diff --git a/.lfsconfig b/.lfsconfig
index e51eb5e7c4..546f34ff1c 100644
--- a/.lfsconfig
+++ b/.lfsconfig
@@ -2,10 +2,14 @@
 # Default LFS endpoint for this repository
 url=https://d3df09qsjufr6g.cloudfront.net/api/v1
 
-# To use the endpoint with your fork:
-# 1. uncomment the url line below by removing the '#'
-# 2. replace 'owner' with the username or organization that owns the fork
-# 3. have git ignore your local modification of this file by running
-# git update-index --skip-worktree .lfsconfig
- 
-# url=https://d3df09qsjufr6g.cloudfront.net/api/v1/fork/owner
+# To use the endpoint with your fork, run the following git command
+# in your local repository (without the '#'), replacing 'owner' with 
+# the username or organization that owns the fork.
+#
+# git config lfs.url "https://d3df09qsjufr6g.cloudfront.net/api/v1/fork/owner"
+#
+# For example, if your fork is https://github.com/octocat/o3de use
+# git config lfs.url "https://d3df09qsjufr6g.cloudfront.net/api/v1/fork/octocat"
+#
+# IMPORTANT: authenticate with your GitHub username and personal access token
+# not your GitHub password 
diff --git a/Assets/Editor/LambdaFunctions/LwALambdaFunction.js b/Assets/Editor/LambdaFunctions/LwALambdaFunction.js
index c57eb13253..562a7573a6 100644
--- a/Assets/Editor/LambdaFunctions/LwALambdaFunction.js
+++ b/Assets/Editor/LambdaFunctions/LwALambdaFunction.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js
index 5235829e08..81e47bfb15 100644
--- a/Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js
+++ b/Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
index 5b0d503e18..636b3a6b85 100644
--- a/Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
+++ b/Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js
index 106b4b7208..2df17a9ac4 100644
--- a/Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js
+++ b/Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Assets/Editor/MissionTemplate.lua b/Assets/Editor/MissionTemplate.lua
index 287d2ffb28..bdff5191ae 100644
--- a/Assets/Editor/MissionTemplate.lua
+++ b/Assets/Editor/MissionTemplate.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Editor/Scripts/TrackView/example.py b/Assets/Editor/Scripts/TrackView/example.py
index b8e13e4641..f60cfcc038 100755
--- a/Assets/Editor/Scripts/TrackView/example.py
+++ b/Assets/Editor/Scripts/TrackView/example.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Editor/Scripts/editor_script_validation.py b/Assets/Editor/Scripts/editor_script_validation.py
index bb4ec0053e..d132484558 100755
--- a/Assets/Editor/Scripts/editor_script_validation.py
+++ b/Assets/Editor/Scripts/editor_script_validation.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Editor/Scripts/export_all_project_levels.py b/Assets/Editor/Scripts/export_all_project_levels.py
index ab0789fe23..0f52d9250a 100755
--- a/Assets/Editor/Scripts/export_all_project_levels.py
+++ b/Assets/Editor/Scripts/export_all_project_levels.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Editor/Scripts/generatelod.py b/Assets/Editor/Scripts/generatelod.py
index da9d0ffa81..32fd0a7b22 100755
--- a/Assets/Editor/Scripts/generatelod.py
+++ b/Assets/Editor/Scripts/generatelod.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Editor/Scripts/rename_cgf.py b/Assets/Editor/Scripts/rename_cgf.py
index dff4d6c5cb..47d92bb61d 100755
--- a/Assets/Editor/Scripts/rename_cgf.py
+++ b/Assets/Editor/Scripts/rename_cgf.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Editor/Scripts/select_story_anim_objects.py b/Assets/Editor/Scripts/select_story_anim_objects.py
index 4717799381..62ad25a0ea 100755
--- a/Assets/Editor/Scripts/select_story_anim_objects.py
+++ b/Assets/Editor/Scripts/select_story_anim_objects.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Editor/Scripts/tools_shelf_actions.py b/Assets/Editor/Scripts/tools_shelf_actions.py
index a9ba4d56da..670082fa02 100755
--- a/Assets/Editor/Scripts/tools_shelf_actions.py
+++ b/Assets/Editor/Scripts/tools_shelf_actions.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Editor/UI/removeTranslationFiles.py b/Assets/Editor/UI/removeTranslationFiles.py
index 245e5e0042..8f18587a70 100755
--- a/Assets/Editor/UI/removeTranslationFiles.py
+++ b/Assets/Editor/UI/removeTranslationFiles.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Editor/UI/updateTranslatableText.py b/Assets/Editor/UI/updateTranslatableText.py
index 374dd08889..b256e74e37 100755
--- a/Assets/Editor/UI/updateTranslatableText.py
+++ b/Assets/Editor/UI/updateTranslatableText.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Assets/Engine/Libs/MaterialEffects/materialeffects.xml b/Assets/Engine/Libs/MaterialEffects/materialeffects.xml
index 04977c9e80..a7f1c43958 100644
--- a/Assets/Engine/Libs/MaterialEffects/materialeffects.xml
+++ b/Assets/Engine/Libs/MaterialEffects/materialeffects.xml
@@ -11,7 +11,7 @@
   <LastPrinted>2006-02-22T12:05:03Z</LastPrinted>
   <Created>2005-10-12T15:13:39Z</Created>
   <LastSaved>2014-04-08T17:21:06Z</LastSaved>
-  <Company>Crytek</Company>
+  <Company>Contributors to the Open 3D Engine Project</Company>
   <Version>12.00</Version>
  </DocumentProperties>
  <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
diff --git a/Assets/Engine/Scripts/EngineCommon.lua b/Assets/Engine/Scripts/EngineCommon.lua
index 388ccdb139..32c54393a4 100644
--- a/Assets/Engine/Scripts/EngineCommon.lua
+++ b/Assets/Engine/Scripts/EngineCommon.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua b/Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
index 634721ec82..a60b6d388f 100644
--- a/Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
+++ b/Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/AI/SmartObject.lua b/Assets/Engine/Scripts/Entities/AI/SmartObject.lua
index f4233f154a..effd3ac23b 100644
--- a/Assets/Engine/Scripts/Entities/AI/SmartObject.lua
+++ b/Assets/Engine/Scripts/Entities/AI/SmartObject.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/AI/TagPoint.lua b/Assets/Engine/Scripts/Entities/AI/TagPoint.lua
index 37fe7b6ea9..0307463d24 100644
--- a/Assets/Engine/Scripts/Entities/AI/TagPoint.lua
+++ b/Assets/Engine/Scripts/Entities/AI/TagPoint.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua b/Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua
index 27091bab64..2b6797435e 100644
--- a/Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua
+++ b/Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua b/Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua
index 947d0553ee..b3c7838e12 100644
--- a/Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua
+++ b/Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Default/GeomEntity.lua b/Assets/Engine/Scripts/Entities/Default/GeomEntity.lua
index dfaef2bc14..a58af759b3 100644
--- a/Assets/Engine/Scripts/Entities/Default/GeomEntity.lua
+++ b/Assets/Engine/Scripts/Entities/Default/GeomEntity.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Default/RopeEntity.lua b/Assets/Engine/Scripts/Entities/Default/RopeEntity.lua
index 12d83a2262..559538156f 100644
--- a/Assets/Engine/Scripts/Entities/Default/RopeEntity.lua
+++ b/Assets/Engine/Scripts/Entities/Default/RopeEntity.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua b/Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua
index 11b3d35c3e..2fd2836f9d 100644
--- a/Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua
+++ b/Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua b/Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua
index 6d24ba1c05..9183d19e43 100644
--- a/Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua
+++ b/Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Lights/Light.lua b/Assets/Engine/Scripts/Entities/Lights/Light.lua
index 401880429c..daf323f9e8 100644
--- a/Assets/Engine/Scripts/Entities/Lights/Light.lua
+++ b/Assets/Engine/Scripts/Entities/Lights/Light.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Others/CameraSource.lua b/Assets/Engine/Scripts/Entities/Others/CameraSource.lua
index b17be8c446..01ac7a8989 100644
--- a/Assets/Engine/Scripts/Entities/Others/CameraSource.lua
+++ b/Assets/Engine/Scripts/Entities/Others/CameraSource.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Others/CameraTarget.lua b/Assets/Engine/Scripts/Entities/Others/CameraTarget.lua
index 913bc23d38..59ce9c82cb 100644
--- a/Assets/Engine/Scripts/Entities/Others/CameraTarget.lua
+++ b/Assets/Engine/Scripts/Entities/Others/CameraTarget.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Others/Comment.lua b/Assets/Engine/Scripts/Entities/Others/Comment.lua
index bb4978eedb..68c26b0571 100644
--- a/Assets/Engine/Scripts/Entities/Others/Comment.lua
+++ b/Assets/Engine/Scripts/Entities/Others/Comment.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua b/Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua
index 5d2b946aad..baab0c0da9 100644
--- a/Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua
+++ b/Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Others/RigidBody.lua b/Assets/Engine/Scripts/Entities/Others/RigidBody.lua
index 451fe8e413..8651bed6a4 100644
--- a/Assets/Engine/Scripts/Entities/Others/RigidBody.lua
+++ b/Assets/Engine/Scripts/Entities/Others/RigidBody.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua b/Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua
index 985ec72856..1a23ae2c5d 100644
--- a/Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua
+++ b/Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Physics/AnimObject.lua b/Assets/Engine/Scripts/Entities/Physics/AnimObject.lua
index 0e098353b8..c1786e6ec9 100644
--- a/Assets/Engine/Scripts/Entities/Physics/AnimObject.lua
+++ b/Assets/Engine/Scripts/Entities/Physics/AnimObject.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua b/Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
index a53e70e86e..7f9494577f 100644
--- a/Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
+++ b/Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua b/Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua
index 5516c081ca..7502473d72 100644
--- a/Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua
+++ b/Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua b/Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua
index d47f671b5e..aedd41d71b 100644
--- a/Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua
+++ b/Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua b/Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua
index 9484b9fb40..a48ef8fa87 100644
--- a/Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua
+++ b/Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Render/FogVolume.lua b/Assets/Engine/Scripts/Entities/Render/FogVolume.lua
index 0a2d1332a1..085f302e88 100644
--- a/Assets/Engine/Scripts/Entities/Render/FogVolume.lua
+++ b/Assets/Engine/Scripts/Entities/Render/FogVolume.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Render/GeomCache.lua b/Assets/Engine/Scripts/Entities/Render/GeomCache.lua
index 601372bb64..048d04e89c 100644
--- a/Assets/Engine/Scripts/Entities/Render/GeomCache.lua
+++ b/Assets/Engine/Scripts/Entities/Render/GeomCache.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
index 4eef0e0be0..5981c3d301 100644
--- a/Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
+++ b/Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
index 477128ccb5..958b8e55ea 100644
--- a/Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
+++ b/Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
index 75d4a301b4..a44a88870c 100644
--- a/Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
+++ b/Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua b/Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
index 6dae66dd7c..f3f2f49577 100644
--- a/Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
+++ b/Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua b/Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
index b75a0f5125..4a97342d2e 100644
--- a/Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
+++ b/Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua b/Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua
index 89c0a3e73f..0c21d6c187 100644
--- a/Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua
+++ b/Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua b/Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
index cfa2cc1781..ec8e47388e 100644
--- a/Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
+++ b/Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua b/Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
index d3702905fc..26724b8251 100644
--- a/Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
+++ b/Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua b/Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua
index 33b9b1430a..62f606a413 100644
--- a/Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua
+++ b/Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Utils/Components/InputUtils.lua b/Assets/Engine/Scripts/Utils/Components/InputUtils.lua
index 2569befbf9..980bbda952 100644
--- a/Assets/Engine/Scripts/Utils/Components/InputUtils.lua
+++ b/Assets/Engine/Scripts/Utils/Components/InputUtils.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua b/Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua
index 0db1ec9ab9..56596df39d 100644
--- a/Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua
+++ b/Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Utils/Containers.lua b/Assets/Engine/Scripts/Utils/Containers.lua
index 9014a63090..d2905b5399 100644
--- a/Assets/Engine/Scripts/Utils/Containers.lua
+++ b/Assets/Engine/Scripts/Utils/Containers.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Utils/EntityUtils.lua b/Assets/Engine/Scripts/Utils/EntityUtils.lua
index 36362f9919..0adc4bc281 100644
--- a/Assets/Engine/Scripts/Utils/EntityUtils.lua
+++ b/Assets/Engine/Scripts/Utils/EntityUtils.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Assets/Engine/Scripts/Utils/Math.lua b/Assets/Engine/Scripts/Utils/Math.lua
index 660fb17a92..57542dfee3 100644
--- a/Assets/Engine/Scripts/Utils/Math.lua
+++ b/Assets/Engine/Scripts/Utils/Math.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/CMakeLists.txt b/AutomatedTesting/CMakeLists.txt
index fb1f0320e4..7a7d2b3165 100644
--- a/AutomatedTesting/CMakeLists.txt
+++ b/AutomatedTesting/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Editor/Scripts/SettingsRegistry/__init__.py b/AutomatedTesting/Editor/Scripts/SettingsRegistry/__init__.py
index ce5d67d66d..e1b5394b94 100755
--- a/AutomatedTesting/Editor/Scripts/SettingsRegistry/__init__.py
+++ b/AutomatedTesting/Editor/Scripts/SettingsRegistry/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Editor/Scripts/SettingsRegistry/settings_registry_example.py b/AutomatedTesting/Editor/Scripts/SettingsRegistry/settings_registry_example.py
index 120a487341..0dec2669fe 100755
--- a/AutomatedTesting/Editor/Scripts/SettingsRegistry/settings_registry_example.py
+++ b/AutomatedTesting/Editor/Scripts/SettingsRegistry/settings_registry_example.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Editor/Scripts/__init__.py b/AutomatedTesting/Editor/Scripts/__init__.py
index ce5d67d66d..e1b5394b94 100755
--- a/AutomatedTesting/Editor/Scripts/__init__.py
+++ b/AutomatedTesting/Editor/Scripts/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/EngineFinder.cmake b/AutomatedTesting/EngineFinder.cmake
index 0fee5bf6fc..94460e7c11 100644
--- a/AutomatedTesting/EngineFinder.cmake
+++ b/AutomatedTesting/EngineFinder.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/CMakeLists.txt b/AutomatedTesting/Gem/CMakeLists.txt
index 6732e0b7c6..e502c06bba 100644
--- a/AutomatedTesting/Gem/CMakeLists.txt
+++ b/AutomatedTesting/Gem/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/CMakeLists.txt b/AutomatedTesting/Gem/Code/CMakeLists.txt
index 427ee7e66f..280c44fe8b 100644
--- a/AutomatedTesting/Gem/Code/CMakeLists.txt
+++ b/AutomatedTesting/Gem/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Include/AutomatedTesting/AutomatedTestingBus.h b/AutomatedTesting/Gem/Code/Include/AutomatedTesting/AutomatedTestingBus.h
index 945e135414..7a1a0db21b 100644
--- a/AutomatedTesting/Gem/Code/Include/AutomatedTesting/AutomatedTestingBus.h
+++ b/AutomatedTesting/Gem/Code/Include/AutomatedTesting/AutomatedTestingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Platform/Android/platform_android_files.cmake b/AutomatedTesting/Gem/Code/Platform/Android/platform_android_files.cmake
index 30503258bc..1fe051b062 100644
--- a/AutomatedTesting/Gem/Code/Platform/Android/platform_android_files.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Platform/Linux/platform_linux_files.cmake b/AutomatedTesting/Gem/Code/Platform/Linux/platform_linux_files.cmake
index 30503258bc..1fe051b062 100644
--- a/AutomatedTesting/Gem/Code/Platform/Linux/platform_linux_files.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Platform/Mac/platform_mac_files.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/platform_mac_files.cmake
index 7a7c055518..b4e92ff6f5 100644
--- a/AutomatedTesting/Gem/Code/Platform/Mac/platform_mac_files.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Platform/Mac/runtime_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
index 3b5129225b..6faf6e663d 100644
--- a/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Platform/Mac/tool_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
index 3b5129225b..6faf6e663d 100644
--- a/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Platform/Windows/platform_windows_files.cmake b/AutomatedTesting/Gem/Code/Platform/Windows/platform_windows_files.cmake
index 30503258bc..1fe051b062 100644
--- a/AutomatedTesting/Gem/Code/Platform/Windows/platform_windows_files.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Platform/iOS/platform_ios_files.cmake b/AutomatedTesting/Gem/Code/Platform/iOS/platform_ios_files.cmake
index d0f06b1753..d43675623c 100644
--- a/AutomatedTesting/Gem/Code/Platform/iOS/platform_ios_files.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Source/AutomatedTestingModule.cpp b/AutomatedTesting/Gem/Code/Source/AutomatedTestingModule.cpp
index b8c122ec8f..e4534870e2 100644
--- a/AutomatedTesting/Gem/Code/Source/AutomatedTestingModule.cpp
+++ b/AutomatedTesting/Gem/Code/Source/AutomatedTestingModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Source/AutomatedTestingSystemComponent.cpp b/AutomatedTesting/Gem/Code/Source/AutomatedTestingSystemComponent.cpp
index dbe8faf12a..7bd2742d31 100644
--- a/AutomatedTesting/Gem/Code/Source/AutomatedTestingSystemComponent.cpp
+++ b/AutomatedTesting/Gem/Code/Source/AutomatedTestingSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Source/AutomatedTestingSystemComponent.h b/AutomatedTesting/Gem/Code/Source/AutomatedTestingSystemComponent.h
index ff93c24d15..de9d9ab51d 100644
--- a/AutomatedTesting/Gem/Code/Source/AutomatedTestingSystemComponent.h
+++ b/AutomatedTesting/Gem/Code/Source/AutomatedTestingSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/automatedtesting_files.cmake b/AutomatedTesting/Gem/Code/automatedtesting_files.cmake
index ed8551e7d8..f28ae27ca7 100644
--- a/AutomatedTesting/Gem/Code/automatedtesting_files.cmake
+++ b/AutomatedTesting/Gem/Code/automatedtesting_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/enabled_gems.cmake b/AutomatedTesting/Gem/Code/enabled_gems.cmake
index 767e6acafc..4ab914c118 100644
--- a/AutomatedTesting/Gem/Code/enabled_gems.cmake
+++ b/AutomatedTesting/Gem/Code/enabled_gems.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -52,7 +52,7 @@ set(ENABLED_GEMS
 )
 
 # TODO remove conditional add once AWSNativeSDK libs are fixed for Android and Linux Monolithic release.
-set(aws_excluded_platforms Linux Android)
+set(aws_excluded_platforms Android)
 if (NOT (LY_MONOLITHIC_GAME AND ${PAL_PLATFORM_NAME} IN_LIST aws_excluded_platforms))
     list(APPEND ENABLED_GEMS
         AWSCore
diff --git a/AutomatedTesting/Gem/Editor/Scripts/__init__.py b/AutomatedTesting/Gem/Editor/Scripts/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/AutomatedTesting/Gem/Editor/Scripts/__init__.py
+++ b/AutomatedTesting/Gem/Editor/Scripts/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Editor/Scripts/bootstrap.py b/AutomatedTesting/Gem/Editor/Scripts/bootstrap.py
index 5f784b8b8d..ec639ca075 100644
--- a/AutomatedTesting/Gem/Editor/Scripts/bootstrap.py
+++ b/AutomatedTesting/Gem/Editor/Scripts/bootstrap.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt
index 8ba799d638..0d5c1d144a 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/AWS/Windows/__init__.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/__init__.py
index 3a3549d485..5482b53e84 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/aws_metrics/__init__.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/__init__.py
index 487ceb9103..68fa386ecb 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/aws_metrics/aws_metrics_automation_test.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_automation_test.py
index ccafb35900..902666ba10 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/aws_metrics/aws_metrics_utils.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_utils.py
index f6b79e5690..814ec1546a 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/aws_metrics/aws_metrics_waiters.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_waiters.py
index da058eb0d9..c56844bbcd 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_waiters.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_waiters.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/cdk/__init__.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/cdk/__init__.py
index 3a3549d485..5482b53e84 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/cdk/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/cdk/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/cdk/cdk_utils.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/cdk/cdk_utils.py
index b2058b372b..532f39df4a 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/cdk/cdk_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/cdk/cdk_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/client_auth/__init__.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/__init__.py
index 3a3549d485..5482b53e84 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/client_auth/test_anonymous_credentials.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_anonymous_credentials.py
index cf22ac6879..7ab84328fe 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_anonymous_credentials.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_anonymous_credentials.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/client_auth/test_password_signin.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_password_signin.py
index 4a964a5027..dafcb31751 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_password_signin.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/test_password_signin.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/Windows/resource_mappings/__init__.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/__init__.py
index ce5bb8503d..99aac69543 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/resource_mappings.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/resource_mappings.py
index 871288702e..2d67b0abc7 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/resource_mappings.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/resource_mappings.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/__init__.py b/AutomatedTesting/Gem/PythonTests/AWS/__init__.py
index 3a3549d485..5482b53e84 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/common/__init__.py b/AutomatedTesting/Gem/PythonTests/AWS/common/__init__.py
index 3a3549d485..5482b53e84 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/common/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/common/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/common/aws_credentials.py b/AutomatedTesting/Gem/PythonTests/AWS/common/aws_credentials.py
index 5a6f182b14..61523599a8 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/common/aws_credentials.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/common/aws_credentials.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/common/aws_utils.py b/AutomatedTesting/Gem/PythonTests/AWS/common/aws_utils.py
index b6f2573497..ca0d14c67c 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/common/aws_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/common/aws_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/common/custom_waiter.py b/AutomatedTesting/Gem/PythonTests/AWS/common/custom_waiter.py
index 544a5e5394..6a41b53dfd 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/common/custom_waiter.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/common/custom_waiter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/AWS/conftest.py b/AutomatedTesting/Gem/PythonTests/AWS/conftest.py
index 037b181dcb..15217d4620 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/conftest.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/conftest.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/ActorSplitsAfterCapsuleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py
index 0c6a7fd7e2..55dec5e13d 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/ActorSplitsAfterCollision.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py
index 0ecb9f2ff4..b9e78330d6 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/ActorSplitsAfterDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py
index 126a4d0c84..0f670fc779 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/ActorSplitsAfterImpactSpreadDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py
index 466cc554cb..b18ac07dcb 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/ActorSplitsAfterRadialDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py
index 31cde279d1..cc8f2185b6 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/ActorSplitsAfterShearDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py
index 6221225209..c31c26d928 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/ActorSplitsAfterStressDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py
index 6f2729d497..af82c5c3b8 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/ActorSplitsAfterTriangleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py
index 55a65a57ff..8fba903e5e 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/BlastUtils.py b/AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py
index bbc0409a14..95ba71ebb4 100644
--- a/AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt
index 2ca3af95ff..14dc029c7b 100644
--- a/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Blast/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py
index 002553b096..fd068c3db2 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py
index 925b08a272..d8b769e53f 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Blast/__init__.py b/AutomatedTesting/Gem/PythonTests/Blast/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
index 479db3230a..df21877cd4 100644
--- a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/EditorPythonBindings/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CMakeLists.txt
index 84b52b7ccc..638a54fa5d 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/EditorPythonBindings/ComponentAssetCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentAssetCommands_test.py
index fdd545bb94..a55905f65b 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentAssetCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentAssetCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentAssetCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentAssetCommands_test_case.py
index 46ec731bcb..598cb41342 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentAssetCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentAssetCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test.py
index 916130bc91..d73946449c 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test_case.py
index 4b86e18f0c..1a3c62ae98 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentCommands_test_case_BuildComponentTypeNameList.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test_case_BuildComponentTypeNameList.py
index ff6b65d495..7057606b7a 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test_case_BuildComponentTypeNameList.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test_case_BuildComponentTypeNameList.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentPropertyCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test.py
index 0426334c81..f9b91e60b1 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentPropertyCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case.py
index 29d6aadcf1..0fed80420c 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentPropertyCommands_test_case_set_none.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case_set_none.py
index 11d776f70b..e8def81b02 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case_set_none.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case_set_none.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentPropertyCommands_test_case_visibility.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case_visibility.py
index e68ce36923..baf888aea1 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case_visibility.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case_visibility.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentPropertyCommands_test_containers.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_containers.py
index c3f75fd902..f76e23dc46 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_containers.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_containers.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentPropertyCommands_test_enum.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_enum.py
index b9fd437ccc..caceecce69 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_enum.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_enum.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ComponentUpdateListProperty_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py
index af80a36460..1fd8a85259 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/DisplaySettingsBus_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsBus_test.py
index 070e2c8242..befa473149 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsBus_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsBus_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/DisplaySettingsBus_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsBus_test_case.py
index bbf268aa68..fed1e706da 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsBus_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsBus_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/DisplaySettingsCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsCommands_test.py
index 0593f16378..e8cc288ed7 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/DisplaySettingsCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsCommands_test_case.py
index 7e8f61e703..712d37545b 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/DisplaySettingsCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EditorCommandLine_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorCommandLine_test.py
index 9edebf9aef..e2a2327057 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorCommandLine_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorCommandLine_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EditorCommandLine_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorCommandLine_test_case.py
index 6e12ffb0fb..933950a7be 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorCommandLine_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorCommandLine_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EditorScripts/ComponentUpdateListProperty_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorScripts/ComponentUpdateListProperty_test_case.py
index 19b4c56111..bbf15e3ae4 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorScripts/ComponentUpdateListProperty_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorScripts/ComponentUpdateListProperty_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EditorScripts/__init__.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorScripts/__init__.py
index ce5bb8503d..99aac69543 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorScripts/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorScripts/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_legacy_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_legacy_test_case.py
index d1586d8947..cb9c57f8ee 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_legacy_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_legacy_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EditorUtilityCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test.py
index 4b037460e9..d4b3f93f59 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EditorUtilityCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test_case.py
index 1c886ce5cd..d6b72f6948 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EditorViewCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorViewCommands_test.py
index b010ef75bb..6f1ce58d14 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorViewCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorViewCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EditorViewCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorViewCommands_test_case.py
index 1570b720f4..b80524cd55 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorViewCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorViewCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EntityCRUDCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCRUDCommands_test.py
index 54d6666eec..23ee8cc74e 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCRUDCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCRUDCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EntityCRUDCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCRUDCommands_test_case.py
index 42fa3e4097..319113d3df 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCRUDCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCRUDCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EntityCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCommands_test.py
index e1aed00f90..c213bcb8bd 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EntityCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCommands_test_case.py
index db05dfb614..c2ed344888 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EntitySearchCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySearchCommands_test.py
index a1bb71b3c0..8689dd5685 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySearchCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySearchCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EntitySearchCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySearchCommands_test_case.py
index 9c6a6ce1de..8898916579 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySearchCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySearchCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EntitySelectionCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySelectionCommands_test.py
index b5a5393028..504cdd45dc 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySelectionCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySelectionCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/EntitySelectionCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySelectionCommands_test_case.py
index 78acc915eb..5307216409 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySelectionCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntitySelectionCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/GameModeCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/GameModeCommands_test.py
index 5352965727..f5cd8b4903 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/GameModeCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/GameModeCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/GameModeCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/GameModeCommands_test_case.py
index c4589bfe97..1aa83cbe82 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/GameModeCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/GameModeCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/LevelCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelCommands_test.py
index 7bda88578f..c16aed368c 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/LevelCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelCommands_test_case.py
index 9d33273fef..b283c1b1b0 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/LevelComponentCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelComponentCommands_test.py
index 7ddd9ea7c6..9a4a769def 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelComponentCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelComponentCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/LevelComponentCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelComponentCommands_test_case.py
index e2fce7a83f..65cca678ec 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelComponentCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelComponentCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/LevelPathsCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelPathsCommands_test.py
index a9b8aa6642..fbe81a7222 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelPathsCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelPathsCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/LevelPathsCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelPathsCommands_test_case.py
index 522e234fc8..86149187a9 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelPathsCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/LevelPathsCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/MainWindowCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/MainWindowCommands_test.py
index 8d21567a26..7a243f85c1 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/MainWindowCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/MainWindowCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/MainWindowCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/MainWindowCommands_test_case.py
index 182e31a300..dc96a4b55f 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/MainWindowCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/MainWindowCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ObjectManagerCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test.py
index d09cba3c2f..b72e2f8461 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ObjectManagerCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
index 6ce97cf84b..fee4f1f154 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ObjectStringRepresentation_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectStringRepresentation_test.py
index 7053b03389..5d4c94d166 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectStringRepresentation_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectStringRepresentation_test.py
@@ -1,6 +1,6 @@
 '' 
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ObjectStringRepresentation_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectStringRepresentation_test_case.py
index 9a465ab1d0..b3d3ad142b 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectStringRepresentation_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectStringRepresentation_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/PySide_Example_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test.py
index 4f74d214f4..e3e0c7e0db 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test.py
@@ -1,6 +1,6 @@
 ''
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/PySide_Example_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test_case.py
index e65ea28895..d50bd872b8 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/TrackViewCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/TrackViewCommands_test.py
index 18592eb99f..4e7a8d7953 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/TrackViewCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/TrackViewCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/TrackViewCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/TrackViewCommands_test_case.py
index 1226633061..d5d793b53b 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/TrackViewCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/TrackViewCommands_test_case.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/EditorPythonBindings/ViewPaneCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewPaneCommands_test.py
index 3895723177..80826bac33 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewPaneCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewPaneCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ViewPaneCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewPaneCommands_test_case.py
index 2698996c55..b277074647 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewPaneCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewPaneCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ViewportTitleDlgCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewportTitleDlgCommands_test.py
index 30c57c9e14..45ca1197b2 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewportTitleDlgCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewportTitleDlgCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/ViewportTitleDlgCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewportTitleDlgCommands_test_case.py
index 51109ca926..8dba9a1c16 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewportTitleDlgCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewportTitleDlgCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/WaitCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/WaitCommands_test.py
index d04a4f6e96..929db4cbcb 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/WaitCommands_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/WaitCommands_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/WaitCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/WaitCommands_test_case.py
index 8052bb8dc7..63cdabb9c9 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/WaitCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/WaitCommands_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/__init__.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/hydra_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/hydra_utils.py
index 52f9ebb1c5..8d91534c59 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/hydra_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/hydra_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/layerEntity_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/layerEntity_test.py
index 622d9844bf..51724ea509 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/layerEntity_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/layerEntity_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonBindings/layerEntity_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/layerEntity_test_case.py
index f153ea3446..bd5265470c 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/layerEntity_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/layerEntity_test_case.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/EditorPythonTestTools/README.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
index b5c02fd67a..b8933bab6b 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
@@ -1,4 +1,4 @@
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonTestTools/__init__.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonTestTools/editor_python_test_tools/__init__.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py
index ce5bb8503d..99aac69543 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
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 f046a396f2..b452ad163d 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py
index cdbefb6144..b6d05a11cc 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
index 0aa02c9b8b..2ce73a7dae 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
index 0ad9290e23..2583109573 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py
index c73acea7a9..f017872c58 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py
index f558577bca..8f57532a60 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonTestTools/editor_python_test_tools/utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
index 93660d2ec3..35f07f99af 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/EditorPythonTestTools/setup.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py
index 891d8c93c2..1100efcdc6 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py
index bd6fcc93cd..85abb9eff5 100755
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py
index cd741d26d3..fac5a6264c 100755
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/NvCloth/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/NvCloth/CMakeLists.txt
index cedae0a390..5b26424097 100644
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/NvCloth/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/NvCloth/ImportPathHelper.py
index 002553b096..fd068c3db2 100755
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/ImportPathHelper.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/ImportPathHelper.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/NvCloth/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Active.py
index 230d99d205..ce3f04b8f1 100755
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Active.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Active.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/NvCloth/__init__.py b/AutomatedTesting/Gem/PythonTests/NvCloth/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Platform/Android/PAL_traits_android.cmake b/AutomatedTesting/Gem/PythonTests/Platform/Android/PAL_traits_android.cmake
index b9f79c94e0..12a69f2243 100644
--- a/AutomatedTesting/Gem/PythonTests/Platform/Android/PAL_traits_android.cmake
+++ b/AutomatedTesting/Gem/PythonTests/Platform/Android/PAL_traits_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Platform/Linux/PAL_traits_linux.cmake b/AutomatedTesting/Gem/PythonTests/Platform/Linux/PAL_traits_linux.cmake
index b9f79c94e0..12a69f2243 100644
--- a/AutomatedTesting/Gem/PythonTests/Platform/Linux/PAL_traits_linux.cmake
+++ b/AutomatedTesting/Gem/PythonTests/Platform/Linux/PAL_traits_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Platform/Mac/PAL_traits_mac.cmake b/AutomatedTesting/Gem/PythonTests/Platform/Mac/PAL_traits_mac.cmake
index b9f79c94e0..12a69f2243 100644
--- a/AutomatedTesting/Gem/PythonTests/Platform/Mac/PAL_traits_mac.cmake
+++ b/AutomatedTesting/Gem/PythonTests/Platform/Mac/PAL_traits_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Platform/Windows/PAL_traits_windows.cmake b/AutomatedTesting/Gem/PythonTests/Platform/Windows/PAL_traits_windows.cmake
index 8b3eeb5233..180fc1d1fd 100644
--- a/AutomatedTesting/Gem/PythonTests/Platform/Windows/PAL_traits_windows.cmake
+++ b/AutomatedTesting/Gem/PythonTests/Platform/Windows/PAL_traits_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Platform/iOS/PAL_traits_ios.cmake b/AutomatedTesting/Gem/PythonTests/Platform/iOS/PAL_traits_ios.cmake
index b9f79c94e0..12a69f2243 100644
--- a/AutomatedTesting/Gem/PythonTests/Platform/iOS/PAL_traits_ios.cmake
+++ b/AutomatedTesting/Gem/PythonTests/Platform/iOS/PAL_traits_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/PythonAssetBuilder/AssetBuilder_test.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
index c433215f83..f5bdb73a41 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/PythonAssetBuilder/AssetBuilder_test_case.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
index c8f03ac2b0..6622c0de68 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/PythonAssetBuilder/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/CMakeLists.txt
index c343f28d6f..a36f90d22e 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/PythonAssetBuilder/__init__.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/__init__.py
index ce5bb8503d..99aac69543 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/bootstrap_tests.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/bootstrap_tests.py
index 577c7fa910..2d2169b309 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/bootstrap_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/bootstrap_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/PythonAssetBuilder/export_chunks_builder.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/export_chunks_builder.py
index 46cac37d0c..f4c61ab29f 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/export_chunks_builder.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/export_chunks_builder.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/PythonAssetBuilder/mock_asset_builder.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/mock_asset_builder.py
index 10c93bdd47..e46d57b3d7 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/mock_asset_builder.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/mock_asset_builder.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/C28798177_WhiteBox_AddComponentToEntity.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py
index 4c606ccb43..da98d20204 100755
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/C28798205_WhiteBox_SetInvisible.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py
index 962f2a7168..ea1350d9ed 100755
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/C29279329_WhiteBox_SetDefaultShape.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py
index 2556214552..ab470f2f8f 100755
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt
index fcf2f52e09..a6d5ef0956 100644
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/FileManagement.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/FileManagement.py
index a0494b9915..5bab5983a9 100755
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/FileManagement.py
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/FileManagement.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/ImportPathHelper.py
index 002553b096..fd068c3db2 100755
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/ImportPathHelper.py
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/ImportPathHelper.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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_Active.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Active.py
index 7cb1e21afb..26b7ee7fa4 100755
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Active.py
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Active.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/__init__.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/CMakeLists.txt
index ecc8f96f5a..29abc336bf 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/assetpipeline/__init__.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/__init__.py
index ce5d67d66d..e1b5394b94 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/assetpipeline/ap_fixtures/__init__.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/__init__.py
index ce5d67d66d..e1b5394b94 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py
index 70eb8f200e..bb1afdb7b7 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/ap_config_backup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_config_backup_fixture.py
index e73f737b9b..5a2837dae8 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_config_backup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_config_backup_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/ap_config_default_platform_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_config_default_platform_fixture.py
index 33aaacb5f1..5b6492b0a0 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_config_default_platform_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_config_default_platform_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/ap_external_project_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_external_project_setup_fixture.py
index 9c6cb4bf27..9bd03cc692 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_external_project_setup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_external_project_setup_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/ap_fast_scan_setting_backup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_fast_scan_setting_backup_fixture.py
index 66f0cb9ab7..9973f1ee10 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_fast_scan_setting_backup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_fast_scan_setting_backup_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/ap_idle_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_idle_fixture.py
index 2a5fc18c08..5af3477e4f 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_idle_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_idle_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py
index 3a7e91b262..538efac531 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/ap_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
index 9d288d5985..7d458e0202 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/asset_processor_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
index 4dfb65f3b1..8750962049 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
index b2dc628c43..f82e197cb8 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/clear_moveoutput_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/clear_moveoutput_fixture.py
index 15cbecdfea..b0fd2d0992 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/clear_moveoutput_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/clear_moveoutput_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/clear_testingAssets_dir.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/clear_testingAssets_dir.py
index 60b7437c71..631970b50c 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/clear_testingAssets_dir.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/clear_testingAssets_dir.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/one_time_log_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/one_time_log_fixture.py
index 7f49ceb5c6..5c3713483b 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/one_time_log_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/one_time_log_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/ap_fixtures/timeout_option_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/timeout_option_fixture.py
index 1dab821924..306f36d072 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/timeout_option_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/timeout_option_fixture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
index 1c8a4b17ad..f05aff6db3 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/assetpipeline/asset_processor_tests/__init__.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/__init__.py
index ce5d67d66d..e1b5394b94 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/assetpipeline/asset_processor_tests/asset_builder_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_builder_tests.py
index 1ca2d51424..31e387e8a3 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_builder_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_builder_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py
index 34051c0614..926f1cc602 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
index f771563937..618811cfda 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests2.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests2.py
index 9897d67b37..9314c29571 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests2.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests2.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
index 4da409accd..bcf8221ce6 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py
index d0fe77c68d..0ea6d29380 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/asset_processor_gui_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests.py
index ebddf6d5b6..a03351393a 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
index 82070ecd58..4b03caba62 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/asset_relocator_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_relocator_tests.py
index 6b687c267d..f03eddf733 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_relocator_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_relocator_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/assets/C1571774/test_lua_print.lua b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C1571774/test_lua_print.lua
index d289ed4310..a156345563 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C1571774/test_lua_print.lua
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C1571774/test_lua_print.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/assetpipeline/asset_processor_tests/assets/C1591338/test_lua_print.lua b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C1591338/test_lua_print.lua
index d289ed4310..a156345563 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C1591338/test_lua_print.lua
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C1591338/test_lua_print.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/assetpipeline/asset_processor_tests/assets/test_ProcessAndDeleteCache_APBatchShouldReprocess/main.lua b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_ProcessAndDeleteCache_APBatchShouldReprocess/main.lua
index 4ff6ccf76e..631a12422c 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_ProcessAndDeleteCache_APBatchShouldReprocess/main.lua
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_ProcessAndDeleteCache_APBatchShouldReprocess/main.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/assetpipeline/asset_processor_tests/assets/test_ProcessByBothApAndBatch_Md5ShouldMatch/main.lua b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_ProcessByBothApAndBatch_Md5ShouldMatch/main.lua
index 4ff6ccf76e..631a12422c 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_ProcessByBothApAndBatch_Md5ShouldMatch/main.lua
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_ProcessByBothApAndBatch_Md5ShouldMatch/main.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/assetpipeline/asset_processor_tests/conftest.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/conftest.py
index f04bcd9963..32b2910b2a 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/conftest.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/conftest.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/asset_processor_tests/missing_dependency_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py
index c0aa01964a..d1e51d7422 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/fbx_tests/__init__.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/__init__.py
index ce5d67d66d..e1b5394b94 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/assetpipeline/fbx_tests/conftest.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/conftest.py
index a30d232b6a..dad417436d 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/conftest.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/conftest.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/fbx_tests/fbx_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/fbx_tests.py
index 6460d04e48..4a9dbb51c8 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/fbx_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/fbx_tests/fbx_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/assetpipeline/wwise_bank_dependency_tests/__init__.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/wwise_bank_dependency_tests/__init__.py
index ce5d67d66d..e1b5394b94 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/wwise_bank_dependency_tests/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/wwise_bank_dependency_tests/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/assetpipeline/wwise_bank_dependency_tests/bank_info_parser_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/wwise_bank_dependency_tests/bank_info_parser_tests.py
index d77aeb36a8..2906835386 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/wwise_bank_dependency_tests/bank_info_parser_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/wwise_bank_dependency_tests/bank_info_parser_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/atom_renderer/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt
index cd260447c3..ec150bd186 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/atom_renderer/__init__.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/atom_renderer/atom_hydra_scripts/__init__.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
index 10db402b9c..df1910b535 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/atom_renderer/test_Atom_MainSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
index d3e05e9c09..c5090937b8 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/atom_renderer/test_Atom_SandboxSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
index 5d18cc6c6e..41859195ee 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/__init__.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_database_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_database_utils.py
index 63e6f3b0b7..7df225590c 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_database_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_database_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/asset_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_utils.py
index a9cd280c31..83cf35e9f2 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/base.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
index b91e088ee9..2e2f794e94 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/file_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/file_utils.py
index fbb694e938..44719a33f1 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/file_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/file_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/landscape_canvas_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/landscape_canvas_utils.py
index 1d82995a6e..ff279ebc0a 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/landscape_canvas_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/landscape_canvas_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/network_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/network_utils.py
index 773ab77ffb..f9981d2dac 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/network_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/network_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/platform_setting.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/platform_setting.py
index 07dc9f26b7..f057bd7ffe 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/platform_setting.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/platform_setting.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/registry_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/registry_utils.py
index 315ca4d85d..6e2c13d794 100644
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/registry_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/registry_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
@@ -9,12 +9,12 @@ import winreg
 
 logger = logging.getLogger(__name__)
 
-LUMBERYARD_SETTINGS_PATH = r'Software\Amazon\Lumberyard\Settings'
+LUMBERYARD_SETTINGS_PATH = r'Software\O3DE\O3DE\Settings'
 
 def set_ly_registry_value(reg_path, value_name, new_value, value_type=winreg.REG_DWORD):
     """
     Sets the specified value for the specified value_name in the LY registry key.
-    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\Amazon\Lumberyard\Settings)
+    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\O3DE\O3DE\Settings)
     :param value_name: A string that identifies the value name (e.g. UndoLevels, ViewportInteractionModel)
     :param new_value: Value to set on the specified value_name
     :param value_type: The type of value set. Defaults to a 32-bit number.
@@ -40,7 +40,7 @@ def set_ly_registry_value(reg_path, value_name, new_value, value_type=winreg.REG
 def get_ly_registry_value(reg_path, value_name):
     """
     Gets the current value for an existing value_name in the LY registry key.
-    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\Amazon\Lumberyard\Settings)
+    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\O3DE\O3DE\Settings)
     :param value_name: A string that identifies the value name (e.g. UndoLevels, ViewportInteractionModel)
     :return: Value set for the specified value_name
     """
@@ -62,7 +62,7 @@ def get_ly_registry_value(reg_path, value_name):
 def delete_ly_registry_value(reg_path, value_name):
     """
     Deletes the specific registry value_name found in the reg_path key.
-    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\Amazon\Lumberyard\Settings)
+    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\O3DE\O3DE\Settings)
     :param value_name: A string that identifies the value name (e.g. UndoLevels, ViewportInteractionModel)
     :return: None
     """
diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/report.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/report.py
index 0f48863e75..4841a4ad79 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/report.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/report.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/automatedtesting_shared/screenshot_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/screenshot_utils.py
index c641b495c0..ac36be4d8c 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/screenshot_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/screenshot_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/automatedtesting_shared/windows_registry_setting.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/windows_registry_setting.py
index 4c3894e1ec..72731e2f1c 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/windows_registry_setting.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/windows_registry_setting.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
index 0c0d26a208..66cfa13ec3 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/editor/EditorScripts/AssetBrowser_SearchFiltering.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py
index cd7b33fc7b..dbed681f03 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/AssetBrowser_TreeNavigation.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py
index 26597b2ff7..f934886f03 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/AssetPicker_UI_UX.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py
index c0e6f0937f..30b774c88b 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py
index 08e4e8c7d2..c01b65eeab 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py
index 2ca2fba6e4..5250dd6978 100755
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/Docking_BasicDockedTools.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py
index cfaf63ba4b..de0624fedb 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py
index 145a3c2305..5b365dd229 100755
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/Menus_EditMenuOptions.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
index 4ec4e95a8e..26110cd954 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/Menus_FileMenuOptions.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py
index 127a061725..bc1a37541e 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/Menus_ViewMenuOptions.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
index e66e271c71..7ed08867a9 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/EditorScripts/__init__.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/editor/__init__.py b/AutomatedTesting/Gem/PythonTests/editor/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/editor/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/editor/conftest.py b/AutomatedTesting/Gem/PythonTests/editor/conftest.py
index 2b26370126..73d974640f 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/conftest.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/conftest.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
@@ -14,12 +14,12 @@ logger = logging.getLogger(__name__)
 
 
 layout = {
-    'path': r'Software\Amazon\O3DE\Editor\fancyWindowLayouts',
+    'path': r'Software\O3DE\O3DE\Editor\fancyWindowLayouts',
     'value': 'last'
 }
 restore_camera = {
     'new': 16384,
-    'path': r'Software\Amazon\Lumberyard\Editor\AutoHide',
+    'path': r'Software\O3DE\O3DE\Editor\AutoHide',
     'value': 'ViewportCameraRestoreOnExitGameMode'
 }
 
diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_AssetBrowser.py b/AutomatedTesting/Gem/PythonTests/editor/test_AssetBrowser.py
index addb59ec3b..3389e4087c 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_AssetBrowser.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_AssetBrowser.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/test_AssetPicker.py b/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py
index df7b727af4..16150fcc21 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/test_BasicEditorWorkflows.py b/AutomatedTesting/Gem/PythonTests/editor/test_BasicEditorWorkflows.py
index 72545fb98d..e290a7e3e9 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_BasicEditorWorkflows.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_BasicEditorWorkflows.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/test_ComponentCRUD.py b/AutomatedTesting/Gem/PythonTests/editor/test_ComponentCRUD.py
index dac939a9de..847cc726dd 100755
--- a/AutomatedTesting/Gem/PythonTests/editor/test_ComponentCRUD.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_ComponentCRUD.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/test_Docking.py b/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
index c61651bf3d..f5f684e4e1 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/test_InputBindings.py b/AutomatedTesting/Gem/PythonTests/editor/test_InputBindings.py
index 81efd6a056..ceb2933dd6 100755
--- a/AutomatedTesting/Gem/PythonTests/editor/test_InputBindings.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_InputBindings.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/editor/test_Menus.py b/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
index 94646fc65b..b45a087c79 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
index 8a37e13e7d..9c16479b9b 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/largeworlds/__init__.py b/AutomatedTesting/Gem/PythonTests/largeworlds/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude.py
index 87e0fc583f..b8b640071e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py
index ebfd5c1a1c..bbdb925585 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude.py
index 8fe9d5bc6f..5f6c72f481 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/AreaComponentSlices_SliceCreationAndVisibilityToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AreaComponentSlices_SliceCreationAndVisibilityToggle.py
index 97257b7b04..c255476445 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AreaComponentSlices_SliceCreationAndVisibilityToggle.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AreaComponentSlices_SliceCreationAndVisibilityToggle.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea.py
index 7173d1c423..cea749dc46 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/AssetWeightSelector_InstancesExpressBasedOnWeight.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetWeightSelector_InstancesExpressBasedOnWeight.py
index 8f0c37e89e..cfd436792b 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetWeightSelector_InstancesExpressBasedOnWeight.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetWeightSelector_InstancesExpressBasedOnWeight.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/Debugger_DebugCVarsWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/Debugger_DebugCVarsWorks.py
index 720db3960d..40fd67d957 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/Debugger_DebugCVarsWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/Debugger_DebugCVarsWorks.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius.py
index 9b3b641bd8..f6270fac28 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius.py
index 1eaa440644..960d3a3015 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py
index 1edc392423..863c8935ba 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py
index 0e7b2bc7ad..4b0951acaf 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py
index 9deecc1208..892549d414 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py
index 11a2282935..963a97f3a3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/InstanceSpawnerPriority_LayerAndSubPriority.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/InstanceSpawnerPriority_LayerAndSubPriority.py
index 7d099a075b..3f915b5516 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/InstanceSpawnerPriority_LayerAndSubPriority.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/InstanceSpawnerPriority_LayerAndSubPriority.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py
index 71c81e5f36..c4dfbbf4fe 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/LayerBlocker_InstancesBlockedInConfiguredArea.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlocker_InstancesBlockedInConfiguredArea.py
index 04f4cb6d4c..cb2d206f18 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlocker_InstancesBlockedInConfiguredArea.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlocker_InstancesBlockedInConfiguredArea.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py
index e3952a93ce..0224f6bc0a 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
index f9a58c44e6..fc060151e9 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
index f3c916836c..e170d13360 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py
index 654007ec14..c99d180253 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py
index c4098fc9cc..d23f811f58 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py
index 95ccc6ef8e..ad57f80776 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_DependentOnMeshComponent.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_DependentOnMeshComponent.py
index ff56ca936f..1d25121bf6 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_DependentOnMeshComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_DependentOnMeshComponent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py
index 8cb35ab6ca..a0b38ee277 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py
index bd18d0e850..6af05b8d70 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py
index addc2feaf1..bbb869ff7f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets.py
index 594bddffa2..87e6d3b9b3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/RotationModifierOverrides_InstancesRotateWithinRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifierOverrides_InstancesRotateWithinRange.py
index 75448d360f..a21031abbe 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifierOverrides_InstancesRotateWithinRange.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifierOverrides_InstancesRotateWithinRange.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/RotationModifier_InstancesRotateWithinRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifier_InstancesRotateWithinRange.py
index 0c7f52ce7b..78353ef090 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifier_InstancesRotateWithinRange.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifier_InstancesRotateWithinRange.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/ScaleModifierOverrides_InstancesProperlyScale.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifierOverrides_InstancesProperlyScale.py
index 8b85e13f61..b475c56e5e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifierOverrides_InstancesProperlyScale.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifierOverrides_InstancesProperlyScale.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/ScaleModifier_InstancesProperlyScale.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifier_InstancesProperlyScale.py
index a69ae4d393..2c9380ccbe 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifier_InstancesProperlyScale.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifier_InstancesProperlyScale.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/ShapeIntersectionFilter_InstancesPlantInAssignedShape.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ShapeIntersectionFilter_InstancesPlantInAssignedShape.py
index f1f3bed629..9624ccdc34 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ShapeIntersectionFilter_InstancesPlantInAssignedShape.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ShapeIntersectionFilter_InstancesPlantInAssignedShape.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py
index ce1f18983a..8607aece64 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py
index 813897047d..f252a13c2a 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py
index 0bfaeabb45..593591c84b 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SlopeFilter_FilterStageToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_FilterStageToggle.py
index fe57316ec1..c8523dd798 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_FilterStageToggle.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_FilterStageToggle.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SurfaceDataRefreshes_RemainsStable.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceDataRefreshes_RemainsStable.py
index c7203b8614..b930ab6acc 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceDataRefreshes_RemainsStable.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceDataRefreshes_RemainsStable.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected.py
index a541090762..76021d9f83 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py
index ed17c9d017..ddf2f30e89 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_ExclusionList.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_ExclusionList.py
index ab7fa9ec46..613778cbb3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_ExclusionList.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_ExclusionList.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_InclusionList.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_InclusionList.py
index 441072a2ca..55a6d815e3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_InclusionList.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_InclusionList.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorPointDensity.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorPointDensity.py
index 87831fc0f1..e4a57916d7 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorPointDensity.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorPointDensity.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorSize.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorSize.py
index 04adb48c16..53ee7d6105 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorSize.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorSize.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py
index 4296a4342b..df42b9e821 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/EditorScripts/__init__.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/__init__.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
index 9e140d74d7..36a8307c88 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_AreaComponentSlices.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py
index 6c0fd66b20..ffea660a63 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_AssetListCombiner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py
index 2c3e5ec10a..f5d239771f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_AssetWeightSelector.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py
index 917fcd44fc..9f6302cd82 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_Debugger.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py
index cdaa6f47ad..ed979136e0 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_DistanceBetweenFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py
index e2ad2031a4..3c53c51a3c 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_DynVeg_Regressions.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py
index 9f7b8770da..207aa40f90 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
index 3d6a113031..053c4ccbfd 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
index 5a33ffacb7..88b056445f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py
index d0d2bdc2f6..ddbccd751a 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_LayerBlender.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
index a1944eff4d..3c16420a30 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_LayerBlocker.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py
index 90cdc04313..2902291b9a 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_LayerSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
index 9e060300ad..410bdbafed 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_MeshBlocker.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py
index 49e720d3a2..e6ef7f53c5 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py
index 1ba2b93b21..b8036bb724 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py
index 3551f91b00..8a1523f37c 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_PositionModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
index bd151197d7..c2a873dffc 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_RotationModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py
index b79277f0f4..1d892a781b 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_ScaleModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py
index 5018da8f73..f05199d2d0 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py
index 8c32e6c8e4..dd4c4b8943 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
index 74b265e1a1..d7ab40af35 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_SlopeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
index 8cb5a82cbc..5c1f79aaf3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_SurfaceMaskFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py
index f46d5758e2..dbff206b43 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/dyn_veg/test_SystemSettings.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py
index fdf27e2beb..644c748da0 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py
index a52b6eff09..32b2466aa7 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py
index 880f5ea04c..8ca5fed6eb 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py
index 006e257cdd..0ca5fc2b9e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py
index 9e078543a5..417441a92f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientSampling_GradientReferencesAddRemoveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSampling_GradientReferencesAddRemoveSuccessfully.py
index 4d3f9d324f..e8c7433e43 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSampling_GradientReferencesAddRemoveSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSampling_GradientReferencesAddRemoveSuccessfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py
index 6696b1d83c..1d07917588 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py
index 23a7bb9335..e54a3695d8 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithExpectedGradients.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithExpectedGradients.py
index 11ef85591f..fa1630a012 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithExpectedGradients.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithExpectedGradients.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithSpawners.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithSpawners.py
index 5f080c001e..1b97deaf17 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithSpawners.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithSpawners.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange.py
index ec77933424..7535c27010 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py
index 2c47d8306b..b5b9496d1e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/ImageGradient_ProcessedImageAssignedSuccessfully.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_ProcessedImageAssignedSuccessfully.py
index 76a977f9eb..c9e9d0504e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_ProcessedImageAssignedSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_ProcessedImageAssignedSuccessfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py
index 83c8798ecd..8a57c3107b 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/__init__.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientIncompatibilities.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientIncompatibilities.py
index 4fa705f808..2187990ca4 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientIncompatibilities.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientIncompatibilities.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/test_GradientPreviewSettings.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientPreviewSettings.py
index 8c681afd5e..caaa480910 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientPreviewSettings.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientPreviewSettings.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/test_GradientSampling.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSampling.py
index b760bdb7a2..4aeb8c170e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSampling.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSampling.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/test_GradientSurfaceTagEmitter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSurfaceTagEmitter.py
index ee377de2e7..473d0170d8 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSurfaceTagEmitter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSurfaceTagEmitter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/test_GradientTransform.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientTransform.py
index bea751998b..e71592ea58 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientTransform.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientTransform.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/gradient_signal/test_ImageGradient.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_ImageGradient.py
index 93497766c9..07807c7dd5 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_ImageGradient.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_ImageGradient.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
index 08401213dc..a772e070f1 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py
index 132c57eb80..4c99ea63c2 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py
index 0843bac3f8..3a01684979 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py
index 0797e5f005..9a6689a548 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py
index c01b2552c6..a6d43821e3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
index 2593e7413e..63e5e7558f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py
index aa641cb722..71ec206b7f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py
index c79cc92fd1..ba48796251 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py
index dafedc07d1..c57f3a0e67 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py
index 9938fcb1f5..0e1538ac7c 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
index a931d253db..0a25d60819 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py
index 9fe3f6f68b..17e23db160 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py
index a0f9745aa1..dc59938fea 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py
index 136ce16735..b536c2daa3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py
index 3f3317869c..2d6d5c0937 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py
index 8d7eb3bee7..2452101d21 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py
index d2b8727663..780ac1ca7a 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py
index 5d20577fa9..ac12d84914 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py
index f8ec6650b4..0996c832fe 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py
index 7b1126e548..9ee23b58ff 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py
index f2e132e821..5a4bbed8dc 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py
index 5efea232f1..559ba91a25 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py
index 586119c6f5..f2bb5da674 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py
index 98c58d6eb6..1f6ffc5926 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/EditorScripts/__init__.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/__init__.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py
index 23f2ad0b79..633999205c 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/test_EditFunctionality.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_EditFunctionality.py
index 8619a2dcf4..bb3e1ea81c 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_EditFunctionality.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_EditFunctionality.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py
index 0edafe731a..bbca71461c 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/test_GradientModifierNodes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientModifierNodes.py
index 3335cc5229..7f5e0625c5 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientModifierNodes.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientModifierNodes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/test_GradientNodes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientNodes.py
index 8aa1da1ff5..b66203c2e2 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientNodes.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientNodes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/test_GraphComponentSync.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py
index bcb023a830..d5036b24bf 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/landscape_canvas/test_ShapeNodes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_ShapeNodes.py
index d5a0530903..fceba3de20 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_ShapeNodes.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_ShapeNodes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/largeworlds/large_worlds_utils/__init__.py b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
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 99d9717707..515009cb3a 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
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/physics/AddModifyDelete_Utils.py b/AutomatedTesting/Gem/PythonTests/physics/AddModifyDelete_Utils.py
index f812347602..aa62b365c6 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/AddModifyDelete_Utils.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/AddModifyDelete_Utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C100000_RigidBody_EnablingGravityWorksPoC.py b/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py
index 5b07b285ce..2784e10bb8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py b/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py
index aff3a6f0c6..bec80b64d0 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C12712452_ScriptCanvas_CollisionEvents.py b/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py
index 89f74c8d5c..b6d2b4db99 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py b/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py
index 0baa1869ed..33b8688555 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py b/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py
index f8c0ad5401..ad90d3520a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C12712455_ScriptCanvas_ShapeCastVerification.py b/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py
index 6a95371f4c..4554c1035e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py b/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py
index e28261feac..fb3f31f070 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C12868580_ForceRegion_SplineModifiedTransform.py b/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py
index d037e81ac9..94b4643d9d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C12905527_ForceRegion_MagnitudeDeviation.py b/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py
index 88210bf007..655952c797 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C12905528_ForceRegion_WithNonTriggerCollider.py b/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py
index 106b0db99f..2fc72f6a3b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C13351703_COM_NotIncludeTriggerShapes.py b/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py
index 81a786f8ff..25a875ff08 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C13352089_RigidBodies_MaxAngularVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py
index 38578cbdba..27dbb33f29 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C13508019_Terrain_TerrainTexturePainterWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py
index fb135cd332..f4c6c635be 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C13895144_Ragdoll_ChangeLevel.py b/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py
index c21c22f054..21ad19b7db 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14195074_ScriptCanvas_PostUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
index a07e5a87df..0d5cc6c5b1 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14654881_CharacterController_SwitchLevels.py b/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py
index a3f0eec073..be6480cd17 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14654882_Ragdoll_ragdollAPTest.py b/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py
index a5d3935e05..bccd7fd232 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14861498_ConfirmError_NoPxMesh.py b/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py
index d12b1e2efc..0506390409 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14861500_DefaultSetting_ColliderShape.py b/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py
index 5525883839..f9e410f926 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py
index 3c99f35870..afa0173583 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14861502_PhysXCollider_AssetAutoAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py
index 6e7afc6e13..bd35678b07 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py b/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py
index 4d5413a93c..ba7512db0d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14902097_ScriptCanvas_PreUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
index 119de51ca1..e04d744314 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py b/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
index 05fd44cfe0..c3bd1207ec 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14976307_Gravity_SetGravityWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py
index a72091942d..6255a0403a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py b/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py
index b9fd33f178..f0c53968a8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py
index dcd789a697..ec71dbb8a3 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py
index ef1351f32a..b774932802 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15096735_Materials_DefaultLibraryConsistency.py b/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py
index eac8a5080e..10a47058d7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py b/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py
index 76bf1f5db8..6614e8b0da 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15096740_Material_LibraryUpdatedCorrectly.py b/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
index d60aa4e467..21b345e6be 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15308217_NoCrash_LevelSwitch.py b/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py
index 23344bbbd6..f0a40aadb5 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15308221_Material_ComponentsInSyncWithLibrary.py b/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py
index 5e7143ea2d..1ff9659eff 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15425929_Undo_Redo.py b/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py
index 8978194da7..d8044fed85 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py b/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py
index 1093c04b72..689319e767 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py b/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py
index 0e088451fa..4ee2969bfd 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py b/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py
index 3363d27a72..bc2fc7855a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C15845879_ForceRegion_HighLinearDampingForce.py b/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py
index 990acb3a9e..63bf163bb8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C17411467_AddPhysxRagdollComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py
index 147c447514..b5a74ecb26 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243580_Joints_Fixed2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py
index 181e60c00c..82887a58bb 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243581_Joints_FixedBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py
index 9125ae3c77..645468ea07 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243582_Joints_FixedLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py
index afa146be29..3f26bd398b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243583_Joints_Hinge2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py
index 4aa2a62513..34876aa2ba 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243584_Joints_HingeSoftLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py
index f6598dc871..76a7b912df 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243585_Joints_HingeNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py
index 34ed26a1f8..c9c5b57d7f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243586_Joints_HingeLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py
index 434fe933f0..173b8a4206 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243587_Joints_HingeBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py
index 4bd97bd154..0a26ac4255 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243588_Joints_Ball2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py
index 500d6bd66e..67aba58945 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243589_Joints_BallSoftLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py
index ec23149478..4ef72d982a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243590_Joints_BallNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py
index b27a5cb8e9..396dc590e3 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243591_Joints_BallLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py
index 9a335f556b..9f5cf46c05 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243592_Joints_BallBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py
index 312d0f3dbe..5d41ca47bd 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18243593_Joints_GlobalFrameConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py
index ceecb0644e..d282e131bb 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18977601_Material_FrictionCombinePriority.py b/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py
index 5a25b447da..ff3dc73435 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C18981526_Material_RestitutionCombinePriority.py b/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py
index 9c91812f44..76396a6f44 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C19536274_GetCollisionName_PrintsName.py b/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py
index 40c3edf578..350b2d5114 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C19536277_GetCollisionName_PrintsNothing.py b/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py
index 6d6cf7c700..ad4245c53a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C19578018_ShapeColliderWithNoShapeComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py
index 3fcb8921be..b58d2a657e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C19578021_ShapeCollider_CanBeAdded.py b/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py
index 47d916a4bf..a793e453f5 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C19723164_ShapeColliders_WontCrashEditor.py b/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py
index 12f900b297..89fd62a147 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py
index bb2d0821cb..940a6d3bca 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C28978033_Ragdoll_WorldBodyBusTests.py b/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
index 5016d78b46..3ecde5cc51 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C29032500_EditorComponents_WorldBodyBusWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py
index 000223e26d..96f4c70643 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C3510642_Terrain_NotCollideWithTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py
index 66d6131ad0..f225ee1422 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C3510644_Collider_CollisionGroups.py b/AutomatedTesting/Gem/PythonTests/physics/C3510644_Collider_CollisionGroups.py
index 4a2c6e0704..76cb34a1eb 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C3510644_Collider_CollisionGroups.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C3510644_Collider_CollisionGroups.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044455_Material_libraryChangesInstantly.py b/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py
index 0a1b0b9f2f..b15999a1ae 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044456_Material_FrictionCombine.py b/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py
index badf00832b..0ee96b1818 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044457_Material_RestitutionCombine.py b/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py
index a9dbcc0259..6c411d6227 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044459_Material_DynamicFriction.py b/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py
index 0702de1758..54a7deb30e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044460_Material_StaticFriction.py b/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py
index 5050504782..646ccfebad 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044461_Material_Restitution.py b/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py
index a115e4f3ee..38f0122e7d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044694_Material_EmptyLibraryUsesDefault.py b/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py
index cfc1e706e4..afee06a4e5 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py b/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py
index 450763ba1e..b562201e73 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4044697_Material_PerfaceMaterialValidation.py b/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
index a4b2c2f5cd..f95f8a5230 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4888315_Material_AddModifyDeleteOnCollider.py b/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py
index 52f62f0d0c..8481548735 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4925577_Materials_MaterialAssignedToTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py
index e30f640d48..9d18131504 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4925579_Material_AddModifyDeleteOnTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py
index fe44d124a6..f37c1d065e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4925580_Material_RagdollBonesMaterial.py b/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py
index c44a606cfc..477648da4c 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py b/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py
index dd68521df9..4f661886d3 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976194_RigidBody_PhysXComponentIsValid.py b/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py
index 53ece4ab19..d633207d7f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976195_RigidBodies_InitialLinearVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py
index 27b024eb8a..7123ac66d6 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976197_RigidBodies_InitialAngularVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py
index 0ebd4ae010..cc24bc8390 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py b/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py
index 82e5a4fc63..2dba8d174a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976200_RigidBody_AngularDampingObjectRotation.py b/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py
index 5b525a4ebd..f7c88f0645 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976201_RigidBody_MassIsAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py
index fd6c9a9647..3b17283309 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py b/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py
index 30a43f34a6..13d06a3599 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976204_Verify_Start_Asleep_Condition.py b/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py
index 8c2ae7cb8b..8193aa4440 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976206_RigidBodies_GravityEnabledActive.py b/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py
index 1adeeb45dc..394c8466e7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py b/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py
index 1e52521e0d..ddd87a1800 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976209_RigidBody_ComputesCOM.py b/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py
index cc72f7dc89..9591f88175 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976210_COM_ManualSetting.py b/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py
index 2950cebcaa..5769f5af09 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py b/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py
index f6ee61e63f..02b676a56d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976227_Collider_NewGroup.py b/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py
index 0ea4881198..24a15cf656 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976236_AddPhysxColliderComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py
index baef392352..238d2cd346 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py b/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py
index 9a2f0bd7ad..e89c9fc605 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py b/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py
index 196efd0be0..33b9060032 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976244_Collider_SameGroupSameLayerCollision.py b/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py
index 50f7ceacea..643bf3fe52 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4976245_PhysXCollider_CollisionLayerTest.py b/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py
index 6701fdba06..5b8c23f702 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4982593_PhysXCollider_CollisionLayerTest.py b/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py
index 29d9e372bb..8d18f5adb9 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4982595_Collider_TriggerDisablesCollision.py b/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py
index 08f0f0ca58..094db2350a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4982797_Collider_ColliderOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py
index 61480afa51..d5b3ef2235 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4982798_Collider_ColliderRotationOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py
index 3c7c4939ba..9a90d9487d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4982800_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py
index 2cebd5f195..f7a033e71b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4982801_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py
index b231b68e62..dc07dd9b5b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4982802_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py
index 2a22460a02..3995adeb23 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C4982803_Enable_PxMesh_Option.py b/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py
index 2b0ab6e118..3ddf222fa3 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5296614_PhysXMaterial_ColliderShape.py b/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py
index 28c5f71f2e..f758c75f2b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5340400_RigidBody_ManualMomentOfInertia.py b/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py
index e81c3cfe26..b8694efe2d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py
index 0bc268d8ee..31ece7beae 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py b/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py
index 00eff5722c..b4a9115626 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py b/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py
index 03c18ae017..b4c7901c52 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5689528_Terrain_MultipleTerrainComponents.py b/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py
index 47ea3b94b6..c0d245075e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py b/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py
index d2da06af69..b3ed10c69f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5689531_Warning_TerrainSliceTerrainComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py
index cc43338e66..3935d213b4 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5932040_ForceRegion_CubeExertsWorldForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py
index 4fc70612e4..ba4836eda1 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py
index f54ba0a891..0cbd82303d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5932042_PhysXForceRegion_LinearDamping.py b/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py
index cc15b23b07..e48a8d3ef0 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py
index c5cb305563..7975eaf036 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5932044_ForceRegion_PointForceOnRigidBody.py b/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py
index ad104b2289..22c8fabb53 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5932045_ForceRegion_Spline.py b/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py
index cbc65529fc..4bec128c58 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py
index 45eab62c8b..146a7bf456 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959760_PhysXForceRegion_PointForceExertion.py b/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py
index db341d0985..013edee626 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py
index 2aa1584799..0e118d43a6 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py b/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
index 90e974e6d1..eb87e05c4d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py b/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
index 35742175c8..9a5271836d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959765_ForceRegion_AssetGetsImpulsed.py b/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
index 43e27d8467..ad198e346a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959808_ForceRegion_PositionOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py
index c7f336fe28..1b7962160a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959809_ForceRegion_RotationalOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py
index 53f1fa2bc6..bdcd128412 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py b/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py
index 1879465576..4ee29d3d1a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py b/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py
index da6ef46e71..74a2a3e46e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C5968760_ForceRegion_CheckNetForceChange.py b/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py
index f10da33537..ed4019abe0 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6032082_Terrain_MultipleResolutionsValid.py b/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py
index 2e7c132444..e4e6a8276c 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6090546_ForceRegion_SliceFileInstantiates.py b/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py
index ba73153fd0..9fdcd08d8f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6090547_ForceRegion_ParentChildForceRegions.py b/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py
index 4a0cedcde6..5c3f2c240a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py
index de698a5d2d..036ca37d00 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py
index 7ab32a8563..b883de48c9 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6090552_ForceRegion_LinearDampingNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py
index 7e72a4277a..eab28df6aa 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py
index 411dcec5e1..78a08664cf 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6090554_ForceRegion_PointForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py
index 147b561f11..1ac781fdda 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py
index 66adf2a20c..6f4d600c31 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py b/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py
index 3f113c5c19..1053944513 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6224408_ScriptCanvas_EntitySpawn.py b/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py
index 31afbbcd8c..122c8d51aa 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6274125_ScriptCanvas_TriggerEvents.py b/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py
index b347442c6f..86c3929cd2 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/C6321601_Force_HighValuesDirectionAxes.py b/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py
index fc780ec721..282d2a7a2f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/physics/CMakeLists.txt
index 334f0c2eaa..a49ca2633b 100644
--- a/AutomatedTesting/Gem/PythonTests/physics/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/physics/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/physics/FileManagement.py b/AutomatedTesting/Gem/PythonTests/physics/FileManagement.py
index a0494b9915..5bab5983a9 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/FileManagement.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/FileManagement.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/physics/ImportPathHelper.py
index 002553b096..fd068c3db2 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/ImportPathHelper.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/ImportPathHelper.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/JointsHelper.py b/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py
index 0450eb6ba5..0461d8fbc0 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/Physmaterial_Editor.py b/AutomatedTesting/Gem/PythonTests/physics/Physmaterial_Editor.py
index 8a96d5a5f8..f28908dc3b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/Physmaterial_Editor.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/Physmaterial_Editor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/TestSuite_InDevelopment.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py
index a04372c30d..fba35bae03 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
index d8796a5116..1895571fa5 100644
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py
index 3bc8d80659..445b098f0e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
index c7b085b6cb..a934702904 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/TestSuite_Utils.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Utils.py
index 8d5a4b239f..f26afa834c 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Utils.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/UtilTest_Managed_Files.py b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Managed_Files.py
index 038c41a6f6..9db106a82d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Managed_Files.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Managed_Files.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/UtilTest_Physmaterial_Editor.py b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Physmaterial_Editor.py
index 386028cd8c..3c43cecdb2 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Physmaterial_Editor.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Physmaterial_Editor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/UtilTest_PhysxConfig_Default.py b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_PhysxConfig_Default.py
index 75bf4415ee..ed193ecca8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_PhysxConfig_Default.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_PhysxConfig_Default.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/UtilTest_PhysxConfig_Override.py b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_PhysxConfig_Override.py
index 75bf4415ee..ed193ecca8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_PhysxConfig_Override.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_PhysxConfig_Override.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/UtilTest_Tracer_PicksErrorsAndWarnings.py b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Tracer_PicksErrorsAndWarnings.py
index 0a1e1596c3..1a29cd1522 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Tracer_PicksErrorsAndWarnings.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Tracer_PicksErrorsAndWarnings.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/physics/__init__.py b/AutomatedTesting/Gem/PythonTests/physics/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/prefab/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/prefab/CMakeLists.txt
index 0184a8b6d4..94ea4aa481 100644
--- a/AutomatedTesting/Gem/PythonTests/prefab/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/prefab/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/prefab/PrefabLevel_OpensLevelWithEntities.py b/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_OpensLevelWithEntities.py
index c367c7e531..73288a3249 100644
--- a/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_OpensLevelWithEntities.py
+++ b/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_OpensLevelWithEntities.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/prefab/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py
index 15df6705e9..ee8dcf8956 100644
--- a/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/prefab/__init__.py b/AutomatedTesting/Gem/PythonTests/prefab/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/AutomatedTesting/Gem/PythonTests/prefab/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/prefab/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/scripting/CMakeLists.txt
index 37c37595e9..4ebef2e77c 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/scripting/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripting/Debugger_HappyPath_TargetMultipleEntities.py b/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleEntities.py
index 13b86900c1..b0e3570632 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleEntities.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleEntities.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Debugger_HappyPath_TargetMultipleGraphs.py b/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleGraphs.py
index 492d79bd10..909f7438ce 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleGraphs.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleGraphs.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/EditMenu_Default_UndoRedo.py b/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_Default_UndoRedo.py
index 229fe7237e..1c2241f49b 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_Default_UndoRedo.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_Default_UndoRedo.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Entity_HappyPath_AddScriptCanvasComponent.py b/AutomatedTesting/Gem/PythonTests/scripting/Entity_HappyPath_AddScriptCanvasComponent.py
index 88282ddc1c..13cb6ccf68 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Entity_HappyPath_AddScriptCanvasComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Entity_HappyPath_AddScriptCanvasComponent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/FileMenu_Default_NewAndOpen.py b/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_Default_NewAndOpen.py
index 99e91ae7dc..b6ef00486b 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_Default_NewAndOpen.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_Default_NewAndOpen.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/GraphClose_Default_SavePrompt.py b/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_Default_SavePrompt.py
index 23d185c1da..0961c2b4fd 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_Default_SavePrompt.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_Default_SavePrompt.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Graph_HappyPath_ZoomInZoomOut.py b/AutomatedTesting/Gem/PythonTests/scripting/Graph_HappyPath_ZoomInZoomOut.py
index b50626a6e3..1b2b5e9e27 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Graph_HappyPath_ZoomInZoomOut.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Graph_HappyPath_ZoomInZoomOut.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/scripting/ImportPathHelper.py
index ec3f6c9a55..5dbfc92e10 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/ImportPathHelper.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ImportPathHelper.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/NewScriptEventButton_HappyPath_ContainsSCCategory.py b/AutomatedTesting/Gem/PythonTests/scripting/NewScriptEventButton_HappyPath_ContainsSCCategory.py
index 6fc4ef2d4c..67949ed18d 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NewScriptEventButton_HappyPath_ContainsSCCategory.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NewScriptEventButton_HappyPath_ContainsSCCategory.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/NodeCategory_ExpandOnClick.py b/AutomatedTesting/Gem/PythonTests/scripting/NodeCategory_ExpandOnClick.py
index 2efd0cd7db..642e9f135a 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NodeCategory_ExpandOnClick.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodeCategory_ExpandOnClick.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/NodeInspector_HappyPath_VariableRenames.py b/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_HappyPath_VariableRenames.py
index f9054b645c..4dbac1d214 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_HappyPath_VariableRenames.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_HappyPath_VariableRenames.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/NodePalette_HappyPath_CanSelectNode.py b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_CanSelectNode.py
index 60c09095ff..5cd6a37a79 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_CanSelectNode.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_CanSelectNode.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/NodePalette_HappyPath_ClearSelection.py b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_ClearSelection.py
index 56c98ee40d..b3bc12b9b5 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_ClearSelection.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_ClearSelection.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/NodePalette_SearchText_Deletion.py b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SearchText_Deletion.py
index 9d2cdee6d9..9c241083ae 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SearchText_Deletion.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SearchText_Deletion.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Node_HappyPath_DuplicateNode.py b/AutomatedTesting/Gem/PythonTests/scripting/Node_HappyPath_DuplicateNode.py
index 49a79ba8a3..cb112ee370 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Node_HappyPath_DuplicateNode.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Node_HappyPath_DuplicateNode.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Pane_Default_RetainOnSCRestart.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_Default_RetainOnSCRestart.py
index 5ebc43419c..87c867d1d2 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Pane_Default_RetainOnSCRestart.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_Default_RetainOnSCRestart.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Pane_HappyPath_DocksProperly.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_DocksProperly.py
index ef9efa2208..4952eefc01 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_DocksProperly.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_DocksProperly.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Pane_HappyPath_OpenCloseSuccessfully.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_OpenCloseSuccessfully.py
index 1c408d8107..223d1d0b0c 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_OpenCloseSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_OpenCloseSuccessfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Pane_HappyPath_ResizesProperly.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_ResizesProperly.py
index edddd7b817..9eee529ad2 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_ResizesProperly.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_ResizesProperly.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Pane_PropertiesChanged_RetainsOnRestart.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_PropertiesChanged_RetainsOnRestart.py
index 8f2b1d3b64..78a925e9a6 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Pane_PropertiesChanged_RetainsOnRestart.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_PropertiesChanged_RetainsOnRestart.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/Pane_Undocked_ClosesSuccessfully.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_Undocked_ClosesSuccessfully.py
index f8d72d1189..cf9546f61f 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Pane_Undocked_ClosesSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_Undocked_ClosesSuccessfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage.py
index 1ec780e707..601d71d01d 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptCanvasTools_Toggle_OpenCloseSuccess.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasTools_Toggle_OpenCloseSuccess.py
index 5e5c045320..1f2994677a 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasTools_Toggle_OpenCloseSuccess.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasTools_Toggle_OpenCloseSuccess.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptCanvas_ChangingAssets_ComponentStable.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets_ComponentStable.py
index 1d381c2b29..ce7817e986 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets_ComponentStable.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets_ComponentStable.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptCanvas_TwoComponents_InteractSuccessfully.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents_InteractSuccessfully.py
index 2fd72972c0..fb189f8308 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents_InteractSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents_InteractSuccessfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptCanvas_TwoEntities_UseSimultaneously.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities_UseSimultaneously.py
index 9256d9b4a0..a547b78e86 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities_UseSimultaneously.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities_UseSimultaneously.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptEvent_AddRemoveMethod_UpdatesInSC.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_AddRemoveMethod_UpdatesInSC.py
index 34fe71caa2..9ddd81e4e7 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_AddRemoveMethod_UpdatesInSC.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_AddRemoveMethod_UpdatesInSC.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptEvent_AddRemoveParameter_ActionsSuccessful.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_AddRemoveParameter_ActionsSuccessful.py
index e7b7bba29c..9feefaa41a 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_AddRemoveParameter_ActionsSuccessful.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_AddRemoveParameter_ActionsSuccessful.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptEvent_HappyPath_CreatedWithoutError.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_HappyPath_CreatedWithoutError.py
index f3c2ccb54b..a74ebb8cb0 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_HappyPath_CreatedWithoutError.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_HappyPath_CreatedWithoutError.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptEvents_AllParamDatatypes_CreationSuccess.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_AllParamDatatypes_CreationSuccess.py
index 07dc27543d..ee7ec5ebc1 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_AllParamDatatypes_CreationSuccess.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_AllParamDatatypes_CreationSuccess.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptEvents_Default_SendReceiveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_Default_SendReceiveSuccessfully.py
index 2f5b73a067..d5897ba09e 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_Default_SendReceiveSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_Default_SendReceiveSuccessfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptEvents_HappyPath_SendReceiveAcrossMultiple.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_HappyPath_SendReceiveAcrossMultiple.py
index eb0edee3da..3dc8b0bd24 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_HappyPath_SendReceiveAcrossMultiple.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_HappyPath_SendReceiveAcrossMultiple.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/ScriptEvents_ReturnSetType_Successfully.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_ReturnSetType_Successfully.py
index 5d4edb94f3..aaca779575 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_ReturnSetType_Successfully.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_ReturnSetType_Successfully.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
index 783b8a3abc..ab22d06eb5 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py
index 94e648e049..9d82b3c8db 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/VariableManager_Default_CreateDeleteVars.py b/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_Default_CreateDeleteVars.py
index b53d2a677c..163cf81812 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_Default_CreateDeleteVars.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_Default_CreateDeleteVars.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/VariableManager_UnpinVariableType_Works.py b/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_UnpinVariableType_Works.py
index b0277aa042..c66febab25 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_UnpinVariableType_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_UnpinVariableType_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripting/__init__.py b/AutomatedTesting/Gem/PythonTests/scripting/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
index 7ef1d56ad1..6e91ae4ea4 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -38,4 +38,30 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         COMPONENT
             Sandbox
     )
-endif()
\ No newline at end of file
+
+    ly_add_pytest(
+        NAME AutomatedTesting::EditorTestWithGPU
+        TEST_REQUIRES gpu
+        PATH ${CMAKE_CURRENT_LIST_DIR}/test_Editor_NewExistingLevels_Works.py
+        TIMEOUT 100
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            AZ::PythonBindingsExample
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+    )
+
+    ly_add_pytest(
+        NAME AutomatedTesting::GameLauncherWithGPU
+        TEST_REQUIRES gpu
+        PATH ${CMAKE_CURRENT_LIST_DIR}/test_GameLauncher_EnterExitGameMode_Works.py
+        TIMEOUT 100
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            AZ::PythonBindingsExample
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+    )
+endif()
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/Editor_NewExistingLevels_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/Editor_NewExistingLevels_Works.py
index 98f08ab9fa..656bca0323 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/Editor_NewExistingLevels_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/Editor_NewExistingLevels_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/__init__.py b/AutomatedTesting/Gem/PythonTests/smoke/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/test_CLITool_AssetBuilder_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetBuilder_Works.py
index 37b1a80f1c..02e36c93f3 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetBuilder_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetBuilder_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/test_CLITool_AssetBundlerBatch_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetBundlerBatch_Works.py
index f03a56e489..48092accc7 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetBundlerBatch_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetBundlerBatch_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/test_CLITool_AssetProcessorBatch_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetProcessorBatch_Works.py
index dbb08f8150..ee8da64638 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetProcessorBatch_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetProcessorBatch_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/test_CLITool_AzTestRunner_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AzTestRunner_Works.py
index 6d47ba87e7..98955fdfcb 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AzTestRunner_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AzTestRunner_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/test_CLITool_PythonBindingsExample_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_PythonBindingsExample_Works.py
index f7b209d5f7..9d9b4fbefe 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_PythonBindingsExample_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_PythonBindingsExample_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/test_CLITool_SerializeContextTools_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_SerializeContextTools_Works.py
index 715754f229..525598a6dc 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_SerializeContextTools_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_SerializeContextTools_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/test_Editor_NewExistingLevels_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
index 56cd0e2f6e..ae14edcae5 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
@@ -1,7 +1,10 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
 
 SPDX-License-Identifier: Apache-2.0 OR MIT
+
+
+Test should run in both gpu and non gpu
 """
 
 import pytest
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_LoadLevel_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_LoadLevel_Works.py
new file mode 100644
index 0000000000..80da990332
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_LoadLevel_Works.py
@@ -0,0 +1,104 @@
+"""
+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
+
+
+UI Apps: AutomatedTesting.GameLauncher
+Launch AutomatedTesting.GameLauncher with Simple level
+Test should run in both gpu and non gpu
+"""
+
+import pytest
+import psutil
+
+# Bail on the test if ly_test_tools doesn't exist.
+pytest.importorskip("ly_test_tools")
+import ly_test_tools.environment.waiter as waiter
+from ly_remote_console.remote_console_commands import RemoteConsole as RemoteConsole
+from ly_remote_console.remote_console_commands import (
+    send_command_and_expect_response as send_command_and_expect_response,
+)
+
+
+@pytest.mark.parametrize("launcher_platform", ["windows"])
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+@pytest.mark.parametrize("level", ["Simple"])
+@pytest.mark.SUITE_sandbox
+class TestRemoteConsoleLoadLevelWorks(object):
+    @pytest.fixture
+    def remote_console_instance(self, request):
+        console = RemoteConsole()
+
+        def teardown():
+            if console.connected:
+                console.stop()
+
+        request.addfinalizer(teardown)
+
+        return console
+
+    def test_RemoteConsole_LoadLevel_Works(self, launcher, level, remote_console_instance, launcher_platform):
+        expected_lines = ['Level system is loading "Simple"']
+
+        self.launch_and_validate_results_launcher(launcher, level, remote_console_instance, expected_lines)
+
+    def launch_and_validate_results_launcher(
+        self,
+        launcher,
+        level,
+        remote_console_instance,
+        expected_lines,
+        null_renderer=False,
+        port_listener_timeout=120,
+        log_monitor_timeout=300,
+        remote_console_port=4600,
+    ):
+        """
+        Runs the launcher with the specified level, and monitors Game.log for expected lines.
+        :param launcher: Configured launcher object to run test against.
+        :param level: The level to load in the launcher.
+        :param remote_console_instance: Configured Remote Console object.
+        :param expected_lines: Expected lines to search log for.
+        :oaram null_renderer: Specifies the test does not require the renderer. Defaults to True.
+        :param port_listener_timeout: Timeout for verifying successful connection to Remote Console.
+        :param log_monitor_timeout: Timeout for monitoring for lines in Game.log
+        :param remote_console_port: The port used to communicate with the Remote Console.
+        """
+
+        def _check_for_listening_port(port):
+            """
+            Checks to see if the connection to the designated port was established.
+            :param port: Port to listen to.
+            :return: True if port is listening.
+            """
+            port_listening = False
+            for conn in psutil.net_connections():
+                if "port={}".format(port) in str(conn):
+                    port_listening = True
+            return port_listening
+
+        if null_renderer:
+            launcher.args.extend(["-NullRenderer"])
+
+        # Start the Launcher
+        with launcher.start():
+
+            # Ensure Remote Console can be reached
+            waiter.wait_for(
+                lambda: _check_for_listening_port(remote_console_port),
+                port_listener_timeout,
+                exc=AssertionError("Port {} not listening.".format(remote_console_port)),
+            )
+            remote_console_instance.start(timeout=30)
+
+            # Load the specified level in the launcher
+            send_command_and_expect_response(
+                remote_console_instance, f"loadlevel {level}", "LEVEL_LOAD_END", timeout=30
+            )
+
+            # Monitor the console for expected lines
+            for line in expected_lines:
+                assert remote_console_instance.expect_log_line(
+                    line, log_monitor_timeout
+                ), f"Expected line not found: {line}"
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_StaticTools_GenPakShaders_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_StaticTools_GenPakShaders_Works.py
index db61f5e031..ec79bb4a15 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_StaticTools_GenPakShaders_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_StaticTools_GenPakShaders_Works.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/smoke/test_UIApps_AssetProcessor_CheckIdle.py b/AutomatedTesting/Gem/PythonTests/smoke/test_UIApps_AssetProcessor_CheckIdle.py
index e26b1a3558..d4e11e20cf 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_UIApps_AssetProcessor_CheckIdle.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_UIApps_AssetProcessor_CheckIdle.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/streaming/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/streaming/CMakeLists.txt
index 4639aff70e..d6f3f30ba9 100644
--- a/AutomatedTesting/Gem/PythonTests/streaming/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/streaming/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/streaming/__init__.py b/AutomatedTesting/Gem/PythonTests/streaming/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/AutomatedTesting/Gem/PythonTests/streaming/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/streaming/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/streaming/benchmark/__init__.py b/AutomatedTesting/Gem/PythonTests/streaming/benchmark/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/AutomatedTesting/Gem/PythonTests/streaming/benchmark/__init__.py
+++ b/AutomatedTesting/Gem/PythonTests/streaming/benchmark/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/streaming/benchmark/asset_load_benchmark_test.py b/AutomatedTesting/Gem/PythonTests/streaming/benchmark/asset_load_benchmark_test.py
index 8fd20145fc..a2c41f1073 100755
--- a/AutomatedTesting/Gem/PythonTests/streaming/benchmark/asset_load_benchmark_test.py
+++ b/AutomatedTesting/Gem/PythonTests/streaming/benchmark/asset_load_benchmark_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/Contents.json b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/Contents.json
index f836f07ee7..5ea213954f 100644
--- a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,5 +1,41 @@
 {
   "images" : [
+    {
+      "extent" : "full-screen",
+      "filename" : "iPhoneLaunchImage1242x2688.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "12.0",
+      "orientation" : "portrait",
+      "scale" : "3x",
+      "subtype" : "2688h"
+    },
+    {
+      "extent" : "full-screen",
+      "filename" : "iPhoneLaunchImage2688x1242.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "12.0",
+      "orientation" : "landscape",
+      "scale" : "3x",
+      "subtype" : "2688h"
+    },
+    {
+      "extent" : "full-screen",
+      "filename" : "iPhoneLaunchImage828x1792.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "12.0",
+      "orientation" : "portrait",
+      "scale" : "2x",
+      "subtype" : "1792h"
+    },
+    {
+      "extent" : "full-screen",
+      "filename" : "iPhoneLaunchImage1792x828.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "12.0",
+      "orientation" : "landscape",
+      "scale" : "2x",
+      "subtype" : "1792h"
+    },
     {
       "extent" : "full-screen",
       "idiom" : "iphone",
@@ -166,4 +202,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
\ No newline at end of file
+}
diff --git a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage1242x2688.png b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage1242x2688.png
new file mode 100644
index 0000000000..e190d2b585
--- /dev/null
+++ b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage1242x2688.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc79117e25cc7533ccf6724453e3f44a01b4eaaecded6fa826abe897456f36ee
+size 405896
diff --git a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage1792x828.png b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage1792x828.png
new file mode 100644
index 0000000000..5601f081de
--- /dev/null
+++ b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage1792x828.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c7191be3bdae09dc621012a26b0c1b9c15de1d567cf65ff1079e00f8636a32a
+size 220720
diff --git a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage2688x1242.png b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage2688x1242.png
new file mode 100644
index 0000000000..844b23fdd9
--- /dev/null
+++ b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage2688x1242.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfbd362f9cb5f285c23807a032af98150cf5409c514445122683736a3c65008c
+size 364976
diff --git a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage828x1792.png b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage828x1792.png
new file mode 100644
index 0000000000..9ebb93e39c
--- /dev/null
+++ b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage828x1792.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0252b068b232f521ac6eca4a708fad6eaf257d0a66aa03f4f865f6a0b219cfc
+size 236433
diff --git a/AutomatedTesting/Levels/AI/NavigationComponentTest/NavigationAgent.lua b/AutomatedTesting/Levels/AI/NavigationComponentTest/NavigationAgent.lua
index e0c4d60578..4008a9987c 100644
--- a/AutomatedTesting/Levels/AI/NavigationComponentTest/NavigationAgent.lua
+++ b/AutomatedTesting/Levels/AI/NavigationComponentTest/NavigationAgent.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Levels/AWS/Metrics/Script/Metrics.lua b/AutomatedTesting/Levels/AWS/Metrics/Script/Metrics.lua
index dce6522eda..feb806b43f 100644
--- a/AutomatedTesting/Levels/AWS/Metrics/Script/Metrics.lua
+++ b/AutomatedTesting/Levels/AWS/Metrics/Script/Metrics.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/LuaScripts/instance_counter_blender.lua b/AutomatedTesting/LuaScripts/instance_counter_blender.lua
index 49cf68e67f..efb267b949 100644
--- a/AutomatedTesting/LuaScripts/instance_counter_blender.lua
+++ b/AutomatedTesting/LuaScripts/instance_counter_blender.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Materials/UVs.azsl b/AutomatedTesting/Materials/UVs.azsl
index 2894d4de85..8a818bf4d3 100644
--- a/AutomatedTesting/Materials/UVs.azsl
+++ b/AutomatedTesting/Materials/UVs.azsl
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/ShaderLib/scenesrg.srgi b/AutomatedTesting/ShaderLib/scenesrg.srgi
index 77a95b2ba6..00ff9d3ce0 100644
--- a/AutomatedTesting/ShaderLib/scenesrg.srgi
+++ b/AutomatedTesting/ShaderLib/scenesrg.srgi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/ShaderLib/viewsrg.srgi b/AutomatedTesting/ShaderLib/viewsrg.srgi
index 014b0a271d..f765abf5b0 100644
--- a/AutomatedTesting/ShaderLib/viewsrg.srgi
+++ b/AutomatedTesting/ShaderLib/viewsrg.srgi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Shaders/CommonVS.azsli b/AutomatedTesting/Shaders/CommonVS.azsli
index d138970aa8..129800b66d 100644
--- a/AutomatedTesting/Shaders/CommonVS.azsli
+++ b/AutomatedTesting/Shaders/CommonVS.azsli
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/TestAssets/test_chunks_builder.py b/AutomatedTesting/TestAssets/test_chunks_builder.py
index d8134fb259..ab9422ebbf 100755
--- a/AutomatedTesting/TestAssets/test_chunks_builder.py
+++ b/AutomatedTesting/TestAssets/test_chunks_builder.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/test1.lua b/AutomatedTesting/test1.lua
index 6846eda0a7..b98529b28e 100644
--- a/AutomatedTesting/test1.lua
+++ b/AutomatedTesting/test1.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/test2.lua b/AutomatedTesting/test2.lua
index c76d79397d..0a678f256d 100644
--- a/AutomatedTesting/test2.lua
+++ b/AutomatedTesting/test2.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/CMakeLists.txt b/CMakeLists.txt
index 497f56f56d..282b8c03b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/CMakeLists.txt b/Code/CMakeLists.txt
index 91807c8eb0..6dcb99edb4 100644
--- a/Code/CMakeLists.txt
+++ b/Code/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
 #
 
-add_subdirectory(CryEngine)
 add_subdirectory(Framework)
 add_subdirectory(LauncherUnified)
-add_subdirectory(Sandbox)
+add_subdirectory(Legacy)
+add_subdirectory(Editor)
 add_subdirectory(Tools)
diff --git a/Code/CryEngine/CMakeLists.txt b/Code/CryEngine/CMakeLists.txt
deleted file mode 100644
index 329bbca3fe..0000000000
--- a/Code/CryEngine/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-add_subdirectory(CryCommon)
-add_subdirectory(CrySystem)
diff --git a/Code/CryEngine/CryCommon/AndroidSpecific.h b/Code/CryEngine/CryCommon/AndroidSpecific.h
deleted file mode 100644
index 49c2e5fa46..0000000000
--- a/Code/CryEngine/CryCommon/AndroidSpecific.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Specific to Android declarations, inline functions etc.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ANDROIDSPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_ANDROIDSPECIFIC_H
-#pragma once
-
-#if defined(__arm__) || defined(__aarch64__)
-#define _CPU_ARM
-#endif
-
-#if defined(__aarch64__)
-#define PLATFORM_64BIT
-#endif
-
-#if defined(__ARM_NEON__)
-#define _CPU_NEON
-#endif
-
-#ifndef MOBILE
-#define MOBILE
-#endif
-
-#if (defined(__clang__) && NDK_REV_MAJOR >= 14) || (defined(_CPU_ARM) && defined(PLATFORM_64BIT))
-    // The version of clang that NDK r14+ ships with is seemingly generating different (for better or worse) code for the atomic operations
-    // used in the LocklessLinkedList.  In either case, this is causing deadlocks in the job system and crashes from memory stomps in
-    // the bucket allocator.  By defining INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED it will disable the Cry job system as well as
-    // change the implementation of the LocklessLinkedList to use a mutex in it's operations instead, essentially use the same behaviour
-    // as iOS.  While not ideal to use this as a band-aid on the problem, it does fix it with a negligible performance impact.
-    //
-    // Additionally, arm64 processors do not provide a cmpxchg16b (or equivalent) instruction required for _InterlockedCompareExchange128
-    #define INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED
-#endif
-
-// Force all allocations to be aligned to TARGET_DEFAULT_ALIGN.
-// This is because malloc on Android 32 bit returns memory that is not aligned
-// to what some structs/classes need.
-#define CRY_FORCE_MALLOC_NEW_ALIGN
-
-#define DEBUG_BREAK raise(SIGTRAP)
-#define RC_EXECUTABLE "rc"
-#define USE_CRT 1
-#define SIZEOF_PTR 4
-
-//////////////////////////////////////////////////////////////////////////
-// Standard includes.
-//////////////////////////////////////////////////////////////////////////
-#include <malloc.h>
-#include <stdint.h>
-#include <fcntl.h>
-#include <float.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <ctype.h>
-#include <sys/socket.h>
-#include <errno.h>
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Define platform independent types.
-//////////////////////////////////////////////////////////////////////////
-#include "BaseTypes.h"
-
-typedef signed long long  INT64;
-
-typedef double real;
-
-typedef uint32              DWORD;
-typedef DWORD*              LPDWORD;
-#if defined(PLATFORM_64BIT)
-typedef uint64              DWORD_PTR;
-#else
-typedef DWORD               DWORD_PTR;
-#endif
-typedef intptr_t INT_PTR, *PINT_PTR;
-typedef uintptr_t UINT_PTR, * PUINT_PTR;
-typedef char* LPSTR, * PSTR;
-typedef uint64      __uint64;
-typedef int64       INT64;
-typedef uint64      UINT64;
-
-typedef long LONG_PTR, * PLONG_PTR, * PLONG;
-typedef unsigned long ULONG_PTR, * PULONG_PTR;
-
-typedef unsigned char               BYTE;
-typedef unsigned short          WORD;
-typedef void*                               HWND;
-typedef UINT_PTR                        WPARAM;
-typedef LONG_PTR                        LPARAM;
-typedef LONG_PTR                        LRESULT;
-#define PLARGE_INTEGER LARGE_INTEGER *
-typedef const char* LPCSTR, * PCSTR;
-typedef long long                       LONGLONG;
-typedef ULONG_PTR                       SIZE_T;
-typedef unsigned char               byte;
-
-#define ILINE __forceinline
-
-#define _A_RDONLY (0x01)
-#define _A_SUBDIR (0x10)
-
-//////////////////////////////////////////////////////////////////////////
-// Win32 FileAttributes.
-//////////////////////////////////////////////////////////////////////////
-#define FILE_ATTRIBUTE_READONLY             0x00000001
-#define FILE_ATTRIBUTE_HIDDEN               0x00000002
-#define FILE_ATTRIBUTE_SYSTEM               0x00000004
-#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
-#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
-#define FILE_ATTRIBUTE_DEVICE               0x00000040
-#define FILE_ATTRIBUTE_NORMAL               0x00000080
-#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
-#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
-#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
-#define FILE_ATTRIBUTE_COMPRESSED           0x00000800
-#define FILE_ATTRIBUTE_OFFLINE              0x00001000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
-#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
-
-#define INVALID_FILE_ATTRIBUTES (-1)
-
-#define DEFINE_ALIGNED_DATA(type, name, alignment) \
-    type __attribute__ ((aligned(alignment))) name;
-#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) \
-    static type __attribute__ ((aligned(alignment))) name;
-#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) \
-    const type __attribute__ ((aligned(alignment))) name;
-
-#include "LinuxSpecific.h"
-// these functions do not exist int the wchar.h header
-#undef wscasecomp
-#undef wscasencomp
-extern int wcsicmp (const wchar_t* s1, const wchar_t* s2);
-extern int wcsnicmp (const wchar_t* s1, const wchar_t* s2, size_t count);
-
-// these are not defined in android-19 and prior
-#undef wcsnlen
-extern size_t wcsnlen(const wchar_t* str, size_t maxLen);
-
-#undef stpcpy
-extern char* stpcpy(char* dest, const char* str);
-// end android-19
-
-
-#define TARGET_DEFAULT_ALIGN (16U)
-
-#ifdef _RELEASE
-    #define __debugbreak()
-#else
-    #define __debugbreak() __builtin_trap()
-#endif
-
-// there is no __finite in android, only variants of isfinite
-#undef __finite
-#if NDK_REV_MAJOR >= 16
-    #define __finite isfinite
-#else
-    #define __finite __isfinite
-#endif
-
-#define S_IWRITE S_IWUSR
-
-#define ILINE __forceinline
-#define _A_RDONLY (0x01)
-#define _A_SUBDIR (0x10)
-#define _A_HIDDEN (0x02)
-
-
-#include <android/api-level.h>
-
-#if __ANDROID_API__ == 19
-    // The following were apparently introduced in API 21, however in earlier versions of the
-    // platform specific headers they were defines.  In the move to unified headers, the follwoing
-    // defines were removed from stat.h
-    #ifndef stat64
-        #define stat64 stat
-    #endif
-
-    #ifndef fstat64
-        #define fstat64 fstat
-    #endif
-
-    #ifndef lstat64
-        #define lstat64 lstat
-    #endif
-#endif // __ANDROID_API__ == 19
-
-
-// std::stoull deosn't exist on android, so we need to define it
-namespace std
-{
-    inline unsigned long long stoull(const std::string& str, size_t* idx = 0, int base = 10)
-    {
-        const char* start = str.c_str();
-        char* end = nullptr;
-        unsigned long long result = strtoull(start, &end, base);
-        if (idx)
-        {
-            *idx = end - start;
-        }
-        return result;
-    }
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_ANDROIDSPECIFIC_H
diff --git a/Code/CryEngine/CryCommon/AnimKey.h b/Code/CryEngine/CryCommon/AnimKey.h
deleted file mode 100644
index 9c5b91ab2d..0000000000
--- a/Code/CryEngine/CryCommon/AnimKey.h
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ANIMKEY_H
-#define CRYINCLUDE_CRYCOMMON_ANIMKEY_H
-#pragma once
-
-#include <IConsole.h> // <> required for Interfuscator
-#include <ISystem.h>
-#include <Cry_Color.h>
-#include <AzCore/Math/Color.h>
-#include <AzCore/Component/EntityId.h>
-
-enum EAnimKeyFlags
-{
-    AKEY_SELECTED = 0x01,       //! This key is selected in track view.
-    AKEY_SORT_MARKER = 0x02     //! Internal use to locate a key after a sort.
-};
-
-//! Interface to animation key.
-//! Not real interface though...
-//! No virtuals for optimization reason.
-struct IKey
-{
-    float time;
-    int flags;
-
-    // compare keys.
-    bool operator<(const IKey& key) const { return time < key.time; }
-    bool operator==(const IKey& key) const { return time == key.time; }
-    bool operator>(const IKey& key) const { return time > key.time; }
-    bool operator<=(const IKey& key) const { return time <= key.time; }
-    bool operator>=(const IKey& key) const { return time >= key.time; }
-    bool operator!=(const IKey& key) const { return time != key.time; }
-
-    IKey()
-        : time(0)
-        , flags(0) {};
-
-    virtual ~IKey() = default;
-};
-
-/** I2DBezierKey used in float tracks.
-        Its x component actually represents kinda time-warping curve.
-*/
-struct I2DBezierKey
-    : public IKey
-{
-    Vec2 value;
-};
-
-/** ITcbKey used in all TCB tracks.
-*/
-struct ITcbKey
-    : public IKey
-{
-    // Values.
-    float fval[4];
-    // Key controls.
-    float tens;         //!< Key tension value.
-    float cont;       //!< Key continuity value.
-    float bias;       //!< Key bias value.
-    float easeto;     //!< Key ease to value.
-    float easefrom;   //!< Key ease from value.
-
-    //! Protect from direct instantiation of this class.
-    //! Only derived classes can be created,
-    ITcbKey()
-    {
-        fval[0] = 0;
-        fval[1] = 0;
-        fval[2] = 0;
-        fval[3] = 0;
-        tens = 0, cont = 0, bias = 0, easeto = 0, easefrom = 0;
-    };
-
-    void SetFloat(float val) { fval[0] = val; };
-    void SetVec3(const Vec3& val)
-    {
-        fval[0] = val.x;
-        fval[1] = val.y;
-        fval[2] = val.z;
-    };
-    void SetQuat(const Quat& val)
-    {
-        fval[0] = val.v.x;
-        fval[1] = val.v.y;
-        fval[2] = val.v.z;
-        fval[3] = val.w;
-    };
-
-    ILINE void SetValue(float val)             { SetFloat(val);   }
-    ILINE void SetValue(const Vec3& val) { SetVec3(val); }
-    ILINE void SetValue(const Quat& val) { SetQuat(val); }
-
-    float GetFloat() const { return *((float*)fval); };
-    Vec3 GetVec3() const
-    {
-        Vec3 vec;
-        vec.x = fval[0];
-        vec.y = fval[1];
-        vec.z = fval[2];
-        return vec;
-    };
-    Quat GetQuat() const
-    {
-        Quat quat;
-        quat.v.x = fval[0];
-        quat.v.y = fval[1];
-        quat.v.z = fval[2];
-        quat.w = fval[3];
-        return quat;
-    };
-    ILINE void GetValue(float& val) { val = GetFloat(); };
-    ILINE void GetValue(Vec3& val)  { val = GetVec3(); };
-    ILINE void GetValue(Quat& val)  { val = GetQuat(); };
-};
-
-struct IEventKey
-    : public IKey
-{
-    AZStd::string event;
-    AZStd::string eventValue;
-    AZStd::string animation;
-    AZStd::string target;
-
-    union
-    {
-        float value;
-        float duration;
-    };
-    bool bNoTriggerInScrubbing;
-
-    IEventKey()
-    {
-        duration = 0;
-        bNoTriggerInScrubbing = false;
-    }
-};
-
-/** ISelectKey used in Camera selection track or Scene node.
-*/
-struct ISelectKey
-    : public IKey
-{
-    AZStd::string szSelection;        //!< Node name.
-    AZ::EntityId cameraAzEntityId;    // will be Invalid for legacy Cameras
-    float fDuration;
-    float fBlendTime;
-
-    ISelectKey()
-    {
-        fDuration = 0;
-        fBlendTime = 0;
-    }
-};
-
-/** ISequenceKey used in sequence track.
-*/
-struct ISequenceKey
-    : public IKey
-{
-    AZStd::string szSelection;          //!@deprecated : use sequenceEntityId to identify sequences
-    AZ::EntityId sequenceEntityId;
-    float fDuration;
-    float fStartTime;
-    float fEndTime;
-    bool bOverrideTimes;
-    bool  bDoNotStop;
-
-    ISequenceKey()
-    {
-        fDuration = 0;
-        fStartTime = 0;
-        fEndTime = 0;
-        bOverrideTimes = false;
-        bDoNotStop = false; // default crysis behaviour
-    }
-};
-
-/** ISoundKey used in sound track.
-*/
-struct ISoundKey
-    : public IKey
-{
-    ISoundKey()
-        : fDuration(0.0f)
-    {
-        customColor.x = Col_TrackviewDefault.r;
-        customColor.y = Col_TrackviewDefault.g;
-        customColor.z = Col_TrackviewDefault.b;
-    }
-
-    AZStd::string sStartTrigger;
-    AZStd::string sStopTrigger;
-    float         fDuration;
-    Vec3          customColor;
-};
-
-/** ITimeRangeKey used in time ranges animation track.
-*/
-#define ANIMKEY_TIME_RANGE_END_TIME_UNSET .0f
-struct ITimeRangeKey
-    : public IKey
-{
-    float m_duration;       //!< Duration in seconds of this animation.
-    float m_startTime;      //!< Start time of this animation (Offset from beginning of animation).
-    float m_endTime;        //!< End time of this animation (can be smaller than the duration).
-    float m_speed;          //!< Speed multiplier for this key.
-    bool  m_bLoop;          //!< True if time is looping
-
-    ITimeRangeKey()
-    {
-        m_duration = 0.0f;
-        m_endTime = ANIMKEY_TIME_RANGE_END_TIME_UNSET;
-        m_startTime = 0.0f;
-        m_speed = 1.0f;
-        m_bLoop = false;
-    }
-
-    float GetValidEndTime() const
-    {
-        float endTime = m_endTime;
-        if (endTime == ANIMKEY_TIME_RANGE_END_TIME_UNSET || (!m_bLoop && endTime > m_duration))
-        {
-            endTime = m_duration;
-        }
-        return endTime;
-    }
-
-    float GetValidSpeed() const
-    {
-        float speed = m_speed;
-        if (speed <= 0.0f)
-        {
-            speed = 1.0f;
-        }
-        return speed;
-    }
-
-    float GetActualDuration() const
-    {
-        return (GetValidEndTime() - m_startTime) / GetValidSpeed();
-    }
-
-    // Return true if the input time falls in range of the start/end time for this key.
-    bool IsInRange(float sequenceTime) const
-    {
-        return sequenceTime >= time && sequenceTime <= (time + GetActualDuration());
-    }
-};
-
-/** ICharacterKey used in Character animation track.
-*/
-struct ICharacterKey
-    : public ITimeRangeKey
-{
-    AZStd::string m_animation;      //!< Name of character animation.
-    bool m_bBlendGap;               //!< True if gap to next animation should be blended
-    bool m_bInPlace;                // Play animation in place (Do not move root).
-
-    ICharacterKey()
-        : ITimeRangeKey()
-    {
-        m_bLoop = false;
-        m_bBlendGap = false;
-        m_bInPlace = false;
-    }
-};
-
-/** IExprKey used in expression animation track.
-*/
-struct IExprKey
-    : public IKey
-{
-    IExprKey()
-    {
-        pszName[0] = 0;
-        fAmp = 1.0f;
-        fBlendIn = 0.5f;
-        fHold = 1.0f;
-        fBlendOut = 0.5f;
-    }
-    char pszName[128];  //!< Name of morph-target
-    float fAmp;
-    float fBlendIn;
-    float fHold;
-    float fBlendOut;
-};
-
-/** IConsoleKey used in Console track, triggers console commands and variables.
-*/
-struct IConsoleKey
-    : public IKey
-{
-    AZStd::string command;
-};
-
-struct ILookAtKey
-    : public IKey
-{
-    AZStd::string szSelection;  //!< Node name.
-    float fDuration;
-    AZStd::string lookPose;
-    float smoothTime;
-
-    ILookAtKey()
-    {
-        fDuration = 0;
-        smoothTime = 0.2f;
-    }
-};
-
-//! Discrete (non-interpolated) float key.
-struct IDiscreteFloatKey
-    : public IKey
-{
-    float m_fValue;
-
-    void SetValue(float fValue)
-    {
-        m_fValue = fValue;
-    }
-
-    IDiscreteFloatKey()
-    {
-        m_fValue = -1.0f;
-    }
-};
-
-//! A key for the capture track.
-struct ICaptureKey
-    : public IKey
-{
-    friend class AnimSerializer;
-
-    AZStd::string folder;
-    AZStd::string prefix;
-    float duration;
-    float timeStep;
-    bool once;
-
-    ICaptureKey()
-        : IKey()
-        , duration(0.0f)
-        , timeStep(0.033f)
-        , once(false)
-    {
-        ICVar* pCaptureFolderCVar = gEnv->pConsole->GetCVar("capture_folder");
-        if (pCaptureFolderCVar != NULL  && pCaptureFolderCVar->GetString())
-        {
-            folder = pCaptureFolderCVar->GetString();
-        }
-        ICVar* pCaptureFilePrefixCVar = gEnv->pConsole->GetCVar("capture_file_prefix");
-        if (pCaptureFilePrefixCVar != NULL  && pCaptureFilePrefixCVar->GetString())
-        {
-            prefix = pCaptureFilePrefixCVar->GetString();
-        }
-    }
-
-    ICaptureKey(const ICaptureKey& other)
-        : IKey(other)
-        , folder(other.folder)
-        , prefix(other.prefix)
-        , duration(other.duration)
-        , timeStep(other.timeStep)
-        , once(other.once)
-    {
-    }
-};
-
-//! Boolean key.
-struct IBoolKey
-    : public IKey
-{
-    IBoolKey() {};
-};
-
-//! Comment Key.
-struct ICommentKey
-    : public IKey
-{
-    enum ETextAlign : int
-    {
-        eTA_Left    =   0,
-        eTA_Center  =   BIT(1),
-        eTA_Right   =   BIT(2)
-    };
-
-    //-----------------------------------------------------------------------------
-    //!
-    ICommentKey()
-        : m_duration(1.f)
-        , m_size(1.f)
-        , m_align(eTA_Left)
-        , m_strFont("default")
-        , m_color(1.f, 1.f, 1.f, 1.f)
-    {
-    }
-
-    //-----------------------------------------------------------------------------
-    //!
-    ICommentKey(const ICommentKey& other)
-        : IKey(other)
-        , m_strComment(other.m_strComment)
-        , m_strFont(other.m_strFont)
-    {
-        m_duration = other.m_duration;
-        m_color = other.m_color;
-        m_size = other.m_size;
-        m_align = other.m_align;
-    }
-
-    AZStd::string m_strComment;
-    float   m_duration;
-
-    AZStd::string m_strFont;
-    AZ::Color    m_color;
-    float   m_size;
-    ETextAlign  m_align;
-};
-
-//-----------------------------------------------------------------------------
-//!
-struct IScreenFaderKey
-    : public IKey
-{
-    //-----------------------------------------------------------------------------
-    //!
-    enum EFadeType : int
-    {
-        eFT_FadeIn = 0, eFT_FadeOut = 1
-    };
-    enum EFadeChangeType : int
-    {
-        eFCT_Linear = 0, eFCT_Square = 1, eFCT_CubicSquare = 2, eFCT_SquareRoot = 3, eFCT_Sin = 4
-    };
-
-    //-----------------------------------------------------------------------------
-    //!
-    IScreenFaderKey()
-        : IKey()
-        , m_fadeTime(2.f)
-        , m_bUseCurColor(true)
-        , m_fadeType(eFT_FadeOut)
-        , m_fadeChangeType(eFCT_Linear)
-    {
-        m_fadeColor = AZ::Color(.0f, .0f, .0f, 1.0f);
-    }
-
-    //-----------------------------------------------------------------------------
-    //!
-    IScreenFaderKey(const IScreenFaderKey& other)
-        : IKey(other)
-        , m_fadeTime(other.m_fadeTime)
-        , m_bUseCurColor(other.m_bUseCurColor)
-        , m_fadeType(other.m_fadeType)
-        , m_fadeChangeType(other.m_fadeChangeType)
-    {
-        m_fadeColor = other.m_fadeColor;
-        m_strTexture = other.m_strTexture;
-    }
-
-    //-----------------------------------------------------------------------------
-    //!
-    float       m_fadeTime;
-    AZ::Color   m_fadeColor;
-    AZStd::string m_strTexture;
-    bool        m_bUseCurColor;
-    EFadeType   m_fadeType;
-    EFadeChangeType m_fadeChangeType;
-};
-
-namespace AZ
-{
-    AZ_TYPE_INFO_SPECIALIZE(IKey, "{680BD51E-C106-4BBF-9A6F-CD551E00519F}");
-    AZ_TYPE_INFO_SPECIALIZE(IBoolKey, "{DBF8044F-6E64-403D-807D-F3152F640703}");
-    AZ_TYPE_INFO_SPECIALIZE(ICaptureKey, "{93AA8D63-6B1E-4D33-8CC3-C82147BB95CB}");
-    AZ_TYPE_INFO_SPECIALIZE(ICharacterKey, "{6D1FB9E2-128C-4B33-84FF-4F696C1F7D53}");
-    AZ_TYPE_INFO_SPECIALIZE(ICommentKey, "{99C2234E-A4DD-45D1-90C3-D5AFC54FA47F}");
-    AZ_TYPE_INFO_SPECIALIZE(IConsoleKey, "{8C0DCB9B-297D-4AF4-A0D1-F5160E6900E8}");
-    AZ_TYPE_INFO_SPECIALIZE(IDiscreteFloatKey, "{469A2B90-E019-4147-A53F-2EB42E179596}");
-    AZ_TYPE_INFO_SPECIALIZE(IEventKey, "{F09533AA-9780-494D-9E5C-8CB98266AC5E}");
-    AZ_TYPE_INFO_SPECIALIZE(ILookAtKey, "{6F4CED0E-D83A-40E2-B7BF-038D82BC0374}");
-    AZ_TYPE_INFO_SPECIALIZE(IScreenFaderKey, "{FA15E27D-603F-4829-925A-E36D75C93964}");
-    AZ_TYPE_INFO_SPECIALIZE(ISelectKey, "{FCEADCF5-042E-473B-845F-0778F087B6DC}");
-    AZ_TYPE_INFO_SPECIALIZE(ISequenceKey, "{B55294AD-F14E-43AC-B6B5-AC27B377FE00}");
-    AZ_TYPE_INFO_SPECIALIZE(ISoundKey, "{452E50CF-B7D0-42D5-A86A-B295682674BB}");
-    AZ_TYPE_INFO_SPECIALIZE(ITimeRangeKey, "{17807C95-C7A1-481B-AD94-C54D83928D0B}");
-}
-#endif // CRYINCLUDE_CRYCOMMON_ANIMKEY_H
diff --git a/Code/CryEngine/CryCommon/AppleSpecific.h b/Code/CryEngine/CryCommon/AppleSpecific.h
deleted file mode 100644
index 93b1c974ab..0000000000
--- a/Code/CryEngine/CryCommon/AppleSpecific.h
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Apple specific declarations common amongst its products
-
-#ifndef CRYINCLUDE_CRYCOMMON_APPLESPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_APPLESPECIFIC_H
-#pragma once
-
-#if defined(__clang__)
-#pragma diagnostic ignore "-W#pragma-messages"
-#endif
-
-
-#define DEBUG_BREAK __builtin_trap()
-#define RC_EXECUTABLE "rc"
-
-//////////////////////////////////////////////////////////////////////////
-// Standard includes.
-//////////////////////////////////////////////////////////////////////////
-#include <stdlib.h>
-#include <stdint.h>
-#include <math.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <ctype.h>
-#include <limits.h>
-#include <signal.h>
-#include <unistd.h>
-#include <errno.h>
-#include <malloc/malloc.h>
-#include <Availability.h>
-// Atomic operations , guaranteed to work across all apple platforms
-#include <libkern/OSAtomic.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string>
-//////////////////////////////////////////////////////////////////////////
-
-#define FP16_MESH
-#define BOOST_DISABLE_WIN32
-
-#ifndef __COUNTER__
-#define __COUNTER__ __LINE__
-#endif
-
-#ifdef __FUNC__
-#undef __FUNC__
-#endif
-
-#define __FUNC__ __func__
-
-typedef void*                               LPVOID;
-#define VOID                    void
-#define PVOID                               void*
-
-typedef unsigned int UINT;
-typedef char CHAR;
-typedef float FLOAT;
-
-#define PHYSICS_EXPORTS
-
-// MSVC compiler-specific keywords
-#define __forceinline inline
-#define _inline inline
-#define __cdecl
-#define _cdecl
-#define __stdcall
-#define _stdcall
-#define __fastcall
-#define _fastcall
-#define IN
-#define OUT
-
-#define MAP_ANONYMOUS MAP_ANON
-
-//////////////////////////////////////////////////////////////////////////
-// Define platform independent types.
-//////////////////////////////////////////////////////////////////////////
-#include "BaseTypes.h"
-
-typedef double real;
-
-typedef uint32          DWORD;
-typedef DWORD*          LPDWORD;
-typedef uint64                          DWORD_PTR;
-typedef intptr_t INT_PTR, * PINT_PTR;
-typedef uintptr_t UINT_PTR, * PUINT_PTR;
-typedef char* LPSTR, * PSTR;
-typedef char TCHAR;
-typedef uint64          __uint64;
-#if !defined(__clang__)
-typedef int64               __int64;
-#endif
-typedef int64               INT64;
-typedef uint64          UINT64;
-
-typedef long LONG_PTR, * PLONG_PTR, * PLONG;
-typedef unsigned long ULONG_PTR, * PULONG_PTR;
-
-typedef uint8                               BYTE;
-typedef uint16                          WORD;
-typedef void*                               HWND;
-typedef UINT_PTR                        WPARAM;
-typedef LONG_PTR                        LPARAM;
-typedef LONG_PTR                        LRESULT;
-#define PLARGE_INTEGER LARGE_INTEGER *
-typedef const char* LPCSTR, * PCSTR;
-typedef long long                       LONGLONG;
-typedef ULONG_PTR                       SIZE_T;
-typedef uint8                               byte;
-#define ILINE __forceinline
-
-#ifndef MAXUINT
-#define MAXUINT ((uint) ~((uint)0))
-#endif
-
-#ifndef MAXINT
-#define MAXINT ((int)(MAXUINT >> 1))
-#endif
-
-#ifndef _CVTBUFSIZE
-#define _CVTBUFSIZE (309+40) /* # of digits in max. dp value + slop */
-#endif
-
-#ifndef STDMETHODCALLTYPE_DEFINED
-#define STDMETHODCALLTYPE_DEFINED
-#define STDMETHODCALLTYPE
-#endif
-
-#define _ALIGN(num) \
-    __attribute__ ((aligned(num))) \
-    AZ_POP_DISABLE_WARNING
-
-#define _PACK __attribute__ ((packed))
-
-// Safe memory freeing
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(p)          { if (p) { delete (p);       (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(p)    { if (p) { delete[] (p);     (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
-}
-#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))
-#define HIWORD(l)           ((WORD)((DWORD_PTR)(l) >> 16))
-#define LOBYTE(w)           ((BYTE)((DWORD_PTR)(w) & 0xff))
-#define HIBYTE(w)           ((BYTE)((DWORD_PTR)(w) >> 8))
-
-#define CALLBACK
-#define WINAPI
-
-#ifndef __cplusplus
-#ifndef _WCHAR_T_DEFINED
-typedef unsigned short wchar_t;
-#define TCHAR wchar_t;
-#define _WCHAR_T_DEFINED
-#endif
-#endif
-typedef wchar_t WCHAR;    // wc,   16-bit UNICODE character
-typedef WCHAR* PWCHAR;
-typedef WCHAR* LPWCH, * PWCH;
-typedef const WCHAR* LPCWCH, * PCWCH;
-typedef WCHAR* NWPSTR;
-typedef WCHAR* LPWSTR, * PWSTR;
-typedef WCHAR* LPUWSTR, * PUWSTR;
-
-typedef const WCHAR* LPCWSTR, * PCWSTR;
-typedef const WCHAR* LPCUWSTR, * PCUWSTR;
-
-#ifdef UNICODE
-typedef LPCWSTR LPCTSTR;
-typedef LPWSTR LPTSTR;
-#else
-typedef LPCSTR LPCTSTR;
-typedef LPSTR LPTSTR;
-#endif
-
-typedef DWORD COLORREF;
-#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
-
-#define GetRValue(rgb)  (LOBYTE(rgb))
-#define GetGValue(rgb)  (LOBYTE(((WORD)(rgb)) >> 8))
-#define GetBValue(rgb)  (LOBYTE((rgb)>>16))
-
-#define MAKEFOURCC(ch0, ch1, ch2, ch3)                \
-    ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
-     ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24))
-#define FILE_ATTRIBUTE_NORMAL               0x00000080
-
-// Conflit with OBJC defined bool type.
-
-#if defined(IOS)
-typedef bool BOOL;
-#else
-typedef signed char BOOL;
-#endif
-
-typedef int32_t LONG;
-typedef unsigned int ULONG;
-typedef int HRESULT;
-
-//typedef int32 __int32;
-typedef uint32 __uint32;
-typedef int64 __int64;
-typedef uint64 __uint64;
-
-#define TRUE 1
-#define FALSE 0
-
-#ifndef MAX_PATH
-#define MAX_PATH PATH_MAX
-#endif
-#ifndef _MAX_PATH
-#define _MAX_PATH MAX_PATH
-#endif
-
-#define _PTRDIFF_T_DEFINED 1
-
-#define _A_RDONLY       (0x01)    /* Read only file */
-#define _A_HIDDEN (0x02)    /* Hidden file */
-#define _A_SUBDIR       (0x10)    /* Subdirectory */
-
-//////////////////////////////////////////////////////////////////////////
-// Win32 FileAttributes.
-//////////////////////////////////////////////////////////////////////////
-#define FILE_ATTRIBUTE_READONLY             0x00000001
-#define FILE_ATTRIBUTE_HIDDEN               0x00000002
-#define FILE_ATTRIBUTE_SYSTEM               0x00000004
-#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
-#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
-#define FILE_ATTRIBUTE_DEVICE               0x00000040
-#define FILE_ATTRIBUTE_NORMAL               0x00000080
-#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
-#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
-#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
-#define FILE_ATTRIBUTE_COMPRESSED           0x00000800
-#define FILE_ATTRIBUTE_OFFLINE              0x00001000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
-#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
-
-#define INVALID_FILE_ATTRIBUTES (-1)
-
-#define DEFINE_ALIGNED_DATA(type, name, alignment) \
-    type __attribute__ ((aligned(alignment))) name;
-#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) \
-    static type __attribute__ ((aligned(alignment))) name;
-#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) \
-    const type __attribute__ ((aligned(alignment))) name;
-
-#define BST_UNCHECKED   0x0000
-
-#ifndef HRESULT_VALUES_DEFINED
-#define HRESULT_VALUES_DEFINED
-enum
-{
-    E_OUTOFMEMORY  = 0x8007000E,
-    E_FAIL         = 0x80004005,
-    E_ABORT        = 0x80004004,
-    E_INVALIDARG   = 0x80070057,
-    E_NOINTERFACE  = 0x80004002,
-    E_NOTIMPL      = 0x80004001,
-    E_UNEXPECTED   = 0x8000FFFF
-};
-#endif
-
-#define ERROR_SUCCESS   0L
-
-enum
-{
-    IDOK        = 1,
-    IDCANCEL    = 2,
-    IDABORT     = 3,
-    IDRETRY     = 4,
-    IDIGNORE    = 5,
-    IDYES       = 6,
-    IDNO        = 7,
-    IDTRYAGAIN  = 10,
-    IDCONTINUE  = 11
-};
-
-#define ES_MULTILINE    0x0004L
-#define ES_AUTOVSCROLL  0x0040L
-#define ES_AUTOHSCROLL  0x0080L
-#define ES_WANTRETURN   0x1000L
-
-#define LB_ERR  (-1)
-
-#define LB_ADDSTRING    0x0180
-#define LB_GETCOUNT     0x018B
-#define LB_SETTOPINDEX  0x0197
-
-#define MB_OK                0x00000000L
-#define MB_OKCANCEL          0x00000001L
-#define MB_ABORTRETRYIGNORE  0x00000002L
-#define MB_YESNOCANCEL       0x00000003L
-#define MB_YESNO             0x00000004L
-#define MB_RETRYCANCEL       0x00000005L
-#define MB_CANCELTRYCONTINUE 0x00000006L
-
-#define MB_ICONQUESTION     0x00000020L
-#define MB_ICONEXCLAMATION  0x00000030L
-    
-#define MB_ICONERROR        0x00000010L
-#define MB_ICONWARNING      0x00000030L
-#define MB_ICONINFORMATION  0x00000040L
-
-#define MB_SETFOREGROUND    0x00010000L
-
-#define MB_APPLMODAL    0x00000000L
-
-#define MF_STRING   0x00000000L
-
-#define MK_LBUTTON  0x0001
-#define MK_RBUTTON  0x0002
-#define MK_SHIFT    0x0004
-#define MK_CONTROL  0x0008
-#define MK_MBUTTON  0x0010
-
-#define MK_ALT  ( 0x20 )
-
-#define SM_MOUSEPRESENT 0x00000000L
-
-#define SM_CMOUSEBUTTONS    43
-
-#define USER_TIMER_MINIMUM  0x0000000A
-
-#define VK_TAB      0x09
-#define VK_SHIFT    0x10
-#define VK_MENU     0x12
-#define VK_ESCAPE   0x1B
-#define VK_SPACE    0x20
-#define VK_DELETE   0x2E
-
-#define VK_NUMPAD1  0x61
-#define VK_NUMPAD2  0x62
-#define VK_NUMPAD3  0x63
-#define VK_NUMPAD4  0x64
-
-#define VK_OEM_COMMA    0xBC   // ',' any country
-#define VK_OEM_PERIOD   0xBE   // '.' any country
-#define VK_OEM_3        0xC0   // '`~' for US
-#define VK_OEM_4        0xDB  //  '[{' for US
-#define VK_OEM_6        0xDD  //  ']}' for US
-
-#define WAIT_TIMEOUT 258L    // dderror
-
-#define WM_MOVE 0x0003
-#define WM_USER 0x0400
-
-#define WHEEL_DELTA 120
-
-#define WS_CHILD    0x40000000L
-#define WS_VISIBLE  0x10000000L
-
-#define CB_ERR  (-1)
-
-// function renaming
-#define _finite std::isfinite
-#define _snprintf snprintf
-//#define _isnan isnan
-#define stricmp strcasecmp
-#define _stricmp strcasecmp
-#define strnicmp strncasecmp
-#define _strnicmp strncasecmp
-#define wcsicmp wcscasecmp
-#define wcsnicmp wcsncasecmp
-//#define memcpy_s(dest,bytes,src,n) memcpy(dest,src,n)
-#define _isnan ISNAN
-#define _wtof(str) wcstod(str, 0)
-
-
-#define TARGET_DEFAULT_ALIGN (0x8U)
-
-
-
-#define _msize malloc_size
-
-
-struct _OVERLAPPED;
-
-typedef void (* LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, struct _OVERLAPPED* lpOverlapped);
-
-typedef struct _OVERLAPPED
-{
-    void* pCaller;//this is orginally reserved for internal purpose, we store the Caller pointer here
-    LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine; ////this is orginally ULONG_PTR InternalHigh and reserved for internal purpose
-    union
-    {
-        struct
-        {
-            DWORD Offset;
-            DWORD OffsetHigh;
-        };
-        PVOID Pointer;
-    };
-    DWORD dwNumberOfBytesTransfered;    //additional member temporary speciying the number of bytes to be read
-    /*HANDLE*/ void*  hEvent;
-} OVERLAPPED, * LPOVERLAPPED;
-
-typedef struct _SECURITY_ATTRIBUTES
-{
-    DWORD nLength;
-    LPVOID lpSecurityDescriptor;
-    BOOL bInheritHandle;
-} SECURITY_ATTRIBUTES, * PSECURITY_ATTRIBUTES, * LPSECURITY_ATTRIBUTES;
-
-#ifdef __cplusplus
-
-#define __min(_S, _T) min(_S, _T)
-#define __max(_S, _T) max(_S, _T)
-
-typedef enum
-{
-    INVALID_HANDLE_VALUE = -1l
-}INVALID_HANDLE_VALUE_ENUM;
-//for compatibility reason we got to create a class which actually contains an int rather than a void* and make sure it does not get mistreated
-template <class T, T U>
-//U is default type for invalid handle value, T the encapsulated handle type to be used instead of void* (as under windows and never linux)
-class CHandle
-{
-public:
-    typedef T           HandleType;
-    typedef void* PointerType;  //for compatibility reason to encapsulate a void* as an int
-
-    static const HandleType sciInvalidHandleValue = U;
-
-    CHandle(const CHandle<T, U>& cHandle)
-        : m_Value(cHandle.m_Value){}
-    CHandle(const HandleType cHandle = U)
-        : m_Value(cHandle){}
-    CHandle(const PointerType cpHandle)
-        : m_Value(reinterpret_cast<HandleType>(cpHandle)){}
-    CHandle(INVALID_HANDLE_VALUE_ENUM)
-        : m_Value(U){}                               //to be able to use a common value for all InvalidHandle - types
-#if defined(PLATFORM_64BIT)
-    //treat __null tyope also as invalid handle type
-    CHandle(long)
-        : m_Value(U){}          //to be able to use a common value for all InvalidHandle - types
-#endif
-    operator HandleType(){
-        return m_Value;
-    }
-    bool operator!() const{return m_Value == sciInvalidHandleValue; }
-    const CHandle& operator =(const CHandle& crHandle){m_Value = crHandle.m_Value; return *this; }
-    const CHandle& operator =(const PointerType cpHandle){m_Value = (HandleType) reinterpret_cast<UINT_PTR>(cpHandle); return *this; }
-    const bool operator ==(const CHandle& crHandle)     const{return m_Value == crHandle.m_Value; }
-    const bool operator ==(const HandleType cHandle)    const{return m_Value == cHandle; }
-    const bool operator ==(const PointerType cpHandle) const{return m_Value == reinterpret_cast<HandleType>(cpHandle); }
-    const bool operator !=(const HandleType cHandle)    const{return m_Value != cHandle; }
-    const bool operator !=(const CHandle& crHandle)     const{return m_Value != crHandle.m_Value; }
-    const bool operator !=(const PointerType cpHandle) const{return m_Value != reinterpret_cast<HandleType>(cpHandle); }
-    const bool operator <   (const CHandle& crHandle)       const{return m_Value < crHandle.m_Value; }
-    HandleType Handle() const{return m_Value; }
-
-private:
-    HandleType m_Value; //the actual value, remember that file descriptors are ints under linux
-
-    typedef void    ReferenceType;//for compatibility reason to encapsulate a void* as an int
-    //forbid these function which would actually not work on an int
-    PointerType operator->();
-    PointerType operator->() const;
-    ReferenceType operator*();
-    ReferenceType operator*() const;
-    operator PointerType();
-};
-
-typedef CHandle<int, (int) - 1l> HANDLE;
-
-typedef HANDLE EVENT_HANDLE;
-typedef HANDLE THREAD_HANDLE;
-
-typedef HANDLE HKEY;
-typedef HANDLE HDC;
-
-typedef HANDLE HBITMAP;
-
-typedef HANDLE HMENU;
-
-#endif //__cplusplus
-
-inline char* _fullpath(char* absPath, const char* relPath, size_t maxLength)
-{
-    char path[PATH_MAX];
-    
-    if (realpath(relPath, path) == NULL)
-    {
-        return NULL;
-    }
-    const size_t len = std::min(strlen(path), maxLength - 1);
-    memcpy(absPath, path, len);
-    absPath[len] = 0;
-    return absPath;
-}
-
-typedef union _LARGE_INTEGER
-{
-    struct
-    {
-        DWORD LowPart;
-        LONG HighPart;
-    };
-    struct
-    {
-        DWORD LowPart;
-        LONG HighPart;
-    } u;
-
-    long long QuadPart;
-} LARGE_INTEGER;
-
-extern bool QueryPerformanceCounter(LARGE_INTEGER*);
-extern bool QueryPerformanceFrequency(LARGE_INTEGER* frequency);
-
-inline int64 CryGetTicks()
-{
-    LARGE_INTEGER counter;
-    QueryPerformanceCounter(&counter);
-    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
-#define __debugbreak() ::raise(SIGTRAP)
-#endif
-
-#define __assume(x)
-#define _flushall sync
-
-inline int closesocket(int s)
-{
-    return ::close(s);
-}
-
-inline int WSAGetLastError()
-{
-    return errno;
-}
-
-//we take the definition of the pthread_t type directly from the pthread file
-#define THREADID_NULL 0
-
-template <typename T, size_t N>
-char (*RtlpNumberOf( T (&)[N] ))[N];
-
-#define RTL_NUMBER_OF_V2(A) (sizeof(*RtlpNumberOf(A)))
-
-#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A)
-
-#undef SUCCEEDED
-#define SUCCEEDED(x) ((x) >= 0)
-#undef FAILED
-#define FAILED(x) (!(SUCCEEDED(x)))
-
-#endif // CRYINCLUDE_CRYCOMMON_APPLESPECIFIC_H
diff --git a/Code/CryEngine/CryCommon/BaseTypes.h b/Code/CryEngine/CryCommon/BaseTypes.h
deleted file mode 100644
index cbd4f78fcd..0000000000
--- a/Code/CryEngine/CryCommon/BaseTypes.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_BASETYPES_H
-#define CRYINCLUDE_CRYCOMMON_BASETYPES_H
-#pragma once
-
-#include "CompileTimeAssert.h"
-
-
-COMPILE_TIME_ASSERT(sizeof(char) == 1);
-COMPILE_TIME_ASSERT(sizeof(float) == 4);
-COMPILE_TIME_ASSERT(sizeof(int) >= 4);
-
-
-typedef unsigned char  uchar;
-typedef signed   char  schar;
-
-typedef unsigned short ushort;
-typedef signed   short sshort;
-
-#if !defined(CLANG_FIX_UINT_REDEF)
-typedef unsigned int   uint;
-#endif
-typedef signed   int   sint;
-
-typedef unsigned long  ulong;
-typedef signed   long  slong;
-
-typedef unsigned long long ulonglong;
-typedef signed   long long slonglong;
-
-COMPILE_TIME_ASSERT(sizeof(uchar)     == sizeof(schar));
-COMPILE_TIME_ASSERT(sizeof(ushort)    == sizeof(sshort));
-COMPILE_TIME_ASSERT(sizeof(uint)      == sizeof(sint));
-COMPILE_TIME_ASSERT(sizeof(ulong)     == sizeof(slong));
-COMPILE_TIME_ASSERT(sizeof(ulonglong) == sizeof(slonglong));
-
-COMPILE_TIME_ASSERT(sizeof(uchar)  <= sizeof(ushort));
-COMPILE_TIME_ASSERT(sizeof(ushort) <= sizeof(uint));
-COMPILE_TIME_ASSERT(sizeof(uint)   <= sizeof(ulong));
-COMPILE_TIME_ASSERT(sizeof(ulong)  <= sizeof(ulonglong));
-
-
-typedef schar int8;
-typedef schar sint8;
-typedef uchar uint8;
-COMPILE_TIME_ASSERT(sizeof(uint8) == 1);
-COMPILE_TIME_ASSERT(sizeof(sint8) == 1);
-
-typedef sshort int16;
-typedef sshort sint16;
-typedef ushort uint16;
-COMPILE_TIME_ASSERT(sizeof(uint16) == 2);
-COMPILE_TIME_ASSERT(sizeof(sint16) == 2);
-
-typedef sint int32;
-typedef sint sint32;
-typedef uint uint32;
-COMPILE_TIME_ASSERT(sizeof(uint32) == 4);
-COMPILE_TIME_ASSERT(sizeof(sint32) == 4);
-
-typedef slonglong int64;
-
-#ifndef O3DE_INT64_DEFINED
-#define O3DE_INT64_DEFINED
-typedef slonglong sint64;
-typedef ulonglong uint64;
-COMPILE_TIME_ASSERT(sizeof(uint64) == 8);
-COMPILE_TIME_ASSERT(sizeof(sint64) == 8);
-#endif
-
-
-typedef float  f32;
-typedef double f64;
-COMPILE_TIME_ASSERT(sizeof(f32) == 4);
-COMPILE_TIME_ASSERT(sizeof(f64) == 8);
-
-#endif // CRYINCLUDE_CRYCOMMON_BASETYPES_H
diff --git a/Code/CryEngine/CryCommon/BitFiddling.h b/Code/CryEngine/CryCommon/BitFiddling.h
deleted file mode 100644
index 328c883de1..0000000000
--- a/Code/CryEngine/CryCommon/BitFiddling.h
+++ /dev/null
@@ -1,593 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : various integer bit fiddling hacks
-
-
-#pragma once
-
-#include "CompileTimeAssert.h"
-#include <AzCore/Casting/numeric_cast.h>
-
-// Section dictionary
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define BITFIDDLING_H_SECTION_TRAITS 1
-#define BITFIDDLING_H_SECTION_INTEGERLOG2 2
-#endif
-
-// Traits
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION BITFIDDLING_H_SECTION_TRAITS
-    #include AZ_RESTRICTED_FILE(BitFiddling_h)
-#elif defined(LINUX) || defined(APPLE)
-#define BITFIDDLING_H_TRAIT_HAS_COUNT_LEADING_ZEROS 1
-#endif
-
-#if BITFIDDLING_H_TRAIT_HAS_COUNT_LEADING_ZEROS
-#define countLeadingZeros32(x)              __builtin_clz(x)
-#else       // Windows implementation
-ILINE uint32 countLeadingZeros32(uint32 x)
-{
-    DWORD result = 32 ^ 31; // assumes result is unmodified if _BitScanReverse returns 0
-    _BitScanReverse(&result, x);
-    PREFAST_SUPPRESS_WARNING(6102);
-    result ^= 31; // needed because the index is from LSB (whereas all other implementations are from MSB)
-    return result;
-}
-#endif
-
-inline uint32 circularShift(uint32 nbits, uint32 i)
-{
-    return (i << nbits) | (i >> (32 - nbits));
-}
-
-template <typename T>
-inline size_t countTrailingZeroes(T v)
-{
-    size_t n = 0;
-
-    v = ~v & (v - 1);
-    while (v)
-    {
-        ++n;
-        v >>= 1;
-    }
-
-    return n;
-}
-
-// this function returns the integer logarithm of various numbers without branching
-#define IL2VAL(mask, shift)         \
-    c |= ((x & mask) != 0) * shift; \
-    x >>= ((x & mask) != 0) * shift
-
-template <typename TInteger>
-inline bool IsPowerOfTwo(TInteger x)
-{
-    return (x & (x - 1)) == 0;
-}
-
-// compile time version of IsPowerOfTwo, useful for STATIC_CHECK
-template <int nValue>
-struct IsPowerOfTwoCompileTime
-{
-    enum
-    {
-        IsPowerOfTwo = ((nValue & (nValue - 1)) == 0)
-    };
-};
-
-inline uint32 NextPower2(uint32 n)
-{
-    n--;
-    n |= n >> 1;
-    n |= n >> 2;
-    n |= n >> 4;
-    n |= n >> 8;
-    n |= n >> 16;
-    n++;
-    return n;
-}
-
-inline uint8 IntegerLog2(uint8 x)
-{
-    uint8 c = 0;
-    IL2VAL(0xf0, 4);
-    IL2VAL(0xc, 2);
-    IL2VAL(0x2, 1);
-    return c;
-}
-inline uint16 IntegerLog2(uint16 x)
-{
-    uint16 c = 0;
-    IL2VAL(0xff00, 8);
-    IL2VAL(0xf0, 4);
-    IL2VAL(0xc, 2);
-    IL2VAL(0x2, 1);
-    return c;
-}
-
-inline uint32 IntegerLog2(uint32 x)
-{
-    return 31 - countLeadingZeros32(x);
-}
-
-inline uint64 IntegerLog2(uint64 x)
-{
-    uint64 c = 0;
-    IL2VAL(0xffffffff00000000ull, 32);
-    IL2VAL(0xffff0000u, 16);
-    IL2VAL(0xff00, 8);
-    IL2VAL(0xf0, 4);
-    IL2VAL(0xc, 2);
-    IL2VAL(0x2, 1);
-    return c;
-}
-
-#if defined(APPLE) || defined(LINUX)
-inline unsigned long int IntegerLog2(unsigned long int x)
-{
-    #if defined(PLATFORM_64BIT)
-    return IntegerLog2((uint64)x);
-  #else
-    return IntegerLog2((uint32)x);
-  #endif
-}
-#endif
-#undef IL2VAL
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION BITFIDDLING_H_SECTION_INTEGERLOG2
-    #include AZ_RESTRICTED_FILE(BitFiddling_h)
-#endif
-
-template <typename TInteger>
-inline TInteger IntegerLog2_RoundUp(TInteger x)
-{
-    return 1 + IntegerLog2(x - 1);
-}
-
-static ILINE uint8 BitIndex(uint8 v)
-{
-    uint32 vv = v;
-    return aznumeric_caster(31 - countLeadingZeros32(vv));
-}
-
-static ILINE uint8 BitIndex(uint16 v)
-{
-    uint32 vv = v;
-    return aznumeric_caster(31 - countLeadingZeros32(vv));
-}
-
-static ILINE uint8 BitIndex(uint32 v)
-{
-    return aznumeric_caster(31 - countLeadingZeros32(v));
-}
-
-static ILINE uint8 CountBits(uint8 v)
-{
-    uint8 c = v;
-    c = ((c >> 1) & 0x55) + (c & 0x55);
-    c = ((c >> 2) & 0x33) + (c & 0x33);
-    c = ((c >> 4) & 0x0f) + (c & 0x0f);
-    return c;
-}
-
-static ILINE uint8 CountBits(uint16 v)
-{
-    return CountBits((uint8)(v  & 0xff)) +
-           CountBits((uint8)((v >> 8) & 0xff));
-}
-
-static ILINE uint8 CountBits(uint32 v)
-{
-    return CountBits((uint8)(v          & 0xff)) +
-           CountBits((uint8)((v >> 8) & 0xff)) +
-           CountBits((uint8)((v >> 16) & 0xff)) +
-           CountBits((uint8)((v >> 24) & 0xff));
-}
-
-// Branchless version of return v < 0 ? alt : v;
-ILINE int32 Isel32(int32 v, int32 alt)
-{
-    return ((static_cast<int32>(v) >> 31) & alt) | ((static_cast<int32>(~v) >> 31) & v);
-}
-
-template <uint32 ILOG>
-struct CompileTimeIntegerLog2
-{
-    static const uint32 result = 1 + CompileTimeIntegerLog2<(ILOG >> 1)>::result;
-};
-template <>
-struct CompileTimeIntegerLog2<1>
-{
-    static const uint32 result = 0;
-};
-template <>
-struct CompileTimeIntegerLog2<0>; // keep it undefined, we cannot represent "minus infinity" result
-
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<1>::result == 0);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<2>::result == 1);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<3>::result == 1);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<4>::result == 2);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<5>::result == 2);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<255>::result == 7);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<256>::result == 8);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<257>::result == 8);
-
-template <uint32 ILOG>
-struct CompileTimeIntegerLog2_RoundUp
-{
-    static const uint32 result = CompileTimeIntegerLog2<ILOG>::result + ((ILOG & (ILOG - 1)) != 0);
-};
-template <>
-struct CompileTimeIntegerLog2_RoundUp<0>; // we can return 0, but let's keep it undefined (same as CompileTimeIntegerLog2<0>)
-
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<1>::result == 0);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<2>::result == 1);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<3>::result == 2);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<4>::result == 2);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<5>::result == 3);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<255>::result == 8);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<256>::result == 8);
-COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<257>::result == 9);
-
-// Character-to-bitfield mapping
-
-inline uint32 AlphaBit(char c)
-{
-    return c >= 'a' && c <= 'z' ? 1 << (c - 'z' + 31) : 0;
-}
-
-inline uint64 AlphaBit64(char c)
-{
-    return (c >= 'a' && c <= 'z' ? 1U << (c - 'z' + 31) : 0) |
-           (c >= 'A' && c <= 'Z' ? 1LL << (c - 'Z' + 63) : 0);
-}
-
-inline uint32 AlphaBits(uint32 wc)
-{
-    // Handle wide multi-char constants, can be evaluated at compile-time.
-    return AlphaBit((char)wc)
-           | AlphaBit((char)(wc >> 8))
-           | AlphaBit((char)(wc >> 16))
-           | AlphaBit((char)(wc >> 24));
-}
-
-inline uint32 AlphaBits(const char* s)
-{
-    // Handle string of any length.
-    uint32 n = 0;
-    while (*s)
-    {
-        n |= AlphaBit(*s++);
-    }
-    return n;
-}
-
-inline uint64 AlphaBits64(const char* s)
-{
-    // Handle string of any length.
-    uint64 n = 0;
-    while (*s)
-    {
-        n |= AlphaBit64(*s++);
-    }
-    return n;
-}
-
-// s should point to a buffer at least 65 chars long
-inline void BitsAlpha64(uint64 n, char* s)
-{
-    for (int i = 0; n != 0; n >>= 1, i++)
-    {
-        if (n & 1)
-        {
-            *s++ = i < 32 ? static_cast<char>(i + 'z' - 31) : static_cast<char>(i + 'Z' - 63);
-        }
-    }
-    *s++ = '\0';
-}
-
-
-// if hardware doesn't support 3Dc we can convert to DXT5 (different channels are used)
-// with almost the same quality but the same memory requirements
-inline void ConvertBlock3DcToDXT5(uint8 pDstBlock[16], const uint8 pSrcBlock[16])
-{
-    assert(pDstBlock != pSrcBlock);       // does not work in place
-
-    // 4x4 block requires 8 bytes in DXT5 or 3DC
-
-    // DXT5:  8 bit alpha0, 8 bit alpha1, 16*3 bit alpha lerp
-    //        16bit col0, 16 bit col1 (R5G6B5 low byte then high byte), 16*2 bit color lerp
-
-    //  3DC:  8 bit x0, 8 bit x1, 16*3 bit x lerp
-    //        8 bit y0, 8 bit y1, 16*3 bit y lerp
-
-    for (uint32 dwK = 0; dwK < 8; ++dwK)
-    {
-        pDstBlock[dwK] = pSrcBlock[dwK];
-    }
-    for (uint32 dwK = 8; dwK < 16; ++dwK)
-    {
-        pDstBlock[dwK] = 0;
-    }
-
-    // 6 bit green channel (highest bits)
-    // by using all 3 channels with a slight offset we can get more precision but then a dot product would be needed in PS
-    // because of bilinear filter we cannot just distribute bits to get perfect result
-    uint16 colDst0 = (((uint16)pSrcBlock[8] + 2) >> 2) << 5;
-    uint16 colDst1 = (((uint16)pSrcBlock[9] + 2) >> 2) << 5;
-
-    bool bFlip = colDst0 <= colDst1;
-
-    if (bFlip)
-    {
-        uint16 help = colDst0;
-        colDst0 = colDst1;
-        colDst1 = help;
-    }
-
-    bool bEqual = colDst0 == colDst1;
-
-    // distribute bytes by hand to not have problems with endianess
-    pDstBlock[8 + 0] = (uint8)colDst0;
-    pDstBlock[8 + 1] = (uint8)(colDst0 >> 8);
-    pDstBlock[8 + 2] = (uint8)colDst1;
-    pDstBlock[8 + 3] = (uint8)(colDst1 >> 8);
-
-    uint16* pSrcBlock16 = (uint16*)(pSrcBlock + 10);
-    uint16* pDstBlock16 = (uint16*)(pDstBlock + 12);
-
-    // distribute 16 3 bit values to 16 2 bit values (loosing LSB)
-    for (uint32 dwK = 0; dwK < 16; ++dwK)
-    {
-        uint32 dwBit0 = dwK * 3 + 0;
-        uint32 dwBit1 = dwK * 3 + 1;
-        uint32 dwBit2 = dwK * 3 + 2;
-
-        uint8 hexDataIn = (((pSrcBlock16[(dwBit2 >> 4)] >> (dwBit2 & 0xf)) & 1) << 2)         // get HSB
-            | (((pSrcBlock16[(dwBit1 >> 4)] >> (dwBit1 & 0xf)) & 1) << 1)
-            | ((pSrcBlock16[(dwBit0 >> 4)] >> (dwBit0 & 0xf)) & 1);                 // get LSB
-
-        uint8 hexDataOut = 0;
-
-        switch (hexDataIn)
-        {
-        case 0:
-            hexDataOut = 0;
-            break;                          // color 0
-        case 1:
-            hexDataOut = 1;
-            break;                          // color 1
-
-        case 2:
-            hexDataOut = 0;
-            break;                          // mostly color 0
-        case 3:
-            hexDataOut = 2;
-            break;
-        case 4:
-            hexDataOut = 2;
-            break;
-        case 5:
-            hexDataOut = 3;
-            break;
-        case 6:
-            hexDataOut = 3;
-            break;
-        case 7:
-            hexDataOut = 1;
-            break;                          // mostly color 1
-
-        default:
-            assert(0);
-        }
-
-        if (bFlip)
-        {
-            if (hexDataOut < 2)
-            {
-                hexDataOut = 1 - hexDataOut;        // 0<->1
-            }
-            else
-            {
-                hexDataOut = 5 - hexDataOut;  // 2<->3
-            }
-        }
-
-        if (bEqual)
-        {
-            if (hexDataOut == 3)
-            {
-                hexDataOut = 1;
-            }
-        }
-
-        pDstBlock16[(dwK >> 3)] |= (hexDataOut << ((dwK & 0x7) << 1));
-    }
-}
-
-
-
-
-// is a bit on in a new bit field, but off in an old bit field
-static ILINE bool TurnedOnBit(unsigned bit, unsigned oldBits, unsigned newBits)
-{
-    return (newBits & bit) != 0 && (oldBits & bit) == 0;
-}
-
-
-
-
-
-
-
-inline uint32 cellUtilCountLeadingZero(uint32 x)
-{
-    uint32 y;
-    uint32 n = 32;
-
-    y = x >> 16;
-    if (y != 0)
-    {
-        n = n - 16;
-        x = y;
-    }
-    y = x >>  8;
-    if (y != 0)
-    {
-        n = n -  8;
-        x = y;
-    }
-    y = x >>  4;
-    if (y != 0)
-    {
-        n = n -  4;
-        x = y;
-    }
-    y = x >>  2;
-    if (y != 0)
-    {
-        n = n -  2;
-        x = y;
-    }
-    y = x >>  1;
-    if (y != 0)
-    {
-        return n - 2;
-    }
-    return n - x;
-}
-
-inline uint32 cellUtilLog2(uint32 x)
-{
-    return 31 - cellUtilCountLeadingZero(x);
-}
-
-
-
-
-inline void convertSwizzle(uint8*& dst, const uint8*&    src,
-    const uint32 SrcPitch, const uint32 depth,
-    const uint32 xpos, const uint32 ypos,
-    const uint32 SciX1, const uint32 SciY1,
-    const uint32 SciX2, const uint32 SciY2,
-    const uint32 level)
-{
-    if (level == 1)
-    {
-        switch (depth)
-        {
-        case 16:
-            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
-            {
-                //                  *((uint32*&)dst)++ = ((uint32*)src)[ypos * width + xpos];
-                //                  *((uint32*&)dst)++ = ((uint32*)src)[ypos * width + xpos+1];
-                //                  *((uint32*&)dst)++ = ((uint32*)src)[ypos * width + xpos+2];
-                //                  *((uint32*&)dst)++ = ((uint32*)src)[ypos * width + xpos+3];
-                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 16)));
-                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 16 + 4)));
-                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 16 + 8)));
-                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 16 + 12)));
-            }
-            else
-            {
-                ((uint32*&)dst) += 4;
-            }
-            break;
-        case 8:
-            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
-            {
-                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 8)));
-                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 8 + 4)));
-            }
-            else
-            {
-                ((uint32*&)dst) += 2;
-            }
-            break;
-        case 4:
-            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
-            {
-                *((uint32*&)dst) = *((uint32*)(src + (ypos * SrcPitch + xpos * 4)));
-            }
-            dst += 4;
-            break;
-        case 3:
-            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
-            {
-                *dst++ = src[ypos * SrcPitch + xpos * depth];
-                *dst++ = src[ypos * SrcPitch + xpos * depth + 1];
-                *dst++ = src[ypos * SrcPitch + xpos * depth + 2];
-            }
-            else
-            {
-                dst += 3;
-            }
-            break;
-        case 1:
-            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
-            {
-                *dst++ = src[ypos * SrcPitch + xpos * depth];
-            }
-            else
-            {
-                dst++;
-            }
-            break;
-        default:
-            assert(0);
-        }
-        return;
-    }
-    else
-    {
-        convertSwizzle(dst, src, SrcPitch, depth, xpos, ypos, SciX1, SciY1, SciX2, SciY2, level - 1);
-        convertSwizzle(dst, src, SrcPitch, depth, xpos + (1U << (level - 2)), ypos, SciX1, SciY1, SciX2, SciY2, level - 1);
-        convertSwizzle(dst, src, SrcPitch, depth, xpos, ypos + (1U << (level - 2)), SciX1, SciY1, SciX2, SciY2, level - 1);
-        convertSwizzle(dst, src, SrcPitch, depth, xpos + (1U << (level - 2)), ypos + (1U << (level - 2)), SciX1, SciY1, SciX2, SciY2, level - 1);
-    }
-}
-
-
-
-
-inline void Linear2Swizzle(uint8*   dst,
-    const uint8*     src,
-    const uint32 SrcPitch,
-    const uint32 width,
-    const uint32 height,
-    const uint32 depth,
-    const uint32 SciX1, const uint32 SciY1,
-    const uint32 SciX2, const uint32 SciY2)
-{
-    src -= SciY1 * SrcPitch + SciX1 * depth;
-    if (width == height)
-    {
-        convertSwizzle(dst, src, SrcPitch, depth, 0, 0, SciX1, SciY1, SciX2, SciY2, cellUtilLog2(width) + 1);
-    }
-    else
-    if (width > height)
-    {
-        uint32 baseLevel    = cellUtilLog2(width) - (cellUtilLog2(width) - cellUtilLog2(height));
-        for (uint32 i = 0; i < (1UL << (cellUtilLog2(width) - cellUtilLog2(height))); i++)
-        {
-            convertSwizzle(dst, src, SrcPitch, depth, (1U << baseLevel) * i, 0, SciX1, SciY1, SciX2, SciY2, baseLevel + 1);
-        }
-    }
-    else
-    //  if (width < height)//wtf
-    {
-        uint32 baseLevel    = cellUtilLog2(height) - (cellUtilLog2(height) - cellUtilLog2(width));
-        for (uint32 i = 0; i < (1UL << (cellUtilLog2(height) - cellUtilLog2(width))); i++)
-        {
-            convertSwizzle(dst, src, SrcPitch, depth, 0, (1U << baseLevel) * i, SciX1, SciY1, SciX2, SciY2, baseLevel + 1);
-        }
-    }
-}
diff --git a/Code/CryEngine/CryCommon/CMakeLists.txt b/Code/CryEngine/CryCommon/CMakeLists.txt
deleted file mode 100644
index 6c00cc5071..0000000000
--- a/Code/CryEngine/CryCommon/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-ly_add_target(
-    NAME CryCommon STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        crycommon_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .         # Lots of code without CryCommon/
-            ..        # Dangerous since exports CryEngine's path (client code can do CrySystem/ without depending on that target)
-    BUILD_DEPENDENCIES
-        PUBLIC
-            AZ::AzCore
-            AZ::AzFramework
-)
-
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-    ly_add_target(
-        NAME CryCommonMocks HEADERONLY
-        NAMESPACE Legacy
-        FILES_CMAKE
-            crycommon_testing_files.cmake
-        INCLUDE_DIRECTORIES
-            INTERFACE
-                Mocks
-    )
-
-endif()
diff --git a/Code/CryEngine/CryCommon/Common_TypeInfo.cpp b/Code/CryEngine/CryCommon/Common_TypeInfo.cpp
deleted file mode 100644
index 5d43478c38..0000000000
--- a/Code/CryEngine/CryCommon/Common_TypeInfo.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "TypeInfo_impl.h"
-#include "Cry_Geo.h"
-
-STRUCT_INFO_T_BEGIN(Vec2_tpl, class, F)
-VAR_INFO(x)
-VAR_INFO(y)
-STRUCT_INFO_T_END(Vec2_tpl, class, F)
-
-#include "Cry_Vector3.h"
-
-STRUCT_INFO_T_BEGIN(Vec3_tpl, typename, F)
-VAR_INFO(x)
-VAR_INFO(y)
-VAR_INFO(z)
-STRUCT_INFO_T_END(Vec3_tpl, typename, F)
-
-typedef TFixed<unsigned char, 1, 255, 0> TFixedUChar_1_255_0;
-STRUCT_INFO_T_INSTANTIATE(Vec3_tpl, TFixedUChar_1_255_0)
-
-STRUCT_INFO_T_BEGIN(Vec4_tpl, typename, F)
-VAR_INFO(x)
-VAR_INFO(y)
-VAR_INFO(z)
-VAR_INFO(w)
-STRUCT_INFO_T_END(Vec4_tpl, typename, F)
-
-STRUCT_INFO_T_INSTANTIATE(Vec4_tpl, short)
-
-STRUCT_INFO_T_BEGIN(Ang3_tpl, typename, F)
-VAR_INFO(x)
-VAR_INFO(y)
-VAR_INFO(z)
-STRUCT_INFO_T_END(Ang3_tpl, typename, F)
-
-STRUCT_INFO_T_BEGIN(Plane_tpl, typename, F)
-VAR_INFO(n)
-VAR_INFO(d)
-STRUCT_INFO_T_END(Plane_tpl, typename, F)
-
-//-----------------------------------------------------------------
-//#include "Cry_Quat_info.h"
-STRUCT_INFO_T_BEGIN(Quat_tpl, typename, F)
-VAR_INFO(v)
-VAR_INFO(w)
-STRUCT_INFO_T_END(Quat_tpl, typename, F)
-
-STRUCT_INFO_T_INSTANTIATE(Quat_tpl, float)
-
-STRUCT_INFO_T_BEGIN(QuatT_tpl, typename, F)
-VAR_INFO(q)
-VAR_INFO(t)
-STRUCT_INFO_T_END(QuatT_tpl, typename, F)
-
-STRUCT_INFO_T_INSTANTIATE(QuatT_tpl, float)
-
-STRUCT_INFO_T_BEGIN(QuatTS_tpl, typename, F)
-VAR_INFO(q)
-VAR_INFO(t)
-VAR_INFO(s)
-STRUCT_INFO_T_END(QuatTS_tpl, typename, F)
-
-STRUCT_INFO_T_BEGIN(DualQuat_tpl, typename, F)
-VAR_INFO(nq)
-VAR_INFO(dq)
-STRUCT_INFO_T_END(DualQuat_tpl, typename, F)
-
-
-//------------------------------------------------------------
-//#include "Cry_Matrix_info.h"
-STRUCT_INFO_T_BEGIN(Matrix33_tpl, typename, F)
-VAR_INFO(m00)
-VAR_INFO(m01)
-VAR_INFO(m02)
-VAR_INFO(m10)
-VAR_INFO(m11)
-VAR_INFO(m12)
-VAR_INFO(m20)
-VAR_INFO(m21)
-VAR_INFO(m22)
-STRUCT_INFO_T_END(Matrix33_tpl, typename, F)
-
-STRUCT_INFO_T_BEGIN(Matrix34_tpl, typename, F)
-VAR_INFO(m00)
-VAR_INFO(m01)
-VAR_INFO(m02)
-VAR_INFO(m03)
-VAR_INFO(m10)
-VAR_INFO(m11)
-VAR_INFO(m12)
-VAR_INFO(m13)
-VAR_INFO(m20)
-VAR_INFO(m21)
-VAR_INFO(m22)
-VAR_INFO(m23)
-STRUCT_INFO_T_END(Matrix34_tpl, typename, F)
-
-STRUCT_INFO_T_INSTANTIATE(Matrix34_tpl, float)
-
-STRUCT_INFO_T_BEGIN(Matrix44_tpl, typename, F)
-VAR_INFO(m00)
-VAR_INFO(m01)
-VAR_INFO(m02)
-VAR_INFO(m03)
-VAR_INFO(m10)
-VAR_INFO(m11)
-VAR_INFO(m12)
-VAR_INFO(m13)
-VAR_INFO(m20)
-VAR_INFO(m21)
-VAR_INFO(m22)
-VAR_INFO(m23)
-VAR_INFO(m30)
-VAR_INFO(m31)
-VAR_INFO(m32)
-VAR_INFO(m33)
-STRUCT_INFO_T_END(Matrix44_tpl, typename, F)
-
-
-//#include "Cry_Color_info.h"
-STRUCT_INFO_T_BEGIN(Color_tpl, class, T)
-VAR_INFO(r)
-VAR_INFO(g)
-VAR_INFO(b)
-VAR_INFO(a)
-STRUCT_INFO_T_END(Color_tpl, class, T)
-
-STRUCT_INFO_T_INSTANTIATE(Color_tpl, unsigned char)
-
-//#include "Cry_Geo_info.h"
-STRUCT_INFO_BEGIN(AABB)
-VAR_INFO(min)
-VAR_INFO(max)
-STRUCT_INFO_END(AABB)
-
-STRUCT_INFO_BEGIN(RectF)
-VAR_INFO(x)
-VAR_INFO(y)
-VAR_INFO(w)
-VAR_INFO(h)
-STRUCT_INFO_END(RectF)
-
-#include "TimeValue_info.h"
-#include "CryHalf_info.h"
-
-// Manually instantiate templates as needed here.
-template struct Vec3_tpl<float>;
-template struct Vec4_tpl<float>;
-template struct Vec2_tpl<float>;
-template struct Ang3_tpl<float>;
-template struct Plane_tpl<float>;
-template struct Matrix33_tpl<float>;
-template struct Color_tpl<float>;
diff --git a/Code/CryEngine/CryCommon/CompileTimeAssert.h b/Code/CryEngine/CryCommon/CompileTimeAssert.h
deleted file mode 100644
index 603aa4cac3..0000000000
--- a/Code/CryEngine/CryCommon/CompileTimeAssert.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-// Inspired by the Boost library's BOOST_STATIC_ASSERT(),
-// see http://www.boost.org/doc/libs/1_49_0/doc/html/boost_staticassert/how.html
-// or http://www.boost.org/libs/static_assert
-
-#ifndef CRYINCLUDE_CRYCOMMON_COMPILETIMEASSERT_H
-#define CRYINCLUDE_CRYCOMMON_COMPILETIMEASSERT_H
-#pragma once
-
-#if defined(__cplusplus)
-/*
-template <bool b>
-struct COMPILE_TIME_ASSERT_FAIL;
-
-template <>
-struct COMPILE_TIME_ASSERT_FAIL<true>
-{
-};
-
-template <int i>
-struct COMPILE_TIME_ASSERT_TEST
-{
-    enum { dummy = i };
-};
-
-#define COMPILE_TIME_ASSERT_BUILD_NAME2(x, y) x##y
-#define COMPILE_TIME_ASSERT_BUILD_NAME1(x, y) COMPILE_TIME_ASSERT_BUILD_NAME2(x, y)
-#define COMPILE_TIME_ASSERT_BUILD_NAME(x, y) COMPILE_TIME_ASSERT_BUILD_NAME1(x, y)
-
-#ifndef __RECODE__
-    #define COMPILE_TIME_ASSERT(expr) \
-        typedef COMPILE_TIME_ASSERT_TEST<sizeof(COMPILE_TIME_ASSERT_FAIL<(bool)(expr)>)> \
-        COMPILE_TIME_ASSERT_BUILD_NAME(compile_time_assert_test_, __LINE__)
-    // note: for MS Visual Studio we could use __COUNTER__ instead of __LINE__
-#else
-    #define COMPILE_TIME_ASSERT(expr)
-#endif  // __RECODE__
-
-#else
-
-#define COMPILE_TIME_ASSERT(expr)
-*/
-#endif
-
-#define COMPILE_TIME_ASSERT_MSG(expr, msg) static_assert(expr, msg)
-#define COMPILE_TIME_ASSERT(expr) COMPILE_TIME_ASSERT_MSG(expr, "Compile Time Assert")
-
-
-#endif // CRYINCLUDE_CRYCOMMON_COMPILETIMEASSERT_H
diff --git a/Code/CryEngine/CryCommon/CryArray.h b/Code/CryEngine/CryCommon/CryArray.h
deleted file mode 100644
index 8a1170a4cf..0000000000
--- a/Code/CryEngine/CryCommon/CryArray.h
+++ /dev/null
@@ -1,1346 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYARRAY_H
-#define CRYINCLUDE_CRYCOMMON_CRYARRAY_H
-#pragma once
-
-#include "CryLegacyAllocator.h"
-
-//---------------------------------------------------------------------------
-// Convenient iteration macros
-#define for_iter(IT, it, b, e)          for (IT it = (b), _e = (e); it != _e; ++it)
-#define for_container(CT, it, cont) for_iter (CT::iterator, it, (cont).begin(), (cont).end())
-
-#define for_ptr(T, it, b, e)                for (T* it = (b), * _e = (e); it != _e; ++it)
-#define for_array_ptr(T, it, arr)       for_ptr (T, it, (arr).begin(), (arr).end())
-
-#define for_array(i, arr)                       for (int i = 0, _e = (arr).size(); i < _e; i++)
-#define for_all(cont)                               for_array (_i, cont) cont[_i]
-
-//---------------------------------------------------------------------------
-// Stack array helper
-#define ALIGNED_STACK_ARRAY(T, name, size, alignment)           \
-    PREFAST_SUPPRESS_WARNING(6255)                              \
-    T * name = (T*) alloca((size) * sizeof(T) + alignment - 1); \
-    name = Align(name, alignment);
-
-#define STACK_ARRAY(T, name, size)                 \
-    ALIGNED_STACK_ARRAY(T, name, size, alignof(T)) \
-
-//---------------------------------------------------------------------------
-// Specify semantics for moving objects.
-// If raw_movable() is true, objects will be moved with memmove().
-// If false, with the templated move_init() function.
-template<class T>
-bool raw_movable([[maybe_unused]] T const& dest)
-{
-    return false;
-}
-
-// This container was written before C++11 and move semantics. As a result, it attempts
-// to fake move semantics where possible by constructing over top of existing instances.
-// This works great, unless the type being operated on has internal pointers to its own
-// memory space (for instance a string with SSO, or COW semantics).
-template <class T>
-struct fake_move_helper
-{
-    static void move(T& dest, T& source)
-    {
-        ::new(&dest) T(source);
-        source.~T();
-    }
-};
-
-// Override for string to ensure proper construction
-template <>
-struct fake_move_helper<string>
-{
-    static void move(string& dest, string& source)
-    {
-        ::new((void*)&dest) string(); 
-        dest = source;
-        source.~string();
-    }
-};
-
-// Generic move function: transfer an existing source object to uninitialized dest address.
-// Addresses must not overlap (requirement on caller).
-// May be specialized for specific types, to provide a more optimal move.
-// For types that can be trivially moved (memcpy), do not specialize move_init, rather specialize raw_movable to return true.
-template<class T>
-void move_init(T& dest, T& source)
-{
-    assert(&dest != &source);
-    fake_move_helper<T>::move(dest, source);
-}
-
-/*---------------------------------------------------------------------------
-Public classes:
-
-        Array<T, [I, STORAGE]>
-        StaticArray<T, nSIZE, [I]>
-        DynArray<T, [I, STORAGE, ALLOC]>
-        StaticDynArray<T, nSIZE, [I]>
-
-Support classes are placed in namespaces NArray and NAlloc to reduce global name usage.
----------------------------------------------------------------------------*/
-
-namespace NArray
-{
-    // We should never have these defined as macros.
-    #undef min
-    #undef max
-
-    // Define our own min/max here, to avoid including entire <algorithm>.
-    template<class T>
-    inline T min(T a, T b)
-    { return a < b ? a : b; }
-    template<class T>
-    inline T max(T a, T b)
-    { return a > b ? a : b; }
-
-    // Automatic inference of signed from unsigned int type.
-    template<class T>
-    struct IntTraits
-    {
-        typedef T TSigned;
-    };
-
-    template<>
-    struct IntTraits<uint>
-    {
-        typedef int TSigned;
-    };
-    template<>
-    struct IntTraits<uint64>
-    {
-        typedef int64 TSigned;
-    };
-#if !defined(LINUX) && !defined(APPLE)
-    template<>
-    struct IntTraits<unsigned long>
-    {
-        typedef long TSigned;
-    };
-#endif
-
-    /*---------------------------------------------------------------------------
-    // STORAGE prototype for Array<T,I,STORAGE>.
-    struct Storage
-    {
-        template<class T, class I>
-        struct Store
-        {
-            [const] T* begin() [const];
-            I size() const;
-        };
-    };
-    ---------------------------------------------------------------------------*/
-
-    //---------------------------------------------------------------------------
-    // ArrayStorage: Default STORAGE Array<T,I,STORAGE>.
-    // Simply contains a pointer and count to an existing array,
-    // performs no allocation or deallocation.
-
-    struct ArrayStorage
-    {
-        template<class T, class I = int>
-        struct Store
-        {
-            // Construction.
-            Store()
-                : m_aElems(0)
-                , m_nCount(0)
-            {}
-            Store(T* elems, I count)
-                : m_aElems(elems)
-                , m_nCount(count)
-            {}
-            Store(T* start, T* finish)
-                : m_aElems(start)
-                , m_nCount(check_cast<I>(finish - start))
-            {}
-
-            void set(T* elems, I count)
-            {
-                m_aElems = elems;
-                m_nCount = count;
-            }
-
-            // Basic storage.
-            CONST_VAR_FUNCTION(T * begin(),
-                { return m_aElems;
-                })
-            inline I size() const
-            { return m_nCount; }
-
-            // Modifiers, alter range in place.
-            void erase_front(I count = 1)
-            {
-                assert(count >= 0 && count <= m_nCount);
-                m_nCount -= count;
-                m_aElems += count;
-            }
-
-            void erase_back(I count = 1)
-            {
-                assert(count >= 0 && count <= m_nCount);
-                m_nCount -= count;
-            }
-
-            void resize(I count)
-            {
-                assert(count >= 0 && count <= m_nCount);
-                m_nCount = count;
-            }
-
-        protected:
-            T*  m_aElems;
-            I       m_nCount;
-        };
-    };
-
-    //---------------------------------------------------------------------------
-    // StaticArrayStorage: STORAGE scheme with a statically sized member array.
-
-    template<int nSIZE>
-    struct StaticArrayStorage
-    {
-        template<class T, class I = int>
-        struct Store
-        {
-            // Basic storage.
-            CONST_VAR_FUNCTION(T * begin(),
-                { return m_aElems;
-                })
-            inline static I size()
-            { return (I)nSIZE; }
-
-        protected:
-            T               m_aElems[nSIZE];
-        };
-    };
-};
-
-//---------------------------------------------------------------------------
-// Array<T,I,S>: Non-growing array.
-// S serves as base class, and implements storage scheme: begin(), size()
-
-template< class T, class I = int, class STORE = NArray::ArrayStorage >
-struct Array
-    : STORE::template Store<T, I>
-{
-    typedef typename STORE::template Store<T, I> S;
-
-    // Tedious redundancy.
-    using S::size;
-    using S::begin;
-
-    // STL-compatible typedefs.
-    typedef T                           value_type;
-    typedef T*                      pointer;
-    typedef const T*            const_pointer;
-    typedef T&                      reference;
-    typedef const T&            const_reference;
-
-    typedef T*                      iterator;
-    typedef const T*            const_iterator;
-
-    typedef I                           size_type;
-    typedef typename NArray::IntTraits<size_type>::TSigned
-        difference_type;
-
-    typedef Array<T, I>              array;
-    typedef Array<const T, I>    const_array;
-
-    // Construction.
-    Array()
-    {}
-
-    // Forward single- and double-argument constructors.
-    template<class In>
-    explicit Array(const In& i)
-        : S(i)
-    {}
-
-    template<class In1, class In2>
-    Array(const In1& i1, const In2& i2)
-        : S(i1, i2)
-    {}
-
-    // Accessors.
-    inline bool empty() const
-    { return size() == 0; }
-    inline size_type size_mem() const
-    { return size() * sizeof(T); }
-
-    CONST_VAR_FUNCTION(T * data(),
-        { return begin();
-        })
-
-    CONST_VAR_FUNCTION(T * end(),
-        { return begin() + size();
-        })
-
-    CONST_VAR_FUNCTION(T * rbegin(),
-        { return begin() + size() - 1;
-        })
-
-    CONST_VAR_FUNCTION(T * rend(),
-        { return begin() - 1;
-        })
-
-    CONST_VAR_FUNCTION(T & front(),
-        {
-            assert(!empty());
-            return *begin();
-        })
-
-    CONST_VAR_FUNCTION(T & back(),
-        {
-            assert(!empty());
-            return *rbegin();
-        })
-
-    CONST_VAR_FUNCTION(T & at(size_type i),
-        {
-            CRY_ASSERT_TRACE(i >= 0 && i < size(), ("Index %lld is out of range (array size is %lld)", (long long int) i, (long long int) size()));
-            return begin()[i];
-        })
-
-    CONST_VAR_FUNCTION(T & operator [](size_type i),
-        {
-            CRY_ASSERT_TRACE(i >= 0 && i < size(), ("Index %lld is out of range (array size is %lld)", (long long int) i, (long long int) size()));
-            return begin()[i];
-        })
-
-    // Conversion to canonical array type.
-    operator array()
-    { return array(begin(), size()); }
-    operator const_array() const
-    {
-        return const_array(begin(), size());
-    }
-
-    // Additional conversion via operator() to full or sub array.
-    array operator ()(size_type i, size_type count)
-    {
-        assert(i >= 0 && i + count <= size());
-        return array(begin() + i, count);
-    }
-    const_array operator ()(size_type i, size_type count) const
-    {
-        assert(i >= 0 && i + count <= size());
-        return const_array(begin() + i, count);
-    }
-
-    array operator ()(size_type i = 0)
-    { return (*this)(i, size() - i); }
-    const_array operator ()(size_type i = 0) const
-    { return (*this)(i, size() - i); }
-
-    // Basic element assignment functions.
-
-    // Copy values to existing elements.
-    void fill(const T& val)
-    {
-        for_array_ptr (T, it, *this)
-        * it = val;
-    }
-
-    void copy(const_array source)
-    {
-        assert(source.size() >= size());
-        const T* s = source.begin();
-        for_array_ptr (T, it, *this)
-        * it = *s++;
-    }
-
-    // Raw element construct/destruct functions.
-    iterator init()
-    {
-        for_array_ptr (T, it, *this)
-        new(it) T;
-        return begin();
-    }
-    iterator init(const T& val)
-    {
-        for_array_ptr (T, it, *this)
-        new(it) T(val);
-        return begin();
-    }
-    iterator init(const_array source)
-    {
-        assert(source.size() >= size());
-        assert(source.end() <= begin() || source.begin() >= end());
-        const_iterator s = source.begin();
-        for_array_ptr (T, it, *this)
-        new(it) T(*s++);
-        return begin();
-    }
-
-    iterator move_init(array source)
-    {
-        assert(source.size() >= size());
-        iterator s = source.begin();
-        if (s != begin())
-        {
-            if (raw_movable(*s))
-            {
-                memmove(begin(), s, size_mem());
-            }
-            else if (s > begin() || source.end() <= begin())
-            {
-                for_array_ptr (T, it, *this)
-                    ::move_init(*it, *s++);
-            }
-            else
-            {
-                s += size();
-                for (iterator it = end(); it > begin(); )
-                {
-                    ::move_init(*--it, *--s);
-                }
-            }
-        }
-        return begin();
-    }
-
-    void destroy()
-    {
-        // Destroy in reverse order, to complement construction order.
-        for (iterator it = rbegin(); it > rend(); --it)
-        {
-            it->~T();
-        }
-    }
-};
-
-// Type-inferring constructor.
-
-template<class T, class I>
-inline Array<T, I> ArrayT(T* elems, I count)
-{
-    return Array<T, I>(elems, count);
-}
-
-template<class T>
-inline Array<T, size_t> ArrayT(T* start, T* finish)
-{
-    return Array<T, size_t>(start, finish);
-}
-
-// StaticArray<T,I,nSIZE>
-// A superior alternative to static C arrays.
-// Provides standard STL-like Array interface, including bounds-checking.
-//      standard:       Type array[256];
-//      structured: StaticArray<Type,256> array;
-
-template<class T, int nSIZE, class I = int>
-struct StaticArray
-    : Array< T, I, NArray::StaticArrayStorage<nSIZE> >
-{
-};
-
-//---------------------------------------------------------------------------
-// Specify allocation for dynamic arrays
-
-namespace NAlloc
-{
-    // Multi-purpose allocation function prototype
-    // pMem = 0, nSize != 0:        allocate new mem, nSize = actual amount alloced
-    // pMem != 0, nSize = 0:        deallcate mem
-    // pMem != 0, nSize != 0:       nSize = actual amount allocated
-    typedef void* (* Allocator)(void* pMem, size_t& nSize, size_t nAlign, bool bSlack);
-
-    //
-    // Allocation utilities
-    //
-
-    inline size_t realloc_size(size_t nMinSize)
-    {
-        // Choose an efficient realloc size, when growing an existing (non-zero) block.
-        // Find the next power-of-two, minus a bit of presumed system alloc overhead.
-        static const size_t nMinAlloc = 32;
-        static const size_t nOverhead = 16;
-        static const size_t nDoubleLimit =
-            sizeof(size_t) < 8 ? 1 << 12      // 32-bit system
-            : 1 << 16;                                            // >= 64-bit system
-
-        nMinSize += nOverhead;
-        size_t nAlloc = nMinAlloc;
-        while (nAlloc < nMinSize)
-        {
-            nAlloc <<= 1;
-        }
-        if (nAlloc > nDoubleLimit)
-        {
-            size_t nAlign = NArray::max(nAlloc >> 3, nDoubleLimit);
-            nAlloc = Align(nMinSize, nAlign);
-        }
-        return nAlloc - nOverhead;
-    }
-
-    template<class A, class T, class I>
-    T* reallocate(A& allocator, T* old_elems, I old_size, I& new_size, size_t alignment = 1, bool allow_slack = false)
-    {
-        T* new_elems;
-        if (new_size)
-        {
-            size_t new_bytes = new_size * sizeof(T);
-            new_elems = (T*) allocator.alloc(0, new_bytes, alignment, allow_slack);
-            assert(IsAligned(new_elems, alignment));
-            assert(new_bytes >= new_size * sizeof(T));
-            new_size = check_cast<I>(new_bytes / sizeof(T));
-        }
-        else
-        {
-            new_elems = 0;
-        }
-
-        if (old_elems)
-        {
-            Array<T, I> old_elems_array(old_elems, old_size);
-            if (new_elems)
-            {
-                // Move elements.
-                ArrayT(new_elems, NArray::min(old_size, new_size)).move_init(old_elems_array);
-            }
-
-            // Dealloc old.
-            old_elems_array.destroy(); // call destructors
-            size_t zero = 0;
-            allocator.alloc(old_elems, zero, alignment);
-        }
-
-        return new_elems;
-    }
-
-    template<class A>
-    inline size_t get_alloc_size(const A& allocator, const void* pMem, size_t nSize, size_t nAlign)
-    {
-        non_const(allocator).alloc((void*)pMem, nSize, nAlign);
-        return nSize;
-    }
-
-    struct AllocFunction
-    {
-        Allocator       m_Function;
-
-        void* alloc(void* pMem, size_t& nSize, size_t nAlign, bool bSlack = false)
-        {
-            return m_Function(pMem, nSize, nAlign, bSlack);
-        }
-    };
-
-    // Adds prefix bytes to allocation, preserving alignment
-    template<class A, class Prefix, int nSizeAlign = 1>
-    struct AllocPrefix
-        : A
-    {
-        void* alloc(void* pMem, size_t& nSize, size_t nAlign, bool bSlack = false)
-        {
-            // Adjust pointer and size for prefix bytes
-            nAlign = NArray::max(nAlign, alignof(Prefix));
-            size_t nPrefixSize = Align(sizeof(Prefix), nAlign);
-
-            if (pMem)
-            {
-                pMem = (char*)pMem - nPrefixSize;
-            }
-            if (nSize)
-            {
-                nSize = Align(nSize, nSizeAlign);
-                nSize += nPrefixSize;
-            }
-
-            pMem = A::alloc(pMem, nSize, nAlign, bSlack);
-
-            if (nSize)
-            {
-                nSize -= nPrefixSize;
-            }
-            if (pMem)
-            {
-                pMem = (char*)pMem + nPrefixSize;
-            }
-            return pMem;
-        }
-    };
-
-    // Stores and retrieves allocator function in memory, for compatibility with diverse allocators
-    template<class A>
-    struct AllocCompatible
-    {
-        void* alloc(void* pMem, size_t& nSize, size_t nAlign, bool bSlack = false)
-        {
-            nAlign = NArray::max(nAlign, alignof(Allocator));
-            if (pMem)
-            {
-                // Retrieve original allocation function, for dealloc or size query
-                AllocPrefix<AllocFunction, Allocator> alloc_prefix;
-                alloc_prefix.m_Function = ((Allocator*)pMem)[-1];
-                return alloc_prefix.alloc(pMem, nSize, nAlign, bSlack);
-            }
-            else if (nSize)
-            {
-                // Allocate new with this module's base_allocator, storing pointer to function
-                AllocPrefix<A, Allocator> alloc_prefix;
-                pMem = alloc_prefix.alloc(pMem, nSize, nAlign, bSlack);
-                if (pMem)
-                {
-                    ((Allocator*)pMem)[-1] = &A::alloc;
-                }
-            }
-            return pMem;
-        }
-    };
-
-    //---------------------------------------------------------------------------
-    // Allocators for DynArray.
-
-    // Standard CryModule memory allocation, using aligned versions
-    struct ModuleAlloc
-    {
-        static void* alloc(void* pMem, size_t& nSize, size_t nAlign, bool bSlack = false)
-        {
-            if (pMem)
-            {
-                if (nSize)
-                {
-                    // Return memory usage, adding presumed alignment padding
-                    if (nAlign > sizeof(size_t))
-                    {
-                        nSize += nAlign - sizeof(size_t);
-                    }
-                }
-                else
-                {
-                    // Dealloc
-                    CryModuleMemalignFree(pMem);
-                }
-            }
-            else if (nSize)
-            {
-                // Alloc
-                if (bSlack)
-                {
-                    nSize = realloc_size(nSize);
-                }
-                return CryModuleMemalign(nSize, nAlign);
-            }
-            return 0;
-        }
-    };
-
-    // Standard allocator for DynArray stores a compatibility pointer in the memory
-    typedef AllocCompatible<ModuleAlloc> StandardAlloc;
-};
-
-//---------------------------------------------------------------------------
-// Storage schemes for dynamic arrays
-namespace NArray
-{
-    //---------------------------------------------------------------------------
-    // SmallDynStorage: STORAGE scheme for DynArray<T,I,STORAGE,ALLOC>.
-    // Array is just a single pointer, size and capacity information stored before the array data.
-
-    template<class A = NAlloc::StandardAlloc>
-    struct SmallDynStorage
-    {
-        template<class T, class I>
-        struct Store
-            : private A
-        {
-            struct Header
-            {
-                static const I nCAP_BIT = I(1) << (sizeof(I) * 8 - 1);
-
-                ILINE char* data() const
-                {
-                    assert(IsAligned(this, sizeof(I)));
-                    return (char*)(this + 1);
-                }
-                ILINE bool is_null() const
-                { return m_nSizeCap == 0; }
-                ILINE I size() const
-                { return m_nSizeCap & ~nCAP_BIT; }
-
-                I   capacity() const
-                {
-                    I aligned_bytes = Align(size() * sizeof(T), sizeof(I));
-                    if (m_nSizeCap & nCAP_BIT)
-                    {
-                        // Capacity stored in word following data
-                        return *(I*)(data() + aligned_bytes);
-                    }
-                    else
-                    {
-                        // Capacity - size < sizeof(I)
-                        return aligned_bytes / sizeof(T);
-                    }
-                }
-
-                void set_sizes(I s, I c)
-                {
-                    // Store size, and assert against overflow.
-                    assert(s <= c);
-                    m_nSizeCap = s;
-                    I aligned_bytes = Align(s * sizeof(T), sizeof(I));
-                    if (c * sizeof(T) >= aligned_bytes + sizeof(I))
-                    {
-                        // Has extra capacity, more than word-alignment
-                        m_nSizeCap |= nCAP_BIT;
-                        *(I*)(data() + aligned_bytes) = c;
-                    }
-                    assert(size() == s);
-                    assert(capacity() == c);
-                }
-
-            protected:
-                I       m_nSizeCap;             // Store allocation size, with last bit indicating extra capacity.
-
-            public:
-
-                static T* null_header()
-                {
-                    // m_aElems is never 0, for empty array points to a static empty header.
-                    // Declare a big enough static var to account for alignment.
-                    struct EmptyHeader
-                    {
-                        Header  head;
-                        char        pad[alignof(T)];
-                    };
-                    static EmptyHeader s_EmptyHeader;
-
-                    // The actual header pointer can be anywhere in the struct, it's all initialized to 0.
-                    static T* s_EmptyElems = (T*)Align(s_EmptyHeader.pad, alignof(T));
-
-                    return s_EmptyElems;
-                }
-            };
-
-            // Construction.
-            Store()
-            {
-                set_null();
-            }
-
-            Store(const A& a)
-                : A(a)
-            {
-                set_null();
-            }
-
-            // Basic storage.
-            CONST_VAR_FUNCTION(T * begin(),
-                { return m_aElems;
-                })
-            inline I size() const
-            { return header()->size(); }
-            inline I capacity() const
-            { return header()->capacity(); }
-            size_t get_alloc_size() const
-            { return is_null() ? 0 : NAlloc::get_alloc_size(allocator(), begin(), capacity() * sizeof(T), alignof(T)); }
-
-            void resize_raw(I new_size, bool allow_slack = false)
-            {
-                I new_cap = capacity();
-                if (allow_slack ? new_size > new_cap : new_size != new_cap)
-                {
-                    new_cap = new_size;
-                    m_aElems = NAlloc::reallocate(allocator(), header()->is_null() ? 0 : m_aElems, size(), new_cap, alignof(T), allow_slack);
-                    if (!m_aElems)
-                    {
-                        set_null();
-                        return;
-                    }
-                }
-                header()->set_sizes(new_size, new_cap);
-            }
-
-        protected:
-
-            T*              m_aElems;
-
-            CONST_VAR_FUNCTION(Header * header(),
-                {
-                    assert(m_aElems);
-                    return ((Header*)m_aElems) - 1;
-                })
-
-            void set_null()
-            { m_aElems = Header::null_header(); }
-            bool is_null() const
-            { return header()->is_null(); }
-
-            typedef NAlloc::AllocPrefix<A, Header, sizeof(I)> AP;
-
-            AP& allocator()
-            {
-                COMPILE_TIME_ASSERT(sizeof(AP) == sizeof(A));
-                return *(AP*)this;
-            }
-            const AP& allocator() const
-            {
-                return *(const AP*)this;
-            }
-        };
-    };
-
-    //---------------------------------------------------------------------------
-    // StaticDynStorage: STORAGE scheme with a statically sized member array.
-
-    template<int nSIZE>
-    struct StaticDynStorage
-    {
-        template<class T, class I = int>
-        struct Store
-            : ArrayStorage::Store<T, I>
-        {
-            Store()
-                : ArrayStorage::Store<T, I>((T*)Align(m_aData, alignof(T)), 0) {}
-
-            static I capacity()
-            { return (I)nSIZE; }
-            static size_t get_alloc_size()
-            { return 0; }
-
-            void resize_raw(I new_size, [[maybe_unused]] bool allow_slack = false)
-            {
-                // cannot realloc, just set size
-                assert(new_size >= 0 && new_size <= capacity());
-                this->m_nCount = new_size;
-            }
-
-        protected:
-
-            char        m_aData[nSIZE * sizeof(T) + alignof(T) - 1];      // Storage for elems, deferred construction
-        };
-    };
-};
-
-// Legacy base class of DynArray, only used for read-only access
-#define DynArrayRef DynArray
-
-//---------------------------------------------------------------------------
-// DynArray<T,I,S>: Extension of Array allowing dynamic allocation.
-// S specifies storage scheme, as with Array, but adds resize(), capacity(), ...
-// A specifies the actual memory allocation function: alloc()
-
-// NOTE: This version has been re-based on AZStd::vector for correctness and performance
-// The original implementation has been retained as LegacyDynArray below, for the few
-// cases where we must retain the old internal behavior
-template< class T, class I = int, class STORE = NArray::SmallDynStorage<> >
-struct DynArray
-    : public AZStd::vector<T, AZ::StdLegacyAllocator>
-{
-    typedef AZStd::vector<T, AZ::StdLegacyAllocator> vector_base;
-    using value_type = typename vector_base::value_type;
-    using size_type = I;
-    using iterator = typename vector_base::iterator;
-    using const_iterator = typename vector_base::const_iterator;
-
-    using vector_base::begin;
-    using vector_base::end;
-
-    DynArray()
-        : vector_base::vector()
-    {
-    }
-
-    explicit DynArray(size_type numElements)
-        : vector_base::vector(numElements)
-    {
-    }
-
-    DynArray(size_type numElements, const T& value)
-        : vector_base::vector(numElements, value)
-    {
-    }
-
-    // Ignore any specialized allocators, they all pull from the LegacyAllocator now
-    // Because we mandate that all DynArrays use the StdLegacyAllocator, matching allocators
-    // isn't meaningful here, so it's factored out
-    // Note that the STORE/S& is ignored entirely, because we do not support sharing storage
-    // between 2 DynArrays anymore. LegacyDynArray can still do that, but this feature is no longer used
-    template <typename S, typename = AZStd::enable_if_t<AZStd::is_base_of<S, typename STORE::template Store<T, I>>::value>>
-    explicit DynArray(const S&)
-        : vector_base::vector()
-    {
-    }
-
-    size_type capacity() const
-    {
-        return static_cast<size_type>(vector_base::capacity());
-    }
-
-    size_type size() const
-    {
-        return static_cast<size_type>(vector_base::size());
-    }
-
-    size_type available() const
-    {
-        return capacity() - size();
-    }
-
-    size_type get_alloc_size() const
-    {
-        return capacity() * sizeof(T);
-    }
-
-    // Grow array, return iterator to new raw elems.
-    iterator grow_raw(size_type count = 1, bool /*allow_slack*/ = true)
-    {
-        vector_base::resize(size() + count);
-        return end() - count;
-    }
-    
-    iterator grow(size_type count)
-    {
-        return grow_raw(count);
-    }
-    iterator grow(size_type count, const T& val)
-    {
-        vector_base::reserve(size() + count);
-        for (size_type idx = 0; idx < count; ++idx)
-        {
-            vector_base::push_back(val);
-        }
-        return end() - count;
-    }
-
-    void shrink()
-    {
-        // Realloc memory to exact array size.
-        vector_base::shrink_to_fit();
-    }
-
-    void resize(size_type newSize)
-    {
-        vector_base::resize(newSize);
-    }
-
-    void resize(size_type new_size, const T& val)
-    {
-        size_type s = size();
-        if (new_size > s)
-        {
-            grow(new_size - s, val);
-        }
-        else
-        {
-            pop_back(s - new_size);
-        }
-    }
-
-    void assign(const_iterator first, const_iterator last)
-    {
-        vector_base::assign(first, last);
-    }
-
-    void assign(size_type n, const T& val)
-    {
-        clear();
-        grow(n, val);
-    }
-
-    iterator push_back()
-    {
-        return grow(1);
-    }
-    iterator push_back(const T& val)
-    {
-        vector_base::push_back(val);
-        return vector_base::end() - 1;
-    }
-    iterator push_back(const DynArray& other)
-    {
-        return insert(end(), other.begin(), other.end());
-    }
-
-    iterator insert_raw(iterator pos, size_type count = 1)
-    {
-        // Grow array, return iterator to inserted raw elems.
-        assert(pos >= begin() && pos <= end());
-        vector_base::insert(pos, count, T());
-        return pos;
-    }
-
-    iterator insert(iterator it, const T& val)
-    {
-        vector_base::insert(it, 1, val);
-        return it;
-    }
-    iterator insert(iterator it, size_type count, const T& val)
-    {
-        vector_base::insert(it, count, val);
-        return it;
-    }
-    iterator insert(iterator it, const_iterator start, const_iterator finish)
-    {
-        vector_base::insert(it, start, finish);
-        return it;
-    }
-
-    iterator insert(size_type pos)
-    {
-        return insert_raw(begin() + pos);
-    }
-    iterator insert(size_type pos, const T& val)
-    {
-        iterator it = insert_raw(begin() + pos);
-        *it = val;
-        return it;
-    }
-
-    void pop_back(size_type count = 1, [[maybe_unused]] bool allow_slack = true)
-    {
-        // Destroy erased elems, change size without reallocing.
-        assert(count >= 0 && count <= size());
-        for (size_type idx = 0; idx < count; ++idx)
-        {
-            vector_base::pop_back();
-        }
-    }
-
-    iterator erase(iterator pos)
-    {
-        return vector_base::erase(pos);
-    }
-
-    iterator erase(iterator start, iterator finish)
-    {
-        AZ_Assert(start >= begin() && finish >= start && finish <= end(), "DynArray: Erasure range out of bounds");
-
-        // Copy over erased elems, destroy those at end.
-        iterator it = start, e = end();
-        while (finish < e)
-        {
-            *it++ = *finish++;
-        }
-        pop_back(check_cast<size_type>(finish - it));
-        return it;
-    }
-
-    iterator erase(size_type pos, size_type count = 1)
-    {
-        return erase(begin() + pos, begin() + pos + count);
-    }
-
-    void clear()
-    {
-        vector_base::clear();
-        vector_base::shrink_to_fit();
-    }
-};
-
-//---------------------------------------------------------------------------
-// Original Cry DynArray
-//---------------------------------------------------------------------------
-template< class T, class I = int, class STORE = NArray::SmallDynStorage<> >
-struct LegacyDynArray
-    : Array< T, I, STORE >
-{
-    typedef LegacyDynArray<T, I, STORE> self_type;
-    typedef Array<T, I, STORE> super_type;
-    typedef typename STORE::template Store<T, I> S;
-
-    // Tedious redundancy for GCC.
-    using_type(super_type, size_type);
-    using_type(super_type, iterator);
-    using_type(super_type, const_iterator);
-    using_type(super_type, array);
-    using_type(super_type, const_array);
-
-    using super_type::size;
-    using super_type::capacity;
-    using super_type::begin;
-    using super_type::end;
-    using super_type::at;
-    using super_type::copy;
-    using super_type::init;
-    using super_type::destroy;
-
-    //
-    // Construction.
-    //
-    LegacyDynArray()
-    {}
-
-    LegacyDynArray(size_type count)
-    {
-        grow(count);
-    }
-    LegacyDynArray(size_type count, const T& val)
-    {
-        grow(count, val);
-    }
-
-#if !defined(_DISALLOW_INITIALIZER_LISTS)
-    // Initializer-list
-    LegacyDynArray(std::initializer_list<T> l)
-    {
-        push_back(Array<const T, I>(l.begin(), l.size()));
-    }
-#endif
-
-    // Copying from a generic array type.
-    LegacyDynArray(const_array a)
-    {
-        push_back(a);
-    }
-    self_type& operator =(const_array a)
-    {
-        if (a.begin() >= begin() && a.end() <= end())
-        {
-            // Assigning from (partial) self; remove undesired elements.
-            erase((T*)a.end(), end());
-            erase(begin(), (T*)a.begin());
-        }
-        else
-        {
-            // Assert no overlap.
-            assert(a.end() <= begin() || a.begin() >= end());
-            if (a.size() == size())
-            {
-                // If same size, perform element copy.
-                copy(a);
-            }
-            else
-            {
-                // If different sizes, destroy then copy init elements.
-                pop_back(size());
-                push_back(a);
-            }
-        }
-        return *this;
-    }
-
-    // Copy init/assign.
-    inline LegacyDynArray(const self_type& a)
-    {
-        push_back(a());
-    }
-    inline self_type& operator =(const self_type& a)
-    {
-        return *this = a();
-    }
-
-    // Init/assign from basic storage type.
-    inline LegacyDynArray(const S& a)
-    {
-        push_back(const_array(a.begin(), a.size()));
-    }
-    inline self_type& operator =(const S& a)
-    {
-        return *this = const_array(a.begin(), a.size());
-    }
-
-    inline ~LegacyDynArray()
-    {
-        destroy();
-        S::resize_raw(0);
-    }
-
-    void swap(self_type& a)
-    {
-        // Swap storage structures, no element copying
-        S temp = static_cast<S&>(*this);
-        static_cast<S&>(*this) = static_cast<S&>(a);
-        static_cast<S&>(a) = temp;
-    }
-
-    inline size_type available() const
-    {
-        return capacity() - size();
-    }
-
-    //
-    // Allocation modifiers.
-    //
-
-    void reserve(size_type count)
-    {
-        if (count > capacity())
-        {
-            I s = size();
-            S::resize_raw(count, false);
-            S::resize_raw(s, true);
-        }
-    }
-
-    // Grow array, return iterator to new raw elems.
-    iterator grow_raw(size_type count = 1, bool allow_slack = true)
-    {
-        S::resize_raw(size() + count, allow_slack);
-        return end() - count;
-    }
-    Array<T, I> append_raw(size_type count = 1, bool allow_slack = true)
-    {
-        return Array<T, I>(grow_raw(count, allow_slack), count);
-    }
-
-    iterator grow(size_type count)
-    {
-        return append_raw(count).init();
-    }
-    iterator grow(size_type count, const T& val)
-    {
-        return append_raw(count).init(val);
-    }
-
-    void shrink()
-    {
-        // Realloc memory to exact array size.
-        S::resize_raw(size());
-    }
-
-    void resize(size_type new_size)
-    {
-        size_type s = size();
-        if (new_size > s)
-        {
-            append_raw(new_size - s, false).init();
-        }
-        else
-        {
-            pop_back(s - new_size, false);
-        }
-    }
-    void resize(size_type new_size, const T& val)
-    {
-        size_type s = size();
-        if (new_size > s)
-        {
-            append_raw(new_size - s, false).init(val);
-        }
-        else
-        {
-            pop_back(s - new_size, false);
-        }
-    }
-
-    void assign(size_type n, const T& val)
-    {
-        resize(n);
-        fill(val);
-    }
-
-    void assign(const_iterator start, const_iterator finish)
-    {
-        *this = const_array(start, finish);
-    }
-
-    iterator push_back()
-    {
-        return grow(1);
-    }
-    iterator push_back(const T& val)
-    {
-        return grow(1, val);
-    }
-    iterator push_back(const_array a)
-    {
-        return append_raw(a.size(), false).init(a);
-    }
-
-    array insert_raw(iterator pos, size_type count = 1)
-    {
-        // Grow array, return iterator to inserted raw elems.
-        assert(pos >= begin() && pos <= end());
-        size_t i = pos - begin();
-        append_raw(count);
-        (*this)(i + count).move_init((*this)(i));
-        return (*this)(i, count);
-    }
-
-    iterator insert(iterator it, const T& val)
-    {
-        return insert_raw(it, 1).init(val);
-    }
-    iterator insert(iterator it, size_type count, const T& val)
-    {
-        return insert_raw(it, count).init(val);
-    }
-    iterator insert(iterator it, const_iterator start, const_iterator finish)
-    {
-        return insert(it, const_array(start, finish));
-    }
-    iterator insert(iterator it, const_array a)
-    {
-        return insert_raw(it, a.size()).init(a);
-    }
-
-    iterator insert(size_type pos)
-    {
-        return insert_raw(&at(pos)).init();
-    }
-    iterator insert(size_type pos, const T& val)
-    {
-        return insert_raw(&at(pos)).init(val);
-    }
-    iterator insert(size_type pos, const_array a)
-    {
-        return insert_raw(&at(pos), a.size()).init(a);
-    }
-
-    void pop_back(size_type count = 1, bool allow_slack = true)
-    {
-        // Destroy erased elems, change size without reallocing.
-        assert(count >= 0 && count <= size());
-        size_type new_size = size() - count;
-        (*this)(new_size).destroy();
-        S::resize_raw(new_size, allow_slack);
-    }
-
-    iterator erase(iterator start, iterator finish)
-    {
-        assert(start >= begin() && finish >= start && finish <= end());
-
-        // Copy over erased elems, destroy those at end.
-        iterator it = start, e = end();
-        while (finish < e)
-        {
-            *it++ = *finish++;
-        }
-        pop_back(check_cast<size_type>(finish - it));
-        return it;
-    }
-
-    iterator erase(iterator it)
-    {
-        return erase(it, it + 1);
-    }
-
-    iterator erase(size_type pos, size_type count = 1)
-    {
-        return erase(begin() + pos, begin() + pos + count);
-    }
-
-    void clear()
-    {
-        destroy();
-        S::resize_raw(0);
-    }
-};
-
-template<class T, int nSIZE, class I = int>
-struct StaticDynArray
-    : LegacyDynArray< T, I, NArray::StaticDynStorage<nSIZE> >
-{
-};
-
-
-
-    #include "CryPodArray.h"
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYARRAY_H
diff --git a/Code/CryEngine/CryCommon/CryAssert.h b/Code/CryEngine/CryCommon/CryAssert.h
deleted file mode 100644
index 49bbd8a573..0000000000
--- a/Code/CryEngine/CryCommon/CryAssert.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Assert dialog box
-
-#pragma once
-
-#include <AzCore/base.h>
-
-//-----------------------------------------------------------------------------------------------------
-// Just undef this if you want to use the standard assert function
-//-----------------------------------------------------------------------------------------------------
-
-// if AZ_ENABLE_TRACING is enabled, then calls to AZ_Assert(...) will flow in.  This is the case
-// even in Profile mode - thus if you want to manage what happens, USE_CRY_ASSERT also needs to be enabled in those cases.
-// if USE_CRY_ASSERT is not enabled, but AZ_ENABLE_TRACING is enabled, then the default behavior for assets will occur instead
-// which is to throw the DEBUG BREAK exception / signal, which tends to end with application shutdown.
-#if defined(AZ_ENABLE_TRACE_ASSERTS)
-#define USE_AZ_ASSERT
-#endif
-
-#if !defined (USE_AZ_ASSERT) && defined(AZ_ENABLE_TRACING)
-#undef USE_CRY_ASSERT
-#define USE_CRY_ASSERT
-#endif
-
-// you can undefine this.  It will cause the assert message box to appear anywhere that USE_CRY_ASSERT is enabled
-// instead of it only appearing in debug. 
-// if this is DEFINED then only in debug builds will you see the message box.  In other builds, CRY_ASSERTS become CryWarning instead of
-// instead (showing no message box, only a warning).
-#define CRY_ASSERT_DIALOG_ONLY_IN_DEBUG
-
-#if defined(FORCE_STANDARD_ASSERT) || defined(USE_AZ_ASSERT)
-#undef USE_CRY_ASSERT
-#undef CRY_ASSERT_DIALOG_ONLY_IN_DEBUG
-#endif
-
-// Using AZ_Assert for all assert kinds (assert =, CRY_ASSERT, AZ_Assert).
-// see Trace::Assert for implementation
-#if defined(USE_AZ_ASSERT)
-    #undef assert
-    #if !defined(NDEBUG)
-        #define assert(condition) AZ_Assert(condition, "%s", #condition)
-    #else
-        #define assert(condition)
-    #endif
-#endif //defined(USE_AZ_ASSERT)
-
-//-----------------------------------------------------------------------------------------------------
-// Use like this:
-// CRY_ASSERT(expression);
-// CRY_ASSERT_MESSAGE(expression,"Useful message");
-// CRY_ASSERT_TRACE(expression,("This should never happen because parameter n%d named %s is %f",iParameter,szParam,fValue));
-//-----------------------------------------------------------------------------------------------------
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(CryAssert_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32) || defined(APPLE) || defined(LINUX)
-    #define CRYASSERT_H_TRAIT_USE_CRY_ASSERT_MESSAGE 1
-#endif
-
-#if defined(USE_CRY_ASSERT) && CRYASSERT_H_TRAIT_USE_CRY_ASSERT_MESSAGE
-void CryAssertTrace(const char*, ...);
-bool CryAssert(const char*, const char*, unsigned int, bool*);
-void CryDebugBreak();
-
-    #define CRY_ASSERT(condition) CRY_ASSERT_MESSAGE(condition, NULL)
-
-    #define CRY_ASSERT_MESSAGE(condition, message) CRY_ASSERT_TRACE(condition, (message))
-
-    #define CRY_ASSERT_TRACE(condition, parenthese_message)                  \
-    do                                                                       \
-    {                                                                        \
-        static bool s_bIgnoreAssert = false;                                 \
-        if (!s_bIgnoreAssert && !(condition))                                \
-        {                                                                    \
-            CryAssertTrace parenthese_message;                               \
-            if (CryAssert(#condition, __FILE__, __LINE__, &s_bIgnoreAssert)) \
-            {                                                                \
-                DEBUG_BREAK;                                                 \
-            }                                                                \
-        }                                                                    \
-    } while (0)
-
-    #undef assert
-    #define assert CRY_ASSERT
-#elif !defined(CRY_ASSERT)
-#ifndef USE_AZ_ASSERT
-    #include <assert.h>
-#endif //USE_AZ_ASSERT
-    #define CRY_ASSERT(condition) assert(condition)
-    #define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
-    #define CRY_ASSERT_TRACE(condition, parenthese_message) assert(condition)
-#endif
-
-//-----------------------------------------------------------------------------------------------------
diff --git a/Code/CryEngine/CryCommon/CryAssert_Android.h b/Code/CryEngine/CryCommon/CryAssert_Android.h
deleted file mode 100644
index ccc72f0bd7..0000000000
--- a/Code/CryEngine/CryCommon/CryAssert_Android.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Assert dialog box for android
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYASSERT_ANDROID_H
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_ANDROID_H
-#pragma once
-
-#if defined(USE_CRY_ASSERT) && defined(ANDROID)
-
-#include <AzCore/NativeUI/NativeUIRequests.h>
-
-static char gs_szMessage[MAX_PATH];
-
-void CryAssertTrace(const char* szFormat, ...)
-{
-    if (gEnv == 0)
-    {
-        return;
-    }
-
-    if (!gEnv->bIgnoreAllAsserts)
-    {
-        if (szFormat == NULL)
-        {
-            gs_szMessage[0] = '\0';
-        }
-        else
-        {
-            va_list args;
-            va_start(args, szFormat);
-            vsnprintf(gs_szMessage, sizeof(gs_szMessage), szFormat, args);
-            va_end(args);
-        }
-    }
-}
-
-bool CryAssert(const char* szCondition, const char* szFile, unsigned int line, bool* pIgnore)
-{
-    if (!gEnv)
-    {
-        return true;
-    }
-
-#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
-    // we are in a non-debug build, so we should turn this into a warning instead.
-    if ((gEnv) && (gEnv->pLog))
-    {
-        if (!gEnv->bIgnoreAllAsserts)
-        {
-            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", szFile, line, szCondition);
-        }
-    }
-    
-    if (pIgnore)
-    {
-        // avoid showing the same one repeatedly.
-        *pIgnore = true;
-    }
-    return false;
-#endif
-
-    gEnv->pSystem->OnAssert(szCondition, gs_szMessage, szFile, line);
-
-    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
-    {
-        AZ::NativeUI::AssertAction result;
-        EBUS_EVENT_RESULT(result, AZ::NativeUI::NativeUIRequestBus, DisplayAssertDialog, gs_szMessage);
-
-        switch (result)
-        {
-        case AZ::NativeUI::AssertAction::IGNORE_ASSERT:
-            return false;
-        case AZ::NativeUI::AssertAction::IGNORE_ALL_ASSERTS:
-            gEnv->bNoAssertDialog = true;
-            gEnv->bIgnoreAllAsserts = true;
-            return false;
-        case AZ::NativeUI::AssertAction::BREAK:
-            return true;
-        default:
-            break;
-        }
-        
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-#endif
-#endif // CRYINCLUDE_CRYCOMMON_CRYASSERT_ANDROID_H
diff --git a/Code/CryEngine/CryCommon/CryAssert_Linux.h b/Code/CryEngine/CryCommon/CryAssert_Linux.h
deleted file mode 100644
index 918977734e..0000000000
--- a/Code/CryEngine/CryCommon/CryAssert_Linux.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-// Description :
-//     Assert dialog box for LINUX. The linux assert dialog is based on a
-//     small ncurses application which writes the choice to a file. This
-//     was chosen since there is no default UI system on Linux. X11 wasn't
-//     used due to the possibility of the system running another display
-//     protocol (e.g.: WayLand, Mir)
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYASSERT_LINUX_H
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_LINUX_H
-#pragma once
-
-#if defined(USE_CRY_ASSERT) && defined(LINUX) && !defined(ANDROID)
-
-static char gs_szMessage[MAX_PATH];
-
-void CryAssertTrace(const char* szFormat, ...)
-{
-    if (gEnv == 0)
-    {
-        return;
-    }
-
-    if (!gEnv->bIgnoreAllAsserts)
-    {
-        if (szFormat == NULL)
-        {
-            gs_szMessage[0] = '\0';
-        }
-        else
-        {
-            va_list args;
-            va_start(args, szFormat);
-            vsnprintf(gs_szMessage, sizeof(gs_szMessage), szFormat, args);
-            va_end(args);
-        }
-    }
-}
-
-bool CryAssert(const char* szCondition, const char* szFile, unsigned int line, bool* pIgnore)
-{
-    if (!gEnv)
-    {
-        return false;
-    }
-
-#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
-    // we are in a non-debug build, so we should turn this into a warning instead.
-    if (gEnv->pLog)
-    {
-        if (!gEnv->bIgnoreAllAsserts)
-        {
-            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", szFile, line, szCondition);
-        }
-    }
-    if (pIgnore)
-    {
-        // avoid showing the same one repeatedly.
-        *pIgnore = true;
-    }
-    return false;
-#endif
-
-    static const int max_len = 4096;
-    static char gs_command_str[4096];
-    static CryLockT<CRYLOCK_RECURSIVE> lock;
-
-    gEnv->pSystem->OnAssert(szCondition, gs_szMessage, szFile, line);
-
-    size_t file_len = strlen(szFile);
-
-    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
-    {
-        CryAutoLock< CryLockT<CRYLOCK_RECURSIVE> > lk (lock);
-        snprintf(gs_command_str, max_len, "xterm -geometry 100x20 -n 'Assert Dialog [Linux Launcher]' -T 'Assert Dialog [Linux Launcher]' -e 'BinLinux/assert_term \"%s\" \"%s\" %d \"%s\"; echo \"$?\" > .assert_return'",
-            szCondition, (file_len > 60) ? szFile + (file_len - 61) : szFile, line, gs_szMessage);
-        int ret = system(gs_command_str);
-        if (ret != 0)
-        {
-            CryLogAlways("<Assert> Terminal failed to execute");
-            return false;
-        }
-
-        FILE* assert_file = fopen(".assert_return", "r");
-        if (!assert_file)
-        {
-            CryLogAlways("<Assert> Couldn't open assert file");
-            return false;
-        }
-        int result = -1;
-        fscanf(assert_file, "%d", &result);
-        fclose(assert_file);
-
-        switch (result)
-        {
-        case 0:
-            break;
-        case 1:
-            *pIgnore = true;
-            break;
-        case 2:
-            gEnv->bIgnoreAllAsserts = true;
-            break;
-        case 3:
-            return true;
-            break;
-        case 4:
-            raise(SIGABRT);
-            exit(-1);
-            break;
-        default:
-            CryLogAlways("<Assert> Unknown result in assert file: %d", result);
-            return false;
-        }
-    }
-
-
-    return false;
-}
-
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYASSERT_LINUX_H
diff --git a/Code/CryEngine/CryCommon/CryAssert_Mac.h b/Code/CryEngine/CryCommon/CryAssert_Mac.h
deleted file mode 100644
index c618fb8c91..0000000000
--- a/Code/CryEngine/CryCommon/CryAssert_Mac.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Assert dialog box for Mac OS X
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYASSERT_MAC_H
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_MAC_H
-#pragma once
-
-#if defined(USE_CRY_ASSERT) && defined(MAC)
-#include <AzCore/NativeUI/NativeUIRequests.h>
-
-static char gs_szMessage[MAX_PATH];
-
-void CryAssertTrace(const char* szFormat, ...)
-{
-    if (gEnv == 0)
-    {
-        return;
-    }
-
-    if (!gEnv->bIgnoreAllAsserts)
-    {
-        if (szFormat == NULL)
-        {
-            gs_szMessage[0] = '\0';
-        }
-        else
-        {
-            va_list args;
-            va_start(args, szFormat);
-            vsnprintf(gs_szMessage, sizeof(gs_szMessage), szFormat, args);
-            va_end(args);
-        }
-    }
-}
-
-bool CryAssert(const char* szCondition, const char* szFile, unsigned int line, bool* pIgnore)
-{
-    if (!gEnv)
-    {
-        return false;
-    }
-
-#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
-    // we are in a non-debug build, so we should turn this into a warning instead.
-    if ((gEnv) && (gEnv->pLog))
-    {
-        if (!gEnv->bIgnoreAllAsserts)
-        {
-            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", szFile, line, szCondition);
-        }
-    }
-    
-    if (pIgnore)
-    {
-        // avoid showing the same one repeatedly.
-        *pIgnore = true;
-    }
-    return false;
-#endif
-
-    static const int max_len = 4096;
-    static char gs_command_str[4096];
-
-    static CryLockT<CRYLOCK_RECURSIVE> lock;
-
-    gEnv->pSystem->OnAssert(szCondition, gs_szMessage, szFile, line);
-
-    size_t file_len = strlen(szFile);
-
-    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
-    {
-        AZ::NativeUI::AssertAction result;
-        EBUS_EVENT_RESULT(result, AZ::NativeUI::NativeUIRequestBus, DisplayAssertDialog, gs_szMessage);
-        
-        switch(result)
-        {
-            case AZ::NativeUI::AssertAction::IGNORE_ASSERT:
-                return false;
-            case AZ::NativeUI::AssertAction::IGNORE_ALL_ASSERTS:
-                gEnv->bNoAssertDialog = true;
-                gEnv->bIgnoreAllAsserts = true;
-                return false;
-            case AZ::NativeUI::AssertAction::BREAK:
-                return true;
-            default:
-                break;
-        }
-        
-        // For asserts on the Mac always trigger a debug break. Annoying but at least it does not kill the thread like assert() does.
-        __asm__("int $3");
-    }
-
-
-    return false;
-}
-
-
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYASSERT_MAC_H
diff --git a/Code/CryEngine/CryCommon/CryAssert_iOS.h b/Code/CryEngine/CryCommon/CryAssert_iOS.h
deleted file mode 100644
index d238a72d72..0000000000
--- a/Code/CryEngine/CryCommon/CryAssert_iOS.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Assert dialog box for Mac OS X
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYASSERT_IOS_H
-#define CRYINCLUDE_CRYCOMMON_CRYASSERT_IOS_H
-#pragma once
-
-#if defined(USE_CRY_ASSERT) && (defined(IOS)
-
-#include <AzCore/NativeUI/NativeUIRequests.h>
-
-static char gs_szMessage[MAX_PATH];
-
-void CryAssertTrace(const char* szFormat, ...)
-{
-    if (gEnv == 0)
-    {
-        return;
-    }
-
-    if (!gEnv->bIgnoreAllAsserts)
-    {
-        if (szFormat == NULL)
-        {
-            gs_szMessage[0] = '\0';
-        }
-        else
-        {
-            va_list args;
-            va_start(args, szFormat);
-            vsnprintf(gs_szMessage, sizeof(gs_szMessage), szFormat, args);
-            va_end(args);
-        }
-    }
-}
-
-bool CryAssert(const char* szCondition, const char* szFile, unsigned int line, bool* pIgnore)
-{
-    if (!gEnv)
-    {
-        return false;
-    }
-
-#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
-    // we are in a non-debug build, so we should turn this into a warning instead.
-    if ((gEnv) && (gEnv->pLog))
-    {
-        if (!gEnv->bIgnoreAllAsserts)
-        {
-            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", szFile, line, szCondition);
-        }
-    }
-    
-    if (pIgnore)
-    {
-        // avoid showing the same one repeatedly.
-        *pIgnore = true;
-    }
-    return false;
-#endif
-
-    gEnv->pSystem->OnAssert(szCondition, gs_szMessage, szFile, line);
-    
-    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
-    {
-        printf("!!ASSERT!!\n\tCondition: %s\n\tMessage  : %s\n\tFile     : %s\n\tLine     : %d", szCondition, gs_szMessage, szFile, line);
-
-        AZ::NativeUI::AssertAction result;
-        EBUS_EVENT_RESULT(result, AZ::NativeUI::NativeUIRequestBus, DisplayAssertDialog, gs_szMessage);
-        
-        switch(result)
-        {
-        case AZ::NativeUI::AssertAction::IGNORE_ASSERT:
-            return false;
-        case AZ::NativeUI::AssertAction::IGNORE_ALL_ASSERTS:
-            gEnv->bNoAssertDialog = true;
-            gEnv->bIgnoreAllAsserts = true;
-            return false;
-        case AZ::NativeUI::AssertAction::BREAK:
-            return true;
-        default:
-            break;
-        }
-    }
-    return false;
-}
-
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYASSERT_IOS_H
diff --git a/Code/CryEngine/CryCommon/CryAssert_impl.h b/Code/CryEngine/CryCommon/CryAssert_impl.h
deleted file mode 100644
index e279b01c6a..0000000000
--- a/Code/CryEngine/CryCommon/CryAssert_impl.h
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Assert dialog box
-
-#pragma once
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define CRYASSERT_IMPL_H_SECTION_1 1
-#define CRYASSERT_IMPL_H_SECTION_2 2
-#endif
-
-#if defined(USE_CRY_ASSERT)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYASSERT_IMPL_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(CryAssert_impl_h)
-#endif
-
-#if defined(APPLE)
-#if defined(MAC)
-#include "CryAssert_Mac.h"
-#else
-#include "CryAssert_iOS.h"
-#endif
-#endif
-
-#if defined(LINUX)
-#if defined(ANDROID)
-#include "CryAssert_Android.h"
-#else
-#include "CryAssert_Linux.h"
-#endif
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYASSERT_IMPL_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(CryAssert_impl_h)
-#elif defined(WIN32)
-
-//-----------------------------------------------------------------------------------------------------
-
-#include <signal.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-//-----------------------------------------------------------------------------------------------------
-
-#define IDD_DIALOG_ASSERT           101
-#define IDC_CRYASSERT_EDIT_LINE                 1000
-#define IDC_CRYASSERT_EDIT_FILE                 1001
-#define IDC_CRYASSERT_EDIT_CONDITION        1002
-#define IDC_CRYASSERT_BUTTON_CONTINUE       1003
-#define IDC_CRYASSERT_EDIT_REASON               1004
-#define IDC_CRYASSERT_BUTTON_IGNORE         1005
-#define IDC_CRYASSERT_BUTTON_STOP               1007
-#define IDC_CRYASSERT_BUTTON_BREAK          1008
-#define IDC_CRYASSERT_BUTTON_IGNORE_ALL 1009
-
-#define IDC_CRYASSERT_STATIC_TEXT 0
-
-#define DLG_TITLE                   L"Assertion Failed"
-#define DLG_FONT                    L"MS Sans Serif"
-#define DLG_ITEM_TEXT_0     L"Continue"
-#define DLG_ITEM_TEXT_1     L"Stop"
-#define DLG_ITEM_TEXT_2     L"Info"
-#define DLG_ITEM_TEXT_3     L""
-#define DLG_ITEM_TEXT_4     L"Line"
-#define DLG_ITEM_TEXT_5     L""
-#define DLG_ITEM_TEXT_6     L"File"
-#define DLG_ITEM_TEXT_7     L"Condition"
-#define DLG_ITEM_TEXT_8     L""
-#define DLG_ITEM_TEXT_9     L"failed"
-#define DLG_ITEM_TEXT_10    L""
-#define DLG_ITEM_TEXT_11    L"Reason"
-#define DLG_ITEM_TEXT_12    L"Ignore"
-
-#define DLG_ITEM_TEXT_14    L"Break"
-#define DLG_ITEM_TEXT_15    L"Ignore All"
-
-#define DLG_NB_ITEM   15
-
-
-template<int iTitleSize>
-struct SDlgItem
-{
-    // If use my struct instead of DLGTEMPLATE, or else (for some strange reason) it is not DWORD aligned !!
-    DWORD style;
-    DWORD dwExtendedStyle;
-    short x;
-    short y;
-    short cx;
-    short cy;
-    WORD id;
-    WORD ch;
-    WORD c;
-    WCHAR t[iTitleSize];
-    WORD dummy;
-};
-#define SDLGITEM(TEXT, V) SDlgItem<sizeof(TEXT) / 2> V;
-
-struct SDlgData
-{
-    DLGTEMPLATE dlt;
-    WORD _menu;
-    WORD _class;
-    WCHAR _title[sizeof(DLG_TITLE) / 2];
-    WORD pointSize;
-    WCHAR _font[sizeof(DLG_FONT) / 2];
-
-    SDLGITEM(DLG_ITEM_TEXT_0,   i0);
-    SDLGITEM(DLG_ITEM_TEXT_12, i12);
-    SDLGITEM(DLG_ITEM_TEXT_15, i15);
-    SDLGITEM(DLG_ITEM_TEXT_14, i14);
-    SDLGITEM(DLG_ITEM_TEXT_1,   i1);
-    SDLGITEM(DLG_ITEM_TEXT_2,   i2);
-    SDLGITEM(DLG_ITEM_TEXT_3,   i3);
-    SDLGITEM(DLG_ITEM_TEXT_4,   i4);
-    SDLGITEM(DLG_ITEM_TEXT_5,   i5);
-    SDLGITEM(DLG_ITEM_TEXT_6,   i6);
-    SDLGITEM(DLG_ITEM_TEXT_7,   i7);
-    SDLGITEM(DLG_ITEM_TEXT_8,   i8);
-    SDLGITEM(DLG_ITEM_TEXT_9,   i9);
-    SDLGITEM(DLG_ITEM_TEXT_10, i10);
-    SDLGITEM(DLG_ITEM_TEXT_11, i11);
-};
-
-//-----------------------------------------------------------------------------------------------------
-
-static SDlgData g_dialogRC =
-{
-    {DS_SETFOREGROUND | DS_MODALFRAME | DS_3DLOOK | DS_SETFONT | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE, 0, DLG_NB_ITEM, 0, 0, 330, 134}, 0, 0, DLG_TITLE, 8, DLG_FONT,
-    {BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                      0,  12, 113, 50, 14, IDC_CRYASSERT_BUTTON_CONTINUE,  0xFFFF, 0x0080, DLG_ITEM_TEXT_0,  0},
-    {BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                   0,  66, 113, 50, 14, IDC_CRYASSERT_BUTTON_IGNORE,        0xFFFF, 0x0080, DLG_ITEM_TEXT_12, 0},
-    {BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                      0,  120, 113, 50, 14, IDC_CRYASSERT_BUTTON_IGNORE_ALL, 0xFFFF, 0x0080, DLG_ITEM_TEXT_15, 0},
-    {BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                      0,  214, 113, 50, 14, IDC_CRYASSERT_BUTTON_BREAK,         0xFFFF, 0x0080, DLG_ITEM_TEXT_14, 0},
-    {BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                      0,  268, 113, 50, 14, IDC_CRYASSERT_BUTTON_STOP,          0xFFFF, 0x0080, DLG_ITEM_TEXT_1,  0},
-    {BS_GROUPBOX | WS_CHILD | WS_VISIBLE,                                                                   0,  7,  7,  316, 100, IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0080, DLG_ITEM_TEXT_2,  0},
-    {ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_CHILD | WS_VISIBLE, 0,    50, 48, 25, 13, IDC_CRYASSERT_EDIT_LINE,                0xFFFF, 0x0081, DLG_ITEM_TEXT_3,  0},
-    {WS_CHILD | WS_VISIBLE,                                                                                           0,  14, 50, 14, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_4,  0},
-    {ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_CHILD | WS_VISIBLE, 0,    50, 32, 240, 13, IDC_CRYASSERT_EDIT_FILE,                0xFFFF, 0x0081, DLG_ITEM_TEXT_5,  0},
-    {WS_CHILD | WS_VISIBLE,                                                                                           0,  14, 34, 12, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_6,  0},
-    {WS_CHILD | WS_VISIBLE,                                                                                           0,  13, 18, 30, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_7,  0},
-    {ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_CHILD | WS_VISIBLE, 0,    50, 16, 240, 13, IDC_CRYASSERT_EDIT_CONDITION,       0xFFFF, 0x0081, DLG_ITEM_TEXT_8,  0},
-    {WS_CHILD | WS_VISIBLE,                                                                                           0,  298, 19, 18, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_9,  0},
-    {ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_CHILD | WS_VISIBLE, 0,    50, 67, 240, 13, IDC_CRYASSERT_EDIT_REASON,          0xFFFF, 0x0081, DLG_ITEM_TEXT_10, 0},
-    {WS_CHILD | WS_VISIBLE,                                                                                           0,  15, 69, 26, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_11, 0},
-};
-
-//-----------------------------------------------------------------------------------------------------
-
-struct SCryAssertInfo
-{
-    const char* pszCondition;
-    const char* pszFile;
-    const char* pszMessage;
-
-    unsigned int uiLine;
-
-    enum
-    {
-        BUTTON_CONTINUE,
-        BUTTON_IGNORE,
-        BUTTON_IGNORE_ALL,
-        BUTTON_BREAK,
-        BUTTON_STOP,
-        BUTTON_REPORT_AS_BUG,
-    } btnChosen;
-
-    unsigned int uiX;
-    unsigned int uiY;
-};
-
-//-----------------------------------------------------------------------------------------------------
-
-static INT_PTR CALLBACK DlgProc(HWND _hDlg, UINT _uiMsg, WPARAM _wParam, LPARAM _lParam)
-{
-    static SCryAssertInfo* pAssertInfo = NULL;
-
-    const UINT WM_USER_SHOWFILE_MESSAGE = (WM_USER + 0x4000);
-
-    switch (_uiMsg)
-    {
-    case WM_INITDIALOG:
-    {
-        pAssertInfo = (SCryAssertInfo*) _lParam;
-
-        SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_CONDITION),   pAssertInfo->pszCondition);
-        SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_FILE),            pAssertInfo->pszFile);
-
-        // Want to move the cursor on the file text, so that the end of the file is the first thing visible,
-        // instead of the beginning, which will be the user's depot, and the same for pretty much every file.
-        // Have to do this delayed, because if it's done in WM_INITDIALOG, it doesn't work.
-        // PostMessage will add this to the end of the message queue.
-        PostMessage(_hDlg, WM_USER_SHOWFILE_MESSAGE, 0, 0);
-
-        char szLine[MAX_PATH];
-        sprintf_s(szLine, "%d", pAssertInfo->uiLine);
-        SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_LINE), szLine);
-
-        if (pAssertInfo->pszMessage && pAssertInfo->pszMessage[0] != '\0')
-        {
-            SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_REASON), pAssertInfo->pszMessage);
-        }
-        else
-        {
-            SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_REASON), "No Reason");
-        }
-
-        SetWindowPos(_hDlg, HWND_TOPMOST, pAssertInfo->uiX, pAssertInfo->uiY, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
-
-        break;
-    }
-
-    case WM_USER_SHOWFILE_MESSAGE:
-    {
-        // Still have to delay sending this message, or it won't work for some reason.
-        // Windows does a whole bunch of stuff behind the scenes. Using PostMessage here seems to work better.
-        PostMessage(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_FILE), EM_SETSEL, strlen(pAssertInfo->pszFile), -1);
-        break;
-    }
-
-    case WM_COMMAND:
-    {
-        switch (LOWORD(_wParam))
-        {
-        case IDCANCEL:
-        case IDC_CRYASSERT_BUTTON_CONTINUE:
-        {
-            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_CONTINUE;
-            EndDialog(_hDlg, 0);
-            break;
-        }
-        case IDC_CRYASSERT_BUTTON_IGNORE:
-        {
-            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_IGNORE;
-            EndDialog(_hDlg, 0);
-            break;
-        }
-        case IDC_CRYASSERT_BUTTON_IGNORE_ALL:
-        {
-            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_IGNORE_ALL;
-            EndDialog(_hDlg, 0);
-            break;
-        }
-        case IDC_CRYASSERT_BUTTON_BREAK:
-        {
-            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_BREAK;
-            EndDialog(_hDlg, 0);
-            break;
-        }
-        case IDC_CRYASSERT_BUTTON_STOP:
-        {
-            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_STOP;
-            EndDialog(_hDlg, 1);
-            break;
-        }
-        default:
-            break;
-        }
-        ;
-        break;
-    }
-
-    case WM_DESTROY:
-    {
-        if (pAssertInfo)
-        {
-            RECT rcWindowBounds;
-            GetWindowRect(_hDlg, &rcWindowBounds);
-            pAssertInfo->uiX = rcWindowBounds.left;
-            pAssertInfo->uiY = rcWindowBounds.top;
-        }
-        break;
-    }
-
-    default:
-        return FALSE;
-    }
-    ;
-
-    return TRUE;
-}
-
-//-----------------------------------------------------------------------------------------------------
-
-static char gs_szMessage[MAX_PATH];
-
-//-----------------------------------------------------------------------------------------------------
-
-void CryAssertTrace(const char* _pszFormat, ...)
-{
-    if (gEnv == 0)
-    {
-        return;
-    }
-    if (!gEnv->bIgnoreAllAsserts)
-    {
-        if (NULL == _pszFormat)
-        {
-            gs_szMessage[0] = '\0';
-        }
-        else
-        {
-            va_list args;
-            va_start(args, _pszFormat);
-            vsnprintf_s(gs_szMessage, sizeof(gs_szMessage), _TRUNCATE, _pszFormat, args);
-            va_end(args);
-        }
-    }
-}
-
-//-----------------------------------------------------------------------------------------------------
-
-static const char* gs_strRegSubKey  = "Software\\O3DE\\AssertWindow";
-static const char* gs_strRegXValue  = "AssertInfoX";
-static const char* gs_strRegYValue  = "AssertInfoY";
-
-//-----------------------------------------------------------------------------------------------------
-
-void RegistryReadUInt32(const char* _strSubKey, const char* _strRegName, unsigned int* _puiValue, unsigned int _uiDefault)
-{
-    HKEY hKey;
-    RegCreateKeyEx(HKEY_CURRENT_USER, _strSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL);
-
-    DWORD dwType;
-    DWORD dwLength = sizeof(DWORD);
-
-    if (ERROR_SUCCESS != RegQueryValueEx(hKey, _strRegName, 0, &dwType, (BYTE*) _puiValue, &dwLength))
-    {
-        *_puiValue = _uiDefault;
-    }
-
-    RegCloseKey(hKey);
-}
-
-//-----------------------------------------------------------------------------------------------------
-
-void RegistryWriteUInt32(const char* _strSubKey, const char* _strRegName, unsigned int _uiValue)
-{
-    HKEY hKey;
-    RegCreateKeyEx(HKEY_CURRENT_USER, _strSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL);
-    RegSetValueEx   (hKey, _strRegName, 0, REG_DWORD, (BYTE*) &_uiValue, sizeof(DWORD));
-    RegCloseKey     (hKey);
-}
-
-//-----------------------------------------------------------------------------------------------------
-
-class CCursorShowerWithStack
-{
-public:
-    void StoreCurrentAndShow()
-    {
-        m_numberOfShows = 1;
-
-        while (ShowCursor(TRUE) < 0)
-        {
-            ++m_numberOfShows;
-        }
-    }
-
-    void RevertToPrevious()
-    {
-        while (m_numberOfShows > 0)
-        {
-            ShowCursor(FALSE);
-            --m_numberOfShows;
-        }
-    }
-
-private:
-    int m_numberOfShows;
-};
-
-bool CryAssert(const char* _pszCondition, const char* _pszFile, unsigned int _uiLine, bool* _pbIgnore)
-{
-    if (!gEnv)
-    {
-        return false;
-    }
-
-#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
-    // we are in a non-debug build, so we should turn this into a warning instead.
-    if ((gEnv) && (gEnv->pLog))
-    {
-        if (!gEnv->bIgnoreAllAsserts)
-        {
-            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", _pszFile, _uiLine, _pszCondition);
-        }
-    }
-    
-    if (_pbIgnore)
-    {
-        // avoid showing the same one repeatedly.
-        *_pbIgnore = true;
-    }
-    return false;
-#endif
-
-    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
-    {
-        SCryAssertInfo assertInfo;
-
-        assertInfo.pszCondition = _pszCondition;
-        assertInfo.pszFile          = _pszFile;
-        assertInfo.pszMessage       = gs_szMessage;
-        assertInfo.uiLine               = _uiLine;
-        assertInfo.btnChosen        = SCryAssertInfo::BUTTON_CONTINUE;
-
-        gEnv->pSystem->SetAssertVisible(true);
-        RegistryReadUInt32(gs_strRegSubKey, gs_strRegXValue, &assertInfo.uiX, 10);
-        RegistryReadUInt32(gs_strRegSubKey, gs_strRegYValue, &assertInfo.uiY, 10);
-
-        CCursorShowerWithStack cursorShowerWithStack;
-        cursorShowerWithStack.StoreCurrentAndShow();
-
-        DialogBoxIndirectParam(GetModuleHandle(NULL), (DLGTEMPLATE*) &g_dialogRC, GetDesktopWindow(), DlgProc, (LPARAM) &assertInfo);
-
-        cursorShowerWithStack.RevertToPrevious();
-
-        RegistryWriteUInt32(gs_strRegSubKey, gs_strRegXValue, assertInfo.uiX);
-        RegistryWriteUInt32(gs_strRegSubKey, gs_strRegYValue, assertInfo.uiY);
-        gEnv->pSystem->SetAssertVisible(false);
-
-        switch (assertInfo.btnChosen)
-        {
-        case SCryAssertInfo::BUTTON_IGNORE:
-            *_pbIgnore = true;
-            break;
-        case SCryAssertInfo::BUTTON_IGNORE_ALL:
-            gEnv->bIgnoreAllAsserts = true;
-            break;
-        case SCryAssertInfo::BUTTON_BREAK:
-            return true;
-        case SCryAssertInfo::BUTTON_STOP:
-            raise(SIGABRT);
-            exit(-1);
-        case SCryAssertInfo::BUTTON_REPORT_AS_BUG:
-            if (gEnv && gEnv->pSystem)
-            {
-                const char* pszSafeMessage = (assertInfo.pszMessage && assertInfo.pszMessage[0]) ? assertInfo.pszMessage : "<no reason>";
-                gEnv->pSystem->ReportBug("Assert: %s - %s", assertInfo.pszCondition, pszSafeMessage);
-            }
-            break;
-        }
-    }
-    
-    if (gEnv && gEnv->pSystem)
-    {
-        // this also can cause fatal / shutdown behavior:
-        gEnv->pSystem->OnAssert(_pszCondition, gs_szMessage, _pszFile, _uiLine);
-    }
-
-    return false;
-}
-
-//-----------------------------------------------------------------------------------------------------
-
-#endif
-#endif
-
-//-----------------------------------------------------------------------------------------------------
diff --git a/Code/CryEngine/CryCommon/CryCommon.cpp b/Code/CryEngine/CryCommon/CryCommon.cpp
deleted file mode 100644
index a8caf86bb4..0000000000
--- a/Code/CryEngine/CryCommon/CryCommon.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-//      This contains compiled code that is used by other projects in the solution.
-//      Because we don't want static DLL dependencies, the CryCommon project is not compiled into a library.
-//      Instead, this .cpp file is included in every project which needs it.
-//      But we also include it in the CryCommon project (disabled in the build),
-//      so that CryCommon can have the same editable settings as other projects.
-
-// Set this to 1 to get an output of some pre-defined compiler symbols.
-
-#if 0
-
-#ifdef _WIN32
-#pragma message("_WIN32")
-#endif
-#ifdef _WIN64
-#pragma message("_WIN64")
-#endif
-
-#ifdef _M_IX86
-#pragma message("_M_IX86")
-#endif
-#ifdef _M_PPC
-#pragma message("_M_PPC")
-#endif
-
-#ifdef _DEBUG
-#pragma message("_DEBUG")
-#endif
-
-#ifdef _DLL
-#pragma message("_DLL")
-#endif
-#ifdef _USRDLL
-#pragma message("_USRDLL")
-#endif
-#ifdef _MT
-#pragma message("_MT")
-#endif
-
-#endif
-
-#include <AzCore/PlatformIncl.h>
-
-#include "TypeInfo_impl.h"
diff --git a/Code/CryEngine/CryCommon/CryCrc32.h b/Code/CryEngine/CryCommon/CryCrc32.h
deleted file mode 100644
index 73c14bacea..0000000000
--- a/Code/CryEngine/CryCommon/CryCrc32.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "BaseTypes.h"
-
-// CRC-32
-//
-// Polynomial:
-//   0x04C11DB7
-//   x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1
-//
-// Validation:
-//   CCrc32::Compute("123456789") == 0xCBF43926
-//
-// Examples of using:
-//
-//   printf("crc32: %08x\n", (unsigned)CCrc32::Compute(ptr, size));
-//
-//   CCrc32 crc;
-//   crc.Add(ptr0, size0);
-//   crc.Add(ptr1, size1);
-//   printf("crc32: %08x\n", (unsigned)crc.Get());
-
-class CCrc32
-{
-public:
-    static uint32 Compute(const void* const pData, const size_t sizeInBytes)
-    {
-        CCrc32 c;
-        c.Add(pData, sizeInBytes);
-        return c.Get();
-    }
-
-    static uint32 Compute(const char* const szData)
-    {
-        CCrc32 c;
-        c.Add(szData);
-        return c.Get();
-    }
-
-    static uint32 ComputeLowercase(const char* const pData, const size_t sizeInBytes)
-    {
-        CCrc32 c;
-        c.AddLowercase(pData, sizeInBytes);
-        return c.Get();
-    }
-
-    static uint32 ComputeLowercase(const char* const szData)
-    {
-        CCrc32 c;
-        c.AddLowercase(szData);
-        return c.Get();
-    }
-
-
-    CCrc32()
-        : m_crc(0xFFFFffff)
-        , m_pTable(GetTable())
-    {
-    }
-
-    CCrc32(unsigned int initializer)
-        : m_crc(initializer)
-        , m_pTable(GetTable())
-    {
-    }
-
-    void Reset()
-    {
-        m_crc = 0xFFFFffff;
-    }
-
-    uint32 Get() const
-    {
-        return ~m_crc;
-    }
-
-    unsigned int Add(const void* const pData, size_t sizeInBytes)
-    {
-        const uint8* p = (const uint8*)pData;
-        while (sizeInBytes--)
-        {
-            m_crc = (m_crc >> 8) ^ m_pTable[(m_crc & 0xFF) ^ (*p++)];
-        }
-        return Get();
-    }
-
-    unsigned int Add(const char* szData)
-    {
-        while (*szData)
-        {
-            m_crc = (m_crc >> 8) ^ m_pTable[(m_crc & 0xFF) ^ uint8(*szData++)];
-        }
-        return Get();
-    }
-
-#if defined(CRY_TMP_ASCII_TO_LOWER)
-#   error CRY_TMP_ASCII_TO_LOWER already defined
-#endif
-#define CRY_TMP_ASCII_TO_LOWER(c)  uint8(((c) <= 'Z' && (c) >= 'A') ? (c) + ('a' - 'A') : (c))
-
-    unsigned int AddLowercase(const char* pData, size_t sizeInBytes)
-    {
-        while (sizeInBytes--)
-        {
-            const uint8 c = *pData++;
-            m_crc = (m_crc >> 8) ^ m_pTable[(m_crc & 0xFF) ^ CRY_TMP_ASCII_TO_LOWER(c)];
-        }
-        return Get();
-    }
-
-    unsigned int AddLowercase(const char* szData)
-    {
-        while (*szData)
-        {
-            const uint8 c = *szData++;
-            m_crc = (m_crc >> 8) ^ m_pTable[(m_crc & 0xFF) ^ CRY_TMP_ASCII_TO_LOWER(c)];
-        }
-        return Get();
-    }
-
-#undef CRY_TMP_ASCII_TO_LOWER
-
-private:
-    static const uint32* GetTable()
-    {
-        static const uint32 table[256] =
-        {
-            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-            0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-            0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-            0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-            0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-            0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-            0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-            0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-            0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-            0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-            0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-            0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-            0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-            0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-            0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-            0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-            0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-            0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-            0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-            0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-            0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-            0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-            0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-            0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-            0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-            0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-            0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-            0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-            0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-            0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-            0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-            0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-            0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-            0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-            0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-            0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-            0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-            0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-            0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-        };
-        return &table[0];
-    }
-
-private:
-    uint32 m_crc;
-    const uint32* const m_pTable;
-};
-
-// eof
diff --git a/Code/CryEngine/CryCommon/CryCustomTypes.h b/Code/CryEngine/CryCommon/CryCustomTypes.h
deleted file mode 100644
index 97ea13f9b4..0000000000
--- a/Code/CryEngine/CryCommon/CryCustomTypes.h
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Derived CTypeInfos for structs, enums, etc.
-//               Compressed numerical types  and associated TypeInfos
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYCUSTOMTYPES_H
-#define CRYINCLUDE_CRYCOMMON_CRYCUSTOMTYPES_H
-#pragma once
-
-#include "CryTypeInfo.h"
-#include "CryFixedString.h"
-#include <Cry_Math.h>
-#include <Cry_Color.h>
-#include <AzCore/Casting/numeric_cast.h>
-
-#define STATIC_CONST(T, name, val) \
-    static inline T name()  { static T t = val; return t; }
-
-#define ARRAY_COUNT(arr)        (sizeof(arr) / sizeof *(arr))
-#define ARRAY_VAR(arr)          ArrayT(&(arr)[0], (int)ARRAY_COUNT(arr))
-
-//---------------------------------------------------------------------------
-// String helper function.
-
-template<class T>
-inline bool HasString(const T& val, FToString flags, const void* def_data = 0)
-{
-    if (flags.SkipDefault)
-    {
-        if (val == (def_data ? *(const T*)def_data : T()))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-float NumToFromString(float val, int digits, bool floating, char buffer[], int buf_size);
-
-template<class T>
-string NumToString(T val, int min_digits, int max_digits, bool floating)
-{
-    char buffer[64];
-    float f(val);
-    for (int digits = min_digits; digits < max_digits; digits++)
-    {
-        if (T(NumToFromString(f, digits, floating, buffer, 64)) == val)
-        {
-            break;
-        }
-    }
-    return buffer;
-}
-
-//---------------------------------------------------------------------------
-// TypeInfo for structs
-
-struct CStructInfo
-    : CTypeInfo
-{
-    CStructInfo(cstr name, size_t size, size_t align, Array<CVarInfo> vars = Array<CVarInfo>(), Array<CTypeInfo const*> templates = Array<CTypeInfo const*>());
-    virtual bool IsType(CTypeInfo const& Info) const;
-    virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const;
-    virtual bool FromString(void* data, cstr str, FFromString flags = 0) const;
-    virtual bool ToValue(const void* data, void* value, const CTypeInfo& typeVal) const;
-    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const;
-    virtual bool ValueEqual(const void* data, const void* def_data) const;
-    virtual void SwapEndian(void* pData, size_t nCount, bool bWriting) const;
-    virtual void GetMemoryUsage(ICrySizer* pSizer, void const* data) const;
-
-    virtual const CVarInfo* NextSubVar(const CVarInfo* pPrev, bool bRecurseBase = false) const;
-    virtual const CVarInfo* FindSubVar(cstr name) const;
-
-    virtual CTypeInfo const* const* NextTemplateType(CTypeInfo const* const* pPrev) const
-    {
-        pPrev = pPrev ? pPrev + 1 : TemplateTypes.begin();
-        return pPrev < TemplateTypes.end() ? pPrev : 0;
-    }
-
-protected:
-    Array<CVarInfo>                     Vars;
-    CryStackStringT<char, 16>   EndianDesc;             // Encodes instructions for endian swapping.
-    bool                                            HasBitfields;
-    Array<CTypeInfo const*>     TemplateTypes;
-
-    void MakeEndianDesc();
-    size_t AddEndianDesc(cstr desc, size_t dim, size_t elem_size);
-    bool IsCompatibleType(CTypeInfo const& Info) const;
-};
-
-//---------------------------------------------------------------------------
-// Template TypeInfo for base types, using global To/FromString functions.
-
-template<class T>
-struct TTypeInfo
-    : CTypeInfo
-{
-    TTypeInfo(cstr name)
-        : CTypeInfo(name, sizeof(T), alignof(T))
-    {}
-
-    virtual bool ToValue(const void* data, void* value, const CTypeInfo& typeVal) const
-    {
-        if (&typeVal == this)
-        {
-            return *(T*)value = *(const T*)data, true;
-        }
-        return false;
-    }
-    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
-    {
-        if (&typeVal == this)
-        {
-            return *(T*)data = *(const T*)value, true;
-        }
-        return false;
-    }
-
-    virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const
-    {
-        if (!HasString(*(const T*)data, flags, def_data))
-        {
-            return string();
-        }
-        return ::ToString(*(const T*)data);
-    }
-    virtual bool FromString(void* data, cstr str, FFromString flags = 0) const
-    {
-        if (!*str)
-        {
-            if (!flags.SkipEmpty)
-            {
-                *(T*)data = T();
-            }
-            return true;
-        }
-        return ::FromString(*(T*)data, str);
-    }
-    virtual bool ValueEqual(const void* data, const void* def_data = 0) const
-    {
-        return *(const T*)data == (def_data ? *(const T*)def_data : T());
-    }
-
-    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer, [[maybe_unused]] void const* data) const
-    {}
-};
-
-//---------------------------------------------------------------------------
-// Template TypeInfo for modified types (e.g. compressed, range-limited)
-
-template<class T, class S>
-struct TProxyTypeInfo
-    : CTypeInfo
-{
-    TProxyTypeInfo(cstr name)
-        : CTypeInfo(name, sizeof(S), alignof(S))
-    {}
-
-    virtual bool IsType(CTypeInfo const& Info) const
-    { return &Info == this || ValTypeInfo().IsType(Info); }
-
-    virtual bool ToValue(const void* data, void* value, const CTypeInfo& typeVal) const
-    {
-        if (&typeVal == this)
-        {
-            *(S*)value = *(const S*)data;
-            return true;
-        }
-        T val = T(*(const S*)data);
-        return ValTypeInfo().ToValue(&val, value, typeVal);
-    }
-    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
-    {
-        if (&typeVal == this)
-        {
-            *(S*)data = *(const S*)value;
-            return true;
-        }
-        T val;
-        if (ValTypeInfo().FromValue(&val, value, typeVal))
-        {
-            *(S*)data = S(val);
-            return true;
-        }
-        return false;
-    }
-
-    virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const
-    {
-        T val = T(*(const S*)data);
-        T def_val = def_data ? T(*(const S*)def_data) : T();
-        return ValTypeInfo().ToString(&val, flags, &def_val);
-    }
-    virtual bool FromString(void* data, cstr str, FFromString flags = 0) const
-    {
-        T val;
-        if (!*str)
-        {
-            if (!flags.SkipEmpty)
-            {
-                *(S*)data = S();
-            }
-            return true;
-        }
-        if (!TypeInfo(&val).FromString(&val, str))
-        {
-            return false;
-        }
-        *(S*)data = S(val);
-        return true;
-    }
-
-    // Forward additional TypeInfo functions.
-    virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
-    { return ValTypeInfo().GetLimit(eLimit, fVal); }
-    virtual cstr EnumElem(uint nIndex) const
-    { return ValTypeInfo().EnumElem(nIndex); }
-
-protected:
-
-    static const CTypeInfo& ValTypeInfo()
-    { return TypeInfo((T*)0); }
-};
-
-//---------------------------------------------------------------------------
-// Customisation for string.
-
-template<>
-inline string TTypeInfo<string>::ToString(const void* data, FToString flags, const void* def_data) const
-{
-    const string& val = *(const string*)data;
-    if (def_data && flags.SkipDefault)
-    {
-        if (val == *(const string*)def_data)
-        {
-            return string();
-        }
-    }
-    return val;
-}
-
-template<>
-inline bool TTypeInfo<string>::FromString(void* data, cstr str, FFromString flags) const
-{
-    if (!*str && flags.SkipEmpty)
-    {
-        return true;
-    }
-    *(string*)data = str;
-    return true;
-}
-
-template<>
-void TTypeInfo<string>::GetMemoryUsage(ICrySizer* pSizer, void const* data) const;
-
-//---------------------------------------------------------------------------
-//
-// TypeInfo for small integer types.
-
-
-template<class T>
-struct TIntTraits
-{
-    static const bool bSIGNED
-        = T(-1) < T(0);
-
-    static const T nMIN_FACTOR
-        = bSIGNED ? T(-1) : T(0);
-
-    static const size_t nPOS_BITS
-        = sizeof(T) * 8 - bSIGNED;
-
-    static const T nMIN = std::numeric_limits<T>::min();
-
-    static const T nMAX = std::numeric_limits<T>::max();
-};
-
-template<uint S>
-struct TIntType
-{};
-
-template<>
-struct TIntType<1>
-{
-    typedef int8 TType;
-};
-template<>
-struct TIntType<2>
-{
-    typedef int16 TType;
-};
-template<>
-struct TIntType<4>
-{
-    typedef int32 TType;
-};
-template<>
-struct TIntType<8>
-{
-    typedef int64 TType;
-};
-
-template<class D, class S>
-inline bool ConvertInt(D& dest, S src)
-{
-    if constexpr (TIntTraits<D>::nPOS_BITS < TIntTraits<S>::nPOS_BITS)
-    {
-        src = clamp_tpl(src, S(TIntTraits<D>::nMIN), S(TIntTraits<D>::nMAX));
-    }
-    else if constexpr (TIntTraits<D>::bSIGNED < TIntTraits<S>::bSIGNED)
-    {
-        src = max(src, S(0));
-    }
-
-    dest = D(src);
-    assert(S(dest) == src);
-    return true;
-}
-
-template<class D>
-inline bool ConvertInt(D& dest, const void* src, const CTypeInfo& typeSrc)
-{
-    if (typeSrc.IsType<int>())
-    {
-        switch (typeSrc.Size)
-        {
-        case 1:
-            return ConvertInt(dest, *(const int8*)src);
-        case 2:
-            return ConvertInt(dest, *(const int16*)src);
-        case 4:
-            return ConvertInt(dest, *(const int32*)src);
-        case 8:
-            return ConvertInt(dest, *(const int64*)src);
-        }
-    }
-    else if (typeSrc.IsType<uint>())
-    {
-        switch (typeSrc.Size)
-        {
-        case 1:
-            return ConvertInt(dest, *(const uint8*)src);
-        case 2:
-            return ConvertInt(dest, *(const uint16*)src);
-        case 4:
-            return ConvertInt(dest, *(const uint32*)src);
-        case 8:
-            return ConvertInt(dest, *(const uint64*)src);
-        }
-    }
-    return false;
-}
-
-template<class S>
-inline bool ConvertInt(void* dest, const CTypeInfo& typeDest, S src)
-{
-    if (typeDest.IsType<int>())
-    {
-        switch (typeDest.Size)
-        {
-        case 1:
-            return ConvertInt(*(int8*)dest, src);
-        case 2:
-            return ConvertInt(*(int16*)dest, src);
-        case 4:
-            return ConvertInt(*(int32*)dest, src);
-        case 8:
-            return ConvertInt(*(int64*)dest, src);
-        }
-    }
-    else if (typeDest.IsType<uint>())
-    {
-        switch (typeDest.Size)
-        {
-        case 1:
-            return ConvertInt(*(uint8*)dest, src);
-        case 2:
-            return ConvertInt(*(uint16*)dest, src);
-        case 4:
-            return ConvertInt(*(uint32*)dest, src);
-        case 8:
-            return ConvertInt(*(uint64*)dest, src);
-        }
-    }
-    return false;
-}
-
-template<class T>
-struct TIntTypeInfo
-    : TTypeInfo<T>
-{
-    TIntTypeInfo(cstr name)
-        : TTypeInfo<T>(name)
-    {}
-
-    virtual bool IsType(CTypeInfo const& Info) const
-    { return &Info == this || &Info == (TIntTraits<T>::bSIGNED ? &TypeInfo((int*)0) : &TypeInfo((uint*)0)); }
-
-    virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
-    {
-        if (eLimit == eLimit_Min)
-        {
-            return fVal = float(TIntTraits<T>::nMIN), true;
-        }
-        if (eLimit == eLimit_Max)
-        {
-            return fVal = float(TIntTraits<T>::nMAX), true;
-        }
-        if (eLimit == eLimit_Step)
-        {
-            return fVal = 1.f, true;
-        }
-        return false;
-    }
-
-    // Override to allow int conversion
-    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
-    { return ConvertInt(*(T*)data, value, typeVal); }
-    virtual bool ToValue(const void* data, void* value, const CTypeInfo& typeVal) const
-    { return ConvertInt(value, typeVal, *(const T*)data); }
-};
-
-//---------------------------------------------------------------------------
-// Store any type, such as an enum, in a small int.
-
-template<class T, int nMIN = INT_MIN, int nMAX = INT_MAX, int nDEFAULT = 0>
-struct TRangedType
-{
-    typedef TRangedType<T, nMIN, nMAX, nDEFAULT> TThis;
-
-    TRangedType(T init = T(nDEFAULT))
-        : m_Val(init)
-    {
-        CheckRange(m_Val);
-    }
-
-    operator T() const
-    {
-        return m_Val;
-    }
-
-    CUSTOM_STRUCT_INFO(CCustomInfo)
-
-protected:
-    T       m_Val;
-
-    static bool HasMin()
-    { return nMIN > INT_MIN; }
-    static bool HasMax()
-    { return nMAX < INT_MAX; }
-
-    static bool CheckRange(T& val)
-    {
-        if (HasMin() && val < T(nMIN))
-        {
-            val = T(nMIN);
-            return false;
-        }
-        else if (HasMax() && val > T(nMAX))
-        {
-            val = T(nMAX);
-            return false;
-        }
-        return true;
-    }
-
-    // Adaptor TypeInfo for specifying limits, and implementing range checking
-    struct CCustomInfo
-        : TProxyTypeInfo<T, TThis>
-    {
-        CCustomInfo()
-            : TProxyTypeInfo<T, TThis>(::TypeInfo((T*) 0).Name)
-        {}
-
-        virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
-        {
-            if (eLimit == eLimit_Min && HasMin())
-            {
-                return fVal = T(nMIN), true;
-            }
-            if (eLimit == eLimit_Max && HasMax())
-            {
-                return fVal = T(nMAX), true;
-            }
-            return ::TypeInfo((T*)0).GetLimit(eLimit, fVal);
-        }
-    };
-};
-
-//---------------------------------------------------------------------------
-// Store any type, such as an enum, in a small int.
-
-template<class T, class S = uint8, int nOffset = 0, int nDefault = nOffset>
-struct TSmall
-{
-    typedef TSmall<T, S, nOffset, nDefault> TThis;
-    typedef T       TValue;
-
-    inline TSmall(T val = T(nDefault))
-    {
-        set(val);
-    }
-    void set(T val = T(nDefault))
-    {
-        m_Val = S(val) - S(nOffset);
-
-        // The unary operator+() forces integer promotion to happen and thus
-        // induces a call to operator T(), which allows the equality operator to work.
-        assert(+(*this) == val);
-    }
-
-    inline operator T() const
-    { return T(T(m_Val) + nOffset); }
-    inline T operator +() const
-    { return T(T(m_Val) + nOffset); }
-
-    CUSTOM_STRUCT_INFO(CCustomInfo)
-
-protected:
-    S       m_Val;
-
-    struct CCustomInfo
-        : TProxyTypeInfo<T, TThis>
-    {
-        CCustomInfo()
-            : TProxyTypeInfo<T, TThis>("TSmall<>")
-        {}
-
-        virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
-        {
-            if (eLimit == eLimit_Min)
-            {
-                return fVal = float(TIntTraits<S>::nMIN + nOffset), true;
-            }
-            if (eLimit == eLimit_Max)
-            {
-                return fVal = float(TIntTraits<S>::nMAX + nOffset), true;
-            }
-            if (eLimit == eLimit_Step)
-            {
-                return fVal = 1.f, true;
-            }
-            return false;
-        }
-    };
-};
-
-//---------------------------------------------------------------------------
-// Quantise a float linearly in an int.
-template<class S, int nLIMIT, S nQUANT = TIntTraits<S>::nMAX, bool bTRUNC = false>
-struct TFixed
-{
-    typedef float TValue;
-
-    inline TFixed()
-        : m_Store(0)
-    {}
-
-    inline TFixed(float fIn)
-    {
-        float fStore = ToStore(fIn);
-        fStore = clamp_tpl(fStore, float(TIntTraits<S>::nMIN_FACTOR * nQUANT), float(nQUANT));
-        m_Store = bTRUNC ? S(fStore) : fStore < 0.f ? S(fStore - 0.5f) : S(fStore + 0.5f);
-    }
-
-    // Conversion.
-    inline operator float() const
-    { return FromStore(m_Store); }
-    inline float operator +() const
-    { return FromStore(m_Store); }
-    inline bool operator !() const
-    { return !m_Store; }
-
-    inline bool operator ==(const TFixed& x) const
-    { return m_Store == x.m_Store; }
-    inline bool operator ==(float x) const
-    { return m_Store == TFixed(x); }
-    inline S GetStore() const
-    { return m_Store; }
-
-    static S GetMaxStore()
-    { return nQUANT; }
-    static float GetMaxValue()
-    { return float(nLIMIT); }
-
-    CUSTOM_STRUCT_INFO(CCustomInfo)
-
-protected:
-    S       m_Store;
-
-    typedef TFixed<S, nLIMIT, nQUANT, bTRUNC> TThis;
-
-    static const int nMAX = nLIMIT;
-    static const int nMIN = TIntTraits<S>::nMIN_FACTOR * nLIMIT;
-
-    static inline float ToStore(float f)
-    { return f * float(nQUANT) / float(nLIMIT); }
-    static inline float FromStore(float f)
-    { return f * float(nLIMIT) / float(nQUANT); }
-
-    // TypeInfo implementation.
-    struct CCustomInfo
-        : TProxyTypeInfo<float, TThis>
-    {
-        CCustomInfo()
-            : TProxyTypeInfo<float, TThis>("TFixed<>")
-        {}
-
-        virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
-        {
-            if (eLimit == eLimit_Min)
-            {
-                return fVal = float(nMIN), true;
-            }
-            if (eLimit == eLimit_Max)
-            {
-                return fVal = float(nMAX), true;
-            }
-            if (eLimit == eLimit_Step)
-            {
-                return fVal = FromStore(1.f), true;
-            }
-            return false;
-        }
-
-        // Override ToString: Limit to significant digits.
-        virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const
-        {
-            if (!HasString(*(const S*)data, flags, def_data))
-            {
-                return string();
-            }
-            static int digits = int_ceil(log10f(float(nQUANT)));
-            return NumToString(*(const TFixed*)data, 1, digits + 3, true);
-        }
-    };
-};
-
-
-// Define the canonical float-to-byte quantisation.
-typedef TFixed<uint8, 1> UnitFloat8;
-
-#ifdef COMPRESSED_FLOATS
-
-//---------------------------------------------------------------------------
-// A floating point number, with templated storage size (and sign), and number of exponent bits
-template<class S, int nEXP_BITS>
-struct TFloat
-{
-    typedef float TValue;
-
-    ILINE TFloat()
-        : m_Store(0)
-    {}
-
-    ILINE TFloat(float fIn)
-        : m_Store(FromFloat(fIn))
-    {}
-
-    ILINE operator float() const
-    { return ToFloat(m_Store); }
-    ILINE float operator +() const
-    { return ToFloat(m_Store); }
-
-    ILINE bool operator !() const
-    { return !m_Store; }
-
-    ILINE bool operator ==(TFloat x) const
-    { return m_Store == x.m_Store; }
-    ILINE bool operator ==(float x) const
-    { return float(*this) == x; }
-
-    inline TFloat& operator *=(float x)
-    { return *this = *this * x; }
-
-    ILINE uint32 partial_float_conversion() const
-    { return (0 == m_Store) ? 0 : ToFloatCore(m_Store); }
-
-    STATIC_CONST(float, fMAX, ToFloat(TIntTraits<S>::nMAX));
-    STATIC_CONST(float, fPOS_MIN, ToFloat(1 << nMANT_BITS));
-    STATIC_CONST(float, fMIN, -fMAX() * (float)TIntTraits<S>::bSIGNED);
-
-    CUSTOM_STRUCT_INFO(CCustomInfo)
-
-protected:
-    S       m_Store;
-
-    typedef TFloat<S, nEXP_BITS> TThis;
-
-    static const S nBITS = sizeof(S) * 8;
-    static const S nSIGN = TIntTraits<S>::bSIGNED;
-    static const S nMANT_BITS = nBITS - nEXP_BITS - nSIGN;
-    static const S nSIGN_MASK = S(nSIGN << (nBITS - 1));
-    static const S nMANT_MASK = (S(1) << nMANT_BITS) - 1;
-    static const S nEXP_MASK = ~S(nMANT_MASK | nSIGN_MASK);
-    static const int nEXP_MAX = 1 << (nEXP_BITS - 1),
-                     nEXP_MIN = 1 - nEXP_MAX;
-
-    STATIC_CONST(float, fROUNDER, 1.f + fPOS_MIN() * 0.5f);
-
-    static inline S FromFloat(float fIn)
-    {
-        COMPILE_TIME_ASSERT(sizeof(S) <= 4);
-        COMPILE_TIME_ASSERT(nEXP_BITS > 0 && nEXP_BITS <= 8 && nEXP_BITS < sizeof(S) * 8 - 4);
-
-        // Clamp to allowed range.
-        float fClamped = clamp_tpl(fIn * fROUNDER(), fMIN(), fMAX());
-
-        // Bit shift to convert from IEEE float32.
-        uint32 uBits = *(const uint32*)&fClamped;
-
-        // Convert exp.
-        int32 iExp = (uBits >> 23) & 0xFF;
-        iExp -= 127 + nEXP_MIN;
-        IF (iExp < 0, 0)
-        {
-            // Underflow.
-            return 0;
-        }
-
-        // Reduce mantissa.
-        uint32 uMant = uBits >> (23 - nMANT_BITS);
-
-        S bits = (uMant & nMANT_MASK)
-            | (iExp << nMANT_BITS)
-            | ((uBits >> (32 - nBITS)) & nSIGN_MASK);
-
-        #ifdef _DEBUG
-        fIn = clamp_tpl(fIn, fMIN(), fMAX());
-        float fErr = fabs(ToFloat(bits) - fIn);
-        float fMaxErr = fabs(fIn) / float(1 << nMANT_BITS);
-        assert(fErr <= fMaxErr);
-        #endif
-
-        return bits;
-    }
-
-    static inline uint32 ToFloatCore(S bits)
-    {
-        // Extract FP components.
-        uint32 uBits = bits & nMANT_MASK,
-               uExp = (bits & ~nSIGN_MASK) >> nMANT_BITS,
-               uSign = bits & nSIGN_MASK;
-
-        // Shift to 32-bit.
-        uBits <<= 23 - nMANT_BITS;
-        uBits |= (uExp + 127 + nEXP_MIN) << 23;
-        uBits |= uSign << (32 - nBITS);
-
-        return uBits;
-    }
-
-    static ILINE float ToFloat(S bits)
-    {
-        IF (bits == 0, 0)
-        {
-            return 0.f;
-        }
-
-        uint32 uBits = ToFloatCore(bits);
-        return *(float*)&uBits;
-    }
-
-    // TypeInfo implementation.
-    struct CCustomInfo
-        : TProxyTypeInfo<float, TThis>
-    {
-        CCustomInfo()
-            : TProxyTypeInfo<float, TThis>("TFloat<>")
-        {}
-
-        virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
-        {
-            if (eLimit == eLimit_Min)
-            {
-                return fVal = fMIN(), true;
-            }
-            if (eLimit == eLimit_Max)
-            {
-                return fVal = fMAX(), true;
-            }
-            if (eLimit == eLimit_Step)
-            {
-                return fVal = fPOS_MIN(), true;
-            }
-            return false;
-        }
-
-        // Override ToString: Limit to significant digits.
-        virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const
-        {
-            if (!HasString(*(const S*)data, flags, def_data))
-            {
-                return string();
-            }
-            static int digits = int_ceil(log10f(1 << nMANT_BITS));
-            return NumToString(*(const TFloat*)data, 1, digits + 3, true);
-        }
-    };
-};
-
-// Canonical float16 types, with range ~= 64K.
-typedef TFloat<int16, 5>     SFloat16;
-typedef TFloat<uint16, 5>    UFloat16;
-
-template<typename T>
-ILINE T partial_float_cast(const SFloat16& s) { return static_cast<T>(s.partial_float_conversion()); }
-
-template<typename T>
-ILINE T partial_float_cast(const UFloat16& u) { return static_cast<T>(u.partial_float_conversion()); }
-
-#ifdef _DEBUG
-
-// Classes for unit tests.
-template<class T2, class T>
-void TestValues(T val)
-{
-    T2 val2 = val;
-    T2 val2c;
-
-    bool b = TypeInfo(&val2c).FromValue(&val2c, val);
-    assert(b);
-    assert(val2 == val2c);
-    b = TypeInfo(&val2c).ToValue(&val2c, val);
-    assert(b);
-    assert(val2 == T2(val));
-}
-
-template<class T2, class T>
-void TestTypes(T val)
-{
-    T2 val2 = val;
-    string s = TypeInfo(&val2).ToString(&val2);
-    bool b = TypeInfo(&val).FromString(&val, s);
-    assert(b);
-    assert(val2 == T2(val));
-
-    TestValues<T2>(val);
-}
-
-template<class T>
-void TestType(T val)
-{
-    TestTypes<T>(val);
-}
-
-#endif // _DEBUG
-
-#endif // COMPRESSED_FLOATS
-
-//---------------------------------------------------------------------------
-// TypeInfo for enums
-
-//---------------------------------------------------------------------------
-// Implement data features based on enum definition
-/*
-    interface EnumDef
-    {
-        typedef TInt;
-        uint Count();
-        TInt Value(uint i);
-        cstr Name(uint i);
-        bool MatchName(uint i, cstr str);
-        cstr ToName(TInt value);
-    } const
-*/
-
-template<class TEnumDef, class TInt>
-struct TEnumInfo
-    : TIntTypeInfo<TInt>
-    , TEnumDef
-{
-    TEnumInfo(cstr name)
-        : TIntTypeInfo<TInt>(name) {}
-
-    virtual cstr EnumElem(uint nIndex) const
-    {
-        if (nIndex < TEnumDef::Count())
-        {
-            cstr name = TEnumDef::Name(nIndex);
-            if (*name != '_')
-            {
-                return name;
-            }
-        }
-        return 0;
-    }
-
-    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
-    {
-        TInt val;
-        if (ConvertInt(val, value, typeVal))
-        {
-            if (TEnumDef::ToName(val))
-            {
-                return *(TInt*)data = val, true;
-            }
-        }
-        return false;
-    }
-
-    virtual string ToString(const void* data, FToString flags, const void* def_data) const
-    {
-        TInt val = *(const TInt*)(data);
-        if (flags.SkipDefault && val == (def_data ? *(const TInt*)def_data : TInt(0)))
-        {
-            return string();
-        }
-
-        if (cstr sName = TEnumDef::ToName(val))
-        {
-            return sName;
-        }
-
-        // Unmatched value, return as number.
-        return ::ToString(val);
-    }
-
-    virtual bool FromString(void* data, cstr str, FFromString flags) const
-    {
-        if (!*str)
-        {
-            if (!flags.SkipEmpty)
-            {
-                *(TInt*)data = (TInt)0;
-            }
-            return true;
-        }
-
-        for (int i = 0, count = TEnumDef::Count(); i < count; i++)
-        {
-            if (TEnumDef::MatchName(i, str))
-            {
-                return *(TInt*)data = check_cast<TInt>(TEnumDef::Value(i)), true;
-            }
-        }
-
-        // No match, attempt numeric or bool conversion.
-        if (::FromString(*(TInt*)data, str))
-        {
-            return true;
-        }
-
-        bool b;
-        if (::FromString(b, str))
-        {
-            return *(TInt*)data = b, true;
-        }
-
-        return false;
-    }
-};
-
-//---------------------------------------------------------------------------
-// TypeInfo for regular enums
-
-struct CSimpleEnumDef
-{
-    void Init(Array<cstr> names, char* enum_str);
-
-    // TEnumDef implementations
-    ILINE uint Count() const
-    { return asNames.size(); }
-    ILINE static uint Value(uint i)
-    { return i; }
-    ILINE cstr Name(uint i) const
-    { return asNames[i]; }
-    ILINE bool MatchName(uint i, cstr str) const
-    {
-        cstr name = asNames[i];
-        if (*name == '_')
-        {
-            name++;
-        }
-        return azstricmp(name, str) == 0;
-    }
-    ILINE cstr ToName(uint value) const
-    {
-        if (value < Count())
-        {
-            return asNames[value];
-        }
-        return 0;
-    }
-
-protected:
-
-    Array<cstr>     asNames;
-};
-
-struct CSimpleEnumInfo
-    : TEnumInfo<CSimpleEnumDef, uint8>
-{
-    CSimpleEnumInfo(cstr name, Array<cstr> names, char* enum_str)
-        : TEnumInfo<CSimpleEnumDef, uint8>(name)
-    {
-        Init(names, enum_str);
-    }
-};
-
-// Define a regular small enum with TypeInfo
-
-#define DEFINE_ENUM_VALUE(EType, E, TInt)           \
-    TInt Value;                                     \
-    ILINE EType(E val = E(0))                       \
-        : Value(aznumeric_caster(val)) {}           \
-    ILINE operator E() const { return E(Value); }   \
-    ILINE E operator +() const { return E(Value); } \
-
-#define DEFINE_ENUM(EType, ...)                                                             \
-    struct EType                                                                            \
-    {                                                                                       \
-        enum E { __VA_ARGS__, _count };                                                     \
-        typedef uint8 TInt;                                                                 \
-        DEFINE_ENUM_VALUE(EType, E, TInt)                                                   \
-        ILINE static uint Count() { return _count; }                                        \
-        static const CSimpleEnumInfo& TypeInfo() {                                          \
-            static cstr names[_count];                                                      \
-            static char enum_str[] = #__VA_ARGS__;                                          \
-            static CSimpleEnumInfo info( #EType, Array<cstr>(&names[0], _count), enum_str); \
-            return info;                                                                    \
-        }                                                                                   \
-    };
-
-//---------------------------------------------------------------------------
-// TypeInfo for irregular enums
-
-struct CEnumDef
-{
-    typedef int64 TValue;
-
-    struct SElem
-    {
-        TValue  Value;
-        cstr        Name;
-    };
-
-    void Init(Array<SElem> elems, char* enum_str = 0);
-
-    // TEnumDef implementations
-    ILINE uint Count() const
-    { return Elems.size(); }
-    ILINE TValue Value(uint i) const
-    { return Elems[i].Value; }
-    ILINE cstr Name(uint i) const
-    { return *Elems[i].Name ? Elems[i].Name + nPrefixLength : ""; }
-    bool MatchName(uint i, cstr str) const;
-    cstr ToName(TValue val) const;
-
-    struct SInit
-    {
-        static LegacyDynArray<SElem>* s_pElems;
-
-        static void Init(LegacyDynArray<SElem>& elems)
-        {
-            s_pElems = &elems;
-        }
-        SInit()
-        {
-            TValue val = s_pElems->empty() ? 0 : s_pElems->back().Value + 1;
-            s_pElems->push_back()->Value = val;
-        }
-        SInit(TValue val)
-        {
-            s_pElems->push_back()->Value = val;
-        }
-    };
-
-protected:
-
-    Array<SElem>    Elems;
-    TValue              MinValue;
-    bool                    bRegular;
-    uint                    nPrefixLength;
-};
-
-template<class TInt>
-struct CEnumInfo
-    : TEnumInfo<CEnumDef, TInt>
-{
-    CEnumInfo(cstr name, Array<CEnumDef::SElem> elems, char* enum_str = 0)
-        : TEnumInfo<CEnumDef, TInt>(name)
-    {
-        CEnumDef::Init(elems, enum_str);
-    }
-};
-
-struct CEnumDefUuid
-    : public TTypeInfo<AZ::Uuid>
-{
-    struct SElem
-    {
-        AZ::Uuid  Value;
-        cstr        Name;
-    };
-
-    CEnumDefUuid(cstr name, Array<CEnumDefUuid::SElem> elems, char* enum_str = 0)
-        : TTypeInfo<AZ::Uuid>(name)
-    {
-        CEnumDefUuid::Init(elems, enum_str);
-    }
-    void Init(Array<SElem> elems, char* enum_str = 0);
-
-    // TEnumDef implementations
-    ILINE uint Count() const
-    {
-        return Elems.size();
-    }
-    ILINE AZ::Uuid Value(uint i) const
-    {
-        return Elems[i].Value;
-    }
-    ILINE cstr Name(uint i) const
-    {
-        return *Elems[i].Name ? Elems[i].Name + nPrefixLength : "";
-    }
-    bool MatchName(uint i, cstr str) const;
-    cstr ToName(AZ::Uuid val) const;
-
-    cstr EnumElem(uint nIndex) const override
-    {
-        if (nIndex < Count())
-        {
-            cstr name = Name(nIndex);
-            if (*name != '_')
-            {
-                return name;
-            }
-        }
-        return 0;
-    }
-
-    bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const override
-    {
-        if (&typeVal == this)
-        {
-            const AZ::Uuid& valueUuid = *reinterpret_cast<const AZ::Uuid*>(value);
-            if (ToName(valueUuid))
-            {
-                AZ::Uuid& dataUuid = *reinterpret_cast<AZ::Uuid*>(data);
-                dataUuid = valueUuid;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    string ToString(const void* data, FToString flags, const void* def_data) const override
-    {
-        const AZ::Uuid& uuidData = *reinterpret_cast<const AZ::Uuid*>(data);
-        const AZ::Uuid& defUuidData = *reinterpret_cast<const AZ::Uuid*>(def_data);
-        if (flags.SkipDefault && uuidData == (def_data ? defUuidData : AZ::Uuid::CreateNull()))
-        {
-            return string();
-        }
-
-        if (cstr sName = ToName(uuidData))
-        {
-            return sName;
-        }
-
-        return string();
-    }
-
-    bool FromString(void* data, cstr str, FFromString flags) const override
-    {
-        AZ::Uuid& uuidData = *reinterpret_cast<AZ::Uuid*>(data);
-        if (!*str)
-        {
-            if (!flags.SkipEmpty)
-            {
-                uuidData = AZ::Uuid::CreateNull();
-            }
-            return true;
-        }
-
-        for (int i = 0, count = Count(); i < count; i++)
-        {
-            if (MatchName(i, str))
-            {
-                uuidData = Value(i);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-protected:
-
-    Array<SElem>    Elems;
-    bool                    bRegular;
-    uint                    nPrefixLength;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYCUSTOMTYPES_H
diff --git a/Code/CryEngine/CryCommon/CryEndian.h b/Code/CryEngine/CryCommon/CryEndian.h
deleted file mode 100644
index 554a8e0465..0000000000
--- a/Code/CryEngine/CryCommon/CryEndian.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYENDIAN_H
-#define CRYINCLUDE_CRYCOMMON_CRYENDIAN_H
-#pragma once
-
-#include <BaseTypes.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Endian support
-//////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////////
-// NEED_ENDIAN_SWAP is an older define still used in several places to toggle endian swapping.
-// It is only used when reading files which are assumed to be little-endian.
-// For legacy support, define it to swap on big endian platforms.
-/////////////////////////////////////////////////////////////////////////////////////
-
-typedef bool    EEndian;
-
-#if defined(SYSTEM_IS_LITTLE_ENDIAN)
-#   undef SYSTEM_IS_LITTLE_ENDIAN
-#endif
-#if defined(SYSTEM_IS_BIG_ENDIAN)
-#   undef SYSTEM_IS_BIG_ENDIAN
-#endif
-
-#if 0 // no big-endian platforms right now, but keep the code
-      // Big-endian platform
-#   define SYSTEM_IS_LITTLE_ENDIAN 0
-#   define SYSTEM_IS_BIG_ENDIAN 1
-#else
-// Little-endian platform
-#   define SYSTEM_IS_LITTLE_ENDIAN 1
-#   define SYSTEM_IS_BIG_ENDIAN 0
-#endif
-
-#if SYSTEM_IS_BIG_ENDIAN
-// Big-endian platform. Swap to/from little.
-    #define eBigEndian          false
-    #define eLittleEndian       true
-    #define NEED_ENDIAN_SWAP
-#else
-// Little-endian platform. Swap to/from big.
-    #define eLittleEndian       false
-    #define eBigEndian          true
-    #undef NEED_ENDIAN_SWAP
-#endif
-
-
-enum EEndianness
-{
-    eEndianness_Little,
-    eEndianness_Big,
-#if SYSTEM_IS_BIG_ENDIAN
-    eEndianness_Native = eEndianness_Big,
-    eEndianness_NonNative = eEndianness_Little,
-#else
-    eEndianness_Native = eEndianness_Little,
-    eEndianness_NonNative = eEndianness_Big,
-#endif
-};
-
-
-// Legacy macros
-#define GetPlatformEndian() false
-
-/////////////////////////////////////////////////////////////////////////////////////
-
-inline bool IsSystemLittleEndian()
-{
-    const int a = 1;
-    return 1 == *(const char*)&a;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-
-// SwapEndian function, using TypeInfo.
-struct CTypeInfo;
-void SwapEndian(const CTypeInfo& Info, size_t nSizeCheck, void* pData, size_t nCount = 1, bool bWriting = false);
-
-// Default template utilizes TypeInfo.
-template<class T>
-inline void SwapEndianBase(T* t, size_t nCount = 1, bool bWriting = false)
-{
-    SwapEndian(TypeInfo(t), sizeof(T), t, nCount, bWriting);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-// SwapEndianBase functions.
-// Always swap the data (the functions named SwapEndian swap based on an optional bSwapEndian parameter).
-// The bWriting parameter must be specified in general when the output is for writing,
-// but it matters only for types with bitfields.
-
-// Overrides for base types.
-
-template<>
-inline void SwapEndianBase(char* p, size_t nCount, bool bWriting)
-{
-    (void)p;
-    (void)nCount;
-    (void)bWriting;
-}
-
-template<>
-inline void SwapEndianBase(uint8* p, size_t nCount, bool bWriting)
-{
-    (void)p;
-    (void)nCount;
-    (void)bWriting;
-}
-
-template<>
-inline void SwapEndianBase(int8* p, size_t nCount, bool bWriting)
-{
-    (void)p;
-    (void)nCount;
-    (void)bWriting;
-}
-
-template<>
-inline void SwapEndianBase(uint16* p, size_t nCount, bool bWriting)
-{
-    (void)bWriting;
-    for (; nCount-- > 0; p++)
-    {
-        *p = (uint16) (((*p >> 8) + (*p << 8)) & 0xFFFF);
-    }
-}
-
-template<>
-inline void SwapEndianBase(int16* p, size_t nCount, bool bWriting)
-{
-    (void)bWriting;
-    SwapEndianBase((uint16*)p, nCount);
-}
-
-template<>
-inline void SwapEndianBase(uint32* p, size_t nCount, bool bWriting)
-{
-    (void)bWriting;
-    for (; nCount-- > 0; p++)
-    {
-        *p = (*p >> 24) + ((*p >> 8) & 0xFF00) + ((*p & 0xFF00) << 8) + (*p << 24);
-    }
-}
-
-template<>
-inline void SwapEndianBase(int32* p, size_t nCount, bool bWriting)
-{
-    (void)bWriting;
-    SwapEndianBase((uint32*)p, nCount);
-}
-
-template<>
-inline void SwapEndianBase(float* p, size_t nCount, bool bWriting)
-{
-    (void)bWriting;
-    SwapEndianBase((uint32*)p, nCount);
-}
-
-template<>
-inline void SwapEndianBase(uint64* p, size_t nCount, bool bWriting)
-{
-    (void)bWriting;
-    for (; nCount-- > 0; p++)
-    {
-        *p = (*p >> 56) + ((*p >> 40) & 0xFF00) + ((*p >> 24) & 0xFF0000) + ((*p >> 8) & 0xFF000000)
-            + ((*p & 0xFF000000) << 8) + ((*p & 0xFF0000) << 24) + ((*p & 0xFF00) << 40) + (*p << 56);
-    }
-}
-
-template<>
-inline void SwapEndianBase(int64* p, size_t nCount, bool bWriting)
-{
-    (void)bWriting;
-    SwapEndianBase((uint64*)p, nCount);
-}
-
-template<>
-inline void SwapEndianBase(double* p, size_t nCount, bool bWriting)
-{
-    (void)bWriting;
-    SwapEndianBase((uint64*)p, nCount);
-}
-
-//---------------------------------------------------------------------------
-// SwapEndian functions.
-// bSwapEndian argument optional, and defaults to swapping from LittleEndian format.
-
-template<class T>
-inline void SwapEndian(T* t, size_t nCount, bool bSwapEndian = eLittleEndian)
-{
-    if (bSwapEndian)
-    {
-        SwapEndianBase(t, nCount);
-    }
-}
-
-// Specify int and uint as well as size_t, to resolve overload ambiguities.
-template<class T>
-inline void SwapEndian(T* t, int nCount, bool bSwapEndian = eLittleEndian)
-{
-    if (bSwapEndian)
-    {
-        SwapEndianBase(t, nCount);
-    }
-}
-
-#if defined(PLATFORM_64BIT)
-template<class T>
-inline void SwapEndian(T* t, unsigned int nCount, bool bSwapEndian = eLittleEndian)
-{
-    if (bSwapEndian)
-    {
-        SwapEndianBase(t, nCount);
-    }
-}
-#endif
-
-template<class T>
-inline void SwapEndian(T& t, bool bSwapEndian = eLittleEndian)
-{
-    if (bSwapEndian)
-    {
-        SwapEndianBase(&t, 1);
-    }
-}
-
-template<class T>
-inline T SwapEndianValue(T t, bool bSwapEndian = eLittleEndian)
-{
-    if (bSwapEndian)
-    {
-        SwapEndianBase(&t, 1);
-    }
-    return t;
-}
-
-//---------------------------------------------------------------------------
-// Object-oriented data extraction for endian-swapping reading.
-template<class T, class D>
-inline T* StepData(D*& pData, size_t nCount, bool bSwapEndian)
-{
-    T* Elems = (T*)pData;
-    SwapEndian(Elems, nCount, bSwapEndian);
-    pData = (D*)((T*)pData + nCount);
-    return Elems;
-}
-
-template<class T, class D>
-inline T* StepData(D*& pData, bool bSwapEndian)
-{
-    return StepData<T, D>(pData, 1, bSwapEndian);
-}
-
-template<class T, class D>
-inline void StepData(T*& Result, D*& pData, size_t nCount, bool bSwapEndian)
-{
-    Result = StepData<T, D>(pData, nCount, bSwapEndian);
-}
-
-template<class T, class D>
-inline void StepDataCopy(T* Dest, D*& pData, size_t nCount, bool bSwapEndian)
-{
-    memcpy(Dest, pData, nCount * sizeof(T));
-    SwapEndian(Dest, nCount, bSwapEndian);
-    pData = (D*)((T*)pData + nCount);
-}
-
-template<class T, class D>
-inline void StepDataWrite(D*& pDest, const T* aSrc, size_t nCount, bool bSwapEndian)
-{
-    memcpy(pDest, aSrc, nCount * sizeof(T));
-    if (bSwapEndian)
-    {
-        SwapEndianBase((T*)pDest, nCount, true);
-    }
-    (T*&)pDest += nCount;
-}
-
-template<class T, class D>
-inline void StepDataWrite(D*& pDest, const T& Src, bool bSwapEndian)
-{
-    StepDataWrite(pDest, &Src, 1, bSwapEndian);
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYENDIAN_H
diff --git a/Code/CryEngine/CryCommon/CryFile.h b/Code/CryEngine/CryCommon/CryFile.h
deleted file mode 100644
index 15c77af3ff..0000000000
--- a/Code/CryEngine/CryCommon/CryFile.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : File wrapper.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYFILE_H
-#define CRYINCLUDE_CRYCOMMON_CRYFILE_H
-#pragma once
-
-#include <CryPath.h>
-#include <ISystem.h>
-#include <AzFramework/Archive/IArchive.h>
-#include <IConsole.h>
-#include "StringUtils.h"
-#include <AzCore/IO/FileIO.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Defines for CryEngine filetypes extensions.
-//////////////////////////////////////////////////////////////////////////
-#define CRY_GEOMETRY_FILE_EXT                    "cgf"
-#define CRY_SKEL_FILE_EXT                        "chr" //will be a SKEL soon
-#define CRY_SKIN_FILE_EXT                        "skin"
-#define CRY_CHARACTER_ANIMATION_FILE_EXT         "caf"
-#define CRY_CHARACTER_DEFINITION_FILE_EXT        "cdf"
-#define CRY_CHARACTER_LIST_FILE_EXT              "cid"
-#define CRY_ANIM_GEOMETRY_FILE_EXT               "cga"
-#define CRY_ANIM_GEOMETRY_ANIMATION_FILE_EXT     "anm"
-#define CRY_COMPILED_FILE_EXT                    "(c)"
-#define CRY_BINARY_XML_FILE_EXT                  "binxml"
-#define CRY_XML_FILE_EXT                         "xml"
-#define CRY_CHARACTER_PARAM_FILE_EXT             "chrparams"
-#define CRY_GEOM_CACHE_FILE_EXT                  "cax"
-//////////////////////////////////////////////////////////////////////////
-#define CRYFILE_MAX_PATH                         260
-//////////////////////////////////////////////////////////////////////////
-
-inline const char* CryGetExt(const char* filepath)
-{
-    const char* str = filepath;
-    size_t len = strlen(filepath);
-    for (const char* p = str + len - 1; p >= str; --p)
-    {
-        switch (*p)
-        {
-        case ':':
-        case '/':
-        case '\\':
-            // we've reached a path separator - it means there's no extension in this name
-            return "";
-        case '.':
-            // there's an extension in this file name
-            return p + 1;
-        }
-    }
-    return "";
-}
-
-// Summary:
-//   Checks if specified file name is a character file.
-// Summary:
-//   Checks if specified file name is a character file.
-inline bool IsCharacterFile(const char* filename)
-{
-    const char* ext = CryGetExt(filename);
-    if (_stricmp(ext, CRY_SKEL_FILE_EXT) == 0 || _stricmp(ext, CRY_SKIN_FILE_EXT) == 0 || _stricmp(ext, CRY_CHARACTER_DEFINITION_FILE_EXT) == 0 || _stricmp(ext, CRY_ANIM_GEOMETRY_FILE_EXT) == 0)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-// Description:
-//   Checks if specified file name is a static geometry file.
-inline bool IsStatObjFile(const char* filename)
-{
-    const char* ext = CryGetExt(filename);
-    if (_stricmp(ext, CRY_GEOMETRY_FILE_EXT) == 0)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-// Summary:
-//   Wrapper on file system.
-class CCryFile
-{
-public:
-    CCryFile();
-    CCryFile(AZ::IO::IArchive* pIArchive);    // allow an alternative IArchiveinterface
-    CCryFile(const char* filename, const char* mode);
-    ~CCryFile();
-
-    bool Open(const char* filename, const char* mode, int nOpenFlagsEx = 0);
-    void Close();
-
-    // Summary:
-    //   Writes data in a file to the current file position.
-    size_t Write(const void* lpBuf, size_t nSize);
-    // Summary:
-    //   Reads data from a file at the current file position.
-    size_t ReadRaw(void* lpBuf, size_t nSize);
-    // Summary:
-    //   Template version, for automatic size support.
-    template<class T>
-    inline size_t ReadTypeRaw(T* pDest, size_t nCount = 1)
-    {
-        return ReadRaw(pDest, sizeof(T) * nCount);
-    }
-
-    // Summary:
-    //   Automatic endian-swapping version.
-    template<class T>
-    inline size_t ReadType(T* pDest, size_t nCount = 1)
-    {
-        size_t nRead = ReadRaw(pDest, sizeof(T) * nCount);
-        SwapEndian(pDest, nCount);
-        return nRead;
-    }
-
-    // Summary:
-    //   Retrieves the length of the file.
-    size_t GetLength();
-
-    // Summary:
-    //   Moves the current file pointer to the specified position.
-    size_t Seek(size_t seek, int mode);
-    // Summary:
-    //   Moves the current file pointer at the beginning of the file.
-    void SeekToBegin();
-    // Summary:
-    //   Moves the current file pointer at the end of the file.
-    size_t SeekToEnd();
-    // Summary:
-    //   Retrieves the current file pointer.
-    size_t GetPosition();
-
-    // Summary:
-    //   Tests for end-of-file on a selected file.
-    bool IsEof();
-
-    // Summary:
-    //   Flushes any data yet to be written.
-    void Flush();
-
-    // Summary:
-    //   Gets a handle to a pack object.
-    AZ::IO::HandleType GetHandle() const { return m_fileHandle; };
-
-    // Description:
-    //    Retrieves the filename of the selected file.
-    const char* GetFilename() const { return m_filename; };
-
-    // Description:
-    //    Retrieves the filename after adjustment to the real relative to engine root path.
-    // Example:
-    //    Original filename "textures/red.dds" adjusted filename will look like "game/textures/red.dds"
-    // Return:
-    //    Adjusted filename, this is a pointer to a static string, copy return value if you want to keep it.
-    const char* GetAdjustedFilename() const;
-
-    // Summary:
-    //   Checks if file is opened from Archive file.
-    bool IsInPak() const;
-
-    // Summary:
-    //   Gets path of archive this file is in.
-    const char* GetPakPath() const;
-
-private:
-    char m_filename[CRYFILE_MAX_PATH];
-    AZ::IO::HandleType m_fileHandle;
-    AZ::IO::IArchive* m_pIArchive;
-};
-
-// Summary:
-// CCryFile implementation.
-inline CCryFile::CCryFile()
-{
-    m_fileHandle = AZ::IO::InvalidHandle;
-    m_pIArchive = gEnv ? gEnv->pCryPak : NULL;
-}
-
-inline CCryFile::CCryFile(AZ::IO::IArchive* pIArchive)
-{
-    m_fileHandle = AZ::IO::InvalidHandle;
-    m_pIArchive = pIArchive;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryFile::CCryFile(const char* filename, const char* mode)
-{
-    m_fileHandle = AZ::IO::InvalidHandle;
-    m_pIArchive = gEnv ? gEnv->pCryPak : NULL;
-    Open(filename, mode);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryFile::~CCryFile()
-{
-    Close();
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Notes:
-//   For nOpenFlagsEx see IArchive::EFOpenFlags
-// See also:
-//   IArchive::EFOpenFlags
-inline bool CCryFile::Open(const char* filename, const char* mode, int nOpenFlagsEx)
-{
-    char tempfilename[CRYFILE_MAX_PATH] = "";
-    cry_strcpy(tempfilename, filename);
-
-#if !defined (_RELEASE)
-    if (gEnv && gEnv->IsEditor() && gEnv->pConsole)
-    {
-        ICVar* const pCvar = gEnv->pConsole->GetCVar("ed_lowercasepaths");
-        if (pCvar)
-        {
-            const int lowercasePaths = pCvar->GetIVal();
-            if (lowercasePaths)
-            {
-                const string lowerString = PathUtil::ToLower(tempfilename);
-                cry_strcpy(tempfilename, lowerString.c_str());
-            }
-        }
-    }
-#endif
-    if (m_fileHandle != AZ::IO::InvalidHandle)
-    {
-        Close();
-    }
-    cry_strcpy(m_filename, tempfilename);
-
-    if (m_pIArchive)
-    {
-        m_fileHandle = m_pIArchive->FOpen(tempfilename, mode, nOpenFlagsEx);
-    }
-    else
-    {
-        AZ::IO::FileIOBase::GetInstance()->Open(tempfilename, AZ::IO::GetOpenModeFromStringMode(mode), m_fileHandle);
-    }
-
-    return m_fileHandle != AZ::IO::InvalidHandle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline void CCryFile::Close()
-{
-    if (m_fileHandle != AZ::IO::InvalidHandle)
-    {
-        if (m_pIArchive)
-        {
-            m_pIArchive->FClose(m_fileHandle);
-        }
-        else
-        {
-            AZ::IO::FileIOBase::GetInstance()->Close(m_fileHandle);
-        }
-        m_fileHandle = AZ::IO::InvalidHandle;
-        m_filename[0] = 0;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline size_t CCryFile::Write(const void* lpBuf, size_t nSize)
-{
-    assert(m_fileHandle != AZ::IO::InvalidHandle);
-    if (m_pIArchive)
-    {
-        return m_pIArchive->FWrite(lpBuf, 1, nSize, m_fileHandle);
-    }
-
-    if (AZ::IO::FileIOBase::GetInstance()->Write(m_fileHandle, lpBuf, nSize))
-    {
-        return nSize;
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline size_t CCryFile::ReadRaw(void* lpBuf, size_t nSize)
-{
-    assert(m_fileHandle != AZ::IO::InvalidHandle);
-    if (m_pIArchive)
-    {
-        return m_pIArchive->FReadRaw(lpBuf, 1, nSize, m_fileHandle);
-    }
-
-    AZ::u64 bytesRead = 0;
-    AZ::IO::FileIOBase::GetInstance()->Read(m_fileHandle, lpBuf, nSize, false, &bytesRead);
-
-    return static_cast<size_t>(bytesRead);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline size_t CCryFile::GetLength()
-{
-    assert(m_fileHandle != AZ::IO::InvalidHandle);
-    if (m_pIArchive)
-    {
-        return m_pIArchive->FGetSize(m_fileHandle);
-    }
-    //long curr = ftell(m_file);
-    AZ::u64 size = 0;
-    AZ::IO::FileIOBase::GetInstance()->Size(m_fileHandle, size);
-    return static_cast<size_t>(size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline size_t CCryFile::Seek(size_t seek, int mode)
-{
-    assert(m_fileHandle != AZ::IO::InvalidHandle);
-    if (m_pIArchive)
-    {
-        return m_pIArchive->FSeek(m_fileHandle, long(seek), mode);
-    }
-
-    if (AZ::IO::FileIOBase::GetInstance()->Seek(m_fileHandle, seek, AZ::IO::GetSeekTypeFromFSeekMode(mode)))
-    {
-        return 0;
-    }
-    return 1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline void CCryFile::SeekToBegin()
-{
-    Seek(0, SEEK_SET);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline size_t CCryFile::SeekToEnd()
-{
-    return Seek(0, SEEK_END);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline size_t CCryFile::GetPosition()
-{
-    assert(m_fileHandle != AZ::IO::InvalidHandle);
-    if (m_pIArchive)
-    {
-        return m_pIArchive->FTell(m_fileHandle);
-    }
-
-    AZ::u64 tellOffset = 0;
-    AZ::IO::FileIOBase::GetInstance()->Tell(m_fileHandle, tellOffset);
-
-    return static_cast<size_t>(tellOffset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline bool CCryFile::IsEof()
-{
-    assert(m_fileHandle != AZ::IO::InvalidHandle);
-    if (m_pIArchive)
-    {
-        return m_pIArchive->FEof(m_fileHandle) != 0;
-    }
-    
-    return AZ::IO::FileIOBase::GetInstance()->Eof(m_fileHandle);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline void CCryFile::Flush()
-{
-    assert(m_fileHandle != AZ::IO::InvalidHandle);
-
-    if (m_pIArchive)
-    {
-        m_pIArchive->FFlush(m_fileHandle);
-    }
-    
-    AZ::IO::FileIOBase::GetInstance()->Flush(m_fileHandle);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline bool CCryFile::IsInPak() const
-{
-    if (m_fileHandle != AZ::IO::InvalidHandle && m_pIArchive)
-    {
-        return m_pIArchive->GetFileArchivePath(m_fileHandle) != NULL;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline const char* CCryFile::GetPakPath() const
-{
-    if (m_fileHandle != AZ::IO::InvalidHandle && m_pIArchive)
-    {
-        const char* sPath = m_pIArchive->GetFileArchivePath(m_fileHandle);
-        if (sPath != NULL)
-        {
-            return sPath;
-        }
-    }
-    return "";
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-inline const char* CCryFile::GetAdjustedFilename() const
-{
-    static char szAdjustedFile[AZ::IO::IArchive::MaxPath];
-    assert(m_pIArchive);
-    if (!m_pIArchive)
-    {
-        return "";
-    }
-
-    // Gets mod path to file.
-    const char* gameUrl = m_pIArchive->AdjustFileName(m_filename, szAdjustedFile, AZ::IO::IArchive::MaxPath, 0);
-
-    // Returns standard path otherwise.
-    if (gameUrl != &szAdjustedFile[0])
-    {
-        cry_strcpy(szAdjustedFile, gameUrl);
-    }
-    return szAdjustedFile;
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYFILE_H
diff --git a/Code/CryEngine/CryCommon/CryFixedString.h b/Code/CryEngine/CryCommon/CryFixedString.h
deleted file mode 100644
index f0ba67cd6a..0000000000
--- a/Code/CryEngine/CryCommon/CryFixedString.h
+++ /dev/null
@@ -1,2336 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Stack-based fixed-size String class, similar to CryString.
-//               will switch to heap-based allocation when string does no longer fit
-//               Can easily be substituted instead of CryString.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYFIXEDSTRING_H
-#define CRYINCLUDE_CRYCOMMON_CRYFIXEDSTRING_H
-#pragma once
-
-#include <string.h>
-#include <wchar.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <wctype.h>
-#include <AzCore/base.h>
-
-#include "CryString.h"
-
-#ifndef CRY_STRING_DEBUG
-#define CRY_STRING_DEBUG(s)
-#endif
-
-#define UNITTEST_CRYFIXEDSTRING (0)
-
-template <class T>
-class CharTraits;
-
-// traits for char
-template <>
-class CharTraits<char>
-{
-public:
-    typedef size_t size_type;
-    typedef char value_type;
-    typedef const value_type* const_str;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef pointer iterator;
-    typedef const_pointer const_iterator;
-
-    ILINE int _isspace(value_type c) const
-    {
-        return ::isspace((int)c);
-    }
-
-    ILINE value_type _traits_toupper(value_type c) const
-    {
-        return static_cast<value_type>(toupper(c));
-    }
-
-    ILINE value_type _traits_tolower(value_type c) const
-    {
-        return static_cast<value_type>(tolower(c));
-    }
-
-    ILINE value_type _ascii_tolower(value_type c) const
-    {
-        return (c >= 'A' && c <= 'Z') ? c - 'A' + 'a' : c;
-    }
-
-    ILINE value_type _ascii_toupper(value_type c) const
-    {
-        return (c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c;
-    }
-
-    ILINE int _strcmp (const_str a, const_str b) const
-    {
-        return ::strcmp(a, b);
-    }
-
-    ILINE int _strncmp (const_str a, const_str b, size_type n) const
-    {
-        return ::strncmp(a, b, n);
-    }
-
-    ILINE int _stricmp (const_str a, const_str b) const
-    {
-        return ::azstricmp(a, b);
-    }
-
-    ILINE int _strnicmp (const_str a, const_str b, size_type n) const
-    {
-        return ::azstrnicmp(a, b, n);
-    }
-
-    ILINE size_type _strspn(const_str str, const_str strCharSet) const
-    {
-        return (str == NULL) ? 0 : (size_type)::strspn(str, strCharSet);
-    }
-
-    ILINE size_type _strcspn(const_str str, const_str strCharSet) const
-    {
-        return (str == NULL) ? 0 : (size_type)::strcspn(str, strCharSet);
-    }
-
-    static ILINE size_type _strlen(const_str str)
-    {
-        return (str == NULL) ? 0 : (size_type)::strlen(str);
-    }
-
-    ILINE const_str _strchr(const_str str, value_type c) const
-    {
-        return (str == NULL) ? 0 : ::strchr(str, c);
-    }
-
-    ILINE value_type* _strstr(value_type* str, const_str strSearch) const
-    {
-        return (str == NULL) ? 0 : (value_type*) ::strstr(str, strSearch);
-    }
-
-    ILINE void _copy(value_type* dest, const value_type* src, size_type count)
-    {
-        memcpy(dest, src, count * sizeof(value_type));
-    }
-
-    ILINE void _move(value_type* dest, const value_type* src, size_type count)
-    {
-        memmove(dest, src, count * sizeof(value_type));
-    }
-
-    ILINE void _set(value_type* dest, value_type ch, size_type count)
-    {
-        memset(dest, ch, count * sizeof(value_type));
-    }
-
-    ILINE int   _vsnprintf(value_type* str, size_type size, const_str format, va_list ap)
-    {
-        return ::azvsnprintf(str, size, format, ap);
-    }
-};
-
-// traits for wchar_t
-template <>
-class CharTraits<wchar_t>
-{
-public:
-    typedef size_t size_type;
-    typedef wchar_t value_type;
-    typedef const value_type* const_str;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef pointer iterator;
-    typedef const_pointer const_iterator;
-
-    ILINE int _isspace(value_type c) const
-    {
-        return iswspace(c);
-    }
-
-    ILINE value_type _traits_toupper(value_type c) const
-    {
-        return towupper(c);
-    }
-
-    ILINE value_type _traits_tolower(value_type c) const
-    {
-        return towlower(c);
-    }
-
-    ILINE value_type _ascii_tolower(value_type c) const
-    {
-        return ((((c) >= 'A') && ((c) <= 'Z')) ? ((c) - 'A' + 'a') : (c));
-    }
-
-    ILINE value_type _ascii_toupper(value_type c) const
-    {
-        return ((((c) >= 'a') && ((c) <= 'z')) ? ((c) - 'a' + 'A') : (c));
-    }
-
-    ILINE int _strcmp (const_str a, const_str b) const
-    {
-        return wcscmp (a, b);
-    }
-
-    ILINE int _strncmp (const_str a, const_str b, size_type n) const
-    {
-        return wcsncmp (a, b, n);
-    }
-
-    ILINE int _stricmp (const_str a, const_str b) const
-    {
-        return azwcsicmp(a, b);
-    }
-
-    ILINE int _strnicmp (const_str a, const_str b, size_type n) const
-    {
-        return azwcsnicmp(a, b, n);
-    }
-
-    ILINE size_type _strspn(const_str str, const_str strCharSet) const
-    {
-        return (str == NULL) ? 0 : (size_type)::wcsspn(str, strCharSet);
-    }
-
-    ILINE size_type _strcspn(const_str str, const_str strCharSet) const
-    {
-        return (str == NULL) ? 0 : (size_type)::wcscspn(str, strCharSet);
-    }
-
-    static ILINE size_type _strlen(const_str str)
-    {
-        return (str == NULL) ? 0 : (size_type)::wcslen(str);
-    }
-
-    ILINE const_str _strchr(const_str str, value_type c) const
-    {
-        return (str == NULL) ? 0 : ::wcschr(str, c);
-    }
-
-    ILINE value_type* _strstr(value_type* str, const_str strSearch) const
-    {
-        return (str == NULL) ? 0 : ::wcsstr(str, strSearch);
-    }
-
-    ILINE void _copy(value_type* dest, const value_type* src, size_type count)
-    {
-        memcpy(dest, src, count * sizeof(value_type));
-    }
-
-    ILINE void _move(value_type* dest, const value_type* src, size_type count)
-    {
-        memmove(dest, src, count * sizeof(value_type));
-    }
-
-    ILINE void _set(value_type* dest, value_type ch, size_type count)
-    {
-        wmemset(dest, ch, count);
-    }
-
-    ILINE int   _vsnprintf(value_type* str, size_type size, const_str format, va_list ap)
-    {
-        return ::_vsnwprintf_s(str, size + 1, size, format, ap);
-    }
-};
-
-template <class T, size_t S>
-class CryStackStringT
-    : public CharTraits<T>
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Types compatible with STL string.
-    //////////////////////////////////////////////////////////////////////////
-    typedef CryStackStringT<T, S> _Self;
-    typedef size_t size_type;
-    typedef T value_type;
-    typedef const value_type* const_str;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef pointer iterator;
-    typedef const_pointer const_iterator;
-    static const size_type MAX_SIZE = S;
-
-    enum _npos_type
-    {
-        npos = (size_type) ~0
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Constructors
-    //////////////////////////////////////////////////////////////////////////
-    CryStackStringT();
-
-public:
-
-    CryStackStringT(const _Self& str);
-    CryStackStringT(const _Self& str, size_type nOff, size_type nCount);
-    CryStackStringT(size_type nRepeat, value_type ch);
-
-    // The reason of making this constructor unavailable (for a while) is
-    // explained in comments in front of the declaration of
-    // CryStringT::CryStringT(size_type nRepeat, value_type ch)
-    // (see CryString.h).
-private:
-    CryStackStringT(value_type ch, size_type nRepeat);
-
-public:
-
-    CryStackStringT(const_str str);
-    CryStackStringT(const CryStringT<T>& str);
-    CryStackStringT(const_str str, size_type nLength);
-    CryStackStringT(const_iterator _First, const_iterator _Last);
-    ~CryStackStringT();
-
-    //////////////////////////////////////////////////////////////////////////
-    // STL string like interface.
-    //////////////////////////////////////////////////////////////////////////
-    //! Operators.
-    size_type length() const;
-    size_type size() const;
-    bool empty() const;
-    void clear();  // free up the data
-
-    //! Returns the storage currently allocated to hold the string, a value at least as large as length().
-    //  Also: capacity is always >= (MAX_SIZE-1)
-    size_type capacity() const;
-
-    // Sets the capacity of the string to a number at least as great as a specified number.
-    // nCount = 0 is shrinking string to fit number of characters in it.
-    // Shrink to fit post-cond: capacity() >= (MAX_SIZE-1)
-    void reserve(size_type nCount = 0);
-
-    _Self& append(const value_type* _Ptr);
-    _Self& append(const value_type* _Ptr, size_type nCount);
-    _Self& append(const _Self& _Str, size_type nOff, size_type nCount);
-    _Self& append(const _Self& _Str);
-    _Self& append(size_type nCount, value_type _Ch);
-    _Self& append(const_iterator _First, const_iterator _Last);
-
-    _Self& assign(const_str _Ptr);
-    _Self& assign(const_str _Ptr, size_type nCount);
-    _Self& assign(const _Self& _Str, size_type off, size_type nCount);
-    _Self& assign(const _Self& _Str);
-    _Self& assign(size_type nCount, value_type _Ch);
-    _Self& assign(const_iterator _First, const_iterator _Last);
-
-    value_type  at(size_type index) const;
-    //value_type& at( size_type index );
-
-    const_iterator begin() const { return m_str; };
-    const_iterator end() const { return m_str + length(); };
-
-    iterator begin() { return m_str; };
-    iterator end() { return m_str + length(); };
-
-    //! cast to C string operator.
-    operator const_str() const {
-        return m_str;
-    }
-
-    //! cast to C string.
-    const value_type* c_str() const { return m_str; }
-    const value_type* data() const { return m_str; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // string comparison.
-    //////////////////////////////////////////////////////////////////////////
-    int compare(const _Self& _Str) const;
-    int compare(size_type _Pos1, size_type _Num1, const _Self& _Str) const;
-    int compare(size_type _Pos1, size_type _Num1, const _Self& _Str, size_type nOff, size_type nCount) const;
-    int compare(const value_type* _Ptr) const;
-    int compare(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2 = npos) const;
-
-    // Case insensitive comparison
-    int compareNoCase(const _Self& _Str) const;
-    int compareNoCase(size_type _Pos1, size_type _Num1, const _Self& _Str) const;
-    int compareNoCase(size_type _Pos1, size_type _Num1, const _Self& _Str, size_type nOff, size_type nCount) const;
-    int compareNoCase(const value_type* _Ptr) const;
-    int compareNoCase(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2 = npos) const;
-
-    // Copies at most a specified number of characters from an indexed position in a source string to a target character array.
-    size_type copy(value_type* _Ptr, size_type nCount, size_type nOff = 0) const;
-
-    void push_back(value_type _Ch) { _ConcatenateInPlace(&_Ch, 1); }
-    void resize(size_type nCount, value_type _Ch = ' ');
-
-    //! simple sub-string extraction
-    _Self substr(size_type pos, size_type count = npos) const;
-
-    // replace part of string.
-    _Self& replace(value_type chOld, value_type chNew);
-    _Self& replace(const_str strOld, const_str strNew);
-    _Self& replace(size_type pos, size_type count, const_str strNew);
-    _Self& replace(size_type pos, size_type count, const_str strNew, size_type count2);
-    _Self& replace(size_type pos, size_type count, size_type nNumChars, value_type chNew);
-
-    // insert new elements to string.
-    _Self& insert(size_type nIndex, value_type ch);
-    _Self& insert(size_type nIndex, size_type nCount, value_type ch);
-    _Self& insert(size_type nIndex, const_str pstr);
-    _Self& insert(size_type nIndex, const_str pstr, size_type nCount);
-
-    //! delete count characters starting at zero-based index
-    _Self& erase(size_type nIndex, size_type count = npos);
-
-    //! searching (return starting index, or -1 if not found)
-    //! look for a single character match
-    //! like "C" strchr
-    size_type find(value_type ch, size_type pos = 0) const;
-    //! look for a specific sub-string
-    //! like "C" strstr
-    size_type find(const_str subs, size_type pos = 0) const;
-    size_type rfind(value_type ch, size_type pos = npos) const;
-
-    size_type find_first_of(value_type _Ch, size_type nOff = 0) const;
-    size_type find_first_of(const_str charSet, size_type nOff = 0) const;
-    //size_type find_first_of( const value_type* _Ptr,size_type _Off,size_type _Count ) const;
-    size_type find_first_of(const _Self& _Str, size_type _Off = 0) const;
-
-    size_type find_first_not_of(value_type _Ch, size_type _Off = 0) const;
-    size_type find_first_not_of(const value_type* _Ptr, size_type _Off = 0) const;
-    size_type find_first_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const;
-    size_type find_first_not_of(const _Self& _Str, size_type _Off = 0) const;
-
-    void swap(_Self& _Str);
-
-    //////////////////////////////////////////////////////////////////////////
-    // overloaded operators.
-    //////////////////////////////////////////////////////////////////////////
-    // overloaded indexing.
-    value_type operator[](size_type index) const;
-    //  value_type& operator[]( size_type index ); // same as at()
-
-    // overloaded assignment
-    _Self& operator=(const _Self& str);
-    _Self& operator=(value_type ch);
-    _Self& operator=(const_str str);
-    _Self& operator=(const CryStringT<T>& str);
-
-    void move(_Self& src);
-
-#if defined(LINUX) || defined(APPLE)
-    template<size_t AnySize>
-    _Self& operator=(const CryStackStringT<T, AnySize>& str)
-    {
-        _Assign(str.c_str(), str.size());
-        return *this;
-    }
-#endif
-
-    // string concatenation
-    _Self& operator+=(const _Self& str);
-    _Self& operator+=(value_type ch);
-    _Self& operator+=(const_str str);
-    _Self& operator+=(const CryStringT<T>& str);
-
-    size_t GetAllocatedMemory() const
-    {
-        size_t size = sizeof(*this);
-        if (m_str != m_strBuf)
-        {
-            size += (m_nAllocSize + 1) * sizeof(value_type);
-        }
-        return size;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Extended functions.
-    // This functions are not in the STL string.
-    // They have an ATL CString interface.
-    //////////////////////////////////////////////////////////////////////////
-    //! Format string, use (sprintf)
-    _Self& Format(const value_type* format, ...);
-
-    //! Format string fast, directly formats into string's buffer.
-    //  Make sure there is enough space to hold the string
-    _Self& FormatFast (const value_type* format, ...);
-
-    //! Converts the string to lower-case.
-    //  This function uses the "C" locale for case-conversion (ie, A-Z only).
-    _Self& MakeLower();
-
-    //! Converts the string to upper-case.
-    //  This function uses the "C" locale for case-conversion (ie, A-Z only).
-    _Self& MakeUpper();
-
-    _Self& Trim();
-    _Self& Trim(value_type ch);
-    _Self& Trim(const value_type* sCharSet);
-
-    _Self& TrimLeft();
-    _Self& TrimLeft(value_type ch);
-    _Self& TrimLeft(const value_type* sCharSet);
-
-    _Self& TrimRight();
-    _Self& TrimRight(value_type ch);
-    _Self& TrimRight(const value_type* sCharSet);
-
-    _Self SpanIncluding(const_str charSet) const;
-    _Self SpanExcluding(const_str charSet) const;
-    _Self Tokenize(const_str charSet, int& nStart) const;
-    _Self Mid(size_type nFirst, size_type nCount = npos) const {  return substr(nFirst, nCount); };
-
-    _Self Left(size_type count) const;
-    _Self Right(size_type count) const;
-    //////////////////////////////////////////////////////////////////////////
-
-    // public utilities.
-    static bool _IsValidString(const_str str);
-
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Only used for debugging statistics.
-    //////////////////////////////////////////////////////////////////////////
-    static size_t _usedMemory(size_t size)
-    {
-        static size_t s_used_memory = 0;
-        s_used_memory += size;
-        return s_used_memory;
-    }
-
-    //private:
-public:
-    size_type   m_nLength;
-    size_type   m_nAllocSize;
-    value_type* m_str;                              // pointer to ref counted string data
-    value_type  m_strBuf[MAX_SIZE];
-
-    // implementation helpers
-    void _AllocData(size_type nLen);
-    void _FreeData(value_type* pData);
-    void _Free();
-    void _Initialize();
-
-    void _Concatenate(const_str sStr1, size_type nLen1, const_str sStr2, size_type nLen2);
-    void _ConcatenateInPlace(const_str sStr, size_type nLen);
-    void _Assign(const_str sStr, size_type nLen);
-    void _MakeUnique();
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CryStackStringT<T,S> Implementation
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline bool CryStackStringT<T, S>::_IsValidString(const_str)
-{
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::_Assign(const_str sStr, size_type nLen)
-{
-    // Check if this string is shared (reference count greater then 1) or not enough capacity to store new string.
-    // Then allocate new string buffer.
-    if (nLen > capacity())
-    {
-        _Free();
-        _AllocData(nLen);
-    }
-    // Copy characters from new string to this buffer.
-    CharTraits<T>::_copy(m_str, sStr, nLen);
-    // Set new length.
-    m_nLength = nLen;
-    // Make null terminated string.
-    m_str[nLen] = 0;
-    CRY_STRING_DEBUG(m_str)
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::_Concatenate(const_str sStr1, size_type nLen1, const_str sStr2, size_type nLen2)
-{
-    size_type nLen = nLen1 + nLen2;
-    if (nLen1 * 2 > nLen)
-    {
-        nLen = nLen1 * 2;
-    }
-    if (nLen != 0)
-    {
-        if (nLen < 8)
-        {
-            nLen = 8;
-        }
-        _AllocData(nLen);
-        CharTraits<T>::_copy(m_str, sStr1, nLen1);
-        CharTraits<T>::_copy(m_str + nLen1, sStr2, nLen2);
-        m_nLength = nLen1 + nLen2;
-        m_str[nLen1 + nLen2] = 0;
-    }
-    CRY_STRING_DEBUG(m_str)
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::_ConcatenateInPlace(const_str sStr, size_type nLen)
-{
-    if (nLen != 0)
-    {
-        // Check if this string is shared (reference count greater then 1) or not enough capacity to store new string.
-        // Then allocate new string buffer.
-        if (length() + nLen > capacity())
-        {
-            value_type* pOldData = m_str;
-            _Concatenate(m_str, length(), sStr, nLen);
-            _FreeData(pOldData);
-        }
-        else
-        {
-            CharTraits<T>::_copy(m_str + length(), sStr, nLen);
-            m_nLength += nLen;
-            m_str[m_nLength] = 0; // Make null terminated string.
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::_MakeUnique()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::_Initialize()
-{
-    m_strBuf[0] = 0;
-    m_str = m_strBuf;
-    m_nLength = 0;
-    m_nAllocSize = MAX_SIZE - 1; // 0 termination not counted!
-}
-
-// always allocate one extra character for '\0' termination
-// assumes [optimistically] that data length will equal allocation length
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::_AllocData(size_type nLen)
-{
-    assert(nLen >= 0);
-    assert(nLen <= INT_MAX - 1);    // max size (enough room for 1 extra)
-
-    if (nLen == 0)
-    {
-        _Initialize();
-    }
-    else
-    {
-        size_type allocLen = (nLen + 1) * sizeof(value_type);
-        value_type* pData = m_strBuf;
-        if (allocLen > MAX_SIZE)
-        {
-            pData = (value_type*)CryModuleMalloc(allocLen);
-            _usedMemory(allocLen);   // For statistics.
-            m_nAllocSize = nLen;
-        }
-        else
-        {
-            m_nAllocSize = MAX_SIZE - 1;
-        }
-        m_nLength = nLen;
-        m_str = pData;
-        m_str[nLen] = 0; // null terminated string.
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::_Free()
-{
-    _FreeData(m_str);
-    _Initialize();
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::_FreeData(value_type* pData)
-{
-    if (pData != m_strBuf)
-    {
-        size_t allocLen = (m_nAllocSize + 1) * sizeof(value_type);
-        _usedMemory(-check_cast<ptrdiff_t>(allocLen));   // For statistics.
-        CryModuleFree(pData);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>::CryStackStringT()
-{
-    _Initialize();
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>::CryStackStringT(const CryStackStringT<T, S>& str)
-{
-    _Initialize();
-    _Assign(str.c_str(), str.length());
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>::CryStackStringT(const CryStackStringT<T, S>& str, size_type nOff, size_type nCount)
-{
-    _Initialize();
-    assign(str, nOff, nCount);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>::CryStackStringT(const_str str)
-{
-    _Initialize();
-    // Make a copy of C string.
-    size_type nLen = this->_strlen(str);
-    if (nLen != 0)
-    {
-        _AllocData(nLen);
-        CharTraits<T>::_copy(m_str, str, nLen);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>::CryStackStringT(const CryStringT<T>& str)
-{
-    _Initialize();
-    size_t nLength = str.size();
-    if (nLength > 0)
-    {
-        _AllocData(nLength);
-        CharTraits<T>::_copy(m_str, str.c_str(), nLength);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>::CryStackStringT(const_str str, size_type nLength)
-{
-    _Initialize();
-    if (nLength > 0)
-    {
-        _AllocData(nLength);
-        CharTraits<T>::_copy(m_str, str, nLength);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// The reason of making this constructor unavailable (for a while) is
-// explained in comments in front of the declaration of
-// CryStringT::CryStringT(size_type nRepeat, value_type ch)
-// (see CryString.h).
-template <class T, size_t S>
-inline CryStackStringT<T, S>::CryStackStringT(size_type nRepeat, value_type ch)
-{
-    _Initialize();
-    if (nRepeat > 0)
-    {
-        _AllocData(nRepeat);
-        CharTraits<T>::_set(m_str, ch, nRepeat);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>::CryStackStringT(const_iterator _First, const_iterator _Last)
-{
-    _Initialize();
-    size_type nLength = (size_type)(_Last - _First);
-    if (nLength > 0)
-    {
-        _AllocData(nLength);
-        CharTraits<T>::_copy(m_str, _First, nLength);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>::~CryStackStringT()
-{
-    _FreeData(m_str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::length() const
-{
-    return m_nLength;
-}
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::size() const
-{
-    return m_nLength;
-}
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::capacity() const
-{
-    return m_nAllocSize;
-}
-
-template <class T, size_t S>
-inline bool CryStackStringT<T, S>::empty() const
-{
-    return length() == 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::clear()
-{
-    if (length() == 0)
-    {
-        return;
-    }
-    _Free();
-    assert(length() == 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::reserve(size_type nCount)
-{
-    // Reserve of 0 is shrinking container to fit number of characters in it..
-    if (nCount > capacity())
-    {
-        value_type* pOldData = m_str;
-        size_type nOldLength = m_nLength;
-        _AllocData(nCount);
-        CharTraits<T>::_copy(m_str, pOldData, nOldLength);
-        m_nLength = nOldLength;
-        m_str[m_nLength] = 0;
-        _FreeData(pOldData);
-    }
-    else if (nCount == 0)
-    {
-        if (length() != capacity())
-        {
-            value_type* pOldData = m_str;
-            if (pOldData != m_strBuf)  // in case we fit into our static buffer, we cannot shrink anyway
-            {
-                size_type nOldLength = m_nLength;
-                _AllocData(m_nLength);
-                // if (pOldData != m_strBuf || m_str != m_strBuf) // actually always true
-                // {
-                CharTraits<T>::_copy(m_str, pOldData, nOldLength); // we can safely use CharTraits<T>::_copy, as we never overlap here (in case of static buffer, we don't shrink anyway)
-                _FreeData(pOldData);
-                // }
-            }
-        }
-    }
-    CRY_STRING_DEBUG(m_str)
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const_str _Ptr)
-{
-    *this += _Ptr;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const_str _Ptr, size_type nCount)
-{
-    _ConcatenateInPlace(_Ptr, nCount);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const CryStackStringT<T, S>& _Str, size_type off, size_type nCount)
-{
-    size_type len = _Str.length();
-    if (off > len)
-    {
-        return *this;
-    }
-    if (off + nCount > len)
-    {
-        nCount = len - off;
-    }
-    _ConcatenateInPlace(_Str.m_str + off, nCount);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const CryStackStringT<T, S>& _Str)
-{
-    *this += _Str;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(size_type nCount, value_type _Ch)
-{
-    if (nCount > 0)
-    {
-        if (length() + nCount >= capacity())
-        {
-            value_type* pOldData = m_str;
-            size_type nOldLength = m_nLength;
-            _AllocData(length() + nCount);
-            CharTraits<T>::_copy(m_str, pOldData, nOldLength);
-            CharTraits<T>::_set(m_str + nOldLength, _Ch, nCount);
-            _FreeData(pOldData);
-        }
-        else
-        {
-            size_type nOldLength = length();
-            CharTraits<T>::_set(m_str + nOldLength, _Ch, nCount);
-            m_nLength = nOldLength + nCount;
-            m_str[length()] = 0; // Make null terminated string.
-        }
-    }
-    CRY_STRING_DEBUG(m_str)
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const_iterator _First, const_iterator _Last)
-{
-    append(_First, (size_type)(_Last - _First));
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const_str _Ptr)
-{
-    *this = _Ptr;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const_str _Ptr, size_type nCount)
-{
-    size_type len = this->_strlen(_Ptr);
-    _Assign(_Ptr, (nCount < len) ? nCount : len);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const CryStackStringT<T, S>& _Str, size_type off, size_type nCount)
-{
-    size_type len = _Str.length();
-    if (off > len)
-    {
-        return *this;
-    }
-    if (off + nCount > len)
-    {
-        nCount = len - off;
-    }
-    _Assign(_Str.m_str + off, nCount);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const CryStackStringT<T, S>& _Str)
-{
-    *this = _Str;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(size_type nCount, value_type _Ch)
-{
-    if (nCount >= 1)
-    {
-        _AllocData(nCount);
-        CharTraits<T>::_set(m_str, _Ch, nCount);
-        CRY_STRING_DEBUG(m_str)
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const_iterator _First, const_iterator _Last)
-{
-    assign(_First, (size_type)(_Last - _First));
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::value_type CryStackStringT<T, S>::at(size_type index) const
-{
-    assert(index >= 0 && index < length());
-    return m_str[index];
-}
-
-/*
-inline value_type& CryStackStringT<T,S>::at( size_type index )
-{
-// same as GetAt
-assert( index >= 0 && index < length() );
-return m_str[index];
-}
-*/
-
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::value_type CryStackStringT<T, S>::operator[](size_type index) const
-{
-    assert(index < length());
-    return m_str[index];
-}
-
-
-/*
-inline value_type& CryStackStringT<T,S>::operator[]( size_type index )
-{
-// same as GetAt
-assert( index >= 0 && index < length() );
-return m_str[index];
-}
-*/
-
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compare(const CryStackStringT<T, S>& _Str) const
-{
-    return CharTraits<T>::_strcmp(m_str, _Str.m_str);
-}
-
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compare(size_type _Pos1, size_type _Num1, const CryStackStringT<T, S>& _Str) const
-{
-    return compare(_Pos1, _Num1, _Str.m_str, npos);
-}
-
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compare(size_type _Pos1, size_type _Num1, const CryStackStringT<T, S>& _Str, size_type nOff, size_type nCount) const
-{
-    assert(nOff < _Str.length());
-    return compare(_Pos1, _Num1, _Str.m_str + nOff, nCount);
-}
-
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compare(const value_type* _Ptr) const
-{
-    return CharTraits<T>::_strcmp(m_str, _Ptr);
-}
-
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compare(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2) const
-{
-    assert(_Pos1 < length());
-    if (length() - _Pos1 < _Num1)
-    {
-        _Num1 = length() - _Pos1; // trim to size
-    }
-    int res = _Num1 == 0 ? 0 : CharTraits<T>::_strncmp(m_str + _Pos1, _Ptr, (_Num1 < _Num2) ? _Num1 : _Num2);
-    return (res != 0 ? res : _Num2 == npos && _Ptr[_Num1] == 0 ? 0 : _Num1 < _Num2 ? -1 : _Num1 == _Num2 ? 0 : +1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compareNoCase(const CryStackStringT<T, S>& _Str) const
-{
-    return CharTraits<T>::_stricmp(m_str, _Str.m_str);
-}
-
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compareNoCase(size_type _Pos1, size_type _Num1, const CryStackStringT<T, S>& _Str) const
-{
-    return compareNoCase(_Pos1, _Num1, _Str.m_str, npos);
-}
-
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compareNoCase(size_type _Pos1, size_type _Num1, const CryStackStringT<T, S>& _Str, size_type nOff, size_type nCount) const
-{
-    assert(nOff < _Str.length());
-    return compareNoCase(_Pos1, _Num1, _Str.m_str + nOff, nCount);
-}
-
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compareNoCase(const value_type* _Ptr) const
-{
-    return CharTraits<T>::_stricmp(m_str, _Ptr);
-}
-
-template <class T, size_t S>
-inline int CryStackStringT<T, S>::compareNoCase(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2) const
-{
-    assert(_Pos1 < length());
-    if (length() - _Pos1 < _Num1)
-    {
-        _Num1 = length() - _Pos1; // trim to size
-    }
-    int res = _Num1 == 0 ? 0 : CharTraits<T>::_strnicmp(m_str + _Pos1, _Ptr, (_Num1 < _Num2) ? _Num1 : _Num2);
-    return (res != 0 ? res : _Num2 == npos && _Ptr[_Num1] == 0 ? 0 : _Num1 < _Num2 ? -1 : _Num1 == _Num2 ? 0 : +1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::copy(value_type* _Ptr, size_type nCount, size_type nOff) const
-{
-    assert(nOff < length());
-    if (nCount < 0)
-    {
-        nCount = 0;
-    }
-    if (nOff + nCount > length()) // trim to offset.
-    {
-        nCount = length() - nOff;
-    }
-
-    CharTraits<T>::_copy(_Ptr, m_str + nOff, nCount);
-    return nCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::resize(size_type nCount, value_type _Ch)
-{
-    _MakeUnique();
-    if (nCount > length())
-    {
-        size_type numToAdd = nCount - length();
-        append(numToAdd, _Ch);
-    }
-    else if (nCount < length())
-    {
-        m_nLength = nCount;
-        m_str[length()] = 0; // Make null terminated string.
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-//! compare helpers
-template <class T, size_t S>
-inline bool operator==(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
-{ return s1.compare(s2) == 0; }
-template <class T, size_t S>
-inline bool operator==(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
-{ return s1.compare(s2) == 0; }
-template <class T, size_t S>
-inline bool operator==(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
-{ return s2.compare(s1) == 0; }
-template <class T, size_t S>
-inline bool operator!=(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
-{ return s1.compare(s2) != 0; }
-template <class T, size_t S>
-inline bool operator!=(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
-{ return s1.compare(s2) != 0; }
-template <class T, size_t S>
-inline bool operator!=(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
-{ return s2.compare(s1) != 0; }
-template <class T, size_t S>
-inline bool operator<(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
-{ return s1.compare(s2) < 0; }
-template <class T, size_t S>
-inline bool operator<(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
-{ return s1.compare(s2) < 0; }
-template <class T, size_t S>
-inline bool operator<(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
-{ return s2.compare(s1) > 0; }
-template <class T, size_t S>
-inline bool operator>(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
-{ return s1.compare(s2) > 0; }
-template <class T, size_t S>
-inline bool operator>(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
-{ return s1.compare(s2) > 0; }
-template <class T, size_t S>
-inline bool operator>(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
-{ return s2.compare(s1) < 0; }
-template <class T, size_t S>
-inline bool operator<=(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
-{ return s1.compare(s2) <= 0; }
-template <class T, size_t S>
-inline bool operator<=(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
-{ return s1.compare(s2) <= 0; }
-template <class T, size_t S>
-inline bool operator<=(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
-{ return s2.compare(s1) >= 0; }
-template <class T, size_t S>
-inline bool operator>=(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
-{ return s1.compare(s2) >= 0; }
-template <class T, size_t S>
-inline bool operator>=(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
-{ return s1.compare(s2) >= 0; }
-template <class T, size_t S>
-inline bool operator>=(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
-{ return s2.compare(s1) <= 0; }
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator=(value_type ch)
-{
-    _Assign(&ch, 1);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S> operator+(const CryStackStringT<T, S>& string1, typename CryStackStringT<T, S>::value_type ch)
-{
-    CryStackStringT<T, S> s(string1);
-    s.append(1, ch);
-    return s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S> operator+(typename CryStackStringT<T, S>::value_type ch, const CryStackStringT<T, S>& str)
-{
-    CryStackStringT<T, S> s;
-    s.reserve(str.size() + 1);
-    s.append(1, ch);
-    s.append(str);
-    return s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S> operator+(const CryStackStringT<T, S>& string1, const CryStackStringT<T, S>& string2)
-{
-    CryStackStringT<T, S> s(string1);
-    s.append(string2);
-    return s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S> operator+(const CryStackStringT<T, S>& str1, const typename CryStackStringT<T, S>::value_type* str2)
-{
-    CryStackStringT<T, S> s(str1);
-    s.append(str2);
-    return s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S> operator+(const typename CryStackStringT<T, S>::value_type* str1, const CryStackStringT<T, S>& str2)
-{
-    assert(str1 == NULL || (CryStackStringT<T, S>::_IsValidString(str1)));
-    CryStackStringT<T, S> s;
-    s.reserve(CharTraits<T>::_strlen(str1) + str2.size());
-    s.append(str1);
-    s.append(str2);
-    return s;
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator=(const CryStackStringT<T, S>& str)
-{
-    _Assign (str.c_str(), str.length());
-    return *this;
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator=(const_str str)
-{
-    assert(str == NULL || _IsValidString(str));
-    _Assign(str, this->_strlen(str));
-    return *this;
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator=(const CryStringT<T>& str)
-{
-    _Assign(str.c_str(), str.size());
-    return *this;
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator+=(const CryStringT<T>& str)
-{
-    _ConcatenateInPlace(str.c_str(), str.size());
-    return *this;
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator+=(const_str str)
-{
-    assert(str == NULL || _IsValidString(str));
-    _ConcatenateInPlace(str, this->_strlen(str));
-    return *this;
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator+=(value_type ch)
-{
-    _ConcatenateInPlace(&ch, 1);
-    return *this;
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator+=(const CryStackStringT<T, S>& str)
-{
-    _ConcatenateInPlace(str.m_str, str.length());
-    return *this;
-}
-
-//! find first single character
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find(value_type ch, size_type pos) const
-{
-    if (!(/*pos >= 0 && */ pos <= length()))
-    {
-        return (typename CryStackStringT<T, S>::size_type)npos;
-    }
-    const_str str = CharTraits<T>::_strchr(m_str + pos, ch);
-    // return npos if not found and index otherwise
-    return (str == NULL) ? npos : (size_type)(str - m_str);
-}
-
-//! find a sub-string (like strstr)
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find(const_str subs, size_type pos) const
-{
-    assert(_IsValidString(subs));
-    if (!(pos >= 0 && pos <= length()))
-    {
-        return npos;
-    }
-
-    // find first matching substring
-    const_str str = CharTraits<T>::_strstr(m_str + pos, subs);
-
-    // return npos for not found, distance from beginning otherwise
-    return (str == NULL) ? npos : (size_type)(str - m_str);
-}
-
-//! find last single character
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::rfind(value_type ch, size_type pos) const
-{
-    const_str str;
-    if (pos == npos)
-    {
-        // find last single character
-        str = strrchr(m_str, ch);
-        // return -1 if not found, distance from beginning otherwise
-        return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
-    }
-    else
-    {
-        if (pos == npos)
-        {
-            pos = length();
-        }
-        if (!(pos >= 0 && pos <= length()))
-        {
-            return npos;
-        }
-
-        value_type tmp = m_str[pos + 1];
-        m_str[pos + 1] = 0;
-        str = strrchr(m_str, ch);
-        m_str[pos + 1] = tmp;
-    }
-    // return -1 if not found, distance from beginning otherwise
-    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_of(const CryStackStringT<T, S>& _Str, size_type _Off) const
-{
-    return find_first_of(_Str.m_str, _Off);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_of(value_type _Ch, size_type nOff) const
-{
-    if (!(nOff >= 0 && nOff <= length()))
-    {
-        return npos;
-    }
-    value_type charSet[2] = { _Ch, 0 };
-    const_str str = strpbrk(m_str + nOff, charSet);
-    return (str == NULL) ? -1 : (size_type)(str - m_str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_of(const_str charSet, size_type nOff) const
-{
-    assert(_IsValidString(charSet));
-    if (!(nOff >= 0 && nOff <= length()))
-    {
-        return npos;
-    }
-    const_str str = strpbrk(m_str + nOff, charSet);
-    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
-}
-
-//size_type find_first_not_of(const _Self& __s, size_type __pos = 0) const
-//{ return find_first_not_of(__s._M_start, __pos, __s.size()); }
-
-//size_type find_first_not_of(const _CharT* __s, size_type __pos = 0) const
-//{ _STLP_FIX_LITERAL_BUG(__s) return find_first_not_of(__s, __pos, _Traits::length(__s)); }
-
-//size_type find_first_not_of(const _CharT* __s, size_type __pos,   size_type __n) const;
-
-//size_type find_first_not_of(_CharT __c, size_type __pos = 0) const;
-
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_not_of(const value_type* _Ptr, size_type _Off) const
-{ return find_first_not_of(_Ptr, _Off, this->_strlen(_Ptr)); }
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_not_of(const CryStackStringT<T, S>& _Str, size_type _Off) const
-{ return find_first_not_of(_Str.m_str, _Off); }
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_not_of(value_type _Ch, size_type _Off) const
-{
-    if (_Off > length())
-    {
-        return npos;
-    }
-    else
-    {
-        for (const value_type* str = begin() + _Off; str != end(); ++str)
-        {
-            if (*str != _Ch)
-            {
-                return size_type(str - begin()); // Character found!
-            }
-        }
-        return npos;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const
-{
-    if (_Off > length())
-    {
-        return npos;
-    }
-    else
-    {
-        const value_type* charsFirst = _Ptr, * charsLast = _Ptr + _Count;
-        for (const value_type* str = begin() + _Off; str != end(); ++str)
-        {
-            const value_type* c;
-            for (c = charsFirst; c != charsLast; ++c)
-            {
-                if (*c == *str)
-                {
-                    break;
-                }
-            }
-            if (c == charsLast)
-            {
-                return size_type(str - begin());// Current character not in char set.
-            }
-        }
-        return npos;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S> CryStackStringT<T, S>::substr(size_type pos, size_type count) const
-{
-    if (pos >= length())
-    {
-        return CryStackStringT<T, S>();
-    }
-    if (count == npos)
-    {
-        count = length() - pos;
-    }
-    if (pos + count > length())
-    {
-        count = length() - pos;
-    }
-    return CryStackStringT<T, S>(m_str + pos, count);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::erase(size_type nIndex, size_type nCount)
-{
-    if (nIndex < 0)
-    {
-        nIndex = 0;
-    }
-    if (nCount < 0 || nCount > length() - nIndex)
-    {
-        nCount = length() - nIndex;
-    }
-    if (nCount > 0 && nIndex < length())
-    {
-        _MakeUnique();
-        size_type nNumToCopy = length() - (nIndex + nCount) + 1;
-        CharTraits<T>::_move(m_str + nIndex, m_str + nIndex + nCount, nNumToCopy);
-        m_nLength = length() - nCount;
-    }
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::insert(size_type nIndex, value_type ch)
-{
-    return insert(nIndex, 1, ch);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::insert(size_type nIndex, size_type nCount, value_type ch)
-{
-    _MakeUnique();
-
-    if (nIndex < 0)
-    {
-        nIndex = 0;
-    }
-
-    size_type nNewLength = length();
-    if (nIndex > nNewLength)
-    {
-        nIndex = nNewLength;
-    }
-    nNewLength += nCount;
-
-    if (capacity() < nNewLength)
-    {
-        value_type* pOldData = m_str;
-        size_type nOldLength = m_nLength;
-        const_str pstr = m_str;
-        _AllocData(nNewLength);
-        CharTraits<T>::_copy(m_str, pstr, nOldLength + 1);
-        _FreeData(pOldData);
-    }
-
-    CharTraits<T>::_move(m_str + nIndex + nCount, m_str + nIndex, (nNewLength - nIndex));
-    CharTraits<T>::_set(m_str + nIndex, ch, nCount);
-    m_nLength = nNewLength;
-    CRY_STRING_DEBUG(m_str)
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::insert(size_type nIndex, const_str pstr, size_type nCount)
-{
-    if (nIndex < 0)
-    {
-        nIndex = 0;
-    }
-
-    size_type nInsertLength = nCount;
-    size_type nNewLength = length();
-    if (nInsertLength > 0)
-    {
-        _MakeUnique();
-        if (nIndex > nNewLength)
-        {
-            nIndex = nNewLength;
-        }
-        nNewLength += nInsertLength;
-
-        if (capacity() < nNewLength)
-        {
-            value_type* pOldData = m_str;
-            size_type nOldLength = m_nLength;
-            const_str pOldStr = m_str;
-            _AllocData(nNewLength);
-            CharTraits<T>::_copy(m_str, pOldStr, (nOldLength + 1));
-            _FreeData(pOldData);
-        }
-
-        CharTraits<T>::_move(m_str + nIndex + nInsertLength, m_str + nIndex, (nNewLength - nIndex - nInsertLength + 1));
-        CharTraits<T>::_copy(m_str + nIndex, pstr, nInsertLength);
-        m_nLength = nNewLength;
-        m_str[length()] = 0;
-    }
-    CRY_STRING_DEBUG(m_str)
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::insert(size_type nIndex, const_str pstr)
-{
-    return insert(nIndex, pstr, this->_strlen(pstr));
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(size_type pos, size_type count, const_str strNew)
-{
-    return replace(pos, count, strNew, this->_strlen(strNew));
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(size_type pos, size_type count, const_str strNew, size_type count2)
-{
-    erase(pos, count);
-    insert(pos, strNew, count2);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(size_type pos, size_type count, size_type nNumChars, value_type chNew)
-{
-    erase(pos, count);
-    insert(pos, nNumChars, chNew);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(value_type chOld, value_type chNew)
-{
-    if (chOld != chNew)
-    {
-        _MakeUnique();
-        value_type* strend = m_str + length();
-        for (value_type* str = m_str; str != strend; ++str)
-        {
-            if (*str == chOld)
-            {
-                *str = chNew;
-            }
-        }
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(const_str strOld, const_str strNew)
-{
-    size_type nSourceLen = this->_strlen(strOld);
-    if (nSourceLen == 0)
-    {
-        return *this;
-    }
-    size_type nReplacementLen = this->_strlen(strNew);
-
-    size_type nCount = 0;
-    value_type* strStart = m_str;
-    value_type* strEnd = m_str + length();
-    value_type* strTarget;
-    while (strStart < strEnd)
-    {
-        while ((strTarget = CharTraits<T>::_strstr(strStart, strOld)) != NULL)
-        {
-            nCount++;
-            strStart = strTarget + nSourceLen;
-        }
-        strStart += this->_strlen(strStart) + 1;
-    }
-
-    if (nCount > 0)
-    {
-        _MakeUnique();
-
-        size_type nOldLength = length();
-        size_type nNewLength =  nOldLength + (nReplacementLen - nSourceLen) * nCount;
-        if (capacity() < nNewLength)
-        {
-            value_type* pOldData = m_str;
-            size_type nPrevLength = m_nLength;
-            const_str pstr = m_str;
-            _AllocData(nNewLength);
-            CharTraits<T>::_copy(m_str, pstr, nPrevLength);
-            _FreeData(pOldData);
-        }
-        strStart = m_str;
-        strEnd = m_str + length();
-
-        while (strStart < strEnd)
-        {
-            while ((strTarget = CharTraits<T>::_strstr(strStart, strOld)) != NULL)
-            {
-                size_type nBalance = nOldLength - ((size_type)(strTarget - m_str) + nSourceLen);
-                CharTraits<T>::_move(strTarget + nReplacementLen, strTarget + nSourceLen, nBalance);
-                CharTraits<T>::_copy(strTarget, strNew, nReplacementLen);
-                strStart = strTarget + nReplacementLen;
-                strStart[nBalance] = 0;
-                nOldLength += (nReplacementLen - nSourceLen);
-            }
-            strStart += this->_strlen(strStart) + 1;
-        }
-        m_nLength = nNewLength;
-    }
-    CRY_STRING_DEBUG(m_str)
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::move(CryStackStringT<T, S>& str)
-{
-    memcpy(this, &str, sizeof(*this));
-    if (str.m_str == str.m_strBuf)
-    {
-        m_str = m_strBuf;
-    }
-}
-
-template <class T, size_t S>
-inline void CryStackStringT<T, S>::swap(CryStackStringT<T, S>& _Str)
-{
-    CryStackStringT<T, S> temp;
-    temp.move(*this);
-    move(_Str);
-    _Str.move(temp);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::Format(const_str format, ...)
-{
-    assert(_IsValidString(format));
-
-    value_type temp[4096]; // Limited to 4096 characters!
-    va_list argList;
-    va_start(argList, format);
-    this->_vsnprintf(temp, 4095, format, argList);
-    temp[4095] = '\0';
-    va_end(argList);
-    *this = temp;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::FormatFast(const_str format, ...)
-{
-    assert(_IsValidString(format));
-
-    va_list argList;
-    va_start(argList, format);
-
-    int newLength = this->_vsnprintf(m_str, capacity(), format, argList);
-    if (newLength >= 0)
-    {
-        m_nLength = (size_type)newLength;
-    }
-    else
-    {
-        m_nLength = capacity();
-        m_str[capacity()] = '\0';
-    }
-
-    va_end(argList);
-
-    return *this;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::MakeLower()
-{
-    _MakeUnique();
-    for (value_type* s = m_str; *s != 0; s++)
-    {
-        *s = this->_ascii_tolower(*s);
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::MakeUpper()
-{
-    _MakeUnique();
-    for (value_type* s = m_str; *s != 0; s++)
-    {
-        *s = this->_ascii_toupper(*s);
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::Trim()
-{
-    return TrimRight().TrimLeft();
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::Trim(value_type ch)
-{
-    _MakeUnique();
-    const value_type chset[2] = { ch, 0 };
-    return TrimRight(chset).TrimLeft(chset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::Trim(const value_type* sCharSet)
-{
-    _MakeUnique();
-    return TrimRight(sCharSet).TrimLeft(sCharSet);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimRight(value_type ch)
-{
-    const value_type chset[2] = { ch, 0 };
-    return TrimRight(chset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimRight(const value_type* sCharSet)
-{
-    if (!sCharSet || !(*sCharSet) || length() < 1)
-    {
-        return *this;
-    }
-
-    const value_type* last = m_str + length() - 1;
-    const value_type* str = last;
-    while ((str != m_str) && (CharTraits<T>::_strchr(sCharSet, *str) != 0))
-    {
-        str--;
-    }
-
-    if (str != last)
-    {
-        // Just shrink length of the string.
-        size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
-        _MakeUnique();
-        m_nLength = nNewLength;
-        m_str[nNewLength] = 0;
-    }
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimRight()
-{
-    if (length() < 1)
-    {
-        return *this;
-    }
-
-    const value_type* last = m_str + length() - 1;
-    const value_type* str = last;
-    while ((str != m_str) && (CharTraits<T>::_isspace(*str) != 0))
-    {
-        str--;
-    }
-
-    if (str != last)     // something changed?
-    {
-        // Just shrink length of the string.
-        size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
-        _MakeUnique();
-        m_nLength = nNewLength;
-        m_str[nNewLength] = 0;
-    }
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimLeft(value_type ch)
-{
-    const value_type chset[2] = { ch, 0 };
-    return TrimLeft(chset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimLeft(const value_type* sCharSet)
-{
-    if (!sCharSet || !(*sCharSet))
-    {
-        return *this;
-    }
-
-    const value_type* str = m_str;
-    while ((*str != 0) && (CharTraits<T>::_strchr(sCharSet, *str) != 0))
-    {
-        str++;
-    }
-
-    if (str != m_str)
-    {
-        size_type nOff = (size_type)(str - m_str); // m_str can change in _MakeUnique
-        _MakeUnique();
-        size_type nNewLength = length() - nOff;
-        CharTraits<T>::_move(m_str, m_str + nOff, nNewLength + 1);
-        m_nLength = nNewLength;
-        m_str[nNewLength] = 0;
-    }
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimLeft()
-{
-    const value_type* str = m_str;
-    while ((*str != 0) && (CharTraits<T>::_isspace(*str) != 0))
-    {
-        str++;
-    }
-
-    if (str != m_str)
-    {
-        size_type nOff = (size_type)(str - m_str); // m_str can change in _MakeUnique
-        _MakeUnique();
-        size_type nNewLength = length() - nOff;
-        CharTraits<T>::_move(m_str, m_str + nOff, nNewLength + 1);
-        m_nLength = nNewLength;
-        m_str[nNewLength] = 0;
-    }
-
-    return *this;
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S> CryStackStringT<T, S>::Right(size_type count) const
-{
-    if (count == npos)
-    {
-        return CryStackStringT<T, S>();
-    }
-    else if (count > length())
-    {
-        return *this;
-    }
-
-    return CryStackStringT<T, S>(m_str + length() - count, count);
-}
-
-template <class T, size_t S>
-inline CryStackStringT<T, S> CryStackStringT<T, S>::Left(size_type count) const
-{
-    if (count == npos)
-    {
-        return CryStackStringT<T, S>();
-    }
-    else if (count > length())
-    {
-        count = length();
-    }
-
-    return CryStackStringT<T, S>(m_str, count);
-}
-
-// strspn equivalent
-template <class T, size_t S>
-inline CryStackStringT<T, S> CryStackStringT<T, S>::SpanIncluding(const_str charSet) const
-{
-    assert(_IsValidString(charSet));
-    return Left((size_type)this->_strspn(m_str, charSet));
-}
-
-// strcspn equivalent
-template <class T, size_t S>
-inline CryStackStringT<T, S> CryStackStringT<T, S>::SpanExcluding(const_str charSet) const
-{
-    assert(_IsValidString(charSet));
-    return Left((size_type)this->_strcspn(m_str, charSet));
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t S>
-inline CryStackStringT<T, S> CryStackStringT<T, S>::Tokenize(const_str charSet, int& nStart) const
-{
-    if (nStart < 0)
-    {
-        return CryStackStringT<T, S>();
-    }
-
-    if (!charSet)
-    {
-        return *this;
-    }
-
-    const_str sPlace = m_str + nStart;
-    const_str sEnd = m_str + length();
-    if (sPlace < sEnd)
-    {
-        int nIncluding = (int)this->_strspn(sPlace, charSet);
-
-        if ((sPlace + nIncluding) < sEnd)
-        {
-            sPlace += nIncluding;
-            int nExcluding = (int)this->_strcspn(sPlace, charSet);
-            int nFrom = nStart + nIncluding;
-            nStart = nFrom + nExcluding + 1;
-
-            return substr(nFrom, nExcluding);
-        }
-    }
-    // Return empty string.
-    nStart = -1;
-    return CryStackStringT<T, S>();
-}
-
-#if defined(_RELEASE)
-#define ASSERT_LEN        (void)(0)
-#define ASSERT_WLEN       (void)(0)
-#else
-#define ASSERT_LEN        CRY_ASSERT_TRACE(this->length() <= S, ("String '%s' is %u character(s) longer than MAX_SIZE=%u", this->c_str(), this->length() - S, S))
-#define ASSERT_WLEN       CRY_ASSERT_TRACE(this->length() <= S, ("Wide-char string '%ls' is %u character(s) longer than MAX_SIZE=%u", this->c_str(), this->length() - S, S))
-#endif
-
-// a template specialization for char
-template<size_t S>
-class CryFixedStringT
-    : public CryStackStringT<char, S>
-{
-public:
-    typedef CryStackStringT<char, S> _parentType;
-    typedef CryFixedStringT<S> _Self;
-    typedef size_t size_type;
-    typedef char value_type;
-    typedef const value_type* const_str;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef pointer iterator;
-    typedef const_pointer const_iterator;
-    static const size_type MAX_SIZE = S;
-    CryFixedStringT()
-        : _parentType() {}
-    CryFixedStringT(const _parentType& str)
-        : _parentType(str) {ASSERT_LEN; }
-    CryFixedStringT(const _parentType& str, size_type nOff, size_type nCount)
-        : _parentType(str, nOff, nCount) {ASSERT_LEN; }
-    CryFixedStringT(const _Self& str)
-        : _parentType(str) {ASSERT_LEN; }
-    CryFixedStringT(const _Self& str, size_type nOff, size_type nCount)
-        : _parentType(str, nOff, nCount) {ASSERT_LEN; }
-    CryFixedStringT(size_type nRepeat, value_type ch)
-        : _parentType(nRepeat, ch) {ASSERT_LEN; }
-    CryFixedStringT(const_str str)
-        : _parentType (str) {ASSERT_LEN; }
-    CryFixedStringT(const_str str, size_type nLength)
-        : _parentType(str, nLength) {ASSERT_LEN; }
-    CryFixedStringT(const_iterator _First, const_iterator _Last)
-        : _parentType(_First, _Last) {ASSERT_LEN; }
-
-    template<size_t AnySize>
-    _Self& operator=(const CryFixedStringT<AnySize>& str)
-    {
-        _parentType::operator = (str);
-        ASSERT_LEN;
-        return *this;
-    }
-    template<size_t AnySize>
-    _Self& operator=(const CryStackStringT<char, AnySize>& str)
-    {
-        _parentType::operator = (str);
-        ASSERT_LEN;
-        return *this;
-    }
-    _Self& operator=(value_type ch)
-    {
-        _parentType::operator = (ch);
-        ASSERT_LEN;
-        return *this;
-    }
-
-    void GetMemoryUsage(class ICrySizer* pSizer) const{}
-};
-
-// a template specialization for a fixed list of CryFixedString [Jan M.]
-template<size_t maxElements, size_t stringSize>
-class CCryFixedStringListT
-{
-public:
-    CCryFixedStringListT()
-    { Clear(); }
-
-    void Clear()
-    {
-        m_currentAmount = -1;
-        for (int a = 0; a < NUM_MAX_ELEMENTS; ++a)
-        {
-            m_data[a] = "";
-        }
-    }
-
-    void Add(const char* name)
-    {
-        m_data[++m_currentAmount] = name;
-        if (m_currentAmount == NUM_MAX_ELEMENTS)
-        {
-            m_currentAmount = -1;
-        }
-    }
-
-    const char* operator[](int index)
-    {
-        if (index <= m_currentAmount)
-        {
-            return m_data[index].c_str();
-        }
-        return NULL;
-    }
-
-    ILINE int Size() { return m_currentAmount + 1; }
-
-    CryFixedStringT<32>* GetData(int& amount)
-    {
-        amount = m_currentAmount + 1;
-        return m_data;
-    }
-private:
-    const static int NUM_MAX_ELEMENTS = maxElements;
-    CryFixedStringT<stringSize> m_data[NUM_MAX_ELEMENTS];
-    int32   m_currentAmount;
-};
-
-// a template specialization for wchar_t
-template<size_t S>
-class CryFixedWStringT
-    : public CryStackStringT<wchar_t, S>
-{
-public:
-    typedef CryStackStringT<wchar_t, S> _parentType;
-    typedef CryFixedWStringT<S> _Self;
-    typedef size_t size_type;
-    typedef wchar_t value_type;
-    typedef const value_type* const_str;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef pointer iterator;
-    typedef const_pointer const_iterator;
-    static const size_type MAX_SIZE = S;
-    CryFixedWStringT()
-        : _parentType() {}
-    CryFixedWStringT(const _parentType& str)
-        : _parentType(str) {ASSERT_WLEN; }
-    CryFixedWStringT(const _parentType& str, size_type nOff, size_type nCount)
-        : _parentType(str, nOff, nCount) {ASSERT_WLEN; }
-    CryFixedWStringT(const _Self& str)
-        : _parentType(str) {ASSERT_WLEN; }
-    CryFixedWStringT(const _Self& str, size_type nOff, size_type nCount)
-        : _parentType(str, nOff, nCount) {ASSERT_WLEN; }
-    CryFixedWStringT(size_type nRepeat, value_type ch)
-        : _parentType(nRepeat, ch) {ASSERT_WLEN; }
-    CryFixedWStringT(const_str str)
-        : _parentType (str) {ASSERT_WLEN; }
-    CryFixedWStringT(const_str str, size_type nLength)
-        : _parentType(str, nLength) {ASSERT_WLEN; }
-    CryFixedWStringT(const_iterator _First, const_iterator _Last)
-        : _parentType(_First, _Last) {ASSERT_WLEN; }
-
-    template<size_t AnySize>
-    _Self& operator=(const CryFixedWStringT<AnySize>& str)
-    {
-        _parentType::operator = (str);
-        ASSERT_WLEN;
-        return *this;
-    }
-    template<size_t AnySize>
-    _Self& operator=(const CryStackStringT<wchar_t, AnySize>& str)
-    {
-        _parentType::operator = (str);
-        ASSERT_WLEN;
-        return *this;
-    }
-};
-#undef ASSERT_LEN
-#undef ASSERT_WLEN
-typedef CryStackStringT<char, 512> stack_string;
-
-// Special string type used for specifying file paths.
-typedef CryStackStringT<char, 512> CryPathString;
-
-
-#if UNITTEST_CRYFIXEDSTRING
-
-struct SUnitTest_FixedString
-{
-    bool UnitAssert(const char* message, const char* value, const char* refValue)
-    {
-        int res = strcmp(value, refValue);
-        CRY_ASSERT_MESSAGE(res == 0, message);
-        return res == 0;
-    }
-
-    bool UnitAssert(const char* message, const wchar_t* value, const wchar_t* refValue)
-    {
-        int res = wcscmp(value, refValue);
-        CRY_ASSERT_MESSAGE(res == 0, message);
-        return res == 0;
-    }
-
-    bool UnitAssert(const char* message, bool cond)
-    {
-        CRY_ASSERT_MESSAGE(cond, message);
-        return cond;
-    }
-
-    bool UnitAssert(const char* message, size_t a, size_t b)
-    {
-        CRY_ASSERT_MESSAGE(a == b, message);
-        return a == b;
-    }
-
-    int UnitTest()
-    {
-        CryStackStringT<char, 10> str1;
-        CryStackStringT<char, 10> str2;
-        CryStackStringT<char, 4> str3;
-        CryStackStringT<char, 10> str4;
-        CryStackStringT<char, 5 + 1> str5;
-        CryStackStringT<wchar_t, 16> wstr1;
-        CryStackStringT<wchar_t, 255> wstr2;
-        CryFixedStringT<100> fixedString100;
-        CryFixedStringT<200> fixedString200;
-
-        typedef CryStackStringT<char, 10> T;
-        T* pStr = new T;
-        * pStr = "adads";
-        delete pStr;
-
-        str1 = "abcd";
-        UnitAssert ("Assignment1-EnoughSpace", str1, "abcd");
-
-        str2 = "efg";
-        UnitAssert ("Assignment2-EnoughSpace", str2, "efg");
-
-        str2 = str1;
-        UnitAssert ("Assignment3-EnoughSpace", str2, "abcd");
-
-        str3 = str1;
-        UnitAssert ("Assignment4-NotEnoughSpace", str3, "abcd");
-
-        str1 += "XY";
-        UnitAssert ("Concatenate-EnoughSpace", str1, "abcdXY");
-
-        str2 += "efghijk";
-        UnitAssert ("Concatenate-NotEnoughSpace", str2, "abcdefghijk");
-
-        str1.replace("bc", "");
-        UnitAssert ("Replace-Shrink-EnoughSpace", str1, "adXY");
-
-        str1.replace("XY", "1234");
-        UnitAssert ("Replace-Grow-EnoughSpace", str1, "ad1234");
-
-        str1.replace("1234", "1234567890");
-        UnitAssert ("Replace-Grow-NotEnoughSpace", str1, "ad1234567890");
-
-        str1.reserve(200);
-        UnitAssert ("Reserve200-SameString", str1, "ad1234567890");
-        UnitAssert ("Reserve200-Capacity", str1.capacity() == 200);
-
-        str1.reserve(0);
-        UnitAssert ("Reserve0-SameString", str1, "ad1234567890");
-        UnitAssert ("Reserve0-Capacity==Length", str1.capacity() == str1.length());
-
-        str1.erase(7); // doesn't change capacity
-        UnitAssert ("Erase-SameString", str1, "ad12345");
-
-        str4.assign("abc");
-        UnitAssert ("Str4 Assignment", str4, "abc");
-        str4.reserve(9);
-        UnitAssert ("Str4", str4.capacity() >= 9); // capacity is always >= MAX_SIZE-1
-        str4.reserve(0);
-        UnitAssert ("Str4-Shrink", str4.capacity() >= 9); // capacity is always >= MAX_SIZE-1
-
-        size_t idx = str1.find("123");
-        UnitAssert ("Str1-Find", idx == 2);
-
-        idx = str1.find("123", 3);
-        UnitAssert ("Str1-Find", idx == str1.npos);
-
-        wstr1 = L"abc";
-        UnitAssert ("WStr1-Assign", wstr1, L"abc");
-        UnitAssert ("WStr1-CompareCaseGT", wstr1.compare(L"aBc") > 0);
-        UnitAssert ("WStr1-CompareCaseLT", wstr1.compare(L"babc") < 0);
-        UnitAssert ("WStr1-CompareNoCase", wstr1.compareNoCase(L"aBc") == 0);
-
-        str1.Format("This is a %s %S with %d params", "mixed", L"string", 3);
-        str2.Format("This is a %S %s with %d params", L"mixed", "string", 3);
-        UnitAssert ("Str1-Format1", str1, "This is a mixed string with 3 params");
-        UnitAssert ("Str1-Format2", str1, str2);
-
-        wstr1.Format(L"This is a %s %S with %d params", L"mixed", "string", 3);
-        wstr2.Format(L"This is a %S %s with %d params", "mixed", L"string", 3);
-        UnitAssert ("WStr1-Format1", wstr1, L"This is a mixed string with 3 params");
-        UnitAssert ("WStr1-Format2", wstr1, wstr2);
-
-        str5.FormatFast("%s", "12345");
-        UnitAssert ("Str5-FormatFast", str5, "12345");
-
-        str5.FormatFast("%s", "012345");
-        UnitAssert ("Str5-FormatFast-Truncate", str5, "01234");
-
-        fixedString100 = str5;
-        str2 = fixedString200;
-        fixedString200 = fixedString100;
-        UnitAssert ("FixedString-Test2", fixedString100, "01234");
-        UnitAssert ("FixedString-Test1", fixedString100, fixedString200);
-
-        CryStackStringT<char, 10> testStr;
-        CryFixedStringT<100> testStr2;
-        CryFixedWStringT<100> testWStr1;
-        string normalString;
-        wstring normalWString;
-        normalString = string(testStr);
-        normalString = string(testStr2);
-        normalString.assign(testStr2.c_str());
-        // normalString = testStr;  // <- must NOT compile, as we don't allow it!
-        // normalWString = testWStr1;  // <- must NOT compile, as we don't allow it!
-        normalWString = wstring(testWStr1);
-        return 0;
-    }
-};
-#endif // #if UNITTEST_CRYFIXEDSTRING
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYFIXEDSTRING_H
diff --git a/Code/CryEngine/CryCommon/CryHalf.inl b/Code/CryEngine/CryCommon/CryHalf.inl
deleted file mode 100644
index b882e5e079..0000000000
--- a/Code/CryEngine/CryCommon/CryHalf.inl
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRY_HALF_INL
-#define CRY_HALF_INL
-
-#pragma once
-
-
-
-typedef uint16 CryHalf;
-class ICrySizer;
-
-typedef union floatint_union
-{
-    float f;
-    uint32 i;
-} floatint_union;
-
-__forceinline CryHalf CryConvertFloatToHalf(const float Value)
-{
-#if defined(LINUX) || defined(MAC)
-    asm volatile("" ::: "memory");
-#endif
-    unsigned int Result;
-
-    unsigned int IValue = ((unsigned int*)(&Value))[0];
-    unsigned int Sign = (IValue & 0x80000000U) >> 16U;
-    IValue = IValue & 0x7FFFFFFFU;      // Hack off the sign
-
-    if (IValue > 0x47FFEFFFU)
-    {
-        // The number is too large to be represented as a half.  Saturate to infinity.
-        Result = 0x7FFFU;
-    }
-    else
-    {
-        if (IValue < 0x38800000U)
-        {
-            // The number is too small to be represented as a normalized half.
-            // Convert it to a denormalized value.
-            unsigned int Shift = 113U - (IValue >> 23U);
-            IValue = (0x800000U | (IValue & 0x7FFFFFU)) >> Shift;
-        }
-        else
-        {
-            // Rebias the exponent to represent the value as a normalized half.
-            IValue += 0xC8000000U;
-        }
-
-        Result = ((IValue + 0x0FFFU + ((IValue >> 13U) & 1U)) >> 13U) & 0x7FFFU;
-    }
-    return (CryHalf)(Result | Sign);
-}
-
-__forceinline float CryConvertHalfToFloat(const CryHalf Value)
-{
-#if defined(LINUX) || defined(MAC)
-    asm volatile("" ::: "memory");
-#endif
-    unsigned int Mantissa;
-    unsigned int Exponent;
-    unsigned int Result;
-
-    Mantissa = (unsigned int)(Value & 0x03FF);
-
-    if ((Value & 0x7C00) != 0)  // The value is normalized
-    {
-        Exponent = (unsigned int)((Value >> 10) & 0x1F);
-    }
-    else if (Mantissa != 0)     // The value is denormalized
-    {
-        // Normalize the value in the resulting float
-        Exponent = 1;
-
-        do
-        {
-            Exponent--;
-            Mantissa <<= 1;
-        } while ((Mantissa & 0x0400) == 0);
-
-        Mantissa &= 0x03FF;
-    }
-    else                        // The value is zero
-    {
-        Exponent = (unsigned int)-112;
-    }
-
-    Result = ((Value & 0x8000) << 16) | // Sign
-        ((Exponent + 112) << 23) | // Exponent
-        (Mantissa << 13);          // Mantissa
-
-    return *(float*)&Result;
-}
-
-struct CryHalf2
-{
-    CryHalf x;
-    CryHalf y;
-
-    CryHalf2()
-    {
-    }
-    CryHalf2(CryHalf _x, CryHalf _y)
-        : x(_x)
-        , y(_y)
-    {
-    }
-    CryHalf2(const CryHalf* const __restrict pArray)
-    {
-        x = pArray[0];
-        y = pArray[1];
-    }
-    CryHalf2(float _x, float _y)
-    {
-        x = CryConvertFloatToHalf(_x);
-        y = CryConvertFloatToHalf(_y);
-    }
-    CryHalf2(const float* const __restrict pArray)
-    {
-        x = CryConvertFloatToHalf(pArray[0]);
-        y = CryConvertFloatToHalf(pArray[1]);
-    }
-    CryHalf2& operator= (const CryHalf2& Half2)
-    {
-        x = Half2.x;
-        y = Half2.y;
-        return *this;
-    }
-
-    bool operator !=(const CryHalf2& rhs) const
-    {
-        return x != rhs.x || y != rhs.y;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-
-    AUTO_STRUCT_INFO
-};
-
-struct CryHalf4
-{
-    CryHalf x;
-    CryHalf y;
-    CryHalf z;
-    CryHalf w;
-
-    CryHalf4()
-    {
-    }
-    CryHalf4(CryHalf _x, CryHalf _y, CryHalf _z, CryHalf _w)
-        : x(_x)
-        , y(_y)
-        , z(_z)
-        , w(_w)
-    {
-    }
-    CryHalf4(const CryHalf* const __restrict pArray)
-    {
-        x = pArray[0];
-        y = pArray[1];
-        z = pArray[2];
-        w = pArray[3];
-    }
-    CryHalf4(float _x, float _y, float _z, float _w)
-    {
-        x = CryConvertFloatToHalf(_x);
-        y = CryConvertFloatToHalf(_y);
-        z = CryConvertFloatToHalf(_z);
-        w = CryConvertFloatToHalf(_w);
-    }
-    CryHalf4(const float* const __restrict pArray)
-    {
-        x = CryConvertFloatToHalf(pArray[0]);
-        y = CryConvertFloatToHalf(pArray[1]);
-        z = CryConvertFloatToHalf(pArray[2]);
-        w = CryConvertFloatToHalf(pArray[3]);
-    }
-    CryHalf4& operator= (const CryHalf4& Half4)
-    {
-        x = Half4.x;
-        y = Half4.y;
-        z = Half4.z;
-        w = Half4.w;
-        return *this;
-    }
-    bool operator !=(const CryHalf4& rhs) const
-    {
-        return x != rhs.x || y != rhs.y || z != rhs.z || w != rhs.w;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-
-    AUTO_STRUCT_INFO
-};
-
-#endif // #ifndef CRY_HALF_INL
diff --git a/Code/CryEngine/CryCommon/CryHalf_info.h b/Code/CryEngine/CryCommon/CryHalf_info.h
deleted file mode 100644
index 4c9f0cf336..0000000000
--- a/Code/CryEngine/CryCommon/CryHalf_info.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYHALF_INFO_H
-#define CRYINCLUDE_CRYCOMMON_CRYHALF_INFO_H
-#pragma once
-
-#include "CryHalf.inl"
-
-STRUCT_INFO_BEGIN(CryHalf2)
-STRUCT_VAR_INFO(x, TYPE_INFO(CryHalf))
-STRUCT_VAR_INFO(y, TYPE_INFO(CryHalf))
-STRUCT_INFO_END(CryHalf2)
-
-STRUCT_INFO_BEGIN(CryHalf4)
-STRUCT_VAR_INFO(x, TYPE_INFO(CryHalf))
-STRUCT_VAR_INFO(y, TYPE_INFO(CryHalf))
-STRUCT_VAR_INFO(z, TYPE_INFO(CryHalf))
-STRUCT_VAR_INFO(w, TYPE_INFO(CryHalf))
-STRUCT_INFO_END(CryHalf4)
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYHALF_INFO_H
diff --git a/Code/CryEngine/CryCommon/CryHeaders.h b/Code/CryEngine/CryCommon/CryHeaders.h
deleted file mode 100644
index a23d8d6978..0000000000
--- a/Code/CryEngine/CryCommon/CryHeaders.h
+++ /dev/null
@@ -1,1505 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYHEADERS_H
-#define CRYINCLUDE_CRYCOMMON_CRYHEADERS_H
-#pragma once
-
-
-#include "BaseTypes.h"
-#include "Cry_Math.h"
-
-#ifdef MAX_SUB_MATERIALS
-// This checks that the values are in sync in the different files.
-COMPILE_TIME_ASSERT(MAX_SUB_MATERIALS == 128);
-#else
-    #define MAX_SUB_MATERIALS 128
-#endif
-
-#include "CryEndian.h"
-
-// Chunk type must fit into uint16
-enum ChunkTypes
-{
-    ChunkType_ANY     = 0,
-
-    ChunkType_Mesh = 0x1000,  // was 0xCCCC0000 in chunk files with versions <= 0x745
-    ChunkType_Helper,
-    ChunkType_VertAnim,
-    ChunkType_BoneAnim,
-    ChunkType_GeomNameList, // obsolete
-    ChunkType_BoneNameList,
-    ChunkType_MtlList,      // obsolete
-    ChunkType_MRM,          // obsolete
-    ChunkType_SceneProps,   // obsolete
-    ChunkType_Light,        // obsolete
-    ChunkType_PatchMesh,    // not implemented
-    ChunkType_Node,
-    ChunkType_Mtl,          // obsolete
-    ChunkType_Controller,
-    ChunkType_Timing,
-    ChunkType_BoneMesh,
-    ChunkType_BoneLightBinding, // obsolete. describes the lights binded to bones
-    ChunkType_MeshMorphTarget,  // describes a morph target of a mesh chunk
-    ChunkType_BoneInitialPos,   // describes the initial position (4x3 matrix) of each bone; just an array of 4x3 matrices
-    ChunkType_SourceInfo, // describes the source from which the cgf was exported: source max file, machine and user
-    ChunkType_MtlName, // material name
-    ChunkType_ExportFlags, // Special export flags.
-    ChunkType_DataStream, // Stream data.
-    ChunkType_MeshSubsets, // Array of mesh subsets.
-    ChunkType_MeshPhysicsData, // Physicalized mesh data.
-
-    // these are the new compiled chunks for characters
-    ChunkType_CompiledBones = 0x2000,  // was 0xACDC0000 in chunk files with versions <= 0x745
-    ChunkType_CompiledPhysicalBones,
-    ChunkType_CompiledMorphTargets,
-    ChunkType_CompiledPhysicalProxies,
-    ChunkType_CompiledIntFaces,
-    ChunkType_CompiledIntSkinVertices,
-    ChunkType_CompiledExt2IntMap,
-
-    ChunkType_BreakablePhysics = 0x3000,  // was 0xAAFC0000 in chunk files with versions <= 0x745
-    ChunkType_FaceMap,         // obsolete
-    ChunkType_MotionParameters,
-    ChunkType_FootPlantInfo,   // obsolete
-    ChunkType_BonesBoxes,
-    ChunkType_FoliageInfo,
-    ChunkType_Timestamp,
-    ChunkType_GlobalAnimationHeaderCAF,
-    ChunkType_GlobalAnimationHeaderAIM,
-    ChunkType_BspTreeData
-};
-
-enum ECgfStreamType
-{
-    CGF_STREAM_POSITIONS,
-    CGF_STREAM_NORMALS,
-    CGF_STREAM_TEXCOORDS,
-    CGF_STREAM_COLORS,
-    CGF_STREAM_COLORS2,
-    CGF_STREAM_INDICES,
-    CGF_STREAM_TANGENTS,
-    CGF_STREAM_DUMMY0_,  // used to be CGF_STREAM_SHCOEFFS, dummy is needed to keep existing assets loadable
-    CGF_STREAM_DUMMY1_,  // used to be CGF_STREAM_SHAPEDEFORMATION, dummy is needed to keep existing assets loadable
-    CGF_STREAM_BONEMAPPING,
-    CGF_STREAM_FACEMAP,
-    CGF_STREAM_VERT_MATS,
-    CGF_STREAM_QTANGENTS,
-    CGF_STREAM_SKINDATA,
-    CGF_STREAM_DUMMY2_,  // used to be old console specific, dummy is needed to keep existing assets loadable
-    CGF_STREAM_P3S_C4B_T2S,
-    CGF_STREAM_NUM_TYPES
-};
-
-//////////////////////////////////////////////////////////////////////////
-enum EPhysicsGeomType
-{
-    PHYS_GEOM_TYPE_NONE       = -1,
-    PHYS_GEOM_TYPE_DEFAULT    = 0x1000 + 0,
-    PHYS_GEOM_TYPE_NO_COLLIDE = 0x1000 + 1,
-    PHYS_GEOM_TYPE_OBSTRUCT   = 0x1000 + 2,
-
-    PHYS_GEOM_TYPE_DEFAULT_PROXY  = 0x1000 + 0x100, // Default physicalization, but only proxy (NoDraw geometry).
-};
-
-struct CryVertex
-{
-    Vec3 p;     //position
-    Vec3 n;     //normal vector
-
-    AUTO_STRUCT_INFO
-};
-
-struct CryFace
-{
-    int v0, v1, v2;     //vertex indices
-    int MatID;        //mat ID
-
-    int& operator [] (int i) {return (&v0)[i]; }
-    int operator [] (int i) const {return (&v0)[i]; }
-    bool isDegenerate () const {return v0 == v1 || v1 == v2 || v2 == v0; }
-
-    AUTO_STRUCT_INFO
-};
-
-struct CryUV
-{
-    float u, v;        //texture coordinates
-    AUTO_STRUCT_INFO
-};
-
-struct CrySkinVtx
-{
-    int bVolumetric;
-    int idx[4];
-    float w[4];
-    Matrix33 M;
-
-    AUTO_STRUCT_INFO
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct CryLink
-{
-    int     BoneID;
-    Vec3    offset;
-    float   Blending;
-
-    AUTO_STRUCT_INFO
-};
-
-struct CryIRGB
-{
-    unsigned char r, g, b;
-    AUTO_STRUCT_INFO
-};
-
-struct NAME_ENTITY
-{
-    char  name[64];
-};
-
-struct phys_geometry;
-
-struct CryBonePhysics
-{
-    phys_geometry* pPhysGeom; // id of a separate mesh for this bone // MUST not be in File Structures!!!
-    // additional joint parameters
-    int   flags;
-    float min[3], max[3];
-    float spring_angle[3];
-    float spring_tension[3];
-    float damping[3];
-    float framemtx[3][3];
-};
-
-// the compatible between 32- and 64-bits structure
-struct CryBonePhysics_Comp
-{
-    int nPhysGeom; // id of a separate mesh for this bone
-    // additional joint parameters
-    int   flags;
-    float min[3], max[3];
-    float spring_angle[3];
-    float spring_tension[3];
-    float damping[3];
-    float framemtx[3][3];
-
-    AUTO_STRUCT_INFO
-};
-
-#define __copy3(MEMBER) left.MEMBER[0] = right.MEMBER[0]; left.MEMBER[1] = right.MEMBER[1]; left.MEMBER[2] = right.MEMBER[2];
-inline void CopyPhysInfo(CryBonePhysics& left, const CryBonePhysics_Comp& right)
-{
-    left.pPhysGeom = (phys_geometry*)(INT_PTR)right.nPhysGeom;
-    left.flags = right.flags;
-    __copy3(min);
-    __copy3(max);
-    __copy3(spring_angle);
-    __copy3(spring_tension);
-    __copy3(damping);
-    __copy3(framemtx[0]);
-    __copy3(framemtx[1]);
-    __copy3(framemtx[2]);
-}
-inline void CopyPhysInfo(CryBonePhysics_Comp& left, const CryBonePhysics& right)
-{
-    left.nPhysGeom = (int)(INT_PTR)right.pPhysGeom;
-    left.flags = right.flags;
-    __copy3(min);
-    __copy3(max);
-    __copy3(spring_angle);
-    __copy3(spring_tension);
-    __copy3(damping);
-    __copy3(framemtx[0]);
-    __copy3(framemtx[1]);
-    __copy3(framemtx[2]);
-}
-#undef __copy3
-
-struct CryBoneDescData
-{
-    unsigned int m_nControllerID; // unic id of bone (generated from bone name in the max)
-
-    // [Sergiy] physics info for different lods
-    // lod 0 is the physics of alive body, lod 1 is the physics of a dead body
-    CryBonePhysics m_PhysInfo[2];
-    float m_fMass;
-
-    Matrix34 m_DefaultW2B; //intitalpose matrix World2Bone
-    Matrix34 m_DefaultB2W; //intitalpose matrix Bone2World
-
-    enum
-    {
-        kBoneNameMaxSize = 256,
-    };
-    char m_arrBoneName[CryBoneDescData::kBoneNameMaxSize];
-
-    int m_nLimbId; // set by model state class
-
-    // this bone parent is this[m_nOffsetParent], 0 if the bone is root. Normally this is <= 0
-    int m_nOffsetParent;
-
-    // The whole hierarchy of bones is kept in one big array that belongs to the ModelState
-    // Each bone that has children has its own range of bone objects in that array,
-    // and this points to the beginning of that range and defines the number of bones.
-    unsigned m_numChildren;
-    // the beginning of the subarray of children is at this[m_nOffsetChildren]
-    // this is 0 if there are no children
-    int m_nOffsetChildren;
-};
-
-struct CryBoneDescData_Comp
-{
-    unsigned int m_nControllerID; // unique id of bone (generated from bone name)
-
-    // [Sergiy] physics info for different lods
-    // lod 0 is the physics of alive body, lod 1 is the physics of a dead body
-    CryBonePhysics_Comp m_PhysInfo[2];
-    float m_fMass;
-
-    Matrix34 m_DefaultW2B; //intitalpose matrix World2Bone
-    Matrix34 m_DefaultB2W; //intitalpose matrix Bone2World
-
-    char m_arrBoneName[256];
-
-    int m_nLimbId; // set by model state class
-
-    // this bone parent is this[m_nOffsetParent], 0 if the bone is root. Normally this is <= 0
-    int m_nOffsetParent;
-
-    // The whole hierarchy of bones is kept in one big array that belongs to the ModelState
-    // Each bone that has children has its own range of bone objects in that array,
-    // and this points to the beginning of that range and defines the number of bones.
-    unsigned m_numChildren;
-    // the beginning of the subarray of children is at this[m_nOffsetChildren]
-    // this is 0 if there are no children
-    int m_nOffsetChildren;
-
-    AUTO_STRUCT_INFO
-};
-
-inline void CopyBoneDescData(CryBoneDescData_Comp& left, const CryBoneDescData& right)
-{
-    left.m_nControllerID = right.m_nControllerID;
-
-    CopyPhysInfo(left.m_PhysInfo[0], right.m_PhysInfo[0]);
-    CopyPhysInfo(left.m_PhysInfo[1], right.m_PhysInfo[1]);
-
-    left.m_fMass = right.m_fMass;
-    left.m_DefaultW2B = right.m_DefaultW2B;
-    left.m_DefaultB2W = right.m_DefaultB2W;
-    memcpy(left.m_arrBoneName, right.m_arrBoneName, sizeof(left.m_arrBoneName));
-    left.m_nLimbId = right.m_nLimbId;
-    left.m_nOffsetParent = right.m_nOffsetParent;
-    left.m_numChildren = right.m_numChildren;
-    left.m_nOffsetChildren = right.m_nOffsetChildren;
-}
-
-struct BONE_ENTITY
-{
-    int   BoneID;
-    int   ParentID;
-    int   nChildren;
-
-    // Id of controller (CRC32 From name of bone).
-    unsigned int  ControllerID;
-
-    char prop[32];
-    CryBonePhysics_Comp phys;
-
-    AUTO_STRUCT_INFO
-};
-
-struct KEY_HEADER
-{
-    int   KeyTime;  //in ticks
-    AUTO_STRUCT_INFO
-};
-
-struct RANGE_ENTITY
-{
-    char name[32];
-    int start;
-    int end;
-    AUTO_STRUCT_INFO
-};
-
-//========================================
-//Timing Chunk Header
-//========================================
-struct TIMING_CHUNK_DESC_0918
-{
-    enum
-    {
-        VERSION = 0x0918
-    };
-
-    f32     m_SecsPerTick;    // seconds/ticks
-    int32   m_TicksPerFrame;    // ticks/Frame
-
-    RANGE_ENTITY  global_range;   // covers all of the time ranges
-    int       qqqqnSubRanges;
-
-    AUTO_STRUCT_INFO
-};
-
-
-struct SPEED_CHUNK_DESC_2
-{
-    enum
-    {
-        VERSION = 0x0922
-    };
-
-    float     Speed;
-    float     Distance;
-    float     Slope;
-    uint32    AnimFlags;
-    f32       MoveDir[3];
-    QuatT     StartPosition;
-    AUTO_STRUCT_INFO
-};
-
-
-struct MotionParams905
-{
-    uint32  m_nAssetFlags;
-    uint32  m_nCompression;
-
-    int32   m_nTicksPerFrame;
-    f32     m_fSecsPerTick;
-    int32   m_nStart;
-    int32   m_nEnd;
-
-    f32     m_fMoveSpeed;
-    f32     m_fTurnSpeed;
-    f32     m_fAssetTurn;
-    f32     m_fDistance;
-    f32     m_fSlope;
-
-    QuatT   m_StartLocation;
-    QuatT   m_EndLocation;
-
-    f32     m_LHeelStart, m_LHeelEnd;
-    f32     m_LToe0Start, m_LToe0End;
-    f32     m_RHeelStart, m_RHeelEnd;
-    f32     m_RToe0Start, m_RToe0End;
-
-    MotionParams905()
-    {
-        m_nAssetFlags = 0;
-        m_nCompression = -1;
-        m_nTicksPerFrame = 0;
-        m_fSecsPerTick = 0;
-        m_nStart = 0;
-        m_nEnd = 0;
-
-        m_fMoveSpeed = -1;
-        m_fTurnSpeed = -1;
-        m_fAssetTurn = -1;
-        m_fDistance = -1;
-        m_fSlope = -1;
-
-        m_LHeelStart = -1;
-        m_LHeelEnd = -1;
-        m_LToe0Start = -1;
-        m_LToe0End = -1;
-        m_RHeelStart = -1;
-        m_RHeelEnd = -1;
-        m_RToe0Start = -1;
-        m_RToe0End = -1;
-
-        m_StartLocation.SetIdentity();
-        m_EndLocation.SetIdentity();
-    }
-};
-
-
-struct CHUNK_MOTION_PARAMETERS
-{
-    enum
-    {
-        VERSION = 0x0925
-    };
-
-    MotionParams905 mp;
-};
-
-
-
-struct CHUNK_GAHCAF_INFO
-{
-    enum
-    {
-        VERSION = 0x0971
-    };
-    enum
-    {
-        FILEPATH_SIZE = 256
-    };
-
-    uint32  m_Flags;
-    char    m_FilePath[FILEPATH_SIZE];
-    uint32  m_FilePathCRC32;
-    uint32  m_FilePathDBACRC32;
-
-    f32 m_LHeelStart, m_LHeelEnd;
-    f32 m_LToe0Start, m_LToe0End;
-    f32 m_RHeelStart, m_RHeelEnd;
-    f32 m_RToe0Start, m_RToe0End;
-
-    f32 m_fStartSec;                //asset-feature: Start time in seconds.
-    f32 m_fEndSec;                  //asset-feature: End time in seconds.
-    f32 m_fTotalDuration;           //asset-feature: asset-feature: total duration in seconds.
-    uint32 m_nControllers;
-
-    //locator information
-    QuatT m_StartLocation;
-    QuatT m_LastLocatorKey;
-    Vec3  m_vVelocity;         //asset-feature: the velocity vector for this asset
-    f32   m_fDistance;          //asset-feature: the absolute distance this objects is moving
-    f32   m_fSpeed;             //asset-feature: speed (meters in second)
-    f32   m_fSlope;             //asset-feature: uphill-downhill measured in degrees
-    f32   m_fTurnSpeed;         //asset-feature: turning speed per second
-    f32   m_fAssetTurn;         //asset-feature: radiant between first and last frame
-};
-
-
-
-
-struct CHUNK_GAHAIM_INFO
-{
-    struct VirtualExampleInit2
-    {
-        Vec2 polar;
-        uint8 i0, i1, i2, i3;
-        f32 w0, w1, w2, w3;
-    };
-    struct VirtualExample
-    {
-        uint8 i0, i1, i2, i3;
-        int16 v0, v1, v2, v3;
-    };
-
-    enum
-    {
-        VERSION = 0x0970
-    };
-    enum
-    {
-        XGRID = 17
-    };
-    enum
-    {
-        YGRID = 9
-    };
-    enum
-    {
-        FILEPATH_SIZE = 256
-    };
-
-    uint32  m_Flags;
-    char    m_FilePath[FILEPATH_SIZE];
-    uint32  m_FilePathCRC32;
-
-    f32 m_fStartSec;                //asset-feature: Start time in seconds.
-    f32 m_fEndSec;                  //asset-feature: End time in seconds.
-    f32 m_fTotalDuration;           //asset-feature: asset-feature: total duration in seconds.
-
-    uint32 m_AnimTokenCRC32;
-
-    uint64 m_nExist;
-    Quat m_MiddleAimPoseRot;
-    Quat m_MiddleAimPose;
-    VirtualExample m_PolarGrid[XGRID * YGRID];
-    uint32 m_numAimPoses;
-};
-
-
-//========================================
-//Material Chunk Header
-//========================================
-
-//////////////////////////////////////////////////////////////////////////
-#define MTL_NAME_CHUNK_DESC_0800_MAX_SUB_MATERIALS (32)
-struct MTL_NAME_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-    enum EFlags
-    {
-        FLAG_MULTI_MATERIAL  = 0x0001, // Have sub materials info.
-        FLAG_SUB_MATERIAL    = 0x0002, // This is sub material.
-        FLAG_SH_COEFFS       = 0x0004, // This material should get spherical harmonics coefficients computed.
-        FLAG_SH_2SIDED       = 0x0008, // This material will be used as 2 sided in the sh precomputation
-        FLAG_SH_AMBIENT      = 0x0010, // This material will get an ambient sh term(to not shadow it entirely)
-    };
-
-    int nFlags; // see EFlags.
-    int nFlags2;
-    char name[128]; //material/shader name
-    int nPhysicalizeType;
-    int nSubMaterials;
-    int nSubMatChunkId[MTL_NAME_CHUNK_DESC_0800_MAX_SUB_MATERIALS];
-    int nAdvancedDataChunkId;
-    float sh_opacity;
-    int reserve[32];
-
-    AUTO_STRUCT_INFO
-};
-
-struct MTL_NAME_CHUNK_DESC_0802
-{
-    enum
-    {
-        VERSION = 0x0802
-    };
-
-    char name[128];  //material/shader name
-    int nSubMaterials;
-
-    // Data continues from here.
-    // 1) if nSubMaterials is 0, this is a single-material: we store physicalization type of the material (int32).
-    // 2) if nSubMaterials is not 0, this is a multi-material: we store nSubMaterials physicalization types (int32
-    //    value for each sub-material). After the physicalization types we store chain of ASCIIZ names of sub-materials.
-
-    AUTO_STRUCT_INFO
-};
-
-//========================================
-//Mesh Chunk Header
-//========================================
-
-struct MESH_CHUNK_DESC_0745
-{
-    // Versions 0x0744 and 0x0745 are *exactly* the same.
-    // Version number was increased from 0x0744 to 0x0745 just because
-    // it was the only way to inform *old* (existing) executables that
-    // NODE_CHUNK_DESC(!) chunk format was changed and cannot be read
-    // by them (old CLoaderCGF::LoadNodeChunk() didn't check
-    // NODE_CHUNK_DESC's version number).
-    enum
-    {
-        VERSION = 0x0745
-    };
-    enum
-    {
-        COMPATIBLE_OLD_VERSION = 0x0744
-    };
-
-    enum EFlags1
-    {
-        FLAG1_BONE_INFO = 0x01,
-    };
-    enum EFlags2
-    {
-        FLAG2_HAS_VERTEX_COLOR = 0x01,
-        FLAG2_HAS_VERTEX_ALPHA = 0x02,
-        FLAG2_HAS_TOPOLOGY_IDS = 0x04,
-    };
-    unsigned char flags1;
-    unsigned char flags2;
-    int   nVerts;
-    int   nTVerts;      // # of texture vertices (0 or nVerts)
-    int   nFaces;
-    int   VertAnimID;   // id of the related vertAnim chunk if present. otherwise it is -1
-
-    AUTO_STRUCT_INFO
-};
-
-// Compiled Mesh chunk.
-struct MESH_CHUNK_DESC_0801
-{
-    // Versions 0x0800 and 0x0801 are *exactly* the same.
-    // Version number was increased from 0x0800 to 0x0801 just because
-    // it was the only way to inform *old* (existing) executables that
-    // NODE_CHUNK_DESC(!) chunk format was changed and cannot be read
-    // by them (old CLoaderCGF::LoadNodeChunk() didn't check
-    // NODE_CHUNK_DESC's version number).
-    enum
-    {
-        VERSION = 0x0801
-    };
-    enum
-    {
-        COMPATIBLE_OLD_VERSION = 0x0800
-    };
-
-    enum EFlags
-    {
-        MESH_IS_EMPTY           = 0x0001, // Empty mesh (no streams are saved)
-        HAS_TEX_MAPPING_DENSITY = 0x0002, // texMappingDensity contains a valid value
-        HAS_EXTRA_WEIGHTS       = 0x0004, // The weight stream will have weights for influences 5-8
-        HAS_FACE_AREA           = 0x0008, // geometricMeanFaceArea contains a valid value
-    };
-
-    int nFlags;  // @see EFlags
-    int nFlags2;
-
-    // Just for info.
-    int nVerts;       // Number of vertices.
-    int nIndices;     // Number of indices.
-    int nSubsets;     // Number of mesh subsets.
-
-    int nSubsetsChunkId; // Chunk id of subsets. (Must be ChunkType_MeshSubsets)
-    int nVertAnimID;    // id of the related vertAnim chunk if present. otherwise it is -1
-
-    // ChunkIDs of data streams (Must be ChunkType_DataStream).
-    int GetStreamChunkID(ECgfStreamType streamType, [[maybe_unused]] int streamIndex) const
-    {
-        // Ignore streamIndex since all chunks with version 0x0801 have only one stream per type
-        return nStreamChunkID[streamType];
-    }
-    int nStreamChunkID[ECgfStreamType::CGF_STREAM_NUM_TYPES]; // Index is one of ECgfStreamType values.
-
-    // Chunk IDs of physical mesh data. (Must be ChunkType_MeshPhysicsData)
-    int nPhysicsDataChunkId[4];
-
-    // Bounding box of the mesh.
-    Vec3 bboxMin;
-    Vec3 bboxMax;
-
-    float texMappingDensity;
-    float geometricMeanFaceArea;
-    int reserved[31];
-    AUTO_STRUCT_INFO
-};
-
-struct MESH_CHUNK_DESC_0802
-{
-    // Version 0x0802 adds an additional dimention to the nStreamChunkID array to allow for multiple streams of the same type
-    enum
-    {
-        VERSION = 0x0802
-    };
-    enum
-    {
-        COMPATIBLE_OLD_VERSION = 0x0802
-    };
-
-    enum EFlags
-    {
-        MESH_IS_EMPTY = 0x0001, // Empty mesh (no streams are saved)
-        HAS_TEX_MAPPING_DENSITY = 0x0002, // texMappingDensity contains a valid value
-        HAS_EXTRA_WEIGHTS = 0x0004, // The weight stream will have weights for influences 5-8
-        HAS_FACE_AREA = 0x0008, // geometricMeanFaceArea contains a valid value
-    };
-
-    int nFlags;  // @see EFlags
-    int nFlags2;
-
-    // Just for info.
-    int nVerts;       // Number of vertices.
-    int nIndices;     // Number of indices.
-    int nSubsets;     // Number of mesh subsets.
-
-    int nSubsetsChunkId; // Chunk id of subsets. (Must be ChunkType_MeshSubsets)
-    int nVertAnimID;    // id of the related vertAnim chunk if present. otherwise it is -1
-
-    // ChunkIDs of data streams (Must be ChunkType_DataStream).
-    int GetStreamChunkID(ECgfStreamType streamType, int streamIndex) const
-    {
-        return nStreamChunkID[streamType][streamIndex];
-    }
-    int nStreamChunkID[ECgfStreamType::CGF_STREAM_NUM_TYPES][8]; // [ECgfStreamType value][streamIndex] e.g. [CGF_STREAM_TEXCOORDS][1] to get UV set 1
-
-    // Chunk IDs of physical mesh data. (Must be ChunkType_MeshPhysicsData)
-    int nPhysicsDataChunkId[4];
-
-    // Bounding box of the mesh.
-    Vec3 bboxMin;
-    Vec3 bboxMax;
-
-    float texMappingDensity;
-    float geometricMeanFaceArea;
-    int reserved[31];
-    AUTO_STRUCT_INFO
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// Stream chunk contains data about a mesh data stream (positions, normals, etc...)
-//////////////////////////////////////////////////////////////////////////
-struct STREAM_DATA_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    enum EFlags { }; // Not implemented.
-
-    int nFlags;
-    int nStreamType;  // Stream type one of ECgfStreamType.
-    int nCount;       // Number of elements.
-    int nElementSize; // Element Size.
-    int reserved[2];
-
-    // Data starts here at the end of the chunk..
-    //char streamData[nCount*nElementSize];
-
-    AUTO_STRUCT_INFO
-};
-
-struct STREAM_DATA_CHUNK_DESC_0801
-{
-    enum
-    {
-        VERSION = 0x0801
-    };
-
-    enum EFlags { }; // Not implemented.
-
-    int nFlags;
-    int nStreamType;  // Stream type one of ECgfStreamType.
-    int nStreamIndex; // To handle multiple streams of the same type
-    int nCount;       // Number of elements.
-    int nElementSize; // Element Size.
-    int reserved[2];
-
-    // Data starts here at the end of the chunk..
-    //char streamData[nCount*nElementSize];
-
-    AUTO_STRUCT_INFO
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Contains array of mesh subsets.
-// Each subset holds an info about material id, indices ranges etc...
-//////////////////////////////////////////////////////////////////////////
-struct MESH_SUBSETS_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    enum EFlags
-    {
-        SH_HAS_DECOMPR_MAT = 0x0001,    // obsolete
-        BONEINDICES        = 0x0002,
-        HAS_SUBSET_TEXEL_DENSITY = 0x0004,
-    };
-
-    int nFlags;
-    int nCount;       // Number of elements.
-    int reserved[2];
-
-    struct MeshSubset
-    {
-        int nFirstIndexId;
-        int nNumIndices;
-        int nFirstVertId;
-        int nNumVerts;
-        int nMatID; // Material sub-object Id.
-        float fRadius;
-        Vec3 vCenter;
-
-        AUTO_STRUCT_INFO
-    };
-
-    struct MeshBoneIDs
-    {
-        uint32 numBoneIDs;
-        uint16 arrBoneIDs[0x80];
-
-        AUTO_STRUCT_INFO
-    };
-
-    struct MeshSubsetTexelDensity
-    {
-        float texelDensity;
-
-        AUTO_STRUCT_INFO
-    };
-
-    // Data starts here at the end of the chunk.
-    //Subset streamData[nCount];
-
-    MESH_SUBSETS_CHUNK_DESC_0800()
-        : nFlags(0)
-        , nCount(0)
-    {
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Contain array of mesh subsets.
-// Each subset holds an info about material id, indices ranges etc...
-//////////////////////////////////////////////////////////////////////////
-struct MESH_PHYSICS_DATA_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    int nDataSize;  // Size of physical data at the end of the chunk.
-    int nFlags;
-    int nTetrahedraDataSize;
-    int nTetrahedraChunkId; // Chunk of physics Tetrahedra data.
-    int reserved[2];
-
-    // Data starts here at the end of the chunk.
-    //char physicsData[nDataSize];
-    //char tetrahedraData[nTetrahedraDataSize];
-
-    AUTO_STRUCT_INFO
-};
-
-
-struct VERTANIM_CHUNK_DESC_0744
-{
-    enum
-    {
-        VERSION = 0x0744
-    };
-
-    int   GeomID;     // ID of the related mesh chunk
-    int   nKeys;      // # of keys
-    int   nVerts;     // # of vertices this object has
-    int   nFaces;     // # of faces this object has (for double check purpose)
-
-    AUTO_STRUCT_INFO
-};
-
-typedef VERTANIM_CHUNK_DESC_0744 VERTANIM_CHUNK_DESC;
-#define VERTANIM_CHUNK_DESC_VERSION VERTANIM_CHUNK_DESC_0744::VERSION
-
-//========================================
-//Bone Anim Chunk Header
-//========================================
-
-struct BONEANIM_CHUNK_DESC_0290
-{
-    enum
-    {
-        VERSION = 0x0290
-    };
-
-    int   nBones;
-
-    AUTO_STRUCT_INFO
-};
-
-//========================================
-//Bonelist Chunk Header
-//========================================
-
-// this structure describes the bone names
-// it's followed by numEntities packed \0-terminated strings, the list terminated by double-\0
-struct BONENAMELIST_CHUNK_DESC_0745
-{
-    enum
-    {
-        VERSION = 0x0745
-    };
-
-    int numEntities;
-    AUTO_STRUCT_INFO
-};
-
-
-struct COMPILED_BONE_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    char reserved[32];
-    AUTO_STRUCT_INFO
-};
-
-struct COMPILED_PHYSICALBONE_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    char reserved[32];
-    AUTO_STRUCT_INFO
-};
-
-struct COMPILED_PHYSICALPROXY_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    uint32 numPhysicalProxies;
-    AUTO_STRUCT_INFO
-};
-
-struct COMPILED_MORPHTARGETS_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800, VERSION1 = 0x801
-    };
-
-    uint32 numMorphTargets;
-    AUTO_STRUCT_INFO
-};
-
-
-struct COMPILED_INTFACES_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    AUTO_STRUCT_INFO
-};
-
-struct COMPILED_INTSKINVERTICES_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    char reserved[32];
-    AUTO_STRUCT_INFO
-};
-
-struct COMPILED_EXT2INTMAP_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800
-    };
-
-    AUTO_STRUCT_INFO
-};
-
-struct COMPILED_BONEBOXES_CHUNK_DESC_0800
-{
-    enum
-    {
-        VERSION = 0x0800, VERSION1 = 0x801
-    };
-
-    AUTO_STRUCT_INFO
-};
-
-// Keyframe and Timing Primitives __________________________________________________________________________________________________________________
-struct BaseKey
-{
-    int time;
-    AUTO_STRUCT_INFO
-};
-
-struct BaseTCB
-{
-    float t, c, b;
-    float ein, eout;
-    AUTO_STRUCT_INFO
-};
-
-struct BaseKey1
-    : BaseKey
-{
-    float   val;
-    AUTO_STRUCT_INFO
-};
-struct BaseKey3
-    : BaseKey
-{
-    Vec3  val;
-    AUTO_STRUCT_INFO
-};
-struct BaseKeyQ
-    : BaseKey
-{
-    CryQuat val;
-    AUTO_STRUCT_INFO
-};
-
-struct CryLin1Key
-    : BaseKey1
-{
-    AUTO_STRUCT_INFO
-};
-struct CryLin3Key
-    : BaseKey3
-{
-    AUTO_STRUCT_INFO
-};
-struct CryLinQKey
-    : BaseKeyQ
-{
-    AUTO_STRUCT_INFO
-};
-struct CryTCB1Key
-    : BaseKey1
-    , BaseTCB
-{
-    AUTO_STRUCT_INFO
-};
-struct CryTCB3Key
-    : BaseKey3
-    , BaseTCB
-{
-    AUTO_STRUCT_INFO
-};
-struct CryTCBQKey
-    : BaseKeyQ
-    , BaseTCB
-{
-    AUTO_STRUCT_INFO
-};
-struct CryBez1Key
-    : BaseKey1
-{
-    float    intan, outtan;
-    AUTO_STRUCT_INFO
-};
-struct CryBez3Key
-    : BaseKey3
-{
-    Vec3 intan, outtan;
-    AUTO_STRUCT_INFO
-};
-struct CryBezQKey
-    : BaseKeyQ
-{
-    AUTO_STRUCT_INFO
-};
-
-struct CryKeyPQLog
-{
-    int nTime;
-    Vec3 vPos;
-    Vec3 vRotLog; // logarithm of the rotation
-
-    // resets to initial position/rotation/time
-    void reset ()
-    {
-        nTime = 0;
-        vPos.x = vPos.y = vPos.z = 0;
-        vRotLog.x = vRotLog.y = vRotLog.z = 0;
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-//========================================
-//Controller Chunk Header
-//========================================
-enum CtrlTypes
-{
-    CTRL_NONE,
-    CTRL_CRYBONE,
-    CTRL_LINEER1, CTRL_LINEER3, CTRL_LINEERQ,
-    CTRL_BEZIER1, CTRL_BEZIER3, CTRL_BEZIERQ,
-    CTRL_TCB1,    CTRL_TCB3,    CTRL_TCBQ,
-    CTRL_BSPLINE_2O, // 2-byte fixed values, open
-    CTRL_BSPLINE_1O, // 1-byte fixed values, open
-    CTRL_BSPLINE_2C, // 2-byte fixed values, closed
-    CTRL_BSPLINE_1C,  // 1-byte fixed values, closed
-    CTRL_CONST       // constant position&rotation
-};
-
-enum CtrlFlags
-{
-    CTRL_ORT_CYCLE = 0x01,
-    CTRL_ORT_LOOP = 0x02
-};
-
-// Used to store TCB-controllers in .anm files
-struct CONTROLLER_CHUNK_DESC_0826
-{
-    enum
-    {
-        VERSION = 0x0826
-    };
-
-    CtrlTypes   type;   //one ot the CtrlTypes values
-    int       nKeys;    // # of keys this controller has; toatl # of knots (positional and orientational) in the case of B-Spline
-
-    //unsigned short nSubCtrl;  // # of sub controllers; not used now/reserved
-    unsigned int nFlags;    // Flags of controller.
-    //int       nSubCtrl; // # of sub controllers; not used now/reserved
-
-    unsigned nControllerId; // unique generated in exporter id based on crc32 of bone name
-
-    AUTO_STRUCT_INFO
-};
-
-// Format used to store uncompressed sampled animation exported from DCC into .i_caf files (earlier .caf)
-struct CONTROLLER_CHUNK_DESC_0827
-{
-    enum
-    {
-        VERSION = 0x0827
-    };
-    unsigned numKeys;
-    unsigned nControllerId;
-
-    AUTO_STRUCT_INFO
-};
-
-// Unused format (was it introduced to fix missing header in 827?)
-struct CONTROLLER_CHUNK_DESC_0828
-{
-    enum
-    {
-        VERSION = 0x0828
-    };
-};
-
-struct CONTROLLER_CHUNK_DESC_0829
-{
-    enum
-    {
-        VERSION = 0x0829
-    };
-
-    enum
-    {
-        eKeyTimeRotation = 0, eKeyTimePosition = 1, eKeyTimeScale = 2
-    };
-
-    unsigned int nControllerId;
-
-    uint16 numRotationKeys;
-    uint16 numPositionKeys;
-    uint8 RotationFormat;
-    uint8 RotationTimeFormat;
-    uint8 PositionFormat;
-    uint8 PositionKeysInfo;
-    uint8 PositionTimeFormat;
-    uint8 TracksAligned;
-
-    AUTO_STRUCT_INFO
-};
-
-// Added new controller flags field, correspond to v827 and v829 respectively
-struct CONTROLLER_CHUNK_DESC_0830
-{
-    enum
-    {
-        VERSION = 0x830
-    };
-
-    CONTROLLER_CHUNK_DESC_0830(){}
-
-    CONTROLLER_CHUNK_DESC_0830(const CONTROLLER_CHUNK_DESC_0827* oldChunk)
-        : numKeys(oldChunk->numKeys)
-        , nControllerId(oldChunk->nControllerId)
-        , nFlags(0)
-    {}
-
-    unsigned numKeys;
-    unsigned nControllerId;
-    unsigned nFlags;
-
-    AUTO_STRUCT_INFO
-};
-
-struct CONTROLLER_CHUNK_DESC_0831
-{
-    enum
-    {
-        VERSION = 0x831
-    };
-
-    CONTROLLER_CHUNK_DESC_0831(){}
-
-    CONTROLLER_CHUNK_DESC_0831(const CONTROLLER_CHUNK_DESC_0829* oldChunk)
-        : nControllerId(oldChunk->nControllerId)
-        , nFlags(0)
-        , numPositionKeys(oldChunk->numPositionKeys)
-        , numRotationKeys(oldChunk->numRotationKeys)
-        , RotationFormat(oldChunk->RotationFormat)
-        , RotationTimeFormat(oldChunk->RotationTimeFormat)
-        , PositionFormat(oldChunk->PositionFormat)
-        , PositionKeysInfo(oldChunk->PositionKeysInfo)
-        , PositionTimeFormat(oldChunk->PositionTimeFormat)
-        , TracksAligned(oldChunk->TracksAligned)
-    {}
-
-    enum
-    {
-        eKeyTimeRotation = 0, eKeyTimePosition = 1, eKeyTimeScale = 2
-    };
-
-    unsigned int nControllerId;
-    unsigned int nFlags;
-
-    uint16 numRotationKeys;
-    uint16 numPositionKeys;
-    uint8 RotationFormat;
-    uint8 RotationTimeFormat;
-    uint8 PositionFormat;
-    uint8 PositionKeysInfo;
-    uint8 PositionTimeFormat;
-    uint8 TracksAligned;
-
-    AUTO_STRUCT_INFO
-};
-
-struct CONTROLLER_CHUNK_DESC_0905
-{
-    enum
-    {
-        VERSION = 0x0905
-    };
-
-    uint32 numKeyPos;
-    uint32 numKeyRot;
-    uint32 numKeyTime;
-    uint32 numAnims;
-    AUTO_STRUCT_INFO
-};
-
-//========================================
-//Node Chunk Header
-//========================================
-struct NODE_CHUNK_DESC_0824
-{
-    // Versions 0x0823 and 0x0824 have exactly same layout.
-    // The only difference between 0x0823 and 0x0824 is that some members
-    // are now named _obsoleteXXX_ and are not filled/used in 0x0824.
-    enum
-    {
-        VERSION = 0x0824
-    };
-    enum
-    {
-        COMPATIBLE_OLD_VERSION = 0x0823
-    };
-
-    char    name[64];
-
-    int     ObjectID;        // ID of this node's object chunk (if present)
-    int     ParentID;        // chunk ID of the parent Node's chunk
-    int     nChildren;       // # of children Nodes
-    int     MatID;           // Material chunk No
-
-    uint8   _obsoleteA_[4];  // uint8 IsGroupHead; uint8 IsGroupMember; uint8 _padding_[2]. not used anymore.
-
-    float   tm[4][4];        // transformation matrix
-
-    float   _obsoleteB_[3];  // position component of the matrix, stored as Vec3. not used anymore.
-    float   _obsoleteC_[4];  // rotation component of the matrix, stored as CryQuat. not used anymore.
-    float   _obsoleteD_[3];  // scale component of the matrix, stored as Vec3. not used anymore.
-
-    int     pos_cont_id;     // position controller chunk id
-    int     rot_cont_id;     // rotation controller chunk id
-    int     scl_cont_id;     // scale controller chunk id
-
-    int     PropStrLen;      // length of the property string
-
-    AUTO_STRUCT_INFO
-};
-
-//========================================
-//Helper Chunk Header
-//========================================
-enum HelperTypes
-{
-    HP_POINT = 0,
-    HP_DUMMY = 1,
-    HP_XREF = 2,
-    HP_CAMERA = 3,
-    HP_GEOMETRY = 4
-};
-
-struct HELPER_CHUNK_DESC_0744
-{
-    enum
-    {
-        VERSION = 0x0744
-    };
-
-    HelperTypes type;     // one of the HelperTypes values
-    Vec3  size;     // size in local x,y,z axises (for dummy only)
-
-    AUTO_STRUCT_INFO
-};
-
-typedef HELPER_CHUNK_DESC_0744 HELPER_CHUNK_DESC;
-#define HELPER_CHUNK_DESC_VERSION HELPER_CHUNK_DESC::VERSION
-
-
-// ChunkType_MeshMorphTarget  - morph target of a mesh chunk
-// This chunk contains only the information about the vertices that are changed in the mesh
-// This chunk is followed by an array of numMorphVertices structures SMeshMorphTargetVertex,
-// immediately followed by the name (null-terminated, variable-length string) of the morph target.
-// The string is after the array because of future alignment considerations; it may be padded with 0s.
-struct MESHMORPHTARGET_CHUNK_DESC_0001
-{
-    enum
-    {
-        VERSION = 0x0001
-    };
-    uint32 nChunkIdMesh;   // the chunk id of the mesh chunk (ChunkType_Mesh) for which this morph target is
-    uint32 numMorphVertices;  // number of MORPHED vertices
-
-    AUTO_STRUCT_INFO
-};
-
-
-// an array of these structures follows the MESHMORPHTARGET_CHUNK_DESC_0001
-// there are numMorphVertices of them
-struct SMeshMorphTargetVertex
-{
-    uint32 nVertexId; // vertex index in the original (mesh) array of vertices
-    Vec3 ptVertex;     // the target point of the morph target
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-    AUTO_STRUCT_INFO
-};
-
-struct SMeshMorphTargetHeader
-{
-    uint32 MeshID;
-    uint32 NameLength;  //size of the name string
-    uint32 numIntVertices; //type SMeshMorphTargetVertex
-    uint32 numExtVertices; //type SMeshMorphTargetVertex
-
-    AUTO_STRUCT_INFO
-};
-
-struct SMeshPhysicalProxyHeader
-{
-    uint32 ChunkID;
-    uint32 numPoints;
-    uint32 numIndices;
-    uint32 numMaterials;
-
-    AUTO_STRUCT_INFO
-};
-
-//
-// ChunkType_BoneInitialPos   - describes the initial position (4x3 matrix) of each bone; just an array of 4x3 matrices
-// This structure is followed by
-struct BONEINITIALPOS_CHUNK_DESC_0001
-{
-    enum
-    {
-        VERSION = 0x0001
-    };
-    // the chunk id of the mesh chunk (ChunkType_Mesh) with bone info for which these bone initial positions are applicable.
-    // there might be some unused bones here as well. There must be the same number of bones as in the other chunks - they're placed
-    // in BoneId order.
-    unsigned nChunkIdMesh;
-    // this is the number of bone initial pose matrices here
-    unsigned numBones;
-
-    AUTO_STRUCT_INFO
-};
-
-// an array of these matrices follows the  BONEINITIALPOS_CHUNK_DESC_0001 header
-// there are numBones of them
-// TO BE REPLACED WITH Matrix43
-struct SBoneInitPosMatrix
-{
-    float mx[4][3];
-    float* operator [] (int i) {return mx[i]; }
-    const float* operator [] (int i) const {return mx[i]; }
-    const Vec3& getOrt (int nOrt) const {return *(const Vec3*)(mx[nOrt]); }
-
-    AUTO_STRUCT_INFO
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Custom Attributes chunk description.
-//////////////////////////////////////////////////////////////////////////
-struct EXPORT_FLAGS_CHUNK_DESC
-{
-    enum
-    {
-        VERSION = 0x0001
-    };
-    enum EFlags
-    {
-        MERGE_ALL_NODES          = 0x0001,
-        HAVE_AUTO_LODS           = 0x0002,
-        USE_CUSTOM_NORMALS       = 0x0004,
-        WANT_F32_VERTICES        = 0x0008,
-        EIGHT_WEIGHTS_PER_VERTEX = 0x0010,
-        //START: Prevent reprocessing skinning data for skinned CGF
-        SKINNED_CGF              = 0x0020,
-        //END: Prevent reprocessing skinning data for skinned CGF
-    };
-    enum ESrcFlags
-    {
-        FROM_MAX_EXPORTER = 0x0000,
-        FROM_COLLADA_XSI  = 0x1001,
-        FROM_COLLADA_MAX  = 0x1002,
-        FROM_COLLADA_MAYA = 0x1003,
-    };
-
-    unsigned int flags; // @see EFlags
-    unsigned int rc_version[4]; // Resource compiler version.
-    char rc_version_string[16]; // Version as a string.
-    unsigned int assetAuthorTool;
-    unsigned int authorToolVersion;
-    unsigned int reserved[30];
-
-    AUTO_STRUCT_INFO
-};
-
-struct BREAKABLE_PHYSICS_CHUNK_DESC
-{
-    enum
-    {
-        VERSION = 0x0001
-    };
-
-    unsigned int granularity;
-    int nMode;
-    int nRetVtx;
-    int nRetTets;
-    int nReserved[10];
-
-    AUTO_STRUCT_INFO
-};
-
-struct FOLIAGE_INFO_CHUNK_DESC
-{
-    enum
-    {
-        //START: Add Skinned Geometry (.CGF) export type (for touch bending vegetation)
-        VERSION = 0x0001,
-        VERSION2 = 0x0002
-        //END: Add Skinned Geometry (.CGF) export type (for touch bending vegetation)
-    };
-
-    int nSpines;
-    int nSpineVtx;
-    int nSkinnedVtx;
-    int nBoneIds;
-
-    AUTO_STRUCT_INFO
-};
-
-struct FOLIAGE_SPINE_SUB_CHUNK
-{
-    unsigned char nVtx;
-    char _paddingA_[3];
-    float len;
-    Vec3 navg;
-    unsigned char iAttachSpine;
-    unsigned char iAttachSeg;
-    char _paddingB_[2];
-
-    AUTO_STRUCT_INFO
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYHEADERS_H
diff --git a/Code/CryEngine/CryCommon/CryHeaders_info.cpp b/Code/CryEngine/CryCommon/CryHeaders_info.cpp
deleted file mode 100644
index 4aefe61ee1..0000000000
--- a/Code/CryEngine/CryCommon/CryHeaders_info.cpp
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "TypeInfo_impl.h"
-#include "CryHeaders.h"
-
-STRUCT_INFO_BEGIN(CryVertex)
-STRUCT_VAR_INFO(p, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(n, TYPE_INFO(Vec3))
-STRUCT_INFO_END(CryVertex)
-
-STRUCT_INFO_BEGIN(CryFace)
-STRUCT_VAR_INFO(v0, TYPE_INFO(int))
-STRUCT_VAR_INFO(v1, TYPE_INFO(int))
-STRUCT_VAR_INFO(v2, TYPE_INFO(int))
-STRUCT_VAR_INFO(MatID, TYPE_INFO(int))
-STRUCT_INFO_END(CryFace)
-
-STRUCT_INFO_BEGIN(CryUV)
-STRUCT_VAR_INFO(u, TYPE_INFO(float))
-STRUCT_VAR_INFO(v, TYPE_INFO(float))
-STRUCT_INFO_END(CryUV)
-
-STRUCT_INFO_BEGIN(CrySkinVtx)
-STRUCT_VAR_INFO(bVolumetric, TYPE_INFO(int))
-STRUCT_VAR_INFO(idx, TYPE_INFO_ARRAY(4, TYPE_INFO(int)))
-STRUCT_VAR_INFO(w, TYPE_INFO_ARRAY(4, TYPE_INFO(float)))
-STRUCT_VAR_INFO(M, TYPE_INFO(Matrix33))
-STRUCT_INFO_END(CrySkinVtx)
-
-STRUCT_INFO_BEGIN(CryLink)
-STRUCT_VAR_INFO(BoneID, TYPE_INFO(int))
-STRUCT_VAR_INFO(offset, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(Blending, TYPE_INFO(float))
-STRUCT_INFO_END(CryLink)
-
-STRUCT_INFO_BEGIN(CryIRGB)
-STRUCT_VAR_INFO(r, TYPE_INFO(unsigned char))
-STRUCT_VAR_INFO(g, TYPE_INFO(unsigned char))
-STRUCT_VAR_INFO(b, TYPE_INFO(unsigned char))
-STRUCT_INFO_END(CryIRGB)
-
-STRUCT_INFO_BEGIN(CryBonePhysics_Comp)
-STRUCT_VAR_INFO(nPhysGeom, TYPE_INFO(int))
-STRUCT_VAR_INFO(flags, TYPE_INFO(int))
-STRUCT_VAR_INFO(min, TYPE_ARRAY(3, TYPE_INFO(float)))
-STRUCT_VAR_INFO(max, TYPE_ARRAY(3, TYPE_INFO(float)))
-STRUCT_VAR_INFO(spring_angle, TYPE_ARRAY(3, TYPE_INFO(float)))
-STRUCT_VAR_INFO(spring_tension, TYPE_ARRAY(3, TYPE_INFO(float)))
-STRUCT_VAR_INFO(damping, TYPE_ARRAY(3, TYPE_INFO(float)))
-STRUCT_VAR_INFO(framemtx, TYPE_ARRAY(3, TYPE_ARRAY(3, TYPE_INFO(float))))
-STRUCT_INFO_END(CryBonePhysics_Comp)
-
-STRUCT_INFO_BEGIN(CryBoneDescData_Comp)
-STRUCT_VAR_INFO(m_nControllerID, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(m_PhysInfo, TYPE_ARRAY(2, TYPE_INFO(BONE_PHYSICS_COMP)))
-STRUCT_VAR_INFO(m_fMass, TYPE_INFO(float))
-STRUCT_VAR_INFO(m_DefaultW2B, TYPE_INFO(Matrix34))
-STRUCT_VAR_INFO(m_DefaultB2W, TYPE_INFO(Matrix34))
-STRUCT_VAR_INFO(m_arrBoneName, TYPE_ARRAY(256, TYPE_INFO(char)))
-STRUCT_VAR_INFO(m_nLimbId, TYPE_INFO(int))
-STRUCT_VAR_INFO(m_nOffsetParent, TYPE_INFO(int))
-STRUCT_VAR_INFO(m_numChildren, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(m_nOffsetChildren, TYPE_INFO(int))
-STRUCT_INFO_END(CryBoneDescData_Comp)
-
-STRUCT_INFO_BEGIN(BONE_ENTITY)
-STRUCT_VAR_INFO(BoneID, TYPE_INFO(int))
-STRUCT_VAR_INFO(ParentID, TYPE_INFO(int))
-STRUCT_VAR_INFO(nChildren, TYPE_INFO(int))
-STRUCT_VAR_INFO(ControllerID, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(prop, TYPE_ARRAY(32, TYPE_INFO(char)))
-STRUCT_VAR_INFO(phys, TYPE_INFO(BONE_PHYSICS_COMP))
-STRUCT_INFO_END(BONE_ENTITY)
-
-ENUM_INFO_BEGIN(ChunkTypes)
-ENUM_ELEM_INFO(, ChunkType_ANY)
-ENUM_ELEM_INFO(, ChunkType_Mesh)
-ENUM_ELEM_INFO(, ChunkType_Helper)
-ENUM_ELEM_INFO(, ChunkType_VertAnim)
-ENUM_ELEM_INFO(, ChunkType_BoneAnim)
-ENUM_ELEM_INFO(, ChunkType_GeomNameList)
-ENUM_ELEM_INFO(, ChunkType_BoneNameList)
-ENUM_ELEM_INFO(, ChunkType_MtlList)
-ENUM_ELEM_INFO(, ChunkType_MRM)
-ENUM_ELEM_INFO(, ChunkType_SceneProps)
-ENUM_ELEM_INFO(, ChunkType_Light)
-ENUM_ELEM_INFO(, ChunkType_PatchMesh)
-ENUM_ELEM_INFO(, ChunkType_Node)
-ENUM_ELEM_INFO(, ChunkType_Mtl)
-ENUM_ELEM_INFO(, ChunkType_Controller)
-ENUM_ELEM_INFO(, ChunkType_Timing)
-ENUM_ELEM_INFO(, ChunkType_BoneMesh)
-ENUM_ELEM_INFO(, ChunkType_BoneLightBinding)
-ENUM_ELEM_INFO(, ChunkType_MeshMorphTarget)
-ENUM_ELEM_INFO(, ChunkType_BoneInitialPos)
-ENUM_ELEM_INFO(, ChunkType_SourceInfo)
-ENUM_ELEM_INFO(, ChunkType_MtlName)
-ENUM_ELEM_INFO(, ChunkType_ExportFlags)
-ENUM_ELEM_INFO(, ChunkType_DataStream)
-ENUM_ELEM_INFO(, ChunkType_MeshSubsets)
-ENUM_ELEM_INFO(, ChunkType_MeshPhysicsData)
-ENUM_ELEM_INFO(, ChunkType_CompiledBones)
-ENUM_ELEM_INFO(, ChunkType_CompiledPhysicalBones)
-ENUM_ELEM_INFO(, ChunkType_CompiledMorphTargets)
-ENUM_ELEM_INFO(, ChunkType_CompiledPhysicalProxies)
-ENUM_ELEM_INFO(, ChunkType_CompiledIntFaces)
-ENUM_ELEM_INFO(, ChunkType_CompiledIntSkinVertices)
-ENUM_ELEM_INFO(, ChunkType_CompiledExt2IntMap)
-ENUM_ELEM_INFO(, ChunkType_BreakablePhysics)
-ENUM_ELEM_INFO(, ChunkType_FaceMap)
-ENUM_ELEM_INFO(, ChunkType_MotionParameters)
-ENUM_ELEM_INFO(, ChunkType_FootPlantInfo)
-ENUM_ELEM_INFO(, ChunkType_BonesBoxes)
-ENUM_ELEM_INFO(, ChunkType_FoliageInfo)
-ENUM_INFO_END(ChunkTypes)
-
-STRUCT_INFO_BEGIN(RANGE_ENTITY)
-STRUCT_VAR_INFO(name, TYPE_ARRAY(32, TYPE_INFO(char)))
-STRUCT_VAR_INFO(start, TYPE_INFO(int))
-STRUCT_VAR_INFO(end, TYPE_INFO(int))
-STRUCT_INFO_END(RANGE_ENTITY)
-
-STRUCT_INFO_BEGIN(TIMING_CHUNK_DESC_0918)
-STRUCT_VAR_INFO(m_SecsPerTick, TYPE_INFO(float))
-STRUCT_VAR_INFO(m_TicksPerFrame, TYPE_INFO(int))
-STRUCT_VAR_INFO(global_range, TYPE_INFO(RANGE_ENTITY))
-STRUCT_VAR_INFO(qqqqnSubRanges, TYPE_INFO(int))
-STRUCT_INFO_END(TIMING_CHUNK_DESC_0918)
-
-
-STRUCT_INFO_BEGIN(SPEED_CHUNK_DESC_2)
-STRUCT_VAR_INFO(Speed, TYPE_INFO(float))
-STRUCT_VAR_INFO(Distance, TYPE_INFO(float))
-STRUCT_VAR_INFO(Slope, TYPE_INFO(float))
-STRUCT_VAR_INFO(AnimFlags, TYPE_INFO(int))
-STRUCT_VAR_INFO(MoveDir, TYPE_ARRAY(3, TYPE_INFO(f32)))
-STRUCT_VAR_INFO(StartPosition, TYPE_INFO(QuatT))
-STRUCT_INFO_END(SPEED_CHUNK_DESC_2)
-
-STRUCT_INFO_BEGIN(MTL_NAME_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
-STRUCT_VAR_INFO(nFlags2, TYPE_INFO(int))
-STRUCT_VAR_INFO(name, TYPE_ARRAY(128, TYPE_INFO(char)))
-STRUCT_VAR_INFO(nPhysicalizeType, TYPE_INFO(int))
-STRUCT_VAR_INFO(nSubMaterials, TYPE_INFO(int))
-STRUCT_VAR_INFO(nSubMatChunkId, TYPE_ARRAY(MTL_NAME_CHUNK_DESC_0800_MAX_SUB_MATERIALS, TYPE_INFO(int)))
-STRUCT_VAR_INFO(nAdvancedDataChunkId, TYPE_INFO(int))
-STRUCT_VAR_INFO(sh_opacity, TYPE_INFO(float))
-STRUCT_VAR_INFO(reserve, TYPE_ARRAY(32, TYPE_INFO(int)))
-STRUCT_INFO_END(MTL_NAME_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(MTL_NAME_CHUNK_DESC_0802)
-STRUCT_VAR_INFO(name, TYPE_ARRAY(128, TYPE_INFO(char)))
-STRUCT_VAR_INFO(nSubMaterials, TYPE_INFO(int))
-STRUCT_INFO_END(MTL_NAME_CHUNK_DESC_0802)
-
-STRUCT_INFO_BEGIN(MESH_CHUNK_DESC_0745)
-STRUCT_VAR_INFO(flags1, TYPE_INFO(unsigned char))
-STRUCT_VAR_INFO(flags2, TYPE_INFO(unsigned char))
-STRUCT_VAR_INFO(nVerts, TYPE_INFO(int))
-STRUCT_VAR_INFO(nTVerts, TYPE_INFO(int))
-STRUCT_VAR_INFO(nFaces, TYPE_INFO(int))
-STRUCT_VAR_INFO(VertAnimID, TYPE_INFO(int))
-STRUCT_INFO_END(MESH_CHUNK_DESC_0745)
-
-STRUCT_INFO_BEGIN(MESH_CHUNK_DESC_0801)
-STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
-STRUCT_VAR_INFO(nFlags2, TYPE_INFO(int))
-STRUCT_VAR_INFO(nVerts, TYPE_INFO(int))
-STRUCT_VAR_INFO(nIndices, TYPE_INFO(int))
-STRUCT_VAR_INFO(nSubsets, TYPE_INFO(int))
-STRUCT_VAR_INFO(nSubsetsChunkId, TYPE_INFO(int))
-STRUCT_VAR_INFO(nVertAnimID, TYPE_INFO(int))
-STRUCT_VAR_INFO(nStreamChunkID, TYPE_ARRAY(16, TYPE_INFO(int)))
-STRUCT_VAR_INFO(nPhysicsDataChunkId, TYPE_ARRAY(4, TYPE_INFO(int)))
-STRUCT_VAR_INFO(bboxMin, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(bboxMax, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(texMappingDensity, TYPE_INFO(float))
-STRUCT_VAR_INFO(geometricMeanFaceArea, TYPE_INFO(float))
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(30, TYPE_INFO(int)))
-STRUCT_INFO_END(MESH_CHUNK_DESC_0801)
-
-STRUCT_INFO_BEGIN(MESH_CHUNK_DESC_0802)
-STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
-STRUCT_VAR_INFO(nFlags2, TYPE_INFO(int))
-STRUCT_VAR_INFO(nVerts, TYPE_INFO(int))
-STRUCT_VAR_INFO(nIndices, TYPE_INFO(int))
-STRUCT_VAR_INFO(nSubsets, TYPE_INFO(int))
-STRUCT_VAR_INFO(nSubsetsChunkId, TYPE_INFO(int))
-STRUCT_VAR_INFO(nVertAnimID, TYPE_INFO(int))
-STRUCT_VAR_INFO(nStreamChunkID, TYPE_ARRAY(16, TYPE_ARRAY(8, TYPE_INFO(int))))
-STRUCT_VAR_INFO(nPhysicsDataChunkId, TYPE_ARRAY(4, TYPE_INFO(int)))
-STRUCT_VAR_INFO(bboxMin, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(bboxMax, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(texMappingDensity, TYPE_INFO(float))
-STRUCT_VAR_INFO(geometricMeanFaceArea, TYPE_INFO(float))
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(30, TYPE_INFO(int)))
-STRUCT_INFO_END(MESH_CHUNK_DESC_0802)
-
-STRUCT_INFO_BEGIN(STREAM_DATA_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
-STRUCT_VAR_INFO(nStreamType, TYPE_INFO(int))
-STRUCT_VAR_INFO(nCount, TYPE_INFO(int))
-STRUCT_VAR_INFO(nElementSize, TYPE_INFO(int))
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(2, TYPE_INFO(int)))
-STRUCT_INFO_END(STREAM_DATA_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(STREAM_DATA_CHUNK_DESC_0801)
-STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
-STRUCT_VAR_INFO(nStreamType, TYPE_INFO(int))
-STRUCT_VAR_INFO(nStreamIndex, TYPE_INFO(int))
-STRUCT_VAR_INFO(nCount, TYPE_INFO(int))
-STRUCT_VAR_INFO(nElementSize, TYPE_INFO(int))
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(2, TYPE_INFO(int)))
-STRUCT_INFO_END(STREAM_DATA_CHUNK_DESC_0801)
-
-STRUCT_INFO_BEGIN(MESH_SUBSETS_CHUNK_DESC_0800::MeshSubset)
-STRUCT_VAR_INFO(nFirstIndexId, TYPE_INFO(int))
-STRUCT_VAR_INFO(nNumIndices, TYPE_INFO(int))
-STRUCT_VAR_INFO(nFirstVertId, TYPE_INFO(int))
-STRUCT_VAR_INFO(nNumVerts, TYPE_INFO(int))
-STRUCT_VAR_INFO(nMatID, TYPE_INFO(int))
-STRUCT_VAR_INFO(fRadius, TYPE_INFO(float))
-STRUCT_VAR_INFO(vCenter, TYPE_INFO(Vec3))
-STRUCT_INFO_END(MESH_SUBSETS_CHUNK_DESC_0800::MeshSubset)
-
-STRUCT_INFO_BEGIN(MESH_SUBSETS_CHUNK_DESC_0800::MeshBoneIDs)
-STRUCT_VAR_INFO(numBoneIDs, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(arrBoneIDs, TYPE_ARRAY(128, TYPE_INFO(uint16)))
-STRUCT_INFO_END(MESH_SUBSETS_CHUNK_DESC_0800::MeshBoneIDs)
-
-STRUCT_INFO_BEGIN(MESH_SUBSETS_CHUNK_DESC_0800::MeshSubsetTexelDensity)
-STRUCT_VAR_INFO(texelDensity, TYPE_INFO(float))
-STRUCT_INFO_END(MESH_SUBSETS_CHUNK_DESC_0800::MeshSubsetTexelDensity)
-
-
-STRUCT_INFO_BEGIN(MESH_SUBSETS_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
-STRUCT_VAR_INFO(nCount, TYPE_INFO(int))
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(2, TYPE_INFO(int)))
-STRUCT_INFO_END(MESH_SUBSETS_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(MESH_PHYSICS_DATA_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(nDataSize, TYPE_INFO(int))
-STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
-STRUCT_VAR_INFO(nTetrahedraDataSize, TYPE_INFO(int))
-STRUCT_VAR_INFO(nTetrahedraChunkId, TYPE_INFO(int))
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(2, TYPE_INFO(int)))
-STRUCT_INFO_END(MESH_PHYSICS_DATA_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(BONEANIM_CHUNK_DESC_0290)
-STRUCT_VAR_INFO(nBones, TYPE_INFO(int))
-STRUCT_INFO_END(BONEANIM_CHUNK_DESC_0290)
-
-STRUCT_INFO_BEGIN(BONENAMELIST_CHUNK_DESC_0745)
-STRUCT_VAR_INFO(numEntities, TYPE_INFO(int))
-STRUCT_INFO_END(BONENAMELIST_CHUNK_DESC_0745)
-
-STRUCT_INFO_BEGIN(COMPILED_BONE_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(32, TYPE_INFO(char)))
-STRUCT_INFO_END(COMPILED_BONE_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(COMPILED_PHYSICALBONE_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(32, TYPE_INFO(char)))
-STRUCT_INFO_END(COMPILED_PHYSICALBONE_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(COMPILED_PHYSICALPROXY_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(numPhysicalProxies, TYPE_INFO(uint32))
-STRUCT_INFO_END(COMPILED_PHYSICALPROXY_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(COMPILED_MORPHTARGETS_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(numMorphTargets, TYPE_INFO(uint32))
-STRUCT_INFO_END(COMPILED_MORPHTARGETS_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(COMPILED_INTSKINVERTICES_CHUNK_DESC_0800)
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(32, TYPE_INFO(char)))
-STRUCT_INFO_END(COMPILED_INTSKINVERTICES_CHUNK_DESC_0800)
-
-STRUCT_INFO_BEGIN(BaseKey)
-STRUCT_VAR_INFO(time, TYPE_INFO(int))
-STRUCT_INFO_END(BaseKey)
-
-STRUCT_INFO_BEGIN(BaseTCB)
-STRUCT_VAR_INFO(t, TYPE_INFO(float))
-STRUCT_VAR_INFO(c, TYPE_INFO(float))
-STRUCT_VAR_INFO(b, TYPE_INFO(float))
-STRUCT_VAR_INFO(ein, TYPE_INFO(float))
-STRUCT_VAR_INFO(eout, TYPE_INFO(float))
-STRUCT_INFO_END(BaseTCB)
-
-STRUCT_INFO_BEGIN(BaseKey3)
-STRUCT_BASE_INFO(BaseKey)
-STRUCT_VAR_INFO(val, TYPE_INFO(Vec3))
-STRUCT_INFO_END(BaseKey3)
-
-STRUCT_INFO_BEGIN(BaseKeyQ)
-STRUCT_BASE_INFO(BaseKey)
-STRUCT_VAR_INFO(val, TYPE_INFO(CryQuat))
-STRUCT_INFO_END(BaseKeyQ)
-
-STRUCT_INFO_BEGIN(CryTCB3Key)
-STRUCT_BASE_INFO(BaseKey3)
-STRUCT_BASE_INFO(BaseTCB)
-STRUCT_INFO_END(CryTCB3Key)
-
-STRUCT_INFO_BEGIN(CryTCBQKey)
-STRUCT_BASE_INFO(BaseKeyQ)
-STRUCT_BASE_INFO(BaseTCB)
-STRUCT_INFO_END(CryTCBQKey)
-
-STRUCT_INFO_BEGIN(CryKeyPQLog)
-STRUCT_VAR_INFO(nTime, TYPE_INFO(int))
-STRUCT_VAR_INFO(vPos, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(vRotLog, TYPE_INFO(Vec3))
-STRUCT_INFO_END(CryKeyPQLog)
-
-ENUM_INFO_BEGIN(CtrlTypes)
-ENUM_ELEM_INFO(, CTRL_NONE)
-ENUM_ELEM_INFO(, CTRL_CRYBONE)
-ENUM_ELEM_INFO(, CTRL_LINEER1)
-ENUM_ELEM_INFO(, CTRL_LINEER3)
-ENUM_ELEM_INFO(, CTRL_LINEERQ)
-ENUM_ELEM_INFO(, CTRL_BEZIER1)
-ENUM_ELEM_INFO(, CTRL_BEZIER3)
-ENUM_ELEM_INFO(, CTRL_BEZIERQ)
-ENUM_ELEM_INFO(, CTRL_TCB1)
-ENUM_ELEM_INFO(, CTRL_TCB3)
-ENUM_ELEM_INFO(, CTRL_TCBQ)
-ENUM_ELEM_INFO(, CTRL_BSPLINE_2O)
-ENUM_ELEM_INFO(, CTRL_BSPLINE_1O)
-ENUM_ELEM_INFO(, CTRL_BSPLINE_2C)
-ENUM_ELEM_INFO(, CTRL_BSPLINE_1C)
-ENUM_ELEM_INFO(, CTRL_CONST)
-ENUM_INFO_END(CtrlTypes)
-
-STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0826)
-STRUCT_VAR_INFO(type, TYPE_INFO(CtrlTypes))
-STRUCT_VAR_INFO(nKeys, TYPE_INFO(int))
-STRUCT_VAR_INFO(nFlags, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
-STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0826)
-
-STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0827)
-STRUCT_VAR_INFO(numKeys, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
-STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0827)
-
-STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0829)
-STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(numRotationKeys, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(numPositionKeys, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(RotationFormat, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(RotationTimeFormat, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(PositionFormat, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(PositionKeysInfo, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(PositionTimeFormat, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(TracksAligned, TYPE_INFO(uint8))
-STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0829)
-
-STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0830)
-STRUCT_VAR_INFO(numKeys, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(nFlags, Type_info(unsigned int))
-STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
-STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0830)
-
-STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0831)
-STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(nFlags, Type_info(unsigned int))
-STRUCT_VAR_INFO(numRotationKeys, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(numPositionKeys, TYPE_INFO(uint16))
-STRUCT_VAR_INFO(RotationFormat, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(RotationTimeFormat, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(PositionFormat, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(PositionKeysInfo, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(PositionTimeFormat, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(TracksAligned, TYPE_INFO(uint8))
-STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0831)
-
-STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0905)
-STRUCT_VAR_INFO(numKeyPos, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(numKeyRot, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(numKeyTime, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(numAnims, TYPE_INFO(uint32))
-STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0905)
-
-STRUCT_INFO_BEGIN(NODE_CHUNK_DESC_0824)
-STRUCT_VAR_INFO(name, TYPE_ARRAY(64, TYPE_INFO(char)))
-STRUCT_VAR_INFO(ObjectID, TYPE_INFO(int))
-STRUCT_VAR_INFO(ParentID, TYPE_INFO(int))
-STRUCT_VAR_INFO(nChildren, TYPE_INFO(int))
-STRUCT_VAR_INFO(MatID, TYPE_INFO(int))
-STRUCT_VAR_INFO(_obsoleteA_, TYPE_ARRAY(4, TYPE_INFO(uint8)))
-STRUCT_VAR_INFO(tm, TYPE_ARRAY(4, TYPE_ARRAY(4, TYPE_INFO(float))))
-STRUCT_VAR_INFO(_obsoleteB_, TYPE_ARRAY(3, TYPE_INFO(float)))
-STRUCT_VAR_INFO(_obsoleteC_, TYPE_ARRAY(4, TYPE_INFO(float)))
-STRUCT_VAR_INFO(_obsoleteD_, TYPE_ARRAY(3, TYPE_INFO(float)))
-STRUCT_VAR_INFO(pos_cont_id, TYPE_INFO(int))
-STRUCT_VAR_INFO(rot_cont_id, TYPE_INFO(int))
-STRUCT_VAR_INFO(scl_cont_id, TYPE_INFO(int))
-STRUCT_VAR_INFO(PropStrLen, TYPE_INFO(int))
-STRUCT_INFO_END(NODE_CHUNK_DESC_0824)
-
-ENUM_INFO_BEGIN(HelperTypes)
-ENUM_ELEM_INFO(, HP_POINT)
-ENUM_ELEM_INFO(, HP_DUMMY)
-ENUM_ELEM_INFO(, HP_XREF)
-ENUM_ELEM_INFO(, HP_CAMERA)
-ENUM_ELEM_INFO(, HP_GEOMETRY)
-ENUM_INFO_END(HelperTypes)
-
-STRUCT_INFO_BEGIN(HELPER_CHUNK_DESC_0744)
-STRUCT_VAR_INFO(type, TYPE_INFO(HelperTypes))
-STRUCT_VAR_INFO(size, TYPE_INFO(Vec3))
-STRUCT_INFO_END(HELPER_CHUNK_DESC_0744)
-
-STRUCT_INFO_BEGIN(MESHMORPHTARGET_CHUNK_DESC_0001)
-STRUCT_VAR_INFO(nChunkIdMesh, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(numMorphVertices, TYPE_INFO(unsigned int))
-STRUCT_INFO_END(MESHMORPHTARGET_CHUNK_DESC_0001)
-
-STRUCT_INFO_BEGIN(SMeshMorphTargetVertex)
-STRUCT_VAR_INFO(nVertexId, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(ptVertex, TYPE_INFO(Vec3))
-STRUCT_INFO_END(SMeshMorphTargetVertex)
-
-STRUCT_INFO_BEGIN(SMeshMorphTargetHeader)
-STRUCT_VAR_INFO(MeshID, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(NameLength, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(numIntVertices, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(numExtVertices, TYPE_INFO(uint32))
-STRUCT_INFO_END(SMeshMorphTargetHeader)
-
-STRUCT_INFO_BEGIN(SMeshPhysicalProxyHeader)
-STRUCT_VAR_INFO(ChunkID, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(numPoints, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(numIndices, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(numMaterials, TYPE_INFO(uint32))
-STRUCT_INFO_END(SMeshPhysicalProxyHeader)
-
-STRUCT_INFO_BEGIN(BONEINITIALPOS_CHUNK_DESC_0001)
-STRUCT_VAR_INFO(nChunkIdMesh, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(numBones, TYPE_INFO(unsigned int))
-STRUCT_INFO_END(BONEINITIALPOS_CHUNK_DESC_0001)
-
-STRUCT_INFO_BEGIN(SBoneInitPosMatrix)
-STRUCT_VAR_INFO(mx, TYPE_ARRAY(4, TYPE_ARRAY(3, TYPE_INFO(float))))
-STRUCT_INFO_END(SBoneInitPosMatrix)
-
-STRUCT_INFO_BEGIN(EXPORT_FLAGS_CHUNK_DESC)
-STRUCT_VAR_INFO(flags, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(rc_version, TYPE_ARRAY(4, TYPE_INFO(unsigned int)))
-STRUCT_VAR_INFO(rc_version_string, TYPE_ARRAY(16, TYPE_INFO(char)))
-STRUCT_VAR_INFO(assetAuthorTool, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(authorToolVersion, TYPE_INFO(uint32))
-STRUCT_VAR_INFO(reserved, TYPE_ARRAY(30, TYPE_INFO(unsigned int)))
-STRUCT_INFO_END(EXPORT_FLAGS_CHUNK_DESC)
-
-STRUCT_INFO_BEGIN(BREAKABLE_PHYSICS_CHUNK_DESC)
-STRUCT_VAR_INFO(granularity, TYPE_INFO(unsigned int))
-STRUCT_VAR_INFO(nMode, TYPE_INFO(int))
-STRUCT_VAR_INFO(nRetVtx, TYPE_INFO(int))
-STRUCT_VAR_INFO(nRetTets, TYPE_INFO(int))
-STRUCT_VAR_INFO(nReserved, TYPE_ARRAY(10, TYPE_INFO(int)))
-STRUCT_INFO_END(BREAKABLE_PHYSICS_CHUNK_DESC)
-
-STRUCT_INFO_BEGIN(FOLIAGE_INFO_CHUNK_DESC)
-STRUCT_VAR_INFO(nSpines, TYPE_INFO(int))
-STRUCT_VAR_INFO(nSpineVtx, TYPE_INFO(int))
-STRUCT_VAR_INFO(nSkinnedVtx, TYPE_INFO(int))
-STRUCT_VAR_INFO(nBoneIds, TYPE_INFO(int))
-STRUCT_INFO_END(FOLIAGE_INFO_CHUNK_DESC)
-
-STRUCT_INFO_BEGIN(FOLIAGE_SPINE_SUB_CHUNK)
-STRUCT_VAR_INFO(nVtx, TYPE_INFO(char))
-STRUCT_VAR_INFO(len, TYPE_INFO(float))
-STRUCT_VAR_INFO(navg, TYPE_INFO(Vec3))
-STRUCT_VAR_INFO(iAttachSpine, TYPE_INFO(unsigned char))
-STRUCT_VAR_INFO(iAttachSeg, TYPE_INFO(unsigned char))
-STRUCT_INFO_END(FOLIAGE_SPINE_SUB_CHUNK)
diff --git a/Code/CryEngine/CryCommon/CryLegacyAllocator.h b/Code/CryEngine/CryCommon/CryLegacyAllocator.h
deleted file mode 100644
index f8024dac41..0000000000
--- a/Code/CryEngine/CryCommon/CryLegacyAllocator.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "LegacyAllocator.h"
-
-#include <AzCore/std/algorithm.h>
-
-//-----------------------------------------------------------------------------
-// CryModule allocation API
-//-----------------------------------------------------------------------------
-#define CryModuleMalloc(size) CryModuleMallocImpl(size, __FILE__, __LINE__)
-
-inline void* CryModuleMallocImpl(size_t size, const char* file, const int line)
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(size, 0, 0, "LegacyAllocator malloc", file, line);
-}
-
-#define CryModuleFree(ptr) CryModuleFreeImpl(ptr, __FILE__, __LINE__)
-#define CryModuleMemalignFree(ptr) CryModuleFreeImpl(ptr, __FILE__, __LINE__)
-
-inline void CryModuleFreeImpl(void* ptr, const char* file, const int line)
-{
-
-    AZ::IAllocator& allocator = AZ::AllocatorInstance<AZ::LegacyAllocator>::GetAllocator();
-
-    if (allocator.IsAllocationSourceChanged())
-    {
-        allocator.GetAllocationSource()->DeAllocate(ptr);
-    }
-    else
-    {
-        static_cast<AZ::LegacyAllocator&>(allocator).DeAllocate(ptr, file, line);
-    }
-}
-
-#define CryModuleMemalign(size, alignment) CryModuleMemalignImpl(size, alignment, __FILE__, __LINE__)
-
-inline void* CryModuleMemalignImpl(size_t size, size_t alignment, const char* file, const int line)
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(size, alignment, 0, "LegacyAllocator memalign", file, line);
-}
-
-#define CryModuleCalloc(num, size) CryModuleCallocImpl(num, size, __FILE__, __LINE__)
-
-inline void* CryModuleCallocImpl(size_t num, size_t size, const char* file, const int line)
-{
-    void* ptr = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(num * size, 0, 0, "LegacyAllocator calloc", file, line);
-    ::memset(ptr, 0, num * size);
-    return ptr;
-}
-
-#define CryModuleRealloc(ptr, size) CryModuleReallocAlignImpl(ptr, size, 0, __FILE__, __LINE__)
-#define CryModuleReallocAlign(ptr, size, alignment) CryModuleReallocAlignImpl(ptr, size, alignment, __FILE__, __LINE__)
-
-inline void* CryModuleReallocAlignImpl(void* prev, size_t size, size_t alignment, const char* file, const int line)
-{
-    if (!prev)
-    {
-        // map realloc(nullptr, ...) -> alloc() so that we can track the location of the initial alloc
-        return CryModuleMemalignImpl(size, alignment, file, line);
-    }
-    if (size == 0)
-    {
-        CryModuleFreeImpl(prev, file, line);
-        return nullptr;
-    }
-    // There should not be any code using CryRealloc during static-init time or before the allocators
-// are initialized.
-#if defined(AZ_MONOLITHIC_BUILD)
-    if (!AZ::AllocatorInstance<AZ::LegacyAllocator>::IsReady())
-    {
-        AZ_Assert(false, "CryRealloc/CryReallocAlign cannot be used unless the LegacyAllocator has been initialized");
-        return nullptr;
-    }
-#endif
-
-    AZ::IAllocator& allocator = AZ::AllocatorInstance<AZ::LegacyAllocator>::GetAllocator();
-    void *ptr;
-
-    if (allocator.IsAllocationSourceChanged())
-    {
-        ptr = allocator.GetAllocationSource()->ReAllocate(prev, size, 0);
-    }
-    else
-    {
-        ptr = static_cast<AZ::LegacyAllocator&>(allocator).ReAllocate(prev, size, 0, file, line);
-    }
-
-    return ptr;
-}
-
-//-----------------------------------------------------------------------------
-// CryCrt alloc API
-//-----------------------------------------------------------------------------
-inline size_t CryCrtSize(void* p)
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(p);
-}
-
-inline void* CryCrtMalloc(size_t size)
-{
-    return CryModuleMalloc(size);
-}
-
-inline size_t CryCrtFree(void* p)
-{
-    size_t size = CryCrtSize(p);
-    CryModuleFree(p);
-    return size;
-};
-
-//-----------------------------------------------------------------------------
-// CrySystemCrt alloc API
-//-----------------------------------------------------------------------------
-inline size_t CrySystemCrtSize(void* p)
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(p);
-}
-
-inline void* CrySystemCrtMalloc(size_t size)
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(size, 0, 0, "AZ::LegacyAllocator");
-}
-
-inline void* CrySystemCrtRealloc(void* p, size_t size)
-{
-    // Use LegacyAllocator's special ReAllocate
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().ReAllocate(p, size, 0);
-}
-
-inline size_t CrySystemCrtFree(void* p)
-{
-    size_t size = CrySystemCrtSize(p);
-    CryModuleFree(p);
-    return size;
-}
-
-inline size_t CrySystemCrtGetUsedSpace()
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().NumAllocatedBytes();
-}
-
-//-----------------------------------------------------------------------------
-// CryMalloc API
-//-----------------------------------------------------------------------------
-inline void* CryMalloc(size_t size, size_t& allocated, size_t alignment)
-{
-    if (!size)
-    {
-        allocated = 0;
-        return nullptr;
-    }
-
-    // The original implementation guaranteed 16 byte min alignment
-    alignment = AZStd::GetMax<size_t>(alignment, 16);
-    void* ptr = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(size, alignment, 0, "CryMalloc", __FILE__, __LINE__);
-    allocated = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(ptr);
-    return ptr;
-}
-
-inline void* CryRealloc(void* memblock, size_t size, size_t& allocated, size_t& oldsize, size_t alignment)
-{
-    oldsize = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(memblock);
-    void* ptr = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().ReAllocate(memblock, size, alignment);
-    allocated = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(ptr);
-    return ptr;
-}
-
-inline size_t CryFree(void* p, size_t /*alignment*/)
-{
-    size_t size = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(p);
-    AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().DeAllocate(p, size);
-    return size;
-}
-
-inline size_t CryGetMemSize(void* memblock, size_t /*sourceSize*/)
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(memblock);
-}
-
-inline int CryMemoryGetAllocatedSize()
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().NumAllocatedBytes();
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline int CryMemoryGetPoolSize()
-{
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline int CryStats([[maybe_unused]] char* buf)
-{
-    return 0;
-}
-
-inline int CryGetUsedHeapSize()
-{
-    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().NumAllocatedBytes();
-}
-
-inline int CryGetWastedHeapSize()
-{
-    return 0;
-}
-
-inline void CryCleanup()
-{
-    AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().GarbageCollect();
-}
-
-inline void CryResetStats(void)
-{
-}
diff --git a/Code/CryEngine/CryCommon/CryLibrary.cpp b/Code/CryEngine/CryCommon/CryLibrary.cpp
deleted file mode 100644
index 42f3ca3d09..0000000000
--- a/Code/CryEngine/CryCommon/CryLibrary.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <CryCommon/CryLibrary.h>
-
-#if !defined(AZ_RESTRICTED_PLATFORM) && defined(WIN32)
-
-HMODULE CryLoadLibrary(const char* libName)
-{
-    HMODULE module = ::LoadLibraryA(libName);
-    if (module != NULL)
-    {
-        // We need to inject the environment first thing so that allocators are available immediately
-        InjectEnvironmentFunction injectEnv = reinterpret_cast<InjectEnvironmentFunction>(::GetProcAddress(module, INJECT_ENVIRONMENT_FUNCTION));
-        if (injectEnv)
-        {
-            auto env = AZ::Environment::GetInstance();
-            injectEnv(env);
-        }
-    }
-
-    return module;
-}
-
-// Cry code seems to have used void* as their abstraction for HMODULE across
-// platforms.
-bool CryFreeLibrary(void* lib)
-{
-    if (lib != NULL)
-    {
-        DetachEnvironmentFunction detachEnv = reinterpret_cast<DetachEnvironmentFunction>(::GetProcAddress((HMODULE)lib, DETACH_ENVIRONMENT_FUNCTION));
-        if (detachEnv)
-        {
-            detachEnv();
-        }
-        return ::FreeLibrary((HMODULE)lib) != FALSE;
-    }
-    return false;
-}
-
-#endif
diff --git a/Code/CryEngine/CryCommon/CryLibrary.h b/Code/CryEngine/CryCommon/CryLibrary.h
deleted file mode 100644
index 1d06d8ee1b..0000000000
--- a/Code/CryEngine/CryCommon/CryLibrary.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-
-/*!
-    CryLibrary
-
-    Convenience-Macros which abstract the use of DLLs/shared libraries in a platform independent way.
-    A short explanation of the different macros follows:
-
-    CrySharedLibrarySupported:
-        This macro can be used to test if the current active platform supports shared library calls. The default
-        value is false. This gets redefined if a certain platform (WIN32 or LINUX) is desired.
-
-    CrySharedLibraryPrefix:
-        The default prefix which will get prepended to library names in calls to CryLoadLibraryDefName
-        (see below).
-
-    CrySharedLibraryExtension:
-        The default extension which will get appended to library names in calls to CryLoadLibraryDefName
-        (see below).
-
-    CryLoadLibrary(libName):
-        Loads a shared library.
-
-    CryLoadLibraryDefName(libName):
-        Loads a shared library. The platform-specific default library prefix and extension are appended to the libName.
-        This allows writing of somewhat platform-independent library loading code and is therefore the function
-        which should be used most of the time, unless some special extensions are used (e.g. for plugins).
-
-    CryGetProcAddress(libHandle, procName):
-        Import function from the library presented by libHandle.
-
-    CryFreeLibrary(libHandle):
-        Unload the library presented by libHandle.
-
-    HISTORY:
-        03.03.2004 MarcoK
-            - initial version
-            - added to CryPlatform
-*/
-
-#include <stdio.h>
-#include <AzCore/PlatformDef.h>
-#include <AzCore/Module/Environment.h>
-
-#define INJECT_ENVIRONMENT_FUNCTION "InjectEnvironment"
-#define DETACH_ENVIRONMENT_FUNCTION "DetachEnvironment"
-using InjectEnvironmentFunction = void(*)(void*);
-using DetachEnvironmentFunction = void(*)();
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(CryLibrary_h)
-#elif defined(WIN32)
-    #if !defined(WIN32_LEAN_AND_MEAN)
-        #define WIN32_LEAN_AND_MEAN
-    #endif
-    #include <CryWindows.h>
-
-    HMODULE CryLoadLibrary(const char* libName);
-    
-    // Cry code seems to have used void* as their abstraction for HMODULE across
-    // platforms.
-    bool CryFreeLibrary(void* lib);
-
-    #define CRYLIBRARY_H_TRAIT_USE_WINDOWS_DLL 1
-#elif ((defined(LINUX) || AZ_TRAIT_OS_PLATFORM_APPLE))
-    #include <dlfcn.h>
-    #include <stdlib.h>
-    #include <libgen.h>
-    #include "platform.h"
-    #include <AzCore/Debug/Trace.h>
-
-// for compatibility with code written for windows
-    #define CrySharedLibrarySupported true
-    #define CrySharedLibraryPrefix "lib"
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    #include <mach-o/dyld.h>
-    #define CrySharedLibraryExtension ".dylib"
-#else
-    #define CrySharedLibraryExtension ".so"
-#endif
-
-    #define CryGetProcAddress(libHandle, procName) ::dlsym(libHandle, procName)
-    #define HMODULE void*
-static const char* gEnvName("MODULE_PATH");
-
-static const char* GetModulePath()
-{
-    return getenv(gEnvName);
-}
-
-static void SetModulePath(const char* pModulePath)
-{
-    setenv(gEnvName, pModulePath ? pModulePath : "", true);
-}
-
-// bInModulePath is only ever set to false in RC, because rc needs to load dlls from a $PATH that
-// it has modified to include ..
-static HMODULE CryLoadLibrary(const char* libName, bool bLazy = false, bool bInModulePath = true)
-{
-    const char* libPath = nullptr;
-    char pathBuffer[MAX_PATH] = {0};
-    
-    libPath = libName;
-
-#if !defined(AZ_PLATFORM_ANDROID)
-    if (bInModulePath)
-    {
-        char exePath[MAX_PATH + 1] = { 0 };
-        const char* modulePath = GetModulePath();
-        if (!modulePath)
-        {
-            modulePath = ".";
-            #if defined(LINUX)
-                int len = readlink("/proc/self/exe", exePath, MAX_PATH);
-                if (len != -1)
-                {
-                    exePath[len] = 0;
-                    modulePath = dirname(exePath);
-                }
-            #elif AZ_TRAIT_OS_PLATFORM_APPLE
-                uint32_t bufsize = MAX_PATH;
-                if (_NSGetExecutablePath(exePath, &bufsize) == 0)
-                {
-                    exePath[bufsize] = 0;
-                    modulePath = dirname(exePath);
-                }
-            #endif
-        }
-        sprintf_s(pathBuffer, "%s/%s", modulePath, libName);
-        libPath = pathBuffer;
-    }
-#endif
-
-    HMODULE module;
-    #if defined(LINUX) && !defined(ANDROID)
-        module = ::dlopen(libPath, (bLazy ? RTLD_LAZY : RTLD_NOW) | RTLD_DEEPBIND);
-    #else
-        module = ::dlopen(libPath, bLazy ? RTLD_LAZY : RTLD_NOW);
-    #endif
-    AZ_Warning("LMBR", module, "Can't load library [%s]: %s", libName, dlerror());
-
-    if (module)
-    {
-        // We need to inject the environment first thing so that allocators are available immediately
-        InjectEnvironmentFunction injectEnv = reinterpret_cast<InjectEnvironmentFunction>(CryGetProcAddress(module, INJECT_ENVIRONMENT_FUNCTION));
-        if (injectEnv)
-        {
-            injectEnv(AZ::Environment::GetInstance());
-        }
-    }
-
-    return module;
-}
-
-static bool CryFreeLibrary(void* lib)
-{
-    if (lib)
-    {
-        DetachEnvironmentFunction detachEnv = reinterpret_cast<DetachEnvironmentFunction>(CryGetProcAddress(lib, DETACH_ENVIRONMENT_FUNCTION));
-        if (detachEnv)
-        {
-            detachEnv();
-        }
-        return (::dlclose(lib) == 0);
-    }
-    return false;
-}
-#endif
-
-#if CRYLIBRARY_H_TRAIT_USE_WINDOWS_DLL
-#define CrySharedLibrarySupported true
-#define CrySharedLibraryPrefix ""
-#define CrySharedLibraryExtension ".dll"
-#define CryGetProcAddress(libHandle, procName) ::GetProcAddress((HMODULE)(libHandle), procName)
-#elif !defined(CrySharedLibrarySupported)
-#define CrySharedLibrarySupported false
-#define CrySharedLibraryPrefix ""
-#define CrySharedLibraryExtension ""
-#define CryLoadLibrary(libName) NULL
-#define CryGetProcAddress(libHandle, procName) NULL
-#define CryFreeLibrary(libHandle)
-#define GetModuleHandle(x)  0
-#endif
-#define CryLibraryDefName(libName) CrySharedLibraryPrefix libName CrySharedLibraryExtension
-#define CryLoadLibraryDefName(libName) CryLoadLibrary(CryLibraryDefName(libName))
diff --git a/Code/CryEngine/CryCommon/CryListenerSet.h b/Code/CryEngine/CryCommon/CryListenerSet.h
deleted file mode 100644
index 64b7807055..0000000000
--- a/Code/CryEngine/CryCommon/CryListenerSet.h
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A simple, intelligent and efficient container for listeners.
-
-//               This is designed to provide a simple & consistent interface and behavior
-//               for adding, removing and iterating listeners - hopefully avoiding the
-//               common pitfalls such as duplicated elements, invalid iterators and
-//               dangling pointers.
-
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYLISTENERSET_H
-#define CRYINCLUDE_CRYCOMMON_CRYLISTENERSET_H
-#pragma once
-
-
-#include <CrySizer.h>
-/************************************************************************
-
-Core elements:
-
-    * CListenerSet<T> - The collection of listeners.
-    * CListenerSet<T>::Notifier - The iterator for safely calling listeners in sequence.
-
-    [Where T is a pointer or something with pointer traits]
-
-Advantages:
-
-    * Greatly reduces the complexity of managing listener collections.
-    * Can safely add and remove listeners during listener iteration.
-    * Automatically and safely removes NULL elements.
-    * Simple interface (but different from an STL collection to avoid confusion).
-    * Checks to see all listeners have been removed at destruction.
-    * Low overhead implementation (cheap use of std::vector and minimal heap allocation).
-    * Can add debug checks as needed - including stack tracing of Add() calls.
-    * Safe for recursive notification chains.
-    * Works with vanilla pointers and smart pointers.
-    * Provides full support for named listeners to aid debugging.
-    * Listener names tracked during notification to help resolve crashes.
-    * Designed to ensure names are recorded correctly in crash dump files.
-
-Named listener support:
-
-    Supplying a name for a listener provides valuable debug information in the following cases:
-
-        * Resolving crashes during listener notification - the name will help trace what listener caused the crash.
-        * Resolving which listeners are present in the CListenerSet during runtime.
-
-    IMPORTANT: Please ensure heap allocated strings passed in as names are marked as such ie.
-
-        m_listeners.Add(pListener, "MyListener");                               // OK: Static string passed.
-        m_listeners.Add(pListener2, m_myName.c_str(), false);       // OK: Heap string passed and marked as non-static.
-        m_listeners.Add(pListener3, m_myName.c_str(), true);        // BAD: Heap string passed and marked as static (potential CRASH).
-
-    Why store names like this?
-
-        * 99% of use cases use static strings - so why allocate memory to make copies of static data?
-        * Pointers to static strings will *always* survive crash dumps - great for debugging crashes.
-        * We can enable debug support in QA builds - key for catching rare listener related crashes.
-
-Example:
-
-    class CMyWorld
-    {
-    public:
-        void AddListener(IMyWorldListener* pListener, const char* szName) { m_listeners.Add(pListener, szName); }
-        void RemoveListener(IMyWorldListener* pListener) { m_listeners.Remove(pListener); }
-
-        void NotifyListeners(CSomeEvent& event)
-        {
-            for (TWorldListeners::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
-            {
-                notifier->OnWorldEvent(event);
-            }
-        }
-
-    private:
-        typedef CListenerSet<IMyWorldListener*> TWorldListeners;
-        TWorldListeners m_listeners;
-    };
-
-
-    // Implements IMyWorldListener
-    CMyWorldUser::OnWorldEvent(CSomeEvent& event)
-    {
-        // OK: Removing a listeners within an event handler
-        m_pWorld->RemoveListener(this);
-
-        // OK: Notifying listeners within an event handler
-        m_pWorld->NotifyListeners(CSomeEvent newEvent(USER_REMOVED, this));
-    }
-
-
-*************************************************************************/
-
-#ifndef _RELEASE
-    #define CRY_LISTENERSET_DEBUG
-#endif
-
-// Forward decl.
-template <typename T>
-class CListenerNotifier;
-
-
-// Main listener collection class used in conjunction with CListenerNotifier.
-template <typename T>
-class CListenerSet
-{
-public:
-    // NOTE: No default constructor in favor of forcing users to provide an expectedCapacity
-    inline CListenerSet(size_t expectedCapacity);
-    inline /*non-virtual*/ ~CListenerSet();
-
-    // Appends a listener to the end of the collection. Name is optional but recommended.
-    inline bool Add(T pListener, const char* name = NULL, bool staticName = true);
-
-    // Removes a listener from the collection.
-    inline void Remove(T pListener);
-
-    // Removes all listeners from the collection (NOTE: prefer informing listeners to remove themselves)
-    inline void Clear(bool bFreeMemory = false);
-
-    // Returns true if this contains pListener
-    inline bool Contains(T pListener) const;
-
-    // Returns number of valid listeners
-    inline size_t ValidListenerCount() const;
-
-    // Returns true if no valid listeners exist
-    inline bool Empty() const;
-
-    // Reserves space to help avoid runtime reallocation
-    inline void Reserve(size_t capacity);
-
-    // Returns the memory size of this object (to support CrySizer)
-    inline size_t MemSize() const;
-
-    // Returns true if currently in the process of notifying listeners.
-    inline bool IsNotifying() const;
-
-    // Allow access for Notifier for iteration
-    friend class CListenerNotifier<T>;
-
-    // Allow TListeners::Notifier style usage
-    typedef class CListenerNotifier<T> Notifier;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddContainer(m_listeners);
-#if defined(CRY_LISTENERSET_DEBUG)
-        pSizer->AddContainer(m_allocatedNames);
-#endif
-    }
-private:    // DO NOT REMOVE - following methods only to be accessed only via CNotifier
-
-    struct ListenerRecord
-    {
-        ListenerRecord()
-            : m_pListener() {}
-        ListenerRecord(T pListener, [[maybe_unused]] const char* szName = NULL)
-            : m_pListener(pListener)
-#ifdef CRY_LISTENERSET_DEBUG
-            , m_szName(szName)
-#endif
-        {}
-
-        bool operator==(const ListenerRecord& other) const  { return m_pListener == other.m_pListener; }
-        bool operator==(const T& other) const                               { return m_pListener == other; }
-
-        T                       m_pListener;                // The listener reference
-
-#ifdef CRY_LISTENERSET_DEBUG
-        const char* m_szName;                       // Name of tracked listener (owned if pointing to data in m_allocatedNames)
-#endif
-    };
-
-    typedef std::vector<ListenerRecord> TListenerVec;
-    typedef std::vector<string> TAllocatedNameVec;
-
-    inline void StartNotificationScope();
-    inline void EndNotificationScope();
-
-    inline void EraseNullElements();
-
-private:
-    TListenerVec            m_listeners;                            // Collection of unique listeners.
-    size_t                      m_activeNotifications;      // Counts current notifications in progress (cleanup cannot occur unless this is 0).
-    bool                            m_cleanupRequired;      // Indicates NULL elements in listener.
-    bool                            m_freeMemOnCleanup;     // Indicates how to clean up.
-
-#ifdef CRY_LISTENERSET_DEBUG
-    // Used to delete heap allocated names
-    inline void DeleteName(const char* name);
-
-    TAllocatedNameVec m_allocatedNames;                 // Collection of strings pointing at heap allocated (i.e. copied) names (typically empty)
-#endif
-};
-
-
-// Helper class used to iterate listeners during listener notification.
-template <typename T>
-class CListenerNotifier
-{
-public:
-    ILINE CListenerNotifier(CListenerSet<T>& listeners);
-    ILINE /*non-virtual*/ ~CListenerNotifier();
-
-    // True if the current element is ready for iteration
-    ILINE bool IsValid();
-
-    // Dereference current listener, MUST only be done after a call to IsValid().
-    ILINE T operator->();
-
-    // Dereference current listener, MUST only be done after a call to IsValid().
-    ILINE T operator*();
-
-    // Move to next valid listener (skipping NULL elements)
-    ILINE void Next();
-
-    // Returns the name of the listener (if available)
-    inline const char* Name() const;
-
-private:
-    CListenerSet<T>&    m_listenerSet;      // ListenerSet being notified
-    T                                   m_pListener;            // Current listener at index (resolved by IsValid(), cleared after each dereference)
-    size_t                      m_index;                    // Current index of element (incremented by next)
-
-#ifdef CRY_LISTENERSET_DEBUG
-    const char*             m_szName;                   // Name of the listener (if provided) to aid debugging
-#endif
-};
-
-/******************************************************************************************/
-
-
-
-template <typename T>
-inline CListenerSet<T>::CListenerSet(size_t expectedCapacity)
-    : m_activeNotifications(0)
-    , m_cleanupRequired(false)
-    , m_freeMemOnCleanup(false)
-{
-    // Reserve the expected capacity to avoid reallocations
-    m_listeners.reserve(expectedCapacity);
-}
-
-template <typename T>
-inline CListenerSet<T>::~CListenerSet()
-{
-    // Ensure no notifications are in progress
-    CRY_ASSERT(m_activeNotifications == 0);
-
-    // Ensure NULL elements were removed at end of last notification
-    CRY_ASSERT(!m_cleanupRequired);
-}
-
-// Appends a listener to the end of the collection. Name is optional but recommended.
-template <typename T>
-inline bool CListenerSet<T>::Add(T pListener, const char* name, [[maybe_unused]] bool staticName)
-{
-    bool success = false;
-
-    // Ensure the listener exists
-    CRY_ASSERT(pListener);
-
-    if (pListener)
-    {
-        // Ensure the listener is only added once
-        if (!Contains(pListener))
-        {
-            // Resolve name buffer safe for usage outside of this scope
-            const char* safeName = name;
-
-#ifdef CRY_LISTENERSET_DEBUG
-            // If a name was provided but it's not static data
-            if (name && !staticName)
-            {
-                // Add it to the list of heap allocated names (that we need to later delete)
-                m_allocatedNames.push_back(name);
-                safeName = m_allocatedNames.back().c_str();
-            }
-#endif
-
-            m_listeners.push_back(ListenerRecord(pListener, safeName));
-            success = true;
-        }
-    }
-
-    return success;
-}
-
-// Removes a listener from the collection.
-template <typename T>
-inline void CListenerSet<T>::Remove(T pListener)
-{
-    typename TListenerVec::iterator endIter(m_listeners.end());
-    typename TListenerVec::iterator iter(std::find(m_listeners.begin(), endIter, pListener));
-    if (iter != endIter)
-    {
-#ifdef CRY_LISTENERSET_DEBUG
-        // Delete name if it was heap allocated
-        if (const char* name = iter->m_szName)
-        {
-            DeleteName(name);
-        }
-#endif
-
-        // If no notifications in progress
-        if (m_activeNotifications == 0)
-        {
-            // Just delete the listener entry immediately
-            m_listeners.erase(iter);
-        }
-        else    // Notification(s) in progress, cannot re-order listeners
-        {
-            // Mark for cleanup
-            iter->m_pListener = NULL;
-
-            m_cleanupRequired = true;
-            m_freeMemOnCleanup = false;
-        }
-    }
-    else    // The listener is not in the set
-    {
-        // TODO: Warn about redundant Remove()
-    }
-}
-
-// Removes all listeners from the collection (NOTE: prefer informing listeners to remove themselves)
-template <typename T>
-inline void CListenerSet<T>::Clear(bool bFreeMemory)
-{
-    // If no notifications in progress
-    if (m_activeNotifications == 0)
-    {
-        // Simply clear the listeners immediately
-        if (bFreeMemory)
-        {
-            stl::free_container(m_listeners);
-        }
-        else
-        {
-            m_listeners.clear();
-        }
-    }
-    else
-    {
-        // Mark all listeners for cleanup
-        std::fill(m_listeners.begin(), m_listeners.end(), ListenerRecord());
-
-        m_cleanupRequired = true;
-        m_freeMemOnCleanup = true;
-    }
-
-#ifdef CRY_LISTENERSET_DEBUG
-    // Safe to clear allocated names immediately (no references exist any more)
-    if (bFreeMemory)
-    {
-        stl::free_container(m_allocatedNames);
-    }
-    else
-    {
-        m_allocatedNames.clear();
-    }
-#endif
-}
-
-// Returns true if this contains pListener
-template <typename T>
-inline bool CListenerSet<T>::Contains(T pListener) const
-{
-    return stl::find(m_listeners, pListener);
-}
-
-// Returns number of valid listeners
-template <typename T>
-inline size_t CListenerSet<T>::ValidListenerCount() const
-{
-    size_t validCount = m_listeners.size();
-
-    if (m_cleanupRequired)
-    {
-        // Remove the count of NULL elements from the result
-        validCount = validCount - std::count(m_listeners.begin(), m_listeners.end(), T());
-    }
-
-    return validCount;
-}
-
-// Returns true if no valid listeners exist
-template <typename T>
-inline bool CListenerSet<T>::Empty() const
-{
-    return ValidListenerCount() == 0;
-}
-
-// Reserves space to help avoid runtime reallocation
-template <typename T>
-inline void CListenerSet<T>::Reserve(size_t capacity)
-{
-    m_listeners.reserve(capacity);
-}
-
-// Returns the memory size of this object (to support CrySizer)
-template <typename T>
-inline size_t CListenerSet<T>::MemSize() const
-{
-    size_t size = sizeof(CListenerSet<T>) + sizeof(ListenerRecord) * m_listeners.size();
-
-#ifdef CRY_LISTENERSET_DEBUG
-    size += sizeof(typename TAllocatedNameVec::value_type);
-    for (typename TAllocatedNameVec::const_iterator iter(m_allocatedNames.begin()); iter != m_allocatedNames.end(); ++iter)
-    {
-        size += iter->GetAllocatedMemory();
-    }
-#endif
-
-    return size;
-}
-
-template <typename T>
-inline bool CListenerSet<T>::IsNotifying() const
-{
-    return m_activeNotifications > 0;
-}
-
-template <typename T>
-inline void CListenerSet<T>::StartNotificationScope()
-{
-    ++m_activeNotifications;
-}
-
-template <typename T>
-inline void CListenerSet<T>::EndNotificationScope()
-{
-    // Ensure at least one notification scope was started
-    CRY_ASSERT(m_activeNotifications > 0);
-
-    // If this is the last notification
-    if (--m_activeNotifications == 0)
-    {
-        EraseNullElements();
-    }
-}
-
-template <typename T>
-inline void CListenerSet<T>::EraseNullElements()
-{
-    // Ensure no modification while notification(s) are ongoing
-    CRY_ASSERT(m_activeNotifications == 0);
-
-    if (m_cleanupRequired && m_activeNotifications == 0)
-    {
-        stl::find_and_erase_all(m_listeners, T());
-        if (m_freeMemOnCleanup && m_listeners.empty())
-        {
-            stl::free_container(m_listeners);
-        }
-        m_cleanupRequired = false;
-        m_freeMemOnCleanup = false;
-    }
-}
-
-#ifdef CRY_LISTENERSET_DEBUG
-
-// Used to delete heap allocated names
-template <typename T>
-inline void CListenerSet<T>::DeleteName(const char* name)
-{
-    if (!m_allocatedNames.empty())
-    {
-        typename TAllocatedNameVec::iterator endIter(m_allocatedNames.end());
-        for (typename TAllocatedNameVec::iterator iter(m_allocatedNames.begin()); iter != endIter; ++iter)
-        {
-            // Is this the source string?
-            if (iter->c_str() == name)
-            {
-                // Delete it
-                m_allocatedNames.erase(iter);
-                break;
-            }
-        }
-    }
-}
-
-#endif  // defined CRY_LISTENERSET_DEBUG
-
-
-/******************************************************************************************/
-
-
-
-template <typename T>
-ILINE CListenerNotifier<T>::CListenerNotifier(CListenerSet<T>& listeners)
-    : m_listenerSet(listeners)
-    , m_pListener()
-    , m_index(0)
-#ifdef CRY_LISTENERSET_DEBUG
-    , m_szName()
-#endif
-{
-    // Flag iteration to listener set to ensure no erase is attempted during iteration
-    m_listenerSet.StartNotificationScope();
-
-    // If first element is NULL, move to next valid element
-    if (!IsValid())
-    {
-        Next();
-    }
-}
-
-template <typename T>
-ILINE CListenerNotifier<T>::~CListenerNotifier()
-{
-    // Erases any NULL elements from listeners
-    m_listenerSet.EndNotificationScope();
-}
-
-// True if the current element is ready for iteration
-template <typename T>
-ILINE bool CListenerNotifier<T>::IsValid()
-{
-    if (!m_pListener)
-    {
-        // Always check with original collection
-        if (m_index < m_listenerSet.m_listeners.size())
-        {
-            const typename CListenerSet<T>::ListenerRecord & record(m_listenerSet.m_listeners[m_index]);
-            m_pListener = record.m_pListener;
-
-#ifdef CRY_LISTENERSET_DEBUG
-            m_szName = record.m_szName;
-#endif
-        }
-    }
-
-    return m_pListener != NULL;
-}
-
-// Dereference current listener, MUST only be done after a call to IsReady().
-template <typename T>
-ILINE T CListenerNotifier<T>::operator->()
-{
-    return operator*();
-}
-
-// Dereference current listener, MUST only be done after a call to IsReady().
-template <typename T>
-ILINE T CListenerNotifier<T>::operator*()
-{
-    // Ensure IsReady() was called and its return value checked
-    CRY_ASSERT(m_pListener);
-
-    // Clear cached listener pointer to force a IsReady() call before this can be called again.
-    // This is done as the listener could be removed during any call to its own event handlers
-    // resulting in m_pListener becoming a dangling pointer.
-    T pListener(m_pListener);
-    m_pListener = T();
-    return pListener;
-}
-
-// Move to next valid listener
-template <typename T>
-ILINE void CListenerNotifier<T>::Next()
-{
-    size_t index = m_index;
-    typename CListenerSet<T>::ListenerRecord * pNextRecord = NULL;
-    m_pListener = NULL; // Always assume there's no next, let the code below prove otherwise!
-
-    const size_t listenerCount = m_listenerSet.m_listeners.size();
-    while (++index < listenerCount)
-    {
-        typename CListenerSet<T>::ListenerRecord & record(m_listenerSet.m_listeners[index]);
-
-        // Is this element valid?
-        if (record.m_pListener)
-        {
-            pNextRecord = &record;
-            break;
-        }
-        // Else move to next element
-    }
-
-    if (pNextRecord)
-    {
-        m_pListener = pNextRecord->m_pListener;
-#ifdef CRY_LISTENERSET_DEBUG
-        m_szName = pNextRecord->m_szName;
-#endif
-    }
-
-    m_index = index;
-}
-
-// Returns the name of the listener (if available)
-template <typename T>
-inline const char* CListenerNotifier<T>::Name() const
-{
-#ifdef CRY_LISTENERSET_DEBUG
-    return m_szName;
-#else
-    return NULL;
-#endif
-}
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYLISTENERSET_H
diff --git a/Code/CryEngine/CryCommon/CryName.h b/Code/CryEngine/CryCommon/CryName.h
deleted file mode 100644
index 966ed38c80..0000000000
--- a/Code/CryEngine/CryCommon/CryName.h
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYNAME_H
-#define CRYINCLUDE_CRYCOMMON_CRYNAME_H
-#pragma once
-
-#include <ISystem.h>
-#include <StlUtils.h>
-#include <CrySizer.h>
-#include <CryCrc32.h>
-#include <AzCore/std/containers/unordered_map.h>
-
-class CNameTable;
-
-
-struct INameTable
-{
-    virtual ~INameTable(){}
-
-    // Name entry header, immediately after this header in memory starts actual string data.
-    struct SNameEntry
-    {
-        enum
-        {
-            TAG = 0xdeadbeef
-        };
-
-        int nTag; // tag to ensure that this is actually a name entry
-        // Reference count of this string.
-        int nRefCount;
-        // Current length of string.
-        int nLength;
-        // Size of memory allocated at the end of this class.
-        int nAllocSize;
-        // Here in memory starts character buffer of size nAllocSize.
-        //char data[nAllocSize]
-
-        const char* GetStr() { return (char*)(this + 1); }
-        void  AddRef() { nRefCount++; /*InterlockedIncrement(&_header()->nRefCount);*/};
-        int   Release() { return --nRefCount; };
-        int   GetMemoryUsage() { return sizeof(SNameEntry) + strlen(GetStr()); }
-        int     GetLength(){return nLength; }
-    };
-
-
-    // Finds an existing name table entry, or creates a new one if not found.
-    virtual INameTable::SNameEntry* GetEntry(const char* str) = 0;
-    // Only finds an existing name table entry, return 0 if not found.
-    virtual INameTable::SNameEntry* FindEntry(const char* str) = 0;
-    // Release existing name table entry.
-    virtual void Release(SNameEntry* pEntry) = 0;
-    virtual int GetMemoryUsage() = 0;
-    virtual int GetNumberOfEntries() = 0;
-
-    // Output all names from the table to log.
-    virtual void LogNames() = 0;
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const  = 0;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CNameTable
-    : public INameTable
-{
-private:
-    typedef AZStd::unordered_map<const char*, SNameEntry*, stl::hash_string_caseless<const char*>, stl::equality_string_caseless<const char*> > NameMap;
-    NameMap m_nameMap;
-
-public:
-    CNameTable()
-    {
-        // Ensure that SNameEntry is an aligned size
-        static_assert(sizeof(INameTable::SNameEntry) % sizeof(void*) == 0, "SNameEntry must be an aligned size");
-    }
-
-    ~CNameTable()
-    {
-        for (NameMap::iterator it = m_nameMap.begin(); it != m_nameMap.end(); ++it)
-        {
-            CryModuleFree(it->second);
-        }
-    }
-
-    // Only finds an existing name table entry, return 0 if not found.
-    virtual INameTable::SNameEntry* FindEntry(const char* str)
-    {
-        SNameEntry* pEntry = stl::find_in_map(m_nameMap, str, 0);
-        return pEntry;
-    }
-
-    // Finds an existing name table entry, or creates a new one if not found.
-    virtual INameTable::SNameEntry* GetEntry(const char* str)
-    {
-        SNameEntry* pEntry = FindEntry(str);
-        if (!pEntry)
-        {
-            // Create a new entry.
-            unsigned int nLen = strlen(str);
-            unsigned int allocLen = sizeof(SNameEntry) + (nLen + 1) * sizeof(char);
-            pEntry = (SNameEntry*)CryModuleMalloc(allocLen);
-            assert(pEntry != NULL);
-            pEntry->nTag = SNameEntry::TAG;
-            pEntry->nRefCount = 0;
-            pEntry->nLength = nLen;
-            pEntry->nAllocSize = allocLen;
-            // Copy string to the end of name entry.
-            char* pEntryStr = const_cast<char*>(pEntry->GetStr());
-            memcpy(pEntryStr, str, nLen + 1);
-            // put in map.
-            //m_nameMap.insert( NameMap::value_type(pEntry->GetStr(),pEntry) );
-            m_nameMap[pEntry->GetStr()] = pEntry;
-        }
-        return pEntry;
-    }
-
-    // Release existing name table entry.
-    virtual void Release(SNameEntry* pEntry)
-    {
-        assert(pEntry);
-        m_nameMap.erase(pEntry->GetStr());
-        CryModuleFree(pEntry);
-    }
-    virtual int GetMemoryUsage()
-    {
-        int nSize = 0;
-        NameMap::iterator it;
-        int n = 0;
-        for (it = m_nameMap.begin(); it != m_nameMap.end(); it++)
-        {
-            nSize += strlen(it->first);
-            nSize += it->second->GetMemoryUsage();
-            n++;
-        }
-        nSize += n * 8;
-
-        return nSize;
-    }
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddContainer(m_nameMap);
-    }
-    virtual int GetNumberOfEntries()
-    {
-        return m_nameMap.size();
-    }
-
-    // Log all names inside CryName table.
-    virtual void LogNames()
-    {
-        NameMap::iterator it;
-        for (it = m_nameMap.begin(); it != m_nameMap.end(); ++it)
-        {
-            SNameEntry* pNameEntry = it->second;
-            CryLog("[%4d] %s", pNameEntry->nLength, pNameEntry->GetStr());
-        }
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Class CCryName.
-//////////////////////////////////////////////////////////////////////////
-class CCryName
-{
-public:
-    CCryName();
-    CCryName(const CCryName& n);
-    explicit CCryName(const char* s);
-    CCryName(const char* s, bool bOnlyFind);
-    ~CCryName();
-
-    CCryName& operator=(const CCryName& n);
-    CCryName& operator=(const char* s);
-
-    bool    operator==(const CCryName& n) const;
-    bool    operator!=(const CCryName& n) const;
-
-    bool    operator==(const char* s) const;
-    bool    operator!=(const char* s) const;
-
-    bool    operator<(const CCryName& n) const;
-    bool    operator>(const CCryName& n) const;
-
-    bool    empty() const { return !m_str || !m_str[0]; }
-    void    reset() {   _release(m_str);    m_str = 0; }
-    void  addref()    {   _addref(m_str); }
-
-    const   char*   c_str() const
-    {
-        return (m_str) ? m_str : "";
-    }
-    int length() const { return _length(); };
-
-    static bool find(const char* str) { return GetNameTable()->FindEntry(str) != 0; }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        //pSizer->AddObject(m_str);
-        pSizer->AddObject(GetNameTable());   // cause for slowness?
-    }
-    static int GetMemoryUsage()
-    {
-#ifdef USE_STATIC_NAME_TABLE
-        CNameTable* pTable = GetNameTable();
-#else
-        INameTable* pTable = GetNameTable();
-#endif
-        return pTable->GetMemoryUsage();
-    }
-    static int GetNumberOfEntries()
-    {
-#ifdef USE_STATIC_NAME_TABLE
-        CNameTable* pTable = GetNameTable();
-#else
-        INameTable* pTable = GetNameTable();
-#endif
-        return pTable->GetNumberOfEntries();
-    }
-
-    // Compare functor for sorting CCryNames lexically.
-    struct CmpLex
-    {
-        bool operator () (const CCryName& n1, const CCryName& n2) const
-        {
-            return strcmp(n1.c_str(), n2.c_str()) < 0;
-        }
-    };
-
-private:
-    typedef INameTable::SNameEntry SNameEntry;
-
-#ifdef USE_STATIC_NAME_TABLE
-    static CNameTable* GetNameTable()
-    {
-        // Note: can not use a 'static CNameTable sTable' here, because that
-        // implies a static destruction order depenency - the name table is
-        // accessed from static destructor calls.
-        static CNameTable* table = NULL;
-
-        if (table == NULL)
-        {
-            table = new CNameTable();
-        }
-        return table;
-    }
-#else
-    //static INameTable* GetNameTable() { return GetISystem()->GetINameTable(); }
-    static INameTable* GetNameTable()
-    {
-        assert(gEnv && gEnv->pNameTable);
-        return gEnv->pNameTable;
-    }
-#endif
-
-    SNameEntry* _entry(const char* pBuffer) const
-    {
-        CRY_ASSERT(pBuffer);
-        CRY_ASSERT((((SNameEntry*)pBuffer) - 1)->nTag == SNameEntry::TAG);
-        return ((SNameEntry*)pBuffer) - 1;
-    }
-    void _release(const char* pBuffer)
-    {
-        if (pBuffer && _entry(pBuffer)->Release() <= 0 && gEnv)
-        {
-            GetNameTable()->Release(_entry(pBuffer));
-        }
-    }
-    int  _length() const { return (m_str) ? _entry(m_str)->nLength : 0; };
-    void _addref(const char* pBuffer)
-    {
-        if (pBuffer)
-        {
-            _entry(pBuffer)->AddRef();
-        }
-    }
-
-
-    const char* m_str;
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// CryName
-//////////////////////////////////////////////////////////////////////////
-inline CCryName::CCryName()
-{
-    m_str = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryName::CCryName(const CCryName& n)
-{
-    _addref(n.m_str);
-    m_str = n.m_str;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryName::CCryName(const char* s)
-{
-    m_str = 0;
-    *this = s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryName::CCryName(const char* s, [[maybe_unused]] bool bOnlyFind)
-{
-    assert(s);
-    m_str = 0;
-    if (*s) // if not empty
-    {
-        SNameEntry* pNameEntry = GetNameTable()->FindEntry(s);
-        if (pNameEntry)
-        {
-            m_str = pNameEntry->GetStr();
-            _addref(m_str);
-        }
-    }
-}
-
-inline CCryName::~CCryName()
-{
-    _release(m_str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryName&    CCryName::operator=(const CCryName& n)
-{
-    if (m_str != n.m_str)
-    {
-        _release(m_str);
-        m_str = n.m_str;
-        _addref(m_str);
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryName&    CCryName::operator=(const char* s)
-{
-    assert(s);
-    const char* pBuf = 0;
-    if (s && *s) // if not empty
-    {
-        pBuf = GetNameTable()->GetEntry(s)->GetStr();
-    }
-    if (m_str != pBuf)
-    {
-        _release(m_str);
-        m_str = pBuf;
-        _addref(m_str);
-    }
-    return *this;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-inline bool CCryName::operator==(const CCryName& n) const
-{
-    return m_str == n.m_str;
-}
-
-inline bool CCryName::operator!=(const CCryName& n) const
-{
-    return !(*this == n);
-}
-
-inline bool CCryName::operator==(const char* str) const
-{
-    return m_str && _stricmp(m_str, str) == 0;
-}
-
-inline bool CCryName::operator!=(const char* str) const
-{
-    if (!m_str)
-    {
-        return true;
-    }
-    return _stricmp(m_str, str) != 0;
-}
-
-inline bool CCryName::operator<(const CCryName& n) const
-{
-    return m_str < n.m_str;
-}
-
-inline bool CCryName::operator>(const CCryName& n) const
-{
-    return m_str > n.m_str;
-}
-
-inline bool operator==(const string& s, const CCryName& n)
-{
-    return n == s;
-}
-inline bool operator!=(const string& s, const CCryName& n)
-{
-    return n != s;
-}
-
-inline bool operator==(const char* s, const CCryName& n)
-{
-    return n == s;
-}
-inline bool operator!=(const char* s, const CCryName& n)
-{
-    return n != s;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Class CCryNameCRC.
-//////////////////////////////////////////////////////////////////////////
-class CCryNameCRC
-{
-public:
-    CCryNameCRC();
-    CCryNameCRC(const CCryNameCRC& n);
-    CCryNameCRC(const char* s);
-    CCryNameCRC(const char* s, bool bOnlyFind);
-    explicit CCryNameCRC(uint32 n) { m_nID = n; } //  We use "explicit" to prevent comparison of strings with ints due to implicit conversion.
-    ~CCryNameCRC();
-
-    CCryNameCRC& operator=(const CCryNameCRC& n);
-    CCryNameCRC& operator=(const char* s);
-
-    bool  operator==(const CCryNameCRC& n) const;
-    bool  operator!=(const CCryNameCRC& n) const;
-
-    bool  operator==(const char* s) const;
-    bool  operator!=(const char* s) const;
-
-    bool  operator<(const CCryNameCRC& n) const;
-    bool  operator>(const CCryNameCRC& n) const;
-
-    bool  empty() const { return m_nID == 0; }
-    void  reset() {   m_nID = 0; }
-    uint32 get() const    {   return m_nID; }
-    void  add(int nAdd) { m_nID += nAdd; }
-
-    AUTO_STRUCT_INFO
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
-private:
-
-    uint32 m_nID;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CCryNameCRC
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameCRC::CCryNameCRC()
-{
-    m_nID = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameCRC::CCryNameCRC(const CCryNameCRC& n)
-{
-    m_nID = n.m_nID;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameCRC::CCryNameCRC(const char* s)
-{
-    m_nID = 0;
-    *this = s;
-}
-
-inline CCryNameCRC::~CCryNameCRC()
-{
-    m_nID = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameCRC& CCryNameCRC::operator=(const CCryNameCRC& n)
-{
-    m_nID = n.m_nID;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CCryNameCRC& CCryNameCRC::operator=(const char* s)
-{
-    assert(s);
-    if (*s) // if not empty
-    {
-        m_nID = CCrc32::ComputeLowercase(s);
-    }
-    return *this;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-inline bool CCryNameCRC::operator==(const CCryNameCRC& n) const
-{
-    return m_nID == n.m_nID;
-}
-
-inline bool CCryNameCRC::operator!=(const CCryNameCRC& n) const
-{
-    return !(*this == n);
-}
-
-inline bool CCryNameCRC::operator==(const char* str) const
-{
-    assert(str);
-    if (*str) // if not empty
-    {
-        uint32 nID = CCrc32::ComputeLowercase(str);
-        return m_nID == nID;
-    }
-    return m_nID == 0;
-}
-
-inline bool CCryNameCRC::operator!=(const char* str) const
-{
-    if (!m_nID)
-    {
-        return true;
-    }
-    if (*str) // if not empty
-    {
-        uint32 nID = CCrc32::ComputeLowercase(str);
-        return m_nID != nID;
-    }
-    return false;
-}
-
-inline bool CCryNameCRC::operator<(const CCryNameCRC& n) const
-{
-    return m_nID < n.m_nID;
-}
-
-inline bool CCryNameCRC::operator>(const CCryNameCRC& n) const
-{
-    return m_nID > n.m_nID;
-}
-
-inline bool operator==(const string& s, const CCryNameCRC& n)
-{
-    return n == s;
-}
-inline bool operator!=(const string& s, const CCryNameCRC& n)
-{
-    return n != s;
-}
-
-inline bool operator==(const char* s, const CCryNameCRC& n)
-{
-    return n == s;
-}
-inline bool operator!=(const char* s, const CCryNameCRC& n)
-{
-    return n != s;
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYNAME_H
diff --git a/Code/CryEngine/CryCommon/CryPath.h b/Code/CryEngine/CryCommon/CryPath.h
deleted file mode 100644
index f3f64fe43d..0000000000
--- a/Code/CryEngine/CryCommon/CryPath.h
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Defines namespace PathUtil for operations on files paths.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYPATH_H
-#define CRYINCLUDE_CRYCOMMON_CRYPATH_H
-#pragma once
-
-#include <ISystem.h>
-#include <AzFramework/Archive/IArchive.h>
-#include <IConsole.h>
-
-#include "platform.h"
-
-#define UNIX_PATH_SEP_STR    "/"
-#define UNIX_PATH_SEP_CHR    '/'
-#define DOS_PATH_SEP_STR     "\\"
-#define DOS_PATH_SEP_CHR     '\\'
-
-#if AZ_LEGACY_CRYCOMMON_TRAIT_USE_UNIX_PATHS
-#define CRY_NATIVE_PATH_SEPSTR  UNIX_PATH_SEP_STR
-#else
-#define CRY_NATIVE_PATH_SEPSTR  DOS_PATH_SEP_STR
-#endif
-
-namespace PathUtil
-{
-    const static int maxAliasLength = 32;
-    inline string GetLocalizationFolder()
-    {
-        return gEnv->pCryPak->GetLocalizationFolder();
-    }
-
-    inline string GetLocalizationRoot()
-    {
-        return gEnv->pCryPak->GetLocalizationRoot();
-    }
-
-    //! Convert a path to the uniform form.
-    inline string ToUnixPath(const string& strPath)
-    {
-        if (strPath.find(DOS_PATH_SEP_CHR) != string::npos)
-        {
-            string path = strPath;
-            path.replace(DOS_PATH_SEP_CHR, UNIX_PATH_SEP_CHR);
-            return path;
-        }
-        return strPath;
-    }
-
-    //! Convert a path to the uniform form in place on stack
-    inline void ToUnixPath(stack_string& rConv)
-    {
-        const char* const cpEnd = &(rConv.c_str()[rConv.size()]);
-        char*   __restrict pC = rConv.begin();
-        while (pC != cpEnd)
-        {
-            char c = *pC;
-            if (c == DOS_PATH_SEP_CHR)
-            {
-                c = UNIX_PATH_SEP_CHR;
-            }
-            *pC++ = c;
-        }
-    }
-
-    //! Convert a path to the DOS form.
-    inline string ToDosPath(const string& strPath)
-    {
-        if (strPath.find(UNIX_PATH_SEP_CHR) != string::npos)
-        {
-            string path = strPath;
-            path.replace(UNIX_PATH_SEP_CHR, DOS_PATH_SEP_CHR);
-            return path;
-        }
-        return strPath;
-    }
-
-    //! Convert a path to the Native form.
-    inline string ToNativePath(const string& strPath)
-    {
-#if AZ_LEGACY_CRYCOMMON_TRAIT_USE_UNIX_PATHS
-        return ToUnixPath(strPath);
-#else
-        return ToDosPath(strPath);
-#endif
-    }
-
-    //! Convert a path to lowercase form
-    inline string ToLower(const string& strPath)
-    {
-        string path = strPath;
-        path.MakeLower();
-        return path;
-    }
-
-
-    //! Split full file name to path and filename
-    //! @param filepath [IN] Full file name including path.
-    //! @param path [OUT] Extracted file path.
-    //! @param filename [OUT] Extracted file (without extension).
-    //! @param ext [OUT] Extracted files extension.
-    inline void Split(const string& filepath, string& path, string& filename, string& fext)
-    {
-        path = filename = fext = string();
-        if (filepath.empty())
-        {
-            return;
-        }
-        const char* str = filepath.c_str();
-        const char* pext = str + filepath.length() - 1;
-        const char* p;
-        for (p = str + filepath.length() - 1; p >= str; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                path = filepath.substr(0, p - str + 1);
-                filename = filepath.substr(p - str + 1, pext - p);
-                return;
-            case '.':
-                // there's an extension in this file name
-                fext = filepath.substr(p - str + 1);
-                pext = p;
-                break;
-            }
-        }
-        filename = filepath.substr(p - str + 1, pext - p);
-    }
-
-    //! Split full file name to path and filename
-    //! @param filepath [IN] Full file name inclusing path.
-    //! @param path [OUT] Extracted file path.
-    //! @param file [OUT] Extracted file (with extension).
-    inline void Split(const string& filepath, string& path, string& file)
-    {
-        string fext;
-        Split(filepath, path, file, fext);
-        file += fext;
-    }
-
-    // Extract extension from full specified file path
-    // Returns
-    //   pointer to the extension (without .) or pointer to an empty 0-terminated string
-    inline const char* GetExt(const char* filepath)
-    {
-        const char* str = filepath;
-        size_t len = strlen(filepath);
-        for (const char* p = str + len - 1; p >= str; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                // we've reached a path separator - it means there's no extension in this name
-                return "";
-            case '.':
-                // there's an extension in this file name
-                return p + 1;
-            }
-        }
-        return "";
-    }
-
-    //! Extract path from full specified file path.
-    inline string GetPath(const string& filepath)
-    {
-        const char* str = filepath.c_str();
-        for (const char* p = str + filepath.length() - 1; p >= str; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                return filepath.substr(0, p - str + 1);
-            }
-        }
-        return "";
-    }
-
-    //! Extract path from full specified file path.
-    inline string GetPath(const char* filepath)
-    {
-        return GetPath(string(filepath));
-    }
-
-    //! Extract path from full specified file path.
-    inline stack_string GetPath(const stack_string& filepath)
-    {
-        const char* str = filepath.c_str();
-        for (const char* p = str + filepath.length() - 1; p >= str; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                return filepath.substr(0, p - str + 1);
-            }
-        }
-        return "";
-    }
-
-    //! Extract file name with extension from full specified file path.
-    inline string GetFile(const string& filepath)
-    {
-        const char* str = filepath.c_str();
-        for (const char* p = str + filepath.length() - 1; p >= str; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                return filepath.substr(p - str + 1);
-            }
-        }
-        return filepath;
-    }
-
-    inline const char* GetFile(const char* filepath)
-    {
-        const size_t len = strlen(filepath);
-        for (const char* p = filepath + len - 1; p >= filepath; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                return p + 1;
-            }
-        }
-        return filepath;
-    }
-
-    //! Replace extension for given file.
-    inline void RemoveExtension(string& filepath)
-    {
-        const char* str = filepath.c_str();
-        for (const char* p = str + filepath.length() - 1; p >= str; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                // we've reached a path separator - it means there's no extension in this name
-                return;
-            case '.':
-                // there's an extension in this file name
-                filepath = filepath.substr(0, p - str);
-                return;
-            }
-        }
-        // it seems the file name is a pure name, without path or extension
-    }
-
-    //! Replace extension for given file.
-    inline void RemoveExtension(stack_string& filepath)
-    {
-        const char* str = filepath.c_str();
-        for (const char* p = str + filepath.length() - 1; p >= str; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                // we've reached a path separator - it means there's no extension in this name
-                return;
-            case '.':
-                // there's an extension in this file name
-                filepath = filepath.substr(0, p - str);
-                return;
-            }
-        }
-        // it seems the file name is a pure name, without path or extension
-    }
-
-    //! Extract file name without extension from full specified file path.
-    inline string GetFileName(const string& filepath)
-    {
-        string file = filepath;
-        RemoveExtension(file);
-        return GetFile(file);
-    }
-
-    //! Removes the trailing slash or backslash from a given path.
-    inline string RemoveSlash(const string& path)
-    {
-        if (path.empty() || (path[path.length() - 1] != '/' && path[path.length() - 1] != '\\'))
-        {
-            return path;
-        }
-        return path.substr(0, path.length() - 1);
-    }
-
-    //! get slash
-    inline string GetSlash()
-    {
-        return CRY_NATIVE_PATH_SEPSTR;
-    }
-
-    //! add a backslash if needed
-    inline string AddSlash(const string& path)
-    {
-        if (path.empty() || path[path.length() - 1] == '/')
-        {
-            return path;
-        }
-        if (path[path.length() - 1] == '\\')
-        {
-            return path.substr(0, path.length() - 1) + "/";
-        }
-        return path + "/";
-    }
-
-    //! add a backslash if needed
-    inline stack_string AddSlash(const stack_string& path)
-    {
-        if (path.empty() || path[path.length() - 1] == '/')
-        {
-            return path;
-        }
-        if (path[path.length() - 1] == '\\')
-        {
-            return path.substr(0, path.length() - 1) + "/";
-        }
-        return path + "/";
-    }
-
-    //! add a backslash if needed
-    inline string AddSlash(const char* path)
-    {
-        return AddSlash(string(path));
-    }
-
-    inline stack_string ReplaceExtension(const stack_string& filepath, const char* ext)
-    {
-        stack_string str = filepath;
-        if (ext != 0)
-        {
-            RemoveExtension(str);
-            if (ext[0] != 0 && ext[0] != '.')
-            {
-                str += ".";
-            }
-            str += ext;
-        }
-        return str;
-    }
-
-    //! Replace extension for given file.
-    inline string ReplaceExtension(const string& filepath, const char* ext)
-    {
-        string str = filepath;
-        if (ext != 0)
-        {
-            RemoveExtension(str);
-            if (ext[0] != 0 && ext[0] != '.')
-            {
-                str += ".";
-            }
-            str += ext;
-        }
-        return str;
-    }
-
-    //! Replace extension for given file.
-    inline string ReplaceExtension(const char* filepath, const char* ext)
-    {
-        return ReplaceExtension(string(filepath), ext);
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline string Make(const string& path, const string& file)
-    {
-        return AddSlash(path) + file;
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline string Make(const string& dir, const string& filename, const string& ext)
-    {
-        string path = ReplaceExtension(filename, ext);
-        path = AddSlash(dir) + path;
-        return path;
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline string Make(const string& dir, const string& filename, const char* ext)
-    {
-        return Make(dir, filename, string(ext));
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline stack_string Make(const stack_string& path, const stack_string& file)
-    {
-        return AddSlash(path) + file;
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline stack_string Make(const stack_string& dir, const stack_string& filename, const stack_string& ext)
-    {
-        stack_string path = ReplaceExtension(filename, ext);
-        path = AddSlash(dir) + path;
-        return path;
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline string Make(const char* path, const string& file)
-    {
-        return Make(string(path), file);
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline string Make(const string& path, const char* file)
-    {
-        return Make(path, string(file));
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline string Make(const char path[], const char file[])
-    {
-        return Make(string(path), string(file));
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline string Make(const char* path, const char* file, const char* ext)
-    {
-        return Make(string(path), string(file), string(ext));
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline string MakeFullPath(const string& relativePath)
-    {
-        return relativePath;
-    }
-
-    inline string GetParentDirectory (const string& strFilePath, int nGeneration = 1)
-    {
-        for (const char* p = strFilePath.c_str() + strFilePath.length() - 2; // -2 is for the possible trailing slash: there always must be some trailing symbol which is the file/directory name for which we should get the parent
-             p >= strFilePath.c_str();
-             --p)
-        {
-            switch (*p)
-            {
-            case ':':
-                return string (strFilePath.c_str(), p);
-            case '/':
-            case '\\':
-                // we've reached a path separator - return everything before it.
-                if (!--nGeneration)
-                {
-                    return string(strFilePath.c_str(), p);
-                }
-                break;
-            }
-        }
-        // it seems the file name is a pure name, without path or extension
-        return string();
-    }
-
-    template<typename T, size_t SIZE>
-    inline CryStackStringT<T, SIZE> GetParentDirectoryStackString(const CryStackStringT<T, SIZE>& strFilePath, int nGeneration = 1)
-    {
-        for (const char* p = strFilePath.c_str() + strFilePath.length() - 2; // -2 is for the possible trailing slash: there always must be some trailing symbol which is the file/directory name for which we should get the parent
-             p >= strFilePath.c_str();
-             --p)
-        {
-            switch (*p)
-            {
-            case ':':
-                return CryStackStringT<T, SIZE> (strFilePath.c_str(), p);
-            case '/':
-            case '\\':
-                // we've reached a path separator - return everything before it.
-                if (!--nGeneration)
-                {
-                    return CryStackStringT<T, SIZE>(strFilePath.c_str(), p);
-                }
-                break;
-            }
-        }
-        // it seems the file name is a pure name, without path or extension
-        return CryStackStringT<T, SIZE>();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Description:
-    //    Make a game correct path out of any input path.
-    inline stack_string MakeGamePath(const stack_string& path)
-    {
-        stack_string relativePath(ToUnixPath(path));
-
-        if ((!gEnv) || (!gEnv->pFileIO))
-        {
-            return relativePath;
-        }
-        unsigned int index = 0;
-        if (relativePath.length() && relativePath[index] == '@') // already aliased
-        {
-            if (relativePath.compareNoCase(0, 9, "@assets@/") == 0)
-            {
-                return relativePath.substr(9); // assets is assumed.
-            }
-            return relativePath;
-        }
-
-        const char* rootValue = gEnv->pFileIO->GetAlias("@root@");
-        if (rootValue)
-        {
-            stack_string rootPath(ToUnixPath(rootValue));
-            if (
-                (rootPath.size() > 0) &&
-                (rootPath.size() < relativePath.size()) &&
-                (relativePath.compareNoCase(0, rootPath.size(), rootPath) == 0)
-                )
-            {
-                stack_string chopped_string = relativePath.substr(rootPath.size());
-                stack_string rooted = stack_string("@root@") + chopped_string;
-                return rooted;
-            }
-        }
-
-
-
-        return relativePath;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Description:
-    //    Make a game correct path out of any input path.
-    inline string MakeGamePath(const string& path)
-    {
-        stack_string stackPath(path.c_str());
-        return MakeGamePath(stackPath).c_str();
-    }
-
-    // returns true if the string matches the wildcard
-    inline bool MatchWildcard (const char* szString, const char* szWildcard)
-    {
-        const char* pString = szString, * pWildcard = szWildcard;
-        // skip the obviously the same starting substring
-        while (*pWildcard && *pWildcard != '*' && *pWildcard != '?')
-        {
-            if (*pString != *pWildcard)
-            {
-                return false; // must be exact match unless there's a wildcard character in the wildcard string
-            }
-            else
-            {
-                ++pString, ++pWildcard;
-            }
-        }
-
-        if (!*pString)
-        {
-            // this will only match if there are no non-wild characters in the wildcard
-            for (; *pWildcard; ++pWildcard)
-            {
-                if (*pWildcard != '*' && *pWildcard != '?')
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        switch (*pWildcard)
-        {
-        case '\0':
-            return false; // the only way to match them after the leading non-wildcard characters is !*pString, which was already checked
-
-        // we have a wildcard with wild character at the start.
-        case '*':
-        {
-            // merge consecutive ? and *, since they are equivalent to a single *
-            while (*pWildcard == '*' || *pWildcard == '?')
-            {
-                ++pWildcard;
-            }
-
-            if (!*pWildcard)
-            {
-                return true;     // the rest of the string doesn't matter: the wildcard ends with *
-            }
-            for (; *pString; ++pString)
-            {
-                if (MatchWildcard(pString, pWildcard))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-        case '?':
-            return MatchWildcard(pString + 1, pWildcard + 1) || MatchWildcard(pString, pWildcard + 1);
-        default:
-            assert (0);
-            return false;
-        }
-    }
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYPATH_H
diff --git a/Code/CryEngine/CryCommon/CryPodArray.h b/Code/CryEngine/CryCommon/CryPodArray.h
deleted file mode 100644
index 17198b2437..0000000000
--- a/Code/CryEngine/CryCommon/CryPodArray.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Simple POD types container
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYPODARRAY_H
-#define CRYINCLUDE_CRYCOMMON_CRYPODARRAY_H
-#pragma once
-
-#include <AzCore/std/containers/vector.h>
-
-//////////////////////////////////////////////////////////////////////////
-// POD Array
-// vector like class (random access O(1)) without construction/destructor/copy constructor/assignment handling
-// over-allocation allows safe prefetching where required without worrying about memory page boundaries
-//////////////////////////////////////////////////////////////////////////
-template <class T, size_t overAllocBytes = 0>
-class PodArray
-{
-    AZStd::vector<T> m_elements;
-
-public:
-    typedef T        value_type;
-    typedef T*       iterator;
-    typedef const T* const_iterator;
-
-    //////////////////////////////////////////////////////////////////////////
-    // STL compatible interface
-    //////////////////////////////////////////////////////////////////////////
-    void resize(size_t numElements)
-    {
-        m_elements.resize(numElements);
-    }
-    //////////////////////////////////////////////////////////////////////////
-    ILINE void reserve(unsigned numElements) { m_elements.reserve(numElements); }
-    ILINE void push_back(const T& rElement) { m_elements.push_back(rElement); }
-    ILINE size_t size() const   { return m_elements.size(); }
-    ILINE size_t capacity() const { return m_elements.capacity(); }
-
-    ILINE void clear() { m_elements.clear(); }
-    ILINE T* begin() { return m_elements.begin(); }
-    ILINE T* end() { return m_elements.end(); }
-    ILINE const T* begin() const { return m_elements.begin(); }
-    ILINE const T* end() const { return m_elements.end(); }
-    ILINE bool empty() const { return m_elements.empty(); }
-
-    ILINE const T& front() const { return m_elements.front(); }
-    ILINE T& front() { return m_elements.front(); }
-
-    ILINE const T& back() const { return m_elements.back(); }
-    ILINE T& back() { return m_elements.back(); }
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    PodArray()
-        : m_elements()
-    {
-    }
-    PodArray(int elem_count, int nNewCount = 0)
-    {
-        m_elements.reserve(elem_count);
-        m_elements.resize(nNewCount);
-    }
-    PodArray(const PodArray<T>& from)
-        : m_elements(from.m_elements)
-    {
-    }
-    ~PodArray()
-    {
-    }
-
-    void Reset() { m_elements.clear(); }
-    void Free()
-    {
-        m_elements.clear();
-        m_elements.shrink_to_fit();
-    }
-
-    ILINE void Clear()
-    {
-        m_elements.clear();
-    }
-
-    int Find(const T& p)
-    {
-        const auto it = AZStd::find(m_elements.begin(), m_elements.end(), p);
-        if (it != m_elements.end())
-        {
-            return static_cast<int>(AZStd::distance(m_elements.begin(), it));
-        }
-        return -1;
-    }
-
-    inline void AddList(const PodArray<T>& lstAnother)
-    {
-        AZStd::copy(lstAnother.m_elements.begin(), lstAnother.m_elements.end(), AZStd::back_inserter(m_elements));
-    }
-
-    inline void AddList(T* pAnotherArray, int nAnotherCount)
-    {
-        AZStd::copy(pAnotherArray, pAnotherArray + nAnotherCount, AZStd::back_inserter(m_elements));
-    }
-
-    ILINE void Add(const T& p)
-    {
-        m_elements.push_back(p);
-    }
-
-    ILINE T& AddNew()
-    {
-        m_elements.emplace_back();
-        return m_elements.back();
-    }
-
-    void InsertBefore(const T& p, const unsigned int nBefore)
-    {
-        m_elements.insert(m_elements.begin() + nBefore, p);
-    }
-
-    void CheckAllocated(int elem_count)
-    {
-        if (m_elements.size() < elem_count)
-        {
-            m_elements.resize(elem_count);
-        }
-    }
-
-    void PreAllocate(int elem_count, int nNewCount = -1)
-    {
-        m_elements.reserve(elem_count);
-        if (nNewCount >= 0)
-        {
-            m_elements.resize(nNewCount);
-        }
-    }
-
-    inline void Delete(const int nElemId, const int nElemCount = 1)
-    {
-        AZ_Assert(nElemId >= 0 && nElemId + nElemCount <= size(), "Index out of bounds");
-        m_elements.erase(m_elements.begin() + nElemId, m_elements.begin() + nElemId + nElemCount);
-    }
-
-    inline void DeleteFastUnsorted(const int nElemId, const int nElemCount = 1)
-    {
-        AZ_Assert(nElemId >= 0 && nElemId + nElemCount <= size(), "Index out of bounds");
-        m_elements.erase(m_elements.begin() + nElemId, m_elements.begin() + nElemId + nElemCount);
-    }
-
-    inline bool Delete(const T& del)
-    {
-        const size_t numElements = m_elements.size();
-        m_elements.erase(std::remove(m_elements.begin(), m_elements.end(), del), m_elements.end());
-        return numElements != m_elements.size();
-    }
-
-    ILINE  int Count() const { return m_elements.size(); }
-    ILINE  unsigned int Size() const { return m_elements.size(); }
-
-    ILINE  int IsEmpty() const { return m_elements.empty(); }
-
-    ILINE  const T& operator [] (int i) const { return m_elements[i]; }
-    ILINE  T& operator [] (int i) { return m_elements[i]; }
-    ILINE  const T& GetAt(int i) const { return m_elements[i]; }
-    ILINE  T& GetAt(int i) { return m_elements[i]; }
-    ILINE  const T* Get(int i) const { return &m_elements[i]; }
-    ILINE  T* Get(int i) { return &m_elements[i]; }
-    ILINE  const T* GetElements() const { return m_elements.data(); }
-    ILINE  T* GetElements() { return m_elements.data(); }
-    
-    ILINE  unsigned int GetDataSize() const { return m_elements.size() * sizeof(T); }
-
-    const T& Last() const { return m_elements.back(); }
-    T& Last() { return m_elements.back(); }
-
-    ILINE void DeleteLast()
-    {
-        assert(!m_elements.empty());
-        m_elements.pop_back();
-    }
-
-    PodArray<T>& operator=(const PodArray<T>& source_list)
-    {
-        m_elements = source_list.m_elements;
-        return *this;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Return true if arrays have the same data.
-    bool Compare(const PodArray<T>& l) const
-    {
-        return m_elements == l.m_elements;
-    }
-
-    // for statistics
-    ILINE size_t ComputeSizeInMemory() const
-    {
-        return (sizeof(*this) + sizeof(T) * m_elements.capacity()) + overAllocBytes;
-    }
-
-    ILINE void RemoveIf(AZStd::function<bool(const T&)> testFunc)
-    {
-        m_elements.erase(AZStd::remove_if(m_elements.begin(), m_elements.end(), testFunc), m_elements.end());
-    }
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYPODARRAY_H
diff --git a/Code/CryEngine/CryCommon/CryRandomInternal.h b/Code/CryEngine/CryCommon/CryRandomInternal.h
deleted file mode 100644
index 48441cdba8..0000000000
--- a/Code/CryEngine/CryCommon/CryRandomInternal.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <algorithm>  // std::swap()
-#include <limits>  // std::numeric_limits
-#include <type_traits>  // std::make_unsigned
-#include "BaseTypes.h"  // uint32, uint64
-#include "CompileTimeAssert.h"
-#include "Cry_Vector2.h"
-#include "Cry_Vector3.h"
-#include "Cry_Vector4.h"
-
-
-namespace CryRandom_Internal
-{
-    template <class R, class T, size_t size>
-    struct BoundedRandomUint
-    {
-        COMPILE_TIME_ASSERT(std::numeric_limits<T>::is_integer);
-        COMPILE_TIME_ASSERT(!std::numeric_limits<T>::is_signed);
-        COMPILE_TIME_ASSERT(sizeof(T) == size);
-        COMPILE_TIME_ASSERT(sizeof(T) <= sizeof(uint32));
-
-        inline static T Get(R& randomGenerator, const T maxValue)
-        {
-            const uint32 r = randomGenerator.GenerateUint32();
-            // Note that the computation below is biased. An alternative computation
-            // (also biased): uint32((uint64)r * ((uint64)maxValue + 1)) >> 32)
-            return (T)((uint64)r % ((uint64)maxValue + 1));
-        }
-    };
-
-    template <class R, class T>
-    struct BoundedRandomUint<R, T, 8>
-    {
-        COMPILE_TIME_ASSERT(std::numeric_limits<T>::is_integer);
-        COMPILE_TIME_ASSERT(!std::numeric_limits<T>::is_signed);
-        COMPILE_TIME_ASSERT(sizeof(T) == sizeof(uint64));
-
-        inline static T Get(R& randomGenerator, const T maxValue)
-        {
-            const uint64 r = randomGenerator.GenerateUint64();
-            if (maxValue >= (std::numeric_limits<uint64>::max)())
-            {
-                return r;
-            }
-            // Note that the computation below is biased.
-            return (T)(r % ((uint64)maxValue + 1));
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-
-    template <class R, class T, bool bInteger = std::numeric_limits<T>::is_integer>
-    struct BoundedRandom;
-
-    template <class R, class T>
-    struct BoundedRandom<R, T, true>
-    {
-        COMPILE_TIME_ASSERT(std::numeric_limits<T>::is_integer);
-        typedef typename std::make_unsigned<T>::type UT;
-        COMPILE_TIME_ASSERT(sizeof(T) == sizeof(UT));
-        COMPILE_TIME_ASSERT(std::numeric_limits<UT>::is_integer);
-        COMPILE_TIME_ASSERT(!std::numeric_limits<UT>::is_signed);
-
-        inline static T Get(R& randomGenerator, T minValue, T maxValue)
-        {
-            if (minValue > maxValue)
-            {
-                std::swap(minValue, maxValue);
-            }
-            return (T)((UT)minValue + (UT)BoundedRandomUint<R, UT, sizeof(UT)>::Get(randomGenerator, (UT)(maxValue - minValue)));
-        }
-    };
-
-    template <class R, class T>
-    struct BoundedRandom<R, T, false>
-    {
-        COMPILE_TIME_ASSERT(!std::numeric_limits<T>::is_integer);
-
-        inline static T Get(R& randomGenerator, const T minValue, const T maxValue)
-        {
-            return minValue + (maxValue - minValue) * randomGenerator.GenerateFloat();
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-
-    template <class R, class VT, class T = typename VT::value_type, size_t componentCount = VT::component_count>
-    struct BoundedRandomComponentwise;
-
-    template <class R, class VT, class T>
-    struct BoundedRandomComponentwise<R, VT, T, 2>
-    {
-        inline static VT Get(R& randomGenerator, const VT& minValue, const VT& maxValue)
-        {
-            const T x = BoundedRandom<R, T>::Get(randomGenerator, minValue.x, maxValue.x);
-            const T y = BoundedRandom<R, T>::Get(randomGenerator, minValue.y, maxValue.y);
-            return VT(x, y);
-        }
-    };
-
-    template <class R, class VT, class T>
-    struct BoundedRandomComponentwise<R, VT, T, 3>
-    {
-        inline static VT Get(R& randomGenerator, const VT& minValue, const VT& maxValue)
-        {
-            const T x = BoundedRandom<R, T>::Get(randomGenerator, minValue.x, maxValue.x);
-            const T y = BoundedRandom<R, T>::Get(randomGenerator, minValue.y, maxValue.y);
-            const T z = BoundedRandom<R, T>::Get(randomGenerator, minValue.z, maxValue.z);
-            return VT(x, y, z);
-        }
-    };
-
-    template <class R, class VT, class T>
-    struct BoundedRandomComponentwise<R, VT, T, 4>
-    {
-        inline static VT Get(R& randomGenerator, const VT& minValue, const VT& maxValue)
-        {
-            const T x = BoundedRandom<R, T>::Get(randomGenerator, minValue.x, maxValue.x);
-            const T y = BoundedRandom<R, T>::Get(randomGenerator, minValue.y, maxValue.y);
-            const T z = BoundedRandom<R, T>::Get(randomGenerator, minValue.z, maxValue.z);
-            const T w = BoundedRandom<R, T>::Get(randomGenerator, minValue.w, maxValue.w);
-            return VT(x, y, z, w);
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-
-    template <class R, class VT>
-    inline VT GetRandomUnitVector(R& randomGenerator)
-    {
-        typedef typename VT::value_type T;
-        COMPILE_TIME_ASSERT(!std::numeric_limits<T>::is_integer);
-
-        VT res;
-        T lenSquared;
-
-        do
-        {
-            res = BoundedRandomComponentwise<R, VT>::Get(randomGenerator, VT(-1), VT(1));
-            lenSquared = res.GetLengthSquared();
-        } while (lenSquared > 1);
-
-        if (lenSquared >= (std::numeric_limits<T>::min)())
-        {
-            return res * isqrt_tpl(lenSquared);
-        }
-
-        res = VT(ZERO);
-        res.x = 1;
-        return res;
-    }
-} // namespace CryRandom_Internal
-
-// eof
diff --git a/Code/CryEngine/CryCommon/CrySizer.h b/Code/CryEngine/CryCommon/CrySizer.h
deleted file mode 100644
index be8bd71460..0000000000
--- a/Code/CryEngine/CryCommon/CrySizer.h
+++ /dev/null
@@ -1,586 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Declaration and definition of the CrySizer class, which is used to
-//               calculate the memory usage by the subsystems and components, to help
-//               the artists keep the memory budged low.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYSIZER_H
-#define CRYINCLUDE_CRYCOMMON_CRYSIZER_H
-#pragma once
-
-
-//////////////////////////////////////////////////////////////////////////
-
-// common containers for overloads
-#include <list>
-
-#include "Cry_Math.h"
-#include <StlUtils.h>
-#include <Tarray.h>
-#include <CryPodArray.h>
-#include <Cry_Vector3.h>
-#include <Cry_Quat.h>
-#include <Cry_Color.h>
-#include <smartptr.h>
-
-// forward declarations for overloads
-struct AABB;
-struct SVF_P3F;
-struct SVF_P3F_C4B_T2F;
-struct SVF_P3F_C4B_T2S;
-struct SVF_P3S_C4B_T2S;
-struct SPipTangents;
-
-#ifdef WIN64
-#include <string.h> // workaround for Amd64 compiler
-#endif
-
-namespace AZ
-{
-    class Vector3;
-}
-
-// flags applicable to the ICrySizer (retrieved via getFlags() method)
-//
-enum ICrySizerFlagsEnum
-{
-    // if this flag is set, during getSize(), the subsystem must count all the objects
-    // it uses in the other subsystems also
-    CSF_RecurseSubsystems = 1 << 0,
-
-    CSF_Reserved1 = 1 << 1,
-    CSF_Reserved2 = 1 << 2
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Helper functions to calculate size of the std containers.
-//////////////////////////////////////////////////////////////////////////
-namespace stl
-{
-    template <class Map>
-    inline size_t size_of_map(const Map& m)
-    {
-        if (!m.empty())
-        {
-            return m.size() * sizeof(typename Map::value_type) + m.size() * sizeof(MapLikeStruct);
-        }
-        return 0;
-    }
-    template <class Map>
-    inline size_t size_of_set(const Map& m)
-    {
-        if (!m.empty())
-        {
-            return m.size() * sizeof(typename Map::value_type) + m.size() * sizeof(MapLikeStruct);
-        }
-        return 0;
-    }
-    template <class List>
-    inline size_t size_of_list(const List& c)
-    {
-        if (!c.empty())
-        {
-            return c.size() * sizeof(typename List::value_type) + c.size() * sizeof(void*) * 2; // sizeof stored type + 2 pointers prev,next
-        }
-        return 0;
-    }
-    template <class Deque>
-    inline size_t size_of_deque(const Deque& c)
-    {
-        if (!c.empty())
-        {
-            return c.size() * sizeof(typename Deque::value_type);
-        }
-        return 0;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// interface ICrySizer
-// USAGE
-//   An instance of this class is passed down to each and every component in the system.
-//   Every component it's passed to optionally pushes its name on top of the
-//     component name stack (thus ensuring that all the components calculated down
-//     the tree will be assigned the correct subsystem/component name)
-//   Every component must Add its size with one of the Add* functions, and Add the
-//     size of all its subcomponents recursively
-//   In order to push the component/system name on the name stack, the clients must
-//     use the SIZER_COMPONENT_NAME macro or CrySizerComponentNameHelper class:
-//
-//   void X::getSize (ICrySizer* pSizer)
-//   {
-//     SIZER_COMPONENT_NAME(pSizer, X);
-//     if (!pSizer->Add (this))
-//       return;
-//     pSizer->Add (m_arrMySimpleArray);
-//     pSizer->Add (m_setMySimpleSet);
-//     m_pSubobject->getSize (pSizer);
-//   }
-//
-//   The Add* functions return bool. If they return true, then the object has been added
-//   to the set for the first time, and you should go on recursively adding all its children.
-//   If it returns false, then you can spare time and rather not go on into recursion;
-//   however it doesn't reflect on the results: an object that's added more than once is
-//   counted only once.
-//
-// WARNING:
-//   If you have an array (pointer), you should Add its size with addArray
-class ICrySizer
-{
-public:
-    virtual ~ICrySizer(){}
-    // this class is used to push/pop the name to/from the stack automatically
-    // (to exclude stack overruns or underruns at runtime)
-    friend class CrySizerComponentNameHelper;
-
-    virtual void Release() = 0;
-
-    // Return total calculated size.
-    virtual size_t GetTotalSize() = 0;
-
-    // Return total objects added.
-    virtual size_t GetObjectCount() = 0;
-
-    // Resets the counting.
-    virtual void Reset() = 0;
-
-    virtual void End() = 0;
-
-    // adds an object identified by the unique pointer (it needs not be
-    // the actual object position in the memory, though it would be nice,
-    // but it must be unique throughout the system and unchanging for this object)
-    // nCount parameter is only used for counting number of objects, it doesnt affect the size of the object.
-    // RETURNS: true if the object has actually been added (for the first time)
-    //          and calculated
-    virtual bool AddObject (const void* pIdentifier, size_t nSizeBytes, int nCount = 1) = 0;
-
-    template<typename Type>
-    bool AddObjectSize(const Type* pObj)
-    {
-        return AddObject(pObj, sizeof *pObj);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // temp dummy function while checking in the CrySizer changes, will be removed soon
-
-    template<typename Type>
-    void AddObject(const Type& rObj)
-    {
-        (void)rObj;
-    }
-
-    template<typename Type>
-    void AddObject(Type* pObj)
-    {
-        if (pObj)
-        {
-            //forward to reference object to allow function overload
-            this->AddObject(*pObj);
-        }
-    }
-
-    // overloads for smart_ptr and other common objects
-    template<typename T>
-    void AddObject(const _smart_ptr<T>& rObj) { this->AddObject(rObj.get()); }
-    template<typename T>
-    void AddObject(const AZStd::shared_ptr<T>& rObj) { this->AddObject(rObj.get()); }
-    template<typename T>
-    void AddObject(const std::shared_ptr<T>& rObj) { this->AddObject(rObj.get()); }
-    template<typename T>
-    void AddObject(const std::unique_ptr<T>& rObj) { this->AddObject(rObj.get()); }
-    template<typename T, typename U>
-    void AddObject(const std::pair<T, U>& rPair)
-    {
-        this->AddObject(rPair.first);
-        this->AddObject(rPair.second);
-    }
-    template<typename T, typename U>
-    void AddObject(const AZStd::pair<T, U>& rPair)
-    {
-        this->AddObject(rPair.first);
-        this->AddObject(rPair.second);
-    }
-    void AddObject(const string& rString) {this->AddObject(rString.c_str(), rString.capacity()); }
-    void AddObject(const CryStringT<wchar_t>& rString) {this->AddObject(rString.c_str(), rString.capacity()); }
-    void AddObject(const CryFixedStringT<32>&){}
-    void AddObject(const wchar_t&) {}
-    void AddObject(const char&) {}
-    void AddObject(const unsigned char&) {}
-    void AddObject(const signed char&) {}
-    void AddObject(const short&) {}
-    void AddObject(const unsigned short&) {}
-    void AddObject(const int&) {}
-    void AddObject(const unsigned int&) {}
-    void AddObject(const long&) {}
-    void AddObject(const unsigned long&) {}
-    void AddObject(const float&) {}
-    void AddObject(const bool&) {}
-    void AddObject(const unsigned long long&) {}
-    void AddObject(const long long&) {}
-    void AddObject(const double&) {}
-    void AddObject(const Vec2&) {}
-    void AddObject(const Vec3&) {}
-    void AddObject(const Vec4&) {}
-    void AddObject(const Ang3&) {}
-    void AddObject(const Matrix34&) {}
-    void AddObject(const Quat&) {}
-    void AddObject(const QuatT&) {}
-    void AddObject(const QuatTS&) {}
-    void AddObject(const ColorF&) {}
-    void AddObject(const AABB&) {}
-    void AddObject(const SVF_P3F&) {}
-    void AddObject(const SVF_P3F_C4B_T2F&) {}
-    void AddObject(const SVF_P3F_C4B_T2S&) {}
-    void AddObject(const SVF_P3S_C4B_T2S&) {}
-    void AddObject(const SPipTangents&) {}
-    void AddObject([[maybe_unused]] const AZ::Vector3& rObj) {}
-    void AddObject(void*) {}
-
-    // overloads for container, will automaticly traverse the content
-    template<typename T, typename Alloc>
-    void AddObject(const std::list<T, Alloc>& rList)
-    {
-        // dummy struct to get correct element size
-        struct Dummy
-        {
-            void* a;
-            void* b;
-            T t;
-        };
-
-        for (typename std::list<T, Alloc>::const_iterator it = rList.begin(); it != rList.end(); ++it)
-        {
-            if (this->AddObject(&(*it), sizeof(Dummy)))
-            {
-                this->AddObject(*it);
-            }
-        }
-    }
-    template<typename K, typename T, typename Comp, typename Equal, typename Alloc>
-    void AddObject([[maybe_unused]] const AZStd::unordered_map<K, T, Comp, Equal, Alloc>& rVector)
-    {
-
-    }
-
-    template<typename T, typename Alloc>
-    void AddObject(const std::vector<T, Alloc>& rVector)
-    {
-        if (rVector.empty())
-        {
-            this->AddObject(&rVector, rVector.capacity() * sizeof(T));
-            return;
-        }
-
-        if (!this->AddObject(&rVector[0], rVector.capacity() * sizeof(T)))
-        {
-            return;
-        }
-
-        for (typename std::vector<T, Alloc>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
-        {
-            this->AddObject(*it);
-        }
-    }
-
-    template<typename T, typename Alloc>
-    void AddObject(const std::deque<T, Alloc>& rVector)
-    {
-        for (typename std::deque<T, Alloc>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
-        {
-            if (this->AddObject(&(*it), sizeof(T)))
-            {
-                this->AddObject(*it);
-            }
-        }
-    }
-
-    template<typename T, typename I, typename S>
-    void AddObject(const DynArray<T, I, S>& rVector)
-    {
-        if (rVector.empty())
-        {
-            this->AddObject(rVector.begin(), rVector.get_alloc_size());
-            return;
-        }
-
-        if (!this->AddObject(rVector.begin(), rVector.get_alloc_size()))
-        {
-            return;
-        }
-
-        for (typename DynArray<T, I, S>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
-        {
-            this->AddObject(*it);
-        }
-    }
-
-    template<typename T>
-    void AddObject(const PodArray<T>& rVector)
-    {
-        if (!this->AddObject(rVector.begin(), rVector.capacity() * sizeof(T)))
-        {
-            return;
-        }
-
-        for (typename PodArray<T>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
-        {
-            this->AddObject(*it);
-        }
-    }
-
-    template<typename K, typename T, typename Comp, typename Alloc>
-    void AddObject(const std::map<K, T, Comp, Alloc>& rVector)
-    {
-        // dummy struct to get correct element size
-        struct Dummy
-        {
-            void* a;
-            void* b;
-            void* c;
-            void* d;
-            K k;
-            T t;
-        };
-
-        for (typename std::map<K, T, Comp, Alloc>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
-        {
-            if (this->AddObject(&(*it), sizeof(Dummy)))
-            {
-                this->AddObject(it->first);
-                this->AddObject(it->second);
-            }
-        }
-    }
-
-    template<typename T, typename Comp, typename Alloc>
-    void AddObject(const std::set<T, Comp, Alloc>& rVector)
-    {
-        // dummy struct to get correct element size
-        struct Dummy
-        {
-            void* a;
-            void* b;
-            void* c;
-            void* d;
-            T t;
-        };
-
-        for (typename std::set<T, Comp, Alloc>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
-        {
-            if (this->AddObject(&(*it), sizeof(Dummy)))
-            {
-                this->AddObject(*it);
-            }
-        }
-    }
-
-    template <typename TKey, typename TValue, typename TPredicate, typename TAlloc>
-    void AddObject (const std::multimap<TKey, TValue, TPredicate, TAlloc>& rContainer)
-    {
-        AddContainer(rContainer);
-    }
-    ////////////////////////////////////////////////////////////////////////////////////////
-    template <typename T>
-    bool Add (const T* pId, size_t num)
-    {
-        return AddObject(pId, num * sizeof(T));
-    }
-
-    template <class T>
-    bool Add (const T& rObject)
-    {
-        return AddObject (&rObject, sizeof(T));
-    }
-
-    bool Add (const char* szText)
-    {
-        return AddObject(szText, strlen(szText) + 1);
-    }
-
-    template <class StringCls>
-    bool AddString (const StringCls& strText)
-    {
-        if (!strText.empty())
-        {
-            return AddObject (strText.c_str(), strText.size());
-        }
-        else
-        {
-            return false;
-        }
-    }
-#ifdef _XSTRING_
-    template <class Elem, class Traits, class Allocator>
-    bool Add (const std::basic_string<Elem, Traits, Allocator>& strText)
-    {
-        AddString (strText);
-        return true;
-    }
-#endif
-
- #ifndef NOT_USE_CRY_STRING
-    bool Add (const string& strText)
-    {
-        AddString(strText);
-        return true;
-    }
- #endif
-
-
-    // Template helper function to add generic stl container
-    template <typename Container>
-    bool AddContainer (const Container& rContainer)
-    {
-        if (rContainer.capacity())
-        {
-            return AddObject (&rContainer, rContainer.capacity() * sizeof(typename Container::value_type));
-        }
-        return false;
-    }
-    template <typename Container>
-    bool AddHashMap(const Container& rContainer)
-    {
-        if (!rContainer.empty())
-        {
-            return AddObject (&(*rContainer.begin()), rContainer.size() * sizeof(typename Container::value_type));
-        }
-        return false;
-    }
-
-    // Specialization of the AddContainer for the std::list
-    template <typename Type, typename TAlloc>
-    bool AddContainer (const std::list<Type, TAlloc>& rContainer)
-    {
-        if (!rContainer.empty())
-        {
-            return AddObject(&(*rContainer.begin()), stl::size_of_list(rContainer));
-        }
-        return false;
-    }
-    // Specialization of the AddContainer for the std::deque
-    template <typename Type, typename TAlloc>
-    bool AddContainer (const std::deque<Type, TAlloc>& rContainer)
-    {
-        if (!rContainer.empty())
-        {
-            return AddObject(&(*rContainer.begin()), stl::size_of_deque(rContainer));
-        }
-        return false;
-    }
-    // Specialization of the AddContainer for the std::map
-    template <typename TKey, typename TValue, typename TPredicate, typename TAlloc>
-    bool AddContainer (const std::map<TKey, TValue, TPredicate, TAlloc>& rContainer)
-    {
-        if (!rContainer.empty())
-        {
-            return AddObject(&(*rContainer.begin()), stl::size_of_map(rContainer));
-        }
-        return false;
-    }
-    // Specialization of the AddContainer for the std::multimap
-    template <typename TKey, typename TValue, typename TPredicate, typename TAlloc>
-    bool AddContainer (const std::multimap<TKey, TValue, TPredicate, TAlloc>& rContainer)
-    {
-        if (!rContainer.empty())
-        {
-            return AddObject(&(*rContainer.begin()), stl::size_of_map(rContainer));
-        }
-        return false;
-    }
-    // Specialization of the AddContainer for the std::set
-    template <typename TKey, typename TPredicate, typename TAlloc>
-    bool AddContainer (const std::set<TKey, TPredicate, TAlloc>& rContainer)
-    {
-        if (!rContainer.empty())
-        {
-            return AddObject(&(*rContainer.begin()), stl::size_of_set(rContainer));
-        }
-        return false;
-    }
-
-    // Specialization of the AddContainer for the AZStd::unordered_map
-    template <typename KEY, typename TYPE, class HASH, class EQUAL, class ALLOCATOR>
-    bool AddContainer(const AZStd::unordered_map<KEY, TYPE, HASH, EQUAL, ALLOCATOR>& rContainer)
-    {
-        if (!rContainer.empty())
-        {
-            return AddObject(&(*rContainer.begin()), rContainer.size() * sizeof(typename AZStd::unordered_map<KEY, TYPE, HASH, EQUAL, ALLOCATOR>::value_type));
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    void Test()
-    {
-        std::map<int, float> mymap;
-        AddContainer(mymap);
-    }
-
-    // returns the flags
-    unsigned GetFlags() const {return m_nFlags; }
-
-protected:
-    // these functions must operate on the component name stack
-    // they are to be only accessible from within class CrySizerComponentNameHelper
-    // which should be used through macro SIZER_COMPONENT_NAME
-    virtual void Push (const char* szComponentName) = 0;
-    // pushes the name that is the name of the previous component . (dot) this name
-    virtual void PushSubcomponent (const char* szSubcomponentName) = 0;
-    virtual void Pop () = 0;
-
-    unsigned m_nFlags;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// This is on-stack class that is only used to push/pop component names
-// to/from the sizer name stack.
-//
-// USAGE:
-//
-//   Create an instance of this class at the start of a function, before
-//   calling Add* methods of the sizer interface. Everything added in the
-//   function and below will be considered this component, unless
-//   explicitly set otherwise.
-//
-class CrySizerComponentNameHelper
-{
-public:
-    // pushes the component name on top of the name stack of the given sizer
-    CrySizerComponentNameHelper (ICrySizer* pSizer, const char* szComponentName, bool bSubcomponent)
-        : m_pSizer(pSizer)
-    {
-        if (bSubcomponent)
-        {
-            pSizer->PushSubcomponent (szComponentName);
-        }
-        else
-        {
-            pSizer->Push (szComponentName);
-        }
-    }
-
-    // pops the component name off top of the name stack of the sizer
-    ~CrySizerComponentNameHelper()
-    {
-        m_pSizer->Pop();
-    }
-
-protected:
-    ICrySizer* m_pSizer;
-};
-
-// use this to push (and automatically pop) the sizer component name at the beginning of the
-// getSize() function
-#define SIZER_COMPONENT_NAME(pSizerPointer, szComponentName) PREFAST_SUPPRESS_WARNING(6246) CrySizerComponentNameHelper AZ_JOIN(sizerHelper, __LINE__)(pSizerPointer, szComponentName, false)
-#define SIZER_SUBCOMPONENT_NAME(pSizerPointer, szComponentName) PREFAST_SUPPRESS_WARNING(6246) CrySizerComponentNameHelper AZ_JOIN(sizerHelper, __LINE__)(pSizerPointer, szComponentName, true)
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYSIZER_H
diff --git a/Code/CryEngine/CryCommon/CryString.h b/Code/CryEngine/CryCommon/CryString.h
deleted file mode 100644
index 1a6487e373..0000000000
--- a/Code/CryEngine/CryCommon/CryString.h
+++ /dev/null
@@ -1,2522 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Custom reference counted string class.
-//               Can easily be substituted instead of string
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYSTRING_H
-#define CRYINCLUDE_CRYCOMMON_CRYSTRING_H
-#pragma once
-
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/std/hash.h>
-
-#if !defined(NOT_USE_CRY_STRING)
-
-#include <string.h>
-#include <wchar.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include "LegacyAllocator.h"
-
-#define CRY_STRING
-
-// forward declaration of CryStackString
-template<class T, size_t S>
-class CryStackStringT;
-
-
-class CConstCharWrapper;    //forward declaration for special const char * without memory allocations
-
-//extern void CryDebugStr( const char *format,... );
-//#define CRY_STRING_DEBUG(s) { if (*s) CryDebugStr( "[%6d] %s",_usedMemory(0),(s) );}
-#define CRY_STRING_DEBUG(s)
-
-class CryStringAllocator
-    : public AZ::SimpleSchemaAllocator<AZ::HphaSchema>
-{
-public:
-    AZ_TYPE_INFO(CryStringAllocator, "{763DFC83-8A6E-4FD9-B6BC-BBF56E93E4EE}");
-
-    using Base = AZ::SimpleSchemaAllocator<AZ::HphaSchema>;
-    using Descriptor = Base::Descriptor;
-
-    CryStringAllocator()
-        : Base("CryStringAllocator", "Allocator for CryString<T>")
-    {
-        Descriptor desc;
-        desc.m_systemChunkSize = 4 * 1024 * 1024;     // grow by 4 MB at a time
-        desc.m_subAllocator = &AZ::AllocatorInstance<AZ::LegacyAllocator>::Get();
-        Create(desc);
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CryStringT class.
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-class CryStringT
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Types compatible with STL string.
-    //////////////////////////////////////////////////////////////////////////
-    typedef CryStringT<T> _Self;
-    typedef size_t size_type;
-    typedef T value_type;
-    typedef const value_type* const_str;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef pointer iterator;
-    typedef const_pointer const_iterator;
-
-    enum _npos_type
-    {
-        npos = (size_type) ~0
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Constructors
-    //////////////////////////////////////////////////////////////////////////
-    CryStringT();
-
-protected:
-    CryStringT(const CConstCharWrapper& str);   //ctor for strings without memory allocations
-    friend class CConstCharWrapper;
-public:
-
-    CryStringT(const _Self& str);
-    CryStringT(const _Self& str, size_type nOff, size_type nCount);
-
-    // Before September 2012 this constructor looked like this:
-    //    explicit CryStringT( value_type ch, size_type nRepeat = 1 );
-    // It was very error-prone, because the matching constructor
-    // std::string constructor is different:
-    //    std::string( size_type nRepeat, value_type ch );
-    //
-    // To prevent hard-to-catch bugs, we removed all calls of this
-    // constructor in the existing CryEngine code (in September 2012)
-    // and started using proper order of parameters (matching std::).
-    //
-    // To catch calls using the reversed arguments in other projects,
-    // we retain the previous function with reversed arguments,
-    // and declare it private.
-    CryStringT(size_type nRepeat, value_type ch);
-private:
-    CryStringT(value_type ch, size_type nRepeat);
-
-public:
-
-    CryStringT(const_str str);
-    CryStringT(const_str str, size_type nLength);
-    CryStringT(const_iterator _First, const_iterator _Last);
-    ~CryStringT();
-
-    //////////////////////////////////////////////////////////////////////////
-    // STL string like interface.
-    //////////////////////////////////////////////////////////////////////////
-    //! Operators.
-    size_type length() const;
-    size_type size() const;
-    bool empty() const;
-    void clear();  // free up the data
-
-    //! Returns the storage currently allocated to hold the string, a value at least as large as length().
-    size_type capacity() const;
-
-    // Sets the capacity of the string to a number at least as great as a specified number.
-    // nCount = 0 is shrinking string to fit number of characters in it.
-    void reserve(size_type nCount = 0);
-
-    _Self& append(const value_type* _Ptr);
-    _Self& append(const value_type* _Ptr, size_type nCount);
-    _Self& append(const _Self& _Str, size_type nOff, size_type nCount);
-    _Self& append(const _Self& _Str);
-    _Self& append(size_type nCount, value_type _Ch);
-    _Self& append(const_iterator _First, const_iterator _Last);
-
-    _Self& assign(const_str _Ptr);
-    _Self& assign(const_str _Ptr, size_type nCount);
-    _Self& assign(const _Self& _Str, size_type off, size_type nCount);
-    _Self& assign(const _Self& _Str);
-    _Self& assign(size_type nCount, value_type _Ch);
-    _Self& assign(const_iterator _First, const_iterator _Last);
-
-    value_type at(size_type index) const;
-
-    const_iterator begin() const { return m_str; };
-    const_iterator end() const { return m_str + length(); };
-
-    iterator begin() { return m_str; };
-    iterator end() { return m_str + length(); };
-
-    // Following functions are commented out because they provide direct write access to
-    // the string and such access doesn't work properly with our current reference-count
-    // implementation.
-    // If you really need write access to your string's elements, please consider
-    // using CryStackStringT<> instead of CryString<>. Alternatively, you can modify
-    // your string by multiple calls of erase() and append().
-    // Note: If you need *linear memory read* access to your string's elements, use data()
-    // or c_str(). If you need *linear memory write* access to your string's elements,
-    // use a non-string class (std::vector<>, DynArray<>, etc.) instead of CryString<>.
-    //value_type& at( size_type index );
-    //iterator begin() { return m_str; };
-    //iterator end() { return m_str+length(); };
-
-    //! cast to C string operator.
-    operator const_str() const {
-        return m_str;
-    }
-
-    //! cast to C string.
-    const value_type* c_str() const { return m_str; }
-    const value_type* data() const { return m_str; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // string comparison.
-    //////////////////////////////////////////////////////////////////////////
-    int compare(const _Self& _Str) const;
-    int compare(size_type _Pos1, size_type _Num1, const _Self& _Str) const;
-    int compare(size_type _Pos1, size_type _Num1, const _Self& _Str, size_type nOff, size_type nCount) const;
-    int compare(const char* _Ptr) const;
-    int compare(const wchar_t* _Ptr) const;
-    int compare(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2 = npos) const;
-
-    // Case insensitive comparison
-    int compareNoCase(const _Self& _Str) const;
-    int compareNoCase(size_type _Pos1, size_type _Num1, const _Self& _Str) const;
-    int compareNoCase(size_type _Pos1, size_type _Num1, const _Self& _Str, size_type nOff, size_type nCount) const;
-    int compareNoCase(const value_type* _Ptr) const;
-    int compareNoCase(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2 = npos) const;
-
-    // Copies at most a specified number of characters from an indexed position in a source string to a target character array.
-    size_type copy(value_type* _Ptr, size_type nCount, size_type nOff = 0) const;
-
-    void push_back(value_type _Ch) { _ConcatenateInPlace(&_Ch, 1); }
-    void resize(size_type nCount, value_type _Ch = ' ');
-
-    //! simple sub-string extraction
-    _Self substr(size_type pos, size_type count = npos) const;
-
-    // replace part of string.
-    _Self& replace(value_type chOld, value_type chNew);
-    _Self& replace(const_str strOld, const_str strNew);
-    _Self& replace(size_type pos, size_type count, const_str strNew);
-    _Self& replace(size_type pos, size_type count, const_str strNew, size_type count2);
-    _Self& replace(size_type pos, size_type count, size_type nNumChars, value_type chNew);
-
-    // insert new elements to string.
-    _Self& insert(size_type nIndex, value_type ch);
-    _Self& insert(size_type nIndex, size_type nCount, value_type ch);
-    _Self& insert(size_type nIndex, const_str pstr);
-    _Self& insert(size_type nIndex, const_str pstr, size_type nCount);
-
-    //! delete count characters starting at zero-based index
-    _Self& erase(size_type nIndex, size_type count = npos);
-
-    //! searching (return starting index, or -1 if not found)
-    //! look for a single character match
-    //! like "C" strchr
-    size_type find(value_type ch, size_type pos = 0) const;
-    //! look for a specific sub-string
-    //! like "C" strstr
-    size_type find(const_str subs, size_type pos = 0) const;
-    size_type rfind(value_type ch, size_type pos = npos) const;
-    size_type rfind(const _Self& subs, size_type pos = 0) const;
-
-    size_type find_first_of(value_type _Ch, size_type nOff = 0) const;
-    size_type find_first_of(const_str charSet, size_type nOff = 0) const;
-    //size_type find_first_of( const value_type* _Ptr,size_type _Off,size_type _Count ) const;
-    size_type find_first_of(const _Self& _Str, size_type _Off = 0) const;
-
-    size_type find_first_not_of(value_type _Ch, size_type _Off = 0) const;
-    size_type find_first_not_of(const value_type* _Ptr, size_type _Off = 0) const;
-    size_type find_first_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const;
-    size_type find_first_not_of(const _Self& _Str, size_type _Off = 0) const;
-
-    size_type find_last_of(value_type _Ch, size_type _Off = npos) const;
-    size_type find_last_of(const value_type* _Ptr, size_type _Off = npos) const;
-    size_type find_last_of(const value_type* _Ptr, size_type _Off, size_type _Count) const;
-    size_type find_last_of(const _Self& _Str, size_type _Off = npos) const;
-
-    size_type find_last_not_of(value_type _Ch, size_type _Off = npos) const;
-    size_type find_last_not_of(const value_type* _Ptr, size_type _Off = npos) const;
-    size_type find_last_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const;
-    size_type find_last_not_of(const _Self& _Str, size_type _Off = npos) const;
-
-
-    void swap(_Self& _Str);
-
-    //////////////////////////////////////////////////////////////////////////
-    // overloaded operators.
-    //////////////////////////////////////////////////////////////////////////
-    // overloaded indexing.
-    //value_type operator[]( size_type index ) const; // same as at()
-    //  value_type& operator[]( size_type index ); // same as at()
-
-    // overloaded assignment
-    _Self& operator=(const _Self& str);
-    _Self& operator=(value_type ch);
-    _Self& operator=(const_str str);
-
-    template<size_t AnySize>
-    CryStringT(const CryStackStringT<T, AnySize>& str);
-
-protected:
-    // we prohibit an implicit conversion from CryStackString to make user aware of allocation!
-    // -> use string(stackedString) instead
-    // as the private statement seems to be ignored (VS C++), we add a compile time error, see below
-    template<size_t AnySize>
-    _Self& operator=(const CryStackStringT<T, AnySize>& str)
-    {
-        // we add a compile-time error as the Visual C++ compiler seems to ignore the private statement?
-#if defined(__clang__)
-        //CLANG_TODO: clang verifies things differently
-#else
-        static_assert(false, "Use explicit string assignment when assigning from_StackString");
-#endif
-        // not reached, as above will generate a compile time error
-        _Assign(str.c_str(), str.length());
-        return *this;
-    }
-
-public:
-    // string concatenation
-    _Self& operator+=(const _Self& str);
-    _Self& operator+=(value_type ch);
-    _Self& operator+=(const_str str);
-
-    //template <class TT> friend CryStringT<TT> operator+( const CryStringT<TT>& str1, const CryStringT<TT>& str2 );
-    //template <class TT> friend CryStringT<TT> operator+( const CryStringT<TT>& str, value_type ch );
-    //template <class TT> friend CryStringT<TT> operator+( value_type ch, const CryStringT<TT>& str );
-    //template <class TT> friend CryStringT<TT> operator+( const CryStringT<TT>& str1, const_str str2 );
-    //template <class TT> friend CryStringT<TT> operator+( const_str str1, const CryStringT<TT>& str2 );
-
-    size_t GetAllocatedMemory() const
-    {
-        StrHeader* header = _header();
-        if (header == _emptyHeader())
-        {
-            return 0;
-        }
-        return sizeof(StrHeader) + (header->nAllocSize + 1) * sizeof(value_type);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Extended functions.
-    // This functions are not in the STL string.
-    // They have an ATL CString interface.
-    //////////////////////////////////////////////////////////////////////////
-    //! Format string, use (sprintf)
-    _Self& Format(const value_type* format, ...);
-
-    //! Converts the string to lower-case
-    //  This function uses the "C" locale for case-conversion (ie, A-Z only)
-    _Self& MakeLower();
-
-    //! Converts the string to upper-case
-    //  This function uses the "C" locale for case-conversion (ie, A-Z only)
-    _Self& MakeUpper();
-
-    _Self& Trim();
-    _Self& Trim(value_type ch);
-    _Self& Trim(const value_type* sCharSet);
-
-    _Self& TrimLeft();
-    _Self& TrimLeft(value_type ch);
-    _Self& TrimLeft(const value_type* sCharSet);
-
-    _Self& TrimRight();
-    _Self& TrimRight(value_type ch);
-    _Self& TrimRight(const value_type* sCharSet);
-
-    _Self SpanIncluding(const_str charSet) const;
-    _Self SpanExcluding(const_str charSet) const;
-    _Self Tokenize(const_str charSet, int& nStart) const;
-    _Self Mid(size_type nFirst, size_type nCount = npos) const {  return substr(nFirst, nCount); };
-
-    _Self Left(size_type count) const;
-    _Self Right(size_type count) const;
-    //////////////////////////////////////////////////////////////////////////
-
-    // public utilities.
-    static size_type _strlen(const_str str);
-    static size_type _strnlen(const_str str, size_type maxLen);
-    static const_str _strchr(const_str str, value_type c);
-    static const_str _strrchr(const_str str, value_type c);
-    static value_type* _strstr(value_type* str, const_str strSearch);
-    static bool _IsValidString(const_str str);
-
-#if defined(WIN32) || defined(WIN64)
-    static int _vscpf(const_str format, va_list args);
-#endif
-    static int _vsnpf(value_type* buf, int cnt, const_str format, va_list args);
-
-
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Only used for debugging statistics.
-    //////////////////////////////////////////////////////////////////////////
-    static size_t _usedMemory(ptrdiff_t size)
-    {
-        static size_t s_used_memory = 0;
-        s_used_memory += size;
-        return s_used_memory;
-    }
-
-protected:
-    value_type* m_str; // pointer to ref counted string data
-
-    // String header. Immediately after this header in memory starts actual string data.
-    struct StrHeader
-    {
-        int nRefCount;
-        int nLength;
-        int nAllocSize;     // Size of memory allocated at the end of this class.
-
-        value_type* GetChars() { return (value_type*)(this + 1); }
-        void  AddRef() { nRefCount++; /*InterlockedIncrement(&_header()->nRefCount);*/};
-        int   Release() { return --nRefCount; };
-    };
-    static StrHeader* _emptyHeader()
-    {
-        // Define 2 static buffers in a row. The 2nd is a dummy object to hold a single empty char string.
-        static StrHeader sEmptyStringBuffer[2] = {
-            {-1, 0, 0}, {0, 0, 0}
-        };
-        return &sEmptyStringBuffer[0];
-    }
-
-    // implementation helpers
-    StrHeader* _header() const;
-
-    void _AllocData(size_type nLen);
-    static void _FreeData(StrHeader* pData);
-    void _Free();
-    void _Initialize();
-
-    void _Concatenate(const_str sStr1, size_type nLen1, const_str sStr2, size_type nLen2);
-    void _ConcatenateInPlace(const_str sStr, size_type nLen);
-    void _Assign(const_str sStr, size_type nLen);
-    void _MakeUnique();
-
-    static void _copy(value_type* dest, const value_type* src, size_type count);
-    static void _move(value_type* dest, const value_type* src, size_type count);
-    static void _set(value_type* dest, value_type ch, size_type count);
-};
-
-// Variant of CryStringT<T> which does not share memory with other strings.
-template<class T>
-class CryStringLocalT
-    : public CryStringT<T>
-{
-public:
-    typedef CryStringT<T> BaseType;
-    typedef typename BaseType::const_str const_str;
-    typedef typename BaseType::value_type value_type;
-    typedef typename BaseType::size_type size_type;
-    typedef typename BaseType::iterator iterator;
-
-    CryStringLocalT()
-    {}
-    CryStringLocalT(const CryStringLocalT& str)
-        : BaseType(str.c_str())
-    {}
-    CryStringLocalT(const BaseType& str)
-        : BaseType(str.c_str())
-    {}
-    template<size_t Size>
-    CryStringLocalT(const CryStackStringT<T, Size>& str)
-        : BaseType(str.c_str())
-    {}
-    CryStringLocalT(const_str str)
-        : BaseType(str)
-    {}
-    CryStringLocalT(const_str str, size_t len)
-        : BaseType(str, len)
-    {}
-    CryStringLocalT(const_str begin, const_str end)
-        : BaseType(begin, end)
-    {}
-    CryStringLocalT(size_type nRepeat, value_type ch)
-        : BaseType(nRepeat, ch)
-    {}
-
-    CryStringLocalT(const typename CryStringT<T>::_Self& str, size_type nOff, size_type nCount)
-        : BaseType(str, nOff, nCount)
-    {}
-
-    CryStringLocalT& operator=(const BaseType& str)
-    {
-        BaseType::operator=(str.c_str());
-        return *this;
-    }
-    CryStringLocalT& operator=(const CryStringLocalT& str)
-    {
-        BaseType::operator=(str.c_str());
-        return *this;
-    }
-    CryStringLocalT& operator=(const_str str)
-    {
-        BaseType::operator=(str);
-        return *this;
-    }
-    iterator begin() { return BaseType::m_str; }
-    using BaseType::begin; // const version
-    iterator end() { return BaseType::m_str + BaseType::length(); }
-    using BaseType::end; // const version
-};
-
-typedef CryStringLocalT<char> CryStringLocal;
-
-
-// wrapper class for creation of strings without memory allocation
-// it creates a string with pointer pointing to const char* location
-// destructor sets the string to empty
-// NOTE: never copy a string from it, just use it as function parameters instead of const char* itself
-class CConstCharWrapper
-{
-public:
-    //passing *this is safe since the char pointer is already set and therefore is the this-ptr constructed complete enough
-#pragma warning (push)
-#pragma warning (disable : 4355)
-    CConstCharWrapper(const char* const cpString)
-        : cpChar(cpString)
-        , str(*this){AZ_Assert(cpString, "c-string parameter cannot be nullptr"); } //create stack string
-#pragma warning (pop)
-    ~CConstCharWrapper(){str.m_str = CryStringT<char>::_emptyHeader()->GetChars(); }//reset string
-    operator const CryStringT<char>&() const {
-        return str;
-    }                                                     //cast operator to const string reference
-private:
-    const char* const cpChar;
-    CryStringT<char> str;
-
-    char* GetCharPointer() const {return const_cast<char*>(cpChar); }    //access function for string ctor
-
-    friend class CryStringT<char>;  //both are bidirectional friends to avoid any other accesses
-};
-
-
-//macro needed because compiler somehow cannot find the cast operator when not invoked directly
-#define CONST_TEMP_STRING(a) ((const string&)CConstCharWrapper(a))
-
-/////////////////////////////////////////////////////////////////////////////
-// CryStringT<T> Implementation
-//////////////////////////////////////////////////////////////////////////
-
-template <class T>
-inline typename CryStringT<T>::StrHeader * CryStringT<T>::_header() const
-{
-    AZ_Assert(m_str != nullptr, "string header is nullptr");
-    return ((StrHeader*)m_str) - 1;
-}
-
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::_strlen(const_str str)
-{
-    return (str == NULL) ? 0 : (size_type)::strlen(str);
-}
-
-template <>
-inline CryStringT<wchar_t>::size_type CryStringT<wchar_t>::_strlen(const_str str)
-{
-    return (str == NULL) ? 0 : (size_type)::wcslen(str);
-}
-
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::_strnlen(const_str str, size_type maxLen)
-{
-    size_type len = 0;
-    if (str)
-    {
-        while (len < maxLen && *str != '\0')
-        {
-            len++;
-            str++;
-        }
-    }
-    return len;
-}
-
-template <class T>
-inline typename CryStringT<T>::const_str CryStringT<T>::_strchr(const_str str, value_type c)
-{
-    return (str == NULL) ? 0 : ::strchr(str, c);
-}
-
-template <>
-inline CryStringT<wchar_t>::const_str CryStringT<wchar_t>::_strchr(const_str str, value_type c)
-{
-    return (str == NULL) ? 0 : ::wcschr(str, c);
-}
-
-template <class T>
-inline typename CryStringT<T>::const_str CryStringT<T>::_strrchr(const_str str, value_type c)
-{
-    return (str == NULL) ? 0 : ::strrchr(str, c);
-}
-
-template <>
-inline CryStringT<wchar_t>::const_str CryStringT<wchar_t>::_strrchr(const_str str, value_type c)
-{
-    return (str == NULL) ? 0 : ::wcsrchr(str, c);
-}
-
-template <class T>
-inline typename CryStringT<T>::value_type * CryStringT<T>::_strstr(value_type * str, const_str strSearch)
-{
-    return (str == NULL) ? 0 : (value_type*)::strstr(str, strSearch);
-}
-
-template <>
-inline CryStringT<wchar_t>::value_type * CryStringT<wchar_t>::_strstr(value_type * str, const_str strSearch)
-{
-    return (str == NULL) ? 0 : ::wcsstr(str, strSearch);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_copy(value_type* dest, const value_type* src, size_type count)
-{
-    if (dest != src)
-    {
-        memcpy(dest, src, count * sizeof(value_type));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_move(value_type* dest, const value_type* src, size_type count)
-{
-    memmove(dest, src, count * sizeof(value_type));
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_set(value_type* dest, value_type ch, size_type count)
-{
-    static_assert(sizeof(value_type) == sizeof(T));
-    static_assert(sizeof(value_type) == 1);
-    memset(dest, ch, count);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <>
-inline void CryStringT<wchar_t>::_set(value_type* dest, value_type ch, size_type count)
-{
-    static_assert(sizeof(value_type) == sizeof(wchar_t));
-    wmemset(dest, ch, count);
-}
-
-#if defined(WIN32) || defined(WIN64)
-
-template<>
-inline int CryStringT<char>::_vscpf(const_str format, va_list args)
-{
-    return _vscprintf(format, args);
-}
-
-template<>
-inline int CryStringT<wchar_t>::_vscpf(const_str format, va_list args)
-{
-    return _vscwprintf(format, args);
-}
-
-template<>
-inline int CryStringT<char>::_vsnpf(value_type* buf, int cnt, const_str format, va_list args)
-{
-    return azvsnprintf(buf, cnt, format, args);
-}
-
-template<>
-inline int CryStringT<wchar_t>::_vsnpf(value_type* buf, int cnt, const_str format, va_list args)
-{
-    return azvsnwprintf(buf, cnt, format, args);
-}
-
-#else
-
-template<>
-inline int CryStringT<char>::_vsnpf(value_type* buf, int cnt, const_str format, va_list args)
-{
-    return vsnprintf(buf, cnt, format, args);
-}
-
-template<>
-inline int CryStringT<wchar_t>::_vsnpf(value_type* buf, int cnt, const_str format, va_list args)
-{
-    return vswprintf(buf, cnt, format, args);
-}
-
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline bool CryStringT<T>::_IsValidString(const_str)
-{
-    /*
-    if (str == NULL)
-        return false;
-    int nLength = _strlen(str);
-    return !::IsBadStringPtrA(str, nLength);
-    */
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_Assign(const_str sStr, size_type nLen)
-{
-    // Check if this string is shared (reference count greater then 1) or not enough capacity to store new string.
-    // Then allocate new string buffer.
-    if (_header()->nRefCount > 1 || nLen > capacity())
-    {
-        _Free();
-        _AllocData(nLen);
-    }
-    // Copy characters from new string to this buffer.
-    _copy(m_str, sStr, nLen);
-    // Set new length.
-    _header()->nLength = aznumeric_cast<int>(nLen);
-    // Make null terminated string.
-    m_str[nLen] = 0;
-    CRY_STRING_DEBUG(m_str)
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_Concatenate(const_str sStr1, size_type nLen1, const_str sStr2, size_type nLen2)
-{
-    size_type nLen = nLen1 + nLen2;
-
-    if (nLen1 * 2 > nLen)
-    {
-        nLen = nLen1 * 2;
-    }
-
-    if (nLen != 0)
-    {
-        if (nLen < 8)
-        {
-            nLen = 8;
-        }
-
-        _AllocData(nLen);
-        _copy(m_str, sStr1, nLen1);
-        _copy(m_str + nLen1, sStr2, nLen2);
-        _header()->nLength = aznumeric_cast<int>(nLen1 + nLen2);
-        m_str[nLen1 + nLen2] = 0;
-    }
-    CRY_STRING_DEBUG(m_str)
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_ConcatenateInPlace(const_str sStr, size_type nLen)
-{
-    if (nLen != 0)
-    {
-        // Check if this string is shared (reference count greater then 1) or not enough capacity to store new string.
-        // Then allocate new string buffer.
-        if (_header()->nRefCount > 1 || length() + nLen > capacity())
-        {
-            StrHeader* pOldData = _header();
-            _Concatenate(m_str, length(), sStr, nLen);
-            _FreeData(pOldData);
-        }
-        else
-        {
-            _copy(m_str + length(), sStr, nLen);
-            _header()->nLength = aznumeric_cast<int>(_header()->nLength + nLen);
-            m_str[_header()->nLength] = 0; // Make null terminated string.
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_MakeUnique()
-{
-    if (_header()->nRefCount > 1)
-    {
-        // If string is shared, make a copy of string buffer.
-        StrHeader* pOldData = _header();
-        // This will not free header because reference count is greater then 1.
-        _Free();
-        // Allocate a new string buffer.
-        _AllocData(pOldData->nLength);
-        // Full copy of null terminated string.
-        _copy(m_str, pOldData->GetChars(), pOldData->nLength + 1);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_Initialize()
-{
-    m_str = _emptyHeader()->GetChars();
-}
-
-// always allocate one extra character for '\0' termination
-// assumes [optimistically] that data length will equal allocation length
-template <class T>
-inline void CryStringT<T>::_AllocData(size_type nLen)
-{
-    AZ_Assert(nLen <= (std::numeric_limits<int>::max)() - 1, "New string allocation size %zu is greater than the max allowed size of %d",
-        nLen, (std::numeric_limits<int>::max)() - 1);    // max size (enough room for 1 extra)
-
-    if (nLen == 0)
-    {
-        _Initialize();
-    }
-    else
-    {
-        size_type allocLen = sizeof(StrHeader) + (nLen + 1) * sizeof(value_type);
-
-        StrHeader* pData = (StrHeader*)azmalloc(allocLen, 32, CryStringAllocator);
-
-        _usedMemory(allocLen);   // For statistics.
-        pData->nRefCount = 1;
-        m_str = pData->GetChars();
-        pData->nLength = aznumeric_cast<int>(nLen);
-        pData->nAllocSize = aznumeric_cast<int>(nLen);
-        m_str[nLen] = 0; // null terminated string.
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_Free()
-{
-    if (_header()->nRefCount >= 0) // Not empty string.
-    {
-        _FreeData(_header());
-        _Initialize();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::_FreeData(StrHeader* pData)
-{
-    //Cry uses -1 to represent strings on the stack. 
-    if (pData->nRefCount < 0)
-    {
-        return;
-    }
-
-    if (pData->nRefCount == 0 || pData->Release() <= 0)
-    {
-        azfree((void*)pData, CryStringAllocator);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>::CryStringT()
-{
-    _Initialize();
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>::CryStringT(const CryStringT<T>& str)
-{
-    AZ_Assert(str._header()->nRefCount != 0, "Reference count input cry string should be greater than 0");
-    if (str._header()->nRefCount >= 0)
-    {
-        m_str = str.m_str;
-        _header()->AddRef();
-    }
-    else
-    {
-        _Initialize();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>::CryStringT(const CryStringT<T>& str, size_type nOff, size_type nCount)
-{
-    _Initialize();
-    assign(str, nOff, nCount);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>::CryStringT(const_str str)
-{
-    _Initialize();
-    // Make a copy of C string.
-    size_type nLen = _strlen(str);
-    if (nLen != 0)
-    {
-        _AllocData(nLen);
-        _copy(m_str, str, nLen);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-template <class T>
-inline CryStringT<T>::CryStringT(const CConstCharWrapper& str)
-{
-    _Initialize();
-    m_str = const_cast<pointer>(str.GetCharPointer());
-}
-
-template<class T>
-template<size_t AnySize>
-inline CryStringT<T>::CryStringT(const CryStackStringT<T, AnySize>& str)
-{
-    _Initialize();
-    const size_type nLength = str.length();
-    if (nLength > 0)
-    {
-        _AllocData(nLength);
-        _copy(m_str, str, nLength);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>::CryStringT(const_str str, size_type nLength)
-{
-    _Initialize();
-    if (nLength > 0)
-    {
-        _AllocData(nLength);
-        _copy(m_str, str, nLength);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>::CryStringT(size_type nRepeat, value_type ch)
-{
-    _Initialize();
-    if (nRepeat > 0)
-    {
-        _AllocData(nRepeat);
-        _set(m_str, ch, nRepeat);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>::CryStringT(const_iterator _First, const_iterator _Last)
-{
-    _Initialize();
-    size_type nLength = (size_type)(_Last - _First);
-    if (nLength > 0)
-    {
-        _AllocData(nLength);
-        _copy(m_str, _First, nLength);
-        CRY_STRING_DEBUG(m_str)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>::~CryStringT()
-{
-    _FreeData(_header());
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::length() const
-{
-    return _header()->nLength;
-}
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::size() const
-{
-    return _header()->nLength;
-}
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::capacity() const
-{
-    return _header()->nAllocSize;
-}
-
-template <class T>
-inline bool CryStringT<T>::empty() const
-{
-    return length() == 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::clear()
-{
-    if (length() == 0)
-    {
-        return;
-    }
-    if (_header()->nRefCount >= 0)
-    {
-        _Free();
-    }
-    else
-    {
-        resize(0);
-    }
-    AZ_Assert(length() == 0, "Cleared string should have a length of 0");
-    AZ_Assert(_header()->nRefCount < 0 || capacity() == 0,
-        "Cleared string should have a reference count or capacity of 0");
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::reserve(size_type nCount)
-{
-    // Reserve of 0 is shrinking container to fit number of characters in it..
-    if (nCount > capacity())
-    {
-        StrHeader* pOldData = _header();
-        _AllocData(nCount);
-        _copy(m_str, pOldData->GetChars(), pOldData->nLength);
-        _header()->nLength = pOldData->nLength;
-        m_str[pOldData->nLength] = 0;
-        _FreeData(pOldData);
-    }
-    else if (nCount == 0)
-    {
-        if (length() != capacity())
-        {
-            StrHeader* pOldData = _header();
-            _AllocData(length());
-            _copy(m_str, pOldData->GetChars(), pOldData->nLength);
-            _FreeData(pOldData);
-        }
-    }
-    CRY_STRING_DEBUG(m_str)
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::append(const_str _Ptr)
-{
-    *this += _Ptr;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::append(const_str _Ptr, size_type nCount)
-{
-    _ConcatenateInPlace(_Ptr, nCount);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::append(const CryStringT<T>& _Str, size_type off, size_type nCount)
-{
-    size_type len = _Str.length();
-    if (off > len)
-    {
-        return *this;
-    }
-    if (off + nCount > len)
-    {
-        nCount = len - off;
-    }
-    _ConcatenateInPlace(_Str.m_str + off, nCount);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::append(const CryStringT<T>& _Str)
-{
-    *this += _Str;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::append(size_type nCount, value_type _Ch)
-{
-    if (nCount > 0)
-    {
-        if (_header()->nRefCount > 1 || length() + nCount > capacity())
-        {
-            StrHeader* pOldData = _header();
-            _AllocData(length() + nCount);
-            _copy(m_str, pOldData->GetChars(), pOldData->nLength);
-            _set(m_str + pOldData->nLength, _Ch, nCount);
-            _FreeData(pOldData);
-        }
-        else
-        {
-            size_type nOldLength = length();
-            _set(m_str + nOldLength, _Ch, nCount);
-            _header()->nLength = aznumeric_cast<int>(nOldLength + nCount);
-            m_str[length()] = 0; // Make null terminated string.
-        }
-    }
-    CRY_STRING_DEBUG(m_str)
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::append(const_iterator _First, const_iterator _Last)
-{
-    append(_First, (size_type)(_Last - _First));
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::assign(const_str _Ptr)
-{
-    *this = _Ptr;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::assign(const_str _Ptr, size_type nCount)
-{
-    size_type len = _strnlen(_Ptr, nCount);
-    _Assign(_Ptr, len);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::assign(const CryStringT<T>& _Str, size_type off, size_type nCount)
-{
-    size_type len = _Str.length();
-    if (off > len)
-    {
-        return *this;
-    }
-    if (off + nCount > len)
-    {
-        nCount = len - off;
-    }
-    _Assign(_Str.m_str + off, nCount);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::assign(const CryStringT<T>& _Str)
-{
-    *this = _Str;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::assign(size_type nCount, value_type _Ch)
-{
-    if (nCount >= 1)
-    {
-        _AllocData(nCount);
-        _set(m_str, _Ch, nCount);
-        CRY_STRING_DEBUG(m_str)
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::assign(const_iterator _First, const_iterator _Last)
-{
-    assign(_First, (size_type)(_Last - _First));
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::value_type CryStringT<T>::at(size_type index) const
-{
-    AZ_Assert(index >= 0 && index < length(), "index into CryString is out of range");
-    return m_str[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline int CryStringT<T>::compare(const CryStringT<T>& _Str) const
-{
-    return compare(_Str.m_str);
-}
-
-template <class T>
-inline int CryStringT<T>::compare(size_type _Pos1, size_type _Num1, const CryStringT<T>& _Str) const
-{
-    return compare(_Pos1, _Num1, _Str.m_str, npos);
-}
-
-template <class T>
-inline int CryStringT<T>::compare(size_type _Pos1, size_type _Num1, const CryStringT<T>& _Str, size_type nOff, size_type nCount) const
-{
-    AZ_Assert(nOff < _Str.length(), "Offset into input string is larger than the index range");
-    return compare(_Pos1, _Num1, _Str.m_str + nOff, nCount);
-}
-
-template <class T>
-inline int CryStringT<T>::compare(const char* _Ptr) const
-{
-    return strcmp(m_str, _Ptr);
-}
-
-template <class T>
-inline int CryStringT<T>::compare(const wchar_t* _Ptr) const
-{
-    return wcscmp(m_str, _Ptr);
-}
-
-template <class T>
-inline int CryStringT<T>::compare(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2) const
-{
-    AZ_Assert(_Pos1 < length(), "position index to compare is larger than the length of this string");
-    if (length() - _Pos1 < _Num1)
-    {
-        _Num1 = length() - _Pos1; // trim to size
-    }
-    int res = _Num1 == 0 ? 0 : strncmp(m_str + _Pos1, _Ptr, (_Num1 < _Num2) ? _Num1 : _Num2);
-    return (res != 0 ? res : _Num2 == npos && _Ptr[_Num1] == 0 ? 0 : _Num1 < _Num2 ? -1 : _Num1 == _Num2 ? 0 : +1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline int CryStringT<T>::compareNoCase(const CryStringT<T>& _Str) const
-{
-    return _stricmp(m_str, _Str.m_str);
-}
-
-template <class T>
-inline int CryStringT<T>::compareNoCase(size_type _Pos1, size_type _Num1, const CryStringT<T>& _Str) const
-{
-    return compareNoCase(_Pos1, _Num1, _Str.m_str, npos);
-}
-
-template <class T>
-inline int CryStringT<T>::compareNoCase(size_type _Pos1, size_type _Num1, const CryStringT<T>& _Str, size_type nOff, size_type nCount) const
-{
-    AZ_Assert(nOff < _Str.length(), "offset to start comparison within input string is larger than the string index range");
-    return compareNoCase(_Pos1, _Num1, _Str.m_str + nOff, nCount);
-}
-
-template <class T>
-inline int CryStringT<T>::compareNoCase(const value_type* _Ptr) const
-{
-    return _stricmp(m_str, _Ptr);
-}
-
-template <class T>
-inline int CryStringT<T>::compareNoCase(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2) const
-{
-    AZ_Assert(_Pos1 < length(), "Position to start case-insensitive search is larger the indexable range");
-    if (length() - _Pos1 < _Num1)
-    {
-        _Num1 = length() - _Pos1; // trim to size
-    }
-    int res = _Num1 == 0 ? 0 : _strnicmp(m_str + _Pos1, _Ptr, (_Num1 < _Num2) ? _Num1 : _Num2);
-    return (res != 0 ? res : _Num2 == npos && _Ptr[_Num1] == 0 ? 0 : _Num1 < _Num2 ? -1 : _Num1 == _Num2 ? 0 : +1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::copy(value_type* _Ptr, size_type nCount, size_type nOff) const
-{
-    AZ_Assert(nOff < length(), "Offset to copy from string to output address is outside the indexable range");
-    if (nCount < 0)
-    {
-        nCount = 0;
-    }
-    if (nOff + nCount > length()) // trim to offset.
-    {
-        nCount = length() - nOff;
-    }
-
-    _copy(_Ptr, m_str + nOff, nCount);
-    return nCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::resize(size_type nCount, value_type _Ch)
-{
-    _MakeUnique();
-    if (nCount > length())
-    {
-        size_type numToAdd = nCount - length();
-        append(numToAdd, _Ch);
-    }
-    else if (nCount < length())
-    {
-        _header()->nLength = nCount;
-        m_str[length()] = 0; // Make null terminated string.
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-//! compare helpers
-template <class T>
-inline bool operator==(const CryStringT<T>& s1, const CryStringT<T>& s2)
-{ return s1.compare(s2) == 0; }
-template <class T>
-inline bool operator==(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
-{ return s1.compare(s2) == 0; }
-template <class T>
-inline bool operator==(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
-{ return s2.compare(s1) == 0; }
-template <class T>
-inline bool operator!=(const CryStringT<T>& s1, const CryStringT<T>& s2)
-{ return s1.compare(s2) != 0; }
-template <class T>
-inline bool operator!=(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
-{ return s1.compare(s2) != 0; }
-template <class T>
-inline bool operator!=(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
-{ return s2.compare(s1) != 0; }
-template <class T>
-inline bool operator<(const CryStringT<T>& s1, const CryStringT<T>& s2)
-{ return s1.compare(s2) < 0; }
-template <class T>
-inline bool operator<(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
-{ return s1.compare(s2) < 0; }
-template <class T>
-inline bool operator<(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
-{ return s2.compare(s1) > 0; }
-template <class T>
-inline bool operator>(const CryStringT<T>& s1, const CryStringT<T>& s2)
-{ return s1.compare(s2) > 0; }
-template <class T>
-inline bool operator>(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
-{ return s1.compare(s2) > 0; }
-template <class T>
-inline bool operator>(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
-{ return s2.compare(s1) < 0; }
-template <class T>
-inline bool operator<=(const CryStringT<T>& s1, const CryStringT<T>& s2)
-{ return s1.compare(s2) <= 0; }
-template <class T>
-inline bool operator<=(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
-{ return s1.compare(s2) <= 0; }
-template <class T>
-inline bool operator<=(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
-{ return s2.compare(s1) >= 0; }
-template <class T>
-inline bool operator>=(const CryStringT<T>& s1, const CryStringT<T>& s2)
-{ return s1.compare(s2) >= 0; }
-template <class T>
-inline bool operator>=(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
-{ return s1.compare(s2) >= 0; }
-template <class T>
-inline bool operator>=(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
-{ return s2.compare(s1) <= 0; }
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::operator=(value_type ch)
-{
-    _Assign(&ch, 1);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T> operator+(const CryStringT<T>& string1, typename CryStringT<T>::value_type ch)
-{
-    CryStringT<T> s(string1);
-    s.append(1, ch);
-    return s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T> operator+(typename CryStringT<T>::value_type ch, const CryStringT<T>& str)
-{
-    CryStringT<T> s;
-    s.reserve(str.size() + 1);
-    s.append(1, ch);
-    s.append(str);
-    return s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T> operator+(const CryStringT<T>& string1, const CryStringT<T>& string2)
-{
-    CryStringT<T> s(string1);
-    s.append(string2);
-    return s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T> operator+(const CryStringT<T>& str1, const typename CryStringT<T>::value_type* str2)
-{
-    CryStringT<T> s(str1);
-    s.append(str2);
-    return s;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T> operator+(const typename CryStringT<T>::value_type* str1, const CryStringT<T>& str2)
-{
-    AZ_Assert(str1 == nullptr || CryStringT<T>::_IsValidString(str1), "Input string is not valid");
-    CryStringT<T> s;
-    s.reserve(CryStringT<T>::_strlen(str1) + str2.size());
-    s.append(str1);
-    s.append(str2);
-    return s;
-}
-
-template <class T>
-inline CryStringT<T>& CryStringT<T>::operator=(const CryStringT<T>& str)
-{
-    if (m_str != str.m_str)
-    {
-        if (_header()->nRefCount < 0)
-        {
-            // Empty string.
-            //          _Assign( str.m_str,str.length() );
-            if (str._header()->nRefCount < 0)
-            {
-                ; // two empty strings...
-            }
-            else
-            {
-                m_str = str.m_str;
-                _header()->AddRef();
-            }
-        }
-        else if (str._header()->nRefCount < 0)
-        {
-            // If source string is empty.
-            _Free();
-            m_str = str.m_str;
-        }
-        else
-        {
-            // Copy string reference.
-            _Free();
-            m_str = str.m_str;
-            _header()->AddRef();
-        }
-    }
-    return *this;
-}
-
-template <class T>
-inline CryStringT<T>& CryStringT<T>::operator=(const_str str)
-{
-    AZ_Assert(str == nullptr || _IsValidString(str), "Input string is not valid");
-    _Assign(str, _strlen(str));
-    return *this;
-}
-
-template <class T>
-inline CryStringT<T>& CryStringT<T>::operator+=(const_str str)
-{
-    AZ_Assert(str == nullptr || _IsValidString(str), "Input string is not valid");
-    _ConcatenateInPlace(str, _strlen(str));
-    return *this;
-}
-
-template <class T>
-inline CryStringT<T>& CryStringT<T>::operator+=(value_type ch)
-{
-    _ConcatenateInPlace(&ch, 1);
-    return *this;
-}
-
-template <class T>
-inline CryStringT<T>& CryStringT<T>::operator+=(const CryStringT<T>& str)
-{
-    _ConcatenateInPlace(str.m_str, str.length());
-    return *this;
-}
-
-//! find first single character
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find(value_type ch, size_type pos) const
-{
-    if (!(pos >= 0 && pos <= length()))
-    {
-        return (typename CryStringT<T>::size_type)npos;
-    }
-    const_str str = _strchr(m_str + pos, ch);
-    // return npos if not found and index otherwise
-    return (str == NULL) ? npos : (size_type)(str - m_str);
-}
-
-//! find a sub-string (like strstr)
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find(const_str subs, size_type pos) const
-{
-    AZ_Assert(_IsValidString(subs), "Input string is not valid");
-    if (!(pos >= 0 && pos <= length()))
-    {
-        return npos;
-    }
-
-    // find first matching substring
-    const_str str = _strstr(m_str + pos, subs);
-
-    // return npos for not found, distance from beginning otherwise
-    return (str == NULL) ? npos : (size_type)(str - m_str);
-}
-
-//! find last single character
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::rfind(value_type ch, size_type pos) const
-{
-    const_str str;
-    if (pos == npos)
-    {
-        // find last single character
-        str = _strrchr(m_str, ch);
-        // return -1 if not found, distance from beginning otherwise
-        return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
-    }
-    else
-    {
-        if (pos == npos)
-        {
-            pos = length();
-        }
-        if (!(pos >= 0 && pos <= length()))
-        {
-            return npos;
-        }
-
-        value_type tmp = m_str[pos + 1];
-        m_str[pos + 1] = 0;
-        str = _strrchr(m_str, ch);
-        m_str[pos + 1] = tmp;
-    }
-    // return -1 if not found, distance from beginning otherwise
-    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
-}
-
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::rfind(const CryStringT<T>& subs, size_type pos) const
-{
-    size_type res = npos;
-    for (int i = (int)size(); i >= (int)pos; --i)
-    {
-        size_type findRes = find(subs, i);
-        if (findRes != npos)
-        {
-            res = findRes;
-            break;
-        }
-    }
-    return res;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_first_of(const CryStringT<T>& _Str, size_type _Off) const
-{
-    return find_first_of(_Str.m_str, _Off);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_first_of(value_type _Ch, size_type nOff) const
-{
-    if (!(nOff >= 0 && nOff <= length()))
-    {
-        return npos;
-    }
-    value_type charSet[2] = { _Ch, 0 };
-    const_str str = strpbrk(m_str + nOff, charSet);
-    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_first_of(const_str charSet, size_type nOff) const
-{
-    AZ_Assert(_IsValidString(charSet), "input c-string must not be nullptr");
-    if (!(nOff >= 0 && nOff <= length()))
-    {
-        return npos;
-    }
-    const_str str = strpbrk(m_str + nOff, charSet);
-    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
-}
-
-template <>
-inline CryStringT<wchar_t>::size_type CryStringT<wchar_t>::find_first_of(const_str charSet, size_type nOff) const
-{
-    AZ_Assert(_IsValidString(charSet), "input c-string must not be nullptr");
-    if (!(nOff >= 0 && nOff <= length()))
-    {
-        return npos;
-    }
-    const_str str = wcspbrk(m_str + nOff, charSet);
-    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
-}
-
-//size_type find_first_not_of(const _Self& __s, size_type __pos = 0) const
-//{ return find_first_not_of(__s._M_start, __pos, __s.size()); }
-
-//size_type find_first_not_of(const _CharT* __s, size_type __pos = 0) const
-//{ _STLP_FIX_LITERAL_BUG(__s) return find_first_not_of(__s, __pos, _Traits::length(__s)); }
-
-//size_type find_first_not_of(const _CharT* __s, size_type __pos,   size_type __n) const;
-
-//size_type find_first_not_of(_CharT __c, size_type __pos = 0) const;
-
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_first_not_of(const value_type* _Ptr, size_type _Off) const
-{ return find_first_not_of(_Ptr, _Off, _strlen(_Ptr)); }
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_first_not_of(const CryStringT<T>& _Str, size_type _Off) const
-{ return find_first_not_of(_Str.m_str, _Off); }
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_first_not_of(value_type _Ch, size_type _Off) const
-{
-    if (_Off > length())
-    {
-        return npos;
-    }
-    else
-    {
-        for (const value_type* str = begin() + _Off; str != end(); ++str)
-        {
-            if (*str != _Ch)
-            {
-                return size_type(str - begin()); // Character found!
-            }
-        }
-        return npos;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_first_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const
-{
-    if (_Off > length())
-    {
-        return npos;
-    }
-    else
-    {
-        const value_type* charsFirst = _Ptr, * charsLast = _Ptr + _Count;
-        for (const value_type* str = begin() + _Off; str != end(); ++str)
-        {
-            const value_type* c;
-            for (c = charsFirst; c != charsLast; ++c)
-            {
-                if (*c == *str)
-                {
-                    break;
-                }
-            }
-            if (c == charsLast)
-            {
-                return size_type(str - begin());// Current character not in char set.
-            }
-        }
-        return npos;
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_last_of(value_type _Ch, size_type _Off) const
-{
-    size_type nLenght(length());
-    // Empty strings, always return npos (same semantic as std::string).
-    if (nLenght == 0)
-    {
-        return npos;
-    }
-
-    // If the offset is is bigger than the size of the string
-    if (_Off >= nLenght)
-    {
-        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
-        // test the null terminating character.
-        _Off = nLenght - 1;
-    }
-
-    // From the character at the offset position, going to to the direction of the first character.
-    for (const value_type* str = begin() + _Off; true; --str)
-    {
-        // We found a character in the string which matches the input character.
-        if (*str == _Ch)
-        {
-            return size_type(str - begin()); // Character found!
-        }
-        // If the next element will be begin()-1, then we should stop.
-        if (str == begin())
-        {
-            break;
-        }
-    }
-
-    // We found nothing.
-    return npos;
-}
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_last_of(const value_type* _Ptr, size_type _Off) const
-{
-    // This function is actually a convenience alias...
-    // BTW: what will happeb if wchar_t is used here?
-    return find_last_of(_Ptr, _Off, _strlen(_Ptr));
-}
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_last_of(const value_type* _Ptr, size_type _Off, size_type _Count) const
-{
-    size_type nLenght(length());
-    // Empty strings, always return npos (same semantic as std::string).
-    if (nLenght == 0)
-    {
-        return npos;
-    }
-
-    // If the offset is is bigger than the size of the string
-    if (_Off >= nLenght)
-    {
-        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
-        // test the null terminating character.
-        _Off = nLenght - 1;
-    }
-
-    // From the character at the offset position, going to to the direction of the first character.
-    const value_type* charsFirst = _Ptr, * charsLast = _Ptr + _Count;
-    for (const value_type* str = begin() + _Off; true; --str)
-    {
-        const value_type* c;
-        // For every character in the character set.
-        for (c = charsFirst; c != charsLast; ++c)
-        {
-            // If the current character matches any of the charcaters in the input string...
-            if (*c == *str)
-            {
-                // This is the value we must return.
-                return size_type(str - begin());
-            }
-        }
-
-        // If the next element will be begin()-1, then we should stop.
-        if (str == begin())
-        {
-            break;
-        }
-    }
-    // We couldn't find any character of the input string in the current string.
-    return npos;
-}
-/////////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_last_of(const _Self& strCharSet, size_type _Off) const
-{
-    size_type nLenght(length());
-    // Empty strings, always return npos (same semantic as std::string).
-    if (nLenght == 0)
-    {
-        return npos;
-    }
-
-    // If the offset is is bigger than the size of the string
-    if (_Off >= nLenght)
-    {
-        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
-        // test the null terminating character.
-        _Off = nLenght - 1;
-    }
-
-
-    // From the character at the offset position, going to to the direction of the first character.
-    for (const value_type* str = begin() + _Off; true; --str)
-    {
-        // We check every character of the input string.
-        for (const value_type* strInputCharacter = strCharSet.begin(); strInputCharacter != strCharSet.end(); ++strInputCharacter)
-        {
-            // If any character matches.
-            if (*str == *strInputCharacter)
-            {
-                // We return the position where we found it.
-                return size_type(str - begin()); // Character found!
-            }
-        }
-        // If the next element will be begin()-1, then we should stop.
-        if (str == begin())
-        {
-            break;
-        }
-    }
-
-    // As we couldn't find any matching character...we return the appropriate value.
-    return npos;
-}
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_last_not_of(value_type _Ch, size_type _Off) const
-{
-    size_type nLenght(length());
-    // Empty strings, always return npos (same semantic as std::string).
-    if (nLenght == 0)
-    {
-        return npos;
-    }
-
-    // If the offset is is bigger than the size of the string
-    if (_Off >= nLenght)
-    {
-        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
-        // test the null terminating character.
-        _Off = nLenght - 1;
-    }
-
-
-    // From the character at the offset position, going to to the direction of the first character.
-    for (const value_type* str = begin() + _Off; true; --str)
-    {
-        // If the current character being analyzed is different of the input character.
-        if (*str != _Ch)
-        {
-            // We found the last item which is not the input character before the given offset.
-            return size_type(str - begin()); // Character found!
-        }
-        // If the next element will be begin()-1, then we should stop.
-        if (str == begin())
-        {
-            break;
-        }
-    }
-
-    // As we couldn't find any matching character...we return the appropriate value.
-    return npos;
-}
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_last_not_of(const value_type* _Ptr, size_type _Off) const
-{
-    // This function is actually a convenience alias...
-    // BTW: what will happeb if wchar_t is used here?
-    return find_last_not_of(_Ptr, _Off, _strlen(_Ptr));
-}
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_last_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const
-{
-    size_type nLenght(length());
-    // Empty strings, always return npos (same semantic as std::string).
-    if (nLenght == 0)
-    {
-        return npos;
-    }
-
-    // If the offset is is bigger than the size of the string
-    if (_Off >= nLenght)
-    {
-        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
-        // test the null terminating character.
-        _Off = nLenght - 1;
-    }
-
-
-    // From the character at the offset position, going to to the direction of the first character.
-    const value_type* charsFirst = _Ptr, * charsLast = _Ptr + _Count;
-    for (const value_type* str = begin() + _Off; true; --str)
-    {
-        bool boFoundAny(false);
-        const value_type* c;
-        // For every character in the character set.
-        for (c = charsFirst; c != charsLast; ++c)
-        {
-            // If the current character matches any of the charcaters in the input string...
-            if (*c == *str)
-            {
-                // So we signal it was found and stop this search.
-                boFoundAny = true;
-                break;
-            }
-        }
-
-        // Using a different solution of the other similar methods
-        // to make it easier to read.
-        // If the character being analyzed is not in the set...
-        if (!boFoundAny)
-        {
-            //.. we return the position where we found it.
-            return size_type(str - begin());
-        }
-
-        // If the next element will be begin()-1, then we should stop.
-        if (str == begin())
-        {
-            break;
-        }
-    }
-    // We couldn't find any character of the input string not in the character set.
-    return npos;
-}
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline typename CryStringT<T>::size_type CryStringT<T>::find_last_not_of(const _Self& _Str, size_type _Off) const
-{
-    size_type nLenght(length());
-    // Empty strings, always return npos (same semantic as std::string).
-    if (nLenght == 0)
-    {
-        return npos;
-    }
-
-    // If the offset is is bigger than the size of the string
-    if (_Off >= nLenght)
-    {
-        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
-        // test the null terminating character.
-        _Off = nLenght - 1;
-    }
-
-
-    // From the character at the offset position, going to to the direction of the first character.
-    for (const value_type* str = begin() + _Off; true; --str)
-    {
-        bool boFoundAny(false);
-        for (const value_type* strInputCharacter = _Str.begin(); strInputCharacter != _Str.end(); ++strInputCharacter)
-        {
-            // The character matched one of the character set...
-            if (*strInputCharacter == *str)
-            {
-                // So we signal it was found and stop this search.
-                boFoundAny = true;
-                break;
-            }
-        }
-
-        // Using a different solution of the other similar methods
-        // to make it easier to read.
-        // If the character being analyzed is not in the set...
-        if (!boFoundAny)
-        {
-            //.. we return the position where we found it.
-            return size_type(str - begin());
-        }
-
-        // If the next element will be begin()-1, then we should stop.
-        if (str == begin())
-        {
-            break;
-        }
-    }
-
-    // As we couldn't find any matching character...we return the appropriate value.
-    return npos;
-}
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T> CryStringT<T>::substr(size_type pos, size_type count) const
-{
-    if (pos >= length())
-    {
-        return CryStringT<T>();
-    }
-    if (count == npos)
-    {
-        count = length() - pos;
-    }
-    if (pos + count > length())
-    {
-        count = length() - pos;
-    }
-    return CryStringT<T>(m_str + pos, count);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::erase(size_type nIndex, size_type nCount)
-{
-    if (nIndex < 0)
-    {
-        nIndex = 0;
-    }
-    if (nCount < 0 || nCount > length() - nIndex)
-    {
-        nCount = length() - nIndex;
-    }
-    if (nCount > 0 && nIndex < length())
-    {
-        _MakeUnique();
-        size_type nNumToCopy = length() - (nIndex + nCount) + 1;
-        _move(m_str + nIndex, m_str + nIndex + nCount, nNumToCopy);
-        _header()->nLength = length() - nCount;
-    }
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::insert(size_type nIndex, value_type ch)
-{
-    return insert(nIndex, 1, ch);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::insert(size_type nIndex, size_type nCount, value_type ch)
-{
-    _MakeUnique();
-
-    if (nIndex < 0)
-    {
-        nIndex = 0;
-    }
-
-    size_type nNewLength = length();
-    if (nIndex > nNewLength)
-    {
-        nIndex = nNewLength;
-    }
-    nNewLength += nCount;
-
-    if (capacity() < nNewLength)
-    {
-        StrHeader* pOldData = _header();
-        const_str pstr = m_str;
-        _AllocData(nNewLength);
-        _copy(m_str, pstr, pOldData->nLength + 1);
-        _FreeData(pOldData);
-    }
-
-    _move(m_str + nIndex + nCount, m_str + nIndex, (nNewLength - nIndex - nCount) + 1);
-    _set(m_str + nIndex, ch, nCount);
-    _header()->nLength = nNewLength;
-    CRY_STRING_DEBUG(m_str)
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::insert(size_type nIndex, const_str pstr, size_type nCount)
-{
-    if (nIndex < 0)
-    {
-        nIndex = 0;
-    }
-
-    size_type nInsertLength = nCount;
-    size_type nNewLength = length();
-    if (nInsertLength > 0)
-    {
-        _MakeUnique();
-        if (nIndex > nNewLength)
-        {
-            nIndex = nNewLength;
-        }
-        nNewLength += nInsertLength;
-
-        if (capacity() < nNewLength)
-        {
-            StrHeader* pOldData = _header();
-            const_str pOldStr = m_str;
-            _AllocData(nNewLength);
-            _copy(m_str, pOldStr, (pOldData->nLength + 1));
-            _FreeData(pOldData);
-        }
-
-        _move(m_str + nIndex + nInsertLength, m_str + nIndex, (nNewLength - nIndex - nInsertLength + 1));
-        _copy(m_str + nIndex, pstr, nInsertLength);
-        _header()->nLength = nNewLength;
-        m_str[length()] = 0;
-    }
-    CRY_STRING_DEBUG(m_str)
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::insert(size_type nIndex, const_str pstr)
-{
-    return insert(nIndex, pstr, _strlen(pstr));
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::replace(size_type pos, size_type count, const_str strNew)
-{
-    return replace(pos, count, strNew, _strlen(strNew));
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::replace(size_type pos, size_type count, const_str strNew, size_type count2)
-{
-    erase(pos, count);
-    insert(pos, strNew, count2);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::replace(size_type pos, size_type count, size_type nNumChars, value_type chNew)
-{
-    erase(pos, count);
-    insert(pos, nNumChars, chNew);
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::replace(value_type chOld, value_type chNew)
-{
-    if (chOld != chNew)
-    {
-        _MakeUnique();
-        value_type* strend = m_str + length();
-        for (value_type* str = m_str; str != strend; ++str)
-        {
-            if (*str == chOld)
-            {
-                *str = chNew;
-            }
-        }
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::replace(const_str strOld, const_str strNew)
-{
-    size_type nSourceLen = _strlen(strOld);
-    if (nSourceLen == 0)
-    {
-        return *this;
-    }
-    size_type nReplacementLen = _strlen(strNew);
-
-    size_type nCount = 0;
-    value_type* strStart = m_str;
-    value_type* strEnd = m_str + length();
-    value_type* strTarget;
-    while (strStart < strEnd)
-    {
-        while ((strTarget = _strstr(strStart, strOld)) != NULL)
-        {
-            nCount++;
-            strStart = strTarget + nSourceLen;
-        }
-        strStart += _strlen(strStart) + 1;
-    }
-
-    if (nCount > 0)
-    {
-        _MakeUnique();
-
-        size_type nOldLength = length();
-        size_type nNewLength =  nOldLength + (nReplacementLen - nSourceLen) * nCount;
-        if (capacity() < nNewLength || _header()->nRefCount > 1)
-        {
-            StrHeader* pOldData = _header();
-            const_str pstr = m_str;
-            _AllocData(nNewLength);
-            _copy(m_str, pstr, pOldData->nLength);
-            _FreeData(pOldData);
-        }
-        strStart = m_str;
-        strEnd = m_str + length();
-
-        while (strStart < strEnd)
-        {
-            while ((strTarget = _strstr(strStart, strOld)) != NULL)
-            {
-                size_type nBalance = nOldLength - ((size_type)(strTarget - m_str) + nSourceLen);
-                _move(strTarget + nReplacementLen, strTarget + nSourceLen, nBalance);
-                _copy(strTarget, strNew, nReplacementLen);
-                strStart = strTarget + nReplacementLen;
-                strStart[nBalance] = 0;
-                nOldLength += (nReplacementLen - nSourceLen);
-            }
-            strStart += _strlen(strStart) + 1;
-        }
-        _header()->nLength = nNewLength;
-    }
-    CRY_STRING_DEBUG(m_str)
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline void CryStringT<T>::swap(CryStringT<T>& _Str)
-{
-    value_type* temp = _Str.m_str;
-    _Str.m_str = m_str;
-    m_str = temp;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::Format(const_str format, ...)
-{
-    AZ_Assert(_IsValidString(format), "format c-string must not be nullptr");
-
-#if defined(WIN32) || defined(WIN64)
-    va_list argList;
-    va_start(argList, format);
-    int n = _vscpf(format, argList);
-    if (n < 0)
-    {
-        n = 0;
-    }
-    resize(n);  //this will actually allocate n+1 elements to accommodate the null terminator
-    _vsnpf(m_str, n, format, argList);
-    va_end(argList);
-    return *this;
-#else
-    value_type temp[4096]; // Limited to 4096 characters!
-    va_list argList;
-    va_start(argList, format);
-    _vsnpf(temp, 4096, format, argList);
-    temp[4095] = '\0';
-    va_end(argList);
-    *this = temp;
-    return *this;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::MakeLower()
-{
-    _MakeUnique();
-    for (value_type* s = m_str; *s != 0; s++)
-    {
-        const value_type c = *s;
-        *s = (c >= 'A' && c <= 'Z') ? c - 'A' + 'a' : c; // ASCII only, standard "C" locale
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::MakeUpper()
-{
-    _MakeUnique();
-    for (value_type* s = m_str; *s != 0; s++)
-    {
-        const value_type c = *s;
-        *s = (c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c; // ASCII only, standard "C" locale
-    }
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::Trim()
-{
-    return TrimRight().TrimLeft();
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::Trim(value_type ch)
-{
-    _MakeUnique();
-    const value_type chset[2] = { ch, 0 };
-    return TrimRight(chset).TrimLeft(chset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::Trim(const value_type* sCharSet)
-{
-    _MakeUnique();
-    return TrimRight(sCharSet).TrimLeft(sCharSet);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::TrimRight(value_type ch)
-{
-    const value_type chset[2] = { ch, 0 };
-    return TrimRight(chset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::TrimRight(const value_type* sCharSet)
-{
-    if (!sCharSet || !(*sCharSet) || length() < 1)
-    {
-        return *this;
-    }
-
-    const value_type* last = m_str + length() - 1;
-    const value_type* str = last;
-    while ((str != m_str) && (_strchr(sCharSet, *str) != 0))
-    {
-        str--;
-    }
-
-    if (str != last)
-    {
-        // Just shrink length of the string.
-        size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
-        _MakeUnique();
-        _header()->nLength = nNewLength;
-        m_str[nNewLength] = 0;
-    }
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::TrimRight()
-{
-    if (length() < 1)
-    {
-        return *this;
-    }
-
-    const value_type* last = m_str + length() - 1;
-    const value_type* str = last;
-    while ((str != m_str) && (isspace((unsigned char)*str) != 0))
-    {
-        str--;
-    }
-
-    if (str != last)     // something changed?
-    {
-        // Just shrink length of the string.
-        size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
-        _MakeUnique();
-        _header()->nLength = nNewLength;
-        m_str[nNewLength] = 0;
-    }
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::TrimLeft(value_type ch)
-{
-    const value_type chset[2] = { ch, 0 };
-    return TrimLeft(chset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::TrimLeft(const value_type* sCharSet)
-{
-    if (!sCharSet || !(*sCharSet))
-    {
-        return *this;
-    }
-
-    const value_type* str = m_str;
-    while ((*str != 0) && (_strchr(sCharSet, *str) != 0))
-    {
-        str++;
-    }
-
-    if (str != m_str)
-    {
-        size_type nOff = (size_type)(str - m_str); // m_str can change in _MakeUnique
-        _MakeUnique();
-        size_type nNewLength = length() - nOff;
-        _move(m_str, m_str + nOff, nNewLength + 1);
-        _header()->nLength = nNewLength;
-        m_str[nNewLength] = 0;
-    }
-
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T>& CryStringT<T>::TrimLeft()
-{
-    const value_type* str = m_str;
-    while ((*str != 0) && (isspace((unsigned char)*str) != 0))
-    {
-        str++;
-    }
-
-    if (str != m_str)
-    {
-        size_type nOff = (size_type)(str - m_str); // m_str can change in _MakeUnique
-        _MakeUnique();
-        size_type nNewLength = length() - nOff;
-        _move(m_str, m_str + nOff, nNewLength + 1);
-        _header()->nLength = nNewLength;
-        m_str[nNewLength] = 0;
-    }
-
-    return *this;
-}
-
-template <class T>
-inline CryStringT<T> CryStringT<T>::Right(size_type count) const
-{
-    if (count == npos)
-    {
-        return CryStringT<T>();
-    }
-    else if (count > length())
-    {
-        return *this;
-    }
-
-    return CryStringT<T>(m_str + length() - count, count);
-}
-
-template <class T>
-inline CryStringT<T> CryStringT<T>::Left(size_type count) const
-{
-    if (count == npos)
-    {
-        return CryStringT<T>();
-    }
-    else if (count > length())
-    {
-        count = length();
-    }
-
-    return CryStringT<T>(m_str, count);
-}
-
-// strspn equivalent
-template <class T>
-inline CryStringT<T> CryStringT<T>::SpanIncluding(const_str charSet) const
-{
-    AZ_Assert(_IsValidString(charSet), "input c-string must not be nullptr");
-    return Left((size_type)strspn(m_str, charSet));
-}
-
-// strcspn equivalent
-template <class T>
-inline CryStringT<T> CryStringT<T>::SpanExcluding(const_str charSet) const
-{
-    AZ_Assert(_IsValidString(charSet), "input c-string must not be nullptr");
-    return Left((size_type)strcspn(m_str, charSet));
-}
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-inline CryStringT<T> CryStringT<T>::Tokenize(const_str charSet, int& nStart) const
-{
-    if (nStart < 0)
-    {
-        return CryStringT<T>();
-    }
-
-    if (!charSet)
-    {
-        return *this;
-    }
-
-    const_str sPlace = m_str + nStart;
-    const_str sEnd = m_str + length();
-    if (sPlace < sEnd)
-    {
-        int nIncluding = (int)strspn(sPlace, charSet);
-
-        if ((sPlace + nIncluding) < sEnd)
-        {
-            sPlace += nIncluding;
-            int nExcluding = (int)strcspn(sPlace, charSet);
-            int nFrom = nStart + nIncluding;
-            nStart = nFrom + nExcluding + 1;
-
-            return substr(nFrom, nExcluding);
-        }
-    }
-    // Return empty string.
-    nStart = -1;
-    return CryStringT<T>();
-}
-
-//////////////////////////////////////////////////////////////////////////
-// This code prevents std::string compiling in Win32 with STLPort
-//////////////////////////////////////////////////////////////////////////
-#if defined(WIN32) && !defined(WIN64) && defined(_STLP_BEGIN_NAMESPACE) && !defined(DONT_BAN_STD_STRING)
-#define CRYINCLUDE_STLP_STRING_FWD_H
-#define CRYINCLUDE_STLP_INTERNAL_STRING_H
-namespace std
-{
-    //const char* __get_c_string( const CryStringT<char> &str ) { return str.c_str(); };
-    class string
-    {
-        // std::string must not be used if CryString included.
-        // Use string instead.
-    };
-}
-//////////////////////////////////////////////////////////////////////////
-#endif // WIN64
-
-typedef CryStringT<char> string;
-typedef CryStringT<wchar_t> wstring;
-
-#else // !defined(NOT_USE_CRY_STRING)
-
-#include <string>  // STL string
-typedef std::string string;
-typedef std::wstring wstring;
-
-#endif // !defined(NOT_USE_CRY_STRING)
-
-namespace AZStd
-{
-    template <>
-    struct hash<::string>
-    {
-        typedef ::string   argument_type;
-        typedef size_t     result_type;
-        inline result_type operator()(const argument_type& value) const 
-        { 
-            return hash_string(value.c_str(), value.length());
-        }
-
-        static size_t hash_string(const char* str, size_t length)
-        {
-            size_t hash = 14695981039346656037ULL;
-            const size_t fnvPrime = 1099511628211ULL;
-            const char* cptr = str;
-            for (; length; --length)
-            {
-                hash ^= static_cast<size_t>(*cptr++);
-                hash *= fnvPrime;
-            }
-            return hash;
-        }
-    };
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYSTRING_H
diff --git a/Code/CryEngine/CryCommon/CrySystemBus.h b/Code/CryEngine/CryCommon/CrySystemBus.h
deleted file mode 100644
index 93085f8819..0000000000
--- a/Code/CryEngine/CryCommon/CrySystemBus.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYSYSTEMBUS_H
-#define CRYINCLUDE_CRYCOMMON_CRYSYSTEMBUS_H
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-struct ISystem;
-struct SSystemInitParams;
-
-/*!
- * Events from CrySystem
- */
-class CrySystemEvents
-    : public AZ::EBusTraits
-{
-public:
-    //! ISystem has been created and is about to initialize.
-    virtual void OnCrySystemPreInitialize(ISystem&, const SSystemInitParams&) {}
-
-    //! ISystem and IConsole has been created but the cfg files have not been parsed
-    virtual void OnCrySystemCVarRegistry() {}
-
-    //! ISystem has been created and initialized.
-    virtual void OnCrySystemInitialized(ISystem&, const SSystemInitParams&) {}
-
-    //! In-Editor systems have been created and initialized.
-    virtual void OnCryEditorInitialized() {}
-
-    //! Editor has started a level export
-    virtual void OnCryEditorBeginLevelExport() {}
-
-    //! Editor has finished a level export
-    virtual void OnCryEditorEndLevelExport(bool /*success*/) {}
-
-    //! ISystem is about to begin shutting down
-    virtual void OnCrySystemShutdown(ISystem&) {}
-
-    //! ISystem has shut down.
-    virtual void OnCrySystemPostShutdown() {}
-
-    //! Sent when a new level is being created.
-    virtual void OnCryEditorBeginCreate() {}
-
-    //! Sent after a new level has been created.
-    virtual void OnCryEditorEndCreate() {}
-
-    //! Sent when a level is about to be loaded.
-    virtual void OnCryEditorBeginLoad() {}
-
-    //! Sent after a level has been loaded.
-    virtual void OnCryEditorEndLoad() {}
-
-    //! Sent when the document is about to close.
-    virtual void OnCryEditorCloseScene() {}
-
-    //! Sent when the document is closed.
-    virtual void OnCryEditorSceneClosed() {}
-};
-using CrySystemEventBus = AZ::EBus<CrySystemEvents>;
-
-/*!
- * Requests to CrySystem
- */
-class CrySystemRequests
-    : public AZ::EBusTraits
-{
-public:
-    //! Get CrySystem
-    virtual ISystem* GetCrySystem() = 0;
-};
-using CrySystemRequestBus = AZ::EBus<CrySystemRequests>;
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYSYSTEMBUS_H
diff --git a/Code/CryEngine/CryCommon/CryThread.h b/Code/CryEngine/CryCommon/CryThread.h
deleted file mode 100644
index 7506f6767d..0000000000
--- a/Code/CryEngine/CryCommon/CryThread.h
+++ /dev/null
@@ -1,823 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Public include file for the multi-threading API.
-
-
-#pragma once
-
-
-// Include basic multithread primitives.
-#include "MultiThread.h"
-#include "BitFiddling.h"
-#include <AzCore/std/string/string.h>
-//////////////////////////////////////////////////////////////////////////
-// Lock types:
-//
-// CRYLOCK_FAST
-//   A fast potentially (non-recursive) mutex.
-// CRYLOCK_RECURSIVE
-//   A recursive mutex.
-//////////////////////////////////////////////////////////////////////////
-enum CryLockType
-{
-    CRYLOCK_FAST = 1,
-    CRYLOCK_RECURSIVE = 2,
-};
-
-#define CRYLOCK_HAVE_FASTLOCK 1
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Primitive locks and conditions.
-//
-// Primitive locks are represented by instance of class CryLockT<Type>
-//
-//
-template<CryLockType Type>
-class CryLockT
-{
-    /* Unsupported lock type. */
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Typedefs.
-//////////////////////////////////////////////////////////////////////////
-typedef CryLockT<CRYLOCK_RECURSIVE>   CryCriticalSection;
-typedef CryLockT<CRYLOCK_FAST>        CryCriticalSectionNonRecursive;
-//////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////
-//
-// CryAutoCriticalSection implements a helper class to automatically
-// lock critical section in constructor and release on destructor.
-//
-//////////////////////////////////////////////////////////////////////////
-template<class LockClass>
-class CryAutoLock
-{
-private:
-    LockClass* m_pLock;
-
-    CryAutoLock();
-    CryAutoLock(const CryAutoLock<LockClass>&);
-    CryAutoLock<LockClass>& operator = (const CryAutoLock<LockClass>&);
-
-public:
-    CryAutoLock(LockClass& Lock)
-        : m_pLock(&Lock) { m_pLock->Lock(); }
-    CryAutoLock(const LockClass& Lock)
-        : m_pLock(const_cast<LockClass*>(&Lock)) { m_pLock->Lock(); }
-    ~CryAutoLock() { m_pLock->Unlock(); }
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-// CryOptionalAutoLock implements a helper class to automatically
-// lock critical section (if needed) in constructor and release on destructor.
-//
-//////////////////////////////////////////////////////////////////////////
-template<class LockClass>
-class CryOptionalAutoLock
-{
-private:
-    LockClass* m_Lock;
-    bool m_bLockAcquired;
-
-    CryOptionalAutoLock();
-    CryOptionalAutoLock(const CryOptionalAutoLock<LockClass>&);
-    CryOptionalAutoLock<LockClass>& operator = (const CryOptionalAutoLock<LockClass>&);
-
-public:
-    CryOptionalAutoLock(LockClass& Lock, bool acquireLock)
-        : m_Lock(&Lock)
-        , m_bLockAcquired(false)
-    {
-        if (acquireLock)
-        {
-            Acquire();
-        }
-    }
-    ~CryOptionalAutoLock()
-    {
-        Release();
-    }
-    void Release()
-    {
-        if (m_bLockAcquired)
-        {
-            m_Lock->Unlock();
-            m_bLockAcquired = false;
-        }
-    }
-    void Acquire()
-    {
-        if (!m_bLockAcquired)
-        {
-            m_Lock->Lock();
-            m_bLockAcquired = true;
-        }
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-// CryAutoSet implements a helper class to automatically
-// set and reset value in constructor and release on destructor.
-//
-//////////////////////////////////////////////////////////////////////////
-template<class ValueClass>
-class CryAutoSet
-{
-private:
-    ValueClass* m_pValue;
-
-    CryAutoSet();
-    CryAutoSet(const CryAutoSet<ValueClass>&);
-    CryAutoSet<ValueClass>& operator = (const CryAutoSet<ValueClass>&);
-
-public:
-    CryAutoSet(ValueClass& value)
-        : m_pValue(&value) { *m_pValue = (ValueClass)1; }
-    ~CryAutoSet() { *m_pValue = (ValueClass)0; }
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Auto critical section is the most commonly used type of auto lock.
-//
-//////////////////////////////////////////////////////////////////////////
-typedef CryAutoLock<CryCriticalSection> CryAutoCriticalSection;
-
-#define AUTO_LOCK_T(Type, lock) PREFAST_SUPPRESS_WARNING(6246); CryAutoLock<Type> __AutoLock(lock)
-#define AUTO_LOCK(lock)             AUTO_LOCK_T(CryCriticalSection, lock)
-#define AUTO_LOCK_CS(csLock) CryAutoCriticalSection __AL__##csLock(csLock)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Threads.
-
-// Base class for runnable objects.
-//
-// A runnable is an object with a Run() and a Cancel() method.  The Run()
-// method should perform the runnable's job.  The Cancel() method may be
-// called by another thread requesting early termination of the Run() method.
-// The runnable may ignore the Cancel() call, the default implementation of
-// Cancel() does nothing.
-class CryRunnable
-{
-public:
-    virtual ~CryRunnable() { }
-    virtual void Run() = 0;
-    virtual void Cancel() { }
-};
-
-// Class holding information about a thread.
-//
-// A reference to the thread information can be obtained by calling GetInfo()
-// on the CrySimpleThread (or derived class) instance.
-//
-// NOTE:
-// If the code is compiled with NO_THREADINFO defined, then the GetInfo()
-// method will return a reference to a static dummy instance of this
-// structure.  It is currently undecided if NO_THREADINFO will be defined for
-// release builds!
-
-struct CryThreadInfo
-{
-    // The symbolic name of the thread.
-    //
-    // You may set this name directly or through the SetName() method of
-    // CrySimpleThread (or derived class).
-    AZStd::string m_Name;
-
-
-    // A thread identification number.
-    // The number is unique but architecture specific.  Do not assume anything
-    // about that number except for being unique.
-    //
-    // This field is filled when the thread is started (i.e. before the Run()
-    // method or thread routine is called).  It is advised that you do not
-    // change this number manually.
-    uint32 m_ID;
-};
-
-// Simple thread class.
-//
-// CrySimpleThread is a simple wrapper around a system thread providing
-// nothing but system-level functionality of a thread.  There are two typical
-// ways to use a simple thread:
-//
-// 1. Derive from the CrySimpleThread class and provide an implementation of
-//    the Run() (and optionally Cancel()) methods.
-// 2. Specify a runnable object when the thread is started.  The default
-//    runnable type is CryRunnable.
-//
-// The Runnable class specfied as the template argument must provide Run()
-// and Cancel() methods compatible with the following signatures:
-//
-//   void Runnable::Run();
-//   void Runnable::Cancel();
-//
-// If the Runnable does not support cancellation, then the Cancel() method
-// should do nothing.
-//
-// The same instance of CrySimpleThread may be used for multiple thread
-// executions /in sequence/, i.e. it is valid to re-start the thread by
-// calling Start() after the thread has been joined by calling WaitForThread().
-template<class Runnable = CryRunnable>
-class CrySimpleThread;
-
-// Standard thread class.
-//
-// The class provides a lock (mutex) and an associated condition variable.  If
-// you don't need the lock, then you should used CrySimpleThread instead of
-// CryThread.
-template<class Runnable = CryRunnable>
-class CryThread;
-
-///////////////////////////////////////////////////////////////////////////////
-// Include architecture specific code.
-#if AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS
-#include <CryThread_pthreads.h>
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32) || defined(WIN64)
-#include <CryThread_windows.h>
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(CryThread_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-// Put other platform specific includes here!
-#include <CryThread_dummy.h>
-#endif
-
-#if !defined _CRYTHREAD_CONDLOCK_GLITCH
-typedef CryLockT<CRYLOCK_RECURSIVE> CryMutex;
-#endif // !_CRYTHREAD_CONDLOCK_GLITCH
-
-// The the architecture specific code does not define a class CryRWLock, then
-// a default implementation is provided here.
-#if !defined _CRYTHREAD_HAVE_RWLOCK && !defined _CRYTHREAD_CONDLOCK_GLITCH
-class CryRWLock
-{
-    CryCriticalSection m_lockExclusiveAccess;
-    CryCriticalSection m_lockSharedAccessComplete;
-    CryConditionVariable m_condSharedAccessComplete;
-
-    int m_nSharedAccessCount;
-    int m_nCompletedSharedAccessCount;
-    bool m_bExclusiveAccess;
-
-    CryRWLock(const CryRWLock&);
-    CryRWLock& operator= (const CryRWLock&);
-
-    void AdjustSharedAccessCount()
-    {
-        m_nSharedAccessCount -= m_nCompletedSharedAccessCount;
-        m_nCompletedSharedAccessCount = 0;
-    }
-
-public:
-    CryRWLock()
-        : m_nSharedAccessCount(0)
-        , m_nCompletedSharedAccessCount(0)
-        , m_bExclusiveAccess(false)
-    { }
-
-    void RLock()
-    {
-        m_lockExclusiveAccess.Lock();
-        if (++m_nSharedAccessCount == INT_MAX)
-        {
-            m_lockSharedAccessComplete.Lock();
-            AdjustSharedAccessCount();
-            m_lockSharedAccessComplete.Unlock();
-        }
-        m_lockExclusiveAccess.Unlock();
-    }
-
-    bool TryRLock()
-    {
-        if (!m_lockExclusiveAccess.TryLock())
-        {
-            return false;
-        }
-        if (++m_nSharedAccessCount == INT_MAX)
-        {
-            m_lockSharedAccessComplete.Lock();
-            AdjustSharedAccessCount();
-            m_lockSharedAccessComplete.Unlock();
-        }
-        m_lockExclusiveAccess.Unlock();
-        return true;
-    }
-
-    void RUnlock()
-    {
-        Unlock();
-    }
-
-    void WLock()
-    {
-        m_lockExclusiveAccess.Lock();
-        m_lockSharedAccessComplete.Lock();
-        assert(!m_bExclusiveAccess);
-        AdjustSharedAccessCount();
-        if (m_nSharedAccessCount > 0)
-        {
-            m_nCompletedSharedAccessCount -= m_nSharedAccessCount;
-            do
-            {
-                m_condSharedAccessComplete.Wait(m_lockSharedAccessComplete);
-            }
-            while (m_nCompletedSharedAccessCount < 0);
-            m_nSharedAccessCount = 0;
-        }
-        m_bExclusiveAccess = true;
-    }
-
-    bool TryWLock()
-    {
-        if (!m_lockExclusiveAccess.TryLock())
-        {
-            return false;
-        }
-        if (!m_lockSharedAccessComplete.TryLock())
-        {
-            m_lockExclusiveAccess.Unlock();
-            return false;
-        }
-        assert(!m_bExclusiveAccess);
-        AdjustSharedAccessCount();
-        if (m_nSharedAccessCount > 0)
-        {
-            m_lockSharedAccessComplete.Unlock();
-            m_lockExclusiveAccess.Unlock();
-            return false;
-        }
-        else
-        {
-            m_bExclusiveAccess = true;
-        }
-        return true;
-    }
-
-    void WUnlock()
-    {
-        Unlock();
-    }
-
-    void Unlock()
-    {
-        if (!m_bExclusiveAccess)
-        {
-            m_lockSharedAccessComplete.Lock();
-            if (++m_nCompletedSharedAccessCount == 0)
-            {
-                m_condSharedAccessComplete.NotifySingle();
-            }
-            m_lockSharedAccessComplete.Unlock();
-        }
-        else
-        {
-            m_bExclusiveAccess = false;
-            m_lockSharedAccessComplete.Unlock();
-            m_lockExclusiveAccess.Unlock();
-        }
-    }
-};
-#endif // !defined _CRYTHREAD_HAVE_RWLOCK
-
-// Thread class.
-//
-// CryThread is an extension of CrySimpleThread providing a lock (mutex) and a
-// condition variable per instance.
-template<class Runnable>
-class CryThread
-    : public CrySimpleThread<Runnable>
-{
-    CryMutex m_Lock;
-    CryConditionVariable m_Cond;
-
-    CryThread(const CryThread<Runnable>&);
-    void operator = (const CryThread<Runnable>&);
-
-public:
-    CryThread() { }
-    void Lock() { m_Lock.Lock(); }
-    bool TryLock() { return m_Lock.TryLock(); }
-    void Unlock() { m_Lock.Unlock(); }
-    void Wait() { m_Cond.Wait(m_Lock); }
-    // Timed wait on the associated condition.
-    //
-    // The 'milliseconds' parameter specifies the relative timeout in
-    // milliseconds.  The method returns true if a notification was received and
-    // false if the specified timeout expired without receiving a notification.
-    //
-    // UNIX note: the method will _not_ return if the calling thread receives a
-    // signal.  Instead the call is re-started with the _original_ timeout
-    // value.  This misfeature may be fixed in the future.
-    bool TimedWait(uint32 milliseconds)
-    {
-        return m_Cond.TimedWait(m_Lock, milliseconds);
-    }
-    void Notify() { m_Cond.Notify(); }
-    void NotifySingle() { m_Cond.NotifySingle(); }
-    CryMutex& GetLock() { return m_Lock; }
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Sync primitive for multiple reads and exclusive locking change access
-//
-//  Desc:
-//      Useful in case if you have rarely modified object that needs
-//      to be read quite often from different threads but still
-//      need to be exclusively modified sometimes
-//  Debug functionality:
-//      Can be used for debug-only lock calls, which verify that no
-//      simultaneous access is attempted.
-//      Use the bDebug argument of LockRead or LockModify,
-//      or use the DEBUG_READLOCK or DEBUG_MODIFYLOCK macros.
-//      There is no overhead in release builds, if you use the macros,
-//      and the lock definition is inside #ifdef _DEBUG.
-//////////////////////////////////////////////////////////////////////////
-
-class CryReadModifyLock
-{
-public:
-    CryReadModifyLock()
-        : m_modifyCount(0)
-        , m_readCount(0)
-    {
-        SetDebugLocked(false);
-    }
-
-    bool LockRead(bool bTry = false, cstr strDebug = 0, bool bDebug = false) const
-    {
-        if (!WriteLock(bTry, bDebug, strDebug))         // wait until write unlocked
-        {
-            return false;
-        }
-        CryInterlockedIncrement(&m_readCount);          // increment read counter
-        m_writeLock.Unlock();
-        return true;
-    }
-    void UnlockRead() const
-    {
-        SetDebugLocked(false);
-        const int counter = CryInterlockedDecrement(&m_readCount);       // release read
-        assert(counter >= 0);
-        if (m_writeLock.TryLock())
-        {
-            m_writeLock.Unlock();
-        }
-        else
-        if (counter == 0 && m_modifyCount)
-        {
-            m_ReadReleased.Set();                                           // signal the final read released
-        }
-    }
-    bool LockModify(bool bTry = false, cstr strDebug = 0, bool bDebug = false) const
-    {
-        if (!WriteLock(bTry, bDebug, strDebug))
-        {
-            return false;
-        }
-        CryInterlockedIncrement(&m_modifyCount);        // increment write counter (counter is for nested cases)
-        while (m_readCount)
-        {
-            m_ReadReleased.Wait();                                      // wait for all threads finish read operation
-        }
-        return true;
-    }
-    void UnlockModify() const
-    {
-        SetDebugLocked(false);
-#if !defined(NDEBUG)
-        int counter =
-#endif
-            CryInterlockedDecrement(&m_modifyCount);      // decrement write counter
-        assert(counter >= 0);
-        m_writeLock.Unlock();                                               // release exclusive lock
-    }
-
-protected:
-    mutable volatile int          m_readCount;
-    mutable volatile int          m_modifyCount;
-    mutable CryEvent              m_ReadReleased;
-    mutable CryCriticalSection    m_writeLock;
-    mutable bool                                    m_debugLocked;
-    mutable const char*                     m_debugLockStr;
-
-    void SetDebugLocked([[maybe_unused]] bool b, [[maybe_unused]] const char* str = 0) const
-    {
-#ifdef _DEBUG
-        m_debugLocked = b;
-        m_debugLockStr = str;
-#endif
-    }
-
-    bool WriteLock(bool bTry, [[maybe_unused]] bool bDebug, [[maybe_unused]] const char* strDebug) const
-    {
-        if (!m_writeLock.TryLock())
-        {
-#ifdef _DEBUG
-            assert(!m_debugLocked);
-            assert(!bDebug);
-#endif
-            if (bTry)
-            {
-                return false;
-            }
-            m_writeLock.Lock();
-        }
-#ifdef _DEBUG
-        if (!m_readCount && !m_modifyCount)                 // not yet locked
-        {
-            SetDebugLocked(bDebug, strDebug);
-        }
-#endif
-        return true;
-    }
-};
-
-// Auto-locking classes.
-template<class T, bool bDEBUG = false>
-class AutoLockRead
-{
-protected:
-    const T& m_lock;
-public:
-    AutoLockRead(const T& lock, cstr strDebug = 0)
-        : m_lock(lock) { m_lock.LockRead(bDEBUG, strDebug, bDEBUG); }
-    ~AutoLockRead()
-    { m_lock.UnlockRead(); }
-};
-
-template<class T, bool bDEBUG = false>
-class AutoLockModify
-{
-protected:
-    const T& m_lock;
-public:
-    AutoLockModify(const T& lock, cstr strDebug = 0)
-        : m_lock(lock) { m_lock.LockModify(bDEBUG, strDebug, bDEBUG); }
-    ~AutoLockModify()
-    { m_lock.UnlockModify(); }
-};
-
-#define AUTO_READLOCK(p) PREFAST_SUPPRESS_WARNING(6246) AutoLockRead<CryReadModifyLock> AZ_JOIN(__readlock, __LINE__)(p, __FUNC__)
-#define AUTO_READLOCK_PROT(p) PREFAST_SUPPRESS_WARNING(6246) AutoLockRead<CryReadModifyLock> AZ_JOIN(__readlock_prot, __LINE__)(p, __FUNC__)
-#define AUTO_MODIFYLOCK(p) PREFAST_SUPPRESS_WARNING(6246) AutoLockModify<CryReadModifyLock> AZ_JOIN(__modifylock, __LINE__)(p, __FUNC__)
-
-#if defined(_DEBUG)
-    #define DEBUG_READLOCK(p) AutoLockRead<CryReadModifyLock> AZ_JOIN(__readlock, __LINE__)(p, __FUNC__)
-    #define DEBUG_MODIFYLOCK(p) AutoLockModify<CryReadModifyLock> AZ_JOIN(__modifylock, __LINE__)(p, __FUNC__)
-#else
-    #define DEBUG_READLOCK(p)
-    #define DEBUG_MODIFYLOCK(p)
-#endif
-
-// producer consumer queue implementations, but here instead of MultiThread_Container.h
-// since they requiere platform specific code, and including windows.h in a very common
-// header file leads to all kinds of problems
-namespace CryMT
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Producer/Consumer Queue for 1 to 1 thread communication
-    // Realized with only volatile variables and memory barriers
-    // *warning* this producer/consumer queue is only thread safe in a 1 to 1 situation
-    // and doesn't provide any yields or similar to prevent spinning
-    //////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    class SingleProducerSingleConsumerQueue
-        : public CryMT::detail::SingleProducerSingleConsumerQueueBase
-    {
-    public:
-        SingleProducerSingleConsumerQueue();
-        ~SingleProducerSingleConsumerQueue();
-
-        void Init(size_t nSize);
-
-        void Push(const T& rObj);
-        void Pop(T* pResult);
-        uint32 Size() { return (m_nProducerIndex - m_nComsumerIndex); }
-        uint32 BufferSize() { return m_nBufferSize;  }
-        uint32 FreeCount() { return (m_nBufferSize - (m_nProducerIndex - m_nComsumerIndex)); }
-
-    private:
-        T* m_arrBuffer;
-        uint32 m_nBufferSize;
-
-        volatile uint32 m_nProducerIndex _ALIGN(16);
-        volatile uint32 m_nComsumerIndex _ALIGN(16);
-    } _ALIGN(128);
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline SingleProducerSingleConsumerQueue<T>::SingleProducerSingleConsumerQueue()
-        : m_arrBuffer(NULL)
-        , m_nBufferSize(0)
-        , m_nProducerIndex(0)
-        , m_nComsumerIndex(0)
-    {}
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline SingleProducerSingleConsumerQueue<T>::~SingleProducerSingleConsumerQueue()
-    {
-        CryModuleMemalignFree(m_arrBuffer);
-        m_nBufferSize = 0;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline void SingleProducerSingleConsumerQueue<T>::Init(size_t nSize)
-    {
-        assert(m_arrBuffer == NULL);
-        assert(m_nBufferSize == 0);
-        assert((nSize & (nSize - 1)) == 0);
-
-        m_arrBuffer = alias_cast<T*>(CryModuleMemalign(nSize * sizeof(T), 16));
-        m_nBufferSize = nSize;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline void SingleProducerSingleConsumerQueue<T>::Push(const T& rObj)
-    {
-        assert(m_arrBuffer != NULL);
-        assert(m_nBufferSize != 0);
-        SingleProducerSingleConsumerQueueBase::Push((void*)&rObj, m_nProducerIndex, m_nComsumerIndex, m_nBufferSize, m_arrBuffer, sizeof(T));
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline void SingleProducerSingleConsumerQueue<T>::Pop(T* pResult)
-    {
-        assert(m_arrBuffer != NULL);
-        assert(m_nBufferSize != 0);
-        SingleProducerSingleConsumerQueueBase::Pop(pResult, m_nProducerIndex, m_nComsumerIndex, m_nBufferSize, m_arrBuffer, sizeof(T));
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-    // Producer/Consumer Queue for N to 1 thread communication
-    // lockfree implemenation, to copy with multiple producers,
-    // a internal producer refcount is managed, the queue is empty
-    // as soon as there are no more producers and no new elements
-    //////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    class N_ProducerSingleConsumerQueue
-        : public CryMT::detail::N_ProducerSingleConsumerQueueBase
-    {
-    public:
-        N_ProducerSingleConsumerQueue();
-        ~N_ProducerSingleConsumerQueue();
-
-        void Init(size_t nSize);
-
-        void Push(const T& rObj);
-        bool Pop(T* pResult);
-
-        // needs to be called before using, assumes that there is at least one producer
-        // so the first one doesn't need to call AddProducer, but he has to deregister itself
-        void SetRunningState();
-
-        // to correctly track when the queue is empty(and no new jobs will be added), refcount the producer
-        void AddProducer();
-        void RemoveProducer();
-
-        uint32 Size() { return (m_nProducerIndex - m_nComsumerIndex); }
-        uint32 BufferSize() { return m_nBufferSize; }
-        uint32 FreeCount() { return (m_nBufferSize - (m_nProducerIndex - m_nComsumerIndex)); }
-
-    private:
-        T*                              m_arrBuffer;
-        volatile uint32*    m_arrStates;
-        uint32                      m_nBufferSize;
-
-        volatile uint32 m_nProducerIndex;
-        volatile uint32 m_nComsumerIndex;
-        volatile uint32 m_nRunning;
-        volatile uint32 m_nProducerCount;
-    } _ALIGN(128);
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline N_ProducerSingleConsumerQueue<T>::N_ProducerSingleConsumerQueue()
-        : m_arrBuffer(NULL)
-        , m_arrStates(NULL)
-        , m_nBufferSize(0)
-        , m_nProducerIndex(0)
-        , m_nComsumerIndex(0)
-        , m_nRunning(0)
-        , m_nProducerCount(0)
-    {}
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline N_ProducerSingleConsumerQueue<T>::~N_ProducerSingleConsumerQueue()
-    {
-        CryModuleMemalignFree(m_arrBuffer);
-        CryModuleMemalignFree((void*)m_arrStates);
-        m_nBufferSize = 0;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline void N_ProducerSingleConsumerQueue<T>::Init(size_t nSize)
-    {
-        assert(m_arrBuffer == NULL);
-        assert(m_arrStates == NULL);
-        assert(m_nBufferSize == 0);
-        assert((nSize & (nSize - 1)) == 0);
-
-        m_arrBuffer = alias_cast<T*>(CryModuleMemalign(nSize * sizeof(T), 16));
-        m_arrStates = alias_cast<uint32*>(CryModuleMemalign(nSize * sizeof(uint32), 16));
-        memset((void*)m_arrStates, 0, sizeof(uint32) * nSize);
-        m_nBufferSize = nSize;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline void N_ProducerSingleConsumerQueue<T>::SetRunningState()
-    {
-#if !defined(_RELEASE)
-        if (m_nRunning == 1)
-        {
-            __debugbreak();
-        }
-#endif
-        m_nRunning = 1;
-        m_nProducerCount = 1;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline void N_ProducerSingleConsumerQueue<T>::AddProducer()
-    {
-        assert(m_arrBuffer != NULL);
-        assert(m_arrStates != NULL);
-        assert(m_nBufferSize != 0);
-#if !defined(_RELEASE)
-        if (m_nRunning == 0)
-        {
-            __debugbreak();
-        }
-#endif
-        CryInterlockedIncrement((volatile int*)&m_nProducerCount);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline void N_ProducerSingleConsumerQueue<T>::RemoveProducer()
-    {
-        assert(m_arrBuffer != NULL);
-        assert(m_arrStates != NULL);
-        assert(m_nBufferSize != 0);
-#if !defined(_RELEASE)
-        if (m_nRunning == 0)
-        {
-            __debugbreak();
-        }
-#endif
-        if (CryInterlockedDecrement((volatile int*)&m_nProducerCount) == 0)
-        {
-            m_nRunning = 0;
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline void N_ProducerSingleConsumerQueue<T>::Push(const T& rObj)
-    {
-        assert(m_arrBuffer != NULL);
-        assert(m_arrStates != NULL);
-        assert(m_nBufferSize != 0);
-        CryMT::detail::N_ProducerSingleConsumerQueueBase::Push((void*)&rObj, m_nProducerIndex, m_nComsumerIndex, m_nRunning, m_arrBuffer, m_nBufferSize, sizeof(T), m_arrStates);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    template<typename T>
-    inline bool N_ProducerSingleConsumerQueue<T>::Pop(T* pResult)
-    {
-        assert(m_arrBuffer != NULL);
-        assert(m_arrStates != NULL);
-        assert(m_nBufferSize != 0);
-        return CryMT::detail::N_ProducerSingleConsumerQueueBase::Pop(pResult, m_nProducerIndex, m_nComsumerIndex, m_nRunning, m_arrBuffer, m_nBufferSize, sizeof(T), m_arrStates);
-    }
-} //namespace CryMT
-
-// Include all multithreading containers.
-#include "MultiThread_Containers.h"
diff --git a/Code/CryEngine/CryCommon/CryThreadImpl.h b/Code/CryEngine/CryCommon/CryThreadImpl.h
deleted file mode 100644
index 1928ee0774..0000000000
--- a/Code/CryEngine/CryCommon/CryThreadImpl.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-
-#include <CryThread.h>
-
-// Include architecture specific code.
-#if defined(LINUX) || defined(APPLE)
-#include <CryThreadImpl_pthreads.h>
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32) || defined(WIN64)
-#include <CryThreadImpl_windows.h>
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(CryThreadImpl_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-// Put other platform specific includes here!
-#endif
diff --git a/Code/CryEngine/CryCommon/CryThreadImpl_pthreads.h b/Code/CryEngine/CryCommon/CryThreadImpl_pthreads.h
deleted file mode 100644
index a8895f5bbc..0000000000
--- a/Code/CryEngine/CryCommon/CryThreadImpl_pthreads.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYTHREADIMPL_PTHREADS_H
-#define CRYINCLUDE_CRYCOMMON_CRYTHREADIMPL_PTHREADS_H
-#pragma once
-
-
-#include "CryThread_pthreads.h"
-
-#if PLATFORM_SUPPORTS_THREADLOCAL
-THREADLOCAL CrySimpleThreadSelf
-* CrySimpleThreadSelf::m_Self = NULL;
-#else
-TLS_DEFINE(CrySimpleThreadSelf*, g_CrySimpleThreadSelf)
-#endif
-
-
-//////////////////////////////////////////////////////////////////////////
-// CryEvent(Timed) implementation
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void CryEventTimed::Reset()
-{
-    m_lockNotify.Lock();
-    m_flag = false;
-    m_lockNotify.Unlock();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryEventTimed::Set()
-{
-    m_lockNotify.Lock();
-    m_flag = true;
-    m_cond.Notify();
-    m_lockNotify.Unlock();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryEventTimed::Wait()
-{
-    m_lockNotify.Lock();
-    if (!m_flag)
-    {
-        m_cond.Wait(m_lockNotify);
-    }
-    m_flag  =   false;
-    m_lockNotify.Unlock();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CryEventTimed::Wait(const uint32 timeoutMillis)
-{
-    bool bResult = true;
-    m_lockNotify.Lock();
-    if (!m_flag)
-    {
-        bResult = m_cond.TimedWait(m_lockNotify, timeoutMillis);
-    }
-    m_flag  =   false;
-    m_lockNotify.Unlock();
-    return bResult;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// CryCriticalSection implementation
-///////////////////////////////////////////////////////////////////////////////
-typedef CryLockT<CRYLOCK_RECURSIVE> TCritSecType;
-
-void  CryDeleteCriticalSection(void* cs)
-{
-    delete ((TCritSecType*)cs);
-}
-
-void  CryEnterCriticalSection(void* cs)
-{
-    ((TCritSecType*)cs)->Lock();
-}
-
-bool  CryTryCriticalSection(void* cs)
-{
-    return false;
-}
-
-void  CryLeaveCriticalSection(void* cs)
-{
-    ((TCritSecType*)cs)->Unlock();
-}
-
-void  CryCreateCriticalSectionInplace(void* pCS)
-{
-    new (pCS) TCritSecType;
-}
-
-void CryDeleteCriticalSectionInplace(void*)
-{
-}
-
-void* CryCreateCriticalSection()
-{
-    return (void*) new TCritSecType;
-}
-
-#if AZ_TRAIT_SKIP_CRYINTERLOCKED
-#elif defined(INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED)
-//////////////////////////////////////////////////////////////////////////
-void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
-{
-    AZStd::lock_guard<AZStd::mutex> lock(list.mutex);
-
-    element.pNext = list.pNext;
-    list.pNext = &element;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
-{
-    AZStd::lock_guard<AZStd::mutex> lock(list.mutex);
-
-    SLockFreeSingleLinkedListEntry* returnValue = list.pNext;
-    if (list.pNext)
-    {
-        list.pNext = list.pNext->pNext;
-    }
-    return returnValue;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
-{
-    AZStd::lock_guard<AZStd::mutex> lock(list.mutex);
-
-    list.pNext = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
-{
-    AZStd::lock_guard<AZStd::mutex> lock(list.mutex);
-
-    SLockFreeSingleLinkedListEntry* returnValue = list.pNext;
-    list.pNext = nullptr;
-    return returnValue;
-}
-
-#elif defined(LINUX32)
-//////////////////////////////////////////////////////////////////////////
-// Implementation for Linux32 with gcc using uint64
-//////////////////////////////////////////////////////////////////////////
-void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
-{
-    uint32 curSetting[2];
-    uint32 newSetting[2];
-    uint32 newPointer = (uint32) & element;
-    do
-    {
-        curSetting[0] = (uint32)list.pNext;
-        curSetting[1] = list.salt;
-        element.pNext = (SLockFreeSingleLinkedListEntry*)curSetting[0];
-        newSetting[0] = newPointer;     // new pointer
-        newSetting[1] = curSetting[1] + 1;   // new salt
-    }
-    while (false == __sync_bool_compare_and_swap((volatile uint64*)&list.pNext, *(uint64*)&curSetting[0], *(uint64*)&newSetting[0]));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
-{
-    uint32 curSetting[2];
-    uint32 newSetting[2];
-    do
-    {
-        curSetting[1] = list.salt;
-        curSetting[0] = (uint32)list.pNext;
-        if (curSetting[0] == 0)
-        {
-            return NULL;
-        }
-        newSetting[0] = *(uint32*)curSetting[0];     // new pointer
-        newSetting[1] = curSetting[1] + 1;   // new salt
-    }
-    while (false == __sync_bool_compare_and_swap((volatile uint64*)&list.pNext, *(uint64*)&curSetting[0], *(uint64*)&newSetting[0]));
-    return (void*)curSetting[0];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
-{
-    list.salt = 0;
-    list.pNext = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
-{
-    uint32 curSetting[2];
-    uint32 newSetting[2];
-    uint32 newSalt;
-    uint32 newPointer;
-    do
-    {
-        curSetting[1] = list.salt;
-        curSetting[0] = (uint32)list.pNext;
-        if (curSetting[0] == 0)
-        {
-            return NULL;
-        }
-        newSetting[0] = 0;
-        newSetting[1] = curSetting[1] + 1;
-    }
-    while (false == __sync_bool_compare_and_swap((volatile uint64*)&list.pNext, *(uint64*)&curSetting[0], *(uint64*)&newSetting[0]));
-    return (void*)curSetting[0];
-}
-#else
-// This implementation get's used on multiple platforms that support uint128 compare and swap.
-
-//////////////////////////////////////////////////////////////////////////
-// LINUX64 Implementation of Lockless Single Linked List
-//////////////////////////////////////////////////////////////////////////
-typedef __uint128_t uint128;
-
-//////////////////////////////////////////////////////////////////////////
-// Implementation for Linux64 with gcc using __int128_t
-//////////////////////////////////////////////////////////////////////////
-void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
-{
-    uint64 curSetting[2];
-    uint64 newSetting[2];
-    uint64 newPointer = (uint64) & element;
-    do
-    {
-        curSetting[0] = (uint64)list.pNext;
-        curSetting[1] = list.salt;
-        element.pNext = (SLockFreeSingleLinkedListEntry*)curSetting[0];
-        newSetting[0] = newPointer;     // new pointer
-        newSetting[1] = curSetting[1] + 1;   // new salt
-    }
-    // while (false == __sync_bool_compare_and_swap( (volatile uint128*)&list.pNext,*(uint128*)&curSetting[0],*(uint128*)&newSetting[0] ));
-    while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
-{
-    uint64 curSetting[2];
-    uint64 newSetting[2];
-    do
-    {
-        curSetting[1] = list.salt;
-        curSetting[0] = (uint64)list.pNext;
-        if (curSetting[0] == 0)
-        {
-            return NULL;
-        }
-        newSetting[0] = *(uint64*)curSetting[0];     // new pointer
-        newSetting[1] = curSetting[1] + 1;   // new salt
-    }
-    //while (false == __sync_bool_compare_and_swap( (volatile uint128*)&list.pNext,*(uint128*)&curSetting[0],*(uint128*)&newSetting[0] ));
-    while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
-    return (void*)curSetting[0];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
-{
-    list.salt = 0;
-    list.pNext = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
-{
-    uint64 curSetting[2];
-    uint64 newSetting[2];
-    uint64 newSalt;
-    uint64 newPointer;
-    do
-    {
-        curSetting[1] = list.salt;
-        curSetting[0] = (uint64)list.pNext;
-        if (curSetting[0] == 0)
-        {
-            return NULL;
-        }
-        newSetting[0] = 0;
-        newSetting[1] = curSetting[1] + 1;
-    }
-    //  while (false == __sync_bool_compare_and_swap( (volatile uint128*)&list.pNext,*(uint128*)&curSetting[0],*(uint128*)&newSetting[0] ));
-    while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
-    return (void*)curSetting[0];
-}
-//////////////////////////////////////////////////////////////////////////
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYTHREADIMPL_PTHREADS_H
diff --git a/Code/CryEngine/CryCommon/CryThreadImpl_windows.h b/Code/CryEngine/CryCommon/CryThreadImpl_windows.h
deleted file mode 100644
index 1dd8dd4c26..0000000000
--- a/Code/CryEngine/CryCommon/CryThreadImpl_windows.h
+++ /dev/null
@@ -1,598 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <windows.h>
-#include <process.h>
-#include <AzCore/std/parallel/semaphore.h> // for CreateSemaphore
-struct SThreadNameDesc
-{
-    DWORD dwType;
-    LPCSTR szName;
-    DWORD dwThreadID;
-    DWORD dwFlags;
-};
-
-THREADLOCAL CrySimpleThreadSelf* CrySimpleThreadSelf::m_Self = NULL;
-
-//////////////////////////////////////////////////////////////////////////
-CryEvent::CryEvent()
-{
-    m_handle = (void*)CreateEvent(NULL, FALSE, FALSE, NULL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CryEvent::~CryEvent()
-{
-    CloseHandle(m_handle);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryEvent::Reset()
-{
-    ResetEvent(m_handle);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryEvent::Set()
-{
-    SetEvent(m_handle);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryEvent::Wait() const
-{
-    WaitForSingleObject(m_handle, INFINITE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CryEvent::Wait(const uint32 timeoutMillis) const
-{
-    if (WaitForSingleObject(m_handle, timeoutMillis) == WAIT_TIMEOUT)
-    {
-        return false;
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CryLock_WinMutex
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-CryLock_WinMutex::CryLock_WinMutex()
-    : m_hdl(CreateMutex(NULL, FALSE, NULL)) {}
-CryLock_WinMutex::~CryLock_WinMutex()
-{
-    CloseHandle(m_hdl);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryLock_WinMutex::Lock()
-{
-    WaitForSingleObject(m_hdl, INFINITE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryLock_WinMutex::Unlock()
-{
-    ReleaseMutex(m_hdl);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CryLock_WinMutex::TryLock()
-{
-    return WaitForSingleObject(m_hdl, 0) != WAIT_TIMEOUT;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CryLock_CritSection
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-CryLock_CritSection::CryLock_CritSection()
-{
-    InitializeCriticalSection((CRITICAL_SECTION*)&m_cs);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CryLock_CritSection::~CryLock_CritSection()
-{
-    DeleteCriticalSection((CRITICAL_SECTION*)&m_cs);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryLock_CritSection::Lock()
-{
-    EnterCriticalSection((CRITICAL_SECTION*)&m_cs);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryLock_CritSection::Unlock()
-{
-    LeaveCriticalSection((CRITICAL_SECTION*)&m_cs);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CryLock_CritSection::TryLock()
-{
-    return TryEnterCriticalSection((CRITICAL_SECTION*)&m_cs) != FALSE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// most of this is taken from http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
-//////////////////////////////////////////////////////////////////////////
-CryConditionVariable::CryConditionVariable()
-{
-    m_waitersCount = 0;
-    m_wasBroadcast = 0;
-    m_sema = CreateSemaphore(NULL, 0, 0x7fffffff, NULL);
-    InitializeCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    m_waitersDone = CreateEvent(NULL, FALSE, FALSE, NULL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CryConditionVariable::~CryConditionVariable()
-{
-    CloseHandle(m_sema);
-    DeleteCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    CloseHandle(m_waitersDone);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryConditionVariable::Wait(LockType& lock)
-{
-    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    m_waitersCount++;
-    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-
-    SignalObjectAndWait(lock._get_win32_handle(), m_sema, INFINITE, FALSE);
-
-    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    m_waitersCount--;
-    bool lastWaiter = m_wasBroadcast && m_waitersCount == 0;
-    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-
-    if (lastWaiter)
-    {
-        SignalObjectAndWait(m_waitersDone, lock._get_win32_handle(), INFINITE, FALSE);
-    }
-    else
-    {
-        WaitForSingleObject(lock._get_win32_handle(), INFINITE);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CryConditionVariable::TimedWait(LockType& lock, uint32 millis)
-{
-    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    m_waitersCount++;
-    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-
-    bool ok = true;
-    if (WAIT_TIMEOUT == SignalObjectAndWait(lock._get_win32_handle(), m_sema, millis, FALSE))
-    {
-        ok = false;
-    }
-
-    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    m_waitersCount--;
-    bool lastWaiter = m_wasBroadcast && m_waitersCount == 0;
-    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-
-    if (lastWaiter)
-    {
-        SignalObjectAndWait(m_waitersDone, lock._get_win32_handle(), INFINITE, FALSE);
-    }
-    else
-    {
-        WaitForSingleObject(lock._get_win32_handle(), INFINITE);
-    }
-
-    return ok;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryConditionVariable::NotifySingle()
-{
-    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    bool haveWaiters = m_waitersCount > 0;
-    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    if (haveWaiters)
-    {
-        ReleaseSemaphore(m_sema, 1, 0);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryConditionVariable::Notify()
-{
-    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    bool haveWaiters = false;
-    if (m_waitersCount > 0)
-    {
-        m_wasBroadcast = 1;
-        haveWaiters = true;
-    }
-    if (haveWaiters)
-    {
-        ReleaseSemaphore(m_sema, m_waitersCount, 0);
-        LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-        WaitForSingleObject(m_waitersDone, INFINITE);
-        m_wasBroadcast = 0;
-    }
-    else
-    {
-        LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CrySemaphore::CrySemaphore(int nMaximumCount, int nInitialCount)
-{
-    m_Semaphore = (void*)CreateSemaphore(NULL, nInitialCount, nMaximumCount, NULL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CrySemaphore::~CrySemaphore()
-{
-    CloseHandle((HANDLE)m_Semaphore);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CrySemaphore::Acquire()
-{
-    WaitForSingleObject((HANDLE)m_Semaphore, INFINITE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CrySemaphore::Release()
-{
-    ReleaseSemaphore((HANDLE)m_Semaphore, 1, NULL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CryFastSemaphore::CryFastSemaphore(int nMaximumCount, int nInitialCount)
-    : m_Semaphore(nMaximumCount)
-    , m_nCounter(nInitialCount)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CryFastSemaphore::~CryFastSemaphore()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryFastSemaphore::Acquire()
-{
-    int nCount = ~0;
-    do
-    {
-        nCount = *const_cast<volatile int*>(&m_nCounter);
-    } while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nCounter), nCount - 1, nCount) != nCount);
-
-    // if the count would have been 0 or below, go to kernel semaphore
-    if ((nCount - 1)  < 0)
-    {
-        m_Semaphore.Acquire();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryFastSemaphore::Release()
-{
-    int nCount = ~0;
-    do
-    {
-        nCount = *const_cast<volatile int*>(&m_nCounter);
-    } while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nCounter), nCount + 1, nCount) != nCount);
-
-    // wake up kernel semaphore if we have waiter
-    if (nCount < 0)
-    {
-        m_Semaphore.Release();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CryRWLock::CryRWLock()
-{
-    STATIC_ASSERT(sizeof(m_Lock) == sizeof(PSRWLOCK), "RWLock-pointer has invalid size");
-    InitializeSRWLock(reinterpret_cast<PSRWLOCK>(&m_Lock));
-}
-
-//////////////////////////////////////////////////////////////////////////
-CryRWLock::~CryRWLock()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryRWLock::RLock()
-{
-    AcquireSRWLockShared(reinterpret_cast<PSRWLOCK>(&m_Lock));
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(_CRYTHREAD_WANT_TRY_RWLOCK)
-bool CryRWLock::TryRLock()
-{
-    return TryAcquireSRWLockShared(reinterpret_cast<PSRWLOCK>(&m_Lock)) != 0;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-void CryRWLock::RUnlock()
-{
-    ReleaseSRWLockShared(reinterpret_cast<PSRWLOCK>(&m_Lock));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryRWLock::WLock()
-{
-    AcquireSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&m_Lock));
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(_CRYTHREAD_WANT_TRY_RWLOCK)
-bool CryRWLock::TryWLock()
-{
-    return TryAcquireSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&m_Lock)) != 0;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-void CryRWLock::WUnlock()
-{
-    ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&m_Lock));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryRWLock::Lock()
-{
-    WLock();
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(_CRYTHREAD_WANT_TRY_RWLOCK)
-bool CryRWLock::TryLock()
-{
-    return TryWLock();
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-void CryRWLock::Unlock()
-{
-    WUnlock();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CrySimpleThreadSelf::CrySimpleThreadSelf()
-    : m_thread(NULL)
-    , m_threadId(0)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CrySimpleThreadSelf::WaitForThread()
-{
-    assert(m_thread);
-    PREFAST_ASSUME(m_thread);
-    if (GetCurrentThreadId() != m_threadId)
-    {
-        WaitForSingleObject((HANDLE)m_thread, INFINITE);
-    }
-}
-
-CrySimpleThreadSelf::~CrySimpleThreadSelf()
-{
-    if (m_thread)
-    {
-        CloseHandle(m_thread);
-    }
-}
-
-void CrySimpleThreadSelf::StartThread(unsigned (__stdcall * func)(void*), void* argList)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(CryThreadImpl_windows_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    m_thread = (void*)_beginthreadex(NULL, 0, func, argList, CREATE_SUSPENDED, &m_threadId);
-#endif
-    assert(m_thread);
-    PREFAST_ASSUME(m_thread);
-    ResumeThread((HANDLE)m_thread);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
-{
-    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListHeader) == sizeof(SLIST_HEADER), CRY_INTERLOCKED_SLIST_HEADER_HAS_WRONG_SIZE);
-    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListEntry) >= sizeof(SLIST_ENTRY), CRY_INTERLOCKED_SLIST_ENTRY_HAS_WRONG_SIZE);
-
-    assert(IsAligned(&list, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Header has wrong Alignment");
-    assert(IsAligned(&element, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Entry has wrong Alignment");
-    InterlockedPushEntrySList(alias_cast<PSLIST_HEADER>(&list), alias_cast<PSLIST_ENTRY>(&element));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
-{
-    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListHeader) == sizeof(SLIST_HEADER), CRY_INTERLOCKED_SLIST_HEADER_HAS_WRONG_SIZE);
-
-    assert(IsAligned(&list, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Header has wrong Alignment");
-    return reinterpret_cast<void*>(InterlockedPopEntrySList(alias_cast<PSLIST_HEADER>(&list)));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
-{
-    assert(IsAligned(&list, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Header has wrong Alignment");
-
-    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListHeader) == sizeof(SLIST_HEADER), CRY_INTERLOCKED_SLIST_HEADER_HAS_WRONG_SIZE);
-    InitializeSListHead(alias_cast<PSLIST_HEADER>(&list));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
-{
-    assert(IsAligned(&list, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Header has wrong Alignment");
-
-    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListHeader) == sizeof(SLIST_HEADER), CRY_INTERLOCKED_SLIST_HEADER_HAS_WRONG_SIZE);
-    return InterlockedFlushSList(alias_cast<PSLIST_HEADER>(&list));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// base class for lock less Producer/Consumer queue, due platforms specific they
-// are implemeted in CryThead_platform.h
-namespace CryMT {
-    namespace detail {
-        ///////////////////////////////////////////////////////////////////////////////
-        void SingleProducerSingleConsumerQueueBase::Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize)
-        {
-            // spin if queue is full
-            int iter = 0;
-            while (rProducerIndex - rComsumerIndex == nBufferSize)
-            {
-                CryLowLatencySleep(iter++ > 10 ? 1 : 0);
-            }
-
-            MemoryBarrier();
-            char* pBuffer = alias_cast<char*>(arrBuffer);
-            uint32 nIndex = rProducerIndex % nBufferSize;
-
-            memcpy(pBuffer + (nIndex * nObjectSize), pObj, nObjectSize);
-            MemoryBarrier();
-            rProducerIndex += 1;
-            MemoryBarrier();
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////
-        void SingleProducerSingleConsumerQueueBase::Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize)
-        {
-            MemoryBarrier();
-            // busy-loop if queue is empty
-            int iter = 0;
-            while (rProducerIndex - rComsumerIndex == 0)
-            {
-                CryLowLatencySleep(iter++ > 10 ? 1 : 0);
-            }
-
-            char* pBuffer = alias_cast<char*>(arrBuffer);
-            uint32 nIndex = rComsumerIndex % nBufferSize;
-
-            memcpy(pObj, pBuffer + (nIndex * nObjectSize), nObjectSize);
-            MemoryBarrier();
-            rComsumerIndex += 1;
-            MemoryBarrier();
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////
-        void N_ProducerSingleConsumerQueueBase::Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, [[maybe_unused]] volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*    arrStates)
-        {
-            MemoryBarrier();
-            uint32 nProducerIndex;
-            uint32 nComsumerIndex;
-
-            int iter = 0;
-            do
-            {
-                nProducerIndex = rProducerIndex;
-                nComsumerIndex = rComsumerIndex;
-
-                if (nProducerIndex - nComsumerIndex == nBufferSize)
-                {
-                    CryLowLatencySleep(iter++ > 10 ? 1 : 0);
-                    if (iter > 20) // 10 spins + 10 ms wait
-                    {
-                        uint32 nSizeToAlloc = sizeof(SFallbackList) + nObjectSize - 1;
-                        SFallbackList* pFallbackEntry = (SFallbackList*)CryModuleMemalign(nSizeToAlloc, 128);
-                        memcpy(pFallbackEntry->object, pObj, nObjectSize);
-                        MemoryBarrier();
-                        CryInterlockedPushEntrySList(fallbackList,  pFallbackEntry->nextEntry);
-                        return;
-                    }
-                    continue;
-                }
-
-                if (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&rProducerIndex), nProducerIndex + 1, nProducerIndex) == nProducerIndex)
-                {
-                    break;
-                }
-            } while (true);
-
-            MemoryBarrier();
-            char* pBuffer = alias_cast<char*>(arrBuffer);
-            uint32 nIndex = nProducerIndex % nBufferSize;
-
-            memcpy(pBuffer + (nIndex * nObjectSize), pObj, nObjectSize);
-            MemoryBarrier();
-            arrStates[nIndex] = 1;
-            MemoryBarrier();
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////
-        bool N_ProducerSingleConsumerQueueBase::Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32* arrStates)
-        {
-            MemoryBarrier();
-
-            // busy-loop if queue is empty
-            int iter = 0;
-            if (rRunning && rProducerIndex - rComsumerIndex == 0)
-            {
-                while (rRunning && rProducerIndex - rComsumerIndex == 0)
-                {
-                    CryLowLatencySleep(iter++ > 10 ? 1 : 0);
-                }
-            }
-
-            if (rRunning == 0 && rProducerIndex - rComsumerIndex == 0)
-            {
-                SFallbackList* pFallback = (SFallbackList*)CryInterlockedPopEntrySList(fallbackList);
-                IF (pFallback, 0)
-                {
-                    memcpy(pObj, pFallback->object, nObjectSize);
-                    CryModuleMemalignFree(pFallback);
-                    return true;
-                }
-                // if the queue was empty, make sure we really are empty
-                return false;
-            }
-
-            iter = 0;
-            while (arrStates[rComsumerIndex % nBufferSize] == 0)
-            {
-                CryLowLatencySleep(iter++ > 10 ? 1 : 0);
-            }
-
-            char* pBuffer = alias_cast<char*>(arrBuffer);
-            uint32 nIndex = rComsumerIndex % nBufferSize;
-
-            memcpy(pObj, pBuffer + (nIndex * nObjectSize), nObjectSize);
-            MemoryBarrier();
-            arrStates[nIndex] = 0;
-            MemoryBarrier();
-            rComsumerIndex += 1;
-            MemoryBarrier();
-
-            return true;
-        }
-    } // namespace detail
-} // namespace CryMT
diff --git a/Code/CryEngine/CryCommon/CryThread_dummy.h b/Code/CryEngine/CryCommon/CryThread_dummy.h
deleted file mode 100644
index ea9804c6eb..0000000000
--- a/Code/CryEngine/CryCommon/CryThread_dummy.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYTHREAD_DUMMY_H
-#define CRYINCLUDE_CRYCOMMON_CRYTHREAD_DUMMY_H
-#pragma once
-
-#include <AzCore/base.h>
-
-//////////////////////////////////////////////////////////////////////////
-CryEvent::CryEvent() {}
-CryEvent::~CryEvent() {}
-void CryEvent::Reset() {}
-void CryEvent::Set() {}
-void CryEvent::Wait() const {}
-bool CryEvent::Wait(const uint32 timeoutMillis) const {}
-typedef CryEvent CryEventTimed;
-
-//////////////////////////////////////////////////////////////////////////
-class _DummyLock
-{
-public:
-    _DummyLock();
-
-    void Lock();
-    bool TryLock();
-    void Unlock();
-
-#if defined(AZ_DEBUG_BUILD)
-    bool IsLocked();
-#endif
-};
-
-template<>
-class CryLock<CRYLOCK_FAST>
-    : public _DummyLock
-{
-    CryLock(const CryLock<CRYLOCK_FAST>&);
-    void operator = (const CryLock<CRYLOCK_FAST>&);
-
-public:
-    CryLock();
-};
-
-template<>
-class CryLock<CRYLOCK_RECURSIVE>
-    : public _DummyLock
-{
-    CryLock(const CryLock<CRYLOCK_RECURSIVE>&);
-    void operator = (const CryLock<CRYLOCK_RECURSIVE>&);
-
-public:
-    CryLock();
-};
-
-template<>
-class CryCondLock<CRYLOCK_FAST>
-    : public CryLock<CRYLOCK_FAST>
-{
-};
-
-template<>
-class CryCondLock<CRYLOCK_RECURSIVE>
-    : public CryLock<CRYLOCK_FAST>
-{
-};
-
-template<>
-class CryCond< CryLock<CRYLOCK_FAST> >
-{
-    typedef CryLock<CRYLOCK_FAST> LockT;
-    CryCond(const CryCond<LockT>&);
-    void operator = (const CryCond<LockT>&);
-
-public:
-    CryCond();
-
-    void Notify();
-    void NotifySingle();
-    void Wait(LockT&);
-    bool TimedWait(LockT &, uint32);
-};
-
-template<>
-class CryCond< CryLock<CRYLOCK_RECURSIVE> >
-{
-    typedef CryLock<CRYLOCK_RECURSIVE> LockT;
-    CryCond(const CryCond<LockT>&);
-    void operator = (const CryCond<LockT>&);
-
-public:
-    CryCond();
-
-    void Notify();
-    void NotifySingle();
-    void Wait(LockT&);
-    bool TimedWait(LockT &, uint32);
-};
-
-class _DummyRWLock
-{
-public:
-    _DummyRWLock() { }
-
-    void RLock();
-    bool TryRLock();
-    void WLock();
-    bool TryWLock();
-    void Lock() { WLock(); }
-    bool TryLock() { return TryWLock(); }
-    void Unlock();
-};
-
-template<class Runnable>
-class CrySimpleThread
-    : public CryRunnable
-{
-public:
-    typedef void (* ThreadFunction)(void*);
-
-    CrySimpleThread();
-    virtual ~CrySimpleThread();
-#if !defined(NO_THREADINFO)
-    CryThreadInfo& GetInfo();
-#endif
-    const char* GetName();
-    void SetName(const char*);
-
-    virtual void Run();
-    virtual void Cancel();
-    virtual void Start(Runnable&, unsigned = 0, const char* = NULL);
-    virtual void Start(unsigned = 0, const char* = NULL);
-    void StartFunction(ThreadFunction, void* = NULL, unsigned = 0);
-
-    void Exit();
-    void Join();
-    unsigned SetCpuMask(unsigned);
-    unsigned GetCpuMask();
-
-    void Stop();
-    bool IsStarted() const;
-    bool IsRunning() const;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYTHREAD_DUMMY_H
-
diff --git a/Code/CryEngine/CryCommon/CryThread_pthreads.h b/Code/CryEngine/CryCommon/CryThread_pthreads.h
deleted file mode 100644
index b1d40dc10f..0000000000
--- a/Code/CryEngine/CryCommon/CryThread_pthreads.h
+++ /dev/null
@@ -1,1328 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <AzCore/PlatformRestrictedFileDef.h>
-
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <sched.h>
-
-#include <ISystem.h>
-#include <ILog.h>
-#include <errno.h>
-
-// Section dictionary
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define CRYTHREAD_PTHREADS_H_SECTION_REGISTER_THREAD 1
-#define CRYTHREAD_PTHREADS_H_SECTION_TRAITS 2
-#define CRYTHREAD_PTHREADS_H_SECTION_PTHREADCOND 3
-#define CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_CONSTRUCT 4
-#define CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_DESTROY 5
-#define CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_ACQUIRE 6
-#define CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_RELEASE 7
-#define CRYTHREAD_PTHREADS_H_SECTION_TRY_RLOCK 8
-#define CRYTHREAD_PTHREADS_H_SECTION_TRY_WLOCK 9
-#define CRYTHREAD_PTHREADS_H_SECTION_START_RUNNABLE 10
-#define CRYTHREAD_PTHREADS_H_SECTION_START_CPUMASK 11
-#define CRYTHREAD_PTHREADS_H_SECTION_START_CPUMASK_POSTCREATE 12
-#define CRYTHREAD_PTHREADS_H_SECTION_SETCPUMASK 13
-#define CRYTHREAD_PTHREADS_H_SECTION_START_RUNNABLE_CPUMASK_POSTCREATE 14
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_REGISTER_THREAD
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#endif
-
-#if !defined(RegisterThreadName)
-    #define RegisterThreadName(id, name)
-    #define UnRegisterThreadName(id)
-#endif
-
-#if defined(APPLE) || defined(ANDROID)
-// PTHREAD_MUTEX_FAST_NP is only defined by Pthreads-w32, thus not on MAC
-    #define PTHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_NORMAL
-#endif
-
-// Define LARGE_THREAD_STACK to use larger than normal per-thread stack
-#if defined(_DEBUG) && (defined(MAC) || defined(LINUX) || defined(AZ_PLATFORM_IOS))
-#define LARGE_THREAD_STACK
-#endif
-
-#if defined(LINUX)
-#undef RegisterThreadName
-ILINE void RegisterThreadName(pthread_t id, const char* name)
-{
-    if ((!name) || (!id))
-    {
-        return;
-    }
-    int ret;
-    // pthread names on linux are limited to 16 char
-    if (strlen(name) >= 16)
-    {
-        char thread_name[16];
-        memcpy(thread_name, name, 15);
-        thread_name[15] = 0;
-        ret = pthread_setname_np(id, thread_name);
-    }
-    else
-    {
-        ret = pthread_setname_np(id, name);
-    }
-    if (ret != 0)
-    {
-        CryLog("Failed to set thread name for %" PRI_THREADID ", name: %s", id, name);
-    }
-}
-#endif
-
-#if !defined _CRYTHREAD_HAVE_LOCK
-template<class LockClass>
-class _PthreadCond;
-template<int PthreadMutexType>
-class _PthreadLockBase;
-
-template<int PthreadMutexType>
-class _PthreadLockAttr
-{
-    friend class _PthreadLockBase<PthreadMutexType>;
-
-protected:
-    _PthreadLockAttr()
-    {
-        pthread_mutexattr_init(&m_Attr);
-        pthread_mutexattr_settype(&m_Attr, PthreadMutexType);
-    }
-    ~_PthreadLockAttr()
-    {
-        pthread_mutexattr_destroy(&m_Attr);
-    }
-    pthread_mutexattr_t m_Attr;
-};
-
-template<int PthreadMutexType>
-class _PthreadLockBase
-{
-protected:
-    static pthread_mutexattr_t& GetAttr()
-    {
-        static _PthreadLockAttr<PthreadMutexType> m_Attr;
-        return m_Attr.m_Attr;
-    }
-};
-
-template<class LockClass, int PthreadMutexType>
-class _PthreadLock
-    : public _PthreadLockBase<PthreadMutexType>
-{
-    friend class _PthreadCond<LockClass>;
-
-    //#if defined(_DEBUG)
-public:
-    //#endif
-    pthread_mutex_t m_Lock;
-
-public:
-    _PthreadLock()
-        : LockCount(0)
-    {
-        pthread_mutex_init(
-            &m_Lock,
-            &_PthreadLockBase<PthreadMutexType>::GetAttr());
-    }
-    ~_PthreadLock() { pthread_mutex_destroy(&m_Lock); }
-
-    void Lock() { pthread_mutex_lock(&m_Lock); CryInterlockedIncrement(&LockCount); }
-
-    bool TryLock()
-    {
-        const int rc = pthread_mutex_trylock(&m_Lock);
-        if (0 == rc)
-        {
-            CryInterlockedIncrement(&LockCount);
-            return true;
-        }
-        return false;
-    }
-
-    void Unlock() { CryInterlockedDecrement(&LockCount); pthread_mutex_unlock(&m_Lock); }
-
-    // Get the POSIX pthread_mutex_t.
-    // Warning:
-    // This method will not be available in the Win32 port of CryThread.
-    pthread_mutex_t& Get_pthread_mutex_t() { return m_Lock; }
-
-    bool IsLocked()
-    {
-#if defined(LINUX) || defined(APPLE)
-        // implementation taken from CrysisWars
-        return LockCount > 0;
-#else
-        return true;
-#endif
-    }
-
-private:
-    volatile int LockCount;
-};
-
-#if defined CRYLOCK_HAVE_FASTLOCK
-    #if defined(_DEBUG) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
-template<>
-class CryLockT<CRYLOCK_FAST>
-    : public _PthreadLock<CryLockT<CRYLOCK_FAST>, PTHREAD_MUTEX_ERRORCHECK_NP>
-    #else
-template<>
-class CryLockT<CRYLOCK_FAST>
-    : public _PthreadLock<CryLockT<CRYLOCK_FAST>, PTHREAD_MUTEX_FAST_NP>
-    #endif
-{
-    CryLockT(const CryLockT<CRYLOCK_FAST>&);
-    void operator = (const CryLockT<CRYLOCK_FAST>&);
-
-public:
-    CryLockT() { }
-};
-#endif // CRYLOCK_HAVE_FASTLOCK
-
-template<>
-class CryLockT<CRYLOCK_RECURSIVE>
-    : public _PthreadLock<CryLockT<CRYLOCK_RECURSIVE>, PTHREAD_MUTEX_RECURSIVE>
-{
-    CryLockT(const CryLockT<CRYLOCK_RECURSIVE>&);
-    void operator = (const CryLockT<CRYLOCK_RECURSIVE>&);
-
-public:
-    CryLockT() { }
-};
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_TRAITS
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#else
-#if !defined(LINUX) && !defined(APPLE)
-#define CRYTHREAD_PTHREADS_H_TRAIT_DEFINE_CRYMUTEX 1
-#endif
-#if !defined(LINUX) && !defined(APPLE)
-#define CRYTHREAD_PTHREADS_H_TRAIT_SET_THREAD_NAME 1
-#endif
-#endif
-
-#if CRYTHREAD_PTHREADS_H_TRAIT_DEFINE_CRYMUTEX
-#if defined CRYLOCK_HAVE_FASTLOCK
-class CryMutex
-    : public CryLockT<CRYLOCK_FAST>
-{
-};
-#else
-class CryMutex
-    : public CryLockT<CRYLOCK_RECURSIVE>
-{
-};
-#endif
-#endif // CRYTHREAD_PTHREADS_TRAIT_DEFINE_CRYMUTEX
-
-template<class LockClass>
-class _PthreadCond
-{
-    pthread_cond_t m_Cond;
-
-public:
-    _PthreadCond() { pthread_cond_init(&m_Cond, NULL); }
-    ~_PthreadCond() { pthread_cond_destroy(&m_Cond); }
-    void Notify() { pthread_cond_broadcast(&m_Cond); }
-    void NotifySingle() { pthread_cond_signal(&m_Cond); }
-    void Wait(LockClass& Lock) { pthread_cond_wait(&m_Cond, &Lock.m_Lock); }
-    bool TimedWait(LockClass& Lock, uint32 milliseconds)
-    {
-        struct timeval now;
-        struct timespec timeout;
-        int err;
-
-        gettimeofday(&now, NULL);
-        while (true)
-        {
-            timeout.tv_sec = now.tv_sec + milliseconds / 1000;
-            uint64 nsec = (uint64)now.tv_usec * 1000 + (uint64)milliseconds * 1000000;
-            if (nsec >= 1000000000)
-            {
-                timeout.tv_sec += (long)(nsec / 1000000000);
-                nsec %= 1000000000;
-            }
-            timeout.tv_nsec = (long)nsec;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_PTHREADCOND
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-            #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-            err = pthread_cond_timedwait(&m_Cond, &Lock.m_Lock, &timeout);
-            if (err == EINTR)
-            {
-                // Interrupted by a signal.
-                continue;
-            }
-            else if (err == ETIMEDOUT)
-            {
-                return false;
-            }
-#endif
-            else
-            {
-                assert(err == 0);
-            }
-            break;
-        }
-        return true;
-    }
-
-    // Get the POSIX pthread_cont_t.
-    // Warning:
-    // This method will not be available in the Win32 port of CryThread.
-    pthread_cond_t& Get_pthread_cond_t() { return m_Cond; }
-};
-
-#if AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS
-template <class LockClass>
-class CryConditionVariableT
-    : public _PthreadCond<LockClass>
-{
-};
-
-#if defined CRYLOCK_HAVE_FASTTLOCK
-template<>
-class CryConditionVariableT< CryLockT<CRYLOCK_FAST> >
-    : public _PthreadCond< CryLockT<CRYLOCK_FAST> >
-{
-    typedef CryLockT<CRYLOCK_FAST> LockClass;
-    CryConditionVariableT(const CryConditionVariableT<LockClass>&);
-    CryConditionVariableT<LockClass>& operator = (const CryConditionVariableT<LockClass>&);
-
-public:
-    CryConditionVariableT() { }
-};
-#endif // CRYLOCK_HAVE_FASTLOCK
-
-template<>
-class CryConditionVariableT< CryLockT<CRYLOCK_RECURSIVE> >
-    : public _PthreadCond< CryLockT<CRYLOCK_RECURSIVE> >
-{
-    typedef CryLockT<CRYLOCK_RECURSIVE> LockClass;
-    CryConditionVariableT(const CryConditionVariableT<LockClass>&);
-    CryConditionVariableT<LockClass>& operator = (const CryConditionVariableT<LockClass>&);
-
-public:
-    CryConditionVariableT() { }
-};
-
-#if !defined(_CRYTHREAD_CONDLOCK_GLITCH)
-typedef CryConditionVariableT< CryLockT<CRYLOCK_RECURSIVE> > CryConditionVariable;
-#else
-typedef CryConditionVariableT< CryLockT<CRYLOCK_FAST> > CryConditionVariable;
-#endif
-
-#define _CRYTHREAD_HAVE_LOCK 1
-
-#else // LINUX MAC
-
-#if defined CRYLOCK_HAVE_FASTLOCK
-template<>
-class CryConditionVariable
-    : public _PthreadCond< CryLockT<CRYLOCK_FAST> >
-{
-    typedef CryLockT<CRYLOCK_FAST> LockClass;
-    CryConditionVariable(const CryConditionVariable&);
-    CryConditionVariable& operator = (const CryConditionVariable&);
-
-public:
-    CryConditionVariable() { }
-};
-#endif // CRYLOCK_HAVE_FASTLOCK
-
-template<>
-class CryConditionVariable
-    : public _PthreadCond< CryLockT<CRYLOCK_RECURSIVE> >
-{
-    typedef CryLockT<CRYLOCK_RECURSIVE> LockClass;
-    CryConditionVariable(const CryConditionVariable&);
-    CryConditionVariable& operator = (const CryConditionVariable&);
-
-public:
-    CryConditionVariable() { }
-};
-
-#define _CRYTHREAD_HAVE_LOCK 1
-
-#endif // LINUX MAC
-#endif // !defined _CRYTHREAD_HAVE_LOCK
-
-//////////////////////////////////////////////////////////////////////////
-// Platform independet wrapper for a counting semaphore
-class CrySemaphore
-{
-public:
-    CrySemaphore(int nMaximumCount, int nInitialCount = 0);
-    ~CrySemaphore();
-
-    void Acquire();
-    void Release();
-
-private:
-#if defined(APPLE)
-    // Apple only supports named semaphores so have to use sem_open/unlink/sem_close instead
-    // of sem_open/sem_destroy, passing in this array for the name.
-    char m_semaphoreName[L_tmpnam];
-#endif
-    sem_t* m_Semaphore;
-};
-
-//////////////////////////////////////////////////////////////////////////
-inline CrySemaphore::CrySemaphore(int nMaximumCount, int nInitialCount)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_CONSTRUCT
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(APPLE)
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    tmpnam(m_semaphoreName);
-#   pragma clang diagnostic pop
-    m_Semaphore = sem_open(m_semaphoreName, O_CREAT | O_EXCL, 0644, nInitialCount);
-#else
-    m_Semaphore = new sem_t;
-    sem_init(m_Semaphore, 0, nInitialCount);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CrySemaphore::~CrySemaphore()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_DESTROY
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(APPLE)
-    sem_close(m_Semaphore);
-    sem_unlink(m_semaphoreName);
-#else
-    sem_destroy(m_Semaphore);
-    delete m_Semaphore;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline void CrySemaphore::Acquire()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_ACQUIRE
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    while (sem_wait(m_Semaphore) != 0 && errno == EINTR)
-    {
-        ;
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline void CrySemaphore::Release()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_RELEASE
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    sem_post(m_Semaphore);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Platform independet wrapper for a counting semaphore
-// except that this version uses C-A-S only until a blocking call is needed
-// -> No kernel call if there are object in the semaphore
-
-class CryFastSemaphore
-{
-public:
-    CryFastSemaphore(int nMaximumCount, int nInitialCount = 0);
-    ~CryFastSemaphore();
-    void Acquire();
-    void Release();
-
-private:
-    CrySemaphore m_Semaphore;
-    volatile int32 m_nCounter;
-};
-
-//////////////////////////////////////////////////////////////////////////
-inline CryFastSemaphore::CryFastSemaphore(int nMaximumCount, int nInitialCount)
-    : m_Semaphore(nMaximumCount)
-    , m_nCounter(nInitialCount)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline CryFastSemaphore::~CryFastSemaphore()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////
-inline void CryFastSemaphore::Acquire()
-{
-    int nCount = ~0;
-    do
-    {
-        nCount = *const_cast<volatile int*>(&m_nCounter);
-    } while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nCounter), nCount - 1, nCount) != nCount);
-
-    // if the count would have been 0 or below, go to kernel semaphore
-    if ((nCount - 1)  < 0)
-    {
-        m_Semaphore.Acquire();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline void CryFastSemaphore::Release()
-{
-    int nCount = ~0;
-    do
-    {
-        nCount = *const_cast<volatile int*>(&m_nCounter);
-    } while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nCounter), nCount + 1, nCount) != nCount);
-
-    // wake up kernel semaphore if we have waiter
-    if (nCount < 0)
-    {
-        m_Semaphore.Release();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if !defined _CRYTHREAD_HAVE_RWLOCK
-class CryRWLock
-{
-    pthread_rwlock_t m_Lock;
-
-    CryRWLock(const CryRWLock&);
-    CryRWLock& operator= (const CryRWLock&);
-
-public:
-    CryRWLock() { pthread_rwlock_init(&m_Lock, NULL); }
-    ~CryRWLock() { pthread_rwlock_destroy(&m_Lock); }
-    void RLock() { pthread_rwlock_rdlock(&m_Lock); }
-    bool TryRLock()
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_TRY_RLOCK
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-        #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        return pthread_rwlock_tryrdlock(&m_Lock) != EBUSY;
-#endif
-    }
-    void RUnlock() { Unlock(); }
-    void WLock() { pthread_rwlock_wrlock(&m_Lock); }
-    bool TryWLock()
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_TRY_RLOCK
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-        #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        return pthread_rwlock_trywrlock(&m_Lock) != EBUSY;
-#endif
-    }
-    void WUnlock() { Unlock(); }
-    void Lock() { WLock(); }
-    bool TryLock() { return TryWLock(); }
-    void Unlock() { pthread_rwlock_unlock(&m_Lock); }
-};
-
-// Indicate that this implementation header provides an implementation for
-// CryRWLock.
-#define _CRYTHREAD_HAVE_RWLOCK 1
-#endif // !defined _CRYTHREAD_HAVE_RWLOCK
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Provide TLS implementation using pthreads for those platforms without __thread
-////////////////////////////////////////////////////////////////////////////////
-
-struct SCryPthreadTLSBase
-{
-    SCryPthreadTLSBase(void (*pDestructor)(void*))
-    {
-        pthread_key_create(&m_kKey, pDestructor);
-    }
-
-    ~SCryPthreadTLSBase()
-    {
-        pthread_key_delete(m_kKey);
-    }
-
-    void* GetSpecific()
-    {
-        return pthread_getspecific(m_kKey);
-    }
-
-    void SetSpecific(const void* pValue)
-    {
-        pthread_setspecific(m_kKey, pValue);
-    }
-
-    pthread_key_t m_kKey;
-};
-
-template <typename T, bool bDirect>
-struct SCryPthreadTLSImpl{};
-
-template <typename T>
-struct SCryPthreadTLSImpl<T, true>
-    : private SCryPthreadTLSBase
-{
-    SCryPthreadTLSImpl()
-        :   SCryPthreadTLSBase(NULL)
-    {
-    }
-
-    T Get()
-    {
-        void* pSpecific(GetSpecific());
-        return *reinterpret_cast<const T*>(&pSpecific);
-    }
-
-    void Set(const T& kValue)
-    {
-        SetSpecific(*reinterpret_cast<const void* const*>(&kValue));
-    }
-};
-
-template <typename T>
-struct SCryPthreadTLSImpl<T, false>
-    : private SCryPthreadTLSBase
-{
-    SCryPthreadTLSImpl()
-        :   SCryPthreadTLSBase(&Destroy)
-    {
-    }
-
-    T* GetPtr()
-    {
-        T* pPtr(static_cast<T*>(GetSpecific()));
-        if (pPtr == NULL)
-        {
-            pPtr = new T();
-            SetSpecific(pPtr);
-        }
-        return pPtr;
-    }
-
-    static void Destroy(void* pPointer)
-    {
-        delete static_cast<T*>(pPointer);
-    }
-
-    const T& Get()
-    {
-        return *GetPtr();
-    }
-
-    void Set(const T& kValue)
-    {
-        *GetPtr() = kValue;
-    }
-};
-
-template <typename T>
-struct SCryPthreadTLS
-    : SCryPthreadTLSImpl<T, sizeof(T) <= sizeof(void*)>
-{
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// CryEvent(Timed) represent a synchronization event
-//////////////////////////////////////////////////////////////////////////
-class CryEventTimed
-{
-public:
-    ILINE CryEventTimed(){m_flag = false; }
-    ILINE ~CryEventTimed(){}
-
-    // Reset the event to the unsignalled state.
-    void Reset();
-    // Set the event to the signalled state.
-    void Set();
-    // Access a HANDLE to wait on.
-    void* GetHandle() const { return NULL; };
-    // Wait indefinitely for the object to become signalled.
-    void Wait();
-    // Wait, with a time limit, for the object to become signalled.
-    bool Wait(const uint32 timeoutMillis);
-
-private:
-    // Lock for synchronization of notifications.
-    CryCriticalSection m_lockNotify;
-#if defined(LINUX) || defined(APPLE)
-    CryConditionVariableT< CryLockT<CRYLOCK_RECURSIVE> > m_cond;
-#else
-    CryConditionVariable m_cond;
-#endif
-    volatile bool m_flag;
-};
-
-typedef CryEventTimed CryEvent;
-
-#if !PLATFORM_SUPPORTS_THREADLOCAL
-TLS_DECLARE(class CrySimpleThreadSelf*, g_CrySimpleThreadSelf);
-#endif
-
-class CrySimpleThreadSelf
-{
-protected:
-#if PLATFORM_SUPPORTS_THREADLOCAL
-
-    static CrySimpleThreadSelf* GetSelf()
-    {
-        return m_Self;
-    }
-
-    static void SetSelf(CrySimpleThreadSelf* pSelf)
-    {
-        m_Self = pSelf;
-    }
-private:
-    static THREADLOCAL CrySimpleThreadSelf* m_Self;
-
-#else
-
-    static CrySimpleThreadSelf* GetSelf()
-    {
-        return TLS_GET(CrySimpleThreadSelf*, g_CrySimpleThreadSelf);
-    }
-
-    static void SetSelf(CrySimpleThreadSelf* pSelf)
-    {
-        TLS_SET(g_CrySimpleThreadSelf, pSelf);
-    }
-
-#endif
-};
-
-template<class Runnable>
-class CrySimpleThread
-    : public CryRunnable
-    , protected CrySimpleThreadSelf
-{
-public:
-    typedef void (* ThreadFunction)(void*);
-    typedef CryRunnable RunnableT;
-    
-    const volatile bool& GetStartedState() const { return m_bIsStarted; }
-
-private:
-#if !defined(NO_THREADINFO)
-    CryThreadInfo m_Info;
-#endif
-    pthread_t m_ThreadID;
-    unsigned m_CpuMask;
-    Runnable* m_Runnable;
-    struct
-    {
-        ThreadFunction m_ThreadFunction;
-        void* m_ThreadParameter;
-    } m_ThreadFunction;
-    volatile bool m_bIsStarted;
-    volatile bool m_bIsRunning;
-
-protected:
-    virtual void Terminate()
-    {
-        // This method must be empty.
-        // Derived classes overriding Terminate() are not required to call this
-        // method.
-    }
-
-private:
-#if !defined(NO_THREADINFO)
-    static void SetThreadInfo(CrySimpleThread<Runnable>* self)
-    {
-        pthread_t thread = pthread_self();
-        self->m_Info.m_ID = (uint32)(TRUNCATE_PTR)thread;
-#if defined(APPLE)
-        pthread_setname_np(self->m_Info.m_Name.c_str());
-#endif
-    }
-#else
-    static void SetThreadInfo(CrySimpleThread<Runnable>* self) { }
-#endif
-
-    static void* PthreadRunRunnable(void* thisPtr)
-    {
-        CrySimpleThread<Runnable>* const self = (CrySimpleThread<Runnable>*)thisPtr;
-        SetSelf(self);
-        self->m_bIsStarted = true;
-        self->m_bIsRunning = true;
-        SetThreadInfo(self);
-        self->m_Runnable->Run();
-        self->m_bIsRunning = false;
-        self->Terminate();
-        SetSelf(NULL);
-        return NULL;
-    }
-
-    static void* PthreadRunThis(void* thisPtr)
-    {
-        CrySimpleThread<Runnable>* const self = (CrySimpleThread<Runnable>*)thisPtr;
-        SetSelf(self);
-        self->m_bIsStarted = true;
-        self->m_bIsRunning = true;
-        SetThreadInfo(self);
-        self->Run();
-        self->m_bIsRunning = false;
-        self->Terminate();
-        SetSelf(NULL);
-        return NULL;
-    }
-
-    CrySimpleThread(const CrySimpleThread<Runnable>&);
-    void operator = (const CrySimpleThread<Runnable>&);
-
-public:
-    CrySimpleThread()
-        : m_CpuMask(0)
-        , m_bIsStarted(false)
-        , m_bIsRunning(false)
-    {
-        m_ThreadFunction.m_ThreadFunction = NULL;
-        m_ThreadFunction.m_ThreadParameter = NULL;
-#if !defined(NO_THREADINFO)
-        m_Info.m_Name = "<Thread>";
-        m_Info.m_ID = 0;
-#endif
-        memset(&m_ThreadID, 0, sizeof m_ThreadID);
-        m_Runnable = NULL;
-    }
-
-    virtual ~CrySimpleThread()
-    {
-        if (IsStarted())
-        {
-            // Note: We don't want to cache a pointer to ISystem and/or ILog to
-            // gain more freedom on when the threading classes are used (e.g.
-            // threads may be started very early in the initialization).
-            ISystem* pSystem = GetISystem();
-            ILog* pLog = NULL;
-            if (pSystem != NULL)
-            {
-                pLog = pSystem->GetILog();
-            }
-            if (pLog != NULL)
-            {
-                pLog->LogError("Runaway thread %s", GetName());
-            }
-            Cancel();
-            WaitForThread();
-        }
-    }
-
-#if !defined(NO_THREADINFO)
-    CryThreadInfo& GetInfo() { return m_Info; }
-    const char* GetName()
-    {
-        return m_Info.m_Name.c_str();
-    }
-
-    // Set the name of the called thread.
-    //
-    // WIN32:
-    // If the thread is started, then the VC debugger is informed about the new
-    // thread name.  If the thread is not started, then the VC debugger will be
-    // informed lated when the thread is started through one of the Start()
-    // methods.
-    //
-    // If the parameter Name is NULL, then the name of the thread is kept
-    // unchanged.  This may be used to sent the current thread name to the VC
-    // debugger.
-    void SetName(const char* Name)
-    {
-        if (Name != NULL)
-        {
-            if (m_ThreadID)
-            {
-                RegisterThreadName(m_ThreadID, Name);
-            }
-            m_Info.m_Name = Name;
-        }
-#if defined(WIN32)
-        if (IsStarted())
-        {
-            // The VC debugger gets the information about a thread's name through
-            // the exception 0x406D1388.
-            struct
-            {
-                DWORD Type;
-                const char* Name;
-                DWORD ID;
-                DWORD Flags;
-            } Info = { 0x1000, NULL, 0, 0 };
-            Info.ID = (DWORD)m_Info.m_ID;
-            __try
-            {
-                RaiseException(
-                    0x406D1388, 0, sizeof Info / sizeof(DWORD), (ULONG_PTR*)&Info);
-            }
-            __except (EXCEPTION_CONTINUE_EXECUTION)
-            {
-            }
-        }
-#endif
-    }
-#else
-#if !defined(NO_THREADINFO)
-    CryThreadInfo& GetInfo()
-    {
-        static CryThreadInfo dummyInfo = { "<dummy>", 0 };
-        return dummyInfo;
-    }
-#endif
-    const char* GetName() { return "<dummy>"; }
-    void SetName(const char* Name) { }
-#endif
-
-    virtual void Run()
-    {
-        // This Run() implementation supports the void StartFunction() method.
-        // However, code using this class (or derived classes) should eventually
-        // be refactored to use one of the other Start() methods.  This code will
-        // be removed some day and the default implementation of Run() will be
-        // empty.
-        if (m_ThreadFunction.m_ThreadFunction != NULL)
-        {
-            m_ThreadFunction.m_ThreadFunction(m_ThreadFunction.m_ThreadParameter);
-        }
-    }
-
-    // Cancel the running thread.
-    //
-    // If the thread class is implemented as a derived class of CrySimpleThread,
-    // then the derived class should provide an appropriate implementation for
-    // this method.  Calling the base class implementation is _not_ required.
-    //
-    // If the thread was started by specifying a Runnable (template argument),
-    // then the Cancel() call is passed on to the specified runnable.
-    //
-    // If the thread was started using the StartFunction() method, then the
-    // caller must find other means to inform the thread about the cancellation
-    // request.
-    virtual void Cancel()
-    {
-        if (IsStarted() && m_Runnable != NULL)
-        {
-            UnRegisterThreadName(m_ThreadID);
-            m_Runnable->Cancel();
-        }
-    }
-
-    virtual void Start(Runnable& runnable, unsigned cpuMask = 0, const char* name = NULL, int32 StackSize = (SIMPLE_THREAD_STACK_SIZE_KB * 1024))
-    {
-#if defined(LARGE_THREAD_STACK)
-        StackSize *= 4;//debug code needs a lot more than profile
-#endif
-        assert(m_ThreadID == 0);
-        pthread_attr_t threadAttr;
-        pthread_attr_init(&threadAttr);
-        pthread_attr_setdetachstate(&threadAttr, PTHREAD_CREATE_JOINABLE);
-        pthread_attr_setstacksize(&threadAttr, StackSize);
-        if (name)
-        {
-            this->m_Info.m_Name = name;
-        }
-#if CRYTHREAD_PTHREADS_H_TRAIT_SET_THREAD_NAME
-        threadAttr.name = (char*)name;
-#endif
-        m_CpuMask = cpuMask;
-#if defined(PTHREAD_NPTL)
-        if (cpuMask != ~0 && cpuMask != 0)
-        {
-            cpu_set_t cpuSet;
-            CPU_ZERO(&cpuSet);
-            for (int cpu = 0; cpu < sizeof(cpuMask) * 8; ++cpu)
-            {
-                if (cpuMask & (1 << cpu))
-                {
-                    CPU_SET(cpu, &cpuSet);
-                }
-            }
-            pthread_attr_setaffinity_np(&threadAttr, sizeof cpuSet, &cpuSet);
-        }
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_START_RUNNABLE
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-        m_Runnable = &runnable;
-        int err = pthread_create(
-                &m_ThreadID,
-                &threadAttr,
-                PthreadRunRunnable,
-                this);
-        pthread_attr_destroy(&threadAttr);
-        RegisterThreadName(m_ThreadID, name);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_START_RUNNABLE_CPUMASK_POSTCREATE
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-        assert(err == 0);
-    }
-
-    virtual void Start(unsigned cpuMask = 0, const char* name = NULL, int32 Priority = THREAD_PRIORITY_NORMAL, int32 StackSize = (SIMPLE_THREAD_STACK_SIZE_KB * 1024))
-    {
-#if defined(LARGE_THREAD_STACK)
-        StackSize *= 4;//debug code needs a lot more than profile
-#endif
-        assert(m_ThreadID == 0);
-        pthread_attr_t threadAttr;
-        sched_param schedParam;
-        pthread_attr_init(&threadAttr);
-        pthread_attr_getschedparam(&threadAttr, &schedParam);
-        schedParam.sched_priority   =   Priority;
-        pthread_attr_setschedparam(&threadAttr, &schedParam);
-        pthread_attr_setdetachstate(&threadAttr, PTHREAD_CREATE_JOINABLE);
-        pthread_attr_setstacksize(&threadAttr, StackSize);
-        if (name)
-        {
-            this->m_Info.m_Name = name;
-        }
-#if CRYTHREAD_PTHREADS_H_TRAIT_SET_THREAD_NAME
-        threadAttr.name = (char*)name;
-#endif
-        m_CpuMask = cpuMask;
-#if defined(PTHREAD_NPTL)
-        if (cpuMask != ~0 && cpuMask != 0)
-        {
-            cpu_set_t cpuSet;
-            CPU_ZERO(&cpuSet);
-            for (int cpu = 0; cpu < sizeof(cpuMask) * 8; ++cpu)
-            {
-                if (cpuMask & (1 << cpu))
-                {
-                    CPU_SET(cpu, &cpuSet);
-                }
-            }
-            pthread_attr_setaffinity_np(&threadAttr, sizeof cpuSet, &cpuSet);
-        }
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_START_CPUMASK
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-        int err = pthread_create(
-                &m_ThreadID,
-                &threadAttr,
-                PthreadRunThis,
-                this);
-        pthread_attr_destroy(&threadAttr);
-        RegisterThreadName(m_ThreadID, name);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_START_CPUMASK_POSTCREATE
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-        assert(err == 0);
-    }
-
-    void StartFunction(
-        ThreadFunction threadFunction,
-        void* threadParameter = NULL,
-        unsigned cpuMask = 0
-        )
-    {
-        m_ThreadFunction.m_ThreadFunction = threadFunction;
-        m_ThreadFunction.m_ThreadParameter = threadParameter;
-        Start(cpuMask);
-    }
-
-    static CrySimpleThread<Runnable>* Self()
-    {
-        return reinterpret_cast<CrySimpleThread<Runnable>*>(GetSelf());
-    }
-
-    void Exit()
-    {
-        assert(m_ThreadID == pthread_self());
-        m_bIsRunning = false;
-        Terminate();
-        SetSelf(NULL);
-        pthread_exit(NULL);
-        UnRegisterThreadName(m_ThreadID);
-    }
-
-    void WaitForThread()
-    {
-        if (pthread_self() != m_ThreadID)
-        {
-            int err = pthread_join(m_ThreadID, NULL);
-            assert(err == 0);
-        }
-        m_bIsStarted = false;
-        memset(&m_ThreadID, 0, sizeof m_ThreadID);
-    }
-
-    unsigned SetCpuMask(unsigned cpuMask)
-    {
-        int oldCpuMask = m_CpuMask;
-        if (cpuMask == m_CpuMask)
-        {
-            return oldCpuMask;
-        }
-        m_CpuMask = cpuMask;
-#if defined(PTHREAD_NPTL)
-        cpu_set_t cpuSet;
-        CPU_ZERO(&cpuSet);
-        if (cpuMask != ~0 && cpuMask != 0)
-        {
-            for (int cpu = 0; cpu < sizeof(cpuMask) * 8; ++cpu)
-            {
-                if (cpuMask & (1 << cpu))
-                {
-                    CPU_SET(cpu, &cpuSet);
-                }
-            }
-            else
-            {
-                CPU_ZERO(&cpuSet);
-                for (int cpu = 0; i < sizeof(cpuSet) * 8; ++cpu)
-                {
-                    CPU_SET(cpu, &cpuSet);
-                }
-            }
-            pthread_attr_setaffinity_np(&threadAttr, sizeof cpuSet, &cpuSet);
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SETCPUMASK
-    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
-#endif
-            return oldCpuMask;
-        }
-
-        unsigned GetCpuMask() { return m_CpuMask; }
-
-        void Stop()
-        {
-            m_bIsStarted = false;
-        }
-
-        bool IsStarted() const { return m_bIsStarted; }
-        bool IsRunning() const { return m_bIsRunning; }
-    };
-
-#include "MemoryAccess.h"
-
-    ///////////////////////////////////////////////////////////////////////////////
-    // base class for lock less Producer/Consumer queue, due platforms specific they
-    // are implemeted in CryThead_platform.h
-    namespace CryMT {
-        namespace detail {
-            ///////////////////////////////////////////////////////////////////////////////
-            ///////////////////////////////////////////////////////////////////////////////
-            class SingleProducerSingleConsumerQueueBase
-            {
-            public:
-                SingleProducerSingleConsumerQueueBase()
-                {}
-
-                void Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize);
-                void Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize);
-            };
-
-            ///////////////////////////////////////////////////////////////////////////////
-            inline void SingleProducerSingleConsumerQueueBase::Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize)
-            {
-                MemoryBarrier();
-                // spin if queue is full
-                int iter = 0;
-                while (rProducerIndex - rComsumerIndex == nBufferSize)
-                {
-                    Sleep(iter++ > 10 ? 1 : 0);
-                }
-
-                char* pBuffer = alias_cast<char*>(arrBuffer);
-                uint32 nIndex = rProducerIndex % nBufferSize;
-                memcpy(pBuffer + (nIndex * nObjectSize), pObj, nObjectSize);
-
-                MemoryBarrier();
-                rProducerIndex += 1;
-                MemoryBarrier();
-            }
-
-            ///////////////////////////////////////////////////////////////////////////////
-            inline void SingleProducerSingleConsumerQueueBase::Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize)
-            {
-                MemoryBarrier();
-                // busy-loop if queue is empty
-                int iter = 0;
-                while (rProducerIndex - rComsumerIndex == 0)
-                {
-                    Sleep(iter++ > 10 ? 1 : 0);
-                }
-
-                char* pBuffer = alias_cast<char*>(arrBuffer);
-                uint32 nIndex = rComsumerIndex % nBufferSize;
-
-                memcpy(pObj, pBuffer + (nIndex * nObjectSize), nObjectSize);
-
-                MemoryBarrier();
-                rComsumerIndex += 1;
-                MemoryBarrier();
-            }
-
-
-            ///////////////////////////////////////////////////////////////////////////////
-            ///////////////////////////////////////////////////////////////////////////////
-            class N_ProducerSingleConsumerQueueBase
-            {
-            public:
-                N_ProducerSingleConsumerQueueBase()
-                {
-                    CryInitializeSListHead(fallbackList);
-                }
-
-                void Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*   arrStates);
-                bool Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*    arrStates);
-
-                SLockFreeSingleLinkedListHeader fallbackList;
-                struct SFallbackList
-                {
-                    SLockFreeSingleLinkedListEntry nextEntry;
-                    char alignment_padding[128 - sizeof(SLockFreeSingleLinkedListEntry)];
-                    char object[1]; // struct will be overallocated with enough memory for the object
-                };
-            };
-
-            ///////////////////////////////////////////////////////////////////////////////
-            inline void N_ProducerSingleConsumerQueueBase::Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32* arrStates)
-            {
-                MemoryBarrier();
-                uint32 nProducerIndex;
-                uint32 nComsumerIndex;
-
-                int iter = 0;
-                do
-                {
-                    nProducerIndex = rProducerIndex;
-                    nComsumerIndex = rComsumerIndex;
-
-                    if (nProducerIndex - nComsumerIndex == nBufferSize)
-                    {
-                        Sleep(iter++ > 10 ? 1 : 0);
-                        if (iter > 20) // 10 spins + 10 ms wait
-                        {
-                            uint32 nSizeToAlloc = sizeof(SFallbackList) + nObjectSize - 1;
-                            SFallbackList* pFallbackEntry = (SFallbackList*)CryModuleMemalign(nSizeToAlloc, 128);
-                            memcpy(pFallbackEntry->object, pObj, nObjectSize);
-                            CryInterlockedPushEntrySList(fallbackList,  pFallbackEntry->nextEntry);
-                            return;
-                        }
-                        continue;
-                    }
-
-                    if (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&rProducerIndex), nProducerIndex + 1, nProducerIndex) == nProducerIndex)
-                    {
-                        break;
-                    }
-                } while (true);
-
-                char* pBuffer = alias_cast<char*>(arrBuffer);
-                uint32 nIndex = nProducerIndex % nBufferSize;
-
-                memcpy(pBuffer + (nIndex * nObjectSize), pObj, nObjectSize);
-
-                MemoryBarrier();
-                arrStates[nIndex] = 1;
-                MemoryBarrier();
-            }
-
-            ///////////////////////////////////////////////////////////////////////////////
-            inline bool N_ProducerSingleConsumerQueueBase::Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32* arrStates)
-            {
-                MemoryBarrier();
-                // busy-loop if queue is empty
-                int iter = 0;
-                do
-                {
-                    SFallbackList* pFallback = (SFallbackList*)CryInterlockedPopEntrySList(fallbackList);
-                    IF (pFallback, 0)
-                    {
-                        memcpy(pObj, pFallback->object, nObjectSize);
-                        CryModuleMemalignFree(pFallback);
-                        return true;
-                    }
-
-                    if (iter > 10)
-                    {
-                        Sleep(iter > 100 ? 1 : 0);
-                    }
-                    iter++;
-                } while (rRunning && rProducerIndex - rComsumerIndex == 0);
-
-                if (rRunning == 0 && rProducerIndex - rComsumerIndex == 0)
-                {
-                    // if the queue was empty, make sure we really are empty
-                    SFallbackList* pFallback = (SFallbackList*)CryInterlockedPopEntrySList(fallbackList);
-                    IF (pFallback, 0)
-                    {
-                        memcpy(pObj, pFallback->object, nObjectSize);
-                        CryModuleMemalignFree(pFallback);
-                        return true;
-                    }
-                    return false;
-                }
-
-                iter = 0;
-                while (arrStates[rComsumerIndex % nBufferSize] == 0)
-                {
-                    Sleep(iter++ > 10 ? 1 : 0);
-                }
-
-                char* pBuffer = alias_cast<char*>(arrBuffer);
-                uint32 nIndex = rComsumerIndex % nBufferSize;
-
-                memcpy(pObj, pBuffer + (nIndex * nObjectSize), nObjectSize);
-
-                MemoryBarrier();
-                arrStates[nIndex] = 0;
-                MemoryBarrier();
-                rComsumerIndex += 1;
-                MemoryBarrier();
-
-                return true;
-            }
-        } // namespace detail
-    } // namespace CryMT
diff --git a/Code/CryEngine/CryCommon/CryThread_windows.h b/Code/CryEngine/CryCommon/CryThread_windows.h
deleted file mode 100644
index ae8068801e..0000000000
--- a/Code/CryEngine/CryCommon/CryThread_windows.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <process.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define CRYTHREAD_WINDOWS_H_SECTION_1 1
-#define CRYTHREAD_WINDOWS_H_SECTION_2 2
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// CryEvent represent a synchronization event
-//////////////////////////////////////////////////////////////////////////
-class CryEvent
-{
-public:
-    CryEvent();
-    ~CryEvent();
-
-    // Reset the event to the unsignalled state.
-    void Reset();
-    // Set the event to the signalled state.
-    void Set();
-    // Access a HANDLE to wait on.
-    void* GetHandle() const { return m_handle; };
-    // Wait indefinitely for the object to become signalled.
-    void Wait() const;
-    // Wait, with a time limit, for the object to become signalled.
-    bool Wait(const uint32 timeoutMillis) const;
-
-private:
-    CryEvent(const CryEvent&);
-    CryEvent& operator = (const CryEvent&);
-
-private:
-    void* m_handle;
-};
-
-typedef CryEvent CryEventTimed;
-
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// from winnt.h
-struct CRY_CRITICAL_SECTION
-{
-    void* DebugInfo;
-    long LockCount;
-    long RecursionCount;
-    threadID OwningThread;
-    void* LockSemaphore;
-    unsigned long* SpinCount;        // force size on 64-bit systems when packed
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-// kernel mutex - don't use... use CryMutex instead
-class CryLock_WinMutex
-{
-public:
-    CryLock_WinMutex();
-    ~CryLock_WinMutex();
-
-    void Lock();
-    void Unlock();
-    bool TryLock();
-
-    void* _get_win32_handle() { return m_hdl; }
-
-private:
-    CryLock_WinMutex(const CryLock_WinMutex&);
-    CryLock_WinMutex& operator = (const CryLock_WinMutex&);
-
-private:
-    void* m_hdl;
-};
-
-// critical section... don't use... use CryCriticalSection instead
-class CryLock_CritSection
-{
-public:
-    CryLock_CritSection();
-    ~CryLock_CritSection();
-
-    void Lock();
-    void Unlock();
-    bool TryLock();
-
-    bool IsLocked()
-    {
-        return m_cs.RecursionCount > 0 && m_cs.OwningThread == CryGetCurrentThreadId();
-    }
-
-private:
-    CryLock_CritSection(const CryLock_CritSection&);
-    CryLock_CritSection& operator = (const CryLock_CritSection&);
-
-private:
-    CRY_CRITICAL_SECTION m_cs;
-};
-
-template <>
-class CryLockT<CRYLOCK_RECURSIVE>
-    : public CryLock_CritSection
-{
-};
-template <>
-class CryLockT<CRYLOCK_FAST>
-    : public CryLock_CritSection
-{
-};
-class CryMutex
-    : public CryLock_WinMutex
-{
-};
-#define _CRYTHREAD_CONDLOCK_GLITCH 1
-
-//////////////////////////////////////////////////////////////////////////
-class CryConditionVariable
-{
-public:
-    typedef CryMutex LockType;
-
-    CryConditionVariable();
-    ~CryConditionVariable();
-    void Wait(LockType& lock);
-    bool TimedWait(LockType& lock, uint32 millis);
-    void NotifySingle();
-    void Notify();
-
-private:
-    CryConditionVariable(const CryConditionVariable&);
-    CryConditionVariable& operator = (const CryConditionVariable&);
-
-private:
-    int m_waitersCount;
-    CRY_CRITICAL_SECTION m_waitersCountLock;
-    void* m_sema;
-    void* m_waitersDone;
-    size_t m_wasBroadcast;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Platform independet wrapper for a counting semaphore
-class CrySemaphore
-{
-public:
-    CrySemaphore(int nMaximumCount, int nInitialCount = 0);
-    ~CrySemaphore();
-    void Acquire();
-    void Release();
-
-private:
-    void* m_Semaphore;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Platform independet wrapper for a counting semaphore
-// except that this version uses C-A-S only until a blocking call is needed
-// -> No kernel call if there are object in the semaphore
-class CryFastSemaphore
-{
-public:
-    CryFastSemaphore(int nMaximumCount, int nInitialCount = 0);
-    ~CryFastSemaphore();
-    void Acquire();
-    void Release();
-
-private:
-    CrySemaphore m_Semaphore;
-    volatile int32 m_nCounter;
-};
-
-//////////////////////////////////////////////////////////////////////////
-#if !defined(_CRYTHREAD_HAVE_RWLOCK)
-class CryRWLock
-{
-    void* /*SRWLOCK*/ m_Lock;
-
-    CryRWLock(const CryRWLock&);
-    CryRWLock& operator= (const CryRWLock&);
-
-public:
-    CryRWLock();
-    ~CryRWLock();
-
-    void RLock();
-    void RUnlock();
-
-    void WLock();
-    void WUnlock();
-
-    void Lock();
-    void Unlock();
-
-#if defined(_CRYTHREAD_WANT_TRY_RWLOCK)
-    // Enabling TryXXX requires Windows 7 or newer
-    bool TryRLock();
-    bool TryWLock();
-    bool TryLock();
-#endif
-};
-
-// Indicate that this implementation header provides an implementation for
-// CryRWLock.
-#define _CRYTHREAD_HAVE_RWLOCK 1
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-class CrySimpleThreadSelf
-{
-public:
-    CrySimpleThreadSelf();
-    void WaitForThread();
-    virtual ~CrySimpleThreadSelf();
-protected:
-    void StartThread(unsigned (__stdcall * func)(void*), void* argList);
-    static THREADLOCAL CrySimpleThreadSelf* m_Self;
-private:
-    CrySimpleThreadSelf(const CrySimpleThreadSelf&);
-    CrySimpleThreadSelf& operator = (const CrySimpleThreadSelf&);
-protected:
-    void* m_thread;
-    uint32 m_threadId;
-};
-
-template<class Runnable>
-class CrySimpleThread
-    : public CryRunnable
-    , public CrySimpleThreadSelf
-{
-public:
-    typedef void (* ThreadFunction)(void*);
-    typedef CryRunnable RunnableT;
-
-    void SetName(const char* Name)
-    {
-        m_name = Name;
-    }
-    const char* GetName() { return m_name; }
-
-    const volatile bool& GetStartedState() const { return m_bIsStarted; }
-
-private:
-    Runnable* m_Runnable;
-    struct
-    {
-        ThreadFunction m_ThreadFunction;
-        void* m_ThreadParameter;
-    } m_ThreadFunction;
-    volatile bool m_bIsStarted;
-    volatile bool m_bIsRunning;
-    volatile bool m_bCreatedThread;
-    string m_name;
-
-protected:
-    virtual void Terminate()
-    {
-        // This method must be empty.
-        // Derived classes overriding Terminate() are not required to call this
-        // method.
-    }
-
-private:
-    static unsigned __stdcall RunRunnable(void* thisPtr)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_WINDOWS_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(CryThread_windows_h)
-#endif
-        CrySimpleThread<Runnable>* const self = (CrySimpleThread<Runnable>*)thisPtr;
-        self->m_bIsStarted = true;
-        self->m_bIsRunning = true;
-
-        self->m_Runnable->Run();
-        self->m_bIsRunning = false;
-        self->m_bCreatedThread = false;
-        self->Terminate();
-        return 0;
-    }
-
-    static unsigned __stdcall RunThis(void* thisPtr)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION CRYTHREAD_WINDOWS_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(CryThread_windows_h)
-#endif
-        CrySimpleThread<Runnable>* const self = (CrySimpleThread<Runnable>*)thisPtr;
-        self->m_bIsStarted = true;
-        self->m_bIsRunning = true;
-
-        self->Run();
-        self->m_bIsRunning = false;
-        self->m_bCreatedThread = false;
-        self->Terminate();
-        return 0;
-    }
-
-    CrySimpleThread(const CrySimpleThread<Runnable>&);
-    void operator = (const CrySimpleThread<Runnable>&);
-
-public:
-    CrySimpleThread()
-        : m_bIsStarted(false)
-        , m_bIsRunning(false)
-        , m_bCreatedThread(false)
-    {
-        m_thread = NULL;
-        m_Runnable = NULL;
-    }
-    void* GetHandle() { return m_thread; }
-
-    virtual ~CrySimpleThread()
-    {
-        if (IsStarted())
-        {
-            if (gEnv && gEnv->pLog)
-            {
-                gEnv->pLog->LogError("Runaway thread %p '%s'", m_thread, m_name.c_str());
-            }
-        }
-
-        if (m_bCreatedThread)
-        {
-            Cancel();
-            WaitForThread();
-        }
-    }
-
-    virtual void Run()
-    {
-        // This Run() implementation supports the void StartFunction() method.
-        // However, code using this class (or derived classes) should eventually
-        // be refactored to use one of the other Start() methods.  This code will
-        // be removed some day and the default implementation of Run() will be
-        // empty.
-        if (m_ThreadFunction.m_ThreadFunction != NULL)
-        {
-            m_ThreadFunction.m_ThreadFunction(m_ThreadFunction.m_ThreadParameter);
-        }
-    }
-
-    // Cancel the running thread.
-    //
-    // If the thread class is implemented as a derived class of CrySimpleThread,
-    // then the derived class should provide an appropriate implementation for
-    // this method.  Calling the base class implementation is _not_ required.
-    //
-    // If the thread was started by specifying a Runnable (template argument),
-    // then the Cancel() call is passed on to the specified runnable.
-    //
-    // If the thread was started using the StartFunction() method, then the
-    // caller must find other means to inform the thread about the cancellation
-    // request.
-    virtual void Cancel()
-    {
-        if (IsStarted() && m_Runnable != NULL)
-        {
-            m_Runnable->Cancel();
-        }
-    }
-
-    virtual void Start(Runnable& runnable, [[maybe_unused]] unsigned cpuMask = 0, const char* = NULL, int32 = 0)
-    {
-        if (m_bCreatedThread)
-        {
-            // Don't start thread more than once!
-            return;
-        }
-        m_Runnable = &runnable;
-        m_bCreatedThread = true;
-        StartThread(RunRunnable, this);
-    }
-
-    virtual void Start([[maybe_unused]] unsigned cpuMask = 0, const char* = NULL, int32 = 0, int32 = 0)
-    {
-        if (m_bCreatedThread)
-        {
-            // Don't start thread more than once!
-            return;
-        }
-        m_bCreatedThread = true;
-        StartThread(RunThis, this);
-    }
-
-    void StartFunction(
-        ThreadFunction threadFunction,
-        void* threadParameter = NULL
-        )
-    {
-        m_ThreadFunction.m_ThreadFunction = threadFunction;
-        m_ThreadFunction.m_ThreadParameter = threadParameter;
-        Start();
-    }
-
-    static CrySimpleThread<Runnable>* Self()
-    {
-        return reinterpret_cast<CrySimpleThread<Runnable>*>(m_Self);
-    }
-
-    void Exit()
-    {
-        assert(!"implemented");
-    }
-
-    void Stop()
-    {
-        m_bIsStarted = false;
-    }
-
-    bool IsStarted() const { return m_bIsStarted; }
-    bool IsRunning() const { return m_bIsRunning; }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// base class for lock less Producer/Consumer queue, due platforms specific they
-// are implemented in CryThead_platform.h
-namespace CryMT {
-    namespace detail {
-        ///////////////////////////////////////////////////////////////////////////////
-        ///////////////////////////////////////////////////////////////////////////////
-        class SingleProducerSingleConsumerQueueBase
-        {
-        public:
-            SingleProducerSingleConsumerQueueBase()
-            {}
-
-            void Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize);
-            void Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize);
-        };
-
-
-        ///////////////////////////////////////////////////////////////////////////////
-        ///////////////////////////////////////////////////////////////////////////////
-        class N_ProducerSingleConsumerQueueBase
-        {
-        public:
-            N_ProducerSingleConsumerQueueBase()
-            {
-                CryInitializeSListHead(fallbackList);
-            }
-
-            void Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*   arrStates);
-            bool Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*    arrStates);
-
-        private:
-            SLockFreeSingleLinkedListHeader fallbackList;
-            struct SFallbackList
-            {
-                SLockFreeSingleLinkedListEntry nextEntry;
-                char alignment_padding[128 - sizeof(SLockFreeSingleLinkedListEntry)];
-                char object[1]; // struct will be overallocated with enough memory for the object
-            };
-        };
-    } // namespace detail
-} // namespace CryMT
diff --git a/Code/CryEngine/CryCommon/CryTypeInfo.cpp b/Code/CryEngine/CryCommon/CryTypeInfo.cpp
deleted file mode 100644
index 78dc92e9d1..0000000000
--- a/Code/CryEngine/CryCommon/CryTypeInfo.cpp
+++ /dev/null
@@ -1,1468 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Implementation of TypeInfo classes and functions.
-
-#include <AzCore/base.h>
-#include "CryTypeInfo.h"
-#include "CryCustomTypes.h"
-#include "Cry_Math.h"
-#include "CrySizer.h"
-#include "CryEndian.h"
-#include "TypeInfo_impl.h"
-
-// Traits
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(CryTypeInfo_cpp)
-#elif defined(LINUX) || defined(APPLE)
-#define CRYTYPEINFO_CPP_TRAIT_DEFINE_LTOA_S 1
-#endif
-
-#if CRYTYPEINFO_CPP_TRAIT_DEFINE_LTOA_S
-
-char* _ltoa_s(long value, char* string, size_t size, int32 radix)
-{
-    if (10 == radix)
-    {
-        sprintf_s(string, size, "%ld", value);
-    }
-    else
-    {
-        sprintf_s(string, size, "%lx", value);
-    }
-    return(string);
-}
-
-
-char* _i64toa_s(int64 value, char* string, size_t size, int32 radix)
-{
-    if (10 == radix)
-    {
-        sprintf_s(string, size, "%llu", (unsigned long long)value);
-    }
-    else
-    {
-        sprintf_s(string, size, "%llx", (unsigned long long)value);
-    }
-    return(string);
-}
-
-char* _ultoa_s(uint32 value, char* string, size_t size, int32 radix)
-{
-    if (10 == radix)
-    {
-        sprintf_s(string, size, "%.d", value);
-    }
-    else
-    {
-        sprintf_s(string, size, "%.x", value);
-    }
-    return(string);
-}
-
-#endif //LINUX || MAC
-
-//////////////////////////////////////////////////////////////////////
-// Case-insensitive comparison helpers.
-
-class StrNoCase
-{
-public:
-    inline StrNoCase(cstr str)
-        : m_Str(str) {}
-    inline bool operator == (cstr str) const        { return azstricmp(m_Str, str) == 0; }
-    inline bool operator != (cstr str) const        { return azstricmp(m_Str, str) != 0; }
-private:
-    cstr    m_Str;
-};
-
-// Default Endian swap function, forwards to TypeInfo.
-void SwapEndian(const CTypeInfo& Info, [[maybe_unused]] size_t nSizeCheck, void* data, size_t nCount, bool bWriting)
-{
-    assert(nSizeCheck == Info.Size);
-    Info.SwapEndian(data, nCount, bWriting);
-}
-
-//////////////////////////////////////////////////////////////////////
-// Basic TypeInfo implementations.
-
-// Basic type infos.
-
-DEFINE_TYPE_INFO(void, CTypeInfo, ("void", 0, 0))
-
-TYPE_INFO_BASIC(bool)
-TYPE_INFO_BASIC(char)
-TYPE_INFO_BASIC(wchar_t)
-
-TYPE_INFO_INT(signed char)
-TYPE_INFO_INT(unsigned char)
-TYPE_INFO_INT(short)
-TYPE_INFO_INT(unsigned short)
-TYPE_INFO_INT(int)
-TYPE_INFO_INT(unsigned int)
-TYPE_INFO_INT(long)
-TYPE_INFO_INT(unsigned long)
-TYPE_INFO_INT(int64)
-TYPE_INFO_INT(uint64)
-
-TYPE_INFO_BASIC(float)
-TYPE_INFO_BASIC(double)
-
-TYPE_INFO_BASIC(string)
-
-
-const CTypeInfo&PtrTypeInfo()
-{
-    static CTypeInfo Info(TYPE_INFO_NAME(void*), sizeof(void*), alignof(void*));
-    return Info;
-}
-
-//////////////////////////////////////////////////////////////////////
-// Basic type info implementations.
-
-// String conversion functions needed by TypeInfo.
-
-// bool
-string ToString(bool const& val)
-{
-    static string sTrue = "true", sFalse = "false";
-    return val ? sTrue : sFalse;
-}
-
-bool FromString(bool& val, cstr s)
-{
-    if (!strcmp(s, "0") || !azstricmp(s, "false"))
-    {
-        val = false;
-        return true;
-    }
-    if (!strcmp(s, "1") || !azstricmp(s, "true"))
-    {
-        val = true;
-        return true;
-    }
-    return false;
-}
-
-// int64
-string ToString(int64 const& val)
-{
-    char buffer[64];
-    _i64toa_s(val, buffer, sizeof(buffer), 10);
-    return buffer;
-}
-// uint64
-string ToString(uint64 const& val)
-{
-    char buffer[64];
-    sprintf_s(buffer, "%" PRIu64, val);
-    return buffer;
-}
-
-
-
-// long
-string ToString(long const& val)
-{
-    char buffer[64];
-    _ltoa_s(val, buffer, sizeof(buffer), 10);
-    return buffer;
-}
-
-// ulong
-string ToString(unsigned long const& val)
-{
-    char buffer[64];
-    _ultoa_s(val, buffer, sizeof(buffer), 10);
-    return buffer;
-}
-
-template<class T>
-bool ClampedIntFromString(T& val, const char* s)
-{
-    bool signbit = *s == '-';
-    s += signbit;
-    if (signbit && !TIntTraits<T>::bSIGNED)
-    {
-        // Negative number on unsigned.
-        val = T(0);
-        return true;
-    }
-
-    uint digit = (uint8) * s - '0';
-    if (digit > 9)
-    {
-        // No digits.
-        return false;
-    }
-
-    // Extract digits until overflow.
-    T v = static_cast<T>(digit);
-    while ((digit = (uint8) * ++s - '0') <= 9)
-    {
-        T vnew = static_cast<T>(v * 10 + digit);
-        if (vnew < v)
-        {
-            // Overflow.
-            if (signbit)
-            {
-                val = TIntTraits<T>::nMIN;
-            }
-            else
-            {
-                val = TIntTraits<T>::nMAX;
-            }
-            return true;
-        }
-        v = vnew;
-    }
-
-    val = signbit ? ~v + 1 : v;
-    return true;
-}
-
-bool FromString(int64& val, const char* s)                      { return ClampedIntFromString(val, s); }
-bool FromString(uint64& val, const char* s)                     { return ClampedIntFromString(val, s); }
-
-bool FromString(long& val, const char* s)                           { return ClampedIntFromString(val, s); }
-bool FromString(unsigned long& val, const char* s)      { return ClampedIntFromString(val, s); }
-
-string ToString(int const& val)                                             { return ToString(long(val)); }
-bool FromString(int& val, const char* s)                            { return ClampedIntFromString(val, s); }
-
-string ToString(unsigned int const& val)                            { return ToString((unsigned long)(val)); }
-bool FromString(unsigned int& val, const char* s)           { return ClampedIntFromString(val, s); }
-
-string ToString(short const& val)                                           { return ToString(long(val)); }
-bool FromString(short& val, const char* s)                      {   return ClampedIntFromString(val, s); }
-
-string ToString(unsigned short const& val)                      { return ToString((unsigned long)(val)); }
-bool FromString(unsigned short& val, const char* s)     {   return ClampedIntFromString(val, s); }
-
-string ToString(char const& val)                                            { return ToString(long(val)); }
-bool FromString(char& val, const char* s)                           {   return ClampedIntFromString(val, s); }
-
-string ToString(wchar_t const& val)                                     { return ToString(long(val)); }
-bool FromString(wchar_t& val, const char* s)                    {   return ClampedIntFromString(val, s); }
-
-string ToString(signed char const& val)                             { return ToString(long(val)); }
-bool FromString(signed char& val, const char* s)            {   return ClampedIntFromString(val, s); }
-
-string ToString(unsigned char const& val)                           { return ToString((unsigned long)(val)); }
-bool FromString(unsigned char& val, const char* s)      {   return ClampedIntFromString(val, s); }
-
-string ToString(const AZ::Uuid& val)
-{
-    return val.ToString<string>();
-}
-
-bool FromString(AZ::Uuid& val, const char* s)
-{
-    val = AZ::Uuid(s);
-    return true;
-}
-
-float NumToFromString(float val, int digits, bool floating, char buffer[], int buf_size)
-{
-    assert(buf_size >= 32);
-    if (floating)
-    {
-        if (val >= powf(10.f, float(digits)))
-        {
-            sprintf_s(buffer, buf_size, "%.0f", val);
-        }
-        else
-        {
-            sprintf_s(buffer, buf_size, "%.*g", digits, val);
-        }
-    }
-    else
-    {
-        sprintf_s(buffer, buf_size, "%.*f", digits, float(val));
-    }
-#if !defined(NDEBUG)
-    int readCount =
-#endif
-        azsscanf(buffer, "%g", &val);
-    assert(readCount == 1);
-    return val;
-}
-
-// double
-string ToString(double const& val)
-{
-    char buffer[64];
-    sprintf_s(buffer, "%.16g", val);
-    return buffer;
-}
-bool FromString(double& val, const char* s)
-{
-    return azsscanf(s, "%lg", &val) == 1;
-}
-
-// float
-string ToString(float const& val)
-{
-    char buffer[64];
-    for (int digits = 7; digits < 10; digits++)
-    {
-        if (NumToFromString(val, digits, true, buffer, 64) == val)
-        {
-            break;
-        }
-    }
-    return buffer;
-}
-
-bool FromString(float& val, const char* s)
-{
-    return azsscanf(s, "%g", &val) == 1;
-}
-
-
-
-// string override.
-template <>
-void TTypeInfo<string>::GetMemoryUsage(ICrySizer* pSizer, void const* data) const
-{
-    // CRAIG: just a temp hack to try and get things working
-#if !defined(LINUX) && !defined(APPLE)
-    pSizer->AddString(*(string*)data);
-#endif
-}
-
-#if defined(TEST_TYPEINFO) && defined(_DEBUG)
-
-struct STypeInfoTest
-{
-    STypeInfoTest()
-    {
-        TestType(string("well"));
-
-        TestType(true);
-
-        TestType(int8(-0x12));
-        TestType(uint8(0x87));
-        TestType(int16(-0x1234));
-        TestType(uint16(0x8765));
-        TestType(int32(-0x12345678));
-        TestType(uint32(0x87654321));
-        TestType(int64(-0x123456789ABCDEF0LL));
-        TestType(uint64(0xFEDCBA9876543210LL));
-
-        TestType(float(1234.5678));
-        TestType(float(12345678));
-        TestType(float(12345678e-20));
-        TestType(float(12345678e20));
-
-        TestType(double(987654321.0123456789));
-        TestType(double(9876543210123456789.0));
-        TestType(double(9876543210123456789e-40));
-        TestType(double(9876543210123456789e40));
-    }
-};
-static STypeInfoTest _TypeInfoTest;
-
-#endif //TEST_TYPEINFO
-
-
-//////////////////////////////////////////////////////////////////////
-// CTypeInfo implementation
-
-//---------------------------------------------------------------------------
-// Endian helper functions.
-
-void CTypeInfo::SwapEndian(void* pData, size_t nCount, [[maybe_unused]] bool bWriting) const
-{
-    switch (Size)
-    {
-    case 1:
-        break;
-    case 2:
-        ::SwapEndianBase((uint16*)pData, nCount);
-        break;
-    case 4:
-        ::SwapEndianBase((uint32*)pData, nCount);
-        break;
-    case 8:
-        ::SwapEndianBase((uint64*)pData, nCount);
-        break;
-    default:
-        assert(0);
-    }
-}
-
-// If attr name is found, return pointer to start of value text; else 0.
-static cstr FindAttr(cstr attrs, cstr name)
-{
-    size_t name_len = strlen(name);
-    while (attrs)
-    {
-        attrs = strchr(attrs, '<');
-        if (!attrs)
-        {
-            return 0;
-        }
-
-        attrs++;
-        size_t attr_len = strcspn(attrs, "=>");
-        if (attr_len == name_len && _strnicmp(attrs, name, name_len) == 0)
-        {
-            attrs += attr_len;
-            if (*attrs == '=')
-            {
-                ++attrs;
-            }
-            return attrs;
-        }
-        attrs += attr_len;
-        if (*attrs == '=')
-        {
-            attrs = strchr(attrs + 1, '>');
-        }
-    }
-    return 0;
-}
-
-bool CTypeInfo::CVarInfo::GetAttr(cstr name) const
-{
-    return FindAttr(Attrs, name) != 0;
-}
-
-bool CTypeInfo::CVarInfo::GetAttr(cstr name, string& val) const
-{
-    cstr valstr = FindAttr(Attrs, name);
-    if (!valstr)
-    {
-        return false;
-    }
-
-    // Find attr delimiter.
-    cstr end = strchr(valstr, '>');
-    if (!end)
-    {
-        return false;
-    }
-
-    // Strip quotes.
-    if (*valstr == '"')
-    {
-        valstr++;
-        if (end - valstr > 1 && end[-1] == '"')
-        {
-            end--;
-        }
-    }
-    val = string(valstr, end - valstr);
-    return true;
-}
-
-bool CTypeInfo::CVarInfo::GetAttr(cstr name, float& val) const
-{
-    cstr valstr = FindAttr(Attrs, name);
-    if (!valstr)
-    {
-        return false;
-    }
-    val = (float)atof(valstr);
-    return true;
-}
-
-cstr CTypeInfo::CVarInfo::GetComment() const
-{
-    cstr send = strrchr(Attrs, '>');
-    if (send)
-    {
-        do
-        {
-            ++send;
-        } while (*send == ' ');
-        return send;
-    }
-    else
-    {
-        return Attrs;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-// CStructInfo implementation
-
-inline cstr DisplayName(cstr name)
-{
-    // Skip prefixes in Name.
-    cstr dname = name;
-    while (islower((unsigned char)*dname) || *dname == '_')
-    {
-        dname++;
-    }
-    if (isupper((unsigned char)*dname))
-    {
-        return dname;
-    }
-    else
-    {
-        return name;
-    }
-}
-
-CStructInfo::CStructInfo(cstr name, size_t size, size_t align, Array<CVarInfo> vars, Array<CTypeInfo const*> templates)
-    : CTypeInfo(name, size, align)
-    , Vars(vars)
-    , TemplateTypes(templates)
-    , HasBitfields(false)
-{
-    // Process and validate offsets and sizes.
-    if (Vars.size() > 0)
-    {
-        size = 0;
-        int bitoffset = 0;
-
-        for (int i = 0; i < Vars.size(); i++)
-        {
-            CStructInfo::CVarInfo& var = Vars[i];
-
-            // Convert name.
-            var.Name = DisplayName(var.Name);
-
-            if (var.bBitfield)
-            {
-                HasBitfields = true;
-                if (bitoffset > 0)
-                {
-                    // Continuing bitfield.
-                    var.Offset = Vars[i - 1].Offset;
-                    var.BitWordWidth = Vars[i - 1].BitWordWidth;
-
-                    if (bitoffset + var.ArrayDim > var.GetSize() * 8)
-                    {
-                        // Overflows word, start on next one.
-                        bitoffset = 0;
-                        size += var.GetSize();
-                    }
-                }
-
-                if (bitoffset == 0)
-                {
-                    var.Offset = check_cast<uint32>(size);
-
-                    // Detect real word size of bitfield, from offset of next field.
-                    size_t next_offset = Size;
-                    for (int j = i + 1; j < Vars.size(); j++)
-                    {
-                        if (!Vars[j].bBitfield)
-                        {
-                            next_offset = Vars[j].Offset;
-                            break;
-                        }
-                    }
-                    assert(next_offset > size);
-                    size_t wordsize = min(next_offset - size, var.Type.Size);
-                    size = next_offset;
-                    switch (wordsize)
-                    {
-                    case 1:
-                        var.BitWordWidth = 0;
-                        break;
-                    case 2:
-                        var.BitWordWidth = 1;
-                        break;
-                    case 4:
-                        var.BitWordWidth = 2;
-                        break;
-                    case 8:
-                        var.BitWordWidth = 3;
-                        break;
-                    default:
-                        assert(0);
-                    }
-                }
-
-                assert(var.ArrayDim <= var.GetSize() * 8);
-                var.BitOffset = bitoffset;
-                bitoffset += var.ArrayDim;
-            }
-            else
-            {
-                bitoffset = 0;
-                if (var.Offset >= size)
-                {
-                    size = var.Offset + var.GetSize();
-                }
-            }
-        }
-        assert(Align(size, Alignment) == Align(Size, Alignment));
-    }
-}
-
-size_t EndianDescSize(cstr desc)
-{
-    // Iterate the endian descriptor.
-    size_t nSize = 0;
-    for (; *desc; desc++)
-    {
-        size_t count = *desc & 0x3F;
-        size_t nType = *(uint8*)desc >> 6;
-        nSize += count << nType;
-    }
-    return nSize;
-}
-
-size_t CStructInfo::AddEndianDesc(cstr desc, size_t dim, size_t elem_size)
-{
-    if (dim == 0)
-    {
-        return 0;
-    }
-
-    size_t endian_size = EndianDescSize(desc);
-    size_t total_size = elem_size * (dim - 1) + endian_size;
-
-    if (desc[1] || (endian_size < elem_size && dim > 1))
-    {
-        // Composite endian descriptor, replicate it.
-        assert(endian_size <= elem_size);
-        assert(elem_size - endian_size < 0x40);
-        while (dim-- > 0)
-        {
-            EndianDesc += (cstr)desc;
-            if (dim > 1 && endian_size < elem_size)
-            {
-                EndianDesc += char(0x40 | (elem_size - endian_size));
-            }
-        }
-    }
-    else
-    {
-        // Single endian component. Replicate using count field.
-        size_t subdim = desc[0] & 0x3F;
-        dim *= subdim;
-        if (!EndianDesc.empty())
-        {
-            // Combine with previous component if possible.
-            char prevdesc = *(EndianDesc.end() - 1);
-            if ((prevdesc & ~0x3F) == (desc[0] & ~0x3F))
-            {
-                // Combine with previous char.
-                size_t maxdim = min(dim, size_t(0x3F - (prevdesc & 0x3F)));
-                prevdesc += check_cast<char>(maxdim);
-                EndianDesc.erase(EndianDesc.length() - 1, 1);
-                EndianDesc.append(1, prevdesc);
-                dim -= maxdim;
-            }
-        }
-        for (; dim > 0x3F; dim -= 0x3F)
-        {
-            EndianDesc += desc[0] | 0x3F;
-        }
-        if (dim > 0)
-        {
-            EndianDesc += check_cast<char>((desc[0] & ~0x3F) | dim);
-        }
-    }
-
-    return total_size;
-}
-
-bool CStructInfo::FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
-{
-    if (IsCompatibleType(typeVal))
-    {
-        bool bOK = true;
-        int i = 0;
-        for AllSubVars(pToVar, typeVal)
-        {
-            if (!Vars[i].Type.FromValue(Vars[i].GetAddress(data), pToVar->GetAddress(value), pToVar->Type))
-            {
-                bOK = false;
-            }
-            i++;
-        }
-        return bOK;
-    }
-
-    // Check all subclasses.
-    for (int i = 0; i < Vars.size() && Vars[i].IsBaseClass(); i++)
-    {
-        if (Vars[i].Type.FromValue(Vars[i].GetAddress(data), value, typeVal))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool CStructInfo::ToValue(const void* data, void* value, const CTypeInfo& typeVal) const
-{
-    if (IsCompatibleType(typeVal))
-    {
-        bool bOK = true;
-        int i = 0;
-        for AllSubVars(pToVar, typeVal)
-        {
-            if (!Vars[i].Type.ToValue(Vars[i].GetAddress(data), pToVar->GetAddress(value), pToVar->Type))
-            {
-                bOK = false;
-            }
-            i++;
-        }
-        return bOK;
-    }
-
-    // Check all subclasses.
-    for (int i = 0; i < Vars.size() && Vars[i].IsBaseClass(); i++)
-    {
-        if (Vars[i].Type.ToValue(Vars[i].GetAddress(data), value, typeVal))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-// Parse structs as comma-separated values.
-
-/*                                  ,               1,      ,2      1,2
-
-        Top                                         1           ,2      1,2             ; strip trail commas
-        Child   Named                           1           (,2)    (1,2)           ; strip trail commas, paren if internal commas
-                    Nameless    ,               1,      ,2      1,2             ;
-*/
-
-static void StripCommas(string& str)
-{
-    size_t nLast = str.size();
-    while (nLast > 0 && str[nLast - 1] == ',')
-    {
-        nLast--;
-    }
-    str.resize(nLast);
-}
-
-string CStructInfo::ToString(const void* data, FToString flags, const void* def_data) const
-{
-    string str;                     // Return str.
-
-    for (int i = 0; i < Vars.size(); i++)
-    {
-        // Handling of empty values: Skip trailing empty values.
-        // If there are intermediate empty values, replace them with non-empty ones.
-        const CVarInfo& var = Vars[i];
-
-        if (!var.IsInline())
-        {
-            // Named sub var or struct.
-            if (!flags.NamedFields && i > 0)
-            {
-                str += ",";
-            }
-
-            string substr = var.ToString(data, FToString(flags).Sub(0), def_data);
-
-            if (flags.SkipDefault && substr.empty())
-            {
-                continue;
-            }
-
-            if (flags.NamedFields)
-            {
-                if (*str)
-                {
-                    str += ",";
-                }
-                if (*var.Name)
-                {
-                    str += var.Name;
-                    str += "=";
-                }
-            }
-            if (substr.find(',') != string::npos || substr.find('=') != string::npos)
-            {
-                // Encase nested composite types in parens.
-                str += "(";
-                str += substr;
-                str += ")";
-            }
-            else
-            {
-                str += substr;
-            }
-        }
-        else
-        {
-            // Nameless base struct. Treat children as inline.
-            str += var.ToString(data, FToString(flags).Sub(1), def_data);
-        }
-    }
-
-    if (flags.SkipDefault && !flags.Sub)
-    {
-        StripCommas(str);
-    }
-    return str;
-}
-
-// Retrieve and return one subelement from src, advancing the pointer.
-// Copy to tempstr if necessary.
-
-typedef CryStackStringT<char, 256> CTempStr;
-
-void ParseElement(cstr& src, cstr& varname, cstr& val, CTempStr& tempstr)
-{
-    varname = val = 0;
-
-    while (*src == ' ')
-    {
-        src++;
-    }
-    if (!*src)
-    {
-        return;
-    }
-
-    // Find end of var assignment.
-    int nest = 0;
-    cstr eq = 0;
-
-    cstr end;
-    for (end = src; *end; end++)
-    {
-        if (*end == '(')
-        {
-            nest++;
-        }
-        else if (*end == ')')
-        {
-            nest--;
-        }
-        else if (nest == 0)
-        {
-            if (*end == '=' && !eq)
-            {
-                eq = end;
-            }
-            else if (*end == ',')
-            {
-                break;
-            }
-        }
-    }
-
-    // Advance src past element.
-    val = src;
-    src = end;
-
-    if (*src == ',')
-    {
-        src++;
-    }
-
-    if (eq)
-    {
-        varname = val;
-        val = eq + 1;
-    }
-
-    PREFAST_ASSUME(val);
-    if (*val == '(' && end[-1] == ')')
-    {
-        // Remove parens.
-        val++;
-        end--;
-    }
-
-    if (eq)
-    {
-        if (*end)
-        {
-            // Must copy sub string to temp.
-            val = (cstr)tempstr + (val - varname);
-            eq = (cstr)tempstr + (eq - varname);
-            varname = tempstr.assign(varname, end);
-            non_const(*eq) = 0;
-        }
-        else
-        {
-            // Copy just varname to temp, return val in place.
-            varname = tempstr.assign(varname, eq);
-        }
-    }
-    else if (*end)
-    {
-        // Must copy sub string to temp.
-        val = tempstr.assign(val, end);
-    }
-
-    // Else can return val without copying.
-}
-
-bool CStructInfo::FromString(void* data, cstr str, FFromString flags) const
-{
-    if (!flags.SkipEmpty)
-    {
-        // Initialise all to default
-        for (int i = 0; i < Vars.size(); i++)
-        {
-            Vars[i].FromString(data, "");
-        }
-    }
-
-    CTempStr tempstr;
-    const CVarInfo* pVar = 0;
-    int nErrors = 0;
-
-    while (*str)
-    {
-        cstr varname, val;
-        ParseElement(str, varname, val, tempstr);
-
-        if (varname)
-        {
-            pVar = FindSubVar(varname);
-        }
-        else
-        {
-            pVar = NextSubVar(pVar, true);
-        }
-        if (pVar)
-        {
-            if (*val || !flags.SkipEmpty)
-            {
-                nErrors += !pVar->FromString(data, val, flags);
-            }
-        }
-        else
-        {
-            nErrors++;
-        }
-    }
-
-    return !nErrors;
-}
-
-bool CStructInfo::ValueEqual(const void* data, const void* def_data) const
-{
-    for (int i = 0; i < Vars.size(); i++)
-    {
-        const CVarInfo& var = Vars[i];
-        if (!var.Type.ValueEqual((char*)data + var.Offset, (def_data ? (char*)def_data + var.Offset : 0)))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-void CStructInfo::SwapEndian(void* data, size_t nCount, bool bWriting) const
-{
-    non_const(*this).MakeEndianDesc();
-
-    if (EndianDesc.length() == 1 && !HasBitfields && EndianDescSize(EndianDesc) == Size)
-    {
-        // Optimised array swap.
-        size_t nElems = (EndianDesc[0u] & 0x3F) * nCount;
-        switch (EndianDesc[0u] & 0xC0)
-        {
-        case 0:             // Skip bytes
-            break;
-        case 0x40:      // Swap 2 bytes
-            ::SwapEndianBase((uint16*)data, nElems);
-            break;
-        case 0x80:      // Swap 4 bytes
-            ::SwapEndianBase((uint32*)data, nElems);
-            break;
-        case 0xC0:      // Swap 8 bytes
-            ::SwapEndianBase((uint64*)data, nElems);
-            break;
-        }
-        return;
-    }
-
-    for (; nCount-- > 0; data = (char*)data + Size)
-    {
-        // First swap bits.
-        // Iterate the endian descriptor.
-        void* step = data;
-        for (cstr desc = EndianDesc; *desc; desc++)
-        {
-            size_t nElems = *desc & 0x3F;
-            switch (*desc & 0xC0)
-            {
-            case 0:             // Skip bytes
-                step = (uint8*)step + nElems;
-                break;
-            case 0x40:      // Swap 2 bytes
-                ::SwapEndianBase((uint16*)step, nElems);
-                step = (uint16*)step + nElems;
-                break;
-            case 0x80:      // Swap 4 bytes
-                ::SwapEndianBase((uint32*)step, nElems);
-                step = (uint32*)step + nElems;
-                break;
-            case 0xC0:      // Swap 8 bytes
-                ::SwapEndianBase((uint64*)step, nElems);
-                step = (uint64*)step + nElems;
-                break;
-            }
-        }
-
-        // Then bitfields if needed.
-        if (HasBitfields)
-        {
-            uint64 uOrigBits = 0, uNewBits = 0;
-            for (int i = 0; i < Vars.size(); i++)
-            {
-                CVarInfo const& var = Vars[i];
-                if (var.bBitfield)
-                {
-                    // Reverse location of all bitfields in word.
-                    size_t nWordBits = var.GetElemSize() * 8;
-                    assert(nWordBits <= 64);
-                    if (var.BitOffset == 0)
-                    {
-                        // Initialise bitfield swapping.
-                        var.Type.ToValue(var.GetAddress(data), uOrigBits);
-                        uNewBits = 0;
-                    }
-                    size_t nSrcOffset = (GetPlatformEndian() == eLittleEndian) == bWriting ? var.BitOffset : nWordBits - var.GetBits() - var.BitOffset;
-                    size_t nDstOffset = nWordBits - var.GetBits() - nSrcOffset;
-
-                    uint64 uFieldVal = uOrigBits >> nSrcOffset;
-                    uFieldVal &= ((1 << var.GetBits()) - 1);
-                    uNewBits |= uFieldVal << nDstOffset;
-                    var.Type.FromValue(var.GetAddress(data), uNewBits);
-                }
-            }
-        }
-    }
-}
-
-void CStructInfo::MakeEndianDesc()
-{
-    if (!EndianDesc.empty())
-    {
-        return;
-    }
-
-    size_t last_offset = 0;
-    for (int i = 0; i < Vars.size(); i++)
-    {
-        CVarInfo const& var = Vars[i];
-        bool bUnionAlias = var.bBitfield ? var.BitOffset > 0 : var.Offset < last_offset;
-        if (!bUnionAlias)
-        {
-            // Add endian desc for member.
-            cstr subdesc = 0;
-            if (var.Type.HasSubVars())
-            {
-                // Struct-computed endian desc.
-                CStructInfo const& infoSub = static_cast<CStructInfo const&>(var.Type);
-                non_const(infoSub).MakeEndianDesc();
-                subdesc = infoSub.EndianDesc;
-                if (!*subdesc)
-                {
-                    // No swapping.
-                    continue;
-                }
-            }
-            else
-            {
-                // Basic type.
-                switch (var.GetElemSize())
-                {
-                case 0:
-                case 1:
-                    continue;                                           // No swapping needed.
-                case 2:
-                    subdesc = "\x41";
-                    break;
-                case 4:
-                    subdesc = "\x81";
-                    break;
-                case 8:
-                    subdesc = "\xC1";
-                    break;
-                default:
-                    assert(0);
-                }
-            }
-
-            // Apply any padding to current offset.
-            assert(last_offset <= var.Offset);
-            if (last_offset < var.Offset)
-            {
-                last_offset += AddEndianDesc("\x01", var.Offset - last_offset, 1);
-            }
-            last_offset += AddEndianDesc(subdesc, var.GetDim(), var.GetElemSize());
-        }
-    }
-}
-
-void CStructInfo::GetMemoryUsage(ICrySizer* pSizer, void const* data) const
-{
-    for (int i = 0; i < Vars.size(); i++)
-    {
-        Vars[i].Type.GetMemoryUsage(pSizer, (char*)data + Vars[i].Offset);
-    }
-}
-
-const CTypeInfo::CVarInfo* CStructInfo::NextSubVar(const CVarInfo* pPrev, bool bRecurseBase) const
-{
-    if (pPrev >= Vars.begin() && pPrev < Vars.end())
-    {
-        // pPrev is within this struct's vars
-        if (++pPrev < Vars.end())
-        {
-            return pPrev;
-        }
-        return 0;
-    }
-
-    if (Vars.empty())
-    {
-        return 0;
-    }
-
-    if (bRecurseBase)
-    {
-        // Recurse into inline base structs
-        const CVarInfo* pBase = Vars.begin();
-        if (pBase->IsInline())
-        {
-            if (const CVarInfo* pNext = pBase->Type.NextSubVar(pPrev, true))
-            {
-                return pNext;
-            }
-            if (++pBase < Vars.end())
-            {
-                return pBase;
-            }
-            return 0;
-        }
-    }
-
-    if (!pPrev)
-    {
-        // Return first var
-        return Vars.begin();
-    }
-
-    return 0;
-}
-
-const CTypeInfo::CVarInfo* CStructInfo::FindSubVar(cstr name) const
-{
-    static int s_nLast = 0;
-    int nSize = Vars.size();
-    if (s_nLast >= nSize)
-    {
-        s_nLast = 0;
-    }
-
-    for (int i = s_nLast, iEnd = s_nLast + nSize; i < iEnd; i++)
-    {
-        int v = i >= nSize ? i - nSize : i;
-        const CVarInfo& var = Vars[v];
-        if (var.Type.Size > 0 && StrNoCase(var.GetName()) == name)
-        {
-            s_nLast = v;
-            return &var;
-        }
-        if (var.IsBaseClass())
-        {
-            if (const CVarInfo* pSubVar = var.Type.FindSubVar(name))
-            {
-                return pSubVar;
-            }
-        }
-    }
-    return 0;
-}
-
-bool CStructInfo::IsCompatibleType(CTypeInfo const& Info) const
-{
-    if (this == &Info)
-    {
-        return true;
-    }
-
-    if (!TemplateTypes.empty() && Info.IsTemplate() && strcmp(Name, Info.Name) == 0)
-    {
-        CTypeInfo const* const* pA = NextTemplateType(0);
-        CTypeInfo const* const* pB = Info.NextTemplateType(0);
-
-        while (pA && pB && (*pA)->IsType(**pB))
-        {
-            pA = Info.NextTemplateType(pA);
-            pB = Info.NextTemplateType(pB);
-        }
-        return !pA && !pB;
-    }
-
-    return false;
-}
-
-bool CStructInfo::IsType(CTypeInfo const& Info) const
-{
-    if (IsCompatibleType(Info))
-    {
-        return true;
-    }
-
-    // Check all subclasses.
-    for (int i = 0; i < Vars.size() && Vars[i].IsBaseClass(); i++)
-    {
-        if (Vars[i].Type.IsType(Info))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////
-// CSimpleEnumDef implementation
-
-cstr ParseNextEnum(char*& rs)
-{
-    char* s = rs;
-    while (isspace(*s))
-    {
-        s++;
-    }
-    if (!*s)
-    {
-        return 0;
-    }
-
-    cstr se = s;
-    while (isalnum(*s) || *s == '_')
-    {
-        s++;
-    }
-
-    if (*s == ',')
-    {
-        *s++ = 0;
-    }
-    else if (*s)
-    {
-        *s++ = 0;
-        while (*s && *s != ',')
-        {
-            s++;
-        }
-        if (*s)
-        {
-            s++;
-        }
-    }
-    rs = s;
-    return se;
-}
-
-void CSimpleEnumDef::Init(Array<cstr> names, char* enum_str)
-{
-    asNames = names;
-
-    // Split copy of enums string into elements, store in array.
-    int i = 0;
-    while (cstr se = ParseNextEnum(enum_str))
-    {
-        asNames[i++] = se;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-// CEnumDef implementation
-
-void CEnumDef::Init(Array<SElem> elems, char* enum_str)
-{
-    Elems = elems;
-    MinValue = 0;
-    bRegular = true;
-    nPrefixLength = 0;
-
-    if (enum_str)
-    {
-        // Parse enum names from str
-        int i = 0;
-        while (cstr se = ParseNextEnum(enum_str))
-        {
-            Elems[i++].Name = se;
-        }
-    }
-
-    // Analyse names and values.
-    if (!elems.empty())
-    {
-        cstr sPrefix = "";
-        MinValue =  Elems[0].Value;
-        for (int i = 0; i < elems.size(); i++)
-        {
-            if (Elems[i].Value != i + Elems[0].Value)
-            {
-                bRegular = false;
-            }
-            MinValue = min(MinValue, Elems[i].Value);
-
-            // Find common prefix.
-            cstr sElem = Elems[i].Name;
-            if (*sElem)
-            {
-                if (!*sPrefix)
-                {
-                    sPrefix = sElem;
-                    nPrefixLength = static_cast<uint>(strlen(sPrefix));
-                }
-                else
-                {
-                    uint p = 0;
-                    while (p < nPrefixLength && sElem[p] == sPrefix[p])
-                    {
-                        p++;
-                    }
-                    nPrefixLength = p;
-                }
-            }
-        }
-
-        // Ensure prefix is on underscore boundary.
-        while (nPrefixLength > 0 && sPrefix[nPrefixLength - 1] != '_')
-        {
-            nPrefixLength--;
-        }
-    }
-}
-
-bool CEnumDef::MatchName(uint i, cstr str) const
-{
-    cstr name = Elems[i].Name;
-    if (*name && nPrefixLength)
-    {
-        if (azstricmp(name + nPrefixLength, str) == 0)
-        {
-            return true;
-        }
-    }
-    if (*name == '_')
-    {
-        name++;
-    }
-    return azstricmp(name, str) == 0;
-}
-
-cstr CEnumDef::ToName(TValue value) const
-{
-    // Find matching element.
-    if (bRegular)
-    {
-        TValue index = value - MinValue;
-        if (index >= 0 && index < Elems.size())
-        {
-            return Name((uint)index);
-        }
-    }
-    else
-    {
-        for (int i = 0; i < Elems.size(); i++)
-        {
-            if (Elems[i].Value == value)
-            {
-                return Name(i);
-            }
-        }
-    }
-
-    // No match
-    return 0;
-}
-
-LegacyDynArray<CEnumDef::SElem>* CEnumDef::SInit::s_pElems = 0;
-
-void CEnumDefUuid::Init(Array<SElem> elems, char* enum_str)
-{
-    Elems = elems;
-    bRegular = false;
-    nPrefixLength = 0;
-
-    if (enum_str)
-    {
-        // Parse enum names from str
-        int i = 0;
-        while (cstr se = ParseNextEnum(enum_str))
-        {
-            Elems[i++].Name = se;
-        }
-    }
-
-    // Analyse names and values.
-    if (!elems.empty())
-    {
-        cstr sPrefix = "";
-        for (int i = 0; i < elems.size(); i++)
-        {
-            // Find common prefix.
-            cstr sElem = Elems[i].Name;
-            if (*sElem)
-            {
-                if (!*sPrefix)
-                {
-                    sPrefix = sElem;
-                    nPrefixLength = static_cast<uint>(strlen(sPrefix));
-                }
-                else
-                {
-                    uint p = 0;
-                    while (p < nPrefixLength && sElem[p] == sPrefix[p])
-                    {
-                        p++;
-                    }
-                    nPrefixLength = p;
-                }
-            }
-        }
-
-        // Ensure prefix is on underscore boundary.
-        while (nPrefixLength > 0 && sPrefix[nPrefixLength - 1] != '_')
-        {
-            nPrefixLength--;
-        }
-    }
-}
-
-bool CEnumDefUuid::MatchName(uint i, cstr str) const
-{
-    cstr name = Elems[i].Name;
-    if (*name && nPrefixLength)
-    {
-        if (azstricmp(name + nPrefixLength, str) == 0)
-        {
-            return true;
-        }
-    }
-    if (*name == '_')
-    {
-        name++;
-    }
-    return azstricmp(name, str) == 0;
-}
-
-cstr CEnumDefUuid::ToName(AZ::Uuid value) const
-{
-    // Find matching element.
-    for (int i = 0; i < Elems.size(); ++i)
-    {
-        if (Elems[i].Value == value)
-        {
-            return Elems[i].Name;
-        }
-    }
-    // No match
-    return 0;
-}
diff --git a/Code/CryEngine/CryCommon/CryTypeInfo.h b/Code/CryEngine/CryCommon/CryTypeInfo.h
deleted file mode 100644
index 849e8c6bf0..0000000000
--- a/Code/CryEngine/CryCommon/CryTypeInfo.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Declaration of CTypeInfo and related types.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYTYPEINFO_H
-#define CRYINCLUDE_CRYCOMMON_CRYTYPEINFO_H
-#pragma once
-
-#include <platform.h>
-#include "CryArray.h"
-#include "Options.h"
-#include "CryString.h"
-#include "TypeInfo_decl.h"
-
-class ICrySizer;
-
-class CCryName;
-string ToString(CCryName const& val);
-bool FromString(CCryName& val, const char* s);
-
-//---------------------------------------------------------------------------
-// Specify options for converting data to/from strings
-struct FToString
-{
-    OPT_STRUCT(FToString)
-    OPT_VAR(bool, SkipDefault)      // Omit default values on writing.
-    OPT_VAR(bool, NamedFields)      // Add Name= text to sub-values.
-    OPT_VAR(bool, Sub)                      // Write sub-structures (internal usage).
-};
-
-struct FFromString
-{
-    OPT_STRUCT(FFromString)
-    OPT_VAR(bool, SkipEmpty)            // Do not set values from empty strings (otherwise, set to zero).
-};
-
-// Specify which limits a variable has
-enum ENumericLimit
-{
-    eLimit_Min,
-    eLimit_Max,
-    eLimit_SoftMin,
-    eLimit_SoftMax,
-    eLimit_MinIsInfinite,
-    eLimit_Step,
-};
-
-//---------------------------------------------------------------------------
-// Type info base class, and default implementation
-
-struct CTypeInfo
-{
-    cstr        Name;
-    size_t  Size;
-    size_t  Alignment;
-
-    CTypeInfo(cstr name, size_t size, size_t align)
-        : Name(name)
-        , Size(size)
-        , Alignment(align) {}
-
-    virtual ~CTypeInfo()
-    {}
-
-    //
-    // Inheritance.
-    //
-    virtual bool IsType(CTypeInfo const& Info) const
-    { return this == &Info; }
-
-    template<class T>
-    bool IsType() const
-    { return IsType(TypeInfo((T*)0)); }
-
-    //
-    // Data access interface.
-    //
-
-    // Convert value to string.
-    virtual string ToString([[maybe_unused]] const void* data, [[maybe_unused]] FToString flags = 0, [[maybe_unused]] const void* def_data = 0) const
-    { return ""; }
-
-    // Write value from string, return success.
-    virtual bool FromString([[maybe_unused]] void* data, [[maybe_unused]] cstr str, [[maybe_unused]] FFromString flags = 0) const
-    { return false; }
-
-    // Read and write values of a specified type.
-    virtual bool ToValue([[maybe_unused]] const void* data, [[maybe_unused]] void* value, [[maybe_unused]] const CTypeInfo& typeVal) const
-    { return false; }
-
-    virtual bool FromValue([[maybe_unused]] void* data, [[maybe_unused]] const void* value, [[maybe_unused]] const CTypeInfo& typeVal) const
-    { return false; }
-
-    // Templated interface to above functions.
-    template<class T>
-    bool ToValue(const void* data, T& value) const
-    { return ToValue(data, &value, TypeInfo(&value)); }
-    template<class T>
-    bool FromValue(void* data, const T& value) const
-    { return FromValue(data, &value, TypeInfo(&value)); }
-
-    virtual bool ValueEqual(const void* data, const void* def_data = 0) const
-    { return ToString(data, FToString().SkipDefault(1), def_data).empty(); }
-
-    virtual bool GetLimit([[maybe_unused]] ENumericLimit eLimit, [[maybe_unused]] float& fVal) const
-    { return false; }
-
-    // Convert numeric formats from big-to-little endian or vice versa.
-    // Swaps bitfield order as well (which may be separate from integer bit order).
-    virtual void SwapEndian(void* pData, size_t nCount, bool bWriting) const;
-
-    // Track memory used by any internal structures (not counting object size itself).
-    // Add to CrySizer as needed, return remaining mem count.
-    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer, [[maybe_unused]] const void* data) const
-    {}
-
-    //
-    // Structure interface.
-    //
-    struct CVarInfo
-    {
-        const CTypeInfo&        Type;                               // Info for type of variable.
-        cstr                                Name;                               // Display name of variable.
-        cstr                                Attrs;                          // Var-specific attribute string, of form:
-        // "<name=value>" for each attr, concatenated.
-        // Remaining text considered as comment.
-        uint32                          Offset;                         // Offset in bytes from struct start.
-        uint32                          ArrayDim : 22,               // Number of array elements, or bits if bitfield.
-                                        bBaseClass : 1,                 // Sub-var is actually a base class.
-                                        bBitfield : 1,                      // Var is a bitfield, ArrayDim is number of bits.
-                                        BitOffset : 6,                      // Additional offset in bits for bitfields.
-        // Bit offset is computed in declaration order; on some platforms, it goes high to low.
-                                        BitWordWidth : 2;               // Width of bitfield = 1 byte << BitWordWidth
-
-
-        // Accessors.
-        cstr GetName() const                                    { return Name; }
-        size_t GetDim() const                                   { return bBitfield ? 1 : ArrayDim; }
-        size_t GetSize() const                              { return bBitfield ? (size_t)1 << BitWordWidth : Type.Size* ArrayDim; }
-        size_t GetElemSize() const                      { return bBitfield ? (size_t)1 << BitWordWidth : Type.Size; }
-        size_t GetBits() const                              { return bBitfield ? ArrayDim : ArrayDim* Type.Size* 8; }
-        bool IsBaseClass() const                            { return bBaseClass; }
-        bool IsInline() const
-        {
-            if (bBaseClass && Offset == 0)
-            {
-                const CVarInfo* pFirst = Type.NextSubVar(0);
-                if (pFirst)
-                {
-                    return pFirst->IsBaseClass();
-                }
-            }
-            return false;
-        }
-
-        bool GetLimit(ENumericLimit eLimit, float& fVal) const
-        {
-            return Type.GetLimit(eLimit, fVal);
-        }
-
-        // Useful functions.
-        void* GetAddress(void* base) const
-        {
-            return (char*)base + Offset;
-        }
-        const void* GetAddress(const void* base) const
-        {
-            return (const char*)base + Offset;
-        }
-        bool FromString(void* base, cstr str, FFromString flags = 0) const
-        {
-            assert(!bBitfield);
-            return Type.FromString((char*)base + Offset, str, flags);
-        }
-        string ToString(const void* base, FToString flags = 0, const void* def_base = 0) const
-        {
-            assert(!bBitfield);
-            return Type.ToString((const char*)base + Offset, flags, def_base ? (const char*)def_base + Offset : 0);
-        }
-
-        // Attribute access. Not fast.
-        bool GetAttr(cstr name) const;
-        bool GetAttr(cstr name, float& val) const;
-        bool GetAttr(cstr name, string& val) const;
-
-        // Comment, excluding attributes.
-        cstr GetComment() const;
-    };
-
-    // Structure var iteration.
-    virtual CVarInfo const* NextSubVar([[maybe_unused]] CVarInfo const* pPrev, [[maybe_unused]] bool bRecurseBase = false) const
-    { return 0; }
-    inline bool HasSubVars() const
-    { return NextSubVar(0) != 0; }
-    #define AllSubVars(pVar, Info) \
-    (const CTypeInfo::CVarInfo* pVar = (Info).NextSubVar(0); pVar; pVar = (Info).NextSubVar(pVar))
-
-    // Named var search.
-    virtual const CVarInfo* FindSubVar([[maybe_unused]] cstr name) const
-    { return 0; }
-
-    virtual CTypeInfo const* const* NextTemplateType([[maybe_unused]] CTypeInfo const* const* pPrev) const
-    { return 0; }
-    inline bool IsTemplate() const
-    { return NextTemplateType(0) != 0; }
-
-    //
-    // String enumeration interface.
-    // Return sequential strings in enumeration, then 0 when out of range.
-    // String/int conversion is handled by ToString/FromString.
-    //
-    virtual cstr EnumElem([[maybe_unused]] uint nIndex) const { return 0; }
-};
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYTYPEINFO_H
diff --git a/Code/CryEngine/CryCommon/CryVersion.h b/Code/CryEngine/CryCommon/CryVersion.h
deleted file mode 100644
index 70a1a1bf28..0000000000
--- a/Code/CryEngine/CryCommon/CryVersion.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Defines File version structure.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYVERSION_H
-#define CRYINCLUDE_CRYCOMMON_CRYVERSION_H
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-/** This class keeps file version information.
-*/
-struct SFileVersion
-{
-    int v[4];
-
-    SFileVersion()
-    {
-        v[0] = v[1] = v[2] = v[3] = 0;
-    }
-    SFileVersion(const int vers[])
-    {
-        v[0] = vers[0];
-        v[1] = vers[1];
-        v[2] = vers[2];
-        v[3] = 1;
-    }
-
-    void Set(const char* s)
-    {
-        v[0] = v[1] = v[2] = v[3] = 0;
-
-        char t[50];
-        const size_t len = (std::min)(strlen(s), sizeof(t) - 1);
-        memcpy(t, s, len);
-        t[len] = 0;
-
-        char* p;
-        char* next = nullptr;
-        [[maybe_unused]] size_t strmax = sizeof(t);
-        p = azstrtok(t, &strmax, ".", &next);
-        if (!p)
-        {
-            return;
-        }
-        v[3] = atoi(p);
-        p = azstrtok(nullptr, &strmax, ".", &next);
-        if (!p)
-        {
-            return;
-        }
-        v[2] = atoi(p);
-        p = azstrtok(nullptr, &strmax, ".", &next);
-        if (!p)
-        {
-            return;
-        }
-        v[1] = atoi(p);
-        p = azstrtok(nullptr, &strmax, ".", &next);
-        if (!p)
-        {
-            return;
-        }
-        v[0] = atoi(p);
-    }
-
-    explicit SFileVersion(const char* s)
-    {
-        Set(s);
-    }
-
-    bool operator <(const SFileVersion& v2) const
-    {
-        if (v[3] < v2.v[3])
-        {
-            return true;
-        }
-        if (v[3] > v2.v[3])
-        {
-            return false;
-        }
-
-        if (v[2] < v2.v[2])
-        {
-            return true;
-        }
-        if (v[2] > v2.v[2])
-        {
-            return false;
-        }
-
-        if (v[1] < v2.v[1])
-        {
-            return true;
-        }
-        if (v[1] > v2.v[1])
-        {
-            return false;
-        }
-
-        if (v[0] < v2.v[0])
-        {
-            return true;
-        }
-        if (v[0] > v2.v[0])
-        {
-            return false;
-        }
-        return false;
-    }
-    bool operator ==(const SFileVersion& v1) const
-    {
-        if (v[0] == v1.v[0] && v[1] == v1.v[1] &&
-            v[2] == v1.v[2] && v[3] == v1.v[3])
-        {
-            return true;
-        }
-        return false;
-    }
-    bool operator >(const SFileVersion& v1) const
-    {
-        return !(*this < v1);
-    }
-    bool operator >=(const SFileVersion& v1) const
-    {
-        return (*this == v1) || (*this > v1);
-    }
-    bool operator <=(const SFileVersion& v1) const
-    {
-        return (*this == v1) || (*this < v1);
-    }
-
-    int& operator[](int i)       { return v[i]; }
-    int  operator[](int i) const { return v[i]; }
-
-    template <size_t size>
-    void ToShortString(char(&buffer)[size]) const
-    {
-        sprintf_s(buffer, size, "%d.%d.%d", v[2], v[1], v[0]);
-    }
-
-    void ToShortString(char* s, size_t bufferSize) const
-    {
-        sprintf_s(s, bufferSize, "%d.%d.%d", v[2], v[1], v[0]);
-    }
-
-    template <size_t size>
-    void ToString(char(&buffer)[size]) const
-    {
-        sprintf_s(buffer, size, "%d.%d.%d.%d", v[3], v[2], v[1], v[0]);
-    }
-
-    void ToString(char* s, size_t bufferSize) const
-    {
-        sprintf_s(s, bufferSize, "%d.%d.%d.%d", v[3], v[2], v[1], v[0]);
-    }
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYVERSION_H
diff --git a/Code/CryEngine/CryCommon/CryWindows.h b/Code/CryEngine/CryCommon/CryWindows.h
deleted file mode 100644
index 3d57f6a24e..0000000000
--- a/Code/CryEngine/CryCommon/CryWindows.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Specific header to handle Windows.h include
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRYWINDOWS_H
-#define CRYINCLUDE_CRYCOMMON_CRYWINDOWS_H
-#pragma once
-
-
-#if defined(WIN32) || defined(WIN64)
-
-#ifndef FULL_WINDOWS_HEADER
-    #define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <windows.h>
-
-#undef GetCommandLine
-#undef GetObject
-#undef PlaySound
-#undef GetClassName
-#undef DrawText
-#undef GetCharWidth
-#undef GetUserName
-#undef LoadLibrary
-#undef RegisterClass
-
-#undef min
-#undef max
-
-#undef NOMINMAX
-#undef WIN32_LEAN_AND_MEAN
-#undef FULL_WINDOWS_HEADER
-
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_CRYWINDOWS_H
diff --git a/Code/CryEngine/CryCommon/Cry_Camera.h b/Code/CryEngine/CryCommon/Cry_Camera.h
deleted file mode 100644
index b10134350c..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Camera.h
+++ /dev/null
@@ -1,2428 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common Camera class implementation
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_CAMERA_H
-#define CRYINCLUDE_CRYCOMMON_CRY_CAMERA_H
-#pragma once
-
-
-//DOC-IGNORE-BEGIN
-#include <Cry_Math.h>
-#include <Cry_Geo.h>
-#include <MemoryAccess.h>
-#include <Cry_XOptimise.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.
-};
-
-class CameraViewParameters
-{
-public:
-    CameraViewParameters();
-
-    void LookAt(const Vec3& Eye, const Vec3& ViewRefPt, const Vec3& ViewUp);
-    void Perspective(float Yfov, float Aspect, float Ndist, float Fdist);
-    void Frustum(float l, float r, float b, float t, float Ndist, float Fdist);
-    const Vec3& wCOP() const;
-    Vec3 ViewDir() const;
-    Vec3 ViewDirOffAxis() const;
-
-    float* GetXform_Screen2Obj(float* M, int WW, int WH) const;
-    float* GetXform_Obj2Screen(float* M, int WW, int WH) const;
-
-    float* GetModelviewMatrix(float* M) const;
-    float* GetProjectionMatrix(float* M) const;
-    float* GetViewportMatrix(float* M, int WW, int WH) const;
-
-    void SetModelviewMatrix(const float* M);
-
-    void GetLookAtParams(Vec3* Eye, Vec3* ViewRefPt, Vec3* ViewUp) const;
-    void GetPerspectiveParams(float* Yfov, float* Xfov, float* Aspect, float* Ndist, float* Fdist) const;
-    void GetFrustumParams(float* l, float* r, float* b, float* t, float* Ndist, float* Fdist) const;
-
-    float* GetInvModelviewMatrix(float* M) const;
-    float* GetInvProjectionMatrix(float* M) const;
-    float* GetInvViewportMatrix(float* M, int WW, int WH) const;
-
-    Vec3 WorldToCam(const Vec3& wP) const;
-    float WorldToCamZ(const Vec3& wP) const;
-    Vec3 CamToWorld(const Vec3& cP) const;
-
-    void LoadIdentityXform();
-    void Xform(const float M[16]);
-
-    void Translate(const Vec3& trans);
-    void Rotate(const float M[9]);
-
-    void GetPixelRay(float sx, float sy, int ww, int wh, Vec3* Start, Vec3* Dir) const;
-
-    void CalcVerts(Vec3* V) const;
-    void CalcTileVerts(Vec3* V, f32 nPosX, f32 nPosY, f32 nGridSizeX, f32 nGridSizeY) const;
-    void CalcRegionVerts(Vec3* V, const Vec2& vMin, const Vec2& vMax) const;
-    void CalcTiledRegionVerts(Vec3* V, Vec2& vMin, Vec2& vMax, f32 nPosX, f32 nPosY, f32 nGridSizeX, f32 nGridSizeY) const;
-
-    Vec3 vX, vY, vZ;
-    Vec3 vOrigin;
-    float fWL, fWR, fWB, fWT;
-    float fNear, fFar;
-};
-
-inline float* Frustum16fv(float* M, float l, float r, float b, float t, float n, float f)
-{
-    M[0] = (2 * n) / (r - l);
-    M[4] = 0;
-    M[8] = (r + l) / (r - l);
-    M[12] = 0;
-    M[1] = 0;
-    M[5] = (2 * n) / (t - b);
-    M[9] = (t + b) / (t - b);
-    M[13] = 0;
-    M[2] = 0;
-    M[6] = 0;
-    M[10] = -(f + n) / (f - n);
-    M[14] = (-2 * f * n) / (f - n);
-    M[3] = 0;
-    M[7] = 0;
-    M[11] = -1;
-    M[15] = 0;
-
-    return M;
-}
-
-inline float* Viewing16fv(float* M, const Vec3 X, const Vec3 Y, const Vec3 Z, const Vec3 O)
-{
-    M[0] = X.x;
-    M[4] = X.y;
-    M[8] = X.z;
-    M[12] = -X | O;
-    M[1] = Y.x;
-    M[5] = Y.y;
-    M[9] = Y.z;
-    M[13] = -Y | O;
-    M[2] = Z.x;
-    M[6] = Z.y;
-    M[10] = Z.z;
-    M[14] = -Z | O;
-    M[3] = 0;
-    M[7] = 0;
-    M[11] = 0;
-    M[15] = 1;
-    return M;
-}
-
-
-inline CameraViewParameters::CameraViewParameters()
-{
-    vX.Set(1, 0, 0);
-    vY.Set(0, 1, 0);
-    vZ.Set(0, 0, 1);
-    vOrigin.Set(0, 0, 0);
-    fNear = 1.4142f;
-    fFar = 10;
-    fWL = -1;
-    fWR = 1;
-    fWT = 1;
-    fWB = -1;
-}
-
-inline void CameraViewParameters::LookAt(const Vec3& Eye, const Vec3& ViewRefPt, const Vec3& ViewUp)
-{
-    vZ = Eye - ViewRefPt;
-    vZ.NormalizeSafe();
-    vX = ViewUp % vZ;
-    vX.NormalizeSafe();
-    vY = vZ % vX;
-    vY.NormalizeSafe();
-    vOrigin = Eye;
-}
-
-inline void CameraViewParameters::Perspective(float Yfov, float Aspect, float Ndist, float Fdist)
-{
-    fNear = Ndist;
-    fFar = Fdist;
-    fWT = tanf(Yfov * 0.5f) * fNear;
-    fWB = -fWT;
-    fWR = fWT * Aspect;
-    fWL = -fWR;
-}
-
-inline void CameraViewParameters::Frustum(float l, float r, float b, float t, float Ndist, float Fdist)
-{
-    fNear = Ndist;
-    fFar = Fdist;
-    fWR = r;
-    fWL = l;
-    fWB = b;
-    fWT = t;
-}
-
-
-inline void CameraViewParameters::GetLookAtParams(Vec3* Eye, Vec3* ViewRefPt, Vec3* ViewUp) const
-{
-    *Eye = vOrigin;
-    *ViewRefPt = vOrigin - vZ;
-    *ViewUp = vY;
-}
-
-inline void CameraViewParameters::GetPerspectiveParams(float* Yfov, float* Xfov, float* Aspect, float* Ndist, float* Fdist) const
-{
-    *Yfov = atanf(fWT / fNear) * 57.29578f * 2.0f;
-    *Xfov = atanf(fWR / fNear) * 57.29578f * 2.0f;
-    *Aspect = fWT / fWR;
-    *Ndist = fNear;
-    *Fdist = fFar;
-}
-
-inline void CameraViewParameters::GetFrustumParams(float* l, float* r, float* b, float* t, float* Ndist, float* Fdist) const
-{
-    *l = fWL;
-    *r = fWR;
-    *b = fWB;
-    *t = fWT;
-    *Ndist = fNear;
-    *Fdist = fFar;
-}
-
-inline const Vec3& CameraViewParameters::wCOP() const
-{
-    return(vOrigin);
-}
-
-inline Vec3 CameraViewParameters::ViewDir() const
-{
-    return(-vZ);
-}
-
-inline Vec3 CameraViewParameters::ViewDirOffAxis() const
-{
-    float fX = (fWL + fWR) * 0.5f, fY = (fWT + fWB) * 0.5f;  // MIDPOINT ON VIEWPLANE WINDOW
-    Vec3 ViewDir = vX * fX + vY * fY - vZ * fNear;
-    ViewDir.Normalize();
-    return ViewDir;
-}
-
-inline Vec3 CameraViewParameters::WorldToCam(const Vec3& wP) const
-{
-    Vec3 sP(wP - vOrigin);
-    Vec3 cP(vX | sP, vY | sP, vZ | sP);
-    return cP;
-}
-
-inline float CameraViewParameters::WorldToCamZ(const Vec3& wP) const
-{
-    Vec3 sP(wP - vOrigin);
-    float zdist = vZ | sP;
-    return zdist;
-}
-
-inline Vec3 CameraViewParameters::CamToWorld(const Vec3& cP) const
-{
-    Vec3 wP(vX * cP.x + vY * cP.y + vZ * cP.z + vOrigin);
-    return wP;
-}
-
-inline void CameraViewParameters::LoadIdentityXform()
-{
-    vX.Set(1, 0, 0);
-    vY.Set(0, 1, 0);
-    vZ.Set(0, 0, 1);
-    vOrigin.Set(0, 0, 0);
-}
-
-inline void CameraViewParameters::Xform(const float M[16])
-{
-    vX.Set(vX.x * M[0] + vX.y * M[4] + vX.z * M[8],
-        vX.x * M[1] + vX.y * M[5] + vX.z * M[9],
-        vX.x * M[2] + vX.y * M[6] + vX.z * M[10]);
-    vY.Set(vY.x * M[0] + vY.y * M[4] + vY.z * M[8],
-        vY.x * M[1] + vY.y * M[5] + vY.z * M[9],
-        vY.x * M[2] + vY.y * M[6] + vY.z * M[10]);
-    vZ.Set(vZ.x * M[0] + vZ.y * M[4] + vZ.z * M[8],
-        vZ.x * M[1] + vZ.y * M[5] + vZ.z * M[9],
-        vZ.x * M[2] + vZ.y * M[6] + vZ.z * M[10]);
-    vOrigin.Set(vOrigin.x * M[0] + vOrigin.y * M[4] + vOrigin.z * M[8] + M[12],
-        vOrigin.x * M[1] + vOrigin.y * M[5] + vOrigin.z * M[9] + M[13],
-        vOrigin.x * M[2] + vOrigin.y * M[6] + vOrigin.z * M[10] + M[14]);
-
-    float Scale = vX.GetLength();
-    vX /= Scale;
-    vY /= Scale;
-    vZ /= Scale;
-
-    fWL *= Scale;
-    fWR *= Scale;
-    fWB *= Scale;
-    fWT *= Scale;
-    fNear *= Scale;
-    fFar *= Scale;
-};
-
-inline void CameraViewParameters::Translate(const Vec3& trans)
-{
-    vOrigin += trans;
-}
-
-inline void CameraViewParameters::Rotate(const float M[9])
-{
-    vX.Set(vX.x * M[0] + vX.y * M[3] + vX.z * M[6],
-        vX.x * M[1] + vX.y * M[4] + vX.z * M[7],
-        vX.x * M[2] + vX.y * M[5] + vX.z * M[8]);
-    vY.Set(vY.x * M[0] + vY.y * M[3] + vY.z * M[6],
-        vY.x * M[1] + vY.y * M[4] + vY.z * M[7],
-        vY.x * M[2] + vY.y * M[5] + vY.z * M[8]);
-    vZ.Set(vZ.x * M[0] + vZ.y * M[3] + vZ.z * M[6],
-        vZ.x * M[1] + vZ.y * M[4] + vZ.z * M[7],
-        vZ.x * M[2] + vZ.y * M[5] + vZ.z * M[8]);
-}
-
-inline float* CameraViewParameters::GetModelviewMatrix(float* M) const
-{
-    Viewing16fv(M, vX, vY, vZ, vOrigin);
-    return M;
-}
-
-inline float* CameraViewParameters::GetProjectionMatrix(float* M) const
-{
-    Frustum16fv(M, fWL, fWR, fWB, fWT, fNear, fFar);
-    return(M);
-}
-
-inline void CameraViewParameters::GetPixelRay(float sx, float sy, int ww, int wh, Vec3* Start, Vec3* Dir) const
-{
-    Vec3 wTL = vOrigin + (vX * fWL) + (vY * fWT) - (vZ * fNear);      // FIND LOWER-LEFT
-    Vec3 dX = (vX * (fWR - fWL)) / (float)ww;                 // WORLD WIDTH OF PIXEL
-    Vec3 dY = (vY * (fWT - fWB)) / (float)wh;                 // WORLD HEIGHT OF PIXEL
-    wTL += (dX * sx - dY * sy);                         // INCR TO WORLD PIXEL
-    wTL += (dX * 0.5f - dY * 0.5f);                       // INCR TO PIXEL CNTR
-    *Start = vOrigin;
-    *Dir = wTL - vOrigin;
-}
-
-inline void CameraViewParameters::CalcVerts(Vec3* V)  const
-{
-    float NearZ = -fNear;
-    V[0].Set(fWR, fWT, NearZ);
-    V[1].Set(fWL, fWT, NearZ);
-    V[2].Set(fWL, fWB, NearZ);
-    V[3].Set(fWR, fWB, NearZ);
-
-    float FarZ = -fFar, FN = fFar / fNear;
-    float fwL = fWL * FN, fwR = fWR * FN, fwB = fWB * FN, fwT = fWT * FN;
-    V[4].Set(fwR, fwT, FarZ);
-    V[5].Set(fwL, fwT, FarZ);
-    V[6].Set(fwL, fwB, FarZ);
-    V[7].Set(fwR, fwB, FarZ);
-
-    for (int i = 0; i < 8; i++)
-    {
-        V[i] = CamToWorld(V[i]);
-    }
-}
-
-inline void CameraViewParameters::CalcTileVerts(Vec3* V, f32 nPosX, f32 nPosY, f32 nGridSizeX, f32 nGridSizeY)  const
-{
-    float NearZ = -fNear;
-
-    float TileWidth = abs(fWR - fWL) / nGridSizeX;
-    float TileHeight = abs(fWT - fWB) / nGridSizeY;
-    float TileL = fWL + TileWidth * nPosX;
-    float TileR = fWL + TileWidth * (nPosX + 1);
-    float TileB = fWB + TileHeight * nPosY;
-    float TileT = fWB + TileHeight * (nPosY + 1);
-
-    V[0].Set(TileR, TileT, NearZ);
-    V[1].Set(TileL, TileT, NearZ);
-    V[2].Set(TileL, TileB, NearZ);
-    V[3].Set(TileR, TileB, NearZ);
-
-    float FarZ = -fFar, FN = fFar / fNear;
-    float fwL = fWL * FN, fwR = fWR * FN, fwB = fWB * FN, fwT = fWT * FN;
-
-    float TileFarWidth = abs(fwR - fwL) / nGridSizeX;
-    float TileFarHeight = abs(fwT - fwB) / nGridSizeY;
-    float TileFarL = fwL + TileFarWidth * nPosX;
-    float TileFarR = fwL + TileFarWidth * (nPosX + 1);
-    float TileFarB = fwB + TileFarHeight * nPosY;
-    float TileFarT = fwB + TileFarHeight * (nPosY + 1);
-
-    V[4].Set(TileFarR, TileFarT, FarZ);
-    V[5].Set(TileFarL, TileFarT, FarZ);
-    V[6].Set(TileFarL, TileFarB, FarZ);
-    V[7].Set(TileFarR, TileFarB, FarZ);
-
-    for (int i = 0; i < 8; i++)
-    {
-        V[i] = CamToWorld(V[i]);
-    }
-}
-
-inline void CameraViewParameters::CalcTiledRegionVerts(Vec3* V, Vec2& vMin, Vec2& vMax, f32 nPosX, f32 nPosY, f32 nGridSizeX, f32 nGridSizeY) const
-{
-    float NearZ = -fNear;
-
-    Vec2 vTileMin, vTileMax;
-
-    vMin.x = max(vMin.x, nPosX / nGridSizeX);
-    vMax.x = min(vMax.x, (nPosX + 1) / nGridSizeX);
-
-    vMin.y = max(vMin.y, nPosY / nGridSizeY);
-    vMax.y = min(vMax.y, (nPosY + 1) / nGridSizeY);
-
-    vTileMin.x = abs(fWR - fWL) * vMin.x;
-    vTileMin.y = abs(fWT - fWB) * vMin.y;
-    vTileMax.x = abs(fWR - fWL) * vMax.x;
-    vTileMax.y = abs(fWT - fWB) * vMax.y;
-
-
-    float TileL = fWL + vTileMin.x;
-    float TileR = fWL + vTileMax.x;
-    float TileB = fWB + vTileMin.y;
-    float TileT = fWB + vTileMax.y;
-
-    V[0].Set(TileR, TileT, NearZ);
-    V[1].Set(TileL, TileT, NearZ);
-    V[2].Set(TileL, TileB, NearZ);
-    V[3].Set(TileR, TileB, NearZ);
-
-    float FarZ = -fFar, FN = fFar / fNear;
-    float fwL = fWL * FN, fwR = fWR * FN, fwB = fWB * FN, fwT = fWT * FN;
-
-    Vec2 vTileFarMin, vTileFarMax;
-
-    vTileFarMin.x = abs(fwR - fwL) * vMin.x;
-    vTileFarMin.y = abs(fwT - fwB) * vMin.y;
-    vTileFarMax.x = abs(fwR - fwL) * vMax.x;
-    vTileFarMax.y = abs(fwT - fwB) * vMax.y;
-
-
-    float TileFarL = fwL + vTileFarMin.x;
-    float TileFarR = fwL + vTileFarMax.x;
-    float TileFarB = fwB + vTileFarMin.y;
-    float TileFarT = fwB + vTileFarMax.y;
-
-    V[4].Set(TileFarR, TileFarT, FarZ);
-    V[5].Set(TileFarL, TileFarT, FarZ);
-    V[6].Set(TileFarL, TileFarB, FarZ);
-    V[7].Set(TileFarR, TileFarB, FarZ);
-
-    for (int i = 0; i < 8; i++)
-    {
-        V[i] = CamToWorld(V[i]);
-    }
-}
-
-
-inline void CameraViewParameters::CalcRegionVerts(Vec3* V, const Vec2& vMin, const Vec2& vMax) const
-{
-    float NearZ = -fNear;
-
-    Vec2 vTileMin, vTileMax;
-
-    vTileMin.x = abs(fWR - fWL) * vMin.x;
-    vTileMin.y = abs(fWT - fWB) * vMin.y;
-    vTileMax.x = abs(fWR - fWL) * vMax.x;
-    vTileMax.y = abs(fWT - fWB) * vMax.y;
-
-    float TileL = fWL + vTileMin.x;
-    float TileR = fWL + vTileMax.x;
-    float TileB = fWB + vTileMin.y;
-    float TileT = fWB + vTileMax.y;
-
-    V[0].Set(TileR, TileT, NearZ);
-    V[1].Set(TileL, TileT, NearZ);
-    V[2].Set(TileL, TileB, NearZ);
-    V[3].Set(TileR, TileB, NearZ);
-
-    float FarZ = -fFar, FN = fFar / fNear;
-    float fwL = fWL * FN, fwR = fWR * FN, fwB = fWB * FN, fwT = fWT * FN;
-
-    Vec2 vTileFarMin, vTileFarMax;
-
-    vTileFarMin.x = abs(fwR - fwL) * vMin.x;
-    vTileFarMin.y = abs(fwT - fwB) * vMin.y;
-    vTileFarMax.x = abs(fwR - fwL) * vMax.x;
-    vTileFarMax.y = abs(fwT - fwB) * vMax.y;
-
-    float TileFarL = fwL + vTileFarMin.x;
-    float TileFarR = fwL + vTileFarMax.x;
-    float TileFarB = fwB + vTileFarMin.y;
-    float TileFarT = fwB + vTileFarMax.y;
-
-    V[4].Set(TileFarR, TileFarT, FarZ);
-    V[5].Set(TileFarL, TileFarT, FarZ);
-    V[6].Set(TileFarL, TileFarB, FarZ);
-    V[7].Set(TileFarR, TileFarB, FarZ);
-
-    for (int i = 0; i < 8; i++)
-    {
-        V[i] = CamToWorld(V[i]);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// 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 static Vec3 CreateViewdir(const Ang3& ypr);
-    ILINE static Vec3 CreateViewdir(const Matrix33& m) { return m.GetColumn1(); };
-
-    ILINE void SetMatrix(const Matrix34& mat) { assert(mat.IsOrthonormal()); m_Matrix = mat; UpdateFrustum(); };
-    ILINE void SetMatrixNoUpdate(const Matrix34& mat) { assert(mat.IsOrthonormal()); m_Matrix = mat; };
-    ILINE const Matrix34& GetMatrix() const { return m_Matrix; };
-    ILINE Vec3 GetViewdir() const { return m_Matrix.GetColumn1(); };
-    
-    ILINE void SetEntityRotation(const Quat& entityRot) { m_entityRot = entityRot; }
-    ILINE Quat GetEntityRotation() { return m_entityRot; }
-    ILINE void SetEntityPos(const Vec3& entityPos) { m_entityPos = entityPos; }
-    ILINE Vec3 GetEntityPos() const { return m_entityPos; };
-
-    ILINE Matrix34 GetViewMatrix() const { return m_Matrix.GetInverted(); };
-    ILINE Vec3 GetPosition() const { return m_Matrix.GetTranslation(); }
-    ILINE void SetPosition(const Vec3& p)   { m_Matrix.SetTranslation(p); UpdateFrustum(); }
-    ILINE void SetPositionNoUpdate(const Vec3& p)   { m_Matrix.SetTranslation(p); }
-    ILINE bool Project(const Vec3& p, Vec3& result, Vec2i topLeft = Vec2i(0, 0), Vec2i widthHeight = Vec2i(0, 0)) const;
-    ILINE bool Unproject(const Vec3& viewportPos, Vec3& result, Vec2i topLeft = Vec2i(0, 0), Vec2i widthHeight = Vec2i(0, 0)) const;
-    ILINE void CalcScreenBounds(int* vOut, const AABB* pAABB, int nWidth, int nHeight) const;
-    ILINE Vec3 GetUp() const { return m_Matrix.GetColumn2(); }
-
-    //------------------------------------------------------------
-
-    void SetFrustum(int nWidth, int nHeight, f32 FOV = DEFAULT_FOV, f32 nearplane = DEFAULT_NEAR, f32 farplane = DEFAULT_FAR, f32 fPixelAspectRatio = 1.0f);
-    ILINE void SetAsymmetry(float l, float r, float b, float t) { m_asymLeft = l; m_asymRight = r; m_asymBottom = b; m_asymTop = t; UpdateFrustum(); }
-
-    ILINE int GetViewSurfaceX() const { return m_Width; }
-    ILINE int GetViewSurfaceZ() const { return m_Height; }
-    ILINE f32 GetFov() const { return m_fov; }
-    ILINE float GetHorizontalFov() const;
-    ILINE f32 GetNearPlane() const { return m_edge_nlt.y; }
-    ILINE f32 GetFarPlane() const { return m_edge_flt.y; }
-    ILINE f32 GetProjRatio() const { return(m_ProjectionRatio); }
-    ILINE f32 GetAngularResolution() const { return m_Height / m_fov; }
-    ILINE f32 GetPixelAspectRatio() const { return m_PixelAspectRatio; }
-
-    ILINE Vec3 GetEdgeP() const { return m_edge_plt; }
-    ILINE Vec3 GetEdgeN() const { return m_edge_nlt; }
-    ILINE Vec3 GetEdgeF() const { return m_edge_flt; }
-
-    ILINE f32 GetAsymL() const { return m_asymLeft; }
-    ILINE f32 GetAsymR() const { return m_asymRight; }
-    ILINE f32 GetAsymB() const { return m_asymBottom; }
-    ILINE f32 GetAsymT() const { return m_asymTop; }
-
-    ILINE const Vec3& GetNPVertex(int nId) const; //get near-plane vertices
-    ILINE const Vec3& GetFPVertex(int nId) const; //get far-plane vertices
-    ILINE const Vec3& GetPPVertex(int nId) const; //get projection-plane vertices
-
-    ILINE const Plane_tpl<f32>* GetFrustumPlane(int numplane)    const       { return &m_fp[numplane]; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Z-Buffer ranges.
-    // This values are defining near/far clipping plane, it only used to specify z-buffer range.
-    // Use it only when you want to override default z-buffer range.
-    // Valid values for are: 0 <= zrange <= 1
-    //////////////////////////////////////////////////////////////////////////
-    ILINE void SetZRange(float zmin, float zmax)
-    {
-        // Clamp to 0-1 range.
-        m_zrangeMin = min(1.0f, max(0.0f, zmin));
-        m_zrangeMax = min(1.0f, max(0.0f, zmax));
-    };
-    ILINE float GetZRangeMin() const { return m_zrangeMin; }
-    ILINE float GetZRangeMax() const { return m_zrangeMax; }
-    //////////////////////////////////////////////////////////////////////////
-
-    //-----------------------------------------------------------------------------------
-    //--------                Frustum-Culling                ----------------------------
-    //-----------------------------------------------------------------------------------
-
-    //Check if a point lies within camera's frustum
-    bool IsPointVisible(const Vec3& p) const;
-
-    //sphere-frustum test
-    bool IsSphereVisible_F(const ::Sphere& s) const;
-    uint8 IsSphereVisible_FH(const ::Sphere& s) const;   //this is going to be the exact version of sphere-culling
-
-    // AABB-frustum test
-    // Fast
-    bool IsAABBVisible_F(const ::AABB& aabb) const;
-    uint8 IsAABBVisible_FH(const ::AABB& aabb, bool* pAllInside) const;
-    uint8 IsAABBVisible_FH(const ::AABB& aabb) const;
-
-    // Exact
-    bool IsAABBVisible_E(const ::AABB& aabb) const;
-    uint8 IsAABBVisible_EH(const ::AABB& aabb, bool* pAllInside) const;
-    uint8 IsAABBVisible_EH(const ::AABB& aabb) const;
-
-    // Multi-camera
-    bool IsAABBVisible_EHM(const ::AABB& aabb, bool* pAllInside) const;
-    bool IsAABBVisible_EM(const ::AABB& aabb) const;
-    bool IsAABBVisible_FM(const ::AABB& aabb) const;
-
-    //OBB-frustum test
-    bool IsOBBVisible_F(const Vec3& wpos, const OBB& obb) const;
-    uint8 IsOBBVisible_FH(const Vec3& wpos,  const OBB& obb) const;
-    bool IsOBBVisible_E(const Vec3& wpos,  const OBB& obb, f32 uscale) const;
-    uint8 IsOBBVisible_EH(const Vec3& wpos,  const OBB& obb, f32 uscale) const;
-
-    //## constructor/destructor
-    CCamera()
-    {
-        m_Matrix.SetIdentity();
-        m_asymRight = 0;
-        m_asymLeft = 0;
-        m_asymBottom = 0;
-        m_asymTop = 0;
-        SetFrustum(640, 480);
-        m_zrangeMin = 0.0f;
-        m_zrangeMax = 1.0f;
-        m_pMultiCamera = NULL;
-        m_pPortal = NULL;
-        m_JustActivated = 0;
-        m_nPosX = m_nPosY = m_nSizeX = m_nSizeY = 0;
-        m_entityPos = Vec3(0, 0, 0);
-        m_entityRot = Quat(0, 0, 0, 1);
-    }
-    ~CCamera() {}
-
-    void GetFrustumVertices(Vec3* pVerts) const;
-    void GetFrustumVerticesCam(Vec3* pVerts) const;
-
-    void SetJustActivated(const bool justActivated) {m_JustActivated = (int)justActivated; }
-    bool IsJustActivated() const {return m_JustActivated != 0; }
-
-    void SetViewPort(int nPosX, int nPosY, int nSizeX, int nSizeY)
-    {
-        m_nPosX = nPosX;
-        m_nPosY = nPosY;
-        m_nSizeX = nSizeX;
-        m_nSizeY = nSizeY;
-    }
-
-    void GetViewPort(int& nPosX, int& nPosY, int& nSizeX, int& nSizeY) const
-    {
-        nPosX = m_nPosX;
-        nPosY = m_nPosY;
-        nSizeX = m_nSizeX;
-        nSizeY = m_nSizeY;
-    }
-
-    void UpdateFrustum();
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
-
-    CameraViewParameters m_viewParameters;
-
-private:
-    bool AdditionalCheck(const AABB& aabb) const;
-    bool AdditionalCheck(const Vec3& wpos, const OBB& obb, f32 uscale) const;
-
-    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_ProjectionRatio;  // ratio between width and height of view-surface
-    f32     m_PixelAspectRatio; // accounts for aspect ratio and non-square pixels
-
-    Quat    m_entityRot;                //The rotation of this camera's entity (does not include HMD orientation)
-    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]; //
-
-    // Near Far range of the z-buffer to use for this camera.
-    float m_zrangeMin;
-    float m_zrangeMax;
-
-    int m_nPosX, m_nPosY, m_nSizeX, m_nSizeY;
-
-    //------------------------------------------------------------------------
-    //---   OLD STUFF
-    //------------------------------------------------------------------------
-public:
-
-    void SetFrustumVertices(Vec3* arrvVerts)
-    {
-        m_clbp = arrvVerts[0];
-        m_cltp = arrvVerts[1];
-        m_crtp = arrvVerts[2];
-        m_crbp = arrvVerts[3];
-    }
-    inline void SetFrustumPlane(int i, const Plane_tpl<f32>& plane)
-    {
-        m_fp[i] = plane;
-        //do not break strict aliasing rules, use union instead of reinterpret_casts
-        union f32_u
-        {
-            float floatVal;
-            uint32 uintVal;
-        };
-
-        {
-            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;
-        }
-    }
-
-    inline Ang3 GetAngles()   const { return CreateAnglesYPR(Matrix33(m_Matrix)); }
-    void SetAngles(const Ang3& angles)  { SetMatrix(Matrix34::CreateRotationXYZ(angles)); }
-
-
-    struct IVisArea* m_pPortal; // pointer to portal used to create this camera
-    struct ScissorInfo
-    {
-        ScissorInfo() { x1 = y1 = x2 = y2 = 0; }
-        uint16 x1, y1, x2, y2;
-    };
-    ScissorInfo m_ScissorInfo;
-    class PodArray<CCamera>* m_pMultiCamera; // maybe used for culling instead of this camera
-
-    Vec3    m_OccPosition;      //Position for calculate occlusions (needed for portals rendering)
-    inline const Vec3& GetOccPos() const { return(m_OccPosition); }
-
-    int m_JustActivated;        //Camera activated in this frame, used for disabling motion blur effect at camera changes in movies
-};
-
-inline float CCamera::GetHorizontalFov() const
-{
-    float fFractionVert = tanf(m_fov * 0.5f);
-    float fFractionHoriz = fFractionVert * GetProjRatio();
-    float fHorizFov = atanf(fFractionHoriz) * 2;
-
-    return fHorizFov;
-}
-
-
-// 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);
-    }
-}
-
-// Description
-//   <PRE>
-//x=yaw
-//y=pitch
-//z=roll (we ignore this element, since its not possible to convert the roll-component into a vector)
-// </PRE>
-ILINE Vec3 CCamera::CreateViewdir(const Ang3& ypr)
-{
-    assert(ypr.IsInRangePI()); //all angles need to be in range between -pi and +pi
-    f32 sz, cz;
-    sincos_tpl(ypr.x, &sz, &cz);          //YAW
-    f32 sx, cx;
-    sincos_tpl(ypr.y, &sx, &cx);          //PITCH
-    return Vec3(-sz * cx, cz * cx, sx); //calculate the view-direction
-}
-
-// Description
-//   <PRE>
-//p=world space position
-//result=spreen space pos
-//retval=is visible on screen
-// </PRE>
-ILINE bool CCamera::Project(const Vec3& p, Vec3& result, Vec2i topLeft, Vec2i widthHeight) const
-{
-    Matrix44A mProj, mView;
-    Vec4 in, transformed, projected;
-
-    mathMatrixPerspectiveFov(&mProj, GetFov(), GetProjRatio(), GetNearPlane(), GetFarPlane());
-
-    mathMatrixLookAt(&mView, GetPosition(), GetPosition() + GetViewdir(), GetUp());
-
-    int pViewport[4] = {0, 0, GetViewSurfaceX(), GetViewSurfaceZ()};
-
-    if (!topLeft.IsZero() || !widthHeight.IsZero())
-    {
-        pViewport[0] = topLeft.x;
-        pViewport[1] = topLeft.y;
-        pViewport[2] = widthHeight.x;
-        pViewport[3] = widthHeight.y;
-    }
-
-    in.x = p.x;
-    in.y = p.y;
-    in.z = p.z;
-    in.w = 1.0f;
-    mathVec4Transform((f32*)&transformed, (f32*)&mView, (f32*)&in);
-
-    bool visible = transformed.z < 0.0f;
-
-    mathVec4Transform((f32*)&projected, (f32*)&mProj, (f32*)&transformed);
-
-    if (projected.w == 0.0f)
-    {
-        result = Vec3(0.f, 0.f, 0.f);
-        return false;
-    }
-
-    projected.x /= projected.w;
-    projected.y /= projected.w;
-    projected.z /= projected.w;
-
-    visible = visible && (fabs_tpl(projected.x) <= 1.0f) && (fabs_tpl(projected.y) <= 1.0f);
-
-    //output coords
-    result.x = pViewport[0] + (1 + projected.x) * pViewport[2] / 2;
-    result.y = pViewport[1] + (1 - projected.y) * pViewport[3] / 2;  //flip coords for y axis
-    result.z = projected.z;
-
-    return visible;
-}
-
-ILINE bool CCamera::Unproject(const Vec3& viewportPos, Vec3& result, Vec2i topLeft, Vec2i widthHeight) const
-{
-    Matrix44A mProj, mView;
-
-    mathMatrixPerspectiveFov(&mProj, GetFov(), GetProjRatio(), GetNearPlane(), GetFarPlane());
-    mathMatrixLookAt(&mView, GetPosition(), GetPosition() + GetViewdir(), Vec3(0, 0, 1));
-
-    int viewport[4] = {0, 0, GetViewSurfaceX(), GetViewSurfaceZ()};
-
-    if (!topLeft.IsZero() || !widthHeight.IsZero())
-    {
-        viewport[0] = topLeft.x;
-        viewport[1] = topLeft.y;
-        viewport[2] = widthHeight.x;
-        viewport[3] = widthHeight.y;
-    }
-
-    Vec4 vIn;
-    vIn.x = (viewportPos.x - viewport[0]) * 2 / viewport[2] - 1.0f;
-    vIn.y = (viewportPos.y - viewport[1]) * 2 / viewport[3] - 1.0f;
-    vIn.z = viewportPos.z;
-    vIn.w = 1.0;
-
-    Matrix44A m;
-    const float* proj = mProj.GetData();
-    const float* view = mView.GetData();
-    float* mdata = m.GetData();
-    for (int i = 0; i < 4; i++)
-    {
-        float ai0 = proj[i],  ai1 = proj[4 + i],  ai2 = proj[8 + i],  ai3 = proj[12 + i];
-        mdata[i] = ai0 * view[0] + ai1 * view[1] + ai2 * view[2] + ai3 * view[3];
-        mdata[4 + i] = ai0 * view[4] + ai1 * view[5] + ai2 * view[6] + ai3 * view[7];
-        mdata[8 + i] = ai0 * view[8] + ai1 * view[9] + ai2 * view[10] + ai3 * view[11];
-        mdata[12 + i] = ai0 * view[12] + ai1 * view[13] + ai2 * view[14] + ai3 * view[15];
-    }
-
-    m.Invert();
-    if (!m.IsValid())
-    {
-        return false;
-    }
-
-    Vec4 vOut = vIn * m;
-    if (vOut.w == 0.0)
-    {
-        return false;
-    }
-
-    result = Vec3(vOut.x / vOut.w, vOut.y / vOut.w, vOut.z / vOut.w);
-
-    return true;
-}
-
-ILINE void CCamera::CalcScreenBounds(int* vOut, const AABB* pAABB, int nWidth, int nHeight) const
-{
-    Matrix44A mProj, mView, mVP;
-    mathMatrixPerspectiveFov(&mProj, GetFov(), GetProjRatio(), GetNearPlane(), GetFarPlane());
-    mathMatrixLookAt(&mView, GetPosition(), GetPosition() + GetViewdir(), GetMatrix().GetColumn2());
-    mVP = mView * mProj;
-
-    Vec3 verts[8];
-
-    Vec2i   topLeft = Vec2i(0, 0);
-    Vec2i widthHeight = Vec2i(nWidth, nHeight);
-    float pViewport[4] = {0.0f, 0.0f, (float)widthHeight.x, (float)widthHeight.y};
-
-    float x0 = 9999.9f, x1 = -9999.9f, y0 = 9999.9f, y1 = -9999.9f;
-    float fIntersect = 1.0f;
-
-    Vec3 vDir = GetViewdir();
-    Vec3 vPos = GetPosition();
-    float d = vPos.Dot(vDir);
-
-    verts[0] = Vec3(pAABB->min.x, pAABB->min.y, pAABB->min.z);
-    verts[1] = Vec3(pAABB->max.x, pAABB->min.y, pAABB->min.z);
-    verts[2] = Vec3(pAABB->min.x, pAABB->max.y, pAABB->min.z);
-    verts[3] = Vec3(pAABB->max.x, pAABB->max.y, pAABB->min.z);
-    verts[4] = Vec3(pAABB->min.x, pAABB->min.y, pAABB->max.z);
-    verts[5] = Vec3(pAABB->max.x, pAABB->min.y, pAABB->max.z);
-    verts[6] = Vec3(pAABB->min.x, pAABB->max.y, pAABB->max.z);
-    verts[7] = Vec3(pAABB->max.x, pAABB->max.y, pAABB->max.z);
-
-    for (int i = 0; i < 8; i++)
-    {
-        float fDist = verts[i].Dot(vDir) - d;
-        fDist = (float)fsel(fDist, 0.0f, -fDist);
-
-        //Project(verts[i],vertsOut[i], topLeft, widthHeight);
-
-        Vec3 result = Vec3(0.0f, 0.0f, 0.0f);
-        Vec4 transformed, projected, vIn;
-
-        vIn = Vec4(verts[i].x, verts[i].y, verts[i].z, 1.0f);
-
-        mathVec4Transform((f32*)&projected, (f32*)&mVP, (f32*)&vIn);
-
-        fIntersect = (float)fsel(-projected.w, 0.0f, 1.0f);
-
-        if (!fzero(fIntersect) && !fzero(projected.w))
-        {
-            projected.x /= projected.w;
-            projected.y /= projected.w;
-            projected.z /= projected.w;
-
-            //output coords
-            result.x = pViewport[0] + (1.0f + projected.x) * pViewport[2] / 2.0f;
-            result.y = pViewport[1] + (1.0f - projected.y) * pViewport[3] / 2.0f;  //flip coords for y axis
-            result.z = projected.z;
-        }
-        else
-        {
-            vOut[0] = topLeft.x;
-            vOut[1] = topLeft.y;
-            vOut[2] = widthHeight.x;
-            vOut[3] = widthHeight.y;
-            return;
-        }
-
-        x0 = min(x0, result.x);
-        x1 = max(x1, result.x);
-        y0 = min(y0, result.y);
-        y1 = max(y1, result.y);
-    }
-
-    vOut[0] = (int)max(0.0f, min(pViewport[2], x0));
-    vOut[1] = (int)max(0.0f, min(pViewport[3], y0));
-    vOut[2] = (int)max(0.0f, min(pViewport[2], x1));
-    vOut[3] = (int)max(0.0f, min(pViewport[3], y1));
-}
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-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_ProjectionRatio = fWidth / fHeight;    // projection ratio (1.0 for square pixels)
-
-    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;
-
-    assert(fabs(acos_tpl(Vec3d(0, m_edge_plt.y, m_edge_plt.z).GetNormalized().y) * 2 - m_fov) < 0.001);
-
-    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;
-    }
-    m_OccPosition = GetPosition();
-}
-
-// Summary
-//   Return frustum vertices in world space
-// Description
-//   Takes pointer to array of 8 elements
-inline void CCamera::GetFrustumVertices(Vec3* pVerts) const
-{
-    Matrix33 m33 = Matrix33(m_Matrix);
-
-    /*
-        The frustum array contains points in the following order
-
-        frustum[0] = far left top
-        frustum[1] = far left bottom
-        frustum[2] = far right bottom
-        frustum[3] = far right top
-
-        frustum[4] = near left top
-        frustum[5] = near left bottom
-        frustum[6] = near right bottom
-        frustum[7] = near right top
-    */
-
-    int i = 0;
-
-    pVerts[i++] = m33 * Vec3(+m_edge_flt.x, +m_edge_flt.y, +m_edge_flt.z) + GetPosition();
-    pVerts[i++] = m33 * Vec3(+m_edge_flt.x, +m_edge_flt.y, -m_edge_flt.z) + GetPosition();
-    pVerts[i++] = m33 * Vec3(-m_edge_flt.x, +m_edge_flt.y, -m_edge_flt.z) + GetPosition();
-    pVerts[i++] = m33 * Vec3(-m_edge_flt.x, +m_edge_flt.y, +m_edge_flt.z) + GetPosition();
-
-    pVerts[i++] = m33 * Vec3(+m_edge_nlt.x, +m_edge_nlt.y, +m_edge_nlt.z) + GetPosition();
-    pVerts[i++] = m33 * Vec3(+m_edge_nlt.x, +m_edge_nlt.y, -m_edge_nlt.z) + GetPosition();
-    pVerts[i++] = m33 * Vec3(-m_edge_nlt.x, +m_edge_nlt.y, -m_edge_nlt.z) + GetPosition();
-    pVerts[i++] = m33 * Vec3(-m_edge_nlt.x, +m_edge_nlt.y, +m_edge_nlt.z) + GetPosition();
-}
-
-inline void CCamera::GetFrustumVerticesCam(Vec3* pVerts) const
-{
-    int i = 0;
-
-    //near plane
-    pVerts[i++] = Vec3(+m_edge_nlt.x, +m_edge_nlt.y, +m_edge_nlt.z);
-    pVerts[i++] = Vec3(+m_edge_nlt.x, +m_edge_nlt.y, -m_edge_nlt.z);
-    pVerts[i++] = Vec3(-m_edge_nlt.x, +m_edge_nlt.y, -m_edge_nlt.z);
-    pVerts[i++] = Vec3(-m_edge_nlt.x, +m_edge_nlt.y, +m_edge_nlt.z);
-
-    //far plane
-    pVerts[i++] = Vec3(+m_edge_flt.x, +m_edge_flt.y, +m_edge_flt.z);
-    pVerts[i++] = Vec3(+m_edge_flt.x, +m_edge_flt.y, -m_edge_flt.z);
-    pVerts[i++] = Vec3(-m_edge_flt.x, +m_edge_flt.y, -m_edge_flt.z);
-    pVerts[i++] = Vec3(-m_edge_flt.x, +m_edge_flt.y, +m_edge_flt.z);
-}
-
-//get near-plane vertices
-ILINE const Vec3& CCamera::GetNPVertex(int nId) const
-{
-    switch (nId)
-    {
-    case 0:
-        return m_clbn;
-    case 1:
-        return m_cltn;
-    case 2:
-        return m_crtn;
-    case 3:
-        return m_crbn;
-    }
-    assert(0);
-    return m_clbn;
-}
-//get far-plane vertices
-ILINE const Vec3& CCamera::GetFPVertex(int nId) const
-{
-    switch (nId)
-    {
-    case 0:
-        return m_clbf;
-    case 1:
-        return m_cltf;
-    case 2:
-        return m_crtf;
-    case 3:
-        return m_crbf;
-    }
-    assert(0);
-    return m_clbf;
-}
-ILINE const Vec3& CCamera::GetPPVertex(int nId) const
-{
-    switch (nId)
-    {
-    case 0:
-        return m_clbp;
-    case 1:
-        return m_cltp;
-    case 2:
-        return m_crtp;
-    case 3:
-        return m_crbp;
-    }
-    assert(0);
-    return m_clbp;
-}
-
-
-
-
-// Description
-//   Check if a point lies within camera's frustum
-//
-// Example
-//   u8 InOut=camera.IsPointVisible(point);
-//
-// return values
-//   CULL_EXCLUSION = point outside of frustum
-//   CULL_INTERSECT = point inside of frustum
-inline bool CCamera::IsPointVisible(const Vec3& p) const
-{
-    if ((m_fp[FR_PLANE_NEAR  ] | p) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[FR_PLANE_RIGHT ] | p) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[FR_PLANE_LEFT  ] | p) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[FR_PLANE_TOP   ] | p) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[FR_PLANE_BOTTOM] | p) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[FR_PLANE_FAR   ] | p) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    return CULL_OVERLAP;
-}
-
-
-
-
-
-
-
-
-// Description
-//   Conventional method to check if a sphere and the camera-frustum overlap
-//   The center of the sphere is assumed to be in world-space.
-//
-// Example
-//   u8 InOut=camera.IsSphereVisible_F(sphere);
-//
-// return values
-//   CULL_EXCLUSION = sphere outside of frustum (very fast rejection-test)
-//   CULL_INTERSECT = sphere and frustum intersects or sphere in completely inside frustum
-inline bool CCamera::IsSphereVisible_F(const ::Sphere& s) const
-{
-    if ((m_fp[0] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[1] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[2] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[3] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[4] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((m_fp[5] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    return CULL_OVERLAP;
-}
-
-// Description
-//   Conventional method to check if a sphere and the camera-frustum overlap, or
-//   if the sphere is completely inside the camera-frustum. The center of the
-//   sphere is assumed to be in world-space.
-//
-// Example
-//   u8 InOut=camera.IsSphereVisible_FH(sphere);
-//
-// return values
-//   CULL_EXCLUSION   = sphere outside of frustum (very fast rejection-test)
-//   CULL_INTERSECT   = sphere intersects the borders of the frustum, further checks necessary
-//   CULL_INCLUSION   = sphere is complete inside the frustum, no further checks necessary
-inline uint8 CCamera::IsSphereVisible_FH(const ::Sphere& s) const
-{
-    f32 nc, rc, lc, tc, bc, cc;
-    if ((nc = m_fp[0] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((rc = m_fp[1] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((lc = m_fp[2] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((tc = m_fp[3] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((bc = m_fp[4] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-    if ((cc = m_fp[5] | s.center) > s.radius)
-    {
-        return CULL_EXCLUSION;
-    }
-
-    //now we have to check if it is completely in frustum
-    f32 r = -s.radius;
-    if (nc > r)
-    {
-        return CULL_OVERLAP;
-    }
-    if (lc > r)
-    {
-        return CULL_OVERLAP;
-    }
-    if (rc > r)
-    {
-        return CULL_OVERLAP;
-    }
-    if (tc > r)
-    {
-        return CULL_OVERLAP;
-    }
-    if (bc > r)
-    {
-        return CULL_OVERLAP;
-    }
-    if (cc > r)
-    {
-        return CULL_OVERLAP;
-    }
-    return CULL_INCLUSION;
-}
-
-
-
-
-
-// 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;
-}
-
-
-// Description
-//   Hierarchical approach to check if an AABB and the camera-frustum overlap, or if the AABB
-//   is totally inside the camera-frustum. The AABB is assumed to be in world-space.
-//
-// Example
-//   int InOut=camera.IsAABBVisible_FH(aabb);
-//
-// return values
-//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
-//   CULL_OVERLAP     = AABB intersects the borders of the frustum, further checks necessary
-//   CULL_INCLUSION   = AABB is complete inside the frustum, no further checks necessary
-
-inline uint8 CCamera::IsAABBVisible_FH(const AABB& aabb, bool* pAllInside) const
-{
-    assert(pAllInside && *pAllInside == false);
-    if (IsAABBVisible_F(aabb) == CULL_EXCLUSION)
-    {
-        return CULL_EXCLUSION;
-    }
-    const f32* p = &aabb.min.x;
-    uint32 x, y, z;
-    x = m_idx2[0];
-    y = m_idy2[0];
-    z = m_idz2[0];
-    if ((m_fp[0] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[1];
-    y = m_idy2[1];
-    z = m_idz2[1];
-    if ((m_fp[1] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[2];
-    y = m_idy2[2];
-    z = m_idz2[2];
-    if ((m_fp[2] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[3];
-    y = m_idy2[3];
-    z = m_idz2[3];
-    if ((m_fp[3] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[4];
-    y = m_idy2[4];
-    z = m_idz2[4];
-    if ((m_fp[4] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[5];
-    y = m_idy2[5];
-    z = m_idz2[5];
-    if ((m_fp[5] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    *pAllInside = true;
-    return CULL_INCLUSION;
-}
-
-// Description
-//   Hierarchical approach to check if an AABB and the camera-frustum overlap, or if the AABB
-//   is totally inside the camera-frustum. The AABB is assumed to be in world-space.
-//
-// Example
-//   int InOut=camera.IsAABBVisible_FH(aabb);
-//
-// return values
-//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
-//   CULL_OVERLAP     = AABB intersects the borders of the frustum, further checks necessary
-//   CULL_INCLUSION   = AABB is complete inside the frustum, no further checks necessary
-inline uint8 CCamera::IsAABBVisible_FH(const AABB& aabb) const
-{
-    if (IsAABBVisible_F(aabb) == CULL_EXCLUSION)
-    {
-        return CULL_EXCLUSION;
-    }
-    const f32* p = &aabb.min.x;
-    uint32 x, y, z;
-    x = m_idx2[0];
-    y = m_idy2[0];
-    z = m_idz2[0];
-    if ((m_fp[0] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[1];
-    y = m_idy2[1];
-    z = m_idz2[1];
-    if ((m_fp[1] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[2];
-    y = m_idy2[2];
-    z = m_idz2[2];
-    if ((m_fp[2] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[3];
-    y = m_idy2[3];
-    z = m_idz2[3];
-    if ((m_fp[3] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[4];
-    y = m_idy2[4];
-    z = m_idz2[4];
-    if ((m_fp[4] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    x = m_idx2[5];
-    y = m_idy2[5];
-    z = m_idz2[5];
-    if ((m_fp[5] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_OVERLAP;
-    }
-    return CULL_INCLUSION;
-}
-
-
-// Description
-//  This function checks if an AABB and the camera-frustum overlap. The AABB is assumed to be in world-space.
-//  This test can reject even such AABBs that overlap a frustum-plane far outside the view-frustum.
-// IMPORTANT:
-//  This function is only useful if you really need exact-culling.
-//  It's about 30% slower then "IsAABBVisible_F(aabb)"
-//
-// Example:
-//  int InOut=camera.IsAABBVisible_E(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_E(const AABB& aabb) const
-{
-    uint8 o = IsAABBVisible_FH(aabb);
-    if (o == CULL_EXCLUSION)
-    {
-        return CULL_EXCLUSION;
-    }
-    if (o == CULL_INCLUSION)
-    {
-        return CULL_OVERLAP;
-    }
-    return AdditionalCheck(aabb); //result is either "exclusion" or "overlap"
-}
-
-// Description:
-//   Improved approach to check if an AABB and the camera-frustum overlap, or if the AABB
-//   is totally inside the camera-frustum. The AABB is assumed to be in world-space. This
-//   test can reject even such AABBs that overlap a frustum-plane far outside the view-frustum.
-// IMPORTANT:
-//   This function is only useful if you really need exact-culling.
-//   It's about 30% slower then "IsAABBVisible_FH(aabb)"
-//
-// Example:
-//   int InOut=camera.IsAABBVisible_EH(aabb);
-//
-// return values:
-//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
-//   CULL_OVERLAP     = AABB intersects the borders of the frustum, further checks necessary
-//   CULL_INCLUSION   = AABB is complete inside the frustum, no further checks necessary
-inline uint8 CCamera::IsAABBVisible_EH(const AABB& aabb, bool* pAllInside) const
-{
-    uint8 o = IsAABBVisible_FH(aabb, pAllInside);
-    if (o == CULL_EXCLUSION)
-    {
-        return CULL_EXCLUSION;
-    }
-    if (o == CULL_INCLUSION)
-    {
-        return CULL_INCLUSION;
-    }
-    return AdditionalCheck(aabb); //result is either "exclusion" or "overlap"
-}
-
-// Description:
-//   Improved approach to check if an AABB and the camera-frustum overlap, or if the AABB
-//   is totally inside the camera-frustum. The AABB is assumed to be in world-space. This
-//   test can reject even such AABBs that overlap a frustum-plane far outside the view-frustum.
-// IMPORTANT:
-//   This function is only useful if you really need exact-culling.
-//   It's about 30% slower then "IsAABBVisible_FH(aabb)"
-//
-// Example:
-//   int InOut=camera.IsAABBVisible_EH(aabb);
-//
-// return values:
-//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
-//   CULL_OVERLAP     = AABB intersects the borders of the frustum, further checks necessary
-//   CULL_INCLUSION   = AABB is complete inside the frustum, no further checks necessary
-inline uint8 CCamera::IsAABBVisible_EH(const AABB& aabb) const
-{
-    uint8 o = IsAABBVisible_FH(aabb);
-    if (o == CULL_EXCLUSION)
-    {
-        return CULL_EXCLUSION;
-    }
-    if (o == CULL_INCLUSION)
-    {
-        return CULL_INCLUSION;
-    }
-    return AdditionalCheck(aabb); //result is either "exclusion" or "overlap"
-}
-
-// Description:
-//  Makes culling taking into account presence of m_pMultiCamera
-//  If m_pMultiCamera exists - object is visible if at least one of cameras see's it
-//
-// return values:
-//  true - box visible
-//  true - not visible
-inline bool CCamera::IsAABBVisible_EHM(const AABB& aabb, bool* pAllInside) const
-{
-    assert(pAllInside && *pAllInside == false);
-
-    if (!m_pMultiCamera) // use main camera
-    {
-        return IsAABBVisible_EH(aabb, pAllInside) != CULL_EXCLUSION;
-    }
-
-    bool bVisible = false;
-
-    for (int i = 0; i < m_pMultiCamera->Count(); i++)
-    {
-        bool bAllIn = false;
-
-        if (m_pMultiCamera->GetAt(i).IsAABBVisible_EH(aabb, &bAllIn))
-        {
-            bVisible = true;
-
-            // don't break here always because another camera may include bbox completely
-            if (bAllIn)
-            {
-                *pAllInside = true;
-                break;
-            }
-        }
-    }
-
-    return bVisible;
-}
-
-// Description:
-//  Makes culling taking into account presence of m_pMultiCamera
-//  If m_pMultiCamera exists - object is visible if at least one of cameras see's it
-//
-// return values:
-//  true - box visible
-//  true - not visible
-ILINE bool CCamera::IsAABBVisible_EM(const AABB& aabb) const
-{
-    if (!m_pMultiCamera) // use main camera
-    {
-        return IsAABBVisible_E(aabb) != CULL_EXCLUSION;
-    }
-
-    // check several parallel cameras - object is visible if at least one camera see's it
-
-    for (int i = 0; i < m_pMultiCamera->Count(); i++)
-    {
-        if (m_pMultiCamera->GetAt(i).IsAABBVisible_E(aabb))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-// Description:
-//  Makes culling taking into account presence of m_pMultiCamera
-//  If m_pMultiCamera exists - object is visible if at least one of cameras see's it
-//
-// return values:
-//  true - box visible
-//  true - not visible
-ILINE bool CCamera::IsAABBVisible_FM(const AABB& aabb) const
-{
-    PrefetchLine(&aabb, sizeof(AABB));
-
-    if (!m_pMultiCamera) // use main camera
-    {
-        return IsAABBVisible_F(aabb) != CULL_EXCLUSION;
-    }
-
-    // check several parallel cameras - object is visible if at least one camera see's it
-
-    for (int i = 0; i < m_pMultiCamera->Count(); i++)
-    {
-        if (m_pMultiCamera->GetAt(i).IsAABBVisible_F(aabb))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-
-
-// Description
-//   Fast check if an OBB and the camera-frustum overlap, using the separating-axis-theorem (SAT)
-//   The center of the OOBB is assumed to be in world-space.
-// NOTE: even if the OBB is totally inside the frustum, this function returns CULL_OVERLAP
-//   For hierarchical frustum-culling this function is not perfect.
-//
-// Example:
-//   bool InOut=camera.IsOBBVisibleFast(obb);
-//
-// return values:
-//   CULL_EXCLUSION = OBB outside of frustum (very fast rejection-test)
-//   CULL_OVERLAP   = OBB and frustum intersects or OBB in totally inside frustum
-inline bool CCamera::IsOBBVisible_F(const Vec3& wpos, const OBB& obb) const
-{
-    CRY_ASSERT(obb.m33.IsOrthonormalRH(0.001f));
-
-    //transform the obb-center into world-space
-    Vec3 p  =   obb.m33 * obb.c + wpos;
-
-    //extract the orientation-vectors from the columns of the 3x3 matrix
-    //and scale them by the half-lengths
-    Vec3 ax = obb.m33.GetColumn0() * obb.h.x;
-    Vec3 ay = obb.m33.GetColumn1() * obb.h.y;
-    Vec3 az = obb.m33.GetColumn2() * obb.h.z;
-
-    //we project the axes of the OBB onto the normal of each of the 6 planes.
-    //If the absolute value of the distance from the center of the OBB to the plane
-    //is larger then the "radius" of the OBB, then the OBB is outside the frustum.
-    f32 t;
-    if ((t = m_fp[0] | p) > 0.0f)
-    {
-        if (t > (fabsf(m_fp[0].n | ax) + fabsf(m_fp[0].n | ay) + fabsf(m_fp[0].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if ((t = m_fp[1] | p) > 0.0f)
-    {
-        if (t > (fabsf(m_fp[1].n | ax) + fabsf(m_fp[1].n | ay) + fabsf(m_fp[1].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if ((t = m_fp[2] | p) > 0.0f)
-    {
-        if (t > (fabsf(m_fp[2].n | ax) + fabsf(m_fp[2].n | ay) + fabsf(m_fp[2].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if ((t = m_fp[3] | p) > 0.0f)
-    {
-        if (t > (fabsf(m_fp[3].n | ax) + fabsf(m_fp[3].n | ay) + fabsf(m_fp[3].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if ((t = m_fp[4] | p) > 0.0f)
-    {
-        if (t > (fabsf(m_fp[4].n | ax) + fabsf(m_fp[4].n | ay) + fabsf(m_fp[4].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if ((t = m_fp[5] | p) > 0.0f)
-    {
-        if (t > (fabsf(m_fp[5].n | ax) + fabsf(m_fp[5].n | ay) + fabsf(m_fp[5].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-
-    //probably the OBB is visible!
-    //With this test we can't be sure if the OBB partially visible or totally included or
-    //totally outside the frustum but still intersecting one of the 6 planes (=worst case)
-    return CULL_OVERLAP;
-}
-
-ILINE uint8 CCamera::IsOBBVisible_FH([[maybe_unused]] const Vec3& wpos, [[maybe_unused]] const OBB& obb) const
-{
-    //not implemented yet
-    return CULL_EXCLUSION;
-}
-
-// Description:
-//   This function checks if an OBB and the camera-frustum overlap.
-//   This test can reject even such OBBs that overlap a frustum-plane
-//   far outside the view-frustum.
-// IMPORTANT: It is about 10% slower then "IsOBBVisibleFast(obb)"
-//
-// Example:
-//   int InOut=camera.IsOBBVisible_E(OBB);
-//
-// return values:
-//   CULL_EXCLUSION   = OBB outside of frustum (very fast rejection-test)
-//   CULL_OVERLAP     = OBB intersects the borders of the frustum or is totally inside
-inline bool CCamera::IsOBBVisible_E(const Vec3& wpos, const OBB& obb, f32 uscale = 1.0f) const
-{
-    assert(obb.m33.IsOrthonormalRH(0.001f));
-
-    //transform the obb-center into world-space
-    Vec3 p  =   obb.m33 * obb.c * uscale + wpos;
-
-    //extract the orientation-vectors from the columns of the 3x3 matrix
-    //and scale them by the half-lengths
-    Vec3 ax = obb.m33.GetColumn0() * obb.h.x * uscale;
-    Vec3 ay = obb.m33.GetColumn1() * obb.h.y * uscale;
-    Vec3 az = obb.m33.GetColumn2() * obb.h.z * uscale;
-
-    //we project the axes of the OBB onto the normal of each of the 6 planes.
-    //If the absolute value of the distance from the center of the OBB to the plane
-    //is larger then the "radius" of the OBB, then the OBB is outside the frustum.
-    f32 t0, t1, t2, t3, t4, t5;
-    bool mt0, mt1, mt2, mt3, mt4, mt5;
-    mt0 = (t0 = m_fp[0] | p) > 0.0f;
-    if (mt0)
-    {
-        if (t0 > (fabsf(m_fp[0].n | ax) + fabsf(m_fp[0].n | ay) + fabsf(m_fp[0].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    mt1 = (t1 = m_fp[1] | p) > 0.0f;
-    if (mt1)
-    {
-        if (t1 > (fabsf(m_fp[1].n | ax) + fabsf(m_fp[1].n | ay) + fabsf(m_fp[1].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    mt2 = (t2 = m_fp[2] | p) > 0.0f;
-    if (mt2)
-    {
-        if (t2 > (fabsf(m_fp[2].n | ax) + fabsf(m_fp[2].n | ay) + fabsf(m_fp[2].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    mt3 = (t3 = m_fp[3] | p) > 0.0f;
-    if (mt3)
-    {
-        if (t3 > (fabsf(m_fp[3].n | ax) + fabsf(m_fp[3].n | ay) + fabsf(m_fp[3].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    mt4 = (t4 = m_fp[4] | p) > 0.0f;
-    if (mt4)
-    {
-        if (t4 > (fabsf(m_fp[4].n | ax) + fabsf(m_fp[4].n | ay) + fabsf(m_fp[4].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    mt5 = (t5 = m_fp[5] | p) > 0.0f;
-    if (mt5)
-    {
-        if (t5 > (fabsf(m_fp[5].n | ax) + fabsf(m_fp[5].n | ay) + fabsf(m_fp[5].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-
-    //if obb-center is in view-frustum, then stop further calculation
-    if (!(mt0 | mt1 | mt2 | mt3 | mt4 | mt5))
-    {
-        return CULL_OVERLAP;
-    }
-
-    return AdditionalCheck(wpos, obb, uscale);
-}
-
-
-// Description:
-//   Improved approach to check if an OBB and the camera-frustum intersect, or if the OBB
-//   is totally inside the camera-frustum. The bounding-box of the OBB is assumed to be
-//   in world-space. This test can reject even such OBBs that intersect a frustum-plane far
-//   outside the view-frustum
-//
-// Example:
-//   int InOut=camera.IsOBBVisible_EH(obb);
-//
-// return values:
-//   CULL_EXCLUSION   = OBB outside of frustum (very fast rejection-test)
-//   CULL_OVERLAP     = OBB intersects the borders of the frustum, further checks necessary
-//   CULL_INCLUSION   = OBB is complete inside the frustum, no further checks necessary
-inline uint8 CCamera::IsOBBVisible_EH(const Vec3& wpos, const OBB& obb, f32 uscale = 1.0f) const
-{
-    assert(obb.m33.IsOrthonormalRH(0.001f));
-    //transform the obb-center into world-space
-    Vec3 p  =   obb.m33 * obb.c * uscale + wpos;
-
-    //extract the orientation-vectors from the columns of the 3x3 matrix
-    //and scale them by the half-lengths
-    Vec3 ax = obb.m33.GetColumn0() * obb.h.x * uscale;
-    Vec3 ay = obb.m33.GetColumn1() * obb.h.y * uscale;
-    Vec3 az = obb.m33.GetColumn2() * obb.h.z * uscale;
-
-    //we project the axes of the OBB onto the normal of each of the 6 planes.
-    //If the absolute value of the distance from the center of the OBB to the plane
-    //is larger then the "radius" of the OBB, then the OBB is outside the frustum.
-    f32 t0, t1, t2, t3, t4, t5;
-    bool mt0, mt1, mt2, mt3, mt4, mt5;
-    if (mt0 = (t0 = m_fp[0] | p) > 0.0f)
-    {
-        if (t0 > (fabsf(m_fp[0].n | ax) + fabsf(m_fp[0].n | ay) + fabsf(m_fp[0].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if (mt1 = (t1 = m_fp[1] | p) > 0.0f)
-    {
-        if (t1 > (fabsf(m_fp[1].n | ax) + fabsf(m_fp[1].n | ay) + fabsf(m_fp[1].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if (mt2 = (t2 = m_fp[2] | p) > 0.0f)
-    {
-        if (t2 > (fabsf(m_fp[2].n | ax) + fabsf(m_fp[2].n | ay) + fabsf(m_fp[2].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if (mt3 = (t3 = m_fp[3] | p) > 0.0f)
-    {
-        if (t3 > (fabsf(m_fp[3].n | ax) + fabsf(m_fp[3].n | ay) + fabsf(m_fp[3].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if (mt4 = (t4 = m_fp[4] | p) > 0.0f)
-    {
-        if (t4 > (fabsf(m_fp[4].n | ax) + fabsf(m_fp[4].n | ay) + fabsf(m_fp[4].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    if (mt5 = (t5 = m_fp[5] | p) > 0.0f)
-    {
-        if (t5 > (fabsf(m_fp[5].n | ax) + fabsf(m_fp[5].n | ay) + fabsf(m_fp[5].n | az)))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-
-    //check if obb-center is in view-frustum
-    if (!(mt0 | mt1 | mt2 | mt3 | mt4 | mt5))
-    {
-        //yes, it is!
-        //and now check if OBB is totally included
-        if (-t0 < (fabsf(m_fp[0].n | ax) + fabsf(m_fp[0].n | ay) + fabsf(m_fp[0].n | az)))
-        {
-            return CULL_OVERLAP;
-        }
-        if (-t1 < (fabsf(m_fp[1].n | ax) + fabsf(m_fp[1].n | ay) + fabsf(m_fp[1].n | az)))
-        {
-            return CULL_OVERLAP;
-        }
-        if (-t2 < (fabsf(m_fp[2].n | ax) + fabsf(m_fp[2].n | ay) + fabsf(m_fp[2].n | az)))
-        {
-            return CULL_OVERLAP;
-        }
-        if (-t3 < (fabsf(m_fp[3].n | ax) + fabsf(m_fp[3].n | ay) + fabsf(m_fp[3].n | az)))
-        {
-            return CULL_OVERLAP;
-        }
-        if (-t4 < (fabsf(m_fp[4].n | ax) + fabsf(m_fp[4].n | ay) + fabsf(m_fp[4].n | az)))
-        {
-            return CULL_OVERLAP;
-        }
-        if (-t5 < (fabsf(m_fp[5].n | ax) + fabsf(m_fp[5].n | ay) + fabsf(m_fp[5].n | az)))
-        {
-            return CULL_OVERLAP;
-        }
-        return CULL_INCLUSION;
-    }
-    return AdditionalCheck(wpos, obb, uscale);
-}
-
-//------------------------------------------------------------------------------
-//---                         ADDITIONAL-TEST                                ---
-//------------------------------------------------------------------------------
-
-extern _MS_ALIGN(64) uint32 BoxSides[];
-
-// Description:
-//   A box can easily straddle one of the view-frustum planes far
-//   outside the view-frustum and in this case the previous test would
-//   return CULL_OVERLAP.
-//
-// Note:  With this check, we make sure the AABB is really not visble
-NO_INLINE_WEAK bool CCamera::AdditionalCheck(const AABB& aabb) const
-{
-    Vec3d m = (aabb.min + aabb.max) * 0.5;
-    uint32 o = 1; //will be reset to 0 if center is outside
-    o &= isneg(m_fp[0] | m);
-    o &= isneg(m_fp[2] | m);
-    o &= isneg(m_fp[3] | m);
-    o &= isneg(m_fp[4] | m);
-    o &= isneg(m_fp[5] | m);
-    o &= isneg(m_fp[1] | m);
-    if (o)
-    {
-        return CULL_OVERLAP;    //if obb-center is in view-frustum, then stop further calculation
-    }
-    Vec3d vmin(aabb.min - GetPosition());  //AABB in camera-space
-    Vec3d vmax(aabb.max - GetPosition());  //AABB in camera-space
-
-    uint32 frontx8 = 0; // make the flags using the fact that the upper bit in f32 is its sign
-
-    union f64_u
-    {
-        f64 floatVal;
-        int64 intVal;
-    };
-    f64_u uminx, uminy, uminz, umaxx, umaxy, umaxz;
-    uminx.floatVal = vmin.x;
-    uminy.floatVal = vmin.y;
-    uminz.floatVal = vmin.z;
-    umaxx.floatVal = vmax.x;
-    umaxy.floatVal = vmax.y;
-    umaxz.floatVal = vmax.z;
-
-    frontx8 |= (-uminx.intVal >> 0x3f) & 0x008; //if (AABB.min.x>0.0f)  frontx8|=0x008;
-    frontx8 |= (umaxx.intVal >> 0x3f) & 0x010; //if (AABB.max.x<0.0f)  frontx8|=0x010;
-    frontx8 |= (-uminy.intVal >> 0x3f) & 0x020; //if (AABB.min.y>0.0f)  frontx8|=0x020;
-    frontx8 |= (umaxy.intVal >> 0x3f) & 0x040; //if (AABB.max.y<0.0f)  frontx8|=0x040;
-    frontx8 |= (-uminz.intVal >> 0x3f) & 0x080; //if (AABB.min.z>0.0f)  frontx8|=0x080;
-    frontx8 |= (umaxz.intVal >> 0x3f) & 0x100; //if (AABB.max.z<0.0f)  frontx8|=0x100;
-
-    //check if camera is inside the aabb
-    if (frontx8 == 0)
-    {
-        return CULL_OVERLAP;             //AABB is patially visible
-    }
-    Vec3d v[8] = {
-        Vec3d(vmin.x, vmin.y, vmin.z),
-        Vec3d(vmax.x, vmin.y, vmin.z),
-        Vec3d(vmin.x, vmax.y, vmin.z),
-        Vec3d(vmax.x, vmax.y, vmin.z),
-        Vec3d(vmin.x, vmin.y, vmax.z),
-        Vec3d(vmax.x, vmin.y, vmax.z),
-        Vec3d(vmin.x, vmax.y, vmax.z),
-        Vec3d(vmax.x, vmax.y, vmax.z)
-    };
-
-    //---------------------------------------------------------------------
-    //---            find the silhouette-vertices of the AABB            ---
-    //---------------------------------------------------------------------
-    uint32 p0   =   BoxSides[frontx8 + 0];
-    uint32 p1   =   BoxSides[frontx8 + 1];
-    uint32 p2   =   BoxSides[frontx8 + 2];
-    uint32 p3   =   BoxSides[frontx8 + 3];
-    uint32 p4   =   BoxSides[frontx8 + 4];
-    uint32 p5   =   BoxSides[frontx8 + 5];
-    uint32 sideamount = BoxSides[frontx8 + 7];
-
-    if (sideamount == 4)
-    {
-        //--------------------------------------------------------------------------
-        //---     we take the 4 vertices of projection-plane in cam-space,       ---
-        //-----  and clip them against the 4 side-frustum-planes of the AABB        -
-        //--------------------------------------------------------------------------
-        Vec3d s0 = v[p0] % v[p1];
-        if ((s0 | m_cltp) > 0 && (s0 | m_crtp) > 0 && (s0 | m_crbp) > 0 && (s0 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3d s1 = v[p1] % v[p2];
-        if ((s1 | m_cltp) > 0 && (s1 | m_crtp) > 0 && (s1 | m_crbp) > 0 && (s1 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3d s2 = v[p2] % v[p3];
-        if ((s2 | m_cltp) > 0 && (s2 | m_crtp) > 0 && (s2 | m_crbp) > 0 && (s2 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3d s3 = v[p3] % v[p0];
-        if ((s3 | m_cltp) > 0 && (s3 | m_crtp) > 0 && (s3 | m_crbp) > 0 && (s3 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-
-    if (sideamount == 6)
-    {
-        //--------------------------------------------------------------------------
-        //---     we take the 4 vertices of projection-plane in cam-space,       ---
-        //---    and clip them against the 6 side-frustum-planes of the AABB      ---
-        //--------------------------------------------------------------------------
-        Vec3d s0 = v[p0] % v[p1];
-        if ((s0 | m_cltp) > 0 && (s0 | m_crtp) > 0 && (s0 | m_crbp) > 0 && (s0 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3d s1 = v[p1] % v[p2];
-        if ((s1 | m_cltp) > 0 && (s1 | m_crtp) > 0 && (s1 | m_crbp) > 0 && (s1 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3d s2 = v[p2] % v[p3];
-        if ((s2 | m_cltp) > 0 && (s2 | m_crtp) > 0 && (s2 | m_crbp) > 0 && (s2 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3d s3 = v[p3] % v[p4];
-        if ((s3 | m_cltp) > 0 && (s3 | m_crtp) > 0 && (s3 | m_crbp) > 0 && (s3 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3d s4 = v[p4] % v[p5];
-        if ((s4 | m_cltp) > 0 && (s4 | m_crtp) > 0 && (s4 | m_crbp) > 0 && (s4 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3d s5 = v[p5] % v[p0];
-        if ((s5 | m_cltp) > 0 && (s5 | m_crtp) > 0 && (s5 | m_crbp) > 0 && (s5 | m_clbp) > 0)
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    return CULL_OVERLAP; //AABB is patially visible
-}
-
-//------------------------------------------------------------------------------
-//---                         ADDITIONAL-TEST                                ---
-//------------------------------------------------------------------------------
-
-// Description:
-//   A box can easily straddle one of the view-frustum planes far
-//   outside the view-frustum and in this case the previous test would
-//   return CULL_OVERLAP.
-// Note:
-//   With this check, we make sure the OBB is really not visible
-NO_INLINE_WEAK bool CCamera::AdditionalCheck(const Vec3& wpos, const OBB& obb, f32 uscale) const
-{
-    Vec3 CamInOBBSpace  = wpos - GetPosition();
-    Vec3 iCamPos = -CamInOBBSpace * obb.m33;
-    uint32 front8 = 0;
-    AABB aabb = AABB((obb.c - obb.h) * uscale, (obb.c + obb.h) * uscale);
-    if (iCamPos.x < aabb.min.x)
-    {
-        front8 |= 0x008;
-    }
-    if (iCamPos.x > aabb.max.x)
-    {
-        front8 |= 0x010;
-    }
-    if (iCamPos.y < aabb.min.y)
-    {
-        front8 |= 0x020;
-    }
-    if (iCamPos.y > aabb.max.y)
-    {
-        front8 |= 0x040;
-    }
-    if (iCamPos.z < aabb.min.z)
-    {
-        front8 |= 0x080;
-    }
-    if (iCamPos.z > aabb.max.z)
-    {
-        front8 |= 0x100;
-    }
-
-    if (front8 == 0)
-    {
-        return CULL_OVERLAP;
-    }
-
-    //the transformed OBB-vertices in cam-space
-    Vec3 v[8] = {
-        obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.min.z) + CamInOBBSpace,
-        obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.min.z) + CamInOBBSpace,
-        obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.min.z) + CamInOBBSpace,
-        obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.min.z) + CamInOBBSpace,
-        obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.max.z) + CamInOBBSpace,
-        obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.max.z) + CamInOBBSpace,
-        obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.max.z) + CamInOBBSpace,
-        obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.max.z) + CamInOBBSpace
-    };
-
-    //---------------------------------------------------------------------
-    //---            find the silhouette-vertices of the OBB            ---
-    //---------------------------------------------------------------------
-    uint32 p0   =   BoxSides[front8 + 0];
-    uint32 p1   =   BoxSides[front8 + 1];
-    uint32 p2   =   BoxSides[front8 + 2];
-    uint32 p3   =   BoxSides[front8 + 3];
-    uint32 p4   =   BoxSides[front8 + 4];
-    uint32 p5   =   BoxSides[front8 + 5];
-    uint32 sideamount = BoxSides[front8 + 7];
-
-    if (sideamount == 4)
-    {
-        //--------------------------------------------------------------------------
-        //---     we take the 4 vertices of projection-plane in cam-space,       ---
-        //-----  and clip them against the 4 side-frustum-planes of the OBB        -
-        //--------------------------------------------------------------------------
-        Vec3 s0 = v[p0] % v[p1];
-        if (((s0 | m_cltp) >= 0) && ((s0 | m_crtp) >= 0) && ((s0 | m_crbp) >= 0) && ((s0 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3 s1 = v[p1] % v[p2];
-        if (((s1 | m_cltp) >= 0) && ((s1 | m_crtp) >= 0) && ((s1 | m_crbp) >= 0) && ((s1 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3 s2 = v[p2] % v[p3];
-        if (((s2 | m_cltp) >= 0) && ((s2 | m_crtp) >= 0) && ((s2 | m_crbp) >= 0) && ((s2 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3 s3 = v[p3] % v[p0];
-        if (((s3 | m_cltp) >= 0) && ((s3 | m_crtp) >= 0) && ((s3 | m_crbp) >= 0) && ((s3 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-
-    if (sideamount == 6)
-    {
-        //--------------------------------------------------------------------------
-        //---     we take the 4 vertices of projection-plane in cam-space,       ---
-        //---    and clip them against the 6 side-frustum-planes of the OBB      ---
-        //--------------------------------------------------------------------------
-        Vec3 s0 = v[p0] % v[p1];
-        if (((s0 | m_cltp) >= 0) && ((s0 | m_crtp) >= 0) && ((s0 | m_crbp) >= 0) && ((s0 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3 s1 = v[p1] % v[p2];
-        if (((s1 | m_cltp) >= 0) && ((s1 | m_crtp) >= 0) && ((s1 | m_crbp) >= 0) && ((s1 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3 s2 = v[p2] % v[p3];
-        if (((s2 | m_cltp) >= 0) && ((s2 | m_crtp) >= 0) && ((s2 | m_crbp) >= 0) && ((s2 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3 s3 = v[p3] % v[p4];
-        if (((s3 | m_cltp) >= 0) && ((s3 | m_crtp) >= 0) && ((s3 | m_crbp) >= 0) && ((s3 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3 s4 = v[p4] % v[p5];
-        if (((s4 | m_cltp) >= 0) && ((s4 | m_crtp) >= 0) && ((s4 | m_crbp) >= 0) && ((s4 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-        Vec3 s5 = v[p5] % v[p0];
-        if (((s5 | m_cltp) >= 0) && ((s5 | m_crtp) >= 0) && ((s5 | m_crbp) >= 0) && ((s5 | m_clbp) >= 0))
-        {
-            return CULL_EXCLUSION;
-        }
-    }
-    //now we are 100% sure that the OBB is visible on the screen
-    return CULL_OVERLAP;
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_CAMERA_H
diff --git a/Code/CryEngine/CryCommon/Cry_Color.h b/Code/CryEngine/CryCommon/Cry_Color.h
deleted file mode 100644
index 7a1a971450..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Color.h
+++ /dev/null
@@ -1,1215 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : 4D Color template.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_COLOR_H
-#define CRYINCLUDE_CRYCOMMON_CRY_COLOR_H
-#pragma once
-
-#include <CryHeaders.h>
-#include <platform.h>
-#include <AzCore/std/containers/array.h>
-
-ILINE float FClamp(float X, float Min, float Max)
-{
-    return X < Min ? Min : X < Max ? X : Max;
-}
-
-template <class T>
-struct Color_tpl;
-
-typedef Color_tpl<uint8> ColorB; // [ 0,  255]
-typedef Color_tpl<float> ColorF; // [0.0, 1.0]
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-// RGBA Color structure.
-//////////////////////////////////////////////////////////////////////////////////////////////
-template <class T>
-struct Color_tpl
-{
-    T   r, g, b, a;
-
-    ILINE Color_tpl() {};
-
-    ILINE Color_tpl(T _x, T _y, T _z, T _w);
-    ILINE Color_tpl(T _x, T _y, T _z);
-
-    /*  inline Color_tpl(const Color_tpl<T> & v)    {
-    r = v.r; g = v.g; b = v.b; a = v.a;
-    }*/
-
-    // works together with pack_abgr8888
-    ILINE Color_tpl(const unsigned int abgr);
-    ILINE Color_tpl(const f32 c);
-    ILINE Color_tpl(const ColorF& c);
-    ILINE Color_tpl(const ColorF& c, float fAlpha);
-    ILINE Color_tpl(const Vec3& c, float fAlpha);
-    ILINE Color_tpl(const Vec4& c);
-
-    void Clamp(float Min = 0, float Max = 1.0f)
-    {
-        r = ::FClamp(r, Min, Max);
-        g = ::FClamp(g, Min, Max);
-        b = ::FClamp(b, Min, Max);
-        a = ::FClamp(a, Min, Max);
-    }
-    void ScaleCol (float f)
-    {
-        r = static_cast<T>(r * f);
-        g = static_cast<T>(g * f);
-        b = static_cast<T>(b * f);
-    }
-
-    float Luminance() const
-    {
-        return r * 0.30f + g * 0.59f + b * 0.11f;
-    }
-
-    ILINE float Max() const
-    {
-        return max(r, max(b, g));
-    }
-
-    float NormalizeCol (ColorF& out) const
-    {
-        float max = Max();
-
-        if (max == 0)
-        {
-            return 0;
-        }
-
-        out = *this / max;
-
-        return max;
-    }
-
-    ILINE Color_tpl(const Vec3& vVec)
-    {
-        r = (T)vVec.x;
-        g = (T)vVec.y;
-        b = (T)vVec.z;
-        a = (T)1.f;
-    }
-
-    ILINE Color_tpl& operator = (const Vec3& v) { r = (T)v.x; g = (T)v.y; b = (T)v.z; a = (T)1.0f; return *this; }
-    ILINE Color_tpl& operator = (const Color_tpl& c) { r = (T)c.r; g = (T)c.g; b = (T)c.b; a = (T)c.a; return *this; }
-
-    ILINE T& operator [] (int index)          { assert(index >= 0 && index <= 3); return ((T*)this)[index]; }
-    ILINE T operator [] (int index) const { assert(index >= 0 && index <= 3); return ((T*)this)[index]; }
-
-    ILINE void Set(float fR, float fG, float fB, float fA = 1.0f)
-    {
-        r = static_cast<T>(fR);
-        g = static_cast<T>(fG);
-        b = static_cast<T>(fB);
-        a = static_cast<T>(fA);
-    }
-
-    ILINE void set(T _x, T _y = 0, T _z = 0, T _w = 0)
-    {
-        r = _x;
-        g = _y;
-        b = _z;
-        a = _w;
-    }
-    ILINE void set(T _x, T _y = 0, T _z = 0)
-    {
-        r = _x;
-        g = _y;
-        b = _z;
-        a = 1;
-    }
-    ILINE Color_tpl operator + () const
-    {
-        return *this;
-    }
-    ILINE Color_tpl operator - () const
-    {
-        return Color_tpl<T>(-r, -g, -b, -a);
-    }
-
-    ILINE Color_tpl& operator += (const Color_tpl& v)
-    {
-        T _r = r,       _g = g,         _b = b,         _a = a;
-        _r += v.r;
-        _g += v.g;
-        _b += v.b;
-        _a += v.a;
-        r = _r;
-        g = _g;
-        b = _b;
-        a = _a;
-        return *this;
-    }
-    ILINE Color_tpl& operator -= (const Color_tpl& v)
-    {
-        r -= v.r;
-        g -= v.g;
-        b -= v.b;
-        a -= v.a;
-        return *this;
-    }
-    ILINE Color_tpl& operator *= (const Color_tpl& v)
-    {
-        r *= v.r;
-        g *= v.g;
-        b *= v.b;
-        a *= v.a;
-        return *this;
-    }
-    ILINE Color_tpl& operator /= (const Color_tpl& v)
-    {
-        r /= v.r;
-        g /= v.g;
-        b /= v.b;
-        a /= v.a;
-        return *this;
-    }
-    ILINE Color_tpl& operator *= (T s)
-    {
-        r *= s;
-        g *= s;
-        b *= s;
-        a *= s;
-        return *this;
-    }
-    ILINE Color_tpl& operator /= (T s)
-    {
-        s = 1.0f / s;
-        r *= s;
-        g *= s;
-        b *= s;
-        a *= s;
-        return *this;
-    }
-
-    ILINE Color_tpl operator + (const Color_tpl& v) const
-    {
-        return Color_tpl(r + v.r, g + v.g, b + v.b, a + v.a);
-    }
-    ILINE Color_tpl operator - (const Color_tpl& v) const
-    {
-        return Color_tpl(r - v.r, g - v.g, b - v.b, a - v.a);
-    }
-    ILINE Color_tpl operator * (const Color_tpl& v) const
-    {
-        return Color_tpl(r * v.r, g * v.g, b * v.b, a * v.a);
-    }
-    ILINE Color_tpl operator / (const Color_tpl& v) const
-    {
-        return Color_tpl(r / v.r, g / v.g, b / v.b, a / v.a);
-    }
-    ILINE Color_tpl operator * (T s) const
-    {
-        return Color_tpl(r * s, g * s, b * s, a * s);
-    }
-    ILINE Color_tpl operator / (T s) const
-    {
-        s = 1.0f / s;
-        return Color_tpl(r * s, g * s, b * s, a * s);
-    }
-
-    ILINE bool operator == (const Color_tpl& v) const
-    {
-        return (r == v.r) && (g == v.g) && (b == v.b) && (a == v.a);
-    }
-    ILINE bool operator != (const Color_tpl& v) const
-    {
-        return (r != v.r) || (g != v.g) || (b != v.b) || (a != v.a);
-    }
-
-    ILINE unsigned char pack_rgb332() const;
-    ILINE unsigned short pack_argb4444() const;
-    ILINE unsigned short pack_rgb555() const;
-    ILINE unsigned short pack_rgb565() const;
-    ILINE unsigned int pack_bgr888() const;
-    ILINE unsigned int pack_rgb888() const;
-    ILINE unsigned int pack_abgr8888() const;
-    ILINE unsigned int pack_argb8888() const;
-    inline Vec4 toVec4() const { return Vec4(r, g, b, a); }
-    inline Vec3 toVec3() const { return Vec3(r, g, b); }
-    inline void toFloat4(f32* out) const;
-
-    inline void toHSV(f32& h, f32& s, f32& v) const;
-    inline void fromHSV(f32 h, f32 s, f32 v);
-
-    inline void clamp(T bottom = 0.0f, T top = 1.0f);
-
-    inline void maximum(const Color_tpl<T>& ca, const Color_tpl<T>& cb);
-    inline void minimum(const Color_tpl<T>& ca, const Color_tpl<T>& cb);
-    inline void abs();
-
-    inline void adjust_contrast(T c);
-    inline void adjust_saturation(T s);
-    inline void adjust_luminance(float newLum);
-
-    inline void lerpFloat(const Color_tpl<T>& ca, const Color_tpl<T>& cb, float s);
-    inline void negative(const Color_tpl<T>& c);
-    inline void grey(const Color_tpl<T>& c);
-
-    // helper function - maybe we can improve the integration
-    static inline uint32 ComputeAvgCol_Fast(const uint32 dwCol0, const uint32 dwCol1)
-    {
-        uint32 dwHalfCol0 = (dwCol0 / 2) & 0x7f7f7f7f;            // each component /2
-        uint32 dwHalfCol1 = (dwCol1 / 2) & 0x7f7f7f7f;            // each component /2
-
-        return dwHalfCol0 + dwHalfCol1;
-    }
-
-    // mCIE: adjusted to compensate problems of DXT compression (extra bit in green channel causes green/purple artifacts)
-    // explained in CryEngine wiki: ColorSpaces
-    Color_tpl<T> RGB2mCIE() const
-    {
-        Color_tpl<T> in = *this;
-
-        // to get grey chrominance for dark colors
-        in.r += 0.000001f;
-        in.g += 0.000001f;
-        in.b += 0.000001f;
-
-        float RGBSum = in.r + in.g + in.b;
-
-        float fInv = 1.0f / RGBSum;
-
-        float RNorm = 3 * 10.0f / 31.0f * in.r * fInv;
-        float GNorm = 3 * 21.0f / 63.0f * in.g * fInv;
-        float Scale = RGBSum / 3.0f;
-
-        // test grey
-        //  out.r = 10.0f/31.0f;        // 1/3 = 10/30      Red range     0..30, 31 unused
-        //  out.g = 21.0f/63.0f;        // 1/3 = 21/63      Green range   0..63
-
-        RNorm = max(0.0f, min(1.0f, RNorm));
-        GNorm = max(0.0f, min(1.0f, GNorm));
-
-        return Color_tpl<T>(RNorm, GNorm, Scale);
-    }
-
-    // mCIE: adjusted to compensate problems of DXT compression (extra bit in green channel causes green/purple artefacts)
-    // explained in CryEngine wiki: ColorSpaces
-    Color_tpl<T> mCIE2RGB() const
-    {
-        Color_tpl<T> out = *this;
-
-        float fScale = out.b;               //                  Blue range   0..31
-
-        // test grey
-        //  out.r = 10.0f/31.0f;        // 1/3 = 10/30      Red range     0..30, 31 unused
-        //  out.g = 21.0f/63.0f;        // 1/3 = 21/63      Green range   0..63
-
-        out.r *= 31.0f / 30.0f;       //
-        out.g *= 63.0f / 63.0f;       //
-        out.b = 0.999f - out.r - out.g;
-
-        float s = 3.0f * fScale;
-
-        out.r *= s;
-        out.g *= s;
-        out.b *= s;
-
-        out.Clamp();
-
-        return out;
-    }
-
-    void rgb2srgb()
-    {
-        for (int i = 0; i < 3; i++)
-        {
-            T& c = (*this)[i];
-
-            if (c < 0.0031308f)
-            {
-                c = 12.92f * c;
-            }
-            else
-            {
-                c = 1.055f * pow(c, 1.0f / 2.4f) - 0.055f;
-            }
-        }
-    }
-
-    void srgb2rgb()
-    {
-        for (int i = 0; i < 3; i++)
-        {
-            T& c = (*this)[i];
-
-            if (c <= 0.040448643f)
-            {
-                c = c / 12.92f;
-            }
-            else
-            {
-                c = pow((c + 0.055f) / 1.055f, 2.4f);
-            }
-        }
-    }
-
-    void GetMemoryUsage([[maybe_unused]] class ICrySizer* pSizer) const { /*nothing*/}
-
-    AZStd::array<T, 4> GetAsArray() const
-    {
-        AZStd::array<T, 4> primitiveArray = { { r, g, b, a } };
-        return primitiveArray;
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-// template specialization
-///////////////////////////////////////////////
-
-template<>
-ILINE Color_tpl<f32>::Color_tpl(f32 _x, f32 _y, f32 _z, f32 _w)
-{
-    r = _x;
-    g = _y;
-    b = _z;
-    a = _w;
-}
-
-template<>
-ILINE Color_tpl<f32>::Color_tpl(f32 _x, f32 _y, f32 _z)
-{
-    r = _x;
-    g = _y;
-    b = _z;
-    a = 1.f;
-}
-
-template<>
-ILINE Color_tpl<uint8>::Color_tpl(uint8 _x, uint8 _y, uint8 _z, uint8 _w)
-{
-    r = _x;
-    g = _y;
-    b = _z;
-    a = _w;
-}
-
-template<>
-ILINE Color_tpl<uint8>::Color_tpl(uint8 _x, uint8 _y, uint8 _z)
-{
-    r = _x;
-    g = _y;
-    b = _z;
-    a = 255;
-}
-
-//-----------------------------------------------------------------------------
-
-template<>
-ILINE Color_tpl<f32>::Color_tpl(const unsigned int abgr)
-{
-    r = (abgr & 0xff) / 255.0f;
-    g = ((abgr >> 8) & 0xff) / 255.0f;
-    b = ((abgr >> 16) & 0xff) / 255.0f;
-    a = ((abgr >> 24) & 0xff) / 255.0f;
-}
-
-template<>
-ILINE Color_tpl<uint8>::Color_tpl(const unsigned int c)
-{
-    *(unsigned int*)(&r) = c;
-} //use this with RGBA8 macro!
-
-//-----------------------------------------------------------------------------
-
-template<>
-ILINE Color_tpl<f32>::Color_tpl(const float c)
-{
-    r = c;
-    g = c;
-    b = c;
-    a = c;
-}
-template<>
-ILINE Color_tpl<uint8>::Color_tpl(const float c)
-{
-    r = (uint8)(c * 255);
-    g = (uint8)(c * 255);
-    b = (uint8)(c * 255);
-    a = (uint8)(c * 255);
-}
-//-----------------------------------------------------------------------------
-
-template<>
-ILINE Color_tpl<f32>::Color_tpl(const ColorF& c)
-{
-    r = c.r;
-    g = c.g;
-    b = c.b;
-    a = c.a;
-}
-template<>
-ILINE Color_tpl<uint8>::Color_tpl(const ColorF& c)
-{
-    r = (uint8)(c.r * 255);
-    g = (uint8)(c.g * 255);
-    b = (uint8)(c.b * 255);
-    a = (uint8)(c.a * 255);
-}
-
-template<>
-ILINE Color_tpl<f32>::Color_tpl(const ColorF& c, float fAlpha)
-{
-    r = c.r;
-    g = c.g;
-    b = c.b;
-    a = fAlpha;
-}
-
-template<>
-ILINE Color_tpl<f32>::Color_tpl(const Vec3& c, float fAlpha)
-{
-    r = c.x;
-    g = c.y;
-    b = c.z;
-    a = fAlpha;
-}
-
-template<>
-ILINE Color_tpl<f32>::Color_tpl(const Vec4& c)
-{
-    r = c.x;
-    g = c.y;
-    b = c.z;
-    a = c.w;
-}
-
-template<>
-ILINE Color_tpl<uint8>::Color_tpl(const ColorF& c, float fAlpha)
-{
-    r = (uint8)(c.r * 255);
-    g = (uint8)(c.g * 255);
-    b = (uint8)(c.b * 255);
-    a = (uint8)(fAlpha * 255);
-}
-template<>
-ILINE Color_tpl<uint8>::Color_tpl(const Vec3& c, float fAlpha)
-{
-    r = (uint8)(c.x * 255);
-    g = (uint8)(c.y * 255);
-    b = (uint8)(c.z * 255);
-    a = (uint8)(fAlpha * 255);
-}
-
-template<>
-ILINE Color_tpl<uint8>::Color_tpl(const Vec4& c)
-{
-    r = (uint8)(c.x * 255);
-    g = (uint8)(c.y * 255);
-    b = (uint8)(c.z * 255);
-    a = (uint8)(c.w * 255);
-}
-
-template<>
-inline void Color_tpl<uint8>::toFloat4(f32* out) const
-{
-    out[0] = r / 255.0f;
-    out[1] = g / 255.0f;
-    out[2] = b / 255.0f;
-    out[3] = a / 255.0f;
-}
-
-template<>
-inline void Color_tpl<f32>::toFloat4(f32* out) const
-{
-    out[0] = r;
-    out[1] = g;
-    out[2] = b;
-    out[3] = a;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-// functions implementation
-///////////////////////////////////////////////
-
-///////////////////////////////////////////////
-/*template <class T>
-inline Color_tpl<T>::Color_tpl(const T *p_elts)
-{
-r = p_elts[0]; g = p_elts[1]; b = p_elts[2]; a = p_elts[3];
-}*/
-
-///////////////////////////////////////////////
-///////////////////////////////////////////////
-template <class T>
-ILINE Color_tpl<T> operator * (T s, const Color_tpl<T>& v)
-{
-    return Color_tpl<T>(v.r * s, v.g * s, v.b * s, v.a * s);
-}
-
-///////////////////////////////////////////////
-template <class T>
-ILINE unsigned char Color_tpl<T>::pack_rgb332() const
-{
-    unsigned char cr;
-    unsigned char cg;
-    unsigned char cb;
-    if constexpr (sizeof(r) == 1) // char and unsigned char
-    {
-        cr = (unsigned char)r;
-        cg = (unsigned char)g;
-        cb = (unsigned char)b;
-    }
-    else if constexpr (sizeof(r) == 2) // short and unsigned short
-    {
-        cr = (unsigned short)(r) >> 8;
-        cg = (unsigned short)(g) >> 8;
-        cb = (unsigned short)(b) >> 8;
-    }
-    else // float or double
-    {
-        cr = (unsigned char)(r * 255.0f);
-        cg = (unsigned char)(g * 255.0f);
-        cb = (unsigned char)(b * 255.0f);
-    }
-    return ((cr >> 5) << 5) | ((cg >> 5) << 2) | (cb >> 5);
-}
-
-///////////////////////////////////////////////
-template <class T>
-ILINE unsigned short Color_tpl<T>::pack_argb4444() const
-{
-    unsigned char cr;
-    unsigned char cg;
-    unsigned char cb;
-    unsigned char ca;
-    if constexpr (sizeof(r) == 1) // char and unsigned char
-    {
-        cr = (unsigned char)r;
-        cg = (unsigned char)g;
-        cb = (unsigned char)b;
-        ca = (unsigned char)a;
-    }
-    else if constexpr (sizeof(r) == 2) // short and unsigned short
-    {
-        cr = (unsigned short)(r) >> 8;
-        cg = (unsigned short)(g) >> 8;
-        cb = (unsigned short)(b) >> 8;
-        ca = (unsigned short)(a) >> 8;
-    }
-    else // float or double
-    {
-        cr = (unsigned char)(r * 255.0f);
-        cg = (unsigned char)(g * 255.0f);
-        cb = (unsigned char)(b * 255.0f);
-        ca = (unsigned char)(a * 255.0f);
-    }
-    return ((ca >> 4) << 12) | ((cr >> 4) << 8) | ((cg >> 4) << 4) | (cb >> 4);
-}
-
-///////////////////////////////////////////////
-template <class T>
-ILINE unsigned short Color_tpl<T>::pack_rgb555() const
-{
-    unsigned char cr;
-    unsigned char cg;
-    unsigned char cb;
-    if constexpr (sizeof(r) == 1) // char and unsigned char
-    {
-        cr = (unsigned char)r;
-        cg = (unsigned char)g;
-        cb = (unsigned char)b;
-    }
-    else if constexpr (sizeof(r) == 2) // short and unsigned short
-    {
-        cr = (unsigned short)(r) >> 8;
-        cg = (unsigned short)(g) >> 8;
-        cb = (unsigned short)(b) >> 8;
-    }
-    else // float or double
-    {
-        cr = (unsigned char)(r * 255.0f);
-        cg = (unsigned char)(g * 255.0f);
-        cb = (unsigned char)(b * 255.0f);
-    }
-    return ((cr >> 3) << 10) | ((cg >> 3) << 5) | (cb >> 3);
-}
-
-///////////////////////////////////////////////
-template <class T>
-ILINE unsigned short Color_tpl<T>::pack_rgb565() const
-{
-    unsigned short cr;
-    unsigned short cg;
-    unsigned short cb;
-    if constexpr (sizeof(r) == 1) // char and unsigned char
-    {
-        cr = (unsigned short)r;
-        cg = (unsigned short)g;
-        cb = (unsigned short)b;
-    }
-    else if constexpr (sizeof(r) == 2) // short and unsigned short
-    {
-        cr = (unsigned short)(r) >> 8;
-        cg = (unsigned short)(g) >> 8;
-        cb = (unsigned short)(b) >> 8;
-    }
-    else // float or double
-    {
-        cr = (unsigned short)(r * 255.0f);
-        cg = (unsigned short)(g * 255.0f);
-        cb = (unsigned short)(b * 255.0f);
-    }
-    return ((cr >> 3) << 11) |  ((cg >> 2) << 5) | (cb >> 3);
-}
-
-///////////////////////////////////////////////
-template <class T>
-ILINE unsigned int Color_tpl<T>::pack_bgr888() const
-{
-    unsigned char cr;
-    unsigned char cg;
-    unsigned char cb;
-    if constexpr (sizeof(r) == 1) // char and unsigned char
-    {
-        cr = (unsigned char)r;
-        cg = (unsigned char)g;
-        cb = (unsigned char)b;
-    }
-    else if constexpr (sizeof(r) == 2) // short and unsigned short
-    {
-        cr = (unsigned short)(r) >> 8;
-        cg = (unsigned short)(g) >> 8;
-        cb = (unsigned short)(b) >> 8;
-    }
-    else // float or double
-    {
-        cr = (unsigned char)(r * 255.0f);
-        cg = (unsigned char)(g * 255.0f);
-        cb = (unsigned char)(b * 255.0f);
-    }
-    return (cb << 16) | (cg << 8) | cr;
-}
-
-///////////////////////////////////////////////
-template <class T>
-ILINE unsigned int Color_tpl<T>::pack_rgb888() const
-{
-    unsigned char cr;
-    unsigned char cg;
-    unsigned char cb;
-    if constexpr (sizeof(r) == 1) // char and unsigned char
-    {
-        cr = (unsigned char)r;
-        cg = (unsigned char)g;
-        cb = (unsigned char)b;
-    }
-    else if constexpr (sizeof(r) == 2) // short and unsigned short
-    {
-        cr = (unsigned short)(r) >> 8;
-        cg = (unsigned short)(g) >> 8;
-        cb = (unsigned short)(b) >> 8;
-    }
-    else // float or double
-    {
-        cr = (unsigned char)(r * 255.0f);
-        cg = (unsigned char)(g * 255.0f);
-        cb = (unsigned char)(b * 255.0f);
-    }
-    return (cr << 16) | (cg << 8) | cb;
-}
-
-///////////////////////////////////////////////
-template <class T>
-ILINE unsigned int Color_tpl<T>::pack_abgr8888() const
-{
-    unsigned char cr;
-    unsigned char cg;
-    unsigned char cb;
-    unsigned char ca;
-    if constexpr (sizeof(r) == 1) // char and unsigned char
-    {
-        cr = (unsigned char)r;
-        cg = (unsigned char)g;
-        cb = (unsigned char)b;
-        ca = (unsigned char)a;
-    }
-    else if constexpr (sizeof(r) == 2) // short and unsigned short
-    {
-        cr = (unsigned short)(r) >> 8;
-        cg = (unsigned short)(g) >> 8;
-        cb = (unsigned short)(b) >> 8;
-        ca = (unsigned short)(a) >> 8;
-    }
-    else // float or double
-    {
-        cr = (unsigned char)(r * 255.0f);
-        cg = (unsigned char)(g * 255.0f);
-        cb = (unsigned char)(b * 255.0f);
-        ca = (unsigned char)(a * 255.0f);
-    }
-    return (ca << 24) | (cb << 16) | (cg << 8) | cr;
-}
-
-
-///////////////////////////////////////////////
-template <class T>
-ILINE unsigned int Color_tpl<T>::pack_argb8888() const
-{
-    unsigned char cr;
-    unsigned char cg;
-    unsigned char cb;
-    unsigned char ca;
-    if constexpr (sizeof(r) == 1) // char and unsigned char
-    {
-        cr = (unsigned char)r;
-        cg = (unsigned char)g;
-        cb = (unsigned char)b;
-        ca = (unsigned char)a;
-    }
-    else if constexpr (sizeof(r) == 2) // short and unsigned short
-    {
-        cr = (unsigned short)(r) >> 8;
-        cg = (unsigned short)(g) >> 8;
-        cb = (unsigned short)(b) >> 8;
-        ca = (unsigned short)(a) >> 8;
-    }
-    else // float or double
-    {
-        cr = (unsigned char)(r * 255.0f);
-        cg = (unsigned char)(g * 255.0f);
-        cb = (unsigned char)(b * 255.0f);
-        ca = (unsigned char)(a * 255.0f);
-    }
-    return (ca << 24) | (cr << 16) | (cg << 8) | cb;
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::toHSV(f32& h, f32& s, f32& v) const
-{
-    f32 red, green, blue;
-    if constexpr (sizeof(this->r) == 1) // 8bit integer
-    {
-        red = this->r * (1.0f / f32(0xff));
-        green = this->g * (1.0f / f32(0xff));
-        blue = this->b * (1.0f / f32(0xff));
-    }
-    else if constexpr (sizeof(this->r) == 2) // 16bit integer
-    {
-        red = this->r * (1.0f / f32(0xffff));
-        green = this->g * (1.0f / f32(0xffff));
-        blue = this->b * (1.0f / f32(0xffff));
-    }
-    else // floating point
-    {
-        red = this->r;
-        green = this->g;
-        blue = this->b;
-    }
-
-    if ((blue > green) && (blue > red))
-    {
-        if (!::iszero(v = blue))
-        {
-            const f32 min = red < green ? red : green;
-            const f32 delta = v - min;
-            if (!::iszero(delta))
-            {
-                s = delta / v;
-                h = (240.0f / 360.0f) + (red - green) / delta * (60.0f / 360.0f);
-            }
-            else
-            {
-                s = 0.0f;
-                h = (240.0f / 360.0f) + (red - green) * (60.0f / 360.0f);
-            }
-            if (h < 0.0f)
-            {
-                h += 1.0f;
-            }
-        }
-        else
-        {
-            s = 0.0f;
-            h = 0.0f;
-        }
-    }
-    else if (green > red)
-    {
-        if (!::iszero(v = green))
-        {
-            const f32 min = red < blue ? red : blue;
-            const f32 delta = v - min;
-            if (!::iszero(delta))
-            {
-                s = delta / v;
-                h = (120.0f / 360.0f) + (blue - red) / delta * (60.0f / 360.0f);
-            }
-            else
-            {
-                s = 0.0f;
-                h = (120.0f / 360.0f) + (blue - red) * (60.0f / 360.0f);
-            }
-            if (h < 0.0f)
-            {
-                h += 1.0f;
-            }
-        }
-        else
-        {
-            s = 0.0f;
-            h = 0.0f;
-        }
-    }
-    else
-    {
-        if (!::iszero(v = red))
-        {
-            const f32 min = green < blue ? green : blue;
-            const f32 delta = v - min;
-            if (!::iszero(delta))
-            {
-                s = delta / v;
-                h = (green - blue) / delta * (60.0f / 360.0f);
-            }
-            else
-            {
-                s = 0.0f;
-                h = (green - blue) * (60.0f / 360.0f);
-            }
-            if (h < 0.0f)
-            {
-                h += 1.0f;
-            }
-        }
-        else
-        {
-            s = 0.0f;
-            h = 0.0f;
-        }
-    }
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::fromHSV(f32 h, f32 s, f32 v)
-{
-    f32 red, green, blue;
-    if (::iszero(v))
-    {
-        red = 0.0f;
-        green = 0.0f;
-        blue = 0.0f;
-    }
-    else if (::iszero(s))
-    {
-        red = v;
-        green = v;
-        blue = v;
-    }
-    else
-    {
-        const f32 hi = h * 6.0f;
-        const int32 i = (int32)::floor(hi);
-        const f32 f = hi - i;
-
-        const f32 v0 = v * (1.0f - s);
-        const f32 v1 = v * (1.0f - s * f);
-        const f32 v2 = v * (1.0f - s * (1.0f - f));
-
-        switch (i)
-        {
-        case 0:
-            red = v;
-            green = v2;
-            blue = v0;
-            break;
-        case 1:
-            red = v1;
-            green = v;
-            blue = v0;
-            break;
-        case 2:
-            red = v0;
-            green = v;
-            blue = v2;
-            break;
-        case 3:
-            red = v0;
-            green = v1;
-            blue = v;
-            break;
-        case 4:
-            red = v2;
-            green = v0;
-            blue = v;
-            break;
-        case 5:
-            red = v;
-            green = v0;
-            blue = v1;
-            break;
-
-        case 6:
-            red = v;
-            green = v2;
-            blue = v0;
-            break;
-        case -1:
-            red = v;
-            green = v0;
-            blue = v1;
-            break;
-        default:
-            red = 0.0f;
-            green = 0.0f;
-            blue = 0.0f;
-            break;
-        }
-    }
-
-    if constexpr (sizeof(this->r) == 1) // 8bit integer
-    {
-        this->r = red * f32(0xff);
-        this->g = green * f32(0xff);
-        this->b = blue * f32(0xff);
-    }
-    else if constexpr (sizeof(this->r) == 2) // 16bit integer
-    {
-        this->r = red * f32(0xffff);
-        this->g = green * f32(0xffff);
-        this->b = blue * f32(0xffff);
-    }
-    else // floating point
-    {
-        this->r = red;
-        this->g = green;
-        this->b = blue;
-    }
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::clamp(T bottom, T top)
-{
-    r = min(top, max(bottom, r));
-    g = min(top, max(bottom, g));
-    b = min(top, max(bottom, b));
-    a = min(top, max(bottom, a));
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::maximum(const Color_tpl<T>& ca, const Color_tpl<T>& cb)
-{
-    r = max(ca.r, cb.r);
-    g = max(ca.g, cb.g);
-    b = max(ca.b, cb.b);
-    a = max(ca.a, cb.a);
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::minimum(const Color_tpl<T>& ca, const Color_tpl<T>& cb)
-{
-    r = min(ca.r, cb.r);
-    g = min(ca.g, cb.g);
-    b = min(ca.b, cb.b);
-    a = min(ca.a, cb.a);
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::abs()
-{
-    r = fabs_tpl(r);
-    g = fabs_tpl(g);
-    b = fabs_tpl(b);
-    a = fabs_tpl(a);
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::adjust_contrast(T c)
-{
-    r = 0.5f + c * (r - 0.5f);
-    g = 0.5f + c * (g - 0.5f);
-    b = 0.5f + c * (b - 0.5f);
-    a = 0.5f + c * (a - 0.5f);
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::adjust_saturation(T s)
-{
-    // Approximate values for each component's contribution to luminance.
-    // Based upon the NTSC standard described in ITU-R Recommendation BT.709.
-    T grey = r * 0.2125f + g * 0.7154f + b * 0.0721f;
-    r = grey + s * (r - grey);
-    g = grey + s * (g - grey);
-    b = grey + s * (b - grey);
-    a = grey + s * (a - grey);
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::adjust_luminance(float newLum)
-{
-    // Optimized yet equivalent version of replacing luminance in XYZ space.
-    // Color and luminance are expected to be linear.
-
-    Color_tpl<f32> colF(r, g, b, a);
-
-    float lum = colF.r * 0.212671f + colF.g * 0.715160f + colF.b * 0.072169f;
-    if (iszero(lum))
-    {
-        return;
-    }
-
-    *this = Color_tpl<T>(colF * newLum / lum);
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::lerpFloat(const Color_tpl<T>& ca, const Color_tpl<T>& cb, float s)
-{
-    r = (T)(ca.r + s * (cb.r - ca.r));
-    g = (T)(ca.g + s * (cb.g - ca.g));
-    b = (T)(ca.b + s * (cb.b - ca.b));
-    a = (T)(ca.a + s * (cb.a - ca.a));
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::negative([[maybe_unused]] const Color_tpl<T>& c)
-{
-    r = T(1.0f) - r;
-    g = T(1.0f) - g;
-    b = T(1.0f) - b;
-    a = T(1.0f) - a;
-}
-
-///////////////////////////////////////////////
-template <class T>
-inline void Color_tpl<T>::grey([[maybe_unused]] const Color_tpl<T>& c)
-{
-    T m = (r + g + b) / T(3);
-
-    r = m;
-    g = m;
-    b = m;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-//#define RGBA8(r,g,b,a)   (ColorB((uint8)(r),(uint8)(g),(uint8)(b),(uint8)(a)))
-#if defined(NEED_ENDIAN_SWAP)
-    #define RGBA8(a, b, g, r)     ((uint32)(((uint8)(r) | ((uint16)((uint8)(g)) << 8)) | (((uint32)(uint8)(b)) << 16)) | (((uint32)(uint8)(a)) << 24))
-#else
-    #define RGBA8(r, g, b, a)     ((uint32)(((uint8)(r) | ((uint16)((uint8)(g)) << 8)) | (((uint32)(uint8)(b)) << 16)) | (((uint32)(uint8)(a)) << 24))
-#endif
-#define Col_Black                               ColorF (0.000f, 0.000f, 0.000f) // 0xFF000000   RGB: 0, 0, 0
-#define Col_White                               ColorF (1.000f, 1.000f, 1.000f) // 0xFFFFFFFF   RGB: 255, 255, 255
-#define Col_Aquamarine                  ColorF (0.498f, 1.000f, 0.831f) // 0xFF7FFFD4   RGB: 127, 255, 212
-#define Col_Azure                               ColorF (0.000f, 0.498f, 1.000f) // 0xFF007FFF       RGB: 0, 127, 255
-#define Col_Blue                                ColorF (0.000f, 0.000f, 1.000f) // 0xFF0000FF   RGB: 0, 0, 255
-#define Col_BlueViolet                  ColorF (0.541f, 0.169f, 0.886f) // 0xFF8A2BE2   RGB: 138, 43, 226
-#define Col_Brown                               ColorF (0.647f, 0.165f, 0.165f) // 0xFFA52A2A   RGB: 165, 42, 42
-#define Col_CadetBlue                       ColorF (0.373f, 0.620f, 0.627f) // 0xFF5F9EA0   RGB: 95, 158, 160
-#define Col_Coral                               ColorF (1.000f, 0.498f, 0.314f) // 0xFFFF7F50   RGB: 255, 127, 80
-#define Col_CornflowerBlue          ColorF (0.392f, 0.584f, 0.929f) // 0xFF6495ED   RGB: 100, 149, 237
-#define Col_Cyan                                ColorF (0.000f, 1.000f, 1.000f) // 0xFF00FFFF   RGB: 0, 255, 255
-#define Col_DarkGray                        ColorF (0.663f, 0.663f, 0.663f) // 0xFFA9A9A9   RGB: 169, 169, 169
-#define Col_DarkGrey                        ColorF (0.663f, 0.663f, 0.663f) // 0xFFA9A9A9   RGB: 169, 169, 169
-#define Col_DarkGreen                       ColorF (0.000f, 0.392f, 0.000f) // 0xFF006400   RGB: 0, 100, 0
-#define Col_DarkOliveGreen          ColorF (0.333f, 0.420f, 0.184f) // 0xFF556B2F   RGB: 85, 107, 47
-#define Col_DarkOrchid                  ColorF (0.600f, 0.196f, 0.800f) // 0xFF9932CC   RGB: 153, 50, 204
-#define Col_DarkSlateBlue               ColorF (0.282f, 0.239f, 0.545f) // 0xFF483D8B   RGB: 72, 61, 139
-#define Col_DarkSlateGray               ColorF (0.184f, 0.310f, 0.310f) // 0xFF2F4F4F   RGB: 47, 79, 79
-#define Col_DarkSlateGrey               ColorF (0.184f, 0.310f, 0.310f) // 0xFF2F4F4F   RGB: 47, 79, 79
-#define Col_DarkTurquoise               ColorF (0.000f, 0.808f, 0.820f) // 0xFF00CED1       RGB: 0, 206, 209
-#define Col_DarkWood                        ColorF (0.050f, 0.010f, 0.005f) // 0xFF0D0301       RGB: 13, 3, 1
-#define Col_DeepPink                        ColorF (1.000f, 0.078f, 0.576f) // 0xFFFF1493       RGB: 255, 20, 147
-#define Col_DimGray                         ColorF (0.412f, 0.412f, 0.412f) // 0xFF696969   RGB: 105, 105, 105
-#define Col_DimGrey                         ColorF (0.412f, 0.412f, 0.412f) // 0xFF696969   RGB: 105, 105, 105
-#define Col_FireBrick                       ColorF (0.698f, 0.133f, 0.133f) // 0xFFB22222   RGB: 178, 34, 34
-#define Col_ForestGreen                 ColorF (0.133f, 0.545f, 0.133f) // 0xFF228B22   RGB: 34, 139, 34
-#define Col_Gold                                ColorF (1.000f, 0.843f, 0.000f) // 0xFFFFD700   RGB: 255, 215, 0
-#define Col_Goldenrod                       ColorF (0.855f, 0.647f, 0.125f) // 0xFFDAA520   RGB: 218, 165, 32
-#define Col_Gray                                ColorF (0.502f, 0.502f, 0.502f) // 0xFF808080   RGB: 128, 128, 128
-#define Col_Grey                                ColorF (0.502f, 0.502f, 0.502f) // 0xFF808080   RGB: 128, 128, 128
-#define Col_Green                               ColorF (0.000f, 0.502f, 0.000f) // 0xFF008000   RGB: 0, 128, 0
-#define Col_GreenYellow                 ColorF (0.678f, 1.000f, 0.184f) // 0xFFADFF2F   RGB: 173, 255, 47
-#define Col_IndianRed                       ColorF (0.804f, 0.361f, 0.361f) // 0xFFCD5C5C   RGB: 205, 92, 92
-#define Col_Khaki                               ColorF (0.941f, 0.902f, 0.549f) // 0xFFF0E68C   RGB: 240, 230, 140
-#define Col_LightBlue                       ColorF (0.678f, 0.847f, 0.902f) // 0xFFADD8E6   RGB: 173, 216, 230
-#define Col_LightGray                       ColorF (0.827f, 0.827f, 0.827f) // 0xFFD3D3D3   RGB: 211, 211, 211
-#define Col_LightGrey                       ColorF (0.827f, 0.827f, 0.827f) // 0xFFD3D3D3   RGB: 211, 211, 211
-#define Col_LightSteelBlue          ColorF (0.690f, 0.769f, 0.871f) // 0xFFB0C4DE   RGB: 176, 196, 222
-#define Col_LightWood                       ColorF (0.600f, 0.240f, 0.100f) // 0xFF993D1A       RGB: 153, 61, 26
-#define Col_Lime                                ColorF (0.000f, 1.000f, 0.000f) // 0xFF00FF00   RGB: 0, 255, 0
-#define Col_LimeGreen                       ColorF (0.196f, 0.804f, 0.196f) // 0xFF32CD32   RGB: 50, 205, 50
-#define Col_Magenta                         ColorF (1.000f, 0.000f, 1.000f) // 0xFFFF00FF   RGB: 255, 0, 255
-#define Col_Maroon                          ColorF (0.502f, 0.000f, 0.000f) // 0xFF800000   RGB: 128, 0, 0
-#define Col_MedianWood                  ColorF (0.300f, 0.120f, 0.030f) // 0xFF4D1F09       RGB: 77, 31, 9
-#define Col_MediumAquamarine        ColorF (0.400f, 0.804f, 0.667f) // 0xFF66CDAA   RGB: 102, 205, 170
-#define Col_MediumBlue                  ColorF (0.000f, 0.000f, 0.804f) // 0xFF0000CD   RGB: 0, 0, 205
-#define Col_MediumForestGreen       ColorF (0.420f, 0.557f, 0.137f) // 0xFF6B8E23       RGB: 107, 142, 35
-#define Col_MediumGoldenrod         ColorF (0.918f, 0.918f, 0.678f) // 0xFFEAEAAD       RGB: 234, 234, 173
-#define Col_MediumOrchid                ColorF (0.729f, 0.333f, 0.827f) // 0xFFBA55D3   RGB: 186, 85, 211
-#define Col_MediumSeaGreen          ColorF (0.235f, 0.702f, 0.443f) // 0xFF3CB371   RGB: 60, 179, 113
-#define Col_MediumSlateBlue         ColorF (0.482f, 0.408f, 0.933f) // 0xFF7B68EE   RGB: 123, 104, 238
-#define Col_MediumSpringGreen       ColorF (0.000f, 0.980f, 0.604f) // 0xFF00FA9A   RGB: 0, 250, 154
-#define Col_MediumTurquoise         ColorF (0.282f, 0.820f, 0.800f) // 0xFF48D1CC   RGB: 72, 209, 204
-#define Col_MediumVioletRed         ColorF (0.780f, 0.082f, 0.522f) // 0xFFC71585   RGB: 199, 21, 133
-#define Col_MidnightBlue                ColorF (0.098f, 0.098f, 0.439f) // 0xFF191970   RGB: 25, 25, 112
-#define Col_Navy                                ColorF (0.000f, 0.000f, 0.502f) // 0xFF000080   RGB: 0, 0, 128
-#define Col_NavyBlue                        ColorF (0.137f, 0.137f, 0.557f) // 0xFF23238E       RGB: 35, 35, 142
-#define Col_Orange                          ColorF (1.000f, 0.647f, 0.000f) // 0xFFFFA500   RGB: 255, 165, 0
-#define Col_OrangeRed                       ColorF (1.000f, 0.271f, 0.000f) // 0xFFFF4500   RGB: 255, 69, 0
-#define Col_Orchid                          ColorF (0.855f, 0.439f, 0.839f) // 0xFFDA70D6   RGB: 218, 112, 214
-#define Col_PaleGreen                       ColorF (0.596f, 0.984f, 0.596f) // 0xFF98FB98   RGB: 152, 251, 152
-#define Col_Pink                                ColorF (1.000f, 0.753f, 0.796f) // 0xFFFFC0CB   RGB: 255, 192, 203
-#define Col_Plum                                ColorF (0.867f, 0.627f, 0.867f) // 0xFFDDA0DD   RGB: 221, 160, 221
-#define Col_Red                                 ColorF (1.000f, 0.000f, 0.000f) // 0xFFFF0000   RGB: 255, 0, 0
-#define Col_Salmon                          ColorF (0.980f, 0.502f, 0.447f) // 0xFFFA8072   RGB: 250, 128, 114
-#define Col_SeaGreen                        ColorF (0.180f, 0.545f, 0.341f) // 0xFF2E8B57   RGB: 46, 139, 87
-#define Col_Sienna                          ColorF (0.627f, 0.322f, 0.176f) // 0xFFA0522D   RGB: 160, 82, 45
-#define Col_SkyBlue                         ColorF (0.529f, 0.808f, 0.922f) // 0xFF87CEEB   RGB: 135, 206, 235
-#define Col_SlateBlue                       ColorF (0.416f, 0.353f, 0.804f) // 0xFF6A5ACD   RGB: 106, 90, 205
-#define Col_SpringGreen                 ColorF (0.000f, 1.000f, 0.498f) // 0xFF00FF7F   RGB: 0, 255, 127
-#define Col_SteelBlue                       ColorF (0.275f, 0.510f, 0.706f) // 0xFF4682B4   RGB: 70, 130, 180
-#define Col_Tan                                 ColorF (0.824f, 0.706f, 0.549f) // 0xFFD2B48C   RGB: 210, 180, 140
-#define Col_Thistle                         ColorF (0.847f, 0.749f, 0.847f) // 0xFFD8BFD8   RGB: 216, 191, 216
-#define Col_Transparent                 ColorF (0.0f, 0.0f, 0.0f, 0.0f) // 0x00000000       RGB: 0, 0, 0
-#define Col_Turquoise                       ColorF (0.251f, 0.878f, 0.816f) // 0xFF40E0D0   RGB: 64, 224, 208
-#define Col_Violet                          ColorF (0.933f, 0.510f, 0.933f) // 0xFFEE82EE   RGB: 238, 130, 238
-#define Col_VioletRed                       ColorF (0.800f, 0.196f, 0.600f) // 0xFFCC3299       RGB: 204, 50, 153
-#define Col_Wheat                               ColorF (0.961f, 0.871f, 0.702f) // 0xFFF5DEB3   RGB: 245, 222, 179
-#define Col_Yellow                          ColorF (1.000f, 1.000f, 0.000f) // 0xFFFFFF00   RGB: 255, 255, 0
-#define Col_YellowGreen                 ColorF (0.604f, 0.804f, 0.196f) // 0xFF9ACD32   RGB: 154, 205, 50
-#define Col_TrackviewDefault    ColorF (0.187820792f, 0.187820792f, 1.0f)
-
-#define Clr_Empty                               ColorF(0.0f, 0.0f, 0.0f, 1.0f)
-#define Clr_Dark                                ColorF(0.15f, 0.15f, 0.15f, 1.0f)
-#define Clr_White                               ColorF(1.0f, 1.0f, 1.0f, 1.0f)
-#define Clr_WhiteTrans                          ColorF(1.0f, 1.0f, 1.0f, 0.0f)
-#define Clr_Full                                ColorF(1.0f, 1.0f, 1.0f, 1.0f)
-#define Clr_Neutral                             ColorF(1.0f, 1.0f, 1.0f, 1.0f)
-#define Clr_Transparent                         ColorF(0.0f, 0.0f, 0.0f, 0.0f)
-#define Clr_FrontVector                         ColorF(0.0f, 0.0f, 0.5f, 1.0f)
-#define Clr_Static                              ColorF(127.0f / 255.0f, 127.0f / 255.0f, 0.0f, 0.0f)
-#define Clr_Median                              ColorF(0.5f, 0.5f, 0.5f, 0.0f)
-#define Clr_MedianHalf                          ColorF(0.5f, 0.5f, 0.5f, 0.5f)
-#define Clr_FarPlane                            ColorF(1.0f, 0.0f, 0.0f, 0.0f)
-#define Clr_FarPlane_R                          ColorF(bReverseDepth ? 0.0f : 1.0f, 0.0f, 0.0f, 0.0f)
-#define Clr_Unknown                             ColorF(0.0f, 0.0f, 0.0f, 0.0f)
-#define Clr_Unused                              ColorF(0.0f, 0.0f, 0.0f, 0.0f)
-#define Clr_Debug                               ColorF(1.0f, 0.0f, 0.0f, 1.0f)
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_COLOR_H
-
-
diff --git a/Code/CryEngine/CryCommon/Cry_Geo.h b/Code/CryEngine/CryCommon/Cry_Geo.h
deleted file mode 100644
index cb3061529a..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Geo.h
+++ /dev/null
@@ -1,1183 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common structures for geometry computations
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_GEO_H
-#define CRYINCLUDE_CRYCOMMON_CRY_GEO_H
-#pragma once
-
-#include "Cry_Math.h"
-///////////////////////////////////////////////////////////////////////////////
-// Forward declarations                                                      //
-///////////////////////////////////////////////////////////////////////////////
-
-struct Ray;
-template <typename F>
-struct Lineseg_tpl;
-template <typename F>
-struct Triangle_tpl;
-
-struct AABB;
-template <typename F>
-struct OBB_tpl;
-
-struct Sphere;
-struct AAEllipsoid;
-struct Ellipsoid;
-struct Cone;
-
-//-----------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Definitions                                                               //
-///////////////////////////////////////////////////////////////////////////////
-
-//
-// Random geometry generation functions.
-//
-
-enum EGeomForm
-{
-    GeomForm_Vertices,
-    GeomForm_Edges,
-    GeomForm_Surface,
-    GeomForm_Volume,
-
-    MaxGeomForm
-};
-AUTO_TYPE_INFO(EGeomForm)
-
-enum EGeomType
-{
-    GeomType_None,
-    GeomType_BoundingBox,
-    GeomType_Physics,
-    GeomType_Render,
-};
-AUTO_TYPE_INFO(EGeomType)
-
-struct PosNorm
-{
-    Vec3    vPos;
-    Vec3    vNorm;
-
-    void zero()
-    {
-        vPos.zero();
-        vNorm.zero();
-    }
-
-    // transform by matrix, etc
-    void operator <<= (Matrix34 const& mx)
-    {
-        vPos = mx * vPos;
-        vNorm = Matrix33(mx) * vNorm;
-    }
-    void operator <<= (QuatTS const& qts)
-    {
-        vPos = qts * vPos;
-        vNorm = qts.q * vNorm;
-    }
-    void operator <<= (DualQuat const& dq)
-    {
-        vPos = dq * vPos;
-        vNorm = dq.nq * vNorm;
-    }
-};
-
-struct RectF
-{
-    float   x, y, w, h;
-    RectF()
-        : x(0)
-        , y(0)
-        , w(1)
-        , h(1)
-    {
-    }
-    AUTO_STRUCT_INFO
-};
-
-struct RectI
-{
-    int   x, y, w, h;
-    RectI()
-        : x(0)
-        , y(0)
-        , w(1)
-        , h(1)
-    {
-    }
-    RectI(int inX, int inY, int inW, int inH)
-        : x(inX)
-        , y(inY)
-        , w(inW)
-        , h(inH)
-    {
-    }
-    _inline void Add(RectI rcAdd)
-    {
-        int x2 = x + w;
-        int y2 = y + h;
-        int x22 = rcAdd.x + rcAdd.w;
-        int y22 = rcAdd.y + rcAdd.h;
-        x =  min(x, rcAdd.x);
-        y =  min(y, rcAdd.y);
-        x2 = max(x2, x22);
-        y2 = max(y2, y22);
-        w = x2 - x;
-        h = y2 - y;
-    }
-    _inline void Add(int inX, int inY, int inW, int inH)
-    {
-        Add(RectI(inX, inY, inW, inH));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Line
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-struct Line
-{
-    Vec3 pointonline;
-    Vec3 direction; //caution: the direction is important for any intersection test
-
-    //default Line constructor (without initialisation)
-    inline Line(void) {}
-    inline Line(const Vec3& o, const Vec3& d) {  pointonline = o; direction = d; }
-    inline void operator () (const Vec3& o, const Vec3& d) {  pointonline = o; direction = d; }
-
-    ~Line(void) {};
-};
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Ray
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-struct Ray
-{
-    Vec3 origin;
-    Vec3 direction;
-
-    //default Ray constructor (without initialisation)
-    inline Ray(void) {}
-    inline Ray(const Vec3& o, const Vec3& d) {  origin = o; direction = d; }
-    inline void operator () (const Vec3& o, const Vec3& d) {  origin = o; direction = d; }
-
-    ~Ray(void) {};
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Lineseg
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-template <typename F>
-struct Lineseg_tpl
-{
-    Vec3_tpl<F> start;
-    Vec3_tpl<F> end;
-
-    //default Lineseg constructor (without initialisation)
-    inline Lineseg_tpl(void) {}
-    inline Lineseg_tpl(const Vec3_tpl<F>& s, const Vec3_tpl<F>& e) {  start = s; end = e; }
-    inline void operator () (const Vec3_tpl<F>& s, const Vec3_tpl<F>& e) {  start = s; end = e; }
-
-    Vec3 GetPoint(F t) const {return t * end + (F(1.0) - t) * start; }
-
-    ~Lineseg_tpl(void) {};
-};
-
-typedef Lineseg_tpl<float> Lineseg;
-typedef Lineseg_tpl<real> Linesegr;
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Triangle
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-template <typename F>
-struct Triangle_tpl
-{
-    Vec3_tpl<F> v0, v1, v2;
-
-    //default Lineseg constructor (without initialisation)
-    ILINE Triangle_tpl(void) {}
-    ILINE Triangle_tpl(const Vec3_tpl<F>& a, const Vec3_tpl<F>& b, const Vec3_tpl<F>& c) {  v0 = a; v1 = b; v2 = c; }
-    ILINE void operator () (const Vec3_tpl<F>& a, const Vec3_tpl<F>& b, const Vec3_tpl<F>& c) { v0 = a; v1 = b; v2 = c; }
-
-    ~Triangle_tpl(void) {};
-
-    Vec3_tpl<F> GetNormal() const
-    {
-        return ((v1 - v0) ^ (v2 - v0)).GetNormalized();
-    }
-
-    F GetArea() const
-    {
-        return 0.5f * (v1 - v0).Cross(v2 - v0).GetLength();
-    }
-};
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Cone
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-struct Cone
-{
-    Vec3 mTip;
-    Vec3 mDir;
-    Vec3 mBase;
-
-    float mHeight;
-    float mBaseRadius;
-
-    Cone() {}
-    Cone(const Vec3& tip, const Vec3& dir, float height, float baseRadius)
-        : mTip(tip)
-        , mDir(dir)
-        , mBase(tip + dir * height)
-        , mHeight(height)
-        , mBaseRadius(baseRadius) {}
-};
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct AABB
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-struct AABB
-{
-    Vec3 min;
-    Vec3 max;
-
-    /// default AABB constructor (without initialisation)
-    ILINE  AABB()
-    {}
-    enum type_reset
-    {
-        RESET
-    };
-    // AABB aabb(RESET) generates a reset aabb
-    ILINE  AABB(type_reset)
-    { Reset(); }
-    ILINE  explicit AABB(float radius)
-    { max = Vec3(radius); min = -max; }
-    ILINE  explicit AABB(const Vec3& v)
-    { min = max = v; }
-    ILINE  AABB(const Vec3& v, float radius)
-    { Vec3 ext(radius); min = v - ext; max = v + ext; }
-    ILINE  AABB(const Vec3& vmin, const Vec3& vmax)
-    { min = vmin; max = vmax; }
-    ILINE  AABB(const AABB& aabb)
-    {
-        min.x = aabb.min.x;
-        min.y = aabb.min.y;
-        min.z = aabb.min.z;
-        max.x = aabb.max.x;
-        max.y = aabb.max.y;
-        max.z = aabb.max.z;
-    }
-    inline AABB(const Vec3* points, int num)
-    {
-        Reset();
-        for (int i = 0; i < num; i++)
-        {
-            Add(points[i]);
-        }
-    }
-
-    //! Reset Bounding box before calculating bounds.
-    //! These values ensure that Add() functions work correctly for Reset bbs, without additional comparisons.
-    ILINE void Reset()
-    {   min = Vec3(1e15f);  max = Vec3(-1e15f); }
-
-    ILINE bool IsReset() const
-    { return min.x > max.x; }
-
-    ILINE float IsResetSel(float ifReset, float ifNotReset) const
-    { return (float)fsel(max.x - min.x, ifNotReset, ifReset); }
-
-    //! Check if bounding box is empty (Zero volume).
-    ILINE bool IsEmpty() const
-    { return min == max; }
-
-    //! Check if bounding box has valid, non zero volume
-    ILINE bool IsNonZero() const
-    { return min.x < max.x && min.y < max.y && min.z < max.z; }
-
-    ILINE Vec3 GetCenter() const
-    { return (min + max) * 0.5f; }
-
-    ILINE Vec3 GetSize() const
-    { return (max - min) * IsResetSel(0.0f, 1.0f); }
-
-    ILINE float GetRadius() const
-    { return IsResetSel(0.0f, (max - min).GetLengthFloat() * 0.5f); }
-
-    ILINE float GetRadiusSqr() const
-    { return IsResetSel(0.0f, ((max - min) * 0.5f).GetLengthSquaredFloat()); }
-
-    ILINE float GetVolume() const
-    { return IsResetSel(0.0f, (max.x - min.x) * (max.y - min.y) * (max.z - min.z)); }
-
-    ILINE void Add(const Vec3& v)
-    {
-        min.CheckMin(v);
-        max.CheckMax(v);
-    }
-
-    inline void Add(const Vec3& v, float radius)
-    {
-        Vec3 ext(radius);
-        min.CheckMin(v - ext);
-        max.CheckMax(v + ext);
-    }
-
-    ILINE void Add(const AABB& bb)
-    {
-        min.CheckMin(bb.min);
-        max.CheckMax(bb.max);
-    }
-
-    inline void Move(const Vec3& v)
-    {
-        const float moveMult = IsResetSel(0.0f, 1.0f);
-        const Vec3 vMove = v * moveMult;
-        min += vMove;
-        max += vMove;
-    }
-
-    inline void Expand(Vec3 const& v)
-    {
-        if (!IsReset())
-        {
-            min -= v;
-            max += v;
-        }
-    }
-
-    // Augment the box on all sides by a box.
-    inline void Augment(AABB const& bb)
-    {
-        if (!IsReset() && !bb.IsReset())
-        {
-            Add(min + bb.min);
-            Add(max + bb.max);
-        }
-    }
-
-    void ClipToBox(AABB const& bb)
-    {
-        min.CheckMax(bb.min);
-        max.CheckMin(bb.max);
-    }
-
-    void ClipMoveToBox(AABB const& bb)
-    {
-        for (int a = 0; a < 3; a++)
-        {
-            if (max[a] - min[a] > bb.max[a] - bb.min[a])
-            {
-                min[a] = bb.min[a];
-                max[a] = bb.max[a];
-            }
-            else if (min[a] < bb.min[a])
-            {
-                max[a] += bb.min[a] - min[a];
-                min[a] = bb.min[a];
-            }
-            else if (max[a] > bb.max[a])
-            {
-                min[a] += bb.max[a] - max[a];
-                max[a] = bb.max[a];
-            }
-        }
-    }
-
-    //! Check if this bounding box overlap with bounding box of sphere.
-    bool IsOverlapSphereBounds(const Vec3& pos, float radius) const
-    {
-        assert(min.IsValid());
-        assert(max.IsValid());
-        assert(pos.IsValid());
-
-        if (pos.x > min.x && pos.x < max.x &&   pos.y > min.y && pos.y < max.y &&   pos.z > min.z && pos.z < max.z)
-        {
-            return true;
-        }
-
-        if (pos.x + radius < min.x)
-        {
-            return false;
-        }
-        if (pos.y + radius < min.y)
-        {
-            return false;
-        }
-        if (pos.z + radius < min.z)
-        {
-            return false;
-        }
-        if (pos.x - radius > max.x)
-        {
-            return false;
-        }
-        if (pos.y - radius > max.y)
-        {
-            return false;
-        }
-        if (pos.z - radius > max.z)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    //! Check if this bounding box contain sphere within itself.
-    bool IsContainSphere(const Vec3& pos, float radius) const
-    {
-        assert(min.IsValid());
-        assert(max.IsValid());
-        assert(pos.IsValid());
-        if (pos.x - radius < min.x)
-        {
-            return false;
-        }
-        if (pos.y - radius < min.y)
-        {
-            return false;
-        }
-        if (pos.z - radius < min.z)
-        {
-            return false;
-        }
-        if (pos.x + radius > max.x)
-        {
-            return false;
-        }
-        if (pos.y + radius > max.y)
-        {
-            return false;
-        }
-        if (pos.z + radius > max.z)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    //! Check if this bounding box contains a point within itself.
-    bool IsContainPoint(const Vec3& pos) const
-    {
-        assert(min.IsValid());
-        assert(max.IsValid());
-        assert(pos.IsValid());
-        if (pos.x < min.x)
-        {
-            return false;
-        }
-        if (pos.y < min.y)
-        {
-            return false;
-        }
-        if (pos.z < min.z)
-        {
-            return false;
-        }
-        if (pos.x > max.x)
-        {
-            return false;
-        }
-        if (pos.y > max.y)
-        {
-            return false;
-        }
-        if (pos.z > max.z)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    float GetDistanceSqr(Vec3 const& v) const
-    {
-        Vec3 vNear = v;
-        vNear.CheckMax(min);
-        vNear.CheckMin(max);
-        return vNear.GetSquaredDistance(v);
-    }
-
-    float GetDistance(Vec3 const& v) const
-    {
-        return sqrt(GetDistanceSqr(v));
-    }
-
-    bool ContainsBox(AABB const& b) const
-    {
-        assert(min.IsValid());
-        assert(max.IsValid());
-        assert(b.min.IsValid());
-        assert(b.max.IsValid());
-        return min.x <= b.min.x && min.y <= b.min.y && min.z <= b.min.z
-               && max.x >= b.max.x && max.y >= b.max.y && max.z >= b.max.z;
-    }
-
-    bool ContainsBox2D(AABB const& b) const
-    {
-        assert(min.IsValid());
-        assert(max.IsValid());
-        assert(b.min.IsValid());
-        assert(b.max.IsValid());
-        return min.x <= b.min.x && min.y <= b.min.y
-               && max.x >= b.max.x && max.y >= b.max.y;
-    }
-
-
-    // Check two bounding boxes for intersection.
-    inline bool IsIntersectBox(const AABB& b) const
-    {
-        assert(min.IsValid());
-        assert(max.IsValid());
-        assert(b.min.IsValid());
-        assert(b.max.IsValid());
-        // Check for intersection on X axis.
-        if ((min.x > b.max.x) || (b.min.x > max.x))
-        {
-            return false;
-        }
-        // Check for intersection on Y axis.
-        if ((min.y > b.max.y) || (b.min.y > max.y))
-        {
-            return false;
-        }
-        // Check for intersection on Z axis.
-        if ((min.z > b.max.z) || (b.min.z > max.z))
-        {
-            return false;
-        }
-        // Boxes overlap in all 3 axises.
-        return true;
-    }
-
-    /*!
-    * calculate the new bounds of a transformed AABB
-    *
-    * Example:
-    * AABB aabb = AABB::CreateAABBfromOBB(m34,aabb);
-    *
-    * return values:
-    *  expanded AABB in world-space
-    */
-    ILINE void SetTransformedAABB(const Matrix34& m34, const AABB& aabb)
-    {
-        if (aabb.IsReset())
-        {
-            Reset();
-        }
-        else
-        {
-            Matrix33 m33;
-            m33.m00 = fabs_tpl(m34.m00);
-            m33.m01 = fabs_tpl(m34.m01);
-            m33.m02 = fabs_tpl(m34.m02);
-            m33.m10 = fabs_tpl(m34.m10);
-            m33.m11 = fabs_tpl(m34.m11);
-            m33.m12 = fabs_tpl(m34.m12);
-            m33.m20 = fabs_tpl(m34.m20);
-            m33.m21 = fabs_tpl(m34.m21);
-            m33.m22 = fabs_tpl(m34.m22);
-
-            Vec3 sz     =   m33 * ((aabb.max - aabb.min) * 0.5f);
-            Vec3 pos    = m34 * ((aabb.max + aabb.min) * 0.5f);
-            min = pos - sz;
-            max = pos + sz;
-        }
-    }
-    ILINE static AABB CreateTransformedAABB(const Matrix34& m34, const AABB& aabb)
-    { AABB taabb; taabb.SetTransformedAABB(m34, aabb); return taabb;     }
-
-
-
-    ILINE void SetTransformedAABB(const QuatT& qt, const AABB& aabb)
-    {
-        if (aabb.IsReset())
-        {
-            Reset();
-        }
-        else
-        {
-            Matrix33 m33 = Matrix33(qt.q);
-            m33.m00 = fabs_tpl(m33.m00);
-            m33.m01 = fabs_tpl(m33.m01);
-            m33.m02 = fabs_tpl(m33.m02);
-            m33.m10 = fabs_tpl(m33.m10);
-            m33.m11 = fabs_tpl(m33.m11);
-            m33.m12 = fabs_tpl(m33.m12);
-            m33.m20 = fabs_tpl(m33.m20);
-            m33.m21 = fabs_tpl(m33.m21);
-            m33.m22 = fabs_tpl(m33.m22);
-            Vec3 sz     =   m33 * ((aabb.max - aabb.min) * 0.5f);
-            Vec3 pos    =  qt * ((aabb.max + aabb.min) * 0.5f);
-            min = pos - sz;
-            max = pos + sz;
-        }
-    }
-    ILINE static AABB CreateTransformedAABB(const QuatT& qt, const AABB& aabb)
-    { AABB taabb; taabb.SetTransformedAABB(qt, aabb); return taabb;  }
-
-
-    //create an AABB using just the extensions of the OBB and ignore the orientation.
-    template<typename F>
-    ILINE void SetAABBfromOBB(const OBB_tpl<F>& obb)
-    { min = obb.c - obb.h; max = obb.c + obb.h; }
-    template<typename F>
-    ILINE static AABB CreateAABBfromOBB(const OBB_tpl<F>& obb)
-    {   return AABB(obb.c - obb.h, obb.c + obb.h);   }
-
-    /*!
-    * converts an OBB into an tight fitting AABB
-    *
-    * Example:
-    * AABB aabb = AABB::CreateAABBfromOBB(wposition,obb,1.0f);
-    *
-    * return values:
-    *  expanded AABB in world-space
-    */
-    template<typename F>
-    ILINE void SetAABBfromOBB(const Vec3& wpos, const OBB_tpl<F>& obb, f32 scaling = 1.0f)
-    {
-        Vec3 pos    = obb.m33 * obb.c * scaling + wpos;
-        Vec3 sz     =   obb.m33.GetFabs() * obb.h * scaling;
-        min = pos - sz;
-        max = pos + sz;
-    }
-    template<typename F>
-    ILINE static AABB CreateAABBfromOBB(const Vec3& wpos, const OBB_tpl<F>& obb, f32 scaling = 1.0f)
-    { AABB taabb; taabb.SetAABBfromOBB(wpos, obb, scaling); return taabb;     }
-
-    /* Converts a Cone into a tight fitting AABB */
-    ILINE static AABB CreateAABBfromCone(const Cone& c)
-    {
-        // Construct AABB for cone base
-        Vec3 baseX = Vec3(1.f - c.mDir.x * c.mDir.x, c.mDir.x * c.mDir.y, c.mDir.x * c.mDir.z).GetNormalized() * c.mBaseRadius;
-        Vec3 baseY = Vec3(c.mDir.y * c.mDir.x, 1.f - c.mDir.y * c.mDir.y, c.mDir.y * c.mDir.z).GetNormalized() * c.mBaseRadius;
-        Vec3 baseZ = Vec3(c.mDir.z * c.mDir.x, c.mDir.z * c.mDir.y, 1.f - c.mDir.z * c.mDir.z).GetNormalized() * c.mBaseRadius;
-
-        Vec3 aabbMax = Vec3(baseX.x, baseY.y, baseZ.z).abs();
-        Vec3 aabbMin = -aabbMax;
-
-        AABB result(aabbMin, aabbMax);
-        result.Move(c.mBase);
-
-        // add tip
-        result.Add(c.mTip);
-        return result;
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-ILINE bool IsEquivalent(const AABB& a, const AABB& b, float epsilon = VEC_EPSILON)
-{
-    return IsEquivalent(a.min, b.min, epsilon) && IsEquivalent(a.max, b.max, epsilon);
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct OBB
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-template <typename F>
-struct OBB_tpl
-{
-    Matrix33 m33; //orientation vectors
-    Vec3 h;             //half-length-vector
-    Vec3 c;             //center of obb
-
-    //default OBB constructor (without initialisation)
-    inline OBB_tpl() {}
-
-    ILINE void SetOBB(const Matrix33& matrix, const Vec3& hlv, const Vec3& center) {  m33 = matrix; h = hlv; c = center;   }
-    ILINE static OBB_tpl<F> CreateOBB(const Matrix33& m33, const Vec3& hlv, const Vec3& center) {    OBB_tpl<f32> obb; obb.m33 = m33; obb.h = hlv; obb.c = center; return obb; }
-
-    ILINE void SetOBBfromAABB(const Matrix33& mat33, const AABB& aabb)
-    {
-        m33 =   mat33;
-        h       =   (aabb.max - aabb.min) * 0.5f;   //calculate the half-length-vectors
-        c       =   (aabb.max + aabb.min) * 0.5f;   //the center is relative to the PIVOT
-    }
-    ILINE void SetOBBfromAABB(const Quat& q, const AABB& aabb)
-    {
-        m33 =   Matrix33(q);
-        h       =   (aabb.max - aabb.min) * 0.5f;   //calculate the half-length-vectors
-        c       =   (aabb.max + aabb.min) * 0.5f;   //the center is relative to the PIVOT
-    }
-    ILINE static OBB_tpl<F> CreateOBBfromAABB(const Matrix33& m33, const AABB& aabb) { OBB_tpl<f32> obb; obb.SetOBBfromAABB(m33, aabb); return obb;    }
-    ILINE static OBB_tpl<F> CreateOBBfromAABB(const Quat& q, const AABB& aabb) { OBB_tpl<f32> obb; obb.SetOBBfromAABB(q, aabb); return obb;    }
-
-    ~OBB_tpl(void) {};
-};
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Sphere
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-struct Sphere
-{
-    Vec3 center;
-    float radius;
-
-    Sphere() {}
-    Sphere(const Vec3& c, float r)
-        : center(c)
-        , radius(r) {}
-    void operator()(const Vec3& c, float r) { center = c; radius = r; }
-};
-
-struct HWVSphere
-{
-    hwvec3  center;
-    simdf       radius;
-
-    ILINE HWVSphere(const hwvec3& c, const simdf& r)
-    {
-        center = c;
-        radius = r;
-    }
-
-    ILINE HWVSphere(const ::Sphere& sp)
-    {
-        center = HWVLoadVecUnaligned(&sp.center);
-        radius = SIMDFLoadFloat(sp.radius);
-    }
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct AAEllipsoid
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-struct AAEllipsoid
-{
-    Vec3 center;
-    Vec3 radius_vec;
-
-    //default AAEllipsoid constructor (without initialisation)
-    inline AAEllipsoid(void) {}
-    inline AAEllipsoid(const Vec3& c, const Vec3& rv) {  radius_vec = rv; center = c; }
-    inline void operator () (const Vec3& c, const Vec3& rv) {  radius_vec = rv; center = c; }
-
-    ~AAEllipsoid(void) {};
-};
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Ellipsoid
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-struct Ellipsoid
-{
-    Matrix34 ExtensionPos;
-
-    //default Ellipsoid constructor (without initialisation)
-    inline Ellipsoid(void) {}
-    inline Ellipsoid(const Matrix34& ep) {  ExtensionPos = ep; }
-    inline void operator () (const Matrix34& ep) {  ExtensionPos = ep; }
-
-    ~Ellipsoid(void) {};
-};
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct TRect
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-template <class Num>
-struct TRect_tpl
-{
-    typedef Vec2_tpl<Num> Vec;
-
-    Vec Min, Max;
-
-    inline TRect_tpl() {}
-    inline TRect_tpl(Num x1, Num y1, Num x2, Num y2)
-        : Min(x1, y1)
-        , Max(x2, y2) {}
-    inline TRect_tpl(const TRect_tpl<Num>& rc)
-        : Min(rc.Min)
-        , Max(rc.Max) {}
-    inline TRect_tpl(const Vec& min, const Vec& max)
-        : Min(min)
-        , Max(max) {}
-
-    inline TRect_tpl<Num> operator * (Num k) const
-    {
-        return TRect_tpl<Num>(Min.x * k, Min.y * k, Max.x * k, Max.y * k);
-    }
-    inline TRect_tpl<Num> operator / (Num k) const
-    {
-        return TRect_tpl<Num>(Min.x / k, Min.y / k, Max.x / k, Max.y / k);
-    }
-
-    inline bool IsEmpty() const { return Max.x < Min.x && Max.y < Min.y; }
-    inline TRect_tpl<Num>& SetEmpty() { Max = Vec(-1, -1); Min = Vec(0, 0); return *this; }
-
-    inline Vec GetDim() const { return Max - Min; }
-    inline Num GetWidth() const { return Max.x - Min.x; }
-    inline Num GetHeight() const { return Max.y - Min.y; }
-
-    inline bool IsEqual(const TRect_tpl<Num>& rc) const { return Min.x == rc.Min.x && Min.y == rc.Min.y && Max.x == rc.Max.x && Max.y == rc.Max.y; }
-
-    inline bool InRect(const TRect_tpl<Num>& rc) const { return rc.Min.x >= Min.x && rc.Max.x <= Max.x && rc.Min.y >= Min.y && rc.Max.y <= Max.y; }
-    inline bool InRect(Vec pt) const { return pt.x >= Min.x && pt.x <= Max.x && pt.y >= Min.y && pt.y <= Max.y; }
-    inline Vec& IntoRect(Vec& pt) const
-    {
-        if (pt.x < Min.x)
-        {
-            pt.x = Min.x;
-        }
-        else if (pt.x > Max.x)
-        {
-            pt.x = Max.x;
-        }
-        if (pt.y < Min.y)
-        {
-            pt.y = Min.y;
-        }
-        else if (pt.y > Max.y)
-        {
-            pt.y = Max.y;
-        }
-        return pt;
-    }
-
-    inline bool Intersects(const TRect_tpl<Num>& rc) const
-    {
-        return !IsEmpty() && !rc.IsEmpty() &&
-               !(Min.x > rc.Max.x || Max.x < rc.Min.x ||
-                 Min.y > rc.Max.y || Max.y < rc.Min.y);
-    }
-
-    inline TRect_tpl<Num>& DoUnite(const TRect_tpl<Num>& rc)
-    {
-        if (IsEmpty())
-        {
-            Min = rc.Min;
-            Max = rc.Max;
-            return *this;
-        }
-        if (rc.IsEmpty())
-        {
-            return *this;
-        }
-        if (Min.x > rc.Min.x)
-        {
-            Min.x = rc.Min.x;
-        }
-        if (Min.y > rc.Min.y)
-        {
-            Min.y = rc.Min.y;
-        }
-        if (Max.x < rc.Max.x)
-        {
-            Max.x = rc.Max.x;
-        }
-        if (Max.y < rc.Max.y)
-        {
-            Max.y = rc.Max.y;
-        }
-        return *this;
-    }
-
-    inline TRect_tpl<Num>& DoIntersect(const TRect_tpl<Num>& rc)
-    {
-        if (IsEmpty())
-        {
-            return *this;
-        }
-        if (rc.IsEmpty())
-        {
-            return SetEmpty();
-        }
-        if (Min.x < rc.Min.x)
-        {
-            Min.x = rc.Min.x;
-        }
-        if (Min.y < rc.Min.y)
-        {
-            Min.y = rc.Min.y;
-        }
-        if (Max.x > rc.Max.x)
-        {
-            Max.x = rc.Max.x;
-        }
-        if (Max.y > rc.Max.y)
-        {
-            Max.y = rc.Max.y;
-        }
-
-        if (Min.x == Max.x || Min.y == Max.y)
-        {
-            return SetEmpty();
-        }
-
-        return *this;
-    }
-
-    inline TRect_tpl<Num> GetSubRect(const TRect_tpl<Num>& rc) const
-    {
-        if (IsEmpty())
-        {
-            return *this;
-        }
-        if (rc.IsEmpty())
-        {
-            return rc;
-        }
-        return TRect_tpl<Num>(Min.x + rc.Min.x * GetWidth(),
-            Min.y + rc.Min.y * GetHeight(),
-            Min.x + rc.Max.x * GetWidth(),
-            Min.y + rc.Max.y * GetHeight());
-    }
-
-    inline TRect_tpl<Num> GetSubRectInv(const TRect_tpl<Num>& rcSub) const
-    {
-        if (IsEmpty())
-        {
-            return *this;
-        }
-        if (rcSub.IsEmpty())
-        {
-            return rcSub;
-        }
-        return TRect_tpl((rcSub.Min.x - Min.x) / GetWidth(),
-            (rcSub.Min.y - Min.y) / GetHeight(),
-            (rcSub.Max.x - Min.x) / GetWidth(),
-            (rcSub.Max.y - Min.y) / GetHeight());
-    }
-};
-
-typedef TRect_tpl<float> Rectf;
-typedef TRect_tpl<int> Recti;
-
-typedef Triangle_tpl<f32>   Triangle;
-typedef Triangle_tpl<f64>   Triangle_f64;
-typedef OBB_tpl<f32>    OBB;
-
-//////////////////////////////////////////////////////////////////////////
-// Manage linear and rotational 3D velocity in a class
-class Velocity3
-{
-public:
-    Vec3        vLin, vRot;
-
-    Velocity3()
-    {}
-    Velocity3(type_zero)
-        : vLin(ZERO)
-        , vRot(ZERO) {}
-    Velocity3(Vec3 const& lin)
-        : vLin(lin)
-        , vRot(ZERO) {}
-    Velocity3(Vec3 const& lin, Vec3 const& rot)
-        : vLin(lin)
-        , vRot(rot) {}
-
-    void FromDelta(QuatT const& loc0, QuatT const& loc1, float fTime)
-    {
-        float fInvT = 1.f / fTime;
-        vLin = (loc1.t - loc0.t) * fInvT;
-        vRot = Quat::log(loc1.q * loc0.q.GetInverted()) * fInvT;
-    }
-
-    Vec3 VelocityAt(Vec3 const& vPosRel) const
-    { return vLin + (vRot % vPosRel); }
-
-    void operator += (Velocity3 const& vv)
-    {
-        vLin += vv.vLin;
-        vRot += vv.vRot;
-    }
-    void operator *= (float f)
-    {
-        vLin *= f;
-        vRot *= f;
-    }
-    void Interp(Velocity3 const& vv, float f)
-    {
-        vLin += (vv.vLin - vLin) * f;
-        vRot += (vv.vRot - vRot) * f;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-#include "Cry_GeoDistance.h"
-#include "Cry_GeoOverlap.h"
-#include "Cry_GeoIntersect.h"
-
-
-
-
-
-
-
-
-
-
-/////////////////////////////////////////////////////////////////////////
-//this is some special engine stuff, should be moved to a better location
-/////////////////////////////////////////////////////////////////////////
-
-// for bbox's checks and calculations
-#define MAX_BB  +99999.0f
-#define MIN_BB  -99999.0f
-
-//! checks if this has been set to minBB
-inline bool IsMinBB(const Vec3& v)
-{
-    if (v.x <= MIN_BB)
-    {
-        return (true);
-    }
-    if (v.y <= MIN_BB)
-    {
-        return (true);
-    }
-    if (v.z <= MIN_BB)
-    {
-        return (true);
-    }
-    return (false);
-}
-
-//! checks if this has been set to maxBB
-inline bool IsMaxBB(const Vec3& v)
-{
-    if (v.x >= MAX_BB)
-    {
-        return (true);
-    }
-    if (v.y >= MAX_BB)
-    {
-        return (true);
-    }
-    if (v.z >= MAX_BB)
-    {
-        return (true);
-    }
-    return (false);
-}
-
-inline Vec3 SetMaxBB(void) { return Vec3(MAX_BB, MAX_BB, MAX_BB); }
-inline Vec3 SetMinBB(void) { return Vec3(MIN_BB, MIN_BB, MIN_BB); }
-
-inline void AddToBounds (const Vec3& v, Vec3& mins, Vec3& maxs)
-{
-    if (v.x < mins.x)
-    {
-        mins.x = v.x;
-    }
-    if (v.x > maxs.x)
-    {
-        maxs.x = v.x;
-    }
-    if (v.y < mins.y)
-    {
-        mins.y = v.y;
-    }
-    if (v.y > maxs.y)
-    {
-        maxs.y = v.y;
-    }
-    if (v.z < mins.z)
-    {
-        mins.z = v.z;
-    }
-    if (v.z > maxs.z)
-    {
-        maxs.z = v.z;
-    }
-}
-
-
-////////////////////////////////////////////////////////////////
-//! calc the area of a polygon giving a list of vertices and normal
-inline float CalcArea(const Vec3* vertices, int numvertices, const Vec3& normal)
-{
-    Vec3 csum(0, 0, 0);
-
-    int n = numvertices;
-    for (int i = 0, j = 1; i <= n - 2; i++, j++)
-    {
-        csum.x += vertices[i].y * vertices[j].z - vertices[i].z * vertices[j].y;
-        csum.y += vertices[i].z * vertices[j].x - vertices[i].x * vertices[j].z;
-        csum.z += vertices[i].x * vertices[j].y - vertices[i].y * vertices[j].x;
-    }
-
-    csum.x += vertices[n - 1].y * vertices[0].z - vertices[n - 1].z * vertices[0].y;
-    csum.y += vertices[n - 1].z * vertices[0].x - vertices[n - 1].x * vertices[0].z;
-    csum.z += vertices[n - 1].x * vertices[0].y - vertices[n - 1].y * vertices[0].x;
-
-    float area = 0.5f * (float)fabs(normal | csum);
-    return (area);
-}
-
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_GEO_H
diff --git a/Code/CryEngine/CryCommon/Cry_GeoDistance.h b/Code/CryEngine/CryCommon/Cry_GeoDistance.h
deleted file mode 100644
index 615c0f1c08..0000000000
--- a/Code/CryEngine/CryCommon/Cry_GeoDistance.h
+++ /dev/null
@@ -1,1693 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common distance-computations
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_GEODISTANCE_H
-#define CRYINCLUDE_CRYCOMMON_CRY_GEODISTANCE_H
-#pragma once
-
-#include <Cry_Geo.h>
-#include <limits>
-#include <AzCore/Math/Vector3.h>
-
-#ifdef max
-#undef max
-#endif
-
-namespace Intersect
-{
-    bool Lineseg_Triangle(const Lineseg& lineseg, const Vec3& v0, const Vec3& v1, const Vec3& v2, Vec3& output, float* outT);
-}
-
-namespace Distance {
-    template<typename F>
-    ILINE F Point_Point(const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2)
-    {
-        return sqrt_tpl(square(p1.x - p2.x) + square(p1.y - p2.y) + square(p1.z - p2.z));
-    }
-
-    template<typename F>
-    ILINE F Point_PointSq(const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2)
-    {
-        return square(p1.x - p2.x) + square(p1.y - p2.y) + square(p1.z - p2.z);
-    }
-
-    template<typename F>
-    ILINE F Point_Point2DSq(const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2)
-    {
-        return square(p1.x - p2.x) + square(p1.y - p2.y);
-    }
-
-    template<typename F>
-    ILINE F Point_Point2D(const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2)
-    {
-        return sqrt_tpl(square(p1.x - p2.x) + square(p1.y - p2.y));
-    }
-
-    // Description:
-    //  Distance: Origin_Triangle2D.
-    //  Calculate the closest distance of a triangle in XY-plane to the coordinate origin.
-    //  it is assumed that the z-values of the triangle are all in the same plane.
-    // Return Value:
-    //  The 3d-position of the closest point on the triangle.
-    // Example:
-    //  Vec3 result = Distance::Origin_Triangle2D( triangle );
-    template<typename F>
-    ILINE Vec3_tpl<F> Origin_Triangle2D(const Triangle_tpl<F>& t)
-    {
-        Vec3_tpl<F> a = t.v0;
-        Vec3_tpl<F> b = t.v1;
-        Vec3_tpl<F> c = t.v2;
-        //check if (0,0,0) is inside or in fron of any triangle sides.
-        uint32 flag = ((a.x * (a.y - b.y) - a.y * (a.x - b.x)) < 0) | (((b.x * (b.y - c.y) - b.y * (b.x - c.x)) < 0) << 1) | (((c.x * (c.y - a.y) - c.y * (c.x - a.x)) < 0) << 2);
-        switch (flag)
-        {
-        case 0:
-            return Vec3_tpl<F>(0, 0, a.z);   //center is inside of triangle
-        case 1:
-            if ((a | (b - a)) > 0.0f)
-            {
-                flag = 5;
-            }
-            else if ((b | (a - b)) > 0.0f)
-            {
-                flag = 3;
-            }
-            break;
-        case 2:
-            if ((b | (c - b)) > 0.0f)
-            {
-                flag = 3;
-            }
-            else if ((c | (b - c)) > 0.0f)
-            {
-                flag = 6;
-            }
-            break;
-        case 3:
-            return b;     //vertex B is closed
-        case 4:
-            if ((c | (a - c)) > 0.0f)
-            {
-                flag = 6;
-            }
-            else if ((a | (c - a)) > 0.0f)
-            {
-                flag = 5;
-            }
-            break;
-        case 5:
-            return a;     //vertex A is closed
-        case 6:
-            return c;     //vertex C is closed
-        }
-        //check again using expanded area
-        switch (flag)
-        {
-        case 1:
-        {
-            Vec3_tpl<F> n = (b - a).GetNormalized();
-            return n * (-a | n) + a;
-        }
-        case 2:
-        {
-            Vec3_tpl<F> n = (c - b).GetNormalized();
-            return n * (-b | n) + b;
-        }
-        case 3:
-            return b;
-        case 4:
-        {
-            Vec3_tpl<F> n = (a - c).GetNormalized();
-            return n * (-c | n) + c;
-        }
-        case 5:
-            return a;
-        case 6:
-            return c;
-        }
-        return Vec3_tpl<F>(0, 0, 0);
-    }
-
-    ILINE hwvec3 Origin_Triangle2D(const hwvec3& a, const hwvec3& b, const hwvec3& c)
-    {
-        const hwvec3 vZero = HWV3Zero();
-        const hwvec3 aNeg = HWV3Negate(a);
-        const hwvec3 bNeg = HWV3Negate(b);
-        const hwvec3 cNeg = HWV3Negate(c);
-
-        const hwvec3 vASubB = HWVSub(a, b);
-        const hwvec3 vBSubA = HWVSub(b, a);
-        const hwvec3 vASubC = HWVSub(a, c);
-        const hwvec3 vCSubA = HWVSub(c, a);
-        const hwvec3 vBSubC = HWVSub(b, c);
-        const hwvec3 vCSubB = HWVSub(c, b);
-
-        HWV4PermuteControl(vSwapXY, HWV_PERMUTE_0Y, HWV_PERMUTE_0X, HWV_PERMUTE_0Z, HWV_PERMUTE_0W);
-
-        const hwvec3 aPerm = HWV3PermuteWord(a, a, vSwapXY);
-        const hwvec3 vACombined = HWVMultiply(aPerm, vASubB);
-
-        //Yes, this is the right way around, check the non-vectorized version below :)
-        const simdf vAY = HWV3SplatXToSIMDF(vACombined);
-        const simdf vAX = HWV3SplatYToSIMDF(vACombined);
-
-
-        const hwvec3 bPerm = HWV3PermuteWord(b, b, vSwapXY);
-        const hwvec3 vBCombined = HWVMultiply(bPerm, vBSubC);
-
-        const simdf vBY = HWV3SplatXToSIMDF(vBCombined);
-        const simdf vBX = HWV3SplatYToSIMDF(vBCombined);
-
-
-        const hwvec3 cPerm = HWV3PermuteWord(c, c, vSwapXY);
-        const hwvec3 vCCombined = HWVMultiply(cPerm, vCSubA);
-
-        const simdf vCY = HWV3SplatXToSIMDF(vCCombined);
-        const simdf vCX = HWV3SplatYToSIMDF(vCCombined);
-
-
-        //check if (0,0,0) is inside or in front of any triangle sides.
-        bool subflag0 = SIMDFLessThanB(vAX, vAY);
-        bool subflag1 = SIMDFLessThanB(vBX, vBY);
-        bool subflag2 = SIMDFLessThanB(vCX, vCY);
-
-        uint32 flag = ((uint32)subflag0) | ((uint32)(subflag1 << 1)) | ((uint32)(subflag2 << 2));
-
-        switch (flag)
-        {
-        case 0:
-        {
-            HWV4PermuteControl(selectz, HWV_PERMUTE_1X, HWV_PERMUTE_1Y, HWV_PERMUTE_0Z, HWV_PERMUTE_1W);
-            return HWV3PermuteWord(a, vZero, selectz);     //center is inside of triangle
-        }
-        case 1:
-        {
-            if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(a, vBSubA)))
-            {
-                flag = 5;
-            }
-            else if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(b, vASubB)))
-            {
-                flag = 3;
-            }
-            break;
-        }
-        case 2:
-        {
-            if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(b, vCSubB)))
-            {
-                flag = 3;
-            }
-            else if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(c, vBSubC)))
-            {
-                flag = 6;
-            }
-            break;
-        }
-        case 3:
-            return b;     //vertex B is closed
-        case 4:
-        {
-            if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(c, vASubC)))
-            {
-                flag = 6;
-            }
-            else if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(a, vCSubA)))
-            {
-                flag = 5;
-            }
-            break;
-        }
-        case 5:
-            return a;     //vertex A is closed
-        case 6:
-            return c;     //vertex C is closed
-        }
-
-        switch (flag)
-        {
-        case 1:
-        {
-            //hwvec3 n = HWV3Normalize(vBSubA);
-            simdf nLengthSq = HWV3Dot(vBSubA, vBSubA);
-            simdf invLengthSq = SIMDFReciprocal(nLengthSq);
-            return HWVMultiplySIMDFAdd(vBSubA, SIMDFMult(HWV3Dot(aNeg, vBSubA), invLengthSq), a);
-        }
-        case 2:
-        {
-            simdf nLengthSq = HWV3Dot(vCSubB, vCSubB);
-            simdf invLengthSq = SIMDFReciprocal(nLengthSq);
-            return HWVMultiplySIMDFAdd(vCSubB, SIMDFMult(HWV3Dot(bNeg, vCSubB), invLengthSq), b);
-        }
-        case 3:
-            return b;
-        case 4:
-        {
-            simdf nLengthSq = HWV3Dot(vASubC, vASubC);
-            simdf invLengthSq = SIMDFReciprocal(nLengthSq);
-            return HWVMultiplySIMDFAdd(vASubC, SIMDFMult(HWV3Dot(cNeg, vASubC), invLengthSq), c);
-        }
-        case 5:
-            return a;
-        case 6:
-            return c;
-        }
-
-        //      switch (flag) {
-        //          case 1: { Vec3_tpl<F> n=(b-a).GetNormalized(); return n*(-a|n)+a; }
-        //          case 2: {   Vec3_tpl<F> n=(c-b).GetNormalized(); return n*(-b|n)+b; }
-        //          case 3: return b;
-        //          case 4: { Vec3_tpl<F> n=(a-c).GetNormalized(); return n*(-c|n)+c; }
-        //          case 5: return a;
-        //          case 6: return c;
-        //      }
-
-        return vZero;
-    }
-
-
-    // Description:
-    //  Distance: Point_Triangle.
-    //  Calculate the closest distance of a point to a triangle in 3d-space.
-    // Return value:
-    //  The squared distance.
-    // Example:
-    //  float result = Distance::Point_Triangle( pos, triangle );
-    template<typename F>
-    ILINE F Point_TriangleSq(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t)
-    {
-        //translate triangle into origin
-        Vec3_tpl<F> a = t.v0 - p;
-        Vec3_tpl<F> b = t.v1 - p;
-        Vec3_tpl<F> c = t.v2 - p;
-        //transform triangle into XY-plane to simplify the test
-        Matrix33_tpl<F> r33 = Matrix33_tpl<F>::CreateRotationV0V1(((b - a) % (a - c)).GetNormalized(), Vec3(0, 0, 1));
-        Vec3_tpl<F> h = Origin_Triangle2D(Triangle_tpl<F>(r33 * a, r33 * b, r33 * c));
-        return (h | h); //return squared distance
-    }
-
-    inline simdf Point_TriangleByPointsSq(const hwvec3& p, const hwvec3& t0, const hwvec3& t1, const hwvec3& t2)
-    {
-        //translate triangle into origin
-
-        HWV3Constant(kUp, 0.0f, 0.0f, 1.0f);
-
-        const hwvec3 a = HWVSub(t0, p);
-        const hwvec3 b = HWVSub(t1, p);
-        const hwvec3 c = HWVSub(t2, p);
-
-        const hwvec3 baDiff = HWVSub(b, a);
-        const hwvec3 acDiff = HWVSub(a, c);
-
-        const hwvec3 cross = HWVCross(baDiff, acDiff);
-
-        const hwvec3 crossNormalized = HWV3Normalize(cross);
-
-        hwmtx33 r33 = HWMtx33CreateRotationV0V1(crossNormalized, kUp);
-
-        hwmtx33 r33opt = HWMtx33GetOptimized(r33);
-
-        //transform triangle into XY-plane to simplify the test
-        const hwvec3 aRot = HWMtx33RotateVecOpt(r33opt, a);
-        const hwvec3 bRot = HWMtx33RotateVecOpt(r33opt, b);
-        const hwvec3 cRot = HWMtx33RotateVecOpt(r33opt, c);
-
-        hwvec3 h = Origin_Triangle2D(aRot, bRot, cRot);
-
-        return HWV3Dot(h, h);
-    }
-
-    template<typename F>
-    ILINE F Point_Triangle(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t)
-    {
-        return sqrt_tpl(Point_TriangleSq(p, t));
-    }
-
-    // Description:
-    //      Distance: Point_Triangle.
-    //      Calculate the closest distance of a point to a triangle in 3d-space.
-    //      The function returns the squared distance and the 3d-position of the
-    //      closest point on the triangle.
-    // Example:
-    //      float result = Distance::Point_Triangle( pos, triangle, output );
-    template<typename F>
-    ILINE F Point_TriangleSq(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t, Vec3_tpl<F>& output)
-    {
-        //translate triangle into origin
-        Vec3_tpl<F> a = t.v0 - p;
-        Vec3_tpl<F> b = t.v1 - p;
-        Vec3_tpl<F> c = t.v2 - p;
-        //transform triangle into XY-plane to simplify the test
-        Matrix33_tpl<F> r33 = Matrix33_tpl<F>::CreateRotationV0V1(((b - a) % (a - c)).GetNormalized(), Vec3_tpl<F>(0, 0, 1));
-        Vec3_tpl<F> h = Origin_Triangle2D(Triangle_tpl<F>(r33 * a, r33 * b, r33 * c));
-        output = h * r33 + p;
-        return (h | h); //return squared distance
-    }
-
-    template<typename F>
-    ILINE F Point_Triangle(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t, Vec3_tpl<F>& output)
-    {
-        return sqrt_tpl(Point_TriangleSq(p, t, output));
-    }
-
-    // Description:
-    //  Squared distance from point to triangle, optionally returning the triangle position in
-    //  parameteric form.
-    template<typename F>
-    ILINE F Point_TriangleSq(const Vec3_tpl<F>& point, const Triangle_tpl<F>& triangle, F* pT0, F* pT1)
-    {
-        Vec3 diff = triangle.v0 - point;
-        const Vec3 edge0 = triangle.v1 - triangle.v0;
-        const Vec3 edge1 = triangle.v2 - triangle.v0;
-        F fA00 = edge0.GetLengthSquared();
-        F fA01 = edge0.Dot(edge1);
-        F fA11 = edge1.GetLengthSquared();
-        F fB0 = diff.Dot(edge0);
-        F fB1 = diff.Dot(edge1);
-        F fC = diff.GetLengthSquared();
-        F fDet = abs(fA00 * fA11 - fA01 * fA01);
-        F fS = fA01 * fB1 - fA11 * fB0;
-        F fT = fA01 * fB0 - fA00 * fB1;
-        F fSqrDist;
-
-        if (fS + fT <= fDet)
-        {
-            if (fS < (F)0.0)
-            {
-                if (fT < (F)0.0) // region 4
-                {
-                    if (fB0 < (F)0.0)
-                    {
-                        fT = (F)0.0;
-                        if (-fB0 >= fA00)
-                        {
-                            fS = (F)1.0;
-                            fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                        }
-                        else
-                        {
-                            fS = -fB0 / fA00;
-                            fSqrDist = fB0 * fS + fC;
-                        }
-                    }
-                    else
-                    {
-                        fS = (F)0.0;
-                        if (fB1 >= (F)0.0)
-                        {
-                            fT = (F)0.0;
-                            fSqrDist = fC;
-                        }
-                        else if (-fB1 >= fA11)
-                        {
-                            fT = (F)1.0;
-                            fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                        }
-                        else
-                        {
-                            fT = -fB1 / fA11;
-                            fSqrDist = fB1 * fT + fC;
-                        }
-                    }
-                }
-                else // region 3
-                {
-                    fS = (F)0.0;
-                    if (fB1 >= (F)0.0)
-                    {
-                        fT = (F)0.0;
-                        fSqrDist = fC;
-                    }
-                    else if (-fB1 >= fA11)
-                    {
-                        fT = (F)1.0;
-                        fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                    }
-                    else
-                    {
-                        fT = -fB1 / fA11;
-                        fSqrDist = fB1 * fT + fC;
-                    }
-                }
-            }
-            else if (fT < (F)0.0) // region 5
-            {
-                fT = (F)0.0;
-                if (fB0 >= (F)0.0)
-                {
-                    fS = (F)0.0;
-                    fSqrDist = fC;
-                }
-                else if (-fB0 >= fA00)
-                {
-                    fS = (F)1.0;
-                    fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                }
-                else
-                {
-                    fS = -fB0 / fA00;
-                    fSqrDist = fB0 * fS + fC;
-                }
-            }
-            else // region 0
-            {
-                // minimum at interior point
-                F fInvDet = ((F)1.0) / fDet;
-                fS *= fInvDet;
-                fT *= fInvDet;
-                fSqrDist = fS * (fA00 * fS + fA01 * fT + ((F)2.0) * fB0) +
-                    fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
-            }
-        }
-        else
-        {
-            F fTmp0, fTmp1, fNumer, fDenom;
-
-            if (fS < (F)0.0) // region 2
-            {
-                fTmp0 = fA01 + fB0;
-                fTmp1 = fA11 + fB1;
-                if (fTmp1 > fTmp0)
-                {
-                    fNumer = fTmp1 - fTmp0;
-                    fDenom = fA00 - 2.0f * fA01 + fA11;
-                    if (fNumer >= fDenom)
-                    {
-                        fS = (F)1.0;
-                        fT = (F)0.0;
-                        fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                    }
-                    else
-                    {
-                        fS = fNumer / fDenom;
-                        fT = (F)1.0 - fS;
-                        fSqrDist = fS * (fA00 * fS + fA01 * fT + 2.0f * fB0) +
-                            fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
-                    }
-                }
-                else
-                {
-                    fS = (F)0.0;
-                    if (fTmp1 <= (F)0.0)
-                    {
-                        fT = (F)1.0;
-                        fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                    }
-                    else if (fB1 >= (F)0.0)
-                    {
-                        fT = (F)0.0;
-                        fSqrDist = fC;
-                    }
-                    else
-                    {
-                        fT = -fB1 / fA11;
-                        fSqrDist = fB1 * fT + fC;
-                    }
-                }
-            }
-            else if (fT < (F)0.0) // region 6
-            {
-                fTmp0 = fA01 + fB1;
-                fTmp1 = fA00 + fB0;
-                if (fTmp1 > fTmp0)
-                {
-                    fNumer = fTmp1 - fTmp0;
-                    fDenom = fA00 - ((F)2.0) * fA01 + fA11;
-                    if (fNumer >= fDenom)
-                    {
-                        fT = (F)1.0;
-                        fS = (F)0.0;
-                        fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                    }
-                    else
-                    {
-                        fT = fNumer / fDenom;
-                        fS = (F)1.0 - fT;
-                        fSqrDist = fS * (fA00 * fS + fA01 * fT + ((F)2.0) * fB0) +
-                            fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
-                    }
-                }
-                else
-                {
-                    fT = (F)0.0;
-                    if (fTmp1 <= (F)0.0)
-                    {
-                        fS = (F)1.0;
-                        fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                    }
-                    else if (fB0 >= (F)0.0)
-                    {
-                        fS = (F)0.0;
-                        fSqrDist = fC;
-                    }
-                    else
-                    {
-                        fS = -fB0 / fA00;
-                        fSqrDist = fB0 * fS + fC;
-                    }
-                }
-            }
-            else // region 1
-            {
-                fNumer = fA11 + fB1 - fA01 - fB0;
-                if (fNumer <= (F)0.0)
-                {
-                    fS = (F)0.0;
-                    fT = (F)1.0;
-                    fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                }
-                else
-                {
-                    fDenom = fA00 - 2.0f * fA01 + fA11;
-                    if (fNumer >= fDenom)
-                    {
-                        fS = (F)1.0;
-                        fT = (F)0.0;
-                        fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                    }
-                    else
-                    {
-                        fS = fNumer / fDenom;
-                        fT = (F)1.0 - fS;
-                        fSqrDist = fS * (fA00 * fS + fA01 * fT + ((F)2.0) * fB0) +
-                            fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
-                    }
-                }
-            }
-        }
-
-        if (pT0)
-        {
-            *pT0 = fS;
-        }
-
-        if (pT1)
-        {
-            *pT1 = fT;
-        }
-
-        return abs(fSqrDist);
-    }
-
-    // Description:
-    //  Distance from point to triangle, optionally returning the triangle position in
-    //  parameteric form.
-    template<typename F>
-    ILINE F Point_Triangle(const Vec3_tpl<F>& point, const Triangle_tpl<F>& triangle, F* pT0, F* pT1)
-    {
-        return sqrt_tpl(Point_TriangleSq(point, triangle, pT0, pT1));
-    }
-
-    //----------------------------------------------------------------------------------
-    /// Returns squared distance from a point to a line segment and also the "t value" (from 0 to 1) of the
-    /// closest point on the line segment
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE F Point_LinesegSq(const Vec3_tpl<F>& p, const Lineseg& lineseg, F& fT)
-    {
-        Vec3_tpl<F> diff = p - lineseg.start;
-        Vec3_tpl<F> dir = lineseg.end - lineseg.start;
-        fT = diff.Dot(dir);
-
-        if (fT <= 0.0f)
-        {
-            fT = 0.0f;
-        }
-        else
-        {
-            F fSqrLen = dir.GetLengthSquared();
-            if (fT >= fSqrLen)
-            {
-                fT = 1.0f;
-                diff -= dir;
-            }
-            else
-            {
-                fT /= fSqrLen;
-                diff -= fT * dir;
-            }
-        }
-
-        return diff.GetLengthSquared();
-    }
-
-    /// Returns distance from a point to a line segment and also the "t value" (from 0 to 1) of the
-    /// closest point on the line segment
-    template<typename F>
-    ILINE F Point_Lineseg(const Vec3_tpl<F>& p, const Lineseg& lineseg, F& fT)
-    {
-        return sqrt_tpl(Point_LinesegSq(p, lineseg, fT));
-    }
-
-
-    //----------------------------------------------------------------------------------
-    /// Returns squared distance from a point to a line segment, ignoring the z coordinates
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE F Point_Lineseg2DSq(const Vec3_tpl<F>& p, const Lineseg& lineseg)
-    {
-        F dspx = p.x - lineseg.start.x, dspy = p.y - lineseg.start.y;
-        F dsex = lineseg.end.x - lineseg.start.x, dsey = lineseg.end.y - lineseg.start.y;
-
-        F denom = (dsex * dsex + dsey * dsey);
-        F t;
-        if (denom > 1e-7)
-        {
-            t = (F)(dspx * dsex + dspy * dsey) / denom;
-            t = clamp_tpl(t, 0.0f, 1.0f);
-        }
-        else
-        {
-            t = 0;
-        }
-
-        F dx = dsex * t - dspx;
-        F dy = dsey * t - dspy;
-
-        return dx * dx + dy * dy;
-    }
-
-    //----------------------------------------------------------------------------------
-    /// Returns squared distance from a point to a line segment and also the "t value" (from 0 to 1) of the
-    /// closest point on the line segment, ignoring the z coordinates
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE F Point_Lineseg2DSq(Vec3_tpl<F> p, Lineseg lineseg, F& fT)
-    {
-        p.z = 0.0f;
-        lineseg.start.z = 0.0f;
-        lineseg.end.z = 0.0f;
-        return Point_LinesegSq(p, lineseg, fT);
-    }
-
-    /// Returns distance from a point to a line segment, ignoring the z coordinates
-    template<typename F>
-    ILINE F Point_Lineseg2D(const Vec3_tpl<F>& p, const Lineseg& lineseg, F& fT)
-    {
-        return sqrt_tpl(Point_Lineseg2DSq(p, lineseg, fT));
-    }
-
-    /// Returns the squared distance from a point to a line as defined by two points (for accuracy
-    /// in some situations), and also the closest position on the line
-    template<typename F>
-    ILINE F Point_LineSq(const Vec3_tpl<F>& vPoint,
-        const Vec3_tpl<F>& vLineStart, const Vec3_tpl<F>& vLineEnd, Vec3_tpl<F>& linePt)
-    {
-        Vec3_tpl<F> dir;
-        Vec3_tpl<F> pointVector;
-
-        if ((vPoint - vLineStart).GetLengthSquared() > (vPoint - vLineEnd).GetLengthSquared())
-        {
-            dir = vLineStart - vLineEnd;
-            pointVector = vPoint - vLineEnd;
-            linePt = vLineEnd;
-        }
-        else
-        {
-            dir = vLineEnd - vLineStart;
-            pointVector = vPoint - vLineStart;
-            linePt = vLineStart;
-        }
-
-        F dirLen2 = dir.GetLengthSquared();
-        if (dirLen2 <= 0.0f)
-        {
-            return pointVector.GetLengthSquared();
-        }
-        dir /= sqrt_tpl(dirLen2);
-
-        F t0 = pointVector.Dot(dir);
-        linePt += t0 * dir;
-        return (vPoint - linePt).GetLengthSquared();
-    }
-
-    /// Returns the distance from a point to a line as defined by two points (for accuracy
-    /// in some situations)
-    template<typename F>
-    ILINE F Point_Line(const Vec3_tpl<F>& vPoint,
-        const Vec3_tpl<F>& vLineStart, const Vec3_tpl<F>& vLineEnd, Vec3_tpl<F>& linePt)
-    {
-        return sqrt_tpl(Point_LineSq(vPoint, vLineStart, vLineEnd, linePt));
-    }
-
-    /// In 2D. The returned linePt will have 0 z value
-    template<typename F>
-    ILINE F Point_Line2DSq(Vec3_tpl<F> vPoint,
-        Vec3_tpl<F> vLineStart, Vec3_tpl<F> vLineEnd, Vec3_tpl<F>& linePt)
-    {
-        vPoint.z = 0.0f;
-        vLineStart.z = 0.0f;
-        vLineEnd.z = 0.0f;
-        return Point_LineSq(vPoint, vLineStart, vLineEnd, linePt);
-    }
-
-    /// In 2D. The returned linePt will have 0 z value
-    template<typename F>
-    ILINE F Point_Line2D(const Vec3_tpl<F>& vPoint,
-        const Vec3_tpl<F>& vLineStart, const Vec3_tpl<F>& vLineEnd, Vec3_tpl<F>& linePt)
-    {
-        return sqrt_tpl(Point_Line2DSq(vPoint, vLineStart, vLineEnd, linePt));
-    }
-
-
-    /// Returns squared distance from a point to a polygon _edge_, together with the closest point on
-    /// the edge of the polygon. Can use the same point in/out
-    template<typename F, typename VecContainer>
-    inline F Point_Polygon2DSq(const Vec3_tpl<F> p, const VecContainer& polygon, Vec3_tpl<F>& polyPos, Vec3_tpl<F>* pNormal = NULL)
-    {
-        typename VecContainer::const_iterator li = polygon.begin();
-        typename VecContainer::const_iterator liend = polygon.end();
-        polyPos.x = polyPos.y = polyPos.z = 0.f;
-        float bestDist = std::numeric_limits<F>::max();
-        for (; li != liend; ++li)
-        {
-            typename VecContainer::const_iterator linext = li;
-            ++linext;
-            if (linext == liend)
-            {
-                linext = polygon.begin();
-            }
-            const Vec3_tpl<F>& l0 = *li;
-            const Vec3_tpl<F>& l1 = *linext;
-
-            float f;
-            float thisDist = Distance::Point_Lineseg2DSq<F>(p, Lineseg(l0, l1), f);
-            if (thisDist < bestDist)
-            {
-                bestDist = thisDist;
-                polyPos = l0 + f * (l1 - l0);
-                if (pNormal)
-                {
-                    Vec3_tpl<F> vPolyseg = l1  - l0;
-                    Vec3_tpl<F> vIntSeg = (polyPos - p);
-                    pNormal->x = vPolyseg.y;
-                    pNormal->y = -vPolyseg.x;
-                    pNormal->z = 0;
-                    pNormal->NormalizeSafe();
-                    // returns the normal towards the start point of the intersecting segment
-                    if ((vIntSeg.Dot(*pNormal)) > 0)
-                    {
-                        pNormal->x = -pNormal->x;
-                        pNormal->y = -pNormal->y;
-                    }
-                }
-            }
-        }
-        return bestDist;
-    }
-
-    //----------------------------------------------------------------------------------
-    /// Calculate squared distance between two line segments
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE F Lineseg_Lineseg2DSq(const Lineseg& seg0, const Lineseg& seg1)
-    {
-        const F Epsilon = (F)0.0000001;
-
-        Vec3_tpl<F> delta = seg1.start - seg0.start;
-
-        Vec3_tpl<F> dir0 = seg0.end - seg0.start;
-        Vec3_tpl<F> dir1 = seg1.end - seg1.start;
-
-        F det = dir0.x * dir1.y - dir0.y * dir1.x;
-        F det0 = delta.x * dir1.y - delta.y * dir1.x;
-        F det1 = delta.x * dir0.y - delta.y * dir0.x;
-
-        F absDet = fabs_tpl(det);
-
-        if (absDet >= Epsilon)
-        {
-            F invDet = (F)1.0 / det;
-
-            F a = det0 * invDet;
-            F b = det1 * invDet;
-
-            if ((a <= (F)1.0) && (a >= (F)0.0) && (b <= (F)1.0) && (b >= (F)0.0))
-            {
-                return (F)0.0;
-            }
-        }
-
-        return min(Distance::Point_Lineseg2DSq(seg0.start, seg1), min(Distance::Point_Lineseg2DSq(seg0.end, seg1),
-                min(Distance::Point_Lineseg2DSq(seg1.start, seg0), Distance::Point_Lineseg2DSq(seg1.end, seg0))));
-    }
-
-    /// Returns squared distance from a lineseg to a polygon, together with the closest point on
-    /// the edge of the polygon. Can use the same point in/out
-    template<typename VecContainer>
-    inline float Lineseg_Polygon2DSq(const Lineseg& line, const VecContainer& polygon)
-    {
-        typename VecContainer::const_iterator li = polygon.begin();
-        typename VecContainer::const_iterator liend = polygon.end();
-
-        float bestDistSq = std::numeric_limits<float>::max();
-        for (; li != liend; ++li)
-        {
-            typename VecContainer::const_iterator linext = li;
-            ++linext;
-            if (linext == liend)
-            {
-                linext = polygon.begin();
-            }
-
-            float thisDistSq = Distance::Lineseg_Lineseg2DSq<float>(line, Lineseg(*li, *linext));
-            if (thisDistSq < bestDistSq)
-            {
-                bestDistSq = thisDistSq;
-            }
-        }
-
-        return bestDistSq;
-    }
-
-    /// Returns distance from a point to a polygon _edge_, together with the closest point on
-    /// the edge of the polygon
-    template<typename F, typename VecContainer>
-    inline F Point_Polygon2D(const Vec3_tpl<F> p, const VecContainer& polygon, Vec3_tpl<F>& polyPos, Vec3_tpl<F>* pNormal = NULL)
-    {
-        return sqrt_tpl(Point_Polygon2DSq(p, polygon, polyPos, pNormal));
-    }
-
-
-    //! \brief Get the distance squared from a point to an OBB.
-    //! \param point Vec3 indicating the point to test
-    //! \param obb OBB indicating the Obb to test
-    //! \return float Closest distance squared from the point to the obb.
-    template <typename F>
-    AZ_INLINE F Point_OBBSq(const Vec3_tpl<F>& point, const OBB& obb)
-    {
-        F distanceSquared = 0;
-        const Vec3 v = point - obb.c; // box center to point
-        for (int i = 0; i < 3; ++i)
-        {
-            F d = v.Dot(obb.m33.GetColumn(i));
-            F ex = 0;
-            F halfLength = obb.h[i];
-            if (d < -halfLength)
-            {
-                ex = d + halfLength;
-            }
-            else if (d > halfLength)
-            {
-                ex = d - halfLength;
-            }
-            distanceSquared += sqr(ex);
-        }
-
-        return distanceSquared;
-    }
-
-    //! \brief Get the distance squared from a Point to a Cylinder.
-    //! \param point AZ::Vector3 The point to test distance against the cylinder
-    //! \param cylinderAxisEndA AZ::Vector3 One end of the cylinder axis (centered in the circle)
-    //! \param cylinderAxisEndB AZ::Vector3 Other end of the cylinder axis (centered in the circle)
-    //! \param radius float Radius of the cylinder
-    //! \return float Closest distance squared from the point to the cylinder.
-    AZ_INLINE float Point_CylinderSq(
-        const AZ::Vector3& point,
-        const AZ::Vector3& cylinderAxisEndA,
-        const AZ::Vector3& cylinderAxisEndB,
-        float radius
-        )
-    {
-        // Use the cylinder axis' center point to determine distance by
-        // splitting into Voronoi regions and using symmetry.
-        // The regions are:
-        // - Inside
-        // - Beyond cylinder radius but between two disc ends.
-        // - Within cylinder radius but beyond two disc ends.
-        // - Beyond cylinder radius and beyond two disc ends.
-
-        const AZ::Vector3 cylinderAxis = cylinderAxisEndB - cylinderAxisEndA;
-        float halfLength = cylinderAxis.GetLength() * 0.5f;
-        const AZ::Vector3 cylinderAxisUnit = cylinderAxis.GetNormalized();
-
-        // get the center of the axis and the vector from center to the test point
-        const AZ::Vector3 centerPoint = (cylinderAxis * 0.5) + cylinderAxisEndA;
-        const AZ::Vector3 pointToCenter = point - centerPoint;
-
-        // distance point is from center (projected onto axis)
-        // the abs here takes advantage of symmetry.
-        float x = fabsf(pointToCenter.Dot(cylinderAxisUnit));
-
-        // squared distance from point to center (hypotenuse)
-        float n2 = pointToCenter.GetLengthSq();
-
-        // squared distance from point to center perpendicular to axis (pythagorean)
-        float y2 = n2 - sqr(x);
-
-        float distanceSquared = 0.f;
-
-        if (x < halfLength) // point is between the two ends
-        {
-            if (y2 > sqr(radius))   // point is outside of radius
-            {
-                distanceSquared = sqr(sqrtf(y2) - radius);
-            }
-            // else point is inside cylinder, distance is zero.
-        }
-        else if (y2 < sqr(radius))
-        {
-            // point is within radius
-            // point projects into a disc at either end, grab the "parallel" distance only
-            distanceSquared = sqr(x - halfLength);
-        }
-        else
-        {
-            // point is outside of radius
-            // point projects onto the edge of the disc, grab distance in two directions,
-            // combine "parallel" and "perpendicular" distances.
-            distanceSquared = sqr(sqrtf(y2) - radius) + sqr(x - halfLength);
-        }
-
-        return distanceSquared;
-    }
-
-    //----------------------------------------------------------------------------------
-    // Distance: Point_AABB
-    //----------------------------------------------------------------------------------
-    // Calculate the closest distance of a point to a AABB in 3d-space.
-    // The function returns the squared distance.
-    // optionally the closest point on the hull is calculated
-    //
-    // Example:
-    //  float result = Distance::Point_AABBSq( pos, aabb );
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE F Point_AABBSq(const Vec3_tpl<F>& vPoint, const AABB& aabb)
-    {
-        F fDist2 = 0;
-
-        F min0Diff = (F)aabb.min[0] - (F)vPoint[0];
-        fDist2 = (F)fsel(min0Diff, fDist2 + sqr(min0Diff), fDist2);
-        F max0Diff = (F)vPoint[0] - (F)aabb.max[0];
-        fDist2 = (F)fsel(max0Diff, fDist2 + sqr(max0Diff), fDist2);
-
-        F min1Diff = (F)aabb.min[1] - (F)vPoint[1];
-        fDist2 = (F)fsel(min1Diff, fDist2 + sqr(min1Diff), fDist2);
-        F max1Diff = (F)vPoint[1] - (F)aabb.max[1];
-        fDist2 = (F)fsel(max1Diff, fDist2 + sqr(max1Diff), fDist2);
-
-        F min2Diff = (F)aabb.min[2] - (F)vPoint[2];
-        fDist2 = (F)fsel(min2Diff, fDist2 + sqr(min2Diff), fDist2);
-        F max2Diff = (F)vPoint[2] - (F)aabb.max[2];
-        fDist2 = (F)fsel(max2Diff, fDist2 + sqr(max2Diff), fDist2);
-
-        return fDist2;
-    }
-
-    template<typename F>
-    ILINE F Point_AABBSq(const Vec3_tpl<F>& vPoint, const AABB& aabb, Vec3_tpl<F>& vClosest)
-    {
-        F fDist2 = Point_AABBSq(vPoint, aabb);
-
-        vClosest = vPoint;
-        if (!iszero(fDist2))
-        {
-            // vPoint is outside the AABB
-            vClosest.x = max(vClosest.x, aabb.min.x);
-            vClosest.x = min(vClosest.x, aabb.max.x);
-            vClosest.y = max(vClosest.y, aabb.min.y);
-            vClosest.y = min(vClosest.y, aabb.max.y);
-            vClosest.z = max(vClosest.z, aabb.min.z);
-            vClosest.z = min(vClosest.z, aabb.max.z);
-        }
-        else
-        {
-            // vPoint is inside the AABB
-            uint16 nSubBox = 0;
-            F fHalf = 2;
-
-            F fMiddleX = ((aabb.max.x - aabb.min.x) / fHalf) + aabb.min.x;
-            F fMiddleY = ((aabb.max.y - aabb.min.y) / fHalf) + aabb.min.y;
-            F fMiddleZ = ((aabb.max.z - aabb.min.z) / fHalf) + aabb.min.z;
-
-            if (vPoint.x < fMiddleX)
-            {
-                nSubBox |= 0x001; // Is Left
-            }
-            if (vPoint.y < fMiddleY)
-            {
-                nSubBox |= 0x010; // Is Rear
-            }
-            if (vPoint.z < fMiddleZ)
-            {
-                nSubBox |= 0x100; // Is Low
-            }
-            F fDistanceToX = 0;
-            F fDistanceToY = 0;
-            F fDistanceToZ = 0;
-
-            F fNewX, fNewY, fNewZ;
-
-            switch (nSubBox & 0xFFF)
-            {
-            case 0x000:
-                // Is Right/Front/Top
-                fDistanceToX = aabb.max.x - vPoint.x;
-                fDistanceToY = aabb.max.y - vPoint.y;
-                fDistanceToZ = aabb.max.z - vPoint.z;
-
-                fNewX = aabb.max.x;
-                fNewY = aabb.max.y;
-                fNewZ = aabb.max.z;
-
-                break;
-            case 0x001:
-                // Is Left/Front/Top
-                fDistanceToX = vPoint.x - aabb.min.x;
-                fDistanceToY = aabb.max.y - vPoint.y;
-                fDistanceToZ = aabb.max.z - vPoint.z;
-
-                fNewX = aabb.min.x;
-                fNewY = aabb.max.y;
-                fNewZ = aabb.max.z;
-
-                break;
-            case 0x010:
-                // Is Right/Rear/Top
-                fDistanceToX = aabb.max.x - vPoint.x;
-                fDistanceToY = vPoint.y - aabb.min.y;
-                fDistanceToZ = aabb.max.z - vPoint.z;
-
-                fNewX = aabb.max.x;
-                fNewY = aabb.min.y;
-                fNewZ = aabb.max.z;
-
-                break;
-            case 0x011:
-                // Is Left/Rear/Top
-                fDistanceToX = vPoint.x - aabb.min.x;
-                fDistanceToY = vPoint.y - aabb.min.y;
-                fDistanceToZ = aabb.max.z - vPoint.z;
-
-                fNewX = aabb.min.x;
-                fNewY = aabb.min.y;
-                fNewZ = aabb.max.z;
-
-                break;
-            case 0x100:
-                // Is Right/Front/Low
-                fDistanceToX = aabb.max.x - vPoint.x;
-                fDistanceToY = aabb.max.y - vPoint.y;
-                fDistanceToZ = vPoint.z - aabb.min.z;
-
-                fNewX = aabb.max.x;
-                fNewY = aabb.max.y;
-                fNewZ = aabb.min.z;
-
-                break;
-            case 0x101:
-                // Is Left/Front/Low
-                fDistanceToX = vPoint.x - aabb.min.x;
-                fDistanceToY = aabb.max.y - vPoint.y;
-                fDistanceToZ = vPoint.z - aabb.min.z;
-
-                fNewX = aabb.min.x;
-                fNewY = aabb.max.y;
-                fNewZ = aabb.min.z;
-
-                break;
-            case 0x110:
-                // Is Right/Rear/Low
-                fDistanceToX = aabb.max.x - vPoint.x;
-                fDistanceToY = vPoint.y - aabb.min.y;
-                fDistanceToZ = vPoint.z - aabb.min.z;
-
-                fNewX = aabb.max.x;
-                fNewY = aabb.min.y;
-                fNewZ = aabb.min.z;
-
-                break;
-            case 0x111:
-                // Is Left/Rear/Low
-                fDistanceToX = vPoint.x - aabb.min.x;
-                fDistanceToY = vPoint.y - aabb.min.y;
-                fDistanceToZ = vPoint.z - aabb.min.z;
-
-                fNewX = aabb.min.x;
-                fNewY = aabb.min.y;
-                fNewZ = aabb.min.z;
-
-                break;
-            default:
-                fNewX = fNewY = fNewZ = 0;
-                break;
-            }
-
-            if (fDistanceToX < fDistanceToY && fDistanceToX < fDistanceToZ)
-            {
-                vClosest.x = fNewX;
-            }
-
-            if (fDistanceToY < fDistanceToX && fDistanceToY < fDistanceToZ)
-            {
-                vClosest.y = fNewY;
-            }
-
-            if (fDistanceToZ < fDistanceToX && fDistanceToZ < fDistanceToY)
-            {
-                vClosest.z = fNewZ;
-            }
-
-            fDist2 = vClosest.GetSquaredDistance(vPoint);
-        }
-        return fDist2;
-    }
-
-    //----------------------------------------------------------------------------------
-    // Distance: Sphere_Triangle
-    //----------------------------------------------------------------------------------
-    // Calculate the closest distance of a sphere to a triangle in 3d-space.
-    // The function returns the squared distance. If sphere and triangle overlaps,
-    // the returned distance is 0
-    //
-    // Example:
-    //  float result = Distance::Point_TriangleSq( pos, triangle );
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE F Sphere_TriangleSq(const ::Sphere& s, const Triangle_tpl<F>& t)
-    {
-        F sqdistance =  Distance::Point_TriangleSq(s.center, t) - (s.radius * s.radius);
-        if (sqdistance < 0)
-        {
-            sqdistance = 0;
-        }
-        return sqdistance;
-    }
-
-    template<typename F>
-    ILINE F Sphere_TriangleSq(const ::Sphere& s, const Triangle_tpl<F>& t, Vec3_tpl<F>& output)
-    {
-        F sqdistance =  Distance::Point_TriangleSq(s.center, t, output) - (s.radius * s.radius);
-        if (sqdistance < 0)
-        {
-            sqdistance = 0;
-        }
-        return sqdistance;
-    }
-
-    //----------------------------------------------------------------------------------
-    /// Calculate squared distance between two line segments, along with the optional
-    /// parameters of the closest points
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE F Lineseg_LinesegSq(const Lineseg& seg0, const Lineseg seg1, F* t0, F* t1)
-    {
-        Vec3 diff = seg0.start - seg1.start;
-        Vec3 delta0 = seg0.end - seg0.start;
-        Vec3 delta1 = seg1.end - seg1.start;
-        F fA00 = delta0.GetLengthSquared();
-        F fA01 = -delta0.Dot(delta1);
-        F fA11 = delta1.GetLengthSquared();
-        F fB0 = diff.Dot(delta0);
-        F fC = diff.GetLengthSquared();
-        F fDet = abs(fA00 * fA11 - fA01 * fA01);
-        F fB1, fS, fT, fSqrDist, fTmp;
-
-        if (fDet > (F) 0.0)
-        {
-            // line segments are not parallel
-            fB1 = -diff.Dot(delta1);
-            fS = fA01 * fB1 - fA11 * fB0;
-            fT = fA01 * fB0 - fA00 * fB1;
-
-            if (fS >= (F)0.0)
-            {
-                if (fS <= fDet)
-                {
-                    if (fT >= (F)0.0)
-                    {
-                        if (fT <= fDet) // region 0 (interior)
-                        {
-                            // minimum at two interior points of 3D lines
-                            F fInvDet = ((F)1.0) / fDet;
-                            fS *= fInvDet;
-                            fT *= fInvDet;
-                            fSqrDist = fS * (fA00 * fS + fA01 * fT + ((F)2.0) * fB0) +
-                                fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
-                        }
-                        else // region 3 (side)
-                        {
-                            fT = (F)1.0;
-                            fTmp = fA01 + fB0;
-                            if (fTmp >= (F)0.0)
-                            {
-                                fS = (F)0.0;
-                                fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                            }
-                            else if (-fTmp >= fA00)
-                            {
-                                fS = (F)1.0;
-                                fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fB1 + fTmp);
-                            }
-                            else
-                            {
-                                fS = -fTmp / fA00;
-                                fSqrDist = fTmp * fS + fA11 + ((F)2.0) * fB1 + fC;
-                            }
-                        }
-                    }
-                    else // region 7 (side)
-                    {
-                        fT = (F)0.0;
-                        if (fB0 >= (F)0.0)
-                        {
-                            fS = (F)0.0;
-                            fSqrDist = fC;
-                        }
-                        else if (-fB0 >= fA00)
-                        {
-                            fS = (F)1.0;
-                            fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                        }
-                        else
-                        {
-                            fS = -fB0 / fA00;
-                            fSqrDist = fB0 * fS + fC;
-                        }
-                    }
-                }
-                else
-                {
-                    if (fT >= (F)0.0)
-                    {
-                        if (fT <= fDet) // region 1 (side)
-                        {
-                            fS = (F)1.0;
-                            fTmp = fA01 + fB1;
-                            if (fTmp >= (F)0.0)
-                            {
-                                fT = (F)0.0;
-                                fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                            }
-                            else if (-fTmp >= fA11)
-                            {
-                                fT = (F)1.0;
-                                fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fB0 + fTmp);
-                            }
-                            else
-                            {
-                                fT = -fTmp / fA11;
-                                fSqrDist = fTmp * fT + fA00 + ((F)2.0) * fB0 + fC;
-                            }
-                        }
-                        else // region 2 (corner)
-                        {
-                            fTmp = fA01 + fB0;
-                            if (-fTmp <= fA00)
-                            {
-                                fT = (F)1.0;
-                                if (fTmp >= (F)0.0)
-                                {
-                                    fS = (F)0.0;
-                                    fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                                }
-                                else
-                                {
-                                    fS = -fTmp / fA00;
-                                    fSqrDist = fTmp * fS + fA11 + ((F)2.0) * fB1 + fC;
-                                }
-                            }
-                            else
-                            {
-                                fS = (F)1.0;
-                                fTmp = fA01 + fB1;
-                                if (fTmp >= (F)0.0)
-                                {
-                                    fT = (F)0.0;
-                                    fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                                }
-                                else if (-fTmp >= fA11)
-                                {
-                                    fT = (F)1.0;
-                                    fSqrDist = fA00 + fA11 + fC +
-                                        ((F)2.0) * (fB0 + fTmp);
-                                }
-                                else
-                                {
-                                    fT = -fTmp / fA11;
-                                    fSqrDist = fTmp * fT + fA00 + ((F)2.0) * fB0 + fC;
-                                }
-                            }
-                        }
-                    }
-                    else // region 8 (corner)
-                    {
-                        if (-fB0 < fA00)
-                        {
-                            fT = (F)0.0;
-                            if (fB0 >= (F)0.0)
-                            {
-                                fS = (F)0.0;
-                                fSqrDist = fC;
-                            }
-                            else
-                            {
-                                fS = -fB0 / fA00;
-                                fSqrDist = fB0 * fS + fC;
-                            }
-                        }
-                        else
-                        {
-                            fS = (F)1.0;
-                            fTmp = fA01 + fB1;
-                            if (fTmp >= (F)0.0)
-                            {
-                                fT = (F)0.0;
-                                fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                            }
-                            else if (-fTmp >= fA11)
-                            {
-                                fT = (F)1.0;
-                                fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fB0 + fTmp);
-                            }
-                            else
-                            {
-                                fT = -fTmp / fA11;
-                                fSqrDist = fTmp * fT + fA00 + ((F)2.0) * fB0 + fC;
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                if (fT >= (F)0.0)
-                {
-                    if (fT <= fDet) // region 5 (side)
-                    {
-                        fS = (F)0.0;
-                        if (fB1 >= (F)0.0)
-                        {
-                            fT = (F)0.0;
-                            fSqrDist = fC;
-                        }
-                        else if (-fB1 >= fA11)
-                        {
-                            fT = (F)1.0;
-                            fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                        }
-                        else
-                        {
-                            fT = -fB1 / fA11;
-                            fSqrDist = fB1 * fT + fC;
-                        }
-                    }
-                    else // region 4 (corner)
-                    {
-                        fTmp = fA01 + fB0;
-                        if (fTmp < (F)0.0)
-                        {
-                            fT = (F)1.0;
-                            if (-fTmp >= fA00)
-                            {
-                                fS = (F)1.0;
-                                fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fB1 + fTmp);
-                            }
-                            else
-                            {
-                                fS = -fTmp / fA00;
-                                fSqrDist = fTmp * fS + fA11 + ((F)2.0) * fB1 + fC;
-                            }
-                        }
-                        else
-                        {
-                            fS = (F)0.0;
-                            if (fB1 >= (F)0.0)
-                            {
-                                fT = (F)0.0;
-                                fSqrDist = fC;
-                            }
-                            else if (-fB1 >= fA11)
-                            {
-                                fT = (F)1.0;
-                                fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                            }
-                            else
-                            {
-                                fT = -fB1 / fA11;
-                                fSqrDist = fB1 * fT + fC;
-                            }
-                        }
-                    }
-                }
-                else // region 6 (corner)
-                {
-                    if (fB0 < (F)0.0)
-                    {
-                        fT = (F)0.0;
-                        if (-fB0 >= fA00)
-                        {
-                            fS = (F)1.0;
-                            fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                        }
-                        else
-                        {
-                            fS = -fB0 / fA00;
-                            fSqrDist = fB0 * fS + fC;
-                        }
-                    }
-                    else
-                    {
-                        fS = (F)0.0;
-                        if (fB1 >= (F)0.0)
-                        {
-                            fT = (F)0.0;
-                            fSqrDist = fC;
-                        }
-                        else if (-fB1 >= fA11)
-                        {
-                            fT = (F)1.0;
-                            fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                        }
-                        else
-                        {
-                            fT = -fB1 / fA11;
-                            fSqrDist = fB1 * fT + fC;
-                        }
-                    }
-                }
-            }
-        }
-        else
-        {
-            // line segments are parallel
-            if (fA01 > (F)0.0)
-            {
-                // direction vectors form an obtuse angle
-                if (fB0 >= (F)0.0)
-                {
-                    fS = (F)0.0;
-                    fT = (F)0.0;
-                    fSqrDist = fC;
-                }
-                else if (-fB0 <= fA00)
-                {
-                    fS = -fB0 / fA00;
-                    fT = (F)0.0;
-                    fSqrDist = fB0 * fS + fC;
-                }
-                else
-                {
-                    fB1 = -diff.Dot(delta1);
-                    fS = (F)1.0;
-                    fTmp = fA00 + fB0;
-                    if (-fTmp >= fA01)
-                    {
-                        fT = (F)1.0;
-                        fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fA01 + fB0 + fB1);
-                    }
-                    else
-                    {
-                        fT = -fTmp / fA01;
-                        fSqrDist = fA00 + ((F)2.0) * fB0 + fC + fT * (fA11 * fT +
-                                                                      ((F)2.0) * (fA01 + fB1));
-                    }
-                }
-            }
-            else
-            {
-                // direction vectors form an acute angle
-                if (-fB0 >= fA00)
-                {
-                    fS = (F)1.0;
-                    fT = (F)0.0;
-                    fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
-                }
-                else if (fB0 <= (F)0.0)
-                {
-                    fS = -fB0 / fA00;
-                    fT = (F)0.0;
-                    fSqrDist = fB0 * fS + fC;
-                }
-                else
-                {
-                    fB1 = -diff.Dot(delta1);
-                    fS = (F)0.0;
-                    if (fB0 >= -fA01)
-                    {
-                        fT = (F)1.0;
-                        fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
-                    }
-                    else
-                    {
-                        fT = -fB0 / fA01;
-                        fSqrDist = fC + fT * (((F)2.0) * fB1 + fA11 * fT);
-                    }
-                }
-            }
-        }
-
-        if (t0)
-        {
-            *t0 = fS;
-        }
-
-        if (t1)
-        {
-            *t1 = fT;
-        }
-
-        return abs(fSqrDist);
-    }
-
-    /// Calculate distance between two line segments, along with the optional
-    /// parameters of the closest points
-    template<typename F>
-    ILINE F Lineseg_Lineseg(const Lineseg& seg0, const Lineseg seg1, F* s, F* t)
-    {
-        return sqrt_tpl(Lineseg_LinesegSq(seg0, seg1, s, t));
-    }
-
-    //----------------------------------------------------------------------------------
-    /// Squared distance from line segment to triangle. Optionally returns the parameters
-    /// describing the closest points
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE F Lineseg_TriangleSq(const Lineseg_tpl<F>& seg, const Triangle_tpl<F>& triangle,
-        F* segT, F* triT0, F* triT1)
-    {
-        Vec3_tpl<F> intersection;
-        if (Intersect::Lineseg_Triangle(seg, triangle.v0, triangle.v1, triangle.v2, intersection, segT))
-        {
-            if (triT0 || triT1)
-            {
-                const Vec3_tpl<F> v0v1 = triangle.v1  - triangle.v0;
-                Lineseg_tpl<F> projPtOnV0V2(intersection, intersection - v0v1);
-                Lineseg_tpl<F> v0v2(triangle.v0, triangle.v2);
-                Lineseg_LinesegSq(projPtOnV0V2, v0v2, triT0, triT1);
-            }
-            return 0.0f;
-        }
-
-        // compare segment to all three edges of the triangle
-        F s, t, u;
-        F distEdgeSq = Distance::Lineseg_LinesegSq(seg, Lineseg(triangle.v0, triangle.v1), &s, &t);
-        F distSq = distEdgeSq;
-        if (segT)
-        {
-            *segT = s;
-        }
-        if (triT0)
-        {
-            *triT0 = t;
-        }
-        if (triT1)
-        {
-            *triT1 = 0.0f;
-        }
-
-        distEdgeSq = Distance::Lineseg_LinesegSq(seg, Lineseg(triangle.v0, triangle.v2), &s, &t);
-        if (distEdgeSq < distSq)
-        {
-            distSq = distEdgeSq;
-            if (segT)
-            {
-                *segT = s;
-            }
-            if (triT0)
-            {
-                *triT0 = 0.0f;
-            }
-            if (triT1)
-            {
-                *triT1 = t;
-            }
-        }
-        distEdgeSq = Distance::Lineseg_LinesegSq(seg, Lineseg(triangle.v1, triangle.v2), &s, &t);
-        if (distEdgeSq < distSq)
-        {
-            distSq = distEdgeSq;
-            if (segT)
-            {
-                *segT = s;
-            }
-            if (triT0)
-            {
-                *triT0 = 1.0f - t;
-            }
-            if (triT1)
-            {
-                *triT1 = t;
-            }
-        }
-
-        // compare segment end points to triangle interior
-        F startTriSq = Distance::Point_TriangleSq(seg.start, triangle, &t, &u);
-        if (startTriSq < distSq)
-        {
-            distSq = startTriSq;
-            if (segT)
-            {
-                *segT = 0.0f;
-            }
-            if (triT0)
-            {
-                *triT0 = t;
-            }
-            if (triT1)
-            {
-                *triT1 = u;
-            }
-        }
-        F endTriSq = Distance::Point_TriangleSq(seg.end, triangle, &t, &u);
-        if (endTriSq < distSq)
-        {
-            distSq = endTriSq;
-            if (segT)
-            {
-                *segT = 1.0f;
-            }
-            if (triT0)
-            {
-                *triT0 = t;
-            }
-            if (triT1)
-            {
-                *triT1 = u;
-            }
-        }
-        return distSq;
-    }
-
-    /// Distance from line segment to triangle. Optionally returns the parameters
-    /// describing the closest points
-    template<typename F>
-    ILINE F Lineseg_Triangle(const Lineseg_tpl<F>& seg, const Triangle_tpl<F>& triangle,
-        F* segT, F* triT0, F* triT1)
-    {
-        return sqrt_tpl(Lineseg_TriangleSq(seg, triangle, segT, triT0, triT1));
-    }
-} //namespace Distance
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_GEODISTANCE_H
diff --git a/Code/CryEngine/CryCommon/Cry_GeoIntersect.h b/Code/CryEngine/CryCommon/Cry_GeoIntersect.h
deleted file mode 100644
index f3afba461f..0000000000
--- a/Code/CryEngine/CryCommon/Cry_GeoIntersect.h
+++ /dev/null
@@ -1,958 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common intersection-tests
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_GEOINTERSECT_H
-#define CRYINCLUDE_CRYCOMMON_CRY_GEOINTERSECT_H
-#pragma once
-
-
-#include <Cry_Geo.h>
-
-namespace Intersect {
-    inline bool Ray_Plane(const Ray& ray, const Plane_tpl<f32>& plane, Vec3& output, bool bSingleSidePlane = true)
-    {
-        float cosine    =   plane.n | ray.direction;
-
-        //REJECTION 1: if "line-direction" is perpendicular to "plane-normal", an intersection is not possible! That means ray is parallel
-        //             to the plane
-        //REJECTION 2: if bSingleSidePlane == true we deal with single-sided planes. That means
-        //             if "line-direction" is pointing in the same direction as "the plane-normal",
-        //             an intersection is not possible!
-        if ((cosine == 0.0f) ||                                     // normal is orthogonal to vector, cant intersect
-            (bSingleSidePlane && (cosine > 0.0f)))  // we are trying to find an intersection in the same direction as the plane normal
-        {
-            return false;
-        }
-
-        float numer     = plane.DistFromPlane(ray.origin);
-        float fLength   = -numer / cosine;
-        output              =   ray.origin + (ray.direction * fLength);
-        //skip, if cutting-point is "behind" ray.origin
-        if (fLength < 0.0f)
-        {
-            return false;
-        }
-
-        return true;        //intersection occurred
-    }
-
-    inline bool Line_Plane(const Line& line, const Plane_tpl<f32>& plane, Vec3& output, bool bSingleSidePlane = true)
-    {
-        float cosine        =   plane.n | line.direction;
-
-        //REJECTION 1: if "line-direction" is perpendicular to "plane-normal", an intersection is not possible! That means ray is parallel
-        //             to the plane
-        //REJECTION 2: if bSingleSidePlane == true we deal with single-sided planes. That means
-        //             if "line-direction" is pointing in the same direction as "the plane-normal",
-        //             an intersection is not possible!
-        if ((cosine == 0.0f) ||                                     // normal is orthogonal to vector, cant intersect
-            (bSingleSidePlane && (cosine > 0.0f)))  // we are trying to find an intersection in the same direction as the plane normal
-        {
-            return false;
-        }
-
-        //an intersection is possible: calculate the exact point!
-        float perpdist  = plane | line.pointonline;
-        float pd_c          =   -perpdist / cosine;
-        output                  =   line.pointonline + (line.direction * pd_c);
-
-        return true;        //intersection occurred
-    }
-
-    // Algorithm description:
-    // http://softsurfer.com/Archive/algorithm_0104/algorithm_0104B.htm#Line-Plane%20Intersection
-    template <typename T>
-    inline bool Segment_Plane(const Lineseg_tpl<T>& segment, const Plane_tpl<T>& plane, Vec3_tpl<T>& vOutput, bool bSingleSidePlane = true)
-    {
-        Vec3_tpl<T> vSegment                                = segment.end - segment.start;
-        T                       planeNormalDotSegment       =   plane.n | vSegment;
-
-        //REJECTION 1: if "line-direction" is perpendicular to "plane-normal", an intersection is not possible! That means ray is parallel
-        //             to the plane
-        //REJECTION 2: if bSingleSidePlane == true we deal with single-sided planes. That means
-        //             if "line-direction" is pointing in the same direction as "the plane-normal",
-        //             an intersection is not possible!
-        if ((planeNormalDotSegment == T(0)) ||                                   // normal is orthogonal to vector, cant intersect
-            (bSingleSidePlane && (planeNormalDotSegment > T(0))))  // we are trying to find an intersection in the same direction as the plane normal
-        {
-            return false;
-        }
-
-        // n Dot (segment.start - closest_point_in_plane) = 1 * DistFromPlane(segment.start) * cos(0) = DistFromPlane(segment.start)
-        T distanceToStart   = plane.DistFromPlane(segment.start);
-        T scale                     = -distanceToStart / planeNormalDotSegment;
-        vOutput                     =   segment.start + (vSegment * scale);
-
-        // skip, if segment start and ends in one side of the plane
-        if ((scale < T(0)) || (scale > T(1)))
-        {
-            return false;
-        }
-
-        return true;        //intersection occurred
-    }
-
-    /// Intersection between two line segments in 2D (ignoring z coordinate). The two parametric
-    /// values are set to between 0 and 1 if intersection occurs. If intersection does not occur
-    /// their values will indicate the parametric values for intersection of the lines extended
-    /// beyond the segment lengths. Parallel lines will result in a negative result, but the parametric
-    /// values will both be equal to 0.5
-    template<typename F>
-    inline bool Lineseg_Lineseg2D(const Lineseg_tpl<F>& lineA, const Lineseg_tpl<F>& lineB, F& outA, F& outB)
-    {
-        const F Epsilon = (F)0.0000001;
-
-        Vec3_tpl<F> delta = lineB.start - lineA.start;
-
-        Vec3_tpl<F> dirA = lineA.end - lineA.start;
-        Vec3_tpl<F> dirB = lineB.end - lineB.start;
-
-        F det = dirA.x * dirB.y - dirA.y * dirB.x;
-        F detA = delta.x * dirB.y - delta.y * dirB.x;
-        F detB = delta.x * dirA.y - delta.y * dirA.x;
-
-        F absDet = fabs_tpl(det);
-
-        if (absDet >= Epsilon)
-        {
-            F invDet = (F)1.0 / det;
-
-            F a = detA * invDet;
-            F b = detB * invDet;
-            outA = a;
-            outB = b;
-
-            if ((a > (F)1.0) || (a < (F)0.0) || (b > (F)1.0) || (b < (F)0.0))
-            {
-                return false;
-            }
-        }
-        else
-        {
-            outA = outB = (F)0.5;
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /// Calculates the intersection between a line segment and a polygon, in 2D (i.e.
-    /// ignoring z coordinate). The VecContainer should be a container of Vec3 such
-    /// that we can traverse it using iterators. intersectionPoint is set to the intersection
-    /// point or the end of the segment, if no intersection.
-    template<typename VecIterator>
-    inline bool Lineseg_Polygon2D(const Lineseg& lineseg, VecIterator polygonBegin, VecIterator polygonEnd, Vec3& intersectionPoint, Vec3* pNormal = NULL, bool bForceNormalOutwards = false)
-    {
-        intersectionPoint = lineseg.end;
-        bool gotIntersection = false;
-
-        float tmin = 1.0f;
-
-        VecIterator iend = polygonEnd;
-        VecIterator li, linext;
-        Lineseg intersectSegment;
-        for (li = polygonBegin; li != iend; ++li)
-        {
-            linext = li;
-            ++linext;
-            if (linext == iend)
-            {
-                linext = polygonBegin;
-            }
-            Lineseg segmentPoly(*li, *linext);
-            float s, t;
-            if (Intersect::Lineseg_Lineseg2D(lineseg, segmentPoly, s, t))
-            {
-                if (s < 0.00001f || s > 0.99999f || t < 0.00001f || t > 0.99999f)
-                {
-                    continue;
-                }
-                if (s < tmin)
-                {
-                    tmin = s;
-                    gotIntersection = true;
-                    intersectSegment = segmentPoly;
-                }
-            }
-        }
-
-        intersectionPoint = lineseg.start + tmin * (lineseg.end - lineseg.start);
-
-        if (pNormal && gotIntersection)
-        {
-            Vec3 vPolyseg = intersectSegment.end - intersectSegment.start;
-            Vec3 vIntSeg = (lineseg.end - lineseg.start);
-            pNormal->x = vPolyseg.y;
-            pNormal->y = -vPolyseg.x;
-            pNormal->z = 0;
-            pNormal->NormalizeSafe();
-            // returns the normal towards the start point of the intersecting segment (if it's not forced to be outwards)
-            if (!bForceNormalOutwards && vIntSeg.Dot(*pNormal) > 0)
-            {
-                pNormal->x = -pNormal->x;
-                pNormal->y = -pNormal->y;
-            }
-        }
-        return gotIntersection;
-    }
-
-    template<typename VecContainer>
-    inline bool Lineseg_Polygon2D(const Lineseg& lineseg, const VecContainer& polygon, Vec3& intersectionPoint, Vec3* pNormal = NULL, bool bForceNormalOutwards = false)
-    {
-        return Lineseg_Polygon2D(lineseg, polygon.begin(), polygon.end(), intersectionPoint, pNormal, bForceNormalOutwards);
-    }
-
-    /*
-    * calculates intersection between a line and a triangle.
-    * IMPORTANT: this is a single-sided intersection test. That means its not enough
-    * that the triangle and line overlap, its also important that the triangle
-    * is "visible" when you are looking along the line-direction.
-    *
-    * If you need a double-sided test, you'll have to call this function twice with
-    * reversed order of triangle vertices.
-    *
-    * return values
-    * if there is an intertection the functions return "true" and stores the
-    * 3d-intersection point in "output". if the function returns "false" the value in
-    * "output" is undefined
-    *
-    */
-    inline bool Line_Triangle(const Line& line, const Vec3& v0, const Vec3& v1, const Vec3& v2, Vec3& output)
-    {
-        const float Epsilon = 0.0000001f;
-
-        Vec3 edgeA = v1 - v0;
-        Vec3 edgeB = v2 - v0;
-
-        Vec3 dir = line.direction;
-
-        Vec3 p = dir.Cross(edgeA);
-        Vec3 t = line.pointonline - v0;
-        Vec3 q = t.Cross(edgeB);
-
-        float dot = edgeB.Dot(p);
-
-        float u = t.Dot(p);
-        float v = dir.Dot(q);
-
-        float DotGreaterThanEpsilon = dot - Epsilon;
-        float VGreaterEqualThanZero = v;
-        float UGreaterEqualThanZero = u;
-        float UVLessThanDot = dot - (u + v);
-        float ULessThanDot = dot - u;
-
-        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
-        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
-        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
-        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
-
-        if (AllGood < 0.0f)
-        {
-            return false;
-        }
-
-        float dt = edgeA.Dot(q) / dot;
-
-        Vec3 result = (dir * dt) + line.pointonline;
-        output = result;
-
-        return true;
-    }
-
-
-
-    /*
-    * calculates intersection between a ray and a triangle.
-    * IMPORTANT: this is a single-sided intersection test. That means its not sufficient
-    * that the triangle and rayt overlap, its also important that the triangle
-    * is "visible" when you from the origin along the ray-direction.
-    *
-    * If you need a double-sided test, you'll have to call this function twice with
-    * reversed order of triangle vertices.
-    *
-    * return values
-    * if there is an intertection the functions return "true" and stores the
-    * 3d-intersection point in "output". if the function returns "false" the value in
-    * "output" is undefined
-    */
-    inline bool Ray_Triangle(const Ray& ray, const Vec3& v0, const Vec3& v1, const Vec3& v2, Vec3& output)
-    {
-        const float Epsilon = 0.0000001f;
-
-        Vec3 edgeA = v1 - v0;
-        Vec3 edgeB = v2 - v0;
-
-        Vec3 dir = ray.direction;
-
-        Vec3 p = dir.Cross(edgeA);
-        Vec3 t = ray.origin - v0;
-        Vec3 q = t.Cross(edgeB);
-
-        float dot = edgeB.Dot(p);
-
-        float u = t.Dot(p);
-        float v = dir.Dot(q);
-
-        float DotGreaterThanEpsilon = dot - Epsilon;
-        float VGreaterEqualThanZero = v;
-        float UGreaterEqualThanZero = u;
-        float UVLessThanDot = dot - (u + v);
-        float ULessThanDot = dot - u;
-
-        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
-        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
-        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
-        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
-
-        if (AllGood < 0.0f)
-        {
-            return false;
-        }
-
-        float dt = edgeA.Dot(q) / dot;
-
-        Vec3 result = (dir * dt) + ray.origin;
-        output = result;
-
-        float AfterStart = (result - ray.origin).Dot(dir);
-
-        return AfterStart >= 0.0f;
-    }
-
-
-
-    /*
-    * Description:
-    *   Calculates intersection between a line-segment and a triangle.
-    * Remarks:
-    *   IMPORTANT: this is a single-sided intersection test. That means its not sufficient
-    *   that the triangle and line-segment overlap, its also important that the triangle
-    *   is "visible" when you are looking along the linesegment from "start" to "end".
-    * Notes:
-    *   If you need a double-sided test, you'll have to call this function twice with
-    *   reversed order of triangle vertices.
-    *
-    * Return value:
-    *   If there is an intertection the the functions return "true" and stores the
-    *   3d-intersection point in "output". if the function returns "false" the value in
-    *   "output" is undefined. If pT is non-zero then if there is an intersection the "t-value"
-    *   (from 0-1) is also returned (unmodified if there is no intersection).
-    */
-    inline bool Lineseg_Triangle(const Lineseg& lineseg, const Vec3& v0, const Vec3& v1, const Vec3& v2, Vec3& output,
-        float* outT = 0)
-    {
-        const float Epsilon = 0.0000001f;
-
-        Vec3 edgeA = v1 - v0;
-        Vec3 edgeB = v2 - v0;
-
-        Vec3 dir = lineseg.end - lineseg.start;
-
-        Vec3 p = dir.Cross(edgeA);
-        Vec3 t = lineseg.start - v0;
-        Vec3 q = t.Cross(edgeB);
-
-        float dot = edgeB.Dot(p);
-
-        float u = t.Dot(p);
-        float v = dir.Dot(q);
-
-        float DotGreaterThanEpsilon = dot - Epsilon;
-        float VGreaterEqualThanZero = v;
-        float UGreaterEqualThanZero = u;
-        float UVLessThanDot = dot - (u + v);
-        float ULessThanDot = dot - u;
-
-        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
-        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
-        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
-        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
-
-        if (AllGood < 0.0f)
-        {
-            return false;
-        }
-
-        float dt = edgeA.Dot(q) / dot;
-
-        Vec3 result = (dir * dt) + lineseg.start;
-        output = result;
-
-        float AfterStart = (result - lineseg.start).Dot(dir);
-        float BeforeEnd = -(result - lineseg.end).Dot(dir);
-        float Within = (float)fsel(AfterStart, BeforeEnd, AfterStart);
-
-        if (outT)
-        {
-            *outT = dt;
-        }
-
-        return Within >= 0.0f;
-    }
-
-
-
-
-    //----------------------------------------------------------------------------------
-    //  Ray_AABB
-    //
-    //  just ONE intersection point is calculated, and thats the entry point           -
-    //   Lineseg and AABB are assumed to be in the same space
-    //
-    //--- 0x00 = no intersection (output undefined)        --------------------------
-    //--- 0x01 = intersection (intersection point in output)              --------------
-    //--- 0x02 = start of Lineseg is inside the AABB (ls.start is output)
-    //----------------------------------------------------------------------------------
-    inline uint8 Ray_AABB(const Ray& ray, const AABB& aabb, Vec3& output1)
-    {
-        uint8 cflags;
-        float cosine;
-        Vec3 cut;
-        //--------------------------------------------------------------------------------------
-        //----         check if "ray.origin" is inside of AABB    ---------------------------
-        //--------------------------------------------------------------------------------------
-        cflags = (ray.origin.x >= aabb.min.x) << 0;
-        cflags |= (ray.origin.x <= aabb.max.x) << 1;
-        cflags |= (ray.origin.y >= aabb.min.y) << 2;
-        cflags |= (ray.origin.y <= aabb.max.y) << 3;
-        cflags |= (ray.origin.z >= aabb.min.z) << 4;
-        cflags |= (ray.origin.z <= aabb.max.z) << 5;
-        if (cflags == 0x3f)
-        {
-            output1 = ray.origin;
-            return 0x02;
-        }
-
-        //--------------------------------------------------------------------------------------
-        //----         check intersection with planes           ------------------------------
-        //--------------------------------------------------------------------------------------
-        for (int i = 0; i < 3; i++)
-        {
-            if ((ray.direction[i] > 0) && (ray.origin[i] < aabb.min[i]))
-            {
-                cosine = (-ray.origin[i] + aabb.min[i]) / ray.direction[i];
-                cut[i] = aabb.min[i];
-                cut[incm3(i)] = ray.origin[incm3(i)] + (ray.direction[incm3(i)] * cosine);
-                cut[decm3(i)] = ray.origin[decm3(i)] + (ray.direction[decm3(i)] * cosine);
-                if ((cut[incm3(i)] > aabb.min[incm3(i)]) && (cut[incm3(i)] < aabb.max[incm3(i)]) && (cut[decm3(i)] > aabb.min[decm3(i)]) && (cut[decm3(i)] < aabb.max[decm3(i)]))
-                {
-                    output1 = cut;
-                    return 0x01;
-                }
-            }
-            if ((ray.direction[i] < 0) && (ray.origin[i] > aabb.max[i]))
-            {
-                cosine = (+ray.origin[i] - aabb.max[i]) / ray.direction[i];
-                cut[i] = aabb.max[i];
-                cut[incm3(i)] = ray.origin[incm3(i)] - (ray.direction[incm3(i)] * cosine);
-                cut[decm3(i)] = ray.origin[decm3(i)] - (ray.direction[decm3(i)] * cosine);
-                if ((cut[incm3(i)] > aabb.min[incm3(i)]) && (cut[incm3(i)] < aabb.max[incm3(i)]) && (cut[decm3(i)] > aabb.min[decm3(i)]) && (cut[decm3(i)] < aabb.max[decm3(i)]))
-                {
-                    output1 = cut;
-                    return 0x01;
-                }
-            }
-        }
-        return 0x00;//no intersection
-    }
-
-
-
-    //----------------------------------------------------------------------------------
-    //  Ray_OBB
-    //
-    //  just ONE intersection point is calculated, and thats the entry point           -
-    //   Lineseg and OBB are assumed to be in the same space
-    //
-    //--- 0x00 = no intersection (output undefined)                                 ----
-    //--- 0x01 = intersection (intersection point in output)              --------------
-    //--- 0x02 = start of Lineseg is inside the OBB (ls.start is output)
-    //----------------------------------------------------------------------------------
-    inline uint8 Ray_OBB(const Ray& ray, const Vec3& pos, const OBB& obb, Vec3& output1)
-    {
-        AABB aabb(obb.c - obb.h, obb.c + obb.h);
-        Ray aray((ray.origin - pos) * obb.m33, ray.direction * obb.m33);
-
-        uint8 cflags;
-        float cosine;
-        Vec3 cut;
-        //--------------------------------------------------------------------------------------
-        //----         check if "aray.origin" is inside of AABB    ---------------------------
-        //--------------------------------------------------------------------------------------
-        cflags = (aray.origin.x > aabb.min.x) << 0;
-        cflags |= (aray.origin.x < aabb.max.x) << 1;
-        cflags |= (aray.origin.y > aabb.min.y) << 2;
-        cflags |= (aray.origin.y < aabb.max.y) << 3;
-        cflags |= (aray.origin.z > aabb.min.z) << 4;
-        cflags |= (aray.origin.z < aabb.max.z) << 5;
-        if (cflags == 0x3f)
-        {
-            output1 = aray.origin;
-            return 0x02;
-        }
-
-        //--------------------------------------------------------------------------------------
-        //----         check intersection with planes           ------------------------------
-        //--------------------------------------------------------------------------------------
-        for (int i = 0; i < 3; i++)
-        {
-            if ((aray.direction[i] > 0) && (aray.origin[i] < aabb.min[i]))
-            {
-                cosine = (-aray.origin[i] + aabb.min[i]) / aray.direction[i];
-                cut[i] = aabb.min[i];
-                cut[incm3(i)] = aray.origin[incm3(i)] + (aray.direction[incm3(i)] * cosine);
-                cut[decm3(i)] = aray.origin[decm3(i)] + (aray.direction[decm3(i)] * cosine);
-                if ((cut[incm3(i)] > aabb.min[incm3(i)]) && (cut[incm3(i)] < aabb.max[incm3(i)]) && (cut[decm3(i)] > aabb.min[decm3(i)]) && (cut[decm3(i)] < aabb.max[decm3(i)]))
-                {
-                    output1 = obb.m33 * cut + pos;
-                    return 0x01;
-                }
-            }
-            if ((aray.direction[i] < 0) && (aray.origin[i] > aabb.max[i]))
-            {
-                cosine = (+aray.origin[i] - aabb.max[i]) / aray.direction[i];
-                cut[i] = aabb.max[i];
-                cut[incm3(i)] = aray.origin[incm3(i)] - (aray.direction[incm3(i)] * cosine);
-                cut[decm3(i)] = aray.origin[decm3(i)] - (aray.direction[decm3(i)] * cosine);
-                if ((cut[incm3(i)] > aabb.min[incm3(i)]) && (cut[incm3(i)] < aabb.max[incm3(i)]) && (cut[decm3(i)] > aabb.min[decm3(i)]) && (cut[decm3(i)] < aabb.max[decm3(i)]))
-                {
-                    output1 = obb.m33 * cut + pos;
-                    return 0x01;
-                }
-            }
-        }
-        return 0x00;//no intersection
-    }
-
-    //----------------------------------------------------------------------------------
-    //  Lineseg_AABB
-    //
-    //  just ONE intersection point is calculated, and thats the entry point           -
-    //   Lineseg and AABB are assumed to be in the same space
-    //
-    //--- 0x00 = no intersection (output undefined)        --------------------------
-    //--- 0x01 = intersection (intersection point in output)              --------------
-    //--- 0x02 = start of Lineseg is inside the AABB (ls.start is output)
-    //----------------------------------------------------------------------------------
-    inline uint8    Lineseg_AABB(const Lineseg& ls, const AABB& aabb, Vec3& output1)
-    {
-        uint8 cflags;
-        float cosine;
-        Vec3 cut;
-        Vec3 lnormal = (ls.start - ls.end).GetNormalized();
-        //--------------------------------------------------------------------------------------
-        //----         check if "ls.start" is inside of AABB    ---------------------------
-        //--------------------------------------------------------------------------------------
-        cflags = (ls.start.x > aabb.min.x) << 0;
-        cflags |= (ls.start.x < aabb.max.x) << 1;
-        cflags |= (ls.start.y > aabb.min.y) << 2;
-        cflags |= (ls.start.y < aabb.max.y) << 3;
-        cflags |= (ls.start.z > aabb.min.z) << 4;
-        cflags |= (ls.start.z < aabb.max.z) << 5;
-        if (cflags == 0x3f)
-        {
-            //ls.start is inside of aabb
-            output1 = ls.start;
-            return 0x02;
-        }
-
-        //--------------------------------------------------------------------------------------
-        //----         check intersection with x-planes           ------------------------------
-        //--------------------------------------------------------------------------------------
-        if (lnormal.x)
-        {
-            if ((ls.start.x < aabb.min.x) && (ls.end.x > aabb.min.x))
-            {
-                cosine = (-ls.start.x + (+aabb.min.x)) / lnormal.x;
-                cut(aabb.min.x, ls.start.y + (lnormal.y * cosine), ls.start.z + (lnormal.z * cosine));
-                //check if cut-point is inside YZ-plane border
-                if ((cut.y > aabb.min.y) && (cut.y < aabb.max.y) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
-                {
-                    output1 = cut;
-                    return 0x01;
-                }
-            }
-            if ((ls.start.x > aabb.max.x) && (ls.end.x < aabb.max.x))
-            {
-                cosine = (+ls.start.x + (-aabb.max.x)) / lnormal.x;
-                cut(aabb.max.x, ls.start.y - (lnormal.y * cosine), ls.start.z - (lnormal.z * cosine));
-                //check if cut-point is inside YZ-plane border
-                if ((cut.y > aabb.min.y) && (cut.y < aabb.max.y) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
-                {
-                    output1 = cut;
-                    return 0x01;
-                }
-            }
-        }
-        //--------------------------------------------------------------------------------------
-        //----         check intersection with z-planes           ------------------------------
-        //--------------------------------------------------------------------------------------
-        if (lnormal.z)
-        {
-            if ((ls.start.z < aabb.min.z) && (ls.end.z > aabb.min.z))
-            {
-                cosine = (-ls.start.z + (+aabb.min.z)) / lnormal.z;
-                cut(ls.start.x + (lnormal.x * cosine), ls.start.y + (lnormal.y * cosine), aabb.min.z);
-                //check if cut-point is inside XY-plane border
-                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.y > aabb.min.y) && (cut.y < aabb.max.y))
-                {
-                    output1 = cut;
-                    return 0x01;
-                }
-            }
-            if ((ls.start.z > aabb.max.z) && (ls.end.z < aabb.max.z))
-            {
-                cosine = (+ls.start.z + (-aabb.max.z)) / lnormal.z;
-                cut(ls.start.x - (lnormal.x * cosine), ls.start.y - (lnormal.y * cosine), aabb.max.z);
-                //check if cut-point is inside XY-plane border
-                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.y > aabb.min.y) && (cut.y < aabb.max.y))
-                {
-                    output1 = cut;
-                    return 0x01;
-                }
-            }
-        }
-        //--------------------------------------------------------------------------------------
-        //----         check intersection with y-planes           ------------------------------
-        //--------------------------------------------------------------------------------------
-        if (lnormal.y)
-        {
-            if ((ls.start.y < aabb.min.y) && (ls.end.y > aabb.min.y))
-            {
-                cosine = (-ls.start.y + (+aabb.min.y)) / lnormal.y;
-                cut(ls.start.x + (lnormal.x * cosine), aabb.min.y, ls.start.z + (lnormal.z * cosine));
-                //check if cut-point is inside XZ-plane border
-                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
-                {
-                    output1 = cut;
-                    return 0x01;
-                }
-            }
-            if ((ls.start.y > aabb.max.y) && (ls.end.y < aabb.max.y))
-            {
-                cosine = (+ls.start.y + (-aabb.max.y)) / lnormal.y;
-                cut(ls.start.x - (lnormal.x * cosine), aabb.max.y, ls.start.z - (lnormal.z * cosine));
-                //check if cut-point is inside XZ-plane border
-                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
-                {
-                    output1 = cut;
-                    return 0x01;
-                }
-            }
-        }
-        //no intersection
-        return 0x00;
-    }
-
-
-
-    //----------------------------------------------------------------------------------
-    //  Lineseg_OBB
-    //
-    //  just ONE intersection point is calculated, and thats the entry point           -
-    //  Lineseg and OBB are assumed to be in the same space
-    //
-    //--- 0x00 = no intersection (output undefined)           --------------------------
-    //--- 0x01 = intersection (intersection point in output)              --------------
-    //--- 0x02 = start of Lineseg is inside the OBB (ls.start is output)
-    //----------------------------------------------------------------------------------
-    inline uint8    Lineseg_OBB(const Lineseg& lseg, const Vec3& pos, const OBB& obb, Vec3& output1)
-    {
-        AABB aabb(obb.c - obb.h, obb.c + obb.h);
-        Lineseg ls((lseg.start - pos) * obb.m33, (lseg.end - pos) * obb.m33);
-
-        uint8 cflags;
-        float cosine;
-        Vec3 cut;
-        Vec3 lnormal = (ls.start - ls.end).GetNormalized();
-        //--------------------------------------------------------------------------------------
-        //----         check if "ls.start" is inside of AABB    ---------------------------
-        //--------------------------------------------------------------------------------------
-        cflags = (ls.start.x > aabb.min.x) << 0;
-        cflags |= (ls.start.x < aabb.max.x) << 1;
-        cflags |= (ls.start.y > aabb.min.y) << 2;
-        cflags |= (ls.start.y < aabb.max.y) << 3;
-        cflags |= (ls.start.z > aabb.min.z) << 4;
-        cflags |= (ls.start.z < aabb.max.z) << 5;
-        if (cflags == 0x3f)
-        {
-            //ls.start is inside of aabb
-            output1 = obb.m33 * ls.start + pos;
-            return 0x02;
-        }
-
-        //--------------------------------------------------------------------------------------
-        //----         check intersection with x-planes           ------------------------------
-        //--------------------------------------------------------------------------------------
-        if (lnormal.x)
-        {
-            if ((ls.start.x < aabb.min.x) && (ls.end.x > aabb.min.x))
-            {
-                cosine = (-ls.start.x + (+aabb.min.x)) / lnormal.x;
-                cut(aabb.min.x, ls.start.y + (lnormal.y * cosine), ls.start.z + (lnormal.z * cosine));
-                //check if cut-point is inside YZ-plane border
-                if ((cut.y > aabb.min.y) && (cut.y < aabb.max.y) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
-                {
-                    output1 = obb.m33 * cut + pos;
-                    return 0x01;
-                }
-            }
-            if ((ls.start.x > aabb.max.x) && (ls.end.x < aabb.max.x))
-            {
-                cosine = (+ls.start.x + (-aabb.max.x)) / lnormal.x;
-                cut(aabb.max.x, ls.start.y - (lnormal.y * cosine), ls.start.z - (lnormal.z * cosine));
-                //check if cut-point is inside YZ-plane border
-                if ((cut.y > aabb.min.y) && (cut.y < aabb.max.y) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
-                {
-                    output1 = obb.m33 * cut + pos;
-                    return 0x01;
-                }
-            }
-        }
-        //--------------------------------------------------------------------------------------
-        //----         check intersection with z-planes           ------------------------------
-        //--------------------------------------------------------------------------------------
-        if (lnormal.z)
-        {
-            if ((ls.start.z < aabb.min.z) && (ls.end.z > aabb.min.z))
-            {
-                cosine = (-ls.start.z + (+aabb.min.z)) / lnormal.z;
-                cut(ls.start.x + (lnormal.x * cosine), ls.start.y + (lnormal.y * cosine), aabb.min.z);
-                //check if cut-point is inside XY-plane border
-                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.y > aabb.min.y) && (cut.y < aabb.max.y))
-                {
-                    output1 = obb.m33 * cut + pos;
-                    return 0x01;
-                }
-            }
-            if ((ls.start.z > aabb.max.z) && (ls.end.z < aabb.max.z))
-            {
-                cosine = (+ls.start.z + (-aabb.max.z)) / lnormal.z;
-                cut(ls.start.x - (lnormal.x * cosine), ls.start.y - (lnormal.y * cosine), aabb.max.z);
-                //check if cut-point is inside XY-plane border
-                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.y > aabb.min.y) && (cut.y < aabb.max.y))
-                {
-                    output1 = obb.m33 * cut + pos;
-                    return 0x01;
-                }
-            }
-        }
-        //--------------------------------------------------------------------------------------
-        //----         check intersection with y-planes           ------------------------------
-        //--------------------------------------------------------------------------------------
-        if (lnormal.y)
-        {
-            if ((ls.start.y < aabb.min.y) && (ls.end.y > aabb.min.y))
-            {
-                cosine = (-ls.start.y + (+aabb.min.y)) / lnormal.y;
-                cut(ls.start.x + (lnormal.x * cosine), aabb.min.y, ls.start.z + (lnormal.z * cosine));
-                //check if cut-point is inside XZ-plane border
-                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
-                {
-                    output1 = obb.m33 * cut + pos;
-                    return 0x01;
-                }
-            }
-            if ((ls.start.y > aabb.max.y) && (ls.end.y < aabb.max.y))
-            {
-                cosine = (+ls.start.y + (-aabb.max.y)) / lnormal.y;
-                cut(ls.start.x - (lnormal.x * cosine), aabb.max.y, ls.start.z - (lnormal.z * cosine));
-                //check if cut-point is inside XZ-plane border
-                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
-                {
-                    output1 = obb.m33 * cut + pos;
-                    return 0x01;
-                }
-            }
-        }
-        //no intersection
-        return 0x00;
-    }
-
-
-
-    //----------------------------------------------------------------------------------
-    //--- 0x00 = no intersection                               --------------------------
-    //--- 0x01 = not possible   --
-    //--- 0x02 = not possible  --
-    //--- 0x03 = two intersection, lineseg has ENTRY and EXIT point  --
-    //----------------------------------------------------------------------------------
-
-    inline unsigned char Line_Sphere(const Line& line, const ::Sphere& s, Vec3& i0, Vec3& i1)
-    {
-        Vec3 end = line.pointonline + line.direction;
-
-        float a = line.direction | line.direction;
-        float b = (line.direction | (line.pointonline - s.center)) * 2.0f;
-        float c = ((line.pointonline - s.center) | (line.pointonline - s.center)) - (s.radius * s.radius);
-
-        float desc = (b * b) - (4 * a * c);
-
-        unsigned char intersection = 0;
-        if (desc >= 0.0f)
-        {
-            float lamba0 = (-b - sqrt_tpl(desc)) / (2.0f * a);
-            //_stprintf(d3dApp.token,"lamba0: %20.12f",lamba0);
-            //d3dApp.m_pFont->DrawText( 2, d3dApp.PrintY, D3DCOLOR_ARGB(255,255,255,0), d3dApp.token ); d3dApp.PrintY+=20;
-            i0 = line.pointonline + ((end - line.pointonline) * lamba0);
-            intersection = 1;
-
-            float lamba1 = (-b + sqrt_tpl(desc)) / (2.0f * a);
-            //_stprintf(d3dApp.token,"lamba1: %20.12f",lamba1);
-            //d3dApp.m_pFont->DrawText( 2, d3dApp.PrintY, D3DCOLOR_ARGB(255,255,255,0), d3dApp.token ); d3dApp.PrintY+=20;
-            i1 = line.pointonline + ((end - line.pointonline) * lamba1);
-            intersection |= 2;
-        }
-
-        return intersection;
-    }
-
-
-
-    //----------------------------------------------------------------------------------
-    //--- 0x00 = no intersection                               --------------------------
-    //--- 0x01 = not possible   --
-    //--- 0x02 = one intersection, lineseg has just an EXIT point but no ENTRY point (ls.start is inside the sphere)  --
-    //--- 0x03 = two intersection, lineseg has ENTRY and EXIT point  --
-    //----------------------------------------------------------------------------------
-
-    inline unsigned char Ray_Sphere(const Ray& ray, const ::Sphere& s, Vec3& i0, Vec3& i1)
-    {
-        Vec3 end = ray.origin + ray.direction;
-        float a = ray.direction | ray.direction;
-        float b = (ray.direction | (ray.origin - s.center)) * 2.0f;
-        float c = ((ray.origin - s.center) | (ray.origin - s.center)) - (s.radius * s.radius);
-
-        float desc = (b * b) - (4 * a * c);
-
-        unsigned char intersection = 0;
-        if (desc >= 0.0f)
-        {
-            float lamba0 = (-b - sqrt_tpl(desc)) / (2.0f * a);
-            //  _stprintf(d3dApp.token,"lamba0: %20.12f",lamba0);
-            //  d3dApp.m_pFont->DrawText( 2, d3dApp.PrintY, D3DCOLOR_ARGB(255,255,255,0), d3dApp.token );   d3dApp.PrintY+=20;
-            if (lamba0 > 0.0f)
-            {
-                i0 = ray.origin + ((end - ray.origin) * lamba0);
-                intersection = 1;
-            }
-
-            float lamba1 = (-b + sqrt_tpl(desc)) / (2.0f * a);
-            //  _stprintf(d3dApp.token,"lamba1: %20.12f",lamba1);
-            //  d3dApp.m_pFont->DrawText( 2, d3dApp.PrintY, D3DCOLOR_ARGB(255,255,255,0), d3dApp.token );   d3dApp.PrintY+=20;
-            if (lamba1 > 0.0f)
-            {
-                i1 = ray.origin + ((end - ray.origin) * lamba1);
-                intersection |= 2;
-            }
-        }
-        return intersection;
-    }
-
-    inline bool Ray_SphereFirst(const Ray& ray, const ::Sphere& s, Vec3& intPoint)
-    {
-        Vec3 p2;
-        unsigned char res = Ray_Sphere(ray, s, intPoint, p2);
-        if (res == 2)
-        {
-            intPoint = p2;
-        }
-        if (res > 1)
-        {
-            return true;
-        }
-        return false;
-    }
-
-
-
-    //----------------------------------------------------------------------------------
-    //--- 0x00 = no intersection                               --------------------------
-    //--- 0x01 = one intersection, lineseg has just an ENTRY point but no EXIT point (ls.end is inside the sphere)  --
-    //--- 0x02 = one intersection, lineseg has just an EXIT point but no ENTRY point (ls.start is inside the sphere)  --
-    //--- 0x03 = two intersection, lineseg has ENTRY and EXIT point  --
-    //----------------------------------------------------------------------------------
-    inline unsigned char Lineseg_Sphere(const Lineseg& ls, const ::Sphere& s, Vec3& i0, Vec3& i1)
-    {
-        Vec3 dir = (ls.end - ls.start);
-
-        float a = dir | dir;
-        if (a == 0.0f)
-        {
-            return 0;
-        }
-
-        float b = (dir | (ls.start - s.center)) * 2.0f;
-        float c = ((ls.start - s.center) | (ls.start - s.center)) - (s.radius * s.radius);
-        float desc = (b * b) - (4 * a * c);
-
-        unsigned char intersection = 0;
-        if (desc >= 0.0f)
-        {
-            float lamba0 = (-b - sqrt_tpl(desc)) / (2.0f * a);
-            if (lamba0 > 0.0f)
-            {
-                i0 = ls.start + ((ls.end - ls.start) * lamba0);
-                //skip, if 1st cutting-point is "in front" of ls.end
-                if (((i0 - ls.end) | dir) > 0)
-                {
-                    return 0;
-                }
-                intersection = 0x01;
-            }
-
-            float lamba1 = (-b + sqrt_tpl(desc)) / (2.0f * a);
-            if (lamba1 > 0.0f)
-            {
-                i1 = ls.start + ((ls.end - ls.start) * lamba1);
-                //skip, if 2nd cutting-point is "in front" of ls.end (=ls.end is inside sphere)
-                if (((i1 - ls.end) | dir) > 0)
-                {
-                    return intersection;
-                }
-                intersection |= 0x02;
-            }
-        }
-        return intersection;
-    }
-
-
-    inline bool Lineseg_SphereFirst(const Lineseg& lineseg, const ::Sphere& s, Vec3& intPoint)
-    {
-        Vec3 p2;
-        uint8 res = Lineseg_Sphere(lineseg, s, intPoint, p2);
-        if (res == 2)
-        {
-            intPoint = p2;
-        }
-        if (res > 1)
-        {
-            return true;
-        }
-        return false;
-    }
-}; //CIntersect
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_GEOINTERSECT_H
diff --git a/Code/CryEngine/CryCommon/Cry_GeoOverlap.h b/Code/CryEngine/CryCommon/Cry_GeoOverlap.h
deleted file mode 100644
index 3c469aacf0..0000000000
--- a/Code/CryEngine/CryCommon/Cry_GeoOverlap.h
+++ /dev/null
@@ -1,2039 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common overlap-tests
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_GEOOVERLAP_H
-#define CRYINCLUDE_CRYCOMMON_CRY_GEOOVERLAP_H
-#pragma once
-
-#include <Cry_Geo.h>
-#include <AzCore/Math/Vector3.h>
-
-namespace Distance
-{
-    template<typename F>
-    ILINE F Point_TriangleSq(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t);
-    template<typename F>
-    ILINE F Point_Lineseg2DSq(Vec3_tpl<F> p, Lineseg lineseg, F& fT);
-    simdf Point_TriangleByPointsSq(const hwvec3& p, const hwvec3& t0, const hwvec3& t1, const hwvec3& t2);
-}
-
-
-namespace Overlap {
-    ILINE void FINDMINMAX(const f32 x0, const f32 x1, const f32 x2, f32& min_value, f32& max_value)
-    {
-        min_value = max_value = x0;
-        min_value = min(x1, min_value);
-        max_value = max(x1, max_value);
-        min_value = min(x2, min_value);
-        max_value = max(x2, max_value);
-    }
-
-    inline bool Lineseg_AABB2D(const Lineseg&, const AABB&);
-    ILINE bool AABB_AABB2D(const AABB&, const AABB&);
-
-    ////////////////////////////////////////////////////////////////
-    // Checks if the point is inside an AABB
-    /*  inline bool Point_AABB(const Vec3 &p, const Vec3 &mins,const Vec3 &maxs)
-        {
-            if ((p.x>=mins.x && p.x<=maxs.x) && (p.y>=mins.y && p.y<=maxs.y) && (p.z>=mins.z && p.z<=maxs.z))   return (true);
-            return (false);
-        }*/
-
-    // Description:
-    //      Checks if the point is inside an AABB
-    //      The min value of the AABB is inclusive
-    //      The max value of the AABB is exclusive
-    ILINE bool  Point_AABB(const Vec3& p, const AABB& aabb)
-    {
-        return ((p.x >= aabb.min.x && p.x < aabb.max.x) && (p.y >= aabb.min.y && p.y < aabb.max.y) && (p.z >= aabb.min.z && p.z < aabb.max.z));
-    }
-
-    // Description:
-    //      Checks if the point is inside a 2D AABB
-    //      The min value of the AABB is inclusive
-    //      The max value of the AABB is exclusive
-    template<typename PtType>
-    ILINE bool  Point_AABB2D(const PtType& p, const AABB& aabb)
-    {
-        return ((p.x >= aabb.min.x && p.x < aabb.max.x) && (p.y >= aabb.min.y && p.y < aabb.max.y));
-    }
-
-    // Description:
-    //      Checks if the point is inside an AABB
-    //      The min and max value of the AABB is inclusive
-    ILINE bool  Point_AABB_MaxInclusive(const Vec3& p, const AABB& aabb)
-    {
-        return ((p.x >= aabb.min.x && p.x <= aabb.max.x) && (p.y >= aabb.min.y && p.y <= aabb.max.y) && (p.z >= aabb.min.z && p.z <= aabb.max.z));
-    }
-
-    // Description:
-    //      Checks if the point is inside a 2D AABB
-    //      The min and max value of the AABB is inclusive
-    template<typename PtType>
-    ILINE bool  Point_AABB2D_MaxInclusive(const PtType& p, const AABB& aabb)
-    {
-        return ((p.x >= aabb.min.x && p.x <= aabb.max.x) && (p.y >= aabb.min.y && p.y <= aabb.max.y));
-    }
-
-    // Description:
-    //  Checks if a point is inside an OBB.
-    // Example:
-    //  bool result=Overlap::Point_OBB( point, obb );
-    ILINE bool  Point_OBB(const Vec3& p, const Vec3& wpos, const OBB& obb)
-    {
-        AABB aabb = AABB(obb.c - obb.h, obb.c + obb.h);
-        Vec3 t = (p - wpos) * obb.m33;
-        return ((t.x >= aabb.min.x && t.x <= aabb.max.x) && (t.y >= aabb.min.y && t.y <= aabb.max.y) && (t.z >= aabb.min.z && t.z <= aabb.max.z));
-    }
-
-    // Description:
-    //  Checks if a point is inside a sphere.
-    // Example:
-    //  bool result=Overlap::Point_Sphere( point, sphere );
-    ILINE bool  Point_Sphere(const Vec3& p, const ::Sphere& s)
-    {
-        Vec3 distc  =   p - s.center;
-        f32 sqrad       =   s.radius * s.radius;
-        return (sqrad > (distc | distc));
-    }
-
-    /// Two line segments, in 2D (ignore z)
-    inline bool Lineseg_Lineseg2D(const Lineseg& lineA, const Lineseg& lineB)
-    {
-        const float Epsilon = 0.0000001f;
-
-        Vec3 delta = lineB.start - lineA.start;
-
-        Vec3 dirA = lineA.end - lineA.start;
-        Vec3 dirB = lineB.end - lineB.start;
-
-        float det = dirA.x * dirB.y - dirA.y * dirB.x;
-        float detA = delta.x * dirB.y - delta.y * dirB.x;
-        float detB = delta.x * dirA.y - delta.y * dirA.x;
-
-        float absDet = fabs_tpl(det);
-
-        if (absDet >= Epsilon)
-        {
-            float invDet = 1.0f / det;
-
-            float a = detA * invDet;
-            float b = detB * invDet;
-
-            if ((a > 1.0f) || (a < 0.0f) || (b > 1.0f) || (b < 0.0f))
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-
-
-    /// Check if a point is within a polygon, in 2D (i.e. ignoring z coordinate)
-    /// The VecContainer should be a container of Vec3_tpl<F> such that we can traverse
-    /// it using iterators.
-    ///
-    /// This works by checking all the lines that start/end above/below the point
-    /// and counting how many have the point on the right/left side. If the
-    /// point is inside, then left/right counts should be odd - if outside then
-    /// even. If it's on the edge then this algorithm will return an arbitrary
-    /// result. This is basically the same as casting a ray horizontally and
-    /// counting the intersections.
-    /// Don't mess with putting tolerances etc in this code, or chaning the <
-    /// to <= etc in case you're worried about the "ray" going through a vertex.
-    /// the only issue is when the point is on the edge - if you're worried about
-    /// that then use the separate function that indicates if a point is within
-    /// a certain tolerance of an edge.
-    template<typename PtType, typename VecContainer>
-    inline bool Point_Polygon2D(const PtType& p, const VecContainer& polygon, const AABB* pAABBPolygon = 0)
-    {
-        if (pAABBPolygon && !Overlap::Point_AABB2D(p, *pAABBPolygon))
-        {
-            return false;
-        }
-
-        int count = 0;
-
-        typename VecContainer::const_iterator li, linext;
-        typename VecContainer::const_iterator liend = polygon.end();
-        for (li = polygon.begin(); li != liend; ++li)
-        {
-            linext = li;
-            ++linext;
-            if (linext == liend)
-            {
-                linext = polygon.begin();
-            }
-            const PtType& l0 = *li;
-            const PtType& l1 = *linext;
-
-            if ((((l1.y <= p.y) && (p.y < l0.y)) ||
-                 ((l0.y <= p.y) && (p.y < l1.y))) &&
-                (p.x < (l0.x - l1.x) * (p.y - l1.y) / (l0.y - l1.y) + l1.x))
-            {
-                count = !count;
-            }
-        }
-        return (0 != count);
-    }
-
-    template<typename PtType>
-    inline bool Point_Polygon2D(const PtType& p, const PtType* polygon, size_t vertexCount, const AABB* pAABBPolygon = 0)
-    {
-        if (pAABBPolygon && !Overlap::Point_AABB2D(p, *pAABBPolygon))
-        {
-            return false;
-        }
-
-        bool count = false;
-
-        for (size_t i = 0; i < vertexCount; ++i)
-        {
-            const PtType l0 = polygon[i % vertexCount];
-            const PtType l1 = polygon[(i + 1) % vertexCount];
-
-            if ((((l1.y <= p.y) && (p.y < l0.y)) ||
-                 ((l0.y <= p.y) && (p.y < l1.y))) &&
-                (p.x < (l0.x - l1.x) * (p.y - l1.y) / (l0.y - l1.y) + l1.x))
-            {
-                count = !count;
-            }
-        }
-
-        return count;
-    }
-
-
-    template<typename F, typename VecContainer>
-    inline bool Circle_Polygon2D(const Vec3_tpl<F>& p, F radius, const VecContainer& polygon)
-    {
-        if (Overlap::Point_Polygon2D(p, polygon))
-        {
-            return true;
-        }
-        typename VecContainer::const_iterator li, linext;
-        typename VecContainer::const_iterator liend = polygon.end();
-        for (li = polygon.begin(); li != liend; ++li)
-        {
-            linext = li;
-            ++linext;
-            if (linext == liend)
-            {
-                linext = polygon.begin();
-            }
-            const Vec3_tpl<F>& l0 = *li;
-            const Vec3_tpl<F>& l1 = *linext;
-            float junk;
-            if (Distance::Point_Lineseg2DSq(p, Lineseg(l0, l1), junk) < square(radius))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-    /// Checks if a line segment overlaps a polygon (defined by a container of sorted
-    /// points) in 2D (ignoring z). If you know the polygon AABB pass it in (z is ignored)
-    template<typename VecContainer>
-    inline bool Lineseg_Polygon2D(const Lineseg& lineseg,
-        const VecContainer& polygon,
-        const AABB* pAABBPolygon = 0)
-    {
-        if (pAABBPolygon && !Overlap::Lineseg_AABB2D(lineseg, *pAABBPolygon))
-        {
-            return false;
-        }
-
-        typename VecContainer::const_iterator it;
-        for (it = polygon.begin(); it != polygon.end(); ++it)
-        {
-            typename VecContainer::const_iterator itNext = it;
-            ++itNext;
-            if (itNext == polygon.end())
-            {
-                itNext = polygon.begin();
-            }
-
-            Lineseg polySeg(*it, *itNext);
-            if (Lineseg_Lineseg2D(lineseg, polySeg))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /// Checks for overlap of two polygons in 2D (ignoring z)
-    template<typename VecContainerA, typename VecContainerB>
-    inline bool Polygon_Polygon2D(const VecContainerA& polygonA, const VecContainerB& polygonB,
-        const AABB* pAABBA = 0, const AABB* pAABBB = 0)
-    {
-        const typename VecContainerA::const_iterator itEndA = polygonA.end();
-        const typename VecContainerB::const_iterator itEndB = polygonB.end();
-        typename VecContainerA::const_iterator itA;
-        typename VecContainerB::const_iterator itB;
-
-        AABB aabbA, aabbB;
-        if (!pAABBA)
-        {
-            pAABBA = &aabbA;
-            aabbA.Reset();
-            for (itA = polygonA.begin(); itA != itEndA; ++itA)
-            {
-                aabbA.Add(*itA);
-            }
-        }
-        if (!pAABBB)
-        {
-            pAABBB = &aabbB;
-            aabbB.Reset();
-            for (itB = polygonB.begin(); itB != itEndB; ++itB)
-            {
-                aabbB.Add(*itB);
-            }
-        }
-
-        // AABB
-        if (!Overlap::AABB_AABB2D(*pAABBA, *pAABBB))
-        {
-            return false;
-        }
-
-        // points of A in B
-        for (itA = polygonA.begin(); itA != itEndA; ++itA)
-        {
-            if (Point_Polygon2D(*itA, polygonB, pAABBB))
-            {
-                return true;
-            }
-        }
-        // points of B in A
-        for (itB = polygonB.begin(); itB != itEndB; ++itB)
-        {
-            if (Point_Polygon2D(*itB, polygonA, pAABBA))
-            {
-                return true;
-            }
-        }
-        // segments of one A against B
-        for (itA = polygonA.begin(); itA != itEndA; ++itA)
-        {
-            typename VecContainerA::const_iterator itNext = itA;
-            ++itNext;
-            if (itNext == itEndA)
-            {
-                itNext = polygonA.begin();
-            }
-            if (Lineseg_Polygon2D(Lineseg(*itA, *itNext), polygonB, pAABBB))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /// Checks if a triangle (defined by three vertices) overlaps a polygon (defined
-    /// by a container of sorted points), all in 2D only (ignoring z).
-    template<typename F, typename VecContainer>
-    inline bool Triangle_Polygon2D(const Vec3_tpl<F>& p0, const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2,
-        const VecContainer& polygon)
-    {
-        // Check for triangle points within the poly
-        if (Point_Polygon2D(p0, polygon))
-        {
-            return true;
-        }
-        if (Point_Polygon2D(p1, polygon))
-        {
-            return true;
-        }
-        if (Point_Polygon2D(p2, polygon))
-        {
-            return true;
-        }
-
-        // check the poly points against the triangle
-        static std::vector<Vec3> triangle;
-        triangle.clear();
-        triangle.push_back(p0);
-        triangle.push_back(p1);
-        triangle.push_back(p2);
-
-        typename VecContainer::const_iterator it;
-        for (it = polygon.begin(); it != polygon.end(); ++it)
-        {
-            if (Point_Polygon2D(*it, triangle))
-            {
-                return true;
-            }
-        }
-
-        // finally check the edges
-        if (Overlap::Lineseg_Polygon2D(Lineseg(p0, p1), polygon))
-        {
-            return true;
-        }
-        if (Overlap::Lineseg_Polygon2D(Lineseg(p1, p2), polygon))
-        {
-            return true;
-        }
-        if (Overlap::Lineseg_Polygon2D(Lineseg(p2, p0), polygon))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    //-----------------------------------------------------------------------------------------
-
-
-    //! check if a Lineseg and a Sphere overlap
-    inline bool Lineseg_Sphere(const Lineseg& ls, const ::Sphere& s)
-    {
-        float radius2 = s.radius * s.radius;
-
-        //check if one of the two edpoints of the line is inside the sphere
-        Vec3 diff = ls.end - s.center;
-        if (diff.x * diff.x + diff.y * diff.y + diff.z * diff.z <= radius2)
-        {
-            return true;
-        }
-
-        Vec3 AC = s.center - ls.start;
-        if (AC.x * AC.x + AC.y * AC.y + AC.z * AC.z <= radius2)
-        {
-            return true;
-        }
-
-        //check distance from the sphere to the line
-        Vec3 AB = ls.end - ls.start;
-
-        float r = (AC.x * AB.x + AC.y * AB.y + AC.z * AB.z) / (AB.x * AB.x + AB.y * AB.y + AB.z * AB.z);
-
-        //projection falls outside the line
-        if (r < 0 || r > 1)
-        {
-            return false;
-        }
-
-        //check if the distance from the line to the center of the sphere is less than radius
-        Vec3 point = ls.start + r * AB;
-        if ((point.x - s.center.x) * (point.x - s.center.x) + (point.y - s.center.y) * (point.y - s.center.y) + (point.z - s.center.z) * (point.z - s.center.z) > radius2)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-
-    /*!
-    * we use the SEPARATING AXIS TEST to check if a Linesegment overlap an AABB.
-    *
-    * Example:
-    *  bool result=Overlap::Lineseg_AABB( ls, pos,aabb );
-    */
-    inline bool Lineseg_AABB (const Lineseg& ls, const AABB& aabb)
-    {
-        //calculate the half-length-vectors of the AABB
-        Vec3 h  =   (aabb.max - aabb.min) * 0.5f;
-        //"t" is the transfer-vector from one center to the other
-        Vec3 t      = (ls.start + ls.end) * 0.5f - (aabb.max + aabb.min) * 0.5f;
-        //calculate line-direction
-        Vec3 ld  =  (ls.end - ls.start) * 0.5f;
-        if (fabsf(t.x) > (h.x + fabsf(ld.x)))
-        {
-            return 0;
-        }
-        if (fabsf(t.y) > (h.y + fabsf(ld.y)))
-        {
-            return 0;
-        }
-        if (fabsf(t.z) > (h.z + fabsf(ld.z)))
-        {
-            return 0;
-        }
-        if (fabsf(t.z * ld.y - t.y * ld.z) > (fabsf(h.y * ld.z) + fabsf(h.z * ld.y)))
-        {
-            return 0;
-        }
-        if (fabsf(t.x * ld.z - t.z * ld.x) > (fabsf(h.x * ld.z) + fabsf(h.z * ld.x)))
-        {
-            return 0;
-        }
-        if (fabsf(t.y * ld.x - t.x * ld.y) > (fabsf(h.x * ld.y) + fabsf(h.y * ld.x)))
-        {
-            return 0;
-        }
-        return 1; //no separating axis found, objects overlap
-    }
-
-    /// 2D seaparating axis test - ignores z
-    inline bool Lineseg_AABB2D (const Lineseg& ls, const AABB& aabb)
-    {
-        //calculate the half-length-vectors of the AABB
-        Vec3 h  =   (aabb.max - aabb.min) * 0.5f;
-        //"t" is the transfer-vector from one center to the other
-        Vec3 t      = (ls.start + ls.end) * 0.5f - (aabb.max + aabb.min) * 0.5f;
-        //calculate line-direction
-        Vec3 ld  =  (ls.end - ls.start) * 0.5f;
-        if (fabsf(t.x) > (h.x + fabsf(ld.x)))
-        {
-            return 0;
-        }
-        if (fabsf(t.y) > (h.y + fabsf(ld.y)))
-        {
-            return 0;
-        }
-        if (fabsf(t.y * ld.x - t.x * ld.y) > (fabsf(h.x * ld.y) + fabsf(h.y * ld.x)))
-        {
-            return 0;
-        }
-        return 1; //no separating axis found, objects overlap
-    }
-
-
-
-    /*!
-    * we use the SEPARATING AXIS TEST to check if two OBB's overlap.
-    *
-    * Example:
-    *  bool result=Overlap::Lineseg_OBB( lineseg, pos,obb );
-    */
-    inline bool Lineseg_OBB (const Lineseg& ls, const Vec3& pos, const OBB& obb)
-    {
-        //the new center-position of Lineseg and OBB in world-space
-        Vec3 wposobb    =   obb.m33 * obb.c + pos;
-        Vec3 wposls =   (ls.start + ls.end) * 0.5f;
-        //"t" is the transfer-vector from one center to the other
-        Vec3 t      = (wposls - wposobb) * obb.m33;
-        //calculate line-direction in local obb-space
-        Vec3 ld  =  ((ls.end - ls.start) * obb.m33) * 0.5f;
-        if (fabsf(t.x) > (obb.h.x + fabsf(ld.x)))
-        {
-            return 0;
-        }
-        if (fabsf(t.y) > (obb.h.y + fabsf(ld.y)))
-        {
-            return 0;
-        }
-        if (fabsf(t.z) > (obb.h.z + fabsf(ld.z)))
-        {
-            return 0;
-        }
-        if (fabsf(t.z * ld.y - t.y * ld.z) > (fabsf(obb.h.y * ld.z) + fabsf(obb.h.z * ld.y)))
-        {
-            return 0;
-        }
-        if (fabsf(t.x * ld.z - t.z * ld.x) > (fabsf(obb.h.x * ld.z) + fabsf(obb.h.z * ld.x)))
-        {
-            return 0;
-        }
-        if (fabsf(t.y * ld.x - t.x * ld.y) > (fabsf(obb.h.x * ld.y) + fabsf(obb.h.y * ld.x)))
-        {
-            return 0;
-        }
-        return 1; //no separating axis found, objects overlap
-    }
-
-
-
-
-    /*!
-    *
-    * overlap-test between a line and a triangle.
-    * IMPORTANT: this is a single-sided test. That means its not enough
-    * that the triangle and line overlap, its also important that the triangle
-    * is "visible" when you are looking along the line-direction.
-    *
-    * If you need a double-sided test, you'll have to call this function twice with
-    * reversed order of triangle vertices.
-    *
-    * return values
-    * return "true" if line and triangle overlap.
-    *
-    */
-    inline bool Line_Triangle(const Line& line, const Vec3& v0, const Vec3& v1, const Vec3& v2)
-    {
-        const float Epsilon = 0.0000001f;
-
-        Vec3 edgeA = v1 - v0;
-        Vec3 edgeB = v2 - v0;
-
-        Vec3 dir = line.direction;
-
-        Vec3 p = dir.Cross(edgeA);
-        Vec3 t = line.pointonline - v0;
-        Vec3 q = t.Cross(edgeB);
-
-        float dot = edgeB.Dot(p);
-
-        float u = t.Dot(p);
-        float v = dir.Dot(q);
-
-        float DotGreaterThanEpsilon = dot - Epsilon;
-        float VGreaterEqualThanZero = v;
-        float UGreaterEqualThanZero = u;
-        float UVLessThanDot = dot - (u + v);
-        float ULessThanDot = dot - u;
-
-        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
-        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
-        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
-        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
-
-        return AllGood >= 0.0f;
-    }
-
-
-    /*!
-    *
-    * overlap-test between a ray and a triangle.
-    * IMPORTANT: this is a single-sided test. That means its not sufficient
-    * that the triangle and ray overlap, its also important that the triangle
-    * is "visible" when you are looking from the origin along the ray-direction.
-    *
-    * If you need a double-sided test, you'll have to call this function twice with
-    * reversed order of triangle vertices.
-    *
-    * return values
-    * return "true" if ray and triangle overlap.
-    */
-    inline bool Ray_Triangle(const Ray& ray, const Vec3& v0, const Vec3& v1, const Vec3& v2)
-    {
-        const float Epsilon = 0.0000001f;
-
-        Vec3 edgeA = v1 - v0;
-        Vec3 edgeB = v2 - v0;
-
-        Vec3 dir = ray.direction;
-
-        Vec3 p = dir.Cross(edgeA);
-        Vec3 t = ray.origin - v0;
-        Vec3 q = t.Cross(edgeB);
-
-        float dot = edgeB.Dot(p);
-
-        float u = t.Dot(p);
-        float v = dir.Dot(q);
-
-        float DotGreaterThanEpsilon = dot - Epsilon;
-        float VGreaterEqualThanZero = v;
-        float UGreaterEqualThanZero = u;
-        float UVLessThanDot = dot - (u + v);
-        float ULessThanDot = dot - u;
-
-        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
-        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
-        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
-        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
-
-        if (AllGood < 0.0f)
-        {
-            return false;
-        }
-
-        float dt = edgeA.Dot(q) / dot;
-
-        Vec3 result = (dir * dt) + ray.origin;
-
-        float AfterStart = (result - ray.origin).Dot(dir);
-
-        return AfterStart >= 0.0f;
-    }
-
-    /*!
-    *
-    * overlap-test between line-segment and a triangle.
-    * IMPORTANT: this is a single-sided test. That means its not sufficient
-    * that the triangle and line-segment overlap, its also important that the triangle
-    * is "visible" when you are looking along the linesegment from "start" to "end".
-    *
-    * If you need a double-sided test, you'll have to call this function twice with
-    * reversed order of triangle vertices.
-    *
-    * return values
-    * return "true" if linesegment and triangle overlap.
-    */
-    inline bool Lineseg_Triangle(const Lineseg& lineseg, const Vec3& v0, const Vec3& v1, const Vec3& v2)
-    {
-        const float Epsilon = 0.0000001f;
-
-        Vec3 edgeA = v1 - v0;
-        Vec3 edgeB = v2 - v0;
-
-        Vec3 dir = lineseg.end - lineseg.start;
-
-        Vec3 p = dir.Cross(edgeA);
-        Vec3 t = lineseg.start - v0;
-        Vec3 q = t.Cross(edgeB);
-
-        float dot = edgeB.Dot(p);
-
-        float u = t.Dot(p);
-        float v = dir.Dot(q);
-
-        float DotGreaterThanEpsilon = dot - Epsilon;
-        float VGreaterEqualThanZero = v;
-        float UGreaterEqualThanZero = u;
-        float UVLessThanDot = dot - (u + v);
-        float ULessThanDot = dot - u;
-
-        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
-        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
-        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
-        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
-
-        if (AllGood < 0.0f)
-        {
-            return false;
-        }
-
-        float dt = edgeA.Dot(q) / dot;
-
-        Vec3 result = (dir * dt) + lineseg.start;
-
-        float AfterStart = (result - lineseg.start).Dot(dir);
-        float BeforeEnd = -(result - lineseg.end).Dot(dir);
-        float Within = (float)fsel(AfterStart, BeforeEnd, AfterStart);
-
-        return Within >= 0.0f;
-    }
-
-    /*----------------------------------------------------------------------------------
-    * Sphere_AABB
-    *   Sphere and AABB are assumed to be in the same space
-    *
-    * Example:
-    *  bool result=Overlap::Sphere_AABB_Inside( sphere, aabb );
-    *
-    * 0 = no overlap
-    * 1 = overlap
-    *----------------------------------------------------------------------------------*/
-    ILINE bool Sphere_AABB(const ::Sphere& s, const AABB& aabb)
-    {
-        Vec3 center(s.center);
-
-        Vec3 aabb_min(aabb.min);
-        Vec3 aabb_max(aabb.max);
-
-        float radiusSq = s.radius * s.radius;
-
-        float x = (float)fsel(aabb_min.x - center.x, center.x - aabb_min.x, fsel(center.x - aabb_max.x, center.x - aabb_max.x, 0.0f));
-        float y = (float)fsel(aabb_min.y - center.y, center.y - aabb_min.y, fsel(center.y - aabb_max.y, center.y - aabb_max.y, 0.0f));
-        float z = (float)fsel(aabb_min.z - center.z, center.z - aabb_min.z, fsel(center.z - aabb_max.z, center.z - aabb_max.z, 0.0f));
-
-        return (x * x + y * y + z * z) < radiusSq;
-    }
-
-    // As Sphere_AABB but ignores z parts
-    ILINE bool Sphere_AABB2D(const ::Sphere& s, const AABB& aabb)
-    {
-        Vec3 center(s.center);
-
-        Vec3 aabb_min(aabb.min);
-        Vec3 aabb_max(aabb.max);
-
-        float radiusSq = s.radius * s.radius;
-
-        float x = (float)fsel(aabb_min.x - center.x, center.x - aabb_min.x, fsel(center.x - aabb_max.x, center.x - aabb_max.x, 0.0f));
-        float y = (float)fsel(aabb_min.y - center.y, center.y - aabb_min.y, fsel(center.y - aabb_max.y, center.y - aabb_max.y, 0.0f));
-
-        return (x * x + y * y) < radiusSq;
-    }
-
-
-    /*!
-    *
-    * conventional method to check if a Sphere and an AABB overlap,
-    * or if the Sphere is completely inside the AABB.
-    *   Sphere and AABB are assumed to be in the same space
-    *
-    * Example:
-    *  bool result=Overlap::Sphere_AABB_Inside( sphere, aabb );
-    *
-    * return values:
-    * 0x00 = no overlap
-    * 0x01 = Sphere and AABB overlap
-    * 0x02 = Sphere in inside AABB
-    */
-    ILINE char Sphere_AABB_Inside(const ::Sphere& s, const AABB& aabb)
-    {
-        if (Sphere_AABB(s, aabb))
-        {
-            Vec3 amin = aabb.min - s.center;
-            Vec3 amax = aabb.max - s.center;
-            if  (amin.x >= (-s.radius))
-            {
-                return 1;
-            }
-            if  (amin.y >= (-s.radius))
-            {
-                return 1;
-            }
-            if  (amin.z >= (-s.radius))
-            {
-                return 1;
-            }
-            if  (amax.x <= (+s.radius))
-            {
-                return 1;
-            }
-            if  (amax.y <= (+s.radius))
-            {
-                return 1;
-            }
-            if  (amax.z <= (+s.radius))
-            {
-                return 1;
-            }
-            //yes, its inside
-            return 2;
-        }
-        return 0;
-    }
-
-    //----------------------------------------------------------------------------------
-    //  Sphere_OBB
-    //  VERY IMPORTANT: Sphere is assumed to be in the space of the OBB, otherwise it won't work
-    //
-    //--- 0 = no overlap                                     ---------------------------
-    //--- 1 = overlap                                                  -----------------
-    //----------------------------------------------------------------------------------
-    inline bool Sphere_OBB(const ::Sphere& s, const OBB& obb)
-    {
-        //first we transform the sphere-center into the AABB-space of the OBB
-        Vec3 SphereInOBBSpace   =   s.center * obb.m33;
-        //the rest ist the same as the "Overlap::Sphere_AABB" calculation
-        float quatradius = s.radius * s.radius;
-        Vec3 quat(0, 0, 0);
-        AABB aabb = AABB(obb.c - obb.h, obb.c + obb.h);
-        if (SphereInOBBSpace.x < aabb.min.x)
-        {
-            quat.x = SphereInOBBSpace.x - aabb.min.x;
-        }
-        else if (SphereInOBBSpace.x > aabb.max.x)
-        {
-            quat.x = SphereInOBBSpace.x - aabb.max.x;
-        }
-        if (SphereInOBBSpace.y < aabb.min.y)
-        {
-            quat.y = SphereInOBBSpace.y - aabb.min.y;
-        }
-        else if (SphereInOBBSpace.y > aabb.max.y)
-        {
-            quat.y = SphereInOBBSpace.y - aabb.max.y;
-        }
-        if (SphereInOBBSpace.z < aabb.min.z)
-        {
-            quat.z = SphereInOBBSpace.z - aabb.min.z;
-        }
-        else if (SphereInOBBSpace.z > aabb.max.z)
-        {
-            quat.z = SphereInOBBSpace.z - aabb.max.z;
-        }
-        return((quat | quat) < quatradius);
-    }
-
-
-    //----------------------------------------------------------------------------------
-    //  Sphere_Sphere overlap test
-    //
-    //--- 0 = no overlap                                     ---------------------------
-    //--- 1 = overlap                                                  -----------------
-    //----------------------------------------------------------------------------------
-    inline bool Sphere_Sphere(const ::Sphere& s1, const ::Sphere& s2)
-    {
-        Vec3 distc  =   s1.center - s2.center;
-        f32 sqrad       =   (s1.radius + s2.radius) * (s1.radius + s2.radius);
-        return (sqrad > (distc | distc));
-    }
-
-    ILINE bool HWVSphere_HWVSphere(const HWVSphere& s1, const HWVSphere& s2)
-    {
-        simdf fTotalRadius = SIMDFAdd(s1.radius, s2.radius);
-        hwvec3 distc = HWVSub(s1.center, s2.center);
-        simdf fTotalRadiusSqr = SIMDFMult(fTotalRadius, fTotalRadius);
-        simdf fDistanceSqr = HWV3Dot(distc, distc);
-        return SIMDFLessThanEqualB(fDistanceSqr, fTotalRadiusSqr);
-    }
-
-    //----------------------------------------------------------------------------------
-    //  Sphere_Triangle overlap test
-    //
-    //--- 0 = no overlap                                     ---------------------------
-    //--- 1 = overlap                                                  -----------------
-    //----------------------------------------------------------------------------------
-    template<typename F>
-    ILINE bool Sphere_Triangle(const ::Sphere& s, const Triangle_tpl<F>& t)
-    {
-        //create a "bouding sphere" around triangle for fast rejection test
-        Vec3_tpl<F> middle = (t.v0 + t.v1 + t.v2) * (1 / 3.0f);
-        Vec3_tpl<F> ov0 = t.v0 - middle;
-        Vec3_tpl<F> ov1 = t.v1 - middle;
-        Vec3_tpl<F> ov2 = t.v2 - middle;
-        F SqRad0 = (ov0 | ov0);
-        F SqRad1 = (ov1 | ov1);
-        F SqRad2 = (ov2 | ov2);
-
-        SqRad0 = (F)fsel(SqRad0 - SqRad1, SqRad0, SqRad1);
-        SqRad0 = (F)fsel(SqRad0 - SqRad2, SqRad0, SqRad2);
-
-        //first simple rejection-test...
-        if (Sphere_Sphere(s, ::Sphere(middle, sqrt_tpl(SqRad0))) == 0)
-        {
-            return 0;                                                        //overlap not possible
-        }
-        //...and now the hardcore-test!
-        if ((s.radius * s.radius) < Distance::Point_TriangleSq(s.center, t))
-        {
-            return 0;
-        }
-        return 1; //sphere and triangle are overlapping
-    }
-
-    ILINE bool HWVSphere_TriangleFromPoints(const HWVSphere& s, const hwvec3& t0, const hwvec3& t1, const hwvec3& t2)
-    {
-        //create a "bounding sphere" around triangle for fast rejection test
-        SIMDFConstant(fOneThird, 1.0f / 3.0f);
-
-        hwvec3 middle = HWVMultiplySIMDF(HWVAdd(t0, HWVAdd(t1, t2)), fOneThird);
-
-        hwvec3 ov0 = HWVSub(t0, middle);
-        hwvec3 ov1 = HWVSub(t1, middle);
-        hwvec3 ov2 = HWVSub(t2, middle);
-
-        simdf SqRad0 = HWV3Dot(ov0, ov0);
-        simdf SqRad1 = HWV3Dot(ov1, ov1);
-        simdf SqRad2 = HWV3Dot(ov2, ov2);
-
-        SqRad0 = SIMDFMax(SqRad0, SqRad1);
-        SqRad0 = SIMDFMax(SqRad0, SqRad2);
-
-        //first simple rejection-test...
-        //if( HWVSphere_HWVSphere(s, HWVSphere(middle, SIMDFSqrtEstFast(SqRad0)))==0 )
-        if (HWVSphere_HWVSphere(s, HWVSphere(middle, SIMDFSqrtEst(SqRad0))) == 0)
-        {
-            return 0; //overlap not possible
-        }
-        else
-        {
-            //...and now the hardcore-test!
-            simdf fRadiusSq = SIMDFMult(s.radius, s.radius);
-            simdf fDistToTriangleSq = Distance::Point_TriangleByPointsSq(s.center, t0, t1, t2);
-
-            return SIMDFLessThanEqualB(fDistToTriangleSq, fRadiusSq);
-        }
-    }
-
-    /*!
-    *
-    * we use the SEPARATING AXIS TEST to check if a triangle and AABB overlap.
-    *
-    * Example:
-    *  bool result=Overlap::AABB_Triangle( pos,aabb, tv0,tv1,tv2 );
-    *
-    */
-    inline bool AABB_Triangle (const AABB& aabb,  const Vec3& tv0, const Vec3& tv1, const Vec3& tv2)
-    {
-        //------ convert AABB into half-length AABB -----------
-        Vec3 h  =   (aabb.max - aabb.min) * 0.5f;   //calculate the half-length-vectors
-        Vec3 c  =   (aabb.max + aabb.min) * 0.5f;   //the center is relative to the PIVOT
-
-        //move everything so that the boxcenter is in (0,0,0)
-        Vec3 v0 =   tv0 - c;
-        Vec3 v1 =   tv1 - c;
-        Vec3 v2 =   tv2 - c;
-
-        //compute triangle edges
-        Vec3 e0 =   v1 - v0;
-        Vec3 e1 =   v2 - v1;
-        Vec3 e2 =   v0 - v2;
-
-        //--------------------------------------------------------------------------------------
-        //    use SEPARATING AXIS THEOREM to test overlap  between AABB and triangle
-        //    cross-product(edge from triangle, {x,y,z}-direction),  this are 3x3=9 tests
-        //--------------------------------------------------------------------------------------
-        float min, max, p0, p1, p2, rad, fex, fey, fez;
-        fex = fabsf(e0.x);
-        fey = fabsf(e0.y);
-        fez = fabsf(e0.z);
-
-        //AXISTEST_X01(e0.z, e0.y, fez, fey);
-        p0 = e0.z * v0.y - e0.y * v0.z;
-        p2 = e0.z * v2.y - e0.y * v2.z;
-        if (p0 < p2)
-        {
-            min = p0;
-            max = p2;
-        }
-        else
-        {
-            min = p2;
-            max = p0;
-        }
-        rad = fez * h.y + fey * h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Y02(e0.z, e0.x, fez, fex);
-        p0 = -e0.z * v0.x + e0.x * v0.z;
-        p2 = -e0.z * v2.x + e0.x * v2.z;
-        if (p0 < p2)
-        {
-            min = p0;
-            max = p2;
-        }
-        else
-        {
-            min = p2;
-            max = p0;
-        }
-        rad = fez * h.x + fex * h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Z12(e0.y, e0.x, fey, fex);
-        p1 = e0.y * v1.x - e0.x * v1.y;
-        p2 = e0.y * v2.x - e0.x * v2.y;
-        if (p2 < p1)
-        {
-            min = p2;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p2;
-        }
-        rad = fey * h.x + fex * h.y;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //-----------------------------------------------
-
-        fex = fabsf(e1.x);
-        fey = fabsf(e1.y);
-        fez = fabsf(e1.z);
-        //AXISTEST_X01(e1.z, e1.y, fez, fey);
-        p0 = e1.z * v0.y - e1.y * v0.z;
-        p2 = e1.z * v2.y - e1.y * v2.z;
-        if (p0 < p2)
-        {
-            min = p0;
-            max = p2;
-        }
-        else
-        {
-            min = p2;
-            max = p0;
-        }
-        rad = fez * h.y + fey * h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Y02(e1.z, e1.x, fez, fex);
-        p0 = -e1.z * v0.x + e1.x * v0.z;
-        p2 = -e1.z * v2.x + e1.x * v2.z;
-        if (p0 < p2)
-        {
-            min = p0;
-            max = p2;
-        }
-        else
-        {
-            min = p2;
-            max = p0;
-        }
-        rad = fez * h.x + fex * h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Z0(e1.y, e1.x, fey, fex);
-        p0 = e1.y * v0.x - e1.x * v0.y;
-        p1 = e1.y * v1.x - e1.x * v1.y;
-        if (p0 < p1)
-        {
-            min = p0;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p0;
-        }
-        rad = fey * h.x + fex * h.y;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //-----------------------------------------------
-
-        fex = fabsf(e2.x);
-        fey = fabsf(e2.y);
-        fez = fabsf(e2.z);
-        //AXISTEST_X2(e2.z, e2.y, fez, fey);
-        p0 = e2.z * v0.y - e2.y * v0.z;
-        p1 = e2.z * v1.y - e2.y * v1.z;
-        if (p0 < p1)
-        {
-            min = p0;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p0;
-        }
-        rad = fez * h.y + fey * h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Y1(e2.z, e2.x, fez, fex);
-        p0 = -e2.z * v0.x + e2.x * v0.z;
-        p1 = -e2.z * v1.x + e2.x * v1.z;
-        if (p0 < p1)
-        {
-            min = p0;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p0;
-        }
-        rad = fez * h.x + fex * h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Z12(e2.y, e2.x, fey, fex);
-        p1 = e2.y * v1.x - e2.x * v1.y;
-        p2 = e2.y * v2.x - e2.x * v2.y;
-        if (p2 < p1)
-        {
-            min = p2;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p2;
-        }
-        rad = fey * h.x + fex * h.y;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //the {x,y,z}-directions (actually, since we use the AABB of the triangle we don't even need to test these)
-        //first test overlap in the {x,y,z}-directions
-        //find min, max of the triangle each direction, and test for overlap in that direction --
-        //this is equivalent to testing a minimal AABB around the triangle against the AABB
-        AABB taabb;
-        FINDMINMAX(v0.x, v1.x, v2.x, taabb.min.x, taabb.max.x);
-        FINDMINMAX(v0.y, v1.y, v2.y, taabb.min.y, taabb.max.y);
-        FINDMINMAX(v0.z, v1.z, v2.z, taabb.min.z, taabb.max.z);
-
-        //test in X-direction
-        FINDMINMAX(v0.x, v1.x, v2.x, taabb.min.x, taabb.max.x);
-        if (taabb.min.x > h.x || taabb.max.x < -h.x)
-        {
-            return 0;
-        }
-
-        //test in Y-direction
-        FINDMINMAX(v0.y, v1.y, v2.y, taabb.min.y, taabb.max.y);
-        if (taabb.min.y > h.y || taabb.max.y < -h.y)
-        {
-            return 0;
-        }
-
-        //test in Z-direction
-        FINDMINMAX(v0.z, v1.z, v2.z, taabb.min.z, taabb.max.z);
-        if (taabb.min.z > h.z || taabb.max.z < -h.z)
-        {
-            return 0;
-        }
-
-        //test if the box intersects the plane of the triangle
-        //compute plane equation of triangle: normal*x+d=0
-        Plane_tpl<f32> plane = Plane_tpl<f32>::CreatePlane((e0 % e1), v0);
-
-        Vec3 vmin, vmax;
-        if (plane.n.x > 0.0f)
-        {
-            vmin.x = -h.x;
-            vmax.x = +h.x;
-        }
-        else
-        {
-            vmin.x = +h.x;
-            vmax.x = -h.x;
-        }
-        if (plane.n.y > 0.0f)
-        {
-            vmin.y = -h.y;
-            vmax.y = +h.y;
-        }
-        else
-        {
-            vmin.y = +h.y;
-            vmax.y = -h.y;
-        }
-        if (plane.n.z > 0.0f)
-        {
-            vmin.z = -h.z;
-            vmax.z = +h.z;
-        }
-        else
-        {
-            vmin.z = +h.z;
-            vmax.z = -h.z;
-        }
-        if ((plane | vmin) > 0.0f)
-        {
-            return 0;
-        }
-        if ((plane | vmax) < 0.0f)
-        {
-            return 0;
-        }
-        return 1;
-    }
-
-
-
-    /*!
-    *
-    * we use the SEPARATING AXIS TEST to check if a triangle and an OBB overlaps.
-    *
-    * Example:
-    *  bool result=Overlap::OBB_Trinagle( pos1,obb1, tv0,tv1,tv2 );
-    *
-    */
-    inline bool OBB_Triangle(const Vec3& pos, const OBB& obb,  const Vec3& tv0, const Vec3& tv1, const Vec3& tv2)
-    {
-        Vec3 p  =   obb.m33 * obb.c + pos;                                    //the new center-position in world-space
-
-        //move everything so that the boxcenter is in (0,0,0)
-        Vec3 v0 =   (tv0 - p) * obb.m33; //pre-transform
-        Vec3 v1 =   (tv1 - p) * obb.m33; //pre-transform
-        Vec3 v2 =   (tv2 - p) * obb.m33; //pre-transform
-
-
-        //compute triangle edges
-        Vec3 e0 =   v1 - v0;
-        Vec3 e1 =   v2 - v1;
-        Vec3 e2 =   v0 - v2;
-
-        //--------------------------------------------------------------------------------------
-        //    use SEPARATING AXIS THEOREM to test intersection between AABB and triangle
-        //    cross-product(edge from triangle, {x,y,z}-direction),  this are 3x3=9 tests
-        //--------------------------------------------------------------------------------------
-        float min, max, p0, p1, p2, rad, fex, fey, fez;
-        fex = fabsf(e0.x);
-        fey = fabsf(e0.y);
-        fez = fabsf(e0.z);
-
-        //AXISTEST_X01(e0.z, e0.y, fez, fey);
-        p0 = e0.z * v0.y - e0.y * v0.z;
-        p2 = e0.z * v2.y - e0.y * v2.z;
-        if (p0 < p2)
-        {
-            min = p0;
-            max = p2;
-        }
-        else
-        {
-            min = p2;
-            max = p0;
-        }
-        rad = fez * obb.h.y + fey * obb.h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Y02(e0.z, e0.x, fez, fex);
-        p0 = -e0.z * v0.x + e0.x * v0.z;
-        p2 = -e0.z * v2.x + e0.x * v2.z;
-        if (p0 < p2)
-        {
-            min = p0;
-            max = p2;
-        }
-        else
-        {
-            min = p2;
-            max = p0;
-        }
-        rad = fez * obb.h.x + fex * obb.h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Z12(e0.y, e0.x, fey, fex);
-        p1 = e0.y * v1.x - e0.x * v1.y;
-        p2 = e0.y * v2.x - e0.x * v2.y;
-        if (p2 < p1)
-        {
-            min = p2;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p2;
-        }
-        rad = fey * obb.h.x + fex * obb.h.y;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //-----------------------------------------------
-
-        fex = fabsf(e1.x);
-        fey = fabsf(e1.y);
-        fez = fabsf(e1.z);
-        //AXISTEST_X01(e1.z, e1.y, fez, fey);
-        p0 = e1.z * v0.y - e1.y * v0.z;
-        p2 = e1.z * v2.y - e1.y * v2.z;
-        if (p0 < p2)
-        {
-            min = p0;
-            max = p2;
-        }
-        else
-        {
-            min = p2;
-            max = p0;
-        }
-        rad = fez * obb.h.y + fey * obb.h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Y02(e1.z, e1.x, fez, fex);
-        p0 = -e1.z * v0.x + e1.x * v0.z;
-        p2 = -e1.z * v2.x + e1.x * v2.z;
-        if (p0 < p2)
-        {
-            min = p0;
-            max = p2;
-        }
-        else
-        {
-            min = p2;
-            max = p0;
-        }
-        rad = fez * obb.h.x + fex * obb.h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Z0(e1.y, e1.x, fey, fex);
-        p0 = e1.y * v0.x - e1.x * v0.y;
-        p1 = e1.y * v1.x - e1.x * v1.y;
-        if (p0 < p1)
-        {
-            min = p0;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p0;
-        }
-        rad = fey * obb.h.x + fex * obb.h.y;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //-----------------------------------------------
-
-        fex = fabsf(e2.x);
-        fey = fabsf(e2.y);
-        fez = fabsf(e2.z);
-        //AXISTEST_X2(e2.z, e2.y, fez, fey);
-        p0 = e2.z * v0.y - e2.y * v0.z;
-        p1 = e2.z * v1.y - e2.y * v1.z;
-        if (p0 < p1)
-        {
-            min = p0;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p0;
-        }
-        rad = fez * obb.h.y + fey * obb.h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Y1(e2.z, e2.x, fez, fex);
-        p0 = -e2.z * v0.x + e2.x * v0.z;
-        p1 = -e2.z * v1.x + e2.x * v1.z;
-        if (p0 < p1)
-        {
-            min = p0;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p0;
-        }
-        rad = fez * obb.h.x + fex * obb.h.z;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //AXISTEST_Z12(e2.y, e2.x, fey, fex);
-        p1 = e2.y * v1.x - e2.x * v1.y;
-        p2 = e2.y * v2.x - e2.x * v2.y;
-        if (p2 < p1)
-        {
-            min = p2;
-            max = p1;
-        }
-        else
-        {
-            min = p1;
-            max = p2;
-        }
-        rad = fey * obb.h.x + fex * obb.h.y;
-        if (min > rad || max < -rad)
-        {
-            return 0;
-        }
-
-        //the {x,y,z}-directions (actually, since we use the AABB of the triangle we don't even need to test these)
-        //first test overlap in the {x,y,z}-directions
-        //find min, max of the triangle each direction, and test for overlap in that direction --
-        //this is equivalent to testing a minimal AABB around the triangle against the AABB
-        AABB taabb;
-        FINDMINMAX(v0.x, v1.x, v2.x, taabb.min.x, taabb.max.x);
-        FINDMINMAX(v0.y, v1.y, v2.y, taabb.min.y, taabb.max.y);
-        FINDMINMAX(v0.z, v1.z, v2.z, taabb.min.z, taabb.max.z);
-
-        // test in X-direction
-        FINDMINMAX(v0.x, v1.x, v2.x, taabb.min.x, taabb.max.x);
-        if (taabb.min.x > obb.h.x || taabb.max.x < -obb.h.x)
-        {
-            return 0;
-        }
-
-        // test in Y-direction
-        FINDMINMAX(v0.y, v1.y, v2.y, taabb.min.y, taabb.max.y);
-        if (taabb.min.y > obb.h.y || taabb.max.y < -obb.h.y)
-        {
-            return 0;
-        }
-
-        // test in Z-direction
-        FINDMINMAX(v0.z, v1.z, v2.z, taabb.min.z, taabb.max.z);
-        if (taabb.min.z > obb.h.z || taabb.max.z < -obb.h.z)
-        {
-            return 0;
-        }
-
-        //test if the box overlaps the plane of the triangle
-        //compute plane equation of triangle: normal*x+d=0
-        Plane_tpl<f32> plane = Plane_tpl<f32>::CreatePlane((e0 % e1), v0);
-
-        Vec3 vmin, vmax;
-        if (plane.n.x > 0.0f)
-        {
-            vmin.x = -obb.h.x;
-            vmax.x = +obb.h.x;
-        }
-        else
-        {
-            vmin.x = +obb.h.x;
-            vmax.x = -obb.h.x;
-        }
-        if (plane.n.y > 0.0f)
-        {
-            vmin.y = -obb.h.y;
-            vmax.y = +obb.h.y;
-        }
-        else
-        {
-            vmin.y = +obb.h.y;
-            vmax.y = -obb.h.y;
-        }
-        if (plane.n.z > 0.0f)
-        {
-            vmin.z = -obb.h.z;
-            vmax.z = +obb.h.z;
-        }
-        else
-        {
-            vmin.z = +obb.h.z;
-            vmax.z = -obb.h.z;
-        }
-        if ((plane | vmin) > 0.0f)
-        {
-            return 0;
-        }
-        if ((plane | vmax) < 0.0f)
-        {
-            return 0;
-        }
-        return 1;
-    }
-
-
-
-
-
-
-
-
-
-    /*!
-    *
-    * conventional method to check if two AABB's overlap.
-    * both AABBs are assumed to be in the same space
-    *
-    * Example:
-    *  bool result=Overlap::AABB_AABB( aabb1, aabb2 );
-    *
-    */
-    ILINE bool AABB_AABB(const AABB& aabb1, const AABB& aabb2)
-    {
-        if  (aabb1.min.x >= aabb2.max.x)
-        {
-            return 0;
-        }
-        if  (aabb1.min.y >= aabb2.max.y)
-        {
-            return 0;
-        }
-        if  (aabb1.min.z >= aabb2.max.z)
-        {
-            return 0;
-        }
-        if  (aabb1.max.x <= aabb2.min.x)
-        {
-            return 0;
-        }
-        if  (aabb1.max.y <= aabb2.min.y)
-        {
-            return 0;
-        }
-        if  (aabb1.max.z <= aabb2.min.z)
-        {
-            return 0;
-        }
-        return 1; //the aabb's overlap
-    }
-
-    /// AABB overlap test - but ignores z values
-    ILINE bool AABB_AABB2D(const AABB& aabb1, const AABB& aabb2)
-    {
-        if  (aabb1.min.x >= aabb2.max.x)
-        {
-            return 0;
-        }
-        if  (aabb1.min.y >= aabb2.max.y)
-        {
-            return 0;
-        }
-        if  (aabb1.max.x <= aabb2.min.x)
-        {
-            return 0;
-        }
-        if  (aabb1.max.y <= aabb2.min.y)
-        {
-            return 0;
-        }
-        return 1; //the aabb's overlap
-    }
-
-
-    /*!
-    *
-    * Conventional method to check if two AABB's overlap.
-    * Both AABBs are in local object space. Used the position-vector
-    * to translate them into world-space
-    *
-    * Example:
-    *  bool result=Overlap::AABB_AABB( pos1,aabb1, pos2,aabb2 );
-    *
-    */
-    ILINE bool AABB_AABB(const Vec3& pos1, const AABB& aabb1,  const Vec3& pos2, const AABB& aabb2)
-    {
-        AABB waabb1(aabb1.min + pos1, aabb1.max + pos1);
-        AABB waabb2(aabb2.min + pos2, aabb2.max + pos2);
-        return AABB_AABB(waabb1, waabb2);
-    }
-
-
-    /*!
-    *
-    * conventional method to check if two AABB's overlap
-    * or if AABB1 is comletely inside AABB2.
-    * both AABBs are assumed to be in the same space
-    *
-    * Example:
-    *  bool result=Overlap::AABB_AABB_Inside( aabb1, aabb2 );
-    *
-    * return values:
-    * 0x00 = no overlap
-    * 0x01 = both AABBs one overlap
-    * 0x02 = AABB1 in inside AABB2
-    */
-    ILINE char AABB_AABB_Inside(const AABB& aabb1, const AABB& aabb2)
-    {
-        if (AABB_AABB(aabb1, aabb2))
-        {
-            if  (aabb1.min.x <= aabb2.min.x)
-            {
-                return 1;
-            }
-            if  (aabb1.min.y <= aabb2.min.y)
-            {
-                return 1;
-            }
-            if  (aabb1.min.z <= aabb2.min.z)
-            {
-                return 1;
-            }
-            if  (aabb1.max.x >= aabb2.max.x)
-            {
-                return 1;
-            }
-            if  (aabb1.max.y >= aabb2.max.y)
-            {
-                return 1;
-            }
-            if  (aabb1.max.z >= aabb2.max.z)
-            {
-                return 1;
-            }
-            //yes, its inside
-            return 2;
-        }
-        return 0;
-    }
-
-
-    /*!
-    *
-    * we use the SEPARATING AXIS TEST to check if and AABB and an OBB overlap.
-    *
-    * Example:
-    *  bool result=Overlap::AABB_OBB( aabb, pos,obb );
-    *
-    */
-    inline bool AABB_OBB (const AABB& aabb,  const Vec3& pos, const OBB& obb)
-    {
-        Vec3 h  =   (aabb.max - aabb.min) * 0.5f;   //calculate the half-length-vectors
-        Vec3 c  =   (aabb.max + aabb.min) * 0.5f;   //the center in world-space
-
-        //"t" is the transfer-vector from one center to the other
-        Vec3 t  = obb.m33 * obb.c + pos - c;
-
-        f32 ra, rb;
-
-        //--------------------------------------------------------------------------
-        //--  we use the vectors "1,0,0","0,1,0" and "0,0,1" as separating axis
-        //--------------------------------------------------------------------------
-        rb  =   fabsf(obb.m33.m00 * obb.h.x) + fabsf(obb.m33.m01 * obb.h.y) + fabsf(obb.m33.m02 * obb.h.z);
-        if (fabsf(t.x) > (fabsf(h.x) + rb))
-        {
-            return 0;
-        }
-        rb  =   fabsf(obb.m33.m10 * obb.h.x) + fabsf(obb.m33.m11 * obb.h.y) + fabsf(obb.m33.m12 * obb.h.z);
-        if (fabsf(t.y) > (fabsf(h.y) + rb))
-        {
-            return 0;
-        }
-        rb  =   fabsf(obb.m33.m20 * obb.h.x) + fabsf(obb.m33.m21 * obb.h.y) + fabsf(obb.m33.m22 * obb.h.z);
-        if (fabsf(t.z) > (fabsf(h.z) + rb))
-        {
-            return 0;
-        }
-
-        //--------------------------------------------------------------------------
-        //--  we use the orientation-vectors "Mx","My" and "Mz" as separating axis
-        //--------------------------------------------------------------------------
-        ra  = fabsf(obb.m33.m00 * h.x) + fabsf(obb.m33.m10 * h.y) + fabsf(obb.m33.m20 * h.z);
-        if (fabsf(t | Vec3(obb.m33.m00, obb.m33.m10, obb.m33.m20)) > (ra + obb.h.x))
-        {
-            return 0;
-        }
-        ra  = fabsf(obb.m33.m01 * h.x) + fabsf(obb.m33.m11 * h.y) + fabsf(obb.m33.m21 * h.z);
-        if (fabsf(t | Vec3(obb.m33.m01, obb.m33.m11, obb.m33.m21)) > (ra + obb.h.y))
-        {
-            return 0;
-        }
-        ra  = fabsf(obb.m33.m02 * h.x) + fabsf(obb.m33.m12 * h.y) + fabsf(obb.m33.m22 * h.z);
-        if (fabsf(t | Vec3(obb.m33.m02, obb.m33.m12, obb.m33.m22)) > (ra + obb.h.z))
-        {
-            return 0;
-        }
-
-        //---------------------------------------------------------------------
-        //----  using 9 cross products we generate new separating axis
-        //---------------------------------------------------------------------
-        const float e0 = h.x + h.y + h.z, e1 = obb.h.x + obb.h.y + obb.h.z, e = (e0 + e1 - fabsf(e0 - e1)) * 0.0001f;
-        ra = h.y * fabsf(obb.m33.m20) + h.z * fabsf(obb.m33.m10);
-        rb = obb.h.y * fabsf(obb.m33.m02) + obb.h.z * fabsf(obb.m33.m01);
-        if (fabsf(t.z * obb.m33.m10 - t.y * obb.m33.m20) > (ra + rb) + e)
-        {
-            return 0;
-        }
-        ra = h.y * fabsf(obb.m33.m21) + h.z * fabsf(obb.m33.m11);
-        rb = obb.h.x * fabsf(obb.m33.m02) + obb.h.z * fabsf(obb.m33.m00);
-        if (fabsf(t.z * obb.m33.m11 - t.y * obb.m33.m21) > (ra + rb) + e)
-        {
-            return 0;
-        }
-        ra = h.y * fabsf(obb.m33.m22) + h.z * fabsf(obb.m33.m12);
-        rb = obb.h.x * fabsf(obb.m33.m01) + obb.h.y * fabsf(obb.m33.m00);
-        if (fabsf(t.z * obb.m33.m12 - t.y * obb.m33.m22) > (ra + rb) + e)
-        {
-            return 0;
-        }
-
-
-        ra = h.x * fabsf(obb.m33.m20) + h.z * fabsf(obb.m33.m00);
-        rb = obb.h.y * fabsf(obb.m33.m12) + obb.h.z * fabsf(obb.m33.m11);
-        if (fabsf(t.x * obb.m33.m20 - t.z * obb.m33.m00) > (ra + rb) + e)
-        {
-            return 0;
-        }
-        ra = h.x * fabsf(obb.m33.m21) + h.z * fabsf(obb.m33.m01);
-        rb = obb.h.x * fabsf(obb.m33.m12) + obb.h.z * fabsf(obb.m33.m10);
-        if (fabsf(t.x * obb.m33.m21 - t.z * obb.m33.m01) > (ra + rb) + e)
-        {
-            return 0;
-        }
-        ra = h.x * fabsf(obb.m33.m22) + h.z * fabsf(obb.m33.m02);
-        rb = obb.h.x * fabsf(obb.m33.m11) + obb.h.y * fabsf(obb.m33.m10);
-        if (fabsf(t.x * obb.m33.m22 - t.z * obb.m33.m02) > (ra + rb) + e)
-        {
-            return 0;
-        }
-
-
-        ra = h.x * fabsf(obb.m33.m10) + h.y * fabsf(obb.m33.m00);
-        rb = obb.h.y * fabsf(obb.m33.m22) + obb.h.z * fabsf(obb.m33.m21);
-        if (fabsf(t.y * obb.m33.m00 - t.x * obb.m33.m10) > (ra + rb) + e)
-        {
-            return 0;
-        }
-        ra = h.x * fabsf(obb.m33.m11) + h.y * fabsf(obb.m33.m01);
-        rb = obb.h.x * fabsf(obb.m33.m22) + obb.h.z * fabsf(obb.m33.m20);
-        if (fabsf(t.y * obb.m33.m01 - t.x * obb.m33.m11) > (ra + rb) + e)
-        {
-            return 0;
-        }
-        ra = h.x * fabsf(obb.m33.m12) + h.y * fabsf(obb.m33.m02);
-        rb = obb.h.x * fabsf(obb.m33.m21) + obb.h.y * fabsf(obb.m33.m20);
-        if (fabsf(t.y * obb.m33.m02 - t.x * obb.m33.m12) > (ra + rb) + e)
-        {
-            return 0;
-        }
-
-        //no separating axis found, we have an intersection
-        return 1;
-    }
-
-    /*!
-    *
-    * we use the SEPARATING AXIS TEST to check if two OBB's overlap.
-    *
-    * Example:
-    *  bool result=Overlap::OBB_OBB( pos1,obb1, pos2,obb2 );
-    *
-    */
-    inline bool OBB_OBB (const Vec3& pos1, const OBB& obb1,  const Vec3& pos2, const OBB& obb2)
-    {
-        //tranform obb2 in local space of obb1
-        Matrix33 M = obb1.m33.T() * obb2.m33;
-
-        //the new center-position in world-space
-        Vec3 p1 =   obb1.m33 * obb1.c + pos1;
-        Vec3 p2 =   obb2.m33 * obb2.c + pos2;
-
-        //"t" is the transfer-vector from one center to the other
-        Vec3 t      = (p2 - p1) * obb1.m33;
-
-        float ra, rb;
-
-        //--------------------------------------------------------------------------
-        //--  we use the vectors "1,0,0","0,1,0" and "0,0,1" as separating axis
-        //--------------------------------------------------------------------------
-        rb  =   fabsf(M.m00 * obb2.h.x) + fabsf(M.m01 * obb2.h.y) + fabsf(M.m02 * obb2.h.z);
-        if (fabsf(t.x) > (fabsf(obb1.h.x) + rb))
-        {
-            return 0;
-        }
-        rb  =   fabsf(M.m10 * obb2.h.x) + fabsf(M.m11 * obb2.h.y) + fabsf(M.m12 * obb2.h.z);
-        if (fabsf(t.y) > (fabsf(obb1.h.y) + rb))
-        {
-            return 0;
-        }
-        rb  =   fabsf(M.m20 * obb2.h.x) + fabsf(M.m21 * obb2.h.y) + fabsf(M.m22 * obb2.h.z);
-        if (fabsf(t.z) > (fabsf(obb1.h.z) + rb))
-        {
-            return 0;
-        }
-
-        //--------------------------------------------------------------------------
-        //--  we use the orientation-vectors "Mx","My" and "Mz" as separating axis
-        //--------------------------------------------------------------------------
-        ra  = fabsf(M.m00 * obb1.h.x) + fabsf(M.m10 * obb1.h.y) + fabsf(M.m20 * obb1.h.z);
-        if (fabsf(t | Vec3(M.m00, M.m10, M.m20)) > (ra + obb2.h.x))
-        {
-            return 0;
-        }
-        ra  = fabsf(M.m01 * obb1.h.x) + fabsf(M.m11 * obb1.h.y) + fabsf(M.m21 * obb1.h.z);
-        if (fabsf(t | Vec3(M.m01, M.m11, M.m21)) > (ra + obb2.h.y))
-        {
-            return 0;
-        }
-        ra  = fabsf(M.m02 * obb1.h.x) + fabsf(M.m12 * obb1.h.y) + fabsf(M.m22 * obb1.h.z);
-        if (fabsf(t | Vec3(M.m02, M.m12, M.m22)) > (ra + obb2.h.z))
-        {
-            return 0;
-        }
-
-        //---------------------------------------------------------------------
-        //----  using 9 cross products we generate new separating axis
-        //---------------------------------------------------------------------
-        ra = obb1.h.y * fabsf(M.m20) + obb1.h.z * fabsf(M.m10);
-        rb = obb2.h.y * fabsf(M.m02) + obb2.h.z * fabsf(M.m01);
-        if (fabsf(t.z * M.m10 - t.y * M.m20) > (ra + rb))
-        {
-            return 0;
-        }
-        ra = obb1.h.y * fabsf(M.m21) + obb1.h.z * fabsf(M.m11);
-        rb = obb2.h.x * fabsf(M.m02) + obb2.h.z * fabsf(M.m00);
-        if (fabsf(t.z * M.m11 - t.y * M.m21) > (ra + rb))
-        {
-            return 0;
-        }
-        ra = obb1.h.y * fabsf(M.m22) + obb1.h.z * fabsf(M.m12);
-        rb = obb2.h.x * fabsf(M.m01) + obb2.h.y * fabsf(M.m00);
-        if (fabsf(t.z * M.m12 - t.y * M.m22) > (ra + rb))
-        {
-            return 0;
-        }
-
-
-        ra = obb1.h.x * fabsf(M.m20) + obb1.h.z * fabsf(M.m00);
-        rb = obb2.h.y * fabsf(M.m12) + obb2.h.z * fabsf(M.m11);
-        if (fabsf(t.x * M.m20 - t.z * M.m00) > (ra + rb))
-        {
-            return 0;
-        }
-        ra = obb1.h.x * fabsf(M.m21) + obb1.h.z * fabsf(M.m01);
-        rb = obb2.h.x * fabsf(M.m12) + obb2.h.z * fabsf(M.m10);
-        if (fabsf(t.x * M.m21 - t.z * M.m01) > (ra + rb))
-        {
-            return 0;
-        }
-        ra = obb1.h.x * fabsf(M.m22) + obb1.h.z * fabsf(M.m02);
-        rb = obb2.h.x * fabsf(M.m11) + obb2.h.y * fabsf(M.m10);
-        if (fabsf(t.x * M.m22 - t.z * M.m02) > (ra + rb))
-        {
-            return 0;
-        }
-
-
-        ra = obb1.h.x * fabsf(M.m10) + obb1.h.y * fabsf(M.m00);
-        rb = obb2.h.y * fabsf(M.m22) + obb2.h.z * fabsf(M.m21);
-        if (fabsf(t.y * M.m00 - t.x * M.m10) > (ra + rb))
-        {
-            return 0;
-        }
-        ra = obb1.h.x * fabsf(M.m11) + obb1.h.y * fabsf(M.m01);
-        rb = obb2.h.x * fabsf(M.m22) + obb2.h.z * fabsf(M.m20);
-        if (fabsf(t.y * M.m01 - t.x * M.m11) > (ra + rb))
-        {
-            return 0;
-        }
-        ra = obb1.h.x * fabsf(M.m12) + obb1.h.y * fabsf(M.m02);
-        rb = obb2.h.x * fabsf(M.m21) + obb2.h.y * fabsf(M.m20);
-        if (fabsf(t.y * M.m02 - t.x * M.m12) > (ra + rb))
-        {
-            return 0;
-        }
-
-        return 1; //no separating axis found, we have an overlap
-    }
-
-
-
-
-
-
-#define PLANE_X         0
-#define PLANE_Y         1
-#define PLANE_Z         2
-#define PLANE_NON_AXIAL 3
-
-    //! check if the point is inside a triangle
-    inline bool PointInTriangle(const Vec3& point, const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& normal)
-    {
-        float xt, yt;
-        Vec3 nn;
-
-        int p1, p2;
-
-        nn = normal;
-        nn.x = (float)fabs(nn.x);
-        nn.y = (float)fabs(nn.y);
-        nn.z = (float)fabs(nn.z);
-
-        if ((nn.x >= nn.y) && (nn.x >= nn.z))
-        {
-            xt = point.y;
-            yt = point.z;
-            p1 = PLANE_Y;
-            p2 = PLANE_Z;
-        }
-        else
-        if ((nn.y >= nn.x) && (nn.y >= nn.z))
-        {
-            xt = point.x;
-            yt = point.z;
-            p1 = PLANE_X;
-            p2 = PLANE_Z;
-        }
-        else
-        {
-            xt = point.x;
-            yt = point.y;
-            p1 = PLANE_X;
-            p2 = PLANE_Y;
-        }
-
-        float Ax, Ay, Bx, By;
-        float s;
-
-        bool front = false;
-        bool back = false;
-
-
-        Ax = (v0)[p1];
-        Bx = (v1)[p1];
-        Ay = (v0)[p2];
-        By = (v1)[p2];
-
-        s = ((Ay - yt) * (Bx - Ax) - (Ax - xt) * (By - Ay));
-
-        if (s >= 0)
-        {
-            if (back)
-            {
-                return (false);
-            }
-            front = true;
-        }
-        else
-        {
-            if (front)
-            {
-                return (false);
-            }
-            back = true;
-        }
-
-        Ax = (v1)[p1];
-        Bx = (v2)[p1];
-        Ay = (v1)[p2];
-        By = (v2)[p2];
-
-        s = ((Ay - yt) * (Bx - Ax) - (Ax - xt) * (By - Ay));
-
-        if (s >= 0)
-        {
-            if (back)
-            {
-                return (false);
-            }
-            front = true;
-        }
-        else
-        {
-            if (front)
-            {
-                return (false);
-            }
-            back = true;
-        }
-
-        Ax = (v2)[p1];
-        Bx = (v0)[p1];
-        Ay = (v2)[p2];
-        By = (v0)[p2];
-
-        s = ((Ay - yt) * (Bx - Ax) - (Ax - xt) * (By - Ay));
-
-        if (s >= 0)
-        {
-            if (back)
-            {
-                return (false);
-            }
-            front = true;
-        }
-        else
-        {
-            if (front)
-            {
-                return (false);
-            }
-            back = true;
-        }
-
-        return (true);
-    }
-}
-
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_GEOOVERLAP_H
diff --git a/Code/CryEngine/CryCommon/Cry_HWMatrix.h b/Code/CryEngine/CryCommon/Cry_HWMatrix.h
deleted file mode 100644
index 63973dc26f..0000000000
--- a/Code/CryEngine/CryCommon/Cry_HWMatrix.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Scalar implementation of hardware vector based matrix
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_HWMATRIX_H
-#define CRYINCLUDE_CRYCOMMON_CRY_HWMATRIX_H
-#pragma once
-
-struct hwmtx33
-{
-    hwvec3 m0, m1, m2;
-};
-
-ILINE void HWMtx33LoadAligned(hwmtx33& out, const Matrix34A& inMtx)
-{
-    out.m0 = HWVLoadVecAligned(reinterpret_cast<const Vec4A*>(&inMtx.m00));
-    out.m1 = HWVLoadVecAligned(reinterpret_cast<const Vec4A*>(&inMtx.m10));
-    out.m2 = HWVLoadVecAligned(reinterpret_cast<const Vec4A*>(&inMtx.m20));
-}
-
-ILINE hwvec3 HWMtx33RotateVec(const hwmtx33& m, const hwvec3& v)
-{
-    return Vec3((m.m0[0] * v.x) + (m.m0[1] * v.y) + (m.m0[2] * v.z),
-        (m.m1[0] * v.x) + (m.m1[1] * v.y) + (m.m1[2] * v.z),
-        (m.m2[0] * v.x) + (m.m2[1] * v.y) + (m.m2[2] * v.z));
-}
-
-ILINE hwvec3 HWMtx33RotateVecOpt(const hwmtx33& m, const hwvec3& v)
-{
-    return HWMtx33RotateVec(m, v);
-}
-
-ILINE hwmtx33 HWMtx33CreateRotationV0V1(const hwvec3& v0, const hwvec3& v1)
-{
-    assert((fabs_tpl(1 - (v0 | v0))) < 0.01); //check if unit-vector
-    assert((fabs_tpl(1 - (v1 | v1))) < 0.01); //check if unit-vector
-    hwmtx33 m;
-    float dot = v0 | v1;
-    if (dot < -0.9999f)
-    {
-        Vec3 axis = v0.GetOrthogonal().GetNormalized();
-        m.m0[0] = (2.0f * axis.x * axis.x - 1);
-        m.m0[1] = (2.0f * axis.x * axis.y);
-        m.m0[2] = (2.0f * axis.x * axis.z);
-        m.m1[0] = (2.0f * axis.y * axis.x);
-        m.m1[1] = (2.0f * axis.y * axis.y - 1);
-        m.m1[2] = (2.0f * axis.y * axis.z);
-        m.m2[0] = (2.0f * axis.z * axis.x);
-        m.m2[1] = (2.0f * axis.z * axis.y);
-        m.m2[2] = (2.0f * axis.z * axis.z - 1);
-    }
-    else
-    {
-        Vec3 v = v0 % v1;
-        f32 h = 1.0f / (1.0f + dot);
-        m.m0[0] = (dot + h * v.x * v.x);
-        m.m0[1] = (h * v.x * v.y - v.z);
-        m.m0[2] = (h * v.x * v.z + v.y);
-        m.m1[0] = (h * v.x * v.y + v.z);
-        m.m1[1] = (dot + h * v.y * v.y);
-        m.m1[2] = (h * v.y * v.z - v.x);
-        m.m2[0] = (h * v.x * v.z - v.y);
-        m.m2[1] = (h * v.y * v.z + v.x);
-        m.m2[2] = (dot + h * v.z * v.z);
-    }
-
-    return m;
-}
-
-//Returns a matrix optimized for this platform's matrix ops, in this case, not doing a thing;
-ILINE hwmtx33 HWMtx33GetOptimized(const hwmtx33& m)
-{
-    return (hwmtx33)m;
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_HWMATRIX_H
-
diff --git a/Code/CryEngine/CryCommon/Cry_HWVector3.h b/Code/CryEngine/CryCommon/Cry_HWVector3.h
deleted file mode 100644
index 6cc1e043d8..0000000000
--- a/Code/CryEngine/CryCommon/Cry_HWVector3.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description: Hardware vector class - scalar implementation
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_HWVECTOR3_H
-#define CRYINCLUDE_CRYCOMMON_CRY_HWVECTOR3_H
-#pragma once
-
-
-#define HWV_PERMUTE_0X 0
-#define HWV_PERMUTE_0Y 1
-#define HWV_PERMUTE_0Z 2
-#define HWV_PERMUTE_0W 3
-#define HWV_PERMUTE_1X 4
-#define HWV_PERMUTE_1Y 5
-#define HWV_PERMUTE_1Z 6
-#define HWV_PERMUTE_1W 7
-
-typedef Vec3 hwvec3;
-typedef Vec4 hwvec4;
-typedef float simdf;
-typedef Vec4 hwvec4fconst;
-typedef int hwvec4i[4];
-
-#define HWV3Constant(name, f0, f1, f2) const Vec3 name(f0, f1, f2)
-#define SIMDFConstant(name, f0) const simdf name = f0
-#define HWV4PermuteControl(name, i0, i1, i2, i3) static const hwvec4i name = {i0, i1, i2, i3};
-#define SIMDFAsVec3(a) (hwvec3)a
-#define HWV3AsSIMDF(a) (simdf)a.x
-
-ILINE hwvec3 HWVLoadVecUnaligned(const Vec3* pLoadFrom)
-{
-    return *pLoadFrom;
-}
-
-ILINE hwvec3 HWVLoadVecAligned(const Vec4A* pLoadFrom)
-{
-    return Vec3(pLoadFrom->x, pLoadFrom->y, pLoadFrom->z);
-}
-
-ILINE void HWVSaveVecUnaligned(Vec3* pSaveTo, const hwvec3& pLoadFrom)
-{
-    *pSaveTo = pLoadFrom;
-}
-
-ILINE void HWVSaveVecAligned(Vec4* pSaveTo, const hwvec4& pLoadFrom)
-{
-    *pSaveTo = pLoadFrom;
-}
-
-ILINE hwvec3 HWVAdd(const hwvec3& a, const hwvec3& b)
-{
-    return hwvec3(a.x + b.x, a.y + b.y, a.z + b.z);
-}
-
-ILINE hwvec3 HWVMultiply(const hwvec3& a, const hwvec3& b)
-{
-    return hwvec3(a.x * b.x, a.y * b.y, a.z * b.z);
-}
-
-ILINE hwvec3 HWVMultiplySIMDF(const hwvec3& a, const simdf& b)
-{
-    return hwvec3(a.x * b, a.y * b, a.z * b);
-}
-
-ILINE hwvec3 HWVMultiplyAdd(const hwvec3& a, const hwvec3& b, const hwvec3& c)
-{
-    return hwvec3((a.x * b.x) + c.x, (a.y * b.y) + c.y, (a.z * b.z) + c.z);
-}
-
-ILINE hwvec3 HWVMultiplySIMDFAdd(const hwvec3& a, const simdf& b, const hwvec3& c)
-{
-    return hwvec3((a.x * b) + c.x, (a.y * b) + c.y, (a.z * b) + c.z);
-}
-
-ILINE hwvec3 HWVSub(const hwvec3& a, const hwvec3& b)
-{
-    return (a - b);
-}
-
-ILINE hwvec3 HWVCross(const hwvec3& a, const hwvec3& b)
-{
-    return hwvec3((a.y * b.z) - (a.z * b.y)
-        , (a.z * b.x) - (a.x * b.z)
-        , (a.x * b.y) - (a.y * b.x));
-}
-
-ILINE simdf HWV3Dot(const hwvec3& a, const hwvec3& b)
-{
-    return (a.x * b.x) + (a.y * b.y) + (a.z * b.z);
-}
-
-ILINE hwvec3 HWVMax(const hwvec3& a, const hwvec3& b)
-{
-    return Vec3(a.x > b.x ? a.x : b.x,
-        a.y > b.y ? a.y : b.y,
-        a.z > b.z ? a.z : b.z);
-}
-
-ILINE hwvec3 HWVMin(const hwvec3& a, const hwvec3& b)
-{
-    return Vec3(a.x < b.x ? a.x : b.x,
-        a.y < b.y ? a.y : b.y,
-        a.z < b.z ? a.z : b.z);
-}
-
-ILINE hwvec3 HWVClamp(const hwvec3& a, const hwvec3& min, const hwvec3& max)
-{
-    return HWVMax(min, HWVMin(a, max));
-}
-
-ILINE hwvec3 HWV3Normalize(const hwvec3& a)
-{
-    float fInvLen = isqrt_safe_tpl((a.x * a.x) + (a.y * a.y) + (a.z * a.z));
-    return Vec3(a.x * fInvLen, a.y * fInvLen, a.z * fInvLen);
-}
-
-ILINE hwvec3 HWVGetOrthogonal(const hwvec3& a)
-{
-    hwvec3 result = a;
-
-    //int i = isneg(square(0.9f)*a.GetLengthSquared()-(a.x*a.x));
-    int i = isneg(square(0.9f) * a.GetLengthSquared() - a.x * a.x);
-    result[i] = 0;
-    result[incm3(i)] = a[decm3(i)];
-    result[decm3(i)] = -a[incm3(i)];
-    return result;
-}
-
-ILINE simdf HWV3SplatXToSIMDF(const hwvec3& a)
-{
-    return a.x;
-}
-
-ILINE simdf HWV3SplatYToSIMDF(const hwvec3& a)
-{
-    return a.y;
-}
-
-ILINE hwvec3 HWV3PermuteWord(const hwvec3& a, const hwvec3& b, const hwvec4i& p)
-{
-    hwvec3 selection[2] = {a, b};
-    float* fSelection = (float*)selection;
-    return Vec3(fSelection[p[0]], fSelection[p[1]], fSelection[p[2]]);
-}
-
-ILINE hwvec3 HWV3Zero()
-{
-    return Vec3(0.0f, 0.0f, 0.0f);
-}
-
-ILINE hwvec4 HWV4Zero()
-{
-    return Vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-
-ILINE hwvec3 HWV3Negate(const hwvec3& a)
-{
-    return Vec3(-a.x, -a.y, -a.z);
-}
-
-ILINE hwvec3 HWVSelect(const hwvec3& a, const hwvec3& b, const hwvec3& control)
-{
-    return Vec3(control[0] > 0.0f ? b[0] : a[0],
-        control[1] > 0.0f ? b[1] : a[1],
-        control[2] > 0.0f ? b[2] : a[2]);
-}
-
-ILINE hwvec3 HWVSelectSIMDF(const hwvec3& a, const hwvec3& b, const bool& control)
-{
-    return control ? b : a;
-}
-
-ILINE simdf HWV3LengthSq(const hwvec3& a)
-{
-    return a.len2();
-}
-
-
-//////////////////////////////////////////////////
-//SIMDF functions for float stored in HWVEC4 data
-//////////////////////////////////////////////////
-
-ILINE simdf SIMDFLoadFloat(const float& f)
-{
-    return f;
-}
-
-ILINE void SIMDFSaveFloat(float* f, const simdf& a)
-{
-    *f = a;
-}
-
-ILINE bool SIMDFGreaterThan(const simdf& a, const simdf& b)
-{
-    return (a > b);
-}
-
-ILINE bool SIMDFLessThanEqualB(const simdf& a, const simdf& b)
-{
-    return (a <= b);
-}
-
-ILINE bool SIMDFLessThanEqual(const simdf& a, const simdf& b)
-{
-    return (a <= b);
-}
-
-ILINE bool SIMDFLessThanB(const simdf& a, const simdf& b)
-{
-    return (a < b);
-}
-
-ILINE bool SIMDFLessThan(const simdf& a, const simdf& b)
-{
-    return (a < b);
-}
-
-ILINE simdf SIMDFAdd(const simdf& a, const simdf& b)
-{
-    return a + b;
-}
-
-ILINE simdf SIMDFMult(const simdf& a, const simdf& b)
-{
-    return a * b;
-}
-
-ILINE simdf SIMDFReciprocal(const simdf& a)
-{
-    return 1.0f / a;
-}
-
-ILINE simdf SIMDFSqrt(const simdf& a)
-{
-    return sqrt_tpl(a);
-}
-
-ILINE simdf SIMDFSqrtEst(const simdf& a)
-{
-    return sqrt_tpl(a);
-}
-
-ILINE simdf SIMDFSqrtEstFast(const simdf& a)
-{
-    return sqrt_tpl(a);
-}
-
-ILINE simdf SIMDFMax(const simdf& a, const simdf& b)
-{
-    return max(a, b);
-}
-
-ILINE simdf SIMDFMin(const simdf& a, const simdf& b)
-{
-    return min(a, b);
-}
-
-ILINE simdf SIMDFClamp(const simdf& a, const simdf& min, const simdf& max)
-{
-    return clamp_tpl(a, min, max);
-}
-
-ILINE simdf SIMDFAbs(const simdf& a)
-{
-    return fabsf(a);
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_HWVECTOR3_H
diff --git a/Code/CryEngine/CryCommon/Cry_Math.h b/Code/CryEngine/CryCommon/Cry_Math.h
deleted file mode 100644
index 315e96ecd9..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Math.h
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common math class
-
-
-#pragma once
-
-//========================================================================================
-
-#include <platform.h>
-#include "Cry_ValidNumber.h"
-#include <CryEndian.h>  // eLittleEndian
-#include <CryHalf.inl>
-#include <MetaUtils.h>
-#include <float.h>
-///////////////////////////////////////////////////////////////////////////////
-// Forward declarations                                                      //
-///////////////////////////////////////////////////////////////////////////////
-template <typename F>
-struct Vec2_tpl;
-template <typename F>
-struct Vec3_tpl;
-template <typename F>
-struct Vec4_tpl;
-
-template <typename F>
-struct Ang3_tpl;
-template <typename F>
-struct Plane_tpl;
-template <typename F>
-struct AngleAxis_tpl;
-template <typename F>
-struct Quat_tpl;
-template <typename F>
-struct QuatT_tpl;
-template <typename F>
-struct DualQuat_tpl;
-template <typename F>
-struct QuatTS_tpl;
-template <typename F>
-struct QuatTNS_tpl;
-
-template <typename F>
-struct Diag33_tpl;
-template <typename F>
-struct Matrix33_tpl;
-template <typename F>
-struct Matrix34_tpl;
-template <typename F>
-struct Matrix44_tpl;
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Definitions                                                               //
-///////////////////////////////////////////////////////////////////////////////
-const f32 gf_PI  = f32(3.14159265358979323846264338327950288419716939937510);
-const f64 g_PI   = 3.14159265358979323846264338327950288419716939937510; // pi
-
-const f32 gf_PI2 = f32(3.14159265358979323846264338327950288419716939937510 * 2.0);
-const f64 g_PI2  = 3.14159265358979323846264338327950288419716939937510 * 2.0; // 2*pi
-
-const f64 sqrt2  = 1.4142135623730950488016887242097;
-const f64 sqrt3  = 1.7320508075688772935274463415059;
-
-const f32 gf_halfPI = f32(1.57079632679489661923132169163975144209858469968755);
-
-#ifndef MAX
-#define MAX(a, b)    (((a) > (b)) ? (a) : (b))
-#endif
-#ifndef MIN
-#define MIN(a, b)    (((a) < (b)) ? (a) : (b))
-#endif
-
-#define VEC_EPSILON (0.05f)
-#define RAD_EPSILON (0.01f)
-#define DEG2RAD(a) ((a) * (gf_PI / 180.0f))
-#define RAD2DEG(a) ((a) * (180.0f / gf_PI))
-#define DEG2COS(a) (cos_tpl((a) * (gf_PI / 180.0f)))
-#define COS2DEG(a) (acos_tpl(a) * (180.0f / gf_PI))
-#define RAD2HCOS(a) (cos_tpl((a * 0.5f)))
-#define HCOS2RAD(a) (acos_tpl(a) * 2.0f)
-#define DEG2HCOS(a) (cos_tpl((a * 0.5f) * (gf_PI / 180.0f)))
-#define DEG2HSIN(a) (sin_tpl((a * 0.5f) * (gf_PI / 180.0f)))
-#define HCOS2DEG(a) (acos_tpl(a) * 2.0f * (180.0f / gf_PI))
-#define SIGN_MASK(x) ((intptr_t)(x) >> ((sizeof(size_t) * 8) - 1))
-#define TANGENT30 0.57735026918962576450914878050196f // tan(30)
-#define TANGENT30_2 0.57735026918962576450914878050196f * 2 // 2*tan(30)
-#define LN2 0.69314718055994530941723212145818f // ln(2)
-
-
-
-
-
-ILINE f32 fsel(const f32 _a, const f32 _b, const f32 _c) { return (_a < 0.0f) ? _c : _b; }
-ILINE f64 fsel(const f64 _a, const f64 _b, const f64 _c) { return (_a < 0.0f) ? _c : _b; }
-ILINE f32 fself(const f32 _a, const f32 _b, const f32 _c) { return (_a < 0.0f) ? _c : _b; }
-ILINE f32 fsels(const f32 _a, const f32 _b, const f32 _c) { return (_a < 0.0f) ? _c : _b; }
-ILINE f32 fres(const f32 _a) { return 1.f / _a; }
-template<class T>
-ILINE T isel(int c, T a, T b) {   return (c < 0) ? b : a; }
-template<class T>
-ILINE T isel(int64 c, T a, T b) { return (c < 0) ? b : a; }
-template<class T>
-ILINE T iselnz(int c, T a, T b) {     return c ? a : b; }
-template<class T>
-ILINE T iselnz(uint32 c, T a, T b) { return c ? a : b; }
-template<class T>
-ILINE T iselnz(int64 c, T a, T b) {   return c ? a : b; }
-template<class T>
-ILINE T iselnz(uint64 c, T a, T b) { return c ? a : b; }
-//provides fast way of checking against 0 (saves fcmp)
-ILINE bool fzero(const float& val) { return val == 0.0f; }
-ILINE bool fzero(float* pVal) { return *pVal == 0.0f; }
-
-
-
-//////////////////////////////////////////////////////////////////////////
-// Define min/max
-//////////////////////////////////////////////////////////////////////////
-#ifdef min
-#undef min
-#endif //min
-
-#ifdef max
-#undef max
-#endif //max
-
-
-// Bring min and max from std namespace to global scope.
-template <class T>
-ILINE T min(const T& a, const T& b) {  return b < a ? b : a; }
-template <class T>
-ILINE T max(const T& a, const T& b) {  return a < b ? b : a; }
-template <class T, class _Compare>
-ILINE const T& min(const T& a, const T& b, _Compare comp) { return comp(b, a) ? b : a; }
-template <class T, class _Compare>
-ILINE const T& max(const T& a, const T& b, _Compare comp) {     return comp(a, b) ? b : a; }
-ILINE int min_branchless(int a, int b) { int diff = a - b; int mask = diff >> 31; return (b & (~mask)) | (a & mask); }
-
-template<class T>
-ILINE T clamp_tpl(T X, T Min, T Max) {  return X < Min ? Min : X < Max ? X : Max; }
-template<class T>
-ILINE void Limit(T& val, const T& min, const T& max)
-{
-    if (val < min)
-    {
-        val = min;
-    }
-    else if (val > max)
-    {
-        val = max;
-    }
-}
-template<class T>
-ILINE T Lerp(const T& a, const T& b, float s) { return T(a + (b - a) * s); }
-
-
-
-//-------------------------------------------
-//-- the portability functions for CPU_X86
-//-------------------------------------------
-
-#if defined(_CPU_SSE)
-#include <xmmintrin.h>
-#endif
-
-ILINE f32 fabs_tpl(f32 op) { return op < 0.0f ? -op : op; }
-ILINE f64 fabs_tpl(f64 op) { return fabs(op); }
-ILINE int32 fabs_tpl(int32 op) { int32 mask = op >> 31; return op + mask ^ mask; }
-
-ILINE f32 floor_tpl(f32 op) {return floorf(op); }
-ILINE f64 floor_tpl(f64 op) {return floor(op); }
-ILINE int32 floor_tpl(int32 op) {return op; }
-
-ILINE f32 ceil_tpl(f32 op) {return ceilf(op); }
-ILINE f64 ceil_tpl(f64 op) {return ceil(op); }
-ILINE int32 ceil_tpl(int32 op) {return op; }
-
-ILINE f32 fmod_tpl(f32 x, f32 y) {return (f32)fmodf(x, y); }
-ILINE f64 fmod_tpl(f64 x, f64 y) {return (f32)fmod(x, y); }
-
-ILINE void sincos_tpl (f32 angle, f32* pSin, f32* pCos) {   *pSin = f32(sin(angle));    *pCos = f32(cos(angle));    }
-ILINE void sincos_tpl (f64 angle, f64* pSin, f64* pCos) {   *pSin = f64(sin(angle));  *pCos = f64(cos(angle));  }
-
-ILINE f32 cos_tpl(f32 op) { return cosf(op); }
-ILINE f64 cos_tpl(f64 op) { return cos(op); }
-
-ILINE f32 sin_tpl(f32 op) { return sinf(op); }
-ILINE f64 sin_tpl(f64 op) { return sin(op); }
-
-ILINE f32 acos_tpl(f32 op) { return acosf(clamp_tpl(op, -1.0f, +1.0f)); }
-ILINE f64 acos_tpl(f64 op) { return acos(clamp_tpl(op, -1.0, +1.0)); }
-
-ILINE f32 asin_tpl(f32 op) { return asinf(clamp_tpl(op, -1.0f, +1.0f)); }
-ILINE f64 asin_tpl(f64 op) { return asin(clamp_tpl(op, -1.0, +1.0)); }
-
-ILINE f32 atan_tpl(f32 op) { return atanf(op); }
-ILINE f64 atan_tpl(f64 op) { return atan(op); }
-
-ILINE f32 atan2_tpl(f32 op1, f32 op2) { return atan2f(op1, op2); }
-ILINE f64 atan2_tpl(f64 op1, f64 op2) { return atan2(op1, op2); }
-
-ILINE f32 tan_tpl(f32 op) {return tanf(op); }
-ILINE f64 tan_tpl(f64 op) {return tan(op); }
-
-ILINE f32 exp_tpl(f32 op) { return expf(op); }
-ILINE f64 exp_tpl(f64 op) { return exp(op); }
-
-ILINE f32 log_tpl(f32 op) { return logf(op); }
-ILINE f64 log_tpl(f64 op) { return log(op); }
-
-ILINE f32 pow_tpl(f32 x, f32 y) {return (f32) pow((f64)x, (f64)y); }
-ILINE f64 pow_tpl(f64 x, f64 y) {return pow(x, y); }
-
-#if defined(_CPU_SSE)
-ILINE f32 sqrt_tpl(f32 op)
-{
-    __m128 s = _mm_sqrt_ss(_mm_set_ss(op));
-    float r;
-    _mm_store_ss(&r, s);
-    return r;
-}
-ILINE f64 sqrt_tpl(f64 op)
-{
-    return sqrt(op);
-}
-
-ILINE f32 sqrt_fast_tpl(f32 op)
-{
-    return sqrt_tpl(op);
-}
-ILINE f64 sqrt_fast_tpl(f64 op)
-{
-    return sqrt_tpl(op);
-}
-
-ILINE f32 isqrt_tpl(f32 op)
-{
-    __m128 value = _mm_set_ss(op);
-    __m128 oneHalf = _mm_set_ss(0.5f);
-    __m128 threeHalfs = _mm_set_ss(1.5f);
-    __m128 simdRecipSqrt = _mm_rsqrt_ss(value);
-    __m128 inverseMult = _mm_mul_ps(_mm_mul_ss(_mm_mul_ss(value, simdRecipSqrt), simdRecipSqrt), oneHalf);
-    __m128 inverseInner = _mm_sub_ps(threeHalfs, inverseMult);
-    __m128 newtonIteration1 = _mm_mul_ss(simdRecipSqrt, inverseInner);
-    float r;
-    _mm_store_ss(&r, newtonIteration1);
-    return r;
-}
-ILINE f64 isqrt_tpl(f64 op)
-{
-    return 1.0 / sqrt(op);
-}
-
-ILINE f32 isqrt_fast_tpl(f32 op)
-{
-    return isqrt_tpl(op);
-}
-ILINE f64 isqrt_fast_tpl(f64 op)
-{
-    return isqrt_tpl(op);
-}
-
-ILINE f32 isqrt_safe_tpl(f32 value)
-{
-    return isqrt_tpl(value + (std::numeric_limits<f32>::min)());
-}
-
-ILINE f64 isqrt_safe_tpl(f64 value)
-{
-    return isqrt_tpl(value + (std::numeric_limits<f64>::min)());
-}
-#elif defined (__ARM_NEON__)
-#include "arm_neon.h"
-
-template <int n>
-float isqrt_helper(float f)
-{
-    float32x2_t v = vdup_n_f32(f);
-    float32x2_t r = vrsqrte_f32(v);
-    // n+1 newton iterations because initial approximation is crude
-    for (int i = 0; i <= n; ++i)
-    {
-        r = vrsqrts_f32(v * r, r) * r;
-    }
-    return vget_lane_f32(r, 0);
-}
-
-ILINE f32 sqrt_tpl(f32 op) { return op != 0.0f ? op* isqrt_helper<1>(op) : op; }
-ILINE f64 sqrt_tpl(f64 op) { return sqrt(op); }
-
-ILINE f32 sqrt_fast_tpl(f32 op) { return op != 0.0f ? op* isqrt_helper<0>(op) : op; }
-ILINE f64 sqrt_fast_tpl(f64 op) { return sqrt(op); }
-
-ILINE f32 isqrt_tpl(f32 op) { return isqrt_helper<1>(op); }
-ILINE f64 isqrt_tpl(f64 op) {   return 1.0 / sqrt(op); }
-
-ILINE f32 isqrt_fast_tpl(f32 op) { return isqrt_helper<0>(op); }
-ILINE f64 isqrt_fast_tpl(f64 op) { return 1.0 / sqrt(op); }
-
-ILINE f32 isqrt_safe_tpl(f32 op) { return isqrt_helper<1>(op + FLT_MIN); }
-ILINE f64 isqrt_safe_tpl(f64 op) { return 1.0 / sqrt(op + DBL_MIN); }
-#else
-#error unsupported CPU
-#endif
-
-ILINE int32 int_round(f32 f)  { return f < 0.f ? int32(f - 0.5f) : int32(f + 0.5f); }
-ILINE int32 pos_round(f32 f)  { return int32(f + 0.5f); }
-ILINE int64 int_round(f64 f)  { return f < 0.0 ? int64(f - 0.5) : int64(f + 0.5); }
-ILINE int64 pos_round(f64 f)  { return int64(f + 0.5); }
-
-ILINE int32 int_ceil(f32 f) {   int32 i = int32(f); return (f > f32(i)) ? i + 1 : i; }
-ILINE int64 int_ceil(f64 f) {   int64 i = int64(f); return (f > f64(i)) ? i + 1 : i; }
-
-ILINE float ufrac8_to_float(float u) { return u * (1.f / 255.f); }
-ILINE float ifrac8_to_float(float i) { return i * (1.f / 127.f); }
-ILINE uint8 float_to_ufrac8(float f) { int i = pos_round(f * 255.f);  assert(i >= 0 && i < 256);  return uint8(i); }
-ILINE int8  float_to_ifrac8(float f) { int i = int_round(f * 127.f);  assert(abs(i) <= 127);  return int8(i); }
-
-
-
-template<class F>
-ILINE F sqr(const F& op) { return op * op; }
-template<class F>
-ILINE F sqr(const Vec2_tpl<F>& op) { return op | op; }
-template<class F>
-ILINE F sqr(const Vec3_tpl<F>& op) { return op | op; }
-template<class F>
-ILINE F sqr_signed(const F& op) { return op * fabs_tpl(op); }
-template<class F>
-ILINE F cube(const F& op) { return op * op * op; }
-
-template<class F>
-ILINE F square(F fOp) { return(fOp * fOp); }
-ILINE float div_min(float n, float d, float m) {    return n * d < m * d * d ? n / d : m; }
-
-
-// Utility functions for returning -1 if input is negative and non-zero, returns positive 1 otherwise
-// Uses extensive bit shifting for performance reasons.
-ILINE int32 sgnnz(f64 x)
-{
-    union
-    {
-        f32 f;
-        int32 i;
-    } u;
-    u.f = (f32)x;
-    return ((u.i >> 31) << 1) + 1;
-}
-ILINE int32 sgnnz(f32 x)
-{
-    union
-    {
-        f32 f;
-        int32 i;
-    } u;
-    u.f = x;
-    return ((u.i >> 31) << 1) + 1;
-}
-ILINE int32 sgnnz(int32 x) {    return ((x >> 31) << 1) + 1; }
-ILINE f32   fsgnnz(f32 x)
-{
-    union
-    {
-        f32 f;
-        int32 i;
-    } u;
-    u.f = x;
-    u.i = (u.i & 0x80000000) | 0x3f800000;
-    return u.f;
-}
-
-ILINE int32 isneg(f32 x)
-{
-    union
-    {
-        f32 f;
-        uint32 i;
-    } u;
-    u.f = x;
-    return (int32)(u.i >> 31);
-}
-ILINE int32 isneg(f64 x)
-{
-    union
-    {
-        f32 f;
-        uint32 i;
-    } u;
-    u.f = (f32)x;
-    return (int32)(u.i >> 31);
-}
-ILINE int32 isneg(int32 x) {    return (int32)((uint32)x >> 31);  }
-
-
-
-
-
-ILINE int32 sgn(f64 x)
-{
-    union
-    {
-        f32 f;
-        int32 i;
-    } u;
-    u.f = (f32)x;
-    return (u.i >> 31) + ((u.i - 1) >> 31) + 1;
-}
-ILINE int32 sgn(f32 x)
-{
-    union
-    {
-        f32 f;
-        int32 i;
-    } u;
-    u.f = x;
-    return (u.i >> 31) + ((u.i - 1) >> 31) + 1;
-}
-ILINE int32 sgn(int32 x) {  return (x >> 31) + ((x - 1) >> 31) + 1; }
-ILINE f32   fsgnf(f32 x) {  return f32(sgn(x)); }
-
-ILINE int32 isnonneg(f32 x)
-{
-    union
-    {
-        f32 f;
-        uint32 i;
-    } u;
-    u.f = x;
-    return (int32)(u.i >> 31 ^ 1);
-}
-ILINE int32 isnonneg(f64 x)
-{
-    union
-    {
-        f32 f;
-        uint32 i;
-    } u;
-    u.f = (f32)x;
-    return (int32)(u.i >> 31 ^ 1);
-}
-ILINE int32 isnonneg(int32 x) {     return (int32)((uint32)x >> 31 ^ 1); }
-
-
-
-ILINE int32 getexp(f32 x) {     return (int32)(*(uint32*)&x >> 23 & 0x0FF) - 127;  }
-ILINE int32 getexp(f64 x) {     return (int32)(*((uint32*)&x + 1) >> 20 & 0x7FF) - 1023; }
-ILINE f32& setexp(f32& x, int32 iexp) {  (*(uint32*)& x &= ~(0x0FF << 23)) |= (iexp + 127) << 23;   return x;  }
-ILINE f64& setexp(f64& x, int32 iexp) {  (*((uint32*)&x + 1) &= ~(0x7FF << 20)) |= (iexp + 1023) << 20;  return x; }
-
-
-ILINE int32 iszero(f32 x)
-{
-    union
-    {
-        f32 f;
-        int32 i;
-    } u;
-    u.f = x;
-    u.i &= 0x7FFFFFFF;
-    return -(u.i >> 31 ^ (u.i - 1) >> 31);
-}
-ILINE int32 iszero(f64 x)
-{
-    union
-    {
-        f32 f;
-        int32 i;
-    } u;
-    u.f = (f32)x;
-    u.i &= 0x7FFFFFFF;
-    return -((u.i >> 31) ^ (u.i - 1) >> 31);
-}
-ILINE int32 iszero(int32 x) {   return -(x >> 31 ^ (x - 1) >> 31); }
-#if defined(PLATFORM_64BIT) && !defined(__clang__)
-ILINE int64 iszero(__int64 x) { return -(x >> 63 ^ (x - 1) >> 63); }
-#endif
-#if defined(PLATFORM_64BIT) && defined(__clang__) && !defined(LINUX)
-ILINE int64 iszero(int64_t x) { return -(x >> 63 ^ (x - 1) >> 63); }
-#endif
-#if defined(PLATFORM_64BIT) && (defined(LINUX) || defined(APPLE))
-ILINE int64 iszero(long int x) {    return -(x >> 63 ^ (x - 1) >> 63); }
-#endif
-
-ILINE float if_neg_else(float test, float val_neg, float val_nonneg) {  return (float)fsel(test, val_nonneg, val_neg); }
-ILINE float if_pos_else(float test, float val_pos, float val_nonpos) {  return (float)fsel(-test, val_nonpos, val_pos); }
-template<class F>
-ILINE int32 inrange(F x, F end1, F end2) {    return isneg(fabs_tpl(end1 + end2 - x * (F)2) - fabs_tpl(end1 - end2)); }
-template<class F>
-ILINE F cond_select(int32 bFirst, F op1, F op2) {  F arg[2] = { op1, op2 };     return arg[bFirst ^ 1]; }
-
-template<class F>
-ILINE int32 idxmax3(const F* pdata)
-{
-    int32 imax = isneg(pdata[0] - pdata[1]);
-    imax |= isneg(pdata[imax] - pdata[2]) << 1;
-    return imax & (2 | (imax >> 1 ^ 1));
-}
-template<class F>
-ILINE int32 idxmax3(const Vec3_tpl<F>& vec)
-{
-    int32 imax = isneg(vec.x - vec.y);
-    imax |= isneg(vec[imax] - vec.z) << 1;
-    return imax & (2 | (imax >> 1 ^ 1));
-}
-template<class F>
-ILINE int32 idxmin3(const F* pdata)
-{
-    int32 imin = isneg(pdata[1] - pdata[0]);
-    imin |= isneg(pdata[2] - pdata[imin]) << 1;
-    return imin & (2 | (imin >> 1 ^ 1));
-}
-template<class F>
-ILINE int32 idxmin3(const Vec3_tpl<F>& vec)
-{
-    int32 imin = isneg(vec.y - vec.x);
-    imin |= isneg(vec.z - vec[imin]) << 1;
-    return imin & (2 | (imin >> 1 ^ 1));
-}
-// Approximation of exp(-x)
-ILINE float approxExp(float x) { return fres(1.f + x); }
-// Approximation of 1.f - exp(-x)
-ILINE float approxOneExp(float x) {     return x * fres(1.f + x); }
-
-
-ILINE int ilog2(uint64 x)   // if x==1<<i (i=0..63), returns i
-{
-#if defined(CRY_PLATFORM_X64)
-# if defined(AZ_RESTRICTED_PLATFORM)
-#  include AZ_RESTRICTED_FILE(Cry_Math_h)
-# endif
-# if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#  undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-# elif defined(CRY_PLATFORM_LINUX)
-#  define HAS_BIT_SCAN_FORWARD64 0
-# else
-#  define HAS_BIT_SCAN_FORWARD64 1
-# endif
-#endif
-
-#if HAS_BIT_SCAN_FORWARD64
-    unsigned long i;
-    _BitScanForward64(&i, x);
-    return i;
-#else
-    union
-    {
-        float f;
-        uint i;
-    } u;
-    u.f = (float)x;
-    return (u.i >> 23) - 127;
-#endif
-}
-
-
-static int32 inc_mod3[] = {1, 2, 0}, dec_mod3[] = {2, 0, 1};
-#ifdef PHYSICS_EXPORTS
-#define incm3(i) inc_mod3[i]
-#define decm3(i) dec_mod3[i]
-#else
-ILINE int32 incm3(int32 i) { return i + 1 & (i - 2) >> 31; }
-ILINE int32 decm3(int32 i) { return i - 1 + ((i - 1) >> 31 & 3); }
-#endif
-
-
-//////////////////////////////////////////////////////////////////////////
-enum type_zero
-{
-    ZERO
-};
-enum type_min
-{
-    VMIN
-};
-enum type_max
-{
-    VMAX
-};
-enum type_identity
-{
-    IDENTITY
-};
-
-#include "Cry_Vector2.h"
-#include "Cry_Vector3.h"
-#include "Cry_Vector4.h"
-#include "Cry_MatrixDiag.h"
-#include "Cry_Matrix33.h"
-#include "Cry_Matrix34.h"
-#include "Cry_Matrix44.h"
-#include "Cry_Quat.h"
-#include "Cry_HWVector3.h"
-#include "Cry_HWMatrix.h"
-#include "Cry_XOptimise.h"
-
-//////////////////////////////////////////////////////////////////////////
-
-/// This function relaxes a value (val) towards a desired value (to) whilst maintaining continuity
-/// of val and its rate of change (valRate). timeDelta is the time between this call and the previous one.
-/// The caller would normally keep val and valRate as working variables, and smoothTime is normally
-/// a fixed parameter. The to/timeDelta values can change.
-///
-/// Implementation details:
-///
-/// This is a critically damped spring system. A linear spring is attached between "val" and "to" that
-/// drags "val" to "to". At the same time a damper between the two removes oscillations; it's tweaked
-/// so it doesn't dampen more than necessary. In combination this gives smooth ease-in and ease-out behavior.
-///
-/// smoothTime can be interpreted in a couple of ways:
-/// - it's the "expected time to reach the target when at maximum velocity" (the target will, however, not be reached
-///   in that time because the speed will decrease the closer it gets to the target)
-/// - it's the 'lag time', how many seconds "val" lags behind "to". If your
-///   target has a certain speed, the lag distance is simply the smoothTime times that speed.
-/// - it's 2/omega, where omega is the spring's natural frequency (or less formally a measure of the spring stiffness)
-///
-/// The implementation is stable for varying timeDelta, but for performance reasons it uses a polynomial approximation
-/// to the exponential function. The approximation works well (within 0.1% of accuracy) when smoothTime > 2*deltaTime,
-/// which is usually the case. (but it might be troublesome when you want a stiff spring or have frame hikes!)
-/// The implementation handles cases where smoothTime==0 separately and reliably. In that case the target will be
-/// reached immediately, and valRate is updated appropriately.
-///
-/// Based on "Critically Damped Ease-In/Ease-Out Smoothing", Thomas Lowe, Game Programming Gems IV
-///
-
-
-template <typename T>
-ILINE void SmoothCD(
-    T& val,                 ///< in/out: value to be smoothed
-    T& valRate,             ///< in/out: rate of change of the value
-    const float timeDelta,  ///< in: time interval
-    const T& to,            ///< in: the target value
-    const float smoothTime) ///< in: timescale for smoothing
-{
-    if (smoothTime > 0.0f)
-    {
-        const float omega = 2.0f / smoothTime;
-        const float x = omega * timeDelta;
-        const float exp = 1.0f / (1.0f + x + 0.48f * x * x + 0.235f * x * x * x);
-        const T change = (val - to);
-        const T temp = (T)((valRate + change * omega) * timeDelta);
-        valRate = (T)((valRate - temp * omega) * exp);
-        val = (T)(to + (change + temp) * exp);
-    }
-    else if (timeDelta > 0.0f)
-    {
-        valRate = (T)((to - val) / timeDelta);
-        val = to;
-    }
-    else
-    {
-        val = to;
-        T zeroizeAmount = valRate;
-        valRate -= zeroizeAmount; // zero it...
-    }
-}
-
-
-template <typename T>
-ILINE void SmoothCDWithMaxRate(
-    T& val,                 ///< in/out: value to be smoothed
-    T& valRate,             ///< in/out: rate of change of the value
-    const float timeDelta,  ///< in: time interval
-    const T& to,            ///< in: the target value
-    const float smoothTime, ///< in: timescale for smoothing
-    const T& maxValRate)    ///< in: maximum allowed rate of change
-{
-    if (smoothTime > 0.0f)
-    {
-        const float omega = 2.0f / smoothTime;
-        const float x = omega * timeDelta;
-        const float exp = 1.0f / (1.0f + x + 0.48f * x * x + 0.235f * x * x * x);
-        const T unclampedChange = val - to;
-        const T maxChange = maxValRate * smoothTime;
-        const T clampedChange = clamp_tpl<T>(unclampedChange, -maxChange, maxChange);
-        const T clampedTo = val - clampedChange;
-        const T temp = (T)((valRate + clampedChange * omega) * timeDelta);
-        valRate = (T)((valRate - temp * omega) * exp);
-        val = (T)(clampedTo + (clampedChange + temp) * exp);
-    }
-    else if (timeDelta > 0.0f)
-    {
-        const T unclampedRate = (T)((to - val) / timeDelta);
-        valRate = clamp_tpl<T>(unclampedRate, -maxValRate, maxValRate);
-        val += valRate * timeDelta;
-    }
-    else
-    {
-        val = to;
-        T zeroizeAmount = valRate;
-        valRate -= zeroizeAmount; // zero it...
-    }
-}
-
-// Smoothes linear blending into cubic (b-spline) with 0-derivatives
-// near 0 and 1
-inline f32 SmoothBlendValue (const f32 fBlend)
-{
-    const f32 fBlendAdj = fBlend - 0.5f;
-    return (f32)fsel(-fBlend, 0.f, fsel(fBlend - 1.f, 1.f, 0.5f - 2.f * (fBlendAdj * fBlendAdj * fBlendAdj) + 1.5f * fBlendAdj));
-}
-
-// function for safe comparsion of floating point  values
-ILINE bool fcmp(f32 fA, f32 fB, f32 fEpsilon = FLT_EPSILON)
-{
-    return fabs(fA - fB) <= fEpsilon;
-}
-
-//! Given an arbitrary unit vector this function will compute two axes to build the orthonormal basis.
-//! \param n Unit 3D vector
-//! \param[out] b1 Orthonormal axis vector
-//! \param[out] b2 Orthonormal axis vector
-inline void GetBasisVectors(const Vec3& n, Vec3& b1, Vec3& b2)
-{
-    if (n.z < FLT_EPSILON - 1.0f)
-    {
-        b1 = Vec3(0.0f, -1.0f, 0.0f);
-        b2 = Vec3(-1.0f, 0.0f, 0.0f);
-        return;
-    }
-
-    const float a = 1.0f / (1.0f + n.z);
-    const float b = -n.x * n.y * a;
-    b1 = Vec3(1.0f - n.x * n.x * a, b, -n.x);
-    b2 = Vec3(b, 1.0f - n.y * n.y * a, -n.y);
-}
diff --git a/Code/CryEngine/CryCommon/Cry_Matrix33.h b/Code/CryEngine/CryCommon/Cry_Matrix33.h
deleted file mode 100644
index cdde89b5ff..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Matrix33.h
+++ /dev/null
@@ -1,1572 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common matrix class
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_MATRIX33_H
-#define CRYINCLUDE_CRYCOMMON_CRY_MATRIX33_H
-#pragma once
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Matrix33_tpl
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-template<typename F>
-struct Matrix33_tpl
-{
-    F m00, m01, m02;
-    F m10, m11, m12;
-    F m20, m21, m22;
-
-    //---------------------------------------------------------------------------------
-
-#ifdef _DEBUG
-    ILINE Matrix33_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&m00);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-            p[3] = F32NAN;
-            p[4] = F32NAN;
-            p[5] = F32NAN;
-            p[6] = F32NAN;
-            p[7] = F32NAN;
-            p[8] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&m00);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-            p[3] = F64NAN;
-            p[4] = F64NAN;
-            p[5] = F64NAN;
-            p[6] = F64NAN;
-            p[7] = F64NAN;
-            p[8] = F64NAN;
-        }
-    }
-#else
-    ILINE Matrix33_tpl(){};
-#endif
-
-    //set matrix to Identity
-    ILINE Matrix33_tpl(type_identity)
-    {
-        m00 = 1;
-        m01 = 0;
-        m02 = 0;
-        m10 = 0;
-        m11 = 1;
-        m12 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = 1;
-    }
-    //set matrix to Zero
-    ILINE Matrix33_tpl(type_zero)
-    {
-        m00 = 0;
-        m01 = 0;
-        m02 = 0;
-        m10 = 0;
-        m11 = 0;
-        m12 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = 0;
-    }
-
-
-    //ASSIGNMENT OPERATOR of identical Matrix33 types.
-    //The assignment operator has precedence over assignment constructor
-    //Matrix33 m; m=m33;
-    ILINE Matrix33_tpl<F>& operator = (const Matrix33_tpl<F>& m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        return *this;
-    }
-
-
-    //--------------------------------------------------------------------
-    //----   implementation of the constructors                        ---
-    //--------------------------------------------------------------------
-
-    //CONSTRUCTOR for identical float-types. It initializes a Matrix33 with 9 floats.
-    //Matrix33(0,1,2, 3,4,5, 6,7,8);
-    explicit ILINE Matrix33_tpl<F>(F x00, F x01, F x02, F x10, F x11, F x12, F x20, F x21, F x22)
-    {
-        m00 = x00;
-        m01 = x01;
-        m02 = x02;
-        m10 = x10;
-        m11 = x11;
-        m12 = x12;
-        m20 = x20;
-        m21 = x21;
-        m22 = x22;
-    }
-    //CONSTRUCTOR for different float-types. It initializes a Matrix33 with 9 floats.
-    //Matrix33(0.0,1.0,2.0, 3.0,4.0,5.0, 6.0,7.0,8.0);
-    template<class F1>
-    explicit ILINE Matrix33_tpl<F>(F1 x00, F1 x01, F1 x02, F1 x10, F1 x11, F1 x12, F1 x20, F1 x21, F1 x22)
-    {
-        m00 = F(x00);
-        m01 = F(x01);
-        m02 = F(x02);
-        m10 = F(x10);
-        m11 = F(x11);
-        m12 = F(x12);
-        m20 = F(x20);
-        m21 = F(x21);
-        m22 = F(x22);
-    }
-
-
-    //CONSTRUCTOR for identical float-types. It initializes a Matrix33 with 3 vectors stored in the columns.
-    //Matrix33(v0,v1,v2);
-    explicit ILINE Matrix33_tpl<F>(const Vec3_tpl<F>&vx, const Vec3_tpl<F>&vy, const Vec3_tpl<F>&vz)
-    {
-        m00 = vx.x;
-        m01 = vy.x;
-        m02 = vz.x;
-        m10 = vx.y;
-        m11 = vy.y;
-        m12 = vz.y;
-        m20 = vx.z;
-        m21 = vy.z;
-        m22 = vz.z;
-    }
-    //CONSTRUCTOR for different float-types. It initializes a Matrix33 with 3 vectors stored in the columns and converts between floats/doubles.
-    //Matrix33r(v0,v1,v2);
-    template<class F1>
-    explicit ILINE Matrix33_tpl<F>(const Vec3_tpl<F1>&vx, const Vec3_tpl<F1>&vy, const Vec3_tpl<F1>&vz)
-    {
-        m00 = F(vx.x);
-        m01 = F(vy.x);
-        m02 = F(vz.x);
-        m10 = F(vx.y);
-        m11 = F(vy.y);
-        m12 = F(vz.y);
-        m20 = F(vx.z);
-        m21 = F(vy.z);
-        m22 = F(vz.z);
-    }
-
-
-
-
-
-    //CONSTRUCTOR for identical float-types. It converts a Diag33 into a Matrix33.
-    //Matrix33(diag33);
-    ILINE Matrix33_tpl<F>(const Diag33_tpl<F>&d)
-    {
-        assert(d.IsValid());
-        m00 = d.x;
-        m01 = 0;
-        m02 = 0;
-        m10 = 0;
-        m11 = d.y;
-        m12 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = d.z;
-    }
-    //CONSTRUCTOR for different float-types. It converts a Diag33 into a Matrix33 and also converts between double/float.
-    //Matrix33(diag33);
-    template<class F1>
-    ILINE Matrix33_tpl<F>(const Diag33_tpl<F1>&d)
-    {
-        assert(d.IsValid());
-        m00 = F(d.x);
-        m01 = 0;
-        m02 = 0;
-        m10 = 0;
-        m11 = F(d.y);
-        m12 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = F(d.z);
-    }
-
-
-
-    //CONSTRUCTOR for identical float-types
-    //Matrix33 m=m33;
-    ILINE Matrix33_tpl<F>(const Matrix33_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-    }
-    //CONSTRUCTOR for different float-types which converts between double/float
-    //Matrix33 m=m33r;
-    template<class F1>
-    ILINE Matrix33_tpl<F>(const Matrix33_tpl<F1>&m)
-    {
-        assert(m.IsValid());
-        m00 = F(m.m00);
-        m01 = F(m.m01);
-        m02 = F(m.m02);
-        m10 = F(m.m10);
-        m11 = F(m.m11);
-        m12 = F(m.m12);
-        m20 = F(m.m20);
-        m21 = F(m.m21);
-        m22 = F(m.m22);
-    }
-
-
-
-    //CONSTRUCTOR for identical float-types. It converts a Matrix34 into a Matrix33.
-    //Needs to be 'explicit' because we loose the translation vector in the conversion process
-    //Matrix33(m34);
-    explicit ILINE Matrix33_tpl<F>(const Matrix34_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-    }
-    //CONSTRUCTOR for different float-types. It converts a Matrix34 into a Matrix33 and converts between double/float.
-    //Needs to be 'explicit' because we loose the translation vector in the conversion process
-    //Matrix33(m34r);
-    template<class F1>
-    explicit ILINE Matrix33_tpl<F>(const Matrix34_tpl<F1>&m)
-    {
-        assert(m.IsValid());
-        m00 = F(m.m00);
-        m01 = F(m.m01);
-        m02 = F(m.m02);
-        m10 = F(m.m10);
-        m11 = F(m.m11);
-        m12 = F(m.m12);
-        m20 = F(m.m20);
-        m21 = F(m.m21);
-        m22 = F(m.m22);
-    }
-
-
-
-
-    //CONSTRUCTOR for identical float-types. It converts a Matrix44 into a Matrix33.
-    //Needs to be 'explicit' because we loose the translation vector and the 3rd row in the conversion process
-    //Matrix33(m44);
-    explicit ILINE Matrix33_tpl<F>(const Matrix44_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-    }
-    //CONSTRUCTOR for different float-types. It converts a Matrix44 into a Matrix33 and converts between double/float.
-    //Needs to be 'explicit' because we loose the translation vector and the 3rd row in the conversion process
-    //Matrix33(m44r);
-    template<class F1>
-    explicit ILINE Matrix33_tpl<F>(const Matrix44_tpl<F1>&m)
-    {
-        assert(m.IsValid());
-        m00 = F(m.m00);
-        m01 = F(m.m01);
-        m02 = F(m.m02);
-        m10 = F(m.m10);
-        m11 = F(m.m11);
-        m12 = F(m.m12);
-        m20 = F(m.m20);
-        m21 = F(m.m21);
-        m22 = F(m.m22);
-    }
-
-    //CONSTRUCTOR for identical float-types. It converts a Quat into a Matrix33.
-    //Needs to be 'explicit' because we loose fp-precision in the conversion process
-    //Matrix33(quat);
-    explicit ILINE Matrix33_tpl<F>(const Quat_tpl<F>&q)
-    {
-        assert(q.IsValid(0.05f));
-        Vec3_tpl<F> v2 = q.v + q.v;
-        F xx = 1 - v2.x * q.v.x;
-        F yy = v2.y * q.v.y;
-        F xw = v2.x * q.w;
-        F xy = v2.y * q.v.x;
-        F yz = v2.z * q.v.y;
-        F yw = v2.y * q.w;
-        F xz = v2.z * q.v.x;
-        F zz = v2.z * q.v.z;
-        F zw = v2.z * q.w;
-        m00 = 1 - yy - zz;
-        m01 = xy - zw;
-        m02 = xz + yw;
-        m10 = xy + zw;
-        m11 = xx - zz;
-        m12 = yz - xw;
-        m20 = xz - yw;
-        m21 = yz + xw;
-        m22 = xx - yy;
-    }
-
-    //CONSTRUCTOR for different float-types. It converts a Quat into a Matrix33 and converts between double/float.
-    //Needs to be 'explicit' because we loose fp-precision in the conversion process
-    //Matrix33(quatr);
-    template<class F1>
-    explicit ILINE Matrix33_tpl<F>(const Quat_tpl<F1>&q)
-    {
-        assert(q.IsValid(0.05f));
-        Vec3_tpl<F1> v2 = q.v + q.v;
-        F1 xx = 1 - v2.x * q.v.x;
-        F1 yy = v2.y * q.v.y;
-        F1 xw = v2.x * q.w;
-        F1 xy = v2.y * q.v.x;
-        F1 yz = v2.z * q.v.y;
-        F1 yw = v2.y * q.w;
-        F1 xz = v2.z * q.v.x;
-        F1 zz = v2.z * q.v.z;
-        F1 zw = v2.z * q.w;
-        m00 = F(1 - yy - zz);
-        m01 = F(xy - zw);
-        m02 = F(xz + yw);
-        m10 = F(xy + zw);
-        m11 = F(xx - zz);
-        m12 = F(yz - xw);
-        m20 = F(xz - yw);
-        m21 = F(yz + xw);
-        m22 = F(xx - yy);
-    }
-
-
-    //CONSTRUCTOR for identical float-types. It converts a Euler Angle into a Matrix33.
-    //Needs to be 'explicit' because we loose fp-precision in the conversion process
-    //Matrix33(Ang3(1,2,3));
-    explicit ILINE Matrix33_tpl<F>(const Ang3_tpl<F>&ang)
-    {
-        assert(ang.IsValid());
-        SetRotationXYZ(ang);
-    }
-    //CONSTRUCTOR for different float-types. It converts a Euler Angle into a Matrix33 and converts between double/float. .
-    //Needs to be 'explicit' because we loose fp-precision in the conversion process
-    //Matrix33(Ang3r(1,2,3));
-    template<class F1>
-    explicit ILINE Matrix33_tpl<F>(const Ang3_tpl<F1>&ang)
-    {
-        assert(ang.IsValid());
-        SetRotationXYZ(Ang3_tpl<F>(F(ang.x), F(ang.y), F(ang.z)));
-    }
-
-
-
-
-    //Bracket OPERATOR: initializes a Matrix33 with 9 floats.
-    //Matrix33 m; m(0,1,2, 3,4,5, 6,7,8);
-    ILINE void operator () (F x00, F x01, F x02, F x10, F x11, F x12, F x20, F x21, F x22)
-    {
-        m00 = x00;
-        m01 = x01;
-        m02 = x02;
-        m10 = x10;
-        m11 = x11;
-        m12 = x12;
-        m20 = x20;
-        m21 = x21;
-        m22 = x22;
-        assert(IsValid());
-    }
-
-
-    //---------------------------------------------------------------------------------------
-
-    ILINE void SetIdentity(void)
-    {
-        m00 = 1;
-        m01 = 0;
-        m02 = 0;
-        m10 = 0;
-        m11 = 1;
-        m12 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = 1;
-    }
-
-    ILINE static Matrix33_tpl<F> CreateIdentity()
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetIdentity();
-        return m33;
-    }
-
-    ILINE void SetZero()
-    {
-        m00 = 0;
-        m01 = 0;
-        m02 = 0;
-        m10 = 0;
-        m11 = 0;
-        m12 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = 0;
-    }
-
-
-    /*!
-    *  Create a rotation matrix around an arbitrary axis (Eulers Theorem).
-    *  The axis is specified as a normalized Vec3. The angle is assumed to be in radians.
-    *
-    *  Example:
-    *       Matrix34 m34;
-    *       Vec3 axis=GetNormalized( Vec3(-1.0f,-0.3f,0.0f) );
-    *       m34.SetRotationAA( rad, axis );
-    */
-    ILINE void SetRotationAA(F angle, const Vec3_tpl<F> axis)
-    {
-        F s, c;
-        sincos_tpl(angle, &s, &c);
-        SetRotationAA(c, s, axis);
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationAA(const F rad, const Vec3_tpl<F>& axis)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationAA(rad, axis);
-        return m33;
-    }
-
-
-    ILINE void SetRotationAA(F c, F s, const Vec3_tpl<F>& axis)
-    {
-        assert(axis.IsUnit(0.001f));
-        F   mc  =   1 - c;
-        m00 = mc * axis.x * axis.x + c;
-        m01 = mc * axis.x * axis.y - axis.z * s;
-        m02 = mc * axis.x * axis.z + axis.y * s;
-        m10 = mc * axis.y * axis.x + axis.z * s;
-        m11 = mc * axis.y * axis.y + c;
-        m12 = mc * axis.y * axis.z - axis.x * s;
-        m20 = mc * axis.z * axis.x - axis.y * s;
-        m21 = mc * axis.z * axis.y + axis.x * s;
-        m22 = mc * axis.z * axis.z + c;
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationAA(F c, F s, const Vec3_tpl<F>& axis)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationAA(c, s, axis);
-        return m33;
-    }
-
-    ILINE void SetRotationAA(const Vec3_tpl<F> axis)
-    {
-        F angle = axis.GetLength();
-        if (angle == F(0))
-        {
-            SetIdentity();
-        }
-        else
-        {
-            SetRotationAA(angle, axis / angle);
-        }
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationAA(const Vec3_tpl<F>& axis)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationAA(axis);
-        return m33;
-    }
-
-
-
-    /*!
-    *
-    * Create rotation-matrix about X axis using an angle.
-    * The angle is assumed to be in radians.
-    *
-    *  Example:
-    *       Matrix m33;
-    *       m33.SetRotationX(0.5f);
-    */
-    ILINE void SetRotationX(const f32 rad)
-    {
-        F s, c;
-        sincos_tpl(rad, &s, &c);
-        m00 = 1.0f;
-        m01 = 0.0f;
-        m02 =    0.0f;
-        m10 = 0.0f;
-        m11 = c;
-        m12 = -s;
-        m20 = 0.0f;
-        m21 = s;
-        m22 = c;
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationX(const f32 rad)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationX(rad);
-        return m33;
-    }
-
-    ILINE void SetRotationY(const f32 rad)
-    {
-        F s, c;
-        sincos_tpl(rad, &s, &c);
-        m00 =   c;
-        m01 =   0;
-        m02 =   s;
-        m10 =   0;
-        m11 =   1;
-        m12 =   0;
-        m20 = -s;
-        m21 =   0;
-        m22 = c;
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationY(const f32 rad)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationY(rad);
-        return m33;
-    }
-
-    ILINE void SetRotationZ(const f32 rad)
-    {
-        F s, c;
-        sincos_tpl(rad, &s, &c);
-        m00 =   c;
-        m01 = -s;
-        m02 =   0.0f;
-        m10 =   s;
-        m11 =   c;
-        m12 =   0.0f;
-        m20 =   0.0f;
-        m21 =   0.0f;
-        m22 = 1.0f;
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationZ(const f32 rad)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationZ(rad);
-        return m33;
-    }
-
-    ILINE void SetRotationXYZ(const Ang3_tpl<F>& rad)
-    {
-        assert(rad.IsValid());
-        F sx, cx;
-        sincos_tpl(rad.x, &sx, &cx);
-        F sy, cy;
-        sincos_tpl(rad.y, &sy, &cy);
-        F sz, cz;
-        sincos_tpl(rad.z, &sz, &cz);
-        F sycz  = (sy * cz), sysz  = (sy * sz);
-        m00 = cy * cz;
-        m01 = sycz * sx - cx * sz;
-        m02 = sycz * cx + sx * sz;
-        m10 = cy * sz;
-        m11 = sysz * sx + cx * cz;
-        m12 = sysz * cx - sx * cz;
-        m20 = -sy;
-        m21 = cy * sx;
-        m22 = cy * cx;
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationXYZ(const Ang3_tpl<F>& rad)
-    {
-        assert(rad.IsValid());
-        Matrix33_tpl<F> m33;
-        m33.SetRotationXYZ(rad);
-        return m33;
-    }
-
-
-
-
-    /*!
-    * Creates a rotation matrix that rotates the vector "v0" into "v1".
-    *
-    *   a) If both vectors are exactly parallel it returns an identity-matrix
-    *   b) CAUTION: If both vectors are exactly diametrical it returns a matrix that rotates
-    *    pi-radians about a "random" axis that is orthogonal to v0.
-    *   c) CAUTION: If both vectors are almost diametrical we have to normalize
-    *    a very small vector and the result is inaccurate. It is recommended to use this
-    *    function with 64-bit precision.
-    */
-    ILINE void SetRotationV0V1(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
-    {
-        assert((fabs_tpl(1 - (v0 | v0))) < 0.01); //check if unit-vector
-        assert((fabs_tpl(1 - (v1 | v1))) < 0.01); //check if unit-vector
-        F dot = v0 | v1;
-        if (dot < F(-0.9999f))
-        {
-            Vec3d axis = v0.GetOrthogonal().GetNormalized();
-            m00 = F(2 * axis.x * axis.x - 1);
-            m01 = F(2 * axis.x * axis.y);
-            m02 = F(2 * axis.x * axis.z);
-            m10 = F(2 * axis.y * axis.x);
-            m11 = F(2 * axis.y * axis.y - 1);
-            m12 = F(2 * axis.y * axis.z);
-            m20 = F(2 * axis.z * axis.x);
-            m21 = F(2 * axis.z * axis.y);
-            m22 = F(2 * axis.z * axis.z - 1);
-        }
-        else
-        {
-            Vec3_tpl<F> v = v0 % v1;
-            F h = 1 / (1 + dot);
-            m00 = F(dot + h * v.x * v.x);
-            m01 = F(h * v.x * v.y - v.z);
-            m02 = F(h * v.x * v.z + v.y);
-            m10 = F(h * v.x * v.y + v.z);
-            m11 = F(dot + h * v.y * v.y);
-            m12 = F(h * v.y * v.z - v.x);
-            m20 = F(h * v.x * v.z - v.y);
-            m21 = F(h * v.y * v.z + v.x);
-            m22 = F(dot + h * v.z * v.z);
-        }
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationV0V1(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationV0V1(v0, v1);
-        return m33;
-    }
-
-
-
-
-
-
-    /*!
-    *
-    * \param vdir  normalized view direction.
-    * \param roll  radiant to rotate about Y-axis.
-    *
-    *  Given a view-direction and a radiant to rotate about Y-axis, this function builds a 3x3 look-at matrix
-    *  using only simple vector arithmetic. This function is always using the implicit up-vector Vec3(0,0,1).
-    *  The view-direction is always stored in column(1).
-    *  IMPORTANT: The view-vector is assumed to be normalized, because all trig-values for the orientation are being
-    *  extracted  directly out of the vector. This function must NOT be called with a view-direction
-    *  that is close to Vec3(0,0,1) or Vec3(0,0,-1). If one of these rules is broken, the function returns a matrix
-    *  with an undefined rotation about the Z-axis.
-    *
-    *  Rotation order for the look-at-matrix is Z-X-Y. (Zaxis=YAW / Xaxis=PITCH / Yaxis=ROLL)
-    *
-    *  COORDINATE-SYSTEM
-    *
-    *  z-axis
-    *    ^
-    *    |
-    *    |  y-axis
-    *    |  /
-    *    | /
-    *    |/
-    *    +--------------->   x-axis
-    *
-    *  Example:
-    *       Matrix33 orientation=Matrix33::CreateRotationVDir( Vec3(0,1,0), 0 );
-    */
-    ILINE void SetRotationVDir(const Vec3_tpl<F>& vdir)
-    {
-        assert((fabs_tpl(1 - (vdir | vdir))) < 0.01);     //check if unit-vector
-        //set default initialisation for up-vector
-        m00 = 1;
-        m01 = 0;
-        m02 = 0;
-        m10 = 0;
-        m11 = 0;
-        m12 = -vdir.z;
-        m20 = 0;
-        m21 = vdir.z;
-        m22 = 0;
-        //calculate look-at matrix
-        F l = sqrt(vdir.x * vdir.x + vdir.y * vdir.y);
-        if (l > F(0.00001))
-        {
-            F xl = -vdir.x / l;
-            F yl = vdir.y / l;
-            m00 = F(yl);
-            m01 = F(vdir.x);
-            m02 = F(xl * vdir.z);
-            m10 = F(xl);
-            m11 = F(vdir.y);
-            m12 = F(-vdir.z * yl);
-            m20 = 0;
-            m21 = F(vdir.z);
-            m22 = F(l);
-        }
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationVDir(const Vec3_tpl<F> vdir)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationVDir(vdir);
-        return m33;
-    }
-
-
-    //look-at matrix with roll
-    ILINE void SetRotationVDir(const Vec3_tpl<F>& vdir, F roll)
-    {
-        SetRotationVDir(vdir);
-        F s, c;
-        sincos_tpl(roll, &s, &c);
-        F x00 = m00, x10 = m10;
-        m00 = m00 * c - m02 * s;
-        m02 = x00 * s + m02 * c;
-        m10 = m10 * c - m12 * s;
-        m12 = x10 * s + m12 * c;
-        m20 = -m22 * s;
-        m22 = m22 * c;
-    }
-    ILINE static Matrix33_tpl<F> CreateRotationVDir(const Vec3_tpl<F>& vdir, F roll)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetRotationVDir(vdir, roll);
-        return m33;
-    }
-
-
-    //! calculate 2 vector that form a orthogonal base with a given input vector (by M.M.)
-    //! /param invDirection input direction (has to be normalized)
-    //! /param outvA first output vector that is perpendicular to the input direction
-    //! /param outvB second output vector that is perpendicular the input vector and the first output vector
-    ILINE static Matrix33_tpl<F> CreateOrthogonalBase(const Vec3& invDirection)
-    {
-        Vec3 outvA;
-        if (invDirection.z < -0.5f || invDirection.z > 0.5f)
-        {
-            outvA = Vec3(invDirection.z, invDirection.y, -invDirection.x);
-        }
-        else
-        {
-            outvA = Vec3(invDirection.y, -invDirection.x, invDirection.z);
-        }
-        Vec3 outvB = (invDirection % outvA).GetNormalized();
-        outvA = (invDirection % outvB).GetNormalized();
-        return CreateFromVectors(invDirection, outvA, outvB);
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    ILINE static Matrix33_tpl<F> CreateOrientation(const Vec3_tpl<F>& dir, const Vec3_tpl<F>& up, float rollAngle)
-    {
-        // LookAt transform.
-        Vec3 xAxis, yAxis, zAxis;
-        Vec3 upVector = up;
-        if (dir.IsZeroFast())
-        {
-            Matrix33_tpl<F> tm;
-            tm.SetIdentity();
-            return tm;
-        }
-        yAxis = dir.GetNormalized();
-
-        if (yAxis.x == 0 && yAxis.y == 0 && up.IsEquivalent(Vec3_tpl<F>(0, 0, 1.0f)))
-        {
-            upVector.Set(-yAxis.z, 0, 0);
-        }
-
-        xAxis = (upVector % yAxis).GetNormalized();
-        zAxis = (xAxis % yAxis).GetNormalized();
-
-        Matrix33_tpl<F> tm;
-        tm.SetFromVectors(xAxis, yAxis, zAxis);
-
-        if (rollAngle != 0)
-        {
-            Matrix33_tpl<F> RollMtx;
-            RollMtx.SetRotationY(rollAngle);
-            tm = tm * RollMtx;
-        }
-        return tm;
-    }
-
-
-    /*!
-    *  Direct-Matrix-Slerp: for the sake of completeness, I have included the following expression
-    *  for Spherical-Linear-Interpolation without using quaternions. This is much faster then converting
-    *  both matrices into quaternions in order to do a quaternion slerp and then converting the slerped
-    *  quaternion back into a matrix.
-    *  This is a high-precision calculation. Given two orthonormal 3x3 matrices this function calculates
-    *  the shortest possible interpolation-path between the two rotations. The interpolation curve forms
-    *  a great arc on the rotation sphere (geodesic). Not only does Slerp follow a great arc it follows
-    *  the shortest great arc.  Furthermore Slerp has constant angular velocity. All in all Slerp is the
-    *  optimal interpolation curve between two rotations.
-    *
-    *  STABILITY PROBLEM: There are two singularities at angle=0 and angle=PI. At 0 the interpolation-axis
-    *  is arbitrary, which means any axis will produce the same result because we have no rotation. Thats
-    *  why I'm using (1,0,0). At PI the rotations point away from each other and the interpolation-axis
-    *  is unpredictable. In this case I'm also using the axis (1,0,0). If the angle is ~0 or ~PI, then we
-    *  have to normalize a very small vector and this can cause numerical instability. The quaternion-slerp
-    *  has exactly the same problems.
-    *                                                                                                  Ivo
-    *  Example:
-    *       Matrix33 slerp=Matrix33::CreateSlerp( m,n,0.333f );
-    */
-    ILINE void SetSlerp(const Matrix33_tpl<F>& m, const Matrix33_tpl<F>& n, F t)
-    {
-        assert(m.IsValid());
-        assert(n.IsValid());
-        //calculate delta-rotation between m and n (=39 flops)
-        Matrix33_tpl<F> d, i;
-        d.m00 = m.m00 * n.m00 + m.m10 * n.m10 + m.m20 * n.m20;
-        d.m01 = m.m00 * n.m01 + m.m10 * n.m11 + m.m20 * n.m21;
-        d.m02 = m.m00 * n.m02 + m.m10 * n.m12 + m.m20 * n.m22;
-        d.m10 = m.m01 * n.m00 + m.m11 * n.m10 + m.m21 * n.m20;
-        d.m11 = m.m01 * n.m01 + m.m11 * n.m11 + m.m21 * n.m21;
-        d.m12 = m.m01 * n.m02 + m.m11 * n.m12 + m.m21 * n.m22;
-        d.m20 = d.m01 * d.m12 - d.m02 * d.m11;
-        d.m21 = d.m02 * d.m10 - d.m00 * d.m12;
-        d.m22 = d.m00 * d.m11 - d.m01 * d.m10;
-        assert(d.IsOrthonormalRH(0.0001f));
-
-        Vec3_tpl<F> axis(d.m21 - d.m12, d.m02 - d.m20, d.m10 - d.m01);
-        F l = sqrt(axis | axis);
-        if (l > F(0.00001))
-        {
-            axis /= l;
-        }
-        else
-        {
-            axis(1, 0, 0);
-        }
-        i.SetRotationAA(acos(clamp_tpl((d.m00 + d.m11 + d.m22 - 1) * 0.5f, F(-1), F(+1))) * t, axis); //angle interpolation and calculation of new delta-matrix (=26 flops)
-
-        //final concatenation (=39 flops)
-        m00 = F(m.m00 * i.m00 + m.m01 * i.m10 + m.m02 * i.m20);
-        m01 = F(m.m00 * i.m01 + m.m01 * i.m11 + m.m02 * i.m21);
-        m02 = F(m.m00 * i.m02 + m.m01 * i.m12 + m.m02 * i.m22);
-        m10 = F(m.m10 * i.m00 + m.m11 * i.m10 + m.m12 * i.m20);
-        m11 = F(m.m10 * i.m01 + m.m11 * i.m11 + m.m12 * i.m21);
-        m12 = F(m.m10 * i.m02 + m.m11 * i.m12 + m.m12 * i.m22);
-        m20 = m01 * m12 - m02 * m11;
-        m21 = m02 * m10 - m00 * m12;
-        m22 = m00 * m11 - m01 * m10;
-        assert(this->IsOrthonormalRH(0.0001f));
-    }
-    ILINE static Matrix33_tpl<F> CreateSlerp(const Matrix33_tpl<F> m, const Matrix33_tpl<F> n, F t)
-    {
-        Matrix33_tpl<F> m33;
-        m33.SetSlerp(m, n, t);
-        return m33;
-    }
-
-
-    ILINE void SetScale(const Vec3_tpl<F>& s)
-    {
-        m00 = s.x;
-        m01 = 0;
-        m02 = 0;
-        m10 = 0;
-        m11 = s.y;
-        m12 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = s.z;
-    }
-    ILINE static Matrix33_tpl<F> CreateScale(const Vec3_tpl<F>& s) { Matrix33_tpl<F> m; m.SetScale(s);   return m;   }
-
-
-    //NOTE: all vectors are stored in columns
-    ILINE void SetFromVectors(const Vec3_tpl<F>& vx, const Vec3_tpl<F>& vy, const Vec3_tpl<F>& vz)
-    {
-        m00 = vx.x;
-        m01 = vy.x;
-        m02 = vz.x;
-        m10 = vx.y;
-        m11 = vy.y;
-        m12 = vz.y;
-        m20 = vx.z;
-        m21 = vy.z;
-        m22 = vz.z;
-    }
-    ILINE static Matrix33_tpl<F> CreateFromVectors(const Vec3_tpl<F>& vx, const Vec3_tpl<F>& vy, const Vec3_tpl<F>& vz) { Matrix33_tpl<F> dst; dst.SetFromVectors(vx, vy, vz); return dst;  }
-
-
-
-
-    ILINE void Transpose()   // in-place transposition
-    {
-        F t;
-        t = m01;
-        m01 = m10;
-        m10 = t;
-        t = m02;
-        m02 = m20;
-        m20 = t;
-        t = m12;
-        m12 = m21;
-        m21 = t;
-    }
-    ILINE Matrix33_tpl<F> GetTransposed() const
-    {
-        Matrix33_tpl<F> dst;
-        dst.m00 = m00;
-        dst.m01 = m10;
-        dst.m02 = m20;
-        dst.m10 = m01;
-        dst.m11 = m11;
-        dst.m12 = m21;
-        dst.m20 = m02;
-        dst.m21 = m12;
-        dst.m22 = m22;
-        return dst;
-    }
-    ILINE Matrix33_tpl<F> T() const { return GetTransposed(); }
-
-    ILINE Matrix33_tpl& Fabs()
-    {
-        m00 = fabs_tpl(m00);
-        m01 = fabs_tpl(m01);
-        m02 = fabs_tpl(m02);
-        m10 = fabs_tpl(m10);
-        m11 = fabs_tpl(m11);
-        m12 = fabs_tpl(m12);
-        m20 = fabs_tpl(m20);
-        m21 = fabs_tpl(m21);
-        m22 = fabs_tpl(m22);
-        return *this;
-    }
-    ILINE Matrix33_tpl<F> GetFabs() const { Matrix33_tpl<F> m = *this; m.Fabs();  return m;   }
-
-
-    ILINE void Adjoint(void)
-    {
-        //rescue members
-        Matrix33_tpl<F> m = *this;
-        //calculate the adjoint-matrix
-        m00 = m.m11 * m.m22 - m.m12 * m.m21;
-        m01 = m.m12 * m.m20 - m.m10 * m.m22;
-        m02 = m.m10 * m.m21 - m.m11 * m.m20;
-        m10 = m.m21 * m.m02 - m.m22 * m.m01;
-        m11 = m.m22 * m.m00 - m.m20 * m.m02;
-        m12 = m.m20 * m.m01 - m.m21 * m.m00;
-        m20 = m.m01 * m.m12 - m.m02 * m.m11;
-        m21 = m.m02 * m.m10 - m.m00 * m.m12;
-        m22 = m.m00 * m.m11 - m.m01 * m.m10;
-    }
-    ILINE Matrix33_tpl<F> GetAdjoint() const {  Matrix33_tpl<F> dst = *this; dst.Adjoint(); return dst;   }
-
-
-
-    /*!
-    *
-    * calculate a real inversion of a Matrix33.
-    * an inverse-matrix is an UnDo-matrix for all kind of transformations
-    * NOTE: if the return value of Invert33() is zero, then the inversion failed!
-    *
-    *  Example 1:
-    *       Matrix33 im33;
-    *       bool st=i33.Invert();
-    *   assert(st);
-    *
-    *  Example 2:
-    *   matrix33 im33=Matrix33::GetInverted(m33);
-    */
-    ILINE bool Invert(void)
-    {
-        //rescue members
-        Matrix33_tpl<F> m = *this;
-        //calculate the cofactor-matrix (=transposed adjoint-matrix)
-        m00 = m.m22 * m.m11 - m.m12 * m.m21;
-        m01 = m.m02 * m.m21 - m.m22 * m.m01;
-        m02 = m.m12 * m.m01 - m.m02 * m.m11;
-        m10 = m.m12 * m.m20 - m.m22 * m.m10;
-        m11 = m.m22 * m.m00 - m.m02 * m.m20;
-        m12 = m.m02 * m.m10 - m.m12 * m.m00;
-        m20 = m.m10 * m.m21 - m.m20 * m.m11;
-        m21 = m.m20 * m.m01 - m.m00 * m.m21;
-        m22 = m.m00 * m.m11 - m.m10 * m.m01;
-        // calculate determinant
-        F det = (m.m00 * m00 + m.m10 * m01 + m.m20 * m02);
-        if (fabs_tpl(det) < 1E-20f)
-        {
-            return 0;
-        }
-        //divide the cofactor-matrix by the determinant
-        F idet = (F)1.0 / det;
-        m00 *= idet;
-        m01 *= idet;
-        m02 *= idet;
-        m10 *= idet;
-        m11 *= idet;
-        m12 *= idet;
-        m20 *= idet;
-        m21 *= idet;
-        m22 *= idet;
-        return 1;
-    }
-    ILINE Matrix33_tpl<F> GetInverted() const
-    {
-        Matrix33_tpl<F> dst = *this;
-        dst.Invert();
-        return dst;
-    }
-
-    ILINE Vec3_tpl<F> TransformVector(const Vec3_tpl<F>& v) const
-    {
-        return Vec3_tpl<F>(m00 * v.x + m01 * v.y + m02 * v.z, m10 * v.x + m11 * v.y + m12 * v.z, m20 * v.x + m21 * v.y + m22 * v.z);
-    }
-
-
-
-    //! make a right-handed orthonormal matrix.
-    ILINE void OrthonormalizeFast()
-    {
-        Vec3 x = Vec3(m00, m10, m20).GetNormalized();
-        Vec3 y = (Vec3(m02, m12, m22) % x).GetNormalized();
-        Vec3 z = (x % y);
-        m00 = x.x;
-        m01 = y.x;
-        m02 = z.x;
-        m10 = x.y;
-        m11 = y.y;
-        m12 = z.y;
-        m20 = x.z;
-        m21 = y.z;
-        m22 = z.z;
-    }
-
-    ILINE f32 Determinant() const
-    {
-        return (m00 * m11 * m22) + (m01 * m12 * m20) + (m02 * m10 * m21) - (m02 * m11 * m20) - (m00 * m12 * m21) - (m01 * m10 * m22);
-    }
-
-    //--------------------------------------------------------------------------------
-    //----                  helper functions to access matrix-members     ------------
-    //--------------------------------------------------------------------------------
-    F* GetData() { return &m00; }
-    const F* GetData() const { return &m00; }
-
-    ILINE F operator () (uint32 i, uint32 j) const {    assert ((i < 3) && (j < 3));    const F* const p_data = (const F*)(&m00);     return p_data[i * 3 + j];   }
-    ILINE F& operator () (uint32 i, uint32 j)   {   assert ((i < 3) && (j < 3));    F* p_data = (F*)(&m00);       return p_data[i * 3 + j];   }
-    ILINE void SetRow(int i, const Vec3_tpl<F>& v)  {   assert(i < 3);    F* p = (F*)(&m00);    p[0 + 3 * i] = v.x;   p[1 + 3 * i] = v.y;   p[2 + 3 * i] = v.z;       }
-    ILINE Vec3_tpl<F> GetRow(int i) const   {   assert(i < 3);    const F* const p = (const F*)(&m00);  return Vec3_tpl<F>(p[0 + 3 * i], p[1 + 3 * i], p[2 + 3 * i]); }
-    ILINE void SetColumn(int i, const Vec3_tpl<F>& v)   {   assert(i < 3);    F* p = (F*)(&m00);    p[i + 3 * 0] = v.x;   p[i + 3 * 1] = v.y;   p[i + 3 * 2] = v.z;       }
-    ILINE Vec3_tpl<F> GetColumn(int i) const    {   assert(i < 3);    const F* const p = (const F*)(&m00);  return Vec3_tpl<F>(p[i + 3 * 0], p[i + 3 * 1], p[i + 3 * 2]); }
-
-
-    ILINE Vec3_tpl<F> GetColumn0() const    { return Vec3_tpl<F> (m00, m10, m20); }
-    ILINE Vec3_tpl<F> GetColumn1() const    { return Vec3_tpl<F> (m01, m11, m21); }
-    ILINE Vec3_tpl<F> GetColumn2() const    { return Vec3_tpl<F> (m02, m12, m22); }
-    ILINE void SetColumn0(const Vec3_tpl<F>& v) { m00 = v.x; m10 = v.y; m20 = v.z;    }
-    ILINE void SetColumn1(const Vec3_tpl<F>& v) { m01 = v.x; m11 = v.y; m21 = v.z;    }
-    ILINE void SetColumn2(const Vec3_tpl<F>& v) { m02 = v.x; m12 = v.y; m22 = v.z;    }
-
-    ILINE Matrix33_tpl<F>& operator *= (F op)
-    {
-        m00 *= op;
-        m01 *= op;
-        m02 *= op;
-        m10 *= op;
-        m11 *= op;
-        m12 *= op;
-        m20 *= op;
-        m21 *= op;
-        m22 *= op;
-        return *this;
-    }
-
-    ILINE Matrix33_tpl<F>& operator /= (F op)
-    {
-        F iop = (F)1.0 / op;
-        m00 *= iop;
-        m01 *= iop;
-        m02 *= iop;
-        m10 *= iop;
-        m11 *= iop;
-        m12 *= iop;
-        m20 *= iop;
-        m21 *= iop;
-        m22 *= iop;
-        return *this;
-    }
-
-    ILINE static bool IsEquivalent(const Matrix33_tpl<F>& m0, const Matrix33_tpl<F>& m1, F e = VEC_EPSILON)
-    {
-        return  (
-            (fabs_tpl(m0.m00 - m1.m00) <= e) && (fabs_tpl(m0.m01 - m1.m01) <= e) && (fabs_tpl(m0.m02 - m1.m02) <= e) &&
-            (fabs_tpl(m0.m10 - m1.m10) <= e) && (fabs_tpl(m0.m11 - m1.m11) <= e) && (fabs_tpl(m0.m12 - m1.m12) <= e) &&
-            (fabs_tpl(m0.m20 - m1.m20) <= e) && (fabs_tpl(m0.m21 - m1.m21) <= e) && (fabs_tpl(m0.m22 - m1.m22) <= e)
-            );
-    }
-
-    ILINE bool IsIdentity(F e) const
-    {
-        return  (
-            (fabs_tpl((F)1 - m00) <= e) && (fabs_tpl(m01) <= e) && (fabs_tpl(m02) <= e) &&
-            (fabs_tpl(m10) <= e) && (fabs_tpl((F)1 - m11) <= e) && (fabs_tpl(m12) <= e) &&
-            (fabs_tpl(m20) <= e) && (fabs_tpl(m21) <= e) && (fabs_tpl((F)1 - m22) <= e)
-            );
-    }
-
-    ILINE bool IsIdentity() const
-    {
-        return 0 == (fabs_tpl((F)1 - m00) + fabs_tpl(m01) + fabs_tpl(m02) + fabs_tpl(m10) + fabs_tpl((F)1 - m11) + fabs_tpl(m12) + fabs_tpl(m20) + fabs_tpl(m21) + fabs_tpl((F)1 - m22));
-    }
-    ILINE int IsZero() const
-    {
-        return 0 == (fabs_tpl(m00) + fabs_tpl(m01) + fabs_tpl(m02) + fabs_tpl(m10) + fabs_tpl(m11) + fabs_tpl(m12) + fabs_tpl(m20) + fabs_tpl(m21) + fabs_tpl(m22));
-    }
-
-    //check if we have an orthonormal-base (general case, works even with reflection matrices)
-    ILINE int IsOrthonormal(F threshold = 0.001) const
-    {
-        f32 d0 = fabs_tpl(GetColumn0() | GetColumn1());
-        if  (d0 > threshold)
-        {
-            return 0;
-        }
-        f32 d1 = fabs_tpl(GetColumn0() | GetColumn2());
-        if  (d1 > threshold)
-        {
-            return 0;
-        }
-        f32 d2 = fabs_tpl(GetColumn1() | GetColumn2());
-        if  (d2 > threshold)
-        {
-            return 0;
-        }
-        int a = (fabs_tpl(1 - (GetColumn0() | GetColumn0()))) < threshold;
-        int b = (fabs_tpl(1 - (GetColumn1() | GetColumn1()))) < threshold;
-        int c = (fabs_tpl(1 - (GetColumn2() | GetColumn2()))) < threshold;
-        return a & b & c;
-    }
-
-    //check if we have an orthonormal-base (assuming we are using a right-handed coordinate system)
-    ILINE int IsOrthonormalRH(F threshold = 0.002) const
-    {
-        Vec3_tpl<F> x = GetColumn0();
-        Vec3_tpl<F> y = GetColumn1();
-        Vec3_tpl<F> z = GetColumn2();
-        bool a = x.IsEquivalent(y % z, threshold);
-        bool b = y.IsEquivalent(z % x, threshold);
-        bool c = z.IsEquivalent(x % y, threshold);
-        a &= x.IsUnit(0.01f);
-        b &= y.IsUnit(0.01f);
-        c &= z.IsUnit(0.01f);
-        return a & b & c;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Remove uniform scale from matrix.
-    ILINE void NoScale()
-    {
-        *this /= GetColumn(0).GetLength();
-    }
-
-    ILINE bool IsValid() const
-    {
-        if (!NumberValid(m00))
-        {
-            return false;
-        }
-        if (!NumberValid(m01))
-        {
-            return false;
-        }
-        if (!NumberValid(m02))
-        {
-            return false;
-        }
-        if (!NumberValid(m10))
-        {
-            return false;
-        }
-        if (!NumberValid(m11))
-        {
-            return false;
-        }
-        if (!NumberValid(m12))
-        {
-            return false;
-        }
-        if (!NumberValid(m20))
-        {
-            return false;
-        }
-        if (!NumberValid(m21))
-        {
-            return false;
-        }
-        if (!NumberValid(m22))
-        {
-            return false;
-        }
-        return true;
-    }
-
-
-    AUTO_STRUCT_INFO
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Typedefs                                                                  //
-///////////////////////////////////////////////////////////////////////////////
-
-typedef Matrix33_tpl<f32>  Matrix33;  //always 32 bit
-typedef Matrix33_tpl<f64>  Matrix33d; //always 64 bit
-typedef Matrix33_tpl<real> Matrix33r; //variable float precision. depending on the target system it can be between 32, 64 or 80 bit
-typedef _MS_ALIGN(16) Matrix33_tpl<f32> _ALIGN (16) Matrix33A;
-
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//-------------       implementation of Matrix33      ------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-
-template<class F1, class F2>
-ILINE Matrix33_tpl<F1> operator*(const Matrix33_tpl<F1>& l, const Diag33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix33_tpl<F1> res;
-    res.m00 = l.m00 * r.x;
-    res.m01 = l.m01 * r.y;
-    res.m02 = l.m02 * r.z;
-    res.m10 = l.m10 * r.x;
-    res.m11 = l.m11 * r.y;
-    res.m12 = l.m12 * r.z;
-    res.m20 = l.m20 * r.x;
-    res.m21 = l.m21 * r.y;
-    res.m22 = l.m22 * r.z;
-    return res;
-}
-template<class F1, class F2>
-ILINE Matrix33_tpl<F1>& operator *= (Matrix33_tpl<F1>& l, const Diag33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    l.m00 *= r.x;
-    l.m01 *= r.y;
-    l.m02 *= r.z;
-    l.m10 *= r.x;
-    l.m11 *= r.y;
-    l.m12 *= r.z;
-    l.m20 *= r.x;
-    l.m21 *= r.y;
-    l.m22 *= r.z;
-    return l;
-}
-
-//Matrix33 operations with another Matrix33
-template<class F1, class F2>
-ILINE Matrix33_tpl<F1> operator * (const Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix33_tpl<F1> m;
-    m.m00 = l.m00 * r.m00 +   l.m01 * r.m10 +   l.m02 * r.m20;
-    m.m01 = l.m00 * r.m01 +   l.m01 * r.m11 +   l.m02 * r.m21;
-    m.m02 = l.m00 * r.m02 +   l.m01 * r.m12 +   l.m02 * r.m22;
-    m.m10 = l.m10 * r.m00 +   l.m11 * r.m10 +   l.m12 * r.m20;
-    m.m11 = l.m10 * r.m01 +   l.m11 * r.m11 +   l.m12 * r.m21;
-    m.m12 = l.m10 * r.m02 +   l.m11 * r.m12 +   l.m12 * r.m22;
-    m.m20 = l.m20 * r.m00 +   l.m21 * r.m10 + l.m22 * r.m20;
-    m.m21 = l.m20 * r.m01 +   l.m21 * r.m11 +   l.m22 * r.m21;
-    m.m22 = l.m20 * r.m02 +   l.m21 * r.m12 +   l.m22 * r.m22;
-    return m;
-}
-
-
-/*!
-*
-*  Implements the multiplication operator: Matrix34=Matrix33*Matrix34
-*
-*  Matrix33 and Matrix34 are specified in collumn order for a right-handed coordinate-system.
-*  AxB = operation B followed by operation A.
-*  A multiplication takes 36 muls and 24 adds.
-*
-*  Example:
-*   Matrix33 m33=Matrix33::CreateRotationX(1.94192f);;
-*   Matrix34 m34=Matrix34::CreateRotationZ(3.14192f);
-*     Matrix34 result=m33*m34;
-*
-*/
-template<class F1, class F2>
-ILINE Matrix34_tpl<F2> operator * (const Matrix33_tpl<F1>& l, const Matrix34_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix34_tpl<F2> m;
-    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
-    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
-    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
-    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
-    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
-    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
-    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
-    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
-    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
-    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23;
-    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23;
-    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23;
-    return m;
-}
-
-/*!
-*
-*  Implements the multiplication operator: Matrix44=Matrix33*Matrix44
-*
-*  Matrix33 and Matrix44 are specified in collumn order for a right-handed coordinate-system.
-*  AxB = operation B followed by operation A.
-*  A multiplication takes 36 muls and 24 adds.
-*
-*  Example:
-*   Matrix33 m33=Matrix33::CreateRotationX(1.94192f);;
-*   Matrix44 m44=Matrix33::CreateRotationZ(3.14192f);
-*     Matrix44 result=m33*m44;
-*
-*/
-template<class F1, class F2>
-ILINE Matrix44_tpl<F2> operator * (const Matrix33_tpl<F1>& l, const Matrix44_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix44_tpl<F2> m;
-    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
-    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
-    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
-    m.m30 = r.m30;
-    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
-    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
-    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
-    m.m31 = r.m31;
-    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
-    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
-    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
-    m.m32 = r.m32;
-    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23;
-    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23;
-    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23;
-    m.m33 = r.m33;
-    return m;
-}
-
-template<class F1, class F2>
-ILINE Matrix33_tpl<F1>& operator *= (Matrix33_tpl<F1>& l,   const Matrix33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix33_tpl<F1> tmp;
-    tmp.m00 = l.m00 * r.m00 + l.m01 * r.m10 +   l.m02 * r.m20;
-    tmp.m01 = l.m00 * r.m01 + l.m01 * r.m11 +   l.m02 * r.m21;
-    tmp.m02 = l.m00 * r.m02 + l.m01 * r.m12 +   l.m02 * r.m22;
-    tmp.m10 = l.m10 * r.m00 + l.m11 * r.m10 +   l.m12 * r.m20;
-    tmp.m11 = l.m10 * r.m01 + l.m11 * r.m11 +   l.m12 * r.m21;
-    tmp.m12 = l.m10 * r.m02 + l.m11 * r.m12 +   l.m12 * r.m22;
-    tmp.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
-    tmp.m21 = l.m20 * r.m01 + l.m21 * r.m11 +   l.m22 * r.m21;
-    tmp.m22 = l.m20 * r.m02 + l.m21 * r.m12 +   l.m22 * r.m22;
-    l = tmp;
-    return l;
-}
-
-
-template<class F1, class F2>
-ILINE Matrix33_tpl<F1> operator+(const Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix33_tpl<F1> res;
-    res.m00 = l.m00 + r.m00;
-    res.m01 = l.m01 + r.m01;
-    res.m02 = l.m02 + r.m02;
-    res.m10 = l.m10 + r.m10;
-    res.m11 = l.m11 + r.m11;
-    res.m12 = l.m12 + r.m12;
-    res.m20 = l.m20 + r.m20;
-    res.m21 = l.m21 + r.m21;
-    res.m22 = l.m22 + r.m22;
-    return res;
-}
-template<class F1, class F2>
-ILINE Matrix33_tpl<F1>& operator+=(Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    l.m00 += r.m00;
-    l.m01 += r.m01;
-    l.m02 += r.m02;
-    l.m10 += r.m10;
-    l.m11 += r.m11;
-    l.m12 += r.m12;
-    l.m20 += r.m20;
-    l.m21 += r.m21;
-    l.m22 += r.m22;
-    return l;
-}
-
-
-
-
-template<class F1, class F2>
-ILINE Matrix33_tpl<F1> operator - (const Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix33_tpl<F1> res;
-    res.m00 = l.m00 - r.m00;
-    res.m01 = l.m01 - r.m01;
-    res.m02 = l.m02 - r.m02;
-    res.m10 = l.m10 - r.m10;
-    res.m11 = l.m11 - r.m11;
-    res.m12 = l.m12 - r.m12;
-    res.m20 = l.m20 - r.m20;
-    res.m21 = l.m21 - r.m21;
-    res.m22 = l.m22 - r.m22;
-    return res;
-}
-template<class F1, class F2>
-ILINE Matrix33_tpl<F1>& operator-=(Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    l.m00 -= r.m00;
-    l.m01 -= r.m01;
-    l.m02 -= r.m02;
-    l.m10 -= r.m10;
-    l.m11 -= r.m11;
-    l.m12 -= r.m12;
-    l.m20 -= r.m20;
-    l.m21 -= r.m21;
-    l.m22 -= r.m22;
-    return l;
-}
-
-
-
-
-template<class F>
-ILINE Matrix33_tpl<F> operator*(const Matrix33_tpl<F>& m, F op)
-{
-    assert(m.IsValid());
-    Matrix33_tpl<F> res;
-    res.m00 = m.m00 * op;
-    res.m01 = m.m01 * op;
-    res.m02 = m.m02 * op;
-    res.m10 = m.m10 * op;
-    res.m11 = m.m11 * op;
-    res.m12 = m.m12 * op;
-    res.m20 = m.m20 * op;
-    res.m21 = m.m21 * op;
-    res.m22 = m.m22 * op;
-    return res;
-}
-template<class F>
-ILINE Matrix33_tpl<F> operator/(const Matrix33_tpl<F>& src, F op) { return src * ((F)1.0 / op); }
-
-//post-multiply
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator*(const Matrix33_tpl<F2>& m, const Vec3_tpl<F1>& p)
-{
-    assert(m.IsValid());
-    assert(p.IsValid());
-    Vec3_tpl<F1> tp;
-    tp.x    =   F1(m.m00 * p.x + m.m01 * p.y + m.m02 * p.z);
-    tp.y    =   F1(m.m10 * p.x + m.m11 * p.y + m.m12 * p.z);
-    tp.z    =   F1(m.m20 * p.x + m.m21 * p.y + m.m22 * p.z);
-    return tp;
-}
-
-//pre-multiply
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator*(const Vec3_tpl<F1>& p, const Matrix33_tpl<F2>& m)
-{
-    assert(m.IsValid());
-    assert(p.IsValid());
-    Vec3_tpl<F1> tp;
-    tp.x    =   F1(p.x * m.m00 + p.y * m.m10 + p.z * m.m20);
-    tp.y    =   F1(p.x * m.m01 + p.y * m.m11 + p.z * m.m21);
-    tp.z    =   F1(p.x * m.m02 + p.y * m.m12 + p.z * m.m22);
-    return tp;
-}
-
-//post-multiply
-template<class F1, class F2>
-ILINE Vec2_tpl<F1> operator*(const Matrix33_tpl<F2>& m, const Vec2_tpl<F1>& v)
-{
-    assert(m.IsValid());
-    assert(v.IsValid());
-    return Vec2_tpl<F1>(v.x * m.m00 + v.y * m.m01,    v.x * m.m10 + v.y * m.m11);
-}
-
-//pre-multiply
-template<class F1, class F2>
-ILINE Vec2_tpl<F1> operator*(const Vec2_tpl<F1>& v, const Matrix33_tpl<F2>& m)
-{
-    assert(m.IsValid());
-    assert(v.IsValid());
-    return Vec2_tpl<F1>(v.x * m.m00 + v.y * m.m10, v.x * m.m01 + v.y * m.m11);
-}
-
-template<class F1>
-ILINE Matrix33_tpl<F1>& crossproduct_matrix(const Vec3_tpl<F1>& v, Matrix33_tpl<F1>& m)
-{
-    m.m00 = 0;
-    m.m01 = -v.z;
-    m.m02 = v.y;
-    m.m10 = v.z;
-    m.m11 = 0;
-    m.m12 = -v.x;
-    m.m20 = -v.y;
-    m.m21 = v.x;
-    m.m22 = 0;
-    return m;
-}
-
-template<class F1>
-ILINE Matrix33_tpl<F1>& dotproduct_matrix(const Vec3_tpl<F1>& v, const Vec3_tpl<F1>& op, Matrix33_tpl<F1>& m)
-{
-    m.m00 = v.x * op.x;
-    m.m10 = v.y * op.x;
-    m.m20 = v.z * op.x;
-    m.m01 = v.x * op.y;
-    m.m11 = v.y * op.y;
-    m.m21 = v.z * op.y;
-    m.m02 = v.x * op.z;
-    m.m12 = v.y * op.z;
-    m.m22 = v.z * op.z;
-    return m;
-}
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_MATRIX33_H
-
diff --git a/Code/CryEngine/CryCommon/Cry_Matrix34.h b/Code/CryEngine/CryCommon/Cry_Matrix34.h
deleted file mode 100644
index 9f5deeaf17..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Matrix34.h
+++ /dev/null
@@ -1,1462 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common matrix class
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_MATRIX34_H
-#define CRYINCLUDE_CRYCOMMON_CRY_MATRIX34_H
-#pragma once
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Matrix34_tpl
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-template <typename F>
-struct Matrix34_tpl
-{
-    F m00, m01, m02, m03;
-    F m10, m11, m12, m13;
-    F m20, m21, m22, m23;
-
-    //default constructor
-#if defined(_DEBUG)
-    ILINE Matrix34_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = (uint32*)&m00;
-            p[ 0] = F32NAN;
-            p[ 1] = F32NAN;
-            p[ 2] = F32NAN;
-            p[ 3] = F32NAN;
-            p[ 4] = F32NAN;
-            p[ 5] = F32NAN;
-            p[ 6] = F32NAN;
-            p[ 7] = F32NAN;
-            p[ 8] = F32NAN;
-            p[ 9] = F32NAN;
-            p[10] = F32NAN;
-            p[11] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = (uint64*)&m00;
-            p[ 0] = F64NAN;
-            p[ 1] = F64NAN;
-            p[ 2] = F64NAN;
-            p[ 3] = F64NAN;
-            p[ 4] = F64NAN;
-            p[ 5] = F64NAN;
-            p[ 6] = F64NAN;
-            p[ 7] = F64NAN;
-            p[ 8] = F64NAN;
-            p[ 9] = F64NAN;
-            p[10] = F64NAN;
-            p[11] = F64NAN;
-        }
-    }
-#else
-    ILINE Matrix34_tpl(){};
-#endif
-
-    //set matrix to Identity
-    ILINE Matrix34_tpl(type_identity)
-    {
-        m00 = 1;
-        m01 = 0;
-        m02 = 0;
-        m03 = 0;
-        m10 = 0;
-        m11 = 1;
-        m12 = 0;
-        m13 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = 1;
-        m23 = 0;
-    }
-
-    //set matrix to Zero
-    ILINE Matrix34_tpl(type_zero)
-    {
-        m00 = 0;
-        m01 = 0;
-        m02 = 0;
-        m03 = 0;
-        m10 = 0;
-        m11 = 0;
-        m12 = 0;
-        m13 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = 0;
-        m23 = 0;
-    }
-
-    //ASSIGNMENT OPERATOR of identical Matrix33 types.
-    //The assignment operator has precedence over assignment constructor
-    //Matrix34 m; m=m34;
-    ILINE Matrix34_tpl<F>& operator = (const Matrix34_tpl<F>& m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = m.m03;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = m.m13;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = m.m23;
-        return *this;
-    }
-
-
-
-
-    //--------------------------------------------------------------------
-    //----   implementation of the constructors                        ---
-    //--------------------------------------------------------------------
-
-
-    //CONSTRUCTOR for identical float-types. It initialises a matrix34 with 12 floats.
-    ILINE Matrix34_tpl<F>(F v00, F v01, F v02, F v03, F v10, F v11, F v12, F v13, F v20, F v21, F v22, F v23)
-    {
-        m00 = v00;
-        m01 = v01;
-        m02 = v02;
-        m03 = v03;
-        m10 = v10;
-        m11 = v11;
-        m12 = v12;
-        m13 = v13;
-        m20 = v20;
-        m21 = v21;
-        m22 = v22;
-        m23 = v23;
-    }
-    //CONSTRUCTOR for different float-types. It initialises a matrix34 with 12 floats.
-    template<class F1>
-    ILINE Matrix34_tpl<F>(F1 v00, F1 v01, F1 v02, F1 v03, F1 v10, F1 v11, F1 v12, F1 v13, F1 v20, F1 v21, F1 v22, F1 v23)
-    {
-        m00 = F(v00);
-        m01 = F(v01);
-        m02 = F(v02);
-        m03 = F(v03);
-        m10 = F(v10);
-        m11 = F(v11);
-        m12 = F(v12);
-        m13 = F(v13);
-        m20 = F(v20);
-        m21 = F(v21);
-        m22 = F(v22);
-        m23 = F(v23);
-    }
-
-
-    //CONSTRUCTOR for identical float-types. It converts a Matrix33 into a Matrix34.
-    //Matrix34(m33);
-    ILINE Matrix34_tpl<F>(const Matrix33_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = 0;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = 0;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = 0;
-    }
-    //CONSTRUCTOR for different float-types. It converts a Matrix33 into a Matrix34 and also converts between double/float.
-    //Matrix34(Matrix33);
-    template<class F1>
-    ILINE Matrix34_tpl<F>(const Matrix33_tpl<F1>&m)
-    {
-        assert(m.IsValid());
-        m00 = F(m.m00);
-        m01 = F(m.m01);
-        m02 = F(m.m02);
-        m03 = 0;
-        m10 = F(m.m10);
-        m11 = F(m.m11);
-        m12 = F(m.m12);
-        m13 = 0;
-        m20 = F(m.m20);
-        m21 = F(m.m21);
-        m22 = F(m.m22);
-        m23 = 0;
-    }
-
-
-    //CONSTRUCTOR for identical float-types. It converts a Matrix33 with a translation-vector into a Matrix34.
-    //Matrix34(m33,Vec3(1,2,3));
-    ILINE Matrix34_tpl<F>(const Matrix33_tpl<F>&m, const Vec3_tpl<F>&t)
-    {
-        assert(m.IsValid());
-        assert(t.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = t.x;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = t.y;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = t.z;
-    }
-    //CONSTRUCTOR for different float-types. It converts a Matrix33 with a translation-vector into a Matrix34 and also converts between double/float.
-    //Matrix34(Matrix33r,Vec3d(1,2,3));
-    template<class F1>
-    ILINE Matrix34_tpl<F>(const Matrix33_tpl<F1>&m, const Vec3_tpl<F1>&t)
-    {
-        assert(m.IsValid());
-        assert(t.IsValid());
-        m00 = F(m.m00);
-        m01 = F(m.m01);
-        m02 = F(m.m02);
-        m03 = F(t.x);
-        m10 = F(m.m10);
-        m11 = F(m.m11);
-        m12 = F(m.m12);
-        m13 = F(t.y);
-        m20 = F(m.m20);
-        m21 = F(m.m21);
-        m22 = F(m.m22);
-        m23 = F(t.z);
-    }
-
-
-
-    //CONSTRUCTOR for identical float types
-    //Matrix34 m=m34;
-    ILINE Matrix34_tpl<F>(const Matrix34_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = m.m03;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = m.m13;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = m.m23;
-    }
-    //CONSTRUCTOR for different float-types.
-    //Matrix34 m=m34d;
-    template<class F1>
-    ILINE Matrix34_tpl<F>(const Matrix34_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);
-    }
-
-
-    //CONSTRUCTOR for identical float-types. It converts a Matrix44 into a Matrix34.
-    //Needs to be 'explicit' because we loose the translation vector in the conversion process
-    //Matrix34(m44);
-    ILINE explicit Matrix34_tpl<F>(const Matrix44_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = m.m03;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = m.m13;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = m.m23;
-    }
-    //CONSTRUCTOR for different float types. It converts a Matrix44 into a Matrix34 and converts between double/float.
-    //Needs to be 'explicit' because we loose the translation vector in the conversion process
-    //Matrix34(m44r);
-    template<class F1>
-    ILINE explicit Matrix34_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);
-    }
-
-    //CONSTRUCTOR for identical float-types. It converts a Quat into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    explicit ILINE Matrix34_tpl<F>(const Quat_tpl<F>&q)
-    {
-        *this = Matrix33_tpl<F>(q);
-    }
-    //CONSTRUCTOR for different float-types. It converts a Quat into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatTd);
-    template<class F1>
-    explicit ILINE Matrix34_tpl<F>(const Quat_tpl<F1>&q)
-    {
-        *this = Matrix33_tpl<F>(q);
-    }
-
-
-
-    //CONSTRUCTOR for identical float-types. It converts a QuatT into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    explicit ILINE Matrix34_tpl<F>(const QuatT_tpl<F> &q)
-    {
-        *this = Matrix34_tpl<F>(Matrix33_tpl<F>(q.q), q.t);
-    }
-    //CONSTRUCTOR for different float-types. It converts a QuatT into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    template<class F1>
-    ILINE explicit Matrix34_tpl(const QuatT_tpl<F1> q)
-    {
-        *this = Matrix34_tpl<F>(Matrix33_tpl<F1>(q.q), q.t);
-    }
-
-
-
-
-    //CONSTRUCTOR for identical float-types. It converts a QuatTS into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    explicit ILINE Matrix34_tpl<F>(const QuatTS_tpl<F> &q)
-    {
-        assert(q.q.IsValid());
-        Vec3_tpl<F> v2 = q.q.v + q.q.v;
-        F xx = 1 - v2.x * q.q.v.x;
-        F yy = v2.y * q.q.v.y;
-        F xw = v2.x * q.q.w;
-        F xy = v2.y * q.q.v.x;
-        F yz = v2.z * q.q.v.y;
-        F yw = v2.y * q.q.w;
-        F xz = v2.z * q.q.v.x;
-        F zz = v2.z * q.q.v.z;
-        F zw = v2.z * q.q.w;
-        m00 = (1 - yy - zz) * q.s;
-        m01 = (xy - zw) * q.s;
-        m02 = (xz + yw) * q.s;
-        m03 = q.t.x;
-        m10 = (xy + zw) * q.s;
-        m11 = (xx - zz) * q.s;
-        m12 = (yz - xw) * q.s;
-        m13 = q.t.y;
-        m20 = (xz - yw) * q.s;
-        m21 = (yz + xw) * q.s;
-        m22 = (xx - yy) * q.s;
-        m23 = q.t.z;
-    }
-    //CONSTRUCTOR for different float-types. It converts a QuatTS into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    template<class F1>
-    ILINE explicit Matrix34_tpl<F>(const QuatTS_tpl<F1> &q)
-    {
-        assert(q.q.IsValid());
-        Vec3_tpl<F1> v2 = q.q.v + q.q.v;
-        F1 xx = 1 - v2.x * q.q.v.x;
-        F1 yy = v2.y * q.q.v.y;
-        F1 xw = v2.x * q.q.w;
-        F1 xy = v2.y * q.q.v.x;
-        F1 yz = v2.z * q.q.v.y;
-        F1 yw = v2.y * q.q.w;
-        F1 xz = v2.z * q.q.v.x;
-        F1 zz = v2.z * q.q.v.z;
-        F1 zw = v2.z * q.q.w;
-        m00 = F((1 - yy - zz) * q.s);
-        m01 = F((xy - zw) * q.s);
-        m02 = F((xz + yw) * q.s);
-        m03 = F(q.t.x);
-        m10 = F((xy + zw) * q.s);
-        m11 = F((xx - zz) * q.s);
-        m12 = F((yz - xw) * q.s);
-        m13 = F(q.t.y);
-        m20 = F((xz - yw) * q.s);
-        m21 = F((yz + xw) * q.s);
-        m22 = F((xx - yy) * q.s);
-        m23 = F(q.t.z);
-    }
-
-
-
-
-    //CONSTRUCTOR for identical float-types. It converts a QuatTNS into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    explicit ILINE Matrix34_tpl<F>(const QuatTNS_tpl<F> &q)
-    {
-        assert(q.q.IsValid());
-        Vec3_tpl<F> v2 = q.q.v + q.q.v;
-        F xx = 1 - v2.x * q.q.v.x;
-        F yy = v2.y * q.q.v.y;
-        F xw = v2.x * q.q.w;
-        F xy = v2.y * q.q.v.x;
-        F yz = v2.z * q.q.v.y;
-        F yw = v2.y * q.q.w;
-        F xz = v2.z * q.q.v.x;
-        F zz = v2.z * q.q.v.z;
-        F zw = v2.z * q.q.w;
-        m00 = (1 - yy - zz) * q.s.x;
-        m01 = (xy - zw) * q.s.y;
-        m02 = (xz + yw) * q.s.z;
-        m03 = q.t.x;
-        m10 = (xy + zw) * q.s.x;
-        m11 = (xx - zz) * q.s.y;
-        m12 = (yz - xw) * q.s.z;
-        m13 = q.t.y;
-        m20 = (xz - yw) * q.s.x;
-        m21 = (yz + xw) * q.s.y;
-        m22 = (xx - yy) * q.s.z;
-        m23 = q.t.z;
-    }
-    //CONSTRUCTOR for different float-types. It converts a QuatTNS into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    template<class F1>
-    ILINE explicit Matrix34_tpl<F>(const QuatTNS_tpl<F1> &q)
-    {
-        assert(q.q.IsValid());
-        Vec3_tpl<F1> v2 = q.q.v + q.q.v;
-        F1 xx = 1 - v2.x * q.q.v.x;
-        F1 yy = v2.y * q.q.v.y;
-        F1 xw = v2.x * q.q.w;
-        F1 xy = v2.y * q.q.v.x;
-        F1 yz = v2.z * q.q.v.y;
-        F1 yw = v2.y * q.q.w;
-        F1 xz = v2.z * q.q.v.x;
-        F1 zz = v2.z * q.q.v.z;
-        F1 zw = v2.z * q.q.w;
-        m00 = F((1 - yy - zz) * q.s.x);
-        m01 = F((xy - zw) * q.s.y);
-        m02 = F((xz + yw) * q.s.z);
-        m03 = F(q.t.x);
-        m10 = F((xy + zw) * q.s.x);
-        m11 = F((xx - zz) * q.s.y);
-        m12 = F((yz - xw) * q.s.z);
-        m13 = F(q.t.y);
-        m20 = F((xz - yw) * q.s.x);
-        m21 = F((yz + xw) * q.s.y);
-        m22 = F((xx - yy) * q.s.z);
-        m23 = F(q.t.z);
-    }
-
-
-
-
-    //CONSTRUCTOR for identical float-types. It converts a DualQuat into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    ILINE explicit Matrix34_tpl<F>(const DualQuat_tpl<F> &q)
-    {
-        assert((fabs_tpl(1 - (q.nq | q.nq))) < 0.01); //check if unit-quaternion
-        Vec3_tpl<F>  t = (q.nq.w * q.dq.v - q.dq.w * q.nq.v + q.nq.v % q.dq.v); //perfect for HLSL
-        Vec3_tpl<F> v2 = q.nq.v + q.nq.v;
-        F xx = 1 - v2.x * q.nq.v.x;
-        F yy = v2.y * q.nq.v.y;
-        F xw = v2.x * q.nq.w;
-        F xy = v2.y * q.nq.v.x;
-        F yz = v2.z * q.nq.v.y;
-        F yw = v2.y * q.nq.w;
-        F xz = v2.z * q.nq.v.x;
-        F zz = v2.z * q.nq.v.z;
-        F zw = v2.z * q.nq.w;
-        m00 = 1 - yy - zz;
-        m01 = xy - zw;
-        m02 = xz + yw;
-        m03 = t.x + t.x;
-        m10 = xy + zw;
-        m11 = xx - zz;
-        m12 = yz - xw;
-        m13 = t.y + t.y;
-        m20 = xz - yw;
-        m21 = yz + xw;
-        m22 = xx - yy;
-        m23 = t.z + t.z;
-    }
-    //CONSTRUCTOR for different float-types. It converts a DualQuat into a Matrix34.
-    //Needs to be 'explicit' because we loose float-precision in the conversion process
-    //Matrix34(QuatT);
-    template<class F1>
-    ILINE explicit Matrix34_tpl<F>(const DualQuat_tpl<F1> &q)
-    {
-        assert((fabs_tpl(1 - (q.nq | q.nq))) < 0.01); //check if unit-quaternion
-        Vec3_tpl<F1>  t = (q.nq.w * q.dq.v - q.dq.w * q.nq.v + q.nq.v % q.dq.v); //perfect for HLSL
-        Vec3_tpl<F1> v2 = q.nq.v + q.nq.v;
-        F1 xx = 1 - v2.x * q.nq.v.x;
-        F1 yy = v2.y * q.nq.v.y;
-        F1 xw = v2.x * q.nq.w;
-        F1 xy = v2.y * q.nq.v.x;
-        F1 yz = v2.z * q.nq.v.y;
-        F1 yw = v2.y * q.nq.w;
-        F1 xz = v2.z * q.nq.v.x;
-        F1 zz = v2.z * q.nq.v.z;
-        F1 zw = v2.z * q.nq.w;
-        m00 = F(1 - yy - zz);
-        m01 = F(xy - zw);
-        m02 = F(xz + yw);
-        m03 = F(t.x + t.x);
-        m10 = F(xy + zw);
-        m11 = F(xx - zz);
-        m12 = F(yz - xw);
-        m13 = F(t.y + t.y);
-        m20 = F(xz - yw);
-        m21 = F(yz + xw);
-        m22 = F(xx - yy);
-        m23 = F(t.z + t.z);
-    }
-
-
-
-
-
-
-    //apply scaling to the columns of the matrix.
-    ILINE void ScaleColumn(const Vec3_tpl<F>& s)
-    {
-        m00 *= s.x;
-        m01 *= s.y;
-        m02 *= s.z;
-        m10 *= s.x;
-        m11 *= s.y;
-        m12 *= s.z;
-        m20 *= s.x;
-        m21 *= s.y;
-        m22 *= s.z;
-    }
-
-    /*!
-    *
-    *  Initializes the Matrix34 with the identity.
-    *
-    */
-    void SetIdentity(void)
-    {
-        m00 = 1.0f;
-        m01 = 0.0f;
-        m02 = 0.0f;
-        m03 = 0.0f;
-        m10 = 0.0f;
-        m11 = 1.0f;
-        m12 = 0.0f;
-        m13 = 0.0f;
-        m20 = 0.0f;
-        m21 = 0.0f;
-        m22 = 1.0f;
-        m23 = 0.0f;
-    }
-
-    ILINE static Matrix34_tpl<F> CreateIdentity(void)
-    {
-        Matrix34_tpl<F> m;
-        m.SetIdentity();
-        return m;
-    }
-
-    ILINE bool IsIdentity() const
-    {
-        return 0 == (fabs_tpl((F)1 - m00) + fabs_tpl(m01) + fabs_tpl(m02) + fabs_tpl(m03) + fabs_tpl(m10) + fabs_tpl((F)1 - m11) + fabs_tpl(m12) + fabs_tpl(m13) + fabs_tpl(m20) + fabs_tpl(m21) + fabs_tpl((F)1 - m22)) + fabs_tpl(m23);
-    }
-
-    ILINE int IsZero() const
-    {
-        return 0 == (fabs_tpl(m00) + fabs_tpl(m01) + fabs_tpl(m02) + fabs_tpl(m03) + fabs_tpl(m10) + fabs_tpl(m11) + fabs_tpl(m12) + fabs_tpl(m13) + fabs_tpl(m20) + fabs_tpl(m21) + fabs_tpl(m22)) + fabs_tpl(m23);
-    }
-
-    /*!
-    *  Create a rotation matrix around an arbitrary axis (Eulers Theorem).
-    *  The axis is specified as an normalized Vec3. The angle is assumed to be in radians.
-    *  This function also assumes a translation-vector and stores it in the right column.
-    *
-    *  Example:
-    *       Matrix34 m34;
-    *       Vec3 axis=GetNormalized( Vec3(-1.0f,-0.3f,0.0f) );
-    *       m34.SetRotationAA( 3.14314f, axis, Vec3(5,5,5) );
-    */
-    ILINE void SetRotationAA(const F rad, const Vec3_tpl<F>& axis, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        *this = Matrix33_tpl<F>::CreateRotationAA(rad, axis);
-        this->SetTranslation(t);
-    }
-    ILINE static Matrix34_tpl<F> CreateRotationAA(const F rad, const Vec3_tpl<F>& axis, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Matrix34_tpl<F> m34;
-        m34.SetRotationAA(rad, axis, t);
-        return m34;
-    }
-
-    ILINE void SetRotationAA(const Vec3_tpl<F>& rot, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        *this = Matrix33_tpl<F>::CreateRotationAA(rot);
-        this->SetTranslation(t);
-    }
-    ILINE static Matrix34_tpl<F> CreateRotationAA(const Vec3_tpl<F>& rot, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Matrix34_tpl<F> m34;
-        m34.SetRotationAA(rot, t);
-        return m34;
-    }
-
-
-    /*!
-    * Create rotation-matrix about X axis using an angle.
-    * The angle is assumed to be in radians.
-    * The translation-vector is set to zero.
-    *
-    *  Example:
-    *       Matrix34 m34;
-    *       m34.SetRotationX(0.5f);
-    */
-    ILINE void SetRotationX(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        *this = Matrix33_tpl<F>::CreateRotationX(rad);
-        this->SetTranslation(t);
-    }
-    ILINE static Matrix34_tpl<F> CreateRotationX(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Matrix34_tpl<F> m34;
-        m34.SetRotationX(rad, t);
-        return m34;
-    }
-
-    /*!
-    * Create rotation-matrix about Y axis using an angle.
-    * The angle is assumed to be in radians.
-    * The translation-vector is set to zero.
-    *
-    *  Example:
-    *       Matrix34 m34;
-    *       m34.SetRotationY(0.5f);
-    */
-    ILINE void SetRotationY(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        *this = Matrix33_tpl<F>::CreateRotationY(rad);
-        this->SetTranslation(t);
-    }
-    ILINE static Matrix34_tpl<F> CreateRotationY(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Matrix34_tpl<F> m34;
-        m34.SetRotationY(rad, t);
-        return m34;
-    }
-
-    /*!
-    * Create rotation-matrix about Z axis using an angle.
-    * The angle is assumed to be in radians.
-    * The translation-vector is set to zero.
-    *
-    *  Example:
-    *       Matrix34 m34;
-    *       m34.SetRotationZ(0.5f);
-    */
-    ILINE void SetRotationZ(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        *this = Matrix33_tpl<F>::CreateRotationZ(rad);
-        this->SetTranslation(t);
-    }
-    ILINE static Matrix34_tpl<F> CreateRotationZ(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Matrix34_tpl<F> m34;
-        m34.SetRotationZ(rad, t);
-        return m34;
-    }
-
-
-    /*!
-    *
-    * Convert three Euler angle to mat33 (rotation order:XYZ)
-    * The Euler angles are assumed to be in radians.
-    * The translation-vector is set to zero.
-    *
-    *  Example 1:
-    *       Matrix34 m34;
-    *       m34.SetRotationXYZ( Ang3(0.5f,0.2f,0.9f), translation );
-    *
-    *  Example 2:
-    *       Matrix34 m34=Matrix34::CreateRotationXYZ( Ang3(0.5f,0.2f,0.9f), translation );
-    */
-    ILINE void SetRotationXYZ(const Ang3_tpl<F>& rad, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        assert(rad.IsValid());
-        assert(t.IsValid());
-        *this = Matrix33_tpl<F>::CreateRotationXYZ(rad);
-        this->SetTranslation(t);
-    }
-    ILINE static Matrix34_tpl<F> CreateRotationXYZ(const Ang3_tpl<F>& rad, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        assert(rad.IsValid());
-        assert(t.IsValid());
-        Matrix34_tpl<F> m34;
-        m34.SetRotationXYZ(rad, t);
-        return m34;
-    }
-
-
-    ILINE void SetRotationAA(F c, F s, Vec3_tpl<F> axis, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        assert(axis.IsValid());
-        assert(t.IsValid());
-        *this = Matrix33_tpl<F>::CreateRotationAA(c, s, axis);
-        m03 = t.x;
-        m13 = t.y;
-        m23 = t.z;
-    }
-    ILINE static Matrix34_tpl<F> CreateRotationAA(F c, F s, Vec3_tpl<F> axis, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Matrix34_tpl<F> m34;
-        m34.SetRotationAA(c, s, axis, t);
-        return m34;
-    }
-
-    ILINE void SetTranslationMat(const Vec3_tpl<F>& v)
-    {
-        m00 = 1.0f;
-        m01 = 0.0f;
-        m02 = 0.0f;
-        m03 = v.x;
-        m10 = 0.0f;
-        m11 = 1.0f;
-        m12 = 0.0f;
-        m13 = v.y;
-        m20 = 0.0f;
-        m21 = 0.0f;
-        m22 = 1.0f;
-        m23 = v.z;
-    }
-    ILINE static Matrix34_tpl<F> CreateTranslationMat(const Vec3_tpl<F>& v)
-    {
-        Matrix34_tpl<F> m34;
-        m34.SetTranslationMat(v);
-        return m34;
-    }
-
-
-    //NOTE: all vectors are stored in columns
-    ILINE void SetFromVectors(const Vec3& vx, const Vec3& vy, const Vec3& vz, const Vec3& pos)
-    {
-        m00 = vx.x;
-        m01 = vy.x;
-        m02 = vz.x;
-        m03 = pos.x;
-        m10 = vx.y;
-        m11 = vy.y;
-        m12 = vz.y;
-        m13 = pos.y;
-        m20 = vx.z;
-        m21 = vy.z;
-        m22 = vz.z;
-        m23 = pos.z;
-    }
-    ILINE static Matrix34_tpl<F> CreateFromVectors(const Vec3_tpl<F>& vx, const Vec3_tpl<F>& vy, const Vec3_tpl<F>& vz, const Vec3_tpl<F>& pos)
-    {
-        Matrix34_tpl<F> m;
-        m.SetFromVectors(vx, vy, vz, pos);
-        return m;
-    }
-
-    void InvertFast()
-    { // in-place transposition
-        assert(IsOrthonormal());
-        F t;
-        Vec3 v(m03, m13, m23);
-        t = m01;
-        m01 = m10;
-        m10 = t;
-        m03 = -v.x * m00 - v.y * m01 - v.z * m20;
-        t = m02;
-        m02 = m20;
-        m20 = t;
-        m13 = -v.x * m10 - v.y * m11 - v.z * m21;
-        t = m12;
-        m12 = m21;
-        m21 = t;
-        m23 = -v.x * m20 - v.y * m21 - v.z * m22;
-    }
-
-    Matrix34_tpl<F> GetInvertedFast() const
-    {
-        assert(IsOrthonormal());
-        Matrix34_tpl<F> dst;
-        dst.m00 = m00;
-        dst.m01 = m10;
-        dst.m02 = m20;
-        dst.m03 = -m03 * m00 - m13 * m10 - m23 * m20;
-        dst.m10 = m01;
-        dst.m11 = m11;
-        dst.m12 = m21;
-        dst.m13 = -m03 * m01 - m13 * m11 - m23 * m21;
-        dst.m20 = m02;
-        dst.m21 = m12;
-        dst.m22 = m22;
-        dst.m23 = -m03 * m02 - m13 * m12 - m23 * m22;
-        return dst;
-    }
-
-    //! transforms a vector. the translation is not beeing considered
-    ILINE Vec3_tpl<F> TransformVector(const Vec3_tpl<F>& v) const
-    {
-        assert(v.IsValid());
-        return Vec3_tpl<F>(m00 * v.x + m01 * v.y + m02 * v.z, m10 * v.x + m11 * v.y + m12 * v.z, m20 * v.x + m21 * v.y + m22 * v.z);
-    }
-    //! transforms a point and add translation vector
-    ILINE Vec3_tpl<F> TransformPoint(const Vec3_tpl<F>& p) const
-    {
-        assert(p.IsValid());
-        return Vec3_tpl<F>(m00 * p.x + m01 * p.y + m02 * p.z + m03, m10 * p.x + m11 * p.y + m12 * p.z + m13, m20 * p.x + m21 * p.y + m22 * p.z + m23);
-    }
-
-    //! Remove scale from matrix.
-    void OrthonormalizeFast()
-    {
-        Vec3_tpl<F> x(m00, m10, m20);
-        Vec3_tpl<F> y(m01, m11, m21);
-        Vec3_tpl<F> z;
-        x = x.GetNormalized();
-        z = (x % y).GetNormalized();
-        y = (z % x).GetNormalized();
-        m00 = x.x;
-        m10 = x.y;
-        m20 = x.z;
-        m01 = y.x;
-        m11 = y.y;
-        m21 = y.z;
-        m02 = z.x;
-        m12 = z.y;
-        m22 = z.z;
-    }
-
-
-    //determinant is ambiguous: only the upper-left-submatrix's determinant is calculated
-    ILINE f32 Determinant() const
-    {
-        return (m00 * m11 * m22) + (m01 * m12 * m20) + (m02 * m10 * m21) - (m02 * m11 * m20) - (m00 * m12 * m21) - (m01 * m10 * m22);
-    }
-
-
-    //--------------------------------------------------------------------------------
-    //----                  helper functions to access matrix-members     ------------
-    //--------------------------------------------------------------------------------
-
-    F* GetData() { return &m00; }
-    const F* GetData() const { return &m00; }
-
-    ILINE F operator () (uint32 i, uint32 j) const {    assert ((i < 3) && (j < 4));    F* p_data = (F*)(&m00);   return p_data[i * 4 + j];   }
-    ILINE F& operator () (uint32 i, uint32 j)   {   assert ((i < 3) && (j < 4));    F* p_data = (F*)(&m00);       return p_data[i * 4 + j];   }
-
-    ILINE void SetRow(int i, const Vec3_tpl<F>& v)  {   assert(i < 3);    F* p = (F*)(&m00);    p[0 + 4 * i] = v.x;   p[1 + 4 * i] = v.y;   p[2 + 4 * i] = v.z;       }
-
-    ILINE const Vec3_tpl<F>& GetRow(int i) const    {   assert(i < 3); return *(const Vec3_tpl<F>*)(&m00 + 4 * i);  }
-    ILINE const Vec4_tpl<F>& GetRow4(int i) const   {   assert(i < 3); return *(const Vec4_tpl<F>*)(&m00 + 4 * i);  }
-
-    ILINE void SetColumn(int i, const Vec3_tpl<F>& v)   {   assert(i < 4);    F* p = (F*)(&m00);    p[i + 4 * 0] = v.x;   p[i + 4 * 1] = v.y;   p[i + 4 * 2] = v.z;       }
-    ILINE Vec3_tpl<F> GetColumn(int i) const    {   assert(i < 4);    F* p = (F*)(&m00);    return Vec3(p[i + 4 * 0], p[i + 4 * 1], p[i + 4 * 2]);    }
-    ILINE Vec3_tpl<F> GetColumn0() const    { return Vec3_tpl<F>(m00, m10, m20);  }
-    ILINE Vec3_tpl<F> GetColumn1() const    { return Vec3_tpl<F>(m01, m11, m21);  }
-    ILINE Vec3_tpl<F> GetColumn2() const    { return Vec3_tpl<F>(m02, m12, m22);  }
-    ILINE Vec3_tpl<F> GetColumn3() const    { return Vec3_tpl<F>(m03, m13, m23);  }
-
-
-    ILINE void SetTranslation(const Vec3_tpl<F>& t) { m03 = t.x;    m13 = t.y; m23 = t.z;   }
-    ILINE Vec3_tpl<F> GetTranslation() const { return Vec3_tpl<F>(m03, m13, m23); }
-    ILINE void ScaleTranslation (F s)                       {   m03 *= s;     m13 *= s;     m23 *= s;     }
-    ILINE Matrix34_tpl<F> AddTranslation(const Vec3_tpl<F>& t)    {   m03 += t.x;   m13 += t.y;   m23 += t.z;   return *this; }
-
-    ILINE void SetRotation33(const Matrix33_tpl<F>& m33)
-    {
-        m00 = m33.m00;
-        m01 = m33.m01;
-        m02 = m33.m02;
-        m10 = m33.m10;
-        m11 = m33.m11;
-        m12 = m33.m12;
-        m20 = m33.m20;
-        m21 = m33.m21;
-        m22 = m33.m22;
-    }
-
-    ILINE void GetRotation33(Matrix33_tpl<F>& m33) const
-    {
-        m33.m00 = m00;
-        m33.m01 = m01;
-        m33.m02 = m02;
-        m33.m10 = m10;
-        m33.m11 = m11;
-        m33.m12 = m12;
-        m33.m20 = m20;
-        m33.m21 = m21;
-        m33.m22 = m22;
-    }
-
-    //check if we have an orthonormal-base (general case, works even with reflection matrices)
-    int IsOrthonormal(F threshold = 0.001) const
-    {
-        f32 d0 = fabs_tpl(GetColumn0() | GetColumn1());
-        if  (d0 > threshold)
-        {
-            return 0;
-        }
-        f32 d1 = fabs_tpl(GetColumn0() | GetColumn2());
-        if  (d1 > threshold)
-        {
-            return 0;
-        }
-        f32 d2 = fabs_tpl(GetColumn1() | GetColumn2());
-        if  (d2 > threshold)
-        {
-            return 0;
-        }
-        int a = (fabs_tpl(1 - (GetColumn0() | GetColumn0()))) < threshold;
-        int b = (fabs_tpl(1 - (GetColumn1() | GetColumn1()))) < threshold;
-        int c = (fabs_tpl(1 - (GetColumn2() | GetColumn2()))) < threshold;
-        return a & b & c;
-    }
-
-    //check if we have an orthonormal-base (assuming we are using a right-handed coordinate system)
-    int IsOrthonormalRH(F threshold = 0.001) const
-    {
-        int a = Vec3_tpl<F>::IsEquivalent(GetColumn0(), GetColumn1() % GetColumn2(), threshold);
-        int b = Vec3_tpl<F>::IsEquivalent(GetColumn1(), GetColumn2() % GetColumn0(), threshold);
-        int c = Vec3_tpl<F>::IsEquivalent(GetColumn2(), GetColumn0() % GetColumn1(), threshold);
-        return a & b & c;
-    }
-    bool static IsEquivalent(const Matrix34_tpl<F>& m0, const Matrix34_tpl<F>& m1, F e = VEC_EPSILON)
-    {
-        return  (
-            (fabs_tpl(m0.m00 - m1.m00) <= e) && (fabs_tpl(m0.m01 - m1.m01) <= e) && (fabs_tpl(m0.m02 - m1.m02) <= e) && (fabs_tpl(m0.m03 - m1.m03) <= e) &&
-            (fabs_tpl(m0.m10 - m1.m10) <= e) && (fabs_tpl(m0.m11 - m1.m11) <= e) && (fabs_tpl(m0.m12 - m1.m12) <= e) && (fabs_tpl(m0.m13 - m1.m13) <= e) &&
-            (fabs_tpl(m0.m20 - m1.m20) <= e) && (fabs_tpl(m0.m21 - m1.m21) <= e) && (fabs_tpl(m0.m22 - m1.m22) <= e) && (fabs_tpl(m0.m23 - m1.m23) <= e)
-            );
-    }
-
-    bool IsValid() const
-    {
-        if (!NumberValid(m00))
-        {
-            return false;
-        }
-        if (!NumberValid(m01))
-        {
-            return false;
-        }
-        if (!NumberValid(m02))
-        {
-            return false;
-        }
-        if (!NumberValid(m03))
-        {
-            return false;
-        }
-        if (!NumberValid(m10))
-        {
-            return false;
-        }
-        if (!NumberValid(m11))
-        {
-            return false;
-        }
-        if (!NumberValid(m12))
-        {
-            return false;
-        }
-        if (!NumberValid(m13))
-        {
-            return false;
-        }
-        if (!NumberValid(m20))
-        {
-            return false;
-        }
-        if (!NumberValid(m21))
-        {
-            return false;
-        }
-        if (!NumberValid(m22))
-        {
-            return false;
-        }
-        if (!NumberValid(m23))
-        {
-            return false;
-        }
-        return true;
-    }
-
-
-    bool IsDegenerate(float epsilon = FLT_EPSILON) const
-    {
-        //check the basis vectors for 0 vector
-        return GetColumn0().len2() < epsilon
-               || GetColumn1().len2() < epsilon
-               || GetColumn2().len2() < epsilon;
-    }
-
-    /*!
-    * Create a matrix with SCALING, ROTATION and TRANSLATION (in this order).
-    *
-    *  Example 1:
-    *       Matrix m34;
-    *       m34.SetMatrix( Vec3(1,2,3), quat, Vec3(11,22,33)  );
-    */
-    ILINE void Set(const Vec3_tpl<F>& s, const Quat_tpl<F>& q, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        assert(s.IsValid());
-        assert(q.IsUnit(0.1f));
-        assert(t.IsValid());
-        F vxvx = q.v.x * q.v.x;
-        F vzvz = q.v.z * q.v.z;
-        F vyvy = q.v.y * q.v.y;
-        F vxvy = q.v.x * q.v.y;
-        F vxvz = q.v.x * q.v.z;
-        F vyvz = q.v.y * q.v.z;
-        F svx = q.w * q.v.x;
-        F svy = q.w * q.v.y;
-        F svz = q.w * q.v.z;
-        m00 = (1 - (vyvy + vzvz) * 2) * s.x;
-        m01 = (vxvy - svz) * 2 * s.y;
-        m02 = (vxvz + svy) * 2 * s.z;
-        m03 = t.x;
-        m10 = (vxvy + svz) * 2 * s.x;
-        m11 = (1 - (vxvx + vzvz) * 2) * s.y;
-        m12 = (vyvz - svx) * 2 * s.z;
-        m13 = t.y;
-        m20 = (vxvz - svy) * 2 * s.x;
-        m21 = (vyvz + svx) * 2 * s.y;
-        m22 = (1 - (vxvx + vyvy) * 2) * s.z;
-        m23 = t.z;
-    }
-    ILINE static Matrix34_tpl<F> Create(const Vec3_tpl<F>& s, const Quat_tpl<F>& q, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Matrix34_tpl<F> m34;
-        m34.Set(s, q, t);
-        return m34;
-    }
-    Matrix34_tpl(const Vec3_tpl<F>& s, const Quat_tpl<F>& q, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Set(s, q, t);
-    }
-
-
-    /*!
-    * Create scaling-matrix.
-    * The translation-vector is set to zero.
-    *
-    *  Example 1:
-    *       Matrix m34;
-    *       m34.SetScale( Vec3(0.5f, 1.0f, 2.0f) );
-    *  Example 2:
-    *       Matrix34 m34 = Matrix34::CreateScale( Vec3(0.5f, 1.0f, 2.0f) );
-    */
-    ILINE void SetScale(const Vec3_tpl<F>& s, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        *this = Matrix33::CreateScale(s);
-        this->SetTranslation(t);
-    }
-    ILINE static Matrix34_tpl<F> CreateScale(const Vec3_tpl<F>& s, const Vec3_tpl<F>& t = Vec3(ZERO))
-    {
-        Matrix34_tpl<F> m34;
-        m34.SetScale(s, t);
-        return m34;
-    }
-
-
-    ILINE Matrix44_tpl<F> GetTransposed() const
-    {
-        Matrix44_tpl<F> tmp;
-        tmp.m00 = m00;
-        tmp.m01 = m10;
-        tmp.m02 = m20;
-        tmp.m03 = 0;
-        tmp.m10 = m01;
-        tmp.m11 = m11;
-        tmp.m12 = m21;
-        tmp.m13 = 0;
-        tmp.m20 = m02;
-        tmp.m21 = m12;
-        tmp.m22 = m22;
-        tmp.m23 = 0;
-        tmp.m30 = m03;
-        tmp.m31 = m13;
-        tmp.m32 = m23;
-        tmp.m33 = 1;
-        return tmp;
-    }
-
-    /*!
-    * calculate a real inversion of a Matrix34
-    * an inverse-matrix is an UnDo-matrix for all kind of transformations
-    *
-    *  Example 1:
-    *       Matrix34 im34; im34.Invert();
-    *
-    *  Example 2:
-    *   Matrix34 im34 = m34.GetInverted();
-    */
-    void Invert(void)
-    {
-        //rescue members
-        Matrix34_tpl<F> m = *this;
-        // calculate 12 cofactors
-        m00 = m.m22 * m.m11 - m.m12 * m.m21;
-        m10 = m.m12 * m.m20 - m.m22 * m.m10;
-        m20 = m.m10 * m.m21 - m.m20 * m.m11;
-        m01 = m.m02 * m.m21 - m.m22 * m.m01;
-        m11 = m.m22 * m.m00 - m.m02 * m.m20;
-        m21 = m.m20 * m.m01 - m.m00 * m.m21;
-        m02 = m.m12 * m.m01 - m.m02 * m.m11;
-        m12 = m.m02 * m.m10 - m.m12 * m.m00;
-        m22 = m.m00 * m.m11 - m.m10 * m.m01;
-        m03 = (m.m22 * m.m13 * m.m01 + m.m02 * m.m23 * m.m11 + m.m12 * m.m03 * m.m21) - (m.m12 * m.m23 * m.m01 + m.m22 * m.m03 * m.m11 + m.m02 * m.m13 * m.m21);
-        m13 = (m.m12 * m.m23 * m.m00 + m.m22 * m.m03 * m.m10 + m.m02 * m.m13 * m.m20) - (m.m22 * m.m13 * m.m00 + m.m02 * m.m23 * m.m10 + m.m12 * m.m03 * m.m20);
-        m23 = (m.m20 * m.m11 * m.m03 + m.m00 * m.m21 * m.m13 + m.m10 * m.m01 * m.m23) - (m.m10 * m.m21 * m.m03 + m.m20 * m.m01 * m.m13 + m.m00 * m.m11 * m.m23);
-        // calculate determinant
-        F det = m.m00 * m00 + m.m10 * m01 + m.m20 * m02;
-        assert(fabs_tpl(det) > (F)0.00000001);
-        F rcpDet = 1.0f / det;
-        // calculate matrix inverse/
-        m00 *= rcpDet;
-        m01 *= rcpDet;
-        m02 *= rcpDet;
-        m03 *= rcpDet;
-        m10 *= rcpDet;
-        m11 *= rcpDet;
-        m12 *= rcpDet;
-        m13 *= rcpDet;
-        m20 *= rcpDet;
-        m21 *= rcpDet;
-        m22 *= rcpDet;
-        m23 *= rcpDet;
-    }
-    ILINE Matrix34_tpl<F> GetInverted() const
-    {
-        Matrix34_tpl<F> dst = *this;
-        dst.Invert();
-        return dst;
-    }
-
-    /*!
-    *  Name:             ReflectMat34
-    *  Description:      reflect a rotation matrix with respect to a plane.
-    *
-    *  Example:
-    *       Vec3 normal( 0.0f,-1.0f, 0.0f);
-    *       Vec3 pos(0,1000,0);
-    *       Matrix34 m34=CreateReflectionMat( pos, normal );
-    */
-    ILINE static Matrix34_tpl<F> CreateReflectionMat (const Vec3_tpl<F>& p, const Vec3_tpl<F>& n)
-    {
-        Matrix34_tpl<F> m;
-        F vxy   = -2.0f * n.x * n.y;
-        F vxz   = -2.0f * n.x * n.z;
-        F vyz   = -2.0f * n.y * n.z;
-        F pdotn = 2.0f * (p | n);
-        m.m00 = 1.0f - 2.0f * n.x * n.x;
-        m.m01 = vxy;
-        m.m02 = vxz;
-        m.m03 = pdotn * n.x;
-        m.m10 = vxy;
-        m.m11 = 1.0f - 2.0f * n.y * n.y;
-        m.m12 = vyz;
-        m.m13 = pdotn * n.y;
-        m.m20 = vxz;
-        m.m21 = vyz;
-        m.m22 = 1.0f - 2.0f * n.z * n.z;
-        m.m23 = pdotn * n.z;
-        return m;
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Typedefs                                                                  //
-///////////////////////////////////////////////////////////////////////////////
-
-typedef Matrix34_tpl<f32>  Matrix34; //always 32 bit
-typedef Matrix34_tpl<f64>  Matrix34d;//always 64 bit
-typedef Matrix34_tpl<real> Matrix34r;//variable float precision. depending on the target system it can be between 32, 64 or bit
-typedef _MS_ALIGN(16) Matrix34_tpl<f32> _ALIGN (16) Matrix34A;
-
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//-------------       implementation of Matrix34      ------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-
-//! multiply all matrix's values by f and return the matrix
-template<class F>
-ILINE Matrix34_tpl<F> operator * (const Matrix34_tpl<F>& m, const f32 f)
-{
-    assert(m.IsValid());
-    Matrix34_tpl<F> r;
-    r.m00 = m.m00 * f;
-    r.m01 = m.m01 * f;
-    r.m02 = m.m02 * f;
-    r.m03 = m.m03 * f;
-    r.m10 = m.m10 * f;
-    r.m11 = m.m11 * f;
-    r.m12 = m.m12 * f;
-    r.m13 = m.m13 * f;
-    r.m20 = m.m20 * f;
-    r.m21 = m.m21 * f;
-    r.m22 = m.m22 * f;
-    r.m23 = m.m23 * f;
-    return r;
-}
-
-/*!
-*  multiplication of Matrix34 by a (column) Vec3.
-*  This function transforms the given input Vec3
-*  into the coordinate system defined by this matrix.
-*
-*  Example:
-*   Matrix34 m34;
-*   Vec3 vector(44,55,66);
-*   Vec3 result = m34*vector;
-*/
-template<class F>
-ILINE Vec3_tpl<F> operator * (const Matrix34_tpl<F>& m, const Vec3_tpl<F>& p)
-{
-    assert(m.IsValid());
-    assert(p.IsValid());
-    Vec3_tpl<F> tp;
-    tp.x    =   m.m00 * p.x + m.m01 * p.y + m.m02 * p.z + m.m03;
-    tp.y    =   m.m10 * p.x + m.m11 * p.y + m.m12 * p.z + m.m13;
-    tp.z    =   m.m20 * p.x + m.m21 * p.y + m.m22 * p.z + m.m23;
-    return tp;
-}
-
-
-template<class F1, class F2>
-ILINE Matrix34_tpl<F1> operator*(const Matrix34_tpl<F1>& l, const Diag33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix34_tpl<F1> m;
-    m.m00 = l.m00 * r.x;
-    m.m01 = l.m01 * r.y;
-    m.m02 = l.m02 * r.z;
-    m.m03 = l.m03;
-    m.m10 = l.m10 * r.x;
-    m.m11 = l.m11 * r.y;
-    m.m12 = l.m12 * r.z;
-    m.m13 = l.m13;
-    m.m20 = l.m20 * r.x;
-    m.m21 = l.m21 * r.y;
-    m.m22 = l.m22 * r.z;
-    m.m23 = l.m23;
-    return m;
-}
-template<class F1, class F2>
-ILINE Matrix34_tpl<F1>& operator *= (Matrix34_tpl<F1>& l, const Diag33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    l.m00 *= r.x;
-    l.m01 *= r.y;
-    l.m02 *= r.z;
-    l.m10 *= r.x;
-    l.m11 *= r.y;
-    l.m12 *= r.z;
-    l.m20 *= r.x;
-    l.m21 *= r.y;
-    l.m22 *= r.z;
-    return l;
-}
-template<class F1, class F2>
-ILINE Matrix34_tpl<F1> operator + (const Matrix34_tpl<F1>& l, const Matrix34_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix34_tpl<F1> m;
-    m.m00 = l.m00 + r.m00;
-    m.m01 = l.m01 + r.m01;
-    m.m02 = l.m02 + r.m02;
-    m.m03 = l.m03 + r.m03;
-    m.m10 = l.m10 + r.m10;
-    m.m11 = l.m11 + r.m11;
-    m.m12 = l.m12 + r.m12;
-    m.m13 = l.m13 + r.m13;
-    m.m20 = l.m20 + r.m20;
-    m.m21 = l.m21 + r.m21;
-    m.m22 = l.m22 + r.m22;
-    m.m23 = l.m23 + r.m23;
-    return m;
-}
-template<class F1, class F2>
-ILINE Matrix34_tpl<F1>& operator += (Matrix34_tpl<F1>& l, const Matrix34_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    l.m00 += r.m00;
-    l.m01 += r.m01;
-    l.m02 += r.m02;
-    l.m03 += r.m03;
-    l.m10 += r.m10;
-    l.m11 += r.m11;
-    l.m12 += r.m12;
-    l.m13 += r.m13;
-    l.m20 += r.m20;
-    l.m21 += r.m21;
-    l.m22 += r.m22;
-    l.m23 += r.m23;
-    return l;
-}
-
-/*!
-*  Implements the multiplication operator: Matrix34=Matrix34*Matrix33
-*
-*  Matrix33 and Matrix44 are specified in collumn order for a right-handed coordinate-system.
-*  AxB = operation B followed by operation A.
-*  A multiplication takes 27 muls and 24 adds.
-*
-*  Example:
-*   Matrix34 m34=Matrix33::CreateRotationX(1.94192f);;
-*   Matrix33 m33=Matrix34::CreateRotationZ(3.14192f);
-*     Matrix34 result=m34*m33;
-*/
-template<class F>
-ILINE Matrix34_tpl<F> operator * (const Matrix34_tpl<F>& l, const Matrix33_tpl<F>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix34_tpl<F> m;
-    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
-    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
-    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
-    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
-    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
-    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
-    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
-    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
-    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
-    m.m03 = l.m03;
-    m.m13 = l.m13;
-    m.m23 = l.m23;
-    return m;
-}
-
-
-
-/*!
-*  Implements the multiplication operator: Matrix34=Matrix34*Matrix34
-*
-*  Matrix34 is specified in collumn order.
-*  AxB = rotation B followed by rotation A.
-*  This operation takes 36 mults and 27 adds.
-*
-*  Example:
-*   Matrix34 m34=Matrix34::CreateRotationX(1.94192f, Vec3(11,22,33));;
-*   Matrix34 m34=Matrix33::CreateRotationZ(3.14192f);
-*     Matrix34 result=m34*m34;
-*/
-template<class F>
-ILINE Matrix34_tpl<F> operator * (const Matrix34_tpl<F>& l, const Matrix34_tpl<F>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix34_tpl<F> m;
-    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
-    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
-    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
-    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
-    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
-    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
-    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
-    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
-    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
-    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23 + l.m03;
-    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23 + l.m13;
-    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23 + l.m23;
-    return m;
-}
-
-/*!
-*  Implements the multiplication operator: Matrix44=Matrix34*Matrix44
-*
-*  Matrix44 and Matrix34 are specified in collumn order.
-*    AxB = rotation B followed by rotation A.
-*  This operation takes 48 mults and 36 adds.
-*
-*  Example:
-*   Matrix34 m34=Matrix33::CreateRotationX(1.94192f);;
-*   Matrix44 m44=Matrix33::CreateRotationZ(3.14192f);
-*     Matrix44 result=m34*m44;
-*/
-template<class F>
-ILINE Matrix44_tpl<F> operator * (const Matrix34_tpl<F>& l, const Matrix44_tpl<F>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix44_tpl<F> m;
-    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20 + l.m03 * r.m30;
-    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20 + l.m13 * r.m30;
-    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20 + l.m23 * r.m30;
-    m.m30 = r.m30;
-    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21 + l.m03 * r.m31;
-    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21 + l.m13 * r.m31;
-    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21 + l.m23 * r.m31;
-    m.m31 = r.m31;
-    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22 + l.m03 * r.m32;
-    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22 + l.m13 * r.m32;
-    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22 + l.m23 * r.m32;
-    m.m32 = r.m32;
-    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23 + l.m03 * r.m33;
-    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23 + l.m13 * r.m33;
-    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23 + l.m23 * r.m33;
-    m.m33 = r.m33;
-    return m;
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_MATRIX34_H
-
diff --git a/Code/CryEngine/CryCommon/Cry_Matrix44.h b/Code/CryEngine/CryCommon/Cry_Matrix44.h
deleted file mode 100644
index ef996daaae..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Matrix44.h
+++ /dev/null
@@ -1,874 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common matrix class
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_MATRIX44_H
-#define CRYINCLUDE_CRYCOMMON_CRY_MATRIX44_H
-#pragma once
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Matrix44_tpl
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-template<typename F>
-struct Matrix44_tpl
-{
-    F m00, m01, m02, m03;
-    F m10, m11, m12, m13;
-    F m20, m21, m22, m23;
-    F m30, m31, m32, m33;
-
-    //---------------------------------------------------------------------------------
-
-#if defined(_DEBUG)
-    ILINE Matrix44_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = (uint32*)&m00;
-            p[ 0] = F32NAN;
-            p[ 1] = F32NAN;
-            p[ 2] = F32NAN;
-            p[ 3] = F32NAN;
-            p[ 4] = F32NAN;
-            p[ 5] = F32NAN;
-            p[ 6] = F32NAN;
-            p[ 7] = F32NAN;
-            p[ 8] = F32NAN;
-            p[ 9] = F32NAN;
-            p[10] = F32NAN;
-            p[11] = F32NAN;
-            p[12] = F32NAN;
-            p[13] = F32NAN;
-            p[14] = F32NAN;
-            p[15] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = (uint64*)&m00;
-            p[ 0] = F64NAN;
-            p[ 1] = F64NAN;
-            p[ 2] = F64NAN;
-            p[ 3] = F64NAN;
-            p[ 4] = F64NAN;
-            p[ 5] = F64NAN;
-            p[ 6] = F64NAN;
-            p[ 7] = F64NAN;
-            p[ 8] = F64NAN;
-            p[ 9] = F64NAN;
-            p[10] = F64NAN;
-            p[11] = F64NAN;
-            p[12] = F64NAN;
-            p[13] = F64NAN;
-            p[14] = F64NAN;
-            p[15] = F64NAN;
-        }
-    }
-#else
-    ILINE Matrix44_tpl(){};
-#endif
-
-    //initialize with zeros
-    ILINE Matrix44_tpl(type_zero)
-    {
-        m00 = 0;
-        m01 = 0;
-        m02 = 0;
-        m03 = 0;
-        m10 = 0;
-        m11 = 0;
-        m12 = 0;
-        m13 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = 0;
-        m23 = 0;
-        m30 = 0;
-        m31 = 0;
-        m32 = 0;
-        m33 = 0;
-    }
-
-
-    //ASSIGNMENT OPERATOR of identical Matrix44 types.
-    //The assignment operator has precedence over assignment constructor
-    //Matrix44 m; m=m44;
-    ILINE Matrix44_tpl<F>& operator = (const Matrix44_tpl<F>& m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = m.m03;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = m.m13;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = m.m23;
-        m30 = m.m30;
-        m31 = m.m31;
-        m32 = m.m32;
-        m33 = m.m33;
-        return *this;
-    }
-
-
-
-    //--------------------------------------------------------------------
-    //----   implementation of the constructors                        ---
-    //--------------------------------------------------------------------
-    ILINE Matrix44_tpl<F>(F v00, F v01, F v02, F v03,
-                          F v10, F v11, F v12, F v13,
-                          F v20, F v21, F v22, F v23,
-                          F v30, F v31, F v32, F v33)
-    {
-        m00 = v00;
-        m01 = v01;
-        m02 = v02;
-        m03 = v03;
-        m10 = v10;
-        m11 = v11;
-        m12 = v12;
-        m13 = v13;
-        m20 = v20;
-        m21 = v21;
-        m22 = v22;
-        m23 = v23;
-        m30 = v30;
-        m31 = v31;
-        m32 = v32;
-        m33 = v33;
-    }
-
-
-
-
-
-
-    //CONSTRUCTOR for different types. It converts a Matrix33 into a Matrix44.
-    //Matrix44(m33);
-    ILINE Matrix44_tpl<F>(const Matrix33_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = 0;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = 0;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = 0;
-        m30 = 0;
-        m31 = 0;
-        m32 = 0;
-        m33 = 1;
-    }
-    //CONSTRUCTOR for different types. It converts a Matrix33 into a Matrix44 and also converts between double/float.
-    //Matrix44(Matrix33);
-    template<class F1>
-    ILINE Matrix44_tpl<F>(const Matrix33_tpl<F1>&m)
-    {
-        assert(m.IsValid());
-        m00 = F(m.m00);
-        m01 = F(m.m01);
-        m02 = F(m.m02);
-        m03 = 0;
-        m10 = F(m.m10);
-        m11 = F(m.m11);
-        m12 = F(m.m12);
-        m13 = 0;
-        m20 = F(m.m20);
-        m21 = F(m.m21);
-        m22 = F(m.m22);
-        m23 = 0;
-        m30 = 0;
-        m31 = 0;
-        m32 = 0;
-        m33 = 1;
-    }
-
-
-    //CONSTRUCTOR for different types. It converts a Matrix34 into a Matrix44.
-    //Matrix44(m34);
-    ILINE Matrix44_tpl<F>(const Matrix34_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = m.m03;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = m.m13;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = m.m23;
-        m30 = 0;
-        m31 = 0;
-        m32 = 0;
-        m33 = 1;
-    }
-    //CONSTRUCTOR for different types. It converts a Matrix34 into a Matrix44 and also converts between double/float.
-    //Matrix44(Matrix34);
-    template<class F1>
-    ILINE Matrix44_tpl<F>(const Matrix34_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 = 0;
-        m31 = 0;
-        m32 = 0;
-        m33 = 1;
-    }
-
-
-    //CONSTRUCTOR for identical types
-    //Matrix44 m=m44;
-    ILINE Matrix44_tpl<F>(const Matrix44_tpl<F>&m)
-    {
-        assert(m.IsValid());
-        m00 = m.m00;
-        m01 = m.m01;
-        m02 = m.m02;
-        m03 = m.m03;
-        m10 = m.m10;
-        m11 = m.m11;
-        m12 = m.m12;
-        m13 = m.m13;
-        m20 = m.m20;
-        m21 = m.m21;
-        m22 = m.m22;
-        m23 = m.m23;
-        m30 = m.m30;
-        m31 = m.m31;
-        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);
-    }
-
-    //---------------------------------------------------------------------
-
-    //! multiply all m1 matrix's values by f and return the matrix
-    friend  ILINE Matrix44_tpl<F> operator * (const Matrix44_tpl<F>& m, const f32 f)
-    {
-        assert(m.IsValid());
-        Matrix44_tpl<F> r;
-        r.m00 = m.m00 * f;
-        r.m01 = m.m01 * f;
-        r.m02 = m.m02 * f;
-        r.m03 = m.m03 * f;
-        r.m10 = m.m10 * f;
-        r.m11 = m.m11 * f;
-        r.m12 = m.m12 * f;
-        r.m13 = m.m13 * f;
-        r.m20 = m.m20 * f;
-        r.m21 = m.m21 * f;
-        r.m22 = m.m22 * f;
-        r.m23 = m.m23 * f;
-        r.m30 = m.m30 * f;
-        r.m31 = m.m31 * f;
-        r.m32 = m.m32 * f;
-        r.m33 = m.m33 * f;
-        return r;
-    }
-
-    //! add all m matrix's values and return the matrix
-    friend    ILINE Matrix44_tpl<F> operator + (const Matrix44_tpl<F>& mm0, const Matrix44_tpl<F>& mm1)
-    {
-        assert(mm0.IsValid());
-        assert(mm1.IsValid());
-        Matrix44_tpl<F> r;
-        r.m00 = mm0.m00 + mm1.m00;
-        r.m01 = mm0.m01 + mm1.m01;
-        r.m02 = mm0.m02 + mm1.m02;
-        r.m03 = mm0.m03 + mm1.m03;
-        r.m10 = mm0.m10 + mm1.m10;
-        r.m11 = mm0.m11 + mm1.m11;
-        r.m12 = mm0.m12 + mm1.m12;
-        r.m13 = mm0.m13 + mm1.m13;
-        r.m20 = mm0.m20 + mm1.m20;
-        r.m21 = mm0.m21 + mm1.m21;
-        r.m22 = mm0.m22 + mm1.m22;
-        r.m23 = mm0.m23 + mm1.m23;
-        r.m30 = mm0.m30 + mm1.m30;
-        r.m31 = mm0.m31 + mm1.m31;
-        r.m32 = mm0.m32 + mm1.m32;
-        r.m33 = mm0.m33 + mm1.m33;
-        return r;
-    }
-
-    ILINE void SetIdentity()
-    {
-        m00 = 1;
-        m01 = 0;
-        m02 = 0;
-        m03 = 0;
-        m10 = 0;
-        m11 = 1;
-        m12 = 0;
-        m13 = 0;
-        m20 = 0;
-        m21 = 0;
-        m22 = 1;
-        m23 = 0;
-        m30 = 0;
-        m31 = 0;
-        m32 = 0;
-        m33 = 1;
-    }
-    ILINE Matrix44_tpl(type_identity) { SetIdentity(); }
-
-
-    ILINE void Transpose()
-    {
-        Matrix44_tpl<F> tmp = *this;
-        m00 = tmp.m00;
-        m01 = tmp.m10;
-        m02 = tmp.m20;
-        m03 = tmp.m30;
-        m10 = tmp.m01;
-        m11 = tmp.m11;
-        m12 = tmp.m21;
-        m13 = tmp.m31;
-        m20 = tmp.m02;
-        m21 = tmp.m12;
-        m22 = tmp.m22;
-        m23 = tmp.m32;
-        m30 = tmp.m03;
-        m31 = tmp.m13;
-        m32 = tmp.m23;
-        m33 = tmp.m33;
-    }
-    ILINE Matrix44_tpl<F> GetTransposed() const
-    {
-        Matrix44_tpl<F> tmp;
-        tmp.m00 = m00;
-        tmp.m01 = m10;
-        tmp.m02 = m20;
-        tmp.m03 = m30;
-        tmp.m10 = m01;
-        tmp.m11 = m11;
-        tmp.m12 = m21;
-        tmp.m13 = m31;
-        tmp.m20 = m02;
-        tmp.m21 = m12;
-        tmp.m22 = m22;
-        tmp.m23 = m32;
-        tmp.m30 = m03;
-        tmp.m31 = m13;
-        tmp.m32 = m23;
-        tmp.m33 = m33;
-        return tmp;
-    }
-
-    /*!
-    *
-    * Calculate a real inversion of a Matrix44.
-    *
-    * Uses Cramer's Rule which is faster (branchless) but numerically more unstable
-    * than other methods like Gaussian Elimination.
-    *
-    *  Example 1:
-    *       Matrix44 im44; im44.Invert();
-    *
-    *  Example 2:
-    *   Matrix44 im44 = m33.GetInverted();
-    */
-    void Invert(void)
-    {
-        F   tmp[12];
-        Matrix44_tpl<F> m = *this;
-
-        // Calculate pairs for first 8 elements (cofactors)
-        tmp[0] = m.m22 * m.m33;
-        tmp[1] = m.m32 * m.m23;
-        tmp[2] = m.m12 * m.m33;
-        tmp[3] = m.m32 * m.m13;
-        tmp[4] = m.m12 * m.m23;
-        tmp[5] = m.m22 * m.m13;
-        tmp[6] = m.m02 * m.m33;
-        tmp[7] = m.m32 * m.m03;
-        tmp[8] = m.m02 * m.m23;
-        tmp[9] = m.m22 * m.m03;
-        tmp[10] = m.m02 * m.m13;
-        tmp[11] = m.m12 * m.m03;
-
-        // Calculate first 8 elements (cofactors)
-        m00 = tmp[0] * m.m11 + tmp[3] * m.m21 + tmp[ 4] * m.m31;
-        m00 -= tmp[1] * m.m11 + tmp[2] * m.m21 + tmp[ 5] * m.m31;
-        m01 = tmp[1] * m.m01 + tmp[6] * m.m21 + tmp[ 9] * m.m31;
-        m01 -= tmp[0] * m.m01 + tmp[7] * m.m21 + tmp[ 8] * m.m31;
-        m02 = tmp[2] * m.m01 + tmp[7] * m.m11 + tmp[10] * m.m31;
-        m02 -= tmp[3] * m.m01 + tmp[6] * m.m11 + tmp[11] * m.m31;
-        m03 = tmp[5] * m.m01 + tmp[8] * m.m11 + tmp[11] * m.m21;
-        m03 -= tmp[4] * m.m01 + tmp[9] * m.m11 + tmp[10] * m.m21;
-        m10 = tmp[1] * m.m10 + tmp[2] * m.m20 + tmp[ 5] * m.m30;
-        m10 -= tmp[0] * m.m10 + tmp[3] * m.m20 + tmp[ 4] * m.m30;
-        m11 = tmp[0] * m.m00 + tmp[7] * m.m20 + tmp[ 8] * m.m30;
-        m11 -= tmp[1] * m.m00 + tmp[6] * m.m20 + tmp[ 9] * m.m30;
-        m12 = tmp[3] * m.m00 + tmp[6] * m.m10 + tmp[11] * m.m30;
-        m12 -= tmp[2] * m.m00 + tmp[7] * m.m10 + tmp[10] * m.m30;
-        m13 = tmp[4] * m.m00 + tmp[9] * m.m10 + tmp[10] * m.m20;
-        m13 -= tmp[5] * m.m00 + tmp[8] * m.m10 + tmp[11] * m.m20;
-
-        // Calculate pairs for second 8 elements (cofactors)
-        tmp[ 0] = m.m20 * m.m31;
-        tmp[ 1] = m.m30 * m.m21;
-        tmp[ 2] = m.m10 * m.m31;
-        tmp[ 3] = m.m30 * m.m11;
-        tmp[ 4] = m.m10 * m.m21;
-        tmp[ 5] = m.m20 * m.m11;
-        tmp[ 6] = m.m00 * m.m31;
-        tmp[ 7] = m.m30 * m.m01;
-        tmp[ 8] = m.m00 * m.m21;
-        tmp[ 9] = m.m20 * m.m01;
-        tmp[10] = m.m00 * m.m11;
-        tmp[11] = m.m10 * m.m01;
-
-        // Calculate second 8 elements (cofactors)
-        m20 = tmp[ 0] * m.m13 + tmp[ 3] * m.m23 + tmp[ 4] * m.m33;
-        m20 -= tmp[ 1] * m.m13 + tmp[ 2] * m.m23 + tmp[ 5] * m.m33;
-        m21 = tmp[ 1] * m.m03 + tmp[ 6] * m.m23 + tmp[ 9] * m.m33;
-        m21 -= tmp[ 0] * m.m03 + tmp[ 7] * m.m23 + tmp[ 8] * m.m33;
-        m22 = tmp[ 2] * m.m03 + tmp[ 7] * m.m13 + tmp[10] * m.m33;
-        m22 -= tmp[ 3] * m.m03 + tmp[ 6] * m.m13 + tmp[11] * m.m33;
-        m23 = tmp[ 5] * m.m03 + tmp[ 8] * m.m13 + tmp[11] * m.m23;
-        m23 -= tmp[ 4] * m.m03 + tmp[ 9] * m.m13 + tmp[10] * m.m23;
-        m30 = tmp[ 2] * m.m22 + tmp[ 5] * m.m32 + tmp[ 1] * m.m12;
-        m30 -= tmp[ 4] * m.m32 + tmp[ 0] * m.m12 + tmp[ 3] * m.m22;
-        m31 = tmp[ 8] * m.m32 + tmp[ 0] * m.m02 + tmp[ 7] * m.m22;
-        m31 -= tmp[ 6] * m.m22 + tmp[ 9] * m.m32 + tmp[ 1] * m.m02;
-        m32 = tmp[ 6] * m.m12 + tmp[11] * m.m32 + tmp[ 3] * m.m02;
-        m32 -= tmp[10] * m.m32 + tmp[ 2] * m.m02 + tmp[ 7] * m.m12;
-        m33 = tmp[10] * m.m22 + tmp[ 4] * m.m02 + tmp[ 9] * m.m12;
-        m33 -= tmp[ 8] * m.m12 + tmp[11] * m.m22 + tmp[ 5] * m.m02;
-
-        // Calculate determinant
-        F det = (m.m00 * m00 + m.m10 * m01 + m.m20 * m02 + m.m30 * m03);
-        //if (fabs_tpl(det)<0.0001f) assert(0);
-
-        // Divide the cofactor-matrix by the determinant
-        F idet = (F)1.0 / det;
-        m00 *= idet;
-        m01 *= idet;
-        m02 *= idet;
-        m03 *= idet;
-        m10 *= idet;
-        m11 *= idet;
-        m12 *= idet;
-        m13 *= idet;
-        m20 *= idet;
-        m21 *= idet;
-        m22 *= idet;
-        m23 *= idet;
-        m30 *= idet;
-        m31 *= idet;
-        m32 *= idet;
-        m33 *= idet;
-    }
-
-    ILINE Matrix44_tpl<F> GetInverted() const
-    {
-        Matrix44_tpl<F> dst = *this;
-        dst.Invert();
-        return dst;
-    }
-
-
-    ILINE f32 Determinant() const
-    {
-        //determinant is ambiguous: only the upper-left-submatrix's determinant is calculated
-        return (m00 * m11 * m22) + (m01 * m12 * m20) + (m02 * m10 * m21) - (m02 * m11 * m20) - (m00 * m12 * m21) - (m01 * m10 * m22);
-    }
-
-    //! transform a vector
-    ILINE Vec3 TransformVector(const Vec3& b) const
-    {
-        assert(b.IsValid());
-        Vec3 v;
-        v.x = m00 * b.x + m01 * b.y + m02 * b.z;
-        v.y = m10 * b.x + m11 * b.y + m12 * b.z;
-        v.z = m20 * b.x + m21 * b.y + m22 * b.z;
-        return v;
-    }
-    //! transform a point
-    ILINE Vec3 TransformPoint(const Vec3& b) const
-    {
-        assert(b.IsValid());
-        Vec3 v;
-        v.x = m00 * b.x + m01 * b.y + m02 * b.z + m03;
-        v.y = m10 * b.x + m11 * b.y + m12 * b.z + m13;
-        v.z = m20 * b.x + m21 * b.y + m22 * b.z + m23;
-        return v;
-    }
-
-
-    //--------------------------------------------------------------------------------
-    //----                  helper functions to access matrix-members     ------------
-    //--------------------------------------------------------------------------------
-    ILINE F* GetData() { return &m00; }
-    ILINE const F* GetData() const { return &m00; }
-
-    ILINE F operator ()  (uint32 i, uint32 j) const {   assert ((i < 4) && (j < 4));    F* p_data = (F*)(&m00);   return p_data[i * 4 + j];   }
-    ILINE F& operator () (uint32 i, uint32 j)   {   assert ((i < 4) && (j < 4));    F* p_data = (F*)(&m00);       return p_data[i * 4 + j];   }
-
-    ILINE void SetRow(int i, const Vec3_tpl<F>& v)  {   assert(i < 4);    F* p = (F*)(&m00);    p[0 + 4 * i] = v.x;   p[1 + 4 * i] = v.y;   p[2 + 4 * i] = v.z;       }
-    ILINE void SetRow4(int i, const Vec4_tpl<F>& v)   {   assert(i < 4);    F* p = (F*)(&m00);    p[0 + 4 * i] = v.x;   p[1 + 4 * i] = v.y;   p[2 + 4 * i] = v.z;   p[3 + 4 * i] = v.w;   }
-    ILINE const Vec3_tpl<F>& GetRow(int i) const    {   assert(i < 4); return *(const Vec3_tpl<F>*)(&m00 + 4 * i);  }
-
-    ILINE void SetColumn(int i, const Vec3_tpl<F>& v)   {   assert(i < 4);    F* p = (F*)(&m00);    p[i + 4 * 0] = v.x;   p[i + 4 * 1] = v.y;   p[i + 4 * 2] = v.z;       }
-    ILINE Vec3_tpl<F> GetColumn(int i) const    {   assert(i < 4);    F* p = (F*)(&m00);    return Vec3(p[i + 4 * 0], p[i + 4 * 1], p[i + 4 * 2]);    }
-    ILINE Vec4_tpl<F> GetColumn4(int i) const {   assert(i < 4);    F* p = (F*)(&m00);    return Vec4(p[i + 4 * 0], p[i + 4 * 1], p[i + 4 * 2], p[i + 4 * 3]);   }
-
-    ILINE Vec3 GetTranslation() const { return Vec3(m03, m13, m23);   }
-    ILINE void SetTranslation(const Vec3& t)  {   m03 = t.x; m13 = t.y; m23 = t.z; }
-
-    bool IsValid() const
-    {
-        if (!NumberValid(m00))
-        {
-            return false;
-        }
-        if (!NumberValid(m01))
-        {
-            return false;
-        }
-        if (!NumberValid(m02))
-        {
-            return false;
-        }
-        if (!NumberValid(m03))
-        {
-            return false;
-        }
-        if (!NumberValid(m10))
-        {
-            return false;
-        }
-        if (!NumberValid(m11))
-        {
-            return false;
-        }
-        if (!NumberValid(m12))
-        {
-            return false;
-        }
-        if (!NumberValid(m13))
-        {
-            return false;
-        }
-        if (!NumberValid(m20))
-        {
-            return false;
-        }
-        if (!NumberValid(m21))
-        {
-            return false;
-        }
-        if (!NumberValid(m22))
-        {
-            return false;
-        }
-        if (!NumberValid(m23))
-        {
-            return false;
-        }
-        if (!NumberValid(m30))
-        {
-            return false;
-        }
-        if (!NumberValid(m31))
-        {
-            return false;
-        }
-        if (!NumberValid(m32))
-        {
-            return false;
-        }
-        if (!NumberValid(m33))
-        {
-            return false;
-        }
-        return true;
-    }
-    static bool IsEquivalent(const Matrix44_tpl<F>& m0, const Matrix44_tpl<F>& m1, F e = VEC_EPSILON)
-    {
-        return  (
-            (fabs_tpl(m0.m00 - m1.m00) <= e) && (fabs_tpl(m0.m01 - m1.m01) <= e) && (fabs_tpl(m0.m02 - m1.m02) <= e) && (fabs_tpl(m0.m03 - m1.m03) <= e) &&
-            (fabs_tpl(m0.m10 - m1.m10) <= e) && (fabs_tpl(m0.m11 - m1.m11) <= e) && (fabs_tpl(m0.m12 - m1.m12) <= e) && (fabs_tpl(m0.m13 - m1.m13) <= e) &&
-            (fabs_tpl(m0.m20 - m1.m20) <= e) && (fabs_tpl(m0.m21 - m1.m21) <= e) && (fabs_tpl(m0.m22 - m1.m22) <= e) && (fabs_tpl(m0.m23 - m1.m23) <= e) &&
-            (fabs_tpl(m0.m30 - m1.m30) <= e) && (fabs_tpl(m0.m31 - m1.m31) <= e) && (fabs_tpl(m0.m32 - m1.m32) <= e) && (fabs_tpl(m0.m33 - m1.m33) <= e)
-            );
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Typedefs                                                                  //
-///////////////////////////////////////////////////////////////////////////////
-
-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
-typedef _MS_ALIGN(16) Matrix44_tpl<f32> _ALIGN (16) Matrix44A;
-
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//-------------       implementation of Matrix44      ------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
-
-/*!
-*  Implements the multiplication operator: Matrix44=Matrix44*Matrix33diag
-*
-*  Matrix44 and Matrix33diag are specified in collumn order.
-*  AxB = operation B followed by operation A.
-*  This operation takes 12 mults.
-*
-*  Example:
-*   Matrix33diag diag(1,2,3);
-*   Matrix44 m44=CreateRotationZ33(3.14192f);
-*     Matrix44 result=m44*diag;
-*/
-template<class F1,  class F2>
-ILINE Matrix44_tpl<F1> operator * (const Matrix44_tpl<F1>& l, const Diag33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix44_tpl<F1> m;
-    m.m00 = l.m00 * r.x;
-    m.m01 = l.m01 * r.y;
-    m.m02 = l.m02 * r.z;
-    m.m03 = l.m03;
-    m.m10 = l.m10 * r.x;
-    m.m11 = l.m11 * r.y;
-    m.m12 = l.m12 * r.z;
-    m.m13 = l.m13;
-    m.m20 = l.m20 * r.x;
-    m.m21 = l.m21 * r.y;
-    m.m22 = l.m22 * r.z;
-    m.m23 = l.m23;
-    m.m30 = l.m30 * r.x;
-    m.m31 = l.m31 * r.y;
-    m.m32 = l.m32 * r.z;
-    m.m33 = l.m33;
-    return m;
-}
-template<class F1, class F2>
-ILINE Matrix44_tpl<F1>& operator *= (Matrix44_tpl<F1>& l, const Diag33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    l.m00 *= r.x;
-    l.m01 *= r.y;
-    l.m02 *= r.z;
-    l.m10 *= r.x;
-    l.m11 *= r.y;
-    l.m12 *= r.z;
-    l.m20 *= r.x;
-    l.m21 *= r.y;
-    l.m22 *= r.z;
-    l.m30 *= r.x;
-    l.m31 *= r.y;
-    l.m32 *= r.z;
-    return l;
-}
-
-
-/*!
-*  Implements the multiplication operator: Matrix44=Matrix44*Matrix33
-*
-*  Matrix44 and Matrix33 are specified in collumn order.
-*  AxB = rotation B followed by rotation A.
-*  This operation takes 48 mults and 24 adds.
-*
-*  Example:
-*   Matrix33 m34=CreateRotationX33(1.94192f);;
-*   Matrix44 m44=CreateRotationZ33(3.14192f);
-*     Matrix44 result=m44*m33;
-*/
-template<class F1,  class F2>
-ILINE Matrix44_tpl<F1> operator * (const Matrix44_tpl<F1>& l, const Matrix33_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix44_tpl<F1> m;
-    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
-    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
-    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
-    m.m30 = l.m30 * r.m00 + l.m31 * r.m10 + l.m32 * r.m20;
-    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
-    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
-    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
-    m.m31 = l.m30 * r.m01 + l.m31 * r.m11 + l.m32 * r.m21;
-    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
-    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
-    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
-    m.m32 = l.m30 * r.m02 + l.m31 * r.m12 + l.m32 * r.m22;
-    m.m03 = l.m03;
-    m.m13 = l.m13;
-    m.m23 = l.m23;
-    m.m33 = l.m33;
-    return m;
-}
-
-
-/*!
-*  Implements the multiplication operator: Matrix44=Matrix44*Matrix34
-*
-*  Matrix44 and Matrix34 are specified in collumn order.
-*  AxB = rotation B followed by rotation A.
-*  This operation takes 48 mults and 36 adds.
-*
-*  Example:
-*   Matrix34 m34=CreateRotationX33(1.94192f);;
-*   Matrix44 m44=CreateRotationZ33(3.14192f);
-*     Matrix44 result=m44*m34;
-*/
-template<class F>
-ILINE Matrix44_tpl<F> operator * (const Matrix44_tpl<F>& l, const Matrix34_tpl<F>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix44_tpl<F> m;
-    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
-    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
-    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
-    m.m30 = l.m30 * r.m00 + l.m31 * r.m10 + l.m32 * r.m20;
-    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
-    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
-    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
-    m.m31 = l.m30 * r.m01 + l.m31 * r.m11 + l.m32 * r.m21;
-    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
-    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
-    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
-    m.m32 = l.m30 * r.m02 + l.m31 * r.m12 + l.m32 * r.m22;
-    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23 + l.m03;
-    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23 + l.m13;
-    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23 + l.m23;
-    m.m33 = l.m30 * r.m03 + l.m31 * r.m13 + l.m32 * r.m23 + l.m33;
-    return m;
-}
-
-
-/*!
-*  Implements the multiplication operator: Matrix44=Matrix44*Matrix44
-*
-*  Matrix44 and Matrix34 are specified in collumn order.
-*    AxB = rotation B followed by rotation A.
-*  This operation takes 48 mults and 36 adds.
-*
-*  Example:
-*   Matrix44 m44=CreateRotationX33(1.94192f);;
-*   Matrix44 m44=CreateRotationZ33(3.14192f);
-*     Matrix44 result=m44*m44;
-*/
-template<class F1, class F2>
-ILINE Matrix44_tpl<F1> operator * (const Matrix44_tpl<F1>& l, const Matrix44_tpl<F2>& r)
-{
-    assert(l.IsValid());
-    assert(r.IsValid());
-    Matrix44_tpl<F1> res;
-    res.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20 + l.m03 * r.m30;
-    res.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20 + l.m13 * r.m30;
-    res.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20 + l.m23 * r.m30;
-    res.m30 = l.m30 * r.m00 + l.m31 * r.m10 + l.m32 * r.m20 + l.m33 * r.m30;
-    res.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21 + l.m03 * r.m31;
-    res.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21 + l.m13 * r.m31;
-    res.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21 + l.m23 * r.m31;
-    res.m31 = l.m30 * r.m01 + l.m31 * r.m11 + l.m32 * r.m21 + l.m33 * r.m31;
-    res.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22 + l.m03 * r.m32;
-    res.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22 + l.m13 * r.m32;
-    res.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22 + l.m23 * r.m32;
-    res.m32 = l.m30 * r.m02 + l.m31 * r.m12 + l.m32 * r.m22 + l.m33 * r.m32;
-    res.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23 + l.m03 * r.m33;
-    res.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23 + l.m13 * r.m33;
-    res.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23 + l.m23 * r.m33;
-    res.m33 = l.m30 * r.m03 + l.m31 * r.m13 + l.m32 * r.m23 + l.m33 * r.m33;
-    return res;
-}
-
-//post-multiply
-template<class F1, class F2>
-ILINE Vec4_tpl<F1> operator*(const Matrix44_tpl<F2>& m, const Vec4_tpl<F1>& v)
-{
-    assert(m.IsValid());
-    assert(v.IsValid());
-    return Vec4_tpl<F1>(v.x * m.m00 + v.y * m.m01 + v.z * m.m02 + v.w * m.m03,
-        v.x * m.m10 + v.y * m.m11 + v.z * m.m12 + v.w * m.m13,
-        v.x * m.m20 + v.y * m.m21 + v.z * m.m22 + v.w * m.m23,
-        v.x * m.m30 + v.y * m.m31 + v.z * m.m32 + v.w * m.m33);
-}
-
-//pre-multiply
-template<class F1, class F2>
-ILINE Vec4_tpl<F1> operator*(const Vec4_tpl<F1>& v, const Matrix44_tpl<F2>& m)
-{
-    assert(m.IsValid());
-    assert(v.IsValid());
-    return Vec4_tpl<F1>(v.x * m.m00 + v.y * m.m10 + v.z * m.m20 + v.w * m.m30,
-        v.x * m.m01 + v.y * m.m11 + v.z * m.m21 + v.w * m.m31,
-        v.x * m.m02 + v.y * m.m12 + v.z * m.m22 + v.w * m.m32,
-        v.x * m.m03 + v.y * m.m13 + v.z * m.m23 + v.w * m.m33);
-}
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_MATRIX44_H
-
diff --git a/Code/CryEngine/CryCommon/Cry_MatrixDiag.h b/Code/CryEngine/CryCommon/Cry_MatrixDiag.h
deleted file mode 100644
index dd3a182e03..0000000000
--- a/Code/CryEngine/CryCommon/Cry_MatrixDiag.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common matrix class
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_MATRIXDIAG_H
-#define CRYINCLUDE_CRYCOMMON_CRY_MATRIXDIAG_H
-#pragma once
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Diag33_tpl
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-template<typename F>
-struct Diag33_tpl
-{
-    F x, y, z;
-
-#ifdef _DEBUG
-    ILINE Diag33_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-        }
-    }
-#else
-    ILINE Diag33_tpl()  {};
-#endif
-
-
-    Diag33_tpl(F dx, F dy, F dz) { x = dx; y = dy; z = dz; }
-    Diag33_tpl(const Vec3_tpl<F>& v) {  x = v.x; y = v.y; z = v.z;    }
-    template<class F1>
-    const Diag33_tpl& operator=(const Vec3_tpl<F1>& v) { x = v.x; y = v.y; z = v.z; return *this;    }
-    Diag33_tpl& operator=(const Diag33_tpl<F>& diag) { x = diag.x; y = diag.y; z = diag.z; return *this;  }
-    template<class F1>
-    Diag33_tpl& operator=(const Diag33_tpl<F1>& diag) { x = diag.x; y = diag.y; z = diag.z; return *this; }
-
-    const void SetIdentity() { x = y = z = 1; }
-    Diag33_tpl(type_identity) { x = y = z = 1; }
-
-    const Diag33_tpl& zero() {  x = y = z = 0; return *this; }
-
-    Diag33_tpl& fabs() {    x = fabs_tpl(x); y = fabs_tpl(y); z = fabs_tpl(z); return *this;  }
-
-    Diag33_tpl& invert()   // in-place inversion
-    {
-        F det = determinant();
-        if (det == 0)
-        {
-            return *this;
-        }
-        det = (F)1.0 / det;
-        F oldata[3];
-        oldata[0] = x;
-        oldata[1] = y;
-        oldata[2] = z;
-        x = oldata[1] * oldata[2] * det;
-        y = oldata[0] * oldata[2] * det;
-        z = oldata[0] * oldata[1] * det;
-        return *this;
-    }
-
-    /*!
-    * Linear-Interpolation between Diag33(lerp)
-    *
-    * Example:
-    *  Diag33 r=Diag33::CreateLerp( p, q, 0.345f );
-    */
-    ILINE void SetLerp(const Diag33_tpl<F>& p, const Diag33_tpl<F>& q, F t)
-    {
-        x = p.x * (1.0f - t) + q.x * t;
-        y = p.y * (1.0f - t) + q.y * t;
-        z = p.z * (1.0f - t) + q.z * t;
-    }
-    ILINE static Diag33_tpl<F> CreateLerp(const Diag33_tpl<F>& p, const Diag33_tpl<F>& q, F t)
-    {
-        Diag33_tpl<F>  d;
-        d.x = p.x * (1.0f - t) + q.x * t;
-        d.y = p.y * (1.0f - t) + q.y * t;
-        d.z = p.z * (1.0f - t) + q.z * t;
-        return d;
-    }
-
-    F determinant() const { return x * y * z; }
-
-    ILINE bool IsValid() const
-    {
-        if (!NumberValid(x))
-        {
-            return false;
-        }
-        if (!NumberValid(y))
-        {
-            return false;
-        }
-        if (!NumberValid(z))
-        {
-            return false;
-        }
-        return true;
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Typedefs                                                                  //
-///////////////////////////////////////////////////////////////////////////////
-
-typedef Diag33_tpl<f32>  Diag33; //always 32 bit
-typedef Diag33_tpl<f64>  Diag33d;//always 64 bit
-typedef Diag33_tpl<real> Diag33r;//variable float precision. depending on the target system it can be between 32, 64 or 80 bit
-
-
-template<class F1, class F2>
-Diag33_tpl<F1> operator*(const Diag33_tpl<F1>& l, const Diag33_tpl<F2>& r)
-{
-    return Diag33_tpl<F1>(l.x * r.x, l.y * r.y,   l.z * r.z);
-}
-
-template<class F1, class F2>
-Matrix33_tpl<F2> operator*(const Diag33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
-{
-    Matrix33_tpl<F2> res;
-    res.m00 = r.m00 * l.x;
-    res.m01 = r.m01 * l.x;
-    res.m02 = r.m02 * l.x;
-    res.m10 = r.m10 * l.y;
-    res.m11 = r.m11 * l.y;
-    res.m12 = r.m12 * l.y;
-    res.m20 = r.m20 * l.z;
-    res.m21 = r.m21 * l.z;
-    res.m22 = r.m22 * l.z;
-    return res;
-}
-template<class F1, class F2>
-Matrix34_tpl<F2> operator*(const Diag33_tpl<F1>& l, const Matrix34_tpl<F2>& r)
-{
-    Matrix34_tpl<F2> m;
-    m.m00 = l.x * r.m00;
-    m.m01 = l.x * r.m01;
-    m.m02 = l.x * r.m02;
-    m.m03 = l.x * r.m03;
-    m.m10 = l.y * r.m10;
-    m.m11 = l.y * r.m11;
-    m.m12 = l.y * r.m12;
-    m.m13 = l.y * r.m13;
-    m.m20 = l.z * r.m20;
-    m.m21 = l.z * r.m21;
-    m.m22 = l.z * r.m22;
-    m.m23 = l.z * r.m23;
-    return m;
-}
-
-template<class F1, class F2>
-Vec3_tpl<F2> operator *(const Diag33_tpl<F1>& mtx, const Vec3_tpl<F2>& vec)
-{
-    return Vec3_tpl<F2>(mtx.x * vec.x, mtx.y * vec.y, mtx.z * vec.z);
-}
-
-template<class F1, class F2>
-Vec3_tpl<F1> operator *(const Vec3_tpl<F1>& vec, const Diag33_tpl<F2>& mtx)
-{
-    return Vec3_tpl<F1>(mtx.x * vec.x, mtx.y * vec.y, mtx.z * vec.z);
-}
-
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_MATRIXDIAG_H
-
diff --git a/Code/CryEngine/CryCommon/Cry_Quat.h b/Code/CryEngine/CryCommon/Cry_Quat.h
deleted file mode 100644
index 5765e56d5f..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Quat.h
+++ /dev/null
@@ -1,2228 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common quaternion class
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_QUAT_H
-#define CRYINCLUDE_CRYCOMMON_CRY_QUAT_H
-#pragma once
-
-#include <AzCore/Math/Quaternion.h>
-
-//----------------------------------------------------------------------
-// Quaternion
-//----------------------------------------------------------------------
-template <typename F>
-struct Quat_tpl
-{
-    Vec3_tpl<F> v;
-    F w;
-
-    //-------------------------------
-
-    //constructors
-#if defined(_DEBUG)
-    ILINE Quat_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&v.x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-            p[3] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&v.x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-            p[3] = F64NAN;
-        }
-    }
-#else
-    ILINE Quat_tpl() {}
-#endif
-
-    //initialize with zeros
-    ILINE Quat_tpl(type_zero)
-    {
-        w = 0, v.x = 0, v.y = 0, v.z = 0;
-    }
-    ILINE Quat_tpl(type_identity)
-    {
-        w = 1, v.x = 0, v.y = 0, v.z = 0;
-    }
-
-    //ASSIGNMENT OPERATOR of identical Quat types.
-    //The assignment operator has precedence over assignment constructor
-    //Quat q; q=q0;
-    ILINE Quat_tpl<F>& operator = (const Quat_tpl<F>& src)
-    {
-        v.x = src.v.x;
-        v.y = src.v.y;
-        v.z = src.v.z;
-        w = src.w;
-        assert(IsValid());
-        return *this;
-    }
-
-
-    //CONSTRUCTOR to initialize a Quat from 4 floats
-    //Quat q(1,0,0,0);
-    ILINE Quat_tpl<F>(F qw, F qx, F qy, F qz)
-    {
-        w = qw;
-        v.x = qx;
-        v.y = qy;
-        v.z = qz;
-        assert(IsValid());
-    }
-    //CONSTRUCTOR to initialize a Quat with a scalar and a vector
-    //Quat q(1,Vec3(0,0,0));
-    ILINE Quat_tpl<F>(F scalar, const Vec3_tpl<F> &vector)
-    {
-        v = vector;
-        w = scalar;
-        assert(IsValid());
-    };
-
-
-    //CONSTRUCTOR for identical types
-    //Quat q=q0;
-    ILINE  Quat_tpl<F>(const Quat_tpl<F>&q)
-    {
-        w = q.w;
-        v.x = q.v.x;
-        v.y = q.v.y;
-        v.z = q.v.z;
-        assert(IsValid());
-    }
-
-    //CONSTRUCTOR for AZ::Quaternion
-    explicit ILINE  Quat_tpl<F>(const AZ::Quaternion& q)
-    {
-        w = q.GetW();
-        v.x = q.GetX();
-        v.y = q.GetY();
-        v.z = q.GetZ();
-        assert(IsValid());
-    }
-
-    //CONSTRUCTOR for identical types which converts between double/float
-    //Quat q32=q64;
-    //Quatr q64=q32;
-    template <class F1>
-    ILINE  Quat_tpl<F>(const Quat_tpl<F1>&q)
-    {
-        assert(q.IsValid());
-        w = F(q.w);
-        v.x = F(q.v.x);
-        v.y = F(q.v.y);
-        v.z = F(q.v.z);
-    }
-
-
-
-
-
-
-
-    //CONSTRUCTOR for different types. It converts a Euler Angle into a Quat.
-    //Needs to be 'explicit' because we loose fp-precision in the conversion process
-    //Quat(Ang3(1,2,3));
-    explicit ILINE Quat_tpl<F>(const Ang3_tpl<F>&ang)
-    {
-        assert(ang.IsValid());
-        SetRotationXYZ(ang);
-    }
-    //CONSTRUCTOR for different types. It converts a Euler Angle into a Quat and converts between double/float. .
-    //Needs to be 'explicit' because we loose fp-precision in the conversion process
-    //Quat(Ang3r(1,2,3));
-    template<class F1>
-    explicit ILINE Quat_tpl<F>(const Ang3_tpl<F1>&ang)
-    {
-        assert(ang.IsValid());
-        SetRotationXYZ(Ang3_tpl<F>(F(ang.x), F(ang.y), F(ang.z)));
-    }
-
-
-    //CONSTRUCTOR for different types. It converts a Matrix33 into a Quat.
-    //Needs to be 'explicit' because we loose fp-precision in the conversion process
-    //Quat(m33);
-    explicit ILINE Quat_tpl<F>(const Matrix33_tpl<F>&m)
-    {
-        assert(m.IsOrthonormalRH(0.1f));
-        F s, p, tr = m.m00 + m.m11 + m.m22;
-        w = 1, v.x = 0, v.y = 0, v.z = 0;
-        if (tr > 0)
-        {
-            s = sqrt_tpl(tr + 1.0f), p = 0.5f / s, w = s * 0.5f, v.x = (m.m21 - m.m12) * p, v.y = (m.m02 - m.m20) * p, v.z = (m.m10 - m.m01) * p;
-        }
-        else if ((m.m00 >= m.m11) && (m.m00 >= m.m22))
-        {
-            s = sqrt_tpl(m.m00 - m.m11 - m.m22 + 1.0f), p = 0.5f / s, w = (m.m21 - m.m12) * p, v.x = s * 0.5f, v.y = (m.m10 + m.m01) * p, v.z = (m.m20 + m.m02) * p;
-        }
-        else if ((m.m11 >= m.m00) && (m.m11 >= m.m22))
-        {
-            s = sqrt_tpl(m.m11 - m.m22 - m.m00 + 1.0f), p = 0.5f / s, w = (m.m02 - m.m20) * p, v.x = (m.m01 + m.m10) * p, v.y = s * 0.5f, v.z = (m.m21 + m.m12) * p;
-        }
-        else if ((m.m22 >= m.m00) && (m.m22 >= m.m11))
-        {
-            s = sqrt_tpl(m.m22 - m.m00 - m.m11 + 1.0f), p = 0.5f / s, w = (m.m10 - m.m01) * p, v.x = (m.m02 + m.m20) * p, v.y = (m.m12 + m.m21) * p, v.z = s * 0.5f;
-        }
-    }
-    //CONSTRUCTOR for different types. It converts a Matrix33 into a Quat and converts between double/float.
-    //Needs to be 'explicit' because we loose fp-precision the conversion process
-    //Quat(m33r);
-    //Quatr(m33);
-    template<class F1>
-    explicit ILINE Quat_tpl<F>(const Matrix33_tpl<F1>&m)
-    {
-        assert(m.IsOrthonormalRH(0.1f));
-        F1 s, p, tr = m.m00 + m.m11 + m.m22;
-        w = 1, v.x = 0, v.y = 0, v.z = 0;
-        if (tr > 0)
-        {
-            s = sqrt_tpl(tr + 1.0f), p = 0.5f / s, w = F(s * 0.5), v.x = F((m.m21 - m.m12) * p), v.y = F((m.m02 - m.m20) * p), v.z = F((m.m10 - m.m01) * p);
-        }
-        else if ((m.m00 >= m.m11) && (m.m00 >= m.m22))
-        {
-            s = sqrt_tpl(m.m00 - m.m11 - m.m22 + 1.0f), p = 0.5f / s, w = F((m.m21 - m.m12) * p), v.x = F(s * 0.5), v.y = F((m.m10 + m.m01) * p), v.z = F((m.m20 + m.m02) * p);
-        }
-        else if ((m.m11 >= m.m00) && (m.m11 >= m.m22))
-        {
-            s = sqrt_tpl(m.m11 - m.m22 - m.m00 + 1.0f), p = 0.5f / s, w = F((m.m02 - m.m20) * p), v.x = F((m.m01 + m.m10) * p), v.y = F(s * 0.5), v.z = F((m.m21 + m.m12) * p);
-        }
-        else if ((m.m22 >= m.m00) && (m.m22 >= m.m11))
-        {
-            s = sqrt_tpl(m.m22 - m.m00 - m.m11 + 1.0f), p = 0.5f / s, w = F((m.m10 - m.m01) * p), v.x = F((m.m02 + m.m20) * p), v.y = F((m.m12 + m.m21) * p), v.z = F(s * 0.5);
-        }
-    }
-
-    //CONSTRUCTOR for different types. It converts a Matrix34 into a Quat.
-    //Needs to be 'explicit' because we loose fp-precision in the conversion process
-    //Quat(m34);
-    explicit ILINE Quat_tpl<F>(const Matrix34_tpl<F>&m)
-    {
-        *this = Quat_tpl<F>(Matrix33_tpl<F>(m));
-    }
-    //CONSTRUCTOR for different types. It converts a Matrix34 into a Quat and converts between double/float.
-    //Needs to be 'explicit' because we loose fp-precision the conversion process
-    //Quat(m34r);
-    //Quatr(m34);
-    template<class F1>
-    explicit ILINE Quat_tpl<F>(const Matrix34_tpl<F1>&m)
-    {
-        *this = Quat_tpl<F>(Matrix33_tpl<F1>(m));
-    }
-
-
-
-
-
-    /*!
-    * invert quaternion.
-    *
-    * Example 1:
-    *  Quat q=Quat::CreateRotationXYZ(Ang3(1,2,3));
-    *  Quat result = !q;
-    *  Quat result = GetInverted(q);
-    *  q.Invert();
-    */
-    ILINE Quat_tpl<F> operator ! () const { return Quat_tpl(w, -v); }
-    ILINE void Invert(void) { *this = !*this;   }
-    ILINE Quat_tpl<F> GetInverted() const { return !(*this); }
-    //flip quaternion. don't confuse this with quaternion-inversion.
-    ILINE Quat_tpl<F>   operator - () const { return Quat_tpl<F>(-w, -v); };
-    //multiplication by a scalar
-    void operator *= (F op) {   w *= op; v *= op;   }
-
-    // Exact compare of 2 quats.
-    ILINE bool operator==(const Quat_tpl<F>& q) const { return (v == q.v) && (w == q.w); }
-    ILINE bool operator!=(const Quat_tpl<F>& q) const { return !(*this == q); }
-
-
-
-
-    //A quaternion is a compressed matrix. Thus there is no problem extracting the rows & columns.
-    ILINE Vec3_tpl<F> GetColumn(uint32 i)
-    {
-        if (i == 0)
-        {
-            return GetColumn0();
-        }
-        if (i == 1)
-        {
-            return GetColumn1();
-        }
-        if (i == 2)
-        {
-            return GetColumn2();
-        }
-        assert(0); //bad index
-        return Vec3(ZERO);
-    }
-
-    ILINE Vec3_tpl<F> GetColumn0() const {return Vec3_tpl<F>(2 * (v.x * v.x + w * w) - 1, 2 * (v.y * v.x + v.z * w), 2 * (v.z * v.x - v.y * w)); }
-    ILINE Vec3_tpl<F> GetColumn1() const {return Vec3_tpl<F>(2 * (v.x * v.y - v.z * w), 2 * (v.y * v.y + w * w) - 1, 2 * (v.z * v.y + v.x * w)); }
-    ILINE Vec3_tpl<F> GetColumn2() const {return Vec3_tpl<F>(2 * (v.x * v.z + v.y * w), 2 * (v.y * v.z - v.x * w), 2 * (v.z * v.z + w * w) - 1); }
-    ILINE Vec3_tpl<F> GetRow0() const {return Vec3_tpl<F>(2 * (v.x * v.x + w * w) - 1, 2 * (v.x * v.y - v.z * w), 2 * (v.x * v.z + v.y * w)); }
-    ILINE Vec3_tpl<F> GetRow1() const {return Vec3_tpl<F>(2 * (v.y * v.x + v.z * w), 2 * (v.y * v.y + w * w) - 1, 2 * (v.y * v.z - v.x * w)); }
-    ILINE Vec3_tpl<F> GetRow2() const   {return Vec3_tpl<F>(2 * (v.z * v.x - v.y * w), 2 * (v.z * v.y + v.x * w), 2 * (v.z * v.z + w * w) - 1); }
-
-    // These are just copy & pasted components of the GetColumn1() above.
-    ILINE F GetFwdX() const { return (2 * (v.x * v.y - v.z * w)); }
-    ILINE F GetFwdY() const { return (2 * (v.y * v.y + w * w) - 1); }
-    ILINE F GetFwdZ() const { return (2 * (v.z * v.y + v.x * w)); }
-    ILINE F GetRotZ() const { return atan2_tpl(-GetFwdX(), GetFwdY()); }
-
-
-
-    /*!
-    * set identity quaternion
-    *
-    * Example:
-    *       Quat q=Quat::CreateIdentity();
-    *   or
-    *       q.SetIdentity();
-    *   or
-    *       Quat p=Quat(IDENTITY);
-    */
-    ILINE void SetIdentity(void)
-    {
-        w = 1;
-        v.x = 0;
-        v.y = 0;
-        v.z = 0;
-    }
-    ILINE static Quat_tpl<F> CreateIdentity(void)
-    {
-        return Quat_tpl<F>(1, 0, 0, 0);
-    }
-
-
-
-
-    // Description:
-    //    Check if identity quaternion.
-    ILINE bool IsIdentity() const
-    {
-        return w == 1 && v.x == 0 && v.y == 0 && v.z == 0;
-    }
-
-    ILINE bool IsUnit(F e = VEC_EPSILON) const
-    {
-        return fabs_tpl(1 - (w * w + v.x * v.x + v.y * v.y + v.z * v.z)) < e;
-    }
-
-    ILINE bool IsValid([[maybe_unused]] F e = VEC_EPSILON) const
-    {
-        if (!v.IsValid())
-        {
-            return false;
-        }
-        if (!NumberValid(w))
-        {
-            return false;
-        }
-        //if (!IsUnit(e))   return false;
-        return true;
-    }
-
-
-
-    ILINE void SetRotationAA(F rad, const Vec3_tpl<F>& axis)
-    {
-        F s, c;
-        sincos_tpl(rad * (F)0.5, &s, &c);
-        SetRotationAA(c, s, axis);
-    }
-    ILINE static Quat_tpl<F> CreateRotationAA(F rad, const Vec3_tpl<F>& axis)
-    {
-        Quat_tpl<F> q;
-        q.SetRotationAA(rad, axis);
-        return q;
-    }
-
-    ILINE void SetRotationAA(F cosha, F sinha, const Vec3_tpl<F>& axis)
-    {
-        assert(axis.IsUnit(0.001f));
-        w = cosha;
-        v = axis * sinha;
-    }
-    ILINE static Quat_tpl<F> CreateRotationAA(F cosha, F sinha, const Vec3_tpl<F>& axis)
-    {
-        Quat_tpl<F> q;
-        q.SetRotationAA(cosha, sinha, axis);
-        return q;
-    }
-
-
-
-
-    /*!
-    * Create rotation-quaternion that around the fixed coordinate axes.
-    *
-    * Example:
-    *       Quat q=Quat::CreateRotationXYZ( Ang3(1,2,3) );
-    *   or
-    *       q.SetRotationXYZ( Ang3(1,2,3) );
-    */
-    ILINE void SetRotationXYZ(const Ang3_tpl<F>& a)
-    {
-        assert(a.IsValid());
-        F sx, cx;
-        sincos_tpl(F(a.x * F(0.5)), &sx, &cx);
-        F sy, cy;
-        sincos_tpl(F(a.y * F(0.5)), &sy, &cy);
-        F sz, cz;
-        sincos_tpl(F(a.z * F(0.5)), &sz, &cz);
-        w       = cx * cy * cz + sx * sy * sz;
-        v.x = cz * cy * sx - sz * sy * cx;
-        v.y = cz * sy * cx + sz * cy * sx;
-        v.z = sz * cy * cx - cz * sy * sx;
-    }
-    ILINE static Quat_tpl<F> CreateRotationXYZ(const Ang3_tpl<F>& a)
-    {
-        assert(a.IsValid());
-        Quat_tpl<F> q;
-        q.SetRotationXYZ(a);
-        return q;
-    }
-
-    /*!
-    * Create rotation-quaternion that about the x-axis.
-    *
-    * Example:
-    *       Quat q=Quat::CreateRotationX( radiant );
-    *   or
-    *       q.SetRotationX( Ang3(1,2,3) );
-    */
-    ILINE void SetRotationX(f32 r)
-    {
-        F s, c;
-        sincos_tpl(F(r * F(0.5)), &s, &c);
-        w = c;
-        v.x = s;
-        v.y = 0;
-        v.z = 0;
-    }
-    ILINE static Quat_tpl<F> CreateRotationX(f32 r)
-    {
-        Quat_tpl<F> q;
-        q.SetRotationX(r);
-        return q;
-    }
-
-
-    /*!
-    * Create rotation-quaternion that about the y-axis.
-    *
-    * Example:
-    *       Quat q=Quat::CreateRotationY( radiant );
-    *   or
-    *       q.SetRotationY( radiant );
-    */
-    ILINE void SetRotationY(f32 r)
-    {
-        F s, c;
-        sincos_tpl(F(r * F(0.5)), &s, &c);
-        w = c;
-        v.x = 0;
-        v.y = s;
-        v.z = 0;
-    }
-    ILINE static Quat_tpl<F> CreateRotationY(f32 r)
-    {
-        Quat_tpl<F> q;
-        q.SetRotationY(r);
-        return q;
-    }
-
-
-    /*!
-    * Create rotation-quaternion that about the z-axis.
-    *
-    * Example:
-    *       Quat q=Quat::CreateRotationZ( radiant );
-    *   or
-    *       q.SetRotationZ( radiant );
-    */
-    ILINE void SetRotationZ(f32 r)
-    {
-        F s, c;
-        sincos_tpl(F(r * F(0.5)), &s, &c);
-        w = c;
-        v.x = 0;
-        v.y = 0;
-        v.z = s;
-    }
-    ILINE static Quat_tpl<F> CreateRotationZ(f32 r)
-    {
-        Quat_tpl<F> q;
-        q.SetRotationZ(r);
-        return q;
-    }
-
-
-
-    /*!
-    *
-    * Create rotation-quaternion that rotates from one vector to another.
-    * Both vectors are assumed to be normalized.
-    *
-    * Example:
-    *       Quat q=Quat::CreateRotationV0V1( v0,v1 );
-    *       q.SetRotationV0V1( v0,v1 );
-    */
-    ILINE void SetRotationV0V1(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
-    {
-        assert(v0.IsUnit(0.01f));
-        assert(v1.IsUnit(0.01f));
-        F dot = v0.x * v1.x + v0.y * v1.y + v0.z * v1.z + F(1.0);
-        if (dot > F(0.0001))
-        {
-            F vx = v0.y * v1.z - v0.z * v1.y;
-            F vy = v0.z * v1.x - v0.x * v1.z;
-            F vz = v0.x * v1.y - v0.y * v1.x;
-            F d = isqrt_tpl(dot * dot + vx * vx + vy * vy + vz * vz);
-            w = F(dot * d);
-            v.x = F(vx * d);
-            v.y = F(vy * d);
-            v.z = F(vz * d);
-            return;
-        }
-        w = 0;
-        v = v0.GetOrthogonal().GetNormalized();
-    }
-    ILINE static Quat_tpl<F> CreateRotationV0V1(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1) { Quat_tpl<F> q;  q.SetRotationV0V1(v0, v1);   return q;   }
-
-
-
-
-
-
-    /*!
-    *
-    * \param vdir  normalized view direction.
-    * \param roll  radiant to rotate about Y-axis.
-    *
-    *  Given a view-direction and a radiant to rotate about Y-axis, this function builds a 3x3 look-at quaternion
-    *  using only simple vector arithmetic. This function is always using the implicit up-vector Vec3(0,0,1).
-    *  The view-direction is always stored in column(1).
-    *  IMPORTANT: The view-vector is assumed to be normalized, because all trig-values for the orientation are being
-    *  extracted  directly out of the vector. This function must NOT be called with a view-direction
-    *  that is close to Vec3(0,0,1) or Vec3(0,0,-1). If one of these rules is broken, the function returns a quaternion
-    *  with an undefined rotation about the Z-axis.
-    *
-    *  Rotation order for the look-at-quaternion is Z-X-Y. (Zaxis=YAW / Xaxis=PITCH / Yaxis=ROLL)
-    *
-    *  COORDINATE-SYSTEM
-    *
-    *  z-axis
-    *    ^
-    *    |
-    *    |  y-axis
-    *    |  /
-    *    | /
-    *    |/
-    *    +--------------->   x-axis
-    *
-    *  Example:
-    *       Quat LookAtQuat=Quat::CreateRotationVDir( Vec3(0,1,0) );
-    *   or
-    *       Quat LookAtQuat=Quat::CreateRotationVDir( Vec3(0,1,0), 0.333f );
-    */
-    ILINE void SetRotationVDir(const Vec3_tpl<F>& vdir)
-    {
-        assert(vdir.IsUnit(0.01f));
-        //set default initialization for up-vector
-        w = F(0.70710676908493042);
-        v.x = F(vdir.z * 0.70710676908493042);
-        v.y = F(0.0);
-        v.z = F(0.0);
-        F l = sqrt_tpl(vdir.x * vdir.x + vdir.y * vdir.y);
-        if (l > F(0.00001))
-        {
-            //calculate LookAt quaternion
-            Vec3_tpl<F> hv  =   Vec3_tpl<F> (vdir.x / l, vdir.y / l + 1.0f, l + 1.0f);
-            F r = sqrt_tpl(hv.x * hv.x + hv.y * hv.y);
-            F s = sqrt_tpl(hv.z * hv.z + vdir.z * vdir.z);
-            //generate the half-angle sine&cosine
-            F hacos0 = 0.0;
-            F hasin0 = -1.0;
-            if (r > F(0.00001))
-            {
-                hacos0 = hv.y / r;
-                hasin0 = -hv.x / r;
-            }                                                       //yaw
-            F hacos1 = hv.z / s;
-            F hasin1 = vdir.z / s;                                  //pitch
-            w = F(hacos0 * hacos1);
-            v.x = F(hacos0 * hasin1);
-            v.y = F(hasin0 * hasin1);
-            v.z = F(hasin0 * hacos1);
-        }
-    }
-    ILINE static Quat_tpl<F> CreateRotationVDir(const Vec3_tpl<F>& vdir) {    Quat_tpl<F> q;  q.SetRotationVDir(vdir); return q;  }
-
-
-    ILINE void SetRotationVDir(const Vec3_tpl<F>& vdir, F r)
-    {
-        SetRotationVDir(vdir);
-        F sy, cy;
-        sincos_tpl(r * (F)0.5, &sy, &cy);
-        F vx = v.x, vy = v.y;
-        v.x = F(vx * cy - v.z * sy);
-        v.y = F(w * sy + vy * cy);
-        v.z = F(v.z * cy + vx * sy);
-        w = F(w * cy - vy * sy);
-    }
-    ILINE static Quat_tpl<F> CreateRotationVDir(const Vec3_tpl<F>& vdir, F roll) {    Quat_tpl<F> q; q.SetRotationVDir(vdir, roll);    return q;   }
-
-
-
-
-    /*!
-    * normalize quaternion.
-    *
-    * Example 1:
-    *  Quat q; q.Normalize();
-    *
-    * Example 2:
-    *  Quat q=Quat(1,2,3,4);
-    *  Quat qn=q.GetNormalized();
-    */
-    ILINE void Normalize(void)
-    {
-        F d = isqrt_tpl(w * w + v.x * v.x + v.y * v.y + v.z * v.z);
-        w *= d;
-        v.x *= d;
-        v.y *= d;
-        v.z *= d;
-    }
-    ILINE Quat_tpl<F> GetNormalized() const
-    {
-        Quat_tpl<F> t = *this;
-        t.Normalize();
-        return t;
-    }
-
-
-    ILINE void NormalizeSafe(void)
-    {
-        F d = w * w + v.x * v.x + v.y * v.y + v.z * v.z;
-        if (d > 1e-8f)
-        {
-            d = isqrt_tpl(d);
-            w *= d;
-            v.x *= d;
-            v.y *= d;
-            v.z *= d;
-        }
-        else
-        {
-            SetIdentity();
-        }
-    }
-    ILINE Quat_tpl<F> GetNormalizedSafe() const
-    {
-        Quat_tpl<F> t = *this;
-        t.NormalizeSafe();
-        return t;
-    }
-
-
-    ILINE void  NormalizeFast(void)
-    {
-        assert(this->IsValid());
-        F fInvLen = isqrt_fast_tpl(v.x * v.x + v.y * v.y + v.z * v.z + w * w);
-        v.x *= fInvLen;
-        v.y *= fInvLen;
-        v.z *= fInvLen;
-        w *= fInvLen;
-    }
-    ILINE Quat_tpl<F> GetNormalizedFast() const
-    {
-        Quat_tpl<F> t = *this;
-        t.NormalizeFast();
-        return t;
-    }
-
-
-    /*!
-    * get length of quaternion.
-    *
-    * Example 1:
-    *  f32 l=q.GetLength();
-    */
-    ILINE F GetLength() const
-    {
-        return sqrt_tpl(w * w + v.x * v.x + v.y * v.y + v.z * v.z);
-    }
-
-    ILINE static bool IsEquivalent(const Quat_tpl<F>& q1, const Quat_tpl<F>& q2, F qe = RAD_EPSILON)
-    {
-        Quat_tpl<f64> q1r = q1;
-        Quat_tpl<f64> q2r = q2;
-        f64 rad = acos(min(1.0, fabs_tpl(q1r.v.x * q2r.v.x + q1r.v.y * q2r.v.y + q1r.v.z * q2r.v.z + q1r.w * q2r.w)));
-        bool qdif = rad <= qe;
-        return qdif;
-    }
-
-
-    // Exponent of Quaternion.
-    ILINE static Quat_tpl<F> exp(const Vec3_tpl<F>& v)
-    {
-        F lensqr = v.len2();
-        if (lensqr > F(0))
-        {
-            F len = sqrt_tpl(lensqr);
-            F s, c;
-            sincos_tpl(len, &s, &c);
-            s /= len;
-            return Quat_tpl<F>(c, v.x * s, v.y * s, v.z * s);
-        }
-        return Quat_tpl<F> (IDENTITY);
-    }
-
-    // logarithm of a quaternion, imaginary part (the real part of the logarithm is always 0)
-    ILINE static Vec3_tpl<F> log (const Quat_tpl<F>& q)
-    {
-        assert(q.IsValid());
-        F lensqr = q.v.len2();
-        if (lensqr > 0.0f)
-        {
-            F len = sqrt_tpl(lensqr);
-            F angle = atan2_tpl(len, q.w) / len;
-            return q.v * angle;
-        }
-        // logarithm of a quaternion, imaginary part (the real part of the logarithm is always 0)
-        return Vec3_tpl<F>(0, 0, 0);
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Logarithm of Quaternion difference.
-    ILINE static Quat_tpl<F> LnDif(const Quat_tpl<F>& q1, const Quat_tpl<F>& q2)
-    {
-        return Quat_tpl<F>(0, log(q2 / q1));
-    }
-
-
-
-
-    /*!
-    * linear-interpolation between quaternions (lerp)
-    *
-    * Example:
-    *  CQuaternion result,p,q;
-    *  result=qlerp( p, q, 0.5f );
-    */
-    ILINE void SetNlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
-    {
-        Quat_tpl<F> q = tq;
-        assert(p.IsValid());
-        assert(q.IsValid());
-        if ((p | q) < 0)
-        {
-            q = -q;
-        }
-        v.x = p.v.x * (1.0f - t) + q.v.x * t;
-        v.y = p.v.y * (1.0f - t) + q.v.y * t;
-        v.z = p.v.z * (1.0f - t) + q.v.z * t;
-        w       = p.w  * (1.0f - t) + q.w  * t;
-        Normalize();
-    }
-
-    ILINE static Quat_tpl<F> CreateNlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
-    {
-        Quat_tpl<F> d;
-        d.SetNlerp(p, tq, t);
-        return d;
-    }
-
-
-    /*!
-    * linear-interpolation between quaternions (nlerp)
-    * in this case we convert the t-value into a 1d cubic spline to get closer to Slerp
-    *
-    * Example:
-    *  Quat result,p,q;
-    *  result.SetNlerpCubic( p, q, 0.5f );
-    */
-    ILINE void SetNlerpCubic(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
-    {
-        Quat_tpl<F> q = tq;
-        assert((fabs_tpl(1 - (p | p))) < 0.001); //check if unit-quaternion
-        assert((fabs_tpl(1 - (q | q))) < 0.001); //check if unit-quaternion
-        F cosine = (p | q);
-        if (cosine < 0)
-        {
-            q = -q;
-        }
-        F k = (1 - fabs_tpl(cosine)) * F(0.4669269);
-        F s = 2 * k * t * t * t - 3 * k * t * t + (1 + k) * t;
-        v.x = p.v.x * (1.0f - s) + q.v.x * s;
-        v.y = p.v.y * (1.0f - s) + q.v.y * s;
-        v.z = p.v.z * (1.0f - s) + q.v.z * s;
-        w       = p.w  * (1.0f - s) + q.w * s;
-        Normalize();
-    }
-    ILINE static Quat_tpl<F> CreateNlerpCubic(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
-    {
-        Quat_tpl<F> d;
-        d.SetNlerpCubic(p, tq, t);
-        return d;
-    }
-
-
-    /*!
-    * spherical-interpolation between quaternions (geometrical slerp)
-    *
-    * Example:
-    *  Quat result,p,q;
-    *  result.SetSlerp( p, q, 0.5f );
-    */
-    ILINE void SetSlerp(const Quat_tpl<F>& tp, const Quat_tpl<F>& tq, F t)
-    {
-        assert(tp.IsValid());
-        assert(tq.IsUnit());
-        Quat_tpl<F> p = tp, q = tq;
-        Quat_tpl<F> q2;
-
-        F cosine = (p | q);
-        if (cosine < 0.0f)
-        {
-            cosine = -cosine;
-            q = -q;
-        }                                             //take shortest arc
-        if (cosine > 0.9999f)
-        {
-            SetNlerp(p, q, t);
-            return;
-        }
-        // from now on, a division by 0 is not possible any more
-        q2.w        = q.w - p.w * cosine;
-        q2.v.x  = q.v.x - p.v.x * cosine;
-        q2.v.y  = q.v.y - p.v.y * cosine;
-        q2.v.z  = q.v.z - p.v.z * cosine;
-        F sine  = sqrt(q2 | q2);
-
-        // Actually you can divide by 0 right here.
-        assert(sine != 0.0000f);
-
-        F s, c;
-        sincos_tpl(atan2_tpl(sine, cosine) * t, &s, &c);
-        w =   F(p.w  * c + q2.w  * s / sine);
-        v.x = F(p.v.x * c + q2.v.x * s / sine);
-        v.y = F(p.v.y * c + q2.v.y * s / sine);
-        v.z = F(p.v.z * c + q2.v.z * s / sine);
-    }
-
-    ILINE static Quat_tpl<F> CreateSlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
-    {
-        Quat_tpl<F> d;
-        d.SetSlerp(p, tq, t);
-        return d;
-    }
-
-    /*!
-    * spherical-interpolation between quaternions (algebraic slerp_a)
-    * I have included this function just for the sake of completeness, because
-    * its the only useful application to check if exp & log really work.
-    * Both slerp-functions are returning the same result.
-    *
-    * Example:
-    *  Quat result,p,q;
-    *  result.SetExpSlerp( p,q,0.3345f );
-    */
-    ILINE void SetExpSlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
-    {
-        assert((fabs_tpl(1 - (p | p))) < 0.001); //check if unit-quaternion
-        assert((fabs_tpl(1 - (tq | tq))) < 0.001); //check if unit-quaternion
-        Quat_tpl<F> q = tq;
-        if ((p | q) < 0)
-        {
-            q = -q;
-        }
-        *this = p * exp(log(!p * q) * t);                     //algebraic slerp (1)
-        //...and some more exp-slerp-functions producing all the same result
-        //*this = exp( log (p* !q) * (1-t)) * q;    //algebraic slerp (2)
-        //*this = exp( log (q* !p) * t) * p;            //algebraic slerp (3)
-        //*this = q * exp( log (!q*p) * (1-t));     //algebraic slerp (4)
-    }
-    ILINE static Quat_tpl<F> CreateExpSlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& q, F t)
-    {
-        Quat_tpl<F> d;
-        d.SetExpSlerp(p, q, t);
-        return d;
-    }
-
-
-    //! squad(p,a,b,q,t) = slerp( slerp(p,q,t),slerp(a,b,t), 2(1-t)t).
-    ILINE void SetSquad(const Quat_tpl<F>& p, const Quat_tpl<F>& a, const Quat_tpl<F>& b, const Quat_tpl<F>& q, F t)
-    {
-        SetSlerp(CreateSlerp(p, q, t), CreateSlerp(a, b, t), 2.0f * (1.0f - t) * t);
-    }
-
-    ILINE static Quat_tpl<F> CreateSquad(const Quat_tpl<F>& p, const Quat_tpl<F>& a, const Quat_tpl<F>& b, const Quat_tpl<F>& q, F t)
-    {
-        Quat_tpl<F> d;
-        d.SetSquad(p, a, b, q, t);
-        return d;
-    }
-
-
-    //useless, please delete
-    ILINE Quat_tpl<F> GetScaled(F scale) const
-    {
-        return CreateNlerp(IDENTITY, *this, scale);
-    }
-
-
-    AUTO_STRUCT_INFO
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Typedefs                                                                  //
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef MAX_API_NUM
-typedef Quat_tpl<f32>  Quat;  //always 32 bit
-typedef Quat_tpl<f64>  Quatd; //always 64 bit
-typedef Quat_tpl<real> Quatr; //variable float precision. depending on the target system it can be between 32, 64 or 80 bit
-#endif
-
-typedef Quat_tpl<f32>   CryQuat;
-typedef Quat_tpl<f32> quaternionf;
-typedef Quat_tpl<real>  quaternion;
-
-// alligned versions
-#ifndef MAX_API_NUM
-typedef DEFINE_ALIGNED_DATA (Quat, QuatA, 16);               // typedef __declspec(align(16)) Quat_tpl<f32>     CryQuatA;
-typedef DEFINE_ALIGNED_DATA (Quatd, QuatrA, 32); // typedef __declspec(align(16)) Quat_tpl<f32>     quaternionfA;
-#endif
-
-
-
-/*!
-*
-* The "inner product" or "dot product" operation.
-*
-* calculate the "inner product" between two Quaternion.
-* If both Quaternion are unit-quaternions, the result is the cosine: p*q=cos(angle)
-*
-* Example:
-*  Quat p(1,0,0,0),q(1,0,0,0);
-*  f32 cosine = ( p | q );
-*
-*/
-template<typename F1, typename F2>
-ILINE F1 operator | (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    assert(q.v.IsValid());
-    assert(p.v.IsValid());
-    return (q.v.x * p.v.x + q.v.y * p.v.y + q.v.z * p.v.z + q.w * p.w);
-}
-
-
-/*!
-*
-*  Implements the multiplication operator: Qua=QuatA*QuatB
-*
-*  AxB = operation B followed by operation A.
-*  A multiplication takes 16 muls and 12 adds.
-*
-*  Example 1:
-*   Quat p(1,0,0,0),q(1,0,0,0);
-*   Quat result=p*q;
-*
-*  Example 2: (self-multiplication)
-*   Quat p(1,0,0,0),q(1,0,0,0);
-*   Quat p*=q;
-*/
-template<class F1, class F2>
-Quat_tpl<F1> ILINE operator * (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    assert(q.IsValid());
-    assert(p.IsValid());
-    return Quat_tpl<F1>
-           (
-        q.w * p.w  - (q.v.x * p.v.x + q.v.y * p.v.y + q.v.z * p.v.z),
-        q.v.y * p.v.z - q.v.z * p.v.y + q.w * p.v.x + q.v.x * p.w,
-        q.v.z * p.v.x - q.v.x * p.v.z + q.w * p.v.y + q.v.y * p.w,
-        q.v.x * p.v.y - q.v.y * p.v.x + q.w * p.v.z + q.v.z * p.w
-           );
-}
-template<class F1, class F2>
-ILINE void operator *= (Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    assert(q.IsValid());
-    assert(p.IsValid());
-    F1 s0 = q.w;
-    q.w = q.w * p.w - (q.v | p.v);
-    q.v = p.v * s0 + q.v * p.w + (q.v % p.v);
-}
-
-/*!
-*  Implements the multiplication operator: QuatT=Quat*Quatpos
-*
-*  AxB = operation B followed by operation A.
-*  A multiplication takes 31 muls and 27 adds (=58 float operations).
-*
-*  Example:
-*   Quat    quat        =   Quat::CreateRotationX(1.94192f);;
-*   QuatT quatpos   =   QuatT::CreateRotationZ(3.14192f,Vec3(11,22,33));
-*     QuatT qp          =   quat*quatpos;
-*/
-template<class F1, class F2>
-ILINE QuatT_tpl<F1> operator * (const Quat_tpl<F1>& q, const QuatT_tpl<F2>& p)
-{
-    return QuatT_tpl<F1>(q * p.q, q * p.t);
-}
-
-
-
-/*!
-*  division operator
-*
-*  Example 1:
-*   Quat p(1,0,0,0),q(1,0,0,0);
-*   Quat result=p/q;
-*
-*  Example 2: (self-division)
-*   Quat p(1,0,0,0),q(1,0,0,0);
-*   Quat p/=q;
-*/
-template<class F1, class F2>
-ILINE Quat_tpl<F1> operator / (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    return (!p * q);
-}
-template<class F1, class F2>
-ILINE void operator /= (Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    q = (!p * q);
-}
-
-
-/*!
-*  addition operator
-*
-*  Example:
-*   Quat p(1,0,0,0),q(1,0,0,0);
-*   Quat result=p+q;
-*
-*  Example:(self-addition operator)
-*   Quat p(1,0,0,0),q(1,0,0,0);
-*   Quat p-=q;
-*/
-template<class F1, class F2>
-ILINE Quat_tpl<F1> operator + (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    return Quat_tpl<F1>(q.w + p.w, q.v + p.v);
-}
-template<class F1, class F2>
-ILINE void operator += (Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    q.w += p.w;
-    q.v += p.v;
-}
-
-
-
-/*!
-*  subtraction operator
-*
-*  Example:
-*   Quat p(1,0,0,0),q(1,0,0,0);
-*   Quat result=p-q;
-*
-*  Example: (self-subtraction operator)
-*   Quat p(1,0,0,0),q(1,0,0,0);
-*   Quat p-=q;
-*
-*/
-template<class F1, class F2>
-ILINE Quat_tpl<F1> operator - (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    return Quat_tpl<F1>(q.w - p.w, q.v - p.v);
-}
-template<class F1, class F2>
-ILINE void operator -= (Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
-{
-    q.w -= p.w;
-    q.v -= p.v;
-}
-
-
-//! Scale quaternion free function.
-template <typename F>
-ILINE Quat_tpl<F> operator * (F t, const Quat_tpl<F>& q)
-{
-    return Quat_tpl<F>(t * q.w, t * q.v);
-};
-
-
-template <typename F1, typename F2>
-ILINE Quat_tpl<F1>   operator * (const Quat_tpl<F1>& q, F2 t)
-{
-    return Quat_tpl<F1>(q.w * t, q.v * t);
-};
-template <typename F1, typename F2>
-ILINE Quat_tpl<F1>   operator / (const Quat_tpl<F1>& q, F2 t)
-{
-    return Quat_tpl<F1>(q.w / t, q.v / t);
-};
-
-
-/*!
-*
-* post-multiply of a quaternion and a Vec3 (3D rotations with quaternions)
-*
-* Example:
-*  Quat q(1,0,0,0);
-*  Vec3 v(33,44,55);
-*    Vec3 result = q*v;
-*/
-template<class F, class F2>
-ILINE Vec3_tpl<F> operator * (const Quat_tpl<F>& q, const Vec3_tpl<F2>& v)
-{
-    assert(v.IsValid());
-    assert(q.IsValid());
-    //muls=15 / adds=15
-    Vec3_tpl<F> out, r2;
-    r2.x = (q.v.y * v.z - q.v.z * v.y) + q.w * v.x;
-    r2.y = (q.v.z * v.x - q.v.x * v.z) + q.w * v.y;
-    r2.z = (q.v.x * v.y - q.v.y * v.x) + q.w * v.z;
-    out.x = (r2.z * q.v.y - r2.y * q.v.z);
-    out.x += out.x + v.x;
-    out.y = (r2.x * q.v.z - r2.z * q.v.x);
-    out.y += out.y + v.y;
-    out.z = (r2.y * q.v.x - r2.x * q.v.y);
-    out.z += out.z + v.z;
-    return out;
-}
-
-
-/*!
-* pre-multiply of a quaternion and a Vec3 (3D rotations with quaternions)
-*
-* Example:
-*  Quat q(1,0,0,0);
-*  Vec3 v(33,44,55);
-*    Vec3 result = v*q;
-*/
-template<class F, class F2>
-ILINE Vec3_tpl<F2> operator * (const Vec3_tpl<F>& v, const Quat_tpl<F2>& q)
-{
-    assert(v.IsValid());
-    assert(q.IsValid());
-    //muls=15 / adds=15
-    Vec3_tpl<F> out, r2;
-    r2.x = (q.v.z * v.y - q.v.y * v.z) + q.w * v.x;
-    r2.y = (q.v.x * v.z - q.v.z * v.x) + q.w * v.y;
-    r2.z = (q.v.y * v.x - q.v.x * v.y) + q.w * v.z;
-    out.x = (r2.y * q.v.z - r2.z * q.v.y);
-    out.x += out.x + v.x;
-    out.y = (r2.z * q.v.x - r2.x * q.v.z);
-    out.y += out.y + v.y;
-    out.z = (r2.x * q.v.y - r2.y * q.v.x);
-    out.z += out.z + v.z;
-    return out;
-}
-
-
-
-template<class F1, class F2>
-ILINE Quat_tpl<F1> operator % (const Quat_tpl<F1>& q, const Quat_tpl<F2>& tp)
-{
-    Quat_tpl<F1> p = tp;
-    if ((p | q) < 0)
-    {
-        p = -p;
-    }
-    return Quat_tpl<F1>(q.w + p.w, q.v + p.v);
-}
-template<class F1, class F2>
-ILINE void operator %= (Quat_tpl<F1>& q, const Quat_tpl<F2>& tp)
-{
-    Quat_tpl<F1> p = tp;
-    if ((p | q) < 0)
-    {
-        p = -p;
-    }
-    q = Quat_tpl<F1>(q.w + p.w, q.v + p.v);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//----------------------------------------------------------------------
-// Quaternion with translation vector
-//----------------------------------------------------------------------
-template <typename F>
-struct QuatT_tpl
-{
-    Quat_tpl<F> q; //this is the quaternion
-    Vec3_tpl<F> t; //this is the translation vector and a scalar (for uniform scaling?)
-
-    ILINE QuatT_tpl(){}
-
-    //initialize with zeros
-    ILINE QuatT_tpl(type_zero)
-    {
-        q.w = 0, q.v.x = 0, q.v.y = 0, q.v.z = 0, t.x = 0, t.y = 0, t.z = 0;
-    }
-    ILINE QuatT_tpl(type_identity)
-    {
-        q.w = 1, q.v.x = 0, q.v.y = 0, q.v.z = 0, t.x = 0, t.y = 0, t.z = 0;
-    }
-
-    ILINE QuatT_tpl(const Vec3_tpl<F>& _t, const Quat_tpl<F>& _q) { q = _q; t = _t; }
-
-    //CONSTRUCTOR: implement the copy/casting/assignment constructor:
-    template <typename F1>
-    ILINE QuatT_tpl(const QuatT_tpl<F1>& qt)
-        : q(qt.q)
-        , t(qt.t) {}
-
-    //convert unit DualQuat back to QuatT
-    ILINE QuatT_tpl(const DualQuat_tpl<F>& qd)
-    {
-        //copy quaternion part
-        q = qd.nq;
-        //convert translation vector:
-        t = (qd.nq.w * qd.dq.v - qd.dq.w * qd.nq.v + qd.nq.v % qd.dq.v) * 2; //perfect for HLSL
-    }
-
-    explicit ILINE QuatT_tpl(const QuatTS_tpl<F>& qts)
-        : q(qts.q)
-        , t(qts.t) {}
-
-    explicit ILINE QuatT_tpl(const Matrix34_tpl<F>& m)
-    {
-        q = Quat_tpl<F>(Matrix33(m));
-        t = m.GetTranslation();
-    }
-
-    ILINE QuatT_tpl(const Quat_tpl<F>& quat, const Vec3_tpl<F>& trans)
-    {
-        q = quat;
-        t = trans;
-    }
-
-    ILINE void SetIdentity()
-    {
-        q.w = 1;
-        q.v.x = 0;
-        q.v.y = 0;
-        q.v.z = 0;
-        t.x = 0;
-        t.y = 0;
-        t.z = 0;
-    }
-
-    ILINE bool IsIdentity() const
-    {
-        return (q.IsIdentity() && t.IsZero());
-    }
-
-    /*!
-    * Convert three Euler angle to mat33 (rotation order:XYZ)
-    * The Euler angles are assumed to be in radians.
-    * The translation-vector is set to zero by default.
-    *
-    *  Example 1:
-    *       QuatT qp;
-    *       qp.SetRotationXYZ( Ang3(0.5f,0.2f,0.9f), translation );
-    *
-    *  Example 2:
-    *       QuatT qp=QuatT::CreateRotationXYZ( Ang3(0.5f,0.2f,0.9f), translation );
-    */
-    ILINE void SetRotationXYZ(const Ang3_tpl<F>& rad, const Vec3_tpl<F>& trans = Vec3(ZERO))
-    {
-        assert(rad.IsValid());
-        assert(trans.IsValid());
-        q.SetRotationXYZ(rad);
-        t = trans;
-    }
-    ILINE static QuatT_tpl<F> CreateRotationXYZ(const Ang3_tpl<F>& rad, const Vec3_tpl<F>& trans = Vec3(ZERO))
-    {
-        assert(rad.IsValid());
-        assert(trans.IsValid());
-        QuatT_tpl<F> qp;
-        qp.SetRotationXYZ(rad, trans);
-        return qp;
-    }
-
-
-
-    ILINE void SetRotationAA(F cosha, F sinha, const Vec3_tpl<F> axis, const Vec3_tpl<F>& trans = Vec3(ZERO))
-    {
-        q.SetRotationAA(cosha, sinha, axis);
-        t = trans;
-    }
-    ILINE static QuatT_tpl<F> CreateRotationAA(F cosha, F sinha, const Vec3_tpl<F> axis, const Vec3_tpl<F>& trans = Vec3(ZERO))
-    {
-        QuatT_tpl<F> qt;
-        qt.SetRotationAA(cosha, sinha, axis, trans);
-        return qt;
-    }
-
-
-    ILINE void Invert()
-    { // in-place transposition
-        assert(q.IsValid());
-        t = -t * q;
-        q = !q;
-    }
-    ILINE QuatT_tpl<F> GetInverted() const
-    {
-        assert(q.IsValid());
-        QuatT_tpl<F> qpos;
-        qpos.q = !q;
-        qpos.t = -t * q;
-        return qpos;
-    }
-
-    ILINE void SetTranslation(const Vec3_tpl<F>& trans)   {   t = trans;    }
-
-    ILINE Vec3_tpl<F> GetColumn0() const {return q.GetColumn0(); }
-    ILINE Vec3_tpl<F> GetColumn1() const {return q.GetColumn1(); }
-    ILINE Vec3_tpl<F> GetColumn2() const {return q.GetColumn2(); }
-    ILINE Vec3_tpl<F> GetColumn3() const {return t; }
-    ILINE Vec3_tpl<F> GetRow0() const { return q.GetRow0(); }
-    ILINE Vec3_tpl<F> GetRow1() const { return q.GetRow1(); }
-    ILINE Vec3_tpl<F> GetRow2() const { return q.GetRow2(); }
-
-    ILINE static bool IsEquivalent(const QuatT_tpl<F>& qt1, const QuatT_tpl<F>& qt2, F qe = RAD_EPSILON, F ve = VEC_EPSILON)
-    {
-        real rad = acos(min(1.0f, fabs_tpl(qt1.q | qt2.q)));
-        bool qdif = rad <= qe;
-        bool vdif   = fabs_tpl(qt1.t.x - qt2.t.x) <= ve && fabs_tpl(qt1.t.y - qt2.t.y) <= ve && fabs_tpl(qt1.t.z - qt2.t.z) <= ve;
-        return (qdif && vdif);
-    }
-
-    ILINE bool IsValid() const
-    {
-        if (!t.IsValid())
-        {
-            return false;
-        }
-        if (!q.IsValid())
-        {
-            return false;
-        }
-        return true;
-    }
-
-    /*!
-    * linear-interpolation between quaternions (lerp)
-    *
-    * Example:
-    *  CQuaternion result,p,q;
-    *  result=qlerp( p, q, 0.5f );
-    */
-    ILINE void SetNLerp(const QuatT_tpl<F>& p, const QuatT_tpl<F>& tq, F ti)
-    {
-        assert(p.q.IsValid());
-        assert(tq.q.IsValid());
-        Quat_tpl<F> d = tq.q;
-        if ((p.q | d) < 0)
-        {
-            d = -d;
-        }
-        Vec3_tpl<F> vDiff = d.v - p.q.v;
-        q.v = p.q.v + (vDiff * ti);
-        q.w = p.q.w + ((d.w - p.q.w) * ti);
-        q.Normalize();
-        vDiff = tq.t - p.t;
-        t = p.t + (vDiff * ti);
-    }
-    ILINE static QuatT_tpl<F> CreateNLerp(const QuatT_tpl<F>& p, const QuatT_tpl<F>& q, F t)
-    {
-        QuatT_tpl<F> d;
-        d.SetNLerp(p, q, t);
-        return d;
-    }
-
-    //NOTE: all vectors are stored in columns
-    ILINE void SetFromVectors(const Vec3& vx, const Vec3& vy, const Vec3& vz, const Vec3& pos)
-    {
-        Matrix34 m34;
-        m34.m00 = vx.x;
-        m34.m01 = vy.x;
-        m34.m02 = vz.x;
-        m34.m03 = pos.x;
-        m34.m10 = vx.y;
-        m34.m11 = vy.y;
-        m34.m12 = vz.y;
-        m34.m13 = pos.y;
-        m34.m20 = vx.z;
-        m34.m21 = vy.z;
-        m34.m22 = vz.z;
-        m34.m23 = pos.z;
-        *this = QuatT_tpl<F>(m34);
-    }
-    ILINE static QuatT_tpl<F> CreateFromVectors(const Vec3_tpl<F>& vx, const Vec3_tpl<F>& vy, const Vec3_tpl<F>& vz, const Vec3_tpl<F>& pos)
-    {
-        QuatT_tpl<F> qt;
-        qt.SetFromVectors(vx, vy, vz, pos);
-        return qt;
-    }
-
-    QuatT_tpl<F> GetScaled(F scale)
-    {
-        return QuatT_tpl<F>(t * scale, q.GetScaled(scale));
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-typedef QuatT_tpl<f32>  QuatT; //always 32 bit
-typedef QuatT_tpl<f64>  QuatTd;//always 64 bit
-typedef QuatT_tpl<real> QuatTr;//variable float precision. depending on the target system it can be between 32, 64 or bit
-
-// alligned versions
-typedef DEFINE_ALIGNED_DATA (QuatT, QuatTA, 32);                 //wastest 4byte per quatT // typedef __declspec(align(16)) Quat_tpl<f32>       QuatTA;
-typedef DEFINE_ALIGNED_DATA (QuatTd, QuatTrA, 16);           // typedef __declspec(align(16)) Quat_tpl<f32>     QuatTrA;
-
-
-/*!
-*
-*  Implements the multiplication operator: QuatT=Quatpos*Quat
-*
-*  AxB = operation B followed by operation A.
-*  A multiplication takes 16 muls and 12 adds (=28 float operations).
-*
-*  Example:
-*   Quat    quat        =   Quat::CreateRotationX(1.94192f);;
-*   QuatT quatpos   =   QuatT::CreateRotationZ(3.14192f,Vec3(11,22,33));
-*     QuatT qp          =   quatpos*quat;
-*/
-template<class F1, class F2>
-ILINE QuatT_tpl<F1> operator * (const QuatT_tpl<F1>& p, const Quat_tpl<F2>& q)
-{
-    assert(p.IsValid());
-    assert(q.IsValid());
-    return QuatT_tpl<F1>(p.q * q, p.t);
-}
-
-/*!
-*  Implements the multiplication operator: QuatT=QuatposA*QuatposB
-*
-*  AxB = operation B followed by operation A.
-*  A multiplication takes 31 muls and 30 adds  (=61 float operations).
-*
-*  Example:
-*   QuatT quatposA  =   QuatT::CreateRotationX(1.94192f,Vec3(77,55,44));
-*   QuatT quatposB  =   QuatT::CreateRotationZ(3.14192f,Vec3(11,22,33));
-*     QuatT qp              =   quatposA*quatposB;
-*/
-template<class F1, class F2>
-ILINE QuatT_tpl<F1> operator * (const QuatT_tpl<F1>& q, const QuatT_tpl<F2>& p)
-{
-    assert(q.IsValid());
-    assert(p.IsValid());
-    return QuatT_tpl<F1>(q.q * p.q, q.q * p.t + q.t);
-}
-
-
-
-/*!
-* post-multiply of a QuatT and a Vec3 (3D rotations with quaternions)
-*
-* Example:
-*  Quat q(1,0,0,0);
-*  Vec3 v(33,44,55);
-*    Vec3 result = q*v;
-*/
-template<class F, class F2>
-Vec3_tpl<F> operator * (const QuatT_tpl<F>& q, const Vec3_tpl<F2>& v)
-{
-    assert(v.IsValid());
-    assert(q.IsValid());
-    //muls=15 / adds=15+3
-    Vec3_tpl<F> out, r2;
-    r2.x = (q.q.v.y * v.z - q.q.v.z * v.y) + q.q.w * v.x;
-    r2.y = (q.q.v.z * v.x - q.q.v.x * v.z) + q.q.w * v.y;
-    r2.z = (q.q.v.x * v.y - q.q.v.y * v.x) + q.q.w * v.z;
-    out.x = (r2.z * q.q.v.y - r2.y * q.q.v.z);
-    out.x += out.x + v.x + q.t.x;
-    out.y = (r2.x * q.q.v.z - r2.z * q.q.v.x);
-    out.y += out.y + v.y + q.t.y;
-    out.z = (r2.y * q.q.v.x - r2.x * q.q.v.y);
-    out.z += out.z + v.z + q.t.z;
-    return out;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//----------------------------------------------------------------------
-// Quaternion with translation vector and scale
-// Similar to QuatT, but s is not ignored.
-// Most functions then differ, so we don't inherit.
-//----------------------------------------------------------------------
-template <typename F>
-struct QuatTS_tpl
-{
-    Quat_tpl<F> q;
-    Vec3_tpl<F> t;
-    F                       s;
-
-    //constructors
-#if defined(_DEBUG)
-    ILINE QuatTS_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&q.v.x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-            p[3] = F32NAN;
-            p[4] = F32NAN;
-            p[5] = F32NAN;
-            p[6] = F32NAN;
-            p[7] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&q.v.x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-            p[3] = F64NAN;
-            p[4] = F64NAN;
-            p[5] = F64NAN;
-            p[6] = F64NAN;
-            p[7] = F64NAN;
-        }
-    }
-#else
-    ILINE QuatTS_tpl(){}
-#endif
-
-    ILINE QuatTS_tpl(const Quat_tpl<F>& quat, const Vec3_tpl<F>& trans, F scale = 1)    { q = quat; t = trans; s = scale; }
-    ILINE QuatTS_tpl(type_identity) { SetIdentity(); }
-
-    //CONSTRUCTOR: implement the copy/casting/assignment constructor:
-    template <typename F1>
-    ILINE QuatTS_tpl(const QuatTS_tpl<F1>& qts)
-        :  q(qts.q)
-        , t(qts.t)
-        , s(qts.s)    {}
-
-    ILINE QuatTS_tpl& operator = (const QuatT_tpl<F>& qt)
-    {
-        q = qt.q;
-        t = qt.t;
-        s = 1.0f;
-        return *this;
-    }
-    ILINE QuatTS_tpl(const QuatT_tpl<F>& qp)  { q = qp.q; t = qp.t; s = 1.0f; }
-
-
-    ILINE void SetIdentity()
-    {
-        q.SetIdentity();
-        t = Vec3(ZERO);
-        s = 1;
-    }
-
-    explicit ILINE QuatTS_tpl(const Matrix34_tpl<F>& m)
-    {
-        t = m.GetTranslation();
-
-        // The determinant of a matrix is the volume spanned by its base vectors.
-        // We need an approximate length scale, so we calculate the cube root of the determinant.
-        s = pow(m.Determinant(), F(1.0 / 3.0));
-
-        // Orthonormalize using X and Z as anchors.
-        const Vec3_tpl<F>& r0 = m.GetRow(0);
-        const Vec3_tpl<F>& r2 = m.GetRow(2);
-
-        const Vec3_tpl<F> v0 = r0.GetNormalized();
-        const Vec3_tpl<F> v1 = (r2 % r0).GetNormalized();
-        const Vec3_tpl<F> v2 = (v0 % v1);
-
-        Matrix33_tpl<F> m3;
-        m3.SetRow(0, v0);
-        m3.SetRow(1, v1);
-        m3.SetRow(2, v2);
-
-        q = Quat_tpl<F>(m3);
-    }
-
-    void Invert()
-    {
-        s = 1 / s;
-        q = !q;
-        t = q * t * -s;
-    }
-    QuatTS_tpl<F> GetInverted() const
-    {
-        QuatTS_tpl<F> inv;
-        inv.s = 1 / s;
-        inv.q = !q;
-        inv.t = inv.q * t * -inv.s;
-        return inv;
-    }
-
-
-    /*!
-    * linear-interpolation between quaternions (nlerp)
-    *
-    * Example:
-    *  CQuaternion result,p,q;
-    *  result=qlerp( p, q, 0.5f );
-    */
-    ILINE void SetNLerp(const QuatTS_tpl<F>& p, const QuatTS_tpl<F>& tq, F ti)
-    {
-        assert(p.q.IsValid());
-        assert(tq.q.IsValid());
-        Quat_tpl<F> d = tq.q;
-        if ((p.q | d) < 0)
-        {
-            d = -d;
-        }
-        Vec3_tpl<F> vDiff = d.v - p.q.v;
-        q.v = p.q.v + (vDiff * ti);
-        q.w = p.q.w + ((d.w - p.q.w) * ti);
-        q.Normalize();
-
-        vDiff = tq.t - p.t;
-        t = p.t + (vDiff * ti);
-
-        s     = p.s + ((tq.s - p.s) * ti);
-    }
-
-    ILINE static QuatTS_tpl<F> CreateNLerp(const QuatTS_tpl<F>& p, const QuatTS_tpl<F>& q, F t)
-    {
-        QuatTS_tpl<F> d;
-        d.SetNLerp(p, q, t);
-        return d;
-    }
-
-
-
-    ILINE static bool IsEquivalent(const QuatTS_tpl<F>& qts1, const QuatTS_tpl<F>& qts2, F qe = RAD_EPSILON, F ve = VEC_EPSILON)
-    {
-        f64 rad  =  acos(min(1.0f, fabs_tpl(qts1.q | qts2.q)));
-        bool qdif = rad <= qe;
-        bool vdif   = fabs_tpl(qts1.t.x - qts2.t.x) <= ve && fabs_tpl(qts1.t.y - qts2.t.y) <= ve && fabs_tpl(qts1.t.z - qts2.t.z) <= ve;
-        bool sdif   = fabs_tpl(qts1.s - qts2.s) <= ve;
-        return (qdif && vdif && sdif);
-    }
-
-
-    bool IsValid(F e = VEC_EPSILON) const
-    {
-        if (!q.v.IsValid())
-        {
-            return false;
-        }
-        if (!NumberValid(q.w))
-        {
-            return false;
-        }
-        if (!q.IsUnit(e))
-        {
-            return false;
-        }
-        if (!t.IsValid())
-        {
-            return false;
-        }
-        if (!NumberValid(s))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    ILINE Vec3_tpl<F> GetColumn0() const {return q.GetColumn0(); }
-    ILINE Vec3_tpl<F> GetColumn1() const {return q.GetColumn1(); }
-    ILINE Vec3_tpl<F> GetColumn2() const {return q.GetColumn2(); }
-    ILINE Vec3_tpl<F> GetColumn3() const {return t; }
-    ILINE Vec3_tpl<F> GetRow0() const { return q.GetRow0(); }
-    ILINE Vec3_tpl<F> GetRow1() const { return q.GetRow1(); }
-    ILINE Vec3_tpl<F> GetRow2() const { return q.GetRow2(); }
-
-    AUTO_STRUCT_INFO
-};
-
-typedef QuatTS_tpl<f32>  QuatTS; //always 64 bit
-typedef QuatTS_tpl<f64>  QuatTSd;//always 64 bit
-typedef QuatTS_tpl<real> QuatTSr;//variable float precision. depending on the target system it can be between 32, 64 or 80 bit
-
-// alligned versions
-typedef DEFINE_ALIGNED_DATA (QuatTS, QuatTSA, 16);               // typedef __declspec(align(16)) Quat_tpl<f32>     QuatTSA;
-typedef DEFINE_ALIGNED_DATA (QuatTSd, QuatTSrA, 64);             // typedef __declspec(align(16)) QuatTS_tpl<f32>       QuatTSrA;
-
-template<class F1, class F2>
-ILINE QuatTS_tpl<F1> operator * (const QuatTS_tpl<F1>& a, const Quat_tpl<F2>& b)
-{
-    return QuatTS_tpl<F1>(a.q * b, a.t, a.s);
-}
-
-
-template<class F1, class F2>
-ILINE QuatTS_tpl<F1> operator * (const QuatTS_tpl<F1>& a, const QuatT_tpl<F2>& b)
-{
-    return QuatTS_tpl<F1>(a.q * b.q, a.q * (b.t * a.s) + a.t, a.s);
-}
-template<class F1, class F2>
-ILINE QuatTS_tpl<F1> operator * (const QuatT_tpl<F1>& a, const QuatTS_tpl<F2>& b)
-{
-    return QuatTS_tpl<F1>(a.q * b.q, a.q * b.t + a.t, b.s);
-}
-template<class F1, class F2>
-ILINE QuatTS_tpl<F1> operator * (const Quat_tpl<F1>& a, const QuatTS_tpl<F2>& b)
-{
-    return QuatTS_tpl<F1>(a * b.q, a * b.t, b.s);
-}
-
-/*!
-*  Implements the multiplication operator: QuatTS=QuatTS*QuatTS
-*/
-template<class F1, class F2>
-ILINE QuatTS_tpl<F1> operator * (const QuatTS_tpl<F1>& a, const QuatTS_tpl<F2>& b)
-{
-    assert(a.IsValid());
-    assert(b.IsValid());
-    return QuatTS_tpl<F1>(a.q * b.q, a.q * (b.t * a.s) + a.t, a.s * b.s);
-}
-
-/*!
-* post-multiply of a QuatT and a Vec3 (3D rotations with quaternions)
-*/
-template<class F, class F2>
-ILINE Vec3_tpl<F> operator * (const QuatTS_tpl<F>& q, const Vec3_tpl<F2>& v)
-{
-    assert(q.IsValid());
-    assert(v.IsValid());
-    return q.q * v * q.s + q.t;
-}
-
-
-//----------------------------------------------------------------------
-// Quaternion with translation vector and non-uniform scale
-//----------------------------------------------------------------------
-template <typename F>
-struct QuatTNS_tpl
-{
-    Quat_tpl<F> q;
-    Vec3_tpl<F> t;
-    Vec3_tpl<F> s;
-
-    //constructors
-#if defined(_DEBUG)
-    ILINE QuatTNS_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&q.v.x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-            p[3] = F32NAN;
-            p[4] = F32NAN;
-            p[5] = F32NAN;
-            p[6] = F32NAN;
-            p[7] = F32NAN;
-            p[8] = F32NAN;
-            p[9] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&q.v.x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-            p[3] = F64NAN;
-            p[4] = F64NAN;
-            p[5] = F64NAN;
-            p[6] = F64NAN;
-            p[7] = F64NAN;
-            p[8] = F64NAN;
-            p[9] = F64NAN;
-        }
-    }
-#else
-    ILINE QuatTNS_tpl() {};
-#endif
-
-    ILINE QuatTNS_tpl(const Quat_tpl<F>& quat, const Vec3_tpl<F>& trans, const Vec3_tpl<F>& scale = Vec3_tpl<F>(1)) { q = quat; t = trans; s = scale; }
-    ILINE QuatTNS_tpl(type_identity) { SetIdentity(); }
-
-    //CONSTRUCTOR: implement the copy/casting/assignment constructor:
-    template <typename F1>
-    ILINE QuatTNS_tpl(const QuatTS_tpl<F1>& qts)
-        :     q(qts.q)
-        , t(qts.t)
-        , s(qts.s)
-    {
-    }
-
-    ILINE QuatTNS_tpl& operator = (const QuatT_tpl<F>& qt)
-    {
-        q = qt.q;
-        t = qt.t;
-        s = Vec3_tpl<F>(1);
-        return *this;
-    }
-    ILINE QuatTNS_tpl(const QuatT_tpl<F>& qp) { q = qp.q; t = qp.t; s = Vec3_tpl<F>(1); }
-
-
-    ILINE void SetIdentity()
-    {
-        q.SetIdentity();
-        t = Vec3_tpl<F>(ZERO);
-        s = Vec3_tpl<F>(1);
-    }
-
-    explicit ILINE QuatTNS_tpl(const Matrix34_tpl<F>& m)
-    {
-        t = m.GetTranslation();
-
-        // Lengths of base vectors equates to scaling in matrix
-        s.x = m.GetColumn0().GetLength();
-        s.y = m.GetColumn1().GetLength();
-        s.z = m.GetColumn2().GetLength();
-
-        // Orthonormalize using X and Z as anchors.
-        const Vec3_tpl<F>& r0 = m.GetRow(0);
-        const Vec3_tpl<F>& r2 = m.GetRow(2);
-
-        const Vec3_tpl<F> v0 = r0.GetNormalized();
-        const Vec3_tpl<F> v1 = (r2 % r0).GetNormalized();
-        const Vec3_tpl<F> v2 = (v0 % v1);
-
-        Matrix33_tpl<F> m3;
-        m3.SetRow(0, v0);
-        m3.SetRow(1, v1);
-        m3.SetRow(2, v2);
-
-        q = Quat_tpl<F>(m3);
-    }
-
-    void Invert()
-    {
-        s = Vec3_tpl<F>(1) / s;
-        q = !q;
-        t = q * t * -s;
-    }
-    QuatTNS_tpl<F> GetInverted() const
-    {
-        QuatTNS_tpl<F> inv;
-        inv.s = Vec3_tpl<F>(1) / s;
-        inv.q = !q;
-        inv.t = inv.q * t * -inv.s;
-        return inv;
-    }
-
-
-    /*!
-    * linear-interpolation between quaternions (nlerp)
-    *
-    * Example:
-    *  CQuaternion result,p,q;
-    *  result=qlerp( p, q, 0.5f );
-    */
-    ILINE void SetNLerp(const QuatTNS_tpl<F>& p, const QuatTNS_tpl<F>& tq, F ti)
-    {
-        assert(p.q.IsValid());
-        assert(tq.q.IsValid());
-        Quat_tpl<F> d = tq.q;
-        if ((p.q | d) < 0)
-        {
-            d = -d;
-        }
-        Vec3_tpl<F> vDiff = d.v - p.q.v;
-        q.v = p.q.v + (vDiff * ti);
-        q.w = p.q.w + ((d.w - p.q.w) * ti);
-        q.Normalize();
-
-        vDiff = tq.t - p.t;
-        t = p.t + (vDiff * ti);
-
-        s     = p.s + ((tq.s - p.s) * ti);
-    }
-
-    ILINE static QuatTNS_tpl<F> CreateNLerp(const QuatTNS_tpl<F>& p, const QuatTNS_tpl<F>& q, F t)
-    {
-        QuatTNS_tpl<F> d;
-        d.SetNLerp(p, q, t);
-        return d;
-    }
-
-
-
-    ILINE static bool IsEquivalent(const QuatTNS_tpl<F>& qts1, const QuatTNS_tpl<F>& qts2, F qe = RAD_EPSILON, F ve = VEC_EPSILON)
-    {
-        real rad  = acos(min(1.0f, fabs_tpl(qts1.q | qts2.q)));
-        bool qdif = rad <= qe;
-        bool vdif   = fabs_tpl(qts1.t.x - qts2.t.x) <= ve && fabs_tpl(qts1.t.y - qts2.t.y) <= ve && fabs_tpl(qts1.t.z - qts2.t.z) <= ve;
-        bool sdif   = fabs_tpl(qts1.s.x - qts2.s.x) <= ve && fabs_tpl(qts1.s.y - qts2.s.y) <= ve && fabs_tpl(qts1.s.z - qts2.s.z) <= ve;
-        return (qdif && vdif && sdif);
-    }
-
-
-    bool IsValid(F e = VEC_EPSILON) const
-    {
-        if (!q.v.IsValid())
-        {
-            return false;
-        }
-        if (!NumberValid(q.w))
-        {
-            return false;
-        }
-        if (!q.IsUnit(e))
-        {
-            return false;
-        }
-        if (!t.IsValid())
-        {
-            return false;
-        }
-        if (!NumberValid(s.x))
-        {
-            return false;
-        }
-        if (!NumberValid(s.y))
-        {
-            return false;
-        }
-        if (!NumberValid(s.z))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    ILINE Vec3_tpl<F> GetColumn0() const {return q.GetColumn0(); }
-    ILINE Vec3_tpl<F> GetColumn1() const {return q.GetColumn1(); }
-    ILINE Vec3_tpl<F> GetColumn2() const {return q.GetColumn2(); }
-    ILINE Vec3_tpl<F> GetColumn3() const {return t; }
-    ILINE Vec3_tpl<F> GetRow0() const { return q.GetRow0(); }
-    ILINE Vec3_tpl<F> GetRow1() const { return q.GetRow1(); }
-    ILINE Vec3_tpl<F> GetRow2() const { return q.GetRow2(); }
-
-    AUTO_STRUCT_INFO
-};
-
-typedef QuatTNS_tpl<f32> QuatTNS;
-typedef QuatTNS_tpl<f64> QuatTNSr;
-typedef QuatTNS_tpl<f64> QuatTNS_f64;
-
-// alligned versions
-typedef DEFINE_ALIGNED_DATA (QuatTNS, QuatTNSA, 16);
-typedef DEFINE_ALIGNED_DATA (QuatTNSr, QuatTNSrA, 64);
-typedef DEFINE_ALIGNED_DATA (QuatTNS_f64, QuatTNS_f64A, 64);
-
-template<class F1, class F2>
-ILINE QuatTNS_tpl<F1> operator * (const QuatTNS_tpl<F1>& a, const Quat_tpl<F2>& b)
-{
-    return QuatTNS_tpl<F1>(a.q * b, a.t, a.s);
-}
-
-template<class F1, class F2>
-ILINE QuatTNS_tpl<F1> operator * (const Quat_tpl<F1>& a, const QuatTNS_tpl<F2>& b)
-{
-    return QuatTNS_tpl<F1>(a * b.q, a * b.t, b.s);
-}
-
-template<class F1, class F2>
-ILINE QuatTNS_tpl<F1> operator * (const QuatTNS_tpl<F1>& a, const QuatT_tpl<F2>& b)
-{
-    return QuatTNS_tpl<F1>(a.q * b.q, a.q * Vec3_tpl<F1>(b.x * a.s.x, b.y * a.s.y, b.z * a.s.z) + a.t, a.s);
-}
-
-template<class F1, class F2>
-ILINE QuatTNS_tpl<F1> operator * (const QuatT_tpl<F1>& a, const QuatTNS_tpl<F2>& b)
-{
-    return QuatTNS_tpl<F1>(a.q * b.q, a.q * b.t + a.t, b.s);
-}
-
-/*!
-*  Implements the multiplication operator: QuatTNS=QuatTNS*QuatTNS
-*/
-template<class F1, class F2>
-ILINE QuatTNS_tpl<F1> operator * (const QuatTNS_tpl<F1>& a, const QuatTNS_tpl<F2>& b)
-{
-    assert(a.IsValid());
-    assert(b.IsValid());
-    return QuatTNS_tpl<F1>(
-        a.q * b.q,
-        a.q * Vec3_tpl<F1>(b.t.x * a.s.x, b.t.y * a.s.y, b.t.z * a.s.z) + a.t,
-        Vec3_tpl<F1>(a.s.x * b.s.x, a.s.y * b.s.y, a.s.z * b.s.z)
-        );
-}
-
-/*!
-* post-multiply of a QuatTNS and a Vec3 (3D rotations with quaternions)
-*/
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator * (const QuatTNS_tpl<F1>& q, const Vec3_tpl<F2>& v)
-{
-    assert(q.IsValid());
-    assert(v.IsValid());
-    return q.q * Vec3_tpl<F1>(v.x * q.s.x, v.y * q.s.y, v.z * q.s.z) + q.t;
-}
-
-//----------------------------------------------------------------------
-// Dual Quaternion
-//----------------------------------------------------------------------
-template <typename F>
-struct DualQuat_tpl
-{
-    Quat_tpl<F> nq;
-    Quat_tpl<F> dq;
-
-    ILINE DualQuat_tpl()  {}
-
-    ILINE DualQuat_tpl(const Quat_tpl<F>& q, const Vec3_tpl<F>& t)
-    {
-        //copy the quaternion part
-        nq = q;
-        //convert the translation into a dual quaternion part
-        dq.w        = -0.5f * (t.x * q.v.x  + t.y * q.v.y + t.z * q.v.z);
-        dq.v.x  = 0.5f * (t.x * q.w        + t.y * q.v.z - t.z * q.v.y);
-        dq.v.y  = 0.5f * (-t.x * q.v.z  + t.y * q.w       + t.z * q.v.x);
-        dq.v.z  = 0.5f * (t.x * q.v.y  - t.y * q.v.x + t.z * q.w);
-    }
-
-    ILINE DualQuat_tpl(const QuatT_tpl<F>& qt)
-    {
-        //copy the quaternion part
-        nq = qt.q;
-        //convert the translation into a dual quaternion part
-        dq.w        = -0.5f * (qt.t.x * qt.q.v.x    + qt.t.y * qt.q.v.y   + qt.t.z * qt.q.v.z);
-        dq.v.x  = 0.5f * (qt.t.x * qt.q.w      - qt.t.z * qt.q.v.y + qt.t.y * qt.q.v.z);
-        dq.v.y  = 0.5f * (qt.t.y * qt.q.w      - qt.t.x * qt.q.v.z   + qt.t.z * qt.q.v.x);
-        dq.v.z  = 0.5f * (qt.t.x * qt.q.v.y    - qt.t.y * qt.q.v.x   + qt.t.z * qt.q.w);
-    }
-
-    explicit ILINE DualQuat_tpl( const Matrix34_tpl<F>& m34 )
-    {
-        // non-dual part (just copy q0):
-        nq = Quat_tpl<F>(m34);
-        f32 tx = m34.m03;
-        f32 ty = m34.m13;
-        f32 tz = m34.m23;
-
-        // dual part:
-        dq.w        = -0.5f * (tx * nq.v.x  + ty * nq.v.y + tz * nq.v.z);
-        dq.v.x  = 0.5f * (tx * nq.w        + ty * nq.v.z - tz * nq.v.y);
-        dq.v.y  = 0.5f * (-tx * nq.v.z  + ty * nq.w       + tz * nq.v.x);
-        dq.v.z  = 0.5f * (tx * nq.v.y  - ty * nq.v.x + tz * nq.w);
-    }
-
-
-    ILINE DualQuat_tpl(type_identity)
-    {
-        SetIdentity();
-    }
-
-    ILINE DualQuat_tpl(type_zero)
-    {
-        SetZero();
-    }
-
-    template <typename F1>
-    ILINE DualQuat_tpl(const DualQuat_tpl<F1>& QDual)
-        : nq(QDual.nq)
-        , dq(QDual.dq) {}
-
-    ILINE void SetIdentity()
-    {
-        nq.SetIdentity();
-        dq.w = 0.0f;
-        dq.v.x = 0.0f;
-        dq.v.y = 0.0f;
-        dq.v.z = 0.0f;
-    }
-
-    ILINE void SetZero()
-    {
-        nq.w = 0.0f;
-        nq.v.x = 0.0f;
-        nq.v.y = 0.0f;
-        nq.v.z = 0.0f;
-        dq.w = 0.0f;
-        dq.v.x = 0.0f;
-        dq.v.y = 0.0f;
-        dq.v.z = 0.0f;
-    }
-
-    ILINE void Normalize()
-    {
-        // Normalize both components so that nq is unit
-        F norm = isqrt_safe_tpl(nq.v.len2() + sqr(nq.w));
-        nq *= norm;
-        dq *= norm;
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-#ifndef MAX_API_NUM
-typedef DualQuat_tpl<f32>  DualQuat; //always 32 bit
-typedef DualQuat_tpl<f64>  DualQuatd;//always 64 bit
-typedef DualQuat_tpl<real> DualQuatr;//variable float precision. depending on the target system it can be between 32, 64 or 80 bit
-#else
-typedef DualQuat_tpl<f32> CryDualQuat;
-#endif
-
-template<class F1, class F2>
-ILINE DualQuat_tpl<F1> operator*(const DualQuat_tpl<F1>& l, const F2 r)
-{
-    DualQuat_tpl<F1> dual;
-    dual.nq.w  = l.nq.w  * r;
-    dual.nq.v.x = l.nq.v.x * r;
-    dual.nq.v.y = l.nq.v.y * r;
-    dual.nq.v.z = l.nq.v.z * r;
-
-    dual.dq.w  = l.dq.w  * r;
-    dual.dq.v.x = l.dq.v.x * r;
-    dual.dq.v.y = l.dq.v.y * r;
-    dual.dq.v.z = l.dq.v.z * r;
-    return dual;
-}
-
-template<class F1, class F2>
-ILINE DualQuat_tpl<F1> operator+(const DualQuat_tpl<F1>& l, const DualQuat_tpl<F2>& r)
-{
-    DualQuat_tpl<F1> dual;
-    dual.nq.w  = l.nq.w  + r.nq.w;
-    dual.nq.v.x = l.nq.v.x + r.nq.v.x;
-    dual.nq.v.y = l.nq.v.y + r.nq.v.y;
-    dual.nq.v.z = l.nq.v.z + r.nq.v.z;
-
-    dual.dq.w  = l.dq.w  + r.dq.w;
-    dual.dq.v.x = l.dq.v.x + r.dq.v.x;
-    dual.dq.v.y = l.dq.v.y + r.dq.v.y;
-    dual.dq.v.z = l.dq.v.z + r.dq.v.z;
-    return dual;
-}
-
-template<class F1, class F2>
-ILINE void operator += (DualQuat_tpl<F1>& l, const DualQuat_tpl<F2>& r)
-{
-    l.nq.w  += r.nq.w;
-    l.nq.v.x += r.nq.v.x;
-    l.nq.v.y += r.nq.v.y;
-    l.nq.v.z += r.nq.v.z;
-
-    l.dq.w  += r.dq.w;
-    l.dq.v.x += r.dq.v.x;
-    l.dq.v.y += r.dq.v.y;
-    l.dq.v.z += r.dq.v.z;
-}
-
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator*(const DualQuat_tpl<F1>& dq, const Vec3_tpl<F2>& v)
-{
-    F2 t;
-    const F2 ax = dq.nq.v.y * v.z - dq.nq.v.z * v.y + dq.nq.w * v.x;
-    const F2 ay = dq.nq.v.z * v.x - dq.nq.v.x * v.z + dq.nq.w * v.y;
-    const F2 az = dq.nq.v.x * v.y - dq.nq.v.y * v.x + dq.nq.w * v.z;
-    F2 x = dq.dq.v.x * dq.nq.w - dq.nq.v.x * dq.dq.w + dq.nq.v.y * dq.dq.v.z - dq.nq.v.z * dq.dq.v.y;
-    x += x;
-    t = (az * dq.nq.v.y - ay * dq.nq.v.z);
-    x += t + t + v.x;
-    F2 y = dq.dq.v.y * dq.nq.w - dq.nq.v.y * dq.dq.w + dq.nq.v.z * dq.dq.v.x - dq.nq.v.x * dq.dq.v.z;
-    y += y;
-    t = (ax * dq.nq.v.z - az * dq.nq.v.x);
-    y += t + t + v.y;
-    F2 z = dq.dq.v.z * dq.nq.w - dq.nq.v.z * dq.dq.w + dq.nq.v.x * dq.dq.v.y - dq.nq.v.y * dq.dq.v.x;
-    z += z;
-    t = (ay * dq.nq.v.x - ax * dq.nq.v.y);
-    z += t + t + v.z;
-    return Vec3_tpl<F2>(x, y, z);
-}
-
-template<class F1, class F2>
-ILINE DualQuat_tpl<F1> operator*(const DualQuat_tpl<F1>& a, const DualQuat_tpl<F2>& b)
-{
-    DualQuat_tpl<F1> dual;
-
-    dual.nq.v.x = a.nq.v.y * b.nq.v.z - a.nq.v.z * b.nq.v.y + a.nq.w * b.nq.v.x + a.nq.v.x * b.nq.w;
-    dual.nq.v.y = a.nq.v.z * b.nq.v.x - a.nq.v.x * b.nq.v.z + a.nq.w * b.nq.v.y + a.nq.v.y * b.nq.w;
-    dual.nq.v.z = a.nq.v.x * b.nq.v.y - a.nq.v.y * b.nq.v.x + a.nq.w * b.nq.v.z + a.nq.v.z * b.nq.w;
-    dual.nq.w = a.nq.w * b.nq.w  - (a.nq.v.x * b.nq.v.x + a.nq.v.y * b.nq.v.y + a.nq.v.z * b.nq.v.z);
-
-    //dual.dq   = a.nq*b.dq + a.dq*b.nq;
-    dual.dq.v.x = a.nq.v.y * b.dq.v.z - a.nq.v.z * b.dq.v.y + a.nq.w * b.dq.v.x + a.nq.v.x * b.dq.w;
-    dual.dq.v.y = a.nq.v.z * b.dq.v.x - a.nq.v.x * b.dq.v.z + a.nq.w * b.dq.v.y + a.nq.v.y * b.dq.w;
-    dual.dq.v.z = a.nq.v.x * b.dq.v.y - a.nq.v.y * b.dq.v.x + a.nq.w * b.dq.v.z + a.nq.v.z * b.dq.w;
-    dual.dq.w = a.nq.w * b.dq.w  - (a.nq.v.x * b.dq.v.x + a.nq.v.y * b.dq.v.y + a.nq.v.z * b.dq.v.z);
-
-    dual.dq.v.x += a.dq.v.y * b.nq.v.z - a.dq.v.z * b.nq.v.y + a.dq.w * b.nq.v.x + a.dq.v.x * b.nq.w;
-    dual.dq.v.y += a.dq.v.z * b.nq.v.x - a.dq.v.x * b.nq.v.z + a.dq.w * b.nq.v.y + a.dq.v.y * b.nq.w;
-    dual.dq.v.z += a.dq.v.x * b.nq.v.y - a.dq.v.y * b.nq.v.x + a.dq.w * b.nq.v.z + a.dq.v.z * b.nq.w;
-    dual.dq.w += a.dq.w * b.nq.w  - (a.dq.v.x * b.nq.v.x + a.dq.v.y * b.nq.v.y + a.dq.v.z * b.nq.v.z);
-
-    return dual;
-}
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_QUAT_H
-
-
diff --git a/Code/CryEngine/CryCommon/Cry_ValidNumber.h b/Code/CryEngine/CryCommon/Cry_ValidNumber.h
deleted file mode 100644
index af6e560455..0000000000
--- a/Code/CryEngine/CryCommon/Cry_ValidNumber.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_VALIDNUMBER_H
-#define CRYINCLUDE_CRYCOMMON_CRY_VALIDNUMBER_H
-#pragma once
-
-//--------------------------------------------------------------------------------
-
-// http://www.psc.edu/general/software/packages/ieee/ieee.html
-
-/*
-    The IEEE standard for floating point arithmetic
-    """"""""""""""""""""""""""""""""""""""""""""""""
-
-    Single Precision
-    """""""""""""""""
-
-    The IEEE single precision floating point standard representation requires a 32 bit word,
-    which may be represented as numbered from 0 to 31, left to right.
-    The first bit is the sign bit, S,
-    the next eight bits are the exponent bits, 'E',
-    and the final 23 bits are the fraction 'F':
-
-    S EEEEEEEE FFFFFFFFFFFFFFFFFFFFFFF
-    0 1      8 9                    31
-
-    The value V represented by the word may be determined as follows:
-
-    * If E=255 and F is nonzero, then V=NaN ("Not a number")
-    * If E=255 and F is zero and S is 1, then V=-Infinity
-    * If E=255 and F is zero and S is 0, then V=Infinity
-    * If 0<E<255 then V=(-1)**S * 2 ** (E-127) * (1.F) where "1.F" is intended to represent the binary number created by prefixing F with an implicit leading 1 and a binary point.
-    * If E=0 and F is nonzero, then V=(-1)**S * 2 ** (-126) * (0.F) These are "unnormalized" values.
-    * If E=0 and F is zero and S is 1, then V=-0
-    * If E=0 and F is zero and S is 0, then V=0
-
-
-
-    Double Precision
-    """""""""""""""""
-
-    The IEEE double precision floating point standard representation requires a 64 bit word,
-    which may be represented as numbered from 0 to 63, left to right.
-    The first bit is the sign bit, S,
-    the next eleven bits are the exponent bits, 'E',
-    and the final 52 bits are the fraction 'F':
-
-    S EEEEEEEEEEE FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-    0 1        11 12                                                63
-
-    The value V represented by the word may be determined as follows:
-
-    * If E=2047 and F is nonzero, then V=NaN ("Not a number")
-    * If E=2047 and F is zero and S is 1, then V=-Infinity
-    * If E=2047 and F is zero and S is 0, then V=Infinity
-    * If 0<E<2047 then V=(-1)**S * 2 ** (E-1023) * (1.F) where "1.F" is intended to represent the binary number created by prefixing F with an implicit leading 1 and a binary point.
-    * If E=0 and F is nonzero, then V=(-1)**S * 2 ** (-1022) * (0.F) These are "unnormalized" values.
-    * If E=0 and F is zero and S is 1, then V=-0
-    * If E=0 and F is zero and S is 0, then V=0
-
-*/
-
-//--------------------------------------------------------------------------------
-
-#define FloatU32(x)                     (alias_cast<uint32, float>(x))
-#define FloatU32ExpMask             (0xFF << 23)
-#define FloatU32FracMask            ((1 << 23) - 1)
-#define FloatU32SignMask            (1 << 31)
-#define F32NAN                              (0x7F800001)                    // Produces rock solid fp-exceptions.
-#define F32NAN_SAFE                     (FloatU32ExpMask | FloatU32FracMask) // This one is not triggering an fp-exception.
-
-#define DoubleU64(x)                    (*((uint64*) &(x)))
-#define DoubleU64ExpMask            ((uint64)255 << 55)
-#define DoubleU64FracMask           (((uint64)1 << 55) - (uint64)1)
-#define DoubleU64SignMask           ((uint64)1 << 63)
-#if defined(__GNUC__)
-    #define F64NAN                              (0x7FF0000000000001ULL) // Produces rock solid fp-exceptions.
-#else
-    #define F64NAN                              (0x7FF0000000000001)    // Produces rock solid fp-exceptions.
-#endif
-#define F64NAN_SAFE                     (DoubleU64ExpMask | DoubleU64FracMask)  // This one is not triggering an fp-exception.
-
-//--------------------------------------------------------------------------------
-
-ILINE bool NumberValid(const float& x)
-{
-    return ((FloatU32(x) & FloatU32ExpMask) != FloatU32ExpMask);
-}
-
-ILINE bool NumberNAN(const float& x)
-{
-    return (((FloatU32(x) & FloatU32ExpMask) == FloatU32ExpMask) &&
-            ((FloatU32(x) & FloatU32FracMask) != 0));
-}
-
-ILINE bool NumberINF(const float& x)
-{
-    return (((FloatU32(x) & FloatU32ExpMask) == FloatU32ExpMask) &&
-            ((FloatU32(x) & FloatU32FracMask) == 0));
-}
-
-ILINE bool NumberDEN(const float& x)
-{
-    return (((FloatU32(x) & FloatU32ExpMask) == 0) &&
-            ((FloatU32(x) & FloatU32FracMask) != 0));
-}
-
-//--------------------------------------------------------------------------------
-
-ILINE bool NumberValid(const double& x)
-{
-    return ((DoubleU64(x) & DoubleU64ExpMask) != DoubleU64ExpMask);
-}
-
-ILINE bool NumberNAN(const double& x)
-{
-    return (((DoubleU64(x) & DoubleU64ExpMask) == DoubleU64ExpMask) &&
-            ((DoubleU64(x) & DoubleU64FracMask) != 0));
-}
-
-ILINE bool NumberINF(const double& x)
-{
-    return (((DoubleU64(x) & DoubleU64ExpMask) == DoubleU64ExpMask) &&
-            ((DoubleU64(x) & DoubleU64FracMask) == 0));
-}
-
-ILINE bool NumberDEN(const double& x)
-{
-    return (((DoubleU64(x) & DoubleU64ExpMask) == 0) &&
-            ((DoubleU64(x) & DoubleU64FracMask) != 0));
-}
-
-//--------------------------------------------------------------------------------
-
-
-ILINE bool NumberValid([[maybe_unused]] const int8 x)
-{
-    return true; //integers are always valid
-}
-ILINE bool NumberValid([[maybe_unused]] const uint8 x)
-{
-    return true; //integers are always valid
-}
-ILINE bool NumberValid([[maybe_unused]] const int16 x)
-{
-    return true; //integers are always valid
-}
-ILINE bool NumberValid([[maybe_unused]] const uint16 x)
-{
-    return true; //integers are always valid
-}
-ILINE bool NumberValid([[maybe_unused]] const int32 x)
-{
-    return true; //integers are always valid
-}
-ILINE bool NumberValid([[maybe_unused]] const uint32 x)
-{
-    return true; //integers are always valid
-}
-ILINE bool NumberValid([[maybe_unused]] const int64 x)
-{
-    return true; //integers are always valid
-}
-ILINE bool NumberValid([[maybe_unused]] const uint64 x)
-{
-    return true; //integers are always valid
-}
-
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_VALIDNUMBER_H
diff --git a/Code/CryEngine/CryCommon/Cry_Vector2.h b/Code/CryEngine/CryCommon/Cry_Vector2.h
deleted file mode 100644
index c09db3e0f6..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Vector2.h
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common matrix class
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
-#define CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
-#pragma once
-
-#include <AzCore/RTTI/TypeInfo.h>
-#include "Cry_Math.h"
-
-template<class F>
-struct Vec2_tpl
-{
-    typedef F value_type;
-    enum
-    {
-        component_count = 2
-    };
-
-    F x, y;
-
-#ifdef _DEBUG
-    ILINE Vec2_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-        }
-    }
-#else
-    ILINE Vec2_tpl() {}
-#endif
-
-    ILINE Vec2_tpl(type_zero)
-        : x(0)
-        , y(0) {}
-    ILINE Vec2_tpl(F vx, F vy) { x = vx; y = vy; }
-    explicit ILINE Vec2_tpl(F m) { x = y = m; }
-
-    ILINE Vec2_tpl& set(F nx, F ny) { x = F(nx); y = F(ny); return *this; }
-
-
-    template<class F1>
-    ILINE Vec2_tpl(const Vec2_tpl<F1>& src) { x = F(src.x); y = F(src.y); }
-    template<class F1>
-    ILINE explicit Vec2_tpl(const Vec3_tpl<F1>& src) { x = F(src.x); y = F(src.y); }
-    template<class F1>
-    ILINE explicit Vec2_tpl(const F1* psrc) { x = F(psrc[0]); y = F(psrc[1]); }
-
-    explicit ILINE Vec2_tpl(const Vec3_tpl<F>& v)
-        : 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; }
-
-    ILINE int operator!() const { return x == 0 && y == 0; }
-
-    // The default Normalize function is in fact "safe". 0 vectors remain unchanged.
-    Vec2_tpl& Normalize()
-    {
-        F fInvLen = isqrt_safe_tpl(x * x + y * y);
-        x *= fInvLen;
-        y *= fInvLen;
-        return *this;
-    }
-
-    // Normalize if non-0, otherwise set to specified "safe" value.
-    Vec2_tpl& NormalizeSafe(const struct Vec2_tpl<F>& safe = Vec2_tpl<F>(0, 0))
-    {
-        F fLen2 = x * x + y * y;
-        if (fLen2 > 0.0f)
-        {
-            F fInvLen = isqrt_tpl(fLen2);
-            x *= fInvLen;
-            y *= fInvLen;
-        }
-        else
-        {
-            *this = safe;
-        }
-        return *this;
-    }
-
-    Vec2_tpl GetNormalized() const
-    {
-        F fInvLen = isqrt_safe_tpl(x * x + y * y);
-        return *this * fInvLen;
-    }
-
-    Vec2_tpl GetNormalizedSafe(const struct Vec2_tpl<F>& safe = Vec2_tpl<F>(1, 0)) const
-    {
-        F fLen2 = x * x + y * y;
-        if (fLen2 > 0.0f)
-        {
-            F fInvLen = isqrt_tpl(fLen2);
-            return *this * fInvLen;
-        }
-        else
-        {
-            return safe;
-        }
-    }
-
-    ILINE bool IsEquivalent(const Vec2_tpl<F>& v1, F epsilon = VEC_EPSILON) const
-    {
-        assert(v1.IsValid());
-        assert(this->IsValid());
-        return  ((fabs_tpl(x - v1.x) <= epsilon) &&   (fabs_tpl(y - v1.y) <= epsilon));
-    }
-
-    ILINE static bool IsEquivalent(const Vec2_tpl<F>& v0, const Vec2_tpl<F>& v1, F epsilon = VEC_EPSILON)
-    {
-        assert(v0.IsValid());
-        assert(v1.IsValid());
-        return  ((fabs_tpl(v0.x - v1.x) <= epsilon) &&    (fabs_tpl(v0.y - v1.y) <= epsilon));
-    }
-
-
-    ILINE F GetLength() const
-    {
-        return sqrt_tpl(x * x + y * y);
-    }
-
-    ILINE F GetLengthSquared() const
-    {
-        return x * x + y * y;
-    }
-
-    ILINE F GetLength2() const
-    {
-        return x * x + y * y;
-    }
-
-    void SetLength(F fLen)
-    {
-        F fLenMe = GetLength2();
-        if (fLenMe < 0.00001f * 0.00001f)
-        {
-            return;
-        }
-        fLenMe = fLen * isqrt_tpl(fLenMe);
-        x *= fLenMe;
-        y *= fLenMe;
-    }
-
-    ILINE F area() const { return x * y; }
-
-    ILINE F& operator[](int idx) { return *((F*)&x + idx); }
-    ILINE F operator[](int idx) const { return *((F*)&x + idx); }
-    ILINE operator F*() { return &x; }
-    ILINE Vec2_tpl& flip() { x = -x; y = -y; return *this; }
-    ILINE Vec2_tpl& zero() { x = y = 0; return *this; }
-    ILINE Vec2_tpl rot90ccw() const { return Vec2_tpl(-y, x); }
-    ILINE Vec2_tpl rot90cw() const { return Vec2_tpl(y, -x); }
-
-    #ifdef quotient_h
-    quotient_tpl<F> fake_atan2() const
-    {
-        quotient_tpl<F> res;
-        int quad = -(signnz(x * x - y * y) - 1 >> 1); // hope the optimizer will remove complement shifts and adds
-        if (quad)
-        {
-            res.x = -y;
-            res.y = x;
-        }
-        else
-        {
-            res.x = x;
-            res.y = y;
-        }
-        int sgny = signnz(res.y);
-        quad |= 1 - sgny;                               //(res.y<0)<<1;
-        res.x *= sgny;
-        res.y *= sgny;
-        res += 1 + (quad << 1);
-        return res;
-    }
-    #endif
-    ILINE F atan2() const { return atan2_tpl(y, x); }
-
-    ILINE Vec2_tpl operator-() const { return Vec2_tpl(-x, -y); }
-
-    ILINE Vec2_tpl operator*(F k) const { return Vec2_tpl(x * k, y * k); }
-    ILINE Vec2_tpl& operator*=(F k) { x *= k; y *= k; return *this; }
-    ILINE Vec2_tpl operator/(F k) const { return *this * ((F)1.0 / k); }
-    ILINE Vec2_tpl& operator/=(F k) { return *this *= ((F)1.0 / k); }
-
-    //  bool operator==(const Vec2_tpl<F> &vec) { return x == vec.x && y == vec.y; }
-    ILINE bool operator!=(const Vec2_tpl<F>& vec) { return !(*this == vec); }
-
-    ILINE friend bool operator==(const Vec2_tpl<F>& left, const Vec2_tpl<F>& right) { return left.x == right.x && left.y == right.y; }
-    ILINE friend bool operator!=(const Vec2_tpl<F>& left, const Vec2_tpl<F>& right) {   return !(left == right);  }
-
-    ILINE bool IsZero(F e = (F)0.0) const
-    {
-        return (fabs_tpl(x) <= e) && (fabs_tpl(y) <= e);
-    }
-
-    // IsZeroSlow would be a better name [5/20/2010 evgeny]
-    ILINE bool IsZeroFast(F e = (F)0.0003) const
-    {
-        return (fabs_tpl(x) + fabs_tpl(y)) <= e;
-    }
-
-    ILINE F Dot(const Vec2_tpl& rhs) const {return x * rhs.x + y * rhs.y; }
-    /// returns a vector perpendicular to this one (this->Cross(newVec) points "up")
-    ILINE Vec2_tpl Perp() const {return Vec2_tpl(-y, x); }
-
-    // The size of the "paralell-trapets" area spanned by the two vectors.
-    ILINE F Cross (const Vec2_tpl<F>& v) const
-    {
-        return float (x * v.y - y * v.x);
-    }
-
-    /*!
-    * Linear-Interpolation between Vec3 (lerp)
-    *
-    * Example:
-    *  Vec3 r=Vec3::CreateLerp( p, q, 0.345f );
-    */
-    ILINE void SetLerp(const Vec2_tpl<F>& p, const Vec2_tpl<F>& q, F t) { *this = p * (1.0f - t) + q * t; }
-    ILINE static Vec2_tpl<F> CreateLerp(const Vec2_tpl<F>& p, const Vec2_tpl<F>& q, F t) {    return p * (1.0f - t) + q * t; }
-
-
-    /*!
-    * Spherical-Interpolation between 3d-vectors (geometrical slerp)
-    * both vectors are assumed to be normalized.
-    *
-    * Example:
-    *  Vec3 r=Vec3::CreateSlerp( p, q, 0.5674f );
-    */
-    void SetSlerp(const Vec2_tpl<F>& p, const Vec2_tpl<F>& q, F t)
-    {
-        assert((fabs_tpl(1 - (p | p))) < 0.005); //check if unit-vector
-        assert((fabs_tpl(1 - (q | q))) < 0.005); //check if unit-vector
-        // calculate cosine using the "inner product" between two vectors: p*q=cos(radiant)
-        F cosine = (p | q);
-        //we explore the special cases where the both vectors are very close together,
-        //in which case we approximate using the more economical LERP and avoid "divisions by zero" since sin(Angle) = 0  as   Angle=0
-        if (cosine >= (F)0.99)
-        {
-            SetLerp(p, q, t); //perform LERP:
-            this->Normalize();
-        }
-        else
-        {
-            //perform SLERP: because of the LERP-check above, a "division by zero" is not possible
-            F rad               = acos_tpl(cosine);
-            F scale_0   = sin_tpl((1 - t) * rad);
-            F scale_1   = sin_tpl(t * rad);
-            *this = (p * scale_0 + q * scale_1) / sin_tpl(rad);
-            this->Normalize();
-        }
-    }
-    ILINE static Vec2_tpl<F> CreateSlerp(const Vec2_tpl<F>& p, const Vec2_tpl<F>& q, F t)
-    {
-        Vec2_tpl<F> v;
-        v.SetSlerp(p, q, t);
-        return v;
-    }
-
-    bool IsValid() const
-    {
-        if (!NumberValid(x))
-        {
-            return false;
-        }
-        if (!NumberValid(y))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    ILINE F GetDistance(const Vec2_tpl<F>& vec1) const
-    {
-        return sqrt_tpl((x - vec1.x) * (x - vec1.x) + (y - vec1.y) * (y - vec1.y));
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Typedefs                                                                  //
-///////////////////////////////////////////////////////////////////////////////
-
-typedef Vec2_tpl<f32>    Vec2;  // always 32 bit
-typedef Vec2_tpl<f64>    Vec2d; // always 64 bit
-typedef Vec2_tpl<int32>  Vec2i;
-typedef Vec2_tpl<uint32> Vec2ui;
-typedef Vec2_tpl<real>   Vec2r; // variable float precision. depending on the target system it can be 32, 64 or 80 bit
-
-typedef Vec2_tpl<float> vector2f;
-#if defined(LINUX64)
-typedef Vec2_tpl<int>    vector2l;
-#else
-typedef Vec2_tpl<long>   vector2l;
-#endif
-typedef Vec2_tpl<float> vector2df;
-typedef Vec2_tpl<real> vector2d;
-typedef Vec2_tpl<int> vector2di;
-typedef Vec2_tpl<unsigned int> vector2dui;
-
-template<class F>
-Vec2_tpl<F> operator*(F op1, const Vec2_tpl<F>& op2) {return Vec2_tpl<F>(op1 * op2.x, op1 * op2.y); }
-
-template<class F1, class F2>
-F1 operator*(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2) { return op1.x * op2.x + op1.y * op2.y; } // dot product
-template<class F1, class F2>
-F1 operator|(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2) { return op1.x * op2.x + op1.y * op2.y; } // dot product
-
-template<class F1, class F2>
-F1 operator^(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2) { return op1.x * op2.y - op1.y * op2.x; } // cross product
-
-template<class F1, class F2>
-Vec2_tpl<F1> operator+(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2)
-{
-    return Vec2_tpl<F1>(op1.x + op2.x, op1.y + op2.y);
-}
-template<class F1, class F2>
-Vec2_tpl<F1> operator-(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2)
-{
-    return Vec2_tpl<F1>(op1.x - op2.x, op1.y - op2.y);
-}
-
-template<class F1, class F2>
-Vec2_tpl<F1>& operator+=(Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2)
-{
-    op1.x += op2.x;
-    op1.y += op2.y;
-    return op1;
-}
-template<class F1, class F2>
-Vec2_tpl<F1>& operator-=(Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2)
-{
-    op1.x -= op2.x;
-    op1.y -= op2.y;
-    return op1;
-}
-
-template<class F>
-bool operator==(const Vec2_tpl<F>& left, const Vec2_tpl<F>& right)
-{
-    return left.x == right.x && left.y == right.y;
-}
-
-
-template<>
-ILINE Vec2 clamp_tpl<Vec2>(Vec2 X, Vec2 Min, Vec2 Max)
-{
-    return Vec2(clamp_tpl(X.x, Min.x, Max.x), clamp_tpl(X.y, Min.y, Max.y));
-}
-
-
-// declare common constants.  Must be done after the class for compiler conformance
-// (msvc and clang handle instantiation differently)
-const Vec2_tpl<float> Vec2_Zero(0, 0);
-const Vec2_tpl<float> Vec2_OneX(1, 0);
-const Vec2_tpl<float> Vec2_OneY(0, 1);
-const Vec2_tpl<float> Vec2_One(1, 1);
-
-namespace AZ
-{
-    AZ_TYPE_INFO_SPECIALIZE(Vec2, "{844131BA-9565-42F3-8482-6F65A6D5FC59}");
-}
-#endif // CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
diff --git a/Code/CryEngine/CryCommon/Cry_Vector3.h b/Code/CryEngine/CryCommon/Cry_Vector3.h
deleted file mode 100644
index 6e75503fb4..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Vector3.h
+++ /dev/null
@@ -1,1429 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common vector class
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_VECTOR3_H
-#define CRYINCLUDE_CRYCOMMON_CRY_VECTOR3_H
-#pragma once
-
-
-#include "CryEndian.h"
-#include <AzCore/Math/Vector3.h>
-
-template<typename T>
-struct VecPrecisionValues
-{
-    ILINE static bool CheckGreater(const T value)
-    {
-        return value > 0;
-    }
-};
-
-template<>
-struct VecPrecisionValues<float>
-{
-    ILINE static bool CheckGreater(const float value)
-    {
-        return value > FLT_EPSILON;
-    }
-};
-
-
-template <typename F>
-struct Vec3s_tpl
-{
-    F x, y, z;
-
-    ILINE Vec3s_tpl(F vx, F vy, F vz)
-        : x(vx)
-        , y(vy)
-        , z(vz){}
-    ILINE F& operator [] (int32 index)        { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
-    ILINE F operator [] (int32 index) const { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class Vec3_tpl
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-template <typename F>
-struct Vec3_tpl
-{
-    typedef F value_type;
-    enum
-    {
-        component_count = 3
-    };
-
-    F x, y, z;
-
-#if defined(_DEBUG)
-    ILINE Vec3_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-        }
-    }
-#else
-    ILINE Vec3_tpl()    {};
-#endif
-
-    /*!
-    * template specialization to initialize a vector
-    *
-    * Example:
-    *  Vec3 v0=Vec3(ZERO);
-    *  Vec3 v1=Vec3(MIN);
-    *  Vec3 v2=Vec3(MAX);
-    */
-    Vec3_tpl(type_zero)
-        : x(0)
-        , y(0)
-        , z(0) {}
-    Vec3_tpl(type_min);
-    Vec3_tpl(type_max);
-
-    /*!
-    * constructors and bracket-operator to initialize a vector
-    *
-    * Example:
-    *  Vec3 v0=Vec3(1,2,3);
-    *  Vec3 v1(1,2,3);
-    *  v2.Set(1,2,3);
-    */
-    ILINE Vec3_tpl(F vx, F vy, F vz)
-        : x(vx)
-        , y(vy)
-        , z(vz){ assert(this->IsValid()); }
-    ILINE void operator () (F vx, F vy, F vz) { x = vx; y = vy; z = vz; assert(this->IsValid()); }
-    ILINE Vec3_tpl<F>& Set(const F xval, const F yval, const F zval) { x = xval; y = yval; z = zval; assert(this->IsValid()); return *this; }
-
-    explicit ILINE Vec3_tpl(F f)
-        : x(f)
-        , y(f)
-        , z(f) { assert(this->IsValid()); }
-
-    explicit ILINE Vec3_tpl(const AZ::Vector3& v)
-    {
-        x = v.GetX();
-        y = v.GetY();
-        z = v.GetZ();
-    }
-
-    /*!
-    * the copy/casting/assignement constructor
-    *
-    * Example:
-    *  Vec3 v0=v1;
-    *  Vec3 v0=Vec3(angle);
-    *  Vec3 v0=Vec3(vector4);
-    */
-    ILINE Vec3_tpl(const Vec3_tpl& v)   {   x = v.x; y = v.y; z = v.z; }
-    template<class F1>
-    ILINE  Vec3_tpl<F>(const Vec3_tpl<F1>&v)  {
-        x = F(v.x);
-        y = F(v.y);
-        z = F(v.z);
-        assert(IsValid());
-    }
-
-    ILINE Vec3_tpl<F>(const Vec2_tpl<F>&v) {
-        x = v.x;
-        y = v.y;
-        z = 0;
-        assert(IsValid());
-    }
-    template<class T>
-    ILINE Vec3_tpl<F>(const Vec2_tpl<T>&v) {
-        x = F(v.x);
-        y = F(v.y);
-        z = 0;
-        assert(IsValid());
-    }
-
-    explicit ILINE Vec3_tpl<F>(const Ang3_tpl<F>&v) {
-        x = v.x;
-        y = v.y;
-        z = v.z;
-        assert(IsValid());
-    }
-    template<class T>
-    explicit ILINE Vec3_tpl<F>(const Ang3_tpl<T>&v) {
-        x = v.x;
-        y = v.y;
-        z = v.z;
-        assert(IsValid());
-    }
-
-    explicit ILINE Vec3_tpl<F>(const Vec4_tpl<F> &v) {
-        x = F(v.x);
-        y = F(v.y);
-        z = F(v.z);
-    }
-    template<class T>
-    explicit ILINE Vec3_tpl<F>(const Vec4_tpl<T> &v) {
-        x = F(v.x);
-        y = F(v.y);
-        z = F(v.z);
-    }
-
-
-
-
-    /*!
-    * overloaded arithmetic operator
-    *
-    * Example:
-    *  Vec3 v0=v1*4;
-    */
-    ILINE Vec3_tpl<F> operator * (F k) const
-    {
-        const Vec3_tpl<F> v = *this;
-        return Vec3_tpl<F>(v.x * k, v.y * k, v.z * k);
-    }
-    ILINE Vec3_tpl<F> operator / (F k) const
-    {
-        k = (F)1.0 / k;
-        return Vec3_tpl<F>(x * k, y * k, z * k);
-    }
-    ILINE friend Vec3_tpl<F> operator * (F f, const Vec3_tpl& vec)
-    {
-        return Vec3_tpl((F)(f * vec.x), (F)(f * vec.y), (F)(f * vec.z));
-    }
-
-    ILINE Vec3_tpl<F>& operator *= (F k)
-    {
-        x *= k;
-        y *= k;
-        z *= k;
-        return *this;
-    }
-    ILINE Vec3_tpl<F>& operator /= (F k)
-    {
-        k = (F)1.0 / k;
-        x *= k;
-        y *= k;
-        z *= k;
-        return *this;
-    }
-
-    ILINE Vec3_tpl<F> operator - (void) const
-    {
-        return Vec3_tpl<F>(-x, -y, -z);
-    }
-    ILINE Vec3_tpl<F>& Flip()
-    {
-        x = -x;
-        y = -y;
-        z = -z;
-        return *this;
-    }
-
-
-    /*!
-    * bracked-operator
-    *
-    * Example:
-    *  uint32 t=v[0];
-    */
-    ILINE F& operator [] (int32 index)        { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
-    ILINE F operator [] (int32 index) const { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
-
-
-    /*!
-    * functions and operators to compare vector
-    *
-    * Example:
-    *  if (v0==v1) dosomething;
-    */
-    ILINE bool operator==(const Vec3_tpl<F>& vec)
-    {
-        return x == vec.x && y == vec.y && z == vec.z;
-    }
-    ILINE bool operator!=(const Vec3_tpl<F>& vec)
-    {
-        return !(*this == vec);
-    }
-
-    ILINE friend bool operator ==(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
-    {
-        return ((v0.x == v1.x) && (v0.y == v1.y) && (v0.z == v1.z));
-    }
-    ILINE friend bool operator !=(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
-    {
-        return !(v0 == v1);
-    }
-
-    ILINE bool IsZero(F e = (F) 0.0) const
-    {
-        return (fabs_tpl(x) <= e) && (fabs_tpl(y) <= e) && (fabs_tpl(z) <= e);
-    }
-
-    ILINE bool IsZeroFast(F e = (F) 0.0003) const
-    {
-        return (fabs_tpl(x) + fabs_tpl(y) + fabs_tpl(z)) <= e;
-    }
-
-    // Chebyshev distance (axis aligned)
-    ILINE bool IsEquivalent(const Vec3_tpl<F>& v1, F epsilon = VEC_EPSILON) const
-    {
-        assert(v1.IsValid());
-        assert(this->IsValid());
-        return  ((fabs_tpl(x - v1.x) <= epsilon) &&   (fabs_tpl(y - v1.y) <= epsilon) && (fabs_tpl(z - v1.z) <= epsilon));
-    }
-    ILINE static bool IsEquivalent(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, F epsilon = VEC_EPSILON)
-    {
-        assert(v0.IsValid());
-        assert(v1.IsValid());
-        return  ((fabs_tpl(v0.x - v1.x) <= epsilon) &&    (fabs_tpl(v0.y - v1.y) <= epsilon) &&  (fabs_tpl(v0.z - v1.z) <= epsilon));
-    }
-
-    // Euclidean distance L2
-    ILINE bool IsEquivalentL2(const Vec3_tpl<F>& v1, F epsilon = VEC_EPSILON) const
-    {
-        assert(v1.IsValid());
-        assert(this->IsValid());
-        return (*this - v1).GetLengthSquared() <= (epsilon * epsilon);
-    }
-    ILINE static bool IsEquivalentL2(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, F epsilon = VEC_EPSILON)
-    {
-        assert(v0.IsValid());
-        assert(v1.IsValid());
-        return (v0 - v1).GetLengthSquared() <= (epsilon * epsilon);
-    }
-
-    ILINE bool IsUnit(F epsilon = VEC_EPSILON) const
-    {
-        return (fabs_tpl(1 - GetLengthSquared()) <= epsilon);
-    }
-
-    bool IsValid() const
-    {
-        if (!NumberValid(x))
-        {
-            return false;
-        }
-        if (!NumberValid(y))
-        {
-            return false;
-        }
-        if (!NumberValid(z))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    //! force vector length by normalizing it
-    ILINE void SetLength(F fLen)
-    {
-        F fLenMe = GetLengthSquared();
-        if (fLenMe < 0.00001f * 0.00001f)
-        {
-            return;
-        }
-        fLenMe = fLen * isqrt_tpl(fLenMe);
-        x *= fLenMe;
-        y *= fLenMe;
-        z *= fLenMe;
-    }
-
-    ILINE void ClampLength(F maxLength)
-    {
-        F sqrLength = GetLengthSquared();
-        if (sqrLength > (maxLength * maxLength))
-        {
-            F scale = maxLength * isqrt_tpl(sqrLength);
-            x *= scale;
-            y *= scale;
-            z *= scale;
-        }
-    }
-
-    //! calculate the length of the vector
-    ILINE F GetLength() const
-    {
-        return sqrt_tpl(x * x + y * y + z * z);
-    }
-
-    ILINE F GetLengthFloat() const
-    {
-        return GetLength();
-    }
-
-    ILINE F GetLengthFast() const
-    {
-        return sqrt_fast_tpl(x * x + y * y + z * z);
-    }
-
-    //! calculate the squared length of the vector
-    ILINE F GetLengthSquared() const
-    {
-        return x * x + y * y + z * z;
-    }
-
-    ILINE F GetLengthSquaredFloat() const
-    {
-        return GetLengthSquared();
-    }
-
-    //! calculate the length of the vector ignoring the z component
-    ILINE F GetLength2D() const
-    {
-        return sqrt_tpl(x * x + y * y);
-    }
-
-    //! calculate the squared length of the vector ignoring the z component
-    ILINE F GetLengthSquared2D() const
-    {
-        return x * x + y * y;
-    }
-
-    ILINE F GetDistance(const Vec3_tpl<F>& vec1) const
-    {
-        return sqrt_tpl((x - vec1.x) * (x - vec1.x) + (y - vec1.y) * (y - vec1.y) + (z - vec1.z) * (z - vec1.z));
-    }
-    ILINE F GetSquaredDistance (const Vec3_tpl<F>& v) const
-    {
-        return (x - v.x) * (x - v.x) + (y - v.y) * (y - v.y) + (z - v.z) * (z - v.z);
-    }
-    ILINE F GetSquaredDistance2D (const Vec3_tpl<F>& v) const
-    {
-        return (x - v.x) * (x - v.x) + (y - v.y) * (y - v.y);
-    }
-
-    //! Normalize the vector.
-    // The default Normalize function is in fact "safe". 0 vectors remain unchanged.
-    ILINE void  Normalize()
-    {
-        assert(this->IsValid());
-        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z);
-        x *= fInvLen;
-        y *= fInvLen;
-        z *= fInvLen;
-    }
-
-    //! May be faster and less accurate.
-    ILINE void NormalizeFast()
-    {
-        assert(this->IsValid());
-        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z);
-        x *= fInvLen;
-        y *= fInvLen;
-        z *= fInvLen;
-    }
-
-    //! Normalize the vector to a scale.
-    ILINE void Normalize(F scale)
-    {
-        assert(this->IsValid());
-        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z) * scale;
-        x *= fInvLen;
-        y *= fInvLen;
-        z *= fInvLen;
-    }
-    ILINE void NormalizeFast(F scale)
-    {
-        assert(this->IsValid());
-        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z) * scale;
-        x *= fInvLen;
-        y *= fInvLen;
-        z *= fInvLen;
-    }
-
-    //! Normalize the vector.
-    // check for null vector - set to the passed in vector (which should be normalised!) if it is null vector
-    // returns the original length of the vector
-    ILINE F NormalizeSafe(const struct Vec3_tpl<F>& safe = Vec3_tpl<F>(0, 0, 0))
-    {
-        assert(this->IsValid());
-        F fLen2 = x * x + y * y + z * z;
-        IF (VecPrecisionValues<F>::CheckGreater(fLen2), 1)
-        {
-            F fInvLen = isqrt_tpl(fLen2);
-            x *= fInvLen;
-            y *= fInvLen;
-            z *= fInvLen;
-            return F(1) / fInvLen;
-        }
-        else
-        {
-            *this = safe;
-            return F(0);
-        }
-    }
-
-    ILINE Vec3_tpl GetNormalizedFloat() const
-    {
-        return GetNormalized();
-    }
-
-    //! Return a normalized vector.
-    ILINE Vec3_tpl GetNormalized() const
-    {
-        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z);
-        return *this * fInvLen;
-    }
-
-    //! Return a normalized vector.
-    ILINE Vec3_tpl GetNormalizedFast() const
-    {
-        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z);
-        return *this * fInvLen;
-    }
-
-    //! Return a safely normalized vector - returns safe vector (should be normalised) if original is zero length.
-    ILINE Vec3_tpl GetNormalizedSafe(const struct Vec3_tpl<F>& safe = Vec3_tpl<F>(1, 0, 0)) const
-    {
-        F fLen2 = x * x + y * y + z * z;
-        IF (VecPrecisionValues<F>::CheckGreater(fLen2), 1)
-        {
-            F fInvLen = isqrt_tpl(fLen2);
-            return *this * fInvLen;
-        }
-        else
-        {
-            return safe;
-        }
-    }
-
-    //! Return a safely normalized vector - returns safe vector (should be normalised) if original is zero length.
-    ILINE Vec3_tpl GetNormalizedSafeFloat(const struct Vec3_tpl<F>& safe = Vec3_tpl<F>(1, 0, 0)) const
-    {
-        return GetNormalizedSafe(safe);
-    }
-
-    //! Return a normalized and scaled vector.
-    ILINE Vec3_tpl GetNormalized(F scale) const
-    {
-        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z);
-        return *this * (fInvLen * scale);
-    }
-    ILINE Vec3_tpl GetNormalizedFast(F scale) const
-    {
-        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z);
-        return *this * (fInvLen * scale);
-    }
-
-    //! Permutate coordinates so that z goes to new_z slot.
-    ILINE Vec3_tpl GetPermutated(int new_z) const { return Vec3_tpl(*(&x + inc_mod3[new_z]), *(&x + dec_mod3[new_z]), *(&x + new_z)); }
-
-    //! Returns volume of a box with this vector as diagonal.
-    ILINE F GetVolume() const { return x * y * z; }
-
-    //! Returns a vector that consists of absolute values of this one's coordinates.
-    ILINE Vec3_tpl<F> abs() const
-    {
-        return Vec3_tpl(fabs_tpl(x), fabs_tpl(y), fabs_tpl(z));
-    }
-
-    //! Check for min bounds.
-    ILINE void CheckMin(const Vec3_tpl<F> other)
-    {
-        x = min(other.x, x);
-        y = min(other.y, y);
-        z = min(other.z, z);
-    }
-    //! Check for max bounds.
-    ILINE void CheckMax(const Vec3_tpl<F> other)
-    {
-        x = max(other.x, x);
-        y = max(other.y, y);
-        z = max(other.z, z);
-    }
-
-
-
-    /*!
-    * Sets a vector orthogonal to the input vector.
-    *
-    * Example:
-    *  Vec3 v;
-    *  v.SetOrthogonal( i );
-    */
-    ILINE void SetOrthogonal(const Vec3_tpl<F>& v)
-    {
-        sqr(F(0.9)) * (v | v) - v.x * v.x < 0 ? (x = -v.z, y = 0, z = v.x) : (x = 0, y = v.z, z = -v.y);
-    }
-    //! Returns a vector orthogonal to this one.
-    ILINE Vec3_tpl GetOrthogonal() const
-    {
-        return sqr(F(0.9)) * (x * x + y * y + z * z) - x * x < 0 ? Vec3_tpl<F>(-z, 0, x) : Vec3_tpl<F>(0, z, -y);
-    }
-
-    /*!
-    * Project a point/vector on a (virtual) plane
-    * Consider we have a plane going through the origin.
-    * Because d=0 we need just the normal. The vector n is assumed to be a unit-vector.
-    *
-    * Example:
-    *  Vec3 result=Vec3::CreateProjection( incident, normal );
-    */
-    ILINE void SetProjection(const Vec3_tpl& i, const Vec3_tpl& n)
-    {
-        *this = i - n * (n | i);
-    }
-    ILINE static Vec3_tpl<F> CreateProjection(const Vec3_tpl& i, const Vec3_tpl& n)
-    {
-        return i - n * (n | i);
-    }
-
-    /*!
-    * Calculate a reflection vector. Vec3 n is assumed to be a unit-vector.
-    *
-    * Example:
-    *  Vec3 result=Vec3::CreateReflection( incident, normal );
-    */
-    ILINE void SetReflection(const Vec3_tpl<F>& i, const Vec3_tpl<F>& n)
-    {
-        *this = (n * (i | n) * 2) - i;
-    }
-    ILINE static Vec3_tpl<F> CreateReflection(const Vec3_tpl<F>& i, const Vec3_tpl<F>& n)
-    {
-        return (n * (i | n) * 2) - i;
-    }
-
-    /*!
-    * Linear-Interpolation between Vec3 (lerp)
-    *
-    * Example:
-    *  Vec3 r=Vec3::CreateLerp( p, q, 0.345f );
-    */
-    ILINE void SetLerp(const Vec3_tpl<F>& p, const Vec3_tpl<F>& q, F t)
-    {
-        const Vec3_tpl<F> diff = q - p;
-        *this = p + (diff * t);
-    }
-    ILINE static Vec3_tpl<F> CreateLerp(const Vec3_tpl<F>& p, const Vec3_tpl<F>& q, F t)
-    {
-        const Vec3_tpl<F> diff = q - p;
-        return p + (diff * t);
-    }
-
-
-    /*!
-    * Spherical-Interpolation between 3d-vectors (geometrical slerp)
-    * both vectors are assumed to be normalized.
-    *
-    * Example:
-    *  Vec3 r=Vec3::CreateSlerp( p, q, 0.5674f );
-    */
-    void SetSlerp(const Vec3_tpl<F>& p, const Vec3_tpl<F>& q, F t)
-    {
-        assert(p.IsUnit(0.005f));
-        assert(q.IsUnit(0.005f));
-        // calculate cosine using the "inner product" between two vectors: p*q=cos(radiant)
-        F cosine = clamp_tpl((p | q), F(-1), F(1));
-        //we explore the special cases where the both vectors are very close together,
-        //in which case we approximate using the more economical LERP and avoid "divisions by zero" since sin(Angle) = 0  as   Angle=0
-        if (cosine >= (F)0.99)
-        {
-            SetLerp(p, q, t); //perform LERP:
-            Normalize();
-        }
-        else
-        {
-            //perform SLERP: because of the LERP-check above, a "division by zero" is not possible
-            F rad               = acos_tpl(cosine);
-            F scale_0   = sin_tpl((1 - t) * rad);
-            F scale_1   = sin_tpl(t * rad);
-            *this = (p * scale_0 + q * scale_1) / sin_tpl(rad);
-            Normalize();
-        }
-    }
-    ILINE static Vec3_tpl<F> CreateSlerp(const Vec3_tpl<F>& p, const Vec3_tpl<F>& q, F t)
-    {
-        Vec3_tpl<F> v;
-        v.SetSlerp(p, q, t);
-        return v;
-    }
-
-
-
-
-    /*!
-        * Quadratic-Interpolation between vectors v0,v1,v2.
-        * This is repeated linear interpolation from 3 points and the resulting curve is a parabola.
-        * If t is in the range [0...1], then the curve goes only through v0 and v2.
-        *
-        * Example:
-        *  Vec3 ip; ip.SetQuadraticCurve( v0,v1,v2, 0.345f );
-        */
-    ILINE void SetQuadraticCurve(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, F t1)
-    {
-        F t0 = 1.0f - t1;
-        *this = t0 * t0 * v0 + t0 * t1 * 2.0f * v1 + t1 * t1 * v2;
-    }
-    ILINE static Vec3_tpl<F> CreateQuadraticCurve(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, F t)
-    {
-        Vec3_tpl<F> ip;
-        ip.SetQuadraticCurve(v0, v1, v2, t);
-        return ip;
-    }
-
-    /*!
-    * Cubic-Interpolation between vectors v0,v1,v2,v3.
-    * This is repeated linear interpolation from 4 points.
-    * If t is in the range [0...1], then the curve goes only through v0 and v3.
-    *
-    * Example:
-    *  Vec3 ip; ip.SetCubicCurve( v0,v1,v2,v3, 0.345f );
-    */
-    ILINE void SetCubicCurve(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, const Vec3_tpl<F>& v3, F t1)
-    {
-        F t0 = 1.0f - t1;
-        *this = t0 * t0 * t0 * v0 + 3 * t0 * t0 * t1 * v1 + 3 * t0 * t1 * t1 * v2 + t1 * t1 * t1 * v3;
-    }
-    ILINE static Vec3_tpl<F> CreateCubicCurve(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, const Vec3_tpl<F>& v3, F t)
-    {
-        Vec3_tpl<F> ip;
-        ip.SetCubicCurve(v0, v1, v2, v3, t);
-        return ip;
-    }
-
-    /*!
-       * Spline-Interpolation between vectors v0,v1,v2.
-       * This is a variation of a quadratic curve.
-       * If t is in the range [0...1], then the spline goes through all 3 points
-       *
-       * Example:
-       *  Vec3 ip; ip.SetSplineInterpolation( v0,v1,v2, 0.345f );
-       */
-    ILINE void SetQuadraticSpline(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, F t)
-    {
-        SetQuadraticCurve(v0, v1 - (v0 * 0.5f + v1 + v2 * 0.5f - v1 * 2.0f), v2, t);
-    }
-    ILINE static Vec3_tpl<F> CreateQuadraticSpline(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, F t)
-    {
-        Vec3_tpl<F> ip;
-        ip.SetQuadraticSpline(v0, v1, v2, t);
-        return ip;
-    }
-
-    /*!
-    * Rotate a vector using angle&axis.
-    *
-    * Example:
-    *  Vec3 r=v.GetRotated(axis,angle);
-    */
-    ILINE Vec3_tpl<F> GetRotated(const Vec3_tpl<F>& axis, F angle) const
-    {
-        return GetRotated(axis, cos_tpl(angle), sin_tpl(angle));
-    }
-    ILINE Vec3_tpl<F> GetRotated(const Vec3_tpl<F>& axis, F cosa, F sina) const
-    {
-        Vec3_tpl<F> zax = axis * (*this | axis);
-        Vec3_tpl<F> xax = *this - zax;
-        Vec3_tpl<F> yax = axis % xax;
-        return xax * cosa + yax * sina + zax;
-    }
-
-    /*!
-    * Rotate a vector around a center using angle&axis.
-    *
-    * Example:
-    *  Vec3 r=v.GetRotated(axis,angle);
-    */
-    ILINE Vec3_tpl<F> GetRotated(const Vec3_tpl& center, const Vec3_tpl<F>& axis, F angle) const
-    {
-        return center + (*this - center).GetRotated(axis, angle);
-    }
-    ILINE Vec3_tpl<F> GetRotated(const Vec3_tpl<F>& center, const Vec3_tpl<F>& axis, F cosa, F sina) const
-    {
-        return center + (*this - center).GetRotated(axis, cosa, sina);
-    }
-
-    /*!
-    * Component wise multiplication of two vectors.
-    */
-    ILINE Vec3_tpl CompMul(const Vec3_tpl<F> rhs) const
-    {
-        return(Vec3_tpl(x * rhs.x, y * rhs.y, z * rhs.z));
-    }
-
-    //! Three methods for a "dot-product" operation.
-    ILINE F Dot (const Vec3_tpl<F> v)   const
-    {
-        return x * v.x + y * v.y + z * v.z;
-    }
-    //! Two methods for a "cross-product" operation.
-    ILINE Vec3_tpl<F> Cross (const Vec3_tpl<F> vec2) const
-    {
-        return Vec3_tpl<F>(y * vec2.z  -  z * vec2.y,     z * vec2.x -    x * vec2.z,   x * vec2.y  -  y * vec2.x);
-    }
-
-    //f32* fptr=vec;
-    DEPRECATED operator F* ()                   { return (F*)this; }
-    template <class T>
-    explicit DEPRECATED Vec3_tpl(const T* src) { x = F(src[0]); y = F(src[1]); z = F(src[2]); }
-
-    ILINE Vec3_tpl& zero() { x = y = z = 0; return *this; }
-    ILINE F len() const
-    {
-        return sqrt_tpl(x * x + y * y + z * z);
-    }
-    ILINE F len2() const
-    {
-        return x * x + y * y + z * z;
-    }
-
-    ILINE Vec3_tpl& normalize()
-    {
-        F len2 = x * x + y * y + z * z;
-        if (len2 > (F)1e-20f)
-        {
-            F rlen = isqrt_tpl(len2);
-            x *= rlen;
-            y *= rlen;
-            z *= rlen;
-        }
-        else
-        {
-            Set(0, 0, 1);
-        }
-        return *this;
-    }
-    ILINE Vec3_tpl normalized() const
-    {
-        F len2 = x * x + y * y + z * z;
-        if (len2 > (F)1e-20f)
-        {
-            F rlen = isqrt_tpl(len2);
-            return Vec3_tpl(x * rlen, y * rlen, z * rlen);
-        }
-        else
-        {
-            return Vec3_tpl(0, 0, 1);
-        }
-    }
-
-    //vector subtraction
-    template<class F1>
-    ILINE Vec3_tpl<F1> sub(const Vec3_tpl<F1>& v) const
-    {
-        return Vec3_tpl<F1>(x - v.x, y - v.y, z - v.z);
-    }
-    //vector scale
-    template<class F1>
-    ILINE Vec3_tpl<F1> scale(const F1 k) const
-    {
-        return Vec3_tpl<F>(x * k, y * k, z * k);
-    }
-
-    //vector dot product
-    template<class F1>
-    ILINE F1 dot(const Vec3_tpl<F1>& v) const
-    {
-        return (F1)(x * v.x + y * v.y + z * v.z);
-    }
-    //vector cross product
-    template<class F1>
-    ILINE Vec3_tpl<F1> cross(const Vec3_tpl<F1>& v) const
-    {
-        return Vec3_tpl<F1>(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x);
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-// dot product (2 versions)
-template<class F1, class F2>
-ILINE F1 operator * (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return v0.Dot(v1);
-}
-template<class F1, class F2>
-ILINE F1 operator | (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return v0.Dot(v1);
-}
-// cross product (2 versions)
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator ^ (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return v0.Cross(v1);
-}
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator % (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return v0.Cross(v1);
-}
-
-
-//vector addition
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator + (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return Vec3_tpl<F1>(static_cast<F1>(v0.x + v1.x), static_cast<F1>(v0.y + v1.y), static_cast<F1>(v0.z + v1.z));
-}
-//vector addition
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator + (const Vec2_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return Vec3_tpl<F1>(v0.x + v1.x, v0.y + v1.y, v1.z);
-}
-//vector addition
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator + (const Vec3_tpl<F1>& v0, const Vec2_tpl<F2>& v1)
-{
-    return Vec3_tpl<F1>(v0.x + v1.x, v0.y + v1.y, v0.z);
-}
-
-//vector subtraction
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator - (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return Vec3_tpl<F1>((F1)(v0.x - v1.x), (F1)(v0.y - v1.y), (F1)(v0.z - v1.z));
-}
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator - (const Vec2_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return Vec3_tpl<F1>(v0.x - v1.x, v0.y - v1.y, 0.0f - v1.z);
-}
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator - (const Vec3_tpl<F1>& v0, const Vec2_tpl<F2>& v1)
-{
-    return Vec3_tpl<F1>(v0.x - v1.x, v0.y - v1.y, v0.z);
-}
-
-
-//---------------------------------------------------------------------------
-
-
-//vector self-addition
-template<class F1, class F2>
-ILINE Vec3_tpl<F1>& operator += (Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    v0 = v0 + v1;
-    return v0;
-}
-//vector self-subtraction
-template<class F1, class F2>
-ILINE Vec3_tpl<F1>& operator -= (Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    v0 = v0 - v1;
-    return v0;
-}
-template<class F1, class F2>
-ILINE Vec3_tpl<F1> operator / (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
-{
-    return Vec3_tpl<F1>(v0.x / v1.x, v0.y / v1.y, v0.z / v1.z);
-}
-
-template <class F>
-ILINE bool IsEquivalent(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, f32 epsilon = VEC_EPSILON)
-{
-    return  ((fabs_tpl(v0.x - v1.x) <= epsilon) &&    (fabs_tpl(v0.y - v1.y) <= epsilon) &&  (fabs_tpl(v0.z - v1.z) <= epsilon));
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Typedefs                                                                  //
-///////////////////////////////////////////////////////////////////////////////
-typedef Vec3_tpl<f32>    Vec3;  // always 32 bit
-
-typedef Vec3_tpl<f64>    Vec3d; // always 64 bit
-typedef Vec3_tpl<int32>  Vec3i;
-typedef Vec3_tpl<uint32> Vec3ui;
-typedef Vec3_tpl<real>   Vec3r; // variable float precision. depending on the target system it can be 32, 64 or 80 bit
-
-template<>
-inline Vec3_tpl<f64>::Vec3_tpl(type_min) { x = y = z = -1.7E308; }
-template<>
-inline Vec3_tpl<f64>::Vec3_tpl(type_max) { x = y = z = 1.7E308; }
-template<>
-inline Vec3_tpl<f32>::Vec3_tpl(type_min) { x = y = z = -3.3E38f; }
-template<>
-inline Vec3_tpl<f32>::Vec3_tpl(type_max) { x = y = z = 3.3E38f; }
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct Ang3_tpl
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-template <typename F>
-struct Ang3_tpl
-{
-    F x, y, z;
-
-#if defined(_DEBUG)
-    ILINE Ang3_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-        }
-    }
-#else
-    ILINE Ang3_tpl()    {};
-#endif
-
-
-    Ang3_tpl(type_zero) { x = y = z = 0; }
-
-    void operator () (F vx, F vy, F vz) { x = vx; y = vy; z = vz; };
-    ILINE Ang3_tpl<F>(F vx, F vy, F vz)   {
-        x = vx;
-        y = vy;
-        z = vz;
-    }
-
-    explicit ILINE Ang3_tpl(const Vec3_tpl<F>& v)
-        : x((F)v.x)
-        , y((F)v.y)
-        , z((F)v.z) { assert(this->IsValid()); }
-
-    ILINE bool operator==(const Ang3_tpl<F>& vec) { return x == vec.x && y == vec.y && z == vec.z; }
-    ILINE bool operator!=(const Ang3_tpl<F>& vec) { return !(*this == vec); }
-
-    ILINE Ang3_tpl<F> operator * (F k) const { return Ang3_tpl<F>(x * k, y * k, z * k); }
-    ILINE Ang3_tpl<F> operator / (F k) const { k = (F)1.0 / k; return Ang3_tpl<F>(x * k, y * k, z * k); }
-
-
-    ILINE Ang3_tpl<F>& operator *= (F k) { x *= k; y *= k; z *= k; return *this; }
-    //explicit ILINE Ang3_tpl<F>& operator = (const Vec3_tpl<F>& v)  { x=v.x; y=v.y; z=v.z; return *this;   }
-
-    ILINE Ang3_tpl<F> operator - (void) const { return Ang3_tpl<F>(-x, -y, -z); }
-
-    ILINE friend bool operator ==(const Ang3_tpl<F>& v0, const Ang3_tpl<F>& v1)
-    {
-        return ((v0.x == v1.x) && (v0.y == v1.y) && (v0.z == v1.z));
-    }
-    ILINE void Set(F xval, F yval, F zval) { x = xval; y = yval; z = zval; }
-
-    ILINE bool IsEquivalent(const Ang3_tpl<F>& v1, F epsilon = VEC_EPSILON) const
-    {
-        return  ((fabs_tpl(x - v1.x) <= epsilon) &&   (fabs_tpl(y - v1.y) <= epsilon) && (fabs_tpl(z - v1.z) <= epsilon));
-    }
-    ILINE bool IsInRangePI() const
-    {
-        F pi = (F)(gf_PI + 0.001); //we need this to fix fp-precision problem
-        return  ((x > -pi) && (x < pi) && (y > -pi) && (y < pi) && (z > -pi) && (z < pi));
-    }
-
-    //! Normalize angle to -pi and +pi range.
-    ILINE void RangePI()
-    {
-        const F modX = fmod(x + gf_PI, gf_PI2);
-        x = if_neg_else(modX, modX + gf_PI, modX - gf_PI);
-
-        const F modY = fmod(y + gf_PI, gf_PI2);
-        y = if_neg_else(modY, modY + gf_PI, modY - gf_PI);
-
-        const F modZ = fmod(z + gf_PI, gf_PI2);
-        z = if_neg_else(modZ, modZ + gf_PI, modZ - gf_PI);
-    }
-
-    //! Convert unit Quat to Euler Angles (xyz).
-    template<class F1>
-    explicit Ang3_tpl(const Quat_tpl<F1>& q)
-    {
-        assert(q.IsValid());
-        y = F(asin_tpl(max((F)-1.0, min((F)1.0, -(q.v.x * q.v.z - q.w * q.v.y) * 2))));
-        if (fabs_tpl(fabs_tpl(y) - (F)((F)g_PI * (F)0.5)) < (F)0.01)
-        {
-            x = F(0);
-            z = F(atan2_tpl(-2 * (q.v.x * q.v.y - q.w * q.v.z), 1 - (q.v.x * q.v.x + q.v.z * q.v.z) * 2));
-        }
-        else
-        {
-            x = F(atan2_tpl((q.v.y * q.v.z + q.w * q.v.x) * 2, 1 - (q.v.x * q.v.x + q.v.y * q.v.y) * 2));
-            z = F(atan2_tpl((q.v.x * q.v.y + q.w * q.v.z) * 2, 1 - (q.v.z * q.v.z + q.v.y * q.v.y) * 2));
-        }
-    }
-
-    //! Convert Matrix33 to Euler Angles (xyz).
-    template<class F1>
-    explicit Ang3_tpl(const Matrix33_tpl<F1>& m)
-    {
-        assert(m.IsOrthonormalRH(0.001f));
-        y = (F)asin_tpl(max((F)-1.0, min((F)1.0, -m.m20)));
-        if (fabs_tpl(fabs_tpl(y) - (F)((F)g_PI * (F)0.5)) < (F)0.01)
-        {
-            x = F(0);
-            z = F(atan2_tpl(-m.m01, m.m11));
-        }
-        else
-        {
-            x = F(atan2_tpl(m.m21, m.m22));
-            z = F(atan2_tpl(m.m10, m.m00));
-        }
-    }
-
-    //! Convert Matrix34 to Euler Angles (xyz).
-    template<class F1>
-    explicit Ang3_tpl(const Matrix34_tpl<F1>& m)
-    {
-        assert(m.IsOrthonormalRH(0.001f));
-        y = F(asin_tpl(max((F)-1.0, min((F)1.0, -m.m20))));
-        if (fabs_tpl(fabs_tpl(y) - (F)((F)g_PI * (F)0.5)) < (F)0.01)
-        {
-            x = F(0);
-            z = F(atan2_tpl(-m.m01, m.m11));
-        }
-        else
-        {
-            x = F(atan2_tpl(m.m21, m.m22));
-            z = F(atan2_tpl(m.m10, m.m00));
-        }
-    }
-
-    //! Convert Matrix44 to Euler Angles (xyz).
-    template<class F1>
-    explicit Ang3_tpl(const Matrix44_tpl<F1>& m)
-    {
-        assert(Matrix33(m).IsOrthonormalRH(0.001f));
-        y = F(asin_tpl(max((F)-1.0, min((F)1.0, -m.m20))));
-        if (fabs_tpl(fabs_tpl(y) - (F)((F)g_PI * (F)0.5)) < (F)0.01)
-        {
-            x = F(0);
-            z = F(atan2_tpl(-m.m01, m.m11));
-        }
-        else
-        {
-            x = F(atan2_tpl(m.m21, m.m22));
-            z = F(atan2_tpl(m.m10, m.m00));
-        }
-    }
-
-    template<typename F1>
-    static ILINE F CreateRadZ(const Vec2_tpl<F1>& v0, const Vec2_tpl<F1>& v1)
-    {
-        F cz    = v0.x * v1.y - v0.y * v1.x;
-        F c     =   v0.x * v1.x + v0.y * v1.y;
-        return F(atan2_tpl(cz, c));
-    }
-
-    template<typename F1>
-    static ILINE F CreateRadZ(const Vec3_tpl<F1>& v0, const Vec3_tpl<F1>& v1)
-    {
-        F cz    = v0.x * v1.y - v0.y * v1.x;
-        F c     =   v0.x * v1.x + v0.y * v1.y;
-        return F(atan2_tpl(cz, c));
-    }
-
-    template<typename F1>
-    ILINE static Ang3_tpl<F> GetAnglesXYZ(const Quat_tpl<F1>& q) {    return Ang3_tpl<F>(q); }
-    template<typename F1>
-    ILINE void SetAnglesXYZ(const Quat_tpl<F1>& q)    {   *this = Ang3_tpl<F>(q);   }
-
-    template<typename F1>
-    ILINE static Ang3_tpl<F> GetAnglesXYZ(const Matrix33_tpl<F1>& m) {    return Ang3_tpl<F>(m); }
-    template<typename F1>
-    ILINE void SetAnglesXYZ(const Matrix33_tpl<F1>& m)    {   *this = Ang3_tpl<F>(m);   }
-
-    template<typename F1>
-    ILINE static Ang3_tpl<F> GetAnglesXYZ(const Matrix34_tpl<F1>& m) {    return Ang3_tpl<F>(m); }
-    template<typename F1>
-    ILINE void SetAnglesXYZ(const Matrix34_tpl<F1>& m)    {   *this = Ang3_tpl<F>(m);   }
-
-    //---------------------------------------------------------------
-    ILINE F& operator [] (int index)          { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
-    ILINE F operator [] (int index) const { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
-
-
-    bool IsValid() const
-    {
-        if (!NumberValid(x))
-        {
-            return false;
-        }
-        if (!NumberValid(y))
-        {
-            return false;
-        }
-        if (!NumberValid(z))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-typedef Ang3_tpl<f32>       Ang3;
-typedef Ang3_tpl<real>  Ang3r;
-typedef Ang3_tpl<f64>       Ang3_f64;
-
-//---------------------------------------
-
-//vector addition
-template<class F1, class F2>
-ILINE Ang3_tpl<F1> operator + (const Ang3_tpl<F1>& v0, const Ang3_tpl<F2>& v1)
-{
-    return Ang3_tpl<F1>(v0.x + v1.x, v0.y + v1.y, v0.z + v1.z);
-}
-//vector subtraction
-template<class F1, class F2>
-ILINE Ang3_tpl<F1> operator - (const Ang3_tpl<F1>& v0, const Ang3_tpl<F2>& v1)
-{
-    return Ang3_tpl<F1>(v0.x - v1.x, v0.y - v1.y, v0.z - v1.z);
-}
-
-//---------------------------------------
-
-//vector self-addition
-template<class F1, class F2>
-ILINE Ang3_tpl<F1>& operator += (Ang3_tpl<F1>& v0, const Ang3_tpl<F2>& v1)
-{
-    v0 = v0 + v1;
-    return v0;
-}
-//vector self-subtraction
-template<class F1, class F2>
-ILINE Ang3_tpl<F1>& operator -= (Ang3_tpl<F1>& v0, const Ang3_tpl<F2>& v1)
-{
-    v0 = v0 - v1;
-    return v0;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// struct CAngleAxis
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-template <typename F>
-struct AngleAxis_tpl
-{
-    //! storage for the Angle&Axis coordinates.
-    F angle;
-    Vec3_tpl<F> axis;
-
-    // default quaternion constructor
-    AngleAxis_tpl(void) { };
-    AngleAxis_tpl(F a, F ax, F ay, F az) {  angle = a; axis.x = ax; axis.y = ay; axis.z = az; }
-    AngleAxis_tpl(F a, const Vec3_tpl<F>& n) { angle = a; axis = n; }
-    void operator () (F a, const Vec3_tpl<F>& n) {  angle = a; axis = n; }
-    AngleAxis_tpl(const AngleAxis_tpl<F>& aa);   //CAngleAxis aa=angleaxis
-    const Vec3_tpl<F> operator * (const Vec3_tpl<F>& v) const;
-
-    AngleAxis_tpl(const Quat_tpl<F>& q)
-    {
-        angle = acos_tpl(q.w) * 2;
-        axis    = q.v;
-        axis.Normalize();
-        F s = sin_tpl(angle * (F)0.5);
-        if (s == 0)
-        {
-            angle = 0;
-            axis.x = 0;
-            axis.y = 0;
-            axis.z = 1;
-        }
-    }
-};
-
-typedef AngleAxis_tpl<f32> AngleAxis;
-typedef AngleAxis_tpl<f64> AngleAxis_f64;
-
-template<typename F>
-ILINE const Vec3_tpl<F> AngleAxis_tpl<F>::operator * (const Vec3_tpl<F>& v) const
-{
-    Vec3_tpl<F> origin  = axis * (axis | v);
-    return origin +  (v - origin) * cos_tpl(angle)  +  (axis % v) * sin_tpl(angle);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//////////////////////////////////////////////////////////////////////
-template<typename F>
-struct Plane_tpl
-{
-    //plane-equation: n.x*x + n.y*y + n.z*z + d > 0 is in front of the plane
-    Vec3_tpl<F> n;  //!< normal
-    F   d;                      //!< distance
-
-    //----------------------------------------------------------------
-
-#if defined(_DEBUG)
-    ILINE Plane_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&n.x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-            p[3] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&n.x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-            p[3] = F64NAN;
-        }
-    }
-#else
-    ILINE Plane_tpl()   {};
-#endif
-
-
-    ILINE Plane_tpl(const Plane_tpl<F>& p) {  n = p.n; d = p.d; }
-    ILINE Plane_tpl(const Vec3_tpl<F>& normal, const F& distance) {  n = normal; d = distance; }
-
-    //! set normal and dist for this plane and  then calculate plane type
-    ILINE void Set(const Vec3_tpl<F>& vNormal, const F fDist)
-    {
-        n = vNormal;
-        d = fDist;
-    }
-
-    ILINE void SetPlane(const Vec3_tpl<F>& normal, const Vec3_tpl<F>& point)
-    {
-        n = normal;
-        d = -(point | normal);
-    }
-    ILINE static Plane_tpl<F> CreatePlane(const Vec3_tpl<F>& normal, const Vec3_tpl<F>& point)
-    {
-        return Plane_tpl<F>(normal, -(point | normal));
-    }
-
-    ILINE Plane_tpl<F> operator - (void) const { return Plane_tpl<F>(-n, -d); }
-
-    /*!
-    * Constructs the plane by tree given Vec3s (=triangle) with a right-hand (anti-clockwise) winding
-    *
-    * Example 1:
-    *  Vec3 v0(1,2,3),v1(4,5,6),v2(6,5,6);
-    *  Plane_tpl<F>  plane;
-    *  plane.SetPlane(v0,v1,v2);
-    *
-    * Example 2:
-    *  Vec3 v0(1,2,3),v1(4,5,6),v2(6,5,6);
-    *  Plane_tpl<F>  plane=Plane_tpl<F>::CreatePlane(v0,v1,v2);
-    */
-    ILINE void SetPlane(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2)
-    {
-        n = ((v1 - v0) % (v2 - v0)).GetNormalized();  //vector cross-product
-        d   =   -(n | v0);              //calculate d-value
-    }
-    ILINE static Plane_tpl<F> CreatePlane(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2)
-    {
-        Plane_tpl<F> p;
-        p.SetPlane(v0, v1, v2);
-        return p;
-    }
-
-    /*!
-    * Computes signed distance from point to plane.
-    * This is the standard plane-equation: d=Ax*By*Cz+D.
-    * The normal-vector is assumed to be normalized.
-    *
-    * Example:
-    *  Vec3 v(1,2,3);
-    *  Plane_tpl<F>  plane=CalculatePlane(v0,v1,v2);
-    *  f32 distance = plane|v;
-    */
-    ILINE F operator | (const Vec3_tpl<F>& point) const { return (n | point) + d; }
-    ILINE F DistFromPlane(const Vec3_tpl<F>& vPoint) const  {   return (n * vPoint + d); }
-
-    ILINE Plane_tpl<F> operator - (const Plane_tpl<F>& p) const { return Plane_tpl<F>(n - p.n, d - p.d); }
-    ILINE Plane_tpl<F> operator + (const Plane_tpl<F>& p) const { return Plane_tpl<F>(n + p.n, d + p.d); }
-    ILINE void operator -= (const Plane_tpl<F>& p) { d -= p.d; n -= p.n; }
-    ILINE Plane_tpl<F> operator * (F s) const {   return Plane_tpl<F>(n * s, d * s);   }
-    ILINE Plane_tpl<F> operator / (F s) const {   return Plane_tpl<F>(n / s, d / s); }
-
-    //! check for equality between two planes
-    friend  bool operator ==(const Plane_tpl<F>& p1, const Plane_tpl<F>& p2)
-    {
-        if (fabsf(p1.n.x - p2.n.x) > 0.0001f)
-        {
-            return (false);
-        }
-        if (fabsf(p1.n.y - p2.n.y) > 0.0001f)
-        {
-            return (false);
-        }
-        if (fabsf(p1.n.z - p2.n.z) > 0.0001f)
-        {
-            return (false);
-        }
-        if (fabsf(p1.d - p2.d) < 0.01f)
-        {
-            return(true);
-        }
-        return (false);
-    }
-
-    Vec3_tpl<F> MirrorVector(const Vec3_tpl<F>& i)   {  return n * (2 * (n | i)) - i;  }
-    Vec3_tpl<F> MirrorPosition(const Vec3_tpl<F>& i) {  return i - n * (2 * ((n | i) + d)); }
-
-    ILINE bool IsValid() const { return !n.IsZeroFast(); } //A plane with a zero normal isn't valid.
-
-    AUTO_STRUCT_INFO
-};
-
-typedef Plane_tpl<f32>  Plane; //always 32 bit
-typedef Plane_tpl<f64>  Planed;//always 64 bit
-typedef Plane_tpl<real> Planer;//variable float precision. depending on the target system it can be between 32, 64 or 80 bit
-
-
-// declare common constants.  Must be done after the class for compiler conformance
-// (msvc and clang handle instantiation differently)
-const Vec3_tpl<float> Vec3_Zero(0, 0, 0);
-const Vec3_tpl<float> Vec3_OneX(1, 0, 0);
-const Vec3_tpl<float> Vec3_OneY(0, 1, 0);
-const Vec3_tpl<float> Vec3_OneZ(0, 0, 1);
-const Vec3_tpl<float> Vec3_One(1, 1, 1);
-
-namespace AZ
-{
-    AZ_TYPE_INFO_SPECIALIZE(Vec3, "{DFA993FB-4E92-4A13-BDB3-4E9285A5346F}");
-}
-#endif // CRYINCLUDE_CRYCOMMON_CRY_VECTOR3_H
diff --git a/Code/CryEngine/CryCommon/Cry_Vector4.h b/Code/CryEngine/CryCommon/Cry_Vector4.h
deleted file mode 100644
index 90354ab6f1..0000000000
--- a/Code/CryEngine/CryCommon/Cry_Vector4.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common vector class
-
-
-#pragma once
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class Vec4_tpl
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-template <typename F>
-struct Vec4_tpl
-{
-    typedef F value_type;
-    enum
-    {
-        component_count = 4
-    };
-
-    F x, y, z, w;
-
-#if defined(_DEBUG)
-    ILINE Vec4_tpl()
-    {
-        if constexpr (sizeof(F) == 4)
-        {
-            uint32* p = alias_cast<uint32*>(&x);
-            p[0] = F32NAN;
-            p[1] = F32NAN;
-            p[2] = F32NAN;
-            p[3] = F32NAN;
-        }
-        if constexpr (sizeof(F) == 8)
-        {
-            uint64* p = alias_cast<uint64*>(&x);
-            p[0] = F64NAN;
-            p[1] = F64NAN;
-            p[2] = F64NAN;
-            p[3] = F64NAN;
-        }
-    }
-#else
-    ILINE Vec4_tpl() {}
-#endif
-
-    template<typename F2>
-    ILINE Vec4_tpl<F>& operator = (const Vec4_tpl<F2>& v1)
-    {
-        x = F(v1.x);
-        y = F(v1.y);
-        z = F(v1.z);
-        w = F(v1.w);
-        return (*this);
-    }
-
-    ILINE Vec4_tpl(F vx, F vy, F vz, F vw) { x = vx; y = vy; z = vz; w = vw; }
-    ILINE Vec4_tpl(const Vec3_tpl<F>& v, F vw) {  x = v.x; y = v.y; z = v.z; w = vw; }
-    explicit ILINE Vec4_tpl(F m) { x = y = z = w = m; }
-    ILINE Vec4_tpl(type_zero) { x = y = z = w = F(0); }
-
-    ILINE void operator () (F vx, F vy, F vz, F vw) { x = vx; y = vy; z = vz; w = vw; }
-    ILINE void operator () (const Vec3_tpl<F>& v, F vw) {  x = v.x; y = v.y; z = v.z; w = vw; }
-
-    ILINE F& operator [] (int index)          { assert(index >= 0 && index <= 3);  return ((F*)this)[index]; }
-    ILINE F operator [] (int index) const { assert(index >= 0 && index <= 3);  return ((F*)this)[index]; }
-    template <class T>
-    ILINE  Vec4_tpl(const Vec4_tpl<T>& v)
-        : x((F)v.x)
-        , y((F)v.y)
-        , z((F)v.z)
-        , w((F)v.w) { assert(this->IsValid()); }
-
-    ILINE Vec4_tpl& zero() { x = y = z = w = 0; return *this; }
-
-    ILINE bool IsEquivalent(const Vec4_tpl<F>& v1, F epsilon = VEC_EPSILON) const
-    {
-        assert(v1.IsValid());
-        assert(this->IsValid());
-        return  ((fabs_tpl(x - v1.x) <= epsilon) &&   (fabs_tpl(y - v1.y) <= epsilon) && (fabs_tpl(z - v1.z) <= epsilon) && (fabs_tpl(w - v1.w) <= epsilon));
-    }
-
-
-    ILINE Vec4_tpl& operator=(const Vec4_tpl& src)
-    {
-        x = src.x;
-        y = src.y;
-        z = src.z;
-        w = src.w;
-        return *this;
-    }
-
-    ILINE Vec4_tpl<F> operator * (F k) const
-    {
-        return Vec4_tpl<F>(x * k, y * k, z * k, w * k);
-    }
-    ILINE Vec4_tpl<F> operator / (F k) const
-    {
-        k = (F)1.0 / k;
-        return Vec4_tpl<F>(x * k, y * k, z * k, w * k);
-    }
-
-    ILINE Vec4_tpl<F>& operator *= (F k)
-    {
-        x *= k;
-        y *= k;
-        z *= k;
-        w *= k;
-        return *this;
-    }
-    ILINE Vec4_tpl<F>& operator /= (F k)
-    {
-        k = (F)1.0 / k;
-        x *= k;
-        y *= k;
-        z *= k;
-        w *= k;
-        return *this;
-    }
-
-    ILINE void operator += (const Vec4_tpl<F>& v)
-    {
-        x += v.x;
-        y += v.y;
-        z += v.z;
-        w += v.w;
-    }
-
-    ILINE void operator -= (const Vec4_tpl<F>& v)
-    {
-        x -= v.x;
-        y -= v.y;
-        z -= v.z;
-        w -= v.w;
-    }
-
-
-    ILINE F Dot (const Vec4_tpl<F>& vec2)   const
-    {
-        return x * vec2.x + y * vec2.y + z * vec2.z + w * vec2.w;
-    }
-
-    ILINE F GetLength() const
-    {
-        return sqrt_tpl(Dot(*this));
-    }
-
-    ILINE F GetLengthSquared() const
-    {
-        return Dot(*this);
-    }
-
-
-    bool IsValid() const
-    {
-        if (!NumberValid(x))
-        {
-            return false;
-        }
-        if (!NumberValid(y))
-        {
-            return false;
-        }
-        if (!NumberValid(z))
-        {
-            return false;
-        }
-        if (!NumberValid(w))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    /*!
-    * functions and operators to compare vector
-    *
-    * Example:
-    *  if (v0==v1) dosomething;
-    */
-    ILINE bool operator==(const Vec4_tpl<F>& vec)
-    {
-        return x == vec.x && y == vec.y && z == vec.z && w == vec.w;
-    }
-    ILINE bool operator!=(const Vec4_tpl<F>& vec) { return !(*this == vec); }
-
-    ILINE friend bool operator ==(const Vec4_tpl<F>& v0, const Vec4_tpl<F>& v1)
-    {
-        return ((v0.x == v1.x) && (v0.y == v1.y) && (v0.z == v1.z) && (v0.w == v1.w));
-    }
-    ILINE friend bool operator !=(const Vec4_tpl<F>& v0, const Vec4_tpl<F>& v1) {   return !(v0 == v1);   }
-
-    //! normalize the vector
-    // The default Normalize function is in fact "safe". 0 vectors remain unchanged.
-    ILINE void  Normalize()
-    {
-        assert(this->IsValid());
-        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z + w * w);
-        x *= fInvLen;
-        y *= fInvLen;
-        z *= fInvLen;
-        w *= fInvLen;
-    }
-
-    //! may be faster and less accurate
-    ILINE void NormalizeFast()
-    {
-        assert(this->IsValid());
-        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z + w * w);
-        x *= fInvLen;
-        y *= fInvLen;
-        z *= fInvLen;
-        w *= fInvLen;
-    }
-
-    ILINE void SetLerp(const Vec4_tpl<F>& p, const Vec4_tpl<F>& q, F t) { *this = p * (1.0f - t) + q * t; }
-    ILINE static Vec4_tpl<F> CreateLerp(const Vec4_tpl<F>& p, const Vec4_tpl<F>& q, F t) {    return p * (1.0f - t) + q * t; }
-
-    AUTO_STRUCT_INFO
-};
-
-
-typedef Vec4_tpl<f32>    Vec4;  // always 32 bit
-typedef Vec4_tpl<f64>    Vec4d; // always 64 bit
-typedef Vec4_tpl<int32>  Vec4i;
-typedef Vec4_tpl<uint32> Vec4ui;
-typedef Vec4_tpl<real> Vec4r; // variable float precision. depending on the target system it can be 32, 64 or 80 bit
-
-#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE)
-typedef Vec4_tpl<f32> Vec4A;
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(Cry_Vector4_h)
-#endif
-
-//vector self-addition
-template<class F1, class F2>
-ILINE Vec4_tpl<F1>& operator += (Vec4_tpl<F1>& v0, const Vec4_tpl<F2>& v1)
-{
-    v0 = v0 + v1;
-    return v0;
-}
-
-//vector addition
-template<class F1, class F2>
-ILINE Vec4_tpl<F1> operator + (const Vec4_tpl<F1>& v0, const Vec4_tpl<F2>& v1)
-{
-    return Vec4_tpl<F1>(v0.x + v1.x, v0.y + v1.y, v0.z + v1.z, v0.w + v1.w);
-}
-//vector subtraction
-template<class F1, class F2>
-ILINE Vec4_tpl<F1> operator - (const Vec4_tpl<F1>& v0, const Vec4_tpl<F2>& v1)
-{
-    return Vec4_tpl<F1>(v0.x - v1.x, v0.y - v1.y, v0.z - v1.z, v0.w - v1.w);
-}
-
-//vector multiplication
-template<class F1, class F2>
-ILINE Vec4_tpl<F1> operator * (const Vec4_tpl<F1> v0, const Vec4_tpl<F2>& v1)
-{
-    return Vec4_tpl<F1>(v0.x * v1.x, v0.y * v1.y, v0.z * v1.z, v0.w * v1.w);
-}
-
-//vector division
-template<class F1, class F2>
-ILINE Vec4_tpl<F1> operator / (const Vec4_tpl<F1>& v0, const Vec4_tpl<F2>& v1)
-{
-    return Vec4_tpl<F1>(v0.x / v1.x, v0.y / v1.y, v0.z / v1.z, v0.w / v1.w);
-}
diff --git a/Code/CryEngine/CryCommon/Cry_XOptimise.h b/Code/CryEngine/CryCommon/Cry_XOptimise.h
deleted file mode 100644
index 02d91e39ac..0000000000
--- a/Code/CryEngine/CryCommon/Cry_XOptimise.h
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Misc mathematical functions
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_XOPTIMISE_H
-#define CRYINCLUDE_CRYCOMMON_CRY_XOPTIMISE_H
-#pragma once
-
-#include <platform.h>
-
-
-
-
-inline float AngleMod(float a)
-{
-    a = (float)((360.0 / 65536) * ((int)(a * (65536 / 360.0)) & 65535));
-    return a;
-}
-
-inline float AngleModRad(float a)
-{
-    a = (float)((gf_PI2 / 65536) * ((int)(a * (65536 / gf_PI2)) & 65535));
-    return a;
-}
-inline unsigned short Degr2Word(float f)
-{
-    return (unsigned short)(AngleMod(f) / 360.0f * 65536.0f);
-}
-inline float Word2Degr(unsigned short s)
-{
-    return (float)s / 65536.0f * 360.0f;
-}
-
-#if defined(_CPU_X86)
-ILINE float __fastcall Ffabs(float f)
-{
-    *((unsigned*) &f) &= ~0x80000000;
-    return (f);
-}
-#else
-inline float Ffabs(float x) { return fabsf(x); }
-#endif
-
-
-
-#define mathMatrixRotationZ(pOut, angle) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateRotationZ(angle)))
-#define mathMatrixRotationY(pOut, angle) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateRotationY(angle)))
-#define mathMatrixRotationX(pOut, angle) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateRotationX(angle)))
-#define mathMatrixTranslation(pOut, x, y, z) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateTranslationMat(Vec3(x, y, z))))
-#define mathMatrixScaling(pOut, sx, sy, sz) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateScale(Vec3(sx, sy, sz))))
-
-template <class T>
-inline void ExchangeVals(T& X, T& Y)
-{
-    const T Tmp = X;
-    X = Y;
-    Y = Tmp;
-}
-
-
-inline void mathMatrixPerspectiveFov(Matrix44A* pMatr, f32 fovY, f32 Aspect, f32 zn, f32 zf)
-{
-    f32 yScale = 1.0f / tan_tpl(fovY / 2.0f);
-    f32 xScale = yScale / Aspect;
-
-    f32 m22 = f32(f64(zf) / (f64(zn) - f64(zf)));
-    f32 m32 = f32(f64(zn) * f64(zf) / (f64(zn) - f64(zf)));
-
-    (*pMatr)(0, 0) = xScale;
-    (*pMatr)(0, 1) = 0;
-    (*pMatr)(0, 2) = 0;
-    (*pMatr)(0, 3) = 0;
-    (*pMatr)(1, 0) = 0;
-    (*pMatr)(1, 1) = yScale;
-    (*pMatr)(1, 2) = 0;
-    (*pMatr)(1, 3) = 0;
-    (*pMatr)(2, 0) = 0;
-    (*pMatr)(2, 1) = 0;
-    (*pMatr)(2, 2) = m22;
-    (*pMatr)(2, 3) = -1.0f;
-    (*pMatr)(3, 0) = 0;
-    (*pMatr)(3, 1) = 0;
-    (*pMatr)(3, 2) = m32;
-    (*pMatr)(3, 3) = 0;
-}
-
-
-
-inline void mathMatrixOrtho(Matrix44A* pMatr, f32 w, f32 h, f32 zn, f32 zf)
-{
-    f32 m22 = f32(1.0 / (f64(zn) - f64(zf)));
-    f32 m32 = f32(f64(zn) / (f64(zn) - f64(zf)));
-
-    (*pMatr)(0, 0) = 2.0f / w;
-    (*pMatr)(0, 1) = 0;
-    (*pMatr)(0, 2) = 0;
-    (*pMatr)(0, 3) = 0;
-    (*pMatr)(1, 0) =     0;
-    (*pMatr)(1, 1) = 2.0f / h;
-    (*pMatr)(1, 2) = 0;
-    (*pMatr)(1, 3) = 0;
-    (*pMatr)(2, 0) =     0;
-    (*pMatr)(2, 1) = 0;
-    (*pMatr)(2, 2) = m22;
-    (*pMatr)(2, 3) = 0;
-    (*pMatr)(3, 0) =     0;
-    (*pMatr)(3, 1) = 0;
-    (*pMatr)(3, 2) = m32;
-    (*pMatr)(3, 3) = 1;
-}
-
-inline void mathMatrixOrthoOffCenter(Matrix44A* pMatr, f32 l, f32 r, f32 b, f32 t, f32 zn, f32 zf)
-{
-    f32 m22 = f32(1.0 / (f64(zn) - f64(zf)));
-    f32 m32 = f32(f64(zn) / (f64(zn) - f64(zf)));
-
-    (*pMatr)(0, 0) = 2.0f / (r - l);
-    (*pMatr)(0, 1) = 0;
-    (*pMatr)(0, 2) = 0;
-    (*pMatr)(0, 3) = 0;
-    (*pMatr)(1, 0) =     0;
-    (*pMatr)(1, 1) = 2.0f / (t - b);
-    (*pMatr)(1, 2) = 0;
-    (*pMatr)(1, 3) = 0;
-    (*pMatr)(2, 0) =     0;
-    (*pMatr)(2, 1) =  0;
-    (*pMatr)(2, 2) = m22;
-    (*pMatr)(2, 3) = 0;
-    (*pMatr)(3, 0) = (l + r) / (l - r);
-    (*pMatr)(3, 1) = (t + b) / (b - t);
-    (*pMatr)(3, 2) = m32;
-    (*pMatr)(3, 3) = 1.0f;
-}
-
-
-inline void mathMatrixOrthoOffCenterLH(Matrix44A* pMatr, f32 l, f32 r, f32 b, f32 t, f32 zn, f32 zf)
-{
-    f32 m22 = f32(1.0 / (f64(zf) - f64(zn)));
-    f32 m32 = f32(f64(zn) / (f64(zn) - f64(zf)));
-
-    (*pMatr)(0, 0) = 2.0f / (r - l);
-    (*pMatr)(0, 1) = 0;
-    (*pMatr)(0, 2) = 0;
-    (*pMatr)(0, 3) = 0;
-    (*pMatr)(1, 0) =     0;
-    (*pMatr)(1, 1) = 2.0f / (t - b);
-    (*pMatr)(1, 2) = 0;
-    (*pMatr)(1, 3) = 0;
-    (*pMatr)(2, 0) =     0;
-    (*pMatr)(2, 1) =  0;
-    (*pMatr)(2, 2) = m22;
-    (*pMatr)(2, 3) = 0;
-    (*pMatr)(3, 0) = (l + r) / (l - r);
-    (*pMatr)(3, 1) = (t + b) / (b - t);
-    (*pMatr)(3, 2) = m32;
-    (*pMatr)(3, 3) = 1.0f;
-}
-
-
-inline void mathMatrixPerspectiveOffCenter(Matrix44A* pMatr, f32 l, f32 r, f32 b, f32 t, f32 zn, f32 zf)
-{
-    f32 m22 = f32(f64(zf) / (f64(zn) - f64(zf)));
-    f32 m32 = f32(f64(zn) * f64(zf) / (f64(zn) - f64(zf)));
-
-    (*pMatr)(0, 0) = 2 * zn / (r - l);
-    (*pMatr)(0, 1) =  0;
-    (*pMatr)(0, 2) = 0;
-    (*pMatr)(0, 3) = 0;
-    (*pMatr)(1, 0) = 0;
-    (*pMatr)(1, 1) = 2 * zn / (t - b);
-    (*pMatr)(1, 2) = 0;
-    (*pMatr)(1, 3) = 0;
-    (*pMatr)(2, 0) = (l + r) / (r - l);
-    (*pMatr)(2, 1) = (t + b) / (t - b);
-    (*pMatr)(2, 2) =   m22;
-    (*pMatr)(2, 3) = -1;
-    (*pMatr)(3, 0) = 0;
-    (*pMatr)(3, 1) = 0;
-    (*pMatr)(3, 2) =   m32;
-    (*pMatr)(3, 3) = 0;
-}
-
-inline void mathMatrixPerspectiveOffCenterReverseDepth(Matrix44A* pMatr, f32 l, f32 r, f32 b, f32 t, f32 zn, f32 zf)
-{
-    f32 m22 = f32(-f64(zn) / (f64(zn) - f64(zf)));
-    f32 m32 = f32(-f64(zn) * f64(zf) / (f64(zn) - f64(zf)));
-
-    (*pMatr)(0, 0) = 2 * zn / (r - l);
-    (*pMatr)(0, 1) =  0;
-    (*pMatr)(0, 2) = 0;
-    (*pMatr)(0, 3) = 0;
-    (*pMatr)(1, 0) = 0;
-    (*pMatr)(1, 1) = 2 * zn / (t - b);
-    (*pMatr)(1, 2) = 0;
-    (*pMatr)(1, 3) = 0;
-    (*pMatr)(2, 0) = (l + r) / (r - l);
-    (*pMatr)(2, 1) = (t + b) / (t - b);
-    (*pMatr)(2, 2) =   m22;
-    (*pMatr)(2, 3) = -1;
-    (*pMatr)(3, 0) = 0;
-    (*pMatr)(3, 1) = 0;
-    (*pMatr)(3, 2) =   m32;
-    (*pMatr)(3, 3) = 0;
-}
-
-//RH
-inline void mathMatrixLookAt(Matrix44A* pMatr, const Vec3& Eye, const Vec3& At, const Vec3& Up)
-{
-    Vec3 vLightDir = (Eye - At);
-    Vec3 zaxis = vLightDir.GetNormalized();
-    Vec3 xaxis = (Up.Cross(zaxis)).GetNormalized();
-    Vec3 yaxis = zaxis.Cross(xaxis);
-
-    (*pMatr)(0, 0) = xaxis.x;
-    (*pMatr)(0, 1) = yaxis.x;
-    (*pMatr)(0, 2) = zaxis.x;
-    (*pMatr)(0, 3) = 0;
-    (*pMatr)(1, 0) = xaxis.y;
-    (*pMatr)(1, 1) = yaxis.y;
-    (*pMatr)(1, 2) = zaxis.y;
-    (*pMatr)(1, 3) = 0;
-    (*pMatr)(2, 0) = xaxis.z;
-    (*pMatr)(2, 1) = yaxis.z;
-    (*pMatr)(2, 2) = zaxis.z;
-    (*pMatr)(2, 3) = 0;
-    (*pMatr)(3, 0) = -xaxis.Dot(Eye);
-    (*pMatr)(3, 1) = -yaxis.Dot(Eye);
-    (*pMatr)(3, 2) = -zaxis.Dot(Eye);
-    (*pMatr)(3, 3) = 1;
-}
-
-inline bool mathMatrixPerspectiveFovInverse(Matrix44_tpl<f64>* pResult, const Matrix44A* pProjFov)
-{
-    if ((*pProjFov)(0, 1) == 0.0f && (*pProjFov)(0, 2) == 0.0f && (*pProjFov)(0, 3) == 0.0f &&
-        (*pProjFov)(1, 0) == 0.0f && (*pProjFov)(1, 2) == 0.0f && (*pProjFov)(1, 3) == 0.0f &&
-        (*pProjFov)(3, 0) == 0.0f && (*pProjFov)(3, 1) == 0.0f && (*pProjFov)(3, 2) != 0.0f)
-    {
-        (*pResult)(0, 0) = 1.0 / (*pProjFov).m00;
-        (*pResult)(0, 1) = 0;
-        (*pResult)(0, 2) = 0;
-        (*pResult)(0, 3) = 0;
-        (*pResult)(1, 0) = 0;
-        (*pResult)(1, 1) = 1.0 / (*pProjFov).m11;
-        (*pResult)(1, 2) = 0;
-        (*pResult)(1, 3) = 0;
-        (*pResult)(2, 0) = 0;
-        (*pResult)(2, 1) = 0;
-        (*pResult)(2, 2) = 0;
-        (*pResult)(2, 3) = 1.0 / (*pProjFov).m32;
-        (*pResult)(3, 0) = (*pProjFov).m20 / (*pProjFov).m00;
-        (*pResult)(3, 1) = (*pProjFov).m21 / (*pProjFov).m11;
-        (*pResult)(3, 2) = -1;
-        (*pResult)(3, 3) = (*pProjFov).m22 / (*pProjFov).m32;
-
-        return true;
-    }
-
-    return false;
-}
-
-template<class T_out, class T_in>
-inline void mathMatrixLookAtInverse(Matrix44_tpl<T_out>* pResult, const Matrix44_tpl<T_in>* pLookAt)
-{
-    (*pResult)(0, 0) = (*pLookAt).m00;
-    (*pResult)(0, 1) = (*pLookAt).m10;
-    (*pResult)(0, 2) = (*pLookAt).m20;
-    (*pResult)(0, 3) = (*pLookAt).m03;
-    (*pResult)(1, 0) = (*pLookAt).m01;
-    (*pResult)(1, 1) = (*pLookAt).m11;
-    (*pResult)(1, 2) = (*pLookAt).m21;
-    (*pResult)(1, 3) = (*pLookAt).m13;
-    (*pResult)(2, 0) = (*pLookAt).m02;
-    (*pResult)(2, 1) = (*pLookAt).m12;
-    (*pResult)(2, 2) = (*pLookAt).m22;
-    (*pResult)(2, 3) = (*pLookAt).m23;
-
-    (*pResult)(3, 0) = T_out(-(f64((*pLookAt).m00) * f64((*pLookAt).m30) + f64((*pLookAt).m01) * f64((*pLookAt).m31) + f64((*pLookAt).m02) * f64((*pLookAt).m32)));
-    (*pResult)(3, 1) = T_out(-(f64((*pLookAt).m10) * f64((*pLookAt).m30) + f64((*pLookAt).m11) * f64((*pLookAt).m31) + f64((*pLookAt).m12) * f64((*pLookAt).m32)));
-    (*pResult)(3, 2) = T_out(-(f64((*pLookAt).m20) * f64((*pLookAt).m30) + f64((*pLookAt).m21) * f64((*pLookAt).m31) + f64((*pLookAt).m22) * f64((*pLookAt).m32)));
-    (*pResult)(3, 3) = (*pLookAt).m33;
-};
-
-inline void mathVec4Transform(f32 out[4], const f32 m[16], const f32 in[4])
-{
-#define M(row, col)  m[col * 4 + row]
-    out[0] =    M(0, 0) * in[0] + M(0, 1) * in[1] + M(0, 2) * in[2] + M(0, 3) * in[3];
-    out[1] =    M(1, 0) * in[0] + M(1, 1) * in[1] + M(1, 2) * in[2] + M(1, 3) * in[3];
-    out[2] =    M(2, 0) * in[0] + M(2, 1) * in[1] + M(2, 2) * in[2] + M(2, 3) * in[3];
-    out[3] =    M(3, 0) * in[0] + M(3, 1) * in[1] + M(3, 2) * in[2] + M(3, 3) * in[3];
-#undef M
-}
-
-//fix: replace by 3x4 Matrix transformation and move to crymath
-inline void mathVec3Transform(f32 out[4], const f32 m[16], const f32 in[3])
-{
-#define M(row, col)  m[col * 4 + row]
-    out[0] =    M(0, 0) * in[0] + M(0, 1) * in[1] + M(0, 2) * in[2] + M(0, 3) * 1.0f;
-    out[1] =    M(1, 0) * in[0] + M(1, 1) * in[1] + M(1, 2) * in[2] + M(1, 3) * 1.0f;
-    out[2] =    M(2, 0) * in[0] + M(2, 1) * in[1] + M(2, 2) * in[2] + M(2, 3) * 1.0f;
-    out[3] =    M(3, 0) * in[0] + M(3, 1) * in[1] + M(3, 2) * in[2] + M(3, 3) * 1.0f;
-#undef M
-}
-
-#define mathVec3TransformF(pOut, pV, pM) mathVec3Transform((f32*)pOut, (const f32*)pM, (f32*)pV)
-#define mathVec4TransformF(pOut, pV, pM) mathVec4Transform((f32*)pOut, (const f32*)pM, (f32*)pV)
-#define mathVec3NormalizeF(pOut, pV) (*(Vec3*)pOut) = (((Vec3*)pV)->GetNormalizedSafe())
-#define mathVec2NormalizeF(pOut, pV) (*(Vec2*)pOut) = (((Vec2*)pV)->GetNormalizedSafe())
-
-
-//fix replace viewport by int16 array
-//fix for d3d viewport
-inline f32 mathVec3Project(Vec3* pvWin, const Vec3* pvObj, const int32 pViewport[4], const Matrix44A* pProjection, const Matrix44A* pView, const Matrix44A* pWorld)
-{
-    Vec4 in, out;
-
-    in.x = pvObj->x;
-    in.y = pvObj->y;
-    in.z = pvObj->z;
-    in.w = 1.0f;
-    mathVec4Transform((f32*)&out, (f32*)pWorld, (f32*)&in);
-    mathVec4Transform((f32*)&in, (f32*)pView, (f32*)&out);
-    mathVec4Transform((f32*)&out, (f32*)pProjection, (f32*)&in);
-
-    if (out.w == 0.0f)
-    {
-        return 0.f;
-    }
-
-    out.x /= out.w;
-    out.y /= out.w;
-    out.z /= out.w;
-
-    //output coords
-    pvWin->x = pViewport[0] + (1 + out.x) * pViewport[2] / 2;
-    pvWin->y = pViewport[1] + (1 - out.y) * pViewport[3] / 2;  //flip coords for y axis
-
-    //FIX: update fViewportMinZ fViewportMaxZ support for Viewport everywhere
-    float fViewportMinZ = 0, fViewportMaxZ = 1.0f;
-
-    pvWin->z = fViewportMinZ + out.z * (fViewportMaxZ - fViewportMinZ);
-
-    return out.w;
-}
-
-inline Vec3* mathVec3UnProject(Vec3* pvObj, const Vec3* pvWin, const int32 pViewport[4], const Matrix44A* pProjection, const Matrix44A* pView, const Matrix44A* pWorld, [[maybe_unused]] int32 OptFlags)
-{
-    Matrix44A m, mA;
-    Vec4 in, out;
-
-    //FIX: update fViewportMinZ fViewportMaxZ support for Viewport everywhere
-    float fViewportMinZ = 0, fViewportMaxZ = 1.0f;
-
-    in.x = (pvWin->x - pViewport[0]) * 2 / pViewport[2] - 1.0f;
-    in.y = 1.0f - ((pvWin->y - pViewport[1]) * 2 / pViewport[3]);   //flip coords for y axis
-    in.z = (pvWin->z - fViewportMinZ) / (fViewportMaxZ - fViewportMinZ);
-    in.w = 1.0f;
-
-    //prepare inverse projection matrix
-    mA = ((*pWorld) * (*pView)) * (*pProjection);
-    m = mA.GetInverted();
-
-    mathVec4Transform((f32*)&out, m.GetData(), (f32*)&in);
-    if (out.w == 0.0f)
-    {
-        return NULL;
-    }
-
-    pvObj->x = out.x / out.w;
-    pvObj->y = out.y / out.w;
-    pvObj->z = out.z / out.w;
-
-    return pvObj;
-}
-
-
-inline Vec3* mathVec3ProjectArray(Vec3* pOut, uint32 OutStride, const Vec3* pV,   uint32 VStride, const int32 pViewport[4],   const Matrix44A* pProjection,   const Matrix44A* pView, const Matrix44A* pWorld, uint32 n, int32)
-{
-    Matrix44A m;
-    Vec4 in, out;
-
-    int8* pOutT = (int8*)pOut;
-    int8* pInT = (int8*)pV;
-
-    Vec3* pvWin;
-    Vec3* pvObj;
-
-    //FIX: update fViewportMinZ fViewportMaxZ support for Viewport everywhere
-    float fViewportMinZ = 0, fViewportMaxZ = 1.0f;
-
-    m =  ((*pWorld) * (*pView)) * (*pProjection);
-
-    for (uint32 i = 0; i < n; i++)
-    {
-        pvObj = (Vec3*)pInT;
-        pvWin = (Vec3*)pOutT;
-
-        in.x = pvObj->x;
-        in.y = pvObj->y;
-        in.z = pvObj->z;
-        in.w = 1.0f;
-
-        mathVec4Transform((f32*)&out, m.GetData(), (f32*)&in);
-
-        if (out.w == 0.0f)
-        {
-            return NULL;
-        }
-
-        float fInvW = 1.0f / out.w;
-        out.x *= fInvW;
-        out.y *= fInvW;
-        out.z *= fInvW;
-
-        //output coords
-        pvWin->x = pViewport[0] + (1 + out.x) * pViewport[2] / 2;
-        pvWin->y = pViewport[1] + (1 - out.y) * pViewport[3] / 2;  //flip coords for y axis
-
-        pvWin->z = fViewportMinZ + out.z * (fViewportMaxZ - fViewportMinZ);
-
-        pOutT += OutStride;
-        pInT += VStride;
-    }
-
-    return pOut;
-}
-
-
-inline Vec3* mathVec3UnprojectArray(Vec3* pOut, uint32 OutStride, const Vec3* pV, uint32 VStride, const int32 pViewport[4], const Matrix44* pProjection, const Matrix44* pView, const Matrix44* pWorld, uint32 n, [[maybe_unused]]   int32 OptFlags)
-{
-    Vec4 in, out;
-    Matrix44 m, mA;
-
-    int8* pOutT = (int8*)pOut;
-    int8* pInT = (int8*)pV;
-
-    Vec3* pvWin;
-    Vec3* pvObj;
-
-    //FIX: update fViewportMinZ fViewportMaxZ support for Viewport everywhere
-    float fViewportMinZ = 0, fViewportMaxZ = 1.0f;
-
-    mA =  ((*pWorld) * (*pView)) * (*pProjection);
-    m = mA.GetInverted();
-
-    for (uint32 i = 0; i < n; i++)
-    {
-        pvWin = (Vec3*)pInT;
-        pvObj = (Vec3*)pOutT;
-
-        in.x = (pvWin->x - pViewport[0]) * 2 / pViewport[2] - 1.0f;
-        in.y = 1.0f - ((pvWin->y - pViewport[1]) * 2 / pViewport[3]);   //flip coords for y axis
-        in.z = (pvWin->z - fViewportMinZ) / (fViewportMaxZ - fViewportMinZ);
-        in.w = 1.0f;
-
-        mathVec4Transform((f32*)&out, m.GetData(), (f32*)&in);
-
-        assert(out.w != 0.0f);
-
-        if (out.w == 0.0f)
-        {
-            return NULL;
-        }
-
-        pvObj->x = out.x / out.w;
-        pvObj->y = out.y / out.w;
-        pvObj->z = out.z / out.w;
-
-        pOutT += OutStride;
-        pInT += VStride;
-    }
-
-    return pOut;
-}
-
-
-
-
-/*****************************************************
-MISC FUNCTIONS
-*****************************************************/
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(_CPU_X86)
-inline int fastftol_positive(float f)
-{
-    int i;
-
-    f -= 0.5f;
-#if defined(_MSC_VER)
-    __asm fld [f]
-    __asm fistp [i]
-#elif defined(__GNUC__)
-    __asm__ ("fld %[f]\n fistpl %[i]" : [i] "+m" (i) : [f] "m" (f));
-#else
-#error
-#endif
-    return i;
-}
-#else
-inline int fastftol_positive (float f)
-{
-    assert(f >= 0.f);
-    return (int)floorf(f);
-}
-#endif
-
-
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(_CPU_X86)
-inline int fastround_positive(float f)
-{
-    int i;
-    assert(f >= 0.f);
-#if defined(_MSC_VER)
-    __asm fld [f]
-    __asm fistp [i]
-#elif defined(__GNUC__)
-    __asm__ ("fld %[f]\n fistpl %[i]" : [i] "+m" (i) : [f] "m" (f));
-#else
-#error
-#endif
-    return i;
-}
-#else
-inline int fastround_positive(float f)
-{
-    assert(f >= 0.f);
-    return (int) (f + 0.5f);
-}
-#endif
-
-
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(_CPU_X86)
-ILINE int __fastcall FtoI(float  x)
-{
-    int    t;
-#if defined(_MSC_VER)
-    __asm
-    {
-        fld   x
-        fistp t
-    }
-#elif defined(__GNUC__)
-    __asm__ ("fld %[x]\n fistpl %[t]" : [t] "+m" (t) : [x] "m" (x));
-#else
-#error
-#endif
-    return t;
-}
-#else
-inline int FtoI(float x) { return (int)x; }
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_CRY_XOPTIMISE_H
-
diff --git a/Code/CryEngine/CryCommon/FrameProfiler.h b/Code/CryEngine/CryCommon/FrameProfiler.h
deleted file mode 100644
index 4a8614b8c1..0000000000
--- a/Code/CryEngine/CryCommon/FrameProfiler.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <AzCore/Debug/Profiler.h>
-
-#define SUBSYSTEM_DEFINES \
-    X(PROFILE_ANY,          "Any")          \
-    X(PROFILE_RENDERER,     "Renderer")     \
-    X(PROFILE_3DENGINE,     "3DEngine")     \
-    X(PROFILE_PARTICLE,     "Particle")     \
-    X(PROFILE_AI,           "AI")           \
-    X(PROFILE_ANIMATION,    "Animation")    \
-    X(PROFILE_MOVIE,        "Movie")        \
-    X(PROFILE_ENTITY,       "Entity")       \
-    X(PROFILE_UI,           "UI")           \
-    X(PROFILE_NETWORK,      "Network")      \
-    X(PROFILE_PHYSICS,      "Physics")      \
-    X(PROFILE_SCRIPT,       "Script")       \
-    X(PROFILE_SCRIPT_CFUNC, "Script C Functions")  \
-    X(PROFILE_AUDIO,        "Audio")        \
-    X(PROFILE_EDITOR,       "Editor")       \
-    X(PROFILE_SYSTEM,       "System")       \
-    X(PROFILE_ACTION,       "Action")       \
-    X(PROFILE_GAME,         "Game")         \
-    X(PROFILE_INPUT,        "Input")        \
-    X(PROFILE_SYNC,         "Sync")         \
-    X(PROFILE_NETWORK_TRAFFIC, "Network Traffic") \
-    X(PROFILE_DEVICE,       "Device")
-
-#define X(Subsystem, SubsystemName) Subsystem,
-enum EProfiledSubsystem
-{
-    SUBSYSTEM_DEFINES
-    PROFILE_LAST_SUBSYSTEM
-};
-#undef X
-
-static_assert(static_cast<AZ::Debug::ProfileCategory>(PROFILE_LAST_SUBSYSTEM) == AZ::Debug::ProfileCategory::LegacyLast, "Mismatched AZ and Legacy profile categories");
-#include <AzCore/Debug/EventTrace.h>
-
-
-
-#define FUNCTION_PROFILER_LEGACYONLY(pISystem, subsystem)
-
-#define FUNCTION_PROFILER(pISystem, subsystem) \
-    AZ_PROFILE_FUNCTION(static_cast<AZ::Debug::ProfileCategory>(subsystem));
-
-#define FUNCTION_PROFILER_FAST(pISystem, subsystem, bProfileEnabled) \
-    AZ_PROFILE_FUNCTION(static_cast<AZ::Debug::ProfileCategory>(subsystem));
-
-#define FUNCTION_PROFILER_ALWAYS(pISystem, subsystem) \
-    AZ_PROFILE_FUNCTION(static_cast<AZ::Debug::ProfileCategory>(subsystem));
-
-#define FRAME_PROFILER_LEGACYONLY(szProfilerName, pISystem, subsystem)
-
-#define FRAME_PROFILER(szProfilerName, pISystem, subsystem) \
-    AZ_PROFILE_SCOPE(static_cast<AZ::Debug::ProfileCategory>(subsystem), szProfilerName);
-
-#define FRAME_PROFILER_FAST(szProfilerName, pISystem, subsystem, bProfileEnabled) \
-    AZ_PROFILE_SCOPE(static_cast<AZ::Debug::ProfileCategory>(subsystem), szProfilerName);
-
-#define FUNCTION_PROFILER_SYS(subsystem) \
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_##subsystem)
-
-#define STALL_PROFILER(cause)
-
diff --git a/Code/CryEngine/CryCommon/FunctorBaseFunction.h b/Code/CryEngine/CryCommon/FunctorBaseFunction.h
deleted file mode 100644
index 42677bf194..0000000000
--- a/Code/CryEngine/CryCommon/FunctorBaseFunction.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Implementation of the common function template specializations.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_FUNCTORBASEFUNCTION_H
-#define CRYINCLUDE_CRYCOMMON_FUNCTORBASEFUNCTION_H
-#pragma once
-
-
-#include "IFunctorBase.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Return type void
-// No arguments.
-template<>
-class TFunctor<void (*)()>
-    : public IFunctorBase
-{
-public:
-    typedef void (* TFunctionType)();
-
-    TFunctor(TFunctionType pFunction)
-        : m_pfnFunction(pFunction){}
-
-    virtual void Call()
-    {
-        m_pfnFunction();
-    }
-private:
-    TFunctionType                   m_pfnFunction;
-};
-//////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////
-// Return type void
-// 1 argument.
-template<typename tArgument1>
-class TFunctor<void (*)(tArgument1)>
-    : public IFunctorBase
-{
-public:
-    typedef void (* TFunctionType)(tArgument1);
-
-    TFunctor(TFunctionType pFunction, tArgument1 Argument1)
-        : m_pfnFunction(pFunction)
-        , m_tArgument1(Argument1){}
-
-    virtual void Call()
-    {
-        m_pfnFunction(m_tArgument1);
-    }
-private:
-    TFunctionType                   m_pfnFunction;
-    tArgument1                      m_tArgument1;
-};
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Return type void
-// 2 arguments.
-template<typename tArgument1, typename tArgument2>
-class TFunctor<void (*)(tArgument1, tArgument2)>
-    : public IFunctorBase
-{
-public:
-    typedef void (* TFunctionType)(tArgument1, tArgument2);
-
-    TFunctor(TFunctionType pFunction, const tArgument1& Argument1, const tArgument2& Argument2)
-        : m_pfnFunction(pFunction)
-        , m_tArgument1(Argument1)
-        , m_tArgument2(Argument2){}
-
-    virtual void Call()
-    {
-        m_pfnFunction(m_tArgument1, m_tArgument2);
-    }
-private:
-    TFunctionType                       m_pfnFunction;
-    tArgument1                          m_tArgument1;
-    tArgument2                          m_tArgument2;
-};
-//////////////////////////////////////////////////////////////////////////
-
-#endif // CRYINCLUDE_CRYCOMMON_FUNCTORBASEFUNCTION_H
diff --git a/Code/CryEngine/CryCommon/FunctorBaseMember.h b/Code/CryEngine/CryCommon/FunctorBaseMember.h
deleted file mode 100644
index 1d85e7fff1..0000000000
--- a/Code/CryEngine/CryCommon/FunctorBaseMember.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Implementation of the member function template specializations.
-
-#ifndef CRYINCLUDE_CRYCOMMON_FUNCTORBASEMEMBER_H
-#define CRYINCLUDE_CRYCOMMON_FUNCTORBASEMEMBER_H
-#pragma once
-
-
-#include "IFunctorBase.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Return type void
-// No Arguments
-template<typename tCalleeType>
-class TFunctor<void (tCalleeType::*)()>
-    : public IFunctorBase
-{
-public:
-    typedef void (tCalleeType::* TMemberFunctionType)();
-
-    TFunctor(tCalleeType* pCallee, TMemberFunctionType pMemberFunction)
-        : m_pCalee(pCallee)
-        , m_pfnMemberFunction(pMemberFunction){}
-
-    virtual void Call()
-    {
-        (m_pCalee->*m_pfnMemberFunction)();
-    }
-private:
-    tCalleeType*                        m_pCalee;
-    TMemberFunctionType         m_pfnMemberFunction;
-};
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Return type void
-// 1 argument.
-template<typename tCalleeType, typename tArgument1>
-class TFunctor<void (tCalleeType::*)(tArgument1)>
-    : public IFunctorBase
-{
-public:
-    typedef void (tCalleeType::* TMemberFunctionType)(tArgument1);
-
-    TFunctor(tCalleeType* pCallee, TMemberFunctionType pMemberFunction, const tArgument1& Argument1)
-        : m_pCalee(pCallee)
-        , m_pfnMemberFunction(pMemberFunction)
-        , m_tArgument1(Argument1){}
-
-    virtual void Call()
-    {
-        (m_pCalee->*m_pfnMemberFunction)(m_tArgument1);
-    }
-private:
-    tCalleeType*                                    m_pCalee;
-    TMemberFunctionType                     m_pfnMemberFunction;
-    tArgument1                                      m_tArgument1;
-};
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Return type void
-// 2 arguments.
-template<typename tCalleeType, typename tArgument1, typename tArgument2>
-class TFunctor<void (tCalleeType::*)(tArgument1, tArgument2)>
-    : public IFunctorBase
-{
-public:
-    typedef void (tCalleeType::* TMemberFunctionType)(tArgument1, tArgument2);
-
-    TFunctor(tCalleeType* pCallee, TMemberFunctionType pMemberFunction, const tArgument1& Argument1, const tArgument2& Argument2)
-        : m_pCalee(pCallee)
-        , m_pfnMemberFunction(pMemberFunction)
-        , m_tArgument1(Argument1)
-        , m_tArgument2(Argument2){}
-
-    virtual void Call()
-    {
-        (m_pCalee->*m_pfnMemberFunction)(m_tArgument1, m_tArgument2);
-    }
-private:
-    tCalleeType*                                    m_pCalee;
-    TMemberFunctionType                     m_pfnMemberFunction;
-    tArgument1                                      m_tArgument1;
-    tArgument2                                      m_tArgument2;
-};
-//////////////////////////////////////////////////////////////////////////
-
-#endif // CRYINCLUDE_CRYCOMMON_FUNCTORBASEMEMBER_H
diff --git a/Code/CryEngine/CryCommon/HMDBus.h b/Code/CryEngine/CryCommon/HMDBus.h
deleted file mode 100644
index 3c92278c26..0000000000
--- a/Code/CryEngine/CryCommon/HMDBus.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <ISystem.h>
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Transform.h>
-#include <IStereoRenderer.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;
-            };
-
-            ///
-            /// Get per-eye camera info from the device. The specific info to get is defined in the EyeCameraInfo struct. This function can be used to setup
-            /// rendering cameras per-eye. Note that each eye may have different projection matrix information.
-            ///
-            /// @param eye The specific eye to get camera data for.
-            /// @param nearPlane Near distance for the main render camera.
-            /// @param farPlane Far distance for the main render camera.
-            /// @param cameraInfo Returned camera information for this particular eye.
-            ///
-            virtual void GetPerEyeCameraInfo([[maybe_unused]] const EStereoEye eye, [[maybe_unused]] const float nearPlane, [[maybe_unused]] const float farPlane, [[maybe_unused]] PerEyeCameraInfo& cameraInfo) {}
-            
-            /// 
-            /// 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() {}
-
-            ///
-            /// Retrieves the current index into the VR system's swapchain that should be used. 
-            /// This only really need to be overridden by VR implementations that keep track
-            /// of an internal swapchain like Oculus. OpenVR will handle swapchains 
-            /// internally and can just return 0.
-            ///
-            virtual AZ::u32 GetSwapchainIndex([[maybe_unused]] const EStereoEye& eye) { return 0; }
-
-        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/CryEngine/CryCommon/HeapAllocator.h b/Code/CryEngine/CryCommon/HeapAllocator.h
deleted file mode 100644
index a033c57287..0000000000
--- a/Code/CryEngine/CryCommon/HeapAllocator.h
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_HEAPALLOCATOR_H
-#define CRYINCLUDE_CRYCOMMON_HEAPALLOCATOR_H
-#pragma once
-
-
-#include "Synchronization.h"
-#include "Options.h"
-
-#include <CrySizer.h>
-
-//---------------------------------------------------------------------------
-#define bMEM_ACCESS_CHECK       0
-#define bMEM_HEAP_CHECK         0
-
-namespace stl
-{
-    class HeapSysAllocator
-    {
-    public:
-        static void* SysAlloc(size_t nSize)
-        { return CryModuleMalloc(nSize); }
-        static void SysDealloc(void* ptr)
-        { CryModuleFree(ptr); }
-    };
-
-    class GlobalHeapSysAllocator
-    {
-    public:
-        static void* SysAlloc(size_t nSize)
-        {
-            return CryModuleMalloc(nSize);
-        }
-        static void SysDealloc(void* ptr)
-        {
-            CryModuleFree(ptr);
-        }
-    };
-
-    // Round up to next multiple of nAlign. Handles any positive integer.
-    inline size_t RoundUpTo(size_t nSize, size_t nAlign)
-    {
-        assert(nAlign > 0);
-        nSize += nAlign - 1;
-        return nSize - nSize % nAlign;
-    }
-
-    /*---------------------------------------------------------------------------
-    HeapAllocator
-        A memory pool that can allocate arbitrary amounts of memory of arbitrary size
-        and alignment. The heap may be freed all at once. Individual block deallocation
-        is not provided.
-
-        Usable as a base class to implement more general-purpose allocators that
-        track, free, and reuse individual memory blocks.
-
-        The class can optionally support multi-threading, using the second
-        template parameter. By default it is multithread-safe.
-        See Synchronization.h.
-
-        Allocation details: Maintains a linked list of pages.
-        All pages after first are in order of most free memory first.
-        Allocations are from the smallest free page available.
-
-    ---------------------------------------------------------------------------*/
-
-    struct SMemoryUsage
-    {
-        size_t nAlloc, nUsed;
-
-        SMemoryUsage(size_t _nAlloc = 0, size_t _nUsed = 0)
-            : nAlloc(_nAlloc)
-            , nUsed(_nUsed)
-        {
-            Validate();
-        }
-
-        size_t nFree() const
-        {
-            return nAlloc - nUsed;
-        }
-        void Validate() const
-        {
-            assert(nUsed <= nAlloc);
-        }
-        void Clear()
-        {
-            nAlloc = nUsed = 0;
-        }
-
-        void operator += (SMemoryUsage const& op)
-        {
-            nAlloc += op.nAlloc;
-            nUsed += op.nUsed;
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    struct FHeap
-    {
-        OPT_STRUCT(FHeap)
-        OPT_VAR(size_t, PageSize);          // Pages allocated at this size, or multiple thereof if needed.
-        OPT_VAR(bool, SinglePage)               // Only 1 page allowed (fixed alloc)
-        OPT_VAR(bool, FreeWhenEmpty)        // Release all memory when no longer used
-    };
-
-    template <typename L = PSyncMultiThread, typename SysAl = HeapSysAllocator>
-    class HeapAllocator
-        : public FHeap
-        , public L
-        , private SysAl
-    {
-    public:
-
-        typedef AutoLock<L> Lock;
-
-        enum
-        {
-            DefaultAlignment = sizeof(void*)
-        };
-        enum
-        {
-            DefaultPageSize = 0x1000
-        };
-
-    private:
-
-        struct PageNode
-        {
-            PageNode* pNext;
-            char*           pEndAlloc;
-            char*           pEndUsed;
-
-            char* StartUsed() const
-            {
-                return (char*)(this + 1);
-            }
-
-            PageNode(size_t nAlloc)
-            {
-                pNext = 0;
-                pEndAlloc = (char*)this + nAlloc;
-                pEndUsed = StartUsed();
-            }
-
-            void* Allocate(size_t nSize, size_t nAlign)
-            {
-                // Align current mem.
-                char* pNew = Align(pEndUsed, nAlign);
-                if (pNew + nSize > pEndAlloc)
-                {
-                    return 0;
-                }
-                pEndUsed = pNew + nSize;
-                return pNew;
-            }
-
-            bool CanAllocate(size_t nSize, size_t nAlign)
-            {
-                return Align(pEndUsed, nAlign) + nSize <= pEndAlloc;
-            }
-
-            void Reset()
-            {
-                pEndUsed = StartUsed();
-            }
-
-            size_t GetMemoryAlloc() const
-            {
-                return pEndAlloc - (char*)this;
-            }
-            size_t GetMemoryUsed() const
-            {
-                return pEndUsed - StartUsed();
-            }
-            size_t GetMemoryFree() const
-            {
-                return pEndAlloc - pEndUsed;
-            }
-
-            void Validate() const
-            {
-                assert(pEndAlloc >= (char*)this);
-                assert(pEndUsed >= StartUsed() && pEndUsed <= pEndAlloc);
-            }
-
-            bool CheckPtr(void* ptr) const
-            {
-                return (char*)ptr >= StartUsed() && (char*)ptr < pEndUsed;
-            }
-        };
-
-    public:
-
-        HeapAllocator(FHeap opts = 0)
-            : FHeap(opts)
-            , _pPageList(0)
-        {
-            PageSize = max<size_t>(Align(PageSize, DefaultPageSize), DefaultPageSize);
-        }
-
-        ~HeapAllocator()
-        {
-            Clear();
-        }
-
-        //
-        // Raw memory allocation.
-        //
-        void* Allocate(const Lock& lock, size_t nSize, size_t nAlign = DefaultAlignment)
-        {
-            for (;; )
-            {
-                // Try allocating from head page first.
-                if (_pPageList)
-                {
-                    if (void* ptr = _pPageList->Allocate(nSize, nAlign))
-                    {
-                        _TotalMem.nUsed += nSize;
-                        return ptr;
-                    }
-
-                    if (_pPageList->pNext && _pPageList->pNext->GetMemoryFree() > _pPageList->GetMemoryFree())
-                    {
-                        SortPage(lock, _pPageList);
-                        Validate(lock);
-
-                        // Try allocating from new head, which has the most free memory.
-                        // If this fails, we know no further pages will succeed.
-                        if (void* ptr = _pPageList->Allocate(nSize, nAlign))
-                        {
-                            _TotalMem.nUsed += nSize;
-                            return ptr;
-                        }
-                    }
-                    if (SinglePage)
-                    {
-                        return 0;
-                    }
-                }
-
-                // Allocate the new page of the required size.
-                size_t nAllocSize = Align(sizeof(PageNode), nAlign) + nSize;
-                nAllocSize = RoundUpTo(nAllocSize, PageSize);
-
-                void* pAlloc = this->SysAlloc(nAllocSize);
-                PageNode* pPageNode = new(pAlloc) PageNode(nAllocSize);
-
-                // Insert at head of list.
-                pPageNode->pNext = _pPageList;
-                _pPageList = pPageNode;
-
-                _TotalMem.nAlloc += nAllocSize;
-
-                Validate(lock);
-            }
-        }
-
-        void Deallocate([[maybe_unused]] const Lock& lock, [[maybe_unused]] void* ptr, size_t nSize)
-        {
-            // Just to maintain counts, can't reuse memory.
-            assert(CheckPtr(lock, ptr));
-            assert(_TotalMem.nUsed >= nSize);
-            _TotalMem.nUsed -= nSize;
-        }
-
-        //
-        // Templated type allocation.
-        //
-        template<typename T>
-        T* New(size_t nAlign = 0)
-        {
-            void* pMemory = Allocate(Lock(*this), sizeof(T), nAlign ? nAlign : alignof(T));
-            return pMemory ? new(pMemory) T : 0;
-        }
-
-        template<typename T>
-        T* NewArray(size_t nCount, size_t nAlign = 0)
-        {
-            void* pMemory = Allocate(Lock(*this), sizeof(T) * nCount, nAlign ? nAlign : alignof(T));
-            return pMemory ? new(pMemory) T[nCount] : 0;
-        }
-
-        //
-        // Maintenance.
-        //
-        SMemoryUsage GetTotalMemory(const Lock&)
-        {
-            return _TotalMem;
-        }
-        SMemoryUsage GetTotalMemory()
-        {
-            Lock lock(*this);
-            return _TotalMem;
-        }
-
-        // Facility to defer freeing of dead pages during memory release calls.
-        struct FreeMemLock
-            : Lock
-        {
-            struct PageNode* _pPageList;
-
-            FreeMemLock(L& lock)
-                : Lock(lock)
-                , _pPageList(0) {}
-
-            ~FreeMemLock()
-            {
-                while (_pPageList != 0)
-                {
-                    // Read the "next" pointer before deleting.
-                    PageNode* pNext = _pPageList->pNext;
-
-                    // Delete the current page.
-                    SysAl::SysDealloc(_pPageList);
-
-                    // Move to the next page in the list.
-                    _pPageList = pNext;
-                }
-            }
-        };
-
-        void Clear(FreeMemLock& lock)
-        {
-            // Remove the pages from the object.
-            Validate(lock);
-            lock._pPageList = _pPageList;
-            _pPageList = 0;
-            _TotalMem.Clear();
-        }
-
-        void Clear()
-        {
-            FreeMemLock lock(*this);
-            Clear(lock);
-        }
-
-        void Reset(const Lock& lock)
-        {
-            // Reset all pages, allowing memory re-use.
-            Validate(lock);
-            size_t nPrevSize = ~0;
-            for (PageNode** ppPage = &_pPageList; *ppPage; )
-            {
-                (*ppPage)->Reset();
-                if ((*ppPage)->GetMemoryAlloc() > nPrevSize)
-                {
-                    // Move page to sorted location near beginning.
-                    SortPage(lock, *ppPage);
-
-                    // ppPage is now next page, so continue loop.
-                    continue;
-                }
-                nPrevSize = (*ppPage)->GetMemoryAlloc();
-                ppPage = &(*ppPage)->pNext;
-            }
-            _TotalMem.nUsed = 0;
-            Validate(lock);
-        }
-
-        void Reset()
-        {
-            Reset(Lock(*this));
-        }
-
-        //
-        // Validation.
-        //
-        bool CheckPtr(const Lock&, void* ptr) const
-        {
-            if (!ptr)
-            {
-                return true;
-            }
-            for (PageNode* pNode = _pPageList; pNode; pNode = pNode->pNext)
-            {
-                if (pNode->CheckPtr(ptr))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        void Validate(const Lock&) const
-        {
-        #ifdef _DEBUG
-            // Check page validity, and memory counts.
-            SMemoryUsage MemCheck;
-
-            for (PageNode* pPage = _pPageList; pPage; pPage = pPage->pNext)
-            {
-                pPage->Validate();
-                if (pPage != _pPageList && pPage->pNext)
-                {
-                    assert(pPage->GetMemoryFree() >= pPage->pNext->GetMemoryFree());
-                }
-                MemCheck.nAlloc += pPage->GetMemoryAlloc();
-                MemCheck.nUsed += pPage->GetMemoryUsed();
-            }
-            assert(MemCheck.nAlloc == _TotalMem.nAlloc);
-            assert(MemCheck.nUsed >= _TotalMem.nUsed);
-        #endif
-
-        #if bMEM_HEAP_CHECK
-            static int nCount = 0, nInterval = 0;
-            if (nCount++ >= nInterval)
-            {
-                nInterval++;
-                nCount = 0;
-            }
-        #endif
-        }
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            Lock lock(non_const(*this));
-            for (PageNode* pNode = _pPageList; pNode; pNode = pNode->pNext)
-            {
-                pSizer->AddObject(pNode, pNode->GetMemoryAlloc());
-            }
-        }
-
-    private:
-
-        void SortPage(const Lock&, PageNode*& rpPage)
-        {
-            // Unlink rpPage.
-            PageNode* pPage = rpPage;
-            rpPage = pPage->pNext;
-
-            // Insert into list based on free memory.
-            PageNode** ppBefore = &_pPageList;
-            while (*ppBefore && (*ppBefore)->GetMemoryFree() > pPage->GetMemoryFree())
-            {
-                ppBefore = &(*ppBefore)->pNext;
-            }
-
-            // Link before rpList.
-            pPage->pNext = *ppBefore;
-            *ppBefore = pPage;
-        }
-
-        PageNode*           _pPageList;     // All allocated pages.
-        SMemoryUsage    _TotalMem;      // Track memory allocated and used.
-    };
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_HEAPALLOCATOR_H
diff --git a/Code/CryEngine/CryCommon/HeightmapUpdateNotificationBus.h b/Code/CryEngine/CryCommon/HeightmapUpdateNotificationBus.h
deleted file mode 100644
index 980318ac58..0000000000
--- a/Code/CryEngine/CryCommon/HeightmapUpdateNotificationBus.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Aabb.h>
-
-namespace AZ
-{
-    /**
-    * the EBus is used to request information about potential vegetation surfaces
-    */
-    class HeightmapUpdateNotification
-        : public AZ::EBusTraits
-    {
-    public:
-        ////////////////////////////////////////////////////////////////////////
-        // EBusTraits
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        ////////////////////////////////////////////////////////////////////////
-
-        // Occurs when the terrain height map is modified.
-        virtual void HeightmapModified(const AZ::Aabb& bounds) = 0;
-    };
-
-    typedef AZ::EBus<HeightmapUpdateNotification> HeightmapUpdateNotificationBus;
-}
diff --git a/Code/CryEngine/CryCommon/IAudioInterfacesCommonData.h b/Code/CryEngine/CryCommon/IAudioInterfacesCommonData.h
deleted file mode 100644
index afd31ee048..0000000000
--- a/Code/CryEngine/CryCommon/IAudioInterfacesCommonData.h
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <AzCore/base.h>
-#include <AzCore/Math/Matrix3x4.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/RTTI/TypeInfo.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/string/string.h>
-
-
-#define AUDIO_BIT(x)     (1 << (x))
-#define AUDIO_TRIGGER_IMPL_ID_NUM_RESERVED 100// IDs below that value are used for the CATLTriggerImpl_Internal
-
-
-namespace Audio
-{
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    typedef AZ::u64 TATLIDType;
-    typedef AZ::u32 TATLEnumFlagsType;
-    typedef TATLIDType TAudioObjectID;
-    typedef TATLIDType TAudioControlID;
-    typedef TATLIDType TAudioSwitchStateID;
-    typedef TATLIDType TAudioEnvironmentID;
-    typedef TATLIDType TAudioPreloadRequestID;
-    typedef TATLIDType TAudioEventID;
-    typedef TATLIDType TAudioFileEntryID;
-    typedef TATLIDType TAudioTriggerImplID;
-    typedef TATLIDType TAudioTriggerInstanceID;
-    typedef TATLIDType TAudioProxyID;
-    typedef TATLIDType TAudioSourceId;
-    typedef TATLIDType TAudioFileId;
-    typedef TATLIDType TAudioFileCollectionId;
-    typedef TATLIDType TAudioFileLanguageId;
-
-#define INVALID_AUDIO_OBJECT_ID (static_cast<Audio::TAudioObjectID>(0))
-#define GLOBAL_AUDIO_OBJECT_ID (static_cast<Audio::TAudioObjectID>(1))
-#define INVALID_AUDIO_CONTROL_ID (static_cast<Audio::TAudioControlID>(0))
-#define INVALID_AUDIO_SWITCH_STATE_ID (static_cast<Audio::TAudioSwitchStateID>(0))
-#define INVALID_AUDIO_ENVIRONMENT_ID (static_cast<Audio::TAudioEnvironmentID>(0))
-#define INVALID_AUDIO_PRELOAD_REQUEST_ID (static_cast<Audio::TAudioPreloadRequestID>(0))
-#define INVALID_AUDIO_EVENT_ID (static_cast<Audio::TAudioEventID>(0))
-#define INVALID_AUDIO_FILE_ENTRY_ID (static_cast<Audio::TAudioFileEntryID>(0))
-#define INVALID_AUDIO_TRIGGER_IMPL_ID (static_cast<Audio::TAudioTriggerImplID>(0))
-#define INVALID_AUDIO_TRIGGER_INSTANCE_ID (static_cast<Audio::TAudioTriggerInstanceID>(0))
-#define INVALID_AUDIO_ENUM_FLAG_TYPE (static_cast<Audio::TATLEnumFlagsType>(0))
-#define ALL_AUDIO_REQUEST_SPECIFIC_TYPE_FLAGS (static_cast<Audio::TATLEnumFlagsType>(-1))
-#define INVALID_AUDIO_PROXY_ID (static_cast<Audio::TAudioProxyID>(0))
-#define DEFAULT_AUDIO_PROXY_ID (static_cast<Audio::TAudioProxyID>(1))
-#define INVALID_AUDIO_SOURCE_ID (static_cast<Audio::TAudioSourceId>(0))
-#define INVALID_AUDIO_FILE_ID (static_cast<Audio::TAudioFileId>(0))
-#define INVALID_AUDIO_FILE_COLLECTION_ID (static_cast<Audio::TAudioFileCollectionId>(0))
-#define INVALID_AUDIO_FILE_LANGUAGE_ID (static_cast<Audio::TAudioFileLanguageId>(0))
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    // <title EAudioRequestStatus>
-    // Summary:
-    //      An enum that lists possible statuses of an AudioRequest.
-    //      Used as a return type for many function used by the AudioSystem internally,
-    //      and also for most of the IAudioSystemImplementation calls.
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum EAudioRequestStatus : TATLEnumFlagsType
-    {
-        eARS_NONE = 0,
-        eARS_SUCCESS = 1,
-        eARS_PARTIAL_SUCCESS = 2,
-        eARS_FAILURE = 3,
-        eARS_PENDING = 4,
-        eARS_FAILURE_INVALID_OBJECT_ID = 5,
-        eARS_FAILURE_INVALID_CONTROL_ID = 6,
-        eARS_FAILURE_INVALID_REQUEST = 7,
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    //! Converts a boolean value to an EAudioRequestStatus.
-    //! @param result The boolean value to convert.
-    //! @return eARS_SUCCESS if result is true, eARS_FAILURE otherwise.
-    inline EAudioRequestStatus BoolToARS(bool result)
-    {
-        return result ? eARS_SUCCESS : eARS_FAILURE;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SATLWorldPosition
-    {
-        SATLWorldPosition()
-            : m_transform(AZ::Matrix3x4::CreateIdentity())
-        {}
-
-        SATLWorldPosition(const AZ::Vector3& rPos)
-            : m_transform(AZ::Matrix3x4::CreateIdentity())
-        {
-            m_transform.SetTranslation(rPos);
-        }
-
-        SATLWorldPosition(const AZ::Transform& rTransform)
-            : m_transform(AZ::Matrix3x4::CreateFromTransform(rTransform))
-        {}
-
-        SATLWorldPosition(const AZ::Matrix3x4& rTransform)
-            : m_transform(rTransform)
-        {
-        }
-
-        inline AZ::Vector3 GetPositionVec() const
-        {
-            return m_transform.GetTranslation();
-        }
-
-        inline AZ::Vector3 GetUpVec() const
-        {
-            return m_transform.GetBasisZ();
-        }
-
-        inline AZ::Vector3 GetForwardVec() const
-        {
-            return m_transform.GetBasisY();
-        }
-
-        inline AZ::Vector3 GetRightVec() const
-        {
-            return m_transform.GetBasisX();
-        }
-
-        inline void NormalizeForwardVec()
-        {
-            auto forward = GetForwardVec();
-            if (forward.IsZero())
-            {
-                m_transform.SetBasisY(AZ::Vector3::CreateAxisY());
-            }
-            else
-            {
-                forward.Normalize();
-                m_transform.SetBasisY(forward);
-            }
-        }
-
-        inline void NormalizeUpVec()
-        {
-            auto up = GetUpVec();
-            if (up.IsZero())
-            {
-                m_transform.SetBasisZ(AZ::Vector3::CreateAxisZ());
-            }
-            else
-            {
-                up.Normalize();
-                m_transform.SetBasisZ(up);
-            }
-        }
-
-    private:
-        AZ::Matrix3x4 m_transform;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum EAudioAssetType : TATLEnumFlagsType
-    {
-        eAAT_STREAM = 1,
-        eAAT_SOURCE = 2,
-        eAAT_NONE = 3,
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum EAudioCodecType : TATLEnumFlagsType
-    {
-        eACT_PCM        = 1,
-        eACT_ADPCM      = 2,
-        eACT_XMA        = 3,
-        eACT_VORBIS     = 4,
-        eACT_XWMA       = 5,
-        eACT_AAC        = 6,
-        eACT_STREAM_PCM = 7,
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum EAudioRequestFlags : TATLEnumFlagsType
-    {
-        eARF_NONE                   = 0,                // assumes Lowest priority
-        eARF_PRIORITY_NORMAL        = AUDIO_BIT(0),    // will be processed if no high priority requests are pending
-        eARF_PRIORITY_HIGH          = AUDIO_BIT(1),    // will be processed first
-        eARF_EXECUTE_BLOCKING       = AUDIO_BIT(2),    // blocks main thread until the request has been fully handled
-        eARF_SYNC_CALLBACK          = AUDIO_BIT(3),    // callback (ATL's NotifyListener) will happen on the main thread
-        eARF_SYNC_FINISHED_CALLBACK = AUDIO_BIT(4),    // "finished trigger instance" callback will happen on the main thread
-        eARF_THREAD_SAFE_PUSH       = AUDIO_BIT(5),    // use when pushing a request from a non-main thread, e.g. AK::EventManager or AudioThread
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum EAudioRequestType : TATLEnumFlagsType
-    {
-        eART_NONE                           = 0,
-        eART_AUDIO_MANAGER_REQUEST          = 1,
-        eART_AUDIO_CALLBACK_MANAGER_REQUEST = 2,
-        eART_AUDIO_OBJECT_REQUEST           = 3,
-        eART_AUDIO_LISTENER_REQUEST         = 4,
-        eART_AUDIO_ALL_REQUESTS             = static_cast<TATLEnumFlagsType>(-1),
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum EAudioRequestResult : TATLEnumFlagsType
-    {
-        eARR_NONE       = 0,
-        eARR_SUCCESS    = 1,
-        eARR_FAILURE    = 2,
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum EAudioEventState : TATLEnumFlagsType
-    {
-        eAES_NONE               = 0,
-        eAES_PLAYING            = 1,
-        eAES_PLAYING_DELAYED    = 2,
-        eAES_LOADING            = 3,
-        eAES_UNLOADING          = 4,
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum class ObstructionType : TATLEnumFlagsType
-    {
-        Ignore = 0,
-        SingleRay,
-        MultiRay,
-        Count,
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum class PanningMode
-    {
-        Speakers,
-        Headphones,
-    };
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum class AudioInputSourceType
-    {
-        Unsupported,    // Unsupported type
-        //OggFile,      // Audio Input from an Ogg file
-        //OpusFile,     // Audio Input from an Opus file
-        PcmFile,        // Audio Input from a raw PCM file
-        WavFile,        // Audio Input from a Wav file
-        Microphone,     // Audio Input from a Microphone
-        Synthesis,      // Audio Input that is synthesized (user-provided systhesis function)
-        ExternalStream, // Audio Input from a stream source (video stream, network stream, etc)
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum class AudioInputSampleType
-    {
-        Unsupported,    // Unsupported type
-        Int,            // Integer type, probably don't need to differentiate signed vs unsigned
-        Float,          // Floating poitn type
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    enum class MultiPositionBehaviorType
-    {
-        Separate,       // Sound positions are treated separately as individual point sources, i.e. like torches along a wall.
-        Blended,        // Sound positions are blended together as a 'spread out' sound, i.e. like a river.
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    using MultiPositionVec = AZStd::vector<AZ::Vector3>;
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct MultiPositionParams
-    {
-        MultiPositionVec m_positions;
-        MultiPositionBehaviorType m_type;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioInputConfig
-    {
-        SAudioInputConfig()
-            : m_sourceId(INVALID_AUDIO_SOURCE_ID)
-            , m_sampleRate(0)
-            , m_numChannels(0)
-            , m_bitsPerSample(0)
-            , m_bufferSize(0)
-            , m_sampleType(AudioInputSampleType::Unsupported)
-            , m_autoUnloadFile(false)
-        {}
-
-        SAudioInputConfig(AudioInputSourceType sourceType, const char* filename, bool autoUnloadFile = true)
-            : m_sourceId(INVALID_AUDIO_SOURCE_ID)
-            , m_sampleRate(0)
-            , m_numChannels(0)
-            , m_bitsPerSample(0)
-            , m_bufferSize(0)
-            , m_sourceType(sourceType)
-            , m_sampleType(AudioInputSampleType::Unsupported)
-            , m_sourceFilename(filename)
-            , m_autoUnloadFile(autoUnloadFile)
-        {}
-
-        SAudioInputConfig(
-            AudioInputSourceType sourceType,
-            AZ::u32 sampleRate,
-            AZ::u32 numChannels,
-            AZ::u32 bitsPerSample,
-            AudioInputSampleType sampleType)
-            : m_sourceId(INVALID_AUDIO_SOURCE_ID)
-            , m_sampleRate(sampleRate)
-            , m_numChannels(numChannels)
-            , m_bitsPerSample(bitsPerSample)
-            , m_sourceType(sourceType)
-            , m_sampleType(sampleType)
-            , m_autoUnloadFile(false)
-        {}
-
-        void SetBufferSizeFromFrameCount(AZ::u32 frameCount)
-        {
-            m_bufferSize = (m_numChannels * frameCount * (m_bitsPerSample >> 3));
-        }
-
-        AZ::u32 GetSampleCountFromBufferSize() const
-        {
-            AZ_Assert(m_bitsPerSample >= 8, "Bits Per Sample is set too low!\n");
-            return m_bufferSize / (m_bitsPerSample >> 3);
-        }
-
-        TAudioSourceId m_sourceId;          // This is set later after the source is created
-        AZ::u32 m_sampleRate;               // 44100, 48000, ...
-        AZ::u32 m_numChannels;              // 1 = Mono, 2 = Stereo
-        AZ::u32 m_bitsPerSample;            // e.g. 16, 32
-        AZ::u32 m_bufferSize;               // Size in bytes
-        AudioInputSourceType m_sourceType;  // File, Synthesis, Microphone, ...
-        AudioInputSampleType m_sampleType;  // Int, Float
-        AZStd::string m_sourceFilename;
-        bool m_autoUnloadFile;              // For file types, specifies whether file should unload after playback finishes
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct AudioStreamData
-    {
-        AudioStreamData()
-        {}
-
-        AudioStreamData(AZ::u8* buffer, AZStd::size_t dataSize)
-            : m_data(buffer)
-            , m_sizeBytes(dataSize)
-        {}
-
-        AZ::u8* m_data = nullptr;           // points to start of raw data
-        union {
-            AZStd::size_t m_sizeBytes = 0;  // in bytes
-            AZStd::size_t m_offsetBytes;    // if using this structure as a read/write bookmark, use this alias
-        };
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct AudioStreamMultiTrackData
-    {
-        AudioStreamMultiTrackData()
-        {
-            m_data[0] = m_data[1] = m_data[2] = m_data[3] = m_data[4] = m_data[5] = nullptr;
-        }
-
-        const void* m_data[6];              // 6 channels max
-        union {
-            AZStd::size_t m_sizeBytes = 0;  // size in bytes of each track
-            AZStd::size_t m_offsetBytes;    // if using this structure as a read/write bookmark, use this alias
-        };
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioRequestDataBase
-    {
-        explicit SAudioRequestDataBase(const EAudioRequestType eType = eART_NONE)
-            : eRequestType(eType)
-        {}
-
-        virtual ~SAudioRequestDataBase() {}
-
-        const EAudioRequestType eRequestType;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioSourceInfo
-    {
-        TAudioSourceId m_sourceId;
-        TAudioFileId m_fileId;
-        TAudioFileCollectionId m_languageId;
-        TAudioFileLanguageId m_collectionId;
-        EAudioCodecType m_codecType;
-
-        SAudioSourceInfo()
-            : m_sourceId(INVALID_AUDIO_SOURCE_ID)
-            , m_fileId(INVALID_AUDIO_FILE_ID)
-            , m_languageId(INVALID_AUDIO_FILE_LANGUAGE_ID)
-            , m_collectionId(INVALID_AUDIO_FILE_COLLECTION_ID)
-            , m_codecType(eACT_STREAM_PCM)
-        {}
-
-        SAudioSourceInfo(TAudioSourceId sourceId)
-            : m_sourceId(sourceId)
-            , m_fileId(INVALID_AUDIO_FILE_ID)
-            , m_languageId(INVALID_AUDIO_FILE_LANGUAGE_ID)
-            , m_collectionId(INVALID_AUDIO_FILE_COLLECTION_ID)
-            , m_codecType(eACT_STREAM_PCM)
-        {}
-
-        SAudioSourceInfo(
-            TAudioSourceId sourceId,
-            TAudioFileId fileId,
-            TAudioFileLanguageId languageId,
-            TAudioFileCollectionId collectionId,
-            EAudioCodecType codecType)
-            : m_sourceId(sourceId)
-            , m_fileId(fileId)
-            , m_languageId(languageId)
-            , m_collectionId(collectionId)
-            , m_codecType(codecType)
-        {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioCallBackInfos
-    {
-        struct UserData
-        {
-            UserData(void* userData)
-                : m_pUserData(userData)
-            {}
-
-            UserData(uint64_t userData)
-                : m_userData(userData)
-            {}
-
-            UserData& operator=(void* userData)
-            {
-                m_pUserData = userData;
-                return *this;
-            }
-
-            UserData& operator=(uint64_t userData)
-            {
-                m_userData = userData;
-                return *this;
-            }
-
-            operator void*() const
-            {
-                return m_pUserData;
-            }
-
-            operator uint64_t() const
-            {
-                return m_userData;
-            }
-
-            bool operator==(void* const userData)
-            {
-                return this->m_pUserData == userData;
-            }
-
-            bool operator==(uint64_t userData)
-            {
-                return this->m_userData == userData;
-            }
-
-            union
-            {
-                void* m_pUserData;
-                uint64_t m_userData;
-            };
-        };
-
-        SAudioCallBackInfos(const SAudioCallBackInfos& rOther)
-            : pObjectToNotify(rOther.pObjectToNotify)
-            , pUserData(rOther.pUserData)
-            , pUserDataOwner(rOther.pUserDataOwner)
-            , nRequestFlags(rOther.nRequestFlags)
-        {
-        }
-
-        explicit SAudioCallBackInfos(
-            void* const pPassedObjectToNotify = nullptr,
-            UserData pPassedUserData = nullptr,
-            void* const pPassedUserDataOwner = nullptr,
-            const TATLEnumFlagsType nPassedRequestFlags = eARF_PRIORITY_NORMAL)
-            : pObjectToNotify(pPassedObjectToNotify)
-            , pUserData(pPassedUserData)
-            , pUserDataOwner(pPassedUserDataOwner)
-            , nRequestFlags(nPassedRequestFlags)
-        {
-        }
-
-        static const SAudioCallBackInfos& GetEmptyObject()
-        {
-            static SAudioCallBackInfos emptyInstance;
-            return emptyInstance;
-        }
-
-        void* const pObjectToNotify;
-        UserData pUserData;
-        void* const pUserDataOwner;
-        const TATLEnumFlagsType nRequestFlags;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioRequest
-    {
-        SAudioRequest()
-            : nFlags(eARF_NONE)
-            , nAudioObjectID(INVALID_AUDIO_OBJECT_ID)
-            , pOwner(nullptr)
-            , pUserData(nullptr)
-            , pUserDataOwner(nullptr)
-            , pData(nullptr)
-        {}
-
-        ~SAudioRequest() {}
-
-        SAudioRequest(const SAudioRequest& other) = delete;
-        SAudioRequest& operator=(const SAudioRequest& other) = delete;
-
-        TATLEnumFlagsType nFlags;
-        TAudioObjectID nAudioObjectID;
-        void* pOwner;
-        void* pUserData;
-        void* pUserDataOwner;
-        SAudioRequestDataBase* pData;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioRequestInfo
-    {
-        explicit SAudioRequestInfo(
-            const EAudioRequestResult ePassedResult,
-            void* const pPassedOwner,
-            void* const pPassedUserData,
-            void* const pPassedUserDataOwner,
-            const EAudioRequestType ePassedAudioRequestType,
-            const TATLEnumFlagsType nPassedSpecificAudioRequest,
-            const TAudioControlID nPassedAudioControlID,
-            const TAudioObjectID nPassedAudioObjectID,
-            const TAudioEventID passedAudioEventID)
-            : eResult(ePassedResult)
-            , pOwner(pPassedOwner)
-            , pUserData(pPassedUserData)
-            , pUserDataOwner(pPassedUserDataOwner)
-            , eAudioRequestType(ePassedAudioRequestType)
-            , nSpecificAudioRequest(nPassedSpecificAudioRequest)
-            , nAudioControlID(nPassedAudioControlID)
-            , nAudioObjectID(nPassedAudioObjectID)
-            , audioEventID(passedAudioEventID)
-        {}
-
-        const EAudioRequestResult eResult;
-        void* const pOwner;
-        void* const pUserData;
-        void* const pUserDataOwner;
-        const EAudioRequestType eAudioRequestType;
-        const TATLEnumFlagsType nSpecificAudioRequest;
-        const TAudioControlID nAudioControlID;
-        const TAudioObjectID nAudioObjectID;
-        const TAudioEventID audioEventID;
-    };
-
-} // namespace Audio
-
-
-namespace AZ
-{
-    AZ_TYPE_INFO_SPECIALIZE(Audio::MultiPositionBehaviorType, "{96851568-74F9-4EEC-9195-82DCF701EEEF}");
-    AZ_TYPE_INFO_SPECIALIZE(Audio::ObstructionType, "{8C056768-40E2-4B2D-AF01-9F7A6817BAAA}");
-} // namespace AZ
-
diff --git a/Code/CryEngine/CryCommon/IAudioSystem.h b/Code/CryEngine/CryCommon/IAudioSystem.h
deleted file mode 100644
index 5248015b2b..0000000000
--- a/Code/CryEngine/CryCommon/IAudioSystem.h
+++ /dev/null
@@ -1,1070 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <IAudioInterfacesCommonData.h>
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Crc.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/std/parallel/mutex.h>
-
-// External forward declarations.
-struct IVisArea;
-struct ICVar;
-struct SSystemInitParams;
-
-namespace Audio
-{
-    // Internal forward declarations.
-    struct SAudioRequest;
-
-
-    enum EATLDataScope : TATLEnumFlagsType
-    {
-        eADS_NONE           = 0,
-        eADS_GLOBAL         = 1,
-        eADS_LEVEL_SPECIFIC = 2,
-        eADS_ALL            = 3,
-    };
-
-    enum EAudioManagerRequestType : TATLEnumFlagsType
-    {
-        eAMRT_NONE                      = 0,
-        eAMRT_INIT_AUDIO_IMPL           = AUDIO_BIT(0),
-        eAMRT_RELEASE_AUDIO_IMPL        = AUDIO_BIT(1),
-        eAMRT_RESERVE_AUDIO_OBJECT_ID   = AUDIO_BIT(2),
-        eAMRT_CREATE_SOURCE             = AUDIO_BIT(5),
-        eAMRT_DESTROY_SOURCE            = AUDIO_BIT(6),
-        eAMRT_PARSE_CONTROLS_DATA       = AUDIO_BIT(7),
-        eAMRT_PARSE_PRELOADS_DATA       = AUDIO_BIT(8),
-        eAMRT_CLEAR_CONTROLS_DATA       = AUDIO_BIT(9),
-        eAMRT_CLEAR_PRELOADS_DATA       = AUDIO_BIT(10),
-        eAMRT_PRELOAD_SINGLE_REQUEST    = AUDIO_BIT(11),
-        eAMRT_UNLOAD_SINGLE_REQUEST     = AUDIO_BIT(12),
-        eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE = AUDIO_BIT(13),
-        eAMRT_REFRESH_AUDIO_SYSTEM      = AUDIO_BIT(14),
-        eAMRT_LOSE_FOCUS                = AUDIO_BIT(15),
-        eAMRT_GET_FOCUS                 = AUDIO_BIT(16),
-        eAMRT_MUTE_ALL                  = AUDIO_BIT(17),
-        eAMRT_UNMUTE_ALL                = AUDIO_BIT(18),
-        eAMRT_STOP_ALL_SOUNDS           = AUDIO_BIT(19),
-        eAMRT_DRAW_DEBUG_INFO           = AUDIO_BIT(20),
-        eAMRT_CHANGE_LANGUAGE           = AUDIO_BIT(21),
-        eAMRT_SET_AUDIO_PANNING_MODE    = AUDIO_BIT(22),
-    };
-
-    enum EAudioCallbackManagerRequestType : TATLEnumFlagsType
-    {
-        eACMRT_NONE                             = 0,
-        eACMRT_REPORT_STARTED_EVENT             = AUDIO_BIT(0),
-        eACMRT_REPORT_FINISHED_EVENT            = AUDIO_BIT(1),
-        eACMRT_REPORT_FINISHED_TRIGGER_INSTANCE = AUDIO_BIT(2),
-    };
-
-    enum EAudioListenerRequestType : TATLEnumFlagsType
-    {
-        eALRT_NONE = 0,
-        eALRT_SET_POSITION = AUDIO_BIT(0),
-    };
-
-    enum EAudioObjectRequestType : TATLEnumFlagsType
-    {
-        eAORT_NONE                      = 0,
-        eAORT_PREPARE_TRIGGER           = AUDIO_BIT(0),
-        eAORT_UNPREPARE_TRIGGER         = AUDIO_BIT(1),
-        eAORT_EXECUTE_TRIGGER           = AUDIO_BIT(2),
-        eAORT_STOP_TRIGGER              = AUDIO_BIT(3),
-        eAORT_STOP_ALL_TRIGGERS         = AUDIO_BIT(4),
-        eAORT_SET_POSITION              = AUDIO_BIT(5),
-        eAORT_SET_RTPC_VALUE            = AUDIO_BIT(6),
-        eAORT_SET_SWITCH_STATE          = AUDIO_BIT(7),
-        eAORT_SET_ENVIRONMENT_AMOUNT    = AUDIO_BIT(8),
-        eAORT_RESET_ENVIRONMENTS        = AUDIO_BIT(9),
-        eAORT_RESET_RTPCS               = AUDIO_BIT(10),
-        eAORT_RELEASE_OBJECT            = AUDIO_BIT(11),
-        eAORT_EXECUTE_SOURCE_TRIGGER    = AUDIO_BIT(12),
-        eAORT_SET_MULTI_POSITIONS       = AUDIO_BIT(13),
-    };
-
-    enum EAudioObjectObstructionCalcType : TATLEnumFlagsType
-    {
-        eAOOCT_IGNORE       = 0,
-        eAOOCT_SINGLE_RAY   = 1,
-        eAOOCT_MULTI_RAY    = 2,
-    };
-
-    enum EAudioControlType : TATLEnumFlagsType
-    {
-        eACT_NONE           = 0,
-        eACT_AUDIO_OBJECT   = 1,
-        eACT_TRIGGER        = 2,
-        eACT_RTPC           = 3,
-        eACT_SWITCH         = 4,
-        eACT_SWITCH_STATE   = 5,
-        eACT_PRELOAD        = 6,
-        eACT_ENVIRONMENT    = 7,
-    };
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template <typename T>
-    AZ_FORCE_INLINE T AudioStringToID(const char* const source)
-    {
-        return static_cast<T>(AZ::Crc32(source));
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    // Function Callback Typedefs
-    using AudioRequestCallbackType = void(*)(const SAudioRequestInfo* const);
-    using TriggerFinishedCallbackType = void(*)(const TAudioObjectID, const TAudioControlID, void* const);
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    // Audio Manager Requests
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioManagerRequestDataBase
-        : public SAudioRequestDataBase
-    {
-        explicit SAudioManagerRequestDataBase(const EAudioManagerRequestType ePassedType = eAMRT_NONE)
-            : SAudioRequestDataBase(eART_AUDIO_MANAGER_REQUEST)
-            , eType(ePassedType)
-        {}
-
-        ~SAudioManagerRequestDataBase() override {}
-
-        const EAudioManagerRequestType eType;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template <EAudioManagerRequestType T>
-    struct SAudioManagerRequestData
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData()
-            : SAudioManagerRequestDataBase(T)
-        {}
-
-        ~SAudioManagerRequestData() override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_INIT_AUDIO_IMPL>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData()
-            : SAudioManagerRequestDataBase(eAMRT_INIT_AUDIO_IMPL)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_INIT_AUDIO_IMPL>() override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_RELEASE_AUDIO_IMPL> : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData()
-            : SAudioManagerRequestDataBase(eAMRT_RELEASE_AUDIO_IMPL)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_RELEASE_AUDIO_IMPL>() override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_RESERVE_AUDIO_OBJECT_ID>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData(TAudioObjectID* const pPassedObjectID, const char* const sPassedObjectName = nullptr)
-            : SAudioManagerRequestDataBase(eAMRT_RESERVE_AUDIO_OBJECT_ID)
-            , pObjectID(pPassedObjectID)
-            , sObjectName(sPassedObjectName)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_RESERVE_AUDIO_OBJECT_ID>()override {}
-
-        TAudioObjectID* const pObjectID;
-        const char* const sObjectName;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_CREATE_SOURCE>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData(const SAudioInputConfig& sourceConfig)
-            : SAudioManagerRequestDataBase(eAMRT_CREATE_SOURCE)
-            , m_sourceConfig(sourceConfig)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_CREATE_SOURCE>() override {}
-
-        SAudioInputConfig m_sourceConfig;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_DESTROY_SOURCE>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData(TAudioSourceId sourceId)
-            : SAudioManagerRequestDataBase(eAMRT_DESTROY_SOURCE)
-            , m_sourceId(sourceId)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_DESTROY_SOURCE>() override {}
-
-        const TAudioSourceId m_sourceId;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_PARSE_CONTROLS_DATA>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData(const char* const sControlsFolderPath, const EATLDataScope ePassedDataScope)
-            : SAudioManagerRequestDataBase(eAMRT_PARSE_CONTROLS_DATA)
-            , sFolderPath(sControlsFolderPath)
-            , eDataScope(ePassedDataScope)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_PARSE_CONTROLS_DATA>()override {}
-
-        const char* const sFolderPath;
-        const EATLDataScope eDataScope;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_PARSE_PRELOADS_DATA>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData(const char* const sControlsFolderPath, const EATLDataScope ePassedDataScope)
-            : SAudioManagerRequestDataBase(eAMRT_PARSE_PRELOADS_DATA)
-            , sFolderPath(sControlsFolderPath)
-            , eDataScope(ePassedDataScope)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_PARSE_PRELOADS_DATA>()override {}
-
-        const char* const sFolderPath;
-        const EATLDataScope eDataScope;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_CLEAR_CONTROLS_DATA>
-        : public SAudioManagerRequestDataBase
-    {
-        explicit SAudioManagerRequestData(const EATLDataScope ePassedDataScope = eADS_NONE)
-            : SAudioManagerRequestDataBase(eAMRT_CLEAR_CONTROLS_DATA)
-            , eDataScope(ePassedDataScope)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_CLEAR_CONTROLS_DATA>()override {}
-
-        const EATLDataScope eDataScope;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_CLEAR_PRELOADS_DATA>
-        : public SAudioManagerRequestDataBase
-    {
-        explicit SAudioManagerRequestData(const EATLDataScope ePassedDataScope = eADS_NONE)
-            : SAudioManagerRequestDataBase(eAMRT_CLEAR_PRELOADS_DATA)
-            , eDataScope(ePassedDataScope)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_CLEAR_PRELOADS_DATA>()override {}
-
-        const EATLDataScope eDataScope;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_PRELOAD_SINGLE_REQUEST>
-        : public SAudioManagerRequestDataBase
-    {
-        explicit SAudioManagerRequestData(const TAudioPreloadRequestID nRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID, const bool bPassedAutoLoadOnly = false)
-            : SAudioManagerRequestDataBase(eAMRT_PRELOAD_SINGLE_REQUEST)
-            , nPreloadRequestID(nRequestID)
-            , bAutoLoadOnly(bPassedAutoLoadOnly)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_PRELOAD_SINGLE_REQUEST>()override {}
-
-        const TAudioPreloadRequestID nPreloadRequestID;
-        const bool bAutoLoadOnly;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_UNLOAD_SINGLE_REQUEST>
-        : public SAudioManagerRequestDataBase
-    {
-        explicit SAudioManagerRequestData(const TAudioPreloadRequestID nRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID)
-            : SAudioManagerRequestDataBase(eAMRT_UNLOAD_SINGLE_REQUEST)
-            , nPreloadRequestID(nRequestID)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_UNLOAD_SINGLE_REQUEST>()override {}
-
-        const TAudioPreloadRequestID nPreloadRequestID;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData(const EATLDataScope eScope = eADS_NONE)
-            : SAudioManagerRequestDataBase(eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE)
-            , eDataScope(eScope)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE>()override {}
-
-        const EATLDataScope eDataScope;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_REFRESH_AUDIO_SYSTEM>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData(const char* const controlsPath, const char* const levelName, TAudioPreloadRequestID preloadId)
-            : SAudioManagerRequestDataBase(eAMRT_REFRESH_AUDIO_SYSTEM)
-            , m_controlsPath(controlsPath)
-            , m_levelName(levelName)
-            , m_levelPreloadId(preloadId)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_REFRESH_AUDIO_SYSTEM>()override {}
-
-        const char* const m_controlsPath;
-        const char* const m_levelName;
-        const TAudioPreloadRequestID m_levelPreloadId = INVALID_AUDIO_PRELOAD_REQUEST_ID;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_CHANGE_LANGUAGE>
-        : public SAudioManagerRequestDataBase
-    {
-        SAudioManagerRequestData()
-            : SAudioManagerRequestDataBase(eAMRT_CHANGE_LANGUAGE)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_CHANGE_LANGUAGE>()override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioManagerRequestData<eAMRT_SET_AUDIO_PANNING_MODE>
-        : public SAudioManagerRequestDataBase
-    {
-        explicit SAudioManagerRequestData(PanningMode panningMode)
-            : SAudioManagerRequestDataBase(eAMRT_SET_AUDIO_PANNING_MODE)
-            , m_panningMode(panningMode)
-        {}
-
-        ~SAudioManagerRequestData<eAMRT_SET_AUDIO_PANNING_MODE>() override {}
-
-        const PanningMode m_panningMode;
-    };
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    // Audio Callback Manager Requests
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioCallbackManagerRequestDataBase
-        : public SAudioRequestDataBase
-    {
-        explicit SAudioCallbackManagerRequestDataBase(const EAudioCallbackManagerRequestType ePassedType = eACMRT_NONE)
-            : SAudioRequestDataBase(eART_AUDIO_CALLBACK_MANAGER_REQUEST)
-            , eType(ePassedType)
-        {}
-
-        ~SAudioCallbackManagerRequestDataBase() override {}
-
-        const EAudioCallbackManagerRequestType eType;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template <EAudioCallbackManagerRequestType T>
-    struct SAudioCallbackManagerRequestData
-        : public SAudioCallbackManagerRequestDataBase
-    {
-        SAudioCallbackManagerRequestData()
-            : SAudioCallbackManagerRequestDataBase(T)
-        {}
-
-        ~SAudioCallbackManagerRequestData() override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioCallbackManagerRequestData<eACMRT_REPORT_STARTED_EVENT>
-        : public SAudioCallbackManagerRequestDataBase
-    {
-        SAudioCallbackManagerRequestData(TAudioEventID const nPassedEventID)
-            : SAudioCallbackManagerRequestDataBase(eACMRT_REPORT_STARTED_EVENT)
-            , nEventID(nPassedEventID)
-        {}
-
-        ~SAudioCallbackManagerRequestData<eACMRT_REPORT_STARTED_EVENT>() override {}
-
-        const TAudioEventID nEventID;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioCallbackManagerRequestData<eACMRT_REPORT_FINISHED_EVENT>
-        : public SAudioCallbackManagerRequestDataBase
-    {
-        SAudioCallbackManagerRequestData(const TAudioEventID nPassedEventID, const bool bPassedSuccess)
-            : SAudioCallbackManagerRequestDataBase(eACMRT_REPORT_FINISHED_EVENT)
-            , nEventID(nPassedEventID)
-            , bSuccess(bPassedSuccess)
-        {}
-
-        ~SAudioCallbackManagerRequestData<eACMRT_REPORT_FINISHED_EVENT>()override {}
-
-        const TAudioEventID nEventID;
-        const bool bSuccess;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioCallbackManagerRequestData<eACMRT_REPORT_FINISHED_TRIGGER_INSTANCE>
-        : public SAudioCallbackManagerRequestDataBase
-    {
-        SAudioCallbackManagerRequestData(TAudioControlID const nPassedControlID)
-            : SAudioCallbackManagerRequestDataBase(eACMRT_REPORT_FINISHED_TRIGGER_INSTANCE)
-            , nAudioTriggerID(nPassedControlID)
-        {}
-
-        ~SAudioCallbackManagerRequestData<eACMRT_REPORT_FINISHED_TRIGGER_INSTANCE>()override {}
-
-        const TAudioControlID nAudioTriggerID;
-    };
-
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    // Audio Object Requests
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioObjectRequestDataBase
-        : public SAudioRequestDataBase
-    {
-        explicit SAudioObjectRequestDataBase(const EAudioObjectRequestType ePassedType = eAORT_NONE)
-            : SAudioRequestDataBase(eART_AUDIO_OBJECT_REQUEST)
-            , eType(ePassedType)
-        {}
-
-        ~SAudioObjectRequestDataBase() override {}
-
-        const EAudioObjectRequestType eType;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template <EAudioObjectRequestType T>
-    struct SAudioObjectRequestData
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(T)
-        {}
-
-        ~SAudioObjectRequestData() override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_EXECUTE_TRIGGER>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_EXECUTE_TRIGGER)
-            , nTriggerID(INVALID_AUDIO_CONTROL_ID)
-            , fTimeUntilRemovalInMS(0.0f)
-        {}
-
-        SAudioObjectRequestData(const TAudioControlID nPassedTriggerID, const float fPassedTimeUntilRemovalInMS)
-            : SAudioObjectRequestDataBase(eAORT_EXECUTE_TRIGGER)
-            , nTriggerID(nPassedTriggerID)
-            , fTimeUntilRemovalInMS(fPassedTimeUntilRemovalInMS)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_EXECUTE_TRIGGER>()override {}
-
-        TAudioControlID nTriggerID;
-        float fTimeUntilRemovalInMS;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_PREPARE_TRIGGER>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_PREPARE_TRIGGER)
-            , nTriggerID(INVALID_AUDIO_CONTROL_ID)
-        {}
-
-        explicit SAudioObjectRequestData(const TAudioControlID nPassedTriggerID)
-            : SAudioObjectRequestDataBase(eAORT_PREPARE_TRIGGER)
-            , nTriggerID(nPassedTriggerID)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_PREPARE_TRIGGER>()override {}
-
-        TAudioControlID nTriggerID;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_UNPREPARE_TRIGGER>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_UNPREPARE_TRIGGER)
-            , nTriggerID(INVALID_AUDIO_CONTROL_ID)
-        {}
-
-        explicit SAudioObjectRequestData(const TAudioControlID nPassedTriggerID)
-            : SAudioObjectRequestDataBase(eAORT_UNPREPARE_TRIGGER)
-            , nTriggerID(nPassedTriggerID)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_UNPREPARE_TRIGGER>()override {}
-
-        TAudioControlID nTriggerID;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_STOP_TRIGGER>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_STOP_TRIGGER)
-            , nTriggerID(INVALID_AUDIO_CONTROL_ID)
-        {}
-
-        explicit SAudioObjectRequestData(const TAudioControlID nPassedTriggerID)
-            : SAudioObjectRequestDataBase(eAORT_STOP_TRIGGER)
-            , nTriggerID(nPassedTriggerID)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_STOP_TRIGGER>()override {}
-
-        TAudioControlID nTriggerID;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_STOP_ALL_TRIGGERS>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_STOP_ALL_TRIGGERS)
-            , m_filterByOwner(false)
-        {}
-
-        SAudioObjectRequestData(bool filterByOwner)
-            : SAudioObjectRequestDataBase(eAORT_STOP_ALL_TRIGGERS)
-            , m_filterByOwner(filterByOwner)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_STOP_ALL_TRIGGERS>()override {}
-
-        const bool m_filterByOwner;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_SET_POSITION>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_SET_POSITION)
-            , oPosition()
-        {}
-
-        explicit SAudioObjectRequestData(const SATLWorldPosition& oPassedPosition)
-            : SAudioObjectRequestDataBase(eAORT_SET_POSITION)
-            , oPosition(oPassedPosition)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_SET_POSITION>()override {}
-
-        SATLWorldPosition oPosition;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_SET_RTPC_VALUE>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_SET_RTPC_VALUE)
-            , nControlID(INVALID_AUDIO_CONTROL_ID)
-            , fValue(0.0f)
-        {}
-
-        SAudioObjectRequestData(const TAudioControlID nPassedControlID, const float fPassedValue)
-            : SAudioObjectRequestDataBase(eAORT_SET_RTPC_VALUE)
-            , nControlID(nPassedControlID)
-            , fValue(fPassedValue)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_SET_RTPC_VALUE>()override {}
-
-        TAudioControlID nControlID;
-        float fValue;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_SET_SWITCH_STATE>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_SET_SWITCH_STATE)
-            , nSwitchID(INVALID_AUDIO_CONTROL_ID)
-            , nStateID(INVALID_AUDIO_SWITCH_STATE_ID)
-        {}
-
-        SAudioObjectRequestData(const TAudioControlID nPassedControlID, const TAudioSwitchStateID nPassedStateID)
-            : SAudioObjectRequestDataBase(eAORT_SET_SWITCH_STATE)
-            , nSwitchID(nPassedControlID)
-            , nStateID(nPassedStateID)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_SET_SWITCH_STATE>()override {}
-
-        TAudioControlID nSwitchID;
-        TAudioSwitchStateID nStateID;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_SET_ENVIRONMENT_AMOUNT>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_SET_ENVIRONMENT_AMOUNT)
-            , nEnvironmentID(INVALID_AUDIO_ENVIRONMENT_ID)
-            , fAmount(1.0f)
-        {}
-
-        SAudioObjectRequestData(const TAudioEnvironmentID nPassedEnvironmentID, const float fPassedAmount)
-            : SAudioObjectRequestDataBase(eAORT_SET_ENVIRONMENT_AMOUNT)
-            , nEnvironmentID(nPassedEnvironmentID)
-            , fAmount(fPassedAmount)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_SET_ENVIRONMENT_AMOUNT>()override {}
-
-        TAudioEnvironmentID nEnvironmentID;
-        float fAmount;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_RESET_ENVIRONMENTS>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_RESET_ENVIRONMENTS)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_RESET_ENVIRONMENTS>()override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_RESET_RTPCS>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_RESET_RTPCS)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_RESET_RTPCS>() override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_RELEASE_OBJECT>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_RELEASE_OBJECT)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_RELEASE_OBJECT>()override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioObjectRequestData<eAORT_EXECUTE_SOURCE_TRIGGER>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_EXECUTE_SOURCE_TRIGGER)
-            , m_triggerId(INVALID_AUDIO_CONTROL_ID)
-        {}
-
-        SAudioObjectRequestData(
-            TAudioControlID triggerId,
-            const SAudioSourceInfo& sourceInfo)
-            : SAudioObjectRequestDataBase(eAORT_EXECUTE_SOURCE_TRIGGER)
-            , m_triggerId(triggerId)
-            , m_sourceInfo(sourceInfo)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_EXECUTE_SOURCE_TRIGGER>()override {}
-
-        TAudioControlID m_triggerId;
-        SAudioSourceInfo m_sourceInfo;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template <>
-    struct SAudioObjectRequestData<eAORT_SET_MULTI_POSITIONS>
-        : public SAudioObjectRequestDataBase
-    {
-        SAudioObjectRequestData()
-            : SAudioObjectRequestDataBase(eAORT_SET_MULTI_POSITIONS)
-        {}
-
-        SAudioObjectRequestData(const MultiPositionParams& params)
-            : SAudioObjectRequestDataBase(eAORT_SET_MULTI_POSITIONS)
-            , m_params(params)
-        {}
-
-        ~SAudioObjectRequestData<eAORT_SET_MULTI_POSITIONS>() override {}
-
-        MultiPositionParams m_params;
-    };
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    // Audio Listener Requests
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioListenerRequestDataBase
-        : public SAudioRequestDataBase
-    {
-        explicit SAudioListenerRequestDataBase(const EAudioListenerRequestType ePassedType = eALRT_NONE)
-            : SAudioRequestDataBase(eART_AUDIO_LISTENER_REQUEST)
-            , eType(ePassedType)
-        {}
-
-        ~SAudioListenerRequestDataBase() override {}
-
-        const EAudioListenerRequestType eType;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<EAudioListenerRequestType T>
-    struct SAudioListenerRequestData
-        : public SAudioListenerRequestDataBase
-    {
-        SAudioListenerRequestData()
-            : SAudioListenerRequestDataBase(T)
-        {}
-
-        ~SAudioListenerRequestData() override {}
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    template<>
-    struct SAudioListenerRequestData<eALRT_SET_POSITION>
-        : public SAudioListenerRequestDataBase
-    {
-        SAudioListenerRequestData()
-            : SAudioListenerRequestDataBase(eALRT_SET_POSITION)
-        {}
-
-        explicit SAudioListenerRequestData(const SATLWorldPosition& oWorldPosition)
-            : SAudioListenerRequestDataBase(eALRT_SET_POSITION)
-            , oNewPosition(oWorldPosition)
-        {}
-
-        ~SAudioListenerRequestData<eALRT_SET_POSITION>()override {}
-
-        SATLWorldPosition oNewPosition;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct SAudioSystemInfo
-    {
-        SAudioSystemInfo()
-            : nCountUsedAudioTriggers(0)
-            , nCountUnusedAudioTriggers(0)
-            , nCountUsedAudioEvents(0)
-            , nCountUnusedAudioEvents(0)
-        {}
-
-        AZStd::size_t nCountUsedAudioTriggers;
-        AZStd::size_t nCountUnusedAudioTriggers;
-        AZStd::size_t nCountUsedAudioEvents;
-        AZStd::size_t nCountUnusedAudioEvents;
-
-        AZ::Vector3 oListenerPos;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct IAudioProxy
-    {
-        virtual ~IAudioProxy() = default;
-
-        virtual void Initialize(const char* sObjectName, bool bInitAsync = true) = 0;
-        virtual void Release() = 0;
-        virtual void Reset() = 0;
-
-        virtual void ExecuteSourceTrigger(TAudioControlID nTriggerID, const SAudioSourceInfo& rSourceInfo, const SAudioCallBackInfos& rCallbackInfos = SAudioCallBackInfos::GetEmptyObject()) = 0;
-        virtual void ExecuteTrigger(TAudioControlID nTriggerID, const SAudioCallBackInfos& rCallbackInfos = SAudioCallBackInfos::GetEmptyObject()) = 0;
-        virtual void StopAllTriggers() = 0;
-        virtual void StopTrigger(TAudioControlID nTriggerID) = 0;
-        virtual void SetSwitchState(TAudioControlID nSwitchID, TAudioSwitchStateID nStateID) = 0;
-        virtual void SetRtpcValue(TAudioControlID nRtpcID, float fValue) = 0;
-        virtual void SetObstructionCalcType(EAudioObjectObstructionCalcType eObstructionType) = 0;
-        virtual void SetPosition(const SATLWorldPosition& rPosition) = 0;
-        virtual void SetPosition(const AZ::Vector3& rPosition) = 0;
-        virtual void SetMultiplePositions(const MultiPositionParams& params) = 0;
-        virtual void SetEnvironmentAmount(TAudioEnvironmentID nEnvironmentID, float fAmount) = 0;
-        virtual void SetCurrentEnvironments() = 0;
-        virtual void ResetRtpcValues() = 0;
-        virtual TAudioObjectID GetAudioObjectID() const = 0;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    class AudioPreloadNotifications
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~AudioPreloadNotifications() = default;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // EBusTraits - PreloadID Address, Multiple Handler
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        using BusIdType = TAudioPreloadRequestID;
-        using MutexType = AZStd::recursive_mutex;
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void OnAudioPreloadCached() = 0;
-        virtual void OnAudioPreloadUncached() = 0;
-    };
-
-    using AudioPreloadNotificationBus = AZ::EBus<AudioPreloadNotifications>;
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    class AudioSystemRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~AudioSystemRequests() = default;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // EBusTraits - Single Bus Address, Single Handler
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual bool Initialize() = 0;
-        virtual void Release() = 0;
-        virtual void ExternalUpdate() = 0;
-
-        virtual void PushRequest(const SAudioRequest& rAudioRequestData) = 0;
-        virtual void PushRequestBlocking(const SAudioRequest& audioRequestData) = 0;
-
-        virtual void AddRequestListener(
-            AudioRequestCallbackType callBack,
-            void* objectToListenTo,
-            EAudioRequestType requestType = eART_AUDIO_ALL_REQUESTS,
-            TATLEnumFlagsType specificRequestMask = ALL_AUDIO_REQUEST_SPECIFIC_TYPE_FLAGS) = 0;
-        virtual void RemoveRequestListener(
-            AudioRequestCallbackType callBack,
-            void* requestOwner) = 0;
-
-        virtual TAudioControlID GetAudioTriggerID(const char* sAudioTriggerName) const = 0;
-        virtual TAudioControlID GetAudioRtpcID(const char* sAudioRtpcName) const = 0;
-        virtual TAudioControlID GetAudioSwitchID(const char* sAudioSwitchName) const = 0;
-        virtual TAudioSwitchStateID GetAudioSwitchStateID(TAudioControlID nSwitchID, const char* sAudioSwitchStateName) const = 0;
-        virtual TAudioPreloadRequestID GetAudioPreloadRequestID(const char* sAudioPreloadRequestName) const = 0;
-        virtual TAudioEnvironmentID GetAudioEnvironmentID(const char* sAudioEnvironmentName) const = 0;
-
-        virtual bool ReserveAudioListenerID(TAudioObjectID& rAudioObjectID) = 0;
-        virtual bool ReleaseAudioListenerID(TAudioObjectID nAudioObjectID) = 0;
-        virtual bool SetAudioListenerOverrideID(TAudioObjectID nAudioObjectID) = 0;
-
-        virtual void GetInfo(SAudioSystemInfo& rAudioSystemInfo) = 0;
-        virtual const char* GetControlsPath() const = 0;
-        virtual void UpdateControlsPath() = 0;
-        virtual void RefreshAudioSystem(const char* levelName) = 0;
-
-        virtual IAudioProxy* GetFreeAudioProxy() = 0;
-        virtual void FreeAudioProxy(IAudioProxy* pIAudioProxy) = 0;
-
-        virtual TAudioSourceId CreateAudioSource(const SAudioInputConfig& sourceConfig) = 0;
-        virtual void DestroyAudioSource(TAudioSourceId sourceId) = 0;
-
-        virtual const char* GetAudioControlName(EAudioControlType controlType, TATLIDType atlID) const = 0;
-        virtual const char* GetAudioSwitchStateName(TAudioControlID switchID, TAudioSwitchStateID stateID) const = 0;
-    };
-
-    using AudioSystemRequestBus = AZ::EBus<AudioSystemRequests>;
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct AudioTriggerNotifications
-        : public AZ::EBusTraits
-    {
-        virtual ~AudioTriggerNotifications() = default;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // EBusTraits - Address by ID, Multiple Handler, Mutex, Queued
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        static const bool EnableEventQueue = true;
-        using MutexType = AZStd::recursive_mutex;
-        using BusIdType = Audio::TAudioControlID;
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void ReportDurationInfo(TAudioEventID, float /*duration*/, float /*estimatedDuration*/) = 0;
-    };
-
-    using AudioTriggerNotificationBus = AZ::EBus<AudioTriggerNotifications>;
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    class AudioSystemThreadSafeRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~AudioSystemThreadSafeRequests() = default;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // EBusTraits - Single Bus Address, Single Handler, Mutex, Queued
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const bool EnableEventQueue = true;
-        using MutexType = AZStd::recursive_mutex;
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        virtual void PushRequestThreadSafe(const SAudioRequest& audioRequestData) = 0;
-    };
-
-    using AudioSystemThreadSafeRequestBus = AZ::EBus<AudioSystemThreadSafeRequests>;
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    struct IAudioSystem
-        : public AudioSystemRequestBus::Handler
-        , public AudioSystemThreadSafeRequestBus::Handler
-    {
-        ~IAudioSystem() override = default;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    class AudioStreamingRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~AudioStreamingRequests() = default;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides - Single Bus, Single Handler
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        using BusIdType = TAudioSourceId;
-        using MutexType = AZStd::recursive_mutex;
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // <title ReadStreamingInput>
-        // Summary:
-        //      Load streaming input into the ATL-specific audio input
-        // Arguments:
-        //      data - Buffer of data to load into the input device's internal buffer
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        virtual AZStd::size_t ReadStreamingInput(const AudioStreamData& data) = 0;
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // <title ReadStreamingMultiTrackInput>
-        // Summary:
-        //      Load streaming multi-track input into the ATL-specific audio input
-        // Arguments:
-        //      data - Buffers of multi-track data to load into the input device's internal buffer
-        // Return value:
-        //      The number of frames loaded into the internal buffer
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        virtual AZStd::size_t ReadStreamingMultiTrackInput(AudioStreamMultiTrackData& data) = 0;
-    };
-
-    using AudioStreamingRequestBus = AZ::EBus<AudioStreamingRequests>;
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    namespace Gem
-    {
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // Used for initializing and releasing the audio system (AudioSystem/ATL) code.
-        class AudioSystemGemRequests
-            : public AZ::EBusTraits
-        {
-        public:
-            ///////////////////////////////////////////////////////////////////////////////////////////
-            // EBusTraits overrides
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-            static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-            ///////////////////////////////////////////////////////////////////////////////////////////
-
-            // Interface methods
-            virtual bool Initialize(const SSystemInitParams* initParams) = 0;
-            virtual void Release() = 0;
-        };
-
-        using AudioSystemGemRequestBus = AZ::EBus<AudioSystemGemRequests>;
-
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-        // Used for initializing and releasing the audio engine (middleware layer) code.
-        class AudioEngineGemRequests
-            : public AZ::EBusTraits
-        {
-        public:
-            ///////////////////////////////////////////////////////////////////////////////////////////
-            // EBusTraits overrides
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-            static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-            ///////////////////////////////////////////////////////////////////////////////////////////
-
-            // Interface methods
-            virtual bool Initialize() = 0;
-            virtual void Release() = 0;
-        };
-
-        using AudioEngineGemRequestBus = AZ::EBus<AudioEngineGemRequests>;
-
-    } // namespace Gem
-
-} // namespace Audio
diff --git a/Code/CryEngine/CryCommon/ICmdLine.h b/Code/CryEngine/CryCommon/ICmdLine.h
deleted file mode 100644
index 3a9ccedfee..0000000000
--- a/Code/CryEngine/CryCommon/ICmdLine.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : This is the interface to access command line arguments.
-//               This will avoid the need to parse command line in multiple
-//               places  and thus  reduce unnecessary code duplication
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ICMDLINE_H
-#define CRYINCLUDE_CRYCOMMON_ICMDLINE_H
-#pragma once
-
-// The type of command line argument
-enum ECmdLineArgType
-{
-    // Description:
-    //      Argument was not preceeded by anything
-    eCLAT_Normal = 0,
-    // Description:
-    //      Argument was preceeded by a minus sign '-'
-    eCLAT_Pre,
-    // Description:
-    //      Argument was preceeded by a plus signe '+'
-    eCLAT_Post,
-    // Description:
-    //      Argument is the executable filename
-    eCLAT_Executable,
-};
-
-// Container for a command line Argument
-class ICmdLineArg
-{
-public:
-    // <interfuscator:shuffle>
-    virtual ~ICmdLineArg(){}
-    // Description:
-    //      Retrieve the name of the argument.
-    // Return Value:
-    //      The name of the argument.
-    virtual const char* GetName() const = 0;
-
-    // Description:
-    //      Retrieve the value of the argument.
-    // Return Value:
-    //      The value of the argument as a null-terminated string.
-    virtual const char* GetValue() const = 0;
-
-    // Description:
-    //      Retrieve the type of argument.
-    // Return Value:
-    //      The type of argument.
-    // See Also:
-    //      ECmdLineArgType
-    virtual const ECmdLineArgType GetType() const = 0;
-
-    // Description:
-    //      Retrieve the value of the argument.
-    // Return Value:
-    //      The value of the argument as float number.
-    virtual const float GetFValue() const = 0;
-
-    // Description:
-    //      Retrieve the value of the argument.
-    // Return Value:
-    //      The value of the argument as integer number.
-    virtual const int GetIValue() const = 0;
-    // </interfuscator:shuffle>
-};
-
-// Command line interface
-class ICmdLine
-{
-public:
-    // <interfuscator:shuffle>
-    virtual ~ICmdLine(){}
-    // Description:
-    //      Returns the n-th command line argument.
-    // Arguments:
-    //      n - 0 returns executable name, otherwise returns n-th argument.
-    // Return Value:
-    //      Pointer to the command line argument at index specified by idx.
-    // See Also:
-    //      ICmdLineArg
-    virtual const ICmdLineArg* GetArg(int n) const = 0;
-
-    // Description:
-    //      Returns the number of command line arguments.
-    // Return Value:
-    //      The number of command line arguments.
-    virtual int GetArgCount() const = 0;
-
-    // Description:
-    //      Finds an argument in the command line.
-    // Arguments:
-    //      name - the name of the argument to find, excluding any '+' or '-'
-    // Return Value:
-    //      0 when if the argument was not found.
-    //      Pointer to a ICmdLineArg class containing the specified argument.
-    // See Also:
-    //      ICmdLineArg
-    virtual const ICmdLineArg* FindArg(const ECmdLineArgType ArgType, const char* name, bool caseSensitive = false) const = 0;
-    // </interfuscator:shuffle>
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_ICMDLINE_H
diff --git a/Code/CryEngine/CryCommon/IConsole.h b/Code/CryEngine/CryCommon/IConsole.h
deleted file mode 100644
index 7306c027c9..0000000000
--- a/Code/CryEngine/CryCommon/IConsole.h
+++ /dev/null
@@ -1,688 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ICONSOLE_H
-#define CRYINCLUDE_CRYCOMMON_ICONSOLE_H
-#pragma once
-
-#include <CryCommon/platform.h>
-
-struct SFunctor;
-
-struct ConsoleBind;
-
-struct ICVar;
-class ITexture;
-class ICrySizer;
-struct ISystem;
-
-#define     CVAR_INT              1
-#define     CVAR_FLOAT          2
-#define     CVAR_STRING         3
-
-// By default, cvars registered as const, read-only, or cheat cannot be modified in release builds for security.
-// The common practice has been to hard-code the default values of all these 'const' cvars before generating a release build.
-// However, this is restrictive because the cannot be modified at run-time in release, and so cannot differ between (or during) levels.
-// If you wish, you can disable this restriction by defining ALLOW_CONST_CVAR_MODIFICATIONS 1 (which is the default for non-release builds),
-// thus allowing const/read-only/cheat cvars to be set at run-time in release, and removing the need to explicitly hard-code your default values for release builds.
-#if defined(_RELEASE)
-#define ALLOW_AUDIT_CVARS 0
-#define ALLOW_CONST_CVAR_MODIFICATIONS AZ_TRAIT_CVARS_ENABLED_FOR_RELEASE_BUILDS
-#define LOG_CVAR_INFRACTIONS 0
-#define LOG_CVAR_USAGE 0
-#else
-#define ALLOW_AUDIT_CVARS 1
-#define ALLOW_CONST_CVAR_MODIFICATIONS 1
-#define LOG_CVAR_INFRACTIONS 1
-#define LOG_CVAR_USAGE 1
-#endif // defined(_RELEASE)
-
-#define CVAR_GROUPS_ARE_PRIVILEGED 1 // allows cvar groups to manipulate const/cheat cvars (turn off to log group cvar manipulation)
-#define LOG_CVAR_INFRACTIONS_CALLSTACK (LOG_CVAR_INFRACTIONS && 0) // logs the callstack when certain cvar issues arise; helpful in tracking down where the problem originated
-
-// If this flag is set during registering a console variable, and the variable exists,
-// then the variable will store its value in memory given by src
-#define CVF_CHANGE_SOURCE (1u << 16)
-
-// Flags used by ICVar
-enum EVarFlags
-{
-    VF_NULL =                                           0x00000000,         // just to have one recognizable spot where the flags are located in the Register call
-    VF_CHEAT =                                      0x00000002,         // stays in the default state when cheats are disabled
-    VF_DEV_ONLY =                   0x00000004,         // cvar is only registered with the console in non release builds
-    VF_DEDI_ONLY =                  0x00000008,         // cvar is only registered with the console in non release or dedicated server builds
-    VF_NET_SYNCED =                             0x00000080,         // synchronised between server and client(s); server authorative
-    VF_DUMPTODISK   =                               0x00000100,
-    VF_READONLY =                                   0x00000800,         // can not be changed by the user
-    VF_REQUIRE_LEVEL_RELOAD =           0x00001000,
-    VF_REQUIRE_APP_RESTART =            0x00002000,
-    VF_WARNING_NOTUSED  =                   0x00004000,         // shows warning that this var was not used in config file
-    VF_COPYNAME =                                   0x00008000,         // otherwise the const char * to the name will be stored without copying the memory
-    VF_MODIFIED =                                   0x00010000,         // Set when variable value modified.
-    VF_WASINCONFIG  =                           0x00020000,         // Set when variable was present in config file.
-    VF_BITFIELD =                                   0x00040000,         // Allow bitfield setting syntax.
-    VF_RESTRICTEDMODE =                     0x00080000,         // is visible and usable in restricted (normal user) console mode
-    VF_INVISIBLE     =                      0x00100000,         // Invisible to the user in console
-    VF_ALWAYSONCHANGE =                     0x00200000,         // Always accept variable value and call on change callback even if variable value didnt change
-    VF_BLOCKFRAME =                             0x00400000,         // Blocks the execution of console commands for one frame
-    VF_CONST_CVAR =                             0x00800000,         // Set if it is a const cvar not to be set inside cfg-files
-    VF_CHEAT_ALWAYS_CHECK =             0x01000000,         // This variable is critical to check in every hash, since it's extremely vulnerable
-    VF_CHEAT_NOCHECK =                      0x02000000,       // This variable is set as VF_CHEAT but doesn't have to be checked/hashed since it's harmless to hack
-    VF_SYSSPEC_OVERWRITE =              0x04000000,       // This variable is specified by system.cfg with the intention to overwrite all subsequent settings
-    VF_CVARGRP_IGNOREINREALVAL =    0x08000000,       // This variable will be ignored when cvar group's real val is checked (Needed for cvars which are in a group but change in various situations)
-    VF_RESETTABLE =                          0x10000000,         // This variable will be reset when a commanded reset to defaults occurs
-    VF_RENDERER_CVAR =                      0x20000000,         // The update of this variable will be done in render thread
-    VF_DEPRECATED =                             0x40000000,         // Deprecated cvars use default values which cannot be modified outside the code
-    VF_EXPERIMENTAL =                           0x80000000,         // This variable is used by WIP or experimental feature
-};
-
-struct ICVarDumpSink
-{
-    // <interfuscator:shuffle>
-    virtual ~ICVarDumpSink(){}
-    virtual void OnElementFound(ICVar* pCVar) = 0;
-    // </interfuscator:shuffle>
-};
-
-struct IKeyBindDumpSink
-{
-    // <interfuscator:shuffle>
-    virtual ~IKeyBindDumpSink(){}
-    virtual void OnKeyBindFound(const char* sBind, const char* sCommand) = 0;
-    // </interfuscator:shuffle>
-};
-
-struct IOutputPrintSink
-{
-    // <interfuscator:shuffle>
-    virtual ~IOutputPrintSink(){}
-    virtual void Print(const char* inszText) = 0;
-    // </interfuscator:shuffle>
-};
-
-// Callback class to derive from when you want to receive callbacks when console var changes.
-struct IConsoleVarSink
-{
-    // <interfuscator:shuffle>
-    virtual ~IConsoleVarSink(){}
-    // Called by Console before changing console var value, to validate if var can be changed.
-    // Return value: true if ok to change value, false if should not change value.
-    virtual bool OnBeforeVarChange(ICVar* pVar, const char* sNewValue) = 0;
-    // Called by Console after variable has changed value
-    virtual void OnAfterVarChange(ICVar* pVar) = 0;
-    // </interfuscator:shuffle>
-};
-
-#if defined(GetCommandLine)
-#undef GetCommandLine
-#endif
-
-// Interface to the arguments of the console command.
-struct IConsoleCmdArgs
-{
-    // <interfuscator:shuffle>
-    virtual ~IConsoleCmdArgs(){}
-    // Gets number of arguments supplied to the command (including the command itself)
-    virtual int GetArgCount() const = 0;
-    // Gets argument by index, nIndex must be in 0 <= nIndex < GetArgCount()
-    virtual const char* GetArg(int nIndex) const = 0;
-    // Gets complete command line
-    virtual const char* GetCommandLine() const = 0;
-    // </interfuscator:shuffle>
-};
-
-// Interface to the arguments of the console command.
-struct IConsoleArgumentAutoComplete
-{
-    // <interfuscator:shuffle>
-    virtual ~IConsoleArgumentAutoComplete(){}
-    // Gets number of matches for the argument to auto complete.
-    virtual int GetCount() const = 0;
-    // Gets argument value by index, nIndex must be in 0 <= nIndex < GetCount()
-    virtual const char* GetValue(int nIndex) const = 0;
-    // </interfuscator:shuffle>
-};
-
-// This a definition of the console command function that can be added to console with AddCommand.
-typedef void (* ConsoleCommandFunc)(IConsoleCmdArgs*);
-
-// This a definition of the callback function that is called when variable change.
-typedef void (* ConsoleVarFunc)(ICVar*);
-
-/* Summary: Interface to the engine console.
-
-  Description:
-    The engine console allow to manipulate the internal engine parameters
-    and to invoke commands.
-    This interface allow external modules to integrate their functionalities
-    into the console as commands or variables.
-
-    IMPLEMENTATIONS NOTES:
-    The console takes advantage of the script engine to store the console variables,
-    this mean that all variables visible through script and console.
-*/
-struct IConsole
-{
-    // <interfuscator:shuffle>
-    virtual ~IConsole(){}
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Deletes the console
-    virtual void Release() = 0;
-
-    // Initialize this instance of engine console
-    // Arguments:
-    //   pSystem - an instance of ISystem
-    virtual void Init(ISystem* pSystem) = 0;
-    // Create a new console variable that store the value in a string
-    // Arguments:
-    //   sName - console variable name
-    //   sValue - default value
-    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
-    //   help - help text that is shown when you use <sName> ? in the console
-    // Return:
-    //   pointer to the interface ICVar
-    virtual ICVar* RegisterString(const char* sName, const char* sValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0) = 0;
-    // Create a new console variable that store the value in a int
-    // Arguments:
-    //   sName - console variable name
-    //   iValue - default value
-    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
-    //   help - help text that is shown when you use <sName> ? in the console
-    // Return:
-    //   pointer to the interface ICVar
-    virtual ICVar* RegisterInt(const char* sName, int iValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0) = 0;
-    // Create a new console variable that store the value in a int64
-    // Arguments:
-    //   sName - console variable name
-    //   iValue - default value
-    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
-    //   help - help text that is shown when you use <sName> ? in the console
-    // Return:
-    //   pointer to the interface ICVar
-    virtual ICVar* RegisterInt64(const char* sName, int64 iValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0) = 0;
-    // Create a new console variable that store the value in a float
-    // Arguments:
-    //   sName - console variable name
-    //   fValue - default value
-    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
-    //   help - help text that is shown when you use <sName> ? in the console
-    // Return:
-    //   pointer to the interface ICVar
-    virtual ICVar* RegisterFloat(const char* sName, float fValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0) = 0;
-
-    // Create a new console variable that will update the user defined float
-    // Arguments:
-    //   sName - console variable name
-    //   src - pointer to the memory that will be updated
-    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
-    //   help - help text that is shown when you use <sName> ? in the console
-    //   allowModify - allow modification through config vars, prevents missing modifications in release mode
-    // Return:
-    //   pointer to the interface ICVar
-    virtual ICVar* Register(const char* name, float* src, float defaultvalue, int nFlags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true) = 0;
-    // Create a new console variable that will update the user defined integer
-    // Arguments:
-    //   sName - console variable name
-    //   src - pointer to the memory that will be updated
-    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
-    //   help - help text that is shown when you use <sName> ? in the console
-    //   allowModify - allow modification through config vars, prevents missing modifications in release mode
-    // Return:
-    //   pointer to the interface ICVar
-    virtual ICVar* Register(const char* name, int* src, int defaultvalue, int nFlags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true) = 0;
-
-    // Create a new console variable that will update the user defined pointer to null terminated string
-    // Arguments:
-    //   sName - console variable name
-    //   src - pointer to the memory that will be updated
-    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
-    //   help - help text that is shown when you use <sName> ? in the console
-    //   allowModify - allow modification through config vars, prevents missing modifications in release mode
-    // Return:
-    //   pointer to the interface ICVar
-    virtual ICVar* Register(const char* name, const char** src, const char* defaultvalue, int nFlags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true) = 0;
-
-    // Registers an existing console variable
-    // Should only be used with static duration objects, object is never freed
-    // Arguments:
-    //   pVar - the existing console variable
-    // Return:
-    //   pointer to the interface ICVar (that was passed in)
-    virtual ICVar* Register(ICVar* pVar) = 0;
-
-    // ! Remove a variable from the console
-    // @param sVarName console variable name
-    // @param bDelete if true the variable is deleted
-    // @see ICVar
-    virtual void UnregisterVariable(const char* sVarName, bool bDelete = false) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Set the y coordinate where the console will stop to scroll when is dropped
-    // @param value y in screen coordinates
-    virtual void SetScrollMax(int value) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // add output sink (clases which are interested in the output) - order is not guaranteed
-    // @param inpSink must not be 0 and is not allowed to be added twice
-    virtual void AddOutputPrintSink(IOutputPrintSink* inpSink) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // remove output sink (clases which are interested in the output) - order is not guaranteed
-    // @param inpSink must not be 0 and has to be added before
-    virtual void RemoveOutputPrintSink(IOutputPrintSink* inpSink) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // show/hide the console
-    // @param specifies if the window must be (true=show,false=hide)
-    // @param specifies iRequestScrollMax <=0 if not used, otherwise it sets SetScrollMax temporary to the given value
-    virtual void ShowConsole(bool show, int iRequestScrollMax = -1) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Dump all console-variables to a callback-interface
-    // @param Callback callback-interface which needs to be called for each element
-    virtual void DumpCVars(ICVarDumpSink* pCallback, unsigned int nFlagsFilter = 0) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Bind a console command to a key
-    // @param sCmd console command that must be executed
-    // @param sRes name of the key to invoke the command
-    virtual void CreateKeyBind(const char* sCmd, const char* sRes) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Sets the background-image
-    // @param pImage background-image
-    virtual void    SetImage(ITexture* pImage, bool bDeleteCurrent) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Retrieves the background-image
-    // @return background-image
-    virtual ITexture* GetImage() = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Sets static/scroll background-mode
-    // @param bStatic true if static
-    virtual void StaticBackground(bool bStatic) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Sets the loading-background-image
-    // @param pImage background-image
-    virtual void    SetLoadingImage(const char* szFilename) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Iterate through the lines - used for dedicated server (truncated if needed)
-    // @param indwLineNo 0.. counted from the last printed line on
-    // @param outszBuffer pointer to the destination string buffer (zero terminated afterwards), must not be 0
-    // @param indwBufferSize 1.. size of the buffer
-    // @return true=line was returned, false=there are no more lines
-
-    virtual bool GetLineNo(int indwLineNo, char* outszBuffer, int indwBufferSize) const = 0;
-
-    // @return current number of lines in the console
-    virtual int GetLineCount() const = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Retrieve a console variable by name - not case sensitive
-    // @param name variable name
-    // @return a pointer to the ICVar interface, NULL if is not found
-    // @see ICVar
-    virtual ICVar* GetCVar(const char* name) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Read a value from a configuration file (.ini) and return the value
-    // @param szVarName variable name
-    // @param szFileName source configuration file
-    // @param def_val default value (if the variable is not found into the file)
-    // @return the variable value
-    virtual char* GetVariable(const char* szVarName, const char* szFileName, const char* def_val) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Read a value from a configuration file (.ini) and return the value
-    // @param szVarName variable name
-    // @param szFileName source configuration file
-    // @param def_val default value (if the variable is not found into the file)
-    // @return the variable value
-    virtual float GetVariable(const char* szVarName, const char* szFileName, float def_val) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Print a string in the console and go to the new line
-    // @param s the string to print
-    virtual void PrintLine(const char* s) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Append a string in the last console line
-    // @param s the string to print
-    virtual void PrintLinePlus(const char* s) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Retrieve the status of the console (active/not active)
-    // @return the variable value(true = active/false = not active)
-    virtual bool GetStatus() = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Clear the console text
-    virtual void    Clear() = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Update the console
-    virtual void    Update() = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Draw the console
-    virtual void    Draw() = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Description:
-    //    Register a new console command.
-    // Arguments:
-    //    sCommand - Command name.
-    //    func     - Pointer to the console command function to be called when command is invoked.
-    //    nFlags   - Bitfield consist of VF_ flags (e.g. VF_CHEAT)
-    //    sHelp    - Help string, will be displayed when typing in console "command ?".
-    // Return
-    //    True if successful, false otherwise.
-    virtual bool AddCommand(const char* sCommand, ConsoleCommandFunc func, int nFlags = 0, const char* sHelp = NULL) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Description:
-    //    Register a new console command that execute script function.
-    //    EG "Game.Connect(%1)" the symbol "%1" will be replaced with the command parameter 1
-    //    writing in the console "connect 127.0.0.1" will invoke Game.Connect("127.0.0.1")
-    // Arguments:
-    //    sCommand - Command name.
-    //    sScriptFunc - Script function to be executed when command is invoked.
-    //    nFlags   - Bitfield consist of VF_ flags (e.g. VF_CHEAT)
-    //    sHelp    - Help string, will be displayed when typing in console "command ?".
-    // Return
-    //    True if successful, false otherwise.
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    virtual bool AddCommand(const char* sName, const char* sScriptFunc, int nFlags = 0, const char* sHelp = NULL) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Description:
-    //    Removes a console command which was previously registered with AddCommand.
-    // Arguments:
-    //    sCommand - Command name
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    virtual void RemoveCommand(const char* sName) = 0;
-
-    // Execute a string in the console
-    // Arguments:
-    //   command - console command e.g. "map testy" - no leading slash
-    //   bSilentMode - true=suppresses log in error case and logging the command to the console
-    //   bDeferExecution - true=the command is stored in special fifo that allows delayed execution
-    //               by using wait_seconds and wait_frames commands
-    //
-    virtual void ExecuteString(const char* command, bool bSilentMode = false, bool bDeferExecution = false) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Print a message into the log and abort the execution of the application
-    // @param message error string to print in the log
-    virtual void Exit(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Return true if the console is opened
-    // @return the variable value(true = opened/false = closed)
-    virtual bool IsOpened() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Auto completion.
-    //////////////////////////////////////////////////////////////////////////
-    virtual int     GetNumVars() = 0;
-
-    virtual int     GetNumVisibleVars() = 0;
-
-    // Arguments:
-    //   szPrefix - 0 or prefix e.g. "sys_spec_"
-    // Return
-    //   used size
-    virtual size_t GetSortedVars(const char** pszArray, size_t numItems, const char* szPrefix = 0) = 0;
-    virtual const char* AutoComplete(const char* substr) = 0;
-    virtual const char* AutoCompletePrev(const char* substr) = 0;
-    virtual const char* ProcessCompletion(const char* szInputBuffer) = 0;
-    virtual void RegisterAutoComplete(const char* sVarOrCommand, IConsoleArgumentAutoComplete* pArgAutoComplete) = 0;
-    virtual void UnRegisterAutoComplete(const char* sVarOrCommand) = 0;
-    //
-    virtual void ResetAutoCompletion() = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    // Calculation of the memory used by the whole console system
-    virtual void GetMemoryUsage (ICrySizer* pSizer) const = 0;
-
-    // Function related to progress bar
-    virtual void ResetProgressBar(int nProgressRange) = 0;
-    // Function related to progress bar
-    virtual void TickProgressBar() = 0;
-
-    // Arguments:
-    //   szLine - must not be 0
-    virtual void SetInputLine(const char* szLine) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Dump all key bindings to a callback-interface
-    // @param Callback callback-interface which needs to be called for each element
-    virtual void DumpKeyBinds(IKeyBindDumpSink* pCallback) = 0;
-    virtual const char* FindKeyBind(const char* sCmd) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Hashing of cvars (for anti-cheat). Separates setting of range, calculation,
-    // and retrieval of result so calculation can be done at a known safe point
-    // (e.g end of frame) when we know cvars won't be modified or in temporary state
-
-    // Get Number of cvars that can be hashed
-    virtual int GetNumCheatVars() = 0;
-    // Set the range of cvars
-    virtual void SetCheatVarHashRange(size_t firstVar, size_t lastVar) = 0;
-    // Calculate the hash from current cvars
-    virtual void CalcCheatVarHash() = 0;
-    // Since hash is calculated async, check if it's completed
-    virtual bool IsHashCalculated() = 0;
-    // Get the hash calculated
-    virtual uint64 GetCheatVarHash() = 0;
-    virtual void PrintCheatVars(bool bUseLastHashRange) = 0;
-    virtual char* GetCheatVarAt(uint32 nOffset) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Console variable sink.
-    // Adds a new console variables sink callback.
-    virtual void AddConsoleVarSink(IConsoleVarSink* pSink) = 0;
-    //! Removes a console variables sink callback.
-    virtual void RemoveConsoleVarSink(IConsoleVarSink* pSink) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // History
-    //////////////////////////////////////////////////////////////////////////
-
-    // \param bUpOrDown true=after pressed "up", false=after pressed "down"
-    // \return 0 if there is no history line or pointer to the null terminated history line
-    virtual const char* GetHistoryElement(bool bUpOrDown) = 0;
-    //! \param szCommand must not be 0
-    virtual void AddCommandToHistory(const char* szCommand) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    //
-    virtual void LoadConfigVar(const char* sVariable, const char* sValue) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Enable or disable the activation key (tilde by default).
-    // This is useful when user is in a text field and want to be able to enter the default key.
-    // bEnable=true console will show
-    // bEnable=false console will no show
-    virtual void EnableActivationKey(bool bEnable) = 0;
-
-
-    // </interfuscator:shuffle>
-
-    virtual void SetClientDataProbeString(const char* pName, const char* pValue) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Description:
-//  This interface for the remote console
-struct IRemoteConsoleListener
-{
-    virtual ~IRemoteConsoleListener() {}
-
-    virtual void OnConsoleCommand([[maybe_unused]] const char* cmd) {};
-    virtual void OnGameplayCommand([[maybe_unused]] const char* cmd) {};
-};
-
-struct IRemoteConsole
-{
-    virtual ~IRemoteConsole() {};
-
-    virtual void RegisterConsoleVariables() = 0;
-    virtual void UnregisterConsoleVariables() = 0;
-
-    virtual void Start() = 0;
-    virtual void Stop() = 0;
-    virtual bool IsStarted() const = 0;
-
-    virtual void AddLogMessage(const char* log) = 0;
-    virtual void AddLogWarning(const char* log) = 0;
-    virtual void AddLogError(const char* log) = 0;
-
-    virtual void Update() = 0;
-
-    virtual void RegisterListener(IRemoteConsoleListener* pListener, const char* name) = 0;
-    virtual void UnregisterListener(IRemoteConsoleListener* pListener) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Description:
-//  This interface is the 1:1 "C++ representation"
-//  of a console variable.
-// Note:
-//  A console variable is accessible in C++ trough
-//  this interface and in all scripts as global variable
-//  (with the same name of the variable in the console)
-struct ICVar
-{
-    enum EConsoleLogMode
-    {
-        eCLM_Off,                           // off
-        eCLM_ConsoleAndFile,    // normal info to console and file
-        eCLM_FileOnly,              // normal info to file only
-        eCLM_FullInfo                   // full info to file only
-    };
-
-    // <interfuscator:shuffle>
-    // TODO make protected;
-    virtual ~ICVar() {}
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // delete the variable
-    // NOTE: the variable will automatically unregister itself from the console
-    virtual void Release() = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Return the integer value of the variable
-    // @return the value
-    virtual int GetIVal() const = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Return the 64-bit integer value of the variable
-    // @return the value
-    virtual int64 GetI64Val() const = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Return the float value of the variable
-    // @return the value
-    virtual float GetFVal() const = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Return the string value of the variable, don't store pointer as multiple calls to this function might return same memory ptr
-    // @return the value
-    virtual const char* GetString() const = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Return the data probe string value of the variable, don't store pointer as multiple calls to this function might return same memory ptr
-    // @return the value
-    virtual const char* GetDataProbeString() const = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Reset the CVar to its default value if possible
-    virtual void Reset() {}
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // set the string value of the variable
-    // @param s string representation the value
-    virtual void Set(const char* s) = 0;
-
-    // Force to set the string value of the variable - can be called
-    // from inside code only
-    // @param s string representation the value
-    virtual void ForceSet(const char* s) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // set the float value of the variable
-    // @param s float representation the value
-    virtual void Set(float f) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // set the float value of the variable
-    // @param s integer representation the value
-    virtual void Set(int i) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // clear the specified bits in the flag field
-    virtual void ClearFlags (int flags) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // return the variable's flags
-    // @return the variable's flags
-    // See Also: EVarFlags
-    virtual int GetFlags() const = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Set the variable's flags
-    // See Also: EVarFlags
-    virtual int SetFlags(int flags) = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // return the primary variable's type
-    // @return the primary variable's type  e.g. CVAR_INT, CVAR_FLOAT, CVAR_STRING
-    virtual int GetType() = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // return the variable's name
-    // @return the variable's name
-    virtual const char* GetName() const = 0;
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // return the variable's help text
-    // @return the variable's help text, can be 0 if no help is available
-    virtual const char* GetHelp() = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // return if the variable may be modified in config files
-    // @return if the variable may be modified in config files
-    virtual bool IsConstCVar() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set a new on change function callback.
-    // Deprecated function. The functor should be preferred.
-    virtual void SetOnChangeCallback(ConsoleVarFunc pChangeFunc) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Adds a new on change functor to the list.
-    // It will add from index 1 on (0 is reserved).
-    // Returns an ID to use when getting or removing the functor
-    virtual uint64 AddOnChangeFunctor(const SFunctor& pChangeFunctor) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Returns the number of registered on change functos.
-    virtual uint64 GetNumberOfOnChangeFunctors() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Returns the functors with the specified id.
-    virtual const SFunctor& GetOnChangeFunctor(uint64 nFunctorId) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Removes an on change functor
-    // returns true if removal was successful.
-    virtual bool RemoveOnChangeFunctor(uint64 nFunctorId) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Get the current callback function.
-    virtual ConsoleVarFunc GetOnChangeCallback() const = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    //
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // only useful for CVarGroups, other types return GetIVal()
-    // CVarGroups set multiple other CVars and this function returns
-    // the integer value the CVarGroup should have, when looking at the controlled cvars
-    // Returns:
-    //   value that would represent the state, -1 if the state cannot be found
-    virtual int GetRealIVal() const = 0;
-
-    virtual void SetLimits(float min, float max) = 0;
-    virtual void GetLimits(float& min, float& max) = 0;
-    virtual bool HasCustomLimits() = 0;
-
-    // only useful for CVarGroups
-    // log difference between expected state and real state
-    virtual void DebugLog([[maybe_unused]] const int iExpectedValue, [[maybe_unused]] const EConsoleLogMode mode) const {}
-    // </interfuscator:shuffle>
-
-    // Set the data probe string value of the variable
-    virtual void SetDataProbeString(const char* pDataProbeString) = 0;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_ICONSOLE_H
diff --git a/Code/CryEngine/CryCommon/IEntityRenderState.h b/Code/CryEngine/CryCommon/IEntityRenderState.h
deleted file mode 100644
index bd18a7407e..0000000000
--- a/Code/CryEngine/CryCommon/IEntityRenderState.h
+++ /dev/null
@@ -1,787 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IENTITYRENDERSTATE_H
-#define CRYINCLUDE_CRYCOMMON_IENTITYRENDERSTATE_H
-#pragma once
-
-#include <IRenderer.h>
-#include <limits>
-#include <AzCore/Component/EntityId.h>
-
-namespace AZ 
-{
-    class Vector2;
-}
-
-struct IMaterial;
-struct IVisArea;
-struct SRenderingPassInfo;
-struct SRendItemSorter;
-struct SFrameLodInfo;
-struct pe_params_area;
-struct pe_articgeomparams;
-
-// @NOTE: When removing an item from this enum, replace it with a dummy - ID's from this enum are stored in data and should not change.
-enum EERType
-{
-    eERType_NotRenderNode,
-    eERType_Dummy_10,
-    eERType_Dummy8, 
-    eERType_Light,
-    eERType_Cloud,
-    eERType_TerrainSystem, // used to be eERType_Dummy_1 which used to be eERType_VoxelObject, preserve order for compatibility
-    eERType_FogVolume,
-    eERType_Decal,
-    eERType_Dummy_6, // used to be eERType_ParticleEmitter, preserve order for compatibility
-    eERType_WaterVolume,
-    eERType_Dummy_5, // used to be eERType_WaterWave, preserve order for compatibility
-    eERType_Dummy_7, // used to be eERType_Road, preserve order for compatibility
-    eERType_DistanceCloud,
-    eERType_VolumeObject,
-    eERType_Dummy_0, // used to be eERType_AutoCubeMap, preserve order for compatibility
-    eERType_Rope,
-    eERType_PrismObject,
-    eERType_Dummy_2, // used to be eERType_IsoMesh, preserve order for compatibility
-    eERType_Dummy_4,
-    eERType_RenderComponent,
-    eERType_GameEffect,
-    eERType_BreakableGlass,
-    eERType_Dummy_3, // used to be eERType_LightShape, preserve order for compatibility
-    eERType_Dummy_9,
-    eERType_GeomCache,
-    eERType_StaticMeshRenderComponent,
-    eERType_DynamicMeshRenderComponent,
-    eERType_SkinnedMeshRenderComponent,
-    eERType_TypesNum, // MUST BE AT END TOTAL NUMBER OF ERTYPES
-};
-
-enum ERNListType
-{
-    eRNListType_Unknown,
-    eRNListType_DecalsAndRoads,
-    eRNListType_ListsNum,
-    eRNListType_First = eRNListType_Unknown, // This should be the last member
-    // And it counts on eRNListType_Unknown
-    // being the first enum element.
-};
-
-enum EOcclusionObjectType
-{
-    eoot_OCCLUDER,
-    eoot_OCEAN,
-    eoot_OCCELL,
-    eoot_OCCELL_OCCLUDER,
-    eoot_OBJECT,
-    eoot_OBJECT_TO_LIGHT,
-    eoot_TERRAIN_NODE,
-    eoot_PORTAL,
-};
-
-// RenderNode flags
-
-#define ERF_GOOD_OCCLUDER               BIT(0)
-#define ERF_PROCEDURAL                  BIT(1)
-#define ERF_CLONE_SOURCE                BIT(2) // set if this object was cloned from another one
-#define ERF_CASTSHADOWMAPS              BIT(3) // if you ever set this flag, be sure also to set ERF_HAS_CASTSHADOWMAPS
-#define ERF_RENDER_ALWAYS               BIT(4)
-#define ERF_DYNAMIC_DISTANCESHADOWS     BIT(5)
-#define ERF_HIDABLE                     BIT(6)
-#define ERF_HIDABLE_SECONDARY           BIT(7)
-#define ERF_HIDDEN                      BIT(8)
-#define ERF_SELECTED                    BIT(9)
-#define ERF_PROCEDURAL_ENTITY           BIT(10) // this is an object generated at runtime which has a limited lifetime (matches procedural entity)
-#define ERF_OUTDOORONLY                 BIT(11)
-#define ERF_NODYNWATER                  BIT(12)
-#define ERF_EXCLUDE_FROM_TRIANGULATION  BIT(13)
-#define ERF_REGISTER_BY_BBOX            BIT(14)
-#define ERF_STATIC_INSTANCING           BIT(15)
-#define ERF_VOXELIZE_STATIC             BIT(16)
-#define ERF_NO_PHYSICS                  BIT(17)
-#define ERF_NO_DECALNODE_DECALS         BIT(18)
-#define ERF_REGISTER_BY_POSITION        BIT(19)
-#define ERF_COMPONENT_ENTITY            BIT(20)
-#define ERF_RECVWIND                    BIT(21)
-#define ERF_COLLISION_PROXY             BIT(22) // Collision proxy is a special object that is only visible in editor
-// and used for physical collisions with player and vehicles.
-#define ERF_LOD_BBOX_BASED              BIT(23) // Lod changes based on bounding boxes.
-#define ERF_SPEC_BIT0                   BIT(24) // Bit0 of min config specification.
-#define ERF_SPEC_BIT1                   BIT(25) // Bit1 of min config specification.
-#define ERF_SPEC_BIT2                   BIT(26) // Bit2 of min config specification.
-#define ERF_SPEC_BITS_MASK              (ERF_SPEC_BIT0 | ERF_SPEC_BIT1 | ERF_SPEC_BIT2) // Bit mask of the min spec bits.
-#define ERF_SPEC_BITS_SHIFT             (24)    // Bit offset of the ERF_SPEC_BIT0.
-#define ERF_RAYCAST_PROXY               BIT(27) // raycast proxy is only used for raycasting
-#define ERF_HUD                         BIT(28) // Hud object that can avoid some visibility tests
-#define ERF_RAIN_OCCLUDER               BIT(29) // Is used for rain occlusion map
-#define ERF_HAS_CASTSHADOWMAPS          BIT(30) // at one point had ERF_CASTSHADOWMAPS set
-#define ERF_ACTIVE_LAYER                BIT(31) // the node is on a currently active layer
-
-struct IShadowCaster
-{
-    // <interfuscator:shuffle>
-    virtual ~IShadowCaster(){}
-    virtual bool HasOcclusionmap([[maybe_unused]] int nLod, [[maybe_unused]] IRenderNode* pLightOwner) { return false; }
-    virtual CLodValue ComputeLod(int wantedLod, [[maybe_unused]] const SRenderingPassInfo& passInfo) { return CLodValue(wantedLod); }
-    virtual void Render(const SRendParams& RendParams, const SRenderingPassInfo& passInfo) = 0;
-    virtual const AABB GetBBoxVirtual() = 0;
-    virtual void FillBBox(AABB& aabb) = 0;
-    virtual EERType GetRenderNodeType() = 0;
-    virtual bool IsRenderNode() { return true; }
-    // </interfuscator:shuffle>
-    uint8 m_cStaticShadowLod;
-};
-
-// Optional filter function for octree queries to perform custom filtering of the results.
-// return true to keep the render node, false to filter it out.
-using ObjectTreeQueryFilterCallback = AZStd::function<bool(IRenderNode*, EERType)>;
-
-struct IOctreeNode
-{
-public:
-    virtual ~IOctreeNode() {};
-
-    virtual void GetObjectsByType(PodArray<IRenderNode*>& lstObjects, EERType objType, const AABB* pBBox, ObjectTreeQueryFilterCallback filterCallback = nullptr) = 0;
-
-    struct CVisArea* m_pVisArea;
-};
-
-struct SLodDistDissolveTransitionState
-{
-    float fStartDist;
-    int8 nOldLod;
-    int8 nNewLod;
-    bool bFarside;
-};
-
-struct SLightInfo
-{
-    bool operator == (const SLightInfo& other) const
-    { return other.vPos.IsEquivalent(vPos, 0.1f) && fabs(other.fRadius - fRadius) < 0.1f; }
-    Vec3 vPos;
-    float fRadius;
-    bool bAffecting;
-};
-
-struct IRenderNode
-    : public IShadowCaster
-{
-    enum EInternalFlags
-    {
-        DECAL_OWNER     = BIT(0),           // Owns some decals.
-        REQUIRES_NEAREST_CUBEMAP = BIT(1), // Pick nearest cube map
-        UPDATE_DECALS   = BIT(2),           // The node changed geometry - decals must be updated.
-        REQUIRES_FORWARD_RENDERING = BIT(3), // Special shadow processing needed.
-        WAS_INVISIBLE   = BIT(4),           // Was invisible last frame.
-        WAS_IN_VISAREA  = BIT(5),           // Was inside vis-ares last frame.
-        WAS_FARAWAY         = BIT(6),         // Was considered 'far away' for the purposes of physics deactivation.
-        HAS_OCCLUSION_PROXY = BIT(7)    // This node has occlusion proxy.
-    };
-
-    IRenderNode()
-    {
-        m_dwRndFlags = 0;
-        m_fViewDistanceMultiplier = static_cast<float>(IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX); // By default object is not limited by distance. 
-        m_ucLodRatio = 100;
-        m_pOcNode = 0;
-        m_fWSMaxViewDist = 0;
-        m_nInternalFlags = 0;
-        m_nMaterialLayers = 0;
-        m_pRNTmpData = NULL;
-        m_pPrev = m_pNext = NULL;
-        m_nSID = 0;
-        m_cShadowLodBias = 0;
-        m_cStaticShadowLod = 0;
-    }
-
-    virtual bool CanExecuteRenderAsJob() { return false; }
-
-    // <interfuscator:shuffle>
-    // Debug info about object.
-    virtual const char* GetName() const = 0;
-    virtual const char* GetEntityClassName() const = 0;
-    virtual string GetDebugString([[maybe_unused]] char type = 0) const { return ""; }
-    virtual float GetImportance() const   { return 1.f; }
-
-    // Description:
-    //    Releases IRenderNode.
-    virtual void ReleaseNode([[maybe_unused]] bool bImmediate = false) { delete this; }
-
-
-    virtual IRenderNode* Clone() const { return NULL; }
-
-    // Description:
-    //    Sets render node transformation matrix.
-    virtual void SetMatrix([[maybe_unused]] const Matrix34& mat) {}
-
-    // Description:
-    //    Gets local bounds of the render node.
-    virtual void GetLocalBounds(AABB& bbox) { AABB WSBBox(GetBBox()); bbox = AABB(WSBBox.min - GetPos(true), WSBBox.max - GetPos(true)); }
-
-    virtual Vec3 GetPos(bool bWorldOnly = true) const = 0;
-    virtual const AABB GetBBox() const = 0;
-    virtual void FillBBox(AABB& aabb) { aabb = GetBBox(); }
-    virtual void SetBBox(const AABB& WSBBox) = 0;
-
-    virtual void SetScale([[maybe_unused]] const Vec3& scale) {}
-    
-    //Get the scales assuming the scale is uniform or per column as needed.
-    virtual float GetUniformScale() { return 1.0f; }
-    virtual float GetColumnScale([[maybe_unused]] int column) { return 1.0f; }
-
-    // Summary:
-    //    Changes the world coordinates position of this node by delta
-    //    Don't forget to call this base function when overriding it.
-    virtual void OffsetPosition(const Vec3& delta) = 0;
-
-    // Return true when the node is initialized and ready to render
-    virtual bool IsReady() const { return true; }
-
-    // Summary:
-    //   Renders node geometry
-    virtual void Render(const struct SRendParams& EntDrawParams, const SRenderingPassInfo& passInfo) = 0;
-
-    // Hides/disables node in renderer.
-    virtual void Hide(bool bHide) { SetRndFlags(ERF_HIDDEN, bHide); }
-    bool IsHidden() const { return (GetRndFlags() & ERF_HIDDEN) != 0; }
-
-    // Gives access to object components.
-    virtual struct IStatObj* GetEntityStatObj(unsigned int nPartId = 0, unsigned int nSubPartId = 0, Matrix34A* pMatrix = NULL, bool bReturnOnlyVisible = false);
-    virtual _smart_ptr<IMaterial> GetEntitySlotMaterial([[maybe_unused]] unsigned int nPartId, [[maybe_unused]] bool bReturnOnlyVisible = false, [[maybe_unused]] bool* pbDrawNear = NULL) { return NULL; }
-    virtual void SetEntityStatObj([[maybe_unused]] unsigned int nSlot, [[maybe_unused]] IStatObj* pStatObj, [[maybe_unused]] const Matrix34A* pMatrix = NULL) {};
-    virtual int GetSlotCount() const { return 1; }
-
-    // Summary:
-    //   Returns IRenderMesh of the object.
-    virtual struct IRenderMesh* GetRenderMesh([[maybe_unused]] int nLod) { return 0; };
-
-    // Description:
-    //   Allows to adjust default lod distance settings,
-    //   if fLodRatio is 100 - default lod distance is used.
-    virtual void SetLodRatio(int nLodRatio) { m_ucLodRatio = static_cast<unsigned char>(min(255, max(0, nLodRatio))); }
-
-    // Summary:
-    //   Gets material layers mask.
-    virtual uint8 GetMaterialLayers() const { return m_nMaterialLayers; }
-
-
-    // Summary
-    //   Physicalizes if it isn't already.
-    virtual void CheckPhysicalized() {};
-
-    // Summary:
-    //   Physicalizes node.
-    virtual void Physicalize([[maybe_unused]] bool bInstant = false) {}
-
-    virtual ~IRenderNode() { assert(!m_pRNTmpData); };
-
-    // Summary:
-    //   Sets override material for this instance.
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMat) = 0;
-    // Summary:
-    //   Queries override material of this instance.
-    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = NULL) = 0;
-    virtual _smart_ptr<IMaterial> GetMaterialOverride() = 0;
-    virtual void GetMaterials(AZStd::vector<_smart_ptr<IMaterial>>& materials)
-    {
-        _smart_ptr<IMaterial> currentMaterial = GetMaterialOverride();
-        if (!currentMaterial)
-        {
-            currentMaterial = GetMaterial();
-        }
-        if (currentMaterial)
-        {
-            materials.push_back(currentMaterial);
-        }
-    }
-
-    // Used by the editor during export
-    virtual void SetCollisionClassIndex([[maybe_unused]] int tableIndex) {}
-
-    virtual int GetEditorObjectId() { return 0; }
-    virtual void SetEditorObjectId([[maybe_unused]] int nEditorObjectId) {}
-    virtual void SetStatObjGroupIndex([[maybe_unused]] int nVegetationGroupIndex) { }
-    virtual int GetStatObjGroupId() const { return -1; }
-    virtual void SetLayerId([[maybe_unused]] uint16 nLayerId) { }
-    virtual uint16 GetLayerId() { return 0; }
-    virtual float GetMaxViewDist() = 0;
-
-    virtual EERType GetRenderNodeType() = 0;
-    virtual bool IsAllocatedOutsideOf3DEngineDLL() 
-    { 
-        return GetRenderNodeType() == eERType_RenderComponent || 
-            GetRenderNodeType() == eERType_StaticMeshRenderComponent || 
-            GetRenderNodeType() == eERType_DynamicMeshRenderComponent || 
-            GetRenderNodeType() == eERType_SkinnedMeshRenderComponent;
-    }
-    virtual void Dephysicalize([[maybe_unused]] bool bKeepIfReferenced = false) {}
-    virtual void Dematerialize() {}
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-
-    virtual void Precache() {};
-
-    virtual const AABB GetBBoxVirtual() { return GetBBox(); }
-
-    //  virtual float GetLodForDistance(float fDistance) { return 0; }
-
-    virtual void OnRenderNodeBecomeVisible([[maybe_unused]] const SRenderingPassInfo& passInfo) {}
-    virtual void OnPhysAreaChange() {}
-
-    virtual bool IsMovableByGame() const { return false; }
-
-    virtual uint8 GetSortPriority() { return 0; }
-
-    // Types of voxelization for objects and lights
-    enum EVoxelGIMode : int
-    {
-        VM_None = 0, // No voxelization
-        VM_Static, // Incremental or asynchronous lazy voxelization
-        VM_Dynamic, // Real-time every-frame voxelization on GPU
-    };
-
-    virtual EVoxelGIMode GetVoxelGIMode() { return VM_None; }
-    virtual void SetDesiredVoxelGIMode([[maybe_unused]] EVoxelGIMode voxelMode) {}
-
-    virtual void SetMinSpec(int nMinSpec) { m_dwRndFlags &= ~ERF_SPEC_BITS_MASK; m_dwRndFlags |= (nMinSpec << ERF_SPEC_BITS_SHIFT) & ERF_SPEC_BITS_MASK; };
-
-    // Description:
-    //  Allows to adjust default max view distance settings,
-    //  if fMaxViewDistRatio is 1.0f - default max view distance is used.
-    virtual void SetViewDistanceMultiplier(float fViewDistanceMultiplier);
-    // </interfuscator:shuffle>
-
-    void CopyIRenderNodeData(IRenderNode* pDest) const
-    {
-        pDest->m_fWSMaxViewDist         = m_fWSMaxViewDist;
-        pDest->m_dwRndFlags                 = m_dwRndFlags;
-        //pDest->m_pOcNode                      = m_pOcNode;        // Removed to stop the registering from earlying out.
-        pDest->m_fViewDistanceMultiplier = m_fViewDistanceMultiplier;
-        pDest->m_ucLodRatio                 = m_ucLodRatio;
-        pDest->m_cShadowLodBias         = m_cShadowLodBias;
-        pDest->m_cStaticShadowLod       = m_cStaticShadowLod;
-        pDest->m_nInternalFlags         = m_nInternalFlags;
-        pDest->m_nMaterialLayers        = m_nMaterialLayers;
-        //pDestBrush->m_pRNTmpData              //If this is copied from the source render node, there are two
-        //  pointers to the same data, and if either is deleted, there will
-        //  be a crash when the dangling pointer is used on the other
-    }
-
-    // Rendering flags.
-    ILINE void SetRndFlags(unsigned int dwFlags) { m_dwRndFlags = dwFlags; }
-    ILINE void SetRndFlags(unsigned int dwFlags, bool bEnable)
-    {
-        if (bEnable)
-        {
-            SetRndFlags(m_dwRndFlags | dwFlags);
-        }
-        else
-        {
-            SetRndFlags(m_dwRndFlags & (~dwFlags));
-        }
-    }
-    ILINE unsigned int GetRndFlags() const { return m_dwRndFlags; }
-
-    // Object draw frames (set if was drawn).
-    ILINE void SetDrawFrame(int nFrameID, int nRecursionLevel)
-    {
-        assert(m_pRNTmpData);
-        int* pDrawFrames = (int*)m_pRNTmpData;
-        pDrawFrames[nRecursionLevel] = nFrameID;
-    }
-
-    ILINE int GetDrawFrame(int nRecursionLevel = 0) const
-    {
-        IF (!m_pRNTmpData, 0)
-        {
-            return 0;
-        }
-
-        int* pDrawFrames = (int*)m_pRNTmpData;
-        return pDrawFrames[nRecursionLevel];
-    }
-
-    // Returns:
-    //   Current VisArea or null if in outdoors or entity was not registered in 3dengine.
-    ILINE IVisArea* GetEntityVisArea() const { return m_pOcNode ? (IVisArea*)(m_pOcNode->m_pVisArea) : NULL; }
-
-    // Summary:
-    //   Makes object visible at any distance.
-    ILINE void SetViewDistUnlimited() { SetViewDistanceMultiplier(100.0f); }
-
-    // Summary:
-    //   Retrieves the view distance settings.
-    ILINE float GetViewDistanceMultiplier() const
-    {
-        return m_fViewDistanceMultiplier;
-    }
-
-    // Summary:
-    //   Returns lod distance ratio.
-    ILINE int GetLodRatio() const { return m_ucLodRatio; }
-
-    // Summary:
-    //   Returns lod distance ratio
-    ILINE float GetLodRatioNormalized() const { return 0.01f * m_ucLodRatio; }
-
-    virtual bool GetLodDistances([[maybe_unused]] const SFrameLodInfo& frameLodInfo, [[maybe_unused]] float* distances) const { return false; }
-
-    // Returns distance for first lod change, not factoring in distance multiplier or lod ratio
-    virtual float GetFirstLodDistance() const { return FLT_MAX; }
-
-    // Description:
-    //  Bias value to add to the regular lod
-    virtual void SetShadowLodBias(int8 nShadowLodBias) { m_cShadowLodBias = nShadowLodBias; }
-
-    // Summary:
-    //   Returns lod distance ratio.
-    ILINE int GetShadowLodBias() const { return m_cShadowLodBias; }
-
-    // Summary:
-    //   Sets material layers mask.
-    ILINE void SetMaterialLayers(uint8 nMtlLayers) { m_nMaterialLayers = nMtlLayers; }
-
-    ILINE int  GetMinSpec() const { return (m_dwRndFlags & ERF_SPEC_BITS_MASK) >> ERF_SPEC_BITS_SHIFT; };
-
-    static const ERNListType GetRenderNodeListId(const EERType eRType)
-    {
-        switch (eRType)
-        {
-        case eERType_Decal:
-            return eRNListType_DecalsAndRoads;
-        default:
-            return eRNListType_Unknown;
-        }
-    }
-
-    virtual AZ::EntityId GetEntityId() { return AZ::EntityId(); }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Variables
-    //////////////////////////////////////////////////////////////////////////
-
-public:
-
-    // Every sector has linked list of IRenderNode objects.
-    IRenderNode* m_pNext, * m_pPrev;
-
-    // Current objects tree cell.
-    IOctreeNode* m_pOcNode;
-
-    // Pointer to temporary data allocated only for currently visible objects.
-    struct CRNTmpData* m_pRNTmpData;
-
-    // Max view distance.
-    float m_fWSMaxViewDist;
-
-    // Render flags.
-    int m_dwRndFlags;
-
-    // Shadow LOD bias
-    // Set to SHADOW_LODBIAS_DISABLE to disable any shadow lod overrides for this rendernode
-    static const int8 SHADOW_LODBIAS_DISABLE = -128;
-    int8 m_cShadowLodBias;
-
-    // Segment Id
-    int m_nSID;
-
-    // Max view distance settings.
-    static const int VIEW_DISTANCE_MULTIPLIER_MAX = 100;
-    float m_fViewDistanceMultiplier;
-
-    // LOD settings.
-    unsigned char m_ucLodRatio;
-
-    // Flags for render node internal usage, one or more bits from EInternalFlags.
-    unsigned char m_nInternalFlags;
-
-    // Material layers bitmask -> which material layers are active.
-    unsigned char m_nMaterialLayers;
-};
-
-inline void IRenderNode::SetViewDistanceMultiplier(float fViewDistanceMultiplier)
-{
-    fViewDistanceMultiplier = CLAMP(fViewDistanceMultiplier, 0.0f, 100.0f);
-    if (fabs(m_fViewDistanceMultiplier - fViewDistanceMultiplier) > FLT_EPSILON)
-    {
-        m_fViewDistanceMultiplier = fViewDistanceMultiplier;
-    }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-inline IStatObj* IRenderNode::GetEntityStatObj([[maybe_unused]] unsigned int nPartId, [[maybe_unused]] unsigned int nSubPartId, [[maybe_unused]] Matrix34A* pMatrix, [[maybe_unused]] bool bReturnOnlyVisible)
-{
-    return 0;
-}
-
-
-//We must use interfaces instead of unsafe type casts and unnecessary includes
-
-struct ILightSource
-    : public IRenderNode
-{
-    // <interfuscator:shuffle>
-    virtual void SetLightProperties(const CDLight& light) = 0;
-    virtual CDLight& GetLightProperties() = 0;
-    virtual const Matrix34& GetMatrix() = 0;
-    virtual struct ShadowMapFrustum* GetShadowFrustum(int nId = 0) = 0;
-    virtual bool IsLightAreasVisible() = 0;
-    virtual void SetCastingException(IRenderNode* pNotCaster) = 0;
-    virtual void SetName(const char* name) = 0;
-    // </interfuscator:shuffle>
-};
-
-struct SCloudMovementProperties
-{
-    bool m_autoMove;
-    Vec3 m_speed;
-    Vec3 m_spaceLoopBox;
-    float m_fadeDistance;
-};
-
-// Summary:
-//   ICloudRenderNode is an interface to the Cloud Render Node object.
-struct ICloudRenderNode
-    : public IRenderNode
-{
-    // <interfuscator:shuffle>
-    // Description:
-    //    Loads a cloud from a cloud description XML file.
-    virtual bool LoadCloud(const char* sCloudFilename) = 0;
-    virtual bool LoadCloudFromXml(XmlNodeRef cloudNode) = 0;
-    virtual void SetMovementProperties(const SCloudMovementProperties& properties) = 0;
-    // </interfuscator:shuffle>
-};
-
-// Summary:
-//   IVoxelObject is an interface to the Voxel Object Render Node object.
-struct IVoxelObject
-    : public IRenderNode
-{
-    // <interfuscator:shuffle>
-    virtual void SetCompiledData(void* pData, int nSize, uint8 ucChildId, EEndian eEndian) = 0;
-    virtual void SetObjectName(const char* pName) = 0;
-    virtual void SetMatrix(const Matrix34& mat) = 0;
-    virtual bool ResetTransformation() = 0;
-    virtual void InterpolateVoxelData() = 0;
-    virtual void SetFlags(int nFlags) = 0;
-    virtual void Regenerate() = 0;
-    virtual void CopyHM() = 0;
-    virtual bool IsEmpty() = 0;
-    // </interfuscator:shuffle>
-};
-
-// Summary:
-//   IFogVolumeRenderNode is an interface to the Fog Volume Render Node object.
-struct SFogVolumeProperties
-{
-    // Common parameters.
-    // Center position & rotation values are taken from the entity matrix.
-
-    int           m_volumeType;
-    Vec3      m_size;
-    ColorF        m_color;
-    bool      m_useGlobalFogColor;
-    bool        m_ignoresVisAreas;
-    bool        m_affectsThisAreaOnly;
-    float     m_globalDensity;
-    float     m_densityOffset;
-    float     m_softEdges;
-    float     m_fHDRDynamic;            // 0 to get the same results in LDR, <0 to get darker, >0 to get brighter.
-    float     m_nearCutoff;
-
-    float m_heightFallOffDirLong;       // Height based fog specifics.
-    float m_heightFallOffDirLati;       // Height based fog specifics.
-    float m_heightFallOffShift;             // Height based fog specifics.
-    float m_heightFallOffScale;             // Height based fog specifics.
-
-    float m_rampStart;
-    float m_rampEnd;
-    float m_rampInfluence;
-    float m_windInfluence;
-    float m_densityNoiseScale;
-    float m_densityNoiseOffset;
-    float m_densityNoiseTimeFrequency;
-    Vec3 m_densityNoiseFrequency;
-};
-
-struct IFogVolumeRenderNode
-    : public IRenderNode
-{
-    // <interfuscator:shuffle>
-    virtual void SetFogVolumeProperties(const SFogVolumeProperties& properties) = 0;
-    virtual const Matrix34& GetMatrix() const = 0;
-
-    virtual void FadeGlobalDensity(float fadeTime, float newGlobalDensity) = 0;
-    // </interfuscator:shuffle>
-};
-
-// LY renderer system spec levels.
-enum class EngineSpec : AZ::u32
-{
-    Low = 1,
-    Medium,
-    High,
-    VeryHigh,
-    Never = UINT_MAX,
-};
-
-struct SDecalProperties
-{
-    SDecalProperties()
-    {
-        m_projectionType = ePlanar;
-        m_sortPrio = 0;
-        m_deferred = false;
-        m_pos = Vec3(0.0f, 0.0f, 0.0f);
-        m_normal = Vec3(0.0f, 0.0f, 1.0f);
-        m_explicitRightUpFront = Matrix33::CreateIdentity();
-        m_radius = 1.0f;
-        m_depth = 1.0f;
-        m_opacity = 1.0f;
-        m_angleAttenuation = 1.0f;
-        m_maxViewDist = 8000.0f;
-        m_minSpec = EngineSpec::Low;
-    }
-
-    enum EProjectionType : int
-    {
-        ePlanar,
-        eProjectOnTerrain,
-        eProjectOnTerrainAndStaticObjects
-    };
-
-    EProjectionType m_projectionType;
-    uint8 m_sortPrio;
-    uint8 m_deferred;
-    Vec3 m_pos;
-    Vec3 m_normal;
-    Matrix33 m_explicitRightUpFront;
-    float m_radius;
-    float m_depth;
-    const char* m_pMaterialName;
-    float m_opacity;
-    float m_angleAttenuation;
-    float m_maxViewDist;
-    EngineSpec m_minSpec;
-};
-
-// Description:
-//   IDecalRenderNode is an interface to the Decal Render Node object.
-struct IDecalRenderNode
-    : public IRenderNode
-{
-    // <interfuscator:shuffle>
-    virtual void SetDecalProperties(const SDecalProperties& properties) = 0;
-    virtual const SDecalProperties* GetDecalProperties() const = 0;
-    virtual const Matrix34& GetMatrix() = 0;
-    virtual void CleanUpOldDecals() = 0;
-    // </interfuscator:shuffle>
-};
-
-// Description:
-//   IWaterVolumeRenderNode is an interface to the Water Volume Render Node object.
-struct IWaterVolumeRenderNode
-    : public IRenderNode
-{
-    enum EWaterVolumeType
-    {
-        eWVT_Unknown,
-        eWVT_Ocean,
-        eWVT_Area,
-        eWVT_River
-    };
-
-    // <interfuscator:shuffle>
-    // Description:
-    // Sets if the render node is attached to a parent entity
-    // This must be called right after the object construction if it is the case
-    // Only supported for Areas (not rivers or ocean)
-    virtual void SetAreaAttachedToEntity() = 0;
-
-    virtual void SetFogDensity(float fogDensity) = 0;
-    virtual float GetFogDensity() const = 0;
-    virtual void SetFogColor(const Vec3& fogColor) = 0;
-    virtual void SetFogColorAffectedBySun(bool enable) = 0;
-    virtual void SetFogShadowing(float fogShadowing) = 0;
-
-    virtual void SetCapFogAtVolumeDepth(bool capFog) = 0;
-    virtual void SetVolumeDepth(float volumeDepth) = 0;
-    virtual void SetStreamSpeed(float streamSpeed) = 0;
-
-    virtual void SetCaustics(bool caustics) = 0;
-    virtual void SetCausticIntensity(float causticIntensity) = 0;
-    virtual void SetCausticTiling(float causticTiling) = 0;
-    virtual void SetCausticHeight(float causticHeight) = 0;
-    virtual void SetAuxPhysParams(pe_params_area*) = 0;
-
-    virtual void CreateOcean(uint64 volumeID, /* TBD */ bool keepSerializationParams = false) = 0;
-    virtual void CreateArea(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, const Vec2& surfUVScale, const Plane_tpl<f32>& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
-    virtual void CreateRiver(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, float uTexCoordBegin, float uTexCoordEnd, const Vec2& surfUVScale, const Plane_tpl<f32>& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
-    virtual void CreateRiver(uint64 volumeID, const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, float uTexCoordBegin, float uTexCoordEnd, const AZ::Vector2& surfUVScale, const AZ::Plane& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
-
-    virtual void SetAreaPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams = false) = 0;
-    virtual void SetRiverPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams = false) = 0;
-    virtual void SetRiverPhysicsArea(const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, bool keepSerializationParams = false) = 0;
-
-    // </interfuscator:shuffle>
-
-    // This flag is used to account for legacy entities which used to serialize the node without parent objects.
-    // Now there are runtime components which spawn the rendering node, however we need to support legacy code as well. 
-    // Remove this flag when legacy entities are removed entirely
-    bool m_hasToBeSerialised = true;
-};
-
-// Description:
-//   IDistanceCloudRenderNode is an interface to the Distance Cloud Render Node object.
-struct SDistanceCloudProperties
-{
-    Vec3 m_pos;
-    float m_sizeX;
-    float m_sizeY;
-    float m_rotationZ;
-    const char* m_pMaterialName;
-};
-
-struct IDistanceCloudRenderNode
-    : public IRenderNode
-{
-    virtual void SetProperties(const SDistanceCloudProperties& properties) = 0;
-};
-
-struct SVolumeObjectProperties
-{
-};
-
-struct SVolumeObjectMovementProperties
-{
-    bool m_autoMove;
-    Vec3 m_speed;
-    Vec3 m_spaceLoopBox;
-    float m_fadeDistance;
-};
-
-// Description:
-//   IVolumeObjectRenderNode is an interface to the Volume Object Render Node object.
-struct IVolumeObjectRenderNode
-    : public IRenderNode
-{
-    // <interfuscator:shuffle>
-    virtual void LoadVolumeData(const char* filePath) = 0;
-    virtual void SetProperties(const SVolumeObjectProperties& properties) = 0;
-    virtual void SetMovementProperties(const SVolumeObjectMovementProperties& properties) = 0;
-    // </interfuscator:shuffle>
-};
-
-#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
-struct IPrismRenderNode
-    : public IRenderNode
-{
-};
-#endif // EXCLUDE_DOCUMENTATION_PURPOSE
-
-#endif // CRYINCLUDE_CRYCOMMON_IENTITYRENDERSTATE_H
diff --git a/Code/CryEngine/CryCommon/IEntityRenderState_info.cpp b/Code/CryEngine/CryCommon/IEntityRenderState_info.cpp
deleted file mode 100644
index 89876fb91a..0000000000
--- a/Code/CryEngine/CryCommon/IEntityRenderState_info.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "TypeInfo_impl.h"
-#include <IEntityRenderState.h> // <> required for Interfuscator
-
-ENUM_INFO_BEGIN(EERType)
-ENUM_ELEM_INFO(, eERType_NotRenderNode)
-ENUM_ELEM_INFO(, eERType_Dummy_10)
-ENUM_ELEM_INFO(, eERType_Light)
-ENUM_ELEM_INFO(, eERType_Cloud)
-ENUM_ELEM_INFO(, eERType_TerrainSystem)
-ENUM_ELEM_INFO(, eERType_FogVolume)
-ENUM_ELEM_INFO(, eERType_Decal)
-ENUM_ELEM_INFO(, eERType_Dummy_6)
-ENUM_ELEM_INFO(, eERType_WaterVolume)
-ENUM_ELEM_INFO(, eERType_Dummy_7)
-ENUM_ELEM_INFO(, eERType_DistanceCloud)
-ENUM_ELEM_INFO(, eERType_VolumeObject)
-ENUM_ELEM_INFO(, eERType_Dummy_0)
-ENUM_ELEM_INFO(, eERType_Rope)
-ENUM_ELEM_INFO(, eERType_PrismObject)
-ENUM_ELEM_INFO(, eERType_Dummy_2)
-ENUM_ELEM_INFO(, eERType_Dummy_4)
-ENUM_ELEM_INFO(, eERType_RenderComponent)
-ENUM_ELEM_INFO(, eERType_StaticMeshRenderComponent)
-ENUM_ELEM_INFO(, eERType_DynamicMeshRenderComponent)
-ENUM_ELEM_INFO(, eERType_SkinnedMeshRenderComponent)
-ENUM_ELEM_INFO(, eERType_GameEffect)
-ENUM_ELEM_INFO(, eERType_BreakableGlass)
-ENUM_ELEM_INFO(, eERType_Dummy_3)
-ENUM_ELEM_INFO(, eERType_Dummy_9)
-ENUM_ELEM_INFO(, eERType_GeomCache)
-ENUM_ELEM_INFO(, eERType_TypesNum)
-ENUM_INFO_END(EERType)
diff --git a/Code/CryEngine/CryCommon/IFont.h b/Code/CryEngine/CryCommon/IFont.h
deleted file mode 100644
index e22c33eb09..0000000000
--- a/Code/CryEngine/CryCommon/IFont.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CryFont interface.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IFONT_H
-#define CRYINCLUDE_CRYCOMMON_IFONT_H
-#pragma once
-
-#include <Cry_Math.h>
-#include <Cry_Color.h>
-#include <CryString.h>
-#include <smartptr.h>
-
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/EBus/EBus.h>
-
-struct ISystem;
-class ICrySizer;
-
-struct ICryFont;
-struct IFFont;
-struct FontFamily;
-
-struct SVF_P2F_C4B_T2F_F4B;
-
-extern "C"
-#ifdef CRYFONT_EXPORTS
-DLL_EXPORT
-#else
-DLL_IMPORT
-#endif
-ICryFont * CreateCryFontInterface(ISystem * pSystem);
-
-typedef ICryFont*(* PFNCREATECRYFONTINTERFACE)(ISystem* pSystem);
-typedef AZStd::shared_ptr<FontFamily> FontFamilyPtr;
-
-namespace IFFontConstants
-{
-    //! The default scale applied to individual glyphs when rendering to the font texture.
-    //!
-    //! This is a "best guess" to try and fit all glyphs of a font within the
-    //! bounds of a font texture slot. This value can be defined on a per-font
-    //! basis via the "sizeratio" *.font XML attribute.
-    const float defaultSizeRatio = 0.8f;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-struct ICryFont
-{
-    static const int defaultGlyphSizeX = -1;    //!< Default glyph size indicates that glyphs in the font texture
-                                                //!< should be rendered at the maximum resolution supported by
-                                                //!< the font texture's glyph cell/slot configuration (configured
-                                                //!< via font XML).
-
-    static const int defaultGlyphSizeY = -1;    //!< Default glyph size indicates that glyphs in the font texture
-                                                //!< should be rendered at the maximum resolution supported by
-                                                //!< the font texture's glyph cell/slot configuration (configured
-                                                //!< via font XML).
-
-    // <interfuscator:shuffle>
-    virtual ~ICryFont(){}
-    //
-    virtual void Release() = 0;
-    // Summary:
-    //   Creates a named font (case insensitive)
-    virtual IFFont* NewFont(const char* pFontName) = 0;
-    // Summary:
-    //   Gets a named font (case insensitive)
-    virtual IFFont* GetFont(const char* pFontName) const = 0;
-
-    //! \brief Loads and initializes a Font Family from a *.fontfamily file
-    //! \param pFontFamilyName Name of font family to load (or name of a *.fontfamily file)
-    virtual FontFamilyPtr LoadFontFamily(const char* pFontFamilyName) = 0;
-
-    // Summary:
-    //   Gets font family (case insensitive)
-    virtual FontFamilyPtr GetFontFamily(const char* pFontFamilyName) = 0;
-
-    //! \brief Adds the characters in the given string to all of the font textures within the font family.
-    //! All font styles within the given font family (bold, italic, etc.) will have the given 
-    //! characters added to their font textures.
-    //!
-    //! \param pFontFamily  The font family to add the characters to.
-    //! \param pChars       String of characters to add to font textures (UTF-8 supported).
-    //! \param glyphSizeX   Width (in pixels) of the characters to be rendered at in the font texture.
-    //! \param glyphSizeY   Height (in pixels) of the characters to be rendered at in the font texture.
-    virtual void AddCharsToFontTextures(FontFamilyPtr pFontFamily, const char* pChars, int glyphSizeX = defaultGlyphSizeX, int glyphSizeY = defaultGlyphSizeY) = 0;
-
-    // Summary:
-    //   Puts the objects used in this module into the sizer interface
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-    // Summary:
-    //   All font names separated by ,
-    // Example:
-    //   "console,default,hud"
-    virtual string GetLoadedFontNames() const = 0;
-
-    //! \brief Called when the g_language (current language) setting changes.
-    //!
-    //! Mainly used to reload font family resources for the new language.
-    virtual void OnLanguageChanged() = 0;
-    
-    //! \brief Reload all fonts
-    virtual void ReloadAllFonts() = 0;
-
-    // </interfuscator:shuffle>
-};
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-#define TTFFLAG_SMOOTH_NONE                 0x00000000      // No smooth.
-#define TTFFLAG_SMOOTH_BLUR                 0x00000001      // Smooth by blurring it.
-#define TTFFLAG_SMOOTH_SUPERSAMPLE  0x00000002      // Smooth by rendering the characters into a bigger texture, and then resize it to the normal size using bilinear filtering.
-
-#define TTFFLAG_SMOOTH_MASK                 0x0000000f      // Mask for retrieving.
-#define TTFFLAG_SMOOTH_SHIFT                0                           // Shift amount for retrieving.
-
-#define TTFLAG_SMOOTH_AMOUNT_2X         0x00010000      // Blur / supersample [2x]
-#define TTFLAG_SMOOTH_AMOUNT_4X         0x00020000      // Blur / supersample [4x]
-
-#define TTFFLAG_SMOOTH_AMOUNT_MASK  0x000f0000      // Mask for retrieving.
-#define TTFFLAG_SMOOTH_AMOUNT_SHIFT 16                      // Shift amount for retrieving.
-
-
-#define TTFFLAG_CREATE(smooth, amount)      ((((smooth) << TTFFLAG_SMOOTH_SHIFT) & TTFFLAG_SMOOTH_MASK) | (((amount) << TTFFLAG_SMOOTH_AMOUNT_SHIFT) & TTFFLAG_SMOOTH_AMOUNT_MASK))
-#define TTFFLAG_GET_SMOOTH(flag)                    (((flag) & TTFLAG_SMOOTH_MASK) >> TTFFLAG_SMOOTH_SHIFT)
-#define TTFFLAG_GET_SMOOTH_AMOUNT(flag)     (((flag) & TTFLAG_SMOOTH_SMOUNT_MASK) >> TTFFLAG_SMOOTH_AMOUNT_SHIFT)
-
-//////////////////////////////////////////////////////////////////////////
-struct STextDrawContext
-{
-    unsigned int m_fxIdx;
-
-    Vec2 m_size;
-    Vec2i m_requestSize;
-    float m_widthScale;
-    float m_lineSpacing;
-
-    float m_clipX;
-    float m_clipY;
-    float m_clipWidth;
-    float m_clipHeight;
-
-    int m_drawTextFlags;
-
-    bool m_proportional;
-    bool m_sizeIn800x600;
-    bool m_clippingEnabled;
-    bool m_framed;
-
-    ColorB m_colorOverride;
-
-    Matrix34 m_transform;
-
-    int m_baseState;
-    bool m_overrideViewProjMatrices;
-    bool m_kerningEnabled;
-    bool m_processSpecialChars;
-    bool m_pixelAligned;                    //!< toggles whether rendering is pixel aligned
-
-    float m_tracking;                       //!< extra space between characters in pixels (prior to any transform)
-
-    STextDrawContext()
-        : m_fxIdx(0)
-        , m_size(16.0f, 16.0f)
-        , m_requestSize(static_cast<int32>(m_size.x), static_cast<int32>(m_size.y))
-        , m_widthScale(1.0f)
-        , m_lineSpacing(0.f)
-        , m_clipX(0)
-        , m_clipY(0)
-        , m_clipWidth(0)
-        , m_clipHeight(0)
-        , m_proportional(true)
-        , m_sizeIn800x600(true)
-        , m_clippingEnabled(false)
-        , m_framed(false)
-        , m_colorOverride(0, 0, 0, 0)
-        , m_drawTextFlags(0)
-        , m_transform(IDENTITY)
-        , m_baseState(-1) // indicates not set, would like to set to GS_DEPTHFUNC_LEQUAL but header dependencies preclude that
-        , m_overrideViewProjMatrices(true) // the old behavior that overrides the currently set view and projection matrices
-        , m_kerningEnabled(true)
-        , m_processSpecialChars(true)
-        , m_pixelAligned(true)
-        , m_tracking(0.0f)
-    {
-    }
-
-    void Reset() { *this = STextDrawContext(); }
-    void SetEffect(unsigned int fxIdx) { m_fxIdx = fxIdx; }
-    void SetSize(const Vec2& size) { m_size = size; }
-    void SetCharWidthScale(float widthScale) { m_widthScale = widthScale; }
-    void SetClippingRect(float x, float y, float width, float height) { m_clipX = x; m_clipY = y; m_clipWidth = width; m_clipHeight = height; }
-    void SetProportional(bool proportional) { m_proportional = proportional; }
-    void SetSizeIn800x600(bool sizeIn800x600) { m_sizeIn800x600 = sizeIn800x600; }
-    void EnableClipping(bool enable) { m_clippingEnabled = enable; }
-    void EnableFrame(bool enable) { m_framed = enable; }
-    void SetColor(const ColorF& col) { m_colorOverride = col; }
-    void SetFlags(int flags) { m_drawTextFlags = flags; }
-    void SetTransform(const Matrix34& transform) { m_transform = transform; }
-    void SetBaseState(int baseState) { m_baseState = baseState; }
-    void SetOverrideViewProjMatrices(bool overrideViewProjMatrices) { m_overrideViewProjMatrices = overrideViewProjMatrices; }
-    void SetLineSpacing(float lineSpacing) { m_lineSpacing = lineSpacing; }
-
-    float GetCharWidth() const { return m_size.x; }
-    float GetCharHeight() const { return m_size.y; }
-    float GetCharWidthScale() const { return m_widthScale; }
-    int GetFlags() const { return m_drawTextFlags; }
-    float GetLineSpacing() const { return m_lineSpacing; }
-
-    bool IsColorOverridden() const { return m_colorOverride.a != 0; }
-};
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-struct IFFont
-{
-    // <interfuscator:shuffle>
-    virtual ~IFFont() {}
-
-    // We don't derive from CBaseResource currently, that could be an enhancement
-    virtual int32 AddRef() = 0;
-    virtual int32 Release() = 0;
-
-    //! \brief Loads a font from a TTF file.
-    //! \param pFontFilePath Path to font file
-    //! \param width Desired width of font texture.
-    //! \param height Desired width of font texture.
-    //! \param widthNumSlots Number of character slots across the width (X-axis) of the font texture
-    //! \param heightNumSlots Number of character slots across the height (Y-axis) of the font texture
-    //! \param flags Flags governing font, such as smoothness (see TTFFLAG_CREATE).
-    //! \param sizeRatio Scale to apply to the font size when storing glyphs in font texture slots.
-    virtual bool Load(const char* pFontFilePath, unsigned int width, unsigned int height, unsigned int widthNumSlots, unsigned int heightNumSlots, unsigned int flags, float sizeRatio) = 0;
-
-    //! \brief Loads a font from a XML file.
-    //! \param pXMLFile Path to font XML file
-    virtual bool Load(const char* pXMLFile) = 0;
-
-    // Summary:
-    //   Frees internally memory internally allocated by Load().
-    virtual void Free() = 0;
-
-    // Summary:
-    //   Draws a formatted string (UTF-8).
-    virtual void DrawString(float x, float y, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
-
-    // Summary:
-    //   Draws a formatted string (UTF-8), taking z into account.
-    virtual void DrawString(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
-
-    // Summary:
-    //   Computes the text size (UTF-8).
-    virtual Vec2 GetTextSize(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
-
-    // Description:
-    //   Computes virtual text-length (UTF-8) (because of special chars...).
-    virtual size_t GetTextLength(const char* pStr, const bool asciiMultiLine) const = 0;
-
-    // Description:
-    //   Wraps text based on specified maximum line width (UTF-8)
-    virtual void WrapText(string& result, float maxWidth, const char* pStr, const STextDrawContext& ctx) = 0;
-
-    // Description:
-    //   Puts the memory used by this font into the given sizer.
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-
-    // Description:
-    //   useful for special feature rendering interleaved with fonts (e.g. box behind the text)
-    virtual void GetGradientTextureCoord(float& minU, float& minV, float& maxU, float& maxV) const = 0;
-
-    virtual unsigned int GetEffectId(const char* pEffectName) const = 0;
-    virtual unsigned int GetNumEffects() const = 0;
-    virtual const char* GetEffectName(unsigned int effectId) const = 0;
-    virtual Vec2 GetMaxEffectOffset(unsigned int effectId) const = 0;
-    virtual bool DoesEffectHaveTransparency(unsigned int effectId) const = 0;
-
-    //! \brief Adds the given UTF-8 string of chars to this font's font texture.
-    //! \param pChars String of UTF-8 chars to add to font texture
-    //! \param glyphSizeX   Width (in pixels) of the characters to be rendered at in the font texture.
-    //! \param glyphSizeY   Height (in pixels) of the characters to be rendered at in the font texture.
-    virtual void AddCharsToFontTexture(const char* pChars, int glyphSizeX = ICryFont::defaultGlyphSizeX, int glyphSizeY = ICryFont::defaultGlyphSizeY) = 0;
-
-    //! \brief Returns XY kerning offsets (positive or negative) for two given glyphs.
-    //!
-    //! Kerning values are only returned for fonts that have a 'kern' table defined.
-    //! Even fonts that do have a 'kern' defined do not define kerning values for all
-    //! possible combination of characters. Zero values will be returned for those
-    //! cases.
-    virtual Vec2 GetKerning(uint32_t leftGlyph, uint32_t rightGlyph, const STextDrawContext& ctx) const = 0;
-
-    //! \brief Returns the ascender of the font
-    virtual float GetAscender(const STextDrawContext& ctx) const = 0;
-
-    //! \brief Returns the y offset from the top to the baseline
-    virtual float GetBaseline(const STextDrawContext& ctx) const = 0;
-
-    //! \brief Returns the scaling applied to glyphs before being rendered to the font texture from FreeType.
-    virtual float GetSizeRatio() const = 0;
-
-    //! \brief Get the number of quads required to render the text string
-    //! This is an upper limit. Due to clipping the rendering of the text string might actually use less quads.
-    virtual uint32 GetNumQuadsForText(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
-
-    //! \brief Write the quads for the text into the given vertex and index buffers
-    //! The actual number of quads written to the buffer is returned
-    virtual uint32 WriteTextQuadsToBuffers(SVF_P2F_C4B_T2F_F4B* verts, uint16* indices, uint32 maxQuads,
-        float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
-
-    //! \brief get the font texture for this font, will return -1 if there is no valid font texture
-    virtual int GetFontTextureId() = 0;
-
-    //! \brief get the font texture version for this font. Incremented each time the texture is changed
-    virtual uint32 GetFontTextureVersion() = 0;
-
-    // </interfuscator:shuffle>
-};
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-//! Correlates several font files to define a family of fonts, specifically for styling.
-struct FontFamily
-{
-    FontFamily()
-        : normal(nullptr)
-        , bold(nullptr)
-        , italic(nullptr)
-        , boldItalic(nullptr)
-    {
-    }
-
-    FontFamily(const FontFamily&) = delete;
-    FontFamily(const FontFamily&&) = delete;
-    FontFamily& operator=(const FontFamily&) = delete;
-    FontFamily& operator=(const FontFamily&&) = delete;
-
-    string familyName;
-    IFFont* normal;
-    IFFont* bold;
-    IFFont* italic;
-    IFFont* boldItalic;
-
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct IFFont_RenderProxy
-{
-    // <interfuscator:shuffle>
-    virtual ~IFFont_RenderProxy() {}
-    virtual void RenderCallback(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
-    // </interfuscator:shuffle>
-};
-
-//////////////////////////////////////////////////////////////////////////
-//! Simple bus that notifies listeners of font changes
-class FontNotifications
-    : public AZ::EBusTraits
-{
-public:
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-
-    virtual ~FontNotifications() = default;
-
-    virtual void OnFontsReloaded() = 0;
-
-    virtual void OnFontTextureUpdated(IFFont* /*font*/) {}
-};
-
-using FontNotificationBus = AZ::EBus<FontNotifications>;
-
-#endif // CRYINCLUDE_CRYCOMMON_IFONT_H
diff --git a/Code/CryEngine/CryCommon/IFunctorBase.h b/Code/CryEngine/CryCommon/IFunctorBase.h
deleted file mode 100644
index 89fe3f9d55..0000000000
--- a/Code/CryEngine/CryCommon/IFunctorBase.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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
-
-
-// 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()
-    {
-        CryInterlockedIncrement(&m_nReferences);
-    }
-
-    void Release()
-    {
-        if (CryInterlockedDecrement(&m_nReferences) <= 0)
-        {
-            delete this;
-        }
-    }
-
-protected:
-    volatile 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/CryEngine/CryCommon/IGem.h b/Code/CryEngine/CryCommon/IGem.h
deleted file mode 100644
index 9e3a3192b0..0000000000
--- a/Code/CryEngine/CryCommon/IGem.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "platform.h"
-#include "ISystem.h"
-#include "CrySystemBus.h"
-
-#include <AzCore/Module/Module.h>
-
-
-/**
- * CryHooksModule is an AZ::Module with common hooks into CryEngine systems.
- * - Sets gEnv once CrySystem has initialized.
- * - Registers as a CrySystem event handler.
- */
-class CryHooksModule
-    : public AZ::Module
-    , protected CrySystemEventBus::Handler
-    , protected  ISystemEventListener
-{
-public:
-    AZ_RTTI(CryHooksModule, "{BD896D16-6F7D-4EA6-A532-0A9E6BF3C089}", AZ::Module);
-    CryHooksModule()
-        : Module()
-    {
-        CrySystemEventBus::Handler::BusConnect();
-    }
-
-    ~CryHooksModule() override
-    {
-        CrySystemEventBus::Handler::BusDisconnect();
-
-        if (gEnv && gEnv->pSystem && gEnv->pSystem->GetISystemEventDispatcher())
-        {
-            gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
-        }
-    }
-
-protected:
-
-    void OnCrySystemPreInitialize(ISystem& system, const SSystemInitParams& systemInitParams) override
-    {
-        (void)systemInitParams;
-
-#if !defined(AZ_MONOLITHIC_BUILD)
-        // When module is linked dynamically, we must set our gEnv pointer.
-        // When module is linked statically, we'll share the application's gEnv pointer.
-        gEnv = system.GetGlobalEnvironment();
-#else
-        (void)system;
-#endif
-    }
-
-    void OnCrySystemInitialized(ISystem& system, const SSystemInitParams& systemInitParams) override
-    {
-        (void)systemInitParams;
-
-        system.GetISystemEventDispatcher()->RegisterListener(this);
-    }
-
-    void OnCrySystemPostShutdown() override
-    {
-#if !defined(AZ_MONOLITHIC_BUILD)
-        gEnv = nullptr;
-#endif
-    }
-
-    void OnSystemEvent(ESystemEvent /*event*/, UINT_PTR /*wparam*/, UINT_PTR /*lparam*/) override {}
-};
diff --git a/Code/CryEngine/CryCommon/IIndexedMesh.h b/Code/CryEngine/CryCommon/IIndexedMesh.h
deleted file mode 100644
index 744bfebc1d..0000000000
--- a/Code/CryEngine/CryCommon/IIndexedMesh.h
+++ /dev/null
@@ -1,2300 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IINDEXEDMESH_H
-#define CRYINCLUDE_CRYCOMMON_IINDEXEDMESH_H
-#pragma once
-
-#include "CryHeaders.h"
-#include "Cry_Color.h"
-#include "StlUtils.h"
-#include "CryEndian.h"
-#include <CrySizer.h>
-#include <Cry_Geo.h>    // for AABB
-#include <VertexFormats.h>
-#include <Vertex.h>
-#include <AzCore/Casting/numeric_cast.h>
-
-// Description:
-//    2D Texture coordinates used by CMesh.
-struct SMeshTexCoord
-{
-    SMeshTexCoord() {}
-
-private:
-    float s, t;
-
-public:
-    explicit SMeshTexCoord(float x, float y)
-    {
-        s = x;
-        t = y;
-    }
-
-    explicit SMeshTexCoord(const Vec2f16& other)
-    {
-        const Vec2 uv = other.ToVec2();
-
-        s = uv.x;
-        t = uv.y;
-    }
-
-    explicit SMeshTexCoord(const Vec2& other)
-    {
-        s = other.x;
-        t = other.y;
-    }
-
-    explicit SMeshTexCoord(const Vec4& other)
-    {
-        s = other.x;
-        t = other.y;
-    }
-
-    void ExportTo(Vec2f16& other) const
-    {
-        other = Vec2f16(s, t);
-    }
-
-    void ExportTo(float& others, float& othert) const
-    {
-        others = s;
-        othert = t;
-    }
-
-    bool operator ==(const SMeshTexCoord& other) const
-    {
-        return (s == other.s) && (t == other.t);
-    }
-
-    bool operator !=(const SMeshTexCoord& other) const
-    {
-        return !(*this == other);
-    }
-
-    bool operator <(const SMeshTexCoord& other) const
-    {
-        return (s != other.s) ? (s < other.s) : (t < other.t);
-    }
-
-    bool IsEquivalent(const Vec2& other, float epsilon = 0.003f) const
-    {
-        return
-            (fabs_tpl(s - other.x) <= epsilon) &&
-            (fabs_tpl(t - other.y) <= epsilon);
-    }
-
-    bool IsEquivalent(const SMeshTexCoord& other, float epsilon = 0.00005f) const
-    {
-        return
-            (fabs_tpl(s - other.s) <= epsilon) &&
-            (fabs_tpl(t - other.t) <= epsilon);
-    }
-
-    ILINE Vec2 GetUV() const
-    {
-        return Vec2(s, t);
-    }
-
-    void GetUV(Vec2& otheruv) const
-    {
-        otheruv = GetUV();
-    }
-
-    void GetUV(Vec4& otheruv) const
-    {
-        otheruv = Vec4(s, t, 0.0f, 1.0f);
-    }
-
-    void Lerp(const SMeshTexCoord& other, float pos)
-    {
-        Vec2 texA;
-        Vec2 texB;
-        this->GetUV();
-        other.GetUV();
-
-        texA.SetLerp(texA, texB, pos);
-
-        *this = SMeshTexCoord(texA);
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-// Description:
-//    RGBA Color description structure used by CMesh.
-struct SMeshColor
-{
-    SMeshColor() {}
-
-private:
-    uint8 r, g, b, a;
-
-public:
-    explicit SMeshColor(uint8 otherr, uint8 otherg, uint8 otherb, uint8 othera)
-    {
-        r = otherr;
-        g = otherg;
-        b = otherb;
-        a = othera;
-    }
-
-    explicit SMeshColor(const Vec4& otherc)
-    {
-        r = aznumeric_caster(FtoI(otherc.x));
-        g = aznumeric_caster(FtoI(otherc.y));
-        b = aznumeric_caster(FtoI(otherc.z));
-        a = aznumeric_caster(FtoI(otherc.w));
-    }
-
-    void TransferRGBTo(SMeshColor& other) const
-    {
-        other.r = r;
-        other.g = g;
-        other.b = b;
-    }
-
-    void TransferATo(SMeshColor& other) const
-    {
-        other.a = a;
-    }
-
-    void MaskA(uint8 maska)
-    {
-        a &= maska;
-    }
-
-    bool operator ==(const SMeshColor& other) const
-    {
-        return (r == other.r) && (g == other.g) && (b == other.b) && (a == other.a);
-    }
-
-    bool operator !=(const SMeshColor& other) const
-    {
-        return !(*this == other);
-    }
-
-    bool operator <(const SMeshColor& other) const
-    {
-        return (r != other.r) ? (r < other.r) : (g != other.g) ? (g < other.g) : (b != other.b) ? (b < other.b) : (a < other.a);
-    }
-
-    ILINE ColorB GetRGBA() const
-    {
-        return ColorB(r, g, b, a);
-    }
-
-    void GetRGBA(ColorB& otherc) const
-    {
-        otherc = GetRGBA();
-    }
-
-    void GetRGBA(Vec4& otherc) const
-    {
-        otherc = Vec4(r, g, b, a);
-    }
-
-    void Lerp(const SMeshColor& other, float pos)
-    {
-        Vec4 clrA;
-        Vec4 clrB;
-        this->GetRGBA(clrA);
-        other.GetRGBA(clrB);
-
-        clrA.SetLerp(clrA, clrB, pos);
-
-        *this = SMeshColor(clrA);
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-
-// 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.
-
-    AUTO_STRUCT_INFO
-};
-
-// Description:
-//    3D Normal Vector used by CMesh.
-struct SMeshNormal
-{
-    SMeshNormal() {}
-
-private:
-    Vec3 Normal;
-
-public:
-    explicit SMeshNormal(const Vec3& othern)
-    {
-        Normal = othern;
-    }
-
-    bool operator ==(const SMeshNormal& othern) const
-    {
-        return (Normal.x == othern.Normal.x) && (Normal.y == othern.Normal.y) && (Normal.z == othern.Normal.z);
-    }
-
-    bool operator !=(const SMeshNormal& othern) const
-    {
-        return !(*this == othern);
-    }
-
-    bool operator <(const SMeshNormal& othern) const
-    {
-        return (Normal.x != othern.Normal.x) ? (Normal.x < othern.Normal.x) : (Normal.y != othern.Normal.y) ? (Normal.y < othern.Normal.y) : (Normal.z < othern.Normal.z);
-    }
-
-    bool IsEquivalent(const Vec3& othern, float epsilon = 0.00005f) const
-    {
-        return
-            Normal.IsEquivalent(othern, epsilon);
-    }
-
-    bool IsEquivalent(const SMeshNormal& othern, float epsilon = 0.00005f) const
-    {
-        return
-            IsEquivalent(othern.Normal, epsilon);
-    }
-
-    ILINE Vec3 GetN() const
-    {
-        return Normal;
-    }
-
-    void GetN(Vec3& othern) const
-    {
-        othern = GetN();
-    }
-
-    void RotateBy(const Matrix33& rot)
-    {
-        Normal = rot * Normal;
-    }
-
-    void RotateSafelyBy(const Matrix33& rot)
-    {
-        Normal = rot * Normal;
-        // normalize in case "rot" wasn't length-preserving
-        Normal.Normalize();
-    }
-
-    void RotateBy(const Matrix34& trn)
-    {
-        Normal = trn.TransformVector(Normal);
-    }
-
-    void RotateSafelyBy(const Matrix34& trn)
-    {
-        Normal = trn.TransformVector(Normal);
-        // normalize in case "trn" wasn't length-preserving
-        Normal.Normalize();
-    }
-
-    void Slerp(const SMeshNormal& other, float pos)
-    {
-        Vec3 nrmA = this->GetN();
-        Vec3 nrmB = other.GetN();
-
-        nrmA.Normalize();
-        nrmB.Normalize();
-
-        nrmA.SetSlerp(nrmA, nrmB, pos);
-
-        *this = SMeshNormal(nrmA);
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-
-// Description:
-//    Mesh tangents (tangent space normals).
-struct SMeshTangents
-{
-    SMeshTangents() {}
-
-private:
-    Vec4sf Tangent;
-    Vec4sf Bitangent;
-
-public:
-    explicit SMeshTangents(const Vec4sf& othert, const Vec4sf& otherb)
-    {
-        Tangent   = othert;
-        Bitangent = otherb;
-    }
-
-    explicit SMeshTangents(const SPipTangents& other)
-    {
-        Tangent   = other.Tangent;
-        Bitangent = other.Bitangent;
-    }
-
-    explicit SMeshTangents(const Vec4& othert, const Vec4& otherb)
-    {
-        Tangent   = PackingSNorm::tPackF2Bv(othert);
-        Bitangent = PackingSNorm::tPackF2Bv(otherb);
-    }
-
-    explicit SMeshTangents(const Vec3& othert, const Vec3& otherb, const Vec3& othern)
-    {
-        // TODO: can be optimized to use only integer arithmetic
-        int16 othersign = 1;
-        if (othert.Cross(otherb).Dot(othern) < 0)
-        {
-            othersign = -1;
-        }
-
-        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), PackingSNorm::tPackS2B(othersign));
-        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), PackingSNorm::tPackS2B(othersign));
-    }
-
-    explicit SMeshTangents(const Vec3& othert, const Vec3& otherb, const int16& othersign)
-    {
-        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), PackingSNorm::tPackS2B(othersign));
-        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), PackingSNorm::tPackS2B(othersign));
-    }
-
-    void ExportTo(Vec4sf& othert, Vec4sf& otherb) const
-    {
-        othert = Tangent;
-        otherb = Bitangent;
-    }
-
-    void ExportTo(SPipTangents& other) const
-    {
-        other.Tangent   = Tangent;
-        other.Bitangent = Bitangent;
-    }
-
-    bool operator ==(const SMeshTangents& other) const
-    {
-        return
-            Tangent[0] == other.Tangent[0] ||
-            Tangent[1] == other.Tangent[1] ||
-            Tangent[2] == other.Tangent[2] ||
-            Tangent[3] == other.Tangent[3] ||
-            Bitangent[0] == other.Bitangent[0] ||
-            Bitangent[1] == other.Bitangent[1] ||
-            Bitangent[2] == other.Bitangent[2] ||
-            Bitangent[3] == other.Bitangent[3];
-    }
-
-    bool operator !=(const SMeshTangents& other) const
-    {
-        return !(*this == other);
-    }
-
-    bool IsEquivalent(const Vec3& othert, const Vec3& otherb, const int16& othersign, float epsilon = 0.01f) const
-    {
-        // TODO: can be optimized to use only integer arithmetic
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z);
-        Vec3 btg3(btg.x, btg.y, btg.z);
-
-        return
-            (tng.w == othersign) &&
-            (btg.w == othersign) &&
-            (tng3.Dot(othert) >= (1.0f - epsilon)) &&
-            (btg3.Dot(otherb) >= (1.0f - epsilon));
-    }
-
-    void GetTB(Vec4sf& othert, Vec4sf& otherb) const
-    {
-        othert = Tangent;
-        otherb = Bitangent;
-    }
-
-    void GetTB(Vec4& othert, Vec4& otherb) const
-    {
-        othert = PackingSNorm::tPackB2F(Tangent);
-        otherb = PackingSNorm::tPackB2F(Bitangent);
-    }
-
-    void GetTB(Vec3& othert, Vec3& otherb) const
-    {
-        const Vec4 t = PackingSNorm::tPackB2F(Tangent);
-        const Vec4 b = PackingSNorm::tPackB2F(Bitangent);
-
-        othert = Vec3(t.x, t.y, t.z);
-        otherb = Vec3(b.x, b.y, b.z);
-    }
-
-    ILINE Vec3 GetN() const
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z);
-        Vec3 btg3(btg.x, btg.y, btg.z);
-
-        // assumes w 1 or -1
-        return tng3.Cross(btg3) * tng.w;
-    }
-
-    void GetN(Vec3& othern) const
-    {
-        othern = GetN();
-    }
-
-    void GetTBN(Vec3& othert, Vec3& otherb, Vec3& othern) const
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z);
-        Vec3 btg3(btg.x, btg.y, btg.z);
-
-        // assumes w 1 or -1
-        othert = tng3;
-        otherb = btg3;
-        othern = tng3.Cross(btg3) * tng.w;
-    }
-
-    ILINE int16 GetR() const
-    {
-        return PackingSNorm::tPackB2S(Tangent.w);
-    }
-
-    void GetR(int16& sign) const
-    {
-        sign = GetR();
-    }
-
-    void RotateBy(const Matrix33& rot)
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z);
-        Vec3 btg3(btg.x, btg.y, btg.z);
-
-        tng3 = rot * tng3;
-        btg3 = rot * btg3;
-
-        *this = SMeshTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
-    }
-
-    void RotateSafelyBy(const Matrix33& rot)
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z);
-        Vec3 btg3(btg.x, btg.y, btg.z);
-
-        tng3 = rot * tng3;
-        btg3 = rot * btg3;
-
-        // normalize in case "rot" wasn't length-preserving
-        tng3.Normalize();
-        btg3.Normalize();
-
-        *this = SMeshTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
-    }
-
-    void RotateBy(const Matrix34& trn)
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z);
-        Vec3 btg3(btg.x, btg.y, btg.z);
-
-        tng3 = trn.TransformVector(tng3);
-        btg3 = trn.TransformVector(btg3);
-
-        *this = SMeshTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
-    }
-
-    void RotateSafelyBy(const Matrix34& trn)
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z);
-        Vec3 btg3(btg.x, btg.y, btg.z);
-
-        tng3 = trn.TransformVector(tng3);
-        btg3 = trn.TransformVector(btg3);
-
-        // normalize in case "rot" wasn't length-preserving
-        tng3.Normalize();
-        btg3.Normalize();
-
-        *this = SMeshTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
-    }
-
-    void SlerpTowards(const SMeshTangents& other, const SMeshNormal& normal, float pos)
-    {
-        Vec3 tngA, btgA;
-        Vec3 tngB, btgB;
-        this->GetTB(tngA, btgA);
-        other.GetTB(tngB, btgB);
-
-        // Q: necessary?
-        tngA.Normalize();
-        tngB.Normalize();
-        btgA.Normalize();
-        btgB.Normalize();
-
-        tngA.SetSlerp(tngA, tngB, pos);
-        btgA.SetSlerp(btgA, btgB, pos);
-
-        *this = SMeshTangents(tngA, btgA, normal.GetN());
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-struct SMeshQTangents
-{
-    SMeshQTangents() {}
-
-private:
-    Vec4sf TangentBitangent;
-
-public:
-    explicit SMeshQTangents(const SPipQTangents& other)
-    {
-        TangentBitangent = other.QTangent;
-    }
-
-    explicit SMeshQTangents(const Quat& other)
-    {
-        TangentBitangent.x = PackingSNorm::tPackF2B(other.v.x);
-        TangentBitangent.y = PackingSNorm::tPackF2B(other.v.y);
-        TangentBitangent.z = PackingSNorm::tPackF2B(other.v.z);
-        TangentBitangent.w = PackingSNorm::tPackF2B(other.w);
-    }
-
-    void ExportTo(SPipQTangents& other)
-    {
-        other.QTangent = TangentBitangent;
-    }
-
-    ILINE Quat GetQ() const
-    {
-        Quat q;
-
-        q.v.x = PackingSNorm::tPackB2F(TangentBitangent.x);
-        q.v.y = PackingSNorm::tPackB2F(TangentBitangent.y);
-        q.v.z = PackingSNorm::tPackB2F(TangentBitangent.z);
-        q.w   = PackingSNorm::tPackB2F(TangentBitangent.w);
-
-        return q;
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-// Description:
-//    for skinning every vertex has 4 bones and 4 weights.
-struct SMeshBoneMapping_uint16
-{
-    typedef uint16 BoneId;
-    typedef uint8 Weight;
-
-    BoneId boneIds[4];
-    Weight weights[4];
-
-    AUTO_STRUCT_INFO
-};
-
-struct SMeshBoneMapping_uint8
-{
-    typedef uint8 BoneId;
-    typedef uint8 Weight;
-
-    BoneId boneIds[4];
-    Weight weights[4];
-
-    AUTO_STRUCT_INFO
-};
-
-//START: Add LOD support for touch bending vegetation
-struct SMeshBoneMappingInfo_uint8
-{
-    SMeshBoneMappingInfo_uint8(int vertexCount)
-    {
-        //Will be deleted by ~SFoliageInfoCGF()
-        pBoneMapping = new SMeshBoneMapping_uint8[vertexCount];
-        nVertexCount = vertexCount;
-    }
-
-    int nVertexCount;
-    struct SMeshBoneMapping_uint8* pBoneMapping;
-
-    AUTO_STRUCT_INFO
-};
-//END: Add LOD support for touch bending vegetation
-
-// 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(PHYS_GEOM_TYPE_DEFAULT)
-        , vertexFormat(eVF_P3S_C4B_T2S)
-    {
-    }
-
-    void GetMemoryUsage([[maybe_unused]] class ICrySizer* pSizer) const
-    {
-    }
-
-    // fix numVerts
-    void FixRanges(vtx_idx* pIndices)
-    {
-        int startVertexToMerge = nFirstVertId;
-        int startIndexToMerge = nFirstIndexId;
-        int numIndiciesToMerge = nNumIndices;
-        // find good min and max AGAIN
-        int maxVertexInUse = 0;
-        for (int n = 0; n < numIndiciesToMerge; n++)
-        {
-            int i = (int)pIndices[n + startIndexToMerge];
-            startVertexToMerge = (i < startVertexToMerge ? i : startVertexToMerge);// min
-            maxVertexInUse = (i > maxVertexInUse ? i : maxVertexInUse);// max
-        }
-        nNumVerts = maxVertexInUse - startVertexToMerge + 1;
-    }
-};
-
-class CMeshHelpers
-{
-public:
-    template <class TPosition, class TTexCoordinates, class TIndex>
-    static bool ComputeTexMappingAreas(
-        size_t indexCount, const TIndex* pIndices,
-        size_t vertexCount,
-        const TPosition* pPositions, size_t stridePositions,
-        const TTexCoordinates* pTexCoords, size_t strideTexCoords,
-        float& computedPosArea, float& computedTexArea, const char*& errorText)
-    {
-        static const float minPosArea = 10e-6f;
-        static const float minTexArea = 10e-8f;
-
-        computedPosArea = 0;
-        computedTexArea = 0;
-        errorText = "?";
-
-        if (indexCount <= 0)
-        {
-            errorText = "index count is 0";
-            return false;
-        }
-
-        if (vertexCount <= 0)
-        {
-            errorText = "vertex count is 0";
-            return false;
-        }
-
-        if ((pIndices == NULL) || (pPositions == NULL))
-        {
-            errorText = "indices and/or positions are NULL";
-            return false;
-        }
-
-        if (pTexCoords == NULL)
-        {
-            errorText = "texture coordinates are NULL";
-            return false;
-        }
-
-        if (indexCount % 3 != 0)
-        {
-            assert(0);
-            errorText = "bad number of indices";
-            return false;
-        }
-
-        // Compute average geometry area of face
-
-        int count = 0;
-        float posAreaSum = 0;
-        float texAreaSum = 0;
-        for (size_t i = 0; i < indexCount; i += 3)
-        {
-            const size_t index0 = pIndices[i];
-            const size_t index1 = pIndices[i + 1];
-            const size_t index2 = pIndices[i + 2];
-
-            if ((index0 >= vertexCount) || (index1 >= vertexCount) || (index2 >= vertexCount))
-            {
-                errorText = "bad vertex index detected";
-                return false;
-            }
-
-            const Vec3 pos0 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index0 * stridePositions));
-            const Vec3 pos1 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index1 * stridePositions));
-            const Vec3 pos2 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index2 * stridePositions));
-
-            const Vec2 tex0 = ToVec2(*(const TTexCoordinates*) (((const char*)pTexCoords) + index0 * strideTexCoords));
-            const Vec2 tex1 = ToVec2(*(const TTexCoordinates*) (((const char*)pTexCoords) + index1 * strideTexCoords));
-            const Vec2 tex2 = ToVec2(*(const TTexCoordinates*) (((const char*)pTexCoords) + index2 * strideTexCoords));
-
-            const float posArea = ((pos1 - pos0).Cross(pos2 - pos0)).GetLength() * 0.5f;
-            const float texArea = fabsf((tex1 - tex0).Cross(tex2 - tex0)) * 0.5f;
-
-            if ((posArea >= minPosArea) && (texArea >= minTexArea))
-            {
-                posAreaSum += posArea;
-                texAreaSum += texArea;
-                ++count;
-            }
-        }
-
-        if (count == 0 || (posAreaSum < minPosArea) || (texAreaSum < minTexArea))
-        {
-            errorText = "faces are too small or have stretched mapping";
-            return false;
-        }
-
-        computedPosArea = posAreaSum;
-        computedTexArea = texAreaSum;
-        return true;
-    }
-
-    template <class TPosition>
-    static bool CollectFaceAreas(size_t indexCount, const vtx_idx* pIndices, size_t vertexCount,
-        const TPosition* pPositions, size_t stridePositions, std::vector<float>& areas)
-    {
-        static const float minFaceArea = 10e-6f;
-
-        if (indexCount % 3 != 0)
-        {
-            return false;
-        }
-
-        areas.reserve(areas.size() + indexCount / 3);
-
-        for (size_t i = 0; i < indexCount; i += 3)
-        {
-            const uint index0 = pIndices[i];
-            const uint index1 = pIndices[i + 1];
-            const uint index2 = pIndices[i + 2];
-
-            if ((index0 >= vertexCount) || (index1 >= vertexCount) || (index2 >= vertexCount))
-            {
-                return false;
-            }
-
-            const Vec3 pos0 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index0 * stridePositions));
-            const Vec3 pos1 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index1 * stridePositions));
-            const Vec3 pos2 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index2 * stridePositions));
-
-            const float faceArea = ((pos1 - pos0).Cross(pos2 - pos0)).GetLength() * 0.5f;
-
-            if (faceArea >= minFaceArea)
-            {
-                areas.push_back(faceArea);
-            }
-        }
-
-        return true;
-    }
-
-private:
-    template <class T>
-    inline static Vec3 ToVec3(const T& v)
-    {
-        return v.ToVec3();
-    }
-
-    template <class T>
-    inline static Vec2 ToVec2(const T& v)
-    {
-        Vec2 uv;
-        v.GetUV(uv);
-
-        return uv;
-    }
-};
-
-template <>
-inline Vec3 CMeshHelpers::ToVec3<Vec3>(const Vec3& v)
-{
-    return v;
-}
-
-template <>
-inline Vec2 CMeshHelpers::ToVec2<Vec2>(const Vec2& v)
-{
-    return v;
-}
-
-template <>
-inline Vec2 CMeshHelpers::ToVec2<Vec2f16>(const Vec2f16& v)
-{
-    return v.ToVec2();
-}
-
-template <>
-inline Vec2 CMeshHelpers::ToVec2<SMeshTexCoord>(const SMeshTexCoord& v)
-{
-    return v.GetUV();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//    General purpose mesh class.
-//////////////////////////////////////////////////////////////////////////
-class CMesh
-{
-public:
-    // e.g. no more than 8 positions, 8 colors, 8 uv sets, etc.
-    const static uint maxStreamsPerType = 8;
-    enum EStream
-    {
-        POSITIONS = 0,
-        POSITIONSF16,
-        NORMALS,
-        FACES,
-        TOPOLOGY_IDS,
-        TEXCOORDS,
-        COLORS,
-        INDICES,
-        TANGENTS,
-        BONEMAPPING,
-        VERT_MATS,
-        QTANGENTS,
-        P3S_C4B_T2S,
-
-        EXTRABONEMAPPING, // Extra stream. Does not have a stream ID in the CGF. Its data is saved at the end of the BONEMAPPING stream.
-
-        LAST_STREAM,
-    };
-
-    SMeshFace* m_pFaces;  // faces are used in mesh processing/compilation
-    int32* m_pTopologyIds;
-
-    // geometry data
-    vtx_idx* m_pIndices;   // indices are used for the final render-mesh
-    Vec3* m_pPositions;
-    Vec3f16* m_pPositionsF16;
-
-    SMeshNormal* m_pNorms;
-    SMeshTangents* m_pTangents;
-    SMeshQTangents* m_pQTangents;
-    SMeshTexCoord* m_pTexCoord;
-    SMeshColor* m_pColor0;
-    SMeshColor* m_pColor1;
-
-    int* m_pVertMats;
-    SVF_P3S_C4B_T2S* m_pP3S_C4B_T2S;
-
-    SMeshBoneMapping_uint16* m_pBoneMapping;  //bone-mapping for the final render-mesh
-    SMeshBoneMapping_uint16* m_pExtraBoneMapping;   //bone indices and weights for bones 5 to 8.
-
-    int m_nCoorCount;                   //number of texture coordinates in m_pTexCoord array
-    int m_streamSize[LAST_STREAM][maxStreamsPerType];
-
-    // Bounding box.
-    AABB m_bbox;
-
-    // Array of mesh subsets.
-    DynArray<SMeshSubset> m_subsets;
-
-    // Mask that indicate if this stream is using not allocated in Mesh pointer;
-    // ex. if (m_sharedStreamMasks[0] & (1<<NORMALS) -> the 1st normals stream is shared
-    // if (m_sharedStreamMasks[1] & (1<<TEXCOORDS) -> the 2nd uv set stream is shared
-    uint32 m_sharedStreamMasks[maxStreamsPerType];
-
-    // Texture space area divided by geometry area. Zero if cannot compute.
-    float m_texMappingDensity;
-
-    // Geometric mean value calculated from the areas of this mesh faces.
-    float m_geometricMeanFaceArea;
-
-    //////////////////////////////////////////////////////////////////////////
-    void GetMemoryUsage(class ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_subsets);
-
-        for (int streamType = 0; streamType < LAST_STREAM; streamType++)
-        {
-            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
-            {
-                void* pStream;
-                int nElementSize = 0;
-                GetStreamInfo(streamType, streamIndex, pStream, nElementSize);
-                pSizer->AddObject(pStream, m_streamSize[streamType][streamIndex] * nElementSize);
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    CMesh()
-    {
-        m_pFaces = NULL;
-        m_pTopologyIds = NULL;
-        m_pIndices = NULL;
-        m_pPositions = NULL;
-        m_pPositionsF16 = NULL;
-        m_pNorms = NULL;
-        m_pTangents = NULL;
-        m_pQTangents = NULL;
-        m_pTexCoord = NULL;
-        m_pColor0 = NULL;
-        m_pColor1 = NULL;
-        m_pVertMats = NULL;
-        m_pP3S_C4B_T2S = NULL;
-        m_pBoneMapping = NULL;
-        m_pExtraBoneMapping = NULL;
-
-        m_nCoorCount = 0;
-
-        memset(m_texCoords, 0, sizeof(m_texCoords));
-        memset(m_streamSize, 0, sizeof(m_streamSize));
-
-        m_bbox.Reset();
-
-        memset(m_sharedStreamMasks, 0, sizeof(m_sharedStreamMasks));
-
-        m_texMappingDensity = 0.0f;
-        m_geometricMeanFaceArea = 0.0f;
-    }
-
-    virtual ~CMesh()
-    {
-        FreeStreams();
-    }
-
-    void FreeStreams()
-    {
-        for (int streamType = 0; streamType < LAST_STREAM; ++streamType)
-        {
-            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
-            {
-                ReallocStream(streamType, streamIndex, 0);
-            }
-        }
-    }
-
-    int GetFaceCount() const
-    {
-        return m_streamSize[FACES][0];
-    }
-    int GetVertexCount() const
-    {
-        return max(max(m_streamSize[POSITIONS][0], m_streamSize[POSITIONSF16][0]), m_streamSize[P3S_C4B_T2S][0]);
-    }
-    int GetTexCoordCount() const
-    {
-        return m_nCoorCount;
-    }
-    int GetTangentCount() const
-    {
-        return m_streamSize[TANGENTS][0];
-    }
-    int GetSubSetCount() const
-    {
-        return m_subsets.size();
-    }
-    int GetIndexCount() const
-    {
-        return m_streamSize[INDICES][0];
-    }
-
-    void SetFaceCount(int nNewCount)
-    {
-        ReallocStream(FACES, 0, nNewCount);
-    }
-
-    void SetVertexCount(int nNewCount)
-    {
-        if (GetVertexCount() != nNewCount || GetVertexCount() == 0)
-        {
-            ReallocStream(POSITIONS, 0, nNewCount);
-            ReallocStream(POSITIONSF16, 0, 0);
-            ReallocStream(NORMALS, 0, nNewCount);
-
-            if (m_pColor0)
-            {
-                ReallocStream(COLORS, 0, nNewCount);
-            }
-
-            if (m_pColor1)
-            {
-                ReallocStream(COLORS, 1, nNewCount);
-            }
-
-            if (m_pVertMats)
-            {
-                ReallocStream(VERT_MATS, 0, nNewCount);
-            }
-        }
-    }
-
-    void SetTexCoordsCount(int nNewCount)
-    {
-        if (m_nCoorCount != nNewCount || m_nCoorCount == 0)
-        {
-            ReallocStream(TEXCOORDS, 0, nNewCount);
-            m_nCoorCount = nNewCount;
-        }
-    }
-
-    void SetTexCoordsAndTangentsCount(int nNewCount)
-    {
-        if (m_nCoorCount != nNewCount || m_nCoorCount == 0)
-        {
-            ReallocStream(TEXCOORDS, 0, nNewCount);
-            ReallocStream(TANGENTS, 0, nNewCount);
-            m_nCoorCount = nNewCount;
-        }
-    }
-
-    void SetIndexCount(int nNewCount)
-    {
-        ReallocStream(INDICES, 0, nNewCount);
-    }
-    // Once m_pTexCoords, m_pColors, etc. are wrapped in vectors, return the size of the vector
-    // or if we go with fixed size arrays, with a bunch of nullptrs, maybe just return the fixed size or the number of non-null ptrs
-    int GetNumberOfStreamsByType(int streamType) const
-    {
-        if (streamType == COLORS || streamType == TEXCOORDS)
-        {
-            return 2;
-        }
-        return 1;
-    }
-
-    bool Has32BitPositions(void) const
-    {
-        return m_pPositions != nullptr;
-    }
-
-    bool Has16BitPositions(void) const
-    {
-        return m_pPositionsF16 != nullptr;
-    }
-
-    bool IsUVSetEmptyForSubmesh(uint submeshIndex, uint uvSet)
-    {
-        // Get a pointer to the uv set
-        SMeshTexCoord* texCoords = nullptr;
-        if (uvSet == 0)
-        {
-            texCoords = m_pTexCoord;
-        }
-        else
-        {
-            texCoords = m_texCoords[uvSet];
-        }
-
-        if (texCoords)
-        {
-            // Iterate through the vertices for the submesh
-            Vec2 emptyTexCoord = Vec2(0.0f, 0.0f);
-            for (int i = m_subsets[submeshIndex].nFirstVertId; i < m_subsets[submeshIndex].nFirstVertId + m_subsets[submeshIndex].nNumVerts; ++i)
-            {
-                // If any of the texture coordinates for the given uv set are non-zero, return false.
-                if (texCoords[i].GetUV() != emptyTexCoord)
-                {
-                    return false;
-                }
-            }
-        }
-        // If no valid texture coordinates are found for submesh for the given uv set, return true.
-        return true;
-    }
-
-    void SetSubmeshVertexFormats(void)
-    {
-        EVertexFormat desiredFormat = eVF_Unknown;
-        for (int submeshIndex = 0; submeshIndex < m_subsets.size(); ++submeshIndex)
-        {
-            // Choose float or short based on the precision of the positions
-            if (this->Has32BitPositions())
-            {
-                // Choose one or two uv sets
-                if (IsUVSetEmptyForSubmesh(submeshIndex, 1))
-                {
-                    desiredFormat = eVF_P3F_C4B_T2F;
-                }
-                else
-                {
-                    desiredFormat = eVF_P3F_C4B_T2F_T2F;
-                }
-            }
-            else if (this->Has16BitPositions())
-            {
-                // Choose one or two uv sets
-                if (IsUVSetEmptyForSubmesh(submeshIndex, 1))
-                {
-                    desiredFormat = eVF_P3S_C4B_T2S;
-                }
-                else
-                {
-                    desiredFormat = eVF_P3S_C4B_T2S_T2S;
-                }
-            }
-            else
-            {
-                AZ_Assert(false, "Submesh does not contain positions");
-            }
-
-            // Set the vertex format for the submesh
-            m_subsets[submeshIndex].vertexFormat = AZ::Vertex::Format(desiredFormat);
-        }
-    }
-
-    AZ::Vertex::Format GetVertexFormatForSubmesh(int submeshIndex) const
-    {
-        assert(submeshIndex < m_subsets.size());
-
-        return m_subsets[submeshIndex].vertexFormat;
-    }
-
-    AZ::Vertex::Format GetMeshGroupVertexFormat() const
-    {
-        AZ::Vertex::Format meshGroupFormat;
-        for (int submeshIndex = 0; submeshIndex < m_subsets.size(); ++submeshIndex)
-        {
-            if (m_subsets[submeshIndex].vertexFormat > meshGroupFormat)
-            {
-                meshGroupFormat = m_subsets[submeshIndex].vertexFormat;
-            }
-        }
-
-        return meshGroupFormat;
-    }
-
-    // Set specific stream type as shared. If there are multiple streams for a given type (such as multiple uv sets), then all streams of that type will be marked as shared
-    void SetSharedStream(int streamType, int streamIndex, void* pStream, int nElementCount)
-    {
-        AZ_Assert(streamType >= 0 && streamType < LAST_STREAM && streamIndex < maxStreamsPerType, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
-        if ((m_sharedStreamMasks[streamIndex] & (1 << streamType)) == 0)
-        {
-            ReallocStream(streamType, streamIndex, 0);
-            m_sharedStreamMasks[streamIndex] |= (1 << streamType);
-        }
-        SetStreamData(streamType, streamIndex, pStream, nElementCount);
-    }
-
-    template <class T>
-    T* GetStreamPtrAndElementCount(int streamType, int streamIndex, int* pElementCount = 0) const
-    {
-        void* pStream = 0;
-        int nElementSize = 0;
-        GetStreamInfo(streamType, streamIndex, pStream, nElementSize);
-
-        if (nElementSize != sizeof(T))
-        {
-            AZ_Assert(false, "The element size %d returned by GetStreamInfo does not match the size %d of type T", nElementSize, sizeof(T));
-            pStream = 0;
-        }
-
-        const int nElementCount = (pStream ? this->m_streamSize[streamType][streamIndex] : 0);
-
-        if (pElementCount)
-        {
-            *pElementCount = nElementCount;
-        }
-        return (T*)pStream;
-    }
-
-    template <class T>
-    T* GetStreamPtr(int streamType, int streamIndex = 0) const
-    {
-        void* pStream = 0;
-        int nElementSize = 0;
-        GetStreamInfo(streamType, streamIndex, pStream, nElementSize);
-
-        if (nElementSize != sizeof(T))
-        {
-            AZ_Assert(false, "The element size %d returned by GetStreamInfo does not match the size %d of type T", nElementSize, sizeof(T));
-            pStream = 0;
-        }
-
-        return (T*)pStream;
-    }
-
-    void GetStreamInfo(int streamType, int streamIndex, void*& pStream, int& nElementSize) const
-    {
-        pStream = 0;
-        nElementSize = 0;
-        AZ_Assert(streamType >= 0 && streamType < LAST_STREAM && streamIndex < maxStreamsPerType, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
-
-        switch (streamType)
-        {
-        case POSITIONS:
-            pStream = m_pPositions;
-            nElementSize = sizeof(Vec3);
-            break;
-        case POSITIONSF16:
-            pStream = m_pPositionsF16;
-            nElementSize = sizeof(Vec3f16);
-            break;
-        case NORMALS:
-            pStream = m_pNorms;
-            nElementSize = sizeof(Vec3);
-            break;
-        case VERT_MATS:
-            pStream = m_pVertMats;
-            nElementSize = sizeof(int);
-            break;
-        case FACES:
-            pStream = m_pFaces;
-            nElementSize = sizeof(SMeshFace);
-            break;
-        case TOPOLOGY_IDS:
-            pStream = m_pTopologyIds;
-            nElementSize = sizeof(int32);
-            break;
-        case TEXCOORDS:
-            if (streamIndex == 0)
-            {
-                pStream = m_pTexCoord;
-            }
-            else
-            {
-                pStream = m_texCoords[streamIndex];
-            }
-            nElementSize = sizeof(SMeshTexCoord);
-            break;
-        case COLORS:
-            if (streamIndex == 0)
-            {
-                pStream = m_pColor0;
-            }
-            else
-            {
-                pStream = m_pColor1;
-            }
-            nElementSize = sizeof(SMeshColor);
-            break;
-        case INDICES:
-            pStream = m_pIndices;
-            nElementSize = sizeof(vtx_idx);
-            break;
-        case TANGENTS:
-            pStream = m_pTangents;
-            nElementSize = sizeof(SMeshTangents);
-            break;
-        case QTANGENTS:
-            pStream = m_pQTangents;
-            nElementSize = sizeof(SMeshQTangents);
-            break;
-        case BONEMAPPING:
-            pStream = m_pBoneMapping;
-            nElementSize = sizeof(SMeshBoneMapping_uint16);
-            break;
-        case EXTRABONEMAPPING:
-            pStream = m_pExtraBoneMapping;
-            nElementSize = sizeof(SMeshBoneMapping_uint16);
-            break;
-        case P3S_C4B_T2S:
-            pStream = m_pP3S_C4B_T2S;
-            nElementSize = sizeof(SVF_P3S_C4B_T2S);
-            break;
-        default:
-            AZ_Assert(false, "Unknown stream");
-            break;
-        }
-    }
-
-
-    virtual void ReallocStream(int streamType, int streamIndex, int nNewCount)
-    {
-        if (streamType < 0 || streamType >= LAST_STREAM || streamIndex >= maxStreamsPerType)
-        {
-            AZ_Assert(false, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
-            return;
-        }
-
-        if (m_sharedStreamMasks[streamIndex] & (1 << streamType))
-        {
-            m_sharedStreamMasks[streamIndex] &= ~(1 << streamType);
-
-            if (nNewCount <= 0)
-            {
-                SetStreamData(streamType, 0, nullptr, 0);
-            }
-            else
-            {
-                const int nOldCount = m_streamSize[streamType][streamIndex];
-                void* pOldElements = 0;
-                int nElementSize = 0;
-                GetStreamInfo(streamType, streamIndex, pOldElements, nElementSize);
-
-                void* const pNewElements = realloc(0, nNewCount * nElementSize);
-                if (!pNewElements)
-                {
-                    AZ_Assert(false, "Allocation failed");
-                    SetStreamData(streamType, streamIndex, nullptr, 0);
-                    return;
-                }
-
-                if (nOldCount > 0)
-                {
-                    memcpy(pNewElements, pOldElements, min(nOldCount, nNewCount) * nElementSize);
-                }
-                if (nNewCount > nOldCount)
-                {
-                    memset((char*)pNewElements + nOldCount * nElementSize, 0, (nNewCount - nOldCount) * nElementSize);
-                }
-
-                SetStreamData(streamType, streamIndex, pNewElements, nNewCount);
-            }
-        }
-        else
-        {
-            const int nOldCount = m_streamSize[streamType][streamIndex];
-            if (nOldCount == nNewCount)
-            {
-                // stream already has required size
-                return;
-            }
-
-            void* pOldElements = 0;
-            int nElementSize = 0;
-            GetStreamInfo(streamType, streamIndex, pOldElements, nElementSize);
-
-            if (nNewCount <= 0)
-            {
-                free(pOldElements);
-                SetStreamData(streamType, streamIndex, nullptr, 0);
-            }
-            else
-            {
-                void* const pNewElements = realloc(pOldElements, nNewCount * nElementSize);
-                if (!pNewElements)
-                {
-                    AZ_Assert(false, "Allocation failed");
-                    free(pOldElements);
-                    SetStreamData(streamType, streamIndex, nullptr, 0);
-                    return;
-                }
-
-                if (nNewCount > nOldCount)
-                {
-                    memset((char*)pNewElements + nOldCount * nElementSize, 0, (nNewCount - nOldCount) * nElementSize);
-                }
-
-                SetStreamData(streamType, streamIndex, pNewElements, nNewCount);
-            }
-        }
-    }
-
-    // Copy mesh from source mesh.
-    void Copy(const CMesh& mesh)
-    {
-        for (int streamType = 0; streamType < LAST_STREAM; streamType++)
-        {
-            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
-            {
-                ReallocStream(streamType, streamIndex, mesh.m_streamSize[streamType][streamIndex]);
-                if (mesh.m_streamSize[streamType][streamIndex] > 0)
-                {
-                    void* pSrcStream = 0;
-                    void* pTrgStream = 0;
-                    int nElementSize = 0;
-                    mesh.GetStreamInfo(streamType, streamIndex, pSrcStream, nElementSize);
-                    GetStreamInfo(streamType, streamIndex, pTrgStream, nElementSize);
-                    if (pSrcStream && pTrgStream)
-                    {
-                        memcpy(pTrgStream, pSrcStream, m_streamSize[streamType][streamIndex] * nElementSize);
-                    }
-                }
-            }
-        }
-        m_bbox = mesh.m_bbox;
-        m_subsets = mesh.m_subsets;
-        m_texMappingDensity = mesh.m_texMappingDensity;
-        m_geometricMeanFaceArea = mesh.m_geometricMeanFaceArea;
-    }
-
-    bool CompareStreams(const CMesh& mesh) const
-    {
-        for (int streamType = 0; streamType < LAST_STREAM; streamType++)
-        {
-            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
-            {
-                if (m_streamSize[streamType][streamIndex] != mesh.m_streamSize[streamType][streamIndex])
-                {
-                    return false;
-                }
-
-                if (m_streamSize[streamType][streamIndex])
-                {
-                    void* pStream1 = 0;
-                    void* pStream2 = 0;
-                    int nElementSize1 = 0;
-                    int nElementSize2 = 0;
-                    GetStreamInfo(streamType, streamIndex, pStream1, nElementSize1);
-                    mesh.GetStreamInfo(streamType, streamIndex, pStream2, nElementSize2);
-
-                    assert(nElementSize1 == nElementSize2);
-
-                    if ((pStream1 && !pStream2) || (!pStream1 && pStream2))
-                    {
-                        return false;
-                    }
-
-                    if (pStream1 && pStream2)
-                    {
-                        if (memcmp(pStream1, pStream2, m_streamSize[streamType][streamIndex] * nElementSize1) != 0)
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    // Add streams from source mesh to the end of existing streams.
-    const char* Append(const CMesh& mesh)
-    {
-        return Append(mesh, 0, -1, 0, -1);
-    }
-
-    // Add streams from source mesh to the end of existing streams.
-    const char* Append(const CMesh& mesh, int fromVertex, int vertexCount, int fromFace, int faceCount)
-    {
-        if (GetIndexCount() > 0 || mesh.GetIndexCount() > 0)
-        {
-            assert(0);
-            return "Cmesh::Append() cannot handle meshes with indices, it can handle faces only";
-        }
-
-        // Non-ranged requests should start from 0th element and element count should be <0.
-        if ((vertexCount < 0 && fromVertex != 0) || (faceCount < 0 && fromFace != 0))
-        {
-            assert(0);
-            return "Cmesh::Append(): Bad CMesh parameters";
-        }
-        if (vertexCount < 0)
-        {
-            vertexCount = mesh.GetVertexCount();
-        }
-        if (faceCount < 0)
-        {
-            faceCount = mesh.GetFaceCount();
-        }
-
-        const int oldVertexCount = GetVertexCount();
-        const int oldFaceCount = GetFaceCount();
-        const int nOldCoorCount = GetTexCoordCount();
-
-        if (GetTexCoordCount() != 0 && GetTexCoordCount() != oldVertexCount)
-        {
-            assert(0);
-            return "Cmesh::Append(): Mismatch in target CMesh vert/tcoord counts";
-        }
-
-        if (mesh.GetTexCoordCount() != 0 && mesh.GetTexCoordCount() != mesh.GetVertexCount())
-        {
-            assert(0);
-            return "Cmesh::Append(): Mismatch in source CMesh vert/tcoord counts";
-        }
-
-        for (int streamType = 0; streamType < LAST_STREAM; ++streamType)
-        {
-            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
-            {
-                const int oldCount = (streamType == FACES) ? oldFaceCount : oldVertexCount;
-
-                const int from = (streamType == FACES) ? fromFace : fromVertex;
-                const int count = (streamType == FACES) ? faceCount : vertexCount;
-
-                const int oldStreamSize = m_streamSize[streamType][streamIndex];
-                const int streamSize = mesh.m_streamSize[streamType][streamIndex];
-
-                if (oldStreamSize <= 0 && (count <= 0 || streamSize <= 0))
-                {
-                    continue;
-                }
-
-                ReallocStream(streamType, streamIndex, oldCount + count);
-
-                if (count > 0)
-                {
-                    void* pSrcStream = 0;
-                    void* pTrgStream = 0;
-                    int srcElementSize = 0;
-                    int trgElementSize = 0;
-                    mesh.GetStreamInfo(streamType, streamIndex, pSrcStream, srcElementSize);
-                    GetStreamInfo(streamType, streamIndex, pTrgStream, trgElementSize);
-
-                    assert(srcElementSize == trgElementSize);
-
-                    if (pSrcStream && pTrgStream)
-                    {
-                        memcpy(
-                            (char*)pTrgStream + oldCount * trgElementSize,
-                            (char*)pSrcStream + from * srcElementSize,
-                            count * srcElementSize);
-                    }
-                }
-            }
-        }
-
-        {
-            const int nOffset = oldVertexCount - fromVertex;
-            const int newFaceCount = GetFaceCount();
-
-            for (int i = oldFaceCount; i < newFaceCount; ++i)
-            {
-                m_pFaces[i].v[0] += nOffset;
-                m_pFaces[i].v[1] += nOffset;
-                m_pFaces[i].v[2] += nOffset;
-            }
-        }
-
-        m_bbox.Add(mesh.m_bbox.min);
-        m_bbox.Add(mesh.m_bbox.max);
-
-        return 0;
-    }
-
-    void RemoveRangeFromStream(int streamType, int streamIndex, int nFirst, int nCount)
-    {
-        if (streamType < 0 || streamType >= LAST_STREAM || streamIndex >= maxStreamsPerType)
-        {
-            AZ_Assert(false, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
-            return;
-        }
-
-        if (m_sharedStreamMasks[streamIndex] & (1 << streamType))
-        {
-            // Make shared stream non-shared
-            ReallocStream(streamType, streamIndex, m_streamSize[streamType][streamIndex]);
-        }
-
-        const int nTotalCount = m_streamSize[streamType][streamIndex];
-
-        int nElementSize;
-        void* pStream = 0;
-        GetStreamInfo(streamType, streamIndex, pStream, nElementSize);
-
-        if (nFirst >= nTotalCount || nTotalCount <= 0 || pStream == 0)
-        {
-            return;
-        }
-        if (nFirst + nCount > nTotalCount)
-        {
-            nCount = nTotalCount - nFirst;
-        }
-        if (nCount <= 0)
-        {
-            return;
-        }
-
-        const int nTailCount = nTotalCount - (nFirst + nCount);
-        if (nTailCount > 0)
-        {
-            char* const pRangeStart = (char*)pStream + nFirst * nElementSize;
-            char* const pRangeEnd = (char*)pStream + (nFirst + nCount) * nElementSize;
-            memmove(pRangeStart, pRangeEnd, nTailCount * nElementSize);
-        }
-
-        ReallocStream(streamType, streamIndex, nTotalCount - nCount);
-    }
-
-    bool Validate(const char** const ppErrorDescription) const
-    {
-        const int vertexCount = GetVertexCount();
-        const int faceCount = GetFaceCount();
-        const int indexCount = GetIndexCount();
-
-        if ((faceCount <= 0) && (indexCount <= 0))
-        {
-            if (vertexCount > 0)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "no any indices, but vertices exist";
-                }
-                return false;
-            }
-        }
-
-        if ((uint)vertexCount > (sizeof(vtx_idx) == 2 ? 0xffff : 0x7fffffff))
-        {
-            if (ppErrorDescription)
-            {
-                ppErrorDescription[0] =
-                    (sizeof(vtx_idx) == 2)
-                    ? "vertex count is greater or equal than 64K"
-                    : "vertex count is greater or equal than 2G";
-            }
-            return false;
-        }
-
-        if (faceCount > 0)
-        {
-            if (vertexCount <= 0)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "no any vertices, but faces exist";
-                }
-                return false;
-            }
-        }
-
-        if (indexCount > 0)
-        {
-            if (vertexCount <= 0)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "no any vertices, but indices exist";
-                }
-                return false;
-            }
-        }
-
-        for (int i = 0; i < faceCount; ++i)
-        {
-            const SMeshFace& face = m_pFaces[i];
-            for (int j = 0; j < 3; ++j)
-            {
-                const int v = face.v[j];
-                if ((v < 0) || (v >= vertexCount))
-                {
-                    if (ppErrorDescription)
-                    {
-                        ppErrorDescription[0] = "a face refers vertex outside of vertex array";
-                    }
-                    return false;
-                }
-            }
-        }
-
-        for (int i = 0; i < indexCount; i++)
-        {
-            if ((uint)m_pIndices[i] >= (uint)vertexCount)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "an index refers vertex outside of vertex array";
-                }
-                return false;
-            }
-        }
-
-        if (GetTexCoordCount() != 0 && GetTexCoordCount() != vertexCount)
-        {
-            if (ppErrorDescription)
-            {
-                ppErrorDescription[0] = "number of texture coordinates is different from number of vertices";
-            }
-            return false;
-        }
-
-        if (!_finite(m_bbox.min.x) || !_finite(m_bbox.min.y) || !_finite(m_bbox.min.z) ||
-            !_finite(m_bbox.max.x) || !_finite(m_bbox.max.y) || !_finite(m_bbox.max.z))
-        {
-            if (ppErrorDescription)
-            {
-                ppErrorDescription[0] = "bounding box contains damaged data";
-            }
-            return false;
-        }
-
-        if (m_bbox.IsReset())
-        {
-            if (ppErrorDescription)
-            {
-                ppErrorDescription[0] = "bounding box is not set";
-            }
-            return false;
-        }
-
-        if (m_bbox.max.x < m_bbox.min.x ||
-            m_bbox.max.y < m_bbox.min.y ||
-            m_bbox.max.z < m_bbox.min.z)
-        {
-            if (ppErrorDescription)
-            {
-                ppErrorDescription[0] = "bounding box min is greater than max";
-            }
-            return false;
-        }
-
-        if (m_bbox.min.GetDistance(m_bbox.max) < 0.001f)
-        {
-            if (ppErrorDescription)
-            {
-                ppErrorDescription[0] = "bounding box is less than 1 mm in size";
-            }
-            return false;
-        }
-
-        for (int s = 0, subsetCount = m_subsets.size(); s < subsetCount; ++s)
-        {
-            const SMeshSubset& subset = m_subsets[s];
-
-            if (subset.nNumIndices <= 0)
-            {
-                if (subset.nNumVerts > 0)
-                {
-                    if (ppErrorDescription)
-                    {
-                        ppErrorDescription[0] = "a mesh subset without indices contains vertices";
-                    }
-                    return false;
-                }
-                continue;
-            }
-            else if (subset.nNumVerts <= 0)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "a mesh subset has indices but vertices are missing";
-                }
-                return false;
-            }
-
-            if (subset.nFirstIndexId < 0)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "a mesh subset has negative start position in index array";
-                }
-                return false;
-            }
-            if (subset.nFirstIndexId + subset.nNumIndices > indexCount)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "a mesh subset refers indices outside of index array";
-                }
-                return false;
-            }
-            if (subset.nFirstVertId < 0)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "a mesh subset has negative start position in vertex array";
-                }
-                return false;
-            }
-            if (subset.nFirstVertId + subset.nNumVerts > vertexCount)
-            {
-                if (ppErrorDescription)
-                {
-                    ppErrorDescription[0] = "a mesh subset refers vertices outside of vertex array";
-                }
-                return false;
-            }
-
-            for (int ii = subset.nFirstIndexId; ii < subset.nFirstIndexId + subset.nNumIndices; ++ii)
-            {
-                const uint index = m_pIndices[ii];
-                if (index < (uint)subset.nFirstVertId)
-                {
-                    if (ppErrorDescription)
-                    {
-                        ppErrorDescription[0] = "a mesh subset refers a vertex lying before subset vertices";
-                    }
-                    return false;
-                }
-                if (index >= (uint)(subset.nFirstVertId + subset.nNumVerts))
-                {
-                    if (ppErrorDescription)
-                    {
-                        ppErrorDescription[0] = "a mesh subset refers a vertex lying after subset vertices";
-                    }
-                    return false;
-                }
-
-                Vec3 p(ZERO);
-                const Vec3* pp = &p;
-                if (m_pPositions)
-                {
-                    pp = &m_pPositions[index];
-                }
-                else if (m_pPositionsF16)
-                {
-                    p = m_pPositionsF16[index].ToVec3();
-                }
-                else if (m_pP3S_C4B_T2S)
-                {
-                    p = m_pP3S_C4B_T2S[index].xyz.ToVec3();
-                }
-                if (!_finite(pp->x))
-                {
-                    if (ppErrorDescription)
-                    {
-                        ppErrorDescription[0] = "a mesh subset contains a vertex with damaged x component";
-                    }
-                    return false;
-                }
-                if (!_finite(pp->y))
-                {
-                    if (ppErrorDescription)
-                    {
-                        ppErrorDescription[0] = "a mesh subset contains a vertex with damaged y component";
-                    }
-                    return false;
-                }
-                if (!_finite(pp->z))
-                {
-                    if (ppErrorDescription)
-                    {
-                        ppErrorDescription[0] = "a mesh subset contains a vertex with damaged z component";
-                    }
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool ComputeSubsetTexMappingAreas(
-        size_t subsetIndex,
-        float& computedPosArea, float& computedTexArea, const char*& errorText)
-    {
-        computedPosArea = 0.0f;
-        computedTexArea = 0.0f;
-        errorText = "";
-
-        if (subsetIndex >= (size_t)m_subsets.size())
-        {
-            errorText = "subset index is bad";
-            return false;
-        }
-
-        if (GetIndexCount() <= 0)
-        {
-            errorText = "missing indices";
-            return false;
-        }
-
-        if ((GetVertexCount() <= 0) || ((m_pPositions == NULL) && (m_pPositionsF16 == NULL)))
-        {
-            errorText = "missing vertices";
-            return false;
-        }
-
-        if ((m_pTexCoord == NULL) || (GetTexCoordCount() <= 0))
-        {
-            errorText = "missing texture coordinates";
-            return false;
-        }
-
-        const SMeshSubset& subset = m_subsets[subsetIndex];
-
-        if ((subset.nNumIndices <= 0) || (subset.nFirstIndexId < 0))
-        {
-            errorText = "missing or bad indices in subset";
-            return false;
-        }
-
-        bool ok;
-        if (m_pPositions)
-        {
-            ok = CMeshHelpers::ComputeTexMappingAreas(
-                    subset.nNumIndices, &m_pIndices[subset.nFirstIndexId],
-                    GetVertexCount(),
-                    &m_pPositions[0], sizeof(m_pPositions[0]),
-                    &m_pTexCoord[0], sizeof(m_pTexCoord[0]),
-                    computedPosArea, computedTexArea, errorText);
-        }
-        else
-        {
-            ok = CMeshHelpers::ComputeTexMappingAreas(
-                    subset.nNumIndices, &m_pIndices[subset.nFirstIndexId],
-                    GetVertexCount(),
-                    &m_pPositionsF16[0], sizeof(m_pPositionsF16[0]),
-                    &m_pTexCoord[0], sizeof(m_pTexCoord[0]),
-                    computedPosArea, computedTexArea, errorText);
-        }
-
-        return ok;
-    }
-
-    // note: this function doesn't work for "old" uncompressed meshes (with faces instead of indices)
-    bool RecomputeTexMappingDensity()
-    {
-        m_texMappingDensity = 0;
-
-        if (GetFaceCount() > 0)
-        {
-            // uncompressed mesh - not supported
-            return false;
-        }
-
-        if ((GetIndexCount() <= 0) || (GetVertexCount() <= 0) || ((m_pPositions == NULL) && (m_pPositionsF16 == NULL)))
-        {
-            return false;
-        }
-
-        if ((m_pTexCoord == NULL) || (GetTexCoordCount() <= 0))
-        {
-            return false;
-        }
-
-        float totalPosArea = 0;
-        float totalTexArea = 0;
-
-        for (size_t i = 0, count = m_subsets.size(); i < count; ++i)
-        {
-
-            float posArea;
-            float texArea;
-            const char* errorText = "";
-
-            const bool ok = ComputeSubsetTexMappingAreas(i, posArea, texArea, errorText);
-
-            if (ok)
-            {
-                totalPosArea += posArea;
-                totalTexArea += texArea;
-            }
-        }
-
-        if (totalPosArea <= 0)
-        {
-            return false;
-        }
-
-        m_texMappingDensity = totalTexArea / totalPosArea;
-        return true;
-    }
-
-    bool RecomputeGeometricMeanFaceArea()
-    {
-        m_geometricMeanFaceArea = 0.0f;
-
-        if (GetFaceCount() > 0)
-        {
-            // uncompressed mesh - not supported
-            return false;
-        }
-
-        if ((GetIndexCount()  <= 0) || (GetVertexCount() <= 0) || ((m_pPositions == NULL) && (m_pPositionsF16 == NULL)))
-        {
-            return false;
-        }
-
-        std::vector<float> areas;
-        const size_t subsetCount = m_subsets.size();
-
-        for (size_t i = 0; i < subsetCount; ++i)
-        {
-            CollectSubsetFaceAreas(m_subsets[i], areas);
-        }
-
-        const size_t areasCount = areas.size();
-        if (areasCount == 0)
-        {
-            return false;
-        }
-
-        float fGeometricTotal = 0.0f;
-        for (size_t i = 0; i < areasCount; ++i)
-        {
-            fGeometricTotal += logf(areas[i]);
-        }
-
-        m_geometricMeanFaceArea = expf(fGeometricTotal / areasCount);
-
-        assert(m_geometricMeanFaceArea > 0.0f);
-
-        return true;
-    }
-
-    bool CollectSubsetFaceAreas(const SMeshSubset& subset, std::vector<float>& areas)
-    {
-        if ((subset.nNumIndices <= 0) || (subset.nFirstIndexId < 0))
-        {
-            return false;
-        }
-
-        bool ok = false;
-        if (m_pPositions != NULL)
-        {
-            ok = CMeshHelpers::CollectFaceAreas(subset.nNumIndices, &m_pIndices[subset.nFirstIndexId],
-                    GetVertexCount(), &m_pPositions[0], sizeof(m_pPositions[0]), areas);
-        }
-        else if (m_pPositionsF16 != NULL)
-        {
-            ok = CMeshHelpers::CollectFaceAreas(subset.nNumIndices, &m_pIndices[subset.nFirstIndexId],
-                    GetVertexCount(), &m_pPositionsF16[0], sizeof(m_pPositionsF16[0]), areas);
-        }
-
-        return ok;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Estimates the size of the render mesh.
-    uint32 EstimateRenderMeshMemoryUsage() const
-    {
-        const size_t cSizeStream[VSF_NUM] = {
-            0U,
-            sizeof(SPipTangents),        // VSF_TANGENTS
-            sizeof(SPipQTangents),       // VSF_QTANGENTS
-            sizeof(SVF_W4B_I4S),         // VSF_HWSKIN_INFO
-            sizeof(SVF_P3F),             // VSF_VERTEX_VELOCITY
-#if ENABLE_NORMALSTREAM_SUPPORT
-            sizeof(SPipNormal),          // VSF_NORMALS
-#endif
-        };
-
-        uint32 nMeshSize = 0;
-        uint32 activeStreams = (GetVertexCount()) ? 1U << VSF_GENERAL : 0U;
-        activeStreams |=
-            (m_pQTangents) ? (1U << VSF_QTANGENTS) :
-            (m_pTangents) ? (1U << VSF_TANGENTS) : 0U;
-        if (m_pBoneMapping)
-        {
-            activeStreams |= 1U << VSF_HWSKIN_INFO;
-        }
-        for (uint32 i = 0; i < VSF_NUM; i++)
-        {
-            if (activeStreams & (1U << i))
-            {
-                nMeshSize += ((i == VSF_GENERAL) ? sizeof(SVF_P3S_C4B_T2S) : cSizeStream[i]) * GetVertexCount();
-                nMeshSize += TARGET_DEFAULT_ALIGN - (nMeshSize & (TARGET_DEFAULT_ALIGN - 1));
-            }
-        }
-        if (GetIndexCount())
-        {
-            nMeshSize += GetIndexCount() * sizeof(vtx_idx);
-            nMeshSize += TARGET_DEFAULT_ALIGN - (nMeshSize & (TARGET_DEFAULT_ALIGN - 1));
-        }
-
-        return nMeshSize;
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    // This function used when we do not have an actual mesh, but only vertex/index count of it.
-    static uint32 ApproximateRenderMeshMemoryUsage(int nVertexCount, int nIndexCount)
-    {
-        uint32 nMeshSize = 0;
-        nMeshSize += nVertexCount * sizeof(SVF_P3S_C4B_T2S);
-        nMeshSize += nVertexCount * sizeof(SPipTangents);
-
-        nMeshSize += nIndexCount * sizeof(vtx_idx);
-        return nMeshSize;
-    }
-
-private:
-    // Set stream size.
-    void SetStreamData(int streamType, int streamIndex, void* pStream, int nNewCount)
-    {
-        if (streamType < 0 || streamType >= LAST_STREAM || streamIndex >= maxStreamsPerType)
-        {
-            AZ_Assert(false, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
-            return;
-        }
-        m_streamSize[streamType][streamIndex] = nNewCount;
-        switch (streamType)
-        {
-        case POSITIONS:
-            m_pPositions = (Vec3*)pStream;
-            break;
-        case POSITIONSF16:
-            m_pPositionsF16 = (Vec3f16*)pStream;
-            break;
-        case NORMALS:
-            m_pNorms = (SMeshNormal*)pStream;
-            break;
-        case VERT_MATS:
-            m_pVertMats = (int*)pStream;
-            break;
-        case FACES:
-            m_pFaces = (SMeshFace*)pStream;
-            break;
-        case TOPOLOGY_IDS:
-            m_pTopologyIds = (int32*)pStream;
-            break;
-        case TEXCOORDS:
-            if (streamIndex == 0)
-            {
-                m_pTexCoord = (SMeshTexCoord*)pStream;
-            }
-            else
-            {
-                m_texCoords[streamIndex] = (SMeshTexCoord*)pStream;
-            }
-            m_nCoorCount = nNewCount;
-            break;
-        case COLORS:
-            if (streamIndex == 0)
-            {
-                m_pColor0 = (SMeshColor*)pStream;
-            }
-            else
-            {
-                m_pColor1 = (SMeshColor*)pStream;
-            }
-            break;
-        case INDICES:
-            m_pIndices = (vtx_idx*)pStream;
-            break;
-        case TANGENTS:
-            m_pTangents = (SMeshTangents*)pStream;
-            break;
-        case QTANGENTS:
-            m_pQTangents = (SMeshQTangents*)pStream;
-            break;
-        case BONEMAPPING:
-            m_pBoneMapping = (SMeshBoneMapping_uint16*)pStream;
-            break;
-        case EXTRABONEMAPPING:
-            m_pExtraBoneMapping = (SMeshBoneMapping_uint16*)pStream;
-            break;
-        case P3S_C4B_T2S:
-            m_pP3S_C4B_T2S = (SVF_P3S_C4B_T2S*)pStream;
-            m_nCoorCount = nNewCount;
-            break;
-        default:
-            AZ_Assert(false, "Unknown stream");
-            break;
-        }
-    }
-
-    SMeshTexCoord* m_texCoords[maxStreamsPerType];
-};
-
-// 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
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IIndexedMesh() {}
-
-    // Release indexed mesh.
-    virtual void Release() = 0;
-
-    //! Gives read-only access to mesh data
-    virtual void GetMeshDescription(SMeshDescription& meshDesc) const = 0;
-
-    virtual CMesh* GetMesh() = 0;
-
-    virtual void SetMesh(CMesh& mesh) = 0;
-
-    /*! Frees vertex and face streams. Calling this function invalidates SMeshDescription pointers */
-    virtual void FreeStreams() = 0;
-
-    //! Return number of allocated faces
-    virtual int GetFaceCount() const = 0;
-
-    /*! Reallocates faces. Calling this function invalidates SMeshDescription pointers */
-    virtual void SetFaceCount(int nNewCount) = 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;
-
-    /*! Reallocates colors. Calling this function invalidates SMeshDescription pointers */
-    virtual void SetColorCount(int nNewCount) = 0;
-
-    //! Return number of allocated texture coordinates
-    virtual int GetTexCoordCount() const = 0;
-
-    /*! Reallocates texture coordinates. Calling this function invalidates SMeshDescription pointers */
-    virtual void SetTexCoordCount(int nNewCount, int numStreams = 1) = 0;
-
-    //! Return number of allocated tangents.
-    virtual int GetTangentCount() const = 0;
-
-    /*! Reallocates tangents. Calling this function invalidates SMeshDescription pointers */
-    virtual void SetTangentCount(int nNewCount) = 0;
-
-    // Get number of indices in the mesh.
-    virtual int GetIndexCount() const = 0;
-
-    // Set number of indices in the mesh.
-    virtual void SetIndexCount(int nNewCount) = 0;
-
-    // Allocates m_pBoneMapping in CMesh
-    virtual void AllocateBoneMapping() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Subset access.
-    //////////////////////////////////////////////////////////////////////////
-    virtual int GetSubSetCount() const = 0;
-    virtual void SetSubSetCount(int nSubsets) = 0;
-    virtual const SMeshSubset& GetSubSet(int nIndex) const = 0;
-    virtual void SetSubsetBounds(int nIndex, const Vec3& vCenter, float fRadius) = 0;
-    virtual void SetSubsetIndexVertexRanges(int nIndex, int nFirstIndexId, int nNumIndices, int nFirstVertId, int nNumVerts) = 0;
-    virtual void SetSubsetMaterialId(int nIndex, int nMatID) = 0;
-    virtual void SetSubsetMaterialProperties(int nIndex, int nMatFlags, int nPhysicalizeType, const AZ::Vertex::Format& vertexFormat) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Mesh bounding box.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetBBox(const AABB& box) = 0;
-    virtual AABB GetBBox() const = 0;
-    virtual void CalcBBox() = 0;
-
-    virtual void RestoreFacesFromIndices() = 0;
-    // </interfuscator:shuffle>
-
-    // Optimizes mesh
-    virtual void Optimize(const char* szComment = NULL) = 0;
-};
-
-
-#endif // CRYINCLUDE_CRYCOMMON_IINDEXEDMESH_H
diff --git a/Code/CryEngine/CryCommon/IIndexedMesh_info.cpp b/Code/CryEngine/CryCommon/IIndexedMesh_info.cpp
deleted file mode 100644
index 11303ed16e..0000000000
--- a/Code/CryEngine/CryCommon/IIndexedMesh_info.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "TypeInfo_impl.h"
-#include <IIndexedMesh.h> // <> required for Interfuscator
-
-STRUCT_INFO_BEGIN(SMeshTexCoord)
-STRUCT_VAR_INFO(s, TYPE_INFO(float))
-STRUCT_VAR_INFO(t, TYPE_INFO(float))
-STRUCT_INFO_END(SMeshTexCoord)
-
-STRUCT_INFO_BEGIN(SMeshNormal)
-STRUCT_VAR_INFO(Normal, TYPE_INFO(Vec3))
-STRUCT_INFO_END(SMeshNormal)
-
-STRUCT_INFO_BEGIN(SMeshColor)
-STRUCT_VAR_INFO(r, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(g, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(b, TYPE_INFO(uint8))
-STRUCT_VAR_INFO(a, TYPE_INFO(uint8))
-STRUCT_INFO_END(SMeshColor)
-
-STRUCT_INFO_BEGIN(SMeshTangents)
-STRUCT_VAR_INFO(Tangent, TYPE_INFO(Vec4sf))
-STRUCT_VAR_INFO(Bitangent, TYPE_INFO(Vec4sf))
-STRUCT_INFO_END(SMeshTangents)
-
-STRUCT_INFO_BEGIN(SMeshQTangents)
-STRUCT_VAR_INFO(TangentBitangent, TYPE_INFO(Vec4sf))
-STRUCT_INFO_END(SMeshQTangents)
-
-STRUCT_INFO_BEGIN(SMeshBoneMapping_uint16)
-STRUCT_VAR_INFO(boneIds, TYPE_ARRAY(4, TYPE_INFO(SMeshBoneMapping_uint16::BoneId)))
-STRUCT_VAR_INFO(weights, TYPE_ARRAY(4, TYPE_INFO(SMeshBoneMapping_uint16::Weight)))
-STRUCT_INFO_END(SMeshBoneMapping_uint16)
-
-STRUCT_INFO_BEGIN(SMeshBoneMapping_uint8)
-STRUCT_VAR_INFO(boneIds, TYPE_ARRAY(4, TYPE_INFO(SMeshBoneMapping_uint8::BoneId)))
-STRUCT_VAR_INFO(weights, TYPE_ARRAY(4, TYPE_INFO(SMeshBoneMapping_uint8::Weight)))
-STRUCT_INFO_END(SMeshBoneMapping_uint8)
diff --git a/Code/CryEngine/CryCommon/ILevelSystem.h b/Code/CryEngine/CryCommon/ILevelSystem.h
deleted file mode 100644
index 949cf84c89..0000000000
--- a/Code/CryEngine/CryCommon/ILevelSystem.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Gathers level information. Loads a level.
-
-
-#ifndef CRYINCLUDE_CRYACTION_ILEVELSYSTEM_H
-#define CRYINCLUDE_CRYACTION_ILEVELSYSTEM_H
-#pragma once
-
-#include <CrySizer.h>
-#include <IXml.h>
-#include <AzCore/Asset/AssetCommon.h>
-
-struct IConsoleCmdArgs;
-
-namespace AZ::IO
-{
-    struct IArchive;
-}
-
-// [LYN-2376] Remove once legacy slice support is removed
-struct ILevelInfo
-{
-    virtual ~ILevelInfo() = default;
-
-    virtual const char* GetName() const = 0;
-    virtual const char* GetPath() const = 0;
-    virtual const char* GetAssetName() const = 0;
-};
-
-
-/*!
- * Extend this class and call ILevelSystem::AddListener() to receive level system related events.
- */
-struct ILevelSystemListener
-{
-    virtual ~ILevelSystemListener() = default;
-    //! Called when loading a level fails due to it not being found.
-    virtual void OnLevelNotFound([[maybe_unused]] const char* levelName) {}
-    //! Called after ILevelSystem::PrepareNextLevel() completes.
-    virtual void OnPrepareNextLevel([[maybe_unused]] const char* levelName) {}
-    //! Called after ILevelSystem::OnLoadingStart() completes, before the level actually starts loading.
-    virtual void OnLoadingStart([[maybe_unused]] const char* levelName) {}
-    //! Called after the level finished
-    virtual void OnLoadingComplete([[maybe_unused]] const char* levelName) {}
-    //! Called when there's an error loading a level, with the level info and a description of the error.
-    virtual void OnLoadingError([[maybe_unused]] const char* levelName, [[maybe_unused]] const char* error) {}
-    //! Called whenever the loading status of a level changes. progressAmount goes from 0->100.
-    virtual void OnLoadingProgress([[maybe_unused]] const char* levelName, [[maybe_unused]] int progressAmount) {}
-    //! Called after a level is unloaded, before the data is freed.
-    virtual void OnUnloadComplete([[maybe_unused]] const char* levelName) {}
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { }
-};
-
-struct ILevelSystem
-{
-    virtual ~ILevelSystem() = default;
-
-    virtual void Release() = 0;
-
-    virtual void AddListener(ILevelSystemListener* pListener) = 0;
-    virtual void RemoveListener(ILevelSystemListener* pListener) = 0;
-
-    virtual bool LoadLevel(const char* levelName) = 0;
-    virtual void UnloadLevel() = 0;
-    virtual bool IsLevelLoaded() = 0;
-    virtual const char* GetCurrentLevelName() const = 0;
-
-    // If the level load failed then we need to have a different shutdown procedure vs when a level is naturally unloaded
-    virtual void SetLevelLoadFailed(bool loadFailed) = 0;
-    virtual bool GetLevelLoadFailed() = 0;
-
-    virtual AZ::Data::AssetType GetLevelAssetType() const = 0;
-
-    static const char* GetLevelsDirectoryName()
-    {
-        return LevelsDirectoryName;
-    }
-
-    // [LYN-2376] Deprecated methods, to be removed once slices are removed:
-    virtual void Rescan(const char* levelsFolder) = 0;
-    virtual int GetLevelCount() = 0;
-    virtual ILevelInfo* GetLevelInfo(int level) = 0;
-    virtual ILevelInfo* GetLevelInfo(const char* levelName) = 0;
-
-protected:
-
-    static constexpr const char* LevelsDirectoryName = "levels";
-};
-
-#endif // CRYINCLUDE_CRYACTION_ILEVELSYSTEM_H
diff --git a/Code/CryEngine/CryCommon/ILocalizationManager.h b/Code/CryEngine/CryCommon/ILocalizationManager.h
deleted file mode 100644
index 207baeee7d..0000000000
--- a/Code/CryEngine/CryCommon/ILocalizationManager.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ILOCALIZATIONMANAGER_H
-#define CRYINCLUDE_CRYCOMMON_ILOCALIZATIONMANAGER_H
-#pragma once
-
-#include "LocalizationManagerBus.h"
-//#include <platform.h> // Needed for LARGE_INTEGER (for consoles).
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-// Forward declarations
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-class XmlNodeRef;
-
-//////////////////////////////////////////////////////////////////////////
-// Localized strings manager interface.
-//////////////////////////////////////////////////////////////////////////
-
-// Localization Info structure
-struct SLocalizedInfoGame
-{
-    SLocalizedInfoGame ()
-        : szCharacterName(NULL)
-        , bUseSubtitle(false)
-    {
-    }
-
-    const char* szCharacterName;
-    string sUtf8TranslatedText;
-
-    bool bUseSubtitle;
-};
-
-struct SLocalizedAdvancesSoundEntry
-{
-    string  sName;
-    float       fValue;
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(sName);
-    }
-};
-
-// Localization Sound Info structure, containing sound related parameters.
-struct SLocalizedSoundInfoGame
-    : public SLocalizedInfoGame
-{
-    SLocalizedSoundInfoGame()
-        : sSoundEvent(NULL)
-        , fVolume(0.f)
-        , fRadioRatio (0.f)
-        , bIsDirectRadio(false)
-        , bIsIntercepted(false)
-        , nNumSoundMoods(0)
-        , pSoundMoods (NULL)
-        , nNumEventParameters(0)
-        , pEventParameters(NULL)
-    {
-    }
-
-    const char* sSoundEvent;
-    float fVolume;
-    float fRadioRatio;
-    bool    bIsDirectRadio;
-    bool    bIsIntercepted;
-
-    // SoundMoods.
-    int         nNumSoundMoods;
-    SLocalizedAdvancesSoundEntry* pSoundMoods;
-
-    // EventParameters.
-    int         nNumEventParameters;
-    SLocalizedAdvancesSoundEntry* pEventParameters;
-};
-
-// Localization Sound Info structure, containing sound related parameters.
-struct SLocalizedInfoEditor
-    : public SLocalizedInfoGame
-{
-    SLocalizedInfoEditor()
-        : sKey(NULL)
-        , sOriginalCharacterName(NULL)
-        , sOriginalActorLine(NULL)
-        , sUtf8TranslatedActorLine(NULL)
-        , nRow(0)
-    {
-    }
-
-    const char* sKey;
-    const char* sOriginalCharacterName;
-    const char* sOriginalActorLine;
-    const char* sUtf8TranslatedActorLine;
-    unsigned int nRow;
-};
-
-// Summary:
-//      Interface to the Localization Manager.
-struct ILocalizationManager
-    : public LocalizationManagerRequestBus::Handler
-{
-    //Platform independent language IDs. These are used to map the platform specific language codes to localization pakfiles
-    //Please ensure that each entry in this enum has a corresponding entry in the PLATFORM_INDEPENDENT_LANGUAGE_NAMES array which is defined in LocalizedStringManager.cpp currently.
-    enum EPlatformIndependentLanguageID
-    {
-        ePILID_English_US,
-        ePILID_English_GB,
-        ePILID_German_DE,
-        ePILID_Russian_RU,
-        ePILID_Polish_PL,
-        ePILID_Turkish_TR,
-        ePILID_Spanish_ES,
-        ePILID_Spanish_MX,
-        ePILID_French_FR,
-        ePILID_French_CA,
-        ePILID_Italian_IT,
-        ePILID_Portugese_PT,
-        ePILID_Portugese_BR,
-        ePILID_Japanese_JP,
-        ePILID_Korean_KR,
-        ePILID_Chinese_T,
-        ePILID_Chinese_S,
-        ePILID_Dutch_NL,
-        ePILID_Finnish_FI,
-        ePILID_Swedish_SE,
-        ePILID_Czech_CZ,
-        ePILID_Norwegian_NO,
-        ePILID_Arabic_SA,
-        ePILID_Danish_DK,
-        ePILID_MAX_OR_INVALID,   //Not a language, denotes the maximum number of languages or an unknown language
-    };
-
-    typedef uint32 TLocalizationBitfield;
-
-    // <interfuscator:shuffle>
-    virtual ~ILocalizationManager(){}
-    virtual const char* LangNameFromPILID(const ILocalizationManager::EPlatformIndependentLanguageID id) = 0;
-    virtual ILocalizationManager::EPlatformIndependentLanguageID PILIDFromLangName(AZStd::string langName) = 0;
-    virtual ILocalizationManager::EPlatformIndependentLanguageID GetSystemLanguage() { return ILocalizationManager::EPlatformIndependentLanguageID::ePILID_English_US; }
-    virtual ILocalizationManager::TLocalizationBitfield MaskSystemLanguagesFromSupportedLocalizations(const ILocalizationManager::TLocalizationBitfield systemLanguages) = 0;
-    virtual ILocalizationManager::TLocalizationBitfield IsLanguageSupported(const ILocalizationManager::EPlatformIndependentLanguageID id) = 0;
-    virtual bool SetLanguage([[maybe_unused]] const char* sLanguage) override { return false; }
-    virtual const char* GetLanguage() override { return nullptr; }
-
-    virtual int GetLocalizationFormat() const { return -1; }
-    virtual AZStd::string GetLocalizedSubtitleFilePath([[maybe_unused]] const AZStd::string& localVideoPath, [[maybe_unused]] const AZStd::string& subtitleFileExtension) const { return ""; }
-    virtual AZStd::string GetLocalizedLocXMLFilePath([[maybe_unused]] const AZStd::string& localXmlPath) const { return ""; }
-    // load the descriptor file with tag information
-    virtual bool InitLocalizationData(const char* sFileName, bool bReload = false) = 0;
-    // request to load loca data by tag. Actual loading will happen during next level load begin event.
-    virtual bool RequestLoadLocalizationDataByTag(const char* sTag) = 0;
-    // direct load of loca data by tag
-    virtual bool LoadLocalizationDataByTag(const char* sTag, bool bReload = false) = 0;
-    virtual bool ReleaseLocalizationDataByTag(const char* sTag) = 0;
-
-    virtual bool LoadAllLocalizationData(bool bReload = false) = 0;
-    virtual bool LoadExcelXmlSpreadsheet([[maybe_unused]] const char* sFileName, [[maybe_unused]] bool bReload = false) override { return false; }
-    virtual void ReloadData() override {};
-
-    // Summary:
-    //   Free localization data.
-    virtual void FreeData() = 0;
-
-    // Summary:
-    //   Translate a string into the currently selected language.
-    // Description:
-    //   Processes the input string and translates all labels contained into the currently selected language.
-    // Parameters:
-    //   sString             - String to be translated.
-    //   outLocalizedString  - Translated version of the string.
-    //   bEnglish            - if true, translates the string into the always present English language.
-    // Returns:
-    //   true if localization was successful, false otherwise
-    virtual bool LocalizeString_ch([[maybe_unused]] const char* sString, [[maybe_unused]] string& outLocalizedString, [[maybe_unused]] bool bEnglish = false) override { return false; }
-
-    // Summary:
-    //   Same as LocalizeString( const char* sString, string& outLocalizedString, bool bEnglish=false )
-    //   but at the moment this is faster.
-    virtual bool LocalizeString_s([[maybe_unused]] const string& sString, [[maybe_unused]] string& outLocalizedString, [[maybe_unused]] bool bEnglish = false) override { return false; }
-
-    // Summary:
-    virtual void LocalizeAndSubstituteInternal([[maybe_unused]] AZStd::string& locString, [[maybe_unused]] const AZStd::vector<AZStd::string>& keys, [[maybe_unused]] const AZStd::vector<AZStd::string>& values) override {}
-    //   Return the localized version corresponding to a label.
-    // Description:
-    //   A label has to start with '@' sign.
-    // Parameters:
-    //   sLabel              - Label to be translated, must start with '@' sign.
-    //   outLocalizedString  - Localized version of the label.
-    //   bEnglish            - if true, returns the always present English version of the label.
-    // Returns:
-    //   True if localization was successful, false otherwise.
-    virtual bool LocalizeLabel([[maybe_unused]] const char* sLabel, [[maybe_unused]] string& outLocalizedString, [[maybe_unused]] bool bEnglish = false) override { return false; }
-    virtual bool IsLocalizedInfoFound([[maybe_unused]] const char* sKey) { return false; }
-
-    // Summary:
-    //   Get localization info structure corresponding to a key (key=label without the '@' sign).
-    // Parameters:
-    //   sKey    - Key to be looked up. Key = Label without '@' sign.
-    //   outGameInfo - Reference to localization info structure to be filled in.
-    //  Returns:
-    //    True if info for key was found, false otherwise.
-    virtual bool GetLocalizedInfoByKey(const char* sKey, SLocalizedInfoGame& outGameInfo) = 0;
-
-    // Summary:
-    //   Get the sound localization info structure corresponding to a key.
-    // Parameters:
-    //   sKey         - Key to be looked up. Key = Label without '@' sign.
-    //   outSoundInfo - reference to sound info structure to be filled in
-    //                                  pSoundMoods requires nNumSoundMoods-times allocated memory
-    //                                  on return nNumSoundMoods will hold how many SoundsMood entries are needed
-    //                                  pEventParameters requires nNumEventParameters-times allocated memory
-    //                                  on return nNumEventParameters will hold how many EventParameter entries are needed
-    //                                  Passing 0 in the Num fields will make the query ignore checking for allocated memory
-    // Returns:
-    //   True if successful, false otherwise (key not found, or not enough memory provided to write additional info).
-    virtual bool GetLocalizedInfoByKey(const char* sKey, SLocalizedSoundInfoGame* pOutSoundInfo) = 0;
-
-    // Summary:
-    //   Return number of localization entries.
-    virtual int  GetLocalizedStringCount() override { return -1; }
-
-    // Summary:
-    //   Get the localization info structure at index nIndex.
-    // Parameters:
-    //   nIndex  - Index.
-    //   outEditorInfo - Reference to localization info structure to be filled in.
-    // Returns:
-    //   True if successful, false otherwise (out of bounds).
-    virtual bool GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoEditor& outEditorInfo) = 0;
-
-    // Summary:
-    //   Get the localization info structure at index nIndex.
-    // Parameters:
-    //   nIndex  - Index.
-    //   outGameInfo - Reference to localization info structure to be filled in.
-    // Returns:
-    //   True if successful, false otherwise (out of bounds).
-    virtual bool GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoGame& outGameInfo) = 0;
-
-    // Summary:
-    //   Get the english localization info structure corresponding to a key.
-    // Parameters:
-    //   sKey         - Key to be looked up. Key = Label without '@' sign.
-    //   sLocalizedString - Corresponding english language string.
-    // Returns:
-    //   True if successful, false otherwise (key not found).
-    virtual bool GetEnglishString([[maybe_unused]] const char* sKey, [[maybe_unused]] string& sLocalizedString) override { return false; }
-
-    // Summary:
-    //   Get Subtitle for Key or Label .
-    // Parameters:
-    //   sKeyOrLabel    - Key or Label to be used for subtitle lookup. Key = Label without '@' sign.
-    //   outSubtitle    - Subtitle (untouched if Key/Label not found).
-    //   bForceSubtitle - If true, get subtitle (sLocalized or sEnglish) even if not specified in Data file.
-    // Returns:
-    //   True if subtitle found (and outSubtitle filled in), false otherwise.
-    virtual bool GetSubtitle([[maybe_unused]] const char* sKeyOrLabel, [[maybe_unused]] string& outSubtitle, [[maybe_unused]] bool bForceSubtitle = false) override { return false; }
-
-    // Description:
-    //      These methods format outString depending on sString with ordered arguments
-    //      FormatStringMessage(outString, "This is %2 and this is %1", "second", "first");
-    // Arguments:
-    //      outString - This is first and this is second.
-    virtual void FormatStringMessage_List([[maybe_unused]] string& outString, [[maybe_unused]] const string& sString, [[maybe_unused]] const char** sParams, [[maybe_unused]] int nParams) override {}
-    virtual void FormatStringMessage([[maybe_unused]] string& outString, [[maybe_unused]] const string& sString, [[maybe_unused]] const char* param1, [[maybe_unused]] const char* param2 = 0, [[maybe_unused]] const char* param3 = 0, [[maybe_unused]] const char* param4 = 0) override {}
-
-    virtual void LocalizeTime([[maybe_unused]] time_t t, [[maybe_unused]] bool bMakeLocalTime, [[maybe_unused]] bool bShowSeconds, [[maybe_unused]] string& outTimeString) override {}
-    virtual void LocalizeDate([[maybe_unused]] time_t t, [[maybe_unused]] bool bMakeLocalTime, [[maybe_unused]] bool bShort, [[maybe_unused]] bool bIncludeWeekday, [[maybe_unused]] string& outDateString) override {}
-    virtual void LocalizeDuration([[maybe_unused]] int seconds, [[maybe_unused]] string& outDurationString) override {}
-    virtual void LocalizeNumber([[maybe_unused]] int number, [[maybe_unused]] string& outNumberString) override {}
-    virtual void LocalizeNumber_Decimal([[maybe_unused]] float number, [[maybe_unused]] int decimals, [[maybe_unused]] string& outNumberString) override {}
-
-    // Summary:
-    //   Returns true if the project has localization configured for use, false otherwise.
-    virtual bool ProjectUsesLocalization() const override { return false; }
-    // </interfuscator:shuffle>
-
-    static ILINE TLocalizationBitfield LocalizationBitfieldFromPILID(EPlatformIndependentLanguageID pilid)
-    {
-        assert(pilid >= 0 && pilid < ePILID_MAX_OR_INVALID);
-        return (1 << pilid);
-    }
-};
-
-// Summary:
-//      Simple bus that notifies listeners that the language (g_language) has changed.
-
-
-
-
-#endif // CRYINCLUDE_CRYCOMMON_ILOCALIZATIONMANAGER_H
diff --git a/Code/CryEngine/CryCommon/ILog.h b/Code/CryEngine/CryCommon/ILog.h
deleted file mode 100644
index ad1c84f3de..0000000000
--- a/Code/CryEngine/CryCommon/ILog.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// In Mac, including ILog without including platform.h first fails because platform.h 
-// includes CryThread.h which includes CryThread_pthreads.h which uses ILog. 
-// So plaform.h needs the contents of ILog.h.
-// By including platform.h outside of the guard, we give platform.h the right include order
-#include <platform.h>
-
-#ifndef CRYINCLUDE_CRYCOMMON_ILOG_H
-#define CRYINCLUDE_CRYCOMMON_ILOG_H
-#pragma once
-
-#include <IMiniLog.h> // <> required for Interfuscator
-
-// enable this define to support log scopes to provide more context information for log lines
-// this code is disable by default due it's runtime cost
-//#define SUPPORT_LOG_IDENTER
-
-// forward declarations
-class ICrySizer;
-
-// Summary:
-//   Callback interface to the ILog.
-struct ILogCallback
-{
-    // <interfuscator:shuffle>
-    virtual ~ILogCallback() {}
-    //OnWrite will always be called even if verbosity settings cause OnWriteToConsole and OnWriteToFile to not be called.
-    virtual void OnWrite(const char* sText, IMiniLog::ELogType type) = 0;
-    virtual void OnWriteToConsole(const char* sText, bool bNewLine) = 0;
-    virtual void OnWriteToFile(const char* sText, bool bNewLine) = 0;
-    // </interfuscator:shuffle>
-};
-
-// Summary:
-//   Interface for logging operations based on IMiniLog.
-// Notes:
-//   Logging in CryEngine should be done using the following global functions:
-//      CryLog (eMessage)
-//      CryLogAlways (eAlways)
-//      CryError (eError)
-//      CryWarning (eWarning)
-//      CryComment (eComment)
-//   ILog gives you more control on logging operations.
-// See also:
-//   IMiniLog, CryLog, CryLogAlways, CryError, CryWarning
-struct ILog
-    : public IMiniLog
-{
-    // <interfuscator:shuffle>
-    virtual void Release() = 0;
-
-    // Summary:
-    //   Sets the file used to log to disk.
-    //   if you don't specify the full path it will be assumed relative to the 'log folder'
-    //   dobackups controls whether or not it will backup old logs when creating new ones.
-    virtual bool SetFileName(const char* fileNameOrFullPath, bool doBackups) = 0;
-
-    // Summary:
-    //   Gets the filename used to log to disk.
-    virtual const char* GetFileName() = 0;
-
-    // Summary:
-    //   Gets the filename where the current log backup was copied to on disk
-    virtual const char* GetBackupFileName() = 0;
-
-    //all the following functions will be removed are here just to be able to compile the project ---------------------------
-
-    // Summary:
-    //   Logs the text both to file and console.
-    virtual void    Log(const char* szCommand, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    virtual void    LogAlways(const char* szCommand, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    virtual void    LogWarning(const char* szCommand, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    virtual void    LogError(const char* szCommand, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    // Summary:
-    //   Logs the text both to the end of file and console.
-    virtual void    LogPlus(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    // Summary:
-    //   Logs to the file specified in SetFileName.
-    // See also:
-    //   SetFileName
-    virtual void    LogToFile(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    //
-    virtual void    LogToFilePlus(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    // Summary:
-    //   Logs to console only.
-    virtual void    LogToConsole(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    //
-    virtual void    LogToConsolePlus(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    //
-    virtual void    UpdateLoadingScreen(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    //
-    virtual void RegisterConsoleVariables() {}
-
-    //
-    virtual void UnregisterConsoleVariables() {}
-
-    // Notes:
-    //   Full logging (to console and file) can be enabled with verbosity 4.
-    //   In the console 'log_Verbosity 4' command can be used.
-    virtual void    SetVerbosity(int verbosity) = 0;
-
-    virtual int     GetVerbosityLevel() = 0;
-
-    virtual void  AddCallback(ILogCallback* pCallback) = 0;
-    virtual void  RemoveCallback(ILogCallback* pCallback) = 0;
-
-    // Notes:
-    //   The function called every frame by system.
-    virtual void Update() = 0;
-
-    virtual const char* GetModuleFilter() = 0;
-
-    // Notes:
-    //   Collect memory statistics in CrySizer
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-
-    // Asset scope strings help to figure out asset dependencies in case of asset loading errors.
-    // Should not be used directly, only by using define CRY_DEFINE_ASSET_SCOPE
-    // @see CRY_DEFINE_ASSET_SCOPE
-    virtual void PushAssetScopeName([[maybe_unused]] const char* sAssetType, [[maybe_unused]] const char* sName) {};
-    virtual void PopAssetScopeName() {};
-    virtual const char* GetAssetScopeString() { return ""; };
-    // </interfuscator:shuffle>
-
-#if defined(SUPPORT_LOG_IDENTER)
-    virtual void Indent(class CLogIndenter* indenter) = 0;
-    virtual void Unindent(class CLogIndenter* indenter) = 0;
-#endif
-
-#if !defined(RESOURCE_COMPILER)
-    virtual void FlushAndClose() = 0;
-#endif
-};
-
-#if !defined(SUPPORT_LOG_IDENTER)
-#define INDENT_LOG_DURING_SCOPE(...) (void)(0)
-#define CRY_DEFINE_ASSET_SCOPE(sAssetType, sAssetName) (void)(0)
-#else
-class CLogIndenter
-{
-public:
-    CLogIndenter(ILog* log)
-        : m_log(log)
-        , m_enabled(false)
-        , m_nextIndenter(NULL)
-        , m_needToPrintSectionText(false)
-    {
-    }
-
-    void Enable(bool enable = true, const char* sectionTextFormat = NULL, ...)
-    {
-        va_list args;
-        va_start (args, sectionTextFormat);
-
-        enable &= (m_log != NULL);
-
-        if (enable != m_enabled)
-        {
-            if (sectionTextFormat && enable)
-            {
-                char buffer[1024];
-
-                vsnprintf(buffer, sizeof(buffer), sectionTextFormat, args);
-                buffer[sizeof(buffer) - 1] = '\0';
-
-                m_sectionText = buffer;
-                m_needToPrintSectionText = true;
-            }
-            else
-            {
-                m_sectionText = "";
-                m_needToPrintSectionText = m_nextIndenter ? m_nextIndenter->m_needToPrintSectionText : false;
-            }
-
-            assert(m_log);
-
-            if (enable)
-            {
-                m_log->Indent(this);
-            }
-            else
-            {
-                m_log->Unindent(this);
-            }
-            m_enabled = enable;
-        }
-
-        va_end (args);
-    }
-
-    CLogIndenter* GetNextIndenter()
-    {
-        return m_nextIndenter;
-    }
-
-    void SetNextIndenter(CLogIndenter* indenter)
-    {
-        m_nextIndenter = indenter;
-    }
-
-    void DisplaySectionText()
-    {
-        if (m_needToPrintSectionText)
-        {
-            m_needToPrintSectionText = false;
-            string sectionText = m_sectionText;
-            Enable(false);
-
-            if (m_nextIndenter)
-            {
-                m_nextIndenter->DisplaySectionText();
-            }
-
-            if (!sectionText.empty())
-            {
-                assert (m_log);
-                m_log->Log ("%s", sectionText.c_str());
-            }
-            Enable(true);
-        }
-    }
-
-    ~CLogIndenter()
-    {
-        Enable(false);
-    }
-
-private:
-    bool m_enabled;
-    bool m_needToPrintSectionText;
-    ILog* m_log;
-    CLogIndenter* m_nextIndenter;
-    string m_sectionText;
-};
-
-class CLogAssetScopeName
-{
-    ILog* m_pLog;
-public:
-    CLogAssetScopeName(ILog* pLog, const char* sAssetType, const char* sAssetName)
-        : m_pLog(pLog) { pLog->PushAssetScopeName(sAssetType, sAssetName); }
-    ~CLogAssetScopeName() { m_pLog->PopAssetScopeName(); }
-};
-
-#define ILOG_CONCAT_IMPL(x, y) x##y
-#define ILOG_CONCAT_MACRO(x, y) ILOG_CONCAT_IMPL(x, y)
-#define INDENT_LOG_DURING_SCOPE(...) CLogIndenter ILOG_CONCAT_MACRO(indentMe, __LINE__) ((CryGetCurrentThreadId() == gEnv->mMainThreadId) ? gEnv->pLog : NULL); ILOG_CONCAT_MACRO(indentMe, __LINE__).Enable(__VA_ARGS__)
-
-#define CRY_DEFINE_ASSET_SCOPE(sAssetType, sAssetName) CLogAssetScopeName __asset_scope_name(gEnv->pLog, sAssetType, sAssetName);
-#endif
-
-
-#endif // CRYINCLUDE_CRYCOMMON_ILOG_H
-
-
-
diff --git a/Code/CryEngine/CryCommon/IMNM.h b/Code/CryEngine/CryCommon/IMNM.h
deleted file mode 100644
index 6aace5024c..0000000000
--- a/Code/CryEngine/CryCommon/IMNM.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef __IMNM_H__
-#define __IMNM_H__
-
-#pragma once
-
-namespace MNM
-{
-    namespace Constants
-    {
-        enum Edges
-        {
-            InvalidEdgeIndex = ~0u
-        };
-
-        enum TileIdConstants
-        {
-            InvalidTileID = 0,
-        };
-        enum TriangleIDConstants
-        {
-            InvalidTriangleID = 0,
-        };
-
-        enum EStaticIsland
-        {
-            eStaticIsland_InvalidIslandID = 0,
-            eStaticIsland_FirstValidIslandID = 1,
-        };
-        enum EGlobalIsland
-        {
-            eGlobalIsland_InvalidIslandID = 0,
-        };
-
-        enum EOffMeshLink
-        {
-            eOffMeshLinks_InvalidOffMeshLinkID = 0,
-        };
-    }
-
-    // ------------------------------------------------------------------------------------------
-    // Basic types used in the MNM namespace
-
-    typedef uint32 TileID;
-    typedef uint32 TriangleID;
-    typedef uint32 OffMeshLinkID;
-
-    // StaticIslandIDs identify triangles that are statically connected inside a mesh
-    // and that are reachable without the use of any off mesh links.
-    typedef uint32 StaticIslandID;
-
-    // GlobalIslandIDs define IDs able to code and connect islands between meshes.
-    struct GlobalIslandID
-    {
-        GlobalIslandID(const uint64 defaultValue = MNM::Constants::eGlobalIsland_InvalidIslandID)
-            : id(defaultValue)
-        {
-            STATIC_ASSERT(sizeof(StaticIslandID) <= 4, "The maximum supported size for StaticIslandIDs is 4 bytes.");
-        }
-
-        GlobalIslandID(const uint32 navigationMeshID, const MNM::StaticIslandID islandID)
-        {
-            id = ((uint64)navigationMeshID << 32) | islandID;
-        }
-
-        GlobalIslandID operator=(const GlobalIslandID other)
-        {
-            id = other.id;
-            return *this;
-        }
-
-        inline bool operator==(const GlobalIslandID& rhs) const
-        {
-            return id == rhs.id;
-        }
-
-        inline bool operator<(const GlobalIslandID& rhs) const
-        {
-            return id < rhs.id;
-        }
-
-        MNM::StaticIslandID GetStaticIslandID() const
-        {
-            return (MNM::StaticIslandID) (id & ((uint64)1 << 32) - 1);
-        }
-
-        uint32 GetNavigationMeshIDAsUint32() const
-        {
-            return static_cast<uint32>(id >> 32);
-        }
-
-        uint64 id;
-    };
-}
-
-#endif // __IMNM_H__
diff --git a/Code/CryEngine/CryCommon/IMaterial.h b/Code/CryEngine/CryCommon/IMaterial.h
deleted file mode 100644
index 02153cd031..0000000000
--- a/Code/CryEngine/CryCommon/IMaterial.h
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : IMaterial interface declaration.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IMATERIAL_H
-#define CRYINCLUDE_CRYCOMMON_IMATERIAL_H
-#pragma once
-
-struct ISurfaceType;
-struct ISurfaceTypeManager;
-class ICrySizer;
-
-enum EEfResTextures : int; // Need to specify a fixed size for the forward declare to work on clang
-struct IRenderShaderResources;
-struct SEfTexModificator;
-struct SInputShaderResources;
-
-struct SShaderItem;
-struct SShaderParam;
-struct IShader;
-struct IShaderPublicParams;
-struct IMaterial;
-struct IMaterialManager;
-struct CMaterialCGF;
-struct CRenderChunk;
-struct IRenderMesh;
-
-#include <Tarray.h>
-#include <IXml.h>
-#include <smartptr.h>
-#include <AzCore/EBus/EBus.h>
-
-#ifdef MAX_SUB_MATERIALS
-// This checks that the values are in sync in the different files.
-COMPILE_TIME_ASSERT(MAX_SUB_MATERIALS == 128);
-#else
-#define MAX_SUB_MATERIALS 128
-#endif
-
-// Special names for materials.
-#define MTL_SPECIAL_NAME_COLLISION_PROXY "collision_proxy"
-#define MTL_SPECIAL_NAME_COLLISION_PROXY_VEHICLE "nomaterial_vehicle"
-#define MTL_SPECIAL_NAME_RAYCAST_PROXY "raycast_proxy"
-
-namespace AZ
-{
-    class MaterialNotificationEvents : public AZ::EBusTraits
-    {
-    public:
-        virtual ~MaterialNotificationEvents() {}
-
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        static const bool EnableEventQueue = true;
-        using EventQueueMutexType = AZStd::mutex;
-
-
-        virtual void OnShaderLoaded([[maybe_unused]] IShader* shader) {}
-    };
-    using MaterialNotificationEventBus = AZ::EBus<MaterialNotificationEvents>;
-}
-
-enum
-{
-    MAX_STREAM_PREDICTION_ZONES = 2
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//    IMaterial is an interface to the material object, SShaderItem host which is a combination of IShader and SShaderInputResources.
-//    Material bind together rendering algorithm (Shader) and resources needed to render this shader, textures, colors, etc...
-//    All materials except for pure sub material childs have a unique name which directly represent .mtl file on disk.
-//    Ex: "Materials/Fire/Burn"
-//    Materials can be created by Sandbox MaterialEditor.
-//////////////////////////////////////////////////////////////////////////
-enum EMaterialFlags
-{
-    MTL_FLAG_WIRE                       = 0x0001,   // Use wire frame rendering for this material.
-    MTL_FLAG_2SIDED                     = 0x0002,   // Use 2 Sided rendering for this material.
-    MTL_FLAG_ADDITIVE                   = 0x0004,   // Use Additive blending for this material.
-    //MTL_FLAG_DETAIL_DECAL               = 0x0008,   // UNUSED RESERVED FOR LEGACY REASONS
-    MTL_FLAG_LIGHTING                   = 0x0010,   // Should lighting be applied on this material.
-    MTL_FLAG_NOSHADOW                   = 0x0020,   // Material do not cast shadows.
-    MTL_FLAG_ALWAYS_USED                = 0x0040,   // When set forces material to be export even if not explicitly used.
-    MTL_FLAG_PURE_CHILD                 = 0x0080,   // Not shared sub material, sub material unique to his parent multi material.
-    MTL_FLAG_MULTI_SUBMTL               = 0x0100,   // This material is a multi sub material.
-    MTL_FLAG_NOPHYSICALIZE              = 0x0200,   // Should not physicalize this material.
-    MTL_FLAG_NODRAW                     = 0x0400,   // Do not render this material.
-    MTL_FLAG_NOPREVIEW                  = 0x0800,   // Cannot preview the material.
-    MTL_FLAG_NOTINSTANCED               = 0x1000,   // Do not instantiate this material.
-    MTL_FLAG_COLLISION_PROXY            = 0x2000,   // This material is the collision proxy.
-    MTL_FLAG_SCATTER                    = 0x4000,   // Use scattering for this material
-    MTL_FLAG_REQUIRE_FORWARD_RENDERING  = 0x8000,   // This material has to be rendered in forward rendering passes (alpha/additive blended)
-    MTL_FLAG_NON_REMOVABLE              = 0x10000,  // Material with this flag once created are never removed from material manager (Used for decal materials, this flag should not be saved).
-    MTL_FLAG_HIDEONBREAK                = 0x20000,  // Non-physicalized subsets with such materials will be removed after the object breaks
-    MTL_FLAG_UIMATERIAL                 = 0x40000,  // Used for UI in Editor. Don't need show it DB.
-    MTL_64BIT_SHADERGENMASK             = 0x80000,  // ShaderGen mask is remapped
-    MTL_FLAG_RAYCAST_PROXY              = 0x100000,
-    MTL_FLAG_REQUIRE_NEAREST_CUBEMAP    = 0x200000, // materials with alpha blending requires special processing for shadows
-    MTL_FLAG_CONSOLE_MAT                = 0x400000,
-    MTL_FLAG_DELETE_PENDING             = 0x800000, // Internal use only
-    MTL_FLAG_BLEND_TERRAIN              = 0x1000000,
-    MTL_FLAG_IS_TERRAIN                 = 0x2000000,// indication to the loader - Terrain type
-    MTL_FLAG_IS_SKY                     = 0x4000000,// indication to the loader - Sky type
-    MTL_FLAG_FOG_VOLUME_SHADING_QUALITY_HIGH= 0x8000000 // high vertex shading quality behaves more accurately with fog volumes.
-};
-
-#define MTL_FLAGS_SAVE_MASK (MTL_FLAG_WIRE | MTL_FLAG_2SIDED | MTL_FLAG_ADDITIVE |  MTL_FLAG_LIGHTING | \
-                             MTL_FLAG_NOSHADOW | MTL_FLAG_MULTI_SUBMTL | MTL_FLAG_SCATTER | MTL_FLAG_REQUIRE_FORWARD_RENDERING | MTL_FLAG_FOG_VOLUME_SHADING_QUALITY_HIGH | MTL_FLAG_HIDEONBREAK | MTL_FLAG_UIMATERIAL | MTL_64BIT_SHADERGENMASK | MTL_FLAG_REQUIRE_NEAREST_CUBEMAP | MTL_FLAG_CONSOLE_MAT | MTL_FLAG_BLEND_TERRAIN)
-
-// Post effects flags
-enum EPostEffectFlags
-{
-    POST_EFFECT_GHOST     = 0x1,
-    POST_EFFECT_HOLOGRAM  = 0x2,
-
-    POST_EFFECT_MASK = POST_EFFECT_GHOST | POST_EFFECT_HOLOGRAM
-};
-
-// Bit offsets for shader layer flags
-enum EMaterialLayerFlags
-{
-    // Active layers flags
-    MTL_LAYER_FROZEN = 0x0001,
-    MTL_LAYER_WET    = 0x0002,
-    MTL_LAYER_DYNAMICFROZEN = 0x0008,
-
-    // Usage flags
-    MTL_LAYER_USAGE_NODRAW = 0x0001,     // Layer is disabled
-    MTL_LAYER_USAGE_REPLACEBASE = 0x0002, // Replace base pass rendering with layer - optimization
-    MTL_LAYER_USAGE_FADEOUT = 0x0004,            // Layer doesn't render but still causes parent to fade out
-
-    // Blend offsets
-    MTL_LAYER_BLEND_FROZEN = 0xff000000,
-    MTL_LAYER_BLEND_WET    = 0x00fe0000,
-    MTL_LAYER_BLEND_DYNAMICFROZEN = 0x000000ff,
-
-    MTL_LAYER_FROZEN_MASK                   = 0xff,
-    MTL_LAYER_WET_MASK                      = 0xfe, // bit stolen
-    MTL_LAYER_DYNAMICFROZEN_MASK    = 0xff,
-
-    MTL_LAYER_BLEND_MASK = (MTL_LAYER_BLEND_FROZEN | MTL_LAYER_BLEND_WET | MTL_LAYER_BLEND_DYNAMICFROZEN),
-
-    // Slot count
-    MTL_LAYER_MAX_SLOTS = 3
-};
-
-// copy flags
-enum EMaterialCopyFlags
-{
-    // copy flags
-    MTL_COPY_DEFAULT  = 0,
-    MTL_COPY_NAME     = BIT(0),
-    MTL_COPY_TEXTURES = BIT(1),
-};
-
-struct IMaterialHelpers
-{
-    virtual ~IMaterialHelpers() {}
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual EEfResTextures FindTexSlot(const char* texName) const = 0;
-    virtual const char* FindTexName(EEfResTextures texSlot) const = 0;
-    virtual const char* LookupTexName(EEfResTextures texSlot) const = 0;
-    virtual const char* LookupTexDesc(EEfResTextures texSlot) const = 0;
-    virtual const char* LookupTexEnum(EEfResTextures texSlot) const = 0;
-    virtual const char* LookupTexSuffix(EEfResTextures texSlot) const = 0;
-    virtual bool IsAdjustableTexSlot(EEfResTextures texSlot) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual bool SetGetMaterialParamFloat(IRenderShaderResources& pShaderResources, const char* sParamName, float& v, bool bGet) const = 0;
-    virtual bool SetGetMaterialParamVec3(IRenderShaderResources& pShaderResources, const char* sParamName, Vec3& v, bool bGet) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetTexModFromXml(SEfTexModificator& pShaderResources, const XmlNodeRef& node) const = 0;
-    virtual void SetXmlFromTexMod(const SEfTexModificator& pShaderResources, XmlNodeRef& node) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetTexturesFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
-    virtual void SetXmlFromTextures( SInputShaderResources& pShaderResources, XmlNodeRef& node) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetVertexDeformFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
-    virtual void SetXmlFromVertexDeform(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetLightingFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
-    virtual void SetXmlFromLighting(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetShaderParamsFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
-    virtual void SetXmlFromShaderParams(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void MigrateXmlLegacyData(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
-};
-
-//////////////////////////////////////////////////////////////////////////////////////
-// Description:
-//    IMaterialLayer is group of material layer properties.
-//    Each layer is composed of shader item, specific layer textures, lod info, etc
-struct IMaterialLayer
-{
-    // <interfuscator:shuffle>
-    virtual ~IMaterialLayer(){}
-    // Reference counting
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-
-    // Description:
-    //    - Enable/disable layer usage
-    virtual void Enable(bool bEnable = true) = 0;
-    // Description:
-    //    - Check if layer enabled
-    virtual bool IsEnabled() const = 0;
-    // Description:
-    //    - Enable/disable fade out
-    virtual void FadeOut(bool bFadeOut = true) = 0;
-    // Description:
-    //    - Check if layer fades out
-    virtual bool DoesFadeOut() const = 0;
-    // Description:
-    //    - Set shader item
-    virtual void SetShaderItem(const _smart_ptr<IMaterial> pParentMtl, const SShaderItem& pShaderItem) = 0;
-    // Description:
-    //    - Return shader item
-    virtual const SShaderItem& GetShaderItem() const = 0;
-    virtual SShaderItem& GetShaderItem() = 0;
-    // Description:
-    //    - Set layer usage flags
-    virtual void SetFlags(uint8 nFlags) = 0;
-    // Description:
-    //    - Get layer usage flags
-    virtual uint8 GetFlags() const = 0;
-
-    // todo: layer specific textures support
-    //
-    // </interfuscator:shuffle>
-};
-
-struct IMaterial
-{
-    // TODO: Remove it!
-    //! default texture mapping
-    uint8 m_ucDefautMappingAxis;
-    float m_fDefautMappingScale;
-
-    // <interfuscator:shuffle>
-    virtual ~IMaterial() {};
-
-    //////////////////////////////////////////////////////////////////////////
-    // Reference counting.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-    virtual int GetNumRefs() = 0;
-
-    virtual IMaterialHelpers& GetMaterialHelpers() = 0;
-    virtual IMaterialManager* GetMaterialManager() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // material name
-    //////////////////////////////////////////////////////////////////////////
-    //! Set material name, (Do not use this directly
-    virtual void SetName(const char* pName) = 0;
-    //! Returns material name.
-    virtual const char* GetName() const = 0;
-
-    //! Set/get shader name. The shader name may include technique name so it could be deferent than GetShaderItem()->m_pShader->GetName().
-    virtual void SetShaderName(const char* pName) = 0;
-    virtual const char* GetShaderName() const = 0;
-
-    //! Material flags.
-    //! @see EMaterialFlags
-    virtual void SetFlags(int flags) = 0;
-    virtual int GetFlags() const = 0;
-    virtual void UpdateFlags() = 0;
-
-    // Returns true if this is the default material.
-    virtual bool IsDefault() = 0;
-
-    virtual int GetSurfaceTypeId() = 0;
-
-    // Assign a different surface type to this material.
-    virtual void SetSurfaceType(const char* sSurfaceTypeName) = 0;
-
-    virtual ISurfaceType* GetSurfaceType() = 0;
-
-    // shader item
-    virtual void ReleaseCurrentShaderItem() = 0;
-    virtual void SetShaderItem(const SShaderItem& _ShaderItem) = 0;
-    // [Alexey] EF_LoadShaderItem return value with RefCount = 1, so if you'll use SetShaderItem after EF_LoadShaderItem use Assign function
-    virtual void AssignShaderItem(const SShaderItem& _ShaderItem) = 0;
-    virtual SShaderItem& GetShaderItem() = 0;
-    virtual const SShaderItem& GetShaderItem() const = 0;
-
-    // Returns shader item for correct sub material or for single material.
-    // Even if this is not sub material or nSubMtlSlot is invalid it will return valid renderable shader item.
-    virtual SShaderItem& GetShaderItem(int nSubMtlSlot) = 0;
-    virtual const SShaderItem& GetShaderItem(int nSubMtlSlot) const = 0;
-
-    // Returns true if streamed in
-    virtual bool IsStreamedIn(const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES], IRenderMesh* pRenderMesh) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Sub materials access.
-    //////////////////////////////////////////////////////////////////////////
-    //! Returns number of child sub materials holded by this material.
-    virtual void SetSubMtlCount(int numSubMtl) = 0;
-    //! Returns number of child sub materials holded by this material.
-    virtual int GetSubMtlCount() = 0;
-    //! Return sub material at specified index.
-    virtual _smart_ptr<IMaterial> GetSubMtl(int nSlot) = 0;
-    // Assign material to the sub mtl slot.
-    // Must first allocate slots using SetSubMtlCount.
-    virtual void SetSubMtl(int nSlot, _smart_ptr<IMaterial> pMtl) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Layers access.
-    //////////////////////////////////////////////////////////////////////////
-    //! Returns number of layers in this material.
-    virtual void SetLayerCount(uint32 nCount) = 0;
-    //! Returns number of layers in this material.
-    virtual uint32 GetLayerCount() const = 0;
-    //! Set layer at slot id (### MUST ALOCATE SLOTS FIRST ### USING SetLayerCount)
-    virtual void SetLayer(uint32 nSlot, IMaterialLayer* pLayer) = 0;
-    //! Return active layer
-    virtual const IMaterialLayer* GetLayer(uint8 nLayersMask, uint8 nLayersUsageMask) const = 0;
-    //! Return layer at slot id
-    virtual const IMaterialLayer* GetLayer(uint32 nSlot) const = 0;
-    //! Create a new layer
-    virtual IMaterialLayer* CreateLayer() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Always get a valid material.
-    // If not multi material return this material.
-    // If Multi material return Default material if wrong id.
-    virtual _smart_ptr<IMaterial> GetSafeSubMtl(int nSlot) = 0;
-
-    // Description:
-    //    Fill an array of integeres representing surface ids of the sub materials or the material itself.
-    // Arguments:
-    //    pSurfaceIdsTable is a pointer to the array of int with size enough to hold MAX_SUB_MATERIALS surface type ids.
-    // Return:
-    //    number of filled items.
-    virtual int FillSurfaceTypeIds(int pSurfaceIdsTable[]) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // UserData used to link with the Editor.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetUserData(void* pUserData) = 0;
-    virtual void* GetUserData() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Set or get a material parameter value.
-    //! \param sParamName        - Name of the parameter
-    //! \param v                 - Input or output value depending on bGet
-    //! \param bGet              - If true, v is an output; if false, v is an input
-    //! \param allowShaderParam  - If true, and sParamName is not a built-in parameter of the Material, then custom shader parameters will be searched as well. Defaults to false to preserve legacy behavior.
-    //! \param materialIndex     - Index of the sub-material if this is a material group
-    //! return                   - True if sParamName was found
-    virtual bool SetGetMaterialParamFloat(const char* sParamName, float& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) = 0;
-    //! Set or get a material parameter value.
-    //! \param sParamName        - Name of the parameter
-    //! \param v                 - Input or output value depending on bGet
-    //! \param bGet              - If true, v is an output; if false, v is an input
-    //! \param allowShaderParam  - If true, and sParamName is not a built-in parameter of the Material, then custom shader parameters will be searched as well. Defaults to false to preserve legacy behavior.
-    //! \param materialIndex     - Index of the sub-material if this is a material group
-    //! return                   - True if sParamName was found
-    virtual bool SetGetMaterialParamVec3(const char* sParamName, Vec3& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) = 0;
-    //! Set or get a material parameter value.
-    //! \param sParamName        - Name of the parameter
-    //! \param v                 - Input or output value depending on bGet
-    //! \param bGet              - If true, v is an output; if false, v is an input
-    //! \param allowShaderParam  - If true, and sParamName is not a built-in parameter of the Material, then custom shader parameters will be searched as well. Defaults to false to preserve legacy behavior.
-    //! \param materialIndex     - Index of the sub-material if this is a material group
-    //! return                   - True if sParamName was found
-    virtual bool SetGetMaterialParamVec4(const char* sParamName, Vec4& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) = 0;
-
-    virtual void SetDirty(bool dirty = true) = 0;
-    virtual bool IsDirty() const = 0;
-
-    //! Returns true if the material is the parent of a group of materials
-    virtual bool IsMaterialGroup() const = 0;
-
-    //! Returns true if the material is a single material belongs to a material group
-    virtual bool IsSubMaterial() const = 0;
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-
-    virtual size_t GetResourceMemoryUsage(ICrySizer* pSizer) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Makes this specific material enter sketch mode.
-    // Current supported sketch modes:
-    //  - 0, no sketch.
-    //  - 1, normal sketch mode.
-    //  - 2, fast sketch mode.
-    virtual void SetSketchMode(int mode) = 0;
-
-    // Sets FT_DONT_STREAM flag for all textures used by the material
-    // If a stream is already in process, this will stop the stream and flush the device texture
-    virtual void DisableTextureStreaming() = 0;
-    //////////////////////////////////////////////////////////////////////////
-    // Tells to texture streamer to start loading textures asynchronously
-    //////////////////////////////////////////////////////////////////////////
-    virtual void RequestTexturesLoading(const float fMipFactor) = 0;
-
-    virtual void PrecacheMaterial(const float fEntDistance, struct IRenderMesh* pRenderMesh, bool bFullUpdate, bool bDrawNear = false) = 0;
-
-    // Estimates texture memory usage for this material
-    // When nMatID is not negative only caluclate for one sub-material
-    virtual int GetTextureMemoryUsage(ICrySizer* pSizer, int nMatID = -1) = 0;
-
-    // Set & retrieve a material link name
-    // This value by itself is not used by the material system per-se and hence
-    // has no real effect, however it is used on a higher level to tie related materials
-    // together, for example by procedural breakable glass to determine which material to
-    // switch to.
-    virtual void SetMaterialLinkName(const char* name) = 0;
-    virtual const char* GetMaterialLinkName() const = 0;
-    virtual void SetKeepLowResSysCopyForDiffTex() = 0;
-
-    virtual uint32 GetDccMaterialHash() const = 0;
-    virtual void SetDccMaterialHash(uint32 hash) = 0;
-
-    virtual CryCriticalSection& GetSubMaterialResizeLock() = 0;
-
-    virtual void UpdateShaderItems() = 0;
-
-    // </interfuscator:shuffle>
-};
-
-
-
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//     IMaterialManagerListener is a callback interface to listenen
-//     for special events of material manager, (used by Editor).
-struct IMaterialManagerListener
-{
-    // <interfuscator:shuffle>
-    virtual ~IMaterialManagerListener(){}
-    // Called when material manager tries to load a material.
-    //  nLoadingFlags - Zero or a bitwise combination of the flagas defined in ELoadingFlags.
-    virtual void OnCreateMaterial(_smart_ptr<IMaterial> pMaterial) = 0;
-    virtual void OnDeleteMaterial(_smart_ptr<IMaterial> pMaterial) = 0;
-    virtual bool IsCurrentMaterial(_smart_ptr<IMaterial> pMaterial) const = 0;
-    // </interfuscator:shuffle>
-};
-
-using IMaterialRef = _smart_ptr<IMaterial>;
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//     IMaterialManager interface provide access to the material manager
-//     implemented in 3d engine.
-struct IMaterialManager
-{
-    //! Loading flags
-    enum ELoadingFlags
-    {
-        ELoadingFlagsPreviewMode        = BIT(0),
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IMaterialManager(){}
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-
-    // Summary:
-    //   Creates a new material object and register it with the material manager
-    // Return Value:
-    //   A newly created object derived from IMaterial.
-    virtual _smart_ptr<IMaterial> CreateMaterial(const char* sMtlName, int nMtlFlags = 0) = 0;
-
-    // Summary:
-    //   Renames a material object
-    // Note:
-    //   Do not use IMaterial::SetName directly.
-    // Arguments:
-    //   pMtl - Pointer to a material object
-    //   sNewName - New name to assign to the material
-    virtual void RenameMaterial(_smart_ptr<IMaterial> pMtl, const char* sNewName) = 0;
-
-    // Description:
-    //    Finds named material.
-    virtual _smart_ptr<IMaterial> FindMaterial(const char* sMtlName) const = 0;
-
-    // Description:
-    //    Loads material.
-    //  nLoadingFlags - Zero or a bitwise combination of the values defined in ELoadingFlags.
-    virtual _smart_ptr<IMaterial> LoadMaterial(const char* sMtlName, bool bMakeIfNotFound = true, bool bNonremovable = false, unsigned long nLoadingFlags = 0) = 0;
-
-    // Description:
-    //    Loads material from xml.
-    virtual _smart_ptr<IMaterial> LoadMaterialFromXml(const char* sMtlName, XmlNodeRef mtlNode) = 0;
-
-    // Description:
-    //    Reloads the material from disk.
-    virtual void ReloadMaterial(_smart_ptr<IMaterial> pMtl) = 0;
-
-    // Description:
-    //    Saves material.
-    virtual bool SaveMaterial(XmlNodeRef mtlNode, _smart_ptr<IMaterial> pMtl) = 0;
-
-    // Description:
-    //    Clone single material or multi sub material.
-    // Arguments:
-    //    nSubMtl - when negative all sub materials of MultiSubMtl are cloned, if positive only specified slot is cloned.
-    virtual _smart_ptr<IMaterial> CloneMaterial(_smart_ptr<IMaterial> pMtl, int nSubMtl = -1) = 0;
-
-    // Description:
-    //    Copy single material.
-    virtual void CopyMaterial(_smart_ptr<IMaterial> pMtlSrc, _smart_ptr<IMaterial> pMtlDest, EMaterialCopyFlags flags) = 0;
-
-    // Description:
-    //    Clone MultiSubMtl material.
-    // Arguments:
-    //    sSubMtlName - name of the sub-material to clone, if NULL all submaterial are cloned.
-    virtual _smart_ptr<IMaterial> CloneMultiMaterial(_smart_ptr<IMaterial> pMtl, const char* sSubMtlName = 0) = 0;
-
-    // Description:
-    //    Associate a special listener callback with material manager inside 3d engine.
-    //    This listener callback is used primerly by the editor.
-    virtual void SetListener(IMaterialManagerListener* pListener) = 0;
-
-    // Description:
-    //    Retrieve a default engine material.
-    virtual _smart_ptr<IMaterial> GetDefaultMaterial() = 0;
-
-    // Description:
-    //    Retrieve a default engine material for terrain layer
-    virtual _smart_ptr<IMaterial> GetDefaultTerrainLayerMaterial() = 0;
-
-    // Description:
-    //    Retrieve a default engine material with material layers presets.
-    virtual _smart_ptr<IMaterial> GetDefaultLayersMaterial() = 0;
-
-    // Description:
-    //    Retrieve a default engine material for drawing helpers.
-    virtual _smart_ptr<IMaterial> GetDefaultHelperMaterial() = 0;
-
-    // Description:
-    //    Retrieve surface type by name.
-    virtual ISurfaceType* GetSurfaceTypeByName(const char* sSurfaceTypeName, const char* sWhy = NULL) = 0;
-    virtual int GetSurfaceTypeIdByName(const char* sSurfaceTypeName, const char* sWhy = NULL) = 0;
-    // Description:
-    //    Retrieve surface type by unique surface type id.
-    virtual ISurfaceType* GetSurfaceType(int nSurfaceTypeId, const char* sWhy = NULL) = 0;
-    // Description:
-    //    Retrieve interface to surface type manager.
-    virtual ISurfaceTypeManager* GetSurfaceTypeManager() = 0;
-
-    // Get IMaterial pointer from the CGF material structure.
-    //  nLoadingFlags - Zero, or a bitwise combination of the enum items from ELoadingFlags.
-    virtual _smart_ptr<IMaterial> LoadCGFMaterial(CMaterialCGF* pMaterialCGF, const char* sCgfFilename, unsigned long nLoadingFlags = 0) = 0;
-
-    // for statistics - call once to get the count (pData==0), again to get the data(pData!=0)
-    virtual void GetLoadedMaterials(AZStd::vector<_smart_ptr<IMaterial>>* pData, uint32& nObjCount) const = 0;
-
-    // Updates material data in the renderer
-    virtual void RefreshMaterialRuntime() = 0;
-
-    //// Forcing to create ISurfaceTypeManager
-    //virtual void CreateSurfaceTypeManager() = 0;
-    //// Forcing to destroy ISurfaceTypeManager
-    //virtual void ReleaseSurfaceTypeManager() = 0;
-
-    // </interfuscator:shuffle>
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_IMATERIAL_H
diff --git a/Code/CryEngine/CryCommon/IMiniLog.h b/Code/CryEngine/CryCommon/IMiniLog.h
deleted file mode 100644
index 2c1069b11d..0000000000
--- a/Code/CryEngine/CryCommon/IMiniLog.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : This is the smallest possible interface to the Log -
-//               it s independent and small  so that it can be easily moved
-//               across the engine and test applications  to test engine
-//               parts that need logging (e.g. Streaming Engine) separately
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IMINILOG_H
-#define CRYINCLUDE_CRYCOMMON_IMINILOG_H
-#pragma once
-
-
-struct IMiniLog
-{
-    enum ELogType
-    {
-        eMessage,
-        eWarning,
-        eError,
-        eAlways,
-        eWarningAlways,
-        eErrorAlways,
-        eInput,                     // e.g. "e_CaptureFolder ?" or all printouts from history or auto completion
-        eInputResponse,             // e.g. "Set output folder for video capturing" in response to "e_CaptureFolder ?"
-        eComment
-    };
-
-    // <interfuscator:shuffle>
-    // Notes:
-    //   You only have to implement this function.
-    virtual void LogV(ELogType nType, const char* szFormat, va_list args) PRINTF_PARAMS(3, 0) = 0;
-
-    virtual void LogV(ELogType nType, int flags, const char* szFormat, va_list args) PRINTF_PARAMS(4, 0) = 0;
-
-    // Summary:
-    //   Logs using type.
-    inline void LogWithType(ELogType nType, const char* szFormat, ...) PRINTF_PARAMS(3, 4);
-
-    inline void LogWithType(ELogType nType, int flags, const char* szFormat, ...) PRINTF_PARAMS(4, 5);
-
-    // --------------------------------------------------------------------------
-
-    // Summary:
-    //   Destructor.
-    virtual ~IMiniLog() {}
-
-    // Description:
-    //   This is the simplest log function for messages
-    //   with the default implementation.
-    virtual inline void Log(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-
-    // Description:
-    //   This is the simplest log function for warnings
-    //   with the default implementation.
-    virtual inline void LogWarning(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-
-    // Description:
-    //   This is the simplest log function for errors
-    //   with the default implementation.
-    virtual inline void LogError(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-    // </interfuscator:shuffle>
-};
-
-inline void IMiniLog::LogWithType(ELogType nType, int flags, const char* szFormat, ...)
-{
-    va_list args;
-    va_start(args, szFormat);
-    LogV(nType, flags, szFormat, args);
-    va_end(args);
-}
-
-inline void IMiniLog::LogWithType(ELogType nType, const char* szFormat, ...)
-{
-    va_list args;
-    va_start(args, szFormat);
-    LogV(nType, szFormat, args);
-    va_end(args);
-}
-
-inline void IMiniLog::Log(const char* szFormat, ...)
-{
-    va_list args;
-    va_start(args, szFormat);
-    LogV (eMessage, szFormat, args);
-    va_end(args);
-}
-
-inline void IMiniLog::LogWarning(const char* szFormat, ...)
-{
-    va_list args;
-    va_start(args, szFormat);
-    LogV (eWarning, szFormat, args);
-    va_end(args);
-}
-
-inline void IMiniLog::LogError(const char* szFormat, ...)
-{
-    va_list args;
-    va_start(args, szFormat);
-    LogV (eError, szFormat, args);
-    va_end(args);
-}
-
-// Notes:
-//   By default, to make it possible not to implement the log at the beginning at all,
-//   empty implementations of the two functions are given.
-struct CNullMiniLog
-    : public IMiniLog
-{
-    // Notes:
-    //   The default implementation just won't do anything
-    //##@{
-    void LogV([[maybe_unused]] const char* szFormat, [[maybe_unused]] va_list args) {}
-    void LogV([[maybe_unused]] ELogType nType, [[maybe_unused]] const char* szFormat, [[maybe_unused]] va_list args) {}
-    void LogV ([[maybe_unused]] ELogType nType, [[maybe_unused]] int flags, [[maybe_unused]] const char* szFormat, [[maybe_unused]] va_list args) {}
-    //##@}
-};
-
-
-#endif // CRYINCLUDE_CRYCOMMON_IMINILOG_H
diff --git a/Code/CryEngine/CryCommon/IMovieSystem.h b/Code/CryEngine/CryCommon/IMovieSystem.h
deleted file mode 100644
index fd30671296..0000000000
--- a/Code/CryEngine/CryCommon/IMovieSystem.h
+++ /dev/null
@@ -1,1467 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IMOVIESYSTEM_H
-#define CRYINCLUDE_CRYCOMMON_IMOVIESYSTEM_H
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/Math/Crc.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-#include <Range.h>
-#include <AnimKey.h>
-#include <ISplines.h>
-#include <IRenderer.h>
-#include <IRenderAuxGeom.h>
-#include <VectorSet.h>
-#include <CryName.h>
-
-// forward declaration.
-struct IAnimTrack;
-struct IAnimNode;
-struct IAnimSequence;
-struct IMovieSystem;
-struct IKey;
-class XmlNodeRef;
-struct ISplineInterpolator;
-struct ILightAnimWrapper;
-
-namespace AZ
-{
-    namespace Data
-    {
-        class AssetData;
-    }
-}
-
-namespace Maestro
-{
-    template<typename AssetType>
-    struct AssetBlends;
-}
-
-typedef IMovieSystem* (* PFNCREATEMOVIESYSTEM)(struct ISystem*);
-
-#define LIGHT_ANIMATION_SET_NAME "_LightAnimationSet"
-#define MAX_ANIM_NAME_LENGTH 64
-//! Very high priority for cut scene sounds.
-#define MOVIE_SOUND_PRIORITY 230
-
-#if !defined(CONSOLE)
-#define MOVIESYSTEM_SUPPORT_EDITING
-#endif
-
-typedef std::vector<IAnimSequence*> AnimSequences;
-typedef AZStd::vector<AZStd::string> TrackEvents;
-
-// Forward declare, including will cause much pain with the precompiled headers
-enum class SequenceType;
-enum class AnimNodeType;
-enum class AnimValueType;
-enum class AnimParamType;
-
-// TODO: Refactor headers that are using these values so they are not need in header files
-
-// AnimValueType::Float is the default value
-#define kAnimValueDefault static_cast<AnimValueType>(0)
-// AnimValueType::Unknown
-#define kAnimValueUnknown static_cast<AnimValueType>(0xFFFFFFFF)
-// SequenceType::SequenceComponent is the default value
-#define kSequenceTypeDefault static_cast<SequenceType>(1)
-// AnimParamType::Invalid
-#define kAnimParamTypeInvalid static_cast<AnimParamType>(0xFFFFFFFF)
-// AnimParamType::ByString
-#define kAnimParamTypeByString static_cast<AnimParamType>(8)
-
-//! Flags that can be set on animation node.
-enum EAnimNodeFlags
-{
-    eAnimNodeFlags_Expanded                 = BIT(0), //!< Deprecated, handled by sandbox now
-    eAnimNodeFlags_EntitySelected           = BIT(1), //!< Set if the referenced entity is selected in the editor
-    eAnimNodeFlags_CanChangeName            = BIT(2), //!< Set if this node allow changing of its name.
-    eAnimNodeFlags_Disabled                 = BIT(3), //!< Disable this node.
-    eAnimNodeFlags_DisabledForComponent     = BIT(4), //!< Disable this node for a disabled or pending entity component.
-};
-
-enum ENodeExportType
-{
-    eNodeExportType_Global = 0,
-    eNodeExportType_Local = 1,
-};
-
-// Common parameters of animation node.
-class CAnimParamType
-{
-    friend class CMovieSystem;
-    friend class AnimSerializer;
-
-public:
-    AZ_TYPE_INFO(CAnimParamType, "{E2F34955-3B07-4241-8D34-EA3BEF3B33D2}")
-
-    static const uint kParamTypeVersion = 9;
-
-    CAnimParamType()
-        : m_type(kAnimParamTypeInvalid) {}
-
-    CAnimParamType(const string& name)
-    {
-        *this = name;
-    }
-   
-    CAnimParamType(AnimParamType type)
-    {
-        *this = type;
-    }
-
-    // Convert from old enum or int
-    void operator =(AnimParamType type)
-    {
-        m_type = type;
-    }
-
-    void operator =(const string& name)
-    {
-        m_type = kAnimParamTypeByString;
-        m_name = name;
-    }
-
-    void operator =(const AZStd::string& name)
-    {
-        m_type = kAnimParamTypeByString;
-        m_name = name;
-    }
-    // Convert to enum. This needs to be explicit,
-    // otherwise operator== will be ambiguous
-    AnimParamType GetType() const { return m_type; }
-
-    // Get name
-    const char* GetName() const { return m_name.c_str(); }
-
-    bool operator ==(const CAnimParamType& animParamType) const
-    {
-        if (m_type == kAnimParamTypeByString && animParamType.m_type == kAnimParamTypeByString)
-        {
-            return m_name == animParamType.m_name;
-        }
-
-        return m_type == animParamType.m_type;
-    }
-
-    bool operator !=(const CAnimParamType& animParamType) const
-    {
-        return !(*this == animParamType);
-    }
-
-    bool operator <(const CAnimParamType& animParamType) const
-    {
-        if (m_type == kAnimParamTypeByString && animParamType.m_type == kAnimParamTypeByString)
-        {
-            return m_name < animParamType.m_name;
-        }
-        else if (m_type == kAnimParamTypeByString)
-        {
-            return false; // Always sort named params last
-        }
-        else if (animParamType.m_type == kAnimParamTypeByString)
-        {
-            return true; // Always sort named params last
-        }
-        if (m_type < animParamType.m_type)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    void SaveToXml(XmlNodeRef& xmlNode) const;
-    void LoadFromXml(const XmlNodeRef& xmlNode, const uint version = kParamTypeVersion);
-
-    // Serialization. Defined in Movie.cpp
-    inline void Serialize(XmlNodeRef& xmlNode, bool bLoading, const uint version = kParamTypeVersion);
-
-private:
-    AnimParamType m_type;
-    AZStd::string m_name;
-};
-
-namespace AZStd
-{
-    // define hasher to allow for AZStd maps and sets of CAnimParamType
-    template <>
-    struct hash < CAnimParamType >
-    {
-        inline size_t operator()(const CAnimParamType& paramType) const
-        {
-            AZStd::hash<AnimParamType> paramTypeHasher;
-            size_t retVal = paramTypeHasher(paramType.GetType());
-            AZStd::hash_combine(retVal, AZ::Crc32(paramType.GetName()));
-            return retVal;
-        }
-    };
-}  // namespace AZStd
-
-//! Types of animation track.
-// Do not change values! they are serialized
-//
-// Attention: This should only be expanded if you add a completely new way how tracks store data!
-// If you just want to control a new parameter of an entity etc. extend EParamType
-//
-// Note: TCB splines are only for backward compatibility, Bezier is the default
-//
-enum EAnimCurveType
-{
-    eAnimCurveType_TCBFloat         = 1,
-    eAnimCurveType_TCBVector        = 2,
-    eAnimCurveType_TCBQuat          = 3,
-    eAnimCurveType_BezierFloat      = 4,
-
-    eAnimCurveType_Unknown          = 0xFFFFFFFF
-};
-
-enum ETrackMask
-{
-    eTrackMask_MaskSound = 1 << 11, // Old: 1 << ATRACK_SOUND
-};
-
-//! Structure passed to Animate function.
-struct SAnimContext
-{
-    SAnimContext()
-    {
-        singleFrame = false;
-        forcePlay = false;
-        resetting = false;
-        time = 0;
-        dt = 0;
-        fps = 0;
-        sequence = nullptr;
-        trackMask = 0;
-        startTime = 0;
-    }
-
-    float time;             //!< Current time in seconds.
-    float dt;               //!< Delta of time from previous animation frame in seconds.
-    float fps;              //!< Last calculated frames per second value.
-    bool singleFrame;       //!< This is not a playing animation, more a single-frame update.
-    bool forcePlay;         //!< Set when force playing animation.
-    bool resetting;         //!< Set when animation sequence is resetting.
-
-    IAnimSequence* sequence; //!< Sequence in which animation performed.
-
-    // TODO: Replace trackMask with something more type safe
-    // TODO: Mask should be stored with dynamic length
-    uint32 trackMask;       //!< To update certain types of tracks only
-    float startTime;        //!< The start time of this playing sequence
-
-    void Serialize(XmlNodeRef& xmlNode, bool loading);
-};
-
-/** Parameters for cut-scene cameras
-*/
-struct SCameraParams
-{
-    SCameraParams()
-    {
-        fov = 0.0f;
-        nearZ = DEFAULT_NEAR;
-        justActivated = false;
-    }
-    AZ::EntityId cameraEntityId;
-    float fov;
-    float nearZ;
-    bool justActivated;
-};
-
-//! Interface for movie-system implemented by user for advanced function-support
-struct IMovieUser
-{
-    // <interfuscator:shuffle>
-    virtual ~IMovieUser(){}
-    //! Called when movie system requests a camera-change.
-    virtual void SetActiveCamera(const SCameraParams& Params) = 0;
-    //! Called when movie system enters into cut-scene mode.
-    virtual void BeginCutScene(IAnimSequence* pSeq, unsigned long dwFlags, bool bResetFX) = 0;
-    //! Called when movie system exits from cut-scene mode.
-    virtual void EndCutScene(IAnimSequence* pSeq, unsigned long dwFlags) = 0;
-    //! Called when movie system wants to send a global event.
-    virtual void SendGlobalEvent(const char* pszEvent) = 0;
-    // </interfuscator:shuffle>
-};
-
-//! Callback-class
-struct IMovieCallback
-{
-    //! Callback-reasons
-    enum ECallbackReason
-    {
-        CBR_CHANGENODE, // Node is changing.
-        CBR_CHANGETRACK // Track of the node is changing.
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IMovieCallback(){}
-    // Called by movie system.
-    virtual void OnMovieCallback(ECallbackReason reason, IAnimNode* pNode) = 0;
-    virtual void OnSetCamera(const SCameraParams& Params) = 0;
-    virtual bool IsSequenceCamUsed() const = 0;
-    // </interfuscator:shuffle>
-};
-
-/** Interface of Animation Track.
-*/
-struct IAnimTrack
-{
-    AZ_RTTI(IAnimTrack, "{AA0D5170-FB28-426F-BA13-7EFF6BB3AC67}");
-    AZ_CLASS_ALLOCATOR(IAnimTrack, AZ::SystemAllocator, 0);
-
-    static void Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<IAnimTrack>();
-        }
-    }
-
-    //! Flags that can be set on animation track.
-    enum EAnimTrackFlags
-    {
-        eAnimTrackFlags_Linear   = BIT(1), //!< Use only linear interpolation between keys.
-        eAnimTrackFlags_Loop     = BIT(2), //!< Play this track in a loop.
-        eAnimTrackFlags_Cycle    = BIT(3), //!< Cycle track.
-        eAnimTrackFlags_Disabled = BIT(4), //!< Disable this track.
-
-        //////////////////////////////////////////////////////////////////////////
-        // Used by editor.
-        //////////////////////////////////////////////////////////////////////////
-        eAnimTrackFlags_Hidden   = BIT(5), //!< Set when track is hidden in track view.
-        eAnimTrackFlags_Muted    = BIT(8), //!< Mute this sound track or music track. This only affects the playback in editor on these types of tracks.
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IAnimTrack() {};
-
-    // for intrusive_ptr support
-    virtual void add_ref() = 0;
-    virtual void release() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual EAnimCurveType GetCurveType() = 0;
-    virtual AnimValueType     GetValueType() = 0;
-
-#ifdef MOVIESYSTEM_SUPPORT_EDITING
-    // This color is used for the editor.
-    virtual ColorB GetCustomColor() const = 0;
-    virtual void SetCustomColor(ColorB color) = 0;
-    virtual bool HasCustomColor() const = 0;
-    virtual void ClearCustomColor() = 0;
-#endif
-
-    // Return what parameter of the node, this track is attached to.
-    virtual const CAnimParamType& GetParameterType() const = 0;
-
-    // Assign node parameter ID for this track.
-    virtual void SetParameterType(CAnimParamType type) = 0;
-
-    virtual void SetNode(IAnimNode* node) = 0;
-    // Return Animation Sequence that owns this node.
-    virtual IAnimNode* GetNode() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Animation track can contain sub-tracks (Position XYZ anim track have sub-tracks for x,y,z)
-    // Get count of sub tracks.
-    virtual int GetSubTrackCount() const = 0;
-    // Retrieve pointer the specfied sub track.
-    virtual IAnimTrack* GetSubTrack(int nIndex) const = 0;
-    virtual const char* GetSubTrackName(int nIndex) const = 0;
-    virtual void SetSubTrackName(int nIndex, const char* name) = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void GetKeyValueRange(float& fMin, float& fMax) const = 0;
-    virtual void SetKeyValueRange(float fMin, float fMax) = 0;
-
-    //! Return number of keys in track.
-    virtual int GetNumKeys() const = 0;
-
-    //! Return true if keys exists in this track
-    virtual bool HasKeys() const = 0;
-
-    //! Set number of keys in track.
-    //! If needed adds empty keys at end or remove keys from end.
-    virtual void SetNumKeys(int numKeys) = 0;
-
-    //! Remove specified key.
-    virtual void RemoveKey(int num) = 0;
-
-    //! Get key at specified location.
-    //! @param key Must be valid pointer to compatible key structure, to be filled with specified key location.
-    virtual void GetKey(int index, IKey* key) const = 0;
-
-    //! Get time of specified key.
-    //! @return key time.
-    virtual float GetKeyTime(int index) const = 0;
-
-    //! Find key at given time.
-    //! @return Index of found key, or -1 if key with this time not found.
-    virtual int FindKey(float time) = 0;
-
-    //! Get flags of specified key.
-    //! @return key time.
-    virtual int GetKeyFlags(int index) = 0;
-
-    //! Set key at specified location.
-    //! @param key Must be valid pointer to compatible key structure.
-    virtual void SetKey(int index, IKey* key) = 0;
-
-    //! Set time of specified key.
-    virtual void SetKeyTime(int index, float time) = 0;
-
-    //! Set flags of specified key.
-    virtual void SetKeyFlags(int index, int flags) = 0;
-
-    //! Sort keys in track (after time of keys was modified).
-    virtual void SortKeys() = 0;
-
-    //! Get track flags.
-    virtual int GetFlags() = 0;
-
-    //! Check if track is masked by mask
-    // TODO: Mask should be stored with dynamic length
-    virtual bool IsMasked(const uint32 mask) const = 0;
-
-    //! Set track flags.
-    virtual void SetFlags(int flags) = 0;
-
-    //! Create key at given time, and return its index.
-    //! @return Index of new key.
-    virtual int CreateKey(float time) = 0;
-
-    //! Clone key at specified index.
-    //! @retun Index of new key.
-    virtual int CloneKey(int key) = 0;
-
-    //! Clone key at specified index from another track of SAME TYPE.
-    //! @retun Index of new key.
-    virtual int CopyKey(IAnimTrack* pFromTrack, int nFromKey) = 0;
-
-    //! Get info about specified key.
-    //! @param Short human readable text description of this key.
-    //! @param duration of this key in seconds.
-    virtual void GetKeyInfo(int key, const char*& description, float& duration) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Get track value at specified time.
-    // Interpolates keys if needed.
-    // Applies a scale multiplier set in SetMultiplier(), if requested
-    //////////////////////////////////////////////////////////////////////////
-    virtual void GetValue(float time, float& value, bool applyMultiplier=false) = 0;
-    virtual void GetValue(float time, Vec3& value, bool applyMultiplier = false) = 0;
-    virtual void GetValue(float time, Vec4& value, bool applyMultiplier = false) = 0;
-    virtual void GetValue(float time, Quat& value) = 0;
-    virtual void GetValue(float time, bool& value) = 0;
-    virtual void GetValue(float time, Maestro::AssetBlends<AZ::Data::AssetData>& value) = 0;
-
-    // support for AZ:: vector types - re-route to legacy types
-    void GetValue(float time, AZ::Vector3& value, bool applyMultiplier = false)
-    {
-        Vec3 vec3;
-        GetValue(time, vec3, applyMultiplier);
-        value.Set(vec3.x, vec3.y, vec3.z);
-    }
-    void GetValue(float time, AZ::Quaternion& value)
-    {
-        Quat quat;
-        GetValue(time, quat);
-        value.Set(quat.v.x, quat.v.y, quat.v.z, quat.w);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set track value at specified time.
-    // Adds new keys if required.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetValue(float time, const float& value, bool bDefault = false, bool applyMultiplier = false) = 0;
-    virtual void SetValue(float time, const Vec3& value, bool bDefault = false, bool applyMultiplier = false) = 0;
-    virtual void SetValue(float time, const Vec4& value, bool bDefault = false, bool applyMultiplier = false) = 0;
-    virtual void SetValue(float time, const Quat& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const bool& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const Maestro::AssetBlends<AZ::Data::AssetData>& value, bool bDefault = false) = 0;
-
-    // support for AZ:: vector types - re-route to legacy types
-    void SetValue(float time, AZ::Vector3& value, bool bDefault = false, bool applyMultiplier = false)
-    {
-        Vec3 vec3(value.GetX(), value.GetY(), value.GetZ());
-        SetValue(time, vec3, bDefault, applyMultiplier);
-    }
-    void SetValue(float time, AZ::Quaternion& value, [[maybe_unused]] bool bDefault = false)
-    {
-        Quat quat(value.GetW(), value.GetX(), value.GetY(), value.GetZ());
-        SetValue(time, quat);
-    }
-
-    // Only for position tracks, offset all track keys by this amount.
-    virtual void OffsetKeyPosition(const Vec3& value) = 0;
-
-    // Used to update the data in tracks after the parent entity has been changed.
-    virtual void UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM) = 0;
-
-    // Assign active time range for this track.
-    virtual void SetTimeRange(const Range& timeRange) = 0;
-
-    //! @deprecated - IAnimTracks use AZ::Serialization now. Legacy - Serialize this animation track to XML.
-    virtual bool Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks = true) = 0;
-    virtual bool SerializeSelection(XmlNodeRef& xmlNode, bool bLoading, bool bCopySelected = false, float fTimeOffset = 0) = 0;
-
-    virtual void InitPostLoad(IAnimSequence* /*sequence*/) {};
-
-    //! For custom track animate parameters.
-    virtual void Animate([[maybe_unused]] SAnimContext& ec) {};
-
-    // Get access to the internal spline of the track.
-    virtual ISplineInterpolator* GetSpline() const { return 0; };
-
-    virtual bool IsKeySelected([[maybe_unused]] int key) const { return false; }
-
-    virtual void SelectKey([[maybe_unused]] int key, [[maybe_unused]] bool select) {}
-
-    virtual void SetSortMarkerKey([[maybe_unused]] unsigned int keyIndex, [[maybe_unused]] bool enabled) {}
-    virtual bool IsSortMarkerKey([[maybe_unused]] unsigned int keyIndex) const { return false; }
-
-    //! Return the index of the key which lies right after the given key in time.
-    //! @param key Index of of key.
-    //! @return Index of the next key in time. If the last key given, this returns -1.
-    // In case of keys sorted, it's just 'key+1', but if not sorted, it can be another value.
-    virtual int NextKeyByTime(int key) const
-    {
-        if (key + 1 < GetNumKeys())
-        {
-            return key + 1;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-    //! Get the animation layer index assigned. (only for character/look-at tracks ATM)
-    virtual int GetAnimationLayerIndex() const { return -1; }
-    //! Set the animation layer index. (only for character/look-at tracks ATM)
-    virtual void SetAnimationLayerIndex([[maybe_unused]] int index) { }
-
-    //! Returns whether the track responds to muting (false by default), which only affects the Edtior.
-    //! Tracks that use mute should override this, such as CSoundTrack
-    //! @return Boolean of whether the track respnnds to muting or not
-    virtual bool UsesMute() const { return false; }
-
-    //! Set a multiplier which will be multiplied to track values in SetValue and divided out in GetValue if requested
-    virtual void SetMultiplier(float trackValueMultiplier) = 0;
-
-    // Expanded state interface
-    virtual void SetExpanded(bool expanded) = 0;
-    virtual bool GetExpanded() const = 0;
-
-    virtual unsigned int GetId() const = 0;
-    virtual void SetId(unsigned int id) = 0;
-
-    // </interfuscator:shuffle>
-};
-
-
-/** Callback called by animation node when its animated.
-*/
-struct IAnimNodeOwner
-{
-    // <interfuscator:shuffle>
-    virtual ~IAnimNodeOwner(){}
-    virtual void OnNodeAnimated([[maybe_unused]] IAnimNode* pNode) {}
-    virtual void OnNodeVisibilityChanged(IAnimNode* pNode, const bool bHidden) = 0;
-    virtual void OnNodeReset([[maybe_unused]] IAnimNode* pNode) {}
-
-    // mark the node's sequence object layer as modified
-    virtual void MarkAsModified() = 0;
-    // </interfuscator:shuffle>
-};
-
-/** Base class for all Animation nodes,
-        can host multiple animation tracks, and execute them other time.
-        Animation node is reference counted.
-*/
-struct IAnimNode
-{
-public:
-    AZ_RTTI(IAnimNode, "{0A096354-7F26-4B18-B8C0-8F10A3E0440A}");
-    AZ_CLASS_ALLOCATOR(IAnimNode, AZ::SystemAllocator, 0);
-
-    static void Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<IAnimNode>();
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Supported params.
-    //////////////////////////////////////////////////////////////////////////
-    enum ESupportedParamFlags
-    {
-        eSupportedParamFlags_MultipleTracks = 0x01, // Set if parameter can be assigned multiple tracks.
-        eSupportedParamFlags_Hidden         = 0x02, // Hidden from the Track View UI.
-    };
-
-    struct SParamInfo
-    {
-        SParamInfo()
-            : name("")
-            , valueType(kAnimValueDefault)
-            , flags(ESupportedParamFlags(0)) {};
-        SParamInfo(const char* _name, CAnimParamType _paramType, AnimValueType _valueType, ESupportedParamFlags _flags)
-            : name(_name)
-            , paramType(_paramType)
-            , valueType(_valueType)
-            , flags(_flags) {};
-
-        const char* name;           // parameter name.
-        CAnimParamType paramType;     // parameter id.
-        AnimValueType valueType;       // value type, defines type of track to use for animating this parameter.
-        ESupportedParamFlags flags; // combination of flags from ESupportedParamFlags.
-    };
-
-    using AnimParamInfos = AZStd::vector<SParamInfo>;
-
-    // <interfuscator:shuffle>
-    virtual ~IAnimNode() {};
-
-    // for intrusive_ptr support
-    virtual void add_ref() = 0;
-    virtual void release() = 0;
-
-    //! Set node name.
-    virtual void SetName(const char* name) = 0;
-
-    //! Get node name.
-    virtual const char* GetName() = 0;
-
-    // Get Type of this node.
-    virtual AnimNodeType GetType() const = 0;
-
-    // Return Animation Sequence that owns this node.
-    virtual IAnimSequence* GetSequence() const = 0;
-
-    // Set the Animation Sequence that owns this node.
-    virtual void SetSequence(IAnimSequence* sequence) = 0;
-
-    // Called when sequence is activated / deactivated
-    virtual void Activate(bool bActivate) = 0;
-
-    // Set AnimNode flags.
-    // @param flags One or more flags from EAnimNodeFlags.
-    // @see EAnimNodeFlags
-    virtual void SetFlags(int flags) = 0;
-
-    // Get AnimNode flags.
-    // @return flags set on node.
-    // @see EAnimNodeFlags
-    virtual int GetFlags() const = 0;
-
-    // return true if flagsToCheck is set on the node or any of the node's parents
-    virtual bool AreFlagsSetOnNodeOrAnyParent(EAnimNodeFlags flagsToCheck) const = 0;
-
-    // AZ::Entity is bound/handled via their Id over EBuses, as opposed to directly with pointers.
-    virtual void SetAzEntityId(const AZ::EntityId& id) = 0;
-    virtual AZ::EntityId GetAzEntityId() const = 0;
-
-    // Return movie system that created this node.
-    virtual IMovieSystem*   GetMovieSystem() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Space position/orientation scale.
-    //////////////////////////////////////////////////////////////////////////
-    //! Translate entity node.
-    virtual void SetPos(float time, const Vec3& pos) = 0;
-    //! Rotate entity node.
-    virtual void SetRotate(float time, const Quat& quat) = 0;
-    //! Scale entity node.
-    virtual void SetScale(float time, const Vec3& scale) = 0;
-
-    //! Compute and return the offset which brings the current position to the given position
-    virtual Vec3 GetOffsetPosition(const Vec3& position) { return position - GetPos(); }
-
-    //! Get current entity position.
-    virtual Vec3 GetPos() = 0;
-    //! Get current entity rotation.
-    virtual Quat GetRotate() = 0;
-    //! Get entity rotation at specified time.
-    virtual Quat GetRotate(float time) = 0;
-    //! Get current entity scale.
-    virtual Vec3 GetScale() = 0;
-
-    // General Set param.
-    // Set float/vec3/vec4 parameter at given time.
-    // @return true if parameter set, false if this parameter not exist in node.
-    virtual bool SetParamValue(float time, CAnimParamType param, float value) = 0;
-    virtual bool SetParamValue(float time, CAnimParamType param, const Vec3& value) = 0;
-    virtual bool SetParamValue(float time, CAnimParamType param, const Vec4& value) = 0;
-    // Get float/vec3/vec4 parameter at given time.
-    // @return true if parameter exist, false if this parameter not exist in node.
-    virtual bool GetParamValue(float time, CAnimParamType param, float& value) = 0;
-    virtual bool GetParamValue(float time, CAnimParamType param, Vec3& value) = 0;
-    virtual bool GetParamValue(float time, CAnimParamType param, Vec4& value) = 0;
-
-    //! Evaluate animation node while not playing animation.
-    virtual void StillUpdate() = 0;
-
-    //! Evaluate animation to the given time.
-    virtual void Animate(SAnimContext& ec) = 0;
-
-    // Description:
-    //      Returns number of supported parameters by this animation node (position,rotation,scale,etc..).
-    // Returns:
-    //      Number of supported parameters.
-    virtual unsigned int GetParamCount() const = 0;
-
-    // Description:
-    //      Returns the type of a param by index
-    // Arguments:
-    //      nIndex - parameter index in range 0 <= nIndex < GetSupportedParamCount()
-    virtual CAnimParamType GetParamType(unsigned int nIndex) const = 0;
-
-    // Description:
-    //      Check if parameter is supported by this node.
-    virtual bool IsParamValid(const CAnimParamType& paramType) const = 0;
-
-    // Description:
-    //      Returns name of supported parameter of this animation node or NULL if not available
-    // Arguments:
-    //          paramType - parameter id
-    virtual const char* GetParamName(const CAnimParamType& paramType) const = 0;
-
-    // Description:
-    //      Returns the params value type
-    virtual AnimValueType GetParamValueType(const CAnimParamType& paramType) const = 0;
-
-    // Description:
-    //      Returns the params value type
-    virtual ESupportedParamFlags GetParamFlags(const CAnimParamType& paramType) const = 0;
-
-    // Called node data is re-initialized, such as when changing the entity associated with it.
-    virtual void OnReset() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Working with Tracks.
-    //////////////////////////////////////////////////////////////////////////
-    virtual int GetTrackCount() const = 0;
-
-    // Return track assigned to the specified parameter.
-    virtual IAnimTrack* GetTrackByIndex(int nIndex) const = 0;
-
-    // Return first track assigned to the specified parameter.
-    virtual IAnimTrack* GetTrackForParameter(const CAnimParamType& paramType) const = 0;
-
-    // Return the i-th track assigned to the specified parameter in case of multiple tracks.
-    virtual IAnimTrack* GetTrackForParameter(const CAnimParamType& paramType, uint32 index) const = 0;
-
-    // Get the index of a given track among tracks with the same parameter type in this node.
-    virtual uint32 GetTrackParamIndex(const IAnimTrack* pTrack) const = 0;
-
-    // Creates a new track for given parameter.
-    virtual IAnimTrack* CreateTrack(const CAnimParamType& paramType) = 0;
-
-    // Initializes track default values after de-serialization / user creation. Only called in editor.
-    virtual void InitializeTrackDefaultValue(IAnimTrack* pTrack, const CAnimParamType& paramType) = 0;
-
-    // Assign animation track to parameter.
-    // if track parameter is NULL track with parameter id param will be removed.
-    virtual void SetTrack(const CAnimParamType& paramType, IAnimTrack* track) = 0;
-
-    // Set time range for all tracks in this sequence.
-    virtual void SetTimeRange(Range timeRange) = 0;
-
-    // Remove track from anim node.
-    virtual void AddTrack(IAnimTrack* pTrack) = 0;
-
-    // Remove track from anim node.
-    virtual bool RemoveTrack(IAnimTrack* pTrack) = 0;
-
-    // Description:
-    //      Creates default set of tracks supported by this node.
-    virtual void CreateDefaultTracks() = 0;
-
-    // returns the tangent type to use for created keys. Override this if you have an animNode that you wish
-    // to have tangents other than UNIFIED created for new keys.
-    virtual int GetDefaultKeyTangentFlags() const { return SPLINE_KEY_TANGENT_UNIFIED; }
-
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Callback for animation node used by editor.
-    // Register notification callback with animation node.
-    virtual void SetNodeOwner(IAnimNodeOwner* pOwner) = 0;
-    virtual IAnimNodeOwner* GetNodeOwner() = 0;
-
-    // Serialize this animation node to XML.
-    virtual void Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks) = 0;
-
-    // Serialize only the tracks in this animation node to/from XML
-    virtual void SerializeAnims(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks) = 0;
-
-    // Sets up internal pointers post load from Sequence Component
-    virtual void InitPostLoad(IAnimSequence* sequence) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-    // Groups interface
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetParent(IAnimNode* pParent) = 0;
-    virtual IAnimNode* GetParent() const = 0;
-    virtual IAnimNode* HasDirectorAsParent() const = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void Render() = 0;
-
-    virtual bool NeedToRender() const = 0;
-
-    // Called from editor if dynamic params need updating
-    virtual void UpdateDynamicParams() = 0;
-    // </interfuscator:shuffle>
-
-    // Used by AnimCameraNode
-    virtual bool GetShakeRotation([[maybe_unused]] const float& time, [[maybe_unused]] Quat& rot){return false; }
-
-    virtual void SetCameraShakeSeed([[maybe_unused]] const uint shakeSeed){};
-
-    // override this method to handle explicit setting of time
-    virtual void TimeChanged([[maybe_unused]] float newTime) {};
-
-    // Compares all of the node's track values at the given time with the associated property value and 
-    //     sets a key at that time if they are different to match the latter
-    // Returns the number of keys set
-    virtual int SetKeysForChangedTrackValues([[maybe_unused]] float time) { return 0; };
-
-    // Callbacks used when Game/Simulation mode is started and stopped in the Editor. Override if you want to handle these events
-    virtual void OnStartPlayInEditor() {};
-    virtual void OnStopPlayInEditor() {};
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // interface for Components - implemented by CAnimComponentNode
-
-    // Override if the derived node has an associated component type (e.g. CAnimComponentNode)
-    virtual void SetComponent([[maybe_unused]] AZ::ComponentId comopnentId, [[maybe_unused]] const AZ::Uuid& componentTypeId) {}
-
-    // returns the componentId of the component the node is associate with, if applicable, or a AZ::InvalidComponentId otherwise
-    virtual AZ::ComponentId GetComponentId() const { return AZ::InvalidComponentId; }
-    // ~interface for Components
-    ////////////////////////////////////////////////////////////////////////////////
-
-    // Used to disable any animation that is overridden by a SceneNode during camera interpolation, such as
-    // FoV, transform, nearZ
-    virtual void SetSkipInterpolatedCameraNode([[maybe_unused]] const bool skipNodeCameraAnimation) {};
-
-    // Expanded state interface
-    virtual void SetExpanded(bool expanded) = 0;
-    virtual bool GetExpanded() const = 0;
-
-    // Return the node id. This id is unique within a given sequence.
-    virtual int GetId() const = 0;
-};
-
-//! Track event listener
-struct ITrackEventListener
-{
-    //! Reasons
-    enum ETrackEventReason
-    {
-        eTrackEventReason_Added,
-        eTrackEventReason_Removed,
-        eTrackEventReason_Renamed,
-        eTrackEventReason_Triggered,
-        eTrackEventReason_MovedUp,
-        eTrackEventReason_MovedDown,
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~ITrackEventListener(){}
-    // Description:
-    //      Called when track event is updated
-    // Arguments:
-    //      pSeq - Animation sequence
-    //      reason - Reason for update (see EReason)
-    //      event - Track event added
-    //      pUserData - Data to accompany reason
-    virtual void OnTrackEvent(IAnimSequence* sequence, int reason, const char* event, void* pUserData) = 0;
-    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{};
-    // </interfuscator:shuffle>
-};
-
-struct IAnimLegacySequenceObject
-{
-    // <interfuscator:shuffle>
-    virtual ~IAnimLegacySequenceObject() {}
-    virtual void OnNameChanged() = 0;
-    virtual void OnModified() = 0;
-    // </interfuscator:shuffle>
-};
-
-struct IAnimStringTable
-{
-    AZ_RTTI(IAnimStringTable, "{35690309-9D22-41FF-80B7-8AF7C8419945}")
-    virtual ~IAnimStringTable() {}
-
-    // for intrusive_ptr support
-    virtual void add_ref() = 0;
-    virtual void release() = 0;
-
-    virtual const char* Add(const char* p) = 0;
-};
-
-/** Animation sequence, operates on animation nodes contained in it.
- */
-struct IAnimSequence
-{
-    AZ_RTTI(IAnimSequence, "{A60F95F5-5A4A-47DB-B3BB-525BBC0BC8DB}");
-    AZ_CLASS_ALLOCATOR(IAnimSequence, AZ::SystemAllocator, 0);
-
-    static const int kSequenceVersion = 5;
-
-    static void Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<IAnimSequence>();
-        }
-    }
-
-    //! Flags used for SetFlags(),GetFlags(),SetParentFlags(),GetParentFlags() methods.
-    enum EAnimSequenceFlags
-    {
-        eSeqFlags_PlayOnReset         = BIT(0),   //!< Start playing this sequence immediately after reset of movie system(Level load).
-        eSeqFlags_OutOfRangeConstant  = BIT(1),   //!< Constant Out-Of-Range,time continues normally past sequence time range.
-        eSeqFlags_OutOfRangeLoop      = BIT(2),   //!< Loop Out-Of-Range,time wraps back to the start of range when reaching end of range.
-        eSeqFlags_CutScene            = BIT(3),   //!< Cut scene sequence.
-        eSeqFlags_NoHUD               = BIT(4),   //!< @deprecated - Don`t display HUD
-        eSeqFlags_NoPlayer            = BIT(5),   //!< Disable input and drawing of player
-        eSeqFlags_NoGameSounds        = BIT(9),   //!< Suppress all game sounds.
-        eSeqFlags_NoSeek              = BIT(10), //!< Cannot seek in sequence.
-        eSeqFlags_NoAbort             = BIT(11), //!< Cutscene can not be aborted
-        eSeqFlags_NoSpeed             = BIT(13), //!< Cannot modify sequence speed - TODO: add interface control if required
-     // eSeqFlags_CanWarpInFixedTime  = BIT(14), //!< @deprecated - Timewarp by scaling a fixed time step - removed July 2017, unused
-        eSeqFlags_EarlyMovieUpdate    = BIT(15), //!< Turn the 'sys_earlyMovieUpdate' on during the sequence.
-        eSeqFlags_LightAnimationSet   = BIT(16), //!< A special unique sequence for light animations
-        eSeqFlags_NoMPSyncingNeeded   = BIT(17), //!< this sequence doesn't require MP net syncing
-    };
-
-    virtual ~IAnimSequence() {};
-
-    // for intrusive_ptr support
-    virtual void add_ref() = 0;
-    virtual void release() = 0;
-
-    //! Set the name of this sequence. (ex. "Intro" in the same case as above)
-    virtual void SetName(const char* name) = 0;
-    //! Get the name of this sequence. (ex. "Intro" in the same case as above)
-    virtual const char* GetName() const = 0;
-    //! Get the ID (unique in a level and consistent across renaming) of this sequence.
-    virtual uint32 GetId () const = 0;
-    //! Resets the ID to the next available ID - used on sequence loads into levels to resolve ID collisions
-    virtual void ResetId() = 0;
-
-    // Legacy sequence objects are connected by pointers. SequenceComponents are connected by AZ::EntityId
-    virtual void SetLegacySequenceObject(IAnimLegacySequenceObject* legacySequenceObject) = 0;
-    virtual IAnimLegacySequenceObject* GetLegacySequenceObject() const = 0;
-    virtual void SetSequenceEntityId(const AZ::EntityId& entityOwnerId) = 0;
-    virtual const AZ::EntityId& GetSequenceEntityId() const = 0;
-
-    //! Set the currently active director node.
-    virtual void SetActiveDirector(IAnimNode* pDirectorNode) = 0;
-    //! Get the currently active director node, if any.
-    virtual IAnimNode* GetActiveDirector() const = 0;
-
-    //! Set animation sequence flags
-    virtual void SetFlags(int flags) = 0;
-    //! Get animation sequence flags
-    virtual int GetFlags() const = 0;
-    //! Get cutscene related animation sequence flags
-    virtual int GetCutSceneFlags(const bool localFlags = false) const = 0;
-    //! Set parent animation sequence
-    virtual void SetParentSequence(IAnimSequence* pParentSequence) = 0;
-    //! Get parent animation sequence
-    virtual const IAnimSequence* GetParentSequence() const = 0;
-    //! Check whether this sequence has the given sequence as a descendant through one of its sequence tracks.
-    virtual bool IsAncestorOf(const IAnimSequence* sequence) const = 0;
-
-    //! Return number of animation nodes in sequence.
-    virtual int GetNodeCount() const = 0;
-    //! Get animation node at specified index.
-    virtual IAnimNode* GetNode(int index) const = 0;
-
-    //! Add animation node to sequence.
-    //! @return True if node added, same node will not be added 2 times.
-    virtual bool AddNode(IAnimNode* node) = 0;
-
-    // Reorders the array of nodes, so the specified node is placed after or before the given pivot node depending on the parameter 'next'.
-    virtual void ReorderNode(IAnimNode* node, IAnimNode* pPivotNode, bool next) = 0;
-
-    // Description:
-    //      Creates a new animation node with specified type.
-    // Arguments:
-    //      nodeType - Type of node, one of AnimNodeType enums.
-    virtual IAnimNode* CreateNode(AnimNodeType nodeType) = 0;
-
-    // Description:
-    //      Creates a new animation node from serialized node XML.
-    // Arguments:
-    //      node - Serialized form of node
-    virtual IAnimNode* CreateNode(XmlNodeRef node) = 0;
-
-    //! Remove animation node from sequence.
-    virtual void RemoveNode(IAnimNode* node, bool removeChildRelationships /*=true*/) = 0;
-
-    // Finds node by name, can be slow.
-    // If the node belongs to a director, the director node also should be given
-    // since there can be multiple instances of the same node(i.e. the same name)
-    // across multiple director nodes.
-    virtual IAnimNode* FindNodeByName(const char* sNodeName, const IAnimNode* pParentDirector) = 0;
-
-    //! Remove all nodes from sequence.
-    virtual void RemoveAll() = 0;
-
-    // Activate sequence by binding sequence animations to nodes.
-    // must be called prior animating sequence.
-    virtual void Activate() = 0;
-
-    /** Check if sequence is activated
-    */
-    virtual bool IsActivated() const = 0;
-
-    // Deactivates sequence by unbinding sequence animations from nodes.
-    virtual void Deactivate() = 0;
-
-    // Pre-caches data associated with this anim sequence.
-    virtual void PrecacheData(float startTime = 0.0f) = 0;
-
-    // Update sequence while not playing animation.
-    virtual void StillUpdate() = 0;
-
-    // Render function call for some special node.
-    virtual void Render() = 0;
-
-    // Evaluate animations of all nodes in sequence.
-    // Sequence must be activated before animating.
-    virtual void Animate(const SAnimContext& ec) = 0;
-
-    //! Set time range of this sequence.
-    virtual void SetTimeRange(Range timeRange) = 0;
-
-    //! Get time range of this sequence.
-    virtual Range GetTimeRange() = 0;
-
-    //! Resets the sequence
-    virtual void Reset(bool bSeekToStart) = 0;
-
-    //! This can have more time-consuming tasks performed additional to tasks of the usual 'Reset()' method.
-    virtual void ResetHard() = 0;
-
-    // Called to pause sequence.
-    virtual void Pause() = 0;
-
-    // Called to resume sequence.
-    virtual void Resume() = 0;
-
-    /** Called to check if sequence is paused.
-    */
-    virtual bool IsPaused() const = 0;
-
-    /** Called when a sequence is looped.
-    */
-    virtual void OnLoop() = 0;
-
-    /** Move/Scale all keys in tracks from previous time range to new time range.
-    */
-    virtual void AdjustKeysToTimeRange(const Range& timeRange) = 0;
-
-    /** Called when time was explicitly jumped to/set.
-    */
-    virtual void TimeChanged(float newTime) = 0;
-
-    // fix up internal pointers after load from Sequence Component
-    virtual void InitPostLoad() = 0;
-
-    // Copy some nodes of this sequence to XML.
-    virtual void CopyNodes(XmlNodeRef& xmlNode, IAnimNode** pSelectedNodes, uint32 count) = 0;
-
-    // Paste nodes given by the XML to this sequence.
-    virtual void PasteNodes(const XmlNodeRef& xmlNode, IAnimNode* pParent) = 0;
-
-    // Summary:
-    //  Adds/removes track events in sequence.
-    virtual bool AddTrackEvent(const char* szEvent) = 0;
-    virtual bool RemoveTrackEvent(const char* szEvent) = 0;
-    virtual bool RenameTrackEvent(const char* szEvent, const char* szNewEvent) = 0;
-    virtual bool MoveUpTrackEvent(const char* szEvent) = 0;
-    virtual bool MoveDownTrackEvent(const char* szEvent) = 0;
-    virtual void ClearTrackEvents() = 0;
-
-    // Summary:
-    //  Gets the track events in the sequence.
-    virtual int GetTrackEventsCount() const = 0;
-    // Summary:
-    //  Gets the specified track event in the sequence.
-    virtual char const* GetTrackEvent(int iIndex) const = 0;
-
-    virtual IAnimStringTable* GetTrackEventStringTable() = 0;
-
-    // Summary:
-    //   Called to trigger a track event.
-    virtual void TriggerTrackEvent(const char* event, const char* param = NULL) = 0;
-
-    //! Track event listener
-    virtual void AddTrackEventListener(ITrackEventListener* pListener) = 0;
-    virtual void RemoveTrackEventListener(ITrackEventListener* pListener) = 0;
-
-    // return the sequence type - legacy or new component entity
-    virtual SequenceType GetSequenceType() const = 0;
-
-    // Expanded state interface
-    virtual void SetExpanded(bool expanded) = 0;
-    virtual bool GetExpanded() const = 0;
-
-    virtual unsigned int GetUniqueTrackIdAndGenerateNext() = 0;
-
-    // </interfuscator:shuffle>
-};
-
-/** Movie Listener interface.
-    Register at movie system to get notified about movie events
-*/
-struct IMovieListener
-{
-    enum EMovieEvent
-    {
-        eMovieEvent_Started = 0,   // fired when sequence is started
-        eMovieEvent_Stopped,       // fired when sequence ended normally
-        eMovieEvent_Aborted,       // fired when sequence was aborted before normal end (STOP and ABORTED event are mutually exclusive!)
-        eMovieEvent_Updated,            // fired after sequence time or playback speed was updated
-        eMovieEvent_RecordModeStarted,  // fired when Record Mode is started
-        eMovieEvent_RecordModeStopped,  // fired when Record Mode is stopped
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IMovieListener(){}
-    //! callback on movie events
-    virtual void OnMovieEvent(EMovieEvent movieEvent, IAnimSequence* pAnimSequence) = 0;
-    // </interfuscator:shuffle>
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-};
-
-/** Movie System interface.
-        Main entrance point to engine movie capability.
-        Enumerate available movies, update all movies, create animation nodes and tracks.
- */
-struct IMovieSystem
-{
-    AZ_RTTI(IMovieSystem, "{D8E6D6E9-830D-40DC-87F3-E9A069FBEB69}")
-
-    enum ESequenceStopBehavior
-    {
-        eSSB_LeaveTime = 0,         // When sequence is stopped it remains in last played time.
-        eSSB_GotoEndTime = 1,       // Default behavior in game, sequence is animated at end time before stop.
-        eSSB_GotoStartTime = 2, // Default behavior in editor, sequence is animated at start time before stop.
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IMovieSystem(){}
-
-    //! Release movie system.
-    virtual void Release() = 0;
-    //! Set the user.
-    virtual void SetUser(IMovieUser* pUser) = 0;
-    //! Get the user.
-    virtual IMovieUser* GetUser() = 0;
-
-    virtual IAnimSequence* CreateSequence(const char* sequence, bool bLoad = false, uint32 id = 0, SequenceType = kSequenceTypeDefault, AZ::EntityId entityId = AZ::EntityId()) = 0;
-    virtual void AddSequence(IAnimSequence* sequence) = 0;
-    virtual void RemoveSequence(IAnimSequence* sequence) = 0;
-    virtual IAnimSequence* FindLegacySequenceByName(const char* sequence) const = 0;
-    virtual IAnimSequence* FindSequence(const AZ::EntityId& componentEntitySequenceId) const = 0;
-    virtual IAnimSequence* FindSequenceById(uint32 id) const = 0;
-    virtual IAnimSequence* GetSequence(int i) const = 0;
-    virtual int GetNumSequences() const = 0;
-    virtual IAnimSequence* GetPlayingSequence(int i) const = 0;
-    virtual int GetNumPlayingSequences() const = 0;
-    virtual bool IsCutScenePlaying() const = 0;
-
-    virtual uint32 GrabNextSequenceId() = 0;
-    // called whenever a new sequence Id is set - to update nextSequenceId
-    virtual void OnSetSequenceId(uint32 sequenceId) = 0;
-    //////////////////////////////////////////////////////////////////////////
-    //
-    // If the name of a sequence changes, the keys that refer it in the
-    // sequence track of the director node should be properly updated also.
-    //
-    // @param   before The old name of the sequence.
-    // @param   after The new name of the sequence.
-    // @return  Number of modified sequence keys.
-    //
-    //////////////////////////////////////////////////////////////////////////
-    virtual int OnSequenceRenamed(const char* before, const char* after) = 0;
-    //////////////////////////////////////////////////////////////////////////
-    //
-    // If the name of a camera changes, the keys that refer it in the
-    // camera track of the director node should be properly updated also.
-    // This updates the name of the corresponding camera node also, if any.
-    //
-    // @param   before The old name of the camera.
-    // @param   after The new name of the camera.
-    // @return  Number of modified camera keys.
-    //
-    //////////////////////////////////////////////////////////////////////////
-    virtual int OnCameraRenamed(const char* before, const char* after) = 0;
-
-    // Adds a listener to a sequence
-    // @param sequence Pointer to sequence
-    // @param pListener Pointer to an IMovieListener
-    // @return true on successful add, false otherwise
-    virtual bool AddMovieListener(IAnimSequence* sequence, IMovieListener* pListener) = 0;
-
-    // Removes a listener from a sequence
-    // @param sequence Pointer to sequence
-    // @param pListener Pointer to an IMovieListener
-    // @return true on successful removal, false otherwise
-    virtual bool RemoveMovieListener(IAnimSequence* sequence, IMovieListener* pListener) = 0;
-
-    virtual ISystem* GetSystem() = 0;
-
-    // Remove all sequences from movie system.
-    virtual void RemoveAllSequences() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Sequence playback.
-    //////////////////////////////////////////////////////////////////////////
-    // Start playing sequence.
-    // Call ignored if sequence is already playing.
-    // @param sequence Name of sequence to play.
-    virtual void PlaySequence(const char* pSequenceName, IAnimSequence* pParentSeq, bool bResetFX, bool bTrackedSequence, float startTime = -FLT_MAX, float endTime = -FLT_MAX) = 0;
-
-    // Start playing sequence.
-    // Call ignored if sequence is already playing.
-    // @param sequence Pointer to Valid sequence to play.
-    virtual void PlaySequence(IAnimSequence* sequence, IAnimSequence* pParentSeq, bool bResetFX, bool bTrackedSequence, float startTime = -FLT_MAX, float endTime = -FLT_MAX) = 0;
-
-    // Stops currently playing sequence.
-    // Ignored if sequence is not playing.
-    // Returns true if sequence has been stopped. false otherwise
-    // @param sequence Name of playing sequence to stop.
-    virtual bool StopSequence(const char* pSequenceName) = 0;
-
-    // Stop's currently playing sequence.
-    // Ignored if sequence is not playing.
-    // Returns true if sequence has been stopped. false otherwise
-    // @param sequence Pointer to Valid sequence to stop.
-    virtual bool StopSequence(IAnimSequence* sequence) = 0;
-
-    /** Aborts a currently playing sequence.
-            Ignored if sequence is not playing.
-            Calls IMovieListener with MOVIE_EVENT_ABORTED event (MOVIE_EVENT_DONE is NOT called)
-            Returns true if sequence has been aborted. false otherwise
-            @param sequence Pointer to Valid sequence to stop.
-            @param bLeaveTime If false, uses default stop behavior, otherwise leaves the sequence at time
-    */
-    virtual bool AbortSequence(IAnimSequence* sequence, bool bLeaveTime = false) = 0;
-
-    // Stops all currently playing sequences.
-    virtual void StopAllSequences() = 0;
-
-    // Stops all playing cut-scene sequences.
-    // This will not stop all sequences, but only those with CUT_SCENE flag set.
-    virtual void StopAllCutScenes() = 0;
-
-    // Checks if specified sequence is playing.
-    virtual bool IsPlaying(IAnimSequence* seq) const = 0;
-
-    /** Resets playback state of movie system,
-            usually called after loading of level,
-    */
-    virtual void Reset(bool bPlayOnReset, bool bSeekToStart) = 0;
-
-    // Sequences with PLAY_ONRESET flag will start playing after this call.
-    virtual void PlayOnLoadSequences() = 0;
-
-    // Update movie system while not playing animation.
-    virtual void StillUpdate() = 0;
-
-    // Updates movie system every frame before the entity system to animate all playing sequences.
-    virtual void PreUpdate(const float dt) = 0;
-
-    // Updates movie system every frame after the entity system to animate all playing sequences.
-    virtual void PostUpdate(const float dt) = 0;
-
-    // Render function call of some special node.
-    virtual void Render() = 0;
-
-    // Set and enable Fixed Step cvars
-    virtual void EnableFixedStepForCapture(float step) = 0;
-
-    // Disable Fixed Step cvars and return to previous settings
-    virtual void DisableFixedStepForCapture() = 0;
- 
-    // Signal the capturing start.
-    virtual void StartCapture(const ICaptureKey& key, int frame) = 0;
-
-    // Signal the capturing end.
-    virtual void EndCapture() = 0;
-
-    // Actually turn on/off the capturing.
-    // This is needed for the timing issue of turning on/off the capturing.
-    virtual void ControlCapture() = 0;
-
-    // Returns true if a Render Output capture is currently active.
-    virtual bool IsCapturing() const = 0;
-
-    // Set movie system into recording mode,
-    // While in recording mode any changes made to node will be added as keys to tracks.
-    virtual void SetRecording(bool recording) = 0;
-    virtual bool IsRecording() const = 0;
-
-    virtual void EnableCameraShake(bool bEnabled) = 0;
-    virtual bool IsCameraShakeEnabled() const = 0;
-
-    // Pause any playing sequences.
-    virtual void Pause() = 0;
-
-    // Resume playing sequences.
-    virtual void Resume() = 0;
-
-    // Pause cut scenes in editor.
-    virtual void PauseCutScenes() = 0;
-
-    // Resume cut scenes in editor.
-    virtual void ResumeCutScenes() = 0;
-
-    // Callback when animation-data changes
-    virtual void SetCallback(IMovieCallback* pCallback) = 0;
-
-    virtual IMovieCallback* GetCallback() = 0;
-
-    virtual const SCameraParams& GetCameraParams() const = 0;
-    virtual void SetCameraParams(const SCameraParams& Params) = 0;
-    virtual void SendGlobalEvent(const char* pszEvent) = 0;
-
-    // Gets the float time value for a sequence that is already playing
-    virtual float GetPlayingTime(IAnimSequence* pSeq) = 0;
-    virtual float GetPlayingSpeed(IAnimSequence* pSeq) = 0;
-    // Sets the time progression of an already playing cutscene.
-    // If IAnimSequence:NO_SEEK flag is set on pSeq, this call is ignored.
-    virtual bool SetPlayingTime(IAnimSequence* pSeq, float fTime) = 0;
-    virtual bool SetPlayingSpeed(IAnimSequence* pSeq, float fSpeed) = 0;
-    // Set behavior pattern for stopping sequences.
-    virtual void SetSequenceStopBehavior(ESequenceStopBehavior behavior) = 0;
-
-    // Set the start and end time of an already playing cutscene.
-    virtual bool GetStartEndTime(IAnimSequence* pSeq, float& fStartTime, float& fEndTime) = 0;
-    virtual bool SetStartEndTime(IAnimSequence* pSeq, const float fStartTime, const float fEndTime) = 0;
-
-    // Make the specified sequence go to a given frame time.
-    // @param seqName A sequence name.
-    // @param targetFrame A target frame to go to in time.
-    virtual void GoToFrame(const char* seqName, float targetFrame) = 0;
-
-    // Get the name of camera used for sequences instead of cameras specified in the director node.
-    virtual const char* GetOverrideCamName() const = 0;
-
-    // Get behavior pattern for stopping sequences.
-    virtual IMovieSystem::ESequenceStopBehavior GetSequenceStopBehavior() = 0;
-
-    // These are used to disable 'Ragdollize' events in the editor when the 'AI/Physics' is off.
-    virtual bool IsPhysicsEventsEnabled() const = 0;
-    virtual void EnablePhysicsEvents(bool enable) = 0;
-
-    virtual void EnableBatchRenderMode(bool bOn) = 0;
-    virtual bool IsInBatchRenderMode() const = 0;
-
-    virtual ILightAnimWrapper* CreateLightAnimWrapper(const char* name) const = 0;
-
-    virtual void LoadParamTypeFromXml(CAnimParamType& animParamType, const XmlNodeRef& xmlNode, const uint version) = 0;
-    virtual void SaveParamTypeToXml(const CAnimParamType& animParamType, XmlNodeRef& xmlNode) = 0;
-
-    // Should only be called from CAnimParamType
-    virtual void SerializeParamType(CAnimParamType& animParamType, XmlNodeRef& xmlNode, bool bLoading, const uint version) = 0;
-
-    // For buffering and presenting user notification messages in the Editor. Will also print as an AZ_Warning()
-    virtual void LogUserNotificationMsg(const AZStd::string& msg) = 0;
-    virtual void ClearUserNotificationMsgs() = 0;
-    virtual const AZStd::string& GetUserNotificationMsgs() const = 0;
-
-    // Call this from OnActivate() when a new sequence component entity is activated.
-    virtual void OnSequenceActivated(IAnimSequence* sequence) = 0;
-
-#ifdef MOVIESYSTEM_SUPPORT_EDITING
-    virtual AnimNodeType GetNodeTypeFromString(const char* pString) const = 0;
-    virtual CAnimParamType GetParamTypeFromString(const char* pString) const = 0;
-#endif
-
-    // fill in the animNodeType from the xmlNode description (or vice versa)
-    virtual void SerializeNodeType(AnimNodeType& animNodeType, XmlNodeRef& xmlNode, bool bLoading, const uint version, int flags) = 0;
-
-    // </interfuscator:shuffle>
-};
-
-inline void SAnimContext::Serialize(XmlNodeRef& xmlNode, bool bLoading)
-{
-    if (bLoading)
-    {
-        XmlString name;
-        if (xmlNode->getAttr("sequence", name))
-        {
-            sequence = gEnv->pMovieSystem->FindLegacySequenceByName(name.c_str());
-        }
-        xmlNode->getAttr("dt", dt);
-        xmlNode->getAttr("fps", fps);
-        xmlNode->getAttr("time", time);
-        xmlNode->getAttr("bSingleFrame", singleFrame);
-        xmlNode->getAttr("bResetting", resetting);
-        xmlNode->getAttr("trackMask", trackMask);
-        xmlNode->getAttr("startTime", startTime);
-    }
-    else
-    {
-        if (sequence)
-        {
-            string fullname = sequence->GetName();
-            xmlNode->setAttr("sequence", fullname.c_str());
-        }
-        xmlNode->setAttr("dt", dt);
-        xmlNode->setAttr("fps", fps);
-        xmlNode->setAttr("time", time);
-        xmlNode->setAttr("bSingleFrame", singleFrame);
-        xmlNode->setAttr("bResetting", resetting);
-        xmlNode->setAttr("trackMask", trackMask);
-        xmlNode->setAttr("startTime", startTime);
-    }
-}
-
-inline void CAnimParamType::SaveToXml(XmlNodeRef& xmlNode) const
-{
-    gEnv->pMovieSystem->SaveParamTypeToXml(*this, xmlNode);
-}
-
-inline void CAnimParamType::LoadFromXml(const XmlNodeRef& xmlNode, const uint version)
-{
-    gEnv->pMovieSystem->LoadParamTypeFromXml(*this, xmlNode, version);
-}
-
-inline void CAnimParamType::Serialize(XmlNodeRef& xmlNode, bool bLoading, const uint version)
-{
-    gEnv->pMovieSystem->SerializeParamType(*this, xmlNode, bLoading, version);
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_IMOVIESYSTEM_H
diff --git a/Code/CryEngine/CryCommon/INavigationSystem.h b/Code/CryEngine/CryCommon/INavigationSystem.h
deleted file mode 100644
index 9d04a87132..0000000000
--- a/Code/CryEngine/CryCommon/INavigationSystem.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_INAVIGATIONSYSTEM_H
-#define CRYINCLUDE_CRYCOMMON_INAVIGATIONSYSTEM_H
-#pragma once
-
-#include <AzCore/std/functional.h>
-
-#include <IMNM.h>
-#include <physinterface.h>
-
-struct IOffMeshNavigationManager;
-
-enum ENavigationIDTag
-{
-    MeshIDTag = 0,
-    AgentTypeIDTag,
-    VolumeIDTag,
-};
-
-template <ENavigationIDTag T>
-struct TNavigationID
-{
-    explicit TNavigationID(uint32 _id = 0)
-        : id(_id) {}
-
-    TNavigationID& operator=(const TNavigationID& other) { id = other.id; return *this; }
-
-    ILINE operator uint32() const { return id; }
-    ILINE bool operator==(const TNavigationID& other) const { return id == other.id; }
-    ILINE bool operator!=(const TNavigationID& other) const { return id != other.id; }
-    ILINE bool operator<(const TNavigationID& other) const { return id < other.id; }
-
-private:
-    uint32 id;
-};
-
-
-typedef TNavigationID<MeshIDTag> NavigationMeshID;
-typedef TNavigationID<AgentTypeIDTag> NavigationAgentTypeID;
-typedef TNavigationID<VolumeIDTag> NavigationVolumeID;
-typedef AZStd::function<void(NavigationAgentTypeID, NavigationMeshID, uint32)> NavigationMeshChangeCallback;
-typedef AZStd::function<bool(IPhysicalEntity&, uint32&)> NavigationMeshEntityCallback;
-
-struct INavigationSystemUser
-{
-    virtual ~INavigationSystemUser() {}
-
-    virtual void Reset() = 0;
-    virtual void UpdateForSynchronousOrAsynchronousReadingOperation() = 0;
-    virtual void UpdateForSynchronousWritingOperations() = 0;
-    virtual void CompleteRunningTasks() = 0;
-};
-
-struct INavigationSystem
-{
-    enum ENavigationEvent
-    {
-        MeshReloaded = 0,
-        MeshReloadedAfterExporting,
-        NavigationCleared,
-    };
-
-    enum EAccessbilityDir
-    {
-        AccessibilityToward,
-        AccessibilityAway,
-    };
-
-    struct INavigationSystemListener
-    {
-        // <interfuscator:shuffle>
-        virtual ~INavigationSystemListener(){}
-        virtual void OnNavigationEvent(const ENavigationEvent event) = 0;
-        // </interfuscator:shuffle>
-    };
-
-    enum WorkingState
-    {
-        Idle = 0,
-        Working,
-    };
-
-
-    struct CreateAgentTypeParams
-    {
-        CreateAgentTypeParams(const Vec3& _voxelSize = Vec3(0.1f), uint16 _radiusVoxelCount = 4,
-            uint16 _climbableVoxelCount = 4, uint16 _heightVoxelCount = 18,
-            [[maybe_unused]] uint16 _maxWaterDepthVoxelCount = 6)
-            : voxelSize(_voxelSize)
-            , climbableInclineGradient(1.0f)
-            , climbableStepRatio(0.75f)
-            , radiusVoxelCount(_radiusVoxelCount)
-            , climbableVoxelCount(_climbableVoxelCount)
-            , heightVoxelCount(_heightVoxelCount)
-            , maxWaterDepthVoxelCount()
-        {
-        }
-
-        Vec3 voxelSize;
-
-        float climbableInclineGradient;
-        float climbableStepRatio;
-
-        uint16 radiusVoxelCount;
-        uint16 climbableVoxelCount;
-        uint16 heightVoxelCount;
-        uint16 maxWaterDepthVoxelCount;
-    };
-
-    struct CreateMeshParams
-    {
-        CreateMeshParams(const Vec3& _origin = Vec3(ZERO), const Vec3i& _tileSize = Vec3i(8), const uint32 _tileCount = 1024)
-            : origin(_origin)
-            , tileSize(_tileSize)
-            , tileCount(_tileCount)
-        {
-        }
-
-        Vec3 origin;
-        Vec3i tileSize;
-        uint32 tileCount;
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~INavigationSystem() {}
-    virtual NavigationAgentTypeID CreateAgentType(const char* name, const CreateAgentTypeParams& params) = 0;
-    virtual NavigationAgentTypeID GetAgentTypeID(const char* name) const = 0;
-    virtual NavigationAgentTypeID GetAgentTypeID(size_t index) const = 0;
-    virtual const char* GetAgentTypeName(NavigationAgentTypeID agentTypeID) const = 0;
-    virtual size_t GetAgentTypeCount() const = 0;
-
-    virtual NavigationMeshID CreateMesh(const char* name, NavigationAgentTypeID agentTypeID, const CreateMeshParams& params) = 0;
-    virtual NavigationMeshID CreateMesh(const char* name, NavigationAgentTypeID agentTypeID, const CreateMeshParams& params, NavigationMeshID requestedID) = 0;
-    virtual void DestroyMesh(NavigationMeshID meshID) = 0;
-
-    virtual void SetMeshEntityCallback(NavigationAgentTypeID agentTypeID, const NavigationMeshEntityCallback& callback) = 0;
-    virtual void AddMeshChangeCallback(NavigationAgentTypeID agentTypeID, const NavigationMeshChangeCallback& callback) = 0;
-    virtual void RemoveMeshChangeCallback(NavigationAgentTypeID agentTypeID, const NavigationMeshChangeCallback& callback) = 0;
-
-    virtual void SetMeshBoundaryVolume(NavigationMeshID meshID, NavigationVolumeID volumeID) = 0;
-    virtual NavigationVolumeID CreateVolume(Vec3* vertices, size_t vertexCount, float height) = 0;
-    virtual NavigationVolumeID CreateVolume(Vec3* vertices, size_t vertexCount, float height, NavigationVolumeID requestedID) = 0;
-    virtual void DestroyVolume(NavigationVolumeID volumeID) = 0;
-    virtual void SetVolume(NavigationVolumeID volumeID, Vec3* vertices, size_t vertexCount, float height) = 0;
-    virtual bool ValidateVolume(NavigationVolumeID volumeID) = 0;
-    virtual NavigationVolumeID GetVolumeID(NavigationMeshID meshID) = 0;
-
-    virtual void SetExclusionVolume(const NavigationAgentTypeID* agentTypeIDs, size_t agentTypeIDCount, NavigationVolumeID volumeID) = 0;
-
-    virtual NavigationMeshID GetMeshID(const char* name, NavigationAgentTypeID agentTypeID) const = 0;
-    virtual const char* GetMeshName(NavigationMeshID meshID) const = 0;
-    virtual void SetMeshName(NavigationMeshID meshID, const char* name) = 0;
-
-    virtual WorkingState GetState() const = 0;
-    virtual WorkingState Update(bool blocking = false) = 0;
-    virtual void PauseNavigationUpdate() = 0;
-    virtual void RestartNavigationUpdate() = 0;
-
-    virtual size_t QueueMeshUpdate(NavigationMeshID meshID, const AABB& aabb) = 0;
-    virtual void ProcessQueuedMeshUpdates() = 0;
-
-    virtual void Clear() = 0;
-    // ClearAndNotify it's used when the listeners need to be notified about
-    // the performed clear operation.
-    virtual void ClearAndNotify() = 0;
-    virtual bool ReloadConfig() = 0;
-    virtual void DebugDraw() = 0;
-    virtual void Reset() = 0;
-
-    virtual void WorldChanged(const AABB& aabb) = 0;
-
-    virtual void SetDebugDisplayAgentType(NavigationAgentTypeID agentTypeID) = 0;
-    virtual NavigationAgentTypeID GetDebugDisplayAgentType() const = 0;
-
-    //Returns impact mesh ID and point if segment intersects
-    virtual std::tuple<bool, NavigationMeshID, Vec3> RaycastWorld(const Vec3& segP0, const Vec3& segP1) const = 0;
-
-    virtual bool GetClosestPointInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location, float vrange, float hrange, Vec3* meshLocation, float minIslandArea = 0.f) const = 0;
-
-    //Returns nav mesh ID at the specified location based on the passed in agent type
-    virtual NavigationMeshID GetEnclosingMeshID(NavigationAgentTypeID agentTypeID, const Vec3& location) const = 0;
-
-    virtual bool IsLocationValidInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location) const = 0;
-
-    //Test to see if the specified location is within the navmesh.  The point has to be weithin downRange and upRange offset from location
-    virtual bool IsLocationContainedWithinTriangleInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location, float downRange, float upRange) const = 0;
-
-    //Returns a list of triangle centers within the specified AABB and navmesh
-    virtual size_t GetTriangleCenterLocationsInMesh(const NavigationMeshID meshID, const Vec3& location, const AABB& searchAABB, Vec3* centerLocations, size_t maxCenterLocationCount, float minIslandArea = 0.f) const = 0;
-
-    // Returns all borders (unconnected edges) in the specified AABB.  There are 3 Vec3's
-    // per border edge, vert 0, vert 1, and a normal pointing out from the edge.  You can
-    // pass null for pBorders to return the total number of borders (multiply this by 3 to
-    // get the total number of Vec3's you need to pass in).
-    virtual size_t GetTriangleBorders(const NavigationMeshID meshID, const AABB& aabb, Vec3* pBorders, size_t maxBorderCount, float minIslandArea = 0.f) const = 0;
-
-    //For Hunt - gets triangle centers, and island ids - this is used to compute spawn points for an area
-    virtual size_t GetTriangleInfo(const NavigationMeshID meshID, const AABB& aabb, Vec3* centerLocations, uint32* islandids, size_t max_count, float minIslandArea = 0.f) const = 0;
-
-    //returns island id of the triangle at the current position
-    virtual MNM::GlobalIslandID GetGlobalIslandIdAtPosition(const NavigationAgentTypeID agentID, const Vec3& location) = 0;
-
-    virtual bool ReadFromFile(const char* fileName, bool bAfterExporting) = 0;
-    virtual bool SaveToFile(const char* fileName) const = 0;
-
-    virtual void RegisterListener(INavigationSystemListener* pListener, const char* name = NULL) = 0;
-    virtual void UnRegisterListener(INavigationSystemListener* pListener) = 0;
-
-    virtual void RegisterUser(INavigationSystemUser* pExtension, const char* name = NULL) = 0;
-    virtual void UnRegisterUser(INavigationSystemUser* pExtension) = 0;
-
-    virtual void RegisterArea(const char* shapeName) = 0;
-    virtual void UnRegisterArea(const char* shapeName) = 0;
-    virtual bool IsAreaPresent(const char* shapeName) = 0;
-    virtual NavigationVolumeID GetAreaId(const char* shapeName) const = 0;
-    virtual void SetAreaId(const char* shapeName, NavigationVolumeID id) = 0;
-    virtual void UpdateAreaNameForId(const NavigationVolumeID id, const char* newShapeName) = 0;
-
-    virtual void StartWorldMonitoring() = 0;
-    virtual void StopWorldMonitoring() = 0;
-
-    virtual bool IsInUse() const = 0;
-
-    virtual void CalculateAccessibility() = 0;
-
-    virtual uint32 GetTileIdWhereLocationIsAtForMesh(NavigationMeshID meshID, const Vec3& location) = 0;
-    virtual void GetTileBoundsForMesh(NavigationMeshID meshID, uint32 tileID, AABB& bounds) const = 0;
-
-    virtual MNM::TriangleID GetTriangleIDWhereLocationIsAtForMesh(const NavigationAgentTypeID agentID, const Vec3& location) = 0;
-
-    virtual const IOffMeshNavigationManager& GetIOffMeshNavigationManager() const = 0;
-    virtual IOffMeshNavigationManager& GetIOffMeshNavigationManager() = 0;
-    virtual void ComputeAccessibility(const Vec3& seedPos, NavigationAgentTypeID agentTypeId = NavigationAgentTypeID(0), float range = 0.f, EAccessbilityDir dir = AccessibilityAway) = 0;
-    virtual bool TryGetAgentRadiusData(const char* agentType, Vec3& voxelSize, uint16& radiusInVoxels) const = 0;
-    // </interfuscator:shuffle>
-};
-
-
-
-#endif // CRYINCLUDE_CRYCOMMON_INAVIGATIONSYSTEM_H
diff --git a/Code/CryEngine/CryCommon/IPathfinder.h b/Code/CryEngine/CryCommon/IPathfinder.h
deleted file mode 100644
index 6678470be2..0000000000
--- a/Code/CryEngine/CryCommon/IPathfinder.h
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Pathfinder Interface.
-
-#pragma once
-
-struct IAIPathAgent;
-
-#include <INavigationSystem.h>
-#include <IMNM.h>
-#include <ISerialize.h>
-#include <SerializeFwd.h>
-#include <Cry_Geo.h>
-
-#include <AzCore/std/functional.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <limits>
-
-// Hacks to deal with windows header inclusion.
-#ifdef GetObject
-#undef GetObject
-#endif
-#ifdef GetUserName
-#undef GetUserName
-#endif
-#ifdef DrawText
-#undef DrawText
-#endif
-#ifdef LoadLibrary
-#undef LoadLibrary
-#endif
-#ifdef max
-#undef max
-#endif
-
-/* WARNING: These interfaces and structures are soon to be deprecated.
-                        Use at your own risk of having to change your code later!
-*/
-
-
-// Passing through navigational SO methods.
-enum ENavSOMethod
-{
-    nSOmNone,                           // not passing or not passable
-    nSOmAction,                     // execute an AI action
-    nSOmPriorityAction,     // execute a higher priority AI action
-    nSOmStraight,                   // just pass straight
-    nSOmSignalAnimation,    // play signal animation
-    nSOmActionAnimation,    // play action animation
-    nSOmLast
-};
-
-// Indication of (a) what a graph node represents and (b) what kind of graph node an AI entity
-// can navigate. In the latter case it can be used as a bit mask.
-// Copied from CryCommon/IAISystem.h which has been deleted.
-enum ENavigationType
-{
-    NAV_UNSET              = 1 << 0,
-    NAV_TRIANGULAR         = 1 << 1,
-    NAV_WAYPOINT_HUMAN     = 1 << 2,
-    NAV_WAYPOINT_3DSURFACE = 1 << 3,
-    NAV_FLIGHT             = 1 << 4,
-    NAV_VOLUME             = 1 << 5,
-    NAV_ROAD               = 1 << 6,
-    NAV_SMARTOBJECT        = 1 << 7,
-    NAV_FREE_2D            = 1 << 8,
-    NAV_CUSTOM_NAVIGATION    = 1 << 9,
-    NAV_MAX_VALUE          = NAV_CUSTOM_NAVIGATION
-};
-
-//====================================================================
-// NavigationBlocker
-// Represents an object that might be blocking a link. Each blocker is
-// assumed to be spherical, with the position centred around the floor
-// so that links can intersect it.
-//====================================================================
-struct NavigationBlocker
-{
-    /// pos and radius define the sphere.
-    /// costAddMod is a fixed cost (in m) associated with the blocker obscuring a link - a value of 0 has
-    /// no effect - a value of 10 would make the link effectively 10m longer than it is.
-    /// costMultMod is the cost modification factor - a value of 0 has no effect - a value of 10 would make the link
-    /// 10x more costly. -ve disables the link
-    /// radialDecay indicates if the cost modifiers should decay linearly to 0 over the radius of the sphere
-    /// directional indicates if the cost should be unaffected for motion in a radial direction
-    NavigationBlocker(const Vec3& pos, float radius, float _costAddMod, float _costMultMod, bool _radialDecay, bool _directional)
-        : sphere(pos, radius)
-        , costAddMod(_costAddMod)
-        , costMultMod(_costMultMod)
-        , restrictedLocation(false)
-        , radialDecay(_radialDecay)
-        , directional(_directional) {}
-
-    /// Just to allow std::vector::resize(0)
-    NavigationBlocker()
-        : sphere(Vec3(0, 0, 0), 0.0f)
-        , costAddMod(0)
-        , costMultMod(0)
-        , radialDecay(false) {AZ_Assert(false, "Should never get called"); }
-
-    ::Sphere sphere;
-    bool radialDecay;
-    bool directional;
-
-    /// absolute cost added to any link going through this blocker (useful for small blockers)
-    float costAddMod;
-    /// multiplier for link costs going through this blocker (0 means no extra cost, 1 means to double etc)
-    float costMultMod;
-
-    // info to speed up the intersection checks
-    /// If this is true then the blocker is small enough that it only affects the
-    /// nav type it resides in. If false then it affects everything.
-    bool restrictedLocation;
-    ENavigationType navType;
-    union Location
-    {
-        struct // similar for other nav types when there's info to go in them
-        {
-            // no node because the node "areas" can overlap so it's not useful
-            int nBuildingID;
-        } waypoint;
-    };
-    /// Only gets used if restrictedLocation = true
-    Location location;
-};
-
-typedef DynArray<NavigationBlocker> NavigationBlockers;
-
-
-//====================================================================
-// PathPointDescriptor
-//====================================================================
-struct PathPointDescriptor
-{
-    struct SmartObjectNavData
-        : public _i_reference_target_t
-    {
-        unsigned fromIndex;
-        unsigned toIndex;
-    };
-    typedef _smart_ptr< SmartObjectNavData > SmartObjectNavDataPtr;
-
-    struct OffMeshLinkData
-    {
-        OffMeshLinkData()
-            : meshID(0)
-            , offMeshLinkID(0)
-        {}
-
-        uint32 meshID;
-        MNM::OffMeshLinkID offMeshLinkID;
-    };
-
-    PathPointDescriptor(ENavigationType _navType = NAV_UNSET, const Vec3& _vPos = ZERO)
-        : vPos(_vPos)
-        , navType(_navType)
-        , navTypeCustomId(0)
-        , iTriId(0)
-        , pSONavData(0)
-        , navSOMethod(nSOmNone)
-    {}
-
-    PathPointDescriptor(const Vec3& _vPos)
-        : vPos(_vPos)
-        , navType(NAV_UNSET)
-        , navTypeCustomId(0)
-        , iTriId(0)
-        , pSONavData(0)
-        , navSOMethod(nSOmNone)
-    {}
-
-    bool IsEquivalent(const PathPointDescriptor& other) const
-    {
-        return (navType == other.navType) && vPos.IsEquivalent(other.vPos, 0.01f);
-    }
-
-    static bool ArePointsEquivalent(const PathPointDescriptor& point1, const PathPointDescriptor& point2)
-    {
-        return point1.IsEquivalent(point2);
-    }
-
-    Vec3 vPos;
-    ENavigationType navType;
-    uint16 navTypeCustomId;
-
-    uint32 iTriId;
-    OffMeshLinkData offMeshLinkData;
-
-    SmartObjectNavDataPtr pSONavData;
-
-    ENavSOMethod navSOMethod;
-};
-
-struct PathfindingExtraConstraint
-{
-    enum EExtraConstraintType
-    {
-        ECT_MAXCOST,
-        ECT_MINDISTFROMPOINT,
-        ECT_AVOIDSPHERE,
-        ECT_AVOIDCAPSULE
-    };
-
-    EExtraConstraintType type;
-
-    union UConstraint
-    {
-        struct SConstraintMaxCost
-        {
-            float maxCost;
-        };
-        struct SConstraintMinDistFromPoint
-        {
-            float px, py, pz; // Can't use Vec3 as it has a constructor.
-            float minDistSq;
-        };
-        struct SConstraintAvoidSphere
-        {
-            float px, py, pz; // Can't use Vec3 as it has a constructor.
-            float minDistSq;
-        };
-        struct SConstraintAvoidCapsule
-        {
-            float px, py, pz;
-            float qx, qy, qz;
-            float minDistSq;
-        };
-        SConstraintMaxCost maxCost;
-        SConstraintMinDistFromPoint minDistFromPoint;
-        SConstraintAvoidSphere avoidSphere;
-        SConstraintAvoidCapsule avoidCapsule;
-    };
-    UConstraint constraint;
-};
-
-typedef DynArray<PathfindingExtraConstraint> PathfindingExtraConstraints;
-
-
-struct PathfindRequest
-{
-    enum ERequestType
-    {
-        TYPE_ACTOR,
-        TYPE_RAW,
-    };
-    ERequestType type;
-
-    unsigned startIndex;
-    unsigned endIndex;
-    Vec3 startPos;
-    Vec3 startDir;
-    Vec3 endPos;
-    /// endDir magnitude indicates the tendency to line up at the end of the path -
-    /// magnitude should be between 0 and 1
-    Vec3 endDir;
-    bool bSuccess;
-    IAIPathAgent* pRequester;
-    int nForceTargetBuildingId;
-    bool allowDangerousDestination;
-    float endTol;
-    float endDistance;
-    // as a result of RequestPathInDirection or RequestPathTo
-    bool isDirectional;
-
-    /// This gets set to false if the path end position doesn't match the requested end position
-    /// (e.g. in the event of a partial path, or if the destination is in forbidden)
-    bool bPathEndIsAsRequested;
-
-    int id;
-    float passRadius;
-
-    PathfindingExtraConstraints extraConstraints;
-
-    PathfindRequest(ERequestType _type)
-        : type(_type)
-        , startIndex(0)
-        , endIndex(0)
-        , pRequester(0)
-        , bPathEndIsAsRequested(false)
-        , allowDangerousDestination(false)
-        , endTol(std::numeric_limits<float>::max())
-        , endDistance(0)
-        , nForceTargetBuildingId(-1)
-        , isDirectional(false)
-        , id(-1)
-        , passRadius(0.0f)
-    {
-    }
-};
-
-struct PathFollowerParams
-{
-    PathFollowerParams()
-        : normalSpeed(0.0f)
-        , pathRadius(0.0f)
-        , pathLookAheadDist(1.0f)
-        , maxAccel(0.0f)
-        , maxDecel(1.0f)
-        , minSpeed(0.0f)
-        , maxSpeed(10.0f)
-        , endAccuracy(0.2f)
-        , endDistance(0.0f)
-        , stopAtEnd(true)
-        , use2D(true)
-        , isVehicle(false)
-        , isAllowedToShortcut(true)
-        , passRadius(0.5f)
-    {}
-
-    // OLD: Remove this when possible, Animation to take over majority of logic
-    float normalSpeed; ///< normal entity speed
-    float pathRadius; ///< max deviation allowed from the path
-    float pathLookAheadDist; ///< how far we look ahead along the path - normally the same as pathRadius
-    float maxAccel; ///< maximum acceleration of the entity
-    float maxDecel; ///< maximum deceleration of the entity
-    float minSpeed; ///< minimum output speed (unless it's zero on path end etc)
-    float maxSpeed; ///< maximum output speed
-
-    // KEEP: Additions and useful state for new impl.
-    float endAccuracy; ///< How close to the end point the agent must be to finish pathing
-    float endDistance; ///< stop this much before the end
-    bool stopAtEnd; ///< aim to finish the path by reaching the end position (stationary), or simply overshoot
-    bool use2D; ///< follow in 2 or 3D
-    bool isVehicle;
-    bool isAllowedToShortcut;
-
-    /// The minimum radius of the agent for navigating
-    float passRadius;
-};
-
-
-struct PathFollowResult
-{
-    struct SPredictedState
-    {
-        SPredictedState() {}
-        SPredictedState(const Vec3& p, const Vec3& v)
-            : pos(p)
-            , vel(v) {}
-        Vec3 pos;
-        Vec3 vel;
-    };
-    typedef AZStd::vector<SPredictedState, AZ::StdLegacyAllocator> TPredictedStates;
-
-    // OLD: Obsolete & to be replaced by new impl.
-
-    /// maximum time to predict out to - actual prediction may not go this far
-    float desiredPredictionTime;
-    /// the first element in predictedStates will be now + predictionDeltaTime, etc
-    float predictionDeltaTime;
-    /// if this is non-zero then on output the prediction will be placed into it
-    TPredictedStates* predictedStates;
-
-    PathFollowResult()
-        : predictionDeltaTime(0.1f)
-        , predictedStates(0)
-        , desiredPredictionTime(0)
-        , distanceToEnd(0.f)
-        , reachedEnd(false)
-        , followTargetPos(0)
-        , inflectionPoint(0) {}
-
-
-    float distanceToEnd;
-    bool reachedEnd;
-    Vec3 velocityOut;
-
-    // NEW: Replaces data above
-
-    // NOTE: If the turningPoint and inflectionPoint are equal, they represent the end of the path.
-    /// The furthest point on the path we can move directly towards without colliding with anything
-    Vec3 followTargetPos;
-    /// The next point on the path beyond the follow target that deviates substantially from a straight-line path
-    Vec3 inflectionPoint;
-
-    /// The maximum distance the agent can safely move in a straight line beyond the turning point
-    //  float maxOverrunDistance;
-};
-
-
-
-// Intermediary and minimal interface to use the pathfinder without requiring an AI object
-// TODO: Fix the long function names. At the moment they collide with IAIObject base.
-//           The alternative would be to make IAIObject derive from IAIPathAgent.
-struct IAIPathAgent
-{
-    virtual ~IAIPathAgent(){}
-    virtual const char* GetPathAgentName() const = 0;
-    virtual unsigned short GetPathAgentType() const = 0;
-
-    virtual float GetPathAgentPassRadius() const = 0;
-    virtual Vec3 GetPathAgentPos() const = 0;
-    virtual Vec3 GetPathAgentVelocity() const = 0;
-
-    // This cannot easily be const, but has no side-effects
-    virtual void GetPathAgentNavigationBlockers(NavigationBlockers& blockers, const PathfindRequest* pRequest) = 0;
-
-    virtual void SetPathToFollow(const char* pathName) = 0;
-    virtual void SetPathAttributeToFollow(bool bSpline) = 0;
-
-    //Path finding avoids blocker type by radius.
-    virtual void SetPFBlockerRadius(int blockerType, float radius) = 0;
-
-    virtual bool GetValidPositionNearby(const Vec3& proposedPosition, Vec3& adjustedPosition) const = 0;
-    virtual bool GetTeleportPosition(Vec3& teleportPos) const = 0;
-
-    virtual class IPathFollower* GetPathFollower() const = 0;
-
-    virtual bool IsPointValidForAgent(const Vec3& pos, uint32 flags) const = 0;
-};
-
-typedef std::list<PathPointDescriptor> TPathPoints;
-
-struct SNavPathParams
-{
-    SNavPathParams(const Vec3& _start = Vec3_Zero, const Vec3& _end = Vec3_Zero,
-        const Vec3& _startDir = Vec3_Zero, const Vec3& _endDir = Vec3_Zero,
-        int _nForceBuildingID = -1, bool _allowDangerousDestination = false, float _endDistance = 0.0f,
-        bool _continueMovingAtEnd = false, bool _isDirectional = false)
-        : start(_start)
-        , end(_end)
-        , startDir(_startDir)
-        , endDir(_endDir)
-        , nForceBuildingID(_nForceBuildingID)
-        , allowDangerousDestination(_allowDangerousDestination)
-        , precalculatedPath(false)
-        , inhibitPathRegeneration(false)
-        , continueMovingAtEnd(_continueMovingAtEnd)
-        , endDistance(_endDistance)
-        , isDirectional(_isDirectional)
-    {}
-
-    Vec3 start;
-    Vec3 end;
-    Vec3 startDir;
-    Vec3 endDir;
-    int nForceBuildingID;
-    bool allowDangerousDestination;
-    /// if path is precalculated it should not be regenerated, and also some things like steering
-    /// will be disabled
-    bool precalculatedPath;
-    /// sometimes it is necessary to disable a normal path from getting regenerated
-    bool inhibitPathRegeneration;
-    bool continueMovingAtEnd;
-    bool isDirectional;
-    float endDistance; // The requested cut distance of the path, positive value means distance from path end, negative value means distance from path start.
-    NavigationMeshID meshID;
-
-    void Clear()
-    {
-        start = Vec3_Zero;
-        end = Vec3_Zero;
-        startDir = Vec3_Zero;
-        endDir = Vec3_Zero;
-        allowDangerousDestination = false;
-        precalculatedPath = false;
-        inhibitPathRegeneration = false;
-        continueMovingAtEnd = false;
-        isDirectional = false;
-        endDistance = 0.0f;
-        meshID = NavigationMeshID(0);
-    }
-
-    void Serialize(TSerialize ser)
-    {
-        ser.Value("start", start);
-        ser.Value("end", end);
-        ser.Value("startDir", startDir);
-        ser.Value("endDir", endDir);
-        ser.Value("nForceBuildingID", nForceBuildingID);
-        ser.Value("allowDangerousDestination", allowDangerousDestination);
-        ser.Value("precalculatedPath", precalculatedPath);
-        ser.Value("inhibitPathRegeneration", inhibitPathRegeneration);
-        ser.Value("continueMovingAtEnd", continueMovingAtEnd);
-        ser.Value("isDirectional", isDirectional);
-        ser.Value("endDistance", endDistance);
-
-        if (ser.IsReading())
-        {
-            uint32 meshIdAsUint32;
-            ser.Value("meshID", meshIdAsUint32);
-            meshID = NavigationMeshID(meshIdAsUint32);
-        }
-        else
-        {
-            uint32 meshIdAsUint32 = (uint32) meshID;
-            ser.Value("meshID", meshIdAsUint32);
-        }
-    }
-};
-
-class INavPath
-{
-public:
-    virtual ~INavPath(){}
-    virtual void Release() = 0;
-    virtual void CopyTo(INavPath* pRecipient) const = 0;
-    virtual AZStd::shared_ptr<INavPath> Clone() const = 0;
-
-    virtual NavigationMeshID GetMeshID() const = 0;
-
-    virtual int GetVersion() const = 0;
-    virtual void SetVersion(int version) = 0;
-
-    virtual void SetParams(const SNavPathParams& params) = 0;
-    virtual const SNavPathParams& GetParams() const = 0;
-    virtual SNavPathParams& GetParams() = 0;
-    virtual const TPathPoints& GetPath() const = 0;
-    virtual void SetPathPoints(const TPathPoints& points) = 0;
-
-    virtual float   GetPathLength(bool twoD) const = 0;
-    virtual void PushFront(const PathPointDescriptor& newPathPoint, bool force = false) = 0;
-    virtual void PushBack(const PathPointDescriptor& newPathPoint, bool force = false) = 0;
-    virtual void Clear(const char* contextName) = 0;
-    virtual bool Advance(PathPointDescriptor& nextPathPoint) = 0;
-
-    virtual bool GetPathEndIsAsRequested() const = 0;
-    virtual void SetPathEndIsAsRequested(bool value) = 0;
-
-    virtual bool Empty() const = 0;
-
-    virtual const PathPointDescriptor* GetLastPathPoint() const = 0;
-    virtual const PathPointDescriptor* GetPrevPathPoint() const = 0;
-    virtual const PathPointDescriptor* GetNextPathPoint() const = 0;
-    virtual const PathPointDescriptor* GetNextNextPathPoint() const = 0;
-
-    virtual const Vec3& GetNextPathPos(const Vec3& defaultPos = Vec3_Zero) const = 0;
-    virtual const Vec3& GetLastPathPos(const Vec3& defaultPos = Vec3_Zero) const = 0;
-
-    virtual bool GetPosAlongPath(Vec3& posOut, float dist, bool twoD, bool extrapolateBeyondEnd, ENavigationType* nextPointType = NULL) const = 0;
-    virtual float GetDistToPath(Vec3& pathPosOut, float& distAlongPathOut, const Vec3& pos, float dist, bool twoD) const = 0;
-    virtual float GetDistToSmartObject(bool twoD) const = 0;
-    virtual PathPointDescriptor::SmartObjectNavDataPtr GetLastPathPointAnimNavSOData() const = 0;
-    virtual void SetPreviousPoint(const PathPointDescriptor& previousPoint) = 0;
-
-    virtual AABB GetAABB(float dist) const = 0;
-
-    virtual bool GetPathPropertiesAhead(float distAhead, bool twoD, Vec3& posOut, Vec3& dirOut, float* invROut, float& lowestPathDotOut, bool scaleOutputWithDist) const = 0;
-
-    virtual void SetEndDir(const Vec3& endDir) = 0;
-    virtual const Vec3& GetEndDir() const = 0;
-
-    virtual bool UpdateAndSteerAlongPath(Vec3& dirOut, float& distToEndOut, float& distToPathOut, bool& isResolvingSticking, Vec3& pathDirOut, Vec3& pathAheadDirOut, Vec3& pathAheadPosOut, Vec3 currentPos, const Vec3& currentVel, float lookAhead, float pathRadius, float dt, bool resolveSticking, bool twoD) = 0;
-
-    virtual void TrimPath(float length, bool twoD) = 0;
-    virtual float GetDiscardedPathLength() const = 0;
-    virtual float UpdatePathPosition(Vec3 agentPos, float pathLookahead, bool twoD, bool allowPathToFinish) = 0;
-    virtual Vec3 CalculateTargetPos(Vec3 agentPos, float lookAhead, float minLookAheadAlongPath, float pathRadius, bool twoD) const = 0;
-
-    virtual void Draw(const Vec3& drawOffset = ZERO) const = 0;
-    virtual void Dump(const char* name) const = 0;
-
-    bool ArePathsEqual(const INavPath& otherNavPath)
-    {
-        const TPathPoints& path1 = this->GetPath();
-        const TPathPoints& path2 = otherNavPath.GetPath();
-        const TPathPoints::size_type path1Size = path1.size();
-        const TPathPoints::size_type path2Size = path2.size();
-        if (path1Size != path2Size)
-        {
-            return false;
-        }
-
-        TPathPoints::const_iterator path1It = path1.begin();
-        TPathPoints::const_iterator path1End = path1.end();
-        TPathPoints::const_iterator path2It = path2.begin();
-
-        typedef std::pair<TPathPoints::const_iterator, TPathPoints::const_iterator> TMismatchResult;
-
-        TMismatchResult result = std::mismatch(path1It, path1End, path2It, PathPointDescriptor::ArePointsEquivalent);
-        return result.first == path1.end();
-    }
-};
-using INavPathPtr = AZStd::shared_ptr<INavPath>;
-
-enum EMNMPathResult
-{
-    eMNMPR_NoPathFound = 0,
-    eMNMPR_Success,
-};
-
-struct MNMPathRequestResult
-{
-    MNMPathRequestResult()
-        : cost(0.f)
-        , id(0)
-        , result(eMNMPR_NoPathFound)
-    {}
-
-    ILINE bool HasPathBeenFound() const
-    {
-        return result == eMNMPR_Success;
-    }
-
-    INavPathPtr pPath;
-    float cost;
-    uint32 id;
-    EMNMPathResult result;
-};
-
-struct IPathObstacles
-{
-    virtual ~IPathObstacles() {}
-
-    virtual bool IsPathIntersectingObstacles(const NavigationMeshID meshID, const Vec3& start, const Vec3& end, float radius) const = 0;
-    virtual bool IsPointInsideObstacles(const Vec3& position) const = 0;
-    virtual bool IsLineSegmentIntersectingObstaclesOrCloseToThem(const Lineseg& linesegToTest, float maxDistanceToConsiderClose) const = 0;
-};
-
-class IPathFollower
-{
-public:
-    virtual ~IPathFollower(){}
-
-    virtual void Release() = 0;
-
-    virtual void Reset() = 0;
-
-    /// This attaches us to a particular path (pass 0 to detach)
-    virtual void AttachToPath(INavPath* navPath) = 0;
-
-    virtual void SetParams(const PathFollowerParams& params) = 0;
-
-    /// Just view the params
-    virtual const PathFollowerParams& GetParams() const = 0;
-    virtual PathFollowerParams& GetParams() = 0;
-
-    // Advances the follow target along the path as far as possible while ensuring the follow
-    // target remains reachable. Returns true if the follow target is reachable, false otherwise.
-    virtual bool Update(PathFollowResult& result, const Vec3& curPos, const Vec3& curVel, float dt) = 0;
-
-    /// Advances the current state in terms of position - effectively pretending that the follower
-    /// has gone further than it has.
-    virtual void Advance(float distance) = 0;
-
-    /// Returns the distance from the lookahead to the end, plus the distance from the position passed in
-    /// to the LA if pCurPos != 0
-    virtual float GetDistToEnd(const Vec3* pCurPos) const = 0;
-
-    /// Returns the distance along the path from the current look-ahead position to the
-    /// first smart object path segment. If there's no path, or no smart objects on the
-    /// path, then std::numeric_limits<float>::max() will be returned
-    virtual float GetDistToSmartObject() const = 0;
-    virtual float GetDistToNavType(ENavigationType navType) const = 0;
-
-    /// Returns a point on the path some distance ahead. actualDist is set according to
-    /// how far we looked - may be less than dist if we'd reach the end
-    virtual Vec3 GetPathPointAhead(float dist, float& actualDist) const = 0;
-
-    virtual void Draw(const Vec3& drawOffset = ZERO) const = 0;
-
-    virtual void Serialize(TSerialize ser) = 0;
-
-    // Checks ability to walk along a piecewise linear path starting from the current position
-    // (useful for example when animation would like to deviate from the path)
-    virtual bool CheckWalkability(const Vec2* path, const size_t length) const = 0;
-
-    // Can the pathfollower cut corners if there is space to do so? (default: true)
-    virtual bool GetAllowCuttingCorners() const = 0;
-
-    // Sets whether or not the pathfollower is allowed to cut corners if there is space to do so. (default: true)
-    virtual void SetAllowCuttingCorners(const bool allowCuttingCorners) = 0;
-};
-
-namespace MNM
-{
-    typedef unsigned int QueuedPathID;
-
-    namespace Constants
-    {
-        enum EQueuedPathID
-        {
-            eQueuedPathID_InvalidID = 0,
-        };
-    }
-}
-
-struct MNMPathRequest
-{
-    using Callback = AZStd::function<void(const MNM::QueuedPathID&, MNMPathRequestResult&)>;
-
-    MNMPathRequest()
-        : resultCallback(0)
-        , startLocation(ZERO)
-        , endLocation(ZERO)
-        , endDirection(Vec3(0, 1, 0))
-        , agentTypeID(NavigationAgentTypeID())
-        , forceTargetBuildingId(0)
-        , endTolerance(0.0f)
-        , endDistance(0.0f)
-        , allowDangerousDestination(false)
-        , beautify(true)
-    {
-    }
-
-    MNMPathRequest(const Vec3& start, const Vec3& end, const Vec3& _endDirection, int _forceTargetBuildingId,
-        float _endTolerance, float _endDistance, [[maybe_unused]] bool _allowDangerousDestination, const Callback& callback,
-        const NavigationAgentTypeID& _agentTypeID)
-        : resultCallback(callback)
-        , startLocation(start)
-        , endLocation(end)
-        , endDirection(_endDirection)
-        , agentTypeID(_agentTypeID)
-        , forceTargetBuildingId(_forceTargetBuildingId)
-        , endTolerance(_endTolerance)
-        , endDistance(_endDistance)
-        , allowDangerousDestination(false)
-        , beautify(true)
-    {
-    }
-
-    Callback resultCallback;
-
-    Vec3    startLocation;
-    Vec3    endLocation;
-    Vec3    endDirection;
-
-    NavigationAgentTypeID agentTypeID;
-
-    //Set beautify to false if you don't want to "beautify" the path (make it little less jagged, and more curvy)
-    bool    beautify;
-
-    int     forceTargetBuildingId;
-    float   endTolerance;
-    float   endDistance;
-    bool    allowDangerousDestination;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
-struct IMNMPathfinder
-{
-    virtual ~IMNMPathfinder() {};
-
-    //Request a path (look at MNMPathRequest for relevant request info).  This request is queued and processed in a seperate
-    //thread.  The path result is sent to the callback function specified in the request.  Returns an ID so you can cancel
-    //the request.
-    virtual MNM::QueuedPathID RequestPathTo(const IAIPathAgent* pRequester, const MNMPathRequest& request) = 0;
-    // Returns a four-tuple: triangle ID and three vertices
-    virtual const std::tuple<uint32, Vec3, Vec3, Vec3> GetCurrentNavTriangle(const IAIPathAgent* pRequester, NavigationAgentTypeID agentTypeID) const = 0;
-
-    //Cancel a requested path by ID
-    virtual void CancelPathRequest(MNM::QueuedPathID requestId) = 0;
-
-    virtual bool CheckIfPointsAreOnStraightWalkableLine(const NavigationMeshID& meshID, const Vec3& source, const Vec3& destination, float heightOffset = 0.2f) const = 0;
-};
diff --git a/Code/CryEngine/CryCommon/IPhysics.h b/Code/CryEngine/CryCommon/IPhysics.h
deleted file mode 100644
index 9abbe5431a..0000000000
--- a/Code/CryEngine/CryCommon/IPhysics.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IPHYSICS_H
-#define CRYINCLUDE_CRYCOMMON_IPHYSICS_H
-#pragma once
-
-
-//
-#ifdef PHYSICS_EXPORTS
-    #define CRYPHYSICS_API DLL_EXPORT
-#else
-    #define CRYPHYSICS_API DLL_IMPORT
-#endif
-
-#define vector_class Vec3_tpl
-
-
-#include <CrySizer.h>
-
-//////////////////////////////////////////////////////////////////////////
-// IDs that can be used for foreign id.
-//////////////////////////////////////////////////////////////////////////
-enum EPhysicsForeignIds
-{
-    PHYS_FOREIGN_ID_TERRAIN = 0,
-    PHYS_FOREIGN_ID_STATIC = 1,
-    PHYS_FOREIGN_ID_ENTITY = 2,
-    PHYS_FOREIGN_ID_FOLIAGE = 3,
-    PHYS_FOREIGN_ID_ROPE = 4,
-    PHYS_FOREIGN_ID_SOUND_OBSTRUCTION = 5,
-    PHYS_FOREIGN_ID_SOUND_PROXY_OBSTRUCTION = 6,
-    PHYS_FOREIGN_ID_SOUND_REVERB_OBSTRUCTION = 7,
-    PHYS_FOREIGN_ID_WATERVOLUME = 8,
-    PHYS_FOREIGN_ID_BREAKABLE_GLASS = 9,
-    PHYS_FOREIGN_ID_BREAKABLE_GLASS_FRAGMENT = 10,
-    PHYS_FOREIGN_ID_RIGID_PARTICLE = 11,
-    PHYS_FOREIGN_ID_RESERVED1 = 12,
-    PHYS_FOREIGN_ID_RAGDOLL = 13,
-    PHYS_FOREIGN_ID_COMPONENT_ENTITY = 14,
-
-    PHYS_FOREIGN_ID_USER = 100, // All user defined foreign ids should start from this enum.
-};
-
-
-//#include "utils.h"
-#include "Cry_Math.h"
-#include "primitives.h"
-#include <physinterface.h> // <> required for Interfuscator
-
-
-#endif // CRYINCLUDE_CRYCOMMON_IPHYSICS_H
diff --git a/Code/CryEngine/CryCommon/IPostEffectGroup.h b/Code/CryEngine/CryCommon/IPostEffectGroup.h
deleted file mode 100644
index 4e45fcff21..0000000000
--- a/Code/CryEngine/CryCommon/IPostEffectGroup.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/std/containers/variant.h>
-
-typedef AZStd::variant<float, Vec4, AZStd::string> PostEffectGroupParam;
-
-// A prioritized group of postprocessing effect parameters.
-// These are defined in XML files and can be enabled or disabled using flow graph or Lua scripts.
-// Effect groups can also optionally specify blend curves to smoothly transition between effects, whether to stay enabled until explicitly disabled,
-// and whether to make effect strength based on distance from the camera.
-class IPostEffectGroup
-{
-public:
-    virtual ~IPostEffectGroup(){}
-
-    virtual const char* GetName() const = 0;
-    virtual void SetEnable(bool enable) = 0;
-    virtual bool GetEnable() const = 0;
-    virtual unsigned int GetPriority() const = 0;
-    virtual bool GetHold() const = 0;
-    virtual float GetFadeDistance() const = 0;
-    virtual void SetParam(const char* name, const PostEffectGroupParam& value) = 0;
-    virtual PostEffectGroupParam* GetParam(const char* name) = 0;
-    virtual void ClearParams() = 0;
-    // Increases the strength of the effects based on distance from the camera each time it's called. The effect strength is cleared each frame.
-    // Only applies to effect groups with the fadeDistance attribute set.
-    virtual void ApplyAtPosition(const Vec3& position) = 0;
-};
-
-typedef AZStd::list<IPostEffectGroup*> PostEffectGroupList;
-
-class IPostEffectGroupManager
-{
-public:
-    virtual ~IPostEffectGroupManager(){}
-
-    virtual IPostEffectGroup* GetGroup(const char* name) = 0;
-    virtual IPostEffectGroup* GetGroup(const unsigned int index) = 0;
-    virtual const unsigned int GetGroupCount() = 0;
-    // Returns a list of IPostEffectGroups who had their Enabled state toggled this frame
-    virtual const PostEffectGroupList& GetGroupsToggledThisFrame() = 0;
-};
diff --git a/Code/CryEngine/CryCommon/IProcess.h b/Code/CryEngine/CryCommon/IProcess.h
deleted file mode 100644
index c99bf2fbdc..0000000000
--- a/Code/CryEngine/CryCommon/IProcess.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Process common interface
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IPROCESS_H
-#define CRYINCLUDE_CRYCOMMON_IPROCESS_H
-#pragma once
-
-
-// forward declaration
-struct      SRenderingPassInfo;
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-struct IProcess
-{
-    // <interfuscator:shuffle>
-    virtual ~IProcess(){}
-    virtual bool    Init() = 0;
-    virtual void    Update() = 0;
-    virtual void    RenderWorld(int nRenderFlags, const SRenderingPassInfo& passInfo, const char* szDebugName) = 0;
-    virtual void    ShutDown() = 0;
-    virtual void    SetFlags(int flags) = 0;
-    virtual int     GetFlags(void) = 0;
-    // </interfuscator:shuffle>
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_IPROCESS_H
diff --git a/Code/CryEngine/CryCommon/IReadWriteXMLSink.h b/Code/CryEngine/CryCommon/IReadWriteXMLSink.h
deleted file mode 100644
index a36b9e5492..0000000000
--- a/Code/CryEngine/CryCommon/IReadWriteXMLSink.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Moved Craig's ReadWriteXMLSink from CryAction to CrySystem
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IREADWRITEXMLSINK_H
-#define CRYINCLUDE_CRYCOMMON_IREADWRITEXMLSINK_H
-#pragma once
-
-#include <IXml.h>
-#include <AzCore/std/containers/variant.h>
-
-struct IReadXMLSink;
-struct IWriteXMLSource;
-
-struct IReadWriteXMLSink
-{
-    // <interfuscator:shuffle>
-    virtual ~IReadWriteXMLSink(){}
-    virtual bool ReadXML(const char* definitionFile, const char* dataFile, IReadXMLSink* pSink) = 0;
-    virtual bool ReadXML(const char* definitionFile, XmlNodeRef node, IReadXMLSink* pSink) = 0;
-    virtual bool ReadXML(XmlNodeRef definition, const char* dataFile, IReadXMLSink* pSink) = 0;
-    virtual bool ReadXML(XmlNodeRef definition, XmlNodeRef node, IReadXMLSink* pSink) = 0;
-
-    virtual XmlNodeRef CreateXMLFromSource(const char* definitionFile, IWriteXMLSource* pSource) = 0;
-    virtual bool WriteXML(const char* definitionFile, const char* dataFile, IWriteXMLSource* pSource) = 0;
-    // </interfuscator:shuffle>
-};
-
-
-struct SReadWriteXMLCommon
-{
-    typedef AZStd::variant<Vec3, int, float, const char*, bool> TValue;
-};
-
-
-TYPEDEF_AUTOPTR(IReadXMLSink);
-typedef IReadXMLSink_AutoPtr IReadXMLSinkPtr;
-
-// this interface allows customization of the data read routines
-struct IReadXMLSink
-    : public SReadWriteXMLCommon
-{
-    // <interfuscator:shuffle>
-    virtual ~IReadXMLSink(){}
-    // reference counting
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-
-    virtual IReadXMLSinkPtr BeginTable(const char* name, const XmlNodeRef& definition) = 0;
-    virtual IReadXMLSinkPtr BeginTableAt(int elem, const XmlNodeRef& definition) = 0;
-    virtual bool SetValue(const char* name, const TValue& value, const XmlNodeRef& definition) = 0;
-    virtual bool EndTableAt(int elem) = 0;
-    virtual bool EndTable(const char* name) = 0;
-
-    virtual IReadXMLSinkPtr BeginArray(const char* name, const XmlNodeRef& definition) = 0;
-    virtual bool SetAt(int elem, const TValue& value, const XmlNodeRef& definition) = 0;
-    virtual bool EndArray(const char* name) = 0;
-
-    virtual bool Complete() = 0;
-
-    virtual bool IsCreationMode() = 0;
-    virtual XmlNodeRef GetCreationNode() = 0;
-    virtual void SetCreationNode(XmlNodeRef definition) = 0;
-    // </interfuscator:shuffle>
-};
-
-
-TYPEDEF_AUTOPTR(IWriteXMLSource);
-typedef IWriteXMLSource_AutoPtr IWriteXMLSourcePtr;
-
-// this interface allows customization of the data write routines
-struct IWriteXMLSource
-    : public SReadWriteXMLCommon
-{
-    // <interfuscator:shuffle>
-    virtual ~IWriteXMLSource(){}
-    // reference counting
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-
-    virtual IWriteXMLSourcePtr BeginTable(const char* name) = 0;
-    virtual IWriteXMLSourcePtr BeginTableAt(int elem) = 0;
-    virtual bool HaveValue(const char* name) = 0;
-    virtual bool GetValue(const char* name, TValue& value, const XmlNodeRef& definition) = 0;
-    virtual bool EndTableAt(int elem) = 0;
-    virtual bool EndTable(const char* name) = 0;
-
-    virtual IWriteXMLSourcePtr BeginArray(const char* name, size_t* numElems, const XmlNodeRef& definition) = 0;
-    virtual bool HaveElemAt(int elem) = 0;
-    virtual bool GetAt(int elem, TValue& value, const XmlNodeRef& definition) = 0;
-    virtual bool EndArray(const char* name) = 0;
-
-    virtual bool Complete() = 0;
-    // </interfuscator:shuffle>
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_IREADWRITEXMLSINK_H
diff --git a/Code/CryEngine/CryCommon/IRenderAuxGeom.h b/Code/CryEngine/CryCommon/IRenderAuxGeom.h
deleted file mode 100644
index 8bce5bc477..0000000000
--- a/Code/CryEngine/CryCommon/IRenderAuxGeom.h
+++ /dev/null
@@ -1,837 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IRENDERAUXGEOM_H
-#define CRYINCLUDE_CRYCOMMON_IRENDERAUXGEOM_H
-#pragma once
-
-
-struct SAuxGeomRenderFlags;
-
-#include "IRenderer.h"
-
-
-enum EBoundingBoxDrawStyle
-{
-    eBBD_Faceted,
-    eBBD_Extremes_Color_Encoded
-};
-
-// Summary:
-//   Auxiliary geometry render interface.
-// Description:
-//   Used mostly for debugging, editor purposes, the Auxiliary geometry render
-//   interface provide functions to render 2d geometry and also text.
-struct IRenderAuxGeom
-{
-    // <interfuscator:shuffle>
-    virtual ~IRenderAuxGeom(){}
-    // Summary:
-    //   Sets render flags.
-    virtual void SetRenderFlags(const SAuxGeomRenderFlags& renderFlags) = 0;
-    // Summary:
-    //   Gets render flags.
-    virtual SAuxGeomRenderFlags GetRenderFlags() = 0;
-
-    // 2D/3D rendering function
-
-    // Summary:
-    //   Draws a point.
-    // Arguments:
-    //   v          - Vector storing the position of the point.
-    //   col        - Color used to draw the point.
-    //   size       - Size of the point drawn.
-    virtual void DrawPoint(const Vec3& v, const ColorB& col, uint8 size = 1) = 0;
-    // Summary:
-    //   Draws n points.
-    // Arguments:
-    //   v          - Pointer to a list of vector storing the position of the points.
-    //   numPoints  - Number of point we will find starting from the area memory defined by v.
-    //   col        - Color used to draw the points.
-    //   size       - Size of the points drawn.
-    //##@{
-    virtual void DrawPoints(const Vec3* v, uint32 numPoints, const ColorB& col, uint8 size = 1) = 0;
-    virtual void DrawPoints(const Vec3* v, uint32 numPoints, const ColorB* col, uint8 size = 1) = 0;
-    //##@}
-
-    // Summary:
-    //   Draws a line.
-    // Arguments:
-    //   v0         - Starting vertex of the line.
-    //   colV0      - Color of the first vertex.
-    //   v1         - Ending vertex of the line.
-    //   colV1      - Color of the second vertex.
-    //   thickness  - Thickness of the line.
-    virtual void DrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, float thickness = 1.0f) = 0;
-    // Summary:
-    //   Draws n lines.
-    // Arguments:
-    //   v          - List of vertexes belonging to the lines we want to draw.
-    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
-    //   col        - Color of the vertexes.
-    //   thickness  - Thickness of the line.
-    //##@{
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const ColorB& col, float thickness = 1.0f) = 0;
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const ColorB* col, float thickness = 1.0f) = 0;
-    //##@}
-
-    // Summary:
-    //   Draws n lines.
-    // Arguments:
-    //   v          - List of vertexes belonging to the lines we want to draw.
-    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
-    //   ind        -
-    //   numIndices -
-    //   col        - Color of the vertexes.
-    //   thickness  - Thickness of the line.
-    //##@{
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col, float thickness = 1.0f) = 0;
-    virtual void DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col, float thickness = 1.0f) = 0;
-    //##@}
-
-    // Summary:
-    //   Draws a polyline.
-    // Arguments:
-    //   v          - List of vertexes belonging to the polyline we want to draw.
-    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
-    //   closed     - If true a line between the last vertex and the first one is drawn.
-    //   col        - Color of the vertexes.
-    //   thickness  - Thickness of the line.
-    //##@{
-    virtual void DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB& col, float thickness = 1.0f) = 0;
-    virtual void DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB* col, float thickness = 1.0f) = 0;
-    //##@}
-
-    // Summary:
-    //   Draws a triangle.
-    // Arguments:
-    //   v0         - First vertex of the triangle.
-    //   colV0      - Color of the first vertex of the triangle.
-    //   v1         - Second vertex of the triangle.
-    //   colV1      - Color of the second vertex of the triangle.
-    //   v2         - Third vertex of the triangle.
-    //   colV2      - Color of the third vertex of the triangle.
-    virtual void DrawTriangle(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, const Vec3& v2, const ColorB& colV2) = 0;
-    // Summary:
-    //   Draws n triangles.
-    // Arguments:
-    //   v          - List of vertexes belonging to the sequence of triangles we have to draw.
-    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
-    //   col        - Color of the vertexes.
-    //##@{
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB& col) = 0;
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB* col) = 0;
-    //##@}
-    // Summary:
-    //   Draws n triangles.
-    // Arguments:
-    //   v          - List of vertexes belonging to the sequence of triangles we have to draw.
-    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
-    //   ind        -
-    //   numIndices -
-    //   col        - Color of the vertexes.
-    //##@{
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col) = 0;
-    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col) = 0;
-    //##@}
-
-    // Summary:
-    //   Draws a quad on the xz plane.
-    // Arguments:
-    //   pos        - Center position of the quad
-    //   width      - Width of the quad.
-    //   height     - Height of the quad.
-    //   matWorld   - World matrix to transform the quad.
-    //   col        - Color of the quad.
-    //   drawShaded - True if you want to draw the quad shaded, false otherwise.
-    virtual void DrawQuad(float width, float height, const Matrix34& matWorld, const ColorB& col, bool drawShaded = true) = 0;
-
-    // Summary:
-    //   Draws a Axis-aligned Bounding Boxes (AABB).
-    //##@{
-    virtual void DrawAABB(const AABB& aabb, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
-    virtual void DrawAABBs(const AABB* aabbs, uint32 aabbCount, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
-    virtual void DrawAABB(const AABB& aabb, const Matrix34& matWorld, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
-    //##@}
-
-    // Summary:
-    //   Draws a Oriented Bounding Boxes (AABB).
-    //##@{
-    virtual void DrawOBB(const OBB& obb, const Vec3& pos, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
-    virtual void DrawOBB(const OBB& obb, const Matrix34& matWorld, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
-    //##@}
-
-    // Summary:
-    //   Draws a sphere.
-    // Arguments:
-    //   pos        - Center of the sphere.
-    //   radius     - Radius of the sphere.
-    //   col        - Color of the sphere.
-    //   drawShaded - True if you want to draw the sphere shaded, false otherwise.
-    virtual void DrawSphere(const Vec3& pos, float radius, const ColorB& col, bool drawShaded = true) = 0;
-
-    // Summary:
-    //   Draws a disk.
-    // Arguments:
-    //   pos        - Center of the disk.
-    //   radius     - Radius of the disk.
-    //   col        - Color of the disk.
-    //   drawShaded - True if you want to draw the disk shaded, false otherwise.
-    virtual void DrawDisk(const Vec3& pos, const Vec3& dir, float radius, const ColorB& col, bool drawShaded = true) = 0;
-
-    // Summary:
-    //   Draws a cone.
-    // Arguments:
-    //   pos        - Center of the base of the cone.
-    //   dir        - Direction of the cone.
-    //   radius     - Radius of the base of the cone.
-    //   height     - Height of the cone.
-    //   col        - Color of the cone.
-    //   drawShaded - True if you want to draw the cone shaded, false otherwise.
-    virtual void DrawCone(const Vec3& pos, const Vec3& dir, float radius, float height, const ColorB& col, bool drawShaded = true) = 0;
-    // Summary:
-    //   Draws a cylinder.
-    // Arguments:
-    //   pos        - Center of the base of the cylinder.
-    //   dir        - Direction of the cylinder.
-    //   radius     - Radius of the base of the cylinder.
-    //   height     - Height of the cylinder.
-    //   col        - Color of the cylinder.
-    //   drawShaded - True if you want to draw the cylinder shaded, false otherwise.
-    virtual void DrawCylinder(const Vec3& pos, const Vec3& dir, float radius, float height, const ColorB& col, bool drawShaded = true) = 0;
-
-    // Summary:
-    //   Draws bones.
-    //##@{
-    virtual void DrawBone(const Vec3& rParent, const Vec3& rBone, ColorB col) = 0;
-    //##@}
-
-    // Summary:
-    //   Draws Text.
-    //##@{
-    virtual void RenderText(Vec3 pos, SDrawTextInfo& ti, const char* format, va_list args) = 0;
-
-    // Summary:
-    //   Draws 3d Label.
-    //##@{
-    void Draw3dLabel(Vec3 pos, float font_size, const ColorF& color, const char* label_text, ...) PRINTF_PARAMS(5, 6)
-    {
-        va_list args;
-        va_start(args, label_text);
-
-        SDrawTextInfo ti;
-        ti.xscale = ti.yscale = font_size;
-        ti.color[0] = color[0];
-        ti.color[1] = color[1];
-        ti.color[2] = color[2];
-        ti.color[3] = color[3];
-        ti.flags = eDrawText_2D | eDrawText_FixedSize | eDrawText_Monospace;
-
-        RenderText(pos, ti, label_text, args);
-
-        va_end(args);
-    }
-
-    void Draw2dLabelInternal(float x, float y, float font_size, const float* pfColor, int flags, const char* format, va_list args)
-    {
-        SDrawTextInfo ti;
-        ti.xscale = ti.yscale = font_size;
-        ti.flags = (eDrawText_2D | eDrawText_800x600 | eDrawText_FixedSize | flags);
-        if (pfColor)
-        {
-            ti.color[0] = pfColor[0];
-            ti.color[1] = pfColor[1];
-            ti.color[2] = pfColor[2];
-            ti.color[3] = pfColor[3];
-        }
-
-        RenderText(Vec3(x, y, 0.5f), ti, format, args);
-    }
-
-    void Draw2dLabel(float x, float y, float font_size, const float* pfColor, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        va_list args;
-        va_start(args, label_text);
-        Draw2dLabelInternal(x, y, font_size, pfColor, (bCenter ? eDrawText_Center : eDrawText_Left), label_text, args);
-        va_end(args);
-    }
-
-    void Draw2dLabel(float x, float y, float font_size, const ColorF& fColor, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        const AZStd::array<float, 4> color = fColor.GetAsArray();
-        va_list args;
-        va_start(args, label_text);
-        Draw2dLabelInternal(x, y, font_size, color.data(), (bCenter ? eDrawText_Center : eDrawText_Left), label_text, args);
-        va_end(args);
-    }
-
-    void Draw2dLabelCustom(float x, float y, float font_size, const float* pfColor, int flags, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        va_list args;
-        va_start(args, label_text);
-        Draw2dLabelInternal(x, y, font_size, pfColor, flags, label_text, args);
-        va_end(args);
-    }
-
-    void Draw2dLabelCustom(float x, float y, float font_size, const ColorF& fColor, int flags, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        const AZStd::array<float, 4> color = fColor.GetAsArray();
-        va_list args;
-        va_start(args, label_text);
-        Draw2dLabelInternal(x, y, font_size, color.data(), flags, label_text, args);
-        va_end(args);
-    }
-    //##@}
-
-    // Summary:
-    //   If possible flushes all elements stored on the buffer to rendering system.
-    //   Note 1: rendering system may start processing flushed commands immediately or postpone it till Commit() call
-    //   Note 2: worker threads's commands are always postponed till Commit() call
-    //
-    virtual void Flush() = 0;
-    // </interfuscator:shuffle>
-
-    // Summary:
-    //   Flushes yet unprocessed elements and notifies rendering system that issuing rendering commands for current frame is done and frame is ready to be drawn
-    //   Thus Commit() guarantees that all previously issued commands will appear on the screen
-    //   Each thread rendering AUX geometry MUST call Commit() at the end of drawing cycle/frame
-    //   "frames" indicate how many frames current commands butch must be presented on screen unless there till next butch is ready.
-    //   for render and main thread this parameter has no effect
-    virtual void Commit(uint frames = 0) = 0;
-    // </interfuscator:shuffle>
-
-    /**
-    * Processes and resets the underlying vertex buffer
-    */
-    virtual void Process() = 0;
-};
-
-// Notes:
-//   Don't change the xxxShift values blindly as they affect the rendering output
-//   that is two primitives have to be rendered after 3d primitives, alpha blended
-//   geometry have to be rendered after opaque ones, etc.
-//   This also applies to the individual flags in EAuxGeomPublicRenderflags_*!
-// Remarks:
-//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
-//   Check RenderAuxGeom.h in ../RenderDll/Common
-enum EAuxGeomPublicRenderflagBitMasks
-{
-    e_Mode2D3DShift             = 31,
-    e_Mode2D3DMask              = 0x1 << e_Mode2D3DShift,
-
-    e_AlphaBlendingShift        = 29,
-    e_AlphaBlendingMask         = 0x3 << e_AlphaBlendingShift,
-
-    e_DrawInFrontShift          = 28,
-    e_DrawInFrontMask           = 0x1 << e_DrawInFrontShift,
-
-    e_FillModeShift             = 26,
-    e_FillModeMask              = 0x3 << e_FillModeShift,
-
-    e_CullModeShift             = 24,
-    e_CullModeMask              = 0x3 << e_CullModeShift,
-
-    e_DepthWriteShift           = 23,
-    e_DepthWriteMask            = 0x1 << e_DepthWriteShift,
-
-    e_DepthTestShift            = 22,
-    e_DepthTestMask             = 0x1 << e_DepthTestShift,
-
-    e_PublicParamsMask      = e_Mode2D3DMask | e_AlphaBlendingMask | e_DrawInFrontMask | e_FillModeMask |
-        e_CullModeMask | e_DepthWriteMask | e_DepthTestMask
-};
-
-// Notes:
-//   e_Mode2D renders in normalized [0.. 1] screen space.
-//   Don't change the xxxShift values blindly as they affect the rendering output
-//   that is two primitives have to be rendered after 3d primitives, alpha blended
-//   geometry have to be rendered after opaque ones, etc.
-//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
-// Remarks:
-//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
-//   Check RenderAuxGeom.h in ../RenderDll/Common
-// See also:
-//   EAuxGeomPublicRenderflagBitMasks
-enum EAuxGeomPublicRenderflags_Mode2D3D
-{
-    e_Mode3D                            = 0x0 << e_Mode2D3DShift,
-    e_Mode2D                            = 0x1 << e_Mode2D3DShift,
-};
-
-// Notes:
-//   Don't change the xxxShift values blindly as they affect the rendering output
-//   that is two primitives have to be rendered after 3d primitives, alpha blended
-//   geometry have to be rendered after opaque ones, etc.
-//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
-// Remarks:
-//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
-//   Check RenderAuxGeom.h in ../RenderDll/Common
-// See also:
-//   EAuxGeomPublicRenderflagBitMasks
-enum EAuxGeomPublicRenderflags_AlphaBlendMode
-{
-    e_AlphaNone                     = 0x0 << e_AlphaBlendingShift,
-    e_AlphaAdditive             = 0x1 << e_AlphaBlendingShift,
-    e_AlphaBlended              = 0x2 << e_AlphaBlendingShift,
-};
-
-// Notes:
-//   Don't change the xxxShift values blindly as they affect the rendering output
-//   that is two primitives have to be rendered after 3d primitives, alpha blended
-//   geometry have to be rendered after opaque ones, etc.
-//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
-// Remarks:
-//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
-//   Check RenderAuxGeom.h in ../RenderDll/Common
-// See also:
-//   EAuxGeomPublicRenderflagBitMasks
-enum EAuxGeomPublicRenderflags_DrawInFrontMode
-{
-    e_DrawInFrontOff            = 0x0 << e_DrawInFrontShift,
-    e_DrawInFrontOn             = 0x1 << e_DrawInFrontShift,
-};
-
-// Notes:
-//   Don't change the xxxShift values blindly as they affect the rendering output
-//   that is two primitives have to be rendered after 3d primitives, alpha blended
-//   geometry have to be rendered after opaque ones, etc.
-//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
-// Remarks:
-//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
-//   Check RenderAuxGeom.h in ../RenderDll/Common
-// See also:
-//   EAuxGeomPublicRenderflagBitMasks
-enum EAuxGeomPublicRenderflags_FillMode
-{
-    e_FillModeSolid             = 0x0 << e_FillModeShift,
-    e_FillModeWireframe     = 0x1 << e_FillModeShift,
-    e_FillModePoint             = 0x2 << e_FillModeShift,
-};
-
-// Notes:
-//   Don't change the xxxShift values blindly as they affect the rendering output
-//   that is two primitives have to be rendered after 3d primitives, alpha blended
-//   geometry have to be rendered after opaque ones, etc.
-//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
-// Remarks:
-//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
-//   Check RenderAuxGeom.h in ../RenderDll/Common
-// See also:
-//   EAuxGeomPublicRenderflagBitMasks
-enum EAuxGeomPublicRenderflags_CullMode
-{
-    e_CullModeNone              = 0x0 << e_CullModeShift,
-    e_CullModeFront             = 0x1 << e_CullModeShift,
-    e_CullModeBack              = 0x2 << e_CullModeShift,
-};
-
-// Notes:
-//   Don't change the xxxShift values blindly as they affect the rendering output
-//   that is two primitives have to be rendered after 3d primitives, alpha blended
-//   geometry have to be rendered after opaque ones, etc.
-//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
-// Remarks:
-//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
-//   Check RenderAuxGeom.h in ../RenderDll/Common
-// See also:
-//   EAuxGeomPublicRenderflagBitMasks
-enum EAuxGeomPublicRenderflags_DepthWrite
-{
-    e_DepthWriteOn              = 0x0 << e_DepthWriteShift,
-    e_DepthWriteOff             = 0x1 << e_DepthWriteShift,
-};
-
-// Notes:
-//   Don't change the xxxShift values blindly as they affect the rendering output
-//   that is two primitives have to be rendered after 3d primitives, alpha blended
-//   geometry have to be rendered after opaque ones, etc.
-//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
-// Remarks:
-//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
-//   Check RenderAuxGeom.h in ../RenderDll/Common
-// See also:
-//   EAuxGeomPublicRenderflagBitMasks
-enum EAuxGeomPublicRenderflags_DepthTest
-{
-    e_DepthTestOn                   = 0x0 << e_DepthTestShift,
-    e_DepthTestOff              = 0x1 << e_DepthTestShift,
-};
-
-
-enum EAuxGeomPublicRenderflags_Defaults
-{
-    // Default render flags for 3d primitives.
-    e_Def3DPublicRenderflags = e_Mode3D | e_AlphaNone | e_DrawInFrontOff | e_FillModeSolid |
-        e_CullModeBack | e_DepthWriteOn | e_DepthTestOn,
-
-    // Default render flags for 2d primitives.
-    e_Def2DPublicRenderflags = e_Mode2D | e_AlphaNone | e_DrawInFrontOff | e_FillModeSolid |
-        e_CullModeBack | e_DepthWriteOn | e_DepthTestOn
-};
-
-
-struct SAuxGeomRenderFlags
-{
-    uint32 m_renderFlags;
-
-    SAuxGeomRenderFlags();
-    SAuxGeomRenderFlags(const SAuxGeomRenderFlags& rhs);
-    SAuxGeomRenderFlags(uint32 renderFlags);
-    SAuxGeomRenderFlags& operator =(const SAuxGeomRenderFlags& rhs);
-    SAuxGeomRenderFlags& operator =(uint32 rhs);
-
-    bool operator ==(const SAuxGeomRenderFlags& rhs) const;
-    bool operator ==(uint32 rhs) const;
-    bool operator !=(const SAuxGeomRenderFlags& rhs) const;
-    bool operator !=(uint32 rhs) const;
-
-    // Summary:
-    //   Gets the flags for 2D/3D rendering mode.
-    EAuxGeomPublicRenderflags_Mode2D3D GetMode2D3DFlag() const;
-    // Summary:
-    //   Sets the flags for 2D/3D rendering mode.
-    void SetMode2D3DFlag(const EAuxGeomPublicRenderflags_Mode2D3D& state);
-
-    // Summary:
-    //   Gets the flags for alpha blend mode.
-    EAuxGeomPublicRenderflags_AlphaBlendMode GetAlphaBlendMode() const;
-    // Summary:
-    //   Sets the flags for the alpha blend mode.
-    void SetAlphaBlendMode(const EAuxGeomPublicRenderflags_AlphaBlendMode& state);
-
-
-    EAuxGeomPublicRenderflags_DrawInFrontMode GetDrawInFrontMode() const;
-    void SetDrawInFrontMode(const EAuxGeomPublicRenderflags_DrawInFrontMode& state);
-
-    // Summary:
-    //   Gets the flags for the filling mode.
-    EAuxGeomPublicRenderflags_FillMode GetFillMode() const;
-    // Summary:
-    //   Sets the flags for the filling mode.
-    void SetFillMode(const EAuxGeomPublicRenderflags_FillMode& state);
-
-    // Summary:
-    //   Gets the flags for the culling mode.
-    EAuxGeomPublicRenderflags_CullMode GetCullMode() const;
-    // Summary:
-    //   Sets the flags for the culling mode.
-    void SetCullMode(const EAuxGeomPublicRenderflags_CullMode& state);
-
-
-    EAuxGeomPublicRenderflags_DepthWrite GetDepthWriteFlag() const;
-    void SetDepthWriteFlag(const EAuxGeomPublicRenderflags_DepthWrite& state);
-
-    // Summary:
-    //   Gets the flags for the depth test.
-    EAuxGeomPublicRenderflags_DepthTest GetDepthTestFlag() const;
-    // Summary:
-    //   Sets the flags for the depth test.
-    void SetDepthTestFlag(const EAuxGeomPublicRenderflags_DepthTest& state);
-};
-
-
-inline
-SAuxGeomRenderFlags::SAuxGeomRenderFlags()
-    : m_renderFlags(e_Def3DPublicRenderflags)
-{
-}
-
-inline
-SAuxGeomRenderFlags::SAuxGeomRenderFlags(const SAuxGeomRenderFlags& rhs)
-    : m_renderFlags(rhs.m_renderFlags)
-{
-}
-
-
-inline
-SAuxGeomRenderFlags::SAuxGeomRenderFlags(uint32 renderFlags)
-    : m_renderFlags(renderFlags)
-{
-}
-
-
-inline SAuxGeomRenderFlags&
-SAuxGeomRenderFlags::operator =(const SAuxGeomRenderFlags& rhs)
-{
-    m_renderFlags = rhs.m_renderFlags;
-    return(*this);
-}
-
-
-inline SAuxGeomRenderFlags&
-SAuxGeomRenderFlags::operator =(uint32 rhs)
-{
-    m_renderFlags = rhs;
-    return(*this);
-}
-
-
-inline bool
-SAuxGeomRenderFlags::operator ==(const SAuxGeomRenderFlags& rhs) const
-{
-    return(m_renderFlags == rhs.m_renderFlags);
-}
-
-
-inline bool
-SAuxGeomRenderFlags::operator ==(uint32 rhs) const
-{
-    return(m_renderFlags == rhs);
-}
-
-
-inline bool
-SAuxGeomRenderFlags::operator !=(const SAuxGeomRenderFlags& rhs) const
-{
-    return(m_renderFlags != rhs.m_renderFlags);
-}
-
-
-inline bool
-SAuxGeomRenderFlags::operator !=(uint32 rhs) const
-{
-    return(m_renderFlags != rhs);
-}
-
-
-inline EAuxGeomPublicRenderflags_Mode2D3D
-SAuxGeomRenderFlags::GetMode2D3DFlag() const
-{
-    int mode2D3D((int)(m_renderFlags & (uint32)e_Mode2D3DMask));
-    switch (mode2D3D)
-    {
-    case e_Mode2D:
-    {
-        return(e_Mode2D);
-    }
-    case e_Mode3D:
-    default:
-    {
-        assert(e_Mode3D == mode2D3D);
-        return(e_Mode3D);
-    }
-    }
-}
-
-
-inline void
-SAuxGeomRenderFlags::SetMode2D3DFlag(const EAuxGeomPublicRenderflags_Mode2D3D& state)
-{
-    m_renderFlags &= ~e_Mode2D3DMask;
-    m_renderFlags |= state;
-}
-
-
-inline EAuxGeomPublicRenderflags_AlphaBlendMode
-SAuxGeomRenderFlags::GetAlphaBlendMode() const
-{
-    uint32 alphaBlendMode(m_renderFlags & e_AlphaBlendingMask);
-    switch (alphaBlendMode)
-    {
-    case e_AlphaAdditive:
-    {
-        return(e_AlphaAdditive);
-    }
-    case e_AlphaBlended:
-    {
-        return(e_AlphaBlended);
-    }
-    case e_AlphaNone:
-    default:
-    {
-        assert(e_AlphaNone == alphaBlendMode);
-        return(e_AlphaNone);
-    }
-    }
-}
-
-
-inline void
-SAuxGeomRenderFlags::SetAlphaBlendMode(const EAuxGeomPublicRenderflags_AlphaBlendMode& state)
-{
-    m_renderFlags &= ~e_AlphaBlendingMask;
-    m_renderFlags |= state;
-}
-
-
-inline EAuxGeomPublicRenderflags_DrawInFrontMode
-SAuxGeomRenderFlags::GetDrawInFrontMode() const
-{
-    uint32 drawInFrontMode(m_renderFlags & e_DrawInFrontMask);
-    switch (drawInFrontMode)
-    {
-    case e_DrawInFrontOff:
-    {
-        return(e_DrawInFrontOff);
-    }
-    case e_DrawInFrontOn:
-    default:
-    {
-        assert(e_DrawInFrontOn == drawInFrontMode);
-        return(e_DrawInFrontOn);
-    }
-    }
-}
-
-
-inline void
-SAuxGeomRenderFlags::SetDrawInFrontMode(const EAuxGeomPublicRenderflags_DrawInFrontMode& state)
-{
-    m_renderFlags &= ~e_DrawInFrontMask;
-    m_renderFlags |= state;
-}
-
-
-inline EAuxGeomPublicRenderflags_FillMode
-SAuxGeomRenderFlags::GetFillMode() const
-{
-    uint32 fillMode(m_renderFlags & e_FillModeMask);
-    switch (fillMode)
-    {
-    case e_FillModePoint:
-    {
-        return(e_FillModePoint);
-    }
-    case e_FillModeWireframe:
-    {
-        return(e_FillModeWireframe);
-    }
-    case e_FillModeSolid:
-    default:
-    {
-        assert(e_FillModeSolid == fillMode);
-        return(e_FillModeSolid);
-    }
-    }
-}
-
-
-inline void
-SAuxGeomRenderFlags::SetFillMode(const EAuxGeomPublicRenderflags_FillMode& state)
-{
-    m_renderFlags &= ~e_FillModeMask;
-    m_renderFlags |= state;
-}
-
-
-inline EAuxGeomPublicRenderflags_CullMode
-SAuxGeomRenderFlags::GetCullMode() const
-{
-    uint32 cullMode(m_renderFlags & e_CullModeMask);
-    switch (cullMode)
-    {
-    case e_CullModeNone:
-    {
-        return(e_CullModeNone);
-    }
-    case e_CullModeFront:
-    {
-        return(e_CullModeFront);
-    }
-    case e_CullModeBack:
-    default:
-    {
-        assert(e_CullModeBack == cullMode);
-        return(e_CullModeBack);
-    }
-    }
-}
-
-
-inline void
-SAuxGeomRenderFlags::SetCullMode(const EAuxGeomPublicRenderflags_CullMode& state)
-{
-    m_renderFlags &= ~e_CullModeMask;
-    m_renderFlags |= state;
-}
-
-
-inline EAuxGeomPublicRenderflags_DepthWrite
-SAuxGeomRenderFlags::GetDepthWriteFlag() const
-{
-    uint32 depthWriteFlag(m_renderFlags & e_DepthWriteMask);
-    switch (depthWriteFlag)
-    {
-    case e_DepthWriteOff:
-    {
-        return(e_DepthWriteOff);
-    }
-    case e_DepthWriteOn:
-    default:
-    {
-        assert(e_DepthWriteOn == depthWriteFlag);
-        return(e_DepthWriteOn);
-    }
-    }
-}
-
-
-inline void
-SAuxGeomRenderFlags::SetDepthWriteFlag(const EAuxGeomPublicRenderflags_DepthWrite& state)
-{
-    m_renderFlags &= ~e_DepthWriteMask;
-    m_renderFlags |= state;
-}
-
-
-inline EAuxGeomPublicRenderflags_DepthTest
-SAuxGeomRenderFlags::GetDepthTestFlag() const
-{
-    uint32 depthTestFlag(m_renderFlags & e_DepthTestMask);
-    switch (depthTestFlag)
-    {
-    case e_DepthTestOff:
-    {
-        return(e_DepthTestOff);
-    }
-    case e_DepthTestOn:
-    default:
-    {
-        assert(e_DepthTestOn == depthTestFlag);
-        return(e_DepthTestOn);
-    }
-    }
-}
-
-
-inline void
-SAuxGeomRenderFlags::SetDepthTestFlag(const EAuxGeomPublicRenderflags_DepthTest& state)
-{
-    m_renderFlags &= ~e_DepthTestMask;
-    m_renderFlags |= state;
-}
-
-
-class CRenderAuxGeomRenderFlagsRestore
-{
-public:
-    explicit CRenderAuxGeomRenderFlagsRestore(IRenderAuxGeom* pRender);
-    ~CRenderAuxGeomRenderFlagsRestore();
-
-private:
-    IRenderAuxGeom* m_pRender;
-    SAuxGeomRenderFlags m_backuppedRenderFlags;
-
-    // copy-construction not supported
-    CRenderAuxGeomRenderFlagsRestore(const CRenderAuxGeomRenderFlagsRestore&);
-    CRenderAuxGeomRenderFlagsRestore& operator=(const CRenderAuxGeomRenderFlagsRestore&);
-};
-
-inline CRenderAuxGeomRenderFlagsRestore::CRenderAuxGeomRenderFlagsRestore(IRenderAuxGeom* pRender)
-{
-    m_pRender = pRender;
-    m_backuppedRenderFlags = m_pRender->GetRenderFlags();
-}
-
-inline CRenderAuxGeomRenderFlagsRestore::~CRenderAuxGeomRenderFlagsRestore()
-{
-    m_pRender->SetRenderFlags(m_backuppedRenderFlags);
-}
-
-
-#endif // CRYINCLUDE_CRYCOMMON_IRENDERAUXGEOM_H
diff --git a/Code/CryEngine/CryCommon/IRenderMesh.h b/Code/CryEngine/CryCommon/IRenderMesh.h
deleted file mode 100644
index 85797d45ea..0000000000
--- a/Code/CryEngine/CryCommon/IRenderMesh.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IRENDERMESH_H
-#define CRYINCLUDE_CRYCOMMON_IRENDERMESH_H
-#pragma once
-
-#include "VertexFormats.h"
-#include <IMaterial.h>
-#include <IShader.h>
-#include <IRenderer.h>  // PublicRenderPrimitiveType
-#include <Cry_Geo.h>
-#include <CryArray.h>
-#include <ITimer.h>
-
-class CMesh;
-struct CRenderChunk;
-class CRenderObject;
-struct SSkinningData;
-struct IMaterial;
-struct IShader;
-struct IIndexedMesh;
-struct SMRendTexVert;
-struct UCol;
-struct GeomInfo;
-
-struct TFace;
-struct SMeshSubset;
-struct SRenderingPassInfo;
-struct SRendItemSorter;
-struct SRenderObjectModifier;
-
-namespace AZ
-{
-    namespace Vertex
-    {
-        class Format;
-    }
-}
-
-enum eRenderPrimitiveType : int8;
-
-// Keep this in sync with BUFFER_USAGE hints DevBuffer.h
-enum ERenderMeshType
-{
-    eRMT_Immmutable = 0,
-    eRMT_Static = 1,
-    eRMT_Dynamic = 2,
-    eRMT_Transient = 3,
-};
-
-
-#define FSM_VERTEX_VELOCITY 1
-#define FSM_NO_TANGENTS   2
-#define FSM_CREATE_DEVICE_MESH 4
-#define FSM_SETMESH_ASYNC 8
-#define FSM_ENABLE_NORMALSTREAM 16
-#define FSM_IGNORE_TEXELDENSITY 32
-
-// Invalidate video buffer flags
-#define FMINV_STREAM      1
-#define FMINV_STREAM_MASK ((1 << VSF_NUM) - 1)
-#define FMINV_INDICES     0x100
-#define FMINV_ALL        -1
-
-// Stream lock flags
-#define  FSL_READ             0x01
-#define  FSL_WRITE            0x02
-#define  FSL_DYNAMIC          0x04
-#define  FSL_DISCARD          0x08
-#define  FSL_VIDEO            0x10
-#define  FSL_SYSTEM           0x20
-#define  FSL_INSTANCED        0x40
-#define  FSL_NONSTALL_MAP     0x80   // Map must not stall for VB/IB locking
-#define  FSL_VBIBPUSHDOWN     0x100  // Push down from vram on demand if target architecture supports it, used internally
-#define  FSL_DIRECT           0x200  // Access VRAM directly if target architecture supports it, used internally
-#define  FSL_LOCKED           0x400  // Internal use
-#define  FSL_SYSTEM_CREATE    (FSL_WRITE | FSL_DISCARD | FSL_SYSTEM)
-#define  FSL_SYSTEM_UPDATE    (FSL_WRITE | FSL_SYSTEM)
-#define  FSL_VIDEO_CREATE     (FSL_WRITE | FSL_DISCARD | FSL_VIDEO)
-#define  FSL_VIDEO_UPDATE     (FSL_WRITE | FSL_VIDEO)
-
-#define FSL_ASYNC_DEFER_COPY  (1u << 1)
-#define FSL_FREE_AFTER_ASYNC (2u << 1)
-
-struct IRenderMesh
-{
-    enum EMemoryUsageArgument
-    {
-        MEM_USAGE_COMBINED,
-        MEM_USAGE_ONLY_SYSTEM,
-        MEM_USAGE_ONLY_VIDEO,
-        MEM_USAGE_ONLY_STREAMS,
-    };
-
-    // Render mesh initialization parameters, that can be used to create RenderMesh from raw pointers.
-    struct SInitParamerers
-    {
-        AZ::Vertex::Format vertexFormat;
-        ERenderMeshType eType;
-
-        void* pVertBuffer;
-        int nVertexCount;
-        SPipTangents* pTangents;
-        SPipNormal* pNormals;
-        vtx_idx* pIndices;
-        int nIndexCount;
-        PublicRenderPrimitiveType nPrimetiveType;
-        int nRenderChunkCount;
-        int nClientTextureBindID;
-        bool bOnlyVideoBuffer;
-        bool bPrecache;
-        bool bLockForThreadAccess;
-
-        SInitParamerers()
-            : vertexFormat(eVF_P3F_C4B_T2F)
-            , eType(eRMT_Static)
-            , pVertBuffer(0)
-            , nVertexCount(0)
-            , pTangents(0)
-            , pNormals(0)
-            , pIndices(0)
-            , nIndexCount(0)
-            , nPrimetiveType(prtTriangleList)
-            , nRenderChunkCount(0)
-            , nClientTextureBindID(0)
-            , bOnlyVideoBuffer(false)
-            , bPrecache(true)
-            , bLockForThreadAccess(false) {}
-    };
-
-    struct ThreadAccessLock
-    {
-        ThreadAccessLock(IRenderMesh* pRM)
-            : m_pRM(pRM)
-        {
-            m_pRM->LockForThreadAccess();
-        }
-
-        ~ThreadAccessLock()
-        {
-            m_pRM->UnLockForThreadAccess();
-        }
-
-    private:
-        ThreadAccessLock(const ThreadAccessLock&);
-        ThreadAccessLock& operator = (const ThreadAccessLock&);
-
-    private:
-        IRenderMesh* m_pRM;
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IRenderMesh(){}
-
-    //////////////////////////////////////////////////////////////////////////
-    // Reference Counting.
-    virtual void AddRef() = 0;
-    virtual int Release() = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    // Prevent rendering if video memory could not been allocated for it
-    virtual bool CanRender() = 0;
-
-    // Returns type name given to the render mesh on creation time.
-    virtual const char* GetTypeName() = 0;
-    // Returns the name of the source given to the render mesh on creation time.
-    virtual const char* GetSourceName() const = 0;
-
-    virtual int  GetIndicesCount() = 0;
-    virtual int  GetVerticesCount() = 0;
-    virtual AZ::Vertex::Format GetVertexFormat() = 0;
-    virtual ERenderMeshType GetMeshType() = 0;
-    virtual float GetGeometricMeanFaceArea() const = 0;
-
-    virtual bool CheckUpdate(uint32 nStreamMask) = 0;
-    virtual int GetStreamStride(int nStream) const = 0;
-
-    virtual const uintptr_t GetVBStream(int nStream) const = 0;
-    virtual const uintptr_t GetIBStream() const = 0;
-    virtual int GetNumVerts() const  = 0;
-    virtual int GetNumInds() const = 0;
-    virtual const eRenderPrimitiveType GetPrimitiveType() const = 0;
-
-    virtual void SetSkinned(bool bSkinned = true) = 0;
-    virtual uint GetSkinningWeightCount() const = 0;
-
-    // Create render buffers from render mesh. Returns the final size of the render mesh or ~0U on failure
-    virtual size_t SetMesh(CMesh& mesh, int nSecColorsSetOffset, uint32 flags, bool requiresLock) = 0;
-    virtual void CopyTo(IRenderMesh* pDst, int nAppendVtx = 0, bool bDynamic = false, bool fullCopy = true) = 0;
-    virtual void SetSkinningDataVegetation(struct SMeshBoneMapping_uint8* pBoneMapping) = 0;
-    virtual void SetSkinningDataCharacter(CMesh& mesh, struct SMeshBoneMapping_uint16* pBoneMapping, struct SMeshBoneMapping_uint16* pExtraBoneMapping) = 0;
-    // Creates an indexed mesh from this render mesh (accepts an optional pointer to an IIndexedMesh object that should be used)
-    virtual IIndexedMesh* GetIndexedMesh(IIndexedMesh* pIdxMesh = 0) = 0;
-    virtual int GetRenderChunksCount(_smart_ptr<IMaterial> pMat, int& nRenderTrisCount) = 0;
-
-    virtual IRenderMesh* GenerateMorphWeights() = 0;
-    virtual IRenderMesh* GetMorphBuddy() = 0;
-    virtual void SetMorphBuddy(IRenderMesh* pMorph) = 0;
-
-    virtual bool UpdateVertices(const void* pVertBuffer, int nVertCount, int nOffset, int nStream, uint32 copyFlags, bool requiresLock = true) = 0;
-    virtual bool UpdateIndices(const vtx_idx* pNewInds, int nInds, int nOffsInd, uint32 copyFlags, bool requiresLock = true) = 0;
-    virtual void SetCustomTexID(int nCustomTID) = 0;
-    virtual void SetChunk(int nIndex, CRenderChunk& chunk) = 0;
-    virtual void SetChunk(_smart_ptr<IMaterial> pNewMat, int nFirstVertId, int nVertCount, int nFirstIndexId, int nIndexCount, float texelAreaDensity, const AZ::Vertex::Format& vertexFormat, int nMatID = 0) = 0;
-
-    // Assign array of render chunks.
-    // Initializes render element for each render chunk.
-    virtual void SetRenderChunks(CRenderChunk* pChunksArray, int nCount, bool bSubObjectChunks) = 0;
-
-    virtual void GenerateQTangents() = 0;
-    virtual void CreateChunksSkinned() = 0;
-    virtual void NextDrawSkinned() = 0;
-    virtual IRenderMesh* GetVertexContainer() = 0;
-    virtual void SetVertexContainer(IRenderMesh* pBuf) = 0;
-    virtual TRenderChunkArray& GetChunks() = 0;
-    virtual TRenderChunkArray& GetChunksSkinned() = 0;
-    virtual TRenderChunkArray& GetChunksSubObjects() = 0;
-    virtual void SetBBox(const Vec3& vBoxMin, const Vec3& vBoxMax) = 0;
-    virtual void GetBBox(Vec3& vBoxMin, Vec3& vBoxMax) = 0;
-    virtual void UpdateBBoxFromMesh() = 0;
-    virtual uint32* GetPhysVertexMap() = 0;
-    virtual bool IsEmpty() = 0;
-
-    virtual byte* GetPosPtrNoCache(int32& nStride, uint32 nFlags) = 0;
-    virtual byte* GetPosPtr(int32& nStride, uint32 nFlags) = 0;
-    virtual byte* GetColorPtr(int32& nStride, uint32 nFlags) = 0;
-    virtual byte* GetNormPtr(int32& nStride, uint32 nFlags) = 0;
-    //! Returns a pointer to the first uv coordinate in the interleaved vertex stream
-    virtual byte* GetUVPtrNoCache(int32& nStride, uint32 nFlags, uint32 uvSetIndex = 0) = 0;
-    /*! Get a pointer to the mesh's uv coordinates and the stride from the beginning of one uv coordinate to the next
-        \param[out] nStride The stride in between successive uv coordinates.
-        \param nFlags Stream lock flags (FSL_READ, FSL_WRITE, etc)
-        \param uvSetIndex Which uv set to retrieve (defaults to 0)
-        \return A pointer to cached uvs which contains all of the uv coordinates contiguous in memory, or as a fallback a pointer to the first uv coordinate in the interleaved vertex stream
-                Either way, nStride is set such that the caller can use it to iterate over the data in the same way regardless of which pointer was returned
-                Returns nullptr if there is no uv coordinate stream at the given index
-    */
-    virtual byte* GetUVPtr(int32& nStride, uint32 nFlags, uint32 uvSetIndex = 0) = 0;
-
-    virtual byte* GetTangentPtr(int32& nStride, uint32 nFlags) = 0;
-    virtual byte* GetQTangentPtr(int32& nStride, uint32 nFlags) = 0;
-
-    virtual byte* GetHWSkinPtr(int32& nStride, uint32 nFlags, bool remapped = false) = 0;
-    virtual byte* GetVelocityPtr(int32& nStride, uint32 nFlags) = 0;
-
-    virtual void UnlockStream(int nStream) = 0;
-    virtual void UnlockIndexStream() = 0;
-
-    virtual vtx_idx* GetIndexPtr(uint32 nFlags, int32 nOffset = 0) = 0;
-    virtual const PodArray<std::pair<int, int> >* GetTrisForPosition(const Vec3& vPos, _smart_ptr<IMaterial> pMaterial) = 0;
-
-    virtual float GetExtent(EGeomForm eForm) = 0;
-    virtual void GetRandomPos(PosNorm& ran, EGeomForm eForm, SSkinningData const* pSkinning = NULL) = 0;
-
-    virtual void Render(const struct SRendParams& rParams, CRenderObject* pObj, _smart_ptr<IMaterial> pMaterial, const SRenderingPassInfo& passInfo, bool bSkinned = false) = 0;
-    virtual void Render(CRenderObject* pObj, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter) = 0;
-    virtual void AddRenderElements(_smart_ptr<IMaterial> pIMatInfo, CRenderObject* pObj, const SRenderingPassInfo& passInfo, int nSortId = EFSLIST_GENERAL, int nAW = 1) = 0;
-    virtual void AddRE(_smart_ptr<IMaterial> pMaterial, CRenderObject* pObj, IShader* pEf, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter) = 0;
-    virtual void SetREUserData(float* pfCustomData, float fFogScale = 0, float fAlpha = 1) = 0;
-
-    // Debug draw this render mesh.
-    virtual void DebugDraw(const struct SGeometryDebugDrawInfo& info, uint32 nVisibleChunksMask = ~0, float fExtrdueScale = 0.01f) = 0;
-
-    // Returns mesh memory usage and add it to the CrySizer (if not NULL).
-    // Arguments:
-    //     pSizer - Sizer interface, can be NULL if caller only want to calculate size
-    //     nType - see EMemoryUsageArgument
-    virtual size_t GetMemoryUsage(ICrySizer* pSizer, EMemoryUsageArgument nType) const = 0;
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-
-    // Get allocated only in video memory or only in system memory.
-    virtual int GetAllocatedBytes(bool bVideoMem) const = 0;
-    virtual float GetAverageTrisNumPerChunk(_smart_ptr<IMaterial> pMat) = 0;
-    virtual int GetTextureMemoryUsage(const _smart_ptr<IMaterial> pMaterial, ICrySizer* pSizer = NULL, bool bStreamedIn = true) const = 0;
-    virtual void KeepSysMesh(bool keep) = 0;    // HACK: temp workaround for GDC-888
-    virtual void UnKeepSysMesh() = 0;
-    virtual void SetMeshLod(int nLod) = 0;
-
-    virtual void LockForThreadAccess() = 0;
-    virtual void UnLockForThreadAccess() = 0;
-
-    // Sets the async update state - will sync before rendering to this
-    virtual volatile int* SetAsyncUpdateState(void) = 0;
-    virtual void CreateRemappedBoneIndicesPair(const DynArray<JointIdType>& arrRemapTable, const uint pairGuid) = 0;
-    virtual void ReleaseRemappedBoneIndicesPair(const uint pairGuid) = 0;
-
-    virtual void OffsetPosition(const Vec3& delta) = 0;
-    // </interfuscator:shuffle>
-};
-
-struct SBufferStream
-{
-    void* m_pLocalData;       // pointer to buffer data
-    uintptr_t m_BufferHdl;
-    SBufferStream()
-    {
-        m_pLocalData = NULL;
-        m_BufferHdl = ~0u;
-    }
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_IRENDERMESH_H
diff --git a/Code/CryEngine/CryCommon/IRenderer.h b/Code/CryEngine/CryCommon/IRenderer.h
deleted file mode 100644
index a72149f9c7..0000000000
--- a/Code/CryEngine/CryCommon/IRenderer.h
+++ /dev/null
@@ -1,2606 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "Cry_Geo.h"
-#include "Cry_Camera.h"
-#include "ITexture.h"
-#include "Cry_Vector2.h"
-#include "Cry_Vector3.h"
-#include "Cry_Matrix33.h"
-#include "Cry_Color.h"
-#include "smartptr.h"
-#include "StringUtils.h"
-#include <IXml.h> // <> required for Interfuscator
-#include "smartptr.h"
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/std/containers/intrusive_slist.h>
-
-// forward declarations
-struct SRenderingPassInfo;
-struct SRTStack;
-struct SFogVolumeData;
-// Callback used for DXTCompress
-typedef void (* MIPDXTcallback)(const void* buffer, size_t count, void* userData);
-
-typedef void (* GpuCallbackFunc)(DWORD context);
-
-// Callback for shadercache miss
-typedef void (* ShaderCacheMissCallback)(const char* acShaderRequest);
-
-struct ICaptureFrameListener
-{
-    virtual ~ICaptureFrameListener (){}
-    virtual bool OnNeedFrameData(unsigned char*& pConvertedTextureBuf) = 0;
-    virtual void OnFrameCaptured(void) = 0;
-    virtual int OnGetFrameWidth(void) = 0;
-    virtual int OnGetFrameHeight(void) = 0;
-    virtual int OnCaptureFrameBegin(int* pTexHandle) = 0;
-
-    enum ECaptureFrameFlags
-    {
-        eCFF_NoCaptureThisFrame = (0 << 1),
-        eCFF_CaptureThisFrame = (1 << 1),
-    };
-};
-
-// Forward declarations.
-//////////////////////////////////////////////////////////////////////
-typedef void* WIN_HWND;
-typedef void* WIN_HINSTANCE;
-typedef void* WIN_HDC;
-typedef void* WIN_HGLRC;
-
-class CREMesh;
-class CMesh;
-//class   CImage;
-struct  CStatObj;
-class CVegetation;
-struct  ShadowMapFrustum;
-struct  IStatObj;
-class CObjManager;
-struct  SPrimitiveGroup;
-class CRendElementBase;
-class CRenderObject;
-class CTexMan;
-//class   ColorF;
-class CShadowVolEdge;
-class CCamera;
-class CDLight;
-struct SDeferredLightVolume;
-struct  ILog;
-struct  IConsole;
-struct  ICVar;
-struct  ITimer;
-struct  ISystem;
-class IGPUParticleEngine;
-class ICrySizer;
-struct IRenderAuxGeom;
-struct SREPointSpriteCreateParams;
-struct SPointSpriteVertex;
-struct RenderLMData;
-struct SShaderParam;
-struct SSkyLightRenderParams;
-struct SParticleRenderInfo;
-struct SParticleAddJobCompare;
-struct IColorGradingController;
-class IStereoRenderer;
-struct IFFont;
-struct IFFont_RenderProxy;
-struct STextDrawContext;
-struct IRenderMesh;
-struct ShadowFrustumMGPUCache;
-struct IAsyncTextureCompileListener;
-struct IClipVolume;
-struct SClipVolumeBlendInfo;
-class CRenderView;
-struct SDynTexture2;
-class CTexture;
-enum ETexPool : int;
-
-//////////////////////////////////////////////////////////////////////
-typedef unsigned char bvec4[4];
-typedef float vec4_t[4];
-typedef unsigned char byte;
-typedef float vec2_t[2];
-
-//DOC-IGNORE-BEGIN
-#include "Cry_Color.h"
-#include "Tarray.h"
-
-#include <IFont.h>
-//DOC-IGNORE-END
-
-#define MAX_NUM_VIEWPORTS 7
-
-// Query types for CryInd editor (used in EF_Query() function).
-enum ERenderQueryTypes
-{
-    EFQ_DeleteMemoryArrayPtr = 1,
-    EFQ_DeleteMemoryPtr,
-    EFQ_GetShaderCombinations,
-    EFQ_SetShaderCombinations,
-    EFQ_CloseShaderCombinations,
-
-    EFQ_MainThreadList,
-    EFQ_RenderThreadList,
-    EFQ_RenderMultithreaded,
-
-    EFQ_RecurseLevel,
-    EFQ_IncrementFrameID,
-    EFQ_DeviceLost,
-    EFQ_LightSource,
-
-    EFQ_Alloc_APITextures,
-    EFQ_Alloc_APIMesh,
-
-    // Memory allocated by meshes in system memory.
-    EFQ_Alloc_Mesh_SysMem,
-    EFQ_Mesh_Count,
-
-    EFQ_HDRModeEnabled,
-    EFQ_ParticlesTessellation,
-    EFQ_WaterTessellation,
-    EFQ_MeshTessellation,
-    EFQ_GetShadowPoolFrustumsNum,
-    EFQ_GetShadowPoolAllocThisFrameNum,
-    EFQ_GetShadowMaskChannelsNum,
-    EFQ_GetTiledShadingSkippedLightsNum,
-
-    // Description:
-    //      Query will return all textures in the renderer,
-    //      pass pointer to an SRendererQueryGetAllTexturesParam instance
-    EFQ_GetAllTextures,
-
-    // Description:
-    //      Release resources allocated by GetAllTextures query
-    //      pass pointer to an SRendererQueryGetAllTexturesParam instance, populated by EFQ_GetAllTextures
-    EFQ_GetAllTexturesRelease,
-
-    // Description:
-    //      Query will return all IRenderMesh objects in the renderer,
-    //      Pass an array pointer to be allocated and filled with the IRendermesh pointers. The calling function is responsible for freeing this memory.
-    //      This was originally a two pass process, but proved to be non-thread-safe, leading to buffer overruns and underruns.
-    EFQ_GetAllMeshes,
-
-    // Summary:
-    //      Multigpu (crossfire/sli) is enabled.
-    EFQ_MultiGPUEnabled,
-    EFQ_SetDrawNearFov,
-    EFQ_GetDrawNearFov,
-    EFQ_TextureStreamingEnabled,
-    EFQ_MSAAEnabled,
-    EFQ_AAMode,
-
-    EFQ_Fullscreen,
-    EFQ_GetTexStreamingInfo,
-    EFQ_GetMeshPoolInfo,
-
-    // Description:
-    //      True when shading is done in linear space, de-gamma on texture lookup, gamma on frame buffer writing (sRGB), false otherwise.
-    EFQ_sLinearSpaceShadingEnabled,
-
-    // The percentages of overscan borders for left/right and top/bottom to adjust the title safe area.
-    EFQ_OverscanBorders,
-
-    // Get num active post effects
-    EFQ_NumActivePostEffects,
-
-    // Get size of textures memory pool
-    EFQ_TexturesPoolSize,
-    EFQ_RenderTargetPoolSize,
-
-    EFQ_GetShaderCacheInfo,
-
-    EFQ_GetFogCullDistance,
-    EFQ_GetMaxRenderObjectsNum,
-
-    EFQ_IsRenderLoadingThreadActive,
-
-    EFQ_GetSkinningDataPoolSize,
-
-    EFQ_GetViewportDownscaleFactor,
-    EFQ_ReverseDepthEnabled,
-
-    EFQ_GetLastD3DDebugMessage
-};
-
-struct ID3DDebugMessage
-{
-public:
-    virtual void Release() = 0;
-    virtual const char* GetMessage() const = 0;
-
-protected:
-    ID3DDebugMessage() {}
-    virtual ~ID3DDebugMessage() {}
-};
-
-enum EScreenAspectRatio
-{
-    eAspect_Unknown,
-    eAspect_4_3,
-    eAspect_16_9,
-    eAspect_16_10,
-};
-
-class SBoundingVolume
-{
-public:
-    SBoundingVolume()
-        : m_vCenter(0, 0, 0)
-        , m_fRadius(0) {}
-    ~SBoundingVolume() {}
-
-    void SetCenter(const Vec3& center)  { m_vCenter = center; }
-    void SetRadius(float radius)        { m_fRadius = radius; }
-    const Vec3& GetCenter() const       { return m_vCenter;   }
-    float GetRadius() const             { return m_fRadius;   }
-
-protected:
-    Vec3    m_vCenter;
-    float   m_fRadius;
-};
-
-class SMinMaxBox
-    : public SBoundingVolume
-{
-public:
-    SMinMaxBox()
-    {
-        Clear();
-    }
-    SMinMaxBox(const Vec3& min, const Vec3& max) :
-        m_min(min), 
-        m_max(max)
-    {
-        UpdateSphere();
-    }
-
-    // Summary:
-    //  Destructor
-    virtual ~SMinMaxBox() {}
-
-    void  AddPoint(const Vec3& pt)
-    {
-        if (pt.x > m_max.x)
-        {
-            m_max.x = pt.x;
-        }
-        if (pt.x < m_min.x)
-        {
-            m_min.x = pt.x;
-        }
-
-        if (pt.y > m_max.y)
-        {
-            m_max.y = pt.y;
-        }
-        if (pt.y < m_min.y)
-        {
-            m_min.y = pt.y;
-        }
-
-        if (pt.z > m_max.z)
-        {
-            m_max.z = pt.z;
-        }
-        if (pt.z < m_min.z)
-        {
-            m_min.z = pt.z;
-        }
-
-        // Summary:
-        //   Updates the center and radius.
-        UpdateSphere();
-    }
-    void  AddPoint(float x, float y, float z)
-    {
-        AddPoint(Vec3(x, y, z));
-    }
-
-    void  Union(const SMinMaxBox& box)  { AddPoint(box.GetMin()); AddPoint(box.GetMax()); }
-
-    const Vec3& GetMin() const     { return m_min; }
-    const Vec3& GetMax() const     { return m_max; }
-
-    void  SetMin(const Vec3& min)  { m_min = min; UpdateSphere(); }
-    void  SetMax(const Vec3& max)  { m_max = max; UpdateSphere(); }
-
-    float GetWidthInX() const       { return m_max.x - m_min.x; }
-    float GetWidthInY() const       { return m_max.y - m_min.y; }
-    float GetWidthInZ() const       { return m_max.z - m_min.z; }
-
-    bool  PointInBBox(const Vec3& pt) const;
-
-    bool  ViewFrustumCull(const CameraViewParameters& viewParameters, const Matrix44& mat);
-
-    void  Transform(const Matrix34& mat)
-    {
-        Vec3 verts[8];
-        CalcVerts(verts);
-        Clear();
-        for (int i = 0; i < 8; i++)
-        {
-            AddPoint(mat.TransformPoint(verts[i]));
-        }
-    }
-
-    // Summary:
-    //  Resets the bounding box.
-    void  Clear()
-    {
-        m_min = Vec3(999999.0f, 999999.0f, 999999.0f);
-        m_max = Vec3(-999999.0f, -999999.0f, -999999.0f);
-    }
-
-protected:
-    void UpdateSphere()
-    {
-        m_vCenter =  m_min;
-        m_vCenter += m_max;
-        m_vCenter *= 0.5f;
-
-        Vec3 rad  =  m_max;
-        rad      -= m_vCenter;
-        m_fRadius =  rad.len();
-    }
-    void CalcVerts(Vec3 pVerts[8]) const
-    {
-        pVerts[0].Set(m_max.x, m_max.y, m_max.z);
-        pVerts[4].Set(m_max.x, m_max.y, m_min.z);
-        pVerts[1].Set(m_min.x, m_max.y, m_max.z);
-        pVerts[5].Set(m_min.x, m_max.y, m_min.z);
-        pVerts[2].Set(m_min.x, m_min.y, m_max.z);
-        pVerts[6].Set(m_min.x, m_min.y, m_min.z);
-        pVerts[3].Set(m_max.x, m_min.y, m_max.z);
-        pVerts[7].Set(m_max.x, m_min.y, m_min.z);
-    }
-
-private:
-    Vec3 m_min; // Original object space BV.
-    Vec3 m_max;
-};
-
-
-
-//////////////////////////////////////////////////////////////////////
-// All possible primitive types
-
-enum PublicRenderPrimitiveType
-{
-    prtTriangleList,
-    prtTriangleStrip,
-    prtLineList,
-    prtLineStrip
-};
-
-//////////////////////////////////////////////////////////////////////
-#define R_CULL_DISABLE  0
-#define R_CULL_NONE     0
-#define R_CULL_FRONT    1
-#define R_CULL_BACK     2
-
-//////////////////////////////////////////////////////////////////////
-#define R_DEFAULT_LODBIAS 0
-
-//////////////////////////////////////////////////////////////////////
-#define R_SOLID_MODE    0
-#define R_WIREFRAME_MODE 1
-
-#define R_DX9_RENDERER  2
-#define R_DX11_RENDERER 3
-#define R_NULL_RENDERER 4
-#define R_CUBAGL_RENDERER 5
-#define R_GL_RENDERER 6
-#define R_METAL_RENDERER 7
-#define R_DX12_RENDERER 8
-
-//////////////////////////////////////////////////////////////////////
-// Render features
-
-#define RFT_FREE_0x1          0x1
-#define RFT_ALLOW_RECTTEX     0x2
-#define RFT_OCCLUSIONQUERY    0x4
-#define RFT_FREE_0x8          0x8
-#define RFT_HWGAMMA           0x10
-#define RFT_FREE_0x20         0x20
-#define RFT_COMPRESSTEXTURE   0x40
-#define RFT_FREE_0x80         0x80
-#define RFT_ALLOWANISOTROPIC  0x100      // Allows anisotropic texture filtering.
-#define RFT_SUPPORTZBIAS      0x200
-#define RFT_FREE_0x400        0x400
-#define RFT_FREE_0x800        0x800
-#define RFT_FREE_0x1000       0x1000
-#define RFT_FREE_0x2000       0x2000
-#define RFT_OCCLUSIONTEST     0x8000     // Support hardware occlusion test.
-
-#define RFT_HW_ARM_MALI       0x04000    // Unclassified ARM (MALI) hardware.
-#define RFT_HW_INTEL          0x10000    // Unclassified intel hardware.
-#define RFT_HW_QUALCOMM       0x10000    // Unclassified Qualcomm hardware
-#define RFT_HW_ATI            0x20000    // Unclassified ATI hardware.
-#define RFT_HW_NVIDIA         0x40000    // Unclassified NVidia hardware.
-#define RFT_HW_MASK           0x74000    // Graphics chip mask.
-
-#define RFT_HW_HDR            0x80000    // Hardware supports high dynamic range rendering.
-
-#define RFT_HW_SM20           0x100000   // Shader model 2.0
-#define RFT_HW_SM2X           0x200000   // Shader model 2.X
-#define RFT_HW_SM30           0x400000   // Shader model 3.0
-#define RFT_HW_SM40           0x800000   // Shader model 4.0
-#define RFT_HW_SM50           0x1000000  // Shader model 5.0
-
-#define RFT_FREE_0x2000000    0x2000000
-#define RFT_FREE_0x4000000    0x4000000
-#define RFT_FREE_0x8000000    0x8000000
-
-#define RFT_HW_VERTEX_STRUCTUREDBUF 0x10000000 // Supports Structured Buffers in the Vertex Shader.
-#define RFT_RGBA                    0x20000000 // RGBA order (otherwise BGRA).
-#define RFT_COMPUTE_SHADERS         0x40000000 // Compute Shaders support
-#define RFT_HW_VERTEXTEXTURES       0x80000000 // Vertex texture fetching supported.
-
-//====================================================================
-// PrecacheResources flags
-
-#define FPR_NEEDLIGHT     1
-#define FPR_2D            2
-#define FPR_HIGHPRIORITY  4
-#define FPR_SYNCRONOUS    8
-#define FPR_STARTLOADING    16
-#define FPR_SINGLE_FRAME_PRIORITY_UPDATE 32
-
-//=====================================================================
-// SetRenderTarget flags
-#define SRF_SCREENTARGET  1
-#define SRF_USE_ORIG_DEPTHBUF 2
-#define SRF_USE_ORIG_DEPTHBUF_MSAA 4
-
-//====================================================================
-// Draw shaders flags (EF_EndEf3d)
-
-#define SHDF_ALLOWHDR               BIT(0)
-#define SHDF_CUBEMAPGEN             BIT(1)
-#define SHDF_ZPASS                  BIT(2)
-#define SHDF_ZPASS_ONLY             BIT(3)
-#define SHDF_DO_NOT_CLEAR_Z_BUFFER  BIT(4)
-#define SHDF_ALLOWPOSTPROCESS       BIT(5)
-#define SHDF_ALLOW_AO               BIT(8)
-#define SHDF_ALLOW_WATER            BIT(9)
-#define SHDF_NOASYNC                BIT(10)
-#define SHDF_NO_DRAWNEAR            BIT(11)
-#define SHDF_STREAM_SYNC            BIT(13)
-#define SHDF_NO_SHADOWGEN           BIT(15)
-
-//////////////////////////////////////////////////////////////////////
-// Virtual screen size
-const float VIRTUAL_SCREEN_WIDTH = 800.0f;
-const float VIRTUAL_SCREEN_HEIGHT = 600.0f;
-
-//////////////////////////////////////////////////////////////////////
-// Object states
-#define OS_ALPHA_BLEND             0x1
-#define OS_ADD_BLEND               0x2
-#define OS_MULTIPLY_BLEND          0x4
-#define OS_TRANSPARENT            (OS_ALPHA_BLEND | OS_ADD_BLEND | OS_MULTIPLY_BLEND)
-#define OS_NODEPTH_TEST            0x8
-#define OS_NODEPTH_WRITE           0x10
-#define OS_ANIM_BLEND              0x20
-#define OS_ENVIRONMENT_CUBEMAP     0x40
-
-// Render State flags
-#define GS_BLSRC_MASK              0xf
-#define GS_BLSRC_ZERO              0x1
-#define GS_BLSRC_ONE               0x2
-#define GS_BLSRC_DSTCOL            0x3
-#define GS_BLSRC_ONEMINUSDSTCOL    0x4
-#define GS_BLSRC_SRCALPHA          0x5
-#define GS_BLSRC_ONEMINUSSRCALPHA  0x6
-#define GS_BLSRC_DSTALPHA          0x7
-#define GS_BLSRC_ONEMINUSDSTALPHA  0x8
-#define GS_BLSRC_ALPHASATURATE     0x9
-#define GS_BLSRC_SRCALPHA_A_ZERO   0xa // separate alpha blend state
-#define GS_BLSRC_SRC1ALPHA         0xb // dual source blending
-
-
-#define GS_BLDST_MASK              0xf0
-#define GS_BLDST_ZERO              0x10
-#define GS_BLDST_ONE               0x20
-#define GS_BLDST_SRCCOL            0x30
-#define GS_BLDST_ONEMINUSSRCCOL    0x40
-#define GS_BLDST_SRCALPHA          0x50
-#define GS_BLDST_ONEMINUSSRCALPHA  0x60
-#define GS_BLDST_DSTALPHA          0x70
-#define GS_BLDST_ONEMINUSDSTALPHA  0x80
-#define GS_BLDST_ONE_A_ZERO        0x90 // separate alpha blend state
-#define GS_BLDST_ONEMINUSSRC1ALPHA 0xa0 // dual source blending
-
-
-#define GS_DEPTHWRITE              0x00000100
-
-#define GS_COLMASK_RT1             0x00000200
-#define GS_COLMASK_RT2             0x00000400
-#define GS_COLMASK_RT3             0x00000800
-
-#define GS_NOCOLMASK_R             0x00001000
-#define GS_NOCOLMASK_G             0x00002000
-#define GS_NOCOLMASK_B             0x00004000
-#define GS_NOCOLMASK_A             0x00008000
-#define GS_COLMASK_RGB             (GS_NOCOLMASK_A)
-#define GS_COLMASK_A               (GS_NOCOLMASK_R | GS_NOCOLMASK_G | GS_NOCOLMASK_B)
-#define GS_COLMASK_NONE            (GS_NOCOLMASK_R | GS_NOCOLMASK_G | GS_NOCOLMASK_B | GS_NOCOLMASK_A)
-#define GS_COLMASK_MASK            GS_COLMASK_NONE
-#define GS_COLMASK_SHIFT           12
-
-#define GS_WIREFRAME               0x00010000
-#define GS_NODEPTHTEST             0x00040000
-
-#define GS_BLEND_MASK              0x0f0000ff
-
-#define GS_DEPTHFUNC_LEQUAL        0x00000000
-#define GS_DEPTHFUNC_EQUAL         0x00100000
-#define GS_DEPTHFUNC_GREAT         0x00200000
-#define GS_DEPTHFUNC_LESS          0x00300000
-#define GS_DEPTHFUNC_GEQUAL        0x00400000
-#define GS_DEPTHFUNC_NOTEQUAL      0x00500000
-#define GS_DEPTHFUNC_HIZEQUAL      0x00600000 // keep hi-z test, always pass fine depth. Useful for debug display
-#define GS_DEPTHFUNC_ALWAYS        0x00700000
-#define GS_DEPTHFUNC_MASK          0x00700000
-
-#define GS_STENCIL                 0x00800000
-
-#define GS_BLEND_OP_MASK           0x03000000
-#define GS_BLOP_MAX                              0x01000000
-#define GS_BLOP_MIN                              0x02000000
-
-// Separate alpha blend mode
-#define GS_BLALPHA_MASK            0x0c000000
-#define GS_BLALPHA_MIN             0x04000000
-#define GS_BLALPHA_MAX             0x08000000
-
-#define GS_ALPHATEST_MASK          0xf0000000
-#define GS_ALPHATEST_GREATER       0x10000000
-#define GS_ALPHATEST_LESS          0x20000000
-#define GS_ALPHATEST_GEQUAL        0x40000000
-#define GS_ALPHATEST_LEQUAL        0x80000000
-
-#define FORMAT_8_BIT   8
-#define FORMAT_24_BIT 24
-#define FORMAT_32_BIT 32
-
-//==================================================================
-// StencilStates
-
-//Note: If these are altered, g_StencilFuncLookup and g_StencilOpLookup arrays
-//          need to be updated in turn
-
-#define FSS_STENCFUNC_ALWAYS   0x0
-#define FSS_STENCFUNC_NEVER    0x1
-#define FSS_STENCFUNC_LESS     0x2
-#define FSS_STENCFUNC_LEQUAL   0x3
-#define FSS_STENCFUNC_GREATER  0x4
-#define FSS_STENCFUNC_GEQUAL   0x5
-#define FSS_STENCFUNC_EQUAL    0x6
-#define FSS_STENCFUNC_NOTEQUAL 0x7
-#define FSS_STENCFUNC_MASK     0x7
-
-#define FSS_STENCIL_TWOSIDED   0x8
-
-#define FSS_CCW_SHIFT          16
-
-#define FSS_STENCOP_KEEP    0x0
-#define FSS_STENCOP_REPLACE 0x1
-#define FSS_STENCOP_INCR    0x2
-#define FSS_STENCOP_DECR    0x3
-#define FSS_STENCOP_ZERO    0x4
-#define FSS_STENCOP_INCR_WRAP 0x5
-#define FSS_STENCOP_DECR_WRAP 0x6
-#define FSS_STENCOP_INVERT 0x7
-
-#define FSS_STENCFAIL_SHIFT   4
-#define FSS_STENCFAIL_MASK    (0x7 << FSS_STENCFAIL_SHIFT)
-
-#define FSS_STENCZFAIL_SHIFT  8
-#define FSS_STENCZFAIL_MASK   (0x7 << FSS_STENCZFAIL_SHIFT)
-
-#define FSS_STENCPASS_SHIFT   12
-#define FSS_STENCPASS_MASK    (0x7 << FSS_STENCPASS_SHIFT)
-
-#define STENC_FUNC(op) (op)
-#define STENC_CCW_FUNC(op) (op << FSS_CCW_SHIFT)
-#define STENCOP_FAIL(op) (op << FSS_STENCFAIL_SHIFT)
-#define STENCOP_ZFAIL(op) (op << FSS_STENCZFAIL_SHIFT)
-#define STENCOP_PASS(op) (op << FSS_STENCPASS_SHIFT)
-#define STENCOP_CCW_FAIL(op) (op << (FSS_STENCFAIL_SHIFT + FSS_CCW_SHIFT))
-#define STENCOP_CCW_ZFAIL(op) (op << (FSS_STENCZFAIL_SHIFT + FSS_CCW_SHIFT))
-#define STENCOP_CCW_PASS(op) (op << (FSS_STENCPASS_SHIFT + FSS_CCW_SHIFT))
-
-//Stencil masks
-#define BIT_STENCIL_RESERVED 0x80
-#define BIT_STENCIL_INSIDE_CLIPVOLUME 0x40
-#define STENC_VALID_BITS_NUM 7
-#define STENC_MAX_REF ((1 << STENC_VALID_BITS_NUM) - 1)
-
-// Read FrameBuffer type
-enum ERB_Type
-{
-    eRB_BackBuffer,
-    eRB_FrontBuffer,
-    eRB_ShadowBuffer
-};
-
-enum EVertexCostTypes
-{
-    EVCT_STATIC = 0,
-    EVCT_VEGETATION,
-    EVCT_SKINNED,
-    EVCT_NUM
-};
-
-//////////////////////////////////////////////////////////////////////
-
-struct SDispFormat
-{
-    int m_Width;
-    int m_Height;
-    int m_BPP;
-};
-
-struct SAAFormat
-{
-    char szDescr[64];
-    int nSamples;
-    int nQuality;
-};
-
-// Summary:
-//   Info about Terrain sector texturing.
-struct SSectorTextureSet
-{
-    SSectorTextureSet(unsigned short nT0)
-    {
-        nTex0 = nT0;
-        fTexOffsetX = fTexOffsetY = 0;
-        fTexScale = 1.f;
-    }
-
-    unsigned short nTex0;
-    float fTexOffsetX, fTexOffsetY, fTexScale;
-};
-
-struct IRenderNode;
-struct SShaderItem;
-
-#ifdef SUPPORT_HW_MOUSE_CURSOR
-class IHWMouseCursor
-{
-public:
-    virtual ~IHWMouseCursor() {}
-    virtual void SetPosition(int x, int y) = 0;
-    virtual void Show() = 0;
-    virtual void Hide() = 0;
-};
-#endif
-
-//////////////////////////////////////////////////////////////////////
-//DOC-IGNORE-BEGIN
-#include <IShader.h> // <> required for Interfuscator
-//DOC-IGNORE-END
-#include <IRenderMesh.h>
-
-// Flags passed in function FreeResources.
-#define FRR_SHADERS   1
-#define FRR_SHADERTEXTURES 2
-#define FRR_TEXTURES  4
-#define FRR_SYSTEM    8
-#define FRR_RESTORE   0x10
-#define FRR_REINITHW  0x20
-#define FRR_DELETED_MESHES 0x40
-#define FRR_FLUSH_TEXTURESTREAMING 0x80
-#define FRR_OBJECTS     0x100
-#define FRR_RENDERELEMENTS 0x200
-#define FRR_RP_BUFFERS 0x400
-#define FRR_SYSTEM_RESOURCES 0x800
-#define FRR_POST_EFFECTS 0x1000
-#define FRR_ALL      -1
-
-// Refresh render resources flags.
-// Flags passed in function RefreshResources.
-#define FRO_SHADERS  1
-#define FRO_SHADERTEXTURES  2
-#define FRO_TEXTURES 4
-#define FRO_GEOMETRY 8
-#define FRO_FORCERELOAD 0x10
-
-//=============================================================================
-// Shaders render target stuff.
-
-#define FRT_CLEAR_DEPTH   0x1
-#define FRT_CLEAR_STENCIL 0x2
-#define FRT_CLEAR_COLOR   0x4
-#define FRT_CLEAR (FRT_CLEAR_COLOR | FRT_CLEAR_DEPTH | FRT_CLEAR_STENCIL)
-#define FRT_CLEAR_FOGCOLOR 0x8
-#define FRT_CLEAR_IMMEDIATE 0x10
-#define FRT_CLEAR_COLORMASK 0x20
-#define FRT_CLEAR_RESET_VIEWPORT 0x40
-
-#define FRT_CAMERA_REFLECTED_WATERPLANE 0x40
-#define FRT_CAMERA_REFLECTED_PLANE      0x80
-#define FRT_CAMERA_CURRENT              0x100
-
-#define FRT_USE_FRONTCLIPPLANE          0x200
-#define FRT_USE_BACKCLIPPLANE           0x400
-
-#define FRT_GENERATE_MIPS               0x800
-
-#define FRT_RENDTYPE_CUROBJECT          0x1000
-#define FRT_RENDTYPE_CURSCENE           0x2000
-#define FRT_RENDTYPE_RECURSIVECURSCENE  0x4000
-#define FRT_RENDTYPE_COPYSCENE          0x8000
-
-// Summary:
-//   Flags used in DrawText function.
-// See also:
-//   SDrawTextInfo
-// Remarks:
-//   Text must be fixed pixel size.
-enum EDrawTextFlags
-{
-    eDrawText_Left          = 0,        // default left alignment if neither Center or Right are specified
-    eDrawText_Center        = BIT(0),   // centered alignment, otherwise right or left
-    eDrawText_Right         = BIT(1),   // right alignment, otherwise center or left
-    eDrawText_CenterV       = BIT(2),   // center vertically, otherwise top
-    eDrawText_Bottom        = BIT(3),   // bottom alignment
-
-    eDrawText_2D            = BIT(4),   // 3 component vector is used for xy screen position, otherwise it's 3d world space position
-
-    eDrawText_FixedSize     = BIT(5),   // font size is defined in the actual pixel resolution, otherwise it's in the virtual 800x600
-    eDrawText_800x600       = BIT(6),   // position are specified in the virtual 800x600 resolution, otherwise coordinates are in pixels
-
-    eDrawText_Monospace     = BIT(7),   // non proportional font rendering (Font width is same for all characters)
-
-    eDrawText_Framed        = BIT(8),   // draw a transparent, rectangular frame behind the text to ease readability independent from the background
-
-    eDrawText_DepthTest     = BIT(9),   // text should be occluded by world geometry using the depth buffer
-    eDrawText_IgnoreOverscan = BIT(10),  // ignore the overscan borders, text should be drawn at the location specified
-    eDrawText_UseTransform  = BIT(11),  // use a transform for the text
-};
-
-// Debug stats/views for Partial resolves
-// if REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS is enabled, make sure REFRACTION_PARTIAL_RESOLVE_STATS is too
-#if defined(PERFORMANCE_BUILD)
-    #define REFRACTION_PARTIAL_RESOLVE_STATS 1
-    #define REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS 0
-#elif defined(_RELEASE) // note: _RELEASE is defined in PERFORMANCE_BUILD, so this check must come second
-    #define REFRACTION_PARTIAL_RESOLVE_STATS 0
-    #define REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS 0
-#else
-    #define REFRACTION_PARTIAL_RESOLVE_STATS 1
-    #define REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS 1
-#endif
-
-#if REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS
-enum ERefractionPartialResolvesDebugViews
-{
-    eRPR_DEBUG_VIEW_2D_AREA = 1,
-    eRPR_DEBUG_VIEW_3D_BOUNDS,
-    eRPR_DEBUG_VIEW_2D_AREA_OVERLAY
-};
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//   This structure used in DrawText method of renderer.
-//   It provide all necessary information of how to render text on screen.
-// See also:
-//   IRenderer::Draw2dText
-struct SDrawTextInfo
-{
-    // Summary:
-    //  One of EDrawTextFlags flags.
-    // See also:
-    //  EDrawTextFlags
-    int     flags;
-    // Summary:
-    //  Text color, (r,g,b,a) all members must be specified.
-    float   color[4];
-    float xscale;
-    float yscale;
-
-    SDrawTextInfo()
-    {
-        flags = 0;
-        color[0] = color[1] = color[2] = color[3] = 1;
-        xscale = 1.0f;
-        yscale = 1.0f;
-    }
-};
-
-#define UIDRAW_TEXTSIZEFACTOR (12.0f)
-#define MIN_RESOLUTION_SCALE (0.25f)
-#define MAX_RESOLUTION_SCALE (4.0f)
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(IRenderer_h)
-#else
-//SLI/CROSSFIRE GPU maximum count
-    #define MAX_GPU_NUM 4
-#endif
-
-#define MAX_FRAME_ID_STEP_PER_FRAME 20
-const int MAX_GSM_LODS_NUM = 16;
-
-const f32 DRAW_NEAREST_MIN = 0.03f;
-const f32 DRAW_NEAREST_MAX = 40.0f;
-
-//===================================================================
-
-//////////////////////////////////////////////////////////////////////
-struct IRenderDebugListener
-{
-    virtual ~IRenderDebugListener() {}
-
-    virtual void OnDebugDraw() = 0;
-};
-
-//////////////////////////////////////////////////////////////////////
-struct ILoadtimeCallback
-{
-    virtual void LoadtimeUpdate(float fDeltaTime) = 0;
-    virtual void LoadtimeRender() = 0;
-    virtual ~ILoadtimeCallback(){}
-};
-
-//////////////////////////////////////////////////////////////////////
-struct ISyncMainWithRenderListener
-{
-    virtual void SyncMainWithRender() = 0;
-    virtual ~ISyncMainWithRenderListener(){}
-};
-
-//////////////////////////////////////////////////////////////////////
-enum ERenderType
-{
-    eRT_Undefined,
-    eRT_Null,
-    eRT_DX11,
-    eRT_DX12,
-    eRT_Provo,
-    eRT_OpenGL,
-    eRT_Metal,
-    eRT_Jasper,
-};
-
-//////////////////////////////////////////////////////////////////////
-// Enum for types of deferred lights
-enum eDeferredLightType
-{
-    eDLT_DeferredLight = 0,
-
-    eDLT_NumShadowCastingLights = eDLT_DeferredLight + 1,
-    // these lights cannot cast shadows
-    eDLT_DeferredCubemap = eDLT_NumShadowCastingLights,
-    eDLT_DeferredAmbientLight,
-    eDLT_NumLightTypes,
-};
-
-const float RENDERER_LIGHT_UNIT_SCALE = 10000.0f;  // Scale factor between photometric and internal light units
-
-//////////////////////////////////////////////////////////////////////
-struct SCustomRenderInitArgs
-{
-    bool appStartedFromMediaCenter;
-};
-
-#if defined(ANDROID)
-enum
-{
-    CULL_SIZEX = 128
-};
-enum
-{
-    CULL_SIZEY = 64
-};
-#else
-enum
-{
-    CULL_SIZEX = 256
-};
-enum
-{
-    CULL_SIZEY = 128
-};
-#endif
-
-//////////////////////////////////////////////////////////////////////
-// Description:
-//   Z-buffer as occlusion buffer definitions: used, shared and initialized in engine and renderer.
-struct SHWOccZBuffer
-{
-    uint32* pHardwareZBuffer;
-    uint32* pZBufferVMem;
-    uint32 ZBufferSizeX;
-    uint32 ZBufferSizeY;
-    uint32 HardwareZBufferRSXOff;
-    uint32 ZBufferVMemRSXOff;
-    uint32 pad[2];  // Keep 32 byte aligned
-    SHWOccZBuffer()
-        : pHardwareZBuffer(NULL)
-        , pZBufferVMem(NULL)
-        , ZBufferSizeX(CULL_SIZEX)
-        , ZBufferSizeY(CULL_SIZEY)
-        , ZBufferVMemRSXOff(0)
-        , HardwareZBufferRSXOff(0){}
-};
-
-class ITextureStreamListener
-{
-public:
-    virtual void OnCreatedStreamedTexture(void* pHandle, const char* name, int nMips, int nMinMipAvailable) = 0;
-    virtual void OnDestroyedStreamedTexture(void* pHandle) = 0;
-    virtual void OnTextureWantsMip(void* pHandle, int nMinMip) = 0;
-    virtual void OnTextureHasMip(void* pHandle, int nMinMip) = 0;
-    virtual void OnBegunUsingTextures(void** pHandles, size_t numHandles) = 0;
-    virtual void OnEndedUsingTextures(void** pHandle, size_t numHandles) = 0;
-
-protected:
-    virtual ~ITextureStreamListener() {}
-};
-
-enum eDolbyVisionMode
-{
-    eDVM_Disabled,
-    eDVM_RGBPQ,
-    eDVM_Vision,
-};
-
-enum ERenderPipelineProfilerStats
-{
-    eRPPSTATS_OverallFrame = 0,
-    eRPPSTATS_Recursion,
-
-    // Scene
-    eRPPSTATS_SceneOverall,
-    eRPPSTATS_SceneDecals,
-    eRPPSTATS_SceneForward,
-    eRPPSTATS_SceneWater,
-
-    // Shadows
-    eRPPSTATS_ShadowsOverall,
-    eRPPSTATS_ShadowsSun,
-    eRPPSTATS_ShadowsSunCustom,
-    eRPPSTATS_ShadowsLocal,
-
-    // Lighting
-    eRPPSTATS_LightingOverall,
-    eRPPSTATS_LightingGI,
-
-    // VFX
-    eRPPSTATS_VfxOverall,
-    eRPPSTATS_VfxTransparent,
-    eRPPSTATS_VfxFog,
-    eRPPSTATS_VfxFlares,
-
-    // Individual Total Illumination stats
-    eRPPSTATS_TI_INJECT_CLEAR,
-    eRPPSTATS_TI_VOXELIZE,
-    eRPPSTATS_TI_INJECT_AIR,
-    eRPPSTATS_TI_INJECT_LIGHT,
-    eRPPSTATS_TI_INJECT_REFL0,
-    eRPPSTATS_TI_INJECT_REFL1,
-    eRPPSTATS_TI_INJECT_DYNL,
-    eRPPSTATS_TI_NID_DIFF,
-    eRPPSTATS_TI_GEN_DIFF,
-    eRPPSTATS_TI_GEN_SPEC,
-    eRPPSTATS_TI_GEN_AIR,
-    eRPPSTATS_TI_DEMOSAIC_DIFF,
-    eRPPSTATS_TI_DEMOSAIC_SPEC,
-    eRPPSTATS_TI_UPSCALE_DIFF,
-    eRPPSTATS_TI_UPSCALE_SPEC,
-
-    RPPSTATS_NUM
-};
-
-struct RPProfilerStats
-{
-    float   gpuTime;
-    float   gpuTimeSmoothed;
-    float   gpuTimeMax;
-    float   cpuTime;
-    uint32  numDIPs;
-    uint32  numPolys;
-
-    // Internal
-    float   _gpuTimeMaxNew;
-};
-
-struct TransformationMatrices
-{
-    Matrix44A m_viewMatrix;
-    Matrix44A m_projectMatrix;
-};
-
-struct ISvoRenderer
-{
-    virtual bool IsShaderItemUsedForVoxelization([[maybe_unused]] SShaderItem& rShaderItem, [[maybe_unused]] IRenderNode* pRN){ return false; }
-    virtual void Release(){}
-};
-
-//////////////////////////////////////////////////////////////////////
-struct SRenderPipeline;
-struct SRenderThread;
-struct SShaderTechnique;
-struct SShaderPass;
-struct SDepthTexture;
-struct SRenderTileInfo;
-
-class CShaderMan;
-class CDeviceBufferManager;
-class CShaderResources;
-class PerInstanceConstantBufferPool;
-
-namespace AZ {
-    class Plane;
-    namespace Vertex {
-        class Format;
-    }
-}
-enum eRenderPrimitiveType : int8;
-enum RenderIndexType : int;
-
-struct IRenderAPI
-{
-};
-
-struct IRenderer
-    : public IRenderAPI
-{
-    virtual ~IRenderer(){}
-
-    virtual void AddRenderDebugListener(IRenderDebugListener* pRenderDebugListener) = 0;
-    virtual void RemoveRenderDebugListener(IRenderDebugListener* pRenderDebugListener) = 0;
-
-    virtual ERenderType GetRenderType() const = 0;
-
-    virtual const char* GetRenderDescription() const
-    {
-        return "CryRenderer";
-    }
-
-    // Summary:
-    //  Initializes the renderer, params are self-explanatory.
-    virtual WIN_HWND Init(int x, int y, int width, int height, unsigned int cbpp, int zbpp, int sbits, bool fullscreen, bool isEditor, WIN_HINSTANCE hinst, WIN_HWND Glhwnd = 0, bool bReInit = false, const SCustomRenderInitArgs* pCustomArgs = 0, bool bShaderCacheGen = false) = 0;
-    virtual void PostInit() = 0;
-
-    virtual bool IsPost3DRendererEnabled() const { return false; }
-
-    virtual int GetFeatures() = 0;
-    virtual const void SetApiVersion(const AZStd::string& apiVersion) = 0;
-    virtual const void SetAdapterDescription(const AZStd::string& adapterDescription) = 0;
-    virtual const AZStd::string& GetApiVersion() const = 0;
-    virtual const AZStd::string& GetAdapterDescription() const = 0;
-    virtual void GetVideoMemoryUsageStats(size_t& vidMemUsedThisFrame, size_t& vidMemUsedRecently, bool bGetPoolsSizes = false) = 0;
-    virtual int GetNumGeomInstances() const = 0;
-    virtual int GetNumGeomInstanceDrawCalls() const = 0;
-    virtual int GetCurrentNumberOfDrawCalls() const = 0;
-    virtual void GetCurrentNumberOfDrawCalls(int& nGeneral, int& nShadowGen) const = 0;
-    //Sums DIP counts for the EFSLIST_* passes that match the submitted mask.
-    //Compose the mask with bitwise arithmetic, use (1 << EFSLIST_*) per list.
-    //e.g. to sum general and transparent, pass in ( (1 << EFSLIST_GENERAL) | (1 << EFSLIST_TRANSP) )
-    virtual int GetCurrentNumberOfDrawCalls(uint32 EFSListMask) const = 0;
-    virtual float GetCurrentDrawCallRTTimes(uint32 EFSListMask) const = 0;
-
-    virtual void SetDebugRenderNode(IRenderNode* pRenderNode) = 0;
-    virtual bool IsDebugRenderNode(IRenderNode* pRenderNode) const = 0;
-
-    /////////////////////////////////////////////////////////////////////////////////
-    // Render-context management
-    /////////////////////////////////////////////////////////////////////////////////
-    virtual bool DeleteContext(WIN_HWND hWnd) = 0;
-    virtual bool CreateContext(WIN_HWND hWnd, bool bAllowMSAA = false, int SSX = 1, int SSY = 1) = 0;
-    virtual bool SetCurrentContext(WIN_HWND hWnd) = 0;
-    virtual void MakeMainContextActive() = 0;
-    virtual WIN_HWND GetCurrentContextHWND() = 0;
-    virtual bool IsCurrentContextMainVP() = 0;
-
-    // Summary:
-    //  Gets height of the current viewport.
-    virtual int   GetCurrentContextViewportHeight() const = 0;
-
-    // Summary:
-    //  Gets width of the current viewport.
-    virtual int   GetCurrentContextViewportWidth() const = 0;
-    /////////////////////////////////////////////////////////////////////////////////
-
-    // Summary:
-    //  Shuts down the renderer.
-    virtual void  ShutDown(bool bReInit = false) = 0;
-    virtual void  ShutDownFast() = 0;
-
-    // Description:
-    //  Creates array of all supported video formats (except low resolution formats).
-    // Return value:
-    //  Number of formats in memory.
-    virtual int EnumDisplayFormats(SDispFormat* Formats) = 0;
-
-    // Summary:
-    //  Returns all supported by video card video AA formats.
-    virtual int EnumAAFormats(SAAFormat* Formats) = 0;
-
-    // Summary:
-    //  Changes resolution of the window/device (doesn't require to reload the level.
-    virtual bool  ChangeResolution(int nNewWidth, int nNewHeight, int nNewColDepth, int nNewRefreshHZ, bool bFullScreen, bool bForceReset) = 0;
-
-    // Note:
-    //  Should be called at the beginning of every frame.
-    virtual void  BeginFrame() = 0;
-
-    // Summary:
-    //  Creates default system shaders and textures.
-    virtual void  InitSystemResources(int nFlags) = 0;
-    virtual void  InitTexturesSemantics() = 0;
-
-    // Summary:
-    //  Frees the allocated resources.
-    virtual void  FreeResources(int nFlags) = 0;
-
-    // Summary:
-    //  Shuts down the renderer.
-    virtual void  Release() = 0;
-
-    // See also:
-    //   r_ShowDynTextures
-    virtual void RenderDebug(bool bRenderStats = true) = 0;
-
-    // Note:
-    //   Should be called at the end of every frame.
-    virtual void  EndFrame() = 0;
-
-    // Force a swap on the backbuffer
-    virtual void    ForceSwapBuffers() = 0;
-
-    // Summary:
-    //      Try to flush the render thread commands to keep the render thread active during
-    //      level loading, but simpy return if the render thread is still busy
-    virtual void TryFlush() = 0;
-
-    virtual void GetViewport(int* x, int* y, int* width, int* height) const = 0;
-    virtual void SetViewport(int x, int y, int width, int height, int id = 0) = 0;
-    virtual void SetRenderTile(f32 nTilesPosX = 0.f, f32 nTilesPosY = 0.f, f32 nTilesGridSizeX = 1.f, f32 nTilesGridSizeY = 1.f) = 0;
-    virtual void SetScissor(int x = 0, int y = 0, int width = 0, int height = 0) = 0;
-    virtual Matrix44A& GetViewProjectionMatrix() = 0;
-    virtual void SetTranspOrigCameraProjMatrix(Matrix44A& matrix) = 0;
-
-    virtual EScreenAspectRatio GetScreenAspect(int nWidth, int nHeight) = 0;
-
-    virtual Vec2 SetViewportDownscale(float xscale, float yscale) = 0;
-    virtual void SetViewParameters(const CameraViewParameters& viewParameters) = 0; // Direct setter
-    virtual void ApplyViewParameters(const CameraViewParameters& viewParameters) = 0; // Uses CameraViewParameters to create matrices.
-
-    // Summary:
-    //  Draws user primitives.
-    virtual void DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, int nVerts, int nInds, PublicRenderPrimitiveType nPrimType) = 0;
-
-    struct DynUiPrimitive : public AZStd::intrusive_slist_node<DynUiPrimitive>
-    {
-        SVF_P2F_C4B_T2F_F4B* m_vertices = nullptr;
-        uint16* m_indices = nullptr;
-        int m_numVertices = 0;
-        int m_numIndices = 0;
-    };
-
-    using DynUiPrimitiveList = AZStd::intrusive_slist<DynUiPrimitive, AZStd::slist_base_hook<DynUiPrimitive>>;
-
-    // Summary:
-    //  Draws a list of UI primitives as one draw call (if using separate render thread)
-    virtual void DrawDynUiPrimitiveList(DynUiPrimitiveList& primitives, int totalNumVertices, int totalNumIndices) = 0;
-
-    // Summary:
-    //  Sets the renderer camera.
-    virtual void  SetCamera(const CCamera& cam) = 0;
-
-    // Summary:
-    //  Gets the renderer camera.
-    virtual const CCamera& GetCamera() = 0;
-
-    virtual CRenderView* GetRenderViewForThread(int nThreadID) = 0;
-    // Summary:
-    //  Gets the renderer previous camera.
-    //virtual const CCamera& GetCameraPrev() = 0;
-
-    // Summary:
-    //  Sets delta gamma.
-    virtual bool  SetGammaDelta(float fGamma) = 0;
-
-    // Summary:
-    //  Restores gamma
-    // Note:
-    //  Reset gamma setting if not in fullscreen mode.
-    virtual void  RestoreGamma(void) = 0;
-
-    // Summary:
-    //  Changes display size.
-    virtual bool  ChangeDisplay(unsigned int width, unsigned int height, unsigned int cbpp) = 0;
-
-    // Summary:
-    //  Changes viewport size.
-    virtual void  ChangeViewport(unsigned int x, unsigned int y, unsigned int width, unsigned int height, bool bMainViewport = false, float scaleWidth = 1.0f, float scaleHeight = 1.0f) = 0;
-
-    // Summary:
-    //  Saves source data to a Tga file.
-    // Note:
-    //  Should not be here.
-    virtual bool  SaveTga(unsigned char* sourcedata, int sourceformat, int w, int h, const char* filename, bool flip) const = 0;
-
-    // Summary:
-    //  Sets the current binded texture.
-    virtual void  SetTexture(int tnum) = 0;
-
-    // Summary:
-    //  Sets the current bound texture for the given texture unit
-    virtual void  SetTexture(int tnum, int nUnit) = 0;
-
-    // Summary:
-    //  Sets the white texture.
-    virtual void  SetWhiteTexture() = 0;
-
-    // Summary:
-    //  Gets the white texture Id.
-    virtual int  GetWhiteTextureId() const = 0;
-
-    // Summary:
-    //  Gets the white texture Id.
-    virtual int  GetBlackTextureId() const = 0;
-
-    // Summary:
-    //  Draws a 2d image on the screen.
-    // Example:
-    //  Hud etc.
-    virtual void  Draw2dImage(float xpos, float ypos, float w, float h, int texture_id, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0, float r = 1, float g = 1, float b = 1, float a = 1, float z = 1) = 0;
-
-    virtual void  Draw2dImageStretchMode(bool stretch) = 0;
-
-    // Summary:
-    //  Adds a 2d image that should be drawn on the screen to an internal render list. The list can be drawn with Draw2dImageList.
-    //  If several images will be drawn, using this function is more efficient than calling Draw2dImage as it allows better batching.
-    //  The function supports placing images in stereo 3d space.
-    // Arguments:
-    //      stereoDepth - Places image in stereo 3d space. The depth is specified in camera space, the stereo params are the same that
-    //                                  are used for the scene. A value of 0 is handled as a special case and always places the image on the screen plane.
-    virtual void  Push2dImage(float xpos, float ypos, float w, float h, int texture_id, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0, float r = 1, float g = 1, float b = 1, float a = 1, float z = 1, float stereoDepth = 0) = 0;
-
-    // Summary:
-    //  Draws all images to the screen that were collected with Push2dImage.
-    virtual void  Draw2dImageList() = 0;
-
-    // Summary:
-    //  Draws a image using the current matrix.
-    virtual void DrawImage(float xpos, float ypos, float w, float h, int texture_id, float s0, float t0, float s1, float t1, float r, float g, float b, float a, bool filtered = true) = 0;
-
-    // Description:
-    //  Draws a image using the current matrix, more flexible than DrawImage
-    //  order for s and t: 0=left_top, 1=right_top, 2=right_bottom, 3=left_bottom.
-    virtual void DrawImageWithUV(float xpos, float ypos, float z, float width, float height, int texture_id, float* s, float* t, float r = 1, float g = 1, float b = 1, float a = 1, bool filtered = true) = 0;
-
-    // Summary:
-    //  Sets the polygon mode with Push, Pop restores the last used one
-    // Example:
-    //  Wireframe, solid.
-    virtual void PushWireframeMode(int mode) = 0;
-    virtual void PopWireframeMode() = 0;
-
-    // Summary:
-    //  Gets height of the main rendering resolution.
-    virtual int   GetHeight() const = 0;
-
-    // Summary:
-    //  Gets width of the main rendering resolution.
-    virtual int   GetWidth() const = 0;
-
-    // Summary:
-    //  Gets Pixel Aspect Ratio.
-    virtual float GetPixelAspectRatio() const = 0;
-
-    // Summary:
-    //  Gets the height of the overlay viewport where UI and debug output are rendered.
-    virtual int   GetOverlayHeight() const = 0;
-
-    // Summary:
-    //  Gets the width of the overlay viewport where UI and debug output are rendered.
-    virtual int   GetOverlayWidth() const = 0;
-
-    // Summary:
-    //  Gets the maximum dimension for a square custom render resolution.
-    virtual int   GetMaxSquareRasterDimension() const = 0;
-
-    // Summary:
-    //  Switches subsequent rendering from the internal backbuffer to the native resolution backbuffer if available.
-    virtual void  SwitchToNativeResolutionBackbuffer() = 0;
-
-    // Summary:
-    //  Gets memory status information
-    virtual void GetMemoryUsage(ICrySizer* Sizer) = 0;
-
-    // Summary:
-    //  Gets textures streaming bandwidth information
-    virtual void GetBandwidthStats(float* fBandwidthRequested) = 0;
-
-    // Summary:
-    //  Sets an event listener for texture streaming updates
-    virtual void SetTextureStreamListener(ITextureStreamListener* pListener) = 0;
-
-    // Summary:
-    //  Populates a CPU-side occlusion buffer with the contents from the previous frame's downsampled depth buffer.
-    //  This will be called from a job thread within the occlusion system.
-    virtual int GetOcclusionBuffer(uint16* pOutOcclBuffer, Matrix44* pmCamBuffer) = 0;
-
-    // Summary:
-    //   Gets a screenshot and save to a file
-    // Returns:
-    //   true=success
-    virtual bool ScreenShot(const char* filename = NULL, int width = 0) = 0;
-
-    // Summary:
-    //  Gets current bpp.
-    virtual int GetColorBpp() = 0;
-
-    // Summary:
-    //  Gets current z-buffer depth.
-    virtual int GetDepthBpp() = 0;
-
-    // Summary:
-    //  Gets current stencil bits.
-    virtual int GetStencilBpp() = 0;
-
-    // Summary:
-    //  Returns true if stereo rendering is enabled.
-    virtual bool IsStereoEnabled() const = 0;
-
-    // Summary:
-    //  Returns values of nearest rendering z-range max
-    virtual float GetNearestRangeMax() const = 0;
-
-    // Summary:
-    //  Returns the PerInstanceConstantBufferPool
-    virtual PerInstanceConstantBufferPool* GetPerInstanceConstantBufferPoolPointer() = 0;
-
-    // Summary:
-    //  Projects to screen.
-    //  Returns true if successful.
-    virtual bool ProjectToScreen(
-        float ptx, float pty, float ptz,
-        float* sx, float* sy, float* sz) = 0;
-
-    // Summary:
-    //  Unprojects to screen.
-    virtual int UnProject(
-        float sx, float sy, float sz,
-        float* px, float* py, float* pz,
-        const float modelMatrix[16],
-        const float projMatrix[16],
-        const int    viewport[4]) = 0;
-
-    // Summary:
-    //  Unprojects from screen.
-    virtual int UnProjectFromScreen(
-        float  sx, float  sy, float  sz,
-        float* px, float* py, float* pz) = 0;
-
-    // Remarks:
-    //  For editor.
-    virtual void  GetModelViewMatrix(float* mat) = 0;
-
-    // Remarks:
-    //  For editor.
-    virtual void  GetProjectionMatrix(float* mat) = 0;
-
-    virtual bool WriteDDS(const byte* dat, int wdt, int hgt, int Size, const char* name, ETEX_Format eF, int NumMips) = 0;
-    virtual bool WriteTGA(const byte* dat, int wdt, int hgt, const char* name, int src_bits_per_pixel, int dest_bits_per_pixel) = 0;
-    virtual bool WriteJPG(const byte* dat, int wdt, int hgt, char* name, int src_bits_per_pixel, int nQuality = 100) = 0;
-
-    /////////////////////////////////////////////////////////////////////////////////
-    //Replacement functions for Font
-
-    static const bool FontCreateTextureGenMipsDefaultValue = false;
-    virtual int  FontCreateTexture(int Width, int Height, byte* pData, ETEX_Format eTF = eTF_R8G8B8A8, bool genMips = FontCreateTextureGenMipsDefaultValue, const char* textureName = nullptr) = 0;
-    virtual bool FontUpdateTexture(int nTexId, int X, int Y, int USize, int VSize, byte* pData) = 0;
-    virtual void FontSetTexture(int nTexId, int nFilterMode) = 0;
-    virtual void FontSetRenderingState(bool overrideViewProjMatrices, TransformationMatrices& backupMatrices) = 0;
-    virtual void FontSetBlending(int src, int dst, int baseState) = 0;
-    virtual void FontRestoreRenderingState(bool overrideViewProjMatrices, const TransformationMatrices& restoringMatrices) = 0;
-
-    virtual bool FlushRTCommands(bool bWait, bool bImmediatelly, bool bForce) = 0;
-    virtual void DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, bool asciiMultiLine, const STextDrawContext& ctx) const = 0;
-
-    virtual int  RT_CurThreadList() = 0;
-
-    /////////////////////////////////////////////////////////////////////////////////
-    // External interface for shaders
-    /////////////////////////////////////////////////////////////////////////////////
-    virtual bool EF_PrecacheResource(SShaderItem* pSI, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter = 1) = 0;
-    virtual bool EF_PrecacheResource(IShader* pSH, float fMipFactor, float fTimeToReady, int Flags) = 0;
-    virtual bool EF_PrecacheResource(ITexture* pTP, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter = 1) = 0;
-    virtual bool EF_PrecacheResource(IRenderMesh* pPB, _smart_ptr<IMaterial> pMaterial, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId) = 0;
-    virtual bool EF_PrecacheResource(CDLight* pLS, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId) = 0;
-
-    virtual ITexture* EF_CreateCompositeTexture(int type, const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, ETEX_Format eTF, const STexComposition* pCompositions, size_t nCompositions, int8 nPriority = -1) = 0;
-
-    virtual void PostLevelLoading() = 0;
-    virtual void PostLevelUnload() = 0;
-
-    virtual CRenderObject* EF_AddPolygonToScene(SShaderItem& si, int numPts, const SVF_P3F_C4B_T2F* verts, const SPipTangents* tangs, CRenderObject* obj, const SRenderingPassInfo& passInfo, uint16* inds, int ninds, int nAW, const SRendItemSorter& rendItemSorter) = 0;
-    virtual CRenderObject* EF_AddPolygonToScene(SShaderItem& si, CRenderObject* obj, const SRenderingPassInfo& passInfo, int numPts, int ninds, SVF_P3F_C4B_T2F*& verts, SPipTangents*& tangs, uint16*& inds, int nAW, const SRendItemSorter& rendItemSorter) = 0;
-
-    // This is a workaround for when an editor viewport needs to do immediate rendering
-    // in the editor. Specifically, global constants are updated in a deferred fashion, so
-    // if a viewport (like the lens flare view) starts doing main-thread rendering, those
-    // parameters are not bound.
-    virtual void ForceUpdateGlobalShaderParameters() {}
-
-    /////////////////////////////////////////////////////////////////////////////////
-    // Shaders/Shaders management /////////////////////////////////////////////////////////////////////////////////
-
-    virtual const char* EF_GetShaderMissLogPath() = 0;
-
-    /////////////////////////////////////////////////////////////////////////////////
-    virtual string* EF_GetShaderNames(int& nNumShaders) = 0;
-    // Summary:
-    //  Reloads file
-    virtual bool          EF_ReloadFile (const char* szFileName) = 0;
-    // Summary:
-    //  Reloads file at any time the renderer feels to do so (no guarantees, but likely on next frame update)
-    //  Is threadsafe
-    virtual bool          EF_ReloadFile_Request (const char* szFileName) = 0;
-
-    // Summary:
-    //      Remaps shader gen mask to common global mask.
-    virtual uint64      EF_GetRemapedShaderMaskGen(const char* name, uint64 nMaskGen = 0, bool bFixup = 0) = 0;
-
-    virtual uint64      EF_GetShaderGlobalMaskGenFromString(const char* szShaderName, const char* szShaderGen, uint64 nMaskGen = 0) = 0;
-    virtual AZStd::string EF_GetStringFromShaderGlobalMaskGen(const char* szShaderName, uint64 nMaskGen = 0) = 0;
-
-    virtual const SShaderProfile& GetShaderProfile(EShaderType eST) const = 0;
-    virtual void          EF_SetShaderQuality(EShaderType eST, EShaderQuality eSQ) = 0;
-
-    // Summary:
-    //  Gets renderer quality.
-    virtual ERenderQuality EF_GetRenderQuality() const = 0;
-    // Summary:
-    //  Gets shader type quality.
-    virtual EShaderQuality EF_GetShaderQuality(EShaderType eST) = 0;
-    // Summary:
-    //  Loads shader item for name (name).
-    virtual SShaderItem   EF_LoadShaderItem (const char* szName, bool bShare, int flags = 0, SInputShaderResources* Res = NULL, uint64 nMaskGen = 0) = 0;
-    // Summary:
-    //  Loads shader for name (name).
-    virtual IShader* EF_LoadShader (const char* name, int flags = 0, uint64 nMaskGen = 0) = 0;
-    // Summary:
-    //  Reinitializes all shader files (build hash tables).
-    virtual void          EF_ReloadShaderFiles (int nCategory) = 0;
-    // Summary:
-    //  Reloads all texture files.
-    virtual void          EF_ReloadTextures () = 0;
-    // Summary:
-    //  Gets texture object by ID.
-    virtual ITexture* EF_GetTextureByID(int Id) = 0;
-    // Summary:
-    //  Gets texture object by Name.
-    virtual ITexture* EF_GetTextureByName(const char* name, uint32 flags = 0) = 0;
-    // Summary:
-    //  Loads the texture for name(nameTex).
-    virtual ITexture* EF_LoadTexture(const char* nameTex, uint32 flags = 0) = 0;
-    virtual ITexture* EF_LoadCubemapTexture(const char* nameTex, uint32 flags = 0) = 0;
-    // Summary:
-    //  Loads default texture whose life cycle is managed by Texture Manager, do not try to release them by yourself!
-    virtual ITexture* EF_LoadDefaultTexture(const char* nameTex) = 0;
-
-    // Summary:
-    //  Loads lightmap for name.
-    virtual int           EF_LoadLightmap (const char* name) = 0;
-
-    // Summary:
-    //  Starts using of the shaders (return first index for allow recursions).
-    virtual void EF_StartEf (const SRenderingPassInfo& passInfo) = 0;
-
-    virtual SRenderObjData* EF_GetObjData(CRenderObject* pObj, bool bCreate, int nThreadID) = 0;
-
-    // Summary:
-    //  Gets CRenderObject for RE transformation.
-    //Get temporary RenderObject
-    virtual CRenderObject* EF_GetObject_Temp (int nThreadID) = 0;
-
-    //Get permanent RenderObject
-    virtual CRenderObject* EF_DuplicateRO(CRenderObject* pObj, const SRenderingPassInfo& passInfo) = 0;
-
-    // Summary:
-    //  Adds shader to the list.
-    virtual void EF_AddEf (IRenderElement* pRE, SShaderItem& pSH, CRenderObject* pObj, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter) = 0;
-
-    //! Draw all shaded REs in the list
-    virtual void EF_EndEf3D (int nFlags, int nPrecacheUpdateId, int nNearPrecacheUpdateId, const SRenderingPassInfo& passInfo) = 0;
-
-    virtual void EF_InvokeShadowMapRenderJobs(int nFlags) = 0;
-
-    // Dynamic lights
-    void EF_ClearLightsList() {}; // For FC Compatibility.
-    virtual bool EF_IsFakeDLight (const CDLight* Source) = 0;
-    virtual void EF_ADDDlight(CDLight* Source, const SRenderingPassInfo& passInfo) = 0;
-    virtual bool EF_UpdateDLight(SRenderLight* pDL) = 0;
-    virtual bool EF_AddDeferredDecal([[maybe_unused]] const SDeferredDecal& rDecal){return true; }
-
-    // Deferred lights/vis areas
-
-    virtual int EF_AddDeferredLight(const CDLight& pLight, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter) = 0;
-    virtual uint32 EF_GetDeferredLightsNum(eDeferredLightType eLightType = eDLT_DeferredLight) = 0;
-    virtual void EF_ClearDeferredLightsList() = 0;
-
-    virtual uint8 EF_AddDeferredClipVolume(const IClipVolume* pClipVolume) = 0;
-    virtual bool EF_SetDeferredClipVolumeBlendData(const IClipVolume* pClipVolume, const SClipVolumeBlendInfo& blendInfo) = 0;
-    virtual void EF_ClearDeferredClipVolumesList() = 0;
-
-    // called in between levels to free up memory
-    virtual void EF_ReleaseDeferredData() = 0;
-
-    // called in between levels to free up memory
-    virtual void EF_ReleaseInputShaderResource(SInputShaderResources* pRes) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Post processing effects interfaces
-
-    virtual void EF_SetPostEffectParam(const char* pParam, float fValue, bool bForceValue = false) = 0;
-    virtual void EF_SetPostEffectParamVec4(const char* pParam, const Vec4& pValue, bool bForceValue = false) = 0;
-    virtual void EF_SetPostEffectParamString(const char* pParam, const char* pszArg) = 0;
-
-    virtual void EF_GetPostEffectParam(const char* pParam, float& fValue) = 0;
-    virtual void EF_GetPostEffectParamVec4(const char* pParam, Vec4& pValue) = 0;
-    virtual void EF_GetPostEffectParamString(const char* pParam, const char*& pszArg) = 0;
-
-    virtual int32 EF_GetPostEffectID(const char* pPostEffectName) = 0;
-
-    virtual void EF_ResetPostEffects(bool bOnSpecChange = false) = 0;
-
-    virtual void SyncPostEffects() = 0;
-
-    virtual void EF_DisableTemporalEffects() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void EF_AddWaterSimHit(const Vec3& vPos, float scale, float strength) = 0;
-    virtual void EF_DrawWaterSimHits() = 0;
-
-    /////////////////////////////////////////////////////////////////////////////////
-    // 2d interface for the shaders
-    /////////////////////////////////////////////////////////////////////////////////
-    virtual void EF_EndEf2D(bool bSort) = 0;
-
-    // Summary:
-    //   Returns various Renderer Settings, see ERenderQueryTypes.
-    // Arguments:
-    //   Query - e.g. EFQ_GetShaderCombinations.
-    //   rInOut - Input/Output Parameter, depends on the query if written to/read from, or both
-    void EF_Query(ERenderQueryTypes eQuery)
-    {
-        EF_QueryImpl(eQuery, NULL, 0, NULL, 0);
-    }
-    template<typename T>
-    void EF_Query(ERenderQueryTypes eQuery, T& rInOut)
-    {
-        EF_QueryImpl(eQuery, static_cast<void*>(&rInOut), sizeof(T), NULL, 0);
-    }
-    template<typename T0, typename T1>
-    void EF_Query(ERenderQueryTypes eQuery, T0& rInOut0, T1& rInOut1)
-    {
-        EF_QueryImpl(eQuery, static_cast<void*>(&rInOut0), sizeof(T0), static_cast<void*>(&rInOut1), sizeof(T1));
-    }
-
-    // Summary:
-    //   Toggles render mesh garbage collection
-    // Arguments:
-    //   Param -
-    virtual void ForceGC() = 0;
-
-    // Remarks:
-    //  For stats.
-    virtual int  GetPolyCount() const = 0;
-    virtual void GetPolyCount(int& nPolygons, int& nShadowVolPolys) const = 0;
-
-    // Note:
-    //  3d engine set this color to fog color.
-    virtual void SetClearColor(const Vec3& vColor) = 0;
-  
-    virtual void SetClearBackground(bool bClearBackground) = 0;
-
-    // Summary:
-    //  Creates/deletes RenderMesh object.
-    virtual _smart_ptr<IRenderMesh> CreateRenderMesh(
-        const char* szType
-        , const char* szSourceName
-        , IRenderMesh::SInitParamerers* pInitParams = NULL
-        , ERenderMeshType eBufType = eRMT_Static
-        ) = 0;
-
-    virtual _smart_ptr<IRenderMesh> CreateRenderMeshInitialized(
-        const void* pVertBuffer, int nVertCount, const AZ::Vertex::Format& vertexFormat,
-        const vtx_idx* pIndices, int nIndices,
-        const PublicRenderPrimitiveType nPrimetiveType, const char* szType, const char* szSourceName, ERenderMeshType eBufType = eRMT_Static,
-        int nMatInfoCount = 1, int nClientTextureBindID = 0,
-        bool (* PrepareBufferCallback)(IRenderMesh*, bool) = NULL,
-        void* CustomData = NULL,
-        bool bOnlyVideoBuffer = false,
-        bool bPrecache = true,
-        const SPipTangents* pTangents = NULL, bool bLockForThreadAcc = false, Vec3* pNormals = NULL) = 0;
-
-    //Pass false to get a frameID that increments by one each frame. For this case the increment happens in the game thread at the beginning of the frame.
-    virtual int GetFrameID(bool bIncludeRecursiveCalls = true) = 0;
-
-    virtual void MakeMatrix(const Vec3& pos, const Vec3& angles, const Vec3& scale, Matrix34* mat) = 0;
-
-    // Description:
-    //   Draws text queued.
-    // Note:
-    //   Position can be in 3d or in 2d depending on the flags.
-    virtual void DrawTextQueued(Vec3 pos, SDrawTextInfo& ti, const char* format, va_list args) = 0;
-
-    // Description:
-    //   Draws text queued.
-    // Note:
-    //   Position can be in 3d or in 2d depending on the flags.
-    virtual void DrawTextQueued(Vec3 pos, SDrawTextInfo& ti, const char* text) = 0;
-
-    //////////////////////////////////////////////////////////////////////
-
-    virtual float ScaleCoordX(float value) const = 0;
-    virtual float ScaleCoordY(float value) const = 0;
-    virtual void ScaleCoord(float& x, float& y) const = 0;
-
-    virtual void SetState(int State, int AlphaRef = -1) = 0;
-    virtual void SetCullMode  (int mode = R_CULL_BACK) = 0;
-    virtual void SetStencilState(int st, uint32 nStencRef, uint32 nStencMask, uint32 nStencWriteMask, bool bForceFullReadMask = false) = 0;
-
-    virtual void PushProfileMarker(const char* label) = 0;
-    virtual void PopProfileMarker(const char* label) = 0;
-
-    virtual bool EnableFog(bool enable) = 0;
-    virtual void SetFogColor(const ColorF& color) = 0;
-
-    virtual void SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa) = 0;
-    virtual void SetSrgbWrite(bool srgbWrite) = 0;
-
-    // for one frame allows to disable limit of texture streaming requests
-    virtual void RequestFlushAllPendingTextureStreamingJobs([[maybe_unused]] int nFrames) { }
-
-    // allows to dynamically adjust texture streaming load depending on game conditions
-    virtual void SetTexturesStreamingGlobalMipFactor([[maybe_unused]] float fFactor) { }
-
-    //////////////////////////////////////////////////////////////////////
-    // Summary:
-    //  Interface for auxiliary geometry (for debugging, editor purposes, etc.)
-    virtual IRenderAuxGeom* GetIRenderAuxGeom(void* jobID = 0) = 0;
-    //////////////////////////////////////////////////////////////////////
-
-    //  Interface for renderer side SVO
-    virtual ISvoRenderer* GetISvoRenderer() { return 0; }
-
-    virtual IColorGradingController* GetIColorGradingController() = 0;
-    virtual IStereoRenderer* GetIStereoRenderer() = 0;
-
-    virtual ITexture* Create2DTexture(const char* name, int width, int height, int numMips, int flags, unsigned char* data, ETEX_Format format) = 0;
-    virtual void TextToScreen(float x, float y, const char* format, ...) PRINTF_PARAMS(4, 5) = 0;
-    virtual void TextToScreenColor(int x, int y, float r, float g, float b, float a, const char* format, ...) PRINTF_PARAMS(8, 9) = 0;
-    virtual void ResetToDefault() = 0;
-    virtual void SetMaterialColor(float r, float g, float b, float a) = 0;
-
-    // Sets default Blend, DepthStencil and Raster states.
-    virtual void SetDefaultRenderStates() = 0;
-
-    virtual void Graph(byte* g, int x, int y, int wdt, int hgt, int nC, int type, const char* text, ColorF& color, float fScale) = 0;
-    virtual void EF_RenderTextMessages() = 0;
-
-    virtual void ClearTargetsImmediately(uint32 nFlags) = 0;
-    virtual void ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors, float fDepth) = 0;
-    virtual void ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors) = 0;
-    virtual void ClearTargetsImmediately(uint32 nFlags, float fDepth) = 0;
-
-    virtual void ClearTargetsLater(uint32 nFlags) = 0;
-    virtual void ClearTargetsLater(uint32 nFlags, const ColorF& Colors, float fDepth) = 0;
-    virtual void ClearTargetsLater(uint32 nFlags, const ColorF& Colors) = 0;
-    virtual void ClearTargetsLater(uint32 nFlags, float fDepth) = 0;
-
-    virtual void ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX = -1, int nScaledY = -1) = 0;
-    virtual void ReadFrameBufferFast(uint32* pDstARGBA8, int dstWidth, int dstHeight, bool BGRA = true) = 0;
-
-    // Note:
-    //  The following functions will be removed.
-    virtual void EnableVSync(bool enable) = 0;
-
-    virtual void CreateResourceAsync(SResourceAsync* Resource) = 0;
-    virtual void ReleaseResourceAsync(SResourceAsync* Resource) = 0;
-    virtual void ReleaseResourceAsync(AZStd::unique_ptr<SResourceAsync> pResource) = 0;
-    virtual unsigned int DownLoadToVideoMemory(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
-    virtual unsigned int DownLoadToVideoMemory3D(const byte* data, int w, int h, int d, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
-    virtual unsigned int DownLoadToVideoMemoryCube(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
-    virtual void UpdateTextureInVideoMemory(uint32 tnum, const byte* newdata, int posx, int posy, int w, int h, ETEX_Format eTFSrc = eTF_B8G8R8, int posz = 0, int sizez = 1) = 0;
-
-    virtual bool DXTCompress(const byte* raw_data, int nWidth, int nHeight, ETEX_Format eTF, bool bUseHW, bool bGenMips, int nSrcBytesPerPix, MIPDXTcallback callback) = 0;
-    virtual bool DXTDecompress(const byte* srcData, size_t srcFileSize, byte* dstData, int nWidth, int nHeight, int nMips, ETEX_Format eSrcTF, bool bUseHW, int nDstBytesPerPix) = 0;
-    virtual void RemoveTexture(unsigned int TextureId) = 0;
-    virtual void DeleteFont(IFFont* font) = 0;
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routines uses 2 destination surfaces.  It triggers a backbuffer copy to one of its surfaces,
-    // and then copies the other surface to system memory.  This hopefully will remove any
-    // CPU stalls due to the rect lock call since the buffer will already be in system
-    // memory when it is called
-    // Inputs :
-    //          pDstARGBA8          :   Pointer to a buffer that will hold the captured frame (should be at least 4*dstWidth*dstHieght for RGBA surface)
-    //          destinationWidth    :   Width of the frame to copy
-    //          destinationHeight   :   Height of the frame to copy
-    //
-    //          Note :  If dstWidth or dstHeight is larger than the current surface dimensions, the dimensions
-    //                  of the surface are used for the copy
-    //
-    virtual bool CaptureFrameBufferFast(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight) = 0;
-
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Copy a captured surface to a buffer
-    //
-    // Inputs :
-    //          pDstARGBA8          :   Pointer to a buffer that will hold the captured frame (should be at least 4*dstWidth*dstHieght for RGBA surface)
-    //          destinationWidth    :   Width of the frame to copy
-    //          destinationHeight   :   Height of the frame to copy
-    //
-    //          Note :  If dstWidth or dstHeight is larger than the current surface dimensions, the dimensions
-    //                  of the surface are used for the copy
-    //
-    virtual bool CopyFrameBufferFast(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight) = 0;
-
-
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine registers a callback address that is called when a new frame is available
-    // Inputs :
-    //          pCapture            :   Address of the ICaptureFrameListener object
-    //
-    // Outputs : returns true if successful, otherwise false
-    //
-    virtual bool RegisterCaptureFrame(ICaptureFrameListener* pCapture) = 0;
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine unregisters a callback address that was previously registered
-    // Inputs :
-    //          pCapture            :   Address of the ICaptureFrameListener object to unregister
-    //
-    // Outputs : returns true if successful, otherwise false
-    //
-    virtual bool UnRegisterCaptureFrame(ICaptureFrameListener* pCapture) = 0;
-
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine initializes 2 destination surfaces for use by the CaptureFrameBufferFast routine
-    // It also, captures the current backbuffer into one of the created surfaces
-    //
-    // Inputs :
-    //          bufferWidth : Width of capture buffer, on consoles the scaling is done on the GPU. Pass in 0 (the default) to use backbuffer dimensions
-    //          bufferHeight    : Height of capture buffer.
-    //
-    // Outputs : returns true if surfaces were created otherwise returns false
-    //
-    virtual bool InitCaptureFrameBufferFast(uint32 bufferWidth = 0, uint32 bufferHeight = 0) = 0;
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine releases the 2 surfaces used for frame capture by the CaptureFrameBufferFast routine
-    //
-    // Inputs : None
-    //
-    // Returns : None
-    //
-    virtual void CloseCaptureFrameBufferFast(void) = 0;
-
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // This routine checks for any frame buffer callbacks that are needed and calls them
-    //
-    // Inputs : None
-    //
-    //  Outputs : None
-    //
-    virtual void CaptureFrameBufferCallBack(void) = 0;
-
-    virtual void RegisterSyncWithMainListener(ISyncMainWithRenderListener* pListener) = 0;
-    virtual void RemoveSyncWithMainListener(const ISyncMainWithRenderListener* pListener) = 0;
-
-    virtual void Set2DMode(uint32 orthoX, uint32 orthoY, TransformationMatrices& backupMatrices, float znear = -1e10f, float zfar = 1e10f) = 0;
-    virtual void Unset2DMode(const TransformationMatrices& restoringMatrices) = 0;
-    virtual void Set2DModeNonZeroTopLeft(float orthoLeft, float orthoTop, float orthoWidth, float orthoHeight, TransformationMatrices& backupMatrices, float znear = -1e10f, float zfar = 1e10f) = 0;
-
-    virtual int ScreenToTexture(int nTexID) = 0;
-    virtual void EnableSwapBuffers(bool bEnable) = 0;
-    virtual WIN_HWND GetHWND() = 0;
-
-    // Set the window icon to be displayed on the output window.
-    // The parameter is the path to a DDS texture file to be used as the icon.
-    // For best results, pass a square power-of-two sized texture, with a mip-chain.
-    virtual bool SetWindowIcon(const char* path) = 0;
-
-    virtual void OnEntityDeleted(struct IRenderNode* pRenderNode) = 0;
-
-    virtual int CreateRenderTarget(const char* name, int nWidth, int nHeight, const ColorF& clearColor, ETEX_Format eTF) = 0;
-    virtual bool DestroyRenderTarget (int nHandle) = 0;
-    virtual bool ResizeRenderTarget(int nHandle, int nWidth, int nHeight) = 0;
-    virtual bool SetRenderTarget(int nHandle, SDepthTexture* pDepthSurf = nullptr) = 0;
-    virtual SDepthTexture* CreateDepthSurface(int nWidth, int nHeight, bool shaderResourceView = false) = 0;
-    virtual void DestroyDepthSurface(SDepthTexture* pDepthSurf) = 0;
-
-    // Note:
-    //  Used for pausing timer related stuff.
-    // Example:
-    //  For texture animations, and shader 'time' parameter.
-    virtual void PauseTimer(bool bPause) = 0;
-
-    // Description:
-    //    Creates an Interface to the public params container.
-    // Return:
-    //    Created IShaderPublicParams interface.
-    virtual IShaderPublicParams* CreateShaderPublicParams() = 0;
-
-    virtual void GetThreadIDs(threadID& mainThreadID, threadID& renderThreadID) const = 0;
-
-    struct SArtProfileData
-    {
-        enum EArtProfileUnit
-        {
-            eArtProfileUnit_GPU = 0,
-            eArtProfileUnit_CPU,
-            eArtProfile_NumUnits
-        };
-
-        enum EArtProfileSections
-        {
-            eArtProfile_Shadows = 0,
-            eArtProfile_ZPass,
-            eArtProfile_Decals,
-            eArtProfile_Lighting,
-            eArtProfile_Opaque,
-            eArtProfile_Transparent,
-            eArtProfile_Max,
-        };
-
-        float times[eArtProfile_Max];
-        float budgets[eArtProfile_Max];
-        float total, budgetTotal;
-
-        // detailed values for anything that is grouped together and can be timed
-        enum EBreakdownDetailValues
-        {
-            // Lighting
-            eArtProfileDetail_LightsAmbient,
-            eArtProfileDetail_LightsCubemaps,
-            eArtProfileDetail_LightsDeferred,
-            eArtProfileDetail_LightsShadowMaps, // just the cost of the shadow maps
-
-            // Transparent
-            eArtProfileDetail_Reflections,
-            eArtProfileDetail_Caustics,
-            eArtProfileDetail_RefractionOverhead, // partial resolves
-            eArtProfileDetail_Rain,
-            eArtProfileDetail_LensOptics,
-
-            eArtProfileDetail_Max,
-        };
-
-        float breakdowns[eArtProfileDetail_Max];
-
-        int batches, drawcalls, processedLights;
-
-#if defined(ENABLE_ART_RT_TIME_ESTIMATE)
-        int numStandardBatches;
-        int numStandardDrawCalls;
-        int numLightDrawCalls;
-        float actualRenderTimeMinusPost;
-        float actualRenderTimePost;
-        float actualMiscRTTime;
-        float actualTotalRTTime;
-#endif
-    };
-
-    virtual void EnableGPUTimers2(bool bEnabled) = 0;
-    virtual void AllowGPUTimers2(bool bAllow) = 0;
-    virtual const RPProfilerStats* GetRPPStats(ERenderPipelineProfilerStats eStat, bool bCalledFromMainThread = true) const = 0;
-    virtual const RPProfilerStats* GetRPPStatsArray(bool bCalledFromMainThread = true) const = 0;
-
-    virtual int GetPolygonCountByType(uint32 EFSList, EVertexCostTypes vct, uint32 z, bool bCalledFromMainThread = true) = 0;
-
-    virtual void SetCloudShadowsParams(int nTexID, const Vec3& speed, float tiling, bool invert, float brightness) = 0;
-    virtual uint16 PushFogVolumeContribution(const SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo) = 0;
-    virtual void PushFogVolume(class CREFogVolume* pFogVolume, const SRenderingPassInfo& passInfo) = 0;
-
-    virtual int GetMaxTextureSize() = 0;
-
-    virtual const char* GetTextureFormatName(ETEX_Format eTF) = 0;
-    virtual int GetTextureFormatDataSize(int nWidth, int nHeight, int nDepth, int nMips, ETEX_Format eTF) = 0;
-
-    virtual void SetDefaultMaterials(_smart_ptr<IMaterial> pDefMat, _smart_ptr<IMaterial> pTerrainDefMat) = 0;
-
-    virtual IGPUParticleEngine* GetGPUParticleEngine() const { return 0; }
-
-    virtual uint32 GetActiveGPUCount() const = 0;
-    virtual ShadowFrustumMGPUCache* GetShadowFrustumMGPUCache() = 0;
-    virtual const StaticArray<int, MAX_GSM_LODS_NUM>& GetCachedShadowsResolution() const = 0;
-    virtual void SetCachedShadowsResolution(const StaticArray<int, MAX_GSM_LODS_NUM>& arrResolutions) = 0;
-    virtual void UpdateCachedShadowsLodCount(int nGsmLods) const = 0;
-
-    virtual void SetTexturePrecaching(bool stat) = 0;
-
-    //platform specific
-    virtual void    RT_InsertGpuCallback(uint32 context, GpuCallbackFunc callback) = 0;
-    virtual void EnablePipelineProfiler(bool bEnable) = 0;
-
-    struct SRenderTimes
-    {
-        float fWaitForMain;
-        float fWaitForRender;
-        float fWaitForGPU;
-        float fTimeProcessedRT;
-        float fTimeProcessedRTScene;    //The part of the render thread between the "SCENE" profiler labels
-        float fTimeProcessedGPU;
-        float fTimeGPUIdlePercent;
-    };
-    virtual void GetRenderTimes(SRenderTimes& outTimes) = 0;
-    virtual float GetGPUFrameTime() = 0;
-
-    // Enable the batch mode if the meshpools are used to enable quick and dirty flushes.
-    virtual void EnableBatchMode(bool enable) = 0;
-    // Flag level unloading in progress to disable f.i. rendermesh creation requests
-    virtual void EnableLevelUnloading(bool enable) = 0;
-    // Function to handle cleanup required if a level load fails
-    virtual void OnLevelLoadFailed() = 0;
-
-    struct SDrawCallCountInfo
-    {
-        static const uint32 MESH_NAME_LENGTH = 32;
-        static const uint32 TYPE_NAME_LENGTH = 16;
-
-        SDrawCallCountInfo()
-            : pPos(0, 0, 0)
-            , nZpass(0)
-            , nShadows(0)
-            , nGeneral(0)
-            , nTransparent(0)
-            , nMisc(0)
-        {
-            meshName[0] = '\0';
-            typeName[0] = '\0';
-        }
-
-        void Update(CRenderObject* pObj, IRenderMesh* pRM);
-
-        Vec3 pPos;
-        uint8 nZpass, nShadows, nGeneral, nTransparent, nMisc;
-        char meshName[MESH_NAME_LENGTH];
-        char typeName[TYPE_NAME_LENGTH];
-    };
-
-    //Debug draw call info (per node)
-    typedef AZStd::unordered_map< IRenderNode*, IRenderer::SDrawCallCountInfo, AZStd::hash<IRenderNode*>, AZStd::equal_to<IRenderNode*>, AZ::StdLegacyAllocator > RNDrawcallsMapNode;
-    typedef RNDrawcallsMapNode::iterator RNDrawcallsMapNodeItor;
-
-    //Debug draw call info (per mesh)
-    typedef AZStd::unordered_map< IRenderMesh*, IRenderer::SDrawCallCountInfo, AZStd::hash<IRenderMesh*>, AZStd::equal_to<IRenderMesh*>, AZ::StdLegacyAllocator > RNDrawcallsMapMesh;
-    typedef RNDrawcallsMapMesh::iterator RNDrawcallsMapMeshItor;
-
-#if !defined(_RELEASE)
-    //Get draw call info for frame
-    virtual RNDrawcallsMapMesh& GetDrawCallsInfoPerMesh(bool mainThread = true) = 0;
-    virtual RNDrawcallsMapMesh& GetDrawCallsInfoPerMeshPreviousFrame(bool mainThread = true) = 0;
-    virtual RNDrawcallsMapNode& GetDrawCallsInfoPerNodePreviousFrame(bool mainThread = true) = 0;
-    virtual int GetDrawCallsPerNode(IRenderNode* pRenderNode) = 0;
-    virtual void ForceRemoveNodeFromDrawCallsMap(IRenderNode* pNode) = 0;
-#endif
-
-    virtual void CollectDrawCallsInfo(bool status) = 0;
-    virtual void CollectDrawCallsInfoPerNode(bool status) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Summary:
-    //   Helper functions to draw text.
-    //////////////////////////////////////////////////////////////////////////
-    void DrawLabel(Vec3 pos, float font_size, const char* label_text, ...) PRINTF_PARAMS(4, 5)
-    {
-        va_list args;
-        va_start(args, label_text);
-        SDrawTextInfo ti;
-        ti.xscale = ti.yscale = font_size;
-        ti.flags = eDrawText_FixedSize | eDrawText_800x600;
-        DrawTextQueued(pos, ti, label_text, args);
-        va_end(args);
-    }
-
-    void DrawLabelEx(Vec3 pos, float font_size, const float* pfColor, bool bFixedSize, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        va_list args;
-        va_start(args, label_text);
-        SDrawTextInfo ti;
-        ti.xscale = ti.yscale = font_size;
-        ti.flags = ((bFixedSize) ? eDrawText_FixedSize : 0) | ((bCenter) ? eDrawText_Center : 0) | eDrawText_800x600;
-        if (pfColor)
-        {
-            ti.color[0] = pfColor[0];
-            ti.color[1] = pfColor[1];
-            ti.color[2] = pfColor[2];
-            ti.color[3] = pfColor[3];
-        }
-        DrawTextQueued(pos, ti, label_text, args);
-        va_end(args);
-    }
-
-    void Draw2dLabelEx(float x, float y, float font_size, const ColorF& fColor, EDrawTextFlags flags, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        va_list args;
-        va_start(args, label_text);
-        SDrawTextInfo ti;
-        ti.xscale = ti.yscale = font_size;
-        ti.flags = flags;
-        {
-            ti.color[0] = fColor[0];
-            ti.color[1] = fColor[1];
-            ti.color[2] = fColor[2];
-            ti.color[3] = fColor[3];
-        }
-        DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
-        va_end(args);
-    }
-
-    void Draw2dLabel(float x, float y, float font_size, const float* pfColor, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        va_list args;
-        va_start(args, label_text);
-        SDrawTextInfo ti;
-        ti.xscale = ti.yscale = font_size;
-        ti.flags = eDrawText_2D | eDrawText_800x600 | eDrawText_FixedSize | ((bCenter) ? eDrawText_Center : 0);
-        if (pfColor)
-        {
-            ti.color[0] = pfColor[0];
-            ti.color[1] = pfColor[1];
-            ti.color[2] = pfColor[2];
-            ti.color[3] = pfColor[3];
-        }
-        DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
-        va_end(args);
-    }
-
-    void Draw2dLabel(float x, float y, float font_size, const ColorF& fColor, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        va_list args;
-        va_start(args, label_text);
-        SDrawTextInfo ti;
-        ti.xscale = ti.yscale = font_size;
-        ti.flags = eDrawText_2D | eDrawText_800x600 | eDrawText_FixedSize | ((bCenter) ? eDrawText_Center : 0);
-        {
-            ti.color[0] = fColor[0];
-            ti.color[1] = fColor[1];
-            ti.color[2] = fColor[2];
-            ti.color[3] = fColor[3];
-        }
-        DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
-        va_end(args);
-    }
-
-    // BLM - Added override that takes flags manually, so we can draw monospaced, etc.
-    void Draw2dLabelWithFlags(float x, float y, float font_size, const ColorF& fColor, uint32 flags, const char* label_text, ...) PRINTF_PARAMS(7, 8)
-    {
-        va_list args;
-        va_start(args, label_text);
-        SDrawTextInfo ti;
-        ti.xscale = ti.yscale = font_size;
-        ti.flags = flags;
-        {
-            ti.color[0] = fColor[0];
-            ti.color[1] = fColor[1];
-            ti.color[2] = fColor[2];
-            ti.color[3] = fColor[3];
-        }
-        DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
-        va_end(args);
-    }
-
-    /**
-    * Used to determine if the renderer has loaded default system
-    * textures yet.
-    *
-    * Some textures like s_ptexWhite aren't available until this is true.
-    *
-    * @return True if the renderer has loaded default resources
-    */
-    virtual bool HasLoadedDefaultResources() { return false; }
-
-    // Summary:
-    virtual SSkinningData* EF_CreateSkinningData(uint32 nNumBones, bool bNeedJobSyncVar, bool bUseMatrixSkinning = false) = 0;
-    virtual SSkinningData* EF_CreateRemappedSkinningData(uint32 nNumBones, SSkinningData* pSourceSkinningData, uint32 nCustomDataSize, uint32 pairGuid) = 0;
-    virtual void EF_ClearSkinningDataPool() = 0;
-    virtual int EF_GetSkinningPoolID() = 0;
-
-    virtual void ClearShaderItem(SShaderItem* pShaderItem) = 0;
-    virtual void UpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial) = 0;
-    virtual void ForceUpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial) = 0;
-    virtual void RefreshShaderResourceConstants(SShaderItem* pShaderItem, IMaterial* pMaterial) = 0;
-
-    // Summary:
-    //  Determine if a switch to stereo mode will occur at the start of the next frame
-    virtual bool IsStereoModeChangePending() = 0;
-
-    // Summary:
-    // Lock/Unlock the video memory buffer used by particles when using the jobsystem
-    virtual void LockParticleVideoMemory(uint32 nId) = 0;
-    virtual void UnLockParticleVideoMemory(uint32 nId) = 0;
-
-    // Summary:
-    // tell the renderer that we will begin/stop spawning jobs which generate SRendItems
-    virtual void BeginSpawningGeneratingRendItemJobs(int nThreadID) = 0;
-    virtual void BeginSpawningShadowGeneratingRendItemJobs(int nThreadID) = 0;
-    virtual void EndSpawningGeneratingRendItemJobs() = 0;
-
-    virtual void StartLoadtimePlayback(ILoadtimeCallback* pCallback) = 0;
-    virtual void StopLoadtimePlayback() = 0;
-
-    // Summary:
-    // get the shared job state for SRendItem Generating jobs
-    virtual AZ::LegacyJobExecutor* GetGenerateRendItemJobExecutor() = 0;
-    virtual AZ::LegacyJobExecutor* GetGenerateShadowRendItemJobExecutor() = 0;
-    virtual AZ::LegacyJobExecutor* GetGenerateRendItemJobExecutorPreProcess() = 0;
-    virtual AZ::LegacyJobExecutor* GetFinalizeRendItemJobExecutor(int nThreadID) = 0;
-    virtual AZ::LegacyJobExecutor* GetFinalizeShadowRendItemJobExecutor(int nThreadID) = 0;
-
-    virtual void FlushPendingTextureTasks() = 0;
-
-    virtual void SetShadowJittering(float fShadowJittering) = 0;
-    virtual float GetShadowJittering() const = 0;
-
-    virtual bool LoadShaderStartupCache() = 0;
-    virtual void UnloadShaderStartupCache() = 0;
-
-    virtual bool LoadShaderLevelCache() = 0;
-    virtual void UnloadShaderLevelCache() = 0;
-
-    virtual void StartScreenShot([[maybe_unused]] int e_ScreenShot) {};
-    virtual void EndScreenShot([[maybe_unused]] int e_ScreenShot) {};
-
-    // Sets a renderer tracked cvar
-    virtual void SetRendererCVar(ICVar* pCVar, const char* pArgText, bool bSilentMode = false) = 0;
-
-    // Get the render piepline
-    virtual SRenderPipeline* GetRenderPipeline() = 0;
-
-    // Get the sahder manager
-    virtual CShaderMan* GetShaderManager() = 0;
-
-    // Get render thread
-    virtual SRenderThread* GetRenderThread() = 0;
-
-    // Get premade white texture
-    virtual ITexture* GetWhiteTexture() = 0;
-
-    // Get the texture for the name and format given
-    virtual ITexture* GetTextureForName(const char* name, uint32 nFlags, ETEX_Format eFormat) = 0;
-
-    // Get the camera view parameters
-    virtual const CameraViewParameters& GetViewParameters() = 0;
-
-    // Get frame reset number
-    virtual uint32 GetFrameReset() = 0;
-
-    // Get original depth buffer
-    virtual SDepthTexture* GetDepthBufferOrig() = 0;
-
-    // Get width of backbuffer
-    virtual uint32 GetBackBufferWidth() = 0;
-
-    // Get height of backbuffer
-    virtual uint32 GetBackBufferHeight() = 0;
-
-    // Get the device buffer manager
-    virtual CDeviceBufferManager* GetDeviceBufferManager() = 0;
-
-    // Get render tile info
-    virtual const SRenderTileInfo* GetRenderTileInfo() const = 0;
-
-    // Returns precomputed identity matrix
-    virtual Matrix44A GetIdentityMatrix() = 0;
-
-    // Get current GPU group Id. Used for tracking which GPU is being used
-    virtual int32 RT_GetCurrGpuID() const = 0;
-
-    // Generate the next texture id
-    virtual int GenerateTextureId() = 0;
-
-    // Set culling mode
-    virtual void SetCull(ECull eCull, bool bSkipMirrorCull = false) = 0;
-
-    // Draw a 2D quad
-    virtual void DrawQuad(float x0, float y0, float x1, float y1, const ColorF& color, float z = 1.0f, float s0 = 0.0f, float t0 = 0.0f, float s1 = 1.0f, float t1 = 1.0f) = 0;
-
-    // Draw a quad
-    virtual void DrawQuad3D(const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, const ColorF& color, float ftx0, float fty0, float ftx1, float fty1) = 0;
-
-    // Resets render pipeline state
-    virtual void FX_ResetPipe() = 0;
-
-    // Gets an (existing) depth surface of the dimensions given
-    virtual SDepthTexture* FX_GetDepthSurface(int nWidth, int nHeight, bool bAA, bool shaderResourceView = false) = 0;
-
-    // Check to see if buffers are full and if so flush
-    virtual void FX_CheckOverflow(int nVerts, int nInds, IRenderElement* re, int* nNewVerts = nullptr, int* nNewInds = nullptr) = 0;
-
-    // Perform pre render work
-    virtual void FX_PreRender(int Stage) = 0;
-
-    // Perform post render work
-    virtual void FX_PostRender() = 0;
-
-    // Set render states
-    virtual void FX_SetState(int st, int AlphaRef = -1, int RestoreState = 0) = 0;
-
-    // Commit render states
-    virtual void FX_CommitStates(const SShaderTechnique* pTech, const SShaderPass* pPass, bool bUseMaterialState) = 0;
-
-    // Commit changes made thus dar
-    virtual void FX_Commit(bool bAllowDIP = false) = 0;
-
-    // Sets vertex declaration
-    virtual long FX_SetVertexDeclaration(int StreamMask, const AZ::Vertex::Format& vertexFormat) = 0;
-
-    // Draw indexed prim
-    virtual void FX_DrawIndexedPrimitive(eRenderPrimitiveType eType, int nVBOffset, int nMinVertexIndex, int nVerticesCount, int nStartIndex, int nNumIndices, bool bInstanced = false) = 0;
-
-    // Set Index stream
-    virtual long FX_SetIStream(const void* pB, uint32 nOffs, RenderIndexType idxType) = 0;
-
-    // Set vertex stream
-    virtual long FX_SetVStream(int nID, const void* pB, uint32 nOffs, uint32 nStride, uint32 nFreq = 1) = 0;
-
-    // Draw primitives
-    virtual void FX_DrawPrimitive(eRenderPrimitiveType eType, int nStartVertex, int nVerticesCount, int nInstanceVertices = 0) = 0;
-
-    // Clear texture
-    virtual void FX_ClearTarget(ITexture* pTex) = 0;
-
-    // Clear depth
-    virtual void FX_ClearTarget(SDepthTexture* pTex) = 0;
-
-    // Set render target
-    virtual bool FX_SetRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount = 1) = 0;
-
-    // Pushes render target
-    virtual bool FX_PushRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount = 1) = 0;
-
-    // Sets up the render target
-    virtual bool FX_SetRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, bool bPush = false, int nCMSide = -1, bool bScreenVP = false, uint32 nTileCount = 1) = 0;
-
-    // Push render target
-    virtual bool FX_PushRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, int nCMSide = -1, bool bScreenVP = false, uint32 nTileCount = 1) = 0;
-
-    // Restore render target
-    virtual bool FX_RestoreRenderTarget(int nTarget) = 0;
-
-    // Pop render target
-    virtual bool FX_PopRenderTarget(int nTarget) = 0;
-
-    // Set active render targets
-    virtual void FX_SetActiveRenderTargets(bool bAllowDIP = false) = 0;
-
-    // Start an effect / shader / etc..
-    virtual void FX_Start(CShader* ef, int nTech, CShaderResources* Res, IRenderElement* re) = 0;
-
-    // Pop render target on render thread
-    virtual void RT_PopRenderTarget(int nTarget) = 0;
-
-    // Sets viewport dimensions on render thread
-    virtual void RT_SetViewport(int x, int y, int width, int height, int id = -1) = 0;
-
-    // Push render target on render thread
-    virtual void RT_PushRenderTarget(int nTarget, CTexture* pTex, SDepthTexture* pDS, int nS) = 0;
-
-    // Setup scissors rect
-    virtual void EF_Scissor(bool bEnable, int sX, int sY, int sWdt, int sHgt) = 0;
-
-#ifdef SUPPORT_HW_MOUSE_CURSOR
-    virtual IHWMouseCursor* GetIHWMouseCursor() = 0;
-#endif
-
-    virtual int GetRecursionLevel() = 0;
-
-    virtual int GetIntegerConfigurationValue(const char* varName, int defaultValue) = 0;
-    virtual float GetFloatConfigurationValue(const char* varName, float defaultValue) = 0;
-    virtual bool GetBooleanConfigurationValue(const char* varName, bool defaultValue) = 0;
-
-    // Methods exposed to external libraries
-    virtual void ApplyDepthTextureState(int unit, int nFilter, bool clamp) = 0;
-    virtual ITexture* GetZTargetTexture() = 0;
-    virtual int GetTextureState(const STexState& TS) = 0;
-    virtual uint32 TextureDataSize(uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nSlices, ETEX_Format eTF, ETEX_TileMode eTM = eTM_None) = 0;
-    virtual void ApplyForID(int nID, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit, bool useWhiteDefault) = 0;
-    virtual ITexture* Create3DTexture(const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst) = 0;
-    virtual bool IsTextureExist(const ITexture* pTex) = 0;
-    virtual const char* NameForTextureFormat(ETEX_Format eTF) = 0;
-    virtual const char* NameForTextureType(ETEX_Type eTT) = 0;
-    virtual bool IsVideoThreadModeEnabled() = 0;
-    virtual IDynTexture* CreateDynTexture2(uint32 nWidth, uint32 nHeight, uint32 nTexFlags, const char* szSource, ETexPool eTexPool) = 0;
-    virtual uint32 GetCurrentTextureAtlasSize() = 0;
-
-    virtual void BeginProfilerSection(const char* name, uint32 eProfileLabelFlags = 0) = 0;
-    virtual void EndProfilerSection(const char* name) = 0;
-    virtual void AddProfilerLabel(const char* name) = 0;
-
-private:
-    // use private for EF_Query to prevent client code to submit arbitrary combinations of output data/size
-    virtual void EF_QueryImpl(ERenderQueryTypes eQuery, void* pInOut0, uint32 nInOutSize0, void* pInOut1, uint32 nInOutSize1) = 0;
-};
-
-struct SShaderCacheStatistics
-{
-    size_t m_nTotalLevelShaderCacheMisses;
-    size_t m_nGlobalShaderCacheMisses;
-    size_t m_nNumShaderAsyncCompiles;
-    bool m_bShaderCompileActive;
-
-    SShaderCacheStatistics()
-        : m_nTotalLevelShaderCacheMisses(0)
-        , m_nGlobalShaderCacheMisses(0)
-        , m_nNumShaderAsyncCompiles(0)
-        , m_bShaderCompileActive(false)
-    {}
-};
-
-// The statistics about the pool for render mesh data
-// Note:
-struct SMeshPoolStatistics
-{
-    // The size of the mesh data size in bytes
-    size_t nPoolSize;
-
-    // The amount of memory currently in use in the pool
-    size_t nPoolInUse;
-
-    // The highest amount of memory allocated within the mesh data pool
-    size_t nPoolInUsePeak;
-
-    // The size of the mesh data size in bytes
-    size_t nInstancePoolSize;
-
-    // The amount of memory currently in use in the pool
-    size_t nInstancePoolInUse;
-
-    // The highest amount of memory allocated within the mesh data pool
-    size_t nInstancePoolInUsePeak;
-
-    size_t nFallbacks;
-    size_t nInstanceFallbacks;
-    size_t nFlushes;
-
-    SMeshPoolStatistics()
-        : nPoolSize()
-        , nPoolInUse()
-        , nInstancePoolSize()
-        , nInstancePoolInUse()
-        , nInstancePoolInUsePeak()
-        , nFallbacks()
-        , nInstanceFallbacks()
-        , nFlushes()
-    {}
-};
-
-struct SRendererQueryGetAllTexturesParam
-{
-    SRendererQueryGetAllTexturesParam()
-        : pTextures(NULL)
-        , numTextures(0)
-    {
-    }
-
-    _smart_ptr<ITexture>* pTextures;
-    uint32 numTextures;
-};
-
-
-//////////////////////////////////////////////////////////////////////
-
-#define STRIPTYPE_NONE           0
-#define STRIPTYPE_ONLYLISTS      1
-#define STRIPTYPE_SINGLESTRIP    2
-#define STRIPTYPE_MULTIPLESTRIPS 3
-#define STRIPTYPE_DEFAULT        4
-
-/////////////////////////////////////////////////////////////////////
-
-struct IRenderMesh;
-
-//DOC-IGNORE-BEGIN
-#include "VertexFormats.h"
-//DOC-IGNORE-END
-
-struct SRestLightingInfo
-{
-    SRestLightingInfo()
-    {
-        averDir.zero();
-        averCol = Col_Black;
-        refPoint.zero();
-    }
-    Vec3 averDir;
-    ColorF averCol;
-    Vec3 refPoint;
-};
-
-class CLodValue
-{
-public:
-    CLodValue()
-    {
-        m_nLodA = -1;
-        m_nLodB = -1;
-        m_nDissolveRef = 0;
-    }
-
-    CLodValue(int nLodA)
-    {
-        m_nLodA = aznumeric_caster(nLodA);
-        m_nLodB = -1;
-        m_nDissolveRef = 0;
-    }
-
-    CLodValue(int nLodA, uint8 nDissolveRef, int nLodB)
-    {
-        m_nLodA = aznumeric_caster(nLodA);
-        m_nLodB = aznumeric_caster(nLodB);
-        m_nDissolveRef = nDissolveRef;
-    }
-
-    int LodA() const { return m_nLodA; }
-    int LodB() const { return m_nLodB; }
-
-    uint8 DissolveRefA() const { return m_nDissolveRef; }
-    uint8 DissolveRefB() const { return 255 - m_nDissolveRef; }
-
-private:
-    int16 m_nLodA;
-    int16 m_nLodB;
-    uint8 m_nDissolveRef;
-};
-
-// Description:
-//   Structure used to pass render parameters to Render() functions of IStatObj and ICharInstance.
-struct SRendParams
-{
-    SRendParams()
-    {
-        memset(this, 0, sizeof(SRendParams));
-        fAlpha = 1.f;
-        fRenderQuality = 1.f;
-        nRenderList = EFSLIST_GENERAL;
-        nAfterWater = 1;
-        mRenderFirstContainer = false;
-        NoDecalReceiver = false;
-    }
-
-    // Summary:
-    //  object transformations.
-    Matrix34* pMatrix;
-    struct SInstancingInfo* pInstInfo;
-    // Summary:
-    //  object previous transformations - motion blur specific.
-    Matrix34* pPrevMatrix;
-    // Summary:
-    //  VisArea that contains this object, used for RAM-ambient cube query
-    IVisArea*       m_pVisArea;
-    // Summary:
-    //  Override material.
-    _smart_ptr<IMaterial> pMaterial;
-    // Summary:
-    //   Weights stream for deform morphs.
-    IRenderMesh* pWeights;
-    // Summary:
-    //  Object Id for objects identification in renderer.
-    struct IRenderNode* pRenderNode;
-    // Summary:
-    //  Unique object Id for objects identification in renderer.
-    void* pInstance;
-    // Summary:
-    //   TerrainTexInfo for grass.
-    struct SSectorTextureSet* pTerrainTexInfo;
-    // Summary:
-    //   storage for LOD transition states.
-    struct CRNTmpData** ppRNTmpData;
-    // Summary:
-    //  dynamic render data object which can be set by the game
-    AZStd::vector<SShaderParam>* pShaderParams;
-    // Summary:
-    //  Ambient color for the object.
-    ColorF AmbientColor;
-    // Summary:
-    //  Custom sorting offset.
-    float       fCustomSortOffset;
-    // Summary:
-    //  Object alpha.
-    float     fAlpha;
-    // Summary:
-    //  Distance from camera.
-    float     fDistance;
-    // Summary:
-    //   Quality of shaders rendering.
-    float fRenderQuality;
-    // Summary:
-    //  Light mask to specify which light to use on the object.
-    uint32 nDLightMask;
-    // Summary:
-    //  Approximate information about the lights not included into nDLightMask.
-    //  SRestLightingInfo restLightInfo;
-    // Summary:
-    //  CRenderObject flags.
-    int32       dwFObjFlags;
-    // Summary:
-    //   Material layers blending amount
-    uint32 nMaterialLayersBlend;
-    // Summary:
-    //  Vision modes params
-    uint32 nVisionParams;
-    // Summary:
-    //  Vision modes params
-    uint32 nHUDSilhouettesParams;
-    // Summary:
-    //  Defines what pieces of pre-broken geometry has to be rendered
-    uint64 nSubObjHideMask;
-
-    //   Defines per object float custom data
-    float fCustomData[4];
-
-    //   Custom TextureID
-    int16 nTextureID;
-
-    //   Defines per object custom flags
-    uint16 nCustomFlags;
-
-    // The LOD value compute for rendering
-    CLodValue lodValue;
-
-    //   Defines per object custom data
-    uint8 nCustomData;
-
-    // Summary:
-    //   Defines per object DissolveRef value if used by shader.
-    uint8 nDissolveRef;
-    // Summary:
-    //   per-instance vis area stencil ref id
-    uint8   nClipVolumeStencilRef;
-    // Summary:
-    //   Custom offset for sorting by distance.
-    uint8  nAfterWater;
-
-    // Summary:
-    //   Material layers bitmask -> which material layers are active.
-    uint8 nMaterialLayers;
-
-    // Summary:
-    //  Force a sort value for render elements.
-    uint8 nRenderList;
-    // Summary:
-    //  Special sorter to ensure correct ordering even if parts of the 3DEngine are run in parallel
-    uint32 rendItemSorter;
-    // Summary:
-    // Render the first particle container only, instead of all the containers
-    bool mRenderFirstContainer;
-
-    // Summary:
-    // Check if the preview would Show Wireframe - Vera,Confetti
-    bool bIsShowWireframe;
-
-    //Summary:
-    // Force drawing static instead of deformable meshes
-    bool bForceDrawStatic;
-
-    bool NoDecalReceiver;
-};
diff --git a/Code/CryEngine/CryCommon/ISerialize.h b/Code/CryEngine/CryCommon/ISerialize.h
deleted file mode 100644
index 6b2eaa271a..0000000000
--- a/Code/CryEngine/CryCommon/ISerialize.h
+++ /dev/null
@@ -1,1016 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : main header file
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ISERIALIZE_H
-#define CRYINCLUDE_CRYCOMMON_ISERIALIZE_H
-#pragma once
-
-#include <Cry_Math.h>
-#include <IXml.h>
-#include "MiniQueue.h"
-#include <VectorSet.h>
-#include <VectorMap.h>
-#include <StlUtils.h>
-#include <AzCore/Math/Vector3.h>
-#include <list>
-
-class CTimeValue;
-// Forward template declaration
-template<class T, class U>
-class InterpolatedValue_tpl;
-
-// Unfortunately this needs to be here - should be in CryNetwork somewhere.
-struct SNetObjectID
-{
-    static const uint16 InvalidId = ~uint16(0);
-
-    SNetObjectID()
-        : id(InvalidId)
-        , salt(0) {}
-    SNetObjectID(uint16 i, uint16 s)
-        : id(i)
-        , salt(s) {}
-
-    uint16 id;
-    uint16 salt;
-
-    ILINE bool operator!() const
-    {
-        return id == InvalidId;
-    }
-    typedef uint16 (SNetObjectID::* unknown_bool_type);
-    ILINE operator unknown_bool_type() const
-    {
-        return !!(*this) ? &SNetObjectID::id : NULL;
-    }
-    ILINE bool operator!=(const SNetObjectID& rhs) const
-    {
-        return !(*this == rhs);
-    }
-    ILINE bool operator==(const SNetObjectID& rhs) const
-    {
-        return id == rhs.id && salt == rhs.salt;
-    }
-    ILINE bool operator<(const SNetObjectID& rhs) const
-    {
-        return id < rhs.id || (id == rhs.id && salt < rhs.salt);
-    }
-    ILINE bool operator>(const SNetObjectID& rhs) const
-    {
-        return id > rhs.id || (id == rhs.id && salt > rhs.salt);
-    }
-
-    bool IsLegal() const
-    {
-        return salt != 0;
-    }
-
-    const char* GetText(char* tmpBuf = nullptr, size_t bufferSize = 0) const
-    {
-        static char singlebuf[64];
-        if (!tmpBuf)
-        {
-            tmpBuf = singlebuf;
-            bufferSize = sizeof(singlebuf);
-        }
-
-        if (id == InvalidId)
-        {
-            sprintf_s(tmpBuf, bufferSize, "<nil>");
-        }
-        else if (!salt)
-        {
-            sprintf_s(tmpBuf, bufferSize, "illegal:%d:%d", id, salt);
-        }
-        else
-        {
-            sprintf_s(tmpBuf, bufferSize, "%d:%d", id, salt);
-        }
-
-        return tmpBuf;
-    }
-
-    uint32 GetAsUint32() const
-    {
-        return (uint32(salt) << 16) | id;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
-
-    AUTO_STRUCT_INFO
-};
-
-// this enumeration details what "kind" of serialization we are
-// performing, so that classes that want to, for instance, tailor
-// the data they present depending on where data is being written
-// to can do so
-enum ESerializationTarget
-{
-    eST_SaveGame,
-    eST_Network,
-    eST_Script
-};
-
-// this inner class defines an interface so that OnUpdate
-// functions can be passed abstractly through to concrete
-// serialization classes
-struct ISerializeUpdateFunction
-{
-    // <interfuscator:shuffle>
-    virtual ~ISerializeUpdateFunction(){}
-    virtual void Execute() = 0;
-    // </interfuscator:shuffle>
-};
-
-// concrete implementation of IUpdateFunction for a general functor class
-template <class F_Update>
-class CSerializeUpdateFunction
-    : public ISerializeUpdateFunction
-{
-public:
-    CSerializeUpdateFunction(F_Update& update)
-        : m_rUpdate(update) {}
-
-    virtual void Execute()
-    {
-        m_rUpdate();
-    }
-
-private:
-    F_Update m_rUpdate;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Temporary class for string serialization.
-//////////////////////////////////////////////////////////////////////////
-struct SSerializeString
-{
-    AUTO_STRUCT_INFO
-
-    SSerializeString() {};
-    SSerializeString(const SSerializeString& src) { m_str.assign(src.c_str()); };
-    explicit SSerializeString(const char* sbegin, const char* send)
-        : m_str(sbegin, send) {};
-    ~SSerializeString() {}
-
-    // Casting to const char*
-    SSerializeString(const char* s)
-        : m_str(s) { };
-    //operator const char* () const { return m_str; }
-
-    SSerializeString& operator =(const SSerializeString& src) { m_str.assign(src.c_str()); return *this; }
-    SSerializeString& operator =(const char* src) { m_str.assign(src); return *this; }
-
-    bool operator != (const SSerializeString& src) { return m_str != src.m_str; }
-
-    size_t size() const { return m_str.size(); }
-    size_t length() const { return m_str.length(); }
-    const char* c_str() const { return m_str.c_str(); };
-    bool empty() const { return m_str.empty(); }
-    void resize(int sz) { m_str.resize(sz); }
-    void reserve(int sz) { m_str.reserve(sz); }
-
-    void set_string(const string& s)
-    {
-        m_str.assign(s.begin(), s.size());
-    }
-#if !defined(RESOURCE_COMPILER)
-    void set_string(const CryStringLocal& s)
-    {
-        m_str.assign(s.begin(), s.size());
-    }
-#endif
-    template<size_t S>
-    void set_string(const CryFixedStringT<S>& s)
-    {
-        m_str.assign(s.begin(), s.size());
-    }
-
-    operator const string () const {
-        return m_str;
-    }
-
-private:
-    string m_str;
-};
-
-// the ISerialize is intended to be implemented by objects that need
-// to read and write from various data sources, in such a way that
-// different tradeoffs can be balanced by the object that is being
-// serialized, and so that objects being serialized need only write
-// a single function in order to be read from and written to
-struct ISerialize
-{
-    static const int ENUM_POLICY_TAG = 0xe0000000;
-
-    ILINE ISerialize() {}
-
-    // <interfuscator:shuffle>
-    virtual ~ISerialize(){}
-
-    // this is for string values -- they need special support
-    virtual void ReadStringValue(const char* name, SSerializeString& curValue, uint32 policy = 0) = 0;
-    virtual void WriteStringValue(const char* name, SSerializeString& buffer, uint32 policy = 0) = 0;
-    // this function should be implemented to call the passed in interface
-    // if we are reading, and to not call it if we are writing
-    virtual void Update(ISerializeUpdateFunction* pUpdate) = 0;
-
-    // for network updates: notify the network engine that this value was only partially read and we
-    // should re-request an update from the server soon
-    virtual void FlagPartialRead() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // these functions should be implemented to deal with groups
-    //////////////////////////////////////////////////////////////////////////
-
-    // Begins a serialization group - must be matched by an EndGroup
-    // szName is preferably as short as possible for performance reasons
-    // Spaces in szName cause undefined behaviour, use alpha characters,underscore and numbers only for a name.
-    virtual void BeginGroup(const char* szName) = 0;
-    virtual bool BeginOptionalGroup(const char* szName, bool condition) = 0;
-    virtual void EndGroup() = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual bool IsReading() const = 0;
-    virtual bool ShouldCommitValues() const = 0;
-    virtual ESerializationTarget GetSerializationTarget() const = 0;
-    virtual bool Ok() const = 0;
-    // </interfuscator:shuffle>
-
-    // declare all primitive Value() implementations
-#define SERIALIZATION_TYPE(T) \
-    virtual void Value(const char* name, T & x, uint32 policy) = 0;
-#include "SerializationTypes.h"
-#undef SERIALIZATION_TYPE
-
-    // declare all primitive Value() implementations
-#define SERIALIZATION_TYPE(T) \
-    virtual void ValueWithDefault(const char* name, T & x, const T&defaultValue) = 0;
-#include "SerializationTypes.h"
-    SERIALIZATION_TYPE(SSerializeString)
-#undef SERIALIZATION_TYPE
-    void Value([[maybe_unused]] const char* name, [[maybe_unused]] AZ::Vector3& x)
-    {
-    }
-    template <class B>
-    void Value(const char* name, B& x)
-    {
-        Value(name, x, 0);
-    }
-
-    template <class B>
-    void Value(const char* name, B& x, uint32 policy);
-
-    template <class B>
-    void ValueWithDefault(const char* name, B& x, const B& defaultValue);
-};
-
-// this class provides a wrapper so that ISerialize can be used much more
-// easily; it is a template so that if we need to wrap a more specific
-// ISerialize implementation we can do so easily
-template <class TISerialize>
-class CSerializeWrapper
-{
-public:
-    CSerializeWrapper(TISerialize* pSerialize)
-        : m_pSerialize(pSerialize)
-    {
-    }
-
-    // we provide a wrapper around the abstract implementation
-    // ISerialize to allow easy changing of our
-    // interface, and easy implementation of our details.
-    // some of the wrappers are trivial, however for consistency, they
-    // have been made to follow the trend.
-
-    // the value function allows us to declare that a value needs
-    // to be serialized/deserialized; we can pass a serialization policy
-    // in order to compress the value, and an update function to allow
-    // us to be informed of when this value is changed
-    template <typename T_Value>
-    ILINE void Value(const char* szName, T_Value& value, int policy)
-    {
-        m_pSerialize->Value(szName, value, policy);
-    }
-
-    template <typename T_Value>
-    ILINE void Value(const char* szName, T_Value& value)
-    {
-        m_pSerialize->Value(szName, value);
-    }
-
-    void Value(const char* szName, string& value, int policy)
-    {
-        if (IsWriting())
-        {
-            SSerializeString& serializeString = SetSharedSerializeString(value);
-            m_pSerialize->WriteStringValue(szName, serializeString, policy);
-        }
-        else
-        {
-            if (GetSerializationTarget() != eST_Script)
-            {
-                value = "";
-            }
-
-            SSerializeString& serializeString = SetSharedSerializeString(value);
-            m_pSerialize->ReadStringValue(szName, serializeString, policy);
-            value = serializeString.c_str();
-        }
-    }
-    ILINE void Value(const char* szName, string& value)
-    {
-        Value(szName, value, 0);
-    }
-    void Value(const char* szName, const string& value, int policy)
-    {
-        if (IsWriting())
-        {
-            SSerializeString& serializeString = SetSharedSerializeString(value);
-            m_pSerialize->WriteStringValue(szName, serializeString, policy);
-        }
-        else
-        {
-            assert(0 && "This function can only be used for Writing");
-        }
-    }
-    ILINE void Value(const char* szName, const string& value)
-    {
-        Value(szName, value, 0);
-    }
-    template <typename T>
-    void Value(const char* szName, CryStringLocalT<T>& value, int policy)
-    {
-        if (IsWriting())
-        {
-            SSerializeString& serializeString = SetSharedSerializeString(value);
-            m_pSerialize->WriteStringValue(szName, serializeString, policy);
-        }
-        else
-        {
-            if (GetSerializationTarget() != eST_Script)
-            {
-                value = "";
-            }
-
-            SSerializeString& serializeString = SetSharedSerializeString(value);
-            m_pSerialize->ReadStringValue(szName, serializeString, policy);
-            value = serializeString.c_str();
-        }
-    }
-    template <typename T>
-    ILINE void Value(const char* szName, CryStringLocalT<T>& value)
-    {
-        Value(szName, value, 0);
-    }
-    template <typename T>
-    void Value(const char* szName, const CryStringLocalT<T>& value, int policy)
-    {
-        if (IsWriting())
-        {
-            SSerializeString& serializeString = SetSharedSerializeString(value);
-            m_pSerialize->WriteStringValue(szName, serializeString, policy);
-        }
-        else
-        {
-            assert(0 && "This function can only be used for Writing");
-        }
-    }
-    template <typename T>
-    ILINE void Value(const char* szName, const CryStringLocalT<T>& value)
-    {
-        Value(szName, value, 0);
-    }
-    template<size_t S>
-    void Value(const char* szName, CryFixedStringT<S>& value, int policy)
-    {
-        if (IsWriting())
-        {
-            SSerializeString& serializeString = SetSharedSerializeString(value);
-            m_pSerialize->WriteStringValue(szName, serializeString, policy);
-        }
-        else
-        {
-            if (GetSerializationTarget() != eST_Script)
-            {
-                value = "";
-            }
-
-            SSerializeString& serializeString = SetSharedSerializeString(value);
-            m_pSerialize->ReadStringValue(szName, serializeString, policy);
-            assert(serializeString.length() <= S);
-            value = serializeString.c_str();
-        }
-    }
-    template<size_t S>
-    ILINE void Value(const char* szName, CryFixedStringT<S>& value)
-    {
-        Value(szName, value, 0);
-    }
-    template <class T_Class, typename T_Value>
-    void Value(const char* szName, T_Class* pInst, T_Value (T_Class::* get)() const, void (T_Class::* set)(T_Value))
-    {
-        if (IsWriting())
-        {
-            T_Value temp = (pInst->*get)();
-            Value(szName, temp);
-        }
-        else
-        {
-            T_Value temp;
-            Value(szName, temp);
-            (pInst->*set)(temp);
-        }
-    }
-
-    template<class T, class TT>
-    void Value(const char* name, InterpolatedValue_tpl<T, TT>& val)
-    {
-        if (IsWriting())
-        {
-            T a = val.Get();
-            Value(name, a);
-        }
-
-        if (IsReading())
-        {
-            T a;
-            Value(name, a);
-            val.SetGoal(a);
-        }
-    }
-
-    template<class T, class TT>
-    void Value(const char* name, InterpolatedValue_tpl<T, TT>& val, int policy)
-    {
-        if (IsWriting())
-        {
-            T a = val.Get();
-            Value(name, a, policy);
-        }
-
-        if (IsReading())
-        {
-            T a;
-            Value(name, a, policy);
-            val.SetGoal(a);
-        }
-    }
-
-    bool ValueChar(const char* name, char* buffer, int len)
-    {
-        string temp;
-        if (IsReading())
-        {
-            Value(name, temp);
-            if ((int)temp.length() > len - 1)
-            {
-                return false;       // truncated read
-            }
-            memcpy(buffer, temp.data(), temp.length() + 1);
-            buffer[len - 1] = 0;
-        }
-        else
-        {
-            temp = string(buffer, buffer + len);
-            Value(name, temp);
-        }
-        return true;
-    }
-
-    template <typename T>
-    void ValueWithDefault(const char* name, T& x, const T& defaultValue)
-    {
-        m_pSerialize->ValueWithDefault(name, x, defaultValue);
-    }
-
-    void ValueWithDefault(const char* szName, string& value, const string& defaultValue)
-    {
-        static SSerializeString defaultSerializeString;
-
-        {
-            defaultSerializeString.set_string(defaultValue);
-        }
-
-        SSerializeString& serializeString = SetSharedSerializeString(value);
-        m_pSerialize->ValueWithDefault(szName, serializeString, defaultSerializeString);
-        if (IsReading())
-        {
-            value = serializeString.c_str();
-        }
-    }
-
-    template <class T_Class, typename T_Value, class T_SerializationPolicy>
-    void Value(const char* szName, T_Class* pInst, T_Value (T_Class::* get)() const, void (T_Class::* set)(T_Value),
-        const T_SerializationPolicy& policy)
-    {
-        if (IsWriting())
-        {
-            T_Value temp = (pInst->*get)();
-            Value(szName, temp, policy);
-        }
-        else
-        {
-            T_Value temp = static_cast<T_Value>(0);
-            Value(szName, temp, policy);
-            (pInst->*set)(temp);
-        }
-    }
-
-    // a value that is written by referring to a map of key/value pairs - we receive the key, and write the value
-    template <class T_Key, class T_Map>
-    void MappedValue(const char* szName, T_Key& value, const T_Map& mapper)
-    {
-        typedef typename T_Map::ValueType T_Value;
-
-        if (IsWriting())
-        {
-            T_Value write = mapper.KeyToValue(value);
-            Value(szName, write);
-        }
-        else
-        {
-            T_Value read;
-            Value(szName, read);
-            value = mapper.ValueToKey(read);
-        }
-    }
-
-#define CONTAINER_VALUE(container_type, insert_function)                                                                \
-    template <typename T_Value, class Allocator>                                                                        \
-    void Value(const char* name, container_type<T_Value, Allocator>&cont)                                               \
-    {                                                                                                                   \
-        if (!BeginOptionalGroup(name, true)) {return; }                                                                 \
-        if (IsWriting())                                                                                                \
-        {                                                                                                               \
-            uint32 count = cont.size();                                                                                 \
-            Value("Size", count);                                                                                       \
-            for (typename container_type<T_Value, Allocator>::iterator iter = cont.begin(); iter != cont.end(); ++iter) \
-            {                                                                                                           \
-                BeginGroup("i");                                                                                        \
-                T_Value value = *iter;                                                                                  \
-                Value("v", value);                                                                                      \
-                EndGroup();                                                                                             \
-            }                                                                                                           \
-        }                                                                                                               \
-        else                                                                                                            \
-        {                                                                                                               \
-            cont.clear();                                                                                               \
-            uint32 count = 0;                                                                                           \
-            Value("Size", count);                                                                                       \
-            while (count--)                                                                                             \
-            {                                                                                                           \
-                BeginGroup("i");                                                                                        \
-                T_Value temp;                                                                                           \
-                Value("v", temp);                                                                                       \
-                cont.insert_function(temp);                                                                             \
-                EndGroup();                                                                                             \
-            }                                                                                                           \
-        }                                                                                                               \
-        EndGroup();                                                                                                     \
-    }                                                                                                                   \
-    template <typename T_Value, class T_Map>                                                                            \
-    void MappedValue(const char* name, container_type<T_Value>&cont, const T_Map&mapper)                                \
-    {                                                                                                                   \
-        if (!BeginOptionalGroup(name, true)) {return; }                                                                 \
-        if (IsWriting())                                                                                                \
-        {                                                                                                               \
-            uint32 count = cont.size();                                                                                 \
-            Value("Size", count);                                                                                       \
-            for (typename container_type<T_Value>::iterator iter = cont.begin(); iter != cont.end(); ++iter)            \
-            {                                                                                                           \
-                BeginGroup("i");                                                                                        \
-                MappedValue("v", *iter, mapper);                                                                        \
-                EndGroup();                                                                                             \
-            }                                                                                                           \
-        }                                                                                                               \
-        else                                                                                                            \
-        {                                                                                                               \
-            cont.clear();                                                                                               \
-            uint32 count = 0;                                                                                           \
-            Value("Size", count);                                                                                       \
-            while (count--)                                                                                             \
-            {                                                                                                           \
-                BeginGroup("i");                                                                                        \
-                T_Value temp;                                                                                           \
-                MappedValue("v", temp, mapper);                                                                         \
-                cont.insert_function(temp);                                                                             \
-                EndGroup();                                                                                             \
-            }                                                                                                           \
-        }                                                                                                               \
-        EndGroup();                                                                                                     \
-    }
-
-#define PAIR_CONTAINER_VALUE(container_type, insert_function)                                                                                 \
-    template <typename T_Value1, typename T_Value2, class Allocator>                                                                          \
-    void Value(const char* name, container_type<std::pair<T_Value1, T_Value2>, Allocator>&cont)                                               \
-    {                                                                                                                                         \
-        if (!BeginOptionalGroup(name, true)) {return; }                                                                                       \
-        if (IsWriting())                                                                                                                      \
-        {                                                                                                                                     \
-            uint32 count = cont.size();                                                                                                       \
-            Value("Size", count);                                                                                                             \
-            for (typename container_type<std::pair<T_Value1, T_Value2>, Allocator>::iterator iter = cont.begin(); iter != cont.end(); ++iter) \
-            {                                                                                                                                 \
-                BeginGroup("i");                                                                                                              \
-                T_Value1 value1 = iter->first;                                                                                                \
-                T_Value2 value2 = iter->second;                                                                                               \
-                Value("v1", value1);                                                                                                          \
-                Value("v2", value2);                                                                                                          \
-                EndGroup();                                                                                                                   \
-            }                                                                                                                                 \
-        }                                                                                                                                     \
-        else                                                                                                                                  \
-        {                                                                                                                                     \
-            cont.clear();                                                                                                                     \
-            uint32 count = 0;                                                                                                                 \
-            Value("Size", count);                                                                                                             \
-            while (count--)                                                                                                                   \
-            {                                                                                                                                 \
-                BeginGroup("i");                                                                                                              \
-                T_Value1 temp1;                                                                                                               \
-                T_Value2 temp2;                                                                                                               \
-                Value("v1", temp1);                                                                                                           \
-                Value("v2", temp2);                                                                                                           \
-                cont.insert_function(std::pair<T_Value1, T_Value2>(temp1, temp2));                                                            \
-                EndGroup();                                                                                                                   \
-            }                                                                                                                                 \
-        }                                                                                                                                     \
-        EndGroup();                                                                                                                           \
-    }                                                                                                                                         \
-
-    CONTAINER_VALUE(std::vector, push_back);
-    CONTAINER_VALUE(std::list, push_back);
-    CONTAINER_VALUE(std::set, insert);
-    CONTAINER_VALUE(std::deque, push_back);
-    CONTAINER_VALUE(VectorSet, insert);
-    CONTAINER_VALUE(DynArray, insert);
-
-    PAIR_CONTAINER_VALUE(std::list, push_back);
-    PAIR_CONTAINER_VALUE(std::vector, push_back);
-
-    template <typename T_Value>
-    void DummyValues(uint32 numDummyValues)
-    {
-        T_Value dummyValue;
-        for (uint32 i = 0; i < numDummyValues; ++i)
-        {
-            Value("Value", dummyValue);
-        }
-    }
-
-    template <typename T_Value, uint8 N>
-    void Value(const char* name, MiniQueue<T_Value, N>& cont)
-    {
-        if (!BeginOptionalGroup(name, true))
-        {
-            return;
-        }
-        if (IsWriting())
-        {
-            uint32 count = cont.Size();
-            Value("Size", count);
-            for (typename MiniQueue<T_Value, N>::SIterator iter = cont.Begin(); iter != cont.End(); ++iter)
-            {
-                T_Value value = *iter;
-                Value("Value", value);
-            }
-        }
-        else
-        {
-            cont.Clear();
-            uint32 count = 0;
-            Value("Size", count);
-            while (count--)
-            {
-                T_Value temp;
-                Value("Value", temp);
-                cont.Push(temp);
-            }
-        }
-        DummyValues<T_Value>(cont.Capacity() - cont.Size());
-        EndGroup();
-    }
-    template <typename T_Value, uint8 N, class T_Map>
-    void MappedValue(const char* name, MiniQueue<T_Value, N>& cont, const T_Map& mapper)
-    {
-        if (!BeginOptionalGroup(name, true))
-        {
-            return;
-        }
-        if (IsWriting())
-        {
-            uint8 count = cont.Size();
-            Value("Size", count);
-            for (typename MiniQueue<T_Value, N>::SIterator iter = cont.Begin(); iter != cont.End(); ++iter)
-            {
-                BeginGroup("i");
-                MappedValue("Value", *iter, mapper);
-                EndGroup();
-            }
-        }
-        else
-        {
-            cont.Clear();
-            uint8 count = 0;
-            Value("Size", count);
-            while (count--)
-            {
-                BeginGroup("i");
-                T_Value temp;
-                MappedValue("Value", temp, mapper);
-                cont.Push(temp);
-                EndGroup();
-            }
-        }
-        EndGroup();
-    }
-
-#define MAP_CONTAINER_VALUE(container_type)                                                                         \
-    template <typename T_Key, typename T_Value>                                                                     \
-    void Value(const char* name, container_type<T_Key, T_Value>&cont)                                               \
-    {                                                                                                               \
-        if (!BeginOptionalGroup(name, true)) {return; }                                                             \
-        if (IsWriting())                                                                                            \
-        {                                                                                                           \
-            uint32 count = (uint32)cont.size();                                                                     \
-            Value("Size", count);                                                                                   \
-            for (typename container_type<T_Key, T_Value>::iterator iter = cont.begin(); iter != cont.end(); ++iter) \
-            {                                                                                                       \
-                T_Key tempKey = iter->first;                                                                        \
-                BeginGroup("pair");                                                                                 \
-                Value("k", tempKey);                                                                                \
-                Value("v", iter->second);                                                                           \
-                EndGroup();                                                                                         \
-            }                                                                                                       \
-        }                                                                                                           \
-        else                                                                                                        \
-        {                                                                                                           \
-            cont.clear();                                                                                           \
-            uint32 count;                                                                                           \
-            Value("Size", count);                                                                                   \
-            while (count--)                                                                                         \
-            {                                                                                                       \
-                std::pair<T_Key, T_Value> temp;                                                                     \
-                BeginGroup("pair");                                                                                 \
-                Value("k", temp.first);                                                                             \
-                Value("v", temp.second);                                                                            \
-                EndGroup();                                                                                         \
-                cont.insert(temp);                                                                                  \
-            }                                                                                                       \
-        }                                                                                                           \
-        EndGroup();                                                                                                 \
-    }
-
-#define HASH_CONTAINER_VALUE(container_type)                                                                                \
-    template <typename T_Key, typename T_Value, typename T_Hash>                                                            \
-    void Value(const char* name, container_type<T_Key, T_Value, T_Hash>&cont)                                               \
-    {                                                                                                                       \
-        if (!BeginOptionalGroup(name, true)) {return; }                                                                     \
-        if (IsWriting())                                                                                                    \
-        {                                                                                                                   \
-            uint32 count = (uint32)cont.size();                                                                             \
-            Value("Size", count);                                                                                           \
-            for (typename container_type<T_Key, T_Value, T_Hash>::iterator iter = cont.begin(); iter != cont.end(); ++iter) \
-            {                                                                                                               \
-                T_Key tempKey = iter->first;                                                                                \
-                BeginGroup("pair");                                                                                         \
-                Value("k", tempKey);                                                                                        \
-                Value("v", iter->second);                                                                                   \
-                EndGroup();                                                                                                 \
-            }                                                                                                               \
-        }                                                                                                                   \
-        else                                                                                                                \
-        {                                                                                                                   \
-            cont.clear();                                                                                                   \
-            uint32 count;                                                                                                   \
-            Value("Size", count);                                                                                           \
-            while (count--)                                                                                                 \
-            {                                                                                                               \
-                AZStd::pair<T_Key, T_Value> temp;                                                                           \
-                BeginGroup("pair");                                                                                         \
-                Value("k", temp.first);                                                                                     \
-                Value("v", temp.second);                                                                                    \
-                EndGroup();                                                                                                 \
-                cont.insert(temp);                                                                                          \
-            }                                                                                                               \
-        }                                                                                                                   \
-        EndGroup();                                                                                                         \
-    }
-    MAP_CONTAINER_VALUE(std::map);
-    MAP_CONTAINER_VALUE(std::multimap);
-    MAP_CONTAINER_VALUE(VectorMap);
-
-    HASH_CONTAINER_VALUE(AZStd::unordered_map);
-
-    template <typename T_Value>
-    ILINE void EnumValue(const char* szName, T_Value& value,
-        T_Value first, T_Value last)
-    {
-        int32 nValue = int32(value) - first;
-        Value(szName, nValue, ISerialize::ENUM_POLICY_TAG | (last - first));
-        value = T_Value(nValue + first);
-    }
-    template <typename T_Value, class T_Class>
-    ILINE void EnumValue(const char* szName,
-        T_Class* pClass, T_Value (T_Class::* GetValue)() const, void (T_Class::* SetValue)(T_Value),
-        T_Value first, T_Value last)
-    {
-        bool w = IsWriting();
-        int nValue;
-        if (w)
-        {
-            nValue = int32((pClass->*GetValue)()) - first;
-        }
-        Value(szName, nValue, ISerialize::ENUM_POLICY_TAG | (last - first));
-        if (!w)
-        {
-            (pClass->*SetValue)(T_Value(nValue + first));
-        }
-    }
-    /*
-    // we can request that a functor be called whenever our values
-    // are being updated by calling this function
-    template <class F_Update>
-    ILINE void OnUpdate( F_Update& update )
-    {
-        CUpdateFunction<F_Update> func(update);
-        m_pSerialize->Update( &func );
-    }
-    template <class T>
-    ILINE void OnUpdate( T * pCls, void (T::*func)() )
-    {
-        class CFunc : public IUpdateFunction
-        {
-        public:
-            CFunc( T * pCls, void (T::*func)() ) : m_pCls(pCls), m_func(func) {}
-            virtual void Execute()
-            {
-                (m_pCls->*m_func)();
-            }
-        private:
-            T * m_pCls;
-            void (T::*m_func)();
-        };
-        CFunc ifunc( pCls, func );
-        m_pSerialize->Update( &ifunc );
-    }
-    */
-    // groups help us find common data
-    ILINE void BeginGroup(const char* szName)
-    {
-        m_pSerialize->BeginGroup(szName);
-    }
-    ILINE bool BeginOptionalGroup(const char* szName, bool condition)
-    {
-        return m_pSerialize->BeginOptionalGroup(szName, condition);
-    }
-    ILINE void EndGroup()
-    {
-        m_pSerialize->EndGroup();
-    }
-
-    // fetch the serialization target
-    ILINE ESerializationTarget GetSerializationTarget() const
-    {
-        return m_pSerialize->GetSerializationTarget();
-    }
-
-    ILINE bool IsWriting() const
-    {
-        return !m_pSerialize->IsReading();
-    }
-    ILINE bool IsReading() const
-    {
-        return m_pSerialize->IsReading();
-    }
-    ILINE bool ShouldCommitValues() const
-    {
-        assert(m_pSerialize->IsReading());
-        return m_pSerialize->ShouldCommitValues();
-    }
-
-    ILINE bool Ok() const
-    {
-        return m_pSerialize->Ok();
-    }
-
-    friend ILINE TISerialize* GetImpl(CSerializeWrapper<TISerialize> ser)
-    {
-        return ser.m_pSerialize;
-    }
-
-    ILINE void FlagPartialRead()
-    {
-        m_pSerialize->FlagPartialRead();
-    }
-
-    operator CSerializeWrapper<ISerialize>()
-    {
-        return CSerializeWrapper<ISerialize>(m_pSerialize);
-    }
-
-    SSerializeString& SetSharedSerializeString(const string& str)
-    {
-        static SSerializeString serializeString;
-        serializeString.set_string(str);
-        return serializeString;
-    }
-
-#if !defined(RESOURCE_COMPILER)
-    SSerializeString& SetSharedSerializeString(const CryStringLocal& str)
-    {
-        
-
-        static SSerializeString serializeString;
-        serializeString.set_string(str);
-        return serializeString;
-    }
-#endif
-
-    template<size_t S>
-    SSerializeString& SetSharedSerializeString(const CryFixedStringT<S>& str)
-    {
-        
-
-        static SSerializeString serializeString;
-        serializeString.set_string(str);
-        return serializeString;
-    }
-
-private:
-    TISerialize* m_pSerialize;
-};
-
-// default serialize class to use!!
-typedef CSerializeWrapper<ISerialize> TSerialize;
-
-// simple struct to declare something serializable... useful for
-// exposition
-struct ISerializable
-{
-    virtual ~ISerializable(){}
-    virtual void SerializeWith(TSerialize) = 0;
-};
-
-template <class B>
-void ISerialize::Value(const char* name, B& x, uint32 policy)
-{
-    if (!BeginOptionalGroup(name, true))
-    {
-        return;
-    }
-    TSerialize  ser(this);
-    x.Serialize(ser);
-    EndGroup();
-}
-//
-//template <>
-//void ISerialize::Value(const char * name, AZ::Vector3& x, uint32 policy)
-//{
-//
-//}
-
-// Based off ValueWithDefault in SimpleSerialize.h
-template <class B>
-void ISerialize::ValueWithDefault(const char* name, B& x, const B& defaultValue)
-{
-    if (BeginOptionalGroup(name, x != defaultValue))
-    {
-        TSerialize  ser(this);
-        x.Serialize(ser);
-        EndGroup();
-    }
-    else if (IsReading())
-    {
-        x = defaultValue;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Used to automatically Begin/End group in serialization stream
-//////////////////////////////////////////////////////////////////////////
-struct SSerializeScopedBeginGroup
-{
-    SSerializeScopedBeginGroup(TSerialize& ser, const char* sGroupName)
-    {
-        m_pSer = &ser;
-        m_pSer->BeginGroup(sGroupName);
-    }
-    ~SSerializeScopedBeginGroup()
-    {
-        m_pSer->EndGroup();
-    }
-private:
-    TSerialize* m_pSer;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_ISERIALIZE_H
diff --git a/Code/CryEngine/CryCommon/IShader.h b/Code/CryEngine/CryCommon/IShader.h
deleted file mode 100644
index c14a7a8af4..0000000000
--- a/Code/CryEngine/CryCommon/IShader.h
+++ /dev/null
@@ -1,3309 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Shaders common interface.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ISHADER_H
-#define CRYINCLUDE_CRYCOMMON_ISHADER_H
-#pragma once
-
-
-#if defined(LINUX) || defined(APPLE)
-  #include <platform.h>
-#endif
-
-#include "smartptr.h"
-#include "Cry_Vector2.h"
-#include "Cry_Vector3.h"
-#include "Cry_Matrix33.h"
-#include "Cry_Color.h"
-#include "smartptr.h"
-#include "StringUtils.h"
-#include <IXml.h> // <> required for Interfuscator
-#include "smartptr.h"
-#include "VertexFormats.h"
-#include <Vertex.h>
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/std/containers/map.h>
-
-#include "Cry_XOptimise.h"
-#include <CrySizer.h>
-#include <IMaterial.h>
-
-struct IMaterial;
-class CRendElementBase;
-class CRenderObject;
-class CREMesh;
-struct IRenderMesh;
-struct IShader;
-struct IVisArea;
-class CShader;
-class CRendElement;
-class CRendElementBase;
-class ITexAnim;
-struct SShaderPass;
-struct SShaderItem;
-class ITexture;
-struct IMaterial;
-struct SParam;
-struct SShaderSerializeContext;
-struct IAnimNode;
-struct SSkinningData;
-struct SSTexSamplerFX;
-struct SShaderTextureSlot;
-struct IRenderElement;
-
-namespace AZ
-{
-    class LegacyJobExecutor;
-
-    namespace Vertex
-    {
-        class Format;
-    }
-}
-
-//================================================================
-// Summary:
-//   Geometry Culling type.
-enum ECull
-{
-    eCULL_Back = 0, // Back culling flag.
-    eCULL_Front,    // Front culling flag.
-    eCULL_None      // No culling flag.
-};
-
-enum ERenderResource
-{
-    eRR_Unknown,
-    eRR_Mesh,
-    eRR_Texture,
-    eRR_Shader,
-    eRR_ShaderResource,
-};
-
-enum EEfResTextures : int // This needs a fixed size so the enum can be forward declared (needed by IMaterial.h)
-{
-    EFTT_DIFFUSE = 0,
-    EFTT_NORMALS,
-    EFTT_SPECULAR,
-    EFTT_ENV,
-    EFTT_DETAIL_OVERLAY,
-    EFTT_SECOND_SMOOTHNESS,
-    EFTT_HEIGHT,
-    EFTT_DECAL_OVERLAY,
-    EFTT_SUBSURFACE,
-    EFTT_CUSTOM,
-    EFTT_CUSTOM_SECONDARY,
-    EFTT_OPACITY,
-    EFTT_SMOOTHNESS,
-    EFTT_EMITTANCE,
-    EFTT_OCCLUSION,
-    EFTT_SPECULAR_2,
-
-    EFTT_MAX,
-    EFTT_UNKNOWN = EFTT_MAX
-};
-
-enum EEfResSamplers
-{
-    EFSS_ANISO_HIGH = 0,
-    EFSS_ANISO_LOW,
-    EFSS_TRILINEAR,
-    EFSS_BILINEAR,
-    EFSS_TRILINEAR_CLAMP,
-    EFSS_BILINEAR_CLAMP,
-    EFSS_ANISO_HIGH_BORDER,
-    EFSS_TRILINEAR_BORDER,
-
-    EFSS_MAX,
-};
-
-//=========================================================================
-
-// Summary:
-//   Array Pointers for Shaders.
-
-enum ESrcPointer
-{
-    eSrcPointer_Unknown,
-    eSrcPointer_Vert,
-    eSrcPointer_Color,
-    eSrcPointer_Tex,
-    eSrcPointer_TexLM,
-    eSrcPointer_Normal,
-    eSrcPointer_Tangent,
-    eSrcPointer_Max,
-};
-
-struct SWaveForm;
-struct SWaveForm2;
-
-#define FRF_REFRACTIVE 1
-// FREE                2
-#define FRF_HEAT       4
-#define MAX_HEATSCALE 4
-
-#if !defined(MAX_JOINT_AMOUNT)
-#error MAX_JOINT_AMOUNT is not defined
-#endif
-
-#if (MAX_JOINT_AMOUNT <= 256)
-typedef uint8 JointIdType;
-#else
-typedef uint16 JointIdType;
-#endif
-
-// The soft maximum cap for the sliders for emissive intensity.  Also used to clamp legacy glow calculations in MaterialHelpers::MigrateXmlLegacyData.
-// Note this is a "soft max" because the Emissive Intensity slider is capped at 200, but values higher than 200 may be entered in the text field.
-#define EMISSIVE_INTENSITY_SOFT_MAX 200.0f
-
-//=========================================================================
-
-enum EParamType
-{
-    eType_UNKNOWN,
-    eType_BYTE,
-    eType_BOOL,
-    eType_SHORT,
-    eType_INT,
-    eType_HALF,
-    eType_FLOAT,
-    eType_STRING,
-    eType_FCOLOR,
-    eType_VECTOR,
-    eType_TEXTURE_HANDLE,
-    eType_CAMERA,
-    eType_FCOLORA, //  with alpha channel
-};
-
-enum ESamplerType
-{
-    eSType_UNKNOWN,
-    eSType_Sampler,
-    eSType_SamplerComp,
-};
-
-union UParamVal
-{
-    byte m_Byte;
-    bool m_Bool;
-    short m_Short;
-    int m_Int;
-    float m_Float;
-    char* m_String;
-    float m_Color[4];
-    float m_Vector[3];
-    CCamera* m_pCamera;
-};
-
-// Note:
-//   In order to facilitate the memory allocation tracking, we're using here this class;
-//   if you don't like it, please write a substitute for all string within the project and use them everywhere.
-struct SShaderParam
-{
-    AZStd::string m_Name;
-    AZStd::string m_Script;
-    UParamVal m_Value;
-    EParamType m_Type;
-    uint8 m_eSemantic;
-    uint8 m_Pad[3] = { 0 };
-
-    inline void Construct()
-    {
-        memset(&m_Value, 0, sizeof(m_Value));
-        m_Type = eType_UNKNOWN;
-        m_eSemantic = 0;
-        m_Name.clear();
-        m_Script.clear();
-    }
-    inline SShaderParam()
-    {
-        Construct();
-    }
-    size_t Size()
-    {
-        size_t nSize = sizeof(*this);
-        if (m_Type == eType_STRING)
-        {
-            nSize += strlen (m_Value.m_String) + 1;
-        }
-
-        return nSize;
-    }
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_Script);
-        if (m_Type == eType_STRING)
-        {
-            pSizer->AddObject(m_Value.m_String, strlen (m_Value.m_String) + 1);
-        }
-    }
-
-    inline void Destroy()
-    {
-        if (m_Type == eType_STRING)
-        {
-            delete [] m_Value.m_String;
-        }
-    }
-    inline ~SShaderParam()
-    {
-        Destroy();
-    }
-    inline SShaderParam (const SShaderParam& src)
-    {
-        m_Name = src.m_Name;
-        m_Script = src.m_Script;
-        m_Type = src.m_Type;
-        m_eSemantic = src.m_eSemantic;
-        if (m_Type == eType_STRING)
-        {
-            const size_t len = strlen(src.m_Value.m_String) + 1;
-            m_Value.m_String = new char[len];
-            azstrcpy(m_Value.m_String, len, src.m_Value.m_String);
-        }
-        else
-        {
-            m_Value = src.m_Value;
-        }
-    }
-    inline SShaderParam& operator = (const SShaderParam& src)
-    {
-        this->~SShaderParam();
-        new(this)SShaderParam(src);
-        return *this;
-    }
-
-    static bool SetParam(const char* name, AZStd::vector<SShaderParam>* Params, const UParamVal& pr)
-    {
-        uint32 i;
-        for (i = 0; i < (uint32)Params->size(); i++)
-        {
-            SShaderParam* sp = &(*Params)[i];
-            if (!sp || &sp->m_Value == &pr)
-            {
-                continue;
-            }
-            if (azstricmp(sp->m_Name.c_str(), name) == 0)
-            {
-                if (sp->m_Type == eType_STRING)
-                {
-                    delete[] sp->m_Value.m_String;
-                }
-
-
-                switch (sp->m_Type)
-                {
-                case eType_FLOAT:
-                    sp->m_Value.m_Float = pr.m_Float;
-                    break;
-                case eType_SHORT:
-                    sp->m_Value.m_Short = pr.m_Short;
-                    break;
-                case eType_INT:
-                case eType_TEXTURE_HANDLE:
-                    sp->m_Value.m_Int = pr.m_Int;
-                    break;
-
-                case eType_VECTOR:
-                    sp->m_Value.m_Vector[0] = pr.m_Vector[0];
-                    sp->m_Value.m_Vector[1] = pr.m_Vector[1];
-                    sp->m_Value.m_Vector[2] = pr.m_Vector[2];
-                    break;
-
-                case eType_FCOLOR:
-                case eType_FCOLORA:
-                    sp->m_Value.m_Color[0] = pr.m_Color[0];
-                    sp->m_Value.m_Color[1] = pr.m_Color[1];
-                    sp->m_Value.m_Color[2] = pr.m_Color[2];
-                    sp->m_Value.m_Color[3] = pr.m_Color[3];
-                    break;
-
-                case eType_STRING:
-                {
-                    char* str = pr.m_String;
-                    const size_t len = strlen(str) + 1;
-                    sp->m_Value.m_String = new char [len];
-                    azstrcpy(sp->m_Value.m_String, len, str);
-                }
-                break;
-                }
-                break;
-            }
-        }
-        if (i == Params->size())
-        {
-            return false;
-        }
-        return true;
-    }
-    static bool GetValue(const char* szName, AZStd::vector<SShaderParam>* Params, float* v, int nID);
-
-    static bool GetValue(uint8 eSemantic, AZStd::vector<SShaderParam>* Params, float* v, int nID);
-
-    inline void CopyValue(const SShaderParam& src)
-    {
-        if (m_Type == eType_STRING && this != &src)
-        {
-            delete[] m_Value.m_String;
-
-            if (src.m_Type == eType_STRING)
-            {
-                size_t size = strlen(src.m_Value.m_String) + 1;
-                m_Value.m_String = new char[size];
-                azstrcpy(m_Value.m_String, size, src.m_Value.m_String);
-                return;
-            }
-        }
-
-        m_Value = src.m_Value;
-    }
-
-    inline void CopyValueNoString(const SShaderParam& src)
-    {
-        assert(m_Type != eType_STRING && src.m_Type != eType_STRING);
-
-        m_Value = src.m_Value;
-    }
-
-    inline void CopyType(const SShaderParam& src)
-    {
-        m_Type = src.m_Type;
-    }
-};
-
-
-// Description:
-//    IShaderPublicParams can be used to hold a collection of the shader public params.
-//    Manipulate this collection, and use them during rendering by submit to the SRendParams.
-struct IShaderPublicParams
-{
-    // <interfuscator:shuffle>
-    virtual ~IShaderPublicParams(){}
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-
-    // Description:
-    //    Changes number of parameters in collection.
-    virtual void SetParamCount(int nParam) = 0;
-
-    // Description:
-    //    Retrieves number of parameters in collection.
-    virtual int  GetParamCount() const = 0;
-
-    // Description:
-    //    Retrieves shader public parameter at specified index of the collection.
-    virtual SShaderParam& GetParam(int nIndex) = 0;
-    virtual const SShaderParam& GetParam(int nIndex) const = 0;
-
-    // Description:
-    //    Retrieves shader public parameter at specified index of the collection.
-    virtual SShaderParam* GetParamByName(const char* pszName) = 0;
-    virtual const SShaderParam* GetParamByName(const char* pszName) const = 0;
-
-    virtual SShaderParam* GetParamBySemantic(uint8 eParamSemantic) = 0;
-    virtual const SShaderParam* GetParamBySemantic(uint8 eParamSemantic) const = 0;
-
-    // Description:
-    //    Sets a shader parameter (and if doesn't exists, add it to the parameters list).
-    virtual void SetParam(const char* pszName, UParamVal& pParam, EParamType nType = eType_FLOAT, uint8 eSemantic = 0) = 0;
-
-    // Description:
-    //    Assigns shader public parameter at specified index of the collection.
-    virtual void SetParam(int nIndex, const SShaderParam& param) = 0;
-
-    // Description:
-    //    Assigns existing shader parameters list.
-    virtual void SetShaderParams(const AZStd::vector<SShaderParam>& pParams) = 0;
-
-    // Description:
-    //    Adds a new shader public parameter at the end of the collection.
-    virtual void AddParam(const SShaderParam& param) = 0;
-
-    // Description:
-    //    Removes a shader public parameter
-    virtual void RemoveParamByName(const char* pszName) = 0;
-    virtual void RemoveParamBySemantic(uint8 eParamSemantic) = 0;
-
-    // Description:
-    //    Assigns collection of shader public parameters to the specified render params structure.
-    virtual void AssignToRenderParams(struct SRendParams& rParams) = 0;
-
-    virtual uint8 GetSemanticByName(const char* pszName) = 0;
-
-    // Description:
-    //    Gets shader parameters.
-    virtual AZStd::vector<SShaderParam>* GetShaderParams() = 0;
-    virtual const AZStd::vector<SShaderParam>* GetShaderParams() const = 0;
-    // </interfuscator:shuffle>
-};
-
-//=================================================================================
-
-class CInputLightMaterial
-{
-public:
-    CInputLightMaterial()
-        : m_Diffuse(0, 0, 0, 0)
-        , m_Specular(0, 0, 0, 0)
-        , m_Emittance(1, 1, 1, 0)
-        , m_Opacity(0)
-        , m_Smoothness(0)
-    {
-        // memset()
-        for (int i = 0; i < EFTT_MAX; i++)
-        {
-            m_Channels[i][0] = 0.0f,
-            m_Channels[i][1] = 1.0f;
-        }
-    }
-
-    // scale & bias
-    ColorF m_Channels[EFTT_MAX][2];
-
-    // TODO: these will go away
-    ColorF m_Diffuse;
-    ColorF m_Specular;
-    ColorF m_Emittance;  // RGB: Color, Alpha: Intensity (kcd/m2 or kilonits)
-    float m_Opacity;
-    float m_Smoothness;
-
-    inline friend bool operator == (const CInputLightMaterial& m1, const CInputLightMaterial& m2)
-    {
-        return !memcmp(&m1, &m2, CInputLightMaterial::Size());
-    }
-
-    inline static int Size()
-    {
-        int nSize = sizeof(CInputLightMaterial);
-        return nSize;
-    }
-};
-
-class CTexture;
-class CTexAnim;
-#include <ITexture.h>
-
-// Summary:
-//   Vertex modificators definitions (must be 16 bit flag).
-
-#define MDV_BENDING            0x100
-#define MDV_DET_BENDING        0x200
-#define MDV_DET_BENDING_GRASS  0x400
-#define MDV_WIND               0x800
-#define MDV_DEPTH_OFFSET       0x2000
-
-// Does the vertex shader require position-invariant compilation?
-// This would be true of shaders rendering multiple times with different vertex shaders - for example during zprepass and the gbuffer pass
-// Note this is different than the technique flag FHF_POSITION_INVARIANT as that does custom behavior for terrain
-#define MDV_POSITION_INVARIANT 0x4000
-
-// Summary:
-//   Deformations/Morphing types.
-enum EDeformType
-{
-    eDT_Unknown = 0,
-    eDT_SinWave = 1,
-    eDT_SinWaveUsingVtxColor = 2,
-    eDT_Bulge = 3,
-    eDT_Squeeze = 4,
-    eDT_Perlin2D = 5,
-    eDT_Perlin3D = 6,
-    eDT_FromCenter = 7,
-    eDT_Bending = 8,
-    eDT_ProcFlare = 9,
-    eDT_AutoSprite = 10,
-    eDT_Beam = 11,
-    eDT_FixedOffset = 12,
-};
-
-// Summary:
-//   Wave form evaluator flags.
-enum EWaveForm
-{
-    eWF_None,
-    eWF_Sin,
-    eWF_HalfSin,
-    eWF_InvHalfSin,
-    eWF_Square,
-    eWF_Triangle,
-    eWF_SawTooth,
-    eWF_InvSawTooth,
-    eWF_Hill,
-    eWF_InvHill,
-};
-
-#define WFF_CLAMP 1
-#define WFF_LERP  2
-
-// Summary:
-//   Wave form definition.
-struct SWaveForm
-{
-    EWaveForm m_eWFType;
-    byte m_Flags;
-
-    float m_Level;
-    float m_Level1;
-    float m_Amp;
-    float m_Amp1;
-    float m_Phase;
-    float m_Phase1;
-    float m_Freq;
-    float m_Freq1;
-
-    SWaveForm(EWaveForm eWFType, float fLevel, float fAmp, float fPhase, float fFreq)
-    {
-        m_eWFType = eWFType;
-        m_Level = m_Level1 = fLevel;
-        m_Amp = m_Amp1 = fAmp;
-        m_Phase = m_Phase1 = fPhase;
-        m_Freq = m_Freq1 = fFreq;
-    }
-
-    int Size()
-    {
-        int nSize = sizeof(SWaveForm);
-        return nSize;
-    }
-    SWaveForm()
-    {
-        memset(this, 0, sizeof(SWaveForm));
-    }
-    bool operator == (const SWaveForm& wf) const
-    {
-        if (m_eWFType == wf.m_eWFType && m_Level == wf.m_Level && m_Amp == wf.m_Amp && m_Phase == wf.m_Phase && m_Freq == wf.m_Freq && m_Level1 == wf.m_Level1 && m_Amp1 == wf.m_Amp1 && m_Phase1 == wf.m_Phase1 && m_Freq1 == wf.m_Freq1 && m_Flags == wf.m_Flags)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    SWaveForm& operator += (const SWaveForm& wf)
-    {
-        m_Level  += wf.m_Level;
-        m_Level1 += wf.m_Level1;
-        m_Amp  += wf.m_Amp;
-        m_Amp1 += wf.m_Amp1;
-        m_Phase  += wf.m_Phase;
-        m_Phase1 += wf.m_Phase1;
-        m_Freq  += wf.m_Freq;
-        m_Freq1 += wf.m_Freq1;
-        return *this;
-    }
-};
-
-struct SWaveForm2
-{
-    EWaveForm m_eWFType;
-
-    float m_Level;
-    float m_Amp;
-    float m_Phase;
-    float m_Freq;
-
-    SWaveForm2()
-    {
-        memset(this, 0, sizeof(SWaveForm2));
-    }
-    bool operator == (const SWaveForm2& wf) const
-    {
-        if (m_eWFType == wf.m_eWFType && m_Level == wf.m_Level && m_Amp == wf.m_Amp && m_Phase == wf.m_Phase && m_Freq == wf.m_Freq)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    SWaveForm2& operator += (const SWaveForm2& wf)
-    {
-        m_Level  += wf.m_Level;
-        m_Amp  += wf.m_Amp;
-        m_Phase  += wf.m_Phase;
-        m_Freq  += wf.m_Freq;
-        return *this;
-    }
-};
-
-struct SDeformInfo
-{
-    EDeformType m_eType;
-    SWaveForm2 m_WaveX;
-    float m_fDividerX;
-    Vec3 m_vNoiseScale;
-
-    SDeformInfo()
-    {
-        m_eType = eDT_Unknown;
-        m_fDividerX = 0.01f;
-        m_vNoiseScale = Vec3(1, 1, 1);
-    }
-
-    inline bool operator == (const SDeformInfo& m)
-    {
-        if (m_eType == m.m_eType &&
-            m_WaveX == m.m_WaveX &&
-            m_vNoiseScale == m.m_vNoiseScale &&
-            m_fDividerX == m.m_fDividerX)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    int Size()
-    {
-        return sizeof(SDeformInfo);
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->Add(*this);
-    }
-};
-
-//==============================================================================
-// CRenderObject
-
-//////////////////////////////////////////////////////////////////////
-// CRenderObject::m_ObjFlags: Flags used by shader pipeline
-
-enum ERenderObjectFlags
-{
-    FOB_VERTEX_VELOCITY             = BIT(0),
-    FOB_RENDER_TRANS_AFTER_DOF      = BIT(1),  //transparencies rendered after depth of field
-    //Unused                        = BIT(2),
-    FOB_RENDER_AFTER_POSTPROCESSING = BIT(3),
-    FOB_OWNER_GEOMETRY              = BIT(4),
-    FOB_MESH_SUBSET_INDICES         = BIT(5),
-    FOB_SELECTED                    = BIT(6),
-    FOB_RENDERER_IDENDITY_OBJECT    = BIT(7),
-    FOB_GLOBAL_ILLUMINATION         = BIT(8),
-    FOB_NO_FOG                      = BIT(9),
-    FOB_DECAL                       = BIT(10),
-    FOB_OCTAGONAL                   = BIT(11),
-    FOB_POINT_SPRITE                = BIT(13),
-    FOB_SOFT_PARTICLE               = BIT(14),
-    FOB_REQUIRES_RESOLVE            = BIT(15),
-    FOB_UPDATED_RTMASK              = BIT(16),
-    FOB_AFTER_WATER                 = BIT(17),
-    FOB_BENDED                      = BIT(18),
-    FOB_ZPREPASS                    = BIT(19),
-    FOB_PARTICLE_SHADOWS            = BIT(20),
-    FOB_DISSOLVE                    = BIT(21),
-    FOB_MOTION_BLUR                 = BIT(22),
-    FOB_NEAREST                     = BIT(23), // [Rendered in Camera Space]
-    FOB_SKINNED                     = BIT(24),
-    FOB_DISSOLVE_OUT                = BIT(25),
-    FOB_DYNAMIC_OBJECT              = BIT(26),
-    FOB_ALLOW_TESSELLATION          = BIT(27),
-    FOB_DECAL_TEXGEN_2D             = BIT(28),
-    FOB_IN_DOORS                    = BIT(29),
-    FOB_HAS_PREVMATRIX              = BIT(30),
-    FOB_LIGHTVOLUME                 = BIT(31),
-
-    FOB_DECAL_MASK =  (FOB_DECAL | FOB_DECAL_TEXGEN_2D),
-    FOB_PARTICLE_MASK = (FOB_SOFT_PARTICLE | FOB_NO_FOG | FOB_GLOBAL_ILLUMINATION | FOB_PARTICLE_SHADOWS | FOB_NEAREST | FOB_MOTION_BLUR | FOB_LIGHTVOLUME | FOB_ALLOW_TESSELLATION | FOB_IN_DOORS | FOB_AFTER_WATER),
-
-    // WARNING: FOB_MASK_AFFECTS_MERGING must start from 0x10000/bit 16 (important for instancing).
-    FOB_MASK_AFFECTS_MERGING_GEOM  = (FOB_ZPREPASS | FOB_SKINNED | FOB_BENDED | FOB_DYNAMIC_OBJECT | FOB_ALLOW_TESSELLATION | FOB_NEAREST),
-    FOB_MASK_AFFECTS_MERGING = (FOB_ZPREPASS | FOB_MOTION_BLUR | FOB_HAS_PREVMATRIX | FOB_SKINNED | FOB_BENDED | FOB_PARTICLE_SHADOWS | FOB_AFTER_WATER | FOB_DISSOLVE | FOB_DISSOLVE_OUT | FOB_NEAREST | FOB_DYNAMIC_OBJECT | FOB_ALLOW_TESSELLATION)
-};
-
-struct SSkyInfo
-{
-    ITexture* m_SkyBox[3];
-    float m_fSkyLayerHeight;
-
-    int Size()
-    {
-        int nSize = sizeof(SSkyInfo);
-        return nSize;
-    }
-    SSkyInfo()
-    {
-        memset(this, 0, sizeof(SSkyInfo));
-    }
-};
-
-struct SBending
-{
-    Vec2 m_vBending;
-    float m_fMainBendingScale;
-    SWaveForm2 m_Waves[2];
-
-    SBending()
-    {
-        m_vBending.zero();
-        m_fMainBendingScale = 1.f;
-    }
-
-    Vec4 GetShaderConstants(float realTime) const;
-    void GetShaderConstantsStatic(float realTime, Vec4* vBendInfo) const;
-};
-
-// Description:
-//   Interface for the skinnable objects (renderer calls its functions to get the skinning data).
-// should only created by EF_CreateSkinningData
-_MS_ALIGN(16) struct SSkinningData
-{
-    uint32                  nNumBones;
-    uint32                  nHWSkinningFlags;
-    DualQuat*               pBoneQuatsS;
-    Matrix34*               pBoneMatrices;
-    JointIdType*            pRemapTable;
-    AZ::LegacyJobExecutor*  pAsyncJobExecutor;
-    AZ::LegacyJobExecutor*  pAsyncDataJobExecutor;
-    SSkinningData*          pPreviousSkinningRenderData; // used for motion blur
-    uint32                  remapGUID;
-    void*                   pCharInstCB; // used if per char instance cbs are available in renderdll (d3d11+);
-    // members below are for Software Skinning
-    void*                   pCustomData; // client specific data, used for example for sw-skinning on animation side
-    SSkinningData*          pNextSkinningData;          // List to the next element which needs SW-Skinning
-} _ALIGN(16);
-
-struct SRenderObjData
-{
-    uintptr_t m_uniqueObjectId;
-
-    SSkinningData* m_pSkinningData;
-
-    float   m_fTempVars[10];                                    // Different useful vars (ObjVal component in shaders)
-
-    // using a pointer, the client code has to ensure that the data stays valid
-    const AZStd::vector<SShaderParam>* m_pShaderParams;
-
-    uint32  m_nHUDSilhouetteParams;
-
-    uint64 m_nSubObjHideMask;
-
-    union
-    {
-        SBending* m_pBending;
-    };
-
-    SBending* m_BendingPrev;
-
-    uint16  m_FogVolumeContribIdx[2];
-    
-    uint16  m_nLightID;
-    uint16  m_LightVolumeId;
-
-    uint8 m_screenBounds[4];
-
-    uint16  m_nCustomFlags;
-    uint8   m_nCustomData;
-
-    SRenderObjData()
-    {
-        Init();
-    }
-
-    void Init()
-    {
-        m_nSubObjHideMask = 0;
-        m_uniqueObjectId = 0;
-        m_nLightID = 0;
-        m_LightVolumeId = 0;
-        m_pSkinningData = NULL;
-        m_screenBounds[0] = m_screenBounds[1] = m_screenBounds[2] = m_screenBounds[3] = 0;
-        m_nCustomData = 0;
-        m_nCustomFlags = 0;
-        m_nHUDSilhouetteParams = 0;
-        m_pBending = nullptr;
-        m_BendingPrev = nullptr;
-        m_pShaderParams = nullptr;
-        m_FogVolumeContribIdx[0] = m_FogVolumeContribIdx[1] = static_cast<uint16>(-1);
-
-        // The following should be changed to be something like 0xac to indicate invalid data so that by default 
-        // data that was not set will break render features and will be traced (otherwise, default 0 just might pass)
-        memset(m_fTempVars, 0, 10 * sizeof(float));
-    }
-
-    void SetShaderParams(const AZStd::vector<SShaderParam>* pShaderParams)
-    {
-        m_pShaderParams = pShaderParams;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        AZ_UNUSED(pSizer);
-    }
-} _ALIGN(16);
-
-//////////////////////////////////////////////////////////////////////
-// Objects using in shader pipeline
-
-
-// Summary:
-//   Same as in the 3dEngine.
-#define MAX_LIGHTS_NUM 32
-
-struct ShadowMapFrustum;
-
-//////////////////////////////////////////////////////////////////////
-///
-/// Objects using in shader pipeline
-/// Single rendering item, that can be created from 3DEngine and persist across multiple frames
-/// It can be compiled into the platform specific efficient rendering compiled object.
-///
-//////////////////////////////////////////////////////////////////////
-_MS_ALIGN(16) class CRenderObject
-{
-public:
-    AZ_CLASS_ALLOCATOR(CRenderObject, AZ::LegacyAllocator, 0);
-
-    struct SInstanceInfo
-    {
-        Matrix34 m_Matrix;
-        ColorF m_AmbColor;
-    };
-
-    struct SInstanceData
-    {
-        Matrix34 m_MatInst;
-        Vec4 m_vBendInfo;
-        Vec4 m_vDissolveInfo;
-    };
-
-    struct PerInstanceConstantBufferKey
-    {
-        PerInstanceConstantBufferKey()
-            : m_Id{0xFFFF}
-            , m_IndirectId{0xFF}
-        {}
-
-        inline bool IsValid() const
-        {
-            return m_Id != 0xFFFF;
-        }
-
-        AZ::u16 m_Id;
-        AZ::u8  m_IndirectId;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    SInstanceInfo               m_II;                   //!< Per instance data
-
-    uint64                      m_ObjFlags;             //!< Combination of FOB_ flags.
-    uint32                      m_Id;
-
-    float                       m_fAlpha;               //!< Object alpha.
-    float                       m_fDistance;            //!< Distance to the object.
-
-    union
-    {
-        float                   m_fSort;                //!< Custom sort value.
-        uint16                  m_nSort;
-    };
-
-    uint64                      m_nRTMask;              //!< Shader runtime modification flags
-    uint16                      m_nMDV;                 //!< Vertex modifier flags for Shader.
-    uint16                      m_nRenderQuality;       //!< 65535 - full quality, 0 - lowest quality, used by CStatObj
-    int16                       m_nTextureID;           //!< Custom texture id.
-
-    union
-    {
-        uint8                   m_breakableGlassSubFragIndex;
-        uint8                   m_ParticleObjFlags;
-    };
-    uint8                       m_nClipVolumeStencilRef;  //!< Per instance vis area stencil reference ID
-    uint8                       m_DissolveRef;            //!< Dissolve value
-    uint8                       m_RState;                 //!< Render state used for object
-
-    bool                        m_NoDecalReceiver;
-
-    uint32                      m_nMaterialLayers;        //!< Which mtl layers active and how much to blend them
-
-    IRenderNode*                m_pRenderNode;            //!< Will define instance id.
-    _smart_ptr<IMaterial>       m_pCurrMaterial;          //!< Parent material used for render object.
-    IRenderElement*             m_pRE;                    //!< RenderElement used by this CRenderObject
-
-    PerInstanceConstantBufferKey m_PerInstanceConstantBufferKey;
-
-    //! Embedded SRenderObjData, optional data carried by CRenderObject
-    SRenderObjData             m_data;
-
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // Methods
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    /// Constructor
-    //////////////////////////////////////////////////////////////////////////
-    CRenderObject()
-        : m_Id(~0u)
-    {
-        Init();
-    }
-    ~CRenderObject() {};
-
-    //=========================================================================================================
-
-    inline Vec3 GetTranslation() const { return m_II.m_Matrix.GetTranslation(); }
-    inline float GetScaleX() const { return sqrt_tpl(m_II.m_Matrix(0, 0) * m_II.m_Matrix(0, 0) + m_II.m_Matrix(0, 1) * m_II.m_Matrix(0, 1) + m_II.m_Matrix(0, 2) * m_II.m_Matrix(0, 2)); }
-    inline float GetScaleZ() const { return sqrt_tpl(m_II.m_Matrix(2, 0) * m_II.m_Matrix(2, 0) + m_II.m_Matrix(2, 1) * m_II.m_Matrix(2, 1) + m_II.m_Matrix(2, 2) * m_II.m_Matrix(2, 2)); }
-
-    inline void Init()
-    {
-        m_ObjFlags = 0;
-        m_nRenderQuality = 65535;
-
-        m_RState = 0;
-        m_fDistance = 0.0f;
-
-        m_nClipVolumeStencilRef = 0;
-        m_nMaterialLayers = 0;
-        m_DissolveRef = 0;
-
-        m_nMDV = 0;
-        m_fSort = 0;
-
-        m_II.m_AmbColor = Col_White;
-        m_fAlpha = 1.0f;
-        m_nTextureID = -1;
-        m_pCurrMaterial = nullptr;
-        m_pRE = nullptr;
-        m_PerInstanceConstantBufferKey = {};
-
-        m_nRTMask = 0;
-        m_pRenderNode = NULL;
-
-        m_NoDecalReceiver = false;
-        m_data.Init();
-    }
-    void AssignId(uint32 id) { m_Id = id; }
-
-    ILINE Matrix34A& GetMatrix() { return m_II.m_Matrix; }
-
-    ILINE SRenderObjData* GetObjData()
-    {
-        return &m_data;
-    }
-
-    IRenderElement* GetRE() { return m_pRE; }
-    void SetRE(IRenderElement* re) { m_pRE = re; }
-
-protected:
-
-    // Disallow copy (potential bugs with PERMANENT objects)
-    // alwasy use IRendeer::EF_DuplicateRO if you want a copy
-    // of a CRenderObject
-    CRenderObject& operator= (CRenderObject& other) = default;
-
-    void CloneObject(CRenderObject* srcObj)
-    {
-        *this = *srcObj;
-    }
-
-    friend class CRenderer;
-} _ALIGN(16);
-
-enum EResClassName
-{
-    eRCN_Texture,
-    eRCN_Shader,
-};
-
-// className: CTexture, CHWShader_VS, CHWShader_PS, CShader
-struct SResourceAsync
-{
-    AZ_CLASS_ALLOCATOR(SResourceAsync, AZ::SystemAllocator, 0);
-    int nReady;          // 0: Not ready; 1: Ready; -1: Error
-    byte* pData;
-    EResClassName eClassName;     // Resource class name
-    char* Name;          // Resource name
-    union
-    {
-        // CTexture parameters
-        struct
-        {
-            int nWidth, nHeight, nMips, nTexFlags, nFormat, nTexId;
-        };
-        // CShader parameters
-        struct
-        {
-            int nShaderFlags;
-        };
-    };
-    void* pResource; // Pointer to created resource
-
-    SResourceAsync()
-    {
-        memset(this, 0, sizeof(SResourceAsync));
-    }
-
-    ~SResourceAsync()
-    {
-        delete Name;
-    }
-};
-
-#include "IRenderer.h"
-
-//==============================================================================
-
-// Summary:
-//   Color operations flags.
-enum EColorOp
-{
-    eCO_NOSET = 0,
-    eCO_DISABLE = 1,
-    eCO_REPLACE = 2,
-    eCO_DECAL = 3,
-    eCO_ARG2 = 4,
-    eCO_MODULATE = 5,
-    eCO_MODULATE2X = 6,
-    eCO_MODULATE4X = 7,
-    eCO_BLENDDIFFUSEALPHA = 8,
-    eCO_BLENDTEXTUREALPHA = 9,
-    eCO_DETAIL = 10,
-    eCO_ADD = 11,
-    eCO_ADDSIGNED = 12,
-    eCO_ADDSIGNED2X = 13,
-    eCO_MULTIPLYADD = 14,
-    eCO_BUMPENVMAP = 15,
-    eCO_BLEND = 16,
-    eCO_MODULATEALPHA_ADDCOLOR = 17,
-    eCO_MODULATECOLOR_ADDALPHA = 18,
-    eCO_MODULATEINVALPHA_ADDCOLOR = 19,
-    eCO_MODULATEINVCOLOR_ADDALPHA = 20,
-    eCO_DOTPRODUCT3 = 21,
-    eCO_LERP = 22,
-    eCO_SUBTRACT = 23,
-    eCO_MODULATE_METAL_FONT_SPECIAL_MODE = 24,
-};
-
-enum EColorArg
-{
-    eCA_Unknown,
-    eCA_Specular,
-    eCA_Texture,
-    eCA_Texture1,
-    eCA_Normal,
-    eCA_Diffuse,
-    eCA_Previous,
-    eCA_Constant,
-};
-
-#define DEF_TEXARG0 (eCA_Texture | (eCA_Diffuse << 3))
-#define DEF_TEXARG1 (eCA_Texture | (eCA_Previous << 3))
-
-enum ETexModRotateType
-{
-    ETMR_NoChange,
-    ETMR_Fixed,
-    ETMR_Constant,
-    ETMR_Oscillated,
-    ETMR_Max
-};
-
-enum ETexModMoveType
-{
-    ETMM_NoChange,
-    ETMM_Fixed,
-    ETMM_Constant,
-    ETMM_Jitter,
-    ETMM_Pan,
-    ETMM_Stretch,
-    ETMM_StretchRepeat,
-    ETMM_Max
-};
-
-enum ETexGenType
-{
-    ETG_Stream,
-    ETG_World,
-    ETG_Camera,
-    ETG_Max
-};
-
-#define CASE_TEXMOD(var_name)              \
-    if (!_stricmp(#var_name, szParamName)) \
-    {                                      \
-        var_name = fValue;                 \
-        return true;                       \
-    }                                      \
-
-#define CASE_TEXMODANGLE(var_name)         \
-    if (!_stricmp(#var_name, szParamName)) \
-    {                                      \
-        var_name = Degr2Word(fValue);      \
-        return true;                       \
-    }                                      \
-
-#define CASE_TEXMODBYTE(var_name)          \
-    if (!_stricmp(#var_name, szParamName)) \
-    {                                      \
-        var_name = (byte)fValue;           \
-        return true;                       \
-    }                                      \
-
-#define CASE_TEXMODBOOL(var_name)          \
-    if (!_stricmp(#var_name, szParamName)) \
-    {                                      \
-        var_name = (fValue == 1.f);        \
-        return true;                       \
-    }                                      \
-
-struct SEfTexModificator
-{
-    AZ_CLASS_ALLOCATOR(SEfTexModificator, AZ::SystemAllocator, 0);
-    bool SetMember(const char* szParamName, float fValue)
-    {
-        CASE_TEXMODBYTE(m_eTGType);
-        CASE_TEXMODBYTE(m_eRotType);
-        CASE_TEXMODBYTE(m_eMoveType[0]);
-        CASE_TEXMODBYTE(m_eMoveType[1]);
-        CASE_TEXMODBOOL(m_bTexGenProjected);
-
-        CASE_TEXMOD(m_Tiling[0]);
-        CASE_TEXMOD(m_Tiling[1]);
-        CASE_TEXMOD(m_Tiling[2]);
-        CASE_TEXMOD(m_Offs[0]);
-        CASE_TEXMOD(m_Offs[1]);
-        CASE_TEXMOD(m_Offs[2]);
-
-        CASE_TEXMODANGLE(m_Rot[0]);
-        CASE_TEXMODANGLE(m_Rot[1]);
-        CASE_TEXMODANGLE(m_Rot[2]);
-        CASE_TEXMODANGLE(m_RotOscRate[0]);
-        CASE_TEXMODANGLE(m_RotOscRate[1]);
-        CASE_TEXMODANGLE(m_RotOscRate[2]);
-        CASE_TEXMODANGLE(m_RotOscAmplitude[0]);
-        CASE_TEXMODANGLE(m_RotOscAmplitude[1]);
-        CASE_TEXMODANGLE(m_RotOscAmplitude[2]);
-        CASE_TEXMODANGLE(m_RotOscPhase[0]);
-        CASE_TEXMODANGLE(m_RotOscPhase[1]);
-        CASE_TEXMODANGLE(m_RotOscPhase[2]);
-        CASE_TEXMOD(m_RotOscCenter[0]);
-        CASE_TEXMOD(m_RotOscCenter[1]);
-        CASE_TEXMOD(m_RotOscCenter[2]);
-
-        CASE_TEXMOD(m_OscRate[0]);
-        CASE_TEXMOD(m_OscRate[1]);
-        CASE_TEXMOD(m_OscAmplitude[0]);
-        CASE_TEXMOD(m_OscAmplitude[1]);
-        CASE_TEXMOD(m_OscPhase[0]);
-        CASE_TEXMOD(m_OscPhase[1]);
-
-        return false;
-    }
-
-    _MS_ALIGN(16) Matrix44 m_TexGenMatrix _ALIGN(16);
-    _MS_ALIGN(16) Matrix44 m_TexMatrix _ALIGN(16);
-
-    float m_Tiling[3];
-    float m_Offs[3];
-
-    float m_RotOscCenter[3];
-
-    float m_OscRate[2];
-    float m_OscAmplitude[2];
-    float m_OscPhase[2];
-
-    // This members are used only during updating of the matrices
-    float m_LastTime[2];
-    float m_CurrentJitter[2];
-
-    uint16 m_RotOscPhase[3];
-    uint16 m_Rot[3];
-    uint16 m_RotOscRate[3];
-    uint16 m_RotOscAmplitude[3];
-
-    uint8 m_eTGType;
-    uint8 m_eRotType;
-    uint8 m_eMoveType[2];
-    bool m_bTexGenProjected;
-
-    void Reset()
-    {
-        memset(this, 0, sizeof(*this));
-        m_Tiling[0] = m_Tiling[1] = 1.0f;
-    }
-    inline SEfTexModificator()
-    {
-        Reset();
-    }
-    inline SEfTexModificator(const SEfTexModificator& m)
-    {
-        if (&m != this)
-        {
-            memcpy(this, &m, sizeof(*this));
-        }
-    }
-    SEfTexModificator& operator = (const SEfTexModificator& src)
-    {
-        if (&src != this)
-        {
-            this->~SEfTexModificator();
-            new(this)SEfTexModificator(src);
-        }
-        return *this;
-    }
-    int Size()
-    {
-        return sizeof(*this);
-    }
-
-    inline bool operator != (const SEfTexModificator& m)
-    {
-        return memcmp(this, &m, sizeof(*this)) != 0;
-    }
-
-    inline bool isModified()
-    {
-        return ( m_eMoveType[0] != ETMM_NoChange ||
-                 m_eMoveType[1] != ETMM_NoChange ||
-                 m_eRotType != ETMR_NoChange ||
-                 m_Offs[0] != 0.0f ||
-                 m_Offs[1] != 0.0f ||
-                 m_Tiling[0] != 1.0f ||
-                 m_Tiling[1] != 1.0f ||
-                 m_Rot[0] != 0.0f ||
-                 m_Rot[1] != 0.0f ||
-                 m_Rot[2] != 0.0f );
-    }
-};
-
-inline bool IsTextureModifierSupportedForTextureMap(EEfResTextures texture)
-{
-    // Custom uv modifiers are currently only supported for diffuse, detail, decal, 2nd diffuse, and emittance texture maps
-    if (texture == EFTT_DIFFUSE || texture == EFTT_DETAIL_OVERLAY || texture == EFTT_DECAL_OVERLAY || texture == EFTT_CUSTOM || texture == EFTT_EMITTANCE)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////
-#define FILTER_NONE      -1
-#define FILTER_POINT      0
-#define FILTER_LINEAR     1
-#define FILTER_BILINEAR   2
-#define FILTER_TRILINEAR  3
-#define FILTER_ANISO2X    4
-#define FILTER_ANISO4X    5
-#define FILTER_ANISO8X    6
-#define FILTER_ANISO16X   7
-
-//////////////////////////////////////////////////////////////////////
-#define TADDR_WRAP        0
-#define TADDR_CLAMP       1
-#define TADDR_MIRROR      2
-#define TADDR_BORDER      3
-
-//==============================================================================
-//------------------------------------------------------------------------------
-struct STexState
-{
-    struct
-    {
-        signed char m_nMinFilter : 8;
-        signed char m_nMagFilter : 8;
-        signed char m_nMipFilter : 8;
-        signed char m_nAddressU : 8;
-        signed char m_nAddressV : 8;
-        signed char m_nAddressW : 8;
-        signed char m_nAnisotropy : 8;
-        signed char padding : 8;
-    };
-    DWORD  m_dwBorderColor;
-    float m_MipBias;
-    void* m_pDeviceState;
-    bool m_bActive;
-    bool m_bComparison;
-    bool m_bSRGBLookup;
-    byte m_bPAD;
-    // NOTE: There are 4 more pad bytes that exist here because m_pDeviceState is a 64-bit pointer.
-    uint32 m_PadBytes;
-
-    STexState ()
-    {
-        // Make sure we clear everything, including "invisible" pad bytes.
-        memset(this, 0, sizeof(*this));
-    }
-    STexState(int nFilter, bool bClamp)
-    {
-        memset(this, 0, sizeof(*this));
-        int nAddress = bClamp ? TADDR_CLAMP : TADDR_WRAP;
-        SetFilterMode(nFilter);
-        SetClampMode(nAddress, nAddress, nAddress);
-        SetBorderColor(0);
-    }
-    STexState(int nFilter, int nAddressU, int nAddressV, int nAddressW, unsigned int borderColor)
-    {
-        memset(this, 0, sizeof(*this));
-        SetFilterMode(nFilter);
-        SetClampMode(nAddressU, nAddressV, nAddressW);
-        SetBorderColor(borderColor);
-    }
-
-    void Destroy();
-    void Init(const STexState& src);
-
-    ~STexState() { Destroy(); }
-    STexState(const STexState& src) { Init(src); }
-    STexState& operator = (const STexState& src)
-    {
-        this->~STexState();
-        new(this)STexState(src);
-        return *this;
-    }
-    _inline friend bool operator == (const STexState& m1, const STexState& m2)
-    {
-        return (*(uint64*)&m1 == *(uint64*)&m2 && m1.m_dwBorderColor == m2.m_dwBorderColor &&
-            m1.m_bActive == m2.m_bActive && m1.m_bComparison == m2.m_bComparison && m1.m_bSRGBLookup == m2.m_bSRGBLookup &&
-            m1.m_MipBias == m2.m_MipBias);
-    }
-    void Release()
-    {
-        delete this;
-    }
-
-    bool SetFilterMode(int nFilter);
-    bool SetClampMode(int nAddressU, int nAddressV, int nAddressW);
-    void SetBorderColor(DWORD dwColor);
-    void SetComparisonFilter(bool bEnable);
-    void PostCreate();
-};
-
-
-struct IRenderTarget
-{
-    virtual ~IRenderTarget(){}
-    virtual void Release() = 0;
-    virtual void AddRef() = 0;
-};
-
-//==============================================================================
-// FX shader texture sampler (description)
-//------------------------------------------------------------------------------
-struct STexSamplerFX
-{
-#if SHADER_REFLECT_TEXTURE_SLOTS
-    string      m_szUIName;
-    string      m_szUIDescription;
-#endif
-
-    string      m_szName;
-    string      m_szTexture;
-
-    union
-    {
-        struct SHRenderTarget*  m_pTarget;
-        IRenderTarget*          m_pITarget;
-    };
-
-    int16       m_nTexState;
-    byte        m_eTexType;                    // ETEX_Type e.g. eTT_2D or eTT_Cube
-    byte        m_nSlotId;             // EFTT_ index if it references one of the material texture slots, EFTT_MAX otherwise
-    uint32      m_nTexFlags;
-
-    STexSamplerFX()
-    {
-        m_nTexState = -1;
-        m_eTexType = eTT_2D;
-        m_nSlotId = EFTT_MAX;
-        m_nTexFlags = 0;
-        m_pTarget = NULL;
-    }
-
-    ~STexSamplerFX()
-    {
-        SAFE_RELEASE(m_pITarget);
-    }
-
-    int Size()
-    {
-        int nSize = sizeof(*this);
-        nSize += m_szName.capacity();
-        nSize += m_szTexture.capacity();
-#if SHADER_REFLECT_TEXTURE_SLOTS
-        nSize += m_szUIName.capacity();
-        nSize += m_szUIDescription.capacity();
-#endif
-        return nSize;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
-    {
-    }
-
-    uint32 GetTexFlags() { return m_nTexFlags; }
-    void Update();
-    void PostLoad();
-    NO_INLINE STexSamplerFX (const STexSamplerFX& src)
-    {
-        m_pITarget = src.m_pITarget;
-        if (m_pITarget)
-        {
-            m_pITarget->AddRef();
-        }
-        m_szName = src.m_szName;
-        m_szTexture = src.m_szTexture;
-        m_nSlotId = src.m_nSlotId;
-        m_eTexType = src.m_eTexType;
-        m_nTexFlags = src.m_nTexFlags;
-        m_nTexState = src.m_nTexState;
-
-#if SHADER_REFLECT_TEXTURE_SLOTS
-        m_szUIName = src.m_szUIName;
-        m_szUIDescription = src.m_szUIDescription;
-#endif
-    }
-    NO_INLINE STexSamplerFX& operator = (const STexSamplerFX& src)
-    {
-        this->~STexSamplerFX();
-        new(this)STexSamplerFX(src);
-        return *this;
-    }
-    _inline friend bool operator != (const STexSamplerFX& m1, const STexSamplerFX& m2)
-    {
-        if (m1.m_szTexture != m2.m_szTexture || m1.m_eTexType != m2.m_eTexType || m1.m_nTexFlags != m2.m_nTexFlags)
-        {
-            return true;
-        }
-        return false;
-    }
-    _inline bool operator == (const STexSamplerFX& m1)
-    {
-        return !(*this != m1);
-    }
-
-    bool Export(SShaderSerializeContext& SC);
-    bool Import(SShaderSerializeContext& SC, SSTexSamplerFX* pTS);
-};
-
-
-//==============================================================================
-// Resource texture sampler (runtime)
-//------------------------------------------------------------------------------
-struct STexSamplerRT
-{
-    union
-    {
-        CTexture* m_pTex;
-        ITexture* m_pITex;
-    };
-
-    union
-    {
-        struct SHRenderTarget* m_pTarget;
-        IRenderTarget* m_pITarget;
-    };
-
-    union
-    {
-        CTexAnim* m_pAnimInfo;
-        ITexAnim* m_pIAnimInfo;
-    };
-    
-    uint32      m_nTexFlags;
-    int16       m_nTexState;
-
-    uint8       m_eTexType;                       // ETEX_Type e.g. eTT_2D or eTT_Cube
-    int8        m_nSamplerSlot;
-    int8        m_nTextureSlot;
-
-    bool        m_bGlobal;
-
-    STexSamplerRT()
-    {
-        m_nTexState = -1;
-        m_pTex = NULL;
-        m_eTexType = eTT_2D;
-        m_nTexFlags = 0;
-        m_pTarget = NULL;
-        m_pAnimInfo = NULL;
-        m_nSamplerSlot = -1;
-        m_nTextureSlot = -1;
-        m_bGlobal = false;
-    }
-    ~STexSamplerRT()
-    {
-        Cleanup();
-    }
-
-    void Cleanup()
-    {
-        SAFE_RELEASE(m_pITex);
-        // TODO: ref counted deleting of m_pAnimInfo & m_pTarget! - CW
-        SAFE_RELEASE(m_pITarget);
-        SAFE_RELEASE(m_pIAnimInfo);
-    }
-    int Size() const
-    {
-        int nSize = sizeof(*this);
-        return nSize;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
-    {
-    }
-
-    uint32 GetTexFlags() const { return m_nTexFlags; }
-    void Update();
-    void PostLoad();
-
-    NO_INLINE STexSamplerRT (const STexSamplerRT& src)
-    {
-        m_pITex = src.m_pITex;
-        if (m_pITex)
-        {
-            m_pITex->AddRef();
-        }
-        m_pITarget = src.m_pITarget;
-        if (m_pITarget)
-        {
-            m_pITarget->AddRef();
-        }
-        m_pIAnimInfo = src.m_pIAnimInfo;
-        if (m_pIAnimInfo)
-        {
-            m_pIAnimInfo->AddRef();
-        }
-        m_eTexType = src.m_eTexType;
-        m_nTexFlags = src.m_nTexFlags;
-        m_nTexState = src.m_nTexState;
-        m_nSamplerSlot = src.m_nSamplerSlot;
-        m_nTextureSlot = src.m_nTextureSlot;
-        m_bGlobal = src.m_bGlobal;
-    }
-    NO_INLINE STexSamplerRT& operator = (const STexSamplerRT& src)
-    {
-        this->~STexSamplerRT();
-        new(this)STexSamplerRT(src);
-        return *this;
-    }
-    STexSamplerRT (const STexSamplerFX& src)
-    {
-        m_pITex = NULL;
-        m_pAnimInfo = NULL;
-        m_pITarget = src.m_pITarget;
-        if (m_pITarget)
-        {
-            m_pITarget->AddRef();
-        }
-        m_eTexType = src.m_eTexType;
-        m_nTexFlags = src.m_nTexFlags;
-        m_nTexState = src.m_nTexState;
-        m_nSamplerSlot = -1;
-        m_nTextureSlot = -1;
-        m_bGlobal = (src.m_nTexFlags & FT_FROMIMAGE) != 0;
-    }
-    inline bool operator != (const STexSamplerRT& m) const
-    {
-        if (m_pTex != m.m_pTex || m_eTexType != m.m_eTexType || m_nTexFlags != m.m_nTexFlags || m_nTexState != m.m_nTexState)
-        {
-            return true;
-        }
-        return false;
-    }
-};
-
-//==============================================================================
-//------------------------------------------------------------------------------
-struct SEfResTextureExt
-{
-    int32 m_nFrameUpdated;
-    int32 m_nUpdateFlags;
-    int32 m_nLastRecursionLevel;
-    SEfTexModificator* m_pTexModifier;
-
-    SEfResTextureExt ()
-    {
-        m_nFrameUpdated = -1;
-        m_nUpdateFlags = 0;
-        m_nLastRecursionLevel = 0;
-        m_pTexModifier = nullptr;
-    }
-    ~SEfResTextureExt ()
-    {
-        Cleanup();
-    }
-    void Cleanup()
-    {
-        SAFE_DELETE(m_pTexModifier);
-    }
-    inline bool operator != (const SEfResTextureExt& m) const
-    {
-        if (m_pTexModifier && m.m_pTexModifier)
-        {
-            return *m_pTexModifier != *m.m_pTexModifier;
-        }
-        if (!m_pTexModifier && !m.m_pTexModifier)
-        {
-            return false;
-        }
-        return true;
-    }
-    SEfResTextureExt(const SEfResTextureExt& src)
-    {
-        if (&src != this)
-        {
-            Cleanup();
-            if (src.m_pTexModifier)
-            {
-                m_pTexModifier = new SEfTexModificator;
-                * m_pTexModifier = *src.m_pTexModifier;
-            }
-            m_nFrameUpdated = -1;
-            m_nUpdateFlags = src.m_nUpdateFlags;
-            m_nLastRecursionLevel = -1;
-        }
-    }
-    SEfResTextureExt& operator = (const SEfResTextureExt& src)
-    {
-        if (&src != this)
-        {
-            Cleanup();
-            new(this)SEfResTextureExt(src);
-        }
-        return *this;
-    }
-
-    void CopyTo(SEfResTextureExt* pTo) const
-    {
-        if (pTo && pTo != this)
-        {
-            pTo->Cleanup();
-            pTo->m_nFrameUpdated = -1;
-            pTo->m_nUpdateFlags = m_nUpdateFlags;
-            pTo->m_nLastRecursionLevel = -1;
-            pTo->m_pTexModifier = nullptr;
-            if (m_pTexModifier)
-            {
-                pTo->m_pTexModifier = new SEfTexModificator;
-                *(pTo->m_pTexModifier) = *m_pTexModifier;
-            }
-        }
-    }
-    inline int Size() const
-    {
-        int nSize = sizeof(SEfResTextureExt);
-        if (m_pTexModifier)
-        {
-            nSize += m_pTexModifier->Size();
-        }
-        return nSize;
-    }
-};
-
-//==============================================================================
-// SEfResTexture - holds the actual data representing a texture and its associated 
-// sampler and modulator properties.
-//------------------------------------------------------------------------------
-struct SEfResTexture
-{
-    string              m_Name;
-    bool                m_bUTile;
-    bool                m_bVTile;
-    signed char         m_Filter;
-
-    STexSamplerRT       m_Sampler;
-    SEfResTextureExt    m_Ext;
-
-    void UpdateForCreate(int nTSlot);
-    void Update(int nTSlot);
-    void UpdateWithModifier(int nTSlot);
-
-    inline bool operator != (const SEfResTexture& m) const
-    {
-        if (_stricmp(m_Name.c_str(), m.m_Name.c_str()) != 0 ||
-            m_bUTile != m.m_bUTile ||
-            m_bVTile != m.m_bVTile ||
-            m_Filter != m.m_Filter ||
-            m_Ext != m.m_Ext ||
-            m_Sampler != m.m_Sampler)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    inline bool IsHasModificators() const
-    {
-        return (m_Ext.m_pTexModifier != NULL);
-    }
-
-    //! Find out if the texture has modulator and if it requires per frame computation change
-    bool IsNeedTexTransform() const
-    {
-        if (!m_Ext.m_pTexModifier)
-        {
-            return false;
-        }
-        if (m_Ext.m_pTexModifier->m_eRotType != ETMR_NoChange || m_Ext.m_pTexModifier->m_eMoveType[0] != ETMM_NoChange || m_Ext.m_pTexModifier->m_eMoveType[1] != ETMM_NoChange)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    bool IsNeedTexGen() const
-    {
-        if (!m_Ext.m_pTexModifier)
-        {
-            return false;
-        }
-        if (m_Ext.m_pTexModifier->m_eTGType != ETG_Stream)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    inline float GetTiling(int n) const
-    {
-        if (!m_Ext.m_pTexModifier)
-        {
-            return 1.0f;
-        }
-        return m_Ext.m_pTexModifier->m_Tiling[n];
-    }
-
-    inline float GetOffset(int n) const
-    {
-        if (!m_Ext.m_pTexModifier)
-        {
-            return 0;
-        }
-        return m_Ext.m_pTexModifier->m_Offs[n];
-    }
-
-    inline SEfTexModificator* AddModificator()
-    {
-        if (!m_Ext.m_pTexModifier)
-        {
-            m_Ext.m_pTexModifier = new SEfTexModificator;
-        }
-        return m_Ext.m_pTexModifier;
-    }
-
-    inline SEfTexModificator* GetModificator() const
-    {
-        if (!m_Ext.m_pTexModifier)
-        {
-            static SEfTexModificator dummy;
-            dummy.Reset();
-            return &dummy;
-        }
-
-        return m_Ext.m_pTexModifier;
-    }
-
-    int Size() const
-    {
-        int nSize = sizeof(SEfResTexture) - sizeof(STexSamplerRT) - sizeof(SEfResTextureExt);
-        nSize += m_Name.size();
-        nSize += m_Sampler.Size();
-        nSize += m_Ext.Size();
-
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->Add(*this);
-        pSizer->AddObject(m_Name);
-        pSizer->AddObject(m_Sampler);
-    }
-
-    void Cleanup()
-    {
-        m_Sampler.Cleanup();
-        m_Ext.Cleanup();
-    }
-
-    ~SEfResTexture()
-    {
-        Cleanup();
-    }
-
-    void Reset()
-    {
-        m_bUTile = true;
-        m_bVTile = true;
-        m_Filter = FILTER_NONE;
-        SAFE_DELETE(m_Ext.m_pTexModifier);
-        m_Ext.m_nFrameUpdated = -1;
-    }
-
-    SEfResTexture (const SEfResTexture& src)
-    {
-        if (&src != this)
-        {
-            Cleanup();
-            m_Sampler = src.m_Sampler;
-            m_Ext = src.m_Ext;
-            m_Name = src.m_Name;
-            m_bUTile = src.m_bUTile;
-            m_bVTile = src.m_bVTile;
-            m_Filter = src.m_Filter;
-        }
-    }
-
-    SEfResTexture& operator = (const SEfResTexture& src)
-    {
-        if (&src != this)
-        {
-            Cleanup();
-            new(this)SEfResTexture(src);
-        }
-        return *this;
-    }
-    void CopyTo(SEfResTexture* pTo) const
-    {
-        if (pTo && (pTo != this))
-        {
-            pTo->Cleanup();
-            pTo->m_Sampler = m_Sampler;
-            m_Ext.CopyTo(&pTo->m_Ext);
-            pTo->m_Name = m_Name;
-            pTo->m_bUTile = m_bUTile;
-            pTo->m_bVTile = m_bVTile;
-            pTo->m_Filter = m_Filter;
-        }
-    }
-
-    SEfResTexture()
-    {
-        Reset();
-    }
-};
-
-//==============================================================================
-//------------------------------------------------------------------------------
-struct SBaseShaderResources
-{
-    AZStd::vector<SShaderParam>  m_ShaderParams;
-    string                  m_TexturePath;
-    const char*             m_szMaterialName;
-
-    float                   m_AlphaRef;
-    uint32                  m_ResFlags;
-
-    uint16                  m_SortPrio;
-
-    uint8                   m_VoxelCoverage;
-
-    int Size() const
-    {
-        int nSize = sizeof(SBaseShaderResources) + m_ShaderParams.size() * sizeof(SShaderParam);
-        return nSize;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_ShaderParams);
-    }
-
-    SBaseShaderResources& operator=(const SBaseShaderResources& src)
-    {
-        if (&src != this)
-        {
-            ReleaseParams();
-            m_szMaterialName = src.m_szMaterialName;
-            m_ResFlags = src.m_ResFlags;
-            m_AlphaRef = src.m_AlphaRef;
-            m_VoxelCoverage = src.m_VoxelCoverage;
-            m_SortPrio = src.m_SortPrio;
-            m_ShaderParams = src.m_ShaderParams;
-        }
-        return *this;
-    }
-
-    SBaseShaderResources()
-    {
-        m_ResFlags = 0;
-        m_AlphaRef = 0;
-        m_VoxelCoverage = 255;
-        m_SortPrio = 0;
-        m_szMaterialName = NULL;
-    }
-
-    void ReleaseParams()
-    {
-        m_ShaderParams.clear();
-    }
-
-    virtual ~SBaseShaderResources()
-    {
-        ReleaseParams();
-    }
-};
-
-//------------------------------------------------------------------------------
-typedef uint16                                                          ResourceSlotIndex;
-typedef AZStd::unordered_map<ResourceSlotIndex, SEfResTexture>          TexturesResourcesMap;
-typedef AZStd::unordered_map<ResourceSlotIndex, SShaderTextureSlot*>    TexturesSlotsUsageMap;
-//------------------------------------------------------------------------------
-
-struct IRenderShaderResources
-{
-    // <interfuscator:shuffle>
-    virtual void AddRef() = 0;
-    virtual void UpdateConstants(IShader* pSH) = 0;
-    virtual void CloneConstants(const IRenderShaderResources* pSrc) = 0;
-    virtual bool HasLMConstants() const = 0;
-
-    // properties
-    virtual void ToInputLM(CInputLightMaterial& lm) = 0;
-    virtual void SetInputLM(const CInputLightMaterial& lm) = 0;
-
-    virtual ColorF GetColorValue(EEfResTextures slot) const = 0;
-    virtual void SetColorValue(EEfResTextures slot, const ColorF& color) = 0;
-
-    virtual float GetStrengthValue(EEfResTextures slot) const = 0;
-    virtual void SetStrengthValue(EEfResTextures slot, float value) = 0;
-
-    // configs
-    virtual const float& GetAlphaRef() const = 0;
-    virtual void SetAlphaRef(float v) = 0;
-
-    virtual int GetResFlags() = 0;
-    virtual void SetMtlLayerNoDrawFlags(uint8 nFlags) = 0;
-    virtual uint8 GetMtlLayerNoDrawFlags() const = 0;
-    virtual SSkyInfo* GetSkyInfo() = 0;
-    virtual void SetMaterialName(const char* szName) = 0;
-
-    virtual bool TextureSlotExists(ResourceSlotIndex slotId) const = 0;
-    virtual SEfResTexture* GetTextureResource(ResourceSlotIndex slotId) = 0;
-    virtual TexturesResourcesMap* GetTexturesResourceMap() = 0;
-    virtual AZStd::vector<SShaderParam>& GetParameters() = 0;
-
-    virtual ColorF GetFinalEmittance() = 0;
-    virtual float GetVoxelCoverage() = 0;
-
-    virtual ~IRenderShaderResources() {}
-    virtual void Release() = 0;
-    virtual void ConvertToInputResource(struct SInputShaderResources* pDst) = 0;
-    virtual IRenderShaderResources* Clone() const = 0;
-    virtual void SetShaderParams(struct SInputShaderResources* pDst, IShader* pSH) = 0;
-
-    virtual size_t GetResourceMemoryUsage(ICrySizer*    pSizer) = 0;
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-    // </interfuscator:shuffle>
-
-    inline bool IsEmissive() const
-    {
-        // worst: *reinterpret_cast<int32*>(&) > 0x00000000
-        // causes value to pass from FPU to CPU registers
-        return GetStrengthValue(EFTT_EMITTANCE) > 0.0f;
-    }
-    inline bool IsTransparent() const
-    {
-        // worst: *reinterpret_cast<int32*>(&) < 0x3f800000
-        // causes value to pass from FPU to CPU registers
-        return GetStrengthValue(EFTT_OPACITY) < 1.0f;
-    }
-    inline bool IsAlphaTested() const
-    {
-        return GetAlphaRef() > 0.0f;
-    }
-    inline bool IsInvisible() const
-    {
-        const float o = GetStrengthValue(EFTT_OPACITY);
-        const float a = GetAlphaRef();
-
-        return o == 0.0f || a == 1.0f || o <= a;
-    }
-};
-
-
-struct SInputShaderResources
-    : public SBaseShaderResources
-{
-    CInputLightMaterial                 m_LMaterial;
-    TexturesResourcesMap                m_TexturesResourcesMap;      // a map of all textures resources used by the shader by name
-    SDeformInfo                         m_DeformInfo;
-
-    int Size() const
-    {
-        int nSize = SBaseShaderResources::Size();// -sizeof(SEfResTexture) * m_TexturesResourcesMap.size();
-        nSize += m_TexturePath.size();
-        nSize += sizeof(SDeformInfo);
-
-        for (auto& iter : m_TexturesResourcesMap)
-        {
-            nSize += iter.second.Size();
-        }
-        return nSize;
-    }
-
-    SInputShaderResources& operator=(const SInputShaderResources& src)
-    {
-        if (&src != this)
-        {
-            Cleanup();  // this will also remove all texture slots
-            SBaseShaderResources::operator = (src);
-            m_TexturePath = src.m_TexturePath;
-            m_DeformInfo = src.m_DeformInfo;
-            m_TexturesResourcesMap = src.m_TexturesResourcesMap;
-            m_LMaterial = src.m_LMaterial;
-        }
-        return *this;
-    }
-
-    SInputShaderResources()    {}
-    SInputShaderResources(struct IRenderShaderResources* pSrc)
-    {
-        pSrc->ConvertToInputResource(this);
-        m_ShaderParams = pSrc->GetParameters();
-    }
-
-    void Cleanup()
-    {
-        m_TexturesResourcesMap.clear();
-    }
-
-    virtual ~SInputShaderResources()
-    {
-        Cleanup();
-    }
-
-    bool IsEmpty(ResourceSlotIndex nTSlot) const
-    {
-        auto    iter = m_TexturesResourcesMap.find(nTSlot);
-        return (iter != m_TexturesResourcesMap.end()) ? iter->second.m_Name.empty() : true;
-    }
-
-    SEfResTexture* GetTextureResource(ResourceSlotIndex slotId)
-    {
-        auto    iter = m_TexturesResourcesMap.find(slotId);
-        return (iter != m_TexturesResourcesMap.end()) ? &iter->second : nullptr;
-    }
-
-    inline TexturesResourcesMap* GetTexturesResourceMap()
-    {
-        return &m_TexturesResourcesMap;
-    }
-};
-
-//===================================================================================
-// Shader gen structure (used for automatic shader script generating).
-
-//
-#define SHGF_HIDDEN   1
-#define SHGF_PRECACHE 2
-#define SHGF_AUTO_PRECACHE 4
-#define SHGF_LOWSPEC_AUTO_PRECACHE 8
-#define SHGF_RUNTIME 0x10
-
-#define SHGD_LM_DIFFUSE             0x1
-#define SHGD_TEX_DETAIL             0x2
-#define SHGD_TEX_NORMALS            0x4
-#define SHGD_TEX_ENVCM              0x8
-#define SHGD_TEX_SPECULAR           0x10
-#define SHGD_TEX_SECOND_SMOOTHNESS  0x20
-#define SHGD_TEX_HEIGHT             0x40
-#define SHGD_TEX_SUBSURFACE         0x80
-#define SHGD_HW_BILINEARFP16        0x100
-#define SHGD_HW_SEPARATEFP16        0x200
-#define SHGD_HW_ORBIS               0x800
-#define SHGD_TEX_CUSTOM             0x1000
-#define SHGD_TEX_CUSTOM_SECONDARY   0x2000
-#define SHGD_TEX_DECAL              0x4000
-#define SHGD_TEX_OCC                0x8000
-#define SHGD_TEX_SPECULAR_2         0x10000
-#define SHGD_HW_GLES3               0x20000
-#define SHGD_USER_ENABLED           0x40000
-#define SHGD_HW_SAA                 0x80000
-#define SHGD_TEX_EMITTANCE          0x100000
-#define SHGD_HW_DX10                0x200000
-#define SHGD_HW_DX11                0x400000
-#define SHGD_HW_GL4                 0x800000
-#define SHGD_HW_WATER_TESSELLATION  0x1000000
-#define SHGD_HW_SILHOUETTE_POM      0x2000000
-// Confetti Nicholas Baldwin: adding metal shader language support
-#define SHGD_HW_METAL               0x4000000
-#define SHGD_TEX_MASK       (   SHGD_TEX_DETAIL | SHGD_TEX_NORMALS | SHGD_TEX_ENVCM | SHGD_TEX_SPECULAR | SHGD_TEX_SECOND_SMOOTHNESS | \
-                                SHGD_TEX_HEIGHT | SHGD_TEX_SUBSURFACE | SHGD_TEX_CUSTOM | SHGD_TEX_CUSTOM_SECONDARY | SHGD_TEX_DECAL | \
-                                SHGD_TEX_OCC | SHGD_TEX_SPECULAR_2 | SHGD_TEX_EMITTANCE)
-
-
-//------------------------------------------------------------------------------
-// Texture slot descriptor for shader 
-//------------------------------------------------------------------------------
-struct SShaderTextureSlot
-{
-    SShaderTextureSlot()
-    {
-        m_TexType = eTT_MaxTexType;
-    }
-
-    string  m_Name;
-    string  m_Description;
-    byte    m_TexType;      // 2D, 3D, Cube etc..
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_Name);
-        pSizer->AddObject(m_Description);
-        pSizer->AddObject(m_TexType);
-    }
-};
-
-//------------------------------------------------------------------------------
-// Shader's used texture slots
-//------------------------------------------------------------------------------
-/* [Shader System] - To Do: bring that back to life after testing
-struct SShaderTexSlots
-{
-    uint32                      m_nRefCount;
-    TexturesSlotsUsageMap       m_UsedTextureSlots;
-
-    SShaderTexSlots()
-    {
-        m_nRefCount = 1;
-    }
-
-    ~SShaderTexSlots()
-    {
-        for (auto& iter : m_UsedTextureSlots )
-        {
-            SAFE_DELETE( iter.second );
-        }
-        m_UsedTextureSlots.clear();
-    }
-    void Release()
-    {
-        m_nRefCount--;
-        if (!m_nRefCount)
-        {
-            delete this;
-        }
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_UsedTextureSlots);
-    }
-
-    SShaderTextureSlot* GetUsedTextureSlot(uint16 slotId)
-    {
-        auto    iter = m_UsedTextureSlots.find(slotId);
-        return (iter != m_UsedTextureSlots.end()) ? iter->second : nullptr;
-    }
-};
-*/
-
-// [Shader System] - To Do: replace this with the code above after testing
-struct SShaderTexSlots
-{
-    uint32 m_nRefCount;
-    SShaderTextureSlot* m_UsedTextureSlots[EFTT_MAX];
-    SShaderTexSlots()
-    {
-        m_nRefCount = 1;
-        memset(m_UsedTextureSlots, 0, sizeof(m_UsedTextureSlots));
-    }
-    ~SShaderTexSlots()
-    {
-        uint32 i;
-        for (i = 0; i < EFTT_MAX; i++)
-        {
-            SShaderTextureSlot* pSlot = m_UsedTextureSlots[i];
-            SAFE_DELETE(pSlot);
-        }
-    }
-    void Release()
-    {
-        m_nRefCount--;
-        if (!m_nRefCount)
-        {
-            delete this;
-        }
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_UsedTextureSlots);
-    }
-};
-
-//===================================================================================
-
-enum EShaderType
-{
-    eST_All = -1,           // To set all with one call.
-
-    eST_General = 0,
-    eST_Metal,
-    eST_Glass,
-    eST_Ice,
-    eST_Shadow,
-    eST_Water,
-    eST_FX,
-    eST_PostProcess,
-    eST_HDR,
-    eST_Sky,
-    eST_Compute,
-    eST_Max                     // To define array size.
-};
-
-enum EShaderDrawType
-{
-    eSHDT_General,
-    eSHDT_Light,
-    eSHDT_Shadow,
-    eSHDT_Terrain,
-    eSHDT_Overlay,
-    eSHDT_OceanShore,
-    eSHDT_Fur,
-    eSHDT_NoDraw,
-    eSHDT_CustomDraw,
-    eSHDT_Sky,
-    eSHDT_Volume
-};
-
-enum EShaderQuality
-{
-    eSQ_Low = 0,
-    eSQ_Medium = 1,
-    eSQ_High = 2,
-    eSQ_VeryHigh = 3,
-    eSQ_Max = 4
-};
-
-enum ERenderQuality
-{
-    eRQ_Low = 0,
-    eRQ_Medium = 1,
-    eRQ_High = 2,
-    eRQ_VeryHigh = 3,
-    eRQ_Max = 4
-};
-
-// Summary:
-//   Shader profile flags .
-#define SPF_LOADNORMALALPHA     0x1
-
-struct SShaderProfile
-{
-    SShaderProfile()
-        : m_iShaderProfileQuality(eSQ_High)
-        , m_nShaderProfileFlags(SPF_LOADNORMALALPHA)
-    {
-    }
-
-    EShaderQuality GetShaderQuality() const
-    {
-        return (EShaderQuality)CLAMP(m_iShaderProfileQuality, 0, eSQ_VeryHigh);
-    }
-
-    void SetShaderQuality(const EShaderQuality& rValue)
-    {
-        m_iShaderProfileQuality = (int)rValue;
-    }
-
-    // ----------------------------------------------------------------
-
-    int                                   m_iShaderProfileQuality;      // EShaderQuality e.g. eSQ_Medium, use Get/Set functions if possible
-    uint32                            m_nShaderProfileFlags;        // SPF_...
-};
-
-//====================================================================================
-// Phys. material flags
-
-#define MATF_NOCLIP 1
-
-//====================================================================================
-// Registered shader techniques ID's
-
-enum EShaderTechniqueID
-{
-    TTYPE_GENERAL = -1,
-    TTYPE_Z = 0,
-    TTYPE_SHADOWGEN,
-    TTYPE_GLOWPASS,
-    TTYPE_MOTIONBLURPASS,
-    TTYPE_CUSTOMRENDERPASS,
-    TTYPE_EFFECTLAYER,
-    TTYPE_SOFTALPHATESTPASS,
-    TTYPE_WATERREFLPASS,
-    TTYPE_WATERCAUSTICPASS,
-    TTYPE_ZPREPASS,
-    TTYPE_PARTICLESTHICKNESSPASS,
-
-    // PC specific techniques must go after this point, to support shader serializing
-    // TTYPE_CONSOLE_MAX must equal TTYPE_MAX for console
-    TTYPE_CONSOLE_MAX,
-    TTYPE_DEBUG = TTYPE_CONSOLE_MAX,
-
-    TTYPE_MAX
-};
-
-//====================================================================================
-
-// EFSLIST_ lists
-// Note - declaration order/index value has no explicit meaning.
-
-enum ERenderListID
-{
-    EFSLIST_INVALID = 0,                         // Don't use, internally used.
-    EFSLIST_PREPROCESS,                        // Pre-process items.
-    EFSLIST_GENERAL,                                 // Opaque ambient_light+shadow passes.
-    EFSLIST_SHADOW_GEN,                        // Shadow map generation.
-    EFSLIST_DECAL,                                   // Opaque or transparent decals.
-    EFSLIST_WATER_VOLUMES,                   // After decals.
-    EFSLIST_TRANSP,                                // Sorted by distance under-water render items.
-    EFSLIST_WATER,                                   // Water-ocean render items.
-    EFSLIST_HDRPOSTPROCESS,                // Hdr post-processing screen effects.
-    EFSLIST_AFTER_HDRPOSTPROCESS,      // After hdr post-processing screen effects.
-    EFSLIST_POSTPROCESS,                         // Post-processing screen effects.
-    EFSLIST_AFTER_POSTPROCESS,           // After post-processing screen effects.
-    EFSLIST_SHADOW_PASS,                         // Shadow mask generation (usually from from shadow maps).
-    EFSLIST_DEFERRED_PREPROCESS,         // Pre-process before deferred passes.
-    EFSLIST_SKIN,                                        // Skin rendering pre-process
-    EFSLIST_HALFRES_PARTICLES,           // Half resolution particles
-    EFSLIST_PARTICLES_THICKNESS,         // Particles thickness passes
-    EFSLIST_LENSOPTICS,                          // Lens-optics processing
-    EFSLIST_VOXELIZE,                                // Mesh voxelization
-    EFSLIST_EYE_OVERLAY,                         // Eye overlay layer requires special processing
-    EFSLIST_FOG_VOLUME,                          // Fog density injection passes.
-    EFSLIST_GPU_PARTICLE_CUBEMAP_COLLISION,       // Cubemaps for GPU particle cubemap depth collision
-    EFSLIST_REFRACTIVE_SURFACE,                   // After decals, used for instance for the water surface that comes with water volumes.
-
-    EFSLIST_NUM
-};
-
-//================================================================
-// Different preprocess flags for shaders that require preprocessing (like recursive render to texture, screen effects, visibility check, ...)
-// SShader->m_nPreprocess flags in priority order
-
-#define  SPRID_FIRST          25
-#define  SPRID_SCANTEXWATER   26
-#define  FSPR_SCANTEXWATER    (1 << SPRID_SCANTEXWATER)
-#define  SPRID_SCANTEX        27
-#define  FSPR_SCANTEX         (1 << SPRID_SCANTEX)
-#define  SPRID_SCANLCM        28
-#define  FSPR_SCANLCM         (1 << SPRID_SCANLCM)
-#define  SPRID_GENSPRITES_DEPRECATED     29
-#define  FSPR_GENSPRITES_DEPRECATED      (1 << SPRID_GENSPRITES_DEPRECATED)
-#define  SPRID_CUSTOMTEXTURE  30
-#define  FSPR_CUSTOMTEXTURE   (1 << SPRID_CUSTOMTEXTURE)
-#define  SPRID_GENCLOUDS      31
-#define  FSPR_GENCLOUDS       (1 << SPRID_GENCLOUDS)
-
-#define  FSPR_MASK            0xfff00000
-#define  FSPR_MAX             (1 << 31)
-
-#define FEF_DONTSETTEXTURES   1                 // Set: explicit setting of samplers (e.g. tex->Apply(1,nTexStatePoint)), not set: set sampler by sematics (e.g. $ZTarget).
-#define FEF_DONTSETSTATES     2
-
-// SShader::m_Flags
-// Different useful flags
-#define EF_RELOAD        1                      // Shader needs tangent vectors array.
-#define EF_FORCE_RELOAD  2
-#define EF_RELOADED      4
-#define EF_NODRAW        8
-#define EF_HASCULL       0x10
-#define EF_SUPPORTSDEFERREDSHADING_MIXED 0x20
-#define EF_SUPPORTSDEFERREDSHADING_FULL 0x40
-#define EF_SUPPORTSDEFERREDSHADING (EF_SUPPORTSDEFERREDSHADING_MIXED | EF_SUPPORTSDEFERREDSHADING_FULL)
-#define EF_DECAL         0x80
-#define EF_LOADED        0x100
-#define EF_LOCALCONSTANTS 0x200
-#define EF_BUILD_TREE     0x400
-#define EF_LIGHTSTYLE    0x800
-#define EF_NOCHUNKMERGING 0x1000
-#define EF_SUNFLARES     0x2000
-#define EF_NEEDNORMALS   0x4000                 // Need normals operations.
-#define EF_OFFSETBUMP    0x8000
-#define EF_NOTFOUND      0x10000
-#define EF_DEFAULT       0x20000
-#define EF_SKY           0x40000
-#define EF_USELIGHTS     0x80000
-#define EF_ALLOW3DC      0x100000
-#define EF_FOGSHADER     0x200000
-#define EF_FAILED_IMPORT 0x400000               // Currently just for debug, can be removed if necessary
-#define EF_PRECACHESHADER 0x800000
-#define EF_FORCEREFRACTIONUPDATE    0x1000000
-#define EF_SUPPORTSINSTANCING_CONST 0x2000000
-#define EF_SUPPORTSINSTANCING_ATTR  0x4000000
-#define EF_SUPPORTSINSTANCING (EF_SUPPORTSINSTANCING_CONST | EF_SUPPORTSINSTANCING_ATTR)
-#define EF_WATERPARTICLE  0x8000000
-#define EF_CLIENTEFFECT  0x10000000
-#define EF_SYSTEM        0x20000000
-#define EF_REFRACTIVE    0x40000000
-#define EF_NOPREVIEW     0x80000000
-
-#define EF_PARSE_MASK    (EF_SUPPORTSINSTANCING | EF_SKY | EF_HASCULL | EF_USELIGHTS | EF_REFRACTIVE)
-
-
-// SShader::Flags2
-// Additional Different useful flags
-
-#define EF2_PREPR_GENSPRITES_DEPRECATED 0x1
-#define EF2_PREPR_GENCLOUDS 0x2
-#define EF2_PREPR_SCANWATER 0x4
-#define EF2_NOCASTSHADOWS  0x8
-#define EF2_NODRAW         0x10
-#define EF2_HASOPAQUE      0x40
-#define EF2_AFTERHDRPOSTPROCESS  0x80
-#define EF2_DONTSORTBYDIST 0x100
-#define EF2_FORCE_WATERPASS    0x200
-#define EF2_FORCE_GENERALPASS   0x400
-#define EF2_AFTERPOSTPROCESS  0x800
-#define EF2_IGNORERESOURCESTATES  0x1000
-#define EF2_EYE_OVERLAY  0x2000
-#define EF2_FORCE_TRANSPASS       0x4000
-#define EF2_DEFAULTVERTEXFORMAT 0x8000
-#define EF2_FORCE_ZPASS 0x10000
-#define EF2_FORCE_DRAWLAST 0x20000
-#define EF2_FORCE_DRAWAFTERWATER 0x40000
-// free 0x80000
-#define EF2_DEPTH_FIXUP 0x100000
-#define EF2_SINGLELIGHTPASS 0x200000
-#define EF2_FORCE_DRAWFIRST 0x400000
-#define EF2_HAIR            0x800000
-#define EF2_DETAILBUMPMAPPING 0x1000000
-#define EF2_HASALPHATEST      0x2000000
-#define EF2_HASALPHABLEND     0x4000000
-#define EF2_ZPREPASS 0x8000000
-#define EF2_VERTEXCOLORS 0x10000000
-#define EF2_SKINPASS 0x20000000
-#define EF2_HW_TESSELLATION 0x40000000
-#define EF2_ALPHABLENDSHADOWS 0x80000000
-
-class CCryNameR;
-class CCryNameTSCRC;
-struct IShader
-{
-public:
-    // <interfuscator:shuffle>
-    virtual ~IShader(){}
-    virtual int GetID() = 0;
-    virtual int AddRef() = 0;
-    virtual int Release() = 0;
-    virtual int ReleaseForce() = 0;
-
-    virtual const char* GetName() = 0;
-    virtual const char* GetName() const = 0;
-    virtual int GetFlags() const = 0;
-    virtual int GetFlags2() const = 0;
-    virtual void SetFlags2(int Flags) = 0;
-    virtual void ClearFlags2(int Flags) = 0;
-    virtual bool Reload(int nFlags, const char* szShaderName) = 0;
-    virtual AZStd::vector<SShaderParam>& GetPublicParams() = 0;
-    virtual int GetTexId () = 0;
-    virtual ITexture* GetBaseTexture(int* nPass, int* nTU) = 0;
-    virtual unsigned int GetUsedTextureTypes(void) = 0;
-    virtual SShaderTexSlots* GetUsedTextureSlots(int nTechnique) = 0;
-    virtual ECull GetCull(void) = 0;
-    virtual int Size(int Flags) = 0;
-    virtual uint64 GetGenerationMask() = 0;
-    virtual size_t GetNumberOfUVSets() = 0;
-    virtual int GetTechniqueID(int nTechnique, int nRegisteredTechnique) = 0;
-    virtual AZ::Vertex::Format GetVertexFormat(void) = 0;
-
-    // D3D Effects interface
-    virtual bool FXSetTechnique(const CCryNameTSCRC& Name) = 0;
-    virtual bool FXSetPSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) = 0;
-    virtual bool FXSetCSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) = 0;
-    virtual bool FXSetVSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) = 0;
-    virtual bool FXSetGSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) = 0;
-
-    virtual bool FXSetPSFloat(const char* NameParam, const Vec4 fParams[], int nParams) = 0;
-    virtual bool FXSetCSFloat(const char* NameParam, const Vec4 fParams[], int nParams) = 0;
-    virtual bool FXSetVSFloat(const char* NameParam, const Vec4 fParams[], int nParams) = 0;
-    virtual bool FXSetGSFloat(const char* NameParam, const Vec4 fParams[], int nParams) = 0;
-
-    virtual bool FXBegin(uint32* uiPassCount, uint32 nFlags) = 0;
-    virtual bool FXBeginPass(uint32 uiPass) = 0;
-    virtual bool FXCommit(const uint32 nFlags) = 0;
-    virtual bool FXEndPass() = 0;
-    virtual bool FXEnd() = 0;
-
-    virtual EShaderType GetShaderType() = 0;
-    virtual EShaderDrawType GetShaderDrawType() const = 0;
-    virtual uint32      GetVertexModificator() = 0;
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-    // </interfuscator:shuffle>
-
-    static uint32 GetTextureSlot(EEfResTextures textureType) { return (uint32)textureType; }
-};
-
-struct SShaderItem
-{
-    IShader* m_pShader;
-    IRenderShaderResources* m_pShaderResources;
-    int32 m_nTechnique;
-    uint32 m_nPreprocessFlags;
-
-    SShaderItem()
-    {
-        m_pShader = NULL;
-        m_pShaderResources = NULL;
-        m_nTechnique = -1;
-        m_nPreprocessFlags = 1;
-    }
-    SShaderItem(IShader* pSH)
-    {
-        m_pShader = pSH;
-        m_pShaderResources = NULL;
-        m_nTechnique = -1;
-        m_nPreprocessFlags = 1;
-    }
-    SShaderItem(IShader* pSH, IRenderShaderResources* pRS)
-    {
-        m_pShader = pSH;
-        m_pShaderResources = pRS;
-        m_nTechnique = -1;
-        m_nPreprocessFlags = 1;
-    }
-    SShaderItem(IShader* pSH, IRenderShaderResources* pRS, int nTechnique)
-    {
-        m_pShader = pSH;
-        m_pShaderResources = pRS;
-        m_nTechnique = nTechnique;
-        m_nPreprocessFlags = 1;
-    }
-
-    uint32 PostLoad();
-    bool Update();
-    bool RefreshResourceConstants();
-    // Note:
-    //   If you change this function please check bTransparent variable in CRenderMesh::Render().
-    // See also:
-    //   CRenderMesh::Render()
-    inline bool IsZWrite() const
-    {
-        IShader* pSH = m_pShader;
-        if (pSH->GetFlags() & (EF_NODRAW | EF_DECAL))
-        {
-            return false;
-        }
-        if (pSH->GetFlags2() & EF2_FORCE_ZPASS)
-        {
-            return true;
-        }
-        if (m_pShaderResources && m_pShaderResources->IsTransparent())
-        {
-            return false;
-        }
-        return true;
-    }
-    inline struct SShaderTechnique* GetTechnique() const;
-    bool IsMergable(SShaderItem& PrevSI);
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_pShader);
-        pSizer->AddObject(m_pShaderResources);
-    }
-};
-
-
-//////////////////////////////////////////////////////////////////////
-// define before including <IRenderMesh.h>
-
-struct CRenderChunk
-{
-    bool m_bUsesBones;
-    CREMesh* pRE;               // Pointer to the mesh.
-
-    float m_texelAreaDensity;
-
-    uint32 nFirstIndexId;
-    uint32 nNumIndices;
-
-    uint32 nFirstVertId;
-    uint32 nNumVerts;
-
-    uint16 m_nMatFlags;     // Material flags from originally assigned material @see EMaterialFlags.
-    uint16 m_nMatID;                // Material Sub-object id.
-
-    // Index of sub-object that this chunk originates from, used by sub-object hide mask.
-    // @see IStatObj::GetSubObject
-    uint32 nSubObjectIndex;
-
-    AZ::Vertex::Format m_vertexFormat;
-
-    //////////////////////////////////////////////////////////////////////////
-    CRenderChunk()
-        : m_bUsesBones(false)
-        , pRE(0)
-        , m_texelAreaDensity(1.0f)
-        , nFirstIndexId(0)
-        , nNumIndices(0)
-        , nFirstVertId(0)
-        , nNumVerts(0)
-        , m_nMatFlags(0)
-        , m_nMatID(0)
-        , nSubObjectIndex(0)
-        , m_vertexFormat(eVF_P3F_C4B_T2F)
-    {
-    }
-
-    int Size() const;
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
-    {
-    }
-};
-
-typedef DynArray<CRenderChunk> TRenderChunkArray;
-
-//////////////////////////////////////////////////////////////////////
-// DLights
-
-enum eDynamicLightFlags
-{
-    DLF_AREA_SPEC_TEX               = BIT(0),
-    DLF_DIRECTIONAL                 = BIT(1),
-    DLF_BOX_PROJECTED_CM            = BIT(2),
-    // BIT(3) DEPRECATED, Available for use
-    DLF_POST_3D_RENDERER            = BIT(4),
-    DLF_CASTSHADOW_MAPS             = BIT(5),
-    DLF_POINT                       = BIT(6),
-    DLF_PROJECT                     = BIT(7),
-    DLF_LIGHT_BEAM                  = BIT(8),
-    DLF_IGNORES_VISAREAS            = BIT(10),
-    DLF_DEFERRED_CUBEMAPS           = BIT(11),
-    DLF_HAS_CLIP_VOLUME             = BIT(12),
-    DLF_DISABLED                    = BIT(13),
-    DLF_AREA_LIGHT                  = BIT(14),
-    DLF_USE_FOR_SVOGI               = BIT(15),
-    // UNUSED                       = BIT(16),
-    DLF_FAKE                        = BIT(17), // No lighting, used for Flares, beams and such.
-    DLF_SUN                         = BIT(18),
-    DLF_LM                          = BIT(19),
-    DLF_THIS_AREA_ONLY              = BIT(20), // Affects only current area/sector.
-    DLF_AMBIENT                     = BIT(21), // Ambient light (has name indicates, used for replacing ambient)
-    DLF_INDOOR_ONLY                 = BIT(22), // Do not affect height map.
-    DLF_VOLUMETRIC_FOG              = BIT(23), // Affects volumetric fog.
-    DLF_ATTACH_TO_SUN               = BIT(24), // Add only to  Light Propagation Volume if it's possible.
-    DLF_TRACKVIEW_TIMESCRUBBING     = BIT(25), // Add only to  Light Propagation Volume if it's possible.
-    DLF_VOLUMETRIC_FOG_ONLY         = BIT(26), // Affects only volumetric fog.
-    DLF_DEFERRED_LIGHT              = BIT(27), // DEPRECATED. Remove once deferred shading by default
-    DLF_SPECULAROCCLUSION           = BIT(28), // DEPRECATED. Remove all dependencies editor side, etc
-    DLF_DIFFUSEOCCLUSION            = BIT(29),
-    DLF_CAST_TERRAIN_SHADOWS        = BIT(30), // Include terrain in shadow casters
-
-    DLF_LIGHTTYPE_MASK              = (DLF_DIRECTIONAL | DLF_POINT | DLF_PROJECT | DLF_AREA_LIGHT)
-};
-
-
-//Area light types
-#define DLAT_SPHERE             0x1
-#define DLAT_RECTANGLE      0x2
-#define DLAT_POINT              0x4
-
-#define DL_SHADOW_UPDATE_SHIFT 8
-
-#include <IRenderMesh.h>  // <> required for Interfuscator
-
-struct IAnimNode;
-
-struct ILightAnimWrapper
-    : public _i_reference_target_t
-{
-public:
-    virtual bool Resolve() = 0;
-    IAnimNode* GetNode() const { return m_pNode; }
-
-protected:
-    ILightAnimWrapper(const char* name)
-        : m_name(name)
-        , m_pNode(0) {}
-    virtual ~ILightAnimWrapper() {}
-
-protected:
-    string m_name;
-    IAnimNode* m_pNode;
-};
-
-struct SOpticsInstanceParameters
-{
-    SOpticsInstanceParameters(float brightness = 0.0f, float size = 0.0f, const ColorF& color = ColorF(), bool valid = false) : 
-        m_brightness(brightness), 
-        m_size(size), m_color(color), 
-        m_isValid(valid) {}
-
-    float m_brightness;
-    float m_size;
-    ColorF m_color;
-    bool m_isValid;
-};
-
-#define MAX_RECURSION_LEVELS 2
-
-struct SRenderLight
-{
-    SRenderLight()
-    {
-        memset(this, 0, sizeof(SRenderLight));
-        m_fLightFrustumAngle = 45.0f;
-        m_fRadius = 4.0f;
-        m_fBaseRadius = 4.0f;
-        m_SpecMult = m_BaseSpecMult = 1.0f;
-        m_ProjMatrix.SetIdentity();
-        m_ObjMatrix.SetIdentity();
-        m_BaseObjMatrix.SetIdentity();
-        m_sName = "";
-        m_pLightAnim = NULL;
-        m_fAreaWidth = 1;
-        m_fAreaHeight = 1;
-        m_fBoxWidth = 1.0f;
-        m_fBoxHeight = 1.0f;
-        m_fBoxLength = 1.0f;
-        m_fTimeScrubbed = 0.0f;
-
-        m_fShadowBias = 1.0f;
-        m_fShadowSlopeBias = 1.0f;
-        m_fShadowResolutionScale = 1.0f;
-        m_nShadowMinResolution = 0;
-        m_fShadowUpdateMinRadius = m_fRadius;
-        m_nShadowUpdateRatio = 1 << DL_SHADOW_UPDATE_SHIFT;
-        m_nEntityId = (uint32) - 1;
-        m_LensOpticsFrustumAngle = 255;
-        m_nAttenFalloffMax = 255;
-        m_fAttenuationBulbSize = 0.1f;
-        m_fProbeAttenuation = 1.0f;
-        m_lightId = -1;
-    }
-
-    const Vec3& GetPosition() const
-    {
-        return m_Origin;
-    }
-    void SetPosition(const Vec3& vPos)
-    {
-        m_BaseOrigin = vPos;
-        m_Origin = vPos;
-    }
-
-    // Summary:
-    //   Use this instead of m_Color.
-    void SetLightColor(const ColorF& cColor)
-    {
-        m_Color = cColor;
-        m_BaseColor = cColor;
-    }
-
-    ITexture* GetDiffuseCubemap() const
-    {
-        return m_pDiffuseCubemap;
-    }
-
-    ITexture* GetSpecularCubemap() const
-    {
-        return m_pSpecularCubemap;
-    }
-
-    ITexture* GetLightTexture() const
-    {
-        return m_pLightImage ? m_pLightImage : NULL;
-    }
-
-    void SetOpticsParams(const SOpticsInstanceParameters& params)
-    {
-        m_opticsParams = params;
-    }
-
-    const SOpticsInstanceParameters& GetOpticsParams() const
-    {
-        return m_opticsParams;
-    }
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*LATER*/}
-
-    void AcquireResources()
-    {
-        if (m_Shader.m_pShader)
-        {
-            m_Shader.m_pShader->AddRef();
-        }
-        if (m_pLightImage)
-        {
-            m_pLightImage->AddRef();
-        }
-        if (m_pDiffuseCubemap)
-        {
-            m_pDiffuseCubemap->AddRef();
-        }
-        if (m_pSpecularCubemap)
-        {
-            m_pSpecularCubemap->AddRef();
-        }
-        if (m_pLightAnim)
-        {
-            m_pLightAnim->AddRef();
-        }
-        if (m_pLightAttenMap)
-        {
-            m_pLightAttenMap->AddRef();
-        }
-    }
-
-    void DropResources()
-    {
-        SAFE_RELEASE(m_Shader.m_pShader);
-        SAFE_RELEASE(m_pLightImage);
-        SAFE_RELEASE(m_pDiffuseCubemap);
-        SAFE_RELEASE(m_pSpecularCubemap);
-        SAFE_RELEASE(m_pLightAnim);
-        SAFE_RELEASE(m_pLightAttenMap);
-    }
-
-    void SetAnimSpeed(float fAnimSpeed)
-    {
-        m_nAnimSpeed = aznumeric_caster(int_round(min(fAnimSpeed * 255.0f / 4.0f, 255.0f)));   // Assuming speed multiplier in range [0, 4]
-    }
-
-    float GetAnimSpeed() const
-    {
-        return ((float) m_nAnimSpeed) * (4.0f / 255.0f);
-    }
-
-    void SetFalloffMax(float fMax)
-    {
-        m_nAttenFalloffMax = aznumeric_caster(int_round(fMax * 255.0f));
-    }
-
-    float GetFalloffMax()  const
-    {
-        return ((float) m_nAttenFalloffMax) / 255.0f;
-    }
-
-    // Calculate the scissor rectangle in screenspace that encompasses this light.  These values are used to set
-    // the hardware scissor rect in order to clip the min/max 2d extents for the light.
-    // These values must be calculated and read on the render thread due to the VR tracking updates performed on the render thread.
-    void CalculateScissorRect();
-
-    //=========================================================================================================================
-
-    // Commonly used on most code paths (64 bytes)
-    int16 m_Id;                                     // Shader id
-    uint8 m_nStencilRef[2];
-    uint32 m_n3DEngineUpdateFrameID;
-    uint32 m_nEntityId;                             // Unique entity id
-    uint32 m_Flags;                                 // light flags (DLF_etc).
-    Vec3 m_Origin;                                  // World space position
-    float m_fRadius;                                // xyz= Origin, w=Radius. (Do not change order)
-    ColorF m_Color;                                 // w component unused - todo pack spec mul into alpha (post c3 - touches quite some code)
-    float m_SpecMult;                               // Specular multiplier
-    float m_fHDRDynamic;                            // <DEPRECATED> 0 to get the same results in HDR, <0 to get darker, >0 to get brighter.
-    int16 m_sX;                                     // Scissor parameters (2d extent).
-    int16 m_sY;
-    int16 m_sWidth;
-    int16 m_sHeight;
-    int m_lightId;
-
-    // Env. probes
-    ITexture* m_pDiffuseCubemap;                    // Very small cubemap texture to make a lookup for diffuse.
-    ITexture* m_pSpecularCubemap;                   // Cubemap texture to make a lookup for local specular.
-    Vec3 m_ProbeExtents;
-    float m_fBoxWidth;
-    float m_fBoxHeight;
-    float m_fBoxLength;
-    float m_fProbeAttenuation;                      // Can be used fade out distant probes, or to manually blend between multiple co-located probes 
-    uint8 m_nAttenFalloffMax;
-    uint8 m_nSortPriority;
-
-    // Shadow map fields
-    struct ILightSource* m_pOwner;
-    ShadowMapFrustum** m_pShadowMapFrustums;
-    float m_fShadowBias;
-    float m_fShadowSlopeBias;
-    float m_fShadowResolutionScale;
-    float m_fShadowUpdateMinRadius;
-    uint16 m_nShadowMinResolution;
-    uint16 m_nShadowUpdateRatio;
-    uint8 m_ShadowChanMask : 4;
-    uint8 m_ShadowMaskIndex : 4;
-
-    // Projector
-    ITexture*                       m_pLightAttenMap;                                       // User can specify custom light attenuation gradient
-    ITexture*                       m_pLightImage;
-    Matrix44                        m_ProjMatrix;
-    Matrix34                        m_ObjMatrix;
-    float                           m_fLightFrustumAngle;
-    float                           m_fProjectorNearPlane;
-
-    // Misc fields. todo: put in cold data struct (post c3 - touches quite some code)
-    const char* m_sName;                            // Optional name of the light source.
-    SShaderItem m_Shader;                           // Shader item
-    CRenderObject* m_pObject[MAX_RECURSION_LEVELS]; // Object for light coronas and light flares.
-    ILightAnimWrapper* m_pLightAnim;
-
-    Matrix34 m_BaseObjMatrix;
-    float m_fTimeScrubbed;
-    Vec3 m_BaseOrigin;                              // World space position.
-    float m_fBaseRadius;                            // Base radius 
-    ColorF m_BaseColor;                             // w component unused..
-    float m_BaseSpecMult;
-
-    float m_fAttenuationBulbSize;
-
-    float m_fAreaWidth;
-    float m_fAreaHeight;
-
-    float m_fFogRadialLobe;                         // The blend ratio of two radial lobe for volumetric fog.
-
-    AZ::u8 m_nAnimSpeed;
-    AZ::u8 m_nLightStyle;
-    AZ::u8 m_nLightPhase;
-    AZ::u8 m_LensOpticsFrustumAngle;                 // from 0 to 255, The range will be adjusted from 0 to 360 when used.
-
-    IClipVolume* m_pClipVolumes[2];
-
-    SOpticsInstanceParameters m_opticsParams;       // Per instance optics parameters
-};
-
-//////////////////////////////////////////////////////////////////////
-class CDLight
-    : public SRenderLight
-{
-public:
-    CDLight()
-        : SRenderLight()
-    {
-    }
-
-    ~CDLight()
-    {
-        DropResources();
-    }
-
-    // Summary:
-    //   Good for debugging.
-    bool IsOk() const
-    {
-        for (int i = 0; i < 3; ++i)
-        {
-            if (m_Color[i] < 0 || m_Color[i] > 100.0f || _isnan(m_Color[i]))
-            {
-                return false;
-            }
-            if (m_BaseColor[i] < 0 || m_BaseColor[i] > 100.0f || _isnan(m_BaseColor[i]))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    CDLight(const CDLight& other)
-    {
-        operator=(other);
-    }
-
-    CDLight& operator=(const CDLight& dl)
-    {
-        if (this == &dl)
-        {
-            return *this;
-        }
-
-        DropResources();
-
-        m_pOwner = dl.m_pOwner;
-        memcpy(m_pObject, dl.m_pObject, sizeof(m_pObject));
-        m_Shader = dl.m_Shader;
-        m_pShadowMapFrustums = dl.m_pShadowMapFrustums;
-        m_pDiffuseCubemap = dl.m_pDiffuseCubemap;
-        m_pSpecularCubemap = dl.m_pSpecularCubemap;
-        m_pLightImage = dl.m_pLightImage;
-        m_pLightAttenMap = dl.m_pLightAttenMap;
-        m_sName = dl.m_sName;
-        m_ProjMatrix = dl.m_ProjMatrix;
-        m_ObjMatrix = dl.m_ObjMatrix;
-        m_BaseObjMatrix = dl.m_BaseObjMatrix;
-        m_Color = dl.m_Color;
-        m_BaseColor = dl.m_BaseColor;
-        m_Origin = dl.m_Origin;
-        m_BaseOrigin = dl.m_BaseOrigin;
-        m_fRadius = dl.m_fRadius;
-        m_fBaseRadius = dl.m_fBaseRadius;
-        m_ProbeExtents = dl.m_ProbeExtents;
-        m_SpecMult = dl.m_SpecMult;
-        m_BaseSpecMult = dl.m_BaseSpecMult;
-        m_fShadowBias = dl.m_fShadowBias;
-        m_fShadowSlopeBias = dl.m_fShadowSlopeBias;
-        m_fShadowResolutionScale = dl.m_fShadowResolutionScale;
-        m_fHDRDynamic = dl.m_fHDRDynamic;
-        m_LensOpticsFrustumAngle = dl.m_LensOpticsFrustumAngle;
-        m_fLightFrustumAngle = dl.m_fLightFrustumAngle;
-        m_fProjectorNearPlane = dl.m_fProjectorNearPlane;
-        m_Flags = dl.m_Flags;
-        m_Id = dl.m_Id;
-        m_n3DEngineUpdateFrameID = dl.m_n3DEngineUpdateFrameID;
-        m_sX = dl.m_sX;
-        m_sY = dl.m_sY;
-        m_sWidth = dl.m_sWidth;
-        m_sHeight = dl.m_sHeight;
-        m_nLightStyle = dl.m_nLightStyle;
-        m_nLightPhase = dl.m_nLightPhase;
-        m_ShadowChanMask = dl.m_ShadowChanMask;
-        m_pLightAnim = dl.m_pLightAnim;
-        m_fAreaWidth = dl.m_fAreaWidth;
-        m_fAreaHeight = dl.m_fAreaHeight;
-        m_fBoxWidth = dl.m_fBoxWidth;
-        m_fBoxHeight = dl.m_fBoxHeight;
-        m_fBoxLength = dl.m_fBoxLength;
-        m_fTimeScrubbed = dl.m_fTimeScrubbed;
-        m_nShadowMinResolution = dl.m_nShadowMinResolution;
-        m_fShadowUpdateMinRadius = dl.m_fShadowUpdateMinRadius;
-        m_nShadowUpdateRatio = dl.m_nShadowUpdateRatio;
-        m_nAnimSpeed = dl.m_nAnimSpeed;
-        m_nSortPriority = dl.m_nSortPriority;
-        m_nAttenFalloffMax = dl.m_nAttenFalloffMax;
-        m_fProbeAttenuation = dl.m_fProbeAttenuation;
-        m_fAttenuationBulbSize = dl.m_fAttenuationBulbSize;
-        m_fFogRadialLobe = dl.m_fFogRadialLobe;
-        m_nEntityId = dl.m_nEntityId;
-        memcpy(m_nStencilRef, dl.m_nStencilRef, sizeof(m_nStencilRef));
-        memcpy(m_pClipVolumes, dl.m_pClipVolumes, sizeof(m_pClipVolumes));
-        m_opticsParams = dl.m_opticsParams;
-        AcquireResources();
-
-        return *this;
-    }
-
-    // Summary:
-    //   Use this instead of m_Color.
-    const ColorF& GetFinalColor([[maybe_unused]] const ColorF& cColor) const
-    {
-        return m_Color;
-    }
-
-    // Summary:
-    //   Use this instead of m_Color.
-    void SetSpecularMult(float fSpecMult)
-    {
-        m_SpecMult = fSpecMult;
-        m_BaseSpecMult = fSpecMult;
-    }
-
-    void SetShadowBiasParams(float fShadowBias, float fShadowSlopeBias)
-    {
-        m_fShadowBias = fShadowBias;
-        m_fShadowSlopeBias = fShadowSlopeBias;
-    }
-
-    // Summary:
-    //   Use this instead of m_Color.
-    const float& GetSpecularMult() const
-    {
-        return m_SpecMult;
-    }
-    void SetMatrix(const Matrix34& Matrix, bool reset = true)
-    {
-        // Scale the cubemap to adjust the default 45 degree 1/2 angle fustrum to
-        // the desired angle (0 to 90 degrees).
-        float scaleFactor = tan_tpl((90.0f - m_fLightFrustumAngle) * gf_PI / 180.0f);
-        m_ProjMatrix = Matrix33(Matrix) * Matrix33::CreateScale(Vec3(1, scaleFactor, scaleFactor));
-        Matrix44 transMat;
-        transMat.SetIdentity();
-        transMat(3, 0) = -Matrix(0, 3);
-        transMat(3, 1) = -Matrix(1, 3);
-        transMat(3, 2) = -Matrix(2, 3);
-        m_ProjMatrix = transMat * m_ProjMatrix;
-        m_ObjMatrix = Matrix;
-
-        // Remove any scale
-        m_ObjMatrix.GetColumn0().NormalizeSafe(Vec3_OneX);
-        m_ObjMatrix.GetColumn1().NormalizeSafe(Vec3_OneY);
-        m_ObjMatrix.GetColumn2().NormalizeSafe(Vec3_OneZ);
-
-        if (reset)
-        {
-            m_BaseObjMatrix = m_ObjMatrix;
-        }
-    }
-
-    void SetSpecularCubemap(ITexture* texture)
-    {
-        m_pSpecularCubemap = texture;
-    }
-
-    void SetDiffuseCubemap(ITexture* texture)
-    {
-        m_pDiffuseCubemap = texture;
-    }
-
-    void ReleaseCubemaps()
-    {
-        SAFE_RELEASE(m_pSpecularCubemap);
-        SAFE_RELEASE(m_pDiffuseCubemap);
-    }
-};
-
-#define DECAL_HAS_NORMAL_MAP    (1 << 0)
-#define DECAL_STATIC                    (1 << 1)
-#define DECAL_HAS_SPECULAR_MAP (1 << 2)
-
-struct SDeferredDecal
-{
-    SDeferredDecal()
-    {
-        ZeroStruct(*this);
-        rectTexture.w = rectTexture.h = 1.f;
-        angleAttenuation = 1.0f;
-    }
-
-    Matrix34 projMatrix; // defines where projection should be applied in the world
-    _smart_ptr<IMaterial> pMaterial; // decal material
-    float fAlpha; // transparency of decal, used mostly for distance fading
-    float fGrowAlphaRef;
-    float angleAttenuation;
-    RectF rectTexture; // subset of texture to render
-    uint32 nFlags;
-    uint8 nSortOrder; // user defined sort order
-};
-
-// Summary:
-//   Runtime shader flags for HW skinning.
-enum EHWSkinningRuntimeFlags
-{
-    eHWS_MotionBlured = 0x04,
-    eHWS_Skinning_DQ_Linear = 0x08,     // Convert dual-quaternions to matrices on the GPU
-    eHWS_Skinning_Matrix = 0x10,        // Pass float3x4 skinning matrices directly to the GPU
-};
-
-// Enum of data types that can be used as bones on GPU for skinning
-enum EBoneTypes
-{
-    eBoneType_DualQuat = 0,
-    eBoneType_Matrix,
-    eBoneType_Count,
-};
-
-// Summary:
-//   Shader graph support.
-enum EGrBlockType
-{
-    eGrBlock_Unknown,
-    eGrBlock_VertexInput,
-    eGrBlock_VertexOutput,
-    eGrBlock_PixelInput,
-    eGrBlock_PixelOutput,
-    eGrBlock_Texture,
-    eGrBlock_Sampler,
-    eGrBlock_Function,
-    eGrBlock_Constant,
-};
-
-enum EGrBlockSamplerType
-{
-    eGrBlockSampler_Unknown,
-    eGrBlockSampler_2D,
-    eGrBlockSampler_3D,
-    eGrBlockSampler_Cube,
-    eGrBlockSampler_Bias2D,
-    eGrBlockSampler_BiasCube,
-};
-
-enum EGrNodeType
-{
-    eGrNode_Unknown,
-    eGrNode_Input,
-    eGrNode_Output,
-};
-
-enum EGrNodeFormat
-{
-    eGrNodeFormat_Unknown,
-    eGrNodeFormat_Float,
-    eGrNodeFormat_Vector,
-    eGrNodeFormat_Matrix,
-    eGrNodeFormat_Int,
-    eGrNodeFormat_Bool,
-    eGrNodeFormat_Texture2D,
-    eGrNodeFormat_Texture3D,
-    eGrNodeFormat_TextureCUBE,
-};
-
-enum EGrNodeIOSemantic
-{
-    eGrNodeIOSemantic_Unknown,
-    eGrNodeIOSemantic_Custom,
-    eGrNodeIOSemantic_VPos,
-    eGrNodeIOSemantic_Color0,
-    eGrNodeIOSemantic_Color1,
-    eGrNodeIOSemantic_Color2,
-    eGrNodeIOSemantic_Color3,
-    eGrNodeIOSemantic_Normal,
-    eGrNodeIOSemantic_TexCoord0,
-    eGrNodeIOSemantic_TexCoord1,
-    eGrNodeIOSemantic_TexCoord2,
-    eGrNodeIOSemantic_TexCoord3,
-    eGrNodeIOSemantic_TexCoord4,
-    eGrNodeIOSemantic_TexCoord5,
-    eGrNodeIOSemantic_TexCoord6,
-    eGrNodeIOSemantic_TexCoord7,
-    eGrNodeIOSemantic_Tangent,
-    eGrNodeIOSemantic_Binormal,
-};
-
-struct SShaderGraphFunction
-{
-    string m_Data;
-    string m_Name;
-    std::vector<string> inParams;
-    std::vector<string> outParams;
-    std::vector<string> szInTypes;
-    std::vector<string> szOutTypes;
-};
-
-struct SShaderGraphNode
-{
-    EGrNodeType m_eType;
-    EGrNodeFormat m_eFormat;
-    EGrNodeIOSemantic m_eSemantic;
-    string m_CustomSemantics;
-    string m_Name;
-    bool m_bEditable;
-    bool m_bWasAdded;
-    SShaderGraphFunction* m_pFunction;
-    AZStd::vector<SShaderParam> m_Properties;
-
-    SShaderGraphNode()
-    {
-        m_eType = eGrNode_Unknown;
-        m_eFormat = eGrNodeFormat_Unknown;
-        m_eSemantic = eGrNodeIOSemantic_Unknown;
-        m_bEditable = false;
-        m_bWasAdded = false;
-        m_pFunction = NULL;
-    }
-    ~SShaderGraphNode();
-};
-
-
-typedef std::vector<SShaderGraphNode*> FXShaderGraphNodes;
-typedef FXShaderGraphNodes::iterator FXShaderGraphNodeItor;
-
-struct SShaderGraphBlock
-{
-    EGrBlockType m_eType;
-    EGrBlockSamplerType m_eSamplerType;
-    string m_ClassName;
-    FXShaderGraphNodes  m_Nodes;
-
-    ~SShaderGraphBlock();
-};
-
-typedef std::vector<SShaderGraphBlock*> FXShaderGraphBlocks;
-typedef FXShaderGraphBlocks::iterator FXShaderGraphBlocksItor;
-
-#include <CryCommon/StaticInstance.h>
-
-#endif // CRYINCLUDE_CRYCOMMON_ISHADER_H
diff --git a/Code/CryEngine/CryCommon/ISplines.h b/Code/CryEngine/CryCommon/ISplines.h
deleted file mode 100644
index 5f05786f19..0000000000
--- a/Code/CryEngine/CryCommon/ISplines.h
+++ /dev/null
@@ -1,1258 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ISPLINES_H
-#define CRYINCLUDE_CRYCOMMON_ISPLINES_H
-#pragma once
-
-#include <CrySizer.h>
-#include <IXml.h>
-
-//////////////////////////////////////////////////////////////////////////
-
-// These flags are mostly applicable for hermit based splines.
-enum ESplineKeyTangentType
-{
-    SPLINE_KEY_TANGENT_NONE    = 0,
-    SPLINE_KEY_TANGENT_CUSTOM  = 1,
-    SPLINE_KEY_TANGENT_ZERO    = 2,
-    SPLINE_KEY_TANGENT_STEP    = 3,
-    SPLINE_KEY_TANGENT_LINEAR  = 4,
-    SPLINE_KEY_TANGENT_BEZIER  = 5
-};
-
-#define SPLINE_KEY_TANGENT_IN_SHIFT  (0)
-#define SPLINE_KEY_TANGENT_IN_MASK   (0x07)                                  // 0000111
-#define SPLINE_KEY_TANGENT_OUT_SHIFT (3)
-#define SPLINE_KEY_TANGENT_OUT_MASK  (0x07 << (SPLINE_KEY_TANGENT_OUT_SHIFT))  // 0111000
-#define SPLINE_KEY_TANGENT_UNIFY_SHIFT (6)
-#define SPLINE_KEY_TANGENT_UNIFY_MASK  (0x01 << (SPLINE_KEY_TANGENT_UNIFY_SHIFT))  // 1000000
-
-#define SPLINE_KEY_TANGENT_ALL_MASK (SPLINE_KEY_TANGENT_IN_MASK | SPLINE_KEY_TANGENT_OUT_MASK | SPLINE_KEY_TANGENT_UNIFY_MASK)
-#define SPLINE_KEY_TANGENT_UNIFIED ((SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_IN_SHIFT)    \
-                                    | (SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_OUT_SHIFT) \
-                                    | (0x01 << SPLINE_KEY_TANGENT_UNIFY_SHIFT))
-#define SPLINE_KEY_TANGENT_BROKEN ((SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_IN_SHIFT)    \
-                                   | (SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_OUT_SHIFT) \
-                                   | (0x00 << SPLINE_KEY_TANGENT_UNIFY_SHIFT))
-
-enum ESplineKeyFlags
-{
-    ESPLINE_KEY_UI_SELECTED_SHIFT = 16,
-    ESPLINE_KEY_UI_SELECTED_MAX_DIMENSION_COUNT = 4,   // should be power of 2 (see ESPLINE_KEY_UI_SELECTED_MASK)
-    ESPLINE_KEY_UI_SELECTED_MASK = ((1 << ESPLINE_KEY_UI_SELECTED_MAX_DIMENSION_COUNT) - 1) << ESPLINE_KEY_UI_SELECTED_SHIFT
-};
-
-
-// Return value closest to 0 if same sign, or 0 if opposite.
-template<class T>
-inline T minmag(T const& a, T const& b)
-{
-    if (a * b <= T(0.f))
-    {
-        return T(0.f);
-    }
-    else if (a < T(0.f))
-    {
-        return max(a, b);
-    }
-    else
-    {
-        return min(a, b);
-    }
-}
-
-template<class T>
-inline Vec3_tpl<T> minmag(Vec3_tpl<T> const& a, Vec3_tpl<T> const& b)
-{
-    return Vec3_tpl<T>(minmag(a.x, b.x), minmag(a.y, b.y), minmag(a.z, b.z));
-}
-
-template<class T>
-T abs(Vec3_tpl<T> v)
-{
-    return v.GetLength();
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Interface returned by backup methods of ISplineInterpolator.
-//////////////////////////////////////////////////////////////////////////
-struct ISplineBackup
-{
-    // <interfuscator:shuffle>
-    virtual ~ISplineBackup(){}
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-    // </interfuscator:shuffle>
-};
-
-//////////////////////////////////////////////////////////////////////////
-// General Interpolation interface.
-//////////////////////////////////////////////////////////////////////////
-struct ISplineInterpolator
-{
-    typedef float ElemType;
-    typedef ElemType ValueType[4];
-
-    // <interfuscator:shuffle>
-    virtual ~ISplineInterpolator(){}
-
-    // Dimension of the spline from 0 to 3, number of parameters used in ValueType.
-    virtual int GetNumDimensions() = 0;
-
-    // Insert`s a new key, returns index of the key.
-    virtual int  InsertKey(float time, ValueType value) = 0;
-    virtual void RemoveKey(int key) = 0;
-
-    virtual void FindKeysInRange(float startTime, float endTime, int& firstFoundKey, int& numFoundKeys) = 0;
-    virtual void RemoveKeysInRange(float startTime, float endTime) = 0;
-
-    virtual int   GetKeyCount() = 0;
-    virtual void  SetKeyTime(int key, float time) = 0;
-    virtual float GetKeyTime(int key) = 0;
-    virtual void  SetKeyValue(int key, ValueType value) = 0;
-    virtual bool  GetKeyValue(int key, ValueType& value) = 0;
-
-    virtual void  SetKeyInTangent(int key, ValueType tin) = 0;
-    virtual void  SetKeyOutTangent(int key, ValueType tout) = 0;
-    virtual void  SetKeyTangents(int key, ValueType tin, ValueType tout) = 0;
-    virtual bool  GetKeyTangents(int key, ValueType& tin, ValueType& tout) = 0;
-
-    // Changes key flags, @see ESplineKeyFlags
-    virtual void  SetKeyFlags(int key, int flags) = 0;
-    // Retrieve key flags, @see ESplineKeyFlags
-    virtual int   GetKeyFlags(int key) = 0;
-
-    virtual void Interpolate(float time, ValueType& value) = 0;
-    virtual void EvalInTangent([[maybe_unused]] float time, [[maybe_unused]] ValueType& value) {};
-    virtual void EvalOutTangent([[maybe_unused]] float time, [[maybe_unused]] ValueType& value) {};
-
-    virtual void SerializeSpline(XmlNodeRef& node, bool bLoading) = 0;
-
-    virtual ISplineBackup* Backup() = 0;
-    virtual void Restore(ISplineBackup* pBackup) = 0;
-
-    void ClearAllKeys()
-    {
-        while (GetKeyCount() > 0)
-        {
-            RemoveKey(0);
-        }
-        Update();
-    }
-
-    // </interfuscator:shuffle>
-
-    //////////////////////////////////////////////////////////////////////////
-    // Helper functions.
-    //////////////////////////////////////////////////////////////////////////
-    inline bool IsKeySelectedAtAnyDimension(const int key)
-    {
-        const int flags = GetKeyFlags(key);
-        const int dimensionCount = GetNumDimensions();
-        const int mask = ((1 << dimensionCount) - 1) << ESPLINE_KEY_UI_SELECTED_SHIFT;
-        return (flags & mask) != 0;
-    }
-
-    inline bool IsKeySelectedAtDimension(const int key, const int dimension)
-    {
-        const int flags = GetKeyFlags(key);
-        const int mask = 1 << (ESPLINE_KEY_UI_SELECTED_SHIFT + dimension);
-        return (flags & mask) != 0;
-    }
-
-    void SelectKeyAllDimensions(int key, bool select)
-    {
-        const int flags = GetKeyFlags(key);
-        if (select)
-        {
-            const int dimensionCount = GetNumDimensions();
-            const int mask = ((1 << dimensionCount) - 1) << ESPLINE_KEY_UI_SELECTED_SHIFT;
-            SetKeyFlags(key, (flags & (~ESPLINE_KEY_UI_SELECTED_MASK)) | mask);
-        }
-        else
-        {
-            SetKeyFlags(key, flags & (~ESPLINE_KEY_UI_SELECTED_MASK));
-        }
-    }
-
-    void SelectKeyAtDimension(int key, int dimension, bool select)
-    {
-        const int flags = GetKeyFlags(key);
-        const int mask = 1 << (ESPLINE_KEY_UI_SELECTED_SHIFT + dimension);
-        SetKeyFlags(key, (select ? (flags | mask) : (flags & (~mask))));
-    }
-
-    inline int InsertKeyFloat(float time, float val) { ValueType v = {val, 0, 0, 0}; return InsertKey(time, v); }
-    inline int InsertKeyFloat3(float time, float* vals) { ValueType v = {vals[0], vals[1], vals[2], 0}; return InsertKey(time, v); }
-    inline bool GetKeyValueFloat(int key, float& value) { ValueType v = {value}; bool b = GetKeyValue(key, v); value = v[0]; return b; }
-    inline void SetKeyValueFloat(int key, float value) { ValueType v = {value, 0, 0, 0}; SetKeyValue(key, v); }
-    inline void SetKeyValueFloat3(int key, float* vals) { ValueType v = {vals[0], vals[1], vals[2], 0}; SetKeyValue(key, v); }
-    inline void InterpolateFloat(float time, float& val) { ValueType v = {val}; Interpolate(time, v); val = v[0]; }
-    inline void InterpolateFloat3(float time, float* vals) { ValueType v = {vals[0], vals[1], vals[2]}; Interpolate(time, v); vals[0] = v[0]; vals[1] = v[1]; vals[2] = v[2]; }
-
-    inline void EvalInTangentFloat(float time, float& val) { ValueType v = { val }; EvalInTangent(time, v); val = v[0]; }
-    inline void EvalOutTangentFloat(float time, float& val) { ValueType v = { val }; EvalOutTangent(time, v); val = v[0]; }
-
-
-    // Return Key closest to the specified time.
-    inline int FindKey(float fTime, float fEpsilon = 0.01f)
-    {
-        int nKey = -1;
-        // Find key.
-        for (int k = 0; k < GetKeyCount(); k++)
-        {
-            if (fabs(GetKeyTime(k) - fTime) < fEpsilon)
-            {
-                nKey = k;
-                break;
-            }
-        }
-        return nKey;
-    }
-
-    // Force update.
-    void Update() { ValueType val; Interpolate(0.f, val); }
-    static void ZeroValue(ValueType& value) { value[0] = 0; value[1] = 0; value[2] = 0; value[3] = 0; }
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////
-namespace spline
-{
-    template    <int N>
-    class BasisFunction
-    {
-    public:
-        const float& operator[](int i) const { return m_f[i]; };
-    protected:
-        float   m_f[N];
-    };
-
-    // Special functions that makes parameter zero.
-    template <class T>
-    inline void Zero(T& val)
-    {
-        memset(&val, 0, sizeof(val));
-    }
-    // Specialized Zero functions
-    template <>
-    inline void Zero(float& val) { val = 0.0f; }
-    template <>
-    inline void Zero(Vec2& val) { val = Vec2(0.0f, 0.0f); }
-    template <>
-    inline void Zero(Vec3& val) { val = Vec3(0.0f, 0.0f, 0.0f); }
-    template <>
-    inline void Zero(Quat& val) { val.SetIdentity(); }
-
-    inline float Concatenate(float left, float right) { return left + right; }
-    inline Vec3 Concatenate(const Vec3& left, const Vec3& right) { return left + right; }
-    inline Quat Concatenate(const Quat& left, const Quat& right) { return left * right; }
-    inline float Subtract (float left, float right) { return left - right; }
-    inline Vec3 Subtract (const Vec3& left, const Vec3& right) { return left - right; }
-    inline Quat Subtract(const Quat& left, const Quat& right) { return left / right; }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    // HermitBasis.
-    class HermitBasis
-        : public BasisFunction<4>
-    {
-    public:
-        HermitBasis(float t)
-        {
-            float t2, t3, t2_3, t3_2, t3_t2;
-
-            t2 = t * t;                                               // t2 = t^2;
-            t3 = t2 * t;                                          // t3 = t^3;
-
-            t3_2 = t3 + t3;
-            t2_3 = 3 * t2;
-            t3_t2 = t3 - t2;
-            m_f[0] = t3_2 - t2_3 + 1;
-            m_f[1] = -t3_2 + t2_3;
-            m_f[2] = t3_t2 - t2 + t;
-            m_f[3] = t3_t2;
-        }
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////
-    // BezierBasis.
-    class BezierBasis
-        : public BasisFunction<4>
-    {
-    public:
-        BezierBasis(const float t)
-        {
-            const float t2 = t * t;
-            const float t3 = t2 * t;
-            m_f[0] = -t3 + 3 * t2 - 3 * t + 1;
-            m_f[1] = 3 * t3 - 6 * t2 + 3 * t;
-            m_f[2] = -3 * t3 + 3 * t2;
-            m_f[3] = t3;
-        }
-    };
-
-    template<class T>
-    struct TCoeffBasis
-    {
-        // Coefficients for a cubic polynomial.
-        T   m_c[4];
-
-        inline T eval(float t) const
-        {
-            return m_c[0] + t * (m_c[1] + t * (m_c[2] + t * m_c[3]));
-        }
-        // Compute coeffs based on 2 endpoints & slopes.
-        void set(float t0, T v0, T s0, float t1, T v1, T s1)
-        {
-            /*
-                Solve cubic equation:
-                    v(u) = d t^3 + c t^2 + b t + a
-                for
-                    v(0) = v0, v'(0) = s0, v(t1) = v1, v'(t1) = s1
-
-                Solution:
-                    a   = v0
-                    b   =                       s0
-                    c   = -3v0 +3v1 -2s0    -s1
-                    d = +2v0 -2v1 +s0       +s1
-            */
-
-            /*
-                Polynomial will be evaluated on adjusted parameter u == t-t0. u0 = 0, u1 = t1-t0.
-                The range is normalised to start at 0 to avoid extra terms in the coefficient
-                computation that can compromise precision. However, the range is not normalised
-                to length 1, because that would require a division at runtime. Instead, we perform
-                the division on the coefficients.
-            */
-            m_c[0] = v0;
-
-            if (t1 <= t0)
-            {
-                m_c[1] = m_c[2] = m_c[3] = T(0.f);
-            }
-            else
-            {
-                float idt = 1.f / (t1 - t0);
-
-                m_c[1] = T(s0 * idt);
-                m_c[2] = T((-3.0f * v0 + 3.0f * v1 - 2.0f * s0 - s1) * idt * idt);
-                m_c[3] = T((2.0f * v0 - 2.0f * v1 + s0 + s1) * idt * idt * idt);
-            }
-        }
-
-        void GetMemoryUsage(ICrySizer* pSizer) const {}
-    };
-
-    inline float fast_fmod(float x, float y)
-    {
-        return fmod_tpl(x, y);
-        //int ival = ftoi(x/y);
-        //return x - ival*y;
-    }
-
-    /****************************************************************************
-    **                            Key classes                                                                    **
-    ****************************************************************************/
-    template    <class T>
-    struct  SplineKey
-    {
-        typedef T   value_type;
-
-        float               time;       //!< Key time.
-        int                 flags;  //!< Key flags.
-        value_type  value;  //!< Key value.
-        value_type  ds;         //!< Incoming tangent.
-        value_type  dd;         //!< Outgoing tangent.
-        SplineKey()
-        {
-            memset(this, 0, sizeof(SplineKey));
-        }
-
-        SplineKey& operator=(const SplineKey& src) { memcpy(this, &src, sizeof(*this)); return *this; }
-
-        static void Reflect(AZ::SerializeContext* serializeContext) {}
-    };
-
-    template    <class T>
-    bool    operator ==(const SplineKey<T>& k1, const SplineKey<T>& k2) { return k1.time == k2.time; };
-    template    <class T>
-    bool    operator !=(const SplineKey<T>& k1, const SplineKey<T>& k2) { return k1.time != k2.time; };
-    template    <class T>
-    bool    operator < (const SplineKey<T>& k1, const SplineKey<T>& k2) { return k1.time < k2.time; };
-    template    <class T>
-    bool    operator > (const SplineKey<T>& k1, const SplineKey<T>& k2) { return k1.time > k2.time; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // TCBSplineKey class
-    //////////////////////////////////////////////////////////////////////////
-
-    template    <class T>
-    struct TCBSplineKey
-        :  public SplineKey<T>
-    {
-        // Key controls.
-        float tens;         //!< Key tension value.
-        float cont;         //!< Key continuity value.
-        float bias;         //!< Key bias value.
-        float easeto;       //!< Key ease to value.
-        float easefrom;     //!< Key ease from value.
-
-        TCBSplineKey() { tens = 0, cont = 0, bias = 0, easeto = 0, easefrom = 0; };
-    };
-
-    //! TCB spline key used in quaternion spline with angle axis as input.
-    struct TCBAngAxisKey
-        :  public TCBSplineKey<CryQuat>
-    {
-        float angle;
-        Vec3 axis;
-
-        TCBAngAxisKey()
-            : axis(0, 0, 0)
-            , angle(0) {};
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // General Spline class
-    //////////////////////////////////////////////////////////////////////////
-    template <class KeyType, class BasisType>
-    class TSpline
-    {
-    public:
-        typedef KeyType     key_type;
-        typedef typename KeyType::value_type    value_type;
-        typedef BasisType   basis_type;
-
-        // Out of range types.
-        enum
-        {
-            ORT_CONSTANT                =   0x0001, // Constant track.
-            ORT_CYCLE                       =   0x0002, // Cycle track
-            ORT_LOOP                        =   0x0003, // Loop track.
-            ORT_OSCILLATE               =   0x0004, // Oscillate track.
-            ORT_LINEAR                  =   0x0005, // Linear track.
-            ORT_RELATIVE_REPEAT =   0x0007  // Relative repeat track.
-        };
-        // Spline flags.
-        enum
-        {
-            MODIFIED        =   0x0001, // Track modified.
-            MUST_SORT       =   0x0002, // Track modified and must be sorted.
-        };
-
-        /////////////////////////////////////////////////////////////////////////////
-        // Methods.
-        inline TSpline()
-        {
-            m_flags = MODIFIED;
-            m_ORT = 0;
-            m_curr = 0;
-            m_rangeStart = 0;
-            m_rangeEnd = 0;
-            m_refCount = 0;
-        }
-
-        virtual ~TSpline() {};
-
-        ILINE void flag_set(int flag) { m_flags |= flag; };
-        ILINE void flag_clr(int flag) { m_flags &= ~flag; };
-        ILINE int  flag(int flag)  { return m_flags & flag; };
-
-        ILINE void ORT(int ort) { m_ORT = ort; };
-        ILINE int  ORT() const { return m_ORT; };
-        ILINE int  isORT(int o) const { return (m_ORT == o); };
-
-        ILINE void SetRange(float start, float end) { m_rangeStart = start; m_rangeEnd = end; };
-        ILINE float GetRangeStart() const { return m_rangeStart; };
-        ILINE float GetRangeEnd() const { return m_rangeEnd; };
-
-        // Keys access methods.
-        ILINE void reserve_keys(int n) { m_keys.reserve(n); };              // Reserve memory for more keys.
-        ILINE void clear()               { m_keys.clear(); };
-        ILINE void resize(int num)     { m_keys.resize(num); SetModified(true); };              // Set new key count.
-        ILINE bool empty() const         { return m_keys.empty(); };        // Check if curve empty (no keys).
-        ILINE int num_keys() const       { return (int)m_keys.size(); };        // Return number of keys in curve.
-
-        ILINE key_type& key(int n)     { return m_keys[n]; };               // Return n key.
-        ILINE float&    time(int n)      { return m_keys[n].time; };    // Shortcut to key n time.
-        ILINE value_type&   value(int n) { return m_keys[n].value; };   // Shortcut to key n value.
-        ILINE value_type&   ds(int n)    { return m_keys[n].ds; };          // Shortcut to key n incoming tangent.
-        ILINE value_type&   dd(int n)    { return m_keys[n].dd; };          // Shortcut to key n outgoing tangent.
-        ILINE int& flags(int n)        { return m_keys[n].flags; };   // Shortcut to key n flags.
-
-        ILINE key_type const&   key(int n) const          { return m_keys[n]; };                // Return n key.
-        ILINE float time(int n) const                             { return m_keys[n].time; };       // Shortcut to key n time.
-        ILINE value_type const& value(int n) const    { return m_keys[n].value; };      // Shortcut to key n value.
-        ILINE value_type const& ds(int n) const           { return m_keys[n].ds; };             // Shortcut to key n incoming tangent.
-        ILINE value_type const& dd(int n) const           { return m_keys[n].dd; };             // Shortcut to key n outgoing tangent.
-        ILINE int   flags(int n) const                { return m_keys[n].flags; };    // Shortcut to key n flags.
-
-        ILINE int GetInTangentType(int nkey) const  { return (flags(nkey) & SPLINE_KEY_TANGENT_IN_MASK)  >> SPLINE_KEY_TANGENT_IN_SHIFT; }
-        ILINE int GetOutTangentType(int nkey) const { return (flags(nkey) & SPLINE_KEY_TANGENT_OUT_MASK) >> SPLINE_KEY_TANGENT_OUT_SHIFT; }
-
-        ILINE void erase(int key)                     { m_keys.erase(m_keys.begin() + key); SetModified(true); };
-        ILINE bool closed()                                     { return (ORT() == ORT_LOOP); } // return True if curve closed.
-
-        ILINE void SetModified(bool bOn, bool bSort = false)
-        {
-            if (bOn)
-            {
-                m_flags |= MODIFIED;
-            }
-            else
-            {
-                m_flags &= ~(MODIFIED);
-            }
-            if (bSort)
-            {
-                m_flags |= MUST_SORT;
-            }
-            m_curr = 0;
-        }
-
-        ILINE void sort_keys()
-        {
-            std::stable_sort(m_keys.begin(), m_keys.end());
-            m_flags &= ~MUST_SORT;
-        }
-
-        ILINE void push_back(const key_type& k)
-        {
-            m_keys.push_back(k);
-            SetModified(true);
-        };
-        ILINE int insert_key(const key_type& k)
-        {
-            int num = num_keys();
-            for (int i = 0; i < num; i++)
-            {
-                if (m_keys[i].time > k.time)
-                {
-                    m_keys.insert(m_keys.begin() + i, k);
-                    SetModified(true);
-                    return i;
-                }
-            }
-            m_keys.push_back(k);
-            SetModified(true);
-            return num_keys() - 1;
-        };
-
-        ILINE int insert_key(float t, value_type const& val)
-        {
-            key_type key;
-            key.time = t;
-            key.value = val;
-            key.flags = 0;
-            Zero(key.ds);
-            Zero(key.dd);
-            return insert_key(key);
-        }
-
-        inline void update()
-        {
-            if (m_flags & MODIFIED)
-            {
-                sort_keys();
-                if (m_flags & MODIFIED)
-                {
-                    comp_deriv();
-                }
-            }
-        }
-
-        inline bool is_updated() const
-        {
-            return (m_flags & MODIFIED) == 0;
-        }
-
-        // Interpolate the value along the spline.
-        inline bool interpolate(float t, value_type& val)
-        {
-            update();
-
-            if (empty())
-            {
-                return false;
-            }
-
-            if (t < time(0))
-            {
-                val = value(0);
-                return true;
-            }
-
-            adjust_time(t);
-
-            int curr = seek_key(t);
-            if (curr < num_keys() - 1)
-            {
-                assert(t >= time(curr));
-                float u = (t - time(curr)) / (time(curr + 1) - time(curr));
-                interp_keys(curr, curr + 1, u, val);
-            }
-            else
-            {
-                val = value(num_keys() - 1);
-            }
-            return true;
-        }
-
-        size_t mem_size() const
-        {
-            return this->m_keys.capacity() * sizeof(this->m_keys[0]);
-        }
-
-        size_t sizeofThis() const
-        {
-            return sizeof(*this) + mem_size();
-        }
-
-        void swap(TSpline<KeyType, BasisType>& b)
-        {
-            using std::swap;
-
-            m_keys.swap(b.m_keys);
-            swap(m_flags, b.m_flags);
-            swap(m_ORT, b.m_ORT);
-            swap(m_curr, b.m_curr);
-            swap(m_rangeStart, b.m_rangeStart);
-            swap(m_rangeEnd, b.m_rangeEnd);
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // This two functions must be overridden in derived spline classes.
-        //////////////////////////////////////////////////////////////////////////
-        // Pre-compute spline tangents.
-        virtual void comp_deriv() = 0;
-        // Interpolate value between two keys.
-        virtual void interp_keys(int key1, int key2, float u, value_type& val) = 0;
-        //////////////////////////////////////////////////////////////////////////
-
-        static void Reflect(AZ::SerializeContext* serializeContext) {}
-     
-        inline void add_ref()
-        {
-            ++m_refCount;
-        };
-
-        inline void release()
-        {
-            AZ_Assert(m_refCount > 0, "Reference count logic error, trying to decrement reference when refCount is 0");
-            if (--m_refCount == 0)
-            {
-                delete this;
-            }
-        }
-
-    private:
-        int m_refCount;
-
-    protected:
-        AZStd::vector<key_type> m_keys;                 // List of keys.
-        uint8           m_flags;
-        uint8           m_ORT;                          // Out-Of-Range type.
-        int16           m_curr;                         // Current key in track.
-
-        float           m_rangeStart;
-        float           m_rangeEnd;
-
-        // Return key before or equal to this time.
-        inline int seek_key(float t)
-        {
-            assert(num_keys() < (1 << 15));
-            if ((m_curr >= num_keys()) || (time(m_curr) > t))
-            {
-                // Search from begining.
-                m_curr = 0;
-            }
-            while ((m_curr < num_keys() - 1) && (time(m_curr + 1) <= t))
-            {
-                ++m_curr;
-            }
-            return m_curr;
-        }
-
-        inline void adjust_time(float& t)
-        {
-            if (isORT(ORT_CYCLE) || isORT(ORT_LOOP))
-            {
-                if (num_keys() > 0)
-                {
-                    float endtime = time(num_keys() - 1);
-                    if (t > endtime)
-                    {
-                        // Warp time.
-                        t = fast_fmod(t, endtime);
-                    }
-                }
-            }
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // TSplineSlopes is default implementation of slope computation
-    //////////////////////////////////////////////////////////////////////////
-    template < class T, class Key = SplineKey<T>, bool bCLAMP = false >
-    class TSplineSlopes
-        : public TSpline< Key, TCoeffBasis<T> >
-    {
-    public:
-        typedef TSpline< Key, TCoeffBasis<T> > super_type;
-        using_type(super_type, key_type);
-        using_type(super_type, value_type);
-        static const bool clamp_range = bCLAMP;
-
-        void comp_deriv()
-        {
-            this->SetModified(false);
-
-            int last = this->num_keys() - 1;
-            if (last <= 0)
-            {
-                return;
-            }
-
-            if (bCLAMP)
-            {
-                // Change discontinuous slopes.
-                for (int i = 0; i <= last; ++i)
-                {
-                    // Out slopes.
-                    if (i < last && this->GetOutTangentType(i) == SPLINE_KEY_TANGENT_LINEAR)
-                    {
-                        // Set linear between points.
-                        this->dd(i) = this->value(i + 1) - this->value(i);
-                        if (this->GetInTangentType(i + 1) == SPLINE_KEY_TANGENT_NONE)
-                        {
-                            // Match continuous slope on right.
-                            this->dd(i) = 2.0f * this->dd(i) - this->ds(i + 1);
-                        }
-                    }
-                    else if (i < last && this->GetOutTangentType(i) == SPLINE_KEY_TANGENT_NONE)
-                    {
-                        this->dd(i) = value_type(0.f);
-                    }
-
-                    // In slopes.
-                    if (i > 0 && this->GetInTangentType(i) == SPLINE_KEY_TANGENT_LINEAR)
-                    {
-                        // Set linear between points.
-                        this->ds(i) = this->value(i) - this->value(i - 1);
-                        if (this->GetOutTangentType(i - 1) == SPLINE_KEY_TANGENT_NONE)
-                        {
-                            // Match continuous slope on left.
-                            this->ds(i) = 2.0f * this->ds(i) - this->dd(i - 1);
-                        }
-                    }
-                    else if (i < last && this->GetInTangentType(i) == SPLINE_KEY_TANGENT_NONE)
-                    {
-                        this->ds(i) = value_type(0.f);
-                    }
-                }
-            }
-            else
-            {
-                key_type& k0 = this->key(0);
-                key_type& k1 = this->key(last);
-
-                Zero(k0.ds);
-                k0.dd = (0.5f) * (this->value(1) - this->value(0));
-                k1.ds = (0.5f) * (this->value(last) - this->value(last - 1));
-                Zero(k1.dd);
-
-                for (int i = 1; i < (this->num_keys() - 1); ++i)
-                {
-                    key_type& key = this->key(i);
-                    key.ds = 0.5f * (this->value(i + 1) - this->value(i - 1));
-                    key.dd = key.ds;
-                }
-            }
-        }
-
-        virtual void interp_keys(int key1, int key2, float u, value_type& val)
-        {
-            // Compute coeffs dynamically.
-            TCoeffBasis<T> coeff;
-            coeff.set(0.f, this->value(key1), this->dd(key1), 1.f, this->value(key2), this->ds(key2));
-            val = coeff.eval(u);
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // CatmullRomSpline class implementation
-    //////////////////////////////////////////////////////////////////////////
-    template <class T, class Key = SplineKey<T>, bool bRangeLimit = false >
-    class CatmullRomSpline
-        : public TSplineSlopes< T, Key, bRangeLimit >
-    {
-    protected:
-
-        typedef TSplineSlopes< T, Key, bRangeLimit > super_type;
-
-        std::vector< TCoeffBasis<T> > m_coeffs;
-
-        virtual void comp_deriv()
-        {
-            super_type::comp_deriv();
-
-            // Store coeffs for each segment.
-            m_coeffs.resize(this->num_keys());
-
-            if (this->num_keys() > 0)
-            {
-                unsigned i;
-                for (i = 0; i < m_coeffs.size() - 1; i++)
-                {
-                    m_coeffs[i].set(this->time(i), this->value(i), this->dd(i), this->time(i + 1), this->value(i + 1), this->ds(i + 1));
-                }
-
-                // Last segment is just constant value.
-                m_coeffs[i].set(this->time(i), this->value(i), T(0.f), this->time(i) + 1.f, this->value(i), T(0.f));
-            }
-        }
-
-        virtual void interp_keys(int key1, int key2, float u, typename TSpline<Key, HermitBasis>::value_type& val)
-        {
-            u *= this->time(key2) - this->time(key1);
-            val = m_coeffs[key1].eval(u);
-        }
-
-    public:
-
-        size_t mem_size() const
-        {
-            return super_type::mem_size() + this->m_coeffs.capacity() * sizeof(this->m_coeffs[0]);
-        }
-        size_t sizeofThis() const
-        {
-            return sizeof(*this) + mem_size();
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Extended version of Hermit Spline.
-    // Provides more control on key tangents.
-    //////////////////////////////////////////////////////////////////////////
-    template <class T, class Key = SplineKey<T> >
-    class HermitSplineEx
-        : public TSpline< Key, HermitBasis >
-    {
-    public:
-        typedef TSpline< Key, HermitBasis > super_type;
-        using_type(super_type, key_type);
-        using_type(super_type, value_type);
-
-        virtual void comp_deriv()
-        {
-            this->SetModified(false);
-            if (this->num_keys() > 1)
-            {
-                int last = this->num_keys() - 1;
-                key_type& k0 = this->key(0);
-                key_type& k1 = this->key(last);
-                Zero(k0.ds);
-                Zero(k0.dd);
-                Zero(k1.ds);
-                Zero(k1.dd);
-
-                Zero(k0.ds);
-                k0.dd = (0.5f) * (this->value(1) - this->value(0));
-                k1.ds = (0.5f) * (this->value(last) - this->value(last - 1));
-                Zero(k1.dd);
-
-                for (int i = 1; i < (this->num_keys() - 1); ++i)
-                {
-                    key_type& key = this->key(i);
-                    key.ds = 0.5f * (this->value(i + 1) - this->value(i - 1));
-                    key.dd = key.ds;
-                    switch (this->GetInTangentType(i))
-                    {
-                    case SPLINE_KEY_TANGENT_STEP:
-                        key.ds = value_type();
-                        break;
-                    case SPLINE_KEY_TANGENT_ZERO:
-                        key.ds = value_type();
-                        break;
-                    case SPLINE_KEY_TANGENT_LINEAR:
-                        key.ds = this->value(i) - this->value(i - 1);
-                        break;
-                    }
-                    switch (this->GetOutTangentType(i))
-                    {
-                    case SPLINE_KEY_TANGENT_STEP:
-                        key.dd = value_type();
-                        break;
-                    case SPLINE_KEY_TANGENT_ZERO:
-                        key.dd = value_type();
-                        break;
-                    case SPLINE_KEY_TANGENT_LINEAR:
-                        key.dd = this->value(i + 1) - this->value(i);
-                        break;
-                    }
-                }
-            }
-        }
-
-    protected:
-        virtual void interp_keys(int from, int to, float u, T& val)
-        {
-            if (this->GetInTangentType(to) == SPLINE_KEY_TANGENT_STEP || this->GetOutTangentType(from) == SPLINE_KEY_TANGENT_STEP)
-            {
-                val = this->value(from);
-                return;
-            }
-            typename TSpline<Key, HermitBasis >::basis_type basis(u);
-            val = (basis[0] * this->value(from)) + (basis[1] * this->value(to)) + (basis[2] * this->dd(from)) + (basis[3] * this->ds(to));
-        }
-    };
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Bezier Spline.
-    //////////////////////////////////////////////////////////////////////////
-    template <class T, class Key = SplineKey<T> >
-    class BezierSpline
-        : public TSpline< Key, BezierBasis >
-    {
-    public:
-        typedef TSpline< Key, BezierBasis > super_type;
-        using_type(super_type, key_type);
-        using_type(super_type, value_type);
-
-        virtual void comp_deriv()
-        {
-            this->SetModified(false);
-
-            if (this->num_keys() > 1)
-            {
-                const float oneThird = 1 / 3.0f;
-
-                const int last = this->num_keys() - 1;
-
-                {
-                    if (this->GetInTangentType(0) != SPLINE_KEY_TANGENT_CUSTOM)
-                    {
-                        Zero(this->key(0).ds);
-                    }
-                    if (this->GetOutTangentType(0) != SPLINE_KEY_TANGENT_CUSTOM)
-                    {
-                        this->key(0).dd = oneThird * (this->value(1) - this->value(0));
-                    }
-
-                    if (this->GetInTangentType(last) != SPLINE_KEY_TANGENT_CUSTOM)
-                    {
-                        this->key(last).ds = oneThird * (this->value(last) - this->value(last - 1));
-                    }
-                    if (this->GetOutTangentType(last) != SPLINE_KEY_TANGENT_CUSTOM)
-                    {
-                        Zero(this->key(last).dd);
-                    }
-                }
-
-                for (int i = 1; i < last; ++i)
-                {
-                    key_type& key = this->key(i);
-                    T ds0 = key.ds;
-                    T dd0 = key.dd;
-
-                    const float deltaTime = this->time(i + 1) - this->time(i - 1);
-                    if (deltaTime <= 0)
-                    {
-                        Zero(key.ds);
-                        Zero(key.dd);
-                    }
-                    else
-                    {
-                        const float k = (this->time(i) - this->time(i - 1)) / deltaTime;
-                        const value_type deltaValue = this->value(i + 1) - this->value(i - 1);
-                        key.ds = oneThird * deltaValue * k;
-                        key.dd = oneThird * deltaValue * (1 - k);
-                    }
-
-                    switch (this->GetInTangentType(i))
-                    {
-                    case SPLINE_KEY_TANGENT_STEP:
-                        Zero(key.ds);
-                        break;
-                    case SPLINE_KEY_TANGENT_ZERO:
-                        Zero(key.ds);
-                        break;
-                    case SPLINE_KEY_TANGENT_LINEAR:
-                        key.ds = oneThird * (this->value(i) - this->value(i - 1));
-                        break;
-                    case SPLINE_KEY_TANGENT_CUSTOM:
-                        key.ds = ds0;
-                        break;
-                    }
-
-                    switch (this->GetOutTangentType(i))
-                    {
-                    case SPLINE_KEY_TANGENT_STEP:
-                        Zero(key.dd);
-                        break;
-                    case SPLINE_KEY_TANGENT_ZERO:
-                        Zero(key.dd);
-                        break;
-                    case SPLINE_KEY_TANGENT_LINEAR:
-                        key.dd = oneThird * (this->value(i + 1) - this->value(i));
-                        break;
-                    case SPLINE_KEY_TANGENT_CUSTOM:
-                        key.dd = dd0;
-                        break;
-                    }
-                }
-            }
-        }
-
-        static void Reflect(AZ::SerializeContext* serializeContext) {}
-
-    protected:
-        virtual void interp_keys(int from, int to, float u, T& val)
-        {
-            if (this->GetOutTangentType(from) == SPLINE_KEY_TANGENT_STEP)
-            {
-                val = this->value(to);
-            }
-            else if (this->GetInTangentType(to) == SPLINE_KEY_TANGENT_STEP)
-            {
-                val = this->value(from);
-            }
-            else
-            {
-                typename TSpline<Key, BezierBasis >::basis_type basis(u);
-
-                const T p0 = this->value(from);
-                const T p3 = this->value(to);
-                const T p1 = p0 + this->dd(from);
-                const T p2 = p3 - this->ds(to);
-
-                val = (basis[0] * p0) + (basis[1] * p1) + (basis[2] * p2) + (basis[3] * p3);
-            }
-        }
-    };
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Base class for spline interpolators.
-    //////////////////////////////////////////////////////////////////////////
-
-    template <typename spline_type>
-    struct SSplineBackup
-        : public ISplineBackup
-        , public spline_type
-    {
-        int refCount;
-
-        SSplineBackup(spline_type const& s)
-            : spline_type(s)
-            , refCount(0) {}
-        virtual void AddRef() {++refCount; }
-        virtual void Release()
-        {
-            if (--refCount <= 0)
-            {
-                delete this;
-            }
-        }
-    };
-
-    template <class value_type, class spline_type>
-    class CBaseSplineInterpolator
-        : public ISplineInterpolator
-        , public spline_type
-    {
-    public:
-        static const int DIM = sizeof(value_type) / sizeof(ElemType);
-
-        //////////////////////////////////////////////////////////////////////////
-        inline void ToValueType(const value_type& t, ValueType& v) { *(value_type*)v = t; }
-        inline void FromValueType(ValueType v, value_type& t) { t = *(value_type*)v; }
-        //////////////////////////////////////////////////////////////////////////
-
-        virtual void SetModified(bool b, bool bSort = false)
-        {
-            spline_type::SetModified(b, bSort);
-        }
-        virtual int GetNumDimensions()
-        {
-            assert(sizeof(value_type) % sizeof(ElemType) == 0);
-            return DIM;
-        }
-
-        virtual int InsertKey(float t, ValueType val)
-        {
-            value_type value;
-            FromValueType(val, value);
-            return spline_type::insert_key(t, value);
-        }
-        virtual void RemoveKey(int key)
-        {
-            if (key >= 0 && key < this->num_keys())
-            {
-                this->erase(key);
-            }
-        }
-        virtual void FindKeysInRange(float startTime, float endTime, int& firstFoundKey, int& numFoundKeys)
-        {
-            int count = this->num_keys();
-            int start = 0;
-            int end = count;
-            for (int i = 0; i < count; ++i)
-            {
-                float keyTime = this->key(i).time;
-                if (keyTime < startTime)
-                {
-                    start = i + 1;
-                }
-                if (keyTime > endTime && end > i)
-                {
-                    end = i;
-                }
-            }
-            if (start < end)
-            {
-                firstFoundKey = start;
-                numFoundKeys = end - start;
-            }
-            else
-            {
-                firstFoundKey = -1;
-                numFoundKeys = 0;
-            }
-        }
-        virtual void RemoveKeysInRange(float startTime, float endTime)
-        {
-            int firstFoundKey, numFoundKeys;
-            FindKeysInRange(startTime, endTime, firstFoundKey, numFoundKeys);
-            while (numFoundKeys-- > 0)
-            {
-                this->erase(firstFoundKey++);
-            }
-        }
-        virtual int GetKeyCount()
-        {
-            return this->num_keys();
-        };
-        virtual float GetKeyTime(int key)
-        {
-            if (key >= 0 && key < this->num_keys())
-            {
-                return this->key(key).time;
-            }
-            return 0;
-        }
-        virtual bool GetKeyValue(int key, ValueType& val)
-        {
-            if (key >= 0 && key < this->num_keys())
-            {
-                ToValueType(this->key(key).value, val);
-                return true;
-            }
-            return false;
-        }
-        virtual void SetKeyValue(int k, ValueType val)
-        {
-            if (k >= 0 && k < this->num_keys())
-            {
-                FromValueType(val, this->key(k).value);
-                this->SetModified(true);
-            }
-        }
-        virtual void SetKeyTime(int k, float fTime)
-        {
-            if (k >= 0 && k < this->num_keys())
-            {
-                this->key(k).time = fTime;
-                this->SetModified(true, true);
-            }
-        }
-        virtual void  SetKeyInTangent(int k, ValueType tin)
-        {
-            if (k >= 0 && k < this->num_keys())
-            {
-                FromValueType(tin, this->key(k).ds);
-                this->SetModified(true);
-            }
-        }
-        virtual void  SetKeyOutTangent(int k, ValueType tout)
-        {
-            if (k >= 0 && k < this->num_keys())
-            {
-                FromValueType(tout, this->key(k).dd);
-                this->SetModified(true);
-            }
-        }
-        virtual void  SetKeyTangents(int k, ValueType tin, ValueType tout)
-        {
-            if (k >= 0 && k < this->num_keys())
-            {
-                FromValueType(tin, this->key(k).ds);
-                FromValueType(tout, this->key(k).dd);
-                this->SetModified(true);
-            }
-        }
-        virtual bool GetKeyTangents(int k, ValueType& tin, ValueType& tout)
-        {
-            if (k >= 0 && k < this->num_keys())
-            {
-                ToValueType(this->key(k).ds, tin);
-                ToValueType(this->key(k).dd, tout);
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        virtual void  SetKeyFlags(int k, int flags)
-        {
-            if (k >= 0 && k < this->num_keys())
-            {
-                this->key(k).flags = flags;
-                this->SetModified(true);
-            }
-        }
-        virtual int   GetKeyFlags(int k)
-        {
-            if (k >= 0 && k < this->num_keys())
-            {
-                return this->key(k).flags;
-            }
-            return 0;
-        }
-
-        virtual void Interpolate(float time, ValueType& value)
-        {
-            value_type v;
-            if (spline_type::interpolate(time, v))
-            {
-                ToValueType(v, value);
-            }
-        }
-
-        virtual ISplineBackup* Backup()
-        {
-            return new SSplineBackup<spline_type>(*this);
-        }
-
-        virtual void Restore(ISplineBackup* p)
-        {
-            SSplineBackup<spline_type>* pBackup = static_cast<SSplineBackup<spline_type>*>(p);
-            static_cast<spline_type&>(*this) = *pBackup;
-        }
-    };
-}
-
-namespace AZ
-{
-    AZ_TYPE_INFO_SPECIALIZE(spline::SplineKey<Vec2>, "{24A4D7E5-C36D-427D-AB49-CD86573B7288}");
-}
-#endif // CRYINCLUDE_CRYCOMMON_ISPLINES_H
diff --git a/Code/CryEngine/CryCommon/IStatObj.h b/Code/CryEngine/CryCommon/IStatObj.h
deleted file mode 100644
index 2ba9d0cd16..0000000000
--- a/Code/CryEngine/CryCommon/IStatObj.h
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "smartptr.h"           // TYPEDEF_AUTOPTR
-#include "IMaterial.h"
-
-// forward declarations
-//////////////////////////////////////////////////////////////////////
-struct ShadowMapFrustum;
-struct SRenderingPassInfo;
-struct SRendItemSorter;
-struct IShader;
-struct SPhysGeomArray;
-struct CStatObj;
-
-class CRenderObject;
-class CDLight;
-class IReadStream;
-class CRenderObject;
-class CLodValue;
-
-
-TYPEDEF_AUTOPTR(IReadStream);
-
-//! Interface to non animated object
-struct phys_geometry;
-struct IChunkFile;
-
-// General forward declaration.
-class CRenderObject;
-struct SMeshLodInfo;
-
-#include "CryHeaders.h"
-#include "Cry_Math.h"
-#include "Cry_Geo.h"
-#include "IPhysics.h"
-
-#define MAX_STATOBJ_LODS_NUM 6
-
-//////////////////////////////////////////////////////////////////////////
-// 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.
-    STATIC_SUB_OBJECT_POINT,
-    STATIC_SUB_OBJECT_DUMMY,
-    STATIC_SUB_OBJECT_XREF,
-    STATIC_SUB_OBJECT_CAMERA,
-    STATIC_SUB_OBJECT_LIGHT,
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Flags that can be set on static object.
-//////////////////////////////////////////////////////////////////////////
-enum EStaticObjectFlags
-{
-    STATIC_OBJECT_HIDDEN  =    BIT(0), // When set static object will not be displayed.
-    STATIC_OBJECT_CLONE     =      BIT(1), // specifies whether this object was cloned for modification
-    STATIC_OBJECT_GENERATED  = BIT(2), // tells that the object was generated procedurally (breakable obj., f.i.)
-    STATIC_OBJECT_CANT_BREAK = BIT(3), // StatObj has geometry unsuitable for procedural breaking
-    STATIC_OBJECT_DEFORMABLE = BIT(4), // StatObj can be procedurally smeared (using SmearStatObj)
-    STATIC_OBJECT_COMPOUND   = BIT(5), // StatObj has subobject meshes
-    STATIC_OBJECT_MULTIPLE_PARENTS = BIT(6), // Child StatObj referenced by several parents
-
-    // Collisions
-    STATIC_OBJECT_NO_PLAYER_COLLIDE = BIT(10),
-
-    // Special flags.
-    STATIC_OBJECT_SPAWN_ENTITY    = BIT(20), // StatObj spawns entity when broken.
-    STATIC_OBJECT_NO_AUTO_HIDEPOINTS = BIT(22), // Do not generate AI auto hide points around object if it's dynamic
-    STATIC_OBJECT_DYNAMIC                   = BIT(23), // mesh data should be kept in system memory (and yes, the name *is* an oxymoron)
-};
-
-#define HIT_NO_HIT (-1)
-#define HIT_UNKNOWN (-2)
-
-#define HIT_OBJ_TYPE_BRUSH   0
-#define HIT_OBJ_TYPE_TERRAIN 1
-#define HIT_OBJ_TYPE_VISAREA 2
-
-// used for on-CPU voxelization
-struct SRayHitTriangle
-{
-    SRayHitTriangle() { ZeroStruct(*this); }
-    Vec3 v[3];
-    Vec2 t[3];
-    ColorB c[3];
-    Vec3 n;
-    _smart_ptr<IMaterial> pMat;
-    uint8 nTriArea;
-    uint8 nOpacity;
-    uint8 nHitObjType;
-};
-
-struct SRayHitInfo
-{
-    SRayHitInfo()
-    {
-        memset(this, 0, sizeof(*this));
-        nHitTriID = HIT_UNKNOWN;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    // Input parameters.
-    Vec3    inReferencePoint;
-    Ray     inRay;
-    bool    bInFirstHit;
-    bool        inRetTriangle;
-    bool    bUseCache;
-    bool    bOnlyZWrite;
-    bool    bGetVertColorAndTC;
-    float   fMaxHitDistance; // When not 0, only hits with closer distance will be registered.
-    Vec3        vTri0;
-    Vec3        vTri1;
-    Vec3        vTri2;
-    float       fMinHitOpacity;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Output parameters.
-    float fDistance; // Distance from reference point.
-    Vec3 vHitPos;
-    Vec3 vHitNormal;
-    int  nHitMatID; // Material Id that was hit.
-    int  nHitTriID; // Triangle Id that was hit.
-    int  nHitSurfaceID; // Material Id that was hit.
-    struct IRenderMesh* pRenderMesh;
-    struct IStatObj* pStatObj;
-    Vec2 vHitTC;
-    Vec4 vHitColor;
-    Vec4 vHitTangent;
-    Vec4 vHitBitangent;
-    PodArray<SRayHitTriangle>* pHitTris;
-};
-
-enum EFileStreamingStatus
-{
-    ecss_NotLoaded,
-    ecss_InProgress,
-    ecss_Ready
-};
-
-// Interface for streaming of objects like CStatObj.
-struct IStreamable
-{
-    struct SInstancePriorityInfo
-    {
-        int   nRoundId;
-        float fMaxImportance;
-    };
-
-    IStreamable()
-    {
-        ZeroStruct(m_arrUpdateStreamingPrioriryRoundInfo);
-        m_eStreamingStatus = ecss_NotLoaded;
-        fCurImportance = 0;
-        m_nSelectedFrameId = 0;
-        m_nStatsInUse = 0;
-    }
-
-    bool UpdateStreamingPrioriryLowLevel(float fImportance, int nRoundId, bool bFullUpdate)
-    {
-        bool bRegister = false;
-
-        if (m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId != nRoundId)
-        {
-            if (!m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId)
-            {
-                bRegister = true;
-            }
-
-            m_arrUpdateStreamingPrioriryRoundInfo[1] = m_arrUpdateStreamingPrioriryRoundInfo[0];
-
-            m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId = nRoundId;
-            m_arrUpdateStreamingPrioriryRoundInfo[0].fMaxImportance = fImportance;
-        }
-        else
-        {
-            m_arrUpdateStreamingPrioriryRoundInfo[0].fMaxImportance = max(m_arrUpdateStreamingPrioriryRoundInfo[0].fMaxImportance, fImportance);
-        }
-
-        if (bFullUpdate)
-        {
-            m_arrUpdateStreamingPrioriryRoundInfo[1] = m_arrUpdateStreamingPrioriryRoundInfo[0];
-            m_arrUpdateStreamingPrioriryRoundInfo[1].nRoundId--;
-        }
-
-        return bRegister;
-    }
-
-    // <interfuscator:shuffle>
-    virtual ~IStreamable(){}
-    virtual void StartStreaming(bool bFinishNow, IReadStream_AutoPtr* ppStream) = 0;
-    virtual int GetStreamableContentMemoryUsage(bool bJustForDebug = false) = 0;
-    virtual void ReleaseStreamableContent() = 0;
-    virtual void GetStreamableName(string& sName) = 0;
-    virtual uint32 GetLastDrawMainFrameId() = 0;
-    virtual bool IsUnloadable() const = 0;
-
-    SInstancePriorityInfo m_arrUpdateStreamingPrioriryRoundInfo[2];
-    float fCurImportance;
-    EFileStreamingStatus m_eStreamingStatus;
-    uint32 m_nSelectedFrameId : 31;
-    uint32 m_nStatsInUse : 1;
-};
-
-struct SMeshBoneMapping_uint8;
-struct SSpine;
-struct SMeshColor;
-
-// Summary:
-//     Interface to hold static object data
-struct IStatObj
-    : public IStreamable
-{
-    //! Loading flags
-    enum ELoadingFlags
-    {
-        ELoadingFlagsPreviewMode = BIT(0),
-        ELoadingFlagsForceBreakable = BIT(1),
-        ELoadingFlagsIgnoreLoDs = BIT(2),
-        ELoadingFlagsTessellate = BIT(3), // if e_StatObjTessellation enabled
-        ELoadingFlagsJustGeometry = BIT(4), // for streaming, to avoid parsing all chunks
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // SubObject
-    //////////////////////////////////////////////////////////////////////////
-    struct SSubObject
-    {
-        SSubObject() { bShadowProxy = 0; }
-
-        EStaticSubObjectType nType;
-        string name;
-        string properties;
-        int nParent;          // Index of the parent sub object, if there`s hierarchy between them.
-        Matrix34 tm;          // Transformation matrix.
-        Matrix34 localTM;     // Local transformation matrix, relative to parent.
-        IStatObj* pStatObj;   // Static object for sub part of CGF.
-        Vec3 helperSize;      // Size of the helper (if helper).
-        struct IRenderMesh* pWeights; // render mesh with a single deformation weights stream
-        unsigned int bIdentityMatrix : 1; // True if sub object matrix is identity.
-        unsigned int bHidden : 1; // True if sub object is hidden
-        unsigned int bShadowProxy : 1; // Child StatObj has 'shadowproxy' in name
-        unsigned int nBreakerJoints : 8; // number of joints that can switch this part to a broken state
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(name);
-            pSizer->AddObject(properties);
-        }
-    };
-    //////////////////////////////////////////////////////////////////////////
-
-    // Statistics information about this object.
-    struct SStatistics
-    {
-        int nVertices;
-        int nVerticesPerLod[MAX_STATOBJ_LODS_NUM];
-        int nIndices;
-        int nIndicesPerLod[MAX_STATOBJ_LODS_NUM];
-        int nMeshSize;
-        int nMeshSizeLoaded;
-        int nPhysProxySize;
-        int nPhysProxySizeMax;
-        int nPhysPrimitives;
-        int nDrawCalls;
-        int nLods;
-        int nSubMeshCount;
-        int nNumRefs;
-        bool bSplitLods; // Lods split between files.
-
-        // Optional texture sizer.
-        ICrySizer* pTextureSizer;
-        ICrySizer* pTextureSizer2;
-
-        SStatistics() { Reset(); }
-
-        void Reset()
-        {
-            pTextureSizer = NULL;
-            pTextureSizer2 = NULL;
-            nVertices = 0;
-            nIndices = 0;
-            nMeshSize = 0;
-            nMeshSizeLoaded = 0;
-            nNumRefs = 0;
-            nPhysProxySize = 0;
-            nPhysPrimitives = 0;
-            nDrawCalls = 0;
-            nLods = 0;
-            nSubMeshCount = 0;
-            bSplitLods = false;
-            ZeroStruct(nVerticesPerLod);
-            ZeroStruct(nIndicesPerLod);
-        }
-    };
-
-    // <interfuscator:shuffle>
-    // Description:
-    //     Increase the reference count of the object.
-    // Summary:
-    //     Notifies that the object is being used
-    virtual int AddRef() = 0;
-
-    // Description:
-    //     Decrease the reference count of the object. If the reference count
-    //     reaches zero, the object will be deleted from memory.
-    // Summary:
-    //     Notifies that the object is no longer needed
-    virtual int Release() = 0;
-
-    // Description:
-    //     Set static object flags.
-    // Arguments:
-    //     nFlags - flags to set, a combination of EStaticObjectFlags values.
-    virtual void SetFlags(int nFlags) = 0;
-
-    // Description:
-    //     Retrieve flags set on the static object.
-    virtual int GetFlags() const = 0;
-
-    // Sets the default object indicator
-    virtual void SetDefaultObject(bool state) = 0;
-
-    // Description:
-    //     Retrieves the internal flag m_nVehicleOnlyPhysics.
-    virtual unsigned int  GetVehicleOnlyPhysics() = 0;
-
-    // Description:
-    //     Retrieves the internal flag m_nIdMaterialBreakable.
-    virtual int  GetIDMatBreakable() = 0;
-
-    // Description:
-    //     Retrieves the internal flag m_bBreakableByGame.
-    virtual unsigned int  GetBreakableByGame() = 0;
-
-    // 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;
-
-    // Description:
-    //     Create an empty indexed mesh ready to be filled with data
-    //      If an indexed mesh already exists it is returned
-    // Return Value:
-    //     An empty indexed mesh or the existing indexed mesh
-    virtual struct IIndexedMesh* CreateIndexedMesh() = 0;
-
-    //! Access to rendering geometry for indoor engine ( optimized vert arrays, lists of shader pointers )
-    virtual struct IRenderMesh* GetRenderMesh() = 0;
-
-    // Description:
-    //     Returns the physical representation of the object.
-    // Arguments:
-    //     nType - one of PHYS_GEOM_TYPE_'s, or an explicit slot index
-    // Return Value:
-    //     A pointer to a phys_geometry structure.
-    // Summary:
-    //     Get the physic representation
-    virtual phys_geometry* GetPhysGeom(int nType = PHYS_GEOM_TYPE_DEFAULT) = 0;
-
-    // Description:
-    //       Updates rendermesh's vertices, normals, and tangents with the data provided
-    // Summary:
-    //       Updates vertices in the range [iVtx0..iVtx0+nVtx-1], vertices are in their original order
-    //       (as they are physicalized). Clones the object if necessary to make the modifications
-    // Return Value:
-    //     modified IStatObj (a clone or this one, if it's already a clone)
-    virtual IStatObj* UpdateVertices(strided_pointer<Vec3> pVtx, strided_pointer<Vec3> pNormals, int iVtx0, int nVtx, int* pVtxMap = 0, float rscale = 1.f) = 0;
-
-    // Description:
-    //       Skins rendermesh's vertices based on skeleton vertices
-    // Summary:
-    //       Skins vertices based on mtxSkelToMesh[pSkelVtx[i]]
-    //       Clones the object if necessary to make the modifications
-    // Return Value:
-    //     modified IStatObj (a clone or this one, if it's already a clone)
-    virtual IStatObj* SkinVertices(strided_pointer<Vec3> pSkelVtx, const Matrix34& mtxSkelToMesh) = 0;
-
-    // Description:
-    //     Sets and replaces the physical representation of the object.
-    // Arguments:
-    //       pPhysGeom - A pointer to a phys_geometry class.
-    //     nType - Pass 0 to set the physic geometry or pass 1 to set the obstruct geometry
-    // Summary:
-    //     Set the physic representation
-    virtual void SetPhysGeom(phys_geometry* pPhysGeom, int nType = 0) = 0;
-
-    // Description:
-    //     Returns a tetrahedral lattice, if any (used for breakable objects)
-    virtual ITetrLattice* GetTetrLattice() = 0;
-
-    virtual float GetAIVegetationRadius() const = 0;
-    virtual void SetAIVegetationRadius(float radius) = 0;
-
-    // Description:
-    //     Set default material for the geometry.
-    // Arguments:
-    //     pMaterial - A valid pointer to the material.
-    virtual void SetMaterial(_smart_ptr<IMaterial> pMaterial) = 0;
-
-    // Description:
-    //     Returns default material of the geometry.
-    // Arguments:
-    //     nType - Pass 0 to get the physic geometry or pass 1 to get the obstruct geometry
-    // Return Value:
-    //     A pointer to a phys_geometry class.
-    virtual _smart_ptr<IMaterial> GetMaterial() = 0;
-    virtual const _smart_ptr<IMaterial> GetMaterial() const = 0;
-
-    // Return Value:
-    //     A Vec3 object containing the bounding box.
-    // Summary:
-    //     Get the minimal bounding box component
-    virtual Vec3 GetBoxMin() = 0;
-
-    // Return Value:
-    //     A Vec3 object containing the bounding box.
-    // Summary:
-    //     Get the minimal bounding box component
-    virtual Vec3 GetBoxMax() = 0;
-
-    // Return Value:
-    //     A Vec3 object containing the bounding box center.
-    // Summary:
-    //     Get the center of bounding box
-    virtual const Vec3 GetVegCenter() = 0;
-
-    // Arguments:
-    //     Minimum bounding box component
-    // Summary:
-    //     Set the minimum bounding box component
-    virtual void    SetBBoxMin(const Vec3& vBBoxMin) = 0;
-
-    // Arguments:
-    //     Minimum bounding box component
-    // Summary:
-    //     Set the minimum bounding box component
-    virtual void    SetBBoxMax(const Vec3& vBBoxMax) = 0;
-
-    // Summary:
-    //     Get the object radius
-    // Return Value:
-    //     A float containing the radius
-    virtual float GetRadius() = 0;
-
-    // Description:
-    //     Reloads one or more component of the object. The possible flags
-    //     are FRO_SHADERS, FRO_TEXTURES and FRO_GEOMETRY.
-    // Arguments:
-    //     nFlags - One or more flag which indicate which element of the object
-    //     to reload
-    // Summary:
-    //     Reloads the object
-    virtual void Refresh(int nFlags) = 0;
-
-    // Description:
-    //     Registers the object elements into the renderer.
-    // Arguments:
-    //     rParams   - Render parameters
-    //     nLogLevel - Level of the LOD
-    // Summary:
-    //     Renders the object
-    virtual void Render(const struct SRendParams& rParams, const SRenderingPassInfo& passInfo) = 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;
-
-    // Summary:
-    //     Generate a random point in object.
-    // Arguments:
-    //     eForm - Object aspect to generate on (surface, volume, etc)
-    virtual float GetExtent(EGeomForm eForm) = 0;
-    virtual void GetRandomPos(PosNorm& ran, EGeomForm eForm) const = 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;
-    virtual IStatObj* GetLowestLod() = 0;
-    virtual int FindNearesLoadedLOD(int nLodIn, bool bSearchUp = false) = 0;
-    virtual int FindHighestLOD(int nBias) = 0;
-
-    virtual bool LoadCGF(const char* filename, bool bLod, unsigned long nLoadingFlags, const void* pData, const int nDataSize) = 0;
-    virtual void DisableStreaming() = 0;
-    virtual void TryMergeSubObjects(bool bFromStreaming) = 0;
-    virtual bool IsUnloadable() const = 0;
-    virtual void SetCanUnload(bool value) = 0;
-
-    virtual string& GetFileName() = 0;
-    virtual const string& GetFileName() const = 0;
-
-    virtual const string& GetCGFNodeName() const = 0;
-
-    // Summary:
-    //     Returns the filename of the object
-    // Return Value:
-    //     A null terminated string which contain the filename of the object.
-    virtual const char* GetFilePath() const = 0;
-
-    // Summary:
-    //     Set the filename of the object
-    // Arguments:
-    //     szFileName - New filename of the object
-    // Return Value:
-    //       None
-    virtual void SetFilePath(const char* szFileName) = 0;
-
-    // Summary:
-    //     Returns the name of the geometry
-    // Return Value:
-    //     A null terminated string which contains the name of the geometry
-    virtual const char* GetGeoName() = 0;
-
-    // Summary:
-    //     Sets the name of the geometry
-    virtual void SetGeoName(const char* szGeoName) = 0;
-
-    // Summary:
-    //     Compares if another object is the same
-    // Arguments:
-    //     szFileName - Filename of the object to compare
-    //     szGeomName - Geometry name of the object to compare (optional)
-    // Return Value:
-    //     A boolean which equals to true in case both object are the same, or false in the opposite case.
-    virtual bool IsSameObject(const char* szFileName, const char* szGeomName) = 0;
-
-    // Description:
-    //     Will return the position of the helper named in the argument. The
-    //     helper should have been specified during the exporting process of
-    //     the cgf file.
-    // Arguments:
-    //     szHelperName - A null terminated string holding the name of the helper
-    // Return Value:
-    //     A Vec3 object which contains the position.
-    // Summary:
-    //     Gets the position of a specified helper
-    virtual Vec3 GetHelperPos(const char* szHelperName) = 0;
-
-    // Summary:
-    //     Gets the transformation matrix of a specified helper, see GetHelperPos
-    virtual const Matrix34& GetHelperTM(const char* szHelperName) = 0;
-
-    //! Tell us if the object is not found
-    virtual bool IsDefaultObject() = 0;
-
-    // Summary:
-    //     Free the geometry data
-    virtual void FreeIndexedMesh() = 0;
-
-    // Pushes the underlying tree of objects into the given Sizer object for statistics gathering
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const = 0;
-
-    //DOC-IGNORE-BEGIN
-    //! used for sprites
-    virtual float& GetRadiusVert() = 0;
-
-    //! used for sprites
-    virtual float& GetRadiusHors() = 0;
-    //DOC-IGNORE-END
-
-    // Summary:
-    //     Determines if the object has physics capabilities
-    virtual bool IsPhysicsExist() = 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; }
-
-    // Summary:
-    //     Invalidates geometry inside IStatObj, will mark hosted IIndexedMesh as invalid.
-    // Arguments:
-    //     bPhysics - if true will also recreate physics for indexed mesh.
-    virtual void Invalidate(bool bPhysics = false, float tolerance = 0.05f) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Interface to the Sub Objects.
-    //////////////////////////////////////////////////////////////////////////
-    // Summary:
-    //    Retrieve number of sub-objects.
-    virtual int GetSubObjectCount() const = 0;
-    // Summary:
-    //    Sets number of sub-objects.
-    virtual void SetSubObjectCount(int nCount) = 0;
-    // Summary:
-    //    Retrieve sub object by index, where 0 <= nIndex < GetSubObjectCount()
-    virtual IStatObj::SSubObject* GetSubObject(int nIndex) = 0;
-    // Summary:
-    //    Check if this object is sub object of another IStatObj.
-    virtual bool IsSubObject() const = 0;
-    // Summary:
-    //    Retrieve parent static object, only relevant when this IStatObj is Sub-object.
-    virtual IStatObj* GetParentObject() const = 0;
-    // Summary:
-    //    Retrieve the static object, from which this one was cloned (if that is the case)
-    virtual IStatObj* GetCloneSourceObject() const = 0;
-    // Summary:
-    //    Find sub-pbject by name.
-    virtual IStatObj::SSubObject* FindSubObject(const char* sNodeName) = 0;
-    //    Find sub-object by name (including spaces, comma and semi-colon.
-    virtual IStatObj::SSubObject* FindSubObject_CGA(const char* sNodeName) = 0;
-
-    // Summary:
-    //    Find object by full name (use all the characters)
-    virtual IStatObj::SSubObject* FindSubObject_StrStr(const char* sNodeName) = 0;
-    //    Remove Sub-Object.
-    virtual bool RemoveSubObject(int nIndex) = 0;
-    //    Copy Sub-Object.
-    virtual bool CopySubObject(int nToIndex, IStatObj* pFromObj, int nFromIndex) = 0;
-    //    adds a new sub object
-    virtual IStatObj::SSubObject& AddSubObject(IStatObj* pStatObj) = 0;
-
-    // Summary:
-    //      Adds subobjects to pent, meshes as parts, joint helpers as breakable joints
-    virtual int PhysicalizeSubobjects(IPhysicalEntity* pent, const Matrix34* pMtx, float mass, float density = 0.0f, int id0 = 0, strided_pointer<int> pJointsIdMap = 0, const char* szPropsOverride = 0) = 0;
-    // Summary:
-    //      Adds all phys geometries to pent, assigns ids starting from id; takes mass and density from the StatObj properties if not set in pgp
-    //    for compound objects calls PhysicalizeSubobjects
-    //    returns the physical id of the last physicalized part
-    virtual int Physicalize(IPhysicalEntity* pent, pe_geomparams* pgp, int id = 0, const char* szPropsOverride = 0) = 0;
-
-    virtual bool IsDeformable() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Save contents of static object to the CGF file.
-    //////////////////////////////////////////////////////////////////////////
-    // Save object to the CGF file.
-    // Arguments:
-    //    sFilename
-    //          Filename of the CGF file.
-    //          Note that the function fails if pOutChunkFile is NULL and the path
-    //          to the file does not exist on the drive. You can call
-    //          CFileUtil::CreatePath() before SaveToCGF() call to create all
-    //          folders that do not exist yet.
-    //    pOutChunkFile
-    //          Optional output parameter. If it is specified then the file will not be written to
-    //          the drive but instead the function returns a pointer to the IChunkFile interface with
-    //          filled CGF chunks. Caller of the function is responsible to call Release method
-    //          of IChunkFile to release it later.
-    virtual bool SaveToCGF(const char* sFilename, IChunkFile** pOutChunkFile = NULL, bool bHavePhysicalProxy = false) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Summary:
-    //    Clones static geometry, Makes an exact copy of the Static object and the contained geometry.
-    //virtual IStatObj* Clone(bool bCloneChildren=true, bool nDynamic=false) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Summary:
-    //    Clones static geometry, Makes an exact copy of the Static object and the contained geometry.
-    virtual IStatObj* Clone(bool bCloneGeometry, bool bCloneChildren, bool bMeshesOnly) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Summary:
-    //    makes sure that both objects have one-to-one vertex correspondance
-    //    sets MorphBuddy for this object's render mesh
-    //    returns 0 if failed (due to objects having no vertex maps most likely)
-    virtual int SetDeformationMorphTarget(IStatObj* pDeformed) = 0;
-
-    // chages the weights of the deformation morphing according to point, radius, and strength
-    // (radius==0 updates all weights of all vertices)
-    //  if the object is a compound object, updates the weights of its subobjects that have deformation morphs; clones the object if necessary
-    //   otherwise, updates the weights passed as a pWeights param
-    virtual IStatObj* DeformMorph(const Vec3& pt, float r, float strength, IRenderMesh* pWeights = 0) = 0;
-
-    // hides all non-physicalized geometry, clones the object if necessary
-    virtual IStatObj* HideFoliage() = 0;
-
-    // serializes the StatObj's mesh into a stream
-    virtual int Serialize(TSerialize ser) = 0;
-
-    // Get object properties as loaded from CGF.
-    virtual const char* GetProperties() = 0;
-
-    // Get physical properties specified for object.
-    virtual bool GetPhysicalProperties(float& mass, float& density) = 0;
-
-    // Returns the last B operand for this object as A, along with its relative scale
-    virtual IStatObj* GetLastBooleanOp(float& scale) = 0;
-
-    // Intersect ray with static object.
-    // Ray must be in object local space.
-    virtual bool RayIntersection(SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl = 0) = 0;
-
-    // Intersect lineseg with static object. Works on dedi server as well.
-    // Lineseg must be in object local space. Returns the hit position and the surface type id of the point hit.
-    virtual bool LineSegIntersection(const Lineseg& lineSeg, Vec3& hitPos, int& surfaceTypeId) = 0;
-
-    // Debug Draw this static object.
-    virtual void DebugDraw(const struct SGeometryDebugDrawInfo& info, float fExtrdueScale = 0.01f) = 0;
-
-    // Fill statistics about the level.
-    virtual void GetStatistics(SStatistics& stats) = 0;
-
-    // Returns initial hide mask
-    virtual uint64 GetInitialHideMask() = 0;
-
-    // Updates hide mask as new mask = (mask & maskAND) | maskOR
-    virtual uint64 UpdateInitialHideMask(uint64 maskAND = 0ul - 1ul, uint64 maskOR = 0) = 0;
-
-    // Set the filename of the mesh of the next state (for example damaged version)
-    virtual void SetStreamingDependencyFilePath(const char* szFileName) = 0;
-
-    virtual void ComputeGeometricMean(SMeshLodInfo& lodInfo) = 0;
-
-    // Returns the distance for the first LOD switch. Used for brushes and vegetation.
-    virtual float GetLodDistance() const = 0;
-
-    // Returns true if the mesh has been stripped
-    virtual bool IsMeshStrippedCGF() const = 0;
-
-    virtual void LoadLowLODs(bool bUseStreaming, unsigned long nLoadingFlags) = 0;
-
-    // Indicates if lods have been loaded
-    virtual bool AreLodsLoaded() const = 0;
-
-    // Indicates if a garbage check should be done
-    virtual bool CheckGarbage() const = 0;
-
-    // Sets state of check garbage flags
-    virtual void SetCheckGarbage(bool val) = 0;
-
-    // Returns the number of child references
-    virtual int CountChildReferences() const = 0;
-
-    // Returns the user count
-    virtual int GetUserCount() const = 0;
-
-    // Shutdown
-    virtual void ShutDown() = 0;
-
-    virtual int GetMaxUsableLod() const = 0;
-    virtual int GetMinUsableLod() const = 0;
-
-    virtual SMeshBoneMapping_uint8* GetBoneMapping() const = 0;
-
-    virtual int GetSpineCount() const = 0;
-    virtual SSpine* GetSpines() const = 0;
-
-    virtual IStatObj* GetLodLevel0() = 0;
-    virtual void SetLodLevel0(IStatObj* lod) = 0;
-    virtual _smart_ptr<CStatObj>* GetLods() = 0;
-    virtual int GetLoadedLodsNum() = 0;
-
-    virtual bool UpdateStreamableComponents(float fImportance, const Matrix34A& objMatrix, bool bFullUpdate, int nNewLod) = 0;
-
-    virtual void RenderInternal(CRenderObject* pRenderObject, uint64 nSubObjectHideMask, const CLodValue& lodValue, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw) = 0;
-    virtual void RenderObjectInternal(CRenderObject* pRenderObject, int nLod, uint8 uLodDissolveRef, bool dissolveOut, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw) = 0;
-    virtual void RenderSubObject(CRenderObject* pRenderObject, int nLod, int nSubObjId, const Matrix34A& renderTM, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw) = 0;
-    virtual void RenderSubObjectInternal(CRenderObject* pRenderObject, int nLod, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw) = 0;
-    virtual void RenderRenderMesh(CRenderObject* pObj, struct SInstancingInfo* pInstInfo, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter) = 0;
-
-    virtual SPhysGeomArray& GetArrPhysGeomInfo() = 0;
-    virtual bool IsLodsAreLoadedFromSeparateFile() = 0;
-
-    virtual void StartStreaming(bool bFinishNow, IReadStream_AutoPtr* ppStream) = 0;
-    virtual void UpdateStreamingPrioriryInternal(const Matrix34A& objMatrix, float fDistance, bool bFullUpdate) = 0;
-
-    virtual void SetMerged(bool state) = 0;
-
-    virtual int GetRenderMeshMemoryUsage() const = 0;
-    virtual void SetLodObject(int nLod, IStatObj* pLod) = 0;
-    virtual int GetLoadedTrisCount() const = 0;
-    virtual int GetRenderTrisCount() const = 0;
-    virtual int GetRenderMatIds() const = 0;
-
-    virtual bool IsUnmergable() const = 0;
-    virtual void SetUnmergable(bool state) = 0;
-
-    virtual int GetSubObjectMeshCount() const = 0;
-    virtual void SetSubObjectMeshCount(int count) = 0;
-    virtual void CleanUnusedLods() = 0;
-
-    virtual AZStd::vector<SMeshColor>& GetClothData() = 0;
-};
diff --git a/Code/CryEngine/CryCommon/IStereoRenderer.h b/Code/CryEngine/CryCommon/IStereoRenderer.h
deleted file mode 100644
index b75269264c..0000000000
--- a/Code/CryEngine/CryCommon/IStereoRenderer.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef __ISTEREORENDERER_H__
-#define __ISTEREORENDERER_H__
-
-#pragma once
-
-#include "StereoRendererBus.h"
-
-enum EStereoEye
-{
-    STEREO_EYE_LEFT  = 0,
-    STEREO_EYE_RIGHT = 1,
-    STEREO_EYE_COUNT
-};
-
-enum EStereoDevice
-{
-    STEREO_DEVICE_NONE      = 0,
-    STEREO_DEVICE_FRAMECOMP = 1,
-    STEREO_DEVICE_HDMI      = 2,
-    STEREO_DEVICE_DRIVER    = 3,  //!< Nvidia and AMD drivers.
-    STEREO_DEVICE_DUALHEAD  = 4,
-    STEREO_DEVICE_COUNT,
-
-    STEREO_DEVICE_DEFAULT = 100  //!< Auto-detect device.
-};
-
-enum EStereoMode
-{
-    STEREO_MODE_NO_STEREO       = 0,  //!< Stereo disabled.
-    STEREO_MODE_DUAL_RENDERING  = 1,
-    STEREO_MODE_COUNT,
-};
-
-enum EStereoOutput
-{
-    STEREO_OUTPUT_STANDARD          = 0,
-    STEREO_OUTPUT_IZ3D              = 1,
-    STEREO_OUTPUT_CHECKERBOARD      = 2,
-    STEREO_OUTPUT_ABOVE_AND_BELOW   = 3,
-    STEREO_OUTPUT_SIDE_BY_SIDE      = 4,
-    STEREO_OUTPUT_LINE_BY_LINE      = 5,
-    STEREO_OUTPUT_ANAGLYPH          = 6,
-    STEREO_OUTPUT_HMD               = 7,
-    STEREO_OUTPUT_COUNT,
-};
-
-enum EStereoDeviceState
-{
-    STEREO_DEVSTATE_OK = 0,
-    STEREO_DEVSTATE_UNSUPPORTED_DEVICE,
-    STEREO_DEVSTATE_REQ_1080P,
-    STEREO_DEVSTATE_REQ_FRAMEPACKED,
-    STEREO_DEVSTATE_BAD_DRIVER,
-    STEREO_DEVSTATE_REQ_FULLSCREEN
-};
-
-class IStereoRenderer
-    : public AZ::StereoRendererRequestBus::Handler
-{
-public:
-    enum EHmdRender
-    {
-        eHR_Eyes = 0,
-        eHR_Latency
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IStereoRenderer(){}
-
-    virtual EStereoDevice GetDevice() = 0;
-    virtual EStereoDeviceState GetDeviceState() = 0;
-    virtual void GetInfo(EStereoDevice* device, EStereoMode* mode, EStereoOutput* output, EStereoDeviceState* state) const = 0;
-
-    virtual bool GetStereoEnabled() = 0;
-    virtual float GetStereoStrength() = 0;
-    virtual float GetMaxSeparationScene(bool half = true) = 0;
-    virtual float GetZeroParallaxPlaneDist() = 0;
-
-    virtual void OnHmdDeviceChanged() = 0;
-
-    virtual void OnResolutionChanged() {}
-
-    virtual void GetNVControlValues(bool& stereoEnabled, float& stereoStrength) = 0;
-    // </interfuscator:shuffle>
-
-    enum class Status
-    {
-        kRenderingFirstEye,
-        kRenderingSecondEye,
-        kIdle ///< Not currently rendering to either eye.
-    };
-
-    virtual Status GetStatus() const = 0;
-};
-
-#endif
diff --git a/Code/CryEngine/CryCommon/ISurfaceType.h b/Code/CryEngine/CryCommon/ISurfaceType.h
deleted file mode 100644
index b9fcad4633..0000000000
--- a/Code/CryEngine/CryCommon/ISurfaceType.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Defines interfaces to access Surface Types.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ISURFACETYPE_H
-#define CRYINCLUDE_CRYCOMMON_ISURFACETYPE_H
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// Flags that ISurfaceType::GetFlags() can return.
-//////////////////////////////////////////////////////////////////////////
-enum ESurfaceTypeFlags
-{
-    SURFACE_TYPE_NO_PHYSICALIZE         = BIT(1), // This surface should not be physicalized.
-    SURFACE_TYPE_NO_COLLIDE             = BIT(2), // Should only be set for vegetation canopy mats
-    SURFACE_TYPE_VEHICLE_ONLY_COLLISION = BIT(3),
-    SURFACE_TYPE_CAN_SHATTER            = BIT(4), // This surface type can shatter
-    SURFACE_TYPE_BULLET_PIERCEABLE          = BIT(5), // This surface is pierceable by bullets (used by MFX system to spawn front/back FX)
-};
-
-// Parameter structure passed to ISurfaceType::Execute
-struct SSurfaceTypeExecuteParams
-{
-    Vec3 hitPoint;
-    Vec3 hitNormal;
-    int hitType;
-};
-
-#define SURFACE_BREAKAGE_TYPE(x) x
-
-//////////////////////////////////////////////////////////////////////////
-// Surface definition.
-//////////////////////////////////////////////////////////////////////////
-struct ISurfaceType
-{
-    //////////////////////////////////////////////////////////////////////////
-    struct SSurfaceTypeAIParams
-    {
-        float fImpactRadius;
-        float fImpactSoundRadius;
-        float fFootStepRadius;
-        float proneMult;
-        float crouchMult;
-        float movingMult;
-
-        SSurfaceTypeAIParams()
-        {
-            fImpactRadius = 2.5f;
-            fImpactSoundRadius = 20.0f;
-            fFootStepRadius = 20.0f;
-            proneMult = 0.2f;
-            crouchMult = 0.5f;
-            movingMult = 2.5f;
-        }
-    };
-    struct SPhysicalParams
-    {
-        int breakable_id;
-        int break_energy;
-        float hole_size;
-        float hole_size_explosion;
-        float hit_radius;
-        float hit_points;
-        float hit_points_secondary;
-        float hit_maxdmg;
-        float hit_lifetime;
-        int pierceability;
-        float damage_reduction;
-        float ric_angle;
-        float ric_dam_reduction;
-        float ric_vel_reduction;
-        float friction;
-        float bouncyness;
-        int iBreakability;
-        int collType;
-        float sound_obstruction;
-    };
-    struct SBreakable2DParams
-    {
-        string particle_effect;
-        float blast_radius;
-        float blast_radius_first;
-        float vert_size_spread;
-        int rigid_body;
-        float life_time;
-        float cell_size;
-        int max_patch_tris;
-        float filter_angle;
-        float shard_density;
-        int use_edge_alpha;
-        float crack_decal_scale;
-        string crack_decal_mtl;
-        float max_fracture;
-        string full_fracture_fx;
-        string fracture_fx;
-        int no_procedural_full_fracture;
-        string broken_mtl;
-        float destroy_timeout;
-        float destroy_timeout_spread;
-
-        SBreakable2DParams()
-            : blast_radius(0)
-            , rigid_body(0)
-            , life_time(0)
-            , cell_size(0)
-            , max_patch_tris(0)
-            , shard_density(0)
-            , crack_decal_scale(0)
-            , max_fracture(1.0f)
-            , vert_size_spread(0)
-            , filter_angle(0)
-            , use_edge_alpha(0)
-            , blast_radius_first(0)
-            , no_procedural_full_fracture(0)
-            , destroy_timeout(0)
-            , destroy_timeout_spread(0) {}
-    };
-    struct SBreakageParticles
-    {
-        string type;
-        string particle_effect;
-        int count_per_unit;
-        float count_scale;
-        float scale;
-        SBreakageParticles()
-            : count_per_unit(1)
-            , count_scale(1)
-            , scale(1) {}
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~ISurfaceType(){}
-
-    // Releases surface type.
-    virtual void Release() = 0;
-
-    // Return unique Id of this surface type.
-    // Maximum of 65535 simultanious surface types can exist.
-    virtual uint16 GetId() const = 0;
-
-    // Unique name of the surface type.
-    virtual const char* GetName() const = 0;
-
-    // Typename of this surface type.
-    virtual const char* GetType() const = 0;
-
-    // Flags of the surface type.
-    // Return:
-    //    A combination of ESurfaceTypeFlags flags.
-    virtual int  GetFlags() const = 0;
-
-    // Execute material.
-    virtual void Execute(SSurfaceTypeExecuteParams& params) = 0;
-
-    // returns a some cached properties for faster access
-    virtual int GetBreakability() const = 0;
-    virtual float GetBreakEnergy() const = 0;
-    virtual int GetHitpoints() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual const SPhysicalParams& GetPhyscalParams() = 0;
-
-    // Optional AI Params.
-    virtual const SSurfaceTypeAIParams* GetAIParams() = 0;
-
-    // Optional params for 2D breakable plane.
-    virtual SBreakable2DParams* GetBreakable2DParams() = 0;
-    virtual SBreakageParticles* GetBreakageParticles(const char* sType, bool bLookInDefault = true) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Called by Surface manager.
-    //////////////////////////////////////////////////////////////////////////
-    // Loads surface, (do not use directly).
-    virtual bool Load(int nId) = 0;
-    // </interfuscator:shuffle>
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//    This interface is used to enumerate all items registered to the surface type manager.
-//////////////////////////////////////////////////////////////////////////
-struct ISurfaceTypeEnumerator
-{
-    // <interfuscator:shuffle>
-    virtual ~ISurfaceTypeEnumerator(){}
-    virtual void Release() = 0;
-    virtual ISurfaceType* GetFirst() = 0;
-    virtual ISurfaceType* GetNext() = 0;
-    // </interfuscator:shuffle>
-};
-
-// Description:
-//    Manages loading and mapping of physical surface materials to Ids and materials scripts.
-// Behaviour:
-//    At start will enumerate all material names.
-//    When the surface is first time requested by name it will be loaded and cached
-//    and new unique id will be generated for it.
-struct ISurfaceTypeManager
-{
-    // <interfuscator:shuffle>
-    virtual ~ISurfaceTypeManager(){}
-
-
-    // Description:
-    //    Load Surface types
-    virtual void LoadSurfaceTypes() = 0;
-
-    // Description:
-    //    Return surface type by name.
-    //    If surface is not yet loaded it will be loaded and and cached.
-    // Arguments:
-    //    sName - Name of the surface type ("mat_metal","mat_wood", etc..)
-    //    warn - print warning message if surface not found
-    virtual ISurfaceType* GetSurfaceTypeByName(const char* sName, const char* sWhy = NULL, bool warn = true) = 0;
-
-    // Description:
-    //    Return surface type by id.
-    //    If surface is not yet loaded it will be loaded and and cached.
-    // Arguments:
-    //    sName - Name of the surface type ("mat_metal","mat_wood", etc..)
-    virtual ISurfaceType* GetSurfaceType(int nSurfaceId, const char* sWhy = NULL) = 0;
-
-    // Description:
-    //    Retrieve an interface to the enumerator class that allow to iterate over all surface types.
-    virtual ISurfaceTypeEnumerator* GetEnumerator() = 0;
-
-    // Register a new surface type.
-    virtual bool RegisterSurfaceType(ISurfaceType* pSurfaceType, bool bDefault = false) = 0;
-    virtual void UnregisterSurfaceType(ISurfaceType* pSurfaceType) = 0;
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-    // </interfuscator:shuffle>
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_ISURFACETYPE_H
-
diff --git a/Code/CryEngine/CryCommon/ISystem.h b/Code/CryEngine/CryCommon/ISystem.h
deleted file mode 100644
index 1a2ffc5a7c..0000000000
--- a/Code/CryEngine/CryCommon/ISystem.h
+++ /dev/null
@@ -1,1690 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// In Mac, including ISystem without including platform.h first fails because platform.h
-// includes CryThread.h which includes CryThread_pthreads.h which uses ISystem (gEnv).
-// So plaform.h needs the contents of ISystem.h.
-// By including platform.h outside of the guard, we give platform.h the right include order
-#include <platform.h> // Needed for LARGE_INTEGER (for consoles).
-
-#ifndef CRYINCLUDE_CRYCOMMON_ISYSTEM_H
-#define CRYINCLUDE_CRYCOMMON_ISYSTEM_H
-#pragma once
-
-#ifdef CRYSYSTEM_EXPORTS
-#define CRYSYSTEM_API DLL_EXPORT
-#else
-#define CRYSYSTEM_API DLL_IMPORT
-#endif
-
-#include "CryAssert.h"
-#include "CompileTimeAssert.h"
-
-#include <AzCore/IO/SystemFile.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define ISYSTEM_H_SECTION_1 1
-#define ISYSTEM_H_SECTION_2 2
-#define ISYSTEM_H_SECTION_3 3
-#define ISYSTEM_H_SECTION_4 4
-#define ISYSTEM_H_SECTION_5 5
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-// Forward declarations
-////////////////////////////////////////////////////////////////////////////////////////////////
-#include <IXml.h> // <> required for Interfuscator
-#include "IValidator.h" // <> required for Interfuscator
-#include <ILog.h> // <> required for Interfuscator
-#include "CryVersion.h"
-#include "smartptr.h"
-#include <memory> // shared_ptr
-#include <CrySystemBus.h>
-
-struct ISystem;
-struct ILog;
-namespace AZ::IO
-{
-    struct IArchive;
-}
-struct IConsole;
-struct IRemoteConsole;
-struct IRenderer;
-struct IProcess;
-struct ITimer;
-struct ICryFont;
-struct IMovieSystem;
-namespace Audio
-{
-    struct IAudioSystem;
-} // namespace Audio
-struct SFileVersion;
-struct INameTable;
-struct ILevelSystem;
-struct IViewSystem;
-class ICrySizer;
-class IXMLBinarySerializer;
-struct IReadWriteXMLSink;
-struct IAVI_Reader;
-class CPNoise3;
-struct ILocalizationManager;
-struct IOutputPrintSink;
-struct IWindowMessageHandler;
-
-namespace AZ
-{
-    namespace IO
-    {
-        class FileIOBase;
-    }
-}
-
-typedef void* WIN_HWND;
-
-class CCamera;
-struct CLoadingTimeProfiler;
-
-class ICmdLine;
-
-class ILyShine;
-
-enum ESystemUpdateFlags
-{
-    // Summary:
-    //   Special update mode for editor.
-    ESYSUPDATE_EDITOR = 0x0004
-};
-
-// Description:
-//   Configuration specification, depends on user selected machine specification.
-enum ESystemConfigSpec
-{
-    CONFIG_AUTO_SPEC = 0,
-    CONFIG_LOW_SPEC = 1,
-    CONFIG_MEDIUM_SPEC = 2,
-    CONFIG_HIGH_SPEC = 3,
-    CONFIG_VERYHIGH_SPEC = 4,
-
-    END_CONFIG_SPEC_ENUM, // MUST BE LAST VALUE. USED FOR ERROR CHECKING.
-};
-
-// Description:
-//   Configuration platform. Autodetected at start, can be modified through the editor.
-enum ESystemConfigPlatform
-{
-    CONFIG_INVALID_PLATFORM = 0,
-    CONFIG_PC = 1,
-    CONFIG_MAC = 2,
-    CONFIG_OSX_METAL = 3,
-    CONFIG_ANDROID = 4,
-    CONFIG_IOS = 5,
-    CONFIG_PROVO = 7,
-    CONFIG_SALEM = 8,
-    CONFIG_JASPER = 9,
-
-    END_CONFIG_PLATFORM_ENUM, // MUST BE LAST VALUE. USED FOR ERROR CHECKING.
-};
-
-enum ESystemGlobalState
-{
-    ESYSTEM_GLOBAL_STATE_UNKNOWN,
-    ESYSTEM_GLOBAL_STATE_INIT,
-    ESYSTEM_GLOBAL_STATE_RUNNING,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_MATERIALS,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_OBJECTS,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_STATIC_WORLD,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_TEXTURES,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END,
-    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE
-};
-
-// Summary:
-//   System wide events.
-enum ESystemEvent
-{
-    // Description:
-    // Seeds all random number generators to the same seed number, WParam will hold seed value.
-    //##@{
-    ESYSTEM_EVENT_RANDOM_SEED = 1,
-    ESYSTEM_EVENT_RANDOM_ENABLE,
-    ESYSTEM_EVENT_RANDOM_DISABLE,
-    //##@}
-
-    // Description:
-    //   Changes to main window focus.
-    //   wparam is not 0 is focused, 0 if not focused
-    ESYSTEM_EVENT_CHANGE_FOCUS = 10,
-
-    // Description:
-    //   Moves of the main window.
-    //   wparam=x, lparam=y
-    ESYSTEM_EVENT_MOVE = 11,
-
-    // Description:
-    //   Resizes of the main window.
-    //   wparam=width, lparam=height
-    ESYSTEM_EVENT_RESIZE = 12,
-
-    // Description:
-    //   Activation of the main window.
-    //   wparam=1/0, 1=active 0=inactive
-    ESYSTEM_EVENT_ACTIVATE = 13,
-
-    // Description:
-    //   Main window position changed.
-    ESYSTEM_EVENT_POS_CHANGED = 14,
-
-    // Description:
-    //   Main window style changed.
-    ESYSTEM_EVENT_STYLE_CHANGED = 15,
-
-    // Description:
-    //   Sent before the loading movie is begun
-    ESYSTEM_EVENT_LEVEL_LOAD_START_PRELOADINGSCREEN,
-
-    // Description:
-    //   Sent before the loading last save
-    ESYSTEM_EVENT_LEVEL_LOAD_RESUME_GAME,
-
-    // Description:
-    //   Sent before starting level, before game rules initialization and before ESYSTEM_EVENT_LEVEL_LOAD_START event
-    //   Used mostly for level loading profiling
-    ESYSTEM_EVENT_LEVEL_LOAD_PREPARE,
-
-    // Description:
-    //   Sent to start the active loading screen rendering.
-    ESYSTEM_EVENT_LEVEL_LOAD_START_LOADINGSCREEN,
-
-    // Description:
-    //   Sent when loading screen is active
-    ESYSTEM_EVENT_LEVEL_LOAD_LOADINGSCREEN_ACTIVE,
-
-    // Description:
-    //   Sent before starting loading a new level.
-    //   Used for a more efficient resource management.
-    ESYSTEM_EVENT_LEVEL_LOAD_START,
-
-    // Description:
-    //   Sent after loading a level finished.
-    //   Used for a more efficient resource management.
-    ESYSTEM_EVENT_LEVEL_LOAD_END,
-
-    // Description:
-    //   Sent after trying to load a level failed.
-    //   Used for resetting the front end.
-    ESYSTEM_EVENT_LEVEL_LOAD_ERROR,
-
-    // Description:
-    //   Sent in case the level was requested to load, but it's not ready
-    //   Used in streaming install scenario for notifying the front end.
-    ESYSTEM_EVENT_LEVEL_NOT_READY,
-
-    // Description:
-    //   Sent after precaching of the streaming system has been done
-    ESYSTEM_EVENT_LEVEL_PRECACHE_START,
-
-    // Description:
-    //   Sent before object/texture precache stream requests are submitted
-    ESYSTEM_EVENT_LEVEL_PRECACHE_FIRST_FRAME,
-
-    // Description:
-    //  Sent when level loading is completely finished with no more onscreen
-    //  movie or info rendering, and when actual gameplay can start
-    ESYSTEM_EVENT_LEVEL_GAMEPLAY_START,
-
-    // Level is unloading.
-    ESYSTEM_EVENT_LEVEL_UNLOAD,
-
-    // Summary:
-    //   Sent after level have been unloaded. For cleanup code.
-    ESYSTEM_EVENT_LEVEL_POST_UNLOAD,
-
-    // Summary:
-    //   Called when the game framework has been initialized.
-    ESYSTEM_EVENT_GAME_POST_INIT,
-
-    // Summary:
-    //   Called when the game framework has been initialized, not loading should happen in this event.
-    ESYSTEM_EVENT_GAME_POST_INIT_DONE,
-
-    // Summary:
-    //   Sent when the system is doing a full shutdown.
-    ESYSTEM_EVENT_FULL_SHUTDOWN,
-
-    // Summary:
-    //   Sent when the system is doing a fast shutdown.
-    ESYSTEM_EVENT_FAST_SHUTDOWN,
-
-    // Summary:
-    //   When keyboard layout changed.
-    ESYSTEM_EVENT_LANGUAGE_CHANGE,
-
-    // Description:
-    //   Toggled fullscreen.
-    //   wparam is 1 means we switched to fullscreen, 0 if for windowed
-    ESYSTEM_EVENT_TOGGLE_FULLSCREEN,
-    ESYSTEM_EVENT_SHARE_SHADER_COMBINATIONS,
-
-    // Summary:
-    //   Start 3D post rendering
-    ESYSTEM_EVENT_3D_POST_RENDERING_START,
-
-    // Summary:
-    //   End 3D post rendering
-    ESYSTEM_EVENT_3D_POST_RENDERING_END,
-
-    // Summary:
-    //   Called before switching to level memory heap
-    ESYSTEM_EVENT_SWITCHING_TO_LEVEL_HEAP_DEPRECATED,
-
-    // Summary:
-    //   Called after switching to level memory heap
-    ESYSTEM_EVENT_SWITCHED_TO_LEVEL_HEAP_DEPRECATED,
-
-    // Summary:
-    //   Called before switching to global memory heap
-    ESYSTEM_EVENT_SWITCHING_TO_GLOBAL_HEAP_DEPRECATED,
-
-    // Summary:
-    //   Called after switching to global memory heap
-    ESYSTEM_EVENT_SWITCHED_TO_GLOBAL_HEAP_DEPRECATED,
-
-    // Description:
-    //   Sent after precaching of the streaming system has been done
-    ESYSTEM_EVENT_LEVEL_PRECACHE_END,
-
-    // Description:
-    //      Sent when game mode switch begins
-    ESYSTEM_EVENT_GAME_MODE_SWITCH_START,
-
-    // Description:
-    //      Sent when game mode switch ends
-    ESYSTEM_EVENT_GAME_MODE_SWITCH_END,
-
-    // Description:
-    //   Video notifications
-    //   wparam=[0/1/2/3] : [stop/play/pause/resume]
-    ESYSTEM_EVENT_VIDEO,
-
-    // Description:
-    //   Sent if the game is paused
-    ESYSTEM_EVENT_GAME_PAUSED,
-
-    // Description:
-    //   Sent if the game is resumed
-    ESYSTEM_EVENT_GAME_RESUMED,
-
-    // Description:
-    //      Sent when time of day is set
-    ESYSTEM_EVENT_TIME_OF_DAY_SET,
-
-    // Description:
-    //      Sent once the Editor finished initialization.
-    ESYSTEM_EVENT_EDITOR_ON_INIT,
-
-    // Description:
-    //      Sent when frontend is initialised
-    ESYSTEM_EVENT_FRONTEND_INITIALISED,
-
-    // Description:
-    //      Sent once the Editor switches between in-game and editing mode.
-    ESYSTEM_EVENT_EDITOR_GAME_MODE_CHANGED,
-
-    // Description:
-    //      Sent once the Editor switches simulation mode (AI/Physics).
-    ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_CHANGED,
-
-    // Description:
-    //      Sent when frontend is reloaded
-    ESYSTEM_EVENT_FRONTEND_RELOADED,
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(ISystem_h)
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(ISystem_h)
-#endif
-    ESYSTEM_EVENT_STREAMING_INSTALL_ERROR,
-
-    // Description:
-    //      Sent when the online services are initialized.
-    ESYSTEM_EVENT_ONLINE_SERVICES_INITIALISED,
-
-    // Description:
-    //      Sent when a new audio implementation is loaded
-    ESYSTEM_EVENT_AUDIO_IMPLEMENTATION_LOADED,
-
-    // Description:
-    //      Sent when simulation mode switch begins
-    ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_SWITCH_START,
-
-    // Description:
-    //      Sent when simluation mode switch ends
-    ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_SWITCH_END,
-
-    ESYSTEM_EVENT_USER = 0x1000,
-
-    ESYSTEM_BEAM_PLAYER_TO_CAMERA_POS
-};
-
-// Description:
-//   User defined callback, which can be passed to ISystem.
-struct ISystemUserCallback
-{
-    // <interfuscator:shuffle>
-    virtual ~ISystemUserCallback() {}
-    // Description:
-    //   This method is called at the earliest point the ISystem pointer can be used
-    //   the log might not be yet there.
-    virtual void OnSystemConnect([[maybe_unused]] ISystem* pSystem) {}
-
-    // Summary:
-    //   Signals to User that engine error occurred.
-    // Return Value:
-    //      True to Halt execution or false to ignore this error
-    virtual bool OnError(const char* szErrorString) = 0;
-
-    // Notes:
-    //   If working in Editor environment notify user that engine want to Save current document.
-    //   This happens if critical error have occurred and engine gives a user way to save data and not lose it
-    //   due to crash.
-    virtual bool OnSaveDocument() = 0;
-
-    // Notes:
-    //  If working in Editor environment and a critical error occurs notify the user to backup
-    //  the current document to prevent data loss due to crash.
-    virtual bool OnBackupDocument() = 0;
-
-    // Description:
-    //   Notifies user that system wants to switch out of current process.
-    // Example:
-    //  Called when pressing ESC in game mode to go to Menu.
-    virtual void OnProcessSwitch() = 0;
-
-    // Description:
-    //   Notifies user, usually editor, about initialization progress in system.
-    virtual void OnInitProgress(const char* sProgressMsg) = 0;
-
-    // Description:
-    //   Initialization callback.  This is called early in CSystem::Init(), before
-    //   any of the other callback methods is called.
-    // See also:
-    //   CSystem::Init()
-    virtual void OnInit(ISystem*) { }
-
-    // Summary:
-    //   Shutdown callback.
-    virtual void OnShutdown() { }
-
-    // Summary:
-    //   Quit callback.
-    // See also:
-    //   CSystem::Quit()
-    virtual void OnQuit() { }
-
-    // Description:
-    //   Notify user of an update iteration.  Called in the update loop.
-    virtual void OnUpdate() { }
-
-    // Description:
-    //   Show message by provider.
-    virtual int ShowMessage(const char* text, const char* caption, unsigned int uType) { return CryMessageBox(text, caption, uType); }
-
-    // Description:
-    //   Collects the memory information in the user program/application.
-    virtual void GetMemoryUsage(ICrySizer* pSizer) = 0;
-    // </interfuscator:shuffle>
-
-    //   Post console load, for cvar setting
-    virtual void OnConsoleCreated([[maybe_unused]] ::IConsole* pConsole) {}
-};
-
-// Description:
-//   Interface used for getting notified when a system event occurs.
-struct ISystemEventListener
-{
-    // <interfuscator:shuffle>
-    virtual ~ISystemEventListener() {}
-    virtual void OnSystemEventAnyThread([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam) {}
-    virtual void OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam) { }
-    // </interfuscator:shuffle>
-};
-
-// Description:
-//   Structure used for getting notified when a system event occurs.
-struct ISystemEventDispatcher
-{
-    // <interfuscator:shuffle>
-    virtual ~ISystemEventDispatcher() {}
-    virtual bool RegisterListener(ISystemEventListener* pListener) = 0;
-    virtual bool RemoveListener(ISystemEventListener* pListener) = 0;
-
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) = 0;
-    virtual void Update() = 0;
-
-    //virtual void OnLocaleChange() = 0;
-    // </interfuscator:shuffle>
-};
-
-struct IErrorObserver
-{
-    // <interfuscator:shuffle>
-    virtual ~IErrorObserver() {}
-    virtual void OnAssert(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber) = 0;
-    virtual void OnFatalError(const char* message) = 0;
-    // </interfuscator:shuffle>
-};
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(ISystem_h)
-#endif
-
-namespace AZ
-{
-    namespace Internal
-    {
-        class EnvironmentInterface;
-    } // namespace Internal
-} // namespace AZ
-
-typedef AZ::Internal::EnvironmentInterface SharedEnvironmentInstance;
-
-// Description:
-//  Structure passed to Init method of ISystem interface.
-struct SSystemInitParams
-{
-    void* hInstance;                                //
-    void* hWnd;                                     //
-
-    ILog* pLog;                                     // You can specify your own ILog to be used by System.
-    ILogCallback* pLogCallback;                     // You can specify your own ILogCallback to be added on log creation (used by Editor).
-    ISystemUserCallback* pUserCallback;
-    const char* sLogFileName;                       // File name to use for log.
-    bool autoBackupLogs;                            // if true, logs will be automatically backed up each startup
-    IOutputPrintSink* pPrintSync;               // Print Sync which can be used to catch all output from engine
-    char szSystemCmdLine[2048];                     // Command line.
-
-    bool bEditor;                                   // When running in Editor mode.
-    bool bPreview;                                  // When running in Preview mode (Minimal initialization).
-    bool bTestMode;                                 // When running in Automated testing mode.
-    bool bDedicatedServer;                          // When running a dedicated server.
-    bool bSkipConsole;                                  // Don't create console
-    bool bUnattendedMode;                           // When running as part of a build on build-machines: Prevent popping up of any dialog
-    bool bSkipMovie;            // Don't load movie
-
-    bool bToolMode;                                 // System is running inside a tool. Will not create USER directory or anything else that the game needs to do
-
-    ISystem* pSystem;                                           // Pointer to existing ISystem interface, it will be reused if not NULL.
-
-    SharedEnvironmentInstance* pSharedEnvironment;
-
-    // Summary:
-    //  Initialization defaults.
-    SSystemInitParams()
-    {
-        hInstance = NULL;
-        hWnd = NULL;
-
-        pLog = NULL;
-        pLogCallback = NULL;
-        pUserCallback = NULL;
-        sLogFileName = NULL;
-        autoBackupLogs = true;
-        pPrintSync = NULL;
-        memset(szSystemCmdLine, 0, sizeof(szSystemCmdLine));
-
-        bEditor = false;
-        bPreview = false;
-        bTestMode = false;
-        bDedicatedServer = false;
-        bSkipConsole = false;
-        bUnattendedMode = false;
-        bSkipMovie = false;
-        bToolMode = false;
-
-        pSystem = NULL;
-
-        pSharedEnvironment = nullptr;
-    }
-};
-
-// Notes:
-//   Can be used for LoadConfiguration().
-// See also:
-//   LoadConfiguration()
-struct ILoadConfigurationEntrySink
-{
-    // <interfuscator:shuffle>
-    virtual ~ILoadConfigurationEntrySink() {}
-    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup) = 0;
-    virtual void OnLoadConfigurationEntry_End() {}
-    // </interfuscator:shuffle>
-};
-
-struct SPlatformInfo
-{
-    unsigned int numCoresAvailableToProcess;
-    unsigned int numLogicalProcessors;
-
-#if defined(WIN32) || defined(WIN64)
-    enum EWinVersion
-    {
-        WinUndetected,
-        Win2000,
-        WinXP,
-        WinSrv2003,
-        WinVista,
-        Win7,
-        Win8,
-        Win81,
-        Win10
-    };
-
-    EWinVersion winVer;
-    bool win64Bit;
-    bool vistaKB940105Required;
-#endif
-};
-
-// Description:
-//  Holds info about system update stats over perior of time (cvar-tweakable)
-
-struct SSystemUpdateStats
-{
-    SSystemUpdateStats()
-        : avgUpdateTime(0.0f)
-        , minUpdateTime(0.0f)
-        , maxUpdateTime(0.0f) {}
-    float avgUpdateTime;
-    float minUpdateTime;
-    float maxUpdateTime;
-};
-
-// Description:
-//   Global environment.
-//   Contains pointers to all global often needed interfaces.
-//    This is a faster way to get interface pointer then calling ISystem interface to retrieve one.
-// Notes:
-//   Some pointers can be NULL, use with care.
-// See also:
-//   ISystem
-struct SSystemGlobalEnvironment
-{
-    AZ::IO::IArchive*          pCryPak;
-    AZ::IO::FileIOBase*        pFileIO;
-    ITimer*                    pTimer;
-    ICryFont*                  pCryFont;
-    ::IConsole*                  pConsole;
-    ISystem*                   pSystem = nullptr;
-    ILog*                      pLog;
-    IMovieSystem*              pMovieSystem;
-    INameTable*                pNameTable;
-    IRenderer*                 pRenderer;
-    ILyShine*                      pLyShine;
-    SharedEnvironmentInstance*      pSharedEnvironment;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_4
-    #include AZ_RESTRICTED_FILE(ISystem_h)
-#endif
-
-    threadID                                 mMainThreadId;     //The main thread ID is used in multiple systems so should be stored globally
-
-    //////////////////////////////////////////////////////////////////////////
-    // Used by CRY_ASSERT
-    bool                                            bIgnoreAllAsserts;
-    bool                                            bNoAssertDialog;
-    //////////////////////////////////////////////////////////////////////////
-
-    bool                                            bToolMode;
-
-    int                                             retCode = 0;
-
-    ILINE const bool IsDedicated() const
-    {
-#if defined(CONSOLE)
-        return false;
-#else
-        return bDedicated;
-#endif
-    }
-
-#if !defined(CONSOLE)
-    ILINE void SetIsEditor(bool isEditor)
-    {
-        bEditor = isEditor;
-    }
-
-    ILINE void SetIsEditorGameMode(bool isEditorGameMode)
-    {
-        bEditorGameMode = isEditorGameMode;
-    }
-
-    ILINE void SetIsEditorSimulationMode(bool isEditorSimulationMode)
-    {
-        bEditorSimulationMode = isEditorSimulationMode;
-    }
-
-    ILINE void SetIsDedicated(bool isDedicated)
-    {
-        bDedicated = isDedicated;
-    }
-#endif
-
-    //this way the compiler can strip out code for consoles
-    ILINE const bool IsEditor() const
-    {
-#if defined(CONSOLE)
-        return false;
-#else
-        return bEditor;
-#endif
-    }
-
-    ILINE const bool IsEditorGameMode() const
-    {
-#if defined(CONSOLE)
-        return false;
-#else
-        return bEditorGameMode;
-#endif
-    }
-
-    ILINE const bool IsEditorSimulationMode() const
-    {
-#if defined(CONSOLE)
-        return false;
-#else
-        return bEditorSimulationMode;
-#endif
-    }
-
-    ILINE const bool IsEditing() const
-    {
-#if defined(CONSOLE)
-        return false;
-#else
-        return bEditor && !bEditorGameMode;
-#endif
-    }
-
-    ILINE bool IsInToolMode() const
-    {
-        return bToolMode;
-    }
-
-    ILINE void SetToolMode(bool bNewToolMode)
-    {
-        bToolMode = bNewToolMode;
-    }
-
-#if !defined(CONSOLE)
-private:
-    bool bEditor;          // Engine is running under editor.
-    bool bEditorGameMode;  // Engine is in editor game mode.
-    bool bEditorSimulationMode;  // Engine is in editor simulation mode.
-    bool bDedicated;             // Engine is in dedicated
-#endif
-
-public:
-    SSystemGlobalEnvironment()
-        : bToolMode(false)
-    {
-    };
-};
-
-// NOTE Nov 25, 2008: <pvl> the ISystem interface that follows has a member function
-// called 'GetUserName'.  If we don't #undef'ine the same-named Win32 symbol here
-// ISystem wouldn't even compile.
-// TODO Nov 25, 2008: <pvl> there might be a better place for this?
-#ifdef GetUserName
-#undef GetUserName
-#endif
-
-
-struct IProfilingSystem
-{
-    // <interfuscator:shuffle>
-    virtual ~IProfilingSystem() {}
-    //////////////////////////////////////////////////////////////////////////
-    // VTune Profiling interface.
-
-    // Summary:
-    //   Resumes vtune data collection.
-    virtual void VTuneResume() = 0;
-    // Summary:
-    //   Pauses vtune data collection.
-    virtual void VTunePause() = 0;
-    //////////////////////////////////////////////////////////////////////////
-    // </interfuscator:shuffle>
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Description:
-//   Main Engine Interface.
-//   Initialize and dispatch all engine's subsystems.
-struct ISystem
-{
-    // <interfuscator:shuffle>
-    virtual ~ISystem() {}
-    // Summary:
-    //   Releases ISystem.
-    virtual void Release() = 0;
-
-                                                                                  // Summary:
-                                                                                  //   Returns pointer to the global environment structure.
-    virtual SSystemGlobalEnvironment* GetGlobalEnvironment() = 0;
-
-    // Summary:
-    //   Updates all subsystems (including the ScriptSink() )
-    // Arguments:
-    //   flags      - One or more flags from ESystemUpdateFlags structure.
-    //   nPauseMode - 0=normal(no pause), 1=menu/pause, 2=cutscene
-    virtual bool UpdatePreTickBus(int updateFlags = 0, int nPauseMode = 0) = 0;
-
-    // Summary:
-    //   Updates all subsystems (including the ScriptSink() )
-    // Arguments:
-    //   flags      - One or more flags from ESystemUpdateFlags structure.
-    //   nPauseMode - 0=normal(no pause), 1=menu/pause, 2=cutscene
-    virtual bool UpdatePostTickBus(int updateFlags = 0, int nPauseMode = 0) = 0;
-
-    // Summary:
-    //   Updates only require components during loading
-    virtual bool UpdateLoadtime() = 0;
-
-    // Summary:
-    //   Optimisation: do part of the update while waiting for occlusion queries to complete
-    virtual void DoWorkDuringOcclusionChecks() = 0;
-    virtual bool NeedDoWorkDuringOcclusionChecks() = 0;
-
-    // Summary:
-    //   Retrieve the name of the user currently logged in to the computer.
-    virtual const char* GetUserName() = 0;
-
-    // Summary:
-    //   Quits the application.
-    virtual void    Quit() = 0;
-    // Summary:
-    //   Tells the system if it is relaunching or not.
-    virtual void    Relaunch(bool bRelaunch) = 0;
-    // Summary:
-    //   Returns true if the application is in the shutdown phase.
-    virtual bool    IsQuitting() const = 0;
-    // Summary:
-    //   Tells the system in which way we are using the serialization system.
-    virtual void  SerializingFile(int mode) = 0;
-    virtual int IsSerializingFile() const = 0;
-
-    virtual bool IsRelaunch() const = 0;
-
-    // Description:
-    //   Displays error message.
-    //   Logs it to console and file and error message box then terminates execution.
-    virtual void FatalError(const char* sFormat, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    // Description:
-    //   Reports a bug using the crash handler.
-    //   Logs an error to the console and launches the crash handler, then continues execution.
-    virtual void ReportBug(const char* sFormat, ...) PRINTF_PARAMS(2, 3) = 0;
-
-    // Description:
-    //   Report warning to current Validator object.
-    //   Doesn't terminate the execution.
-    //##@{
-    virtual void WarningV(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args) = 0;
-    virtual void Warning(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, ...) = 0;
-    //##@}
-
-    // 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;
-
-    // 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 INameTable* GetINameTable() = 0;
-    virtual ICmdLine* GetICmdLine() = 0;
-    virtual ILog* GetILog() = 0;
-    virtual AZ::IO::IArchive* GetIPak() = 0;
-    virtual ICryFont* GetICryFont() = 0;
-    virtual IMovieSystem* GetIMovieSystem() = 0;
-    virtual ::IConsole* GetIConsole() = 0;
-    virtual IRemoteConsole* GetIRemoteConsole() = 0;
-    virtual IProfilingSystem* GetIProfilingSystem() = 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;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // IXmlNode interface.
-    //////////////////////////////////////////////////////////////////////////
-
-    // Summary:
-    //   Creates new xml node.
-    virtual XmlNodeRef CreateXmlNode(const char* sNodeName = "", bool bReuseStrings = false, bool bIsProcessingInstruction = false) = 0;
-    // Summary:
-    //   Loads xml from memory buffer, returns 0 if load failed.
-    virtual XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings = false, bool bSuppressWarnings = false) = 0;
-    // Summary:
-    //   Loads xml file, returns 0 if load failed.
-    virtual XmlNodeRef LoadXmlFromFile(const char* sFilename, bool bReuseStrings = false) = 0;
-    // Summary:
-    //   Retrieves access to XML utilities interface.
-    virtual IXmlUtils* GetXmlUtils() = 0;
-
-    virtual void SetViewCamera(CCamera& Camera) = 0;
-    virtual CCamera& GetViewCamera() = 0;
-
-    // Description:
-    //   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;
-
-    //////////////////////////////////////////////////////////////////////////
-    // File version.
-    //////////////////////////////////////////////////////////////////////////
-
-    // Summary:
-    //   Gets file version.
-    virtual const SFileVersion& GetFileVersion() = 0;
-    // Summary:
-    //   Gets product version.
-    virtual const SFileVersion& GetProductVersion() = 0;
-    // Summary:
-    //   Gets build version.
-    virtual const SFileVersion& GetBuildVersion() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Configuration.
-    //////////////////////////////////////////////////////////////////////////
-
-    // Summary:
-    //   Loads configurations from CVarGroup directory recursively
-    //   If m_GraphicsSettingsMap is defined (in Graphics Settings Dialog box), fills in mapping based on sys_spec_Full
-    // Arguments:
-    //   sPath - e.g. "Game/Config/CVarGroups"
-    virtual void AddCVarGroupDirectory(const string& sPath) = 0;
-
-    // Summary:
-    //   Saves system configuration.
-    virtual void SaveConfiguration() = 0;
-
-    // Summary:
-    //   Loads system configuration
-    // Arguments:
-    //   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:
-    //   Retrieves current configuration platform
-    virtual ESystemConfigPlatform GetConfigPlatform() const = 0;
-
-    // Summary:
-    //   Changes current configuration platform.
-    virtual void SetConfigPlatform(ESystemConfigPlatform platform) = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    // Summary:
-    //   Query if system is now paused.
-    //   Pause flag is set when calling system update with pause mode.
-    virtual bool IsPaused() const = 0;
-
-    // Summary:
-    //   Retrieves localized strings manager interface.
-    virtual ILocalizationManager* GetLocalizationManager() = 0;
-
-    // Summary:
-    //   Retrieves the perlin noise singleton instance.
-    virtual CPNoise3* GetNoiseGen() = 0;
-
-    // Summary:
-    //   Retrieves system update counter.
-    virtual uint64 GetUpdateCounter() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Error callback handling
-
-    // Summary:
-    //  Registers listeners to CryAssert and error messages. (may not be called if asserts are disabled)
-    //  Each pointer can be registered only once. (stl::push_back_unique)
-    //  It will return false if the pointer is already registered. Returns true, otherwise.
-    virtual bool RegisterErrorObserver(IErrorObserver* errorObserver) = 0;
-
-    // Summary:
-    //  Unregisters listeners to CryAssert and error messages.
-    //  It will return false if the pointer is not registered. Otherwise, returns true.
-    virtual bool UnregisterErrorObserver(IErrorObserver* errorObserver) = 0;
-
-    // Summary:
-    //  Called after the processing of the assert message box on some platforms.
-    //  It will be called even when asserts are disabled by the console variables.
-    virtual void OnAssert(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber) = 0;
-
-    // Summary:
-    // Returns if the assert window from CryAssert is visible.
-    // OBS1: needed by the editor, as in some cases it can freeze if during an assert engine it will handle
-    // some events such as mouse movement in a CryPhysics assert.
-    // OBS2: it will always return false, if asserts are disabled or ignored.
-    virtual bool IsAssertDialogVisible() const = 0;
-
-    // Summary:
-    // Sets the AssertVisisble internal variable.
-    // Typically it should only be called by CryAssert.
-    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 Crytek application. (0 = first instance, 1 = second instance, etc)
-    virtual int GetApplicationInstance() = 0;
-
-    // Summary:
-    //   Get log index of the currently running Open 3D Engine application. (0 = first instance, 1 = second instance, etc)
-    virtual int GetApplicationLogInstance(const char* logFilePath) = 0;
-
-    // Summary:
-    //      Clear all currently logged and drawn on screen error messages
-    virtual void ClearErrorMessages() = 0;
-    //////////////////////////////////////////////////////////////////////////
-    // For debugging use only!, query current C++ call stack.
-    //////////////////////////////////////////////////////////////////////////
-
-    // Notes:
-    //   Pass nCount to indicate maximum number of functions to get.
-    //   For debugging use only, query current C++ call stack.
-    // Description:
-    //   Fills array of function pointers, nCount return number of functions.
-    virtual void debug_GetCallStack(const char** pFunctions, int& nCount) = 0;
-    // Summary:
-    //   Logs current callstack.
-    // Notes:
-    //   For debugging use only!, query current C++ call stack.
-    virtual void debug_LogCallStack(int nMaxFuncs = 32, int nFlags = 0) = 0;
-
-    // Description:
-    //   Execute command line arguments.
-    //   Should be after init game.
-    // Example:
-    //   +g_gametype ASSAULT +map "testy"
-    virtual void ExecuteCommandLine(bool deferred=true) = 0;
-
-    // Description:
-    //  GetSystemUpdate stats (all systems update without except console)
-    //  very useful on dedicated server as we throttle it to fixed frequency
-    //  returns zeroes if no updates happened yet
-    virtual void GetUpdateStats(SSystemUpdateStats& stats) = 0;
-
-    virtual ESystemGlobalState  GetSystemGlobalState(void) = 0;
-    virtual void SetSystemGlobalState(ESystemGlobalState systemGlobalState) = 0;
-
-#if !defined(_RELEASE)
-    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
-    virtual void RegisterWindowMessageHandler(IWindowMessageHandler* pHandler) = 0;
-
-    // Summary:
-    //      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
-    {
-    public:
-        virtual ~CrySystemNotifications() = default;
-
-        // Override to be notified right before the call to ISystem::Render
-        virtual void OnPreRender() {}
-
-        // Override to be notified right after the call to ISystem::Render (but before RenderEnd)
-        virtual void OnPostRender() {}
-    };
-    using CrySystemNotificationBus = AZ::EBus<CrySystemNotifications>;
-};
-
-#if defined(USE_DISK_PROFILER)
-
-struct DiskOperationInfo
-{
-    DiskOperationInfo()
-        : m_nSeeksCount(0)
-        , m_nFileOpenCount(0)
-        , m_nFileReadCount(0)
-        , m_dOperationSize(0.)
-        , m_dOperationTime(0.) {}
-    int m_nSeeksCount;
-    int m_nFileOpenCount;
-    int m_nFileReadCount;
-    double m_dOperationTime;
-    double m_dOperationSize;
-
-    DiskOperationInfo& operator -= (const DiskOperationInfo& rv)
-    {
-        m_nSeeksCount -= rv.m_nSeeksCount;
-        m_nFileOpenCount -= rv.m_nFileOpenCount;
-        m_nFileReadCount -= rv.m_nFileReadCount;
-        m_dOperationSize -= rv.m_dOperationSize;
-        m_dOperationTime -= rv.m_dOperationTime;
-        return *this;
-    }
-
-    DiskOperationInfo& operator += (const DiskOperationInfo& rv)
-    {
-        m_nSeeksCount += rv.m_nSeeksCount;
-        m_nFileOpenCount += rv.m_nFileOpenCount;
-        m_nFileReadCount += rv.m_nFileReadCount;
-        m_dOperationSize += rv.m_dOperationSize;
-        m_dOperationTime += rv.m_dOperationTime;
-        return *this;
-    }
-
-    DiskOperationInfo operator - (const DiskOperationInfo& rv)
-    {
-        DiskOperationInfo res(*this);
-        return res -= rv;
-    }
-
-    DiskOperationInfo operator + (const DiskOperationInfo& rv)
-    {
-        DiskOperationInfo res(*this);
-        return res += rv;
-    }
-};
-
-#endif
-
-#if defined(ENABLE_LOADING_PROFILER) && AZ_PROFILE_TELEMETRY
-
-#define LOADING_TIME_PROFILE_SECTION AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzCore)
-#define LOADING_TIME_PROFILE_SECTION_ARGS(...) AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::AzCore, __VA_ARGS__)
-#define LOADING_TIME_PROFILE_SECTION_NAMED(sectionName) AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzCore, sectionName)
-#define LOADING_TIME_PROFILE_SECTION_NAMED_ARGS(sectionName, ...) AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::AzCore, sectionName, __VA_ARGS__)
-
-#else
-
-#define LOADING_TIME_PROFILE_SECTION
-#define LOADING_TIME_PROFILE_SECTION_ARGS(...)
-#define LOADING_TIME_PROFILE_SECTION_NAMED(sectionName)
-#define LOADING_TIME_PROFILE_SECTION_NAMED_ARGS(sectionName, ...)
-
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// CrySystem DLL Exports.
-//////////////////////////////////////////////////////////////////////////
-typedef ISystem* (*PFNCREATESYSTEMINTERFACE)(SSystemInitParams& initParams);
-
-
-//////////////////////////////////////////////////////////////////////////
-// Global environment variable.
-//////////////////////////////////////////////////////////////////////////
-extern SSystemGlobalEnvironment* gEnv;
-
-
-// Summary:
-//   Gets the system interface.
-inline ISystem* GetISystem()
-{
-    // Some unit tests temporarily install and then uninstall ISystem* mocks.
-    // It is generally okay for runtime and tool systems which call this function to cache the returned pointer,
-    // because their lifetime is usually shorter than the lifetime of the ISystem* implementation.
-    // It is NOT safe for this function to cache it as a static itself, though, as the static it would cache
-    // it inside may outlive the the actual instance implementing ISystem* when unit tests are torn down and then restarted.
-    ISystem* systemInterface = gEnv ? gEnv->pSystem : nullptr;
-    if (!systemInterface)
-    {
-        CrySystemRequestBus::BroadcastResult(systemInterface, &CrySystemRequests::GetCrySystem);
-    }
-    return systemInterface;
-};
-//////////////////////////////////////////////////////////////////////////
-
-// Description:
-//   This function must be called once by each module at the beginning, to setup global pointers.
-extern "C" AZ_DLL_EXPORT void ModuleInitISystem(ISystem* pSystem, const char* moduleName);
-extern "C" AZ_DLL_EXPORT void ModuleShutdownISystem(ISystem* pSystem);
-extern "C" AZ_DLL_EXPORT void InjectEnvironment(void* env);
-extern "C" AZ_DLL_EXPORT void DetachEnvironment();
-
-void* GetModuleInitISystemSymbol();
-void* GetModuleShutdownISystemSymbol();
-void* GetInjectEnvironmentSymbol();
-void* GetDetachEnvironmentSymbol();
-
-#define PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING \
-    AZ_UNUSED(GetModuleInitISystemSymbol()); \
-    AZ_UNUSED(GetModuleShutdownISystemSymbol()); \
-    AZ_UNUSED(GetInjectEnvironmentSymbol()); \
-    AZ_UNUSED(GetDetachEnvironmentSymbol());
-
-
-extern bool g_bProfilerEnabled;
-
-// Summary:
-//   Interface of the DLL.
-extern "C"
-{
-    CRYSYSTEM_API ISystem* CreateSystemInterface(const SSystemInitParams& initParams);
-}
-
-// Description:
-//   Displays error message.
-//   Logs it to console and file and error message box.
-//   Then terminates execution.
-void CryFatalError(const char*, ...) PRINTF_PARAMS(1, 2);
-inline void CryFatalError(const char* format, ...)
-{
-    if (!gEnv || !gEnv->pSystem)
-    {
-        return;
-    }
-
-    va_list ArgList;
-    char szBuffer[MAX_WARNING_LENGTH];
-    va_start(ArgList, format);
-    int count = azvsnprintf(szBuffer, sizeof(szBuffer), format, ArgList);
-    if (count == -1 || count >= sizeof(szBuffer))
-    {
-        szBuffer[sizeof(szBuffer) - 1] = '\0';
-    }
-    va_end(ArgList);
-
-    gEnv->pSystem->FatalError("%s", szBuffer);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-// Description:
-//   Displays warning message.
-//   Logs it to console and file and display a warning message box.
-//   Doesn't terminate execution.
-void CryWarning(EValidatorModule, EValidatorSeverity, const char*, ...) PRINTF_PARAMS(3, 4);
-inline void CryWarning(EValidatorModule module, EValidatorSeverity severity, const char* format, ...)
-{
-    if (!gEnv || !gEnv->pSystem || !format)
-    {
-        return;
-    }
-
-    va_list args;
-    va_start(args, format);
-    GetISystem()->WarningV(module, severity, 0, 0, format, args);
-    va_end(args);
-}
-
-#ifdef EXCLUDE_CVARHELP
-#define CVARHELP(_comment)  0
-#else
-#define CVARHELP(_comment)  _comment
-#endif
-
-//Provide macros for fixing cvars for release mode on consoles to enums to allow for code stripping
-//Do not enable for PC, apply VF_CHEAT there if required
-#if defined(CONSOLE)
-#define CONST_CVAR_FLAGS (VF_CHEAT)
-#else
-#define CONST_CVAR_FLAGS (VF_NULL)
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_5
-    #include AZ_RESTRICTED_FILE(ISystem_h)
-#endif
-#if defined(_RELEASE) && defined(IS_CONSOLE_PLATFORM)
-#ifndef LOG_CONST_CVAR_ACCESS
-#error LOG_CONST_CVAR_ACCESS should be defined in ProjectDefines.h
-#endif
-
-#include "IConsole.h"
-namespace Detail
-{
-    template<typename T>
-    struct SQueryTypeEnum;
-    template<>
-    struct SQueryTypeEnum<int>
-    {
-        static const int type = CVAR_INT;
-        static int ParseString(const char* s) { return atoi(s); }
-    };
-    template<>
-    struct SQueryTypeEnum<float>
-    {
-        static const int type = CVAR_FLOAT;
-        static float ParseString(const char* s) { return (float)atof(s); }
-    };
-
-    template<typename T>
-    struct SDummyCVar
-        : ICVar
-    {
-        const T value;
-#if LOG_CONST_CVAR_ACCESS
-        mutable bool bWasRead;
-        mutable bool bWasChanged;
-        SDummyCVar(T val)
-            : value(val)
-            , bWasChanged(false)
-            , bWasRead(false) {}
-#else
-        SDummyCVar(T val)
-            : value(val) {}
-#endif
-
-        void WarnUse() const
-        {
-#if LOG_CONST_CVAR_ACCESS
-            if (!bWasRead)
-            {
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[CVAR] Read from const CVar '%s' via name look-up, this is non-optimal", GetName());
-                bWasRead = true;
-            }
-#endif
-        }
-
-        void InvalidAccess() const
-        {
-#if LOG_CONST_CVAR_ACCESS
-            if (!bWasChanged)
-            {
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "[CVAR] Write to const CVar '%s' with wrong value '%f' was ignored. This indicates a bug in code or a config file", GetName(), GetFVal());
-                bWasChanged = true;
-            }
-#endif
-        }
-
-        void Release() {}
-        int GetIVal() const { WarnUse(); return static_cast<int>(value); }
-        int64 GetI64Val() const { WarnUse(); return static_cast<int64>(value); }
-        float GetFVal() const { WarnUse(); return static_cast<float>(value); }
-        const char* GetString() const { return ""; }
-        const char* GetDataProbeString() const { return ""; }
-        void Set(const char* s)
-        {
-            if (SQueryTypeEnum<T>::ParseString(s) != value)
-            {
-                InvalidAccess();
-            }
-        }
-        void ForceSet(const char* s) { Set(s); }
-        void Set(const float f)
-        {
-            if (static_cast<T>(f) != value)
-            {
-                InvalidAccess();
-            }
-        }
-        void Set(const int i)
-        {
-            if (static_cast<T>(i) != value)
-            {
-                InvalidAccess();
-            }
-        }
-        void ClearFlags([[maybe_unused]] int flags) {}
-        int GetFlags() const { return VF_CONST_CVAR | VF_READONLY; }
-        int SetFlags([[maybe_unused]] int flags) { return 0; }
-        int GetType() { return SQueryTypeEnum<T>::type; }
-        const char* GetHelp() { return NULL; }
-        bool IsConstCVar() const { return true; }
-        void SetOnChangeCallback(ConsoleVarFunc pChangeFunc) { (void)pChangeFunc; }
-        uint64 AddOnChangeFunctor(const SFunctor& pChangeFunctor) { (void)pChangeFunctor; return 0; }
-        uint64 GetNumberOfOnChangeFunctors() const { return 0; }
-        const SFunctor& GetOnChangeFunctor([[maybe_unused]] uint64 nFunctorIndex) const { InvalidAccess(); SFunctor* pNull = nullptr; return *pNull; }
-        bool RemoveOnChangeFunctor([[maybe_unused]] const uint64 nElement) { return true; }
-        ConsoleVarFunc GetOnChangeCallback() const { InvalidAccess(); return NULL; }
-        void GetMemoryUsage([[maybe_unused]] class ICrySizer* pSizer) const {}
-        int GetRealIVal() const { return GetIVal(); }
-        void SetLimits([[maybe_unused]] float min, [[maybe_unused]] float max) { return; }
-        void GetLimits([[maybe_unused]] float& min, [[maybe_unused]] float& max) { return; }
-        bool HasCustomLimits() { return false; }
-        void SetDataProbeString([[maybe_unused]] const char* pDataProbeString) { InvalidAccess(); }
-    };
-}
-
-#define REGISTER_DUMMY_CVAR(type, name, value)                                           \
-    do {                                                                                 \
-        static struct DummyCVar                                                          \
-            : Detail::SDummyCVar<type>                                                   \
-        {                                                                                \
-            DummyCVar()                                                                  \
-                : Detail::SDummyCVar<type>(value) {}                                     \
-            const char* GetName() const { return name; }                                 \
-        } DummyStaticInstance;                                                           \
-        if (!(gEnv->pConsole != 0 ? gEnv->pConsole->Register(&DummyStaticInstance) : 0)) \
-        {                                                                                \
-            DEBUG_BREAK;                                                                 \
-            CryFatalError("Can not register dummy CVar");                                \
-        }                                                                                \
-    } while (0)
-
-# define CONSOLE_CONST_CVAR_MODE
-# define DeclareConstIntCVar(name, defaultValue) enum : int { name = (defaultValue) }
-# define DeclareStaticConstIntCVar(name, defaultValue) enum : int { name = (defaultValue) }
-
-# define DefineConstIntCVarName(strname, name, defaultValue, flags, help) { COMPILE_TIME_ASSERT((int)(defaultValue) == (int)(name)); REGISTER_DUMMY_CVAR(int, strname, defaultValue); }
-# define DefineConstIntCVar(name, defaultValue, flags, help) { COMPILE_TIME_ASSERT((int)(defaultValue) == (int)(name)); REGISTER_DUMMY_CVAR(int, (#name), defaultValue); }
-// DefineConstIntCVar2 is deprecated, any such instance can be converted to the 3 variant by removing the quotes around the first parameter
-# define DefineConstIntCVar3(name, _var_, defaultValue, flags, help) { COMPILE_TIME_ASSERT((int)(defaultValue) == (int)(_var_)); REGISTER_DUMMY_CVAR(int, name, defaultValue); }
-# define AllocateConstIntCVar(scope, name)
-
-# define DefineConstFloatCVar(name, flags, help) { REGISTER_DUMMY_CVAR(float, (#name), name ## Default); }
-# define DeclareConstFloatCVar(name)
-# define DeclareStaticConstFloatCVar(name)
-# define AllocateConstFloatCVar(scope, name)
-
-# define IsCVarConstAccess(expr) expr
-
-#else
-
-# define DeclareConstIntCVar(name, defaultValue) int name { defaultValue }
-# define DeclareStaticConstIntCVar(name, defaultValue) static int name
-# define DefineConstIntCVarName(strname, name, defaultValue, flags, help) \
-    (gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(strname, &name, defaultValue, flags | CONST_CVAR_FLAGS, CVARHELP(help)))
-# define DefineConstIntCVar(name, defaultValue, flags, help) \
-    (gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register((#name), &name, defaultValue, flags | CONST_CVAR_FLAGS, CVARHELP(help), 0, false))
-// DefineConstIntCVar2 is deprecated, any such instance can be converted to the 3 variant by removing the quotes around the first parameter
-# define DefineConstIntCVar3(_name, _var, _def_val, _flags, help) \
-    (gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, &(_var), (_def_val), (_flags) | CONST_CVAR_FLAGS, CVARHELP(help), 0, false))
-# define AllocateConstIntCVar(scope, name) int scope:: name
-
-# define DefineConstFloatCVar(name, flags, help) \
-    (gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register((#name), &name, name ## Default, flags | CONST_CVAR_FLAGS, CVARHELP(help), 0, false))
-# define DeclareConstFloatCVar(name) float name
-# define DeclareStaticConstFloatCVar(name) static float name
-# define AllocateConstFloatCVar(scope, name) float scope:: name
-
-# define IsCVarConstAccess(expr)
-
-#endif
-
-#if defined(USE_CRY_ASSERT)
-static void AssertConsoleExists(void)
-{
-    CRY_ASSERT(gEnv->pConsole != NULL);
-}
-#define ASSERT_CONSOLE_EXISTS AssertConsoleExists()
-#else
-#define ASSERT_CONSOLE_EXISTS 0
-#endif // defined(USE_CRY_ASSERT)
-
-// the following macros allow the help text to be easily stripped out
-
-// Summary:
-//   Preferred way to register a CVar
-#define REGISTER_CVAR(_var, _def_val, _flags, _comment)                                                            (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register((#_var), &(_var), (_def_val), (_flags), CVARHELP(_comment)))
-// Summary:
-//   Preferred way to register a CVar with a callback
-#define REGISTER_CVAR_CB(_var, _def_val, _flags, _comment, _onchangefunction)                   (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register((#_var), &(_var), (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
-// Summary:
-//   Preferred way to register a string CVar
-#define REGISTER_STRING(_name, _def_val, _flags, _comment)                                                     (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterString(_name, (_def_val), (_flags), CVARHELP(_comment)))
-// Summary:
-//   Preferred way to register a string CVar with a callback
-#define REGISTER_STRING_CB(_name, _def_val, _flags, _comment, _onchangefunction)            (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterString(_name, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
-// Summary:
-//   Preferred way to register an int CVar
-#define REGISTER_INT(_name, _def_val, _flags, _comment)                                                            (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterInt(_name, (_def_val), (_flags), CVARHELP(_comment)))
-// Summary:
-//   Preferred way to register an int CVar with a callback
-#define REGISTER_INT_CB(_name, _def_val, _flags, _comment, _onchangefunction)                   (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterInt(_name, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
-// Summary:
-//   Preferred way to register an int64 CVar
-#define REGISTER_INT64(_name, _def_val, _flags, _comment)                                                      (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterInt64(_name, (_def_val), (_flags), CVARHELP(_comment)))
-// Summary:
-//   Preferred way to register an int64 CVar with a callback
-#define REGISTER_INT64_CB(_name, _def_val, _flags, _comment, _onchangefunction)                                                     (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterInt64(_name, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
-// Summary:
-//   Preferred way to register a float CVar
-#define REGISTER_FLOAT(_name, _def_val, _flags, _comment)                                                      (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterFloat(_name, (_def_val), (_flags), CVARHELP(_comment)))
-// Summary:
-//   Preferred way to register a float CVar with a callback
-#define REGISTER_FLOAT_CB(_name, _def_val, _flags, _comment, _onchangefunction)                 (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterFloat(_name, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
-// Summary:
-//   Offers more flexibility but more code is required
-#define REGISTER_CVAR2(_name, _var, _def_val, _flags, _comment)                                             (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, _var, (_def_val), (_flags), CVARHELP(_comment)))
-// Summary:
-//   Offers more flexibility but more code is required
-#define REGISTER_CVAR2_CB(_name, _var, _def_val, _flags, _comment, _onchangefunction)    (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, _var, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
-// Summary:
-//   Offers more flexibility but more code is required, explicit address taking of destination variable
-#define REGISTER_CVAR3(_name, _var, _def_val, _flags, _comment)                                             (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, &(_var), (_def_val), (_flags), CVARHELP(_comment)))
-// Summary:
-//   Offers more flexibility but more code is required, explicit address taking of destination variable
-#define REGISTER_CVAR3_CB(_name, _var, _def_val, _flags, _comment, _onchangefunction)    (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, &(_var), (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
-// Summary:
-//   Preferred way to register a console command
-#define REGISTER_COMMAND(_name, _func, _flags, _comment)                                                           (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? false : gEnv->pConsole->AddCommand(_name, _func, (_flags), CVARHELP(_comment)))
-// Summary:
-//   Preferred way to unregister a CVar
-#define UNREGISTER_CVAR(_name)                                                      (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? (void)0 : gEnv->pConsole->UnregisterVariable(_name))
-//   Preferred way to unregister a console command
-#define UNREGISTER_COMMAND(_name)                                                           (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? (void)0 : gEnv->pConsole->RemoveCommand(_name))
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Development only cvars
-//
-// N.B:
-// (1) Registered as real cvars *in non release builds only*.
-// (2) Can still be manipulated in release by the mapped variable, so not the same as const cvars.
-// (3) Any 'OnChanged' callback will need guarding against in release builds since the cvar won't exist
-// (4) Any code that tries to get ICVar* will need guarding against in release builds since the cvar won't exist
-//
-// ILLEGAL_DEV_FLAGS is a mask of all those flags which make no sense in a _DEV_ONLY or _DEDI_ONLY cvar since the
-// cvar potentially won't exist in a release build.
-//
-#define ILLEGAL_DEV_FLAGS (VF_NET_SYNCED | VF_CHEAT | VF_CHEAT_ALWAYS_CHECK | VF_CHEAT_NOCHECK | VF_READONLY | VF_CONST_CVAR)
-
-#if defined(_RELEASE)
-#define REGISTER_CVAR_DEV_ONLY(_var, _def_val, _flags, _comment)                                                               NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); _var = _def_val
-#define REGISTER_CVAR_CB_DEV_ONLY(_var, _def_val, _flags, _comment, _onchangefunction)                  NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); _var = _def_val /* _onchangefunction consumed; callback not available */
-#define REGISTER_STRING_DEV_ONLY(_name, _def_val, _flags, _comment)                                                        NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
-#define REGISTER_STRING_CB_DEV_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)               NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
-#define REGISTER_INT_DEV_ONLY(_name, _def_val, _flags, _comment)                                                               NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
-#define REGISTER_INT_CB_DEV_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)                  NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
-#define REGISTER_INT64_DEV_ONLY(_name, _def_val, _flags, _comment)                                                         NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
-#define REGISTER_FLOAT_DEV_ONLY(_name, _def_val, _flags, _comment)                                                         NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
-#define REGISTER_CVAR2_DEV_ONLY(_name, _var, _def_val, _flags, _comment)                                                NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); *(_var) = _def_val
-#define REGISTER_CVAR2_CB_DEV_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)       NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); *(_var) = _def_val
-#define REGISTER_CVAR3_DEV_ONLY(_name, _var, _def_val, _flags, _comment)                                                NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); _var = _def_val
-#define REGISTER_CVAR3_CB_DEV_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)       NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); _var = _def_val
-#define REGISTER_COMMAND_DEV_ONLY(_name, _func, _flags, _comment)                                                  /* consumed; command not available */
-#else
-#define REGISTER_CVAR_DEV_ONLY(_var, _def_val, _flags, _comment)                                                               REGISTER_CVAR(_var, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR_CB_DEV_ONLY(_var, _def_val, _flags, _comment, _onchangefunction)                  REGISTER_CVAR_CB(_var, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_STRING_DEV_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_STRING(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_STRING_CB_DEV_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)               REGISTER_STRING_CB(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_INT_DEV_ONLY(_name, _def_val, _flags, _comment)                                                               REGISTER_INT(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_INT_CB_DEV_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)                  REGISTER_INT_CB(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_INT64_DEV_ONLY(_name, _def_val, _flags, _comment)                                                         REGISTER_INT64(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_FLOAT_DEV_ONLY(_name, _def_val, _flags, _comment)                                                         REGISTER_FLOAT(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR2_DEV_ONLY(_name, _var, _def_val, _flags, _comment)                                                REGISTER_CVAR2(_name, _var, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR2_CB_DEV_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)       REGISTER_CVAR2_CB(_name, _var, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR3_DEV_ONLY(_name, _var, _def_val, _flags, _comment)                                                REGISTER_CVAR3(_name, _var, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR3_CB_DEV_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)       REGISTER_CVAR3_CB(_name, _var, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_COMMAND_DEV_ONLY(_name, _func, _flags, _comment)                                                          REGISTER_COMMAND(_name, _func, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#endif // defined(_RELEASE)
-//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Dedicated server only cvars
-//
-// N.B:
-// (1) Registered as real cvars in all non release builds
-// (2) Registered as real cvars in release on dedi servers only, otherwise treated as DEV_ONLY type cvars (see above)
-//
-
-// TODO Registering all cvars for Dedicated server as well. Currently CrySystems have no concept of Dedicated server with cmake.
-// If we introduce server specific targets for CrySystems, we can add DEDICATED_SERVER flags to those and add the flag back in here.
-#if defined(_RELEASE)
-#define REGISTER_CVAR_DEDI_ONLY(_var, _def_val, _flags, _comment)                                                          REGISTER_CVAR(_var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR_CB_DEDI_ONLY(_var, _def_val, _flags, _comment, _onchangefunction)                 REGISTER_CVAR_CB(_var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_STRING_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                       REGISTER_STRING(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_STRING_CB_DEDI_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)          REGISTER_STRING_CB(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_INT_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                          REGISTER_INT(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_INT_CB_DEDI_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)                 REGISTER_INT_CB(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_INT64_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_INT64(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_FLOAT_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_FLOAT(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR2_DEDI_ONLY(_name, _var, _def_val, _flags, _comment)                                               REGISTER_CVAR2(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR2_CB_DEDI_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)  REGISTER_CVAR2_CB(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR3_DEDI_ONLY(_name, _var, _def_val, _flags, _comment)                                               REGISTER_CVAR3(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_CVAR3_CB_DEDI_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)  REGISTER_CVAR3_CB(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#define REGISTER_COMMAND_DEDI_ONLY(_name, _func, _flags, _comment)                                                         REGISTER_COMMAND(_name, _func, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
-#else
-#define REGISTER_CVAR_DEDI_ONLY(_var, _def_val, _flags, _comment)                                                          REGISTER_CVAR_DEV_ONLY(_var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
-#define REGISTER_CVAR_CB_DEDI_ONLY(_var, _def_val, _flags, _comment, _onchangefunction)                 REGISTER_CVAR_CB_DEV_ONLY(_var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
-#define REGISTER_STRING_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                       REGISTER_STRING_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
-#define REGISTER_STRING_CB_DEDI_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)          REGISTER_STRING_CB_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
-#define REGISTER_INT_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                          REGISTER_INT_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
-#define REGISTER_INT_CB_DEDI_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)                 REGISTER_INT_CB_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
-#define REGISTER_INT64_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_INT64_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
-#define REGISTER_FLOAT_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_FLOAT_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
-#define REGISTER_CVAR2_DEDI_ONLY(_name, _var, _def_val, _flags, _comment)                                               REGISTER_CVAR2_DEV_ONLY(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
-#define REGISTER_CVAR2_CB_DEDI_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)  REGISTER_CVAR2_CB_DEV_ONLY(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
-#define REGISTER_CVAR3_DEDI_ONLY(_name, _var, _def_val, _flags, _comment)                                               REGISTER_CVAR3_DEV_ONLY(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
-#define REGISTER_CVAR3_CB_DEDI_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)  REGISTER_CVAR3_CB_DEV_ONLY(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
-#define REGISTER_COMMAND_DEDI_ONLY(_name, _func, _flags, _comment)                                                         REGISTER_COMMAND_DEV_ONLY(_name, _func, ((_flags) | VF_DEDI_ONLY), _comment)
-#endif // defined(_RELEASE)
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifdef EXCLUDE_NORMAL_LOG               // setting this removes a lot of logging to reduced code size (useful for consoles)
-
-#define CryLog(...) ((void)0)
-#define CryComment(...) ((void)0)
-#define CryLogAlways(...) ((void)0)
-
-#else // EXCLUDE_NORMAL_LOG
-
-// Summary:
-//   Simple logs of data with low verbosity.
-void CryLog(const char*, ...) PRINTF_PARAMS(1, 2);
-inline void CryLog(const char* format, ...)
-{
-    // Fran: we need these guards for the testing framework to work
-    if (gEnv && gEnv->pSystem && gEnv->pLog)
-    {
-        va_list args;
-        va_start(args, format);
-        gEnv->pLog->LogV(ILog::eMessage, format, args);
-        va_end(args);
-    }
-}
-// Notes:
-//   Very rarely used log comment.
-void CryComment(const char*, ...) PRINTF_PARAMS(1, 2);
-inline void CryComment(const char* format, ...)
-{
-    // Fran: we need these guards for the testing framework to work
-    if (gEnv && gEnv->pSystem && gEnv->pLog)
-    {
-        va_list args;
-        va_start(args, format);
-        gEnv->pLog->LogV(ILog::eComment, format, args);
-        va_end(args);
-    }
-}
-// Summary:
-//   Logs important data that must be printed regardless verbosity.
-void CryLogAlways(const char*, ...) PRINTF_PARAMS(1, 2);
-inline void CryLogAlways(const char* format, ...)
-{
-    // log should not be used before system is ready
-    // error before system init should be handled explicitly
-
-    // Fran: we need these guards for the testing framework to work
-
-    if (gEnv && gEnv->pSystem && gEnv->pLog)
-    {
-        //      assert(gEnv);
-        //      assert(gEnv->pSystem);
-
-        va_list args;
-        va_start(args, format);
-        gEnv->pLog->LogV(ILog::eAlways, format, args);
-        va_end(args);
-    }
-}
-
-#endif // EXCLUDE_NORMAL_LOG
-
-//////////////////////////////////////////////////////////////////////////
-// Additional headers.
-//////////////////////////////////////////////////////////////////////////
-#include <FrameProfiler.h>
-
-#endif // CRYINCLUDE_CRYCOMMON_ISYSTEM_H
-
diff --git a/Code/CryEngine/CryCommon/ITexture.h b/Code/CryEngine/CryCommon/ITexture.h
deleted file mode 100644
index c2244b6840..0000000000
--- a/Code/CryEngine/CryCommon/ITexture.h
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ITEXTURE_H
-#define CRYINCLUDE_CRYCOMMON_ITEXTURE_H
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-#include "Cry_Math.h"
-#include "Cry_Color.h"
-#include "Tarray.h"
-#include <smartptr.h>
-class CTexture;
-
-#ifndef COMPILER_SUPPORTS_ENUM_SPECIFICATION
-# if defined(_MSC_VER)
-#  define COMPILER_SUPPORTS_ENUM_SPECIFICATION 1
-# else
-#  define COMPILER_SUPPORTS_ENUM_SPECIFICATION 0
-# endif
-#endif
-
-#if COMPILER_SUPPORTS_ENUM_SPECIFICATION
-enum ETEX_Type : uint8
-#else
-typedef uint8 ETEX_Type;
-enum eTEX_Type
-#endif
-{
-    eTT_1D = 0,
-    eTT_2D,
-    eTT_3D,
-    eTT_Cube,
-    eTT_CubeArray,
-    eTT_Dyn2D,
-    eTT_User,
-    eTT_NearestCube,
-
-    eTT_2DArray,
-    eTT_2DMS,
-
-    eTT_Auto2D,
-
-    eTT_MaxTexType,     // not used
-};
-
-
-// Texture formats
-#if COMPILER_SUPPORTS_ENUM_SPECIFICATION
-enum ETEX_Format : uint8
-#else
-typedef uint8 ETEX_Format;
-enum eTEX_Format
-#endif
-{
-    eTF_Unknown = 0,
-    eTF_R8G8B8A8S,
-    eTF_R8G8B8A8 = 2, // may be saved into file
-
-    eTF_A8 = 4,
-    eTF_R8,
-    eTF_R8S,
-    eTF_R16,
-    eTF_R16F,
-    eTF_R32F,
-    eTF_R8G8,
-    eTF_R8G8S,
-    eTF_R16G16,
-    eTF_R16G16S,
-    eTF_R16G16F,
-    eTF_R11G11B10F,
-    eTF_R10G10B10A2,
-    eTF_R16G16B16A16,
-    eTF_R16G16B16A16S,
-    eTF_R16G16B16A16F,
-    eTF_R32G32B32A32F,
-
-    eTF_CTX1,
-    eTF_BC1 = 22, // may be saved into file
-    eTF_BC2 = 23, // may be saved into file
-    eTF_BC3 = 24, // may be saved into file
-    eTF_BC4U,     // 3Dc+
-    eTF_BC4S,
-    eTF_BC5U,     // 3Dc
-    eTF_BC5S,
-    eTF_BC6UH,
-    eTF_BC6SH,
-    eTF_BC7,
-    eTF_R9G9B9E5,
-
-    // hardware depth buffers
-    eTF_D16,
-    eTF_D24S8,
-    eTF_D32F,
-    eTF_D32FS8,
-
-    // only available as hardware format under DX11.1 with DXGI 1.2
-    eTF_B5G6R5,
-    eTF_B5G5R5,
-    eTF_B4G4R4A4,
-
-    // only available as hardware format under OpenGL
-    eTF_EAC_R11,
-    eTF_EAC_RG11,
-    eTF_ETC2,
-    eTF_ETC2A,
-
-    // only available as hardware format under DX9
-    eTF_A8L8,
-    eTF_L8,
-    eTF_L8V8U8,
-    eTF_B8G8R8,
-    eTF_L8V8U8X8,
-    eTF_B8G8R8X8,
-    eTF_B8G8R8A8,
-
-    eTF_PVRTC2,
-    eTF_PVRTC4,
-
-    eTF_ASTC_4x4,
-    eTF_ASTC_5x4,
-    eTF_ASTC_5x5,
-    eTF_ASTC_6x5,
-    eTF_ASTC_6x6,
-    eTF_ASTC_8x5,
-    eTF_ASTC_8x6,
-    eTF_ASTC_8x8,
-    eTF_ASTC_10x5,
-    eTF_ASTC_10x6,
-    eTF_ASTC_10x8,
-    eTF_ASTC_10x10,
-    eTF_ASTC_12x10,
-    eTF_ASTC_12x12,
-
-    // add R16 unsigned int format for hardware that do not support float point rendering
-    eTF_R16U,
-    eTF_R16G16U,
-    eTF_R10G10B10A2UI,
-
-    eTF_MaxFormat               // unused, must be always the last in the list
-};
-
-#if COMPILER_SUPPORTS_ENUM_SPECIFICATION
-enum ETEX_TileMode : uint8
-#else
-typedef uint8 ETEX_TileMode;
-enum eTEX_TileMode
-#endif
-{
-    eTM_None = 0,
-    eTM_LinearPadded,
-    eTM_Optimal,
-};
-
-
-enum ETextureFlags
-{
-    FT_NOMIPS                  = 0x00000001,
-    FT_TEX_NORMAL_MAP          = 0x00000002,
-    FT_TEX_WAS_NOT_PRE_TILED   = 0x00000004,
-    FT_USAGE_DEPTHSTENCIL      = 0x00000008,
-    FT_USAGE_ALLOWREADSRGB     = 0x00000010,
-    FT_FILESINGLE              = 0x00000020, // suppress loading of additional files like _DDNDIF (faster, RC can tag the file for that)
-    FT_TEX_FONT                = 0x00000040,
-    FT_HAS_ATTACHED_ALPHA      = 0x00000080,
-    FT_USAGE_UNORDERED_ACCESS  = 0x00000100,
-    FT_USAGE_READBACK          = 0x00000200,
-    FT_USAGE_MSAA              = 0x00000400,
-    FT_FORCE_MIPS              = 0x00000800,
-    FT_USAGE_RENDERTARGET      = 0x00001000,
-    FT_USAGE_DYNAMIC           = 0x00002000,
-    FT_STAGE_READBACK          = 0x00004000,
-    FT_STAGE_UPLOAD            = 0x00008000,
-    FT_DONT_RELEASE            = 0x00010000,
-    FT_ASYNC_PREPARE           = 0x00020000,
-    FT_DONT_STREAM             = 0x00040000,
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #include AZ_RESTRICTED_FILE(ITexture_h)
-#endif
-
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-#if defined(AZ_PLATFORM_IOS)
-    FT_USAGE_MEMORYLESS        = 0x00080000, //reusing an unused bit for ios
-#else
-    FT_USAGE_PREDICATED_TILING = 0x00080000, //unused
-#endif
-#endif
-    FT_FAILED                  = 0x00100000,
-    FT_FROMIMAGE               = 0x00200000,
-    FT_STATE_CLAMP             = 0x00400000,
-    FT_USAGE_ATLAS             = 0x00800000,
-    FT_ALPHA                   = 0x01000000,
-    FT_REPLICATE_TO_ALL_SIDES  = 0x02000000,
-    FT_KEEP_LOWRES_SYSCOPY     = 0x04000000, // keep low res copy in system memory for voxelization on CPU
-    FT_SPLITTED                = 0x08000000, // for split dds files
-    FT_USE_HTILE               = 0x10000000,
-    FT_IGNORE_PRECACHE         = 0x20000000,
-    FT_COMPOSITE               = 0x40000000,
-    FT_USAGE_UAV_RWTEXTURE     = 0x80000000,
-};
-
-struct SDepthTexture;
-
-struct STextureStreamingStats
-{
-    STextureStreamingStats(bool bComputeTexturesPerFrame)
-        : bComputeReuquiredTexturesPerFrame(bComputeTexturesPerFrame)
-    {
-        nMaxPoolSize = 0;
-        nCurrentPoolSize = 0;
-        nStreamedTexturesSize = 0;
-        nStaticTexturesSize = 0;
-        nThroughput = 0;
-        nNumTexturesPerFrame = 0;
-        nRequiredStreamedTexturesSize = 0;
-        nRequiredStreamedTexturesCount = 0;
-        bPoolOverflow = false;
-        bPoolOverflowTotally = false;
-        fPoolFragmentation = 0.0f;
-    }
-    size_t nMaxPoolSize;
-    size_t nCurrentPoolSize;
-    size_t nStreamedTexturesSize;
-    size_t nStaticTexturesSize;
-    uint32 nNumTexturesPerFrame;
-    size_t nThroughput;
-    size_t nRequiredStreamedTexturesSize;
-    uint32 nRequiredStreamedTexturesCount;
-    float fPoolFragmentation;
-    uint32 bPoolOverflow : 1;
-    uint32 bPoolOverflowTotally : 1;
-    const bool bComputeReuquiredTexturesPerFrame;
-};
-
-
-//////////////////////////////////////////////////////////////////////
-// Texture object interface
-class CDeviceTexture;
-class ITexture
-{
-protected:
-    virtual ~ITexture() {}
-public:
-
-    // <interfuscator:shuffle>
-    virtual int AddRef() = 0;
-    virtual int Release() = 0;
-    virtual int ReleaseForce() = 0;
-
-    virtual const ColorF& GetClearColor() const = 0;
-    virtual const ETEX_Format GetDstFormat() const = 0;
-    virtual const ETEX_Format GetSrcFormat() const = 0;
-    virtual const ETEX_Type GetTexType() const = 0;
-    virtual void ApplyTexture(int nTUnit, int nState = -1) = 0;
-    virtual const char* GetName() const = 0;
-    virtual const int GetWidth() const = 0;
-    virtual const int GetHeight() const = 0;
-    virtual const int GetDepth() const = 0;
-    virtual const int GetTextureID() const = 0;
-    virtual const uint32 GetFlags() const = 0;
-    virtual const int GetNumMips() const = 0;
-    virtual const int GetRequiredMip() const = 0;
-    virtual const int GetDeviceDataSize() const  = 0;
-    virtual const int GetDataSize() const = 0;
-    virtual const ETEX_Type GetTextureType() const = 0;
-    // Sets the texture type of the texture to be used before the texture is loaded.
-    // Once the texture is loaded the type from the file will overwrite whatever
-    // value was set here.
-    virtual void SetTextureType(ETEX_Type type) = 0;
-    virtual const bool IsTextureLoaded() const = 0;
-    virtual void PrecacheAsynchronously(float fMipFactor, int nFlags, int nUpdateId, int nCounter = 1) = 0;
-    virtual uint8* GetData32(int nSide = 0, int nLevel = 0, uint8* pDst = NULL, ETEX_Format eDstFormat = eTF_R8G8B8A8) = 0;
-    virtual bool SetFilter(int nFilter) = 0;   // FILTER_ flags
-    virtual void SetClamp(bool bEnable) = 0; // Texture addressing set
-    virtual float GetAvgBrightness() const = 0;
-
-    virtual int StreamCalculateMipsSigned(float fMipFactor) const = 0;
-    virtual int GetStreamableMipNumber() const = 0;
-    virtual int GetStreamableMemoryUsage(int nStartMip) const = 0;
-    virtual int GetMinLoadedMip() const = 0;
-
-    using StagingHook = AZStd::function<bool(void*, uint32, uint32)>;
-    virtual void Readback(AZ::u32 subresourceIndex, StagingHook callback) = 0;
-
-    virtual bool Reload() = 0;
-    // Used for debugging/profiling.
-    virtual const char* GetFormatName() const = 0;
-    virtual const char* GetTypeName() const = 0;
-    virtual const bool IsStreamedVirtual() const = 0;
-    virtual const bool IsShared() const = 0;
-    virtual const bool IsStreamable() const = 0;
-    virtual bool IsStreamedIn(const int nMinPrecacheRoundIds[2]) const = 0;
-    virtual const int GetAccessFrameId() const = 0;
-
-    virtual const ETEX_Format GetTextureDstFormat() const = 0;
-    virtual const ETEX_Format GetTextureSrcFormat() const = 0;
-
-    virtual bool IsPostponed() const = 0;
-    virtual const bool IsParticularMipStreamed(float fMipFactor) const = 0;
-
-    // get low res system memory (used for CPU voxelization)
-    virtual const ColorB* GetLowResSystemCopy([[maybe_unused]] uint16& nWidth, [[maybe_unused]] uint16& nHeight, [[maybe_unused]] int** ppLowResSystemCopyAtlasId) { return 0; }
-
-    // </interfuscator:shuffle>
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
-    {
-        COMPILE_TIME_ASSERT(eTT_MaxTexType <= 255);
-        COMPILE_TIME_ASSERT(eTF_MaxFormat <= 255);
-        /*LATER*/
-    }
-
-    virtual void SetKeepSystemCopy(bool bKeepSystemCopy) = 0;
-    virtual void UpdateTextureRegion(const uint8_t* data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc) = 0;
-    virtual CDeviceTexture* GetDevTexture() const = 0;
-
-};
-
-struct STextureLoadData
-{
-    void*               m_pData;
-    size_t              m_DataSize;
-    int                 m_Width;
-    int                 m_Height;
-    ETEX_Format         m_Format;
-    int                 m_NumMips;
-    int                 m_nFlags;
-    ITexture*           m_pTexture;
-    STextureLoadData()
-        : m_pData(nullptr)
-        , m_Width(0)
-        , m_Height(0)
-        , m_Format(eTF_Unknown)
-        , m_NumMips(0)
-        , m_nFlags(0)
-        , m_pTexture(nullptr)
-    {
-    }
-    ~STextureLoadData()
-    {
-        if (m_pData)
-        {
-            CryModuleFree(m_pData);
-        }
-    }
-
-    static void* AllocateData(size_t dataSize)
-    {
-        return CryModuleMalloc(dataSize);
-    }
-};
-struct ITextureLoadHandler
-{
-    virtual ~ITextureLoadHandler() {}
-    virtual bool LoadTextureData(const char* path, STextureLoadData& loadData) = 0;
-    virtual bool SupportsExtension(const char* ext) const = 0;
-    virtual void Update() = 0;
-};
-
-//=========================================================================================
-
-class IDynTexture
-{
-public:
-    enum
-    {
-        fNeedRegenerate = 1ul << 0,
-    };
-    // <interfuscator:shuffle>
-    virtual ~IDynTexture(){}
-    virtual void Release() = 0;
-    virtual void GetSubImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight) = 0;
-    virtual void GetImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight) = 0;
-    virtual int GetTextureID() = 0;
-    virtual void Lock() = 0;
-    virtual void UnLock() = 0;
-    virtual int GetWidth() = 0;
-    virtual int GetHeight() = 0;
-    virtual bool IsValid() = 0;
-    virtual uint8 GetFlags() const = 0;
-    virtual void SetFlags([[maybe_unused]] uint8 flags) {}
-    virtual bool Update(int nNewWidth, int nNewHeight) = 0;
-    virtual void Apply(int nTUnit, int nTS = -1) = 0;
-    virtual bool ClearRT() = 0;
-    virtual bool SetRT(int nRT, bool bPush, struct SDepthTexture* pDepthSurf, bool bScreenVP = false) = 0;
-    virtual bool SetRectStates() = 0;
-    virtual bool RestoreRT(int nRT, bool bPop) = 0;
-    virtual ITexture* GetTexture() = 0;
-    virtual void SetUpdateMask() = 0;
-    virtual void ResetUpdateMask() = 0;
-    virtual bool IsSecondFrame() = 0;
-    virtual bool GetImageData32([[maybe_unused]] uint8* pData, [[maybe_unused]] int nDataSize) { return 0; }
-    // </interfuscator:shuffle>
-};
-
-// Animating Texture sequence definition
-class ITexAnim
-{
-public:
-    virtual ~ITexAnim() {};
-    virtual void Release() = 0;
-    virtual void AddRef() = 0;
-};
-
-struct AZ_DEPRECATED(STexAnim, "STexAnim has been deprecated and replaced by the abstract interface ITexAnim above and CTexAnim in RenderDLL/Common/Textures/Texture.h. This was done to keep proper ref counting between CryRenderDLL and EditorLib.") {};
-
-struct STexComposition
-{
-    _smart_ptr<ITexture> pTexture;
-    uint16 nSrcSlice;
-    uint16 nDstSlice;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_ITEXTURE_H
diff --git a/Code/CryEngine/CryCommon/ITimer.h b/Code/CryEngine/CryCommon/ITimer.h
deleted file mode 100644
index dccdafae17..0000000000
--- a/Code/CryEngine/CryCommon/ITimer.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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/CryEngine/CryCommon/IValidator.h b/Code/CryEngine/CryCommon/IValidator.h
deleted file mode 100644
index 610b8f8748..0000000000
--- a/Code/CryEngine/CryCommon/IValidator.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : IValidator interface used to check objects for warnings and errors
-//               Report missing resources or invalid files.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IVALIDATOR_H
-#define CRYINCLUDE_CRYCOMMON_IVALIDATOR_H
-#pragma once
-
-#   define MAX_WARNING_LENGTH   4096
-
-#if MAX_WARNING_LENGTH < 33
-#error "MAX_WARNING_LENGTH should be bigger than 32"
-#endif
-
-#define ERROR_CANT_FIND_CENTRAL_DIRECTORY "Cannot find Central Directory Record in pak. This is either not a pak file, or a pak file without Central Directory. It does not mean that the data is permanently lost, but it may be severely damaged. Please repair the file with external tools, there may be enough information left to recover the file completely."
-
-enum EValidatorSeverity
-{
-    VALIDATOR_ERROR,
-    VALIDATOR_ERROR_DBGBRK, // will __debugbreak() if sys_error_debugbreak is 1
-    VALIDATOR_WARNING,
-    VALIDATOR_COMMENT
-};
-
-enum EValidatorModule
-{
-    VALIDATOR_MODULE_UNKNOWN,
-    VALIDATOR_MODULE_RENDERER,
-    VALIDATOR_MODULE_3DENGINE,
-    VALIDATOR_MODULE_ASSETS,
-    VALIDATOR_MODULE_SYSTEM,
-    VALIDATOR_MODULE_AUDIO,
-    VALIDATOR_MODULE_MOVIE,
-    VALIDATOR_MODULE_EDITOR,
-    VALIDATOR_MODULE_NETWORK,
-    VALIDATOR_MODULE_PHYSICS,
-    VALIDATOR_MODULE_RESERVED, // formerly VALIDATOR_MODULE_FLOWGRAPH
-    VALIDATOR_MODULE_FEATURETESTS,
-    VALIDATOR_MODULE_ONLINE,
-    VALIDATOR_MODULE_SHINE,
-    VALIDATOR_MODULE_DRS,
-};
-
-enum EValidatorFlags
-{
-    VALIDATOR_FLAG_FILE             = 0x0001, // Indicate that required file was not found or file was invalid.
-    VALIDATOR_FLAG_TEXTURE          = 0x0002, // Problem with texture.
-    VALIDATOR_FLAG_SCRIPT           = 0x0004, // Problem with script.
-    VALIDATOR_FLAG_AUDIO            = 0x0008, // Problem with audio.
-    VALIDATOR_FLAG_AI               = 0x0010, // Problem with AI.
-    VALIDATOR_FLAG_LOG_ASSET_SCOPE  = 0x0020, // Log asset scope with the warning.
-    VALIDATOR_FLAG_IGNORE_IN_EDITOR = 0x0040, // Do not log this with the editor
-    VALIDATOR_FLAG_SKIP_VALIDATOR   = 0x0080, // Do not call validator's Report()
-};
-
-struct SValidatorRecord
-{
-    //! Severity of this error.
-    EValidatorSeverity severity;
-    //! In which module error occured.
-    EValidatorModule module;
-    //! Error Text.
-    const char* text;
-    //! File which is missing or causing problem.
-    const char* file;
-    //! Additional description for this error.
-    const char* description;
-    //! Asset scope sring
-    const char* assetScope;
-    //! Flags that suggest kind of error.
-    int flags;
-
-    //////////////////////////////////////////////////////////////////////////
-    SValidatorRecord()
-    {
-        module = VALIDATOR_MODULE_UNKNOWN;
-        text = NULL;
-        file = NULL;
-        assetScope = NULL;
-        description = NULL;
-        severity = VALIDATOR_WARNING;
-        flags = 0;
-    }
-};
-
-/*! This interface will be given to Validate methods of engine, for resources and objects validation.
- */
-struct IValidator
-{
-    // <interfuscator:shuffle>
-    virtual ~IValidator(){}
-    virtual void Report(SValidatorRecord& record) = 0;
-    // </interfuscator:shuffle>
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_IVALIDATOR_H
diff --git a/Code/CryEngine/CryCommon/IViewSystem.h b/Code/CryEngine/CryCommon/IViewSystem.h
deleted file mode 100644
index 646e963653..0000000000
--- a/Code/CryEngine/CryCommon/IViewSystem.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : View System interfaces.
-
-
-#ifndef CRYINCLUDE_CRYACTION_IVIEWSYSTEM_H
-#define CRYINCLUDE_CRYACTION_IVIEWSYSTEM_H
-#pragma once
-
-#include <ISerialize.h>
-#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 Serialize(TSerialize ser) = 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;
-    virtual void UpdateAudioListener(const Matrix34& rMatrix) = 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 Serialize(TSerialize ser) = 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 UpdateSoundListeners() = 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;
-};
-
-#endif // CRYINCLUDE_CRYACTION_IVIEWSYSTEM_H
diff --git a/Code/CryEngine/CryCommon/IWindowMessageHandler.h b/Code/CryEngine/CryCommon/IWindowMessageHandler.h
deleted file mode 100644
index 855fc585d8..0000000000
--- a/Code/CryEngine/CryCommon/IWindowMessageHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef _CRY_WINDOW_MESSAGE_HANDLER_H_
-#define _CRY_WINDOW_MESSAGE_HANDLER_H_
-#include "platform.h"
-#if defined(WIN32)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-
-// Summary:
-//      Window message handler for Windows OS
-struct IWindowMessageHandler
-{
-    // Summary:
-    //      The low-level pre-process message handler for Windows
-    //      This is called before TranslateMessage/DispatchMessage (which will eventually end up in the HandleMessage handler)
-    //      Typically, do not implement this function.
-    virtual void PreprocessMessage([[maybe_unused]] HWND hWnd, [[maybe_unused]] UINT uMsg, [[maybe_unused]] WPARAM wParam, [[maybe_unused]] LPARAM lParam) {}
-
-    // Summary:
-    //      The low-level window message handler for Windows
-    //      The return value specifies if the implementation wants to modify the message handling result
-    //      When returning true, the desired result value should be written through the pResult pointer
-    //      When returning false, the value stored through pResult (if any) is ignored
-    //      If more than one implementation write different results, the behavior is undefined
-    //      If none of the implementations write any result, the default OS result will be used instead
-    //      In general, return false if the handler doesn't care about the message, or only uses it for informational purposes
-    virtual bool HandleMessage([[maybe_unused]] HWND hWnd, [[maybe_unused]] UINT uMsg, [[maybe_unused]] WPARAM wParam, [[maybe_unused]] LPARAM lParam, [[maybe_unused]] LRESULT* pResult) { return false; }
-};
-#else
-// Summary:
-//      Dummy window message handler
-//      This is used for platforms that don't use window message handlers
-struct IWindowMessageHandler
-{
-};
-#endif
-#endif
diff --git a/Code/CryEngine/CryCommon/IXml.h b/Code/CryEngine/CryCommon/IXml.h
deleted file mode 100644
index 19bc010a39..0000000000
--- a/Code/CryEngine/CryCommon/IXml.h
+++ /dev/null
@@ -1,950 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IXML_H
-#define CRYINCLUDE_CRYCOMMON_IXML_H
-#pragma once
-
-#include <platform.h>
-#include <Cry_Math.h>
-#include <AzCore/IO/FileIO.h>
-
-class ICrySizer;
-
-template <class T>
-struct Color_tpl;
-typedef Color_tpl<uint8> ColorB;
-
-template <typename F>
-struct Vec2_tpl;
-typedef Vec2_tpl<f32>   Vec2;
-typedef Vec2_tpl<f64>  Vec2d;
-
-template <typename F>
-struct Vec3_tpl;
-typedef Vec3_tpl<f32>   Vec3;
-typedef Vec3_tpl<f64>  Vec3d;
-
-template <typename F>
-struct Vec4_tpl;
-typedef Vec4_tpl<f32>   Vec4;
-typedef Vec4_tpl<f64>  Vec4d;
-
-template <typename F>
-struct Quat_tpl;
-typedef Quat_tpl<f32>  Quat;
-
-template <typename F>
-struct Ang3_tpl;
-typedef Ang3_tpl<f32>       Ang3;
-
-
-#if defined(QT_VERSION)
-#include <QColor>
-#include <QString>
-#elif defined(_AFX)
-#include "Util/GuidUtil.h"
-#endif
-
-#include <AzCore/Math/Guid.h>
-#include <AzCore/Math/Uuid.h>
-
-class QColor;
-class QString;
-
-class IXMLBinarySerializer;
-struct IReadWriteXMLSink;
-struct ISerialize;
-
-/*
-This is wrapper around expat library to provide DOM type of access for xml.
-Do not use IXmlNode class directly instead always use XmlNodeRef wrapper that
-takes care of memory management issues.
-
-Usage Example:
--------------------------------------------------------
-void testXml(bool bReuseStrings)
-{
-    XmlParser xml(bReuseStrings);
-    XmlNodeRef root = xml.ParseFile("test.xml", true);
-
-    if (root)
-    {
-        for (int i = 0; i < root->getChildCount(); ++i)
-        {
-            XmlNodeRef child = root->getChild(i);
-            if (child->isTag("world"))
-            {
-                if (child->getAttr("name") == "blah")
-                {
-                    ....
-                }
-            }
-        }
-    }
-}
-*/
-
-// Summary:
-//   Special string wrapper for xml nodes.
-class XmlString
-    : public string
-{
-public:
-    XmlString() {};
-    XmlString(const char* str)
-        : string(str) {};
-
-    operator const char*() const {
-        return c_str();
-    }
-};
-
-// Summary:
-//   XML string data.
-struct IXmlStringData
-{
-    // <interfuscator:shuffle>
-    virtual ~IXmlStringData(){}
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-    virtual const char* GetString() = 0;
-    virtual size_t      GetStringLength() = 0;
-    // </interfuscator:shuffle>
-};
-
-class IXmlNode;
-
-// Summary:
-//   XmlNodeRef, wrapper class implementing reference counting for IXmlNode.
-// See also:
-//   IXmlNode
-class XmlNodeRef
-{
-private:
-    IXmlNode* p;
-public:
-    XmlNodeRef()
-        : p(NULL) {}
-    XmlNodeRef(IXmlNode* p_);
-    XmlNodeRef(const XmlNodeRef& p_);
-
-    ~XmlNodeRef();
-
-    operator IXmlNode*() const {
-        return p;
-    }
-
-    IXmlNode& operator*() const { return *p; }
-    IXmlNode* operator->(void) const { return p; }
-
-    XmlNodeRef&  operator=(IXmlNode* newp);
-    XmlNodeRef&  operator=(const XmlNodeRef& newp);
-
-#if !defined(RESOURCE_COMPILER)
-    template<typename Sizer >
-    void GetMemoryUsage(Sizer* pSizer) const
-    {
-        pSizer->AddObject(p);
-    }
-#endif
-
-    //Support for range based for, and stl algorithms.
-    class XmlNodeRefIterator begin();
-    class XmlNodeRefIterator end();
-};
-
-// Summary:
-//   IXmlNode class
-// Notes:
-//   Never use IXmlNode directly instead use reference counted XmlNodeRef.
-// See also:
-//   XmlNodeRef
-class IXmlNode
-{
-protected:
-    int m_nRefCount;
-
-protected:
-    // <interfuscator:shuffle>
-    virtual void DeleteThis() = 0;
-    virtual ~IXmlNode() {};
-    // </interfuscator:shuffle>
-
-public:
-
-    // <interfuscator:shuffle>
-    // Summary:
-    //   Creates new XML node.
-    virtual XmlNodeRef createNode(const char* tag) = 0;
-
-    // Notes:
-    // AddRef/Release need to be virtual to permit overloading from CXMLNodePool
-
-    // Summary:
-    //   Reference counting.
-    virtual void AddRef() { m_nRefCount++; };
-    // Notes:
-    //   When ref count reach zero XML node dies.
-    virtual void Release()
-    {
-        if (--m_nRefCount <= 0)
-        {
-            DeleteThis();
-        }
-    };
-    virtual int GetRefCount() const { return m_nRefCount; };
-
-    // Summary:
-    //   Gets XML node tag.
-    virtual const char* getTag() const = 0;
-    // Summary:
-    //   Sets XML node tag.
-    virtual void    setTag(const char* tag) = 0;
-
-    // Summary:
-    //   Returns true if a given tag equal to node tag.
-    virtual bool isTag(const char* tag) const = 0;
-
-    // Summary:
-    //   Gets XML Node attributes.
-    virtual int getNumAttributes() const = 0;
-    // Summary:
-    //   Returns attribute key and value by attribute index.
-    virtual bool getAttributeByIndex(int index, const char** key, const char** value) = 0;
-
-    // Summary:
-    //   Copies attributes to this node from a given node.
-    virtual void copyAttributes(XmlNodeRef fromNode) = 0;
-
-    // Summary:
-    //   Gets XML Node attribute for specified key.
-    // Return Value:
-    //   The value of the attribute if it exists, otherwise an empty string.
-    virtual const char* getAttr(const char* key) const = 0;
-
-    // Summary:
-    //  Gets XML Node attribute for specified key.
-    // Return Value:
-    //  True if the attribute exists, false otherwise.
-    virtual bool getAttr(const char* key, const char** value) const = 0;
-
-    // Summary:
-    //  Checks if attributes with specified key exist.
-    virtual bool haveAttr(const char* key) const = 0;
-
-    // Summary:
-    //   Adds new child node.
-    virtual void addChild(const XmlNodeRef& node) = 0;
-
-    // Summary:
-    //   Creates new xml node and add it to childs list.
-    virtual XmlNodeRef newChild(const char* tagName) = 0;
-
-    // Summary:
-    //   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;
-
-    // Summary:
-    //   Gets number of child XML nodes.
-    virtual int getChildCount() const = 0;
-
-    // Summary:
-    //   Gets XML Node child nodes.
-    virtual XmlNodeRef getChild(int i) const = 0;
-
-    // Summary:
-    //   Finds node with specified tag.
-    virtual XmlNodeRef findChild(const char* tag) const = 0;
-
-    // Summary:
-    //   Gets parent XML node.
-    virtual XmlNodeRef getParent() const = 0;
-
-    // Summary:
-    //   Sets parent XML node.
-    virtual void setParent(const XmlNodeRef& inRef) = 0;
-
-    // Summary:
-    //   Returns content of this node.
-    virtual const char* getContent() const = 0;
-    // Summary:
-    //   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;
-
-    // Summary:
-    //   Returns XML of this node and sub nodes.
-    // Notes:
-    //   IXmlStringData pointer must be release when string is not needed anymore.
-    // See also:
-    //   IXmlStringData
-    virtual IXmlStringData* getXMLData(int nReserveMem = 0) const = 0;
-    // Summary:
-    //   Returns XML of this node and sub nodes.
-    virtual XmlString getXML(int level = 0) const = 0;
-    virtual bool saveToFile(const char* fileName) = 0;
-
-    // Summary:
-    //   Sets new XML Node attribute (or override attribute with same key).
-    //##@{
-    virtual void setAttr(const char* key, const char* value) = 0;
-    virtual void setAttr(const char* key, int value) = 0;
-    virtual void setAttr(const char* key, unsigned int value) = 0;
-    virtual void setAttr(const char* key, int64 value) = 0;
-    virtual void setAttr(const char* key, uint64 value, bool useHexFormat = true) = 0;
-    virtual void setAttr(const char* key, float value) = 0;
-    virtual void setAttr(const char* key, double value) = 0;
-    virtual void setAttr(const char* key, const Vec2& value) = 0;
-    virtual void setAttr(const char* key, const Vec2d& value) = 0;
-    virtual void setAttr(const char* key, const Ang3& value) = 0;
-    virtual void setAttr(const char* key, const Vec3& value) = 0;
-    virtual void setAttr(const char* key, const Vec4& value) = 0;
-    virtual void setAttr(const char* key, const Vec3d& value) = 0;
-    virtual void setAttr(const char* key, const Quat& value) = 0;
-#if defined(LINUX64) || defined(APPLE)
-    // Compatibility functions, on Linux and Mac long int is the default int64_t
-    ILINE void setAttr(const char* key, unsigned long int value, bool useHexFormat = true)
-    {
-        setAttr(key, (uint64)value, useHexFormat);
-    }
-
-    ILINE void setAttr(const char* key, long int value)
-    {
-        setAttr(key, (int64)value);
-    }
-#endif
-
-    virtual void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const QColor& color)
-    {
-#if defined(QT_VERSION)
-        setAttr(key, static_cast<unsigned long>(color.red() | (color.green() << 8) | (color.blue() << 16)));
-#endif
-    }
-    //##@}
-
-    // Summary:
-    //   Inline Helpers.
-    //##@{
-    //##@}
-
-    // Summary:
-    //   Deletes attribute.
-    virtual void delAttr(const char* key) = 0;
-    // Summary:
-    //   Removes all node attributes.
-    virtual void removeAllAttributes() = 0;
-
-    // Summary:
-    //   Gets attribute value of node.
-    //##@{
-    virtual bool getAttr(const char* key, int& value) const = 0;
-    virtual bool getAttr(const char* key, unsigned int& value) const = 0;
-    virtual bool getAttr(const char* key, int64& value) const = 0;
-    virtual bool getAttr(const char* key, uint64& value, bool useHexFormat = true) const = 0;
-    virtual bool getAttr(const char* key, float& value) const = 0;
-    virtual bool getAttr(const char* key, double& value) const = 0;
-    virtual bool getAttr(const char* key, Vec2& value) const = 0;
-    virtual bool getAttr(const char* key, Vec2d& value) const = 0;
-    virtual bool getAttr(const char* key, Ang3& value) const = 0;
-    virtual bool getAttr(const char* key, Vec3& value) const = 0;
-    virtual bool getAttr(const char* key, Vec4& value) const = 0;
-    virtual bool getAttr(const char* key, Vec3d& value) const = 0;
-    virtual bool getAttr(const char* key, Quat& value) const = 0;
-    virtual bool getAttr(const char* key, bool& value) const = 0;
-    virtual bool getAttr(const char* key, XmlString& value) const = 0;
-    virtual bool getAttr(const char* key, ColorB& value) const = 0;
-
-#if defined(LINUX64) || defined(APPLE)
-    // Compatibility functions, on Linux and Mac long int is the default int64_t
-    ILINE bool getAttr(const char* key, unsigned long int& value, bool useHexFormat = true) const
-    {
-        return getAttr(key, (uint64&)value, useHexFormat);
-    }
-
-    ILINE bool getAttr(const char* key, long int& value) const
-    {
-        return getAttr(key, (int64&)value);
-    }
-#endif
-
-    // </interfuscator:shuffle>
-
-#if !defined(RESOURCE_COMPILER)
-    // <interfuscator:shuffle>
-    // Summary:
-    //   Collect all allocated memory
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-
-    // 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;
-    // </interfuscator:shuffle>
-#endif
-
-    //##@}
-
-    // Summary:
-    //   Inline Helpers.
-    //##@{
-#if !defined(LINUX64) && !defined(APPLE)
-    bool getAttr(const char* key, long& value) const
-    {
-        int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<long>(v);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    bool getAttr(const char* key, unsigned long& value) const
-    {
-        int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<unsigned long>(v);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    void setAttr(const char* key, unsigned long value) { setAttr(key, (unsigned int)value); };
-    void setAttr(const char* key, long value) { setAttr(key, (int)value); };
-#endif
-    bool getAttr(const char* key, unsigned short& value) const
-    {
-        int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<unsigned short>(v);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    bool getAttr(const char* key, unsigned char& value) const
-    {
-        int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<unsigned char>(v);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    bool getAttr(const char* key, short& value) const
-    {
-        int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<short>(v);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    bool getAttr(const char* key, char& value) const
-    {
-        int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<char>(v);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    //##@}
-
-    // Summary:
-    //   Gets QString attribute.
-    bool getAttr([[maybe_unused]] const char* key, [[maybe_unused]] QString& value) const
-    {
-#if defined(QT_VERSION)
-        if (!haveAttr(key))
-        {
-            return false;
-        }
-        value = getAttr(key);
-        return true;
-#else
-        return false;
-#endif
-    }
-
-    bool getAttr([[maybe_unused]] const char* key, [[maybe_unused]] QColor& color) const
-    {
-#if defined(QT_VERSION)
-        if (!haveAttr(key))
-        {
-            return false;
-        }
-        int v;
-        getAttr(key, v);
-        color = QColor(v & 0xff, (v >> 8) & 0xff, (v >> 16) & 0xff);
-        return true;
-#else
-        return false;
-#endif
-    }
-
-#if defined(QT_VERSION)
-    // Summary:
-    //   Sets GUID attribute.
-    void setAttr(const char* key, const GUID& value)
-    {
-        AZ::Uuid uuid;
-        uuid = value;
-        setAttr(key, uuid.ToString<AZStd::string>().c_str());
-    };
-
-    // Summary:
-    //   Gets GUID from attribute.
-    bool getAttr(const char* key, GUID& value) const
-    {
-        if (!haveAttr(key))
-        {
-            return false;
-        }
-        const char* guidStr = getAttr(key);
-        value = AZ::Uuid(guidStr);
-        if (value.Data1 == 0)
-        {
-            memset(&value, 0, sizeof(value));
-            // If bad GUID, use old guid system.
-            value.Data1 = atoi(guidStr);
-        }
-        return true;
-    }
-#elif defined(_AFX)
-    // Summary:
-    //   Sets GUID attribute.
-    void setAttr(const char* key, REFGUID value)
-    {
-        const char* str = GuidUtil::ToString(value);
-        setAttr(key, str);
-    };
-
-    // Summary:
-    //   Gets GUID from attribute.
-    bool getAttr(const char* key, GUID& value) const
-    {
-        if (!haveAttr(key))
-        {
-            return false;
-        }
-        const char* guidStr = getAttr(key);
-        value = GuidUtil::FromString(guidStr);
-        if (value.Data1 == 0)
-        {
-            memset(&value, 0, sizeof(value));
-            // If bad GUID, use old guid system.
-            value.Data1 = atoi(guidStr);
-        }
-        return true;
-    }
-#endif
-
-    // Summary:
-    //   Lets be friendly to him.
-    friend class XmlNodeRef;
-};
-
-/*
-// Summary:
-//   Inline Implementation of XmlNodeRef
-inline XmlNodeRef::XmlNodeRef(const char *tag, IXmlNode *node)
-{
-    if (node)
-    {
-        p = node->createNode(tag);
-    }
-    else
-    {
-        p = new XmlNode(tag);
-    }
-    p->AddRef();
-}
-*/
-
-//////////////////////////////////////////////////////////////////////////
-inline XmlNodeRef::XmlNodeRef(IXmlNode* p_)
-    : p(p_)
-{
-    if (p)
-    {
-        p->AddRef();
-    }
-}
-
-inline XmlNodeRef::XmlNodeRef(const XmlNodeRef& p_)
-    : p(p_.p)
-{
-    if (p)
-    {
-        p->AddRef();
-    }
-}
-
-inline XmlNodeRef::~XmlNodeRef()
-{
-    if (p)
-    {
-        p->Release();
-    }
-}
-
-inline XmlNodeRef&  XmlNodeRef::operator=(IXmlNode* newp)
-{
-    if (newp)
-    {
-        newp->AddRef();
-    }
-    if (p)
-    {
-        p->Release();
-    }
-    p = newp;
-    return *this;
-}
-
-inline XmlNodeRef&  XmlNodeRef::operator=(const XmlNodeRef& newp)
-{
-    if (newp.p)
-    {
-        newp.p->AddRef();
-    }
-    if (p)
-    {
-        p->Release();
-    }
-    p = newp.p;
-    return *this;
-}
-
-
-//XmlNodeRef can be treated as a container. Iterating through it, iterates through its children
-class XmlNodeRefIterator
-{
-public:
-    XmlNodeRefIterator()
-        : m_index(0)
-    {
-    }
-    XmlNodeRefIterator(XmlNodeRef& parentNode, std::size_t index)
-        : m_parentNode(parentNode)
-        , m_index(index)
-    {
-        Update();
-    }
-
-    XmlNodeRefIterator& operator=(const XmlNodeRefIterator& other) = default;
-
-    XmlNodeRefIterator& operator++() 
-    {
-        ++m_index;
-        Update();
-        return *this;
-    }
-    XmlNodeRefIterator operator++(int)
-    {
-        XmlNodeRefIterator ret = *this;
-        ++m_index;
-        Update();
-        return ret;
-    }
-
-    IXmlNode* operator*() const 
-    {
-        return m_currentChildNode;
-    }
-
-    XmlNodeRefIterator& operator--()
-    {
-        --m_index;
-        Update();
-        return *this;
-    }
-
-    XmlNodeRefIterator operator--(int)
-    {
-        XmlNodeRefIterator ret = *this;
-        --m_index;
-        Update();
-        return ret;
-    }
-
-    bool operator!=(const XmlNodeRefIterator& rhs) {
-        return m_index != rhs.m_index;
-    }
-
-private:
-    friend void swap(XmlNodeRefIterator& lhs, XmlNodeRefIterator& rhs);
-    friend bool operator==(const XmlNodeRefIterator& lhs, const XmlNodeRefIterator& rhs);
-    friend bool operator!=(const XmlNodeRefIterator& lhs, const XmlNodeRefIterator& rhs);
-
-    void Update()
-    {
-        if (m_index >= 0 && m_index < m_parentNode->getChildCount())
-        {
-            m_currentChildNode = m_parentNode->getChild(static_cast<int>(m_index));
-        }
-    }
-
-    XmlNodeRef m_parentNode;
-    XmlNodeRef m_currentChildNode;
-    std::size_t m_index; //default to first child, if no children then this will equal size which is what we use for the end iterator
-};
-
-inline void swap(XmlNodeRefIterator& lhs, XmlNodeRefIterator& rhs)
-{
-    AZStd::swap(lhs.m_parentNode, rhs.m_parentNode);
-    AZStd::swap(lhs.m_currentChildNode, rhs.m_currentChildNode);
-    AZStd::swap(lhs.m_index, rhs.m_index);
-}
-
-inline bool operator==(const XmlNodeRefIterator& lhs, const XmlNodeRefIterator& rhs)
-{
-    return lhs.m_index == rhs.m_index;
-}
-
-inline bool operator!=(const XmlNodeRefIterator& lhs, const XmlNodeRefIterator& rhs)
-{
-    return lhs.m_index != rhs.m_index;
-}
-
-inline XmlNodeRefIterator XmlNodeRef::begin()
-{
-    return XmlNodeRefIterator(*this, 0);
-}
-
-inline XmlNodeRefIterator XmlNodeRef::end()
-{
-    return XmlNodeRefIterator(*this, (*this)->getChildCount());
-}
-
-//////////////////////////////////////////////////////////////////////////
-struct IXmlSerializer
-{
-    // <interfuscator:shuffle>
-    virtual ~IXmlSerializer(){}
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-
-    virtual ISerialize* GetWriter(XmlNodeRef& node) = 0;
-    virtual ISerialize* GetReader(XmlNodeRef& node) = 0;
-    // </interfuscator:shuffle>
-#if !defined(RESOURCE_COMPILER)
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-#endif
-};
-
-#if !defined(RESOURCE_COMPILER)
-//////////////////////////////////////////////////////////////////////////
-// Summary:
-//   XML Parser interface.
-struct IXmlParser
-{
-    // <interfuscator:shuffle>
-    virtual ~IXmlParser(){}
-    virtual void AddRef() = 0;
-    virtual void Release() = 0;
-
-    // Summary:
-    //   Parses xml file.
-    virtual XmlNodeRef ParseFile(const char* filename, bool bCleanPools) = 0;
-
-    // Summary:
-    //   Parses xml from memory buffer.
-    virtual XmlNodeRef ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings = false) = 0;
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-    // </interfuscator:shuffle>
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Summary:
-//   XML Table Reader interface.
-//
-//   Can be used to read tables exported from Excel in .xml format. Supports
-//   reading CryEngine's version of those Excel .xml tables (produced by RC).
-//
-// Usage:
-//   p->Begin(rootNode);
-//   while (p->ReadRow(...))
-//   {
-//     while (p->ReadCell(...))
-//     {
-//       ...
-//     }
-//   }
-struct IXmlTableReader
-{
-    // <interfuscator:shuffle>
-    virtual ~IXmlTableReader(){}
-
-    virtual void Release() = 0;
-
-    // Returns false if XML tree is not in supported table format.
-    virtual bool Begin(XmlNodeRef rootNode) = 0;
-
-    // Returns estimated number of rows (estimated number of ReadRow() calls returning true).
-    // Returned number is equal *or greater* than real number, because it's impossible to
-    // know real number in advance in case of Excel XML.
-    virtual int GetEstimatedRowCount() = 0;
-
-    // Prepares next row for reading by ReadCell().
-    // Returns true and sets rowIndex if the row was prepared successfully.
-    // Note: empty rows are skipped sometimes, so use returned rowIndex if you need
-    // to know absolute row index.
-    // Returns false if no rows left.
-    virtual bool ReadRow(int& rowIndex) = 0;
-
-    // Reads next cell in the current row.
-    // Returns true and sets columnIndex, pContent, contenSize if the cell was read successfully.
-    // Note: empty cells are skipped sometimes, so use returned cellIndex if you need
-    // to know absolute cell index (i.e. column).
-    // Returns false if no cells left in the row.
-    virtual bool ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize) = 0;
-    virtual float GetCurrentRowHeight() = 0;
-    // </interfuscator:shuffle>
-};
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Summary:
-//   IXmlUtils structure.
-struct IXmlUtils
-{
-    // <interfuscator:shuffle>
-    virtual ~IXmlUtils(){}
-
-    // Summary:
-    //   Loads xml file, returns 0 if load failed.
-    virtual XmlNodeRef LoadXmlFromFile(const char* sFilename, bool bReuseStrings = false, bool bEnablePatching = true) = 0;
-    // Summary:
-    //   Loads xml from memory buffer, returns 0 if load failed.
-    virtual XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings = false, bool bSuppressWarnings = false) = 0;
-
-    // Summary:
-    //   Creates an MD5 hash of an XML file
-    virtual const char* HashXml(XmlNodeRef node) = 0;
-
-    // Summary:
-    //   Gets an object that can read a xml into a IReadXMLSink
-    //   and writes a xml from a IWriteXMLSource
-    virtual IReadWriteXMLSink* GetIReadWriteXMLSink() = 0;
-
-    // Summary:
-    //   Creates XML Writer for ISerialize interface.
-    // See also:
-    //   IXmlSerializer
-    virtual IXmlSerializer* CreateXmlSerializer() = 0;
-    // </interfuscator:shuffle>
-
-#if !defined(RESOURCE_COMPILER)
-    // <interfuscator:shuffle>
-    // Summary:
-    //   Creates XML Parser.
-    // Notes:
-    //   WARNING!!!
-    //   IXmlParser does not normally support recursive XML loading, all nodes loaded by this parser are invalidated on loading new file.
-    //   This is a specialized interface for fast loading of many XMLs,
-    //   After use it must be released with call to Release method.
-    virtual IXmlParser* CreateXmlParser() = 0;
-
-    // Summary:
-    //   Creates XML to file in the binary form.
-    virtual bool SaveBinaryXmlFile(const char* sFilename, XmlNodeRef root) = 0;
-    // Summary:
-    //   Reads XML data from file in the binary form.
-    virtual XmlNodeRef LoadBinaryXmlFile(const char* sFilename, bool bEnablePatching = true) = 0;
-
-    // Summary:
-    //   Enables or disables checking for binary xml files.
-    // Return Value:
-    //   The previous status.
-    virtual bool EnableBinaryXmlLoading(bool bEnable) = 0;
-
-    // Summary:
-    //   Creates XML Table reader.
-    // Notes:
-    //   After use it must be released with call to Release method.
-    virtual IXmlTableReader* CreateXmlTableReader() = 0;
-
-    // Init xml stats nodes pool
-    virtual void InitStatsXmlNodePool(uint32 nPoolSize) = 0;
-
-    // Creates new xml node for statistics.
-    virtual XmlNodeRef CreateStatsXmlNode(const char* sNodeName) = 0;
-    // Set owner thread
-    virtual void SetStatsOwnerThread(threadID threadId) = 0;
-
-    // Free memory held on to by xml pool if empty
-    virtual void FlushStatsXmlNodePool() = 0;
-
-    // Sets the patch which is used to transform loaded XML files. the patch itself is encoded into XML
-    // Set to NULL to clear an existing transform and disable further patching
-    virtual void SetXMLPatcher(XmlNodeRef* pPatcher) = 0;
-    // </interfuscator:shuffle>
-#endif
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_IXML_H
diff --git a/Code/CryEngine/CryCommon/LCGRandom.h b/Code/CryEngine/CryCommon/LCGRandom.h
deleted file mode 100644
index 169f1b1be0..0000000000
--- a/Code/CryEngine/CryCommon/LCGRandom.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_LCGRANDOM_H
-#define CRYINCLUDE_CRYCOMMON_LCGRANDOM_H
-#pragma once
-
-#include "BaseTypes.h"  // uint32, uint64
-#include "CryRandomInternal.h"  // CryRandom_Internal::BoundedRandom
-
-
-// A simple Linear Congruential Generator (LCG) of pseudo-randomized numbers.
-// NOTE: It should *not* be used for any encryption methods.
-//
-// We use Microsoft Visual/Quick C/C++ generator's settings (mul 214013, add 2531011)
-// (see http://en.wikipedia.org/wiki/Linear_congruential_generator), but our generator
-// returns results that are different from Microsoft's:
-// Microsoft's version returns 15-bit values (bits 30..16 of the 32-bit state),
-// our version returns 32-bit values (bits 47..16 of the 64-bit state).
-
-class CRndGen
-{
-public:
-    CRndGen()
-    {
-        Seed(5489UL);
-    }
-
-    CRndGen(uint32 seed)
-    {
-        Seed(seed);
-    }
-
-    // Initializes the generator using an unsigned 32-bit number.
-    void Seed(uint32 seed)
-    {
-        m_state = (uint64)seed;
-    }
-
-    // Generates a random number in the closed interval [0; max uint32].
-    uint32 GenerateUint32()
-    {
-        m_state = ((uint64)214013) * m_state + ((uint64)2531011);
-        return (uint32)(m_state >> 16);
-    }
-
-    // Generates a random number in the closed interval [0; max uint64].
-    uint64 GenerateUint64()
-    {
-        const uint32 a = GenerateUint32();
-        const uint32 b = GenerateUint32();
-        return ((uint64)b << 32) | (uint64)a;
-    }
-
-    // Generates a random number in the closed interval [0.0f; 1.0f].
-    float GenerateFloat()
-    {
-        return (float)GenerateUint32() * (1.0f / 4294967295.0f);
-    }
-
-    // Ranged function returns random value within the *inclusive* range
-    // between minValue and maxValue.
-    // Any orderings work correctly: minValue <= maxValue and
-    // minValue >= minValue.
-    template <class T>
-    T GetRandom(const T minValue, const T maxValue)
-    {
-        return CryRandom_Internal::BoundedRandom<CRndGen, T>::Get(*this, minValue, maxValue);
-    }
-
-    // Vector (Vec2, Vec3, Vec4) ranged function returns vector with
-    // every component within the *inclusive* ranges between minValue.component
-    // and maxValue.component.
-    // All orderings work correctly: minValue.component <= maxValue.component and
-    // minValue.component >= maxValue.component.
-    template <class T>
-    T GetRandomComponentwise(const T& minValue, const T& maxValue)
-    {
-        return CryRandom_Internal::BoundedRandomComponentwise<CRndGen, T>::Get(*this, minValue, maxValue);
-    }
-
-    // The function returns a random unit vector (Vec2, Vec3, Vec4).
-    template <class T>
-    T GetRandomUnitVector()
-    {
-        return CryRandom_Internal::GetRandomUnitVector<CRndGen, T>(*this);
-    }
-
-private:
-    uint64 m_state;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_LCGRANDOM_H
diff --git a/Code/CryEngine/CryCommon/LegacyAllocator.h b/Code/CryEngine/CryCommon/LegacyAllocator.h
deleted file mode 100644
index 0b79e99f7a..0000000000
--- a/Code/CryEngine/CryCommon/LegacyAllocator.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Memory/AllocatorBase.h>
-#include <AzCore/Memory/HphaSchema.h>
-
-#define AZCORE_SYS_ALLOCATOR_HPPA
-//#define AZCORE_SYS_ALLOCATOR_MALLOC
-
-#ifdef AZCORE_SYS_ALLOCATOR_HPPA
-#   include <AzCore/Memory/HphaSchema.h>
-#elif defined(AZCORE_SYS_ALLOCATOR_MALLOC)
-#   include <AzCore/Memory/MallocSchema.h>
-#else
-#   include <AzCore/Memory/HeapSchema.h>
-#endif
-
-namespace AZ
-{
-
-#ifdef AZCORE_SYS_ALLOCATOR_HPPA
-    typedef AZ::HphaSchema LegacyAllocatorSchema;
-#elif defined(AZCORE_SYS_ALLOCATOR_MALLOC)
-    typedef AZ::MallocSchema LegacyAllocatorSchema;
-#else
-    typedef AZ::HeapSchema LegacyAllocatorSchema;
-#endif
-
-    struct LegacyAllocatorDescriptor
-        : public LegacyAllocatorSchema::Descriptor
-    {
-        LegacyAllocatorDescriptor()
-        {
-            // pull 32MB from the OS at a time
-#ifdef AZCORE_SYS_ALLOCATOR_HPPA
-            m_systemChunkSize = 32 * 1024 * 1024;
-#endif
-        }
-    };
-
-    class LegacyAllocator
-        : public SimpleSchemaAllocator<AZ::HphaSchema, LegacyAllocatorDescriptor>
-    {
-    public:
-        AZ_TYPE_INFO(LegacyAllocator, "{17FC25A4-92D9-48C5-BB85-7F860FCA2C6F}");
-
-        using Descriptor = LegacyAllocatorDescriptor;
-        using Base = SimpleSchemaAllocator<AZ::HphaSchema, LegacyAllocatorDescriptor>;
-        
-        LegacyAllocator()
-            : Base("LegacyAllocator", "Allocator for Legacy CryEngine systems")
-        {
-        }
-
-        pointer_type Allocate(size_type byteSize, size_type alignment, int flags = 0, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override
-        {
-            if (alignment == 0)
-            {
-                // Some STL containers, like std::vector, are assuming a specific minimum alignment. seems to have a requirement
-                // Take a look at _Allocate_manually_vector_aligned in xmemory0
-                alignment = sizeof(void*) * 2; 
-            }
-
-            pointer_type ptr = m_schema->Allocate(byteSize, alignment, flags, name, fileName, lineNum, suppressStackRecord);
-            AZ_PROFILE_MEMORY_ALLOC_EX(AZ::Debug::ProfileCategory::MemoryReserved, fileName, lineNum, ptr, byteSize, name ? name : GetName());
-            AZ_MEMORY_PROFILE(ProfileAllocation(ptr, byteSize, alignment, name, fileName, lineNum, suppressStackRecord));
-            AZ_Assert(ptr || byteSize == 0, "OOM - Failed to allocate %zu bytes from LegacyAllocator", byteSize);
-            return ptr;
-        }
-
-        // DeAllocate with file/line, to track when allocs were freed from Cry
-        void DeAllocate(pointer_type ptr, [[maybe_unused]] const char* file, [[maybe_unused]] const int line, size_type byteSize = 0, size_type alignment = 0)
-        {
-            AZ_PROFILE_MEMORY_FREE_EX(AZ::Debug::ProfileCategory::MemoryReserved, file, line, ptr);
-            AZ_MEMORY_PROFILE(ProfileDeallocation(ptr, byteSize, alignment, nullptr));
-            m_schema->DeAllocate(ptr, byteSize, alignment);
-        }
-
-        // Realloc with file/line, because Cry uses realloc(nullptr) and realloc(ptr, 0) to mimic malloc/free
-        pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment, [[maybe_unused]] const char* file, [[maybe_unused]] const int line)
-        {
-            if (newAlignment == 0)
-            {
-                // Some STL containers, like std::vector, are assuming a specific minimum alignment. seems to have a requirement
-                // Take a look at _Allocate_manually_vector_aligned in xmemory0
-                newAlignment = sizeof(void*) * 2;
-            }
-
-            AZ_MEMORY_PROFILE(ProfileReallocationBegin(ptr, newSize));
-            AZ_PROFILE_MEMORY_FREE_EX(AZ::Debug::ProfileCategory::MemoryReserved, file, line, ptr);
-            pointer_type newPtr = m_schema->ReAllocate(ptr, newSize, newAlignment);
-            AZ_PROFILE_MEMORY_ALLOC_EX(AZ::Debug::ProfileCategory::MemoryReserved, file, line, newPtr, newSize, "LegacyAllocator Realloc");
-            AZ_MEMORY_PROFILE(ProfileReallocationEnd(ptr, newPtr, newSize, newAlignment));
-            AZ_Assert(newPtr || newSize == 0, "OOM - Failed to reallocate %zu bytes from LegacyAllocator", newSize);
-            return newPtr;
-        }
-
-        void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0) override
-        {
-            AZ_MEMORY_PROFILE(ProfileDeallocation(ptr, 0, 0, nullptr));
-            Base::DeAllocate(ptr, byteSize, alignment);
-        }
-
-        pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override
-        {
-            if (newAlignment == 0)
-            {
-                // Some STL containers, like std::vector, are assuming a specific minimum alignment. seems to have a requirement
-                // Take a look at _Allocate_manually_vector_aligned in xmemory0
-                newAlignment = sizeof(void*) * 2;
-            }
-
-            AZ_MEMORY_PROFILE(ProfileReallocationBegin(ptr, newSize));
-            pointer_type newPtr = Base::ReAllocate(ptr, newSize, newAlignment);
-            AZ_MEMORY_PROFILE(ProfileReallocationEnd(ptr, newPtr, newSize, newAlignment));
-            AZ_Assert(newPtr || newSize == 0, "OOM - Failed to reallocate %zu bytes from LegacyAllocator", newSize);
-            return newPtr;
-        }
-    };
-
-    using StdLegacyAllocator = AZStdAlloc<LegacyAllocator>;
-
-    // Specialize for the LegacyAllocator to provide one per module that does not use the
-    // environment for its storage
-    template <>
-    class AllocatorInstance<LegacyAllocator> : public Internal::AllocatorInstanceBase<LegacyAllocator>
-    {
-    };
-
-#if defined(AZ_PLATFORM_PROVO) || defined(AZ_PLATFORM_JASPER)
-    struct GlobalAllocatorDescriptor
-        : public AZ::HphaSchema::Descriptor
-    {
-        GlobalAllocatorDescriptor()
-        {
-            // pull 1MB from the OS at a time
-            m_systemChunkSize = 1024 * 1024;
-        }
-    };
-
-    class GlobalAllocator
-        : public SimpleSchemaAllocator<AZ::HphaSchema, GlobalAllocatorDescriptor>
-    {
-    public:
-        AZ_TYPE_INFO(GlobalAllocator, "{BC7861DA-AF7F-4FFD-A2F5-BAD89BDD77FD}");
-
-        using Descriptor = GlobalAllocatorDescriptor;
-        using Base = SimpleSchemaAllocator<AZ::HphaSchema, GlobalAllocatorDescriptor>;
-        
-        GlobalAllocator()
-            : Base("GlobalAllocator", "Allocator for untracked new/delete/malloc/free")
-        {
-        }
-
-        //---------------------------------------------------------------------
-        // IAllocatorAllocate
-        //---------------------------------------------------------------------
-        pointer_type Allocate(size_type byteSize, size_type alignment, int flags = 0, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override
-        {
-            // Note: We cannot put the asserts in the AllocateBase class because various allocators depend on allocations failing from some heap classes.
-            pointer_type ptr = Base::Allocate(byteSize, alignment, flags, name, fileName, lineNum, suppressStackRecord);
-            AZ_Assert(ptr, "OOM - Failed to allocate %zu bytes from GlobalAllocator", byteSize);
-            return ptr;
-        }
-
-        pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override
-        {
-            pointer_type newPtr = Base::ReAllocate(ptr, newSize, newAlignment);
-            AZ_Assert(newPtr, "OOM - Failed to reallocate %zu bytes from GlobalAllocator", newSize);
-            return newPtr;
-        }
-
-    };
-
-    // Specialize for the GlobalAllocator to provide one per module that does not use the
-    // environment for its storage
-    template <>
-    class AllocatorInstance<GlobalAllocator> : public Internal::AllocatorInstanceBase<GlobalAllocator, AllocatorStorage::ModuleStoragePolicy<GlobalAllocator, false>>
-    {
-    };
-#endif
-}
diff --git a/Code/CryEngine/CryCommon/Linux32Specific.h b/Code/CryEngine/CryCommon/Linux32Specific.h
deleted file mode 100644
index 19f7a5bba0..0000000000
--- a/Code/CryEngine/CryCommon/Linux32Specific.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Specific to Linux declarations, inline functions etc.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_LINUX32SPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_LINUX32SPECIFIC_H
-#pragma once
-
-
-#define _CPU_X86
-//#define _CPU_SSE
-
-#define DEBUG_BREAK raise(SIGTRAP)
-#define RC_EXECUTABLE "rc"
-#define USE_CRT 1
-#define SIZEOF_PTR 4
-
-//////////////////////////////////////////////////////////////////////////
-// Standard includes.
-//////////////////////////////////////////////////////////////////////////
-#include <malloc.h>
-//#include <winbase.h>
-#include <stdint.h>
-#include <sys/dir.h>
-#include <sys/io.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <ctype.h>
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Define platform independent types.
-//////////////////////////////////////////////////////////////////////////
-#include "BaseTypes.h"
-
-typedef signed long long  INT64;
-
-typedef double real;
-
-typedef unsigned long       DWORD;
-typedef unsigned long*      LPDWORD;
-typedef DWORD               DWORD_PTR;
-typedef int INT_PTR, * PINT_PTR;
-typedef unsigned int UINT_PTR, * PUINT_PTR;
-typedef char* LPSTR, * PSTR;
-
-typedef long LONG_PTR, * PLONG_PTR, * PLONG;
-typedef unsigned long ULONG_PTR, * PULONG_PTR;
-
-typedef unsigned char       BYTE;
-typedef unsigned short      WORD;
-typedef void*               HWND;
-typedef UINT_PTR            WPARAM;
-typedef LONG_PTR            LPARAM;
-typedef LONG_PTR            LRESULT;
-#define PLARGE_INTEGER LARGE_INTEGER *
-typedef const char* LPCSTR, * PCSTR;
-typedef long long           LONGLONG;
-typedef ULONG_PTR           SIZE_T;
-typedef unsigned char       byte;
-
-#define __int64     long long
-
-#define ILINE __forceinline
-
-#define _A_RDONLY (0x01)
-#define _A_SUBDIR (0x10)
-
-//////////////////////////////////////////////////////////////////////////
-// Win32 FileAttributes.
-//////////////////////////////////////////////////////////////////////////
-#define FILE_ATTRIBUTE_READONLY             0x00000001
-#define FILE_ATTRIBUTE_HIDDEN               0x00000002
-#define FILE_ATTRIBUTE_SYSTEM               0x00000004
-#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
-#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
-#define FILE_ATTRIBUTE_DEVICE               0x00000040
-#define FILE_ATTRIBUTE_NORMAL               0x00000080
-#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
-#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
-#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
-#define FILE_ATTRIBUTE_COMPRESSED           0x00000800
-#define FILE_ATTRIBUTE_OFFLINE              0x00001000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
-#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
-
-#define INVALID_FILE_ATTRIBUTES (-1)
-
-#define DEFINE_ALIGNED_DATA(type, name, alignment) \
-    type __attribute__ ((aligned(alignment))) name;
-#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) \
-    static type __attribute__ ((aligned(alignment))) name;
-#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) \
-    const type __attribute__ ((aligned(alignment))) name;
-
-#include "LinuxSpecific.h"
-
-#define TARGET_DEFAULT_ALIGN (0x4U)
-
-#endif // CRYINCLUDE_CRYCOMMON_LINUX32SPECIFIC_H
diff --git a/Code/CryEngine/CryCommon/Linux64Specific.h b/Code/CryEngine/CryCommon/Linux64Specific.h
deleted file mode 100644
index f1a72ec236..0000000000
--- a/Code/CryEngine/CryCommon/Linux64Specific.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Specific to Linux declarations, inline functions etc.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_LINUX64SPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_LINUX64SPECIFIC_H
-#pragma once
-
-
-
-//#define _CPU_X86
-#define _CPU_AMD64
-#define _CPU_SSE
-
-#define DEBUG_BREAK ::raise(SIGTRAP)
-#define RC_EXECUTABLE "rc"
-#define USE_CRT 1
-#define SIZEOF_PTR 8
-
-//////////////////////////////////////////////////////////////////////////
-// Standard includes.
-//////////////////////////////////////////////////////////////////////////
-#include <malloc.h>
-#include <stdint.h>
-#include <sys/dir.h>
-#include <sys/io.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <ctype.h>
-
-#if defined(_CPU_SSE)
-#include <xmmintrin.h>
-#endif
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Define platform independent types.
-//////////////////////////////////////////////////////////////////////////
-#include "BaseTypes.h"
-
-typedef double real;
-
-typedef uint32      DWORD;
-typedef DWORD*      LPDWORD;
-typedef uint64      DWORD_PTR;
-typedef intptr_t INT_PTR, * PINT_PTR;
-typedef uintptr_t UINT_PTR, * PUINT_PTR;
-typedef char* LPSTR, * PSTR;
-typedef uint64      __uint64;
-#if !defined(__clang__)
-typedef int64       __int64;
-#endif
-typedef int64       INT64;
-typedef uint64      UINT64;
-
-typedef long LONG_PTR, * PLONG_PTR, * PLONG;
-typedef unsigned long ULONG_PTR, * PULONG_PTR;
-
-typedef uint8               BYTE;
-typedef uint16              WORD;
-typedef void*               HWND;
-typedef UINT_PTR            WPARAM;
-typedef LONG_PTR            LPARAM;
-typedef LONG_PTR            LRESULT;
-#define PLARGE_INTEGER LARGE_INTEGER *
-typedef const char* LPCSTR, * PCSTR;
-typedef long long           LONGLONG;
-typedef ULONG_PTR           SIZE_T;
-typedef uint8               byte;
-#define ILINE __forceinline
-#define _A_RDONLY (0x01)
-#define _A_SUBDIR (0x10)
-#define _A_HIDDEN (0x02)
-
-//////////////////////////////////////////////////////////////////////////
-// Win32 FileAttributes.
-//////////////////////////////////////////////////////////////////////////
-#define FILE_ATTRIBUTE_READONLY             0x00000001
-#define FILE_ATTRIBUTE_HIDDEN               0x00000002
-#define FILE_ATTRIBUTE_SYSTEM               0x00000004
-#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
-#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
-#define FILE_ATTRIBUTE_DEVICE               0x00000040
-#define FILE_ATTRIBUTE_NORMAL               0x00000080
-#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
-#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
-#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
-#define FILE_ATTRIBUTE_COMPRESSED           0x00000800
-#define FILE_ATTRIBUTE_OFFLINE              0x00001000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
-#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
-
-#define INVALID_FILE_ATTRIBUTES (-1)
-
-#define DEFINE_ALIGNED_DATA(type, name, alignment) \
-    type __attribute__ ((aligned(alignment))) name;
-#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) \
-    static type __attribute__ ((aligned(alignment))) name;
-#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) \
-    const type __attribute__ ((aligned(alignment))) name;
-
-#include "LinuxSpecific.h"
-
-#define TARGET_DEFAULT_ALIGN (0x8U)
-
-#define PLATFORM_64BIT
-
-#ifdef _RELEASE
-    #define __debugbreak()
-#else
-    #define __debugbreak() "_asm int 3"
-#endif
-
-#define __assume(x)
-
-#define _msize(p) malloc_usable_size(p)
-
-#endif // CRYINCLUDE_CRYCOMMON_LINUX64SPECIFIC_H
diff --git a/Code/CryEngine/CryCommon/LinuxSpecific.h b/Code/CryEngine/CryCommon/LinuxSpecific.h
deleted file mode 100644
index 8ecee9bfff..0000000000
--- a/Code/CryEngine/CryCommon/LinuxSpecific.h
+++ /dev/null
@@ -1,593 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Specific to Linux declarations, inline functions etc.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_LINUXSPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_LINUXSPECIFIC_H
-#pragma once
-
-
-#include <stdlib.h>
-#include <time.h>
-#include <pthread.h>
-#include <math.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <algorithm>
-#include <signal.h>
-#ifndef __COUNTER__
-#define __COUNTER__ __LINE__
-#endif
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#if defined(APPLE)
-#include <dirent.h>
-#endif //defined(APPLE)
-#if !defined(SKIP_INET_INCLUDES)
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif // defined(SKIP_INET_INCLUDES)
-#include <vector>
-#include <string>
-
-#ifdef __FUNC__
-#undef __FUNC__
-#endif
-#if defined(__GNUC__) || defined(__clang__)
-#define __FUNC__ __func__
-#else
-#define __FUNC__                                             \
-    ({                                                       \
-         static char __f[sizeof(__PRETTY_FUNCTION__) + 1];   \
-         strcpy(__f, __PRETTY_FUNCTION__);                   \
-         char* __p = (char*)strchr(__f, '(');                \
-         *__p = 0;                                           \
-         while (*(__p) != ' ' && __p != (__f - 1)) {--__p; } \
-         (__p + 1);                                          \
-     })
-#endif
-
-typedef void*                               LPVOID;
-#define VOID                    void
-#define PVOID                               void*
-
-typedef unsigned int UINT;
-typedef char CHAR;
-typedef float FLOAT;
-
-#define PHYSICS_EXPORTS
-// MSVC compiler-specific keywords
-#define __forceinline inline
-#define _inline inline
-#define __cdecl
-#define _cdecl
-#define __stdcall
-#define _stdcall
-#define __fastcall
-#define _fastcall
-#define IN
-#define OUT
-
-#ifdef AZ_MONOLITHIC_BUILD
-#if !defined(USE_STATIC_NAME_TABLE)
-#define USE_STATIC_NAME_TABLE 1
-#endif
-#endif // AZ_MONOLITHIC_BUILD
-
-#if !defined(_STLP_HASH_MAP) && !defined(USING_STLPORT)
-#define _STLP_HASH_MAP 1
-#endif
-
-// Enable memory address tracing code.
-#if !defined(MM_TRACE_ADDRS) // && !defined(NDEBUG)
-#define MM_TRACE_ADDRS 1
-#endif
-
-#ifndef STDMETHODCALLTYPE_DEFINED
-#define STDMETHODCALLTYPE_DEFINED
-#define STDMETHODCALLTYPE
-#endif
-
-#define _ALIGN(num) \
-    __attribute__ ((aligned(num))) \
-    AZ_POP_DISABLE_WARNING
-
-#define _PACK __attribute__ ((packed))
-
-// Safe memory freeing
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(p)          { if (p) { delete (p);       (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(p)    { if (p) { delete[] (p);     (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
-}
-#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))
-#define HIWORD(l)           ((WORD)((DWORD_PTR)(l) >> 16))
-#define LOBYTE(w)           ((BYTE)((DWORD_PTR)(w) & 0xff))
-#define HIBYTE(w)           ((BYTE)((DWORD_PTR)(w) >> 8))
-
-#define CALLBACK
-#define WINAPI
-
-#ifndef __cplusplus
-#ifndef _WCHAR_T_DEFINED
-typedef unsigned short wchar_t;
-#define TCHAR wchar_t;
-#define _WCHAR_T_DEFINED
-#endif
-#endif
-typedef wchar_t WCHAR;    // wc,   16-bit UNICODE character
-typedef WCHAR* PWCHAR;
-typedef WCHAR* LPWCH, * PWCH;
-typedef const WCHAR* LPCWCH, * PCWCH;
-typedef WCHAR* NWPSTR;
-typedef WCHAR* LPWSTR, * PWSTR;
-typedef WCHAR* LPUWSTR, * PUWSTR;
-
-typedef const WCHAR* LPCWSTR, * PCWSTR;
-typedef const WCHAR* LPCUWSTR, * PCUWSTR;
-
-#ifdef UNICODE
-typedef LPCWSTR LPCTSTR;
-typedef LPWSTR LPTSTR;
-#else
-typedef LPCSTR LPCTSTR;
-typedef LPSTR LPTSTR;
-#endif
-typedef char TCHAR;
-
-typedef DWORD COLORREF;
-#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
-
-#define GetRValue(rgb)  (LOBYTE(rgb))
-#define GetGValue(rgb)  (LOBYTE(((WORD)(rgb)) >> 8))
-#define GetBValue(rgb)  (LOBYTE((rgb)>>16))
-
-#define MAKEFOURCC(ch0, ch1, ch2, ch3)                \
-    ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
-     ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24))
-#define FILE_ATTRIBUTE_NORMAL               0x00000080
-
-typedef int                         BOOL;
-typedef int32_t                 LONG;
-typedef uint32_t            ULONG;
-typedef int                         HRESULT;
-
-#define BST_UNCHECKED   0x0000
-
-#ifndef MAXUINT
-#define MAXUINT ((uint) ~((uint)0))
-#endif
-
-#ifndef MAXINT
-#define MAXINT ((int)(MAXUINT >> 1))
-#endif
-
-#if !defined(__clang__)
-typedef int32 __int32;
-typedef uint32 __uint32;
-typedef int64 __int64;
-typedef uint64 __uint64;
-#endif
-
-#define THREADID_NULL -1
-typedef unsigned long int threadID;
-
-#define TRUE 1
-#define FALSE 0
-
-#ifndef MAX_PATH
-    #define MAX_PATH 256
-#endif
-#ifndef _MAX_PATH
-#define _MAX_PATH MAX_PATH
-#endif
-
-#define _PTRDIFF_T_DEFINED 1
-
-//#define __TIMESTAMP__ __DATE__" "__TIME__
-
-// function renaming
-#define _finite __finite
-#define _snprintf snprintf
-#define _isnan isnan
-#define stricmp strcasecmp
-#define _stricmp strcasecmp
-#define strnicmp strncasecmp
-#define _strnicmp strncasecmp
-#define wcsicmp wcscasecmp
-#define wcsnicmp wcsncasecmp
-
-
-#define _wtof(str) wcstod(str, 0)
-
-/*static unsigned char toupper(unsigned char c)
-{
-  return c & ~0x40;
-}
-*/
-typedef union _LARGE_INTEGER
-{
-    struct
-    {
-        DWORD LowPart;
-        LONG HighPart;
-    };
-    struct
-    {
-        DWORD LowPart;
-        LONG HighPart;
-    } u;
-    long long QuadPart;
-} LARGE_INTEGER;
-
-
-// stdlib.h stuff
-#define _MAX_DRIVE  3   // max. length of drive component
-#define _MAX_DIR    256 // max. length of path component
-#define _MAX_FNAME  256 // max. length of file name component
-#define _MAX_EXT    256 // max. length of extension component
-
-// fcntl.h
-#define _O_RDONLY       0x0000  /* open for reading only */
-#define _O_WRONLY       0x0001  /* open for writing only */
-#define _O_RDWR         0x0002  /* open for reading and writing */
-#define _O_APPEND       0x0008  /* writes done at eof */
-#define _O_CREAT        0x0100  /* create and open file */
-#define _O_TRUNC        0x0200  /* open and truncate */
-#define _O_EXCL         0x0400  /* open only if file doesn't already exist */
-#define _O_TEXT         0x4000  /* file mode is text (translated) */
-#define _O_BINARY       0x8000  /* file mode is binary (untranslated) */
-#define _O_RAW  _O_BINARY
-#define _O_NOINHERIT    0x0080  /* child process doesn't inherit file */
-#define _O_TEMPORARY    0x0040  /* temporary file bit */
-#define _O_SHORT_LIVED  0x1000  /* temporary storage file, try not to flush */
-#define _O_SEQUENTIAL   0x0020  /* file access is primarily sequential */
-#define _O_RANDOM       0x0010  /* file access is primarily random */
-
-// curses.h stubs for PDcurses keys
-#define PADENTER    KEY_MAX + 1
-#define CTL_HOME    KEY_MAX + 2
-#define CTL_END     KEY_MAX + 3
-#define CTL_PGDN    KEY_MAX + 4
-#define CTL_PGUP    KEY_MAX + 5
-
-// stubs for virtual keys, isn't used on Linux
-#define VK_UP               0
-#define VK_DOWN         0
-#define VK_RIGHT        0
-#define VK_LEFT         0
-#define VK_CONTROL  0
-#define VK_SCROLL       0
-
-enum
-{
-    IDOK        = 1,
-    IDCANCEL    = 2,
-    IDABORT     = 3,
-    IDRETRY     = 4,
-    IDIGNORE    = 5,
-    IDYES       = 6,
-    IDNO        = 7,
-    IDTRYAGAIN  = 10,
-    IDCONTINUE  = 11
-};
-
-#define ES_MULTILINE    0x0004L
-#define ES_AUTOVSCROLL  0x0040L
-#define ES_AUTOHSCROLL  0x0080L
-#define ES_WANTRETURN   0x1000L
-
-#define LB_ERR  (-1)
-
-#define LB_ADDSTRING    0x0180
-#define LB_GETCOUNT     0x018B
-#define LB_SETTOPINDEX  0x0197
-
-#define MB_OK                0x00000000L
-#define MB_OKCANCEL          0x00000001L
-#define MB_ABORTRETRYIGNORE  0x00000002L
-#define MB_YESNOCANCEL       0x00000003L
-#define MB_YESNO             0x00000004L
-#define MB_RETRYCANCEL       0x00000005L
-#define MB_CANCELTRYCONTINUE 0x00000006L
-
-#define MB_ICONQUESTION     0x00000020L
-#define MB_ICONEXCLAMATION  0x00000030L
-    
-#define MB_ICONERROR        0x00000010L
-#define MB_ICONWARNING      0x00000030L
-#define MB_ICONINFORMATION  0x00000040L
-
-#define MB_SETFOREGROUND    0x00010000L
-
-#define MB_APPLMODAL    0x00000000L
-
-#define MF_STRING   0x00000000L
-
-#define MK_LBUTTON  0x0001
-#define MK_RBUTTON  0x0002
-#define MK_SHIFT    0x0004
-#define MK_CONTROL  0x0008
-#define MK_MBUTTON  0x0010
-
-#define MK_ALT  ( 0x20 )
-
-#define SM_MOUSEPRESENT 0x00000000L
-
-#define SM_CMOUSEBUTTONS    43
-
-#define USER_TIMER_MINIMUM  0x0000000A
-
-#define VK_TAB      0x09
-#define VK_SHIFT    0x10
-#define VK_MENU     0x12
-#define VK_ESCAPE   0x1B
-#define VK_SPACE    0x20
-#define VK_DELETE   0x2E
-
-#define VK_NUMPAD1  0x61
-#define VK_NUMPAD2  0x62
-#define VK_NUMPAD3  0x63
-#define VK_NUMPAD4  0x64
-
-#define VK_OEM_COMMA    0xBC   // ',' any country
-#define VK_OEM_PERIOD   0xBE   // '.' any country
-#define VK_OEM_3        0xC0   // '`~' for US
-#define VK_OEM_4        0xDB  //  '[{' for US
-#define VK_OEM_6        0xDD  //  ']}' for US
-
-#define WAIT_TIMEOUT 258L    // dderror
-
-#define WM_MOVE 0x0003
-#define WM_USER 0x0400
-
-#define WHEEL_DELTA 120
-
-#define WS_CHILD    0x40000000L
-#define WS_VISIBLE  0x10000000L
-
-#define CB_ERR  (-1)
-
-// io.h stuff
-typedef unsigned int _fsize_t;
-
-#define _flushall()
-
-struct _OVERLAPPED;
-
-typedef void (* LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, struct _OVERLAPPED* lpOverlapped);
-
-typedef struct _OVERLAPPED
-{
-    void* pCaller;//this is orginally reserved for internal purpose, we store the Caller pointer here
-    LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine; ////this is orginally ULONG_PTR InternalHigh and reserved for internal purpose
-    union
-    {
-        struct
-        {
-            DWORD Offset;
-            DWORD OffsetHigh;
-        };
-        PVOID Pointer;
-    };
-    DWORD dwNumberOfBytesTransfered;        //additional member temporary speciying the number of bytes to be read
-    /*HANDLE*/ void*  hEvent;
-} OVERLAPPED, * LPOVERLAPPED;
-
-typedef struct _SECURITY_ATTRIBUTES
-{
-    DWORD nLength;
-    LPVOID lpSecurityDescriptor;
-    BOOL bInheritHandle;
-} SECURITY_ATTRIBUTES, * PSECURITY_ATTRIBUTES, * LPSECURITY_ATTRIBUTES;
-
-#ifdef __cplusplus
-extern bool QueryPerformanceCounter(LARGE_INTEGER*);
-extern bool QueryPerformanceFrequency(LARGE_INTEGER* frequency);
-
-static pthread_mutex_t mutex_t;
-template<typename T>
-const volatile T InterlockedIncrement(volatile T* pT)
-{
-    pthread_mutex_lock(&mutex_t);
-    ++(*pT);
-    pthread_mutex_unlock(&mutex_t);
-    return *pT;
-}
-
-template<typename T>
-const volatile T InterlockedDecrement(volatile T* pT)
-{
-    pthread_mutex_lock(&mutex_t);
-    --(*pT);
-    pthread_mutex_unlock(&mutex_t);
-    return *pT;
-}
-
-#if 0
-template<typename S, typename T>
-inline const S& min(const S& rS, const T& rT)
-{
-    return (rS <= rT) ? rS : rT;
-}
-
-template<typename S, typename T>
-inline const S& max(const S& rS, const T& rT)
-{
-    return (rS >= rT) ? rS : rT;
-}
-#endif
-
-template<typename S, typename T>
-inline S __min(const S& rS, const T& rT)
-{
-    return std::min(rS, rT);
-}
-
-template<typename S, typename T>
-inline S __max(const S& rS, const T& rT)
-{
-    return std::max(rS, rT);
-}
-
-
-typedef enum
-{
-    INVALID_HANDLE_VALUE = -1l
-}INVALID_HANDLE_VALUE_ENUM;
-//for compatibility reason we got to create a class which actually contains an int rather than a void* and make sure it does not get mistreated
-template <class T, T U>
-//U is default type for invalid handle value, T the encapsulated handle type to be used instead of void* (as under windows and never linux)
-class CHandle
-{
-public:
-    typedef T           HandleType;
-    typedef void* PointerType;      //for compatibility reason to encapsulate a void* as an int
-
-    static const HandleType sciInvalidHandleValue = U;
-
-    CHandle(const CHandle<T, U>& cHandle)
-        : m_Value(cHandle.m_Value){}
-    CHandle(const HandleType cHandle = U)
-        : m_Value(cHandle){}
-    CHandle(const PointerType cpHandle)
-        : m_Value(reinterpret_cast<HandleType>(cpHandle)){}
-    CHandle(INVALID_HANDLE_VALUE_ENUM)
-        : m_Value(U){}                                   //to be able to use a common value for all InvalidHandle - types
-#if defined(LINUX64) && !defined(__clang__)
-    //treat __null tyope also as invalid handle type
-    CHandle(__typeof__(__null))
-        : m_Value(U){}                            //to be able to use a common value for all InvalidHandle - types
-#endif
-    operator HandleType(){
-        return m_Value;
-    }
-    bool operator!() const{return m_Value == sciInvalidHandleValue; }
-    const CHandle& operator =(const CHandle& crHandle){m_Value = crHandle.m_Value; return *this; }
-    const CHandle& operator =(const PointerType cpHandle){m_Value = (HandleType) reinterpret_cast<UINT_PTR>(cpHandle); return *this; }
-    const bool operator ==(const CHandle& crHandle)     const{return m_Value == crHandle.m_Value; }
-    const bool operator ==(const HandleType cHandle)    const{return m_Value == cHandle; }
-    const bool operator ==(const PointerType cpHandle) const{return m_Value == (HandleType) reinterpret_cast<UINT_PTR>(cpHandle); }
-    const bool operator !=(const HandleType cHandle)    const{return m_Value != cHandle; }
-    const bool operator !=(const CHandle& crHandle)     const{return m_Value != crHandle.m_Value; }
-    const bool operator !=(const PointerType cpHandle) const{return m_Value != (HandleType) reinterpret_cast<UINT_PTR>(cpHandle); }
-    const bool operator <   (const CHandle& crHandle)       const{return m_Value < crHandle.m_Value; }
-    HandleType Handle() const{return m_Value; }
-
-private:
-    HandleType m_Value;     //the actual value, remember that file descriptors are ints under linux
-
-    typedef void    ReferenceType;    //for compatibility reason to encapsulate a void* as an int
-    //forbid these function which would actually not work on an int
-    PointerType operator->();
-    PointerType operator->() const;
-    ReferenceType operator*();
-    ReferenceType operator*() const;
-    operator PointerType();
-};
-
-typedef CHandle<int, (int) - 1l> HANDLE;
-
-typedef HANDLE EVENT_HANDLE;
-typedef pid_t THREAD_HANDLE;
-
-typedef HANDLE HKEY;
-// typedef HANDLE HDC;
-
-typedef HANDLE HBITMAP;
-
-typedef HANDLE HMENU;
-
-inline int64 CryGetTicks()
-{
-    LARGE_INTEGER counter;
-    QueryPerformanceCounter(&counter);
-    return counter.QuadPart;
-}
-
-inline int64 CryGetTicksPerSec()
-{
-    LARGE_INTEGER li;
-    QueryPerformanceFrequency(&li);
-    return li.QuadPart;
-}
-
-#endif //__cplusplus
-
-inline int _CrtCheckMemory() { return 1; };
-
-inline char* _fullpath(char* absPath, const char* relPath, size_t maxLength)
-{
-    char path[PATH_MAX];
-
-    if (realpath(relPath, path) == NULL)
-    {
-        return NULL;
-    }
-    const size_t len = std::min(strlen(path), maxLength - 1);
-    memcpy(absPath, path, len);
-    absPath[len] = 0;
-    return absPath;
-}
-
-typedef void* HGLRC;
-typedef void* HDC;
-typedef void* PROC;
-typedef void* PIXELFORMATDESCRIPTOR;
-
-#define SCOPED_ENABLE_FLOAT_EXCEPTIONS
-
-// Linux_Win32Wrapper.h now included directly by platform.h
-//#include "Linux_Win32Wrapper.h"
-
-#define closesocket close
-inline int WSAGetLastError()
-{
-    return errno;
-}
-
-template <typename T, size_t N>
-char (*RtlpNumberOf( T (&)[N] ))[N];
-
-#define RTL_NUMBER_OF_V2(A) (sizeof(*RtlpNumberOf(A)))
-
-#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A)
-
-#undef SUCCEEDED
-#define SUCCEEDED(x) ((x) >= 0)
-#undef FAILED
-#define FAILED(x) (!(SUCCEEDED(x)))
-
-#endif // CRYINCLUDE_CRYCOMMON_LINUXSPECIFIC_H
-
-// vim:ts=2:sw=2:tw=78
-
diff --git a/Code/CryEngine/CryCommon/Linux_Win32Wrapper.h b/Code/CryEngine/CryCommon/Linux_Win32Wrapper.h
deleted file mode 100644
index 8b905ff025..0000000000
--- a/Code/CryEngine/CryCommon/Linux_Win32Wrapper.h
+++ /dev/null
@@ -1,716 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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>
-#include <dirent.h>
-#include <vector>
-/* Memory block identification */
-#define _FREE_BLOCK      0
-#define _NORMAL_BLOCK    1
-#define _CRT_BLOCK       2
-#define _IGNORE_BLOCK    3
-#define _CLIENT_BLOCK    4
-#define _MAX_BLOCKS      5
-
-typedef void* HMODULE;
-
-typedef struct _MEMORYSTATUS
-{
-    DWORD dwLength;
-    DWORD dwMemoryLoad;
-    SIZE_T dwTotalPhys;
-    SIZE_T dwAvailPhys;
-    SIZE_T dwTotalPageFile;
-    SIZE_T dwAvailPageFile;
-    SIZE_T dwTotalVirtual;
-    SIZE_T dwAvailVirtual;
-} MEMORYSTATUS, * LPMEMORYSTATUS;
-
-extern void GlobalMemoryStatus(LPMEMORYSTATUS lpmem);
-
-#if defined(PLATFORM_64BIT)
-#   define MEMORY_ALLOCATION_ALIGNMENT 16
-#else
-#   define MEMORY_ALLOCATION_ALIGNMENT 8
-#endif
-
-#define S_OK 0
-#define THREAD_PRIORITY_NORMAL              0
-#define THREAD_PRIORITY_IDLE                    0
-#define THREAD_PRIORITY_LOWEST              0
-#define THREAD_PRIORITY_BELOW_NORMAL    0
-#define THREAD_PRIORITY_ABOVE_NORMAL    0
-#define THREAD_PRIORITY_HIGHEST             0
-#define THREAD_PRIORITY_TIME_CRITICAL   0
-#define MAX_COMPUTERNAME_LENGTH 15 // required by CryOnline module
-
-#if 0
-//for compatibility reason we got to create a class which actually contains an int rather than a void* and make sure it does not get mistreated
-template <class T, T U>
-//U is default type for invalid handle value, T the encapsulated handle type to be used instead of void* (as under windows and never linux)
-class CHandle
-{
-public:
-    typedef T           HandleType;
-    typedef void* PointerType;  //for compatibility reason to encapsulate a void* as an int
-
-    static const HandleType sciInvalidHandleValue = U;
-
-    CHandle(const CHandle<T, U>& cHandle)
-        : m_Value(cHandle.m_Value){}
-    CHandle(const HandleType cHandle = U)
-        : m_Value(cHandle){}
-    //CHandle(const PointerType cpHandle) : m_Value(reinterpret_cast<HandleType>(cpHandle)){}
-    //CHandle(INVALID_HANDLE_VALUE_ENUM) : m_Value(U){}//to be able to use a common value for all InvalidHandle - types
-
-    operator HandleType(){
-        return m_Value;
-    }
-    bool operator!() const{return m_Value == sciInvalidHandleValue; }
-    const CHandle& operator =(const CHandle& crHandle){m_Value = crHandle.m_Value; return *this; }
-    const CHandle& operator =(const PointerType cpHandle){m_Value = reinterpret_cast<HandleType>(cpHandle); return *this; }
-    const bool operator ==(const CHandle& crHandle)     const{return m_Value == crHandle.m_Value; }
-    const bool operator ==(const HandleType cHandle)    const{return m_Value == cHandle; }
-    //const bool operator ==(const PointerType cpHandle)const{return m_Value == reinterpret_cast<HandleType>(cpHandle);}
-    const bool operator !=(const HandleType cHandle)    const{return m_Value != cHandle; }
-    const bool operator !=(const CHandle& crHandle)     const{return m_Value != crHandle.m_Value; }
-    //const bool operator !=(const PointerType cpHandle)const{return m_Value != reinterpret_cast<HandleType>(cpHandle);}
-    const bool operator <   (const CHandle& crHandle)       const{return m_Value < crHandle.m_Value; }
-    HandleType Handle() const{return m_Value; }
-
-private:
-    HandleType m_Value; //the actual value, remember that file descriptors are ints under linux
-
-    typedef void    ReferenceType;//for compatibility reason to encapsulate a void* as an int
-    //forbid these function which would actually not work on an int
-    PointerType operator->();
-    PointerType operator->() const;
-    ReferenceType operator*();
-    ReferenceType operator*() const;
-    operator PointerType();
-};
-
-typedef CHandle<INT_PTR, (INT_PTR) 0> HANDLE;
-
-typedef HANDLE EVENT_HANDLE;
-typedef HANDLE THREAD_HANDLE;
-
-#define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1)
-#endif
-
-//#define __TIMESTAMP__ __DATE__" "__TIME__
-
-// stdlib.h stuff
-#define _MAX_DRIVE  3   // max. length of drive component
-#define _MAX_DIR    256 // max. length of path component
-#define _MAX_FNAME  256 // max. length of file name component
-#define _MAX_EXT    256 // max. length of extension component
-
-// fcntl.h
-#define _O_RDONLY       0x0000  /* open for reading only */
-#define _O_WRONLY       0x0001  /* open for writing only */
-#define _O_RDWR         0x0002  /* open for reading and writing */
-#define _O_APPEND       0x0008  /* writes done at eof */
-#define _O_CREAT        0x0100  /* create and open file */
-#define _O_TRUNC        0x0200  /* open and truncate */
-#define _O_EXCL         0x0400  /* open only if file doesn't already exist */
-#define _O_TEXT         0x4000  /* file mode is text (translated) */
-#define _O_BINARY       0x8000  /* file mode is binary (untranslated) */
-#define _O_RAW  _O_BINARY
-#define _O_NOINHERIT    0x0080  /* child process doesn't inherit file */
-#define _O_TEMPORARY    0x0040  /* temporary file bit */
-#define _O_SHORT_LIVED  0x1000  /* temporary storage file, try not to flush */
-#define _O_SEQUENTIAL   0x0020  /* file access is primarily sequential */
-#define _O_RANDOM       0x0010  /* file access is primarily random */
-
-inline void MemoryBarrier() {
-    __sync_synchronize();
-}
-// Memory barrier implementation taken from https://code.google.com/p/gperftools/
-//inline void MemoryBarrier() {
-//  __asm__ __volatile__("mfence" : : : "memory");
-//}
-
-#if !defined(_CPU_SSE)
-typedef int64 __m128;
-#endif
-
-#if defined(LINUX64) || defined(APPLE)
-unsigned char _InterlockedCompareExchange128(int64 volatile* dst, int64 exchangehigh, int64 exchangelow, int64* comperand);
-#endif
-//////////////////////////////////////////////////////////////////////////
-// io.h stuff
-#if !defined(ANDROID)
-extern int errno;
-#endif
-typedef unsigned int _fsize_t;
-
-struct _OVERLAPPED;
-typedef _OVERLAPPED* LPOVERLAPPED;
-
-typedef void (* LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, struct _OVERLAPPED* lpOverlapped);
-
-typedef struct tagRECT
-{
-    LONG    left;
-    LONG    top;
-    LONG    right;
-    LONG    bottom;
-} RECT, * PRECT;
-
-typedef struct tagPOINT
-{
-    LONG  x;
-    LONG  y;
-} POINT, * PPOINT;
-
-#ifndef _FILETIME_
-#define _FILETIME_
-typedef struct _FILETIME
-{
-    DWORD dwLowDateTime;
-    DWORD dwHighDateTime;
-} FILETIME, * PFILETIME, * LPFILETIME;
-#endif
-
-typedef union _ULARGE_INTEGER
-{
-    struct
-    {
-        DWORD LowPart;
-        DWORD HighPart;
-    };
-    unsigned long long QuadPart;
-} ULARGE_INTEGER;
-
-typedef ULARGE_INTEGER* PULARGE_INTEGER;
-
-#ifdef __cplusplus
-inline LONG CompareFileTime(const FILETIME* lpFileTime1, const FILETIME* lpFileTime2)
-#else
-static LONG CompareFileTime(const FILETIME* lpFileTime1, const FILETIME* lpFileTime2)
-#endif
-{
-    ULARGE_INTEGER u1, u2;
-    memcpy(&u1, lpFileTime1, sizeof u1);
-    memcpy(&u2, lpFileTime2, sizeof u2);
-    if (u1.QuadPart < u2.QuadPart)
-    {
-        return -1;
-    }
-    else
-    if (u1.QuadPart > u2.QuadPart)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-typedef struct _SYSTEMTIME
-{
-    WORD wYear;
-    WORD wMonth;
-    WORD wDayOfWeek;
-    WORD wDay;
-    WORD wHour;
-    WORD wMinute;
-    WORD wSecond;
-    WORD wMilliseconds;
-} SYSTEMTIME, * PSYSTEMTIME, * LPSYSTEMTIME;
-
-typedef struct _TIME_FIELDS
-{
-    short Year;
-    short Month;
-    short Day;
-    short Hour;
-    short Minute;
-    short Second;
-    short Milliseconds;
-    short Weekday;
-} TIME_FIELDS, * PTIME_FIELDS;
-
-#define DAYSPERNORMALYEAR  365
-#define DAYSPERLEAPYEAR    366
-#define MONSPERYEAR        12
-
-inline void ZeroMemory(void* pPtr, int nSize)
-{
-    memset(pPtr, 0, nSize);
-}
-
-inline BOOL InflateRect(RECT* pRect, int dx, int dy)
-{
-    pRect->left -= dx;
-    pRect->right += dx;
-    pRect->top -= dy;
-    pRect->bottom += dy;
-    return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-extern BOOL SystemTimeToFileTime(const SYSTEMTIME* syst, LPFILETIME ft);
-//Win32API function declarations actually used
-extern bool IsBadReadPtr(void* ptr, unsigned int size);
-
-// Defined in the launcher.
-DLL_IMPORT void OutputDebugString(const char*);
-DLL_IMPORT void DebugBreak();
-
-/*
-//critical section stuff
-#define pthread_attr_default NULL
-
-typedef pthread_mutex_t CRITICAL_SECTION;
-#ifdef __cplusplus
-inline void InitializeCriticalSection(CRITICAL_SECTION *lpCriticalSection)
-{
-pthread_mutexattr_t pthread_mutexattr_def;
-pthread_mutexattr_settype(&pthread_mutexattr_def, PTHREAD_MUTEX_RECURSIVE_NP);
-pthread_mutex_init(lpCriticalSection, &pthread_mutexattr_def);
-}
-inline void EnterCriticalSection(CRITICAL_SECTION *lpCriticalSection){pthread_mutex_lock(lpCriticalSection);}
-inline void LeaveCriticalSection(CRITICAL_SECTION *lpCriticalSection){pthread_mutex_unlock(lpCriticalSection);}
-inline void DeleteCriticalSection(CRITICAL_SECTION *lpCriticalSection){}
-#else
-static void InitializeCriticalSection(CRITICAL_SECTION *lpCriticalSection)
-{
-pthread_mutexattr_t pthread_mutexattr_def;
-pthread_mutexattr_settype(&pthread_mutexattr_def, PTHREAD_MUTEX_RECURSIVE_NP);
-pthread_mutex_init(lpCriticalSection, &pthread_mutexattr_def);
-}
-static void EnterCriticalSection(CRITICAL_SECTION *lpCriticalSection){pthread_mutex_lock(lpCriticalSection);}
-static void LeaveCriticalSection(CRITICAL_SECTION *lpCriticalSection){pthread_mutex_unlock(lpCriticalSection);}
-static void DeleteCriticalSection(CRITICAL_SECTION *lpCriticalSection){}
-#endif
-*/
-
-extern bool QueryPerformanceCounter(LARGE_INTEGER* counter);
-extern bool QueryPerformanceFrequency(LARGE_INTEGER* frequency);
-#ifdef __cplusplus
-
-inline uint32 GetTickCount()
-{
-    LARGE_INTEGER count, freq;
-    QueryPerformanceCounter(&count);
-    QueryPerformanceFrequency(&freq);
-    return uint32(count.QuadPart * 1000 / freq.QuadPart);
-}
-
-#define IGNORE              0       // Ignore signal
-#define INFINITE            0xFFFFFFFF  // Infinite timeout
-#endif
-//begin--------------------------------findfirst/-next declaration/implementation----------------------------------------------------
-
-
-//////////////////////////////////////////////////////////////////////////
-// function renaming
-#define _TRUNCATE (size_t(-1))
-#define _chmod chmod
-#define _snprintf snprintf
-#define stricmp strcasecmp
-#define _stricmp strcasecmp
-#define strnicmp strncasecmp
-#define _strnicmp strncasecmp
-
-#define _strlwr strlwr
-#define _strlwr_s(BUF, SIZE) strlwr(BUF)
-#define _strups strupr
-
-#define _wtof(str) wcstod(str, 0)
-
-// Need to include this before using it's used in finddata, but after the strnicmp definition
-#include "CryString.h"
-
-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<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 GetFileAttributes(LPCSTR lpFileName);
-
-extern const bool GetFilenameNoCase(const char* file, char*, const bool cCreateNew = false);
-
-extern BOOL GetUserName(LPSTR lpBuffer, LPDWORD nSize);
-
-//error code stuff
-//not thread specific, just a coarse implementation for the main thread
-inline DWORD GetLastError() { return errno; }
-inline void SetLastError(DWORD dwErrCode) { errno = dwErrCode; }
-
-//////////////////////////////////////////////////////////////////////////
-#define GENERIC_READ                     (0x80000000L)
-#define GENERIC_WRITE                    (0x40000000L)
-#define GENERIC_EXECUTE                  (0x20000000L)
-#define GENERIC_ALL                      (0x10000000L)
-
-#define CREATE_NEW          1
-#define CREATE_ALWAYS       2
-#define OPEN_EXISTING       3
-#define OPEN_ALWAYS         4
-#define TRUNCATE_EXISTING   5
-
-#define FILE_SHARE_READ                     0x00000001
-#define FILE_SHARE_WRITE                    0x00000002
-#define OPEN_EXISTING                           3
-#define FILE_FLAG_OVERLAPPED            0x40000000
-#define INVALID_FILE_SIZE                   ((DWORD)0xFFFFFFFFl)
-#define FILE_BEGIN                              0
-#define FILE_CURRENT                            1
-#define FILE_END                                    2
-#define ERROR_NO_SYSTEM_RESOURCES 1450L
-#define ERROR_INVALID_USER_BUFFER   1784L
-#define ERROR_NOT_ENOUGH_MEMORY   8L
-#define ERROR_PATH_NOT_FOUND      3L
-#define FILE_FLAG_SEQUENTIAL_SCAN 0x08000000
-
-//////////////////////////////////////////////////////////////////////////
-extern threadID GetCurrentThreadId();
-
-//////////////////////////////////////////////////////////////////////////
-extern HANDLE CreateEvent(
-    LPSECURITY_ATTRIBUTES lpEventAttributes,
-    BOOL bManualReset,
-    BOOL bInitialState,
-    LPCSTR lpName
-    );
-
-//////////////////////////////////////////////////////////////////////////
-extern DWORD Sleep(DWORD dwMilliseconds);
-
-//////////////////////////////////////////////////////////////////////////
-extern DWORD SleepEx(DWORD dwMilliseconds, BOOL bAlertable);
-
-//////////////////////////////////////////////////////////////////////////
-extern DWORD WaitForSingleObjectEx(
-    HANDLE hHandle,
-    DWORD dwMilliseconds,
-    BOOL bAlertable);
-
-//////////////////////////////////////////////////////////////////////////
-extern DWORD WaitForMultipleObjectsEx(
-    DWORD nCount,
-    const HANDLE* lpHandles,
-    BOOL bWaitAll,
-    DWORD dwMilliseconds,
-    BOOL bAlertable);
-
-//////////////////////////////////////////////////////////////////////////
-extern DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds);
-
-//////////////////////////////////////////////////////////////////////////
-extern BOOL SetEvent(HANDLE hEvent);
-
-//////////////////////////////////////////////////////////////////////////
-extern BOOL ResetEvent(HANDLE hEvent);
-
-//////////////////////////////////////////////////////////////////////////
-extern HANDLE CreateMutex(
-    LPSECURITY_ATTRIBUTES lpMutexAttributes,
-    BOOL bInitialOwner,
-    LPCSTR lpName
-    );
-
-//////////////////////////////////////////////////////////////////////////
-extern BOOL ReleaseMutex(HANDLE hMutex);
-
-//////////////////////////////////////////////////////////////////////////
-typedef DWORD (* PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
-typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
-
-//////////////////////////////////////////////////////////////////////////
-extern HANDLE CreateThread(
-    LPSECURITY_ATTRIBUTES lpThreadAttributes,
-    SIZE_T dwStackSize,
-    LPTHREAD_START_ROUTINE lpStartAddress,
-    LPVOID lpParameter,
-    DWORD dwCreationFlags,
-    LPDWORD lpThreadId
-    );
-
-extern BOOL GetComputerName(LPSTR lpBuffer, LPDWORD lpnSize); //required for CryOnline
-extern DWORD GetCurrentProcessId(void);
-
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-#ifdef __cplusplus
-
-//helper function
-extern void adaptFilenameToLinux(char* rAdjustedFilename);
-extern const int comparePathNames(const char* cpFirst, const char* cpSecond, unsigned int len);//returns 0 if identical
-extern void replaceDoublePathFilename(char* szFileName);//removes "\.\" to "\" and "/./" to "/"
-
-//////////////////////////////////////////////////////////////////////////
-extern char* _fullpath(char* absPath, const char* relPath, size_t maxLength);
-//////////////////////////////////////////////////////////////////////////
-extern void _makepath(char* path, const char* drive, const char* dir, const char* filename, const char* ext);
-
-template <size_t size>
-void _makepath_s(char(&path)[size], const char *drive, const char *dir, const char *fname, const char *ext)
-{
-    _makepath(path, drive, dir, fname, ext);
-}
-
-extern void _splitpath(const char* inpath, char* drv, char* dir, char* fname, char* ext);
-
-template <size_t drivesize, size_t dirsize, size_t fnamesize, size_t extsize>
-void _splitpath_s(const char *path, char(&drive)[drivesize], char(&dir)[dirsize], char(&fname)[fnamesize], char(&ext)[extsize])
-{
-    _splitpath(path, drive, dir, fname, ext);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-extern int memicmp(LPCSTR s1, LPCSTR s2, DWORD len);
-
-extern "C" char* strlwr (char* str);
-extern "C" char* strupr(char* str);
-
-extern char* _ui64toa(unsigned long long value,    char* str, int radix);
-extern long long _atoi64(const char* str);
-
-extern int* _errno();
-
-template <size_t SIZE>
-int vsprintf_s(char (&dst)[SIZE], const char* format, va_list argptr)
-{
-    vsnprintf(dst, SIZE, format, argptr);
-    dst[SIZE - 1] = 0;
-    return 0;
-}
-
-inline int vsprintf_s(char* dst, size_t size, const char* format, va_list argptr)
-{
-    vsnprintf(dst, size, format, argptr);
-    dst[size - 1] = 0;
-    return 0;
-}
-
-//note that behaviour is different from strncpy.
-//this will not pad string with zeroes if length of src is less than 'size'
-
-inline int strncpy_s(char* dst, size_t buf_size, const char* src, size_t size)
-{
-    size_t to_copy = std::min(size, strlen(src));
-    size_t term = std::min(buf_size - 1, to_copy);//length of result
-    strncpy(dst, src, term);
-    dst[term] = 0;
-    return 0;
-}
-
-template <size_t SIZE>
-inline int strncpy_s(char(&dst)[SIZE], const char* src, size_t size)
-{
-    size_t to_copy = std::min(size, strlen(src));
-    size_t term = std::min(SIZE - 1, to_copy);//length of result
-    strncpy(dst, src, term);
-    dst[term] = 0;
-    return 0;
-}
-
-inline int strcat_s(char* dst, size_t size, const char* src)
-{
-    if (!dst || !src)
-    {
-        return EINVAL;
-    }
-    size_t len_dst = strlen(dst);
-    size_t len_src = strlen(src);
-    if (size == 0 || len_dst + len_src + 1 >= size)
-    {
-        return ERANGE;
-    }
-    memcpy(dst + len_dst, src, len_src);
-    dst[len_dst + len_src] = 0;
-    return 0;
-}
-
-template <size_t SIZE>
-int strcat_s(char(&dst)[SIZE], const char* src)
-{
-    return strcat_s(dst, SIZE, src);
-}
-
-
-template <size_t SIZE>
-int strcpy_s(char(&dst)[SIZE], const char* src)
-{
-    strncpy(dst, src, SIZE);
-    dst[SIZE - 1] = 0;
-    return 0;
-}
-
-inline int strcpy_s(char* dst, size_t size, const char* src)
-{
-    strncpy(dst, src, size);
-    dst[size - 1] = 0;
-    return 0;
-}
-
-inline int sprintf_s(char* buffer, size_t sizeOfBuffer, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    int err = vsnprintf(buffer, sizeOfBuffer, format, args);
-    va_end(args);
-    return err;
-}
-
-template <size_t size>
-int sprintf_s(char (&buffer)[size], const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    int err = vsnprintf(buffer, size, format, args);
-    va_end(args);
-    return err;
-}
-
-#ifdef _isnan
-#undef _isnan
-template <typename T>
-bool _isnan(T value)
-{
-    return value != value;
-}
-#endif
-
-
-#define vsnprintf_s(BUF, SIZE, COUNT, FORMAT, ARGVLIST) vsnprintf(BUF, SIZE, FORMAT, ARGVLIST)
-#define _vsnwprintf_s(BUF, SIZE, COUNT, FORMAT, ARGVLIST) vswprintf(BUF, SIZE, FORMAT, ARGVLIST)
-#define fprintf_s fprintf
-#define sscanf_s sscanf
-#define fread_s(BUF, SIZE, NMEMB, MAX, HANDLE) fread(BUF, SIZE, NMEMB, HANDLE)
-
-//////////////////////////////////////////////////////////////////////////
-
-#ifndef __TRLTOA__
-#define __TRLTOA__
-extern char* ltoa (long i, char* a, int radix);
-#endif
-#define itoa ltoa
-
-//////////////////////////////////////////////////////////////////////////
-#if 0
-inline long int abs(long int x)
-{
-    return labs(x);
-}
-
-inline float abs(float x)
-{
-    return fabsf(x);
-}
-
-inline double abs(double x)
-{
-    return fabs(x);
-}
-
-inline float sqrt(float x)
-{
-    return sqrtf(x);
-}
-#else
-#include <cmath>
-using std::abs;
-using std::sqrt;
-using std::fabs;
-#endif
-
-extern char* _strtime(char* date);
-extern char* _strdate(char* date);
-
-#if !defined(_CPU_SSE)
-#define _MM_HINT_T0     (1)
-#define _MM_HINT_T1     (2)
-#define _MM_HINT_T2     (3)
-#define _MM_HINT_NTA    (0)
-inline void _mm_prefetch(const char*, int) { }
-#endif // !_CPU_SSE
-
-#endif //__cplusplus
-//////////////////////////////////////////////////////////////////////////
-// Byte Swapping functions
-
-inline unsigned short _byteswap_ushort(unsigned short input)
-{
-    return ((input & 0xff) << 8) | ((input & 0xff00) >> 8);
-}
-
-inline LONG _byteswap_ulong(LONG input)
-{
-    return (input & 0x000000ff) << 24 |
-           (input & 0x0000ff00) << 8 |
-           (input & 0x00ff0000) >> 8 |
-           (input & 0xff000000) >> 24;
-}
-
-inline unsigned long long   _byteswap_uint64(unsigned long long input)
-{
-    return (((input & 0xff00000000000000ull) >> 56) |
-            ((input & 0x00ff000000000000ull) >> 40) |
-            ((input & 0x0000ff0000000000ull) >> 24) |
-            ((input & 0x000000ff00000000ull) >> 8) |
-            ((input & 0x00000000ff000000ull) << 8) |
-            ((input & 0x0000000000ff0000ull) << 24) |
-            ((input & 0x000000000000ff00ull) << 40) |
-            ((input & 0x00000000000000ffull) << 56));
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H
-
-// vim:ts=2
-
diff --git a/Code/CryEngine/CryCommon/LoadScreenBus.h b/Code/CryEngine/CryCommon/LoadScreenBus.h
deleted file mode 100644
index 65c87ade88..0000000000
--- a/Code/CryEngine/CryCommon/LoadScreenBus.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#define AZ_LOADSCREENCOMPONENT_ENABLED      (1)
-
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-
-#include <AzCore/Component/ComponentBus.h>
-
-class LoadScreenInterface
-    : public AZ::ComponentBus
-{
-public:
-    using MutexType = AZStd::recursive_mutex;
-
-    //! Invoked when the load screen should be updated and rendered. Single threaded loading only.
-    virtual void UpdateAndRender() = 0;
-
-    //! Invoked when the game load screen should become visible.
-    virtual void GameStart() = 0;
-
-    //! Invoked when the level load screen should become visible.
-    virtual void LevelStart() = 0;
-
-    //! Invoked when the load screen should be paused.
-    virtual void Pause() = 0;
-
-    //! Invoked when the load screen should be resumed.
-    virtual void Resume() = 0;
-
-    //! Invoked when the load screen should be stopped.
-    virtual void Stop() = 0;
-
-    //! Invoked to find out if loading screen is playing.
-    virtual bool IsPlaying() = 0;
-};
-using LoadScreenBus = AZ::EBus<LoadScreenInterface>;
-
-//! Interface for notifying load screen providers that specific load events are happening.
-//! This is meant to notify systems to connect/disconnect to the LoadScreenUpdateNotificationBus if necessary.
-struct LoadScreenNotifications
-    : public AZ::EBusTraits
-{
-    //! Invoked when the game/engine loading starts. Returns true if any provider handles this.
-    virtual bool NotifyGameLoadStart(bool usingLoadingThread) = 0;
-
-    //! Invoked when level loading starts. Returns true if any provider handles this.
-    virtual bool NotifyLevelLoadStart(bool usingLoadingThread) = 0;
-
-    //! Invoked when loading finishes.
-    virtual void NotifyLoadEnd() = 0;
-};
-using LoadScreenNotificationBus = AZ::EBus<LoadScreenNotifications>;
-
-//! Interface for triggering load screen updates and renders. Has different methods for single threaded vs multi threaded.
-//! This is a separate bus from the LoadScreenNotificationBus to avoid threading issues and to allow implementers to conditionally attach
-//! from inside LoadScreenNotificationBus::NotifyGameLoadStart/NotifyLevelLoadStart
-struct LoadScreenUpdateNotifications
-    : public AZ::EBusTraits
-{
-    //! Invoked when the load screen should be updated and rendered. Single threaded loading only.
-    virtual void UpdateAndRender(float deltaTimeInSeconds) = 0;
-
-    //! Invoked when the load screen should be updated. Multi-threaded loading only.
-    virtual void LoadThreadUpdate(float deltaTimeInSeconds) = 0;
-
-    //! Invoked when the load screen should be updated. Multi-threaded loading only.
-    virtual void LoadThreadRender() = 0;
-};
-using LoadScreenUpdateNotificationBus = AZ::EBus<LoadScreenUpdateNotifications>;
-
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
diff --git a/Code/CryEngine/CryCommon/LocalizationManagerBus.h b/Code/CryEngine/CryCommon/LocalizationManagerBus.h
deleted file mode 100644
index e21c19dc5a..0000000000
--- a/Code/CryEngine/CryCommon/LocalizationManagerBus.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <CrySizer.h>
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/string/conversions.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-// Forward declarations
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Localization Utility classes/functions.
-//////////////////////////////////////////////////////////////////////////
-
-template<typename... Args>
-AZStd::vector<AZStd::string> MakeLocKeyList(Args... args)
-{
-    return {args...};
-}
-
-// Helper functions for Localization and data-string substitution
-struct LocalizationHelpers
-{
-    // Returns the string version of any type convertible by std::to_string()
-    // otherwise throws a compile error.
-    template <typename T>
-    static AZStd::string DataToString(T t);
-
-    // Need a function to specifically handle std::string, since std::to_string() doesn't handle it.
-    static inline AZStd::string DataToString(AZStd::string str);
-
-    // Need a function to specifically handle const char*, since std::to_string() doesn't handle it.
-    static inline AZStd::string DataToString(const char* str);
-
-    // Base case of the recursive function to convert a data list to strings
-    template<typename T>
-    static void ConvertValuesToStrings(AZStd::vector<AZStd::string>& values, T t);
-
-    // Recursive function to convert a data list to strings
-    template<typename T, typename... Args>
-    static void ConvertValuesToStrings(AZStd::vector<AZStd::string>& values, T t, Args... args);
-
-    // Check if a key string is in a list of substitution strings
-    static inline bool IsKeyInList(const AZStd::vector<AZStd::string>& keys, const AZStd::string& target, int& index);
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Localization manager bus interface.
-//////////////////////////////////////////////////////////////////////////
-
-// Summary:
-//      Interface to the Localization Manager.
-class LocalizationManagerRequests
-    : public AZ::EBusTraits
-{
-public:
-    virtual bool SetLanguage(const char* sLanguage) = 0;
-    virtual const char* GetLanguage() = 0;
-
-    virtual int GetLocalizationFormat() const = 0;
-
-    // Get Localized subtitle file for current language
-    // Summary:
-    //  Provides the asset path of a video subtitle file based on the input video path name. Input localVideoPath
-    //  should contain the game-specific path after the current language folder. 
-    //  ex:
-    //      input: localVideoPath = "/VideoSubtitleSrt/100/101/101VT_01.bnk"
-    //      output: return "Localization/en-US/VideoSubtitleSrt/100/101/101VT_01.srt"
-    //
-    //  NOTE: System expects that video file has the same name as the subtitle file (other than the file extension).
-    virtual AZStd::string GetLocalizedSubtitleFilePath(const AZStd::string& localVideoPath, const AZStd::string& subtitleFileExtension) const = 0;
-
-    // Get the given xml for the current language
-    // Summary:
-    //  Provides the asset path of a localization xml file given the local path (e.g. the path starting from
-    //  your language folder).
-    virtual AZStd::string GetLocalizedLocXMLFilePath(const AZStd::string& localXmlPath) const = 0;
-
-    virtual bool LoadExcelXmlSpreadsheet(const char* sFileName, bool bReload = false) = 0;
-    virtual void ReloadData() = 0;
-
-    // Summary:
-    //   Translate a string into the currently selected language.
-    // Description:
-    //   Processes the input string and translates all labels contained into the currently selected language.
-    // Parameters:
-    //   sString             - String to be translated.
-    //   outLocalizedString  - Translated version of the string.
-    //   bEnglish            - if true, translates the string into the always present English language.
-    // Returns:
-    //   true if localization was successful, false otherwise
-    virtual bool LocalizeString_ch(const char* sString, string& outLocalizedString, bool bEnglish = false) = 0;
-
-    // Summary:
-    //   Same as LocalizeString( const char* sString, string& outLocalizedString, bool bEnglish=false )
-    //   but at the moment this is faster.
-    virtual bool LocalizeString_s(const string& sString, string& outLocalizedString, bool bEnglish = false) = 0;
-
-    // Set up system for passing in placeholder data for localized strings
-    // Summary:
-    //   Parse localized string and substitute data in for each key that is surrounded by curly braces
-    //   ie. {player_name}
-    virtual void LocalizeAndSubstituteInternal(AZStd::string& locString, const AZStd::vector<AZStd::string>& keys, const AZStd::vector<AZStd::string>& values) = 0;
-
-    // Summary:
-    //   Parse localized string and substitute data in for each key that is surrounded by curly braces. Number of arguments 
-    //   after 'const AZStd::vector<AZStd::string>& keys' should be equal to the number of strings in 'keys'.
-    //   ex:
-    //        float distance = GetWinDistance();
-    //        AZStd::string winState = IsPlayerFirstPlace() ? "won" : "lost";
-    //        LocalizationManagerRequests::Broadcast(&LocalizationManagerRequests::Events::LocalizeAndSubstitute<float, AZStd::string>
-    //                                          , "@QUICKRESULTS_DISTANCEDIFFERENCE, outLocalizedString
-    //                                          , MakeLocKeyString("race_result", "distance_ahead")
-    //                                          , winState, distance);
-    //
-    //  where "@QUICKRESULTS_DISTANCEDIFFERENCE" would be localized to "You {race_result} by {distance_ahead} meters!" and then 
-    //  "{race_result}" would be replaced by 'winState" and "{distance_ahead}" would be replaced by the 'distance' argument as a string.
-    template<typename T, typename... Args>
-    void LocalizeAndSubstitute(const AZStd::string& locString, AZStd::string& outLocalizedString, const AZStd::vector<AZStd::string>& keys, T t, Args... args);
-
-    // Summary:
-    //   Return the localized version corresponding to a label.
-    // Description:
-    //   A label has to start with '@' sign.
-    // Parameters:
-    //   sLabel              - Label to be translated, must start with '@' sign.
-    //   outLocalizedString  - Localized version of the label.
-    //   bEnglish            - if true, returns the always present English version of the label.
-    // Returns:
-    //   True if localization was successful, false otherwise.
-    virtual bool LocalizeLabel(const char* sLabel, string& outLocalizedString, bool bEnglish = false) = 0;
-
-    // Summary:
-    //   Return number of localization entries.
-    virtual int  GetLocalizedStringCount() = 0;
-
-    // Summary:
-    //   Get the english localization info structure corresponding to a key.
-    // Parameters:
-    //   sKey         - Key to be looked up. Key = Label without '@' sign.
-    //   sLocalizedString - Corresponding english language string.
-    // Returns:
-    //   True if successful, false otherwise (key not found).
-    virtual bool GetEnglishString(const char* sKey, string& sLocalizedString) = 0;
-
-    // Summary:
-    //   Get Subtitle for Key or Label .
-    // Parameters:
-    //   sKeyOrLabel    - Key or Label to be used for subtitle lookup. Key = Label without '@' sign.
-    //   outSubtitle    - Subtitle (untouched if Key/Label not found).
-    //   bForceSubtitle - If true, get subtitle (sLocalized or sEnglish) even if not specified in Data file.
-    // Returns:
-    //   True if subtitle found (and outSubtitle filled in), false otherwise.
-    virtual bool GetSubtitle(const char* sKeyOrLabel, string& outSubtitle, bool bForceSubtitle = false) = 0;
-
-    // Description:
-    //      These methods format outString depending on sString with ordered arguments
-    //      FormatStringMessage(outString, "This is %2 and this is %1", "second", "first");
-    // Arguments:
-    //      outString - This is first and this is second.
-    virtual void FormatStringMessage_List(string& outString, const string& sString, const char** sParams, int nParams) = 0;
-    virtual void FormatStringMessage(string& outString, const string& sString, const char* param1, const char* param2 = 0, const char* param3 = 0, const char* param4 = 0) = 0;
-
-    virtual void LocalizeTime(time_t t, bool bMakeLocalTime, bool bShowSeconds, string& outTimeString) = 0;
-    virtual void LocalizeDate(time_t t, bool bMakeLocalTime, bool bShort, bool bIncludeWeekday, string& outDateString) = 0;
-    virtual void LocalizeDuration(int seconds, string& outDurationString) = 0;
-    virtual void LocalizeNumber(int number, string& outNumberString) = 0;
-    virtual void LocalizeNumber_Decimal(float number, int decimals, string& outNumberString) = 0;
-
-    // Summary:
-    //   Returns true if the project has localization configured for use, false otherwise.
-    virtual bool ProjectUsesLocalization() const = 0;
-    // </interfuscator:shuffle>
-
-};
-using LocalizationManagerRequestBus = AZ::EBus<LocalizationManagerRequests>;
-
-// Summary:
-//      Simple bus that notifies listeners that the language (g_language) has changed.
-class LanguageChangeNotification
-    : public AZ::EBusTraits
-{
-public:
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-
-    virtual ~LanguageChangeNotification() = default;
-
-    virtual void LanguageChanged() = 0;
-};
-
-using LanguageChangeNotificationBus = AZ::EBus<LanguageChangeNotification>;
-
-// Set up system for passing in placeholder data for localized strings
-#include "LocalizationManagerBus.inl"
-
diff --git a/Code/CryEngine/CryCommon/LocalizationManagerBus.inl b/Code/CryEngine/CryCommon/LocalizationManagerBus.inl
deleted file mode 100644
index 617219a74c..0000000000
--- a/Code/CryEngine/CryCommon/LocalizationManagerBus.inl
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-// Returns the string version of any type convertible by AZStd::to_string()
-// otherwise throws a compile error.
-template <typename T>
-AZStd::string LocalizationHelpers::DataToString(T t)
-{
-    return AZStd::to_string(t);
-}
-
-// Need a function to specifically handle AZStd::string, since AZStd::to_string() doesn't handle it.
-AZStd::string LocalizationHelpers::DataToString(AZStd::string str)
-{
-    return str;
-}
-
-// Need a function to specifically handle const char*, since AZStd::to_string() doesn't handle it.
-AZStd::string LocalizationHelpers::DataToString(const char* str)
-{
-    return str;
-}
-
-// Base case of the recursive function to convert a data list to strings
-template<typename T>
-void LocalizationHelpers::ConvertValuesToStrings(AZStd::vector<AZStd::string>& values, T t)
-{
-    values.push_back(DataToString(t));
-}
-
-// Recursive function to convert a data list to strings
-template<typename T, typename... Args>
-void LocalizationHelpers::ConvertValuesToStrings(AZStd::vector<AZStd::string>& values, T t, Args... args)
-{
-    values.push_back(DataToString(t));
-    ConvertValuesToStrings(values, args...);
-}
-
-// Check if a key string is in a list of substitution strings
-bool LocalizationHelpers::IsKeyInList(const AZStd::vector<AZStd::string>& keys, const AZStd::string& target, int& index)
-{
-    for (index = 0; index < keys.size(); ++index)
-    {
-        if (keys[index] == target)
-        {
-            return true;
-        }
-    }
-
-    index = -1;
-    return false;
-}
-
-// Summary:
-//   Parse localized string and substitute data in for each key that is surrounded by curly braces. Number of arguments 
-//   after 'const AZStd::vector<AZStd::string>& keys' should be equal to the number of strings in 'keys'.
-//   ex:
-//        float distance = GetWinDistance();
-//        AZStd::string winState = IsPlayerFirstPlace() ? "won" : "lost";
-//        LocalizationManagerRequests::Broadcast(&LocalizationManagerRequests::Events::LocalizeAndSubstitute<float, AZStd::string>
-//                                          , "@QUICKRESULTS_DISTANCEDIFFERENCE, outLocalizedString
-//                                          , MakeLocKeyString("race_result", "distance_ahead")
-//                                          , winState, distance);
-//
-//  where "@QUICKRESULTS_DISTANCEDIFFERENCE" would be localized to "You {race_result} by {distance_ahead} meters!" and then 
-//  "{race_result}" would be replaced by 'winState" and "{distance_ahead}" would be replaced by the 'distance' argument as a string.
-template<typename T, typename... Args>
-void LocalizationManagerRequests::LocalizeAndSubstitute(const AZStd::string& locString, AZStd::string& outLocalizedString, const AZStd::vector<AZStd::string>& keys, T t, Args... args)
-{    
-    AZStd::vector<AZStd::string> values;
-    LocalizationHelpers::ConvertValuesToStrings(values, t, args...);
-
-    outLocalizedString = locString;
-    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::LocalizeAndSubstituteInternal, outLocalizedString, keys, values);
-}
diff --git a/Code/CryEngine/CryCommon/LyShine/Animation/IUiAnimation.h b/Code/CryEngine/CryCommon/LyShine/Animation/IUiAnimation.h
deleted file mode 100644
index 893147d7e6..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Animation/IUiAnimation.h
+++ /dev/null
@@ -1,1324 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <Range.h>
-#include <AnimKey.h>
-#include <ITimer.h>
-#include <IPhysics.h>
-#include <VectorSet.h>
-#include <CryName.h>
-#include <LyShine/ILyShine.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Vector4.h>
-#include <AzCore/Math/Color.h>
-
-// forward declaration.
-struct IUiAnimTrack;
-struct IUiAnimNode;
-struct IUiAnimSequence;
-struct IUiAnimationSystem;
-struct IKey;
-class XmlNodeRef;
-struct ISplineInterpolator;
-
-namespace AZ
-{
-    class Component;
-    class Entity;
-    class SerializeContext;
-}
-
-#define MAX_ANIM_NAME_LENGTH 64
-
-#if !defined(CONSOLE)
-#define UI_ANIMATION_SYSTEM_SUPPORT_EDITING
-#endif
-
-typedef AZStd::vector<IUiAnimSequence*> UiAnimSequences;
-typedef AZStd::vector<AZStd::string> UiTrackEvents;
-
-//////////////////////////////////////////////////////////////////////////
-//! Node-Types
-//
-// You need to register new types in UiAnimationSystem.cpp/RegisterNodeTypes for serialization.
-// Note: Enums are serialized by string now, there is no need for specific IDs
-// anymore for new parameters. Values are for backward compatibility.
-enum EUiAnimNodeType
-{
-    eUiAnimNodeType_Invalid                 = 0x00,
-    eUiAnimNodeType_Entity                  = 0x01,
-    eUiAnimNodeType_Director                = 0x02,
-    eUiAnimNodeType_Camera                  = 0x03,
-    eUiAnimNodeType_CVar                    = 0x04,
-    eUiAnimNodeType_ScriptVar               = 0x05,
-    eUiAnimNodeType_Material                = 0x06,
-    eUiAnimNodeType_Event                   = 0x07,
-    eUiAnimNodeType_Group                   = 0x08,
-    eUiAnimNodeType_Layer                   = 0x09,
-    eUiAnimNodeType_Comment                 = 0x10,
-    eUiAnimNodeType_RadialBlur              = 0x11,
-    eUiAnimNodeType_ColorCorrection         = 0x12,
-    eUiAnimNodeType_DepthOfField            = 0x13,
-    eUiAnimNodeType_ScreenFader             = 0x14,
-    eUiAnimNodeType_Light                   = 0x15,
-    eUiAnimNodeType_HDRSetup                = 0x16,
-    eUiAnimNodeType_ShadowSetup             = 0x17,
-    eUiAnimNodeType_Alembic                 = 0x18, // Used in cinebox, added so nobody uses that number
-    eUiAnimNodeType_GeomCache               = 0x19,
-    eUiAnimNodeType_Environment,
-    eUiAnimNodeType_ScreenDropsSetup,
-    eUiAnimNodeType_AzEntity,
-    eUiAnimNodeType_Num
-};
-
-//! Flags that can be set on animation node.
-enum EUiAnimNodeFlags
-{
-    eUiAnimNodeFlags_Expanded               = BIT(0), //!< Deprecated, handled by sandbox now
-    eUiAnimNodeFlags_EntitySelected         = BIT(1), //!< Set if the referenced entity is selected in the editor
-    eUiAnimNodeFlags_CanChangeName          = BIT(2), //!< Set if this node allow changing of its name.
-    eUiAnimNodeFlags_Disabled               = BIT(3), //!< Disable this node.
-};
-
-// Static common parameters IDs of animation node.
-//
-// You need to register new params in UiAnimationSystem.cpp/RegisterParamTypes for serialization.
-// Note: Enums are serialized by string now, there is no need for specific IDs
-// anymore for new parameters. Values are for backward compatibility.
-//
-// If you want to expand UI Animation system to control new stuff this is probably  the enum you want to change.
-// For named params see eUiAnimParamType_ByString & CUiAnimParamType
-enum EUiAnimParamType : int
-{
-    eUiAnimParamType_AzComponentField,
-    eUiAnimParamType_Event,
-    eUiAnimParamType_TrackEvent,
-    eUiAnimParamType_Float,
-    eUiAnimParamType_ByString,
-    eUiAnimParamType_User                               = 100000, //!< User node params.
-
-    eUiAnimParamType_Invalid                            = -1
-};
-
-// Common parameters of animation node.
-class CUiAnimParamType
-{
-    friend class UiAnimationSystem;
-
-public:
-    AZ_TYPE_INFO(CUiAnimParamType, "{3D4ADD98-DFDD-4984-AC59-E59C5D718CFC}")
-
-    static const uint kParamTypeVersion = 8;
-
-    CUiAnimParamType()
-        : m_type(eUiAnimParamType_Invalid) {}
-
-    CUiAnimParamType(const string& name)
-    {
-        *this = name;
-    }
-
-    CUiAnimParamType(const EUiAnimParamType type)
-    {
-        *this = type;
-    }
-
-    // Convert from old enum or int
-    void operator =(const int type)
-    {
-        m_type = (EUiAnimParamType)type;
-    }
-
-    void operator =(const string& name)
-    {
-        m_type = eUiAnimParamType_ByString;
-        m_name = name;
-    }
-
-    void operator =(const AZStd::string& name)
-    {
-        m_type = eUiAnimParamType_ByString;
-        m_name = name.c_str();
-    }
-    // Convert to enum. This needs to be explicit,
-    // otherwise operator== will be ambiguous
-    EUiAnimParamType GetType() const { return m_type; }
-
-    // Get name
-    const char* GetName() const { return m_name.c_str(); }
-
-    bool operator ==(const CUiAnimParamType& animParamType) const
-    {
-        if (m_type == eUiAnimParamType_ByString && animParamType.m_type == eUiAnimParamType_ByString)
-        {
-            return m_name == animParamType.m_name;
-        }
-
-        return m_type == animParamType.m_type;
-    }
-
-    bool operator !=(const CUiAnimParamType& animParamType) const
-    {
-        return !(*this == animParamType);
-    }
-
-    bool operator <(const CUiAnimParamType& animParamType) const
-    {
-        if (m_type == eUiAnimParamType_ByString && animParamType.m_type == eUiAnimParamType_ByString)
-        {
-            return m_name < animParamType.m_name;
-        }
-        else if (m_type == eUiAnimParamType_ByString)
-        {
-            return false; // Always sort named params last
-        }
-        else if (animParamType.m_type == eUiAnimParamType_ByString)
-        {
-            return true; // Always sort named params last
-        }
-        if (m_type < animParamType.m_type)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    // Serialization. Defined in UiAnimationSystem.cpp
-    inline void Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading, const uint version = kParamTypeVersion);
-
-private:
-    EUiAnimParamType m_type;
-    CCryName m_name;
-};
-
-// The data required to identify a specific parameter/property on an AZ component on an AZ entity
-class UiAnimParamData
-{
-    friend class UiAnimationSystem;
-
-public:
-
-    AZ_TYPE_INFO(UiAnimParamData, "{B2E9F22C-8DB5-40FA-9DF1-276E91BA8B95}")
-
-    UiAnimParamData()
-        : m_componentId(AZ::InvalidComponentId)
-        , m_typeId(0)
-        , m_offset(0)
-    {}
-
-    UiAnimParamData(AZ::ComponentId componentId, const char* name, AZ::Uuid typeId, size_t offset)
-        : m_componentId(componentId)
-        , m_typeId(typeId)
-        , m_name(name)
-        , m_offset(offset)
-    {}
-
-    AZ::ComponentId GetComponentId() const
-    {
-        return m_componentId;
-    }
-
-    AZ::Uuid GetTypeId() const
-    {
-        return m_typeId;
-    }
-
-    const char* GetName() const
-    {
-        return m_name.c_str();
-    }
-
-    size_t GetOffset() const
-    {
-        return m_offset;
-    }
-
-    AZ::Component* GetComponent(AZ::Entity* entity) const
-    {
-        return entity->FindComponent(m_componentId);
-    }
-
-    bool operator ==(const UiAnimParamData& animParamData) const
-    {
-        return m_componentId == animParamData.m_componentId &&
-               m_typeId == animParamData.m_typeId &&
-               m_offset == animParamData.m_offset;
-    }
-
-    bool operator !=(const UiAnimParamData& animParamData) const
-    {
-        return !(*this == animParamData);
-    }
-
-    bool operator <(const UiAnimParamData& animParamData) const
-    {
-        if (m_componentId != animParamData.m_componentId)
-        {
-            return m_componentId < animParamData.m_componentId;
-        }
-        else if (m_name != animParamData.m_name)
-        {
-            return m_name < animParamData.m_name;
-        }
-        else if (m_typeId != animParamData.m_typeId)
-        {
-            return m_typeId < animParamData.m_typeId;
-        }
-        else
-        {
-            return m_offset < animParamData.m_offset;
-        }
-    }
-
-
-    // Serialization. Defined in UiAnimationSystem.cpp
-    inline void Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading);
-
-private:
-    AZ::ComponentId     m_componentId;  // unique within the owning entity
-    AZ::Uuid            m_typeId;
-    AZStd::string       m_name;     // the name of the element in serialization data
-    size_t              m_offset;
-};
-
-//! Types of animation track.
-// Do not change values! they are serialized
-//
-// Attention: This should only be expanded if you add a completely new way how tracks store data!
-// If you just want to control a new parameter of an entity etc. extend EParamType
-//
-// Note: TCB splines are only for backward compatibility, Bezier is the default
-//
-enum EUiAnimCurveType
-{
-    eUiAnimCurveType_TCBFloat           = 1,
-    eUiAnimCurveType_TCBVector          = 2,
-    eUiAnimCurveType_TCBQuat            = 3,
-    eUiAnimCurveType_BezierFloat        = 4,
-
-    eUiAnimCurveType_Unknown            = 0xFFFFFFFF
-};
-
-//! Values that animation track can hold.
-// Do not change values! they are serialized
-//
-// Attention: This should only be expanded if you add a completely new value type that tracks can control!
-// If you just want to control a new parameter of an entity etc. extend EParamType
-//
-// Note: If the param type of a track is known and valid these can be derived from the node.
-//       These are serialized in case the parameter got invalid (for example for material nodes)
-//
-enum EUiAnimValue
-{
-    eUiAnimValue_Float          = 0,
-    eUiAnimValue_Vector         = 1,
-    eUiAnimValue_Quat           = 2,
-    eUiAnimValue_Bool           = 3,
-    eUiAnimValue_Select         = 5,
-    eUiAnimValue_Vector2        = 13,
-    eUiAnimValue_Vector3        = 14,
-    eUiAnimValue_Vector4        = 15,
-    eUiAnimValue_DiscreteFloat  = 16,
-    eUiAnimValue_RGB            = 20,
-    eUiAnimValue_CharacterAnim  = 21,
-
-    eUiAnimValue_Unknown        = 0xFFFFFFFF
-};
-
-enum EUiTrackMask
-{
-    eUiTrackMask_MaskSound = 1 << 11, // Old: 1 << ATRACK_SOUND
-    eUiTrackMask_MaskMusic = 1 << 14, // Old: 1 << ATRACK_MUSIC
-};
-
-//! Structure passed to Animate function.
-struct SUiAnimContext
-{
-    SUiAnimContext()
-    {
-        bSingleFrame = false;
-        bForcePlay = false;
-        bResetting = false;
-        time = 0;
-        dt = 0;
-        fps = 0;
-        pSequence = NULL;
-        trackMask = 0;
-        startTime = 0;
-    }
-
-    float time;                     //!< Current time in seconds.
-    float   dt;                     //!< Delta of time from previous animation frame in seconds.
-    float   fps;                    //!< Last calculated frames per second value.
-    bool bSingleFrame;              //!< This is not a playing animation, more a single-frame update
-    bool bForcePlay;                //!< Set when force playing animation
-    bool bResetting;                //!< Set when animation sequence is resetted.
-
-    IUiAnimSequence* pSequence;     //!< Sequence in which animation performed.
-
-    // TODO: Replace trackMask with something more type safe
-    // TODO: Mask should be stored with dynamic length
-    uint32 trackMask;               //!< To update certain types of tracks only
-    float startTime;                //!< The start time of this playing sequence
-
-    void Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading);
-};
-
-/** Parameters for cut-scene cameras
-*/
-//! Callback-class
-struct IUiAnimationCallback
-{
-    //! Callback-reasons
-    enum ECallbackReason
-    {
-        CBR_CHANGENODE, // Node is changing.
-        CBR_CHANGETRACK // Track of the node is changing.
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IUiAnimationCallback(){}
-    // Called by UI animation system.
-    virtual void OnUiAnimationCallback(ECallbackReason reason, IUiAnimNode* pNode) = 0;
-    // </interfuscator:shuffle>
-};
-
-/** Interface of Animation Track.
-*/
-struct IUiAnimTrack
-{
-    AZ_RTTI(IUiAnimTrack, "{11C16CEC-4C03-4342-B4A7-62790E48CBD5}")
-
-    //! Flags that can be set on animation track.
-    enum EUiAnimTrackFlags
-    {
-        eUiAnimTrackFlags_Linear   = BIT(1), //!< Use only linear interpolation between keys.
-        eUiAnimTrackFlags_Loop     = BIT(2), //!< Play this track in a loop.
-        eUiAnimTrackFlags_Cycle    = BIT(3), //!< Cycle track.
-        eUiAnimTrackFlags_Disabled = BIT(4), //!< Disable this track.
-
-        //////////////////////////////////////////////////////////////////////////
-        // Used by editor.
-        //////////////////////////////////////////////////////////////////////////
-        eUiAnimTrackFlags_Hidden   = BIT(5), //!< Set when track is hidden in UI Animation editor.
-        eUiAnimTrackFlags_Muted    = BIT(8), //!< Mute this sound track. This only affects the playback in editor.
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IUiAnimTrack() {};
-
-    // for intrusive_ptr support
-    virtual void add_ref() = 0;
-    virtual void release() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual EUiAnimCurveType GetCurveType() = 0;
-    virtual EUiAnimValue     GetValueType() = 0;
-
-#ifdef UI_ANIMATION_SYSTEM_SUPPORT_EDITING
-    // This color is used for the editor.
-    virtual ColorB GetCustomColor() const = 0;
-    virtual void SetCustomColor(ColorB color) = 0;
-    virtual bool HasCustomColor() const = 0;
-    virtual void ClearCustomColor() = 0;
-#endif
-
-    // Return what parameter of the node, this track is attached to.
-    virtual const CUiAnimParamType& GetParameterType() const = 0;
-
-    // Assign node parameter ID for this track.
-    virtual void SetParameterType(CUiAnimParamType type) = 0;
-
-    virtual const UiAnimParamData& GetParamData() const = 0;
-
-    virtual void SetParamData(const UiAnimParamData& param) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Animation track can contain sub-tracks (Position XYZ anim track have sub-tracks for x,y,z)
-    // Get count of sub tracks.
-    virtual int GetSubTrackCount() const = 0;
-    // Retrieve pointer the specfied sub track.
-    virtual IUiAnimTrack* GetSubTrack(int nIndex) const = 0;
-    virtual const char* GetSubTrackName(int nIndex) const = 0;
-    virtual void SetSubTrackName(int nIndex, const char* name) = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void GetKeyValueRange(float& fMin, float& fMax) const = 0;
-    virtual void SetKeyValueRange(float fMin, float fMax) = 0;
-
-    //! Return number of keys in track.
-    virtual int GetNumKeys() const = 0;
-
-    //! Return true if keys exists in this track
-    virtual bool HasKeys() const = 0;
-
-    //! Set number of keys in track.
-    //! If needed adds empty keys at end or remove keys from end.
-    virtual void SetNumKeys(int numKeys) = 0;
-
-    //! Remove specified key.
-    virtual void RemoveKey(int num) = 0;
-
-    //! Get key at specified location.
-    //! @param key Must be valid pointer to compatible key structure, to be filled with specified key location.
-    virtual void GetKey(int index, IKey* key) const = 0;
-
-    //! Get time of specified key.
-    //! @return key time.
-    virtual float GetKeyTime(int index) const = 0;
-
-    //! Find key at given time.
-    //! @return Index of found key, or -1 if key with this time not found.
-    virtual int FindKey(float time) = 0;
-
-    //! Get flags of specified key.
-    //! @return key time.
-    virtual int GetKeyFlags(int index) = 0;
-
-    //! Set key at specified location.
-    //! @param key Must be valid pointer to compatible key structure.
-    virtual void SetKey(int index, IKey* key) = 0;
-
-    //! Set time of specified key.
-    virtual void SetKeyTime(int index, float time) = 0;
-
-    //! Set flags of specified key.
-    virtual void SetKeyFlags(int index, int flags) = 0;
-
-    //! Sort keys in track (after time of keys was modified).
-    virtual void SortKeys() = 0;
-
-    //! Get track flags.
-    virtual int GetFlags() = 0;
-
-    //! Check if track is masked by mask
-    // TODO: Mask should be stored with dynamic length
-    virtual bool IsMasked(const uint32 mask) const = 0;
-
-    //! Set track flags.
-    virtual void SetFlags(int flags) = 0;
-
-    //! Create key at given time, and return its index.
-    //! @return Index of new key.
-    virtual int CreateKey(float time) = 0;
-
-    //! Clone key at specified index.
-    //! @retun Index of new key.
-    virtual int CloneKey(int key) = 0;
-
-    //! Clone key at specified index from another track of SAME TYPE.
-    //! @retun Index of new key.
-    virtual int CopyKey(IUiAnimTrack* pFromTrack, int nFromKey) = 0;
-
-    //! Get info about specified key.
-    //! @param Short human readable text description of this key.
-    //! @param duration of this key in seconds.
-    virtual void GetKeyInfo(int key, const char*& description, float& duration) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Get track value at specified time.
-    // Interpolates keys if needed.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void GetValue(float time, float& value) = 0;
-    virtual void GetValue(float time, Vec3& value) = 0;
-    virtual void GetValue(float time, Vec4& value) = 0;
-    virtual void GetValue(float time, Quat& value) = 0;
-    virtual void GetValue(float time, bool& value) = 0;
-    virtual void GetValue(float time, AZ::Vector2& value) = 0;
-    virtual void GetValue(float time, AZ::Vector3& value) = 0;
-    virtual void GetValue(float time, AZ::Vector4& value) = 0;
-    virtual void GetValue(float time, AZ::Color& value) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set track value at specified time.
-    // Adds new keys if required.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetValue(float time, const float& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const Vec3& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const Vec4& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const Quat& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const bool& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const AZ::Vector2& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const AZ::Vector3& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const AZ::Vector4& value, bool bDefault = false) = 0;
-    virtual void SetValue(float time, const AZ::Color& value, bool bDefault = false) = 0;
-
-    // Only for position tracks, offset all track keys by this amount.
-    virtual void OffsetKeyPosition(const Vec3& value) = 0;
-
-    // Assign active time range for this track.
-    virtual void SetTimeRange(const Range& timeRange) = 0;
-
-    // Serialize this animation track to XML.
-    virtual bool Serialize(IUiAnimationSystem* uiAnimationSystem, XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks = true) = 0;
-    virtual bool SerializeSelection(XmlNodeRef& xmlNode, bool bLoading, bool bCopySelected = false, float fTimeOffset = 0) = 0;
-
-    virtual void InitPostLoad(IUiAnimSequence* /*sequence*/) {};
-
-    //! For custom track animate parameters.
-    virtual void Animate([[maybe_unused]] SUiAnimContext& ec) {};
-
-    // Get access to the internal spline of the track.
-    virtual ISplineInterpolator* GetSpline() const { return 0; };
-
-    virtual bool IsKeySelected([[maybe_unused]] int key) const { return false; }
-
-    virtual void SelectKey([[maybe_unused]] int key, [[maybe_unused]] bool select) {}
-
-    //! Return the index of the key which lies right after the given key in time.
-    //! @param key Index of of key.
-    //! @return Index of the next key in time. If the last key given, this returns -1.
-    // In case of keys sorted, it's just 'key+1', but if not sorted, it can be another value.
-    virtual int NextKeyByTime(int key) const
-    {
-        if (key + 1 < GetNumKeys())
-        {
-            return key + 1;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-    //! Get the animation layer index assigned. (only for character/look-at tracks ATM)
-    virtual int GetAnimationLayerIndex() const { return -1; }
-    //! Set the animation layer index. (only for character/look-at tracks ATM)
-    virtual void SetAnimationLayerIndex([[maybe_unused]] int index) { }
-
-    // </interfuscator:shuffle>
-};
-
-
-/** Callback called by animation node when its animated.
-*/
-struct IUiAnimNodeOwner
-{
-    // <interfuscator:shuffle>
-    virtual ~IUiAnimNodeOwner(){}
-    virtual void OnNodeUiAnimated(IUiAnimNode* pNode) = 0;
-    virtual void OnNodeVisibilityChanged(IUiAnimNode* pNode, const bool bHidden) = 0;
-    virtual void OnNodeReset([[maybe_unused]] IUiAnimNode* pNode) {}
-
-    // </interfuscator:shuffle>
-};
-
-/** Base class for all Animation nodes,
-        can host multiple animation tracks, and execute them other time.
-        Animation node is reference counted.
-*/
-struct IUiAnimNode
-{
-public:
-    AZ_RTTI(IUiAnimNode, "{298180CC-B577-440C-8466-A01ABC8CC00A}")
-
-    //////////////////////////////////////////////////////////////////////////
-    // Supported params.
-    //////////////////////////////////////////////////////////////////////////
-    enum ESupportedParamFlags
-    {
-        eSupportedParamFlags_MultipleTracks = 0x01, // Set if parameter can be assigned multiple tracks.
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IUiAnimNode() {};
-
-    // for intrusive_ptr support
-    virtual void add_ref() = 0;
-    virtual void release() = 0;
-
-    //! Set node name.
-    virtual void SetName(const char* name) = 0;
-
-    //! Get node name.
-    virtual const char* GetName() = 0;
-
-    // Get Type of this node.
-    virtual EUiAnimNodeType GetType() const = 0;
-
-    // Return Animation Sequence that owns this node.
-    virtual IUiAnimSequence* GetSequence() const = 0;
-
-    // Set the Animation Sequence that owns this node.
-    virtual void SetSequence(IUiAnimSequence* sequence) = 0;
-
-    // Called when sequence is activated / deactivated
-    virtual void Activate(bool bActivate) = 0;
-
-    // Set AnimNode flags.
-    // @param flags One or more flags from EUiAnimNodeFlags.
-    // @see EUiAnimNodeFlags
-    virtual void SetFlags(int flags) = 0;
-
-    // Get AnimNode flags.
-    // @return flags set on node.
-    // @see EUiAnimNodeFlags
-    virtual int GetFlags() const = 0;
-
-    // Return animation system that created this node.
-    virtual IUiAnimationSystem* GetUiAnimationSystem() const = 0;
-
-    // General Set param.
-    // Set float/vec3/vec4 parameter at given time.
-    // @return true if parameter set, false if this parameter not exist in node.
-    virtual bool SetParamValue(float time, CUiAnimParamType param, float value) = 0;
-    virtual bool SetParamValue(float time, CUiAnimParamType param, const Vec3& value) = 0;
-    virtual bool SetParamValue(float time, CUiAnimParamType param, const Vec4& value) = 0;
-    // Get float/vec3/vec4 parameter at given time.
-    // @return true if parameter exist, false if this parameter not exist in node.
-    virtual bool GetParamValue(float time, CUiAnimParamType param, float& value) = 0;
-    virtual bool GetParamValue(float time, CUiAnimParamType param, Vec3& value) = 0;
-    virtual bool GetParamValue(float time, CUiAnimParamType param, Vec4& value) = 0;
-
-    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] float value) { return false; }
-    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] bool value) { return false; }
-    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] int value) { return false; }
-    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] unsigned int value) { return false; }
-    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] const AZ::Vector2& value) { return false; }
-    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] const AZ::Vector3& value) { return false; }
-    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] const AZ::Vector4& value) { return false; }
-    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] const AZ::Color& value) { return false; }
-
-    virtual bool GetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] float& value) { return false; }
-
-    //! Evaluate animation node while not playing animation.
-    virtual void StillUpdate() = 0;
-
-    //! Evaluate animation to the given time.
-    virtual void Animate(SUiAnimContext& ec) = 0;
-
-    // Description:
-    //      Returns number of supported parameters by this animation node (position,rotation,scale,etc..).
-    // Returns:
-    //      Number of supported parameters.
-    virtual unsigned int GetParamCount() const = 0;
-
-    // Description:
-    //      Returns the type of a param by index
-    // Arguments:
-    //      nIndex - parameter index in range 0 <= nIndex < GetSupportedParamCount()
-    virtual CUiAnimParamType GetParamType(unsigned int nIndex) const = 0;
-
-    // Description:
-    //      Check if parameter is supported by this node.
-    virtual bool IsParamValid(const CUiAnimParamType& paramType) const = 0;
-
-    // Description:
-    //      Returns name of supported parameter of this animation node or NULL if not available
-    // Arguments:
-    //          paramType - parameter id
-    virtual const char* GetParamName(const CUiAnimParamType& paramType) const = 0;
-
-    // Description:
-    //      Returns name of supported parameter of this animation node or NULL if not available
-    // Arguments:
-    //          paramType - parameter id
-    virtual const char* GetParamNameForTrack(const CUiAnimParamType& paramType, [[maybe_unused]] const IUiAnimTrack* track) const { return GetParamName(paramType); }
-
-    // Description:
-    //      Returns the params value type
-    virtual EUiAnimValue GetParamValueType(const CUiAnimParamType& paramType) const = 0;
-
-    // Description:
-    //      Returns the params value type
-    virtual ESupportedParamFlags GetParamFlags(const CUiAnimParamType& paramType) const = 0;
-
-    // Called node data is re-initialized, such as when changing the entity associated with it.
-    virtual void OnReset() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Working with Tracks.
-    //////////////////////////////////////////////////////////////////////////
-    virtual int GetTrackCount() const = 0;
-
-    // Return track assigned to the specified parameter.
-    virtual IUiAnimTrack* GetTrackByIndex(int nIndex) const = 0;
-
-    // Return first track assigned to the specified parameter.
-    virtual IUiAnimTrack* GetTrackForParameter(const CUiAnimParamType& paramType) const = 0;
-
-    // Return the i-th track assigned to the specified parameter in case of multiple tracks.
-    virtual IUiAnimTrack* GetTrackForParameter(const CUiAnimParamType& paramType, uint32 index) const = 0;
-
-    // Get the index of a given track among tracks with the same parameter type in this node.
-    virtual uint32 GetTrackParamIndex(const IUiAnimTrack* pTrack) const = 0;
-
-    // Creates a new track for given parameter.
-    virtual IUiAnimTrack* CreateTrack(const CUiAnimParamType& paramType) = 0;
-
-    // Return track assigned to the specified class element.
-    // Maybe we should pass nameCrc rather than a void*
-    virtual IUiAnimTrack* GetTrackForAzField(const UiAnimParamData& param) const = 0;
-
-    // Creates a new track for given parameter.
-    // Maybe we should pass nameCrc rather than a void*
-    virtual IUiAnimTrack* CreateTrackForAzField(const UiAnimParamData& param) = 0;
-
-    // Assign animation track to parameter.
-    // if track parameter is NULL track with parameter id param will be removed.
-    virtual void SetTrack(const CUiAnimParamType& paramType, IUiAnimTrack* track) = 0;
-
-    // Set time range for all tracks in this sequence.
-    virtual void SetTimeRange(Range timeRange) = 0;
-
-    // Remove track from anim node.
-    virtual void AddTrack(IUiAnimTrack* pTrack) = 0;
-
-    // Remove track from anim node.
-    virtual bool RemoveTrack(IUiAnimTrack* pTrack) = 0;
-
-    // Description:
-    //      Creates default set of tracks supported by this node.
-    virtual void CreateDefaultTracks() = 0;
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Callback for animation node used by editor.
-    // Register notification callback with animation node.
-    virtual void SetNodeOwner(IUiAnimNodeOwner* pOwner) = 0;
-    virtual IUiAnimNodeOwner* GetNodeOwner() = 0;
-
-    // Serialize this animation node to XML.
-    virtual void SerializeUiAnims(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks) = 0;
-    virtual void Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks) = 0;
-
-    // Sets up internal pointers post load from Sequence Component
-    virtual void InitPostLoad(IUiAnimSequence* pSequence, bool remapIds, LyShine::EntityIdMap* entityIdMap) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-    // Groups interface
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetParent(IUiAnimNode* pParent) = 0;
-    virtual IUiAnimNode* GetParent() const = 0;
-    virtual IUiAnimNode* HasDirectorAsParent() const = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void Render() = 0;
-
-    virtual bool NeedToRender() const = 0;
-
-    // Called from editor if dynamic params need updating
-    virtual void UpdateDynamicParams() = 0;
-    // </interfuscator:shuffle>
-};
-
-//! Track event listener
-struct IUiTrackEventListener
-{
-    //! Reasons
-    enum ETrackEventReason
-    {
-        eTrackEventReason_Added,
-        eTrackEventReason_Removed,
-        eTrackEventReason_Renamed,
-        eTrackEventReason_Triggered,
-        eTrackEventReason_MovedUp,
-        eTrackEventReason_MovedDown,
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IUiTrackEventListener(){}
-    // Description:
-    //      Called when track event is updated
-    // Arguments:
-    //      pSeq - Animation sequence
-    //      reason - Reason for update (see EReason)
-    //      event - Track event added
-    //      pUserData - Data to accompany reason
-    virtual void OnTrackEvent(IUiAnimSequence* pSequence, int reason, const char* event, void* pUserData) = 0;
-    // </interfuscator:shuffle>
-};
-
-struct IUiAnimSequenceOwner
-{
-    // <interfuscator:shuffle>
-    virtual ~IUiAnimSequenceOwner() {}
-    virtual void OnModified() = 0;
-    // </interfuscator:shuffle>
-};
-
-struct IUiAnimStringTable
-{
-    AZ_RTTI(IUiAnimStringTable, "{5B60054D-0D67-4DB5-B867-9869DAB95B83}")
-    virtual ~IUiAnimStringTable() {}
-
-    // for intrusive_ptr support
-    virtual void add_ref() = 0;
-    virtual void release() = 0;
-
-    virtual const char* Add(const char* p) = 0;
-};
-
-/** Animation sequence, operates on animation nodes contained in it.
- */
-struct IUiAnimSequence
-{
-    AZ_RTTI(IUiAnimSequence, "{74EFA085-7758-4275-98A1-4D40DC6F55B8}")
-
-    static const int kSequenceVersion = 3;
-
-    //! Flags used for SetFlags(),GetFlags(),SetParentFlags(),GetParentFlags() methods.
-    enum EUiAnimSequenceFlags
-    {
-        eSeqFlags_PlayOnReset          = BIT(0),   //!< Start playing this sequence immediately after reset of UI animation system(Level load).
-        eSeqFlags_OutOfRangeConstant   = BIT(1),   //!< Constant Out-Of-Range,time continues normally past sequence time range.
-        eSeqFlags_OutOfRangeLoop       = BIT(2),   //!< Loop Out-Of-Range,time wraps back to the start of range when reaching end of range.
-        eSeqFlags_CutScene             = BIT(3),   //!< Cut scene sequence.
-        eSeqFlags_NoHUD                = BIT(4),   //!< @deprecated - Don`t display HUD
-        eSeqFlags_NoPlayer             = BIT(5),   //!< Disable input and drawing of player
-        eSeqFlags_16To9                = BIT(8),   //!< 16:9 bars in sequence
-        eSeqFlags_NoGameSounds         = BIT(9),   //!< Suppress all game sounds.
-        eSeqFlags_NoSeek               = BIT(10),  //!< Cannot seek in sequence.
-        eSeqFlags_NoAbort              = BIT(11),  //!< Cutscene can not be aborted
-        eSeqFlags_NoSpeed              = BIT(13),  //!< Cannot modify sequence speed - TODO: add interface control if required
-     // eSeqFlags_CanWarpInFixedTime   = BIT(14),  //!< @deprecated - Timewarp by scaling a fixed time step - removed July 2017
-        eSeqFlags_EarlyAnimationUpdate = BIT(15),  //!< Turn the 'sys_earlyUiAnimationUpdate' on during the sequence.
-        eSeqFlags_LightAnimationSet    = BIT(16),  //!< A special unique sequence for light animations
-        eSeqFlags_NoMPSyncingNeeded    = BIT(17),  //!< this sequence doesn't require MP net syncing
-    };
-
-    virtual ~IUiAnimSequence() {};
-
-    // for intrusive_ptr support
-    virtual void add_ref() = 0;
-    virtual void release() = 0;
-
-    //! Set the animation system for the canvas containing this sequence
-    virtual IUiAnimationSystem* GetUiAnimationSystem() const = 0;
-
-    //! Set the name of this sequence. (ex. "Intro" in the same case as above)
-    virtual void SetName(const char* name) = 0;
-    //! Get the name of this sequence. (ex. "Intro" in the same case as above)
-    virtual const char* GetName() const = 0;
-    //! Get the ID (unique in a level and consistent across renaming) of this sequence.
-    virtual uint32 GetId () const = 0;
-
-    virtual void SetOwner(IUiAnimSequenceOwner* pOwner) = 0;
-    virtual IUiAnimSequenceOwner* GetOwner() const = 0;
-
-    //! Set the currently active director node.
-    virtual void SetActiveDirector(IUiAnimNode* pDirectorNode) = 0;
-    //! Get the currently active director node, if any.
-    virtual IUiAnimNode* GetActiveDirector() const = 0;
-
-    //! Set animation sequence flags
-    virtual void SetFlags(int flags) = 0;
-    //! Get animation sequence flags
-    virtual int GetFlags() const = 0;
-    //! Get cutscene related animation sequence flags
-    virtual int GetCutSceneFlags(const bool localFlags = false) const = 0;
-    //! Set parent animation sequence
-    virtual void SetParentSequence(IUiAnimSequence* pParentSequence) = 0;
-    //! Get parent animation sequence
-    virtual const IUiAnimSequence* GetParentSequence() const = 0;
-    //! Check whether this sequence has the given sequence as a descendant through one of its sequence tracks.
-    virtual bool IsAncestorOf(const IUiAnimSequence* sequence) const = 0;
-
-    //! Return number of animation nodes in sequence.
-    virtual int GetNodeCount() const = 0;
-    //! Get animation node at specified index.
-    virtual IUiAnimNode* GetNode(int index) const = 0;
-
-    //! Add animation node to sequence.
-    //! @return True if node added, same node will not be added 2 times.
-    virtual bool AddNode(IUiAnimNode* node) = 0;
-
-    // Reorders the array of nodes, so the specified node is placed after or before the given pivot node depending on the parameter 'next'.
-    virtual void ReorderNode(IUiAnimNode* node, IUiAnimNode* pPivotNode, bool next) = 0;
-
-    // Description:
-    //      Creates a new animation node with specified type.
-    // Arguments:
-    //      nodeType - Type of node, one of EUiAnimNodeType enums.
-    virtual IUiAnimNode* CreateNode(EUiAnimNodeType nodeType) = 0;
-
-    // Description:
-    //      Creates a new animation node from serialized node XML.
-    // Arguments:
-    //      node - Serialized form of node
-    virtual IUiAnimNode* CreateNode(XmlNodeRef node) = 0;
-
-    //! Remove animation node from sequence.
-    virtual void RemoveNode(IUiAnimNode* node) = 0;
-
-    // Finds node by name, can be slow.
-    // If the node belongs to a director, the director node also should be given
-    // since there can be multiple instances of the same node(i.e. the same name)
-    // across multiple director nodes.
-    virtual IUiAnimNode* FindNodeByName(const char* sNodeName, const IUiAnimNode* pParentDirector) = 0;
-
-    //! Remove all nodes from sequence.
-    virtual void RemoveAll() = 0;
-
-    // Activate sequence by binding sequence animations to nodes.
-    // must be called prior animating sequence.
-    virtual void Activate() = 0;
-
-    /** Check if sequence is activated
-    */
-    virtual bool IsActivated() const = 0;
-
-    // Deactivates sequence by unbinding sequence animations from nodes.
-    virtual void Deactivate() = 0;
-
-    // Pre-caches data associated with this anim sequence.
-    virtual void PrecacheData(float startTime = 0.0f) = 0;
-
-    // Update sequence while not playing animation.
-    virtual void StillUpdate() = 0;
-
-    // Render function call for some special node.
-    virtual void Render() = 0;
-
-    // Evaluate animations of all nodes in sequence.
-    // Sequence must be activated before animating.
-    virtual void Animate(const SUiAnimContext& ec) = 0;
-
-    //! Set time range of this sequence.
-    virtual void SetTimeRange(Range timeRange) = 0;
-
-    //! Get time range of this sequence.
-    virtual Range GetTimeRange() = 0;
-
-    //! Resets the sequence
-    virtual void Reset(bool bSeekToStart) = 0;
-
-    //! This can have more time-consuming tasks performed additional to tasks of the usual 'Reset()' method.
-    virtual void ResetHard() = 0;
-
-    // Called to pause sequence.
-    virtual void Pause() = 0;
-
-    // Called to resume sequence.
-    virtual void Resume() = 0;
-
-    /** Called to check if sequence is paused.
-    */
-    virtual bool IsPaused() const = 0;
-
-    /** Called when a sequence is looped.
-    */
-    virtual void OnLoop() = 0;
-
-    /** Move/Scale all keys in tracks from previous time range to new time range.
-    */
-    virtual void AdjustKeysToTimeRange(const Range& timeRange) = 0;
-
-    // Serialize this sequence to XML.
-    virtual void Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks = true, uint32 overrideId = 0, bool bUndo = false) = 0;
-    virtual void InitPostLoad(IUiAnimationSystem* pUiAnimationSystem, bool remapIds, LyShine::EntityIdMap* entityIdMap) = 0;
-
-    // Copy some nodes of this sequence to XML.
-    virtual void CopyNodes(XmlNodeRef& xmlNode, IUiAnimNode** pSelectedNodes, uint32 count) = 0;
-
-    // Paste nodes given by the XML to this sequence.
-    virtual void PasteNodes(const XmlNodeRef& xmlNode, IUiAnimNode* pParent) = 0;
-
-    // Summary:
-    //  Adds/removes track events in sequence.
-    virtual bool AddTrackEvent(const char* szEvent) = 0;
-    virtual bool RemoveTrackEvent(const char* szEvent) = 0;
-    virtual bool RenameTrackEvent(const char* szEvent, const char* szNewEvent) = 0;
-    virtual bool MoveUpTrackEvent(const char* szEvent) = 0;
-    virtual bool MoveDownTrackEvent(const char* szEvent) = 0;
-    virtual void ClearTrackEvents() = 0;
-
-    // Summary:
-    //  Gets the track events in the sequence.
-    virtual int GetTrackEventsCount() const = 0;
-    // Summary:
-    //  Gets the specified track event in the sequence.
-    virtual char const* GetTrackEvent(int iIndex) const = 0;
-
-    virtual IUiAnimStringTable* GetTrackEventStringTable() = 0;
-
-    // Summary:
-    //   Called to trigger a track event.
-    virtual void TriggerTrackEvent(const char* event, const char* param = NULL) = 0;
-
-    //! Track event listener
-    virtual void AddTrackEventListener(IUiTrackEventListener* pListener) = 0;
-    virtual void RemoveTrackEventListener(IUiTrackEventListener* pListener) = 0;
-
-    // </interfuscator:shuffle>
-};
-
-/** UI animation Listener interface.
-    Register at UI animation system to get notified about UI animation events
-*/
-struct IUiAnimationListener
-{
-    enum EUiAnimationEvent
-    {
-        eUiAnimationEvent_Started = 0,   // fired when sequence is started
-        eUiAnimationEvent_Stopped,       // fired when sequence ended normally
-        eUiAnimationEvent_Aborted,       // fired when sequence was aborted before normal end (STOP and ABORTED event are mutually exclusive!)
-        eUiAnimationEvent_Updated,       // fired after sequence time or playback speed was updated
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IUiAnimationListener(){}
-    //! callback on UI animation events
-    virtual void OnUiAnimationEvent(EUiAnimationEvent uiAnimationEvent, IUiAnimSequence* pAnimSequence) = 0;
-    virtual void OnUiTrackEvent(AZStd::string eventName, AZStd::string valueName, [[maybe_unused]] IUiAnimSequence* pAnimSequence) {}
-    // </interfuscator:shuffle>
-};
-
-/** UI Animation System interface.
-        Main entrance point to UI Animation capability.
-        Enumerate available UI Animation sequences, update all UI Animation sequences, create animation nodes and tracks.
- */
-struct IUiAnimationSystem
-{
-    AZ_RTTI(IUiAnimationSystem, "{26D795DD-6732-4A2F-81A5-B17B53A3ADAA}")
-
-    enum ESequenceStopBehavior
-    {
-        eSSB_LeaveTime = 0,         // When sequence is stopped it remains in last played time.
-        eSSB_GotoEndTime = 1,       // Default behavior in game, sequence is animated at end time before stop.
-        eSSB_GotoStartTime = 2, // Default behavior in editor, sequence is animated at start time before stop.
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~IUiAnimationSystem(){}
-
-    //! Release UI animation system.
-    virtual void Release() = 0;
-    //! Loads all nodes and sequences from a specific file (should be called when the level is loaded).
-    virtual bool Load(const char* pszFile, const char* pszMission) = 0;
-
-    // Description:
-    //      Creates a new animation track with specified type.
-    // Arguments:
-    //      type - Type of track, one of EUiAnimTrackType enums.
-    virtual IUiAnimTrack* CreateTrack(EUiAnimCurveType type) = 0;
-
-    virtual IUiAnimSequence* CreateSequence(const char* sequence, bool bLoad = false, uint32 id = 0) = 0;
-    virtual IUiAnimSequence* LoadSequence(XmlNodeRef& xmlNode, bool bLoadEmpty = true) = 0;
-    virtual void AddSequence(IUiAnimSequence* pSequence) = 0;
-    virtual void RemoveSequence(IUiAnimSequence* pSequence) = 0;
-    virtual IUiAnimSequence* FindSequence(const char* sequence) const = 0;
-    virtual IUiAnimSequence* FindSequenceById(uint32 id) const = 0;
-    virtual IUiAnimSequence* GetSequence(int i) const = 0;
-    virtual int GetNumSequences() const = 0;
-    virtual IUiAnimSequence* GetPlayingSequence(int i) const = 0;
-    virtual int GetNumPlayingSequences() const = 0;
-    virtual bool IsCutScenePlaying() const = 0;
-
-    virtual uint32 GrabNextSequenceId() = 0;
-    //////////////////////////////////////////////////////////////////////////
-    //
-    // If the name of a sequence changes, the keys that refer it in the
-    // sequence track of the director node should be properly updated also.
-    //
-    // @param   before The old name of the sequence.
-    // @param   after The new name of the sequence.
-    // @return  Number of modified sequence keys.
-    //
-    //////////////////////////////////////////////////////////////////////////
-    virtual int OnSequenceRenamed(const char* before, const char* after) = 0;
-    //////////////////////////////////////////////////////////////////////////
-    //
-    // If the name of a camera changes, the keys that refer it in the
-    // camera track of the director node should be properly updated also.
-    // This updates the name of the corresponding camera node also, if any.
-    //
-    // @param   before The old name of the camera.
-    // @param   after The new name of the camera.
-    // @return  Number of modified camera keys.
-    //
-    //////////////////////////////////////////////////////////////////////////
-    virtual int OnCameraRenamed(const char* before, const char* after) = 0;
-
-    // Adds a listener to a sequence
-    // @param pSequence Pointer to sequence
-    // @param pListener Pointer to an IUiAnimationListener
-    // @return true on successful add, false otherwise
-    virtual bool AddUiAnimationListener(IUiAnimSequence* pSequence, IUiAnimationListener* pListener) = 0;
-
-    // Removes a listener from a sequence
-    // @param pSequence Pointer to sequence
-    // @param pListener Pointer to an IUiAnimationListener
-    // @return true on successful removal, false otherwise
-    virtual bool RemoveUiAnimationListener(IUiAnimSequence* pSequence, IUiAnimationListener* pListener) = 0;
-
-    virtual ISystem* GetSystem() = 0;
-
-    // Remove all sequences from UI animation system.
-    virtual void RemoveAllSequences() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Sequence playback.
-    //////////////////////////////////////////////////////////////////////////
-    // Start playing sequence.
-    // Call ignored if sequence is already playing.
-    // @param sequence Name of sequence to play.
-    virtual void PlaySequence(const char* pSequenceName, IUiAnimSequence* pParentSeq, bool bResetFX, bool bTrackedSequence, float startTime = -FLT_MAX, float endTime = -FLT_MAX) = 0;
-
-    // Start playing sequence.
-    // Call ignored if sequence is already playing.
-    // @param sequence Pointer to Valid sequence to play.
-    virtual void PlaySequence(IUiAnimSequence* pSequence, IUiAnimSequence* pParentSeq, bool bResetFX, bool bTrackedSequence, float startTime = -FLT_MAX, float endTime = -FLT_MAX) = 0;
-
-    // Stops currently playing sequence.
-    // Ignored if sequence is not playing.
-    // Returns true if sequence has been stopped. false otherwise
-    // @param sequence Name of playing sequence to stop.
-    virtual bool StopSequence(const char* pSequenceName) = 0;
-
-    // Stop's currently playing sequence.
-    // Ignored if sequence is not playing.
-    // Returns true if sequence has been stopped. false otherwise
-    // @param sequence Pointer to Valid sequence to stop.
-    virtual bool StopSequence(IUiAnimSequence* pSequence) = 0;
-
-    /** Aborts a currently playing sequence.
-            Ignored if sequence is not playing.
-            Calls IUiAnimationListener with aborted event (done event is NOT called)
-            Returns true if sequence has been aborted. false otherwise
-            @param sequence Pointer to Valid sequence to stop.
-            @param bLeaveTime If false, uses default stop behavior, otherwise leaves the sequence at time
-    */
-    virtual bool AbortSequence(IUiAnimSequence* pSequence, bool bLeaveTime = false) = 0;
-
-    // Stops all currently playing sequences.
-    virtual void StopAllSequences() = 0;
-
-    // Stops all playing cut-scene sequences.
-    // This will not stop all sequences, but only those with CUT_SCENE flag set.
-    virtual void StopAllCutScenes() = 0;
-
-    // Checks if specified sequence is playing.
-    virtual bool IsPlaying(IUiAnimSequence* seq) const = 0;
-
-    /** Resets playback state of UI animation system,
-            usually called after loading of level,
-    */
-    virtual void Reset(bool bPlayOnReset, bool bSeekToStart) = 0;
-
-    // Sequences with PLAY_ONRESET flag will start playing after this call.
-    virtual void PlayOnLoadSequences() = 0;
-
-    // Update UI animation system while not playing animation.
-    virtual void StillUpdate() = 0;
-
-    // Updates UI animation system every frame before the entity system to animate all playing sequences.
-    virtual void PreUpdate(const float dt) = 0;
-
-    // Updates UI animation system every frame after the entity system to animate all playing sequences.
-    virtual void PostUpdate(const float dt) = 0;
-
-    // Render function call of some special node.
-    virtual void Render() = 0;
-
-    // Set UI animation system into recording mode,
-    // While in recording mode any changes made to node will be added as keys to tracks.
-    virtual void SetRecording(bool recording) = 0;
-    virtual bool IsRecording() const = 0;
-
-    // Pause any playing sequences.
-    virtual void Pause() = 0;
-
-    // Resume playing sequences.
-    virtual void Resume() = 0;
-
-    // Callback when animation-data changes
-    virtual void SetCallback(IUiAnimationCallback* pCallback) = 0;
-
-    virtual IUiAnimationCallback* GetCallback() = 0;
-
-    // Serialize to XML.
-    virtual void Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bRemoveOldNodes = false, bool bLoadEmpty = true) = 0;
-    virtual void InitPostLoad(bool remapIds, LyShine::EntityIdMap* entityIdMap) = 0;
-
-    // Gets the float time value for a sequence that is already playing
-    virtual float GetPlayingTime(IUiAnimSequence* pSeq) = 0;
-    virtual float GetPlayingSpeed(IUiAnimSequence* pSeq) = 0;
-    // Sets the time progression of an already playing cutscene.
-    // If IUiAnimSequence:NO_SEEK flag is set on pSeq, this call is ignored.
-    virtual bool SetPlayingTime(IUiAnimSequence* pSeq, float fTime) = 0;
-    virtual bool SetPlayingSpeed(IUiAnimSequence* pSeq, float fSpeed) = 0;
-    // Set behavior pattern for stopping sequences.
-    virtual void SetSequenceStopBehavior(ESequenceStopBehavior behavior) = 0;
-
-    // Set the start and end time of an already playing cutscene.
-    virtual bool GetStartEndTime(IUiAnimSequence* pSeq, float& fStartTime, float& fEndTime) = 0;
-    virtual bool SetStartEndTime(IUiAnimSequence* pSeq, const float fStartTime, const float fEndTime) = 0;
-
-    // Make the specified sequence go to a given frame time.
-    // @param seqName A sequence name.
-    // @param targetFrame A target frame to go to in time.
-    virtual void GoToFrame(const char* seqName, float targetFrame) = 0;
-
-    // Get behavior pattern for stopping sequences.
-    virtual IUiAnimationSystem::ESequenceStopBehavior GetSequenceStopBehavior() = 0;
-
-    // Should only be called from CUiAnimParamType
-    virtual void SerializeParamType(CUiAnimParamType& animParamType, XmlNodeRef& xmlNode, bool bLoading, const uint version) = 0;
-
-    // Should only be called from UiAnimParamData
-    virtual void SerializeParamData(UiAnimParamData& animParamData, XmlNodeRef& xmlNode, bool bLoading) = 0;
-
-    // Called by a sequence whenever a track event is triggered
-    virtual void NotifyTrackEventListeners(const char* eventName, const char* valueName, IUiAnimSequence* pSequence) = 0;
-
-#ifdef UI_ANIMATION_SYSTEM_SUPPORT_EDITING
-    virtual EUiAnimNodeType GetNodeTypeFromString(const char* pString) const = 0;
-    virtual CUiAnimParamType GetParamTypeFromString(const char* pString) const = 0;
-#endif
-
-    // </interfuscator:shuffle>
-};
-
-inline void SUiAnimContext::Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading)
-{
-    if (bLoading)
-    {
-        XmlString name;
-        if (xmlNode->getAttr("sequence", name))
-        {
-            pSequence = animationSystem->FindSequence(name.c_str());
-        }
-        xmlNode->getAttr("dt", dt);
-        xmlNode->getAttr("fps", fps);
-        xmlNode->getAttr("time", time);
-        xmlNode->getAttr("bSingleFrame", bSingleFrame);
-        xmlNode->getAttr("bResetting", bResetting);
-        xmlNode->getAttr("trackMask", trackMask);
-        xmlNode->getAttr("startTime", startTime);
-    }
-    else
-    {
-        if (pSequence)
-        {
-            string fullname = pSequence->GetName();
-            xmlNode->setAttr("sequence", fullname.c_str());
-        }
-        xmlNode->setAttr("dt", dt);
-        xmlNode->setAttr("fps", fps);
-        xmlNode->setAttr("time", time);
-        xmlNode->setAttr("bSingleFrame", bSingleFrame);
-        xmlNode->setAttr("bResetting", bResetting);
-        xmlNode->setAttr("trackMask", trackMask);
-        xmlNode->setAttr("startTime", startTime);
-    }
-}
-
-void CUiAnimParamType::Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading, const uint version)
-{
-    animationSystem->SerializeParamType(*this, xmlNode, bLoading, version);
-}
-
-void UiAnimParamData::Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading)
-{
-    animationSystem->SerializeParamData(*this, xmlNode, bLoading);
-}
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h
deleted file mode 100644
index 672eed2894..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-// Forward declarations
-class ISprite;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to be notified of changes to the sprite settings
-class UiSpriteSettingsChangeNotification
-    : public AZ::EBusTraits
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    /**
-        * Overrides the default AZ::EBusTraits address policy so that the bus
-        * has multiple addresses at which to receive messages. This bus is 
-        * identified by Sprite pointer. Messages addressed to an ID are received by 
-        * handlers connected to that ID.
-        */
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-    /**
-        * Overrides the default AZ::EBusTraits ID type so that Sprite pointers are 
-        * used to access the addresses of the bus.
-        */
-    typedef ISprite* BusIdType;
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual ~UiSpriteSettingsChangeNotification() {}
-
-    //! Called when the sprite settings such as number of cells etc change
-    virtual void OnSpriteSettingsChanged() = 0;
-};
-
-typedef AZ::EBus<UiSpriteSettingsChangeNotification> UiSpriteSettingsChangeNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Notify listeners when sprite image sources change.
-class UiSpriteSourceNotificationInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiSpriteSourceNotificationInterface() {}
-
-    //! A sprite image (or sequence of images) has changed file sources.
-    virtual void OnSpriteSourceChanged() = 0;
-};
-
-typedef AZ::EBus<UiSpriteSourceNotificationInterface> UiSpriteSourceNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h
deleted file mode 100644
index 69ecea5bbf..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Component/Component.h>
-#include <AzCore/Slice/SliceComponent.h>
-#include <AzCore/Serialization/ObjectStream.h>
-
-namespace AZ
-{
-    namespace IO
-    {
-        class FileIOStream;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus interface for tools to talk to the LyShine system
-//! It is valid to use this bus from resource compilers or the UI Editor
-class UiSystemToolsInterface
-    : public AZ::EBusTraits
-{
-public: // types
-
-    class CanvasAssetHandle
-    {
-    public:
-        virtual ~CanvasAssetHandle() {};
-    };
-
-public:
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-    using MutexType = AZStd::recursive_mutex;
-
-    // Public functions
-
-    //! Load a canvas but do not init or activate the entities
-    //! The CanvasAssetHandle is an opaque pointer only valid to be passed to the
-    //! methods below.
-    virtual CanvasAssetHandle* LoadCanvasFromStream(AZ::IO::GenericStream& stream, const AZ::ObjectStream::FilterDescriptor& filterDesc) = 0;
-
-    //! Save a canvas to a stream
-    virtual void SaveCanvasToStream(CanvasAssetHandle* canvas, AZ::IO::FileIOStream& stream) = 0;
-
-    //! Get the slice component for a loaded canvas
-    virtual AZ::SliceComponent* GetRootSliceSliceComponent(CanvasAssetHandle* canvas) = 0;
-
-    //! Get the slice entity for a loaded canvas
-    virtual AZ::Entity* GetRootSliceEntity(CanvasAssetHandle* canvas) = 0;
-
-    //! Get the canvas entity for a loaded canvas
-    virtual AZ::Entity* GetCanvasEntity(CanvasAssetHandle* canvas) = 0;
-
-    //! Replace the slice component with a new one. The old slice component is not deleted.
-    //! The client is responsible for that.
-    virtual void ReplaceRootSliceSliceComponent(CanvasAssetHandle* canvas, AZ::SliceComponent* newSliceComponent) = 0;
-
-    //! Replace the canvas entity with a new one. The old canvas entity is not deleted.
-    //! The client is responsible for that.
-    virtual void ReplaceCanvasEntity(CanvasAssetHandle* canvas, AZ::Entity* newCanvasEntity) = 0;
-    
-    //! Delete the canvas file object and its canvas entity and slice entity.
-    virtual void DestroyCanvas(CanvasAssetHandle* canvas) = 0;
-};
-
-using UiSystemToolsBus = AZ::EBus<UiSystemToolsInterface>;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiAnimateEntityBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiAnimateEntityBus.h
deleted file mode 100644
index 8465165056..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiAnimateEntityBus.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-// Forward declarations
-class ISprite;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiAnimateEntityInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiAnimateEntityInterface() {}
-
-    //! Called when the animation system has updated the data members of an entity's components
-    virtual void PropertyValuesChanged() = 0;
-
-public: // static member data
-
-    //! More than one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-};
-
-typedef AZ::EBus<UiAnimateEntityInterface> UiAnimateEntityBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiAnimationBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiAnimationBus.h
deleted file mode 100644
index 63d0e4d84a..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiAnimationBus.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-#include <LyShine/Animation/IUiAnimation.h>
-
-struct IUiAnimNode;
-
-namespace AZ
-{
-    class Entity;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiAnimNodeInterface
-    : public AZ::EBusTraits
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-    typedef IUiAnimNode* BusIdType;
-    //! Only one implementation for an IAnimNode* can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiAnimNodeInterface() {}
-
-    virtual AZ::EntityId GetAzEntityId() = 0;
-    virtual void SetAzEntity(AZ::Entity* entity) = 0;
-};
-
-typedef AZ::EBus<UiAnimNodeInterface> UiAnimNodeBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiAnimationInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiAnimationInterface() {}
-
-    //! Start a sequence
-    virtual void StartSequence(const AZStd::string& sequenceName) = 0;
-
-    //! Play a sequence from startTime to endTime
-    virtual void PlaySequenceRange(const AZStd::string& sequenceName, float startTime, float endTime) = 0;
-
-    //! Stop a sequence
-    virtual void StopSequence(const AZStd::string& sequenceName) = 0;
-
-    //! Abort a sequence
-    virtual void AbortSequence(const AZStd::string& sequenceName) = 0;
-
-    //! Pause a sequence
-    virtual void PauseSequence(const AZStd::string& sequenceName) = 0;
-
-    //! Resume a sequence
-    virtual void ResumeSequence(const AZStd::string& sequenceName) = 0;
-
-    //! Reset a sequence
-    virtual void ResetSequence(const AZStd::string& sequenceName) = 0;
-
-    //! Get the speed of a sequence
-    virtual float GetSequencePlayingSpeed(const AZStd::string& sequenceName) = 0;
-
-    //! Set the speed of a sequence
-    virtual void SetSequencePlayingSpeed(const AZStd::string& sequenceName, float speed) = 0;
-
-    //! Get the current time of a sequence
-    virtual float GetSequencePlayingTime(const AZStd::string& sequenceName) = 0;
-
-    //! Get whether a sequence is currently playing
-    virtual bool IsSequencePlaying(const AZStd::string& sequenceName) = 0;
-    
-    //! Get the length of a sequence in seconds
-    virtual float GetSequenceLength(const AZStd::string& sequenceName) = 0;
-
-    //! Set the behavior a sequence will exhibit when it stops playing
-    virtual void SetSequenceStopBehavior(IUiAnimationSystem::ESequenceStopBehavior stopBehavior) = 0;
-    
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiAnimationInterface> UiAnimationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiAnimationNotifications
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiAnimationNotifications(){}
-
-    //! Called on an animation event
-    virtual void OnUiAnimationEvent(IUiAnimationListener::EUiAnimationEvent uiAnimationEvent, AZStd::string animSequenceName) = 0;
-
-    //! Called on animation track event triggered
-    virtual void OnUiTrackEvent(AZStd::string eventName, AZStd::string valueName, AZStd::string animSequenceName) {}
-};
-
-typedef AZ::EBus<UiAnimationNotifications> UiAnimationNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiButtonBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiButtonBus.h
deleted file mode 100644
index 11e3dd3724..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiButtonBus.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/UiBase.h>
-
-class ISprite;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiButtonInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    typedef AZStd::function<void(AZ::EntityId, AZ::Vector2)> OnClickCallback;
-
-public: // member functions
-
-    virtual ~UiButtonInterface() {}
-
-    //! Get the on-click callback
-    virtual OnClickCallback GetOnClickCallback() = 0;
-
-    //! Set the on-click callback
-    virtual void SetOnClickCallback(OnClickCallback onClick) = 0;
-
-    //! Get the action name
-    virtual const LyShine::ActionName& GetOnClickActionName() = 0;
-
-    //! Set the action name
-    virtual void SetOnClickActionName(const LyShine::ActionName& actionName) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiButtonInterface> UiButtonBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiButtonNotifications
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiButtonNotifications() {}
-
-    //! Notify listeners that the button was clicked
-    virtual void OnButtonClick() {}
-};
-
-typedef AZ::EBus<UiButtonNotifications> UiButtonNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasBus.h
deleted file mode 100644
index 0c278ea87a..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasBus.h
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Matrix4x4.h>
-#include <AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h>
-#include <AzFramework/Input/User/LocalUserId.h>
-#include <LyShine/UiBase.h>
-
-// Forward declarations
-struct IUiAnimationSystem;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiCanvasInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    enum class ErrorCode
-    {
-        NoError,
-        PrefabContainsExternalEntityRefs
-    };
-
-public: // member functions
-
-    //! Deleting a canvas will delete all its child elements recursively and all of their components
-    virtual ~UiCanvasInterface() {}
-
-    //! Get the asset ID path name of this canvas. If not loaded or saved yet this will be ""
-    virtual const AZStd::string& GetPathname() = 0;
-
-    //! Get the ID of this canvas. This will remain the same while this canvas is loaded.
-    virtual LyShine::CanvasId GetCanvasId() = 0;
-
-    //! Get the unique ID of this canvas
-    virtual AZ::u64 GetUniqueCanvasId() = 0;
-
-    //! Get the draw order of this canvas. Rendering is back-to-front, so higher numbers render in front of lower numbers.
-    virtual int GetDrawOrder() = 0;
-
-    //! Set the draw order of this canvas. Rendering is back-to-front, so higher numbers render in front of lower numbers.
-    virtual void SetDrawOrder(int drawOrder) = 0;
-
-    //! Get the flag indicating if this canvas will stay loaded through a level unload.
-    virtual bool GetKeepLoadedOnLevelUnload() = 0;
-
-    //! Set the flag indicating if this canvas will stay loaded through a level unload.
-    virtual void SetKeepLoadedOnLevelUnload(bool keepLoaded) = 0;
-
-    //! Force a layout recompute. Layouts marked for a recompute are handled on the canvas update,
-    //! so this can be used if an immediate recompute is desired
-    virtual void RecomputeChangedLayouts() = 0;
-
-    //! Get the number child elements of this canvas
-    virtual int GetNumChildElements() = 0;
-
-    //! Get the specified child element, index must be less than GetNumChildElements()
-    virtual AZ::Entity* GetChildElement(int index) = 0;
-
-    //! Get the specified child entity Id, index must be less than GetNumChildElements()
-    virtual AZ::EntityId GetChildElementEntityId(int index) = 0;
-
-    //! Get the child elements of this canvas
-    virtual LyShine::EntityArray GetChildElements() = 0;
-
-    //! Get the child entity Ids of this canvas
-    virtual AZStd::vector<AZ::EntityId> GetChildElementEntityIds() = 0;
-
-    //! Create a new element that is a child of the canvas, the canvas has ownership of the child
-    virtual AZ::Entity* CreateChildElement(const LyShine::NameType& name) = 0;
-
-    //! Return the element on this canvas with the given id or nullptr if no match
-    virtual AZ::Entity* FindElementById(LyShine::ElementId id) = 0;
-
-    //! Return the first element on this canvas with the given name or nullptr if no match
-    virtual AZ::Entity* FindElementByName(const LyShine::NameType& name) = 0;
-
-    //! Return the first element on this canvas with the given name or nullptr if no match
-    virtual AZ::EntityId FindElementEntityIdByName(const LyShine::NameType& name) = 0;
-
-    //! Find all elements on this canvas with the given name
-    virtual void FindElementsByName(const LyShine::NameType& name, LyShine::EntityArray& result) = 0;
-
-    //! Return the element with the given hierarchical name or nullptr if no match
-    //! \param name, a hierarchical name relative to the root with '/' as the separator
-    virtual AZ::Entity* FindElementByHierarchicalName(const LyShine::NameType& name) = 0;
-
-    //! Find all elements on this canvas matching the predicate
-    virtual void FindElements(AZStd::function<bool(const AZ::Entity*)> predicate, LyShine::EntityArray& result) = 0;
-
-    //! Get the front-most element whose bounds include the given point in canvas space
-    //! \return nullptr if no match
-    virtual AZ::Entity* PickElement(AZ::Vector2 point) = 0;
-
-    //! Get all element whose bounds intersect with the given box in canvas space
-    //! \return empty EntityArray if no match
-    virtual LyShine::EntityArray PickElements(const AZ::Vector2& bound0, const AZ::Vector2& bound1) = 0;
-
-    //! Look for an entity with interactable component to handle an event at given point
-    virtual AZ::EntityId FindInteractableToHandleEvent(AZ::Vector2 point) = 0;
-
-    //! Save this canvas to the given path in XML
-    //! \return true if no error
-    virtual bool SaveToXml(const string& assetIdPathname, const string& sourceAssetPathname) = 0;
-
-    //! Save the given UI element entity to the given path as a prefab
-    //! \param pathname the path to save the prefab to
-    //! \param entity   pointer to the entity to save as a prefab
-    //! \return true if no error
-    virtual bool SaveAsPrefab(const string& pathname, AZ::Entity* entity) = 0;
-
-    //! Check if it is OK to save the given UI element entity to the given path as a prefab
-    //! \param entity   pointer to the entity to save as a prefab
-    //! \return errorCode which is NoError if OK to save
-    virtual ErrorCode CheckElementValidToSaveAsPrefab(AZ::Entity* entity) = 0;
-
-    //! Load a prefab element from the given file and optionally insert as child of given entity
-    //! \return the top level entity created
-    virtual AZ::Entity* LoadFromPrefab(const string& pathname,
-        bool makeUniqueName,
-        AZ::Entity* optionalInsertionPoint) = 0;
-
-    //! Initialize a set of entities that have been added to the canvas
-    //! Used when instantiating a slice or for undo/redo, copy/paste
-    //! \param topLevelEntities - The elements that were created
-    //! \param makeUniqueNamesAndIds If false the entity names and ElementIds in the string are kept, else unique ones are generated
-    //! \param insertionPoint The parent element for the created elements, if nullptr the root element is the parent
-    virtual void FixupCreatedEntities(LyShine::EntityArray topLevelEntities, bool makeUniqueNamesAndIds, AZ::Entity* optionalInsertionPoint) = 0;
-
-    //! Add an existing entity to the canvas (only for internal use from editor)
-    //! \param element      The newly created element to add to the canvas
-    //! \param parent       The parent element for the created element, if nullptr the root element is the parent
-    //! \param insertBefore The sibling element to place this element before, if nullptr then add as last child
-    virtual void AddElement(AZ::Entity* element, AZ::Entity* parent, AZ::Entity* insertBefore) = 0;
-
-    //! Go through all elements in the canvas and reinitialize them
-    //! This is done whenever a slice asset changes and the entity context is rebuilt from the root slice asset
-    virtual void ReinitializeElements() = 0;
-
-    //! Save this canvas to an XML string
-    //! \return the resulting string
-    virtual AZStd::string SaveToXmlString() = 0;
-
-    //! Get an element name that is unique to the children of the specified parent and to an optional array of elements
-    //! \param parentEntityId   The entityId of the parent who's children's names must not match the returned name
-    //! \param baseName         The name to append a unique identifier to
-    //! \param includedChildren An array of any other elements who's names must not match the returned name
-    //! \return Unique name that does not match the specified parent's children or the optional array of children
-    virtual AZStd::string GetUniqueChildName(AZ::EntityId parentEntityId, AZStd::string baseName, const LyShine::EntityArray* includeChildren) = 0;
-
-    //! Clone an element and add it to this canvas as a child of the given parent element
-    //! The entity and all its components/children are cloned and new IDs are generated
-    //! NOTE: Only state that is persistent/reflected is cloned
-    //! \param sourceEntity The entity to clone
-    //! \param parentEntity The parent element for the created elements, if nullptr the root element is the parent
-    //! \return The new entity
-    virtual AZ::Entity* CloneElement(AZ::Entity* sourceEntity, AZ::Entity* parentEntity) = 0;
-
-    //! Clone an element and add it to this canvas as a child of the given parent element
-    //! The entity and all its components/children are cloned and new IDs are generated
-    //! NOTE: Only state that is persistent/reflected is cloned
-    //! \param sourceEntity The entity to clone (may be from a different canvas)
-    //! \param parentEntity The parent element for the created elements, if invalid the root element is the parent
-    //! \param insertBefore The child of the parent element that the new element should be inserted before, if invalid the new element is the last child element
-    //! \return The new entity
-    virtual AZ::EntityId CloneElementEntityId(AZ::EntityId sourceEntity, AZ::EntityId parentEntity, AZ::EntityId insertBefore) = 0;
-
-    //! Create a clone of this canvas entity
-    //! \param canvasSize The resolution to display the canvas at
-    virtual AZ::Entity* CloneCanvas(const AZ::Vector2& canvasSize) = 0;
-
-    //! Set the transformation from canvas space to viewport space
-    virtual void SetCanvasToViewportMatrix(const AZ::Matrix4x4& matrix) = 0;
-
-    //! Get the transformation from canvas space to viewport space
-    virtual const AZ::Matrix4x4& GetCanvasToViewportMatrix() = 0;
-
-    //! Get the transformation from viewport space to canvas space
-    virtual void GetViewportToCanvasMatrix(AZ::Matrix4x4& matrix) = 0;
-
-    //! Returns the "target" size of the canvas (in pixels)
-    //
-    //! The target canvas size changes depending on whether you're running in
-    //! the UI Editor or in-game. While in-game, we assume that the canvas size
-    //! fills the screen, so the target canvas size is the size of the viewport.
-    //
-    //! When using the editor, however, the target size is the "authored" size of
-    //! the canvas. The canvas is authored in one resolution, but it may be
-    //! displayed by the game at whatever the game resolution is set to.
-    virtual AZ::Vector2 GetCanvasSize() = 0;
-
-    //! Set the authored size of the canvas (in pixels)
-    virtual void SetCanvasSize(const AZ::Vector2& canvasSize) = 0;
-
-    //! Set the target size of the canvas (in pixels)
-    //!
-    //! This should be called before the UpdateCanvas and RenderCanvas methods.
-    //! When running in game in full screen mode the target canvas size should be set to the viewport size
-    virtual void SetTargetCanvasSize(bool isInGame, const AZ::Vector2& targetCanvasSize) = 0;
-
-    //! Get scale to adjust for the difference between canvas size (authored size)
-    //! and the viewport size (target canvas size) when running on current device
-    virtual AZ::Vector2 GetDeviceScale() = 0;
-
-    //! Get flag that indicates whether visual element's vertices should snap to the nearest pixel
-    virtual bool GetIsPixelAligned() = 0;
-
-    //! Set flag that indicates whether visual element's vertices should snap to the nearest pixel
-    virtual void SetIsPixelAligned(bool isPixelAligned) = 0;
-
-    //! Get flag that indicates whether text should snap to the nearest pixel
-    virtual bool GetIsTextPixelAligned() = 0;
-
-    //! Set flag that indicates whether text should snap to the nearest pixel
-    virtual void SetIsTextPixelAligned(bool isTextPixelAligned) = 0;
-
-    //! Get the animation system for this canvas
-    virtual IUiAnimationSystem* GetAnimationSystem() = 0;
-
-    //! Get flag that governs whether the canvas is enabled
-    //
-    //! A canvas that's enabled will be updated and rendered each frame.
-    virtual bool GetEnabled() = 0;
-
-    //! Set flag that governs whether the canvas is enabled
-    //
-    //! A canvas that's enabled will be updated and rendered each frame.
-    virtual void SetEnabled(bool enabled) = 0;
-
-    //! Get flag that controls whether the canvas is rendering to a texture
-    virtual bool GetIsRenderToTexture() = 0;
-
-    //! Set flag that controls whether the canvas is rendering to a texture
-    virtual void SetIsRenderToTexture(bool isRenderToTexture) = 0;
-
-    //! Get the render target name that this canvas will render to
-    virtual AZStd::string GetRenderTargetName() = 0;
-
-    //! Set the render target name that this canvas will render to
-    virtual void SetRenderTargetName(const AZStd::string& name) = 0;
-
-    //! Get flag that controls whether this canvas automatically handles positional input (mouse/touch)
-    virtual bool GetIsPositionalInputSupported() = 0;
-
-    //! Set flag that controls whether this canvas automatically handles positional input (mouse/touch)
-    virtual void SetIsPositionalInputSupported(bool isSupported) = 0;
-
-    //! Get flag that controls whether this canvas consumes all input events while it is enabled
-    virtual bool GetIsConsumingAllInputEvents() = 0;
-
-    //! Set flag that controls whether this canvas consumes all input events while it is enabled
-    virtual void SetIsConsumingAllInputEvents(bool isConsuming) = 0;
-
-    //! Get flag that controls whether this canvas automatically handles multi-touch input
-    virtual bool GetIsMultiTouchSupported() = 0;
-
-    //! Set flag that controls whether this canvas automatically handles multi-touch input
-    virtual void SetIsMultiTouchSupported(bool isSupported) = 0;
-
-    //! Get flag that controls whether this canvas automatically handles navigation input (via keyboard/gamepad)
-    virtual bool GetIsNavigationSupported() = 0;
-
-    //! Set flag that controls whether this canvas automatically handles navigation input (via keyboard/gamepad)
-    virtual void SetIsNavigationSupported(bool isSupported) = 0;
-
-    //! Get the analog (eg. thumb-stick) input value that must be exceeded before a navigation command will be processed
-    virtual float GetNavigationThreshold() = 0;
-
-    //! Set the analog (eg. thumb-stick) input value that must be exceeded before a navigation command will be processed
-    virtual void SetNavigationThreshold(float navigationThreshold) = 0;
-
-    //! Get the delay (milliseconds) before a held navigation command will begin repeating
-    virtual AZ::u64 GetNavigationRepeatDelay() = 0;
-
-    //! Set the delay (milliseconds) before a held navigation command will begin repeating
-    virtual void SetNavigationRepeatDelay(AZ::u64 navigationRepeatDelay) = 0;
-
-    //! Get the delay (milliseconds) before a held navigation command will continue repeating
-    virtual AZ::u64 GetNavigationRepeatPeriod() = 0;
-
-    //! Set the delay (milliseconds) before a held navigation command will continue repeating
-    virtual void SetNavigationRepeatPeriod(AZ::u64 navigationRepeatPeriod) = 0;
-
-    //! Get the local user id that is being used to filter incoming input events
-    virtual AzFramework::LocalUserId GetLocalUserIdInputFilter() = 0;
-
-    //! Set the local user id that will be used to filter incoming input events
-    virtual void SetLocalUserIdInputFilter(AzFramework::LocalUserId localUserId) = 0;
-
-    //! Handle an input event for the canvas
-    virtual bool HandleInputEvent(const AzFramework::InputChannel::Snapshot& inputSnapshot,
-        const AZ::Vector2* viewportPos = nullptr,
-        AzFramework::ModifierKeyMask activeModifierKeys = AzFramework::ModifierKeyMask::None) = 0;
-
-    //! Handle a unicode text event for the canvas
-    virtual bool HandleTextEvent(const AZStd::string& textUTF8) = 0;
-
-    //! Handle a positional input event for the canvas, this could come from
-    //! a ray cast intersection for example
-    virtual bool HandleInputPositionalEvent(const AzFramework::InputChannel::Snapshot& inputSnapshot, AZ::Vector2 viewportPos) = 0;
-
-    //! Get the mouse position of the last input event
-    virtual AZ::Vector2 GetMousePosition() = 0;
-
-    //! Get the element to be displayed when hovering over an interactable
-    virtual AZ::EntityId GetTooltipDisplayElement() = 0;
-
-    //! Set the element to be displayed when hovering over an interactable
-    virtual void SetTooltipDisplayElement(AZ::EntityId entityId) = 0;
-
-    //! Force the active interactable for the canvas to be the given one,
-    //! also force AutoActivation of interactable,
-    //! intended for internal use by UI components
-    virtual void ForceFocusInteractable(AZ::EntityId interactableId) = 0;
-
-    //! Force the active interactable for the canvas to be the given one,
-    //! also set last mouse pos to point,
-    //! intended for internal use by UI components
-    virtual void ForceActiveInteractable(AZ::EntityId interactableId, bool shouldStayActive, AZ::Vector2 point) = 0;
-
-    //! Get the hover interactable
-    virtual AZ::EntityId GetHoverInteractable() = 0;
-
-    //! Force the hover interactable for the canvas to be the given one, this can be useful when using
-    //! keyboard/gamepad navigation and the current hover interactable is deleted by a script and the script
-    //! wants to specify the new hover interactable
-    virtual void ForceHoverInteractable(AZ::EntityId interactableId) = 0;
-
-    //! Clear all active interactables, and all hover interactables if last input was positional (mouse/touch).
-    //! This is intended for internal use by UI components
-    virtual void ClearAllInteractables() = 0;
-
-    //! Generate Enter pressed/released input events on an interactable.
-    //! Useful for automated testing to simulate button clicks
-    virtual void ForceEnterInputEventOnInteractable(AZ::EntityId interactableId) = 0;
-
-public: // static member data
-
-    //! Only one component on an entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiCanvasInterface> UiCanvasBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! The canvas component implements this bus and it is provided for C++ implementations of
-//! UI components to use to talk to the canvas
-class UiCanvasComponentImplementationInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiCanvasComponentImplementationInterface() {}
-
-    //! Mark the render graph for the canvas as dirty. This will cause the render graph to get
-    //! cleared and rebuilt on the next render.
-    virtual void MarkRenderGraphDirty() = 0;
-
-public: // static member data
-
-    //! Only one component on an entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiCanvasComponentImplementationInterface> UiCanvasComponentImplementationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to be notified of canvas actions
-class UiCanvasActionNotification
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiCanvasActionNotification(){}
-
-    //! Called when the canvas sends an action to the listener
-    virtual void OnAction(AZ::EntityId entityId, const LyShine::ActionName& actionName) = 0;
-};
-
-typedef AZ::EBus<UiCanvasActionNotification> UiCanvasNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to be notified when the draw order of any
-//! canvas changes
-class UiCanvasOrderNotification
-    : public AZ::EBusTraits
-{
-public: // member functions
-
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-    virtual ~UiCanvasOrderNotification(){}
-
-    //! Called when the draw order setting for a canvas changes
-    //! Note this is used to update the order in the UiCanvasManager so that
-    //! order has not been updated when this fires.
-    virtual void OnCanvasDrawOrderChanged(AZ::EntityId canvasEntityId) = 0;
-};
-
-typedef AZ::EBus<UiCanvasOrderNotification> UiCanvasOrderNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to be notified when any canvas has been
-//! enabled or disabled
-class UiCanvasEnabledStateNotification
-    : public AZ::EBusTraits
-{
-public: // member functions
-
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-    virtual ~UiCanvasEnabledStateNotification() {}
-
-    //! Called when the canvas was enabled or disabled
-    virtual void OnCanvasEnabledStateChanged(AZ::EntityId canvasEntityId, bool enabled) = 0;
-};
-
-typedef AZ::EBus<UiCanvasEnabledStateNotification> UiCanvasEnabledStateNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to be notified of canvas size or scale changes
-class UiCanvasSizeNotification
-    : public AZ::EBusTraits
-{
-public:
-    virtual ~UiCanvasSizeNotification() {}
-
-    //! Called when the target canvas size or uniform device scale changes.
-    virtual void OnCanvasSizeOrScaleChange(AZ::EntityId canvasEntityId) = 0;
-};
-
-typedef AZ::EBus<UiCanvasSizeNotification> UiCanvasSizeNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to be notified of changes to the canvas
-//! pixel alignment settings
-class UiCanvasPixelAlignmentNotification
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiCanvasPixelAlignmentNotification() {}
-
-    //! Called when the pixel alignment setting for the canvas changes
-    virtual void OnCanvasPixelAlignmentChange() {}
-
-    //! Called when the text pixel alignment setting for the canvas changes
-    virtual void OnCanvasTextPixelAlignmentChange() {}
-};
-
-typedef AZ::EBus<UiCanvasPixelAlignmentNotification> UiCanvasPixelAlignmentNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to be notified of canvas input.
-//! Note that interactables already get methods called on them when they themselves are interacted
-//! with. This notification bus is intended for other entities or Lua to know when some other
-//! entities are interacted with.
-class UiCanvasInputNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiCanvasInputNotifications() {}
-
-    //! Called when an element is pressed. Will return an invalid entity id if no interactable was
-    //! pressed.
-    virtual void OnCanvasPrimaryPressed([[maybe_unused]] AZ::EntityId entityId) {};
-
-    //! Called when an element is released. The released entity that is sent is the entity that was
-    //! active (if any).
-    virtual void OnCanvasPrimaryReleased([[maybe_unused]] AZ::EntityId entityId) {};
-
-    //! Called when an element is pressed. Will be an invalid entity id if no interactable was
-    //! pressed.
-    virtual void OnCanvasMultiTouchPressed([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int multiTouchIndex) {};
-
-    //! Called when an element is released. The released entity that is sent is the entity that was
-    //! active (if any).
-    virtual void OnCanvasMultiTouchReleased([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int multiTouchIndex) {};
-
-    //! Called when an element starts being hovered
-    virtual void OnCanvasHoverStart([[maybe_unused]] AZ::EntityId entityId) {};
-
-    //! Called when an element ends being hovered
-    virtual void OnCanvasHoverEnd([[maybe_unused]] AZ::EntityId entityId) {};
-
-    //! Called when the enter key is pressed
-    virtual void OnCanvasEnterPressed([[maybe_unused]] AZ::EntityId entityId) {};
-
-    //! Called when the enter key is released
-    virtual void OnCanvasEnterReleased([[maybe_unused]] AZ::EntityId entityId) {};
-};
-
-typedef AZ::EBus<UiCanvasInputNotifications> UiCanvasInputNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasManagerBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasManagerBus.h
deleted file mode 100644
index c964518c61..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasManagerBus.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzFramework/Input/User/LocalUserId.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiCanvasManagerInterface
-    : public AZ::EBusTraits
-{
-public: // types
-
-    typedef std::vector<AZ::EntityId> CanvasEntityList;
-
-public:
-    //! Create a canvas
-    virtual AZ::EntityId CreateCanvas() = 0;
-
-    //! Load a canvas
-    virtual AZ::EntityId LoadCanvas(const AZStd::string& canvasPathname) = 0;
-
-    //! Unload a canvas
-    virtual void UnloadCanvas(AZ::EntityId canvasEntityId) = 0;
-
-    //! Find a canvas by path, optionally load the canvas if it was not found
-    virtual AZ::EntityId FindLoadedCanvasByPathName(const AZStd::string& canvasPathname, bool loadIfNotFound = false) = 0;
-
-    //! Get a list of canvases that are loaded in game, this is sorted by draw order
-    virtual CanvasEntityList GetLoadedCanvases() = 0;
-
-    //! Set the local user id that will be used to filter incoming input events for all canvases.
-    //! Can be overriden for an individual canvas using UiCanvasInterface::SetLocalUserIdInputFilter.
-    virtual void SetLocalUserIdInputFilterForAllCanvases(AzFramework::LocalUserId localUserId) = 0;
-};
-typedef AZ::EBus<UiCanvasManagerInterface> UiCanvasManagerBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to be notified of canvas manager changes
-class UiCanvasManagerNotification
-    : public AZ::EBusTraits
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual ~UiCanvasManagerNotification() {}
-
-    //! Called when a canvas has been loaded
-    virtual void OnCanvasLoaded([[maybe_unused]] AZ::EntityId canvasEntityId) {}
-
-    //! Called when a canvas has been unloaded/destroyed
-    virtual void OnCanvasUnloaded([[maybe_unused]] AZ::EntityId canvasEntityId) {}
-
-    //! Called when a canvas has been reloaded (due to hot-loading)
-    //! For a hot-load, the OnCanvasLoaded/OnCanvasUnloaded notifications are not sent - only this one is
-    virtual void OnCanvasReloaded([[maybe_unused]] AZ::EntityId canvasEntityId) {}
-};
-
-typedef AZ::EBus<UiCanvasManagerNotification> UiCanvasManagerNotificationBus;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h
deleted file mode 100644
index ce4eb37f4a..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Elements that require update notifications should connect to this bus using the entity id of their
-//! containing canvas.
-class UiCanvasUpdateNotification
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiCanvasUpdateNotification() {}
-
-    //! Update the component. This is called when the game is running.
-    //! It is different from the TickBus in that it is called only when the canvas is updated.
-    //! So it is not called if the canvas is disabled.
-    virtual void Update(float deltaTime) = 0;
-
-    //! Update the component while in the editor.
-    //! This is called every frame when in the editor and the game is NOT running.
-    virtual void UpdateInEditor(float /*deltaTime*/) {}
-
-public: // static member data
-
-    //! Multiple components on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-};
-
-typedef AZ::EBus<UiCanvasUpdateNotification> UiCanvasUpdateNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCheckboxBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiCheckboxBus.h
deleted file mode 100644
index c9fddd2be9..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiCheckboxBus.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiCheckboxInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! params: sending entity id, new state
-    typedef AZStd::function<void(AZ::EntityId, AZ::Vector2, bool)> StateChangeCallback;
-
-public: // member functions
-
-    virtual ~UiCheckboxInterface() {}
-
-    //! Query the state of the checkbox
-    //! \return     The current state for the checkbox.
-    virtual bool GetState() = 0;
-
-    //! Manually override the state of the checkbox
-    //! \param isOn     The new desired state of the checkbox.
-    virtual void SetState(bool checked) = 0;
-
-    //! Toggle the state of the checkbox
-    //! \return     The new state of the checkbox.
-    virtual bool ToggleState() = 0;
-
-    //! Get the state change callback
-    virtual StateChangeCallback GetStateChangeCallback() = 0;
-
-    //! Set the state change callback
-    virtual void SetStateChangeCallback(StateChangeCallback onChange) = 0;
-
-    //! Set the optional checked (ON) entity
-    virtual void SetCheckedEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional checked (ON) entity
-    virtual AZ::EntityId GetCheckedEntity() = 0;
-
-    //! Set the optional unchecked (OFF) entity
-    virtual void SetUncheckedEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional unchecked (OFF) entity
-    virtual AZ::EntityId GetUncheckedEntity() = 0;
-
-    //! Get the action triggered when turned on
-    virtual const LyShine::ActionName& GetTurnOnActionName() = 0;
-
-    //! Set the action triggered when turned on
-    virtual void SetTurnOnActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the action triggered when turned off
-    virtual const LyShine::ActionName& GetTurnOffActionName() = 0;
-
-    //! Set the action triggered when turned off
-    virtual void SetTurnOffActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the action triggered when changed
-    virtual const LyShine::ActionName& GetChangedActionName() = 0;
-
-    //! Set the action triggered when changed
-    virtual void SetChangedActionName(const LyShine::ActionName& actionName) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiCheckboxInterface> UiCheckboxBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiCheckboxNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiCheckboxNotifications() {}
-
-    //! Notify listeners that the checkbox state has changed
-    virtual void OnCheckboxStateChange([[maybe_unused]] bool checked) {}
-};
-
-typedef AZ::EBus<UiCheckboxNotifications> UiCheckboxNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiCursorBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiCursorBus.h
deleted file mode 100644
index 09c3155f23..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiCursorBus.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-#include <AzCore/Math/Vector2.h>
-
-class UiCursorInterface
-    : public AZ::EBusTraits
-{
-public:
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-    // Public functions
-
-    //! Increment the UI Cursor visible counter.
-    //! Should be paired with a call to DecrementVisibleCounter.
-    virtual void IncrementVisibleCounter() = 0;
-
-    //! Decrement the UI Cursor visible counter.
-    //! Should be paired with a call to IncrementVisibleCounter.
-    virtual void DecrementVisibleCounter() = 0;
-
-    //! Query whether the UI Cursor is currently visible
-    virtual bool IsUiCursorVisible() = 0;
-
-    //! Set the UI cursor image.
-    virtual void SetUiCursor(const char* cursorImagePath) = 0;
-
-    //! Get the UI cursor position (in pixels) relative
-    //! to the top-left corner of the UI overlay viewport
-    virtual AZ::Vector2 GetUiCursorPosition() = 0;
-};
-
-using UiCursorBus = AZ::EBus<UiCursorInterface>;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDraggableBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiDraggableBus.h
deleted file mode 100644
index 4696e4c103..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiDraggableBus.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiDraggableInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! States that the component can be in during a drag. Lua scripts can switch the state to alert the user
-    enum class DragState
-    {
-        Normal,
-        Valid,
-        Invalid
-    };
-
-public: // member functions
-
-    virtual ~UiDraggableInterface() {}
-
-    //! Get the state of the drag
-    virtual DragState GetDragState() = 0;
-
-    //! Set the state of the drag. This is only relevant during a drag.
-    //! The state affects the visual state of the draggable and can be used to indicate when it is
-    //! over a valid drop target.
-    virtual void SetDragState(DragState dragState) = 0;
-
-    //! Redo the drag, this is not usually needed but if a UiDraggableNotificationBus handler causes
-    //! drop targets to move, and keyboard or console navigation is being used, it can be needed.
-    //! In that case the handler should call this method after moving drop targets.
-    virtual void RedoDrag(AZ::Vector2 point) = 0;
-
-    //! Set this draggable element to be a proxy for another draggable element and start a drag on
-    //! this draggable element at the specified point
-    virtual void SetAsProxy(AZ::EntityId originalDraggableId, AZ::Vector2 point) = 0;
-
-    //! Conclude the drag of a proxy. This should be called from the OnDragEnd callback of the proxy and
-    //! will result in calling OnDragEnd on the draggable element that this is a proxy for
-    virtual void ProxyDragEnd(AZ::Vector2 point) = 0;
-        
-    //! Check if this draggable element is a proxy
-    virtual bool IsProxy() = 0;
-
-    //! Get the original draggable element that this element is a proxy for
-    //! Returns an invalid entity id if this is not a proxy
-    virtual AZ::EntityId GetOriginalFromProxy() = 0;
-
-    //! Get the flag that indicates if this draggable can be dropped on any canvas
-    virtual bool GetCanDropOnAnyCanvas() = 0;
-
-    //! Set the flag that indicates if this draggable can be dropped on any canvas
-    virtual void SetCanDropOnAnyCanvas(bool anyCanvas) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiDraggableInterface> UiDraggableBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiDraggableNotifications
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiDraggableNotifications() {}
-
-    //! Called on drag start
-    virtual void OnDragStart(AZ::Vector2 position) = 0;
-
-    //! Called on position change during drag
-    virtual void OnDrag(AZ::Vector2 position) = 0;
-
-    //! Called on drag end
-    virtual void OnDragEnd(AZ::Vector2 position) = 0;
-};
-
-typedef AZ::EBus<UiDraggableNotifications> UiDraggableNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropTargetBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiDropTargetBus.h
deleted file mode 100644
index 42bdb14bcc..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropTargetBus.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiDropTargetInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    using DropState = int;
-    enum
-    {
-        DropStateNormal = 0,
-        DropStateValid,
-        DropStateInvalid,
-
-        NumDropStates
-    };
-
-public: // member functions
-
-    virtual ~UiDropTargetInterface() {}
-
-    //! Get the OnDrop action name
-    virtual const LyShine::ActionName& GetOnDropActionName() = 0;
-
-    //! Set the OnDrop action name
-    virtual void SetOnDropActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Called when mouse/touch enters the bounds of this drop target while dragging a UiDraggableComponent
-    virtual void HandleDropHoverStart(AZ::EntityId draggable) = 0;
-
-    //! Called on the currently drop hovered drop target component when mouse/touch moves outside of bounds
-    virtual void HandleDropHoverEnd(AZ::EntityId draggable) = 0;
-
-    //! Called when a draggable is dropped on this drop target
-    virtual void HandleDrop(AZ::EntityId draggable) = 0;
-
-    //! Get the state of the drop
-    virtual DropState GetDropState() = 0;
-
-    //! Set the state of the drop target.
-    //! The state affects the visual state of the drop target and can be used to indicate when it has
-    //! a valid draggable hovering over it.
-    virtual void SetDropState(DropState dropState) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiDropTargetInterface> UiDropTargetBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiDropTargetNotifications
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiDropTargetNotifications() {}
-
-    //! Called on starting hovering over a drop target
-    virtual void OnDropHoverStart(AZ::EntityId draggable) = 0;
-
-    //! Called on ending hovering over a drop target
-    virtual void OnDropHoverEnd(AZ::EntityId draggable) = 0;
-
-    //! Called on drop
-    virtual void OnDrop(AZ::EntityId draggable) = 0;
-};
-
-typedef AZ::EBus<UiDropTargetNotifications> UiDropTargetNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownBus.h
deleted file mode 100644
index 18994b67d6..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownBus.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! The UI Dropdown Component is an interactable component which displays a list of options when clicked.
-//! In its default state, the dropdown display a simple button, next to an arrow indicating the dropdown
-//! functionality. When the arrow / option is clicked, the dropdown list appears, displaying the options available.
-//! If the list is too long to be displayed, a scrollbar can be added to scroll up and down the list of options.
-class UiDropdownInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiDropdownInterface() {}
-
-    //! Get the currently selected option
-    virtual AZ::EntityId GetValue() = 0;
-
-    //! Set the currently selected option manually
-    virtual void SetValue(AZ::EntityId value) = 0;
-
-    //! Get the content element this dropdown will expand
-    virtual AZ::EntityId GetContent() = 0;
-
-    //! Set the content element this dropdown will expand
-    virtual void SetContent(AZ::EntityId content) = 0;
-
-    //! Get whether this dropdown should expand automatically on hover
-    virtual bool GetExpandOnHover() = 0;
-
-    //! Set whether this dropdown should expand automatically on hover
-    virtual void SetExpandOnHover(bool expandOnHover) = 0;
-
-    //! Get how long to wait before expanding upon hover / collapsing upon exit
-    virtual float GetWaitTime() = 0;
-
-    //! Set how long to wait before expanding upon hover / collapsing upon exit
-    virtual void SetWaitTime(float waitTime) = 0;
-
-    //! Get whether this dropdown should collapse when the user clicks outside
-    virtual bool GetCollapseOnOutsideClick() = 0;
-
-    //! Set whether this dropdown should collapse when the user clicks outside
-    virtual void SetCollapseOnOutsideClick(bool collapseOnOutsideClick) = 0;
-
-    //! Get the element the dropdown content will parent to when expanded (the canvas by default)
-    virtual AZ::EntityId GetExpandedParentId() = 0;
-
-    //! Set the element the dropdown content will parent to when expanded
-    virtual void SetExpandedParentId(AZ::EntityId expandedParentId) = 0;
-
-    //! Get the text element to display to show the currently selected option
-    virtual AZ::EntityId GetTextElement() = 0;
-
-    //! Set the text element to display to show the currently selected option
-    virtual void SetTextElement(AZ::EntityId textElement) = 0;
-
-    //! Get the icon element to display to show the currently selected option
-    virtual AZ::EntityId GetIconElement() = 0;
-
-    //! Set the icon element to display to show the currently selected option
-    virtual void SetIconElement(AZ::EntityId iconElement) = 0;
-
-    //! Expand the dropdown
-    virtual void Expand() = 0;
-
-    //! Collapse the dropdown
-    virtual void Collapse() = 0;
-
-    //! Get the name of the action that is sent when the dropdown is expanded
-    virtual const LyShine::ActionName& GetExpandedActionName() = 0;
-
-    //! Set the name of the action that is sent when the dropdown is expanded
-    virtual void SetExpandedActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the name of the action that is sent when the dropdown is collapsed
-    virtual const LyShine::ActionName& GetCollapsedActionName() = 0;
-
-    //! Set the name of the action that is sent when the dropdown is collapsed
-    virtual void SetCollapsedActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the name of the action that is sent when the dropdown value is changed
-    virtual const LyShine::ActionName& GetOptionSelectedActionName() = 0;
-
-    //! Set the name of the action that is sent when the dropdown value is changed
-    virtual void SetOptionSelectedActionName(const LyShine::ActionName& actionName) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiDropdownInterface> UiDropdownBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiDropdownNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiDropdownNotifications() {}
-
-    //! Notify listeners that the dropdown was expanded
-    virtual void OnDropdownExpanded() {}
-
-    //! Notify listeners that the dropdown was collapsed
-    virtual void OnDropdownCollapsed() {}
-
-    //! Notify listeners that an option was selected
-    virtual void OnDropdownValueChanged([[maybe_unused]] AZ::EntityId option) {}
-};
-
-typedef AZ::EBus<UiDropdownNotifications> UiDropdownNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownOptionBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownOptionBus.h
deleted file mode 100644
index c46a52e207..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownOptionBus.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! The UiDropdownOptionComponent is a component that is designed to work in conjunction with the
-//! UiDropdownComponent. It represents any option of that dropdown that the user should be able to
-//! select to update the value of the dropdown.
-class UiDropdownOptionInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiDropdownOptionInterface() {}
-
-    //! Get the owning dropdown of this option
-    virtual AZ::EntityId GetOwningDropdown() = 0;
-
-    //! Set the owning dropdown of this option
-    virtual void SetOwningDropdown(AZ::EntityId owningDropdown) = 0;
-
-    //! Get the text element of this option
-    virtual AZ::EntityId GetTextElement() = 0;
-
-    //! Set the text element of this option
-    virtual void SetTextElement(AZ::EntityId textElement) = 0;
-
-    //! Get the icon element of this option
-    virtual AZ::EntityId GetIconElement() = 0;
-
-    //! Set the icon element of this option
-    virtual void SetIconElement(AZ::EntityId iconElement) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiDropdownOptionInterface> UiDropdownOptionBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiDropdownOptionNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiDropdownOptionNotifications() {}
-
-    //! Notify listeners that the dropdown option was selected
-    virtual void OnDropdownOptionSelected() {}
-};
-
-typedef AZ::EBus<UiDropdownOptionNotifications> UiDropdownOptionNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h
deleted file mode 100644
index 2ff0e81263..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a dynamic layout component needs to implement. A dynamic layout component
-//! clones a prototype element to achieve the desired number of children. The parent is resized
-//! accordingly
-class UiDynamicLayoutInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiDynamicLayoutInterface() {}
-
-    //! Clone a prototype element or remove cloned elements to end up with the specified number of children
-    virtual void SetNumChildElements(int numChildren) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiDynamicLayoutInterface> UiDynamicLayoutBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h
deleted file mode 100644
index d09c1ce81a..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a dynamic scrollbox component needs to implement. A dynamic scrollbox
-//! component sets up scrollbox content as a horizontal or vertical list of elements that are
-//! cloned from prototype entities. Only the minimum number of entities are created for efficient
-//! scrolling
-class UiDynamicScrollBoxInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiDynamicScrollBoxInterface() {}
-
-    //! Refresh the content. Should be called when list size or element content has changed.
-    //! This will reset any cached information such as element sizes, so it is recommended
-    //! to use AddElementsToEnd and RemoveElementsFromFront if possible when elements vary
-    //! in size. AddElementsToEnd and RemoveElementsFromFront will also ensure that the
-    //! scroll offset is adjusted to keep the visible elements in place
-    virtual void RefreshContent() = 0;
-
-    //! Add elements to the end of the list.
-    //! Used with lists that are not divided into sections
-    virtual void AddElementsToEnd(int numElementsToAdd, bool scrollToEndIfWasAtEnd) = 0;
-
-    //! Remove elements from the front of the list.
-    //! Used with lists that are not divided into sections
-    virtual void RemoveElementsFromFront(int numElementsToRemove) = 0;
-
-    //! Scroll to the end of the list
-    virtual void ScrollToEnd() = 0;
-
-    //! Get the element index of the specified child element. Returns -1 if not found.
-    //! If the list is divided into sections, the index is local to the section
-    virtual int GetElementIndexOfChild(AZ::EntityId childElement) = 0;
-
-    //! Get the section index of the specified child element. Returns -1 if not found.
-    //! Used with lists that are divided into sections
-    virtual int GetSectionIndexOfChild(AZ::EntityId childElement) = 0;
-
-    //! Get the child element at the specified element index.
-    //! Used with lists that are not divided into sections
-    virtual AZ::EntityId GetChildAtElementIndex(int index) = 0;
-
-    //! Get the child element at the specified section index and element index.
-    //! Used with lists that are divided into sections
-    virtual AZ::EntityId GetChildAtSectionAndElementIndex(int sectionIndex, int index) = 0;
-
-    //! Get whether the list should automatically prepare and refresh its content post activation
-    virtual bool GetAutoRefreshOnPostActivate() = 0;
-
-    //! Set whether the list should automatically prepare and refresh its content post activation
-    virtual void SetAutoRefreshOnPostActivate(bool autoRefresh) = 0;
-
-    //! Get the prototype entity used for the elements
-    virtual AZ::EntityId GetPrototypeElement() = 0;
-
-    //! Set the prototype entity used for the elements
-    virtual void SetPrototypeElement(AZ::EntityId prototypeElement) = 0;
-
-    //! Get whether the elements vary in size
-    virtual bool GetElementsVaryInSize() = 0;
-
-    //! Set whether the elements vary in size
-    virtual void SetElementsVaryInSize(bool varyInSize) = 0;
-
-    //! Get whether to auto calculate the elements when they vary in size
-    virtual bool GetAutoCalculateVariableElementSize() = 0;
-
-    //! Set whether to auto calculate the elements when they vary in size
-    virtual void SetAutoCalculateVariableElementSize(bool autoCalculateSize) = 0;
-
-    //! Get the estimated size for the variable elements. If set to 0, then element sizes
-    //! are calculated up front rather than when becoming visible
-    virtual float GetEstimatedVariableElementSize() = 0;
-
-    //! Set the estimated size for the variable elements. If set to 0, then element sizes
-    //! are calculated up front rather than when becoming visible
-    virtual void SetEstimatedVariableElementSize(float estimatedSize) = 0;
-
-    //! Get whether the list is divided into sections with headers
-    virtual bool GetSectionsEnabled() = 0;
-
-    //! Set whether the list is divided into sections with headers
-    virtual void SetSectionsEnabled(bool enabled) = 0;
-
-    //! Get the prototype entity used for the headers
-    virtual AZ::EntityId GetPrototypeHeader() = 0;
-
-    //! Set the prototype entity used for the headers
-    virtual void SetPrototypeHeader(AZ::EntityId prototypeHeader) = 0;
-
-    //! Get whether headers stick to the beginning of the visible list area
-    virtual bool GetHeadersSticky() = 0;
-
-    //! Set whether headers stick to the beginning of the visible list area
-    virtual void SetHeadersSticky(bool stickyHeaders) = 0;
-
-    //! Get whether the headers vary in size
-    virtual bool GetHeadersVaryInSize() = 0;
-
-    //! Set whether the headers vary in size
-    virtual void SetHeadersVaryInSize(bool varyInSize) = 0;
-
-    //! Get whether to auto calculate the headers when they vary in size
-    virtual bool GetAutoCalculateVariableHeaderSize() = 0;
-
-    //! Set whether to auto calculate the headers when they vary in size
-    virtual void SetAutoCalculateVariableHeaderSize(bool autoCalculateSize) = 0;
-
-    //! Get the estimated size for the variable headers. If set to 0, then header sizes
-    //! are calculated up front rather than when becoming visible
-    virtual float GetEstimatedVariableHeaderSize() = 0;
-
-    //! Set the estimated size for the variable headers. If set to 0, then header sizes
-    //! are calculated up front rather than when becoming visible
-    virtual void SetEstimatedVariableHeaderSize(float estimatedSize) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiDynamicScrollBoxInterface> UiDynamicScrollBoxBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that provides data needed to display a list of elements
-class UiDynamicScrollBoxDataInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiDynamicScrollBoxDataInterface() {}
-
-    //! Returns 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 explicitely).
-    //! Used with lists that are not divided into sections
-    virtual int GetNumElements() { return 0; }
-
-    //! Returns the width of an element at the specified index.
-    //! Called when a horizontal list contains elements of varying size, and the element's "auto calculate size" option is disabled.
-    //! Used with lists that are not divided into sections
-    virtual float GetElementWidth([[maybe_unused]] int index) { return 0.0f; }
-
-    //! Returns the height of an element at the specified index.
-    //! Called when a vertical list contains elements of varying size, and the element's "auto calculate size" option is disabled.
-    //! Used with lists that are not divided into sections
-    virtual float GetElementHeight([[maybe_unused]] int index) { return 0.0f; }
-
-    //! Returns 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 explicitely).
-    //! Used with lists that are divided into sections
-    virtual int GetNumSections() { return 0; }
-
-    //! Returns 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 explicitely).
-    //! Used with lists that are divided into sections
-    virtual int GetNumElementsInSection([[maybe_unused]] int sectionIndex) { return 0; }
-
-    //! Returns the width of an element at the specified section.
-    //! Called when a horizontal list contains elements of varying size, and the element's "auto calculate size" option is disabled.
-    //! Used with lists that are divided into sections
-    virtual float GetElementInSectionWidth([[maybe_unused]] int sectionIndex, [[maybe_unused]] int elementindex) { return 0.0f; }
-
-    //! Returns the height of an element at the specified section.
-    //! Called when a vertical list contains elements of varying size, and the element's "auto calculate size" option is disabled.
-    //! Used with lists that are divided into sections
-    virtual float GetElementInSectionHeight([[maybe_unused]] int sectionIndex, [[maybe_unused]] int elementindex) { return 0.0f; }
-
-    //! Returns the width of a header at the specified section.
-    //! Called when a horizontal list contains headers of varying size, and the header's "auto calculate size" option is disabled.
-    //! Used with lists that are divided into sections
-    virtual float GetSectionHeaderWidth([[maybe_unused]] int sectionIndex) { return 0.0f; }
-
-    //! Returns the height of a header at the specified section.
-    //! Called when a vertical list contains elements of varying size, and the header's "auto calculate size" option is disabled.
-    //! Used with lists that are divided into sections
-    virtual float GetSectionHeaderHeight([[maybe_unused]] int sectionIndex) { return 0.0f; }
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiDynamicScrollBoxDataInterface> UiDynamicScrollBoxDataBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to receive notifications of element state
-//! changes, such as when an element is about to scroll into view
-class UiDynamicScrollBoxElementNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiDynamicScrollBoxElementNotifications(){}
-
-    //! Called when an element is about to become visible. Used to populate the element with data for display.
-    //! Used with lists that are not divided into sections
-    virtual void OnElementBecomingVisible([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int index) {}
-
-    //! Called when elements have variable sizes and are set to auto calculate.
-    //! Used with lists that are not divided into sections
-    virtual void OnPrepareElementForSizeCalculation([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int index) {}
-
-    //! Called 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
-    virtual void OnElementInSectionBecomingVisible([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int sectionIndex, [[maybe_unused]] int index) {}
-
-    //! Called when elements in sections have variable sizes and are set to auto calculate
-    //! Used with lists that are divided into sections
-    virtual void OnPrepareElementInSectionForSizeCalculation([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int sectionIndex, [[maybe_unused]] int index) {}
-
-    //! Called 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
-    virtual void OnSectionHeaderBecomingVisible([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int sectionIndex) {}
-
-    //! Called when headers have variable sizes and are set to auto calculate.
-    //! Used with lists that are divided into sections
-    virtual void OnPrepareSectionHeaderForSizeCalculation([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int sectionIndex) {}
-};
-
-typedef AZ::EBus<UiDynamicScrollBoxElementNotifications> UiDynamicScrollBoxElementNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorBus.h
deleted file mode 100644
index ebac70479f..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorBus.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiEditorInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiEditorInterface() {}
-
-    //! Test if this entity should be visible in the Ui Canvas Editor
-    virtual bool GetIsVisible() = 0;
-
-    //! Set whether this entity should be visible in the Ui Canvas Editor
-    virtual void SetIsVisible(bool isVisible) = 0;
-
-    //! Test if this entity is selectable in the UI Canvas Editor
-    virtual bool GetIsSelectable() = 0;
-
-    //! Set whether this entity is selectable in the UI Canvas Editor
-    virtual void SetIsSelectable(bool isSelectable) = 0;
-
-    //! Test if this entity is currently selected in the UI Canvas Editor
-    virtual bool GetIsSelected() = 0;
-
-    //! Set whether this entity is currently selected in the UI Canvas Editor
-    virtual void SetIsSelected(bool isSelected) = 0;
-
-    //! Test if this entity is currently expanded in the UI Canvas Editor
-    virtual bool GetIsExpanded() = 0;
-
-    //! Set whether this entity is currently expanded in the UI Canvas Editor
-    virtual void SetIsExpanded(bool isExpanded) = 0;
-
-    //! Test if all the parents of this UI element are visible in the editor
-    virtual bool AreAllAncestorsVisible() = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiEditorInterface> UiEditorBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorCanvasBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorCanvasBus.h
deleted file mode 100644
index a2e7dd0c2b..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorCanvasBus.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiEditorCanvasInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiEditorCanvasInterface() {}
-
-    //! Get the snap state.
-    virtual bool GetIsSnapEnabled() = 0;
-
-    //! Set the snap state.
-    virtual void SetIsSnapEnabled(bool enabled) = 0;
-
-    //! Get the translation distance to snap to
-    virtual float GetSnapDistance() = 0;
-
-    //! Set the translation distance to snap to
-    virtual void SetSnapDistance(float distance) = 0;
-
-    //! Get the degrees of rotation to snap to
-    virtual float GetSnapRotationDegrees() = 0;
-
-    //! Set the degrees of rotation to snap to
-    virtual void SetSnapRotationDegrees(float degrees) = 0;
-
-    //! Get the positions of the horizontal guide lines (along y-axis in canvas pixels)
-    virtual AZStd::vector<float> GetHorizontalGuidePositions() = 0;
-
-    //! Add a horizontal guide line
-    virtual void AddHorizontalGuide(float position) = 0;
-
-    //! Remove the horizontal guide line at the given index
-    virtual void RemoveHorizontalGuide(int index) = 0;
-
-    //! Set the position of the horizontal guide line at the given index
-    virtual void SetHorizontalGuidePosition(int index, float position) = 0;
-
-    //! Get the positions of the vertical guide lines (along x-axis in canvas pixels)
-    virtual AZStd::vector<float> GetVerticalGuidePositions() = 0;
-
-    //! Add a vertical guide line
-    virtual void AddVerticalGuide(float position) = 0;
-
-    //! Remove the vertical guide line at the given index
-    virtual void RemoveVerticalGuide(int index) = 0;
-
-    //! Set the position of the vertical guide line at the given index
-    virtual void SetVerticalGuidePosition(int index, float position) = 0;
-
-    //! Remove all of the guides
-    virtual void RemoveAllGuides() = 0;
-
-    //! Get the color to draw the guide lines on this canvas
-    virtual AZ::Color GetGuideColor() = 0;
-
-    //! Set the color to draw the guide lines on this canvas
-    virtual void SetGuideColor(const AZ::Color& color) = 0;
-
-    //! Get whether the guides on this canvas are locked
-    virtual bool GetGuidesAreLocked() = 0;
-
-    //! Set whether the guides on this canvas are locked
-    virtual void SetGuidesAreLocked(bool areLocked) = 0;
-
-    //! Check the canvas for any orphaned elements. These are elements not referenced as a child by the canvas or any of its descendant elements.
-    virtual bool CheckForOrphanedElements() = 0;
-
-    //! Recover any orphaned elements in the canvas by placing them under a special top-level element.
-    virtual void RecoverOrphanedElements() = 0;
-
-    //! Remove any orphaned elements in the canvas.
-    virtual void RemoveOrphanedElements() = 0;
-
-    //! Update the canvas from the UI Editor
-    //! \param deltaTime the amount of time in seconds since the last call to this function
-    //! \param isInGame, true if canvas being updated in preview mode, false if being updated in edit mode
-    virtual void UpdateCanvasInEditorViewport(float deltaTime, bool isInGame) = 0;
-
-    //! Render the canvas in the UI Editor
-    //! \param isInGame, true if canvas being rendered in preview mode, false if being rendered in edit mode
-    //! \param viewportSize, this is the size of the viewport that the canvas is being rendered to
-    virtual void RenderCanvasInEditorViewport(bool isInGame, AZ::Vector2 viewportSize) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiEditorCanvasInterface> UiEditorCanvasBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h
deleted file mode 100644
index 35b97fc359..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Component/EntityId.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiEditorChangeNotificationInterface
-    : public AZ::EBusTraits
-{
-public: // member functions
-
-    virtual ~UiEditorChangeNotificationInterface() {}
-
-    //! Called when the transform properties in the UI editor need to be refreshed
-    virtual void OnEditorTransformPropertiesNeedRefresh() = 0;
-
-    //! Forces a refresh of the entire properties tree in the UI Editor.
-    virtual void OnEditorPropertiesRefreshEntireTree() = 0;
-};
-
-typedef AZ::EBus<UiEditorChangeNotificationInterface> UiEditorChangeNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Notify components who store directories as properties when directory contents change.
-class UiEditorRefreshDirectoryNotificationInterface
-    : public AZ::EBusTraits
-{
-public: // member functions
-
-    virtual ~UiEditorRefreshDirectoryNotificationInterface() {}
-
-    //! Notify directory properties that they should refresh their contents
-    virtual void OnRefreshDirectory() = 0;
-};
-
-typedef AZ::EBus<UiEditorRefreshDirectoryNotificationInterface> UiEditorRefreshDirectoryNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiElementBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiElementBus.h
deleted file mode 100644
index e1eac703aa..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiElementBus.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/UiBase.h>
-
-namespace LyShine
-{
-    class IRenderGraph;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiElementInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    //! Deleting an element will remove it from its parent and delete its child elements and components
-    virtual ~UiElementInterface() {}
-
-    //! Render the element and its child elements and components, this is done by adding primitives to the render graph
-    //! \param renderGraph, the render graph being added to
-    //! \param isInGame, true if element being rendered in game (or preview), false if being render in edit mode
-    virtual void RenderElement(LyShine::IRenderGraph* renderGraph, bool isInGame) = 0;
-
-    //! Retrieves the identifier of this element.
-    virtual LyShine::ElementId GetElementId() = 0;
-
-    //! Get the name of this element
-    virtual LyShine::NameType GetName() = 0;
-
-    //! Get the canvas that contains this element (returns AZ::InvalidEntityId if element has no canvas)
-    virtual AZ::EntityId GetCanvasEntityId() = 0;
-
-    //! Get the parent element of this element (returns nullptr if element has no parent)
-    virtual AZ::Entity* GetParent() = 0;
-
-    //! Get the parent entity Id of this element (returns invalid Id if element has no parent)
-    virtual AZ::EntityId GetParentEntityId() = 0;
-
-    //! Get the number child elements of this element
-    virtual int GetNumChildElements() = 0;
-
-    //! Get the specified child element, index must be less than GetNumChildElements()
-    virtual AZ::Entity* GetChildElement(int index) = 0;
-
-    //! Get the specified child entity Id, index must be less than GetNumChildElements()
-    virtual AZ::EntityId GetChildEntityId(int index) = 0;
-
-    //! Get the specified child's UiElementInterface, index must be less than GetNumChildElements()
-    //! and the element must be fully initialized
-    virtual UiElementInterface* GetChildElementInterface(int index) = 0;
-
-    //! Get the index of the specified child element
-    virtual int GetIndexOfChild(const AZ::Entity* child) = 0;
-
-    //! Get the index of the specified child element
-    virtual int GetIndexOfChildByEntityId(AZ::EntityId childId) = 0;
-
-    //! Get the child elements of this element
-    virtual LyShine::EntityArray GetChildElements() = 0;
-
-    //! Get the child entity Ids of this element
-    virtual AZStd::vector<AZ::EntityId> GetChildEntityIds() = 0;
-
-    //! Create a new element that is a child of this element, this element (the parent) has ownership of the child
-    //! The new entity will have a UiElementComponent added but will not yet be initialized or activated
-    virtual AZ::Entity* CreateChildElement(const LyShine::NameType& name) = 0;
-
-    //! Destroy this element
-    virtual void DestroyElement() = 0;
-
-    //! Queue up element for destruction at end of frame
-    virtual void DestroyElementOnFrameEnd() = 0;
-
-    //! Re-parent this element to move it in the hierarchy
-    //! \param newParent New parent element. If null then the canvas is the parent
-    //! \param nextElement  Element to insert this element before. If null element is put at end of child list
-    virtual void Reparent(AZ::Entity* newParent, AZ::Entity* insertBefore = nullptr) = 0;
-
-    //! Re-parent this element to move it in the hierarchy
-    //! \param newParent New parent element. If InvalidEntityId then the canvas is the parent
-    //! \param nextElement  Element to insert this element before. If InvalidEntityId then element is put at end of child list
-    virtual void ReparentByEntityId(AZ::EntityId newParent, AZ::EntityId insertBefore) = 0;
-
-    //! Add this element as a child of the specified parent
-    //! \param newParent New parent element. If null then the canvas is the parent
-    //! \param index  Child index where element is inserted. If -1 element is put at end of child list
-    virtual void AddToParentAtIndex(AZ::Entity* newParent, int index = -1) = 0;
-
-    //! Remove this element from its parent
-    virtual void RemoveFromParent() = 0;
-
-    //! Get the front-most child element whose bounds include the given point in canvas space
-    //! \return nullptr if no match
-    virtual AZ::Entity* FindFrontmostChildContainingPoint(AZ::Vector2 point, bool isInGame) = 0;
-
-    //! Get all the children whose bounds intersect with the given rect in canvas space
-    //! \return Empty EntityArray if no match
-    virtual LyShine::EntityArray FindAllChildrenIntersectingRect(const AZ::Vector2& bound0, const AZ::Vector2& bound1, bool isInGame) = 0;
-
-    //! Look for an entity with interactable component to handle an event at given point
-    virtual AZ::EntityId FindInteractableToHandleEvent(AZ::Vector2 point) = 0;
-
-    //! Look for a parent (ancestor) entity with interactable component to handle dragging starting at given point
-    virtual AZ::EntityId FindParentInteractableSupportingDrag(AZ::Vector2 point) = 0;
-
-    //! Return the first immediate child element with the given name or nullptr if no match
-    virtual AZ::Entity* FindChildByName(const LyShine::NameType& name) = 0;
-
-    //! Return the first descendant element with the given name or nullptr if no match
-    virtual AZ::Entity* FindDescendantByName(const LyShine::NameType& name) = 0;
-
-    //! Return the first immediate child entity Id with the given name or invalid Id if no match
-    virtual AZ::EntityId FindChildEntityIdByName(const LyShine::NameType& name) = 0;
-
-    //! Return the first descendant entity Id with the given name or invalid Id if no match
-    virtual AZ::EntityId FindDescendantEntityIdByName(const LyShine::NameType& name) = 0;
-
-    //! Return the first immediate child element with the given id or nullptr if no match
-    virtual AZ::Entity* FindChildByEntityId(AZ::EntityId id) = 0;
-
-    //! Return the descendant element with the given id or nullptr if no match
-    virtual AZ::Entity* FindDescendantById(LyShine::ElementId id) = 0;
-
-    //! recursively find descendant elements matching a predicate
-    //! \param result, any matching elements will be added to this array
-    virtual void FindDescendantElements(AZStd::function<bool(const AZ::Entity*)> predicate, LyShine::EntityArray& result) = 0;
-
-    //! recursively visit descendant elements and call the given function on them
-    //! The function is called first on the element and then on its children
-    virtual void CallOnDescendantElements(AZStd::function<void(const AZ::EntityId)> callFunction) = 0;
-
-    //! Return whether a given element is an ancestor of this element
-    virtual bool IsAncestor(AZ::EntityId id) = 0;
-
-    //! Enabled/disabled
-    virtual bool IsEnabled() = 0;
-    virtual void SetIsEnabled(bool isEnabled) = 0;
-    virtual bool GetAreElementAndAncestorsEnabled() = 0;
-
-    //! This can be used to disable the render without disabling the update/interaction.
-    //! This is used internally by components that temporarily disable rendering of other elements (though they preserve the existing value).
-    virtual bool IsRenderEnabled() = 0;
-    virtual void SetIsRenderEnabled(bool isRenderEnabled) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiElementInterface> UiElementBus;
-
-// UI_ANIMATION_REVISIT This may be a temporary location
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiElementChangeNotification
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiElementChangeNotification() {}
-
-    //! Notify listeners that a property has change on this entity
-    virtual void UiElementPropertyChanged() {}
-};
-
-typedef AZ::EBus<UiElementChangeNotification> UiElementChangeNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiElementNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiElementNotifications() {}
-
-    //! Notify listeners that the element is being destroyed
-    virtual void OnUiElementBeingDestroyed() {}
-
-    //! Notify listeners that the element has been fixed up (canvas and parent for the element have been set)
-    virtual void OnUiElementFixup(AZ::EntityId /*canvasEntityId*/, AZ::EntityId /*parentEntityId*/) {}
-
-    //! Notify listeners that the element has been enabled or disabled (the flag on this element was changed)
-    virtual void OnUiElementEnabledChanged(bool /*isEnabled*/) {}
-
-    //! Notify listeners that the element has been enabled or disabled either directly or to a change to an ancestors enabled flag
-    virtual void OnUiElementAndAncestorsEnabledChanged(bool /*areElementAndAncestorsEnabled*/) {}
-};
-
-typedef AZ::EBus<UiElementNotifications> UiElementNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiEntityContextBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiEntityContextBus.h
deleted file mode 100644
index 91dc64ed3e..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiEntityContextBus.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Uuid.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/Serialization/ObjectStream.h>
-#include <AzCore/Slice/SliceComponent.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzFramework/Entity/EntityContextBus.h>
-#include <AzFramework/Entity/EntityContext.h>
-
-// Forward declarations
-namespace AZ
-{
-    class Entity;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus for making requests to the UI entity context.
-//! There is one UiEntityContext per UI canvas.
-class UiEntityContextRequests
-    : public AZ::EBusTraits
-{
-public:
-
-    virtual ~UiEntityContextRequests() {}
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides. Accessed by EntityContextId
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-    typedef AzFramework::EntityContextId BusIdType;
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-    //////////////////////////////////////////////////////////////////////////
-
-    //! Creates an entity in a UI context.
-    //! \return a new entity
-    virtual AZ::Entity* CreateUiEntity(const char* name) = 0;
-
-    //! Registers an existing entity with a UI context.
-    virtual void AddUiEntity(AZ::Entity* entity) = 0;
-
-    //! Registers an existing set of entities with a UI context.
-    virtual void AddUiEntities(const AzFramework::EntityList& entities) = 0;
-
-    //! Destroys an entity in a UI context.
-    //! \return whether or not the entity was destroyed. A false return value signifies the entity did not belong to the UI context.
-    virtual bool DestroyUiEntity(AZ::EntityId entityId) = 0;
-
-    //! Clones a set of entities.
-    //! \param sourceEntities - the source set of entities to clone
-    //! \param resultEntities - the set of entities cloned from the source
-    virtual bool CloneUiEntities(const AZStd::vector<AZ::EntityId>& sourceEntities, AzFramework::EntityList& resultEntities) = 0;
-
-};
-
-using UiEntityContextRequestBus = AZ::EBus<UiEntityContextRequests>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus for receiving events/notifications from the UI entity context
-class UiEntityContextNotification
-    : public AZ::EBusTraits
-{
-public:
-
-    virtual ~UiEntityContextNotification() {};
-
-    //! Fired when the context is being reset.
-    virtual void OnContextReset() {}
-
-    //! Fired when a slice has been successfully instantiated.
-    virtual void OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/, const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
-
-    //! Fired when a slice has failed to instantiate.
-    virtual void OnSliceInstantiationFailed(const AZ::Data::AssetId& /*sliceAssetId*/, const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
-
-    //! Fired when the entity stream has been successfully loaded.
-    virtual void OnEntityStreamLoadSuccess() {}
-
-    //! Fired when the entity stream load has failed
-    virtual void OnEntityStreamLoadFailed() {}
-};
-
-using UiEntityContextNotificationBus = AZ::EBus<UiEntityContextNotification>;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiFaderBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiFaderBus.h
deleted file mode 100644
index 6c03254571..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiFaderBus.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Color.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiFaderInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiFaderInterface() {}
-
-    //! Get the fade value. This is a float between 0 and 1. 1 means no fade. 0 means complete fade to invisible.
-    virtual float GetFadeValue() = 0;
-
-    //! Set the fade value
-    virtual void SetFadeValue(float fade) = 0;
-
-    //! Trigger a fade animation.
-    //! \param targetValue The value to end the fade at [0,1]
-    //! \param speed       Speed measured in full fade amount per second; 0 means instant
-    //! \param listener    The listener to notify when the fade is completed or interrupted
-    virtual void Fade(float targetValue, float speed) = 0;
-
-    //! Get whether a fade animation is taking place
-    virtual bool IsFading() = 0;
-
-    //! Get the flag that indicates whether the fader should use render to texture
-    virtual bool GetUseRenderToTexture() = 0;
-
-    //! Set the flag that indicates whether the fader should use render to texture
-    virtual void SetUseRenderToTexture(bool useRenderToTexture) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiFaderInterface> UiFaderBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement
-class UiFaderNotifications
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiFaderNotifications(){}
-
-    //! Called when the animation triggered by UiFaderInterface::Fade() is done.
-    //! The listener is automatically removed from the fader component after this is called.
-    virtual void OnFadeComplete() = 0;
-
-    //! Called when the animation triggered by UiFaderInterface::Fade() is interrupted.
-    //! The listener is automatically removed from the fader component after this is called.
-    virtual void OnFadeInterrupted() = 0;
-
-    //! Called when the fader component is destroyed
-    virtual void OnFaderDestroyed() = 0;
-};
-
-typedef AZ::EBus<UiFaderNotifications> UiFaderNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h
deleted file mode 100644
index 54602dc3f2..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzFramework/Entity/EntityContextBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus that defines the interface for flipbook animations.
-//!
-//! A flipbook animation component exists on an entity that has an image component
-//! and interacts with the image bus to achieve its functionality (such as by
-//! manipulating sprite-sheet indices).
-class UiFlipbookAnimationInterface
-    : public AZ::ComponentBus
-{
-public: // Types
-
-    //! Defines the looping behavior when playing back a flipbook animation.
-    enum class LoopType
-    {
-        None,       //!< No looping behavior
-        
-        Linear,     //!< When end frame is reached, next frame will be the loop start frame
-
-        PingPong    //!< When end frame is reached, next frame will be the previous frame, 
-                    //!< continuing in reverse until the start frame is reached.
-    };
-
-    //! Units of speed for framerate
-    enum class FramerateUnits
-    {
-        FPS,                //!< Framerate of animation
-
-        SecondsPerFrame,    //!< Number of seconds to wait before playing next frame
-    };
-
-public:
-    virtual ~UiFlipbookAnimationInterface() {}
-
-    //! Start the animation sequence, beginning at the start frame.
-    //!
-    //! If a LoopType other than None has been set, the animation won't stop
-    //! unless explicitly done so (or the image is unloaded/destroyed).
-    virtual void Start() = 0;
-
-    //! Stops animation playback.
-    virtual void Stop() = 0;
-
-    //! \return True if the flipbook animation is currently playing, false otherwise.
-    virtual bool IsPlaying() = 0;
-
-    //! \return The starting frame of the animation.
-    virtual AZ::u32 GetStartFrame() = 0;
-
-    //! Sets the starting frame of the animation.
-    virtual void SetStartFrame(AZ::u32 startFrame) = 0;
-
-    //! \return End frame of the animation.
-    virtual AZ::u32 GetEndFrame() = 0;
-
-    //! Sets the ending frame of the animation.
-    virtual void SetEndFrame(AZ::u32 endFrame) = 0;
-
-    //! \return The current frame of the animation that's being rendered.
-    virtual AZ::u32 GetCurrentFrame() = 0;
-
-    //! Sets the current frame of the animation to render.
-    //!
-    //! If the animation is currently playing, this will effectively "skip"
-    //! to the given frame.
-    virtual void SetCurrentFrame(AZ::u32 currentFrame) = 0;
-
-    //! This frame is distinct from the start frame and allows a "lead in"
-    //! seqence of frames to play leading up to the looping animation. The
-    //! frames that occur prior to the loop start frame will only play once.
-    //!
-    //! \return The frame to start the loop from.
-    virtual AZ::u32 GetLoopStartFrame() = 0;
-
-    //! Sets the starting frame for looping sequences.
-    virtual void SetLoopStartFrame(AZ::u32 loopStartFrame) = 0;
-
-    //! \return The LoopType of the flipbook animation.
-    virtual LoopType GetLoopType() = 0;
-
-    //! Sets the LoopType of the flipbook animation.
-    virtual void SetLoopType(LoopType loopType) = 0;
-    
-    //! Gets the speed used to determine when to transition to the next frame.
-    //!
-    //! Framerate is defined relative to unit of time, specified by FramerateUnits.
-    //!
-    //! See GetFramerateUnit, SetFramerateUnit.
-    virtual float GetFramerate() = 0;
-
-    //! Sets the speed used to determine when to transition to the next frame.
-    //!
-    //! Framerate is defined relative to unit of time, specified by FramerateUnits.
-    //!
-    //! See GetFramerateUnit, SetFramerateUnit.
-    virtual void SetFramerate(float framerate) = 0;
-
-    //! Gets the framerate unit.
-    virtual FramerateUnits GetFramerateUnit() = 0;
-
-    //! Sets the framerate unit.
-    virtual void SetFramerateUnit(FramerateUnits framerateUnit) = 0;
-
-    //! Gets the delay (in seconds) before playing the flipbook (applied only once during playback).
-    virtual float GetStartDelay() = 0;
-
-    //! Sets the delay (in seconds) before playing the flipbook (applied only once during playback).
-    virtual void SetStartDelay(float startDelay) = 0;
-    
-    //! Gets the delay (in seconds) before playing the loop sequence.
-    virtual float GetLoopDelay() = 0;
-
-    //! Sets the delay (in seconds) before playing the loop sequence.
-    virtual void SetLoopDelay(float loopDelay) = 0;
-
-    //! Gets the delay (in seconds) before playing the reverse loop sequence (PingPong loop types only).
-    virtual float GetReverseDelay() = 0;
-
-    //! Sets the delay (in seconds) before playing the reverse loop sequence (PingPong loop types only).
-    virtual void SetReverseDelay(float reverseDelay) = 0;
-
-    //! Returns true if the animation will begin playing when the component activates, false otherwise.
-    virtual bool GetIsAutoPlay() = 0;
-
-    //! Sets whether the animation will automatically begin playing.
-    //!
-    //! This flag is ignored after the component has activated.
-    virtual void SetIsAutoPlay(bool isAutoPlay) = 0;
-};
-
-using UiFlipbookAnimationBus = AZ::EBus<UiFlipbookAnimationInterface>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Allows listeners to be aware of events, like loop completion, occurring.
-class UiFlipbookAnimationNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiFlipbookAnimationNotifications() {}
-
-    //! Notify listeners when the animation starts
-    virtual void OnAnimationStarted() {}
-
-    //! Notify listeners when the animation stops
-    virtual void OnAnimationStopped() {}
-
-    //! Notify listeners when the current loop sequence has completed
-    //!
-    //! This will only trigger for LoopType sequences other than None.
-    //!
-    //! For Linear LoopType, this will trigger on the last frame of the last
-    //! frame of the loop.
-    //!
-    //! For PingPong LoopType, this will trigger on the last frame of the
-    //! loop sequence before reversing the loop direction.
-    virtual void OnLoopSequenceCompleted() {}
-};
-
-typedef AZ::EBus<UiFlipbookAnimationNotifications> UiFlipbookAnimationNotificationsBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiGameEntityContextBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiGameEntityContextBus.h
deleted file mode 100644
index d2118361ae..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiGameEntityContextBus.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Uuid.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/Serialization/ObjectStream.h>
-#include <AzCore/Serialization/IdUtils.h>
-#include <AzCore/Slice/SliceComponent.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzFramework/Entity/EntityContextBus.h>
-#include <AzFramework/Entity/EntityContext.h>
-
-// Forward declarations
-namespace AZ
-{
-    class Entity;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus for making requests to the UI game entity context.
-class UiGameEntityContextRequests
-    : public AZ::EBusTraits
-{
-public:
-
-    virtual ~UiGameEntityContextRequests() {}
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides. Accessed by EntityContextId
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-    typedef AzFramework::EntityContextId BusIdType;
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-    //////////////////////////////////////////////////////////////////////////
-
-    //! Instantiates a dynamic slice asynchronously.
-    //! \return a ticket identifying the spawn request.
-    //!         Callers can immediately subscribe to the SliceInstantiationResultBus for this ticket
-    //!         to receive result for this specific request.
-    virtual AzFramework::SliceInstantiationTicket InstantiateDynamicSlice(
-        const AZ::Data::Asset<AZ::Data::AssetData>& /*sliceAsset*/,
-        const AZ::Vector2& /*position*/,
-        bool /*isViewportPosition*/,
-        AZ::Entity* /*parent*/,
-        const AZ::IdUtils::Remapper<AZ::EntityId>::IdMapper& /*customIdMapper*/)
-    { return AzFramework::SliceInstantiationTicket(); }
-};
-
-using UiGameEntityContextBus = AZ::EBus<UiGameEntityContextRequests>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus for receiving notifications from the UI game entity context component.
-class UiGameEntityContextNotifications
-    : public AZ::EBusTraits
-{
-public:
-
-    virtual ~UiGameEntityContextNotifications() = default;
-
-    /// Fired when a slice has been successfully instantiated.
-    virtual void OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/,
-        const AZ::SliceComponent::SliceInstanceAddress& /*instance*/,
-        const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
-
-    /// Fired when a slice asset could not be instantiated.
-    virtual void OnSliceInstantiationFailed(const AZ::Data::AssetId& /*sliceAssetId*/,
-        const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
-};
-
-using UiGameEntityContextNotificationBus = AZ::EBus<UiGameEntityContextNotifications>;
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus for receiving notifications from the UI game entity context component. This bus is used
-//! by the UiSpawnerComponent that depends on the UiGameEntityContext fixing entities up before
-//! it sends out notifications to listeners on the UiSpawnerNotificationBus
-class UiGameEntityContextSliceInstantiationResults
-    : public AZ::EBusTraits
-{
-public:
-
-    virtual ~UiGameEntityContextSliceInstantiationResults() = default;
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides. Addressed by SliceInstantiationTicket
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-    typedef AzFramework::SliceInstantiationTicket BusIdType;
-    //////////////////////////////////////////////////////////////////////////
-
-    //! Signals that a slice was successfully instantiated prior to entity registration.
-    virtual void OnEntityContextSlicePreInstantiate(const AZ::Data::AssetId& /*sliceAssetId*/, const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/) {}
-
-    //! Signals that a slice was successfully instantiated after entity registration.
-    virtual void OnEntityContextSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/) {}
-
-    //! Signals that a slice could not be instantiated.
-    virtual void OnEntityContextSliceInstantiationFailed(const AZ::Data::AssetId& /*sliceAssetId*/) {}
-};
-
-using UiGameEntityContextSliceInstantiationResultsBus = AZ::EBus<UiGameEntityContextSliceInstantiationResults>;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiImageBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiImageBus.h
deleted file mode 100644
index 5167978509..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiImageBus.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Color.h>
-
-class ISprite;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiImageInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    enum class ImageType : int32_t
-    {
-        Stretched,      //!< the texture is stretched to fit the rect without maintaining aspect ratio
-        Sliced,         //!< the texture is sliced such that center stretches and the edges do not
-        Fixed,          //!< the texture is not stretched at all
-        Tiled,          //!< the texture is tiled (repeated)
-        StretchedToFit, //!< the texture is scaled to fit the rect while maintaining aspect ratio
-        StretchedToFill //!< the texture is scaled to fill the rect while maintaining aspect ratio
-    };
-
-    enum class SpriteType : int32_t
-    {
-        SpriteAsset,
-        RenderTarget,
-    };
-
-    enum class FillType : int32_t
-    {
-        None,           //!< the image is displayed fully filled
-        Linear,         //!< the image is filled linearly from one edge to the opposing edge
-        Radial,         //!< the image is filled radially around the center
-        RadialCorner,   //!< the image is filled radially around a corner
-        RadialEdge,     //!< the image is filled radially around the midpoint of an edge
-    };
-
-    enum class FillCornerOrigin : int32_t
-    {
-        TopLeft,
-        TopRight,
-        BottomRight,
-        BottomLeft,
-    };
-
-    enum class FillEdgeOrigin : int32_t
-    {
-        Left,
-        Top,
-        Right,
-        Bottom,
-    };
-
-public: // member functions
-
-    virtual ~UiImageInterface() {}
-
-    //! Gets the image color tint
-    virtual AZ::Color GetColor() = 0;
-
-    //! Sets the image color tint
-    virtual void SetColor(const AZ::Color& color) = 0;
-
-    //! Gets the image color alpha
-    virtual float GetAlpha() = 0;
-
-    //! Sets the image color alpha
-    virtual void SetAlpha(float color) = 0;
-
-    //! Gets the sprite for this element
-    virtual ISprite* GetSprite() = 0;
-
-    //! Sets the sprite for this element
-    virtual void SetSprite(ISprite* sprite) = 0;
-
-    //! Gets the source location of the image to be displayed by the element
-    virtual AZStd::string GetSpritePathname() = 0;
-    
-    //! Sets the source location of the image to be displayed by the element
-    virtual void SetSpritePathname(AZStd::string spritePath) = 0;
-
-    //! Sets the source location of the image to be displayed by the element only
-    //! if the sprite asset exists. Otherwise, the current sprite remains unchanged.
-    //! Returns whether the sprite changed
-    virtual bool SetSpritePathnameIfExists(AZStd::string spritePath) = 0;
-
-    //! Gets the name of the render target
-    virtual AZStd::string GetRenderTargetName() = 0;
-
-    //! Sets the name of the render target
-    virtual void SetRenderTargetName(AZStd::string renderTargetName) = 0;
-
-    //! Gets whether the render target is in sRGB color space
-    virtual bool GetIsRenderTargetSRGB() = 0;
-
-    //! Sets whether the render target is in sRGB color space
-    virtual void SetIsRenderTargetSRGB(bool isSRGB) = 0;
-
-    //! Gets the type of the sprite
-    virtual SpriteType GetSpriteType() = 0;
-
-    //! Sets the type of the sprite
-    virtual void SetSpriteType(SpriteType spriteType) = 0;
-
-    //! Gets the type of the image
-    virtual ImageType GetImageType() = 0;
-
-    //! Sets the type of the image
-    virtual void SetImageType(ImageType imageType) = 0;
-    
-    //! Gets the fill type for the image
-    virtual FillType GetFillType() = 0;
-
-    //! Sets the fill type for the image
-    virtual void SetFillType(FillType fillType) = 0;
-
-    //! Gets the fill amount for the image in the range [0,1]
-    virtual float GetFillAmount() = 0;
-
-    //! Sets the fill amount for the image in the range [0,1]
-    virtual void SetFillAmount(float fillAmount) = 0;
-
-    //! Gets the start angle for radial fill, measured clockwise in degrees from straight up
-    virtual float GetRadialFillStartAngle() = 0;
-
-    //! Sets the start angle for radial fill, measured clockwise in degrees from straight up
-    virtual void SetRadialFillStartAngle(float radialFillStartAngle) = 0;
-
-    //! Gets the corner fill origin
-    virtual FillCornerOrigin GetCornerFillOrigin() = 0;
-
-    //! Sets the corner fill origin
-    virtual void SetCornerFillOrigin(FillCornerOrigin cornerOrigin) = 0;
-
-    //! Gets the edge fill origin
-    virtual FillEdgeOrigin GetEdgeFillOrigin() = 0;
-
-    //! Sets the edge fill origin
-    virtual void SetEdgeFillOrigin(FillEdgeOrigin edgeOrigin) = 0;
-
-    //! Gets whether the image is filled clockwise
-    virtual bool GetFillClockwise() = 0;
-
-    //! Sets whether the image is filled clockwise
-    virtual void SetFillClockwise(bool fillClockwise) = 0;
-
-    //! Gets whether the center of a sliced image is filled
-    virtual bool GetFillCenter() = 0;
-
-    //! Sets whether the center of a sliced image is filled
-    virtual void SetFillCenter(bool fillCenter) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiImageInterface> UiImageBus;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiImageSequenceBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiImageSequenceBus.h
deleted file mode 100644
index 76c7a81495..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiImageSequenceBus.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiImageSequenceInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    enum class ImageType : int32_t
-    {
-        Stretched,      //!< the texture is stretched to fit the rect without maintaining aspect ratio
-        Fixed,          //!< the texture is not stretched at all
-        StretchedToFit, //!< the texture is scaled to fit the rect while maintaining aspect ratio
-        StretchedToFill //!< the texture is scaled to fill the rect while maintaining aspect ratio
-    };
-
-public: // member functions
-
-    virtual ~UiImageSequenceInterface() {}
-
-    //! Gets the type of the image
-    virtual ImageType GetImageType() = 0;
-
-    //! Sets the type of the image
-    virtual void SetImageType(ImageType imageType) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiImageSequenceInterface> UiImageSequenceBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiIndexableImageBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiIndexableImageBus.h
deleted file mode 100644
index c9b67aaab4..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiIndexableImageBus.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Defines an interface for working with indexable image types, such as sprite-sheets or image sequences.
-class UiIndexableImageInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiIndexableImageInterface() {}
-    
-    //! Sets the index of the image to display
-    virtual void SetImageIndex(AZ::u32 index) = 0;
-
-    //! Gets the index of the image to display
-    virtual const AZ::u32 GetImageIndex() = 0;
-
-    //! Gets the number of indices for this image.
-    virtual const AZ::u32 GetImageIndexCount() = 0;    
-
-    //! Given an index, return its alias (if defined)
-    virtual AZStd::string GetImageIndexAlias(AZ::u32 index) = 0;
-
-    //! Given an index, set an alias for it
-    virtual void SetImageIndexAlias(AZ::u32 index, const AZStd::string& alias) = 0;
-
-    //! Given an alias, return the index that corresponds to it
-    virtual AZ::u32 GetImageIndexFromAlias(const AZStd::string& alias) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiIndexableImageInterface> UiIndexableImageBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInitializationBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiInitializationBus.h
deleted file mode 100644
index f0d6d95cc1..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiInitializationBus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiInitializationInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiInitializationInterface() {}
-
-    //! Initialize the component after it has been created as part of a set of entities.
-    //! I.e. After a group of entities has been created and activated from a load or clone operation
-    //! in the game (not in the UI Editor) this is called on each created element.
-    //! This allows the component to perform operations that rely on related entities being
-    //! activated.
-    virtual void InGamePostActivate() = 0;
-
-public: // static member functions
-
-    static const char* GetUniqueName() { return "UiInitializationInterface"; }
-
-public: // static member data
-
-    //! Multiple components on an entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-};
-
-typedef AZ::EBus<UiInitializationInterface> UiInitializationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableActionsBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableActionsBus.h
deleted file mode 100644
index a67a6b74b9..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableActionsBus.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// This bus allows the get/set of properties for a group of actions that many interactable components
-// implement.
-// It is separate from UiInteractableBus because UiInteractableBus is part of a core system for how
-// the UI canvas communincates with any UI element that wants user input. Sometimes UI components
-// want input because they are part of a 2D puzzle for example but they do not always want to have
-// to support the standard action changes.
-class UiInteractableActionsInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    typedef AZStd::function<void(AZ::EntityId)> OnActionCallback;
-
-public: // member functions
-
-    virtual ~UiInteractableActionsInterface() {}
-
-    //! Get the hover start action name
-    virtual const LyShine::ActionName& GetHoverStartActionName() = 0;
-
-    //! Set the hover start action name
-    virtual void SetHoverStartActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the hover end action name
-    virtual const LyShine::ActionName& GetHoverEndActionName() = 0;
-
-    //! Set the hover end action name
-    virtual void SetHoverEndActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the pressed action name
-    virtual const LyShine::ActionName& GetPressedActionName() = 0;
-
-    //! Set the pressed action name
-    virtual void SetPressedActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the released action name
-    virtual const LyShine::ActionName& GetReleasedActionName() = 0;
-
-    //! Set the released action name
-    virtual void SetReleasedActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the hover start callback
-    virtual OnActionCallback GetHoverStartActionCallback() = 0;
-
-    //! Set the hover start callback
-    virtual void SetHoverStartActionCallback(OnActionCallback onActionCallback) = 0;
-
-    //! Get the hover end callback
-    virtual OnActionCallback GetHoverEndActionCallback() = 0;
-
-    //! Set the hover end callback
-    virtual void SetHoverEndActionCallback(OnActionCallback onActionCallback) = 0;
-
-    //! Get the pressed callback
-    virtual OnActionCallback GetPressedActionCallback() = 0;
-
-    //! Set the pressed callback
-    virtual void SetPressedActionCallback(OnActionCallback onActionCallback) = 0;
-
-    //! Get the release callback
-    virtual OnActionCallback GetReleasedActionCallback() = 0;
-
-    //! Set the release callback
-    virtual void SetReleasedActionCallback(OnActionCallback onActionCallback) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiInteractableActionsInterface> UiInteractableActionsBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableBus.h
deleted file mode 100644
index 4ad4551657..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableBus.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiInteractableInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiInteractableInterface() {}
-
-    //! Check whether this component can handle the event at the given location
-    virtual bool CanHandleEvent(AZ::Vector2 point) = 0;
-
-    //! Called on an interactable component when a pressed event is received over it
-    //! \param point, the point at which the event occurred (viewport space)
-    //! \param shouldStayActive, output - true if the interactable wants to become the active element for the canvas
-    //! \return true if the interactable handled the event
-    virtual bool HandlePressed(AZ::Vector2 point, bool& shouldStayActive) = 0;
-
-    //! Called on the currently pressed interactable component when a release event is received
-    //! \param point, the point at which the event occurred (viewport space)
-    //! \return true if the interactable handled the event
-    virtual bool HandleReleased(AZ::Vector2 point) = 0;
-
-    //! Called on an interactable component when a multi-touch pressed event is received over it
-    //! \param point, the point at which the event occurred (viewport space)
-    //! \param multiTouchIndex, the index of the multi-touch (the 'primary' touch with index 0 is sent to HandlePressed)
-    //! \return true if the interactable handled the event
-    virtual bool HandleMultiTouchPressed(AZ::Vector2 point, int multiTouchIndex) = 0;
-
-    //! Called on the currently pressed interactable component when a multi-touch release event is received
-    //! \param point, the point at which the event occurred (viewport space)
-    //! \param multiTouchIndex, the index of the multi-touch (the 'primary' touch with index 0 is sent to HandlePressed)
-    //! \return true if the interactable handled the event
-    virtual bool HandleMultiTouchReleased(AZ::Vector2 point, int multiTouchIndex) = 0;
-
-    //! Called on an interactable component when an enter pressed event is received
-    //! \param shouldStayActive, output - true if the interactable wants to become the active element for the canvas
-    //! \return true if the interactable handled the event
-    virtual bool HandleEnterPressed([[maybe_unused]] bool& shouldStayActive) { return false; }
-
-    //! Called on the currently pressed interactable component when an enter released event is received
-    //! \return true if the interactable handled the event
-    virtual bool HandleEnterReleased() { return false; }
-
-    //! Called when the interactable was navigated to via gamepad/keyboard, and auto activation is enabled on the interactable
-    //! \return true if the interactable handled the event
-    virtual bool HandleAutoActivation() { return false; }
-
-    //! Called on the currently active interactable component when text input is received
-    //! \return true if the interactable handled the event
-    virtual bool HandleTextInput([[maybe_unused]] const AZStd::string& textUTF8) { return false; };
-
-    //! Called on the currently active interactable component when input is received
-    //! \return true if the interactable handled the event
-    virtual bool HandleKeyInputBegan([[maybe_unused]] const AzFramework::InputChannel::Snapshot& inputSnapshot, [[maybe_unused]] AzFramework::ModifierKeyMask activeModifierKeys) { return false; }
-
-    //! Called on the currently active interactable component when a mouse/touch position event is received
-    //! \param point, the current mouse/touch position (viewport space)
-    virtual void InputPositionUpdate([[maybe_unused]] AZ::Vector2 point) {};
-
-    //! Called on the currently pressed interactable component when a multi-touch position event is received
-    //! \param point, the current mouse/touch position (viewport space)
-    //! \param multiTouchIndex, the index of the multi-touch (the 'primary' touch with index 0 is sent to HandlePressed)
-    virtual void MultiTouchPositionUpdate([[maybe_unused]] AZ::Vector2 point, [[maybe_unused]] int multiTouchIndex) {};
-
-    //! Returns true if this interactable supports taking active status when a drag is started on a child
-    //! interactble AND the given drag startPoint would be a valid drag start point
-    //! \param point, the start point of the drag (which would be on a child interactable) (viewport space)
-    virtual bool DoesSupportDragHandOff([[maybe_unused]] AZ::Vector2 startPoint) { return false; }
-
-    //! Called on a parent of the currently active interactable element to allow interactables that
-    //! contain other interactables to support drags that start on the child.
-    //! If this return true the hand-off occured and the caller will no longer be considered the
-    //! active interactable by the canvas.
-    //! \param currentActiveInteractable, the child element that is the currently active interactable
-    //! \param startPoint, the start point of the potential drag (viewport space)
-    //! \param currentPoint, the current points of the potential drag (viewport space)
-    virtual bool OfferDragHandOff([[maybe_unused]] AZ::EntityId currentActiveInteractable, [[maybe_unused]] AZ::Vector2 startPoint, [[maybe_unused]] AZ::Vector2 currentPoint, [[maybe_unused]] float dragThreshold) { return false; };
-
-    //! Called on the currently active interactable component when the active interactable changes
-    virtual void LostActiveStatus() {};
-
-    //! Called when mouse/touch enters the bounds of this interactable
-    virtual void HandleHoverStart() = 0;
-
-    //! Called on the currently hovered interactable component when mouse/touch moves outside of bounds
-    virtual void HandleHoverEnd() = 0;
-
-    //! Called when a descendant of the interactable becomes the hover interactable by being navigated to
-    virtual void HandleDescendantReceivedHoverByNavigation([[maybe_unused]] AZ::EntityId descendantEntityId) {};
-
-    //! Called when the interactable becomes the hover interactable by being navigated to from one of its descendants
-    virtual void HandleReceivedHoverByNavigatingFromDescendant([[maybe_unused]] AZ::EntityId descendantEntityId) {};
-
-    //! Query whether the interactable is currently pressed
-    virtual bool IsPressed() { return false; }
-
-    //! Enable/disable event handling
-    virtual bool IsHandlingEvents() { return true; }
-    virtual void SetIsHandlingEvents([[maybe_unused]] bool isHandlingEvents) {}
-
-    //! Enable/disable multi-touch event handling
-    virtual bool IsHandlingMultiTouchEvents() { return true; }
-    virtual void SetIsHandlingMultiTouchEvents([[maybe_unused]] bool isHandlingMultiTouchEvents) {}
-
-    //! Get/set whether the interactable automatically becomes active when navigated to via gamepad/keyboard
-    virtual bool GetIsAutoActivationEnabled() = 0;
-    virtual void SetIsAutoActivationEnabled(bool isEnabled) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiInteractableInterface> UiInteractableBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiInteractableActiveNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiInteractableActiveNotifications() {}
-
-    //! Notify listener that this interactable is no longer active
-    virtual void ActiveCancelled() {}
-
-    //! Notify listener that this interactable has given up active status to a new interactable
-    virtual void ActiveChanged([[maybe_unused]] AZ::EntityId m_newActiveInteractable, [[maybe_unused]] bool shouldStayActive) {}
-};
-
-typedef AZ::EBus<UiInteractableActiveNotifications> UiInteractableActiveNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement in order to get notifications when actions are
-//! triggered
-class UiInteractableNotifications
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiInteractableNotifications(){}
-
-    //! Called on hover start
-    virtual void OnHoverStart() {};
-
-    //! Called on hover end
-    virtual void OnHoverEnd() {};
-
-    //! Called on pressed
-    virtual void OnPressed() {};
-
-    //! Called on released
-    virtual void OnReleased() {};
-
-    //! Called on receiving hover by being navigated to from a descendant
-    virtual void OnReceivedHoverByNavigatingFromDescendant([[maybe_unused]] AZ::EntityId descendantEntityId) {};
-};
-
-typedef AZ::EBus<UiInteractableNotifications> UiInteractableNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableStatesBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableStatesBus.h
deleted file mode 100644
index e961d315ee..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractableStatesBus.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-#include <AzCore/Math/Color.h>
-
-class ISprite;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// This bus allows the get/set of properties for a group of states that many interactable components
-// implement.
-// It is separate from UiInteractableBus because UiInteractableBus is part of a core system for how
-// the UI canvas communincates with any UI element that wants user input. Sometimes UI components
-// want input because they are part of a 2D puzzle for example but they do not always want to have
-// to support the standard state changes.
-class UiInteractableStatesInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! The different visual states that an interactable can be in. An enum class is avoided so that 
-    //! derived components of UiInteractableComponent can extend with additional states.
-    using State = int;
-    enum
-    {
-        StateNormal = 0,
-        StateHover,
-        StatePressed,
-        StateDisabled,
-        NumStates
-    };
-
-public: // member functions
-
-    virtual ~UiInteractableStatesInterface() {}
-
-    //! Set the color to be used for the given target when the interactable is in the given state
-    //! If the interactable already has a color action for this state/target combination then replaces it
-    virtual void SetStateColor(State state, AZ::EntityId target, const AZ::Color& color) = 0;
-
-    //! Get the color to be used for the given target when the interactable is in the given state
-    //! \return the color to be used for the given target when the interactable is in the given state
-    virtual AZ::Color GetStateColor(State state, AZ::EntityId target) = 0;
-
-    //! Get whether the interactable has a color action for this state/target combination
-    //! \return true if the interactable has a color action for this state/target combination
-    virtual bool HasStateColor(State state, AZ::EntityId target) = 0;
-
-    //! Set the alpha to be used for the given target when the interactable is in the given state
-    //! If the interactable already has an alpha action for this state/target combination then replaces it
-    virtual void SetStateAlpha(State state, AZ::EntityId target, float alpha) = 0;
-
-    //! Get the alpha to be used for the given target when the interactable is in the given state
-    //! \return the alpha to be used for the given target when the interactable is in the given state
-    virtual float GetStateAlpha(State state, AZ::EntityId target) = 0;
-
-    //! Get whether the interactable has an alpha action for this state/target combination
-    //! \return true if the interactable has an alpha action for this state/target combination
-    virtual bool HasStateAlpha(State state, AZ::EntityId target) = 0;
-
-    //! Set the sprite to be used for the given target when the interactable is in the given state
-    //! If the interactable already has a sprite action for this state/target combination then replaces it
-    virtual void SetStateSprite(State state, AZ::EntityId target, ISprite* sprite) = 0;
-
-    //! Get the sprite to be used for the given target when the interactable is in the given state
-    //! \return the sprite to be used for the given target when the interactable is in the given state
-    virtual ISprite* GetStateSprite(State state, AZ::EntityId target) = 0;
-
-    //! Set the sprite path to be used for the given target when the interactable is in the given state
-    //! If the interactable already has a sprite action for this state/target combination then replaces it
-    virtual void SetStateSpritePathname(State state, AZ::EntityId target, const AZStd::string& spritePath) = 0;
-
-    //! Get the sprite path to be used for the given target when the interactable is in the given state
-    //! \return the sprite path to be used for the given target when the interactable is in the given state
-    virtual AZStd::string GetStateSpritePathname(State state, AZ::EntityId target) = 0;
-
-    //! Get whether the interactable has a sprite action for this state/target combination
-    //! \return true if the interactable has a sprite action for this state/target combination
-    virtual bool HasStateSprite(State state, AZ::EntityId target) = 0;
-
-    //! Set the font to be used for the given target when the interactable is in the given state
-    //! If the interactable already has a font action for this state/target combination then replaces it
-    virtual void SetStateFont(State state, AZ::EntityId target, const AZStd::string& fontPathname, unsigned int fontEffectIndex) = 0;
-
-    //! Get the font path to be used for the given target when the interactable is in the given state
-    //! \return the font path to be used for the given target when the interactable is in the given state
-    virtual AZStd::string GetStateFontPathname(State state, AZ::EntityId target) = 0;
-
-    //! Get the font effect to be used for the given target when the interactable is in the given state
-    //! \return the font effect to be used for the given target when the interactable is in the given state
-    virtual unsigned int GetStateFontEffectIndex(State state, AZ::EntityId target) = 0;
-
-    //! Get whether the interactable has a font action for this state/target combination
-    //! \return true if the interactable has a font action for this state/target combination
-    virtual bool HasStateFont(State state, AZ::EntityId target) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiInteractableStatesInterface> UiInteractableStatesBus;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractionMaskBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractionMaskBus.h
deleted file mode 100644
index 71c54527c6..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiInteractionMaskBus.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiInteractionMaskInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiInteractionMaskInterface() {}
-
-    //! Check whether this element is masking the given point
-    virtual bool IsPointMasked(AZ::Vector2 point) = 0;
-
-public: // static member functions
-
-    static const char* GetUniqueName() { return "UIInteractionMaskInterface"; }
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiInteractionMaskInterface> UiInteractionMaskBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutBus.h
deleted file mode 100644
index 429d44bc24..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutBus.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/Bus/UiTransformBus.h>
-#include <LyShine/IDraw2d.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiLayoutInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! Horizontal order used by layout components
-    enum class HorizontalOrder
-    {
-        LeftToRight,
-        RightToLeft
-    };
-
-    //! Vertical order used by layout components
-    enum class VerticalOrder
-    {
-        TopToBottom,
-        BottomToTop
-    };
-
-    //! Padding (in pixels) inside the edges of an element
-    struct Padding
-    {
-        AZ_TYPE_INFO(Padding, "{DE5C18B0-4214-4A37-B590-8D45CC450A96}")
-
-        Padding()
-            : m_left(0)
-            , m_top(0)
-            , m_right(0)
-            , m_bottom(0) {}
-
-        int m_left;
-        int m_right;
-        int m_top;
-        int m_bottom;
-    };
-
-public: // member functions
-
-    virtual ~UiLayoutInterface() {}
-
-    //! Get whether this layout component uses layout cells to calculate its layout
-    virtual bool IsUsingLayoutCellsToCalculateLayout() = 0;
-
-    //! Get whether this layout component should bypass the default layout cell values calculated by its children
-    virtual bool GetIgnoreDefaultLayoutCells() = 0;
-
-    //! Set whether this layout component should bypass the default layout cell values calculated by its children
-    virtual void SetIgnoreDefaultLayoutCells(bool ignoreDefaultLayoutCells) = 0;
-
-    //! Get the horizontal child alignment
-    virtual IDraw2d::HAlign GetHorizontalChildAlignment() = 0;
-
-    //! Set the horizontal child alignment
-    virtual void SetHorizontalChildAlignment(IDraw2d::HAlign alignment) = 0;
-
-    //! Get the vertical child alignment
-    virtual IDraw2d::VAlign GetVerticalChildAlignment() = 0;
-
-    //! Set the vertical child alignment
-    virtual void SetVerticalChildAlignment(IDraw2d::VAlign alignment) = 0;
-
-    //! Find out whether this layout component is currently overriding the transform of the specified element.
-    virtual bool IsControllingChild(AZ::EntityId childId) = 0;
-
-    //! Get the size the element needs to be to fit a specified number of child elements of a certain size
-    virtual AZ::Vector2 GetSizeToFitChildElements(const AZ::Vector2& childElementSize, int numChildElements) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiLayoutInterface> UiLayoutBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellBus.h
deleted file mode 100644
index 2cf19d09c2..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellBus.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiLayoutCellBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiLayoutCellInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiLayoutCellInterface() {}
-
-    //! Get the overridden min width. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
-    virtual float GetMinWidth() = 0;
-
-    //! Set the overridden min width. LyShine::UiLayoutCellUnspecifiedSize means don't override
-    virtual void SetMinWidth(float width) = 0;
-
-    //! Get the overridden min height. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
-    virtual float GetMinHeight() = 0;
-
-    //! Set the overridden min height. LyShine::UiLayoutCellUnspecifiedSize means don't override
-    virtual void SetMinHeight(float height) = 0;
-
-    //! Get the overridden target width. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
-    virtual float GetTargetWidth() = 0;
-
-    //! Set the overridden target width. LyShine::UiLayoutCellUnspecifiedSize means don't override
-    virtual void SetTargetWidth(float width) = 0;
-
-    //! Get the overridden target height. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
-    virtual float GetTargetHeight() = 0;
-
-    //! Set the overridden target height. LyShine::UiLayoutCellUnspecifiedSize means don't override
-    virtual void SetTargetHeight(float height) = 0;
-
-    //! Get the overridden max width. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
-    virtual float GetMaxWidth() = 0;
-
-    //! Set the overridden max width. LyShine::UiLayoutCellUnspecifiedSize means don't override
-    virtual void SetMaxWidth(float width) = 0;
-
-    //! Get the overridden max height. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
-    virtual float GetMaxHeight() = 0;
-
-    //! Set the overridden max height. LyShine::UiLayoutCellUnspecifiedSize means don't override
-    virtual void SetMaxHeight(float height) = 0;
-
-    //! Get the overridden extra width ratio. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
-    virtual float GetExtraWidthRatio() = 0;
-
-    //! Set the overridden extra width ratio. LyShine::UiLayoutCellUnspecifiedSize means don't override
-    virtual void SetExtraWidthRatio(float width) = 0;
-
-    //! Get the overridden extra height ratio. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
-    virtual float GetExtraHeightRatio() = 0;
-
-    //! Set the overridden extra height ratio. LyShine::UiLayoutCellUnspecifiedSize means don't override
-    virtual void SetExtraHeightRatio(float height) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiLayoutCellInterface> UiLayoutCellBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h
deleted file mode 100644
index 9b0640b6e2..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiLayoutCellBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiLayoutCellDefaultInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiLayoutCellDefaultInterface() {}
-
-    //! Get the minimum width
-    virtual float GetMinWidth() = 0;
-
-    //! Get the minimum height
-    virtual float GetMinHeight() = 0;
-
-    //! Get the target width
-    //! \param maxWidth A width that the element will not surpass. LyShine::UiLayoutCellUnspecifiedSize means no max 
-    virtual float GetTargetWidth(float maxWidth) = 0;
-
-    //! Get the target height
-    //! \param maxHeight A height that the element will not surpass. LyShine::UiLayoutCellUnspecifiedSize means no max
-    virtual float GetTargetHeight(float maxHeight) = 0;
-
-    //! Get the extra width ratio
-    virtual float GetExtraWidthRatio() = 0;
-
-    //! Get the extra height ratio
-    virtual float GetExtraHeightRatio() = 0;
-
-public: // static member data
-
-    //! Multiple components on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-};
-
-typedef AZ::EBus<UiLayoutCellDefaultInterface> UiLayoutCellDefaultBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutColumnBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutColumnBus.h
deleted file mode 100644
index 0327cbbe04..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutColumnBus.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/Bus/UiLayoutBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiLayoutColumnInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiLayoutColumnInterface() {}
-
-    //! Get the padding (in pixels) inside the edges of the element
-    virtual UiLayoutInterface::Padding GetPadding() = 0;
-
-    //! Set the padding (in pixels) inside the edges of the element
-    virtual void SetPadding(UiLayoutInterface::Padding padding) = 0;
-
-    //! Get the spacing (in pixels) between child elements
-    virtual float GetSpacing() = 0;
-
-    //! Set the spacing (in pixels) between child elements
-    virtual void SetSpacing(float spacing) = 0;
-
-    //! Get the vertical order for this layout
-    virtual UiLayoutInterface::VerticalOrder GetOrder() = 0;
-
-    //! Set the vertical order for this layout
-    virtual void SetOrder(UiLayoutInterface::VerticalOrder order) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiLayoutColumnInterface> UiLayoutColumnBus;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutControllerBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutControllerBus.h
deleted file mode 100644
index 02fa66d847..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutControllerBus.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! This interface can to be implemented by any component that wants to modify transform properties
-//! of elements are runtime using the Layout system. The methods in this interface will be called
-//! by the LayoutManager whenever the element is told to recompute its layout. Because an element
-//! might have multiple components that implement this interface, the handlers will be sorted by
-//! priority (lower priority number gets called earlier).
-class UiLayoutControllerInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiLayoutControllerInterface() {}
-
-    //! Set elements' width transform properties
-    virtual void ApplyLayoutWidth() = 0;
-
-    //! Set elements' height transform properties
-    virtual void ApplyLayoutHeight() = 0;
-
-public: // static member data
-
-    //! Events are ordered, each handler may set its priority
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::MultipleAndOrdered;
-
-    //! Priority will be used for ordering, lower priority number means it gets called earlier
-    struct BusHandlerOrderCompare
-    {
-        AZ_FORCE_INLINE bool operator()(const UiLayoutControllerInterface* left, const UiLayoutControllerInterface* right) const { return left->GetPriority() < right->GetPriority(); }
-    };
-
-protected: // member data
-
-    static const unsigned int k_defaultPriority = 100;  // Default is 100, make it lower to get called earlier, higher to get called later
-    virtual unsigned int GetPriority() const { return k_defaultPriority; }
-};
-
-typedef AZ::EBus<UiLayoutControllerInterface> UiLayoutControllerBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutFitterBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutFitterBus.h
deleted file mode 100644
index a1eda7c30b..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutFitterBus.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! This component resizes its element to fit its content. It uses cell sizing information given to
-//! it by other Layout components, Text component, or Image component (fixed type).
-class UiLayoutFitterInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! Fit type indicating enabled fits
-    enum class FitType
-    {
-        None,
-        HorizontalOnly,
-        VerticalOnly,
-        HorizontalAndVertical
-    };
-
-public: // member functions
-
-    virtual ~UiLayoutFitterInterface() {}
-
-    //! Get whether to resize the element horizontally
-    virtual bool GetHorizontalFit() = 0;
-
-    //! Set whether to resize the element horizontally
-    virtual void SetHorizontalFit(bool horizontalFit) = 0;
-
-    //! Get whether to resize the element vertically
-    virtual bool GetVerticalFit() = 0;
-
-    //! Set whether to resize the element vertically
-    virtual void SetVerticalFit(bool verticalFit) = 0;
-
-    //! Get the fit type
-    virtual FitType GetFitType() = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiLayoutFitterInterface> UiLayoutFitterBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutGridBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutGridBus.h
deleted file mode 100644
index 69d1ba7bd1..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutGridBus.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/Bus/UiLayoutBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiLayoutGridInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! Used to determine which direction to start the layout with
-    enum class StartingDirection
-    {
-        HorizontalOrder,
-        VerticalOrder
-    };
-
-public: // member functions
-
-    virtual ~UiLayoutGridInterface() {}
-
-    //! Get the padding (in pixels) inside the edges of the element
-    virtual UiLayoutInterface::Padding GetPadding() = 0;
-
-    //! Set the padding (in pixels) inside the edges of the element
-    virtual void SetPadding(UiLayoutInterface::Padding padding) = 0;
-
-    //! Get the spacing (in pixels) between child elements
-    virtual AZ::Vector2 GetSpacing() = 0;
-
-    //! Set the spacing (in pixels) between child elements
-    virtual void SetSpacing(AZ::Vector2 spacing) = 0;
-
-    //! Get the size (in pixels) of a child element in this layout
-    virtual AZ::Vector2 GetCellSize() = 0;
-
-    //! Set the size (in pixels) of a child element in this layout
-    virtual void SetCellSize(AZ::Vector2 size) = 0;
-
-    //! Get the horizontal order for this layout
-    virtual UiLayoutInterface::HorizontalOrder GetHorizontalOrder() = 0;
-
-    //! Set the horizontal order for this layout
-    virtual void SetHorizontalOrder(UiLayoutInterface::HorizontalOrder order) = 0;
-
-    //! Get the vertical order for this layout
-    virtual UiLayoutInterface::VerticalOrder GetVerticalOrder() = 0;
-
-    //! Set the vertical order for this layout
-    virtual void SetVerticalOrder(UiLayoutInterface::VerticalOrder order) = 0;
-
-    //! Get the starting direction for this layout
-    virtual StartingDirection GetStartingDirection() = 0;
-
-    //! Set the starting direction for this layout
-    virtual void SetStartingDirection(StartingDirection direction) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiLayoutGridInterface> UiLayoutGridBus;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutManagerBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutManagerBus.h
deleted file mode 100644
index 836ae0d756..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutManagerBus.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiLayoutManagerInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiLayoutManagerInterface() {}
-
-public: // static member data
-
-    //! Mark an element to recompute its layout. This is called when something that affects the layout
-    //! has been modified. (ex. layout element size changed, layout element property changed, layout
-    //! element child count changed.)
-    virtual void MarkToRecomputeLayout(AZ::EntityId entityId) = 0;
-
-    //! Mark the specified element's parent to recompute its layout. The parent uses its child's layout
-    //! cell values to calculate its layout, so this is called when something that affects the
-    //! child's layout cell values has been modified. (ex. child's layout cell property changed.)
-    //! Since a child's layout cell values may affect its parent's layout cell values, the top level parent
-    //! is marked
-    virtual void MarkToRecomputeLayoutsAffectedByLayoutCellChange(AZ::EntityId entityId, bool isDefaultLayoutCell) = 0;
-
-    //! Unmark all elements from needing to recompute their layouts
-    virtual void UnmarkAllLayouts() = 0;
-
-    //! Recompute layouts of marked elements and clear the marked layout list
-    virtual void RecomputeMarkedLayouts() = 0;
-
-    //! Compute the layout for the specified element and its descendants
-    virtual void ComputeLayoutForElementAndDescendants(AZ::EntityId entityId) = 0;
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiLayoutManagerInterface> UiLayoutManagerBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutRowBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutRowBus.h
deleted file mode 100644
index 23db162b62..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiLayoutRowBus.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/Bus/UiLayoutBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiLayoutRowInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiLayoutRowInterface() {}
-
-    //! Get the padding (in pixels) inside the edges of the element
-    virtual UiLayoutInterface::Padding GetPadding() = 0;
-
-    //! Set the padding (in pixels) inside the edges of the element
-    virtual void SetPadding(UiLayoutInterface::Padding padding) = 0;
-
-    //! Get the spacing (in pixels) between child elements
-    virtual float GetSpacing() = 0;
-
-    //! Set the spacing (in pixels) between child elements
-    virtual void SetSpacing(float spacing) = 0;
-
-    //! Get the horizontal order for this layout
-    virtual UiLayoutInterface::HorizontalOrder GetOrder() = 0;
-
-    //! Set the horizontal order for this layout
-    virtual void SetOrder(UiLayoutInterface::HorizontalOrder order) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiLayoutRowInterface> UiLayoutRowBus;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiMarkupButtonBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiMarkupButtonBus.h
deleted file mode 100644
index 919c66780a..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiMarkupButtonBus.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Color.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! A markup button allows for button-like behavior on markup text.
-//!
-//! The markup itself is contained within a text component. The markup button
-//! handles interaction with the text, and can also apply styling (such as
-//! coloring for button/clickable text).
-//!
-//! Markup button behavior is only intended for mouse interactions.
-class UiMarkupButtonInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiMarkupButtonInterface() {}
-
-    //! Get the link color
-    virtual AZ::Color GetLinkColor() = 0;
-
-    //! Set the link color
-    virtual void SetLinkColor(const AZ::Color& linkColor) = 0;
-
-    //! Get the link hover color
-    virtual AZ::Color GetLinkHoverColor() = 0;
-
-    //! Set the link hover color
-    virtual void SetLinkHoverColor(const AZ::Color& linkHoverColor) = 0;
-
-public: // static member data
-
-        //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiMarkupButtonInterface> UiMarkupButtonBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiMarkupButtonNotifications
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiMarkupButtonNotifications() {}
-
-    virtual void OnHoverStart(int id, const AZStd::string& action, const AZStd::string& data) = 0;
-    virtual void OnHoverEnd(int id, const AZStd::string& action, const AZStd::string& data) = 0;
-    virtual void OnPressed(int id, const AZStd::string& action, const AZStd::string& data) = 0;
-    virtual void OnReleased(int id, const AZStd::string& action, const AZStd::string& data) = 0;
-    virtual void OnClick(int id, const AZStd::string& action, const AZStd::string& data) = 0;
-};
-
-typedef AZ::EBus<UiMarkupButtonNotifications> UiMarkupButtonNotificationsBus;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiMaskBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiMaskBus.h
deleted file mode 100644
index fc3fd897ac..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiMaskBus.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiMaskInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiMaskInterface() {}
-
-    //! Get whether masking is enabled
-    virtual bool GetIsMaskingEnabled() = 0;
-
-    //! Set whether masking is enabled
-    virtual void SetIsMaskingEnabled(bool enableMasking) = 0;
-
-    //! Get whether interaction masking is enabled
-    virtual bool GetIsInteractionMaskingEnabled() = 0;
-
-    //! Set whether interaction masking is enabled
-    virtual void SetIsInteractionMaskingEnabled(bool enableInteractionMasking) = 0;
-
-    //! Get whether mask visual is drawn to color buffer behind child elements
-    virtual bool GetDrawBehind() = 0;
-
-    //! Set whether mask visual is drawn to color buffer behind child elements
-    virtual void SetDrawBehind(bool drawMaskVisualBehindChildren) = 0;
-
-    //! Get whether mask visual is drawn to color buffer in front of child elements
-    virtual bool GetDrawInFront() = 0;
-
-    //! Set whether mask visual is drawn to color buffer in front of child elements
-    virtual void SetDrawInFront(bool drawMaskVisualInFrontOfChildren) = 0;
-
-    //! Get whether to use alpha test when drawing mask visual to stencil
-    virtual bool GetUseAlphaTest() = 0;
-
-    //! Set whether to use alpha test when drawing mask visual to stencil
-    virtual void SetUseAlphaTest(bool useAlphaTest) = 0;
-
-    //! Get the flag that indicates whether the mask should use render to texture
-    virtual bool GetUseRenderToTexture() = 0;
-
-    //! Set the flag that indicates whether the mask should use render to texture
-    virtual void SetUseRenderToTexture(bool useRenderToTexture) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiMaskInterface> UiMaskBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiNavigationBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiNavigationBus.h
deleted file mode 100644
index 3b3bf9fbf7..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiNavigationBus.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiNavigationInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    enum class NavigationMode
-    {
-        Automatic,
-        Custom,
-        None
-    };
-
-public: // member functions
-
-    virtual ~UiNavigationInterface() {}
-
-    //! Get the navigation mode
-    virtual NavigationMode GetNavigationMode() = 0;
-
-    //! Set the navigation mode
-    virtual void SetNavigationMode(NavigationMode navigationMode) = 0;
-
-    //! Get the entity to receive focus when up is pressed
-    virtual AZ::EntityId GetOnUpEntity() = 0;
-
-    //! Set the entity to receive focus when up is pressed
-    virtual void SetOnUpEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the entity to receive focus when down is pressed
-    virtual AZ::EntityId GetOnDownEntity() = 0;
-
-    //! Set the entity to receive focus when down is pressed
-    virtual void SetOnDownEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the entity to receive focus when left is pressed
-    virtual AZ::EntityId GetOnLeftEntity() = 0;
-
-    //! Set the entity to receive focus when left is pressed
-    virtual void SetOnLeftEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the entity to receive focus when right is pressed
-    virtual AZ::EntityId GetOnRightEntity() = 0;
-
-    //! Set the entity to receive focus when right is pressed
-    virtual void SetOnRightEntity(AZ::EntityId entityId) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiNavigationInterface> UiNavigationBus;
-
-
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiParticleEmitterBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiParticleEmitterBus.h
deleted file mode 100644
index 88d8da4551..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiParticleEmitterBus.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Color.h>
-#include <AzFramework/Entity/EntityContextBus.h>
-
-class ISprite;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus for making requests to the UiParticleEmitterComponent
-class UiParticleEmitterInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    enum class EmitShape
-    {
-        Point,      //!< particles are emitted from the emitter position along the given angle
-        Circle,     //!< particles are emitted from a circle whose radius is the minimum of the element width and height
-        Quad        //!< particles are emitted from the quad with the same size as the element width and height
-    };
-
-    enum class ParticleCoordinateType
-    {
-        Cartesian,  //!< particles move using X,Y co-ordinates
-        Polar       //!< particles move using X: radial speed, Y: angular speed
-    };
-
-    enum class ParticleInitialDirectionType
-    {
-        RelativeToEmitAngle,    //!< particle initial direction is based on the emit angle
-        RelativeToEmitterCenter //!< particle initial direction is directed away from the emitter shape center
-    };
-
-    enum class ParticleKeyframeTangentType
-    {
-        EaseIn,     //!< A zero/flat tangent, a keyframe with ease in + ease out would act like an x^3 curve at the origin
-        EaseOut,    //!< A zero/flat tangent, a keyframe with ease in + ease out would act like an x^3 curve at the origin
-        Linear,     //!< The curve moves linearly from this keyframe towards the next/previous keyframe
-        Step        //!< The curve jumps from the current keyframe value to the next/previous keyframe value
-    };
-
-    struct ParticleFloatKeyframe
-    {
-        AZ_TYPE_INFO(ParticleFloatKeyframe, "{85DF04FE-F614-47C1-B88A-A9F7D4826F6F}");
-
-        float time = 0.0f;
-        float multiplier = 1.0f;
-        ParticleKeyframeTangentType inTangent = ParticleKeyframeTangentType::EaseIn;
-        ParticleKeyframeTangentType outTangent = ParticleKeyframeTangentType::EaseOut;
-    };
-
-    struct ParticleColorKeyframe
-    {
-        AZ_TYPE_INFO(ParticleColorKeyframe, "{22B0CBC0-21A5-44E3-90C5-9BFEF6E4E3C5}");
-
-        float time = 0.0f;
-        AZ::Color color = AZ::Color(1.0f, 1.0f, 1.0f, 1.0f);
-        ParticleKeyframeTangentType inTangent = ParticleKeyframeTangentType::EaseIn;
-        ParticleKeyframeTangentType outTangent = ParticleKeyframeTangentType::EaseOut;
-    };
-
-public: // member functions
-
-    virtual ~UiParticleEmitterInterface() {}
-
-    //! Gets whether the emitter is emitting particles
-    virtual bool GetIsEmitting() = 0;
-
-    //! Sets whether the emitter is emitting particles
-    virtual void SetIsEmitting(bool emitParticles) = 0;
-
-    //! Gets whether the emitter uses a fixed random seed
-    virtual bool GetIsRandomSeedFixed() = 0;
-
-    //! Sets whether the emitter uses a fixed random seed
-    virtual void SetIsRandomSeedFixed(bool randomSeedFixed) = 0;
-
-    //! Gets the emitter random seed
-    virtual int GetRandomSeed() = 0;
-
-    //! Sets the emitter random seed
-    virtual void SetRandomSeed(int randomSeed) = 0;
-
-    //! Gets whether the particles move relative to the emitter position
-    virtual bool GetIsParticlePositionRelativeToEmitter() = 0;
-
-    //! Sets whether the particles move relative to the emitter position
-    virtual void SetIsParticlePositionRelativeToEmitter(bool relativeToEmitter) = 0;
-
-    //! Gets the amount of particles emitted per second
-    virtual float GetParticleEmitRate() = 0;
-
-    //! Sets the amount of particles emitted per second
-    virtual void SetParticleEmitRate(float particleEmitRate) = 0;
-
-    //! Gets whether the emitter starts emitting on activate
-    virtual bool GetIsEmitOnActivate() = 0;
-
-    //! Sets whether the emitter starts emitting on activate
-    virtual void SetIsEmitOnActivate(bool emitOnActivate) = 0;
-
-    //! Gets whether the average particle count is reached as soon as the emitter starts emitting
-    virtual bool GetIsHitParticleCountOnActivate() = 0;
-
-    //! Sets whether the average particle count is reached as soon as the emitter starts emitting
-    virtual void SetIsHitParticleCountOnActivate(bool hitParticleCountOnActivate) = 0;
-
-    //! Gets whether the emitter lifetime is infinite
-    virtual bool GetIsEmitterLifetimeInfinite() = 0;
-
-    //! Sets whether the emitter lifetime is infinite
-    virtual void SetIsEmitterLifetimeInfinite(bool emitterLifetimeInfinite) = 0;
-
-    //! Gets the lifetime of the emitter (in seconds)
-    virtual float GetEmitterLifetime() = 0;
-
-    //! Sets the lifetime of the emitter (in seconds)
-    virtual void SetEmitterLifetime(float emitterLifetime) = 0;
-
-    //! Gets whether there is a cap on the amount of active particles
-    virtual bool GetIsParticleCountLimited() = 0;
-
-    //! Sets whether there is a cap on the amount of active particles
-    virtual void SetIsParticleCountLimited(bool particleCountLimited) = 0;
-
-    //! Gets the maximum amount of active particles
-    virtual AZ::u32 GetMaxParticles() = 0;
-
-    //! Sets the maximum amount of active particles
-    virtual void SetMaxParticles(AZ::u32 maxParticles) = 0;
-
-    //! Gets the shape of the emitter
-    virtual EmitShape GetEmitterShape() = 0;
-
-    //! Sets the shape of the emitter
-    virtual void SetEmitterShape(EmitShape emitterShape) = 0;
-
-    //! Gets whether the particles are emitted on the edge of the emitter shape
-    virtual bool GetIsEmitOnEdge() = 0;
-
-    //! Sets whether the particles are emitted on the edge of the emitter shape
-    virtual void SetIsEmitOnEdge(bool emitOnEdge) = 0;
-
-    //! Gets the inside distance from the emitter shape edge that particles should emit from
-    virtual float GetInsideEmitDistance() = 0;
-
-    //! Sets the inside distance from the emitter shape edge that particles should emit from
-    virtual void SetInsideEmitDistance(float insideEmitDistance) = 0;
-
-    //! Gets the outside distance from the emitter shape edge that particles should emit from
-    virtual float GetOutsideEmitDistance() = 0;
-
-    //! Sets the outside distance from the emitter shape edge that particles should emit from
-    virtual void SetOutsideEmitDistance(float outsideEmitDistance) = 0;
-
-    //! Gets how the initial direction is calculated for Cartesian movement.
-    virtual ParticleInitialDirectionType GetParticleInitialDirectionType() = 0;
-
-    //! Sets how the initial direction is calculated for Cartesian movement.
-    virtual void SetParticleInitialDirectionType(ParticleInitialDirectionType initialDirectionType) = 0;
-
-    //! Gets the angle that particles are emitted from (in degrees clockwise measured from straight up)
-    virtual float GetEmitAngle() = 0;
-
-    //! Sets the angle that particles are emitted from (in degrees clockwise measured from straight up)
-    virtual void SetEmitAngle(float emitAngle) = 0;
-
-    //! Gets the variation in the angle that particles are emitted from (in degrees, with 10 degrees variation being +/- 10 degrees about the emit angle)
-    virtual float GetEmitAngleVariation() = 0;
-
-    //! Sets the variation in the angle that particles are emitted from (in degrees, with 10 degrees variation being +/- 10 degrees about the emit angle)
-    virtual void SetEmitAngleVariation(float emitAngleVariation) = 0;
-
-    //! Gets whether the particle lifetime is infinite
-    virtual bool GetIsParticleLifetimeInfinite() = 0;
-
-    //! Sets whether the particle lifetime is infinite
-    virtual void SetIsParticleLifetimeInfinite(bool infiniteLifetime) = 0;
-
-    //! Gets the particle life time (in seconds)
-    virtual float GetParticleLifetime() = 0;
-
-    //! Sets the particle life time (in seconds)
-    virtual void SetParticleLifetime(float lifetime) = 0;
-
-    //! Gets the particle life time variation (in seconds, 1 second variation being up to +/- 1 second about the lifetime)
-    virtual float GetParticleLifetimeVariation() = 0;
-
-    //! Sets the particle life time variation (in seconds, 1 second variation being up to +/- 1 second about the lifetime)
-    virtual void SetParticleLifetimeVariation(float lifetimeVariation) = 0;
-
-    //! Gets the sprite to be used by the particles
-    virtual ISprite* GetSprite() = 0;
-
-    //! Sets the sprite to be used by the particles
-    virtual void SetSprite(ISprite* sprite) = 0;
-
-    //! Gets the source location of the image to be displayed by the particles
-    virtual AZStd::string GetSpritePathname() = 0;
-
-    //! Sets the source location of the image to be displayed by the particles
-    virtual void SetSpritePathname(AZStd::string spritePath) = 0;
-
-    //! Gets whether the sprite-sheet cell index changes over time
-    virtual bool GetIsSpriteSheetAnimated() = 0;
-
-    //! Sets whether the sprite-sheet cell index changes over time
-    virtual void SetIsSpriteSheetAnimated(bool isSpriteSheetAnimated) = 0;
-
-    //! Gets whether the sprite-sheet cell animation is looped
-    virtual bool GetIsSpriteSheetAnimationLooped() = 0;
-
-    //! Sets whether the sprite-sheet cell animation is looped
-    virtual void SetIsSpriteSheetAnimationLooped(bool isSpriteSheetAnimationLooped) = 0;
-
-    //! Gets whether the sprite-sheet cell (starting) index is random
-    virtual bool GetIsSpriteSheetIndexRandom() = 0;
-
-    //! Sets whether the sprite-sheet cell (starting) index is random
-    virtual void SetIsSpriteSheetIndexRandom(bool isSpriteSheetIndexRandom) = 0;
-
-    //! Gets the sprite-sheet cell (starting) index
-    virtual int GetSpriteSheetCellIndex() = 0;
-
-    //! Sets the sprite-sheet cell (starting) index
-    virtual void SetSpriteSheetCellIndex(int spriteSheetIndex) = 0;
-
-    //! Gets the sprite-sheet cell end index
-    virtual int GetSpriteSheetCellEndIndex() = 0;
-
-    //! Sets the sprite-sheet cell end index
-    virtual void SetSpriteSheetCellEndIndex(int spriteSheetEndIndex) = 0;
-
-    //! Gets the sprite-sheet cell frame delay (in seconds)
-    virtual float GetSpriteSheetFrameDelay() = 0;
-
-    //! Sets the sprite-sheet cell frame delay (in seconds)
-    virtual void SetSpriteSheetFrameDelay(float spriteSheetFrameDelay) = 0;
-
-    //! Gets whether the aspect ratio of the particles is locked
-    virtual bool GetIsParticleAspectRatioLocked() = 0;
-
-    //! Sets whether the aspect ratio of the particles is locked
-    virtual void SetIsParticleAspectRatioLocked(bool aspectRatioLocked) = 0;
-
-    //! Gets the particle pivot (where 0,0 is the top left of the particle and 1,1 is the bottom right of the particle)
-    virtual AZ::Vector2 GetParticlePivot() = 0;
-
-    //! Sets the particle pivot (where 0,0 is the top left of the particle and 1,1 is the bottom right of the particle)
-    virtual void SetParticlePivot(AZ::Vector2 particlePivot) = 0;
-
-    //! Gets the particle size
-    virtual AZ::Vector2 GetParticleSize() = 0;
-
-    //! Sets the particle size
-    virtual void SetParticleSize(AZ::Vector2 particleSize) = 0;
-
-    //! Gets the particle width
-    virtual float GetParticleWidth() = 0;
-
-    //! Sets the particle width
-    virtual void SetParticleWidth(float width) = 0;
-
-    //! Gets the particle width variation (a variation of 1 being up to 1 either side of the given width)
-    virtual float GetParticleWidthVariation() = 0;
-
-    //! Sets the particle width variation (a variation of 1 being up to 1 either side of the given width)
-    virtual void SetParticleWidthVariation(float widthVariation) = 0;
-
-    //! Gets the particle height
-    virtual float GetParticleHeight() = 0;
-
-    //! Sets the particle height
-    virtual void SetParticleHeight(float height) = 0;
-
-    //! Gets the particle height variation (a variation of 5 being up to 5 either side of the given height)
-    virtual float GetParticleHeightVariation() = 0;
-
-    //! Sets the particle height variation (a variation of 5 being up to 5 either side of the given height)
-    virtual void SetParticleHeightVariation(float heightVariation) = 0;
-
-    //! Gets the particle movement co-ordinate type
-    virtual ParticleCoordinateType GetParticleMovementCoordinateType() = 0;
-
-    //! Sets the particle movement co-ordinate type
-    virtual void SetParticleMovementCoordinateType(ParticleCoordinateType particleMovementCoordinateType) = 0;
-
-    //! Gets the particle acceleration co-ordinate type
-    virtual ParticleCoordinateType GetParticleAccelerationCoordinateType() = 0;
-
-    //! Sets the particle acceleration co-ordinate type
-    virtual void SetParticleAccelerationCoordinateType(ParticleCoordinateType particleAccelerationCoordinateType) = 0;
-
-    //! Gets the particle initial velocity for Polar movement
-    virtual AZ::Vector2 GetParticleInitialVelocity() = 0;
-
-    //! Sets the particle initial velocity for Polar movement
-    virtual void SetParticleInitialVelocity(AZ::Vector2 initialVelocity) = 0;
-
-    //! Gets the particle initial velocity variation for Polar movement (a variation of (1,2) being up to (1,2) either side of the initial velocity)
-    virtual AZ::Vector2 GetParticleInitialVelocityVariation() = 0;
-
-    //! Sets the particle initial velocity variation for Polar movement (a variation of (1,2) being up to (1,2) either side of the initial velocity)
-    virtual void SetParticleInitialVelocityVariation(AZ::Vector2 initialVelocityVariation) = 0;
-
-    //! Gets the particle speed for particles with a random initial direction for Cartesian movement
-    virtual float GetParticleSpeed() = 0;
-
-    //! Sets the particle speed for particles with a random initial direction for Cartesian movement
-    virtual void SetParticleSpeed(float speed) = 0;
-
-    //! Gets the particle speed variation for particles with a random initial direction for Cartesian movement (a variation of 1 being up to 1 either side of the given speed)
-    virtual float GetParticleSpeedVariation() = 0;
-
-    //! Sets the particle speed variation for particles with a random initial direction for Cartesian movement (a variation of 1 being up to 1 either side of the given speed)
-    virtual void SetParticleSpeedVariation(float speedVariation) = 0;
-
-    //! Gets the particle acceleration
-    virtual AZ::Vector2 GetParticleAcceleration() = 0;
-
-    //! Sets the particle acceleration
-    virtual void SetParticleAcceleration(AZ::Vector2 acceleration) = 0;
-
-    //! Gets whether the particle rotation is based on the current velocity
-    virtual bool GetIsParticleRotationFromVelocity() = 0;
-
-    //! Sets whether the particle rotation is based on the current velocity
-    virtual void SetIsParticleRotationFromVelocity(bool rotationFromVelocity) = 0;
-
-    //! Gets whether the particle initial rotation is based on the initial velocity
-    virtual bool GetIsParticleInitialRotationFromInitialVelocity() = 0;
-
-    //! Sets whether the particle initial rotation is based on the initial velocity
-    virtual void SetIsParticleInitialRotationFromInitialVelocity(bool rotationFromVelocity) = 0;
-
-    //! Gets the particle initial rotation (in degrees)
-    virtual float GetParticleInitialRotation() = 0;
-
-    //! Sets the particle initial rotation (in degrees)
-    virtual void SetParticleInitialRotation(float initialRotation) = 0;
-
-    //! Gets the particle initial rotation variation (in degrees, a variation of 10 being up to 10 degrees either side of the initial rotation)
-    virtual float GetParticleInitialRotationVariation() = 0;
-
-    //! Sets the particle initial rotation variation (in degrees, a variation of 10 being up to 10 degrees either side of the initial rotation)
-    virtual void SetParticleInitialRotationVariation(float initialRotationVariation) = 0;
-
-    //! Gets the particle rotation speed (in degrees per second)
-    virtual float GetParticleRotationSpeed() = 0;
-
-    //! Sets the particle rotation speed (in degrees per second)
-    virtual void SetParticleRotationSpeed(float rotationSpeed) = 0;
-
-    //! Gets the particle rotation speed variation (in degrees, a variation of 5 being up to 5 either side of the rotation speed)
-    virtual float GetParticleRotationSpeedVariation() = 0;
-
-    //! Sets the particle rotation speed variation (in degrees, a variation of 5 being up to 5 either side of the rotation speed)
-    virtual void SetParticleRotationSpeedVariation(float rotationSpeedVariation) = 0;
-
-    //! Gets the particle color tint
-    virtual AZ::Color GetParticleColor() = 0;
-
-    //! Sets the particle color tint
-    virtual void SetParticleColor(AZ::Color color) = 0;
-
-    //! Gets the particle color brightness variation (from 0-1, 0 being no variation, 1 being random variation from the original color down to black)
-    virtual float GetParticleColorBrightnessVariation() = 0;
-
-    //! Sets the particle color brightness variation (from 0-1, 0 being no variation, 1 being random variation from the original color down to black)
-    virtual void SetParticleColorBrightnessVariation(float brightnessVariation) = 0;
-
-    //! Gets the particle color tint variation
-    virtual float GetParticleColorTintVariation() = 0;
-
-    //! Sets the particle color tint variation
-    virtual void SetParticleColorTintVariation(float tintVariation) = 0;
-
-    //! Gets the particle alpha
-    virtual float GetParticleAlpha() = 0;
-
-    //! Sets the particle alpha
-    virtual void SetParticleAlpha(float alpha) = 0;
-};
-
-using UiParticleEmitterBus = AZ::EBus<UiParticleEmitterInterface>;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonBus.h
deleted file mode 100644
index 5e39655e82..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonBus.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a radio button component needs to implement. A radio button component
-//! provides functionality for a button that can be turned on or off and is dependent on the other
-//! radio buttons in the same radio button group. This interface is designed to be used in
-//! conjunction with the UiRadioButtonGroupInterface, which describes the group for radio buttons.
-class UiRadioButtonInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiRadioButtonInterface() {}
-
-    //! Query the state of the radio button
-    //! \return     The current state for the radio button.
-    virtual bool GetState() = 0;
-
-    //! Get the radio button group
-    virtual AZ::EntityId GetGroup() = 0;
-
-    //! Get the optional checked (ON) entity
-    virtual AZ::EntityId GetCheckedEntity() = 0;
-
-    //! Set the optional checked (ON) entity
-    virtual void SetCheckedEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional unchecked (OFF) entity
-    virtual AZ::EntityId GetUncheckedEntity() = 0;
-
-    //! Set the optional unchecked (OFF) entity
-    virtual void SetUncheckedEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the action triggered when turned on
-    virtual const LyShine::ActionName& GetTurnOnActionName() = 0;
-
-    //! Set the action triggered when turned on
-    virtual void SetTurnOnActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the action triggered when turned off
-    virtual const LyShine::ActionName& GetTurnOffActionName() = 0;
-
-    //! Set the action triggered when turned off
-    virtual void SetTurnOffActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the action triggered when changed
-    virtual const LyShine::ActionName& GetChangedActionName() = 0;
-
-    //! Set the action triggered when changed
-    virtual void SetChangedActionName(const LyShine::ActionName& actionName) = 0;
-
-public: // static member data
-
-        //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiRadioButtonInterface> UiRadioButtonBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiRadioButtonNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiRadioButtonNotifications() {}
-
-    //! Notify listeners that the radio button state has changed
-    virtual void OnRadioButtonStateChange([[maybe_unused]] bool checked) {}
-};
-
-typedef AZ::EBus<UiRadioButtonNotifications> UiRadioButtonNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h
deleted file mode 100644
index 64b9a44427..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a radio button component needs to implement. This interface allows the
-//! radio button group to communicate with the radio button itself
-class UiRadioButtonCommunicationInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiRadioButtonCommunicationInterface() {}
-
-    //! Used by the group to set the state of the radio button
-    //! \param     The new desired state of the radio button.
-    //! \param     Whether the button should inform listeners that it was changed.
-    virtual void SetState(bool isOn, bool sendNotifications) = 0;
-
-    //! Set the radio button group
-    virtual void SetGroup(AZ::EntityId group) = 0;
-
-public: // static member data
-
-    //! Only one component on an entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiRadioButtonCommunicationInterface> UiRadioButtonCommunicationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h
deleted file mode 100644
index 0dafcd68ae..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a radio button group component needs to implement. A radio button group
-//! component provides functionality to manage a group of radio buttons. A group of radio buttons
-//! allows users to choose one of a predefined set of mutually exclusive options. No more than one
-//! item may be selected.
-class UiRadioButtonGroupInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiRadioButtonGroupInterface() {}
-
-    //! Query the state of the radio button group
-    //! \return     The currently checked radio button.
-    virtual AZ::EntityId GetCheckedRadioButton() = 0;
-
-    //! Set a radio button to a desired state
-    virtual void SetState(AZ::EntityId radioButton, bool isOn) = 0;
-
-    //! Get the allow uncheck flag
-    virtual bool GetAllowUncheck() = 0;
-
-    //! Set the allow uncheck flag
-    virtual void SetAllowUncheck(bool allowUncheck) = 0;
-
-    //! Add a new radio button to the group
-    virtual void AddRadioButton(AZ::EntityId radioButton) = 0;
-
-    //! Remove a radio button from the group
-    virtual void RemoveRadioButton(AZ::EntityId radioButton) = 0;
-
-    //! Query whether a radio button is in the group or not
-    virtual bool ContainsRadioButton(AZ::EntityId radioButton) = 0;
-
-    //! Get the action triggered when changed
-    virtual const LyShine::ActionName& GetChangedActionName() = 0;
-
-    //! Set the action triggered when changed
-    virtual void SetChangedActionName(const LyShine::ActionName& actionName) = 0;
-
-public: // static member data
-
-        //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiRadioButtonGroupInterface> UiRadioButtonGroupBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiRadioButtonGroupNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiRadioButtonGroupNotifications() {}
-
-    //! Notify listeners that the radio button group state has changed
-    virtual void OnRadioButtonGroupStateChange([[maybe_unused]] AZ::EntityId checkedRadioButton) {}
-};
-
-typedef AZ::EBus<UiRadioButtonGroupNotifications> UiRadioButtonGroupNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
deleted file mode 100644
index a28435a2cd..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a radio button group component needs to implement. This interface allows
-//! a radio button to communicate with the radio button group itself
-class UiRadioButtonGroupCommunicationInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiRadioButtonGroupCommunicationInterface() {}
-
-    //! Registers a radio button within a group
-    //! \param      The radio button to add
-    //! \return     Whether the radio button was successfully added to the group or not
-    virtual bool RegisterRadioButton(AZ::EntityId radioButton) = 0;
-
-    //! Unregisters a radio button within a group
-    //! \param      The radio button to remove
-    virtual void UnregisterRadioButton(AZ::EntityId radioButton) = 0;
-
-    //! Called when a radio button wants to change state due to user action (i.e. by clicking it)
-    //! \param      The radio button to change the state of
-    //! \param      The new radio button state
-    virtual void RequestRadioButtonStateChange(AZ::EntityId radioButton, bool newState) = 0;
-
-public: // static member data
-
-    //! Only one component on an entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiRadioButtonGroupCommunicationInterface> UiRadioButtonGroupCommunicationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRenderBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiRenderBus.h
deleted file mode 100644
index b5eebb716b..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiRenderBus.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-namespace LyShine
-{
-    class IRenderGraph;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiRenderInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiRenderInterface() {}
-
-    //! Render the component into the render graph
-    virtual void Render(LyShine::IRenderGraph* renderGraph) = 0;
-
-public: // static member data
-
-    //! Multiple components on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-};
-
-typedef AZ::EBus<UiRenderInterface> UiRenderBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiRenderControlBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiRenderControlBus.h
deleted file mode 100644
index 10835a4e3e..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiRenderControlBus.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-namespace LyShine
-{
-    class IRenderGraph;
-}
-
-class UiElementInterface;
-class UiRenderInterface;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! The UiRenderControlBus is used for controlling the rendering of elements that affect the rendering
-//! of their children.
-//! An example use is a mask component that needs to setup stencil write before rendering its
-//! components to increment the stencil buffer, switch to stencil test before rendering the child
-//! elements and then do a second pass to decrement the stencil buffer.
-//! The interface is designed to be flexible and could also be used for setting up scissoring or
-//! rendering to a texture.
-class UiRenderControlInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiRenderControlInterface() {}
-
-    //! This renders this element plus its children. It allows the RenderControl element to control
-    //! the order in which the element's component and children are rendered and to change state
-    //! at any point while rendering them.
-    //! \param renderGraph, the render graph being added to
-    //! \param elementInterface, pointer to the element interface for this element (for performance)
-    //! \param renderInterface, pointer to the render interface for this element (for performance)
-    //! \param numChildren, the number of child elements of this element
-    //! \param isInGame, true if element being rendered in game (or preview), false if being render in edit mode
-    virtual void Render(
-        LyShine::IRenderGraph* renderGraph,
-        UiElementInterface* elementInterface,
-        UiRenderInterface* renderInterface,
-        int numChildren,
-        bool isInGame) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiRenderControlInterface> UiRenderControlBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBarBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBarBus.h
deleted file mode 100644
index d124577cf9..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBarBus.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiScrollBarInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiScrollBarInterface() {}
-
-    //! Get the size of the handle relative to the scrollbar (0 - 1)
-    virtual float GetHandleSize() = 0;
-
-    //! Set the size of the handle relative to the scrollbar (0 - 1)
-    virtual void SetHandleSize(float size) = 0;
-
-    //! Get the minimum size of the handle in pixels
-    virtual float GetMinHandlePixelSize() = 0;
-
-    //! Set the minimum size of the handle in pixels
-    virtual void SetMinHandlePixelSize(float size) = 0;
-
-    //! Get the handle entity
-    virtual AZ::EntityId GetHandleEntity() = 0;
-
-    //! Set the handle entity
-    virtual void SetHandleEntity(AZ::EntityId entityId) = 0;
-
-    //! Get auto fade
-    virtual bool IsAutoFadeEnabled() = 0;
-
-    //! Set auto fade
-    virtual void SetAutoFadeEnabled(bool isAutoFadeEnabled) = 0;
-
-    //! Get the delay in seconds before the scrollbar will fade if unused
-    virtual float GetAutoFadeDelay() = 0;
-
-    //! Set the fade delay in seconds
-    virtual void SetAutoFadeDelay(float delay) = 0;
-
-    //! Get the speed in seconds that it will take for the scrollbar to fade to transparent
-    virtual float GetAutoFadeSpeed() = 0;
-
-    //! Set the fade speed in seconds
-    virtual void SetAutoFadeSpeed(float speed) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiScrollBarInterface> UiScrollBarBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBoxBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBoxBus.h
deleted file mode 100644
index 9d49c6c0b0..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollBoxBus.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/UiBase.h>
-#include <functional>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiScrollBoxInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! Callback for when box is scrolled
-    typedef AZStd::function<void(AZ::EntityId sendingEntityId, AZ::Vector2 newScrollOffset)> ScrollOffsetChangeCallback;
-
-    enum class SnapMode
-    {
-        None,
-        Children,
-        Grid
-    };
-
-    enum class ScrollBarVisibility
-    {
-        AlwaysShow,
-        AutoHide,
-        AutoHideAndResizeViewport
-    };
-
-public: // member functions
-
-    virtual ~UiScrollBoxInterface() {}
-
-    //! Query the current scroll offset of the scroll box
-    //! \return     The current scroll offset for the scroll box.
-    //!
-    //! The scroll offset is the offset from the content element's anchor point to
-    //! the content element's pivot.
-    //! If the content element's anchor points are split it is the offset from
-    //! their center to the pivot.
-    //! So if the mouse is dragged left, the content moves to the left, so the offset
-    //! X has the X drag amount subtracted from it.
-    //! Using the offset from the anchor to the pivot allows the offset to be center
-    //! to center or top-left to top-left, or any combination of the possible
-    //! anchor and pivot positions
-    virtual AZ::Vector2 GetScrollOffset() = 0;
-
-    //! Set the scroll offset of the scroll box
-    //! \param isOn     The new desired scroll offset of the scroll box.
-    virtual void SetScrollOffset(AZ::Vector2 scrollOffset) = 0;
-
-    //! Get the scroll value from 0 - 1
-    virtual AZ::Vector2 GetNormalizedScrollValue() = 0;
-
-    //! Change content size and scroll offset, and handle the changes
-    virtual void ChangeContentSizeAndScrollOffset(AZ::Vector2 contentSize, AZ::Vector2 scrollOffset) = 0;
-
-    //! Get whether there is content to scroll horizontally
-    virtual bool HasHorizontalContentToScroll() = 0;
-
-    //! Get whether there is content to scroll vertically
-    virtual bool HasVerticalContentToScroll() = 0;
-
-    //! Get whether horizontal scrolling interaction is enabled
-    virtual bool GetIsHorizontalScrollingEnabled() = 0;
-
-    //! Set whether horizontal scrolling interaction is enabled
-    virtual void SetIsHorizontalScrollingEnabled(bool isEnabled) = 0;
-
-    //! Get whether vertical scrolling interaction is enabled
-    virtual bool GetIsVerticalScrollingEnabled() = 0;
-
-    //! Set whether vertical scrolling interaction is enabled
-    virtual void SetIsVerticalScrollingEnabled(bool isEnabled) = 0;
-
-    //! Get whether scrolling interaction is constrained to the content area
-    virtual bool GetIsScrollingConstrained() = 0;
-
-    //! Set whether vertical scrolling interaction is constrained to the content area
-    virtual void SetIsScrollingConstrained(bool isConstrained) = 0;
-
-    //! Get snap mode
-    virtual SnapMode GetSnapMode() = 0;
-
-    //! Set snap mode
-    virtual void SetSnapMode(SnapMode snapMode) = 0;
-
-    //! Get snap grid
-    virtual AZ::Vector2 GetSnapGrid() = 0;
-
-    //! Set snap grid
-    virtual void SetSnapGrid(AZ::Vector2 snapGrid) = 0;
-
-    //! Get horizontal scrollbar visibility behavior
-    virtual ScrollBarVisibility GetHorizontalScrollBarVisibility() = 0;
-
-    //! Set horizontal scrollbar visibility behavior
-    virtual void SetHorizontalScrollBarVisibility(ScrollBarVisibility visibility) = 0;
-
-    //! Get vertical scrollbar visibility behavior
-    virtual ScrollBarVisibility GetVerticalScrollBarVisibility() = 0;
-
-    //! Set vertical scrollbar visibility behavior
-    virtual void SetVerticalScrollBarVisibility(ScrollBarVisibility visibility) = 0;
-
-    //! Get the callback invoked while the scroll offset is changing
-    virtual ScrollOffsetChangeCallback GetScrollOffsetChangingCallback() = 0;
-
-    //! Set the callback invoked while the scroll offset is changing
-    virtual void SetScrollOffsetChangingCallback(ScrollOffsetChangeCallback onChange) = 0;
-
-    //! Get the action triggered while the scroll offset is changing
-    virtual const LyShine::ActionName& GetScrollOffsetChangingActionName() = 0;
-
-    //! Set the action triggered while the scroll offset is changing
-    virtual void SetScrollOffsetChangingActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the callback invoked when the scroll offset is done changing
-    virtual ScrollOffsetChangeCallback GetScrollOffsetChangedCallback() = 0;
-
-    //! Set the callback invoked when the scroll offset is done changing
-    virtual void SetScrollOffsetChangedCallback(ScrollOffsetChangeCallback onChange) = 0;
-
-    //! Get the action triggered when the scroll offset is done changing
-    virtual const LyShine::ActionName& GetScrollOffsetChangedActionName() = 0;
-
-    //! Set the action triggered when the scroll offset is done changing
-    virtual void SetScrollOffsetChangedActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Set the optional content entity, if none is specified then nothing gets scrolled
-    virtual void SetContentEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional content entity
-    virtual AZ::EntityId GetContentEntity() = 0;
-
-    //! Set the optional horizontal scrollbar entity
-    virtual void SetHorizontalScrollBarEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional horizontal scrollbar entity
-    virtual AZ::EntityId GetHorizontalScrollBarEntity() = 0;
-
-    //! Set the optional vertical scrollbar entity
-    virtual void SetVerticalScrollBarEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional vertical scrollbar entity
-    virtual AZ::EntityId GetVerticalScrollBarEntity() = 0;
-
-    //! Find the child of the content element that is closest to the content anchors
-    //! at the current scroll offset. i.e. what is the currently "selected" child
-    virtual AZ::EntityId FindClosestContentChildElement() = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiScrollBoxInterface> UiScrollBoxBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement to receive scroll box change notifications
-class UiScrollBoxNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiScrollBoxNotifications(){}
-
-    //! Called when the scroll offset is changing
-    virtual void OnScrollOffsetChanging(AZ::Vector2 newScrollOffset) = 0;
-
-    //! Called when the scroll offset is done changing
-    virtual void OnScrollOffsetChanged(AZ::Vector2 newScrollOffset) = 0;
-};
-
-typedef AZ::EBus<UiScrollBoxNotifications> UiScrollBoxNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollableBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollableBus.h
deleted file mode 100644
index a1272a07bf..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollableBus.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a scrollable component needs to implement. A scrollable component is one
-//! that provides functionality to scroll its content
-//! (e.g. UiScrollBoxComponent)
-class UiScrollableInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiScrollableInterface() {}
-
-    //! Get the ratio between the scrollable content size and the size of its parent
-    virtual bool GetScrollableParentToContentRatio(AZ::Vector2& ratioOut) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiScrollableInterface> UiScrollableBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement in order to get notifications when values of the
-//! scrollable change
-class UiScrollableNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiScrollableNotifications(){}
-
-    //! Called when the scroll value (0 - 1) is changing
-    virtual void OnScrollableValueChanging(AZ::Vector2 value) = 0;
-
-    //! Called when the scroll value (0 - 1) has been changed
-    virtual void OnScrollableValueChanged(AZ::Vector2 value) = 0;
-};
-
-typedef AZ::EBus<UiScrollableNotifications> UiScrollableNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that scrollers need to implement in order to get notifications of changes
-//! created by the scrollable
-class UiScrollableToScrollerNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiScrollableToScrollerNotifications(){}
-
-    //! Called when the scrollable is changing the scroll value (0 - 1)
-    virtual void OnValueChangingByScrollable(AZ::Vector2 value) = 0;
-
-    //! Called when the scrollable is done changing the scroll value (0 - 1)
-    virtual void OnValueChangedByScrollable(AZ::Vector2 value) = 0;
-
-    //! Called when the content size or content parent size has been changed
-    virtual void OnScrollableParentToContentRatioChanged(AZ::Vector2 parentToContentRatio) = 0;
-};
-
-typedef AZ::EBus<UiScrollableToScrollerNotifications> UiScrollableToScrollerNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollerBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollerBus.h
deleted file mode 100644
index 36975e3e80..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiScrollerBus.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a scroller component needs to implement. A scroller component provides
-//! functionality to control the scrolling of scrollable content
-//! (e.g. UiScrollBarComponent)
-class UiScrollerInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! params: sending entity id, newValue, newPosition
-    typedef AZStd::function<void(AZ::EntityId, float)> ValueChangeCallback;
-
-    //! Scroller orientation
-    enum class Orientation
-    {
-        Horizontal,
-        Vertical
-    };
-
-public: // member functions
-
-    virtual ~UiScrollerInterface() {}
-
-    //! Get the current value for the scrollbar (0 - 1)
-    virtual float GetValue() = 0;
-
-    //! Set the value of the scrollbar (0 - 1)
-    virtual void SetValue(float value) = 0;
-
-    //! Get the orientation of the scroller
-    virtual Orientation GetOrientation() = 0;
-
-    //! Set the orientation of the scroller
-    virtual void SetOrientation(Orientation orientation) = 0;
-
-    //! Get the scrollable entity
-    virtual AZ::EntityId GetScrollableEntity() = 0;
-
-    //! Set the scrollable entity
-    virtual void SetScrollableEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the callback invoked while the value is changing
-    virtual ValueChangeCallback GetValueChangingCallback() = 0;
-
-    //! Set the callback invoked while the value is changing
-    virtual void SetValueChangingCallback(ValueChangeCallback onChange) = 0;
-
-    //! Get the callback invoked when the value is done changing
-    virtual ValueChangeCallback GetValueChangedCallback() = 0;
-
-    //! Set the callback invoked when the value is done changing
-    virtual void SetValueChangedCallback(ValueChangeCallback onChange) = 0;
-
-    //! Get the action triggered while the value is changing
-    virtual const LyShine::ActionName& GetValueChangingActionName() = 0;
-
-    //! Set the action triggered while the value is changing
-    virtual void SetValueChangingActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the action triggered when the value is done changing
-    virtual const LyShine::ActionName& GetValueChangedActionName() = 0;
-
-    //! Set the action triggered when the value is done changing
-    virtual void SetValueChangedActionName(const LyShine::ActionName& actionName) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiScrollerInterface> UiScrollerBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement in order to get notifications when values of the
-//! scroller change
-class UiScrollerNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiScrollerNotifications(){}
-
-    //! Called when the scroller value (0 - 1) is changing
-    virtual void OnScrollerValueChanging(float value) = 0;
-
-    //! Called when the scroller value (0 - 1) has been changed
-    virtual void OnScrollerValueChanged(float value) = 0;
-};
-
-typedef AZ::EBus<UiScrollerNotifications> UiScrollerNotificationBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that scrollables need to implement in order to get notifications when the scroller
-//! changes the value
-class UiScrollerToScrollableNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiScrollerToScrollableNotifications(){}
-
-    //! Called when the scroller is changing the scroll value (0 - 1)
-    virtual void OnValueChangingByScroller(float value) = 0;
-
-    //! Called when the scroller is done changing the scroll value (0 - 1)
-    virtual void OnValueChangedByScroller(float value) = 0;
-};
-
-typedef AZ::EBus<UiScrollerToScrollableNotifications> UiScrollerToScrollableNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiSliderBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiSliderBus.h
deleted file mode 100644
index c6ffb68b3e..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiSliderBus.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiSliderInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! params: sending entity id, newValue, newPosition
-    typedef AZStd::function<void(AZ::EntityId, float)> ValueChangeCallback;
-
-public: // member functions
-
-    virtual ~UiSliderInterface() {}
-
-    //! Query the value of the slider
-    //! \return     The current value for the slider.
-    virtual float GetValue() = 0;
-
-    //! Manually override the value of the slider
-    //! \param isOn     The new desired value of the slider.
-    virtual void SetValue(float value) = 0;
-
-    virtual float GetMinValue() = 0;
-    virtual void SetMinValue(float value) = 0;
-    virtual float GetMaxValue() = 0;
-    virtual void SetMaxValue(float value) = 0;
-    virtual float GetStepValue() = 0;
-    virtual void SetStepValue(float step) = 0;
-
-    //! Get the callback invoked while the value is changing
-    virtual ValueChangeCallback GetValueChangingCallback() = 0;
-
-    //! Set the callback invoked while the value is changing
-    virtual void SetValueChangingCallback(ValueChangeCallback onChange) = 0;
-
-    //! Get the action triggered while the value is changing
-    virtual const LyShine::ActionName& GetValueChangingActionName() = 0;
-
-    //! Set the action triggered while the value is changing
-    virtual void SetValueChangingActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the callback invoked when the value is done changing
-    virtual ValueChangeCallback GetValueChangedCallback() = 0;
-
-    //! Set the callback invoked when the value is done changing
-    virtual void SetValueChangedCallback(ValueChangeCallback onChange) = 0;
-
-    //! Get the action triggered when the value is done changing
-    virtual const LyShine::ActionName& GetValueChangedActionName() = 0;
-
-    //! Set the action triggered when the value is done changing
-    virtual void SetValueChangedActionName(const LyShine::ActionName& actionName) = 0;
-
-    //! Set the optional track entity
-    virtual void SetTrackEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional track entity
-    virtual AZ::EntityId GetTrackEntity() = 0;
-
-    //! Set the optional fill entity
-    virtual void SetFillEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional fill entity
-    virtual AZ::EntityId GetFillEntity() = 0;
-
-    //! Set the optional manipulator entity
-    virtual void SetManipulatorEntity(AZ::EntityId entityId) = 0;
-
-    //! Get the optional manipulator entity
-    virtual AZ::EntityId GetManipulatorEntity() = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiSliderInterface> UiSliderBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiSliderNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiSliderNotifications() {}
-
-    //! Notify listeners that the slider value is changing
-    virtual void OnSliderValueChanging([[maybe_unused]] float value) {}
-
-    //! Notify listeners that the slider value is done changing
-    virtual void OnSliderValueChanged([[maybe_unused]] float value) {}
-};
-
-typedef AZ::EBus<UiSliderNotifications> UiSliderNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiSpawnerBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiSpawnerBus.h
deleted file mode 100644
index b0674d1c78..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiSpawnerBus.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzFramework/Entity/EntityContextBus.h>
-#include <AzFramework/Slice/SliceInstantiationTicket.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus for making requests to the UiSpawnerComponent
-class UiSpawnerInterface
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiSpawnerInterface() {}
-
-    //! Spawn the selected slice at the entity's location
-    virtual AzFramework::SliceInstantiationTicket Spawn() = 0;
-
-    //! Spawn the selected slice at the entity's location with the provided relative offset
-    virtual AzFramework::SliceInstantiationTicket SpawnRelative(const AZ::Vector2& relative) = 0;
-
-    //! Spawn the selected slice at the specified viewport position
-    virtual AzFramework::SliceInstantiationTicket SpawnViewport(const AZ::Vector2& pos) { (void)pos; return AzFramework::SliceInstantiationTicket(); };
-
-    //! Spawn the provided slice at the entity's location
-    virtual AzFramework::SliceInstantiationTicket SpawnSlice(const AZ::Data::Asset<AZ::Data::AssetData>& slice) { (void)slice; return AzFramework::SliceInstantiationTicket(); };
-
-    //! Spawn the provided slice at the entity's location with the provided relative offset
-    virtual AzFramework::SliceInstantiationTicket SpawnSliceRelative(const AZ::Data::Asset<AZ::Data::AssetData>& slice, const AZ::Vector2& relative) { (void)slice; (void)relative; return AzFramework::SliceInstantiationTicket(); };
-
-    //! Spawn the provided slice at the specified viewport position
-    virtual AzFramework::SliceInstantiationTicket SpawnSliceViewport(const AZ::Data::Asset<AZ::Data::AssetData>& slice, const AZ::Vector2& pos) { (void)slice; (void)pos; return AzFramework::SliceInstantiationTicket(); };
-};
-
-using UiSpawnerBus = AZ::EBus<UiSpawnerInterface>;
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Bus for notifications dispatched by the UiSpawnerComponent
-//! Whenever one of the "Spawn" calls in UiSpawnerInterface is called then a listener connected
-//! on this bus with the spawner entity ID will either get:
-//! 1. This sequence of notifications:
-//!    OnSpawnBegin
-//!    N x OnEntitySpawned
-//!    OnEntitiesSpawned
-//!    OnTopLevelEntitiesSpawned
-//!    OnSpawnEnd
-//! 2. In the case of a spawn error just this notification:
-//!    OnSpawnFailed
-class UiSpawnerNotifications
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiSpawnerNotifications() {}
-
-    //! Notify that slice has been spawned, but entities have not yet been activated.
-    //! OnEntitySpawned events are about to be dispatched.
-    virtual void OnSpawnBegin(const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
-
-    //! Notify that an entity has spawned, will be called once for each entity spawned in a slice.
-    virtual void OnEntitySpawned(const AzFramework::SliceInstantiationTicket& /*ticket*/, const AZ::EntityId& /*spawnedEntity*/) {}
-
-    //! Single event notification for an entire slice spawn, providing a list of all resulting entity Ids.
-    virtual void OnEntitiesSpawned(const AzFramework::SliceInstantiationTicket& /*ticket*/, const AZStd::vector<AZ::EntityId>& /*spawnedEntities*/) {}
-
-    //! Single event notification for an entire slice spawn, providing a list of all resulting top-level entity Ids.
-    //! Top-level entities are ones that are not the child of any other entity in the slice
-    virtual void OnTopLevelEntitiesSpawned(const AzFramework::SliceInstantiationTicket& /*ticket*/, const AZStd::vector<AZ::EntityId>& /*spawnedEntities*/) {}
-
-    //! Notify that a spawn has been completed. All spawn notifications for this ticket have been dispatched.
-    virtual void OnSpawnEnd(const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
-
-    //! Notify that slice has failed to be spawned.
-    virtual void OnSpawnFailed(const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
-};
-
-using UiSpawnerNotificationBus = AZ::EBus<UiSpawnerNotifications>;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiSystemBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiSystemBus.h
deleted file mode 100644
index 8b17ca591c..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiSystemBus.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Component/Component.h>
-
-class UiSystemInterface
-    : public AZ::EBusTraits
-{
-public:
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-    // Public functions
-
-    //! Register a component type with the UI system.
-    //! The order in which component types are registered is the order that they show up in
-    //! the add component and in the properties pane.
-    //! This will go away once there is a system that orders things the way we want based
-    //! on the existing component registration.
-    virtual void RegisterComponentTypeForMenuOrdering([[maybe_unused]] const AZ::Uuid& typeUuid) {}
-
-    //! Get the UI component types registered with the UI system
-    //! This is a short-term solution until there is a way to get the registered components
-    //! from the framework in an order that we want for the menus and the properties pane
-    virtual const AZStd::vector<AZ::Uuid>* GetComponentTypesForMenuOrdering() = 0;
-
-    //! We use this for metrics to find out which components are part of the LyShine Gem
-    virtual const AZStd::list<AZ::ComponentDescriptor*>* GetLyShineComponentDescriptors() = 0;
-};
-
-using UiSystemBus = AZ::EBus<UiSystemInterface>;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTextBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiTextBus.h
deleted file mode 100644
index 63eab929e3..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiTextBus.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Color.h>
-#include <LyShine/UiBase.h>
-#include <LyShine/Bus/UiTransformBus.h>
-#include <LyShine/IDraw2d.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiTextInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! Callback type for retrieving displayed text.
-    typedef AZStd::function<AZStd::string(const AZStd::string&)> DisplayedTextFunction;
-
-    //! Determines how text overflow should behave
-    enum class OverflowMode
-    {
-        OverflowText,   //!< text contents aren't impacted by element size (and vice versa)
-        ClipText,       //!< clips text contents to fit width of element
-        Ellipsis        //!< truncates displayed text to fit element and appends ellipsis to the text
-    };
-
-    //! Provides values for determining whether text is wrapped or not
-    enum class WrapTextSetting
-    {
-        NoWrap,
-        Wrap
-    };
-
-    //! Controls whether text should shrink (scale down) to prevent overflowing.
-    //!
-    //! The amount of scale applied to text can be limited by minimum shrink scale.
-    enum class ShrinkToFit
-    {
-        None,       //!< No shrinking is applied to text
-        Uniform,    //!< Shrink text uniformly along X/Y dimension (maintains aspect ratio)
-        WidthOnly   //!< Only scales text along X axis (width)
-    };
-
-    //! Determines what processing should be performed on text before returning
-    enum GetTextFlags
-    {
-        GetAsIs         = 0,
-        GetLocalized    = 1 << 0
-    };
-
-    //! Determines how text should be assigned
-    enum SetTextFlags
-    {
-        SetAsIs         = 0,
-        SetEscapeMarkup = 1 << 0,
-        SetLocalized    = 1 << 1
-    };
-
-public: // member functions
-
-    virtual ~UiTextInterface() {}
-
-    //! Returns the unaltered contents of the string contained within the text component.
-    //! \return Unaltered string contents of this text component
-    virtual AZStd::string GetText() = 0;
-    virtual void SetText(const AZStd::string& text) = 0;
-
-    virtual AZStd::string GetTextWithFlags(GetTextFlags flags = GetAsIs) = 0;
-    virtual void SetTextWithFlags(const AZStd::string& text, SetTextFlags flags = SetAsIs) = 0;
-
-    virtual AZ::Color GetColor() = 0;
-    virtual void SetColor(const AZ::Color& color) = 0;
-
-    //! Returns font object used by the displayed text.
-    virtual LyShine::PathnameType GetFont() = 0;
-    virtual void SetFont(const LyShine::PathnameType& fontPath) = 0;
-
-    virtual int GetFontEffect() = 0;
-    virtual void SetFontEffect(int effectIndex) = 0;
-
-    virtual AZStd::string GetFontEffectName(int effectIndex) = 0;
-    virtual void SetFontEffectByName(const AZStd::string& effectName) = 0;
-
-    virtual float GetFontSize() = 0;
-    virtual void SetFontSize(float size) = 0;
-
-    virtual void GetTextAlignment(IDraw2d::HAlign& horizontalAlignment,
-        IDraw2d::VAlign& verticalAlignment) = 0;
-    virtual void SetTextAlignment(IDraw2d::HAlign horizontalAlignment,
-        IDraw2d::VAlign verticalAlignment) = 0;
-
-    virtual IDraw2d::HAlign GetHorizontalTextAlignment() = 0;
-    virtual void SetHorizontalTextAlignment(IDraw2d::HAlign alignment) = 0;
-    virtual IDraw2d::VAlign GetVerticalTextAlignment() = 0;
-    virtual void SetVerticalTextAlignment(IDraw2d::VAlign alignment) = 0;
-
-    virtual float GetCharacterSpacing() = 0;
-    virtual void SetCharacterSpacing(float characterSpacing) = 0;
-    virtual float GetLineSpacing() = 0;
-    virtual void SetLineSpacing(float lineSpacing) = 0;
-
-    //! Given a point in viewport space, return the character index in the string
-    //! \param point a point in viewport space
-    //! \param mustBeInBoundingBox if true the given point be be contained in the bounding box of
-    //!  actual text characters (not the element). If false it can be anywhere (even outside the element)
-    //!  and is projected onto a text position (for drag select for example).
-    //! \return -1 if second param is true and point is outside box
-    //!  0 if to left of first char, 1 if between first and second char,
-    //!  length of string if to right of last char
-    virtual int GetCharIndexFromPoint(AZ::Vector2 point, bool mustBeInBoundingBox) = 0;
-
-    //! Given a point in untransformed canvas space, return the character index in the string
-    //! \param point a point in untransformed canvas space
-    //! \param mustBeInBoundingBox if true the given point be be contained in the bounding box of
-    //!  actual text characters (not the element). If false it can be anywhere (even outside the element)
-    //!  and is projected onto a text position (for drag select for example).
-    //! \return -1 if second param is true and point is outside box
-    //!  0 if to left of first char, 1 if between first and second char,
-    //!  length of string if to right of last char
-    virtual int GetCharIndexFromCanvasSpacePoint(AZ::Vector2 point, bool mustBeInBoundingBox) = 0;
-
-    //! Returns the XY coord of the rendered character position at a given index.
-    //! Imagining a rect encompassing the character width and line height,
-    //! the returned coordinate is the upper-left corner of the rect.
-    //! \param index Index into displayed string.
-    virtual AZ::Vector2 GetPointFromCharIndex(int index) = 0;
-
-    virtual AZ::Color GetSelectionColor() = 0;
-    virtual void GetSelectionRange(int& startIndex, int& endIndex) = 0;
-
-    //! Set a range of the text string to be shown as selected
-    //!
-    //! If startIndex and endIndex are the same then a one pixel wide vertical bar is highlighted.
-    //!
-    //! The provided start and end indices are "character" indices into a UTF8 string. For
-    //! example, an index of 1 could actually be mapped at buffer index 2 if the first character
-    //! in the UTF8 string is a multi-byte character of size 2.
-    //!
-    //! \param startIndex 0 means starting at the left edge first character
-    //! \param endIndex if equal to UTF8 text string length that means up to the right edge of the last char
-    //! \param selectionColor the selection color (for box drawn behind text)
-    virtual void SetSelectionRange(int startIndex, int endIndex, const AZ::Color& selectionColor) = 0;
-
-    //! Clear any text selection range that has been applied to this text
-    virtual void ClearSelectionRange() = 0;
-
-    //! Get the width and height of the text
-    virtual AZ::Vector2 GetTextSize() = 0;
-
-    //! Get the width of the text
-    virtual float GetTextWidth() = 0;
-
-    //! Get the height of the text
-    virtual float GetTextHeight() = 0;
-
-    //! Get the bounding box (in viewport space, so it can be rotated) of the given text range
-    //! If startIndex and endIndex are the same then a rect is still returned that is one pixel wide
-    //! \param startIndex 0 means starting at the first character
-    //! \param endIndex if equal to text string length that means including the last char
-    //! \param rectPoints Output parameter that gets populated with up to three RectPoints for multi-line text selection geometry.
-    virtual void GetTextBoundingBox(int startIndex, int endIndex, UiTransformInterface::RectPointsArray& rectPoints) = 0;
-
-    //! Returns the function object used to manipulate a given string to condition it for rendering.
-    //! The default displayed text function for a UiTextComponent is pass-through (the passed string
-    //! is returned as-is).
-    virtual DisplayedTextFunction GetDisplayedTextFunction() const = 0;
-
-    //! Allows setting a DisplayedTextFunction object to be called prior to rendering.
-    //! The string contents of a UiTextComponent can be modified for rendering without
-    //! changing the actual contents of the text component (GetText()). This functionality
-    //! is useful in some situations, like password hiding, where the displayed text should
-    //! be different from the stored text.
-    virtual void SetDisplayedTextFunction(const DisplayedTextFunction& displayedTextFunction) = 0;
-
-    //! Gets the overflow behavior of this component
-    virtual OverflowMode GetOverflowMode() = 0;
-
-    //! Sets the overflow setting of this component.
-    virtual void SetOverflowMode(OverflowMode overflowMode) = 0;
-
-    //! Gets the text wrapping setting of this component
-    virtual WrapTextSetting GetWrapText() = 0;
-
-    //! Sets the text wrapping setting of this component
-    virtual void SetWrapText(WrapTextSetting wrapSetting) = 0;
-
-    //! Gets the "shrink-to-fit" value of this component
-    virtual ShrinkToFit GetShrinkToFit() = 0;
-
-    //! Sets the "shrink-to-fit" value of this component
-    virtual void SetShrinkToFit(ShrinkToFit shrinkToFit) = 0;
-
-    //! Typically triggered when input mechanism (keyboard vs. mouse) changes/alternates.
-    virtual void ResetCursorLineHint() = 0;
-
-    //! Get whether markup is enabled. If true then the text string is parsed for XML markup.
-    virtual bool GetIsMarkupEnabled() = 0;
-
-    //! Set whether markup is enabled. If true then the text string is parsed for XML markup.
-    virtual void SetIsMarkupEnabled(bool isEnabled) = 0;
-
-    //! Gets the minimum shrink scale when using ShrinkToFit.
-    virtual float GetMinimumShrinkScale() = 0;
-
-    //! Sets the minimum shrink scale when using ShrinkToFit.
-    virtual void SetMinimumShrinkScale(float minShrinkScale) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiTextInterface> UiTextBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface that describes "clickable" areas of text for a text component.
-//!
-//! Text components can contain anchor tags that allow user interaction with text.
-//! These anchor tags define clickable areas that can be stylized (via color) and
-//! provide information to listeners regarding the text.
-class UiClickableTextInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! Defines an area of interaction for clickable text, along with metadata.
-    struct ClickableTextRect
-    {
-        UiTransformInterface::Rect rect; //!< "Click area" for text.
-
-        AZStd::string action; //!< "action" string from markup.
-
-        AZStd::string data; //!< "data" string from markup.
-
-        int id; //!< Identifier that uniquely identifies clickable text from
-                //!< a single anchor tag. The clickable text from markup can
-                //!< be word-wrapped to subsequent lines, in which case the
-                //!< identifier will identify all clickable text coming from
-                //!< a single anchor tag. This allows word-wrapped clickable
-                //!< text to be treated as a single clickable link, 
-                //!< especially useful for hover/color styling.
-    };
-
-    using ClickableTextRects = AZStd::vector<ClickableTextRect>;
-
-public: // member functions
-
-    virtual ~UiClickableTextInterface() {}
-
-    //! Populates given clickable text rects for a text component.
-    virtual void GetClickableTextRects(UiClickableTextInterface::ClickableTextRects& clickableTextRects) = 0;
-
-    //! Sets the drawbatch color for clickable text, given by the ID.
-    virtual void SetClickableTextColor(int id, const AZ::Color& color) = 0;
-
-public: // static member data
-
-    //! Only one component on an entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiClickableTextInterface> UiClickableTextBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiClickableTextNotifications
-    : public AZ::ComponentBus
-{
-public:
-
-    //////////////////////////////////////////////////////////////////////////
-    // EBusTraits overrides
-    static const bool EnableEventQueue = true;
-    //////////////////////////////////////////////////////////////////////////
-
-public: // member functions
-
-    virtual ~UiClickableTextNotifications() {}
-
-    //! Notify listeners that the text has been prepared for render.
-    virtual void OnClickableTextChanged() {}
-};
-
-typedef AZ::EBus<UiClickableTextNotifications> UiClickableTextNotificationsBus;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTextInputBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiTextInputBus.h
deleted file mode 100644
index 838c74bf13..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiTextInputBus.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Color.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiTextInputInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    typedef AZStd::function<void(AZ::EntityId, const AZStd::string&)> TextInputCallback;
-
-public: // member functions
-
-    virtual ~UiTextInputInterface() {}
-
-    //! Get the color to be used for the text background when it is selected
-    virtual AZ::Color GetTextSelectionColor() = 0;
-
-    //! Set the color to be used for the text background when it is selected
-    virtual void SetTextSelectionColor(const AZ::Color& color) = 0;
-
-    //! Get the color to be used for the text cursor
-    virtual AZ::Color GetTextCursorColor() = 0;
-
-    //! Set the color to be used for the text cursor
-    virtual void SetTextCursorColor(const AZ::Color& color) = 0;
-
-    //! Get the cursor blink interval
-    virtual float GetCursorBlinkInterval() = 0;
-
-    //! Set the cursor blink interval, 0 means no blink
-    virtual void SetCursorBlinkInterval(float interval) = 0;
-
-    //! Get the maximum number of character allowed in the edited string
-    virtual int GetMaxStringLength() = 0;
-
-    //! Set the maximum number of character allowed in the edited string
-    //! \param maxCharacters, a value of 0 means none allowed, -1 means no limit
-    virtual void SetMaxStringLength(int maxCharacters) = 0;
-
-    //! Get the on-change callback (called when a character added/removed/changed)
-    virtual TextInputCallback GetOnChangeCallback() = 0;
-
-    //! Set the on-change callback (called when a character added/removed/changed)
-    virtual void SetOnChangeCallback(TextInputCallback callbackFunction) = 0;
-
-    //! Get the on-end-edit callback (called when edit of text is completed)
-    virtual TextInputCallback GetOnEndEditCallback() = 0;
-
-    //! Set the on-end-edit callback (called when edit of text is completed)
-    virtual void SetOnEndEditCallback(TextInputCallback callbackFunction) = 0;
-
-    //! Get the on-enter callback (called when Enter is pressed on keyboard)
-    virtual TextInputCallback GetOnEnterCallback() = 0;
-
-    //! Set the on-enter callback (called when Enter is pressed on keyboard)
-    virtual void SetOnEnterCallback(TextInputCallback callbackFunction) = 0;
-
-    //! Get the "change" action name, the action is sent to canvas listeners when text is changed
-    virtual const LyShine::ActionName& GetChangeAction() = 0;
-
-    //! Set the "change" action name
-    virtual void SetChangeAction(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the "end edit" action name, the action is sent to canvas listeners when the
-    //! editing of the text is finished - i.e. when the text input component is no longer active
-    virtual const LyShine::ActionName& GetEndEditAction() = 0;
-
-    //! Set the "end edit" action name
-    virtual void SetEndEditAction(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the "enter" action name, the action is sent to canvas listeners when enter is pressed
-    virtual const LyShine::ActionName& GetEnterAction() = 0;
-
-    //! Set the "enter" action name
-    virtual void SetEnterAction(const LyShine::ActionName& actionName) = 0;
-
-    //! Get the entity id for the text element being edited by this component
-    virtual AZ::EntityId GetTextEntity() = 0;
-
-    //! Set the entity id for the text element being edited by this component
-    //! This must be a child of this entity
-    virtual void SetTextEntity(AZ::EntityId textEntity) = 0;
-
-    //! Get the text string being edited by this component (from the text element)
-    virtual AZStd::string GetText() = 0;
-
-    virtual void SetText(const AZStd::string& text) = 0;
-
-    //! Get the entity id for the placeholder text element for this component
-    virtual AZ::EntityId GetPlaceHolderTextEntity() = 0;
-
-    //! Set the entity id for the placeholder text element for this component
-    //! This must be a child of this entity
-    virtual void SetPlaceHolderTextEntity(AZ::EntityId textEntity) = 0;
-
-    //! True if this text input is configured as a password field, false otherwise
-    //!
-    //! Password fields will render the displayed text with all of the characters
-    //! of the input string replaced with a character.
-    virtual bool GetIsPasswordField() = 0;
-
-    //! Allows this text input to be configured as a password field.
-    virtual void SetIsPasswordField(bool passwordField) = 0;
-
-    //! Returns the UTF8 character to be used to display password fields
-    //
-    //! Note that having a replacement character configured doesn't determine
-    //! whether this input is configured as a password field (see GetIsPasswordField).
-    virtual uint32_t GetReplacementCharacter() = 0;
-
-    //! Sets the UTF8 character that should be used for displaying text in password fields.
-    //
-    //! Note that setting a replacement character doesn't determine whether this
-    //! text input will be used as a password field (see GetIsPasswordField).
-    virtual void SetReplacementCharacter(uint32_t replacementChar) = 0;
-
-    //! True if copy/cut/paste should be supported, false otherwise
-    virtual bool GetIsClipboardEnabled() = 0;
-
-    //! Allows copy/cut/paste support for this text input
-    virtual void SetIsClipboardEnabled(bool enableClipboard) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiTextInputInterface> UiTextInputBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiTextInputNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiTextInputNotifications() {}
-
-    //! Called when a character added/removed/change
-    virtual void OnTextInputChange([[maybe_unused]] const AZStd::string& textString) {}
-
-    //! Called when edit of text is completed
-    virtual void OnTextInputEndEdit([[maybe_unused]] const AZStd::string& textString) {}
-
-    //! Called when Enter is pressed on keyboard
-    virtual void OnTextInputEnter([[maybe_unused]] const AZStd::string& textString) {}
-};
-
-typedef AZ::EBus<UiTextInputNotifications> UiTextInputNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipBus.h
deleted file mode 100644
index 7446e93ce8..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipBus.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a tooltip component needs to implement. A tooltip component provides
-//! data that is assigned to a tooltip display element
-class UiTooltipInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiTooltipInterface() {}
-
-    //! Get the tooltip text
-    virtual AZStd::string GetText() = 0;
-
-    //! Set the tooltip text
-    virtual void SetText(const AZStd::string& text) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiTooltipInterface> UiTooltipBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h
deleted file mode 100644
index ce0c96b417..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a tooltip component needs to implement. A tooltip component populates
-//! a tooltip display element with data
-class UiTooltipDataPopulatorInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiTooltipDataPopulatorInterface() {}
-
-    //! Assign data to the specified tooltip display element
-    virtual void PushDataToDisplayElement(AZ::EntityId displayEntityId) = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiTooltipDataPopulatorInterface> UiTooltipDataPopulatorBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h
deleted file mode 100644
index c717f37a0e..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that a tooltip display component needs to implement. A tooltip display
-//! component is responsible for displaying an element as a tooltip given sizing and positioning
-//! properties
-class UiTooltipDisplayInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    enum class AutoPositionMode
-    {
-        OffsetFromMouse,
-        OffsetFromElement
-    };
-
-    enum class TriggerMode
-    {
-        OnHover,
-        OnPress,
-        OnClick
-    };
-
-public: // member functions
-
-    virtual ~UiTooltipDisplayInterface() {}
-
-    //! Get the way the tooltip is triggered to display
-    virtual TriggerMode GetTriggerMode() = 0;
-
-    //! Set the way the tooltip is triggered to display
-    virtual void SetTriggerMode(TriggerMode triggerMode) = 0;
-
-    //! Get whether the tooltip display element will be auto positioned
-    virtual bool GetAutoPosition() = 0;
-
-    //! Set whether the tooltip display element will be auto positioned
-    virtual void SetAutoPosition(bool autoPosition) = 0;
-
-    //! Get auto position mode
-    virtual AutoPositionMode GetAutoPositionMode() = 0;
-
-    //! Set auto position mode
-    virtual void SetAutoPositionMode(AutoPositionMode autoPositionMode) = 0;
-
-    //! Get the offset from the tooltip display element's pivot to the mouse position
-    virtual const AZ::Vector2& GetOffset() = 0;
-
-    //! Set the offset from the tooltip display element's pivot to the mouse position
-    virtual void SetOffset(const AZ::Vector2& offset) = 0;
-
-    //! Get whether the tooltip display element should be resized so that the text element
-    //! size matches the size of the string
-    virtual bool GetAutoSize() = 0;
-
-    //! Set whether the tooltip display element should be resized so that the text element
-    //! size matches the size of the string
-    virtual void SetAutoSize(bool autoSize) = 0;
-
-    //! Get the entity id of the text element that is used for resizing
-    virtual AZ::EntityId GetTextEntity() = 0;
-
-    //! Set the entity id of the text element that is used for resizing
-    //! This must be a child of this entity
-    virtual void SetTextEntity(AZ::EntityId textEntity) = 0;
-
-    //! Get the amount of time to wait before showing the tooltip display element after hover start
-    virtual float GetDelayTime() = 0;
-
-    //! Set the amount of time to wait before showing the tooltip display element after hover start
-    virtual void SetDelayTime(float delayTime) = 0;
-
-    //! Get the amount of time the tooltip display element is to remain visible
-    virtual float GetDisplayTime() = 0;
-
-    //! Set the amount of time the tooltip display element is to remain visible
-    virtual void SetDisplayTime(float displayTime) = 0;
-
-    //! Show the tooltip display element
-    virtual void PrepareToShow(AZ::EntityId tooltipElement) = 0;
-
-    //! Hide the tooltip display element
-    virtual void Hide() = 0;
-
-    //! Update the tooltip display element
-    virtual void Update() = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiTooltipDisplayInterface> UiTooltipDisplayBus;
-
-//! Interface class that listeners need to implement to be notified of tooltip display events
-class UiTooltipDisplayNotifications
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiTooltipDisplayNotifications() {}
-
-    //! Called on tooltip display state changes
-    virtual void OnShowing() {};
-    virtual void OnShown() {};
-    virtual void OnHiding() {};
-    virtual void OnHidden() {};
-};
-
-typedef AZ::EBus<UiTooltipDisplayNotifications> UiTooltipDisplayNotificationBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTransform2dBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiTransform2dBus.h
deleted file mode 100644
index bdaa384ff0..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiTransform2dBus.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/Bus/UiTransformBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiTransform2dInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    // Anchors members are always in range 0-1, they are normalized positions within the parent elements bounds
-    struct Anchors
-    {
-        AZ_TYPE_INFO(Anchors, "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}")
-
-        Anchors()
-            : m_left(0.5f)
-            , m_top(0.5f)
-            , m_right(0.5f)
-            , m_bottom(0.5f) {}
-
-        Anchors(float left, float top, float right, float bottom)
-            : m_left(left)
-            , m_top(top)
-            , m_right(right)
-            , m_bottom(bottom) {}
-
-        float   m_left;
-        float   m_top;
-        float   m_right;
-        float   m_bottom;
-
-        void UnitClamp()
-        {
-            m_left = FClamp(m_left, 0.0f, 1.0f);
-            m_top = FClamp(m_top, 0.0f, 1.0f);
-            m_right = FClamp(m_right, 0.0f, 1.0f);
-            m_bottom = FClamp(m_bottom, 0.0f, 1.0f);
-        }
-
-        bool operator==(const Anchors& rhs) const
-        {
-            return (m_left == rhs.m_left &&
-                    m_right == rhs.m_right &&
-                    m_top == rhs.m_top &&
-                    m_bottom == rhs.m_bottom);
-        }
-
-        bool operator!=(const Anchors& rhs) const
-        {
-            return !(*this == rhs);
-        }
-    };
-
-    // Offsets are in pixels or physical units and are offsets from the anchors
-    // The left offset is the offset from the left anchor to the left edge of this UiElement
-    struct Offsets
-    {
-        AZ_TYPE_INFO(Offsets, "{F681BA9D-245C-4630-B20E-05DD752FAD57}")
-
-        Offsets()
-            : m_left(-50)
-            , m_top(-50)
-            , m_right(50)
-            , m_bottom(50) {}
-
-        Offsets(float left, float top, float right, float bottom)
-            : m_left(left)
-            , m_top(top)
-            , m_right(right)
-            , m_bottom(bottom) {}
-
-        float   m_left;
-        float   m_top;
-        float   m_right;
-        float   m_bottom;
-
-        Offsets& operator+=(const UiTransformInterface::RectPoints& rhs)
-        {
-            m_left += rhs.TopLeft().GetX();
-            m_right += rhs.BottomRight().GetX();
-            m_top += rhs.TopLeft().GetY();
-            m_bottom += rhs.BottomRight().GetY();
-
-            return *this;
-        }
-
-        Offsets operator+(const UiTransformInterface::RectPoints& rhs) const
-        {
-            Offsets result(*this);
-
-            result.m_left += rhs.TopLeft().GetX();
-            result.m_right += rhs.BottomRight().GetX();
-            result.m_top += rhs.TopLeft().GetY();
-            result.m_bottom += rhs.BottomRight().GetY();
-
-            return result;
-        }
-
-        Offsets& operator+=(const AZ::Vector2& rhs)
-        {
-            m_left += rhs.GetX();
-            m_right += rhs.GetX();
-            m_top += rhs.GetY();
-            m_bottom += rhs.GetY();
-
-            return *this;
-        }
-
-        Offsets operator+(const AZ::Vector2& rhs) const
-        {
-            Offsets result(*this);
-
-            result.m_left += rhs.GetX();
-            result.m_right += rhs.GetX();
-            result.m_top += rhs.GetY();
-            result.m_bottom += rhs.GetY();
-
-            return result;
-        }
-
-        bool operator==(const Offsets& rhs) const
-        {
-            return (m_left == rhs.m_left &&
-                    m_right == rhs.m_right &&
-                    m_top == rhs.m_top &&
-                    m_bottom == rhs.m_bottom);
-        }
-
-        bool operator!=(const Offsets& rhs) const
-        {
-            return !(*this == rhs);
-        }
-    };
-
-public: // member functions
-
-    virtual ~UiTransform2dInterface() {}
-
-    //! Get the anchors for the element
-    virtual Anchors GetAnchors() = 0;
-
-    //! Set the anchors for the element
-    //! \param adjustOffsets    If true the offsets are adjusted to keep the rect in the same position
-    //! \param allowPush        Only has effect if the anchors are invalid. If true changing an anchor
-    //                          to overlap its opposite anchor, will move the opposite anchor
-    virtual void SetAnchors(Anchors anchors, bool adjustOffsets, bool allowPush) = 0;
-
-    //! Get the offsets for the element
-    virtual Offsets GetOffsets() = 0;
-
-    //! Set the offsets for the element
-    virtual void SetOffsets(Offsets offsets) = 0;
-
-    //! Set the pivot and adjust the offsets to stay in same place
-    virtual void SetPivotAndAdjustOffsets(AZ::Vector2 pivot) = 0;
-
-    //! Modify left and right offsets relative the element's anchors
-    virtual void SetLocalWidth(float width) = 0;
-
-    //! Get the height of the element based off it's offsets
-    virtual float GetLocalWidth() = 0;
-
-    //! Modify top and bottom offsets relative the element's anchors
-    virtual void SetLocalHeight(float height) = 0;
-
-    //! Get the height of the element based off it's offsets
-    virtual float GetLocalHeight() = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiTransform2dInterface> UiTransform2dBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiTransformBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiTransformBus.h
deleted file mode 100644
index 0f316c334c..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiTransformBus.h
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/Math/MathUtils.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Matrix4x4.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// The UiTransformInterface provides an abstract bus interface for UI components that define the
-// position and size of a UI element.
-class UiTransformInterface
-    : public AZ::ComponentBus
-{
-public: // types
-
-    //! Struct that stores the 4 points of a (transformed) rectangle and provides access either as an array or via access functions
-    struct RectPoints
-    {
-        enum Corner     // can be used as an index into RectPoints pt array but access via member functions preferred
-        {
-            Corner_TopLeft,
-            Corner_TopRight,
-            Corner_BottomRight,
-            Corner_BottomLeft,
-
-            Corner_Count
-        };
-
-        AZ::Vector2    pt[Corner_Count];  // in clockwise order: top left, top right, bottom right, bottom left
-
-        RectPoints();
-        RectPoints(float left, float right, float top, float bottom);
-
-        AZ::Vector2& TopLeft();
-        const AZ::Vector2& TopLeft() const;
-
-        AZ::Vector2& TopRight();
-        const AZ::Vector2& TopRight() const;
-
-        AZ::Vector2& BottomRight();
-        const AZ::Vector2& BottomRight() const;
-
-        AZ::Vector2& BottomLeft();
-        const AZ::Vector2& BottomLeft() const;
-
-        AZ::Vector2 GetCenter() const;
-
-        AZ::Vector2 GetAxisAlignedSize() const;
-        AZ::Vector2 GetAxisAlignedTopLeft() const;
-        AZ::Vector2 GetAxisAlignedTopRight() const;
-        AZ::Vector2 GetAxisAlignedBottomRight() const;
-        AZ::Vector2 GetAxisAlignedBottomLeft() const;
-        void SetAxisAligned(float left, float right, float top, float bottom);
-
-        RectPoints Transform(AZ::Matrix4x4& transform) const;
-        RectPoints operator-(const RectPoints& rhs) const;
-    };
-
-    using RectPointsArray = AZStd::vector < UiTransformInterface::RectPoints >;
-
-    //! Struct that stores the bounds of an axis-aligned rectangle
-    struct Rect
-    {
-        float left;
-        float right;
-        float top;
-        float bottom;
-
-        void Set(float l, float r, float t, float b);
-
-        float GetWidth() const;
-        float GetHeight() const;
-
-        float GetCenterX();
-        float GetCenterY();
-
-        AZ::Vector2 GetSize() const;
-        AZ::Vector2 GetCenter();
-
-        void MoveBy(AZ::Vector2 offset);
-
-        RectPoints GetPoints();
-
-        bool operator==(const Rect& rhs) const;
-
-        bool operator!=(const Rect& rhs) const;
-    };
-
-    //! Enum used as a parameter to SetRecomputeFlags
-    enum class Recompute
-    {
-        RectOnly,               //!< Only the rect (offsets or anchors for example) changed (this may affect transform if local scale or rotation)
-        TransformOnly,          //!< Only the transform changed (canvas and viewport transforms must be recomputed)
-        ViewportTransformOnly,  //!< Only the viewport transform changed (viewport transform must be recomputed)
-        RectAndTransform        //!< Both rect and transform changed (all cached data must be recomputed)
-    };
-
-    //! Enum used as a parameter to SetScaleToDeviceMode
-    //! The value determines how an element is scaled when the canvas reference size and actual size are different
-    //! The comments below reference the canvas's "deviceScale". The deviceScale is target (actual) canvas size divided the reference canvas size
-    enum class ScaleToDeviceMode
-    {
-        None,               //!< Default, this element is not affected by device resolution changes
-        UniformScaleToFit,  //!< Apply a uniform scale which is the minimum of deviceScale.x and deviceScale.y
-        UniformScaleToFill, //!< Apply a uniform scale which is the maximum of deviceScale.x and deviceScale.y
-        UniformScaleToFitX, //!< Apply a uniform scale of deviceScale.x
-        UniformScaleToFitY, //!< Apply a uniform scale of deviceScale.y
-        NonUniformScale,    //!< Apply a non-uniform scale which is simply deviceScale
-        ScaleXOnly,         //!< Scale the element only in the X dimension by deviceScale.x
-        ScaleYOnly          //!< Scale the element only in the Y dimension by deviceScale.y
-    };
-
-public: // member functions
-
-    virtual ~UiTransformInterface() {}
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Methods to get and set the properties of the transform component
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Get the rotation about the Z axis
-    virtual float GetZRotation() = 0;
-
-    //! Set the rotation about the Z axis
-    virtual void SetZRotation(float rotation) = 0;
-
-    //! Get the scale
-    virtual AZ::Vector2 GetScale() = 0;
-
-    //! Set the scale
-    virtual void SetScale(AZ::Vector2 scale) = 0;
-
-    //! Get the scale X
-    virtual float GetScaleX() = 0;
-
-    //! Set the scale X
-    virtual void SetScaleX(float scale) = 0;
-
-    //! Get the scale Y
-    virtual float GetScaleY() = 0;
-
-    //! Set the scale Y
-    virtual void SetScaleY(float scale) = 0;
-
-    //! Get the pivot point for the element
-    virtual AZ::Vector2 GetPivot() = 0;
-
-    //! Set the pivot point for the element
-    virtual void SetPivot(AZ::Vector2 pivot) = 0;
-
-    //! Get the pivot point for the element
-    virtual float GetPivotX() = 0;
-
-    //! Set the pivot point for the element
-    virtual void SetPivotX(float pivot) = 0;
-
-    //! Get the pivot point for the element
-    virtual float GetPivotY() = 0;
-
-    //! Set the pivot point for the element
-    virtual void SetPivotY(float pivot) = 0;
-
-    //! Get how the element and all its children will be scaled to allow for the difference
-    //! between the authored canvas size and the actual viewport size.
-    virtual ScaleToDeviceMode GetScaleToDeviceMode() = 0;
-
-    //! Set how the element and all its children will be scaled to allow for the difference
-    //! between the authored canvas size and the actual viewport size.
-    virtual void SetScaleToDeviceMode(ScaleToDeviceMode scaleToDeviceMode) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Methods to get data in viewport space
-    //
-    // Viewport space is a 1-1 mapping to whatever viewport the UI canvas is being rendered to.
-    // A position in viewport space is an offset in pixels from the top left of the viewport.
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Get the four points defining the rectangle of this element, in viewport space pixel coords
-    virtual void GetViewportSpacePoints(RectPoints& points) = 0;
-
-    //! Get the pivot for this element in viewport space
-    virtual AZ::Vector2 GetViewportSpacePivot() = 0;
-
-    //! Get the transform matrix to transform from canvas (noScaleRotate) space to viewport space
-    virtual void GetTransformToViewport(AZ::Matrix4x4& mat) = 0;
-
-    //! Get the transform matrix to transform from viewport space to canvas (noScaleRotate) space
-    virtual void GetTransformFromViewport(AZ::Matrix4x4& mat) = 0;
-
-    //! Apply the "to viewport" transform to the given points
-    virtual void RotateAndScalePoints(RectPoints& points) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Methods to get data in canvas space
-    //
-    // Often canvas space and viewport space are the same thing. For example if a canvas is being
-    // displayed full screen.
-    // However, in other cases they are different. For example in the UI editor when Zoom and Pan allow
-    // the canvas to be moved around in the viewport. In that case an offset of 1 does not mean 1 pixel
-    // in the viewport. Canvas space is defined by the canvas size stored in the canvas.
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Get the four points defining the rectangle of this element, in canvas space coords
-    virtual void GetCanvasSpacePoints(RectPoints& points) = 0;
-
-    //! Get the pivot for this element in canvas space
-    virtual AZ::Vector2 GetCanvasSpacePivot() = 0;
-
-    //! Get the transform matrix to transform from canvasNoScaleRotate space to canvas space
-    virtual void GetTransformToCanvasSpace(AZ::Matrix4x4& mat) = 0;
-    
-    //! Get the transform matrix to transform from canvas space to canvasNoScaleRotate space
-    virtual void GetTransformFromCanvasSpace(AZ::Matrix4x4& mat) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Methods to get data in unrotated and unscaled canvas space (CanvasNoScaleRotate space)
-    //
-    // CanvasNoScaleRotate space is like canvas space but without any of the rotation or scaling in
-    // any of the elments applied. So if none of the elements in the canvas have scale or rotation
-    // the two are the same.
-    //
-    // CanvasNoScaleRotate space is like local space for an element but it does include all of the
-    // parent's anchor and offset calculations so it is not really local space.
-    //
-    // This is a useful space to do calculations in because all elements are axis aligned and their
-    // rectangle can be represented by a Rect struct rather requiring a RectPoints struct.
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Get the axis-aligned rect for the element without accounting for rotation or scale
-    virtual void GetCanvasSpaceRectNoScaleRotate(Rect& rect) = 0;
-
-    //! Get the rect points for the element without accounting for rotation or scale
-    virtual void GetCanvasSpacePointsNoScaleRotate(RectPoints& points) = 0;
-
-    //! Get the size for the element without accounting for rotation or scale
-    virtual AZ::Vector2 GetCanvasSpaceSizeNoScaleRotate() = 0;
-
-    //! Get the pivot for the element without accounting for rotation or scale
-    virtual AZ::Vector2 GetCanvasSpacePivotNoScaleRotate() = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Methods to get data in/about local space
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Get the transform matrix to apply this element's rotation and scale about pivot
-    virtual void GetLocalTransform(AZ::Matrix4x4& mat) = 0;
-
-    //! Get the transform matrix to apply the inverse of this element's rotation and scale about pivot
-    virtual void GetLocalInverseTransform(AZ::Matrix4x4& mat) = 0;
-
-    //! Test whether this transform component has any scale or rotation
-    virtual bool HasScaleOrRotation() = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Methods to get/set the element's position
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Get the position for this element in viewport space (same as GetViewportSpacePivot)
-    virtual AZ::Vector2 GetViewportPosition() = 0;
-
-    //! Set the position for this element in viewport space
-    virtual void SetViewportPosition(const AZ::Vector2& position) = 0;
-
-    //! Get the position for this element in canvas space (same as GetCanvasSpacePivot)
-    virtual AZ::Vector2 GetCanvasPosition() = 0;
-
-    //! Set the position for this element in canvas space
-    virtual void SetCanvasPosition(const AZ::Vector2& position) = 0;
-
-    //! Get the position for this element relative to the center of the element's anchors
-    virtual AZ::Vector2 GetLocalPosition() = 0;
-
-    //! Set the position for this element relative to the center of the element's anchors
-    virtual void SetLocalPosition(const AZ::Vector2& position) = 0;
-
-    //! Get the X position for this element relative to the center of the element's anchors
-    virtual float GetLocalPositionX() = 0;
-
-    //! Set the X position for this element relative to the center of the element's anchors
-    virtual void SetLocalPositionX(float position) = 0;
-
-    //! Get the Y position for this element relative to the center of the element's anchors
-    virtual float GetLocalPositionY() = 0;
-
-    //! Set the Y position for this element relative to the center of the element's anchors
-    virtual void SetLocalPositionY(float position) = 0;
-
-    //! Move this element in viewport space
-    virtual void MoveViewportPositionBy(const AZ::Vector2& offset) = 0;
-
-    //! Move this element in canvas space
-    virtual void MoveCanvasPositionBy(const AZ::Vector2& offset) = 0;
-
-    //! Move this element relative to the center of the element's anchors
-    virtual void MoveLocalPositionBy(const AZ::Vector2& offset) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Query functions
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Test if the given point (in viewport space) is in the rectangle of this element
-    virtual bool IsPointInRect(AZ::Vector2 point) = 0;
-
-    //! Test if the given rect (in viewport space) is in the rectangle of this element
-    virtual bool BoundsAreOverlappingRect(const AZ::Vector2& bound0, const AZ::Vector2& bound1) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Optimization and caching
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Set the required dirty flags for the cached transforms and rect on this element and all its children
-    virtual void SetRecomputeFlags(Recompute recompute) = 0;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Canvas space rect change
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    //! Get whether the canvas space rect has changed since the last call to NotifyAndResetCanvasSpaceRectChange.
-    //! May trigger a recompute of the rect if the recompute flag is dirty
-    virtual bool HasCanvasSpaceRectChanged() = 0;
-
-    //! Get whether the canvas space size has changed since the last call to NotifyAndResetCanvasSpaceRectChange.
-    //! May trigger a recompute of the rect if the recompute flag is dirty
-    virtual bool HasCanvasSpaceSizeChanged() = 0;
-
-    //! Get whether the canvas space rect was changed due to initialization
-    virtual bool HasCanvasSpaceRectChangedByInitialization() = 0;
-
-    //! Send notification of canvas space rect change and reset to unchanged
-    virtual void NotifyAndResetCanvasSpaceRectChange() = 0;
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiTransformInterface> UiTransformBus;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that listeners need to implement
-class UiTransformChangeNotification
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiTransformChangeNotification(){}
-
-    //! Called when an entity's transform (canvas space) has been modified
-    virtual void OnCanvasSpaceRectChanged(AZ::EntityId entityId, const UiTransformInterface::Rect& oldRect, const UiTransformInterface::Rect& newRect) = 0;
-
-    //! Called when an entity's transform (viewport space) has been modified
-    virtual void OnTransformToViewportChanged() {}
-};
-
-typedef AZ::EBus<UiTransformChangeNotification> UiTransformChangeNotificationBus;
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// RectPoints inline methods
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-inline UiTransformInterface::RectPoints::RectPoints()
-{
-}
-
-inline UiTransformInterface::RectPoints::RectPoints(float left, float right, float top, float bottom)
-{
-    SetAxisAligned(left, right, top, bottom);
-}
-
-inline AZ::Vector2& UiTransformInterface::RectPoints::TopLeft()
-{
-    return pt[Corner_TopLeft];
-}
-
-inline const AZ::Vector2& UiTransformInterface::RectPoints::TopLeft() const
-{
-    return pt[Corner_TopLeft];
-}
-
-inline AZ::Vector2& UiTransformInterface::RectPoints::TopRight()
-{
-    return pt[Corner_TopRight];
-}
-
-inline const AZ::Vector2& UiTransformInterface::RectPoints::TopRight() const
-{
-    return pt[Corner_TopRight];
-}
-
-inline AZ::Vector2& UiTransformInterface::RectPoints::BottomRight()
-{
-    return pt[Corner_BottomRight];
-}
-
-inline const AZ::Vector2& UiTransformInterface::RectPoints::BottomRight() const
-{
-    return pt[Corner_BottomRight];
-}
-
-inline AZ::Vector2& UiTransformInterface::RectPoints::BottomLeft()
-{
-    return pt[Corner_BottomLeft];
-}
-
-inline const AZ::Vector2& UiTransformInterface::RectPoints::BottomLeft() const
-{
-    return pt[Corner_BottomLeft];
-}
-
-inline AZ::Vector2 UiTransformInterface::RectPoints::GetCenter() const
-{
-    return ((GetAxisAlignedTopLeft() + GetAxisAlignedBottomRight()) * 0.5f);
-}
-
-inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedSize() const
-{
-    return AZ::Vector2(BottomRight().GetX() - TopLeft().GetX(), BottomRight().GetY() - TopLeft().GetY());
-}
-
-inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedTopLeft() const
-{
-    return AZ::Vector2(min(min(min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        min(min(min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
-}
-
-inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedTopRight() const
-{
-    return AZ::Vector2(max(max(max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        min(min(min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
-}
-
-inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedBottomRight() const
-{
-    return AZ::Vector2(max(max(max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        max(max(max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
-}
-
-inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedBottomLeft() const
-{
-    return AZ::Vector2(min(min(min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        max(max(max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
-}
-
-inline void UiTransformInterface::RectPoints::SetAxisAligned(float left, float right, float top, float bottom)
-{
-    pt[Corner_TopLeft] = AZ::Vector2(left, top);
-    pt[Corner_TopRight] = AZ::Vector2(right, top);
-    pt[Corner_BottomRight] = AZ::Vector2(right, bottom);
-    pt[Corner_BottomLeft] = AZ::Vector2(left, bottom);
-}
-
-inline UiTransformInterface::RectPoints UiTransformInterface::RectPoints::Transform(AZ::Matrix4x4& transform) const
-{
-    RectPoints result;
-    for (int i = 0; i < Corner_Count; ++i)
-    {
-        AZ::Vector3 point3(pt[i].GetX(), pt[i].GetY(), 0.0f);
-        point3 = transform * point3;
-        result.pt[i] = AZ::Vector2(point3.GetX(), point3.GetY());
-    }
-    return result;
-}
-
-inline UiTransformInterface::RectPoints UiTransformInterface::RectPoints::operator-(const RectPoints& rhs) const
-{
-    RectPoints result(*this);
-    for (int i = 0; i < Corner_Count; ++i)
-    {
-        result.pt[i] -= rhs.pt[i];
-    }
-    return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Rect inline methods
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-inline void UiTransformInterface::Rect::Set(float l, float r, float t, float b)
-{
-    left = l;
-    right = r;
-    top = t;
-    bottom = b;
-}
-
-inline float UiTransformInterface::Rect::GetWidth() const
-{
-    return right - left;
-}
-
-inline float UiTransformInterface::Rect::GetHeight() const
-{
-    return bottom - top;
-}
-
-inline float UiTransformInterface::Rect::GetCenterX()
-{
-    return (left + right) * 0.5f;
-}
-
-inline float UiTransformInterface::Rect::GetCenterY()
-{
-    return (top + bottom) * 0.5f;
-}
-
-inline AZ::Vector2 UiTransformInterface::Rect::GetSize() const
-{
-    return AZ::Vector2(GetWidth(), GetHeight());
-}
-
-inline AZ::Vector2 UiTransformInterface::Rect::GetCenter()
-{
-    return AZ::Vector2(GetCenterX(), GetCenterY());
-}
-
-inline void UiTransformInterface::Rect::MoveBy(AZ::Vector2 offset)
-{
-    left += offset.GetX();
-    right += offset.GetX();
-    top += offset.GetY();
-    bottom += offset.GetY();
-}
-
-inline UiTransformInterface::RectPoints UiTransformInterface::Rect::GetPoints()
-{
-    return UiTransformInterface::RectPoints(left, right, top, bottom);
-}
-
-inline bool UiTransformInterface::Rect::operator==(const Rect& rhs) const
-{
-    return left == rhs.left
-            && right == rhs.right
-            && top == rhs.top
-            && bottom == rhs.bottom;
-}
-
-inline bool UiTransformInterface::Rect::operator!=(const Rect& rhs) const
-{
-    return !(*this == rhs);
-}
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/UiVisualBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/UiVisualBus.h
deleted file mode 100644
index a8a9987044..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/UiVisualBus.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <LyShine/Bus/UiImageBus.h>
-#include <AzCore/Math/Color.h>
-#include <IFont.h>
-
-// Forward declarations
-class ISprite;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-class UiVisualInterface
-    : public AZ::ComponentBus
-{
-public: // member functions
-
-    virtual ~UiVisualInterface() {}
-
-    //! Reset the overrides, used when setting interactable states
-    virtual void ResetOverrides() = 0;
-
-    //! Set the override color, used for interactable states
-    virtual void SetOverrideColor(const AZ::Color& color) = 0;
-
-    //! Set the override alpha, used for interactable states
-    virtual void SetOverrideAlpha(float alpha) = 0;
-
-    //! Set the override sprite, if this visual component uses a sprite this will override it
-    //! \param sprite   If null the sprite on the visual component will not be overridden
-    //! \param cellIndex This value will be ignored if the given sprite isn't a sprite-sheet spritetype.
-    virtual void SetOverrideSprite([[maybe_unused]] ISprite* sprite, [[maybe_unused]] AZ::u32 cellIndex) {};
-
-    //! Set the override font, if this visual component uses a font this will override it
-    //! \param font   If null the font on the visual component will not be overridden
-    virtual void SetOverrideFont(FontFamilyPtr fontFamily) {};
-
-    //! Set the override font effect, if this visual component uses a font this will override it
-    virtual void SetOverrideFontEffect([[maybe_unused]] unsigned int fontEffectIndex) {};
-
-public: // static member data
-
-    //! Only one component on a entity can implement the events
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-};
-
-typedef AZ::EBus<UiVisualInterface> UiVisualBus;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h
deleted file mode 100644
index 5928562ccb..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzFramework/Input/Channels/InputChannel.h>
-#include <Cry_Math.h>
-
-struct ray_hit;
-
-namespace AzFramework
-{
-    namespace RenderGeometry
-    {
-        struct RayResult;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// UiCanvasOnMeshBus
-class UiCanvasOnMeshInterface
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiCanvasOnMeshInterface() {}
-
-
-    //! Convert the input ray collision into a canvas space position and pass the event and that position
-    //! to the UI canvas to handle as a positional input event
-    //! \return true if the event was handled
-    virtual bool ProcessHitInputEvent(const AzFramework::InputChannel::Snapshot& inputSnapshot, const AzFramework::RenderGeometry::RayResult& rayResult) = 0;
-};
-
-using UiCanvasOnMeshBus = AZ::EBus<UiCanvasOnMeshInterface>;
diff --git a/Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h b/Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h
deleted file mode 100644
index 2ad0ca218f..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! UiCanvasRefBus
-//! Allows a reference to a UI Canvas entity (which is loaded from a .uicanvas asset file) to 
-//! associated with a component entity in the level.
-//! This is used for convenience by flow graph nodes and also for supprting rendering UI
-//! canvases in the 3D world on a component entity.
-class UiCanvasRefInterface
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiCanvasRefInterface() {}
-
-    //! Get the UI canvas associated with this entity
-    virtual AZ::EntityId GetCanvas() = 0;
-};
-
-using UiCanvasRefBus = AZ::EBus<UiCanvasRefInterface>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! UiCanvasRefNotificationBus
-//! Clients can connect to this bus to receive notifications of when the canvas reference
-//! in a UiCanvasRef changes to a different canvas
-class UiCanvasRefNotifications
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiCanvasRefNotifications() {}
-
-    //! Called when the canvas referenced by a canvas ref component changes
-    //! This can happen through a load, unload or set
-    virtual void OnCanvasRefChanged([[maybe_unused]] AZ::EntityId uiCanvasRefEntity, [[maybe_unused]] AZ::EntityId uiCanvasEntity) {}
-};
-
-using UiCanvasRefNotificationBus = AZ::EBus<UiCanvasRefNotifications>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! UiCanvasAssetRefBus
-//! Allows loading and unloading of a UI canvas asset using a pathname stored in a component on
-//! an entity in the level.
-class UiCanvasAssetRefInterface
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiCanvasAssetRefInterface() {}
-
-    //! Get the canvas pathname. This is the pathname of the canvas that this component
-    //! will load (either on activate or when told to load by the LoadCanvas method)
-    //! The Canvas pathname can be empty and the associated canvas can be set via SetCanvas
-    virtual AZStd::string GetCanvasPathname() = 0;
-
-    //! Set the canvas pathname
-    virtual void SetCanvasPathname(const AZStd::string& pathname) = 0;
-
-    //! Get the flag indicating whether this component will automatically load the canvas
-    virtual bool GetIsAutoLoad() = 0;
-
-    //! Set the flag indicating whether this component will automatically load the canvas
-    virtual void SetIsAutoLoad(bool isAutoLoad) = 0;
-
-    //! Get the flag indicating whether the canvas should be loaded in a disabled state
-    virtual bool GetShouldLoadDisabled() = 0;
-
-    //! Set the flag indicating whether the canvas should be loaded in a disabled state
-    virtual void SetShouldLoadDisabled(bool shouldLoadDisabled) = 0;
-
-    //! Load the UI canvas using the stored asset ref
-    virtual AZ::EntityId LoadCanvas() = 0;
-
-    //! Unload the UI canvas using the stored asset ref (if it is owned by this component)
-    virtual void UnloadCanvas() = 0;
-};
-
-using UiCanvasAssetRefBus = AZ::EBus<UiCanvasAssetRefInterface>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! UiCanvasAssetRefNotificationBus
-//! Clients can connect to this bus to receive notifications of when a canvas is loaded into
-//! a canvas ref component on an entity
-class UiCanvasAssetRefNotifications
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiCanvasAssetRefNotifications() {}
-
-    //! Called when the canvas ref loads a UI canvas
-    virtual void OnCanvasLoadedIntoEntity([[maybe_unused]] AZ::EntityId uiCanvasEntity) {}
-};
-
-using UiCanvasAssetRefNotificationBus = AZ::EBus<UiCanvasAssetRefNotifications>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! UiCanvasProxyRefBus
-//! Allows an entity in a level to share a reference to a UI canvas that was loaded into another
-//! UiCanvasRef.
-//! This bus is only needed to allow two entities in the world to use the same instance of a
-//! UI canvas asset.
-class UiCanvasProxyRefInterface
-    : public AZ::ComponentBus
-{
-public:
-    virtual ~UiCanvasProxyRefInterface() {}
-
-    //! Set the entity that is managing the UI canvas for this proxy
-    //! This will cause the OnCanvasRefChanged event to be sent to any UiCanvasRefNotifications
-    virtual void SetCanvasRefEntity(AZ::EntityId canvasAssetRefEntity) = 0;
-};
-
-using UiCanvasProxyRefBus = AZ::EBus<UiCanvasProxyRefInterface>;
-
diff --git a/Code/CryEngine/CryCommon/LyShine/IDraw2d.h b/Code/CryEngine/CryCommon/LyShine/IDraw2d.h
deleted file mode 100644
index 68eee0ce34..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/IDraw2d.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Color.h>
-
-// Forward declarations
-struct IFFont;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Class for 2D drawing in screen space
-//
-//! The IDraw2d interface allows drawing images and text in 2D.
-//! Positions and sizes are specified in pixels in the current 2D viewport.
-//! The BeginDraw2d method should be called before calling the Draw methods to enter 2D mode
-//! and the EndDraw2d method should be called after calling the Draw methods to exit 2D mode.
-//! There is a helper class Draw2dHelper that encapsulates this in its constructor and destructor.
-class IDraw2d
-{
-public: // types
-
-    //! Horizontal alignment can be used for both text and image drawing
-    enum class HAlign
-    {
-        Left,
-        Center,
-        Right,
-    };
-
-    //! Vertical alignment can be used for both text and image drawing
-    enum class VAlign
-    {
-        Top,
-        Center,
-        Bottom,
-    };
-
-    //! Used for specifying how to round positions to an exact pixel position for pixel-perfect rendering
-    enum class Rounding
-    {
-        None,
-        Nearest,
-        Down,
-        Up
-    };
-
-    enum
-    {
-        //! Limit imposed by FFont. This is the max number of characters including the null terminator.
-        MAX_TEXT_STRING_LENGTH = 1024,
-    };
-
-    enum : int
-    {
-        //! Constant that indicates the built-in default value should be used
-        UseDefault = -1
-    };
-
-    //! Struct used to pass additional image options.
-    //
-    //! If this is not passed then the defaults below are used
-    struct ImageOptions
-    {
-        int         blendMode;      //!< default is GS_BLSRC_SRCALPHA|GS_BLDST_ONEMINUSSRCALPHA
-        AZ::Vector3 color;          //!< default is (1,1,1)
-        Rounding    pixelRounding;  //!< default is Rounding::Nearest
-        int         baseState;      //!< Additional flags for SetState. Default is GS_NODEPTHTEST
-    };
-
-    //! Struct used to pass additional text options - mostly ones that do not change from call to call.
-    //
-    //! If this is not passed then the defaults below are used
-    struct TextOptions
-    {
-        AZStd::string   fontName;               //!< default is "default"
-        unsigned int    effectIndex;            //!< default is 0
-        AZ::Vector3     color;                  //!< default is (1,1,1)
-        HAlign          horizontalAlignment;    //!< default is HAlign::Left
-        VAlign          verticalAlignment;      //!< default is VAlign::Top
-        AZ::Vector2     dropShadowOffset;       //!< default is (0,0), zero offset means no drop shadow is drawn
-        AZ::Color       dropShadowColor;        //!< default is (0,0,0,0), zero alpha means no drop shadow is drawn
-        float           rotation;               //!< default is 0
-        int             baseState;              //!< Additional flags for SetState. Default is GS_NODEPTHTEST
-    };
-
-    //! Used to pass in arrays of vertices (e.g. to DrawQuad)
-    struct VertexPosColUV
-    {
-        VertexPosColUV(){}
-        VertexPosColUV(const AZ::Vector2& inPos, const AZ::Color& inColor, const AZ::Vector2& inUV)
-        {
-            position = inPos;
-            color = inColor;
-            uv = inUV;
-        }
-
-        AZ::Vector2         position;   //!< 2D position of vertex
-        AZ::Color           color;      //!< Float color
-        AZ::Vector2         uv;         //!< Texture coordinate
-    };
-
-public: // member functions
-
-    //! Implement virtual destructor just for safety.
-    virtual ~IDraw2d() {}
-};
diff --git a/Code/CryEngine/CryCommon/LyShine/ILyShine.h b/Code/CryEngine/CryCommon/LyShine/ILyShine.h
deleted file mode 100644
index 6746053596..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/ILyShine.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Math/Vector2.h>
-#include <LyShine/UiBase.h>
-
-class IDraw2d;
-class ISprite;
-struct IUiAnimationSystem;
-class UiEntityContext;
-
-// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the LYSHINE_EXPORTS
-// symbol defined in the StdAfx.h. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// LYSHINE_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-#ifdef LYSHINE_EXPORTS
-    #define LYSHINE_API DLL_EXPORT
-#else
-    #define LYSHINE_API DLL_IMPORT
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! The ILyShine interface provides access to the other interfaces provided by the UI module
-class ILyShine
-{
-public:
-    virtual ~ILyShine(){}
-
-    //! Delete this object
-    virtual void Release() = 0;
-
-    //! Gets the IDraw2d interface
-    virtual IDraw2d* GetDraw2d() = 0;
-
-    //! Create an empty UI Canvas (in game)
-    //
-    //! The system keeps track of all the loaded canvases and unloads them on game exit.
-    virtual AZ::EntityId CreateCanvas() = 0;
-
-    //! Load a UI Canvas from in-game
-    virtual AZ::EntityId LoadCanvas(const string& assetIdPathname) = 0;
-
-    //! Create an empty UI Canvas (for the UI editor)
-    //
-    //! The editor keeps track of the canvases it has open.
-    virtual AZ::EntityId CreateCanvasInEditor(UiEntityContext* entityContext) = 0;
-
-    //! Load a UI Canvas from the UI editor
-    virtual AZ::EntityId LoadCanvasInEditor(const string& assetIdPathname, const string& sourceAssetPathname, UiEntityContext* entityContext) = 0;
-
-    //! Reload a UI Canvas from xml. For use in the editor for the undo system only
-    virtual AZ::EntityId ReloadCanvasFromXml(const AZStd::string& xmlString, UiEntityContext* entityContext) = 0;
-
-    //! Get a loaded canvas by CanvasId
-    //! NOTE: this only searches canvases loaded in the game (not the editor)
-    virtual AZ::EntityId FindCanvasById(LyShine::CanvasId id) = 0;
-
-    //! Get a loaded canvas by path name
-    //! NOTE: this only searches canvases loaded in the game (not the editor)
-    virtual AZ::EntityId FindLoadedCanvasByPathName(const string& assetIdPathname) = 0;
-
-    //! Release a canvas from use either in-game or in editor, destroy UI Canvas if no longer used in either
-    virtual void ReleaseCanvas(AZ::EntityId canvas, bool forEditor = false) = 0;
-
-    //! Queue a canvas for release on the next tick (used in game mode)
-    virtual void ReleaseCanvasDeferred(AZ::EntityId canvas) = 0;
-
-    //! Load a sprite object.
-    virtual ISprite* LoadSprite(const string& pathname) = 0;
-
-    //! Create a sprite that references the specified render target
-    virtual ISprite* CreateSprite(const string& renderTargetName) = 0;
-
-    //! Check if a sprite's texture asset exists. The .sprite sidecar file is optional and is not checked
-    virtual bool DoesSpriteTextureAssetExist(const AZStd::string& pathname) = 0;
-
-    //! Perform post-initialization (script system will be available)
-    virtual void PostInit() = 0;
-
-    //! Set the current viewport size, this should be called before Update and Render are called
-    virtual void SetViewportSize(AZ::Vector2 viewportSize) = 0;
-
-    //! Update UI elements
-    //! \param deltaTimeInSeconds the amount of time in seconds since the last call to this function
-    virtual void Update(float deltaTimeInSeconds) = 0;
-
-    //! Render 2D and UI elements that should be rendered at end of frame
-    virtual void Render() = 0;
-
-    //! Execute events that were queued during a canvas update or input event handler
-    virtual void ExecuteQueuedEvents() = 0;
-
-    //! Reset the system (this happens at end of running game in Editor for example)
-    virtual void Reset() = 0;
-
-    //! Unload canvases that should be unloaded when a level is unloaded
-    virtual void OnLevelUnload() = 0;
-
-    //! Called when a load screen is finished displaying (when a level load is complete).
-    //! Used to mark all render graphs dirty in case the loaded canvases were already rendered before their textures
-    //! were done loading. This happens when a load screen is being rendered during a level load. When other canvases
-    //! associated with the level are loaded, they also get rendered by the UiLoadScreenComponent, but their texture
-    //! loading is delayed until further down the level load process. Once a canvas is rendered, its render graph's
-    //! dirty flag is cleared, so the render graph needs to be marked dirty again after the textures are loaded
-    virtual void OnLoadScreenUnloaded() = 0;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-LYSHINE_API ILyShine* CreateLyShineInterface(ISystem* system);
-
-#ifdef __cplusplus
-};
-#endif
-
diff --git a/Code/CryEngine/CryCommon/LyShine/IRenderGraph.h b/Code/CryEngine/CryCommon/LyShine/IRenderGraph.h
deleted file mode 100644
index 402a8f3b25..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/IRenderGraph.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <IRenderer.h>
-#include <LyShine/UiBase.h>
-
-namespace AZ
-{
-    class Color;
-    class Vector2;
-}
-
-namespace LyShine
-{
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // UI visual components use this interface to add primitives to the render graph, which is how the
-    // UI gets rendered.
-    // There is one render graph per UI canvas. The render graph (like a display list) is rebuilt when
-    // any visual change occurs on the canvas.
-    class IRenderGraph
-    {
-    public:
-
-        //! Virtual destructor
-        virtual ~IRenderGraph() {}
-
-        //---- Functions for creating and adding primitives to the render graph ----
-
-        //! Begin the setup of a mask render node, primitives added between this call and StartChildrenForMask define the mask
-        virtual void BeginMask(bool isMaskingEnabled, bool useAlphaTest, bool drawBehind, bool drawInFront) = 0;
-
-        //! Start defining the children (masked primitives) of a mask
-        virtual void StartChildrenForMask() = 0;
-
-        //! End the setup of a mask render node, this marks the end of adding child primitives
-        virtual void EndMask() = 0;
-
-        //! Begin rendering to a texture
-        virtual void BeginRenderToTexture(int renderTargetHandle, SDepthTexture* renderTargetDepthSurface,
-            const AZ::Vector2& viewportTopLeft, const AZ::Vector2& viewportSize, const AZ::Color& clearColor) = 0;
-
-        //! End rendering to a texture
-        virtual void EndRenderToTexture() = 0;
-
-        //! Add an indexed triangle list primitive to the render graph with given render state
-        virtual void AddPrimitive(IRenderer::DynUiPrimitive* primitive, ITexture* texture,
-            bool isClampTextureMode, bool isTextureSRGB, bool isTexturePremultipliedAlpha, BlendMode blendMode) = 0;
-        
-        //! Add an indexed triangle list primitive to the render graph which will use maskTexture as an alpha (gradient) mask
-        virtual void AddAlphaMaskPrimitive(IRenderer::DynUiPrimitive* primitive,
-            ITexture* texture, ITexture* maskTexture,
-            bool isClampTextureMode, bool isTextureSRGB, bool isTexturePremultipliedAlpha, BlendMode blendMode) = 0;
-        
-        //! Get a dynamic quad primitive that can be added as an image primitive to the render graph
-        //! The graph handles the allocation of this DynUiPrimitive and deletes it when the graph is reset
-        //! This can be used if the UI component doesn't want to own the storage of the primitive. Used infrequently,
-        //! e.g. for the selection rect on a text component.
-        virtual IRenderer::DynUiPrimitive* GetDynamicQuadPrimitive(const AZ::Vector2* positions, uint32 packedColor) = 0;
-
-        //---- Functions for supporting masking (used during creation of the graph, not rendering ) ----
-
-        //! Get flag that indicates we are rendering into a mask. Used to avoid masks on child mask elements.
-        virtual bool IsRenderingToMask() const = 0;
-
-        //! Set flag that we are rendering into a mask. Used to avoid masks on child mask elements.
-        virtual void SetIsRenderingToMask(bool isRenderingToMask) = 0;
-
-        //---- Functions for supporting fading  (used during creation of the graph, not rendering ) ----
-
-        //! Push an alpha fade, this is multiplied with any existing alpha fade from parents
-        virtual void PushAlphaFade(float alphaFadeValue) = 0;
-
-        //! Push a new alpha fade value, this replaces any existing alpha fade
-        virtual void PushOverrideAlphaFade(float alphaFadeValue) = 0;
-
-        //! Pop an alpha fade off the stack
-        virtual void PopAlphaFade() = 0;
-
-        //! Get the current alpha fade value
-        virtual float GetAlphaFade() const = 0;
-    };
-}
diff --git a/Code/CryEngine/CryCommon/LyShine/ISprite.h b/Code/CryEngine/CryCommon/LyShine/ISprite.h
deleted file mode 100644
index 8789fc5d71..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/ISprite.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <SerializeFwd.h>
-#include <smartptr.h>
-#include <LyShine/Bus/UiTransformBus.h>
-#include <AzCore/Math/Vector2.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! A sprite is a texture with extra information about how it behaves for 2D drawing
-//! Currently a sprite exists on disk as a side car file next to the texture file.
-class ISprite
-    : public _i_reference_target<int>
-{
-public: // types
-
-    // The borders define the areas of the sprite that stretch
-    // Border's members are always in range 0-1, they are normalized positions within the texture bounds
-    struct Borders
-    {
-        Borders()
-            : m_left(0.0f)
-            , m_right(1.0f)
-            , m_top(0.0f)
-            , m_bottom(1.0f) {}
-
-        Borders(float left, float right, float top, float bottom)
-            : m_left(left)
-            , m_right(right)
-            , m_top(top)
-            , m_bottom(bottom) {}
-
-        float   m_left;
-        float   m_right;
-        float   m_top;
-        float   m_bottom;
-    };
-
-    //! \brief Defines the UV-extents of a particular "cell" in a sprite-sheet.
-    //! 9-slice information for the cell is also stored.
-    struct SpriteSheetCell
-    {
-        AZStd::string alias;
-        UiTransformInterface::RectPoints uvCellCoords;
-        Borders borders;
-    };
-
-    using SpriteSheetCellContainer = AZStd::vector<SpriteSheetCell>;
-
-public: // member functions
-
-    //! Deleting a sprite will release its texture
-    virtual ~ISprite() {}
-
-    //! Get the pathname of this sprite
-    virtual const string& GetPathname() const = 0;
-
-    //! Get the pathname of the texture of this sprite
-    virtual const string& GetTexturePathname() const = 0;
-
-    //! Get the borders of this sprite
-    virtual Borders GetBorders() const = 0;
-
-    //! Set the borders of this sprite
-    virtual void SetBorders(Borders borders) = 0;
-
-    //! Set the borders of a given cell within the sprite-sheet.
-    virtual void SetCellBorders(int cellIndex, Borders borders) = 0;
-
-    //! Serialize this object for save/load
-    virtual void Serialize(TSerialize ser) = 0;
-
-    //! Save this sprite data to disk
-    virtual bool SaveToXml(const string& pathname) = 0;
-
-    //! Test if this sprite has any borders
-    virtual bool AreBordersZeroWidth() const = 0;
-
-    //! Tests if the sprite-sheet cell has borders
-    virtual bool AreCellBordersZeroWidth(int cellIndex) const = 0;
-
-    //! Get the dimensions of the sprite
-    virtual AZ::Vector2 GetSize() = 0;
-
-    //! Gets the dimensions of a specific cell texture within a sprite-sheet
-    virtual AZ::Vector2 GetCellSize(int cellIndex) = 0;
-
-    //! Gets cell info for each of the cells within the sprite-sheet.
-    virtual const SpriteSheetCellContainer& GetSpriteSheetCells() const = 0;
-
-    //! Sets the sprite's sprite-sheet cells.
-    virtual void SetSpriteSheetCells(const SpriteSheetCellContainer& cells) = 0;
-
-    //! Removes all sprite-sheet cell info for this sprite.
-    virtual void ClearSpriteSheetCells() = 0;
-
-    //! Defines a new SpriteSheetCell for this sprite.
-    virtual void AddSpriteSheetCell(const SpriteSheetCell& spriteSheetCell) = 0;
-
-    //! Gets the dimensions of a specific cell (in a sprite-sheet) in UV coords (UV range).
-    virtual AZ::Vector2 GetCellUvSize(int cellIndex) const = 0;
-
-    //! Gets the UV coords associated for a given cell in a sprite-sheet.
-    virtual UiTransformInterface::RectPoints GetCellUvCoords(int cellIndex) const = 0;
-
-    //! Gets the UV coords associated for a given cell in a sprite-sheet in a way that ignores texture atlases
-    virtual UiTransformInterface::RectPoints GetSourceCellUvCoords(int cellIndex) const = 0;
-
-    //! Gets the sliced border info for a given cell within a sprite-sheet.
-    //!
-    //! The returned UV borders are in "cell space" relative to the given indexed spell. For example,
-    //! a top-left border of (0.5, 0.5) would be the center of the given cell.
-    virtual Borders GetCellUvBorders(int cellIndex) const = 0;
-
-    //! Gets the sliced border UV coordinates in texture space for a given cell within a sprite-sheet.
-    //!
-    //! The returned UV border coordinates are in texture space. For example, a top-left border of (0.5, 0.5) 
-    //! would be the center of the sprite-sheet.
-    virtual Borders GetTextureSpaceCellUvBorders(int cellIndex) const = 0;
-
-    //! Gets the string alias associated with the given cell in a sprite-sheet.
-    virtual const AZStd::string& GetCellAlias(int cellIndex) const = 0;
-
-    //! Sets the string alias associated with the given cell in a sprite-sheet.
-    virtual void SetCellAlias(int cellIndex, const AZStd::string& cellAlias) = 0;
-
-    //! Returns the sprite-sheet cell index that corresponds to the given string alias.
-    virtual int GetCellIndexFromAlias(const AZStd::string& cellAlias) const = 0;
-    
-    //! Returns true if this sprite is configured as a sprite-sheet, false otherwise
-    virtual bool IsSpriteSheet() const = 0;
-};
-
diff --git a/Code/CryEngine/CryCommon/LyShine/UiAssetTypes.h b/Code/CryEngine/CryCommon/LyShine/UiAssetTypes.h
deleted file mode 100644
index 169ec6e143..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/UiAssetTypes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/RTTI/TypeInfo.h>
-#include <AzFramework/Asset/SimpleAsset.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-namespace LyShine
-{
-    class FontAsset
-    {
-    public:
-        AZ_TYPE_INFO(FontAsset, "{57767D37-0EBE-43BE-8F60-AB36D2056EF8}")
-        static const char* GetFileFilter()
-        {
-            return "*.xml;*.font;*.fontfamily";
-        }
-    };
-
-    class CanvasAsset
-    {
-    public:
-        AZ_TYPE_INFO(CanvasAsset, "{E48DDAC8-1F1E-4183-AAAB-37424BCC254B}")
-        static const char* GetFileFilter()
-        {
-            return "*.uicanvas";
-        }
-    };
-}
diff --git a/Code/CryEngine/CryCommon/LyShine/UiBase.h b/Code/CryEngine/CryCommon/LyShine/UiBase.h
deleted file mode 100644
index f5aabc9141..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/UiBase.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <platform.h>
-#include <algorithm>
-#include <Cry_Math.h>
-#include <Cry_Color.h>
-#include <ISystem.h>
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/std/containers/unordered_map.h>
-
-// This is a workaround for AZCore including WinUser.h which defines DrawText to be DrawTextA
-#ifdef DrawText
-    #undef DrawText
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Common types used across the LyShine UI system
-namespace LyShine
-{
-    //! used for UI element names and canvas names, should be the same as the AZ::Entity name type
-    typedef AZStd::string NameType;
-
-    //! Used for pathnames for UI canvas and prefab files
-    typedef AZStd::string PathnameType;
-
-    //! USed for our 32-bit id's for canvases and elements. Only used so FlowGraph can reference these things
-    //! These should go away once FlowGraph can used AZ::EntityIds
-    typedef unsigned int CanvasId;
-    typedef unsigned int ElementId;
-
-    //! Used for UI action names
-    typedef AZStd::string ActionName;
-
-    //! Used for test strings in  UI text elements
-    typedef AZStd::string StringType;    // not yet decided if we should use wchar_t or UTF8
-
-    //! Used for passing lists of entities
-    typedef DynArray<AZ::Entity*> EntityArray;
-
-    enum class BlendMode
-    {
-        Normal,     //!< interpolate from dest color to source color according to source alpha
-        Add,        //!< source color * source alpha is added to dest color (Linear Dodge)
-        Screen,     //!< as close as we can get to Photoshop Screen
-        Darken,     //!< like Photoshop darken
-        Lighten,    //!< like Photoshop lighten
-    };
-
-    // used to map old EntityId's to new EntityId's when generating new ids for a paste or prefab
-    typedef AZStd::unordered_map<AZ::EntityId, AZ::EntityId> EntityIdMap;
-};
-
-
-namespace AZ
-{
-    AZ_TYPE_INFO_SPECIALIZE(ColorF, "{63782551-A309-463B-A301-3A360800DF1E}");
-    AZ_TYPE_INFO_SPECIALIZE(ColorB, "{6F0CC2C0-0CC6-4DBF-9297-B043F270E6A4}");
-    AZ_TYPE_INFO_SPECIALIZE(Vec4, "{CAC9510C-8C00-41D4-BC4D-2C6A8136EB30}");
-    AZ_TYPE_INFO_SPECIALIZE(CryStringT<char>, "{835199FB-292B-4DB3-BC7C-366E356300FA}");
-} // namespace AZ
-
diff --git a/Code/CryEngine/CryCommon/LyShine/UiComponentTypes.h b/Code/CryEngine/CryCommon/LyShine/UiComponentTypes.h
deleted file mode 100644
index 1870ffd9ce..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/UiComponentTypes.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Common types used across the LyShine UI system
-namespace LyShine
-{
-    // Uuid strings for all component types define by LyShine.
-    // This can be used to create components at runtime. E.g.:
-    //     entity->CreateComponent(LyShine::UiTransform2dComponentUuid);
-    const char* const UiButtonComponentUuid =           "{7329DFE8-0F3C-4629-B395-78B2CF646B96}";
-    const char* const UiCanvasComponentUuid =           "{50B8CF6C-B19A-4D86-AFE9-96EFB820D422}";
-    const char* const UiCheckboxComponentUuid =         "{68D62281-B360-4426-AACA-E8BDE8BFEB3A}";
-    const char* const UiDraggableComponentUuid =        "{C96B1EEF-033A-479B-829B-ED3555D0F33A}";
-    const char* const UiDropTargetComponentUuid =       "{E4B8ACE0-FCE7-42D8-9836-942F910168B4}";
-    const char* const UiDropdownComponentUuid =         "{BFC4D5A3-2F7C-4079-B19C-C2A06E93F343}";
-    const char* const UiDropdownOptionComponentUuid =   "{554E16E4-CBA1-4E57-B326-9731AA963BAA}";
-    const char* const UiDynamicLayoutComponentUuid =    "{690BEC14-3642-4247-BD96-FE414CCB7DE7}";
-    const char* const UiDynamicScrollBoxComponentUuid = "{6982C200-4D32-43CC-A7F6-F54FA50FCFF5}";
-    const char* const UiElementComponentUuid =          "{4A97D63E-CE7A-45B6-AAE4-102DB4334688}";
-    const char* const UiFaderComponentUuid =            "{CD01FF77-2249-4ED8-BFFB-33A66A47E17C}";
-    const char* const UiFlipbookAnimationComponentUuid ="{AACCFFA1-B694-4F8B-A289-391A56404E0C}";
-    const char* const UiImageComponentUuid =            "{BDBEFD23-DBB4-4726-A32D-4FEAC24E51F6}";
-    const char* const UiImageSequenceComponentUuid =    "{BFAC7909-3A56-4980-AF7C-261A99D6371B}";
-    const char* const UiLayoutColumnComponentUuid =     "{4BC2E786-360B-4426-8D9C-9B254C5EA21F}";
-    const char* const UiLayoutCellComponentUuid =       "{A0568E58-4382-47F8-8B88-77C64B99AC80}";
-    const char* const UiLayoutFitterComponentUuid =     "{96C55390-9D03-4C47-BB0D-17D3BD5219E3}";
-    const char* const UiLayoutGridComponentUuid =       "{ADDA3AE5-B9AB-44B7-A462-8B89B398A837}";
-    const char* const UiLayoutRowComponentUuid =        "{7B2820C4-7FC7-4F02-B777-6727EB4BAC13}";
-    const char* const UiMarkupButtonComponentUuid =     "{D7EB1706-75E8-4C94-A266-61913F42431B}";
-    const char* const UiMaskComponentUuid =             "{2279AA38-271D-4D4F-A472-E42B984088AC}";
-    const char* const UiParticleEmitterComponentUuid =  "{E8B1288C-CB49-4CAD-B366-AF1B40C47E74}";
-    const char* const UiRadioButtonComponentUuid =      "{773A0F4B-F9F9-4B82-9951-BBD73A737DE4}";
-    const char* const UiRadioButtonGroupComponentUuid = "{F89D5EF2-37C4-4CA7-9AA2-23DC3867EC9D}";
-    const char* const UiScrollBarComponentUuid =        "{6B283F90-3519-47DA-A1DD-65A79CE119CF}";
-    const char* const UiScrollBoxComponentUuid =        "{2F539588-AEAB-4341-A6A6-AF645D129693}";
-    const char* const UiSliderComponentUuid =           "{2913D76B-36A0-45E0-A104-33C668EB612D}";
-    const char* const UiTextComponentUuid =             "{5B3FB2A7-5DC4-4033-A970-001CEC85B6C4}";
-    const char* const UiTextInputComponentUuid =        "{2CB3872B-D2B4-4DDB-B39A-97492310AE11}";
-    const char* const UiTooltipComponentUuid =          "{493EBF89-C299-4722-829D-4DFAB926795B}";
-    const char* const UiTooltipDisplayComponentUuid =   "{18CEE6A7-3CBC-4638-9F4D-87E8D53DDF1A}";
-    const char* const UiTransform2dComponentUuid =      "{2751A5A5-3291-4A4D-9FC0-9CB0EB8D1DE6}";
-
-    // The Uuid of the LyShine system component. Can be used from tools to activate this component.
-    const char* const lyShineSystemComponentUuid =      "{B0C78B8D-1E5B-47D7-95D0-EC69C0513804}";
-};
diff --git a/Code/CryEngine/CryCommon/LyShine/UiEntityContext.h b/Code/CryEngine/CryCommon/LyShine/UiEntityContext.h
deleted file mode 100644
index 1c68646b7a..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/UiEntityContext.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Math/Uuid.h>
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/Slice/SliceComponent.h>
-
-#include <AzFramework/Entity/EntityContext.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-
-#include <LyShine/Bus/UiEntityContextBus.h>
-
-namespace AZ
-{
-    class SerializeContext;
-}
-
-namespace AzFramework
-{
-    class EntityContext;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! The UI Entity Context stores the prefab asset for the root slice of a UI canvas
-//! So all of the UI element entities in a canvas are owned indirectly by the context and managed
-//! by the entity context.
-class UiEntityContext
-    : public AzFramework::EntityContext
-    , public UiEntityContextRequestBus::Handler
-{
-public: // member functions
-
-    //! Initialize the entity context and instantiate the root slice
-    virtual void InitUiContext() = 0;
-
-    //! Destroy the Entity Context
-    virtual void DestroyUiContext() = 0;
-
-    //! Saves the context's slice root to the specified buffer. If necessary
-    //! entities undergo conversion for game: editor -> game components.
-    //! \return true if successfully saved. Failure is only possible if serialization data is corrupt.
-    virtual bool SaveToStreamForGame(AZ::IO::GenericStream& stream, AZ::DataStream::StreamType streamType) = 0;
-
-    //! Saves the given canvas entity to the specified buffer. If necessary
-    //! the entity undergoes conversion for game: editor -> game components.
-    //! \return true if successfully saved. Failure is only possible if serialization data is corrupt.
-    //! This is needed because the canvas entity is not part of the root slice. It is here in the entity
-    //! context because that allows us to get to the ToolsFramework functionality.
-    virtual bool SaveCanvasEntityToStreamForGame(AZ::Entity* canvasEntity, AZ::IO::GenericStream& stream, AZ::DataStream::StreamType streamType) = 0;
-};
diff --git a/Code/CryEngine/CryCommon/LyShine/UiLayoutCellBase.h b/Code/CryEngine/CryCommon/LyShine/UiLayoutCellBase.h
deleted file mode 100644
index fe20273393..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/UiLayoutCellBase.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Common types used across the LyShine UI layout cell system
-namespace LyShine
-{
-    const float UiLayoutCellUnspecifiedSize = -1.0f;
-
-    inline bool IsUiLayoutCellSizeSpecified(float size)
-    {
-        return size >= 0.0f;
-    }
-};
diff --git a/Code/CryEngine/CryCommon/LyShine/UiSerializeHelpers.h b/Code/CryEngine/CryCommon/LyShine/UiSerializeHelpers.h
deleted file mode 100644
index 090b622d9f..0000000000
--- a/Code/CryEngine/CryCommon/LyShine/UiSerializeHelpers.h
+++ /dev/null
@@ -1,670 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Math/Crc.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Color.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Math/Sfmt.h>
-#include <AzCore/Component/Entity.h>
-
-#include <LyShine/UiAssetTypes.h>
-#include <LyShine/UiBase.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace LyShine
-{
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert a CryString field to an AZStd::String
-    // Inline to avoid DLL linkage issues
-    inline bool ConvertSubElementFromCryStringToAzString(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* subElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(subElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            CryStringT<char> oldData;
-
-            if (!elementNode.GetData(oldData))
-            {
-                // Error, old subElement was not a string or not valid
-                AZ_Error("Serialization", false, "Cannot get string data for element %s.", subElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add a new element for the new data.
-            int newElementIndex = classElement.AddElement<AZStd::string>(context, subElementName);
-            if (newElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element %s", subElementName);
-                return false;
-            }
-
-            AZStd::string newData(oldData.c_str());
-            classElement.GetSubElement(newElementIndex).SetData(context, newData);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert a CryString field to a char
-    // Inline to avoid DLL linkage issues
-    inline bool ConvertSubElementFromCryStringToChar(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* subElementName,
-        char defaultValue)
-    {
-        int index = classElement.FindElement(AZ_CRC(subElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            CryStringT<char> oldData;
-
-            if (!elementNode.GetData(oldData))
-            {
-                // Error, old subElement was not a CryString
-                AZ_Error("Serialization", false, "Element %s is not a CryString.", subElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add a new element for the new data.
-            int newElementIndex = classElement.AddElement<char>(context, subElementName);
-            if (newElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element %s", subElementName);
-                return false;
-            }
-
-            char newData = (oldData.empty()) ? defaultValue : oldData[0];
-            classElement.GetSubElement(newElementIndex).SetData(context, newData);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert a CryString field to a simple asset reference
-    // Inline to avoid DLL linkage issues
-    template<typename T>
-    inline bool ConvertSubElementFromCryStringToAssetRef(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* subElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(subElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            CryStringT<char> oldData;
-
-            if (!elementNode.GetData(oldData))
-            {
-                // Error, old subElement was not a CryString
-                AZ_Error("Serialization", false, "Element %s is not a CryString.", subElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add a new element for the new data.
-            int simpleAssetRefIndex = classElement.AddElement<AzFramework::SimpleAssetReference<T> >(context, subElementName);
-            if (simpleAssetRefIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for simpleAssetRefIndex %s", subElementName);
-                return false;
-            }
-
-            // add a sub element for the SimpleAssetReferenceBase within the SimpleAssetReference
-            AZ::SerializeContext::DataElementNode& simpleAssetRefNode = classElement.GetSubElement(simpleAssetRefIndex);
-            int simpleAssetRefBaseIndex = simpleAssetRefNode.AddElement<AzFramework::SimpleAssetReferenceBase>(context, "BaseClass1");
-            if (simpleAssetRefBaseIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element BaseClass1");
-                return false;
-            }
-
-            // add a sub element for the AssetPath within the SimpleAssetReference
-            AZ::SerializeContext::DataElementNode& simpleAssetRefBaseNode = simpleAssetRefNode.GetSubElement(simpleAssetRefBaseIndex);
-            int assetPathElementIndex = simpleAssetRefBaseNode.AddElement<AZStd::string>(context, "AssetPath");
-            if (assetPathElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element AssetPath");
-                return false;
-            }
-
-            AZStd::string newData(oldData.c_str());
-            simpleAssetRefBaseNode.GetSubElement(assetPathElementIndex).SetData(context, newData);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert an AZStd::string field to a simple asset reference
-    // Inline to avoid DLL linkage issues
-    template<typename T>
-    inline bool ConvertSubElementFromAzStringToAssetRef(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* subElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(subElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            AZStd::string oldData;
-
-            if (!elementNode.GetData(oldData))
-            {
-                // Error, old subElement was not a string or not valid
-                AZ_Error("Serialization", false, "Cannot get string data for element %s.", subElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add a new element for the new data.
-            int simpleAssetRefIndex = classElement.AddElement<AzFramework::SimpleAssetReference<T> >(context, subElementName);
-            if (simpleAssetRefIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for simpleAssetRefIndex %s", subElementName);
-                return false;
-            }
-
-            // add a sub element for the SimpleAssetReferenceBase within the SimpleAssetReference
-            AZ::SerializeContext::DataElementNode& simpleAssetRefNode = classElement.GetSubElement(simpleAssetRefIndex);
-            int simpleAssetRefBaseIndex = simpleAssetRefNode.AddElement<AzFramework::SimpleAssetReferenceBase>(context, "BaseClass1");
-            if (simpleAssetRefBaseIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element BaseClass1");
-                return false;
-            }
-
-            // add a sub element for the AssetPath within the SimpleAssetReference
-            AZ::SerializeContext::DataElementNode& simpleAssetRefBaseNode = simpleAssetRefNode.GetSubElement(simpleAssetRefBaseIndex);
-            int assetPathElementIndex = simpleAssetRefBaseNode.AddElement<AZStd::string>(context, "AssetPath");
-            if (assetPathElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element AssetPath");
-                return false;
-            }
-
-            AZStd::string newData(oldData.c_str());
-            simpleAssetRefBaseNode.GetSubElement(assetPathElementIndex).SetData(context, newData);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert a char to a uint32_t
-    // Inline to avoid DLL linkage issues
-    inline bool ConvertSubElementFromCharToUInt32(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* subElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(subElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            char oldData;
-
-            if (!elementNode.GetData(oldData))
-            {
-                // Error, old subElement was not a CryString
-                AZ_Error("Serialization", false, "Element %s is not a char.", subElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add a new element for the new data.
-            int newElementIndex = classElement.AddElement<uint32_t>(context, subElementName);
-            if (newElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element %s", subElementName);
-                return false;
-            }
-
-            uint32_t newData = oldData;
-            classElement.GetSubElement(newElementIndex).SetData(context, newData);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to get the value for a named sub element
-    template<typename T>
-    inline bool GetSubElementValue(
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* elementName, T& value)
-    {
-        int index = classElement.FindElement(AZ_CRC(elementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-            if (!elementNode.GetData(value))
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to make a ColorF out of an RGB color and an alpha
-    inline ColorF MakeColorF(AZ::Vector3 color, float alpha)
-    {
-        return ColorF(color.GetX(), color.GetY(), color.GetZ(), alpha);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to make an AZ::Vector3 from the rgb elements of a ColorF
-    inline AZ::Vector3 MakeColorVector3(ColorF color)
-    {
-        return AZ::Vector3(color.r, color.g, color.b);
-    }
-
-    // Helper function to make an AZ::Color from a ColorF
-    inline AZ::Color MakeColorAZColor(ColorF color)
-    {
-        return AZ::Color(color.r, color.g, color.b, color.a);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert a ColorF field to a Vector3 color and a float
-    // alpha.
-    // Inline to avoid DLL linkage issues
-    inline bool ConvertSubElementFromColorToColorPlusAlpha(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* colorElementName,
-        const char* alphaElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(colorElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            ColorF oldData;
-
-            if (!(GetSubElementValue(elementNode, "r", oldData.r) &&
-                  GetSubElementValue(elementNode, "g", oldData.g) &&
-                  GetSubElementValue(elementNode, "b", oldData.b) &&
-                  GetSubElementValue(elementNode, "a", oldData.a)))
-            {
-                // Error, old subElement was not a ColorF
-                AZ_Error("Serialization", false, "Element %s is not a ColorF.", colorElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add new elements for the new data.
-
-            int newColorElementIndex = classElement.AddElement<AZ::Vector3>(context, colorElementName);
-            if (newColorElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element %s", colorElementName);
-                return false;
-            }
-
-            int newAlphaElementIndex = classElement.AddElement<float>(context, alphaElementName);
-            if (newAlphaElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element %s", alphaElementName);
-                return false;
-            }
-
-            AZ::Vector3 newColorData(oldData.r, oldData.g, oldData.b);
-            classElement.GetSubElement(newColorElementIndex).SetData(context, newColorData);
-
-            float newAlphaData(oldData.a);
-            classElement.GetSubElement(newAlphaElementIndex).SetData(context, newAlphaData);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert a AZ::Vector3 field to a AZ::Color
-    // Inline to avoid DLL linkage issues
-    inline bool ConvertSubElementFromVector3ToAzColor(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* colorElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(colorElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            AZ::Vector3 oldData;
-
-            if (!elementNode.GetData(oldData))
-            {
-                // Error, old subElement was not a Vector3 or not valid
-                AZ_Error("Serialization", false, "Cannot get Vector3 data for element %s.", colorElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add new elements for the new data.
-
-            int newColorElementIndex = classElement.AddElement<AZ::Color>(context, colorElementName);
-            if (newColorElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element %s", colorElementName);
-                return false;
-            }
-
-            AZ::Color newColorData = AZ::Color::CreateFromVector3(oldData);
-            classElement.GetSubElement(newColorElementIndex).SetData(context, newColorData);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert a ColorF field to a AZ::Color
-    // Inline to avoid DLL linkage issues
-    inline bool ConvertSubElementFromColorFToAzColor(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* colorElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(colorElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            ColorF oldData;
-
-            if (!(GetSubElementValue(elementNode, "r", oldData.r) &&
-                  GetSubElementValue(elementNode, "g", oldData.g) &&
-                  GetSubElementValue(elementNode, "b", oldData.b) &&
-                  GetSubElementValue(elementNode, "a", oldData.a)))
-            {
-                // Error, old subElement was not a ColorF
-                AZ_Error("Serialization", false, "Element %s is not a ColorF.", colorElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add new elements for the new data.
-
-            int newColorElementIndex = classElement.AddElement<AZ::Color>(context, colorElementName);
-            if (newColorElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element %s", colorElementName);
-                return false;
-            }
-
-            classElement.GetSubElement(newColorElementIndex).SetData(context, MakeColorAZColor(oldData));
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to convert a Vec2 field to a AZ::Vector2.
-    // Inline to avoid DLL linkage issues
-    inline bool ConvertSubElementFromVec2ToVector2(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* vec2ElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(vec2ElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
-
-            Vec2 oldData;
-
-            if (!(GetSubElementValue(elementNode, "x", oldData.x) &&
-                GetSubElementValue(elementNode, "y", oldData.y)))
-            {
-                // Error, old subElement was not a Vec2
-                AZ_Error("Serialization", false, "Element %s is not a Vec2.", vec2ElementName);
-                return false;
-            }
-
-            // Remove old version.
-            classElement.RemoveElement(index);
-
-            // Add new elements for the new data.
-
-            int newVector2ElementIndex = classElement.AddElement<AZ::Vector2>(context, vec2ElementName);
-            if (newVector2ElementIndex == -1)
-            {
-                // Error adding the new sub element
-                AZ_Error("Serialization", false, "AddElement failed for converted element %s", vec2ElementName);
-                return false;
-            }
-
-            AZ::Vector2 newVector2Data(oldData.x, oldData.y);
-            classElement.GetSubElement(newVector2ElementIndex).SetData(context, newVector2Data);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to move a sub-element from one DataElementNode to another
-    // DataElementNode and rename it
-    inline bool MoveElement(
-        [[maybe_unused]] AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& srcElement,
-        AZ::SerializeContext::DataElementNode& dstElement,
-        const char* srcSubElementName,
-        const char* dstSubElementName)
-    {
-        // find the sub-element (the field we will move)
-        int srcSubElementIndex = srcElement.FindElement(AZ_CRC(srcSubElementName));
-        if (srcSubElementIndex != -1)
-        {
-            // add a copy of the sub-element into the base class
-            AZ::SerializeContext::DataElementNode subElementNode = srcElement.GetSubElement(srcSubElementIndex);
-            subElementNode.SetName(dstSubElementName);
-            dstElement.AddElement(subElementNode);
-
-            // remove the sub-element from its original location
-            srcElement.RemoveElement(srcSubElementIndex);
-        }
-
-        // if the field did not exist then we do not report an error
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to VersionConverter to remove leading forward slashes from asset path
-    inline bool RemoveLeadingForwardSlashesFromAssetPath(
-        AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement,
-        const char* simpleAssetRefSubElementName)
-    {
-        int index = classElement.FindElement(AZ_CRC(simpleAssetRefSubElementName));
-        if (index != -1)
-        {
-            AZ::SerializeContext::DataElementNode& simpleAssetRefNode = classElement.GetSubElement(index);
-            index = simpleAssetRefNode.FindElement(AZ_CRC("BaseClass1", 0xd4925735));
-
-            if (index != -1)
-            {
-                AZ::SerializeContext::DataElementNode& baseClassNode = simpleAssetRefNode.GetSubElement(index);
-                index = baseClassNode.FindElement(AZ_CRC("AssetPath", 0x2c355179));
-
-                if (index != -1)
-                {
-                    AZ::SerializeContext::DataElementNode& assetPathNode = baseClassNode.GetSubElement(index);
-                    AZStd::string assetPath;
-
-                    if (!assetPathNode.GetData(assetPath))
-                    {
-                        AZ_Error("Serialization", false, "Element AssetPath is not a AZStd::string.");
-                        return false;
-                    }
-
-                    // Count leading forward slashes
-                    int i = 0;
-                    while ((i < assetPath.length()) && (assetPath[i] == '/'))
-                    {
-                        i++;
-                    }
-                    if (i > 0)
-                    {
-                        // Remove leading forward slashes
-                        assetPath.erase(0, i);
-
-                        if (!assetPathNode.SetData(context, assetPath))
-                        {
-                            AZ_Error("Serialization", false, "Unable to set AssetPath data.");
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to find a component with the given UUID in an entity
-    inline AZ::SerializeContext::DataElementNode* FindComponentNode(AZ::SerializeContext::DataElementNode& entityNode, const AZ::Uuid& uuid)
-    {
-        // get the component vector node
-        int componentsIndex = entityNode.FindElement(AZ_CRC("Components", 0xee48f5fd));
-        if (componentsIndex == -1)
-        {
-            return nullptr;
-        }
-        AZ::SerializeContext::DataElementNode& componentsNode = entityNode.GetSubElement(componentsIndex);
-
-        // search the components vector for the first component with the given ID
-        int numComponents = componentsNode.GetNumSubElements();
-        for (int compIndex = 0; compIndex < numComponents; ++compIndex)
-        {
-            AZ::SerializeContext::DataElementNode& componentNode = componentsNode.GetSubElement(compIndex);
-
-            if (componentNode.GetId() == uuid)
-            {
-                return &componentNode;
-            }
-        }
-
-        return nullptr;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to create an EntityId node for a newly created entity node
-    inline bool CreateEntityIdNode(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& entityNode)
-    {
-        // Generate a new EntityId and extract the raw u64
-        AZ::EntityId newEntityId = AZ::Entity::MakeId();
-        AZ::u64 rawId = static_cast<AZ::u64>(newEntityId);
-
-        // Create the EntityId node within this entity
-        int entityIdIndex = entityNode.AddElement<AZ::EntityId>(context, "Id");
-        if (entityIdIndex == -1)
-        {
-            return false;
-        }
-        AZ::SerializeContext::DataElementNode& elementIdNode = entityNode.GetSubElement(entityIdIndex);
-
-        // Create the sub node of the EntityID that actually stores the u64
-        int u64Index = elementIdNode.AddElementWithData(context, "id", rawId);
-        if (u64Index == -1)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Helper function to create the AZ::Component base class for a newly created component
-    inline bool CreateComponentBaseClassNode(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& componentNode)
-    {
-        // Generate a new component ID (using same technique that the AZ::Component uses)
-        AZ::ComponentId compId = AZ::Sfmt::GetInstance().Rand64();
-
-        // Create the base class node within this component node
-        int baseClassIndex = componentNode.AddElement<AZ::Component>(context, "BaseClass1");
-        if (baseClassIndex == -1)
-        {
-            return false;
-        }
-        AZ::SerializeContext::DataElementNode& baseClassNode = componentNode.GetSubElement(baseClassIndex);
-
-        // Create the sub node of the component base class that stores the u64 component id
-        int u64Index = baseClassNode.AddElementWithData(context, "Id", compId);
-        if (u64Index == -1)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Code/CryEngine/CryCommon/MacSpecific.h b/Code/CryEngine/CryCommon/MacSpecific.h
deleted file mode 100644
index 9d1eb38cb3..0000000000
--- a/Code/CryEngine/CryCommon/MacSpecific.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Mac declarations
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H
-#pragma once
-
-
-#include "AppleSpecific.h"
-#include <cstddef>
-#include <cfloat>
-#include <xmmintrin.h>
-//#define _CPU_X86
-#define _CPU_AMD64
-#define _CPU_SSE
-#define PLATFORM_64BIT
-
-#define USE_CRT 1
-#define SIZEOF_PTR 8
-
-typedef uint64_t threadID;
-
-
-// curses.h stubs for PDcurses keys
-#define PADENTER    KEY_MAX + 1
-#define CTL_HOME    KEY_MAX + 2
-#define CTL_END     KEY_MAX + 3
-#define CTL_PGDN    KEY_MAX + 4
-#define CTL_PGUP    KEY_MAX + 5
-
-// stubs for virtual keys, isn't used on Mac
-#define VK_UP               0
-#define VK_DOWN         0
-#define VK_RIGHT        0
-#define VK_LEFT         0
-#define VK_CONTROL  0
-#define VK_SCROLL       0
-
-#define MAC_NOT_IMPLEMENTED assert(false);
-
-
-typedef enum
-{
-    eDAContinue,
-    eDAIgnore,
-    eDAIgnoreAll,
-    eDABreak,
-    eDAStop,
-    eDAReportAsBug
-} EDialogAction;
-
-extern EDialogAction MacOSXHandleAssert(const char* condition, const char* file, int line, const char* reason, bool);
-
-#endif // CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h b/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h
deleted file mode 100644
index 7c50486567..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/std/string/string.h>
-#include <Maestro/Bus/SequenceComponentBus.h>
-#include <Maestro/Bus/SequenceAgentComponentBus.h>
-#include <IMovieSystem.h>
-
-#include "SequenceAgentComponentBus.h"
-
-namespace Maestro
-{
-    /*!
-    * EditorSequenceAgentComponentRequests EBus Interface
-    * Messages serviced by EditorSequenceAgentComponents.
-    *
-    * The EBus is Id'ed on a pair of SequenceEntityId, SequenceAgentEntityId 
-    */
-
-    class EditorSequenceAgentComponentBus
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~EditorSequenceAgentComponentBus() = default;
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        using BusIdType = SequenceAgentEventBusId;
-        //////////////////////////////////////////////////////////////////////////
-    };
-
-    class EditorSequenceAgentComponentRequests
-        : public EditorSequenceAgentComponentBus
-    {
-    public:
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides - application is a singleton
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;  // Only one component on a entity can implement the events
-        //////////////////////////////////////////////////////////////////////////
-
-        //! Returns a list of all animatable properties for a given componentId on the entity which holds the SequenceAgent Component
-        virtual void GetAllAnimatableProperties(IAnimNode::AnimParamInfos& propertyNames, AZ::ComponentId componentId) = 0;
-
-        //! Append all animatable components on the entity which holds the SequenceAgent Component
-        virtual void GetAnimatableComponents(AZStd::vector<AZ::ComponentId>& animatableComponentIds) = 0;
-    };
-
-    using EditorSequenceAgentComponentRequestBus = AZ::EBus<EditorSequenceAgentComponentRequests>;
-
-    /**
-    * Notifications from the Editor Sequence Agent Component
-    */
-    class EditorSequenceAgentComponentNotification
-        : public AZ::EBusTraits
-    {
-    public:
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        using BusIdType = AZ::EntityId;
-        //////////////////////////////////////////////////////////////////////////
-
-        virtual ~EditorSequenceAgentComponentNotification() {}
-
-        /**
-        * Called when a Sequence Agent has been connected to a Sequence.
-        */
-        virtual void OnSequenceAgentConnected() {}
-    };
-
-    using EditorSequenceAgentComponentNotificationBus = AZ::EBus<EditorSequenceAgentComponentNotification>;
-
-} // namespace Maestro
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceBus.h b/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceBus.h
deleted file mode 100644
index 8432372f2d..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceBus.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/EBus/EBus.h>
-
-namespace Maestro
-{
-    /**
-    * Global Notifications from the Editor Sequences
-    */
-    class EditorSequenceNotification
-        : public AZ::EBusTraits
-    {
-    public:
-
-        /**
-        * Called when a Sequence has been selected in Track View.
-        */
-        virtual void OnSequenceSelected([[maybe_unused]] const AZ::EntityId& sequenceEntityId) {}
-    };
-
-    using EditorSequenceNotificationBus = AZ::EBus<EditorSequenceNotification>;
-
-} // namespace Maestro
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h b/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h
deleted file mode 100644
index 7515b24735..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/std/string/string.h>
-#include <IMovieSystem.h>
-
-#include "SequenceComponentBus.h"
-enum class AnimValueType;
-
-namespace Maestro
-{
-    /*!
-    * EditorSequenceComponentRequests EBus Interface
-    * Messages serviced by DirectorComponents.
-    */
-    class EditorSequenceComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides - application is a singleton
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;  // Only one component on a entity can implement the events
-        //////////////////////////////////////////////////////////////////////////
-
-        //! Adds an entity to be animated
-        virtual void AddEntityToAnimate(AZ::EntityId entityToAnimate) = 0;
-
-        //! Remove EntityToAnimate
-        virtual void RemoveEntityToAnimate(AZ::EntityId removedEntityId) = 0;
-
-        //! Marks the entity as dirty in the Editor. Returns true if the entity was marked as dirty, false otherwise.
-        virtual bool MarkEntityAsDirty() const = 0;
-
-        //! Fills in a list of all animatable properites for a given component on a given entity.
-        virtual void GetAllAnimatablePropertiesForComponent(IAnimNode::AnimParamInfos& addressList, AZ::EntityId id, AZ::ComponentId componentId) = 0;
-
-        //! Fills in a list of all animatable component ids for the given entity.
-        virtual void GetAnimatableComponents(AZStd::vector<AZ::ComponentId>& componentIds, AZ::EntityId id) = 0;
-
-        //! Return the AnimValueType type for the given address
-        virtual AnimValueType GetValueType(const AZStd::string& animatableAddress) = 0;
-    };
-
-    using EditorSequenceComponentRequestBus = AZ::EBus<EditorSequenceComponentRequests>;
-
-// defined in the bus header so we can refer to it in the Editor code
-#define EditorSequenceComponentTypeId "{C02DC0E2-D0F3-488B-B9EE-98E28077EC56}"
-
-} // namespace Maestro
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h b/Code/CryEngine/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h
deleted file mode 100644
index 6ff8e541fe..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/std/string/string.h>
-#include <Maestro/Bus/SequenceComponentBus.h>
-
-namespace Maestro
-{
-    /*!
-    * SequenceAgentComponentRequests EBus Interface
-    * Messages serviced by SequenceAgentComponents.
-    *
-    * The EBus is Id'ed on a pair of SequenceEntityId, SequenceAgentEntityId 
-    */
-
-    //
-    // SequenceComponents broadcast to SequenceAgentComponents via a pair of Ids:
-    //     sequenceEntityId, sequenceAgentEntityId
-    using SequenceAgentEventBusId = AZStd::pair<AZ::EntityId, AZ::EntityId>;        // SequenceComponenet Entity Id, SequenceAgent EntityId
-
-    class SequenceAgentComponentBus
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~SequenceAgentComponentBus() = default;
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        typedef SequenceAgentEventBusId BusIdType;
-        //////////////////////////////////////////////////////////////////////////
-    };
-
-    class SequenceAgentComponentRequests
-        : public SequenceAgentComponentBus
-    {
-    public:
-        using AnimatablePropertyAddress = Maestro::SequenceComponentRequests::AnimatablePropertyAddress;
-        using AnimatedValue = Maestro::SequenceComponentRequests::AnimatedValue;
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides - application is a singleton
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;  // Only one component on a entity can implement the events
-        //////////////////////////////////////////////////////////////////////////
-
-        //! Called when a SequenceComponent is connected
-        virtual void ConnectSequence(const AZ::EntityId& sequenceEntityId) = 0;
-
-        //! Called when a SequenceComponent is disconnected
-        virtual void DisconnectSequence() = 0;
-
-        //! Get the value for an animated float property at the given address on the same entity as the agent.
-        //! @param returnValue holds the value to get - this must be instance of one of the concrete subclasses of AnimatedValue, corresponding to the type of the property referenced by the animatedAdresss
-        //! @param animatedAddress identifies the component and property to be set
-        virtual void GetAnimatedPropertyValue(AnimatedValue& returnValue, const AnimatablePropertyAddress& animatableAddress) = 0;
-
-        //! Set the value for an animated property at the given address on the same entity as the agent
-        //! @param animatedAddress identifies the component and property to be set
-        //! @param value the value to set - this must be instance of one of the concrete subclasses of AnimatedValue, corresponding to the type of the property referenced by the animatedAdresss
-        //! @return true if the value was changed.
-        virtual bool SetAnimatedPropertyValue(const AnimatablePropertyAddress& animatableAddress, const AnimatedValue& value) = 0;
-
-        //! Returns the Uuid of the type that the 'getter' returns for this animatableAddress
-        virtual AZ::Uuid GetAnimatedAddressTypeId(const Maestro::SequenceComponentRequests::AnimatablePropertyAddress& animatableAddress) = 0;
-
-        //! Track View will expect some components (those using AZ::Data::AssetBlends as a virtual property) to supply a GetAssetDuration event
-        //! so Track View can query the duration of an asset (like a motion) without having any knowledge of that that asset is.
-        virtual void GetAssetDuration(AnimatedValue& returnValue, AZ::ComponentId componentId, const AZ::Data::AssetId& assetId) = 0;
-    };
-
-    using SequenceAgentComponentRequestBus = AZ::EBus<SequenceAgentComponentRequests>;
-
-} // namespace Maestro
-
-namespace AZStd
-{
-    template <>
-    struct hash < Maestro::SequenceAgentEventBusId >
-    {
-        inline size_t operator()(const Maestro::SequenceAgentEventBusId& eventBusId) const
-        {
-            AZStd::hash<AZ::EntityId> entityIdHasher;
-            size_t retVal = entityIdHasher(eventBusId.first);
-            AZStd::hash_combine(retVal, eventBusId.second);
-            return retVal;
-        }
-    };
-}
diff --git a/Code/CryEngine/CryCommon/Maestro/Bus/SequenceComponentBus.h b/Code/CryEngine/CryCommon/Maestro/Bus/SequenceComponentBus.h
deleted file mode 100644
index 7aa9089991..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Bus/SequenceComponentBus.h
+++ /dev/null
@@ -1,842 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/std/string/string.h>
-
-namespace Maestro
-{
-    /*!
-    * SequenceComponentRequests EBus Interface
-    * Messages serviced by SequenceComponents.
-    */
-    class SequenceComponentRequests
-        : public AZ::ComponentBus
-    {
-    public:
-        /**
-         * helper class to define an animatable property address
-         */
-        class AnimatablePropertyAddress
-        {
-        public:
-            AZ_TYPE_INFO(AnimatablePropertyAddress, "{CEE14802-F1E8-4C0A-9750-64C59C39ECE9}");
-
-            AnimatablePropertyAddress(AZ::ComponentId componentId, const AZStd::string& virtualPropertyName)
-                : m_componentId(componentId)
-                , m_virtualPropertyName(virtualPropertyName) {}
-
-            AnimatablePropertyAddress()
-                : m_componentId(AZ::InvalidComponentId) {}
-
-            const AZStd::string& GetVirtualPropertyName() const { return m_virtualPropertyName; }
-            AZ::ComponentId      GetComponentId() const { return m_componentId; }
-
-            bool operator== (const AnimatablePropertyAddress& rhs) const 
-            { 
-                return (m_componentId == rhs.m_componentId && m_virtualPropertyName == rhs.m_virtualPropertyName); 
-            }
-
-        private:
-            AZ::ComponentId m_componentId;                  // componentId of the component being animated on the sequenceAgent's entity
-            AZStd::string   m_virtualPropertyName;          // EBus virtual property name being animated on the component
-        };
-
-        /**
-         * Interface for an animated value to abstract the type (i.e. float/Vector3/Bool) of the value.
-         *
-         * Inherited concrete subclasses determines the actual type of the animatedValue and fills in get/set methods
-         * for casting to other types
-         */
-        // forward declarations
-        class AnimatedFloatValue;
-        class AnimatedVector3Value;
-        class AnimatedBoolValue;
-        class AnimatedQuaternionValue;
-        class AnimatedAssetIdValue;
-
-        class AnimatedValue
-        {
-        public:
-            AZ_TYPE_INFO(AnimatedValue, "{5C4BBDD6-8F80-4510-B5B8-8FA0FBD101A6}");
-
-            virtual ~AnimatedValue() {};
-
-            // Query the type of the value
-            virtual const AZ::Uuid& GetTypeId() const = 0;
-
-            void GetValue(AZ::Vector3& vector3Value) const
-            {
-                vector3Value = GetVector3Value();
-            }
-            void GetValue(AZ::Quaternion& quaternionValue) const
-            {
-                quaternionValue = GetQuaternionValue();
-            }
-            void GetValue(float& floatValue) const
-            {
-                floatValue = GetFloatValue();
-            }
-            void GetValue(bool& boolValue) const
-            {
-                boolValue = GetBoolValue();
-            }
-            void GetValue(AZ::s32& s32Value) const
-            {
-                s32Value = GetS32Value();
-            }
-            void GetValue(AZ::u32& u32Value) const
-            {
-                u32Value = GetU32Value();
-            }
-            void GetValue(AZ::Data::AssetId& assetIdValue) const
-            {
-                assetIdValue = GetAssetIdValue();
-            }
-
-            // same as above but returning the value
-            virtual AZ::Quaternion GetQuaternionValue() const = 0;
-            virtual AZ::Vector3 GetVector3Value() const = 0;
-            virtual float       GetFloatValue() const = 0;
-            virtual bool        GetBoolValue() const = 0;
-            virtual AZ::s32     GetS32Value() const = 0;
-            virtual AZ::u32     GetU32Value() const = 0;
-            virtual const AZ::Data::AssetId& GetAssetIdValue() const = 0;
-
-            // Set the value to the given arg. Returns true if the arg is the 'native' type of the concrete animated value
-            virtual bool SetValue(const AZ::Vector3& vector3Value) = 0;
-            virtual bool SetValue(const AZ::Quaternion& quaternionValue) = 0;
-            virtual bool SetValue(float floatValue) = 0;
-            virtual bool SetValue(bool boolValue) = 0;
-            virtual bool SetValue(AZ::s32 s32Value) = 0;
-            virtual bool SetValue(AZ::u32 u32Value) = 0;
-            virtual bool SetValue(const AZ::Data::AssetId& assetIdValue) = 0;
-
-            virtual bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
-            virtual bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
-            virtual bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
-            virtual bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
-            virtual bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
-
-        protected:
-            AnimatedValue() {}     // protected constructor as the interface should never be constructed directly - it's an abstract class
-        };
-
-        class AnimatedFloatValue
-            : public AnimatedValue
-        {
-        public:
-            AZ_TYPE_INFO(AnimatedFloatValue, "{2C90BCBB-1DF2-47C8-8193-18EFE1C70E20}");
-
-            AnimatedFloatValue(float value = .0f) { m_value = value; }
-            ~AnimatedFloatValue() {}
-
-            const AZ::Uuid& GetTypeId() const override
-            {
-                return AZ::AzTypeInfo<float>::Uuid();
-            }
-
-            AZ::Vector3 GetVector3Value() const override
-            {
-                return AZ::Vector3(m_value);
-            }
-            AZ::Quaternion GetQuaternionValue() const override
-            {
-                return AZ::Quaternion(m_value);
-            }
-            float GetFloatValue() const override
-            {
-                return m_value;
-            }
-            bool GetBoolValue() const override
-            {
-                return (!AZ::IsClose(m_value, .0f, FLT_EPSILON));
-            }
-            AZ::s32 GetS32Value() const override
-            {
-                return static_cast<AZ::s32>(m_value);
-            }
-            AZ::u32 GetU32Value() const override
-            {
-                return static_cast<AZ::u32>(m_value);
-            }
-            const AZ::Data::AssetId& GetAssetIdValue() const override
-            {
-                AZ_Assert(0, "Not expected to be used.");
-                static AZ::Data::AssetId assetId;
-                return assetId;
-            }
-
-            bool SetValue(const AZ::Vector3& vector3Value) override
-            {
-                m_value = vector3Value.GetX();
-                return false;
-            }
-            bool SetValue(const AZ::Quaternion& quaternionValue) override
-            {
-                m_value = quaternionValue.GetLength();
-                return false;
-            }
-            bool SetValue(float floatValue) override
-            {
-                m_value = floatValue;
-                return true;
-            }
-            bool SetValue(bool boolValue) override
-            {
-                m_value = boolValue ? 1.0f : .0f;
-                return false;
-            }
-            bool SetValue(AZ::s32 s32Value) override
-            {
-                m_value = static_cast<float>(s32Value);
-                return false;
-            }
-            bool SetValue(AZ::u32 u32Value) override
-            {
-                m_value = static_cast<float>(u32Value);
-                return false;
-            }
-            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
-            {
-                AZ_UNUSED(assetIdValue);
-                return true;
-            }
-
-            bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
-            {
-                return AZ::IsClose(m_value, rhs.GetFloatValue(), tolerance);
-            }
-            bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return AZ::IsClose(m_value, rhs.GetFloatValue(), tolerance);
-            }
-            bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return AZ::IsClose(m_value, rhs.GetFloatValue(), tolerance);
-            }
-            bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return rhs.GetBoolValue() == (!AZ::IsClose(m_value, .0f, tolerance));
-            }
-            bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                AZ_Assert(0, "Shouldnt be used.");
-                AZ_UNUSED(rhs);
-                AZ_UNUSED(tolerance);
-                return false;
-            }
-
-        private:
-            float m_value;
-        };
-
-        class AnimatedVector3Value
-            : public AnimatedValue
-        {
-        public:
-            AZ_TYPE_INFO(AnimatedVector3Value, "{B8CDD566-9D55-47B2-BF91-162E428B237E}");
-
-            AnimatedVector3Value(const AZ::Vector3& value) { m_value = value; }
-            ~AnimatedVector3Value() {}
-
-            const AZ::Uuid& GetTypeId() const override
-            {
-                return AZ::Vector3::TYPEINFO_Uuid();
-            }
-
-            AZ::Vector3 GetVector3Value() const override
-            {
-                return m_value;
-            }
-            AZ::Quaternion GetQuaternionValue() const override
-            {
-                // treat m_value as Euler Angles in degrees
-                return AZ::ConvertEulerDegreesToQuaternion(m_value);
-            }
-            float GetFloatValue() const override
-            {
-                return m_value.GetX(); // return the first component
-            }
-            bool GetBoolValue() const override
-            {
-                return !m_value.IsClose(AZ::Vector3::CreateZero());
-            }
-            AZ::s32 GetS32Value() const override
-            {
-                return static_cast<AZ::s32>(m_value.GetX());
-            }
-            AZ::u32 GetU32Value() const override
-            {
-                return static_cast<AZ::u32>(m_value.GetX());
-            }
-            const AZ::Data::AssetId& GetAssetIdValue() const override
-            {
-                AZ_Assert(0, "Not expected to be used.");
-                static AZ::Data::AssetId assetId;
-                return assetId;
-            }
-
-            bool SetValue(const AZ::Vector3& vector3Value) override
-            {
-                m_value = vector3Value;
-                return true;
-            }
-            bool SetValue(const AZ::Quaternion& quaternionValue) override
-            {
-                m_value = AZ::ConvertQuaternionToEulerDegrees(quaternionValue);
-                return true;
-            }
-            bool SetValue(float floatValue) override
-            {
-                m_value.Set(floatValue);    // sets vector components to floatValue
-                return false;
-            }
-            bool SetValue(bool boolValue) override
-            {
-                m_value = boolValue ? AZ::Vector3::CreateOne() : AZ::Vector3::CreateZero();
-                return false;
-            }
-            bool SetValue(AZ::s32 s32Value) override
-            {
-                m_value.Set(static_cast<float>(s32Value));
-                return false;
-            }
-            bool SetValue(AZ::u32 u32Value) override
-            {
-                m_value.Set(static_cast<float>(u32Value));
-                return false;
-            }
-            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
-            {
-                AZ_UNUSED(assetIdValue);
-                return true;
-            }
-
-            bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
-            {
-                return m_value.IsClose(rhs.GetVector3Value(), tolerance);
-            }
-            bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return m_value.IsClose(rhs.GetVector3Value(), tolerance);
-            }
-            bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return m_value.IsClose(rhs.GetVector3Value(), tolerance);
-            }
-            bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return rhs.GetBoolValue() == (!m_value.IsClose(AZ::Vector3::CreateZero(), tolerance));
-            }
-            bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                AZ_Assert(0, "Shouldn't be used.");
-                AZ_UNUSED(rhs);
-                AZ_UNUSED(tolerance);
-                return false;
-            }
-
-        private:
-            AZ::Vector3 m_value;
-        };
-
-        class AnimatedQuaternionValue
-            : public AnimatedValue
-        {
-        public:
-            AZ_TYPE_INFO(AnimatedQuaternionValue, "{572E640B-9375-4E16-8F3A-5DCA1734B820}");
-
-            AnimatedQuaternionValue(const AZ::Quaternion value) { m_value = value; }
-            ~AnimatedQuaternionValue() {}
-
-            const AZ::Uuid& GetTypeId() const override
-            {
-                return AZ::Quaternion::TYPEINFO_Uuid();
-            }
-
-            AZ::Vector3 GetVector3Value() const override
-            {
-                // convert Quaternion to Euler angles
-                return AZ::ConvertQuaternionToEulerDegrees(m_value);
-            }
-            AZ::Quaternion GetQuaternionValue() const override
-            {
-                return m_value;
-            }
-            float GetFloatValue() const override
-            {
-                // return the length of the quat
-                return m_value.GetLength(); 
-            }
-            bool GetBoolValue() const override
-            {
-                return !m_value.IsZero();
-            }
-            AZ::s32 GetS32Value() const override
-            {
-                return static_cast<AZ::s32>(m_value.GetLength());
-            }
-            AZ::u32 GetU32Value() const override
-            {
-                return static_cast<AZ::u32>(m_value.GetLength());
-            }
-            const AZ::Data::AssetId& GetAssetIdValue() const override
-            {
-                AZ_Assert(0, "Not expected to be used.");
-                static AZ::Data::AssetId assetId;
-                return assetId;
-            }
-
-            bool SetValue(const AZ::Vector3& vector3Value) override
-            {
-                // convert from Euler angles
-                m_value = AZ::ConvertEulerRadiansToQuaternion(vector3Value);
-                return false;
-            }
-            bool SetValue(const AZ::Quaternion& quaternionValue) override
-            {
-                m_value = quaternionValue;
-                return true;
-            }
-            bool SetValue(float floatValue) override
-            {
-                m_value.Set(floatValue);    // sets quat with all components set to floatValue
-                return false;
-            }
-            bool SetValue(bool boolValue) override
-            {
-                m_value = boolValue ? AZ::Quaternion::CreateIdentity() : AZ::Quaternion::CreateZero();
-                return false;
-            }
-            bool SetValue(AZ::s32 s32Value) override
-            {
-                m_value.Set(static_cast<float>(s32Value));
-                return false;
-            }
-            bool SetValue(AZ::u32 u32Value) override
-            {
-                m_value.Set(static_cast<float>(u32Value));
-                return false;
-            }
-            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
-            {
-                AZ_UNUSED(assetIdValue);
-                return true;
-            }
-
-            bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
-            {
-                return m_value.IsClose(rhs.GetQuaternionValue(), tolerance);
-            }
-            bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return m_value.IsClose(rhs.GetQuaternionValue(), tolerance);
-            }
-            bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return m_value.IsClose(rhs.m_value, tolerance);
-            }
-            bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return rhs.GetBoolValue() == (!m_value.IsZero(tolerance));
-            }
-            bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                AZ_Assert(0, "Shouldn't be used.");
-                AZ_UNUSED(rhs);
-                AZ_UNUSED(tolerance);
-                return false;
-            }
-
-        private:
-            AZ::Quaternion m_value;
-        };
-
-        class AnimatedBoolValue
-            : public AnimatedValue
-        {
-        public:
-            AZ_TYPE_INFO(AnimatedBoolValue, "{5FF422AD-20E7-4109-A2EA-4AACE8213860}");
-
-            AnimatedBoolValue(bool value) { m_value = value; }
-            ~AnimatedBoolValue() {}
-
-            const AZ::Uuid& GetTypeId() const override
-            {
-                return AZ::AzTypeInfo<bool>::Uuid();
-            }
-
-            AZ::Vector3 GetVector3Value() const override
-            {
-                return m_value ? AZ::Vector3::CreateOne() : AZ::Vector3::CreateZero();;
-            }
-            AZ::Quaternion GetQuaternionValue() const override
-            {
-                return m_value ? AZ::Quaternion::CreateIdentity() : AZ::Quaternion::CreateZero();;
-            }
-            float GetFloatValue() const override
-            {
-                return m_value ? 1.0f : .0f;
-            }
-            bool GetBoolValue() const override
-            {
-                return m_value;
-            }
-            AZ::s32 GetS32Value() const override
-            {
-                return m_value ? 1 : 0;
-            }
-            AZ::u32 GetU32Value() const override
-            {
-                return m_value ? 1 : 0;
-            }
-            const AZ::Data::AssetId& GetAssetIdValue() const override
-            {
-                AZ_Assert(0, "Not expected to be used.");
-                static AZ::Data::AssetId assetId;
-                return assetId;
-            }
-
-            bool SetValue(const AZ::Vector3& vector3Value) override
-            {
-                m_value = !vector3Value.IsClose(AZ::Vector3::CreateZero());
-                return false;
-            }
-            bool SetValue(const AZ::Quaternion& quaternionValue) override
-            {
-                m_value = !quaternionValue.IsZero();
-                return false;
-            }
-            bool SetValue(float floatValue) override
-            {
-                m_value = !AZ::IsClose(floatValue, .0f, FLT_EPSILON);
-                return false;
-            }
-            bool SetValue(bool boolValue) override
-            {
-                m_value = boolValue;
-                return true;
-            }
-            bool SetValue(AZ::s32 s32Value) override
-            {
-                m_value = s32Value != 0;
-                return false;
-            }
-            bool SetValue(AZ::u32 u32Value) override
-            {
-                m_value = u32Value != 0;
-                return false;
-            }
-            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
-            {
-                AZ_UNUSED(assetIdValue);
-                return true;
-            }
-
-            bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
-            {
-                return m_value == (!AZ::IsClose(rhs.GetFloatValue(), .0f, tolerance));
-            }
-            bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return m_value == (!rhs.GetVector3Value().IsClose(AZ::Vector3::CreateZero(), tolerance));
-            }
-            bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return m_value == (!rhs.GetQuaternionValue().IsZero(tolerance));
-            }
-            bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                (void)tolerance;                    // avoid compiler warning for unused variable
-                return m_value == rhs.m_value;
-            }
-            bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                AZ_Assert(0, "Shouldn't be used.");
-                AZ_UNUSED(rhs);
-                AZ_UNUSED(tolerance);
-                return false;
-            }
-
-        private:
-            bool m_value;
-        };
-
-        class AnimatedAssetIdValue
-            : public AnimatedValue
-        {
-        public:
-            AZ_TYPE_INFO(AnimatedAssetIdValue, "{BA8AFA84-44C7-4358-AB35-775AF2B8A109}");
-
-            AnimatedAssetIdValue() { m_value.SetInvalid(); }
-            AnimatedAssetIdValue(const AZ::Data::AssetId& value) { m_value = value; }
-
-            const AZ::Uuid& GetTypeId() const override
-            {
-                return AZ::AzTypeInfo<AZ::Data::AssetId>::Uuid();
-            }
-
-            AZ::Vector3 GetVector3Value() const override
-            {
-                return AZ::Vector3::CreateZero();;
-            }
-            AZ::Quaternion GetQuaternionValue() const override
-            {
-                return AZ::Quaternion::CreateZero();;
-            }
-            float GetFloatValue() const override
-            {
-                return 0.0f;
-            }
-            bool GetBoolValue() const override
-            {
-                return false;
-            }
-            AZ::s32 GetS32Value() const override
-            {
-                return 0;
-            }
-            AZ::u32 GetU32Value() const override
-            {
-                return 0;
-            }
-            const AZ::Data::AssetId& GetAssetIdValue() const override
-            {
-                return m_value;
-            }
-
-            bool SetValue(const AZ::Vector3& vector3Value) override
-            {
-                AZ_UNUSED(vector3Value);
-                return false;
-            }
-            bool SetValue(const AZ::Quaternion& quaternionValue) override
-            {
-                AZ_UNUSED(quaternionValue);
-                return false;
-            }
-            bool SetValue(float floatValue) override
-            {
-                AZ_UNUSED(floatValue);
-                return false;
-            }
-            bool SetValue(bool boolValue) override
-            {
-                AZ_UNUSED(boolValue);
-                return true;
-            }
-            bool SetValue(AZ::s32 s32Value) override
-            {
-                AZ_UNUSED(s32Value);
-                return false;
-            }
-            bool SetValue(AZ::u32 u32Value) override
-            {
-                AZ_UNUSED(u32Value);
-                return false;
-            }
-            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
-            {
-                m_value = assetIdValue;
-                return true;
-            }
-
-            bool IsClose([[maybe_unused]] const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
-            {
-                AZ_UNUSED(tolerance);
-                return false;
-            }
-            bool IsClose([[maybe_unused]] const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                AZ_UNUSED(tolerance);
-                return false;
-            }
-            bool IsClose([[maybe_unused]] const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                AZ_UNUSED(tolerance);
-                return false;
-            }
-            bool IsClose([[maybe_unused]] const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
-            {
-                AZ_UNUSED(tolerance);
-                return false;
-            }
-            bool IsClose(const AnimatedAssetIdValue& rhs, [[maybe_unused]] float tolerance = AZ::Constants::Tolerance) const override
-            {
-                return m_value == rhs.m_value;
-            }
-
-        private:
-            AZ::Data::AssetId m_value;
-        };
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides - application is a singleton
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;  // Only one component on a entity can implement the events
-        //////////////////////////////////////////////////////////////////////////
-
-        /** 
-         * Set a value for an animated property at the given address on the given entity.
-         * @param animatedEntityId the entity Id of the entity containing the animatedAddress
-         * @param animatedAddress identifies the component and property to be set
-         * @param value the value to set - this must be instance of one of the concrete subclasses of AnimatedValue, corresponding to the type of the property referenced by the animatedAdresss
-         * @return true if the value was changed.
-         */
-        virtual bool SetAnimatedPropertyValue(const AZ::EntityId& animatedEntityId, const AnimatablePropertyAddress& animatableAddress, const AnimatedValue& value) = 0;
-
-        /**
-         * Get the current value for a property
-         * @param returnValue holds the value to get - this must be instance of one of the concrete subclasses of AnimatedValue, corresponding to the type of the property referenced by the animatedAdresss
-         * @param animatedEntityId the entity Id of the entity containing the animatedAddress
-         * @param animatedAddress identifies the component and property to be set
-         */
-        virtual void GetAnimatedPropertyValue(AnimatedValue& returnValue, const AZ::EntityId& animatedEntityId, const AnimatablePropertyAddress& animatableAddress) = 0;
-
-        /** Returns the Uuid of the type for the property at the animatableAddress on the given entityId
-        */
-        virtual AZ::Uuid GetAnimatedAddressTypeId(const AZ::EntityId& enityId, const Maestro::SequenceComponentRequests::AnimatablePropertyAddress& animatableAddress) = 0;
-
-        /**
-         * Track View will expect some components to supply a GetAssetDuration event so Track View can query the duration of an asset (like a motion)
-         * without having any knowledge of that that asset is.
-         */
-        virtual void GetAssetDuration(AnimatedValue& returnValue, const AZ::EntityId& animatedEntityId, AZ::ComponentId componentId, const AZ::Data::AssetId& assetId) = 0;
-
-        //////////////////////////////////////////////////////////////////////////
-        // Behaviors
-        /**
-        * Play sequence from the start to end times set the sequence
-        */
-        virtual void Play() {}
-        /**
-        * Play sequence between the start to end times, outside of which the sequence behaves according to its 'Out of Range' time setting
-        * @param startTime                     Sequence start time in seconds
-        * @param endTime                       Sequence end time in seconds
-        */
-        virtual void PlayBetweenTimes(float startTime, float endTime) {(void)startTime; (void)endTime;}
-        /**
-         * Stop the sequence. Stopping the sequence jumps the play time to the end of the sequence.
-         */
-        virtual void Stop() {}
-        /**
-        * Pause the sequence. Sequence must be playing for pause to have an effect. Pausing leaves the play time at its current position.
-        */
-        virtual void Pause() {}
-        /**
-        * Resume the sequence. Resume essentially 'unpauses' a sequence. It must have been playing before the pause for playback to start again.
-        */
-        virtual void Resume() {}
-        /**
-        * Set the play speed
-        * @param newSpeed speed multiplier (1.0 is normal speed, less is slower, more is faster).
-        */
-        virtual void SetPlaySpeed(float newSpeed) {(void)newSpeed;}
-        /**
-         * Move the Playhead to the given time
-         * @param time time to move the play head to, in seconds, clamped to be between the start and end times of the sequence
-         */
-        virtual void JumpToTime(float newTime) {(void)newTime;}
-        /**
-        * Move the Playhead to the end of the sequence
-        */
-        virtual void JumpToEnd() {}
-        /**
-        * Move the Playhead to the beginning of the sequence
-        */
-        virtual void JumpToBeginning() {}
-        /**
-         * Returns the current play time in seconds
-         */
-        virtual float GetCurrentPlayTime() { return .0f; }
-        /**
-        * Returns the current play back speed as a multiplier (1.0 is normal speed, less is slower, more is faster).
-        */
-        virtual float GetPlaySpeed() { return 1.0f; }
-        //////////////////////////////////////////////////////////////////////////
-    };
-    using SequenceComponentRequestBus = AZ::EBus<SequenceComponentRequests>;
-
-    /**
-    * Notifications from the Sequence Component
-    */
-    class SequenceComponentNotification
-        : public AZ::ComponentBus
-    {
-    public:
-        ////////////////////////////////////////////////////////////////////////
-        // EBusTraits
-        // multiple handlers (addressed by AZ::EntityId inherited from AZ::ComponentBus)
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        ////////////////////////////////////////////////////////////////////////
-
-        virtual ~SequenceComponentNotification() {}
-
-        /**
-        * Called when Sequence starts
-        * @param startTime Time when sequence starts, in seconds
-        */
-        virtual void OnStart(float startTime) { (void)startTime; }
-        /**
-        * Called when Sequence stops
-        * @param stopTime Time when the sequence stops, in seconds
-        */
-        virtual void OnStop(float stopTime) { (void)stopTime; }
-        /**
-        * Called when Sequence pauses
-        */
-        virtual void OnPause() {}
-        /**
-        * Called when Sequence resumes
-        */
-        virtual void OnResume() {}
-        /**
-        * Called when Sequence is aborted
-        * @param abortTime Time when the sequence aborts, in seconds
-        */
-        virtual void OnAbort(float abortTime) { (void)abortTime; }
-        /**
-        * Called when Sequence is updated. That is, when the current play time changes, or the playback speed changes.
-        * @param updateTime Time when the sequence updates, in seconds
-        */
-        virtual void OnUpdate(float updateTime) { (void)updateTime; }
-        /**
-        * Called when a Sequence Event is triggered.
-        * @param paramValue The Event Key's Value parameter as a string
-        */
-        virtual void OnTrackEventTriggered(const char* eventName, const char* eventValue) { (void)eventName;  (void)eventValue; }
-        /**
-        * Called when a Sequence changes camera during playback in Track View.
-        * @param cameraEntityId entityId of the new camera.
-        */
-        virtual void OnCameraChanged([[maybe_unused]] const AZ::EntityId& oldCameraEntityId, [[maybe_unused]] const AZ::EntityId& newCameraEntityId) {}
-    };
-
-    using SequenceComponentNotificationBus = AZ::EBus<SequenceComponentNotification>;
-} // namespace Maestro
-
-namespace AZStd
-{
-    template <>
-    struct hash < Maestro::SequenceComponentRequests::AnimatablePropertyAddress >
-    {
-        inline size_t operator()(const Maestro::SequenceComponentRequests::AnimatablePropertyAddress& animatablePropertyAddress) const
-        {
-            AZStd::hash<AZ::ComponentId> componentIdHasher;
-            size_t retVal = componentIdHasher(animatablePropertyAddress.GetComponentId());
-            AZStd::hash_combine(retVal, animatablePropertyAddress.GetVirtualPropertyName());
-            return retVal;
-        }
-    };
-}  // namespace AZStd
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AnimNodeType.h b/Code/CryEngine/CryCommon/Maestro/Types/AnimNodeType.h
deleted file mode 100644
index 67eea7b21d..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Types/AnimNodeType.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
-#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
-#pragma once
-
-// **NOTE**: Do not include into the precompiled header hierarchy!
-
-//////////////////////////////////////////////////////////////////////////
-//! Node-Types
-//
-// You need to register new types in Movie.cpp/RegisterNodeTypes for serialization.
-// Note: Enums are serialized by string now, there is no need for specific IDs
-// anymore for new parameters. Values are for backward compatibility.
-enum class AnimNodeType
-{
-    Invalid                   = 0x00,
-    Entity                    = 0x01,       // Legacy Cry Entities (CE is AzEntity)
-    Director                  = 0x02,
-    Camera                    = 0x03,       // Legacy Cry Camera Object
-    CVar                      = 0x04,
-    ScriptVar                 = 0x05,
-    Material                  = 0x06,
-    Event                     = 0x07,
-    Group                     = 0x08,
-    Layer                     = 0x09,
-    Comment                   = 0x10,
-    RadialBlur                = 0x11,
-    ColorCorrection           = 0x12,
-    DepthOfField              = 0x13,
-    ScreenFader               = 0x14,
-    Light                     = 0x15,       // Legacy Cry Light
-    // HDRSetup               = 0x16,       // deprecated Jan 2016
-    ShadowSetup               = 0x17,
-    Alembic                   = 0x18,       // Used in cinebox, added so nobody uses that number
-    GeomCache                 = 0x19,
-    Environment,
-    ScreenDropsSetup,                       // deprecated Jan 2016
-    AzEntity,
-    Component,
-    Num
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AnimParamType.h b/Code/CryEngine/CryCommon/Maestro/Types/AnimParamType.h
deleted file mode 100644
index 3218769cc1..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Types/AnimParamType.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMPARAMTYPE_H
-#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMPARAMTYPE_H
-#pragma once
-
-// **NOTES**: Do not include into the precompiled header hierarchy!
-//            There are a couple legacy defines in IMovieSystem.h that
-//            correspond to these values. ByString and Invalid.
-
-// Static common parameters IDs of animation node.
-//
-// You need to register new params in Movie.cpp/RegisterParamTypes for serialization.
-// Note: Enums are serialized by string now, there is no need for specific IDs
-// anymore for new parameters. Values are for backward compatibility.
-//
-// If you want to expand CryMovie to control new stuff this is probably  the enum you want to change.
-// For named params see AnimParamType::ByString & CAnimParamType
-enum class AnimParamType
-{
-    // Parameter is specified by string. See CAnimParamType
-    ByString                         = 8,
-
-    FOV                              = 0,
-    Position                         = 1,
-    Rotation                         = 2,
-    Scale                            = 3,
-    Event                            = 4,
-    Visibility                       = 5,
-    Camera                           = 6,
-    Animation                        = 7,
-    Sound                            = 10,
-    Sequence                         = 13,
-    // Expression                    = 14,       ///@deprecated Jan 2016
-    Console                          = 17,
-    Music                            = 18,       ///@deprecated in 1.11, July 2017 - left in for legacy serialization
-    Float                            = 19,
-    // FaceSequence                  = 20,       ///@deprecated Jan 2016
-    LookAt                           = 21,
-    TrackEvent                       = 22,
-
-    ShakeAmplitudeA                  = 23,
-    ShakeAmplitudeB                  = 24,
-    ShakeFrequencyA                  = 25,
-    ShakeFrequencyB                  = 26,
-    ShakeMultiplier                  = 27,
-    ShakeNoise                       = 28,
-    ShakeWorking                     = 29,
-    ShakeAmpAMult                    = 61,
-    ShakeAmpBMult                    = 62,
-    ShakeFreqAMult                   = 63,
-    ShakeFreqBMult                   = 64,
-
-    DepthOfField                     = 30,
-    FocusDistance                    = 31,
-    FocusRange                       = 32,
-    BlurAmount                       = 33,
-
-    Capture                          = 34,
-    TransformNoise                   = 35,
-    TimeWarp                         = 36,
-    FixedTimeStep                    = 37,
-    NearZ                            = 38,
-    Goto                             = 39,
-
-    PositionX                        = 51,
-    PositionY                        = 52,
-    PositionZ                        = 53,
-
-    RotationX                        = 54,
-    RotationY                        = 55,
-    RotationZ                        = 56,
-
-    ScaleX                           = 57,
-    ScaleY                           = 58,
-    ScaleZ                           = 59,
-
-    ColorR                           = 82,
-    ColorG                           = 83,
-    ColorB                           = 84,
-
-    CommentText                      = 70,
-    ScreenFader                      = 71,
-
-    LightDiffuse                     = 81,
-    LightRadius                      = 85,
-    LightDiffuseMult                 = 86,
-    LightHDRDynamic                  = 87,
-    LightSpecularMult                = 88,
-    LightSpecPercentage              = 89,
-
-    MaterialDiffuse          = 90,
-    MaterialSpecular         = 91,
-    MaterialEmissive         = 92,
-    // MaterialEmissiveIntensity = 99,   // declared below to keep enumerations in order
-    MaterialOpacity          = 93,
-    MaterialSmoothness       = 94,
-
-    TimeRanges               = 95, //!< Generic track with keys that have time ranges
-
-    Physics                  = 96,   //! Not used anymore, see Physicalize & PhysicsDriven
-
-    ProceduralEyes           = 97,
-
-    Unused                   = 98, //!< Mannequin parameter that was removed.
-
-    MaterialEmissiveIntensity = 99,
-
-    // Add new param types without explicit ID here:
-    // NOTE: don't forget to register in Movie.cpp
-
-    GSMCache,
-
-    ShutterSpeed,
-
-    Physicalize,
-    PhysicsDriven,
-
-    SunLongitude,
-    SunLatitude,
-    MoonLongitude,
-    MoonLatitude,
-
-    User                        = 100000, //!< User node params.
-
-    Invalid                     = static_cast<int>(0xFFFFFFFF)
-};
-
-static const int OLD_APARAM_USER = 100;
-
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMPARAMTYPE_H
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AnimValue.h b/Code/CryEngine/CryCommon/Maestro/Types/AnimValue.h
deleted file mode 100644
index 73a3388678..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Types/AnimValue.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
-#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
-#pragma once
-
-// **NOTE**: Do not include into the precompiled header hierarchy!
-
-//! Values that animation track can hold.
-// Do not change values! they are serialized
-//
-// Attention: This should only be expanded if you add a completely new value type that tracks can control!
-// If you just want to control a new parameter of an entity etc. extend EParamType
-//
-// Note: If the param type of a track is known and valid these can be derived from the node.
-//       These are serialized in case the parameter got invalid (for example for material nodes)
-//
-enum class AnimValue
-{
-    Float = 0,
-    Vector = 1,
-    Quat = 2,
-    Bool = 3,
-    Select = 5,
-    Vector4 = 15,
-    DiscreteFloat = 16,
-    RGB = 20,
-    CharacterAnim = 21,
-
-    Unknown = static_cast<int>(0xFFFFFFFF)
-};
-
-
-#endif CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AnimValueType.h b/Code/CryEngine/CryCommon/Maestro/Types/AnimValueType.h
deleted file mode 100644
index bf3f7c245d..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Types/AnimValueType.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
-#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
-#pragma once
-
-// **NOTES**: Do not include into the precompiled header hierarchy!
-//            There are a couple legacy defines in IMovieSystem.h that
-//            correspond to these values. Unknown and Float.
-
-//! Values that animation track can hold.
-// Do not change values! they are serialized
-//
-// Attention: This should only be expanded if you add a completely new value type that tracks can control!
-// If you just want to control a new parameter of an entity etc. extend EParamType
-//
-// Note: If the param type of a track is known and valid these can be derived from the node.
-//       These are serialized in case the parameter got invalid (for example for material nodes)
-//
-enum class AnimValueType
-{
-    Float = 0,
-    Vector = 1,
-    Quat = 2,
-    Bool = 3,
-    Select = 5,
-    Vector4 = 15,
-    DiscreteFloat = 16,
-    RGB = 20,
-    CharacterAnim = 21,
-    AssetBlend = 22,
-
-    Unknown = static_cast<int>(0xFFFFFFFF)
-};
-
-
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AssetBlendKey.h b/Code/CryEngine/CryCommon/Maestro/Types/AssetBlendKey.h
deleted file mode 100644
index 0d82272543..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Types/AssetBlendKey.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Asset/AssetCommon.h>
-
-namespace AZ
-{
-
-/** IAssetBlendKey used in AssetBlend animation track.
-*/
-struct IAssetBlendKey
-    : public ITimeRangeKey
-{
-    AZ::Data::AssetId m_assetId;    //!< Asset Id
-    AZStd::string m_description;    //!< Description (filename part of path)
-    float m_blendInTime;            //!< Blend in time in seconds;
-    float m_blendOutTime;            //!< Blend in time in seconds;
-
-    IAssetBlendKey()
-        : ITimeRangeKey()
-        , m_blendInTime(0.0f)
-        , m_blendOutTime(0.0f)
-    {
-    }
-};
-
-    AZ_TYPE_INFO_SPECIALIZE(IAssetBlendKey, "{15B82C3A-6DB8-466F-AF7F-18298FCD25FD}");
-}
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/AssetBlends.h b/Code/CryEngine/CryCommon/Maestro/Types/AssetBlends.h
deleted file mode 100644
index b3f6bcfd5b..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Types/AssetBlends.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Asset/AssetCommon.h>
-
-namespace Maestro
-{
-    /**
-    * AssetBlend type
-    */
-    struct AssetBlend
-    {
-        AZ_TYPE_INFO(AssetBlend, "{90EB921C-456C-4CD8-A487-414219CF123B}");
-
-        AssetBlend()
-            : m_time(0.0f)
-            , m_blendInTime(0.0f)
-            , m_blendOutTime(0.0f)
-        {
-            m_assetId.SetInvalid();
-        }
-
-        AssetBlend(const AZ::Data::AssetId& assetId, float time, float blendInTime, float blendOutTime)
-            : m_assetId(assetId)
-            , m_time(time)
-            , m_blendInTime(blendInTime)
-            , m_blendOutTime(blendOutTime)
-        {
-        }
-
-        bool IsClose(const AssetBlend& rhs, float tolerance) const
-        {
-            return m_assetId == rhs.m_assetId
-                && (fabsf(m_time - rhs.m_time) <= tolerance)
-                && (fabsf(m_blendInTime - rhs.m_blendInTime) <= tolerance)
-                && (fabsf(m_blendOutTime - rhs.m_blendOutTime) <= tolerance);
-        }
-
-        AZ::Data::AssetId m_assetId;
-        float m_time;
-        float m_blendInTime;
-        float m_blendOutTime;
-    };
-
-    /**
-    * AssetBlends type
-    */
-    template<typename AssetType>
-    struct AssetBlends
-    {
-        AZ_TYPE_INFO(AssetBlends<AssetType>, "{636A51DA-48E8-4AF9-8310-541E735F2703}");
-        AZStd::vector<AssetBlend> m_assetBlends;
-
-        bool IsClose(const AssetBlends& rhs, float tolerance) const
-        {
-            bool result = m_assetBlends.size() == rhs.m_assetBlends.size();
-
-            for (int x = 0; result && (x < m_assetBlends.size()); x++)
-            {
-                result = m_assetBlends[x].IsClose(rhs.m_assetBlends[x], tolerance);
-            }
-
-            return result;
-        }
-    };
-
-} // namespace Maestro
diff --git a/Code/CryEngine/CryCommon/Maestro/Types/SequenceType.h b/Code/CryEngine/CryCommon/Maestro/Types/SequenceType.h
deleted file mode 100644
index 6eaa8df451..0000000000
--- a/Code/CryEngine/CryCommon/Maestro/Types/SequenceType.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
-#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
-#pragma once
-
-// **NOTES**: Do not include into the precompiled header hierarchy!
-//            There is a legacy define in IMovieSystem.h that
-//            correspond to a value, Legacy.
-
-enum class SequenceType
-{
-    Legacy                = 0,        // legacy CryEntity Sequence Object
-    SequenceComponent     = 1         // Sequence Component on an AZ::Entity
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
diff --git a/Code/CryEngine/CryCommon/MainThreadRenderRequestBus.h b/Code/CryEngine/CryCommon/MainThreadRenderRequestBus.h
deleted file mode 100644
index db20c9cf88..0000000000
--- a/Code/CryEngine/CryCommon/MainThreadRenderRequestBus.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Component/ComponentBus.h>
-#include <AzCore/std/parallel/mutex.h>
-
-namespace AZ
-{
-    /**
-     * Used to queue render commands to be safely executed on the main thread
-     */
-    class MainThreadRenderQueueEvents
-        : public AZ::EBusTraits
-    {
-    public:
-
-        virtual ~MainThreadRenderQueueEvents() {}
-
-        // EBusTraits overrides
-        static const AZ::EBusHandlerPolicy HandlerPolicy = EBusHandlerPolicy::Single;
-        static const bool EnableEventQueue = true;
-        typedef AZStd::mutex EventQueueMutexType;
-    };
-
-    using MainThreadRenderRequestBus = AZ::EBus<MainThreadRenderQueueEvents>;
-}
diff --git a/Code/CryEngine/CryCommon/MathConversion.h b/Code/CryEngine/CryCommon/MathConversion.h
deleted file mode 100644
index 39426031e3..0000000000
--- a/Code/CryEngine/CryCommon/MathConversion.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Math/Aabb.h>
-#include <AzCore/Math/Obb.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Vector4.h>
-#include <AzCore/Math/Color.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Math/Matrix3x3.h>
-#include <AzCore/Math/Matrix3x4.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/Math/Plane.h>
-#include <Cry_Math.h>
-#include <Cry_Geo.h>
-#include <Cry_Color.h>
-
-inline AZ::Vector2 LYVec2ToAZVec2(const Vec2& source)
-{
-    return AZ::Vector2(source.x, source.y);
-}
-
-inline Vec2 AZVec2ToLYVec2(const AZ::Vector2& source)
-{
-    return Vec2(source.GetX(), source.GetY());
-}
-
-inline AZ::Vector3 LYVec3ToAZVec3(const Vec3& source)
-{
-    return AZ::Vector3(source.x, source.y, source.z);
-}
-
-inline Vec3 AZVec3ToLYVec3(const AZ::Vector3& source)
-{
-    return Vec3(source.GetX(), source.GetY(), source.GetZ());
-}
-
-inline AZ::Vector4 LYVec4ToAZVec4(const Vec4& source)
-{
-    return AZ::Vector4(source.x, source.y, source.z, source.w);
-}
-
-inline Vec4 AZVec4ToLYVec4(const AZ::Vector4& source)
-{
-    return Vec4(source.GetX(), source.GetY(), source.GetZ(), source.GetW());
-}
-
-inline AZ::Color LYVec3ToAZColor(const Vec3& source)
-{
-    return AZ::Color(source.x, source.y, source.z, 1.0f);
-}
-
-inline Vec3 AZColorToLYVec3(const AZ::Color& source)
-{
-    return Vec3(source.GetR(), source.GetG(), source.GetB());
-}
-
-inline Vec4 AZColorToLYVec4(const AZ::Color& source)
-{
-    return Vec4(source.GetR(), source.GetG(), source.GetB(), source.GetA());
-}
-
-inline ColorF AZColorToLYColorF(const AZ::Color& source)
-{
-    return ColorF(source.ToU32());
-}
-
-inline AZ::Color LYColorFToAZColor(const ColorF& source)
-{
-    return AZ::Color(source.r, source.g, source.b, source.a);
-}
-
-inline ColorB AZColorToLYColorB(const AZ::Color& source)
-{
-    return ColorB(source.ToU32());
-}
-
-inline AZ::Color LYColorBToAZColor(const ColorB& source)
-{
-    return AZ::Color(source.r, source.g, source.b, source.a);
-}
-
-
-inline AZ::Quaternion LYQuaternionToAZQuaternion(const Quat& source)
-{
-    const float f4[4] = { source.v.x, source.v.y, source.v.z, source.w };
-    return AZ::Quaternion::CreateFromFloat4(f4);
-}
-
-inline Quat AZQuaternionToLYQuaternion(const AZ::Quaternion& source)
-{
-    float f4[4];
-    source.StoreToFloat4(f4);
-    return Quat(f4[3], f4[0], f4[1], f4[2]);
-}
-
-inline Matrix34 AZTransformToLYTransform(const AZ::Transform& source)
-{
-    return Matrix34::CreateFromVectors(
-        AZVec3ToLYVec3(source.GetBasisX()),
-        AZVec3ToLYVec3(source.GetBasisY()),
-        AZVec3ToLYVec3(source.GetBasisZ()),
-        AZVec3ToLYVec3(source.GetTranslation()));
-}
-
-inline Matrix33 AZMatrix3x3ToLYMatrix3x3(const AZ::Matrix3x3& source)
-{
-    return Matrix33::CreateFromVectors(
-        AZVec3ToLYVec3(source.GetColumn(0)),
-        AZVec3ToLYVec3(source.GetColumn(1)),
-        AZVec3ToLYVec3(source.GetColumn(2)));
-}
-
-inline AZ::Matrix3x3 LyMatrix3x3ToAzMatrix3x3(const Matrix33& source)
-{
-    return AZ::Matrix3x3::CreateFromColumns(
-        LYVec3ToAZVec3(source.GetColumn(0)),
-        LYVec3ToAZVec3(source.GetColumn(1)),
-        LYVec3ToAZVec3(source.GetColumn(2)));
-}
-
-inline Matrix34 AZMatrix3x4ToLYMatrix3x4(const AZ::Matrix3x4& source)
-{
-    AZ::Vector3 col0;
-    AZ::Vector3 col1;
-    AZ::Vector3 col2;
-    AZ::Vector3 col3;
-    source.GetBasisAndTranslation(&col0, &col1, &col2, &col3);
-
-    return Matrix34(
-        col0.GetX(), col1.GetX(), col2.GetX(), col3.GetX(),
-        col0.GetY(), col1.GetY(), col2.GetY(), col3.GetY(),
-        col0.GetZ(), col1.GetZ(), col2.GetZ(), col3.GetZ());
-}
-
-inline AZ::Transform LYTransformToAZTransform(const Matrix34& source)
-{
-    const AZ::Matrix3x4 matrix3x4 = AZ::Matrix3x4::CreateFromRowMajorFloat12(source.GetData());
-    return AZ::Transform::CreateFromMatrix3x4(matrix3x4);
-}
-
-inline AZ::Matrix3x4 LYTransformToAZMatrix3x4(const Matrix34& source)
-{
-    return AZ::Matrix3x4::CreateFromRowMajorFloat12(source.GetData());
-}
-
-inline AZ::Transform LYQuatTToAZTransform(const QuatT& source)
-{
-    return AZ::Transform::CreateFromQuaternionAndTranslation(
-        LYQuaternionToAZQuaternion(source.q),
-        LYVec3ToAZVec3(source.t));
-}
-
-inline QuatT AZTransformToLYQuatT(const AZ::Transform& source)
-{
-    return QuatT(
-        AZQuaternionToLYQuaternion(source.GetRotation()),
-        AZVec3ToLYVec3(source.GetTranslation()));
-}
-
-inline QuatT AZMatrix3x4ToLYQuatT(const AZ::Matrix3x4& source)
-{
-    AZ::Matrix3x4 sourceNoScale(source);
-    sourceNoScale.ExtractScale();
-
-    return QuatT(
-        AZQuaternionToLYQuaternion(AZ::Quaternion::CreateFromMatrix3x4(sourceNoScale)),
-        AZVec3ToLYVec3(source.GetTranslation()));
-}
-
-inline DualQuat AZMatrix3x4ToLYDualQuat(const AZ::Matrix3x4& matrix3x4)
-{
-    return DualQuat(AZMatrix3x4ToLYMatrix3x4(matrix3x4));
-}
-
-inline AABB AZAabbToLyAABB(const AZ::Aabb& source)
-{
-    return AABB(AZVec3ToLYVec3(source.GetMin()), AZVec3ToLYVec3(source.GetMax()));
-}
-
-inline AZ::Aabb LyAABBToAZAabb(const AABB& source)
-{
-    return AZ::Aabb::CreateFromMinMax(LYVec3ToAZVec3(source.min), LYVec3ToAZVec3(source.max));
-}
-
-inline AZ::Obb LyOBBtoAZObb(const OBB& source)
-{
-    const AZ::Vector3 position = LYVec3ToAZVec3(source.c);
-    const AZ::Quaternion rotation = AZ::Quaternion::CreateFromMatrix3x3(LyMatrix3x3ToAzMatrix3x3(source.m33));
-    const AZ::Vector3 halfLengths(source.h.x, source.h.y, source.h.z);
-    return AZ::Obb::CreateFromPositionRotationAndHalfLengths(position, rotation, halfLengths);
-}
-
-inline OBB AZObbToLyOBB(const AZ::Obb& source)
-{
-    return OBB::CreateOBB(
-        Matrix33::CreateFromVectors(
-            AZVec3ToLYVec3(source.GetAxisX()),
-            AZVec3ToLYVec3(source.GetAxisY()),
-            AZVec3ToLYVec3(source.GetAxisZ())),
-        Vec3(source.GetHalfLengthX(), source.GetHalfLengthY(), source.GetHalfLengthZ()),
-        AZVec3ToLYVec3(source.GetPosition()));
-}
-
-inline AZ::Plane LyPlaneToAZPlane(const ::Plane& source)
-{
-    return AZ::Plane::CreateFromNormalAndDistance(LYVec3ToAZVec3(source.n), source.d);
-}
-
-inline ::Plane AZPlaneToLyPlane(const AZ::Plane& source)
-{
-    ::Plane resultPlane;
-    resultPlane.Set(AZVec3ToLYVec3(source.GetNormal()), source.GetDistance());
-
-    return resultPlane;
-}
diff --git a/Code/CryEngine/CryCommon/MemoryAccess.h b/Code/CryEngine/CryCommon/MemoryAccess.h
deleted file mode 100644
index 085c45339c..0000000000
--- a/Code/CryEngine/CryCommon/MemoryAccess.h
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Misc mathematical functions
-
-#pragma once
-
-
-#include <platform.h>
-
-// Section dictionary
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define MEMORYACCESS_H_SECTION_TRAITS 1
-#define MEMORYACCESS_H_SECTION_CRYPREFETCH 2
-#endif
-
-// Traits
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MEMORYACCESS_H_SECTION_TRAITS
-    #include AZ_RESTRICTED_FILE(MemoryAccess_h)
-#else
-#define MEMORYACCESS_H_TRAIT_USE_LEGACY_PREFETCHLINE 1
-#endif
-
-#if MEMORYACCESS_H_TRAIT_USE_LEGACY_PREFETCHLINE
-#define PrefetchLine(ptr, off) cryPrefetchT0SSE((void*)((UINT_PTR)ptr + off))
-#else
-#define PrefetchLine(ptr, off) (void)(0)
-#endif
-#define ResetLine128(ptr, off) (void)(0)
-#define FlushLine128(ptr, off) (void)(0)
-
-
-
-//========================================================================================
-
-// cryMemcpy flags
-#define MC_CPU_TO_GPU 0x10
-#define MC_GPU_TO_CPU 0x20
-#define MC_CPU_TO_CPU 0x40
-
-extern int g_CpuFlags;
-
-//
-#define CPUF_SSE   0x01
-#define CPUF_SSE2  0x02
-#define CPUF_3DNOW 0x04
-#define CPUF_MMX   0x08
-#define CPUF_SSE3  0x10
-#define CPUF_F16C  0x20
-#define CPUF_SSE41 0x40
-
-#ifdef _CPU_SSE
-
-#ifdef _CPU_X86
-#include <xmmintrin.h>
-#endif
-
-#define _MM_PREFETCH(MemPtr, Hint) _mm_prefetch((MemPtr), (Hint));
-#define _MM_PREFETCH_LOOP(nCount, MemPtr, Hint) { for (int p = 0; p < nCount; p += 64) { _mm_prefetch((const char*)(MemPtr) + p, Hint); } \
-}
-#else //_CPU_SSE
-#define _MM_PREFETCH(MemPtr, Hint)
-#define _MM_PREFETCH_LOOP(nCount, MemPtr, Hint)
-#endif //_CPU_SSE
-
-void cryMemcpy(void* Dst, const void* Src, int Count);
-#if defined(LINUX) || defined(APPLE)
-// Define this for Mac and Linux since it is used with the pthread sources
-  #define mymemcpy16 memcpy
-#endif
-
-
-//==========================================================================================
-// 3DNow! optimizations
-
-#if defined _CPU_X86 && !defined(LINUX) && !defined(APPLE)
-// ***************************************************************************
-inline void cryPrecacheSSE(const void* src, int nbytes)
-{
-    _asm
-    {
-        mov esi, src
-        mov ecx, nbytes
-        // 64 bytes per pass
-        shr ecx, 6
-        jz endLabel
-
-loopMemToL1:
-        prefetchnta 64[ESI] // Prefetch next loop, non-temporal
-        prefetchnta 96[ESI]
-
-        movq mm1,  0[ESI]// Read in source data
-        movq mm2,  8[ESI]
-        movq mm3, 16[ESI]
-        movq mm4, 24[ESI]
-        movq mm5, 32[ESI]
-        movq mm6, 40[ESI]
-        movq mm7, 48[ESI]
-        movq mm0, 56[ESI]
-
-        add esi, 64
-        dec ecx
-        jnz loopMemToL1
-
-        emms
-
-endLabel:
-    }
-}
-
-
-#endif
-
-
-
-ILINE void cryPrefetchT0SSE(const void* src)
-{
-#if defined(WIN32) && !defined(WIN64)
-    _asm
-    {
-        mov esi, src
-            prefetchT0 [ESI] // Prefetch
-    }
-#else
-    _MM_PREFETCH((char*)src, _MM_HINT_T0);
-#endif
-}
-
-//=================================================================================
-
-// Very optimized memcpy() routine for AMD Athlon and Duron family.
-// This code uses any of FOUR different basic copy methods, depending
-// on the transfer size.
-// NOTE:  Since this code uses MOVNTQ (also known as "Non-Temporal MOV" or
-// "Streaming Store"), and also uses the software prefetch instructions,
-// be sure you're running on Athlon/Duron or other recent CPU before calling!
-
-#define TINY_BLOCK_COPY 64       // Upper limit for movsd type copy.
-// The smallest copy uses the X86 "movsd" instruction, in an optimized
-// form which is an "unrolled loop".
-
-#define IN_CACHE_COPY 64 * 1024  // Upper limit for movq/movq copy w/SW prefetch.
-// Next is a copy that uses the MMX registers to copy 8 bytes at a time,
-// also using the "unrolled loop" optimization.   This code uses
-// the software prefetch instruction to get the data into the cache.
-
-#define UNCACHED_COPY 197 * 1024 // Upper limit for movq/movntq w/SW prefetch.
-// For larger blocks, which will spill beyond the cache, it's faster to
-// use the Streaming Store instruction MOVNTQ.   This write instruction
-// bypasses the cache and writes straight to main memory.  This code also
-// uses the software prefetch instruction to pre-read the data.
-// USE 64 * 1024 FOR THIS VALUE IF YOU'RE ALWAYS FILLING A "CLEAN CACHE".
-
-#define BLOCK_PREFETCH_COPY  infinity // No limit for movq/movntq w/block prefetch.
-#define CACHEBLOCK 80h // Number of 64-byte blocks (cache lines) for block prefetch.
-// For the largest size blocks, a special technique called Block Prefetch
-// can be used to accelerate the read operations.   Block Prefetch reads
-// one address per cache line, for a series of cache lines, in a short loop.
-// This is faster than using software prefetch.  The technique is great for
-// getting maximum read bandwidth, especially in DDR memory systems.
-
-
-#if defined _CPU_X86 && !defined(LINUX) && !defined(APPLE)
-// Inline assembly syntax for use with Visual C++
-inline void cryMemcpy(void* Dst, const void* Src, int Count)
-{
-    if (g_CpuFlags & CPUF_SSE)
-    {
-        __asm
-        {
-            mov       ecx, [Count];
-            number of bytes to copy
-            mov       edi, [Dst];
-            destination
-            mov       esi, [Src];
-            source
-            mov       ebx, ecx;
-            keep a copy of count
-
-            cld
-            cmp       ecx, TINY_BLOCK_COPY
-            jb        $memcpy_ic_3;
-            tiny ? skip mmx copy
-
-            cmp       ecx, 32 * 1024;
-            dont align between 32k - 64k because
-            jbe       $memcpy_do_align;
-            it appears to be slower
-            cmp       ecx, 64*1024
-            jbe       $memcpy_align_done
-                      $memcpy_do_align :
-            mov       ecx, 8;
-            a trick thats faster than rep movsb ...
-            sub       ecx, edi;
-            align destination to qword
-            and       ecx, 111b;
-            get the low bits
-            sub       ebx, ecx;
-            update copy count
-            neg       ecx;
-            set up to jump into the array
-            add       ecx, offset $memcpy_align_done
-            jmp       ecx;
-            jump to array of movsbs
-
-                align 4
-            movsb
-            movsb
-            movsb
-            movsb
-            movsb
-            movsb
-            movsb
-            movsb
-
-$memcpy_align_done:;
-            destination is dword aligned
-            mov       ecx, ebx;
-            number of bytes left to copy
-            shr       ecx, 6;
-            get 64 - byte block count
-            jz        $memcpy_ic_2;
-            finish the last few bytes
-
-            cmp       ecx, IN_CACHE_COPY / 64;
-            too big 4 cache ? use uncached copy
-            jae       $memcpy_uc_test
-
-            // This is small block copy that uses the MMX registers to copy 8 bytes
-            // at a time.  It uses the "unrolled loop" optimization, and also uses
-            // the software prefetch instruction to get the data into the cache.
-                align 16
-            $memcpy_ic_1 :;
-            64 - byte block copies, in - cache copy
-
-            prefetchnta [esi + (200 * 64 / 34 + 192)];
-            start reading ahead
-
-            movq  mm0, [esi + 0];
-            read 64 bits
-            movq  mm1, [esi + 8]
-            movq  [edi + 0], mm0;
-            write 64 bits
-            movq  [edi + 8], mm1;
-note:  the normal movq writes the
-            movq  mm2, [esi + 16];
-            data to cache;
-            a cache line will be
-            movq  mm3, [esi + 24];
-            allocated as needed, to store the data
-                         movq  [edi + 16], mm2
-                         movq  [edi + 24], mm3
-            movq  mm0, [esi + 32]
-            movq  mm1, [esi + 40]
-            movq  [edi + 32], mm0
-                         movq  [edi + 40], mm1
-            movq  mm2, [esi + 48]
-            movq  mm3, [esi + 56]
-            movq  [edi + 48], mm2
-                         movq  [edi + 56], mm3
-
-            add       esi, 64;
-            update source pointer
-            add       edi, 64;
-            update destination pointer
-            dec       ecx;
-            count down
-            jnz       $memcpy_ic_1;
-            last 64 - byte block ?
-
-            $memcpy_ic_2 :
-            mov       ecx, ebx;
-            has valid low 6 bits of the byte count
-$memcpy_ic_3:
-            shr       ecx, 2;
-            dword count
-            and       ecx, 1111b;
-            only look at the "remainder" bits
-            neg       ecx;
-            set up to jump into the array
-            add       ecx, offset $memcpy_last_few
-            jmp       ecx;
-            jump to array of movsds
-
-$memcpy_uc_test:
-            cmp       ecx, UNCACHED_COPY / 64;
-            big enough ? use block prefetch copy
-            jae       $memcpy_bp_1
-
-                $memcpy_64_test :
-            or        ecx, ecx;
-            tail end of block prefetch will jump here
-            jz        $memcpy_ic_2;
-            no more 64 - byte blocks left
-
-            // For larger blocks, which will spill beyond the cache, it's faster to
-            // use the Streaming Store instruction MOVNTQ.   This write instruction
-            // bypasses the cache and writes straight to main memory.  This code also
-            // uses the software prefetch instruction to pre-read the data.
-               align 16
-$memcpy_uc_1:;
-            64 - byte blocks, uncached copy
-
-            prefetchnta [esi + (200 * 64 / 34 + 192)];
-            start reading ahead
-
-            movq  mm0, [esi + 0];
-            read 64 bits
-            add       edi, 64;
-            update destination pointer
-            movq  mm1, [esi + 8]
-            add       esi, 64;
-            update source pointer
-            movq  mm2, [esi - 48]
-            movntq    [edi - 64], mm0;
-            write 64 bits, bypassing the cache
-            movq  mm0, [esi - 40];
-note: movntq also prevents the CPU
-            movntq    [edi - 56], mm1;
-            from READING the destination address
-            movq  mm1, [esi - 32];
-            into the cache, only to be over - written
-                     movntq    [edi - 48], mm2;
-            so that also helps performance
-            movq  mm2, [esi - 24]
-            movntq    [edi - 40], mm0
-            movq  mm0, [esi - 16]
-            movntq    [edi - 32], mm1
-            movq  mm1, [esi - 8]
-            movntq    [edi - 24], mm2
-                  movntq    [edi - 16], mm0
-            dec       ecx
-                  movntq    [edi - 8], mm1
-            jnz       $memcpy_uc_1;
-            last 64 - byte block ?
-
-            jmp       $memcpy_ic_2;
-            almost done
-
-            // For the largest size blocks, a special technique called Block Prefetch
-            // can be used to accelerate the read operations.   Block Prefetch reads
-            // one address per cache line, for a series of cache lines, in a short loop.
-            // This is faster than using software prefetch.  The technique is great for
-            // getting maximum read bandwidth, especially in DDR memory systems.
-                $memcpy_bp_1 :;
-            large blocks, block prefetch copy
-
-            cmp       ecx, CACHEBLOCK;
-            big enough to run another prefetch loop ?
-            jl        $memcpy_64_test;
-            no, back to regular uncached copy
-
-            mov       eax, CACHEBLOCK / 2;
-            block prefetch loop, unrolled 2X
-            add       esi, CACHEBLOCK* 64;
-            move to the top of the block
-                align 16
-            $memcpy_bp_2 :
-            mov       edx, [esi - 64];
-            grab one address per cache line
-            mov       edx, [esi - 128];
-            grab one address per cache line
-            sub       esi, 128;
-            go reverse order to suppress HW prefetcher
-            dec       eax;
-            count down the cache lines
-            jnz       $memcpy_bp_2;
-            keep grabbing more lines into cache
-
-            mov       eax, CACHEBLOCK;
-            now that its in cache, do
-            {
-                the copy
-                            align 16
-$memcpy_bp_3:
-                movq  mm0, [esi   ];
-            } read 64 bits
-            movq  mm1, [esi + 8]
-            movq  mm2, [esi + 16]
-            movq  mm3, [esi + 24]
-            movq  mm4, [esi + 32]
-            movq  mm5, [esi + 40]
-            movq  mm6, [esi + 48]
-            movq  mm7, [esi + 56]
-            add       esi, 64;
-            update source pointer
-                movntq    [edi   ], mm0;
-            write 64 bits, bypassing cache
-            movntq    [edi + 8], mm1;
-note: movntq also prevents the CPU
-            movntq    [edi + 16], mm2;
-            from READING the destination address
-                movntq    [edi + 24], mm3;
-            into the cache, only to be over - written,
-                     movntq    [edi + 32], mm4;
-            so that also helps performance
-                movntq    [edi + 40], mm5
-                movntq    [edi + 48], mm6
-                movntq    [edi + 56], mm7
-            add       edi, 64;
-            update dest pointer
-
-            dec       eax;
-            count down
-
-            jnz       $memcpy_bp_3;
-            keep copying
-            sub       ecx, CACHEBLOCK;
-            update the 64 - byte block count
-            jmp       $memcpy_bp_1;
-            keep processing chunks
-
-            // The smallest copy uses the X86 "movsd" instruction, in an optimized
-            // form which is an "unrolled loop".   Then it handles the last few bytes.
-                align 4
-            movsd
-                movsd;
-            perform last 1 - 15 dword copies
-            movsd
-            movsd
-            movsd
-            movsd
-            movsd
-            movsd
-            movsd
-                    movsd;
-            perform last 1 - 7 dword copies
-            movsd
-            movsd
-            movsd
-            movsd
-            movsd
-            movsd
-
-$memcpy_last_few:;
-            dword aligned from before movsds
-            mov       ecx, ebx;
-            has valid low 2 bits of the byte count
-            and       ecx, 11b;
-            the last few cows must come home
-            jz        $memcpy_final;
-            no more, lets leave
-            rep       movsb;
-            the last 1, 2, or 3 bytes
-
-$memcpy_final:
-            emms;
-            clean up the MMX state
-                sfence;
-            flush the write buffer
-            //  mov     eax, [dest] ; ret value = destination pointer
-        }
-    }
-    else
-    {
-        memcpy(Dst, Src, Count);
-    }
-}
-
-inline void cryPrefetch(const void* Src, int nCount)
-{
-    nCount >>= 6;
-    if (nCount > 0)
-    {
-        _asm
-        {
-            mov esi, Src;
-            mov ecx, nCount;
-mPr0:
-            align 16
-            dec ecx;
-            mov eax, [esi];
-            mov eax, 0;
-            lea esi, [esi + 40h];
-            jne mPr0;
-        }
-    }
-    else
-    {
-        _asm
-        {
-            mov esi, Src;
-            mov ecx, nCount;
-mPr1:
-            align 16
-            inc ecx;
-            mov eax, [esi];
-            mov eax, 0;
-            lea esi, [esi - 40h];
-            jne mPr1;
-        }
-    }
-}
-
-inline void cryMemcpy (void* inDst, const void* inSrc, int nCount, int nFlags)
-{
-    cryMemcpy(inDst, inSrc, nCount);
-}
-
-//==========================================================================================
-// SSE optimizations
-
-
-#else
-
-const int PREFNTA_BLOCK = 0x4000;
-
-ILINE void cryMemcpy(void* Dst, const void* Src, int n)
-{
-    char* dst = (char*)Dst;
-    char* src = (char*)Src;
-    while (n > PREFNTA_BLOCK)
-    {
-        _MM_PREFETCH_LOOP(PREFNTA_BLOCK, src, _MM_HINT_NTA);
-
-        memcpy(dst, src, PREFNTA_BLOCK);
-        src += PREFNTA_BLOCK;
-        dst += PREFNTA_BLOCK;
-        n -= PREFNTA_BLOCK;
-    }
-    _MM_PREFETCH_LOOP(n, src, _MM_HINT_NTA);
-    memcpy(dst, src, n);
-}
-
-ILINE void cryMemcpy(void* Dst, const void* Src, int n, [[maybe_unused]] int nFlags)
-{
-    char* dst = (char*)Dst;
-    char* src = (char*)Src;
-    while (n > PREFNTA_BLOCK)
-    {
-        _MM_PREFETCH_LOOP(PREFNTA_BLOCK, src, _MM_HINT_NTA);
-        memcpy(dst, src, PREFNTA_BLOCK);
-        src += PREFNTA_BLOCK;
-        dst += PREFNTA_BLOCK;
-        n -= PREFNTA_BLOCK;
-    }
-    _MM_PREFETCH_LOOP(n, src, _MM_HINT_NTA);
-    memcpy(dst, src, n);
-}
-
-
-#endif
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MEMORYACCESS_H_SECTION_CRYPREFETCH
-    #include AZ_RESTRICTED_FILE(MemoryAccess_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-//implement something usual to bring one memory location into L1 data cache
-ILINE void CryPrefetch(const void* const cpSrc)
-{
-    cryPrefetchT0SSE(cpSrc);
-}
-#endif
-
-#define CryPrefetchInl CryPrefetch
diff --git a/Code/CryEngine/CryCommon/MetaUtils.h b/Code/CryEngine/CryCommon/MetaUtils.h
deleted file mode 100644
index 7ed2925672..0000000000
--- a/Code/CryEngine/CryCommon/MetaUtils.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_METAUTILS_H
-#define CRYINCLUDE_CRYCOMMON_METAUTILS_H
-#pragma once
-
-
-
-namespace metautils
-{
-    // select
-
-    template<bool Condition, typename Ty1, typename Ty2>
-    struct select;
-
-    template<typename Ty1, typename Ty2>
-    struct select<true, Ty1, Ty2>
-    {
-        typedef Ty1 type;
-    };
-
-    template<typename Ty1, typename Ty2>
-    struct select<false, Ty1, Ty2>
-    {
-        typedef Ty2 type;
-    };
-
-    // is_same
-    // Identifies whether types Ty1 and Ty2 are the same including const & volatile.
-
-    template<typename Ty1, typename Ty2>
-    struct is_same;
-
-    template<typename Ty1>
-    struct is_same<Ty1, Ty1>
-    {
-        enum
-        {
-            value = true,
-        };
-    };
-
-    template<typename Ty1, typename Ty2>
-    struct is_same
-    {
-        enum
-        {
-            value = false,
-        };
-    };
-
-    // remove_const
-    // Removes top level const qualifier.
-
-    template<class Ty>
-    struct remove_const
-    {
-        typedef Ty type;
-    };
-
-    template<class Ty>
-    struct remove_const<const Ty>
-    {
-        typedef Ty type;
-    };
-
-    template<class Ty>
-    struct remove_const<const Ty[]>
-    {
-        typedef Ty type[];
-    };
-
-    template<class Ty, unsigned int N>
-    struct remove_const<const Ty[N]>
-    {
-        typedef Ty type[N];
-    };
-
-    // is_const
-    // Determines whether type Ty is const qualified.
-
-    template <typename Ty>
-    struct is_const
-    {
-        enum
-        {
-            value = false
-        };
-    };
-
-    template <typename Ty>
-    struct is_const<const Ty>
-    {
-        enum
-        {
-            value = true
-        };
-    };
-
-    template<class Ty, unsigned int N>
-    struct is_const<Ty[N]>
-    {
-        enum
-        {
-            value = false
-        };
-    };
-
-    template<class Ty, unsigned int N>
-    struct is_const<const Ty[N]>
-    {
-        enum
-        {
-            value = true
-        };
-    };
-
-    template<class Ty>
-    struct is_const<Ty&>
-    {
-        enum
-        {
-            value = false
-        };
-    };
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_METAUTILS_H
diff --git a/Code/CryEngine/CryCommon/MicrophoneBus.h b/Code/CryEngine/CryCommon/MicrophoneBus.h
deleted file mode 100644
index 43ea57f839..0000000000
--- a/Code/CryEngine/CryCommon/MicrophoneBus.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <IAudioInterfacesCommonData.h>
-
-namespace Audio
-{
-    /**
-     * Interface for connecting with a hardware Microphone device.
-     * The pattern that should be used is as follows:
-     * 
-     * InitializeDevice
-     *  StartSession
-     *   (Capturing Mic Data...)
-     *  EndSession
-     *  ...
-     *  (optional: additional StartSession/EndSession pairs)
-     *  ...
-     * ShutdownDevice
-     */
-    class MicrophoneRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        /**
-         * EBus Traits
-         */
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        using MutexType = AZStd::recursive_mutex;
-
-        /**
-         * Initialize a hardware Microphone input device with the OS.
-         * @return True if the Microphone was initialized without errors, false otherwise.
-         */
-        virtual bool InitializeDevice() = 0;
-
-        /**
-         * Shutdown the connection to the Microphone device.
-         */
-        virtual void ShutdownDevice() = 0;
-
-        /**
-         * Start capturing Microphone data.
-         * @return True if the Microphone capturing session was started without errors, false otherwise.
-         */
-        virtual bool StartSession() = 0;
-
-        /**
-         * Stop capturing Microphone data.
-         */
-        virtual void EndSession() = 0;
-
-        /**
-         * Check if the Microphone is actively capturing data.
-         * @return True if a capturing session has started and is running, false otherwise.
-         */
-        virtual bool IsCapturing() = 0;
-
-        /**
-         * Obtain the format set up for the mic capture session.
-         * @return Configuration of the Microphone.
-         */
-        virtual SAudioInputConfig GetFormatConfig() const = 0;
-
-        /**
-         * Consume a number of sample frames from the captured data.
-         * @param outputData Where the data will be copied to.
-         * @param numFrames The number of sample frames requested.
-         * @param targetConfig The configuration of the data sink (sample rate, channels, sample type, etc).
-         * @param shouldDeinterleave Ask for a deinterleaved copy when in stereo: [LRLRLRLR] --> [LLLL, RRRR]
-         * @return The number of sample frames obtained.
-         */
-        virtual AZStd::size_t GetData(void** outputData, AZStd::size_t numFrames, const SAudioInputConfig& targetConfig, bool shouldDeinterleave) = 0;
-    };
-
-    using MicrophoneRequestBus = AZ::EBus<MicrophoneRequests>;
-
-} // namespace Audio
diff --git a/Code/CryEngine/CryCommon/MiniQueue.h b/Code/CryEngine/CryCommon/MiniQueue.h
deleted file mode 100644
index 986d5b2505..0000000000
--- a/Code/CryEngine/CryCommon/MiniQueue.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : a small memory overhead, fixed size, efficient, iterable
-//               queue class  used for CContextView  SObjectClone
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_MINIQUEUE_H
-#define CRYINCLUDE_CRYCOMMON_MINIQUEUE_H
-#pragma once
-
-
-// this class implements a very small queue of plain-old-data
-template <typename T, uint8 N>
-struct MiniQueue
-{
-public:
-    MiniQueue()
-        : m_nValues(0)
-        , m_nOffset(0) {}
-
-    MiniQueue(const MiniQueue& mq)
-    {
-        m_nValues = mq.m_nValues;
-        m_nOffset = 0;
-        for (int i = 0; i < m_nValues; i++)
-        {
-            m_vValues[i] = mq[i];
-        }
-    }
-
-    bool Empty() const
-    {
-        return m_nValues == 0;
-    }
-    bool Full() const
-    {
-        return m_nValues == N;
-    }
-    uint8 Size() const
-    {
-        return m_nValues;
-    }
-    uint8 Capacity() const
-    {
-        return N;
-    }
-    ILINE void Push(T nValue)
-    {
-        assert(!Full());
-        m_vValues[(m_nOffset + m_nValues) % N] = nValue;
-        m_nValues++;
-    }
-    // push, but if the queue is full, then pop first
-    void CyclePush(T nValue)
-    {
-        if (Full())
-        {
-            Pop();
-        }
-        Push(nValue);
-    }
-    void PushFront(T nValue)
-    {
-        assert(!Full());
-        m_nOffset = (m_nOffset + (N - 1)) % N;
-        m_vValues[m_nOffset] = nValue;
-        m_nValues++;
-    }
-    T Front() const
-    {
-        assert(!Empty());
-        return m_vValues[m_nOffset];
-    }
-    T& Front()
-    {
-        assert(!Empty());
-        return m_vValues[m_nOffset];
-    }
-    T& operator[](int i)
-    {
-        return m_vValues[(m_nOffset + i) % N];
-    }
-    T operator[](int i) const
-    {
-        return m_vValues[(m_nOffset + i) % N];
-    }
-    T Back() const
-    {
-        assert(!Empty());
-        return m_vValues[(m_nOffset + m_nValues - 1) % N];
-    }
-    T& Back()
-    {
-        assert(!Empty());
-        return m_vValues[(m_nOffset + m_nValues - 1) % N];
-    }
-    void Pop()
-    {
-        assert(!Empty());
-        m_nOffset = (m_nOffset + 1) % N;
-        m_nValues--;
-    }
-    void PopBack()
-    {
-        assert(!Empty());
-        m_nValues--;
-    }
-    void Clear()
-    {
-        m_nOffset = m_nValues = 0;
-    }
-
-    struct SIterator
-    {
-    public:
-        SIterator() {}
-        SIterator(T* pValues, uint8 nOffset)
-            : m_pValues(pValues)
-            , m_nOffset(nOffset) {}
-        T& operator*()
-        {
-            return m_pValues[m_nOffset % N];
-        }
-        T* operator->()
-        {
-            return &m_pValues[m_nOffset % N];
-        }
-        SIterator& operator++()
-        {
-            m_nOffset++;
-            return *this;
-        }
-        SIterator operator++(int)
-        {
-            SIterator itor = *this;
-            ++m_nOffset;
-            return itor;
-        }
-        SIterator& operator--()
-        {
-            m_nOffset--;
-            return *this;
-        }
-        SIterator& operator+=(uint8 delta)
-        {
-            m_nOffset += delta;
-            return *this;
-        }
-        SIterator& operator-=(uint8 delta)
-        {
-            m_nOffset -= delta;
-            return *this;
-        }
-
-        friend bool operator!=(const SIterator& a, const SIterator& b)
-        {
-            assert(a.m_pValues == b.m_pValues);
-            return a.m_nOffset != b.m_nOffset;
-        }
-        friend bool operator==(const SIterator& a, const SIterator& b)
-        {
-            assert(a.m_pValues == b.m_pValues);
-            return a.m_nOffset == b.m_nOffset;
-        }
-
-        friend int operator-(const SIterator& a, const SIterator& b)
-        {
-            assert(a.m_pValues == b.m_pValues);
-            int diff = int(a.m_nOffset) - int(b.m_nOffset);
-            return diff;
-        }
-
-        uint8 Offset() { return m_nOffset; }
-
-    private:
-        T* m_pValues;
-        uint8 m_nOffset;
-    };
-
-    SIterator Begin() { return SIterator(m_vValues, m_nOffset); }
-    SIterator End() { return SIterator(m_vValues, m_nOffset + m_nValues); }
-
-    SIterator RBegin() { return SIterator(m_vValues, m_nOffset + m_nValues - 1); }
-    SIterator REnd() { return SIterator(m_vValues, m_nOffset - 1); }
-
-    struct SConstIterator
-    {
-    public:
-        SConstIterator() {}
-        SConstIterator(const T* pValues, uint8 nOffset)
-            : m_pValues(pValues)
-            , m_nOffset(nOffset) {}
-        const T& operator*()
-        {
-            return m_pValues[m_nOffset % N];
-        }
-        const T* operator->()
-        {
-            return &m_pValues[m_nOffset % N];
-        }
-        SConstIterator& operator++()
-        {
-            m_nOffset++;
-            return *this;
-        }
-        SConstIterator& operator--()
-        {
-            m_nOffset--;
-            return *this;
-        }
-        SConstIterator& operator+=(uint8 delta)
-        {
-            m_nOffset += delta;
-            return *this;
-        }
-        SConstIterator& operator-=(uint8 delta)
-        {
-            m_nOffset -= delta;
-            return *this;
-        }
-        friend bool operator!=(const SConstIterator& a, const SConstIterator& b)
-        {
-            assert(a.m_pValues == b.m_pValues);
-            return a.m_nOffset != b.m_nOffset;
-        }
-        friend bool operator==(const SConstIterator& a, const SConstIterator& b)
-        {
-            assert(a.m_pValues == b.m_pValues);
-            return a.m_nOffset == b.m_nOffset;
-        }
-
-        friend int operator-(const SConstIterator& a, const SConstIterator& b)
-        {
-            assert(a.m_pValues == b.m_pValues);
-            int diff = int(a.m_nOffset) - int(b.m_nOffset);
-            return diff;
-        }
-
-        uint8 Offset() { return m_nOffset; }
-
-    private:
-        const T* m_pValues;
-        uint8 m_nOffset;
-    };
-
-    SConstIterator Begin() const { return SConstIterator(m_vValues, m_nOffset); }
-    SConstIterator End() const { return SConstIterator(m_vValues, m_nOffset + m_nValues); }
-
-    SConstIterator RBegin() const { return SConstIterator(m_vValues, m_nOffset + m_nValues - 1); }
-    SConstIterator REnd() const { return SConstIterator(m_vValues, m_nOffset - 1); }
-
-    void Erase(SIterator where)
-    {
-        assert(where.Offset() >= m_nOffset);
-        assert(where.Offset() < m_nOffset + m_nValues);
-        for (size_t offset = where.Offset(); offset < (size_t)(m_nOffset + m_nValues - 1); offset++)
-        {
-            m_vValues[offset % N] = m_vValues[(offset + 1) % N];
-        }
-        m_nValues--;
-    }
-
-    void Erase(SIterator first, SIterator last)
-    {
-        int num = last - first;
-        if (num == 0)
-        {
-            return;
-        }
-        assert(num > 0);
-        assert(num <= Size());
-        assert(first.Offset() >= m_nOffset);
-        assert(first.Offset() < m_nOffset + m_nValues);
-        assert(last.Offset() >= m_nOffset);
-        assert(last.Offset() <= m_nOffset + m_nValues);
-        for (int offset = (int)first.Offset(); offset < m_nOffset + m_nValues - 1; offset++)
-        {
-            m_vValues[offset % N] = m_vValues[(offset + num) % N];
-        }
-        m_nValues -= num;
-    }
-
-private:
-    uint8 m_nValues;
-    uint8 m_nOffset;
-    T m_vValues[N];
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_MINIQUEUE_H
diff --git a/Code/CryEngine/CryCommon/Mocks/IAudioSystemMock.h b/Code/CryEngine/CryCommon/Mocks/IAudioSystemMock.h
deleted file mode 100644
index 75dc792d41..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/IAudioSystemMock.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <IAudioSystem.h>
-
-namespace Audio
-{
-    struct AudioProxyMock
-        : public IAudioProxy
-    {
-        MOCK_METHOD2(Initialize, void(const char* const sObjectName, bool bInitAsync /* = true */));
-        MOCK_METHOD0(Release, void());
-        MOCK_METHOD0(Reset, void());
-        MOCK_METHOD1(StopTrigger, void(TAudioControlID nTriggerID));
-        MOCK_METHOD2(SetSwitchState, void(TAudioControlID nSwitchID, TAudioSwitchStateID nStateID));
-        MOCK_METHOD2(SetRtpcValue, void(TAudioControlID nRtpcID, float fValue));
-        MOCK_METHOD1(SetObstructionCalcType, void(EAudioObjectObstructionCalcType eObstructionType));
-        MOCK_METHOD1(SetPosition, void(const SATLWorldPosition& rPosition));
-        MOCK_METHOD1(SetPosition, void(const AZ::Vector3& rPosition));
-        MOCK_METHOD2(SetEnvironmentAmount, void(TAudioEnvironmentID nEnvironmentID, float fAmount));
-        MOCK_METHOD0(SetCurrentEnvironments, void());
-        MOCK_CONST_METHOD0(GetAudioObjectID, TAudioObjectID());
-    };
-
-    struct AudioSystemMock
-        : public IAudioSystem
-    {
-        MOCK_METHOD0(Initialize, bool());
-        MOCK_METHOD0(Release, void());
-        MOCK_METHOD1(PushRequest, void(const SAudioRequest& rAudioRequestData));
-        MOCK_METHOD4(AddRequestListener, void(AudioRequestCallbackType func, void* pObjectToListenTo, EAudioRequestType requestType /* = eART_AUDIO_ALL_REQUESTS */, TATLEnumFlagsType specificRequestMask /* = ALL_AUDIO_REQUEST_SPECIFIC_TYPE_FLAGS */));
-        MOCK_METHOD2(RemoveRequestListener, void(AudioRequestCallbackType func, void* pObjectToListenTo));
-        MOCK_METHOD0(ExternalUpdate, void());
-        MOCK_CONST_METHOD1(GetAudioTriggerID, TAudioControlID(const char* sAudioTriggerName));
-        MOCK_CONST_METHOD1(GetAudioRtpcID, TAudioControlID(const char* sAudioRtpcName));
-        MOCK_CONST_METHOD1(GetAudioSwitchID, TAudioControlID(const char* sAudioSwitchName));
-        MOCK_CONST_METHOD2(GetAudioSwitchStateID, TAudioSwitchStateID(const TAudioControlID nSwitchID, const char* sAudioStateName));
-        MOCK_CONST_METHOD1(GetAudioPreloadRequestID, TAudioPreloadRequestID(const char* sAudioPreloadRequestName));
-        MOCK_CONST_METHOD1(GetAudioEnvironmentID, TAudioEnvironmentID(const char* sAudioEnvironmentName));
-        MOCK_METHOD1(ReserveAudioListenerID, bool(TAudioObjectID& rAudioListenerID));
-        MOCK_METHOD1(ReleaseAudioListenerID, bool(TAudioObjectID nAudioObjectID));
-        MOCK_METHOD1(OnCVarChanged, void(ICVar* const pCVar));
-        MOCK_METHOD1(GetInfo, void(SAudioSystemInfo& rAudioSystemInfo));
-        MOCK_CONST_METHOD0(GetControlsPath, const char*());
-        MOCK_METHOD0(UpdateControlsPath, void());
-        MOCK_METHOD0(GetFreeAudioProxy, IAudioProxy*());
-        MOCK_METHOD1(FreeAudioProxy, void(IAudioProxy* pIAudioProxy));
-        MOCK_CONST_METHOD2(GetAudioControlName, const char*(EAudioControlType eAudioEntityType, TATLIDType nAudioEntityID));
-        MOCK_CONST_METHOD2(GetAudioSwitchStateName, const char*(TAudioControlID switchID, TAudioSwitchStateID stateID));
-    };
-
-} // namespace Audio
diff --git a/Code/CryEngine/CryCommon/Mocks/ICVarMock.h b/Code/CryEngine/CryCommon/Mocks/ICVarMock.h
deleted file mode 100644
index 96301e7733..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/ICVarMock.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <IConsole.h>
-#include <AzTest/AzTest.h>
-
-#include <SFunctor.h>
-
-class CVarMock
-    : public ICVar
-{
-public:
-    MOCK_METHOD0(Release, void());
-    MOCK_CONST_METHOD0(GetIVal, int());
-    MOCK_CONST_METHOD0(GetI64Val, int64());
-    MOCK_CONST_METHOD0(GetFVal, float());
-    MOCK_CONST_METHOD0(GetString, const char*());
-    MOCK_CONST_METHOD0(GetDataProbeString, const char*());
-    MOCK_METHOD1(Set, void(const char*));
-    MOCK_METHOD1(ForceSet, void(const char*));
-    MOCK_METHOD1(Set, void(float));
-    MOCK_METHOD1(Set, void(int));
-    MOCK_METHOD1(ClearFlags, void(const int));
-    MOCK_CONST_METHOD0(GetFlags, int());
-    MOCK_METHOD1(SetFlags, int(const int));
-    MOCK_METHOD0(GetType, int());
-    MOCK_CONST_METHOD0(GetName, const char*());
-    MOCK_METHOD0(GetHelp, const char*());
-    MOCK_CONST_METHOD0(IsConstCVar, bool());
-    MOCK_METHOD1(SetOnChangeCallback, void(ConsoleVarFunc));
-    MOCK_METHOD1(AddOnChangeFunctor, uint64(const SFunctor& pChangeFunctor));
-    MOCK_CONST_METHOD0(GetNumberOfOnChangeFunctors, uint64());
-    MOCK_CONST_METHOD1(GetOnChangeFunctor, const SFunctor&(uint64));
-    MOCK_METHOD1(RemoveOnChangeFunctor, bool(uint64));
-    MOCK_CONST_METHOD0(GetOnChangeCallback, ConsoleVarFunc());
-    MOCK_CONST_METHOD1(GetMemoryUsage, void(class ICrySizer* pSizer));
-    MOCK_CONST_METHOD0(GetRealIVal, int());
-    MOCK_METHOD2(SetLimits, void(float, float));
-    MOCK_METHOD2(GetLimits, void(float&, float&));
-    MOCK_METHOD0(HasCustomLimits, bool());
-    MOCK_METHOD1(SetDataProbeString, void(const char*));
-};
diff --git a/Code/CryEngine/CryCommon/Mocks/IConsoleMock.h b/Code/CryEngine/CryCommon/Mocks/IConsoleMock.h
deleted file mode 100644
index abeec34a3e..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/IConsoleMock.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_CRYCOMMON_ICONSOLEMOCK_H
-#define CRYINCLUDE_CRYCOMMON_ICONSOLEMOCK_H
-#pragma once
-
-#include <IConsole.h>
-#include <AzTest/AzTest.h>
-
-// Implements the Console interface
-class ConsoleMock
-    : public ::IConsole
-{
-public:
-    MOCK_METHOD0(Release, void());
-    MOCK_METHOD1(Init, void(ISystem * pSystem));
-    MOCK_METHOD5(RegisterString, ICVar * (const char* sName, const char* sValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc));
-    MOCK_METHOD5(RegisterInt, ICVar * (const char* sName, int iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc));
-    MOCK_METHOD5(RegisterInt64, ICVar * (const char* sName, int64 iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc));
-    MOCK_METHOD5(RegisterFloat, ICVar * (const char* sName, float fValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc));
-    MOCK_METHOD7(Register, ICVar * (const char* name, float* src, float defaultvalue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify));
-    MOCK_METHOD7(Register, ICVar * (const char* name, int* src, int defaultvalue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify));
-    MOCK_METHOD7(Register, ICVar * (const char* name, const char** src, const char* defaultvalue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify));
-    MOCK_METHOD1(Register, ICVar * (ICVar * pVar));
-    MOCK_METHOD2(UnregisterVariable, void(const char* sVarName, bool bDelete ));
-    MOCK_METHOD1(SetScrollMax, void(int value));
-    MOCK_METHOD1(AddOutputPrintSink, void(IOutputPrintSink * inpSink));
-    MOCK_METHOD1(RemoveOutputPrintSink, void(IOutputPrintSink * inpSink));
-    MOCK_METHOD2(ShowConsole, void(bool show, int iRequestScrollMax));
-    MOCK_METHOD2(DumpCVars, void(ICVarDumpSink * pCallback, unsigned int nFlagsFilter));
-    MOCK_METHOD2(CreateKeyBind, void(const char* sCmd, const char* sRes));
-    MOCK_METHOD2(SetImage, void (ITexture * pImage, bool bDeleteCurrent));
-    MOCK_METHOD0(GetImage, ITexture * ());
-    MOCK_METHOD1(StaticBackground, void (bool bStatic));
-    MOCK_METHOD1(SetLoadingImage, void(const char* szFilename));
-    MOCK_CONST_METHOD3(GetLineNo, bool(int indwLineNo, char* outszBuffer, int indwBufferSize));
-    MOCK_CONST_METHOD0(GetLineCount, int ());
-    MOCK_METHOD1(GetCVar, ICVar * (const char* name));
-    MOCK_METHOD3(GetVariable, char*(const char* szVarName, const char* szFileName, const char* def_val));
-    MOCK_METHOD3(GetVariable, float (const char* szVarName, const char* szFileName, float def_val));
-    MOCK_METHOD1(PrintLine, void (const char* s));
-    MOCK_METHOD1(PrintLinePlus, void (const char* s));
-    MOCK_METHOD0(GetStatus, bool());
-    MOCK_METHOD0(Clear, void());
-    MOCK_METHOD0(Update, void());
-    MOCK_METHOD0(Draw, void());
-    MOCK_METHOD4(AddCommand, bool (const char* sCommand, ConsoleCommandFunc func, int nFlags, const char* sHelp));
-    MOCK_METHOD4(AddCommand, bool (const char* sName, const char* sScriptFunc, int nFlags, const char* sHelp));
-    MOCK_METHOD1(RemoveCommand, void (const char* sName));
-    MOCK_METHOD3(ExecuteString, void (const char* command, bool bSilentMode, bool bDeferExecution ));
-    MOCK_METHOD0(IsOpened, bool ());
-    MOCK_METHOD0(GetNumVars, int());
-    MOCK_METHOD0(GetNumVisibleVars, int());
-    MOCK_METHOD3(GetSortedVars, size_t (const char** pszArray, size_t numItems, const char* szPrefix));
-    MOCK_METHOD1(AutoComplete, const char*(const char* substr));
-    MOCK_METHOD1(AutoCompletePrev, const char*(const char* substr));
-    MOCK_METHOD1(ProcessCompletion, const char*(const char* szInputBuffer));
-    MOCK_METHOD2(RegisterAutoComplete, void (const char* sVarOrCommand, IConsoleArgumentAutoComplete * pArgAutoComplete));
-    MOCK_METHOD1(UnRegisterAutoComplete, void (const char* sVarOrCommand));
-    MOCK_METHOD0(ResetAutoCompletion, void ());
-    MOCK_CONST_METHOD1(GetMemoryUsage, void (ICrySizer * pSizer));
-    MOCK_METHOD1(ResetProgressBar, void (int nProgressRange));
-    MOCK_METHOD0(TickProgressBar, void ());
-    MOCK_METHOD1(SetInputLine, void (const char* szLine));
-    MOCK_METHOD1(DumpKeyBinds, void (IKeyBindDumpSink * pCallback));
-    MOCK_CONST_METHOD1(FindKeyBind, const char*(const char* sCmd));
-    MOCK_METHOD0(GetNumCheatVars, int ());
-    MOCK_METHOD2(SetCheatVarHashRange, void (size_t firstVar, size_t lastVar));
-    MOCK_METHOD0(CalcCheatVarHash, void ());
-    MOCK_METHOD0(IsHashCalculated, bool ());
-    MOCK_METHOD0(GetCheatVarHash, uint64 ());
-    MOCK_METHOD1(PrintCheatVars, void (bool bUseLastHashRange));
-    MOCK_METHOD1(GetCheatVarAt, char* (uint32 nOffset));
-    MOCK_METHOD1(AddConsoleVarSink, void (IConsoleVarSink * pSink));
-    MOCK_METHOD1(RemoveConsoleVarSink, void (IConsoleVarSink * pSink));
-    MOCK_METHOD1(GetHistoryElement, const char*(bool bUpOrDown));
-    MOCK_METHOD1(AddCommandToHistory, void (const char* szCommand));
-    MOCK_METHOD2(LoadConfigVar, void (const char* sVariable, const char* sValue));
-    MOCK_METHOD1(EnableActivationKey, void (bool bEnable));
-    MOCK_METHOD2(SetClientDataProbeString, void (const char* pName, const char* pValue));
-
-    // can't mock variadic methods, so just override here.
-    void Exit([[maybe_unused]] const char* command, ...) override {};
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_ICONSOLEMOCK_H
diff --git a/Code/CryEngine/CryCommon/Mocks/ICryPakMock.h b/Code/CryEngine/CryCommon/Mocks/ICryPakMock.h
deleted file mode 100644
index 7e2cf9e6c5..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/ICryPakMock.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzTest/AzTest.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzFramework/Archive/INestedArchive.h>
-#include <AzFramework/Archive/IArchive.h>
-
-
-struct CryPakMock
-    : AZ::IO::IArchive
-{
-    MOCK_METHOD5(AdjustFileName, const char*(AZStd::string_view src, char* dst, size_t dstSize, uint32_t nFlags, bool skipMods));
-    MOCK_METHOD1(Init, bool(AZStd::string_view szBasePath));
-    MOCK_METHOD0(Release, void());
-    MOCK_CONST_METHOD1(IsInstalledToHDD, bool(AZStd::string_view acFilePath));
-
-    MOCK_METHOD5(OpenPack, bool(AZStd::string_view, uint32_t, AZStd::intrusive_ptr<AZ::IO::MemoryBlock>, AZStd::fixed_string<AZ::IO::IArchive::MaxPath>*, bool));
-    MOCK_METHOD6(OpenPack, bool(AZStd::string_view, AZStd::string_view, uint32_t, AZStd::intrusive_ptr<AZ::IO::MemoryBlock>, AZStd::fixed_string<AZ::IO::IArchive::MaxPath>*, bool));
-    MOCK_METHOD3(OpenPacks, bool(AZStd::string_view pWildcard, uint32_t nFlags, AZStd::vector<AZStd::fixed_string<AZ::IO::IArchive::MaxPath>>* pFullPaths));
-    MOCK_METHOD4(OpenPacks, bool(AZStd::string_view pBindingRoot, AZStd::string_view pWildcard, uint32_t nFlags, AZStd::vector<AZStd::fixed_string<AZ::IO::IArchive::MaxPath>>* pFullPaths));
-    MOCK_METHOD2(ClosePack, bool(AZStd::string_view pName, uint32_t nFlags));
-    MOCK_METHOD2(ClosePacks, bool(AZStd::string_view pWildcard, uint32_t nFlags));
-    MOCK_METHOD1(FindPacks, bool(AZStd::string_view pWildcardIn));
-    MOCK_METHOD3(SetPacksAccessible, bool(bool bAccessible, AZStd::string_view pWildcard, uint32_t nFlags));
-    MOCK_METHOD3(SetPackAccessible, bool(bool bAccessible, AZStd::string_view pName, uint32_t nFlags));
-    MOCK_METHOD3(LoadPakToMemory, bool(AZStd::string_view pName, EInMemoryArchiveLocation eLoadToMemory, AZStd::intrusive_ptr<AZ::IO::MemoryBlock> pMemoryBlock));
-    MOCK_METHOD2(LoadPaksToMemory, void(int nMaxPakSize, bool bLoadToMemory));
-    MOCK_METHOD1(GetMod, const char*(int index));
-    MOCK_METHOD1(ParseAliases, void(AZStd::string_view szCommandLine));
-    MOCK_METHOD3(SetAlias, void(AZStd::string_view szName, AZStd::string_view szAlias, bool bAdd));
-    MOCK_METHOD2(GetAlias, const char*(AZStd::string_view szName, bool bReturnSame));
-    MOCK_METHOD0(Lock, void());
-    MOCK_METHOD0(Unlock, void());
-    MOCK_METHOD1(SetLocalizationFolder, void(AZStd::string_view sLocalizationFolder));
-    MOCK_CONST_METHOD0(GetLocalizationFolder, const char*());
-    MOCK_CONST_METHOD0(GetLocalizationRoot, const char*());
-    MOCK_METHOD3(FOpen, AZ::IO::HandleType(AZStd::string_view pName, const char* mode, uint32_t nFlags));
-    MOCK_METHOD4(FReadRaw, size_t(void* data, size_t length, size_t elems, AZ::IO::HandleType handle));
-    MOCK_METHOD3(FReadRawAll, size_t(void* data, size_t nFileSize, AZ::IO::HandleType handle));
-    MOCK_METHOD2(FGetCachedFileData, void*(AZ::IO::HandleType handle, size_t & nFileSize));
-    MOCK_METHOD4(FWrite, size_t(const void* data, size_t length, size_t elems, AZ::IO::HandleType handle));
-    MOCK_METHOD3(FGets, char*(char*, int, AZ::IO::HandleType));
-    MOCK_METHOD1(Getc, int(AZ::IO::HandleType));
-    MOCK_METHOD1(FGetSize, size_t(AZ::IO::HandleType f));
-    MOCK_METHOD2(FGetSize, size_t(AZStd::string_view pName, bool bAllowUseFileSystem));
-    MOCK_METHOD1(IsInPak, bool(AZ::IO::HandleType handle));
-    MOCK_METHOD1(RemoveFile, bool(AZStd::string_view pName));
-    MOCK_METHOD1(RemoveDir, bool(AZStd::string_view pName));
-    MOCK_METHOD1(IsAbsPath, bool(AZStd::string_view pPath));
-    MOCK_METHOD3(FSeek, size_t(AZ::IO::HandleType handle, uint64_t seek, int mode));
-    MOCK_METHOD1(FTell, uint64_t(AZ::IO::HandleType handle));
-    MOCK_METHOD1(FClose, int(AZ::IO::HandleType handle));
-    MOCK_METHOD1(FEof, int(AZ::IO::HandleType handle));
-    MOCK_METHOD1(FFlush, int(AZ::IO::HandleType handle));
-    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_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_METHOD1(IsFolder, bool(AZStd::string_view sPath));
-    MOCK_METHOD1(GetFileSizeOnDisk, AZ::IO::IArchive::SignedFileSize(AZStd::string_view filename));
-    MOCK_METHOD2(MakeDir, bool(AZStd::string_view szPath, bool bGamePathMapping));
-    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));
-    MOCK_METHOD1(GetFileArchivePath, const char* (AZ::IO::HandleType f));
-    MOCK_METHOD5(RawCompress, int(const void* pUncompressed, size_t* pDestSize, void* pCompressed, size_t nSrcSize, int nLevel));
-    MOCK_METHOD4(RawUncompress, int(void* pUncompressed, size_t* pDestSize, const void* pCompressed, size_t nSrcSize));
-    MOCK_METHOD1(RecordFileOpen, void(ERecordFileOpenList eList));
-    MOCK_METHOD2(RecordFile, void(AZ::IO::HandleType in, AZStd::string_view szFilename));
-    MOCK_METHOD1(GetResourceList, AZ::IO::IResourceList * (ERecordFileOpenList eList));
-    MOCK_METHOD2(SetResourceList, void(ERecordFileOpenList eList, AZ::IO::IResourceList * pResourceList));
-    MOCK_METHOD0(GetRecordFileOpenList, AZ::IO::IArchive::ERecordFileOpenList());
-    MOCK_METHOD2(ComputeCRC, uint32_t(AZStd::string_view szPath, uint32_t nFileOpenFlags));
-    MOCK_METHOD4(ComputeMD5, bool(AZStd::string_view szPath, uint8_t* md5, uint32_t nFileOpenFlags, bool useDirectAccess));
-    MOCK_METHOD1(RegisterFileAccessSink, void(AZ::IO::IArchiveFileAccessSink * pSink));
-    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_METHOD2(CheckFileAccessDisabled, bool(AZStd::string_view name, const char* mode));
-    MOCK_METHOD1(SetRenderThreadId, void(AZStd::thread_id renderThreadId));
-    MOCK_CONST_METHOD0(GetPakPriority, AZ::IO::ArchiveLocationPriority());
-    MOCK_CONST_METHOD1(GetFileOffsetOnMedia, uint64_t(AZStd::string_view szName));
-    MOCK_CONST_METHOD1(GetFileMediaType, EStreamSourceMediaType(AZStd::string_view szName));
-    MOCK_METHOD0(GetLevelPackOpenEvent, auto()->LevelPackOpenEvent*);
-    MOCK_METHOD0(GetLevelPackCloseEvent, auto()->LevelPackCloseEvent*);
-
-    // Implementations required for variadic functions
-    virtual int FPrintf([[maybe_unused]] AZ::IO::HandleType handle, [[maybe_unused]] const char* format, ...) PRINTF_PARAMS(3, 4)
-    {
-        return 0;
-    }
-};
-
diff --git a/Code/CryEngine/CryCommon/Mocks/ILogMock.h b/Code/CryEngine/CryCommon/Mocks/ILogMock.h
deleted file mode 100644
index 8cb6dfe1b3..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/ILogMock.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#include <ILog.h>
-
-class LogMock
-    : public ILog
-{
-public:
-    MOCK_METHOD3(LogV,
-        void(ELogType nType, const char* szFormat, va_list args));
-    MOCK_METHOD4(LogV,
-        void(ELogType nType, int flags, const char* szFormat, va_list args));
-    MOCK_METHOD0(Release,
-        void());
-    MOCK_METHOD2(SetFileName,
-        bool(const char* fileNameOrFullPath, bool doBackups));
-    MOCK_METHOD0(GetFileName,
-        const char*());
-    MOCK_METHOD0(GetBackupFileName,
-        const char*());
-
-    virtual void Log([[maybe_unused]] const char* szCommand, ...) override {}
-    virtual void LogWarning([[maybe_unused]] const char* szCommand, ...) override {}
-    virtual void LogError([[maybe_unused]] const char* szCommand, ...) override {}
-    virtual void LogAlways([[maybe_unused]] const char* szCommand, ...) override {}
-    virtual void LogPlus([[maybe_unused]] const char* command, ...) override {}
-    virtual void LogToFile([[maybe_unused]] const char* command, ...) override {}
-    virtual void LogToFilePlus([[maybe_unused]] const char* command, ...) override {}
-    virtual void LogToConsole([[maybe_unused]] const char* command, ...) override {}
-    virtual void LogToConsolePlus([[maybe_unused]] const char* command, ...) override {}
-    virtual void UpdateLoadingScreen([[maybe_unused]] const char* command, ...) override {}
-
-    MOCK_METHOD1(SetVerbosity,
-        void(int verbosity));
-    MOCK_METHOD0(GetVerbosityLevel,
-        int());
-    MOCK_METHOD1(AddCallback,
-        void(ILogCallback * pCallback));
-    MOCK_METHOD1(RemoveCallback,
-        void(ILogCallback * pCallback));
-    MOCK_METHOD0(Update,
-        void());
-    MOCK_METHOD0(GetModuleFilter,
-        const char*());
-    MOCK_CONST_METHOD1(GetMemoryUsage,
-        void(ICrySizer * pSizer));
-    MOCK_METHOD1(Indent,
-        void(class CLogIndenter * indenter));
-    MOCK_METHOD1(Unindent,
-        void(class CLogIndenter * indenter));
-    MOCK_METHOD0(FlushAndClose,
-        void());
-};
diff --git a/Code/CryEngine/CryCommon/Mocks/IRemoteConsoleMock.h b/Code/CryEngine/CryCommon/Mocks/IRemoteConsoleMock.h
deleted file mode 100644
index 4c1d1f460b..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/IRemoteConsoleMock.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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/CryEngine/CryCommon/Mocks/IRendererMock.h b/Code/CryEngine/CryCommon/Mocks/IRendererMock.h
deleted file mode 100644
index 9acd628056..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/IRendererMock.h
+++ /dev/null
@@ -1,853 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <IRenderer.h>
-#include <gmock/gmock.h>
-
-struct SRendItemSorter {};
-struct SRenderingPassInfo {};
-struct SClipVolumeBlendInfo {};
-struct SFogVolumeData {};
-
-// the following was generated using google's python script to autogenerate mocks.
-// however, it needed some hand-editing to make it work, so if you add functions to IRenderer,
-// it will probably be better to just manually add them here than try to run the script again
-// hand-edits are marked with 'hand-edit'.  Everything else was autogenerated.
-
-class IRendererMock
-    : public IRenderer
-{
-public:
-    MOCK_METHOD1(AddRenderDebugListener,
-        void(IRenderDebugListener * pRenderDebugListener));
-    MOCK_METHOD1(RemoveRenderDebugListener,
-        void(IRenderDebugListener * pRenderDebugListener));
-    MOCK_CONST_METHOD0(GetRenderType,
-        ERenderType());
-
-    // Hand-edit: Googlemock cannot handle 14 param functions.
-    WIN_HWND Init(int, int, int, int, unsigned int, int, int, bool, bool, WIN_HINSTANCE, WIN_HWND = 0,
-        bool = false, const SCustomRenderInitArgs*  = 0, bool = false) override { return nullptr; }
-
-    MOCK_METHOD0(PostInit,
-        void());
-    MOCK_CONST_METHOD0(IsPost3DRendererEnabled,
-        bool());
-    MOCK_METHOD0(GetFeatures,
-        int());
-
-    // Hand-edit: Googlemock doesn't like 'const void' as a return type:
-    const void SetApiVersion(const AZStd::string&) override {}
-    const void SetAdapterDescription(const AZStd::string&) override {}
-
-    MOCK_CONST_METHOD0(GetApiVersion,
-        const AZStd::string& ());
-    MOCK_CONST_METHOD0(GetAdapterDescription,
-        const AZStd::string& ());
-    MOCK_METHOD3(GetVideoMemoryUsageStats,
-        void(size_t&, size_t&, bool));
-    MOCK_CONST_METHOD0(GetNumGeomInstances,
-        int());
-    MOCK_CONST_METHOD0(GetNumGeomInstanceDrawCalls,
-        int());
-    MOCK_CONST_METHOD0(GetCurrentNumberOfDrawCalls,
-        int());
-    MOCK_CONST_METHOD2(GetCurrentNumberOfDrawCalls,
-        void(int& nGeneral, int& nShadowGen));
-    MOCK_CONST_METHOD1(GetCurrentNumberOfDrawCalls,
-        int(uint32 EFSListMask));
-    MOCK_CONST_METHOD1(GetCurrentDrawCallRTTimes,
-        float(uint32 EFSListMask));
-    MOCK_METHOD1(SetDebugRenderNode,
-        void(IRenderNode * pRenderNode));
-    MOCK_CONST_METHOD1(IsDebugRenderNode,
-        bool(IRenderNode * pRenderNode));
-    MOCK_METHOD1(DeleteContext,
-        bool(WIN_HWND hWnd));
-    MOCK_METHOD4(CreateContext,
-        bool(WIN_HWND, bool, int, int));
-    MOCK_METHOD1(SetCurrentContext,
-        bool(WIN_HWND hWnd));
-    MOCK_METHOD0(MakeMainContextActive,
-        void());
-    MOCK_METHOD0(GetCurrentContextHWND,
-        WIN_HWND());
-    MOCK_METHOD0(IsCurrentContextMainVP,
-        bool());
-    MOCK_CONST_METHOD0(GetCurrentContextViewportHeight,
-        int());
-    MOCK_CONST_METHOD0(GetCurrentContextViewportWidth,
-        int());
-    MOCK_METHOD1(ShutDown,
-        void(bool));
-    MOCK_METHOD0(ShutDownFast,
-        void());
-    MOCK_METHOD1(EnumDisplayFormats,
-        int(SDispFormat * Formats));
-    MOCK_METHOD1(EnumAAFormats,
-        int(SAAFormat * Formats));
-    MOCK_METHOD6(ChangeResolution,
-        bool(int nNewWidth, int nNewHeight, int nNewColDepth, int nNewRefreshHZ, bool bFullScreen, bool bForceReset));
-    MOCK_METHOD0(BeginFrame,
-        void());
-    MOCK_METHOD1(InitSystemResources,
-        void(int nFlags));
-    MOCK_METHOD0(InitTexturesSemantics,
-        void());
-    MOCK_METHOD1(FreeResources,
-        void(int nFlags));
-    MOCK_METHOD0(Release,
-        void());
-    MOCK_METHOD1(RenderDebug,
-        void(bool));
-    MOCK_METHOD0(EndFrame,
-        void());
-    MOCK_METHOD0(ForceSwapBuffers,
-        void());
-    MOCK_METHOD0(TryFlush,
-        void());
-    MOCK_CONST_METHOD4(GetViewport,
-        void(int* x, int* y, int* width, int* height));
-    MOCK_METHOD5(SetViewport,
-        void(int, int, int, int, int));
-    MOCK_METHOD4(SetRenderTile,
-        void(f32, f32, f32, f32));
-    MOCK_METHOD4(SetScissor,
-        void(int, int, int, int));
-    MOCK_METHOD0(GetViewProjectionMatrix,
-        Matrix44A & ());
-    MOCK_METHOD1(SetTranspOrigCameraProjMatrix,
-        void(Matrix44A & matrix));
-    MOCK_METHOD2(GetScreenAspect,
-        EScreenAspectRatio(int nWidth, int nHeight));
-    MOCK_METHOD2(SetViewportDownscale,
-        Vec2(float xscale, float yscale));
-    MOCK_METHOD1(SetViewParameters,
-        void(const CameraViewParameters& viewParameters));
-    MOCK_METHOD1(ApplyViewParameters,
-        void(const CameraViewParameters& viewParameters));
-    MOCK_METHOD5(DrawDynVB,
-        void(SVF_P3F_C4B_T2F * pBuf, uint16 * pInds, int nVerts, int nInds, PublicRenderPrimitiveType nPrimType));
-
-    // Hand-edit: google mock has issues with DynUiPrimitiveList
-    void DrawDynUiPrimitiveList([[maybe_unused]] DynUiPrimitiveList& primitives, [[maybe_unused]] int totalNumVertices, [[maybe_unused]] int totalNumIndices) override { return; }
-
-    MOCK_METHOD1(SetCamera,
-        void(const CCamera& cam));
-    MOCK_METHOD0(GetCamera,
-        const CCamera& ());
-    MOCK_METHOD1(GetRenderViewForThread,
-        CRenderView * (int nThreadID));
-    MOCK_METHOD1(SetGammaDelta,
-        bool(float fGamma));
-    MOCK_METHOD0(RestoreGamma,
-        void(void));
-    MOCK_METHOD3(ChangeDisplay,
-        bool(unsigned int width, unsigned int height, unsigned int cbpp));
-    MOCK_METHOD7(ChangeViewport,
-        void(unsigned int, unsigned int, unsigned int, unsigned int, bool, float, float));
-    MOCK_CONST_METHOD6(SaveTga,
-        bool(unsigned char* sourcedata, int sourceformat, int w, int h, const char* filename, bool flip));
-    MOCK_METHOD1(SetTexture,
-        void(int tnum));
-    MOCK_METHOD2(SetTexture,
-        void(int tnum, int nUnit));
-    MOCK_METHOD0(SetWhiteTexture,
-        void());
-    MOCK_CONST_METHOD0(GetWhiteTextureId,
-        int());
-    MOCK_CONST_METHOD0(GetBlackTextureId,
-        int());
-
-    // Hand-edit: google mock can only do up to 10 parameters
-    void Draw2dImage(float, float, float, float, int, float, float, float, float, float, float, float, float, float, float) override {};
-    MOCK_METHOD1(Draw2dImageStretchMode,
-        void(bool stretch));
-
-    // Hand-edit: google mock can only do up to 10 parameters
-    void Push2dImage(float, float, float, float, int, float, float, float, float, float, float, float, float, float, float, float) override {};
-
-    MOCK_METHOD0(Draw2dImageList,
-        void());
-
-    // Hand-edit:  Hand-edit: google mock can only do up to 10 parameters
-    void DrawImage(float, float, float, float, int, float, float, float, float, float, float, float, float, bool) override {}
-
-    // Hand-edit: google mock can only do up to 10 parameters
-    void DrawImageWithUV(float, float, float, float, float, int, float*, float*, float, float, float, float, bool) override {}
-
-    MOCK_METHOD1(PushWireframeMode,
-        void(int mode));
-    MOCK_METHOD0(PopWireframeMode,
-        void());
-    MOCK_CONST_METHOD0(GetHeight,
-        int());
-    MOCK_CONST_METHOD0(GetWidth,
-        int());
-    MOCK_CONST_METHOD0(GetPixelAspectRatio,
-        float());
-    MOCK_CONST_METHOD0(GetOverlayHeight,
-        int());
-    MOCK_CONST_METHOD0(GetOverlayWidth,
-        int());
-    MOCK_CONST_METHOD0(GetMaxSquareRasterDimension,
-        int());
-    MOCK_METHOD0(SwitchToNativeResolutionBackbuffer,
-        void());
-    MOCK_METHOD1(GetMemoryUsage,
-        void(ICrySizer * Sizer));
-    MOCK_METHOD1(GetBandwidthStats,
-        void(float* fBandwidthRequested));
-    MOCK_METHOD1(SetTextureStreamListener,
-        void(ITextureStreamListener * pListener));
-    MOCK_METHOD2(GetOcclusionBuffer,
-        int(uint16 * pOutOcclBuffer, Matrix44 * pmCamBuffer));
-    MOCK_METHOD2(ScreenShot,
-        bool(const char*, int));
-    MOCK_METHOD0(GetColorBpp,
-        int());
-    MOCK_METHOD0(GetDepthBpp,
-        int());
-    MOCK_METHOD0(GetStencilBpp,
-        int());
-    MOCK_CONST_METHOD0(IsStereoEnabled,
-        bool());
-    MOCK_CONST_METHOD0(GetNearestRangeMax,
-        float());
-    MOCK_METHOD0(GetPerInstanceConstantBufferPoolPointer,
-        PerInstanceConstantBufferPool * ());
-    MOCK_METHOD6(ProjectToScreen,
-        bool(float ptx, float pty, float ptz, float* sx, float* sy, float* sz));
-    MOCK_METHOD9(UnProject,
-        int(float sx, float sy, float sz, float* px, float* py, float* pz, const float modelMatrix[16], const float projMatrix[16], const int viewport[4]));
-    MOCK_METHOD6(UnProjectFromScreen,
-        int(float sx, float sy, float sz, float* px, float* py, float* pz));
-    MOCK_METHOD1(GetModelViewMatrix,
-        void(float* mat));
-    MOCK_METHOD1(GetProjectionMatrix,
-        void(float* mat));
-    MOCK_METHOD7(WriteDDS,
-        bool(const byte * dat, int wdt, int hgt, int Size, const char* name, ETEX_Format eF, int NumMips));
-    MOCK_METHOD6(WriteTGA,
-        bool(const byte * dat, int wdt, int hgt, const char* name, int src_bits_per_pixel, int dest_bits_per_pixel));
-    MOCK_METHOD6(WriteJPG,
-        bool(const byte*, int, int, char*, int, int));
-    MOCK_METHOD6(FontCreateTexture,
-        int(int, int, byte*, ETEX_Format, bool, const char*));
-    MOCK_METHOD6(FontUpdateTexture,
-        bool(int nTexId, int X, int Y, int USize, int VSize, byte * pData));
-    MOCK_METHOD2(FontSetTexture,
-        void(int nTexId, int nFilterMode));
-    MOCK_METHOD2(FontSetRenderingState,
-        void(bool overrideViewProjMatrices, TransformationMatrices & backupMatrices));
-    MOCK_METHOD3(FontSetBlending,
-        void(int src, int dst, int baseState));
-    MOCK_METHOD2(FontRestoreRenderingState,
-        void(bool overrideViewProjMatrices, const TransformationMatrices& restoringMatrices));
-    MOCK_METHOD3(FlushRTCommands,
-        bool(bool bWait, bool bImmediatelly, bool bForce));
-    MOCK_CONST_METHOD7(DrawStringU,
-        void(IFFont_RenderProxy * pFont, float x, float y, float z, const char* pStr, bool asciiMultiLine, const STextDrawContext& ctx));
-    MOCK_METHOD0(RT_CurThreadList,
-        int());
-    MOCK_METHOD6(EF_PrecacheResource,
-        bool(SShaderItem*, float, float, int, int, int));
-    MOCK_METHOD4(EF_PrecacheResource,
-        bool(IShader * pSH, float fMipFactor, float fTimeToReady, int Flags));
-    MOCK_METHOD6(EF_PrecacheResource,
-        bool(ITexture*, float, float, int, int, int));
-    MOCK_METHOD6(EF_PrecacheResource,
-        bool(IRenderMesh * pPB, _smart_ptr<IMaterial> pMaterial, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId));
-    MOCK_METHOD5(EF_PrecacheResource,
-        bool(CDLight * pLS, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId));
-
-    // Hand-edit: google mock can only do up to 10 parameters
-    ITexture* EF_CreateCompositeTexture([[maybe_unused]] int type, [[maybe_unused]] const char* szName, [[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] int nDepth, [[maybe_unused]] int nMips, [[maybe_unused]] int nFlags, [[maybe_unused]] ETEX_Format eTF, [[maybe_unused]] const STexComposition* pCompositions, [[maybe_unused]] size_t nCompositions, [[maybe_unused]] int8 nPriority = -1) override { return nullptr; }
-
-    MOCK_METHOD0(PostLevelLoading,
-        void());
-    MOCK_METHOD0(PostLevelUnload,
-        void());
-    MOCK_METHOD10(EF_AddPolygonToScene,
-        CRenderObject * (SShaderItem & si, int numPts, const SVF_P3F_C4B_T2F * verts, const SPipTangents * tangs, CRenderObject * obj, const SRenderingPassInfo& passInfo, uint16 * inds, int ninds, int nAW, const SRendItemSorter& rendItemSorter));
-    MOCK_METHOD10(EF_AddPolygonToScene,
-        CRenderObject * (SShaderItem & si, CRenderObject * obj, const SRenderingPassInfo& passInfo, int numPts, int ninds, SVF_P3F_C4B_T2F * &verts, SPipTangents * &tangs, uint16 * &inds, int nAW, const SRendItemSorter& rendItemSorter));
-    MOCK_METHOD0(ForceUpdateGlobalShaderParameters,
-        void());
-    MOCK_METHOD0(EF_GetShaderMissLogPath,
-        const char*());
-    MOCK_METHOD1(EF_GetShaderNames,
-        string * (int& nNumShaders));
-    MOCK_METHOD1(EF_ReloadFile,
-        bool(const char* szFileName));
-    MOCK_METHOD1(EF_ReloadFile_Request,
-        bool(const char* szFileName));
-    MOCK_METHOD3(EF_GetRemapedShaderMaskGen,
-        uint64(const char*, uint64, bool));
-    MOCK_METHOD3(EF_GetShaderGlobalMaskGenFromString,
-        uint64(const char*, const char*, uint64));
-    MOCK_METHOD2(EF_GetStringFromShaderGlobalMaskGen,
-        AZStd::string(const char*, uint64));
-    MOCK_CONST_METHOD1(GetShaderProfile,
-        const SShaderProfile& (EShaderType eST));
-    MOCK_METHOD2(EF_SetShaderQuality,
-        void(EShaderType eST, EShaderQuality eSQ));
-    MOCK_CONST_METHOD0(EF_GetRenderQuality,
-        ERenderQuality());
-    MOCK_METHOD1(EF_GetShaderQuality,
-        EShaderQuality(EShaderType eST));
-    MOCK_METHOD5(EF_LoadShaderItem,
-        SShaderItem(const char*, bool, int, SInputShaderResources*, uint64));
-    MOCK_METHOD3(EF_LoadShader,
-        IShader * (const char*, int, uint64));
-    MOCK_METHOD1(EF_ReloadShaderFiles,
-        void(int nCategory));
-    MOCK_METHOD0(EF_ReloadTextures,
-        void());
-    MOCK_METHOD1(EF_GetTextureByID,
-        ITexture * (int Id));
-    MOCK_METHOD2(EF_GetTextureByName,
-        ITexture * (const char*, uint32));
-    MOCK_METHOD2(EF_LoadTexture,
-        ITexture * (const char*, uint32));
-    MOCK_METHOD2(EF_LoadCubemapTexture,
-        ITexture * (const char*, uint32));
-    MOCK_METHOD1(EF_LoadDefaultTexture,
-        ITexture * (const char* nameTex));
-    MOCK_METHOD1(EF_LoadLightmap,
-        int(const char* name));
-    MOCK_METHOD1(EF_StartEf,
-        void(const SRenderingPassInfo& passInfo));
-    MOCK_METHOD3(EF_GetObjData,
-        SRenderObjData * (CRenderObject * pObj, bool bCreate, int nThreadID));
-    MOCK_METHOD1(EF_GetObject_Temp,
-        CRenderObject * (int nThreadID));
-    MOCK_METHOD2(EF_DuplicateRO,
-        CRenderObject * (CRenderObject * pObj, const SRenderingPassInfo& passInfo));
-    MOCK_METHOD7(EF_AddEf,
-        void(IRenderElement * pRE, SShaderItem & pSH, CRenderObject * pObj, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter));
-    MOCK_METHOD4(EF_EndEf3D,
-        void(int nFlags, int nPrecacheUpdateId, int nNearPrecacheUpdateId, const SRenderingPassInfo& passInfo));
-    MOCK_METHOD1(EF_InvokeShadowMapRenderJobs,
-        void(int nFlags));
-    MOCK_METHOD1(EF_IsFakeDLight,
-        bool(const CDLight * Source));
-    MOCK_METHOD2(EF_ADDDlight,
-        void(CDLight * Source, const SRenderingPassInfo& passInfo));
-    MOCK_METHOD1(EF_UpdateDLight,
-        bool(SRenderLight * pDL));
-    MOCK_METHOD1(EF_AddDeferredDecal,
-        bool(const SDeferredDecal& rDecal));
-    MOCK_METHOD4(EF_AddDeferredLight,
-        int(const CDLight& pLight, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter));
-    MOCK_METHOD1(EF_GetDeferredLightsNum,
-        uint32(eDeferredLightType));
-    MOCK_METHOD0(EF_ClearDeferredLightsList,
-        void());
-    MOCK_METHOD1(EF_AddDeferredClipVolume,
-        uint8(const IClipVolume * pClipVolume));
-    MOCK_METHOD2(EF_SetDeferredClipVolumeBlendData,
-        bool(const IClipVolume * pClipVolume, const SClipVolumeBlendInfo& blendInfo));
-    MOCK_METHOD0(EF_ClearDeferredClipVolumesList,
-        void());
-    MOCK_METHOD0(EF_ReleaseDeferredData,
-        void());
-    MOCK_METHOD1(EF_ReleaseInputShaderResource,
-        void(SInputShaderResources * pRes));
-    MOCK_METHOD3(EF_SetPostEffectParam,
-        void(const char*, float, bool));
-    MOCK_METHOD3(EF_SetPostEffectParamVec4,
-        void(const char*, const Vec4&, bool));
-    MOCK_METHOD2(EF_SetPostEffectParamString,
-        void(const char* pParam, const char* pszArg));
-    MOCK_METHOD2(EF_GetPostEffectParam,
-        void(const char* pParam, float& fValue));
-    MOCK_METHOD2(EF_GetPostEffectParamVec4,
-        void(const char* pParam, Vec4 & pValue));
-    MOCK_METHOD2(EF_GetPostEffectParamString,
-        void(const char* pParam, const char* & pszArg));
-    MOCK_METHOD1(EF_GetPostEffectID,
-        int32(const char* pPostEffectName));
-    MOCK_METHOD1(EF_ResetPostEffects,
-        void(bool));
-    MOCK_METHOD0(SyncPostEffects,
-        void());
-    MOCK_METHOD0(EF_DisableTemporalEffects,
-        void());
-    MOCK_METHOD3(EF_AddWaterSimHit,
-        void(const Vec3& vPos, float scale, float strength));
-    MOCK_METHOD0(EF_DrawWaterSimHits,
-        void());
-    MOCK_METHOD1(EF_EndEf2D,
-        void(bool bSort));
-    MOCK_METHOD0(ForceGC,
-        void());
-    MOCK_CONST_METHOD0(GetPolyCount,
-        int());
-    MOCK_CONST_METHOD2(GetPolyCount,
-        void(int& nPolygons, int& nShadowVolPolys));
-    MOCK_METHOD1(SetClearColor,
-        void(const Vec3& vColor));
-    MOCK_METHOD1(SetClearBackground,
-        void(bool bClearBackground));
-    MOCK_METHOD4(CreateRenderMesh,
-        _smart_ptr<IRenderMesh>(const char*, const char*, IRenderMesh::SInitParamerers*, ERenderMeshType));
-
-    // Hand-edit: google mock can only do up to 10 parameters
-    virtual _smart_ptr<IRenderMesh> CreateRenderMeshInitialized(
-        const void*, int, const AZ::Vertex::Format&, const vtx_idx*, int, const PublicRenderPrimitiveType,
-        const char*, const char*, ERenderMeshType = eRMT_Static, int = 1, int = 0,
-        [[maybe_unused]] bool (*PrepareBufferCallback)(IRenderMesh*, bool) = nullptr, void* = nullptr, bool = false, bool = true,
-        const SPipTangents* = nullptr, bool = false, Vec3* = nullptr)
-    {
-        return _smart_ptr<IRenderMesh>();
-    }
-
-    MOCK_METHOD1(GetFrameID,
-        int(bool));
-    MOCK_CONST_METHOD0(GetCameraFrameID,
-        int());
-    MOCK_CONST_METHOD0(IsRenderToTextureActive,
-        bool());
-    MOCK_METHOD4(MakeMatrix,
-        void(const Vec3& pos, const Vec3& angles, const Vec3& scale, Matrix34 * mat));
-    MOCK_METHOD4(DrawTextQueued,
-        void(Vec3 pos, SDrawTextInfo & ti, const char* format, va_list args));
-    MOCK_METHOD3(DrawTextQueued,
-        void(Vec3 pos, SDrawTextInfo & ti, const char* text));
-    MOCK_CONST_METHOD1(ScaleCoordX,
-        float(float value));
-    MOCK_CONST_METHOD1(ScaleCoordY,
-        float(float value));
-    MOCK_CONST_METHOD2(ScaleCoord,
-        void(float& x, float& y));
-    MOCK_METHOD2(SetState,
-        void(int, int));
-    MOCK_METHOD1(SetCullMode,
-        void(int));
-    MOCK_METHOD5(SetStencilState,
-        void(int, uint32, uint32, uint32, bool));
-    MOCK_METHOD1(PushProfileMarker,
-        void(const char* label));
-    MOCK_METHOD1(PopProfileMarker,
-        void(const char* label));
-    MOCK_METHOD1(EnableFog,
-        bool(bool enable));
-    MOCK_METHOD1(SetFogColor,
-        void(const ColorF& color));
-    MOCK_METHOD4(SetColorOp,
-        void(byte eCo, byte eAo, byte eCa, byte eAa));
-    MOCK_METHOD1(SetSrgbWrite,
-        void(bool srgbWrite));
-    MOCK_METHOD1(RequestFlushAllPendingTextureStreamingJobs,
-        void(int nFrames));
-    MOCK_METHOD1(SetTexturesStreamingGlobalMipFactor,
-        void(float fFactor));
-    MOCK_METHOD1(GetIRenderAuxGeom,
-        IRenderAuxGeom * (void*));
-    MOCK_METHOD0(GetISvoRenderer,
-        ISvoRenderer * ());
-    MOCK_METHOD0(GetIColorGradingController,
-        IColorGradingController * ());
-    MOCK_METHOD0(GetIStereoRenderer,
-        IStereoRenderer * ());
-    MOCK_METHOD7(Create2DTexture,
-        ITexture * (const char* name, int width, int height, int numMips, int flags, unsigned char* data, ETEX_Format format));
-
-    void TextToScreen([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] const char* format, ...) override {}
-    void TextToScreenColor([[maybe_unused]] int x, [[maybe_unused]] int y, [[maybe_unused]] float r, [[maybe_unused]] float g, [[maybe_unused]] float b, [[maybe_unused]] float a, [[maybe_unused]] const char* format, ...) override {}
-
-    MOCK_METHOD0(ResetToDefault,
-        void());
-    MOCK_METHOD4(SetMaterialColor,
-        void(float r, float g, float b, float a));
-    MOCK_METHOD0(SetDefaultRenderStates,
-        void());
-    MOCK_METHOD10(Graph,
-        void(byte * g, int x, int y, int wdt, int hgt, int nC, int type, const char* text, ColorF & color, float fScale));
-    MOCK_METHOD0(EF_RenderTextMessages,
-        void());
-    MOCK_METHOD1(ClearTargetsImmediately,
-        void(uint32 nFlags));
-    MOCK_METHOD3(ClearTargetsImmediately,
-        void(uint32 nFlags, const ColorF& Colors, float fDepth));
-    MOCK_METHOD2(ClearTargetsImmediately,
-        void(uint32 nFlags, const ColorF& Colors));
-    MOCK_METHOD2(ClearTargetsImmediately,
-        void(uint32 nFlags, float fDepth));
-    MOCK_METHOD1(ClearTargetsLater,
-        void(uint32 nFlags));
-    MOCK_METHOD3(ClearTargetsLater,
-        void(uint32 nFlags, const ColorF& Colors, float fDepth));
-    MOCK_METHOD2(ClearTargetsLater,
-        void(uint32 nFlags, const ColorF& Colors));
-    MOCK_METHOD2(ClearTargetsLater,
-        void(uint32 nFlags, float fDepth));
-    MOCK_METHOD8(ReadFrameBuffer,
-        void(unsigned char*, int, int, int, ERB_Type, bool, int, int));
-    MOCK_METHOD4(ReadFrameBufferFast,
-        void(uint32*, int, int, bool));
-    MOCK_METHOD1(EnableVSync,
-        void(bool enable));
-    MOCK_METHOD1(CreateResourceAsync,
-        void(SResourceAsync * Resource));
-    MOCK_METHOD1(ReleaseResourceAsync,
-        void(SResourceAsync * Resource));
-    MOCK_METHOD1(ReleaseResourceAsync,
-        void(AZStd::unique_ptr<SResourceAsync> Resource));
-
-    // Hand-edit: google mock can only do up to 10 parameters
-    unsigned int DownLoadToVideoMemory(const byte*, int, int, ETEX_Format, ETEX_Format, int, bool  = true,
-        int  = FILTER_BILINEAR, int  = 0, const char*  = nullptr, int  = 0, EEndian  = eLittleEndian,
-        RectI*  = nullptr, bool  = false) override { return 0; }
-
-    unsigned int DownLoadToVideoMemory3D(const byte*, int, int, [[maybe_unused]] int d, ETEX_Format, ETEX_Format, int, bool  = true,
-        int  = FILTER_BILINEAR, int  = 0, const char*  = nullptr, int  = 0, EEndian  = eLittleEndian,
-        RectI*  = nullptr, bool  = false) override { return 0; }
-
-    unsigned int DownLoadToVideoMemoryCube(const byte*, int, int, ETEX_Format, ETEX_Format, int, bool  = true,
-        int  = FILTER_BILINEAR, int  = 0, const char*  = nullptr, int  = 0, EEndian  = eLittleEndian,
-        RectI*  = nullptr, bool  = false) override { return 0; }
-
-    MOCK_METHOD9(UpdateTextureInVideoMemory,
-        void(uint32, const byte*, int, int, int, int, ETEX_Format, int, int));
-    MOCK_METHOD8(DXTCompress,
-        bool(const byte * raw_data, int nWidth, int nHeight, ETEX_Format eTF, bool bUseHW, bool bGenMips, int nSrcBytesPerPix, MIPDXTcallback callback));
-    MOCK_METHOD9(DXTDecompress,
-        bool(const byte * srcData, size_t srcFileSize, byte * dstData, int nWidth, int nHeight, int nMips, ETEX_Format eSrcTF, bool bUseHW, int nDstBytesPerPix));
-    MOCK_METHOD1(RemoveTexture,
-        void(unsigned int TextureId));
-    MOCK_METHOD1(DeleteFont,
-        void(IFFont * font));
-    MOCK_METHOD3(CaptureFrameBufferFast,
-        bool(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight));
-    MOCK_METHOD3(CopyFrameBufferFast,
-        bool(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight));
-    MOCK_METHOD1(RegisterCaptureFrame,
-        bool(ICaptureFrameListener * pCapture));
-    MOCK_METHOD1(UnRegisterCaptureFrame,
-        bool(ICaptureFrameListener * pCapture));
-    MOCK_METHOD2(InitCaptureFrameBufferFast,
-        bool(uint32, uint32));
-    MOCK_METHOD0(CloseCaptureFrameBufferFast,
-        void(void));
-    MOCK_METHOD0(CaptureFrameBufferCallBack,
-        void(void));
-    MOCK_METHOD1(RegisterSyncWithMainListener,
-        void(ISyncMainWithRenderListener * pListener));
-    MOCK_METHOD1(RemoveSyncWithMainListener,
-        void(const ISyncMainWithRenderListener * pListener));
-    MOCK_METHOD5(Set2DMode,
-        void(uint32, uint32, TransformationMatrices&, float, float));
-    MOCK_METHOD1(Unset2DMode,
-        void(const TransformationMatrices& restoringMatrices));
-    MOCK_METHOD7(Set2DModeNonZeroTopLeft,
-        void(float, float, float, float, TransformationMatrices&, float, float));
-    MOCK_METHOD1(ScreenToTexture,
-        int(int nTexID));
-    MOCK_METHOD1(EnableSwapBuffers,
-        void(bool bEnable));
-    MOCK_METHOD0(GetHWND,
-        WIN_HWND());
-    MOCK_METHOD1(SetWindowIcon,
-        bool(const char* path));
-    MOCK_METHOD1(OnEntityDeleted,
-        void(struct IRenderNode* pRenderNode));
-    MOCK_METHOD5(CreateRenderTarget,
-        int(const char* name, int nWidth, int nHeight, const ColorF& clearColor, ETEX_Format eTF));
-    MOCK_METHOD1(DestroyRenderTarget,
-        bool(int nHandle));
-    MOCK_METHOD3(ResizeRenderTarget,
-        bool(int nHandle, int nWidth, int nHeight));
-    MOCK_METHOD2(SetRenderTarget,
-        bool(int, SDepthTexture*));
-    MOCK_METHOD3(CreateDepthSurface,
-        SDepthTexture * (int, int, bool));
-    MOCK_METHOD1(DestroyDepthSurface,
-        void(SDepthTexture * pDepthSurf));
-    MOCK_METHOD1(PauseTimer,
-        void(bool bPause));
-    MOCK_METHOD0(CreateShaderPublicParams,
-        IShaderPublicParams * ());
-    MOCK_CONST_METHOD2(GetThreadIDs,
-        void(threadID & mainThreadID, threadID & renderThreadID));
-    MOCK_METHOD1(EnableGPUTimers2,
-        void(bool bEnabled));
-    MOCK_METHOD1(AllowGPUTimers2,
-        void(bool bAllow));
-    MOCK_CONST_METHOD2(GetRPPStats,
-        const RPProfilerStats * (ERenderPipelineProfilerStats, bool));
-    MOCK_CONST_METHOD1(GetRPPStatsArray,
-        const RPProfilerStats * (bool));
-    MOCK_METHOD4(GetPolygonCountByType,
-        int(uint32, EVertexCostTypes, uint32, bool));
-    MOCK_METHOD5(SetCloudShadowsParams,
-        void(int nTexID, const Vec3& speed, float tiling, bool invert, float brightness));
-    MOCK_METHOD2(PushFogVolumeContribution,
-        uint16(const SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo));
-    MOCK_METHOD2(PushFogVolume,
-        void(class CREFogVolume * pFogVolume, const SRenderingPassInfo& passInfo));
-    MOCK_METHOD0(GetMaxTextureSize,
-        int());
-    MOCK_METHOD1(GetTextureFormatName,
-        const char*(ETEX_Format eTF));
-    MOCK_METHOD5(GetTextureFormatDataSize,
-        int(int nWidth, int nHeight, int nDepth, int nMips, ETEX_Format eTF));
-    MOCK_METHOD2(SetDefaultMaterials,
-        void(_smart_ptr<IMaterial> pDefMat, _smart_ptr<IMaterial> pTerrainDefMat));
-    MOCK_CONST_METHOD0(GetGPUParticleEngine,
-        IGPUParticleEngine * ());
-    MOCK_CONST_METHOD0(GetActiveGPUCount,
-        uint32());
-    MOCK_METHOD0(GetShadowFrustumMGPUCache,
-        ShadowFrustumMGPUCache * ());
-
-    MOCK_CONST_METHOD0(GetCachedShadowsResolution,
-        const StaticArray<int, MAX_GSM_LODS_NUM>&());
-
-    MOCK_METHOD1(SetCachedShadowsResolution,
-        void(const StaticArray<int, MAX_GSM_LODS_NUM>&arrResolutions));
-    MOCK_CONST_METHOD1(UpdateCachedShadowsLodCount,
-        void(int nGsmLods));
-    MOCK_METHOD1(SetTexturePrecaching,
-        void(bool stat));
-    MOCK_METHOD2(RT_InsertGpuCallback,
-        void(uint32 context, GpuCallbackFunc callback));
-    MOCK_METHOD1(EnablePipelineProfiler,
-        void(bool bEnable));
-    MOCK_METHOD1(GetRenderTimes,
-        void(SRenderTimes & outTimes));
-    MOCK_METHOD0(GetGPUFrameTime,
-        float());
-    MOCK_METHOD1(EnableBatchMode,
-        void(bool enable));
-    MOCK_METHOD1(EnableLevelUnloading,
-        void(bool enable));
-    MOCK_METHOD0(OnLevelLoadFailed,
-        void());
-#if !defined(_RELEASE)
-    MOCK_METHOD1(GetDrawCallsInfoPerMesh,
-        RNDrawcallsMapMesh & (bool));
-    MOCK_METHOD1(GetDrawCallsInfoPerMeshPreviousFrame,
-        RNDrawcallsMapMesh & (bool));
-    MOCK_METHOD1(GetDrawCallsInfoPerNodePreviousFrame,
-        RNDrawcallsMapNode & (bool));
-    MOCK_METHOD1(GetDrawCallsPerNode,
-        int(IRenderNode * pRenderNode));
-    MOCK_METHOD1(ForceRemoveNodeFromDrawCallsMap,
-        void(IRenderNode * pNode));
-#endif
-    MOCK_METHOD1(CollectDrawCallsInfo,
-        void(bool status));
-    MOCK_METHOD1(CollectDrawCallsInfoPerNode,
-        void(bool status));
-    MOCK_METHOD0(HasLoadedDefaultResources,
-        bool());
-    MOCK_METHOD3(EF_CreateSkinningData,
-        SSkinningData * (uint32, bool, bool));
-    MOCK_METHOD4(EF_CreateRemappedSkinningData,
-        SSkinningData * (uint32 nNumBones, SSkinningData * pSourceSkinningData, uint32 nCustomDataSize, uint32 pairGuid));
-    MOCK_METHOD0(EF_ClearSkinningDataPool,
-        void());
-    MOCK_METHOD0(EF_GetSkinningPoolID,
-        int());
-    MOCK_METHOD1(ClearShaderItem,
-        void(SShaderItem * pShaderItem));
-    MOCK_METHOD2(UpdateShaderItem,
-        void(SShaderItem * pShaderItem, _smart_ptr<IMaterial> pMaterial));
-    MOCK_METHOD2(ForceUpdateShaderItem,
-        void(SShaderItem * pShaderItem, _smart_ptr<IMaterial> pMaterial));
-    MOCK_METHOD2(RefreshShaderResourceConstants,
-        void(SShaderItem * pShaderItem, IMaterial * pMaterial));
-    MOCK_METHOD0(IsStereoModeChangePending,
-        bool());
-    MOCK_METHOD1(LockParticleVideoMemory,
-        void(uint32 nId));
-    MOCK_METHOD1(UnLockParticleVideoMemory,
-        void(uint32 nId));
-    MOCK_METHOD1(BeginSpawningGeneratingRendItemJobs,
-        void(int nThreadID));
-    MOCK_METHOD1(BeginSpawningShadowGeneratingRendItemJobs,
-        void(int nThreadID));
-    MOCK_METHOD0(EndSpawningGeneratingRendItemJobs,
-        void());
-    MOCK_METHOD1(StartLoadtimePlayback,
-        void(ILoadtimeCallback* pCallback));
-    MOCK_METHOD0(StopLoadtimePlayback,
-        void());
-
-    MOCK_METHOD0(GetGenerateRendItemJobExecutor,
-        AZ::LegacyJobExecutor*());
-    MOCK_METHOD0(GetGenerateShadowRendItemJobExecutor,
-        AZ::LegacyJobExecutor*());
-    MOCK_METHOD0(GetGenerateRendItemJobExecutorPreProcess,
-        AZ::LegacyJobExecutor*());
-    MOCK_METHOD1(GetFinalizeRendItemJobExecutor,
-        AZ::LegacyJobExecutor*(int nThreadID));
-    MOCK_METHOD1(GetFinalizeShadowRendItemJobExecutor,
-        AZ::LegacyJobExecutor*(int nThreadID));
-    MOCK_METHOD0(FlushPendingTextureTasks,
-        void());
-    MOCK_METHOD1(SetShadowJittering,
-        void(float fShadowJittering));
-    MOCK_CONST_METHOD0(GetShadowJittering,
-        float());
-    MOCK_METHOD0(LoadShaderStartupCache,
-        bool());
-    MOCK_METHOD0(UnloadShaderStartupCache,
-        void());
-    MOCK_METHOD0(LoadShaderLevelCache,
-        bool());
-    MOCK_METHOD0(UnloadShaderLevelCache,
-        void());
-    MOCK_METHOD1(StartScreenShot,
-        void(int e_ScreenShot));
-    MOCK_METHOD1(EndScreenShot,
-        void(int e_ScreenShot));
-    MOCK_METHOD3(SetRendererCVar,
-        void(ICVar*, const char*, bool));
-    MOCK_METHOD0(GetRenderPipeline,
-        SRenderPipeline * ());
-    MOCK_METHOD0(GetShaderManager,
-        CShaderMan * ());
-    MOCK_METHOD0(GetRenderThread,
-        SRenderThread * ());
-    MOCK_METHOD0(GetWhiteTexture,
-        ITexture * ());
-    MOCK_METHOD3(GetTextureForName,
-        ITexture * (const char* name, uint32 nFlags, ETEX_Format eFormat));
-    MOCK_METHOD0(GetViewParameters,
-        const CameraViewParameters& ());
-    MOCK_METHOD0(GetFrameReset,
-        uint32());
-    MOCK_METHOD0(GetDepthBufferOrig,
-        SDepthTexture * ());
-    MOCK_METHOD0(GetBackBufferWidth,
-        uint32());
-    MOCK_METHOD0(GetBackBufferHeight,
-        uint32());
-    MOCK_METHOD0(GetDeviceBufferManager,
-        CDeviceBufferManager * ());
-    MOCK_CONST_METHOD0(GetRenderTileInfo,
-        const SRenderTileInfo * ());
-    MOCK_METHOD0(GetIdentityMatrix,
-        Matrix44A());
-    MOCK_CONST_METHOD0(RT_GetCurrGpuID,
-        int32());
-    MOCK_METHOD0(GenerateTextureId,
-        int());
-    MOCK_METHOD2(SetCull,
-        void(ECull, bool));
-    MOCK_METHOD10(DrawQuad,
-        void(float x0, float y0, float x1, float y1, const ColorF& color, float z, float s0, float t0, float s1, float t1));
-    MOCK_METHOD9(DrawQuad3D,
-        void(const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, const ColorF& color, float ftx0, float fty0, float ftx1, float fty1));
-    MOCK_METHOD0(FX_ResetPipe,
-        void());
-    MOCK_METHOD4(FX_GetDepthSurface,
-        SDepthTexture * (int, int, bool, bool));
-    MOCK_METHOD5(FX_CheckOverflow,
-        void(int, int, IRenderElement*, int*, int*));
-    MOCK_METHOD1(FX_PreRender,
-        void(int Stage));
-    MOCK_METHOD0(FX_PostRender,
-        void());
-    MOCK_METHOD3(FX_SetState,
-        void(int, int, int));
-    MOCK_METHOD3(FX_CommitStates,
-        void(const SShaderTechnique * pTech, const SShaderPass * pPass, bool bUseMaterialState));
-    MOCK_METHOD1(FX_Commit,
-        void(bool));
-    MOCK_METHOD2(FX_SetVertexDeclaration,
-        long(int StreamMask, const AZ::Vertex::Format& vertexFormat));
-    MOCK_METHOD7(FX_DrawIndexedPrimitive,
-        void(eRenderPrimitiveType, int, int, int, int, int, bool));
-    MOCK_METHOD3(FX_SetIStream,
-        long(const void* pB, uint32 nOffs, RenderIndexType idxType));
-    MOCK_METHOD5(FX_SetVStream,
-        long(int, const void*, uint32, uint32, uint32));
-    MOCK_METHOD4(FX_DrawPrimitive,
-        void(eRenderPrimitiveType, int, int, int));
-    MOCK_METHOD1(FX_ClearTarget,
-        void(ITexture * pTex));
-    MOCK_METHOD1(FX_ClearTarget,
-        void(SDepthTexture * pTex));
-    MOCK_METHOD4(FX_SetRenderTarget,
-        bool(int, void*, SDepthTexture*, uint32));
-    MOCK_METHOD4(FX_PushRenderTarget,
-        bool(int, void*, SDepthTexture*, uint32));
-    MOCK_METHOD7(FX_SetRenderTarget,
-        bool(int, CTexture*, SDepthTexture*, bool, int, bool, uint32));
-    MOCK_METHOD6(FX_PushRenderTarget,
-        bool(int, CTexture*, SDepthTexture*, int, bool, uint32));
-    MOCK_METHOD1(FX_RestoreRenderTarget,
-        bool(int nTarget));
-    MOCK_METHOD1(FX_PopRenderTarget,
-        bool(int nTarget));
-    MOCK_METHOD1(FX_SetActiveRenderTargets,
-        void(bool bAllowDIP));
-    MOCK_METHOD4(FX_Start,
-        void(CShader * ef, int nTech, CShaderResources * Res, IRenderElement * re));
-    MOCK_METHOD1(RT_PopRenderTarget,
-        void(int nTarget));
-    MOCK_METHOD5(RT_SetViewport,
-        void(int, int, int, int, int));
-    MOCK_METHOD4(RT_PushRenderTarget,
-        void(int nTarget, CTexture * pTex, SDepthTexture * pDS, int nS));
-    MOCK_METHOD5(EF_Scissor,
-        void(bool bEnable, int sX, int sY, int sWdt, int sHgt));
-
-#ifdef SUPPORT_HW_MOUSE_CURSOR
-    MOCK_METHOD0(GetIHWMouseCursor,
-        IHWMouseCursor * ());
-#endif
-
-    MOCK_METHOD0(GetRecursionLevel,
-        int());
-    MOCK_METHOD2(GetIntegerConfigurationValue,
-        int(const char* varName, int defaultValue));
-    MOCK_METHOD2(GetFloatConfigurationValue,
-        float(const char* varName, float defaultValue));
-    MOCK_METHOD2(GetBooleanConfigurationValue,
-        bool(const char* varName, bool defaultValue));
-    MOCK_METHOD3(ApplyDepthTextureState,
-        void(int unit, int nFilter, bool clamp));
-    MOCK_METHOD0(GetZTargetTexture,
-        ITexture * ());
-    MOCK_METHOD1(GetTextureState,
-        int(const STexState& TS));
-    MOCK_METHOD7(TextureDataSize,
-        uint32(uint32, uint32, uint32, uint32, uint32, ETEX_Format, ETEX_TileMode));
-    MOCK_METHOD6(ApplyForID,
-        void(int nID, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit, bool useWhiteDefault));
-    MOCK_METHOD9(Create3DTexture,
-        ITexture * (const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte * pData, ETEX_Format eTFSrc, ETEX_Format eTFDst));
-    MOCK_METHOD1(IsTextureExist,
-        bool(const ITexture * pTex));
-    MOCK_METHOD1(NameForTextureFormat,
-        const char*(ETEX_Format eTF));
-    MOCK_METHOD1(NameForTextureType,
-        const char*(ETEX_Type eTT));
-    MOCK_METHOD0(IsVideoThreadModeEnabled,
-        bool());
-    MOCK_METHOD5(CreateDynTexture2,
-        IDynTexture * (uint32 nWidth, uint32 nHeight, uint32 nTexFlags, const char* szSource, ETexPool eTexPool));
-    MOCK_METHOD0(GetCurrentTextureAtlasSize,
-        uint32());
-    MOCK_METHOD2(BeginProfilerSection,
-        void(const char*, uint32));
-    MOCK_METHOD1(EndProfilerSection,
-        void(const char*));
-    MOCK_METHOD1(AddProfilerLabel,
-        void(const char*));
-
-    MOCK_METHOD5(EF_QueryImpl,
-        void(ERenderQueryTypes eQuery, void* pInOut0, uint32 nInOutSize0, void* pInOut1, uint32 nInOutSize1));
-};
-
-
diff --git a/Code/CryEngine/CryCommon/Mocks/ISystemMock.h b/Code/CryEngine/CryCommon/Mocks/ISystemMock.h
deleted file mode 100644
index 9c25748eca..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/ISystemMock.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#include <ISystem.h>
-#include <Cry_Camera.h>
-
-#ifdef GetUserName
-#undef GetUserName
-#endif
-
-class SystemMock
-    : public ISystem
-{
-public:
-    MOCK_METHOD0(Release,
-        void());
-    MOCK_METHOD0(GetGlobalEnvironment,
-        SSystemGlobalEnvironment * ());
-    MOCK_METHOD2(UpdatePreTickBus,
-        bool(int, int));
-    MOCK_METHOD2(UpdatePostTickBus,
-        bool(int, int));
-    MOCK_METHOD0(UpdateLoadtime,
-        bool());
-    MOCK_METHOD0(DoWorkDuringOcclusionChecks,
-        void());
-    MOCK_METHOD0(NeedDoWorkDuringOcclusionChecks,
-        bool());
-    MOCK_METHOD0(RenderStatistics,
-        void());
-    MOCK_METHOD0(GetUserName,
-        const char*());
-    MOCK_METHOD0(Quit,
-        void());
-    MOCK_METHOD1(Relaunch,
-        void(bool bRelaunch));
-    MOCK_CONST_METHOD0(IsQuitting,
-        bool());
-    MOCK_METHOD1(SerializingFile,
-        void(int mode));
-    MOCK_CONST_METHOD0(IsSerializingFile,
-        int());
-    MOCK_CONST_METHOD0(IsRelaunch,
-        bool());
-
-    void FatalError([[maybe_unused]] const char* sFormat, ...) override {}
-    void ReportBug([[maybe_unused]] const char* sFormat, ...) override {}
-
-    MOCK_METHOD6(WarningV,
-        void(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args));
-
-    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));
-    MOCK_METHOD1(CheckLogVerbosity,
-        bool(int verbosity));
-    MOCK_METHOD0(GetIViewSystem,
-        IViewSystem * ());
-    MOCK_METHOD0(GetILevelSystem,
-        ILevelSystem * ());
-    MOCK_METHOD0(GetINameTable,
-        INameTable * ());
-    MOCK_METHOD0(GetICmdLine,
-        ICmdLine * ());
-    MOCK_METHOD0(GetILog,
-        ILog * ());
-    MOCK_METHOD0(GetIPak,
-        AZ::IO::IArchive * ());
-    MOCK_METHOD0(GetICryFont,
-        ICryFont * ());
-    MOCK_METHOD0(GetIMovieSystem,
-        IMovieSystem * ());
-    MOCK_METHOD0(GetIAudioSystem,
-        Audio::IAudioSystem * ());
-    MOCK_METHOD0(GetIConsole,
-        ::IConsole * ());
-    MOCK_METHOD0(GetIRemoteConsole,
-        IRemoteConsole * ());
-    MOCK_METHOD0(GetIProfilingSystem,
-        IProfilingSystem * ());
-    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,
-        XmlNodeRef(const char*, bool, bool));
-    MOCK_METHOD4(LoadXmlFromBuffer,
-        XmlNodeRef(const char*, size_t, bool, bool));
-    MOCK_METHOD2(LoadXmlFromFile,
-        XmlNodeRef(const char*, bool));
-    MOCK_METHOD0(GetXmlUtils,
-        IXmlUtils * ());
-    MOCK_METHOD1(SetViewCamera,
-        void(CCamera & Camera));
-    MOCK_METHOD0(GetViewCamera,
-        CCamera & ());
-    MOCK_METHOD1(IgnoreUpdates,
-        void(bool bIgnore));
-    MOCK_METHOD1(SetIProcess,
-        void(IProcess * process));
-    MOCK_METHOD0(GetIProcess,
-        IProcess * ());
-    MOCK_CONST_METHOD0(IsTestMode,
-        bool());
-    MOCK_METHOD3(SetFrameProfiler,
-        void(bool on, bool display, char* prefix));
-    MOCK_METHOD0(GetFileVersion,
-        const SFileVersion&());
-    MOCK_METHOD0(GetProductVersion,
-        const SFileVersion&());
-    MOCK_METHOD0(GetBuildVersion,
-        const SFileVersion&());
-
-    MOCK_METHOD1(AddCVarGroupDirectory,
-        void(const string&));
-    MOCK_METHOD0(SaveConfiguration,
-        void());
-    MOCK_METHOD3(LoadConfiguration,
-        void(const char*, ILoadConfigurationEntrySink*, bool));
-
-    MOCK_CONST_METHOD0(GetMaxConfigSpec,
-        ESystemConfigSpec());
-    MOCK_CONST_METHOD0(GetConfigPlatform,
-        ESystemConfigPlatform());
-    MOCK_METHOD1(SetConfigPlatform,
-        void(ESystemConfigPlatform platform));
-    MOCK_CONST_METHOD0(IsPaused,
-        bool());
-    MOCK_METHOD0(GetLocalizationManager,
-        ILocalizationManager * ());
-    MOCK_METHOD0(GetNoiseGen,
-        CPNoise3 * ());
-    MOCK_METHOD0(GetUpdateCounter,
-        uint64());
-    MOCK_METHOD1(RegisterErrorObserver,
-        bool(IErrorObserver * errorObserver));
-    MOCK_METHOD1(UnregisterErrorObserver,
-        bool(IErrorObserver * errorObserver));
-    MOCK_METHOD4(OnAssert,
-        void(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber));
-    MOCK_CONST_METHOD0(IsAssertDialogVisible,
-        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,
-        int(const char* logFilePath));
-    MOCK_METHOD0(ClearErrorMessages,
-        void());
-    MOCK_METHOD2(debug_GetCallStack,
-        void(const char** pFunctions, int& nCount));
-    MOCK_METHOD2(debug_LogCallStack,
-        void(int, int));
-    MOCK_METHOD1(ExecuteCommandLine,
-        void(bool));
-    MOCK_METHOD1(GetUpdateStats,
-        void(SSystemUpdateStats & stats));
-    MOCK_METHOD0(GetSystemGlobalState,
-        ESystemGlobalState(void));
-    MOCK_METHOD1(SetSystemGlobalState,
-        void(ESystemGlobalState systemGlobalState));
-
-#if !defined(_RELEASE)
-    MOCK_CONST_METHOD0(IsSavingResourceList,
-        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/CryEngine/CryCommon/Mocks/ITextureMock.h b/Code/CryEngine/CryCommon/Mocks/ITextureMock.h
deleted file mode 100644
index 691b8808d6..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/ITextureMock.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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(GetClearColor,
-        const ColorF& ());
-    MOCK_CONST_METHOD0(GetDstFormat,
-        const ETEX_Format());
-    MOCK_CONST_METHOD0(GetSrcFormat,
-        const ETEX_Format());
-    MOCK_CONST_METHOD0(GetTexType,
-        const ETEX_Type());
-    MOCK_METHOD2(ApplyTexture,
-        void(int, int));
-    MOCK_CONST_METHOD0(GetName,
-        const char*());
-    MOCK_CONST_METHOD0(GetWidth,
-        const int());
-    MOCK_CONST_METHOD0(GetHeight,
-        const int());
-    MOCK_CONST_METHOD0(GetDepth,
-        const int());
-    MOCK_CONST_METHOD0(GetTextureID,
-        const int());
-    MOCK_CONST_METHOD0(GetFlags,
-        const uint32());
-    MOCK_CONST_METHOD0(GetNumMips,
-        const int());
-    MOCK_CONST_METHOD0(GetRequiredMip,
-        const int());
-    MOCK_CONST_METHOD0(GetDeviceDataSize,
-        const int());
-    MOCK_CONST_METHOD0(GetDataSize,
-        const int());
-    MOCK_CONST_METHOD0(GetTextureType,
-        const ETEX_Type());
-    MOCK_METHOD1(SetTextureType,
-        void(ETEX_Type type));
-    MOCK_CONST_METHOD0(IsTextureLoaded,
-        const bool());
-    MOCK_METHOD4(PrecacheAsynchronously,
-        void(float, int, int, int));
-    MOCK_METHOD4(GetData32,
-        uint8 * (int nSide, int nLevel, uint8 * pDst, ETEX_Format eDstFormat));
-    MOCK_METHOD1(SetFilter,
-        bool(int nFilter));
-    MOCK_METHOD1(SetClamp,
-        void(bool bEnable));
-    MOCK_CONST_METHOD0(GetAvgBrightness,
-        float());
-    MOCK_CONST_METHOD1(StreamCalculateMipsSigned,
-        int(float fMipFactor));
-    MOCK_CONST_METHOD0(GetStreamableMipNumber,
-        int());
-    MOCK_CONST_METHOD1(GetStreamableMemoryUsage,
-        int(int nStartMip));
-    MOCK_CONST_METHOD0(GetMinLoadedMip,
-        int());
-    MOCK_METHOD2(Readback,
-        void(AZ::u32 subresourceIndex, StagingHook callback));
-    MOCK_METHOD0(Reload,
-        bool());
-    MOCK_CONST_METHOD0(GetFormatName,
-        const char*());
-    MOCK_CONST_METHOD0(GetTypeName,
-        const char*());
-    MOCK_CONST_METHOD0(IsStreamedVirtual,
-        const bool());
-    MOCK_CONST_METHOD0(IsShared,
-        const bool());
-    MOCK_CONST_METHOD0(IsStreamable,
-        const bool());
-    MOCK_CONST_METHOD1(IsStreamedIn,
-        bool(const int nMinPrecacheRoundIds[2]));
-    MOCK_CONST_METHOD0(GetAccessFrameId,
-        const int());
-    MOCK_CONST_METHOD0(GetTextureDstFormat,
-        const ETEX_Format());
-    MOCK_CONST_METHOD0(GetTextureSrcFormat,
-        const ETEX_Format());
-    MOCK_CONST_METHOD0(IsPostponed,
-        bool());
-    MOCK_CONST_METHOD1(IsParticularMipStreamed,
-        const bool(float fMipFactor));
-    MOCK_METHOD3(GetLowResSystemCopy,
-        const ColorB * (uint16 & nWidth, uint16 & nHeight, int** ppLowResSystemCopyAtlasId));
-    MOCK_METHOD1(SetKeepSystemCopy,
-        void(bool bKeepSystemCopy));
-    MOCK_METHOD8(UpdateTextureRegion,
-        void(const uint8_t * data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc));
-    MOCK_CONST_METHOD0(GetDevTexture,
-        CDeviceTexture * ());
-};
-
-class ITextureLoadHandlerMock
-    : public ITextureLoadHandler
-{
-public:
-    MOCK_METHOD2(LoadTextureData,
-        bool(const char* path, STextureLoadData & loadData));
-    MOCK_CONST_METHOD1(SupportsExtension,
-        bool(const char* ext));
-    MOCK_METHOD0(Update,
-        void());
-};
-
-class IDynTextureMock
-    : public IDynTexture
-{
-public:
-    MOCK_METHOD0(Release,
-        void());
-    MOCK_METHOD4(GetSubImageRect,
-        void(uint32 & nX, uint32 & nY, uint32 & nWidth, uint32 & nHeight));
-    MOCK_METHOD4(GetImageRect,
-        void(uint32 & nX, uint32 & nY, uint32 & nWidth, uint32 & nHeight));
-    MOCK_METHOD0(GetTextureID,
-        int());
-    MOCK_METHOD0(Lock,
-        void());
-    MOCK_METHOD0(UnLock,
-        void());
-    MOCK_METHOD0(GetWidth,
-        int());
-    MOCK_METHOD0(GetHeight,
-        int());
-    MOCK_METHOD0(IsValid,
-        bool());
-    MOCK_CONST_METHOD0(GetFlags,
-        uint8());
-    MOCK_METHOD1(SetFlags,
-        void(uint8 flags));
-    MOCK_METHOD2(Update,
-        bool(int nNewWidth, int nNewHeight));
-    MOCK_METHOD2(Apply,
-        void(int, int));
-    MOCK_METHOD0(ClearRT,
-        bool());
-    MOCK_METHOD4(SetRT,
-        bool(int nRT, bool bPush, struct SDepthTexture* pDepthSurf, bool bScreenVP));
-    MOCK_METHOD0(SetRectStates,
-        bool());
-    MOCK_METHOD2(RestoreRT,
-        bool(int nRT, bool bPop));
-    MOCK_METHOD0(GetTexture,
-        ITexture * ());
-    MOCK_METHOD0(SetUpdateMask,
-        void());
-    MOCK_METHOD0(ResetUpdateMask,
-        void());
-    MOCK_METHOD0(IsSecondFrame,
-        bool());
-    MOCK_METHOD2(GetImageData32,
-        bool(uint8 * pData, int nDataSize));
-};
diff --git a/Code/CryEngine/CryCommon/Mocks/ITimerMock.h b/Code/CryEngine/CryCommon/Mocks/ITimerMock.h
deleted file mode 100644
index 12d3a9e57b..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/ITimerMock.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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/CryEngine/CryCommon/Mocks/StubTimer.h b/Code/CryEngine/CryCommon/Mocks/StubTimer.h
deleted file mode 100644
index 1a2aec3e30..0000000000
--- a/Code/CryEngine/CryCommon/Mocks/StubTimer.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <ITimer.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/CryEngine/CryCommon/MultiThread.h b/Code/CryEngine/CryCommon/MultiThread.h
deleted file mode 100644
index 94b311d459..0000000000
--- a/Code/CryEngine/CryCommon/MultiThread.h
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#if defined(APPLE) || defined(LINUX)
-#include <sched.h>
-#endif
-
-#include <AzCore/std/parallel/mutex.h>
-
-#include "CryAssert.h"
-
-// Section dictionary
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define MULTITHREAD_H_SECTION_TRAITS 1
-#define MULTITHREAD_H_SECTION_DEFINE_CRYINTERLOCKEXCHANGE 2
-#define MULTITHREAD_H_SECTION_IMPLEMENT_CRYSPINLOCK 3
-#define MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDADD 4
-#define MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDADDSIZE 5
-#define MULTITHREAD_H_SECTION_CRYINTERLOCKEDFLUSHSLIST_PT1 6
-#define MULTITHREAD_H_SECTION_CRYINTERLOCKEDFLUSHSLIST_PT2 7
-#define MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDCOMPAREEXCHANGE64 8
-#endif
-
-#define THREAD_NAME_LENGTH_MAX 64
-
-#define WRITE_LOCK_VAL (1 << 16)
-
-// Traits
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_TRAITS
-    #include AZ_RESTRICTED_FILE(MultiThread_h)
-#else
-#define MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_ATTRIBUTE_ALIGN_16 0
-#if defined(WIN64)
-#define MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_MSALIGN_16 1
-#endif
-#if defined(APPLE) || defined(LINUX)
-#define MULTITHREAD_H_TRAIT_USE_SALTED_LINKEDLISTHEADER 1
-#endif
-#endif
-
-//as PowerPC operates via cache line reservation, lock variables should reside ion their own cache line
-template <class T>
-struct SAtomicVar
-{
-    T val;
-
-    inline operator T() const{return val; }
-    inline operator T() volatile const{return val; }
-    inline SAtomicVar& operator =(const T& rV){val = rV; return *this; }
-    inline void Assign(const T& rV){val = rV; }
-    inline void Assign(const T& rV) volatile{val = rV; }
-    inline T* Addr() {return &val; }
-    inline volatile T* Addr() volatile {return &val; }
-
-    inline bool operator<(const T& v) const{return val < v; }
-    inline bool operator<(const SAtomicVar<T>& v) const{return val < v.val; }
-    inline bool operator>(const T& v) const{return val > v; }
-    inline bool operator>(const SAtomicVar<T>& v) const{return val > v.val; }
-    inline bool operator<=(const T& v) const{return val <= v; }
-    inline bool operator<=(const SAtomicVar<T>& v) const{return val <= v.val; }
-    inline bool operator>=(const T& v) const{return val >= v; }
-    inline bool operator>=(const SAtomicVar<T>& v) const{return val >= v.val; }
-    inline bool operator==(const T& v) const{return val == v; }
-    inline bool operator==(const SAtomicVar<T>& v) const{return val == v.val; }
-    inline bool operator!=(const T& v) const{return val != v; }
-    inline bool operator!=(const SAtomicVar<T>& v) const{return val != v.val; }
-    inline T operator*(const T& v) const{return val * v; }
-    inline T operator/(const T& v) const{return val / v; }
-    inline T operator+(const T& v) const{return val + v; }
-    inline T operator-(const T& v) const{return val - v; }
-
-    inline bool operator<(const T& v) volatile const{return val < v; }
-    inline bool operator<(const SAtomicVar<T>& v) volatile const{return val < v.val; }
-    inline bool operator>(const T& v) volatile const{return val > v; }
-    inline bool operator>(const SAtomicVar<T>& v) volatile const{return val > v.val; }
-    inline bool operator<=(const T& v) volatile const{return val <= v; }
-    inline bool operator<=(const SAtomicVar<T>& v) volatile const{return val <= v.val; }
-    inline bool operator>=(const T& v) volatile const{return val >= v; }
-    inline bool operator>=(const SAtomicVar<T>& v) volatile const{return val >= v.val; }
-    inline bool operator==(const T& v) volatile const{return val == v; }
-    inline bool operator==(const SAtomicVar<T>& v) volatile const{return val == v.val; }
-    inline bool operator!=(const T& v) volatile const{return val != v; }
-    inline bool operator!=(const SAtomicVar<T>& v) volatile const{return val != v.val; }
-    inline T operator*(const T& v) volatile const{return val * v; }
-    inline T operator/(const T& v) volatile const{return val / v; }
-    inline T operator+(const T& v) volatile const{return val + v; }
-    inline T operator-(const T& v) volatile const{return val - v; }
-};
-
-typedef SAtomicVar<int> TIntAtomic;
-typedef SAtomicVar<unsigned int> TUIntAtomic;
-typedef SAtomicVar<float> TFloatAtomic;
-
-#define __add_db16cycl__ NIntrinsics::YieldFor16Cycles();
-
-void CrySpinLock(volatile int* pLock, int checkVal, int setVal);
-void CryReleaseSpinLock   (volatile int*, int);
-
-LONG   CryInterlockedIncrement(int volatile* lpAddend);
-LONG   CryInterlockedDecrement(int volatile* lpAddend);
-LONG   CryInterlockedOr(LONG volatile* Destination, LONG Value);
-LONG   CryInterlockedExchangeAdd(LONG volatile* lpAddend, LONG Value);
-LONG     CryInterlockedCompareExchange(LONG volatile* dst, LONG exchange, LONG comperand);
-void*    CryInterlockedCompareExchangePointer(void* volatile* dst, void* exchange, void* comperand);
-void*  CryInterlockedExchangePointer       (void* volatile* dst, void* exchange);
-
-void*  CryCreateCriticalSection();
-void   CryCreateCriticalSectionInplace(void*);
-void   CryDeleteCriticalSection(void* cs);
-void   CryDeleteCriticalSectionInplace(void* cs);
-void   CryEnterCriticalSection(void* cs);
-bool   CryTryCriticalSection(void* cs);
-void   CryLeaveCriticalSection(void* cs);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_DEFINE_CRYINTERLOCKEXCHANGE
-    #include AZ_RESTRICTED_FILE(MultiThread_h)
-#endif
-
-ILINE void CrySpinLock(volatile int* pLock, int checkVal, int setVal)
-{
-#ifdef _CPU_X86
-# ifdef __GNUC__
-    int val;
-    __asm__ __volatile__ (
-        "0:     mov %[checkVal], %%eax\n"
-        "       lock cmpxchg %[setVal], (%[pLock])\n"
-        "       jnz 0b"
-        : "=m" (*pLock)
-        : [pLock] "r" (pLock), "m" (*pLock),
-        [checkVal] "m" (checkVal),
-        [setVal] "r" (setVal)
-        : "eax", "cc", "memory"
-        );
-# else //!__GNUC__
-    __asm
-    {
-        mov edx, setVal
-        mov ecx, pLock
-Spin:
-        // Trick from Intel Optimizations guide
-#ifdef _CPU_SSE
-            pause
-#endif
-        mov eax, checkVal
-        lock cmpxchg [ecx], edx
-        jnz Spin
-    }
-# endif //!__GNUC__
-#else // !_CPU_X86
-# if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_IMPLEMENT_CRYSPINLOCK
-    #include AZ_RESTRICTED_FILE(MultiThread_h)
-# endif
-# if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#  undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-# elif defined(APPLE) || defined(LINUX)
-    //    register int val;
-    //  __asm__ __volatile__ (
-    //      "0:     mov %[checkVal], %%eax\n"
-    //      "       lock cmpxchg %[setVal], (%[pLock])\n"
-    //      "       jnz 0b"
-    //      : "=m" (*pLock)
-    //      : [pLock] "r" (pLock), "m" (*pLock),
-    //        [checkVal] "m" (checkVal),
-    //        [setVal] "r" (setVal)
-    //      : "eax", "cc", "memory"
-    //      );
-    //while(CryInterlockedCompareExchange((volatile long*)pLock,setVal,checkVal)!=checkVal) ;
-    uint loops = 0;
-    while (__sync_val_compare_and_swap((volatile int32_t*)pLock, (int32_t)checkVal, (int32_t)setVal) != checkVal)
-    {
-#   if !defined (ANDROID) && !defined(IOS)
-        _mm_pause();
-#   endif
-
-        if (!(++loops & 0x7F))
-        {
-            usleep(1); // give threads with other prio chance to run
-        }
-        else if (!(loops & 0x3F))
-        {
-            sched_yield(); // give threads with same prio chance to run
-        }
-    }
-# else
-    // NOTE: The code below will fail on 64bit architectures!
-    while (_InterlockedCompareExchange((volatile LONG*)pLock, setVal, checkVal) != checkVal)
-    {
-        _mm_pause();
-    }
-# endif
-#endif
-}
-
-ILINE void CryReleaseSpinLock(volatile int* pLock, int setVal)
-{
-    *pLock = setVal;
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(APPLE) || defined(LINUX64)
-// Fixes undefined reference to CryInterlockedAdd(unsigned long volatile*, long) on
-// Mac and linux.
-ILINE void CryInterLockedAdd(volatile LONG* pVal, LONG iAdd)
-{
-    (void) CryInterlockedExchangeAdd(pVal, iAdd);
-}
-
-
-/*
-ILINE void CryInterLockedAdd(volatile unsigned long *pVal, long iAdd)
-{
-    long r;
-    __asm__ __volatile__ (
-    #if defined(LINUX64) || defined(MAC)  // long is 64 bits on amd64.
-        "lock ; xaddq %0, (%1) \n\t"
-    #else
-        "lock ; xaddl %0, (%1) \n\t"
-    #endif
-        : "=r" (r)
-        : "r" (pVal), "0" (iAdd)
-        : "memory"
-    );
-    (void) r;
-}*/
-/*ILINE void CryInterlockedAdd(volatile size_t *pVal, ptrdiff_t iAdd) {
-   //(void)CryInterlockedExchangeAdd((volatile long*)pVal,(long)iAdd);
-    (void) __sync_fetch_and_add(pVal,iAdd);
-}*/
-
-#endif
-ILINE void CryInterlockedAdd(volatile int* pVal, int iAdd)
-{
-#ifdef _CPU_X86
-# ifdef __GNUC__
-    __asm__ __volatile__ (
-        "        lock add %[iAdd], (%[pVal])\n"
-        : "=m" (*pVal)
-        : [pVal] "r" (pVal), "m" (*pVal), [iAdd] "r" (iAdd)
-        );
-# else
-    __asm
-    {
-        mov edx, pVal
-        mov eax, iAdd
-        lock add [edx], eax
-    }
-# endif
-#else
-    // NOTE: The code below will fail on 64bit architectures!
-#if defined(_WIN64)
-    _InterlockedExchangeAdd((volatile LONG*)pVal, iAdd);
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDADD
-    #include AZ_RESTRICTED_FILE(MultiThread_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(APPLE) || defined(LINUX)
-    CryInterlockedExchangeAdd((volatile LONG*)pVal, iAdd);
-#elif defined(APPLE)
-    OSAtomicAdd32(iAdd, (volatile LONG*)pVal);
-#else
-    InterlockedExchangeAdd((volatile LONG*)pVal, iAdd);
-#endif
-
-#endif
-}
-
-ILINE void CryInterlockedAddSize(volatile size_t* pVal, ptrdiff_t iAdd)
-{
-#if defined(PLATFORM_64BIT)
-#if defined(_WIN64)
-    _InterlockedExchangeAdd64((volatile __int64*)pVal, iAdd);
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDADDSIZE
-    #include AZ_RESTRICTED_FILE(MultiThread_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-    InterlockedExchangeAdd64((volatile LONG64*)pVal, iAdd);
-#elif defined(APPLE) || defined(LINUX)
-    (void)__sync_fetch_and_add((int64_t*)pVal, (int64_t)iAdd);
-#else
-    int64 x, n;
-    do
-    {
-        x = (int64) * pVal;
-        n = x + iAdd;
-    }
-    while (CryInterlockedCompareExchange64((volatile int64*)pVal, n, x) != x);
-#endif
-#else
-    CryInterlockedAdd((volatile int*)pVal, (int)iAdd);
-#endif
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-// CryInterlocked*SList Function, these are specialized C-A-S
-// functions for single-linked lists which prevent the A-B-A problem there
-// there are implemented in the platform specific CryThread_*.h files
-// TODO clean up the interlocked function the same was the CryThread_* header are
-
-//TODO somehow get their real size on WIN (without including windows.h...)
-//NOTE: The sizes are verifyed at compile-time in the implementation functions, but this is still ugly
-#if MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_MSALIGN_16
-_MS_ALIGN(16)
-#elif defined(WIN32)
-_MS_ALIGN(8)
-#endif
-struct SLockFreeSingleLinkedListEntry
-{
-    SLockFreeSingleLinkedListEntry* volatile pNext;
-}
-#if MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_ATTRIBUTE_ALIGN_16
-__attribute__ ((aligned(16)))
-#elif defined(LINUX32)
-_ALIGN(8)
-#elif defined(APPLE) || defined(LINUX64)
-_ALIGN(16)
-#endif
-;
-
-#if MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_MSALIGN_16
-_MS_ALIGN(16)
-#elif defined(WIN32)
-_MS_ALIGN(8)
-#endif
-struct SLockFreeSingleLinkedListHeader
-{
-    SLockFreeSingleLinkedListEntry* volatile pNext;
-#if defined(INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED)
-    // arm64 processors do not provide a cmpxchg16b (or equivalent) instruction,
-    // so _InterlockedCompareExchange128 is not implemented on arm64 platforms,
-    // and we have to use a mutex to ensure thread safety.
-    AZStd::mutex mutex;
-#elif MULTITHREAD_H_TRAIT_USE_SALTED_LINKEDLISTHEADER
-    // If pointers 32bit, salt should be as well.  Otherwise we get 4 bytes of padding between pNext and salt and CAS operations fail
-#if defined(PLATFORM_64BIT)
-    volatile uint64 salt;
-#else
-    volatile uint32 salt;
-#endif
-#endif
-}
-#if MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_ATTRIBUTE_ALIGN_16
-__attribute__ ((aligned(16)))
-#elif defined(LINUX32)
-_ALIGN(8)
-#elif defined(APPLE) || defined(LINUX64)
-_ALIGN(16)
-#endif
-;
-
-
-// push a element atomically onto a single linked list
-void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list, SLockFreeSingleLinkedListEntry& element);
-
-// push a element atomically from a single linked list
-void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list);
-
-// initialzied the lock-free single linked list
-void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list);
-
-// flush the whole list
-void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list);
-
-ILINE void CryReadLock(volatile int* rw, bool yield)
-{
-    CryInterlockedAdd(rw, 1);
-#ifdef NEED_ENDIAN_SWAP
-    volatile char* pw = (volatile char*)rw + 1;
-#else
-    volatile char* pw = (volatile char*)rw + 2;
-#endif
-
-    uint64 loops = 0;
-    for (; *pw; )
-    {
-        if (yield)
-        {
-#   if !defined(ANDROID) && !defined(IOS) && !defined(MULTITHREAD_H_TRAIT_NO_MM_PAUSE)
-            _mm_pause();
-#   endif
-
-            if (!(++loops & 0x7F))
-            {
-                // give other threads with other prio right to run
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_CRYINTERLOCKEDFLUSHSLIST_PT1
-    #include AZ_RESTRICTED_FILE(MultiThread_h)
-#elif defined (LINUX)
-                usleep(1);
-#endif
-            }
-            else if (!(loops & 0x3F))
-            {
-                // give threads with same prio chance to run
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_CRYINTERLOCKEDFLUSHSLIST_PT2
-    #include AZ_RESTRICTED_FILE(MultiThread_h)
-#elif defined (LINUX)
-                sched_yield();
-#endif
-            }
-        }
-    }
-}
-
-ILINE void CryReleaseReadLock(volatile int* rw)
-{
-    CryInterlockedAdd(rw, -1);
-}
-
-ILINE void CryWriteLock(volatile int* rw)
-{
-    CrySpinLock(rw, 0, WRITE_LOCK_VAL);
-}
-
-ILINE void CryReleaseWriteLock(volatile int* rw)
-{
-    CryInterlockedAdd(rw, -WRITE_LOCK_VAL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-struct ReadLock
-{
-    ILINE ReadLock(volatile int& rw)
-    {
-        CryInterlockedAdd(prw = &rw, 1);
-#ifdef NEED_ENDIAN_SWAP
-        volatile char* pw = (volatile char*)&rw + 1;
-        for (; * pw; )
-        {
-            ;
-        }
-#else
-        volatile char* pw = (volatile char*)&rw + 2;
-        for (; * pw; )
-        {
-            ;
-        }
-#endif
-    }
-    ILINE ReadLock(volatile int& rw, bool yield)
-    {
-        CryReadLock(prw = &rw, yield);
-    }
-    ~ReadLock()
-    {
-        CryReleaseReadLock(prw);
-    }
-private:
-    volatile int* prw;
-};
-
-struct ReadLockCond
-{
-    ILINE ReadLockCond(volatile int& rw, int bActive)
-    {
-        if (bActive)
-        {
-            CryInterlockedAdd(&rw, 1);
-            bActivated = 1;
-#ifdef NEED_ENDIAN_SWAP
-            volatile char* pw = (volatile char*)&rw + 1;
-            for (; * pw; )
-            {
-                ;
-            }
-#else
-            volatile char* pw = (volatile char*)&rw + 2;
-            for (; * pw; )
-            {
-                ;
-            }
-#endif
-        }
-        else
-        {
-            bActivated = 0;
-        }
-        prw = &rw;
-    }
-    void SetActive(int bActive = 1) { bActivated = bActive; }
-    void Release() { CryInterlockedAdd(prw, -bActivated); }
-    ~ReadLockCond()
-    {
-        CryInterlockedAdd(prw, -bActivated);
-    }
-
-private:
-    volatile int* prw;
-    int bActivated;
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct WriteLock
-{
-    ILINE WriteLock(volatile int& rw) { CryWriteLock(&rw); prw = &rw; }
-    ~WriteLock() { CryReleaseWriteLock(prw); }
-private:
-    volatile int* prw;
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct WriteAfterReadLock
-{
-    ILINE WriteAfterReadLock(volatile int& rw) { CrySpinLock(&rw, 1, WRITE_LOCK_VAL + 1); prw = &rw; }
-    ~WriteAfterReadLock() { CryInterlockedAdd(prw, -WRITE_LOCK_VAL); }
-private:
-    volatile int* prw;
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct WriteLockCond
-{
-    ILINE WriteLockCond(volatile int& rw, int bActive = 1)
-    {
-        if (bActive)
-        {
-            CrySpinLock(&rw, 0, iActive = WRITE_LOCK_VAL);
-        }
-        else
-        {
-            iActive = 0;
-        }
-        prw = &rw;
-    }
-    ILINE WriteLockCond() { prw = &(iActive = 0); }
-    ~WriteLockCond()
-    {
-        CryInterlockedAdd(prw, -iActive);
-    }
-    void SetActive(int bActive = 1) { iActive = -bActive & WRITE_LOCK_VAL; }
-    void Release() { CryInterlockedAdd(prw, -iActive); }
-    volatile int* prw;
-    int iActive;
-};
-
-
-#if defined(LINUX) || defined(APPLE)
-ILINE int64 CryInterlockedCompareExchange64(volatile int64* addr, int64 exchange, int64 comperand)
-{
-    return __sync_val_compare_and_swap(addr, comperand, exchange);
-    // This is OK, because long is signed int64 on Linux x86_64
-    //return CryInterlockedCompareExchange((volatile long*)addr, (long)exchange, (long)comperand);
-}
-
-ILINE int64 CryInterlockedExchange64(volatile int64* addr, int64 exchange)
-{
-    __sync_synchronize();
-    return __sync_lock_test_and_set(addr, exchange);
-}
-#else
-ILINE int64 CryInterlockedCompareExchange64(volatile int64* addr, int64 exchange, int64 compare)
-{
-    // forward to system call
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDCOMPAREEXCHANGE64
-    #include AZ_RESTRICTED_FILE(MultiThread_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    return _InterlockedCompareExchange64((volatile int64*)addr, exchange, compare);
-#endif
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(EXCLUDE_PHYSICS_THREAD)
-ILINE void SpinLock(volatile int* pLock, int checkVal, int setVal) { *(int*)pLock = setVal; }
-ILINE void AtomicAdd(volatile int* pVal, int iAdd) {   *(int*)pVal += iAdd; }
-ILINE void AtomicAdd(volatile unsigned int* pVal, int iAdd) { *(unsigned int*)pVal += iAdd; }
-
-ILINE void JobSpinLock(volatile int* pLock, int checkVal, int setVal) { CrySpinLock(pLock, checkVal, setVal); }
-#else
-ILINE void SpinLock(volatile int* pLock, int checkVal, int setVal) { CrySpinLock(pLock, checkVal, setVal); }
-ILINE void AtomicAdd(volatile int* pVal, int iAdd) {    CryInterlockedAdd(pVal, iAdd); }
-ILINE void AtomicAdd(volatile unsigned int* pVal, int iAdd) { CryInterlockedAdd((volatile int*)pVal, iAdd); }
-
-ILINE void JobSpinLock(volatile int* pLock, int checkVal, int setVal) { SpinLock(pLock, checkVal, setVal); }
-#endif
-
-ILINE void JobAtomicAdd(volatile int* pVal, int iAdd) { CryInterlockedAdd(pVal, iAdd); }
-ILINE void JobAtomicAdd(volatile unsigned int* pVal, int iAdd) { CryInterlockedAdd((volatile int*)pVal, iAdd); }
diff --git a/Code/CryEngine/CryCommon/MultiThread_Containers.h b/Code/CryEngine/CryCommon/MultiThread_Containers.h
deleted file mode 100644
index cc88fc42ef..0000000000
--- a/Code/CryEngine/CryCommon/MultiThread_Containers.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_MULTITHREAD_CONTAINERS_H
-#define CRYINCLUDE_CRYCOMMON_MULTITHREAD_CONTAINERS_H
-#pragma once
-
-#include "StlUtils.h"
-#include "BitFiddling.h"
-
-#include <queue>
-#include <set>
-#include <algorithm>
-
-
-namespace CryMT
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Thread Safe wrappers on the standard STL containers.
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Multi-Thread safe queue container, can be used instead of std::vector.
-    //////////////////////////////////////////////////////////////////////////
-    template <class T, class Alloc = std::allocator<T> >
-    class queue
-    {
-    public:
-        typedef T   value_type;
-        typedef std::vector<T, Alloc>   container_type;
-        typedef CryAutoCriticalSection AutoLock;
-
-        //////////////////////////////////////////////////////////////////////////
-        // std::queue interface
-        //////////////////////////////////////////////////////////////////////////
-        const T& front() const      { AutoLock lock(m_cs); return v.front(); };
-        const T& back() const { AutoLock lock(m_cs);    return v.back(); }
-        void    push(const T& x)    { AutoLock lock(m_cs); return v.push_back(x); };
-        void reserve(const size_t n) { AutoLock lock(m_cs); v.reserve(n); };
-        // classic pop function of queue should not be used for thread safety, use try_pop instead
-        //void  pop()                           { AutoLock lock(m_cs); return v.erase(v.begin()); };
-
-        CryCriticalSection& get_lock() const { return m_cs; }
-
-        bool   empty() const { AutoLock lock(m_cs); return v.empty(); }
-        int    size() const  { AutoLock lock(m_cs); return v.size(); }
-        void   clear() { AutoLock lock(m_cs); v.clear(); }
-        void   free_memory() { AutoLock lock(m_cs); stl::free_container(v); }
-
-        template <class Func>
-        void   sort(const Func& compare_less) { AutoLock lock(m_cs); std::sort(v.begin(), v.end(), compare_less); }
-
-        //////////////////////////////////////////////////////////////////////////
-        bool try_pop(T& returnValue)
-        {
-            AutoLock lock(m_cs);
-            if (!v.empty())
-            {
-                returnValue = v.front();
-                v.erase(v.begin());
-                return true;
-            }
-            return false;
-        };
-
-        //////////////////////////////////////////////////////////////////////////
-        bool try_remove(const T& value)
-        {
-            AutoLock lock(m_cs);
-            if (!v.empty())
-            {
-                typename container_type::iterator it = std::find(v.begin(), v.end(), value);
-                if (it != v.end())
-                {
-                    v.erase(it);
-                    return true;
-                }
-            }
-            return false;
-        };
-
-        template<typename Sizer>
-        void GetMemoryUsage(Sizer* pSizer) const
-        {
-            pSizer->AddObject(v);
-        }
-    private:
-        container_type v;
-        mutable CryCriticalSection m_cs;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Multi-Thread safe vector container, can be used instead of std::vector.
-    //////////////////////////////////////////////////////////////////////////
-    template <class T>
-    class vector
-    {
-    public:
-        typedef T   value_type;
-        typedef CryAutoCriticalSection AutoLock;
-
-        CryCriticalSection& get_lock() const { return m_cs; }
-
-        void free_memory() { AutoLock lock(m_cs); stl::free_container(v); }
-
-        //////////////////////////////////////////////////////////////////////////
-        // std::vector interface
-        //////////////////////////////////////////////////////////////////////////
-        bool   empty() const { AutoLock lock(m_cs); return v.empty(); }
-        int    size() const  { AutoLock lock(m_cs); return v.size(); }
-        void   resize(int sz) { AutoLock lock(m_cs); v.resize(sz); }
-        void   reserve(int sz) { AutoLock lock(m_cs); v.reserve(sz); }
-        size_t capacity() const { AutoLock lock(m_cs); return v.size(); }
-        void   clear() { AutoLock lock(m_cs); v.clear(); }
-        T&     operator[](size_t pos) { AutoLock lock(m_cs); return v[pos]; }
-        const T& operator[](size_t pos) const { AutoLock lock(m_cs); return v[pos]; }
-        const T& front() const { AutoLock lock(m_cs); return v.front(); }
-        const T& back() const { AutoLock lock(m_cs);    return v.back(); }
-        T& back() { AutoLock lock(m_cs);    return v.back(); }
-
-        void push_back(const T& x) { AutoLock lock(m_cs); return v.push_back(x); }
-        void pop_back() { AutoLock lock(m_cs);  return v.pop_back(); }
-        //////////////////////////////////////////////////////////////////////////
-
-        template <class Func>
-        void sort(const Func& compare_less) { AutoLock lock(m_cs); std::sort(v.begin(), v.end(), compare_less); }
-
-        template <class Iter>
-        void append(const Iter& startRange, const Iter& endRange) { AutoLock lock(m_cs); v.insert(v.end(), startRange, endRange); }
-
-        void swap(std::vector<T>& vec) { AutoLock lock(m_cs); v.swap(vec); }
-
-        //////////////////////////////////////////////////////////////////////////
-        bool try_pop_front(T& returnValue)
-        {
-            AutoLock lock(m_cs);
-            if (!v.empty())
-            {
-                returnValue = v.front();
-                v.erase(v.begin());
-                return true;
-            }
-            return false;
-        };
-        bool try_pop_back(T& returnValue)
-        {
-            AutoLock lock(m_cs);
-            if (!v.empty())
-            {
-                returnValue = v.back();
-                v.pop_back();
-                return true;
-            }
-            return false;
-        };
-
-        //////////////////////////////////////////////////////////////////////////
-        template <typename FindFunction, typename KeyType>
-        bool find_and_copy(FindFunction findFunc, const KeyType& key, T& foundValue) const
-        {
-            AutoLock lock(m_cs);
-            if (!v.empty())
-            {
-                typename std::vector<T>::const_iterator it;
-                for (it = v.begin(); it != v.end(); ++it)
-                {
-                    if (findFunc(key, *it))
-                    {
-                        foundValue = *it;
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        bool try_remove(const T& value)
-        {
-            AutoLock lock(m_cs);
-            if (!v.empty())
-            {
-                typename std::vector<T>::iterator it = std::find(v.begin(), v.end(), value);
-                if (it != v.end())
-                {
-                    v.erase(it);
-                    return true;
-                }
-            }
-            return false;
-        };
-
-        //////////////////////////////////////////////////////////////////////////
-        template <typename Predicate>
-        bool try_remove_and_erase_if(Predicate predicateFunction)
-        {
-            AutoLock lock(m_cs);
-            if (!v.empty())
-            {
-                typename std::vector<T>::iterator it = std::remove_if(v.begin(), v.end(), predicateFunction);
-                if (it != v.end())
-                {
-                    v.erase(it, v.end());
-                    return true;
-                }
-            }
-            return false;
-        };
-
-
-        //////////////////////////////////////////////////////////////////////////
-        bool try_remove_at(size_t idx)
-        {
-            AutoLock lock(m_cs);
-            if (idx < v.size())
-            {
-                v.erase(v.begin() + idx);
-                return true;
-            }
-            return false;
-        }
-
-
-        //////////////////////////////////////////////////////////////////////////
-        //Fast remove - just move last elem over deleted element - order is not preserved
-        bool try_remove_unordered(const T& value)
-        {
-            AutoLock lock(m_cs);
-            if (!v.empty())
-            {
-                typename std::vector<T>::iterator it = std::find(v.begin(), v.end(), value);
-                if (it != v.end())
-                {
-                    if (v.size() > 1)
-                    {
-                        typename std::vector<T>::iterator it_back = v.end() - 1;
-
-                        if (it != it_back)
-                        {
-                            *it = *it_back;
-                        }
-
-                        v.erase(it_back);
-                    }
-                    else
-                    {
-                        v.erase(it);
-                    }
-                    return true;
-                }
-            }
-            return false;
-        };
-
-        vector() {}
-
-        vector(const vector<T>& rOther)
-        {
-            AutoLock lock1(m_cs);
-            AutoLock lock2(rOther.m_cs);
-
-            v = rOther.v;
-        }
-
-        vector& operator=(const vector<T>& rOther)
-        {
-            if (this == &rOther)
-            {
-                return *this;
-            }
-
-            AutoLock lock1(m_cs);
-            AutoLock lock2(rOther.m_cs);
-
-            v = rOther.v;
-
-            return *this;
-        }
-    private:
-        std::vector<T> v;
-        mutable CryCriticalSection m_cs;
-    };
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Multi-Thread safe set container, can be used instead of std::set.
-    // It has limited functionality, but most of it is there.
-    //////////////////////////////////////////////////////////////////////////
-    template <class T>
-    class set
-    {
-    public:
-        typedef T   value_type;
-        typedef T Key;
-        typedef typename std::set<T>::size_type size_type;
-        typedef CryAutoCriticalSection  AutoLock;
-
-        //////////////////////////////////////////////////////////////////////////
-        // Methods
-        //////////////////////////////////////////////////////////////////////////
-        void                                clear()                                                                         { AutoLock lock(m_cs); s.clear(); }
-        size_type                       count(const Key& _Key) const                                { AutoLock lock(m_cs); return s.count(_Key); }
-        bool                                empty() const                                                               { AutoLock lock(m_cs); return s.empty(); }
-        size_type                       erase(const Key& _Key)                                          { AutoLock lock(m_cs); return s.erase(_Key); }
-
-        bool                                find(const Key& _Key)                                               { AutoLock lock(m_cs); return (s.find(_Key) != s.end()); }
-
-        bool                                pop_front(value_type&   rFrontElement)
-        {
-            AutoLock lock(m_cs);
-            if (s.empty())
-            {
-                return false;
-            }
-            rFrontElement = *s.begin();
-            s.erase(s.begin());
-            return true;
-        }
-        bool                                pop_front()
-        {
-            AutoLock lock(m_cs);
-            if (s.empty())
-            {
-                return false;
-            }
-            s.erase(s.begin());
-            return true;
-        }
-
-        bool                                front(value_type&   rFrontElement)
-        {
-            AutoLock lock(m_cs);
-            if (s.empty())
-            {
-                return false;
-            }
-            rFrontElement = *s.begin();
-            return true;
-        }
-
-        bool                                insert(const value_type& _Val)                          { AutoLock lock(m_cs); return s.insert(_Val).second; }
-        size_type                       max_size() const                                                        { AutoLock lock(m_cs); return s.max_size(); }
-        size_type                       size() const                                                                { AutoLock lock(m_cs); return s.size(); }
-        void                                swap(set& _Right)                                                       { AutoLock lock(m_cs); s.swap(_Right); }
-
-        CryCriticalSection& get_lock()                                                                  { return m_cs; }
-
-    private:
-        std::set<value_type>                s;
-        mutable CryCriticalSection  m_cs;
-    };
-
-
-    ///////////////////////////////////////////////////////////////////////////////
-    //
-    // Multi-thread safe lock-less FIFO queue container for passing pointers between threads.
-    // The queue only stores pointers to T, it does not copy the contents of T.
-    //
-    //////////////////////////////////////////////////////////////////////////
-    template <class T, class Alloc = std::allocator<T> >
-    class CLocklessPointerQueue
-    {
-    public:
-        explicit CLocklessPointerQueue(size_t reserve = 32) { m_lockFreeQueue.reserve(reserve); };
-        ~CLocklessPointerQueue() {};
-
-        // Check's if queue is empty.
-        bool    empty() const;
-
-        // Pushes item to the queue, only pointer is stored, T contents are not copied.
-        void    push(T* ptr);
-        // pop can return NULL, always check for it before use.
-        T*    pop();
-
-    private:
-        queue<T*, typename std::allocator_traits<Alloc>::template rebind_alloc<T*>> m_lockFreeQueue;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    template <class T, class Alloc>
-    inline bool CLocklessPointerQueue<T, Alloc>::empty() const
-    {
-        return m_lockFreeQueue.empty();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    template <class T, class Alloc>
-    inline void CLocklessPointerQueue<T, Alloc>::push(T* ptr)
-    {
-        m_lockFreeQueue.push(ptr);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    template <class T, class Alloc>
-    inline T* CLocklessPointerQueue<T, Alloc>::pop()
-    {
-        T* val = NULL;
-        m_lockFreeQueue.try_pop(val);
-        return val;
-    }
-}; // namespace CryMT
-
-namespace stl
-{
-    template <typename T>
-    void free_container(CryMT::vector<T>& v)
-    {
-        v.free_memory();
-    }
-    template <typename T>
-    void free_container(CryMT::queue<T>& v)
-    {
-        v.free_memory();
-    }
-}
-
-
-#endif // CRYINCLUDE_CRYCOMMON_MULTITHREAD_CONTAINERS_H
diff --git a/Code/CryEngine/CryCommon/NullAudioSystem.h b/Code/CryEngine/CryCommon/NullAudioSystem.h
deleted file mode 100644
index b5a893aa50..0000000000
--- a/Code/CryEngine/CryCommon/NullAudioSystem.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <IAudioSystem.h>
-
-namespace Audio
-{
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    class NullAudioProxy
-        : public IAudioProxy
-    {
-    public:
-        NullAudioProxy() {}
-        ~NullAudioProxy() override {}
-
-        void Initialize(const char* const, const bool = true) override {}
-        void Release() override {}
-        void Reset() override {}
-        void ExecuteSourceTrigger([[maybe_unused]] TAudioControlID nTriggerID, [[maybe_unused]] const SAudioSourceInfo& rSourceInfo, [[maybe_unused]] const SAudioCallBackInfos & rCallbackInfos = SAudioCallBackInfos::GetEmptyObject()) override {}
-        void ExecuteTrigger(const TAudioControlID, [[maybe_unused]] const SAudioCallBackInfos& rCallbackInfos = SAudioCallBackInfos::GetEmptyObject()) override {}
-        void StopAllTriggers() override {}
-        void StopTrigger(const TAudioControlID) override {}
-        void SetSwitchState(const TAudioControlID, const TAudioSwitchStateID) override {}
-        void SetRtpcValue(const TAudioControlID, const float) override {}
-        void SetObstructionCalcType(const EAudioObjectObstructionCalcType) override {}
-        void SetPosition(const SATLWorldPosition&) override {}
-        void SetPosition(const AZ::Vector3&) override {}
-        void SetMultiplePositions([[maybe_unused]] const MultiPositionParams& positions) override {}
-        void SetEnvironmentAmount(const TAudioEnvironmentID, const float) override {}
-        void SetCurrentEnvironments() override {}
-        void ResetRtpcValues() override {}
-        TAudioObjectID GetAudioObjectID() const override { return INVALID_AUDIO_OBJECT_ID; }
-    };
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////////
-    class NullAudioSystem
-        : public IAudioSystem
-    {
-    public:
-        AZ_CLASS_ALLOCATOR(Audio::NullAudioSystem, AZ::SystemAllocator, 0)
-
-        NullAudioSystem()
-        {
-            AudioSystemRequestBus::Handler::BusConnect();
-            AudioSystemThreadSafeRequestBus::Handler::BusConnect();
-            AZ_TracePrintf(AZ::Debug::Trace::GetDefaultSystemWindow(), "<Audio>: Running with Null Audio System!\n");
-        }
-        ~NullAudioSystem() override
-        {
-            AudioSystemRequestBus::Handler::BusDisconnect();
-            AudioSystemThreadSafeRequestBus::Handler::BusDisconnect();
-        }
-
-        bool Initialize() override { return true; }
-        void Release() override {}
-        void ExternalUpdate() override {}
-
-        void PushRequest(const SAudioRequest&) override {}
-        void PushRequestBlocking(const SAudioRequest&) override {}
-        void PushRequestThreadSafe(const SAudioRequest&) override {}
-        void AddRequestListener(AudioRequestCallbackType, void* const, const EAudioRequestType, const TATLEnumFlagsType) override {}
-        void RemoveRequestListener(AudioRequestCallbackType, void* const) override {}
-
-        TAudioControlID GetAudioTriggerID(const char* const) const override { return INVALID_AUDIO_CONTROL_ID; }
-        TAudioControlID GetAudioRtpcID(const char* const) const override { return INVALID_AUDIO_CONTROL_ID; }
-        TAudioControlID GetAudioSwitchID(const char* const) const override { return INVALID_AUDIO_CONTROL_ID; }
-        TAudioSwitchStateID GetAudioSwitchStateID(const TAudioControlID, const char* const) const override { return INVALID_AUDIO_SWITCH_STATE_ID; }
-        TAudioPreloadRequestID GetAudioPreloadRequestID(const char* const) const override { return INVALID_AUDIO_PRELOAD_REQUEST_ID; }
-        TAudioEnvironmentID GetAudioEnvironmentID(const char* const) const override { return INVALID_AUDIO_ENVIRONMENT_ID; }
-
-        bool ReserveAudioListenerID(TAudioObjectID& rAudioObjectID) override { rAudioObjectID = INVALID_AUDIO_OBJECT_ID; return true; }
-        bool ReleaseAudioListenerID(const TAudioObjectID) override { return true; }
-        bool SetAudioListenerOverrideID(const TAudioObjectID) override { return true; }
-
-        void GetInfo(SAudioSystemInfo&) override {}
-        const char* GetControlsPath() const override { return ""; }
-        void UpdateControlsPath() override {}
-        void RefreshAudioSystem(const char* const) override {}
-
-        IAudioProxy* GetFreeAudioProxy() override { return static_cast<IAudioProxy*>(&m_nullAudioProxy); }
-        void FreeAudioProxy(IAudioProxy* const) override {}
-
-        TAudioSourceId CreateAudioSource([[maybe_unused]] const SAudioInputConfig& sourceConfig) override { return INVALID_AUDIO_SOURCE_ID; }
-        void DestroyAudioSource([[maybe_unused]] TAudioSourceId sourceId) override {}
-
-        const char* GetAudioControlName([[maybe_unused]] const EAudioControlType controlType, [[maybe_unused]] const TATLIDType atlID) const override { return nullptr; }
-        const char* GetAudioSwitchStateName([[maybe_unused]] const TAudioControlID switchID, [[maybe_unused]] const TAudioSwitchStateID stateID) const override { return nullptr; }
-
-    private:
-        NullAudioProxy m_nullAudioProxy;
-    };
-
-} // namespace Audio
diff --git a/Code/CryEngine/CryCommon/Options.h b/Code/CryEngine/CryCommon/Options.h
deleted file mode 100644
index 6cec7b61f6..0000000000
--- a/Code/CryEngine/CryCommon/Options.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Facilities for defining and combining general-purpose or specific options, for functions or structs.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_OPTIONS_H
-#define CRYINCLUDE_CRYCOMMON_OPTIONS_H
-#pragma once
-
-
-// Facilities for collecting options in a struct, and quickly constructing them.
-// Used, for example, as construction argument. Safer and more informative than bool arguments.
-//
-// Example:
-//      struct FObjectOpts;
-//      struct CObject { CObject(FObjectOpts = ZERO); };
-//      CObject object_def();
-//      CObject object( FObjectOpts().Size(8).AllowGrowth(true) );
-
-template<class TOpt, class T, class TContainer, int NInit = 0>
-struct TOptVar
-{
-    typedef T   TValue;
-
-    TOptVar()
-        : _val(T(NInit))
-    {
-        offset(this);
-    }
-    TOptVar(T val)
-        : _val(val) {}
-
-    operator T () const
-    {
-        return _val;
-    }
-    T operator ()() const
-    { return _val; }
-    T operator +() const
-    { return _val; }
-    bool operator !() const
-    { return !_val; }
-
-    TContainer& operator()(T val)
-    {
-        _val = val;
-        return *(TContainer*)((char*)this - offset());
-    }
-
-private:
-    T       _val;
-
-    static size_t offset(void* self = 0)
-    {
-        static size_t _offset = TContainer::static_offset(self);
-        return _offset;
-    }
-};
-
-#define OPT_STRUCT(TOpts)                                                                                    \
-    typedef TOpts TThis; typedef uint TInt;                                                                  \
-    static size_t static_offset(void* var) { static void* _first = var; return (char*)var - (char*)_first; } \
-    TOpts([[maybe_unused]] void* p = 0) {}                                                                   \
-    TOpts operator()() const { return TOpts(*this); }                                                        \
-
-#define OPT_VAR(Type, Var)                            \
-    enum E##Var {}; TOptVar<E##Var, Type, TThis> Var; \
-
-#define OPT_VAR_INIT(Type, Var, init)                       \
-    enum E##Var {}; TOptVar<E##Var, Type, TThis, init> Var; \
-
-#define BIT_STRUCT(Struc, Int)                                                                  \
-    typedef Struc TThis; typedef Int TInt;                                                      \
-    TInt Mask() const { return *(const TInt*)this; }                                            \
-    TInt& Mask() { return *(TInt*)this; }                                                       \
-    Struc(TInt init = 0) { COMPILE_TIME_ASSERT(sizeof(TThis) == sizeof(TInt)); Mask() = init; } \
-
-#define BIT_VAR(Var)                                     \
-    TInt _##Var : 1;                                     \
-    bool Var() const { return _##Var; }                  \
-    TThis& Var(bool val) { _##Var = val; return *this; } \
-
-#endif // CRYINCLUDE_CRYCOMMON_OPTIONS_H
diff --git a/Code/CryEngine/CryCommon/PoolAllocator.h b/Code/CryEngine/CryCommon/PoolAllocator.h
deleted file mode 100644
index 391e09cd31..0000000000
--- a/Code/CryEngine/CryCommon/PoolAllocator.h
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_POOLALLOCATOR_H
-#define CRYINCLUDE_CRYCOMMON_POOLALLOCATOR_H
-#pragma once
-
-
-//---------------------------------------------------------------------------
-// Memory allocation class. Allocates, frees, and reuses fixed-size blocks of
-// memory, a scheme sometimes known as Simple Segregated Memory.
-//
-// Allocation is amortized constant time. The normal case is very fast -
-// basically just a couple of dereferences. If many blocks are allocated,
-// the system may occasionally need to allocate a further bucket of blocks
-// for itself. Deallocation is strictly fast constant time.
-//
-// Each PoolAllocator allocates blocks of a single size and alignment, specified
-// by template arguments. There is no per-block space overhead, except for
-// alignment. The free list mechanism uses the memory of the block itself
-// when it is deallocated.
-//
-// In this implementation memory claimed by the system is never deallocated,
-// until the entire allocator is deallocated. This is to ensure fast
-// allocation/deallocation - reference counting the bucket quickly would
-// require a pointer to the bucket be stored, whereas now no memory is used
-// while the block is allocated.
-//
-// The class can optionally support multi-threading, using the second
-// template parameter. By default it is multithread-safe.
-// See Synchronization.h.
-//
-// The class is implemented using a HeapAllocator.
-//---------------------------------------------------------------------------
-
-#include "HeapAllocator.h"
-
-namespace stl
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Fixed-size pool allocator, using a shared heap.
-    template <typename THeap>
-    class SharedSizePoolAllocator
-    {
-        template <typename T>
-        friend struct PoolCommonAllocator;
-    protected:
-
-        using_type(THeap, Lock);
-
-        struct ObjectNode
-        {
-            ObjectNode* pNext;
-        };
-
-        static size_t AllocSize(size_t nSize)
-        {
-            return max<size_t>(nSize, sizeof(ObjectNode));
-        }
-        static size_t AllocAlign(size_t nSize, size_t nAlign)
-        {
-            return nAlign > 0 ? nAlign : min<size_t>(nSize, alignof(void*));
-        }
-
-    public:
-
-        SharedSizePoolAllocator(THeap& heap, size_t nSize, size_t nAlign = 0)
-            : _pHeap(&heap)
-            , _nAllocSize(AllocSize(nSize))
-            , _nAllocAlign(AllocAlign(nSize, nAlign))
-            , _pFreeList(0)
-        {
-        }
-
-        ~SharedSizePoolAllocator()
-        {
-            // All allocated objects should be freed by now.
-            Lock lock(*_pHeap);
-            Validate(lock);
-            for (ObjectNode* pFree = _pFreeList; pFree; )
-            {
-                ObjectNode* pNext = pFree->pNext;
-                _pHeap->Deallocate(lock, pFree, _nAllocSize);
-                pFree = pNext;
-            }
-        }
-
-        // Raw allocation.
-        void* Allocate()
-        {
-            Lock lock(*_pHeap);
-            if (_pFreeList)
-            {
-                ObjectNode* pFree = _pFreeList;
-                _pFreeList = _pFreeList->pNext;
-                Validate(lock);
-                _Counts.nUsed++;
-                return pFree;
-            }
-
-            // No free pointer, allocate a new one.
-            void* pNewMemory = _pHeap->Allocate(lock, _nAllocSize, _nAllocAlign);
-            if (pNewMemory)
-            {
-                _Counts.nUsed++;
-                _Counts.nAlloc++;
-                Validate(lock);
-            }
-            return pNewMemory;
-        }
-
-        void Deallocate(void* pObject)
-        {
-            Deallocate(Lock(*_pHeap), pObject);
-        }
-
-        SMemoryUsage GetCounts() const
-        {
-            Lock lock(*_pHeap);
-            return _Counts;
-        }
-        SMemoryUsage GetTotalMemory(const Lock&) const
-        {
-            return SMemoryUsage(_Counts.nAlloc * _nAllocSize, _Counts.nUsed * _nAllocSize);
-        }
-
-    protected:
-
-        void Deallocate(const Lock& lock, void* pObject)
-        {
-            if (pObject)
-            {
-                assert(_pHeap->CheckPtr(lock, pObject));
-
-                ObjectNode* pNode = static_cast<ObjectNode*>(pObject);
-
-                // Add the object to the front of the free list.
-                pNode->pNext = _pFreeList;
-                _pFreeList = pNode;
-                _Counts.nUsed--;
-                Validate(lock);
-            }
-        }
-
-        void Validate(const Lock& lock) const
-        {
-            _pHeap->Validate(lock);
-            _Counts.Validate();
-            assert(_Counts.nAlloc * _nAllocSize <= _pHeap->GetTotalMemory(lock).nUsed);
-        }
-
-        void Reset(const Lock&, [[maybe_unused]] bool bForce = false)
-        {
-            assert(bForce || _Counts.nUsed == 0);
-            _Counts.Clear();
-            _pFreeList = 0;
-        }
-
-    protected:
-        const size_t            _nAllocSize, _nAllocAlign;
-        SMemoryUsage            _Counts;
-
-        THeap*                      _pHeap;
-        ObjectNode*             _pFreeList;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    struct SPoolMemoryUsage
-        : SMemoryUsage
-    {
-        size_t nPool;
-
-        SPoolMemoryUsage(size_t _nAlloc = 0, size_t _nPool = 0, size_t _nUsed = 0)
-            : SMemoryUsage(_nAlloc, _nUsed)
-            , nPool(_nPool)
-        {
-            // These values are pulled from 3 atomic variables and not guaranteed to be a perfect "snapshot"
-            // Of the current state of the pool memory usage (e.g. Used may be > max, etc)
-            // Patch the values so that they make sense (it won't be wrong, just mildly out of date)
-            // This is done to prevent sticking expensive mutexes or potentially forever blocking semaphores in the pool
-            if (nUsed > nPool)
-            {
-                nPool = nUsed;
-            }
-
-            assert(nPool <= nAlloc);
-        }
-
-        size_t nPoolFree() const
-        {
-            return nPool - nUsed;
-        }
-        size_t nNonPoolFree() const
-        {
-            return nAlloc - nPool;
-        }
-
-        void Clear()
-        {
-            nAlloc = nUsed = nPool = 0;
-        }
-
-        void operator += (SPoolMemoryUsage const& op)
-        {
-            nAlloc += op.nAlloc;
-            nPool += op.nPool;
-            nUsed += op.nUsed;
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // SizePoolAllocator with owned heap
-    template <typename THeap>
-    class SizePoolAllocator
-        : protected THeap
-        , public SharedSizePoolAllocator<THeap>
-    {
-        typedef SharedSizePoolAllocator<THeap> TPool;
-
-        using_type(THeap, Lock);
-        using_type(THeap, FreeMemLock);
-        using TPool::AllocSize;
-        using TPool::_Counts;
-        using TPool::_nAllocSize;
-
-    public:
-
-        SizePoolAllocator(size_t nSize, size_t nAlign = 0, FHeap opts = 0)
-            : THeap(opts.PageSize(opts.PageSize * AllocSize(nSize)))
-            , TPool(*this, nSize, nAlign)
-        {
-        }
-
-        using TPool::Allocate;
-        using THeap::GetMemoryUsage;
-
-        void Deallocate(void* pObject)
-        {
-            FreeMemLock lock(*this);
-            TPool::Deallocate(lock, pObject);
-            if (THeap::FreeWhenEmpty && _Counts.nUsed == 0)
-            {
-                TPool::Reset(lock);
-                THeap::Clear(lock);
-            }
-        }
-
-        void FreeMemoryIfEmpty()
-        {
-            FreeMemLock lock(*this);
-            if (_Counts.nUsed == 0)
-            {
-                TPool::Reset(lock);
-                THeap::Clear(lock);
-            }
-        }
-
-        void ResetMemory()
-        {
-            FreeMemLock lock(*this);
-            TPool::Reset(lock);
-            THeap::Reset(lock);
-        }
-
-        void FreeMemory()
-        {
-            FreeMemLock lock(*this);
-            TPool::Reset(lock);
-            THeap::Clear(lock);
-        }
-
-
-        void FreeMemoryForce()
-        {
-            FreeMemLock lock(*this);
-            TPool::Reset(lock, true);
-            THeap::Clear(lock);
-        }
-
-        SPoolMemoryUsage GetTotalMemory()
-        {
-            Lock lock(*this);
-            return SPoolMemoryUsage(THeap::GetTotalMemory(lock).nAlloc, _Counts.nAlloc * _nAllocSize, _Counts.nUsed * _nAllocSize);
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Templated size version of SizePoolAllocator
-    template <int S, typename L = PSyncMultiThread, int A = 0>
-    class PoolAllocator
-        : public SizePoolAllocator< HeapAllocator<L> >
-    {
-    public:
-        PoolAllocator(FHeap opts = 0)
-            :   SizePoolAllocator< HeapAllocator<L> >(S, A, opts)
-        {
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    template <int S, int A = 0>
-    class PoolAllocatorNoMT
-        : public SizePoolAllocator< HeapAllocator<PSyncNone> >
-    {
-    public:
-        PoolAllocatorNoMT(FHeap opts = 0)
-            :   SizePoolAllocator< HeapAllocator<PSyncNone> >(S, A, opts)
-        {
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    template<typename T, typename L = PSyncMultiThread, size_t A = 0>
-    class TPoolAllocator
-        : public SizePoolAllocator< HeapAllocator<L> >
-    {
-        typedef SizePoolAllocator< HeapAllocator<L> > TSizePool;
-
-    public:
-
-        using TSizePool::Allocate;
-        using TSizePool::Deallocate;
-
-        TPoolAllocator(FHeap opts = 0)
-            : TSizePool(sizeof(T), max<size_t>(alignof(T), A), opts)
-        {}
-
-        T* New()
-        {
-            return new(Allocate())T();
-        }
-
-        template<class I>
-        T* New(const I& init)
-        {
-            return new(Allocate())T(init);
-        }
-
-        void Delete(T* ptr)
-        {
-            if (ptr)
-            {
-                ptr->~T();
-                Deallocate(ptr);
-            }
-        }
-    };
-
-    // Legacy verbose typedefs.
-    typedef PSyncNone PoolAllocatorSynchronizationSinglethreaded;
-    typedef PSyncMultiThread PoolAllocatorSynchronizationMultithreaded;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Allocator maintaining multiple type-specific pools, sharing a common heap source.
-    template<typename THeap>
-    struct PoolCommonAllocator
-        : protected THeap
-    {
-        typedef SharedSizePoolAllocator<THeap> TPool;
-
-        using_type(THeap, Lock);
-        using_type(THeap, FreeMemLock);
-
-        struct TPoolNode
-            : SharedSizePoolAllocator<THeap>
-        {
-            TPoolNode* pNext;
-
-            TPoolNode(THeap& heap, TPoolNode*& pList, size_t nSize, size_t nAlign)
-                : SharedSizePoolAllocator<THeap>(heap, nSize, nAlign)
-            {
-                pNext = pList;
-                pList = this;
-            }
-        };
-
-    public:
-
-        PoolCommonAllocator()
-            : _pPoolList(0)
-        {
-        }
-        ~PoolCommonAllocator()
-        {
-            TPoolNode* pPool = _pPoolList;
-            while (pPool)
-            {
-                TPoolNode* pNextPool = pPool->pNext;
-                delete pPool;
-                pPool = pNextPool;
-            }
-        }
-
-        TPool* CreatePool(size_t nSize, size_t nAlign = 0)
-        {
-            return new TPoolNode(*this, _pPoolList, nSize, nAlign);
-        }
-
-        SPoolMemoryUsage GetTotalMemory()
-        {
-            Lock lock(*this);
-            SMemoryUsage mem;
-            for (TPoolNode* pPool = _pPoolList; pPool; pPool = pPool->pNext)
-            {
-                mem += pPool->GetTotalMemory(lock);
-            }
-            return SPoolMemoryUsage(THeap::GetTotalMemory(lock).nAlloc, mem.nAlloc, mem.nUsed);
-        }
-
-        bool FreeMemory(bool bDeallocate = true)
-        {
-            FreeMemLock lock(*this);
-            for (TPoolNode* pPool = _pPoolList; pPool; pPool = pPool->pNext)
-            {
-                if (pPool->GetTotalMemory(lock).nUsed)
-                {
-                    return false;
-                }
-            }
-
-            for (TPoolNode* pPool = _pPoolList; pPool; pPool = pPool->pNext)
-            {
-                pPool->Reset(lock);
-            }
-
-            if (bDeallocate)
-            {
-                THeap::Clear(lock);
-            }
-            else
-            {
-                THeap::Reset(lock);
-            }
-            return true;
-        }
-
-    protected:
-        TPoolNode*  _pPoolList;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // The additional TInstancer type provides a way of instantiating multiple instances
-    // of this class, without static variables.
-    template<typename THeap, typename TInstancer = int>
-    struct StaticPoolCommonAllocator
-    {
-        ILINE static PoolCommonAllocator<THeap>& StaticAllocator()
-        {
-            static PoolCommonAllocator<THeap> s_Allocator;
-            return s_Allocator;
-        }
-
-        typedef SharedSizePoolAllocator<THeap> TPool;
-
-        template<class T>
-        ILINE static TPool& TypeAllocator()
-        {
-            static TPool* sp_Pool = CreatePoolOnGlobalHeap(sizeof(T), alignof(T));
-            return *sp_Pool;
-        }
-
-        template<class T>
-        ILINE static void* Allocate(T*& p)
-        { return p = (T*)TypeAllocator<T>().Allocate(); }
-
-        template<class T>
-        ILINE static void Deallocate(T* p)
-        { return TypeAllocator<T>().Deallocate(p); }
-
-        template<class T>
-        static T* New()
-        { return new(TypeAllocator<T>().Allocate())T(); }
-
-        template<class T, class I>
-        static T* New(const I& init)
-        { return new(TypeAllocator<T>().Allocate())T(init); }
-
-        template<class T>
-        static void Delete(T* ptr)
-        {
-            if (ptr)
-            {
-                ptr->~T();
-                TypeAllocator<T>().Deallocate(ptr);
-            }
-        }
-
-        static SPoolMemoryUsage GetTotalMemory()
-        { return StaticAllocator().GetTotalMemory(); }
-
-    private:
-
-        ILINE static TPool* CreatePoolOnGlobalHeap(size_t nSize, size_t nAlign = 0)
-        {            
-            return StaticAllocator().CreatePool(nSize, nAlign);
-        }
-    };
-};
-
-
-#endif // CRYINCLUDE_CRYCOMMON_POOLALLOCATOR_H
diff --git a/Code/CryEngine/CryCommon/ProjectDefines.h b/Code/CryEngine/CryCommon/ProjectDefines.h
deleted file mode 100644
index 097191c039..0000000000
--- a/Code/CryEngine/CryCommon/ProjectDefines.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : to get some defines available in every CryEngine project
-
-
-#pragma once
-
-
-#include "BaseTypes.h"
-#include <AzCore/PlatformDef.h>
-
-#if defined(_RELEASE) && !defined(RELEASE)
-    #define RELEASE
-#endif
-
-// Section dictionary
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define PROJECTDEFINES_H_SECTION_STATS_AGENT 1
-#define PROJECTDEFINES_H_SECTION_TRAITS 2
-#define PROJECTDEFINES_H_SECTION_VTX_IDX 3
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_STATS_AGENT
-    #include AZ_RESTRICTED_FILE(ProjectDefines_h)
-#elif defined(WIN32) || defined(WIN64)
-#if !defined(_RELEASE) || defined(PERFORMANCE_BUILD)
-#define ENABLE_STATS_AGENT
-#endif
-#endif
-
-// The following definitions are used by Sandbox and RC to determine which platform support is needed
-#define TOOLS_SUPPORT_POWERVR
-#define TOOLS_SUPPORT_ETC2COMP
-
-// Type used for vertex indices
-// WARNING: If you change this typedef, you need to update AssetProcessorPlatformConfig.ini to convert cgf and abc files to the proper index format.
-#if defined(RESOURCE_COMPILER)
-typedef uint32 vtx_idx;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(MOBILE)
-typedef uint16 vtx_idx;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_VTX_IDX
-    #include AZ_RESTRICTED_FILE(ProjectDefines_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-// Uncomment one of the two following typedefs:
-typedef uint32 vtx_idx;
-//typedef uint16 vtx_idx;
-#endif
-
-
-// see http://wiki/bin/view/CryEngine/TerrainTexCompression for more details on this
-// 0=off, 1=on
-#define TERRAIN_USE_CIE_COLORSPACE 0
-
-// When non-zero, const cvar accesses (by name) are logged in release-mode on consoles.
-// This can be used to find non-optimal usage scenario's, where the constant should be used directly instead.
-// Since read accesses tend to be used in flow-control logic, constants allow for better optimization by the compiler.
-#define LOG_CONST_CVAR_ACCESS 0
-
-#if defined(WIN32) || defined(WIN64) || LOG_CONST_CVAR_ACCESS
-#define RELEASE_LOGGING
-#endif
-
-#if defined(_RELEASE) && !defined(RELEASE_LOGGING)
-#define EXCLUDE_NORMAL_LOG
-#endif
-
-// Add the "REMOTE_ASSET_PROCESSOR" define except in release
-// this makes it so that asset processor functions.  Without this, all assets must be present and on local media
-// with this, the asset processor can be used to remotely process assets.
-#if !defined(_RELEASE)
-#   define REMOTE_ASSET_PROCESSOR
-#endif
-
-#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD))
-    #define USE_HTTP_WEBSOCKETS 0
-#endif
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_TRAITS
-    #include AZ_RESTRICTED_FILE(ProjectDefines_h)
-#else
-#define PROJECTDEFINES_H_TRAIT_DISABLE_MONOLITHIC_PROFILING_MARKERS 1
-#if !defined(LINUX) && !defined(APPLE)
-#define PROJECTDEFINES_H_TRAIT_ENABLE_SOFTCODE_SYSTEM 1
-#endif
-#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE)
-#define PROJECTDEFINES_H_TRAIT_USE_GPU_PARTICLES 1
-#endif
-#define PROJECTDEFINES_H_TRAIT_USE_MESH_TESSELLATION 1
-#if defined(WIN32)
-#define PROJECTDEFINES_H_TRAIT_USE_SVO_GI 1
-#endif
-#if defined(APPLE) || defined(LINUX)
-#define AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS 1
-#define AZ_LEGACY_CRYCOMMON_TRAIT_USE_UNIX_PATHS 1
-#endif
-#endif
-
-#define USE_GLOBAL_BUCKET_ALLOCATOR
-
-#ifdef IS_PROSDK
-#   define USING_TAGES_SECURITY                 // Wrapper for TGVM security
-# if defined(LINUX) || defined(APPLE)
-#   error LINUX and Mac does not support evaluation version
-# endif
-#endif
-
-#ifdef USING_TAGES_SECURITY
-#   define TAGES_EXPORT __declspec(dllexport)
-#else
-#   define TAGES_EXPORT
-#endif // USING_TAGES_SECURITY
-// test -------------------------------------
-
-#define _DATAPROBE
-
-
-
-//This feature allows automatic crash submission to JIRA, but does not work outside of CryTek
-//Note: This #define will be commented out during code export
-#define ENABLE_CRASH_HANDLER
-
-#if !defined(PHYSICS_STACK_SIZE)
-# define PHYSICS_STACK_SIZE (128U << 10)
-#endif
-
-#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD)) && !defined(RESOURCE_COMPILER)
-#ifndef ENABLE_PROFILING_CODE
-    #define ENABLE_PROFILING_CODE
-#endif
-#if !(defined(SANDBOX_EXPORTS) || defined(PLUGIN_EXPORTS) || (defined(AZ_MONOLITHIC_BUILD) && PROJECTDEFINES_H_TRAIT_DISABLE_MONOLITHIC_PROFILING_MARKERS))
-    #define ENABLE_PROFILING_MARKERS
-#endif
-
-//lightweight profilers, disable for submissions, disables displayinfo inside 3dengine as well
-#ifndef ENABLE_LW_PROFILERS
-    #define ENABLE_LW_PROFILERS
-#endif
-#endif
-
-#if defined(ENABLE_PROFILING_CODE)
-#define ENABLE_ART_RT_TIME_ESTIMATE
-#endif
-
-#if defined(ENABLE_PROFILING_CODE) && !defined(_RELEASE)
-    #define FMOD_STREAMING_DEBUGGING 1
-#endif
-
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(AZ_PLATFORM_LINUX)
-#define FLARES_SUPPORT_EDITING
-#endif
-
-// Reflect texture slot information - only used in the editor
-#if defined(WIN32) || defined(WIN64) || defined(AZ_PLATFORM_MAC)
-#define SHADER_REFLECT_TEXTURE_SLOTS 1
-#else
-#define SHADER_REFLECT_TEXTURE_SLOTS 0
-#endif
-
-// these enable and disable certain net features to give compatibility between PCs and consoles / profile and performance builds
-#define PC_CONSOLE_NET_COMPATIBLE 0
-#define PROFILE_PERFORMANCE_NET_COMPATIBLE 0
-
-#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD)) && !PROFILE_PERFORMANCE_NET_COMPATIBLE
-#define USE_LAGOMETER (1)
-#else
-#define USE_LAGOMETER (0)
-#endif
-
-// enable this in order to support old style material names in old data ("engine/material.mtl" or "mygame/material.mtl" as opposed to just "material.mtl")
-// previously, material names could have the game folder in it, but this is not necessary anymore and would not work with things like gems
-// note that if you use any older projects such as GameSDK this should remain enabled
-#define SUPPORT_LEGACY_MATERIAL_NAMES
-
-// Enable additional structures and code for sprite motion blur. Currently non-functional and disabled
-// #define PARTICLE_MOTION_BLUR
-
-// a special ticker thread to run during load and unload of levels
-#define USE_NETWORK_STALL_TICKER_THREAD
-
-#if !defined(MOBILE)
-//---------------------------------------------------------------------
-// Enable Tessellation Features
-// (displacement mapping, subdivision, water tessellation)
-//---------------------------------------------------------------------
-// Modules   : 3DEngine, Renderer
-// Depends on: DX11
-
-// Global tessellation feature flag
-    #define TESSELLATION
-    #ifdef TESSELLATION
-// Specific features flags
-        #define WATER_TESSELLATION
-        #define PARTICLES_TESSELLATION
-
-        #if PROJECTDEFINES_H_TRAIT_USE_MESH_TESSELLATION
-// Mesh tessellation (displacement, smoothing, subd)
-            #define MESH_TESSELLATION
-// Mesh tessellation also in motion blur passes
-            #define MOTIONBLUR_TESSELLATION
-        #endif
-
-// Dependencies
-        #ifdef MESH_TESSELLATION
-            #define MESH_TESSELLATION_ENGINE
-        #endif
-            #ifndef NULL_RENDERER
-            #ifdef WATER_TESSELLATION
-                #define WATER_TESSELLATION_RENDERER
-            #endif
-            #ifdef PARTICLES_TESSELLATION
-                #define PARTICLES_TESSELLATION_RENDERER
-            #endif
-            #ifdef MESH_TESSELLATION_ENGINE
-                #define MESH_TESSELLATION_RENDERER
-            #endif
-
-            #if defined(WATER_TESSELLATION_RENDERER) || defined(PARTICLES_TESSELLATION_RENDERER) || defined(MESH_TESSELLATION_RENDERER)
-// Common tessellation flag enabling tessellation stages in renderer
-                #define TESSELLATION_RENDERER
-            #endif
-        #endif // !NULL_RENDERER
-    #endif // TESSELLATION
-#endif // !defined(MOBILE)
-
-//------------------------------------------------------
-// SVO GI
-//------------------------------------------------------
-// Modules   : Renderer, Engine
-// Platform  : DX11
-#if !defined(RENDERNODES_LEAN_AND_MEAN)
-    #if PROJECTDEFINES_H_TRAIT_USE_SVO_GI
-        #define FEATURE_SVO_GI
-    #endif
-#endif
-
-#if defined(ENABLE_PROFILING_CODE)
-#   define USE_DISK_PROFILER
-#   define ENABLE_LOADING_PROFILER  // requires AZ_PROFILE_TELEMETRY to also be defined
-#endif
-
-#if PROJECTDEFINES_H_TRAIT_USE_GPU_PARTICLES && !defined(NULL_RENDERER)
-    #define GPU_PARTICLES 1
-#else
-    #define GPU_PARTICLES 0
-#endif
-
-// The maximum number of joints in an animation
-#define MAX_JOINT_AMOUNT 1024
diff --git a/Code/CryEngine/CryCommon/Random.h b/Code/CryEngine/CryCommon/Random.h
deleted file mode 100644
index 4f958bff10..0000000000
--- a/Code/CryEngine/CryCommon/Random.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_RANDOM_H
-#define CRYINCLUDE_CRYCOMMON_RANDOM_H
-#pragma once
-
-#include "BaseTypes.h"
-#include "LCGRandom.h"
-
-namespace CryRandom_Internal
-{
-    // Private access point to the global random number generator.
-    extern CRndGen g_random_generator;
-}
-
-
-// Seed the global random number generator.
-inline void cry_random_seed(const uint32 nSeed)
-{
-    CryRandom_Internal::g_random_generator.Seed(nSeed);
-}
-
-inline uint32 cry_random_uint32()
-{
-    return CryRandom_Internal::g_random_generator.GenerateUint32();
-}
-
-inline float cry_frand()
-{
-    return CryRandom_Internal::g_random_generator.GenerateFloat();
-}
-
-// Ranged function returns random value within the *inclusive* range
-// between minValue and maxValue.
-// Any orderings work correctly: minValue <= maxValue and
-// minValue >= minValue.
-template <class T>
-inline T cry_random(const T minValue, const T maxValue)
-{
-    return CryRandom_Internal::g_random_generator.GetRandom(minValue, maxValue);
-}
-
-// Vector (Vec2, Vec3, Vec4) ranged function returns vector with
-// every component within the *inclusive* ranges between minValue.component
-// and maxValue.component.
-// All orderings work correctly: minValue.component <= maxValue.component and
-// minValue.component >= maxValue.component.
-template <class T>
-inline T cry_random_componentwise(const T& minValue, const T& maxValue)
-{
-    return CryRandom_Internal::g_random_generator.GetRandomComponentwise(minValue, maxValue);
-}
-
-// The function returns a random unit vector (Vec2, Vec3, Vec4).
-template <class T>
-inline T cry_random_unit_vector()
-{
-    return CryRandom_Internal::g_random_generator.GetRandomUnitVector<T>();
-}
-
-// eof
-#endif // CRYINCLUDE_CRYCOMMON_RANDOM_H
diff --git a/Code/CryEngine/CryCommon/Range.h b/Code/CryEngine/CryCommon/Range.h
deleted file mode 100644
index 1240f8123c..0000000000
--- a/Code/CryEngine/CryCommon/Range.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Time TRange class.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_RANGE_H
-#define CRYINCLUDE_CRYCOMMON_RANGE_H
-
-#pragma once
-
-#include <AzCore/RTTI/TypeInfo.h>
-
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-/*!
-        Class TRange, can represent anything that is range between two values, mostly used for time ranges.
- */
-template <class T>
-class TRange
-{
-public:
-    T start;
-    T end;
-
-    TRange()    { start = T(0); end = T(0); };
-    TRange(const TRange& r) { start = r.start; end = r.end; };
-    TRange(T s, T e) { start = s; end = e; };
-
-    void Set(T s, T e) { start = s; end = e; };
-    void Clear() { start = 0; end = 0; };
-
-    //! Get length of range.
-    T   Length() const { return end - start; };
-    //! Check if range is empty.
-    bool IsEmpty()  const { return (start == 0 && end == 0); }
-
-    //! Check if value is inside range.
-    bool IsInside(T val) { return val >= start && val <= end; };
-
-    void ClipValue(T& val) const
-    {
-        if (val < start)
-        {
-            val = start;
-        }
-        if (val > end)
-        {
-            val = end;
-        }
-    }
-
-    //! Compare two ranges.
-    bool    operator == (const TRange& r) const
-    {
-        return start == r.start && end == r.end;
-    }
-
-    bool  operator != (const TRange& r) const
-    {
-        return !(*this == r);
-    }
-    //! Assign operator.
-    TRange& operator =(const TRange& r)
-    {
-        start = r.start;
-        end = r.end;
-        return *this;
-    }
-    //! Interect two ranges.
-    TRange  operator & (const TRange& r) const
-    {
-        return TRange(MAX(start, r.start), MIN(end, r.end));
-    }
-    TRange& operator &= (const TRange& r)
-    {
-        return (*this = (*this & r));
-    }
-    //! Concatent two ranges.
-    TRange  operator | (const TRange& r) const
-    {
-        return TRange(MIN(start, r.start), MAX(end, r.end));
-    }
-    TRange& operator |= (const TRange& r)
-    {
-        return (*this = (*this | r));
-    }
-    //! Add new value to range.
-    TRange  operator + (T v) const
-    {
-        T s = start, e = end;
-        if (v < start)
-        {
-            s = v;
-        }
-        if (v > end)
-        {
-            e = v;
-        }
-        return TRange(s, e);
-    }
-    //! Add new value to range.
-    TRange& operator += (T v) const
-    {
-        if (v < start)
-        {
-            start = v;
-        }
-        if (v > end)
-        {
-            end = v;
-        }
-        return *this;
-    }
-};
-
-//! CRange if just TRange for floats..
-typedef TRange<float> Range;
-
-namespace AZ
-{
-    AZ_TYPE_INFO_SPECIALIZE(Range, "{515CF4CF-4992-4139-BDE5-42A887432B45}");
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_RANGE_H
diff --git a/Code/CryEngine/CryCommon/RenderBus.h b/Code/CryEngine/CryCommon/RenderBus.h
deleted file mode 100644
index 2cb12fdec9..0000000000
--- a/Code/CryEngine/CryCommon/RenderBus.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-namespace AZ
-{
-    /**
-    * This bus serves as a way for non-rendering systems to react to events
-    * that occur inside the renderer. For now these events will probably be implemented by
-    * things like CSystem and CryAction. In the future the idea is that these can be implemented
-    * by a user's GameComponent.
-    */
-    class RenderNotifications
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~RenderNotifications() = default;
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        //////////////////////////////////////////////////////////////////////////
-
-        /**
-        * This event gets posted at the beginning of CD3D9Renderer's FreeResources method, before the resources have been freed.
-        */
-        virtual void OnRendererFreeResources([[maybe_unused]] int flags) {};
-    };
-
-    using RenderNotificationsBus = AZ::EBus<RenderNotifications>;
-
-    /**
-    * This bus is used for renderer notifications that occur directly from the render thread
-    * while scene rendering is occurring.  (In contrast, the RenderNotificationsBus above runs on the
-    * main thread while the renderer is preparing the scene.)
-    */
-    class RenderThreadEvents
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~RenderThreadEvents() = default;
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        //////////////////////////////////////////////////////////////////////////
-
-        /*
-        * This hook enables per-frame render work at the beginning of the frame.
-        *
-        * This event is triggered when RT_RenderScene is called at the beginning of a frame.
-        * The event will only be triggered on the render thread, if multithreaded rendering
-        * is enabled.  And, it will only be triggered on a non-recursive scene render.
-        */
-        virtual void OnRenderThreadRenderSceneBegin() {}
-    };
-
-    using RenderThreadEventsBus = AZ::EBus<RenderThreadEvents>;
-
-    /**
-    * This bus is used for firing screenshot request to any rendering system.
-    * The rendering system should implement its own screenshot function.
-    */
-    class RenderScreenshotRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        static const EBusHandlerPolicy HandlerPolicy = EBusHandlerPolicy::Single; ///< EBusTraits overrides
-        static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::Single; ///< EBusTraits overrides
-
-        /** Take a screenshot and save it to a file.
-        @param filepath the path where a the screenshot is saved.
-        */
-        virtual void WriteScreenshotToFile(const char* filepath) = 0;
-
-        /** Take a screenshot and preserve it within a buffer
-        */
-        virtual void WriteScreenshotToBuffer() = 0;
-
-        /** Fill a provided buffer with the render buffer
-        @param imageBuffer The provided buffer to be filled
-        */
-        virtual bool CopyScreenshotToBuffer(unsigned char* imageBuffer, unsigned int width, unsigned int height) = 0;
-
-    };
-
-    using RenderScreenshotRequestBus = AZ::EBus<RenderScreenshotRequests>;
-
-    class RenderScreenshotNotifications
-        : public AZ::EBusTraits
-    {
-    public:
-        virtual ~RenderScreenshotNotifications() = default;
-
-        static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::Single; ///< EBusTraits overrides
-
-        /** Notify waiting components that the requested screenshot is ready
-        */
-        virtual void OnScreenshotReady() = 0;
-    };
-
-    using RenderScreenshotNotificationBus = AZ::EBus<RenderScreenshotNotifications>;
-}
diff --git a/Code/CryEngine/CryCommon/SFunctor.h b/Code/CryEngine/CryCommon/SFunctor.h
deleted file mode 100644
index 05f08c8290..0000000000
--- a/Code/CryEngine/CryCommon/SFunctor.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : User header for multi DLL functors.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_SFUNCTOR_H
-#define CRYINCLUDE_CRYCOMMON_SFUNCTOR_H
-#pragma once
-
-
-#include "FunctorBaseFunction.h"
-#include "FunctorBaseMember.h"
-
-// Needed for CryFont to compile.
-// Maybe for others too.
-#include "smartptr.h"
-
-
-struct SFunctor
-{
-public:
-    // Calls the functor method.
-    // returns true, if a functor is registered, false otherwise.
-    bool Call()
-    {
-        if (!m_pFunctor)
-        {
-            return false;
-        }
-
-        m_pFunctor->Call();
-
-        return true;
-    }
-
-    // Sets a new functor, common function, void return type, no arguments.
-    // Parameters: the function pointer.
-    template<typename tCallback>
-    void Set(tCallback pCallback)
-    {
-        typedef TFunctor<tCallback> TType;
-        m_pFunctor = new TType(pCallback);
-    }
-
-    // Sets a new functor, common function, void return type, 1 argument.
-    // Parameters: the function pointer, the argument to be passed to the function.
-    template<typename tCallback, typename tArgument1>
-    void Set(tCallback pCallback, const tArgument1& Argument1)
-    {
-        typedef TFunctor<tCallback> TType;
-        m_pFunctor = new TType(pCallback, Argument1);
-    }
-
-    // Sets a new functor, common function, void return type, 2 arguments.
-    // Parameters: the function pointer, the 2 arguments to be passed to the function.
-    template<typename tCallback, typename tArgument1, typename tArgument2>
-    void Set(tCallback pCallback, const tArgument1& Argument1, const tArgument2& Argument2)
-    {
-        typedef TFunctor<tCallback> TType;
-        m_pFunctor = new TType(pCallback, Argument1, Argument2);
-    }
-
-    // Sets a new functor, common function, void return type, no arguments.
-    // Parameters: the function pointer, the 2 arguments to be passed to the function.
-    template<typename tCallee>
-    void Set(tCallee* pCallee, void (tCallee::* pCallback)())
-    {
-        typedef TFunctor<void (tCallee::*)()> TType;
-        m_pFunctor = new TType(pCallee, pCallback);
-    }
-
-    // Sets a new functor, common function, void return type, 1 argument.
-    // Parameters: the function pointer, the 2 arguments to be passed to the function, the argument.
-    template<typename tCallee, typename tArgument1>
-    void Set(tCallee* pCallee, void (tCallee::* pCallback)(tArgument1), const tArgument1& Argument1)
-    {
-        typedef TFunctor<void (tCallee::*)(tArgument1)> TType;
-        m_pFunctor = new TType(pCallee, pCallback, Argument1);
-    }
-
-    // Sets a new functor, common function, void return type, 2 arguments.
-    // Parameters: the function pointer, the 2 arguments to be passed to the function, the 2 arguments.
-    template<typename tCallee, typename tArgument1, typename tArgument2>
-    void Set(tCallee* pCallee, void (tCallee::* pCallback)(tArgument1, tArgument2), const tArgument1& Argument1, const tArgument2& Argument2)
-    {
-        typedef TFunctor<void (tCallee::*)(tArgument1, tArgument2)> TType;
-        m_pFunctor = new TType(pCallee, pCallback, Argument1, Argument2);
-    }
-
-    // Used to compare equality between 2 IFunctors.
-    bool operator==(const SFunctor& rOther)
-    {
-        return m_pFunctor == rOther.m_pFunctor;
-    }
-
-    // Used order to IFunctors (needed for some containers, like map).
-    bool operator<(const SFunctor& rOther)
-    {
-        return m_pFunctor < rOther.m_pFunctor;
-    }
-protected:
-    _smart_ptr<IFunctorBase>    m_pFunctor;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_SFUNCTOR_H
diff --git a/Code/CryEngine/CryCommon/ScopedVariableSetter.h b/Code/CryEngine/CryCommon/ScopedVariableSetter.h
deleted file mode 100644
index 5b2c36b7b9..0000000000
--- a/Code/CryEngine/CryCommon/ScopedVariableSetter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_SCOPEDVARIABLESETTER_H
-#define CRYINCLUDE_CRYCOMMON_SCOPEDVARIABLESETTER_H
-#pragma once
-
-
-// The idea of this class is to set the value of a variable in its constructor,
-// and then in the destructor to reset it to its initial value.
-template <typename T>
-class CScopedVariableSetter
-{
-public:
-    typedef T Value;
-
-    CScopedVariableSetter(Value& variable, const Value& temporaryValue)
-        :   m_oldValue(variable)
-        , m_variable(variable)
-    {
-        m_variable = temporaryValue;
-    }
-
-    ~CScopedVariableSetter()
-    {
-        m_variable = m_oldValue;
-    }
-
-private:
-    Value m_oldValue;
-    Value& m_variable;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_SCOPEDVARIABLESETTER_H
diff --git a/Code/CryEngine/CryCommon/SerializationTypes.h b/Code/CryEngine/CryCommon/SerializationTypes.h
deleted file mode 100644
index 55b0144815..0000000000
--- a/Code/CryEngine/CryCommon/SerializationTypes.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-// this file is included anywhere that we need a complete list of primitive serializable types
-
-SERIALIZATION_TYPE(bool)
-SERIALIZATION_TYPE(float)
-SERIALIZATION_TYPE(double)
-SERIALIZATION_TYPE(Vec2)
-SERIALIZATION_TYPE(Vec3)
-SERIALIZATION_TYPE(Quat)
-SERIALIZATION_TYPE(Ang3)
-SERIALIZATION_TYPE(int8)
-SERIALIZATION_TYPE(int16)
-SERIALIZATION_TYPE(int32)
-SERIALIZATION_TYPE(int64)
-SERIALIZATION_TYPE(uint8)
-SERIALIZATION_TYPE(uint16)
-SERIALIZATION_TYPE(uint32)
-SERIALIZATION_TYPE(uint64)
-SERIALIZATION_TYPE(CTimeValue)
-SERIALIZATION_TYPE(SNetObjectID)
-SERIALIZATION_TYPE(XmlNodeRef) // not for network - only for save games
diff --git a/Code/CryEngine/CryCommon/SerializeFwd.h b/Code/CryEngine/CryCommon/SerializeFwd.h
deleted file mode 100644
index a7e06ec8b8..0000000000
--- a/Code/CryEngine/CryCommon/SerializeFwd.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : forward declaration of TSerialize
-
-#ifndef CRYINCLUDE_CRYCOMMON_SERIALIZEFWD_H
-#define CRYINCLUDE_CRYCOMMON_SERIALIZEFWD_H
-#pragma once
-
-
-
-template <class T>
-class CSerializeWrapper;
-struct ISerialize;
-typedef CSerializeWrapper<ISerialize> TSerialize;
-
-#endif // CRYINCLUDE_CRYCOMMON_SERIALIZEFWD_H
diff --git a/Code/CryEngine/CryCommon/SimpleSerialize.h b/Code/CryEngine/CryCommon/SimpleSerialize.h
deleted file mode 100644
index 01e5e3d9b4..0000000000
--- a/Code/CryEngine/CryCommon/SimpleSerialize.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_SIMPLESERIALIZE_H
-#define CRYINCLUDE_CRYCOMMON_SIMPLESERIALIZE_H
-#pragma once
-
-
-#include <ISerialize.h> // <> required for Interfuscator
-#include "TimeValue.h"
-
-template <bool READING>
-class CSimpleSerializeImpl_Reading;
-
-template <>
-class CSimpleSerializeImpl_Reading<true>
-{
-public:
-    CSimpleSerializeImpl_Reading()
-        : m_bCommit(true) {}
-    ILINE bool IsReading() const
-    {
-        return true;
-    }
-    ILINE bool ShouldCommitValues() const
-    {
-        return m_bCommit;
-    }
-    ILINE void Update(ISerializeUpdateFunction* pFunc)
-    {
-        if (m_bCommit)
-        {
-            pFunc->Execute();
-        }
-    }
-protected:
-    bool m_bCommit;
-};
-
-template <>
-class CSimpleSerializeImpl_Reading<false>
-{
-public:
-    ILINE bool IsReading() const
-    {
-        return false;
-    }
-    ILINE bool ShouldCommitValues() const
-    {
-        return true;
-    }
-    ILINE void Update(ISerializeUpdateFunction*)
-    {
-    }
-};
-
-template <bool READING, ESerializationTarget TARGET>
-class CSimpleSerializeImpl
-    : public CSimpleSerializeImpl_Reading<READING>
-{
-public:
-    CSimpleSerializeImpl()
-        : m_failed(false) {}
-    ILINE void BeginGroup(const char* szName)
-    {
-    }
-    ILINE void EndGroup()
-    {
-    }
-    ILINE ESerializationTarget GetSerializationTarget() const
-    {
-        return TARGET;
-    }
-    ILINE void FlagPartialRead() {}
-
-    ILINE bool Ok() const
-    {
-        return !m_failed;
-    }
-
-protected:
-    ILINE void Failed()
-    {
-        m_failed = true;
-    }
-
-private:
-    bool m_failed;
-};
-
-template <class Impl>
-class CSimpleSerialize
-    : public ISerialize
-{
-public:
-    ILINE CSimpleSerialize(Impl& impl)
-        : m_impl(impl)
-    {
-    }
-
-    void Update(ISerializeUpdateFunction* pFunc)
-    {
-        m_impl.Update(pFunc);
-    }
-
-    void BeginGroup(const char* szName)
-    {
-        m_impl.BeginGroup(szName);
-    }
-
-    bool BeginOptionalGroup(const char* szName, bool condition)
-    {
-        return m_impl.BeginOptionalGroup(szName, condition);
-    }
-
-    void EndGroup()
-    {
-        m_impl.EndGroup();
-    }
-
-    bool IsReading() const
-    {
-        return m_impl.IsReading();
-    }
-
-    bool ShouldCommitValues() const
-    {
-        return m_impl.ShouldCommitValues();
-    }
-
-    ESerializationTarget GetSerializationTarget() const
-    {
-        return m_impl.GetSerializationTarget();
-    }
-
-    void WriteStringValue(const char* name, SSerializeString& value, uint32 policy)
-    {
-        m_impl.Value(name, value, policy);
-    }
-    void ReadStringValue(const char* name, SSerializeString& curValue, uint32 policy)
-    {
-        m_impl.Value(name, curValue, policy);
-    }
-
-    bool Ok() const
-    {
-        return m_impl.Ok();
-    }
-
-    void FlagPartialRead()
-    {
-        m_impl.FlagPartialRead();
-    }
-
-#define SERIALIZATION_TYPE(T) \
-    virtual void Value(const char* name, T & x, uint32 policy) { m_impl.Value(name, x, policy); }
-#include "SerializationTypes.h"
-#undef SERIALIZATION_TYPE
-
-#define SERIALIZATION_TYPE(T) \
-    virtual void ValueWithDefault([[maybe_unused]] const char* name, [[maybe_unused]] T & x, [[maybe_unused]] const T&defaultValue) { assert(0); }
-#include "SerializationTypes.h"
-    SERIALIZATION_TYPE(SSerializeString)
-#undef SERIALIZATION_TYPE
-
-    Impl * GetInnerImpl() {
-        return &m_impl;
-    }
-
-protected:
-    Impl& m_impl;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Support serialization with default values,
-// Require Implementation serialization stub to have Value() method returning boolean.
-//////////////////////////////////////////////////////////////////////////
-template <class Impl>
-class CSimpleSerializeWithDefaults
-    : public CSimpleSerialize<Impl>
-{
-public:
-    ILINE CSimpleSerializeWithDefaults(Impl& impl)
-        : CSimpleSerialize<Impl>(impl) {}
-
-#define SERIALIZATION_TYPE(T)                                                      \
-    virtual void ValueWithDefault(const char* name, T & x, const T&defaultValue) { \
-        if (CSimpleSerialize<Impl>::m_impl.IsReading()) {                          \
-            if (!CSimpleSerialize<Impl>::m_impl.Value(name, x, 0)) {               \
-                x = defaultValue; }                                                \
-        }                                                                          \
-        else if (x != defaultValue) {                                              \
-            CSimpleSerialize<Impl>::m_impl.Value(name, x, 0); }                    \
-    }
-#include "SerializationTypes.h"
-    SERIALIZATION_TYPE(SSerializeString)
-#undef SERIALIZATION_TYPE
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_SIMPLESERIALIZE_H
diff --git a/Code/CryEngine/CryCommon/StatObjBus.h b/Code/CryEngine/CryCommon/StatObjBus.h
deleted file mode 100644
index cefdc4b7c7..0000000000
--- a/Code/CryEngine/CryCommon/StatObjBus.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_CRYCOMMON_STATOBJBUS_H
-#define CRYINCLUDE_CRYCOMMON_STATOBJBUS_H
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/std/containers/unordered_set.h>
-
-struct IStatObj;
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Ebus support for handling unique IDs between IStatInstGroup instances.
-//
-//////////////////////////////////////////////////////////////////////////
-using StatInstGroupId = int;
-
-class StatInstGroupEvents
-    : public AZ::EBusTraits
-{
-public:
-    const static StatInstGroupId s_InvalidStatInstGroupId = -1;
-
-    virtual ~StatInstGroupEvents() = 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 StatInstGroupId GenerateStatInstGroupId() = 0;
-    virtual void ReleaseStatInstGroupId(StatInstGroupId statInstGroupId) = 0;
-    virtual void ReleaseStatInstGroupIdSet(const AZStd::unordered_set<StatInstGroupId>& statInstGroupIdSet) = 0;
-    virtual void ReserveStatInstGroupIdRange(StatInstGroupId from, StatInstGroupId to) = 0;
-};
-
-using StatInstGroupEventBus = AZ::EBus<StatInstGroupEvents>;
-
-//////////////////////////////////////////////////////////////////////////
-//
-// 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>;
-
-#endif // CRYINCLUDE_CRYCOMMON_STATOBJBUS_H
-#pragma once
diff --git a/Code/CryEngine/CryCommon/StaticInstance.h b/Code/CryEngine/CryCommon/StaticInstance.h
deleted file mode 100644
index 5303c3fd73..0000000000
--- a/Code/CryEngine/CryCommon/StaticInstance.h
+++ /dev/null
@@ -1,683 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-template <class T>
-class StaticInstanceSpecialization
-{
-};
-
-// Specializations for std::vector and std::map which allows us to modify the 
-// least amount of legacy code by mirroring the std APIs that are in use
-// These are not intended to be complete, just enough to shim existing legacy code
-template <typename U, class A>
-class StaticInstanceSpecialization<std::vector<U, A>>
-{
-public:
-    using Container = std::vector<U, A>;
-    using reference = typename Container::reference;
-    using const_reference = typename Container::const_reference;
-    using iterator = typename Container::iterator;
-    using const_iterator = typename Container::const_iterator;
-    using pointer = typename Container::pointer;
-    using const_pointer = typename Container::const_pointer;
-    using size_type = typename Container::size_type;
-
-    template <class Integral>
-    AZ_FORCE_INLINE 
-    typename AZStd::enable_if<AZStd::is_integral<Integral>::value, reference>::type
-    operator[](Integral index)
-    {
-        return get()[size_type(index)];
-    }
-
-    template <class Integral>
-    AZ_FORCE_INLINE
-    typename AZStd::enable_if<AZStd::is_integral<Integral>::value, const_reference>::type
-    operator[](Integral index) const
-    {
-        return get()[size_type(index)];
-    }
-
-    AZ_FORCE_INLINE iterator begin()
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE const_iterator begin() const
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE iterator end()
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE const_iterator end() const
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE iterator erase(iterator it)
-    {
-        return get().erase(it);
-    }
-
-    AZ_FORCE_INLINE iterator erase(iterator first, iterator last)
-    {
-        return get().erase(first, last);
-    }
-
-    AZ_FORCE_INLINE void resize(size_t size)
-    {
-        get().resize(size);
-    }
-
-    AZ_FORCE_INLINE void reserve(size_t size)
-    {
-        get().reserve(size);
-    }
-
-    AZ_FORCE_INLINE void clear()
-    {
-        get().clear();
-    }
-
-    AZ_FORCE_INLINE size_type size()
-    {
-        return get().size();
-    }
-
-    AZ_FORCE_INLINE void push_back(U&& val)
-    {
-        get().push_back(val);
-    }
-
-    AZ_FORCE_INLINE void push_back(const U& val)
-    {
-        get().push_back(val);
-    }
-
-    AZ_FORCE_INLINE bool empty() const
-    {
-        return get().empty();
-    }
-
-    AZ_FORCE_INLINE iterator insert(U&& val)
-    {
-        return get().insert(val);
-    }
-
-    AZ_FORCE_INLINE iterator insert(iterator it, U&& val)
-    {
-        return get().insert(it, val);
-    }
-
-    AZ_FORCE_INLINE reference front()
-    {
-        return get().front();
-    }
-
-    AZ_FORCE_INLINE const_reference front() const
-    {
-        return get().front();
-    }
-
-    AZ_FORCE_INLINE reference back()
-    {
-        return get().back();
-    }
-
-    AZ_FORCE_INLINE const_reference back() const
-    {
-        return get().back();
-    }
-
-    AZ_FORCE_INLINE void pop_back()
-    {
-        get().pop_back();
-    }
-
-    AZ_FORCE_INLINE pointer data()
-    {
-        return get().data();
-    }
-
-    AZ_FORCE_INLINE const_pointer data() const
-    {
-        return get().data();
-    }
-
-    void swap(Container& other)
-    {
-        get().swap(other);
-    }
-
-private:
-    Container& get() const;
-};
-
-
-template <typename U, class A>
-class StaticInstanceSpecialization<std::list<U, A>>
-{
-public:
-    using Container = std::list<U, A>;
-    using reference = typename Container::reference;
-    using const_reference = typename Container::const_reference;
-    using iterator = typename Container::iterator;
-    using const_iterator = typename Container::const_iterator;
-    using pointer = typename Container::pointer;
-    using const_pointer = typename Container::const_pointer;
-    using size_type = typename Container::size_type;
-
-    AZ_FORCE_INLINE iterator begin()
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE const_iterator begin() const
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE iterator end()
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE const_iterator end() const
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE iterator erase(iterator it)
-    {
-        return get().erase(it);
-    }
-
-    AZ_FORCE_INLINE iterator erase(iterator first, iterator last)
-    {
-        return get().erase(first, last);
-    }
-
-    AZ_FORCE_INLINE void resize(size_t size)
-    {
-        get().resize(size);
-    }
-
-    AZ_FORCE_INLINE void reserve(size_t size)
-    {
-        get().reserve(size);
-    }
-
-    AZ_FORCE_INLINE void clear()
-    {
-        get().clear();
-    }
-
-    AZ_FORCE_INLINE size_type size()
-    {
-        return get().size();
-    }
-
-    AZ_FORCE_INLINE void push_back(U&& val)
-    {
-        get().push_back(val);
-    }
-
-    AZ_FORCE_INLINE void push_back(const U& val)
-    {
-        get().push_back(val);
-    }
-
-    AZ_FORCE_INLINE void push_front(U&& val)
-    {
-        get().push_front(val);
-    }
-
-    AZ_FORCE_INLINE void push_front(const U& val)
-    {
-        get().push_front(val);
-    }
-
-    AZ_FORCE_INLINE bool empty() const
-    {
-        return get().empty();
-    }
-
-    AZ_FORCE_INLINE iterator insert(U&& val)
-    {
-        return get().insert(val);
-    }
-
-    AZ_FORCE_INLINE iterator insert(iterator it, U&& val)
-    {
-        return get().insert(it, val);
-    }
-
-    AZ_FORCE_INLINE reference front()
-    {
-        return get().front();
-    }
-
-    AZ_FORCE_INLINE const_reference front() const
-    {
-        return get().front();
-    }
-
-    AZ_FORCE_INLINE reference back()
-    {
-        return get().back();
-    }
-
-    AZ_FORCE_INLINE const_reference back() const
-    {
-        return get().back();
-    }
-
-    AZ_FORCE_INLINE void pop_back()
-    {
-        get().pop_back();
-    }
-
-    AZ_FORCE_INLINE pointer data()
-    {
-        return get().data();
-    }
-
-    AZ_FORCE_INLINE const_pointer data() const
-    {
-        return get().data();
-    }
-
-    void swap(Container& other)
-    {
-        get().swap(other);
-    }
-
-private:
-    Container& get() const;
-};
-
-template <class K, class V, class Less, class Allocator>
-class StaticInstanceSpecialization<std::map<K, V, Less, Allocator>>
-{
-public:
-    using Container = std::map<K, V, Less, Allocator>;
-    using reference = typename Container::reference;
-    using const_reference = typename Container::const_reference;
-    using iterator = typename Container::iterator;
-    using const_iterator = typename Container::const_iterator;
-    using key_type = typename Container::key_type;
-    using mapped_type = typename Container::mapped_type;
-    using value_type = typename Container::value_type;
-    using size_type = typename Container::size_type;
-
-    using pair_iter_bool = std::pair<iterator, bool>;
-    
-
-    AZ_FORCE_INLINE iterator begin()
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE const_iterator begin() const
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE iterator end()
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE const_iterator end() const
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE iterator erase(iterator it)
-    {
-        return get().erase(it);
-    }
-
-    AZ_FORCE_INLINE size_t erase(const key_type& key)
-    {
-        return get().erase(key);
-    }
-
-    AZ_FORCE_INLINE mapped_type& operator[](const key_type& key)
-    {
-        return get()[key];
-    }
-
-    template <class K2>
-    AZ_FORCE_INLINE 
-    typename AZStd::enable_if<AZStd::is_constructible<key_type, K2>::value, mapped_type&>::type
-    operator[](const K2& keylike)
-    {
-        return get()[key_type(keylike)];
-    }
-
-    AZ_FORCE_INLINE iterator find(const key_type& key)
-    {
-        return get().find(key);
-    }
-
-    AZ_FORCE_INLINE const_iterator find(const key_type& key) const
-    {
-        return get().find(key);
-    }
-
-    AZ_FORCE_INLINE void clear()
-    {
-        get().clear();
-    }
-
-    AZ_FORCE_INLINE bool empty() const
-    {
-        return get().empty();
-    }
-
-    AZ_FORCE_INLINE iterator insert(iterator hint, const value_type& kv)
-    {
-        return get().insert(hint, kv);
-    }
-
-    AZ_FORCE_INLINE pair_iter_bool insert(const value_type& kv)
-    {
-        return get().insert(kv);
-    }
-
-    AZ_FORCE_INLINE size_type size() const
-    {
-        return get().size();
-    }
-
-    void swap(Container& cont)
-    {
-        get().swap(cont);
-    }
-
-private:
-    Container& get() const;
-};
-
-template <class K, class V, class Less, class Allocator>
-class StaticInstanceSpecialization<std::multimap<K, V, Less, Allocator>>
-{
-public:
-    using Container = std::multimap<K, V, Less, Allocator>;
-    using reference = typename Container::reference;
-    using const_reference = typename Container::const_reference;
-    using iterator = typename Container::iterator;
-    using const_iterator = typename Container::const_iterator;
-    using key_type = typename Container::key_type;
-    using mapped_type = typename Container::mapped_type;
-    using value_type = typename Container::value_type;
-    using size_type = typename Container::size_type;
-
-    AZ_FORCE_INLINE iterator begin()
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE const_iterator begin() const
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE iterator end()
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE const_iterator end() const
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE iterator erase(iterator it)
-    {
-        return get().erase(it);
-    }
-
-    AZ_FORCE_INLINE size_t erase(const key_type& key)
-    {
-        return get().erase(key);
-    }
-
-    AZ_FORCE_INLINE iterator find(const key_type& key)
-    {
-        return get().find(key);
-    }
-
-    AZ_FORCE_INLINE const_iterator find(const key_type& key) const
-    {
-        return get().find(key);
-    }
-
-    AZ_FORCE_INLINE void clear()
-    {
-        get().clear();
-    }
-
-    AZ_FORCE_INLINE bool empty() const
-    {
-        return get().empty();
-    }
-
-    AZ_FORCE_INLINE iterator insert(value_type&& kv)
-    {
-        return get().insert(kv);
-    }
-
-    AZ_FORCE_INLINE iterator insert(const value_type& kv)
-    {
-        return get().insert(kv);
-    }
-
-    AZ_FORCE_INLINE size_type size() const
-    {
-        return get().size();
-    }
-
-private:
-    Container& get() const;
-};
-
-template <class T, class Less, class Allocator>
-class StaticInstanceSpecialization<std::set<T, Less, Allocator>>
-{
-public:
-    using Container = std::set<T, Less, Allocator>;
-    using reference = typename Container::reference;
-    using const_reference = typename Container::const_reference;
-    using iterator = typename Container::iterator;
-    using const_iterator = typename Container::const_iterator;
-    using value_type = typename Container::value_type;
-    using size_type = typename Container::size_type;
-
-    using pair_iter_bool = std::pair<iterator, bool>;
-
-    AZ_FORCE_INLINE iterator begin()
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE const_iterator begin() const
-    {
-        return get().begin();
-    }
-
-    AZ_FORCE_INLINE iterator end()
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE const_iterator end() const
-    {
-        return get().end();
-    }
-
-    AZ_FORCE_INLINE iterator erase(iterator it)
-    {
-        return get().erase(it);
-    }
-
-    AZ_FORCE_INLINE size_t erase(const value_type& key)
-    {
-        return get().erase(key);
-    }
-
-    AZ_FORCE_INLINE iterator find(const value_type& key)
-    {
-        return get().find(key);
-    }
-
-    AZ_FORCE_INLINE const_iterator find(const value_type& key) const
-    {
-        return get().find(key);
-    }
-
-    AZ_FORCE_INLINE void clear()
-    {
-        get().clear();
-    }
-
-    AZ_FORCE_INLINE bool empty() const
-    {
-        return get().empty();
-    }
-
-    AZ_FORCE_INLINE pair_iter_bool insert(value_type&& kv)
-    {
-        return get().insert(kv);
-    }
-
-    AZ_FORCE_INLINE pair_iter_bool insert(const value_type& kv)
-    {
-        return get().insert(kv);
-    }
-
-    AZ_FORCE_INLINE size_type size() const
-    {
-        return get().size();
-    }
-
-private:
-    Container& get() const;
-};
-
-// This is a non-thread safe version of AZStd::static_storage, used purely to lazy
-// initialize various Cry DLL statics/singletons. They are created on first access.
-template <class T, class Destructor=AZStd::default_destruct<T>>
-class StaticInstance
-    : public StaticInstanceSpecialization<T>
-{
-public:
-    template <class ...Args>
-    StaticInstance(Args&& ...args)
-    {
-        // We need to pass args as a copy to avoid taking references to values that dont support it.
-        // For example, if an enum value is being passed in args, we would lost the value inside the lambda
-        m_ctor = [=]()
-        {
-            return Create(args...);
-        };
-    }
-
-    ~StaticInstance()
-    {
-        if (m_instance)
-        {
-            Destructor()(m_instance);
-        }
-    }
-
-    AZ_FORCE_INLINE T* operator->() const
-    {
-        return Get();
-    }
-
-    AZ_FORCE_INLINE operator T*() const
-    {
-        return Get();
-    }
-
-    AZ_FORCE_INLINE operator T&() const
-    {
-        return *Get();
-    }
-
-    AZ_FORCE_INLINE T* operator&() const
-    {
-        return Get();
-    }
-
-    AZ_FORCE_INLINE operator bool() const
-    {
-        return m_instance != nullptr;
-    }
-
-private:
-    StaticInstance(const StaticInstance&) = delete;
-    StaticInstance(StaticInstance&&) = delete;
-    StaticInstance& operator=(const StaticInstance&) = delete;
-
-    template <class ...Args>
-    T* Create(Args&& ...args) const
-    {
-        return new((void*)&m_storage) T(AZStd::forward<Args>(args)...);
-    }
-
-    T* Get() const
-    {
-        if (!m_instance)
-        {
-            m_instance = m_ctor();
-        }
-        return m_instance;
-    }
-
-    mutable T* m_instance = nullptr;
-    mutable typename AZStd::aligned_storage<sizeof(T), AZStd::alignment_of<T>::value>::type m_storage;
-    AZStd::function<T*()> m_ctor;
-};
-
-template <typename U, class A>
-std::vector<U, A>& StaticInstanceSpecialization<std::vector<U, A>>::get() const
-{
-    return *(*static_cast<const StaticInstance<std::vector<U, A>>*>(this));
-}
-
-template <typename U, class A>
-std::list<U, A>& StaticInstanceSpecialization<std::list<U, A>>::get() const
-{
-    return *(*static_cast<const StaticInstance<std::list<U, A>>*>(this));
-}
-
-template <class K, class V, class Less, class Allocator>
-std::map<K, V, Less, Allocator>& StaticInstanceSpecialization<std::map<K, V, Less, Allocator>>::get() const
-{
-    return *(*static_cast<const StaticInstance<std::map<K, V, Less, Allocator>>*>(this));
-}
-
-template <class K, class V, class Less, class Allocator>
-std::multimap<K, V, Less, Allocator>& StaticInstanceSpecialization<std::multimap<K, V, Less, Allocator>>::get() const
-{
-    return *(*static_cast<const StaticInstance<std::multimap<K, V, Less, Allocator>>*>(this));
-}
-
-template <class T, class Less, class Allocator>
-std::set<T, Less, Allocator>& StaticInstanceSpecialization<std::set<T, Less, Allocator>>::get() const
-{
-    return *(*static_cast<const StaticInstance<std::set<T, Less, Allocator>>*>(this));
-}
diff --git a/Code/CryEngine/CryCommon/StereoRendererBus.h b/Code/CryEngine/CryCommon/StereoRendererBus.h
deleted file mode 100644
index d89e347f9f..0000000000
--- a/Code/CryEngine/CryCommon/StereoRendererBus.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-namespace AZ
-{
-    ///
-    /// The Stereo Renderer bus allows other systems to query various properties on the stereo renderer
-    ///
-    class StereoRendererBus
-        : public EBusTraits
-    {
-    public:
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBus Traits
-        static const EBusHandlerPolicy HandlerPolicy = EBusHandlerPolicy::Multiple;
-        static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::Single;
-        using MutexType = AZStd::recursive_mutex;
-        //////////////////////////////////////////////////////////////////////////
-
-        virtual ~StereoRendererBus() {}
-
-        ///
-        /// Return whether the renderer is rendering to the HMD 
-        /// 
-        /// @return True if rendering to the HMD
-        ///
-        virtual bool IsRenderingToHMD() { return false; }
-
-    protected:
-    };
-
-    using StereoRendererRequestBus = EBus < StereoRendererBus >;
-}
diff --git a/Code/CryEngine/CryCommon/StlUtils.h b/Code/CryEngine/CryCommon/StlUtils.h
deleted file mode 100644
index 0b8db7c76c..0000000000
--- a/Code/CryEngine/CryCommon/StlUtils.h
+++ /dev/null
@@ -1,1030 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Various convenience utility functions for STL and alike
-//               Used in Animation subsystem, and in some tools
-#ifndef CRYINCLUDE_CRYCOMMON_STLUTILS_H
-#define CRYINCLUDE_CRYCOMMON_STLUTILS_H
-#pragma once
-
-#include <unordered_map>
-#include <unordered_set>
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/std/containers/unordered_set.h>
-
-#if (defined(LINUX) || defined(APPLE))
-    #include "platform.h"
-#endif
-
-#define STATIC_ASSERT(condition, errMessage) static_assert(condition, errMessage)
-
-#include <map>
-#include <set>
-#include <algorithm>
-#include <deque>
-#include <vector>
-
-#undef std__hash_map
-#define std__hash_map AZStd::unordered_map
-#define std__unordered_set AZStd::unordered_set
-#define std__hash_multimap AZStd::unordered_multimap
-#define std__hash AZStd::hash
-#define std__unordered_map AZStd::unordered_map
-
-template <class T, class Destructor>
-class StaticInstance;
-
-// auto-cleaner: upon destruction, calls the clear() method
-template <class T>
-class CAutoClear
-{
-public:
-    CAutoClear (T* p)
-        : m_p(p) {}
-    ~CAutoClear () {m_p->clear(); }
-protected:
-    T* m_p;
-};
-
-
-template <class Container>
-unsigned sizeofArray (const Container& arr)
-{
-    return (unsigned)(sizeof(typename Container::value_type) * arr.size());
-}
-
-template <class Container>
-unsigned sizeofVector (const Container& arr)
-{
-    return (unsigned)(sizeof(typename Container::value_type) * arr.capacity());
-}
-
-template <class Container>
-unsigned sizeofArray (const Container& arr, unsigned nSize)
-{
-    return arr.empty() ? 0u : (unsigned)(sizeof(typename Container::value_type) * nSize);
-}
-
-template <class Container>
-unsigned capacityofArray (const Container& arr)
-{
-    return (unsigned)(arr.capacity() * sizeof(arr[0]));
-}
-
-template <class T>
-unsigned countElements (const std::vector<T>& arrT, const T& x)
-{
-    unsigned nSum = 0;
-    for (typename std::vector<T>::const_iterator iter = arrT.begin(); iter != arrT.end(); ++iter)
-    {
-        if (x == *iter)
-        {
-            ++nSum;
-        }
-    }
-    return nSum;
-}
-
-// [Timur]
-/** Contain extensions for STL library.
-*/
-namespace stl
-{
-    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Compare member of class/struct.
-    //
-    // e.g. Sort Vec3s by x component
-    //
-    //           std::sort(vec3s.begin(), vec3s.end(), stl::member_compare<Vec3, float, &Vec3::x>());
-    //
-    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    template <typename OWNER_TYPE, typename MEMBER_TYPE, MEMBER_TYPE OWNER_TYPE::* MEMBER_PTR, typename EQUALITY = std::less<MEMBER_TYPE> >
-    struct member_compare
-    {
-        inline bool operator () (const OWNER_TYPE& lhs, const OWNER_TYPE& rhs) const
-        {
-            return EQUALITY()(lhs.*MEMBER_PTR, rhs.*MEMBER_PTR);
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Compare member of class/struct against parameter.
-    //
-    // e.g. Find Vec3 with x component less than 1.0
-    //
-    //           std::find_if(vec3s.begin(), vec3s.end(), stl::member_compare_param<Vec3, float, &Vec3::x>(1.0f));
-    //
-    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    template <typename OWNER_TYPE, typename MEMBER_TYPE, MEMBER_TYPE OWNER_TYPE::* MEMBER_PTR, typename EQUALITY = std::less<MEMBER_TYPE> >
-    struct member_compare_param
-    {
-        inline member_compare_param(const MEMBER_TYPE& _value)
-            : value(_value)
-        {
-        }
-
-        inline bool operator () (const OWNER_TYPE& rhs) const
-        {
-            return EQUALITY()(rhs.*MEMBER_PTR, value);
-        }
-
-        const MEMBER_TYPE& value;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Searches the given entry in the map by key, and if there is none, returns the default value
-    //////////////////////////////////////////////////////////////////////////
-    template <typename Map>
-    inline typename Map::mapped_type find_in_map(const Map& mapKeyToValue, const typename Map::key_type& key, typename Map::mapped_type valueDefault)
-    {
-        typename Map::const_iterator it = mapKeyToValue.find (key);
-        if (it == mapKeyToValue.end())
-        {
-            return valueDefault;
-        }
-        else
-        {
-            return it->second;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Inserts and returns a reference to the given value in the map, or returns the current one if it's already there.
-    //////////////////////////////////////////////////////////////////////////
-    template <typename Map>
-    inline typename Map::mapped_type& map_insert_or_get(Map& mapKeyToValue, const typename Map::key_type& key, const typename Map::mapped_type& defValue = typename Map::mapped_type())
-    {
-        auto&& iresult = mapKeyToValue.insert(typename Map::value_type(key, defValue));
-        return iresult.first->second;
-    }
-
-    // searches the given entry in the map by key, and if there is none, returns the default value
-    // The values are taken/returned in REFERENCEs rather than values
-    template <typename Key, typename mapped_type, typename Traits, typename Allocator>
-    inline mapped_type& find_in_map_ref(std::map<Key, mapped_type, Traits, Allocator>& mapKeyToValue, const Key& key, mapped_type& valueDefault)
-    {
-        typedef std::map<Key, mapped_type, Traits, Allocator> Map;
-        typename Map::iterator it = mapKeyToValue.find (key);
-        if (it == mapKeyToValue.end())
-        {
-            return valueDefault;
-        }
-        else
-        {
-            return it->second;
-        }
-    }
-
-    template <typename Key, typename mapped_type, typename Traits, typename Allocator>
-    inline const mapped_type& find_in_map_ref(const std::map<Key, mapped_type, Traits, Allocator>& mapKeyToValue, const Key& key, const mapped_type& valueDefault)
-    {
-        typedef std::map<Key, mapped_type, Traits, Allocator> Map;
-        typename Map::const_iterator it = mapKeyToValue.find (key);
-        if (it == mapKeyToValue.end())
-        {
-            return valueDefault;
-        }
-        else
-        {
-            return it->second;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Fills vector with contents of map.
-    //////////////////////////////////////////////////////////////////////////
-    template <class Map, class Vector>
-    inline void map_to_vector(const Map& theMap, Vector& array)
-    {
-        array.resize(0);
-        array.reserve(theMap.size());
-        for (typename Map::const_iterator it = theMap.begin(); it != theMap.end(); ++it)
-        {
-            array.push_back(it->second);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Fills vector with contents of set.
-    //////////////////////////////////////////////////////////////////////////
-    template <class Set, class Vector>
-    inline void set_to_vector(const Set& theSet, Vector& array)
-    {
-        array.resize(0);
-        array.reserve(theSet.size());
-        for (typename Set::const_iterator it = theSet.begin(); it != theSet.end(); ++it)
-        {
-            array.push_back(*it);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find and erase element from container.
-    // @return true if item was find and erased, false if item not found.
-    //////////////////////////////////////////////////////////////////////////
-    template <class Container, class Value>
-    inline bool find_and_erase(Container& container, const Value& value)
-    {
-        typename Container::iterator it = AZStd::find(container.begin(), container.end(), value);
-        if (it != container.end())
-        {
-            container.erase(it);
-            return true;
-        }
-        return false;
-    }
-
-    template <typename K, typename P, typename A>
-    inline bool find_and_erase(std::set<K, P, A>& container, const K& value)
-    {
-        return container.erase(value) > 0;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find and erase element from container.
-    // @return true if item was find and erased, false if item not found.
-    //////////////////////////////////////////////////////////////////////////
-    template <class CONTAINER, class PREDICATE>
-    inline bool find_and_erase_if(CONTAINER& container, const PREDICATE& predicate)
-    {
-        typename CONTAINER::iterator end = container.end(), i = std::find_if(container.begin(), end, predicate);
-
-        if (i != end)
-        {
-            container.erase(i);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find and erase all elements matching value from container.
-    // Assume that this will invalidate any exiting iterators.
-    // Commonly used for removing NULL pointers from collections.
-    //////////////////////////////////////////////////////////////////////////
-    template <class Container>
-    inline void find_and_erase_all(Container& container, const typename Container::value_type& value)
-    {
-        // Shuffles all elements != value to the front and returns the start of the removed elements.
-        typename Container::iterator endIter(container.end());
-        typename Container::iterator newEndIter(std::remove(container.begin(), endIter, value));
-
-        // Delete the removed range at the back of the container (low-cost for vector).
-        container.erase(newEndIter, endIter);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find and erase element from map.
-    // @return true if item was find and erased, false if item not found.
-    //////////////////////////////////////////////////////////////////////////
-    template <class Container, class Key>
-    inline bool member_find_and_erase(Container& container, const Key& key)
-    {
-        typename Container::iterator it = container.find (key);
-        if (it != container.end())
-        {
-            container.erase(it);
-            return true;
-        }
-        return false;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Push back to container unique element.
-    // @return true if item added, false overwise.
-    template <class Container, class Value>
-    inline bool push_back_unique(Container& container, const Value& value)
-    {
-        if (AZStd::find(container.begin(), container.end(), value) == container.end())
-        {
-            container.push_back(value);
-            return true;
-        }
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Push back to container unique element.
-    // @return true if item added, false overwise.
-    template <class CONTAINER, class PREDICATE, typename VALUE>
-    inline bool push_back_unique_if(CONTAINER& container, const PREDICATE& predicate, const VALUE& value)
-    {
-        typename CONTAINER::iterator    end = container.end();
-
-        if (AZStd::find_if(container.begin(), end, predicate) == end)
-        {
-            container.push_back(value);
-
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Push back to container contents of another container
-    template <class Container, class Iter>
-    inline void push_back_range(Container& container, Iter begin, Iter end)
-    {
-        for (Iter it = begin; it != end; ++it)
-        {
-            container.push_back(*it);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Push back to container contents of another container, if not already present
-    template <class Container, class Iter>
-    inline void push_back_range_unique(Container& container, Iter begin, Iter end)
-    {
-        for (Iter it = begin; it != end; ++it)
-        {
-            push_back_unique(container, *it);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find element in container.
-    // @return true if item found.
-    template <class Container, class Value>
-    inline bool find(Container& container, const Value& value)
-    {
-        return std::find(container.begin(), container.end(), value) != container.end();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find element in a sorted container using binary search with logarithmic efficiency.
-    //
-    template <class Iterator, class T>
-    inline Iterator binary_find(Iterator first, Iterator last, const T& value)
-    {
-        Iterator it = std::lower_bound(first, last, value);
-        return (it == last || value != *it) ? last : it;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find element in a sorted container using binary search with logarithmic efficiency.
-    // @return true if item was inserted.
-    template <class Container, class Value>
-    inline bool binary_insert_unique(Container& container, const Value& value)
-    {
-        typename Container::iterator it = std::lower_bound(container.begin(), container.end(), value);
-        if (it != container.end())
-        {
-            if (*it == value)
-            {
-                return false;
-            }
-            container.insert(it, value);
-        }
-        else
-        {
-            container.insert(container.end(), value);
-        }
-        return true;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    //! Find element in a sorted container using binary search with logarithmic efficiency.
-    // and erases if element found.
-    // @return true if item was erased.
-    template <class Container, class Value>
-    inline bool binary_erase(Container& container, const Value& value)
-    {
-        typename Container::iterator it = std::lower_bound(container.begin(), container.end(), value);
-        if (it != container.end() && *it == value)
-        {
-            container.erase(it);
-            return true;
-        }
-        return false;
-    }
-
-    template <typename ItT, typename Func>
-    ItT remove_from_heap(ItT begin, ItT end, ItT at, Func order)
-    {
-        using std::swap;
-
-        --end;
-        if (at == end)
-        {
-            return at;
-        }
-
-        size_t idx = std::distance(begin, at);
-        swap(*end, *at);
-
-        size_t length = std::distance(begin, end);
-        size_t parent, child;
-
-        if (idx > 0 && order(*(begin + idx / 2), *(begin + idx)))
-        {
-            do
-            {
-                parent = idx / 2;
-                swap(*(begin + idx), *(begin + parent));
-                idx = parent;
-
-                if (idx == 0 || order(*(begin + idx), *(begin + idx / 2)))
-                {
-                    return end;
-                }
-            }
-            while (true);
-        }
-        else
-        {
-            do
-            {
-                child = idx * 2 + 1;
-                if (child >= length)
-                {
-                    return end;
-                }
-
-                ItT left = begin + child;
-                ItT right = begin + child + 1;
-
-                if (right < end && order(*left, *right))
-                {
-                    ++child;
-                }
-
-                if (order(*(begin + child), *(begin + idx)))
-                {
-                    return end;
-                }
-
-                swap(*(begin + child), *(begin + idx));
-                idx = child;
-            }
-            while (true);
-        }
-
-        return end;
-    }
-
-    struct container_object_deleter
-    {
-        template<typename T>
-        void operator()(const T* ptr) const
-        {
-            delete ptr;
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Convert arbitary class to const char*
-    //////////////////////////////////////////////////////////////////////////
-    template <class Type>
-    inline const char* constchar_cast(const Type& type)
-    {
-        return type;
-    }
-
-    //! Specialization of string to const char cast.
-    template <>
-    inline const char* constchar_cast(const string& type)
-    {
-        return type.c_str();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Case sensetive less key for any type convertable to const char*.
-    //////////////////////////////////////////////////////////////////////////
-    template <class Type>
-    struct less_strcmp
-    {
-        bool operator()(const Type& left, const Type& right) const
-        {
-            return strcmp(constchar_cast(left), constchar_cast(right)) < 0;
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Case insensetive less key for any type convertable to const char*.
-    template <class Type>
-    struct less_stricmp
-    {
-        bool operator()(const Type& left, const Type& right) const
-        {
-            return _stricmp(constchar_cast(left), constchar_cast(right)) < 0;
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Hash map usage:
-    // typedef AZStd::unordered_map<string,int, stl::hash_string_insensitve<string>, stl::equality_string_insensitive<string> > StringToIntHash;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // useful when the key is already the result of an hash function
-    // key needs to be convertible to size_t
-    //////////////////////////////////////////////////////////////////////////
-    template <class Key>
-    class hash_simple
-    {
-    public:
-        enum    // parameters for hash table
-        {
-            bucket_size = 4,    // 0 < bucket_size
-            min_buckets = 8
-        };// min_buckets = 2 ^^ N, 0 < N
-
-        size_t operator()(const Key& key) const
-        {
-            return size_t(key);
-        };
-        bool operator()(const Key& key1, const Key& key2) const
-        {
-            return key1 < key2;
-        }
-    };
-
-    // simple hash class that has the avalanche property (a change in one bit affects all others)
-    // ... use this if you have uint32 key values!
-    class hash_uint32
-    {
-    public:
-        enum    // parameters for hash table
-        {
-            bucket_size = 4,    // 0 < bucket_size
-            min_buckets = 8  // min_buckets = 2 ^^ N, 0 < N
-        };
-
-        ILINE size_t operator()(uint32 a) const
-        {
-            a = (a + 0x7ed55d16) + (a << 12);
-            a = (a ^ 0xc761c23c) ^ (a >> 19);
-            a = (a + 0x165667b1) + (a << 5);
-            a = (a + 0xd3a2646c) ^ (a << 9);
-            a = (a + 0xfd7046c5) + (a << 3);
-            a = (a ^ 0xb55a4f09) ^ (a >> 16);
-            return a;
-        };
-        bool operator()(uint32 key1, uint32 key2) const
-        {
-            return key1 < key2;
-        }
-    };
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Case sensitive string hash
-    //////////////////////////////////////////////////////////////////////////
-    template <class Key>
-    class hash_string
-    {
-    public:
-        enum    // parameters for hash table
-        {
-            bucket_size = 4,    // 0 < bucket_size
-            min_buckets = 8
-        };// min_buckets = 2 ^^ N, 0 < N
-
-        size_t operator()(const Key& key) const
-        {
-            unsigned int h = 0;
-            const char* s = constchar_cast(key);
-            for (; *s; ++s)
-            {
-                h = 5 * h + *(unsigned char*)s;
-            }
-            return size_t(h);
-        };
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Case sensitive string equality
-    //////////////////////////////////////////////////////////////////////////
-    template <class Key>
-    class equality_string
-    {
-    public:
-        bool operator()(const Key& key1, const Key& key2) const
-        {
-            return strcmp(constchar_cast(key1), constchar_cast(key2)) == 0;
-        }
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Case insensitive string hasher
-    //////////////////////////////////////////////////////////////////////////
-    template <class Key>
-    class hash_string_caseless
-    {
-    public:
-        enum    // parameters for hash table
-        {
-            bucket_size = 4,    // 0 < bucket_size
-            min_buckets = 8
-        };// min_buckets = 2 ^^ N, 0 < N
-
-        size_t operator()(const Key& key) const
-        {
-            unsigned int h = 0;
-            const char* s = constchar_cast(key);
-            for (; *s; ++s)
-            {
-                h = 5 * h + tolower(*(unsigned char*)s);
-            }
-            return size_t(h);
-        };
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Case insensitive string comparer
-    //////////////////////////////////////////////////////////////////////////
-    template <class Key>
-    class equality_string_caseless
-    {
-    public:
-        bool operator()(const Key& key1, const Key& key2) const
-        {
-            return _stricmp(constchar_cast(key1), constchar_cast(key2)) == 0;
-        }
-    };
-
-
-    // Support for both Microsoft and SGI kind of hash_map.
-
-#if defined(_STLP_HASH_MAP) || defined(APPLE) || defined(LINUX)
-    // STL Port
-    template <class _Key, class _Predicate = std::less<_Key> >
-    struct hash_compare
-    {
-        enum
-        {   // parameters for hash table
-            bucket_size = 4,    // 0 < bucket_size
-            min_buckets = 8   // min_buckets = 2 ^^ N, 0 < N
-        };
-
-        size_t operator()(const _Key& _Keyval) const
-        {
-            // return hash value.
-            uint32 a = _Keyval;
-            a = (a + 0x7ed55d16) + (a << 12);
-            a = (a ^ 0xc761c23c) ^ (a >> 19);
-            a = (a + 0x165667b1) + (a << 5);
-            a = (a + 0xd3a2646c) ^ (a << 9);
-            a = (a + 0xfd7046c5) + (a << 3);
-            a = (a ^ 0xb55a4f09) ^ (a >> 16);
-            return a;
-        }
-
-        // Less then function.
-        bool operator()(const _Key& _Keyval1, const _Key& _Keyval2) const
-        {   // test if _Keyval1 ordered before _Keyval2
-            _Predicate comp;
-            return (comp(_Keyval1, _Keyval2));
-        }
-    };
-
-    template <class Key, class HashFunc>
-    struct stlport_hash_equal
-    {
-        // Equal function.
-        bool operator()(const Key& k1, const Key& k2) const
-        {
-            HashFunc less;
-            // !(k1 < k2) && !(k2 < k1)
-            return !less(k1, k2) && !less(k2, k1);
-        }
-    };
-
-    template <class Key, class Value, class HashFunc = hash_compare<Key>, class Alloc = std::allocator< std::pair<const Key, Value> > >
-    struct hash_map
-        : public std__hash_map<Key, Value, HashFunc, stlport_hash_equal<Key, HashFunc>, Alloc>
-    {
-        hash_map()
-            : std__hash_map<Key, Value, HashFunc, stlport_hash_equal<Key, HashFunc>, Alloc>(HashFunc::min_buckets) {}
-    };
-
-    template <class Key, class Value, class HashFunc = hash_compare<Key>, class Alloc = std::allocator< std::pair<const Key, Value> > >
-    struct hash_multimap
-        : public std__hash_multimap<Key, Value, HashFunc, stlport_hash_equal<Key, HashFunc>, Alloc>
-    {
-        hash_multimap()
-            : std__hash_multimap<Key, Value, HashFunc, stlport_hash_equal<Key, HashFunc>, Alloc>(HashFunc::min_buckets) {}
-    };
-#endif
-
-    //////////////////////////////////////////////////////////////////////////
-    template<class T>
-    class intrusive_linked_list_node
-    {
-    public:
-        intrusive_linked_list_node()  { link_to_intrusive_list(static_cast<T*>(this)); }
-        // Not virtual by design
-        ~intrusive_linked_list_node() { unlink_from_intrusive_list(static_cast<T*>(this)); }
-
-        static T* get_intrusive_list_root() { return m_root_intrusive; };
-
-        static void link_to_intrusive_list(T* pNode)
-        {
-            if (m_root_intrusive)
-            {
-                // Add to the beginning of the list.
-                T* head = m_root_intrusive;
-                pNode->m_prev_intrusive = 0;
-                pNode->m_next_intrusive = head;
-                head->m_prev_intrusive = pNode;
-                m_root_intrusive = pNode;
-            }
-            else
-            {
-                m_root_intrusive = pNode;
-                pNode->m_prev_intrusive = 0;
-                pNode->m_next_intrusive = 0;
-            }
-        }
-        static void unlink_from_intrusive_list(T* pNode)
-        {
-            if (pNode == m_root_intrusive) // if head of list.
-            {
-                m_root_intrusive = pNode->m_next_intrusive;
-                if (m_root_intrusive)
-                {
-                    m_root_intrusive->m_prev_intrusive = 0;
-                }
-            }
-            else
-            {
-                if (pNode->m_prev_intrusive)
-                {
-                    pNode->m_prev_intrusive->m_next_intrusive = pNode->m_next_intrusive;
-                }
-                if (pNode->m_next_intrusive)
-                {
-                    pNode->m_next_intrusive->m_prev_intrusive = pNode->m_prev_intrusive;
-                }
-            }
-            pNode->m_next_intrusive = 0;
-            pNode->m_prev_intrusive = 0;
-        }
-
-    public:
-        static T* m_root_intrusive;
-        T* m_next_intrusive;
-        T* m_prev_intrusive;
-    };
-
-    template <class T>
-    inline void reconstruct(T& t)
-    {
-        t.~T();
-        new(&t)T;
-    }
-
-    template <class T, class D>
-    inline void reconstruct(StaticInstance<T, D>& instance)
-    {
-        reconstruct(*instance);
-    }
-
-    template <typename T, typename A1>
-    inline void reconstruct(T& t, const A1& a1)
-    {
-        t.~T();
-        new (&t)T(a1);
-    }
-
-    template <typename T, typename A1, typename A2>
-    inline void reconstruct(T& t, const A1& a1, const A2& a2)
-    {
-        t.~T();
-        new (&t)T(a1, a2);
-    }
-
-    template <typename T, typename A1, typename A2, typename A3>
-    inline void reconstruct(T& t, const A1& a1, const A2& a2, const A3& a3)
-    {
-        t.~T();
-        new (&t)T(a1, a2, a3);
-    }
-
-    template <typename T, typename A1, typename A2, typename A3, typename A4>
-    inline void reconstruct(T& t, const A1& a1, const A2& a2, const A3& a3, const A4& a4)
-    {
-        t.~T();
-        new (&t)T(a1, a2, a3, a4);
-    }
-
-    template <typename T, typename A1, typename A2, typename A3, typename A4, typename A5>
-    inline void reconstruct(T& t, const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5)
-    {
-        t.~T();
-        new (&t)T(a1, a2, a3, a4, a5);
-    }
-
-    template <class T>
-    inline void free_container(T& t)
-    {
-        reconstruct(t);
-    }
-
-    template <class T, class A>
-    inline void free_container(std::deque<T, A>& t)
-    {
-        reconstruct(t);
-    }
-
-    template <class K, class D, class H, class A>
-    inline void free_container(std__hash_map<K, D, H, A>& t)
-    {
-        reconstruct(t);
-    }
-
-    template <class T, class D>
-    inline void free_container(StaticInstance<T, D>& instance)
-    {
-        reconstruct(*instance);
-    }
-
-    struct container_freer
-    {
-        template <typename T>
-        void operator () (T& container) const
-        {
-            stl::free_container(container);
-        }
-    };
-
-    template <typename T>
-    struct scoped_set
-    {
-        scoped_set(T& ref, T val)
-            : m_ref(&ref)
-            , m_oldVal(ref)
-        {
-            ref = val;
-        }
-
-        ~scoped_set()
-        {
-            (*m_ref) = m_oldVal;
-        }
-
-    private:
-        scoped_set(const scoped_set<T>& other);
-        scoped_set<T>& operator = (const scoped_set<T>& other);
-
-    private:
-        T* m_ref;
-        T m_oldVal;
-    };
-
-    template <typename T, size_t Length, typename Func>
-    inline void for_each_array(T (&buffer)[Length], Func func)
-    {
-        std::for_each(&buffer[0], &buffer[Length], func);
-    }
-
-    template <typename T, typename D, size_t Length, typename Func>
-    inline void for_each_array(StaticInstance<T, D>(&buffer)[Length], Func func)
-    {
-        for (size_t idx = 0; idx < Length; ++idx)
-        {
-            func(*buffer[idx]);
-        }
-    }
-
-    template <typename T>
-    inline void destruct(T* p)
-    {
-        p->~T();
-    }
-}
-
-#define DEFINE_INTRUSIVE_LINKED_LIST(Class) \
-    template<>                              \
-    Class * stl::intrusive_linked_list_node<Class>::m_root_intrusive = nullptr;
-
-
-// Performs a less-than compare on a serial sequence space, such that earlier values compare less-than later values.
-// Unlike a normal integral value, this accounts for overflowing the limit of the underlying type.
-// For example, assuming a 2-bit unsigned underlying type (with possible values 0, 1, 2 and 3), the following will hold: 0 < 1 && 1 < 2 && 2 < 3 && 3 < 0
-// Assuming two equal values V1 and V2, V2 can be incremented up to "(2 ^ (bits - 1) - 1)" times and V1 < V2 will continue to hold.
-// See also RFC-1982 that documents this http://tools.ietf.org/html/rfc1982
-template<typename T>
-struct SSerialCompare
-{
-    static_assert(std::is_integral<T>::value && std::is_unsigned<T>::value, "T must be an unsigned integral type");
-
-    static const T limit = (T(1) << (sizeof(T) * 8 - 1));
-
-    bool operator()(T lhs, T rhs)
-    {
-        return ((lhs < rhs) && (rhs - lhs < limit)) || ((lhs > rhs) && (lhs - rhs > limit));
-    }
-};
-
-template <class Container>
-unsigned sizeOfVP(Container& arr)
-{
-    int i;
-    unsigned size = 0;
-    for (i = 0; i < (int)arr.size(); i++)
-    {
-        typename Container::value_type& T = arr[i];
-        size += T->Size();
-    }
-    size += (arr.capacity() - arr.size()) * sizeof(typename Container::value_type);
-    return size;
-}
-
-template <class Container>
-unsigned sizeOfV(Container& arr)
-{
-    int i;
-    unsigned size = 0;
-    for (i = 0; i < (int)arr.size(); i++)
-    {
-        typename Container::value_type& T = arr[i];
-        size += T.Size();
-    }
-    size += (arr.capacity() - arr.size()) * sizeof(typename Container::value_type);
-    return size;
-}
-template <class Container>
-unsigned sizeOfA(Container& arr)
-{
-    int i;
-    unsigned size = 0;
-    for (i = 0; i < arr.size(); i++)
-    {
-        typename Container::value_type& T = arr[i];
-        size += T.Size();
-    }
-    return size;
-}
-// define the maplikestruct, used to approximate the memory requirements for a map node
-namespace stl
-{
-    struct MapLikeStruct
-    {
-        bool color;
-        void* parent;
-        void* left;
-        void* right;
-    };
-}
-template <class Map>
-unsigned sizeOfMap(Map& map)
-{
-    unsigned size = 0;
-    for (typename Map::iterator it = map.begin(); it != map.end(); it++)
-    {
-        typename Map::mapped_type& T = it->second;
-        size += T.Size();
-    }
-    size += map.size() * sizeof(stl::MapLikeStruct);
-    return size;
-}
-template <class Map>
-unsigned sizeOfMapStr(Map& map)
-{
-    unsigned size = 0;
-    for (typename Map::iterator it = map.begin(); it != map.end(); it++)
-    {
-        typename Map::mapped_type& T = it->second;
-        size += T.capacity();
-    }
-    size += map.size() * sizeof(stl::MapLikeStruct);
-    return size;
-}
-template <class Map>
-unsigned sizeOfMapP(Map& map)
-{
-    unsigned size = 0;
-    for (typename Map::iterator it = map.begin(); it != map.end(); it++)
-    {
-        typename Map::mapped_type& T = it->second;
-        size += T->Size();
-    }
-    size += map.size() * sizeof(stl::MapLikeStruct);
-    return size;
-}
-template <class Map>
-unsigned sizeOfMapS(Map& map)
-{
-    unsigned size = 0;
-    for (typename Map::iterator it = map.begin(); it != map.end(); it++)
-    {
-        typename Map::mapped_type& T = it->second;
-        size += sizeof(T);
-    }
-    size += map.size() * sizeof(stl::MapLikeStruct);
-    return size;
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_STLUTILS_H
diff --git a/Code/CryEngine/CryCommon/StringUtils.h b/Code/CryEngine/CryCommon/StringUtils.h
deleted file mode 100644
index 6b34953c22..0000000000
--- a/Code/CryEngine/CryCommon/StringUtils.h
+++ /dev/null
@@ -1,1357 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef _CRY_ENGINE_STRING_UTILS_HDR_
-#define _CRY_ENGINE_STRING_UTILS_HDR_
-
-#pragma once
-
-#include "CryString.h"
-#include <ISystem.h>
-#include <algorithm>  // std::replace, std::min
-#include "UnicodeFunctions.h"
-#include "UnicodeIterator.h"
-#include <set>
-
-#if !defined(RESOURCE_COMPILER)
-#   include "CryCrc32.h"
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#   include <ctype.h>
-#endif
-
-namespace CryStringUtils
-{
-    // Convert a single ASCII character to lower case, this is compatible with the standard "C" locale (ie, only A-Z).
-    inline char toLowerAscii(char c)
-    {
-        return (c >= 'A' && c <= 'Z') ? (c - 'A' + 'a') : c;
-    }
-
-    // Convert a single ASCII character to upper case, this is compatible with the standard "C" locale (ie, only A-Z).
-    inline char toUpperAscii(char c)
-    {
-        return (c >= 'a' && c <= 'z') ? (c - 'a' + 'A') : c;
-    }
-}
-
-// cry_strXXX() and CryStringUtils_Internal::strXXX():
-//
-// The functions copy characters from src to dst one by one until any of
-// the following conditions is met:
-//   1) the end of the destination buffer (minus one character) is reached.
-//   2) the end of the source buffer is reached.
-//   3) zero character is found in the source buffer.
-//
-// When any of 1), 2), 3) happens, the functions write the terminating zero
-// character to the destination buffer and return.
-//
-// The functions guarantee writing the terminating zero character to the
-// destination buffer (if the buffer can fit at least one character).
-//
-// The functions return false when a null pointer is passed or when
-// clamping happened (i.e. when the end of the destination buffer is
-// reached but the source has some characters left).
-
-namespace CryStringUtils_Internal
-{
-    template <class TChar>
-    inline bool strcpy_with_clamp(TChar* const dst, size_t const dst_size_in_bytes, const TChar* const src, size_t const src_size_in_bytes)
-    {
-        COMPILE_TIME_ASSERT(sizeof(TChar) == sizeof(char) || sizeof(TChar) == sizeof(wchar_t));
-
-        if (!dst || dst_size_in_bytes < sizeof(TChar))
-        {
-            return false;
-        }
-
-        if (!src || src_size_in_bytes < sizeof(TChar))
-        {
-            dst[0] = 0;
-            return src != 0;  // we return true for non-null src without characters
-        }
-
-        const size_t src_n = src_size_in_bytes / sizeof(TChar);
-        const size_t n = (std::min)(dst_size_in_bytes / sizeof(TChar) - 1, src_n);
-
-        for (size_t i = 0; i < n; ++i)
-        {
-            dst[i] = src[i];
-            if (!src[i])
-            {
-                return true;
-            }
-        }
-
-        dst[n] = 0;
-        return n >= src_n || src[n] == 0;
-    }
-
-    template <class TChar>
-    inline bool strcat_with_clamp(TChar* const dst, size_t const dst_size_in_bytes, const TChar* const src, size_t const src_size_in_bytes)
-    {
-        COMPILE_TIME_ASSERT(sizeof(TChar) == sizeof(char) || sizeof(TChar) == sizeof(wchar_t));
-
-        if (!dst || dst_size_in_bytes < sizeof(TChar))
-        {
-            return false;
-        }
-
-        const size_t dst_n = dst_size_in_bytes / sizeof(TChar) - 1;
-
-        size_t dst_len = 0;
-        while (dst_len < dst_n && dst[dst_len])
-        {
-            ++dst_len;
-        }
-
-        if (!src || src_size_in_bytes < sizeof(TChar))
-        {
-            dst[dst_len] = 0;
-            return src != 0;  // we return true for non-null src without characters
-        }
-
-        const size_t src_n = src_size_in_bytes / sizeof(TChar);
-        const size_t n = (std::min)(dst_n - dst_len, src_n);
-        TChar* dst_ptr = &dst[dst_len];
-
-        for (size_t i = 0; i < n; ++i)
-        {
-            *dst_ptr++ = src[i];
-            if (!src[i])
-            {
-                return true;
-            }
-        }
-
-        *dst_ptr = 0;
-        return n >= src_n || src[n] == 0;
-    }
-
-    // Compares characters as case-sensitive, locale agnostic.
-    template<class CharType>
-    struct SCharComparatorCaseSensitive
-    {
-        static bool IsEqual(CharType a, CharType b)
-        {
-            return a == b;
-        }
-    };
-
-    // Compares characters as case-insensitive, uses the standard "C" locale.
-    template<class CharType>
-    struct SCharComparatorCaseInsensitive
-    {
-        static bool IsEqual(CharType a, CharType b)
-        {
-            if (a < 0x80 && b < 0x80)
-            {
-                a = (CharType)CryStringUtils::toLowerAscii(char(a));
-                b = (CharType)CryStringUtils::toLowerAscii(char(b));
-            }
-            return a == b;
-        }
-    };
-
-    // Template for wildcard matching, UCS code-point aware.
-    // Can be used for ASCII and Unicode (UTF-8/UTF-16/UTF-32), but not for ANSI.
-    // ? will match exactly one code-point.
-    // * will match zero or more code-points.
-    template <template<class> class CharComparator, class CharType>
-    inline bool MatchesWildcards_Tpl(const CharType* pStr, const CharType* pWild)
-    {
-        const CharType* savedStr = 0;
-        const CharType* savedWild = 0;
-
-        while ((*pStr) && (*pWild != '*'))
-        {
-            if (!CharComparator<CharType>::IsEqual(*pWild, *pStr) && (*pWild != '?'))
-            {
-                return false;
-            }
-
-            // We need special handling of '?' for Unicode
-            if (*pWild == '?' && *pStr > 127)
-            {
-                Unicode::CIterator<const CharType*> utf(pStr, pStr + 4);
-                if (utf.IsAtValidCodepoint())
-                {
-                    pStr = (++utf).GetPosition();
-                    --pStr;
-                }
-            }
-
-            ++pWild;
-            ++pStr;
-        }
-
-        while (*pStr)
-        {
-            if (*pWild == '*')
-            {
-                if (!*++pWild)
-                {
-                    return true;
-                }
-                savedWild = pWild;
-                savedStr = pStr + 1;
-            }
-            else if (CharComparator<CharType>::IsEqual(*pWild, *pStr) || (*pWild == '?'))
-            {
-                // We need special handling of '?' for Unicode
-                if (*pWild == '?' && *pStr > 127)
-                {
-                    Unicode::CIterator<const CharType*> utf(pStr, pStr + 4);
-                    if (utf.IsAtValidCodepoint())
-                    {
-                        pStr = (++utf).GetPosition();
-                        --pStr;
-                    }
-                }
-
-                ++pWild;
-                ++pStr;
-            }
-            else
-            {
-                pWild = savedWild;
-                pStr = savedStr++;
-            }
-        }
-
-        while (*pWild == '*')
-        {
-            ++pWild;
-        }
-
-        return *pWild == 0;
-    }
-} // namespace CryStringUtils_Internal
-
-
-inline bool cry_strcpy(char* const dst, size_t const dst_size_in_bytes, const char* const src)
-{
-    return CryStringUtils_Internal::strcpy_with_clamp<char>(dst, dst_size_in_bytes, src, (size_t)-1);
-}
-
-inline bool cry_strcpy(char* const dst, size_t const dst_size_in_bytes, const char* const src, size_t const src_size_in_bytes)
-{
-    return CryStringUtils_Internal::strcpy_with_clamp<char>(dst, dst_size_in_bytes, src, src_size_in_bytes);
-}
-
-template <size_t SIZE_IN_CHARS>
-inline bool cry_strcpy(char(&dst)[SIZE_IN_CHARS], const char* const src)
-{
-    return CryStringUtils_Internal::strcpy_with_clamp<char>(dst, SIZE_IN_CHARS, src, (size_t)-1);
-}
-
-template <size_t SIZE_IN_CHARS>
-inline bool cry_strcpy(char(&dst)[SIZE_IN_CHARS], const char* const src, size_t const src_size_in_bytes)
-{
-    return CryStringUtils_Internal::strcpy_with_clamp<char>(dst, SIZE_IN_CHARS, src, src_size_in_bytes);
-}
-
-
-inline bool cry_wstrcpy(wchar_t* const dst, size_t const dst_size_in_bytes, const wchar_t* const src)
-{
-    return CryStringUtils_Internal::strcpy_with_clamp<wchar_t>(dst, dst_size_in_bytes, src, (size_t)-1);
-}
-
-inline bool cry_wstrcpy(wchar_t* const dst, size_t const dst_size_in_bytes, const wchar_t* const src, size_t const src_size_in_bytes)
-{
-    return CryStringUtils_Internal::strcpy_with_clamp<wchar_t>(dst, dst_size_in_bytes, src, src_size_in_bytes);
-}
-
-template <size_t SIZE_IN_WCHARS>
-inline bool cry_wstrcpy(wchar_t(&dst)[SIZE_IN_WCHARS], const wchar_t* const src)
-{
-    return CryStringUtils_Internal::strcpy_with_clamp<wchar_t>(dst, SIZE_IN_WCHARS * sizeof(wchar_t), src, (size_t)-1);
-}
-
-template <size_t SIZE_IN_WCHARS>
-inline bool cry_wstrcpy(wchar_t(&dst)[SIZE_IN_WCHARS], const wchar_t* const src, size_t const src_size_in_bytes)
-{
-    return CryStringUtils_Internal::strcpy_with_clamp<wchar_t>(dst, SIZE_IN_WCHARS * sizeof(wchar_t), src, src_size_in_bytes);
-}
-
-
-inline bool cry_strcat(char* const dst, size_t const dst_size_in_bytes, const char* const src)
-{
-    return CryStringUtils_Internal::strcat_with_clamp<char>(dst, dst_size_in_bytes, src, (size_t)-1);
-}
-
-inline bool cry_strcat(char* const dst, size_t const dst_size_in_bytes, const char* const src, size_t const src_size_in_bytes)
-{
-    return CryStringUtils_Internal::strcat_with_clamp<char>(dst, dst_size_in_bytes, src, src_size_in_bytes);
-}
-
-template <size_t SIZE_IN_CHARS>
-inline bool cry_strcat(char(&dst)[SIZE_IN_CHARS], const char* const src)
-{
-    return CryStringUtils_Internal::strcat_with_clamp<char>(dst, SIZE_IN_CHARS, src, (size_t)-1);
-}
-
-template <size_t SIZE_IN_CHARS>
-inline bool cry_strcat(char(&dst)[SIZE_IN_CHARS], const char* const src, size_t const src_size_in_bytes)
-{
-    return CryStringUtils_Internal::strcat_with_clamp<char>(dst, SIZE_IN_CHARS, src, src_size_in_bytes);
-}
-
-
-inline bool cry_wstrcat(wchar_t* const dst, size_t const dst_size_in_bytes, const wchar_t* const src)
-{
-    return CryStringUtils_Internal::strcat_with_clamp<wchar_t>(dst, dst_size_in_bytes, src, (size_t)-1);
-}
-
-inline bool cry_wstrcat(wchar_t* const dst, size_t const dst_size_in_bytes, const wchar_t* const src, size_t const src_size_in_bytes)
-{
-    return CryStringUtils_Internal::strcat_with_clamp<wchar_t>(dst, dst_size_in_bytes, src, src_size_in_bytes);
-}
-
-template <size_t SIZE_IN_WCHARS>
-inline bool cry_wstrcat(wchar_t(&dst)[SIZE_IN_WCHARS], const wchar_t* const src)
-{
-    return CryStringUtils_Internal::strcat_with_clamp<wchar_t>(dst, SIZE_IN_WCHARS * sizeof(wchar_t), src, (size_t)-1);
-}
-
-template <size_t SIZE_IN_WCHARS>
-inline bool cry_wstrcat(wchar_t(&dst)[SIZE_IN_WCHARS], const wchar_t* const src, size_t const src_size_in_bytes)
-{
-    return CryStringUtils_Internal::strcat_with_clamp<wchar_t>(dst, SIZE_IN_WCHARS * sizeof(wchar_t), src, src_size_in_bytes);
-}
-
-
-namespace CryStringUtils
-{
-    enum
-    {
-        CRY_DEFAULT_HASH_SEED = 40503, // This is a large 16 bit prime number (perfect for seeding)
-        CRY_EMPTY_STR_HASH = 3350499166U, // HashString("")
-    };
-
-    // removes the extension from the file path
-    // \param szFilePath the source path
-    inline char* StripFileExtension(char* szFilePath)
-    {
-        for (char* p = szFilePath + (int)strlen(szFilePath) - 1; p >= szFilePath; --p)
-        {
-            switch (*p)
-            {
-            case ':':
-            case '/':
-            case '\\':
-                // we've reached a path separator - it means there's no extension in this name
-                return nullptr;
-            case '.':
-                // there's an extension in this file name
-                *p = '\0';
-                return p + 1;
-            }
-        }
-        // it seems the file name is a pure name, without path or extension
-        return nullptr;
-    }
-
-
-    // returns the parent directory of the given file or directory.
-    // the returned path is WITHOUT the trailing slash
-    // if the input path has a trailing slash, it's ignored
-    // nGeneration - is the number of parents to scan up
-    // Note: A drive specifier (if any) will always be kept (Windows-specific).
-    template <class StringCls>
-    StringCls GetParentDirectory(const StringCls& strFilePath, int nGeneration = 1)
-    {
-        for (const char* p = strFilePath.c_str() + strFilePath.length() - 2; // -2 is for the possible trailing slash: there always must be some trailing symbol which is the file/directory name for which we should get the parent
-             p >= strFilePath.c_str();
-             --p)
-        {
-            switch (*p)
-            {
-            case ':':
-                return StringCls(strFilePath.c_str(), p);
-                break;
-            case '/':
-            case '\\':
-                // we've reached a path separator - return everything before it.
-                if (!--nGeneration)
-                {
-                    return StringCls(strFilePath.c_str(), p);
-                }
-                break;
-            }
-        }
-        ;
-        // the file name is a pure name, without path or extension
-        return StringCls();
-    }
-
-    /*!
-    // converts all chars to lower case
-    */
-    inline string ToLower(const string& str)
-    {
-        string temp = str;
-
-#ifndef NOT_USE_CRY_STRING
-        temp.MakeLower();
-#else
-        std::transform(temp.begin(), temp.end(), temp.begin(), toLowerAscii); // STL MakeLower
-#endif
-
-        return temp;
-    }
-
-    /// Converts the single character to lower case.
-    /*!
-    \param c source character to convert to lower case if possible
-    \return the lower case character equivalent if possible
-    */
-    inline char ToLower(char c)
-    {
-        return ((c <= 'Z') && (c >= 'A')) ? c + ('a' - 'A') : c;
-    }
-
-    /// Converts the specified character into lowercase.
-    /*!
-    \param c the character to convert to lowercase
-    \return the lowercase character
-    */
-    // Converts all ASCII characters to upper case.
-    // Note: Any non-ASCII characters are left unchanged.
-    // This function is ASCII-only and locale agnostic.
-    inline string toUpper (const string& str)
-    {
-        string temp = str;
-
-#ifndef NOT_USE_CRY_STRING
-        temp.MakeUpper();
-#else
-        std::transform(temp.begin(), temp.end(), temp.begin(), toUpperAscii); // STL MakeLower
-#endif
-
-        return temp;
-    }
-
-    // searches and returns the pointer to the extension of the given file
-    /*!
-    \param szFileName source filename to search
-    // This function is Unicode agnostic and locale agnostic.
-    */
-    inline const char* FindExtension(const char* szFileName)
-    {
-        const char* szEnd = szFileName + (int)strlen(szFileName);
-        for (const char* p = szEnd - 1; p >= szFileName; --p)
-        {
-            if (*p == '.')
-            {
-                return p + 1;
-            }
-        }
-
-        return szEnd;
-    }
-
-    // searches and returns the pointer to the file name in the given file path
-    /*!
-    \param szFilePath source path to search
-    */
-    inline const char* FindFileNameInPath(const char* szFilePath)
-    {
-        for (const char* p = szFilePath + (int)strlen(szFilePath) - 1; p >= szFilePath; --p)
-        {
-            if (*p == '\\' || *p == '/')
-            {
-                return p + 1;
-            }
-        }
-        return szFilePath;
-    }
-
-    // works like strstr, but is case-insensitive
-    /*!
-    \param szString the source string
-    \param szSubstring the sub-string to look for
-    */
-    inline const char* stristr(const char* szString, const char* szSubstring)
-    {
-        int nSuperstringLength = (int)strlen(szString);
-        int nSubstringLength = (int)strlen(szSubstring);
-
-        for (int nSubstringPos = 0; nSubstringPos <= nSuperstringLength - nSubstringLength; ++nSubstringPos)
-        {
-            if (_strnicmp(szString + nSubstringPos, szSubstring, nSubstringLength) == 0)
-            {
-                return szString + nSubstringPos;
-            }
-        }
-        return nullptr;
-    }
-
-
-#ifndef NOT_USE_CRY_STRING
-
-    /*
-    \param strPath the path to "unify"
-    */
-    inline void UnifyFilePath(stack_string& strPath)
-    {
-        strPath.replace('\\', '/');
-        strPath.MakeLower();
-    }
-
-    template<size_t SIZE>
-    inline void UnifyFilePath(CryStackStringT<char, SIZE>& strPath)
-    {
-        strPath.replace('\\', '/');
-        strPath.MakeLower();
-    }
-
-    /// Replaces backslashes with forward slashes and transforms string to lowercase.
-    /*!
-    \param strPath the path to "unify"
-    */
-    inline void UnifyFilePath(string& strPath)
-    {
-        strPath.replace('\\', '/');
-        strPath.MakeLower();
-    }
-
-#endif
-
-    // converts the number to a string
-    /*
-    \param nNumber an unsigned number
-    \return the unsigned number as a string
-    */
-    inline string ToString(unsigned nNumber)
-    {
-        char szNumber[16];
-        sprintf_s(szNumber, "%u", nNumber);
-        return szNumber;
-    }
-
-    /// Converts the number to a string.
-    /*!
-    \param nNumber an signed integer
-    \return the signed integer as a string
-    */
-    inline string ToString(signed int nNumber)
-    {
-        char szNumber[16];
-        sprintf_s(szNumber, "%d", nNumber);
-        return szNumber;
-    }
-
-    /// Converts the floating point number to a string.
-    /*!
-    \param nNumber a floating point number
-    \return the floating point number as a string
-    */
-    inline string ToString(float nNumber)
-    {
-        char szNumber[128];
-        sprintf_s(szNumber, "%f", nNumber);
-        return szNumber;
-    }
-
-    /// Converts the boolean value to a string ("0" or "1").
-    /*!
-    \param nNumber an unsigned number
-    \return the bool as a string (either "1" or "0")
-    */
-    inline string ToString(bool nNumber)
-    {
-        char szNumber[4];
-        sprintf_s(szNumber, "%i", (int)nNumber);
-        return szNumber;
-    }
-
-#ifdef CRYINCLUDE_CRYCOMMON_CRY_MATRIX44_H
-    /// Converts a Matrix44 to a string.
-    /*!
-    \param m A matrix of type Matrix44
-    \return the matrix in the format {0,0,0,0}{0,0,0,0}{0,0,0,0}{0,0,0,0}
-    */
-    inline string ToString(const Matrix44& m)
-    {
-        char szBuf[0x200];
-        sprintf_s(szBuf, "{%g,%g,%g,%g}{%g,%g,%g,%g}{%g,%g,%g,%g}{%g,%g,%g,%g}",
-            m(0, 0), m(0, 1), m(0, 2), m(0, 3),
-            m(1, 0), m(1, 1), m(1, 2), m(1, 3),
-            m(2, 0), m(2, 1), m(2, 2), m(2, 3),
-            m(3, 0), m(3, 1), m(3, 2), m(3, 3));
-        return szBuf;
-    }
-#endif
-
-#ifdef CRYINCLUDE_CRYCOMMON_CRY_QUAT_H
-    /// Converts a CryQuat to a string.
-    /*!
-    \param m A quaternion of type CryQuat
-    \return the quaternion in the format {0,{0,0,0,0}}
-    */
-    inline string ToString (const CryQuat& q)
-    {
-        char szBuf[0x100];
-        sprintf_s(szBuf, "{%g,{%g,%g,%g}}", q.w, q.v.x, q.v.y, q.v.z);
-        return szBuf;
-    }
-#endif
-
-#ifdef CRYINCLUDE_CRYCOMMON_CRY_VECTOR3_H
-    /// Converts a Vec3 to a string.
-    /*!
-    \param m A vector of type Vec3
-    \return the vector in the format {0,0,0}
-    */
-    inline string ToString (const Vec3& v)
-    {
-        char szBuf[0x80];
-        sprintf_s(szBuf, "{%g,%g,%g}", v.x, v.y, v.z);
-        return szBuf;
-    }
-#endif
-
-    /// This function only exists to allow ToString to compile if it is ever used with an unsupported type.
-    /*!
-    \param unknownType
-    \return a string that reads "unknown"
-    */
-    template<class T>
-    inline string ToString(T& unknownType)
-    {
-        char szValue[8];
-        sprintf_s(szValue, "%s", "unknown");
-        return szValue;
-    }
-
-    // does the same as strstr, but the szString is allowed to be no more than the specified size
-    /*!
-    \param szString the source string
-    \param szSubstring the sub-string to look for
-    \param nSuperstringLength the maximum size of szString
-    */
-    inline const char* strnstr(const char* szString, const char* szSubstring, int nSuperstringLength)
-    {
-        int nSubstringLength = (int)strlen(szSubstring);
-        if (!nSubstringLength)
-        {
-            return szString;
-        }
-
-        for (int nSubstringPos = 0; szString[nSubstringPos] && nSubstringPos < nSuperstringLength - nSubstringLength; ++nSubstringPos)
-        {
-            if (strncmp(szString + nSubstringPos, szSubstring, nSubstringLength) == 0)
-            {
-                return szString + nSubstringPos;
-            }
-        }
-        return nullptr;
-    }
-
-
-    // Finds the string in the array of strings.
-    // Returns its 0-based index or -1 if not found.
-    // Comparison is case-sensitive.
-    // The string array end is demarked by the NULL value.
-    // This function is Unicode agnostic (but no Unicode collation is performed for equality test) and locale agnostic.
-    inline int findString(const char* szString, const char* arrStringList[])
-    {
-        for (const char** p = arrStringList; *p; ++p)
-        {
-            if (0 == strcmp(*p, szString))
-            {
-                return (int)(p - arrStringList);
-            }
-        }
-        return -1; // string was not found
-    }
-
-    /// Finds the string in the array of strings.
-    /*!
-    \param szString the string to look for
-    \param arrStringList array of strings
-    \remark comparison is case-sensitive
-    \remark The string array end is delimited by the nullptr value
-    \return its 0-based index or -1 if not found
-    */
-    inline int FindString(const char* szString, const char* arrStringList[])
-    {
-        for (const char** p = arrStringList; *p; ++p)
-        {
-            if (0 == strcmp(*p, szString))
-            {
-                return (int)(p - arrStringList);
-            }
-        }
-        return -1; // string was not found
-    }
-
-    /// Used for printing out sets of objects of string type.
-    /*!
-    \remark just forms the comma-delimited string where each string in the set is presented as a formatted substring
-    \param setStrings set of strings to print
-    \return a formatted string
-    */
-    inline string ToString(const std::set<string>& setStrings)
-    {
-        string strResult;
-        if (!setStrings.empty())
-        {
-            strResult += "{";
-            for (std::set<string>::const_iterator it = setStrings.begin(); it != setStrings.end(); ++it)
-            {
-                if (it != setStrings.begin())
-                {
-                    strResult += ", ";
-                }
-                strResult += "\"";
-                strResult += *it;
-                strResult += "\"";
-            }
-            strResult += "}";
-        }
-        return strResult;
-    }
-
-    // Cuts the string and adds leading ... if it's longer than specified maximum length.
-    // This function is ASCII-only and locale agnostic.
-    inline string cutString(const string& strPath, unsigned nMaxLength)
-    {
-        if (strPath.length() > nMaxLength && nMaxLength > 3)
-        {
-            return string("...") + string(strPath.c_str() + strPath.length() - (nMaxLength - 3));
-        }
-        else
-        {
-            return strPath;
-        }
-    }
-
-    /// Cuts the string and adds leading ... if it's longer than specified maximum length.
-    /*!
-    \param str the string to cut
-    \param nMaxLength the allowed length of the string before its cut.
-    \return a shortened string starting in ellipses or the source string if it's smaller than nMaxLength
-    */
-    inline string CutString(const string& str, unsigned nMaxLength)
-    {
-        if (str.length() > nMaxLength && nMaxLength > 3)
-        {
-            return string("...") + string(str.c_str() + str.length() - (nMaxLength - 3));
-        }
-        else
-        {
-            return str;
-        }
-    }
-
-    /// Converts the given set of NUMBERS into the string.
-    /*!
-    \param setMtlms A numeric set to convert into a string
-    \param szFormat
-    \param szPostfix
-    */
-    template <typename T>
-    string ToString(const std::set<T>& setMtls, const char* szFormat, const char* szPostfix = "")
-    {
-        string strResult;
-        char szBuffer[64];
-        if (!setMtls.empty())
-        {
-            strResult += strResult.empty() ? "(" : " (";
-            for (typename std::set<T>::const_iterator it = setMtls.begin(); it != setMtls.end(); )
-            {
-                if (it != setMtls.begin())
-                {
-                    strResult += ", ";
-                }
-                sprintf_s(szBuffer, szFormat, *it);
-                strResult += szBuffer;
-                T nStart = *it;
-
-                ++it;
-
-                if (it != setMtls.end() && *it == nStart + 1)
-                {
-                    T nPrev = *it;
-                    // we've got a region
-                    while (++it != setMtls.end() && *it == nPrev + 1)
-                    {
-                        nPrev = *it;
-                    }
-                    if (nPrev == nStart + 1)
-                    {
-                        // special case - range of length 1
-                        strResult += ",";
-                    }
-                    else
-                    {
-                        strResult += "..";
-                    }
-                    sprintf_s(szBuffer, szFormat, nPrev);
-                    strResult += szBuffer;
-                }
-            }
-            strResult += ")";
-        }
-        return szPostfix[0] ? strResult + szPostfix : strResult;
-    }
-
-
-    // Attempts to find a matching wildcard in a string.
-    /*!
-    \param szString source string
-    \param szWildcard the wildcard, supports * and ?
-    // returns true if the string matches the wildcard
-    // Note: ANSI input is not supported, ASCII is fine since it's a subset of UTF-8.
-    */
-    inline bool MatchWildcard(const char* szString, const char* szWildcard)
-    {
-        return CryStringUtils_Internal::MatchesWildcards_Tpl<CryStringUtils_Internal::SCharComparatorCaseSensitive>(szString, szWildcard);
-    }
-
-    // Returns true if the string matches the wildcard.
-    // Supports wildcard ? (matches one code-point) and * (matches zero or more code-points).
-    // This function is Unicode aware and uses the "C" locale for case comparison.
-    // Note: ANSI input is not supported, ASCII is fine since it's a subset of UTF-8.
-    inline bool MatchWildcardIgnoreCase(const char* szString, const char* szWildcard)
-    {
-        return CryStringUtils_Internal::MatchesWildcards_Tpl<CryStringUtils_Internal::SCharComparatorCaseInsensitive>(szString, szWildcard);
-    }
-
-#if !defined(RESOURCE_COMPILER)
-
-    // calculates a hash value for a given string
-    inline uint32 CalculateHash(const char* str)
-    {
-        return CCrc32::Compute(str);
-    }
-
-    // calculates a hash value for the lower case version of a given string
-    inline uint32 CalculateHashLowerCase(const char* str)
-    {
-        return CCrc32::ComputeLowercase(str);
-    }
-
-    // This function is Unicode agnostic and locale agnostic.
-    inline uint32 HashStringSeed(const char* string, const uint32 seed)
-    {
-        // A string hash taken from the FRD/Crysis2 (game) code with low probability of clashes
-        // Recommend you use the CRY_DEFAULT_HASH_SEED (see HashString)
-        const char*     p;
-        uint32 hash = seed;
-        for (p = string; *p != '\0'; p++)
-        {
-            hash += *p;
-            hash += (hash << 10);
-            hash ^= (hash >> 6);
-        }
-        hash += (hash << 3);
-        hash ^= (hash >> 11);
-        hash += (hash << 15);
-        return hash;
-    }
-
-    // This function is ASCII-only and uses the standard "C" locale for case conversion.
-    inline uint32 HashStringLowerSeed(const char* string, const uint32 seed)
-    {
-        // computes the hash of 'string' converted to lower case
-        // also see the comment in HashStringSeed
-        const char*     p;
-        uint32 hash = seed;
-        for (p = string; *p != '\0'; p++)
-        {
-            hash += toLowerAscii(*p);
-            hash += (hash << 10);
-            hash ^= (hash >> 6);
-        }
-        hash += (hash << 3);
-        hash ^= (hash >> 11);
-        hash += (hash << 15);
-        return hash;
-    }
-
-    // This function is Unicode agnostic and locale agnostic.
-    inline uint32 HashString(const char* string)
-    {
-        return HashStringSeed(string, CRY_DEFAULT_HASH_SEED);
-    }
-
-    // This function is ASCII-only and uses the standard "C" locale for case conversion.
-    inline uint32 HashStringLower(const char* string)
-    {
-        return HashStringLowerSeed(string, CRY_DEFAULT_HASH_SEED);
-    }
-#endif
-
-    // converts all chars to lower case - avoids memory allocation
-    /*!
-    \param str Reference to string to convert into lowercase.
-    */
-    inline void ToLowerInplace(string& str)
-    {
-#ifndef NOT_USE_CRY_STRING
-        str.MakeLower();
-#else
-        std::transform(str.begin(), str.end(), str.begin(), toLowerAscii); // STL MakeLower
-#endif
-    }
-
-    /// Converts all chars to lower case - avoids memory allocation
-    /*!
-    \param str Reference to string to convert into lowercase.
-    */
-    inline void ToLowerInplace(char* str)
-    {
-        if (str == nullptr)
-        {
-            return;
-        }
-
-        for (char* s = str; *s != '\0'; s++)
-        {
-            *s = toLowerAscii(*s);
-        }
-    }
-
-
-#ifndef NOT_USE_CRY_STRING
-
-    // Converts a wide string (can be UTF-16 or UTF-32 depending on platform) to UTF-8.
-    // This function is Unicode aware and locale agnostic.
-    /// Converts a wide string to a UTF8 string.
-    /*!
-    \param str The wide string to convert.
-    \return dstr The wide string converted into the specified UTF8 type.
-    */
-    template <typename T>
-    inline void WStrToUTF8(const wchar_t* str, T& dstr)
-    {
-        string utf8;
-        Unicode::Convert(utf8, str);
-
-        // Note: This function expects T to have assign(ptr, len) function
-        dstr.assign(utf8.c_str(), utf8.length());
-    }
-
-    // Converts a wide string (can be UTF-16 or UTF-32 depending on platform) to UTF-8.
-    // This function is Unicode aware and locale agnostic.
-    /// Converts a wide string to UTF8.
-    /*!
-    \param str The wchar_t string to convert.
-    \return The UTF8 string.
-    */
-    inline string WStrToUTF8(const wchar_t* str)
-    {
-        return Unicode::Convert<string>(str);
-    }
-
-    /// Converts a UTF8 string to a wide string.
-    /*!
-    \param str The UTF8 string to convert.
-    \return dstr The UTF8 string converted into the specified type.
-    */
-    template <typename T>
-    inline void UTF8ToWStr(const char* str, T& dstr)
-    {
-        wstring wide;
-        Unicode::Convert(wide, str);
-
-        // Note: This function expects T to have assign(ptr, len) function
-        dstr.assign(wide.c_str(), wide.length());
-    }
-
-    // Converts an UTF-8 string to wide string (can be UTF-16 or UTF-32 depending on platform).
-    // This function is Unicode aware and locale agnostic.
-    /*!
-    \param str The UTF8 string to convert.
-    \return str as converted to wstring.
-    */
-    inline wstring UTF8ToWStr(const char* str)
-    {
-        return Unicode::Convert<wstring>(str);
-    }
-
-    /// Converts a string to a wide character string
-    /*!
-    \param str Source string.
-    \param dstr Destination wstring.
-    */
-    inline void StrToWstr(const char* str, wstring& dstr)
-    {
-        CryStackStringT<wchar_t, 64> tmp;
-        tmp.resize(strlen(str));
-        tmp.clear();
-
-        while (const wchar_t c = (wchar_t)(*str++))
-        {
-            tmp.append(1, c);
-        }
-
-        dstr.assign(tmp.data(), tmp.length());
-    }
-
-#endif // NOT_USE_CRY_STRING
-
-    /// The type used to parse a yes/no string
-#if defined(_DISALLOW_ENUM_CLASS)
-    enum YesNoType
-#else
-    enum class YesNoType
-#endif
-    {
-        Yes,
-        No,
-        Invalid
-    };
-
-    // parse the yes/no string
-    /*!
-    \param szString any of the following strings: yes, enable, true, 1, no, disable, false, 0
-    \return YesNoType::Yes if szString is yes/enable/true/1, YesNoType::No if szString is no, disable, false, 0 and YesNoType::Invalid if the string is not one of the expected values.
-    */
-    inline YesNoType ToYesNoType(const char* szString)
-    {
-        if (!_stricmp(szString, "yes")
-            || !_stricmp(szString, "enable")
-            || !_stricmp(szString, "true")
-            || !_stricmp(szString, "1"))
-#if defined(_DISALLOW_ENUM_CLASS)
-        {
-            return Yes;
-        }
-#else
-        {
-            return YesNoType::Yes;
-        }
-#endif
-        if (!_stricmp(szString, "no")
-            || !_stricmp(szString, "disable")
-            || !_stricmp(szString, "false")
-            || !_stricmp(szString, "0"))
-#if defined(_DISALLOW_ENUM_CLASS)
-        {
-            return No;
-        }
-#else
-        {
-            return YesNoType::No;
-        }
-#endif
-
-#if defined(_DISALLOW_ENUM_CLASS)
-        return Invalid;
-#else
-        return YesNoType::Invalid;
-#endif
-    }
-
-    /// Verifies if the filename provided only contains the accepted characters.
-    /*!
-    \param fileName the filename to verify
-    \return true if the filename only contains alphanumeric values and/or dot, dash and underscores.
-    */
-    inline bool IsValidFileName(const char* fileName)
-    {
-        size_t i = 0;
-        for (;; )
-        {
-            const char c = fileName[i++];
-            if (c == 0)
-            {
-                return true;
-            }
-            if (!((c >= '0' && c <= '9')
-                  || (c >= 'A' && c <= 'Z')
-                  || (c >= 'a' && c <= 'z')
-                  || c == '.' || c == '-' || c == '_'))
-            {
-                return false;
-            }
-        }
-    }
-
-
-    /**************************************************************************
-    *void _makepath() - build path name from components
-    *
-    *Purpose:
-    *       create a path name from its individual components
-    *
-    *Entry:
-    *       char *path  - pointer to buffer for constructed path
-    *       char *drive - pointer to drive component, may or may not contain trailing ':'
-    *       char *dir   - pointer to subdirectory component, may or may not include leading and/or trailing '/' or '\' characters
-    *       char *fname - pointer to file base name component
-    *       char *ext   - pointer to extension component, may or may not contain a leading '.'.
-    *
-    *Exit:
-    *       path - pointer to constructed path name
-    *
-    *******************************************************************************/
-    ILINE void portable_makepath(char path[_MAX_PATH], const char* drive, const char* dir, const char* fname, const char* ext)
-    {
-        const char* p;
-
-        /* we assume that the arguments are in the following form (although we
-        * do not diagnose invalid arguments or illegal filenames (such as
-        * names longer than 8.3 or with illegal characters in them)
-        *
-        *  drive:
-        *      A           ; or
-        *      A:
-        *  dir:
-        *      \top\next\last\     ; or
-        *      /top/next/last/     ; or
-        *      either of the above forms with either/both the leading
-        *      and trailing / or \ removed.  Mixed use of '/' and '\' is
-        *      also tolerated
-        *  fname:
-        *      any valid file name
-        *  ext:
-        *      any valid extension (none if empty or null )
-        */
-
-        /* copy drive */
-
-        if (drive && *drive)
-        {
-            *path++ = *drive;
-            *path++ = (':');
-        }
-
-        /* copy dir */
-
-        if ((p = dir) && *p)
-        {
-            do
-            {
-                *path++ = *p++;
-            } while (*p);
-            if (*(p - 1) != '/' && *(p - 1) != ('\\'))
-            {
-                *path++ = ('\\');
-            }
-        }
-
-        /* copy fname */
-
-        if (p = fname)
-        {
-            while (*p)
-            {
-                *path++ = *p++;
-            }
-        }
-
-        /* copy ext, including 0-terminator - check to see if a '.' needs
-        * to be inserted.
-        */
-
-        if (p = ext)
-        {
-            if (*p && *p != ('.'))
-            {
-                *path++ = ('.');
-            }
-            while (*path++ = *p++)
-            {
-                ;
-            }
-        }
-        else
-        {
-            /* better add the 0-terminator */
-            *path = ('\0');
-        }
-    }
-
-    /// Create a path name from its individual components.
-    /*!
-    \param char *path  pointer to buffer for constructed path
-    \param char *drive pointer to drive component, may or may not contain trailing ':'
-    \param char *dir   pointer to subdirectory component, may or may not include leading and/or trailing '/' or '\' characters
-    \param char *fname pointer to file base name component
-    \param char *ext   pointer to extension component, may or may not contain a leading '.'.
-    \return path pointer to constructed path name
-    */
-    inline void MakePath(char path[_MAX_PATH], const char* drive, const char* dir, const char* fname, const char* ext)
-    {
-        const char* p;
-
-        // we assume that the arguments are in the following form (although we
-        // do not diagnose invalid arguments or illegal filenames (such as
-        // names longer than 8.3 or with illegal characters in them)
-        //
-        // drive:
-        //     A           ; or
-        //     A:
-        // dir:
-        //     \top\next\last\     ; or
-        //     /top/next/last/     ; or
-        //     either of the above forms with either/both the leading
-        //     and trailing / or \ removed.  Mixed use of '/' and '\' is
-        //     also tolerated
-        // fname:
-        //     any valid file name
-        // ext:
-        //     any valid extension (none if empty or null )
-        //
-
-        // copy drive
-        if (drive && *drive)
-        {
-            *path++ = *drive;
-            *path++ = (':');
-        }
-
-        // copy dir
-        if ((p = dir) && *p)
-        {
-            do
-            {
-                *path++ = *p++;
-            } while (*p);
-            if (*(p - 1) != '/' && *(p - 1) != ('\\'))
-            {
-                *path++ = ('\\');
-            }
-        }
-
-        // copy fname
-        if (p = fname)
-        {
-            while (*p)
-            {
-                *path++ = *p++;
-            }
-        }
-
-        // copy ext, including 0-terminator - check to see if a '.' needs
-        // to be inserted.
-        if (p = ext)
-        {
-            if (*p && *p != ('.'))
-            {
-                *path++ = ('.');
-            }
-            while (*path++ = *p++)
-            {
-                ;
-            }
-        }
-        else
-        {
-            // better add the 0-terminator
-            *path = ('\0');
-        }
-    }
-
-    // Copies characters from a string.
-    /*!
-    \param destination Pointer to the destination array where the content is to be copied.
-    \param source C string to be copied.
-    \param num Maximum number of characters to be copied from source.
-    \remark Parameter order is the same as strncpy; Copies only up to num characters from source to destination.
-    \return true if entirety of source was copied into destination.
-    */
-    inline bool strncpy(char* destination, const char* source, size_t num)
-    {
-        bool reply = false;
-
-#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
-        CRY_ASSERT(destination);
-        CRY_ASSERT(source);
-#endif
-
-        if (num)
-        {
-            size_t i;
-            for (i = 0; source[i] && (i + 1) < num; ++i)
-            {
-                destination[i] = source[i];
-            }
-            destination[i] = '\0';
-            reply = (source[i] == '\0');
-        }
-
-#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
-        CRY_ASSERT_MESSAGE(reply, string().Format("String '%s' is too big to fit into a buffer of length %u", source, (unsigned int)num));
-#endif
-        return reply;
-    }
-
-    // Copies wide characters from a wide string.
-    /*!
-    \param destination Pointer to the destination wchar_t array where the content is to be copied.
-    \param source C wide string to be copied.
-    \param num Maximum number of characters to be copied from source.
-    \remark Parameter order is the same as strncpy; Copies only up to num characters from source to destination.
-    \return true if entirety of source was copied into destination.
-    */
-    inline bool wstrncpy(wchar_t* destination, const wchar_t* source, size_t bufferLength)
-    {
-        bool reply = false;
-
-#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
-        CRY_ASSERT(destination);
-        CRY_ASSERT(source);
-#endif
-
-        if (bufferLength)
-        {
-            size_t i;
-            for (i = 0; source[i] && (i + 1) < bufferLength; ++i)
-            {
-                destination[i] = source[i];
-            }
-            destination[i] = '\0';
-            reply = (source[i] == '\0');
-        }
-
-#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
-        CRY_ASSERT_MESSAGE(reply, string().Format("String '%ls' is too big to fit into a buffer of length %u", source, (unsigned int)bufferLength));
-#endif
-        return reply;
-    }
-
-    // Copies a C string into a destination buffer up to a specified delimiter or null terminator.
-    /*!
-    \param destination Pointer to a buffer where the resulting C-string is stored.
-    \param source C string to be copied.
-    \param num Maximum number of characters to be copied from source.
-    \param delimiter Delimiter character up to which the string will be copied.
-    \return Number of bytes written into destination (including null terminator) or 0 if delimiter is not found within the first num bytes of source.
-    */
-    inline size_t CopyStringUntilFindChar(char* destination, const char* source, size_t num, char delimiter)
-    {
-        size_t reply = 0;
-
-#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
-        CRY_ASSERT(destination);
-        CRY_ASSERT(source);
-#endif
-
-        if (num)
-        {
-            size_t i;
-            for (i = 0; source[i] && source[i] != delimiter && (i + 1) < num; ++i)
-            {
-                destination[i] = source[i];
-            }
-            destination[i] = '\0';
-            reply = (source[i] == delimiter) ? (i + 1) : 0;
-        }
-
-        return reply;
-    }
-} // namespace CryStringUtils
-
-#endif // CRYINCLUDE_CRYCOMMON_STRINGUTILS_H
diff --git a/Code/CryEngine/CryCommon/Synchronization.h b/Code/CryEngine/CryCommon/Synchronization.h
deleted file mode 100644
index 428b0d33df..0000000000
--- a/Code/CryEngine/CryCommon/Synchronization.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_SYNCHRONIZATION_H
-#define CRYINCLUDE_CRYCOMMON_SYNCHRONIZATION_H
-#pragma once
-
-
-//---------------------------------------------------------------------------
-// Synchronization policies, for classes (e.g. containers, allocators) that may
-// or may not be multithread-safe.
-//
-// Policies should be used as a template argument to such classes,
-// and these class implementations should then utilise the policy, as a base-class or member.
-//
-//---------------------------------------------------------------------------
-
-#include "MultiThread.h"
-#include "CryThread.h"
-
-namespace stl
-{
-    template<class Sync>
-    struct AutoLock
-    {
-        ILINE AutoLock(Sync& sync)
-            : _sync(sync)
-        {
-            sync.Lock();
-        }
-        ILINE ~AutoLock()
-        {
-            _sync.Unlock();
-        }
-
-    private:
-        Sync& _sync;
-    };
-
-
-    struct PSyncNone
-    {
-        void Lock() {}
-        void Unlock() {}
-    };
-
-    struct PSyncMultiThread
-    {
-        PSyncMultiThread()
-            : _Semaphore(0) {}
-
-        void Lock()
-        {
-            CryWriteLock(&_Semaphore);
-        }
-        void Unlock()
-        {
-            CryReleaseWriteLock(&_Semaphore);
-        }
-        int IsLocked() const volatile
-        {
-            return _Semaphore;
-        }
-
-    private:
-        volatile int _Semaphore;
-    };
-
-#ifdef _DEBUG
-
-    struct PSyncDebug
-        : public PSyncMultiThread
-    {
-        void Lock()
-        {
-            assert(!IsLocked());
-            PSyncMultiThread::Lock();
-        }
-    };
-
-#else
-
-    typedef PSyncNone PSyncDebug;
-
-#endif
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_SYNCHRONIZATION_H
diff --git a/Code/CryEngine/CryCommon/Tarray.h b/Code/CryEngine/CryCommon/Tarray.h
deleted file mode 100644
index 9dfd410ffd..0000000000
--- a/Code/CryEngine/CryCommon/Tarray.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_TARRAY_H
-#define CRYINCLUDE_CRYCOMMON_TARRAY_H
-#pragma once
-
-
-#include <ILog.h>
-#include <Cry_Math.h>
-#include <AzCore/IO/FileIO.h>
-
-#ifndef CLAMP
-#define CLAMP(X, mn, mx) ((X) < (mn) ? (mn) : ((X) < (mx) ? (X) : (mx)))
-#endif
-
-#ifndef SATURATE
-#define SATURATE(X) clamp_tpl(X, 0.f, 1.f)
-#endif
-
-#ifndef SATURATEB
-#define SATURATEB(X) CLAMP(X, 0, 255)
-#endif
-
-#ifndef LERP
-#define LERP(A, B, Alpha) ((A) + (Alpha) * ((B)-(A)))
-#endif
-
-// Safe memory freeing
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(p)          { if (p) { delete (p);       (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(p)    { if (p) { delete[] (p);     (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_RELEASE_FORCE
-#define SAFE_RELEASE_FORCE(p)           { if (p) { (p)->ReleaseForce();  (p) = NULL; } \
-}
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_TARRAY_H
diff --git a/Code/CryEngine/CryCommon/TimeValue.h b/Code/CryEngine/CryCommon/TimeValue.h
deleted file mode 100644
index b5a3135c9a..0000000000
--- a/Code/CryEngine/CryCommon/TimeValue.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_TIMEVALUE_H
-#define CRYINCLUDE_CRYCOMMON_TIMEVALUE_H
-
-#pragma once
-
-
-class CTimeValue
-{
-public:
-    static const int64      TIMEVALUE_PRECISION = 100000;         // one second
-
-public:
-    void GetMemoryUsage(class ICrySizer*) const { /*nothing*/}
-
-    // Default constructor.
-    ILINE CTimeValue()
-    {
-        m_lValue = 0;
-    }
-
-    // Constructor.
-    ILINE CTimeValue(const float fSeconds)
-    {
-        SetSeconds(fSeconds);
-    }
-
-    ILINE CTimeValue(const double fSeconds)
-    {
-        SetSeconds(fSeconds);
-    }
-
-    // Constructor.
-    // Arguments:
-    //      inllValue - positive negative, absolute or relative in 1 second= TIMEVALUE_PRECISION units.
-    ILINE CTimeValue(const int64 inllValue)
-    {
-        m_lValue = inllValue;
-    }
-
-    // Copy constructor.
-    ILINE CTimeValue(const CTimeValue& inValue)
-    {
-        m_lValue = inValue.m_lValue;
-    }
-
-    // Destructor.
-    ILINE ~CTimeValue() {}
-
-    // Description:
-    //      Assignment operator.
-    // Arguments:
-    //      inRhs - Right side.
-    ILINE CTimeValue& operator=(const CTimeValue& inRhs)
-    {
-        m_lValue = inRhs.m_lValue;
-        return *this;
-    };
-
-    // Use only for relative value, absolute values suffer a lot from precision loss.
-    ILINE float GetSeconds() const
-    {
-        return m_lValue * (1.f / TIMEVALUE_PRECISION);
-    }
-
-    // Get relative time difference in seconds - call on the endTime object:  endTime.GetDifferenceInSeconds( startTime );
-    ILINE float GetDifferenceInSeconds(const CTimeValue& startTime) const
-    {
-        return (m_lValue - startTime.m_lValue) * (1.f / TIMEVALUE_PRECISION);
-    }
-
-    //
-    ILINE void SetSeconds(const float infSec)
-    {
-        m_lValue = (int64)(infSec * TIMEVALUE_PRECISION);
-    }
-
-    //
-    ILINE void SetSeconds(const double infSec)
-    {
-        m_lValue = (int64)(infSec * TIMEVALUE_PRECISION);
-    }
-
-    //
-    ILINE void SetSeconds(const int64 indwSec)
-    {
-        m_lValue = indwSec * TIMEVALUE_PRECISION;
-    }
-
-    //
-    ILINE void SetMilliSeconds(const int64 indwMilliSec)
-    {
-        m_lValue = indwMilliSec * (TIMEVALUE_PRECISION / 1000);
-    }
-
-    // Use only for relative value, absolute values suffer a lot from precision loss.
-    ILINE float GetMilliSeconds() const
-    {
-        return m_lValue * (1000.f / TIMEVALUE_PRECISION);
-    }
-
-    ILINE int64 GetMilliSecondsAsInt64() const
-    {
-        return m_lValue * 1000 / TIMEVALUE_PRECISION;
-    }
-
-    ILINE int64 GetMicroSecondsAsInt64() const
-    {
-        return m_lValue * (1000 * 1000) / TIMEVALUE_PRECISION;
-    }
-
-    ILINE int64 GetValue() const
-    {
-        return m_lValue;
-    }
-
-    ILINE void SetValue(int64 val)
-    {
-        m_lValue = val;
-    }
-
-    // Description:
-    //      Useful for periodic events (e.g. water wave, blinking).
-    //      Changing TimePeriod can results in heavy changes in the returned value.
-    // Return Value:
-    //   [0..1[
-    float GetPeriodicFraction(const CTimeValue TimePeriod) const
-    {
-        // todo: change float implement to int64 for more precision
-        float fAbs = GetSeconds() / TimePeriod.GetSeconds();
-        return fAbs - (int)(fAbs);
-    }
-
-    // math operations -----------------------
-
-    // Minus.
-    ILINE CTimeValue operator-(const CTimeValue& inRhs) const {   CTimeValue ret; ret.m_lValue = m_lValue - inRhs.m_lValue; return ret; };
-    // Plus.
-    ILINE CTimeValue operator+(const CTimeValue& inRhs) const {   CTimeValue ret; ret.m_lValue = m_lValue + inRhs.m_lValue; return ret;    };
-    // Unary minus.
-    ILINE CTimeValue operator-() const { CTimeValue ret; ret.m_lValue = -m_lValue; return ret; };
-
-    ILINE CTimeValue& operator+=(const CTimeValue& inRhs) { m_lValue += inRhs.m_lValue; return *this; }
-    ILINE CTimeValue& operator-=(const CTimeValue& inRhs) { m_lValue -= inRhs.m_lValue; return *this; }
-
-    ILINE CTimeValue& operator/=(int inRhs) { m_lValue /= inRhs; return *this; }
-
-    // comparison -----------------------
-
-    ILINE bool operator<(const CTimeValue& inRhs) const { return m_lValue < inRhs.m_lValue; };
-    ILINE bool operator>(const CTimeValue& inRhs) const { return m_lValue > inRhs.m_lValue;   };
-    ILINE bool operator>=(const CTimeValue& inRhs) const { return m_lValue >= inRhs.m_lValue; };
-    ILINE bool operator<=(const CTimeValue& inRhs) const { return m_lValue <= inRhs.m_lValue; };
-    ILINE bool operator==(const CTimeValue& inRhs) const { return m_lValue == inRhs.m_lValue; };
-    ILINE bool operator!=(const CTimeValue& inRhs) const { return m_lValue != inRhs.m_lValue; };
-
-    AUTO_STRUCT_INFO
-
-    void GetMemoryStatistics(class ICrySizer*) const { /*nothing*/}
-
-private: // ----------------------------------------------------------
-
-    int64                                   m_lValue;                                               // absolute or relative value in 1/TIMEVALUE_PRECISION, might be negative
-
-
-    friend class CTimer;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_TIMEVALUE_H
diff --git a/Code/CryEngine/CryCommon/TimeValue_info.h b/Code/CryEngine/CryCommon/TimeValue_info.h
deleted file mode 100644
index 8d2b23b441..0000000000
--- a/Code/CryEngine/CryCommon/TimeValue_info.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_TIMEVALUE_INFO_H
-#define CRYINCLUDE_CRYCOMMON_TIMEVALUE_INFO_H
-#pragma once
-
-#include "TimeValue.h"
-
-STRUCT_INFO_BEGIN(CTimeValue)
-STRUCT_VAR_INFO(m_lValue, TYPE_INFO(int64))
-STRUCT_INFO_END(CTimeValue)
-
-
-#endif // CRYINCLUDE_CRYCOMMON_TIMEVALUE_INFO_H
diff --git a/Code/CryEngine/CryCommon/Timer.h b/Code/CryEngine/CryCommon/Timer.h
deleted file mode 100644
index ffd1d52014..0000000000
--- a/Code/CryEngine/CryCommon/Timer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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/CryEngine/CryCommon/TypeInfo_decl.h b/Code/CryEngine/CryCommon/TypeInfo_decl.h
deleted file mode 100644
index dbab741bae..0000000000
--- a/Code/CryEngine/CryCommon/TypeInfo_decl.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Macros and other definitions needed for TypeInfo declarations.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_TYPEINFO_DECL_H
-#define CRYINCLUDE_CRYCOMMON_TYPEINFO_DECL_H
-#pragma once
-
-#include <AzCore/Math/Uuid.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Meta-type support.
-//////////////////////////////////////////////////////////////////////////
-
-// Currently enable type info for all platforms.
-#if !defined(ENABLE_TYPE_INFO)
-#define ENABLE_TYPE_INFO
-#endif
-#ifdef ENABLE_TYPE_INFO
-
-struct CTypeInfo;
-
-// If TypeInfo exists for T, it is accessed via TypeInfo(T*).
-// Default TypeInfo() is implemented by a struct member function.
-template<class T>
-inline const CTypeInfo& TypeInfo(const T* t)
-{
-    return t->TypeInfo();
-}
-
-// Declare a class's TypeInfo member
-#define STRUCT_INFO \
-    const CTypeInfo&TypeInfo() const;
-
-#define NULL_STRUCT_INFO \
-    const CTypeInfo&TypeInfo() const   { return *(CTypeInfo*)0; }
-
-// Declare an override for a type without TypeInfo() member (e.g. basic type)
-#define DECLARE_TYPE_INFO(Type) \
-    template<>                  \
-    const CTypeInfo&TypeInfo(const Type*);
-
-// Template version.
-#define DECLARE_TYPE_INFO_T(Type) \
-    template<class T>             \
-    const CTypeInfo&TypeInfo(const Type<T>*);
-
-// Type info declaration, with additional prototypes for string conversions.
-#define BASIC_TYPE_INFO(Type)                   \
-    string ToString(Type const & val);          \
-    bool FromString(Type & val, const char* s); \
-    DECLARE_TYPE_INFO(Type)
-
-#define CUSTOM_STRUCT_INFO(Struct)   \
-    const CTypeInfo&TypeInfo() const \
-    { static Struct Info; return Info; }
-
-#else // ENABLE_TYPE_INFO
-
-#define STRUCT_INFO
-#define NULL_STRUCT_INFO
-#define DECLARE_TYPE_INFO(Type)
-#define DECLARE_TYPE_INFO_T(Type)
-#define BASIC_TYPE_INFO(T)
-
-#endif // ENABLE_TYPE_INFO
-
-// Specify automatic tool generation of TypeInfo bodies.
-#define AUTO_STRUCT_INFO                            STRUCT_INFO
-#define AUTO_TYPE_INFO                              DECLARE_TYPE_INFO
-#define AUTO_TYPE_INFO_T                            DECLARE_TYPE_INFO_T
-
-// Obsolete "LOCAL" versions (all infos now generated in local files).
-#define AUTO_STRUCT_INFO_LOCAL              STRUCT_INFO
-#define AUTO_TYPE_INFO_LOCAL                    DECLARE_TYPE_INFO
-#define AUTO_TYPE_INFO_LOCAL_T              DECLARE_TYPE_INFO_T
-
-// Overrides for basic types.
-DECLARE_TYPE_INFO(void)
-
-BASIC_TYPE_INFO(bool)
-BASIC_TYPE_INFO(char)
-BASIC_TYPE_INFO(wchar_t)
-BASIC_TYPE_INFO(signed char)
-BASIC_TYPE_INFO(unsigned char)
-BASIC_TYPE_INFO(short)
-BASIC_TYPE_INFO(unsigned short)
-BASIC_TYPE_INFO(int)
-BASIC_TYPE_INFO(unsigned int)
-BASIC_TYPE_INFO(long)
-BASIC_TYPE_INFO(unsigned long)
-BASIC_TYPE_INFO(int64)
-BASIC_TYPE_INFO(uint64)
-
-BASIC_TYPE_INFO(float)
-BASIC_TYPE_INFO(double)
-
-BASIC_TYPE_INFO(AZ::Uuid)
-
-DECLARE_TYPE_INFO(string)
-
-// All pointers share same TypeInfo.
-const CTypeInfo&PtrTypeInfo();
-template<class T>
-inline const CTypeInfo& TypeInfo([[maybe_unused]] T** t)
-{
-    return PtrTypeInfo();
-}
-
-
-#endif // CRYINCLUDE_CRYCOMMON_TYPEINFO_DECL_H
diff --git a/Code/CryEngine/CryCommon/TypeInfo_impl.h b/Code/CryEngine/CryCommon/TypeInfo_impl.h
deleted file mode 100644
index 938a7b5e52..0000000000
--- a/Code/CryEngine/CryCommon/TypeInfo_impl.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Declaration of CTypeInfo, and other things to access meta-type info.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_TYPEINFO_IMPL_H
-#define CRYINCLUDE_CRYCOMMON_TYPEINFO_IMPL_H
-#pragma once
-
-
-#include "CryCustomTypes.h"
-
-#define ENABLE_TYPE_INFO_NAMES 1
-
-//---------------------------------------------------------------------------
-// DECLARATION MACROS
-// Used to construct meta TypeInfo objects in AutoTypeInfo files.
-// Two possible levels of TypeInfo: default, with size and offset info only, allowing Endian conversion;
-// and full, with string, attr, and enum info, allowing UI and serialisation.
-// The full version is selected by the ENABLE_TYPE_INFO_NAMES macro.
-
-#ifdef ENABLE_TYPE_INFO
-
-    #ifndef ENABLE_TYPE_INFO_NAMES
-// This symbol must be defined only once per module.
-        #define ENABLE_TYPE_INFO_NAMES 0
-    #endif
-
-    #if ENABLE_TYPE_INFO_NAMES
-        #define TYPE_INFO_NAME(n)                           #n
-    #else
-        #define TYPE_INFO_NAME(n)                           ""
-    #endif
-    #define TYPE_INFO_NAME_T(n)                         #n "<>"
-
-// Set of template functions for automatically returning the base element type for any scalar or array variable.
-
-template<class T>
-inline T& ElemType(T* at)
-{ return *at; }
-
-template<class T, size_t N>
-inline T& ElemType(T (*at)[N])
-{ return **at; }
-
-template<class T, size_t N, size_t N2>
-inline T& ElemType(T (*at)[N][N2])
-{ return ***at; }
-
-template<class T, size_t N, size_t N2, size_t N3>
-inline T& ElemType(T (*at)[N][N2][N3])
-{ return ****at; }
-
-template<class T>
-inline T& ValType([[maybe_unused]] T t)
-{ static T _t; return _t; }
-
-//---------------------------------------------------------------------------
-// Macros for constructing StructInfos (invoked by AutoTypeInfo.h)
-
-    #define DEFINE_TYPE_INFO(T, Type, Args) \
-    template<>                              \
-    const CTypeInfo&TypeInfo(const T*)      \
-    { static Type Info Args; return Info; } \
-
-    #define STRUCT_INFO_EMPTY_BODY(T)                       \
-    {                                                       \
-        static CStructInfo Info(#T, sizeof(T), alignof(T)); \
-        return Info;                                        \
-    }                                                       \
-
-    #define STRUCT_INFO_EMPTY(T)        \
-    const CTypeInfo&T::TypeInfo() const \
-    STRUCT_INFO_EMPTY_BODY(T)           \
-
-    #define STRUCT_INFO_T_EMPTY(T, Key, Arg) \
-    template<Key Arg>                        \
-    STRUCT_INFO_EMPTY(T<Arg>)
-
-    #define STRUCT_INFO_TYPE_EMPTY(T) \
-    DEFINE_TYPE_INFO(T, CStructInfo, (#T, sizeof(T), alignof(T)))
-
-    #define STRUCT_INFO_TYPE_T_EMPTY(T, TArgs, TDecl)       \
-    template TDecl const CTypeInfo&TypeInfo(const T TArgs*) \
-    STRUCT_INFO_EMPTY_BODY(T TArgs)                         \
-
-// Define TypeInfo for a primitive type, without string conversion.
-    #define TYPE_INFO_PLAIN(T)                                              DEFINE_TYPE_INFO(T, CTypeInfo, (#T, sizeof(T), alignof(T)))
-
-// Define TypeInfo for a basic type (undecomposable as far as TypeInfo cares), with external string converters.
-    #define TYPE_INFO_BASIC(T)                                              DEFINE_TYPE_INFO(T, TTypeInfo<T>, (#T))
-
-// Variant for int types, allowing conversion between sizes.
-    #define TYPE_INFO_INT(T)                                                    DEFINE_TYPE_INFO(T, TIntTypeInfo<T>, (#T))
-
-    #define STRUCT_INFO_BEGIN(T)                \
-    const CTypeInfo&T::TypeInfo() const {       \
-        static CStructInfo::CVarInfo Vars[] = { \
-
-    #define STRUCT_INFO_END(T)                                           \
-    };                                                                   \
-    static CStructInfo Info(#T, sizeof(T), alignof(T), ARRAY_VAR(Vars)); \
-    return Info;                                                         \
-    }
-
-    #define BASE_INFO_ATTRS(BaseType, Attrs) \
-    { ::TypeInfo((const BaseType*)this), "", Attrs, uint32((char*)static_cast<const BaseType*>(this) - (char*)this), 1, 1, 0, 0, 0 },
-
-    #define BASE_INFO(BaseType) BASE_INFO_ATTRS(BaseType, "")
-
-    #define ALIAS_INFO_ATTRS(AliasName, VarName, Attrs) \
-    { ::TypeInfo(&ElemType(&VarName)), TYPE_INFO_NAME(AliasName), Attrs, uint32((char*)&VarName - (char*)this), sizeof(VarName) / sizeof(ElemType(&VarName)), 0, 0, 0, 0 },
-
-    #define ALIAS_INFO_STRINGNAME_ATTR(AliasStringName, VarName, Attrs) \
-    { ::TypeInfo(&ElemType(&VarName)), AliasStringName, Attrs, uint32((char*)&VarName - (char*)this), sizeof(VarName) / sizeof(ElemType(&VarName)), 0, 0, 0, 0 },
-
-    #define VAR_INFO_ATTRS(VarName, Attrs) \
-    ALIAS_INFO_ATTRS(VarName, VarName, Attrs)
-
-    #define VAR_INFO(VarName) \
-    VAR_INFO_ATTRS(VarName, "")
-
-    #define ALIAS_INFO(AliasName, VarName) \
-    ALIAS_INFO_ATTRS(AliasName, VarName, "")
-
-    #define ATTRS_INFO(Attrs) \
-    { ::TypeInfo((void*)0), "", Attrs, 0, 0, 0, 0, 0, 0 },
-
-    #define BITFIELD_INFO(VarName, Bits) \
-    { ::TypeInfo(&ValType(VarName)), TYPE_INFO_NAME(VarName), "", 0, Bits, 0, 1, 0, 0 },
-
-// Conversion macros for older system.
-    #define STRUCT_BASE_INFO(BaseType)                                      BASE_INFO(BaseType)
-    #define STRUCT_VAR_INFO(VarName, InfoName)                      VAR_INFO(VarName)
-    #define STRUCT_BITFIELD_INFO(VarName, VarType, Bits)    BITFIELD_INFO(VarName, Bits)
-
-// Template versions
-
-template<class T>
-Array<CTypeInfo const*> TypeInfoArray1(T const* pt)
-{
-    static CTypeInfo const* s_info = &::TypeInfo(pt);
-    return ArrayT(&s_info, 1);
-}
-
-    #define STRUCT_INFO_T_BEGIN(T, Key, Arg) \
-    template<Key Arg>                        \
-    STRUCT_INFO_BEGIN(T<Arg>)
-
-    #define STRUCT_INFO_T_END(T, Key, Arg)                                                                       \
-    };                                                                                                           \
-    static CStructInfo Info(#T "<>", sizeof(T<Arg>), alignof(T<Arg>), ARRAY_VAR(Vars), TypeInfoArray1((Arg*)0)); \
-    return Info;                                                                                                 \
-    }
-
-    #define STRUCT_INFO_T2_BEGIN(T, Key1, Arg1, Key2, Arg2) \
-    template<Key1 Arg1, Key2 Arg2>                          \
-    const CTypeInfo&T<Arg1, Arg2>::TypeInfo() const {       \
-        typedef T<Arg1, Arg2> TThis;                        \
-        static CStructInfo::CVarInfo Vars[] = {             \
-
-    #define STRUCT_INFO_T2_END(T, Key1, Arg1, Key2, Arg2)                                                        \
-    };                                                                                                           \
-    static CTypeInfo const* TemplateTypes[] = { &::TypeInfo((Arg1*)0), &::TypeInfo((Arg2*)0) };                  \
-    static CStructInfo Info(#T "<,>", sizeof(TThis), alignof(TThis), ARRAY_VAR(Vars), ARRAY_VAR(TemplateTypes)); \
-    return Info;                                                                                                 \
-    }
-
-    #define STRUCT_INFO_T_INSTANTIATE(T, TArgs) \
-    template const CTypeInfo& T<TArgs>::TypeInfo() const;
-
-//---------------------------------------------------------------------------
-// Enum type info
-
-    #if ENABLE_TYPE_INFO_NAMES
-
-// Enums represented as full CEnumInfo types, with string conversion.
-        #define ENUM_INFO_BEGIN(T)         \
-    template<>                             \
-    const CTypeInfo&TypeInfo(const T*) {   \
-        static CEnumDef::SElem Elems[] = { \
-
-        #define ENUM_INFO_END(T)                       \
-    };                                                 \
-    typedef TIntType<sizeof(T)>::TType TInt;           \
-    static CEnumInfo<TInt> Info(#T, ARRAY_VAR(Elems)); \
-    return Info;                                       \
-    }                                                  \
-
-        #define ENUM_ELEM_INFO(Scope, Elem) \
-    { Scope Elem, #Elem },
-
-    #else // ENABLE_TYPE_INFO_NAMES
-
-// Enums represented as simple types, with no elements or string conversion.
-        #define ENUM_INFO_BEGIN(T) \
-    TYPE_INFO_PLAIN(T)             \
-
-        #define ENUM_INFO_END(T)
-        #define ENUM_ELEM_INFO(Scope, Elem)
-
-    #endif // ENABLE_TYPE_INFO_NAMES
-
-#endif // ENABLE_TYPE_INFO
-
-#endif // CRYINCLUDE_CRYCOMMON_TYPEINFO_IMPL_H
diff --git a/Code/CryEngine/CryCommon/UnicodeBinding.h b/Code/CryEngine/CryCommon/UnicodeBinding.h
deleted file mode 100644
index afa2d0cc88..0000000000
--- a/Code/CryEngine/CryCommon/UnicodeBinding.h
+++ /dev/null
@@ -1,985 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Note: The utilities in this file should typically not be used directly,
-// consider including UnicodeFunctions.h or UnicodeIterator.h instead.
-//
-// (At least) the following string types can be bound with these helper functions:
-// Types                                            Input  Output Null-Terminator
-// CryStringT<T>, (::string, ::wstring):            yes    yes    implied by type (also Stack and Fixed variants)
-// std::basic_string<T>, std::string, std::wstring: yes    yes    implied by type
-// QString:                                         yes    yes    implied by type
-// std::vector<T>, std::list<T>, std::deque<T>:     yes    yes    not present
-// T[] (fixed-length buffer):                       yes    yes    guaranteed to be emitted on output, accepted on input
-// T * and size_t (user-specified-size buffer):     no     yes    guaranteed to be emitted on output
-// const T * (null-terminated string):              yes    no     expected
-// const T[] (literal):                             yes    no     implied as the last item in the array
-// pair of iterators over T:                        yes    no     should not be included in the range
-// uint32 (single UCS code-point):                  yes    no     not present
-// If some other string type is not listed, you can still use it for input easily by passing begin/end iterators.
-// Note: For all types, T can be any 8-bit, 16-bit or 32-bit integral or character type.
-// Further T types may be processed by explicitly passing InputEncoding and OutputEncoding.
-// We never actively tested such scenario's, so no guarantees on floating and user-defined types as code-units.
-
-
-#pragma once
-
-#ifndef assert
-// Some tools use CRT's assert, most engine and game modules use CryAssert.h (via platform.h maybe).
-// We don't want to force a choice upon all code that uses Unicode utilities, so we just assume assert is defined.
-#error This header uses assert macro, please provide an applicable definition before including UnicodeXXX.h
-#endif
-
-#include "UnicodeEncoding.h"
-#include <string.h>                 // For str(n)len and memcpy.
-#include <wchar.h>                  // For wcs(n)len.
-#include <stddef.h>                 // For size_t and ptrdiff_t.
-#include <iterator>                 // For std::iterator_traits.
-#include <string>                   // For std::basic_string.
-#include <vector>                   // For std::vector.
-#include <list>                     // For std::list.
-#include <deque>                    // For std::deque.
-#include <type_traits>              // ... standard type-traits (as of C++11).
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define UNICODEBINDING_H_SECTION_1 1
-#define UNICODEBINDING_H_SECTION_2 2
-#endif
-
-// Forward declare the supported types.
-// Before actually instantiating a binding however, you need to have the full definition included.
-// Also, this allows us to work with QChar/QString as declared names without a dependency on Qt.
-template<typename T, size_t S>
-class CryStackStringT;
-template<size_t S>
-class CryFixedStringT;
-template<size_t S>
-class CryFixedWStringT;
-template<typename T>
-class CryStringLocalT;
-template<typename T>
-class CryStringT;
-class QChar;
-class QString;
-namespace Unicode
-{
-    namespace Detail
-    {
-        // Import standard type traits.
-        // This requires C++11 compiler support.
-        using std::add_const;
-        using std::conditional;
-        using std::extent;
-        using std::integral_constant;
-        using std::is_arithmetic;
-        using std::is_array;
-        using std::is_base_of;
-        using std::is_const;
-        using std::is_convertible;
-        using std::is_integral;
-        using std::is_pointer;
-        using std::is_same;
-        using std::make_unsigned;
-        using std::remove_cv;
-        using std::remove_extent;
-        using std::remove_pointer;
-
-        // SVoid<T>:
-        // Result type will be void if T is well-formed.
-        // Note: This is mostly used to test the presence of member types at compile-time.
-        template<typename T>
-        struct SVoid
-        {
-            typedef void type;
-        };
-
-        // SValidChar<T, InferEncoding, Input>:
-        // Determine if T is a valid character type in the given compile-time context.
-        // The InferEncoding flag is set if the encoding has to be detected automatically.
-        // The Input flag is set if the type is used for input (and not set if the type is used for output).
-        template<typename T, bool InferEncoding, bool Input>
-        struct SValidChar
-        {
-            typedef typename remove_cv<T>::type BaseType;
-            static const bool isArithmeticType = is_arithmetic<BaseType>::value;
-            static const bool isQChar = is_same<BaseType, QChar>::value;
-            static const bool isUsable = isArithmeticType || isQChar;
-            static const bool isValidQualified = !is_const<T>::value || Input;
-            static const bool isKnownSize = sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4;
-            static const bool isValidInferred = isKnownSize || !InferEncoding;
-            static const bool value = isUsable && isValidQualified && isValidInferred;
-        };
-
-        // SPackedIterators<T>:
-        // A pair of iterators over some range.
-        // Note: Packing iterators into a single object allows us to pass them as a single argument like all other types.
-        template<typename T>
-        struct SPackedIterators
-        {
-            const T begin, end;
-            SPackedIterators(const T& _begin, const T& _end)
-                : begin(_begin)
-                , end(_end) {}
-        };
-
-        // SPackedBuffer<T>:
-        // A buffer-pointer/length tuple.
-        // Note: Packing them into a single object allows us to pass them as a single argument like all other types.
-        template<typename T>
-        struct SPackedBuffer
-        {
-            T buffer;
-            size_t size;
-            SPackedBuffer(T _buffer, size_t _size)
-                : buffer(_buffer)
-                , size(_size) {}
-        };
-
-        // SDependentType<T, X>:
-        // Makes the name of type T dependent on X (which is otherwise meaningless).
-        // Note: This is used to force two-phase lookup so we don't need the definition of T until instantiation.
-        // This way we can convince standards-compliant compilers Clang and GCC to not require definition of forward-declared types.
-        // Specifically, we forward-declare Qt's QString and QChar, for which the definition will never be available outside Editor.
-        template<typename T, int X>
-        struct SDependentType
-        {
-            typedef T type;
-        };
-
-        // EBind:
-        // Methods of binding a type for input and/or output.
-        // Note: These are used for tag-dispatch by binding functions, and are private to the implementation.
-        enum EBind
-        {                          // Input Output Description
-            eBind_Impossible,      // No    No     Can't bind this type.
-            eBind_Iterators,       // Yes   Yes    Bind by using begin() and end() member functions.
-            eBind_Data,            // Yes   Yes    Bind by using data() and size() member functions.
-            eBind_Literal,         // Yes   No     Bind a fixed size buffer (const element, aka string literal).
-            eBind_Buffer,          // Yes   No     Bind a fixed size buffer (non-const element) that may be null-terminated.
-            eBind_PackedBuffer,    // No    Yes    Bind a user-specified size buffer (non-const element).
-            eBind_NullTerminated,  // Yes   No     Bind a null-terminated buffer of unknown length (C string).
-            eBind_CodePoint,       // Yes   No     Bind a single code-point value.
-        };
-
-        // SBindIterator<T, InferEncoding>:
-        // Find the EBind for input from iterator pair of type T at compile-time.
-        // If the type is not supported, the resulting value will be eBind_Impossible
-        template<typename T, bool InferEncoding, typename HasValueType = void, typename HasIteratorCategory = void>
-        struct SBindIterator
-        {
-            typedef const void CharType;
-            static const EBind value = eBind_Impossible;
-        };
-        template<typename T, bool InferEncoding, typename HasValueType, typename HasIteratorCategory>
-        struct SBindIterator<T*, InferEncoding, HasValueType, HasIteratorCategory>
-        {
-            typedef typename add_const<T>::type CharType;
-            static const bool isValid = SValidChar<CharType, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
-        };
-        template<typename T, bool InferEncoding>
-        struct SBindIterator<T, InferEncoding,
-            typename SVoid<typename T::value_type>::type,
-            typename SVoid<typename T::iterator_category>::type
-            >
-        {
-            typedef typename add_const<typename T::value_type>::type CharType;
-            typedef typename T::iterator_category IteratorCategory;
-            static const bool isInputIterator = is_base_of<std::input_iterator_tag, IteratorCategory>::value;
-            static const bool isValid = SValidChar<CharType, InferEncoding, true>::value;
-            static const EBind value = isValid && isInputIterator ? eBind_Iterators : eBind_Impossible;
-        };
-
-        // SBindObject<T, InferEncoding>:
-        // Find the EBind for input from object of type T at compile-time.
-        // If the type is not supported, the resulting value will be eBind_Impossible.
-        template<typename T, bool InferEncoding>
-        struct SBindObject
-        {
-            typedef typename add_const<
-                typename conditional<
-                    is_array<T>::value,
-                    typename remove_extent<T>::type,
-                    typename remove_pointer<T>::type
-                    >::type
-                >::type CharType;
-            static const size_t FixedSize = extent<T>::value;
-            COMPILE_TIME_ASSERT(!is_array<T>::value || FixedSize > 0);
-            static const bool isConstArray = is_array<T>::value && is_const<typename remove_extent<T>::type>::value;
-            static const bool isBufferArray = is_array<T>::value && !isConstArray;
-            static const bool isPointer = is_pointer<T>::value;
-            static const bool isCodePoint = is_integral<T>::value;
-            static const bool isValidChar = SValidChar<CharType, InferEncoding, true>::value;
-            static const EBind value =
-                !isValidChar ? eBind_Impossible :
-                isConstArray ? eBind_Literal :
-                isBufferArray ? eBind_Buffer :
-                isPointer ? eBind_NullTerminated :
-                isCodePoint ? eBind_CodePoint :
-                eBind_Impossible;
-        };
-        template<typename CharT, typename Traits, typename Allocator, bool InferEncoding>
-        struct SBindObject<std::basic_string<CharT, Traits, Allocator>, InferEncoding>
-        {
-            typedef typename add_const<CharT>::type CharType;
-            static const bool isValid = SValidChar<CharT, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<typename T, typename Allocator, bool InferEncoding>
-        struct SBindObject<std::vector<T, Allocator>, InferEncoding>
-        {
-            typedef typename add_const<T>::type CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<typename T, typename Allocator, bool InferEncoding>
-        struct SBindObject<std::list<T, Allocator>, InferEncoding>
-        {
-            typedef typename add_const<T>::type CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
-        };
-        template<typename T, typename Allocator, bool InferEncoding>
-        struct SBindObject<std::deque<T, Allocator>, InferEncoding>
-        {
-            typedef typename add_const<T>::type CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
-        };
-        template<typename T, bool InferEncoding>
-        struct SBindObject<CryStringT<T>, InferEncoding>
-        {
-            typedef typename add_const<T>::type CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<typename T, bool InferEncoding>
-        struct SBindObject<CryStringLocalT<T>, InferEncoding>
-        {
-            typedef typename add_const<T>::type CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<typename T, size_t S, bool InferEncoding>
-        struct SBindObject<CryStackStringT<T, S>, InferEncoding>
-        {
-            typedef typename add_const<T>::type CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<size_t S, bool InferEncoding>
-        struct SBindObject<CryFixedStringT<S>, InferEncoding>
-        {
-            typedef char CharType;
-            static const bool isValid = SValidChar<CharType, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<size_t S, bool InferEncoding>
-        struct SBindObject<CryFixedWStringT<S>, InferEncoding>
-        {
-            typedef wchar_t CharType;
-            static const bool isValid = SValidChar<CharType, InferEncoding, true>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<bool InferEncoding>
-        struct SBindObject<QString, InferEncoding>
-        {
-            typedef const QChar CharType;
-            static const EBind value = eBind_Data;
-        };
-        template<typename T, bool InferEncoding>
-        struct SBindObject<SPackedIterators<T>, InferEncoding>
-        {
-            typedef typename SBindIterator<T, InferEncoding>::CharType CharType;
-            static const EBind value = eBind_Iterators;
-        };
-
-        // SBindOutput<T, InferEncoding>:
-        // Find the EBind for output to object of type T at compile-time.
-        // If the type is not supported, the resulting value will be eBind_Impossible.
-        template<typename T, bool InferEncoding>
-        struct SBindOutput
-        {
-            typedef typename remove_extent<T>::type CharType;
-            static const size_t FixedSize = extent<T>::value;
-            static const bool isArray = is_array<T>::value;
-            static const bool isValid = SValidChar<typename remove_extent<T>::type, InferEncoding, false>::value;
-            static const EBind value = isArray && isValid ? eBind_Buffer : eBind_Impossible;
-        };
-        template<typename OutputCharType, bool InferEncoding>
-        struct SBindOutput<SPackedBuffer<OutputCharType*>, InferEncoding>
-        {
-            typedef OutputCharType CharType;
-            static const bool isValid = SValidChar<CharType, InferEncoding, false>::value;
-            static const EBind value = isValid ? eBind_PackedBuffer : eBind_Impossible;
-        };
-        template<typename CharT, typename Traits, typename Allocator, bool InferEncoding>
-        struct SBindOutput<std::basic_string<CharT, Traits, Allocator>, InferEncoding>
-        {
-            typedef CharT CharType;
-            static const bool isValid = SValidChar<CharT, InferEncoding, false>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<typename T, typename Allocator, bool InferEncoding>
-        struct SBindOutput<std::vector<T, Allocator>, InferEncoding>
-        {
-            typedef T CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<typename T, typename Allocator, bool InferEncoding>
-        struct SBindOutput<std::list<T, Allocator>, InferEncoding>
-        {
-            typedef T CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
-            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
-        };
-        template<typename T, typename Allocator, bool InferEncoding>
-        struct SBindOutput<std::deque<T, Allocator>, InferEncoding>
-        {
-            typedef T CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
-            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
-        };
-        template<typename T, bool InferEncoding>
-        struct SBindOutput<CryStringT<T>, InferEncoding>
-        {
-            typedef T CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<typename T, bool InferEncoding>
-        struct SBindOutput<CryStringLocalT<T>, InferEncoding>
-        {
-            typedef T CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<typename T, size_t S, bool InferEncoding>
-        struct SBindOutput<CryStackStringT<T, S>, InferEncoding>
-        {
-            typedef T CharType;
-            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
-            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
-        };
-        template<bool InferEncoding>
-        struct SBindOutput<QString, InferEncoding>
-        {
-            typedef QChar CharType;
-            static const EBind value = eBind_Data;
-        };
-
-        // SInferEncoding<T>:
-        // Infers the encoding of the given character type.
-        // Note: This will always pick an UTF encoding type based on the size of the element type.
-        template<typename T, bool Input>
-        struct SInferEncoding
-        {
-            typedef SBindObject<T, true> ObjectType;
-            typedef SBindIterator<T, true> IteratorType;
-            typedef typename conditional<
-                IteratorType::value != eBind_Impossible,
-                typename IteratorType::CharType,
-                typename ObjectType::CharType
-                >::type CharType;
-            static const EEncoding value =
-                sizeof(CharType) == 1 ? eEncoding_UTF8 :
-                sizeof(CharType) == 2 ? eEncoding_UTF16 :
-                eEncoding_UTF32;
-            COMPILE_TIME_ASSERT(value != eEncoding_UTF32 || sizeof(CharType) == 4);
-        };
-
-        // SBindCharacter<T, Input>:
-        // Pick the base character type to use during input or output with this element type.
-        template<typename T, bool Input, bool Integral = is_integral<T>::value, bool IsQChar = is_same<QChar, typename remove_cv<T>::type>::value>
-        struct SBindCharacter
-        {
-            typedef typename make_unsigned<T>::type BaseType; // The standard doesn't define if a character type is signed or unsigned.
-            typedef typename remove_cv<BaseType>::type UnqualifiedType;
-            typedef typename conditional<Input, const UnqualifiedType, UnqualifiedType>::type type;
-        };
-        template<typename T, bool Input>
-        struct SBindCharacter<T, Input, false, false>
-        {
-            COMPILE_TIME_ASSERT(is_arithmetic<T>::value);
-            typedef typename remove_cv<T>::type UnqualifiedType;
-            typedef typename conditional<Input, const UnqualifiedType, UnqualifiedType>::type type;
-        };
-        template<typename T, bool Input>
-        struct SBindCharacter<T, Input, false, true>
-        {
-            typedef typename conditional<Input, const uint16, uint16>::type type;
-            typedef typename SDependentType<QChar, Input>::type ActuallyQChar; // Force two-phase name lookup on QChar.
-            COMPILE_TIME_ASSERT(sizeof(ActuallyQChar) == sizeof(type)); // In case Qt ever changes QChar.
-        };
-
-        // SBindPointer<T, Input>:
-        // Pick the pointer type to use during input or output with buffers (potentially inside string types).
-        template<typename T, bool Input>
-        struct SBindPointer
-        {
-            COMPILE_TIME_ASSERT(is_pointer<T>::value || is_array<T>::value);
-            typedef typename conditional<
-                is_pointer<T>::value,
-                typename remove_pointer<T>::type,
-                typename remove_extent<T>::type
-                >::type UnboundCharType;
-            typedef typename SBindCharacter<UnboundCharType, Input>::type BoundCharType;
-            typedef BoundCharType* type;
-        };
-
-        // SAutomaticallyDeduced:
-        // Placeholder type that is never defined, used by SRequire for SFINAE overloading.
-        struct SAutomaticallyDeduced;
-
-        // SRequire<Expr, T>:
-        // Helper for SFINAE overloading.
-        // Similar to C++11's std::enable_if, which is not in boost (with that exact name anyway).
-        template<bool SFINAE, typename T = SAutomaticallyDeduced>
-        struct SRequire
-        {
-            typedef T type;
-        };
-        template<typename T>
-        struct SRequire<false, T> {};
-
-        // SafeCast<T, SourceChar>:
-        // Cast a pointer to type T, but only allowing safe casts.
-        // This guards against bad code in other functions since it prevents unintended casts.
-        template<typename T, typename SourceChar>
-        inline T SafeCast(SourceChar* ptr, typename SRequire<is_integral<SourceChar>::value>::type* = 0)
-        {
-            // Allow casts from pointer-to-integral to unrelated pointer-to-integral, provided they are of the same size.
-            typedef typename remove_pointer<T>::type TargetChar;
-            COMPILE_TIME_ASSERT(is_integral<SourceChar>::value && is_integral<TargetChar>::value);
-            COMPILE_TIME_ASSERT(sizeof(SourceChar) == sizeof(TargetChar));
-            return reinterpret_cast<T>(ptr);
-        }
-        template<typename T, typename SourceChar>
-        inline T SafeCast(SourceChar* ptr, typename SRequire<is_same<typename remove_cv<SourceChar>::type, QChar>::value>::type* = 0)
-        {
-            // Allow casts from pointer-to-QChar to unrelated pointer-to-integral, provided they are of the same size.
-            typedef typename remove_pointer<T>::type TargetChar;
-            COMPILE_TIME_ASSERT(is_integral<TargetChar>::value);
-            COMPILE_TIME_ASSERT(sizeof(SourceChar) == sizeof(TargetChar));
-            return reinterpret_cast<T>(ptr);
-        }
-        template<typename T, typename SourceChar>
-        inline T SafeCast(SourceChar* ptr, typename SRequire<!is_integral<SourceChar>::value&& !is_same<typename remove_cv<SourceChar>::type, QChar>::value>::type* = 0)
-        {
-            // Any other casts that are allowed by C++.
-            return static_cast<T>(ptr);
-        }
-
-        // SCharacterTrait<T>:
-        // Exposes some basic traits for a given character.
-        // Note: Map to (hopefully optimized) CRT functions where possible.
-        template<typename T, size_t Size = sizeof(T)* is_integral<T>::value>
-        struct SCharacterTrait
-        {
-            static size_t StrLen(const T* nts) // Fall-back strlen.
-            {
-                size_t result = 0;
-                while (*nts != 0)
-                {
-                    ++nts;
-                    ++result;
-                }
-                return result;
-            }
-            static size_t StrNLen(const T* ptr, size_t len) // Fall-back strnlen.
-            {
-                size_t result = 0;
-                while (*ptr != 0 && result != len)
-                {
-                    ++ptr;
-                    ++result;
-                }
-                return result;
-            }
-        };
-        template<typename T>
-        struct SCharacterTrait<T, sizeof(char)>
-        {
-            static size_t StrLen(const T* nts) // Narrow CRT strlen.
-            {
-                return ::strlen(SafeCast<const char*>(nts));
-            }
-            static size_t StrNLen(const T* ptr, size_t len) // Narrow CRT strnlen.
-            {
-                return ::strnlen(SafeCast<const char*>(ptr), len);
-            }
-        };
-        template<typename T>
-        struct SCharacterTrait<T, sizeof(wchar_t)>
-        {
-            static size_t StrLen(const T* nts) // Wide CRT strlen.
-            {
-                return ::wcslen(SafeCast<const wchar_t*>(nts));
-            }
-            static size_t StrNLen(const T* ptr, size_t len) // Wide CRT strnlen.
-            {
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION UNICODEBINDING_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(UnicodeBinding_h) 
-#endif
-                return ::wcsnlen(SafeCast<const wchar_t*>(ptr), len);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION UNICODEBINDING_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(UnicodeBinding_h)
-#endif
-            }
-        };
-
-        // void Feed(const SPackedIterators<InputIteratorType> &its, Sink &out, tag):
-        // Feeds the provided sink from provided packed iterator-range.
-        template<typename InputIteratorType, typename Sink>
-        inline void Feed(const SPackedIterators<InputIteratorType>& its, Sink& out, integral_constant<EBind, eBind_Iterators>)
-        {
-            typedef typename std::iterator_traits<InputIteratorType>::value_type UnboundCharType;
-            typedef typename SBindCharacter<UnboundCharType, true>::type BoundCharType;
-            for (InputIteratorType it = its.begin; it != its.end; ++it)
-            {
-                const UnboundCharType unbound = *it;
-                const BoundCharType bound = static_cast<BoundCharType>(unbound);
-                const uint32 item = static_cast<uint32>(bound);
-                out(item);
-            }
-        }
-
-        // void Feed(const SPackedIterators<const InputCharType *> &its, Sink &out, tag):
-        // Feeds the provided sink from provided packed pointer-range.
-        // This is slightly better code-generation than using generic iterators.
-        template<typename InputCharType, typename Sink>
-        inline void Feed(const SPackedIterators<const InputCharType*>& its, Sink& out, integral_constant<EBind, eBind_Iterators>)
-        {
-            typedef typename SBindPointer<const InputCharType*, true>::type PointerType;
-            assert(reinterpret_cast<size_t>(its.begin) <= reinterpret_cast<size_t>(its.end) && "Invalid range specified");
-            const size_t length = its.end - its.begin;
-            PointerType ptr = SafeCast<PointerType>(its.begin);
-            assert((ptr || !length) && "Passed a non-empty range containing a null-pointer");
-            for (size_t i = 0; i < length; ++i, ++ptr)
-            {
-                const uint32 item = static_cast<uint32>(*ptr);
-                out(item);
-            }
-        }
-
-        // void Feed(const InputStringType &in, Sink &out, tag):
-        // Feeds the provided sink from a container, using it's iterators.
-        // Note: Dispatches to one of the packed-range overloads.
-        template<typename InputStringType, typename Sink>
-        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_Iterators> tag)
-        {
-            typedef typename InputStringType::const_iterator IteratorType;
-            Detail::SPackedIterators<IteratorType> its(in.begin(), in.end());
-            Feed(its, out, tag);
-        }
-
-        // void Feed(const InputStringType &in, Sink &out, tag):
-        // Feeds the provided sink from a string-object's buffer.
-        template<typename InputStringType, typename Sink>
-        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_Data>)
-        {
-            typedef typename InputStringType::size_type SizeType;
-            typedef typename InputStringType::value_type ValueType;
-            typedef typename SBindPointer<const ValueType*, true>::type PointerType;
-            const SizeType length = in.size();
-            if (length)
-            {
-                PointerType ptr = SafeCast<PointerType>(in.data());
-                for (SizeType i = 0; i < length; ++i, ++ptr)
-                {
-                    const uint32 item = static_cast<uint32>(*ptr);
-                    out(item);
-                }
-            }
-        }
-
-        // void Feed(const InputStringType &in, Sink &out, tag):
-        // Feeds the provided sink from a string-literal.
-        // Note: The literal is assumed to be null-terminated.
-        // It's possible that a const-element fixed-size-buffer is mistaken as a literal.
-        // However, we expect no-one uses such buffers that are not null-terminated already.
-        // If somehow this use-case is desired, either terminate the buffer, or remove const from the buffer, or pass iterators.
-        template<typename InputStringType, typename Sink>
-        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_Literal>)
-        {
-            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
-            typedef typename SBindPointer<InputStringType, true>::type PointerType;
-            const size_t length = extent<InputStringType>::value - 1;
-            PointerType ptr = SafeCast<PointerType>(in);
-            assert(ptr[length] == 0 && "Literal is not null-terminated");
-            for (size_t i = 0; i < length; ++i, ++ptr)
-            {
-                const uint32 item = static_cast<uint32>(*ptr);
-                out(item);
-            }
-        }
-
-        // void Feed(const InputStringType &in, Sink &out, tag):
-        // Feeds the provided sink from a non-const-element fixed-size buffer.
-        // Note: The buffer is allowed to be null-terminated, but it's not required.
-        template<typename InputStringType, typename Sink>
-        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_Buffer>)
-        {
-            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
-            typedef typename SBindPointer<InputStringType, true>::type PointerType;
-            typedef typename SBindPointer<InputStringType, true>::BoundCharType CharType;
-            const size_t length = extent<InputStringType>::value;
-            PointerType ptr = SafeCast<PointerType>(in);
-            for (size_t i = 0; i < length; ++i, ++ptr)
-            {
-                const CharType unbound = *ptr;
-                if (unbound == 0)
-                {
-                    break;
-                }
-                const uint32 item = static_cast<uint32>(unbound);
-                out(item);
-            }
-        }
-
-        // void Feed(const InputStringType &in, Sink &out, tag):
-        // Feeds the provided sink from a null-terminated C-style string.
-        template<typename InputStringType, typename Sink>
-        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_NullTerminated>)
-        {
-            COMPILE_TIME_ASSERT(is_pointer<InputStringType>::value);
-            typedef typename SBindPointer<InputStringType, true>::type PointerType;
-            typedef typename SBindPointer<InputStringType, true>::BoundCharType CharType;
-            PointerType ptr = SafeCast<PointerType>(in);
-            if (ptr)
-            {
-                while (true)
-                {
-                    const CharType unbound = *ptr;
-                    ++ptr;
-                    if (unbound == 0)
-                    {
-                        break;
-                    }
-                    const uint32 item = static_cast<uint32>(unbound);
-                    out(item);
-                }
-            }
-        }
-
-        // void Feed(const InputCharType &in, Sink &out, tag):
-        // Feeds the provided sink from a single value (interpreted as an UCS code-point).
-        template<typename InputCharType, typename Sink>
-        inline void Feed(const InputCharType& in, Sink& out, integral_constant<EBind, eBind_CodePoint>)
-        {
-            COMPILE_TIME_ASSERT(is_arithmetic<InputCharType>::value);
-            const uint32 item = static_cast<uint32>(in);
-            out(item);
-        }
-
-        // size_t EncodedLength(const SPackedIterators<InputIteratorType> &its, tag):
-        // Determines the length of the input sequence in a range of iterators.
-        template<typename InputIteratorType>
-        inline size_t EncodedLength(const SPackedIterators<InputIteratorType>& its, integral_constant<EBind, eBind_Iterators>)
-        {
-            return std::distance(its.begin, its.end); // std::distance will pick optimal implementation depending on iterator category.
-        }
-
-        // size_t EncodedLength(const InputStringType &in, tag):
-        // Determines the length of an input container, which would otherwise be enumerated with iterators.
-        template<typename InputStringType>
-        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_Iterators>)
-        {
-            return in.size(); // Can there be a container without size()? At the very least, not in the supported types.
-        }
-
-        // size_t EncodedLength(const InputStringType &in, tag):
-        // Determines the length of the input container. The container uses contiguous element layout.
-        template<typename InputStringType>
-        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_Data>)
-        {
-            return in.size();
-        }
-
-        // size_t EncodedLength(const InputStringType &in, tag):
-        // Determines the length of the input string-literal. This is a compile-time constant.
-        template<typename InputStringType>
-        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_Literal>)
-        {
-            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
-            return extent<InputStringType>::value - 1;
-        }
-
-        // size_t EncodedLength(const InputStringType &in, tag):
-        // Determines the length of the input fixed-size-buffer. We look for an (optional) null-terminator in the buffer.
-        template<typename InputStringType>
-        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_Buffer>)
-        {
-            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
-            typedef typename remove_extent<InputStringType>::type CharType;
-            return SCharacterTrait<CharType>::StrNLen(in, extent<InputStringType>::value);
-        }
-
-        // size_t EncodedLength(const InputStringType &in, tag):
-        // Determines the length of the input used-specified buffer. We look for an (optional) null-terminator in the buffer.
-        template<typename InputCharType>
-        inline size_t EncodedLength(const SPackedBuffer<InputCharType*>& in, integral_constant<EBind, eBind_PackedBuffer>)
-        {
-            return in.buffer ? SCharacterTrait<InputCharType>::StrNLen(in.buffer, in.size) : 0;
-        }
-
-        // size_t EncodedLength(const InputStringType &in, tag):
-        // Determines the length of the input null-terminated c-style string. We just use strlen() if available.
-        template<typename InputStringType>
-        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_NullTerminated>)
-        {
-            COMPILE_TIME_ASSERT(is_pointer<InputStringType>::value);
-            typedef typename remove_pointer<InputStringType>::type CharType;
-            return in ? SCharacterTrait<CharType>::StrLen(in) : 0;
-        }
-
-        // size_t EncodedLength(const InputCharType &in, tag):
-        // Determines the length of a single UCS code-point. This is always 1.
-        template<typename InputCharType>
-        inline size_t EncodedLength([[maybe_unused]] const InputCharType& in, integral_constant<EBind, eBind_CodePoint>)
-        {
-            COMPILE_TIME_ASSERT(is_arithmetic<InputCharType>::value);
-            return 1;
-        }
-
-        // const void *EncodedPointer(const SPackedIterators<const InputCharType *> &its, tag):
-        // Get a pointer to contiguous storage for an iterator range.
-        // Note: This can only work if the iterators are pointers, or the storage won't be guaranteed contiguous.
-        template<typename InputCharType>
-        inline const void* EncodedPointer(const SPackedIterators<const InputCharType*>& its, integral_constant<EBind, eBind_Iterators>)
-        {
-            return its.begin;
-        }
-
-        // const void *EncodedPointer(const InputStringType &in, tag):
-        // Get a pointer to contiguous storage for string/vector object.
-        // Note: This can only work for containers that actually use contiguous storage, which is determined by the SBindXXX helpers.
-        template<typename InputStringType>
-        inline const void* EncodedPointer(const InputStringType& in, integral_constant<EBind, eBind_Data>)
-        {
-            return in.data();
-        }
-
-        // const void *EncodedPointer(const InputStringType &in, tag):
-        // Get a pointer to contiguous storage for a string-literal.
-        template<typename InputStringType>
-        inline const void* EncodedPointer(const InputStringType& in, integral_constant<EBind, eBind_Literal>)
-        {
-            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
-            return in; // We can just let the array type decay to a pointer.
-        }
-
-        // const void *EncodedPointer(const InputStringType &in, tag):
-        // Get a pointer to contiguous storage for a fixed-size-buffer.
-        template<typename InputStringType>
-        inline const void* EncodedPointer(const InputStringType& in, integral_constant<EBind, eBind_Buffer>)
-        {
-            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
-            return in; // We can just let the array type decay to a pointer.
-        }
-
-        // const void *EncodedPointer(const InputStringType &in, tag):
-        // Get a pointer to contiguous storage for a null-terminated c-style-string.
-        template<typename InputStringType>
-        inline const void* EncodedPointer(const InputStringType& in, integral_constant<EBind, eBind_NullTerminated>)
-        {
-            COMPILE_TIME_ASSERT(is_pointer<InputStringType>::value);
-            return in; // Implied
-        }
-
-        // const void *EncodedPointer(const InputCharType &in, tag):
-        // Get a pointer to contiguous storage for a single UCS code-point.
-        template<typename InputCharType>
-        inline const void* EncodedPointer(const InputCharType& in, integral_constant<EBind, eBind_CodePoint>)
-        {
-            COMPILE_TIME_ASSERT(is_arithmetic<InputCharType>::value);
-            return &in; // Take the address of the parameter (which is kept on the stack of the caller).
-        }
-
-        // SWriteSink<T, Append, BindMethod>:
-        // A helper that performs writing to the type T and can be passed as Sink type to a trans-coder helper.
-        template<typename T, bool Append, EBind>
-        struct SWriteSink;
-        template<typename T, bool Append>
-        struct SWriteSink<T, Append, eBind_Iterators>
-        {
-            typedef typename T::value_type OutputCharType;
-            T& out;
-            SWriteSink(T& _out, size_t)
-                : out(_out)
-            {
-                if (!Append)
-                {
-                    // If not appending, clear the object beforehand.
-                    out.clear();
-                }
-            }
-            void operator()(uint32 item)
-            {
-                const OutputCharType bound = static_cast<OutputCharType>(item);
-                out.push_back(bound); // We assume this can't fail and STL container takes care of memory.
-            }
-            void operator()(const void*, size_t);  // Not implemented.
-            void HintSequence(uint32 length) {} // Don't care about sequences.
-            bool CanWrite() const { return true; } // Always writable
-        };
-        template<typename T, bool Append>
-        struct SWriteSink<T, Append, eBind_Data>
-        {
-            typedef SBindPointer<typename T::value_type*, false> BindHelper;
-            typedef typename BindHelper::UnboundCharType CharType;
-            CharType* ptr;
-            SWriteSink(T& out, size_t length)
-            {
-                const size_t offset = Append ? out.size() : 0;
-                length += offset;
-                out.resize(length); // resize() can't fail without exceptions, so assert instead.
-                assert((out.size() == length) && "Buffer resize failed (out-of-memory?)");
-                const CharType* base = length ? out.data() : 0;
-                ptr = const_cast<CharType*>(base + offset);
-            }
-            void operator()(uint32 item)
-            {
-                *SafeCast<typename BindHelper::type>(ptr) = static_cast<typename BindHelper::BoundCharType>(item);
-                ++ptr;
-            }
-            void operator()(const void* src, size_t length)
-            {
-                ::memcpy(ptr, src, length * sizeof(CharType));
-                ptr += length;
-            }
-            void HintSequence([[maybe_unused]] uint32 length) {} // Don't care about sequences.
-            bool CanWrite() const { return true; } // Always writable
-        };
-        template<typename P, bool Append>
-        struct SWriteSink<SPackedBuffer<P>, Append, eBind_PackedBuffer>
-        {
-            typedef typename remove_pointer<P>::type ElementType;
-            typedef SBindPointer<ElementType*, false> BindHelper;
-            typedef typename BindHelper::UnboundCharType CharType;
-            CharType* ptr;
-            CharType* const terminator;
-            SWriteSink(CharType* _terminator)
-                : terminator(_terminator) {}
-            SWriteSink(SPackedBuffer<P>& out, size_t)
-                : terminator(out.size && out.buffer ? out.buffer + out.size - 1 : 0)
-            {
-                const size_t offset = Append
-                    ? EncodedLength(out, integral_constant<EBind, eBind_PackedBuffer>())
-                    : 0;
-                const size_t fixedOffset = Append && offset >= out.size
-                    ? out.size - 1 // In case the buffer is already full and not terminated.
-                    : offset;
-                CharType* base = static_cast<CharType*>(out.buffer);
-                ptr = terminator ? base + fixedOffset : 0;
-            }
-            ~SWriteSink()
-            {
-                if (ptr)
-                {
-                    *ptr = 0; // Guarantees that the output is null-terminated.
-                }
-            }
-            void operator()(uint32 item)
-            {
-                if (ptr != terminator) // Guarantees we don't overflow the buffer.
-                {
-                    *SafeCast<typename BindHelper::type>(ptr) = static_cast<typename BindHelper::BoundCharType>(item);
-                    ++ptr;
-                }
-            }
-            void operator()(const void* src, size_t length)
-            {
-                const size_t maxLength = terminator - ptr;
-                if (length > maxLength)
-                {
-                    length = maxLength;
-                }
-                ::memcpy(ptr, src, length * sizeof(CharType));
-                ptr += length;
-            }
-            void HintSequence(uint32 length)
-            {
-                if (terminator && (ptr + length >= terminator))
-                {
-                    // This sequence will overflow the buffer.
-                    // In this case, we prefer to not generate any part of the sequence.
-                    // Terminate at the current position and flag as full.
-                    *ptr = 0;
-                    ptr = terminator;
-                }
-            }
-            bool CanWrite() const
-            {
-                return terminator != ptr;
-            }
-        };
-        template<typename T, bool Append>
-        struct SWriteSink<T, Append, eBind_Buffer> // Uses above implementation with specialized constructor
-            : SWriteSink<SPackedBuffer<typename remove_extent<T>::type*>, Append, eBind_PackedBuffer>
-        {
-            typedef typename remove_extent<T>::type ElementType;
-            typedef SWriteSink<SPackedBuffer<ElementType*>, Append, eBind_PackedBuffer> Super;
-            typedef SBindPointer<ElementType*, false> BindHelper;
-            typedef typename BindHelper::UnboundCharType CharType;
-            SWriteSink(T& out, size_t)
-                : Super(out + extent<T>::value - 1)
-            {
-                const size_t offset = Append
-                    ? EncodedLength(out, integral_constant<EBind, eBind_Buffer>())
-                    : 0;
-                const size_t fixedOffset = Append && offset >= extent<T>::value
-                    ? extent<T>::value - 1 // In case the buffer is already full and not terminated.
-                    : offset;
-                Super::ptr = out + fixedOffset; // Qualification for Super required for two-phase lookup.
-            }
-        };
-
-        // SIsBlockCopyable<InputType, OutputType>:
-        // Check if block-copy optimization is possible for these types.
-        // InputType should be an instantiation of SBindObject or SBindIterator.
-        // OutputType should be an instantiation of SBindOutput.
-        // Note: This doesn't take into account safe/unsafe conversions, just if the underlying storage types are compatible.
-        template<typename InputType, typename OutputType>
-        struct SIsBlockCopyable
-        {
-            template<EBind M>
-            struct SIsContiguous
-            {
-                static const bool value =
-                    M == eBind_Data ||
-                    M == eBind_Literal ||
-                    M == eBind_Buffer ||
-                    M == eBind_PackedBuffer ||
-                    M == eBind_NullTerminated ||
-                    M == eBind_CodePoint;
-            };
-            template<typename T>
-            struct SIsPointers
-            {
-                static const bool value = false;
-            };
-            template<typename T>
-            struct SIsPointers<SPackedIterators<T*> >
-            {
-                static const bool value = true;
-            };
-            typedef typename SBindCharacter<typename InputType::CharType, true>::type InputCharType;
-            typedef typename SBindCharacter<typename OutputType::CharType, false>::type OutputCharType;
-            static const bool isIntegral = is_integral<InputCharType>::value && is_integral<OutputCharType>::value;
-            static const bool isSameSize = sizeof(InputCharType) == sizeof(OutputCharType);
-            static const bool isInputContiguous = (SIsContiguous<InputType::value>::value || SIsPointers<InputType>::value);
-            static const bool isOutputContiguous = (SIsContiguous<OutputType::value>::value || SIsPointers<OutputType>::value);
-            static const bool value = isIntegral && isSameSize && isInputContiguous && isOutputContiguous;
-        };
-    }
-}
diff --git a/Code/CryEngine/CryCommon/UnicodeEncoding.h b/Code/CryEngine/CryCommon/UnicodeEncoding.h
deleted file mode 100644
index 5a661513e1..0000000000
--- a/Code/CryEngine/CryCommon/UnicodeEncoding.h
+++ /dev/null
@@ -1,766 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Generic Unicode encoding helpers.
-//
-// Defines encoding and decoding functions used by the higher-level functions.
-// These are used by the various conversion functions in UnicodeFunctions.h and UnicodeIterator.h.
-// Note: You can use these functions manually for low-level functionality, but we don't recommend that.
-// In that case, you probably want to check inside the nested Detail namespace for the elementary bits.
-
-
-#pragma once
-#include "BaseTypes.h" // For uint8, uint16, uint32
-#include "CompileTimeAssert.h" // For COMPILE_TIME_ASSERT macro
-namespace Unicode
-{
-    // Supported encoding/conversion types.
-    enum EEncoding
-    {
-        // UTF-8 encoding, see http://www.unicode.org/resources/utf8.html.
-        // Input and output are supported.
-        // Note: This format maps the entire UCS, where each code-point can take [1, 4] 8-bit code-units.
-        // Note: This is a strict super-set of Latin1/ISO-885901 as well as ASCII.
-        eEncoding_UTF8,
-
-        // UTF-16 encoding, see http://tools.ietf.org/html/rfc2781.
-        // Input and output are supported.
-        // Note: This format maps the entire UCS, where each code-point can take [1, 2] 16-bit code-units.
-        eEncoding_UTF16,
-
-        // UTF-32 encoding, see http://www.unicode.org/reports/tr17/.
-        // Input and output are supported.
-        // Note: This format maps the entire UCS, each code-point is stored in a single 32-bit code-unit.
-        eEncoding_UTF32,
-
-        // ASCII encoding, see http://en.wikipedia.org/wiki/ASCII.
-        // Input and output are supported (any output UCS values out of supported range are mapped to question mark).
-        // Note: Only values [U+0000, U+007F] can be mapped.
-        eEncoding_ASCII,
-
-        // Latin1, aka ISO-8859-1 encoding, see http://en.wikipedia.org/wiki/ISO/IEC_8859-1.
-        // Only input is supported.
-        // Note: This is a strict super-set of ASCII, it additionally maps [U+00A0, U+00FF].
-        eEncoding_Latin1,
-
-        // Windows ANSI codepage 1252, see http://en.wikipedia.org/wiki/Windows-1252.
-        // Only input is supported.
-        // Note: This is a strict super-set of ASCII and Latin1/ISO-8859-1, it maps some code-units from [0x80, 0x9F].
-        eEncoding_Win1252,
-    };
-
-    // Methods of recovery from invalid encoded sequences.
-    enum EErrorRecovery
-    {
-        // No attempt to detect invalid encoding is performed, the input is assumed to be valid.
-        // If the input is not valid, the output is undefined (in debug, this condition will cause an assert to trigger).
-        eErrorRecovery_None,
-
-        // When an invalidly encoded sequence is detected, the sequence is discarded (will not be part of the output).
-        // Typically used for logic/hashing purposes when the input is almost certainly valid.
-        eErrorRecovery_Discard,
-
-        // When an invalidly encoded sequence is detected, the sequence is replaced with the replacement-character (U+FFFD).
-        // Typically used when the output sequence is used for UI display purposes.
-        eErrorRecovery_Replace,
-
-        // When an invalidly encoded sequence is detected, the sequence is replaced with the eEncoding_Latin1 equivalent.
-        // If the sequence is also not valid Latin1 encoded, the sequence is discarded.
-        // Typically used when reading generic text files with 1-byte code-units.
-        // Note: This recovery method can only be used when decoding UTF-8.
-        eErrorRecovery_FallbackLatin1ThenDiscard,
-
-        // When an invalidly encoded sequence is detected, the sequence is replaced with the eEncoding_Win1252 equivalent.
-        // If the sequence is also not valid codepage 1252 encoded, the sequence is discarded.
-        // Typically used when reading text files generated on Windows with 1-byte code-units.
-        // Note: This recovery method can only be used when decoding UTF-8.
-        eErrorRecovery_FallbackWin1252ThenDiscard,
-
-        // When an invalidly encoded sequence is detected, the sequence is replaced with the eEncoding_Latin1 equivalent.
-        // If the sequence is also not valid Latin1 encoded, it is replaced with the replacement-character (U+FFFD).
-        // Typically used when reading generic text files with 1-byte code-units.
-        // Note: This recovery method can only be used when decoding UTF-8.
-        eErrorRecovery_FallbackLatin1ThenReplace,
-
-        // When an invalidly encoded sequence is detected, the sequence is replaced with the eEncoding_Win1252 equivalent.
-        // If the sequence is also not valid codepage 1252 encoded, it is replaced with the replacement-character (U+FFFD).
-        // Typically used when reading text files generated on Windows with 1-byte code-units.
-        // Note: This recovery method can only be used when decoding UTF-8.
-        eErrorRecovery_FallbackWin1252ThenReplace,
-    };
-
-    namespace Detail
-    {
-        // Decode<Encoding, Safe>(state, unit): Decodes a single code-unit of an encoding into an UCS code-point.
-        // When Safe flag is set, encoding errors are detected so a fall-back encoding or other recovery method can be used.
-        // Interpret return value as follows:
-        // <  0x001FFFFF: Decoded codepoint (== return value), call again with next code-unit and clear state.
-        // <  0x80000000: Intermediate state returned, call again with next code-unit and the returned state.
-        // >= 0x80000000: Bad encoding detected, up to 16 bits (UTF-16) or 24 bits (UTF-8, last in lower bits)
-        //                contain previous consumed values (does not happen if Safe == false).
-        template<EEncoding InputEncoding, bool Safe>
-        inline uint32 Decode(uint32 state, uint32 unit);
-
-        // Some constant values used when encoding/decoding.
-        enum
-        {
-            cDecodeShiftRemaining = 26,                               // Where to store the remaining count in the state.
-            cDecodeOneRemaining = 1 << cDecodeShiftRemaining,         // Remaining value of one.
-            cDecodeMaskRemaining = 3 << cDecodeShiftRemaining,        // All possible remaining bits that can be used.
-            cDecodeLeadBit = 1 << 22,                                 // All bits up to and including this one are reserved.
-            cDecodeErrorBit = 1 << 31,                                // Set if an error occurs during decoding.
-            cDecodeOverlongBit = 1 << 30,                             // Set if overlong sequence was used.
-            cDecodeSurrogateBit = 1 << 29,                            // Set if surrogate code-point decoded in UTF-8.
-            cDecodeInvalidBit = 1 << 28,                              // Set if invalid code-point decoded (U+FFFE/FFFF).
-            cDecodeSuccess = 0,                                       // Placeholder to indicate no error occurred.
-            cCodepointMax = 0x10FFFF,                                 // The maximum value of an UCS code-point.
-            cLeadSurrogateFirst = 0xD800,                             // The first valid UTF-16 lead-surrogate value.
-            cLeadSurrogateLast = 0xDBFF,                              // The last valid UTF-16 lead-surrogate value.
-            cTrailSurrogateFirst = 0xDC00,                            // The first valid UTF-16 trail-surrogate value.
-            cTrailSurrogateLast = 0xDFFF,                             // The last valid UTF-16 trail-surrogate value.
-            cReplacementCharacter = 0xFFFD,                           // The default replacement character.
-        };
-
-        // Validate the UTF-8 state of a multi-byte sequence.
-        // The safe decoder of UTF-8 will call this function when a full potential code-point has been decoded.
-        // This function is (at most) called for 50% of the decoded UTF-8 code-units, but likely at much lower frequency.
-        inline uint32 DecodeValidate8(uint32 state)
-        {
-            uint32 errorbits = (state >> 8) | cDecodeErrorBit;
-            state ^= (state & 0x400000) >> 1; // For 3-byte sequences, bit 5 of the lead byte needs to be cleared.
-            const uint32 cp =
-                (state & 0x3F) |
-                ((state & 0x3F00) >> 2) |
-                ((state & 0x3F0000) >> 4) |
-                ((state & 0x07000000) >> 6);
-            if (cp <= cCodepointMax)
-            {
-                if (cp >= cLeadSurrogateFirst && cp <= cTrailSurrogateLast)
-                {
-                    errorbits += cDecodeSurrogateBit; // CESU-8 encoding might have been used.
-                }
-                else
-                {
-                    uint32 minval = 0x80;
-                    minval += (0x00400000 & state) ? 0x800 - 0x80 : 0;
-                    minval += (0x40000000 & state) ? 0x10000 - 0x80 : 0;
-                    if (cp >= minval)
-                    {
-                        if ((cp & 0xFFFFFFFEU) != 0xFFFEU)
-                        {
-                            return cp; // Valid code-point.
-                        }
-                        errorbits += cDecodeInvalidBit; // Invalid character used.
-                    }
-                    errorbits += cDecodeOverlongBit; // Overlong encoding used.
-                }
-            }
-            return errorbits;
-        }
-
-        // Decode UTF-8, unsafe.
-        template<>
-        inline uint32 Decode<eEncoding_UTF8, false>(uint32 state, uint32 unit)
-        {
-            if (state == 0) // First byte.
-            {
-                unit = unit & 0xFF;
-                if (unit < 0xC0)
-                {
-                    return unit;              // Single-unit (ASCII).
-                }
-                uint32 remaining = (unit >> 4) - 0xC;
-                remaining += (remaining == 0);
-                return (unit & 0x1F) + (remaining << cDecodeShiftRemaining); // Lead byte of multi-byte.
-            }
-            state = (state << 6) + (unit & 0x3F) + (state & cDecodeMaskRemaining) - cDecodeOneRemaining; // Apply c-byte.
-            return state & ~cDecodeLeadBit; // Mask off the lead bits of a 4-byte sequence.
-        }
-
-        // Decode UTF-8, safe
-        template<>
-        inline uint32 Decode<eEncoding_UTF8, true>(uint32 state, uint32 unit)
-        {
-            if (unit <= 0xF4) // Discard out-of-range values immediately.
-            {
-                if (state == 0) // First byte.
-                {
-                    if (unit < 0x80)
-                    {
-                        return unit;              // Single-byte.
-                    }
-                    if (unit < 0xC2)
-                    {
-                        return cDecodeErrorBit;              // Invalid continuation byte (or illegal 0xC0/0xC1).
-                    }
-                    uint32 remaining = (unit >> 4) - 0xC;
-                    remaining += (remaining == 0);
-                    return unit + (remaining << cDecodeShiftRemaining); // Multi-byte.
-                }
-                if ((unit & 0xC0) == 0x80)
-                {
-                    const uint32 remaining = (state & cDecodeMaskRemaining) - cDecodeOneRemaining;
-                    state = (state << 8) + unit;
-                    if (remaining != 0)
-                    {
-                        return state | remaining;                 // Intermediate byte of a multi-byte sequence.
-                    }
-                    return DecodeValidate8(state); // Final byte of a multi-byte sequence.
-                }
-            }
-            return cDecodeErrorBit | state;
-        }
-
-        // Decode UTF-16, unsafe.
-        template<>
-        inline uint32 Decode<eEncoding_UTF16, false>(uint32 state, uint32 unit)
-        {
-            const bool bLead = (unit >= cLeadSurrogateFirst) && (unit <= cLeadSurrogateLast);
-            const uint32 initial = unit + (bLead << cDecodeShiftRemaining);
-            const uint32 pair = 0x10000 + ((state & 0x3FF) << 10) + (unit & 0x3FF);
-            return state == 0 ? initial : pair;
-        }
-
-        // Decode UTF-16, safe.
-        template<>
-        inline uint32 Decode<eEncoding_UTF16, true>(uint32 state, uint32 unit)
-        {
-            const bool bTrail = (unit >= cTrailSurrogateFirst) && (unit <= cTrailSurrogateLast);
-            if (state != 0 && !bTrail)
-            {
-                return cDecodeErrorBit + (state & 0xFFFF);                        // Lead surrogate without trail surrogate
-            }
-            uint32 result = Decode<eEncoding_UTF16, false>(state, unit);
-            bool bValid = (result & 0xFFFFFFFEU) != 0xFFFEU;
-            return bValid ? result : result + cDecodeErrorBit + cDecodeInvalidBit;
-        }
-
-        // Decode UTF-32, unsafe.
-        template<>
-        inline uint32 Decode<eEncoding_UTF32, false>([[maybe_unused]] uint32 state, uint32 unit)
-        {
-            return unit;
-        }
-
-        // Decode UTF-32, safe.
-        template<>
-        inline uint32 Decode<eEncoding_UTF32, true>([[maybe_unused]] uint32 state, uint32 unit)
-        {
-            if (unit > cCodepointMax)
-            {
-                return cDecodeErrorBit;
-            }
-            if (unit >= cLeadSurrogateFirst && unit <= cTrailSurrogateLast)
-            {
-                return cDecodeErrorBit | cDecodeSurrogateBit;
-            }
-            if ((unit & 0xFFFEU) == 0xFFFEU)
-            {
-                return cDecodeErrorBit | cDecodeInvalidBit;
-            }
-            return unit;
-        }
-
-        // Decode ASCII, unsafe.
-        template<>
-        inline uint32 Decode<eEncoding_ASCII, false>([[maybe_unused]] uint32 state, uint32 unit)
-        {
-            return unit;
-        }
-
-        // Decode ASCII, safe.
-        template<>
-        inline uint32 Decode<eEncoding_ASCII, true>([[maybe_unused]] uint32 state, uint32 unit)
-        {
-            if (unit > 0x7F)
-            {
-                return cDecodeErrorBit;
-            }
-            return unit;
-        }
-
-        // Decode Latin1, unsafe.
-        template<>
-        inline uint32 Decode<eEncoding_Latin1, false>([[maybe_unused]] uint32 state, uint32 unit)
-        {
-            return unit;
-        }
-
-        // Decode Latin1, safe.
-        template<>
-        inline uint32 Decode<eEncoding_Latin1, true>([[maybe_unused]] uint32 state, uint32 unit)
-        {
-            if ((unit >= 0x80 && unit <= 0x9F) || (unit > 0xFF))
-            {
-                return cDecodeErrorBit;
-            }
-            return unit;
-        }
-
-        // Decode Windows CP-1252, unsafe.
-        template<>
-        inline uint32 Decode<eEncoding_Win1252, false>([[maybe_unused]] uint32 state, uint32 unit)
-        {
-            static const uint16 cp1252[] =
-            {
-                0x20AC, 0x0081, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-                0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008D, 0x017D, 0x008F,
-                0x0090, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-                0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x009D, 0x017E, 0x0178,
-            };
-            return (unit < 0x80 || unit > 0x9F) ? unit : cp1252[unit - 0x80];
-        }
-
-        // Decode Windows CP-1252, safe.
-        template<>
-        inline uint32 Decode<eEncoding_Win1252, true>(uint32 state, uint32 unit)
-        {
-            if (unit > 0xFF)
-            {
-                return cDecodeErrorBit;
-            }
-            uint32 result = Decode<eEncoding_Win1252, false>(state, unit);
-            if (!(unit < 0x80 || unit > 0x9F) && (result == unit))
-            {
-                return cDecodeErrorBit;                                                    // Not defined in codepage 1252.
-            }
-            return result;
-        }
-
-        // SBase<T>:
-        // Utility to apply empty-base-optimization on type T.
-        // Will fall back to a member if T is a reference type.
-        template<typename T, int Tag = 0>
-        struct SBase
-            : T
-        {
-            SBase(T base)
-                : T(base) {}
-            T& GetBase() { return *this; }
-            const T& GetBase() const { return *this; }
-        };
-        template<typename T, int Tag>
-        struct SBase<T&, Tag>
-        {
-            T& base;
-            SBase(T& b)
-                : base(b) {}
-            T& GetBase() { return base; }
-            const T& GetBase() const { return base; }
-        };
-
-        // SDecoder<Encoding, Sink, Recovery>:
-        // Functor to decode UCS code-points from an input range.
-        // Recovery functor will be invoked as a fall-back if decoding fails.
-        // This allows ensuring all the output is valid (even if the input isn't).
-        // Note: The destructor will automatically flush any remaining (erroneous) state, you can also call Finalize().
-        template<EEncoding InputEncoding, typename Sink, typename Recovery = void>
-        struct SDecoder
-            : SBase<Sink, 1>
-            , SBase<Recovery, 2>
-        {
-            uint32 state;
-            SDecoder(Sink sink, Recovery recovery = Recovery())
-                : SBase<Sink, 1>(sink)
-                , SBase<Recovery, 2>(recovery)
-                , state(0) {}
-            SDecoder() { Finalize(); }
-            Recovery& recovery() { return SBase<Recovery, 2>::GetBase(); }
-            Sink& sink() { return SBase<Sink, 1>::GetBase(); }
-            void operator()(uint32 unit)
-            {
-                state = Detail::Decode<InputEncoding, true>(state, unit);
-                if (state <= 0x1FFFFF)
-                {
-                    sink()(state);
-                    state = 0;
-                }
-                else if (state & Detail::cDecodeErrorBit)
-                {
-                    recovery()(sink(), state, unit);
-                    state = 0;
-                }
-            }
-            void Finalize()
-            {
-                if (state)
-                {
-                    recovery()(sink(), state, 0);
-                    state = 0;
-                }
-            }
-        };
-
-        // SDecoder<Encoding, Sink>:
-        // Functor to decode to UCS code-points from an input range.
-        // No attempt to discover or recover from encoding errors is made, can only safely be used with known-valid input.
-        template<EEncoding InputEncoding, typename Sink>
-        struct SDecoder<InputEncoding, Sink, void>
-            : SBase<Sink>
-        {
-            uint32 state;
-            SDecoder(Sink sink)
-                : SBase<Sink>(sink)
-                , state(0) {}
-            Sink& sink() { return SBase<Sink>::GetBase(); }
-            void operator()(uint32 unit)
-            {
-                state = Detail::Decode<InputEncoding, false>(state, unit);
-                if (state <= 0x1FFFFF)
-                {
-                    sink()(state);
-                    state = 0;
-                }
-            }
-            void Finalize() {}
-        };
-
-        // SEncoder<Encoding, Sink>:
-        // Generic Unicode encoder functor.
-        // Encoding must be one an encoding type for which output is supported.
-        // The Sink type must have HintSequence member for UTF-8 and UTF-16 (although it may be a no-op).
-        // In general, you feed operator() with UCS code-points and it will emit code-units.
-        template<EEncoding OutputEncoding, typename Sink>
-        struct SEncoder
-        {
-            static const bool value = false;
-        };
-
-        // SEncoder<Encoding, Sink>:
-        // Specialization of ASCII encoder functor.
-        // Note: Any out-of-range character is mapped to question mark.
-        template<typename Sink>
-        struct SEncoder<eEncoding_ASCII, Sink>
-            : SBase<Sink>
-        {
-            static const bool value = true;
-            typedef uint8 value_type;
-            SEncoder(Sink sink)
-                : SBase<Sink>(sink) {}
-            void operator()(uint32 cp)
-            {
-                cp = cp < 0x80 ? cp : (uint32)'?';
-                SBase<Sink>::GetBase()(value_type(cp));
-            }
-        };
-
-        // SEncoder<Encoding, Sink>:
-        // Specialization of UTF-8 encoder functor.
-        template<typename Sink>
-        struct SEncoder<eEncoding_UTF8, Sink>
-            : SBase<Sink>
-        {
-            static const bool value = true;
-            typedef uint8 value_type;
-            SEncoder(Sink sink)
-                : SBase<Sink>(sink) {}
-            Sink& sink() { return SBase<Sink>::GetBase(); }
-            void operator()(uint32 cp)
-            {
-                if (cp < 0x80)
-                {
-                    // Single byte sequence.
-                    sink()(value_type(cp));
-                }
-                else
-                {
-                    // Expand 21-bit value to 32-bit.
-                    uint32 bits =
-                        (cp & 0x00003F) +
-                        ((cp & 0x000FC0) << 2) +
-                        ((cp & 0x03F000) << 4) +
-                        ((cp & 0x1C0000) << 6);
-
-                    // Type of sequence.
-                    const bool bSeq4 = (cp >= 0x10000);
-                    const bool bSeq3 = (cp >= 0x800);
-
-                    // Mask lead-bytes and continuation-bytes.
-                    uint32 mask = 0xEFE0C080;
-                    mask ^= (bSeq3 << 14);
-                    mask += (bSeq4 ? 0xA00000 : 0);
-                    bits |= mask;
-
-                    // Length of the sequence.
-                    const uint32 length = (uint32)bSeq4 + (uint32)bSeq3 + 1;
-                    sink().HintSequence(length);
-
-                    // Sink the multi-byte sequence.
-                    if (bSeq4)
-                    {
-                        sink()(value_type(bits >> 24));
-                    }
-                    if (bSeq3)
-                    {
-                        sink()(value_type(bits >> 16));
-                    }
-                    sink()(value_type(bits >> 8));
-                    sink()(value_type(bits));
-                }
-            }
-        };
-
-        // SEncoder<Encoding, Sink>:
-        // Specialization of UTF-16 encoder functor.
-        template<typename Sink>
-        struct SEncoder<eEncoding_UTF16, Sink>
-            : SBase<Sink>
-        {
-            static const bool value = true;
-            typedef uint16 value_type;
-            SEncoder(Sink sink)
-                : SBase<Sink>(sink) {}
-            Sink& sink() { return SBase<Sink>::GetBase(); }
-            void operator()(uint32 cp)
-            {
-                if (cp < 0x10000)
-                {
-                    // Single unit
-                    sink()(value_type(cp));
-                }
-                else
-                {
-                    // We will generate two-element sequence
-                    sink().HintSequence(2);
-
-                    // Surrogate pair
-                    cp -= 0x10000;
-                    uint32 lead = ((cp >> 10) & 0x3FF) + Detail::cLeadSurrogateFirst;
-                    uint32 trail = (cp & 0x3FF) + Detail::cTrailSurrogateFirst;
-                    sink()(value_type(lead));
-                    sink()(value_type(trail));
-                }
-            }
-        };
-
-        // SEncoder<Encoding, Sink>:
-        // Specialization of UTF-32 encoder functor.
-        // Note: This is a no-op, but we want to be able to express UTF-32 just like the other encodings.
-        template<typename Sink>
-        struct SEncoder<eEncoding_UTF32, Sink>
-            : SBase<Sink>
-        {
-            static const bool value = true;
-            typedef uint32 value_type;
-            SEncoder(Sink sink)
-                : SBase<Sink>(sink) {}
-            void operator()(uint32 cp)
-            {
-                SBase<Sink>::GetBase()(value_type(cp));
-            }
-        };
-
-        // SDecoder<Encoding, SEncoder<Encoding>, void>:
-        // Specialization for unsafe no-op trans-coding.
-        // Since the conversion is a no-op, no need to keep any state or do any computation.
-        // Note: For a decoding with a fallback, this is not possible since we can't guarantee the input is valid.
-        template<EEncoding SameEncoding, typename Sink>
-        struct SDecoder<SameEncoding, SEncoder<SameEncoding, Sink>, void>
-        {
-            Sink sink;
-            SDecoder(Sink s)
-                : sink(s) {}
-            void operator()(uint32 unit)
-            {
-                sink(unit);
-            }
-            void Finalize() {}
-        };
-
-        // SRecoveryDiscard<Sink>:
-        // Recovery handler that, on encoding error, discards the offending sequence.
-        template<typename Sink>
-        struct SRecoveryDiscard
-        {
-            SRecoveryDiscard() {}
-            void operator()([[maybe_unused]] Sink& sink, [[maybe_unused]] uint32 error, [[maybe_unused]] uint32 unit) {}
-        };
-
-        // SRecoveryReplace<Sink>:
-        // Recovery handler that, on encoding error, replaces the sequence with replacement-character (U+FFFD).
-        // Note: This implementation matches a whole invalid sequence, it could be changed to emit for every code-unit.
-        template<typename Sink>
-        struct SRecoveryReplace
-        {
-            SRecoveryReplace() {}
-            void operator()(Sink& sink, uint32 error, uint32 unit) { sink(cReplacementCharacter); }
-        };
-
-        // SRecoveryFallback<Sink>:
-        // Recovery handler that, on encoding error, falls back to another encoding.
-        // The fallback encoding must be stateless (ie: ASCII, Latin1 or Win1252).
-        // This type assumes an 8-bit primary encoding since the only viable fallback encodings are 8-bit.
-        template<typename Sink, EEncoding FallbackEncoding, typename NextFallback>
-        struct SRecoveryFallback
-            : NextFallback
-        {
-            SRecoveryFallback()
-                : NextFallback() {}
-            void operator()(Sink& sink, uint32 error, uint32 unit)
-            {
-                SDecoder<FallbackEncoding, Sink&, NextFallback&> fallback(sink, *static_cast<NextFallback*>(this));
-                uint8 byte1(error >> 16);
-                uint8 byte2(error >> 8);
-                uint8 byte3(error);
-                uint8 byte4(unit);
-                if (byte1)
-                {
-                    fallback(byte1);
-                }
-                if (byte1 | byte2)
-                {
-                    fallback(byte2);
-                }
-                if (byte1 | byte2 | byte3)
-                {
-                    fallback(byte3);
-                }
-                fallback(byte4);
-            }
-        };
-
-        // SRecoveryFallbackHelper<Sink, RecoveryMethod>:
-        // Helper to pick a SRecoveryFallback instantiation based on RecoveryMethod.
-        template<EEncoding OutputEncoding, typename Sink, EErrorRecovery RecoveryMethod>
-        struct SRecoveryFallbackHelper
-        {
-            // A compilation error here means RecoveryMethod value was unexpected here
-            COMPILE_TIME_ASSERT(
-                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenDiscard ||
-                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenReplace ||
-                RecoveryMethod == eErrorRecovery_FallbackWin1252ThenDiscard ||
-                RecoveryMethod == eErrorRecovery_FallbackWin1252ThenReplace);
-            typedef SEncoder<OutputEncoding, Sink> SinkType;
-            static const EEncoding FallbackEncoding =
-                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenDiscard ||
-                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenReplace
-                ? eEncoding_Latin1 : eEncoding_Win1252;
-            template<typename Dummy, bool WithDiscard>
-            struct Pick
-            {
-                typedef SRecoveryDiscard<SinkType> type;
-            };
-            template<typename Dummy>
-            struct Pick<Dummy, false>
-            {
-                typedef SRecoveryReplace<SinkType> type;
-            };
-            typedef typename Pick<Sink,
-                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenDiscard ||
-                RecoveryMethod == eErrorRecovery_FallbackWin1252ThenDiscard>::type NextFallback;
-            typedef SRecoveryFallback<SinkType, FallbackEncoding, NextFallback> RecoveryType;
-            typedef SDecoder<eEncoding_UTF8, SinkType, RecoveryType> FullType;
-        };
-
-        // STranscoderSelect<InputEncoding, OutputEncoding, Sink, RecoveryMethod>:
-        // Derives a chained decoder/encoder pair that performs code-unit -> code-unit transform.
-        // The RecoveryMethod template parameter determines the behavior during encoding.
-        // This is the basic way to perform trans-coding, and is the type instantiated by the higher-level functions.
-        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename Sink, EErrorRecovery RecoveryMethod>
-        struct STranscoderSelect;
-        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename Sink>
-        struct STranscoderSelect<InputEncoding, OutputEncoding, Sink, eErrorRecovery_None>
-            : SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, void>
-        {
-            typedef SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, void> TranscoderType;
-            STranscoderSelect(Sink sink)
-                : TranscoderType(sink) {}
-        };
-        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename Sink>
-        struct STranscoderSelect<InputEncoding, OutputEncoding, Sink, eErrorRecovery_Discard>
-            : SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, SRecoveryDiscard<SEncoder<OutputEncoding, Sink> > >
-        {
-            typedef SRecoveryDiscard<SEncoder<OutputEncoding, Sink> > RecoveryType;
-            typedef SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, RecoveryType> TranscoderType;
-            STranscoderSelect(Sink sink)
-                : TranscoderType(sink) {}
-        };
-        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename Sink>
-        struct STranscoderSelect<InputEncoding, OutputEncoding, Sink, eErrorRecovery_Replace>
-            : SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, SRecoveryReplace<SEncoder<OutputEncoding, Sink> > >
-        {
-            typedef SRecoveryReplace<SEncoder<OutputEncoding, Sink> > RecoveryType;
-            typedef SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, RecoveryType> TranscoderType;
-            STranscoderSelect(Sink sink)
-                : TranscoderType(sink) {}
-        };
-        template<EEncoding OutputEncoding, typename Sink>
-        struct STranscoderSelect<eEncoding_UTF8, OutputEncoding, Sink, eErrorRecovery_FallbackLatin1ThenDiscard>
-            : SRecoveryFallbackHelper<OutputEncoding, Sink, eErrorRecovery_FallbackLatin1ThenDiscard>::FullType
-        {
-            static const EErrorRecovery RecoveryMethod = eErrorRecovery_FallbackLatin1ThenDiscard;
-            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::RecoveryType RecoveryType;
-            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::FullType TranscoderType;
-            STranscoderSelect(Sink sink)
-                : TranscoderType(sink) {}
-        };
-        template<EEncoding OutputEncoding, typename Sink>
-        struct STranscoderSelect<eEncoding_UTF8, OutputEncoding, Sink, eErrorRecovery_FallbackLatin1ThenReplace>
-            : SRecoveryFallbackHelper<OutputEncoding, Sink, eErrorRecovery_FallbackLatin1ThenReplace>::FullType
-        {
-            static const EErrorRecovery RecoveryMethod = eErrorRecovery_FallbackLatin1ThenReplace;
-            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::RecoveryType RecoveryType;
-            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::FullType TranscoderType;
-            STranscoderSelect(Sink sink)
-                : TranscoderType(sink) {}
-        };
-        template<EEncoding OutputEncoding, typename Sink>
-        struct STranscoderSelect<eEncoding_UTF8, OutputEncoding, Sink, eErrorRecovery_FallbackWin1252ThenDiscard>
-            : SRecoveryFallbackHelper<OutputEncoding, Sink, eErrorRecovery_FallbackWin1252ThenDiscard>::FullType
-        {
-            static const EErrorRecovery RecoveryMethod = eErrorRecovery_FallbackWin1252ThenDiscard;
-            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::RecoveryType RecoveryType;
-            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::FullType TranscoderType;
-            STranscoderSelect(Sink sink)
-                : TranscoderType(sink) {}
-        };
-        template<EEncoding OutputEncoding, typename Sink>
-        struct STranscoderSelect<eEncoding_UTF8, OutputEncoding, Sink, eErrorRecovery_FallbackWin1252ThenReplace>
-            : SRecoveryFallbackHelper<OutputEncoding, Sink, eErrorRecovery_FallbackWin1252ThenReplace>::FullType
-        {
-            static const EErrorRecovery RecoveryMethod = eErrorRecovery_FallbackWin1252ThenReplace;
-            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::RecoveryType RecoveryType;
-            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::FullType TranscoderType;
-            STranscoderSelect(Sink sink)
-                : TranscoderType(sink) {}
-        };
-
-        // SIsSafeEncoding<R>:
-        // Check if the given recovery mode is safe.
-        // This is used for SFINAE checks in higher-level functions.
-        template<EErrorRecovery R>
-        struct SIsSafeEncoding
-        {
-            static const bool value =
-                R == eErrorRecovery_Discard ||
-                R == eErrorRecovery_Replace ||
-                R == eErrorRecovery_FallbackLatin1ThenDiscard ||
-                R == eErrorRecovery_FallbackLatin1ThenReplace ||
-                R == eErrorRecovery_FallbackWin1252ThenDiscard ||
-                R == eErrorRecovery_FallbackWin1252ThenReplace;
-        };
-
-        // SIsCopyableEncoding<I, O>:
-        // Check if data in one encoding can be copied directly to another encoding.
-        // This is the basis for block-copy and string-assign optimizations in un-safe conversion functions.
-        // Note: There are more valid combinations, they are left out since those can't occur with the output encodings supported.
-        // Note: Only used for un-safe functions since it doesn't account for potential invalid sequences (they would be copied over).
-        template<EEncoding InputEncoding, EEncoding OutputEncoding>
-        struct SIsCopyableEncoding
-        {
-            static const bool value =
-                InputEncoding == eEncoding_ASCII || // ASCII and Latin1 values don't change in any encoding.
-                (InputEncoding == eEncoding_Latin1 && OutputEncoding != eEncoding_ASCII); // Except Latin1 -> ASCII is lossy.
-        };
-        template<EEncoding SameEncoding>
-        struct SIsCopyableEncoding<SameEncoding, SameEncoding>
-        {
-            static const bool value = true; // If the input and output encodings are the same, then it's copyable.
-        };
-    }
-}
diff --git a/Code/CryEngine/CryCommon/UnicodeFunctions.h b/Code/CryEngine/CryCommon/UnicodeFunctions.h
deleted file mode 100644
index 75d82ec0f1..0000000000
--- a/Code/CryEngine/CryCommon/UnicodeFunctions.h
+++ /dev/null
@@ -1,1264 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Generic Unicode string functions.
-//
-// Implements the following functions:
-// Analyze: Reports all information on the input string, (length for all encodings, validity- and non-ASCII flags).
-// Validate: Checks if the input string is valid encoded.
-// Length: Reports the encoded length of some known-valid input, as-if it was encoded in the given output encoding.
-// LengthSafe: Reports the encoded length of some input, as-if it was encoded in the given output encoding/recovery.
-// Convert: Converts input from a known-valid string type/encoding to another string type/encoding.
-// ConvertSafe: Converts and recovers encoding errors from one string type/encoding to another string type/encoding.
-// Append: Appends input from a known-valid string type/encoding to another string type/encoding.
-// AppendSafe: Appends and recovers encoding errors from one string type/encoding to another string type/encoding.
-//
-// Note: Ideally the safe functions should be used only once when accepting input from the user or from a file.
-// Afterwards, the content is known-safe and the unsafe functions can be used for optimal performance.
-// Using ConvertSafe once with a reasonable fall-back (depending on the where the input is from) should be the goal.
-//
-// Each function has several overloads:
-// - One variant to handle a string object / buffer / pointer (1 arg), and one to handle iterators (2 args).
-// - One variant with automatic encoding (picks UTF encoding depending on character size), and one for specific encoding.
-// - One variant that returns a new string, and one that takes an existing string to overwrite (Convert(Safe) only).
-// Each function takes one default argument that employs SFINAE to pick the correct overload depending on the arguments.
-
-
-#pragma once
-#include "UnicodeBinding.h"
-namespace Unicode
-{
-    // Results of analysis of an input range of code-units (in any encoding).
-    // This is returned by calling Analyze() function.
-    struct SAnalysisResult
-    {
-        // The type to use for counting units.
-        // Can be changed to uint64_t for dealing with 4GB+ of string data.
-        typedef uint32 size_type;
-
-        size_type inputUnits;     // The number of input units analyzed.
-        size_type outputUnits8;   // The number of output units when encoded with UTF-8.
-        size_type outputUnits16;  // The number of output units when encoded with UTF-16.
-        size_type outputUnits32;  // The number of output units when encoded with UTF-32 (aka number of UCS code-points).
-        size_type cpNonAscii;     // The number of non-ASCII UCS code-points encountered.
-        size_type cpInvalid;      // The number of invalid UCS code-point encountered (or 0xFFFFFFFF if not available).
-
-        // Default constructor, initialize everything to zero.
-        SAnalysisResult()
-            : inputUnits(0)
-            , outputUnits8(0)
-            , outputUnits16(0)
-            , outputUnits32(0)
-            , cpInvalid(0)
-            , cpNonAscii(0) {}
-
-        // Check if the input range was empty.
-        bool IsEmpty() const { return inputUnits == 0; }
-
-        // Check if the input range only contained ASCII characters.
-        bool IsAscii() const { return cpNonAscii == 0; }
-
-        // Check if the input range was valid (has no encoding errors).
-        // Note: This returns false if an unsafe decoder was used for analysis.
-        bool IsValid() const { return cpInvalid == 0; }
-
-        // Get the length of the input range, in source code-units.
-        size_type LengthInSourceUnits() const { return inputUnits; }
-
-        // Get the length of the input range, in UCS code-points.
-        size_type LengthInUCS() const { return outputUnits32; }
-
-        // Get the length of the input range when encoded with the given encoding, in code-units.
-        // Note: If the encoding is not supported for output, the function returns 0.
-        size_type LengthInEncodingUnits(EEncoding encoding) const
-        {
-            switch (encoding)
-            {
-            case eEncoding_ASCII:
-            case eEncoding_UTF32:
-                return outputUnits32;
-            case eEncoding_UTF16:
-                return outputUnits16;
-            case eEncoding_UTF8:
-                return outputUnits8;
-            default:
-                return 0;
-            }
-        }
-
-        // Get the length of the input range when encoded with the given encoding, in bytes.
-        // Note: If the encoding is not supported for output, the function returns 0.
-        size_type LengthInEncodingBytes(EEncoding encoding) const
-        {
-            size_type units = LengthInEncodingUnits(encoding);
-            switch (encoding)
-            {
-            case eEncoding_UTF32:
-                return units << 2;
-            case eEncoding_UTF16:
-                return units << 1;
-            default:
-                return units;
-            }
-        }
-    };
-
-    namespace Detail
-    {
-        // SDummySink:
-        // A sink implementation that does nothing.
-        struct SDummySink
-        {
-            void operator()([[maybe_unused]] uint32 unit) {}
-            void HintSequence([[maybe_unused]] uint32 length) {}
-        };
-
-        // SCountingSink:
-        // A sink that counts the number of units of output.
-        struct SCountingSink
-        {
-            size_t result;
-
-            SCountingSink()
-                : result(0) {}
-            void operator()([[maybe_unused]] uint32 unit) { ++result; }
-            void HintSequence([[maybe_unused]] uint32 length) {}
-        };
-
-        // SAnalysisSink:
-        // A sink that updates analysis statistics.
-        struct SAnalysisSink
-        {
-            SAnalysisResult& result;
-
-            SAnalysisSink(SAnalysisResult& _result)
-                : result(_result) {}
-            void operator()(uint32 cp)
-            {
-                const bool isCat2 = cp >= 0x80;
-                const bool isCat3 = cp >= 0x800;
-                const bool isCat4 = cp >= 0x10000;
-                result.outputUnits32 += 1;
-                result.outputUnits16 += (1 + isCat4);
-                result.outputUnits8 += (1 + isCat4 + isCat3 + isCat2);
-                result.cpNonAscii += isCat2;
-            }
-            void HintSequence([[maybe_unused]] uint32 length) {}
-        };
-
-        // SAnalysisRecovery:
-        // A recovery helper for analysis that counts invalid sequences.
-        struct SAnalysisRecovery
-        {
-            SAnalysisRecovery() {}
-            void operator()(SAnalysisSink& sink, [[maybe_unused]] uint32 error, [[maybe_unused]] uint32 unit)
-            {
-                sink.result.cpInvalid += 1;
-            }
-        };
-
-        // SValidationRecovery:
-        // A recovery helper for validation, it tracks if there is any invalid sequence.
-        struct SValidationRecovery
-        {
-            bool isValid;
-
-            SValidationRecovery()
-                : isValid(true) {}
-            void operator()([[maybe_unused]] SDummySink& sink, [[maybe_unused]] uint32 error, [[maybe_unused]] uint32 unit)
-            {
-                isValid = false;
-            }
-        };
-
-        // SAnalyzer<InputEncoding>:
-        // Helper to perform analysis, counts the input for a given encoding.
-        template<EEncoding InputEncoding>
-        struct SAnalyzer
-        {
-            SDecoder<InputEncoding, SAnalysisSink, SAnalysisRecovery> decoder;
-
-            SAnalyzer(SAnalysisResult& result)
-                : decoder(result) {}
-            void operator()(uint32 item)
-            {
-                decoder.sink().result.inputUnits += 1;
-                decoder(item);
-            }
-        };
-
-        // Analyze<InputEncoding>(target, source):
-        // Analyze string and store analysis result.
-        // This is the generic function called by other Analyze overloads.
-        template<EEncoding InputEncoding, typename InputStringType>
-        inline void Analyze(SAnalysisResult& target, const InputStringType& source)
-        {
-            // Bind methods.
-            const EBind bindMethod = SBindObject<InputStringType, false>::value;
-            integral_constant<EBind, bindMethod> tag;
-
-            // Analyze using helper.
-            SAnalyzer<InputEncoding> analyzer(target);
-            Feed(source, analyzer, tag);
-        }
-
-        // Validate<InputEncoding>(source):
-        // Tests that the string is valid encoding.
-        // This is the generic function called by other Validate overloads.
-        template<EEncoding InputEncoding, typename InputStringType>
-        inline bool Validate(const InputStringType& source)
-        {
-            // Bind methods.
-            const EBind bindMethod = SBindObject<InputStringType, false>::value;
-            integral_constant<EBind, bindMethod> tag;
-
-            // Validate using helper.
-            SDummySink sink;
-            SDecoder<InputEncoding, SDummySink, SValidationRecovery> validator(sink);
-            Feed(source, validator, tag);
-            return validator.recovery().isValid;
-        }
-
-        // Length<InputEncoding, OutputEncoding>(str):
-        // Find length of a string (in code-units) after trans-coding from InputEncoding to OutputEncoding.
-        // This is the generic function called by the other Length overloads.
-        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename InputStringType>
-        inline size_t Length(const InputStringType& source)
-        {
-            // If this assert hits, consider using LengthSafe.
-            assert((Detail::Validate<InputEncoding, InputStringType>(source)) && "Length was used with non-safe input");
-
-            // Bind methods.
-            const EBind bindMethod = SBindObject<InputStringType, false>::value;
-            integral_constant<EBind, bindMethod> tag;
-
-            // All copyable encodings have the property that the number of input encoding units equals the output units.
-            // In addition, this also holds for UTF-32 (always 1) -> ASCII (always 1), even though it's lossy.
-            const bool isCopyable = SIsCopyableEncoding<InputEncoding, OutputEncoding>::value;
-            const bool isCountable = isCopyable || (InputEncoding == eEncoding_UTF32 && OutputEncoding == eEncoding_ASCII);
-
-            if (isCountable)
-            {
-                // Optimization: The number of input units is equal to the number of output units.
-                return EncodedLength(source, tag);
-            }
-            else
-            {
-                // We need to perform the conversion.
-                SCountingSink sink;
-                STranscoderSelect<InputEncoding, OutputEncoding, SCountingSink&, eErrorRecovery_None> transcoder(sink);
-                Feed(source, transcoder, tag);
-                return sink.result;
-            }
-        }
-
-        // LengthSafe<InputEncoding, OutputEncoding, Recovery>(str):
-        // Find length of a string (in code-units) after trans-coding from InputEncoding to OutputEncoding.
-        // Note: The Recovery type used during conversion may influence the result, so this needs to match if you use the length information.
-        // This is the generic function called by the other LengthSafe overloads.
-        template<EEncoding InputEncoding, EEncoding OutputEncoding, EErrorRecovery Recovery, typename InputStringType>
-        inline size_t LengthSafe(const InputStringType& source)
-        {
-            // SRequire a safe recovery method.
-            COMPILE_TIME_ASSERT(SIsSafeEncoding<Recovery>::value);
-
-            // Bind methods.
-            const EBind bindMethod = SBindObject<InputStringType, false>::value;
-            integral_constant<EBind, bindMethod> tag;
-
-            // We can't optimize here, since we cannot assume the input is validly encoded
-            SCountingSink sink;
-            STranscoderSelect<InputEncoding, OutputEncoding, SCountingSink&, Recovery> transcoder(sink);
-            Feed(source, transcoder, tag);
-            return sink.result;
-        }
-
-        // SBlockCopy<Enable, SinkType, Append, OutputMethod, InputStringType, OutputStringType>:
-        // Helper for block-copying entire string at once (as an optimization)
-        // This optimization will effectively try to memcpy or assign the whole string at once.
-        // Note: We need to do some partial specialization here to find out if the optimization is valid, so we can't use a function in C++98.
-        template<bool Enable, typename SinkType, bool Append, EBind OutputMethod, typename InputStringType, typename OutputStringType>
-        struct SBlockCopy
-        {
-            static const EBind bindMethod = SBindObject<InputStringType, false>::value;
-            typedef integral_constant<EBind, bindMethod> TagType;
-            size_t operator()(OutputStringType& target, const InputStringType& source)
-            {
-                // Optimization: Use block copying for these types.
-                TagType tag;
-                const size_t length = EncodedLength(source, tag);
-                SinkType sink(target, length);
-                if (sink.CanWrite())
-                {
-                    const void* const dataPtr = EncodedPointer(source, tag);
-                    sink(dataPtr, length);
-                }
-                return length;
-            }
-        };
-
-        // SBlockCopy<Enable, SinkType, Append, OutputMethod, InputStringType, OutputStringType>:
-        // Specialization that will use direct string assignment.
-        // Note: This optimization is not selected when appending, this could be a future optimization if this is common.
-        // Reason for this is that the += operator is not present on all supported types (ie, std::vector)
-        template<typename SinkType, typename SameStringType>
-        struct SBlockCopy<true, SinkType, false, eBind_Data, SameStringType, SameStringType>
-        {
-            size_t operator()(SameStringType& target, const SameStringType& source)
-            {
-                // Optimization: Use copy assignment.
-                target = source;
-                return source.size();
-            }
-        };
-
-        // SBlockCopy<Enable, SinkType, Append, OutputMethod, InputStringType, OutputStringType>:
-        // Fall-back specialization for Enable == false.
-        // Note: This specialization has to exist for the linker, but should never be called (and optimized away).
-        template<typename SinkType, bool Append, EBind OutputMethod, typename InputStringType, typename OutputStringType>
-        struct SBlockCopy<false, SinkType, Append, OutputMethod, InputStringType, OutputStringType>
-        {
-            size_t operator()([[maybe_unused]] OutputStringType& target, [[maybe_unused]] const InputStringType& source)
-            {
-                assert(false && "Should never be called");
-                return 0;
-            }
-        };
-
-        // Convert<InputEncoding, OutputEncoding, Append>(target, source):
-        // Trans-code a string from InputEncoding to OutputEncoding.
-        // This is the generic function that is called by Convert and Append overloads.
-        // Returns the number of code-units required for full output (excluding any terminators)
-        template<EEncoding InputEncoding, EEncoding OutputEncoding, bool Append, typename InputStringType, typename OutputStringType>
-        inline size_t Convert(OutputStringType& target, const InputStringType& source)
-        {
-            // If this assert hits, consider using ConvertSafe.
-            assert((Detail::Validate<InputEncoding, InputStringType>(source)) && "Convert was used with non-safe input");
-
-            // Bind methods.
-            const EBind inputBindMethod = SBindObject<InputStringType, false>::value;
-            const EBind outputBindMethod = SBindOutput<OutputStringType, false>::value;
-            integral_constant<EBind, inputBindMethod> tag;
-            typedef SWriteSink<OutputStringType, Append, outputBindMethod> SinkType;
-
-            // Check if we can optimize this.
-            const bool isCopyable = SIsCopyableEncoding<InputEncoding, OutputEncoding>::value;
-            const bool isBlocks = SIsBlockCopyable<SBindObject<InputStringType, false>, SBindOutput<OutputStringType, false> >::value;
-            const bool useBlockCopy = isCopyable && isBlocks;
-            size_t length;
-            if (useBlockCopy)
-            {
-                // Use optimized path.
-                SBlockCopy<useBlockCopy, SinkType, Append, outputBindMethod, InputStringType, OutputStringType> blockCopy;
-                length = blockCopy(target, source);
-            }
-            else
-            {
-                // We need to perform the conversion code-unit by code-unit.
-                length = Detail::Length<InputEncoding, OutputEncoding, InputStringType>(source);
-                SinkType sink(target, length);
-                if (sink.CanWrite())
-                {
-                    STranscoderSelect<InputEncoding, OutputEncoding, SinkType&, eErrorRecovery_None> transcoder(sink);
-                    Feed(source, transcoder, tag);
-                }
-            }
-            return length;
-        }
-
-        // ConvertSafe<InputEncoding, OutputEncoding, Append, Recovery>(target, source):
-        // Safely trans-code a string from InputEncoding to OutputEncoding using the specified Recovery to handle encoding errors.
-        // This is the generic function called by ConvertSafe and AppendSafe overloads.
-        template<EEncoding InputEncoding, EEncoding OutputEncoding, bool Append, EErrorRecovery Recovery, typename InputStringType, typename OutputStringType>
-        inline size_t ConvertSafe(OutputStringType& target, const InputStringType& source)
-        {
-            // SRequire a safe recovery method.
-            COMPILE_TIME_ASSERT(SIsSafeEncoding<Recovery>::value);
-
-            // Bind methods.
-            const EBind inputBindMethod = SBindObject<InputStringType, false>::value;
-            const EBind outputBindMethod = SBindOutput<OutputStringType, false>::value;
-            integral_constant<EBind, inputBindMethod> tag;
-            typedef SWriteSink<OutputStringType, Append, outputBindMethod> SinkType;
-
-            // We can't optimize with block-copy here, since we cannot assume the input is validly encoded.
-            const size_t length = Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(source);
-            SinkType sink(target, length);
-            if (sink.CanWrite())
-            {
-                STranscoderSelect<InputEncoding, OutputEncoding, SinkType&, Recovery> transcoder(sink);
-                Feed(source, transcoder, tag);
-            }
-            return length;
-        }
-
-        // SReqAutoObj<T>:
-        // Require that T is usable as input object, with automatic encoding.
-        // This is used as a SFINAE argument for overload resolution of the main functions.
-        template<typename T, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
-        struct SReqAutoObj
-            : SRequire<
-                SBindObject<T, true>::value != eBind_Impossible&&
-                SEncoder<E, SDummySink>::value&&
-                SIsSafeEncoding<R>::value
-                > {};
-
-        // SReqAutoIts<T>:
-        // Require that T is usable as input iterator, with automatic encoding.
-        // This is used as a SFINAE argument for overload resolution of the main functions.
-        template<typename T, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
-        struct SReqAutoIts
-            : SRequire<
-                SBindIterator<T, true>::value != eBind_Impossible&&
-                SEncoder<E, SDummySink>::value&&
-                SIsSafeEncoding<R>::value
-                > {};
-
-        // SReqAnyObj<T>:
-        // Require that T is usable as input object, with user-specified encoding.
-        // This is used as a SFINAE argument for overload resolution of the main functions.
-        template<typename T, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
-        struct SReqAnyObj
-            : SRequire<
-                SBindObject<T, false>::value != eBind_Impossible&&
-                SEncoder<E, SDummySink>::value&&
-                SIsSafeEncoding<R>::value
-                > {};
-
-        // SReqAnyIts<T>:
-        // Require that T is usable as input iterator, with user-specified encoding.
-        // This is used as a SFINAE argument for overload resolution of the main functions.
-        template<typename T, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
-        struct SReqAnyIts
-            : SRequire<
-                SBindIterator<T, false>::value != eBind_Impossible&&
-                SEncoder<E, SDummySink>::value&&
-                SIsSafeEncoding<R>::value
-                > {};
-
-        // SReqAutoObjOut<I, O>:
-        // Require that I is usable as input object, and O as output object, with automatic encoding.
-        // This is used as a SFINAE argument for overload resolution of the main functions.
-        template<typename I, typename O, bool S, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
-        struct SReqAutoObjOut
-            : SRequire<
-                SBindObject<I, true>::value != eBind_Impossible&&
-                SBindOutput<typename conditional<S, SPackedBuffer<O>, O>::type, true>::value != eBind_Impossible&&
-                SEncoder<E, SDummySink>::value&&
-                SIsSafeEncoding<R>::value
-                > {};
-
-        // SReqAutoItsOut<I, O>:
-        // Require that I is usable as input iterator, and O as output object, with automatic encoding.
-        // This is used as a SFINAE argument for overload resolution of the main functions.
-        template<typename I, typename O, bool S, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
-        struct SReqAutoItsOut
-            : SRequire<
-                SBindIterator<I, true>::value != eBind_Impossible&&
-                SBindOutput<typename conditional<S, SPackedBuffer<O>, O>::type, true>::value != eBind_Impossible&&
-                SEncoder<E, SDummySink>::value&&
-                SIsSafeEncoding<R>::value
-                > {};
-
-        // SReqAnyObjOut<I, O>:
-        // Require that I is usable as input object, and O as output object, with user-specified encoding.
-        // This is used as a SFINAE argument for overload resolution of the main functions.
-        template<typename I, typename O, bool S, EEncoding E, EErrorRecovery R = eErrorRecovery_Discard>
-        struct SReqAnyObjOut
-            : SRequire<
-                SBindObject<I, false>::value != eBind_Impossible&&
-                SBindOutput<typename conditional<S, SPackedBuffer<O>, O>::type, false>::value != eBind_Impossible&&
-                SEncoder<E, SDummySink>::value&&
-                SIsSafeEncoding<R>::value
-                > {};
-
-        // SReqAnyItsOut<I, O>:
-        // Require that I is usable as input object, and O as output object, with user-specified encoding.
-        // This is used as a SFINAE argument for overload resolution of the main functions.
-        template<typename I, typename O, bool S, EEncoding E, EErrorRecovery R = eErrorRecovery_Discard>
-        struct SReqAnyItsOut
-            : SRequire<
-                SBindIterator<I, false>::value != eBind_Impossible&&
-                SBindOutput<typename conditional<S, SPackedBuffer<O>, O>::type, false>::value != eBind_Impossible&&
-                SEncoder<E, SDummySink>::value&&
-                SIsSafeEncoding<R>::value
-                > {};
-    }
-
-    // SAnalysisResult Analyze<InputEncoding>(str):
-    // Analyze the given string with the given encoding, providing information on validity and encoding length.
-    template<EEncoding InputEncoding, typename InputStringType>
-    inline SAnalysisResult Analyze(const InputStringType& str,
-        typename Detail::SReqAnyObj<InputStringType>::type* = 0)
-    {
-        SAnalysisResult result;
-        Detail::Analyze<InputEncoding, InputStringType>(result, str);
-        return result;
-    }
-
-    // SAnalysisResult Analyze(str):
-    // Analyze the (assumed) Unicode string input, providing information on validity and encoding length.
-    // The Unicode encoding is picked automatically depending on the input type.
-    template<typename InputStringType>
-    inline SAnalysisResult Analyze(const InputStringType& str,
-        typename Detail::SReqAutoObj<InputStringType>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        SAnalysisResult result;
-        Detail::Analyze<InputEncoding, InputStringType>(result, str);
-        return result;
-    }
-
-    // SAnalysisResult Analyze<InputEncoding>(begin, end):
-    // Analyze the given range with the given encoding, providing information on validity and encoding length.
-    template<EEncoding InputEncoding, typename InputIteratorType>
-    inline SAnalysisResult Analyze(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyIts<InputIteratorType>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        SAnalysisResult result;
-        Detail::Analyze<InputEncoding, InputStringType>(result, its);
-        return result;
-    }
-
-    // SAnalysisResult Analyze(begin, end):
-    // Analyze the given (assumed) Unicode range, providing information on validity and encoding length.
-    // The Unicode encoding is picked automatically depending on the input type.
-    template<typename InputIteratorType>
-    inline SAnalysisResult Analyze(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoIts<InputIteratorType>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        SAnalysisResult result;
-        Detail::Analyze<InputEncoding, InputStringType>(result, its);
-        return result;
-    }
-
-    // bool Validate<InputEncoding>(str):
-    // Checks if the given string is valid in the given encoding.
-    template<EEncoding InputEncoding, typename InputStringType>
-    inline bool Validate(const InputStringType& str,
-        typename Detail::SReqAnyObj<InputStringType>::type* = 0)
-    {
-        return Detail::Validate<InputEncoding, InputStringType>(str);
-    }
-
-    // bool Validate(str):
-    // Checks if the given string is a valid Unicode string.
-    // The Unicode encoding is picked automatically depending on the input type.
-    template<typename InputStringType>
-    inline bool Validate(const InputStringType& str,
-        typename Detail::SReqAutoObj<InputStringType>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        return Detail::Validate<InputEncoding, InputStringType>(str);
-    }
-
-    // bool Validate<InputEncoding>(begin, end):
-    // Checks if the given range is valid in the given encoding.
-    template<EEncoding InputEncoding, typename InputIteratorType>
-    inline bool Validate(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyIts<InputIteratorType>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        return Detail::Validate<InputEncoding, InputStringType>(its);
-    }
-
-    // bool Validate(begin, end):
-    // Checks if the given range is valid Unicode.
-    // The Unicode encoding is picked automatically depending on the input type.
-    template<typename InputIteratorType>
-    inline bool Validate(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoIts<InputIteratorType>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        return Detail::Validate<InputEncoding, InputStringType>(its);
-    }
-
-    // size_t Length<OutputEncoding, InputEncoding>(str):
-    // Get the length (in OutputEncoding) of the given known-valid string with the given InputEncoding.
-    // Note: Length assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use LengthSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename InputStringType>
-    inline size_t Length(const InputStringType& str,
-        typename Detail::SReqAnyObj<InputStringType, OutputEncoding>::type* = 0)
-    {
-        return Detail::Length<InputEncoding, OutputEncoding, InputStringType>(str);
-    }
-
-    // size_t Length<OutputEncoding>(str):
-    // Get the length (in OutputEncoding) of the given known-valid Unicode string.
-    // The Unicode encoding is picked automatically depending on the input type.
-    // Note: Length assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use LengthSafe.
-    template<EEncoding OutputEncoding, typename InputStringType>
-    inline size_t Length(const InputStringType& str,
-        typename Detail::SReqAutoObj<InputStringType, OutputEncoding>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        return Detail::Length<InputEncoding, OutputEncoding, InputStringType>(str);
-    }
-
-    // size_t Length<OutputEncoding, InputEncoding>(begin, end):
-    // Get the length (in OutputEncoding) of the known-valid range with the given InputEncoding.
-    // Note: Length assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use LengthSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename InputIteratorType>
-    inline size_t Length(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyIts<InputIteratorType, OutputEncoding>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        return Detail::Length<InputEncoding, OutputEncoding, InputStringType>(its);
-    }
-
-    // size_t Length<OutputEncoding>(begin, end):
-    // Get the length (in OutputEncoding) of the known-valid Unicode range.
-    // The Unicode encoding is picked automatically depending on the input type.
-    // Note: Length assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use LengthSafe.
-    template<EEncoding OutputEncoding, typename InputIteratorType>
-    inline size_t Length(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoIts<InputIteratorType>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        return Detail::Length<InputEncoding, OutputEncoding, InputStringType>(its);
-    }
-
-    // size_t LengthSafe<Recovery, OutputEncoding, InputEncoding>(str):
-    // Get the length (in OutputEncoding) of the given string with the given InputEncoding.
-    // Note: LengthSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Length.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputStringType>
-    inline size_t LengthSafe(const InputStringType& str,
-        typename Detail::SReqAnyObj<InputStringType, OutputEncoding, Recovery>::type* = 0)
-    {
-        return Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(str);
-    }
-
-    // size_t LengthSafe<Recovery, OutputEncoding>(str):
-    // Get the length (in OutputEncoding) of the given Unicode string.
-    // The Unicode encoding is picked automatically depending on the input type.
-    // Note: LengthSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Length.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, typename InputStringType>
-    inline size_t LengthSafe(const InputStringType& str,
-        typename Detail::SReqAutoObj<InputStringType, OutputEncoding, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        return Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(str);
-    }
-
-    // size_t LengthSafe<Recovery, OutputEncoding, InputEncoding>(begin, end):
-    // Get the length (in OutputEncoding) of the range with the given InputEncoding.
-    // Note: LengthSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Length.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputIteratorType>
-    inline size_t LengthSafe(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyIts<InputIteratorType, OutputEncoding, Recovery>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        return Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(its);
-    }
-
-    // size_t LengthSafe<Recovery, OutputEncoding>(begin, end):
-    // Get the length (in OutputEncoding) of the Unicode range.
-    // The Unicode encoding is picked automatically depending on the input type.
-    // Note: LengthSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Length.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, typename InputIteratorType>
-    inline size_t LengthSafe(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoIts<InputIteratorType, OutputEncoding, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        return Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(its);
-    }
-
-    // OutputStringType &Convert<OutputEncoding, InputEncoding>(result, str):
-    // Converts the given string in the given input encoding and stores into the result string with the given output encoding.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputStringType>
-    inline OutputStringType& Convert(OutputStringType& result, const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding>::type* = 0)
-    {
-        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType &Convert(result, str):
-    // Converts the (assumed) Unicode string input and stores into the result Unicode string.
-    // The Unicode encodings are picked automatically depending on the input type and output type.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<typename OutputStringType, typename InputStringType>
-    inline OutputStringType& Convert(OutputStringType& result, const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType &Convert<OutputEncoding, InputEncoding>(result, begin, end):
-    // Converts the given range in the given input encoding and stores into the result string with the given output encoding.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType& Convert(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // OutputStringType &Convert(result, begin, end):
-    // Converts the (assumed) Unicode range and stores into the result Unicode string.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType& Convert(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // size_t Convert<OutputEncoding, InputEncoding>(buffer, length, str):
-    // Converts the given string in the given input encoding and stores into the result buffer with the given output encoding.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputStringType>
-    inline size_t Convert(OutputCharType* buffer, size_t length, const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputCharType*, true, OutputEncoding>::type* = 0)
-    {
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str) + 1;
-    }
-
-    // size_t Convert(buffer, length, str):
-    // Converts the (assumed) Unicode string input and stores into the result Unicode buffer.
-    // The Unicode encodings are picked automatically depending on the buffer type and output type.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<typename OutputCharType, typename InputStringType>
-    inline size_t Convert(OutputCharType* buffer, size_t length, const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputCharType*, true>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str) + 1;
-    }
-
-    // size_t Convert<OutputEncoding, InputEncoding>(buffer, length, begin, end):
-    // Converts the given range in the given input encoding and stores into the result buffer with the given output encoding.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputIteratorType>
-    inline size_t Convert(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputCharType*, true, OutputEncoding>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its) + 1;
-    }
-
-    // size_t Convert(buffer, length, begin, end):
-    // Converts the (assumed) Unicode range and stores into the result Unicode buffer.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<typename OutputCharType, typename InputIteratorType>
-    inline size_t Convert(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputCharType*, true>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its) + 1;
-    }
-
-    // OutputStringType Convert<OutputStringType, OutputEncoding, InputEncoding>(str):
-    // Converts the given string in the given input encoding to a new string of the given type and output encoding.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<typename OutputStringType, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputStringType>
-    inline OutputStringType Convert(const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding>::type* = 0)
-    {
-        OutputStringType result;
-        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType Convert<OutputStringType>(str):
-    // Converts the (assumed) Unicode string input to a new Unicode string of the given type.
-    // The Unicode encodings are picked automatically depending on the input type and output type.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<typename OutputStringType, typename InputStringType>
-    inline OutputStringType Convert(const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        OutputStringType result;
-        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType Convert<OutputStringType, OutputEncoding, InputEncoding>(begin, end):
-    // Converts the given range in the given input encoding to a new string of the given type and output encoding.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<typename OutputStringType, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputIteratorType>
-    inline OutputStringType Convert(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result;
-        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // OutputStringType Convert<OutputStringType>(begin, end):
-    // Converts the (assumed) Unicode range to a new Unicode string of the given type.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
-    template<typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType Convert(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result;
-        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // OutputStringType &ConvertSafe<Recovery, OutputEncoding, InputEncoding>(result, str):
-    // Converts the given string in the given input encoding and stores into the result string with the given output encoding.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputStringType>
-    inline OutputStringType& ConvertSafe(OutputStringType& result, const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
-    {
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType &ConvertSafe<Recovery>(result, str):
-    // Converts the (assumed) Unicode string input and stores into the result Unicode string.
-    // The Unicode encodings are picked automatically depending on the input type and output type.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, typename OutputStringType, typename InputStringType>
-    inline OutputStringType& ConvertSafe(OutputStringType& result, const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType &ConvertSafe<Recovery, OutputEncoding, InputEncoding>(result, begin, end):
-    // Converts the given range in the given input encoding and stores into the result string with the given output encoding.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType& ConvertSafe(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // OutputStringType &ConvertSafe<Recovery>(result, begin, end):
-    // Converts the (assumed) Unicode range and stores into the result Unicode string.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType& ConvertSafe(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // size_t ConvertSafe<Recovery, OutputEncoding, InputEncoding>(buffer, length, str):
-    // Converts the given string in the given input encoding and stores into the result buffer with the given output encoding.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputStringType>
-    inline size_t ConvertSafe(OutputCharType* buffer, size_t length, const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputCharType*, true, OutputEncoding, Recovery>::type* = 0)
-    {
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        OutputStringType result(buffer, length);
-        return Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str) + 1;
-    }
-
-    // size_t ConvertSafe<Recovery>(buffer, length, str):
-    // Converts the (assumed) Unicode string input and stores into the result Unicode buffer.
-    // The Unicode encodings are picked automatically depending on the buffer type and output type.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, typename OutputCharType, typename InputStringType>
-    inline size_t ConvertSafe(OutputCharType* buffer, size_t length, const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputCharType*, true, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        OutputStringType result(buffer, length);
-        return Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str) + 1;
-    }
-
-    // size_t ConvertSafe<Recovery, OutputEncoding, InputEncoding>(buffer, length, begin, end):
-    // Converts the given range in the given input encoding and stores into the result buffer with the given output encoding.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputIteratorType>
-    inline size_t ConvertSafe(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputCharType*, true, OutputEncoding, Recovery>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result(buffer, length);
-        return Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its) + 1;
-    }
-
-    // size_t ConvertSafe<Recovery>(buffer, length, begin, end):
-    // Converts the (assumed) Unicode range and stores into the result Unicode buffer.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, typename OutputCharType, typename InputIteratorType>
-    inline size_t ConvertSafe(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputCharType*, true, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its) + 1;
-    }
-
-    // OutputStringType ConvertSafe<Recovery, OutputStringType, OutputEncoding, InputEncoding>(str):
-    // Converts the given string in the given input encoding to a new string of the given type and output encoding.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, typename OutputStringType, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputStringType>
-    inline OutputStringType ConvertSafe(const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
-    {
-        OutputStringType result;
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType ConvertSafe<Recovery, OutputStringType>(str):
-    // Converts the (assumed) Unicode string input to a new Unicode string of the given type.
-    // The Unicode encodings are picked automatically depending on the input type and output type.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, typename OutputStringType, typename InputStringType>
-    inline OutputStringType ConvertSafe(const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        OutputStringType result;
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType ConvertSafe<Recovery, OutputStringType, OutputEncoding, InputEncoding>(begin, end):
-    // Converts the given range in the given input encoding to a new string of the given type and output encoding.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, typename OutputStringType, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputIteratorType>
-    inline OutputStringType ConvertSafe(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result;
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // OutputStringType ConvertSafe<Recovery, OutputStringType>(begin, end):
-    // Converts the (assumed) Unicode range to a new Unicode string of the given type.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
-    template<EErrorRecovery Recovery, typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType ConvertSafe(InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result;
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // OutputStringType &Append<OutputEncoding, InputEncoding>(result, str):
-    // Appends the given string in the given input encoding and stores at the end of the result string with the given output encoding.
-    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputStringType>
-    inline OutputStringType& Append(OutputStringType& result, const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding>::type* = 0)
-    {
-        Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType &Append(result, str):
-    // Appends the (assumed) Unicode string input and stores at the end of the result Unicode string.
-    // The Unicode encodings are picked automatically depending on the input type and output type.
-    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
-    template<typename OutputStringType, typename InputStringType>
-    inline OutputStringType& Append(OutputStringType& result, const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType &Append<OutputEncoding, InputEncoding>(result, begin, end):
-    // Appends the given range in the given input encoding and stores at the end of the result string with the given output encoding.
-    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType& Append(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // OutputStringType &Append(result, begin, end):
-    // Appends the (assumed) Unicode range and stores at the end of the result Unicode string.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
-    template<typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType& Append(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // size_t Append<OutputEncoding, InputEncoding>(buffer, length, str):
-    // Appends the given string in the given input encoding to the result buffer with the given output encoding.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputStringType>
-    inline size_t Append(OutputCharType* buffer, size_t length, const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputCharType*, true, OutputEncoding>::type* = 0)
-    {
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, str) + 1;
-    }
-
-    // size_t Append(buffer, length, str):
-    // Appends the (assumed) Unicode string input to the result Unicode buffer.
-    // The Unicode encodings are picked automatically depending on the buffer type and output type.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
-    template<typename OutputCharType, typename InputStringType>
-    inline size_t Append(OutputCharType* buffer, size_t length, const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputCharType*, true>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, str) + 1;
-    }
-
-    // size_t Append<OutputEncoding, InputEncoding>(buffer, length, begin, end):
-    // Appends the given range in the given input encoding to the result buffer with the given output encoding.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
-    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputIteratorType>
-    inline size_t Append(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputCharType*, true, OutputEncoding>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its) + 1;
-    }
-
-    // size_t Append(buffer, length, begin, end):
-    // Appends the (assumed) Unicode range to the result Unicode buffer.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
-    template<typename OutputCharType, typename InputIteratorType>
-    inline size_t Append(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputCharType*, true>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its) + 1;
-    }
-
-    // OutputStringType &AppendSafe<Recovery, OutputEncoding, InputEncoding>(result, str):
-    // Appends the given string in the given input encoding and stores at the end of the result string with the given output encoding.
-    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputStringType>
-    inline OutputStringType& AppendSafe(OutputStringType& result, const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
-    {
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType &AppendSafe<Recovery>(result, str):
-    // Appends the (assumed) Unicode string input and stores at the end of the result Unicode string.
-    // The Unicode encodings are picked automatically depending on the input type and output type.
-    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
-    template<EErrorRecovery Recovery, typename OutputStringType, typename InputStringType>
-    inline OutputStringType& AppendSafe(OutputStringType& result, const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, str);
-        return result;
-    }
-
-    // OutputStringType &AppendSafe<Recovery, OutputEncoding, InputEncoding>(result, begin, end):
-    // Appends the given range in the given input encoding and stores at the end of the result string with the given output encoding.
-    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType& AppendSafe(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // OutputStringType &AppendSafe<Recovery>(result, begin, end):
-    // Appends the (assumed) Unicode range and stores at the end of the result Unicode string.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
-    template<EErrorRecovery Recovery, typename OutputStringType, typename InputIteratorType>
-    inline OutputStringType& AppendSafe(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        const InputStringType its(begin, end);
-        Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, its);
-        return result;
-    }
-
-    // size_t AppendSafe<Recovery, OutputEncoding, InputEncoding>(buffer, length, str):
-    // Appends the given string in the given input encoding to the result buffer with the given output encoding.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputStringType>
-    inline size_t AppendSafe(OutputCharType* buffer, size_t length, const InputStringType& str,
-        typename Detail::SReqAnyObjOut<InputStringType, OutputCharType*, true, OutputEncoding, Recovery>::type* = 0)
-    {
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        OutputStringType result(buffer, length);
-        return Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, str) + 1;
-    }
-
-    // size_t AppendSafe<Recovery>(buffer, length, str):
-    // Appends the (assumed) Unicode string input to the result Unicode buffer.
-    // The Unicode encodings are picked automatically depending on the buffer type and output type.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
-    template<EErrorRecovery Recovery, typename OutputCharType, typename InputStringType>
-    inline size_t AppendSafe(OutputCharType* buffer, size_t length, const InputStringType& str,
-        typename Detail::SReqAutoObjOut<InputStringType, OutputCharType*, true, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        OutputStringType result(buffer, length);
-        return Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, str) + 1;
-    }
-
-    // size_t AppendSafe<Recovery, OutputEncoding, InputEncoding>(buffer, length, begin, end):
-    // Appends the given range in the given input encoding to the result buffer with the given output encoding.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
-    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputIteratorType>
-    inline size_t AppendSafe(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAnyItsOut<InputIteratorType, OutputCharType*, true, OutputEncoding, Recovery>::type* = 0)
-    {
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result(buffer, length);
-        return Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, its) + 1;
-    }
-
-    // size_t AppendSafe<Recovery>(buffer, length, begin, end):
-    // Appends the (assumed) Unicode range to the result Unicode buffer.
-    // The Unicode encodings are picked automatically depending on the range type and output type.
-    // Returns the required length of the output buffer, in code-units, including the null-terminator.
-    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
-    template<EErrorRecovery Recovery, typename OutputCharType, typename InputIteratorType>
-    inline size_t AppendSafe(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
-        typename Detail::SReqAutoItsOut<InputIteratorType, OutputCharType*, true, eEncoding_UTF8, Recovery>::type* = 0)
-    {
-        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
-        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
-        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
-        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
-        const InputStringType its(begin, end);
-        OutputStringType result(buffer, length);
-        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its) + 1;
-    }
-}
diff --git a/Code/CryEngine/CryCommon/UnicodeIterator.h b/Code/CryEngine/CryCommon/UnicodeIterator.h
deleted file mode 100644
index 2ffe942df5..0000000000
--- a/Code/CryEngine/CryCommon/UnicodeIterator.h
+++ /dev/null
@@ -1,614 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Encoded Unicode sequence iteration.
-//
-// For lower level accessing of encoded text, an STL compatible iterator wrapper is provided.
-// This iterator will decode the underlying sequence, abstracting it to a sequence of UCS code-points.
-// Using the iterator wrapper, you can find where in an encoded string code-points (or encoding errors) are located.
-// Note: The iterator is an input-only iterator, you cannot write to the underlying sequence.
-
-
-#pragma once
-#include "UnicodeBinding.h"
-namespace Unicode
-{
-    namespace Detail
-    {
-        // MoveNext(it, checker, tag):
-        // Moves the iterator to the next UCS code-point in the encoded sequence.
-        // Non-specialized version (for 1:1 code-unit to code-point).
-        template<typename BaseIterator, typename BoundsChecker, EEncoding Encoding>
-        inline void MoveNext(BaseIterator& it, const BoundsChecker& checker, const integral_constant<EEncoding, Encoding>)
-        {
-            COMPILE_TIME_ASSERT(
-                Encoding == eEncoding_ASCII ||
-                Encoding == eEncoding_UTF32 ||
-                Encoding == eEncoding_Latin1 ||
-                Encoding == eEncoding_Win1252);
-            assert(!checker.IsEnd(it) && "Attempt to iterate past the end of the sequence");
-
-            // All of these encodings use a single code-unit for each code-point.
-            ++it;
-        }
-
-        // MoveNext(it, checker, tag):
-        // Moves the iterator to the next UCS code-point in the encoded sequence.
-        // Specialized for UTF-8.
-        template<typename BaseIterator, typename BoundsChecker>
-        inline void MoveNext(BaseIterator& it, const BoundsChecker& checker, integral_constant<EEncoding, eEncoding_UTF8>)
-        {
-            assert(!checker.IsEnd(it) && "Attempt to iterate past the end of the sequence");
-
-            // UTF-8: just need to skip up to 3 continuation bytes.
-            for (int i = 0; i < 4; ++i)
-            {
-                ++it;
-                if (checker.IsEnd(it))  // :WARN: always returns false if "safe" bool is false!
-                {
-                    break;
-                }
-                uint32 val = static_cast<uint32>(*it);
-                if ((val & 0xC0) != 0x80)
-                {
-                    break;
-                }
-            }
-        }
-
-        // MoveNext(it, checker, tag):
-        // Moves the iterator to the next UCS code-point in the encoded sequence.
-        // Specialized for UTF-16.
-        template<typename BaseIterator, typename BoundsChecker>
-        inline void MoveNext(BaseIterator& it, const BoundsChecker& checker, integral_constant<EEncoding, eEncoding_UTF16>)
-        {
-            assert(!checker.IsEnd(it) && "Attempt to iterate past the end of the sequence");
-
-            // UTF-16: just need to skip one lead surrogate.
-            ++it;
-            uint32 val = static_cast<uint32>(*it);
-            if (val >= cLeadSurrogateFirst && val <= cLeadSurrogateLast)
-            {
-                if (!checker.IsEnd(it))
-                {
-                    ++it;
-                }
-            }
-        }
-
-        // MovePrev(it, checker, tag):
-        // Moves the iterator to the previous UCS code-point in the encoded sequence.
-        // Non-specialized version (for 1:1 code-unit to code-point).
-        template<typename BaseIterator, typename BoundsChecker, EEncoding Encoding>
-        inline void MovePrev(BaseIterator& it, const BoundsChecker& checker, const integral_constant<EEncoding, Encoding>)
-        {
-            COMPILE_TIME_ASSERT(
-                Encoding == eEncoding_ASCII ||
-                Encoding == eEncoding_UTF32 ||
-                Encoding == eEncoding_Latin1 ||
-                Encoding == eEncoding_Win1252);
-            assert(!checker.IsBegin(it) && "Attempt to iterate past the beginning of the sequence");
-
-            // All of these encodings use a single code-unit for each code-point.
-            --it;
-        }
-
-        // MovePrev(it, checker, tag):
-        // Moves the iterator to the previous UCS code-point in the encoded sequence.
-        // Specialized for UTF-8.
-        template<typename BaseIterator, typename BoundsChecker>
-        inline void MovePrev(BaseIterator& it, const BoundsChecker& checker, integral_constant<EEncoding, eEncoding_UTF8>)
-        {
-            assert(!checker.IsBegin(it) && "Attempt to iterate past the beginning of the sequence");
-
-            // UTF-8: just need to skip up to 3 continuation bytes.
-            for (int i = 0; i < 4; ++i)
-            {
-                --it;
-                if (checker.IsBegin(it))
-                {
-                    break;
-                }
-                uint32 val = static_cast<uint32>(*it);
-                if ((val & 0xC0) != 0x80)
-                {
-                    break;
-                }
-            }
-        }
-
-        // MovePrev(it, checker, tag):
-        // Moves the iterator to the previous UCS code-point in the encoded sequence.
-        // Specialized for UTF-16.
-        template<typename BaseIterator, typename BoundsChecker>
-        inline void MovePrev(BaseIterator& it, const BoundsChecker& checker, integral_constant<EEncoding, eEncoding_UTF16>)
-        {
-            assert(!checker.IsBegin(it) && "Attempt to iterate past the beginning of the sequence");
-
-            // UTF-16: just need to skip one lead surrogate.
-            --it;
-            uint32 val = static_cast<uint32>(*it);
-            if (val >= cLeadSurrogateFirst && val <= cLeadSurrogateLast)
-            {
-                if (!checker.IsBegin(it))
-                {
-                    --it;
-                }
-            }
-        }
-
-        // SBaseIterators<BaseIterator, BoundsChecked>:
-        // Utility to access base iterators properties from CIterator.
-        // This is the bounds-checked specialization, the range information is kept to defend against malformed sequences.
-        template<typename BaseIterator, bool BoundsChecked>
-        struct SBaseIterators
-        {
-            typedef BaseIterator type;
-            type begin, end;
-            type it;
-
-            SBaseIterators(const BaseIterator& _begin, const BaseIterator& _end)
-                : begin(_begin)
-                , end(_end)
-                , it(_begin) {}
-
-            SBaseIterators(const SBaseIterators& other)
-                : begin(other.begin)
-                , end(other.end)
-                , it(other.it) {}
-
-            SBaseIterators& operator =(const SBaseIterators& other)
-            {
-                begin = other.begin;
-                end = other.end;
-                it = other.it;
-                return *this;
-            }
-
-            bool IsBegin(const BaseIterator& _it) const
-            {
-                return begin == _it;
-            }
-
-            bool IsEnd(const BaseIterator& _it) const
-            {
-                return end == _it;
-            }
-
-            bool IsEqual(const SBaseIterators& other) const
-            {
-                return it == other.it
-                       && begin == other.begin
-                       && end == other.end;
-            }
-
-            // Note: Only called inside assert.
-            // O(N) version; works with any forward-iterator (or better)
-            bool IsInRange(const BaseIterator& _it, std::forward_iterator_tag) const
-            {
-                for (BaseIterator i = begin; i != end; ++i)
-                {
-                    if (_it == i)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            // Note: Only called inside assert.
-            // O(1) version; requires random-access-iterator.
-            bool IsInRange(const BaseIterator& _it, std::random_access_iterator_tag) const
-            {
-                return (begin <= _it && _it < end);
-            }
-
-            // Note: Only called inside assert.
-            // Dispatches to the O(1) version if a random-access iterator is used (common case).
-            bool IsInRange(const BaseIterator& _it) const
-            {
-                return IsInRange(_it, typename std::iterator_traits<BaseIterator>::iterator_category());
-            }
-        };
-
-        // SBaseIterators<BaseIterator, BoundsChecked>:
-        // Utility to access base iterators properties from CIterator.
-        // This is the un-checked specialization for known-safe sequences.
-        template<typename BaseIterator>
-        struct SBaseIterators<BaseIterator, false>
-        {
-            typedef BaseIterator type;
-            type it;
-
-            explicit SBaseIterators(const BaseIterator& begin)
-                : it(begin) {}
-
-            SBaseIterators(const BaseIterator& begin, const BaseIterator& end)
-                : it(begin) {}
-
-            SBaseIterators(const SBaseIterators& other)
-                : it(other.it) {}
-
-            SBaseIterators& operator =(const SBaseIterators& other)
-            {
-                it = other.it;
-                return *this;
-            }
-
-            bool IsBegin(const BaseIterator&) const
-            {
-                return false;
-            }
-
-            bool IsEnd(const BaseIterator&) const
-            {
-                return false;
-            }
-
-            bool IsEqual(const SBaseIterators& other) const
-            {
-                return it == other.it;
-            }
-
-            bool IsInRange(const BaseIterator&) const
-            {
-                return true;
-            }
-        };
-
-        // SIteratorSink<Safe>:
-        // Helper to store the last code-point and error bit that was decoded.
-        // This is the safe specialization for potentially malformed sequences.
-        template<bool Safe>
-        struct SIteratorSink
-        {
-            static const uint32 cEmpty = 0xFFFFFFFFU;
-            uint32 value;
-            bool error;
-
-            void Clear()
-            {
-                value = cEmpty;
-                error = false;
-            }
-
-            bool IsEmpty() const
-            {
-                return value == cEmpty;
-            }
-
-            bool IsError() const
-            {
-                return error;
-            }
-
-            const uint32& GetValue() const
-            {
-                return value;
-            }
-
-            void MarkDecodingError()
-            {
-                value = cReplacementCharacter;
-                error = true;
-            }
-
-            template<EEncoding Encoding, typename BaseIterator, bool BoundsChecked>
-            void Decode(const SBaseIterators<BaseIterator, BoundsChecked>& its, integral_constant<EEncoding, Encoding>)
-            {
-                typedef SDecoder<Encoding, SIteratorSink&, SIteratorSink&> DecoderType;
-                DecoderType decoder(*this, *this);
-                Clear();
-                for (BaseIterator it = its.it; IsEmpty(); ++it)
-                {
-                    uint32 val = static_cast<uint32>(*it);
-                    decoder(val);
-                    if (its.IsEnd(it))
-                    {
-                        break;
-                    }
-                }
-                if (IsEmpty())
-                {
-                    // If we still have neither a new value or an error flag, just treat as error.
-                    // This can happen if we reached the end of the sequence, but it ends in an incomplete code-sequence.
-                    MarkDecodingError();
-                }
-            }
-
-            template<EEncoding Encoding, typename BaseIterator, bool BoundsChecked>
-            void DecodeIfEmpty(const SBaseIterators<BaseIterator, BoundsChecked>& its, integral_constant<EEncoding, Encoding> tag)
-            {
-                if (IsEmpty())
-                {
-                    Decode(its, tag);
-                }
-            }
-
-            void operator()(uint32 unit)
-            {
-                value = unit;
-            }
-
-            void operator()(SIteratorSink&, uint32, uint32)
-            {
-                MarkDecodingError();
-            }
-        };
-
-        // SIteratorSink<Safe>:
-        // Helper to store the last code-point that was decoded.
-        // This is the un-safe specialization for known-valid sequences.
-        // Note: No error-state is tracked since we won't handle that regardless for un-safe CIterator.
-        template<>
-        struct SIteratorSink<false>
-        {
-            static const uint32 cEmpty = 0xFFFFFFFFU;
-            uint32 value;
-
-            void Clear()
-            {
-                value = cEmpty;
-            }
-
-            bool IsEmpty() const
-            {
-                return value == cEmpty;
-            }
-
-            bool IsError() const
-            {
-                return false;
-            }
-
-            const uint32& GetValue() const
-            {
-                return value;
-            }
-
-            template<EEncoding Encoding, typename BaseIterator, bool BoundsChecked>
-            void Decode(const SBaseIterators<BaseIterator, BoundsChecked>& its, integral_constant<EEncoding, Encoding>)
-            {
-                typedef SDecoder<Encoding, SIteratorSink&, void> DecoderType;
-                DecoderType decoder(*this);
-                for (BaseIterator it = its.it; IsEmpty(); ++it)
-                {
-                    uint32 val = static_cast<uint32>(*it);
-                    decoder(val);
-                }
-            }
-
-            template<EEncoding Encoding, typename BaseIterator, bool BoundsChecked>
-            void DecodeIfEmpty(const SBaseIterators<BaseIterator, BoundsChecked>& its, integral_constant<EEncoding, Encoding> tag)
-            {
-                if (IsEmpty())
-                {
-                    Decode(its, tag);
-                }
-            }
-
-            void operator()(uint32 unit)
-            {
-                value = unit;
-            }
-        };
-    }
-
-    // CIterator<BaseIterator [, Safe, Encoding]>:
-    // Helper class that can iterate over an encoded text sequence and read the underlying UCS code-points.
-    // If the Safe flag is set, bounds checking is performed inside multi-unit sequences to guard against decoding errors.
-    // This requires the user to know where the sequence ends (use the constructor taking two parameters).
-    // Note: The BaseIterator must be forward-iterator or better when Safe flag is set.
-    // If the Safe flag is not set, you must guarantee the sequence is validly encoded, and allows the use of the single argument constructor.
-    // In the case of unsafe iterator used for C-style string pointer, look for a U+0000 dereferenced value to end the iteration.
-    // Regardless of the Safe flag, the user must ensure that the iterator is never moved past the beginning or end of the range (just like any other STL iterator).
-    // Example of typical usage:
-    // string utf8 = "foo"; // UTF-8
-    // for (Unicode::CIterator<string::const_iterator> it(utf8.begin(), utf8.end()); it != utf8.end(); ++it)
-    // {
-    //     uint32 codepoint = *it; // 32-bit UCS code-point
-    // }
-    // Example unsafe usage: (for known-valid encoded C-style strings):
-    // const char *pValid = "foo"; // UTF-8
-    // for (Unicode::CIterator<const char *, false> it = pValid; *it != 0; ++it)
-    // {
-    //     uint32 codepoint = *it; // 32-bit UCS code-point
-    // }
-    template<typename BaseIterator, bool Safe = true, EEncoding Encoding = Detail::SInferEncoding<BaseIterator, true>::value>
-    class CIterator
-    {
-        // The iterator value in the encoded sequence.
-        // Optionally provides bounds-checking.
-        Detail::SBaseIterators<BaseIterator, Safe> its;
-
-        // The cached UCS code-point at the current position.
-        // Mutable because dereferencing is conceptually const, but does cache some state in this case.
-        mutable Detail::SIteratorSink<Safe> sink;
-
-    public:
-        // Types for compatibility with STL bidirectional iterator requirements.
-        typedef const uint32 value_type;
-        typedef const uint32& reference;
-        typedef const uint32* pointer;
-        typedef const ptrdiff_t difference_type;
-        typedef std::bidirectional_iterator_tag iterator_category;
-
-        // Construct an iterator for the given range.
-        // The initial position of the iterator as at the beginning of the range.
-        CIterator(const BaseIterator& begin, const BaseIterator& end)
-            : its(begin, end)
-        {
-            sink.Clear();
-        }
-
-        // Construct an iterator from a single iterator (typically C-style string pointer).
-        // This can only be used for unsafe iterators.
-        template<typename IteratorType>
-        CIterator(const IteratorType& it, typename Detail::SRequire<!Safe&& Detail::is_convertible<IteratorType, BaseIterator>::value, IteratorType>::type* = 0)
-            : its(static_cast<const BaseIterator&>(it))
-        {
-            sink.Clear();
-        }
-
-        // Copy-construct an iterator.
-        CIterator(const CIterator& other)
-            : its(other.its)
-            , sink(other.sink) {}
-
-        // Copy-assign an iterator.
-        CIterator& operator =(const CIterator& other)
-        {
-            its = other.its;
-            sink = other.sink;
-            return *this;
-        }
-
-        // Test if the iterator points at an encoding error in the underlying encoded sequence.
-        // If so, the function returns false.
-        // When using an un-safe iterator, this function always returns true, if a sequence can contain encoding errors, you must use the safe variant.
-        // Note: This requires the underlying iterator to be dereferenced, so you cannot use it only while the iterator is inside the valid range.
-        bool IsAtValidCodepoint() const
-        {
-            assert(!its.IsEnd(its.it) && "Attempt to dereference the past-the-end iterator");
-            Detail::integral_constant<EEncoding, Encoding> tag;
-            sink.DecodeIfEmpty(its, tag);
-            return !sink.IsError();
-        }
-
-        // Gets the current position in the underlying encoded sequence.
-        // If the iterator points to an invalidly encoded sequence (ie, IsError() returns true), the direction of iteration is significant.
-        // In that case the returned position is approximated; to work around this: move all iterators of which the position is compared in the same direction.
-        const BaseIterator& GetPosition() const
-        {
-            return its.it;
-        }
-
-        // Sets the current position in the underlying encoded sequence.
-        // You may not set the position outside the range for which this iterator was constructed.
-        void SetPosition(const BaseIterator& it)
-        {
-            assert(its.IsInRange(it) && "Attempt to set the underlying iterator outside of the supported range");
-            its.it = it;
-        }
-
-        // Test if this iterator is equal to another iterator instance.
-        // Note: In the presence of an invalidly encoded sequence (ie, IsError() returns true), the direction of iteration is significant.
-        // To work around this, you can either:
-        // 1) Move all iterators that will be compared in the same direction; or
-        // 2) Compare the dereferenced iterator value(s) instead (if applicable).
-        bool operator ==(const CIterator& other) const
-        {
-            return its.IsEqual(other.its);
-        }
-
-        // Test if this iterator is equal to another base iterator.
-        // Note: If the provided iterator does not point to the the first code-unit of an UCS code-point, the behavior is undefined.
-        bool operator ==(const BaseIterator& other) const
-        {
-            return its.it == other;
-        }
-
-        // Test if this iterator is equal to another iterator instance.
-        // Note: In the presence of an invalidly encoded sequence (ie, IsError() returns true), the direction of iteration is significant.
-        // To work around this, you can either:
-        // 1) Move all iterators that will be compared in the same direction; or
-        // 2) Compare the dereferenced iterator value(s) instead (if applicable).
-        bool operator !=(const CIterator& other) const
-        {
-            return !its.IsEqual(other.its);
-        }
-
-        // Test if this iterator is equal to another base iterator.
-        // Note: If the provided iterator does not point to the the first code-unit of an UCS code-point, the behavior is undefined.
-        bool operator !=(const BaseIterator& other) const
-        {
-            return its.it != other;
-        }
-
-        // Get the decoded UCS code-point at the current position in the sequence.
-        // If the iterator points to an invalidly encoded sequence (ie, IsError() returns true) the function returns U+FFFD (replacement character).
-        reference operator *() const
-        {
-            assert(!its.IsEnd(its.it) && "Attempt to dereference the past-the-end iterator");
-            Detail::integral_constant<EEncoding, Encoding> tag;
-            sink.DecodeIfEmpty(its, tag);
-            return sink.GetValue();
-        }
-
-        // Advance the iterator to the next UCS code-point.
-        // Note: You must make sure the iterator is not at the end of the sequence, even in Safe mode.
-        // However, in Safe mode, the iterator will never move past the end of the sequence in the presence of encoding errors.
-        CIterator& operator ++()
-        {
-            Detail::integral_constant<EEncoding, Encoding> tag;
-            Detail::MoveNext(its.it, its, tag);
-            sink.Clear();
-            return *this;
-        }
-
-        // Go back to the previous UCS code-point.
-        // Note: You must make sure the iterator is not at the beginning of the sequence, even in Safe mode.
-        // However, in Safe mode, the iterators will never move past the beginning of the sequence in the presence of encoding errors.
-        CIterator& operator --()
-        {
-            Detail::integral_constant<EEncoding, Encoding> tag;
-            Detail::MovePrev(its.it, its, tag);
-            sink.Clear();
-            return *this;
-        }
-
-        // Advance the iterator to the next UCS code-point, return a copy of the iterator position before advancing.
-        // Note: You must make sure the iterator is not at the end of the sequence, even in Safe mode.
-        // However, in Safe mode, the iterator will never move past the end of the sequence in the presence of encoding errors.
-        CIterator operator ++(int)
-        {
-            CIterator result = *this;
-            ++*this;
-            return result;
-        }
-
-        // Go back to the previous UCS code-point, return a copy of the iterator position before going back.
-        // Note: You must make sure the iterator is not at the beginning of the sequence, even in Safe mode.
-        // However, in Safe mode, the iterators will never move past the beginning of the sequence in the presence of encoding errors.
-        CIterator operator --(int)
-        {
-            CIterator result = *this;
-            --*this;
-            return result;
-        }
-    };
-
-    namespace Detail
-    {
-        // SIteratorSpecializer<T>:
-        // Specializes the CIterator template to use for a given string type.
-        // Note: The reason we use this is because MSVC doesn't want to deduce this on the MakeIterator declaration.
-        template<typename StringType>
-        struct SIteratorSpecializer
-        {
-            typedef CIterator<typename StringType::const_iterator> type;
-        };
-    }
-
-    // MakeIterator(const StringType &str):
-    // Helper function to make an UCS code-point iterator given an Unicode string.
-    // Example usage:
-    // string utf8 = "foo"; // UTF-8
-    // auto it = Unicode::MakeIterator(utf8);
-    // while (it != utf8.end())
-    // {
-    //     uint32 codepoint = *it; // 32-bit UCS code-point
-    // }
-    // Or, in a for-loop:
-    // for (auto it = Unicode::MakeIterator(utf8); it != utf8.end(); ++it) {}
-    template<typename StringType>
-    inline typename Detail::SIteratorSpecializer<StringType>::type MakeIterator(const StringType& str)
-    {
-        return typename Detail::SIteratorSpecializer<StringType>::type(str.begin(), str.end());
-    }
-}
diff --git a/Code/CryEngine/CryCommon/VRCommon.h b/Code/CryEngine/CryCommon/VRCommon.h
deleted file mode 100644
index ea2abb9da7..0000000000
--- a/Code/CryEngine/CryCommon/VRCommon.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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/CryEngine/CryCommon/VectorMap.h b/Code/CryEngine/CryCommon/VectorMap.h
deleted file mode 100644
index 4a0db13ae6..0000000000
--- a/Code/CryEngine/CryCommon/VectorMap.h
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : std::map replacement implemented using sorted vector.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_VECTORMAP_H
-#define CRYINCLUDE_CRYCOMMON_VECTORMAP_H
-#pragma once
-
-
-//--------------------------------------------------------------------------
-// VectorMap
-//
-// Usage Notes:
-// This class is designed to be an (almost, see below) drop-in replacement
-// for std::map. It features an almost identical interface, but it is
-// implemented using a sorted vector rather than a tree. This is in most
-// cases more efficient, as there is less dynamic memory allocation and
-// pointer dereferencing.
-//
-// *************************************************************************
-// PLEASE NOTE: There is one vital difference between std::map and VectorMap
-// that you will need to note before trying to replace std::map. Since
-// VectorMap is implemented using a vector, iterators can and will be
-// invalidated by many operations, such as insertions and deletions, and
-// due to sorting potentially even normal lookups. Please Please PLEASE make
-// sure that you are not storing any iterators to this class.
-// *************************************************************************
-//
-// The class varies from the std::set API in that two of the erase methods
-// methods are not of void return type but return an iterator - this is
-// required in practice because they invalidate iterators, as noted above.
-//
-// * iterator erase(iterator where);
-// * iterator erase(iterator first, iterator last);
-//
-//
-// Performance Notes:
-//
-// This class uses the empty base optimization hack to allow comparison
-// predicate objects that have no state to take up no space in the object.
-// As a result the size of the overall VectorMap instance is the same as
-// that of the std::vector it uses to store the elements.
-//
-// In addition to the normal map interface, this class provides the
-// following members that can be used to manage memory requirements:
-//
-// * void reserve(size_type count);
-//   Allocate enough space for count elements (see vector::reserve()).
-//
-// * size_type capacity() const;
-//   Report how many elements can be stored without reallocating (see
-//   vector::capacity()).
-//
-//--------------------------------------------------------------------------
-
-template <typename K, typename V, typename T = std::less<K>, typename A = std::allocator<std::pair <K, V> > >
-class VectorMap
-    : private T             // Empty base optimization
-{
-public:
-    typedef K key_type;
-    typedef V mapped_type;
-    typedef A allocator_type;
-
-    typedef std::pair</*const */ key_type, mapped_type> value_type;
-
-    typedef T key_compare;
-
-    class FirstLess
-    {
-    public:
-        FirstLess(const key_compare& comp)
-            : m_comp(comp) {}
-
-        bool operator()(const value_type& left, const value_type& right) const
-        {
-            return m_comp(left.first, right.first);
-        }
-
-    private:
-        const key_compare& m_comp;
-    };
-
-    typedef std::vector<value_type, allocator_type> container_type;
-    typedef typename container_type::iterator iterator;
-    typedef typename container_type::const_iterator const_iterator;
-    typedef typename container_type::reverse_iterator reverse_iterator;
-    typedef typename container_type::const_reverse_iterator const_reverse_iterator;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef typename std::allocator_traits<allocator_type>::size_type size_type;
-
-    VectorMap();
-    explicit VectorMap(const key_compare& comp);
-    explicit VectorMap(const key_compare& comp, const allocator_type& alloc);
-    VectorMap(const VectorMap& right);
-    template <class InputIterator>
-    VectorMap(InputIterator first, InputIterator last);
-    template <class InputIterator>
-    VectorMap(InputIterator first, InputIterator last, const key_compare& comp);
-    template <class InputIterator>
-    VectorMap(InputIterator first, InputIterator last, const key_compare& comp, const allocator_type& alloc);
-    void SwapElementsWithVector(container_type& elementVector);
-    iterator begin();
-    const_iterator begin() const;
-    size_type capacity() const;
-    void clear();
-    void clearAndFreeMemory();
-    size_type count(const key_type& key) const;
-    bool empty() const;
-    iterator end();
-    const_iterator end() const;
-    std::pair<iterator, iterator> equal_range(const key_type& key);
-    std::pair<const_iterator, const_iterator> equal_range(const key_type& key) const;
-    iterator erase(iterator where);                 // See documentation above
-    iterator erase(iterator first, iterator last);  // See documentation above
-    void erase(const key_type& key);
-    template <typename Predicate>
-    void erase_if(const Predicate& predicate);
-    iterator find(const key_type& key);
-    const_iterator find(const key_type& key) const;
-    allocator_type get_allocator() const;
-    std::pair<iterator, bool> insert(const value_type& val);
-    iterator insert(iterator where, const value_type& val);
-    template <class InputIterator>
-    void insert(InputIterator first, InputIterator last);
-    key_compare key_comp() const;
-    iterator lower_bound(const key_type& key);
-    const_iterator lower_bound(const key_type& key) const;
-    size_type max_size() const;
-    reverse_iterator rbegin();
-    const_reverse_iterator rbegin() const;
-    reverse_iterator rend();
-    const_reverse_iterator rend() const;
-    void reserve(size_type count);
-    size_type size() const;
-    void swap(VectorMap& other);
-    iterator upper_bound(const key_type& key);
-    const_iterator upper_bound(const key_type& key) const;
-    mapped_type& operator[](const key_type& key);
-
-    template<typename Sizer>
-    void GetMemoryUsage(Sizer* pSizer) const
-    {
-        pSizer->AddObject(m_entries);
-    }
-private:
-    container_type m_entries;
-};
-
-template <typename K, typename V, typename T, typename A>
-VectorMap<K, V, T, A>::VectorMap()
-{
-}
-
-template <typename K, typename V, typename T, typename A>
-VectorMap<K, V, T, A>::VectorMap(const key_compare& comp)
-    :   key_compare(comp)
-{
-}
-
-template <typename K, typename V, typename T, typename A>
-VectorMap<K, V, T, A>::VectorMap(const key_compare& comp, const allocator_type& alloc)
-    :   key_compare(comp)
-    , m_entries(alloc)
-{
-}
-
-template <typename K, typename V, typename T, typename A>
-VectorMap<K, V, T, A>::VectorMap(const VectorMap& right)
-    :   key_compare(right)
-    , m_entries(right.m_entries)
-{
-}
-
-template <typename K, typename V, typename T, typename A>
-template <class InputIterator>
-VectorMap<K, V, T, A>::VectorMap(InputIterator first, InputIterator last)
-{
-    for (; first != last; ++first)
-    {
-        m_entries.push_back(*first);
-    }
-    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
-}
-
-template <typename K, typename V, typename T, typename A>
-template <class InputIterator>
-VectorMap<K, V, T, A>::VectorMap(InputIterator first, InputIterator last, const key_compare& comp)
-    :   key_compare(comp)
-{
-    for (; first != last; ++first)
-    {
-        m_entries.push_back(*first);
-    }
-    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
-}
-
-template <typename K, typename V, typename T, typename A>
-template <class InputIterator>
-VectorMap<K, V, T, A>::VectorMap(InputIterator first, InputIterator last, const key_compare& comp, const allocator_type& alloc)
-    :   key_compare(comp)
-    , m_entries(alloc)
-{
-    for (; first != last; ++first)
-    {
-        m_entries.push_back(*first);
-    }
-    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
-}
-
-template <typename K, typename V, typename T, typename A>
-void VectorMap<K, V, T, A>::SwapElementsWithVector(typename VectorMap<K, V, T, A>::container_type& elementVector)
-{
-    m_entries.swap(elementVector);
-    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::begin()
-{
-    return m_entries.begin();
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::begin() const
-{
-    return m_entries.begin();
-}
-
-template <typename K, typename V, typename T, typename A>
-void VectorMap<K, V, T, A>::clear()
-{
-    m_entries.resize(0);
-}
-
-template <typename K, typename V, typename T, typename A>
-void VectorMap<K, V, T, A>::clearAndFreeMemory()
-{
-    stl::free_container(m_entries);
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::size_type VectorMap<K, V, T, A>::capacity() const
-{
-    return m_entries.capacity();
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::size_type VectorMap<K, V, T, A>::count(const key_type& key) const
-{
-    return size_type(std::binary_search(m_entries.begin(), m_entries.end(), value_type(key, mapped_type()), static_cast<key_compare>(*this)));
-}
-
-template <typename K, typename V, typename T, typename A>
-bool VectorMap<K, V, T, A>::empty() const
-{
-    return m_entries.empty();
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::end()
-{
-    return m_entries.end();
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::end() const
-{
-    return m_entries.end();
-}
-
-template <typename K, typename V, typename T, typename A>
-std::pair<typename VectorMap<K, V, T, A>::iterator, typename VectorMap<K, V, T, A>::iterator> VectorMap<K, V, T, A>::equal_range(const key_type& key)
-{
-    iterator lower = lower_bound(key);
-    if (lower != m_entries.end() && key_compare::operator()(key, (*lower).first))
-    {
-        lower = m_entries.end();
-    }
-    iterator upper = lower;
-    if (upper != m_entries.end())
-    {
-        ++upper;
-    }
-    return std::make_pair(lower, upper);
-}
-
-template <typename K, typename V, typename T, typename A>
-std::pair<typename VectorMap<K, V, T, A>::const_iterator, typename VectorMap<K, V, T, A>::const_iterator> VectorMap<K, V, T, A>::equal_range(const key_type& key) const
-{
-    const_iterator lower = lower_bound(key);
-    if (lower != m_entries.end() && key_compare::operator()(key, (*lower).first))
-    {
-        lower = m_entries.end();
-    }
-    const_iterator upper = lower;
-    if (upper != m_entries.end())
-    {
-        ++upper;
-    }
-    return std::make_pair(lower, upper);
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::erase(iterator where)
-{
-    return m_entries.erase(where);
-}
-
-template <typename K, typename V, typename T, typename A>
-template <typename Predicate>
-void VectorMap<K, V, T, A>::erase_if(const Predicate& predicate)
-{
-    m_entries.erase(std::remove_if(m_entries.begin(), m_entries.end(), predicate), m_entries.end());
-    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::erase(iterator first, iterator last)
-{
-    return m_entries.erase(first, last);
-}
-
-template <typename K, typename V, typename T, typename A>
-void VectorMap<K, V, T, A>::erase(const key_type& key)
-{
-    iterator where = find(key);
-
-    if (where != m_entries.end())
-    {
-        m_entries.erase(where);
-    }
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::find(const key_type& key)
-{
-    iterator it = lower_bound(key);
-    if (it != m_entries.end() && key_compare::operator()(key, (*it).first))
-    {
-        it = m_entries.end();
-    }
-    return it;
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::find(const key_type& key) const
-{
-    const_iterator it = lower_bound(key);
-    if (it != m_entries.end() && key_compare::operator()(key, (*it).first))
-    {
-        it = m_entries.end();
-    }
-    return it;
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::allocator_type VectorMap<K, V, T, A>::get_allocator() const
-{
-    return m_entries.get_allocator();
-}
-
-template <typename K, typename V, typename T, typename A>
-std::pair<typename VectorMap<K, V, T, A>::iterator, bool> VectorMap<K, V, T, A>::insert(const value_type& val)
-{
-    iterator it = lower_bound(val.first);
-    bool insertionMade = false;
-    if (it == m_entries.end() || key_compare::operator()(val.first, (*it).first))
-    {
-        it = m_entries.insert(it, val), insertionMade = true;
-    }
-    return std::make_pair(it, insertionMade);
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::insert(iterator where, const value_type& val)
-{
-    return insert(val);
-}
-
-template <typename K, typename V, typename T, typename A>
-template <class InputIterator>
-void VectorMap<K, V, T, A>::insert(InputIterator first, InputIterator last)
-{
-    for (; first != last; ++first)
-    {
-        insert(*first);
-    }
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::key_compare VectorMap<K, V, T, A>::key_comp() const
-{
-    return static_cast<key_compare>(*this);
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::lower_bound(const key_type& key)
-{
-    int count = 0;
-    count = m_entries.size();
-    iterator first = m_entries.begin();
-    iterator last = m_entries.end();
-    for (; 0 < count; )
-    {   // divide and conquer, find half that contains answer
-        int count2 = count / 2;
-        iterator mid = first + count2;
-
-        if (key_compare::operator()(mid->first, key))
-        {
-            first = ++mid, count -= count2 + 1;
-        }
-        else
-        {
-            count = count2;
-        }
-    }
-    return first;
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::lower_bound(const key_type& key) const
-{
-    int count = 0;
-    count = m_entries.size();
-    const_iterator first = m_entries.begin();
-    const_iterator last = m_entries.end();
-    for (; 0 < count; )
-    {   // divide and conquer, find half that contains answer
-        int count2 = count / 2;
-        const_iterator mid = first + count2;
-
-        if (key_compare::operator()(mid->first, key))
-        {
-            first = ++mid, count -= count2 + 1;
-        }
-        else
-        {
-            count = count2;
-        }
-    }
-    return first;
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::size_type VectorMap<K, V, T, A>::max_size() const
-{
-    return m_entries.max_size();
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::reverse_iterator VectorMap<K, V, T, A>::rbegin()
-{
-    return m_entries.rbegin();
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::const_reverse_iterator VectorMap<K, V, T, A>::rbegin() const
-{
-    return m_entries.rbegin();
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::reverse_iterator VectorMap<K, V, T, A>::rend()
-{
-    return m_entries.rend();
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::const_reverse_iterator VectorMap<K, V, T, A>::rend() const
-{
-    return m_entries.rend();
-}
-
-template <typename K, typename V, typename T, typename A>
-void VectorMap<K, V, T, A>::reserve(size_type count)
-{
-    m_entries.reserve(count);
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::size_type VectorMap<K, V, T, A>::size() const
-{
-    return m_entries.size();
-}
-
-template <typename K, typename V, typename T, typename A>
-void VectorMap<K, V, T, A>::swap(VectorMap& other)
-{
-    m_entries.swap(other.m_entries);
-    std::swap(static_cast<key_compare&>(*this), static_cast<key_compare&>(other));
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::upper_bound(const key_type& key)
-{
-    iterator upper = lower_bound(key);
-    if (upper != m_entries.end() && !key_compare::operator()(key, (*upper).first))
-    {
-        ++upper;
-    }
-    return upper;
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::upper_bound(const key_type& key) const
-{
-    iterator upper = lower_bound(key);
-    if (upper != m_entries.end() && !key_compare::operator()(key, (*upper).first))
-    {
-        ++upper;
-    }
-    return upper;
-}
-
-template <typename K, typename V, typename T, typename A>
-typename VectorMap<K, V, T, A>::mapped_type& VectorMap<K, V, T, A>::operator[](const key_type& key)
-{
-    iterator it = find(key);
-    if (it == m_entries.end())
-    {
-        it = insert(value_type(key, mapped_type())).first;
-    }
-    return (*it).second;
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_VECTORMAP_H
diff --git a/Code/CryEngine/CryCommon/VectorSet.h b/Code/CryEngine/CryCommon/VectorSet.h
deleted file mode 100644
index 578d8c0f28..0000000000
--- a/Code/CryEngine/CryCommon/VectorSet.h
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : std::set replacement implemented using sorted vector.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_VECTORSET_H
-#define CRYINCLUDE_CRYCOMMON_VECTORSET_H
-#pragma once
-
-
-//--------------------------------------------------------------------------
-// VectorSet
-//
-// Usage Notes:
-// This class is designed to be an (almost, see below) drop-in replacement
-// for std::set. It features an almost identical interface, but it is
-// implemented using a sorted vector rather than a tree. This is in most
-// cases more efficient, as there is less dynamic memory allocation and
-// pointer dereferencing.
-//
-// *************************************************************************
-// PLEASE NOTE: There is one vital difference between std::set and VectorSet
-// that you will need to note before trying to replace std::set. Since
-// VectorSet is implemented using a vector, iterators can and will be
-// invalidated by many operations, such as insertions and deletions, and
-// due to sorting potentially even normal lookups. Please Please PLEASE make
-// sure that you are not storing any iterators to this class.
-// *************************************************************************
-//
-// The class varies from the std::set API in that two of the erase methods
-// methods are not of void return type but return an iterator - this is
-// required in practice because they invalidate iterators, as noted above.
-//
-// * iterator erase(iterator where);
-// * iterator erase(iterator first, iterator last);
-//
-// It also adds operator[] to the API.
-//
-//
-// Performance Notes:
-//
-// This class uses the empty base optimization hack to allow comparison
-// predicate objects that have no state to take up no space in the object.
-// As a result the size of the overall VectorMap instance is the same as
-// that of the std::vector it uses to store the elements.
-//
-// In addition to the normal map interface, this class provides the
-// following members that can be used to manage memory requirements:
-//
-// * void reserve(size_type count);
-//   Allocate enough space for count elements (see vector::reserve()).
-//
-// * size_type capacity() const;
-//   Report how many elements can be stored without reallocating (see
-//   vector::capacity()).
-//
-// * void resize(size_type new_size, const_reference x=key_type());
-//   see vector::resize()).
-//
-//--------------------------------------------------------------------------
-
-template <typename K, typename T = AZStd::less<K>, typename A = AZ::StdLegacyAllocator >
-class VectorSet
-    : private T             // Empty base optimization
-{
-public:
-    typedef K key_type;
-    typedef A allocator_type;
-    typedef T key_compare;
-    typedef T value_compare;
-    typedef AZStd::vector<key_type, allocator_type> container_type;
-    typedef typename container_type::iterator iterator;
-    typedef typename container_type::const_iterator const_iterator;
-    typedef typename container_type::reverse_iterator reverse_iterator;
-    typedef typename container_type::const_reverse_iterator const_reverse_iterator;
-    typedef typename container_type::size_type size_type;
-    typedef typename container_type::difference_type difference_type;
-    typedef key_type& reference;
-    typedef const key_type& const_reference;
-    typedef key_type* pointer;
-    typedef const key_type* const_pointer;
-
-    VectorSet();
-    explicit VectorSet(const key_compare& comp);
-    explicit VectorSet(const key_compare& comp, const allocator_type& allocator);
-    VectorSet(const VectorSet<K, T, A>& right);
-    template <class InputIterator>
-    VectorSet(InputIterator first, InputIterator last);
-    template <class InputIterator>
-    VectorSet(InputIterator first, InputIterator last, const key_compare& comp);
-    template <class InputIterator>
-    VectorSet(InputIterator first, InputIterator last, const key_compare& comp, const allocator_type& allocator);
-    void SwapElementsWithVector(container_type& elementVector);
-    const_iterator begin() const;
-    iterator begin();
-    size_type capacity() const;
-    void resize(size_type __new_size, const_reference __x = key_type());
-    void clear();
-    size_type count(const_reference key) const;
-    bool empty() const;
-    const_iterator end() const;
-    iterator end();
-    std::pair<const_iterator, const_iterator> equal_range(const_reference key) const;
-    std::pair<iterator, iterator> equal_range(const_reference key);
-    iterator erase(iterator where);                                 // See documentation above
-    iterator erase(iterator first, iterator last);  // See documentation above
-    size_t erase(const_reference key);
-    iterator find(const_reference key);
-    const_iterator find(const_reference key) const;
-    allocator_type get_allocator() const;
-    std::pair<iterator, bool> insert(const_reference value);
-    iterator insert(iterator _Where, const_reference value);
-    template<class InputIterator>
-    void insert(InputIterator first, InputIterator last);
-    key_compare key_comp() const;
-    const_iterator lower_bound(const_reference key) const;
-    iterator lower_bound(const_reference key);
-    size_type max_size() const;
-    const_reverse_iterator rbegin() const;
-    reverse_iterator rbegin();
-    const_reverse_iterator rend() const;
-    reverse_iterator rend();
-    void reserve(size_type count);
-    size_type size() const;
-    void swap(VectorSet& right);
-    const_iterator upper_bound(const_reference key) const;
-    iterator upper_bound(const_reference key);
-    value_compare value_comp() const;
-    reference operator[](int index);              // See documentation above
-    const_reference operator[](int index) const;              // See documentation above
-
-    template<typename Sizer>
-    void GetMemoryUsage(Sizer* pSizer) const
-    {
-        pSizer->AddObject(m_entries);
-    }
-private:
-    container_type m_entries;
-};
-
-template <typename K, typename T, typename A>
-VectorSet<K, T, A>::VectorSet()
-{
-}
-
-template <typename K, typename T, typename A>
-VectorSet<K, T, A>::VectorSet(const key_compare& comp)
-    :   key_compare(comp)
-{
-}
-
-template <typename K, typename T, typename A>
-VectorSet<K, T, A>::VectorSet(const key_compare& comp, const allocator_type& allocator)
-    :   key_compare(comp)
-    , m_entries(allocator)
-{
-}
-
-template <typename K, typename T, typename A>
-VectorSet<K, T, A>::VectorSet(const VectorSet<K, T, A>& right)
-    :   key_compare(right)
-    , m_entries(right.m_entries)
-{
-}
-
-template <typename K, typename T, typename A>
-template <class InputIterator>
-VectorSet<K, T, A>::VectorSet(InputIterator first, InputIterator last)
-{
-    for (; first != last; ++first)
-    {
-        m_entries.push_back(*first);
-    }
-    std::sort(m_entries.begin(), m_entries.end(), static_cast<key_compare>(*this));
-}
-
-template <typename K, typename T, typename A>
-template <class InputIterator>
-VectorSet<K, T, A>::VectorSet(InputIterator first, InputIterator last, const key_compare& comp)
-    :   key_compare(comp)
-{
-    for (; first != last; ++first)
-    {
-        m_entries.push_back(*first);
-    }
-    std::sort(m_entries.begin(), m_entries.end(), static_cast<key_compare>(*this));
-}
-
-template <typename K, typename T, typename A>
-template <class InputIterator>
-VectorSet<K, T, A>::VectorSet(InputIterator first, InputIterator last, const key_compare& comp, const allocator_type& allocator)
-    :   key_compare(comp)
-    , m_entries(allocator)
-{
-    for (; first != last; ++first)
-    {
-        m_entries.push_back(*first);
-    }
-    std::sort(m_entries.begin(), m_entries.end(), static_cast<key_compare>(*this));
-}
-
-template <typename K, typename T, typename A>
-void VectorSet<K, T, A>::SwapElementsWithVector(container_type& elementVector)
-{
-    m_entries.swap(elementVector);
-    std::sort(m_entries.begin(), m_entries.end(), static_cast<key_compare>(*this));
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::begin() const
-{
-    return m_entries.begin();
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::begin()
-{
-    return m_entries.begin();
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::size_type VectorSet<K, T, A>::capacity() const
-{
-    return m_entries.capacity();
-}
-
-template <typename K, typename T, typename A>
-void VectorSet<K, T, A>::clear()
-{
-    m_entries.clear();
-}
-
-template <typename K, typename T, typename A>
-void VectorSet<K, T, A>::resize(size_type __new_size, const_reference __x)
-{
-    m_entries.resize(__new_size, __x);
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::size_type VectorSet<K, T, A>::count(const_reference key) const
-{
-    return size_type(std::binary_search(m_entries.begin(), m_entries.end(), key, static_cast<key_compare>(*this)));
-}
-
-template <typename K, typename T, typename A>
-bool VectorSet<K, T, A>::empty() const
-{
-    return m_entries.empty();
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::end() const
-{
-    return m_entries.end();
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::end()
-{
-    return m_entries.end();
-}
-
-template <typename K, typename T, typename A>
-std::pair<typename VectorSet<K, T, A>::const_iterator, typename VectorSet<K, T, A>::const_iterator> VectorSet<K, T, A>::equal_range(const_reference key) const
-{
-    const_iterator lower = lower_bound(key);
-    if (lower != m_entries.end() && key_compare::operator()(key, *lower))
-    {
-        lower = m_entries.end();
-    }
-    const_iterator upper = lower;
-    if (upper != m_entries.end())
-    {
-        ++upper;
-    }
-    return std::make_pair(lower, upper);
-}
-
-template <typename K, typename T, typename A>
-std::pair<typename VectorSet<K, T, A>::iterator, typename VectorSet<K, T, A>::iterator> VectorSet<K, T, A>::equal_range(const_reference key)
-{
-    iterator lower = lower_bound(key);
-    if (lower != m_entries.end() && key_compare::operator()(key, *lower))
-    {
-        lower = m_entries.end();
-    }
-    iterator upper = lower;
-    if (upper != m_entries.end())
-    {
-        ++upper;
-    }
-    return std::make_pair(lower, upper);
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::erase(iterator where)
-{
-    return m_entries.erase(where);
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::erase(iterator first, iterator last)
-{
-    return m_entries.erase(first, last);
-}
-
-template <typename K, typename T, typename A>
-size_t VectorSet<K, T, A>::erase(const_reference key)
-{
-    iterator where = find(key);
-
-    if (where != m_entries.end())
-    {
-        // Note erasing entries does not invalidate the sort - no need to trigger a re-sort.
-        m_entries.erase(where);
-        return 1;
-    }
-
-    return 0;
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::find(const_reference key)
-{
-    iterator it = lower_bound(key);
-    if (it != m_entries.end() && key_compare::operator()(key, *it))
-    {
-        it = m_entries.end();
-    }
-    return it;
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::find(const_reference key) const
-{
-    const_iterator it = lower_bound(key);
-    if (it != m_entries.end() && key_compare::operator()(key, *it))
-    {
-        it = m_entries.end();
-    }
-    return it;
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::allocator_type VectorSet<K, T, A>::get_allocator() const
-{
-    return m_entries.get_allocator();
-}
-
-template <typename K, typename T, typename A>
-std::pair<typename VectorSet<K, T, A>::iterator, bool> VectorSet<K, T, A>::insert(const_reference value)
-{
-    iterator it = lower_bound(value);
-    bool insertionMade = false;
-    if (it == m_entries.end() || key_compare::operator()(value, (*it)))
-    {
-        it = m_entries.insert(it, value), insertionMade = true;
-    }
-    return std::make_pair(it, insertionMade);
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::insert(iterator where, const_reference value)
-{
-    return insert(value);
-}
-
-template <typename K, typename T, typename A>
-template<class InputIterator>
-void VectorSet<K, T, A>::insert(InputIterator first, InputIterator last)
-{
-    for (; first != last; ++first)
-    {
-        insert(*first);
-    }
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::key_compare VectorSet<K, T, A>::key_comp() const
-{
-    return static_cast<key_compare>(*this);
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::lower_bound(const_reference key) const
-{
-    return std::lower_bound(m_entries.begin(), m_entries.end(), key, static_cast<key_compare>(*this));
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::lower_bound(const_reference key)
-{
-    return std::lower_bound(m_entries.begin(), m_entries.end(), key, static_cast<key_compare>(*this));
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::size_type VectorSet<K, T, A>::max_size() const
-{
-    return m_entries.max_size();
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::const_reverse_iterator VectorSet<K, T, A>::rbegin() const
-{
-    return m_entries.rbegin();
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::reverse_iterator VectorSet<K, T, A>::rbegin()
-{
-    return m_entries.rbegin();
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::const_reverse_iterator VectorSet<K, T, A>::rend() const
-{
-    return m_entries.rend();
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::reverse_iterator VectorSet<K, T, A>::rend()
-{
-    return m_entries.rend();
-}
-
-template <typename K, typename T, typename A>
-void VectorSet<K, T, A>::reserve(size_type count)
-{
-    m_entries.reserve(count);
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::size_type VectorSet<K, T, A>::size() const
-{
-    return m_entries.size();
-}
-
-template <typename K, typename T, typename A>
-void VectorSet<K, T, A>::swap(VectorSet& other)
-{
-    m_entries.swap(other.m_entries);
-    std::swap(static_cast<key_compare&>(*this), static_cast<key_compare&>(other));
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::upper_bound(const_reference key) const
-{
-    const_iterator upper = lower_bound(key);
-    if (upper != m_entries.end() && !key_compare::operator()(key, *upper))
-    {
-        ++upper;
-    }
-    return upper;
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::upper_bound(const_reference key)
-{
-    iterator upper = lower_bound(key);
-    if (upper != m_entries.end() && !key_compare::operator()(key, *upper))
-    {
-        ++upper;
-    }
-    return upper;
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::value_compare VectorSet<K, T, A>::value_comp() const
-{
-    return static_cast<key_compare>(*this);
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::reference VectorSet<K, T, A>::operator[](int index)
-{
-    return m_entries[index];
-}
-
-template <typename K, typename T, typename A>
-typename VectorSet<K, T, A>::const_reference VectorSet<K, T, A>::operator[](int index) const
-{
-    return m_entries[index];
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_VECTORSET_H
diff --git a/Code/CryEngine/CryCommon/Vertex.h b/Code/CryEngine/CryCommon/Vertex.h
deleted file mode 100644
index 26d62f4a60..0000000000
--- a/Code/CryEngine/CryCommon/Vertex.h
+++ /dev/null
@@ -1,1088 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/array.h>
-namespace AZ
-{
-    namespace Vertex
-    {
-        const uint32_t VERTEX_BUFFER_ALIGNMENT = 4;
-        // This enum must only have 8 entries because only 3 bits are used to store usage.
-        enum class AttributeUsage : uint8
-        {
-            Position,
-            Color,
-            Normal,
-            TexCoord,
-            Weights,
-            Indices,
-            Tangent,
-            BiTangent,
-            NumUsages
-        };
-
-        struct AttributeUsageData
-        {
-            AZStd::string friendlyName;
-            AZStd::string semanticName;
-        };
-
-        static AttributeUsageData AttributeUsageDataTable[(uint)AttributeUsage::NumUsages] =
-        {
-            // {friendlyName, semanticName}
-            { "Position", "POSITION" },
-            { "Color", "COLOR" },
-            { "Normal", "NORMAL" },
-            { "TexCoord", "TEXCOORD" },
-            { "Weights", "BLENDWEIGHT" },
-            { "Indices", "BLENDINDICES" },
-            { "Tangent", "TEXCOORD" },
-            { "BiTangent", "TEXCOORD" }
-        };
-
-        // This enum must have 32 or less entries as 5 bits are used to store type.
-        enum class AttributeType : uint8
-        {
-            Float16_1 = 0,
-            Float16_2,
-            Float16_4,
-
-            Float32_1,
-            Float32_2,
-            Float32_3,
-            Float32_4,
-
-            Byte_1,
-            Byte_2,
-            Byte_4,
-
-            Short_1,
-            Short_2,
-            Short_4,
-
-            UInt16_1,
-            UInt16_2,
-            UInt16_4,
-
-            UInt32_1,
-            UInt32_2,
-            UInt32_3,
-            UInt32_4,
-
-            NumTypes
-        };    
-
-        struct AttributeTypeData
-        {
-            AZStd::string friendlyName;
-            uint8 byteSize;
-        };
-
-        static AttributeTypeData AttributeTypeDataTable[(unsigned int)AZ::Vertex::AttributeType::NumTypes] =
-        {
-            { "Float16_1", 2 },
-            { "Float16_2", 4 },
-            { "Float16_4", 8 },
-
-            { "Float32_1", 4 },
-            { "Float32_2", 8 },
-            { "Float32_3", 12 },
-            { "Float32_4", 16 },
-
-            { "Byte_1", 1 },
-            { "Byte_2", 2 },
-            { "Byte_4", 4 },
-
-            { "Short_1", 2 },
-            { "Short_2", 4 },
-            { "Short_4", 8 },
-
-            { "UInt16_1", 2 },
-            { "UInt16_2", 4 },
-            { "UInt16_4", 8 },
-
-            { "UInt32_1", 4 },
-            { "UInt32_2", 8 },
-            { "UInt32_3", 12 },
-            { "UInt32_4", 16 },
-        };
-
-        //! Stores the usage, type, and byte length of an individual vertex attribute
-        class Attribute
-        {
-        public:
-            // Usage stored in the 3 lower bits and Type stored in the 5 upper bits.
-            static const uint8 kUsageBitCount = 3;
-            static const uint8 kUsageMask = 0x07;
-            static const uint8 kTypeMask = 0xf8;
-            static uint8 CreateAttribute(AttributeUsage usage, AttributeType type)
-            {
-                return (static_cast<uint8>(type) << kUsageBitCount) | static_cast<uint8>(usage);
-            }
-            static AttributeUsage GetUsage(const uint8 attribute)
-            { 
-                return static_cast<AttributeUsage>(attribute & kUsageMask);
-            }
-            static AttributeType GetType(const uint8 attribute)
-            { 
-                return static_cast<AttributeType>((attribute & kTypeMask) >> kUsageBitCount);
-            }
-            static uint8 GetByteLength(const uint8 attribute)
-            { 
-                return AttributeTypeDataTable[(uint)GetType(attribute)].byteSize;
-            }
-            static const AZStd::string& GetSemanticName(uint8 attribute)
-            {
-                return AttributeUsageDataTable[(uint)GetUsage(attribute)].semanticName;
-            }
-        };
-
-        //! Flexible vertex format class
-        class Format
-        {
-        public:
-            Format(){};
-
-
-            //! Conversion from old hard-coded EVertexFormat enum to new, flexible vertex class
-            Format(EVertexFormat format)
-            {
-                m_enum = eVF_Unknown;
-                m_numAttributes = 0;
-                switch (format)
-                {
-                case eVF_Unknown:
-                    m_enum = eVF_Unknown;
-                    break;
-                case eVF_P3F_C4B_T2F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    m_enum = eVF_P3F_C4B_T2F;
-                    break;
-                case eVF_P3F_C4B_T2F_T2F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    m_enum = eVF_P3F_C4B_T2F_T2F;
-                    break;
-                case eVF_P3S_C4B_T2S:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float16_4));// vec3f16 is backed by a CryHalf4
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
-                    m_enum = eVF_P3S_C4B_T2S;
-                    break;
-                case eVF_P3S_C4B_T2S_T2S:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float16_4));// vec3f16 is backed by a CryHalf4
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
-                    m_enum = eVF_P3S_C4B_T2S_T2S;
-                    break;
-                case eVF_P3S_N4B_C4B_T2S:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float16_4));// vec3f16 is backed by a CryHalf4
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Normal, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
-                    m_enum = eVF_P3S_N4B_C4B_T2S;
-                    break;
-                case eVF_P3F_C4B_T4B_N3F2:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Tangent, AttributeType::Float32_3));//x-axis
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::BiTangent, AttributeType::Float32_3));//y-axis
-#ifdef PARTICLE_MOTION_BLUR // Nonfunctional and disabled.
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));//prevPos
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Tangent, AttributeType::Float32_3));//prevXTan
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::BiTangent, AttributeType::Float32_3));//prevYTan
-#endif
-                    m_enum = eVF_P3F_C4B_T4B_N3F2;// Particles.
-                    break;
-                case eVF_TP3F_C4B_T2F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    m_enum = eVF_TP3F_C4B_T2F;// Fonts (28 bytes).
-                    break;
-                case eVF_TP3F_T2F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_TP3F_T2F_T3F;
-                    break;
-                case eVF_P3F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_T3F; // Miscellaneus.
-                    break;
-                case eVF_P3F_T2F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_T2F_T3F;
-                    break;
-                // Additional streams
-                case eVF_T2F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    m_enum = eVF_T2F; // Light maps TC (8 bytes).
-                    break;
-                case eVF_W4B_I4S:// Skinned weights/indices stream.
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Weights, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Indices, AttributeType::UInt16_4));
-                    m_enum = eVF_W4B_I4S;
-                    break;
-                case eVF_C4B_C4B:// SH coefficients.
-                    // We use the "Weights" usage since sh coefs use an unknown usage of 4 bytes.
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Weights, AttributeType::Byte_4));    //coef0
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Weights, AttributeType::Byte_4));    //coef1
-                    m_enum = eVF_C4B_C4B;
-                    break;
-                case eVF_P3F_P3F_I4B:// Shape deformation stream.
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));    //thin
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));    //fat
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Indices, AttributeType::Byte_4));
-                    m_enum = eVF_P3F_P3F_I4B;
-                    break;
-                case eVF_P3F:// Velocity stream.
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    m_enum = eVF_P3F;
-                    break;
-                case eVF_C4B_T2S:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
-                    m_enum = eVF_C4B_T2S;// General (Position is merged with Tangent stream)
-                    break;
-                case eVF_P2F_T4F_C4F: // Lens effects simulation
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    m_enum = eVF_P2F_T4F_C4F;
-                    break;
-                case eVF_P2F_T4F_T4F_C4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    m_enum = eVF_P2F_T4F_T4F_C4F;
-                    break;
-                case eVF_P2S_N4B_C4B_T1F:// terrain
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float16_2));// xy-coordinates in terrain
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Normal, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));// z-coordinate in terrain
-                    m_enum = eVF_P2S_N4B_C4B_T1F;
-                    break;
-                case eVF_P3F_C4B_T2S:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
-                    m_enum = eVF_P3F_C4B_T2S;
-                    break;
-                case eVF_P2F_C4B_T2F_F4B:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Indices, AttributeType::UInt16_2));
-                    m_enum = eVF_P2F_C4B_T2F_F4B;
-                    break;
-                case eVF_P3F_C4B:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
-                    m_enum = eVF_P3F_C4B;
-                    break;
-                case eVF_P3F_C4F_T2F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    m_enum = eVF_P3F_C4F_T2F;
-                    break;
-                case eVF_P3F_C4F_T2F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T2F_T3F;
-                    break;
-                case eVF_P3F_C4F_T2F_T3F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T2F_T3F_T3F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    m_enum = eVF_P3F_C4F_T2F_T1F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F_T3F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T3F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    m_enum = eVF_P3F_C4F_T4F_T2F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T3F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T3F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F;
-                    break;
-                case eVF_P4F_T2F_C4F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P4F_T2F_C4F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T3F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T3F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T1F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F;
-                    break;
-                case eVF_P4F_T2F_C4F_T4F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P4F_T2F_C4F_T4F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T1F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F;
-                    break;
-                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F;
-                    break;
-                case eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F:
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
-                    m_enum = eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F;
-                    break;
-                case eVF_Max:
-                default:
-                    AZ_Error("VF", false, "Invalid vertex format");
-                    m_enum = eVF_Unknown;
-                }
-                CalculateStrideAndUsageCounts();
-            }
-
-            //! Get the equivalent old-style EVertexFormat enum
-            uint GetEnum() const { return m_enum; }
-
-            static const uint8 kHas16BitFloatPosition  = 0x4;
-            static const uint8 kHas16BitFloatTexCoords = 0x2;
-            static const uint8 kHas32BitFloatTexCoords = 0x1;
-
-            
-            //! Helper function to check to see if the vertex format has a position attribute that uses 16 bit floats for the underlying type
-            bool Has16BitFloatPosition() const
-            {
-                return (m_flags & kHas16BitFloatPosition) != 0x0;
-            }
-            
-            //! Helper function to check to see if the vertex format has a texture coordinate attribute that uses 16 bit floats for the underlying type
-            bool Has16BitFloatTextureCoordinates() const
-            {
-                return (m_flags & kHas16BitFloatTexCoords) != 0x0;
-            }
-
-            //! Helper function to check to see if the vertex format has a texture coordinate attribute that uses 32 bit floats for the underlying type
-            bool Has32BitFloatTextureCoordinates() const
-            {
-                return (m_flags & kHas32BitFloatTexCoords) != 0x0;
-            }
-
-
-            uint32 GetAttributeUsageCount(AttributeUsage usage) const
-            {
-                return (uint32)m_attributeUsageCounts[(uint)usage];
-            }
-
-            bool TryGetAttributeOffsetAndType(AttributeUsage usage, uint32 index, uint& outOffset, AttributeType& outType) const
-            {
-                outOffset = 0;
-                outType = AttributeType::NumTypes;
-                for (uint ii=0; ii < m_numAttributes; ++ii)
-                {
-                    uint8 attribute = m_vertexAttributes[ii];
-                    if (Attribute::GetUsage(attribute) == usage)
-                    {
-                        if (index == 0)
-                        {
-                            outType = Attribute::GetType(attribute);
-                            return true;
-                        }
-                        else
-                        {
-                            --index;
-                        }
-                    }
-                    outOffset += Attribute::GetByteLength(attribute);
-                }
-                return false;
-            }
-
-            uint8 GetAttributeByteLength(AttributeUsage usage) const
-            {
-                for (uint ii = 0; ii < m_numAttributes; ++ii)
-                {
-                    uint8 attribute = m_vertexAttributes[ii];
-                    if (Attribute::GetUsage(attribute) == usage)
-                    {
-                        return Attribute::GetByteLength(attribute);
-                    }
-                }
-                return 0;
-            }
-
-
-            const uint8* GetAttributes( uint32 &outCount) const
-            {
-                outCount = m_numAttributes;
-                return m_vertexAttributes;
-            }
-
-            //! Return true if the vertex format is a superset of the input
-            bool IsSupersetOf(const AZ::Vertex::Format& input) const
-            {
-                uint32 count = 0;
-                const uint8* attributes = input.GetAttributes(count);
-                for ( uint8 ii=0; ii<count; ++ii)
-                {
-                    const uint8 attribute = attributes[ii];
-                    if (GetAttributeUsageCount(Attribute::GetUsage(attribute)) < input.GetAttributeUsageCount(Attribute::GetUsage(attribute)))
-                    {
-                        return false;
-                    }
-                }
-                return true;
-            }
-
-            uint GetStride(void) const { return m_stride; }
-            
-            //! Returns the true if an attribute with the given usage is found, false otherwise
-            bool TryCalculateOffset(uint& offset, AttributeUsage usage, uint index = 0) const
-            {
-                offset = 0;
-                for (uint ii = 0; ii < m_numAttributes; ++ii)
-                {
-                    uint8 attribute = m_vertexAttributes[ii];
-                    if (Attribute::GetUsage(attribute) == usage)
-                    {
-                        if (index == 0)
-                        {
-                            return true;
-                        }
-                        else
-                        {
-                            --index;
-                        }
-                    }
-                    offset += Attribute::GetByteLength(attribute);
-                }
-                return false;
-            }
-
-            // Quick comparison operators.
-            bool operator==(const Format& other) const
-            {
-                return m_enum == other.m_enum;
-            }
-            bool operator!=(const Format& other) const
-            {
-                return !(*this == other);
-            }
-            bool operator==(const EVertexFormat& other) const
-            {
-                return m_enum == other;
-            }
-            // Used in RendermeshMerger.cpp
-            // CHWShader_D3D::mfUpdateFXVertexFormat and CHWShader_D3D::mfVertexFormat want the max between two vertex formats...why? It seems like a bad guess of which vertex format to use since there's no particular order to EVertexFormats...other than the more specialized EVertexFormats come after the base EVertexFormats
-            bool operator<(const Format& other) const
-            {
-                return m_enum < other.m_enum;
-            }
-            bool operator<=(const Format& other) const
-            {
-                return (*this == other || *this < other);
-            }
-            bool operator>(const Format& other) const
-            {
-                return !(*this <= other);
-            }
-            bool operator>=(const Format& other) const
-            {
-                return (*this == other || *this > other);
-            }
-        private:
-            void AddAttribute(uint8 attribute)
-            {
-                AZ_Assert(m_numAttributes < kMaxAttributes, "Too many attributes added.  Change the size of kMaxAttributes");
-                m_vertexAttributes[m_numAttributes++] = attribute;
-
-                // Update the flags.
-                AttributeUsage usage = Attribute::GetUsage(attribute);
-                AttributeType type = Attribute::GetType(attribute);
-                if (usage == AttributeUsage::TexCoord)
-                {
-                    if (type == AttributeType::Float16_2) {
-                        m_flags |= kHas16BitFloatTexCoords;
-                    }
-                    else if (type == AttributeType::Float32_2 || type == AttributeType::Float32_3 || type == AttributeType::Float32_4) {
-                        m_flags |= kHas32BitFloatTexCoords;
-                    }
-                }
-                else if (usage == AttributeUsage::Position && type == AttributeType::Float16_4) {
-                    m_flags |= kHas16BitFloatPosition;
-                }
-            }
-
-            //! Calculates the sum of the size in bytes of all attributes that make up this format
-            void CalculateStrideAndUsageCounts()
-            {
-                static_assert((uint32)AttributeUsage::NumUsages <= 8, "We use 3 bits to represent usage so we only support 8 usages for a vertex format attribute.");
-                static_assert((uint32)AttributeType::NumTypes <= 32, "We use 5 bits to represent type so we only support up to 32 types for a vertex format attribute.");
-
-                for (uint index = 0; index < (uint)AttributeUsage::NumUsages; ++index)
-                {
-                    m_attributeUsageCounts[index] = 0;
-                }
-                uint32 stride = 0;
-                for (uint ii = 0; ii < m_numAttributes; ++ii)
-                {
-                    uint8 attribute = m_vertexAttributes[ii];
-                    stride += Attribute::GetByteLength(attribute);
-                    m_attributeUsageCounts[(uint)Attribute::GetUsage(attribute)]++;
-                }
-                AZ_Assert(stride < (0x1 << (sizeof(m_stride) * 8)), "Vertex stride is larger than the maximum supported, update the type for m_stride in Vertex.h");
-
-                m_stride = stride;
-            }
-            
-
-
-#ifdef PARTICLE_MOTION_BLUR
-            static const uint32_t kMaxAttributes = 8;
-#else
-            static const uint32_t kMaxAttributes = 10;
-#endif
-            uint8 m_vertexAttributes[kMaxAttributes] = { 0 };
-
-            uint8 m_attributeUsageCounts[(uint)AttributeUsage::NumUsages] = { 0 };
-            uint8 m_numAttributes = 0;
-            uint8 m_enum = eVF_Unknown;
-            uint8 m_stride = 0;
-            uint8 m_flags = 0x0;
-        };
-
-
-        // bNeedNormals=1 - float normals; bNeedNormals=2 - byte normals //waltont TODO (this was copied as is from vertexformats.h) this comment is out of date and the function does not even use all the parameters. This should be replaceable with the new vertex class, and should be replaced when refactoring CHWShader_D3D::mfVertexFormat which handles the shader parsing/serialization
-        _inline Format VertFormatForComponents([[maybe_unused]] bool bNeedCol, [[maybe_unused]] bool bHasTC, bool bHasTC2, bool bHasPS, bool bHasNormal)
-        {
-            AZ::Vertex::Format RequestedVertFormat;
-
-            if (bHasPS)
-            {
-                RequestedVertFormat = AZ::Vertex::Format(eVF_P3F_C4B_T4B_N3F2);
-            }
-            else
-            if (bHasNormal)
-            {
-                RequestedVertFormat = AZ::Vertex::Format(eVF_P3S_N4B_C4B_T2S);
-            }
-            else
-            {
-                if (!bHasTC2)
-                {
-                    RequestedVertFormat = AZ::Vertex::Format(eVF_P3S_C4B_T2S);
-                }
-                else
-                {
-                    RequestedVertFormat = AZ::Vertex::Format(eVF_P3F_C4B_T2F_T2F);
-                }
-            }
-
-            return RequestedVertFormat;
-        }
-    }
-}
diff --git a/Code/CryEngine/CryCommon/VertexFormats.h b/Code/CryEngine/CryCommon/VertexFormats.h
deleted file mode 100644
index 5cfc210a28..0000000000
--- a/Code/CryEngine/CryCommon/VertexFormats.h
+++ /dev/null
@@ -1,1386 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_VERTEXFORMATS_H
-#define CRYINCLUDE_CRYCOMMON_VERTEXFORMATS_H
-
-#pragma once
-
-#include <CryArray.h>
-// Stream Configuration options
-#define ENABLE_NORMALSTREAM_SUPPORT 1
-
-enum EVertexFormat : uint8
-{
-    eVF_Unknown,
-
-    // Base stream
-    eVF_P3F_C4B_T2F,
-    eVF_P3F_C4B_T2F_T2F,
-    eVF_P3S_C4B_T2S,
-    eVF_P3S_C4B_T2S_T2S, // For UV2 support
-    eVF_P3S_N4B_C4B_T2S,
-
-    eVF_P3F_C4B_T4B_N3F2, // Particles.
-    eVF_TP3F_C4B_T2F, // Fonts (28 bytes).
-    eVF_TP3F_T2F_T3F,  // Miscellaneus.
-    eVF_P3F_T3F,       // Miscellaneus. (AuxGeom)
-    eVF_P3F_T2F_T3F,   // Miscellaneus.
-
-    // Additional streams
-    eVF_T2F,           // Light maps TC (8 bytes).
-    eVF_W4B_I4S,  // Skinned weights/indices stream.
-    eVF_C4B_C4B,      // SH coefficients.
-    eVF_P3F_P3F_I4B,  // Shape deformation stream.
-    eVF_P3F,       // Velocity stream.
-
-    eVF_C4B_T2S,     // General (Position is merged with Tangent stream)
-
-    // Lens effects simulation
-    eVF_P2F_T4F_C4F,  // primary
-    eVF_P2F_T4F_T4F_C4F,
-
-    eVF_P2S_N4B_C4B_T1F,
-    eVF_P3F_C4B_T2S,
-    eVF_P2F_C4B_T2F_F4B, // UI
-    eVF_P3F_C4B,// Auxiliary geometry
-
-
-    eVF_P3F_C4F_T2F,  //numbering for tracking the new vertex formats and for comparison with testing 23
-    eVF_P3F_C4F_T2F_T3F,
-    eVF_P3F_C4F_T2F_T3F_T3F,
-    eVF_P3F_C4F_T2F_T1F,
-    eVF_P3F_C4F_T2F_T1F_T3F,
-    eVF_P3F_C4F_T2F_T1F_T3F_T3F,
-    eVF_P3F_C4F_T4F_T2F,
-    eVF_P3F_C4F_T4F_T2F_T3F,  //30
-    eVF_P3F_C4F_T4F_T2F_T3F_T3F,
-    eVF_P3F_C4F_T4F_T2F_T1F,
-    eVF_P3F_C4F_T4F_T2F_T1F_T3F,
-    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F,
-    eVF_P3F_C4F_T2F_T2F_T1F,  //35
-    eVF_P3F_C4F_T2F_T2F_T1F_T3F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F,  //40
-    eVF_P4F_T2F_C4F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T4F,
-    eVF_P3F_C4F_T2F_T3F_T4F,
-    eVF_P3F_C4F_T2F_T3F_T3F_T4F,
-    eVF_P3F_C4F_T2F_T1F_T4F,  //45
-    eVF_P3F_C4F_T2F_T1F_T3F_T4F,
-    eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T3F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F,  //50
-    eVF_P3F_C4F_T4F_T2F_T1F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F,  //55
-    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F,
-    eVF_P4F_T2F_C4F_T4F_T4F_T4F,  //60
-    eVF_P3F_C4F_T2F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T1F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F,  //65
-    eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T4F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F,  //70
-    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F,  //75
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F,
-    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F,
-    eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F,
-
-    eVF_Max,
-};
-
-
-typedef Vec4_tpl<int16> Vec4sf;     // Used for tangents only.
-
-struct UCol
-{
-    union
-    {
-        uint32 dcolor;
-        uint8  bcolor[4];
-
-        struct
-        {
-            uint8 b, g, r, a;
-        };
-        struct
-        {
-            uint8 z, y, x, w;
-        };
-    };
-
-    // get normal vector from unsigned 8bit integers (can't point up/down and is not normal)
-    ILINE Vec3 GetN()
-    {
-        return Vec3
-               (
-            (bcolor[0] - 128.0f) / 127.5f,
-            (bcolor[1] - 128.0f) / 127.5f,
-            (bcolor[2] - 128.0f) / 127.5f
-               );
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-struct Vec3f16
-    : public CryHalf4
-{
-    _inline Vec3f16()
-    {
-    }
-    _inline Vec3f16(f32 _x, f32 _y, f32 _z)
-    {
-        x = CryConvertFloatToHalf(_x);
-        y = CryConvertFloatToHalf(_y);
-        z = CryConvertFloatToHalf(_z);
-        w = CryConvertFloatToHalf(1.0f);
-    }
-    float operator[](int i) const
-    {
-        assert(i <= 3);
-        return CryConvertHalfToFloat(((CryHalf*)this)[i]);
-    }
-    _inline Vec3f16& operator = (const Vec3& sl)
-    {
-        x = CryConvertFloatToHalf(sl.x);
-        y = CryConvertFloatToHalf(sl.y);
-        z = CryConvertFloatToHalf(sl.z);
-        w = CryConvertFloatToHalf(1.0f);
-        return *this;
-    }
-    _inline Vec3f16& operator = (const Vec4A& sl)
-    {
-        x = CryConvertFloatToHalf(sl.x);
-        y = CryConvertFloatToHalf(sl.y);
-        z = CryConvertFloatToHalf(sl.z);
-        w = CryConvertFloatToHalf(sl.w);
-        return *this;
-    }
-    _inline Vec3 ToVec3() const
-    {
-        Vec3 v;
-        v.x = CryConvertHalfToFloat(x);
-        v.y = CryConvertHalfToFloat(y);
-        v.z = CryConvertHalfToFloat(z);
-        return v;
-    }
-};
-
-struct Vec2f16
-    : public CryHalf2
-{
-    _inline Vec2f16()
-    {
-    }
-    _inline Vec2f16(f32 _x, f32 _y)
-    {
-        x = CryConvertFloatToHalf(_x);
-        y = CryConvertFloatToHalf(_y);
-    }
-    Vec2f16& operator = (const Vec2f16& sl)
-    {
-        x = sl.x;
-        y = sl.y;
-        return *this;
-    }
-    Vec2f16& operator = (const Vec2& sl)
-    {
-        x = CryConvertFloatToHalf(sl.x);
-        y = CryConvertFloatToHalf(sl.y);
-        return *this;
-    }
-    float operator[](int i) const
-    {
-        assert(i <= 1);
-        return CryConvertHalfToFloat(((CryHalf*)this)[i]);
-    }
-    _inline Vec2 ToVec2() const
-    {
-        Vec2 v;
-        v.x = CryConvertHalfToFloat(x);
-        v.y = CryConvertHalfToFloat(y);
-        return v;
-    }
-};
-
-
-struct SVF_P3F_C4B
-{
-    Vec3 xyz;
-    UCol color;
-};
-
-struct SVF_P3F_C4B_T2F
-{
-    Vec3 xyz;
-    UCol color;
-    Vec2 st;
-};
-
-struct SVF_P3F_C4B_T2F_T2F
-{
-    Vec3 xyz;
-    UCol color;
-    Vec2 st;
-    Vec2 st2;
-};
-
-struct SVF_P2F_C4B_T2F_F4B
-{
-    Vec2 xy;
-    UCol color;
-    Vec2 st;
-    uint8 texIndex;
-    uint8 texHasColorChannel;
-    uint8 texIndex2;
-    uint8 pad;
-};
-
-struct SVF_TP3F_C4B_T2F //Fonts
-{
-    Vec4 pos;
-    UCol color;
-    Vec2 st;
-};
-struct SVF_P3S_C4B_T2S
-{
-    Vec3f16 xyz;
-    UCol color;
-    Vec2f16 st;
-
-    AUTO_STRUCT_INFO
-};
-
-struct SVF_P3S_C4B_T2S_T2S
-{
-    Vec3f16 xyz;
-    UCol color;
-    Vec2f16 st;
-    Vec2f16 st2;
-
-    AUTO_STRUCT_INFO
-};
-
-struct SVF_P3F_C4B_T2S
-{
-    Vec3 xyz;
-    UCol color;
-    Vec2f16 st;
-};
-
-struct SVF_P3S_N4B_C4B_T2S
-{
-    Vec3f16 xyz;
-    UCol normal;
-    UCol color;
-    Vec2f16 st;
-};
-
-struct SVF_P2S_N4B_C4B_T1F
-{
-    CryHalf2 xy;
-    UCol normal;
-    UCol color;
-    float z;
-};
-
-struct SVF_T2F
-{
-    Vec2 st;
-};
-struct SVF_W4B_I4S
-{
-    UCol weights;
-    uint16 indices[4];
-};
-struct SVF_C4B_C4B
-{
-    UCol coef0;
-    UCol coef1;
-};
-struct SVF_P3F_P3F_I4B
-{
-    Vec3 thin;
-    Vec3 fat;
-    UCol index;
-};
-struct SVF_P3F
-{
-    Vec3 xyz;
-};
-struct SVF_P3F_T3F
-{
-    Vec3 p;
-    Vec3 st;
-};
-struct SVF_P3F_T2F_T3F
-{
-    Vec3 p;
-    Vec2 st0;
-    Vec3 st1;
-};
-struct SVF_TP3F_T2F_T3F
-{
-    Vec4 p;
-    Vec2 st0;
-    Vec3 st1;
-};
-struct SVF_P2F_T4F_C4F
-{
-    Vec2 p;
-    Vec4 st;
-    Vec4 color;
-};
-
-struct SVF_P2F_T4F_T4F_C4F
-{
-    Vec2 p;
-    Vec4 st;
-    Vec4 st2;
-    Vec4 color;
-};
-
-struct SVF_P3F_C4B_I4B_PS4F
-{
-    Vec3 xyz;
-    Vec2 prevXaxis;
-    Vec2 prevYaxis;
-    UCol color;
-    Vec3 prevPos;
-    struct SpriteInfo
-    {
-        uint8       tex_x, tex_y, tex_z, backlight;     // xyzw
-    } info;
-    Vec2 xaxis;
-    Vec2 yaxis;
-};
-
-struct SVF_P3F_C4B_T4B_N3F2
-{
-    Vec3 xyz;
-    UCol color;
-    UCol st; // st is used as a color, even though st usually refers to a TexCoord
-    Vec3 xaxis;
-    Vec3 yaxis;
-#ifdef PARTICLE_MOTION_BLUR
-    Vec3 prevPos;
-    Vec3 prevXTan;
-    Vec3 prevYTan;
-#endif
-};
-
-struct SVF_C4B_T2S
-{
-    UCol color;
-    Vec2f16 st;
-};
-
-struct SVF_P3F_C4F_T2F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st;
-};
-
-struct SVF_P3F_C4F_T2F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec3 st1;
-};
-
-struct SVF_P3F_C4F_T2F_T3F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec3 st1;
-    Vec3 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T1F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st;
-    float z;
-};
-
-struct SVF_P3F_C4F_T2F_T1F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    float z;
-    Vec3 st1;
-};
-
-struct SVF_P3F_C4F_T2F_T1F_T3F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    float z;
-    Vec3 st1;
-    Vec3 st2;
-};
-
-
-struct SVF_P3F_C4F_T4F_T2F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    Vec3 st2;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T3F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    Vec3 st2;
-    Vec3 st3;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec3 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec3 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-    Vec3 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-    Vec3 st2;
-    Vec3 st3;
-};
-
-struct SVF_P4F_T2F_C4F_T4F_T4F
-{
-    Vec4 xyzw;
-    Vec2 st0;
-    Vec4 color;
-    Vec4 st1;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec4 st1;
-};
-
-struct SVF_P3F_C4F_T2F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec3 st1;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T3F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec3 st1;
-    Vec3 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T1F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    float z;
-    Vec4 st1;
-};
-
-struct SVF_P3F_C4F_T2F_T1F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    float z;
-    Vec3 st1;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    float z;
-    Vec3 st1;
-    Vec3 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    Vec3 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    Vec3 st2;
-    Vec3 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec3 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec3 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-    Vec3 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-    Vec3 st2;
-    Vec3 st3;
-    Vec4 st4;
-};
-
-struct SVF_P4F_T2F_C4F_T4F_T4F_T4F
-{
-    Vec4 xyzw;
-    Vec2 st0;
-    Vec4 color;
-    Vec4 st1;
-    Vec4 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec4 st1;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec3 st1;
-    Vec4 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec3 st1;
-    Vec3 st2;
-    Vec4 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T2F_T1F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    float z;
-    Vec4 st1;
-    Vec4 st2;
-};
-
-struct SVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    float z;
-    Vec3 st1;
-    Vec4 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    float z;
-    Vec3 st1;
-    Vec3 st2;
-    Vec4 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    Vec4 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    Vec3 st2;
-    Vec4 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    Vec3 st2;
-    Vec3 st3;
-    Vec4 st4;
-    Vec4 st5;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-    Vec4 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec4 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec4 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec3 st3;
-    Vec4 st4;
-    Vec4 st5;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-    Vec4 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec4 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z;
-    Vec3 st2;
-    Vec3 st3;
-    Vec4 st4;
-    Vec4 st5;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-    Vec4 st2;
-    Vec4 st3;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-    Vec3 st2;
-    Vec4 st3;
-    Vec4 st4;
-};
-
-struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F
-{
-    Vec3 xyz;
-    Vec4 color;
-    Vec2 st0;
-    Vec2 st1;
-    float z0;
-    float z1;
-    Vec3 st2;
-    Vec3 st3;
-    Vec4 st4;
-    Vec4 st5;
-};
-
-struct SVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F
-{
-    Vec4 xyzw;
-    Vec2 st0;
-    Vec4 color;
-    Vec4 st1;
-    Vec4 st2;
-    Vec4 st3;
-    Vec4 st4;
-};
-
-
-//=============================================================
-// Signed norm value packing [-1,+1]
-
-namespace PackingSNorm
-{
-    ILINE int16 tPackF2B(const float f)
-    {
-        return (int16)(f * 32767.0f);
-    }
-
-    ILINE int16 tPackS2B(const int16 s)
-    {
-        return (int16)(s * 32767);
-    }
-
-    ILINE float tPackB2F(const int16 i)
-    {
-        return (float)((float)i / 32767.0f);
-    }
-
-    ILINE int16 tPackB2S(const int16 s)
-    {
-        // OPT: "(s >> 15) + !(s >> 15)" works as well
-        return (int16)(s / 32767);
-    }
-
-    ILINE Vec4sf tPackF2Bv(const Vec4& v)
-    {
-        Vec4sf vs;
-
-        vs.x = tPackF2B(v.x);
-        vs.y = tPackF2B(v.y);
-        vs.z = tPackF2B(v.z);
-        vs.w = tPackF2B(v.w);
-
-        return vs;
-    }
-
-    ILINE Vec4sf tPackF2Bv(const Vec3& v)
-    {
-        Vec4sf vs;
-
-        vs.x = tPackF2B(v.x);
-        vs.y = tPackF2B(v.y);
-        vs.z = tPackF2B(v.z);
-        vs.w = tPackF2B(1.0f);
-
-        return vs;
-    }
-
-    ILINE Vec4 tPackB2F(const Vec4sf& v)
-    {
-        Vec4 vs;
-
-        vs.x = tPackB2F(v.x);
-        vs.y = tPackB2F(v.y);
-        vs.z = tPackB2F(v.z);
-        vs.w = tPackB2F(v.w);
-
-        return vs;
-    }
-
-    ILINE void tPackB2F(const Vec4sf& v, Vec4& vDst)
-    {
-        vDst.x = tPackB2F(v.x);
-        vDst.y = tPackB2F(v.y);
-        vDst.z = tPackB2F(v.z);
-        vDst.w = 1.0f;
-    }
-
-    ILINE void tPackB2FScale(const Vec4sf& v, Vec4& vDst, const Vec3& vScale)
-    {
-        vDst.x = (float)v.x * vScale.x;
-        vDst.y = (float)v.y * vScale.y;
-        vDst.z = (float)v.z * vScale.z;
-        vDst.w = 1.0f;
-    }
-
-    ILINE void tPackB2FScale(const Vec4sf& v, Vec3& vDst, const Vec3& vScale)
-    {
-        vDst.x = (float)v.x * vScale.x;
-        vDst.y = (float)v.y * vScale.y;
-        vDst.z = (float)v.z * vScale.z;
-    }
-
-    ILINE void tPackB2F(const Vec4sf& v, Vec3& vDst)
-    {
-        vDst.x = tPackB2F(v.x);
-        vDst.y = tPackB2F(v.y);
-        vDst.z = tPackB2F(v.z);
-    }
-};
-
-//=============================================================
-// Pip => Graphics Pipeline structures, used for inputs for the GPU's Input Assembler
-// These structures are optimized for fast decoding (ALU and bandwidth) and
-// might be slow to encode on-the-fly
-
-struct SPipTangents
-{
-    SPipTangents() {}
-
-private:
-    Vec4sf Tangent;
-    Vec4sf Bitangent;
-
-public:
-    explicit SPipTangents(const Vec4sf& othert, const Vec4sf& otherb, const int16& othersign)
-    {
-        using namespace PackingSNorm;
-        Tangent   = othert;
-        Tangent.w   = PackingSNorm::tPackS2B(othersign);
-        Bitangent = otherb;
-        Bitangent.w = PackingSNorm::tPackS2B(othersign);
-    }
-
-    explicit SPipTangents(const Vec4sf& othert, const Vec4sf& otherb, const SPipTangents& othersign)
-    {
-        Tangent   = othert;
-        Tangent.w   = othersign.Tangent.w;
-        Bitangent = otherb;
-        Bitangent.w = othersign.Bitangent.w;
-    }
-
-    explicit SPipTangents(const Vec4sf& othert, const Vec4sf& otherb)
-    {
-        Tangent   = othert;
-        Bitangent = otherb;
-    }
-
-    explicit SPipTangents(const Vec3& othert, const Vec3& otherb, const int16& othersign)
-    {
-        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), PackingSNorm::tPackS2B(othersign));
-        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), PackingSNorm::tPackS2B(othersign));
-    }
-
-    explicit SPipTangents(const Vec3& othert, const Vec3& otherb, const SPipTangents& othersign)
-    {
-        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), othersign.Tangent.w);
-        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), othersign.Bitangent.w);
-    }
-
-    explicit SPipTangents(const Quat& other, const int16& othersign)
-    {
-        Vec3 othert = other.GetColumn0();
-        Vec3 otherb = other.GetColumn1();
-
-        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), PackingSNorm::tPackS2B(othersign));
-        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), PackingSNorm::tPackS2B(othersign));
-    }
-
-    void ExportTo(Vec4sf& othert, Vec4sf& otherb) const
-    {
-        othert = Tangent;
-        otherb = Bitangent;
-    }
-
-    // get normal tangent and bitangent vectors
-    void GetTB(Vec4& othert, Vec4& otherb) const
-    {
-        othert = PackingSNorm::tPackB2F(Tangent);
-        otherb = PackingSNorm::tPackB2F(Bitangent);
-    }
-
-    // get normal vector (perpendicular to tangent and bitangent plane)
-    ILINE Vec3 GetN() const
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z),
-        btg3(btg.x, btg.y, btg.z);
-
-        // assumes w 1 or -1
-        return tng3.Cross(btg3) * tng.w;
-    }
-
-    // get normal vector (perpendicular to tangent and bitangent plane)
-    void GetN(Vec3& othern) const
-    {
-        othern = GetN();
-    }
-
-    // get the tangent-space basis as individual normal vectors (tangent, bitangent and normal)
-    void GetTBN(Vec3& othert, Vec3& otherb, Vec3& othern) const
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z),
-        btg3(btg.x, btg.y, btg.z);
-
-        // assumes w 1 or -1
-        othert = tng3;
-        otherb = btg3;
-        othern = tng3.Cross(btg3) * tng.w;
-    }
-
-    // get normal vector sign (reflection)
-    ILINE int16 GetR() const
-    {
-        return PackingSNorm::tPackB2S(Tangent.w);
-    }
-
-    // get normal vector sign (reflection)
-    void GetR(int16& sign) const
-    {
-        sign = GetR();
-    }
-
-    void TransformBy(const Matrix34& trn)
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z),
-        btg3(btg.x, btg.y, btg.z);
-
-        tng3 = trn.TransformVector(tng3);
-        btg3 = trn.TransformVector(btg3);
-
-        *this = SPipTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
-    }
-
-    void TransformSafelyBy(const Matrix34& trn)
-    {
-        Vec4 tng, btg;
-        GetTB(tng, btg);
-
-        Vec3 tng3(tng.x, tng.y, tng.z),
-        btg3(btg.x, btg.y, btg.z);
-
-        tng3 = trn.TransformVector(tng3);
-        btg3 = trn.TransformVector(btg3);
-
-        // normalize in case "trn" wasn't length-preserving
-        tng3.Normalize();
-        btg3.Normalize();
-
-        *this = SPipTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
-    }
-
-    friend struct SMeshTangents;
-};
-
-struct SPipQTangents
-{
-    SPipQTangents() {}
-
-private:
-    Vec4sf QTangent;
-
-public:
-    explicit SPipQTangents(const Vec4sf& other)
-    {
-        QTangent = other;
-    }
-
-    bool operator ==(const SPipQTangents& other) const
-    {
-        return
-            QTangent[0] == other.QTangent[0] ||
-            QTangent[1] == other.QTangent[1] ||
-            QTangent[2] == other.QTangent[2] ||
-            QTangent[3] == other.QTangent[3];
-    }
-
-    bool operator !=(const SPipQTangents& other) const
-    {
-        return !(*this == other);
-    }
-
-    // get quaternion
-    ILINE Quat GetQ() const
-    {
-        Quat q;
-
-        q.v.x = PackingSNorm::tPackB2F(QTangent.x);
-        q.v.y = PackingSNorm::tPackB2F(QTangent.y);
-        q.v.z = PackingSNorm::tPackB2F(QTangent.z);
-        q.w   = PackingSNorm::tPackB2F(QTangent.w);
-
-        return q;
-    }
-
-    // get normal vector from quaternion
-    ILINE Vec3 GetN() const
-    {
-        const Quat q = GetQ();
-        return q.GetColumn2() * (q.w < 0.0f ? -1.0f : +1.0f);
-    }
-
-    friend struct SMeshQTangents;
-};
-
-struct SPipNormal
-    : public Vec3
-{
-    SPipNormal() {}
-
-    explicit SPipNormal(const Vec3& othern)
-    {
-        x = othern.x;
-        y = othern.y;
-        z = othern.z;
-    }
-
-    // get normal vector
-    ILINE Vec3 GetN() const
-    {
-        return *this;
-    }
-
-    // get normal vector
-    void GetN(Vec3& othern) const
-    {
-        othern = GetN();
-    }
-
-    void TransformBy(const Matrix34& trn)
-    {
-        *this = SPipNormal(trn.TransformVector(*this));
-    }
-
-    void TransformSafelyBy(const Matrix34& trn)
-    {
-        // normalize in case "trn" wasn't length-preserving
-        *this = SPipNormal(trn.TransformVector(*this).normalize());
-    }
-
-    friend struct SMeshNormal;
-};
-
-//==================================================================================================
-
-typedef SVF_P3F_C4B_T2F SAuxVertex;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Vertex Sizes
-//extern const int m_VertexSize[];
-
-//============================================================================
-// Custom vertex streams definitions
-// NOTE: If you add new stream ID also include vertex declarations creating in
-//       CD3D9Renderer::EF_InitD3DVertexDeclarations (D3DRendPipeline.cpp)
-
-// Stream IDs
-enum EStreamIDs
-{
-    VSF_GENERAL,                 // General vertex buffer
-    VSF_TANGENTS,                // Tangents buffer
-    VSF_QTANGENTS,               // Tangents buffer
-    VSF_HWSKIN_INFO,             // HW skinning buffer
-    VSF_VERTEX_VELOCITY,                // Velocity buffer
-# if ENABLE_NORMALSTREAM_SUPPORT
-    VSF_NORMALS,                 // Normals, used for skinning
-#endif
-    // <- Insert new stream IDs here
-    VSF_NUM,                     // Number of vertex streams
-
-    VSF_MORPHBUDDY = 8,          // Morphing (from m_pMorphBuddy)
-    VSF_INSTANCED = 9,           // Data is for instance stream
-    VSF_MORPHBUDDY_WEIGHTS = 15, // Morphing weights
-};
-
-// Stream Masks (Used during updating)
-enum EStreamMasks
-{
-    VSM_GENERAL    = 1 << VSF_GENERAL,
-    VSM_TANGENTS   = ((1 << VSF_TANGENTS) | (1 << VSF_QTANGENTS)),
-    VSM_HWSKIN     = 1 << VSF_HWSKIN_INFO,
-    VSM_VERTEX_VELOCITY   = 1 << VSF_VERTEX_VELOCITY,
-# if ENABLE_NORMALSTREAM_SUPPORT
-    VSM_NORMALS    = 1 << VSF_NORMALS,
-#endif
-
-    VSM_MORPHBUDDY = 1 << VSF_MORPHBUDDY,
-    VSM_INSTANCED  = 1 << VSF_INSTANCED,
-
-    VSM_MASK       = ((1 << VSF_NUM) - 1),
-};
-
-//==================================================================================================================
-
-#endif // CRYINCLUDE_CRYCOMMON_VERTEXFORMATS_H
-
diff --git a/Code/CryEngine/CryCommon/Win32specific.h b/Code/CryEngine/CryCommon/Win32specific.h
deleted file mode 100644
index 8db99b4915..0000000000
--- a/Code/CryEngine/CryCommon/Win32specific.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Specific to Win32 declarations, inline functions etc.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_WIN32SPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_WIN32SPECIFIC_H
-#pragma once
-
-
-#define _CPU_X86
-#define _CPU_SSE
-#ifdef _DEBUG
-#define ILINE _inline
-#else
-#define ILINE __forceinline
-#endif
-
-#define DEBUG_BREAK _asm { int 3 }
-#define RC_EXECUTABLE "rc.exe"
-#define DEPRECATED __declspec(deprecated)
-#define TYPENAME(x) typeid(x).name()
-#define SIZEOF_PTR 4
-
-#ifndef _WIN32_WINNT
-# define _WIN32_WINNT 0x501
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Standard includes.
-//////////////////////////////////////////////////////////////////////////
-#include <malloc.h>
-#include <io.h>
-#include <new.h>
-#include <direct.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-//////////////////////////////////////////////////////////////////////////
-
-// Special intrinsics
-#include <intrin.h> // moved here to prevent assert from being redefined when included elsewhere
-
-
-//////////////////////////////////////////////////////////////////////////
-// Define platform independent types.
-//////////////////////////////////////////////////////////////////////////
-#include "BaseTypes.h"
-
-#define THREADID_NULL -1
-
-typedef unsigned char BYTE;
-typedef unsigned int threadID;
-typedef unsigned long DWORD;
-typedef double        real;  // biggest float-type on this machine
-typedef long          LONG;
-
-#if defined(_WIN64)
-typedef __int64 INT_PTR, * PINT_PTR;
-typedef unsigned __int64 UINT_PTR, * PUINT_PTR;
-
-typedef __int64 LONG_PTR, * PLONG_PTR;
-typedef unsigned __int64 ULONG_PTR, * PULONG_PTR;
-
-typedef ULONG_PTR DWORD_PTR, * PDWORD_PTR;
-#else
-typedef __w64 int INT_PTR, * PINT_PTR;
-typedef __w64 unsigned int UINT_PTR, * PUINT_PTR;
-
-typedef __w64 long LONG_PTR, * PLONG_PTR;
-typedef __w64 unsigned long ULONG_PTR, * PULONG_PTR;
-
-typedef ULONG_PTR DWORD_PTR, * PDWORD_PTR;
-#endif
-
-typedef void* THREAD_HANDLE;
-typedef void* EVENT_HANDLE;
-
-//////////////////////////////////////////////////////////////////////////
-// Multi platform Hi resolution ticks function, should only be used for profiling.
-//////////////////////////////////////////////////////////////////////////
-
-
-int64 CryGetTicks();
-int64 CryGetTicksPerSec();
-
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(p) { if (p) { delete (p); (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(p) { if (p) { delete [] (p); (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p) = NULL; } \
-}
-#endif
-
-#define _MS_ALIGN(num) \
-    AZ_PUSH_DISABLE_WARNING(4324, "-Wunknown-warning-option") \
-    __declspec(align(num))
-
-#define DEFINE_ALIGNED_DATA(type, name, alignment) _declspec(align(alignment)) type name;
-#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) static _declspec(align(alignment)) type name;
-#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) const _declspec(align(alignment)) type name;
-
-#ifndef FILE_ATTRIBUTE_NORMAL
-    #define FILE_ATTRIBUTE_NORMAL 0x00000080
-#endif
-
-#define FP16_TERRAIN
-#define TARGET_DEFAULT_ALIGN (0x4U)
-
-
-#endif // CRYINCLUDE_CRYCOMMON_WIN32SPECIFIC_H
diff --git a/Code/CryEngine/CryCommon/Win64specific.h b/Code/CryEngine/CryCommon/Win64specific.h
deleted file mode 100644
index cd493150f1..0000000000
--- a/Code/CryEngine/CryCommon/Win64specific.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Specific to Win32 declarations, inline functions etc.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_WIN64SPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_WIN64SPECIFIC_H
-#pragma once
-
-
-#define _CPU_AMD64
-#define _CPU_SSE
-#define ILINE __forceinline
-
-#define DEBUG_BREAK CryDebugBreak()
-#define RC_EXECUTABLE "rc.exe"
-#define DEPRECATED __declspec(deprecated)
-#define TYPENAME(x) typeid(x).name()
-#define SIZEOF_PTR 8
-
-#ifndef _WIN32_WINNT
-# define _WIN32_WINNT 0x501
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Standard includes.
-//////////////////////////////////////////////////////////////////////////
-#include <stdexcept>
-#include <malloc.h>
-#include <io.h>
-#include <new.h>
-#include <direct.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-//////////////////////////////////////////////////////////////////////////
-
-// Special intrinsics
-#include <math.h> // Should be included before intrin.h
-#include <intrin.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Define platform independent types.
-//////////////////////////////////////////////////////////////////////////
-#include "BaseTypes.h"
-
-#define THREADID_NULL -1
-typedef long LONG;
-typedef unsigned char BYTE;
-typedef unsigned long threadID;
-typedef unsigned long DWORD;
-typedef double        real;  //biggest float-type on this machine
-typedef long          LONG;
-
-typedef void* THREAD_HANDLE;
-typedef void* EVENT_HANDLE;
-
-typedef __int64 INT_PTR, * PINT_PTR;
-typedef unsigned __int64 UINT_PTR, * PUINT_PTR;
-
-typedef __int64 LONG_PTR, * PLONG_PTR;
-typedef unsigned __int64 ULONG_PTR, * PULONG_PTR;
-
-typedef ULONG_PTR DWORD_PTR, * PDWORD_PTR;
-
-int64 CryGetTicks();
-int64 CryGetTicksPerSec();
-
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(p) { if (p) { delete (p); (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(p) { if (p) { delete [] (p); (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p) = NULL; } \
-}
-#endif
-
-#define _MS_ALIGN(num) \
-    AZ_PUSH_DISABLE_WARNING(4324, "-Wunknown-warning-option") \
-    __declspec(align(num))
-
-#define DEFINE_ALIGNED_DATA(type, name, alignment) _declspec(align(alignment)) type name;
-#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) static _declspec(align(alignment)) type name;
-#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) const _declspec(align(alignment)) type name;
-
-#define SIZEOF_PTR 8
-
-#ifndef FILE_ATTRIBUTE_NORMAL
-    #define FILE_ATTRIBUTE_NORMAL 0x00000080
-#endif
-
-#define TARGET_DEFAULT_ALIGN (0x8U)
-
-#define PLATFORM_64BIT
-
-#endif // CRYINCLUDE_CRYCOMMON_WIN64SPECIFIC_H
diff --git a/Code/CryEngine/CryCommon/WinBase.cpp b/Code/CryEngine/CryCommon/WinBase.cpp
deleted file mode 100644
index 552d207934..0000000000
--- a/Code/CryEngine/CryCommon/WinBase.cpp
+++ /dev/null
@@ -1,1667 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Linux/Mac port support for Win32API calls
-#if !defined(WIN32)
-
-#include "platform.h" // Note: This should be first to get consistent debugging definitions
-
-#include <CryAssert.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define WINBASE_CPP_SECTION_1 1
-#define WINBASE_CPP_SECTION_2 2
-#define WINBASE_CPP_SECTION_3 3
-#define WINBASE_CPP_SECTION_4 4
-#define WINBASE_CPP_SECTION_5 5
-#define WINBASE_CPP_SECTION_6 6
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_1
-    #include AZ_RESTRICTED_FILE(WinBase_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    #include <signal.h>
-#endif
-
-#include <pthread.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <AzCore/IO/SystemFile.h>
-
-#ifdef APPLE
-#include <mach/mach.h>
-#include <mach/mach_time.h>
-#include <sys/sysctl.h>                     // for total physical memory on Mac
-#include <CoreFoundation/CoreFoundation.h>  // for CryMessageBox
-#include <mach/vm_statistics.h>             // host_statistics
-#include <mach/mach_types.h>
-#include <mach/mach_init.h>
-#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>
-#include <utime.h>
-#include <dirent.h>
-#include "CryLibrary.h"
-#endif
-
-#if defined(APPLE)
-    #include <AzFramework/Utils/SystemUtilsApple.h>
-#endif
-
-#include "StringUtils.h"
-
-#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
-static const int FS_O_RDWR = O_RDWR;
-static const int FS_O_RDONLY = O_RDONLY;
-static const int FS_O_WRONLY = O_WRONLY;
-static const FS_ERRNO_TYPE FS_EISDIR = EISDIR;
-
-#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
-    return ptr ? false : true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-char* _strtime(char* date)
-{
-    azstrcpy(date, AZ_ARRAY_SIZE(date), "0:0:0");
-    return date;
-}
-
-//////////////////////////////////////////////////////////////////////////
-char* _strdate(char* date)
-{
-    azstrcpy(date, AZ_ARRAY_SIZE(date), "0");
-    return date;
-}
-
-//////////////////////////////////////////////////////////////////////////
-char* strlwr (char* str)
-{
-    char* cp;             /* traverses string for C locale conversion */
-
-    for (cp = str; *cp; ++cp)
-    {
-        if ('A' <= *cp && *cp <= 'Z')
-        {
-            *cp += 'a' - 'A';
-        }
-    }
-    return str;
-}
-
-char* strupr (char* str)
-{
-    char* cp;             /* traverses string for C locale conversion */
-
-    for (cp = str; *cp; ++cp)
-    {
-        if ('a' <= *cp && *cp <= 'z')
-        {
-            *cp += 'A' - 'a';
-        }
-    }
-    return str;
-}
-
-char* ltoa (long i, char* a, int radix)
-{
-    if (a == NULL)
-    {
-        return NULL;
-    }
-    strcpy (a, "0");
-    if (i && radix > 1 && radix < 37)
-    {
-        char buf[35];
-        unsigned long u = i, p = 34;
-        buf[p] = 0;
-        if (i < 0 && radix == 10)
-        {
-            u = -i;
-        }
-        while (u)
-        {
-            unsigned int d = u % radix;
-            buf[--p] = d < 10 ? '0' + d : 'a' + d - 10;
-            u /= radix;
-        }
-        if (i < 0 && radix == 10)
-        {
-            buf[--p] = '-';
-        }
-        strcpy (a, buf + p);
-    }
-    return a;
-}
-
-
-#if AZ_TRAIT_COMPILER_DEFINE_WCSICMP
-// For Linux it's redefined to wcscasecmp and wcsncasecmp'
-int wcsicmp (const wchar_t* s1, const wchar_t* s2)
-{
-    wint_t c1, c2;
-
-    if (s1 == s2)
-    {
-        return 0;
-    }
-
-    do
-    {
-        c1 = towlower(*s1++);
-        c2 = towlower(*s2++);
-    }
-    while (c1 && c1 == c2);
-
-    return (int) (c1 - c2);
-}
-
-int wcsnicmp (const wchar_t* s1, const wchar_t* s2, size_t count)
-{
-    wint_t c1, c2;
-    if (s1 == s2 || count == 0)
-    {
-        return 0;
-    }
-
-    do
-    {
-        c1 = towlower(*s1++);
-        c2 = towlower(*s2++);
-    }
-    while ((--count) && c1 && (c1 == c2));
-    return (int) (c1 - c2);
-}
-#endif
-
-#if defined(ANDROID)
-// not defined in android-19 or prior
-size_t wcsnlen(const wchar_t* str, size_t maxLen)
-{
-    size_t length;
-    for (length = 0; length < maxLen; ++length, ++str)
-    {
-        if (!*str)
-        {
-            break;
-        }
-    }
-    return length;
-}
-
-char* stpcpy(char* dest, const char* str)
-{
-    while (*str != '\0')
-    {
-        *dest++ = *str++;
-    }
-    *dest = '\0';
-
-    return dest;
-}
-#endif
-
-void _makepath(char* path, const char* drive, const char* dir, const char* filename, const char* ext)
-{
-    char ch;
-    char tmp[MAX_PATH];
-    if (!path)
-    {
-        return;
-    }
-    tmp[0] = '\0';
-    if (drive && drive[0])
-    {
-        tmp[0] = drive[0];
-        tmp[1] = ':';
-        tmp[2] = 0;
-    }
-    if (dir && dir[0])
-    {
-        cry_strcat(tmp, dir);
-        ch = tmp[strlen(tmp) - 1];
-        if (ch != '/' && ch != '\\')
-        {
-            cry_strcat(tmp, "\\");
-        }
-    }
-    if (filename && filename[0])
-    {
-        cry_strcat(tmp, filename);
-        if (ext && ext[0])
-        {
-            if (ext[0] != '.')
-            {
-                cry_strcat(tmp, ".");
-            }
-            cry_strcat(tmp, ext);
-        }
-    }
-    azstrcpy(path, strlen(tmp) + 1, tmp);
-}
-
-char* _ui64toa(unsigned long long value,   char* str, int radix)
-{
-    if (str == 0)
-    {
-        return 0;
-    }
-
-    char buffer[65];
-    char* pos;
-    int digit;
-
-    pos = &buffer[64];
-    *pos = '\0';
-
-    do
-    {
-        digit = value % radix;
-        value = value / radix;
-        if (digit < 10)
-        {
-            *--pos = '0' + digit;
-        }
-        else
-        {
-            *--pos = 'a' + digit - 10;
-        } /* if */
-    } while (value != 0L);
-
-    memcpy(str, pos, &buffer[64] - pos + 1);
-    return str;
-}
-
-long long _atoi64(const char* str)
-{
-    if (str == 0)
-    {
-        return -1;
-    }
-    unsigned long long RunningTotal = 0;
-    char bMinus = 0;
-    while (*str == ' ' || (*str >= '\011' && *str <= '\015'))
-    {
-        str++;
-    } /* while */
-    if (*str == '+')
-    {
-        str++;
-    }
-    else if (*str == '-')
-    {
-        bMinus = 1;
-        str++;
-    } /* if */
-    while (*str >= '0' && *str <= '9')
-    {
-        RunningTotal = RunningTotal * 10 + *str - '0';
-        str++;
-    } /* while */
-    return bMinus ? ((long long)-RunningTotal) : (long long)RunningTotal;
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_2
-    #include AZ_RESTRICTED_FILE(WinBase_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-bool QueryPerformanceCounter(LARGE_INTEGER* counter)
-{
-#if defined(LINUX)
-    // replaced gettimeofday
-    // http://fixunix.com/kernel/378888-gettimeofday-resolution-linux.html
-    timespec tv;
-    clock_gettime(CLOCK_MONOTONIC, &tv);
-    counter->QuadPart = (uint64)tv.tv_sec * 1000000 + tv.tv_nsec / 1000;
-    return true;
-#elif defined(APPLE)
-    counter->QuadPart = mach_absolute_time();
-    return true;
-#else
-    return false;
-#endif
-}
-
-bool QueryPerformanceFrequency(LARGE_INTEGER* frequency)
-{
-#if defined(LINUX)
-    // On Linux we'll use gettimeofday().  The API resolution is microseconds,
-    // so we'll report that to the caller.
-    frequency->u.LowPart  = 1000000;
-    frequency->u.HighPart = 0;
-    return true;
-#elif defined(APPLE)
-    static mach_timebase_info_data_t s_kTimeBaseInfoData;
-    if (s_kTimeBaseInfoData.denom == 0)
-    {
-        mach_timebase_info(&s_kTimeBaseInfoData);
-    }
-    // mach_timebase_info_data_t expresses the tick period in nanoseconds
-    frequency->QuadPart = 1e+9 * (uint64_t)s_kTimeBaseInfoData.denom / (uint64_t)s_kTimeBaseInfoData.numer;
-    return true;
-#else
-    return false;
-#endif
-}
-#endif
-
-void _splitpath(const char* inpath, char* drv, char* dir, char* fname, char* ext)
-{
-    if (drv)
-    {
-        drv[0] = 0;
-    }
-
-    typedef CryStackStringT<char, AZ_MAX_PATH_LEN> path_stack_string;
-
-    const path_stack_string inPath(inpath);
-    string::size_type s = inPath.rfind('/', inPath.size());//position of last /
-    path_stack_string fName;
-    if (s == string::npos)
-    {
-        if (dir)
-        {
-            dir[0] = 0;
-        }
-        fName = inpath; //assign complete string as rest
-    }
-    else
-    {
-        if (dir)
-        {
-            azstrcpy(dir, AZ_MAX_PATH_LEN, (inPath.substr((string::size_type)0, (string::size_type)(s + 1))).c_str());    //assign directory
-        }
-        fName = inPath.substr((string::size_type)(s + 1));                    //assign remaining string as rest
-    }
-    if (fName.size() == 0)
-    {
-        if (ext)
-        {
-            ext[0] = 0;
-        }
-        if (fname)
-        {
-            fname[0] = 0;
-        }
-    }
-    else
-    {
-        //dir and drive are now set
-        s = fName.find(".", (string::size_type)0);//position of first .
-        if (s == string::npos)
-        {
-            if (ext)
-            {
-                ext[0] = 0;
-            }
-            if (fname)
-            {
-                azstrcpy(fname, fName.size() + 1, fName.c_str());   //assign filename
-            }
-        }
-        else
-        {
-            if (ext)
-            {
-                azstrcpy(ext, AZ_MAX_PATH_LEN, (fName.substr(s)).c_str());     //assign extension including .
-            }
-            if (fname)
-            {
-                if (s == 0)
-                {
-                    fname[0] = 0;
-                }
-                else
-                {
-                    azstrcpy(fname, AZ_MAX_PATH_LEN, (fName.substr((string::size_type)0, s)).c_str());  //assign filename
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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)
-{
-    //not complete implementation
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_3
-    #include AZ_RESTRICTED_FILE(WinBase_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(APPLE)
-
-    // Retrieve dwTotalPhys
-    int kMIB[] = {CTL_HW, HW_MEMSIZE};
-    uint64_t dwTotalPhys;
-    size_t ulength = sizeof(dwTotalPhys);
-    if (sysctl(kMIB, 2, &dwTotalPhys, &ulength, NULL, 0) != 0)
-    {
-        gEnv->pLog->LogError("sysctl failed\n");
-    }
-    else
-    {
-        lpmem->dwTotalPhys = static_cast<SIZE_T>(dwTotalPhys);
-    }
-
-    // Get the page size
-    mach_port_t kHost(mach_host_self());
-    vm_size_t uPageSize;
-    if (host_page_size(kHost, &uPageSize) != 0)
-    {
-        gEnv->pLog->LogError("host_page_size failed\n");
-    }
-    else
-    {
-        // Get memory statistics
-        vm_statistics_data_t kVMStats;
-        mach_msg_type_number_t uCount(sizeof(kVMStats) / sizeof(natural_t));
-        if (host_statistics(kHost, HOST_VM_INFO, (host_info_t)&kVMStats, &uCount) != 0)
-        {
-            gEnv->pLog->LogError("host_statistics failed\n");
-        }
-        else
-        {
-            // Calculate dwAvailPhys
-            lpmem->dwAvailPhys = uPageSize * kVMStats.free_count;
-        }
-    }
-#else
-    FILE* f;
-    lpmem->dwMemoryLoad    = 0;
-    lpmem->dwTotalPhys     = 16 * 1024 * 1024;
-    lpmem->dwAvailPhys     = 16 * 1024 * 1024;
-    lpmem->dwTotalPageFile = 16 * 1024 * 1024;
-    lpmem->dwAvailPageFile = 16 * 1024 * 1024;
-    azfopen(&f, "/proc/meminfo", "r");
-    if (f)
-    {
-        char buffer[256];
-        memset(buffer, '0', 256);
-        int total, used, free, shared, buffers, cached;
-
-        lpmem->dwLength = sizeof(MEMORYSTATUS);
-        lpmem->dwTotalPhys = lpmem->dwAvailPhys = 0;
-        lpmem->dwTotalPageFile = lpmem->dwAvailPageFile = 0;
-        while (fgets(buffer, sizeof(buffer), f))
-        {
-            if (azsscanf(buffer, "Mem: %d %d %d %d %d %d", &total, &used, &free, &shared, &buffers, &cached))
-            {
-                lpmem->dwTotalPhys += total;
-                lpmem->dwAvailPhys += free + buffers + cached;
-            }
-            if (azsscanf(buffer, "Swap: %d %d %d", &total, &used, &free))
-            {
-                lpmem->dwTotalPageFile += total;
-                lpmem->dwAvailPageFile += free;
-            }
-            if (azsscanf(buffer, "MemTotal: %d", &total))
-            {
-                lpmem->dwTotalPhys = total * 1024;
-            }
-            if (azsscanf(buffer, "MemFree: %d", &free))
-            {
-                lpmem->dwAvailPhys = free * 1024;
-            }
-            if (azsscanf(buffer, "SwapTotal: %d", &total))
-            {
-                lpmem->dwTotalPageFile = total * 1024;
-            }
-            if (azsscanf(buffer, "SwapFree: %d", &free))
-            {
-                lpmem->dwAvailPageFile = free * 1024;
-            }
-            if (azsscanf(buffer, "Buffers: %d", &buffers))
-            {
-                lpmem->dwAvailPhys += buffers * 1024;
-            }
-            if (azsscanf(buffer, "Cached: %d", &cached))
-            {
-                lpmem->dwAvailPhys += cached * 1024;
-            }
-        }
-        fclose(f);
-        if (lpmem->dwTotalPhys)
-        {
-            DWORD TotalPhysical = lpmem->dwTotalPhys + lpmem->dwTotalPageFile;
-            DWORD AvailPhysical = lpmem->dwAvailPhys + lpmem->dwAvailPageFile;
-            lpmem->dwMemoryLoad = (TotalPhysical - AvailPhysical)  / (TotalPhysical / 100);
-        }
-    }
-#endif
-}
-
-static const int YearLengths[2] = {DAYSPERNORMALYEAR, DAYSPERLEAPYEAR};
-static const int MonthLengths[2][MONSPERYEAR] =
-{
-    { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-    { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-static int IsLeapYear(int Year)
-{
-    return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0;
-}
-
-static void NormalizeTimeFields(short* FieldToNormalize, short* CarryField, int Modulus)
-{
-    *FieldToNormalize = (short) (*FieldToNormalize - Modulus);
-    *CarryField = (short) (*CarryField + 1);
-}
-
-bool TimeFieldsToTime(PTIME_FIELDS tfTimeFields, PLARGE_INTEGER Time)
-{
-    #define SECSPERMIN         60
-    #define MINSPERHOUR        60
-    #define HOURSPERDAY        24
-    #define MONSPERYEAR        12
-
-    #define EPOCHYEAR          1601
-
-    #define SECSPERDAY         86400
-    #define TICKSPERMSEC       10000
-    #define TICKSPERSEC        10000000
-    #define SECSPERHOUR        3600
-
-    int CurYear, CurMonth;
-    LONGLONG rcTime;
-    TIME_FIELDS TimeFields = *tfTimeFields;
-
-    rcTime = 0;
-    while (TimeFields.Second >= SECSPERMIN)
-    {
-        NormalizeTimeFields(&TimeFields.Second, &TimeFields.Minute, SECSPERMIN);
-    }
-    while (TimeFields.Minute >= MINSPERHOUR)
-    {
-        NormalizeTimeFields(&TimeFields.Minute, &TimeFields.Hour, MINSPERHOUR);
-    }
-    while (TimeFields.Hour >= HOURSPERDAY)
-    {
-        NormalizeTimeFields(&TimeFields.Hour, &TimeFields.Day, HOURSPERDAY);
-    }
-    while (TimeFields.Day > MonthLengths[IsLeapYear(TimeFields.Year)][TimeFields.Month - 1])
-    {
-        NormalizeTimeFields(&TimeFields.Day, &TimeFields.Month, SECSPERMIN);
-    }
-    while (TimeFields.Month > MONSPERYEAR)
-    {
-        NormalizeTimeFields(&TimeFields.Month, &TimeFields.Year, MONSPERYEAR);
-    }
-    for (CurYear = EPOCHYEAR; CurYear < TimeFields.Year; CurYear++)
-    {
-        rcTime += YearLengths[IsLeapYear(CurYear)];
-    }
-    for (CurMonth = 1; CurMonth < TimeFields.Month; CurMonth++)
-    {
-        rcTime += MonthLengths[IsLeapYear(CurYear)][CurMonth - 1];
-    }
-    rcTime += TimeFields.Day - 1;
-    rcTime *= SECSPERDAY;
-    rcTime += TimeFields.Hour * SECSPERHOUR + TimeFields.Minute * SECSPERMIN + TimeFields.Second;
-
-    rcTime *= TICKSPERSEC;
-    rcTime += TimeFields.Milliseconds * TICKSPERMSEC;
-
-    Time->QuadPart = rcTime;
-
-    return true;
-}
-
-BOOL SystemTimeToFileTime(const SYSTEMTIME* syst, LPFILETIME ft)
-{
-    TIME_FIELDS tf;
-    LARGE_INTEGER t;
-
-    tf.Year = syst->wYear;
-    tf.Month = syst->wMonth;
-    tf.Day = syst->wDay;
-    tf.Hour = syst->wHour;
-    tf.Minute = syst->wMinute;
-    tf.Second = syst->wSecond;
-    tf.Milliseconds = syst->wMilliseconds;
-
-    TimeFieldsToTime(&tf, &t);
-    ft->dwLowDateTime = t.u.LowPart;
-    ft->dwHighDateTime = t.u.HighPart;
-    return TRUE;
-}
-
-void adaptFilenameToLinux(string& rAdjustedFilename)
-{
-    //first replace all \\ by /
-    string::size_type loc = 0;
-    while ((loc = rAdjustedFilename.find("\\", loc)) != string::npos)
-    {
-        rAdjustedFilename.replace(loc, 1, "/");
-    }
-    loc = 0;
-    //remove /./
-    while ((loc = rAdjustedFilename.find("/./", loc)) != string::npos)
-    {
-        rAdjustedFilename.replace(loc, 3, "/");
-    }
-}
-
-void replaceDoublePathFilename(char* szFileName)
-{
-    //replace "\.\" by "\"
-    string s(szFileName);
-    string::size_type loc = 0;
-    //remove /./
-    while ((loc = s.find("/./", loc)) != string::npos)
-    {
-        s.replace(loc, 3, "/");
-    }
-    loc = 0;
-    //remove "\.\"
-    while ((loc = s.find("\\.\\", loc)) != string::npos)
-    {
-        s.replace(loc, 3, "\\");
-    }
-    azstrcpy((char*)szFileName, AZ_MAX_PATH_LEN, s.c_str());
-}
-
-const int comparePathNames(const char* cpFirst, const char* cpSecond, unsigned int len)
-{
-    //create two strings and replace the \\ by / and /./ by /
-    string first(cpFirst);
-    string second(cpSecond);
-    adaptFilenameToLinux(first);
-    adaptFilenameToLinux(second);
-    if (strlen(cpFirst) < len || strlen(cpSecond) < len)
-    {
-        return -1;
-    }
-    unsigned int length = std::min(std::min(first.size(), second.size()), (size_t)len);    //make sure not to access invalid memory
-    return memicmp(first.c_str(), second.c_str(), length);
-}
-
-#if defined(LINUX) || defined(APPLE) || defined(DEFINE_FIX_ONE_PATH_ELEMENT)
-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)))
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_4
-    #include AZ_RESTRICTED_FILE(WinBase_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-threadID GetCurrentThreadId()
-{
-    return threadID(pthread_self());
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-HANDLE CreateEvent
-(
-    LPSECURITY_ATTRIBUTES lpEventAttributes,
-    BOOL bManualReset,
-    BOOL bInitialState,
-    LPCSTR lpName
-)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "CreateEvent not implemented yet");
-    return 0;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-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);
-    }
-
-    return 0;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_5
-    #include AZ_RESTRICTED_FILE(WinBase_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    timeval tv, start, now;
-    uint64 tStart;
-
-    memset(&tv, 0, sizeof tv);
-    memset(&start, 0, sizeof start);
-    memset(&now, 0, sizeof now);
-    gettimeofday(&now, NULL);
-    start = now;
-    tStart = (uint64)start.tv_sec * 1000000 + start.tv_usec;
-    while (true)
-    {
-        uint64 tNow, timePassed, timeRemaining;
-        tNow = (uint64)now.tv_sec * 1000000 + now.tv_usec;
-        timePassed = tNow - tStart;
-        if (timePassed >= dwMilliseconds)
-        {
-            break;
-        }
-        timeRemaining = dwMilliseconds * 1000 - timePassed;
-        tv.tv_sec = timeRemaining / 1000000;
-        tv.tv_usec = timeRemaining % 1000000;
-        select(1, NULL, NULL, NULL, &tv);
-        gettimeofday(&now, NULL);
-    }
-    return 0;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-DWORD SleepEx(DWORD dwMilliseconds, BOOL bAlertable)
-{
-    //TODO: implement
-    //  CRY_ASSERT_MESSAGE(0, "SleepEx not implemented yet");
-    printf("SleepEx not properly implemented yet\n");
-    Sleep(dwMilliseconds);
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-DWORD WaitForSingleObjectEx(HANDLE hHandle, DWORD dwMilliseconds,   BOOL bAlertable)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "WaitForSingleObjectEx not implemented yet");
-    return 0;
-}
-
-#if 0
-//////////////////////////////////////////////////////////////////////////
-DWORD WaitForMultipleObjectsEx(
-    DWORD nCount,
-    const HANDLE* lpHandles,
-    BOOL bWaitAll,
-    DWORD dwMilliseconds,
-    BOOL bAlertable)
-{
-    //TODO: implement
-    return 0;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "WaitForSingleObject not implemented yet");
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-BOOL SetEvent(HANDLE hEvent)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "SetEvent not implemented yet");
-    return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-BOOL ResetEvent(HANDLE hEvent)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "ResetEvent not implemented yet");
-    return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-HANDLE CreateMutex
-(
-    LPSECURITY_ATTRIBUTES lpMutexAttributes,
-    BOOL bInitialOwner,
-    LPCSTR lpName
-)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "CreateMutex not implemented yet");
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-BOOL ReleaseMutex(HANDLE hMutex)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "ReleaseMutex not implemented yet");
-    return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-
-typedef DWORD (* PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
-typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
-
-//////////////////////////////////////////////////////////////////////////
-HANDLE CreateThread
-(
-    LPSECURITY_ATTRIBUTES lpThreadAttributes,
-    SIZE_T dwStackSize,
-    LPTHREAD_START_ROUTINE lpStartAddress,
-    LPVOID lpParameter,
-    DWORD dwCreationFlags,
-    LPDWORD lpThreadId
-)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "CreateThread not implemented yet");
-    return 0;
-}
-
-#if defined(LINUX) || defined(APPLE)
-BOOL GetComputerName(LPSTR lpBuffer, LPDWORD lpnSize)
-{
-    if (!lpBuffer || !lpnSize)
-    {
-        return FALSE;
-    }
-
-    int err = gethostname(lpBuffer, *lpnSize);
-
-    if (-1 == err)
-    {
-        CryLog("GetComputerName falied [%d]\n", errno);
-        return FALSE;
-    }
-    return TRUE;
-}
-#endif
-
-#if AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID
-DWORD GetCurrentProcessId(void)
-{
-    return (DWORD)getpid();
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-void CrySleep(unsigned int dwMilliseconds)
-{
-    Sleep(dwMilliseconds);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryLowLatencySleep(unsigned int dwMilliseconds)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_6
-    #include AZ_RESTRICTED_FILE(WinBase_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    CrySleep(dwMilliseconds);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-int CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType)
-{
-#ifdef WIN32
-#   error WIN32 is defined in WinBase.cpp (it is a non-Windows file)
-#elif defined(MAC)
-    CFStringRef strText = CFStringCreateWithCString(NULL, lpText, kCFStringEncodingMacRoman);
-    CFStringRef strCaption = CFStringCreateWithCString(NULL, lpCaption, kCFStringEncodingMacRoman);
-
-    CFStringRef strOk = CFSTR("OK");
-    CFStringRef strCancel = CFSTR("Cancel");
-    CFStringRef strRetry = CFSTR("Retry");
-    CFStringRef strYes = CFSTR("Yes");
-    CFStringRef strNo = CFSTR("No");
-    CFStringRef strAbort = CFSTR("Abort");
-    CFStringRef strIgnore = CFSTR("Ignore");
-    CFStringRef strTryAgain = CFSTR("Try Again");
-    CFStringRef strContinue = CFSTR("Continue");
-
-    CFStringRef defaultButton = nullptr;
-    CFStringRef alternativeButton = nullptr;
-    CFStringRef otherButton = nullptr;
-
-    switch (uType & 0xf)
-    {
-        case MB_OKCANCEL:
-            defaultButton = strOk;
-            alternativeButton = strCancel;
-            break;
-        case MB_ABORTRETRYIGNORE:
-            defaultButton = strAbort;
-            alternativeButton = strRetry;
-            otherButton = strIgnore;
-            break;
-        case MB_YESNOCANCEL:
-            defaultButton = strYes;
-            alternativeButton = strNo;
-            otherButton = strCancel;
-            break;
-        case MB_YESNO:
-            defaultButton = strYes;
-            alternativeButton = strNo;
-            break;
-        case MB_RETRYCANCEL:
-            defaultButton = strRetry;
-            alternativeButton = strCancel;
-            break;
-        case MB_CANCELTRYCONTINUE:
-            defaultButton = strCancel;
-            alternativeButton = strTryAgain;
-            otherButton = strContinue;
-            break;
-        case MB_OK:
-        default:
-            defaultButton = strOk;
-            break;
-    }
-
-    CFOptionFlags kResult;
-    CFUserNotificationDisplayAlert(
-        0,                                 // no timeout
-        kCFUserNotificationNoteAlertLevel, //change it depending message_type flags ( MB_ICONASTERISK.... etc.)
-        NULL,                              //icon url, use default, you can change it depending message_type flags
-        NULL,                              //not used
-        NULL,                              //localization of strings
-        strText,                           //header text
-        strCaption,                        //message text
-        defaultButton,                     //default "ok" text in button
-        alternativeButton,                 //alternate button title
-        otherButton,                       //other button title, null--> no other button
-        &kResult                           //response flags
-    );
-
-    if (strCaption)
-    {
-        CFRelease(strCaption);
-    }
-    if (strText)
-    {
-        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
-}
-
-//////////////////////////////////////////////////////////////////////////
-short CryGetAsyncKeyState(int vKey)
-{
-    //TODO: implement
-    CRY_ASSERT_MESSAGE(0, "CryGetAsyncKeyState not implemented yet");
-    return 0;
-}
-
-#if defined(LINUX) || defined(APPLE) || defined(DEFINE_CRY_INTERLOCKED_INCREMENT)
-//[K01]: http://www.memoryhole.net/kyle/2007/05/atomic_incrementing.html
-//http://forums.devx.com/archive/index.php/t-160558.html
-//////////////////////////////////////////////////////////////////////////
-DLL_EXPORT LONG  CryInterlockedIncrement(LONG volatile* lpAddend)
-{
-    /*int r;
-    __asm__ __volatile__ (
-        "lock ; xaddl %0, (%1) \n\t"
-        : "=r" (r)
-        : "r" (lpAddend), "0" (1)
-        : "memory"
-    );
-    return (LONG) (r + 1); */// add, since we get the original value back.
-    return __sync_fetch_and_add(lpAddend, 1) + 1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-DLL_EXPORT LONG  CryInterlockedDecrement(LONG volatile* lpAddend)
-{
-    /*int r;
-    __asm__ __volatile__ (
-        "lock ; xaddl %0, (%1) \n\t"
-        : "=r" (r)
-        : "r" (lpAddend), "0" (-1)
-        : "memory"
-    );
-    return (LONG) (r - 1);  */// subtract, since we get the original value back.
-    return __sync_fetch_and_sub(lpAddend, 1) - 1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-DLL_EXPORT LONG      CryInterlockedExchangeAdd(LONG  volatile* lpAddend, LONG  Value)
-{
-    /*  LONG r;
-        __asm__ __volatile__ (
-        #if defined(LINUX64) || defined(APPLE)  // long is 64 bits on amd64.
-            "lock ; xaddq %0, (%1) \n\t"
-        #else
-            "lock ; xaddl %0, (%1) \n\t"
-        #endif
-            : "=r" (r)
-            : "r" (lpAddend), "0" (Value)
-            : "memory"
-        );
-        return r;*/
-    return __sync_fetch_and_add(lpAddend, Value);
-}
-
-DLL_EXPORT LONG     CryInterlockedOr(LONG volatile* Destination, LONG Value)
-{
-    return __sync_fetch_and_or(Destination, Value);
-}
-
-DLL_EXPORT LONG     CryInterlockedCompareExchange(LONG  volatile* dst, LONG  exchange, LONG comperand)
-{
-    return __sync_val_compare_and_swap(dst, comperand, exchange);
-    /*LONG r;
-    __asm__ __volatile__ (
-    #if defined(LINUX64) || defined(APPLE)  // long is 64 bits on amd64.
-        "lock ; cmpxchgq %2, (%1) \n\t"
-    #else
-        "lock ; cmpxchgl %2, (%1) \n\t"
-    #endif
-        : "=a" (r)
-        : "r" (dst), "r" (exchange), "0" (comperand)
-        : "memory"
-    );
-    return r;*/
-}
-
-
-DLL_EXPORT void*     CryInterlockedCompareExchangePointer(void* volatile* dst, void* exchange, void* comperand)
-{
-    return __sync_val_compare_and_swap(dst, comperand, exchange);
-    //return (void*)CryInterlockedCompareExchange((long volatile*)dst, (long)exchange, (long)comperand);
-}
-
-DLL_EXPORT void*     CryInterlockedExchangePointer(void* volatile* dst, void* exchange)
-{
-    __sync_synchronize();
-    return __sync_lock_test_and_set(dst, exchange);
-    //return (void*)CryInterlockedCompareExchange((long volatile*)dst, (long)exchange, (long)comperand);
-}
-
-#if (defined(LINUX64) && !defined(ANDROID)) || defined(MAC) || defined(IOS_SIMULATOR)
-DLL_EXPORT unsigned char _InterlockedCompareExchange128(int64 volatile* dst, int64 exchangehigh, int64 exchangelow, int64* comperand)
-{
-    bool bEquals;
-    __asm__ __volatile__
-    (
-        "lock cmpxchg16b %1\n\t"
-        "setz %0"
-        : "=q" (bEquals), "+m" (*dst), "+d" (comperand[1]), "+a" (comperand[0])
-        : "c" (exchangehigh), "b" (exchangelow)
-        : "cc"
-    );
-    return (char)bEquals;
-}
-#elif defined(INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED)
-    // arm64 processors do not provide a cmpxchg16b (or equivalent) instruction,
-    // so _InterlockedCompareExchange128 is not implemented on arm64 platforms.
-#endif
-
-threadID CryGetCurrentThreadId()
-{
-    return GetCurrentThreadId();
-}
-
-void CryDebugBreak()
-{
-    __builtin_trap();
-}
-#endif//LINUX APPLE
-
-#if defined(APPLE) || defined(LINUX)
-// WinAPI debug functions.
-DLL_EXPORT void OutputDebugString(const char* outputString)
-{
-#if !defined(_RELEASE)
-    // Emulates dev tools output in Xcode and cmd line launch with idevicedebug.
-    fprintf(stdout, "%s", outputString);
-#endif
-}
-
-DLL_EXPORT void DebugBreak()
-{
-    CryDebugBreak();
-}
-
-#endif
-
-// 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_ERRNO_TYPE FS_EINVAL = EINVAL;
-static const FS_DIR_TYPE FS_DIR_NULL = NULL;
-static const unsigned char FS_TYPE_DIRECTORY = DT_DIR;
-
-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
-    printf("CrySetFileAttributes not properly implemented yet\n");
-    return false;
-}
-
-
-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;
-    FS_ERRNO_TYPE fsErr = 0;
-    FS_DIRENT_TYPE dirent;
-    uint64_t direntSize = 0;
-    FS_DIR_TYPE fd = FS_DIR_NULL;
-
-    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.
-    bool found = false;
-    bool skipScan = false;
-
-    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(LPCSTR lpFileName)
-{
-    struct stat fileStats;
-    const int success = stat(lpFileName, &fileStats);
-    if (success == -1)
-    {
-        char adjustedFilename[MAX_PATH];
-        GetFilenameNoCase(lpFileName, 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
-}
-
-uint32 CryGetFileAttributes(const char* lpFileName)
-{
-    
-    string fn = lpFileName;
-    adaptFilenameToLinux(fn);
-    const char* buffer = fn.c_str();
-    return GetFileAttributes(buffer);
-    
-}
-
-__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 // !defined(WIN32)
diff --git a/Code/CryEngine/CryCommon/XMLBinaryHeaders.h b/Code/CryEngine/CryCommon/XMLBinaryHeaders.h
deleted file mode 100644
index 2f5c23b3d2..0000000000
--- a/Code/CryEngine/CryCommon/XMLBinaryHeaders.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_XMLBINARYHEADERS_H
-#define CRYINCLUDE_CRYCOMMON_XMLBINARYHEADERS_H
-#pragma once
-
-
-namespace XMLBinary
-{
-    class IDataWriter
-    {
-    public:
-        virtual ~IDataWriter() {}
-        virtual void Write(const void* pData, size_t size) = 0;
-    };
-
-    class IFilter
-    {
-    public:
-        enum EType
-        {
-            eType_ElementName,
-            eType_AttributeName
-        };
-        virtual ~IFilter() {}
-        virtual bool IsAccepted(EType type, const char* pName) const = 0;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    typedef uint32 NodeIndex;            // note: only uint32 or uint16 are supported
-
-    template<int size>
-    struct Pad
-    {
-        char pad[size];
-    };
-    template<>
-    struct Pad<0> { };
-
-    struct Node
-    {
-        uint32 nTagStringOffset;         // offset in CBinaryXmlData::pStringData
-        uint32 nContentStringOffset;     // offset in CBinaryXmlData::pStringData
-        uint16 nAttributeCount;
-        uint16 nChildCount;
-        NodeIndex nParentIndex;
-        NodeIndex nFirstAttributeIndex;
-        NodeIndex nFirstChildIndex;
-        Pad<sizeof(uint32) - sizeof(NodeIndex)> reserved_for_alignment;
-    };
-
-    struct Attribute
-    {
-        uint32 nKeyStringOffset;         // offset in CBinaryXmlData::pStringData
-        uint32 nValueStringOffset;       // offset in CBinaryXmlData::pStringData
-    };
-
-    struct BinaryFileHeader
-    {
-        char szSignature[8];
-        uint32 nXMLSize;
-        uint32 nNodeTablePosition;
-        uint32 nNodeCount;
-        uint32 nAttributeTablePosition;
-        uint32 nAttributeCount;
-        uint32 nChildTablePosition;
-        uint32 nChildCount;
-        uint32 nStringDataPosition;
-        uint32 nStringDataSize;
-    };
-}
-
-#endif // CRYINCLUDE_CRYCOMMON_XMLBINARYHEADERS_H
diff --git a/Code/CryEngine/CryCommon/crycommon_files.cmake b/Code/CryEngine/CryCommon/crycommon_files.cmake
deleted file mode 100644
index d3c725b7eb..0000000000
--- a/Code/CryEngine/CryCommon/crycommon_files.cmake
+++ /dev/null
@@ -1,271 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    CryCommon.cpp
-    IAudioInterfacesCommonData.h
-    IAudioSystem.h
-    ICmdLine.h
-    IConsole.h
-    IEntityRenderState.h
-    IEntityRenderState_info.cpp
-    IFont.h
-    IFunctorBase.h
-    IGem.h
-    IIndexedMesh.h
-    IIndexedMesh_info.cpp
-    ILevelSystem.h
-    ILocalizationManager.h
-    LocalizationManagerBus.h
-    LocalizationManagerBus.inl
-    ILog.h
-    IMaterial.h
-    IMiniLog.h
-    IMovieSystem.h
-    IPhysics.h
-    IPostEffectGroup.h
-    IProcess.h
-    IReadWriteXMLSink.h
-    IRenderAuxGeom.h
-    IRenderer.h
-    IRenderMesh.h
-    ISerialize.h
-    IShader.h
-    ISplines.h
-    IStatObj.h
-    StatObjBus.h
-    IStereoRenderer.h
-    ISurfaceType.h
-    ISystem.h
-    ITexture.h
-    ITimer.h
-    IValidator.h
-    IViewSystem.h
-    IWindowMessageHandler.h
-    IXml.h
-    MicrophoneBus.h
-    physinterface.h
-    HMDBus.h
-    VRCommon.h
-    StereoRendererBus.h
-    HeightmapUpdateNotificationBus.h
-    INavigationSystem.h
-    IMNM.h
-    SFunctor.h
-    FunctorBaseFunction.h
-    FunctorBaseMember.h
-    stridedptr.h
-    Options.h
-    SerializationTypes.h
-    CryEndian.h
-    CryRandomInternal.h
-    Random.h
-    LCGRandom.h
-    CryTypeInfo.cpp
-    BaseTypes.h
-    CompileTimeAssert.h
-    MemoryAccess.h
-    AnimKey.h
-    BitFiddling.h
-    Common_TypeInfo.cpp
-    CryArray.h
-    CryAssert.h
-    CryCrc32.h
-    CryCustomTypes.h
-    CryFile.h
-    CryFixedString.h
-    CryHeaders.h
-    CryHeaders_info.cpp
-    CryListenerSet.h
-    CryLegacyAllocator.h
-    CryName.h
-    CryPath.h
-    CryPodArray.h
-    CrySizer.h
-    CryString.h
-    CrySystemBus.h
-    CryThread.h
-    CryThreadImpl.h
-    CryTypeInfo.h
-    CryVersion.h
-    FrameProfiler.h
-    HeapAllocator.h
-    LegacyAllocator.h
-    MetaUtils.h
-    MiniQueue.h
-    MultiThread.h
-    MultiThread_Containers.h
-    NullAudioSystem.h
-    PNoise3.h
-    PoolAllocator.h
-    primitives.h
-    ProjectDefines.h
-    Range.h
-    ScopedVariableSetter.h
-    SerializeFwd.h
-    SimpleSerialize.h
-    smartptr.h
-    StlUtils.h
-    StringUtils.h
-    Synchronization.h
-    Tarray.h
-    Timer.h
-    TimeValue.h
-    TimeValue_info.h
-    TypeInfo_decl.h
-    TypeInfo_impl.h
-    UnicodeBinding.h
-    UnicodeEncoding.h
-    UnicodeFunctions.h
-    UnicodeIterator.h
-    VectorMap.h
-    VectorSet.h
-    VertexFormats.h
-    XMLBinaryHeaders.h
-    RenderBus.h
-    MainThreadRenderRequestBus.h
-    Cry_Matrix33.h
-    Cry_Matrix34.h
-    Cry_Matrix44.h
-    Cry_MatrixDiag.h
-    Cry_Vector4.h
-    Cry_Camera.h
-    Cry_Color.h
-    Cry_Geo.h
-    Cry_GeoDistance.h
-    Cry_GeoIntersect.h
-    Cry_GeoOverlap.h
-    Cry_Math.h
-    Cry_Quat.h
-    Cry_ValidNumber.h
-    Cry_Vector2.h
-    Cry_Vector3.h
-    Cry_XOptimise.h
-    CryHalf_info.h
-    CryHalf.inl
-    MathConversion.h
-    Cry_HWMatrix.h
-    Cry_HWVector3.h
-    AndroidSpecific.h
-    AppleSpecific.h
-    CryAssert_Android.h
-    CryAssert_impl.h
-    CryAssert_iOS.h
-    CryAssert_Linux.h
-    CryAssert_Mac.h
-    CryLibrary.cpp
-    CryLibrary.h
-    CryThread_dummy.h
-    CryThread_pthreads.h
-    CryThread_windows.h
-    CryThreadImpl_pthreads.h
-    CryThreadImpl_windows.h
-    CryWindows.h
-    Linux32Specific.h
-    Linux64Specific.h
-    Linux_Win32Wrapper.h
-    LinuxSpecific.h
-    LoadScreenBus.h
-    MacSpecific.h
-    platform.h
-    platform_impl.cpp
-    Win32specific.h
-    Win64specific.h
-    LyShine/IDraw2d.h
-    LyShine/ILyShine.h
-    LyShine/ISprite.h
-    LyShine/IRenderGraph.h
-    LyShine/UiAssetTypes.h
-    LyShine/UiComponentTypes.h
-    LyShine/UiBase.h
-    LyShine/UiEntityContext.h
-    LyShine/UiLayoutCellBase.h
-    LyShine/UiSerializeHelpers.h
-    LyShine/Animation/IUiAnimation.h
-    LyShine/Bus/UiAnimateEntityBus.h
-    LyShine/Bus/UiAnimationBus.h
-    LyShine/Bus/UiButtonBus.h
-    LyShine/Bus/UiCanvasBus.h
-    LyShine/Bus/UiCanvasManagerBus.h
-    LyShine/Bus/UiCanvasUpdateNotificationBus.h
-    LyShine/Bus/UiCheckboxBus.h
-    LyShine/Bus/UiCursorBus.h
-    LyShine/Bus/UiDraggableBus.h
-    LyShine/Bus/UiDropdownBus.h
-    LyShine/Bus/UiDropdownOptionBus.h
-    LyShine/Bus/UiDropTargetBus.h
-    LyShine/Bus/UiDynamicLayoutBus.h
-    LyShine/Bus/UiDynamicScrollBoxBus.h
-    LyShine/Bus/UiEditorBus.h
-    LyShine/Bus/UiEditorCanvasBus.h
-    LyShine/Bus/UiEditorChangeNotificationBus.h
-    LyShine/Bus/UiElementBus.h
-    LyShine/Bus/UiEntityContextBus.h
-    LyShine/Bus/UiFaderBus.h
-    LyShine/Bus/UiFlipbookAnimationBus.h
-    LyShine/Bus/UiGameEntityContextBus.h
-    LyShine/Bus/UiImageBus.h
-    LyShine/Bus/UiImageSequenceBus.h
-    LyShine/Bus/UiIndexableImageBus.h
-    LyShine/Bus/UiInitializationBus.h
-    LyShine/Bus/UiInteractableActionsBus.h
-    LyShine/Bus/UiInteractableBus.h
-    LyShine/Bus/UiInteractableStatesBus.h
-    LyShine/Bus/UiInteractionMaskBus.h
-    LyShine/Bus/UiLayoutBus.h
-    LyShine/Bus/UiLayoutCellBus.h
-    LyShine/Bus/UiLayoutCellDefaultBus.h
-    LyShine/Bus/UiLayoutColumnBus.h
-    LyShine/Bus/UiLayoutControllerBus.h
-    LyShine/Bus/UiLayoutFitterBus.h
-    LyShine/Bus/UiLayoutGridBus.h
-    LyShine/Bus/UiLayoutManagerBus.h
-    LyShine/Bus/UiLayoutRowBus.h
-    LyShine/Bus/UiMarkupButtonBus.h
-    LyShine/Bus/UiMaskBus.h
-    LyShine/Bus/UiNavigationBus.h
-    LyShine/Bus/UiParticleEmitterBus.h
-    LyShine/Bus/UiRadioButtonBus.h
-    LyShine/Bus/UiRadioButtonCommunicationBus.h
-    LyShine/Bus/UiRadioButtonGroupBus.h
-    LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
-    LyShine/Bus/UiRenderBus.h
-    LyShine/Bus/UiRenderControlBus.h
-    LyShine/Bus/UiScrollableBus.h
-    LyShine/Bus/UiScrollBarBus.h
-    LyShine/Bus/UiScrollBoxBus.h
-    LyShine/Bus/UiScrollerBus.h
-    LyShine/Bus/UiSliderBus.h
-    LyShine/Bus/UiSpawnerBus.h
-    LyShine/Bus/UiSystemBus.h
-    LyShine/Bus/UiTextBus.h
-    LyShine/Bus/UiTextInputBus.h
-    LyShine/Bus/UiTooltipBus.h
-    LyShine/Bus/UiTooltipDataPopulatorBus.h
-    LyShine/Bus/UiTooltipDisplayBus.h
-    LyShine/Bus/UiTransform2dBus.h
-    LyShine/Bus/UiTransformBus.h
-    LyShine/Bus/UiVisualBus.h
-    LyShine/Bus/Sprite/UiSpriteBus.h
-    LyShine/Bus/World/UiCanvasOnMeshBus.h
-    LyShine/Bus/World/UiCanvasRefBus.h
-    LyShine/Bus/Tools/UiSystemToolsBus.h
-    Maestro/Bus/EditorSequenceAgentComponentBus.h
-    Maestro/Bus/EditorSequenceBus.h
-    Maestro/Bus/EditorSequenceComponentBus.h
-    Maestro/Bus/SequenceComponentBus.h
-    Maestro/Bus/SequenceAgentComponentBus.h
-    Maestro/Types/AnimNodeType.h
-    Maestro/Types/AnimParamType.h
-    Maestro/Types/AnimValue.h
-    Maestro/Types/AnimValueType.h
-    Maestro/Types/AssetBlendKey.h
-    Maestro/Types/AssetBlends.h
-    Maestro/Types/SequenceType.h
-    StaticInstance.h
-    WinBase.cpp
-)
diff --git a/Code/CryEngine/CryCommon/crycommon_testing_files.cmake b/Code/CryEngine/CryCommon/crycommon_testing_files.cmake
deleted file mode 100644
index 5e7177b07f..0000000000
--- a/Code/CryEngine/CryCommon/crycommon_testing_files.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Mocks/IAudioSystemMock.h
-    Mocks/IConsoleMock.h
-    Mocks/ICryPakMock.h
-    Mocks/ILogMock.h
-    Mocks/ISystemMock.h
-    Mocks/ITimerMock.h
-    Mocks/ICVarMock.h
-    Mocks/IRendererMock.h
-    Mocks/ITextureMock.h
-    Mocks/IRemoteConsoleMock.h
-)
diff --git a/Code/CryEngine/CryCommon/iOSSpecific.h b/Code/CryEngine/CryCommon/iOSSpecific.h
deleted file mode 100644
index 35fa769388..0000000000
--- a/Code/CryEngine/CryCommon/iOSSpecific.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : iOS specific declarations
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IOSSPECIFIC_H
-#define CRYINCLUDE_CRYCOMMON_IOSSPECIFIC_H
-#pragma once
-
-
-#include "AppleSpecific.h"
-#include <float.h>
-#include <TargetConditionals.h>
-
-#if TARGET_IPHONE_SIMULATOR
-#define IOS_SIMULATOR
-#include <xmmintrin.h>
-#define _CPU_AMD64
-#define _CPU_SSE
-#else
-#define _CPU_ARM
-#define _CPU_NEON
-#endif
-
-// detect 64bit iOS
-#if defined(__LP64__)
-#define PLATFORM_64BIT
-#endif
-
-#if defined(_CPU_ARM) && defined(PLATFORM_64BIT)
-#   define INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED
-#endif // defined(_CPU_ARM) && defined(PLATFORM_64BIT)
-
-#ifndef MOBILE
-#define MOBILE
-#endif
-
-// stubs for virtual keys, isn't used on iOS
-#define VK_UP               0
-#define VK_DOWN         0
-#define VK_RIGHT        0
-#define VK_LEFT         0
-#define VK_CONTROL  0
-#define VK_SCROLL       0
-
-
-//#define USE_CRT 1
-#if !defined(PLATFORM_64BIT)
-#error "IOS build only supports the 64bit architecture"
-#else
-#define SIZEOF_PTR 8
-typedef uint64_t threadID;
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_IOSSPECIFIC_H
diff --git a/Code/CryEngine/CryCommon/physinterface.h b/Code/CryEngine/CryCommon/physinterface.h
deleted file mode 100644
index 873c72cb4b..0000000000
--- a/Code/CryEngine/CryCommon/physinterface.h
+++ /dev/null
@@ -1,3676 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : declarations of all physics interfaces and structures
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_PHYSINTERFACE_H
-#define CRYINCLUDE_CRYCOMMON_PHYSINTERFACE_H
-#pragma once
-
-
-#include <SerializeFwd.h>
-
-#include "Cry_Geo.h"
-#include "stridedptr.h"
-#include "primitives.h"
-#ifdef NEED_ENDIAN_SWAP
-    #include "CryEndian.h"
-#endif
-
-#include <ISystem.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Physics defines.
-//////////////////////////////////////////////////////////////////////////
-
-enum EPE_Params
-{
-    ePE_params_pos = 0,
-    ePE_player_dimensions = 1,
-    ePE_params_car = 2,
-    ePE_params_particle = 3,
-    ePE_player_dynamics = 4,
-    ePE_params_joint = 5,
-    ePE_params_part = 6,
-    ePE_params_sensors = 7,
-    ePE_params_articulated_body = 8,
-    ePE_params_outer_entity = 9,
-    ePE_simulation_params = 10,
-    ePE_params_foreign_data = 11,
-    ePE_params_buoyancy = 12,
-    ePE_params_rope = 13,
-    ePE_params_bbox = 14,
-    ePE_params_flags = 15,
-    ePE_params_wheel = 16,
-    ePE_params_softbody = 17,
-    ePE_params_area = 18,
-    ePE_tetrlattice_params = 19,
-    ePE_params_ground_plane = 20,
-    ePE_params_structural_joint = 21,
-    ePE_params_waterman = 22,
-    ePE_params_timeout = 23,
-    ePE_params_skeleton = 24,
-    ePE_params_structural_initial_velocity = 25,
-    ePE_params_collision_class  = 26,
-
-    ePE_Params_Count
-};
-
-enum EPE_Action
-{
-    ePE_action_move = 1,
-    ePE_action_impulse = 2,
-    ePE_action_drive = 3,
-    ePE_action_reset = 4,
-    ePE_action_add_constraint = 5,
-    ePE_action_update_constraint = 6,
-    ePE_action_register_coll_event = 7,
-    ePE_action_awake = 8,
-    ePE_action_remove_all_parts = 9,
-    ePE_action_set_velocity = 10,
-    ePE_action_attach_points = 11,
-    ePE_action_target_vtx = 12,
-    ePE_action_reset_part_mtx = 13,
-    ePE_action_notify = 14,
-    ePE_action_auto_part_detachment = 15,
-    ePE_action_move_parts = 16,
-    ePE_action_batch_parts_update = 17,
-    ePE_action_slice = 18,
-    pPE_action_syncliving = 19,
-
-    ePE_Action_Count
-};
-
-enum EPE_GeomParams
-{
-    ePE_geomparams = 0,
-    ePE_cargeomparams = 1,
-    ePE_articgeomparams = 2,
-
-    ePE_GeomParams_Count
-};
-
-enum EPE_Status
-{
-    ePE_status_pos = 1,
-    ePE_status_living = 2,
-    ePE_status_vehicle = 4,
-    ePE_status_wheel = 5,
-    ePE_status_joint = 6,
-    ePE_status_awake = 7,
-    ePE_status_dynamics = 8,
-    ePE_status_collisions = 9,
-    ePE_status_id = 10,
-    ePE_status_timeslices = 11,
-    ePE_status_nparts = 12,
-    ePE_status_contains_point = 13,
-    ePE_status_rope = 14,
-    ePE_status_vehicle_abilities = 15,
-    ePE_status_placeholder = 16,
-    ePE_status_softvtx = 17,
-    ePE_status_sensors = 18,
-    ePE_status_sample_contact_area = 19,
-    ePE_status_caps = 20,
-    ePE_status_check_stance = 21,
-    ePE_status_waterman = 22,
-    ePE_status_area = 23,
-    ePE_status_extent = 24,
-    ePE_status_random = 25,
-    ePE_status_constraint = 26,
-    ePE_status_netpos = 27,
-
-    ePE_Status_Count
-};
-
-enum pe_type
-{
-    PE_NONE = 0, PE_STATIC = 1, PE_RIGID = 2, PE_WHEELEDVEHICLE = 3, PE_LIVING = 4, PE_PARTICLE = 5, PE_ARTICULATED = 6, PE_ROPE = 7, PE_SOFT = 8, PE_AREA = 9
-};
-enum sim_class
-{
-    SC_STATIC = 0, SC_SLEEPING_RIGID = 1, SC_ACTIVE_RIGID = 2, SC_LIVING = 3, SC_INDEPENDENT = 4, SC_TRIGGER = 6, SC_DELETED = 7
-};
-struct IGeometry;
-struct IPhysicalEntity;
-struct IGeomManager;
-struct IPhysRenderer;
-class ICrySizer;
-struct IDeferredPhysicsEvent;
-struct ILog;
-IPhysicalEntity* const WORLD_ENTITY = (IPhysicalEntity*)-10;
-
-#ifndef USE_IMPROVED_RIGID_ENTITY_SYNCHRONISATION
-#   define USE_IMPROVED_RIGID_ENTITY_SYNCHRONISATION 1
-#endif
-
-/**
- * 64-bit wrapper for foreign data on physical entities.
- * Int and pointer values are regularly stored in foreign data, but we now also support
- * 64-bit unsigned integers (AZ::EntityId).
- * - Supports implicit two-way conversion as integer, pointer, int, or 64-bit unsigned integer.
- * - Supports casting to typed pointers for compatibility with original void* foreign data.
- */
-class PhysicsForeignData final
-{
-public:
-
-    PhysicsForeignData()
-        : m_data(0) {}
-
-    /// Explicit or implicit creation from pointer, int, or unsigned int types.
-    PhysicsForeignData(void* data)
-        : m_data(reinterpret_cast<uint64>(data)) {}
-    PhysicsForeignData(int data)
-        : m_data(static_cast<uint64>(data)) {}
-    PhysicsForeignData(uint64 data)
-        : m_data(static_cast<uint64>(data)) {}
-
-    /// Comparison operators.
-    bool operator==(const PhysicsForeignData& rhs) const
-    {
-        return m_data == rhs.m_data;
-    }
-
-    bool operator!=(const PhysicsForeignData& rhs) const
-    {
-        return m_data != rhs.m_data;
-    }
-
-    template<typename T>
-    bool operator==(T* data) const
-    {
-        return reinterpret_cast<T*>(m_data) == data;
-    }
-
-    template<typename T>
-    bool operator==(const T* data) const
-    {
-        return reinterpret_cast<const T*>(m_data) == data;
-    }
-
-    bool operator==(int data) const
-    {
-        return static_cast<int>(m_data) == data;
-    }
-
-    bool operator==(uint64 data) const
-    {
-        return m_data == data;
-    }
-
-    /// Using CryPhysics' existing pattern for marking fields as unused.
-    void MarkUnused()
-    {
-        m_data = uint64(1 << 31);
-    }
-
-    bool IsUnused() const
-    {
-        return m_data == uint64(1 << 31);
-    }
-
-    /// Bool operator for: if (foreignData)
-    operator bool() const
-    {
-        return m_data != 0;
-    }
-
-    /// Void* cast conversion
-    operator void*() const
-    {
-        return reinterpret_cast<void*>(m_data);
-    }
-
-    /// int cast conversion
-    operator int() const
-    {
-        return static_cast<int>(m_data);
-    }
-
-    /// 64-bit unsigned int cast conversion
-    operator uint64() const
-    {
-        return m_data;
-    }
-
-    /// Cast conversion to pointers or arbitrary types.
-    template<typename T>
-    operator T*() const
-    {
-        return reinterpret_cast<T*>(m_data);
-    }
-
-private:
-
-    uint64 m_data;  ///< Underlying 64-bit storage.
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////// IPhysicsStreamer Interface /////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-// this is a callback interface for on-demand physicalization, physics gets a pointer to an implementation
-struct IPhysicsStreamer
-{
-    // <interfuscator:shuffle>
-    virtual ~IPhysicsStreamer(){}
-    // called whenever a placeholder (created through CreatePhysicalPlaceholder) requests a full entity
-    virtual int CreatePhysicalEntity(PhysicsForeignData foreignData, int iForeignData, int iForeignFlags) = 0;
-    // called whenever a placeholder-owned entity expires
-    virtual int DestroyPhysicalEntity(IPhysicalEntity* pent) = 0;
-    // called when on-demand entities in a box need to be physicalized
-    // (the grid is activated once RegisterBBoxInPODGrid is called)
-    virtual int CreatePhysicalEntitiesInBox(const Vec3& boxMin, const Vec3& boxMax) = 0;
-    // called when on-demand physicalized box expires.
-    // the streamer is expected to delete those that have a 0 refcounter, and keep the rest
-    virtual int DestroyPhysicalEntitiesInBox(const Vec3& boxMin, const Vec3& boxMax) = 0;
-    // </interfuscator:shuffle>
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////// IPhysRenderer Interface /////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-// this is a callback interface for debug rendering, physics gets a pointer to an implementation
-struct IPhysRenderer
-{
-    // <interfuscator:shuffle>
-    virtual ~IPhysRenderer(){}
-    // draws helpers for the specified geometry (idxColor is in 0..7 range)
-    virtual void DrawGeometry(IGeometry* pGeom, struct geom_world_data* pgwd, int idxColor = 0, int bSlowFadein = 0, const Vec3& sweepDir = Vec3(0)) = 0;
-    // draws a line for wireframe helpers
-    virtual void DrawLine(const Vec3& pt0, const Vec3& pt1, int idxColor = 0, int bSlowFadein = 0) = 0;
-    // gets a descriptive name of the phys entity's owner (used solely for debug output)
-    virtual const char* GetForeignName(PhysicsForeignData foreignData, int iForeignData, int iForeignFlags) = 0;
-    // draws a text line (stauration is 0..1 and is currently used to represent stress level on a breakable joint)
-    virtual void DrawText(const Vec3& pt, const char* txt, int idxColor, float saturation = 0) = 0;
-    // sets an offset that is to be added to all subsequent draw requests
-    virtual Vec3 SetOffset(const Vec3& offs = Vec3(ZERO)) = 0;
-    // draw a frame or a partial frame using a scale for the axes.
-    // pnt is the world space position
-    // axes are the 3 axes normalized
-    // scale is a scale applied on the axes
-    // limits are the x, y, z radians for the Y, Z, X plane. If the pointer is not null, limits will be drawn in form of arcs.
-    // bitfield for what axes are locked
-    virtual void DrawFrame(const Vec3& pnt, const Vec3* axes, const float scale, const Vec3* limits, const int axes_locked) = 0;
-    // </interfuscator:shuffle>
-};
-
-class CMemStream
-{ // For "fastload" serialization
-public:
-
-    ILINE CMemStream(bool swap)
-    {
-        Prealloc();
-        m_iPos = 0;
-        bDeleteBuf = true;
-        bSwapEndian = swap;
-        bMeasureOnly = 0;
-    }
-
-    ILINE CMemStream(void* pbuf, int sz, bool swap)
-    {
-        m_pBuf = (char*)pbuf;
-        m_nSize = sz;
-        m_iPos = 0;
-        bDeleteBuf = false;
-        bSwapEndian = swap;
-        bMeasureOnly = 0;
-    }
-    ILINE CMemStream()
-    {
-        m_pBuf = (char*)m_dummyBuf;
-        m_iPos = 0;
-        m_nSize = 0;
-        bDeleteBuf = false;
-        bSwapEndian = false;
-        bMeasureOnly = -1;
-    }
-
-    virtual ~CMemStream()
-    {
-        if (bDeleteBuf)
-        {
-            CryModuleFree(m_pBuf);
-        }
-    }
-    virtual void Prealloc()
-    {
-        m_pBuf = (char*)CryModuleMalloc(m_nSize = 0x1000);
-    }
-
-    ILINE void* GetBuf() { return m_pBuf; }
-    ILINE int GetUsedSize() { return m_iPos; }
-    ILINE int GetAllocatedSize() { return m_nSize; }
-
-    template<class ftype>
-    ILINE void Write(const ftype& op) { Write(&op, sizeof(op)); }
-    ILINE void Write(const void* pbuf, int sz)
-    {
-#if defined(MEMSTREAM_DEBUG)
-        if (bMeasureOnly <= 0 && m_nSize && m_iPos + sz > m_nSize)
-        {
-            printf("overflow: %d + %d >= %d\n", m_iPos, sz, m_nSize);
-        }
-#endif
-        if (!bMeasureOnly)
-        {
-            if (m_iPos + sz > m_nSize)
-            {
-                GrowBuf(sz);
-            }
-            memcpy(m_pBuf + m_iPos, pbuf, (unsigned int)sz);
-        }
-        m_iPos += sz;
-    }
-
-    virtual void GrowBuf(int sz)
-    {
-        int prevsz = m_nSize;
-        char* prevbuf = m_pBuf;
-        m_pBuf = (char*)CryModuleMalloc(m_nSize = (m_iPos + sz - 1 & ~0xFFF) + 0x1000);
-        memcpy(m_pBuf, prevbuf, (unsigned int)prevsz);
-        CryModuleFree(prevbuf);
-    }
-
-    template<class ftype>
-    ILINE void Read(ftype& op)
-    {
-        ReadRaw(&op, sizeof(op));
-#if defined (NEED_ENDIAN_SWAP)
-        if (bSwapEndian)
-        {
-            SwapEndian(op);
-        }
-#endif
-    }
-
-    template<class ftype>
-    ILINE ftype Read()
-    {
-        ftype val;
-        Read(val);
-        return val;
-    }
-    template<class ftype>
-    ILINE void ReadType(ftype* op, int count = 1)
-    {
-        ReadRaw(op, sizeof(*op) * count);
-#if defined (NEED_ENDIAN_SWAP)
-        if (bSwapEndian)
-        {
-            while (count-- > 0)
-            {
-                SwapEndian(*op++);
-            }
-        }
-#endif
-    }
-    ILINE void ReadRaw(void* pbuf, int sz)
-    {
-#if defined(MEMSTREAM_DEBUG)
-        if (bMeasureOnly <= 0 && m_nSize && m_iPos + sz > m_nSize)
-        {
-            printf("overflow: %d + %d >= %d\n", m_iPos, sz, m_nSize);
-        }
-#endif
-        memcpy(pbuf, (m_pBuf + m_iPos), (unsigned int)sz);
-        m_iPos += sz;
-    }
-
-    char* m_pBuf, m_dummyBuf[4];
-    int m_iPos, m_nSize;
-    bool bDeleteBuf;
-    bool bSwapEndian;
-    int bMeasureOnly;
-};
-
-
-// Workaround for bug in GCC 4.8. The kind of access patterns here leads to an internal
-// compiler error in GCC 4.8 when optimizing with debug symbols. Two possible solutions
-// are available, compile in Profile mode without debug symbols or remove optimizations
-// in the code where the bug occurs
-// see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59776
-#if defined(_PROFILE) && !defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
-// Cannot use #pragma GCC optimize("O0") because it causes a system crash when using
-// the gcc compiler for another platform
-#define CRY_GCC48_AVOID_OPTIMIZE __attribute__((optimize("-O0")))
-#else
-#define CRY_GCC48_AVOID_OPTIMIZE
-#endif
-// unused_marker deliberately fills a variable with invalid data,
-// so that later is_unused() can check whether it was initialized
-// (this is used in all physics params/status/action structures)
-class unused_marker
-{
-public:
-    union f2i
-    {
-        float f;
-        uint32 i;
-    };
-    union d2i
-    {
-        double d;
-        uint32 i[2];
-    };
-    unused_marker() {}
-    unused_marker& operator,(float& x) CRY_GCC48_AVOID_OPTIMIZE;
-    unused_marker& operator,(double& x) CRY_GCC48_AVOID_OPTIMIZE;
-    unused_marker& operator,(int& x) CRY_GCC48_AVOID_OPTIMIZE;
-    unused_marker& operator,(unsigned int& x) CRY_GCC48_AVOID_OPTIMIZE;
-    unused_marker& operator,(PhysicsForeignData& x) CRY_GCC48_AVOID_OPTIMIZE;
-    template<class ref>
-    unused_marker& operator,(ref*& x) { x = (ref*)-1; return *this; }
-    template<class F>
-    unused_marker& operator,(Vec3_tpl<F>& x) { return *this, x.x; }
-    template<class F>
-    unused_marker& operator,(Quat_tpl<F>& x) { return *this, x.w; }
-    template<class F>
-    unused_marker& operator,(strided_pointer<F>& x) { return *this, x.data; }
-};
-inline unused_marker& unused_marker::operator,(float& x) { *alias_cast<int*>(&x) = 0xFFBFFFFF; return *this; }
-inline unused_marker& unused_marker::operator,(double& x) { (alias_cast<int*>(&x))[false ? 1 : 0] = 0xFFF7FFFF; return *this; }
-inline unused_marker& unused_marker::operator,(int& x) { x = 1 << 31; return *this; }
-inline unused_marker& unused_marker::operator,(unsigned int& x) { x = 1u << 31; return *this; }
-inline unused_marker& unused_marker::operator,(PhysicsForeignData& x) { x.MarkUnused(); return *this; }
-
-#undef CRY_GCC48_AVOID_OPTIMIZE
-
-inline bool is_unused(const float& x) { unused_marker::f2i u; u.f = x; return (u.i & 0xFFA00000) == 0xFFA00000; }
-
-inline bool is_unused(int x) { return x == 1 << 31; }
-inline bool is_unused(unsigned int x) { return x == 1u << 31; }
-inline bool is_unused(const PhysicsForeignData& x) { return x.IsUnused(); }
-template<class ref>
-bool is_unused(ref* x) { return x == (ref*)-1; }
-template<class ref>
-bool is_unused(strided_pointer<ref> x) { return is_unused(x.data); }
-template<class F>
-bool is_unused(const Ang3_tpl<F>& x) { return is_unused(x.x); }
-template<class F>
-bool is_unused(const Vec3_tpl<F>& x) { return is_unused(x.x); }
-template<class F>
-bool is_unused(const Quat_tpl<F>& x) { return is_unused(x.w); }
-inline bool is_unused(const double& x) { unused_marker::d2i u; u.d = x; return (u.i[eLittleEndian ? 1 : 0] & 0xFFF40000) == 0xFFF40000; }
-#define MARK_UNUSED unused_marker(),
-
-
-// validators do nothing in the interface, but inside the physics they are redefined
-// so that they check the input for consistency and report errors
-#if !defined(VALIDATOR_LOG)
-#define VALIDATOR_LOG(pLog, str)
-#define VALIDATORS_START
-#define VALIDATOR(member)
-#define VALIDATOR_NORM(member)
-#define VALIDATOR_NORM_MSG(member, msg, member1)
-#define VALIDATOR_RANGE(member, minval, maxval)
-#define VALIDATOR_RANGE2(member, minval, maxval)
-#define VALIDATORS_END
-#endif
-
-
-
-////////// physics entity collision filtering class enums /////////////////
-
-enum pe_collision_class
-{
-    /// reserved basic collision classes
-    collision_class_terrain = 1 << 0,
-    collision_class_wheeled = 1 << 1,
-    collision_class_living = 1 << 2,
-    collision_class_articulated = 1 << 3,
-    collision_class_soft = 1 << 4,
-    collision_class_rope = 1 << 5,
-    collision_class_particle = 1 << 6,
-    // begin game specific ones from this enum
-    collision_class_game = 1 << 10,
-};
-
-struct SCollisionClass
-{
-    uint32 type;     // collision_class flags to identify the enity
-    uint32 ignore;   // another entity will be ignored if *any* of these bits are set in its type
-
-    SCollisionClass() {}
-
-    SCollisionClass(uint32 t, uint32 i)
-    {
-        type = t;
-        ignore = i;
-    }
-};
-
-ILINE int IgnoreCollision(const SCollisionClass& a, const SCollisionClass& b)
-{
-    return (a.type & b.ignore) | (b.type & a.ignore);
-}
-
-
-
-// in physics interface [almost] all parameters are passed via structures
-// this allows having stable interface methods and flexible default arguments system
-
-////////////////////////// Params structures /////////////////////
-
-////////// common params
-struct pe_params
-{
-    int type;
-};
-
-struct pe_params_pos
-    : pe_params                    //   Sets position and orientation of entity
-{
-    enum entype
-    {
-        type_id = ePE_params_pos
-    };
-    pe_params_pos()
-    {
-        type = type_id;
-        MARK_UNUSED pos, scale, q, iSimClass;
-        pMtx3x4 = 0;
-        pMtx3x3 = 0;
-        bRecalcBounds = 1;
-        bEntGridUseOBB = 0;
-    }
-
-    Vec3 pos;
-    quaternionf q;
-    float scale; // note that since there's no per-entity scale, it gets 'baked' into individual parts' scales
-    Matrix34* pMtx3x4; // optional position+orientation
-    Matrix33* pMtx3x3;  // optional orientation via 3x3 matrix
-    int iSimClass; // see the sim_class enum
-    int bRecalcBounds; // tells to recompute the bounding boxes
-    bool bEntGridUseOBB; // whether or not to use part OBBs rather than object AABB when registering in the entity grid
-
-    VALIDATORS_START
-        VALIDATOR(pos)
-        VALIDATOR_NORM_MSG(q, "(perhaps non-uniform scaling was used?)", pos)
-        VALIDATOR(scale)
-    VALIDATORS_END
-};
-
-struct pe_params_bbox
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_bbox
-    };
-    pe_params_bbox() { type = type_id; MARK_UNUSED BBox[0], BBox[1]; }
-    Vec3 BBox[2]; // force this bounding box (note that if the entity recomputes it later, it'll override this)
-
-    VALIDATORS_START
-        VALIDATOR(BBox[0])
-        VALIDATOR(BBox[1])
-    VALIDATORS_END
-};
-
-struct pe_params_outer_entity
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_outer_entity
-    };
-    pe_params_outer_entity() { type = type_id; pOuterEntity = 0; pBoundingGeometry = 0; }
-
-    IPhysicalEntity* pOuterEntity; //   outer entity is used to group together SC_INDEPENDENT entities (example: ropes on a tree trunk)
-    IGeometry* pBoundingGeometry;   // optional geometry to test containment (used in pe_status_contains_point)
-};
-
-struct ITetrLattice;
-
-struct pe_params_part
-    : pe_params                     // Sets geometrical parameters of entity part
-{
-    enum entype
-    {
-        type_id = ePE_params_part
-    };
-    pe_params_part()
-    {
-        type = type_id;
-        MARK_UNUSED pos, q, scale, partid, ipart, mass, density, pPhysGeom, pPhysGeomProxy, idmatBreakable, pLattice, pMatMapping, minContactDist, flagsCond, idSkeleton, invTimeStep, idParent;
-        pMtx3x4 = 0;
-        pMtx3x3 = 0;
-        bRecalcBBox = 1;
-        bAddrefGeoms = 0;
-        flagsOR = flagsColliderOR = 0;
-        flagsAND = flagsColliderAND = (unsigned)-1;
-    }
-
-    int partid; // partid identifier of part
-    int ipart; // optionally, internal part slot number
-    int bRecalcBBox; // whether entity's bounding box should be recalculated
-    Vec3 pos;
-    quaternionf q;
-    float scale;
-    Matrix34* pMtx3x4; // optional position+orientation
-    Matrix33* pMtx3x3; // optional orientation via 3x3 matrix
-    unsigned int flagsCond; // if partid and ipart are not specified, check for parts with flagsCond set
-    unsigned int flagsOR, flagsAND; // new flags = (flags & flagsAND) | flagsOR
-    unsigned int flagsColliderOR, flagsColliderAND;
-    float mass; // either mass of density should be set; mass = density*volume
-    float density;
-    float minContactDist; // threshold for contact points generation
-    struct phys_geometry* pPhysGeom, * pPhysGeomProxy; // if present and different from pPhysGeomProxy, pPhysGeom is used for raytracing
-    int idmatBreakable; // if >=0, the part is procedurally breakable with this mat_id (see AddExplosionShape)
-    ITetrLattice* pLattice; // lattice is used for soft bodies and procedural structural breaking
-    int idSkeleton; // part with this id becomes this part's deformation skeleton
-    int* pMatMapping;   // material mapping table for this part
-    int nMats; // number of pMatMapping entries
-    float invTimeStep; // 1.0f/time_step, ragdolls will compute joint's velocity if this and position is set
-    int bAddrefGeoms;   // AddRef returned geometries if used in GetParams
-    int idParent; // parent for hierarchical breaking; it hides all children until at least one of them breaks off
-
-    VALIDATORS_START
-        VALIDATOR(pos)
-        VALIDATOR_NORM_MSG(q, "(perhaps non-uniform scaling was used in the asset?)", pt)
-        VALIDATOR(scale)
-    VALIDATORS_END
-};
-
-struct pe_params_sensors
-    : pe_params                        // Attaches optional ray sensors to an entity; only living entities support it
-{
-    enum entype
-    {
-        type_id = ePE_params_sensors
-    };
-    pe_params_sensors() { type = type_id; nSensors = 0; pOrigins = 0; pDirections = 0; }
-
-    int nSensors;   // nSensors number of sensors
-    const Vec3* pOrigins; // pOrigins sensors origins in entity CS
-    const Vec3* pDirections;    // pDirections sensors directions (dir*ray length) in entity CS
-};
-
-struct pe_simulation_params
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_simulation_params
-    };
-    pe_simulation_params()
-    {
-        type = type_id;
-        MARK_UNUSED maxTimeStep, gravity, minEnergy, damping, iSimClass,
-                    dampingFreefall, gravityFreefall, mass, density, maxLoggedCollisions, maxRotVel, disablePreCG, maxFriction, collTypes;
-    }
-
-    int iSimClass;
-    float maxTimeStep; // maximum time step that entity can accept (larger steps will be split)
-    float minEnergy; // minimun of kinetic energy below which entity falls asleep (divided by mass)
-    float damping; // damped velocity = oridinal velocity * (1 - damping*time interval)
-    Vec3 gravity;   // per-entity gravity (note that if there are any phys areas with gravity, they will override it unless pef_ignore_areas is set
-    float dampingFreefall; // damping and gravity used when there are no collisions,
-    Vec3 gravityFreefall; // NOTE: if left unused, gravity value will be substituted (if provided)
-    float maxRotVel; // rotational velocity is clamped to this value
-    float mass; // either mass of density should be set; mass = density*volume
-    float density;
-    int maxLoggedCollisions; // maximum EventPhysCollisions reported per frame (only supported by rigid bodies/ragdolls/vehicles)
-    int disablePreCG; // disables Pre-CG solver for the group this body is in (recommended for balls)
-    float maxFriction; // sets upper friction limit for this object and all objects it's currently in contact with
-    int collTypes; // collision types (a combination of ent_xxx flags)
-};
-
-struct pe_params_foreign_data
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_foreign_data
-    };
-    pe_params_foreign_data() { type = type_id; MARK_UNUSED pForeignData, iForeignData, iForeignFlags; iForeignFlagsAND = -1; iForeignFlagsOR = 0; }
-
-    PhysicsForeignData pForeignData; // foreign data is an arbitrary pointer used to associate physical entity with its owner object
-    int iForeignData; // foreign data types (defined in IPhysics.h)
-    int iForeignFlags; // any flags the owner wants to store
-    int iForeignFlagsAND, iForeignFlagsOR; // when setting, flagsNew = flags & flagsAND | flagsOR
-};
-
-struct pe_params_buoyancy
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_buoyancy
-    };
-    pe_params_buoyancy()
-    {
-        type = type_id;
-        iMedium = 0;
-        MARK_UNUSED waterDensity, kwaterDensity, waterDamping,
-                    waterPlane.n, waterPlane.origin, waterEmin, waterResistance, kwaterResistance, waterFlow, flowVariance;
-    };
-
-    float waterDensity; // overrides water density from the current water volume for an entity; sets for water areas
-    float kwaterDensity; // scales water density from the current water volume (used for entities only)
-    // NOTE: for entities , waterDensity override is stored as kwaterDensity relative to the global area's density
-    float waterDamping; // uniform damping while submerged, will be scaled with submerged fraction
-    float waterResistance, kwaterResistance; // water's medium resistance; same comments on water and kwater.. apply
-    Vec3 waterFlow; // flow's movement vector; can only be set for a water area
-    float flowVariance; // not yet supported
-    primitives::plane waterPlane;   // positive normal = above the water surface
-    float waterEmin; // sleep energy while floating with no contacts (see minEnergy in pe_simulation_params)
-    int iMedium; // 0 for water, 1 for air
-};
-
-enum phentity_flags
-{
-    // PE_PARTICLE-specific flags
-    particle_single_contact = 0x01, // full stop after first contact
-    particle_constant_orientation = 0x02, // forces constant orientation
-    particle_no_roll = 0x04, // 'sliding' mode; entity's 'normal' vector axis will be alinged with the ground normal
-    particle_no_path_alignment = 0x08, // unless set, entity's y axis will be aligned along the movement trajectory
-    particle_no_spin = 0x10, // disables spinning while flying
-    particle_no_self_collisions = 0x100, // disables collisions with other particles
-    particle_no_impulse = 0x200, // particle will not add hit impulse (expecting that some other system will)
-
-    // PE_LIVING-specific flags
-    lef_push_objects = 0x01, lef_push_players = 0x02,   // push objects and players during contacts
-    lef_snap_velocities = 0x04,   // quantizes velocities after each step (was ised in MP for precise deterministic sync)
-    lef_loosen_stuck_checks = 0x08, // don't do additional intersection checks after each step (recommended for NPCs to improve performance)
-    lef_report_sliding_contacts = 0x10,   // unless set, 'grazing' contacts are not reported
-
-    // PE_ROPE-specific flags
-    rope_findiff_attached_vel = 0x01, // approximate velocity of the parent object as v = (pos1-pos0)/time_interval
-    rope_no_solver = 0x02, // no velocity solver; will rely on stiffness (if set) and positional length enforcement
-    rope_ignore_attachments = 0x4, // no collisions with objects the rope is attached to
-    rope_target_vtx_rel0 = 0x08, rope_target_vtx_rel1 = 0x10, // whether target vertices are set in the parent entity's frame
-    rope_subdivide_segs = 0x100, // turns on 'dynamic subdivision' mode (only in this mode contacts in a strained state are handled correctly)
-    rope_no_tears = 0x200, // rope will not tear when it reaches its force limit, but stretch
-    rope_collides = 0x200000, // rope will collide with objects other than the terrain
-    rope_collides_with_terrain = 0x400000, // rope will collide with the terrain
-    rope_collides_with_attachment = 0x80, // rope will collide with the objects it's attached to even if the other collision flags are not set
-    rope_no_stiffness_when_colliding = 0x10000000, // rope will use stiffness 0 if it has contacts
-
-    // PE_SOFT-specific flags
-    se_skip_longest_edges = 0x01, // the longest edge in each triangle with not participate in the solver
-    se_rigid_core = 0x02, // soft body will have an additional rigid body core
-
-    // PE_RIGID-specific flags (note that PE_ARTICULATED and PE_WHEELEDVEHICLE are derived from it)
-    ref_use_simple_solver = 0x01, // use penalty-based solver (obsolete)
-    ref_no_splashes = 0x04, // will not generate EventPhysCollisions when contacting water
-    ref_checksum_received = 0x04, ref_checksum_outofsync = 0x08, // obsolete
-    ref_small_and_fast = 0x100, // entity will trace rays against alive characters; set internally unless overriden
-
-    // PE_ARTICULATED-specific flags
-    aef_recorded_physics = 0x02, // specifies a an entity that contains pre-baked physics simulation
-
-    // PE_WHEELEDVEHICLE-specific flags
-    wwef_fake_inner_wheels = 0x08, // exclude wheels between the first and the last one from the solver
-    // (only wheels with non-0 suspension are considered)
-
-    // general flags
-    pef_parts_traceable = 0x10, // each entity part will be registered separately in the entity grid
-    pef_disabled = 0x20, // entity will not be simulated
-    pef_never_break = 0x40, // entity will not break or deform other objects
-    pef_deforming = 0x80, // entity undergoes a dynamic breaking/deforming
-    pef_pushable_by_players = 0x200, // entity can be pushed by playerd
-    pef_traceable = 0x400, particle_traceable = 0x400, rope_traceable = 0x400, // entity is registered in the entity grid
-    pef_update = 0x800, // only entities with this flag are updated if ent_flagged_only is used in TimeStep()
-    pef_monitor_state_changes = 0x1000, // generate immediate events for simulation class changed (typically rigid bodies falling asleep)
-    pef_monitor_collisions = 0x2000, // generate immediate events for collisions
-    pef_monitor_env_changes = 0x4000, // generate immediate events when something breaks nearby
-    pef_never_affect_triggers = 0x8000,   // don't generate events when moving through triggers
-    pef_invisible = 0x10000, // will apply certain optimizations for invisible entities
-    pef_ignore_ocean = 0x20000, // entity will ignore global water area
-    pef_fixed_damping = 0x40000,  // entity will force its damping onto the entire group
-    pef_monitor_poststep = 0x80000, // entity will generate immediate post step events
-    pef_always_notify_on_deletion = 0x100000, // when deleted, entity will awake objects around it even if it's not referenced (has refcount 0)
-    pef_override_impulse_scale = 0x200000, // entity will ignore breakImpulseScale in PhysVars
-    pef_players_can_break = 0x400000, // playes can break the entiy by bumping into it
-    pef_cannot_squash_players = 0x10000000,   // entity will never trigger 'squashed' state when colliding with players
-    pef_ignore_areas = 0x800000, // entity will ignore phys areas (gravity and water)
-    pef_log_state_changes = 0x1000000, // entity will log simulation class change events
-    pef_log_collisions = 0x2000000, // entity will log collision events
-    pef_log_env_changes = 0x4000000, // entity will log EventPhysEnvChange when something breaks nearby
-    pef_log_poststep = 0x8000000, // entity will log EventPhysPostStep events
-};
-
-struct pe_params_flags
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_flags
-    };
-    pe_params_flags() { type = type_id; MARK_UNUSED flags, flagsOR, flagsAND; }
-    unsigned int flags;
-    unsigned int flagsOR;   // when setting, flagsNew = (flags set ? flags:flagsOld) & flagsAND | flagsOR
-    unsigned int flagsAND; // when getting, only flags is filled
-};
-
-
-struct pe_params_collision_class
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_collision_class
-    };
-    pe_params_collision_class() { type = type_id; collisionClassOR.type = collisionClassOR.ignore = 0; collisionClassAND.type = collisionClassAND.ignore = (unsigned)-1; }
-    SCollisionClass collisionClassOR;   // When getting both collisionClassOR and collisionClassAND are filled out
-    SCollisionClass collisionClassAND;  // When setting first collisionClassAND is applied to mask bits, then collisionClassOR is applied to turn on collision bits
-};
-
-struct pe_params_ground_plane
-    : pe_params
-{
-    // used for breakable objects; pieces that are below ground (at least partially) stay in the entity
-    enum entype
-    {
-        type_id = ePE_params_ground_plane
-    };
-    pe_params_ground_plane() { type = type_id; iPlane = 0; MARK_UNUSED ground.origin, ground.n; }
-    int iPlane; // index of the plane to be set (-1 removes existing planes)
-    primitives::plane ground;
-};
-
-enum special_joint_ids
-{
-    joint_impulse = 1000000
-};
-struct pe_params_structural_joint
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_structural_joint
-    };
-    pe_params_structural_joint()
-    {
-        type = type_id;
-        id = 0;
-        bReplaceExisting = 0;
-        MARK_UNUSED idx, partid[0], partid[1], pt, n, maxForcePush, maxForcePull, maxForceShift, maxTorqueBend, maxTorqueTwist, damageAccum, damageAccumThresh,
-                    bBreakable, szSensor, bBroken, partidEpicenter, axisx, limitConstraint, bConstraintWillIgnoreCollisions, dampingConstraint;
-    }
-
-    int id; // joint's 'foreign' identifier
-    int idx; // joint's internal index
-    int bReplaceExisting;   // if not set, SetParams will add a new joint even if id is already used
-    int partid[2]; // ids of the parts this joint connects (-1 for ground)
-    Vec3 pt; // point in entity space
-    Vec3 n; // push/pull direction in entity space
-    Vec3 axisx; // x axis in entity frame; only used for joints that can become dynamic constraints
-    float maxForcePush, maxForcePull, maxForceShift; // linear force limits
-    float maxTorqueBend, maxTorqueTwist; // angular force (torque) limits
-    float damageAccum, damageAccumThresh; // fraction of tension that gets accumulated, can be used to emulate an health system
-    Vec3 limitConstraint; // x=min angle, y=max angle, z=force limit
-    int bBreakable; // joint is at all breakable
-    int bConstraintWillIgnoreCollisions; // dynamic constraints will have constraint_ignore_buddy flag
-    int bDirectBreaksOnly; // joint can only be broken by direct impulses to one of the parts it connects
-    float dampingConstraint; // dynamic constraint's damping
-    float szSensor; // sensor geometry size; used to re-attach the joint when parts break off
-    int bBroken; // joint is broken
-    int partidEpicenter; // tension recomputation will start from this part (used for network playback, for instance)
-};
-
-struct pe_params_structural_initial_velocity
-    : pe_params
-{
-    // Setting of initial velocities of parts before breaking joints on clients through pe_params_structural_joint
-    enum entype
-    {
-        type_id = ePE_params_structural_initial_velocity
-    };
-    pe_params_structural_initial_velocity() { type = type_id; }
-
-    int partid; // id of the part to prepare for breakage
-    Vec3 v; // Initial velocity
-    Vec3 w; // Initial ang velocity
-};
-
-
-struct pe_params_timeout
-    : pe_params
-{
-    // entities can be forced to go to sleep after some time without external impulses
-    enum entype
-    {
-        type_id = ePE_params_timeout
-    };
-    pe_params_timeout() { type = type_id; MARK_UNUSED timeIdle, maxTimeIdle; }
-    float timeIdle; // current 'idle' time (time without any 'prods' from outside)
-    float maxTimeIdle; // sleep when timeIdle>maxTimeIdle; 0 turns this feature off
-};
-
-struct pe_params_skeleton
-    : pe_params
-{
-    // skeleton is a hidden mesh that uses cloth simulation to skin the main physics geometry
-    enum entype
-    {
-        type_id = ePE_params_skeleton
-    };
-    pe_params_skeleton() { type = type_id; MARK_UNUSED partid, ipart, stiffness, thickness, maxStretch, maxImpulse, timeStep, nSteps, hardness, explosionScale, bReset; }
-
-    int partid; // id of the skinned part
-    int ipart; // ..or its internal index
-    float stiffness; // skeleton's hardness against bending and shearing
-    float thickness; // skeleton's thickness for collisions
-    float maxStretch;   // skeleton's maximal stretching
-    float maxImpulse;   // skeleton impulse cap
-    float timeStep; // time step, used to simulate the skeleton (typically small)
-    int nSteps; // number of skeleton sub-steps per each structure update
-    float hardness; // skeleton's hardness against stretching
-    float explosionScale;   // skeleton's explosion impulse scale
-    int bReset; // resets the skeleton to its original pose
-};
-
-
-////////// articulated entity params
-enum joint_flags
-{
-    angle0_locked = 1, all_angles_locked = 7, angle0_limit_reached = 010, angle0_auto_kd = 0100, joint_no_gravity = 01000,
-    joint_isolated_accelerations = 02000, joint_expand_hinge = 04000, angle0_gimbal_locked = 010000,
-    joint_dashpot_reached = 0100000, joint_ignore_impulses = 0200000
-};
-
-struct pe_params_joint
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_joint
-    };
-    pe_params_joint()
-    {
-        type = type_id;
-        for (int i = 0; i < 3; i++)
-        {
-            MARK_UNUSED limits[0][i], limits[1][i], qdashpot[i], kdashpot[i], bounciness[i], q[i], qext[i], ks[i], kd[i], qtarget[i];
-        }
-        bNoUpdate = 0;
-        pMtx0 = 0;
-        flagsPivot = 3;
-        MARK_UNUSED flags, q0, pivot, ranimationTimeStep, nSelfCollidingParts, animationTimeStep, op[0];
-    }
-
-    unsigned int flags; // should be a combination of angle0,1,2_locked, angle0,1,2_auto_kd, joint_no_gravity
-    int flagsPivot; // if bit 0 is set, update pivot point in parent frame, if bit 1 - in child
-    Vec3 pivot; // joint pivot in entity CS
-    quaternionf q0; // orientation of child in parent coordinates that corresponds to angles (0,0,0)
-    Matrix33* pMtx0; // same as q0
-    Vec3 limits[2]; // limits for each angle
-    Vec3 bounciness; // bounciness for each angle (applied when limit is reached)
-    Vec3 ks, kd; // stiffness and damping koefficients for each angle angular spring
-    Vec3 qdashpot; // limit vicinity where joints starts resisting movement
-    Vec3 kdashpot; // when dashpot is activated, this is roughly the angular speed, stopped in 2 sec
-    Ang3 q; // angles values
-    Ang3 qext; // additional angles values (angle[i] = q[i]+qext[i]; only q[i] is taken into account
-    // while calculating spring torque
-    Ang3 qtarget;
-    int op[2]; // body identifiers of parent (optional) and child respectively
-    int nSelfCollidingParts, * pSelfCollidingParts; // part ids of only parts that should be checked for self-collision
-    int bNoUpdate; // omit recalculation of body parameters after changing this joint
-    float animationTimeStep; // used to calculate joint velocities of animation
-    float ranimationTimeStep;   // 1/animation time step, can be not specified (specifying just saves extra division operation)
-
-    VALIDATORS_START
-        VALIDATOR(pivot)
-        VALIDATOR_NORM(q0)
-        VALIDATOR(q)
-        VALIDATOR(qext)
-    VALIDATORS_END
-};
-
-struct pe_params_articulated_body
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_articulated_body
-    };
-    pe_params_articulated_body()
-    {
-        type = type_id;
-        MARK_UNUSED bGrounded, bInheritVel, bCheckCollisions, bCollisionResp, nJointsAlloc;
-        MARK_UNUSED bGrounded, bInheritVel, bCheckCollisions, bCollisionResp, a, wa, w, v, pivot, scaleBounceResponse, posHostPivot, qHostPivot;
-        MARK_UNUSED bAwake, pHost, nCollLyingMode, gravityLyingMode, dampingLyingMode, minEnergyLyingMode, iSimType, iSimTypeLyingMode, nRoots;
-        bApply_dqext = 0;
-        bRecalcJoints = 1;
-    }
-
-    int bGrounded; // whether body's pivot is firmly attached to something or free
-    int bCheckCollisions;   // only works with bCollisionResp set
-    int bCollisionResp; // when on, uses 'ragdoll' simulation mode, when off - 'skeleton' (for hit simulation on alive actors)
-    Vec3 pivot; // attachment position for grounded entities
-    Vec3 a; // acceleration of the ground for grounded entities
-    Vec3 wa; // angular acceleration of the ground for grounded entities
-    Vec3 w; // angular velocity of the ground for grounded entities
-    Vec3 v; // linear velocity of the ground for grounded entities
-    float scaleBounceResponse; // scales impulsive torque that is applied at a joint that has just reached its limit
-    int bApply_dqext;   // adds current dqext to joints velocities. dqext is the speed of external animation and is calculated each time
-    // qext is set for joint (as difference between new value and current value, multiplied by inverse of animation timestep)
-    int bAwake; // current state
-
-    IPhysicalEntity* pHost; // 'ground' entity
-    Vec3 posHostPivot; // attachment position inside pHost
-    quaternionf qHostPivot;
-    int bInheritVel; // take pHost velocity into account during the simulation
-
-    int nCollLyingMode; // number of contacts that triggers 'lying mode'
-    Vec3 gravityLyingMode; // gravity override in lying mode
-    float dampingLyingMode; // damping override
-    float minEnergyLyingMode;   // sleep speed override
-    int iSimType;   // simulation type: 0-'joint-based', 1-'body-based'; fast motion forces joint-based mode automatically
-    int iSimTypeLyingMode; // simulation type override
-    int nRoots; // only used in GetParams
-    int nJointsAlloc; // pre-allocates this amount of joints and parts
-
-    int bRecalcJoints; // re-build geometry positions from joint agnles
-};
-
-////////// living entity params
-
-struct pe_player_dimensions
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_player_dimensions
-    };
-    pe_player_dimensions()
-        : dirUnproj(0, 0, 1)
-        , maxUnproj(0)
-    {
-        type = type_id;
-        MARK_UNUSED sizeCollider, heightPivot, heightCollider, heightEye, heightHead, headRadius, bUseCapsule, groundContactEps;
-    }
-
-    float heightPivot; // offset from central ground position that is considered entity center
-    float heightEye; // vertical offset of camera
-    Vec3 sizeCollider; // collision cylinder dimensions
-    float heightCollider;   // vertical offset of collision geometry center
-    float headRadius;   // radius of the 'head' geometry (used for camera offset)
-    float heightHead;   // center.z of the head geometry
-    Vec3 dirUnproj; // unprojection direction to test in case the new position overlaps with the environment (can be 0 for 'auto')
-    float maxUnproj; // maximum allowed unprojection
-    int bUseCapsule; // switches between capsule and cylinder collider geometry
-    float groundContactEps; // the amount that the living needs to move upwards before ground contact is lost. defaults to which ever is greater 0.004, or 0.01*geometryHeight
-
-    VALIDATORS_START
-        VALIDATOR(heightPivot)
-        VALIDATOR(heightEye)
-        VALIDATOR_RANGE2(sizeCollider, 0, 100)
-    VALIDATORS_END
-};
-
-struct pe_player_dynamics
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_player_dynamics
-    };
-    pe_player_dynamics()
-    {
-        type = type_id;
-        MARK_UNUSED kInertia, kInertiaAccel, kAirControl, gravity, gravity.z, nodSpeed, mass, bSwimming, surface_idx, bActive, collTypes, pLivingEntToIgnore;
-        MARK_UNUSED minSlideAngle, maxClimbAngle, maxJumpAngle, minFallAngle, kAirResistance, maxVelGround, timeImpulseRecover, bReleaseGroundColliderWhenNotActive;
-    }
-
-    float kInertia; // inertia koefficient, the more it is, the less inertia is; 0 means no inertia
-    float kInertiaAccel; // inertia on acceleration
-    float kAirControl; // air control coefficient 0..1, 1 - special value (total control of movement)
-    float kAirResistance;   // standard air resistance
-    Vec3 gravity; // gravity vector
-    float nodSpeed; // vertical camera shake speed after landings
-    int bSwimming; // whether entity is swimming (is not bound to ground plane)
-    float mass; // mass (in kg)
-    int surface_idx; // surface identifier for collisions
-    float minSlideAngle; // if surface slope is more than this angle, player starts sliding (angle is in degrees)
-    float maxClimbAngle; // player cannot climb surface which slope is steeper than this angle (angle is in degrees)
-    float maxJumpAngle; // player is not allowed to jump towards ground if this angle is exceeded (angle is in degrees)
-    float minFallAngle; // player starts falling when slope is steeper than this (angle is in degrees)
-    float maxVelGround; // player cannot stand on surfaces that are moving faster than this
-    float timeImpulseRecover; // forcefully turns on inertia for that duration after receiving an impulse
-    int collTypes; // entity types to check collisions against
-    IPhysicalEntity* pLivingEntToIgnore; // ignore collisions with this *living entity* (doesn't work with other entity types)
-    int bActive; // 0 disables all simulation for the character, apart from moving along the requested velocity
-    int bReleaseGroundColliderWhenNotActive; // when not 0, if the living entity is not active, the ground collider, if any, will be explicitly released during the simulation step.
-};
-
-////////// particle entity params
-
-struct pe_params_particle
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_particle
-    };
-    pe_params_particle()
-    {
-        type = type_id;
-        MARK_UNUSED mass, size, thickness, wspin, accThrust, kAirResistance, kWaterResistance, velocity, heading, accLift, accThrust, gravity, waterGravity;
-        MARK_UNUSED surface_idx, normal, q0, minBounceVel, rollAxis, flags, pColliderToIgnore, iPierceability, areaCheckPeriod, minVel, collTypes, dontPlayHitEffect;
-    }
-
-    unsigned int flags; // see entity flags
-    float mass;
-    float size; // pseudo-radius
-    float thickness; // thickness when lying on a surface (if left unused, size will be used)
-    Vec3 heading; // direction of movement
-    float velocity; // velocity along "heading"
-    float kAirResistance; // air resistance koefficient, F = kv
-    float kWaterResistance; // same for water
-    float accThrust; // acceleration along direction of movement
-    float accLift; // acceleration that lifts particle with the current speed
-    int surface_idx;
-    Vec3 wspin; // angular velocity
-    Vec3 gravity;   // stores this gravity and uses it if the current area's gravity is equal to the global gravity
-    Vec3 waterGravity; // gravity when underwater
-    Vec3 normal; // aligns this direction with the surface normal when sliding
-    Vec3 rollAxis; // aligns this directon with the roll axis when rolling (0,0,0 to disable alignment)
-    quaternionf q0; // initial orientation (zero means x along direction of movement, z up)
-    float minBounceVel; // velocity threshold for bouncing->sliding switch
-    float minVel;   // sleep speed threshold
-    IPhysicalEntity* pColliderToIgnore; // physical entity to ignore during collisions
-    int iPierceability; // pierceability for ray tests; pierceble hits slow the particle down, but don't stop it
-    int collTypes; // 'objtype' passed to RayWorldntersection
-    int areaCheckPeriod; // how often (in frames) world area checks are made
-    int dontPlayHitEffect; // prevent playing of material FX from now on
-
-    VALIDATORS_START
-        VALIDATOR(mass)
-        VALIDATOR(size)
-        VALIDATOR(thickness)
-        VALIDATOR_NORM(heading)
-        VALIDATOR_NORM(q0)
-    VALIDATORS_END
-};
-
-////////// vehicle entity params
-
-struct pe_params_car
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_car
-    };
-    pe_params_car()
-    {
-        type = type_id;
-        MARK_UNUSED engineMaxRPM, iIntegrationType, axleFriction, enginePower, maxSteer, maxTimeStep, minEnergy, damping, brakeTorque;
-        MARK_UNUSED engineMinRPM, engineShiftUpRPM, engineShiftDownRPM, engineIdleRPM, engineStartRPM, clutchSpeed, nGears, gearRatios, kStabilizer;
-        MARK_UNUSED slipThreshold, gearDirSwitchRPM, kDynFriction, minBrakingFriction, maxBrakingFriction, steerTrackNeutralTurn, maxGear, minGear, pullTilt;
-        MARK_UNUSED maxTilt, bKeepTractionWhenTilted;
-    }
-
-    float axleFriction; // friction torque at axes divided by mass of vehicle
-    float enginePower; // power of engine (about 10,000 - 100,000)
-    float maxSteer; // maximum steering angle
-    float engineMaxRPM; // engine torque decreases to 0 after reaching this rotation speed
-    float brakeTorque; // torque applied when breaking using the engine
-    int iIntegrationType; // for suspensions; 0-explicit Euler, 1-implicit Euler
-    float maxTimeStep; // maximum time step when vehicle has only wheel contacts
-    float minEnergy; // minimum awake energy when vehicle has only wheel contacts
-    float damping; // damping when vehicle has only wheel contacts
-    float minBrakingFriction; // limits the the tire friction when handbraked
-    float maxBrakingFriction; // limits the the tire friction when handbraked
-    float kStabilizer; // stabilizer force, as a multiplier for kStiffness of respective suspensions
-    int nWheels; // the number of wheels
-    float engineMinRPM; // disengages the clutch when falling behind this limit, if braking with the engine
-    float engineShiftUpRPM; // RPM threshold for for automatic gear switching
-    float engineShiftDownRPM;
-    float engineIdleRPM; // RPM for idle state
-    float engineStartRPM;   // sets this RPM when activating the engine
-    float clutchSpeed; // clutch engagement/disengagement speed
-    int nGears;
-    float* gearRatios; // assumes 0-backward gear, 1-neutral, 2 and above - forward
-    int maxGear, minGear; // additional gear index clamping
-    float slipThreshold; // lateral speed threshold for switchig a wheel to a 'slipping' mode
-    float gearDirSwitchRPM; // RPM threshold for switching back and forward gears
-    float kDynFriction; // friction modifier for sliping wheels
-    float steerTrackNeutralTurn; // for tracked vehicles, steering angle that causes equal but opposite forces on tracks
-    float pullTilt; // for tracked vehicles, tilt angle of pulling force towards ground
-    float maxTilt; // maximum wheel contact normal tilt (left or right) after which it acts as a locked part of the hull; it's a cosine of the angle
-    int bKeepTractionWhenTilted; // keeps wheel traction in tilted mode
-};
-
-struct pe_params_wheel
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_wheel
-    };
-    pe_params_wheel()
-    {
-        type = type_id;
-        iWheel = 0;
-        MARK_UNUSED bDriving, iAxle, suspLenMax, suspLenInitial, minFriction, maxFriction, surface_idx, bCanBrake, bBlocked,
-                    bRayCast, kStiffness, kDamping, kLatFriction, Tscale, w, bCanSteer, kStiffnessWeight;
-    }
-
-    int iWheel;
-    int bDriving;
-    int iAxle; // wheels on the same axle align their coordinates (if only slightly misaligned)
-               // and apply stabilizer force (if set); axle<0 means the wheel does not affect the physics
-    int bCanBrake; // handbrake applies
-    int bBlocked; // locks the wheel (acts like a forced handbrake)
-    int bCanSteer; // can this wheel steer, 0 or 1
-    float suspLenMax;   // full suspension length (relaxed)
-    float suspLenInitial;   // length in the initial state (used for automatic computations)
-    float minFriction; // surface friction is cropped to this min-max range
-    float maxFriction;
-    int surface_idx;
-    int bRayCast; // uses raycasts instead of cylinders
-    float kStiffness;   // if 0, will be computed based on mass distribution, lenMax, and lenInitial
-    float kStiffnessWeight; // When autocalculating stiffness use this weight for this wheel. Note weights for wheels in front of the centre of mass do not influence the weights of wheels behind the centre of mass
-                            // By default all weights are 1.0 and the sum doesn't have to add up to 1.0!
-                            // Also a <=0 weight will leave the wheel out of the autocalculation. It will be get a stiffness of weight*mass*gravity/defaultLength/numWheels. weight=-1 is a good starting point for these wheels
-    float kDamping; // absolute value if >=0, otherwise -(fraction of 0-oscillation damping)
-    float kLatFriction; // lateral friction scale (doesn't apply when on handbrake)
-    float Tscale;   // optional driving torque scale
-    float w; // rotational velocity; it's computed automatically, but can be overriden if needed
-};
-
-////////// rope entity params
-
-struct pe_params_rope
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_rope
-    };
-    pe_params_rope()
-    {
-        type = type_id;
-        //START: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
-        MARK_UNUSED length, mass, collDist, surface_idx, friction, nSegments, pPoints.data, pVelocities.data, pDamping, pStiffness, pThickness;
-        //END: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
-        MARK_UNUSED pEntTiedTo[0], ptTiedTo[0], idPartTiedTo[0], pEntTiedTo[1], ptTiedTo[1], idPartTiedTo[1], stiffnessAnim, maxForce,
-                    flagsCollider, nMaxSubVtx, stiffnessDecayAnim, dampingAnim, bTargetPoseActive, wind, windVariance, airResistance, waterResistance, density, collTypes,
-                    jointLimit, jointLimitDecay, sensorRadius, frictionPull, stiffness, collisionBBox[0], penaltyScale, maxIters, attachmentZone, minSegLen, unprojLimit, noCollDist, hingeAxis;
-        bLocalPtTied = 0;
-    }
-
-    float length;   // 'target' length; 0 is allowed for ropes with dynamic subdivision
-    float mass;
-    float collDist; // thickness for collisions
-    int surface_idx; // for collision reports; friction is overriden
-    float friction; // friction for free state and lateral friction in strained state
-    float frictionPull; // friction in pull direction in strained state
-    float stiffness; // stiffness against stretching (used in the solver; it's *not* a spring, though)
-    float stiffnessAnim; // shape-preservation stiffness
-    float stiffnessDecayAnim;   // the final shape stiffness will be interpolated from full to full*(1-decay) at the end
-    float dampingAnim; // damping for shape preservation forces
-    int bTargetPoseActive; // 0-no target pose (no shape-preservation stiffness),
-                           // 1-simplified target pose (vertices are pulled directly to targets)
-    // 2-physically correct target pose (the rope applies penalty torques at joints)
-    Vec3 wind; // local wind in addition to one from phys areas
-    float windVariance; // wariance (applied to local only)
-    float airResistance; // needs to be >0 in order to be affetcted by the wind
-    float waterResistance; // medium resistance when underwater
-    float density; // used only to compute buoyancy
-    float jointLimit;   // joint rotation limit (doesn't work when both ends are tied)
-    float jointLimitDecay; // joint limit change (0..1) towards the unattached rope end; can be positive or negative
-    float sensorRadius; // size of the sensor used to re-attach the rope if the host entity breaks
-    float maxForce; // force limit; when breached, the rope will detach itself unless rope_no_tears is set
-    float penaltyScale; // for the solver in strained state with subdivision on
-    float attachmentZone;   // don't register solver contacts within this distance around attachment points (subdivision mode)
-    float minSegLen; // delete segments below this length in subdivision mode
-    float unprojLimit; // rotational unprojection limit per frame (no-subdivision mode)
-    float noCollDist;   // fraction of the segment near the attachment point that doesn't collide (no-subdivision mode)
-    int maxIters;   // tweak for the internal vertex solver
-    int nSegments; // segment count, changin will reset vertex positions
-    int flagsCollider; // only collide with entity parts flagged this way
-    int collTypes; // a selection of ent_xxx flags to collide against
-    int nMaxSubVtx; // maximum internal vertices per segment in subdivision mode
-    Vec3 collisionBBox[2]; // bbox for entity proximity query in host's space
-    // (used make all ropes belonging to one host share the same box, to automatically reuse the query results)
-    Vec3 hingeAxis; // only allow rotation around this axis (in parent's frame if rope_target_vtx_rel is set)
-    strided_pointer<Vec3> pPoints;
-    strided_pointer<Vec3> pVelocities;
-
-    IPhysicalEntity* pEntTiedTo[2];
-    int bLocalPtTied;   // ptTiedTo is in tied part's local coordinates
-    Vec3 ptTiedTo[2];
-    int idPartTiedTo[2];
-    //START: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
-    float* pDamping;
-    float* pStiffness;
-    float* pThickness;
-    //END: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
-};
-
-////////// soft entity params
-
-struct pe_params_softbody
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_softbody
-    };
-    pe_params_softbody()
-    {
-        type = type_id;
-        MARK_UNUSED thickness, maxSafeStep, ks, kdRatio, airResistance, wind, windVariance, nMaxIters,
-                    accuracy, friction, impulseScale, explosionScale, collisionImpulseScale, maxCollisionImpulse, collTypes, waterResistance, massDecay,
-                    shapeStiffnessNorm, shapeStiffnessTang, stiffnessAnim, stiffnessDecayAnim, dampingAnim, maxDistAnim, hostSpaceSim;
-    }
-
-    float thickness; // thickness for collisions
-    float maxSafeStep; // time step cap
-    float ks;   // stiffness against stretching (for soft bodies, <0 means fraction of maximum stable)
-    float kdRatio; // damping in stretch direction, in fractions of 0-oscillation damping
-    float friction; // overrides material friction
-    float waterResistance;
-    float airResistance;
-    Vec3 wind; // wind in addition to phys area wind
-    float windVariance; // wind variance, in fractions of 1 (currently changes 4 times/sec)
-    int nMaxIters; // tweak for the solver (complexity = O(nMaxIters*numVertices))
-    float accuracy; // accuracy for the solver (velocity)
-    float impulseScale; // scale general incoming impulses
-    float explosionScale;   // scale impulses from explosions
-    float collisionImpulseScale; // not used
-    float maxCollisionImpulse; // not used
-    int collTypes; // combination of ent_... flags
-    float massDecay; // decreases mass from attached points to free ends; mass_free = mass_attached/(1+decay) (can impove stability)
-    float shapeStiffnessNorm;   // resistance to bending
-    float shapeStiffnessTang;   // resistance to shearing
-    float stiffnessAnim; // strength of linear target pose pull
-    float stiffnessDecayAnim; // decay of stiffnessAnim
-    float dampingAnim; // damping for target pose pull
-    float maxDistAnim; // max deviation from the target pose at the rim; uses stiffnessDecalAnim to scale down closer to attached vtx
-    float hostSpaceSim; // 0 - world-space simulation, 1 - fully host-space simulation
-};
-
-/////////// area params
-
-struct params_wavesim
-{
-    params_wavesim() { MARK_UNUSED timeStep, waveSpeed, dampingCenter, dampingRim, minhSpread, minVel, simDepth, heightLimit, resistance;   }
-    float timeStep; // fixed timestep used for the simulation
-    float waveSpeed; // wave propagation speed
-    float simDepth; // assumed height of moving water layer (relative to cell size)
-    float heightLimit; // hard limit on height changes (relative to cell size)
-    float resistance; // rate of velocity transfer from floating objects
-    float dampingCenter; // damping in the central tile
-    float dampingRim;   // damping in the outer tiles
-    float minhSpread;   // minimum height perturbation that activates a neighbouring tile
-    float minVel;   // sleep speed threshold
-};
-
-struct pe_params_area
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_params_area
-    };
-    pe_params_area() { type = type_id; MARK_UNUSED gravity, bUniform, damping, falloff0, bUseCallback, pGeom, volume, borderPad, bConvexBorder, objectVolumeThreshold, cellSize, growthReserve, volumeAccuracy; }
-    // water/air area params are set through pe_params_buoyancy
-
-    Vec3 gravity;   // see also bUniform
-    float falloff0; // parametric distance (0..1) where falloff starts
-    int bUniform; // gravity has same direction in every point or always points to the center
-    int bUseCallback;   // will generate immediate EventPhysArea when needs to apply params to an entity
-    float damping; // uniform damping
-    IGeometry* pGeom;   // phys geometry used in the area
-    float volume; // the area will try to maintain this volume by adjusting water level
-    float volumeAccuracy; // accuracy of level computation based on volume (in fractions of the volume)
-    float borderPad; // after adjusting level, expand the border by this distance
-    int   bConvexBorder; // forces convex border after water level adjustments
-    float objectVolumeThreshold; // only consider entities larger than this for level adjustment (set in fractions of area volume)
-    float cellSize; // cell size for wave simulation
-    params_wavesim waveSim;
-    float growthReserve; // assume this area increase during level adjustment (only used for wave simulation)
-};
-
-
-////////// water manager params
-
-struct pe_params_waterman
-    : pe_params
-    , params_wavesim
-{
-    enum entype
-    {
-        type_id = ePE_params_waterman
-    };
-    pe_params_waterman()
-    {
-        type = type_id;
-        MARK_UNUSED posViewer, nExtraTiles, nCells, tileSize, timeStep, waveSpeed,
-                    dampingCenter, dampingRim, minhSpread, minVel, simDepth, heightLimit, resistance;
-    }
-
-    Vec3 posViewer; // water will only be simulated around this point
-    int nExtraTiles; // number of additional tiles in each direction around the one below posViewer (so total = (nExtarTiles*2+1)^2)
-    int nCells; // number of cells in each tile
-    float tileSize;
-};
-
-
-////////////////////////// Action structures /////////////////////
-
-////////// common actions
-struct pe_action
-{
-    int type;
-};
-
-struct pe_action_impulse
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_impulse
-    };
-    pe_action_impulse() { type = type_id; impulse.Set(0, 0, 0); MARK_UNUSED point, angImpulse, partid, ipart; iApplyTime = 2; iSource = 0; }
-
-    Vec3 impulse;
-    Vec3 angImpulse;    // optional
-    Vec3 point; // point of application, in world CS, optional
-    int partid; // receiver part identifier
-    int ipart; // alternatively, part index can be used
-    int iApplyTime; // 0-apply immediately, 1-apply before the next time step, 2-apply after the next time step
-    int iSource; // reserved for internal use
-
-    VALIDATORS_START
-        VALIDATOR_RANGE2(impulse, 0, 1E12f)
-        VALIDATOR_RANGE2(angImpulse, 0, 1E8f)
-        VALIDATOR_RANGE2(point, 0, 1E6f)
-        VALIDATOR_RANGE(ipart, 0, 10000)
-    VALIDATORS_END
-};
-
-struct pe_action_reset
-    : pe_action                      // Resets dynamic state of an entity
-{
-    enum entype
-    {
-        type_id = ePE_action_reset
-    };
-    pe_action_reset() { type = type_id; bClearContacts = 1; }
-    int bClearContacts;
-};
-
-enum constrflags   // see pe_action_add_constraint
-{
-    local_frames = 1, // pt and qframe are in respective entities' coordinate frames
-    world_frames = 2, // pt and qframe are in the world frame
-    local_frames_part = 4, // pt and qframe are if respective entity parts' coordinate frames
-    constraint_inactive = 0x100, // constraint does nothing, except applying _ignore_buddy if set
-    constraint_ignore_buddy = 0x200, // disables collisions between the constrained entities
-    constraint_line = 0x400, // position if constrained to a line
-    constraint_plane = 0x800, // position is constrained to a plane
-    constraint_free_position = 0x1000, // position is unconstrained
-    constraint_no_rotation = 0x2000, // relative rotation is fully constrained
-    constraint_no_enforcement = 0x4000, // disables positional enforcement during fast movement (currently disabled unconditionally)
-    constraint_no_tears = 0x8000 // constraint is not deleted when force limit is reached
-};
-
-struct pe_action_add_constraint
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_add_constraint
-    };
-    pe_action_add_constraint()
-    {
-        type = type_id;
-        pBuddy = 0;
-        flags = world_frames;
-        MARK_UNUSED id, pt[0], pt[1], partid[0], partid[1], qframe[0], qframe[1], xlimits[0], yzlimits[0],
-                    pConstraintEntity, damping, sensorRadius, maxPullForce, maxBendTorque;
-    }
-    int id; // if not set, will be auto-assigned; return value of Action()
-    IPhysicalEntity* pBuddy; // the second constrained entity; can be WORLD_ENTITY for static attachments
-    Vec3 pt[2]; // pt[0] must be set; if pt[1] is not set, assumed to be equal to pt[1]
-    int partid[2]; // if not set, the first part is assumed
-    quaternionf qframe[2]; // constraint frames for constraint angles computation; if not set, identity in the specified frame is assumed
-    float xlimits[2];   // rotation limits around x axis ("twist"); if xlimits[0]>=[1], x axis is locked
-    float yzlimits[2]; // combined yz-rotation - "bending" of x axis; yzlimits[0] is ignored and assumed to be 0 during simulation
-    unsigned int flags; // see enum constrflags
-    float damping; // internal constraint damping
-    float sensorRadius; // used for sampling environment and re-attaching the constraint when something breaks
-    float maxPullForce, maxBendTorque;   // positional and rotational force limits
-    IPhysicalEntity* pConstraintEntity; // used internally for creating dynamic rope constraints
-};
-
-struct pe_action_update_constraint
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_update_constraint
-    };
-    pe_action_update_constraint()
-    {
-        type = type_id;
-        MARK_UNUSED idConstraint, pt[0], pt[1], qframe[0], qframe[1], maxPullForce, maxBendTorque, damping;
-        flagsOR = 0;
-        flagsAND = (unsigned int)-1;
-        bRemove = 0;
-        flags = world_frames;
-    }
-    int idConstraint;   // doesn't have to be unique - can update several constraints with one id; if not set, updates all constraints
-    unsigned int flagsOR;
-    unsigned int flagsAND;
-    int bRemove; // permanently delete the constraint
-    Vec3 pt[2]; // local_frames_part is not supported currently
-    quaternionf qframe[2]; // update to constraint frames
-    float maxPullForce, maxBendTorque;
-    float damping;
-    int flags; // generally it's better to use flagsOR and/or flagsAND
-};
-
-struct pe_action_register_coll_event
-    : pe_action
-{
-    // this can be used to ask an entity to post a fake collision event to the log
-    enum entype
-    {
-        type_id = ePE_action_register_coll_event
-    };
-    pe_action_register_coll_event() { type = type_id; MARK_UNUSED vSelf; }
-
-    Vec3 pt; // collision point
-    Vec3 n; // collision normal
-    Vec3 v; // collider's velocity at pt
-    Vec3 vSelf; // optional override for the current entity's velocity at pt
-    float collMass; // collider's mass
-    IPhysicalEntity* pCollider; // collider entity
-    int partid[2];
-    int idmat[2];
-    short iPrim[2];
-};
-
-struct pe_action_awake
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_awake
-    };
-    pe_action_awake() { type = type_id; bAwake = 1; MARK_UNUSED minAwakeTime; }
-    int bAwake;
-    float minAwakeTime; // minimum time to stay awake after executing the action; supported only by some entity types
-};
-
-struct pe_action_remove_all_parts
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_remove_all_parts
-    };
-    pe_action_remove_all_parts() { type = type_id; }
-};
-
-struct pe_action_reset_part_mtx
-    : pe_action
-{
-    // this will bake the part's matrix into the entity's matrix and clear the former
-    enum entype
-    {
-        type_id = ePE_action_reset_part_mtx
-    };
-    pe_action_reset_part_mtx() { type = type_id; MARK_UNUSED ipart, partid; }
-    int ipart;
-    int partid;
-};
-
-struct pe_action_set_velocity
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_set_velocity
-    };
-    pe_action_set_velocity() { type = type_id; MARK_UNUSED ipart, partid, v, w; bRotationAroundPivot = 0; }
-    int ipart; // if part is not set, vel is applied to the whole entity; the distinction makes sense only for ragdolls
-    int partid;
-    Vec3 v, w;
-    int bRotationAroundPivot;   // if set, w is rotation around the entity's pivot, otherwise around its center of mass
-
-    VALIDATORS_START
-        VALIDATOR_RANGE2(v, 0, 1E5f)
-        VALIDATOR_RANGE2(w, 0, 1E5f)
-    VALIDATORS_END
-};
-
-struct pe_action_notify
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_notify
-    };
-    enum encodes
-    {
-        ParentChange = 0
-    };                               // the entity this one is attached to moved; only ropes handle it ATM, by immediately enforcing length
-    pe_action_notify() { type = type_id; iCode = ParentChange; }
-    int iCode;
-};
-
-struct pe_action_auto_part_detachment
-    : pe_action
-{
-    // this is used to PE_ARTICULATED entities with pre-baked physics simulation
-    enum entype
-    {
-        type_id = ePE_action_auto_part_detachment
-    };
-    pe_action_auto_part_detachment() { type = type_id; MARK_UNUSED threshold, autoDetachmentDist; }
-    float threshold; // each part will receive a breakable joint with this force limit (which is assumed to be set in fractions of gravity)
-    float autoDetachmentDist;   // additionally, a part will auto-detach itself once it's farther than that from the entity's pivot
-};
-
-struct pe_action_move_parts
-    : pe_action
-{
-    // this will move parts from one entity to another
-    enum entype
-    {
-        type_id = ePE_action_move_parts
-    };
-    int idStart, idEnd;
-    int idOffset;   // added once parts are in the new entity
-    IPhysicalEntity* pTarget;
-    Matrix34 mtxRel; // mtxInNewEntity = mtxRel*mtxCurrent
-    pe_action_move_parts() { type = type_id; idStart = 0; idEnd = 1 << 30; idOffset = 0; mtxRel.SetIdentity(); pTarget = 0; }
-};
-
-struct pe_action_batch_parts_update
-    : pe_action
-{
-    // updates positions of all parts from arrays
-    enum entype
-    {
-        type_id = ePE_action_batch_parts_update
-    };
-    pe_action_batch_parts_update() { type = type_id; qOffs.SetIdentity(); posOffs.zero(); numParts = 0; pnumParts = 0; pIds = 0; pValidator = 0; }
-    int* pIds;
-    strided_pointer<quaternionf> qParts;
-    strided_pointer<Vec3> posParts;
-    int numParts;
-    int* pnumParts;
-    quaternionf qOffs; // extra rotation
-    Vec3 posOffs;   // extra offset
-    struct Validator
-    {
-        virtual ~Validator() {}
-        virtual bool Lock() = 0;
-        virtual void Unlock() = 0;
-    }* pValidator;
-};
-
-struct pe_action_slice
-    : pe_action
-{
-    // slices entity's geometry with a shape
-    enum entype
-    {
-        type_id = ePE_action_slice
-    };
-    pe_action_slice() { type = type_id; MARK_UNUSED ipart, partid; npt = 3; }
-    int ipart;
-    int partid;
-    Vec3* pt;
-    int npt; // only 3 is supported currently
-};
-
-////////// living entity actions
-
-struct pe_action_move
-    : pe_action                     // movement request for living entities
-{
-    enum entype
-    {
-        type_id = ePE_action_move
-    };
-    pe_action_move() { type = type_id; iJump = 0; dt = 0; MARK_UNUSED dir; }
-
-    Vec3 dir; // requested velocity vector
-    int iJump; // jump mode - 1-instant velocity change, 2-just adds to current velocity
-    float dt;   // time interval for this action (doesn't need to be set normally)
-
-    VALIDATORS_START
-        VALIDATOR_RANGE2(dir, 0, 1000)
-        VALIDATOR_RANGE(dt, 0, 2)
-    VALIDATORS_END
-};
-
-struct pe_action_syncliving
-    : pe_action                           // syncing living entity physics
-{
-    enum entype
-    {
-        type_id = pPE_action_syncliving
-    };
-    pe_action_syncliving() { type = type_id; pos.zero(); vel.zero(); velRequested.zero(); }
-    Vec3 pos;
-    Vec3 vel;
-    Vec3 velRequested;
-};
-
-////////// vehicle entity actions
-
-struct pe_action_drive
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_drive
-    };
-    pe_action_drive() { type = type_id; MARK_UNUSED pedal, dpedal, steer, dsteer, bHandBrake, clutch, iGear; ackermanOffset = 0.f; }
-
-    float pedal; // engine pedal absolute value; active pedal always awakes the entity
-    float dpedal; // engine pedal delta
-    float steer; // steering angle absolute value
-    float ackermanOffset; // apply ackerman steering, 0.0 -> normal driving front wheels steer, back fixed. 1.0 -> front fixed, back steer. 0.5 -> both front and back steer
-    float dsteer; // steering angle delta
-    float clutch;   // forces clutch; 0..1
-    int bHandBrake; // removing handbrake will automatically awaken the vehicle if it's sleeping
-    int iGear; // 0-back; 1-neutral; 2+-forward
-};
-
-////////// rope entity actions
-
-struct pe_action_target_vtx
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_target_vtx
-    };
-    pe_action_target_vtx() { type = type_id; MARK_UNUSED points, nPoints; posHost.zero(); qHost.SetIdentity(); }
-
-    int nPoints;
-    Vec3* points;   // coordinate frame is world, unless the rope has one of rope_target_vtx_rel flags
-    Vec3 posHost; // world position of the host the vertices are attached to
-    Quat qHost;
-};
-
-////////// soft entity actions
-
-struct pe_action_attach_points
-    : pe_action
-{
-    enum entype
-    {
-        type_id = ePE_action_attach_points
-    };
-    pe_action_attach_points() { type = type_id; MARK_UNUSED partid, points; nPoints = 1; pEntity = WORLD_ENTITY; bLocal = 0; }
-
-    IPhysicalEntity* pEntity;
-    int partid;
-    int* piVtx; // vertex indices to be attached to pEntity.partid
-    Vec3* points;   // can set the desired attachment points; if not set, current positions are fixed in the target's frame
-    int nPoints;
-    int bLocal; // if true, points are in the attached part's CS
-};
-
-////////////////////////// Status structures /////////////////////
-
-////////// common statuses
-struct pe_status
-{
-    int type;
-};
-
-enum status_pos_flags
-{
-    status_local = 1, status_thread_safe = 2, status_addref_geoms = 4
-};
-
-struct pe_status_pos
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_pos
-    };
-    pe_status_pos() { type = type_id; ipart = partid = -1; flags = 0; pMtx3x4 = 0; pMtx3x3 = 0; iSimClass = 0; timeBack = 0; }
-
-    int partid; // part identifier, -1 for entire entity
-    int ipart; // optionally, part slot index
-    unsigned int flags; // status_local if part coordinates should be returned in entity CS rather than world CS
-    unsigned int flagsOR; // boolean OR for all parts flags of the object (or just flags for the selected part)
-    unsigned int flagsAND; // boolean AND for all parts flags of the object (or just flags for the selected part)
-    Vec3 pos; // position of center
-    Vec3 BBox[2]; // bounding box relative to pos (bbox[0]-min, bbox[1]-max)
-    quaternionf q;
-    float scale;
-    int iSimClass;
-    Matrix34* pMtx3x4; // optional 3x4 transformation matrix
-    Matrix33* pMtx3x3;  // optional 3x3 rotation+scale matrix
-    IGeometry* pGeom, * pGeomProxy;
-    float timeBack; // can retrieve previous position; only supported by rigid entities; pos and q; one step back
-};
-
-// Only works when USE_IMPROVED_RIGID_ENTITY_SYNCHRONISATION is 1
-struct pe_status_netpos
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_netpos
-    };
-    pe_status_netpos() { type = type_id; }
-
-    Vec3 pos;
-    quaternionf rot;
-    Vec3 vel;
-    Vec3 angvel;
-    float timeOffset;
-};
-
-struct pe_status_extent
-    : pe_status                         // Caches eForm extent of entity in pGeo
-{
-    enum entype
-    {
-        type_id = ePE_status_extent
-    };
-    pe_status_extent() { type = type_id; eForm = EGeomForm(-1); extent = 0; }
-
-    EGeomForm eForm;
-    float extent;
-};
-
-struct pe_status_random
-    : pe_status_extent                          // Generates random pos on entity, also caches extent
-{
-    enum entype
-    {
-        type_id = ePE_status_random
-    };
-    pe_status_random() { type = type_id; ran.vPos.zero(); ran.vNorm.zero(); }
-    PosNorm ran;
-};
-
-struct pe_status_sensors
-    : pe_status                        // Requests status of attached to the entity sensors
-{
-    enum entype
-    {
-        type_id = ePE_status_sensors
-    };
-    pe_status_sensors() { type = type_id; }
-
-    Vec3* pPoints;  // pointer to array of points where sensors touch environment (assigned by physical entity)
-    Vec3* pNormals; // pointer to array of surface normals at points where sensors touch environment
-    unsigned int flags; // bitmask of flags, bit==1 - sensor touched environment
-};
-
-struct pe_status_dynamics
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_dynamics
-    };
-    pe_status_dynamics()
-        : v(ZERO)
-        , w(ZERO)
-        , a(ZERO)
-        , wa(ZERO)
-        , centerOfMass(ZERO)
-    {
-        MARK_UNUSED partid, ipart;
-        type = type_id;
-        mass = energy = 0;
-        nContacts = 0;
-        time_interval = 0;
-        submergedFraction = 0;
-    }
-
-    int partid;
-    int ipart;
-    Vec3 v; // velocity
-    Vec3 w; // angular velocity
-    Vec3 a; // linear acceleration
-    Vec3 wa; // angular acceleration
-    Vec3 centerOfMass;
-    float submergedFraction; // percentage of the entity that is underwater; 0..1. not supported for individual parts
-    float mass; // entity's or part's mass
-    float energy;   // kinetic energy; only supported by PE_ARTICULATED currently
-    int nContacts;
-    float time_interval; // not used
-};
-
-struct coll_history_item
-{
-    Vec3 pt; // collision area center
-    Vec3 n; // collision normal in entity CS
-    Vec3 v[2]; // velocities of contacting bodies at the point of impact
-    float mass[2]; // masses of contacting bodies
-    float age; // age of collision event
-    int idCollider; // id of collider (not a pointer, since collider can be destroyed before history item is queried)
-    int partid[2];
-    int idmat[2];   // 0-this body material, 1-collider material
-};
-
-struct pe_status_collisions
-    : pe_status
-{
-    // obsolete, replaced with EventPhysCollision events
-    enum entype
-    {
-        type_id = ePE_status_collisions
-    };
-    pe_status_collisions() { type = type_id; age = 0; len = 1; pHistory = 0; bClearHistory = 0; }
-
-    coll_history_item* pHistory; // pointer to a user-provided array of history items
-    int len; // length of this array
-    float age; // maximum age of collision events (older events are ignored)
-    int bClearHistory;
-};
-
-struct pe_status_id
-    : pe_status
-{
-    // retrives surface id from geometry
-    enum entype
-    {
-        type_id = ePE_status_id
-    };
-    pe_status_id() { type = type_id; ipart = partid = -1; bUseProxy = 1; }
-
-    int ipart;
-    int partid;
-    int iPrim; // primitive index (only makes sense for meshes)
-    int iFeature;   // feature id inside the primitive; doesn't affect the result currently
-    int bUseProxy; // use pPhysGeomProxy or pPhysGeom
-    int id; // surface id
-};
-
-struct pe_status_timeslices
-    : pe_status
-{
-    // only implemented for PE_LIVING and is obsolete, although still supported
-    enum entype
-    {
-        type_id = ePE_status_timeslices
-    };
-    pe_status_timeslices() { type = type_id; pTimeSlices = 0; sz = 1; precision = 0.0001f; MARK_UNUSED time_interval; }
-
-    float* pTimeSlices;
-    int sz;
-    float precision; // time surplus below this threshhold will be discarded
-    float time_interval; // if unused, time elapsed since the last action will be used
-};
-
-struct pe_status_nparts
-    : pe_status                         // GetStuts will return the number of parts
-{
-    enum entype
-    {
-        type_id = ePE_status_nparts
-    };
-    pe_status_nparts() { type = type_id; }
-};
-
-struct pe_status_awake
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_awake
-    };
-    pe_status_awake() { type = type_id; lag = 0; }
-    int lag; // GetStatus returns 1 ("awake") if the entity fell asleep later than this amount of frames before
-};
-
-struct pe_status_contains_point
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_contains_point
-    };
-    pe_status_contains_point() { type = type_id; }
-    Vec3 pt;
-};
-
-struct pe_status_placeholder
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_placeholder
-    };
-    pe_status_placeholder() { type = type_id; }
-    IPhysicalEntity* pFullEntity;   // if called on a placeholder, returns the corresponding full entity
-};
-
-struct pe_status_sample_contact_area
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_sample_contact_area
-    };
-    pe_status_sample_contact_area() { type = type_id; }
-    Vec3 ptTest; // checks if ptTest, projected along dirTest falls inside the convex hull of this entity's contacts
-    Vec3 dirTest;
-};
-
-struct pe_status_caps
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_caps
-    };
-    pe_status_caps() { type = type_id; }
-    unsigned int bCanAlterOrientation; // the entity can change orientation that is explicitly set from outside (by baking it into parts/geometries)
-};
-
-struct pe_status_constraint
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_constraint
-    };
-    pe_status_constraint() { type = type_id; idx = -1; }
-    int id;
-    int idx;
-    int flags;
-    Vec3 pt[2];
-    Vec3 n;
-    IPhysicalEntity* pBuddyEntity;
-    IPhysicalEntity* pConstraintEntity;
-};
-
-////////// area status
-
-struct pe_status_area
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_area
-    };
-    pe_status_area() { type = type_id; bUniformOnly = false; ctr.zero(); size.zero(); vel.zero(); MARK_UNUSED gravity; pLockUpdate = 0; pSurface = 0; }
-
-    // inputs.
-    Vec3 ctr, size;                         // query bounds
-    Vec3 vel;
-    bool bUniformOnly;
-
-    // outputs.
-    Vec3 gravity;
-    pe_params_buoyancy pb;
-    volatile int* pLockUpdate;
-    IGeometry* pSurface;
-};
-
-////////// living entity statuses
-
-struct pe_status_living
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_living
-    };
-    pe_status_living() { type = type_id; }
-
-    int bFlying; // whether entity has no contact with ground
-    float timeFlying; // for how long the entity was flying
-    Vec3 camOffset; // camera offset
-    Vec3 vel; // actual velocity (as rate of position change)
-    Vec3 velUnconstrained; // 'physical' movement velocity
-    Vec3 velRequested;  // velocity requested in the last action
-    Vec3 velGround; // velocity of the object entity is standing on
-    float groundHeight; // position where the last contact with the ground occured
-    Vec3 groundSlope;
-    int groundSurfaceIdx;
-    int groundSurfaceIdxAux; // contact with the ground that also has default collision flags
-    IPhysicalEntity* pGroundCollider;   // only returns an actual entity if the ground collider is not static
-    int iGroundColliderPart;
-    float timeSinceStanceChange;
-    //int bOnStairs; // tries to detect repeated abrupt ground height changes
-    int bStuck; // tries to detect cases when the entity cannot move as before because of collisions
-    volatile int* pLockStep; // internal timestepping lock
-    int iCurTime; // quantised time
-    int bSquashed; // entity is being pushed by heavy objects from opposite directions
-};
-
-struct pe_status_check_stance
-    : pe_status
-{
-    // checks whether new dimensions cause collisions; params have the same meaning as in pe_player_dimensions
-    enum entype
-    {
-        type_id = ePE_status_check_stance
-    };
-    pe_status_check_stance()
-        : dirUnproj(0, 0, 1)
-        , unproj(0) { type = type_id; MARK_UNUSED pos, q, sizeCollider, heightCollider, bUseCapsule; }
-
-    Vec3 pos;
-    quaternionf q;
-    Vec3 sizeCollider;
-    float heightCollider;
-    Vec3 dirUnproj;
-    float unproj;
-    int bUseCapsule;
-};
-
-////////// vehicle entity statuses
-
-struct pe_status_vehicle
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_vehicle
-    };
-    pe_status_vehicle() { type = type_id; }
-
-    float steer; // current steering angle
-    float pedal; // current engine pedal
-    int bHandBrake; // nonzero if handbrake is on
-    float footbrake; // nonzero if footbrake is pressed (range 0..1)
-    Vec3 vel;
-    int bWheelContact; // nonzero if at least one wheel touches ground
-    int iCurGear;
-    float engineRPM;
-    float clutch;
-    float drivingTorque;
-    int nActiveColliders;   // number of non-static contacting entities
-};
-
-struct pe_status_wheel
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_wheel
-    };
-    pe_status_wheel() { type = type_id; iWheel = 0; MARK_UNUSED partid; }
-    int iWheel;
-    int partid;
-
-    int bContact;   // nonzero if wheel touches ground
-    Vec3 ptContact; // point where wheel touches ground
-    Vec3 normContact; // contact normal
-    float w; // rotation speed
-    int bSlip;
-    Vec3 velSlip; // slip velocity
-    int contactSurfaceIdx;
-    float friction; // current friction applied
-    float suspLen; // current suspension spring length
-    float suspLenFull; // relaxed suspension spring length
-    float suspLen0; // initial suspension spring length
-    float r; // wheel radius
-    float torque; // driving torque
-    float steer; // current streeing angle
-    IPhysicalEntity* pCollider;
-};
-
-struct pe_status_vehicle_abilities
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_vehicle_abilities
-    };
-    pe_status_vehicle_abilities() { type = type_id; MARK_UNUSED steer; }
-
-    float steer; // should be set to requested steering angle
-    Vec3 rotPivot;  // returns turning circle center
-    float maxVelocity; // calculates maximum velocity of forward movement along a plane (steer is ignored)
-};
-
-////////// articulated entity statuses
-
-struct pe_status_joint
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_joint
-    };
-    pe_status_joint() { type = type_id; MARK_UNUSED partid, idChildBody; }
-
-    int idChildBody; // requested joint is identified by child body id
-    int partid; // ..or, alternatively, by any of parts that belong to it
-    unsigned int flags; // joint flags
-    Ang3 q; // current joint angles (controlled by physics)
-    Ang3 qext; // external angles (from animation)
-    Ang3 dq; // current joint angular velocities
-    quaternionf quat0; // orientation of child inside parent that corresponds to 0 angles
-};
-
-////////// rope entity statuses
-
-struct pe_status_rope
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_rope
-    };
-    pe_status_rope()
-        : pContactEnts(0)
-    {
-        type = type_id;
-        pPoints = pVelocities = pVtx = pContactNorms = 0;
-        nCollStat = nCollDyn = bTargetPoseActive = bStrained = 0;
-        stiffnessAnim = timeLastActive = 0;
-        nVtx = 0;
-        lock = 0;
-    }
-
-    int nSegments;
-    Vec3* pPoints; // expects the caller to provide an array of nSegments+1, if 0, no points are returned
-    Vec3* pVelocities; // expects the caller to provide an array of nSegments+1, if 0, no velocities are returned
-    int nCollStat, nCollDyn; // number of rope contacts with static and dynamic objects
-    int bTargetPoseActive; // current traget pose mode (0, 1, or 2)
-    float stiffnessAnim; // current target pose stiffness
-    int bStrained; // whether the rope is strained, either along a line or wrapped around objects
-    strided_pointer<IPhysicalEntity*> pContactEnts; // returns a pointer to internal data, the caller doesn't need to provide it
-    int nVtx;   // current number of vertices, used for ropes with dynamic subdivision
-    Vec3* pVtx; // expects the caller to provide the array
-    Vec3* pContactNorms; // normals for points (not vertices), expects a pointer from the caller
-    float timeLastActive;   // physics time when the rope was last active (not asleep)
-    Vec3 posHost;   // host (the entity part it's attached to) position that corresponds to the returned state
-    quaternionf qHost; // host's orientation
-    int lock; // for subdivided ropes: +1 to leave read-locked, -1 to release from a previously read-locked state; 0 - local locking only
-};
-
-////////// soft entity statuses
-
-enum ESSVFlags
-{
-    eSSV_LockPos = 1, // locks vertices (soft entity won't be able to update them until released)
-    eSSV_UnlockPos = 2    // release the vertices
-};
-
-struct pe_status_softvtx
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_softvtx
-    };
-    pe_status_softvtx()
-        : pVtx(0)
-        , pNormals(0) { type = type_id; pVtxMap = 0; flags = 0; }
-
-    int nVtx;
-    strided_pointer<Vec3> pVtx; // a pointer to an internal data; doesn't need to be filled
-    strided_pointer<Vec3> pNormals; // a pointer to an internal data; doesn't need to be filled
-    int* pVtxMap;   // mapping table mesh vertex->simulated vertex (can be 0)
-    IGeometry* pMesh; // phys mesh that reflects the simulated data
-    int flags; // see ESSVFlags
-    quaternionf qHost; // host's orientation
-    Vec3 posHost; // host (the entity part it's attached to) position that corresponds to the returned state
-    Vec3 pos;   // entity position that corresponds to the returned state
-    quaternionf q; // entity's orientation
-};
-
-////////// waterman statuses
-
-struct SWaterTileBase
-{
-    int bActive;
-    float* ph; // heights
-    Vec3* pvel; // velocities
-};
-
-struct pe_status_waterman
-    : pe_status
-{
-    enum entype
-    {
-        type_id = ePE_status_waterman
-    };
-    pe_status_waterman() { type = type_id; }
-
-    int bActive;
-    Matrix33 R;
-    Vec3 origin;
-    int nTiles, nCells; // number of tiles and cells in one dimension
-    SWaterTileBase** pTiles; // nTiles^2 entries
-};
-
-////////////////////////// Geometry structures /////////////////////
-
-////////// common geometries
-enum geom_flags
-{
-    // collisions between parts are checked if (part0->flagsCollider & part1->flags) !=0
-    geom_colltype0 = 0x0001, geom_colltype1 = 0x0002, geom_colltype2 = 0x0004, geom_colltype3 = 0x0008, geom_colltype4 = 0x0010,
-    geom_colltype5 = 0x0020, geom_colltype6 = 0x0040, geom_colltype7 = 0x0080, geom_colltype8 = 0x0100, geom_colltype9 = 0x0200,
-    geom_colltype10 = 0x0400, geom_colltype11 = 0x0800, geom_colltype12 = 0x1000, geom_colltype13 = 0x2000, geom_colltype14 = 0x4000,
-    geom_colltype_ray = 0x8000, // special colltype used by raytracing by default
-    geom_floats = 0x10000, // colltype required to apply buoyancy
-    geom_proxy = 0x20000, // only used in AddGeometry to specify that this geometry should go to pPhysGeomProxy
-    geom_structure_changes = 0x40000, // part is breaking/deforming
-    geom_can_modify = 0x80000, // geometry is cloned and is used in this entity only
-    geom_squashy = 0x100000, // part has 'soft' collisions (used for tree foliage proxy)
-    geom_log_interactions = 0x200000, // part will post EventPhysBBoxOverlap whenever something happens inside its bbox
-    geom_monitor_contacts = 0x400000, // part needs collision callback from the solver (used internally)
-    geom_manually_breakable = 0x800000,   // part is breakable outside the physics
-    geom_no_coll_response = 0x1000000, // collisions are detected and reported, but not processed
-    geom_mat_substitutor = 0x2000000, // geometry is used to change other collision's material id if the collision point is inside it
-    geom_break_approximation = 0x4000000, // applies capsule approximation after breaking (used for tree trunks)
-    geom_no_particle_impulse = 0x8000000, // phys particles don't apply impulses to this part; should be used in flagsCollider
-    geom_destroyed_on_break = 0x2000000, // should be used in flagsCollider
-    // mnemonic group names
-    geom_colltype_player = geom_colltype1, geom_colltype_explosion = geom_colltype2,
-    geom_colltype_vehicle = geom_colltype3, geom_colltype_foliage = geom_colltype4, geom_colltype_debris = geom_colltype5,
-    geom_colltype_foliage_proxy = geom_colltype13, geom_colltype_obstruct = geom_colltype14,
-    geom_colltype_solid = 0x0FFF & ~geom_colltype_explosion, geom_collides = 0xFFFF
-};
-
-
-
-struct pe_geomparams
-{
-    enum entype
-    {
-        type_id = ePE_geomparams
-    };
-    pe_geomparams()
-    {
-        type = type_id;
-        density = mass = 0;
-        pos.Set(0, 0, 0);
-        q.SetIdentity();
-        bRecalcBBox = 1;
-        flags = geom_colltype_solid | geom_colltype_ray | geom_floats | geom_colltype_explosion;
-        flagsCollider = geom_colltype0;
-        pMtx3x4 = 0;
-        pMtx3x3 = 0;
-        scale = 1.0f;
-        pLattice = 0;
-        pMatMapping = 0;
-        nMats = 0;
-        MARK_UNUSED surface_idx, minContactDist, idmatBreakable;
-    }
-
-    int type;
-    float density; // 0 if mass is used
-    float mass; // 0 if density is used
-    Vec3 pos; // offset from object's geometrical pivot
-    quaternionf q; // orientation relative to object
-    float scale;
-    Matrix34* pMtx3x4; // optional full transform matrix
-    Matrix33* pMtx3x3;  // optional 3x3 orintation+scale matrix
-    int surface_idx; // surface identifier (used if corresponding CGeometry does not contain materials)
-    unsigned int flags, flagsCollider;
-    float minContactDist;   // contacts closer then this threshold are merged
-    int idmatBreakable; // index for procedural (boolean) breakability
-    ITetrLattice* pLattice; // optional tetrahedral lattice (for lattice breaking and soft bodies)
-    int* pMatMapping;   // mapping of mat ids from geometry to final mat ids
-    int nMats;
-    int bRecalcBBox; // recalculate all bbox info after the part is added
-
-    VALIDATORS_START
-        VALIDATOR_RANGE(density, -1E8, 1E8)
-        VALIDATOR_RANGE(mass, -1E8, 1E8)
-        VALIDATOR(pos)
-        VALIDATOR_NORM_MSG(q, "(perhaps non-uniform scaling was used in the asset?)", pt)
-    VALIDATORS_END
-};
-
-////////// articulated entity geometries
-
-struct pe_articgeomparams
-    : pe_geomparams
-{
-    enum entype
-    {
-        type_id = ePE_articgeomparams
-    };
-    pe_articgeomparams() { type = type_id; idbody = 0; }
-    pe_articgeomparams(pe_geomparams& src)
-    {
-        type = type_id;
-        density = src.density;
-        mass = src.mass;
-        pos = src.pos;
-        q = src.q;
-        scale = src.scale;
-        surface_idx = src.surface_idx;
-        pLattice = src.pLattice;
-        pMatMapping = src.pMatMapping;
-        nMats = src.nMats;
-        pMtx3x4 = src.pMtx3x4;
-        pMtx3x3 = src.pMtx3x3;
-        flags = src.flags;
-        flagsCollider = src.flagsCollider;
-        idbody = 0;
-        idmatBreakable = src.idmatBreakable;
-        bRecalcBBox = src.bRecalcBBox;
-        if (!is_unused(src.minContactDist))
-        {
-            minContactDist = src.minContactDist;
-        }
-        else
-        {
-            MARK_UNUSED minContactDist;
-        }
-    }
-    int idbody; // id of the subbody this geometry is attached to, the 1st add geometry specifies frame CS of this subbody
-};
-
-////////// vehicle entity geometries
-
-const int NMAXWHEELS = 30;
-struct pe_cargeomparams
-    : pe_geomparams
-{
-    enum entype
-    {
-        type_id = ePE_cargeomparams
-    };
-    pe_cargeomparams()
-        : pe_geomparams() { type = type_id; MARK_UNUSED bDriving, minFriction, maxFriction, bRayCast, kLatFriction; bCanBrake = 1; bCanSteer = 1; kStiffnessWeight = 1.f; }
-    pe_cargeomparams(pe_geomparams& src)
-    {
-        type = type_id;
-        density = src.density;
-        mass = src.mass;
-        pos = src.pos;
-        q = src.q;
-        surface_idx = src.surface_idx;
-        idmatBreakable = src.idmatBreakable;
-        pLattice = src.pLattice;
-        pMatMapping = src.pMatMapping;
-        nMats = src.nMats;
-        pMtx3x4 = src.pMtx3x4;
-        pMtx3x3 = src.pMtx3x3;
-        flags = src.flags;
-        flagsCollider = src.flagsCollider;
-        MARK_UNUSED bDriving, minFriction, maxFriction, bRayCast;
-        bCanBrake = 1, bCanSteer = 1;
-        kStiffnessWeight = 1.f;
-    }
-    int bDriving;   // whether wheel is driving, -1 - geometry os not a wheel
-    int iAxle; // wheel axle, currently not used
-    int bCanBrake; // whether the wheel is locked during handbrakes
-    int bRayCast;   // whether the wheel use simple raycasting instead of geometry sweep check
-    int bCanSteer; // wheel the wheel can steer
-    Vec3 pivot; // upper suspension point in vehicle CS
-    float lenMax;   // relaxed suspension length
-    float lenInitial; // current suspension length (assumed to be length in rest state)
-    float kStiffness; // suspension stiffness, if 0 - calculate from lenMax, lenInitial, and vehicle mass and geometry
-    float kStiffnessWeight; // When autocalculating stiffness use this weight for this wheel. Note weights for wheels in front of the centre of mass do not influence the weights of wheels behind the centre of mass
-    float kDamping; // suspension damping, if <0 - calculate as -kdamping*(approximate zero oscillations damping)
-    float minFriction, maxFriction; // additional friction limits for tire friction
-    float kLatFriction; // coefficient for lateral friction
-};
-
-///////////////// tetrahedra lattice params ////////////////////////
-
-struct pe_tetrlattice_params
-    : pe_params
-{
-    enum entype
-    {
-        type_id = ePE_tetrlattice_params
-    };
-    pe_tetrlattice_params()
-    {
-        type = type_id;
-        MARK_UNUSED nMaxCracks, maxForcePush, maxForcePull, maxForceShift, maxTorqueTwist, maxTorqueBend, crackWeaken, density;
-    }
-
-    int nMaxCracks; // maximum cracks per update
-    float maxForcePush, maxForcePull, maxForceShift; // linear force limits
-    float maxTorqueTwist, maxTorqueBend; // angular force limits
-    float crackWeaken; // weakens faces neighbouring a newly generated crack (0..1)
-    float density; // also affects all force limits
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////// IGeometry Interface ////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-struct geom_world_data   // geometry orientation for Intersect() requests
-{
-    geom_world_data()
-    {
-        v.Set(0, 0, 0);
-        w.Set(0, 0, 0);
-        offset.Set(0, 0, 0);
-        R.SetIdentity();
-        centerOfMass.Set(0, 0, 0);
-        scale = 1.0f;
-        iStartNode = 0;
-    }
-    Vec3 offset;
-    Matrix33 R;
-    float scale;
-    Vec3 v, w;   // used to give hints about unprojection direction
-    Vec3 centerOfMass; // w is rotation around this point
-    int iStartNode; // for warm-starting (checks collisions in this node first)
-};
-
-struct intersection_params
-{
-    intersection_params()
-    {
-        iUnprojectionMode = 0;
-        vrel_min = 1E-6f;
-        time_interval = 100.0f;
-        maxSurfaceGapAngle = 1.0f * float(g_PI / 180);
-        pGlobalContacts = 0;
-        minAxisDist = 0;
-        bSweepTest = false;
-        centerOfRotation.Set(0, 0, 0);
-        axisContactNormal.Set(0, 0, 1);
-        unprojectionPlaneNormal.Set(0, 0, 0);
-        axisOfRotation.Set(0, 0, 0);
-        bKeepPrevContacts = false;
-        bStopAtFirstTri = false;
-        ptOutsidePivot[0].Set(1E11f, 1E11f, 1E11f);
-        ptOutsidePivot[1].Set(1E11f, 1E11f, 1E11f);
-        maxUnproj = 1E10f;
-        bNoAreaContacts = false;
-        bNoBorder = false;
-        bNoIntersection = 0;
-        bExactBorder = 0;
-        bThreadSafe = bThreadSafeMesh = 0;
-    }
-    int iUnprojectionMode; // 0-angular, 1-rotational
-    Vec3 centerOfRotation; // for mode 1 only
-    Vec3 axisOfRotation; // if left 0, will be set based on collision area normal
-    float time_interval; // used to set unprojection limits
-    float vrel_min; // if local relative velocity in contact area is above this, unprojects along its derection; otherwise along area normal
-    float maxSurfaceGapAngle;   // theshold for generating area contacts
-    float minAxisDist; // disables rotational unprojection if contact point is closer than this to the axis
-    Vec3 unprojectionPlaneNormal; // restrict linear unprojection to this plane
-    Vec3 axisContactNormal; // a mild hint about possible contact normal
-    float maxUnproj; // unprojections longer than this are discarded
-    Vec3 ptOutsidePivot[2]; // discard contacts that are not facing outward wrt this point
-    bool bSweepTest; // requests a linear sweep test along v*time_interval (v from geom_world_data)
-    bool bKeepPrevContacts; // append results to existing contact buffer
-    bool bStopAtFirstTri;   // stop after the first collision is detected
-    bool bNoAreaContacts;   // don't try to detect contact areas
-    bool bNoBorder; // don't trace contact border
-    int bExactBorder; // always tries to return a consequtive border (useful for boolean ops)
-    int bNoIntersection; // don't find all intersection points (only applies to primitive-primitive collisions)
-    int bBothConvex; // (output) both operands were convex
-    int bThreadSafe; // set if it's known that no other thread will contend for the internal intersection data (only used in PrimitiveWorldIntersection now)
-    int bThreadSafeMesh; // set if it's known that no other thread will try to modify the colliding geometry
-    geom_contact* pGlobalContacts; // pointer to thread's global contact buffer
-};
-
-struct phys_geometry
-{
-    IGeometry* pGeom;
-    Vec3 Ibody; // tensor of inertia in body frame
-    quaternionf q; // body frame
-    Vec3 origin;
-    float V; // volume
-    int nRefCount;
-    int surface_idx; // used for primitives and meshes without per-face ids
-    int* pMatMapping;   // mat mapping; can later be overridden inside entity part
-    int nMats;
-    PhysicsForeignData pForeignData;    // any external pointer to be associated with phys geometry
-};
-
-struct bop_newvtx
-{
-    int idx;             // vertex index in the resulting A phys mesh
-    int iBvtx;     // -1 if intersection vertex, >=0 if B vertex
-    int idxTri[2]; // intersecting triangles' foreign indices
-};
-
-struct bop_newtri
-{
-    int idxNew;  // a newly generated foreign index (can be remapped later)
-    int iop;     // triangle source 0=A, 1=B
-    int idxOrg;  // original (triangulated) triangle's foreign index
-    int iVtx[3]; // for each vertex, existing vertex index if >=0, -(new vertex index+1) if <0
-    float areaOrg; // original triangle's area
-    Vec3 area[3]; // areas of compementary triangles for each vertex (divide by original tri area to get barycentric coords)
-};
-
-struct bop_vtxweld
-{
-    void set(int _ivtxDst, int _ivtxWelded) { ivtxDst = _ivtxDst; ivtxWelded = _ivtxWelded; }
-    int ivtxDst : 16; // ivtxWelded is getting replaced with ivtxDst
-    int ivtxWelded : 16;
-};
-
-struct bop_TJfix
-{
-    void set(int _iACJ, int _iAC, int _iABC, int _iCA, int _iTJvtx) { iACJ = _iACJ; iAC = _iAC; iABC = _iABC; iCA = _iCA; iTJvtx = _iTJvtx; }
-    // A _____J____ C    (ACJ is a thin triangle on top of ABC; J is 'the junction vertex')
-    //   \      .     /      in ABC: set A->Jnew
-    //       \  . /          in ACJ: set J->Jnew, A -> A from original ABC, C -> B from original ABC
-    //           \/
-    //           B
-    int iABC; // big triangle's foreign idx
-    int iACJ; // small triangle's foreign idx
-    int iCA; // CA edge number in ABC
-    int iAC; // AC edge number in ACJ
-    int iTJvtx; // J vertex index
-};
-
-struct bop_meshupdate_thunk
-{
-    bop_meshupdate_thunk() { prevRef = nextRef = this; }
-    virtual ~bop_meshupdate_thunk() { prevRef->nextRef = nextRef; nextRef->prevRef = prevRef; prevRef = nextRef = this; }
-    bop_meshupdate_thunk* prevRef, * nextRef;
-};
-
-struct bop_meshupdate
-    : bop_meshupdate_thunk
-{
-    bop_meshupdate() { Reset(); }
-    virtual ~bop_meshupdate();
-
-    void Reset()
-    {
-        pRemovedVtx = 0;
-        pRemovedTri = 0;
-        pNewVtx = 0;
-        pNewTri = 0;
-        pWeldedVtx = 0;
-        pTJFixes = 0;
-        pMovedBoxes = 0;
-        nRemovedVtx = nRemovedTri = nNewVtx = nNewTri = nWeldedVtx = nTJFixes = nMovedBoxes = 0;
-        next = 0;
-        pMesh[0] = pMesh[1] = 0;
-        relScale = 1.0f;
-    }
-
-    IGeometry* pMesh[2]; // 0-dst (A), 1-src (B)
-    int* pRemovedVtx;
-    int nRemovedVtx;
-    int* pRemovedTri;
-    int nRemovedTri;
-    bop_newvtx* pNewVtx;
-    int nNewVtx;
-    bop_newtri* pNewTri;
-    int nNewTri;
-    bop_vtxweld* pWeldedVtx;
-    int nWeldedVtx;
-    bop_TJfix* pTJFixes;
-    int nTJFixes;
-    bop_meshupdate* next;
-    primitives::box* pMovedBoxes;
-    int nMovedBoxes;
-    float relScale;
-};
-
-struct trinfo
-{
-    trinfo& operator=(trinfo& src) { ibuddy[0] = src.ibuddy[0]; ibuddy[1] = src.ibuddy[1]; ibuddy[2] = src.ibuddy[2]; return *this; }
-    index_t ibuddy[3];
-};
-
-struct mesh_island   // mesh island is a connected group of trinagles
-{
-    int itri;   // first triangle
-    int nTris; // trinagle count
-    int iParent; // outer island is V<0
-    int iChild; // first islands inside it with V<0
-    int iNext; // maintains a linked list of iChild's inside iParent
-    float V; // can be negative (means it represents an inner surface)
-    Vec3 center; // geometrical center
-    int bProcessed; // for internal use
-};
-
-struct tri2isle     // maintains a linked triangle list inside an island
-{
-    unsigned int inext : 16;
-    unsigned int isle    : 15;
-    unsigned int bFree : 1;
-};
-
-struct mesh_data
-    : primitives::primitive
-{
-    index_t* pIndices;
-    char* pMats;
-    int* pForeignIdx;   // an int associated with each face
-    strided_pointer<Vec3> pVertices;
-    Vec3* pNormals;
-    int* pVtxMap;   // original vertex index->merged vertex index
-    trinfo* pTopology; // neighbours for each triangle's edge
-    int nTris, nVertices;
-    mesh_island* pIslands;
-    int nIslands;
-    tri2isle* pTri2Island;
-    int flags;
-};
-
-const int BOP_NEWIDX0 = 0x8000000;
-
-enum geomtypes
-{
-    GEOM_TRIMESH = primitives::triangle::type, GEOM_HEIGHTFIELD = primitives::heightfield::type, GEOM_CYLINDER = primitives::cylinder::type,
-    GEOM_CAPSULE = primitives::capsule::type, GEOM_RAY = primitives::ray::type, GEOM_SPHERE = primitives::sphere::type,
-    GEOM_BOX = primitives::box::type, GEOM_VOXELGRID = primitives::voxelgrid::type
-};
-enum foreigntypes
-{
-    DATA_OWNED_OBJECT = 1, DATA_MESHUPDATE = -1, DATA_UNUSED = -2
-};
-
-enum meshflags
-{
-    // mesh_shared_... flags mean that the mesh will not attempt to free the corresponding array upon deletion
-    mesh_shared_vtx = 1, mesh_shared_idx = 2, mesh_shared_mats = 4, mesh_shared_foreign_idx = 8,    mesh_shared_normals = 0x10,
-    // bounding volume flags (if several are specified in CreateMesh(), the best fitting one will be used)
-    mesh_OBB = 0x20, mesh_AABB = 0x40, mesh_SingleBB = 0x80, mesh_AABB_rotated = 0x40000, mesh_VoxelGrid = 0x80000,
-    // mesh_multicontact is a hint on how many contacts per node to expect; 0-one contact, 2-no limit, 1-balanced
-    mesh_multicontact0 = 0x100, mesh_multicontact1 = 0x200, mesh_multicontact2 = 0x400,
-    // mesh_approx flags are used in CreateMesh to specify which primitive approximations to try
-    mesh_approx_cylinder = 0x800, mesh_approx_box = 0x1000, mesh_approx_sphere = 0x2000, mesh_approx_capsule = 0x200000,
-    mesh_keep_vtxmap = 0x8000, // keeps vertex map after adjacent vertices were merged
-    mesh_keep_vtxmap_for_saving = 0x10000, // deletes vertex map after loading
-    mesh_no_vtx_merge = 0x20000, // does not attempt to merge adjacent vertices
-    mesh_always_static = 0x100000, // simplifies phys mass properties calculation if by just setting them to 0
-    mesh_full_serialization = 0x400000, // mesh will save all data to stream unconditionally
-    mesh_transient = 0x800000, // all mesh allocations will go to a flushable pool
-    mesh_no_booleans = 0x1000000, // disables boolean operations on the mesh
-    mesh_AABB_plane_optimise = 0x4000, // aabb generation is faster since it assumes the tri's are in a plane and distributed uniformly
-    mesh_no_filter = 0x2000000 // doesn't attempt to filter away degenerate triangles
-};
-enum meshAuxData
-{
-    mesh_data_materials = 1, mesh_data_foreign_idx = 2, mesh_data_vtxmap = 4
-};                                                                                       // used in DestroyAuxiliaryMeshData
-
-struct IOwnedObject
-{
-    // <interfuscator:shuffle>
-    virtual ~IOwnedObject(){}
-    virtual int Release() = 0;
-    // </interfuscator:shuffle>
-};
-
-struct SOcclusionCubeMap;
-
-struct IGeometry
-{
-    struct SBoxificationParams
-    {
-        SBoxificationParams() { minFaceArea = sqr(0.4f); distFilter = 0.2f; voxResolution = 100; maxFaceTiltAngle = DEG2RAD(10); minLayerFilling = 0.5f; maxLayerReusage = 0.8f; maxVoxIslandConnections = 0.5f; }
-        float minFaceArea; // ignore patches smaller than this in the box growing process
-        float distFilter;   // smooth away details smaller than this (in terms of linear size)
-        int voxResolution; // resolution of the grid in the longest direction
-        float maxFaceTiltAngle; // tolerance for patch alignment with box faces
-        float minLayerFilling; // stop growing boxes once layer fill percentage falls below this
-        float maxLayerReusage; // stop growing a box if it goes through already used cells (> than this percentage)
-        float maxVoxIslandConnections; // ignore isolated voxel islands that have more than this amount of connections to the used ones
-    };
-    // <interfuscator:shuffle>
-    virtual ~IGeometry(){}
-    virtual int GetType() = 0; // see enum geomtypes
-    virtual int AddRef() = 0;
-    virtual void Release() = 0;
-    virtual void Lock(int bWrite = 1) = 0; // locks the geometry for reading or writing
-    virtual void Unlock(int bWrite = 1) = 0; // bWrite should match the preceding Lock
-    virtual void GetBBox(primitives::box* pbox) = 0; // possibly oriented bbox (depends on BV tree type)
-    virtual int CalcPhysicalProperties(phys_geometry* pgeom) = 0;   // O(num_triangles) for meshes, unless mesh_always_static is set
-    virtual int PointInsideStatus(const Vec3& pt) = 0; // for meshes, will create an auxiliary hashgrid for acceleration
-    // IntersectLocked - the main function for geomtries. pdata1,pdata2,pparams can be 0 - defaults will be assumed.
-    // returns a pointer to an internal thread-specific contact buffer, locked with the lock argument
-    virtual int IntersectLocked(IGeometry* pCollider, geom_world_data* pdata1, geom_world_data* pdata2, intersection_params* pparams, geom_contact*& pcontacts,  WriteLockCond& lock) = 0;
-    virtual int IntersectLocked(IGeometry* pCollider, geom_world_data* pdata1, geom_world_data* pdata2, intersection_params* pparams, geom_contact*& pcontacts, WriteLockCond& lock, int iCaller) = 0;
-    // Intersect - same as Intersect, but doesn't lock pcontacts
-    virtual int Intersect(IGeometry* pCollider, geom_world_data* pdata1, geom_world_data* pdata2, intersection_params* pparams, geom_contact*& pcontacts) = 0;
-    // FindClosestPoint - for non-convex meshes only does local search, doesn't guarantee global minimum
-    // iFeature's format: (feature type: 2-face, 1-edge, 0-vertex)<<9 | feature index
-    // if ptdst0 and ptdst1 are different, searches for a closest point on a line segment
-    // ptres[0] is the closest point on the geometry, ptres[1] - on the test line segment
-    virtual int FindClosestPoint(geom_world_data* pgwd, int& iPrim, int& iFeature, const Vec3& ptdst0, const Vec3& ptdst1, Vec3* ptres, int nMaxIters = 10) = 0;
-    // CalcVolumetricPressure: a fairly correct computation of volumetric pressure with inverse-quadratic falloff (ex: explosions)
-    // for a surface fragment dS, impulse is: k*dS*cos(surface_normal,direction to epicenter) / max(rmin, distance to epicenter)^2
-    // returns integral impulse and angular impulse
-    virtual void CalcVolumetricPressure(geom_world_data* gwd, const Vec3& epicenter, float k, float rmin, const Vec3& centerOfMass, Vec3& P, Vec3& L) = 0;
-    // CalculateBuoyancy: computes the submerged volume (return value) and the mass center of the submerged part
-    virtual float CalculateBuoyancy(const primitives::plane* pplane, const geom_world_data* pgwd, Vec3& submergedMassCenter) = 0;
-    // CalculateMediumResistance: computes medium resistance integral of the surface; self flow of the medium should be baked into pgwd
-    // for a surface fragment dS with normal n and velocity v impulse is: -n*max(0,n*v) (can be scaled by the medium resistance coeff. later)
-    virtual void CalculateMediumResistance(const primitives::plane* pplane, const geom_world_data* pgwd, Vec3& dPres, Vec3& dLres) = 0;
-    // DrawWireframe: draws physics helpers; iLevel>0 will draaw a level in the bounding volume tree
-    virtual void DrawWireframe(IPhysRenderer* pRenderer, geom_world_data* gwd, int iLevel, int idxColor) = 0;
-    virtual int GetPrimitiveId(int iPrim, int iFeature) = 0; // get material id for a primitive (iFeature is ignored currently)
-    // GetPrimitive: expects a valid pprim pointer, type depends on GetType; meshes return primitives::triangle
-    virtual int GetPrimitive(int iPrim, primitives::primitive* pprim) = 0;
-    virtual int GetForeignIdx(int iPrim) = 0;   // only works for meshes
-    virtual Vec3 GetNormal(int iPrim, const Vec3& pt) = 0; // only implemented for meshes currently; pt is ignored
-    virtual int GetFeature(int iPrim, int iFeature, Vec3* pt) = 0; // returns vertices of face, edge, or vertex; only for boxes and meshes currently
-    virtual int IsConvex(float tolerance) = 0;
-    // PrepareForRayTest: creates an auxiliary hash structure for short rays test acceleration
-    virtual void PrepareForRayTest(float raylen) = 0;   // raylen - 'expected' ray length to optimize the hash for
-    // BuildOcclusionCubemap: cubemap projection-based occlusion (used for explosions); pGrids are 6 [nRes^2] arrays
-    // iMode: 0 - update cubemap in pGrid0; 1 - build cubemap in pGrid1, grow edges by nGrow cells, and compare with pGrid0
-    // all geometry closer than rmin is ignored (to avoid large projection scale); same if farther than rmax
-    virtual float BuildOcclusionCubemap(geom_world_data* pgwd, int iMode, SOcclusionCubeMap* cubemap0, SOcclusionCubeMap* cubemap1, int nGrow) = 0;
-    virtual void GetMemoryStatistics(ICrySizer* pSizer) = 0;
-    virtual void Save(CMemStream& stm) = 0;
-    virtual void Load(CMemStream& stm) = 0;
-    // Load: meshes can avoid storing vertex, index, and mat id data, in this case same arrays should be provided during loading
-    virtual void Load(CMemStream& stm, strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pIds) = 0;
-    virtual int GetPrimitiveCount() = 0;
-    virtual const primitives::primitive* GetData() = 0; // returns an pointer to an internal structure; for meshes returns mesh_data
-    virtual void SetData(const primitives::primitive*) = 0; // not supported by meshes
-    virtual float GetVolume() = 0;
-    virtual Vec3 GetCenter() = 0;
-    // Subtract: performs boolean subtraction; if bLogUpdates==1, will create bop_meshupdate inside the mesh
-    virtual int Subtract(IGeometry* pGeom, geom_world_data* pdata1, geom_world_data* pdata2, int bLogUpdates = 1) = 0;
-    virtual int GetSubtractionsCount() = 0; // number of Subtract()s the mesh has survived so far
-    // GetForeignData: returns a pointer associated with the geometry
-    // special: GetForeignData(DATA_MESHUPDATE) returns the internal bop_meshupdate list (does not interfere with the main foreign pointer)
-    virtual PhysicsForeignData GetForeignData(int iForeignData = 0) = 0;
-    virtual int GetiForeignData() = 0; // foreign data type
-    virtual void SetForeignData(PhysicsForeignData pForeignData, int iForeignData) = 0;
-    virtual int GetErrorCount() = 0; // for meshes, the number of edges that don't belong to exactly 2 triangles
-    virtual void DestroyAuxilaryMeshData(int idata) = 0; // see meshAuxData enum
-    virtual void RemapForeignIdx(int* pCurForeignIdx, int* pNewForeignIdx, int nTris) = 0; // used in rendermesh-physics sync after boolean ops
-    virtual void AppendVertices(Vec3* pVtx, int* pVtxMap, int nVtx) = 0; // used in rendermesh-physics sync after boolean ops
-    virtual float GetExtent(EGeomForm eForm) const = 0;
-    virtual void GetRandomPos(PosNorm& ran, EGeomForm eForm) const = 0;
-    virtual void CompactMemory() = 0; // used only by non-breakable meshes to compact non-shared vertices into same contingous block of memory
-    // Boxify: attempts to build a set of boxes covering the geometry's volume (only supported by trimeshes)
-    virtual int Boxify(primitives::box* pboxes, int nMaxBoxes, const SBoxificationParams& params) = 0;
-    // Sanity check the geometry. i.e. its tree doesn't have an excessive depth. returns 0 if fails
-    virtual int SanityCheck() = 0;
-    // </interfuscator:shuffle>
-};
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////// IGeometryManager Interface /////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-struct SMeshBVParams {};
-
-struct SBVTreeParams
-    : SMeshBVParams
-{
-    int nMinTrisPerNode; // if a split creates a node with <nMinTris triangles, another split is attempted
-    int nMaxTrisPerNode; // nodes are split until they have more triangles than this
-    float favorAABB; // when several BV trees are requested in CreateMesh, it selects the one with the smallest volume; favorAABB scales AABB's volume down
-};
-
-struct SVoxGridParams
-    : SMeshBVParams                     // voxel grid is a regular 3d grid collision test acceleration structure
-{
-    Vec3 origin;
-    Vec3 step;
-    Vec3i size;
-};
-
-struct ITetrLattice
-{
-    // <interfuscator:shuffle>
-    virtual ~ITetrLattice(){}
-    virtual int SetParams(const pe_params*) = 0;  // only accepts pe_tetrlattice_params
-    virtual int GetParams(pe_params*) = 0;
-    virtual void DrawWireframe(IPhysRenderer* pRenderer, geom_world_data* gwd, int idxColor) = 0;
-    virtual IGeometry* CreateSkinMesh(int nMaxTrisPerBVNode = 8) = 0; // builds triangle mesh for exterior faces
-    virtual int CheckPoint(const Vec3& pt, int* idx, float* w) = 0; // check if a point is inside any tetrahedron, fills barycentric weights[4]
-    virtual void Release() = 0;
-    // </interfuscator:shuffle>
-};
-
-struct IBreakableGrid2d
-{
-    // <interfuscator:shuffle>
-    virtual ~IBreakableGrid2d(){}
-    // BreakIntoChunks: emulates fracure in the grid around pt with dimensions r x ry
-    // ptout receives a pointer to a vertex array
-    // return value is an allocated array of indices, 3 per triangle, -1 marks contour end, -2 array end
-    // maxPatchTris tells to unite broken trianges into patches of up to this size; 0 means broken triangles are discarded
-    // jointhresh (0..1) affects the way triangles unite into patches
-    // seed bootsraps the RNG if >=0
-    // hole edges are filtered to removes corners sharper than filterAng (except those that are formed by several joined triangles)
-    virtual int* BreakIntoChunks(const vector2df& pt, float r, vector2df*& ptout, int maxPatchTris, float jointhresh, int seed = -1, float filterAng = 0.0f, float ry = 0.0f) = 0;
-    virtual primitives::grid* GetGridData() = 0;
-    virtual bool IsEmpty() = 0;
-    virtual void Release() = 0;
-    virtual float GetFracture() = 0; // destroyed percentage so far
-    virtual void GetMemoryStatistics(ICrySizer* pSizer) const = 0;
-    // </interfuscator:shuffle>
-};
-
-
-struct IGeomManager
-{
-    // <interfuscator:shuffle>
-    virtual ~IGeomManager(){}
-    virtual void InitGeoman() = 0;
-    virtual void ShutDownGeoman() = 0;
-
-    // CreateMesh - depending on flags (see enum meshflags) can create either a mesh or a primitive that approximates
-    // approx_tolerance is the approximation tolerance in relative units
-    // pMats are per-face material ids (which can later be mapped via pMatMapping)
-    // pForeignIdx store any user data per face (internally indices might be sorted when building BV structure, pForegnIdx will reflect that)
-    virtual IGeometry* CreateMesh(strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pMats, int* pForeignIdx, int nTris, int flags, float approx_tolerance = 0.05f, int nMinTrisPerNode = 2, int nMaxTrisPerNode = 4, float favorAABB = 1.0f) = 0;
-    virtual IGeometry* CreateMesh(strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pMats, int* pForeignIdx, int nTris, int flags, float approx_tolerance, SMeshBVParams* pParams) = 0;  // this version can take SVoxGridParams in pParams, if mesh_VoxelGrid is set
-    virtual IGeometry* CreatePrimitive(int type, const primitives::primitive* pprim) = 0; // used to create primitives explicitly
-    virtual void DestroyGeometry(IGeometry* pGeom) = 0; // just calls Release() on pGeom
-
-    // RegisterGeometry: creates a phys_geometry structure for IGeometry, computes mass properties
-    // phys_geometries are managed in pools internally; the new structure has nRefCount 1
-    // defSurfaceIdx will be used (until overwritten in entity part) if the geometry doesn't have per-face materials
-    virtual phys_geometry* RegisterGeometry(IGeometry* pGeom, int defSurfaceIdx = 0, int* pMatMapping = 0, int nMats = 0) = 0;
-    virtual int AddRefGeometry(phys_geometry* pgeom) = 0;
-    virtual int UnregisterGeometry(phys_geometry* pgeom) = 0;   // decreases nRefCount, frees the pool slot if <=0
-    virtual void SetGeomMatMapping(phys_geometry* pgeom, int* pMatMapping, int nMats) = 0;
-
-    virtual void SaveGeometry(CMemStream& stm, IGeometry* pGeom) = 0;
-    virtual IGeometry* LoadGeometry(CMemStream& stm, strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pMats) = 0;
-    virtual void SavePhysGeometry(CMemStream& stm, phys_geometry* pgeom) = 0;
-    virtual phys_geometry* LoadPhysGeometry(CMemStream& stm, strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pIds) = 0;
-    virtual IGeometry* CloneGeometry(IGeometry* pGeom) = 0;
-
-    virtual ITetrLattice* CreateTetrLattice(const Vec3* pt, int npt, const int* pTets, int nTets) = 0;
-    // RegisterCrack: cracks are used for ITertLattice-induced breaking to subtract a shape whenever a tetrahedral face breaks
-    // pVtx specify 3 control vertices; when applying, they are affinely stretched to match the broken face's corners
-    // idmat is breakability index
-    virtual int RegisterCrack(IGeometry* pGeom, Vec3* pVtx, int idmat) = 0;
-    virtual void UnregisterCrack(int id) = 0;
-    virtual void UnregisterAllCracks(void (* OnRemoveGeom)(IGeometry* pGeom) = 0) = 0;
-    // GetCrackGeom - creates a stretched crack based on the three corner vertices (pt[3])
-    // pgwd receives it world transformation
-    virtual IGeometry* GetCrackGeom(const Vec3* pt, int idmat, geom_world_data* pgwd) = 0;
-
-    // GenerateBreakebleGrid - creates a perturbed regular grid of points
-    // ptsrc's bbox is split into a nCells grid (with an additional border)
-    // vertices are randomly perturbed up to 0.4 cell size (seed can bootstrap the randomizer)
-    // ptsrc is "painted" into the grid, snapping the closest grid vertices to ptsrc (but no new ones are created at this stage)
-    // bStatic is ignored currently
-    virtual IBreakableGrid2d* GenerateBreakableGrid(vector2df* ptsrc, int npt, const vector2di& nCells, int bStatic = 1, int seed = -1) = 0;
-
-    virtual void ReleaseGeomsImmediately(bool bReleaseImmediately) = 0;
-    // </interfuscator:shuffle>
-};
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////// IPhysUtils Interface /////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-typedef void* (* qhullmalloc)(size_t);
-
-struct IPhysUtils
-{
-    // <interfuscator:shuffle>
-    virtual ~IPhysUtils(){}
-    // CoverPolygonWithCircles - attempts to fits circles to roughly cover a polygon (can used to generate round spalshes over an area)
-    // bConsecutive is false, uses convex hull of the points
-    // center is a pre-calculated geometrical center of pt's
-    // outputs data into centers and radii arrays, which use global buffers; returns the number of circles
-    virtual int CoverPolygonWithCircles(strided_pointer<vector2df> pt, int npt, bool bConsecutive, const vector2df& center, vector2df*& centers, float*& radii, float minCircleRadius) = 0;
-    virtual int qhull(strided_pointer<Vec3> pts, int npts, index_t*& pTris, qhullmalloc qmalloc = 0) = 0;
-    virtual void DeletePointer(void* pdata) = 0; // should be used to free data allocated in physics
-    virtual int TriangulatePoly(vector2df* pVtx, int nVtx, int* pTris, int szTriBuf) = 0;
-    // </interfuscator:shuffle>
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////// IPhysicalEntity Interface //////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-enum snapshot_flags
-{
-    ssf_compensate_time_diff = 1, ssf_checksum_only = 2, ssf_no_update = 4
-};
-
-struct IPhysicalEntity
-{
-    // <interfuscator:shuffle>
-    virtual ~IPhysicalEntity(){}
-    virtual pe_type GetType() const = 0; // returns pe_type
-
-    virtual int AddRef() = 0;
-    virtual int Release() = 0;
-
-    // SetParams - changes parameters; can be queued and executed later if the physics is busy (unless bThreadSafe is flagged)
-    // returns !0 if successful
-    virtual int SetParams(const pe_params* params, int bThreadSafe = 0) = 0;
-    virtual int GetParams(pe_params* params) const = 0; // uses the same structures as SetParams; returns !0 if successful
-    virtual int GetStatus(pe_status* status) const = 0; // generally returns >0 if successful, but some pe_status'es have special meaning
-    virtual int Action(const pe_action*, int bThreadSafe = 0) = 0; // like SetParams, can get queued
-
-    // AddGeometry - add a new entity part, containing pgeom; request can get queued
-    // params can be specialized depending on the entity type
-    // id is a requested geometry id (expected to be unique), if -1 - assign automatically
-    // returns geometry id (0..some number), -1 means error
-    virtual int AddGeometry(phys_geometry* pgeom, pe_geomparams* params, int id = -1, int bThreadSafe = 0) = 0;
-    virtual void RemoveGeometry(int id, int bThreadSafe = 0) = 0; // returns !0 if successful; can get queued
-
-    virtual PhysicsForeignData GetForeignData(int itype = 0) const = 0; // returns entity's pForeignData if itype matches iForeignData, 0 otherwise
-    virtual int GetiForeignData() const = 0; // returns entity's iForegnData
-
-    virtual int GetStateSnapshot(class CStream& stm, float time_back = 0, int flags = 0) = 0;   // obsolete, was used in Far Cry
-    virtual int GetStateSnapshot(TSerialize ser, float time_back = 0, int flags = 0) = 0;
-    virtual int SetStateFromSnapshot(class CStream& stm, int flags = 0) = 0; // obsolete
-    virtual int PostSetStateFromSnapshot() = 0; // obsolete
-    virtual unsigned int GetStateChecksum() = 0; // obsolete
-    virtual void SetNetworkAuthority(int authoritive = -1, int paused = -1) = 0;     // -1 dont change, 0 - set to false, 1 - set to true
-
-    virtual int SetStateFromSnapshot(TSerialize ser, int flags = 0) = 0;
-    virtual int SetStateFromTypedSnapshot(TSerialize ser, int type, int flags = 0) = 0;
-    virtual int GetStateSnapshotTxt(char* txtbuf, int szbuf, float time_back = 0) = 0; // packs state into ASCII text
-    virtual void SetStateFromSnapshotTxt(const char* txtbuf, int szbuf) = 0;
-
-    // DoStep: evolves entity in time. Normally this is called from PhysicalWorld::TimeStep
-    virtual int DoStep(float time_interval) = 0;
-    virtual int DoStep(float time_interval, int iCaller) = 0;
-    virtual void StartStep(float time_interval) = 0; // must be called before DoStep
-    virtual void StepBack(float time_interval) = 0;
-
-    virtual void GetMemoryStatistics(ICrySizer* pSizer) const = 0;
-    // </interfuscator:shuffle>
-};
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////// IPhysicsEventClient Interface //////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-struct IPhysicsEventClient   // obsolete, replaced with event system (EventPhys...)
-{   // <interfuscator:shuffle>
-    virtual ~IPhysicsEventClient(){}
-    virtual void OnBBoxOverlap(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, IPhysicalEntity* pCollider, void* pColliderForeignData, int iColliderForeignData) = 0;
-    virtual void OnStateChange(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, int iOldSimClass, int iNewSimClass) = 0;
-    virtual void OnCollision(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, coll_history_item* pCollision) = 0;
-    virtual int OnImpulse(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, pe_action_impulse* impulse) = 0;
-    virtual void OnPostStep(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, float dt) = 0;
-    // </interfuscator:shuffle>
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////// IPhysicalWorld Interface //////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-enum draw_helper_flags
-{
-    pe_helper_collisions = 1, pe_helper_geometry = 2, pe_helper_bbox = 4, pe_helper_lattice = 8
-};
-enum surface_flags
-{
-    sf_pierceable_mask = 0x0F, sf_max_pierceable = 0x0F, sf_important = 0x200, sf_manually_breakable = 0x400, sf_matbreakable_bit = 16
-};
-#define sf_pierceability(i) (i)
-#define sf_matbreakable(i) (((i) + 1) << sf_matbreakable_bit)
-enum rwi_flags   // see RayWorldIntersection
-{
-    rwi_ignore_terrain_holes = 0x20, rwi_ignore_noncolliding = 0x40, rwi_ignore_back_faces = 0x80, rwi_ignore_solid_back_faces = 0x100,
-    rwi_pierceability_mask = 0x0F, rwi_pierceability0 = 0, rwi_stop_at_pierceable = 0x0F,
-    rwi_separate_important_hits = sf_important,   // among pierceble hits, materials with sf_important will have priority
-    rwi_colltype_bit = 16, // used to manually specify collision geometry types (default is geom_colltype_ray)
-    rwi_colltype_any = 0x400, // if several colltype flag are specified, switches between requiring all or any of them in a geometry
-    rwi_queue = 0x800, // queues the RWI request, when done it'll generate EventPhysRWIResult
-    rwi_force_pierceable_noncoll = 0x1000, // non-colliding geometries will be treated as pierceable regardless of the actual material
-    rwi_update_last_hit = 0x4000, // update phitLast with the current hit results (should be set if the last hit should be reused for a "warm" start)
-    rwi_any_hit = 0x8000 // returns the first found hit for meshes, not necessarily the closets
-};
-#define rwi_pierceability(pty) (pty)
-#define rwi_colltype_all(colltypes) ((colltypes) << rwi_colltype_bit)
-#define rwi_colltype_any(colltypes) ((colltypes) << rwi_colltype_bit | rwi_colltype_any)
-enum entity_query_flags   // see GetEntitiesInBox and RayWorldIntersection
-{
-    ent_static = 1, ent_sleeping_rigid = 2, ent_rigid = 4, ent_living = 8, ent_independent = 16, ent_deleted = 128, ent_terrain = 0x100,
-    ent_all = ent_static | ent_sleeping_rigid | ent_rigid | ent_living | ent_independent | ent_terrain,
-    ent_flagged_only = pef_update, ent_skip_flagged = pef_update * 2, // "flagged" meas has pef_update set
-    ent_areas = 32, ent_triggers = 64,
-    ent_ignore_noncolliding = 0x10000,
-    ent_sort_by_mass = 0x20000, // sort by mass in ascending order
-    ent_allocate_list = 0x40000, // if not set, the function will return an internal pointer
-    ent_addref_results = 0x100000, // will call AddRef on each entity in the list (expecting the caller call Release)
-    ent_water = 0x200, // can only be used in RayWorldIntersection
-    ent_no_ondemand_activation = 0x80000, // can only be used in RayWorldIntersection
-    ent_delayed_deformations = 0x80000 // queues procedural breakage requests; can only be used in SimulateExplosion
-};
-enum phys_locks
-{
-    PLOCK_WORLD_STEP = 1, PLOCK_CALLER0, PLOCK_CALLER1, PLOCK_QUEUE, PLOCK_AREAS
-};
-
-struct phys_profile_info
-{
-    IPhysicalEntity* pEntity;
-    int nTicks, nCalls;
-    int nTicksLast, nCallsLast;
-    int nTicksAvg;
-    float nCallsAvg;
-    int nTicksPeak, nCallsPeak, peakAge;
-    int nTicksStep;
-    int id;
-    const char* pName;
-};
-
-struct phys_job_info
-{
-    int jobType;
-    int nInvocations;
-    int nFallbacks;
-    int64 nTicks, nLatency, nLatencyAbs;
-    int64 nTicksPeak, nLatencyPeak, nLatencyAbsPeak, peakAge;
-    const char* pName;
-};
-
-struct SolverSettings
-{
-    int nMaxStackSizeMC;                            // def 8
-    float maxMassRatioMC;                           // def 50
-    int nMaxMCiters;                                    // def 1400
-    int nMinMCiters;                  // def 4
-    int nMaxMCitersHopeless;                    // def 400
-    float accuracyMC;                                   // def 0.005
-    float accuracyLCPCG;                            // def 0.005
-    int nMaxContacts;                                   // def 150
-    int nMaxPlaneContacts;            // def 7
-    int nMaxPlaneContactsDistress;      // def 4
-    int nMaxLCPCGsubiters;                      // def 120
-    int nMaxLCPCGsubitersFinal;             // def 250
-    int nMaxLCPCGmicroiters;
-    int nMaxLCPCGmicroitersFinal;
-    int nMaxLCPCGiters;                             // def 5
-    float minLCPCGimprovement;        // def 0.1
-    int nMaxLCPCGFruitlessIters;            // def 4
-    float accuracyLCPCGnoimprovement;   // def 0.05
-    float minSeparationSpeed;                   // def 0.02
-    float maxvCG;
-    float maxwCG;
-    float maxvUnproj;
-    int bCGUnprojVel;
-    float maxMCMassRatio;
-    float maxMCVel;
-    int maxLCPCGContacts;
-};
-
-enum entity_out_of_bounds_flags
-{
-    raycast_out_of_bounds = 1,        // Affects ray casts. NB, ray casting out of bounds entities can cause performance issues
-    get_entities_out_of_bounds = 2,   // Affects GetEntitiesAround.
-};
-
-struct PhysicsVars
-    : SolverSettings
-{
-    int bFlyMode;
-    int iCollisionMode;
-    int bSingleStepMode;
-    int bDoStep;
-    float fixedTimestep;
-    float timeGranularity;
-    float maxWorldStep;
-    int iDrawHelpers;
-    int iOutOfBounds;
-    float maxContactGap;
-    float maxContactGapPlayer;
-    float minBounceSpeed;
-    int bProhibitUnprojection;
-    int bUseDistanceContacts;
-    float unprojVelScale;
-    float maxUnprojVel;
-    float maxUnprojVelRope;
-    int bEnforceContacts;
-    int nMaxSubsteps;
-    int nMaxSurfaces;
-    Vec3 gravity;
-    int nGroupDamping;
-    float groupDamping;
-    int nMaxSubstepsLargeGroup;
-    int nBodiesLargeGroup;
-    int bBreakOnValidation;
-    int bLogActiveObjects;
-    int bProfileEntities;
-    int bProfileFunx;
-    int bProfileGroups;
-    int nGEBMaxCells;
-    int nMaxEntityCells;
-    int nMaxAreaCells;
-    float maxVel;
-    float maxVelPlayers;
-    float maxVelBones;
-    float maxContactGapSimple;
-    float penaltyScale;
-    int bSkipRedundantColldet;
-    int bLimitSimpleSolverEnergy;
-    int nMaxEntityContacts;
-    int bLogLatticeTension;
-    int nMaxLatticeIters;
-    int bLogStructureChanges;
-    float tickBreakable;
-    float approxCapsLen;
-    int nMaxApproxCaps;
-    int bPlayersCanBreak;
-    float lastTimeStep;
-    int bMultithreaded;
-    float breakImpulseScale;
-    float rtimeGranularity;
-    float massLimitDebris;
-    int flagsColliderDebris;
-    int flagsANDDebris;
-    int maxRopeColliderSize;
-    int maxSplashesPerObj;
-    float splashDist0, minSplashForce0, minSplashVel0;
-    float splashDist1, minSplashForce1, minSplashVel1;
-    int bDebugExplosions;
-    float jointGravityStep;
-    float   jointDmgAccum;
-    float   jointDmgAccumThresh;
-    float timeScalePlayers;
-    float threadLag;
-    int numThreads;
-    int physCPU;
-    int physWorkerCPU;
-    Vec3 helperOffset;
-    int64 ticksPerSecond;
-    // net-synchronization related
-#if USE_IMPROVED_RIGID_ENTITY_SYNCHRONISATION
-    float netInterpTime;
-    float netExtrapMaxTime;
-    int netSequenceFrequency;
-    int netDebugDraw;
-#else
-    float netMinSnapDist;
-    float netVelSnapMul;
-    float netMinSnapDot;
-    float netAngSnapMul;
-    float netSmoothTime;
-#endif
-
-    int bEntGridUseOBB;
-    int nStartupOverloadChecks;
-    float breakageMinAxisInertia;   // For procedural breaking, each axis must have a minium inertia compared to the axis with the largest inertia (0.01-1.00)
-
-    int bForceSyncPhysics;
-};
-
-struct ray_hit
-{
-    float dist;
-    IPhysicalEntity* pCollider;
-    int ipart;
-    int partid;
-    short surface_idx;
-    short idmatOrg; // original material index, not mapped with material mapping
-    int foreignIdx;
-    int iNode; // BV tree node that had the intersection; can be used for "warm start" next time
-    Vec3 pt;
-    Vec3 n; // surface normal
-    int bTerrain;   // global terrain hit
-    int iPrim; // hit triangle index
-    ray_hit* next; // reserved for internal use, do not change
-};
-
-struct ray_hit_cached   // used in conjunction with rwi_reuse_last_hit
-{
-    ray_hit_cached() { pCollider = 0; ipart = 0; }
-    ray_hit_cached(const ray_hit& hit) { pCollider = hit.pCollider; ipart = hit.ipart; iNode = hit.iNode; }
-    ray_hit_cached& operator=(const ray_hit& hit) { pCollider = hit.pCollider; ipart = hit.ipart; iNode = hit.iNode; return *this; }
-
-    IPhysicalEntity* pCollider;
-    int ipart;
-    int iNode;
-};
-
-#ifndef PWI_NAME_TAG
-#define PWI_NAME_TAG "PrimitiveWorldIntersection"
-#endif
-#ifndef RWI_NAME_TAG
-#define RWI_NAME_TAG "RayWorldIntersection"
-#endif
-
-struct pe_explosion     // see SimulateExplosion
-{
-    pe_explosion() { nOccRes = 0; nGrow = 0; rminOcc = 0.1f; holeSize = 0; explDir.Set(0, 0, 1); iholeType = 0; forceDeformEntities = false; }
-    Vec3 epicenter; // epicenter for the occlusion computation
-    Vec3 epicenterImp; // epicenter for impulse computation
-    // the impulse a surface fragment with area dS and normal n gets is: dS*k*n*max(0,n*dir_to_epicenter)/max(rmin, dist_to_epicenter)^2
-    // k is selected in such way that at impulsivePressureAtR = k/r^2
-    float rmin, rmax, r;
-    float impulsivePressureAtR;
-    int nOccRes; // resolution of the occlusion map (0 disables)
-    int nGrow; // grow occlusion projections by this amount of cells to allow explosion to reach around corners a bit
-    float rminOcc; // ignores geometry closer than this for occlusion computations
-    float holeSize; // explosion shape for iholeType will be scaled by this holeSize / shape's declared size
-    Vec3 explDir;   // hit direction, for aligning the explosion boolean shape
-    int iholeType; // breakability index for the explosion (<0 disables)
-    bool forceDeformEntities; // force deformation even if breakImpulseScale is zero
-    // filled as results
-    IPhysicalEntity** pAffectedEnts;
-    float* pAffectedEntsExposure;   // 0..1 exposure, computed from the occlusion map
-    int nAffectedEnts;
-};
-
-// Physics events can be logged or immediate. The former are posted to the event queue and the client handler is called
-// during PumpLoggedEvents function. The latter are call client handlers immediately when they happen, which is likely
-// to be inside the physics thread, so the handler must be thread-safe.
-// In most cases, in order to generate events the entity must have the corresponding flag set
-// Important Note: Please keep event ids contigous in respect to being stereo or mono events
-struct EventPhys
-{
-    EventPhys* next;
-    int idval;
-};
-
-struct EventPhysStereo
-    : EventPhys                      // base for two-entity events, ids 0-2
-{
-    IPhysicalEntity* pEntity[2];
-    PhysicsForeignData pForeignData[2];
-    int iForeignData[2];
-};
-
-struct EventPhysMono
-    : EventPhys                    // base for one-entity events, ids 3-16
-{
-    IPhysicalEntity* pEntity;
-    PhysicsForeignData pForeignData;
-    int iForeignData;
-};
-
-struct EventPhysBBoxOverlap
-    : EventPhysStereo                           // generated by triggers and parts with geom_log_interactions
-{
-    enum entype
-    {
-        id = 0, flagsCall = 0, flagsLog = 0
-    };
-    EventPhysBBoxOverlap() { idval = id; }
-};
-
-enum EventPhysCollisionState
-{
-    EPC_DEFERRED_INITIAL, EPC_DEFERRED_REQUEUE, EPC_DEFERRED_FINISHED
-};
-
-struct EventPhysCollision
-    : EventPhysStereo
-{
-    enum entype
-    {
-        id = 2, flagsCall = pef_monitor_collisions, flagsLog = pef_log_collisions
-    };
-    EventPhysCollision() { idval = id; pEntContact = 0; iPrim[0] = iPrim[1] = -1; deferredState = EPC_DEFERRED_INITIAL; fDecalPlacementTestMaxSize = 1000.f; }
-    int idCollider; // in addition to pEntity[1]
-    Vec3 pt; // contact point in world coordinates
-    Vec3 n; // contact normal
-    Vec3 vloc[2];   // velocities at the contact point
-    float mass[2];
-    int partid[2];
-    short idmat[2];
-    short iPrim[2];
-    float penetration; // contact's penetration depth
-    float normImpulse; // impulse applied by the solver to resolve the collision
-    float radius;   // some characteristic size of the contact area
-    void* pEntContact; // reserved for internal use
-    char deferredState; // EventPhysCollisionState
-    char deferredResult; // stores the result returned by the deferred event
-    float fDecalPlacementTestMaxSize; // maximum allowed size of decals caused by this collision
-};
-
-struct EventPhysStateChange
-    : EventPhysMono                             // triggered by simclass changes, even those caused by SetParams
-{
-    enum entype
-    {
-        id = 8, flagsCall = pef_monitor_state_changes, flagsLog = pef_log_state_changes
-    };
-    EventPhysStateChange() { idval = id; }
-    int iSimClass[2];
-    float timeIdle; // how long the entity stayed without external activation (such as impulses)
-    Vec3 BBoxOld[2];
-    Vec3 BBoxNew[2];
-};
-
-struct EventPhysEnvChange
-    : EventPhysMono                         // called when something around the entityy breaks
-{
-    enum entype
-    {
-        id = 3, flagsCall = pef_monitor_env_changes, flagsLog = pef_log_env_changes
-    };
-    enum encode
-    {
-        EntStructureChange = 0
-    };
-    EventPhysEnvChange() { idval = id; }
-    int iCode;
-    IPhysicalEntity* pentSrc;   // entity that broke
-    IPhysicalEntity* pentNew;   // new entity that broke off the original one
-};
-
-struct EventPhysPostStep
-    : EventPhysMono                        // entity has just completed its step
-{
-    enum entype
-    {
-        id = 4, flagsCall = pef_monitor_poststep, flagsLog = pef_log_poststep
-    };
-    EventPhysPostStep() { idval = id; }
-    float dt;
-    Vec3 pos;
-    quaternionf q;
-    int idStep; // world's internal step count
-};
-
-struct EventPhysUpdateMesh
-    : EventPhysMono                          // physics mesh changed
-{
-    enum entype
-    {
-        id = 5, flagsCall = 1, flagsLog = 2
-    };
-    enum reason
-    {
-        ReasonExplosion, ReasonFracture, ReasonRequest, ReasonDeform
-    };
-    EventPhysUpdateMesh() { idval = id; idx = -1; pMesh = 0; }
-    int partid;
-    int bInvalid;
-    int iReason; // see enum reason
-    IGeometry* pMesh;   // ->GetForeignData(DATA_MESHUPDATE) returns a list of bop_meshupdates
-    bop_meshupdate* pLastUpdate; // the last mesh update for at moment when the event was generated
-    Matrix34 mtxSkelToMesh; // skeleton's frame -> mesh's frame transform
-    IGeometry* pMeshSkel;   // for deformable bodies
-    int idx; // used for event deferring by listeners
-};
-
-struct EventPhysCreateEntityPart
-    : EventPhysMono                                // a part broke off an existing entity
-{
-    enum entype
-    {
-        id = 6, flagsCall = 1, flagsLog = 2
-    };
-    enum reason
-    {
-        ReasonMeshSplit, ReasonJointsBroken
-    };
-    EventPhysCreateEntityPart() { idval = id; idx = -1; }
-    IPhysicalEntity* pEntNew;   // new physical entity (has type PE_RIGID)
-    int partidSrc; // original part id
-    int partidNew; // part id assigned to it in the new entity
-    int nTotParts; // total number of parts that broke off during this update (each will have its own event)
-    int bInvalid; // generated mesh was invalid (degenerate or flipped)
-    int iReason;
-    Vec3 breakImpulse; // impulse that initiated the breaking
-    Vec3 breakAngImpulse;
-    Vec3 v; // initial vel of ejected product
-    Vec3 w; // initial ang vel of ejected product
-    float breakSize; // if caused by an explosion, the explosion's rmin
-    float cutRadius; // if updated mesh was successfully approximated with capsules, this is their cross section at the point of breakage
-    Vec3 cutPtLoc[2];   // the cut's center in both entities' frames
-    Vec3 cutDirLoc[2]; // the cut area's normal
-    IGeometry* pMeshNew; // new mesh if was caused by boolean breaking, 0 if by joint breaking (i.e. no new mesh was created)
-    bop_meshupdate* pLastUpdate; // last meshupdate for the moment the event was reported
-    int idx; // used for event deferring by listeners
-};
-
-struct EventPhysRemoveEntityParts
-    : EventPhysMono
-{
-    enum entype
-    {
-        id = 7, flagsCall = 1, flagsLog = 2
-    };
-    EventPhysRemoveEntityParts() { idval = id; idOffs = 0; }
-    unsigned int partIds[4]; // remove parts with ids corresponding to the set bits in partIds[], +idOffs
-    int idOffs;
-    float massOrg; // entity's mass before the parts were removed
-};
-
-struct EventPhysRevealEntityPart
-    : EventPhysMono
-{
-    enum entype
-    {
-        id = 13, flagsCall = 1, flagsLog = 2
-    };
-    EventPhysRevealEntityPart() { idval = id; }
-    int partId; // id of a part that was hidden due to hierarchical breakability, but should be revealed now
-};
-
-struct EventPhysJointBroken
-    : EventPhysStereo
-{
-    enum entype
-    {
-        id = 1, flagsCall = 1, flagsLog = 2
-    };
-    EventPhysJointBroken() { idval = id; }
-    int idJoint;
-    int bJoint; // structural joint if 1, dynamics constraint if 0
-    int partidEpicenter; // the "seed" part during the update
-    Vec3 pt; // joint's position in the entity frame
-    Vec3 n; // joint's z axis
-    int partid[2];
-    int partmat[2]; // material id from the parts' first primitive
-    IPhysicalEntity* pNewEntity[2]; // only set for broken constraints
-};
-
-struct EventPhysRWIResult
-    : EventPhysMono
-{
-    enum entype
-    {
-        id = 9, flagsCall = 0, flagsLog = 0
-    };
-    EventPhysRWIResult() { idval = id; }
-    int (* OnEvent)(const EventPhysRWIResult*);
-    ray_hit* pHits;
-    int nHits, nMaxHits;
-    int bHitsFromPool; // 1 if hits reside in the internal physics hits pool
-};
-
-struct EventPhysPWIResult
-    : EventPhysMono
-{
-    enum entype
-    {
-        id = 10, flagsCall = 0, flagsLog = 0
-    };
-    EventPhysPWIResult() { idval = id; }
-    int (* OnEvent)(const EventPhysPWIResult*);
-    float dist;
-    Vec3 pt;
-    Vec3 n;
-    int idxMat;
-    int partId;
-};
-
-struct EventPhysArea
-    : EventPhysMono                    // for callback phys areas
-{
-    enum entype
-    {
-        id = 11, flagsCall = 0, flagsLog = 0
-    };
-    EventPhysArea() { idval = id; }
-
-    Vec3 pt; // entity's center
-    Vec3 ptref; // for splines - closest point on spline to pt; for normal areas - area's world position
-    Vec3 dirref; // for splines, calculated force direction
-    pe_params_buoyancy pb; // can be filled by the caller
-    Vec3 gravity;   // can be filled by the caller
-    IPhysicalEntity* pent; // the entity that entered the area and caused this event
-};
-
-struct EventPhysAreaChange
-    : EventPhysMono
-{
-    enum entype
-    {
-        id = 12, flagsCall = 0, flagsLog = 0
-    };
-    EventPhysAreaChange() { idval = id; pContainer = 0; }
-
-    Vec3 boxAffected[2];
-    quaternion q;
-    Vec3 pos;
-    float depth;
-    IPhysicalEntity* pContainer;
-    quaternion qContainer;
-    Vec3 posContainer;
-};
-
-struct EventPhysEntityDeleted
-    : EventPhysMono
-{
-    enum entype
-    {
-        id = 14, flagsCall = 0, flagsLog = 0
-    };
-    EventPhysEntityDeleted() { idval = id; }
-    int mode;
-};
-
-struct EventPhysPostPump
-    : EventPhys
-{
-    enum entype
-    {
-        id = 15, flagsCall = 0, flagsLog = 0
-    };
-    EventPhysPostPump() { idval = id; }
-};
-
-const int EVENT_TYPES_NUM = 16;
-
-// Physical entity iterator interface. This interface is used to traverse trough all the physical entities in an physical world. In a way,
-//  this iterator works a lot like a stl iterator.
-struct IPhysicalEntityIt
-{
-    // <interfuscator:shuffle>
-    virtual ~IPhysicalEntityIt(){}
-    virtual void AddRef() = 0;
-    virtual void Release() = 0; // Deletes this iterator and frees any memory it might have allocated.
-
-    virtual bool IsEnd() = 0;   // Check whether current iterator position is the end position.
-    virtual IPhysicalEntity* Next() = 0; // returns the entity that the iterator points to before it goes to the next
-    virtual IPhysicalEntity* This() = 0; // returns the entity that the iterator points to
-    virtual void MoveFirst() = 0;   // positions the iterator at the begining of the entity list
-    // </interfuscator:shuffle>
-};
-
-
-
-#endif // CRYINCLUDE_CRYCOMMON_PHYSINTERFACE_H
diff --git a/Code/CryEngine/CryCommon/platform.h b/Code/CryEngine/CryCommon/platform.h
deleted file mode 100644
index c0e6a50a49..0000000000
--- a/Code/CryEngine/CryCommon/platform.h
+++ /dev/null
@@ -1,816 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Platform dependend stuff.
-//               Include this file instead of windows h
-
-#pragma once
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define PLATFORM_H_SECTION_1 1
-#define PLATFORM_H_SECTION_2 2
-#define PLATFORM_H_SECTION_3 3
-#define PLATFORM_H_SECTION_4 4
-#define PLATFORM_H_SECTION_5 5
-#define PLATFORM_H_SECTION_6 6
-#define PLATFORM_H_SECTION_7 7
-#define PLATFORM_H_SECTION_8 8
-#define PLATFORM_H_SECTION_9 9
-#define PLATFORM_H_SECTION_10 10
-#define PLATFORM_H_SECTION_11 11
-#define PLATFORM_H_SECTION_12 12
-#define PLATFORM_H_SECTION_13 13
-#define PLATFORM_H_SECTION_14 14
-#define PLATFORM_H_SECTION_15 15
-#endif
-
-// certain C++ features are not available in some compiler versions
-// turn them off here:
-// #define _ALLOW_KEYWORD_MACROS
-// #define _DISALLOW_INITIALIZER_LISTS
-// #define _DISALLOW_ENUM_CLASS
-
-#if defined(_MSC_VER)
-    #define _ALLOW_KEYWORD_MACROS
-
-    #define alignof _alignof
-    #if !defined(_HAS_EXCEPTIONS)
-        #define _HAS_EXCEPTIONS 0
-    #endif
-#elif defined(__GNUC__)
-    #define alignof __alignof__
-#endif
-
-// Alignment|InitializerList support.
-#define _ALLOW_INITIALIZER_LISTS
-
-#if (defined(LINUX) && !defined(ANDROID)) || defined(APPLE)
-#define _FILE_OFFSET_BITS 64 // define large file support > 2GB
-#endif
-
-#include <AzCore/PlatformIncl.h>
-
-#include <cstring>
-
-#if defined(_MSC_VER) // We want the class name to be included, but __FUNCTION__ doesn't contain that on GCC/clang
-    #define __FUNC__ __FUNCTION__
-#else
-    #define __FUNC__ __PRETTY_FUNCTION__
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_1
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(_DEBUG) && !defined(LINUX) && !defined(APPLE)
-    #include <crtdbg.h>
-#endif
-
-#define RESTRICT_POINTER __restrict
-
-// we have to use it because of VS doesn't support restrict reference variables
-#if defined(APPLE) || defined(LINUX)
-    #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-        #define GCC411_OR_LATER
-    #endif
-    #define RESTRICT_REFERENCE __restrict
-#else
-    #define RESTRICT_REFERENCE
-#endif
-
-
-#ifndef CHECK_REFERENCE_COUNTS //define that in your StdAfx.h to override per-project
-# define CHECK_REFERENCE_COUNTS 0 //default value
-#endif
-
-#if CHECK_REFERENCE_COUNTS
-# define CHECK_REFCOUNT_CRASH(x) { if (!(x)) {*((int*)0) = 0; } \
-}
-#else
-# define CHECK_REFCOUNT_CRASH(x)
-#endif
-
-#ifndef GARBAGE_MEMORY_ON_FREE //define that in your StdAfx.h to override per-project
-# define GARBAGE_MEMORY_ON_FREE 0 //default value
-#endif
-
-#if GARBAGE_MEMORY_ON_FREE
-# ifndef GARBAGE_MEMORY_RANDOM          //define that in your StdAfx.h to override per-project
-#  define GARBAGE_MEMORY_RANDOM 1   //0 to change it to progressive pattern
-# endif
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Available predefined compiler macros for Visual C++.
-//      _MSC_VER                                        // Indicates MS Visual C compiler version
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_2
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-//      _WIN32, _WIN64       // Indicates target OS
-#endif
-//      _M_IX86, _M_PPC                         // Indicates target processor
-//      _DEBUG                                          // Building in Debug mode
-//      _DLL                                                // Linking with DLL runtime libs
-//      _MT                                                 // Linking with multi-threaded runtime libs
-//////////////////////////////////////////////////////////////////////////
-
-//
-// Translate some predefined macros.
-//
-
-// NDEBUG disables std asserts, etc.
-// Define it automatically if not compiling with Debug libs, or with ADEBUG flag.
-#if !defined(_DEBUG) && !defined(ADEBUG) && !defined(NDEBUG)
-    #define NDEBUG
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_3
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(MOBILE)
-    #define CONSOLE
-#endif
-
-//render thread settings, as this is accessed inside 3dengine and renderer and needs to be compile time defined, we need to do it here
-//enable this macro to strip out the overhead for render thread
-//  #define STRIP_RENDER_THREAD
-#ifdef STRIP_RENDER_THREAD
-    #define RT_COMMAND_BUF_COUNT 1
-#else
-//can be enhanced to triple buffering, FlushFrame needs to be adjusted and RenderObj would become 132 bytes
-    #define RT_COMMAND_BUF_COUNT 2
-#endif
-
-
-// We use WIN macros without _.
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_4
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-#if defined(_WIN32) && !defined(LINUX32) && !defined(LINUX64) && !defined(APPLE) && !defined(WIN32)
-    #define WIN32
-#endif
-#if defined(_WIN64) && !defined(WIN64)
-    #define WIN64
-#endif
-#endif
-
-// In Win32 Release we use static linkage
-#ifdef WIN32
-    #if !defined(_RELEASE) || defined(RESOURCE_COMPILER) || defined(EDITOR) || defined(_FORCEDLL)
-// All windows targets not in Release built as DLLs.
-        #ifndef _USRDLL
-            #define _USRDLL
-        #endif
-    #endif
-
-#endif //WIN32
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_5
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(LINUX) || defined(APPLE)
-    #define __STDC_FORMAT_MACROS
-    #include <inttypes.h>
-    #if defined(APPLE) || defined(LINUX64)
-    // int64 is not the same type as the operating system's int64_t
-        #undef PRIX64
-        #undef PRIx64
-        #undef PRId64
-        #undef PRIu64
-        #define PRIX64 "llX"
-        #define PRIx64 "llx"
-        #define PRId64 "lld"
-        #define PRIu64 "llu"
-    #endif
-    #define PLATFORM_I64(x) x##ll
-#else
-    #include <inttypes.h>
-    #define PLATFORM_I64(x) x##i64
-#endif
-
-#if !defined(PRISIZE_T)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_6
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-    #elif defined(WIN64)
-        #define PRISIZE_T "I64u" //size_t defined as unsigned __int64
-    #elif defined(WIN32) || defined(LINUX32)
-        #define PRISIZE_T "u"
-    #elif defined(MAC) || defined(LINUX64) || defined(IOS)
-        #define PRISIZE_T "lu"
-    #else
-        #error "Please defined PRISIZE_T for this platform"
-    #endif
-#endif
-#if !defined(PRI_THREADID)
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_7
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-    #elif defined(MAC) || defined(IOS) && defined(__LP64__) && defined(__LP64__)
-        #define PRI_THREADID "lld"
-    #elif defined(LINUX64) || defined(ANDROID)
-        #define PRI_THREADID "ld"
-    #else
-        #define PRI_THREADID "d"
-    #endif
-#endif
-#include "ProjectDefines.h"                         // to get some defines available in every CryEngine project
-
-// Function attribute for printf/scanf-style parameters.
-// This enables extended argument checking by GCC.
-//
-// Usage:
-// Put this after the function or method declaration (not the definition!),
-// between the final closing parenthesis and the semicolon.
-// The first parameter indicates the 1-based index of the format string
-// parameter, the second parameter indicates the 1-based index of the first
-// variable parameter.  Example:
-//   void foobar(int a, const char *fmt, ...) PRINTF_PARAMS(2, 3);
-//
-// For va_list based printf style functions, specfy 0 as the second parameter.
-// Example:
-//   void foobarv(int a, const char *fmt, va_list ap) PRINTF_PARAMS(2, 0);
-//
-// Note that 'this' is counted as a method argument. For non-static methods,
-// add 1 to the indices.
-//
-// Use PRINTF_EMPTY_STRING when you want to format an empty string using
-// a function defined with PRINTF_PARAMS to avoid zero length format string
-// warnings when these checks are enabled.
-
-#if defined(__GNUC__) && !defined(_RELEASE)
-  #define PRINTF_PARAMS(...) __attribute__ ((format (printf, __VA_ARGS__)))
-  #define SCANF_PARAMS(...) __attribute__ ((format (scanf, __VA_ARGS__)))
-  #define PRINTF_EMPTY_FORMAT "%s", ""
-#else
-  #define PRINTF_PARAMS(...)
-    #define SCANF_PARAMS(...)
-  #define PRINTF_EMPTY_FORMAT ""
-#endif
-
-#if defined(IOS)
-#define USE_PTHREAD_TLS
-#endif
-
-// Storage class modifier for thread local storage.
-// THEADLOCAL should NOT be defined to empty because that creates some
-// really hard to find issues.
-#if !defined(USE_PTHREAD_TLS)
-#   define THREADLOCAL AZ_TRAIT_COMPILER_THREAD_LOCAL
-#endif //!defined(USE_PTHREAD_TLS)
-
-
-
-//////////////////////////////////////////////////////////////////////////
-// define Read Write Barrier macro needed for lockless programming
-//////////////////////////////////////////////////////////////////////////
-#if   defined(__arm__)
-/**
- * (ARMv7) Full memory barriar.
- *
- * None of GCC 4.6/4.8 or clang 3.3/3.4 have a builtin intrinsic for ARM's ldrex/strex or dmb
- * instructions.  This is a placeholder until supplied by the toolchain.
- */
-inline void  __dmb()
-{
-    // The linux kernel uses "dmb ish" to only sync with local monitor (arch/arm/include/asm/barrier.h):
-    //#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")
-    //#define smp_mb()        dmb(ish)
-    __asm__ __volatile__ ("dmb ish" : : : "memory");
-}
-
-#define READ_WRITE_BARRIER {__dmb(); }
-#else
-    #define READ_WRITE_BARRIER
-#endif
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// define macro to prevent memory reoderings of reads/and writes
-//TODO implement for all GCC platforms, else there are potential crashes with strict aliasing
-    #define MEMORY_RW_REORDERING_BARRIER do { /*not implemented*/} while (0)
-
-//default stack size for threads, currently only used on pthread platforms
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_8
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(LINUX) || defined(APPLE)
-    #if !defined(_DEBUG)
-        #define SIMPLE_THREAD_STACK_SIZE_KB (256)
-    #else
-        #define SIMPLE_THREAD_STACK_SIZE_KB (256 * 4)
-    #endif
-#else
-    #define SIMPLE_THREAD_STACK_SIZE_KB (32)
-#endif
-
-#include <AzCore/PlatformDef.h>
-
-#if defined(AZ_MONOLITHIC_BUILD)
-    #define DLL_EXPORT
-    #define DLL_IMPORT
-#else // AZ_MONOLITHIC_BUILD
-    #define DLL_EXPORT AZ_DLL_EXPORT
-    #define DLL_IMPORT AZ_DLL_IMPORT
-#endif // AZ_MONOLITHIC_BUILD
-
-
-//////////////////////////////////////////////////////////////////////////
-// Define BIT macro for use in enums and bit masks.
-#define BIT(x) (1 << (x))
-#define BIT64(x) (1ll << (x))
-#define TYPED_BIT(type, x) (type(1) << (x))
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Help message, all help text in code must be wrapped in this define.
-// Only include these in non RELEASE builds
-#if !defined(_RELEASE)
-    #define _HELP(x) x
-#else
-    #define _HELP(x) ""
-#endif
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// Globally Used Defines.
-//////////////////////////////////////////////////////////////////////////
-// CPU Types: _CPU_X86,_CPU_AMD64,_CPU_G5
-// Platform: WIN23,WIN64,LINUX32,LINUX64,MAC
-// CPU supported functionality: _CPU_SSE
-//////////////////////////////////////////////////////////////////////////
-
-
-  #if defined(_MSC_VER)
-    #define PREFAST_SUPPRESS_WARNING(W) __pragma(warning(suppress: W))
-  #else
-    #define PREFAST_SUPPRESS_WARNING(W)
-  #endif
-
-#ifdef _PREFAST_
-#   define PREFAST_ASSUME(cond) __analysis_assume(cond)
-#else
-#   define PREFAST_ASSUME(cond)
-#endif
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_9
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    #if defined(WIN32) && !defined(WIN64)
-        #include "Win32specific.h"
-    #endif
-
-    #if defined(WIN64)
-        #include "Win64specific.h"
-    #endif
-#endif
-
-#if defined(LINUX64) && !defined(ANDROID)
-#include "Linux64Specific.h"
-#endif
-
-#if defined(LINUX32) && !defined(ANDROID)
-#include "Linux32Specific.h"
-#endif
-
-#if defined(ANDROID)
-#include "AndroidSpecific.h"
-#endif
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_10
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-
-#if defined(MAC)
-#include "MacSpecific.h"
-#endif
-
-#if defined(IOS)
-#include "iOSSpecific.h"
-#endif
-
-
-#if !defined(TARGET_DEFAULT_ALIGN)
-# error "No default alignment specified for target architecture"
-#endif
-
-// Indicates potentially dangerous cast on 64bit machines
-typedef UINT_PTR TRUNCATE_PTR;
-typedef UINT_PTR EXPAND_PTR;
-
-// Use static branch prediction to improve the generated assembly when possible.
-// This feature has an indirect effect on runtime performance, as it ensures assembly code
-// which is more likely needed (the programmer has to decide this), is directly after the if
-//
-// For reference, as far as i am aware, all compilers use the following heuristic for static branch prediction
-// if branches are always taken
-// forward jumps are not taken
-// backwards jumps are taken (eg. jumping back to the beginning of a loop)
-#if defined(__clang__) || defined(__GNUC__)
-#   define IF(condition, hint)          if (__builtin_expect(!!(condition), hint))
-#   define WHILE(condition, hint)   while (__builtin_expect(!!(condition), hint))
-#   define IF_UNLIKELY(condition)   if (__builtin_expect(!!(condition), 0))
-#   define IF_LIKELY(condition)     if (__builtin_expect(!!(condition), 1))
-#else
-// Fallback for compilers which don't support static branch prediction (like MSVC)
-#   define IF(condition, hint)          if ((condition))
-#   define WHILE(condition, hint)   while ((condition))
-#   define IF_UNLIKELY(condition)   if ((condition))
-#   define IF_LIKELY(condition)     if ((condition))
-#endif // !defined(__clang__) || defined(__GNUC__)
-
-#include <stdio.h>
-
-
-//////////////////////////////////////////////////////////////////////////
-// Provide special cast function which mirrors C++ style casts to support aliasing correct type punning casts in gcc with strict-aliasing enabled
-template<typename DestinationType, typename SourceType>
-ILINE DestinationType alias_cast(SourceType pPtr)
-{
-    union
-    {
-        SourceType pSrc;
-        DestinationType pDst;
-    } conv_union;
-    conv_union.pSrc = pPtr;
-    return conv_union.pDst;
-}
-
-#include "CryLegacyAllocator.h"
-
-//////////////////////////////////////////////////////////////////////////
-#ifndef DEPRECATED
-#define DEPRECATED
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// compile time error stuff
-//////////////////////////////////////////////////////////////////////////
-#undef STATIC_CHECK
-#define STATIC_CHECK(expr, msg) static_assert(expr, #msg)
-
-// Assert dialog box macros
-#include "CryAssert.h"
-
-// Replace standard assert calls by our custom one
-// Works only ifdef USE_CRY_ASSERT && _DEBUG && WIN32
-#ifndef assert
-#define assert CRY_ASSERT
-#endif
-
-#include "CompileTimeAssert.h"
-//////////////////////////////////////////////////////////////////////////
-// Platform dependent functions that emulate Win32 API.
-// Mostly used only for debugging!
-//////////////////////////////////////////////////////////////////////////
-void   CryDebugBreak();
-void   CrySleep(unsigned int dwMilliseconds);
-void   CryLowLatencySleep(unsigned int dwMilliseconds);
-int    CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType);
-short  CryGetAsyncKeyState(int vKey);
-unsigned int CryGetFileAttributes(const char* lpFileName);
-
-inline void CryHeapCheck()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_11
-    #include AZ_RESTRICTED_FILE(platform_h)
-#elif !defined(LINUX) && !defined(APPLE) // todo: this might be readded with later xdks?
-#if !defined(NDEBUG)
-    int Result =
-#endif
-        _heapchk();
-    assert(Result != _HEAPBADBEGIN);
-    assert(Result != _HEAPBADNODE);
-    assert(Result != _HEAPBADPTR);
-    assert(Result != _HEAPEMPTY);
-    assert(Result == _HEAPOK);
-#endif
-}
-
-//---------------------------------------------------------------------------
-// Useful function to clean the structure.
-template <class T>
-inline void ZeroStruct(T& t)
-{ memset(static_cast<void*>(&t), 0, sizeof(t)); }
-
-// Useful functions to init and destroy objects.
-template<class T>
-inline void Construct(T& t)
-{ new(&t)T(); }
-
-template<class T, class U>
-inline void Construct(T& t, U const& u)
-{   new(&t)T(u); }
-
-template<class T>
-inline void Destruct(T& t)
-{ t.~T(); }
-
-// Cast one type to another, asserting there is no conversion loss.
-// Usage: DestType dest = check_cast<DestType>(src);
-template<class D, class S>
-inline D check_cast(S const& s)
-{
-    D d = D(s);
-    assert(S(d) == s);
-    return d;
-}
-
-// Convert one type to another, asserting there is no conversion loss.
-// Usage: DestType dest;  check_convert(dest, src);
-template<class D, class S>
-inline D& check_convert(D& d, S const& s)
-{
-    d = D(s);
-    assert(S(d) == s);
-    return d;
-}
-
-// Convert one type to another, asserting there is no conversion loss.
-// Usage: DestType dest;  check_convert(dest) = src;
-template<class D>
-struct CheckConvert
-{
-    CheckConvert(D& d)
-        : dest(&d) {}
-
-    template<class S>
-    D& operator=(S const& s)
-    {
-        return check_convert(*dest, s);
-    }
-
-protected:
-    D*  dest;
-};
-
-template<class D>
-inline CheckConvert<D> check_convert(D& d)
-{
-    return d;
-}
-
-//---------------------------------------------------------------------------
-// Use NoCopy as a base class to easily prevent copy init & assign for any class.
-struct NoCopy
-{
-    NoCopy() {}
-private:
-    NoCopy(const NoCopy&);
-    NoCopy& operator =(const NoCopy&);
-};
-
-//---------------------------------------------------------------------------
-// ZeroInit: base class to zero the memory of the derived class before initialization, so local objects initialize the same as static.
-// Usage:
-//      class MyClass: ZeroInit<MyClass> {...}
-//      class MyChild: public MyClass, ZeroInit<MyChild> {...}      // ZeroInit must be the last base class
-
-template<class TDerived>
-struct ZeroInit
-{
-#if defined(__clang__) || defined(__GNUC__)
-    bool __dummy;                           // Dummy var to create non-zero size, ensuring proper placement in TDerived
-#endif
-
-    ZeroInit(bool bZero = true)
-    {
-        // Optional bool arg to selectively disable zeroing.
-        if (bZero)
-        {
-            // Infer offset of this base class by static casting to derived class.
-            // Zero only the additional memory of the derived class.
-            TDerived* struct_end = static_cast<TDerived*>(this) + 1;
-            size_t memory_size = (char*)struct_end - (char*)this;
-            memset(this, 0, memory_size);
-        }
-    }
-};
-
-//---------------------------------------------------------------------------
-// Quick const-manipulation macros
-
-// Declare a const and variable version of a function simultaneously.
-#define CONST_VAR_FUNCTION(head, body) \
-    inline head body                   \
-    inline const head const body
-
-template<class T>
-inline
-T& non_const(const T& t)
-{ return const_cast<T&>(t); }
-
-#define using_type(super, type) \
-    typedef typename super::type type;
-
-typedef unsigned char   uchar;
-typedef unsigned int uint;
-typedef const char* cstr;
-
-//---------------------------------------------------------------------------
-// Align function works on integer or pointer values.
-// Only support power-of-two alignment.
-template<typename T>
-inline
-T Align(T nData, size_t nAlign)
-{
-    assert((nAlign & (nAlign - 1)) == 0);
-    size_t size = ((size_t)nData + (nAlign - 1)) & ~(nAlign - 1);
-    return T(size);
-}
-
-template<typename T>
-inline
-bool IsAligned(T nData, size_t nAlign)
-{
-    assert((nAlign & (nAlign - 1)) == 0);
-    return (size_t(nData) & (nAlign - 1)) == 0;
-}
-
-template<typename T, typename U>
-inline
-void SetFlags(T& dest, U flags, bool b)
-{
-    if (b)
-    {
-        dest |= flags;
-    }
-    else
-    {
-        dest &= ~flags;
-    }
-}
-
-// Wrapper code for non-windows builds.
-#if defined(LINUX) || defined(APPLE)
-    #include "Linux_Win32Wrapper.h"
-#elif defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_12
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-
-// Platform wrappers must be included before CryString.h
-#   include "CryString.h"
-
-// Include support for meta-type data.
-#include "TypeInfo_decl.h"
-
-// Include array.
-#include <CryArray.h>
-
-bool   CrySetFileAttributes(const char* lpFileName, uint32 dwFileAttributes);
-threadID CryGetCurrentThreadId();
-
-#if !defined(NOT_USE_CRY_STRING)
-// Fixed-Sized (stack based string)
-// put after the platform wrappers because of missing wcsicmp/wcsnicmp functions
-    #include "CryFixedString.h"
-#endif
-
-// need this in a common header file and any other file would be too misleading
-enum ETriState
-{
-    eTS_false,
-    eTS_true,
-    eTS_maybe
-};
-
-    #ifdef __GNUC__
-        #define NO_INLINE __attribute__ ((noinline))
-#   define NO_INLINE_WEAK __attribute__ ((noinline)) __attribute__((weak)) // marks a function as no_inline, but also as weak to prevent multiple-defined errors
-
-#   define __PACKED __attribute__ ((packed))
-    #else
-        #define NO_INLINE _declspec(noinline)
-#   define NO_INLINE_WEAK _declspec(noinline) inline
-
-#   define __PACKED
-    #endif
-
-// Fallback for Alignment macro of GCC/CLANG (must be after the class definition)
-#if !defined(_ALIGN)
-        #define _ALIGN(num) AZ_POP_DISABLE_WARNING
-#endif
-
-// Fallback for Alignment macro of MSVC (must be before the class definition)
-#if !defined(_MS_ALIGN)
-        #define _MS_ALIGN(num) AZ_PUSH_DISABLE_WARNING(4324, "-Wunknown-warning-option")
-#endif
-
-#if defined(WIN32) || defined(WIN64)
-extern "C" {
-__declspec(dllimport) unsigned long __stdcall TlsAlloc();
-__declspec(dllimport) void* __stdcall TlsGetValue(unsigned long dwTlsIndex);
-__declspec(dllimport) int __stdcall TlsSetValue(unsigned long dwTlsIndex, void* lpTlsValue);
-}
-
-    #define TLS_DECLARE(type, var) extern int var##idx;
-    #define TLS_DEFINE(type, var)              \
-    int var##idx;                              \
-    struct Init##var {                         \
-        Init##var() { var##idx = TlsAlloc(); } \
-    };                                         \
-    Init##var g_init##var;
-    #define TLS_DEFINE_DEFAULT_VALUE(type, var, value)                                \
-    int var##idx;                                                                     \
-    struct Init##var {                                                                \
-        Init##var() { var##idx = TlsAlloc(); TlsSetValue(var##idx, reinterpret_cast<void*>(value)); } \
-    };                                                                                \
-    Init##var g_init##var;
-    #define TLS_GET(type, var) (type)TlsGetValue(var##idx)
-    #define TLS_SET(var, val) TlsSetValue(var##idx, reinterpret_cast<void*>(val))
-#elif defined(USE_PTHREAD_TLS)
-    #define TLS_DECLARE(_TYPE, _VAR) extern SCryPthreadTLS<_TYPE> _VAR##TLSKey;
-    #define TLS_DEFINE(_TYPE, _VAR) SCryPthreadTLS<_TYPE> _VAR##TLSKey;
-    #define TLS_DEFINE_DEFAULT_VALUE(_TYPE, _VAR, _DEFAULT) SCryPthreadTLS<_TYPE> _VAR##TLSKey = _DEFAULT;
-    #define TLS_GET(_TYPE, _VAR) _VAR##TLSKey.Get()
-    #define TLS_SET(_VAR, _VALUE) _VAR##TLSKey.Set(_VALUE)
-#elif defined(THREADLOCAL)
-    #define TLS_DECLARE(type, var) extern THREADLOCAL type var;
-#if defined(LINUX) || defined(MAC)
-    #define TLS_DEFINE(type, var) THREADLOCAL type var = 0;
-#else
-    #define TLS_DEFINE(type, var) THREADLOCAL type var;
-#endif // defined(LINUX) || defined(MAC)
-    #define TLS_DEFINE_DEFAULT_VALUE(type, var, value) THREADLOCAL type var = value;
-    #define TLS_GET(type, var) (var)
-    #define TLS_SET(var, val) (var = (val))
-#else // defined(THREADLOCAL)
-    #error "There's no support for thread local storage"
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_13
-    #include AZ_RESTRICTED_FILE(platform_h)
-#elif !defined(LINUX) && !defined(APPLE)
-typedef int socklen_t;
-#endif
-
-
-// Include MultiThreading support.
-#include "CryThread.h"
-#include "MultiThread.h"
-
-// In RELEASE disable printf and fprintf
-#if defined(_RELEASE) && !defined(RELEASE_LOGGING)
-    #if defined(AZ_RESTRICTED_PLATFORM)
-        #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_14
-        #include AZ_RESTRICTED_FILE(platform_h)
-    #endif
-#endif
-
-#define _STRINGIFY(x) #x
-#define STRINGIFY(x) _STRINGIFY(x)
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_15
-    #include AZ_RESTRICTED_FILE(platform_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32) || defined(WIN64)
-    #define MESSAGE(msg) message(__FILE__ "(" STRINGIFY(__LINE__) "): " msg)
-#else
-    #define MESSAGE(msg)
-#endif
-
-void InitRootDir(char szExeFileName[] = nullptr, uint nExeSize = 0, char szExeRootName[] = nullptr, uint nRootSize = 0);
diff --git a/Code/CryEngine/CryCommon/platform_impl.cpp b/Code/CryEngine/CryCommon/platform_impl.cpp
deleted file mode 100644
index 7f21348007..0000000000
--- a/Code/CryEngine/CryCommon/platform_impl.cpp
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <platform.h>
-#include <StringUtils.h>
-#include <ISystem.h>
-#include <Random.h>
-#include <UnicodeFunctions.h>
-#include <IConsole.h>
-
-#include <AzCore/Debug/Profiler.h>
-#include <AzCore/Debug/ProfileModuleInit.h>
-#include <AzCore/Memory/AllocatorManager.h>
-#include <AzCore/Module/Environment.h>
-
-// Section dictionary
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define PLATFORM_IMPL_H_SECTION_TRAITS 1
-#define PLATFORM_IMPL_H_SECTION_CRYLOWLATENCYSLEEP 2
-#define PLATFORM_IMPL_H_SECTION_CRYGETFILEATTRIBUTES 3
-#define PLATFORM_IMPL_H_SECTION_CRYSETFILEATTRIBUTES 4
-#define PLATFORM_IMPL_H_SECTION_CRY_FILE_ATTRIBUTE_STUBS 5
-#define PLATFORM_IMPL_H_SECTION_CRY_SYSTEM_FUNCTIONS 6
-#define PLATFORM_IMPL_H_SECTION_VIRTUAL_ALLOCATORS 7
-#endif
-
-struct SSystemGlobalEnvironment* gEnv = nullptr;
-
-// Traits
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_TRAITS
-    #include AZ_RESTRICTED_FILE(platform_impl_h)
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// If not in static library.
-#include <CryThreadImpl.h>
-
-#if defined(WIN32) || defined(WIN64)
-void CryPureCallHandler()
-{
-    CryFatalError("Pure function call");
-}
-
-void CryInvalidParameterHandler(
-    [[maybe_unused]] const wchar_t* expression,
-    [[maybe_unused]] const wchar_t* function,
-    [[maybe_unused]] const wchar_t* file,
-    [[maybe_unused]] unsigned int line,
-    [[maybe_unused]] uintptr_t pReserved)
-{
-    //size_t i;
-    //char sFunc[128];
-    //char sExpression[128];
-    //char sFile[128];
-    //wcstombs_s( &i,sFunc,sizeof(sFunc),function,_TRUNCATE );
-    //wcstombs_s( &i,sExpression,sizeof(sExpression),expression,_TRUNCATE );
-    //wcstombs_s( &i,sFile,sizeof(sFile),file,_TRUNCATE );
-    //CryFatalError( "Invalid parameter detected in function %s. File: %s Line: %d, Expression: %s",sFunc,sFile,line,sExpression );
-    CryFatalError("Invalid parameter detected in CRT function\n");
-}
-
-void InitCRTHandlers()
-{
-    _set_purecall_handler(CryPureCallHandler);
-    _set_invalid_parameter_handler(CryInvalidParameterHandler);
-}
-#else
-void InitCRTHandlers() {}
-#endif
-
-#ifndef SOFTCODE
-//////////////////////////////////////////////////////////////////////////
-// This is an entry to DLL initialization function that must be called for each loaded module
-//////////////////////////////////////////////////////////////////////////
-extern "C" AZ_DLL_EXPORT void ModuleInitISystem(ISystem* pSystem, [[maybe_unused]] const char* moduleName)
-{
-    if (gEnv) // Already registered.
-    {
-        return;
-    }
-
-    InitCRTHandlers();
-
-    if (pSystem) // DONT REMOVE THIS. ITS FOR RESOURCE COMPILER!!!!
-    {
-        gEnv = pSystem->GetGlobalEnvironment();
-        assert(gEnv);
-        
-        if (!AZ::Environment::IsReady() || (AZ::Environment::GetInstance() != gEnv->pSharedEnvironment))
-        {
-            AZ::Environment::Attach(gEnv->pSharedEnvironment);
-            AZ::AllocatorManager::Instance();  // Force the AllocatorManager to instantiate and register any allocators defined in data sections
-        }
-        AZ::Debug::ProfileModuleInit();
-    } // if pSystem
-}
-
-extern "C" AZ_DLL_EXPORT void ModuleShutdownISystem([[maybe_unused]] ISystem* pSystem)
-{
-    // Unregister with AZ environment.
-    AZ::Environment::Detach();
-}
-
-extern "C" AZ_DLL_EXPORT void InjectEnvironment(void* env)
-{
-    static bool injected = false;
-    if (!injected)
-    {
-        AZ::Environment::Attach(reinterpret_cast<AZ::EnvironmentInstance>(env));
-        AZ::AllocatorManager::Instance();  // Force the AllocatorManager to instantiate and register any allocators defined in data sections
-        injected = true;
-    }
-}
-
-extern "C" AZ_DLL_EXPORT void DetachEnvironment()
-{
-    AZ::Environment::Detach();
-}
-
-void* GetModuleInitISystemSymbol()
-{
-    return reinterpret_cast<void*>(&ModuleInitISystem);
-}
-void* GetModuleShutdownISystemSymbol()
-{
-    return reinterpret_cast<void*>(&ModuleShutdownISystem);
-}
-void* GetInjectEnvironmentSymbol()
-{
-    return reinterpret_cast<void*>(&InjectEnvironment);
-}
-void* GetDetachEnvironmentSymbol()
-{
-    return reinterpret_cast<void*>(&DetachEnvironment);
-}
-
-#endif // !defined(SOFTCODE)
-
-bool g_bProfilerEnabled = false;
-
-//////////////////////////////////////////////////////////////////////////
-// global random number generator used by cry_random functions
-CRndGen CryRandom_Internal::g_random_generator;
-
-
-//////////////////////////////////////////////////////////////////////////
-
-// when using STL Port _STLP_DEBUG and _STLP_DEBUG_TERMINATE - avoid actually
-// crashing (default terminator seems to kill the thread, which isn't nice).
-#ifdef _STLP_DEBUG_TERMINATE
-
-# ifdef __stl_debug_terminate
-#  undef __stl_debug_terminate
-# endif
-
-void __stl_debug_terminate(void)
-{
-    assert(0 && "STL Debug Error");
-}
-#endif
-
-#ifdef _STLP_DEBUG_MESSAGE
-
-# ifdef __stl_debug_message
-#  undef __stl_debug_message
-# endif
-
-void __stl_debug_message(const char* format_str, ...)
-{
-    va_list __args;
-    va_start(__args, format_str);
-#ifdef WIN32
-    char __buffer [4096];
-    azvsnprintf(__buffer, sizeof(__buffer) / sizeof(char), format_str, __args);
-    OutputDebugStringA(__buffer);
-#endif
-    gEnv->pLog->LogV(ILog::eErrorAlways, format_str, __args);
-    va_end(__args);
-}
-#endif //_STLP_DEBUG_MESSAGE
-
-
-#if defined(WIN32) || defined(WIN64)
-#include <intrin.h>
-#endif
-
-#if defined(APPLE) || defined(LINUX)
-#include "CryAssert_impl.h"
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRY_SYSTEM_FUNCTIONS
-    #include AZ_RESTRICTED_FILE(platform_impl_h)
-#endif
-
-#if defined (_WIN32)
-
-#include "CryAssert_impl.h"
-
-//////////////////////////////////////////////////////////////////////////
-void CryDebugBreak()
-{
-#if defined(WIN32) && !defined(RELEASE)
-    if (IsDebuggerPresent())
-#endif
-    {
-        DebugBreak();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CrySleep(unsigned int dwMilliseconds)
-{
-    AZ_PROFILE_FUNCTION_IDLE(AZ::Debug::ProfileCategory::System);
-    Sleep(dwMilliseconds);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CryLowLatencySleep(unsigned int dwMilliseconds)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::System);
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRYLOWLATENCYSLEEP
-    #include AZ_RESTRICTED_FILE(platform_impl_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    CrySleep(dwMilliseconds);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CryMessageBox([[maybe_unused]] const char* lpText, [[maybe_unused]] const char* lpCaption, [[maybe_unused]] unsigned int uType)
-{
-#ifdef WIN32
-#if !defined(RESOURCE_COMPILER)
-    ICVar* const pCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_crash_dialog") : NULL;
-    if ((pCVar && pCVar->GetIVal() != 0) || (gEnv && gEnv->bNoAssertDialog))
-    {
-        return 0;
-    }
-#endif
-    wstring wideText, wideCaption;
-    Unicode::Convert(wideText, lpText);
-    Unicode::Convert(wideCaption, lpCaption);
-    return MessageBoxW(NULL, wideText.c_str(), wideCaption.c_str(), uType);
-#else
-    return 0;
-#endif
-}
-
-// Initializes root folder of the game, optionally returns exe and path name.
-void InitRootDir(char szExeFileName[], uint nExeSize, char szExeRootName[], [[maybe_unused]] uint nRootSize)
-{
-    WCHAR szPath[_MAX_PATH];
-    size_t nLen = GetModuleFileNameW(GetModuleHandle(NULL), szPath, _MAX_PATH);
-    assert(nLen < _MAX_PATH && "The path to the current executable exceeds the expected length");
-
-    // Find path above exe name and deepest folder.
-    bool firstIteration = true;
-    for (size_t n = nLen - 1; n > 0; n--)
-    {
-        if (szPath[n] == '\\')
-        {
-            szPath[n] = 0;
-
-            if (firstIteration)
-            {
-                // Return exe path
-                if (szExeRootName)
-                {
-                    Unicode::Convert(szExeRootName, n+1, szPath);
-                }
-
-                // Return exe name
-                if (szExeFileName)
-                {
-                    Unicode::Convert(szExeFileName, nExeSize, szPath + n);
-                }
-                firstIteration = false;
-            }
-            // Check if the engineroot exists
-            wcscat_s(szPath, L"\\engine.json");
-            WIN32_FILE_ATTRIBUTE_DATA data;
-            BOOL res = GetFileAttributesExW(szPath, GetFileExInfoStandard, &data);
-            if (res != 0 && data.dwFileAttributes != INVALID_FILE_ATTRIBUTES)
-            {
-                // Found file
-                szPath[n] = 0;
-                SetCurrentDirectoryW(szPath);
-                break;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-short CryGetAsyncKeyState([[maybe_unused]] int vKey)
-{
-#ifdef WIN32
-    return GetAsyncKeyState(vKey);
-#else
-    return 0;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-LONG  CryInterlockedIncrement(int volatile* lpAddend)
-{
-    return InterlockedIncrement((volatile LONG*)lpAddend);
-}
-
-//////////////////////////////////////////////////////////////////////////
-LONG  CryInterlockedDecrement(int volatile* lpAddend)
-{
-    return InterlockedDecrement((volatile LONG*)lpAddend);
-}
-
-//////////////////////////////////////////////////////////////////////////
-LONG  CryInterlockedExchangeAdd(LONG volatile* lpAddend, LONG Value)
-{
-    return InterlockedExchangeAdd(lpAddend, Value);
-}
-
-LONG  CryInterlockedOr(LONG volatile* Destination, LONG Value)
-{
-    return InterlockedOr(Destination, Value);
-}
-
-LONG  CryInterlockedCompareExchange(LONG volatile* dst, LONG exchange, LONG comperand)
-{
-    return InterlockedCompareExchange(dst, exchange, comperand);
-}
-
-void* CryInterlockedCompareExchangePointer(void* volatile* dst, void* exchange, void* comperand)
-{
-    return InterlockedCompareExchangePointer(dst, exchange, comperand);
-}
-
-void* CryInterlockedExchangePointer(void* volatile* dst, void* exchange)
-{
-    return InterlockedExchangePointer(dst, exchange);
-}
-
-void CryInterlockedAdd(volatile size_t* pVal, ptrdiff_t iAdd)
-{
-#if defined (PLATFORM_64BIT)
-#if !defined(NDEBUG)
-    size_t v = (size_t)
-#endif
-        InterlockedAdd64((volatile int64*)pVal, iAdd);
-#else
-    size_t v = (size_t)CryInterlockedExchangeAdd((volatile long*)pVal, (long)iAdd);
-    v += iAdd;
-#endif
-    assert((iAdd == 0) || (iAdd < 0 && v < v - (size_t)iAdd) || (iAdd > 0 && v > v - (size_t)iAdd));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CryCreateCriticalSection()
-{
-    CRITICAL_SECTION* pCS = new CRITICAL_SECTION;
-    InitializeCriticalSection(pCS);
-    return pCS;
-}
-
-void  CryCreateCriticalSectionInplace(void* pCS)
-{
-    InitializeCriticalSection((CRITICAL_SECTION*)pCS);
-}
-//////////////////////////////////////////////////////////////////////////
-void  CryDeleteCriticalSection(void* cs)
-{
-    CRITICAL_SECTION* pCS = (CRITICAL_SECTION*)cs;
-    if (pCS->LockCount >= 0)
-    {
-        CryFatalError("Critical Section hanging lock");
-    }
-    DeleteCriticalSection(pCS);
-    delete pCS;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void  CryDeleteCriticalSectionInplace(void* cs)
-{
-    CRITICAL_SECTION* pCS = (CRITICAL_SECTION*)cs;
-    if (pCS->LockCount >= 0)
-    {
-        CryFatalError("Critical Section hanging lock");
-    }
-    DeleteCriticalSection(pCS);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void  CryEnterCriticalSection(void* cs)
-{
-    EnterCriticalSection((CRITICAL_SECTION*)cs);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool  CryTryCriticalSection(void* cs)
-{
-    return TryEnterCriticalSection((CRITICAL_SECTION*)cs) != 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void  CryLeaveCriticalSection(void* cs)
-{
-    LeaveCriticalSection((CRITICAL_SECTION*)cs);
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 CryGetFileAttributes(const char* lpFileName)
-{
-    WIN32_FILE_ATTRIBUTE_DATA data;
-    BOOL res;
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRYGETFILEATTRIBUTES
-    #include AZ_RESTRICTED_FILE(platform_impl_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    res = GetFileAttributesEx(lpFileName, GetFileExInfoStandard, &data);
-#endif
-    return res ? data.dwFileAttributes : -1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CrySetFileAttributes(const char* lpFileName, uint32 dwFileAttributes)
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRYSETFILEATTRIBUTES
-    #include AZ_RESTRICTED_FILE(platform_impl_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    return SetFileAttributes(lpFileName, dwFileAttributes) != 0;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-threadID CryGetCurrentThreadId()
-{
-    return GetCurrentThreadId();
-}
-
-#endif // _WIN32
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRY_FILE_ATTRIBUTE_STUBS
-    #include AZ_RESTRICTED_FILE(platform_impl_h)
-#endif
-
-#if defined(AZ_PLATFORM_WINDOWS)
-int64 CryGetTicks()
-{
-    LARGE_INTEGER li;
-    QueryPerformanceCounter(&li);
-    return li.QuadPart;
-}
-
-int64 CryGetTicksPerSec()
-{
-    LARGE_INTEGER li;
-    QueryPerformanceFrequency(&li);
-    return li.QuadPart;
-}
-#endif
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Threads implementation. For static linking it must be declared inline otherwise creating multiple symbols
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#define THR_INLINE inline
-
-//////////////////////////////////////////////////////////////////////////
-inline void CryDebugStr([[maybe_unused]] const char* format, ...)
-{
-    /*
-     #ifdef CRYSYSTEM_EXPORTS
-     va_list    ArgList;
-     char       szBuffer[65535];
-     va_start(ArgList, format);
-     azvsnprintf(szBuffer,sizeof(szBuffer)-1, format, ArgList);
-     va_end(ArgList);
-     cry_strcat(szBuffer,"\n");
-     OutputDebugString(szBuffer);
-     #endif
-     */
-}
-
-_MS_ALIGN(64) uint32  BoxSides[0x40 * 8] = {
-    0, 0, 0, 0, 0, 0, 0, 0, //00
-    0, 4, 6, 2, 0, 0, 0, 4, //01
-    7, 5, 1, 3, 0, 0, 0, 4, //02
-    0, 0, 0, 0, 0, 0, 0, 0, //03
-    0, 1, 5, 4, 0, 0, 0, 4, //04
-    0, 1, 5, 4, 6, 2, 0, 6, //05
-    7, 5, 4, 0, 1, 3, 0, 6, //06
-    0, 0, 0, 0, 0, 0, 0, 0, //07
-    7, 3, 2, 6, 0, 0, 0, 4, //08
-    0, 4, 6, 7, 3, 2, 0, 6, //09
-    7, 5, 1, 3, 2, 6, 0, 6, //0a
-    0, 0, 0, 0, 0, 0, 0, 0, //0b
-    0, 0, 0, 0, 0, 0, 0, 0, //0c
-    0, 0, 0, 0, 0, 0, 0, 0, //0d
-    0, 0, 0, 0, 0, 0, 0, 0, //0e
-    0, 0, 0, 0, 0, 0, 0, 0, //0f
-    0, 2, 3, 1, 0, 0, 0, 4, //10
-    0, 4, 6, 2, 3, 1, 0, 6, //11
-    7, 5, 1, 0, 2, 3, 0, 6, //12
-    0, 0, 0, 0, 0, 0, 0, 0, //13
-    0, 2, 3, 1, 5, 4, 0, 6, //14
-    1, 5, 4, 6, 2, 3, 0, 6, //15
-    7, 5, 4, 0, 2, 3, 0, 6, //16
-    0, 0, 0, 0, 0, 0, 0, 0, //17
-    0, 2, 6, 7, 3, 1, 0, 6, //18
-    0, 4, 6, 7, 3, 1, 0, 6, //19
-    7, 5, 1, 0, 2, 6, 0, 6, //1a
-    0, 0, 0, 0, 0, 0, 0, 0, //1b
-    0, 0, 0, 0, 0, 0, 0, 0, //1c
-    0, 0, 0, 0, 0, 0, 0, 0, //1d
-    0, 0, 0, 0, 0, 0, 0, 0, //1e
-    0, 0, 0, 0, 0, 0, 0, 0, //1f
-    7, 6, 4, 5, 0, 0, 0, 4, //20
-    0, 4, 5, 7, 6, 2, 0, 6, //21
-    7, 6, 4, 5, 1, 3, 0, 6, //22
-    0, 0, 0, 0, 0, 0, 0, 0, //23
-    7, 6, 4, 0, 1, 5, 0, 6, //24
-    0, 1, 5, 7, 6, 2, 0, 6, //25
-    7, 6, 4, 0, 1, 3, 0, 6, //26
-    0, 0, 0, 0, 0, 0, 0, 0, //27
-    7, 3, 2, 6, 4, 5, 0, 6, //28
-    0, 4, 5, 7, 3, 2, 0, 6, //29
-    6, 4, 5, 1, 3, 2, 0, 6, //2a
-    0, 0, 0, 0, 0, 0, 0, 0, //2b
-    0, 0, 0, 0, 0, 0, 0, 0, //2c
-    0, 0, 0, 0, 0, 0, 0, 0, //2d
-    0, 0, 0, 0, 0, 0, 0, 0, //2e
-    0, 0, 0, 0, 0, 0, 0, 0, //2f
-    0, 0, 0, 0, 0, 0, 0, 0, //30
-    0, 0, 0, 0, 0, 0, 0, 0, //31
-    0, 0, 0, 0, 0, 0, 0, 0, //32
-    0, 0, 0, 0, 0, 0, 0, 0, //33
-    0, 0, 0, 0, 0, 0, 0, 0, //34
-    0, 0, 0, 0, 0, 0, 0, 0, //35
-    0, 0, 0, 0, 0, 0, 0, 0, //36
-    0, 0, 0, 0, 0, 0, 0, 0, //37
-    0, 0, 0, 0, 0, 0, 0, 0, //38
-    0, 0, 0, 0, 0, 0, 0, 0, //39
-    0, 0, 0, 0, 0, 0, 0, 0, //3a
-    0, 0, 0, 0, 0, 0, 0, 0, //3b
-    0, 0, 0, 0, 0, 0, 0, 0, //3c
-    0, 0, 0, 0, 0, 0, 0, 0, //3d
-    0, 0, 0, 0, 0, 0, 0, 0, //3e
-    0, 0, 0, 0, 0, 0, 0, 0, //3f
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_VIRTUAL_ALLOCATORS
-    #include AZ_RESTRICTED_FILE(platform_impl_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#endif
diff --git a/Code/CryEngine/CryCommon/primitives.h b/Code/CryEngine/CryCommon/primitives.h
deleted file mode 100644
index 16a9ffbbd7..0000000000
--- a/Code/CryEngine/CryCommon/primitives.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_PRIMITIVES_H
-#define CRYINCLUDE_CRYCOMMON_PRIMITIVES_H
-#pragma once
-
-
-
-typedef int index_t;
-enum
-{
-    PHYS_MAX_INDICES = 1 << 30
-};
-
-#include "stridedptr.h"
-
-namespace primitives {
-    ////////////////////////// primitives //////////////////////
-
-    struct primitive
-    {
-    };
-
-    struct box
-        : primitive
-    {
-        enum entype
-        {
-            type = 0
-        };
-        Matrix33 Basis; // v_box = Basis*v_world; Basis = Rotation.T()
-        int bOriented;
-        Vec3 center;
-        Vec3 size;
-        AUTO_STRUCT_INFO
-    };
-
-    struct triangle
-        : primitive
-    {
-        enum entype
-        {
-            type = 1
-        };
-        Vec3 pt[3];
-        Vec3 n;
-        AUTO_STRUCT_INFO
-    };
-
-    struct indexed_triangle
-        : triangle
-    {
-        int idx;
-        AUTO_STRUCT_INFO
-    };
-
-    typedef float (* getHeightCallback)(int ix, int iy);
-    typedef unsigned char (* getSurfTypeCallback)(int ix, int iy);
-
-    struct grid
-        : primitive
-    {
-        Matrix33 Basis;
-        int bOriented;
-        Vec3 origin;
-        vector2df step, stepr;
-        vector2di size;
-        vector2di stride;
-        int bCyclic;
-        grid() { bCyclic = 0; }
-        int inrange(int ix, int iy) {   return bCyclic | -((ix - size.x & - 1 - ix & iy - size.y & - 1 - iy) >> 31); }
-        int getcell_safe(int ix, int iy) { int mask = -inrange(ix, iy); return (iy & size.y - 1) * stride.y + (ix & size.x - 1) * stride.x & mask | size.x * size.y & ~mask; }
-        int crop(int i, int icoord, int bAllowBorder = 1) { int brd = bAllowBorder + (1 << 30 & - bCyclic); return max(-brd, min(size[icoord] - 1 + brd, i)); }
-        vector2di cropxy(const vector2di& ic, int bAllowBorder = 1) { int brd = bAllowBorder + (1 << 30 & - bCyclic); return vector2di(max(-brd, min(size.x - 1 + brd, ic.x)), max(-brd, min(size.y - 1 + brd, ic.y))); }
-        int iscyclic() { return bCyclic; }
-        AUTO_STRUCT_INFO
-    };
-
-    struct heightfield
-        : grid
-    {
-        enum entype
-        {
-            type = 2
-        };
-        heightfield& operator=(const heightfield& src)
-        {
-            step = src.step;
-            stepr = src.stepr;
-            size = src.size;
-            stride = src.stride;
-            heightscale = src.heightscale;
-            typemask = src.typemask;
-            typehole = src.typehole;
-            typepower = src.typepower;
-            fpGetHeightCallback = src.fpGetHeightCallback;
-            fpGetSurfTypeCallback = src.fpGetSurfTypeCallback;
-            return *this;
-        }
-
-        ILINE float getheight(int ix, int iy) const
-        {
-            float result = (*fpGetHeightCallback)(ix, iy);
-            return result * heightscale;
-        }
-        ILINE int gettype(int ix, int iy) const
-        {
-            int itype = (((*fpGetSurfTypeCallback)(ix, iy)) & typemask) >> typepower, idelta = itype - typehole;
-            return itype | ((idelta - 1) >> 31 ^ idelta >> 31);
-        }
-
-        float heightscale;
-        unsigned short typemask;
-        int typehole;
-        int typepower;
-        getHeightCallback fpGetHeightCallback;
-        getSurfTypeCallback fpGetSurfTypeCallback;
-    };
-
-    struct ray
-        : primitive
-    {
-        enum entype
-        {
-            type = 3
-        };
-        Vec3 origin;
-        Vec3 dir;
-        AUTO_STRUCT_INFO
-    };
-
-    struct sphere
-        : primitive
-    {
-        enum entype
-        {
-            type = 4
-        };
-        Vec3 center;
-        float r;
-        AUTO_STRUCT_INFO
-    };
-
-    struct cylinder
-        : primitive
-    {
-        enum entype
-        {
-            type = 5
-        };
-        Vec3 center;
-        Vec3 axis;
-        float r, hh;
-        AUTO_STRUCT_INFO
-    };
-
-    struct capsule
-        : cylinder
-    {
-        enum entype
-        {
-            type = 6
-        };
-        AUTO_STRUCT_INFO
-    };
-
-    struct grid3d
-        : primitive
-    {
-        Matrix33 Basis;
-        int bOriented;
-        Vec3 origin;
-        Vec3 step, stepr;
-        Vec3i size;
-        Vec3i stride;
-    };
-
-    struct voxelgrid
-        : grid3d
-    {
-        enum entype
-        {
-            type = 7
-        };
-        Matrix33 R;
-        Vec3 offset;
-        float scale, rscale;
-        strided_pointer<Vec3> pVtx;
-        index_t* pIndices;
-        Vec3* pNormals;
-        char* pIds;
-        int* pCellTris;
-        int* pTriBuf;
-    };
-
-    struct plane
-        : primitive
-    {
-        enum entype
-        {
-            type = 8
-        };
-        Vec3 n;
-        Vec3 origin;
-        AUTO_STRUCT_INFO
-    };
-
-    struct coord_plane
-        : plane
-    {
-        Vec3 axes[2];
-        AUTO_STRUCT_INFO
-    };
-}
-
-AUTO_TYPE_INFO(primitives::getHeightCallback)
-AUTO_TYPE_INFO(primitives::getSurfTypeCallback)
-
-struct prim_inters
-{
-    prim_inters() { minPtDist2 = 0.0f; ptbest.zero(); }
-    Vec3 pt[2];
-    Vec3 n;
-    unsigned char iFeature[2][2];
-    float minPtDist2;
-    short id[2];
-    int iNode[2];
-    Vec3* ptborder;
-    int nborderpt, nbordersz;
-    Vec3 ptbest;
-    int nBestPtVal;
-};
-
-struct contact
-{
-    real t, taux;
-    Vec3 pt;
-    Vec3 n;
-    unsigned int iFeature[2];
-};
-
-const int NPRIMS = 8;   // since plane is currently not supported in collision checks
-
-///////////////////// geometry contact structures ///////////////////
-
-struct geom_contact_area
-{
-    enum entype
-    {
-        polygon, polyline
-    };
-    int type;
-    int npt;
-    int nmaxpt;
-    float minedge;
-    int* piPrim[2];
-    int* piFeature[2];
-    Vec3* pt;
-    Vec3 n1; // normal of other object surface (or edge)
-};
-
-const int IFEAT_LOG2 = 23;
-const int IDXMASK = ~(0xFF << IFEAT_LOG2);
-const int TRIEND = 0x80 << IFEAT_LOG2;
-
-struct geom_contact
-{
-    real t;
-    Vec3 pt;
-    Vec3 n;
-    Vec3 dir; // unprojection direction
-    int iUnprojMode;
-    float vel; // original velocity along this direction, <0 if least squares normal was used
-    int id[2]; // external ids for colliding geometry parts
-    int iPrim[2];
-    int iFeature[2];
-    int iNode[2]; // BV-tree nodes of contacting primitives
-    Vec3* ptborder; // intersection border
-    int (*idxborder)[2]; // primitive index | primitive's feature's id << IFEAT_LOG2
-    int nborderpt;
-    int bClosed;
-    Vec3 center;
-    bool bBorderConsecutive;
-    geom_contact_area* parea;
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_PRIMITIVES_H
diff --git a/Code/CryEngine/CryCommon/smartptr.h b/Code/CryEngine/CryCommon/smartptr.h
deleted file mode 100644
index 74dcc6911a..0000000000
--- a/Code/CryEngine/CryCommon/smartptr.h
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_SMARTPTR_H
-#define CRYINCLUDE_CRYCOMMON_SMARTPTR_H
-#pragma once
-
-#include <platform.h>
-#include <type_traits>
-
-void CryFatalError(const char*, ...) PRINTF_PARAMS(1, 2);
-#if defined(APPLE)
-    #include <cstddef>
-#endif
-//////////////////////////////////////////////////////////////////
-// SMART POINTER
-//////////////////////////////////////////////////////////////////
-template <class _I>
-class _smart_ptr
-{
-private:
-    _I* p;
-public:
-    _smart_ptr()
-        : p(NULL) {}
-    _smart_ptr(_I* p_)
-    {
-        p = p_;
-        if (p)
-        {
-            p->AddRef();
-        }
-    }
-
-    _smart_ptr(const _smart_ptr& p_)
-    {
-        p = p_.p;
-        if (p)
-        {
-            p->AddRef();
-        }
-    }
-
-    template <typename _Y>
-    _smart_ptr(const _smart_ptr<_Y>& p_)
-    {
-        p = p_.get();
-        if (p)
-        {
-            p->AddRef();
-        }
-    }
-
-    ~_smart_ptr()
-    {
-        if (p)
-        {
-            p->Release();
-        }
-    }
-    operator _I*() const {
-        return p;
-    }
-
-    _I& operator*() const { return *p; }
-    _I* operator->(void) const { return p; }
-    _I* get() const { return p; }
-    _smart_ptr&  operator=(_I* newp)
-    {
-        if (newp)
-        {
-            newp->AddRef();
-        }
-        if (p)
-        {
-            p->Release();
-        }
-        p = newp;
-        return *this;
-    }
-
-    void reset()
-    {
-        _smart_ptr<_I>().swap(*this);
-    }
-
-    void reset(_I* ptr)
-    {
-        _smart_ptr<_I>(ptr).swap(*this);
-    }
-
-    void attach(_I* p_)
-    {
-        p = p_;
-    }
-
-    _smart_ptr&  operator=(const _smart_ptr& newp)
-    {
-        if (newp.p)
-        {
-            newp.p->AddRef();
-        }
-        if (p)
-        {
-            p->Release();
-        }
-        p = newp.p;
-        return *this;
-    }
-
-    template <typename _Y>
-    _smart_ptr&  operator=(const _smart_ptr<_Y>& newp)
-    {
-        _I* const p2 = newp.get();
-        if (p2)
-        {
-            p2->AddRef();
-        }
-        if (p)
-        {
-            p->Release();
-        }
-        p = p2;
-        return *this;
-    }
-
-    // set our contained pointer to null, but don't call Release()
-    // useful for when we want to do that ourselves, or when we know that
-    // the contained pointer is invalid
-    friend _I* ReleaseOwnership(_smart_ptr<_I>& ptr)
-    {
-        _I* ret = ptr.p;
-        ptr.p = 0;
-        return ret;
-    }
-    void swap(_smart_ptr<_I>& other)
-    {
-        std::swap(p, other.p);
-    }
-
-    AUTO_STRUCT_INFO
-};
-
-template <typename T>
-ILINE void swap(_smart_ptr<T>& a, _smart_ptr<T>& b)
-{
-    a.swap(b);
-}
-
-// reference target without vtable for smart pointer
-// implements AddRef() and Release() strategy using reference counter of the specified type
-template <typename TDerived, typename Counter = int>
-class _reference_target_no_vtable
-{
-public:
-    _reference_target_no_vtable()
-        : m_nRefCounter (0)
-    {
-    }
-
-    ~_reference_target_no_vtable()
-    {
-        //assert (!m_nRefCounter);
-    }
-
-    void AddRef()
-    {
-        CHECK_REFCOUNT_CRASH(m_nRefCounter >= 0);
-        ++m_nRefCounter;
-    }
-
-    void Release()
-    {
-        CHECK_REFCOUNT_CRASH(m_nRefCounter > 0);
-        if (--m_nRefCounter == 0)
-        {
-            delete static_cast<TDerived*>(this);
-        }
-        else if (m_nRefCounter < 0)
-        {
-            assert(0);
-            CryFatalError("Deleting Reference Counted Object Twice");
-        }
-    }
-    // Warning: use for debugging/statistics purposes only!
-    Counter NumRefs()
-    {
-        return m_nRefCounter;
-    }
-protected:
-    Counter m_nRefCounter;
-};
-
-// reference target with vtable for smart pointer
-// implements AddRef() and Release() strategy using reference counter of the specified type
-template <typename Counter>
-class _reference_target
-{
-public:
-    _reference_target()
-        : m_nRefCounter (0)
-    {
-    }
-
-    virtual ~_reference_target()
-    {
-        //assert (!m_nRefCounter);
-    }
-
-    void AddRef()
-    {
-        CHECK_REFCOUNT_CRASH(m_nRefCounter >= 0);
-        ++m_nRefCounter;
-    }
-
-    void Release()
-    {
-        CHECK_REFCOUNT_CRASH(m_nRefCounter > 0);
-        if (--m_nRefCounter == 0)
-        {
-            delete this;
-        }
-        else if (m_nRefCounter < 0)
-        {
-            assert(0);
-            CryFatalError("Deleting Reference Counted Object Twice");
-        }
-    }
-    // Warning: use for debugging/statistics purposes only!
-    Counter NumRefs()
-    {
-        return m_nRefCounter;
-    }
-protected:
-    Counter m_nRefCounter;
-};
-
-// default implementation is int counter - for better alignment
-typedef _reference_target<int> _reference_target_t;
-
-
-// reference target for smart pointer with configurable destruct function
-// implements AddRef() and Release() strategy using reference counter of the specified type
-template <typename T, typename Counter = int>
-class _cfg_reference_target
-{
-public:
-
-    typedef void (* DeleteFncPtr)(void*);
-
-    _cfg_reference_target()
-        : m_nRefCounter (0)
-        , m_pDeleteFnc(operator delete)
-    {
-    }
-
-    explicit _cfg_reference_target(DeleteFncPtr pDeleteFnc)
-        : m_nRefCounter (0)
-        , m_pDeleteFnc(pDeleteFnc)
-    {
-    }
-
-    virtual ~_cfg_reference_target()
-    {
-    }
-
-    void AddRef()
-    {
-        CHECK_REFCOUNT_CRASH(m_nRefCounter >= 0);
-        ++m_nRefCounter;
-    }
-
-    void Release()
-    {
-        CHECK_REFCOUNT_CRASH(m_nRefCounter > 0);
-        if (--m_nRefCounter == 0)
-        {
-            assert(m_pDeleteFnc);
-            static_cast<T*>(this)->~T();
-            m_pDeleteFnc(this);
-        }
-        else if (m_nRefCounter < 0)
-        {
-            assert(0);
-            CryFatalError("Deleting Reference Counted Object Twice");
-        }
-    }
-
-    // Sets the delete function with which this object is supposed to be deleted
-    void SetDeleteFnc(DeleteFncPtr pDeleteFnc) { m_pDeleteFnc = pDeleteFnc; }
-
-    // Warning: use for debugging/statistics purposes only!
-    Counter NumRefs()
-    {
-        return m_nRefCounter;
-    }
-protected:
-    Counter m_nRefCounter;
-    DeleteFncPtr m_pDeleteFnc;
-};
-
-
-// base class for interfaces implementing reference counting
-// derive your interface from this class and the descendants won't have to implement
-// the reference counting logic
-template <typename Counter>
-class _i_reference_target
-{
-public:
-    _i_reference_target()
-        : m_nRefCounter (0)
-    {
-    }
-
-    virtual ~_i_reference_target()
-    {
-    }
-
-    virtual void AddRef()
-    {
-        ++m_nRefCounter;
-    }
-
-    virtual void Release()
-    {
-        if (--m_nRefCounter == 0)
-        {
-            delete this;
-        }
-        else if (m_nRefCounter < 0)
-        {
-            assert(0);
-            CryFatalError("Deleting Reference Counted Object Twice");
-        }
-    }
-
-    // Warning: use for debugging/statistics purposes only!
-    Counter NumRefs()   const
-    {
-        return m_nRefCounter;
-    }
-protected:
-    Counter m_nRefCounter;
-};
-
-class CMultiThreadRefCount
-{
-public:
-    CMultiThreadRefCount()
-        : m_cnt(0) {}
-    virtual ~CMultiThreadRefCount() {}
-
-    inline int AddRef()
-    {
-        return CryInterlockedIncrement(&m_cnt);
-    }
-    inline int Release()
-    {
-        const int nCount = CryInterlockedDecrement(&m_cnt);
-        assert(nCount >= 0);
-        if (nCount == 0)
-        {
-            delete this;
-        }
-        else if (nCount < 0)
-        {
-            assert(0);
-            CryFatalError("Deleting Reference Counted Object Twice");
-        }
-        return nCount;
-    }
-
-    inline int GetRefCount()    const { return m_cnt; }
-
-protected:
-    // Allows the memory for the object to be deallocated in the dynamic module where it was originally constructed, as it may use different memory manager (Debug/Release configurations)
-    virtual void DeleteThis() { delete this; }
-
-private:
-    volatile int m_cnt;
-};
-
-// base class for interfaces implementing reference counting that needs to be thread-safe
-// derive your interface from this class and the descendants won't have to implement
-// the reference counting logic
-template <typename Counter>
-class _i_multithread_reference_target
-{
-public:
-    _i_multithread_reference_target()
-        : m_nRefCounter(0)
-    {
-    }
-
-    virtual ~_i_multithread_reference_target()
-    {
-    }
-
-    virtual void AddRef()
-    {
-        CryInterlockedIncrement(&m_nRefCounter);
-    }
-
-    virtual void Release()
-    {
-        const int nCount = CryInterlockedDecrement(&m_nRefCounter);
-        assert(nCount >= 0);
-        if (nCount == 0)
-        {
-            delete this;
-        }
-        else if (nCount < 0)
-        {
-            assert(0);
-            CryFatalError("Deleting Reference Counted Object Twice");
-        }
-    }
-
-    Counter NumRefs()   const { return m_nRefCounter; }
-
-protected:
-
-    volatile Counter m_nRefCounter;
-};
-
-typedef _i_reference_target<int> _i_reference_target_t;
-typedef _i_multithread_reference_target<int> _i_multithread_reference_target_t;
-
-// TYPEDEF_AUTOPTR macro, declares Class_AutoPtr, which is the smart pointer to the given class,
-// and Class_AutoArray, which is the array(STL vector) of autopointers
-#ifdef ENABLE_NAIIVE_AUTOPTR
-// naiive autopointer makes it easier for Visual Assist to parse the declaration and sometimes is easier for debug
-#define TYPEDEF_AUTOPTR(T) typedef T* T##_AutoPtr; typedef std::vector<T##_AutoPtr> T##_AutoArray;
-#else
-#define TYPEDEF_AUTOPTR(T) typedef _smart_ptr<T> T##_AutoPtr; typedef std::vector<T##_AutoPtr> T##_AutoArray;
-#endif
-
-#endif // CRYINCLUDE_CRYCOMMON_SMARTPTR_H
diff --git a/Code/CryEngine/CryCommon/stridedptr.h b/Code/CryEngine/CryCommon/stridedptr.h
deleted file mode 100644
index d5e0ec632a..0000000000
--- a/Code/CryEngine/CryCommon/stridedptr.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_STRIDEDPTR_H
-#define CRYINCLUDE_CRYCOMMON_STRIDEDPTR_H
-#pragma once
-
-#include <CryCommon/platform.h>
-#include <CryCommon/CryEndian.h>
-
-template<class dtype>
-class strided_pointer
-{
-public:
-    strided_pointer()
-        : data(0)
-        , iStride(sizeof(dtype))
-    {
-    }
-
-    strided_pointer(dtype* pdata, int32 stride = sizeof(dtype))
-        : data(pdata)
-        , iStride(stride)
-    {
-    }
-
-    template<typename dtype1>
-    strided_pointer(dtype1* pdata)
-    {
-        set(pdata, sizeof(dtype1));
-    }
-
-    template<typename dtype1>
-    strided_pointer(const strided_pointer<dtype1>& src)
-    {
-        set(src.data, src.iStride);
-    }
-
-    template<typename dtype1>
-    ILINE strided_pointer& operator=(const strided_pointer<dtype1>& src)
-    {
-        set(src.data, src.iStride);
-        return *this;
-    }
-
-    ILINE dtype& operator[](int32 idx) { return *(dtype*)((char*)data + idx * iStride); }
-    ILINE const dtype& operator[](int32 idx) const { return *(const dtype*)((const char*)data + idx * iStride); }
-    ILINE strided_pointer<dtype> operator+(int32 idx) const { return strided_pointer<dtype>((dtype*)((char*)data + idx * iStride), iStride); }
-    ILINE strided_pointer<dtype> operator-(int32 idx) const { return strided_pointer<dtype>((dtype*)((char*)data - idx * iStride), iStride); }
-
-    ILINE operator bool() const
-    {
-        return data != 0;
-    }
-
-private:
-    template<typename dtype1>
-    ILINE void set(dtype1* pdata, int32 stride)
-    {
-#       if !defined(eLittleEndian)
-#           error eLittleEndian is not defined, please include CryEndian.h.
-#       endif
-        COMPILE_TIME_ASSERT(metautils::is_const<dtype>::value || !metautils::is_const<dtype1>::value);
-        // note: we allow xint32 -> xint16 converting
-        COMPILE_TIME_ASSERT(
-            (metautils::is_same<typename metautils::remove_const<dtype1>::type, typename metautils::remove_const<dtype>::type>::value ||
-             ((metautils::is_same<typename metautils::remove_const<dtype1>::type, sint32>::value ||
-               metautils::is_same<typename metautils::remove_const<dtype1>::type, uint32>::value ||
-               metautils::is_same<typename metautils::remove_const<dtype1>::type, sint16>::value ||
-               metautils::is_same<typename metautils::remove_const<dtype1>::type, uint16>::value) &&
-              (metautils::is_same<typename metautils::remove_const<dtype>::type, sint16>::value ||
-               metautils::is_same<typename metautils::remove_const<dtype>::type, uint16>::value))));
-        data = (dtype*)pdata + (sizeof(dtype1) / sizeof(dtype) - 1) * (int)eLittleEndian;
-        iStride = stride;
-    }
-
-private:
-    // Prevents assignment of a structure member's address by mistake:
-    //   stridedPtrObject = &myStruct.member;
-    // Use explicit constructor instead:
-    //   stridedPtrObject = strided_pointer<baseType>(&myStruct.member, sizeof(myStruct));
-    //
-    // Keep it private and non-implemented.
-    strided_pointer& operator=(dtype* pdata);
-
-    // Prevents using the address directly by mistake:
-    //   memcpy(destination, stridedPtrObject, sizeof(baseType) * n);
-    // Use address of the first element instead:
-    //   memcpy(destination, &stridedPtrObject[0], stridedPtrObject.iStride * n);
-    //
-    // Keep it private and non-implemented.
-    operator void*() const;
-
-    // Prevents direct dereferencing to avoid confusing it with "normal" pointers:
-    //   val = *stridedPtrObject;
-    // Use operator [] instead:
-    //   val = stridedPtrObject[0];
-    //
-    // Keep it private and non-implemented.
-    dtype& operator*() const;
-
-public:
-    dtype* data;
-    int32 iStride;
-};
-
-
-#endif // CRYINCLUDE_CRYCOMMON_STRIDEDPTR_H
diff --git a/Code/CryEngine/CrySystem/AZCoreLogSink.h b/Code/CryEngine/CrySystem/AZCoreLogSink.h
deleted file mode 100644
index e5c0228a16..0000000000
--- a/Code/CryEngine/CrySystem/AZCoreLogSink.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Math/Crc.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/Console/IConsole.h>
-
-#include <CryAssert.h>
-
-namespace AZ
-{
-    AZ_CVAR_EXTERNED(int, bg_traceLogLevel);
-}
-
-/**
- * Hook Trace bus so we can funnel AZ asserts, warnings, etc to CryEngine.
- *
- * Note: This is currently owned by CrySystem, because CrySystem owns
- * the logging mechanism for which it is relevant.
- */
-class AZCoreLogSink
-    : public AZ::Debug::TraceMessageBus::Handler
-{
-public:
-    inline static void Connect()
-    {
-        GetInstance().m_ignoredAsserts = new IgnoredAssertMap();
-        GetInstance().BusConnect();
-    }
-
-    inline static void Disconnect()
-    {
-        GetInstance().BusDisconnect();
-        delete GetInstance().m_ignoredAsserts;
-    }
-
-    static AZCoreLogSink& GetInstance()
-    {
-        static AZCoreLogSink s_sink;
-        return s_sink;
-    }
-
-    static bool IsCryLogReady()
-    {
-        static bool hasSetCVar = false;
-        bool ready = gEnv && gEnv->pSystem && gEnv->pLog;
-
-#ifdef _RELEASE
-        if(!hasSetCVar && ready)
-        {
-            // AZ logging only has a concept of 3 levels (error, warning, info) but cry logging has 4 levels (..., messaging).  If info level is set, we'll turn on messaging as well
-            int logLevel = AZ::bg_traceLogLevel == AZ::Debug::LogLevel::Info ? 4 : AZ::bg_traceLogLevel;
-
-            gEnv->pConsole->GetCVar("log_WriteToFileVerbosity")->Set(logLevel);
-            hasSetCVar = true;
-        }
-#endif
-
-        return ready;
-    }
-
-    bool OnPreAssert(const char* fileName, int line, const char* func, const char* message) override
-    {
-#if defined(USE_CRY_ASSERT) && AZ_LEGACY_CRYSYSTEM_TRAIT_DO_PREASSERT
-        AZ::Crc32 crc;
-        crc.Add(&line, sizeof(line));
-        if (fileName)
-        {
-            crc.Add(fileName, strlen(fileName));
-        }
-
-        bool* ignore = nullptr;
-        auto foundIter = m_ignoredAsserts->find(crc);
-        if (foundIter == m_ignoredAsserts->end())
-        {
-            ignore = &((*m_ignoredAsserts)[crc]);
-            *ignore = false;
-        }
-        else
-        {
-            ignore = &((*m_ignoredAsserts)[crc]);
-        }
-
-        if (!(*ignore))
-        {
-            using namespace AZ::Debug;
-
-            Trace::Output(nullptr, "\n==================================================================\n");
-            AZ::OSString outputMsg = AZ::OSString::format("Trace::Assert\n %s(%d): '%s'\n%s\n", fileName, line, func, message);
-            Trace::Output(nullptr, outputMsg.c_str());
-
-            // Suppress 3 in stack depth - this function, the bus broadcast that got us here, and Trace::Assert
-            Trace::Output(nullptr, "------------------------------------------------\n");
-            Trace::PrintCallstack(nullptr, 3);
-            Trace::Output(nullptr, "\n==================================================================\n");
-
-            AZ::EnvironmentVariable<bool> inEditorBatchMode = AZ::Environment::FindVariable<bool>("InEditorBatchMode");
-            if (!inEditorBatchMode.IsConstructed() || !inEditorBatchMode.Get())
-            {
-                // Note - CryAssertTrace doesn't actually print any info to logging
-                // it just stores the message internally for the message box in CryAssert to use
-                CryAssertTrace("%s", message);
-                if (CryAssert("Assertion failed", fileName, line, ignore) || Trace::IsDebuggerPresent())
-                {
-                    Trace::Break();
-                }
-            }
-        }
-        else
-        {
-            CryLogAlways("%s", message);
-        }
-
-        return true; // suppress default AzCore behavior.
-#else
-        AZ_UNUSED(fileName);
-        AZ_UNUSED(line);
-        AZ_UNUSED(func);
-        AZ_UNUSED(message);
-        return false; // allow AZCore to do its default behavior.   This usually results in an application shutdown.
-#endif
-    }
-
-    bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message) override
-    {
-        AZ_UNUSED(fileName);
-        AZ_UNUSED(line);
-        AZ_UNUSED(func);
-        if (!IsCryLogReady())
-        {
-            return false; // allow AZCore to do its default behavior.
-        }
-        gEnv->pLog->LogError("(%s) - %s", window, message);
-        return true; // suppress default AzCore behavior.
-    }
-
-    bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override
-    {
-        AZ_UNUSED(fileName);
-        AZ_UNUSED(line);
-        AZ_UNUSED(func);
-
-        if (!IsCryLogReady())
-        {
-            return false; // allow AZCore to do its default behavior.
-        }
-
-        CryWarning(VALIDATOR_MODULE_UNKNOWN, VALIDATOR_WARNING, "(%s) - %s", window, message);
-        return true; // suppress default AzCore behavior.
-    }
-
-    bool OnOutput(const char* window, const char* message)  override
-    {
-        if (!IsCryLogReady())
-        {
-            return false; // allow AZCore to do its default behavior.
-        }
-
-        if (window == AZ::Debug::Trace::GetDefaultSystemWindow())
-        {
-            CryLogAlways("%s", message);
-        }
-        else
-        {
-            CryLog("(%s) - %s", window, message);
-        }
-
-        return true; // suppress default AzCore behavior.
-    }
-
-private:
-
-    using IgnoredAssertMap = AZStd::unordered_map<AZ::Crc32, bool, AZStd::hash<AZ::Crc32>, AZStd::equal_to<AZ::Crc32>, AZ::OSStdAllocator>;
-    IgnoredAssertMap* m_ignoredAsserts;
-};
diff --git a/Code/CryEngine/CrySystem/AZCrySystemInitLogSink.cpp b/Code/CryEngine/CrySystem/AZCrySystemInitLogSink.cpp
deleted file mode 100644
index c34d990875..0000000000
--- a/Code/CryEngine/CrySystem/AZCrySystemInitLogSink.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "CrySystem_precompiled.h"
-#include <AZCrySystemInitLogSink.h>
-
-#include <AzCore/NativeUI/NativeUIRequests.h>
-#include <AzCore/std/string/osstring.h>
-
-#include <ISystem.h>
-
-namespace AZ
-{
-    namespace Debug
-    {
-        void CrySystemInitLogSink::SetFatalMessageBox(bool enable)
-        {
-            m_isMessageBoxFatal = enable;
-        }
-
-        void CrySystemInitLogSink::DisplayCollectedErrorStrings() const
-        {
-            if (m_errorStringsCollected.empty())
-            {
-                return;
-            }
-
-            AZ::OSString msgBoxMessage;
-            msgBoxMessage.append("O3DE could not initialize correctly for the following reason(s):");
-
-            for (const AZ::OSString& errMsg : m_errorStringsCollected)
-            {
-                msgBoxMessage.append("\n");
-                msgBoxMessage.append(errMsg.c_str());
-            }
-
-            Trace::Output(nullptr, "\n==================================================================\n");
-            Trace::Output(nullptr, msgBoxMessage.c_str());
-            Trace::Output(nullptr, "\n==================================================================\n");
-
-            EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "O3DE Initialization Failed", msgBoxMessage.c_str(), false);
-        }
-    } // namespace Debug
-} // namespace AZ
diff --git a/Code/CryEngine/CrySystem/AZCrySystemInitLogSink.h b/Code/CryEngine/CrySystem/AZCrySystemInitLogSink.h
deleted file mode 100644
index e97c605b84..0000000000
--- a/Code/CryEngine/CrySystem/AZCrySystemInitLogSink.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzFramework/Logging/StartupLogSinkReporter.h>
-
-namespace AZ
-{
-    namespace Debug
-    {
-        /**
-        * A handler for the TraceMessageBus which is meant to collect errors and asserts during CrySystem::Init to display them to the user.
-        * It will also elevate all output to CryLogAlways while it is in scope.
-        * As such, it assumes that it is being used within the CrySystem library and gEnv and gEnv->pSystem are valid.
-        */
-        class CrySystemInitLogSink
-            : public StartupLogSink
-        {
-        public:
-            CrySystemInitLogSink() = default;
-
-            /**
-            * Enables or disables the fatal flags to send to the platform specific message box
-            */
-            void SetFatalMessageBox(bool enable = true);
-
-            /**
-            * Formats the collected error messages into a platform specific message box to display to the user.
-            * This expects that a valid gEnv->pSystem exists, and the IOSPlatform has been initialzied.
-            * Will also log output messages to whatever medium is possible for OnOutput messages on TraceMessageBus (ex. debug output, logs).
-            */
-            void DisplayCollectedErrorStrings() const override;
-
-        protected:
-            bool m_isMessageBoxFatal = false;
-        };
-    } // namespace Debug
-} // namespace AZ
-
diff --git a/Code/CryEngine/CrySystem/CMakeLists.txt b/Code/CryEngine/CrySystem/CMakeLists.txt
deleted file mode 100644
index 54a1ad9cc3..0000000000
--- a/Code/CryEngine/CrySystem/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-add_subdirectory(XML)
-
-ly_add_target(
-    NAME CrySystem.Static STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        crysystem_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::expat
-            3rdParty::lz4
-            3rdParty::md5
-            3rdParty::tiff
-            3rdParty::zlib
-            3rdParty::zstd
-            Legacy::CryCommon
-            Legacy::CrySystem.XMLBinary
-            Legacy::RemoteConsoleCore
-            AZ::AzFramework
-)
-
-ly_add_source_properties(
-    SOURCES SystemInit.cpp
-    PROPERTY COMPILE_DEFINITIONS 
-    VALUES ${LY_PAL_TOOLS_DEFINES}
-)
-
-ly_add_target(
-    NAME CrySystem ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
-    NAMESPACE Legacy
-    FILES_CMAKE
-        crysystem_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::CrySystem.Static
-            AZ::AzCore
-            Legacy::CryCommon
-)
diff --git a/Code/CryEngine/CrySystem/CmdLine.cpp b/Code/CryEngine/CrySystem/CmdLine.cpp
deleted file mode 100644
index 37bc109cc0..0000000000
--- a/Code/CryEngine/CrySystem/CmdLine.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "CmdLine.h"
-
-
-void CCmdLine::PushCommand(const string& sCommand, const string& sParameter)
-{
-    if (sCommand.empty())
-    {
-        return;
-    }
-
-    ECmdLineArgType type = eCLAT_Normal;
-    const char* szCommand = sCommand.c_str();
-
-    if (sCommand[0] == '-')
-    {
-        type = eCLAT_Pre;
-        ++szCommand;
-
-        // Handle cmd line parameters that use -- properly
-        if (szCommand[0] == '-')
-        {
-            ++szCommand;
-        }
-    }
-    else if (sCommand[0] == '+')
-    {
-        type = eCLAT_Post;
-        ++szCommand;
-    }
-
-    m_args.push_back(CCmdLineArg(szCommand, sParameter.c_str(), type));
-}
-
-CCmdLine::CCmdLine(const char* commandLine)
-{
-    m_sCmdLine = commandLine;
-
-    char* src = (char*)commandLine;
-
-    string command, parameter;
-
-    for (;; )
-    {
-        if (*src == '\0')
-        {
-            break;
-        }
-
-        string arg = Next(src);
-
-        if (m_args.empty())
-        {
-            // this is the filename, convert backslash to forward slash
-            arg.replace('\\', '/');
-            m_args.push_back(CCmdLineArg("filename", arg.c_str(), eCLAT_Executable));
-        }
-        else
-        {
-            bool bSecondCharIsNumber = false;
-
-            if (arg[0] && arg[1] >= '0' && arg[1] <= '9')
-            {
-                bSecondCharIsNumber = true;
-            }
-
-            if ((arg[0] == '-' && !bSecondCharIsNumber)
-                || (arg[0] == '+' && !bSecondCharIsNumber)
-                || command.empty())                                             // separator or first parameter
-            {
-                PushCommand(command, parameter);
-
-                command = arg;
-                parameter = "";
-            }
-            else
-            {
-                if (parameter.empty())
-                {
-                    parameter = arg;
-                }
-                else
-                {
-                    parameter += string(" ") + arg;
-                }
-            }
-        }
-    }
-
-    PushCommand(command, parameter);
-}
-
-CCmdLine::~CCmdLine()
-{
-}
-
-const ICmdLineArg* CCmdLine::GetArg(int n) const
-{
-    if ((n >= 0) && (n < (int)m_args.size()))
-    {
-        return &m_args[n];
-    }
-
-    return 0;
-}
-
-int CCmdLine::GetArgCount() const
-{
-    return (int)m_args.size();
-}
-
-const ICmdLineArg* CCmdLine::FindArg(const ECmdLineArgType ArgType, const char* name, bool caseSensitive) const
-{
-    if (caseSensitive)
-    {
-        for (std::vector<CCmdLineArg>::const_iterator it = m_args.begin(); it != m_args.end(); ++it)
-        {
-            if (it->GetType() == ArgType)
-            {
-                if (!strcmp(it->GetName(), name))
-                {
-                    return &(*it);
-                }
-            }
-        }
-    }
-    else
-    {
-        for (std::vector<CCmdLineArg>::const_iterator it = m_args.begin(); it != m_args.end(); ++it)
-        {
-            if (it->GetType() == ArgType)
-            {
-                if (!_stricmp(it->GetName(), name))
-                {
-                    return &(*it);
-                }
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-string CCmdLine::Next(char*& src)
-{
-    char ch = 0;
-    char* org = src;
-
-    ch = *src++;
-    while (ch)
-    {
-        switch (ch)
-        {
-        case '\'':
-        case '\"':
-            org = src;
-
-            while ((*src++ != ch) && *src)
-            {
-                ;
-            }
-
-            return string(org, src - 1);
-
-        case '[':
-            org = src;
-            while ((*src++ != ']') && *src)
-            {
-                ;
-            }
-            return string(org, src - 1);
-
-        case ' ':
-            ch = *src++;
-            continue;
-        default:
-            org = src - 1;
-            for (; *src != ' ' && *src != '\t' && *src; ++src)
-            {
-                ;
-            }
-
-            return string(org, src);
-        }
-        ch = *src++;
-    }
-
-    return string();
-}
-
-
diff --git a/Code/CryEngine/CrySystem/CmdLine.h b/Code/CryEngine/CrySystem/CmdLine.h
deleted file mode 100644
index ea1bfb60ef..0000000000
--- a/Code/CryEngine/CrySystem/CmdLine.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Implements the command line interface ICmdLine.
-
-#ifndef CRYINCLUDE_CRYSYSTEM_CMDLINE_H
-#define CRYINCLUDE_CRYSYSTEM_CMDLINE_H
-
-#pragma once
-
-
-#include <ICmdLine.h>
-#include "CmdLineArg.h"
-
-
-class CCmdLine
-    : public ICmdLine
-{
-public:
-    CCmdLine(const char* commandLine);
-    virtual ~CCmdLine();
-
-    virtual const ICmdLineArg* GetArg(int n) const;
-    virtual int GetArgCount() const;
-    virtual const ICmdLineArg* FindArg(const ECmdLineArgType ArgType, const char* name, bool caseSensitive = false) const;
-    virtual const char* GetCommandLine() const { return m_sCmdLine; };
-
-private:
-    void PushCommand(const string& sCommand, const string& sParameter);
-    string Next(char*& str);
-
-    string m_sCmdLine;
-    std::vector<CCmdLineArg>    m_args;
-};
-
-
-#endif // CRYINCLUDE_CRYSYSTEM_CMDLINE_H
diff --git a/Code/CryEngine/CrySystem/CmdLineArg.cpp b/Code/CryEngine/CrySystem/CmdLineArg.cpp
deleted file mode 100644
index 07a0ee4024..0000000000
--- a/Code/CryEngine/CrySystem/CmdLineArg.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "CmdLineArg.h"
-
-
-CCmdLineArg::CCmdLineArg(const char* name, const char* value, ECmdLineArgType type)
-{
-    m_name = name;
-    m_value = value;
-    m_type = type;
-}
-
-CCmdLineArg::~CCmdLineArg()
-{
-}
-
-const char* CCmdLineArg::GetName() const
-{
-    return m_name.c_str();
-}
-const char* CCmdLineArg::GetValue() const
-{
-    return m_value.c_str();
-}
-const ECmdLineArgType CCmdLineArg::GetType() const
-{
-    return m_type;
-}
-const float CCmdLineArg::GetFValue() const
-{
-    return (float)atof(m_value.c_str());
-}
-const int CCmdLineArg::GetIValue() const
-{
-    return atoi(m_value.c_str());
-}
-
-
diff --git a/Code/CryEngine/CrySystem/CmdLineArg.h b/Code/CryEngine/CrySystem/CmdLineArg.h
deleted file mode 100644
index 40e9ac9907..0000000000
--- a/Code/CryEngine/CrySystem/CmdLineArg.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Implements the command line argument interface ICmdLineArg.
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_CMDLINEARG_H
-#define CRYINCLUDE_CRYSYSTEM_CMDLINEARG_H
-
-#pragma once
-
-#include <ICmdLine.h>
-
-
-class CCmdLineArg
-    : public ICmdLineArg
-{
-public:
-    CCmdLineArg(const char* name, const char* value, ECmdLineArgType type);
-    virtual ~CCmdLineArg();
-
-    const char* GetName() const;
-    const char* GetValue() const;
-    const ECmdLineArgType GetType() const;
-    const float GetFValue() const;
-    const int GetIValue() const;
-
-private:
-
-    ECmdLineArgType m_type;
-    string          m_name;
-    string          m_value;
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_CMDLINEARG_H
diff --git a/Code/CryEngine/CrySystem/ConsoleBatchFile.cpp b/Code/CryEngine/CrySystem/ConsoleBatchFile.cpp
deleted file mode 100644
index 22c455b7a8..0000000000
--- a/Code/CryEngine/CrySystem/ConsoleBatchFile.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Executes an ASCII batch file of console commands...
-
-
-#include "CrySystem_precompiled.h"
-#include "ConsoleBatchFile.h"
-#include "IConsole.h"
-#include "ISystem.h"
-#include "XConsole.h"
-#include <CryPath.h>
-#include <stdio.h>
-#include "System.h"
-#include <AzCore/IO/FileIO.h>
-
-IConsole* CConsoleBatchFile::m_pConsole = NULL;
-
-void CConsoleBatchFile::Init()
-{
-    m_pConsole = gEnv->pConsole;
-    REGISTER_COMMAND("exec", (ConsoleCommandFunc)ExecuteFileCmdFunc, 0, "executes a batch file of console commands");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CConsoleBatchFile::ExecuteFileCmdFunc(IConsoleCmdArgs* args)
-{
-    if (!m_pConsole)
-    {
-        Init();
-    }
-
-    if (!args->GetArg(1))
-    {
-        return;
-    }
-
-    ExecuteConfigFile(args->GetArg(1));
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CConsoleBatchFile::ExecuteConfigFile(const char* sFilename)
-{
-    if (!sFilename)
-    {
-        return false;
-    }
-
-    if (!m_pConsole)
-    {
-        Init();
-    }
-
-    string filename;
-
-    if (sFilename[0] != '@') // console config files are actually by default in @root@ instead of @assets@
-    {
-        // However, if we've passed in a relative or absolute path that matches an existing file name,
-        // don't change it.  Only change it to "@root@/filename" and strip off any relative paths
-        // if the given pattern *didn't* match a file.
-        if (AZ::IO::FileIOBase::GetDirectInstance()->Exists(sFilename))
-        {
-            filename = sFilename;
-        }
-        else
-        {
-            filename = PathUtil::Make("@root@", PathUtil::GetFile(sFilename));
-        }
-    }
-    else
-    {
-        filename = sFilename;
-    }
-
-    if (strlen(PathUtil::GetExt(filename)) == 0)
-    {
-        filename = PathUtil::ReplaceExtension(filename, "cfg");
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    CCryFile file;
-
-    {
-        const char* szLog = "Executing console batch file (try game,config,root):";
-        string filenameLog;
-        string sfn = PathUtil::GetFile(filename);
-
-        if (file.Open(filename, "rb", AZ::IO::IArchive::FOPEN_HINT_QUIET | AZ::IO::IArchive::FOPEN_ONDISK))
-        {
-            filenameLog = string("game/") + sfn;
-        }
-        else if (file.Open(string("config/") + sfn, "rb", AZ::IO::IArchive::FOPEN_HINT_QUIET | AZ::IO::IArchive::FOPEN_ONDISK))
-        {
-            filenameLog = string("game/config/") + sfn;
-        }
-        else if (file.Open(string("./") + sfn, "rb", AZ::IO::IArchive::FOPEN_HINT_QUIET | AZ::IO::IArchive::FOPEN_ONDISK))
-        {
-            filenameLog = string("./") + sfn;
-        }
-        else
-        {
-            CryLog("%s \"%s\" not found!", szLog, filename.c_str());
-            return false;
-        }
-
-        CryLog("%s \"%s\" found in %s ...", szLog, PathUtil::GetFile(filenameLog.c_str()), PathUtil::GetPath(filenameLog).c_str());
-    }
-
-    int nLen = file.GetLength();
-    char* sAllText = new char [nLen + 16];
-    file.ReadRaw(sAllText, nLen);
-    sAllText[nLen] = '\0';
-    sAllText[nLen + 1] = '\0';
-
-    /*
-        This can't work properly as ShowConsole() can be called during the execution of the scripts,
-        which means bConsoleStatus is outdated and must not be set at the end of the function
-
-        bool bConsoleStatus = ((CXConsole*)m_pConsole)->GetStatus();
-        ((CXConsole*)m_pConsole)->SetStatus(false);
-    */
-
-    char* strLast = sAllText + nLen;
-    char* str = sAllText;
-    while (str < strLast)
-    {
-        char* s = str;
-        while (str < strLast && *str != '\n' && *str != '\r')
-        {
-            str++;
-        }
-        *str = '\0';
-        str++;
-        while (str < strLast && (*str == '\n' || *str == '\r'))
-        {
-            str++;
-        }
-
-        string strLine = s;
-
-
-        //trim all whitespace characters at the beginning and the end of the current line and store its size
-        strLine.Trim();
-        size_t strLineSize = strLine.size();
-
-        //skip comments, comments start with ";" or "--" but may have preceding whitespace characters
-        if (strLineSize > 0)
-        {
-            if (strLine[0] == ';')
-            {
-                continue;
-            }
-            else if (strLine.find("--") == 0)
-            {
-                continue;
-            }
-        }
-        //skip empty lines
-        else
-        {
-            continue;
-        }
-
-        {
-            m_pConsole->ExecuteString(strLine);
-        }
-    }
-    // See above
-    //  ((CXConsole*)m_pConsole)->SetStatus(bConsoleStatus);
-
-    delete []sAllText;
-    return true;
-}
diff --git a/Code/CryEngine/CrySystem/ConsoleBatchFile.h b/Code/CryEngine/CrySystem/ConsoleBatchFile.h
deleted file mode 100644
index 52eaf053bc..0000000000
--- a/Code/CryEngine/CrySystem/ConsoleBatchFile.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Executes an ASCII batch file of console commands...
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_CONSOLEBATCHFILE_H
-#define CRYINCLUDE_CRYSYSTEM_CONSOLEBATCHFILE_H
-
-#pragma once
-
-struct IConsoleCmdArgs;
-struct IConsole;
-
-class CConsoleBatchFile
-{
-public:
-    static void Init();
-    static bool ExecuteConfigFile(const char* filename);
-
-private:
-    static void ExecuteFileCmdFunc(IConsoleCmdArgs* args);
-    static IConsole*        m_pConsole;
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_CONSOLEBATCHFILE_H
diff --git a/Code/CryEngine/CrySystem/ConsoleHelpGen.cpp b/Code/CryEngine/CrySystem/ConsoleHelpGen.cpp
deleted file mode 100644
index 2845ca14ae..0000000000
--- a/Code/CryEngine/CrySystem/ConsoleHelpGen.cpp
+++ /dev/null
@@ -1,942 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-
-#if defined(WIN32) || defined(WIN64)
-
-#include "ConsoleHelpGen.h"
-#include "System.h"
-
-
-
-// remove bad characters, toupper, not very fast
-string CConsoleHelpGen::FixAnchorName(const char* szName)
-{
-    string ret;
-
-    const char* p = szName;
-
-    while (*p)
-    {
-        if ((*p >= 'a' && *p <= 'z')
-            || (*p >= 'A' && *p <= 'Z')
-            || (*p >= '0' && *p <= '9'))
-        {
-            if (*p >= 'a' && *p <= 'z')
-            {
-                ret += *p - 'a' + 'A';
-            }
-            else
-            {
-                ret += *p;
-            }
-        }
-
-        ++p;
-    }
-
-    return ret;
-}
-
-string CConsoleHelpGen::GetCleanPrefix(const char* p)
-{
-    string sRet;
-
-    while (*p != '_' && *p != 0)
-    {
-        sRet += *p++;
-    }
-
-    return sRet;
-}
-
-
-string CConsoleHelpGen::SplitPrefixString_Part1(const char* p)
-{
-    string sRet;
-
-    while (*p != 10 && *p != 13 && *p != 0)
-    {
-        sRet += *p++;
-    }
-
-    return sRet;
-}
-
-const char* CConsoleHelpGen::SplitPrefixString_Part2(const char* p)
-{
-    while (*p != 10 && *p != 13 && *p != 0)
-    {
-        p++;
-    }
-
-    while (*p == 10 || *p == 13)
-    {
-        p++;
-    }
-
-    return p;
-}
-
-void CConsoleHelpGen::StartPage(FILE* f, const char* szPageName, const char* szPageDescription) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<HTML><HEAD><TITLE>%s</TITLE><META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=iso-8859-1\">", szPageName);
-        fprintf(f, "<META NAME=\"DESCRIPTION\" CONTENT=\"%s\">", szPageDescription);
-        fprintf(f, "<META NAME=\"author\" content=\"Crytek\">");
-        fprintf(f, "<META NAME=\"copyright\" CONTENT=\"Crytek\">");
-        fprintf(f, "<META NAME=\"KEYWORDS\" CONTENT=\"CryEngine,Crytek\">");
-        fprintf(f, "<META NAME=\"distribution\" CONTENT=\"Crytek\">");
-        fprintf(f, "<META NAME=\"revisit-after\" CONTENT=\"10 days\">");
-        fprintf(f, "<META NAME=\"robots\" CONTENT=\"INDEX, NOFOLLOW\">");
-        fprintf(f, "</HEAD><BODY bgcolor=#ffffff leftmargin=0 topmargin=0 alink=#0000ff link=#0000ff vlink=#0000ff text=#000000>");
-    }
-}
-
-void CConsoleHelpGen::EndPage(FILE* f) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<P></P></BODY></HTML>");
-    }
-}
-
-
-void CConsoleHelpGen::KeyValue(FILE* f, const char* szKey, const char* szValue) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<b>%s:</b> %s<br>\n", szKey, szValue);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        //      fprintf(f,"*%s:* %s\n",szKey,szValue);
-        fprintf(f, "| *%s:* | %s |\n", szKey, szValue);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-void CConsoleHelpGen::LogVersion(FILE* f) const
-{
-    char s[1024];
-
-    {
-        GetModuleFileName(NULL, s, sizeof(s));
-
-        char fdir[_MAX_PATH];
-        char fdrive[_MAX_PATH];
-        char file[_MAX_PATH];
-        char fext[_MAX_PATH];
-        _splitpath_s(s, fdrive, fdir, file, fext);
-
-        KeyValue(f, "Executable", (string(file) + fext).c_str());
-    }
-
-    {
-        time_t ltime;
-
-        time(&ltime);
-        tm today;
-        localtime_s(&today, &ltime);
-
-        strftime(s, 128, "%c", &today);
-        KeyValue(f, "Date(MM/DD/YY) Time", s);
-    }
-
-    {
-        const SFileVersion& ver = gEnv->pSystem->GetFileVersion();
-        ver.ToString(s, sizeof(s));
-
-        KeyValue(f, "FileVersion", s);
-    }
-
-    {
-        const SFileVersion& ver = gEnv->pSystem->GetProductVersion();
-        ver.ToString(s, sizeof(s));
-
-        KeyValue(f, "ProductVersion", s);
-    }
-
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<br>\n");
-    }
-}
-
-void CConsoleHelpGen::StartH1(FILE* f, const char* szName) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<h1>%s</h1>\n", szName);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        fprintf(f, "h1. %s\n", szName);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-void CConsoleHelpGen::EndH1(FILE* f) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<br>\n");
-    }
-}
-
-void CConsoleHelpGen::StartH3(FILE* f, const char* szName) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<h3>%s</h3><ul>\n", szName);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        fprintf(f, "\nh3. %s\n", szName);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-void CConsoleHelpGen::EndH3(FILE* f) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "</ul>\n");
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-
-
-void CConsoleHelpGen::StartCVar(FILE* f, const char* szName) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<h3>%s</h3><ul>\n", szName);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        //      fprintf(f,"\nh3. %s\n",szName);
-        fprintf(f, "\n<div class=\"panel\" style=\"border-style: none;border-width: 1px;\"><div class=\"panelContent\"><p><b>%s</b><br/>\n", szName);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-void CConsoleHelpGen::EndCVar(FILE* f) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "</ul>\n");
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        fprintf(f, "</div></div>\n\n");
-    }
-    else
-    {
-        assert(0);
-    }
-}
-void CConsoleHelpGen::SingleLinePrefix(FILE* f, const char* szPrefix, const char* szPrefixDesc, const char* szLink) const
-{
-    // group within the list of all groups (no elements)
-
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<li><a href=\"%s\">%s_ %s</a></li>\n", szLink, szPrefix, szPrefixDesc);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        string sPrefix;
-
-        if (*szPrefix)
-        {
-            sPrefix = string(szPrefix) + "_";
-        }
-
-        //      fprintf(f,"| %s | [%s|%s] |\n",sPrefix.c_str(),szPrefixDesc,szLink);        // e.g. "" "CL_" "CC_" "I_" "T_"
-        fprintf(f, "{section:border=false}\n"
-            "{column:width=50px}{align:right}%s{align}{column}\n"
-            "{column:width=10px}{column}\n"
-            "{column}{align:left}[%s|%s]{align}{column}\n"
-            "{section}\n",
-            sPrefix.c_str(), szPrefixDesc, szLink);                     // e.g. "" "CL_" "CC_" "I_" "T_"
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-void CConsoleHelpGen::StartPrefix(FILE* f, const char* szPrefix, const char* szPrefixDesc, const char* szLink) const
-{
-    // group before all the group elements
-
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<li><a href=\"%s\">%s_ %s</li></a><ul>\n", szLink, szPrefix, szPrefixDesc);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        if (*szPrefix)
-        {
-            fprintf(f, "* [%s %s|%s]\n", szPrefix, szPrefixDesc, szLink);
-        }
-        else
-        {
-            fprintf(f, "* [%s|%s]\n", szPrefixDesc, szLink);
-        }
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-void CConsoleHelpGen::EndPrefix(FILE* f) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "</ul>\n");
-    }
-}
-
-void CConsoleHelpGen::SingleLineEntry_InGlobal(FILE* f, const char* szName, const char* szLink) const
-{
-    // element within a group
-
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<li><a href=\"%s\">%s</a></li>\n", szLink, szName);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        fprintf(f, "** [%s|%s]\n", szName, szLink);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-
-void CConsoleHelpGen::SingleLineEntry_InGroup(FILE* f, const char* szName, const char* szLink) const
-{
-    // element within a group
-
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<li><a href=\"%s\">%s</a></li>\n", szLink, szName);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        fprintf(f, "* [%s|%s]\n", szName, szLink);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-// szName without #
-void CConsoleHelpGen::Anchor(FILE* f, const char* szName) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<a name=\"%s\"></a>\n", szName);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        fprintf(f, "{anchor:%s}", szName);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-void CConsoleHelpGen::InsertConsoleVars(std::set<const char*, string_nocase_lt>& setCmdAndVars, const char* szLocalPrefix) const
-{
-    CXConsole::ConsoleVariablesMap::const_iterator itrVar, itrVarEnd = m_rParent.m_mapVariables.end();
-
-    for (itrVar = m_rParent.m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
-    {
-        ICVar* var = itrVar->second;
-
-        if (_strnicmp(var->GetName(), szLocalPrefix, strlen(szLocalPrefix)) == 0)
-        {
-            setCmdAndVars.insert(var->GetName());
-        }
-    }
-}
-
-
-
-void CConsoleHelpGen::InsertConsoleCommands(std::set<const char*, string_nocase_lt>& setCmdAndVars, const char* szLocalPrefix) const
-{
-    CXConsole::ConsoleCommandsMap::const_iterator itrCmd, itrCmdEnd = m_rParent.m_mapCommands.end();
-
-    for (itrCmd = m_rParent.m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
-    {
-        const CConsoleCommand& cmd = itrCmd->second;
-
-        if (_strnicmp(cmd.m_sName, szLocalPrefix, strlen(szLocalPrefix)) == 0)
-        {
-            setCmdAndVars.insert(cmd.m_sName.c_str());
-        }
-    }
-}
-
-
-
-void CConsoleHelpGen::InsertConsoleVars(std::set<const char*, string_nocase_lt>& setCmdAndVars, std::map<string, const char*> mapPrefix) const
-{
-    CXConsole::ConsoleVariablesMap::const_iterator itrVar, itrVarEnd = m_rParent.m_mapVariables.end();
-
-    for (itrVar = m_rParent.m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
-    {
-        ICVar* var = itrVar->second;
-        bool bInsert = true;
-
-        {
-            std::map<string, const char*>::const_iterator it2, end = mapPrefix.end();
-
-            for (it2 = mapPrefix.begin(); it2 != end; ++it2)
-            {
-                if (it2->first != "___" && _strnicmp(var->GetName(), it2->first, it2->first.size()) == 0)
-                {
-                    bInsert = false;
-                    break;
-                }
-            }
-        }
-
-        if (bInsert)
-        {
-            setCmdAndVars.insert(var->GetName());
-        }
-    }
-}
-
-
-
-void CConsoleHelpGen::InsertConsoleCommands(std::set<const char*, string_nocase_lt>& setCmdAndVars, std::map<string, const char*> mapPrefix) const
-{
-    CXConsole::ConsoleCommandsMap::const_iterator itrCmd, itrCmdEnd = m_rParent.m_mapCommands.end();
-
-    for (itrCmd = m_rParent.m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
-    {
-        const CConsoleCommand& cmd = itrCmd->second;
-        bool bInsert = true;
-
-        {
-            std::map<string, const char*>::const_iterator it2, end = mapPrefix.end();
-
-            for (it2 = mapPrefix.begin(); it2 != end; ++it2)
-            {
-                if (it2->first != "___" && _strnicmp(cmd.m_sName, it2->first, it2->first.size()) == 0)
-                {
-                    bInsert = false;
-                    break;
-                }
-            }
-        }
-
-        if (bInsert)
-        {
-            setCmdAndVars.insert(cmd.m_sName.c_str());
-        }
-    }
-}
-
-void CConsoleHelpGen::CreateSingleEntryFile(const char* szName) const
-{
-    assert(m_eWorkMode == eWM_Confluence);    // only needed for confluence
-
-    FILE* f3 = nullptr;
-    azfopen(&f3, (string(GetFolderName()) + GetFileExtension() + "/" + FixAnchorName(szName)).c_str(), "w");
-
-    if (!f3)
-    {
-        assert(0);
-        return;         // error
-    }
-
-    //  StartPage(f3,szName,"");        // HTML style
-
-    IncludeSingleEntry(f3, szName);
-
-    //  EndPage(f3);        // HTML style
-
-    fclose(f3);
-}
-
-const CConsoleCommand* CConsoleHelpGen::FindConsoleCommand(const char* szName) const
-{
-    CXConsole::ConsoleCommandsMap::const_iterator itrCmd, itrCmdEnd = m_rParent.m_mapCommands.end();
-
-    for (itrCmd = m_rParent.m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
-    {
-        const CConsoleCommand& cmd = itrCmd->second;
-
-        if (strcmp(cmd.m_sName.c_str(), szName) == 0)
-        {
-            return &cmd;
-        }
-    }
-
-    return 0;
-}
-
-
-void CConsoleHelpGen::IncludeSingleEntry(FILE* f, const char* szName) const
-{
-    StartCVar(f, szName);
-
-    uint32 dwFlags = 0;
-    const char* szHelp = "";
-
-    // slow but good for simpler code
-    if (ICVar* pVar = gEnv->pConsole->GetCVar(szName))
-    {
-        dwFlags = pVar->GetFlags();
-        szHelp = pVar->GetHelp();
-    }
-    else if (const CConsoleCommand* pCommand = FindConsoleCommand(szName))
-    {
-        dwFlags = pCommand->m_nFlags;
-        szHelp = pCommand->m_sHelp.c_str();
-    }
-    else
-    {
-        assert(0);      // internal error
-    }
-    const char* szFlags = CXConsole::GetFlagsString(dwFlags);
-
-    if (*szFlags)
-    {
-        //      fprintf(f3,"%%GRAY%% %s %%ENDCOLOR%%<br>\n",szFlags);       // twiki style
-        if (m_eWorkMode == eWM_HTML)
-        {
-            fprintf(f, "%s<br>\n", szFlags);          // simple HTML style
-        }
-        else if (m_eWorkMode == eWM_Confluence)
-        {
-            fprintf(f, "<font color=\"#808080\">%s</font></p>\n", szFlags);
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-
-    if (*szHelp == 0)
-    {
-        //      fprintf(f,"%%TODO%%\n");    // wiki style, in our wiki %TODO% is defined as <img src=\"%%ICONURL{todo}%%\" width=\"37\" height=\"16\" alt=\"TODO\" border=\"0\" />
-        if (m_eWorkMode == eWM_HTML)
-        {
-            fprintf(f, "<blockquote></b>*TODO*</b></blockquote>\n"); // HTML style
-        }
-        else if (m_eWorkMode == eWM_Confluence)
-        {
-            fprintf(f, "{warning}TODO{warning}\n");          // Confluence style
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-    else
-    {
-        if (m_eWorkMode == eWM_HTML)
-        {
-            fprintf(f, "<blockquote><pre><verbatim><tt>\n%s\n</tt></verbatim></pre></blockquote>\n", szHelp);        // HTML style, <tt> to get fixed with font (layout in code is often making the assumption the forn is fixed width)
-        }
-        else if (m_eWorkMode == eWM_Confluence)
-        {
-            fprintf(f, "<pre>\n");
-
-            string sHelp = szHelp;
-
-            // currently not required as the {noformat} is used
-            //          sHelp.replace("[","\\[");       sHelp.replace("]","\\]");
-            //          sHelp.replace("{","\\{");       sHelp.replace("}","\\}");
-            //          sHelp.replace("(","\\(");       sHelp.replace(")","\\)");
-
-            fprintf(f, "%s\n", sHelp.c_str());       // Confluence style
-
-            fprintf(f, "</pre>");
-        }
-        else
-        {
-            assert(0);
-        }
-    }
-
-    EndCVar(f);
-}
-
-void CConsoleHelpGen::Work()
-{
-    //  string sEngineFolder = string("@user@/")+GetFolderName();
-    //  gEnv->pCryPak->RemoveDir(sEngineFolder.c_str());            // todo: check if that works
-    //  gEnv->pFileIO->CreatePath(sEngineFolder.c_str());
-
-    m_eWorkMode = eWM_HTML;
-    CreateMainPages();
-
-    m_eWorkMode = eWM_Confluence;
-    CreateMainPages();
-    CreateFileForEachEntry();
-
-    m_eWorkMode = eWM_None;
-}
-
-
-
-void CConsoleHelpGen::CreateFileForEachEntry()
-{
-    assert(m_eWorkMode == eWM_Confluence);    // only needed for confluence
-
-    // generate a single file for each console command
-    {
-        CXConsole::ConsoleCommandsMap::const_iterator itrCmd, itrCmdEnd = m_rParent.m_mapCommands.end();
-
-        for (itrCmd = m_rParent.m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
-        {
-            const CConsoleCommand& cmd = itrCmd->second;
-
-            CreateSingleEntryFile(cmd.m_sName.c_str());
-        }
-    }
-
-    // generate a single file for each console variable
-    {
-        CXConsole::ConsoleVariablesMap::iterator itrVar, itrVarEnd = m_rParent.m_mapVariables.end();
-
-        for (itrVar = m_rParent.m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
-        {
-            ICVar* var = itrVar->second;
-
-            CreateSingleEntryFile(var->GetName());
-        }
-    }
-}
-
-void CConsoleHelpGen::CreateMainPages()
-{
-    gEnv->pFileIO->CreatePath(GetFolderName());
-
-    std::map<string, const char*> mapPrefix;
-
-    // order here doesn't matter, after the name some help can be added (after the first return)
-    mapPrefix[     "AI_"] = "Artificial Intelligence";
-    mapPrefix[    "NET_"] = "Network";
-    mapPrefix[     "ED_"] = "Editor";
-    mapPrefix[     "ES_"] = "Entity System";
-    mapPrefix[    "CON_"] = "Console";
-    mapPrefix[     "AG_"] = "Animation Graph"               "\n"    "High level animation logic, describes animation selection and flow, matches animation state to current game logical state.";
-    mapPrefix[     "AC_"] = "Animated Character"            "\n"    "Better name would be 'Character Movement'.\nBridges game controlled movement and animation controlled movement.";
-    mapPrefix[     "CA_"] = "Character Animation"           "\n"    "Motion synthesize and playback, parameterization through blending and inversed kinematics.";
-    mapPrefix[      "E_"] = "3DEngine";
-    mapPrefix[      "I_"] = "Input";
-    mapPrefix[     "FG_"] = "Flow Graph"                    "\n"    "hyper graph: game logic";
-    mapPrefix[      "P_"] = "Physics";
-    mapPrefix[      "R_"] = "Renderer";
-    mapPrefix[      "S_"] = "Sound";
-    mapPrefix[      "G_"] = "Game"                          "\n"    "game specific, not part of CryEngine";
-    mapPrefix[    "SYS_"] = "System";
-    mapPrefix[      "V_"] = "Vehicle";
-    mapPrefix[     "FT_"] = "Feature Test";
-    mapPrefix[   "DEMO_"] = "Time Demo";
-    mapPrefix[     "FT_"] = "Feature Test";
-    mapPrefix[     "GL_"] = "Game Lobby";
-    mapPrefix[    "HUD_"] = "Heads Up Display";
-    mapPrefix[     "KC_"] = "Kill Cam";
-    mapPrefix[     "PL_"] = "Player";
-    mapPrefix[     "PP_"] = "Player Progression";
-    mapPrefix[    "AIM_"] = "Aiming";
-    mapPrefix["CAPTURE_"] = "Capture";
-    mapPrefix[     "DS_"] = "Dialog Scripts";
-    mapPrefix[     "GT_"] = "Game Token";
-    mapPrefix[    "LOG_"] = "Logging";
-    mapPrefix[    "MOV_"] = "Movie Sequences";
-    mapPrefix[    "OSM_"] = "Overload Scene Manager";
-    mapPrefix["PROFILE_"] = "Profiling";
-    mapPrefix[   "STAP_"] = "Screen-space Torso Aim Pose";
-    mapPrefix[    "LUA_"] = "Lua"                           "\n"    "scripting system";
-    mapPrefix[     "SV_"] = "Server";
-    mapPrefix[    "MFX_"] = "Material Effects";
-    mapPrefix[      "M_"] = "Multi threading";
-    mapPrefix[     "CC_"] = "Character Customization";
-    mapPrefix[     "CL_"] = "Client";
-    mapPrefix[      "Q_"] = "Quality"                       "\n"    "usually shader quality";
-    mapPrefix[      "T_"] = "Timer";
-    mapPrefix[     "___"] = "Remaining";            // key defined to get it sorted in the end
-
-    FILE* f1 = nullptr;
-    azfopen(&f1, (string(GetFolderName()) + "/index" + GetFileExtension()).c_str(), "w");
-    if (!f1)
-    {
-        return;
-    }
-
-    StartPage(f1, "CryEngine ConsoleHTMLHelp", "main page");
-
-    StartH1(f1, "Console Commands and Variables");
-
-    LogVersion(f1);
-
-
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f1, "This list was exported from the engine by using the <b>DumpCommandsVars</b> console command.<br>\n\n");
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        fprintf(f1, "This list was exported from the engine by using the *DumpCommandsVars* console command.\n\n");
-    }
-    else
-    {
-        assert(0);
-    }
-
-    // show all registered Prefix with one line
-    {
-        std::map<string, const char*>::const_iterator it, end = mapPrefix.end();
-
-        StartH3(f1, "Registered Prefixes");
-
-        for (it = mapPrefix.begin(); it != end; ++it)
-        {
-            const char* szLocalPrefix = it->first.c_str();      // can be 0 for remaining ones
-            string sCleanPrefix = GetCleanPrefix(szLocalPrefix);
-            string sPrefixName = SplitPrefixString_Part1(it->second);
-
-            SingleLinePrefix(f1, sCleanPrefix.c_str(), sPrefixName.c_str(), (string("CONSOLEPREFIX") + FixAnchorName(sCleanPrefix.c_str()) + GetFileExtension()).c_str());
-            //          fprintf(f1,"   * [[CONSOLEPREFIX%s][%s_ %s]]\n",FixAnchorName(sCleanPrefix.c_str()).c_str(),sCleanPrefix.c_str(),sPrefixName.c_str());
-        }
-
-        EndH3(f1);  // Registered prefixes
-    }
-
-
-
-
-    {
-        std::map<string, const char*>::const_iterator it, it2, end = mapPrefix.end();
-
-        StartH3(f1, "Console Commands and Variables Sorted by Prefix");
-
-        for (it = mapPrefix.begin(); it != end; ++it)
-        {
-            const char* szLocalPrefix = it->first.c_str();      // can be 0 for remaining ones
-            string sCleanPrefix = GetCleanPrefix(szLocalPrefix);
-            string sPrefixName = SplitPrefixString_Part1(it->second);
-
-            std::set<const char*, string_nocase_lt> setCmdAndVars;      // to get console variables and commands sorted together
-
-            if (strcmp("___", szLocalPrefix) != 0)
-            {
-                // insert all starting with the prefix
-                InsertConsoleVars(setCmdAndVars, szLocalPrefix);
-                InsertConsoleCommands(setCmdAndVars, szLocalPrefix);
-            }
-            else
-            {
-                // insert all not starting with any of the prefix
-                InsertConsoleVars(setCmdAndVars, mapPrefix);
-                InsertConsoleCommands(setCmdAndVars, mapPrefix);
-            }
-
-            // -------------------------------
-
-            string sSubName = string("CONSOLEPREFIX") + sCleanPrefix;
-
-            StartPrefix(f1, sCleanPrefix.c_str(), sPrefixName.c_str(), (sSubName + GetFileExtension()).c_str());
-
-            string sFileOut = string(GetFolderName()) + "/" + sSubName + GetFileExtension();
-            FILE* f2 = nullptr;
-            azfopen(&f2, sFileOut.c_str(), "w");
-            if (!f2)
-            {
-                fclose(f1);
-                return;
-            }
-
-            // headline
-            {
-                string sHeadline;
-
-                if (sCleanPrefix.empty())
-                {
-                    sHeadline = "Console Commands and Variables Without Special Prefix";
-                }
-                else
-                {
-                    sHeadline = string("Console Commands and Variables with Prefix ") + sCleanPrefix + "_";
-                }
-
-                StartH1(f2, sHeadline.c_str());
-            }
-
-            Explanation(f2, SplitPrefixString_Part2(it->second));
-
-            KeyValue(f2, "Possible Flags", CXConsole::GetFlagsString(0xffffffff));
-            //          fprintf(f2,"<b>Possible Flags:</b><br>\n");
-            //          fprintf(f2,"     <blockquote>%s</blockquote>",CXConsole::GetFlagsString(0xffffffff));
-
-            // log console variables and commands
-            {
-                StartH3(f2, "Alphabetically Sorted");
-
-                std::set<const char*, string_nocase_lt>::const_iterator itI, endI = setCmdAndVars.end();
-
-                for (itI = setCmdAndVars.begin(); itI != endI; ++itI)
-                {
-                    SingleLineEntry_InGlobal(f1, *itI, (sSubName + GetFileExtension() + "#Anchor" + FixAnchorName(*itI)).c_str());
-                    SingleLineEntry_InGroup(f2, *itI, (string("#Anchor") + FixAnchorName(*itI)).c_str());
-                }
-
-                EndH3(f2);
-            }
-
-            {
-                StartH3(f2, "Console Variables and Commands");
-
-                bool bFirst = true;
-                {
-                    std::set<const char*, string_nocase_lt>::const_iterator itI, endI = setCmdAndVars.end();
-
-                    for (itI = setCmdAndVars.begin(); itI != endI; ++itI)
-                    {
-                        if (!bFirst)
-                        {
-                            Separator(f2);
-                        }
-                        bFirst = false;
-
-                        Anchor(f2, (string("Anchor") + FixAnchorName(*itI)).c_str());      // anchor
-
-                        IncludeSingleEntry(f2, *itI);
-                    }
-                }
-                EndH3(f2);
-            }
-
-            EndH1(f2);  // Console Commands and Variables ...
-
-            fclose(f2);
-            f2 = 0;
-
-            EndPrefix(f1);
-        }
-
-        EndH3(f1);  // Console commands and variables sorted by prefix
-    }
-
-    EndH1(f1);
-    EndPage(f1);
-
-    fclose(f1);
-
-    m_rParent.ConsoleLogInputResponse("successfully wrote directory %s", GetFolderName());
-}
-
-void CConsoleHelpGen::Separator(FILE* f) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<hr>\n");
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        //      fprintf(f,"----\n");
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-
-void CConsoleHelpGen::Explanation(FILE* f, const char* szText) const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        fprintf(f, "<blockquote>%s</blockquote><br>\n<br>\n", szText);
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        //      fprintf(f,"{quote}%s{quote}\n\n",szText);
-        fprintf(f, "%s\n\n", szText);
-    }
-    else
-    {
-        assert(0);
-    }
-}
-
-const char* CConsoleHelpGen::GetFileExtension() const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        return ".html";
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-    }
-    else
-    {
-        assert(0);
-    }
-
-    return "";
-}
-
-const char* CConsoleHelpGen::GetFolderName() const
-{
-    if (m_eWorkMode == eWM_HTML)
-    {
-        return "ConsoleHTMLHelp";
-    }
-    else if (m_eWorkMode == eWM_Confluence)
-    {
-        return "ConsoleHTMLHelp/CRYAUTOGEN";
-    }
-    else
-    {
-        assert(0);
-    }
-
-    return 0;
-}
-
-
-#endif  // defined(WIN32) || defined(WIN64)
-
diff --git a/Code/CryEngine/CrySystem/ConsoleHelpGen.h b/Code/CryEngine/CrySystem/ConsoleHelpGen.h
deleted file mode 100644
index 1e1f04c34e..0000000000
--- a/Code/CryEngine/CrySystem/ConsoleHelpGen.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_CRYSYSTEM_CONSOLEHELPGEN_H
-#define CRYINCLUDE_CRYSYSTEM_CONSOLEHELPGEN_H
-
-#if defined(WIN32) || defined(WIN64)
-
-#include "XConsole.h"           // CXConsole, struct string_nocase_lt
-
-
-// extract consoel variable and command help
-// in some HTML pages and many small files that can be included in Confluence wiki
-// pages (so maintain the documentation only in one place)
-//
-// Possible improvements/Known issues:
-//   - Nicer HTML layout (CSS?)
-//   - Searching in the content of the cvars is tricky (main page doesn't have help content)
-//   - %TODO% (was wiki image, should look good in confluence and HTML)
-//   - many small files should be stored in some extra folder for clearity
-//   - before generating the data the older directoy should be cleaned
-//   - file should be generated in the user folder
-//   - "wb" should be used instead of "w", to get the same result in unix
-class CConsoleHelpGen
-{
-public:
-    CConsoleHelpGen(CXConsole& rParent)
-        : m_rParent(rParent)
-        , m_eWorkMode(eWM_None)
-    {
-    }
-
-    void Work();
-
-private: // --------------------------------------------------------
-
-    enum EWorkMode
-    {
-        eWM_None,
-        eWM_HTML,
-        eWM_Confluence
-    };
-
-    //
-    void CreateMainPages();
-
-    // to create one file for for each cvar/command in confluence style
-    void CreateFileForEachEntry();
-
-    // insert if the name starts with the with prefix
-    void InsertConsoleVars(std::set<const char*, string_nocase_lt>& setCmdAndVars, const char* szPrefix) const;
-    // insert if the name starts with the with prefix
-    void InsertConsoleCommands(std::set<const char*, string_nocase_lt>& setCmdAndVars, const char* szPrefix) const;
-    // insert if the name does not start with any of the prefix in the map
-    void InsertConsoleVars(std::set<const char*, string_nocase_lt>& setCmdAndVars, std::map<string, const char*> mapPrefix) const;
-    // insert if the name does not start with any of the prefix in the map
-    void InsertConsoleCommands(std::set<const char*, string_nocase_lt>& setCmdAndVars, std::map<string, const char*> mapPrefix) const;
-
-    // a single file for the entry is generate
-    void CreateSingleEntryFile(const char* szName) const;
-
-    void IncludeSingleEntry(FILE* f, const char* szName) const;
-
-    static string FixAnchorName(const char* szName);
-    static string GetCleanPrefix(const char* p);
-    // split before "|" (to get the prefix itself)
-    static string SplitPrefixString_Part1(const char* p);
-    // split string after "|" (to get the optional help)
-    static const char* SplitPrefixString_Part2(const char* p);
-
-    void StartPage(FILE* f, const char* szPageName, const char* szPageDescription) const;
-    void EndPage(FILE* f) const;
-    void StartH1(FILE* f, const char* szName) const;
-    void EndH1(FILE* f) const;
-    void StartH3(FILE* f, const char* szName) const;
-    void EndH3(FILE* f) const;
-    void StartCVar(FILE* f, const char* szName) const;
-    void EndCVar(FILE* f) const;
-    void SingleLinePrefix(FILE* f, const char* szPrefix, const char* szPrefixDesc, const char* szLink) const;
-    void StartPrefix(FILE* f, const char* szPrefix, const char* szPrefixDesc, const char* szLink) const;
-    void EndPrefix(FILE* f) const;
-    void SingleLineEntry_InGlobal(FILE* f, const char* szName, const char* szLink) const;
-    void SingleLineEntry_InGroup(FILE* f, const char* szName, const char* szLink) const;
-    void Anchor(FILE* f, const char* szName) const;
-
-    // to log some inital stats like date or application name
-    void KeyValue(FILE* f, const char* szKey, const char* szValue) const;
-
-    // prefix explanation and indention for following text
-    void Explanation(FILE* f, const char* szText) const;
-
-    void Separator(FILE* f) const;
-
-    void LogVersion(FILE* f) const;
-
-    // case senstive
-    // Returns
-    //   0 if not found
-    const CConsoleCommand* FindConsoleCommand(const char* szName) const;
-
-    // ----------------------------------------------
-
-    //
-    const char* GetFolderName() const;
-    //
-    const char* GetFileExtension() const;
-
-    // ----------------------------------------------
-
-    CXConsole&                           m_rParent;
-    EWorkMode                               m_eWorkMode;                // during Work() thise true:HTML and false:Confluence at some point
-};
-
-
-#endif  // defined(WIN32) || defined(WIN64)
-#endif // CRYINCLUDE_CRYSYSTEM_CONSOLEHELPGEN_H
diff --git a/Code/CryEngine/CrySystem/CrySystem_precompiled.h b/Code/CryEngine/CrySystem/CrySystem_precompiled.h
deleted file mode 100644
index 495df0e6c2..0000000000
--- a/Code/CryEngine/CrySystem/CrySystem_precompiled.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Precompiled Header.
-
-
-#pragma once
-
-#include <AzCore/PlatformIncl.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <fcntl.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define STDAFX_H_SECTION_1 1
-#define STDAFX_H_SECTION_2 2
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION STDAFX_H_SECTION_1
-#include AZ_RESTRICTED_FILE(CrySystem_precompiled_h)
-#elif defined(LINUX) // Scrubber friendly negated define pattern
-#elif !defined(APPLE)
-    #include <memory.h>
-    #include <malloc.h>
-#endif
-
-//on mac the precompiled header is auto included in every .c and .cpp file, no include line necessary.
-//.c files don't like the cpp things in here
-#ifdef __cplusplus
-
-#include <vector>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION STDAFX_H_SECTION_2
-#include AZ_RESTRICTED_FILE(CrySystem_precompiled_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(APPLE) // Scrubber friendly negated define pattern
-#elif defined(ANDROID) // Scrubber friendly negated define pattern
-#elif defined(LINUX)
-    #   include <sys/io.h>
-#else
-    #   include <io.h>
-#endif
-
-//#define DEFINE_MODULE_NAME "CrySystem"
-
-#define CRYSYSTEM_EXPORTS
-
-#include <platform.h>
-
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX)
-#if defined(DEDICATED_SERVER)
-// enable/disable map load slicing functionality from the build
-#define MAP_LOADING_SLICING
-#endif
-#endif
-
-#ifdef WIN32
-#include <CryWindows.h>
-#include <tlhelp32.h>
-#undef GetCharWidth
-#undef GetUserName
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include "Cry_Math.h"
-#include <Cry_Camera.h>
-#include <smartptr.h>
-#include <Range.h>
-#include <CrySizer.h>
-#include <StlUtils.h>
-
-
-inline int RoundToClosestMB(size_t memSize)
-{
-    // add half a MB and shift down to get closest MB
-    return((int) ((memSize + (1 << 19)) >> 20));
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// For faster compilation
-//////////////////////////////////////////////////////////////////////////
-#include <IRenderer.h>
-#include <CryFile.h>
-#include <ISystem.h>
-#include <ITimer.h>
-#include <IPhysics.h>
-#include <IXml.h>
-#include <ICmdLine.h>
-#include <IConsole.h>
-#include <ILog.h>
-
-/////////////////////////////////////////////////////////////////////////////
-//forward declarations for common Interfaces.
-/////////////////////////////////////////////////////////////////////////////
-class ITexture;
-struct IRenderer;
-struct ISystem;
-struct ITimer;
-struct IFFont;
-struct ICVar;
-struct IConsole;
-struct IProcess;
-namespace AZ::IO
-{
-    struct IArchive;
-}
-struct ICryFont;
-struct IMovieSystem;
-struct IAudioSystem;
-struct IPhysicalWorld;
-
-#endif //__cplusplus
-
-
-
diff --git a/Code/CryEngine/CrySystem/DebugCallStack.cpp b/Code/CryEngine/CrySystem/DebugCallStack.cpp
deleted file mode 100644
index 1b15bace16..0000000000
--- a/Code/CryEngine/CrySystem/DebugCallStack.cpp
+++ /dev/null
@@ -1,895 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "DebugCallStack.h"
-
-#if defined(WIN32) || defined(WIN64)
-
-#include <IConsole.h>
-#include <CryPath.h>
-#include "System.h"
-
-#include <AzCore/Debug/StackTracer.h>
-#include <AzCore/Debug/EventTraceDrillerBus.h>
-
-#define VS_VERSION_INFO                 1
-#define IDD_CRITICAL_ERROR              101
-#define IDB_CONFIRM_SAVE                102
-#define IDB_DONT_SAVE                   103
-#define IDD_CONFIRM_SAVE_LEVEL          127
-#define IDB_CRASH_FACE                  128
-#define IDD_EXCEPTION                   245
-#define IDC_CALLSTACK                   1001
-#define IDC_EXCEPTION_CODE              1002
-#define IDC_EXCEPTION_ADDRESS           1003
-#define IDC_EXCEPTION_MODULE            1004
-#define IDC_EXCEPTION_DESC              1005
-#define IDB_EXIT                        1008
-#define IDB_IGNORE                      1010
-__pragma(comment(lib, "version.lib"))
-
-//! Needs one external of DLL handle.
-extern HMODULE gDLLHandle;
-
-#include <DbgHelp.h>
-
-#define MAX_PATH_LENGTH 1024
-#define MAX_SYMBOL_LENGTH 512
-
-static HWND hwndException = 0;
-static bool g_bUserDialog = true;         // true=on crash show dialog box, false=supress user interaction
-
-static int  PrintException(EXCEPTION_POINTERS* pex);
-
-static bool IsFloatingPointException(EXCEPTION_POINTERS* pex);
-
-extern LONG WINAPI CryEngineExceptionFilterWER(struct _EXCEPTION_POINTERS* pExceptionPointers);
-extern LONG WINAPI CryEngineExceptionFilterMiniDump(struct _EXCEPTION_POINTERS* pExceptionPointers, const char* szDumpPath, MINIDUMP_TYPE mdumpValue);
-
-//=============================================================================
-CONTEXT CaptureCurrentContext()
-{
-    CONTEXT context;
-    memset(&context, 0, sizeof(context));
-    context.ContextFlags = CONTEXT_FULL;
-    RtlCaptureContext(&context);
-
-    return context;
-}
-
-LONG __stdcall CryUnhandledExceptionHandler(EXCEPTION_POINTERS* pex)
-{
-    return DebugCallStack::instance()->handleException(pex);
-}
-
-
-BOOL CALLBACK EnumModules(
-    PCSTR   ModuleName,
-    DWORD64 BaseOfDll,
-    PVOID   UserContext)
-{
-    DebugCallStack::TModules& modules = *static_cast<DebugCallStack::TModules*>(UserContext);
-    modules[(void*)BaseOfDll] = ModuleName;
-
-    return TRUE;
-}
-//=============================================================================
-// Class Statics
-//=============================================================================
-
-// Return single instance of class.
-IDebugCallStack* IDebugCallStack::instance()
-{
-    static DebugCallStack sInstance;
-    return &sInstance;
-}
-
-//------------------------------------------------------------------------------------------------------------------------
-// Sets up the symbols for functions in the debug file.
-//------------------------------------------------------------------------------------------------------------------------
-DebugCallStack::DebugCallStack()
-    : prevExceptionHandler(0)
-    , m_pSystem(0)
-    , m_nSkipNumFunctions(0)
-    , m_bCrash(false)
-    , m_szBugMessage(NULL)
-{
-}
-
-DebugCallStack::~DebugCallStack()
-{
-}
-
-void DebugCallStack::RemoveOldFiles()
-{
-    RemoveFile("error.log");
-    RemoveFile("error.bmp");
-    RemoveFile("error.dmp");
-}
-
-void DebugCallStack::RemoveFile(const char* szFileName)
-{
-    FILE* pFile = nullptr;
-    azfopen(&pFile, szFileName, "r");
-    const bool bFileExists = (pFile != NULL);
-
-    if (bFileExists)
-    {
-        fclose(pFile);
-
-        WriteLineToLog("Removing file \"%s\"...", szFileName);
-        if (remove(szFileName) == 0)
-        {
-            WriteLineToLog("File successfully removed.");
-        }
-        else
-        {
-            WriteLineToLog("Couldn't remove file!");
-        }
-    }
-}
-
-void DebugCallStack::installErrorHandler(ISystem* pSystem)
-{
-    m_pSystem = pSystem;
-    prevExceptionHandler = (void*)SetUnhandledExceptionFilter(CryUnhandledExceptionHandler);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DebugCallStack::SetUserDialogEnable(const bool bUserDialogEnable)
-{
-    g_bUserDialog = bUserDialogEnable;
-}
-
-
-DWORD g_idDebugThreads[10];
-const char* g_nameDebugThreads[10];
-int g_nDebugThreads = 0;
-volatile int g_lockThreadDumpList = 0;
-
-void MarkThisThreadForDebugging(const char* name)
-{
-    EBUS_EVENT(AZ::Debug::EventTraceDrillerSetupBus, SetThreadName, AZStd::this_thread::get_id(), name);
-
-    WriteLock lock(g_lockThreadDumpList);
-    DWORD id = GetCurrentThreadId();
-    if (g_nDebugThreads == sizeof(g_idDebugThreads) / sizeof(g_idDebugThreads[0]))
-    {
-        return;
-    }
-    for (int i = 0; i < g_nDebugThreads; i++)
-    {
-        if (g_idDebugThreads[i] == id)
-        {
-            return;
-        }
-    }
-    g_nameDebugThreads[g_nDebugThreads] = name;
-    g_idDebugThreads[g_nDebugThreads++] = id;
-    ((CSystem*)gEnv->pSystem)->EnableFloatExceptions(g_cvars.sys_float_exceptions);
-}
-
-void UnmarkThisThreadFromDebugging()
-{
-    WriteLock lock(g_lockThreadDumpList);
-    DWORD id = GetCurrentThreadId();
-    for (int i = g_nDebugThreads - 1; i >= 0; i--)
-    {
-        if (g_idDebugThreads[i] == id)
-        {
-            memmove(g_idDebugThreads + i, g_idDebugThreads + i + 1, (g_nDebugThreads - 1 - i) * sizeof(g_idDebugThreads[0]));
-            memmove(g_nameDebugThreads + i, g_nameDebugThreads + i + 1, (g_nDebugThreads - 1 - i) * sizeof(g_nameDebugThreads[0]));
-            --g_nDebugThreads;
-        }
-    }
-}
-
-extern int prev_sys_float_exceptions;
-void UpdateFPExceptionsMaskForThreads()
-{
-    int mask = -iszero(g_cvars.sys_float_exceptions);
-    CONTEXT ctx;
-    for (int i = 0; i < g_nDebugThreads; i++)
-    {
-        if (g_idDebugThreads[i] != GetCurrentThreadId())
-        {
-            HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, TRUE, g_idDebugThreads[i]);
-            ctx.ContextFlags = CONTEXT_ALL;
-            SuspendThread(hThread);
-            GetThreadContext(hThread, &ctx);
-#ifndef WIN64
-            (ctx.FloatSave.ControlWord |= 7) &= ~5 | mask;
-            (*(WORD*)(ctx.ExtendedRegisters + 24) |= 0x280) &= ~0x280 | mask;
-#else
-            (ctx.FltSave.ControlWord |= 7) &= ~5 | mask;
-            (ctx.FltSave.MxCsr |= 0x280) &= ~0x280  | mask;
-#endif
-            SetThreadContext(hThread, &ctx);
-            ResumeThread(hThread);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int DebugCallStack::handleException(EXCEPTION_POINTERS* exception_pointer)
-{
-    if (gEnv == NULL)
-    {
-        return EXCEPTION_EXECUTE_HANDLER;
-    }
-
-    ResetFPU(exception_pointer);
-
-    prev_sys_float_exceptions = 0;
-    const int cached_sys_float_exceptions = g_cvars.sys_float_exceptions;
-
-    ((CSystem*)gEnv->pSystem)->EnableFloatExceptions(0);
-
-    if (g_cvars.sys_WER)
-    {
-        gEnv->pLog->FlushAndClose();
-        return CryEngineExceptionFilterWER(exception_pointer);
-    }
-
-    if (g_cvars.sys_no_crash_dialog)
-    {
-        DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX);
-        SetErrorMode(dwMode | SEM_NOGPFAULTERRORBOX);
-    }
-
-    m_bCrash = true;
-
-    if (g_cvars.sys_no_crash_dialog)
-    {
-        DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX);
-        SetErrorMode(dwMode | SEM_NOGPFAULTERRORBOX);
-    }
-
-    static bool firstTime = true;
-
-    if (g_cvars.sys_dump_aux_threads)
-    {
-        for (int i = 0; i < g_nDebugThreads; i++)
-        {
-            if (g_idDebugThreads[i] != GetCurrentThreadId())
-            {
-                SuspendThread(OpenThread(THREAD_ALL_ACCESS, TRUE, g_idDebugThreads[i]));
-            }
-        }
-    }
-
-    // uninstall our exception handler.
-    SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER)prevExceptionHandler);
-
-    if (!firstTime)
-    {
-        WriteLineToLog("Critical Exception! Called Multiple Times!");
-        gEnv->pLog->FlushAndClose();
-        // Exception called more then once.
-        return EXCEPTION_EXECUTE_HANDLER;
-    }
-
-    // Print exception info:
-    {
-        char excCode[80];
-        char excAddr[80];
-        WriteLineToLog("<CRITICAL EXCEPTION>");
-        sprintf_s(excAddr, "0x%04X:0x%p", exception_pointer->ContextRecord->SegCs, exception_pointer->ExceptionRecord->ExceptionAddress);
-        sprintf_s(excCode, "0x%08X", exception_pointer->ExceptionRecord->ExceptionCode);
-        WriteLineToLog("Exception: %s, at Address: %s", excCode, excAddr);
-    }
-
-    firstTime = false;
-
-    const int ret = SubmitBug(exception_pointer);
-
-    if (ret != IDB_IGNORE)
-    {
-        CryEngineExceptionFilterWER(exception_pointer);
-    }
-
-    gEnv->pLog->FlushAndClose();
-
-    if (exception_pointer->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
-    {
-        // This is non continuable exception. abort application now.
-        exit(exception_pointer->ExceptionRecord->ExceptionCode);
-    }
-
-    //typedef long (__stdcall *ExceptionFunc)(EXCEPTION_POINTERS*);
-    //ExceptionFunc prevFunc = (ExceptionFunc)prevExceptionHandler;
-    //return prevFunc( (EXCEPTION_POINTERS*)exception_pointer );
-    if (ret == IDB_EXIT)
-    {
-        // Immediate exit.
-        // on windows, exit() and _exit() do all sorts of things, unfortuantely
-        // TerminateProcess is the only way to die.
-        TerminateProcess(GetCurrentProcess(), exception_pointer->ExceptionRecord->ExceptionCode);  // we crashed, so don't return a zero exit code!
-        // on linux based systems, _exit will not call ATEXIT and other things, which makes it more suitable for termination in an emergency such
-        // as an unhandled exception.
-        // however, this function is a windows exception handler.
-    }
-    else if (ret == IDB_IGNORE)
-    {
-#ifndef WIN64
-        exception_pointer->ContextRecord->FloatSave.StatusWord &= ~31;
-        exception_pointer->ContextRecord->FloatSave.ControlWord |= 7;
-        (*(WORD*)(exception_pointer->ContextRecord->ExtendedRegisters + 24) &= 31) |= 0x1F80;
-#else
-        exception_pointer->ContextRecord->FltSave.StatusWord &= ~31;
-        exception_pointer->ContextRecord->FltSave.ControlWord |= 7;
-        (exception_pointer->ContextRecord->FltSave.MxCsr &= 31) |= 0x1F80;
-#endif
-        firstTime = true;
-        prevExceptionHandler = (void*)SetUnhandledExceptionFilter(CryUnhandledExceptionHandler);
-        g_cvars.sys_float_exceptions = cached_sys_float_exceptions;
-        ((CSystem*)gEnv->pSystem)->EnableFloatExceptions(g_cvars.sys_float_exceptions);
-        return EXCEPTION_CONTINUE_EXECUTION;
-    }
-
-    // Continue;
-    return EXCEPTION_EXECUTE_HANDLER;
-}
-
-void DebugCallStack::ReportBug(const char* szErrorMessage)
-{
-    WriteLineToLog("Reporting bug: %s", szErrorMessage);
-
-    m_szBugMessage = szErrorMessage;
-    m_context = CaptureCurrentContext();
-    SubmitBug(NULL);
-    m_szBugMessage = NULL;
-}
-
-void DebugCallStack::dumpCallStack(std::vector<string>& funcs)
-{
-    WriteLineToLog("=============================================================================");
-    int len = (int)funcs.size();
-    for (int i = 0; i < len; i++)
-    {
-        const char* str = funcs[i].c_str();
-        WriteLineToLog("%2d) %s", len - i, str);
-    }
-    WriteLineToLog("=============================================================================");
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void DebugCallStack::LogExceptionInfo(EXCEPTION_POINTERS* pex)
-{
-    string path("");
-    if ((gEnv) && (gEnv->pFileIO))
-    {
-        const char* logAlias = gEnv->pFileIO->GetAlias("@log@");
-        if (!logAlias)
-        {
-            logAlias = gEnv->pFileIO->GetAlias("@root@");
-        }
-        if (logAlias)
-        {
-            path = logAlias;
-            path += "/";
-        }
-    }
-
-    string fileName = path;
-    fileName += "error.log";
-
-    struct stat fileInfo;
-    string timeStamp;
-    string backupPath;
-    if (gEnv->IsDedicated())
-    {
-        backupPath = PathUtil::ToUnixPath(PathUtil::AddSlash(path + "DumpBackups"));
-        gEnv->pFileIO->CreatePath(backupPath.c_str());
-
-        if (stat(fileName.c_str(), &fileInfo) == 0)
-        {
-            // Backup log
-            tm creationTime;
-            localtime_s(&creationTime, &fileInfo.st_mtime);
-            char tempBuffer[32];
-            strftime(tempBuffer, sizeof(tempBuffer), "%d %b %Y (%H %M %S)", &creationTime);
-            timeStamp = tempBuffer;
-
-            string backupFileName = backupPath + timeStamp + " error.log";
-            CopyFile(fileName.c_str(), backupFileName.c_str(), true);
-        }
-    }
-
-    FILE* f = nullptr;
-    azfopen(&f, fileName.c_str(), "wt");
-
-    static char errorString[s_iCallStackSize];
-    errorString[0] = 0;
-
-    // Time and Version.
-    char versionbuf[1024];
-    azstrcpy(versionbuf, AZ_ARRAY_SIZE(versionbuf), "");
-    PutVersion(versionbuf, AZ_ARRAY_SIZE(versionbuf));
-    cry_strcat(errorString, versionbuf);
-    cry_strcat(errorString, "\n");
-
-    char excCode[MAX_WARNING_LENGTH];
-    char excAddr[80];
-    char desc[1024];
-    char excDesc[MAX_WARNING_LENGTH];
-
-    // make sure the mouse cursor is visible
-    ShowCursor(TRUE);
-
-    const char* excName;
-    if (m_bIsFatalError || !pex)
-    {
-        const char* const szMessage = m_bIsFatalError ? s_szFatalErrorCode : m_szBugMessage;
-        excName = szMessage;
-        cry_strcpy(excCode, szMessage);
-        cry_strcpy(excAddr, "");
-        cry_strcpy(desc, "");
-        cry_strcpy(m_excModule, "");
-        cry_strcpy(excDesc, szMessage);
-    }
-    else
-    {
-        sprintf_s(excAddr, "0x%04X:0x%p", pex->ContextRecord->SegCs, pex->ExceptionRecord->ExceptionAddress);
-        sprintf_s(excCode, "0x%08X", pex->ExceptionRecord->ExceptionCode);
-        excName = TranslateExceptionCode(pex->ExceptionRecord->ExceptionCode);
-        cry_strcpy(desc, "");
-        sprintf_s(excDesc, "%s\r\n%s", excName, desc);
-
-
-        if (pex->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
-        {
-            if (pex->ExceptionRecord->NumberParameters > 1)
-            {
-                ULONG_PTR iswrite = pex->ExceptionRecord->ExceptionInformation[0];
-                DWORD64 accessAddr = pex->ExceptionRecord->ExceptionInformation[1];
-                if (iswrite)
-                {
-                    sprintf_s(desc, "Attempt to write data to address 0x%08llu\r\nThe memory could not be \"written\"", accessAddr);
-                }
-                else
-                {
-                    sprintf_s(desc, "Attempt to read from address 0x%08llu\r\nThe memory could not be \"read\"", accessAddr);
-                }
-            }
-        }
-    }
-
-
-    WriteLineToLog("Exception Code: %s", excCode);
-    WriteLineToLog("Exception Addr: %s", excAddr);
-    WriteLineToLog("Exception Module: %s", m_excModule);
-    WriteLineToLog("Exception Name  : %s", excName);
-    WriteLineToLog("Exception Description: %s", desc);
-
-
-    cry_strcpy(m_excDesc, excDesc);
-    cry_strcpy(m_excAddr, excAddr);
-    cry_strcpy(m_excCode, excCode);
-
-
-    char errs[32768];
-    sprintf_s(errs, "Exception Code: %s\nException Addr: %s\nException Module: %s\nException Description: %s, %s\n",
-        excCode, excAddr, m_excModule, excName, desc);
-
-
-    cry_strcat(errs, "\nCall Stack Trace:\n");
-
-    std::vector<string> funcs;
-    {
-        AZ::Debug::StackFrame frames[25];
-        AZ::Debug::SymbolStorage::StackLine lines[AZ_ARRAY_SIZE(frames)];
-        unsigned int numFrames = AZ::Debug::StackRecorder::Record(frames, AZ_ARRAY_SIZE(frames), 3);
-        if (numFrames)
-        {
-            AZ::Debug::SymbolStorage::DecodeFrames(frames, numFrames, lines);
-            for (unsigned int i = 0; i < numFrames; i++)
-            {
-                funcs.push_back(lines[i]);
-            }
-        }
-        dumpCallStack(funcs);
-        // Fill call stack.
-        char str[s_iCallStackSize];
-        cry_strcpy(str, "");
-        for (unsigned int i = 0; i < funcs.size(); i++)
-        {
-            char temp[s_iCallStackSize];
-            sprintf_s(temp, "%2zd) %s", funcs.size() - i, (const char*)funcs[i].c_str());
-            cry_strcat(str, temp);
-            cry_strcat(str, "\r\n");
-            cry_strcat(errs, temp);
-            cry_strcat(errs, "\n");
-        }
-        cry_strcpy(m_excCallstack, str);
-    }
-
-    cry_strcat(errorString, errs);
-
-    if (f)
-    {
-        fwrite(errorString, strlen(errorString), 1, f);
-        {
-            if (g_cvars.sys_dump_aux_threads)
-            {
-                for (int i = 0; i < g_nDebugThreads; i++)
-                {
-                    if (g_idDebugThreads[i] != GetCurrentThreadId())
-                    {
-                        fprintf(f, "\n\nSuspended thread (%s):\n", g_nameDebugThreads[i]);
-                        HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, TRUE, g_idDebugThreads[i]);
-
-                        // mirrors the AZ::Debug::Trace::PrintCallstack() functionality, but prints to a file
-                        {
-                            AZ::Debug::StackFrame frames[10];
-
-                            // Without StackFrame explicit alignment frames array is aligned to 4 bytes
-                            // which causes the stack tracing to fail.
-                            AZ::Debug::SymbolStorage::StackLine lines[AZ_ARRAY_SIZE(frames)];
-
-                            unsigned int numFrames = AZ::Debug::StackRecorder::Record(frames, AZ_ARRAY_SIZE(frames), 0, hThread);
-                            if (numFrames)
-                            {
-                                AZ::Debug::SymbolStorage::DecodeFrames(frames, numFrames, lines);
-                                for (unsigned int i2 = 0; i2 < numFrames; ++i2)
-                                {
-                                    fprintf(f, "%2d) %s\n", numFrames - i2, lines[i2]);
-                                }
-                            }
-                        }
-
-                        ResumeThread(hThread);
-                    }
-                }
-            }
-        }
-        fflush(f);
-        fclose(f);
-    }
-
-    if (pex)
-    {
-        MINIDUMP_TYPE mdumpValue = MiniDumpNormal;
-        bool bDump = true;
-        switch (g_cvars.sys_dump_type)
-        {
-        case 0:
-            bDump = false;
-            break;
-        case 1:
-            mdumpValue = MiniDumpNormal;
-            break;
-        case 2:
-            mdumpValue = (MINIDUMP_TYPE)(MiniDumpWithIndirectlyReferencedMemory | MiniDumpWithDataSegs);
-            break;
-        case 3:
-            mdumpValue = MiniDumpWithFullMemory;
-            break;
-        default:
-            mdumpValue = (MINIDUMP_TYPE)g_cvars.sys_dump_type;
-            break;
-        }
-        if (bDump)
-        {
-            fileName = path + "error.dmp";
-
-            if (gEnv->IsDedicated() && stat(fileName.c_str(), &fileInfo) == 0)
-            {
-                // Backup dump (use timestamp from error.log if available)
-                if (timeStamp.empty())
-                {
-                    tm creationTime;
-                    localtime_s(&creationTime, &fileInfo.st_mtime);
-                    char tempBuffer[32];
-                    strftime(tempBuffer, sizeof(tempBuffer), "%d %b %Y (%H %M %S)", &creationTime);
-                    timeStamp = tempBuffer;
-                }
-
-                string backupFileName = backupPath + timeStamp + " error.dmp";
-                CopyFile(fileName.c_str(), backupFileName.c_str(), true);
-            }
-
-            CryEngineExceptionFilterMiniDump(pex, fileName.c_str(), mdumpValue);
-        }
-    }
-
-    //if no crash dialog don't even submit the bug
-    if (m_postBackupProcess && g_cvars.sys_no_crash_dialog == 0 && g_bUserDialog)
-    {
-        m_postBackupProcess();
-    }
-    else
-    {
-        // lawsonn: Disabling the JIRA-based crash reporter for now
-        // we'll need to deal with it our own way, pending QA.
-        // if you're customizing the engine this is also your opportunity to deal with it.
-        if (g_cvars.sys_no_crash_dialog != 0 || !g_bUserDialog)
-        {
-            // ------------ place custom crash handler here ---------------------
-            // it should launch an executable!
-            /// by  this time, error.bmp will be in the engine root folder
-            // error.log and error.dmp will also be present in the engine root folder
-            // if your error dumper wants those, it should zip them up and send them or offer to do so.
-            // ------------------------------------------------------------------
-        }
-    }
-    const bool bQuitting = !gEnv || !gEnv->pSystem || gEnv->pSystem->IsQuitting();
-
-    //[AlexMcC|16.04.10] When the engine is shutting down, MessageBox doesn't display a box
-    // and immediately returns IDYES. Avoid this by just not trying to save if we're quitting.
-    // Don't ask to save if this isn't a real crash (a real crash has exception pointers)
-    if (g_cvars.sys_no_crash_dialog == 0 && g_bUserDialog && gEnv->IsEditor() && !bQuitting && pex)
-    {
-        BackupCurrentLevel();
-
-        const INT_PTR res = DialogBoxParam(gDLLHandle, MAKEINTRESOURCE(IDD_CONFIRM_SAVE_LEVEL), NULL, DebugCallStack::ConfirmSaveDialogProc, NULL);
-        if (res == IDB_CONFIRM_SAVE)
-        {
-            if (SaveCurrentLevel())
-            {
-                MessageBox(NULL, "Level has been successfully saved!\r\nPress Ok to terminate Editor.", "Save", MB_OK);
-            }
-            else
-            {
-                MessageBox(NULL, "Error saving level.\r\nPress Ok to terminate Editor.", "Save", MB_OK | MB_ICONWARNING);
-            }
-        }
-    }
-
-    if (g_cvars.sys_no_crash_dialog != 0 || !g_bUserDialog)
-    {
-        // terminate immediately - since we're in a crash, there is no point unwinding stack, we've already done access violation or worse.
-        // calling exit will only cause further death down the line...
-        TerminateProcess(GetCurrentProcess(), pex->ExceptionRecord->ExceptionCode);
-    }
-}
-
-
-INT_PTR CALLBACK DebugCallStack::ExceptionDialogProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    static EXCEPTION_POINTERS* pex;
-
-    static char errorString[32768] = "";
-
-    switch (message)
-    {
-    case WM_INITDIALOG:
-    {
-        pex = (EXCEPTION_POINTERS*)lParam;
-        HWND h;
-
-        if (pex->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
-        {
-            // Disable continue button for non continuable exceptions.
-            //h = GetDlgItem( hwndDlg,IDB_CONTINUE );
-            //if (h) EnableWindow( h,FALSE );
-        }
-
-        DebugCallStack* pDCS = static_cast<DebugCallStack*>(DebugCallStack::instance());
-
-        h = GetDlgItem(hwndDlg, IDC_EXCEPTION_DESC);
-        if (h)
-        {
-            SendMessage(h, EM_REPLACESEL, FALSE, (LONG_PTR)pDCS->m_excDesc);
-        }
-
-        h = GetDlgItem(hwndDlg, IDC_EXCEPTION_CODE);
-        if (h)
-        {
-            SendMessage(h, EM_REPLACESEL, FALSE, (LONG_PTR)pDCS->m_excCode);
-        }
-
-        h = GetDlgItem(hwndDlg, IDC_EXCEPTION_MODULE);
-        if (h)
-        {
-            SendMessage(h, EM_REPLACESEL, FALSE, (LONG_PTR)pDCS->m_excModule);
-        }
-
-        h = GetDlgItem(hwndDlg, IDC_EXCEPTION_ADDRESS);
-        if (h)
-        {
-            SendMessage(h, EM_REPLACESEL, FALSE, (LONG_PTR)pDCS->m_excAddr);
-        }
-
-        // Fill call stack.
-        HWND callStack = GetDlgItem(hwndDlg, IDC_CALLSTACK);
-        if (callStack)
-        {
-            SendMessage(callStack, WM_SETTEXT, FALSE, (LPARAM)pDCS->m_excCallstack);
-        }
-
-        if (hwndException)
-        {
-            DestroyWindow(hwndException);
-            hwndException = 0;
-        }
-
-        if (IsFloatingPointException(pex))
-        {
-            EnableWindow(GetDlgItem(hwndDlg, IDB_IGNORE), TRUE);
-        }
-    }
-    break;
-
-    case WM_COMMAND:
-        switch (LOWORD(wParam))
-        {
-        case IDB_EXIT:
-        case IDB_IGNORE:
-            // Fall through.
-
-            EndDialog(hwndDlg, wParam);
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-INT_PTR CALLBACK DebugCallStack::ConfirmSaveDialogProc(HWND hwndDlg, UINT message, WPARAM wParam, [[maybe_unused]] LPARAM lParam)
-{
-    switch (message)
-    {
-    case WM_INITDIALOG:
-    {
-        // The user might be holding down the spacebar while the engine crashes.
-        // If we don't remove keyboard focus from this dialog, the keypress will
-        // press the default button before the dialog actually appears, even if
-        // the user has already released the key, which is bad.
-        SetFocus(NULL);
-    } break;
-    case WM_COMMAND:
-    {
-        switch (LOWORD(wParam))
-        {
-        case IDB_CONFIRM_SAVE:         // Fall through
-        case IDB_DONT_SAVE:
-        {
-            EndDialog(hwndDlg, wParam);
-            return TRUE;
-        }
-        }
-    } break;
-    }
-
-    return FALSE;
-}
-
-bool DebugCallStack::BackupCurrentLevel()
-{
-    CSystem* pSystem = static_cast<CSystem*>(m_pSystem);
-    if (pSystem && pSystem->GetUserCallback())
-    {
-        return pSystem->GetUserCallback()->OnBackupDocument();
-    }
-
-    return false;
-}
-
-bool DebugCallStack::SaveCurrentLevel()
-{
-    CSystem* pSystem = static_cast<CSystem*>(m_pSystem);
-    if (pSystem && pSystem->GetUserCallback())
-    {
-        return pSystem->GetUserCallback()->OnSaveDocument();
-    }
-
-    return false;
-}
-
-int DebugCallStack::SubmitBug(EXCEPTION_POINTERS* exception_pointer)
-{
-    int ret = IDB_EXIT;
-
-    assert(!hwndException);
-
-    RemoveOldFiles();
-
-    AZ::Debug::Trace::PrintCallstack("", 2);
-
-    LogExceptionInfo(exception_pointer);
-
-    if (IsFloatingPointException(exception_pointer))
-    {
-        //! Print exception dialog.
-        ret = PrintException(exception_pointer);
-    }
-
-    return ret;
-}
-
-void DebugCallStack::ResetFPU(EXCEPTION_POINTERS* pex)
-{
-    if (IsFloatingPointException(pex))
-    {
-        // How to reset FPU: http://www.experts-exchange.com/Programming/System/Windows__Programming/Q_10310953.html
-        _clearfp();
-#ifndef WIN64
-        pex->ContextRecord->FloatSave.ControlWord |= 0x2F;
-        pex->ContextRecord->FloatSave.StatusWord &= ~0x8080;
-#endif
-    }
-}
-
-string DebugCallStack::GetModuleNameForAddr(void* addr)
-{
-    if (m_modules.empty())
-    {
-        return "[unknown]";
-    }
-
-    if (addr < m_modules.begin()->first)
-    {
-        return "[unknown]";
-    }
-
-    TModules::const_iterator it = m_modules.begin();
-    TModules::const_iterator end = m_modules.end();
-    for (; ++it != end; )
-    {
-        if (addr < it->first)
-        {
-            return (--it)->second;
-        }
-    }
-
-    //if address is higher than the last module, we simply assume it is in the last module.
-    return m_modules.rbegin()->second;
-}
-
-void DebugCallStack::GetProcNameForAddr(void* addr, string& procName, void*& baseAddr, string& filename, int& line)
-{
-    AZ::Debug::SymbolStorage::StackLine func, file, module;
-    AZ::Debug::SymbolStorage::FindFunctionFromIP(addr, &func, &file, &module, line, baseAddr);
-    procName = func;
-    filename = file;
-}
-
-string DebugCallStack::GetCurrentFilename()
-{
-    char fullpath[MAX_PATH_LENGTH + 1];
-    GetModuleFileName(NULL, fullpath, MAX_PATH_LENGTH);
-    return fullpath;
-}
-
-static bool IsFloatingPointException(EXCEPTION_POINTERS* pex)
-{
-    if (!pex)
-    {
-        return false;
-    }
-
-    DWORD exceptionCode = pex->ExceptionRecord->ExceptionCode;
-    switch (exceptionCode)
-    {
-    case EXCEPTION_FLT_DENORMAL_OPERAND:
-    case EXCEPTION_FLT_DIVIDE_BY_ZERO:
-    case EXCEPTION_FLT_INEXACT_RESULT:
-    case EXCEPTION_FLT_INVALID_OPERATION:
-    case EXCEPTION_FLT_OVERFLOW:
-    case EXCEPTION_FLT_UNDERFLOW:
-    case STATUS_FLOAT_MULTIPLE_FAULTS:
-    case STATUS_FLOAT_MULTIPLE_TRAPS:
-        return true;
-
-    default:
-        return false;
-    }
-}
-
-int DebugCallStack::PrintException(EXCEPTION_POINTERS* exception_pointer)
-{
-    return (int)DialogBoxParam(gDLLHandle, MAKEINTRESOURCE(IDD_CRITICAL_ERROR), NULL, DebugCallStack::ExceptionDialogProc, (LPARAM)exception_pointer);
-}
-
-#else
-void MarkThisThreadForDebugging(const char*) {}
-void UnmarkThisThreadFromDebugging() {}
-void UpdateFPExceptionsMaskForThreads() {}
-#endif //WIN32
diff --git a/Code/CryEngine/CrySystem/DebugCallStack.h b/Code/CryEngine/CrySystem/DebugCallStack.h
deleted file mode 100644
index 0c00540409..0000000000
--- a/Code/CryEngine/CrySystem/DebugCallStack.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_DEBUGCALLSTACK_H
-#define CRYINCLUDE_CRYSYSTEM_DEBUGCALLSTACK_H
-#pragma once
-
-
-#include "IDebugCallStack.h"
-
-#if defined (WIN32) || defined (WIN64)
-
-//! Limits the maximal number of functions in call stack.
-const int MAX_DEBUG_STACK_ENTRIES_FILE_DUMP = 12;
-
-struct ISystem;
-
-//!============================================================================
-//!
-//! DebugCallStack class, capture call stack information from symbol files.
-//!
-//!============================================================================
-class DebugCallStack
-    : public IDebugCallStack
-{
-public:
-    DebugCallStack();
-    virtual ~DebugCallStack();
-
-    ISystem* GetSystem() { return m_pSystem; };
-
-    virtual string GetModuleNameForAddr(void* addr);
-    virtual void GetProcNameForAddr(void* addr, string& procName, void*& baseAddr, string& filename, int& line);
-    virtual string GetCurrentFilename();
-
-    void installErrorHandler(ISystem* pSystem);
-    virtual int handleException(EXCEPTION_POINTERS* exception_pointer);
-
-    virtual void ReportBug(const char*);
-
-    void dumpCallStack(std::vector<string>& functions);
-
-    void SetUserDialogEnable(const bool bUserDialogEnable);
-
-    typedef std::map<void*, string> TModules;
-protected:
-    static void RemoveOldFiles();
-    static void RemoveFile(const char* szFileName);
-
-    static int PrintException(EXCEPTION_POINTERS* exception_pointer);
-    static INT_PTR CALLBACK ExceptionDialogProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam);
-    static INT_PTR CALLBACK ConfirmSaveDialogProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam);
-
-    void LogExceptionInfo(EXCEPTION_POINTERS* exception_pointer);
-    bool BackupCurrentLevel();
-    bool SaveCurrentLevel();
-    int SubmitBug(EXCEPTION_POINTERS* exception_pointer);
-    void ResetFPU(EXCEPTION_POINTERS* pex);
-
-    static const int s_iCallStackSize = 32768;
-
-    char m_excLine[256];
-    char m_excModule[128];
-
-    char m_excDesc[MAX_WARNING_LENGTH];
-    char m_excCode[MAX_WARNING_LENGTH];
-    char m_excAddr[80];
-    char m_excCallstack[s_iCallStackSize];
-
-    void* prevExceptionHandler;
-
-    bool m_bCrash;
-    const char* m_szBugMessage;
-
-    ISystem* m_pSystem;
-
-    int m_nSkipNumFunctions;
-    CONTEXT  m_context;
-
-    TModules m_modules;
-};
-
-#endif //WIN32
-
-#endif // CRYINCLUDE_CRYSYSTEM_DEBUGCALLSTACK_H
diff --git a/Code/CryEngine/CrySystem/DllMain.cpp b/Code/CryEngine/CrySystem/DllMain.cpp
deleted file mode 100644
index 1bc580c3f1..0000000000
--- a/Code/CryEngine/CrySystem/DllMain.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "System.h"
-#include <AZCrySystemInitLogSink.h>
-#include "DebugCallStack.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define DLLMAIN_CPP_SECTION_1 1
-#define DLLMAIN_CPP_SECTION_2 2
-#define DLLMAIN_CPP_SECTION_3 3
-#define DLLMAIN_CPP_SECTION_4 4
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION DLLMAIN_CPP_SECTION_1
-#include AZ_RESTRICTED_FILE(DllMain_cpp)
-#endif
-
-// For lua debugger
-//#include <malloc.h>
-
-HMODULE gDLLHandle = NULL;
-
-#if !defined(AZ_MONOLITHIC_BUILD) && defined(AZ_HAS_DLL_SUPPORT) && AZ_TRAIT_LEGACY_CRYSYSTEM_DEFINE_DLLMAIN
-AZ_PUSH_DISABLE_WARNING(4447, "-Wunknown-warning-option")
-BOOL APIENTRY DllMain(HANDLE hModule,
-    DWORD  ul_reason_for_call,
-    [[maybe_unused]] LPVOID lpReserved
-    )
-AZ_POP_DISABLE_WARNING
-{
-    PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
-
-    gDLLHandle = (HMODULE)hModule;
-    switch (ul_reason_for_call)
-    {
-    case DLL_PROCESS_ATTACH:
-        break;
-    case DLL_THREAD_ATTACH:
-
-
-        break;
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    //  int sbh = _set_sbh_threshold(1016);
-
-    return TRUE;
-}
-#endif
-
-extern "C"
-{
-CRYSYSTEM_API ISystem* CreateSystemInterface(const SSystemInitParams& startupParams)
-{
-    CSystem* pSystem = NULL;
-
-    // We must attach to the environment prior to allocating CSystem, as opposed to waiting
-    // for ModuleInitISystem(), because the log message sink uses buses.
-    // Environment should have been attached via InjectEnvironment
-    AZ_Assert(AZ::Environment::IsReady(), "Environment is not attached, must be attached before CreateSystemInterface can be called");
-
-    pSystem = new CSystem(startupParams.pSharedEnvironment);
-    ModuleInitISystem(pSystem, "CrySystem");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION DLLMAIN_CPP_SECTION_2
-#include AZ_RESTRICTED_FILE(DllMain_cpp)
-#endif
-
-       // the earliest point the system exists - w2e tell the callback
-    if (startupParams.pUserCallback)
-    {
-        startupParams.pUserCallback->OnSystemConnect(pSystem);
-    }
-
-#if defined(WIN32)
-    // Environment Variable to signal we don't want to override our exception handler - our crash report system will set this
-    auto envVar = AZ::Environment::FindVariable<bool>("ExceptionHandlerIsSet");
-    const bool handlerIsSet = (envVar && *envVar);
-    if (!handlerIsSet)
-    {
-        ((DebugCallStack*)IDebugCallStack::instance())->installErrorHandler(pSystem);
-    }
-#endif
-
-    bool retVal = false;
-    {
-        AZ::Debug::StartupLogSinkReporter<AZ::Debug::CrySystemInitLogSink> initLogSink;
-        retVal = pSystem->Init(startupParams);
-        if (!retVal)
-        {
-            initLogSink.GetContainedLogSink().SetFatalMessageBox();
-        }
-    }
-    if (!retVal)
-    {
-        delete pSystem;
-        gEnv = nullptr;
-
-        return 0;
-    }
-
-    return pSystem;
-}
-};
-
diff --git a/Code/CryEngine/CrySystem/Huffman.cpp b/Code/CryEngine/CrySystem/Huffman.cpp
deleted file mode 100644
index 96e68a9954..0000000000
--- a/Code/CryEngine/CrySystem/Huffman.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "Huffman.h"
-
-
-void HuffmanCoder::BitStreamBuilder::AddBits(uint32 value, uint32 numBits)
-{
-    if (numBits > 24)
-    {
-        AddBits(static_cast<uint8>((value >> 24) & 0x000000ff), numBits - 24);
-        numBits = 24;
-    }
-    if (numBits > 16)
-    {
-        AddBits(static_cast<uint8>((value >> 16) & 0x000000ff), numBits - 16);
-        numBits = 16;
-    }
-    if (numBits > 8)
-    {
-        AddBits(static_cast<uint8>((value >> 8) & 0x000000ff), numBits - 8);
-        numBits = 8;
-    }
-    AddBits(static_cast<uint8>(value & 0x000000ff), numBits);
-}
-
-void HuffmanCoder::BitStreamBuilder::AddBits(uint8 value, uint32 numBits)
-{
-    if (m_mode != eM_WRITE)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Trying to write to a read only BitStreamBuilder");
-        return;
-    }
-    uint8 mask;
-    mask = (uint8)(1 << (numBits - 1));
-    while (mask != 0)
-    {
-        //CryLogAlways("mask is %u", mask);
-        if (mask & value)
-        {
-            //CryLogAlways("Buffer value was %u", *m_pBufferCursor.ptr);
-            *(m_pBufferCursor.ptr) |= m_mask;
-            //CryLogAlways("Buffer value now %u", *m_pBufferCursor.ptr);
-        }
-        //CryLogAlways("m_mask was %u", m_mask);
-        m_mask = m_mask >> 1;
-        //CryLogAlways("m_mask now %u", m_mask);
-        if (m_mask == 0)
-        {
-            if (m_pBufferCursor.ptr == m_pBufferEnd.ptr)
-            {
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Bit Stream has consumed the last byte of the buffer and is requesting another. This stream will be truncated here.");
-                return;
-            }
-            //CryLogAlways("Buffer cursor was %u (%p)", *m_pBufferCursor.ptr, m_pBufferCursor.ptr);
-            m_pBufferCursor.ptr++;
-            //CryLogAlways("Buffer cursor now %u (%p)", *m_pBufferCursor.ptr, m_pBufferCursor.ptr);
-            m_mask = 0x80;
-        }
-        mask = mask >> 1L;
-    }
-}
-
-//Returns 1 or 0 for valid values. Returns 2 if the buffer has run out or is the wrong type of builder.
-uint8 HuffmanCoder::BitStreamBuilder::GetBit()
-{
-    if (m_mode != eM_READ)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Trying to read from a write only BitStreamBuilder");
-        return 2;
-    }
-    uint8 value = 0;
-
-    if (m_mask == 0)
-    {
-        if (m_pBufferCursor.const_ptr == m_pBufferEnd.const_ptr)
-        {
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Bit Stream has consumed the last byte of the buffer and is requesting another. This stream will be truncated here.");
-            return 2;
-        }
-        //CryLogAlways("Buffer cursor was %u (%p)", *m_pBufferCursor.const_ptr, m_pBufferCursor.const_ptr);
-        m_pBufferCursor.const_ptr++;
-        //CryLogAlways("Buffer cursor now %u (%p)", *m_pBufferCursor.const_ptr, m_pBufferCursor.const_ptr);
-        m_mask = 0x80;
-    }
-    if (m_mask & *(m_pBufferCursor.const_ptr))
-    {
-        value = 1;
-    }
-    //CryLogAlways("m_mask was %u", m_mask);
-    m_mask = m_mask >> 1;
-    //CryLogAlways("m_mask now %u", m_mask);
-
-    return value;
-}
-
-void HuffmanCoder::Init()
-{
-    SAFE_DELETE_ARRAY(m_TreeNodes);
-    SAFE_DELETE_ARRAY(m_Codes);
-    m_Counts = new uint32[MAX_NUM_SYMBOLS];
-    memset(m_Counts, 0, sizeof(uint32) * MAX_NUM_SYMBOLS);
-    m_State = eHCS_OPEN;
-}
-
-//Adds the values of an array of chars to the counts
-void HuffmanCoder::Update(const uint8* const pSource, const size_t numBytes)
-{
-    if (m_State != eHCS_OPEN)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Trying to update a Huffman Coder that has not been initialized, or has been finalized");
-        return;
-    }
-
-    size_t i;
-    for (i = 0; i < numBytes; i++)
-    {
-        const int symbol = pSource[i];
-        m_Counts[symbol]++;
-    }
-}
-
-void HuffmanCoder::Finalize()
-{
-    if (m_State != eHCS_OPEN)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Trying to finalize a Huffman Coder that has not been initialized, or has been finalized");
-        return;
-    }
-
-    //Construct the tree
-    m_TreeNodes = new HuffmanTreeNode[MAX_NUM_NODES];
-    memset(m_TreeNodes, 0, sizeof(HuffmanTreeNode) * MAX_NUM_NODES);
-    m_Codes = new HuffmanSymbolCode[MAX_NUM_CODES];
-    memset(m_Codes, 0, sizeof(HuffmanSymbolCode) * MAX_NUM_CODES);
-
-    ScaleCountsAndUpdateNodes();
-    m_RootNode = BuildTree();
-    ConvertTreeToCode(m_TreeNodes, m_Codes, 0, 0, m_RootNode);
-
-    //Finalize the coder so that it won't accept any more strings
-    m_State = eHCS_FINAL;
-
-    //Counts are no longer needed
-    SAFE_DELETE_ARRAY(m_Counts);
-}
-
-void HuffmanCoder::CompressInput(const uint8* const pInput, const size_t numBytes, uint8* const pOutput, size_t* const outputSize)
-{
-    BitStreamBuilder streamBuilder(pOutput, pOutput + (*outputSize));
-    for (size_t i = 0; i < numBytes; i++)
-    {
-        const int symbol = pInput[i];
-        const uint32 value = m_Codes[symbol].value;
-        const uint32 numBits = m_Codes[symbol].numBits;
-        /*char szBits[33];
-        memset(szBits, '0', 33);
-        for( uint32 j = 0; j < numBits; j++ )
-        {
-            if( (value & (uint32)(1<<j)) != 0 )
-            {
-                szBits[31-j] = '1';
-            }
-            else
-            {
-                szBits[31-j] = '0';
-            }
-        }
-        szBits[32] = 0;
-        CryLogAlways("%c - %s (%u)", value, szBits, numBits);*/
-        streamBuilder.AddBits(value, numBits);
-    }
-    streamBuilder.AddBits(m_Codes[END_OF_STREAM].value, m_Codes[END_OF_STREAM].numBits);
-    *outputSize = (streamBuilder.m_pBufferCursor.ptr - streamBuilder.m_pBufferStart.ptr) + 1;
-}
-
-size_t HuffmanCoder::UncompressInput(const uint8* const pInput, const size_t numBytes, uint8* const pOutput, const size_t maxOutputSize)
-{
-    size_t numOutputBytes = 0;
-    BitStreamBuilder streamBuilder(pInput, pInput + numBytes);
-
-    while (1)
-    {
-        int code;
-        int node = m_RootNode;
-        do
-        {
-            uint8 bitValue = streamBuilder.GetBit();
-#if 0
-            CryLogAlways("bit=%ld\n", bitValue);
-#endif
-
-            if (bitValue == 0)
-            {
-                node = m_TreeNodes[node].child0;
-            }
-            else
-            {
-                node = m_TreeNodes[node].child1;
-            }
-        } while (node > END_OF_STREAM);
-
-        if (node == END_OF_STREAM)
-        {
-            pOutput[numOutputBytes] = '\0';
-            break;
-        }
-        code = node;
-#if 0
-        {
-            CryLogAlways("%c", code);
-            if (code == '\0')
-            {
-                CryLogAlways("EOM");
-            }
-        }
-#endif
-        pOutput[numOutputBytes] = (char)code;
-        numOutputBytes++;
-        if (numOutputBytes >= maxOutputSize)
-        {
-            pOutput[maxOutputSize - 1] = '\0';
-            break;
-        }
-    }
-
-    return numOutputBytes;
-}
-
-//Private functions
-
-void HuffmanCoder::ScaleCountsAndUpdateNodes()
-{
-    unsigned long maxCount = 0;
-    int i;
-
-    for (i = 0; i < MAX_NUM_SYMBOLS; i++)
-    {
-        const unsigned long count = m_Counts[i];
-        if (count > maxCount)
-        {
-            maxCount = count;
-        }
-    }
-    if (maxCount == 0)
-    {
-        m_Counts[0] = 1;
-        maxCount = 1;
-    }
-    maxCount = maxCount / MAX_NUM_SYMBOLS;
-    maxCount = maxCount + 1;
-    for (i = 0; i < MAX_NUM_SYMBOLS; i++)
-    {
-        const unsigned long count = m_Counts[i];
-        unsigned int scaledCount = (unsigned int)(count / maxCount);
-        if ((scaledCount == 0) && (count != 0))
-        {
-            scaledCount = 1;
-        }
-        m_TreeNodes[i].count = scaledCount;
-        m_TreeNodes[i].child0 = END_OF_STREAM;
-        m_TreeNodes[i].child1 = END_OF_STREAM;
-    }
-    m_TreeNodes[END_OF_STREAM].count = 1;
-    m_TreeNodes[END_OF_STREAM].child0 = END_OF_STREAM;
-    m_TreeNodes[END_OF_STREAM].child1 = END_OF_STREAM;
-}
-
-//Jake's file IO code. Kept in case we make the compression and table generation an offline task
-/* Format is: startSymbol, stopSymbol, count0, count1, count2, ... countN, ..., 0 */
-/* When finding the start, stop symbols only break out if find more than 3 0's in the counts */
-/*static void outputCounts(FILE* const pFile, const HuffmanTreeNode* const pNodes)
-{
-    int first = 0;
-    int last;
-    int next;
-
-    while ((first < MAX_NUM_SYMBOLS) && (pNodes[first].count == 0))
-    {
-        first++;
-    }
-    last = first;
-    next = first;
-    for (; first < MAX_NUM_SYMBOLS; first = next)
-    {
-        int i;
-        last = first+1;
-        while (1)
-        {
-            for (; last < MAX_NUM_SYMBOLS; last++)
-            {
-                if (pNodes[last].count == 0)
-                {
-                    break;
-                }
-            }
-            last--;
-            for (next = last+1; next < MAX_NUM_SYMBOLS; next++)
-            {
-                if (pNodes[next].count != 0)
-                {
-                    break;
-                }
-            }
-            if (next == MAX_NUM_SYMBOLS)
-            {
-                break;
-            }
-            if ((next-last) > 3)
-            {
-                break;
-            }
-            last = next;
-        }
-        putc(first, pFile);
-        putc(last, pFile);
-        for (i = first; i <= last; i++)
-        {
-            const unsigned int count = pNodes[i].count;
-            putc((int)count, pFile);
-        }
-    }
-    putc(0xFF, pFile);
-    putc(0xFF, pFile);
-    putc((int)(pNodes[0xFF].count), pFile);
-}*/
-
-/*static void inputCounts(FILE* const pFile, HuffmanTreeNode* const pNodes)
-{
-    while (1)
-    {
-        int i;
-        const int first = getc(pFile);
-        const int last = getc(pFile);
-        for (i = first; i <= last; i++)
-        {
-            const int count = getc(pFile);
-            pNodes[i].count = (size_t)count;
-            pNodes[i].child0 = END_OF_STREAM;
-            pNodes[i].child1 = END_OF_STREAM;
-        }
-        if ((first == last) && (first == 0xFF))
-        {
-            break;
-        }
-    }
-    pNodes[END_OF_STREAM].count = 1;
-    pNodes[END_OF_STREAM].child0 = END_OF_STREAM;
-    pNodes[END_OF_STREAM].child1 = END_OF_STREAM;
-}*/
-
-int HuffmanCoder::BuildTree()
-{
-    int min1;
-    int min2;
-    int nextFree;
-
-    m_TreeNodes[MAX_NODE].count = 0xFFFFFFF;
-    for (nextFree = END_OF_STREAM + 1;; nextFree++)
-    {
-        int i;
-        min1 = MAX_NODE;
-        min2 = MAX_NODE;
-        for (i = 0; i < nextFree; i++)
-        {
-            const unsigned int count = m_TreeNodes[i].count;
-            if (count != 0)
-            {
-                if (count < m_TreeNodes[min1].count)
-                {
-                    min2 = min1;
-                    min1 = i;
-                }
-                else if (count < m_TreeNodes[min2].count)
-                {
-                    min2 = i;
-                }
-            }
-        }
-        if (min2 == MAX_NODE)
-        {
-            break;
-        }
-        m_TreeNodes[nextFree].count = m_TreeNodes[min1].count + m_TreeNodes[min2].count;
-
-        m_TreeNodes[min1].savedCount = m_TreeNodes[min1].count;
-        m_TreeNodes[min1].count = 0;
-
-        m_TreeNodes[min2].savedCount = m_TreeNodes[min2].count;
-        m_TreeNodes[min2].count = 0;
-
-        m_TreeNodes[nextFree].child0 = min1;
-        m_TreeNodes[nextFree].child1 = min2;
-        m_TreeNodes[nextFree].savedCount = 0;
-    }
-
-    nextFree--;
-    m_TreeNodes[nextFree].savedCount = m_TreeNodes[nextFree].count;
-
-    return nextFree;
-}
-
-void HuffmanCoder::ConvertTreeToCode(const HuffmanTreeNode* const pNodes, HuffmanSymbolCode* const pCodes,
-    const unsigned int value, const unsigned int numBits, const int node)
-{
-    unsigned int nextValue;
-    unsigned int nextNumBits;
-    if (node <= END_OF_STREAM)
-    {
-        pCodes[node].value = value;
-        pCodes[node].numBits = numBits;
-        return;
-    }
-    nextValue = value << 1;
-    nextNumBits = numBits + 1;
-    ConvertTreeToCode(pNodes, pCodes, nextValue, nextNumBits, pNodes[node].child0);
-    nextValue = nextValue | 0x1;
-    ConvertTreeToCode(pNodes, pCodes, nextValue, nextNumBits, pNodes[node].child1);
-}
-
-/*static void printChar(const int c)
-{
-    if (c >= ' ' && c < 127)
-    {
-        printf("'%c'", c);
-    }
-    else
-    {
-        printf("0x%03X", c);
-    }
-}
-
-static void printModel(const HuffmanTreeNode* const pNodes, const HuffmanSymbolCode* const pCodes)
-{
-    int i;
-    for (i = 0; i < MAX_NODE; i++)
-    {
-        const unsigned int count = pNodes[i].savedCount;
-        if (count != 0)
-        {
-            printf("node=");
-            printChar(i);
-            printf(" count=%3d", count);
-            printf(" child0=");
-            printChar(pNodes[i].child0);
-            printf(" child1=");
-            printChar(pNodes[i].child1);
-            if (pCodes && (i <= END_OF_STREAM))
-            {
-                printf(" Huffman code=");
-                binaryFilePrint(stdout, pCodes[i].value, pCodes[i].numBits);
-            }
-            printf("\n");
-        }
-    }
-}*/
diff --git a/Code/CryEngine/CrySystem/Huffman.h b/Code/CryEngine/CrySystem/Huffman.h
deleted file mode 100644
index 5d8876b063..0000000000
--- a/Code/CryEngine/CrySystem/Huffman.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_HUFFMAN_H
-#define CRYINCLUDE_CRYSYSTEM_HUFFMAN_H
-#pragma once
-
-
-class HuffmanCoder
-{
-private:
-    struct HuffmanTreeNode
-    {
-        uint32 count;
-        uint32 savedCount;
-        int child0;
-        int child1;
-    };
-
-    struct HuffmanSymbolCode
-    {
-        uint32 value;
-        uint32 numBits;
-    };
-
-    struct BitStreamBuilder
-    {
-        enum EModes
-        {
-            eM_WRITE,
-            eM_READ
-        };
-        union buf_ptr
-        {
-            uint8* ptr;
-            const uint8* const_ptr;
-        };
-        EModes m_mode;
-        uint8 m_mask;
-        buf_ptr m_pBufferStart;
-        buf_ptr m_pBufferCursor;
-        buf_ptr m_pBufferEnd;       //Pointer to the last byte in the buffer
-
-        BitStreamBuilder(uint8* pBufferStart, uint8* pBufferEnd)
-            : m_mode(eM_WRITE)
-            , m_mask(0x80)
-        {
-            m_pBufferStart.ptr = pBufferStart;
-            m_pBufferCursor.ptr = pBufferStart;
-            m_pBufferEnd.ptr = pBufferEnd;
-        }
-        BitStreamBuilder(const uint8* pBufferStart, const uint8* pBufferEnd)
-            : m_mode(eM_READ)
-            , m_mask(0x80)
-        {
-            m_pBufferStart.const_ptr = pBufferStart;
-            m_pBufferCursor.const_ptr = pBufferStart;
-            m_pBufferEnd.const_ptr = pBufferEnd;
-        }
-
-        void AddBits(uint32 value, uint32 numBits);
-        void AddBits(uint8 value, uint32 numBits);
-        //Returns 1 or 0 for valid values. Returns 2 if the buffer has run out or is the wrong type of builder.
-        uint8 GetBit();
-    };
-
-    const static int MAX_SYMBOL_VALUE = (255);
-    const static int MAX_NUM_SYMBOLS = (MAX_SYMBOL_VALUE + 1);
-    const static int END_OF_STREAM = (MAX_NUM_SYMBOLS);
-    const static int MAX_NUM_CODES = (MAX_NUM_SYMBOLS + 1);
-    const static int MAX_NUM_NODES = (MAX_NUM_CODES * 2);
-    const static int MAX_NODE = (MAX_NUM_NODES - 1);
-
-    enum EHuffmanCoderState
-    {
-        eHCS_NEW,       //Has been created, Init not called
-        eHCS_OPEN,      //Init has been called, tree not yet constructed. Can accept new data.
-        eHCS_FINAL      //Finalize has been called. Can no longer accept data, but can encode/decode.
-    };
-
-    HuffmanTreeNode* m_TreeNodes;
-    HuffmanSymbolCode* m_Codes;
-    uint32* m_Counts;
-    int m_RootNode;
-    uint32 m_RefCount;
-    EHuffmanCoderState m_State;
-
-public:
-    HuffmanCoder()
-        : m_TreeNodes(NULL)
-        , m_Codes(NULL)
-        , m_Counts(NULL)
-        , m_State(eHCS_NEW)
-        , m_RootNode(0)
-        , m_RefCount(0) {}
-    ~HuffmanCoder()
-    {
-        SAFE_DELETE_ARRAY(m_TreeNodes);
-        SAFE_DELETE_ARRAY(m_Codes);
-        SAFE_DELETE_ARRAY(m_Counts);
-    }
-
-    //A bit like an MD5 generator, has three phases.
-    //Clears the existing data
-    void Init();
-    //Adds the values of an array of chars to the counts
-    void Update(const uint8* const pSource, const size_t numBytes);
-    //Construct the coding tree using the counts
-    void Finalize();
-
-    //We typically create a Huffman Coder per localized string table loaded. Since we can and do unload strings at runtime, it's useful to keep a ref count of each coder.
-    inline void AddRef() { m_RefCount++; }
-    inline void DecRef() { m_RefCount = m_RefCount > 0 ? m_RefCount - 1 : 0; }
-    inline uint32 RefCount() { return m_RefCount; }
-
-    void CompressInput(const uint8* const pInput, const size_t numBytes, uint8* const pOutput, size_t* const outputSize);
-    size_t UncompressInput(const uint8* const pInput, const size_t numBytes, uint8* const pOutput, const size_t maxOutputSize);
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-
-        if (m_Counts != NULL)
-        {
-            pSizer->AddObject(m_Counts, sizeof(uint32), MAX_NUM_SYMBOLS);
-        }
-        if (m_TreeNodes != NULL)
-        {
-            pSizer->AddObject(m_TreeNodes, sizeof(HuffmanTreeNode), MAX_NUM_NODES);
-        }
-        if (m_Codes != NULL)
-        {
-            pSizer->AddObject(m_Codes, sizeof(HuffmanSymbolCode), MAX_NUM_CODES);
-        }
-    }
-
-private:
-    void ScaleCountsAndUpdateNodes();
-    int BuildTree();
-    void ConvertTreeToCode(const HuffmanTreeNode* const pNodes, HuffmanSymbolCode* const pCodes, const unsigned int value, const unsigned int numBits, const int node);
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_HUFFMAN_H
diff --git a/Code/CryEngine/CrySystem/IDebugCallStack.cpp b/Code/CryEngine/CrySystem/IDebugCallStack.cpp
deleted file mode 100644
index edc9e21f40..0000000000
--- a/Code/CryEngine/CrySystem/IDebugCallStack.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A multiplatform base class for handling errors and collecting call stacks
-
-
-#include "CrySystem_precompiled.h"
-#include "IDebugCallStack.h"
-#include "System.h"
-#include <AzFramework/IO/FileOperations.h>
-#include <AzCore/NativeUI/NativeUIRequests.h>
-#include <AzCore/StringFunc/StringFunc.h>
-#include <AzCore/Utils/Utils.h>
-//#if !defined(LINUX)
-
-#include <ISystem.h>
-
-const char* const IDebugCallStack::s_szFatalErrorCode = "FATAL_ERROR";
-
-IDebugCallStack::IDebugCallStack()
-    : m_bIsFatalError(false)
-    , m_postBackupProcess(0)
-    , m_memAllocFileHandle(AZ::IO::InvalidHandle)
-{
-}
-
-IDebugCallStack::~IDebugCallStack()
-{
-    StopMemLog();
-}
-
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_SINGLETON
-IDebugCallStack* IDebugCallStack::instance()
-{
-    static IDebugCallStack sInstance;
-    return &sInstance;
-}
-#endif
-
-void IDebugCallStack::FileCreationCallback(void (* postBackupProcess)())
-{
-    m_postBackupProcess = postBackupProcess;
-}
-//////////////////////////////////////////////////////////////////////////
-void IDebugCallStack::LogCallstack()
-{
-    AZ::Debug::Trace::PrintCallstack("", 2);
-}
-
-const char* IDebugCallStack::TranslateExceptionCode(DWORD dwExcept)
-{
-    switch (dwExcept)
-    {
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_TRANSLATE
-    case EXCEPTION_ACCESS_VIOLATION:
-        return "EXCEPTION_ACCESS_VIOLATION";
-        break;
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-        return "EXCEPTION_DATATYPE_MISALIGNMENT";
-        break;
-    case EXCEPTION_BREAKPOINT:
-        return "EXCEPTION_BREAKPOINT";
-        break;
-    case EXCEPTION_SINGLE_STEP:
-        return "EXCEPTION_SINGLE_STEP";
-        break;
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-        return "EXCEPTION_ARRAY_BOUNDS_EXCEEDED";
-        break;
-    case EXCEPTION_FLT_DENORMAL_OPERAND:
-        return "EXCEPTION_FLT_DENORMAL_OPERAND";
-        break;
-    case EXCEPTION_FLT_DIVIDE_BY_ZERO:
-        return "EXCEPTION_FLT_DIVIDE_BY_ZERO";
-        break;
-    case EXCEPTION_FLT_INEXACT_RESULT:
-        return "EXCEPTION_FLT_INEXACT_RESULT";
-        break;
-    case EXCEPTION_FLT_INVALID_OPERATION:
-        return "EXCEPTION_FLT_INVALID_OPERATION";
-        break;
-    case EXCEPTION_FLT_OVERFLOW:
-        return "EXCEPTION_FLT_OVERFLOW";
-        break;
-    case EXCEPTION_FLT_STACK_CHECK:
-        return "EXCEPTION_FLT_STACK_CHECK";
-        break;
-    case EXCEPTION_FLT_UNDERFLOW:
-        return "EXCEPTION_FLT_UNDERFLOW";
-        break;
-    case EXCEPTION_INT_DIVIDE_BY_ZERO:
-        return "EXCEPTION_INT_DIVIDE_BY_ZERO";
-        break;
-    case EXCEPTION_INT_OVERFLOW:
-        return "EXCEPTION_INT_OVERFLOW";
-        break;
-    case EXCEPTION_PRIV_INSTRUCTION:
-        return "EXCEPTION_PRIV_INSTRUCTION";
-        break;
-    case EXCEPTION_IN_PAGE_ERROR:
-        return "EXCEPTION_IN_PAGE_ERROR";
-        break;
-    case EXCEPTION_ILLEGAL_INSTRUCTION:
-        return "EXCEPTION_ILLEGAL_INSTRUCTION";
-        break;
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-        return "EXCEPTION_NONCONTINUABLE_EXCEPTION";
-        break;
-    case EXCEPTION_STACK_OVERFLOW:
-        return "EXCEPTION_STACK_OVERFLOW";
-        break;
-    case EXCEPTION_INVALID_DISPOSITION:
-        return "EXCEPTION_INVALID_DISPOSITION";
-        break;
-    case EXCEPTION_GUARD_PAGE:
-        return "EXCEPTION_GUARD_PAGE";
-        break;
-    case EXCEPTION_INVALID_HANDLE:
-        return "EXCEPTION_INVALID_HANDLE";
-        break;
-    //case EXCEPTION_POSSIBLE_DEADLOCK: return "EXCEPTION_POSSIBLE_DEADLOCK";   break ;
-
-    case STATUS_FLOAT_MULTIPLE_FAULTS:
-        return "STATUS_FLOAT_MULTIPLE_FAULTS";
-        break;
-    case STATUS_FLOAT_MULTIPLE_TRAPS:
-        return "STATUS_FLOAT_MULTIPLE_TRAPS";
-        break;
-
-
-#endif
-    default:
-        return "Unknown";
-        break;
-    }
-}
-
-void IDebugCallStack::PutVersion(char* str, size_t length)
-{
-AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
-
-    if (!gEnv || !gEnv->pSystem)
-    {
-        return;
-    }
-
-    char sFileVersion[128];
-    gEnv->pSystem->GetFileVersion().ToString(sFileVersion, sizeof(sFileVersion));
-
-    char sProductVersion[128];
-    gEnv->pSystem->GetProductVersion().ToString(sProductVersion, sizeof(sFileVersion));
-
-
-    //! Get time.
-    time_t ltime;
-    time(&ltime);
-    tm* today = localtime(&ltime);
-
-    char s[1024];
-    //! Use strftime to build a customized time string.
-    strftime(s, 128, "Logged at %#c\n", today);
-    azstrcat(str, length, s);
-    sprintf_s(s, "FileVersion: %s\n", sFileVersion);
-    azstrcat(str, length, s);
-    sprintf_s(s, "ProductVersion: %s\n", sProductVersion);
-    azstrcat(str, length, s);
-
-    if (gEnv->pLog)
-    {
-        const char* logfile = gEnv->pLog->GetFileName();
-        if (logfile)
-        {
-            sprintf (s, "LogFile: %s\n", logfile);
-            azstrcat(str, length, s);
-        }
-    }
-
-    AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
-    azstrcat(str, length, "ProjectDir: ");
-    azstrcat(str, length, projectPath.c_str());
-    azstrcat(str, length, "\n");
-
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_APPEND_MODULENAME
-    GetModuleFileNameA(NULL, s, sizeof(s));
-    
-    // Log EXE filename only if possible (not full EXE path which could contain sensitive info)
-    AZStd::string exeName;
-    if (AZ::StringFunc::Path::GetFullFileName(s, exeName))
-    {
-        azstrcat(str, length, "Executable: ");
-        azstrcat(str, length, exeName.c_str());
-
-#   ifdef AZ_DEBUG_BUILD
-        azstrcat(str, length, " (debug: yes");
-#   else
-        azstrcat(str, length, " (debug: no");
-#   endif
-    }
-#endif
-AZ_POP_DISABLE_WARNING
-}
-
-
-//Crash the application, in this way the debug callstack routine will be called and it will create all the necessary files (error.log, dump, and eventually screenshot)
-void IDebugCallStack::FatalError(const char* description)
-{
-    m_bIsFatalError = true;
-    WriteLineToLog(description);
-
-#ifndef _RELEASE
-    bool bShowDebugScreen = g_cvars.sys_no_crash_dialog == 0;
-    // showing the debug screen is not safe when not called from mainthread
-    // it normally leads to a infinity recursion followed by a stack overflow, preventing
-    // useful call stacks, thus they are disabled
-    bShowDebugScreen = bShowDebugScreen && gEnv->mMainThreadId == CryGetCurrentThreadId();
-    if (bShowDebugScreen)
-    {
-        EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "Open 3D Engine Fatal Error", description, false);
-    }
-#endif
-
-#if defined(WIN32) || !defined(_RELEASE)
-    int* p = 0x0;
-    PREFAST_SUPPRESS_WARNING(6011) * p = 1; // we're intentionally crashing here
-#endif
-}
-
-void IDebugCallStack::WriteLineToLog(const char* format, ...)
-{
-    va_list ArgList;
-    char        szBuffer[MAX_WARNING_LENGTH];
-    va_start(ArgList, format);
-    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, format, ArgList);
-    cry_strcat(szBuffer, "\n");
-    szBuffer[sizeof(szBuffer) - 1] = '\0';
-    va_end(ArgList);
-
-    AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
-    AZ::IO::FileIOBase::GetDirectInstance()->Open("@Log@\\error.log", AZ::IO::GetOpenModeFromStringMode("a+t"), fileHandle);
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        AZ::IO::FileIOBase::GetDirectInstance()->Write(fileHandle, szBuffer, strlen(szBuffer));
-        AZ::IO::FileIOBase::GetDirectInstance()->Flush(fileHandle);
-        AZ::IO::FileIOBase::GetDirectInstance()->Close(fileHandle);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void IDebugCallStack::StartMemLog()
-{
-    AZ::IO::FileIOBase::GetDirectInstance()->Open("@Log@\\memallocfile.log", AZ::IO::OpenMode::ModeWrite, m_memAllocFileHandle);
-
-    assert(m_memAllocFileHandle != AZ::IO::InvalidHandle);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void IDebugCallStack::StopMemLog()
-{
-    if (m_memAllocFileHandle != AZ::IO::InvalidHandle)
-    {
-        AZ::IO::FileIOBase::GetDirectInstance()->Close(m_memAllocFileHandle);
-        m_memAllocFileHandle = AZ::IO::InvalidHandle;
-    }
-}
-//#endif //!defined(LINUX)
diff --git a/Code/CryEngine/CrySystem/IDebugCallStack.h b/Code/CryEngine/CrySystem/IDebugCallStack.h
deleted file mode 100644
index 2bc50051e7..0000000000
--- a/Code/CryEngine/CrySystem/IDebugCallStack.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A multiplatform base class for handling errors and collecting call stacks
-
-#ifndef CRYINCLUDE_CRYSYSTEM_IDEBUGCALLSTACK_H
-#define CRYINCLUDE_CRYSYSTEM_IDEBUGCALLSTACK_H
-#pragma once
-
-#include "System.h"
-
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_FORWARD_EXCEPTION_POINTERS
-struct EXCEPTION_POINTERS;
-#endif
-//! Limits the maximal number of functions in call stack.
-enum
-{
-    MAX_DEBUG_STACK_ENTRIES = 80
-};
-
-class IDebugCallStack
-{
-public:
-    // Returns single instance of DebugStack
-    static IDebugCallStack* instance();
-
-    virtual int handleException([[maybe_unused]] EXCEPTION_POINTERS* exception_pointer){return 0; }
-
-    // returns the module name of a given address
-    virtual string GetModuleNameForAddr([[maybe_unused]] void* addr) { return "[unknown]"; }
-
-    // returns the function name of a given address together with source file and line number (if available) of a given address
-    virtual void GetProcNameForAddr(void* addr, string& procName, void*& baseAddr, string& filename, int& line)
-    {
-        filename = "[unknown]";
-        line = 0;
-        baseAddr = addr;
-#if defined(PLATFORM_64BIT)
-        procName.Format("[%016llX]", addr);
-#else
-        procName.Format("[%08X]", addr);
-#endif
-    }
-
-    // returns current filename
-    virtual string GetCurrentFilename()  { return "[unknown]"; }
-
-    //! Dumps Current Call Stack to log.
-    virtual void LogCallstack();
-    //triggers a fatal error, so the DebugCallstack can create the error.log and terminate the application
-    void FatalError(const char*);
-
-    //Reports a bug and continues execution
-    virtual void ReportBug(const char*) {}
-
-    virtual void FileCreationCallback(void (* postBackupProcess)());
-
-    static void WriteLineToLog(const char* format, ...);
-
-    virtual void StartMemLog();
-    virtual void StopMemLog();
-
-protected:
-    IDebugCallStack();
-    virtual ~IDebugCallStack();
-
-    static const char* TranslateExceptionCode(DWORD dwExcept);
-    static void PutVersion(char* str, size_t length);
-
-    bool m_bIsFatalError;
-    static const char* const s_szFatalErrorCode;
-
-    void (* m_postBackupProcess)();
-
-    AZ::IO::HandleType m_memAllocFileHandle;
-};
-
-
-
-#endif // CRYINCLUDE_CRYSYSTEM_IDEBUGCALLSTACK_H
diff --git a/Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp b/Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
deleted file mode 100644
index 81da76177f..0000000000
--- a/Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
+++ /dev/null
@@ -1,994 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// [LYN-2376] Remove the entire file once legacy slice support is removed
-
-#include "CrySystem_precompiled.h"
-#include "LevelSystem.h"
-#include <IAudioSystem.h>
-#include "IMovieSystem.h"
-#include <ILocalizationManager.h>
-#include "CryPath.h"
-
-#include <LoadScreenBus.h>
-
-#include <AzCore/Debug/AssetTracking.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/IO/FileOperations.h>
-#include <AzFramework/Entity/GameEntityContextBus.h>
-#include <AzFramework/Input/Buses/Requests/InputChannelRequestBus.h>
-#include <AzFramework/Spawnable/RootSpawnableInterface.h>
-
-#include "MainThreadRenderRequestBus.h"
-#include <LyShine/ILyShine.h>
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/StringFunc/StringFunc.h>
-
-#include <AzCore/Script/ScriptSystemBus.h>
-
-#ifdef WIN32
-#include <CryWindows.h>
-#endif
-
-namespace LegacyLevelSystem
-{
-static constexpr const char* ArchiveExtension = ".pak";
-
-void CLevelInfo::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(m_levelName);
-    pSizer->AddObject(m_levelPath);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLevelInfo::OpenLevelPak()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    // The prefab system doesn't use level.pak
-    if (usePrefabSystemForLevels)
-    {
-        return false;
-    }
-
-    AZStd::string levelpak(m_levelPath);
-    levelpak += "/level.pak";
-    AZStd::fixed_string<AZ::IO::IArchive::MaxPath> fullLevelPakPath;
-    bool bOk = gEnv->pCryPak->OpenPack(
-        levelpak.c_str(), m_isPak ? AZ::IO::IArchive::FLAGS_LEVEL_PAK_INSIDE_PAK : (unsigned)0, NULL, &fullLevelPakPath, false);
-    m_levelPakFullPath.assign(fullLevelPakPath.c_str());
-    return bOk;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLevelInfo::CloseLevelPak()
-{
-    LOADING_TIME_PROFILE_SECTION;
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    // The prefab system doesn't use level.pak
-    if (usePrefabSystemForLevels)
-    {
-        return;
-    }
-
-    if (!m_levelPakFullPath.empty())
-    {
-        gEnv->pCryPak->ClosePack(m_levelPakFullPath.c_str(), AZ::IO::IArchive::FLAGS_PATH_REAL);
-        m_levelPakFullPath.clear();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLevelInfo::ReadInfo()
-{
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    // Set up a default game type for legacy code.
-    m_defaultGameTypeName = "Mission0";
-
-    if (usePrefabSystemForLevels)
-    {
-        return true;
-    }
-
-
-    AZStd::string levelPath(m_levelPath);
-    AZStd::string xmlFile(levelPath);
-    xmlFile += "/LevelInfo.xml";
-    XmlNodeRef rootNode = GetISystem()->LoadXmlFromFile(xmlFile.c_str());
-
-    if (rootNode)
-    {
-        AZStd::string dataFile(levelPath);
-        dataFile += "/LevelDataAction.xml";
-        XmlNodeRef dataNode = GetISystem()->LoadXmlFromFile(dataFile.c_str());
-        if (!dataNode)
-        {
-            dataFile = levelPath + "/LevelData.xml";
-            dataNode = GetISystem()->LoadXmlFromFile(dataFile.c_str());
-        }
-
-        if (dataNode)
-        {
-            XmlNodeRef gameTypesNode = dataNode->findChild("Missions");
-
-            if ((gameTypesNode != 0) && (gameTypesNode->getChildCount() > 0))
-            {
-                m_defaultGameTypeName.clear();
-
-                for (int i = 0; i < gameTypesNode->getChildCount(); i++)
-                {
-                    XmlNodeRef gameTypeNode = gameTypesNode->getChild(i);
-
-                    if (gameTypeNode->isTag("Mission"))
-                    {
-                        const char* gameTypeName = gameTypeNode->getAttr("Name");
-
-                        if (gameTypeName)
-                        {
-                            m_defaultGameTypeName = gameTypeName;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return rootNode != 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-/// Used by console auto completion.
-struct SLevelNameAutoComplete
-    : public IConsoleArgumentAutoComplete
-{
-    AZStd::vector<AZStd::string> levels;
-    virtual int GetCount() const { return levels.size(); };
-    virtual const char* GetValue(int nIndex) const { return levels[nIndex].c_str(); };
-};
-// definition and declaration must be separated for devirtualization
-static StaticInstance<SLevelNameAutoComplete, AZStd::no_destruct<SLevelNameAutoComplete>> g_LevelNameAutoComplete;
-
-//------------------------------------------------------------------------
-static void LoadMap(IConsoleCmdArgs* args)
-{
-    if (gEnv->pSystem && gEnv->pSystem->GetILevelSystem() && !gEnv->IsEditor())
-    {
-        if (args->GetArgCount() > 1)
-        {
-            gEnv->pSystem->GetILevelSystem()->UnloadLevel();
-            gEnv->pSystem->GetILevelSystem()->LoadLevel(args->GetArg(1));
-        }
-    }
-}
-
-//------------------------------------------------------------------------
-static void UnloadMap([[maybe_unused]] IConsoleCmdArgs* args)
-{
-    if (gEnv->pSystem && gEnv->pSystem->GetILevelSystem() && !gEnv->IsEditor())
-    {
-        gEnv->pSystem->GetILevelSystem()->UnloadLevel();
-    }
-}
-
-//------------------------------------------------------------------------
-CLevelSystem::CLevelSystem(ISystem* pSystem, const char* levelsFolder)
-    : m_pSystem(pSystem)
-    , m_pCurrentLevel(0)
-    , m_pLoadingLevelInfo(0)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    CRY_ASSERT(pSystem);
-
-    //if (!gEnv->IsEditor())
-    Rescan(levelsFolder);
-
-    m_fLastLevelLoadTime = 0;
-    m_fLastTime = 0;
-    m_bLevelLoaded = false;
-
-    m_levelLoadStartTime.SetValue(0);
-
-    m_nLoadedLevelsCount = 0;
-
-    REGISTER_COMMAND("map", LoadMap, VF_BLOCKFRAME, "Load a map");
-    REGISTER_COMMAND("unload", UnloadMap, 0, "Unload current map");
-    gEnv->pConsole->RegisterAutoComplete("map", &(*g_LevelNameAutoComplete));
-
-    AZ_Assert(gEnv && gEnv->pCryPak, "gEnv and CryPak must be initialized for loading levels.");
-    if (!gEnv || !gEnv->pCryPak)
-    {
-        return;
-    }
-    auto pPak = gEnv->pCryPak;
-
-    if (AZ::IO::IArchive::LevelPackOpenEvent* levelPakOpenEvent = pPak->GetLevelPackOpenEvent())
-    {
-        m_levelPackOpenHandler = AZ::IO::IArchive::LevelPackOpenEvent::Handler([this](const AZStd::vector<AZStd::string>& levelDirs)
-        {
-            for (AZStd::string dir : 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);
-            }
-        });
-        m_levelPackOpenHandler.Connect(*levelPakOpenEvent);
-    }
-
-    if (AZ::IO::IArchive::LevelPackCloseEvent* levelPakCloseEvent = pPak->GetLevelPackCloseEvent())
-    {
-        m_levelPackCloseHandler = AZ::IO::IArchive::LevelPackCloseEvent::Handler([this](AZStd::string_view)
-        {
-            Rescan(ILevelSystem::LevelsDirectoryName);
-        });
-        m_levelPackCloseHandler.Connect(*levelPakCloseEvent);
-    }
-}
-
-//------------------------------------------------------------------------
-CLevelSystem::~CLevelSystem()
-{
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::Rescan(const char* levelsFolder)
-{
-    if (levelsFolder)
-    {
-        m_levelsFolder = levelsFolder;
-    }
-
-    CRY_ASSERT(!m_levelsFolder.empty());
-    m_levelInfos.clear();
-    m_levelInfos.reserve(64);
-    ScanFolder(0, false);
-
-    g_LevelNameAutoComplete->levels.clear();
-    for (int i = 0; i < (int)m_levelInfos.size(); i++)
-    {
-        g_LevelNameAutoComplete->levels.push_back(AZStd::string(PathUtil::GetFileName(m_levelInfos[i].GetName()).c_str()));
-    }
-}
-
-//-----------------------------------------------------------------------
-void CLevelSystem::ScanFolder(const char* subfolder, bool modFolder)
-{
-    AZStd::string folder;
-    if (subfolder && subfolder[0])
-    {
-        folder = subfolder;
-    }
-
-    AZStd::string search(m_levelsFolder);
-    if (!folder.empty())
-    {
-        if (AZ::StringFunc::StartsWith(folder.c_str(), m_levelsFolder.c_str()))
-        {
-            search = folder;
-        }
-        else
-        {
-            search += "/" + folder;
-        }
-    }
-    search += "/*";
-
-    AZ_Assert(gEnv && gEnv->pCryPak, "gEnv and must be initialized for loading levels.");
-    if (!gEnv || !gEnv->pCryPak)
-    {
-        return;
-    }
-    auto pPak = gEnv->pCryPak;
-
-    AZStd::unordered_set<AZStd::string> pakList;
-
-    const bool allowFileSystem = true;
-    const uint32_t skipPakFiles = 1;
-    AZ::IO::ArchiveFileIterator handle = pPak->FindFirst(search.c_str(), AZ::IO::IArchive::eFileSearchType_AllowOnDiskOnly);
-
-    if (handle)
-    {
-        do
-        {
-            AZStd::string extension;
-            AZStd::string levelName;
-            AZ::StringFunc::Path::Split(handle.m_filename.data(), nullptr, nullptr, &levelName, &extension);
-            if (extension == ArchiveExtension)
-            {
-                if (AZ::StringFunc::Equal(handle.m_filename.data(), LevelPakName))
-                {
-                    // level folder contain pak files like 'level.pak'
-                    // which we only want to load during level loading.
-                    continue;
-                }
-
-                AZStd::string levelContainerPakPath;
-                AZ::StringFunc::Path::Join("@assets@", m_levelsFolder.c_str(), levelContainerPakPath);
-                if (subfolder && subfolder[0])
-                {
-                    AZ::StringFunc::Path::Join(levelContainerPakPath.c_str(), subfolder, levelContainerPakPath);
-                }
-                AZ::StringFunc::Path::Join(levelContainerPakPath.c_str(), handle.m_filename.data(), levelContainerPakPath);
-                pakList.emplace(levelContainerPakPath);
-                continue;
-            }
-        } while (handle = pPak->FindNext(handle));
-
-        pPak->FindClose(handle);
-    }
-
-    // Open all the available paks found in the levels folder
-    for (auto iter = pakList.begin(); iter != pakList.end(); iter++)
-    {
-        AZStd::fixed_string<AZ::IO::IArchive::MaxPath> fullLevelPakPath;
-        gEnv->pCryPak->OpenPack(iter->c_str(), (unsigned)0, nullptr, &fullLevelPakPath, false);
-    }
-
-    // Levels in bundles now take priority over levels outside of bundles.
-    PopulateLevels(search, folder, pPak, modFolder, false);
-    // Load levels outside of the bundles to maintain backward compatibility.
-    PopulateLevels(search, folder, pPak, modFolder, true);
-
-}
-
-void CLevelSystem::PopulateLevels(
-    AZStd::string searchPattern, 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(), AZ::IO::IArchive::eFileSearchType_AllowOnDiskOnly);
-
-        if (handle)
-        {
-            do
-            {
-                if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) != AZ::IO::FileDesc::Attribute::Subdirectory ||
-                    handle.m_filename == "." || handle.m_filename == "..")
-                {
-                    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 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::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);
-        }
-    }
-}
-
-//------------------------------------------------------------------------
-int CLevelSystem::GetLevelCount()
-{
-    return (int)m_levelInfos.size();
-}
-
-//------------------------------------------------------------------------
-ILevelInfo* CLevelSystem::GetLevelInfo(int level)
-{
-    return GetLevelInfoInternal(level);
-}
-
-//------------------------------------------------------------------------
-CLevelInfo* CLevelSystem::GetLevelInfoInternal(int level)
-{
-    if ((level >= 0) && (level < GetLevelCount()))
-    {
-        return &m_levelInfos[level];
-    }
-
-    return 0;
-}
-
-//------------------------------------------------------------------------
-ILevelInfo* CLevelSystem::GetLevelInfo(const char* levelName)
-{
-    return GetLevelInfoInternal(levelName);
-}
-
-//------------------------------------------------------------------------
-CLevelInfo* CLevelSystem::GetLevelInfoInternal(const AZStd::string& levelName)
-{
-    // If level not found by full name try comparing with only filename
-    for (AZStd::vector<CLevelInfo>::iterator it = m_levelInfos.begin(); it != m_levelInfos.end(); ++it)
-    {
-        if (!azstricmp(it->GetName(), levelName.c_str()))
-        {
-            return &(*it);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    for (AZStd::vector<CLevelInfo>::iterator it = m_levelInfos.begin(); it != m_levelInfos.end(); ++it)
-    {
-        {
-            if (!azstricmp(PathUtil::GetFileName(it->GetName()), levelName.c_str()))
-            {
-                return &(*it);
-            }
-        }
-    }
-
-    // Try stripping out the folder to find the raw filename
-    AZStd::string sLevelName(levelName);
-    size_t lastSlash = sLevelName.find_last_of('\\');
-    if (lastSlash == AZStd::string::npos)
-    {
-        lastSlash = sLevelName.find_last_of('/');
-    }
-    if (lastSlash != AZStd::string::npos)
-    {
-        sLevelName = sLevelName.substr(lastSlash + 1, sLevelName.size() - lastSlash - 1);
-        return GetLevelInfoInternal(sLevelName.c_str());
-    }
-
-    return 0;
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::AddListener(ILevelSystemListener* pListener)
-{
-    AZStd::vector<ILevelSystemListener*>::iterator it = AZStd::find(m_listeners.begin(), m_listeners.end(), pListener);
-
-    if (it == m_listeners.end())
-    {
-        m_listeners.reserve(12);
-        m_listeners.push_back(pListener);
-    }
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::RemoveListener(ILevelSystemListener* pListener)
-{
-    AZStd::vector<ILevelSystemListener*>::iterator it = AZStd::find(m_listeners.begin(), m_listeners.end(), pListener);
-
-    if (it != m_listeners.end())
-    {
-        m_listeners.erase(it);
-
-        if (m_listeners.empty())
-        {
-            m_listeners.shrink_to_fit();
-        }
-    }
-}
-
-//------------------------------------------------------------------------
-bool CLevelSystem::LoadLevel(const char* _levelName)
-{
-    if (gEnv->IsEditor())
-    {
-        AZ_TracePrintf("CrySystem::CLevelSystem", "LoadLevel for %s was called in the editor - not actually loading.\n", _levelName);
-        return false;
-    }
-
-    // If a level is currently loaded, unload it before loading the next one.
-    if (IsLevelLoaded())
-    {
-        UnloadLevel();
-    }
-
-    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_PREPARE, 0, 0);
-    PrepareNextLevel(_levelName);
-
-    ILevel* level = LoadLevelInternal(_levelName);
-    if (level)
-    {
-        OnLoadingComplete(_levelName);
-    }
-
-    return (level != nullptr);
-}
-//------------------------------------------------------------------------
-ILevel* CLevelSystem::LoadLevelInternal(const char* _levelName)
-{
-    gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START);
-    AZ_ASSET_NAMED_SCOPE("Level: %s", _levelName);
-
-    CryLog ("Level system is loading \"%s\"", _levelName);
-    INDENT_LOG_DURING_SCOPE();
-
-    char levelName[256];
-    cry_strcpy(levelName, _levelName);
-
-    // Not remove a scope!!!
-    {
-        LOADING_TIME_PROFILE_SECTION;
-
-        //m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
-
-        CLevelInfo* pLevelInfo = GetLevelInfoInternal(levelName);
-
-        if (!pLevelInfo)
-        {
-            // alert the listener
-            OnLevelNotFound(levelName);
-
-            return 0;
-        }
-
-        m_bLevelLoaded = false;
-
-        const bool bLoadingSameLevel = azstricmp(m_lastLevelName.c_str(), levelName) == 0;
-        m_lastLevelName = levelName;
-
-        delete m_pCurrentLevel;
-        CLevel* pLevel = new CLevel();
-        pLevel->m_levelInfo = *pLevelInfo;
-        m_pCurrentLevel = pLevel;
-
-        //////////////////////////////////////////////////////////////////////////
-        // Read main level info.
-        if (!pLevelInfo->ReadInfo())
-        {
-            OnLoadingError(levelName, "Failed to read level info (level.pak might be corrupted)!");
-            return 0;
-        }
-        //[AlexMcC|19.04.10]: Update the level's LevelInfo
-        pLevel->m_levelInfo = *pLevelInfo;
-        //////////////////////////////////////////////////////////////////////////
-
-        gEnv->pConsole->SetScrollMax(600);
-        ICVar* con_showonload = gEnv->pConsole->GetCVar("con_showonload");
-        if (con_showonload && con_showonload->GetIVal() != 0)
-        {
-            gEnv->pConsole->ShowConsole(true);
-            ICVar* g_enableloadingscreen = gEnv->pConsole->GetCVar("g_enableloadingscreen");
-            if (g_enableloadingscreen)
-            {
-                g_enableloadingscreen->Set(0);
-            }
-        }
-
-        // Reset the camera to (1,1,1) (not (0,0,0) which is the invalid/uninitialised state,
-        // to avoid the hack in the renderer to not show anything if the camera is at the origin).
-        CCamera defaultCam;
-        defaultCam.SetPosition(Vec3(1.0f));
-        m_pSystem->SetViewCamera(defaultCam);
-
-        m_pLoadingLevelInfo = pLevelInfo;
-        OnLoadingStart(levelName);
-
-
-        auto pPak = gEnv->pCryPak;
-
-        AZStd::string levelPath(pLevelInfo->GetPath());
-
-        ICVar* pSpamDelay = gEnv->pConsole->GetCVar("log_SpamDelay");
-        float spamDelay = 0.0f;
-        if (pSpamDelay)
-        {
-            spamDelay = pSpamDelay->GetFVal();
-            pSpamDelay->Set(0.0f);
-        }
-
-        // Parse level specific config data.
-        AZStd::string const sLevelNameOnly(PathUtil::GetFileName(levelName));
-
-        if (!sLevelNameOnly.empty())
-        {
-            const char* controlsPath = nullptr;
-            Audio::AudioSystemRequestBus::BroadcastResult(controlsPath, &Audio::AudioSystemRequestBus::Events::GetControlsPath);
-            if (controlsPath)
-            {
-                AZStd::string sAudioLevelPath(controlsPath);
-                sAudioLevelPath.append("levels/");
-                sAudioLevelPath += sLevelNameOnly;
-
-                Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_CONTROLS_DATA> oAMData(sAudioLevelPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
-                Audio::SAudioRequest oAudioRequestData;
-                oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING); // Needs to be blocking so data is available for next preloading request!
-                oAudioRequestData.pData = &oAMData;
-                Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-                Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_PRELOADS_DATA> oAMData2(sAudioLevelPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
-                oAudioRequestData.pData = &oAMData2;
-                Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-                Audio::TAudioPreloadRequestID nPreloadRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID;
-
-                Audio::AudioSystemRequestBus::BroadcastResult(nPreloadRequestID, &Audio::AudioSystemRequestBus::Events::GetAudioPreloadRequestID, sLevelNameOnly.c_str());
-                if (nPreloadRequestID != INVALID_AUDIO_PRELOAD_REQUEST_ID)
-                {
-                    Audio::SAudioManagerRequestData<Audio::eAMRT_PRELOAD_SINGLE_REQUEST> requestData(nPreloadRequestID, true);
-                    oAudioRequestData.pData = &requestData;
-                    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-                }
-            }
-        }
-
-        {
-            AZStd::string missionXml("Mission_");
-            missionXml += pLevelInfo->m_defaultGameTypeName;
-            missionXml += ".xml";
-            AZStd::string xmlFile(pLevelInfo->GetPath());
-            xmlFile += "/";
-            xmlFile += missionXml;
-
-            if (!gEnv->IsEditor())
-            {
-                AZStd::string entitiesFilename =
-                    AZStd::string::format("%s/%s.entities_xml", pLevelInfo->GetPath(), pLevelInfo->m_defaultGameTypeName.c_str());
-                AZStd::vector<char> fileBuffer;
-                CCryFile entitiesFile;
-                if (entitiesFile.Open(entitiesFilename.c_str(), "rt"))
-                {
-                    fileBuffer.resize(entitiesFile.GetLength());
-
-                    if (fileBuffer.size() == entitiesFile.ReadRaw(fileBuffer.begin(), fileBuffer.size()))
-                    {
-                        AZ::IO::ByteContainerStream<AZStd::vector<char>> fileStream(&fileBuffer);
-                        EBUS_EVENT(AzFramework::GameEntityContextRequestBus, LoadFromStream, fileStream, false);
-                    }
-                }
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Movie system must be reset after entities.
-        //////////////////////////////////////////////////////////////////////////
-        IMovieSystem* movieSys = gEnv->pMovieSystem;
-        if (movieSys != NULL)
-        {
-            // bSeekAllToStart needs to be false here as it's only of interest in the editor
-            movieSys->Reset(true, false);
-        }
-
-        gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE);
-
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        gEnv->pConsole->SetScrollMax(600 / 2);
-
-        pPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Clear();
-
-        if (pSpamDelay)
-        {
-            pSpamDelay->Set(spamDelay);
-        }
-
-        m_bLevelLoaded = true;
-        gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END);
-    }
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
-
-    if (auto cvar = gEnv->pConsole->GetCVar("sv_map"); cvar)
-    {
-        cvar->Set(levelName);
-    }
-
-    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_START, 0, 0);
-
-    return m_pCurrentLevel;
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::PrepareNextLevel(const char* levelName)
-{
-    CLevelInfo* pLevelInfo = GetLevelInfoInternal(levelName);
-    if (!pLevelInfo)
-    {
-        // alert the listener
-        OnLevelNotFound(levelName);
-        return;
-    }
-
-    // This work not required in-editor.
-    if (!gEnv || !gEnv->IsEditor())
-    {
-        m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
-
-        // Open pak file for a new level.
-        pLevelInfo->OpenLevelPak();
-
-        // 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);
-        gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE);
-    }
-
-    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        (*it)->OnPrepareNextLevel(pLevelInfo->GetName());
-    }
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::OnLevelNotFound(const char* levelName)
-{
-    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        (*it)->OnLevelNotFound(levelName);
-    }
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::OnLoadingStart(const char* levelName)
-{
-    if (gEnv->pCryPak->GetRecordFileOpenList() == AZ::IO::IArchive::RFOM_EngineStartup)
-    {
-        gEnv->pCryPak->RecordFileOpen(AZ::IO::IArchive::RFOM_Level);
-    }
-
-    m_fLastTime = gEnv->pTimer->GetAsyncCurTime();
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_START, 0, 0);
-
-    LOADING_TIME_PROFILE_SECTION(gEnv->pSystem);
-
-    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        (*it)->OnLoadingStart(levelName);
-    }
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::OnLoadingError(const char* levelName, const char* error)
-{
-    ILevelInfo* pLevelInfo = m_pLoadingLevelInfo;
-    if (!pLevelInfo)
-    {
-        CRY_ASSERT(false);
-        return;
-    }
-
-    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        (*it)->OnLoadingError(levelName, error);
-    }
-
-    ((CLevelInfo*)pLevelInfo)->CloseLevelPak();
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::OnLoadingComplete(const char* levelName)
-{
-    CTimeValue t = gEnv->pTimer->GetAsyncTime();
-    m_fLastLevelLoadTime = (t - m_levelLoadStartTime).GetSeconds();
-
-    LogLoadingTime();
-
-    m_nLoadedLevelsCount++;
-
-    // Hide console after loading.
-    gEnv->pConsole->ShowConsole(false);
-
-    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        (*it)->OnLoadingComplete(levelName);
-    }
-
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-    EBUS_EVENT(LoadScreenBus, Stop);
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::OnLoadingProgress(const char* levelName, int progressAmount)
-{
-    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        (*it)->OnLoadingProgress(levelName, progressAmount);
-    }
-}
-
-//------------------------------------------------------------------------
-void CLevelSystem::OnUnloadComplete(const char* levelName)
-{
-    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        (*it)->OnUnloadComplete(levelName);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLevelSystem::LogLoadingTime()
-{
-    if (gEnv->IsEditor())
-    {
-        return;
-    }
-
-    if (!GetISystem()->IsDevMode())
-    {
-        return;
-    }
-
-    char vers[128];
-    GetISystem()->GetFileVersion().ToString(vers, sizeof(vers));
-
-    const char* sChain = "";
-    if (m_nLoadedLevelsCount > 0)
-    {
-        sChain = " (Chained)";
-    }
-
-    AZStd::string text;
-    text.format("Game Level Load Time: [%s] Level %s loaded in %.2f seconds%s", vers, m_lastLevelName.c_str(), m_fLastLevelLoadTime, sChain);
-    gEnv->pLog->Log(text.c_str());
-}
-
-void CLevelSystem::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_levelInfos);
-    pSizer->AddObject(m_levelsFolder);
-    pSizer->AddObject(m_listeners);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLevelSystem::UnloadLevel()
-{
-    if (gEnv->IsEditor())
-    {
-        return;
-    }
-    if (!m_pLoadingLevelInfo)
-    {
-        return;
-    }
-
-    CryLog("UnloadLevel Start");
-    INDENT_LOG_DURING_SCOPE();
-
-    // Flush core buses. We're about to unload Cry modules and need to ensure we don't have module-owned functions left behind.
-    AZ::Data::AssetBus::ExecuteQueuedEvents();
-    AZ::TickBus::ExecuteQueuedEvents();
-    AZ::MainThreadRenderRequestBus::ExecuteQueuedEvents();
-
-    if (gEnv && gEnv->pSystem)
-    {
-        // clear all error messages to prevent stalling due to runtime file access check during chainloading
-        gEnv->pSystem->ClearErrorMessages();
-    }
-
-    if (gEnv && gEnv->pCryPak)
-    {
-        gEnv->pCryPak->DisableRuntimeFileAccess(false);
-    }
-
-    CTimeValue tBegin = gEnv->pTimer->GetAsyncTime();
-
-    // Clear level entities and prefab instances.
-    EBUS_EVENT(AzFramework::GameEntityContextRequestBus, ResetGameContext);
-
-    if (gEnv->pMovieSystem)
-    {
-        gEnv->pMovieSystem->Reset(false, false);
-        gEnv->pMovieSystem->RemoveAllSequences();
-    }
-
-    // Unload level specific audio binary data.
-    Audio::SAudioManagerRequestData<Audio::eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE> oAMData(Audio::eADS_LEVEL_SPECIFIC);
-    Audio::SAudioRequest oAudioRequestData;
-    oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING);
-    oAudioRequestData.pData = &oAMData;
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-    // Now unload level specific audio config data.
-    Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_CONTROLS_DATA> oAMData2(Audio::eADS_LEVEL_SPECIFIC);
-    oAudioRequestData.pData = &oAMData2;
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-    Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_PRELOADS_DATA> oAMData3(Audio::eADS_LEVEL_SPECIFIC);
-    oAudioRequestData.pData = &oAMData3;
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-    // Reset the camera to (0,0,0) which is the invalid/uninitialised state
-    CCamera defaultCam;
-    m_pSystem->SetViewCamera(defaultCam);
-
-    OnUnloadComplete(m_lastLevelName.c_str());
-
-    // -- kenzo: this will close all pack files for this level
-    // (even the ones which were not added through here, if this is not desired,
-    // then change code to close only level.pak)
-    if (m_pLoadingLevelInfo)
-    {
-        ((CLevelInfo*)m_pLoadingLevelInfo)->CloseLevelPak();
-        m_pLoadingLevelInfo = NULL;
-    }
-
-    m_lastLevelName.clear();
-
-    SAFE_RELEASE(m_pCurrentLevel);
-
-    // Force Lua garbage collection (may no longer be needed now the legacy renderer has been removed).
-    // Normally the GC step is triggered at the end of this method (by the ESYSTEM_EVENT_LEVEL_POST_UNLOAD event).
-    EBUS_EVENT(AZ::ScriptSystemRequestBus, GarbageCollect);
-
-    // Perform level unload procedures for the LyShine UI system
-    if (gEnv && gEnv->pLyShine)
-    {
-        gEnv->pLyShine->OnLevelUnload();
-    }
-
-    m_bLevelLoaded = false;
-
-    CTimeValue tUnloadTime = gEnv->pTimer->GetAsyncTime() - tBegin;
-    CryLog("UnloadLevel End: %.1f sec", tUnloadTime.GetSeconds());
-
-    // Must be sent last.
-    // Cleanup all containers
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_POST_UNLOAD, 0, 0);
-    AzFramework::InputChannelRequestBus::Broadcast(&AzFramework::InputChannelRequests::ResetState);
-}
-
-} // namespace LegacyLevelSystem
diff --git a/Code/CryEngine/CrySystem/LevelSystem/LevelSystem.h b/Code/CryEngine/CrySystem/LevelSystem/LevelSystem.h
deleted file mode 100644
index 1e46c76915..0000000000
--- a/Code/CryEngine/CrySystem/LevelSystem/LevelSystem.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "ILevelSystem.h"
-#include <AzFramework/Archive/IArchive.h>
-
-// [LYN-2376] Remove the entire file once legacy slice support is removed
-
-namespace LegacyLevelSystem
-{
-
-class CLevelInfo
-    : public ILevelInfo
-{
-    friend class CLevelSystem;
-public:
-    CLevelInfo() = default;
-
-    // ILevelInfo
-    virtual const char* GetName() const { return m_levelName.c_str(); }
-    virtual const char* GetPath() const { return m_levelPath.c_str(); }
-    virtual const char* GetAssetName() const { return m_levelAssetName.c_str(); }
-    // ~ILevelInfo
-
-
-    void GetMemoryUsage(ICrySizer*) const;
-
-private:
-    bool ReadInfo();
-
-    bool OpenLevelPak();
-    void CloseLevelPak();
-
-    AZStd::string m_defaultGameTypeName;
-    AZStd::string m_levelName;
-    AZStd::string m_levelPath;
-    AZStd::string m_levelAssetName;
-
-    AZStd::string m_levelPakFullPath;
-
-    bool          m_isPak = false;
-};
-
-struct ILevel
-{
-    virtual ~ILevel() = default;
-    virtual void Release() = 0;
-    virtual ILevelInfo* GetLevelInfo() = 0;
-};
-
-class CLevel
-    : public ILevel
-{
-    friend class CLevelSystem;
-public:
-    CLevel() {}
-    virtual ~CLevel() = default;
-
-    virtual void Release() { delete this; }
-
-    virtual ILevelInfo* GetLevelInfo() { return &m_levelInfo; }
-
-private:
-    CLevelInfo m_levelInfo;
-};
-
-class CLevelSystem
-    : public ILevelSystem
-{
-public:
-    CLevelSystem(ISystem* pSystem, const char* levelsFolder);
-    virtual ~CLevelSystem();
-
-    void Release() { delete this; };
-
-    // ILevelSystem
-    virtual void Rescan(const char* levelsFolder);
-    virtual int GetLevelCount();
-    virtual ILevelInfo* GetLevelInfo(int level);
-    virtual ILevelInfo* GetLevelInfo(const char* levelName);
-
-    virtual void AddListener(ILevelSystemListener* pListener);
-    virtual void RemoveListener(ILevelSystemListener* pListener);
-
-    virtual bool LoadLevel(const char* levelName);
-    virtual void UnloadLevel();
-    virtual bool IsLevelLoaded() { return m_bLevelLoaded; }
-    const char* GetCurrentLevelName() const override
-    {
-        if (m_pCurrentLevel && m_pCurrentLevel->GetLevelInfo())
-        {
-            return m_pCurrentLevel->GetLevelInfo()->GetName();
-        }
-        else
-        {
-            return "";
-        }
-    }
-
-    // If the level load failed then we need to have a different shutdown procedure vs when a level is naturally unloaded
-    virtual void SetLevelLoadFailed(bool loadFailed) { m_levelLoadFailed = loadFailed; }
-    virtual bool GetLevelLoadFailed() { return m_levelLoadFailed; }
-
-    // Unsupported by legacy level system.
-    virtual AZ::Data::AssetType GetLevelAssetType() const { return {}; }
-
-    // ~ILevelSystem
-
-    void GetMemoryUsage(ICrySizer* s) const;
-
-private:
-
-    float GetLastLevelLoadTime() { return m_fLastLevelLoadTime; }
-
-    void ScanFolder(const char* subfolder, bool modFolder);
-    void PopulateLevels(
-        AZStd::string searchPattern, AZStd::string& folder, AZ::IO::IArchive* pPak, bool& modFolder, bool fromFileSystemOnly);
-    void PrepareNextLevel(const char* levelName);
-    ILevel* LoadLevelInternal(const char* _levelName);
-
-    // Methods to notify ILevelSystemListener
-    void OnLevelNotFound(const char* levelName);
-    void OnLoadingStart(const char* levelName);
-    void OnLoadingComplete(const char* levelName);
-    void OnLoadingError(const char* levelName, const char* error);
-    void OnLoadingProgress(const char* levelName, int progressAmount);
-    void OnUnloadComplete(const char* levelName);
-
-    void LogLoadingTime();
-    bool LoadLevelInfo(CLevelInfo& levelInfo);
-
-    // internal get functions for the level infos ... they preserve the type and don't
-    // directly cast to the interface
-    CLevelInfo* GetLevelInfoInternal(int level);
-    CLevelInfo* GetLevelInfoInternal(const AZStd::string& levelName);
-
-    ISystem* m_pSystem;
-    AZStd::vector<CLevelInfo> m_levelInfos;
-    AZStd::string m_levelsFolder;
-    ILevel* m_pCurrentLevel;
-    ILevelInfo* m_pLoadingLevelInfo;
-
-    AZStd::string m_lastLevelName;
-    float                   m_fLastLevelLoadTime;
-    float                   m_fLastTime;
-
-    bool                    m_bLevelLoaded;
-    bool                    m_levelLoadFailed = false;
-
-    int                     m_nLoadedLevelsCount;
-
-    CTimeValue              m_levelLoadStartTime;
-
-    AZStd::vector<ILevelSystemListener*> m_listeners;
-
-    AZ::IO::IArchive::LevelPackOpenEvent::Handler m_levelPackOpenHandler;
-    AZ::IO::IArchive::LevelPackCloseEvent::Handler m_levelPackCloseHandler;
-
-    static constexpr const char* LevelPakName = "level.pak";
-};
-
-} // namespace LegacyLevelSystem
diff --git a/Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.cpp b/Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
deleted file mode 100644
index 803b34d0d5..0000000000
--- a/Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "CrySystem_precompiled.h"
-#include "SpawnableLevelSystem.h"
-#include <IAudioSystem.h>
-#include "IMovieSystem.h"
-
-#include <LoadScreenBus.h>
-
-#include <AzCore/Debug/AssetTracking.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/IO/FileOperations.h>
-#include <AzFramework/Entity/GameEntityContextBus.h>
-#include <AzFramework/Input/Buses/Requests/InputChannelRequestBus.h>
-
-#include "MainThreadRenderRequestBus.h"
-#include <LyShine/ILyShine.h>
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/StringFunc/StringFunc.h>
-
-#include <AzCore/Script/ScriptSystemBus.h>
-
-namespace LegacyLevelSystem
-{
-    //------------------------------------------------------------------------
-    static void LoadLevel(const AZ::ConsoleCommandContainer& arguments)
-    {
-        AZ_Error("SpawnableLevelSystem", !arguments.empty(), "LoadLevel requires a level file name to be provided.");
-        AZ_Error("SpawnableLevelSystem", arguments.size() == 1, "LoadLevel requires a single level file name to be provided.");
-
-        if (!arguments.empty() && gEnv->pSystem && gEnv->pSystem->GetILevelSystem() && !gEnv->IsEditor())
-        {
-            gEnv->pSystem->GetILevelSystem()->LoadLevel(arguments[0].data());
-        }
-    }
-
-    //------------------------------------------------------------------------
-    static void UnloadLevel([[maybe_unused]] const AZ::ConsoleCommandContainer& arguments)
-    {
-        AZ_Warning("SpawnableLevelSystem", !arguments.empty(), "UnloadLevel doesn't use any arguments.");
-
-        if (gEnv->pSystem && gEnv->pSystem->GetILevelSystem() && !gEnv->IsEditor())
-        {
-            gEnv->pSystem->GetILevelSystem()->UnloadLevel();
-        }
-    }
-
-    AZ_CONSOLEFREEFUNC(LoadLevel, AZ::ConsoleFunctorFlags::Null, "Unloads the current level and loads a new one with the given asset name");
-    AZ_CONSOLEFREEFUNC(UnloadLevel, AZ::ConsoleFunctorFlags::Null, "Unloads the current level");
-
-    //------------------------------------------------------------------------
-    SpawnableLevelSystem::SpawnableLevelSystem(ISystem* pSystem)
-        : m_pSystem(pSystem)
-    {
-        LOADING_TIME_PROFILE_SECTION;
-        CRY_ASSERT(pSystem);
-
-        m_fLastLevelLoadTime = 0;
-        m_fLastTime = 0;
-        m_bLevelLoaded = false;
-
-        m_levelLoadStartTime.SetValue(0);
-        m_nLoadedLevelsCount = 0;
-
-        AZ_Assert(gEnv && gEnv->pCryPak, "gEnv and CryPak must be initialized for loading levels.");
-        if (!gEnv || !gEnv->pCryPak)
-        {
-            return;
-        }
-
-        AzFramework::RootSpawnableNotificationBus::Handler::BusConnect();
-    }
-
-    //------------------------------------------------------------------------
-    SpawnableLevelSystem::~SpawnableLevelSystem()
-    {
-        AzFramework::RootSpawnableNotificationBus::Handler::BusDisconnect();
-    }
-
-    void SpawnableLevelSystem::Release()
-    {
-        delete this;
-    }
-
-    bool SpawnableLevelSystem::IsLevelLoaded()
-    {
-        return m_bLevelLoaded;
-    }
-
-    const char* SpawnableLevelSystem::GetCurrentLevelName() const
-    {
-        return m_bLevelLoaded ? m_lastLevelName.c_str() : "";
-    }
-
-    // If the level load failed then we need to have a different shutdown procedure vs when a level is naturally unloaded
-    void SpawnableLevelSystem::SetLevelLoadFailed(bool loadFailed)
-    {
-        m_levelLoadFailed = loadFailed;
-    }
-
-    bool SpawnableLevelSystem::GetLevelLoadFailed()
-    {
-        return m_levelLoadFailed;
-    }
-
-    AZ::Data::AssetType SpawnableLevelSystem::GetLevelAssetType() const
-    {
-        return azrtti_typeid<AzFramework::Spawnable>();
-    }
-
-    // The following methods are deprecated from ILevelSystem and will be removed once slice support is removed.
-
-    // [LYN-2376] Remove once legacy slice support is removed
-    void SpawnableLevelSystem::Rescan([[maybe_unused]] const char* levelsFolder)
-    {
-        AZ_Assert(false, "Rescan - No longer supported.");
-    }
-
-    // [LYN-2376] Remove once legacy slice support is removed
-    int SpawnableLevelSystem::GetLevelCount()
-    {
-        AZ_Assert(false, "GetLevelCount - No longer supported.");
-        return 0;
-    }
-
-    // [LYN-2376] Remove once legacy slice support is removed
-    ILevelInfo* SpawnableLevelSystem::GetLevelInfo([[maybe_unused]] int level)
-    {
-        AZ_Assert(false, "GetLevelInfo - No longer supported.");
-        return nullptr;
-    }
-
-    // [LYN-2376] Remove once legacy slice support is removed
-    ILevelInfo* SpawnableLevelSystem::GetLevelInfo([[maybe_unused]] const char* levelName)
-    {
-        AZ_Assert(false, "GetLevelInfo - No longer supported.");
-        return nullptr;
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::AddListener(ILevelSystemListener* pListener)
-    {
-        AZStd::vector<ILevelSystemListener*>::iterator it = AZStd::find(m_listeners.begin(), m_listeners.end(), pListener);
-
-        if (it == m_listeners.end())
-        {
-            m_listeners.push_back(pListener);
-        }
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::RemoveListener(ILevelSystemListener* pListener)
-    {
-        AZStd::vector<ILevelSystemListener*>::iterator it = AZStd::find(m_listeners.begin(), m_listeners.end(), pListener);
-
-        if (it != m_listeners.end())
-        {
-            m_listeners.erase(it);
-        }
-    }
-
-    //------------------------------------------------------------------------
-    bool SpawnableLevelSystem::LoadLevel(const char* levelName)
-    {
-        if (gEnv->IsEditor())
-        {
-            AZ_TracePrintf("CrySystem::CLevelSystem", "LoadLevel for %s was called in the editor - not actually loading.\n", levelName);
-            return false;
-        }
-
-        // If a level is currently loaded, unload it before loading the next one.
-        if (IsLevelLoaded())
-        {
-            UnloadLevel();
-        }
-
-        gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_PREPARE, 0, 0);
-        PrepareNextLevel(levelName);
-
-        bool result = LoadLevelInternal(levelName);
-        if (result)
-        {
-            OnLoadingComplete(levelName);
-        }
-
-        return result;
-    }
-
-    //------------------------------------------------------------------------
-    bool SpawnableLevelSystem::LoadLevelInternal(const char* levelName)
-    {
-        gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START);
-        AZ_ASSET_NAMED_SCOPE("Level: %s", levelName);
-
-        INDENT_LOG_DURING_SCOPE();
-
-        AZ::Data::AssetId rootSpawnableAssetId;
-        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
-            rootSpawnableAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, levelName, nullptr, false);
-        if (!rootSpawnableAssetId.IsValid())
-        {
-            OnLoadingError(levelName, "AssetCatalog has no entry for the requested level.");
-
-            return false;
-        }
-
-        // This scope is specifically used for marking a loading time profile section
-        {
-            LOADING_TIME_PROFILE_SECTION;
-
-            m_bLevelLoaded = false;
-            m_lastLevelName = levelName;
-            gEnv->pConsole->SetScrollMax(600);
-            ICVar* con_showonload = gEnv->pConsole->GetCVar("con_showonload");
-            if (con_showonload && con_showonload->GetIVal() != 0)
-            {
-                gEnv->pConsole->ShowConsole(true);
-                ICVar* g_enableloadingscreen = gEnv->pConsole->GetCVar("g_enableloadingscreen");
-                if (g_enableloadingscreen)
-                {
-                    g_enableloadingscreen->Set(0);
-                }
-            }
-
-            // This is a workaround until the replacement for GameEntityContext is done
-            AzFramework::GameEntityContextEventBus::Broadcast(&AzFramework::GameEntityContextEventBus::Events::OnPreGameEntitiesStarted);
-
-            // Reset the camera to (1,1,1) (not (0,0,0) which is the invalid/uninitialised state,
-            // to avoid the hack in the renderer to not show anything if the camera is at the origin).
-            CCamera defaultCam;
-            defaultCam.SetPosition(Vec3(1.0f));
-            m_pSystem->SetViewCamera(defaultCam);
-
-            OnLoadingStart(levelName);
-
-            auto pPak = gEnv->pCryPak;
-
-            ICVar* pSpamDelay = gEnv->pConsole->GetCVar("log_SpamDelay");
-            float spamDelay = 0.0f;
-            if (pSpamDelay)
-            {
-                spamDelay = pSpamDelay->GetFVal();
-                pSpamDelay->Set(0.0f);
-            }
-
-            // Parse level specific config data.
-            AZStd::string const sLevelNameOnly(PathUtil::GetFileName(levelName));
-
-            if (!sLevelNameOnly.empty())
-            {
-                const char* controlsPath = nullptr;
-                Audio::AudioSystemRequestBus::BroadcastResult(controlsPath, &Audio::AudioSystemRequestBus::Events::GetControlsPath);
-                if (controlsPath)
-                {
-                    AZStd::string sAudioLevelPath(controlsPath);
-                    sAudioLevelPath.append("levels/");
-                    sAudioLevelPath += sLevelNameOnly;
-
-                    Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_CONTROLS_DATA> oAMData(
-                        sAudioLevelPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
-                    Audio::SAudioRequest oAudioRequestData;
-                    oAudioRequestData.nFlags =
-                        (Audio::eARF_PRIORITY_HIGH |
-                         Audio::eARF_EXECUTE_BLOCKING); // Needs to be blocking so data is available for next preloading request!
-                    oAudioRequestData.pData = &oAMData;
-                    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-                    Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_PRELOADS_DATA> oAMData2(
-                        sAudioLevelPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
-                    oAudioRequestData.pData = &oAMData2;
-                    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-                    Audio::TAudioPreloadRequestID nPreloadRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID;
-
-                    Audio::AudioSystemRequestBus::BroadcastResult(
-                        nPreloadRequestID, &Audio::AudioSystemRequestBus::Events::GetAudioPreloadRequestID, sLevelNameOnly.c_str());
-                    if (nPreloadRequestID != INVALID_AUDIO_PRELOAD_REQUEST_ID)
-                    {
-                        Audio::SAudioManagerRequestData<Audio::eAMRT_PRELOAD_SINGLE_REQUEST> requestData(nPreloadRequestID, true);
-                        oAudioRequestData.pData = &requestData;
-                        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-                    }
-                }
-            }
-
-
-            AZ::Data::Asset<AzFramework::Spawnable> rootSpawnable(
-                rootSpawnableAssetId, azrtti_typeid<AzFramework::Spawnable>(), levelName);
-
-            m_rootSpawnableId = rootSpawnableAssetId;
-            m_rootSpawnableGeneration = AzFramework::RootSpawnableInterface::Get()->AssignRootSpawnable(rootSpawnable);
-
-            // This is a workaround until the replacement for GameEntityContext is done
-            AzFramework::GameEntityContextEventBus::Broadcast(&AzFramework::GameEntityContextEventBus::Events::OnGameEntitiesStarted);
-
-            //////////////////////////////////////////////////////////////////////////
-            // Movie system must be reset after entities.
-            //////////////////////////////////////////////////////////////////////////
-            IMovieSystem* movieSys = gEnv->pMovieSystem;
-            if (movieSys != NULL)
-            {
-                // bSeekAllToStart needs to be false here as it's only of interest in the editor
-                movieSys->Reset(true, false);
-            }
-
-            gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE);
-
-            //////////////////////////////////////////////////////////////////////////
-            //////////////////////////////////////////////////////////////////////////
-            gEnv->pConsole->SetScrollMax(600 / 2);
-
-            pPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Clear();
-
-            if (pSpamDelay)
-            {
-                pSpamDelay->Set(spamDelay);
-            }
-
-            m_bLevelLoaded = true;
-            gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END);
-        }
-
-        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
-
-        if (auto cvar = gEnv->pConsole->GetCVar("sv_map"); cvar)
-        {
-            cvar->Set(levelName);
-        }
-
-        gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_START, 0, 0);
-
-        return true;
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::PrepareNextLevel(const char* levelName)
-    {
-        AZ::Data::AssetId rootSpawnableAssetId;
-        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
-            rootSpawnableAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, levelName, nullptr, false);
-        if (!rootSpawnableAssetId.IsValid())
-        {
-            // alert the listener
-            OnLevelNotFound(levelName);
-            return;
-        }
-
-        // This work not required in-editor.
-        if (!gEnv || !gEnv->IsEditor())
-        {
-            m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
-
-            // 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);
-            gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE);
-        }
-
-        OnPrepareNextLevel(levelName);
-    }
-
-    void SpawnableLevelSystem::OnPrepareNextLevel(const char* levelName)
-    {
-        AZ_TracePrintf("LevelSystem", "Level system is preparing to load '%s'\n", levelName);
-
-        for (auto& listener : m_listeners)
-        {
-            listener->OnPrepareNextLevel(levelName);
-        }
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::OnLevelNotFound(const char* levelName)
-    {
-        AZ_Error("LevelSystem", false, "Requested level not found: '%s'\n", levelName);
-
-        for (auto& listener : m_listeners)
-        {
-            listener->OnLevelNotFound(levelName);
-        }
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::OnLoadingStart(const char* levelName)
-    {
-        AZ_TracePrintf("LevelSystem", "Level system is loading '%s'\n", levelName);
-
-        if (gEnv->pCryPak->GetRecordFileOpenList() == AZ::IO::IArchive::RFOM_EngineStartup)
-        {
-            gEnv->pCryPak->RecordFileOpen(AZ::IO::IArchive::RFOM_Level);
-        }
-
-        m_fLastTime = gEnv->pTimer->GetAsyncCurTime();
-
-        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_START, 0, 0);
-
-        LOADING_TIME_PROFILE_SECTION(gEnv->pSystem);
-
-        for (auto& listener : m_listeners)
-        {
-            listener->OnLoadingStart(levelName);
-        }
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::OnLoadingError(const char* levelName, const char* error)
-    {
-        AZ_Error("LevelSystem", false, "Error loading level '%s': %s\n", levelName, error);
-
-        for (auto& listener : m_listeners)
-        {
-            listener->OnLoadingError(levelName, error);
-        }
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::OnLoadingComplete(const char* levelName)
-    {
-        CTimeValue t = gEnv->pTimer->GetAsyncTime();
-        m_fLastLevelLoadTime = (t - m_levelLoadStartTime).GetSeconds();
-
-        LogLoadingTime();
-
-        m_nLoadedLevelsCount++;
-
-        // Hide console after loading.
-        gEnv->pConsole->ShowConsole(false);
-
-        for (auto& listener : m_listeners)
-        {
-            listener->OnLoadingComplete(levelName);
-        }
-
-    #if AZ_LOADSCREENCOMPONENT_ENABLED
-        EBUS_EVENT(LoadScreenBus, Stop);
-    #endif // if AZ_LOADSCREENCOMPONENT_ENABLED
-
-        AZ_TracePrintf("LevelSystem", "Level load complete: '%s'\n", levelName);
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::OnLoadingProgress(const char* levelName, int progressAmount)
-    {
-        for (auto& listener : m_listeners)
-        {
-            listener->OnLoadingProgress(levelName, progressAmount);
-        }
-    }
-
-    //------------------------------------------------------------------------
-    void SpawnableLevelSystem::OnUnloadComplete(const char* levelName)
-    {
-        for (auto& listener : m_listeners)
-        {
-            listener->OnUnloadComplete(levelName);
-        }
-
-        AZ_TracePrintf("LevelSystem", "Level unload complete: '%s'\n", levelName);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void SpawnableLevelSystem::LogLoadingTime()
-    {
-        if (gEnv->IsEditor())
-        {
-            return;
-        }
-
-        if (!GetISystem()->IsDevMode())
-        {
-            return;
-        }
-
-        char vers[128];
-        GetISystem()->GetFileVersion().ToString(vers, sizeof(vers));
-
-        const char* sChain = "";
-        if (m_nLoadedLevelsCount > 0)
-        {
-            sChain = " (Chained)";
-        }
-
-        AZStd::string text;
-        text.format(
-            "Game Level Load Time: [%s] Level %s loaded in %.2f seconds%s", vers, m_lastLevelName.c_str(), m_fLastLevelLoadTime, sChain);
-        gEnv->pLog->Log(text.c_str());
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void SpawnableLevelSystem::UnloadLevel()
-    {
-        if (gEnv->IsEditor())
-        {
-            return;
-        }
-
-        if (m_lastLevelName.empty())
-        {
-            return;
-        }
-
-        AZ_TracePrintf("LevelSystem", "UnloadLevel Start\n");
-        INDENT_LOG_DURING_SCOPE();
-
-        // Flush core buses. We're about to unload Cry modules and need to ensure we don't have module-owned functions left behind.
-        AZ::Data::AssetBus::ExecuteQueuedEvents();
-        AZ::TickBus::ExecuteQueuedEvents();
-        AZ::MainThreadRenderRequestBus::ExecuteQueuedEvents();
-
-        if (gEnv && gEnv->pSystem)
-        {
-            // clear all error messages to prevent stalling due to runtime file access check during chainloading
-            gEnv->pSystem->ClearErrorMessages();
-        }
-
-        if (gEnv && gEnv->pCryPak)
-        {
-            gEnv->pCryPak->DisableRuntimeFileAccess(false);
-        }
-
-        CTimeValue tBegin = gEnv->pTimer->GetAsyncTime();
-
-        // Clear level entities and prefab instances.
-        EBUS_EVENT(AzFramework::GameEntityContextRequestBus, ResetGameContext);
-
-        if (gEnv->pMovieSystem)
-        {
-            gEnv->pMovieSystem->Reset(false, false);
-            gEnv->pMovieSystem->RemoveAllSequences();
-        }
-
-        // Unload level specific audio binary data.
-        Audio::SAudioManagerRequestData<Audio::eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE> oAMData(Audio::eADS_LEVEL_SPECIFIC);
-        Audio::SAudioRequest oAudioRequestData;
-        oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING);
-        oAudioRequestData.pData = &oAMData;
-        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-        // Now unload level specific audio config data.
-        Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_CONTROLS_DATA> oAMData2(Audio::eADS_LEVEL_SPECIFIC);
-        oAudioRequestData.pData = &oAMData2;
-        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-        Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_PRELOADS_DATA> oAMData3(Audio::eADS_LEVEL_SPECIFIC);
-        oAudioRequestData.pData = &oAMData3;
-        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-        // Reset the camera to (0,0,0) which is the invalid/uninitialised state
-        CCamera defaultCam;
-        m_pSystem->SetViewCamera(defaultCam);
-
-        OnUnloadComplete(m_lastLevelName.c_str());
-
-        AzFramework::RootSpawnableInterface::Get()->ReleaseRootSpawnable();
-
-        m_lastLevelName.clear();
-
-        // Force Lua garbage collection (may no longer be needed now the legacy renderer has been removed).
-        // Normally the GC step is triggered at the end of this method (by the ESYSTEM_EVENT_LEVEL_POST_UNLOAD event).
-        EBUS_EVENT(AZ::ScriptSystemRequestBus, GarbageCollect);
-
-        // Perform level unload procedures for the LyShine UI system
-        if (gEnv && gEnv->pLyShine)
-        {
-            gEnv->pLyShine->OnLevelUnload();
-        }
-
-        m_bLevelLoaded = false;
-
-        CTimeValue tUnloadTime = gEnv->pTimer->GetAsyncTime() - tBegin;
-        AZ_TracePrintf("LevelSystem", "UnloadLevel End: %.1f sec\n", tUnloadTime.GetSeconds());
-
-        // Must be sent last.
-        // Cleanup all containers
-        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_POST_UNLOAD, 0, 0);
-        AzFramework::InputChannelRequestBus::Broadcast(&AzFramework::InputChannelRequests::ResetState);
-
-        AzFramework::GameEntityContextEventBus::Broadcast(&AzFramework::GameEntityContextEventBus::Events::OnGameEntitiesReset);
-    }
-
-    void SpawnableLevelSystem::OnRootSpawnableAssigned(
-        [[maybe_unused]] AZ::Data::Asset<AzFramework::Spawnable> rootSpawnable, [[maybe_unused]] uint32_t generation)
-    {
-    }
-
-    void SpawnableLevelSystem::OnRootSpawnableReleased([[maybe_unused]] uint32_t generation)
-    {
-    }
-
-} // namespace LegacyLevelSystem
diff --git a/Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.h b/Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.h
deleted file mode 100644
index a261e7da9c..0000000000
--- a/Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "ILevelSystem.h"
-#include <AzCore/Console/IConsole.h>
-#include <AzFramework/Archive/IArchive.h>
-#include <AzFramework/Spawnable/RootSpawnableInterface.h>
-
-namespace LegacyLevelSystem
-{
-
-class SpawnableLevelSystem
-        : public ILevelSystem
-        , public AzFramework::RootSpawnableNotificationBus::Handler
-    {
-    public:
-        explicit SpawnableLevelSystem(ISystem* pSystem);
-        ~SpawnableLevelSystem() override;
-
-        // ILevelSystem
-        void Release() override;
-
-        void AddListener(ILevelSystemListener* pListener) override;
-        void RemoveListener(ILevelSystemListener* pListener) override;
-
-        bool LoadLevel(const char* levelName) override;
-        void UnloadLevel() override;
-        bool IsLevelLoaded() override;
-        const char* GetCurrentLevelName() const override;
-
-        // If the level load failed then we need to have a different shutdown procedure vs when a level is naturally unloaded
-        void SetLevelLoadFailed(bool loadFailed) override;
-        bool GetLevelLoadFailed() override;
-        AZ::Data::AssetType GetLevelAssetType() const override;
-
-        // The following methods are deprecated from ILevelSystem and will be removed once slice support is removed.
-
-        // [LYN-2376] Remove once legacy slice support is removed
-        void Rescan([[maybe_unused]] const char* levelsFolder) override;
-        int GetLevelCount() override;
-        ILevelInfo* GetLevelInfo([[maybe_unused]] int level) override;
-        ILevelInfo* GetLevelInfo([[maybe_unused]] const char* levelName) override;
-
-    private:
-        void OnRootSpawnableAssigned(AZ::Data::Asset<AzFramework::Spawnable> rootSpawnable, uint32_t generation) override;
-        void OnRootSpawnableReleased(uint32_t generation) override;
-
-        void PrepareNextLevel(const char* levelName);
-        bool LoadLevelInternal(const char* levelName);
-
-        // Methods to notify ILevelSystemListener
-        void OnPrepareNextLevel(const char* levelName);
-        void OnLevelNotFound(const char* levelName);
-        void OnLoadingStart(const char* levelName);
-        void OnLoadingComplete(const char* levelName);
-        void OnLoadingError(const char* levelName, const char* error);
-        void OnLoadingProgress(const char* levelName, int progressAmount);
-        void OnUnloadComplete(const char* levelName);
-
-        void LogLoadingTime();
-
-        ISystem* m_pSystem{nullptr};
-
-        AZStd::string m_lastLevelName;
-        float m_fLastLevelLoadTime{0.0f};
-        float m_fLastTime{0.0f};
-
-        bool m_bLevelLoaded{false};
-        bool m_levelLoadFailed{false};
-
-        int m_nLoadedLevelsCount{0};
-
-        CTimeValue m_levelLoadStartTime;
-
-        AZStd::vector<ILevelSystemListener*> m_listeners;
-
-        // Information about the currently-loaded root spawnable, used for tracking loads and unloads.
-        uint64_t m_rootSpawnableGeneration{0};
-        AZ::Data::AssetId m_rootSpawnableId{};
-    };
-
-} // namespace LegacyLevelSystem
diff --git a/Code/CryEngine/CrySystem/LocalizedStringManager.cpp b/Code/CryEngine/CrySystem/LocalizedStringManager.cpp
deleted file mode 100644
index 64489cb4fd..0000000000
--- a/Code/CryEngine/CrySystem/LocalizedStringManager.cpp
+++ /dev/null
@@ -1,2771 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-
-#include "LocalizedStringManager.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define LOCALIZEDSTRINGMANAGER_CPP_SECTION_1 1
-#endif
-
-#include <ISystem.h>
-#include "System.h" // to access InitLocalization()
-#include <CryPath.h>
-#include <IConsole.h>
-#include <StringUtils.h>
-#include <locale.h>
-#include <time.h>
-
-#include <AzCore/std/string/conversions.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-
-#define MAX_CELL_COUNT 32
-
-// CVAR names
-const char c_sys_localization_debug[] = "sys_localization_debug";
-const char c_sys_localization_encode[] = "sys_localization_encode";
-#define LOC_WINDOW "Localization"
-const char c_sys_localization_format[] = "sys_localization_format";
-
-enum ELocalizedXmlColumns
-{
-    ELOCALIZED_COLUMN_SKIP  = 0,
-    ELOCALIZED_COLUMN_KEY,
-    ELOCALIZED_COLUMN_AUDIOFILE,
-    ELOCALIZED_COLUMN_CHARACTER_NAME,
-    ELOCALIZED_COLUMN_SUBTITLE_TEXT,
-    ELOCALIZED_COLUMN_ACTOR_LINE,
-    ELOCALIZED_COLUMN_USE_SUBTITLE,
-    ELOCALIZED_COLUMN_VOLUME,
-    ELOCALIZED_COLUMN_SOUNDEVENT,
-    ELOCALIZED_COLUMN_RADIO_RATIO,
-    ELOCALIZED_COLUMN_EVENTPARAMETER,
-    ELOCALIZED_COLUMN_SOUNDMOOD,
-    ELOCALIZED_COLUMN_IS_DIRECT_RADIO,
-    // legacy names
-    ELOCALIZED_COLUMN_LEGACY_PERSON,
-    ELOCALIZED_COLUMN_LEGACY_CHARACTERNAME,
-    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_CHARACTERNAME,
-    ELOCALIZED_COLUMN_LEGACY_ENGLISH_DIALOGUE,
-    ELOCALIZED_COLUMN_LEGACY_TRANSLATION,
-    ELOCALIZED_COLUMN_LEGACY_YOUR_TRANSLATION,
-    ELOCALIZED_COLUMN_LEGACY_ENGLISH_SUBTITLE,
-    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_SUBTITLE,
-    ELOCALIZED_COLUMN_LEGACY_ORIGINAL_CHARACTER_NAME,
-    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_CHARACTER_NAME,
-    ELOCALIZED_COLUMN_LEGACY_ORIGINAL_TEXT,
-    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_TEXT,
-    ELOCALIZED_COLUMN_LEGACY_ORIGINAL_ACTOR_LINE,
-    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_ACTOR_LINE,
-    ELOCALIZED_COLUMN_LAST,
-};
-
-// The order must match to the order of the ELocalizedXmlColumns
-static const char* sLocalizedColumnNames[] =
-{
-    // everyhing read by the file will be convert to lower cases
-    "skip",
-    "key",
-    "audio_filename",
-    "character name",
-    "subtitle text",
-    "actor line",
-    "use subtitle",
-    "volume",
-    "prototype event",
-    "radio ratio",
-    "eventparameter",
-    "soundmood",
-    "is direct radio",
-    // legacy names
-    "person",
-    "character name",
-    "translated character name",
-    "english dialogue",
-    "translation",
-    "your translation",
-    "english subtitle",
-    "translated subtitle",
-    "original character name",
-    "translated character name",
-    "original text",
-    "translated text",
-    "original actor line",
-    "translated actor line",
-};
-
-//Please ensure that this array matches the contents of EPlatformIndependentLanguageID in ILocalizationManager.h
-static const char* PLATFORM_INDEPENDENT_LANGUAGE_NAMES[ ILocalizationManager::ePILID_MAX_OR_INVALID ] =
-{
-    "en-US",  // English (USA)
-    "en-GB",  // English (UK)
-    "de-DE",  // German
-    "ru-RU",  // Russian (Russia)
-    "pl-PL",  // Polish
-    "tr-TR",  // Turkish
-    "es-ES",  // Spanish (Spain)
-    "es-MX",  // Spanish (Mexico)
-    "fr-FR",  // French (France)
-    "fr-CA",  // French (Canada)
-    "it-IT",  // Italian
-    "pt-PT",  // Portugese (Portugal)
-    "pt-BR",  // Portugese (Brazil)
-    "ja-JP",  // Japanese
-    "ko-KR",  // Korean
-    "zh-CHT", // Traditional Chinese
-    "zh-CHS", // Simplified Chinese
-    "nl-NL",  // Dutch (The Netherlands)
-    "fi-FI",  // Finnish
-    "sv-SE",  // Swedish
-    "cs-CZ",  // Czech
-    "no-NO",  // Norwegian
-    "ar-SA",   // Arabic (Saudi Arabia)
-    "da-DK"   // Danish (Denmark)
-};
-
-//////////////////////////////////////////////////////////////////////////
-#if !defined(_RELEASE)
-static void ReloadDialogData([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::ReloadData);
-    //CSystem *pSystem = (CSystem*) gEnv->pSystem;
-    //pSystem->InitLocalization();
-    //pSystem->OpenBasicPaks();
-}
-#endif //#if !defined(_RELEASE)
-
-//////////////////////////////////////////////////////////////////////////
-#if !defined(_RELEASE)
-static void TestFormatMessage ([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-    string fmt1 ("abc %1 def % gh%2i %");
-    string fmt2 ("abc %[action:abc] %2 def % gh%1i %1");
-    string out1, out2;
-    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::FormatStringMessage, out1, fmt1, "first", "second", "third", nullptr);
-    CryLogAlways("%s", out1.c_str());
-    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::FormatStringMessage, out2, fmt2, "second", nullptr, nullptr, nullptr);
-    CryLogAlways("%s", out2.c_str());
-}
-#endif //#if !defined(_RELEASE)
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////
-CLocalizedStringsManager::CLocalizedStringsManager(ISystem* pSystem)
-    : m_cvarLocalizationDebug(0)
-    , m_cvarLocalizationEncode(1)
-    , m_availableLocalizations(0)
-{
-    m_pSystem = pSystem;
-    m_pSystem->GetISystemEventDispatcher()->RegisterListener(this);
-
-    m_languages.reserve(4);
-    m_pLanguage = 0;
-
-#if !defined(_RELEASE)
-    m_haveWarnedAboutAtLeastOneLabel = false;
-
-    REGISTER_COMMAND("ReloadDialogData", ReloadDialogData, VF_NULL,
-        "Reloads all localization dependent XML sheets for the currently set language.");
-
-    REGISTER_COMMAND("_TestFormatMessage", TestFormatMessage, VF_NULL, "");
-
-    REGISTER_CVAR2(c_sys_localization_debug, &m_cvarLocalizationDebug, m_cvarLocalizationDebug, VF_CHEAT,
-        "Toggles debugging of the Localization Manager.\n"
-        "Usage: sys_localization_debug [0..3]\n"
-        "1: outputs warnings\n"
-        "2: outputs extended information and warnings\n"
-        "3: outputs CRC32 hashes and strings to help detect clashes\n"
-        "Default is 0 (off).");
-
-    REGISTER_CVAR2(c_sys_localization_encode, &m_cvarLocalizationEncode, m_cvarLocalizationEncode, VF_REQUIRE_APP_RESTART,
-        "Toggles encoding of translated text to save memory. REQUIRES RESTART.\n"
-        "Usage: sys_localization_encode [0..1]\n"
-        "0: No encoding, store as wide strings\n"
-        "1: Huffman encode translated text, saves approx 30% with a small runtime performance cost\n"
-        "Default is 1.");
-#endif //#if !defined(_RELEASE)
-
-    REGISTER_CVAR2(c_sys_localization_format, &m_cvarLocalizationFormat, 1, VF_NULL,
-        "Usage: sys_localization_format [0..1]\n"
-        "    0: Crytek Legacy Localization (Excel 2003)\n"
-        "    1: AGS XML\n"
-        "Default is 1 (AGS Xml)");
-    //Check that someone hasn't added a language ID without a language name
-    assert(PLATFORM_INDEPENDENT_LANGUAGE_NAMES[ ILocalizationManager::ePILID_MAX_OR_INVALID - 1 ] != 0);
-
-    // Populate available languages by scanning the localization directory for paks
-    // Default to US English if language is not supported
-    string sPath;
-    const string sLocalizationFolder(PathUtil::GetLocalizationFolder());
-    ILocalizationManager::TLocalizationBitfield availableLanguages = 0;
-    
-    AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-    // test language name against supported languages
-    for (int i = 0; i < ILocalizationManager::ePILID_MAX_OR_INVALID; i++)
-    {
-        string sCurrentLanguage = LangNameFromPILID((ILocalizationManager::EPlatformIndependentLanguageID)i);  
-        sPath = sLocalizationFolder.c_str() + sCurrentLanguage;
-        sPath.MakeLower();
-        if (fileIO && fileIO->IsDirectory(sPath))
-        {
-            availableLanguages |= ILocalizationManager::LocalizationBitfieldFromPILID((ILocalizationManager::EPlatformIndependentLanguageID)i);
-            if (m_cvarLocalizationDebug >= 2)
-            {
-                AZ_TracePrintf("Localization", "Detected language support for %s (id %d)", sCurrentLanguage.c_str(), i);
-            }
-        }
-    }
-
-    AZ_Warning("Localization", !(m_cvarLocalizationFormat == 0 && availableLanguages == 0 && ProjectUsesLocalization()), "No localization files found!");
-
-    SetAvailableLocalizationsBitfield(availableLanguages);
-    LocalizationManagerRequestBus::Handler::BusConnect();
-}
-
-//////////////////////////////////////////////////////////////////////
-CLocalizedStringsManager::~CLocalizedStringsManager()
-{
-    FreeData();
-    LocalizationManagerRequestBus::Handler::BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::GetLoadedTags(TLocalizationTagVec& tagVec)
-{
-    TTagFileNames::const_iterator end = m_tagFileNames.end();
-    for (TTagFileNames::const_iterator it = m_tagFileNames.begin(); it != end; ++it)
-    {
-        if (it->second.loaded)
-        {
-            tagVec.push_back(it->first);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::FreeLocalizationData()
-{
-    AutoLock lock(m_cs);    //Make sure to lock, as this is a modifying operation
-    ListAndClearProblemLabels();
-
-    for (uint32 i = 0; i < m_languages.size(); i++)
-    {
-        if (m_cvarLocalizationEncode == 1)
-        {
-            auto pLanguage = m_languages[i];
-            for (uint8 iEncoder = 0; iEncoder < pLanguage->m_vEncoders.size(); iEncoder++)
-            {
-                SAFE_DELETE(pLanguage->m_vEncoders[iEncoder]);
-            }
-        }
-        std::for_each(m_languages[i]->m_vLocalizedStrings.begin(), m_languages[i]->m_vLocalizedStrings.end(), stl::container_object_deleter());
-        m_languages[i]->m_keysMap.clear();
-        m_languages[i]->m_vLocalizedStrings.clear();
-    }
-    m_loadedTables.clear();
-}
-
-//////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::FreeData()
-{
-    FreeLocalizationData();
-
-    for (uint32 i = 0; i < m_languages.size(); i++)
-    {
-        delete m_languages[i];
-    }
-    m_languages.resize(0);
-    m_loadedTables.clear();
-
-    m_pLanguage = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CLocalizedStringsManager::LangNameFromPILID(const ILocalizationManager::EPlatformIndependentLanguageID id)
-{
-    assert(id >= 0 && id < ILocalizationManager::ePILID_MAX_OR_INVALID);
-    return PLATFORM_INDEPENDENT_LANGUAGE_NAMES[ id ];
-}
-
-//////////////////////////////////////////////////////////////////////////
-ILocalizationManager::EPlatformIndependentLanguageID CLocalizedStringsManager::PILIDFromLangName(AZStd::string langName)
-{
-    for (int i = 0; i < ILocalizationManager::ePILID_MAX_OR_INVALID; i++)
-    {
-        if (!_stricmp(langName.c_str(), PLATFORM_INDEPENDENT_LANGUAGE_NAMES[i]))
-        {
-            return (ILocalizationManager::EPlatformIndependentLanguageID)i;
-        }
-    }
-    return ILocalizationManager::ePILID_MAX_OR_INVALID;
-}
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION LOCALIZEDSTRINGMANAGER_CPP_SECTION_1
-#include AZ_RESTRICTED_FILE(LocalizedStringManager_cpp)
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#endif // AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-//////////////////////////////////////////////////////////////////////////
-ILocalizationManager::EPlatformIndependentLanguageID CLocalizedStringsManager::GetSystemLanguage()
-{
-
-    return ILocalizationManager::EPlatformIndependentLanguageID::ePILID_English_US;
-}
-#endif // defined(AZ_RESTRICTED_PLATFORM)
-
-//Uses bitwise operations to compare the localizations we provide in this SKU and the languages that the platform supports.
-//Returns !0 if we provide more localizations than are available as system languages
-ILocalizationManager::TLocalizationBitfield CLocalizedStringsManager::MaskSystemLanguagesFromSupportedLocalizations(const ILocalizationManager::TLocalizationBitfield systemLanguages)
-{
-    return (~systemLanguages) & m_availableLocalizations;
-}
-
-//Returns !0 if the language is supported.
-ILocalizationManager::TLocalizationBitfield CLocalizedStringsManager::IsLanguageSupported(const ILocalizationManager::EPlatformIndependentLanguageID id)
-{
-    return m_availableLocalizations & (1 << id);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::SetAvailableLocalizationsBitfield(const ILocalizationManager::TLocalizationBitfield availableLocalizations)
-{
-    m_availableLocalizations = availableLocalizations;
-}
-
-//////////////////////////////////////////////////////////////////////
-const char* CLocalizedStringsManager::GetLanguage()
-{
-    if (m_pLanguage == 0)
-    {
-        return "";
-    }
-    return m_pLanguage->sLanguage.c_str();
-}
-
-//////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::SetLanguage(const char* sLanguage)
-{
-    if (m_cvarLocalizationDebug >= 2)
-    {
-        CryLog("<Localization> Set language to %s", sLanguage);
-    }
-
-    // Check if already language loaded.
-    for (uint32 i = 0; i < m_languages.size(); i++)
-    {
-        if (_stricmp(sLanguage, m_languages[i]->sLanguage) == 0)
-        {
-            InternalSetCurrentLanguage(m_languages[i]);
-            return true;
-        }
-    }
-
-    SLanguage* pLanguage = new SLanguage;
-    m_languages.push_back(pLanguage);
-
-    if (m_cvarLocalizationDebug >= 2)
-    {
-        CryLog("<Localization> Insert new language to %s", sLanguage);
-    }
-
-    pLanguage->sLanguage = sLanguage;
-    InternalSetCurrentLanguage(pLanguage);
-
-    //-------------------------------------------------------------------------------------------------
-    // input localization
-    //-------------------------------------------------------------------------------------------------
-    // keyboard
-    for (int i = 0; i <= 0x80; i++)
-    {
-        AddControl(i);
-    }
-
-    // mouse
-    for (int i = 1; i <= 0x0f; i++)
-    {
-        AddControl(i * 0x10000);
-    }
-
-    return (true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CLocalizedStringsManager::GetLocalizationFormat() const
-{
-    return m_cvarLocalizationFormat;
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZStd::string CLocalizedStringsManager::GetLocalizedSubtitleFilePath(const AZStd::string& localVideoPath, const AZStd::string& subtitleFileExtension) const
-{
-    AZStd::string sLocalizationFolder(PathUtil::GetLocalizationFolder().c_str());
-    size_t backSlashIdx = sLocalizationFolder.find_first_of("\\", 0);
-    if (backSlashIdx != AZStd::string::npos)
-    {
-        sLocalizationFolder.replace(backSlashIdx, 2, "/");
-    }
-    AZStd::string filePath(m_pLanguage->sLanguage.c_str());
-    filePath = sLocalizationFolder.c_str() + filePath + "/" + localVideoPath;
-    return filePath.substr(0, filePath.find_last_of('.')).append(subtitleFileExtension);
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZStd::string CLocalizedStringsManager::GetLocalizedLocXMLFilePath(const AZStd::string & localXmlPath) const
-{
-    AZStd::string sLocalizationFolder(PathUtil::GetLocalizationFolder().c_str());
-    size_t backSlashIdx = sLocalizationFolder.find_first_of("\\", 0);
-    if (backSlashIdx != AZStd::string::npos)
-    {
-        sLocalizationFolder.replace(backSlashIdx, 2, "/");
-    }
-    const AZStd::string& filePath = AZStd::string::format("%s%s/%s", sLocalizationFolder.c_str(), m_pLanguage->sLanguage.c_str(), localXmlPath.c_str());
-    return filePath.substr(0, filePath.find_last_of('.')).append(".loc.xml");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::AddControl([[maybe_unused]] int nKey)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::ParseFirstLine(IXmlTableReader* pXmlTableReader, char* nCellIndexToType, std::map<int, string>& SoundMoodIndex, std::map<int, string>& EventParameterIndex)
-{
-    string sCellContent;
-
-    for (;; )
-    {
-        int nCellIndex = 0;
-        const char* pContent = 0;
-        size_t contentSize = 0;
-        if (!pXmlTableReader->ReadCell(nCellIndex, pContent, contentSize))
-        {
-            break;
-        }
-
-        if (nCellIndex >= MAX_CELL_COUNT)
-        {
-            break;
-        }
-
-        if (contentSize <= 0)
-        {
-            continue;
-        }
-
-        sCellContent.assign(pContent, contentSize);
-        sCellContent.MakeLower();
-
-        for (int i = 0; i < sizeof(sLocalizedColumnNames) / sizeof(sLocalizedColumnNames[0]); ++i)
-        {
-            const char* pFind = strstr(sCellContent.c_str(), sLocalizedColumnNames[i]);
-            if (pFind != 0)
-            {
-                nCellIndexToType[nCellIndex] = i;
-
-                // find SoundMood
-                if (i == ELOCALIZED_COLUMN_SOUNDMOOD)
-                {
-                    const char* pSoundMoodName = pFind + strlen(sLocalizedColumnNames[i]) + 1;
-                    int nSoundMoodNameLength = sCellContent.length() - strlen(sLocalizedColumnNames[i]) - 1;
-                    if (nSoundMoodNameLength > 0)
-                    {
-                        SoundMoodIndex[nCellIndex] = pSoundMoodName;
-                    }
-                }
-
-                // find EventParameter
-                if (i == ELOCALIZED_COLUMN_EVENTPARAMETER)
-                {
-                    const char* pParameterName = pFind + strlen(sLocalizedColumnNames[i]) + 1;
-                    int nParameterNameLength = sCellContent.length() - strlen(sLocalizedColumnNames[i]) - 1;
-                    if (nParameterNameLength > 0)
-                    {
-                        EventParameterIndex[nCellIndex] = pParameterName;
-                    }
-                }
-
-                break;
-            }
-            // HACK until all columns are renamed to "Translation"
-            //if (_stricmp(sCellContent, "Your Translation") == 0)
-            //{
-            //  nCellIndexToType[nCellIndex] = ELOCALIZED_COLUMN_TRANSLATED_ACTOR_LINE;
-            //  break;
-            //}
-        }
-    }
-}
-
-// copy characters to lower-case 0-terminated buffer
-static void CopyLowercase(char* dst, size_t dstSize, const char* src, size_t srcCount)
-{
-    if (dstSize > 0)
-    {
-        if (srcCount > dstSize - 1)
-        {
-            srcCount = dstSize - 1;
-        }
-        while (srcCount--)
-        {
-            const char c = *src++;
-            *dst++ = (c <= 'Z' && c >= 'A') ? c + ('a' - 'A') : c;
-        }
-        *dst = '\0';
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void ReplaceEndOfLine(CryFixedStringT<CLocalizedStringsManager::LOADING_FIXED_STRING_LENGTH>& s)
-{
-    const string oldSubstr("\\n");
-    const string newSubstr(" \n");
-    size_t pos = 0;
-    for (;; )
-    {
-        pos = s.find(oldSubstr, pos);
-        if (pos == CryFixedStringT<CLocalizedStringsManager::LOADING_FIXED_STRING_LENGTH>::npos)
-        {
-            return;
-        }
-        s.replace(pos, oldSubstr.length(), newSubstr);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CLocalizedStringsManager::OnSystemEvent(
-    ESystemEvent eEvent, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-    // might want to add an event which tells us that we are loading the main menu
-    // so everything can be unloaded and init files reloaded so safe some memory
-    switch (eEvent)
-    {
-    case ESYSTEM_EVENT_LEVEL_LOAD_START:
-    {
-        // This event is here not of interest while we're in the Editor.
-        if (!gEnv->IsEditor())
-        {
-            if (m_cvarLocalizationDebug >= 2)
-            {
-                CryLog("<Localization> Loading Requested Tags");
-            }
-
-            for (TStringVec::iterator it = m_tagLoadRequests.begin(); it != m_tagLoadRequests.end(); ++it)
-            {
-                LoadLocalizationDataByTag(*it);
-            }
-        }
-
-        m_tagLoadRequests.clear();
-        break;
-    }
-    case ESYSTEM_EVENT_EDITOR_ON_INIT:
-    {
-        // Load all tags after the Editor has finished initialization.
-        for (TTagFileNames::iterator it = m_tagFileNames.begin(); it != m_tagFileNames.end(); ++it)
-        {
-            LoadLocalizationDataByTag(it->first);
-        }
-
-        break;
-    }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::InitLocalizationData(
-    const char* sFileName, [[maybe_unused]] bool bReload)
-{
-    XmlNodeRef root = m_pSystem->LoadXmlFromFile(sFileName);
-
-    if (!root)
-    {
-        CryLog("Loading Localization File %s failed!", sFileName);
-        return false;
-    }
-
-    for (int i = 0; i < root->getChildCount(); i++)
-    {
-        XmlNodeRef typeNode = root->getChild(i);
-        string sType = typeNode->getTag();
-
-        // tags should be unique
-        if (m_tagFileNames.find(sType) != m_tagFileNames.end())
-        {
-            continue;
-        }
-
-        TStringVec vEntries;
-        for (int j = 0; j < typeNode->getChildCount(); j++)
-        {
-            XmlNodeRef entry = typeNode->getChild(j);
-            if (!entry->isTag("entry"))
-            {
-                continue;
-            }
-
-            vEntries.push_back(entry->getContent());
-        }
-
-        CRY_ASSERT(m_tagFileNames.size() < 255);
-
-        uint8 curNumTags = m_tagFileNames.size();
-
-        m_tagFileNames[sType].filenames = vEntries;
-        m_tagFileNames[sType].id                = curNumTags + 1;
-        m_tagFileNames[sType].loaded        = false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::RequestLoadLocalizationDataByTag(const char* sTag)
-{
-    TTagFileNames::iterator it = m_tagFileNames.find(sTag);
-    if (it == m_tagFileNames.end())
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] RequestLoadLocalizationDataByTag - Localization tag '%s' not found", sTag);
-        return false;
-    }
-
-    if (m_cvarLocalizationDebug >= 2)
-    {
-        CryLog("<Localization> RequestLoadLocalizationDataByTag %s", sTag);
-    }
-
-    m_tagLoadRequests.push_back(sTag);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::LoadLocalizationDataByTag(
-    const char* sTag, bool bReload)
-{
-    TTagFileNames::iterator it = m_tagFileNames.find(sTag);
-    if (it == m_tagFileNames.end())
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] LoadLocalizationDataByTag - Localization tag '%s' not found", sTag);
-        return false;
-    }
-
-    if (it->second.loaded)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] LoadLocalizationDataByTag - Already loaded tag '%s'", sTag);
-        return true;
-    }
-
-    bool bResult = true;
-
-    stack_string const sLocalizationFolder(PathUtil::GetLocalizationFolder());
-
-    LoadFunc loadFunction = GetLoadFunction();
-    TStringVec& vEntries = it->second.filenames;
-    for (TStringVec::iterator it2 = vEntries.begin(); it2 != vEntries.end(); ++it2)
-    {
-        //Only load files of the correct type for the configured format
-        if ((m_cvarLocalizationFormat == 0 && strstr(*it2, ".xml")) || (m_cvarLocalizationFormat == 1 && strstr(*it2, ".agsxml")))
-        {
-            bResult &= (this->*loadFunction)(*it2, it->second.id, bReload);
-        }
-    }
-
-    if (m_cvarLocalizationDebug >= 2)
-    {
-        CryLog("<Localization> LoadLocalizationDataByTag %s with result %d", sTag, bResult);
-    }
-
-    it->second.loaded = true;
-
-    return bResult;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::ReleaseLocalizationDataByTag(
-    const char* sTag)
-{
-    INDENT_LOG_DURING_SCOPE(true, "Releasing localization data with the tag '%s'", sTag);
-    ListAndClearProblemLabels();
-
-    TTagFileNames::iterator it = m_tagFileNames.find(sTag);
-    if (it == m_tagFileNames.end())
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] ReleaseLocalizationDataByTag - Localization tag '%s' not found", sTag);
-        return false;
-    }
-
-    if (it->second.loaded == false)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] ReleaseLocalizationDataByTag - tag '%s' not loaded", sTag);
-        return false;
-    }
-
-    const uint8 nTagID = it->second.id;
-
-    tmapFilenames newLoadedTables;
-    for (tmapFilenames::iterator iter = m_loadedTables.begin(); iter != m_loadedTables.end(); iter++)
-    {
-        if (iter->second.nTagID != nTagID)
-        {
-            newLoadedTables[iter->first] = iter->second;
-        }
-    }
-    m_loadedTables = newLoadedTables;
-
-    if (m_pLanguage)
-    {
-        //LARGE_INTEGER liStart;
-        //QueryPerformanceCounter(&liStart);
-        AutoLock lock(m_cs);    //Make sure to lock, as this is a modifying operation
-
-        bool bMapEntryErased = false;
-        //First, remove entries from the map
-        for (StringsKeyMap::iterator keyMapIt = m_pLanguage->m_keysMap.begin(); keyMapIt != m_pLanguage->m_keysMap.end(); )
-        {
-            if (keyMapIt->second->nTagID == nTagID)
-            {
-                //VECTORMAP ONLY
-                keyMapIt = m_pLanguage->m_keysMap.erase(keyMapIt);
-                bMapEntryErased = true;
-            }
-            else
-            {
-                keyMapIt++;
-            }
-        }
-
-        if (bMapEntryErased == true)
-        {
-            StringsKeyMap newMap = m_pLanguage->m_keysMap;
-            m_pLanguage->m_keysMap.clearAndFreeMemory();
-            m_pLanguage->m_keysMap = newMap;
-        }
-
-        bool bVecEntryErased = false;
-        //Then remove the entries in the storage vector
-        const uint32 numEntries = m_pLanguage->m_vLocalizedStrings.size();
-        for (int32 i = numEntries - 1; i >= 0; i--)
-        {
-            SLocalizedStringEntry* entry = m_pLanguage->m_vLocalizedStrings[i];
-            PREFAST_ASSUME(entry);
-            if (entry->nTagID == nTagID)
-            {
-                if (m_cvarLocalizationEncode == 1)
-                {
-                    if (entry->huffmanTreeIndex != -1)
-                    {
-                        HuffmanCoder* pCoder = m_pLanguage->m_vEncoders[entry->huffmanTreeIndex];
-                        if (pCoder != NULL)
-                        {
-                            pCoder->DecRef();
-                            if (pCoder->RefCount() == 0)
-                            {
-                                if (m_cvarLocalizationDebug >= 2)
-                                {
-                                    CryLog("<Localization> Releasing coder %u as it no longer has associated strings", entry->huffmanTreeIndex);
-                                }
-                                //This coding table no longer needed, it has no more associated strings
-                                SAFE_DELETE(m_pLanguage->m_vEncoders[entry->huffmanTreeIndex]);
-                            }
-                        }
-                    }
-                }
-                bVecEntryErased = true;
-                delete(entry);
-                m_pLanguage->m_vLocalizedStrings.erase(m_pLanguage->m_vLocalizedStrings.begin() + i);
-            }
-        }
-
-        //Shrink the vector if necessary
-        if (bVecEntryErased == true)
-        {
-            SLanguage::TLocalizedStringEntries newVec = m_pLanguage->m_vLocalizedStrings;
-            m_pLanguage->m_vLocalizedStrings.clear();
-            m_pLanguage->m_vLocalizedStrings = newVec;
-        }
-
-        /*LARGE_INTEGER liEnd, liFreq;
-        QueryPerformanceCounter(&liEnd);
-        QueryPerformanceFrequency(&liFreq);
-
-        CTimeValue lockTime = CTimeValue((liEnd.QuadPart - liStart.QuadPart) * CTimeValue::TIMEVALUE_PRECISION / liFreq.QuadPart);
-        if (m_cvarLocalizationDebug >= 2)
-        {
-            CryLog("<Localization> ReleaseLocalizationDataByTag %s lock time %fMS", sTag, lockTime.GetMilliSeconds());
-        }*/
-    }
-
-    if (m_cvarLocalizationDebug >= 2)
-    {
-        CryLog("<Localization> ReleaseLocalizationDataByTag %s", sTag);
-    }
-
-    it->second.loaded = false;
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::LoadAllLocalizationData(bool bReload)
-{
-    for (TTagFileNames::iterator it = m_tagFileNames.begin(); it != m_tagFileNames.end(); ++it)
-    {
-        if(!LoadLocalizationDataByTag(it->first, bReload))
-            return false;
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::LoadExcelXmlSpreadsheet(const char* sFileName, bool bReload)
-{
-    LoadFunc loadFunction = GetLoadFunction();
-    return (this->*loadFunction)(sFileName, 0, bReload);
-}
-
-//////////////////////////////////////////////////////////////////////
-// Loads a string-table from a Excel XML Spreadsheet file.
-bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName, uint8 nTagID, bool bReload)
-{
-    LOADING_TIME_PROFILE_SECTION_ARGS(sFileName)
-    if (!m_pLanguage)
-    {
-        return false;
-    }
-
-    //check if this table has already been loaded
-    if (!bReload)
-    {
-        if (m_loadedTables.find(CONST_TEMP_STRING(sFileName)) != m_loadedTables.end())
-        {
-            return (true);
-        }
-    }
-
-    ListAndClearProblemLabels();
-
-    IXmlTableReader* const pXmlTableReader = m_pSystem->GetXmlUtils()->CreateXmlTableReader();
-    if (!pXmlTableReader)
-    {
-        CryLog("Loading Localization File %s failed (XML system failure)!", sFileName);
-        return false;
-    }
-
-    XmlNodeRef root;
-    string sPath;
-    {
-        const string sLocalizationFolder(PathUtil::GetLocalizationRoot());
-        const string& languageFolder = m_pLanguage->sLanguage;
-        sPath = sLocalizationFolder.c_str() + languageFolder + PathUtil::GetSlash() + sFileName;
-        root = m_pSystem->LoadXmlFromFile(sPath);
-        if (!root)
-        {
-            CryLog("Loading Localization File %s failed!", sPath.c_str());
-            pXmlTableReader->Release();
-            return false;
-        }
-    }
-
-    // bug search, re-export to a file to compare it
-    //string sReExport = sFileName;
-    //sReExport += ".re";
-    //root->saveToFile(sReExport.c_str());
-
-    CryLog("Loading Localization File %s", sFileName);
-    INDENT_LOG_DURING_SCOPE();
-
-    //Create a huffman coding table for these strings - if they're going to be encoded or compressed
-    HuffmanCoder* pEncoder = NULL;
-    uint8 iEncoder = 0;
-    size_t startOfStringsToCompress = 0;
-    if (m_cvarLocalizationEncode == 1)
-    {
-        {
-            for (iEncoder = 0; iEncoder < m_pLanguage->m_vEncoders.size(); iEncoder++)
-            {
-                if (m_pLanguage->m_vEncoders[iEncoder] == NULL)
-                {
-                    m_pLanguage->m_vEncoders[iEncoder] = pEncoder = new HuffmanCoder();
-                    break;
-                }
-            }
-            if (iEncoder == m_pLanguage->m_vEncoders.size())
-            {
-                pEncoder = new HuffmanCoder();
-                m_pLanguage->m_vEncoders.push_back(pEncoder);
-            }
-            //Make a note of the current end of the loc strings array, as encoding is done in two passes.
-            //One pass to build the code table, another to apply it
-            pEncoder->Init();
-        }
-        startOfStringsToCompress = m_pLanguage->m_vLocalizedStrings.size();
-    }
-
-    {
-        if (!pXmlTableReader->Begin(root))
-        {
-            CryLog("Loading Localization File %s failed! The file is in an unsupported format.", sPath.c_str());
-            pXmlTableReader->Release();
-            return false;
-        }
-    }
-
-    int rowCount = pXmlTableReader->GetEstimatedRowCount();
-    {
-        AutoLock lock(m_cs);    //Make sure to lock, as this is a modifying operation
-        m_pLanguage->m_vLocalizedStrings.reserve(m_pLanguage->m_vLocalizedStrings.size() + rowCount);
-    }
-    {
-        AutoLock lock(m_cs);    //Make sure to lock, as this is a modifying operation
-        //VectorMap only, not applicable to std::map
-        m_pLanguage->m_keysMap.reserve(m_pLanguage->m_keysMap.size() + rowCount);
-    }
-
-    {
-        pairFileName sNewFile;
-        sNewFile.first = sFileName;
-        sNewFile.second.bDataStripping = false; // this is off for now
-        sNewFile.second.nTagID = nTagID;
-        m_loadedTables.insert(sNewFile);
-    }
-
-    // Cell Index
-    char nCellIndexToType[MAX_CELL_COUNT];
-    memset(nCellIndexToType, 0, sizeof(nCellIndexToType));
-
-    // SoundMood Index
-    std::map<int, string> SoundMoodIndex;
-
-    // EventParameter Index
-    std::map<int, string> EventParameterIndex;
-
-    bool bFirstRow = true;
-
-    CryFixedStringT<LOADING_FIXED_STRING_LENGTH> sTmp;
-
-    // lower case event name
-    char szLowerCaseEvent[128];
-    // lower case key
-    char szLowerCaseKey[1024];
-    // key CRC
-    uint32 keyCRC;
-
-    size_t nMemSize = 0;
-
-    for (;; )
-    {
-        int nRowIndex = -1;
-        {
-            if (!pXmlTableReader->ReadRow(nRowIndex))
-            {
-                break;
-            }
-        }
-
-        if (bFirstRow)
-        {
-            bFirstRow = false;
-            ParseFirstLine(pXmlTableReader, nCellIndexToType, SoundMoodIndex, EventParameterIndex);
-            // Skip first row, it contains description only.
-            continue;
-        }
-
-        bool bValidKey = false;
-        bool bValidTranslatedText = false;
-        bool bValidTranslatedCharacterName = false;
-        bool bValidTranslatedActorLine = false;
-        bool bUseSubtitle = true;
-        bool bIsDirectRadio = false;
-        bool bIsIntercepted = false;
-
-        struct CConstCharArray
-        {
-            const char* ptr;
-            size_t count;
-
-            CConstCharArray()
-            {
-                clear();
-            }
-            void clear()
-            {
-                ptr = "";
-                count = 0;
-            }
-            bool empty() const
-            {
-                return count == 0;
-            }
-        };
-
-        CConstCharArray sKeyString;
-        CConstCharArray sCharacterName;
-        CConstCharArray sTranslatedCharacterName; // Legacy, to be removed some day...
-        CConstCharArray sSubtitleText;
-        CConstCharArray sTranslatedText; // Legacy, to be removed some day...
-        CConstCharArray sActorLine;
-        CConstCharArray sTranslatedActorLine; // Legacy, to be removed some day...
-        CConstCharArray sSoundEvent;
-
-        float fVolume = 1.0f;
-        float fRadioRatio = 1.0f;
-        float fEventParameterValue = 0.0f;
-        float fSoundMoodValue = 0.0f;
-
-        int nItems = 0;
-        std::map<int, float> SoundMoodValues;
-        std::map<int, float> EventParameterValues;
-
-        for (;; )
-        {
-            int nCellIndex = -1;
-            CConstCharArray cell;
-
-            {
-                if (!pXmlTableReader->ReadCell(nCellIndex, cell.ptr, cell.count))
-                {
-                    break;
-                }
-            }
-
-            if (nCellIndex >= MAX_CELL_COUNT)
-            {
-                break;
-            }
-
-            // skip empty cells
-            if (cell.count <= 0)
-            {
-                continue;
-            }
-
-            const char nCellType = nCellIndexToType[nCellIndex];
-
-            switch (nCellType)
-            {
-            case ELOCALIZED_COLUMN_SKIP:
-                break;
-            case ELOCALIZED_COLUMN_KEY:
-                sKeyString = cell;
-                bValidKey = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_AUDIOFILE:
-                sKeyString = cell;
-                bValidKey = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_CHARACTER_NAME:
-                sCharacterName = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_SUBTITLE_TEXT:
-                sSubtitleText = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_ACTOR_LINE:
-                sActorLine = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_USE_SUBTITLE:
-                sTmp.assign(cell.ptr, cell.count);
-                bUseSubtitle = CryStringUtils::ToYesNoType(sTmp.c_str()) == CryStringUtils::YesNoType::No ? false : true; // favor yes (yes and invalid -> yes)
-                break;
-            case ELOCALIZED_COLUMN_VOLUME:
-                sTmp.assign(cell.ptr, cell.count);
-                fVolume = (float)atof(sTmp.c_str());
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_SOUNDEVENT:
-                sSoundEvent = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_RADIO_RATIO:
-                sTmp.assign(cell.ptr, cell.count);
-                fRadioRatio = (float)atof(sTmp.c_str());
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_EVENTPARAMETER:
-                sTmp.assign(cell.ptr, cell.count);
-                fEventParameterValue = (float)atof(sTmp.c_str());
-                {
-                    EventParameterValues[nCellIndex] = fEventParameterValue;
-                }
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_SOUNDMOOD:
-                sTmp.assign(cell.ptr, cell.count);
-                fSoundMoodValue = (float)atof(sTmp.c_str());
-                {
-                    SoundMoodValues[nCellIndex] = fSoundMoodValue;
-                }
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_IS_DIRECT_RADIO:
-                sTmp.assign(cell.ptr, cell.count);
-                if (!_stricmp(sTmp.c_str(), "intercept"))
-                {
-                    bIsIntercepted = true;
-                }
-                bIsDirectRadio = bIsIntercepted || (CryStringUtils::ToYesNoType(sTmp.c_str()) == CryStringUtils::YesNoType::Yes ? true : false); // favor no (no and invalid -> no)
-                ++nItems;
-                break;
-            // legacy names
-            case ELOCALIZED_COLUMN_LEGACY_PERSON:
-                // old file often only have content in this column
-                if (!cell.empty())
-                {
-                    sCharacterName = cell;
-                    sTranslatedCharacterName = cell;
-                    bValidTranslatedCharacterName = true;
-                }
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_CHARACTERNAME:
-                sCharacterName = cell;
-                sTranslatedCharacterName = cell;
-                bValidTranslatedCharacterName = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_CHARACTERNAME:
-                sTranslatedCharacterName = cell;
-                bValidTranslatedCharacterName = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_ENGLISH_DIALOGUE:
-                // old file often only have content in this column
-                sActorLine = cell;
-                sSubtitleText = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_TRANSLATION:
-                sTranslatedActorLine = cell;
-                sTranslatedText = cell;
-                bValidTranslatedText = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_YOUR_TRANSLATION:
-                sTranslatedActorLine = cell;
-                sTranslatedText = cell;
-                bValidTranslatedText = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_ENGLISH_SUBTITLE:
-                sSubtitleText = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_SUBTITLE:
-                sTranslatedText = cell;
-                sTranslatedActorLine = cell;
-                bValidTranslatedText = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_ORIGINAL_CHARACTER_NAME:
-                sCharacterName = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_CHARACTER_NAME:
-                sTranslatedCharacterName = cell;
-                bValidTranslatedCharacterName = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_ORIGINAL_TEXT:
-                sSubtitleText = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_TEXT:
-                sTranslatedText = cell;
-                bValidTranslatedText = true;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_ORIGINAL_ACTOR_LINE:
-                sActorLine = cell;
-                ++nItems;
-                break;
-            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_ACTOR_LINE:
-                sTranslatedActorLine = cell;
-                bValidTranslatedActorLine = true;
-                ++nItems;
-                break;
-            }
-        }
-
-        if (!bValidKey)
-        {
-            continue;
-        }
-
-        if (!bValidTranslatedText)
-        {
-            // if this is a dialog entry with a soundevent and with subtitles then a warning should be issued
-            if (m_cvarLocalizationDebug && !sSoundEvent.empty() && bUseSubtitle)
-            {
-                sTmp.assign(sKeyString.ptr, sKeyString.count);
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] Key '%s' in file <%s> has no translated text", sTmp.c_str(), sFileName);
-            }
-
-            // use translated actor line entry if available before falling back to original entry
-            if (!sTranslatedActorLine.empty())
-            {
-                sTranslatedText = sTranslatedActorLine;
-            }
-            else
-            {
-                sTranslatedText = sSubtitleText;
-            }
-        }
-
-        if (!bValidTranslatedActorLine)
-        {
-            // if this is a dialog entry with a soundevent then a warning should be issued
-            if (m_cvarLocalizationDebug && !sSoundEvent.empty())
-            {
-                sTmp.assign(sKeyString.ptr, sKeyString.count);
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] Key '%s' in file <%s> has no translated actor line", sTmp.c_str(), sFileName);
-            }
-
-            // use translated text entry if available before falling back to original entry
-            if (!sTranslatedText.empty())
-            {
-                sTranslatedActorLine = sTranslatedText;
-            }
-            else
-            {
-                sTranslatedActorLine = sSubtitleText;
-            }
-        }
-
-        if (!sSoundEvent.empty() && !bValidTranslatedCharacterName)
-        {
-            if (m_cvarLocalizationDebug)
-            {
-                sTmp.assign(sKeyString.ptr, sKeyString.count);
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] Key '%s' in file <%s> has no translated character name", sTmp.c_str(), sFileName);
-            }
-
-            sTranslatedCharacterName = sCharacterName;
-        }
-
-        if (nItems == 1) // skip lines which contain just one item in the key
-        {
-            continue;
-        }
-
-        // reject to store text if line was marked with no subtitles in game mode
-        if (!gEnv->IsEditor())
-        {
-            if (!bUseSubtitle)
-            {
-                sSubtitleText.clear();
-                sTranslatedText.clear();
-            }
-        }
-
-        // Skip @ character in the key string.
-        if (!sKeyString.empty() && sKeyString.ptr[0] == '@')
-        {
-            sKeyString.ptr++;
-            sKeyString.count--;
-        }
-
-        {
-            CopyLowercase(szLowerCaseEvent, sizeof(szLowerCaseEvent), sSoundEvent.ptr, sSoundEvent.count);
-            CopyLowercase(szLowerCaseKey, sizeof(szLowerCaseKey), sKeyString.ptr, sKeyString.count);
-        }
-
-        //Compute the CRC32 of the key
-        keyCRC = CCrc32::Compute(szLowerCaseKey);
-        if (m_cvarLocalizationDebug >= 3)
-        {
-            CryLogAlways("<Localization dupe/clash detection> CRC32: 0x%8X, Key: %s", keyCRC, szLowerCaseKey);
-        }
-
-        if (m_pLanguage->m_keysMap.find(keyCRC) != m_pLanguage->m_keysMap.end())
-        {
-            sTmp.assign(sKeyString.ptr, sKeyString.count);
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] Localized String '%s' Already Loaded for Language %s OR there is a CRC hash clash", sTmp.c_str(), m_pLanguage->sLanguage.c_str());
-            continue;
-        }
-
-        SLocalizedStringEntry* pEntry = new SLocalizedStringEntry();
-        pEntry->flags = 0;
-
-        if (bUseSubtitle == true)
-        {
-            pEntry->flags |= SLocalizedStringEntry::USE_SUBTITLE;
-        }
-        pEntry->nTagID = nTagID;
-
-        if (gEnv->IsEditor())
-        {
-            pEntry->pEditorExtension = new SLocalizedStringEntryEditorExtension();
-
-            pEntry->pEditorExtension->sKey = szLowerCaseKey;
-
-            pEntry->pEditorExtension->nRow = nRowIndex;
-
-            if (!sActorLine.empty())
-            {
-                sTmp.assign(sActorLine.ptr, sActorLine.count);
-                ReplaceEndOfLine(sTmp);
-                pEntry->pEditorExtension->sOriginalActorLine.assign(sTmp.c_str());
-            }
-            if (!sTranslatedActorLine.empty())
-            {
-                sTmp.assign(sTranslatedActorLine.ptr, sTranslatedActorLine.count);
-                ReplaceEndOfLine(sTmp);
-                pEntry->pEditorExtension->sUtf8TranslatedActorLine.append(sTmp.c_str());
-            }
-            if (bUseSubtitle && !sSubtitleText.empty())
-            {
-                sTmp.assign(sSubtitleText.ptr, sSubtitleText.count);
-                ReplaceEndOfLine(sTmp);
-                pEntry->pEditorExtension->sOriginalText.assign(sTmp.c_str());
-            }
-            // only use the translated character name
-            {
-                pEntry->pEditorExtension->sOriginalCharacterName.assign(sCharacterName.ptr, sCharacterName.count);
-            }
-        }
-
-        if (bUseSubtitle && !sTranslatedText.empty())
-        {
-            sTmp.assign(sTranslatedText.ptr, sTranslatedText.count);
-            ReplaceEndOfLine(sTmp);
-            if (m_cvarLocalizationEncode == 1)
-            {
-                pEncoder->Update((const uint8*)(sTmp.c_str()), sTmp.length());
-                //CryLogAlways("%u Storing %s (%u)", m_pLanguage->m_vLocalizedStrings.size(), sTmp.c_str(), sTmp.length());
-                pEntry->TranslatedText.szCompressed = new uint8[sTmp.length() + 1];
-                pEntry->flags |= SLocalizedStringEntry::IS_COMPRESSED;
-                //Store the raw string. It'll be compressed later
-                memcpy(pEntry->TranslatedText.szCompressed, sTmp.c_str(), sTmp.length());
-                pEntry->TranslatedText.szCompressed[sTmp.length()] = '\0';  //Null terminate
-            }
-            else
-            {
-                pEntry->TranslatedText.psUtf8Uncompressed = new string(sTmp.c_str(), sTmp.c_str() + sTmp.length());
-            }
-        }
-
-        // the following is used to cleverly assign strings
-        // we store all known string into the m_prototypeEvents set and assign known entries from there
-        // the CryString makes sure, that only the ref-count is increment on assignment
-        if (*szLowerCaseEvent)
-        {
-            PrototypeSoundEvents::iterator it = m_prototypeEvents.find(CONST_TEMP_STRING(szLowerCaseEvent));
-            if (it != m_prototypeEvents.end())
-            {
-                pEntry->sPrototypeSoundEvent = *it;
-            }
-            else
-            {
-                pEntry->sPrototypeSoundEvent = szLowerCaseEvent;
-                m_prototypeEvents.insert(pEntry->sPrototypeSoundEvent);
-            }
-        }
-
-        const CConstCharArray sWho = sTranslatedCharacterName.empty() ? sCharacterName : sTranslatedCharacterName;
-        if (!sWho.empty())
-        {
-            sTmp.assign(sWho.ptr, sWho.count);
-            ReplaceEndOfLine(sTmp);
-            sTmp.replace(" ", "_");
-            string tmp;
-            {
-                tmp = sTmp.c_str();
-            }
-            CharacterNameSet::iterator it = m_characterNameSet.find(tmp);
-            if (it != m_characterNameSet.end())
-            {
-                pEntry->sCharacterName = *it;
-            }
-            else
-            {
-                pEntry->sCharacterName = tmp;
-                m_characterNameSet.insert(pEntry->sCharacterName);
-            }
-        }
-
-        pEntry->fVolume = CryConvertFloatToHalf(fVolume);
-
-        // SoundMood Entries
-        {
-            pEntry->SoundMoods.resize(SoundMoodValues.size());
-            if (SoundMoodValues.size() > 0)
-            {
-                std::map<int, float>::const_iterator itEnd = SoundMoodValues.end();
-                int nSoundMoodCount = 0;
-                for (std::map<int, float>::const_iterator it = SoundMoodValues.begin(); it != itEnd; ++it)
-                {
-                    pEntry->SoundMoods[nSoundMoodCount].fValue = (*it).second;
-                    pEntry->SoundMoods[nSoundMoodCount].sName = SoundMoodIndex[(*it).first];
-                    ++nSoundMoodCount;
-                }
-            }
-        }
-
-        // EventParameter Entries
-        {
-            pEntry->EventParameters.resize(EventParameterValues.size());
-            if (EventParameterValues.size() > 0)
-            {
-                std::map<int, float>::const_iterator itEnd = EventParameterValues.end();
-                int nEventParameterCount = 0;
-                for (std::map<int, float>::const_iterator it = EventParameterValues.begin(); it != itEnd; ++it)
-                {
-                    pEntry->EventParameters[nEventParameterCount].fValue = (*it).second;
-                    pEntry->EventParameters[nEventParameterCount].sName = EventParameterIndex[(*it).first];
-                    ++nEventParameterCount;
-                }
-            }
-        }
-
-        pEntry->fRadioRatio = CryConvertFloatToHalf(fRadioRatio);
-
-        if (bIsDirectRadio == true)
-        {
-            pEntry->flags |= SLocalizedStringEntry::IS_DIRECTED_RADIO;
-        }
-        if (bIsIntercepted == true)
-        {
-            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);
-    }
-
-    if (m_cvarLocalizationEncode == 1)
-    {
-        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];
-                if (pStringToCompress->TranslatedText.szCompressed != NULL)
-                {
-                    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();
-
-    return true;
-}
-
-bool CLocalizedStringsManager::DoLoadAGSXmlDocument(const char* sFileName, uint8 nTagID, bool bReload)
-{
-    if (!sFileName)
-    {
-        return false;
-    }
-    if (!m_pLanguage)
-    {
-        return false;
-    }
-    if (!bReload)
-    {
-        if (m_loadedTables.find(CONST_TEMP_STRING(sFileName)) != m_loadedTables.end())
-        {
-            return true;
-        }
-    }
-    ListAndClearProblemLabels();
-    XmlNodeRef root;
-    string sPath;
-    {
-        const string sLocalizationFolder(PathUtil::GetLocalizationRoot());
-        const string& languageFolder = m_pLanguage->sLanguage;
-        sPath = sLocalizationFolder.c_str() + languageFolder + PathUtil::GetSlash() + sFileName;
-        root = m_pSystem->LoadXmlFromFile(sPath);
-        if (!root)
-        {
-            AZ_TracePrintf(LOC_WINDOW, "Loading Localization File %s failed!", sPath.c_str());
-            return false;
-        }
-    }
-    AZ_TracePrintf(LOC_WINDOW, "Loading Localization File %s", sPath.c_str());
-    HuffmanCoder* pEncoder = nullptr;
-    uint8 iEncoder = 0;
-    size_t startOfStringsToCompress = 0;
-    if (m_cvarLocalizationEncode == 1)
-    {
-        {
-            for (iEncoder = 0; iEncoder < m_pLanguage->m_vEncoders.size(); iEncoder++)
-            {
-                if (m_pLanguage->m_vEncoders[iEncoder] == nullptr)
-                {
-                    pEncoder = new HuffmanCoder();
-                    m_pLanguage->m_vEncoders[iEncoder] = pEncoder;
-                    break;
-                }
-            }
-            if (iEncoder == m_pLanguage->m_vEncoders.size())
-            {
-                pEncoder = new HuffmanCoder();
-                m_pLanguage->m_vEncoders.push_back(pEncoder);
-            }
-            pEncoder->Init();
-        }
-        startOfStringsToCompress = m_pLanguage->m_vLocalizedStrings.size();
-    }
-    int rowCount = 0;
-    {
-        AutoLock lock(m_cs);    // Make sure to lock, as this is a modifying operation
-        rowCount = root->getChildCount();
-        {
-            m_pLanguage->m_vLocalizedStrings.reserve(m_pLanguage->m_vLocalizedStrings.size() + rowCount);
-        }
-        m_pLanguage->m_keysMap.reserve(m_pLanguage->m_keysMap.size() + rowCount);
-    }
-    {
-        pairFileName sNewFile;
-        sNewFile.first = sFileName;
-        sNewFile.second.bDataStripping = false; // this is off for now
-        sNewFile.second.nTagID = nTagID;
-        m_loadedTables.insert(sNewFile);
-    }
-    const char* key = nullptr;
-    AZStd::string keyString;
-    AZStd::string lowerKey;
-    AZStd::string textValue;
-    uint32 keyCRC=0;
-    for (int i = 0; i < rowCount; ++i)
-    {
-        XmlNodeRef childNode = root->getChild(i);
-        if (azstricmp(childNode->getTag(), "string") || !childNode->getAttr("key", &key))
-        {
-            continue;
-        }
-        keyString = key;
-        textValue = childNode->getContent();
-        if (textValue.empty())
-        {
-            continue;
-        }
-        AzFramework::StringFunc::Replace(textValue, "\\n", " \n");      // carried over from helper func ReplaceEndOfLine(CryFixedStringT<>& s)
-        if (keyString[0] == '@')
-        {
-            AzFramework::StringFunc::LChop(keyString, 1);
-        }
-        lowerKey = keyString;
-        AZStd::to_lower(lowerKey.begin(), lowerKey.end());
-        keyCRC = CCrc32::Compute(lowerKey.c_str());
-        if (m_cvarLocalizationDebug >= 3)
-        {
-            CryLogAlways("<Localization dupe/clash detection> CRC32: 0%8X, Key: %s", keyCRC, lowerKey.c_str());
-        }
-        if (m_pLanguage->m_keysMap.find(keyCRC) != m_pLanguage->m_keysMap.end())
-        {
-            AZ_Warning(LOC_WINDOW, false, "Localized String '%s' Already Loaded for Language %s OR there is a CRC hash clash", keyString.c_str(), m_pLanguage->sLanguage.c_str());
-            continue;
-        }
-        SLocalizedStringEntry* pEntry = new SLocalizedStringEntry;
-        pEntry->flags = SLocalizedStringEntry::USE_SUBTITLE;
-        pEntry->nTagID = nTagID;
-        if (gEnv->IsEditor())
-        {
-            pEntry->pEditorExtension = new SLocalizedStringEntryEditorExtension();
-            pEntry->pEditorExtension->sKey = lowerKey.c_str();
-            pEntry->pEditorExtension->nRow = i;
-            {
-                pEntry->pEditorExtension->sUtf8TranslatedActorLine.append(textValue.c_str());
-            }
-            {
-                pEntry->pEditorExtension->sOriginalText.assign(textValue.c_str());
-            }
-        }
-        {
-            const char* textString = textValue.c_str();
-            size_t textLength = textValue.length();
-            if (m_cvarLocalizationEncode == 1)
-            {
-                pEncoder->Update((const uint8*)(textString), textLength);
-                pEntry->TranslatedText.szCompressed = new uint8[textLength + 1];
-                pEntry->flags |= SLocalizedStringEntry::IS_COMPRESSED;
-                memcpy(pEntry->TranslatedText.szCompressed, textString, textLength);
-                pEntry->TranslatedText.szCompressed[textLength] = '\0';  //Null terminate
-            }
-            else
-            {
-                pEntry->TranslatedText.psUtf8Uncompressed = new string(textString, textString + textLength);
-            }
-        }
-        {
-            AddLocalizedString(m_pLanguage, pEntry, keyCRC);
-        }
-    }
-    if (m_cvarLocalizationEncode == 1)
-    {
-        {
-            pEncoder->Finalize();
-        }
-        {
-            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];
-                if (pStringToCompress->TranslatedText.szCompressed != nullptr)
-                {
-                    size_t compBufSize = COMPRESSION_FIXED_BUFFER_LENGTH;
-                    memset(compressionBuffer, 0, COMPRESSION_FIXED_BUFFER_LENGTH);
-                    size_t inputStringLength = strnlen((const char*)(pStringToCompress->TranslatedText.szCompressed), COMPRESSION_FIXED_BUFFER_LENGTH);
-                    pEncoder->CompressInput(pStringToCompress->TranslatedText.szCompressed, inputStringLength, compressionBuffer, &compBufSize);
-                    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);
-                    pStringToCompress->TranslatedText.szCompressed = szCompressedString;
-                }
-            }
-        }
-    }
-    return true;
-}
-//////////////////////////////////////////////////////////////////////////
-CLocalizedStringsManager::LoadFunc CLocalizedStringsManager::GetLoadFunction() const
-{
-    CRY_ASSERT_MESSAGE(gEnv && gEnv->pConsole, "System environment or console missing!");
-    if (gEnv && gEnv->pConsole)
-    {
-        if(m_cvarLocalizationFormat == 1)
-        {
-            return &CLocalizedStringsManager::DoLoadAGSXmlDocument;
-        }
-    }
-    return &CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet;
-}
-void CLocalizedStringsManager::ReloadData()
-{
-    tmapFilenames temp = m_loadedTables;
-
-    LoadFunc loadFunction = GetLoadFunction();
-    FreeLocalizationData();
-    for (tmapFilenames::iterator it = temp.begin(); it != temp.end(); it++)
-    {
-        (this->*loadFunction)((*it).first, (*it).second.nTagID, true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::AddLocalizedString(SLanguage* pLanguage, SLocalizedStringEntry* pEntry, const uint32 keyCRC32)
-{
-    pLanguage->m_vLocalizedStrings.push_back(pEntry);
-    int nId = (int)pLanguage->m_vLocalizedStrings.size() - 1;
-    pLanguage->m_keysMap[keyCRC32] = pEntry;
-    
-    if (m_cvarLocalizationDebug >= 2)
-    {
-        CryLog("<Localization> Add new string <%u> with ID %d to <%s>", keyCRC32, nId, pLanguage->sLanguage.c_str());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::LocalizeString_ch(const char* sString, string& outLocalizedString, bool bEnglish)
-{
-    return LocalizeStringInternal(sString, strlen(sString), outLocalizedString, bEnglish);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::LocalizeString_s(const string& sString, string& outLocalizedString, bool bEnglish)
-{
-    return LocalizeStringInternal(sString.c_str(), sString.length(), outLocalizedString, bEnglish);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::LocalizeStringInternal(const char* pStr, size_t len, string& outLocalizedString, bool bEnglish)
-{
-    assert (m_pLanguage);
-    if (m_pLanguage == 0)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "LocalizeString: No language set.");
-        outLocalizedString.assign(pStr, pStr + len);
-        return false;
-    }
-
-    // note: we don't write directly to outLocalizedString, in case it aliases pStr
-    string out;
-
-    // scan the string
-    const char* pPos = pStr;
-    const char* pEnd = pStr + len;
-    while (true)
-    {
-        const char* pLabel = strchr(pPos, '@');
-        if (!pLabel)
-        {
-            break;
-        }
-        // found an occurrence
-
-        // we have skipped a few characters, so copy them over
-        if (pLabel != pPos)
-        {
-            out.append(pPos, pLabel);
-        }
-
-        // Search label for first occurence of any label terminating character
-        const char* pLabelEnd = strpbrk(pLabel, " !\"#$%&\'()*+,./:;<=>\?[\\]^`{|}~\n\t\r");
-        if (!pLabelEnd)
-        {
-            pLabelEnd = pEnd;
-        }
-
-        // localize token
-        string token(pLabel, pLabelEnd);
-        string sLocalizedToken;
-        if (bEnglish)
-        {
-            GetEnglishString(token.c_str(), sLocalizedToken);
-        }
-        else
-        {
-            LocalizeLabel(token.c_str(), sLocalizedToken);
-        }
-        out.append(sLocalizedToken);
-        pPos = pLabelEnd;
-    }
-    out.append(pPos, pEnd);
-    out.swap(outLocalizedString);
-    return true;
-}
-
-void CLocalizedStringsManager::LocalizeAndSubstituteInternal(AZStd::string& locString, const AZStd::vector<AZStd::string>& keys, const AZStd::vector<AZStd::string>& values)
-{
-    string outString;
-    LocalizeString_ch(locString.c_str(), outString);
-    locString = outString .c_str();
-    if (values.size() != keys.size())
-    {
-        AZ_Warning("game", false, "Localization Error: LocalizeAndSubstitute was given %u keys and %u values to replace. These numbers must be equal.", keys.size(), values.size());
-        return;
-    }
-    size_t startIndex = locString.find('{');
-    size_t endIndex = locString.find('}', startIndex);
-    while (startIndex != AZStd::string::npos && endIndex != AZStd::string::npos)
-    {
-        const size_t subLength = endIndex - startIndex - 1;
-        AZStd::string substituteOut = locString.substr(startIndex + 1, subLength).c_str();
-        int index = 0;
-        if (LocalizationHelpers::IsKeyInList(keys, substituteOut, index))
-        {
-            const char* value = values[index].c_str();
-            locString.replace(startIndex, subLength + 2, value);
-            startIndex += strlen(value);
-        }
-        else
-        {
-            AZ_Warning("game", false, "Localization Error: Localized string '%s' contains a key '%s' that is not mapped to a data element.", locString.c_str(), substituteOut.c_str());
-            startIndex += substituteOut.length();
-        }
-        startIndex = locString.find_first_of('{', startIndex);
-        endIndex = locString.find_first_of('}', startIndex); 
-    }
-}
-#if defined(LOG_DECOMP_TIMES)
-static double g_fSecondsPerTick = 0.0;
-static FILE* pDecompLog = NULL;
-// engine independent game timer since gEnv/pSystem isn't available yet
-static void LogDecompTimer(__int64 nTotalTicks, __int64 nDecompTicks, __int64 nAllocTicks)
-{
-    if (g_fSecondsPerTick == 0.0)
-    {
-        __int64 nPerfFreq;
-        QueryPerformanceFrequency((LARGE_INTEGER*)&nPerfFreq);
-        g_fSecondsPerTick = 1.0 / (double)nPerfFreq;
-    }
-
-    if (!pDecompLog)
-    {
-        char szFilenameBuffer[MAX_PATH];
-        time_t rawTime;
-        time(&rawTime);
-        struct tm* pTimeInfo = localtime(&rawTime);
-
-        CreateDirectory("TestResults\\", 0);
-        strftime(szFilenameBuffer, sizeof(szFilenameBuffer), "TestResults\\Decomp_%Y_%m_%d-%H_%M_%S.csv", pTimeInfo);
-        pDecompLog = fopen(szFilenameBuffer, "wb");
-        fprintf(pDecompLog, "Total,Decomp,Alloc\n");
-    }
-    float nTotalMillis = float( g_fSecondsPerTick * 1000.0 * nTotalTicks );
-    float nDecompMillis = float( g_fSecondsPerTick * 1000.0 * nDecompTicks );
-    float nAllocMillis = float( g_fSecondsPerTick * 1000.0 * nAllocTicks );
-    fprintf(pDecompLog, "%f,%f,%f\n", nTotalMillis, nDecompMillis, nAllocMillis);
-    fflush(pDecompLog);
-}
-#endif
-
-string CLocalizedStringsManager::SLocalizedStringEntry::GetTranslatedText(const SLanguage* pLanguage) const
-{
-    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_SYSTEM, g_bProfilerEnabled);
-    if ((flags & IS_COMPRESSED) != 0)
-    {
-#if defined(LOG_DECOMP_TIMES)
-        __int64 nTotalTicks, nDecompTicks, nAllocTicks;
-        nTotalTicks = CryGetTicks();
-#endif  //LOG_DECOMP_TIMES
-
-        string outputString;
-        if (TranslatedText.szCompressed != NULL)
-        {
-            uint8 decompressionBuffer[COMPRESSION_FIXED_BUFFER_LENGTH];
-            HuffmanCoder* pEncoder = pLanguage->m_vEncoders[huffmanTreeIndex];
-
-#if defined(LOG_DECOMP_TIMES)
-            nDecompTicks = CryGetTicks();
-#endif  //LOG_DECOMP_TIMES
-
-            //We don't actually know how much memory was allocated for this string, but the maximum compression buffer size is known
-            size_t decompBufSize = pEncoder->UncompressInput(TranslatedText.szCompressed, COMPRESSION_FIXED_BUFFER_LENGTH, decompressionBuffer, COMPRESSION_FIXED_BUFFER_LENGTH);
-            assert(decompBufSize < COMPRESSION_FIXED_BUFFER_LENGTH && "Buffer overflow");
-
-#if defined(LOG_DECOMP_TIMES)
-            nDecompTicks = CryGetTicks() - nDecompTicks;
-#endif  //LOG_DECOMP_TIMES
-
-#if !defined(NDEBUG)
-            size_t len =
-#endif
-                strnlen((const char*)decompressionBuffer, COMPRESSION_FIXED_BUFFER_LENGTH);
-            assert(len < COMPRESSION_FIXED_BUFFER_LENGTH && "Buffer not null-terminated");
-
-
-#if defined(LOG_DECOMP_TIMES)
-            nAllocTicks = CryGetTicks();
-#endif  //LOG_DECOMP_TIMES
-
-            outputString.assign((const char*)decompressionBuffer, (const char*)decompressionBuffer + decompBufSize);
-
-#if defined(LOG_DECOMP_TIMES)
-            nAllocTicks = CryGetTicks() - nAllocTicks;
-            nTotalTicks = CryGetTicks() - nTotalTicks;
-            LogDecompTimer(nTotalTicks, nDecompTicks, nAllocTicks);
-#endif  //LOG_DECOMP_TIMES
-        }
-        return outputString;
-    }
-    else
-    {
-        if (TranslatedText.psUtf8Uncompressed != NULL)
-        {
-            return *TranslatedText.psUtf8Uncompressed;
-        }
-        else
-        {
-            string emptyOutputString;
-            return emptyOutputString;
-        }
-    }
-}
-
-#ifndef _RELEASE
-//////////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::LocalizedStringsManagerWarning(const char* label, const char* message)
-{
-    if (!m_warnedAboutLabels[label])
-    {
-        CryWarning (VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Failed to localize label '%s' - %s", label, message);
-        m_warnedAboutLabels[label] = true;
-        m_haveWarnedAboutAtLeastOneLabel = true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::ListAndClearProblemLabels()
-{
-    if (m_haveWarnedAboutAtLeastOneLabel)
-    {
-        CryLog ("These labels caused localization problems:");
-        INDENT_LOG_DURING_SCOPE();
-
-        for (std::map<string, bool>::iterator iter = m_warnedAboutLabels.begin(); iter != m_warnedAboutLabels.end(); iter++)
-        {
-            CryLog ("%s", iter->first.c_str());
-        }
-
-        m_warnedAboutLabels.clear();
-        m_haveWarnedAboutAtLeastOneLabel = false;
-    }
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::LocalizeLabel(const char* sLabel, string& outLocalString, bool bEnglish)
-{
-    assert(sLabel);
-    if (!m_pLanguage || !sLabel)
-    {
-        return false;
-    }
-
-    // Label sign.
-    if (sLabel[0] == '@')
-    {
-        uint32 labelCRC32 = CCrc32::ComputeLowercase(sLabel + 1);   // skip @ character.
-        {
-            AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
-            SLocalizedStringEntry* entry = stl::find_in_map(m_pLanguage->m_keysMap, labelCRC32, NULL);
-
-            if (entry != NULL)
-            {
-                
-                string translatedText = entry->GetTranslatedText(m_pLanguage);
-                if ((bEnglish || translatedText.empty()) && entry->pEditorExtension != NULL)
-                {
-                    //assert(!"No Localization Text available!");
-                    outLocalString.assign(entry->pEditorExtension->sOriginalText);
-                    return true;
-                }
-                else
-                {
-                    outLocalString.swap(translatedText);
-                }
-                return true;
-            }
-            else
-            {
-                LocalizedStringsManagerWarning(sLabel, "entry not found in string table");
-            }
-        }
-    }
-    else
-    {
-        LocalizedStringsManagerWarning(sLabel, "must start with @ symbol");
-    }
-
-    outLocalString.assign(sLabel);
-
-    return false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::GetEnglishString(const char* sKey, string& sLocalizedString)
-{
-    assert(sKey);
-    if (!m_pLanguage || !sKey)
-    {
-        return false;
-    }
-
-    // Label sign.
-    if (sKey[0] == '@')
-    {
-        uint32 keyCRC32 = CCrc32::ComputeLowercase(sKey + 1);
-        {
-            AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
-            SLocalizedStringEntry* entry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);   // skip @ character.
-            if (entry != NULL && entry->pEditorExtension != NULL)
-            {
-                sLocalizedString = entry->pEditorExtension->sOriginalText;
-                return true;
-            }
-            else
-            {
-                keyCRC32 = CCrc32::ComputeLowercase(sKey);
-                entry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
-                if (entry != NULL && entry->pEditorExtension != NULL)
-                {
-                    sLocalizedString = entry->pEditorExtension->sOriginalText;
-                    return true;
-                }
-                else
-                {
-                    // CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"Localized string for Label <%s> not found", sKey );
-                    sLocalizedString = sKey;
-                    return false;
-                }
-            }
-        }
-    }
-    else
-    {
-        // CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"Not a valid localized string Label <%s>, must start with @ symbol", sKey );
-    }
-
-    sLocalizedString = sKey;
-    return false;
-}
-
-bool CLocalizedStringsManager::IsLocalizedInfoFound(const char* sKey)
-{
-    if (!m_pLanguage)
-    {
-        return false;
-    }
-    uint32 keyCRC32 = CCrc32::ComputeLowercase(sKey);
-    {
-        AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
-        const SLocalizedStringEntry* entry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
-        return (entry != NULL);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::GetLocalizedInfoByKey(const char* sKey, SLocalizedInfoGame& outGameInfo)
-{
-    if (!m_pLanguage)
-    {
-        return false;
-    }
-
-    uint32 keyCRC32 = CCrc32::ComputeLowercase(sKey);
-    {
-        AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
-        const SLocalizedStringEntry* entry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
-        if (entry != NULL)
-        {
-            outGameInfo.szCharacterName = entry->sCharacterName;
-            outGameInfo.sUtf8TranslatedText = entry->GetTranslatedText(m_pLanguage);
-
-            outGameInfo.bUseSubtitle = (entry->flags & SLocalizedStringEntry::USE_SUBTITLE);
-
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::GetLocalizedInfoByKey(const char* sKey, SLocalizedSoundInfoGame* pOutSoundInfo)
-{
-    assert(sKey);
-    if (!m_pLanguage || !sKey || !pOutSoundInfo)
-    {
-        return false;
-    }
-
-    bool bResult = false;
-
-    uint32 keyCRC32 = CCrc32::ComputeLowercase(sKey);
-    {
-        AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
-        const SLocalizedStringEntry* pEntry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
-        if (pEntry != NULL)
-        {
-            bResult = true;
-
-            pOutSoundInfo->szCharacterName = pEntry->sCharacterName;
-            pOutSoundInfo->sUtf8TranslatedText = pEntry->GetTranslatedText(m_pLanguage);
-
-            //pOutSoundInfo->sOriginalActorLine = pEntry->sOriginalActorLine.c_str();
-            //pOutSoundInfo->sTranslatedActorLine = pEntry->swTranslatedActorLine.c_str();
-            //pOutSoundInfo->sOriginalText = pEntry->sOriginalText;
-            // original Character
-
-            pOutSoundInfo->sSoundEvent = pEntry->sPrototypeSoundEvent.c_str();
-            pOutSoundInfo->fVolume = CryConvertHalfToFloat(pEntry->fVolume);
-            pOutSoundInfo->fRadioRatio = CryConvertHalfToFloat(pEntry->fRadioRatio);
-            pOutSoundInfo->bUseSubtitle = (pEntry->flags & SLocalizedStringEntry::USE_SUBTITLE) != 0;
-            pOutSoundInfo->bIsDirectRadio = (pEntry->flags & SLocalizedStringEntry::IS_DIRECTED_RADIO) != 0;
-            pOutSoundInfo->bIsIntercepted = (pEntry->flags & SLocalizedStringEntry::IS_INTERCEPTED) != 0;
-
-            //SoundMoods
-            if (pOutSoundInfo->nNumSoundMoods >= pEntry->SoundMoods.size())
-            {
-                // enough space to copy data
-                int i = 0;
-                for (; i < pEntry->SoundMoods.size(); ++i)
-                {
-                    pOutSoundInfo->pSoundMoods[i].sName = pEntry->SoundMoods[i].sName;
-                    pOutSoundInfo->pSoundMoods[i].fValue = pEntry->SoundMoods[i].fValue;
-                }
-                // if mode is available fill it with default
-                for (; i < pOutSoundInfo->nNumSoundMoods; ++i)
-                {
-                    pOutSoundInfo->pSoundMoods[i].sName = "";
-                    pOutSoundInfo->pSoundMoods[i].fValue = 0.0f;
-                }
-                pOutSoundInfo->nNumSoundMoods = pEntry->SoundMoods.size();
-            }
-            else
-            {
-                // not enough memory, say what is needed
-                pOutSoundInfo->nNumSoundMoods = pEntry->SoundMoods.size();
-                bResult = (pOutSoundInfo->pSoundMoods == NULL); // only report error if memory was provided but is too small
-            }
-
-            //EventParameters
-            if (pOutSoundInfo->nNumEventParameters >= pEntry->EventParameters.size())
-            {
-                // enough space to copy data
-                int i = 0;
-                for (; i < pEntry->EventParameters.size(); ++i)
-                {
-                    pOutSoundInfo->pEventParameters[i].sName = pEntry->EventParameters[i].sName;
-                    pOutSoundInfo->pEventParameters[i].fValue = pEntry->EventParameters[i].fValue;
-                }
-                // if mode is available fill it with default
-                for (; i < pOutSoundInfo->nNumEventParameters; ++i)
-                {
-                    pOutSoundInfo->pEventParameters[i].sName = "";
-                    pOutSoundInfo->pEventParameters[i].fValue = 0.0f;
-                }
-                pOutSoundInfo->nNumEventParameters = pEntry->EventParameters.size();
-            }
-            else
-            {
-                // not enough memory, say what is needed
-                pOutSoundInfo->nNumEventParameters = pEntry->EventParameters.size();
-                bResult = (pOutSoundInfo->pSoundMoods == NULL); // only report error if memory was provided but is too small
-            }
-        }
-    }
-
-    return bResult;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CLocalizedStringsManager::GetLocalizedStringCount()
-{
-    if (!m_pLanguage)
-    {
-        return 0;
-    }
-    return m_pLanguage->m_vLocalizedStrings.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoGame& outGameInfo)
-{
-    if (!m_pLanguage)
-    {
-        return false;
-    }
-    const std::vector<SLocalizedStringEntry*>& entryVec = m_pLanguage->m_vLocalizedStrings;
-    if (nIndex < 0 || nIndex >= (int)entryVec.size())
-    {
-        return false;
-    }
-    const SLocalizedStringEntry* pEntry = entryVec[nIndex];
-
-    outGameInfo.szCharacterName = pEntry->sCharacterName;
-    outGameInfo.sUtf8TranslatedText = pEntry->GetTranslatedText(m_pLanguage);
-
-    outGameInfo.bUseSubtitle = (pEntry->flags & SLocalizedStringEntry::USE_SUBTITLE);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoEditor& outEditorInfo)
-{
-    if (!m_pLanguage)
-    {
-        return false;
-    }
-    const std::vector<SLocalizedStringEntry*>& entryVec = m_pLanguage->m_vLocalizedStrings;
-    if (nIndex < 0 || nIndex >= (int)entryVec.size())
-    {
-        return false;
-    }
-    const SLocalizedStringEntry* pEntry = entryVec[nIndex];
-    outEditorInfo.szCharacterName = pEntry->sCharacterName;
-    outEditorInfo.sUtf8TranslatedText = pEntry->GetTranslatedText(m_pLanguage);
-
-    assert(pEntry->pEditorExtension != NULL);
-
-    outEditorInfo.sKey = pEntry->pEditorExtension->sKey;
-
-    outEditorInfo.sOriginalActorLine = pEntry->pEditorExtension->sOriginalActorLine;
-    outEditorInfo.sUtf8TranslatedActorLine = pEntry->pEditorExtension->sUtf8TranslatedActorLine;
-
-    //outEditorInfo.sOriginalText = pEntry->sOriginalText;
-    outEditorInfo.sOriginalCharacterName = pEntry->pEditorExtension->sOriginalCharacterName;
-
-    outEditorInfo.nRow = pEntry->pEditorExtension->nRow;
-    outEditorInfo.bUseSubtitle = (pEntry->flags & SLocalizedStringEntry::USE_SUBTITLE);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLocalizedStringsManager::GetSubtitle(const char* sKeyOrLabel, string& outSubtitle, bool bForceSubtitle)
-{
-    assert(sKeyOrLabel);
-    if (!m_pLanguage || !sKeyOrLabel || !*sKeyOrLabel)
-    {
-        return false;
-    }
-    if (*sKeyOrLabel == '@')
-    {
-        ++sKeyOrLabel;
-    }
-
-    uint32 keyCRC32 = CCrc32::ComputeLowercase(sKeyOrLabel);
-    {
-        AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
-        const SLocalizedStringEntry* pEntry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
-        if (pEntry != NULL)
-        {
-            if ((pEntry->flags & SLocalizedStringEntry::USE_SUBTITLE) == false && !bForceSubtitle)
-            {
-                return false;
-            }
-
-            // TODO verify that no fallback is needed
-
-            outSubtitle = pEntry->GetTranslatedText(m_pLanguage);
-
-            if (outSubtitle.empty() == true)
-            {
-                if (pEntry->pEditorExtension != NULL && pEntry->pEditorExtension->sUtf8TranslatedActorLine.empty() == false)
-                {
-                    outSubtitle = pEntry->pEditorExtension->sUtf8TranslatedActorLine;
-                }
-                else if (pEntry->pEditorExtension != NULL && pEntry->pEditorExtension->sOriginalText.empty() == false)
-                {
-                    outSubtitle = pEntry->pEditorExtension->sOriginalText;
-                }
-                else if (pEntry->pEditorExtension != NULL && pEntry->pEditorExtension->sOriginalActorLine.empty() == false)
-                {
-                    outSubtitle = pEntry->pEditorExtension->sOriginalActorLine;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-}
-
-template<typename StringClass, typename CharType>
-void InternalFormatStringMessage(StringClass& outString, const StringClass& sString, const CharType** sParams, int nParams)
-{
-    static const CharType token = (CharType) '%';
-    static const CharType tokens1[2] = { token, (CharType) '\0' };
-    static const CharType tokens2[3] = { token, token, (CharType) '\0' };
-
-    int maxArgUsed = 0;
-    int lastPos = 0;
-    int curPos = 0;
-    const int sourceLen = sString.length();
-    while (true)
-    {
-        int foundPos = sString.find(token, curPos);
-        if (foundPos != string::npos)
-        {
-            if (foundPos + 1 < sourceLen)
-            {
-                const int nArg = sString[foundPos + 1] - '1';
-                if (nArg >= 0 && nArg <= 9)
-                {
-                    if (nArg < nParams)
-                    {
-                        outString.append(sString, lastPos, foundPos - lastPos);
-                        outString.append(sParams[nArg]);
-                        curPos = foundPos + 2;
-                        lastPos = curPos;
-                        maxArgUsed = std::max(maxArgUsed, nArg);
-                    }
-                    else
-                    {
-                        StringClass tmp (sString);
-                        tmp.replace(tokens1, tokens2);
-                        if constexpr (sizeof(*tmp.c_str()) == sizeof(char))
-                        {
-                            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Parameter for argument %d is missing. [%s]", nArg + 1, (const char*)tmp.c_str());
-                        }
-                        else
-                        {
-                            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Parameter for argument %d is missing. [%S]", nArg + 1, (const wchar_t*)tmp.c_str());
-                        }
-                        curPos = foundPos + 1;
-                    }
-                }
-                else
-                {
-                    curPos = foundPos + 1;
-                }
-            }
-            else
-            {
-                curPos = foundPos + 1;
-            }
-        }
-        else
-        {
-            outString.append(sString, lastPos, sourceLen - lastPos);
-            break;
-        }
-    }
-}
-
-template<typename StringClass, typename CharType>
-void InternalFormatStringMessage(StringClass& outString, const StringClass& sString, const CharType* param1, const CharType* param2 = 0, const CharType* param3 = 0, const CharType* param4 = 0)
-{
-    static const int MAX_PARAMS = 4;
-    const CharType* params[MAX_PARAMS] = { param1, param2, param3, param4 };
-    int nParams = 0;
-    while (nParams < MAX_PARAMS && params[nParams])
-    {
-        ++nParams;
-    }
-    InternalFormatStringMessage(outString, sString, params, nParams);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::FormatStringMessage_List(string& outString, const string& sString, const char** sParams, int nParams)
-{
-    InternalFormatStringMessage(outString, sString, sParams, nParams);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLocalizedStringsManager::FormatStringMessage(string& outString, const string& sString, const char* param1, const char* param2, const char* param3, const char* param4)
-{
-    InternalFormatStringMessage(outString, sString, param1, param2, param3, param4);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CLocalizedStringsManager::GetMemoryUsage(ICrySizer* pSizer)
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_languages);
-    pSizer->AddObject(m_prototypeEvents);
-    pSizer->AddObject(m_characterNameSet);
-    pSizer->AddObject(m_pLanguage);
-
-    return 0;
-}
-
-#if defined (WIN32) || defined(WIN64)
-namespace
-{
-    struct LanguageID
-    {
-        const char*   language;
-        unsigned long lcID;
-    };
-
-    LanguageID languageIDArray[] =
-    {
-        { "en-US", 0x0409 },  // English (USA)
-        { "en-GB", 0x0809 },  // English (UK)
-        { "de-DE", 0x0407 },  // German
-        { "ru-RU", 0x0419 },  // Russian (Russia)
-        { "pl-PL", 0x0415 },  // Polish
-        { "tr-TR", 0x041f },  // Turkish
-        { "es-ES", 0x0c0a },  // Spanish (Spain)
-        { "es-MX", 0x080a },  // Spanish (Mexico)
-        { "fr-FR", 0x040c },  // French (France)
-        { "fr-CA", 0x0c0c },  // French (Canada)
-        { "it-IT", 0x0410 },  // Italian
-        { "pt-PT", 0x0816 },  // Portugese (Portugal)
-        { "pt-BR", 0x0416 },  // Portugese (Brazil)
-        { "ja-JP", 0x0411 },  // Japanese
-        { "ko-KR", 0x0412 },  // Korean
-        { "zh-CHT", 0x0804 }, // Traditional Chinese
-        { "zh-CHS", 0x0804 }, // Simplified Chinese
-        { "nl-NL", 0x0413 },  // Dutch (The Netherlands)
-        { "fi-FI", 0x040b },  // Finnish
-        { "sv-SE", 0x041d },  // Swedish
-        { "cs-CZ", 0x0405 },  // Czech 
-        { "no-NO", 0x0414 },  // Norwegian (Norway)
-        { "ar-SA", 0x0401 },  // Arabic (Saudi Arabia)
-        { "da-DK", 0x0406 },  // Danish (Denmark)
-    };
-
-    const size_t numLanguagesIDs = sizeof(languageIDArray) / sizeof(languageIDArray[0]);
-
-    LanguageID GetLanguageID(const char* language)
-    {
-        // default is English (US)
-        const LanguageID defaultLanguage = { "en-US", 0x0409 };
-        for (int i = 0; i < numLanguagesIDs; ++i)
-        {
-            if (_stricmp(language, languageIDArray[i].language) == 0)
-            {
-                return languageIDArray[i];
-            }
-        }
-        return defaultLanguage;
-    }
-
-    LanguageID g_currentLanguageID = { 0, 0 };
-};
-#endif
-
-void CLocalizedStringsManager::InternalSetCurrentLanguage(CLocalizedStringsManager::SLanguage* pLanguage)
-{
-    m_pLanguage = pLanguage;
-#if defined (WIN32) || defined(WIN64)
-    if (m_pLanguage != 0)
-    {
-        g_currentLanguageID = GetLanguageID(m_pLanguage->sLanguage);
-    }
-    else
-    {
-        g_currentLanguageID.language = 0;
-        g_currentLanguageID.lcID = 0;
-    }
-#endif
-    // TODO: on Linux based systems we should now set the locale
-    // Enabling this on windows something seems to get corrupted...
-    // on Windows we always use Windows Platform Functions, which use the lcid
-#if 0
-    if (g_currentLanguageID.language)
-    {
-        const char* currentLocale = setlocale(LC_ALL, 0);
-        if (0 == setlocale(LC_ALL, g_currentLanguageID.language))
-        {
-            setlocale(LC_ALL, currentLocale);
-        }
-    }
-    else
-    {
-        setlocale(LC_ALL, "C");
-    }
-#endif
-    ReloadData();
-    if (gEnv->pCryFont)
-    {
-        gEnv->pCryFont->OnLanguageChanged();
-    }
-}
-
-void CLocalizedStringsManager::LocalizeDuration(int seconds, string& outDurationString)
-{
-    int s = seconds;
-    int d, h, m;
-    d  = s / 86400;
-    s -= d * 86400;
-    h = s / 3600;
-    s -= h * 3600;
-    m = s / 60;
-    s = s - m * 60;
-    string str;
-    if (d > 1)
-    {
-        str.Format("%d @ui_days %02d:%02d:%02d", d, h, m, s);
-    }
-    else if (d > 0)
-    {
-        str.Format("%d @ui_day %02d:%02d:%02d", d, h, m, s);
-    }
-    else if (h > 0)
-    {
-        str.Format("%02d:%02d:%02d", h, m, s);
-    }
-    else
-    {
-        str.Format("%02d:%02d", m, s);
-    }
-    LocalizeString_s(str, outDurationString);
-}
-
-void CLocalizedStringsManager::LocalizeNumber(int number, string& outNumberString)
-{
-    if (number == 0)
-    {
-        outNumberString.assign("0");
-        return;
-    }
-
-    outNumberString.assign("");
-
-    int n = abs(number);
-    string separator;
-    CryFixedStringT<64> tmp;
-    LocalizeString_ch("@ui_thousand_separator", separator);
-    while (n > 0)
-    {
-        int a = n / 1000;
-        int b = n - (a * 1000);
-        if (a > 0)
-        {
-            tmp.Format("%s%03d%s", separator.c_str(), b, tmp.c_str());
-        }
-        else
-        {
-            tmp.Format("%d%s", b, tmp.c_str());
-        }
-        n = a;
-    }
-
-    if (number < 0)
-    {
-        tmp.Format("-%s", tmp.c_str());
-    }
-
-    outNumberString.assign(tmp.c_str());
-}
-
-void CLocalizedStringsManager::LocalizeNumber_Decimal(float number, int decimals, string& outNumberString)
-{
-    if (number == 0.0f)
-    {
-        CryFixedStringT<64> tmp;
-        tmp.Format("%.*f", decimals, number);
-        outNumberString.assign(tmp.c_str());
-        return;
-    }
-
-    outNumberString.assign("");
-
-    string commaSeparator;
-    LocalizeString_ch("@ui_decimal_separator", commaSeparator);
-    float f = number > 0.0f ? number : -number;
-    int d = (int)f;
-
-    string intPart;
-    LocalizeNumber(d, intPart);
-
-    float decimalsOnly = f - (float)d;
-
-    int decimalsAsInt = aznumeric_cast<int>(int_round(decimalsOnly * pow(10.0f, decimals)));
-
-    CryFixedStringT<64> tmp;
-    tmp.Format("%s%s%0*d", intPart.c_str(), commaSeparator.c_str(), decimals, decimalsAsInt);
-
-    outNumberString.assign(tmp.c_str());
-}
-
-bool CLocalizedStringsManager::ProjectUsesLocalization() const
-{
-    ICVar* pCVar = gEnv->pConsole->GetCVar("sys_localization_folder");
-    CRY_ASSERT_MESSAGE(pCVar,
-        "Console variable 'sys_localization_folder' not defined! "
-        "This was previously defined at startup in CSystem::CreateSystemVars.");
-
-    // If game.cfg didn't provide a sys_localization_folder, we'll assume that
-    // the project doesn't want to use localization features.
-    return (pCVar->GetFlags() & VF_WASINCONFIG) != 0;
-}
-
-#if defined (WIN32) || defined(WIN64)
-namespace
-{
-    void UnixTimeToFileTime(time_t unixtime, FILETIME* filetime)
-    {
-        LONGLONG longlong = Int32x32To64(unixtime, 10000000) + 116444736000000000;
-        filetime->dwLowDateTime = (DWORD) longlong;
-        filetime->dwHighDateTime = (DWORD)(longlong >> 32);
-    }
-
-    void UnixTimeToSystemTime(time_t unixtime, SYSTEMTIME* systemtime)
-    {
-        FILETIME filetime;
-        UnixTimeToFileTime(unixtime, &filetime);
-        FileTimeToSystemTime(&filetime, systemtime);
-    }
-
-    time_t UnixTimeFromFileTime(const FILETIME* filetime)
-    {
-        LONGLONG longlong = filetime->dwHighDateTime;
-        longlong <<= 32;
-        longlong |= filetime->dwLowDateTime;
-        longlong -= 116444736000000000;
-        return longlong / 10000000;
-    }
-
-    time_t UnixTimeFromSystemTime(const SYSTEMTIME* systemtime)
-    {
-        // convert systemtime to filetime
-        FILETIME filetime;
-        SystemTimeToFileTime(systemtime, &filetime);
-        // convert filetime to unixtime
-        time_t unixtime = UnixTimeFromFileTime(&filetime);
-        return unixtime;
-    }
-};
-
-void CLocalizedStringsManager::LocalizeTime(time_t t, bool bMakeLocalTime, bool bShowSeconds, string& outTimeString)
-{
-    if (bMakeLocalTime)
-    {
-        struct tm thetime;
-        localtime_s(&thetime, &t);
-        t = gEnv->pTimer->DateToSecondsUTC(thetime);
-    }
-    outTimeString.resize(0);
-    LCID lcID = g_currentLanguageID.lcID ? g_currentLanguageID.lcID : LOCALE_USER_DEFAULT;
-    DWORD flags = bShowSeconds == false ? TIME_NOSECONDS : 0;
-    SYSTEMTIME systemTime;
-    UnixTimeToSystemTime(t, &systemTime);
-    int len = ::GetTimeFormatW(lcID, flags, &systemTime, 0, 0, 0);
-    if (len > 0)
-    {
-        // len includes terminating null!
-        CryFixedWStringT<256> tmpString;
-        tmpString.resize(len);
-        ::GetTimeFormatW(lcID, flags, &systemTime, 0, (wchar_t*) tmpString.c_str(), len);
-        Unicode::Convert(outTimeString, tmpString);
-    }
-}
-
-void CLocalizedStringsManager::LocalizeDate(time_t t, bool bMakeLocalTime, bool bShort, bool bIncludeWeekday, string& outDateString)
-{
-    if (bMakeLocalTime)
-    {
-        struct tm thetime;
-        localtime_s(&thetime, &t);
-        t = gEnv->pTimer->DateToSecondsUTC(thetime);
-    }
-    outDateString.resize(0);
-    LCID lcID = g_currentLanguageID.lcID ? g_currentLanguageID.lcID : LOCALE_USER_DEFAULT;
-    SYSTEMTIME systemTime;
-    UnixTimeToSystemTime(t, &systemTime);
-
-    // len includes terminating null!
-    CryFixedWStringT<256> tmpString;
-
-    if (bIncludeWeekday)
-    {
-        // Get name of day
-        int len = ::GetDateFormatW(lcID, 0, &systemTime, L"ddd", 0, 0);
-        if (len > 0)
-        {
-            // len includes terminating null!
-            tmpString.resize(len);
-            ::GetDateFormatW(lcID, 0, &systemTime, L"ddd", (wchar_t*) tmpString.c_str(), len);
-            string utf8;
-            Unicode::Convert(utf8, tmpString);
-            outDateString.append(utf8);
-            outDateString.append(" ");
-        }
-    }
-    DWORD flags = bShort ? DATE_SHORTDATE : DATE_LONGDATE;
-    int len = ::GetDateFormatW(lcID, flags, &systemTime, 0, 0, 0);
-    if (len > 0)
-    {
-        // len includes terminating null!
-        tmpString.resize(len);
-        ::GetDateFormatW(lcID, flags, &systemTime, 0, (wchar_t*) tmpString.c_str(), len);
-        string utf8;
-        Unicode::Convert(utf8, tmpString);
-        outDateString.append(utf8);
-    }
-}
-
-#else // #if defined (WIN32) || defined(WIN64)
-
-void CLocalizedStringsManager::LocalizeTime(time_t t, bool bMakeLocalTime, bool bShowSeconds, string& outTimeString)
-{
-    struct tm theTime;
-    if (bMakeLocalTime)
-    {
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-        localtime_s(&theTime, &t);
-#else
-        theTime = *localtime(&t);
-#endif
-    }
-    else
-    {
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-        gmtime_s(&theTime, &t);
-#else
-        theTime = *gmtime(&t);
-#endif
-    }
-
-    wchar_t buf[256];
-    const size_t bufSize = sizeof(buf) / sizeof(buf[0]);
-    wcsftime(buf, bufSize, bShowSeconds ? L"%#X" : L"%X", &theTime);
-    buf[bufSize - 1] = 0;
-    Unicode::Convert(outTimeString, buf);
-}
-
-void CLocalizedStringsManager::LocalizeDate(time_t t, bool bMakeLocalTime, bool bShort, bool bIncludeWeekday, string& outDateString)
-{
-    struct tm theTime;
-    if (bMakeLocalTime)
-    {
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-        localtime_s(&theTime, &t);
-#else
-        theTime = *localtime(&t);
-#endif
-    }
-    else
-    {
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-        gmtime_s(&theTime, &t);
-#else
-        theTime = *gmtime(&t);
-#endif
-    }
-
-    wchar_t buf[256];
-    const size_t bufSize = sizeof(buf) / sizeof(buf[0]);
-    const wchar_t* format = bShort ? (bIncludeWeekday ? L"%a %x" : L"%x") : L"%#x"; // long format always contains Weekday name
-    wcsftime(buf, bufSize, format, &theTime);
-    buf[bufSize - 1] = 0;
-    Unicode::Convert(outDateString, buf);
-}
-
-
-
-#endif
-
-
diff --git a/Code/CryEngine/CrySystem/LocalizedStringManager.h b/Code/CryEngine/CrySystem/LocalizedStringManager.h
deleted file mode 100644
index 5b747e1721..0000000000
--- a/Code/CryEngine/CrySystem/LocalizedStringManager.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <ILocalizationManager.h>
-#include <StlUtils.h>
-#include <VectorMap.h>
-#include <AzCore/std/containers/map.h>
-
-#include "Huffman.h"
-
-//////////////////////////////////////////////////////////////////////////
-/*
-    Manage Localization Data
-*/
-class CLocalizedStringsManager
-    : public ILocalizationManager
-    , public ISystemEventListener
-{
-public:
-    typedef std::vector<string> TLocalizationTagVec;
-
-    constexpr const static size_t LOADING_FIXED_STRING_LENGTH = 2048;
-    constexpr const static size_t COMPRESSION_FIXED_BUFFER_LENGTH = 6144;
-
-    CLocalizedStringsManager(ISystem* pSystem);
-    virtual ~CLocalizedStringsManager();
-
-    // ILocalizationManager
-    const char* LangNameFromPILID(const ILocalizationManager::EPlatformIndependentLanguageID id);
-    ILocalizationManager::EPlatformIndependentLanguageID PILIDFromLangName(AZStd::string langName) override;
-    ILocalizationManager::EPlatformIndependentLanguageID GetSystemLanguage() override;
-    ILocalizationManager::TLocalizationBitfield MaskSystemLanguagesFromSupportedLocalizations(const ILocalizationManager::TLocalizationBitfield systemLanguages);
-    ILocalizationManager::TLocalizationBitfield IsLanguageSupported(const ILocalizationManager::EPlatformIndependentLanguageID id);
-
-    const char* GetLanguage() override;
-    bool SetLanguage(const char* sLanguage) override;
-
-    int GetLocalizationFormat() const override;
-    virtual AZStd::string GetLocalizedSubtitleFilePath(const AZStd::string& localVideoPath, const AZStd::string& subtitleFileExtension) const override;
-    virtual AZStd::string GetLocalizedLocXMLFilePath(const AZStd::string& localXmlPath) const override;
-    bool InitLocalizationData(const char* sFileName, bool bReload = false);
-    bool RequestLoadLocalizationDataByTag(const char* sTag);
-    bool LoadLocalizationDataByTag(const char* sTag, bool bReload = false);
-    bool ReleaseLocalizationDataByTag(const char* sTag);
-
-    bool LoadAllLocalizationData(bool bReload = false) override;
-    bool LoadExcelXmlSpreadsheet(const char* sFileName, bool bReload = false) override;
-    void ReloadData() override;
-    void FreeData();
-
-    bool LocalizeString_s(const string& sString, string& outLocalizedString, bool bEnglish = false) override;
-    bool LocalizeString_ch(const char* sString, string& outLocalizedString, bool bEnglish = false) override;
-
-    void LocalizeAndSubstituteInternal(AZStd::string& locString, const AZStd::vector<AZStd::string>& keys, const AZStd::vector<AZStd::string>& values) override;
-    bool LocalizeLabel(const char* sLabel, string& outLocalizedString, bool bEnglish = false) override;
-    bool IsLocalizedInfoFound(const char* sKey);
-    bool GetLocalizedInfoByKey(const char* sKey, SLocalizedInfoGame& outGameInfo);
-    bool GetLocalizedInfoByKey(const char* sKey, SLocalizedSoundInfoGame* pOutSoundInfoGame);
-    int  GetLocalizedStringCount();
-    bool GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoGame& outGameInfo);
-    bool GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoEditor& outEditorInfo);
-
-    bool GetEnglishString(const char* sKey, string& sLocalizedString) override;
-    bool GetSubtitle(const char* sKeyOrLabel, string& outSubtitle, bool bForceSubtitle = false) override;
-
-    void FormatStringMessage_List(string& outString, const string& sString, const char** sParams, int nParams) override;
-    void FormatStringMessage(string& outString, const string& sString, const char* param1, const char* param2 = 0, const char* param3 = 0, const char* param4 = 0) override;
-
-    void LocalizeTime(time_t t, bool bMakeLocalTime, bool bShowSeconds, string& outTimeString) override;
-    void LocalizeDate(time_t t, bool bMakeLocalTime, bool bShort, bool bIncludeWeekday, string& outDateString) override;
-    void LocalizeDuration(int seconds, string& outDurationString) override;
-    void LocalizeNumber(int number, string& outNumberString) override;
-    void LocalizeNumber_Decimal(float number, int decimals, string& outNumberString) override;
-
-    bool ProjectUsesLocalization() const override;
-    // ~ILocalizationManager
-
-    // ISystemEventManager
-    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
-    // ~ISystemEventManager
-
-    int GetMemoryUsage(ICrySizer* pSizer);
-
-    void GetLoadedTags(TLocalizationTagVec& tagVec);
-    void FreeLocalizationData();
-
-private:
-    void SetAvailableLocalizationsBitfield(const ILocalizationManager::TLocalizationBitfield availableLocalizations);
-
-    bool LocalizeStringInternal(const char* pStr, size_t len, string& outLocalizedString, bool bEnglish);
-
-    bool DoLoadExcelXmlSpreadsheet(const char* sFileName, uint8 tagID, bool bReload);
-    typedef bool(CLocalizedStringsManager::*LoadFunc)(const char*, uint8, bool);
-    bool DoLoadAGSXmlDocument(const char* sFileName, uint8 tagID, bool bReload);
-    LoadFunc GetLoadFunction() const;
-
-    struct SLocalizedStringEntryEditorExtension
-    {
-        string  sKey;                                           // Map key text equivalent (without @)
-        string  sOriginalActorLine;             // english text
-        string  sUtf8TranslatedActorLine;       // localized text
-        string  sOriginalText;                      // subtitle. if empty, uses English text
-        string  sOriginalCharacterName;     // english character name speaking via XML asset
-
-        unsigned int nRow;                              // Number of row in XML file
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(this, sizeof(*this));
-
-            pSizer->AddObject(sKey);
-            pSizer->AddObject(sOriginalActorLine);
-            pSizer->AddObject(sUtf8TranslatedActorLine);
-            pSizer->AddObject(sOriginalText);
-            pSizer->AddObject(sOriginalCharacterName);
-        }
-    };
-
-    struct SLanguage;
-
-    //#define LOG_DECOMP_TIMES              //If defined, will log decompression times to a file
-
-    struct SLocalizedStringEntry
-    {
-        //Flags
-        enum
-        {
-            USE_SUBTITLE        = BIT(0),       //should a subtitle displayed for this key?
-            IS_DIRECTED_RADIO   = BIT(1), //should the radio receiving hud be displayed?
-            IS_INTERCEPTED      = BIT(2), //should the radio receiving hud show the interception display?
-            IS_COMPRESSED           = BIT(3),   //Translated text is compressed
-        };
-
-        union trans_text
-        {
-            string*     psUtf8Uncompressed;
-            uint8*      szCompressed;       // Note that no size information is stored. This is for struct size optimization and unfortunately renders the size info inaccurate.
-        };
-
-        string sCharacterName;  // character name speaking via XML asset
-        trans_text TranslatedText;  // Subtitle of this line
-
-        // audio specific part
-        string      sPrototypeSoundEvent;           // associated sound event prototype (radio, ...)
-        CryHalf     fVolume;
-        CryHalf     fRadioRatio;
-        // SoundMoods
-        DynArray<SLocalizedAdvancesSoundEntry> SoundMoods;
-        // EventParameters
-        DynArray<SLocalizedAdvancesSoundEntry> EventParameters;
-        // ~audio specific part
-
-        // subtitle & radio flags
-        uint8       flags;
-
-        // Index of Huffman tree for translated text. -1 = no tree assigned (error)
-        int8        huffmanTreeIndex;
-
-        uint8       nTagID;
-
-        // bool    bDependentTranslation; // if the english/localized text contains other localization labels
-
-        //Additional information for Sandbox. Null in game
-        SLocalizedStringEntryEditorExtension* pEditorExtension;
-
-        SLocalizedStringEntry()
-            : flags(0)
-            , huffmanTreeIndex(-1)
-            , pEditorExtension(NULL)
-        {
-            TranslatedText.psUtf8Uncompressed = NULL;
-        };
-        ~SLocalizedStringEntry()
-        {
-            SAFE_DELETE(pEditorExtension);
-            if ((flags & IS_COMPRESSED) == 0)
-            {
-                SAFE_DELETE(TranslatedText.psUtf8Uncompressed);
-            }
-            else
-            {
-                SAFE_DELETE_ARRAY(TranslatedText.szCompressed);
-            }
-        };
-
-        string GetTranslatedText(const SLanguage* pLanguage) const;
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(this, sizeof(*this));
-
-            pSizer->AddObject(sCharacterName);
-
-            if ((flags & IS_COMPRESSED) == 0 && TranslatedText.psUtf8Uncompressed != NULL)   //Number of bytes stored for compressed text is unknown, which throws this GetMemoryUsage off
-            {
-                pSizer->AddObject(*TranslatedText.psUtf8Uncompressed);
-            }
-
-            pSizer->AddObject(sPrototypeSoundEvent);
-
-            pSizer->AddObject(SoundMoods);
-            pSizer->AddObject(EventParameters);
-
-            if (pEditorExtension != NULL)
-            {
-                pEditorExtension->GetMemoryUsage(pSizer);
-            }
-        }
-    };
-
-    //Keys as CRC32. Strings previously, but these proved too large
-    typedef VectorMap<uint32, SLocalizedStringEntry*>   StringsKeyMap;
-
-    struct SLanguage
-    {
-        typedef std::vector<SLocalizedStringEntry*> TLocalizedStringEntries;
-        typedef std::vector<HuffmanCoder*> THuffmanCoders;
-
-        string sLanguage;
-        StringsKeyMap m_keysMap;
-        TLocalizedStringEntries m_vLocalizedStrings;
-        THuffmanCoders m_vEncoders;
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(this, sizeof(*this));
-            pSizer->AddObject(sLanguage);
-            pSizer->AddObject(m_vLocalizedStrings);
-            pSizer->AddObject(m_keysMap);
-            pSizer->AddObject(m_vEncoders);
-        }
-    };
-
-    struct SFileInfo
-    {
-        bool    bDataStripping;
-        uint8 nTagID;
-    };
-
-#ifndef _RELEASE
-    std::map<string, bool> m_warnedAboutLabels;
-    bool m_haveWarnedAboutAtLeastOneLabel;
-
-    void LocalizedStringsManagerWarning(const char* label, const char* message);
-    void ListAndClearProblemLabels();
-#else
-    inline void LocalizedStringsManagerWarning(...) {};
-    inline void ListAndClearProblemLabels() {};
-#endif
-
-    void AddLocalizedString(SLanguage* pLanguage, SLocalizedStringEntry* pEntry, const uint32 keyCRC32);
-    void AddControl(int nKey);
-    //////////////////////////////////////////////////////////////////////////
-    void ParseFirstLine(IXmlTableReader* pXmlTableReader, char* nCellIndexToType, std::map<int, string>& SoundMoodIndex, std::map<int, string>& EventParameterIndex);
-    void InternalSetCurrentLanguage(SLanguage* pLanguage);
-    ISystem* m_pSystem;
-    // Pointer to the current language.
-    SLanguage* m_pLanguage;
-
-    // all loaded Localization Files
-    typedef std::pair<string, SFileInfo> pairFileName;
-    typedef std::map<string, SFileInfo> tmapFilenames;
-    tmapFilenames m_loadedTables;
-
-
-    // filenames per tag
-    typedef std::vector<string> TStringVec;
-    struct STag
-    {
-        TStringVec  filenames;
-        uint8               id;
-        bool                loaded;
-    };
-    typedef std::map<string, STag> TTagFileNames;
-    TTagFileNames m_tagFileNames;
-    TStringVec m_tagLoadRequests;
-
-    // Array of loaded languages.
-    std::vector<SLanguage*> m_languages;
-
-    typedef std::set<string> PrototypeSoundEvents;
-    PrototypeSoundEvents m_prototypeEvents;  // this set is purely used for clever string/string assigning to save memory
-
-    struct less_strcmp
-    {
-        bool operator()(const string& left, const string& right) const
-        {
-            return strcmp(left.c_str(), right.c_str()) < 0;
-        }
-    };
-
-    typedef std::set<string, less_strcmp> CharacterNameSet;
-    CharacterNameSet m_characterNameSet; // this set is purely used for clever string/string assigning to save memory
-
-    // CVARs
-    int m_cvarLocalizationDebug;
-    int m_cvarLocalizationEncode;   //Encode/Compress translated text to save memory
-    int m_cvarLocalizationFormat;
-
-    //The localizations that are available for this SKU. Used for determining what to show on a language select screen or whether to show one at all
-    TLocalizationBitfield m_availableLocalizations;
-
-    //Lock for
-    mutable CryCriticalSection m_cs;
-    typedef CryAutoCriticalSection AutoLock;
-};
-
-
diff --git a/Code/CryEngine/CrySystem/Log.cpp b/Code/CryEngine/CrySystem/Log.cpp
deleted file mode 100644
index b3230f9f5f..0000000000
--- a/Code/CryEngine/CrySystem/Log.cpp
+++ /dev/null
@@ -1,1546 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Log related functions
-
-
-#include "CrySystem_precompiled.h"
-#include "Log.h"
-
-//this should not be included here
-#include <IConsole.h>
-#include <ISystem.h>
-#include "System.h"
-#include "CryPath.h"                    // PathUtil::ReplaceExtension()
-#include "UnicodeFunctions.h"
-
-#include <AzFramework/IO/FileOperations.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzCore/IO/Path/Path.h>
-
-#ifdef WIN32
-#include <time.h>
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#include <syslog.h>
-#endif
-
-
-// Only accept logging from the main thread.
-#ifdef WIN32
-
-#define THREAD_SAFE_LOG
-//#define THREAD_SAFE_LOG  CryAutoCriticalSection scope_lock(m_logCriticalSection);
-
-#else
-#define THREAD_SAFE_LOG
-#endif //WIN32
-
-#define LOG_BACKUP_PATH "@log@/LogBackups"
-
-#if defined(IOS)
-#include <AzFramework/Utils/SystemUtilsApple.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////
-namespace LogCVars
-{
-    float s_log_tick = 0;
-    int max_backup_directory_size_mb = 200; //200MB default
-};
-
-#ifndef _RELEASE
-static CLog::LogStringType indentString ("    ");
-#endif
-
-//////////////////////////////////////////////////////////////////////
-CLog::CLog(ISystem* pSystem)
-{
-    memset(m_szFilename, 0, MAX_FILENAME_SIZE);
-    memset(m_sBackupFilename, 0, MAX_FILENAME_SIZE);
-    //memset(m_szTemp,0,MAX_TEMP_LENGTH_SIZE);
-    m_pSystem = pSystem;
-    m_pLogVerbosity = 0;
-    m_pLogWriteToFile = 0;
-    m_pLogWriteToFileVerbosity = 0;
-    m_pLogVerbosityOverridesWriteToFile = 0;
-    m_pLogIncludeTime = 0;
-    m_pLogSpamDelay = 0;
-    m_pLogModule = 0;
-    m_fLastLoadingUpdateTime = -1.f;    // for streaming engine update
-    m_backupLogs = true;
-
-#if defined(SUPPORT_LOG_IDENTER)
-    m_indentation = 0;
-    BuildIndentString();
-    m_topIndenter = NULL;
-#endif
-
-    m_nMainThreadId = CryGetCurrentThreadId();
-
-#if defined(KEEP_LOG_FILE_OPEN)
-    m_bFirstLine = true;
-#endif
-
-    m_iLastHistoryItem = 0;
-    memset(m_history, 0, sizeof(m_history));
-
-    CheckAndPruneBackupLogs();
-
-}
-
-void CLog::RegisterConsoleVariables()
-{
-    IConsole* console = m_pSystem->GetIConsole();
-
-#ifdef  _RELEASE
-    #if defined(RELEASE_LOGGING)
-        #define DEFAULT_VERBOSITY 0
-    #else
-        #define DEFAULT_VERBOSITY -1
-    #endif
-#else
-    #define DEFAULT_VERBOSITY 3
-#endif
-
-    if (console)
-    {
-        m_pLogVerbosity = REGISTER_INT("log_Verbosity", DEFAULT_VERBOSITY, VF_DUMPTODISK,
-                "defines the verbosity level for log messages written to console\n"
-                "-1=suppress all logs (including eAlways)\n"
-                "0=suppress all logs(except eAlways)\n"
-                "1=additional errors\n"
-                "2=additional warnings\n"
-                "3=additional messages\n"
-                "4=additional comments");
-
-        //writing to game.log during game play causes stalls on consoles
-        m_pLogWriteToFile = REGISTER_INT("log_WriteToFile", 1, VF_DUMPTODISK, "toggle whether to write log to file (game.log)");
-
-        m_pLogWriteToFileVerbosity = REGISTER_INT("log_WriteToFileVerbosity", DEFAULT_VERBOSITY, VF_DUMPTODISK,
-                "defines the verbosity level for log messages written to files\n"
-                "-1=suppress all logs (including eAlways)\n"
-                "0=suppress all logs(except eAlways)\n"
-                "1=additional errors\n"
-                "2=additional warnings\n"
-                "3=additional messages\n"
-                "4=additional comments");
-        m_pLogVerbosityOverridesWriteToFile = REGISTER_INT("log_VerbosityOverridesWriteToFile", 1, VF_DUMPTODISK, "when enabled, setting log_verbosity to 0 will stop all logging including writing to file");
-
-        // put time into begin of the string if requested by cvar
-        m_pLogIncludeTime = REGISTER_INT("log_IncludeTime", 0, 0,
-                "Toggles time stamping of log entries.\n"
-                "Usage: log_IncludeTime [0/1/2/3/4/5]\n"
-                "  0=off (default)\n"
-                "  1=current time\n"
-                "  2=relative time\n"
-                "  3=current+relative time\n"
-                "  4=absolute time in seconds since this mode was started\n"
-                "  5=current time+server time"
-                "  6=current date+current time");
-
-        m_pLogSpamDelay = REGISTER_FLOAT("log_SpamDelay", 0.0f, 0, "Sets the minimum time interval between messages classified as spam");
-
-        m_pLogModule = REGISTER_STRING("log_Module", "", VF_NULL, "Only show warnings from specified module");
-
-        REGISTER_CVAR2("log_tick", &LogCVars::s_log_tick, LogCVars::s_log_tick, 0, "When not 0, writes tick log entry into the log file, every N seconds");
-
-        REGISTER_CVAR2("max_log_backup_mb", &LogCVars::max_backup_directory_size_mb, LogCVars::max_backup_directory_size_mb, 0, "Maximum size of backup logs to keep on disk (in MB)");
-
-#if defined(KEEP_LOG_FILE_OPEN)
-        REGISTER_COMMAND("log_flush", &LogFlushFile, 0, "Flush the log file");
-#endif
-    }
-    #undef DEFAULT_VERBOSITY
-}
-
-//////////////////////////////////////////////////////////////////////
-CLog::~CLog()
-{
-#if defined(SUPPORT_LOG_IDENTER)
-    while (m_topIndenter)
-    {
-        m_topIndenter->Enable(false);
-    }
-
-    assert (m_indentation == 0);
-#endif
-
-    CreateBackupFile();
-
-    UnregisterConsoleVariables();
-
-    CloseLogFile();
-}
-
-void CLog::UnregisterConsoleVariables()
-{
-    m_pLogVerbosity = 0;
-    m_pLogWriteToFile = 0;
-    m_pLogWriteToFileVerbosity = 0;
-    m_pLogVerbosityOverridesWriteToFile = 0;
-    m_pLogIncludeTime = 0;
-    m_pLogSpamDelay = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::CloseLogFile()
-{
-    m_logFileHandle.Close();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLog::OpenLogFile(const char* filename, int mode)
-{
-    if (m_logFileHandle.IsOpen())
-    {
-        // Can only AZ_Assert if a file is open, otherwise the AZ_Assert
-        // would eventually lead to OpenLogFile being opened up again
-        AZ_Assert(false, "Attempt to open log file when one is already open.  This would lead to a handle leak.");
-        return false;
-    }
-    
-    if (filename == nullptr || filename[0] == '\0')
-    {
-        return false;
-    }
-
-    // it is assumed that @log@ points at the appropriate place (so for apple, to the user profile dir)
-    AZ::IO::FileIOBase* fileSystem = AZ::IO::FileIOBase::GetDirectInstance();
-    if (AZ::IO::FixedMaxPath logFilePath; fileSystem->ReplaceAlias(logFilePath, filename))
-    {
-        logFilePath = logFilePath.LexicallyNormal();
-        m_logFileHandle.Open(logFilePath.c_str(), mode);
-    }
-
-    if (m_logFileHandle.IsOpen())
-    {
-#if defined(KEEP_LOG_FILE_OPEN)
-        m_bFirstLine = true;
-#endif
-    }
-    else
-    {
-#if defined(LINUX) || defined(APPLE)
-        syslog(LOG_NOTICE, "Failed to open log file [%s], mode [%d]", filename, mode);
-#endif
-    }
-
-    return m_logFileHandle.IsOpen();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::SetVerbosity(int verbosity)
-{
-    if (m_pLogVerbosity)
-    {
-        m_pLogVerbosity->Set(verbosity);
-    }
-}
-
-bool CLog::CheckLogFormatter(const char* formatter)
-{
-    if (!formatter)
-    {
-        AZ_Assert(false, "code problem - A message was sent to the log system with nullptr as the formatting string.");
-        return false;
-    }
-
-    if (formatter[0] == 0)
-    {
-        // if there's nothing to log, we don't log anything.  Blank lines at least contain a carriage return or something.
-        return false;
-    }
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-#if !defined(EXCLUDE_NORMAL_LOG)
-void CLog::LogWarning(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    va_list ArgList;
-    char        szBuffer[MAX_WARNING_LENGTH];
-    va_start(ArgList, szFormat);
-    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, szFormat, ArgList);
-    szBuffer[sizeof(szBuffer) - 1] = '\0';
-    va_end(ArgList);
-
-    va_start(ArgList, szFormat);
-    LogV(eWarning, szFormat, ArgList);
-    va_end(ArgList);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::LogError(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    va_list ArgList;
-    char        szBuffer[MAX_WARNING_LENGTH];
-    va_start(ArgList, szFormat);
-    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, szFormat, ArgList);
-    szBuffer[sizeof(szBuffer) - 1] = '\0';
-    va_end(ArgList);
-
-    va_start(ArgList, szFormat);
-    LogV(eError, szFormat, ArgList);
-    va_end(ArgList);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::Log(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    va_list arg;
-    va_start(arg, szFormat);
-    LogV (eMessage, szFormat, arg);
-    va_end(arg);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::LogAlways(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-   
-    va_list arg;
-    va_start(arg, szFormat);
-    LogV (eAlways, szFormat, arg);
-    va_end(arg);
-}
-#endif // !defined(EXCLUDE_NORMAL_LOG)
-
-int MatchStrings(const char* str0, const char* str1)
-{
-    const char* str[] = { str0, str1 };
-    int i, bSkipWord, bAlpha[2], bWS[2], bStop = 0, nDiffs = 0, nWordDiffs, len = 0;
-    do
-    {
-        for (i = 0; i < 2; i++) // skip the spaces, stop at 0
-        {
-            while (*str[i] == ' ')
-            {
-                if (!*str[i]++)
-                {
-                    goto break2;
-                }
-            }
-        }
-        bWS[0] = bWS[1] = nWordDiffs = bSkipWord = 0;
-        do
-        {
-            for (i = bAlpha[0] = bAlpha[1] = 0; i < 2; i++)
-            {
-                if (!bWS[i])
-                {
-                    do
-                    {
-                        int chr = *str[i]++;
-                        bSkipWord |= iszero(chr - '\\') | iszero(chr - '/') | iszero(chr - '_'); // ignore different words with \,_,/
-                        bAlpha[i] = inrange(chr, 'A' - 1, 'Z' + 1) | inrange(chr, 'a' - 1, 'z' + 1);
-                        bWS[i] = iszero(chr - ' ');
-                        bStop |= iszero(chr);
-                    } while (!(bAlpha[i] | bWS[i] | bStop)); // wait for a letter or a space in each input string
-                }
-            }
-            len += bAlpha[0] & bAlpha[1];
-            nWordDiffs += 1 - iszero((int)(*str[0] - *str[1])) & - (bAlpha[0] & bAlpha[1]);   // count diffs in this word
-        } while ((1 - bWS[0] | 1 - bWS[1]) & 1 - bStop); // wait for space (word end) in both strings
-        nDiffs += nWordDiffs & ~-bSkipWord;
-    } while (!bStop);
-break2:
-    return nDiffs * 10 < len;
-}
-
-//will log the text both to file and console
-//////////////////////////////////////////////////////////////////////
-void CLog::LogV(const ELogType type, const char* szFormat, va_list args)
-{
-    // this is here in case someone called LogV directly, with an invalid formatter.
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    LogV(type, 0, szFormat, args);
-}
-
-void CLog::LogV(const ELogType type, [[maybe_unused]]int flags, const char* szFormat, va_list args)
-{
-    // this is here in case someone called LogV directly, with an invalid formatter.
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-
-    }
-    if (!szFormat)
-    {
-        return;
-    }
-
-    if (m_pLogVerbosityOverridesWriteToFile && m_pLogVerbosityOverridesWriteToFile->GetIVal())
-    {
-        if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
-        {
-            return;
-        }
-    }
-
-    FUNCTION_PROFILER(GetISystem(), PROFILE_SYSTEM);
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    bool bfile = false, bconsole = false;
-    const char* szCommand = szFormat;
-
-    uint8 DefaultVerbosity = 0;   // 0 == Always log (except for special -1 verbosity overrides)
-
-    switch (type)
-    {
-    case eAlways:
-        DefaultVerbosity = 0;
-        break;
-    case eWarningAlways:
-        DefaultVerbosity = 0;
-        break;
-    case eErrorAlways:
-        DefaultVerbosity = 0;
-        break;
-    case eInput:
-        DefaultVerbosity = 0;
-        break;
-    case eInputResponse:
-        DefaultVerbosity = 0;
-        break;
-    case eError:
-        DefaultVerbosity = 1;
-        break;
-    case eWarning:
-        DefaultVerbosity = 2;
-        break;
-    case eMessage:
-        DefaultVerbosity = 3;
-        break;
-    case eComment:
-        DefaultVerbosity = 4;
-        break;
-
-    default:
-        assert(0);
-    }
-
-    szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole, DefaultVerbosity);
-    if (!bfile && !bconsole)
-    {
-        return;
-    }
-
-    LogStringType tempString;
-
-    char szBuffer[MAX_WARNING_LENGTH + 32];
-    char* szString = szBuffer;
-    char* szAfterColour = szString;
-    size_t prefixSize = 0;
-    switch (type)
-    {
-    case eWarning:
-    case eWarningAlways:
-        cry_strcpy(szString, MAX_WARNING_LENGTH, "$6[Warning] ");
-        szString += 12;     // strlen("$6[Warning] ");
-        szAfterColour += 2;
-        prefixSize = 12;
-        break;
-
-    case eError:
-    case eErrorAlways:
-        cry_strcpy(szString, MAX_WARNING_LENGTH, "$4[Error] ");
-        szString += 10;     // strlen("$4[Error] ");
-        szAfterColour += 2;
-        prefixSize = 10;
-        break;
-
-    default:
-        break;
-    }
-
-    int bufferlen = sizeof(szBuffer) - prefixSize;
-    if (bufferlen > 0)
-    {
-#if defined(AZ_RESTRICTED_PLATFORM)
-#include AZ_RESTRICTED_FILE(Log_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-        int count = vsnprintf_s(szString, bufferlen, bufferlen - 1, szCommand, args);
-#endif
-        if (count == -1 || count >= bufferlen)
-        {
-            szBuffer[sizeof(szBuffer) - 1] = '\0';
-        }
-    }
-
-    if (type == eWarningAlways || type == eWarning || type == eError || type == eErrorAlways)
-    {
-        const char* sAssetScope = GetAssetScopeString();
-        if (*sAssetScope)
-        {
-            stack_string s = szBuffer;
-            s += "\t<Scope> ";
-            s += sAssetScope;
-            cry_strcpy(szBuffer, s.c_str());
-        }
-    }
-
-    float dt;
-    const char* szSpamCheck = *szFormat == '%' ? szString : szFormat;
-    if (m_pLogSpamDelay && (dt = m_pLogSpamDelay->GetFVal()) > 0.0f && type != eAlways && type != eInputResponse)
-    {
-        const int sz = sizeof(m_history) / sizeof(m_history[0]);
-        int i, j;
-        float time = m_pSystem->GetITimer()->GetCurrTime();
-        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)
-            {
-                continue;
-            }
-            if (m_history[i].ptr == szSpamCheck && *(int*)m_history[i].str == *(int*)szFormat || MatchStrings(m_history[i].str, szSpamCheck))
-            {
-                return;
-            }
-        }
-        i = m_iLastHistoryItem = m_iLastHistoryItem + 1 & sz - 1;
-        cry_strcpy(m_history[i].str, m_history[i].ptr = szSpamCheck);
-        m_history[i].type = type;
-        m_history[i].time = time;
-    }
-
-    LogString(szAfterColour, type);
-    if (bfile)
-    {
-        LogStringToFile(szAfterColour, type, false, MessageQueueState::NotQueued);
-    }
-    if (bconsole)
-    {
-        LogStringToConsole(szBuffer, ELogType::eAlways, false);
-    }
-
-    switch (type)
-    {
-    case eAlways:
-    case eInput:
-    case eInputResponse:
-    case eComment:
-    case eMessage:
-        GetISystem()->GetIRemoteConsole()->AddLogMessage(szString);
-        break;
-    case eWarning:
-    case eWarningAlways:
-        GetISystem()->GetIRemoteConsole()->AddLogWarning(szString);
-        break;
-    case eError:
-    case eErrorAlways:
-        GetISystem()->GetIRemoteConsole()->AddLogError(szString);
-        break;
-    }
-}
-
-//will log the text both to the end of file and console
-//////////////////////////////////////////////////////////////////////
-#if !defined(EXCLUDE_NORMAL_LOG)
-void CLog::LogPlus(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
-    {
-        return;
-    }
-
-    if (m_pLogSpamDelay && m_pLogSpamDelay->GetFVal())
-    { // Vlad: SpamDelay does not work correctly with LogPlus
-        return;
-    }
-
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    if (!szFormat)
-    {
-        return;
-    }
-
-    bool bfile = false, bconsole = false;
-    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
-    if (!bfile && !bconsole)
-    {
-        return;
-    }
-
-    va_list     arglist;
-
-    char szTemp[MAX_TEMP_LENGTH_SIZE];
-    va_start(arglist, szFormat);
-    vsnprintf_s(szTemp, sizeof(szTemp), sizeof(szTemp) - 1, szCommand, arglist);
-    szTemp[sizeof(szTemp) - 1] = 0;
-    va_end(arglist);
-
-    if (bfile)
-    {
-        LogToFilePlus(szTemp);
-    }
-    if (bconsole)
-    {
-        LogToConsolePlus(szTemp);
-    }
-}
-
-//log to console only
-//////////////////////////////////////////////////////////////////////
-void CLog::LogStringToConsole(const char* szString, ELogType logType, bool bAdd)
-{
-    #if defined(_RELEASE) && defined(EXCLUDE_NORMAL_LOG) // no console logging in release
-    return;
-    #endif
-
-
-    if (LogToMainThread(szString, logType, bAdd, SLogMsg::Destination::Console))
-    {
-        return;
-    }
-
-    if (!szString)
-    {
-        return;
-    }
-
-    if (!m_pSystem)
-    {
-        return;
-    }
-    IConsole* console = m_pSystem->GetIConsole();
-    if (!console)
-    {
-        return;
-    }
-
-
-    LogStringType tempString;
-    tempString = szString;
-    if (tempString.length() > MAX_TEMP_LENGTH_SIZE)
-    {
-        tempString.erase(MAX_TEMP_LENGTH_SIZE);
-    }
-    // add \n at end.
-    if (tempString.length() > 0 && tempString[tempString.length() - 1] != '\n')
-    {
-        tempString += '\n';
-    }
-
-    if (bAdd)
-    {
-        console->PrintLinePlus(tempString.c_str());
-    }
-    else
-    {
-        console->PrintLine(tempString.c_str());
-    }
-
-    // Call callback function.
-    if (!m_callbacks.empty())
-    {
-        for (Callbacks::iterator it = m_callbacks.begin(); it != m_callbacks.end(); ++it)
-        {
-            (*it)->OnWriteToConsole(tempString.c_str(), !bAdd);
-        }
-    }
-}
-
-//log to console only
-//////////////////////////////////////////////////////////////////////
-void CLog::LogToConsole(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
-    {
-        return;
-    }
-
-    if (!szFormat)
-    {
-        return;
-    }
-
-    bool bfile = false, bconsole = false;
-    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
-    if (!bconsole)
-    {
-        return;
-    }
-
-    va_list     arglist;
-
-    char szBuffer[MAX_WARNING_LENGTH];
-    va_start(arglist, szFormat);
-    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, szCommand, arglist);
-    szBuffer[sizeof(szBuffer) - 1] = 0;
-    va_end(arglist);
-
-    LogStringToConsole(szBuffer, ELogType::eAlways, false);
-}
-
-//////////////////////////////////////////////////////////////////////
-void CLog::LogToConsolePlus(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
-    {
-        return;
-    }
-
-    if (!szFormat)
-    {
-        return;
-    }
-
-    bool bfile = false, bconsole = false;
-    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
-    if (!bconsole)
-    {
-        return;
-    }
-
-    va_list     arglist;
-
-    char szTemp[MAX_TEMP_LENGTH_SIZE];
-    va_start(arglist, szFormat);
-    vsnprintf_s(szTemp, sizeof(szTemp), sizeof(szTemp) - 1, szCommand, arglist);
-    szTemp[sizeof(szTemp) - 1] = 0;
-    va_end(arglist);
-
-    if (!m_pSystem)
-    {
-        return;
-    }
-
-    LogStringToConsole(szTemp, ELogType::eAlways, true);
-}
-#endif // !defined(EXCLUDE_NORMAL_LOG)
-
-
-
-//////////////////////////////////////////////////////////////////////
-static void RemoveColorCodeInPlace(CLog::LogStringType& rStr)
-{
-    char* s = (char*)rStr.c_str();
-    char* d = s;
-
-    while (*s != 0)
-    {
-        if (*s == '$' && *(s + 1) >= '0' && *(s + 1) <= '9')
-        {
-            s += 2;
-            continue;
-        }
-
-        *d++ = *s++;
-    }
-    *d = 0;
-
-    rStr.resize(d - rStr.c_str());
-}
-
-#if defined(SUPPORT_LOG_IDENTER)
-//////////////////////////////////////////////////////////////////////
-void CLog::BuildIndentString()
-{
-    m_indentWithString = "";
-
-    for (uint8 i = 0; i < m_indentation; ++i)
-    {
-        m_indentWithString = indentString + m_indentWithString;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-void CLog::Indent(CLogIndenter* indenter)
-{
-    indenter->SetNextIndenter(m_topIndenter);
-    m_topIndenter = indenter;
-    ++m_indentation;
-    BuildIndentString();
-}
-
-//////////////////////////////////////////////////////////////////////
-void CLog::Unindent(CLogIndenter* indenter)
-{
-    assert (indenter == m_topIndenter);
-    assert (m_indentation);
-    m_topIndenter = m_topIndenter->GetNextIndenter();
-    --m_indentation;
-    BuildIndentString();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::PushAssetScopeName(const char* sAssetType, const char* sName)
-{
-    assert(sAssetType);
-    assert(sName);
-
-    SAssetScopeInfo as;
-    as.sType = sAssetType;
-    as.sName = sName;
-    CryAutoCriticalSection scope_lock(m_assetScopeQueueLock);
-    m_assetScopeQueue.push_back(as);
-}
-
-void CLog::PopAssetScopeName()
-{
-    CryAutoCriticalSection scope_lock(m_assetScopeQueueLock);
-    assert(!m_assetScopeQueue.empty());
-    if (!m_assetScopeQueue.empty())
-    {
-        m_assetScopeQueue.pop_back();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CLog::GetAssetScopeString()
-{
-    CryAutoCriticalSection scope_lock(m_assetScopeQueueLock);
-
-    m_assetScopeString.clear();
-    for (size_t i = 0; i < m_assetScopeQueue.size(); i++)
-    {
-        m_assetScopeString += "[";
-        m_assetScopeString += m_assetScopeQueue[i].sType;
-        m_assetScopeString += "]";
-        m_assetScopeString += m_assetScopeQueue[i].sName;
-        if (i <  m_assetScopeQueue.size() - 1)
-        {
-            m_assetScopeString += " > ";
-        }
-    }
-    return m_assetScopeString.c_str();
-};
-#endif
-
-bool CLog::LogToMainThread(const char* szString, ELogType logType, bool bAdd, SLogMsg::Destination destination)
-{
-    if (CryGetCurrentThreadId() != m_nMainThreadId)
-    {
-        // When logging from other thread then main, push all log strings to queue.
-        SLogMsg msg;
-        cry_strcpy(msg.msg, szString);
-        msg.bAdd = bAdd;
-        msg.destination = destination;
-        msg.logType = logType;
-        m_threadSafeMsgQueue.push(msg);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////
-#if !defined(EXCLUDE_NORMAL_LOG)
-void CLog::LogStringToFile(const char* szString, ELogType logType, bool bAdd, [[maybe_unused]] MessageQueueState queueState)
-{
-#if defined(_RELEASE) && defined(EXCLUDE_NORMAL_LOG) // no file logging in release
-    return;
-#endif
-
-    if (!szString)
-    {
-        return;
-    }
-
-    if (!m_pSystem)
-    {
-        return;
-    }
-
-    LogStringType tempString;
-    tempString = szString;
-
-    // this is a temp timeStr, it is reused in many branches(moved here to reduce stack usage)
-    LogStringType timeStr;
-
-    // Skip any non character.
-    if (tempString.length() > 0 && tempString.at(0) < 32)
-    {
-        tempString.erase(0, 1);
-    }
-
-    RemoveColorCodeInPlace(tempString);
-
-    bool bIsMainThread = LogToMainThread(szString, logType, bAdd, SLogMsg::Destination::File) == false;
-
-#if defined(_RELEASE)
-    if (!bIsMainThread)
-    {
-        return;
-    }
-#endif
-
-#if defined(SUPPORT_LOG_IDENTER)
-    if (bIsMainThread)
-    {
-        if (m_topIndenter)
-        {
-            m_topIndenter->DisplaySectionText();
-        }
-        tempString = m_indentWithString + tempString;
-    }
-#endif
-
-    if (m_pLogIncludeTime && gEnv && gEnv->pTimer)
-    {
-        uint32 dwCVarState = m_pLogIncludeTime->GetIVal();
-        //      char szTemp[MAX_TEMP_LENGTH_SIZE];
-
-        if (dwCVarState == 1)              // Log_IncludeTime
-        {
-            char sTime[128];
-            time_t ltime;
-            time(&ltime);
-#ifdef AZ_COMPILER_MSVC
-            struct tm today;
-            localtime_s(&today, &ltime);
-            strftime(sTime, 20, "<%H:%M:%S> ", &today);
-#else
-            auto today = localtime(&ltime);
-            strftime(sTime, 20, "<%H:%M:%S> ", today);
-#endif
-
-            timeStr.clear();
-            timeStr.assign(sTime);
-            tempString = timeStr + tempString;
-        }
-        else if (dwCVarState == 2)     // Log_IncludeTime
-        {
-            static CTimeValue lasttime;
-            CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
-            if (lasttime != CTimeValue())
-            {
-                timeStr.clear();
-                uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
-                timeStr.Format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
-                tempString = timeStr + tempString;
-            }
-            lasttime = currenttime;
-        }
-        else if (dwCVarState == 3)     // Log_IncludeTime
-        {
-            char sTime[128];
-            time_t ltime;
-            time(&ltime);
-
-#ifdef AZ_COMPILER_MSVC
-            struct tm today;
-            localtime_s(&today, &ltime);
-            strftime(sTime, 20, "<%H:%M:%S> ", &today);
-#else
-            auto today = localtime(&ltime);
-            strftime(sTime, 20, "<%H:%M:%S> ", today);
-#endif
-            tempString = LogStringType(sTime) + tempString;
-
-            static CTimeValue lasttime;
-            CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
-            if (lasttime != CTimeValue())
-            {
-                timeStr.clear();
-                uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
-                timeStr.Format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
-                tempString = timeStr + tempString;
-            }
-            lasttime = currenttime;
-        }
-        else if (dwCVarState == 4)             // Log_IncludeTime
-        {
-            static bool bFirst = true;
-
-            if (gEnv->pTimer)
-            {
-                static CTimeValue lasttime;
-                CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
-                if (lasttime != CTimeValue())
-                {
-                    timeStr.clear();
-                    uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
-                    timeStr.Format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
-                    tempString = timeStr + tempString;
-                }
-                if (bFirst)
-                {
-                    lasttime = currenttime;
-                    bFirst = false;
-                }
-            }
-        }
-        else if (dwCVarState == 5)             // Log_IncludeTime
-        {
-            char sTime[128];
-            time_t ltime;
-            time(&ltime);
-
-#ifdef AZ_COMPILER_MSVC
-            struct tm today;
-            localtime_s(&today, &ltime);
-            strftime(sTime, 20, "<%H:%M:%S> ", &today);
-#else
-            auto today = localtime(&ltime);
-            strftime(sTime, 20, "<%H:%M:%S> ", today);
-#endif
-            tempString = LogStringType(sTime) + tempString;
-        }
-        else if (dwCVarState == 6)              // Log_IncludeTime
-        {
-            char sTime[128];
-            time_t ltime;
-            time(&ltime);
-#ifdef AZ_COMPILER_MSVC
-            struct tm today;
-            localtime_s(&today, &ltime);
-            strftime(sTime, 40, "<%Y-%m-%d %H:%M:%S> ", &today);
-#else
-            auto today = localtime(&ltime);
-            strftime(sTime, 40, "<%Y-%m-%d %H:%M:%S> ", today);
-#endif
-            tempString = LogStringType(sTime) + tempString;
-        }
-    }
-
-    if (tempString.empty() || tempString[tempString.length() - 1] != '\n')
-    {
-        tempString += '\n';
-    }
-
-    // do not OutputDebugString in release.
-#if !defined(_RELEASE)
-    if (queueState == MessageQueueState::NotQueued)
-    {
-        // Note: OutputDebugString(A) only accepts current ANSI code-page, and the W variant will call the A variant internally.
-        // Here we replace non-ASCII characters with '?', which is the same as OutputDebugStringW will do for non-ANSI.
-        // Thus, we discard slightly more characters (ie, those inside the current ANSI code-page, but outside ASCII).
-        // In exchange, we save double-converting that would have happened otherwise (UTF-8 -> UTF-16 -> ANSI).
-        LogStringType asciiString;
-        Unicode::ConvertSafe<Unicode::EErrorRecovery::eErrorRecovery_FallbackLatin1ThenDiscard, Unicode::eEncoding_ASCII, Unicode::eEncoding_UTF8>(asciiString, tempString);
-        OutputDebugString(asciiString.c_str());
-    }
-
-    if (!bIsMainThread)
-    {
-        return;
-    }
-#endif // !defined(_RELEASE)
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Call callback function.
-    if (!m_callbacks.empty())
-    {
-        for (Callbacks::iterator it = m_callbacks.begin(); it != m_callbacks.end(); ++it)
-        {
-            (*it)->OnWriteToFile(tempString.c_str(), !bAdd);
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Write to file.
-    //////////////////////////////////////////////////////////////////////////
-    int logToFile = m_pLogWriteToFile ? m_pLogWriteToFile->GetIVal() : 1;
-
-    if (logToFile)
-    {
-        if (!m_logFileHandle.IsOpen())
-        {
-            constexpr auto openMode = AZ::IO::SystemFile::OpenMode::SF_OPEN_APPEND
-                | AZ::IO::SystemFile::OpenMode::SF_OPEN_CREATE
-                | AZ::IO::SystemFile::OpenMode::SF_OPEN_WRITE_ONLY;
-            OpenLogFile(m_szFilename, openMode);
-        }
-
-        if (m_logFileHandle.IsOpen())
-        {
-#if defined(KEEP_LOG_FILE_OPEN)
-            if (m_bFirstLine)
-            {
-                m_bFirstLine = false;
-            }
-#endif
-            if (bAdd)
-            {
-                // if adding to a prior line erase the \n at the end.
-                m_logFileHandle.Seek(-2, AZ::IO::SystemFile::SeekMode::SF_SEEK_END);
-            }
-            m_logFileHandle.Write(tempString.c_str(), tempString.size());
-#if !defined(KEEP_LOG_FILE_OPEN)
-            CloseLogFile();
-#endif
-            // do not use FLUSH on log files.  Doing so will slow the engine down greatly when logging.
-            // (the log is flushed automatically when an unhandled exception occurs)
-        }
-    }
-}
-
-void CLog::LogString(const char* szString, ELogType logType)
-{
-    if (LogToMainThread(szString, logType, false, SLogMsg::Destination::Default))
-    {
-        return;
-    }
-
-    for (auto callback : m_callbacks)
-    {
-        callback->OnWrite(szString, logType);
-    }
-}
-
-//same as above but to a file
-//////////////////////////////////////////////////////////////////////
-void CLog::LogToFilePlus(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
-    {
-        return;
-    }
-
-    if (!m_szFilename[0] || !szFormat)
-    {
-        return;
-    }
-
-    bool bfile = false, bconsole = false;
-    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
-    if (!bfile)
-    {
-        return;
-    }
-
-    char szTemp[MAX_TEMP_LENGTH_SIZE];
-    va_list     arglist;
-    va_start(arglist, szFormat);
-    vsnprintf_s(szTemp, sizeof(szTemp), sizeof(szTemp) - 1, szCommand, arglist);
-    szTemp[sizeof(szTemp) - 1] = 0;
-    va_end(arglist);
-
-    LogStringToFile(szTemp, ELogType::eAlways, true, MessageQueueState::NotQueued);
-}
-
-//log to the file specified in setfilename
-//////////////////////////////////////////////////////////////////////
-void CLog::LogToFile(const char* szFormat, ...)
-{
-    if (!CheckLogFormatter(szFormat))
-    {
-        return;
-    }
-
-    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
-    {
-        return;
-    }
-
-    if (!m_szFilename[0] || !szFormat)
-    {
-        return;
-    }
-
-    bool bfile = false, bconsole = false;
-    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
-    if (!bfile)
-    {
-        return;
-    }
-
-    char szTemp[MAX_TEMP_LENGTH_SIZE];
-    va_list     arglist;
-    va_start(arglist, szFormat);
-    vsnprintf_s(szTemp, sizeof(szTemp), sizeof(szTemp) - 1, szCommand, arglist);
-    szTemp[sizeof(szTemp) - 1] = 0;
-    va_end(arglist);
-
-    LogStringToFile(szTemp, ELogType::eAlways, false, MessageQueueState::NotQueued);
-}
-#endif // !defined(EXCLUDE_NORMAL_LOG)
-
-//////////////////////////////////////////////////////////////////////
-void CLog::CreateBackupFile() const
-{
-    LOADING_TIME_PROFILE_SECTION;
-    if (!m_backupLogs)
-    {
-        return;
-    }
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_ALLOW_CREATE_BACKUP_LOG_FILE
-    // simple:
-    //      string bakpath = PathUtil::ReplaceExtension(m_szFilename,"bak");
-    //      CopyFile(m_szFilename,bakpath.c_str(),false);
-
-    // boswej: only create a backup if logging to the engine root, otherwise the
-    // log output has been overridden and the user is responsible
-    string logDir = PathUtil::RemoveSlash(PathUtil::ToUnixPath(PathUtil::GetParentDirectory(m_szFilename)));
-
-    string sExt = PathUtil::GetExt(m_szFilename);
-    string sFileWithoutExt = PathUtil::GetFileName(m_szFilename);
-
-    {
-        assert(::strstr(sFileWithoutExt, ":") == 0);
-        assert(::strstr(sFileWithoutExt, "\\") == 0);
-    }
-
-    PathUtil::RemoveExtension(sFileWithoutExt);
-
-    AZ::IO::FileIOBase* fileSystem = AZ::IO::FileIOBase::GetDirectInstance();
-    AZ::IO::HandleType inFileHandle = AZ::IO::InvalidHandle;
-    fileSystem->Open(m_szFilename, AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, inFileHandle);
-
-    string sBackupNameAttachment;
-
-    // parse backup name attachment
-    // e.g. BackupNameAttachment="attachment name"
-    if (inFileHandle != AZ::IO::InvalidHandle)
-    {
-        bool bKeyFound = false;
-        string sName;
-
-        while (!fileSystem->Eof(inFileHandle))
-        {
-            uint8 c = AZ::IO::GetC(inFileHandle);
-
-            if (c == '\"')
-            {
-                if (!bKeyFound)
-                {
-                    bKeyFound = true;
-
-                    if (sName.find("BackupNameAttachment=") == string::npos)
-                    {
-#ifdef WIN32
-                        OutputDebugString("Log::CreateBackupFile ERROR '");
-                        OutputDebugString(sName.c_str());
-                        OutputDebugString("' not recognized \n");
-#endif
-                        assert(0);      // broken log file? - first line should include this name - written by LogVersion()
-                        return;
-                    }
-                    sName.clear();
-                }
-                else
-                {
-                    sBackupNameAttachment = sName;
-                    break;
-                }
-                continue;
-            }
-            if (c >= ' ')
-            {
-                sName += c;
-            }
-            else
-            {
-                break;
-            }
-        }
-        fileSystem->Close(inFileHandle);
-    }
-
-    string bakdest = PathUtil::Make(LOG_BACKUP_PATH, sFileWithoutExt + sBackupNameAttachment + "." + sExt);
-    fileSystem->CreatePath(LOG_BACKUP_PATH);
-    cry_strcpy(m_sBackupFilename, bakdest.c_str());
-    // Remove any existing backup file with the same name first since the copy will fail otherwise.
-    fileSystem->Remove(m_sBackupFilename);
-    fileSystem->Copy(m_szFilename, bakdest);
-#endif // AZ_LEGACY_CRYSYSTEM_TRAIT_ALLOW_CREATE_BACKUP_LOG_FILE
-}
-
-void CLog::CheckAndPruneBackupLogs() const
-{
-    AZ::IO::FileIOBase* fileSystem = AZ::IO::FileIOBase::GetDirectInstance();
-
-    AZ::u64 totalBackupDirectorySize = 0;
-
-    struct fileInfo
-    {
-        time_t modTime;
-        AZStd::string filename;
-        AZ::u64 filesize;
-
-        fileInfo(time_t _modTime, const char* _name, AZ::u64 _size)
-        {
-            modTime = _modTime;
-            filename = _name;
-            filesize = _size;
-        }
-    };
-
-    AZStd::list<fileInfo> fileInfoList;
-
-    // Now that we've copied the new log over, lets check the size of the backup folder and trim it as necessary to keep it within appropriate limits
-    AZ::IO::Result res = fileSystem->FindFiles(LOG_BACKUP_PATH, "*",
-        [&totalBackupDirectorySize, &fileSystem, &fileInfoList](const char* fileName)
-    {
-        AZ::u64 size;
-        fileSystem->Size(fileName, size);
-        AZ::u64 modTime = fileSystem->ModificationTime(fileName);
-        fileInfoList.push_back(fileInfo(modTime, fileName, size));
-
-        totalBackupDirectorySize += size;
-        return true;
-    });
-
-    AZ::u64 max_size = LogCVars::max_backup_directory_size_mb;
-    max_size = max_size << 20;  // Convert from MB to bytes
-
-    if (totalBackupDirectorySize > max_size)
-    {
-        // Sort the list from lowest to highest modtime (oldest to newest logs)
-        fileInfoList.sort([](const fileInfo &a, const fileInfo&b) { return a.modTime < b.modTime; });
-
-        while (totalBackupDirectorySize > max_size && fileInfoList.size() > 0)
-        {
-            fileSystem->Remove(fileInfoList.front().filename.c_str());
-            totalBackupDirectorySize -= fileInfoList.front().filesize;
-            fileInfoList.pop_front();
-        }
-    }
-}
-
-//set the file used to log to disk
-//////////////////////////////////////////////////////////////////////
-bool CLog::SetFileName(const char* fileNameOrAbsolutePath, bool backupLogs)
-{
-    m_backupLogs = backupLogs;
-    if (!fileNameOrAbsolutePath)
-    {
-        return false;
-    }
-    azstrncpy(m_szFilename, AZ_ARRAY_SIZE(m_szFilename), fileNameOrAbsolutePath, sizeof(m_szFilename));
-
-    CreateBackupFile();
-
-    AZ::IO::FileIOBase* fileSystem = AZ::IO::FileIOBase::GetDirectInstance();
-    AZ::IO::FixedMaxPath newLogFilePath;
-    if (fileSystem->ReplaceAlias(newLogFilePath, m_szFilename))
-    {
-        newLogFilePath = newLogFilePath.LexicallyNormal();
-    }
-    if (m_logFileHandle.IsOpen() && newLogFilePath != m_logFileHandle.Name())
-    {
-        constexpr auto openMode = AZ::IO::SystemFile::OpenMode::SF_OPEN_APPEND
-            | AZ::IO::SystemFile::OpenMode::SF_OPEN_CREATE
-            | AZ::IO::SystemFile::OpenMode::SF_OPEN_WRITE_ONLY;
-        if(AZ::IO::SystemFile newLogFile; newLogFile.Open(m_szFilename, openMode))
-        {
-            m_logFileHandle = AZStd::move(newLogFile);
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CLog::GetFileName()
-{
-    return m_szFilename;
-}
-
-const char* CLog::GetBackupFileName()
-{
-    return m_sBackupFilename;
-}
-
-//////////////////////////////////////////////////////////////////////
-void CLog::UpdateLoadingScreen(const char* szFormat, ...)
-{
-#if !defined(EXCLUDE_NORMAL_LOG)
-    if (szFormat)
-    {
-        // This function is OK to call with nullptr, but then it does not log anything.
-        va_list args;
-        va_start(args, szFormat);
-
-        LogV(ILog::eMessage, szFormat, args);
-
-        va_end(args);
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CLog::GetVerbosityLevel()
-{
-    if (m_pLogVerbosity)
-    {
-        return (m_pLogVerbosity->GetIVal());
-    }
-
-    return (0);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// Checks the verbosity of the message and returns NULL if the message must NOT be
-// logged, or the pointer to the part of the message that should be logged
-// NOTE:
-//    Normally, this is either the pText pointer itself, or the pText+1, meaning
-//    the first verbosity character may be cut off)
-//    This is done in order to avoid modification of const char*, which may cause GPF
-//    sometimes, or kill the verbosity qualifier in the text that's gonna be passed next time.
-const char* CLog::CheckAgainstVerbosity(const char* pText, bool& logtofile, bool& logtoconsole, const uint8 DefaultVerbosity)
-{
-    // the max verbosity (most detailed level)
-#if defined(RELEASE)
-    const unsigned char nMaxVerbosity = 0;
-#else // #if defined(RELEASE)
-    const unsigned char nMaxVerbosity = 8;
-#endif // #if defined(RELEASE)
-
-    // the current verbosity of the log
-    int nLogVerbosityConsole = m_pLogVerbosity ? m_pLogVerbosity->GetIVal() : nMaxVerbosity;
-    int nLogVerbosityFile = m_pLogWriteToFileVerbosity ? m_pLogWriteToFileVerbosity->GetIVal() : nMaxVerbosity;
-
-    logtoconsole = (nLogVerbosityConsole >= DefaultVerbosity);
-
-    //to preserve logging to TTY, logWriteToFile logic has been moved to inside logStringToFile
-    //int logToFileCVar = m_pLogWriteToFile ? m_pLogWriteToFile->GetIVal() : 1;
-
-    logtofile = (nLogVerbosityFile >= DefaultVerbosity);
-
-    return pText;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::AddCallback(ILogCallback* pCallback)
-{
-    stl::push_back_unique(m_callbacks, pCallback);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::RemoveCallback(ILogCallback* pCallback)
-{
-    m_callbacks.remove(pCallback);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLog::Update()
-{
-    FUNCTION_PROFILER_FAST(m_pSystem, PROFILE_SYSTEM, g_bProfilerEnabled);
-
-    if (CryGetCurrentThreadId() == m_nMainThreadId)
-    {
-        if (!m_threadSafeMsgQueue.empty())
-        {
-            CryAutoCriticalSection lock(m_threadSafeMsgQueue.get_lock());   // Get the lock and hold onto it until we clear the entire queue (prevents other threads adding more things in while we clear it)
-            // Must be called from main thread
-            SLogMsg msg;
-            while (m_threadSafeMsgQueue.try_pop(msg))
-            {
-                if (msg.destination == SLogMsg::Destination::Console)
-                {
-                    LogStringToConsole(msg.msg, msg.logType, msg.bAdd);
-                }
-                else if (msg.destination == SLogMsg::Destination::File)
-                {
-                    LogStringToFile(msg.msg, msg.logType, msg.bAdd, MessageQueueState::Queued);
-                }
-                else
-                {
-                    LogString(msg.msg, msg.logType);
-                }
-            }
-            stl::free_container(m_threadSafeMsgQueue);
-        }
-
-        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)
-            {
-                t0 = t1;
-
-                char sTime[128];
-                time_t ltime;
-                time(&ltime);
-#ifdef AZ_COMPILER_MSVC
-                struct tm today;
-                localtime_s(&today, &ltime);
-                strftime(sTime, sizeof(sTime) - 1, "<%H:%M:%S> ", &today);
-#else
-                auto today = localtime(&ltime);
-                strftime(sTime, sizeof(sTime) - 1, "<%H:%M:%S> ", today);
-#endif
-                LogAlways("<tick> %s", sTime);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CLog::GetModuleFilter()
-{
-    if (m_pLogModule)
-    {
-        return m_pLogModule->GetString();
-    }
-    return "";
-}
-
-void CLog::FlushAndClose()
-{
-#if defined(KEEP_LOG_FILE_OPEN)
-    if (m_logFileHandle.IsOpen())
-    {
-        CloseLogFile();
-    }
-#endif
-}
-
-#if defined(KEEP_LOG_FILE_OPEN)
-void CLog::LogFlushFile([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-    if ((gEnv) && (gEnv->pLog))
-    {
-        gEnv->pLog->FlushAndClose();
-    }
-}
-#endif
diff --git a/Code/CryEngine/CrySystem/Log.h b/Code/CryEngine/CrySystem/Log.h
deleted file mode 100644
index b6b5f26c1f..0000000000
--- a/Code/CryEngine/CrySystem/Log.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <ILog.h>
-#include <CryThread.h>
-#include <MultiThread.h>
-#include <MultiThread_Containers.h>
-
-//////////////////////////////////////////////////////////////////////
-#if defined(ANDROID) || defined(AZ_PLATFORM_MAC)
-    #define MAX_TEMP_LENGTH_SIZE    4098
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#include AZ_RESTRICTED_FILE(Log_h)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    #define MAX_TEMP_LENGTH_SIZE    8196
-#endif
-#define MAX_FILENAME_SIZE           256
-
-#define KEEP_LOG_FILE_OPEN
-
-
-//////////////////////////////////////////////////////////////////////
-class CLog
-    : public ILog
-{
-public:
-    typedef std::list<ILogCallback*> Callbacks;
-    typedef CryStackStringT<char, MAX_TEMP_LENGTH_SIZE> LogStringType;
-
-    // constructor
-    CLog(ISystem* pSystem);
-    // destructor
-    ~CLog();
-
-
-    // interface ILog, IMiniLog -------------------------------------------------
-
-    virtual void Release() { delete this; };
-    virtual bool SetFileName(const char* fileNameOrAbsolutePath, bool backupLogs);
-    virtual const char* GetFileName();
-    virtual const char* GetBackupFileName();
-#if !defined(EXCLUDE_NORMAL_LOG)
-    virtual void Log(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void LogAlways(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void LogWarning(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void LogError(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void LogPlus(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void LogToFile  (const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void LogToFilePlus(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void LogToConsole(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void LogToConsolePlus(const char* command, ...) PRINTF_PARAMS(2, 3);
-#else
-    virtual void Log(const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-    virtual void LogAlways(const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-    virtual void LogWarning(const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-    virtual void LogError(const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-    virtual void LogPlus(const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-    virtual void LogToFile  (const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-    virtual void LogToFilePlus(const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-    virtual void LogToConsole(const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-    virtual void LogToConsolePlus(const char* command, ...) PRINTF_PARAMS(2, 3) {
-    };
-#endif // !defined(EXCLUDE_NORMAL_LOG)
-    virtual void UpdateLoadingScreen(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual void SetVerbosity(int verbosity);
-    virtual int  GetVerbosityLevel();
-    virtual void RegisterConsoleVariables();
-    virtual void UnregisterConsoleVariables();
-    virtual void AddCallback(ILogCallback* pCallback);
-    virtual void RemoveCallback(ILogCallback* pCallback);
-    virtual void LogV(ELogType ineType, int flags, const char* szFormat, va_list args);
-    virtual void LogV(ELogType ineType, const char* szFormat, va_list args);
-    virtual void Update();
-    virtual const char* GetModuleFilter();
-    virtual void FlushAndClose();
-
-private: // -------------------------------------------------------------------
-    struct SLogMsg
-    {
-        enum class Destination
-        {
-            Default, //LogString, sends OnWrite to anycallback registered with AddCallback
-            Console,
-            File
-        };
-        char msg[512];
-        ELogType logType;
-        bool bAdd;
-        Destination destination;
-        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
-    };
-
-    void CheckAndPruneBackupLogs() const;
-
-    bool IsError(ELogType logType) const { return logType == ELogType::eError || logType == ELogType::eErrorAlways || logType == ELogType::eWarning || logType == ELogType::eWarningAlways; }
-
-    //helper function to pass calls to LogString... to the main thread, returns false if you are on the main thread already, in which case just process the work.
-    bool LogToMainThread(const char* szString, ELogType logType, bool bAdd, SLogMsg::Destination destination);
-
-    enum class MessageQueueState
-    {
-        NotQueued,
-        Queued
-    };
-
-#if !defined(EXCLUDE_NORMAL_LOG)
-    void LogString(const char* szString, ELogType logType);
-    void LogStringToFile(const char* szString, ELogType logType, bool bAdd, MessageQueueState queueState);
-    void LogStringToConsole(const char* szString, ELogType logType, bool bAdd);
-#else
-    void LogString(const char* szString, ELogType logType) {}
-    void LogStringToFile(const char* szString, ELogType logType, bool bAdd, MessageQueueState queueState) {}
-    void LogStringToConsole(const char* szString, ELogType logType, bool bAdd) {}
-#endif // !defined(EXCLUDE_NORMAL_LOG)
-
-    bool OpenLogFile(const char* filename, int mode);
-    void CloseLogFile();
-
-    // will format the message into m_szTemp
-    void FormatMessage(const char* szCommand, ...) PRINTF_PARAMS(2, 3);
-
-#if defined(SUPPORT_LOG_IDENTER)
-    void Indent(CLogIndenter* indenter);
-    void Unindent(CLogIndenter* indenter);
-    void BuildIndentString();
-    virtual void PushAssetScopeName(const char* sAssetType, const char* sName);
-    virtual void PopAssetScopeName();
-    virtual const char* GetAssetScopeString();
-#endif
-
-    ISystem* m_pSystem;                                                       //
-    float m_fLastLoadingUpdateTime;                           // for non-frequent streamingEngine update
-    char m_szFilename[MAX_FILENAME_SIZE];            // can be with path
-    mutable char m_sBackupFilename[MAX_FILENAME_SIZE];   // can be with path
-    AZ::IO::SystemFile m_logFileHandle;
-
-    bool m_backupLogs;
-
-#if defined(SUPPORT_LOG_IDENTER)
-    uint8                   m_indentation;
-    LogStringType           m_indentWithString;
-    class CLogIndenter* m_topIndenter;
-
-    struct SAssetScopeInfo
-    {
-        string sType;
-        string sName;
-    };
-
-    std::vector<SAssetScopeInfo> m_assetScopeQueue;
-    CryCriticalSection m_assetScopeQueueLock;
-    string m_assetScopeString;
-#endif
-
-    ICVar*                 m_pLogIncludeTime;                                       //
-
-    IConsole*          m_pConsole;                                                      //
-
-    CryCriticalSection m_logCriticalSection;
-
-    struct SLogHistoryItem
-    {
-        char str[MAX_WARNING_LENGTH];
-        const char* ptr;
-        ELogType type;
-        float time;
-    };
-    SLogHistoryItem m_history[16];
-    int m_iLastHistoryItem;
-
-    static bool CheckLogFormatter(const char* formatter);
-
-#if defined(KEEP_LOG_FILE_OPEN)
-    static void LogFlushFile(IConsoleCmdArgs* pArgs);
-
-    bool m_bFirstLine;
-#endif
-
-public: // -------------------------------------------------------------------
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_pLogVerbosity);
-        pSizer->AddObject(m_pLogWriteToFile);
-        pSizer->AddObject(m_pLogWriteToFileVerbosity);
-        pSizer->AddObject(m_pLogVerbosityOverridesWriteToFile);
-        pSizer->AddObject(m_pLogSpamDelay);
-        pSizer->AddObject(m_threadSafeMsgQueue);
-    }
-    // checks the verbosity of the message and returns NULL if the message must NOT be
-    // logged, or the pointer to the part of the message that should be logged
-    const char* CheckAgainstVerbosity(const char* pText, bool& logtofile, bool& logtoconsole, const uint8 DefaultVerbosity = 2);
-
-    // create backup of log file, useful behavior - only on development platform
-    void CreateBackupFile() const;
-
-    ICVar*                 m_pLogVerbosity;                                             //
-    ICVar*                 m_pLogWriteToFile;                                       //
-    ICVar*                 m_pLogWriteToFileVerbosity;                      //
-    ICVar*                 m_pLogVerbosityOverridesWriteToFile;     //
-    ICVar*                 m_pLogSpamDelay;                       //
-    ICVar*                 m_pLogModule;                                                    // Module filter for log
-    Callbacks               m_callbacks;                                                    //
-
-    threadID m_nMainThreadId;
-    CryMT::queue<SLogMsg> m_threadSafeMsgQueue;
-};
diff --git a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.cpp b/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.cpp
deleted file mode 100644
index 8f232d81bc..0000000000
--- a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "RemoteConsole.h"
-
-#ifdef USE_REMOTE_CONSOLE
-    #include "RemoteConsole_impl.inl"
-#else
-    #include "RemoteConsole_none.inl"
-#endif
diff --git a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.h b/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.h
deleted file mode 100644
index a5c6099e5c..0000000000
--- a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_REMOTECONSOLE_REMOTECONSOLE_H
-#define CRYINCLUDE_CRYSYSTEM_REMOTECONSOLE_REMOTECONSOLE_H
-#pragma once
-
-#include <IConsole.h>
-#include <CryListenerSet.h>
-
-#if !defined(RELEASE) || defined(RELEASE_LOGGING) || defined(ENABLE_PROFILING_CODE)
-    #define USE_REMOTE_CONSOLE
-
-    struct SRemoteServer;
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-// CRemoteConsole
-//
-// IRemoteConsole implementation
-//
-/////////////////////////////////////////////////////////////////////////////////////////////
-class CRemoteConsole
-    : public IRemoteConsole
-{
-public:
-    static CRemoteConsole* GetInst() 
-    { 
-        static StaticInstance<CRemoteConsole, AZStd::no_destruct<CRemoteConsole>> inst;
-        return &inst; 
-    }
-
-    virtual void RegisterConsoleVariables();
-    virtual void UnregisterConsoleVariables();
-
-    virtual void Start();
-    virtual void Stop();
-    virtual bool IsStarted() const { return m_running; }
-
-    virtual void AddLogMessage(const char* log);
-    virtual void AddLogWarning(const char* log);
-    virtual void AddLogError(const char* log);
-
-    virtual void Update();
-
-    virtual void RegisterListener(IRemoteConsoleListener* pListener, const char* name);
-    virtual void UnregisterListener(IRemoteConsoleListener* pListener);
-
-    typedef CListenerSet<IRemoteConsoleListener*> TListener;
-
-
-    CRemoteConsole();
-    virtual ~CRemoteConsole();
-
-    TListener m_listener;
-    int m_lastPortValue = 0;
-    volatile bool m_running;
-
-#if defined(USE_REMOTE_CONSOLE)
-    SRemoteServer* m_pServer;
-    ICVar* m_pLogEnableRemoteConsole = nullptr;
-    ICVar* m_remoteConsoleAllowedHostList = nullptr;
-    ICVar* m_remoteConsolePort = nullptr;
-#endif
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_REMOTECONSOLE_REMOTECONSOLE_H
diff --git a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_impl.inl b/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_impl.inl
deleted file mode 100644
index 375bc89327..0000000000
--- a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_impl.inl
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <RemoteConsoleCore.h>
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////
-CRemoteConsole::CRemoteConsole()
-    : m_listener(1)
-    , m_lastPortValue(0)
-    , m_running(false)
-
-    , m_pServer(nullptr)
-    , m_pLogEnableRemoteConsole(nullptr)
-    , m_remoteConsoleAllowedHostList(nullptr)
-    , m_remoteConsolePort(nullptr)
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-CRemoteConsole::~CRemoteConsole()
-{
-    Stop();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::RegisterConsoleVariables()
-{
-    m_pLogEnableRemoteConsole = REGISTER_INT("log_EnableRemoteConsole", 1, VF_DUMPTODISK, "enables/disables the remote console");
-    m_remoteConsoleAllowedHostList = REGISTER_STRING("log_RemoteConsoleAllowedAddresses", "", VF_DUMPTODISK, "COMMA separated list of allowed hosts or IP addresses which can connect");
-    m_remoteConsolePort = REGISTER_INT("log_RemoteConsolePort", defaultRemoteConsolePort, VF_DUMPTODISK, "Base port (4600 for example) for remote console to listen on.  It will start there and continue upwards until an unused one is found.");
-    m_lastPortValue = 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::UnregisterConsoleVariables()
-{
-    m_pLogEnableRemoteConsole = nullptr;
-    m_remoteConsoleAllowedHostList = nullptr;
-    m_remoteConsolePort = nullptr;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::Start()
-{
-    if (!IsStarted())
-    {
-        m_pServer = new SRemoteServer;
-
-        m_pServer->StartServer();
-        m_running = true;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::Stop()
-{
-    // make sure we don't stop if we never started the remote console in the first place
-    if (IsStarted())
-    {
-        m_running = false;
-        m_pServer->StopServer();
-        m_pServer->WaitForThread();
-
-        delete m_pServer;
-        m_pServer = nullptr;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::AddLogMessage(const char* log)
-{
-    if (!IsStarted())
-    {
-        return;
-    }
-
-    IRemoteEvent* pEvent = new SStringEvent<eCET_LogMessage>(log);
-    m_pServer->AddEvent(pEvent);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::AddLogWarning(const char* log)
-{
-    if (!IsStarted())
-    {
-        return;
-    }
-
-    IRemoteEvent* pEvent = new SStringEvent<eCET_LogWarning>(log);
-    m_pServer->AddEvent(pEvent);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::AddLogError(const char* log)
-{
-    if (!IsStarted())
-    {
-        return;
-    }
-
-    IRemoteEvent* pEvent = new SStringEvent<eCET_LogError>(log);
-    m_pServer->AddEvent(pEvent);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::Update()
-{
-    if (m_pLogEnableRemoteConsole)
-    {
-        // we disable the remote console in the editor, since there is no reason to remote into it and we don't want it eating up that port
-        // number anyway and preventing the game from using it.
-        bool isEditor = gEnv && gEnv->IsEditor();
-        bool isEnabled = (!isEditor) && (m_pLogEnableRemoteConsole->GetIVal());
-        bool isStarted = IsStarted();
-
-        int newPortValue = m_remoteConsolePort->GetIVal();
-
-        // the editor never allows remote control.
-        if ((isEnabled) && (!isStarted))
-        {
-            Start();
-        }
-        else if (isStarted)
-        {
-            if ((!isEnabled) || (newPortValue != m_lastPortValue))
-            {
-                Stop();
-            }
-        }
-
-        m_lastPortValue = newPortValue;
-
-    }
-
-    if (m_pServer)
-    {
-        TEventBuffer events;
-        m_pServer->GetEvents(events);
-        for (TEventBuffer::iterator it = events.begin(), end = events.end(); it != end; ++it)
-        {
-            IRemoteEvent* pEvent = *it;
-            switch (pEvent->GetType())
-            {
-            case eCET_ConsoleCommand:
-                for (TListener::Notifier notifier(m_listener); notifier.IsValid(); notifier.Next())
-                {
-                    notifier->OnConsoleCommand(((SStringEvent<eCET_ConsoleCommand>*)pEvent)->GetData());
-                }
-                break;
-            case eCET_GameplayEvent:
-                for (TListener::Notifier notifier(m_listener); notifier.IsValid(); notifier.Next())
-                {
-                    notifier->OnGameplayCommand(((SStringEvent<eCET_GameplayEvent>*)pEvent)->GetData());
-                }
-                break;
-            }
-            delete *it;
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const char* name)
-{
-    m_listener.Add(pListener, name);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
-{
-    m_listener.Remove(pListener);
-}
diff --git a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_none.inl b/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_none.inl
deleted file mode 100644
index e7fb4f8cd5..0000000000
--- a/Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_none.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-CRemoteConsole::CRemoteConsole()
-    : m_listener(1)
-    , m_lastPortValue(0)
-    , m_running(false)
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-CRemoteConsole::~CRemoteConsole()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::RegisterConsoleVariables()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::UnregisterConsoleVariables()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::Start()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::Stop()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::AddLogMessage(const char* log)
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::AddLogWarning(const char* log)
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::AddLogError(const char* log)
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::Update()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const char* name)
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
-{
-}
diff --git a/Code/CryEngine/CrySystem/SimpleStringPool.h b/Code/CryEngine/CrySystem/SimpleStringPool.h
deleted file mode 100644
index 2bfe75176a..0000000000
--- a/Code/CryEngine/CrySystem/SimpleStringPool.h
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_SIMPLESTRINGPOOL_H
-#define CRYINCLUDE_CRYSYSTEM_SIMPLESTRINGPOOL_H
-#pragma once
-
-#include "ISystem.h"
-
-#include <StlUtils.h>
-
-//TODO: Pull most of this into a cpp file!
-
-
-struct SStringData
-{
-    SStringData(const char* szString, int nStrLen)
-        : m_szString(szString)
-        , m_nStrLen(nStrLen)
-    {
-    }
-
-    const char* m_szString;
-    int m_nStrLen;
-    bool operator==(const SStringData& other) const
-    {
-        if (m_nStrLen != other.m_nStrLen)
-        {
-            return false;
-        }
-
-        return strcmp(m_szString, other.m_szString) == 0;
-    }
-private:
-};
-
-template<>
-inline const char* stl::constchar_cast(const SStringData& in)
-{
-    return in.m_szString;
-}
-
-
-/////////////////////////////////////////////////////////////////////
-// String pool implementation.
-// Inspired by expat implementation.
-/////////////////////////////////////////////////////////////////////
-class CSimpleStringPool
-{
-public:
-    enum
-    {
-        STD_BLOCK_SIZE = 1u << 16
-    };
-    struct BLOCK
-    {
-        BLOCK* next;
-        int size;
-        char s[1];
-    };
-    unsigned int m_blockSize;
-    BLOCK* m_blocks;
-    BLOCK* m_free_blocks;
-    const char* m_end;
-    char* m_ptr;
-    char* m_start;
-    int nUsedSpace;
-    int nUsedBlocks;
-    bool m_reuseStrings;
-
-    typedef AZStd::unordered_map<SStringData, char*, stl::hash_string<SStringData> > TStringToExistingStringMap;
-    TStringToExistingStringMap m_stringToExistingStringMap;
-
-    static size_t g_nTotalAllocInXmlStringPools;
-
-    CSimpleStringPool()
-    {
-        m_blockSize = STD_BLOCK_SIZE  - offsetof(BLOCK, s);
-        m_blocks = 0;
-        m_start = 0;
-        m_ptr = 0;
-        m_end = 0;
-        nUsedSpace = 0;
-        nUsedBlocks = 0;
-        m_free_blocks = 0;
-        m_reuseStrings = false;
-    }
-
-    explicit CSimpleStringPool(bool reuseStrings)
-        : m_blockSize(STD_BLOCK_SIZE - offsetof(BLOCK, s))
-        , m_blocks(NULL)
-        , m_free_blocks(NULL)
-        , m_end(0)
-        , m_ptr(0)
-        , m_start(0)
-        , nUsedSpace(0)
-        , nUsedBlocks(0)
-        , m_reuseStrings(reuseStrings)
-    {
-    }
-
-    ~CSimpleStringPool()
-    {
-        BLOCK* pBlock = m_blocks;
-        while (pBlock)
-        {
-            BLOCK* temp = pBlock->next;
-            g_nTotalAllocInXmlStringPools -= (offsetof(BLOCK, s) + pBlock->size * sizeof(char));
-            CryModuleFree(pBlock);
-            pBlock = temp;
-        }
-        pBlock = m_free_blocks;
-        while (pBlock)
-        {
-            BLOCK* temp = pBlock->next;
-            g_nTotalAllocInXmlStringPools -= (offsetof(BLOCK, s) + pBlock->size * sizeof(char));
-            CryModuleFree(pBlock);
-            pBlock = temp;
-        }
-        m_blocks = 0;
-        m_ptr = 0;
-        m_start = 0;
-        m_end = 0;
-    }
-    void SetBlockSize(unsigned int nBlockSize)
-    {
-        if (nBlockSize > 1024 * 1024)
-        {
-            nBlockSize = 1024 * 1024;
-        }
-        unsigned int size = 512;
-        while (size < nBlockSize)
-        {
-            size *= 2;
-        }
-
-        m_blockSize = size - offsetof(BLOCK, s);
-    }
-    void Clear()
-    {
-        BLOCK* pLast = m_free_blocks;
-        if (pLast)
-        {
-            while (pLast->next)
-            {
-                pLast = pLast->next;
-            }
-
-            pLast->next = m_blocks;
-        }
-        else
-        {
-            m_free_blocks = m_blocks;
-        }
-
-        m_blocks = 0;
-        m_start = 0;
-        m_ptr = 0;
-        m_end = 0;
-        nUsedSpace = 0;
-        if (m_reuseStrings)
-        {
-            m_stringToExistingStringMap.clear();
-        }
-    }
-    char* Append(const char* ptr, int nStrLen)
-    {
-        // If a string does not fit within the remainder of the string pool, a new pool will be allocated with at least
-        // nStrLen + 1 size, which means this code does take care of incredibly large strings.
-
-        if (m_reuseStrings)
-        {
-            if (char* existingString = FindExistingString(ptr, nStrLen))
-            {
-                return existingString;
-            }
-        }
-
-        char* ret = m_ptr;
-        if (m_ptr && nStrLen + 1 < (m_end - m_ptr))
-        {
-            memcpy(m_ptr, ptr, nStrLen);
-            m_ptr = m_ptr + nStrLen;
-            *m_ptr++ = 0; // add null termination.
-        }
-        else
-        {
-            int nNewBlockSize = std::max(nStrLen + 1, (int)m_blockSize);
-            AllocBlock(nNewBlockSize, nStrLen + 1);
-            PREFAST_ASSUME(m_ptr);
-            memcpy(m_ptr, ptr, nStrLen);
-            m_ptr = m_ptr + nStrLen;
-            *m_ptr++ = 0; // add null termination.
-            ret = m_start;
-        }
-
-        if (m_reuseStrings)
-        {
-            assert(!FindExistingString(ptr, nStrLen));
-            m_stringToExistingStringMap[SStringData(ret, nStrLen)] = ret;
-        }
-
-        nUsedSpace += nStrLen;
-        return ret;
-    }
-    char* ReplaceString(const char* str1, const char* str2)
-    {
-        if (m_reuseStrings)
-        {
-            CryFatalError("Can't replace strings in an xml node that reuses strings");
-        }
-
-        int nStrLen1 = strlen(str1);
-        int nStrLen2 = strlen(str2);
-
-        // undo ptr1 add.
-        if (m_ptr != m_start)
-        {
-            m_ptr = m_ptr - nStrLen1 - 1;
-        }
-
-        assert(m_ptr == str1);
-
-        int nStrLen = nStrLen1 + nStrLen2;
-
-        char* ret = m_ptr;
-        if (m_ptr && nStrLen + 1 < (m_end - m_ptr))
-        {
-            if (m_ptr != str1)
-            {
-                memcpy(m_ptr, str1, nStrLen1);
-            }
-            memcpy(m_ptr + nStrLen1, str2, nStrLen2);
-            m_ptr = m_ptr + nStrLen;
-            *m_ptr++ = 0; // add null termination.
-        }
-        else
-        {
-            int nNewBlockSize = std::max(nStrLen + 1, (int)m_blockSize);
-            if (m_ptr == m_start)
-            {
-                ReallocBlock(nNewBlockSize * 2); // Reallocate current block.
-                PREFAST_ASSUME(m_ptr);
-                memcpy(m_ptr + nStrLen1, str2, nStrLen2);
-            }
-            else
-            {
-                AllocBlock(nNewBlockSize, nStrLen + 1);
-                PREFAST_ASSUME(m_ptr);
-                memcpy(m_ptr, str1, nStrLen1);
-                memcpy(m_ptr + nStrLen1, str2, nStrLen2);
-            }
-
-            m_ptr = m_ptr + nStrLen;
-            *m_ptr++ = 0; // add null termination.
-            ret = m_start;
-        }
-        nUsedSpace += nStrLen;
-        return ret;
-    }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        BLOCK* pBlock = m_blocks;
-        while (pBlock)
-        {
-            pSizer->AddObject(pBlock, offsetof(BLOCK, s) + pBlock->size * sizeof(char));
-            pBlock = pBlock->next;
-        }
-
-        pBlock = m_free_blocks;
-        while (pBlock)
-        {
-            pSizer->AddObject(pBlock, offsetof(BLOCK, s) + pBlock->size * sizeof(char));
-            pBlock = pBlock->next;
-        }
-    }
-
-private:
-    CSimpleStringPool(const CSimpleStringPool&);
-    CSimpleStringPool& operator = (const CSimpleStringPool&);
-
-private:
-    void AllocBlock(int blockSize, int nMinBlockSize)
-    {
-        if (m_free_blocks)
-        {
-            BLOCK* pBlock = m_free_blocks;
-            BLOCK* pPrev = 0;
-            while (pBlock)
-            {
-                if (pBlock->size >= nMinBlockSize)
-                {
-                    // Reuse free block
-                    if (pPrev)
-                    {
-                        pPrev->next = pBlock->next;
-                    }
-                    else
-                    {
-                        m_free_blocks = pBlock->next;
-                    }
-
-                    pBlock->next = m_blocks;
-                    m_blocks = pBlock;
-                    m_ptr = pBlock->s;
-                    m_start = pBlock->s;
-                    m_end = pBlock->s + pBlock->size;
-                    return;
-                }
-                pPrev = pBlock;
-                pBlock = pBlock->next;
-            }
-        }
-        size_t nMallocSize = offsetof(BLOCK, s) + blockSize * sizeof(char);
-        g_nTotalAllocInXmlStringPools += nMallocSize;
-
-        BLOCK* pBlock = (BLOCK*)CryModuleMalloc(nMallocSize);
-        ;
-        assert(pBlock);
-        pBlock->size = blockSize;
-        pBlock->next = m_blocks;
-        m_blocks = pBlock;
-        m_ptr = pBlock->s;
-        m_start = pBlock->s;
-        m_end = pBlock->s + blockSize;
-        nUsedBlocks++;
-    }
-    void ReallocBlock(int blockSize)
-    {
-        if (m_reuseStrings)
-        {
-            CryFatalError("Can't replace strings in an xml node that reuses strings");
-        }
-
-        BLOCK* pThisBlock = m_blocks;
-        BLOCK* pPrevBlock = m_blocks->next;
-        m_blocks = pPrevBlock;
-
-        size_t nMallocSize = offsetof(BLOCK, s) + blockSize * sizeof(char);
-        if (pThisBlock)
-        {
-            g_nTotalAllocInXmlStringPools -= (offsetof(BLOCK, s) + pThisBlock->size * sizeof(char));
-        }
-        g_nTotalAllocInXmlStringPools += nMallocSize;
-
-
-        BLOCK* pBlock = (BLOCK*)CryModuleRealloc(pThisBlock, nMallocSize);
-        assert(pBlock);
-        pBlock->size = blockSize;
-        pBlock->next = m_blocks;
-        m_blocks = pBlock;
-        m_ptr = pBlock->s;
-        m_start = pBlock->s;
-        m_end = pBlock->s + blockSize;
-    }
-
-    char* FindExistingString(const char* szString, int nStrLen)
-    {
-        SStringData testData(szString, nStrLen);
-        char* szResult = stl::find_in_map(m_stringToExistingStringMap, testData, NULL);
-        assert(!szResult || !_stricmp(szResult, szString));
-        return szResult;
-    }
-};
-
-
-#endif // CRYINCLUDE_CRYSYSTEM_SIMPLESTRINGPOOL_H
diff --git a/Code/CryEngine/CrySystem/System.cpp b/Code/CryEngine/CrySystem/System.cpp
deleted file mode 100644
index 07160a7143..0000000000
--- a/Code/CryEngine/CrySystem/System.cpp
+++ /dev/null
@@ -1,1826 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CryENGINE system core-handle all subsystems
-
-
-#include "CrySystem_precompiled.h"
-#include "System.h"
-#include <time.h>
-#include <AzCore/Console/Console.h>
-#include <AzCore/IO/IStreamer.h>
-#include <AzCore/IO/SystemFile.h>
-#include "CryLibrary.h"
-#include <CryPath.h>
-#include <CrySystemBus.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/API/ApplicationAPI_Platform.h>
-#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
-#include <AzCore/Debug/Trace.h>
-#include <AzCore/Debug/IEventLogger.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzFramework/Logging/MissingAssetLogger.h>
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzCore/Interface/Interface.h>
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define SYSTEM_CPP_SECTION_1 1
-#define SYSTEM_CPP_SECTION_2 2
-#define SYSTEM_CPP_SECTION_3 3
-#define SYSTEM_CPP_SECTION_4 4
-#define SYSTEM_CPP_SECTION_5 5
-#define SYSTEM_CPP_SECTION_6 6
-#define SYSTEM_CPP_SECTION_7 7
-#define SYSTEM_CPP_SECTION_8 8
-#define SYSTEM_CPP_SECTION_9 9
-#endif
-
-#if defined(_RELEASE) && AZ_LEGACY_CRYSYSTEM_TRAIT_USE_EXCLUDEUPDATE_ON_CONSOLE
-//exclude some not needed functionality for release console builds
-#define EXCLUDE_UPDATE_ON_CONSOLE
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-// If app hasn't chosen, set to work with Windows 98, Windows Me, Windows 2000, Windows XP and beyond
-#include <windows.h>
-
-LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    CSystem* pSystem = 0;
-    if (gEnv)
-    {
-        pSystem = static_cast<CSystem*>(gEnv->pSystem);
-    }
-    if (pSystem && !pSystem->IsQuitting())
-    {
-        LRESULT result = 0;
-        bool bAny = false;
-        for (std::vector<IWindowMessageHandler*>::const_iterator it = pSystem->m_windowMessageHandlers.begin(); it != pSystem->m_windowMessageHandlers.end(); ++it)
-        {
-            IWindowMessageHandler* pHandler = *it;
-            LRESULT maybeResult = 0xDEADDEAD;
-            if (pHandler->HandleMessage(hWnd, uMsg, wParam, lParam, &maybeResult))
-            {
-                assert(maybeResult != 0xDEADDEAD && "Message handler indicated a resulting value, but no value was written");
-                if (bAny)
-                {
-                    assert(result == maybeResult && "Two window message handlers tried to return different result values");
-                }
-                else
-                {
-                    bAny = true;
-                    result = maybeResult;
-                }
-            }
-        }
-        if (bAny)
-        {
-            // One of the registered handlers returned something
-            return result;
-        }
-    }
-
-    // Handle with the default procedure
-#if defined(UNICODE) || defined(_UNICODE)
-    assert(IsWindowUnicode(hWnd) && "Window should be Unicode when compiling with UNICODE");
-#else
-    if (!IsWindowUnicode(hWnd))
-    {
-        return DefWindowProcA(hWnd, uMsg, wParam, lParam);
-    }
-#endif
-    return DefWindowProcW(hWnd, uMsg, wParam, lParam);
-}
-#endif
-
-#if defined(LINUX) && !defined(ANDROID)
-#include <execinfo.h> // for backtrace
-#endif
-
-#if defined(ANDROID)
-#include <unwind.h>  // for _Unwind_Backtrace and _Unwind_GetIP
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_1
-#include AZ_RESTRICTED_FILE(System_cpp)
-#endif
-
-#include <IRenderer.h>
-#include <IMovieSystem.h>
-#include <ILog.h>
-#include <IAudioSystem.h>
-#include <IProcess.h>
-#include <LyShine/ILyShine.h>
-
-#include <LoadScreenBus.h>
-
-#include <AzFramework/Archive/Archive.h>
-#include "XConsole.h"
-#include "Log.h"
-
-#include "XML/xml.h"
-#include "XML/ReadWriteXMLSink.h"
-
-#include "LocalizedStringManager.h"
-#include "XML/XmlUtils.h"
-#include "SystemEventDispatcher.h"
-#include "HMDBus.h"
-
-#include "zlib.h"
-#include "RemoteConsole/RemoteConsole.h"
-
-#include <PNoise3.h>
-#include <StringUtils.h>
-
-#include <LyShine/Bus/UiCursorBus.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/Input/Buses/Requests/InputSystemRequestBus.h>
-
-#ifdef WIN32
-
-#include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
-
-// To enable profiling with vtune (https://software.intel.com/en-us/intel-vtune-amplifier-xe), make sure the line below is not commented out
-//#define  PROFILE_WITH_VTUNE
-
-#include <process.h>
-#include <malloc.h>
-#endif
-
-#include <ILevelSystem.h>
-
-#include <AzFramework/IO/LocalFileIO.h>
-
-// profilers api.
-VTuneFunction VTResume = NULL;
-VTuneFunction VTPause = NULL;
-
-// Define global cvars.
-SSystemCVars g_cvars;
-
-#include <IViewSystem.h>
-
-#include <AzCore/Module/Environment.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include "AZCoreLogSink.h"
-
-#if defined(ANDROID)
-namespace
-{
-    struct Callstack
-    {
-        Callstack()
-            : addrs(NULL)
-            , ignore(0)
-            , count(0)
-        {
-        }
-        Callstack(void** addrs, size_t ignore, size_t count)
-        {
-            this->addrs = addrs;
-            this->ignore = ignore;
-            this->count = count;
-        }
-        void** addrs;
-        size_t ignore;
-        size_t count;
-    };
-
-    static _Unwind_Reason_Code trace_func(struct _Unwind_Context* context, void* arg)
-    {
-        Callstack* cs = static_cast<Callstack*>(arg);
-        if (cs->count)
-        {
-            void* ip = (void*) _Unwind_GetIP(context);
-            if (ip)
-            {
-                if (cs->ignore)
-                {
-                    cs->ignore--;
-                }
-                else
-                {
-                    cs->addrs[0] = ip;
-                    cs->addrs++;
-                    cs->count--;
-                }
-            }
-        }
-        return _URC_NO_REASON;
-    }
-
-    static int Backtrace(void** addrs, size_t ignore, size_t size)
-    {
-        Callstack cs(addrs, ignore, size);
-        _Unwind_Backtrace(trace_func, (void*) &cs);
-        return size - cs.count;
-    }
-}
-#endif
-
-/////////////////////////////////////////////////////////////////////////////////
-// System Implementation.
-//////////////////////////////////////////////////////////////////////////
-CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
-{
-    CrySystemRequestBus::Handler::BusConnect();
-
-    if (!pSharedEnvironment)
-    {
-        CryFatalError("No shared environment instance provided. "
-            "Cross-module sharing of EBuses and allocators "
-            "is not possible.");
-    }
-
-    m_systemGlobalState = ESYSTEM_GLOBAL_STATE_UNKNOWN;
-    m_iHeight = 0;
-    m_iWidth = 0;
-    m_iColorBits = 0;
-    // CRT ALLOCATION threshold
-
-    m_bIsAsserting = false;
-    m_pSystemEventDispatcher = new CSystemEventDispatcher(); // Must be first.
-
-    if (m_pSystemEventDispatcher)
-    {
-        m_pSystemEventDispatcher->RegisterListener(this);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Clear environment.
-    //////////////////////////////////////////////////////////////////////////
-    memset(&m_env, 0, sizeof(m_env));
-
-    //////////////////////////////////////////////////////////////////////////
-    // Initialize global environment interface pointers.
-    m_env.pSystem = this;
-    m_env.pTimer = &m_Time;
-    m_env.pNameTable = &m_nameTable;
-    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;
-
-    m_bInitializedSuccessfully = false;
-    m_bRelaunch = false;
-    m_iLoadingMode = 0;
-    m_bTestMode = false;
-    m_bEditor = false;
-    m_bPreviewMode = false;
-    m_bIgnoreUpdates = false;
-    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;
-
-
-    m_pXMLUtils = new CXmlUtils(this);
-
-    if (!AZ::AllocatorInstance<AZ::OSAllocator>::IsReady())
-    {
-        m_initedOSAllocator = true;
-        AZ::AllocatorInstance<AZ::OSAllocator>::Create();
-    }
-    if (!AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
-    {
-        m_initedSysAllocator = true;
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-        AZ::Debug::Trace::Instance().Init();
-    }
-
-    m_bNeedDoWorkDuringOcclusionChecks = false;
-
-    m_eRuntimeState = ESYSTEM_EVENT_LEVEL_UNLOAD;
-
-    m_bHasRenderedErrorMessage = false;
-
-    m_pDataProbe = nullptr;
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
-    RegisterWindowMessageHandler(this);
-#endif
-
-    m_ConfigPlatform = CONFIG_INVALID_PLATFORM;
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////
-CSystem::~CSystem()
-{
-    ShutDown();
-
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
-    UnregisterWindowMessageHandler(this);
-#endif
-
-    CRY_ASSERT(m_windowMessageHandlers.empty() && "There exists a dangling window message handler somewhere");
-
-    SAFE_DELETE(m_pXMLUtils);
-    SAFE_DELETE(m_pSystemEventDispatcher);
-
-    AZCoreLogSink::Disconnect();
-    if (m_initedSysAllocator)
-    {
-        AZ::Debug::Trace::Instance().Destroy();
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-    }
-    if (m_initedOSAllocator)
-    {
-        AZ::AllocatorInstance<AZ::OSAllocator>::Destroy();
-    }
-
-    AZ::Environment::Detach();
-
-    m_env.pSystem = 0;
-    gEnv = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::Release()
-{
-    //Disconnect the render bus
-    AZ::RenderNotificationsBus::Handler::BusDisconnect();
-
-    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;
-}
-
-
-///////////////////////////////////////////////////
-void CSystem::ShutDown()
-{
-    CryLogAlways("System Shutdown");
-
-    // don't broadcast OnCrySystemShutdown unless
-    // we'd previously broadcast OnCrySystemInitialized
-    if (m_bInitializedSuccessfully)
-    {
-        EBUS_EVENT(CrySystemEventBus, OnCrySystemShutdown, *this);
-    }
-
-    if (m_pUserCallback)
-    {
-        m_pUserCallback->OnShutdown();
-    }
-
-    if (GetIRemoteConsole()->IsStarted())
-    {
-        GetIRemoteConsole()->Stop();
-    }
-
-    if (m_sys_firstlaunch)
-    {
-        m_sys_firstlaunch->Set("0");
-    }
-
-    if ((m_bEditor) && (m_env.pConsole))
-    {
-        // restore the old saved cvars
-        if (m_env.pConsole->GetCVar("r_Width"))
-        {
-            m_env.pConsole->GetCVar("r_Width")->Set(m_iWidth);
-        }
-        if (m_env.pConsole->GetCVar("r_Height"))
-        {
-            m_env.pConsole->GetCVar("r_Height")->Set(m_iHeight);
-        }
-        if (m_env.pConsole->GetCVar("r_ColorBits"))
-        {
-            m_env.pConsole->GetCVar("r_ColorBits")->Set(m_iColorBits);
-        }
-    }
-
-    if (m_bEditor && !m_bRelaunch)
-    {
-        SaveConfiguration();
-    }
-
-    // Dispatch the full-shutdown event in case this is not a fast-shutdown.
-    if (m_pSystemEventDispatcher != NULL)
-    {
-        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();
-        gEnv->pLyShine = nullptr;
-    }
-
-    SAFE_RELEASE(m_env.pMovieSystem);
-    SAFE_RELEASE(m_env.pLyShine);
-    SAFE_RELEASE(m_env.pCryFont);
-    if (m_env.pConsole)
-    {
-        ((CXConsole*)m_env.pConsole)->FreeRenderResources();
-    }
-    SAFE_RELEASE(m_pViewSystem);
-    SAFE_RELEASE(m_pLevelSystem);
-
-    if (m_env.pLog)
-    {
-        m_env.pLog->UnregisterConsoleVariables();
-    }
-
-    GetIRemoteConsole()->UnregisterConsoleVariables();
-
-    // 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;
-    m_pCmdLine = 0;
-
-    // Audio System Shutdown!
-    // Shut down audio as late as possible but before the streaming system and console get released!
-    Audio::Gem::AudioSystemGemRequestBus::Broadcast(&Audio::Gem::AudioSystemGemRequestBus::Events::Release);
-
-    // Shut down console as late as possible and after audio!
-    SAFE_RELEASE(m_env.pConsole);
-
-    // Log must be last thing released.
-    if (m_env.pLog)
-    {
-        m_env.pLog->FlushAndClose();
-    }
-    SAFE_RELEASE(m_env.pLog);   // creates log backup
-
-    ShutdownFileSystem();
-
-    ShutdownModuleLibraries();
-
-    EBUS_EVENT(CrySystemEventBus, OnCrySystemPostShutdown);
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////
-void CSystem::Quit()
-{
-    CryLogAlways("CSystem::Quit invoked from thread %" PRI_THREADID " (main is %" PRI_THREADID ")", GetCurrentThreadId(), gEnv->mMainThreadId);
-
-    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::ExitMainLoop);
-
-    // If this was set from anywhere but the main thread, bail and let the main thread handle shutdown
-    if (GetCurrentThreadId() != gEnv->mMainThreadId)
-    {
-        return;
-    }
-
-    if (m_pUserCallback)
-    {
-        m_pUserCallback->OnQuit();
-    }
-
-    gEnv->pLog->FlushAndClose();
-
-    // Latest possible place to flush any pending messages to disk before the forceful termination.
-    if (auto logger = AZ::Interface<AZ::Debug::IEventLogger>::Get(); logger)
-    {
-        logger->Flush();
-    }
-
-    /*
-    * TODO: This call to _exit, _Exit, TerminateProcess etc. needs to
-    * eventually be removed. This causes an extremely early exit before we
-    * actually perform cleanup. When this gets called most managers are
-    * simply never deleted and we leave it to the OS to clean up our mess
-    * which is just really bad practice. However there are LOTS of issues
-    * with shutdown at the moment. Removing this will simply cause
-    * a crash when either the Editor or Launcher initiate shutdown. Both
-    * applications crash differently too. Bugs will be logged about those
-    * issues.
-    */
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_4
-#include AZ_RESTRICTED_FILE(System_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32) || defined(WIN64)
-    TerminateProcess(GetCurrentProcess(), m_env.retCode);
-#else
-    exit(m_env.retCode);
-#endif
-
-#ifdef WIN32
-    //Post a WM_QUIT message to the Win32 api which causes the message loop to END
-    //This is not the same as handling a WM_DESTROY event which destroys a window
-    //but keeps the message loop alive.
-    PostQuitMessage(0);
-#endif
-}
-/////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////
-bool CSystem::IsQuitting() const
-{
-    bool wasExitMainLoopRequested = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(wasExitMainLoopRequested, &AzFramework::ApplicationRequests::WasExitMainLoopRequested);
-    return wasExitMainLoopRequested;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::SetIProcess(IProcess* process)
-{
-    m_pProcess = process;
-    //if (m_pProcess)
-    //m_pProcess->SetPMessage("");
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISystem* CSystem::GetCrySystem()
-{
-    return this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::SleepIfNeeded()
-{
-    FUNCTION_PROFILER_FAST(this, PROFILE_SYSTEM, g_bProfilerEnabled);
-
-    ITimer* const pTimer = gEnv->pTimer;
-    static bool firstCall = true;
-
-    typedef MiniQueue<CTimeValue, 32> PrevNow;
-    static PrevNow prevNow;
-    if (firstCall)
-    {
-        m_lastTickTime = pTimer->GetAsyncTime();
-        prevNow.Push(m_lastTickTime);
-        firstCall = false;
-        return;
-    }
-
-    const float maxRate = m_svDedicatedMaxRate->GetFVal();
-    const float minTime = 1.0f / maxRate;
-    CTimeValue now = pTimer->GetAsyncTime();
-    float elapsed = (now - m_lastTickTime).GetSeconds();
-
-    if (prevNow.Full())
-    {
-        prevNow.Pop();
-    }
-    prevNow.Push(now);
-
-    static bool allowStallCatchup = true;
-    if (elapsed > minTime && allowStallCatchup)
-    {
-        allowStallCatchup = false;
-        m_lastTickTime = pTimer->GetAsyncTime();
-        return;
-    }
-    allowStallCatchup = true;
-
-    float totalElapsed = (now - prevNow.Front()).GetSeconds();
-    float wantSleepTime = CLAMP(minTime * (prevNow.Size() - 1) - totalElapsed, 0, (minTime - elapsed) * 0.9f);
-    static float sleepTime = 0;
-    sleepTime = (15 * sleepTime + wantSleepTime) / 16;
-    int sleepMS = (int)(1000.0f * sleepTime + 0.5f);
-    if (sleepMS > 0)
-    {
-        AZ_PROFILE_FUNCTION_IDLE(AZ::Debug::ProfileCategory::System);
-        Sleep(sleepMS);
-    }
-
-    m_lastTickTime = pTimer->GetAsyncTime();
-}
-
-extern DWORD g_idDebugThreads[];
-extern int g_nDebugThreads;
-int prev_sys_float_exceptions = -1;
-
-//////////////////////////////////////////////////////////////////////
-bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
-{
-    // If we detect the quit flag at the start of Update, that means it was set
-    // from another thread, and we should quit immediately. Otherwise, it will
-    // be set by game logic or the console during Update and we will quit later
-    if (IsQuitting())
-    {
-        Quit();
-        return false;
-    }
-
-#ifndef EXCLUDE_UPDATE_ON_CONSOLE
-    // do the dedicated sleep earlier than the frame profiler to avoid having it counted
-    if (gEnv->IsDedicated())
-    {
-        SleepIfNeeded();
-    }
-#endif //EXCLUDE_UPDATE_ON_CONSOLE
-
-#ifdef WIN32
-    // enable/disable SSE fp exceptions (#nan and /0)
-    // need to do it each frame since sometimes they are being reset
-    _mm_setcsr(_mm_getcsr() & ~0x280 | (g_cvars.sys_float_exceptions > 0 ? 0 : 0x280));
-#endif //WIN32
-
-    FUNCTION_PROFILER_LEGACYONLY(GetISystem(), PROFILE_SYSTEM);
-    AZ_TRACE_METHOD();
-
-    m_nUpdateCounter++;
-#ifndef EXCLUDE_UPDATE_ON_CONSOLE
-    if (m_pUserCallback)
-    {
-        m_pUserCallback->OnUpdate();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Enable/Disable floating exceptions.
-    //////////////////////////////////////////////////////////////////////////
-    prev_sys_float_exceptions += 1 + g_cvars.sys_float_exceptions & prev_sys_float_exceptions >> 31;
-    if (prev_sys_float_exceptions != g_cvars.sys_float_exceptions)
-    {
-        prev_sys_float_exceptions = g_cvars.sys_float_exceptions;
-
-        EnableFloatExceptions(g_cvars.sys_float_exceptions);
-    }
-#endif //EXCLUDE_UPDATE_ON_CONSOLE
-       //////////////////////////////////////////////////////////////////////////
-
-    if (m_env.pLog)
-    {
-        m_env.pLog->Update();
-    }
-
-#ifdef USE_REMOTE_CONSOLE
-    GetIRemoteConsole()->Update();
-#endif
-    if (nPauseMode != 0)
-    {
-        m_bPaused = true;
-    }
-    else
-    {
-        m_bPaused = false;
-    }
-
-#ifdef PROFILE_WITH_VTUNE
-    if (m_bInDevMode)
-    {
-        if (VTPause != NULL && VTResume != NULL)
-        {
-            static bool bVtunePaused = true;
-
-            const AzFramework::InputChannel* inputChannelScrollLock = AzFramework::InputChannelRequests::FindInputChannel(AzFramework::InputDeviceKeyboard::Key::WindowsSystemScrollLock);
-            const bool bPaused = (inputChannelScrollLock ? inputChannelScrollLock->IsActive() : false);
-
-            {
-                if (bVtunePaused && !bPaused)
-                {
-                    GetIProfilingSystem()->VTuneResume();
-                }
-                if (!bVtunePaused && bPaused)
-                {
-                    GetIProfilingSystem()->VTunePause();
-                }
-                bVtunePaused = bPaused;
-            }
-        }
-    }
-#endif //PROFILE_WITH_VTUNE
-
-#ifndef EXCLUDE_UPDATE_ON_CONSOLE
-    if (m_bIgnoreUpdates)
-    {
-        return true;
-    }
-#endif //EXCLUDE_UPDATE_ON_CONSOLE
-
-    //static bool sbPause = false;
-    //bool bPause = false;
-    bool bNoUpdate = false;
-#ifndef EXCLUDE_UPDATE_ON_CONSOLE
-    if (m_sysNoUpdate && m_sysNoUpdate->GetIVal())
-    {
-        bNoUpdate = true;
-    }
-
-    m_bNoUpdate = bNoUpdate;
-#endif //EXCLUDE_UPDATE_ON_CONSOLE
-
-    //check if we are quitting from the game
-    if (IsQuitting())
-    {
-        Quit();
-        return (false);
-    }
-
-    //limit frame rate if vsync is turned off
-    //for consoles this is done inside renderthread to be vsync dependent
-    {
-        FRAME_PROFILER_LEGACYONLY("FRAME_CAP", gEnv->pSystem, PROFILE_SYSTEM);
-        AZ_TRACE_METHOD_NAME("FrameLimiter");
-        static ICVar* pSysMaxFPS = NULL;
-        static ICVar* pVSync = NULL;
-
-        if (pSysMaxFPS == NULL && gEnv && gEnv->pConsole)
-        {
-            pSysMaxFPS = gEnv->pConsole->GetCVar("sys_MaxFPS");
-        }
-        if (pVSync == NULL && gEnv && gEnv->pConsole)
-        {
-            pVSync = gEnv->pConsole->GetCVar("r_Vsync");
-        }
-
-        if (pSysMaxFPS && pVSync)
-        {
-            int32 maxFPS = pSysMaxFPS->GetIVal();
-            uint32 vSync = pVSync->GetIVal();
-
-            if (maxFPS == 0 && vSync == 0)
-            {
-                ILevelSystem* pLvlSys = GetILevelSystem();
-                const bool inLevel = pLvlSys && pLvlSys->IsLevelLoaded();
-                maxFPS = !inLevel || IsPaused() ? 60 : 0;
-            }
-
-            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())
-                {
-                    CrySleep(0);
-                }
-                sTimeLast = gEnv->pTimer->GetAsyncTime();
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    //update time subsystem
-    m_Time.UpdateOnFrameStart();
-
-    //////////////////////////////////////////////////////////////////////
-    //update console system
-    if (m_env.pConsole)
-    {
-        FRAME_PROFILER("SysUpdate:Console", this, PROFILE_SYSTEM);
-        m_env.pConsole->Update();
-    }
-
-    if (IsQuitting())
-    {
-        Quit();
-        return false;
-    }
-
-       //////////////////////////////////////////////////////////////////////
-       //update sound system Part 1 if in Editor / in Game Mode Viewsystem updates the Listeners
-    if (!m_env.IsEditorGameMode())
-    {
-        if ((updateFlags & ESYSUPDATE_EDITOR) != 0 && !bNoUpdate && nPauseMode != 1)
-        {
-            // updating the Listener Position in a first separate step.
-            // Updating all views here is a bit of a workaround, since we need
-            // to ensure that sound listeners owned by inactive views are also
-            // marked as inactive. Ideally that should happen when exiting game mode.
-            if (GetIViewSystem())
-            {
-                FRAME_PROFILER("SysUpdate:UpdateSoundListeners", this, PROFILE_SYSTEM);
-                GetIViewSystem()->UpdateSoundListeners();
-            }
-        }
-    }
-
-    // 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)
-    {
-        FRAME_PROFILER("SysUpdate:UpdateMovieSystem", this, PROFILE_SYSTEM);
-        UpdateMovieSystem(updateFlags, fMovieFrameTime, true);
-    }
-
-    return !IsQuitting();
-}
-
-//////////////////////////////////////////////////////////////////////
-bool CSystem::UpdatePostTickBus(int updateFlags, int /*nPauseMode*/)
-{
-    CTimeValue updateStart = gEnv->pTimer->GetAsyncTime();
-
-    // Run movie system post-update
-    if (!m_bNoUpdate)
-    {
-        const float fMovieFrameTime = m_Time.GetFrameTime(ITimer::ETIMER_UI);
-        FRAME_PROFILER("SysUpdate:UpdateMovieSystem", this, PROFILE_SYSTEM);
-        UpdateMovieSystem(updateFlags, fMovieFrameTime, false);
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    //update sound system part 2
-    if (!g_cvars.sys_deferAudioUpdateOptim && !m_bNoUpdate)
-    {
-        FRAME_PROFILER("SysUpdate:UpdateAudioSystems", this, PROFILE_SYSTEM);
-        UpdateAudioSystems();
-    }
-    else
-    {
-        m_bNeedDoWorkDuringOcclusionChecks = true;
-    }
-
-    //Now update frame statistics
-    CTimeValue cur_time = gEnv->pTimer->GetAsyncTime();
-
-    CTimeValue a_second(g_cvars.sys_update_profile_time);
-    std::vector< std::pair<CTimeValue, float> >::iterator it = m_updateTimes.begin();
-    for (std::vector< std::pair<CTimeValue, float> >::iterator eit = m_updateTimes.end(); it != eit; ++it)
-    {
-        if ((cur_time - it->first) < a_second)
-        {
-            break;
-        }
-    }
-
-    {
-        if (it != m_updateTimes.begin())
-        {
-            m_updateTimes.erase(m_updateTimes.begin(), it);
-        }
-
-        float updateTime = (cur_time - updateStart).GetMilliSeconds();
-        m_updateTimes.push_back(std::make_pair(cur_time, updateTime));
-    }
-
-    {
-        FRAME_PROFILER("SysUpdate - SystemEventDispatcher::Update", this, PROFILE_SYSTEM);
-        m_pSystemEventDispatcher->Update();
-    }
-
-    if (!gEnv->IsEditing() && m_eRuntimeState == ESYSTEM_EVENT_LEVEL_GAMEPLAY_START)
-    {
-        gEnv->pCryPak->DisableRuntimeFileAccess(true);
-    }
-
-    // Also broadcast for anyone else that needs to draw global debug to do so now
-    AzFramework::DebugDisplayEventBus::Broadcast(&AzFramework::DebugDisplayEvents::DrawGlobalDebugInfo);
-
-    return !IsQuitting();
-}
-
-
-bool CSystem::UpdateLoadtime()
-{
-    return !IsQuitting();
-}
-
-void CSystem::DoWorkDuringOcclusionChecks()
-{
-    if (g_cvars.sys_deferAudioUpdateOptim && !m_bNoUpdate)
-    {
-        UpdateAudioSystems();
-        m_bNeedDoWorkDuringOcclusionChecks = false;
-    }
-}
-
-void CSystem::UpdateAudioSystems()
-{
-    AZ_TRACE_METHOD();
-    FRAME_PROFILER_LEGACYONLY("SysUpdate:Audio", this, PROFILE_SYSTEM);
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::ExternalUpdate);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::GetUpdateStats(SSystemUpdateStats& stats)
-{
-    if (m_updateTimes.empty())
-    {
-        stats = SSystemUpdateStats();
-    }
-    else
-    {
-        stats.avgUpdateTime = 0;
-        stats.maxUpdateTime = -FLT_MAX;
-        stats.minUpdateTime = +FLT_MAX;
-        for (std::vector< std::pair<CTimeValue, float> >::const_iterator it = m_updateTimes.begin(), eit = m_updateTimes.end(); it != eit; ++it)
-        {
-            const float t = it->second;
-            stats.avgUpdateTime += t;
-            stats.maxUpdateTime = max(stats.maxUpdateTime, t);
-            stats.minUpdateTime = min(stats.minUpdateTime, t);
-        }
-        stats.avgUpdateTime /= m_updateTimes.size();
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::UpdateMovieSystem(const int updateFlags, const float fFrameTime, const bool bPreUpdate)
-{
-    if (m_env.pMovieSystem && !(updateFlags & ESYSUPDATE_EDITOR) && g_cvars.sys_trackview)
-    {
-        float fMovieFrameTime = fFrameTime;
-
-        if (fMovieFrameTime > g_cvars.sys_maxTimeStepForMovieSystem)
-        {
-            fMovieFrameTime = g_cvars.sys_maxTimeStepForMovieSystem;
-        }
-
-        if (bPreUpdate)
-        {
-            m_env.pMovieSystem->PreUpdate(fMovieFrameTime);
-        }
-        else
-        {
-            m_env.pMovieSystem->PostUpdate(fMovieFrameTime);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// XML stuff
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CSystem::CreateXmlNode(const char* sNodeName, bool bReuseStrings, bool bIsProcessingInstruction)
-{
-    return new CXmlNode(sNodeName, bReuseStrings, bIsProcessingInstruction);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IXmlUtils* CSystem::GetXmlUtils()
-{
-    return m_pXMLUtils;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CSystem::LoadXmlFromFile(const char* sFilename, bool bReuseStrings)
-{
-    LOADING_TIME_PROFILE_SECTION_ARGS(sFilename);
-
-    return m_pXMLUtils->LoadXmlFromFile(sFilename, bReuseStrings);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CSystem::LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings, bool bSuppressWarnings)
-{
-    LOADING_TIME_PROFILE_SECTION
-    return m_pXMLUtils->LoadXmlFromBuffer(buffer, size, bReuseStrings, bSuppressWarnings);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSystem::CheckLogVerbosity(int verbosity)
-{
-    if (verbosity <= m_env.pLog->GetVerbosityLevel())
-    {
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::Warning(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    WarningV(module, severity, flags, file, format, args);
-    va_end(args);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSystem::ShowMessage(const char* text, const char* caption, unsigned int uType)
-{
-    if (m_pUserCallback)
-    {
-        return m_pUserCallback->ShowMessage(text, caption, uType);
-    }
-    return CryMessageBox(text, caption, uType);
-}
-
-inline const char* ValidatorModuleToString(EValidatorModule module)
-{
-    switch (module)
-    {
-    case VALIDATOR_MODULE_RENDERER:
-        return "Renderer";
-    case VALIDATOR_MODULE_3DENGINE:
-        return "3DEngine";
-    case VALIDATOR_MODULE_ASSETS:
-        return "Assets";
-    case VALIDATOR_MODULE_SYSTEM:
-        return "System";
-    case VALIDATOR_MODULE_AUDIO:
-        return "Audio";
-    case VALIDATOR_MODULE_MOVIE:
-        return "Movie";
-    case VALIDATOR_MODULE_EDITOR:
-        return "Editor";
-    case VALIDATOR_MODULE_NETWORK:
-        return "Network";
-    case VALIDATOR_MODULE_PHYSICS:
-        return "Physics";
-    case VALIDATOR_MODULE_ONLINE:
-        return "Online";
-    case VALIDATOR_MODULE_FEATURETESTS:
-        return "FeatureTests";
-    case VALIDATOR_MODULE_SHINE:
-        return "UI";
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::WarningV(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args)
-{
-    // Fran: No logging in a testing environment
-    if (m_env.pLog == 0)
-    {
-        return;
-    }
-
-    const char* sModuleFilter = m_env.pLog->GetModuleFilter();
-    if (sModuleFilter && *sModuleFilter != 0)
-    {
-        const char* sModule = ValidatorModuleToString(module);
-        if (strlen(sModule) > 1 || CryStringUtils::stristr(sModule, sModuleFilter) == 0)
-        {
-            // Filter out warnings from other modules.
-            return;
-        }
-    }
-
-    bool bDbgBreak = false;
-    if (severity == VALIDATOR_ERROR_DBGBRK)
-    {
-        bDbgBreak = true;
-        severity = VALIDATOR_ERROR; // change it to a standard VALIDATOR_ERROR for simplicity in the rest of the system
-    }
-
-    IMiniLog::ELogType ltype = ILog::eComment;
-    switch (severity)
-    {
-    case    VALIDATOR_ERROR:
-        ltype = ILog::eError;
-        break;
-    case    VALIDATOR_WARNING:
-        ltype = ILog::eWarning;
-        break;
-    case    VALIDATOR_COMMENT:
-        ltype = ILog::eComment;
-        break;
-    default:
-        break;
-    }
-    char szBuffer[MAX_WARNING_LENGTH];
-    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, format, args);
-
-    if (file && *file)
-    {
-        CryFixedStringT<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);
-    }
-
-    if (bDbgBreak && g_cvars.sys_error_debugbreak)
-    {
-        AZ::Debug::Trace::Break();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::GetLocalizedPath(const char* sLanguage, string& sLocalizedPath)
-{
-    // Omit the trailing slash!
-    string sLocalizationFolder(string().assign(PathUtil::GetLocalizationFolder(), 0, PathUtil::GetLocalizationFolder().size() - 1));
-
-    int locFormat = 0;
-    LocalizationManagerRequestBus::BroadcastResult(locFormat, &LocalizationManagerRequestBus::Events::GetLocalizationFormat);
-    if(locFormat == 1)
-    {
-        sLocalizedPath = sLocalizationFolder + "/" + sLanguage + ".loc.agsxml";
-    }
-    else
-    {
-    if (sLocalizationFolder.compareNoCase("Languages") != 0)
-    {
-        sLocalizedPath = sLocalizationFolder + "/" + sLanguage + "_xml.pak";
-    }
-    else
-    {
-        sLocalizedPath = string("Localized/") + sLanguage + "_xml.pak";
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::GetLocalizedAudioPath(const char* sLanguage, string& sLocalizedPath)
-{
-    // Omit the trailing slash!
-    string sLocalizationFolder(string().assign(PathUtil::GetLocalizationFolder(), 0, PathUtil::GetLocalizationFolder().size() - 1));
-
-    if (sLocalizationFolder.compareNoCase("Languages") != 0)
-    {
-        sLocalizedPath = sLocalizationFolder + "/" + sLanguage + ".pak";
-    }
-    else
-    {
-        sLocalizedPath = string("Localized/") + sLanguage + ".pak";
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::CloseLanguagePak(const char* sLanguage)
-{
-    string sLocalizedPath;
-    GetLocalizedPath(sLanguage, sLocalizedPath);
-    m_env.pCryPak->ClosePacks({ sLocalizedPath.c_str(), sLocalizedPath.size() });
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::CloseLanguageAudioPak(const char* sLanguage)
-{
-    string sLocalizedPath;
-    GetLocalizedAudioPath(sLanguage, sLocalizedPath);
-    m_env.pCryPak->ClosePacks({ sLocalizedPath.c_str(), sLocalizedPath.size() });
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::Relaunch(bool bRelaunch)
-{
-    if (m_sys_firstlaunch)
-    {
-        m_sys_firstlaunch->Set("0");
-    }
-
-    m_bRelaunch = bRelaunch;
-    SaveConfiguration();
-}
-
-//////////////////////////////////////////////////////////////////////////
-ILocalizationManager* CSystem::GetLocalizationManager()
-{
-    return m_pLocalizationManager;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::debug_GetCallStackRaw(void** callstack, uint32& callstackLength)
-{
-    uint32 callstackCapacity = callstackLength;
-    uint32 nNumStackFramesToSkip = 1;
-
-    memset(callstack, 0, sizeof(void*) * callstackLength);
-
-#if !defined(ANDROID)
-    callstackLength = 0;
-#endif
-
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_CAPTURESTACK
-    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)
-{
-    if (m_executedCommandLine)
-    {
-        return;
-    }
-
-    m_executedCommandLine = true;
-
-    // execute command line arguments e.g. +g_gametype ASSAULT +map "testy"
-
-    ICmdLine* pCmdLine = GetICmdLine();
-    assert(pCmdLine);
-
-    const int iCnt = pCmdLine->GetArgCount();
-    for (int i = 0; i < iCnt; ++i)
-    {
-        const ICmdLineArg* pCmd = pCmdLine->GetArg(i);
-
-        if (pCmd->GetType() == eCLAT_Post)
-        {
-            string sLine = pCmd->GetName();
-            {
-                if (pCmd->GetValue())
-                {
-                    sLine += string(" ") + pCmd->GetValue();
-                }
-
-                GetILog()->Log("Executing command from command line: \n%s\n", sLine.c_str()); // - the actual command might be executed much later (e.g. level load pause)
-                GetIConsole()->ExecuteString(sLine.c_str(), false, 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)
-{
-    m_ConfigPlatform = platform;
-}
-
-//////////////////////////////////////////////////////////////////////////
-ESystemConfigPlatform CSystem::GetConfigPlatform() const
-{
-    return m_ConfigPlatform;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CPNoise3* CSystem::GetNoiseGen()
-{
-    static CPNoise3 m_pNoiseGen;
-    return &m_pNoiseGen;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CProfilingSystem::VTuneResume()
-{
-#ifdef PROFILE_WITH_VTUNE
-    if (VTResume)
-    {
-        CryLogAlways("VTune Resume");
-        VTResume();
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CProfilingSystem::VTunePause()
-{
-#ifdef PROFILE_WITH_VTUNE
-    if (VTPause)
-    {
-        VTPause();
-        CryLogAlways("VTune Pause");
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////
-void CSystem::OnLanguageCVarChanged(ICVar* language)
-{
-    if (language && language->GetType() == CVAR_STRING)
-    {
-        CSystem* pSys = static_cast<CSystem*>(gEnv->pSystem);
-        if (pSys && pSys->GetLocalizationManager())
-        {
-            const char* lang = language->GetString();
-
-            // Hook up Localization initialization
-            int locFormat = 0;
-            LocalizationManagerRequestBus::BroadcastResult(locFormat, &LocalizationManagerRequestBus::Events::GetLocalizationFormat);
-            if (locFormat == 0)
-            {
-                const char* locLanguage = nullptr;
-                LocalizationManagerRequestBus::BroadcastResult(locLanguage, &LocalizationManagerRequestBus::Events::GetLanguage);
-            pSys->OpenLanguagePak(lang);
-            }
-
-            LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::SetLanguage, lang);
-            LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::ReloadData);
-
-            if (gEnv->pCryFont)
-            {
-                gEnv->pCryFont->OnLanguageChanged();
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-void CSystem::OnLanguageAudioCVarChanged(ICVar* language)
-{
-    static Audio::SAudioRequest oLanguageRequest;
-    static Audio::SAudioManagerRequestData<Audio::eAMRT_CHANGE_LANGUAGE> oLanguageRequestData;
-
-    if (language && (language->GetType() == CVAR_STRING))
-    {
-        oLanguageRequest.pData = &oLanguageRequestData;
-        oLanguageRequest.nFlags = Audio::eARF_PRIORITY_HIGH;
-        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, oLanguageRequest);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::OnLocalizationFolderCVarChanged(ICVar* const pLocalizationFolder)
-{
-    if (pLocalizationFolder && pLocalizationFolder->GetType() == CVAR_STRING)
-    {
-        CSystem* const pSystem = static_cast<CSystem* const>(gEnv->pSystem);
-
-        if (pSystem != NULL && gEnv->pCryPak != NULL)
-        {
-            CLocalizedStringsManager* const pLocalizationManager = static_cast<CLocalizedStringsManager* const>(pSystem->GetLocalizationManager());
-
-            if (pLocalizationManager)
-            {
-                // Get what is currently loaded
-                CLocalizedStringsManager::TLocalizationTagVec tagVec;
-                pLocalizationManager->GetLoadedTags(tagVec);
-
-                // Release the old localization data.
-                CLocalizedStringsManager::TLocalizationTagVec::const_iterator end = tagVec.end();
-                for (CLocalizedStringsManager::TLocalizationTagVec::const_iterator it = tagVec.begin(); it != end; ++it)
-                {
-                    pLocalizationManager->ReleaseLocalizationDataByTag(it->c_str());
-                }
-
-                // Close the paks situated in the previous localization folder.
-                pSystem->CloseLanguagePak(pLocalizationManager->GetLanguage());
-                pSystem->CloseLanguageAudioPak(pSystem->m_currentLanguageAudio.c_str());
-
-                // Set the new localization folder.
-                gEnv->pCryPak->SetLocalizationFolder(pLocalizationFolder->GetString());
-
-                // Now open the paks situated in the new localization folder.
-                pSystem->OpenLanguagePak(pLocalizationManager->GetLanguage());
-                pSystem->OpenLanguageAudioPak(pSystem->m_currentLanguageAudio.c_str());
-
-                // And load the new data.
-                for (CLocalizedStringsManager::TLocalizationTagVec::const_iterator it = tagVec.begin(); it != end; ++it)
-                {
-                    pLocalizationManager->LoadLocalizationDataByTag(it->c_str());
-                }
-            }
-        }
-    }
-}
-
-// Catch changes to assert verbosity and update the global used to track it
-void CSystem::SetAssertLevel(int _assertlevel)
-{
-    AZ::EnvironmentVariable<int> assertVerbosityLevel = AZ::Environment::FindVariable<int>("assertVerbosityLevel");
-    if (assertVerbosityLevel)
-    {
-        assertVerbosityLevel.Set(_assertlevel);
-    }
-}
-
-void CSystem::OnAssertLevelCvarChanged(ICVar* pArgs)
-{
-    SetAssertLevel(pArgs->GetIVal());
-}
-
-void CSystem::SetLogLevel(int _loglevel)
-{
-    AZ::EnvironmentVariable<int> logVerbosityLevel = AZ::Environment::FindVariable<int>("sys_LogLevel");
-    if (logVerbosityLevel.IsConstructed())
-    {
-        logVerbosityLevel.Set(_loglevel);
-    }
-}
-
-void CSystem::OnLogLevelCvarChanged(ICVar* pArgs)
-{
-    if (pArgs)
-    {
-        SetLogLevel(pArgs->GetIVal());
-    }
-}
-
-
-void CSystem::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-    switch (event)
-    {
-    case ESYSTEM_EVENT_LEVEL_LOAD_START_LOADINGSCREEN:
-    case ESYSTEM_EVENT_LEVEL_UNLOAD:
-        gEnv->pCryPak->DisableRuntimeFileAccess(false);
-    case ESYSTEM_EVENT_LEVEL_GAMEPLAY_START:
-        m_eRuntimeState = event;
-        break;
-    }
-}
-
-ESystemGlobalState CSystem::GetSystemGlobalState(void)
-{
-    return m_systemGlobalState;
-}
-
-const char* CSystem::GetSystemGlobalStateName(const ESystemGlobalState systemGlobalState)
-{
-    static const char* const s_systemGlobalStateNames[] = {
-        "UNKNOWN",                  // ESYSTEM_GLOBAL_STATE_UNKNOWN,
-        "INIT",                     // ESYSTEM_GLOBAL_STATE_INIT,
-        "RUNNING",                  // ESYSTEM_GLOBAL_STATE_RUNNING,
-        "LEVEL_LOAD_PREPARE",       // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE,
-        "LEVEL_LOAD_START",         // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START,
-        "LEVEL_LOAD_MATERIALS",     // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_MATERIALS,
-        "LEVEL_LOAD_OBJECTS",       // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_OBJECTS,
-        "LEVEL_LOAD_STATIC_WORLD",  // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_STATIC_WORLD,
-        "LEVEL_LOAD_PRECACHE",      // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE,
-        "LEVEL_LOAD_TEXTURES",      // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_TEXTURES,
-        "LEVEL_LOAD_END",           // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END,
-        "LEVEL_LOAD_COMPLETE"       // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE
-    };
-    const size_t numElements = sizeof(s_systemGlobalStateNames) / sizeof(s_systemGlobalStateNames[0]);
-    const size_t index = (size_t)systemGlobalState;
-    if (index >= numElements)
-    {
-        return "INVALID INDEX";
-    }
-    return s_systemGlobalStateNames[index];
-}
-
-void CSystem::SetSystemGlobalState(const ESystemGlobalState systemGlobalState)
-{
-    static CTimeValue s_startTime = CTimeValue();
-    if (systemGlobalState != m_systemGlobalState)
-    {
-        if (gEnv && gEnv->pTimer)
-        {
-            const CTimeValue endTime = gEnv->pTimer->GetAsyncTime();
-            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();
-        }
-    }
-    m_systemGlobalState = systemGlobalState;
-
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-    if (m_systemGlobalState == ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE)
-    {
-        EBUS_EVENT(LoadScreenBus, Stop);
-    }
-#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)
-{
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
-    assert(pHandler && !stl::find(m_windowMessageHandlers, pHandler) && "This IWindowMessageHandler is already registered");
-    m_windowMessageHandlers.push_back(pHandler);
-#else
-    CRY_ASSERT(false && "This platform does not support window message handlers");
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::UnregisterWindowMessageHandler(IWindowMessageHandler* pHandler)
-{
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
-#if !defined(NDEBUG)
-    bool bRemoved =
-#endif
-        stl::find_and_erase(m_windowMessageHandlers, pHandler);
-    assert(pHandler && bRemoved && "This IWindowMessageHandler was not registered");
-#else
-    CRY_ASSERT(false && "This platform does not support window message handlers");
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(WIN32)
-bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pResult)
-{
-    static bool sbInSizingModalLoop;
-    int x = LOWORD(lParam);
-    int y = HIWORD(lParam);
-    *pResult = 0;
-    switch (uMsg)
-    {
-    // System event translation
-    case WM_CLOSE:
-        /*
-            Trigger CSystem to call Quit() the next time
-            it calls Update(). HandleMessages can get messages
-            pumped to it from SyncMainWithRender which would
-            be called recurively by Quit(). Doing so would
-            cause the render thread to deadlock and the main
-            thread to spin in SRenderThread::WaitFlushFinishedCond.
-        */
-        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::ExitMainLoop);
-        return false;
-    case WM_MOVE:
-        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_MOVE, x, y);
-        return false;
-    case WM_SIZE:
-        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, x, y);
-        switch (wParam)
-        {
-        case SIZE_MINIMIZED:
-            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnMinimized);
-            break;
-        case SIZE_MAXIMIZED:
-            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnMaximized);
-            break;
-        case SIZE_RESTORED:
-            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnRestored);
-            break;
-        }
-        return false;
-    case WM_WINDOWPOSCHANGED:
-        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_POS_CHANGED, 1, 0);
-        return false;
-    case WM_STYLECHANGED:
-        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_STYLE_CHANGED, 1, 0);
-        return false;
-    case WM_ACTIVATE:
-        // Pass HIWORD(wParam) as well to indicate whether this window is minimized or not
-        // HIWORD(wParam) != 0 is minimized, HIWORD(wParam) == 0 is not minimized
-        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_ACTIVATE, LOWORD(wParam) != WA_INACTIVE, HIWORD(wParam));
-        return true;
-    case WM_SETFOCUS:
-        EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnSetFocus);
-        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_CHANGE_FOCUS, 1, 0);
-        return false;
-    case WM_KILLFOCUS:
-        EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnKillFocus);
-        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_CHANGE_FOCUS, 0, 0);
-        return false;
-    case WM_INPUTLANGCHANGE:
-        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LANGUAGE_CHANGE, wParam, lParam);
-        return false;
-
-    case WM_SYSCOMMAND:
-        if ((wParam & 0xFFF0) == SC_SCREENSAVE)
-        {
-            // Check if screen saver is allowed
-            IConsole* const pConsole = gEnv->pConsole;
-            const ICVar* const pVar = pConsole ? pConsole->GetCVar("sys_screensaver_allowed") : 0;
-            return pVar && pVar->GetIVal() == 0;
-        }
-        return false;
-
-    // Mouse activation
-    case WM_MOUSEACTIVATE:
-        *pResult = MA_ACTIVATEANDEAT;
-        return true;
-
-    // Hardware mouse counters
-    case WM_ENTERSIZEMOVE:
-        sbInSizingModalLoop = true;
-    // Fall through intended
-    case WM_ENTERMENULOOP:
-    {
-        UiCursorBus::Broadcast(&UiCursorInterface::IncrementVisibleCounter);
-        return true;
-    }
-    case WM_CAPTURECHANGED:
-    // If WM_CAPTURECHANGED is received after WM_ENTERSIZEMOVE (ie, moving/resizing begins).
-    // but no matching WM_EXITSIZEMOVE is received (this can happen if the window is not actually moved).
-    // we still need to decrement the hardware mouse counter that was incremented when WM_ENTERSIZEMOVE was seen.
-    // So in this case, we effectively treat WM_CAPTURECHANGED as if it was the WM_EXITSIZEMOVE message.
-    // This behavior has only been reproduced the window is deactivated during the modal loop (ie, breakpoint triggered and focus moves to VS).
-    case WM_EXITSIZEMOVE:
-        if (!sbInSizingModalLoop)
-        {
-            return false;
-        }
-        sbInSizingModalLoop = false;
-    // Fall through intended
-    case WM_EXITMENULOOP:
-    {
-        UiCursorBus::Broadcast(&UiCursorInterface::DecrementVisibleCounter);
-        return (uMsg != WM_CAPTURECHANGED);
-    }
-    case WM_SYSKEYUP:
-    case WM_SYSKEYDOWN:
-    {
-        const bool bAlt = (lParam & (1 << 29)) != 0;
-        if (bAlt && wParam == VK_F4)
-        {
-            return false;     // Pass though ALT+F4
-        }
-        // Prevent game from entering menu loop!  Editor does allow menu loop.
-        return !m_bEditor;
-    }
-    case WM_INPUT:
-    {
-        UINT rawInputSize;
-        const UINT rawInputHeaderSize = sizeof(RAWINPUTHEADER);
-        GetRawInputData((HRAWINPUT)lParam, RID_INPUT, NULL, &rawInputSize, rawInputHeaderSize);
-
-        AZStd::array<BYTE, sizeof(RAWINPUT)> rawInputBytesArray;
-        LPBYTE rawInputBytes = rawInputBytesArray.data();
-
-        const UINT bytesCopied = GetRawInputData((HRAWINPUT)lParam, RID_INPUT, rawInputBytes, &rawInputSize, rawInputHeaderSize);
-        CRY_ASSERT(bytesCopied == rawInputSize);
-
-        RAWINPUT* rawInput = (RAWINPUT*)rawInputBytes;
-        CRY_ASSERT(rawInput);
-
-        AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputEvent, *rawInput);
-
-        return false;
-    }
-    case WM_DEVICECHANGE:
-    {
-        if (wParam == 0x0007) // DBT_DEVNODES_CHANGED
-        {
-            AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputDeviceChangeEvent);
-        }
-        return true;
-    }
-    case WM_CHAR:
-    {
-        const unsigned short codeUnitUTF16 = static_cast<unsigned short>(wParam);
-        AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputCodeUnitUTF16Event, codeUnitUTF16);
-        return true;
-    }
-
-    // Any other event doesn't interest us
-    default:
-        return false;
-    }
-}
-
-#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;
-}
-
-#undef EXCLUDE_UPDATE_ON_CONSOLE
-
diff --git a/Code/CryEngine/CrySystem/System.h b/Code/CryEngine/CrySystem/System.h
deleted file mode 100644
index 8c122d0df2..0000000000
--- a/Code/CryEngine/CrySystem/System.h
+++ /dev/null
@@ -1,748 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <ISystem.h>
-#include <IRenderer.h>
-#include <IPhysics.h>
-#include <IWindowMessageHandler.h>
-
-#include "Timer.h"
-#include <CryVersion.h>
-#include "CmdLine.h"
-#include "CryName.h"
-
-#include <AzFramework/Archive/ArchiveVars.h>
-#include "RenderBus.h"
-
-#include <LoadScreenBus.h>
-
-#include <AzCore/Module/DynamicModuleHandle.h>
-
-namespace AzFramework
-{
-    class MissingAssetLogger;
-}
-
-struct IConsoleCmdArgs;
-class CWatchdogThread;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define SYSTEM_H_SECTION_1 1
-#define SYSTEM_H_SECTION_2 2
-#define SYSTEM_H_SECTION_3 3
-#define SYSTEM_H_SECTION_4 4
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEM_H_SECTION_1
-#include AZ_RESTRICTED_FILE(System_h)
-#else
-#if defined(WIN32) || defined(LINUX) || defined(APPLE)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_ALLOW_CREATE_BACKUP_LOG_FILE 1
-#endif
-#if defined(WIN32) || (defined(LINUX) && !defined(ANDROID)) || defined(MAC)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_DEFINE_DETECT_PROCESSOR 1
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(WIN32) || defined(APPLE) || defined(LINUX)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_DO_PREASSERT 1
-#endif
-#if defined(MAC) || (defined(LINUX) && !defined(ANDROID))
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_ASM_VOLATILE_CPUID 1
-#endif
-#if (defined(WIN32) && !defined(WIN64)) || (defined(LINUX) && !defined(ANDROID) && !defined(LINUX64))
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_HAS64BITEXT 1
-#endif
-#if defined(WIN32) || (defined(LINUX) && !defined(ANDROID)) || defined(MAC)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_HTSUPPORTED 1
-#endif
-#if defined(WIN32) || (defined(LINUX) && !defined(ANDROID)) || defined(MAC)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_HASCPUID 1
-#endif
-#if defined(WIN32)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_HASAFFINITYMASK 1
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_CRYPAK_POSIX 1
-#endif
-
-#if defined(WIN64)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_BIT64 1
-#endif
-
-#if defined(WIN32)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_PACKED_PEHEADER 1
-#endif
-#if defined(WIN32) || defined(LINUX)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_RENDERMEMORY_INFO 1
-#endif
-
-#if defined(WIN32)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_HANDLER_SYNC_AFFINITY 1
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_FORWARD_EXCEPTION_POINTERS 1
-#endif
-
-#if !defined(_WIN32)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_SINGLETON 1
-#endif
-#if !defined(LINUX) && !defined(APPLE)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_TRANSLATE 1
-#endif
-#if !defined(LINUX) && !defined(APPLE)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_APPEND_MODULENAME 1
-#endif
-
-#if !(defined(ANDROID) || defined(IOS) || defined(LINUX))
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_IMAGEHANDLER_TIFFIO 1
-#endif
-
-#if 1
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_JOBMANAGER_SIXWORKERTHREADS 0
-#endif
-
-#if defined(WIN32)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_MEMADDRESSRANGE_WINDOWS_STYLE 1
-#endif
-
-#if 1
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_EXCLUDEUPDATE_ON_CONSOLE 0
-#endif
-#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
-
-#if !defined(LINUX) && !defined(APPLE)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_SYSTEMCFG_MODULENAME 1
-#endif
-
-#if defined(WIN32) || defined(WIN64)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_THREADINFO_WINDOWS_STYLE 1
-#endif
-
-#if defined(WIN32)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_THREADTASK_EXCEPTIONS 1
-#endif
-//////////////////////////////////////////////////////////////////////////
-
-#if defined(APPLE) || defined(LINUX)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_FACTORY_REGISTRY_USE_PRINTF_FOR_FATAL 1
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_FTELL_NOT_FTELLI64 1
-#endif
-
-#endif
-
-#if defined(USE_UNIXCONSOLE) || defined(USE_ANDROIDCONSOLE) || defined(USE_WINDOWSCONSOLE) || defined(USE_IOSCONSOLE) || defined(USE_NULLCONSOLE)
-#define USE_DEDICATED_SERVER_CONSOLE
-#endif
-
-#if defined(LINUX)
-    #include "CryLibrary.h"
-#endif
-
-#ifdef WIN32
-typedef void* WIN_HMODULE;
-#else
-typedef void* WIN_HMODULE;
-#endif
-
-//forward declarations
-namespace Audio
-{
-    struct IAudioSystem;
-    struct IMusicSystem;
-} // namespace Audio
-struct IDataProbe;
-
-#define PHSYICS_OBJECT_ENTITY 0
-
-typedef void (__cdecl * VTuneFunction)(void);
-extern VTuneFunction VTResume;
-extern VTuneFunction VTPause;
-
-#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;
-    int sys_no_error_report_window;
-    int sys_dump_aux_threads;
-    int sys_WER;
-    int sys_dump_type;
-    int sys_ai;
-    int sys_entitysystem;
-    int sys_trackview;
-    int sys_vtune;
-    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;
-
-    int sys_deferAudioUpdateOptim;
-
-    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;
-
-class CSystem;
-
-struct CProfilingSystem
-    : public IProfilingSystem
-{
-    //////////////////////////////////////////////////////////////////////////
-    // VTune Profiling interface.
-
-    // Summary:
-    //   Resumes vtune data collection.
-    virtual void VTuneResume();
-    // Summary:
-    //   Pauses vtune data collection.
-    virtual void VTunePause();
-    //////////////////////////////////////////////////////////////////////////
-};
-
-class AssetSystem;
-
-/*
-===========================================
-The System interface Class
-===========================================
-*/
-class CXConsole;
-
-//////////////////////////////////////////////////////////////////////
-//! ISystem implementation
-class CSystem
-    : public ISystem
-    , public ILoadConfigurationEntrySink
-    , public ISystemEventListener
-    , public IWindowMessageHandler
-    , public AZ::RenderNotificationsBus::Handler
-    , public CrySystemRequestBus::Handler
-{
-public:
-    CSystem(SharedEnvironmentInstance* pSharedEnvironment);
-    ~CSystem();
-
-    static void OnLanguageCVarChanged(ICVar* language);
-    static void OnLanguageAudioCVarChanged(ICVar* language);
-    static void OnLocalizationFolderCVarChanged(ICVar* const pLocalizationFolder);
-    // adding CVAR to toggle assert verbosity level
-    static void OnAssertLevelCvarChanged(ICVar* pArgs);
-    static void SetAssertLevel(int _assertlevel);
-    static void OnLogLevelCvarChanged(ICVar* pArgs);
-    static void SetLogLevel(int _logLevel);
-
-    // interface ILoadConfigurationEntrySink ----------------------------------
-
-    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup);
-
-    // ISystemEventListener
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
-
-    ///////////////////////////////////////////////////////////////////////////
-    //! @name ISystem implementation
-    //@{
-    virtual bool Init(const SSystemInitParams& startupParams);
-    virtual void Release();
-
-    virtual SSystemGlobalEnvironment* GetGlobalEnvironment() { return &m_env; }
-
-    virtual bool UpdatePreTickBus(int updateFlags = 0, int nPauseMode = 0);
-    virtual bool UpdatePostTickBus(int updateFlags = 0, int nPauseMode = 0);
-    virtual bool UpdateLoadtime();
-    virtual void DoWorkDuringOcclusionChecks();
-    virtual bool NeedDoWorkDuringOcclusionChecks() { return m_bNeedDoWorkDuringOcclusionChecks; }
-
-    ////////////////////////////////////////////////////////////////////////
-    // CrySystemRequestBus interface implementation
-    ISystem* GetCrySystem() override;
-    ////////////////////////////////////////////////////////////////////////
-
-    void Relaunch(bool bRelaunch);
-    bool IsRelaunch() const { return m_bRelaunch; };
-
-    void SerializingFile(int mode) { m_iLoadingMode = mode; }
-    int  IsSerializingFile() const { return m_iLoadingMode; }
-    void Quit();
-    bool IsQuitting() const;
-    void ShutdownFileSystem(); // used to cleanup any file resources, such as cache handle.
-    void SetAffinity();
-    virtual const char* GetUserName();
-    virtual int GetApplicationInstance();
-    int GetApplicationLogInstance(const char* logFilePath) override;
-
-    ITimer* GetITimer(){ return m_env.pTimer; }
-    AZ::IO::IArchive* GetIPak() { return m_env.pCryPak; };
-    IConsole* GetIConsole() { return m_env.pConsole; };
-    IRemoteConsole* GetIRemoteConsole();
-    IMovieSystem* GetIMovieSystem() { return m_env.pMovieSystem; };
-    ICryFont* GetICryFont(){ return m_env.pCryFont; }
-    ILog* GetILog(){ return m_env.pLog; }
-    ICmdLine* GetICmdLine(){ return m_pCmdLine; }
-    INameTable* GetINameTable() { return m_env.pNameTable; };
-    IViewSystem* GetIViewSystem();
-    ILevelSystem* GetILevelSystem();
-    ISystemEventDispatcher* GetISystemEventDispatcher() { return m_pSystemEventDispatcher; }
-    IProfilingSystem* GetIProfilingSystem() { return &m_ProfilingSystem; }
-    //////////////////////////////////////////////////////////////////////////
-    // retrieves the perlin noise singleton instance
-    CPNoise3* GetNoiseGen();
-    virtual uint64 GetUpdateCounter() { return m_nUpdateCounter; };
-
-    void        DetectGameFolderAccessRights();
-
-    virtual void ExecuteCommandLine(bool deferred=true);
-
-    virtual void GetUpdateStats(SSystemUpdateStats& stats);
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual XmlNodeRef CreateXmlNode(const char* sNodeName = "", bool bReuseStrings = false, bool bIsProcessingInstruction = false);
-    virtual XmlNodeRef LoadXmlFromFile(const char* sFilename, bool bReuseStrings = false);
-    virtual XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings = false, bool bSuppressWarnings = false);
-    virtual IXmlUtils* GetXmlUtils();
-    //////////////////////////////////////////////////////////////////////////
-
-    void SetViewCamera(CCamera& Camera){ m_ViewCamera = Camera; }
-    CCamera& GetViewCamera() { return m_ViewCamera; }
-
-    void IgnoreUpdates(bool bIgnore) { m_bIgnoreUpdates = bIgnore; };
-
-    void SetIProcess(IProcess* process);
-    IProcess* GetIProcess(){ return m_pProcess; }
-
-    bool IsTestMode() const { return m_bTestMode; }
-    //@}
-
-    void SleepIfNeeded();
-
-    virtual void FatalError(const char* format, ...) PRINTF_PARAMS(2, 3);
-    virtual void ReportBug(const char* format, ...) PRINTF_PARAMS(2, 3);
-    // Validator Warning.
-    void WarningV(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args);
-    void Warning(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, ...);
-    virtual int ShowMessage(const char* text, const char* caption, unsigned int uType);
-    bool CheckLogVerbosity(int verbosity);
-
-    //! Return pointer to user defined callback.
-    ISystemUserCallback* GetUserCallback() const { return m_pUserCallback; };
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SaveConfiguration();
-    virtual void LoadConfiguration(const char* sFilename, ILoadConfigurationEntrySink* pSink = 0, bool warnIfMissing = true);
-    virtual ESystemConfigSpec GetMaxConfigSpec() const;
-    virtual ESystemConfigPlatform GetConfigPlatform() const;
-    virtual void SetConfigPlatform(ESystemConfigPlatform platform);
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual bool IsPaused() const { return m_bPaused; };
-
-    virtual ILocalizationManager* GetLocalizationManager();
-    virtual void debug_GetCallStack(const char** pFunctions, int& nCount);
-    virtual void debug_LogCallStack(int nMaxFuncs = 32, int nFlags = 0);
-    // 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)
-    void SetVersionInfo(const char* const szVersion);
-#endif
-
-    void ShutdownModuleLibraries();
-
-#if defined(WIN32)
-    friend LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-#endif
-    virtual void* GetRootWindowMessageHandler();
-    virtual void RegisterWindowMessageHandler(IWindowMessageHandler* pHandler);
-    virtual void UnregisterWindowMessageHandler(IWindowMessageHandler* pHandler);
-
-    // IWindowMessageHandler
-#if defined(WIN32)
-    virtual bool HandleMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-#endif
-    // ~IWindowMessageHandler
-
-private:
-
-    // Release all resources.
-    void ShutDown();
-
-    bool LoadEngineDLLs();
-
-    //! @name Initialization routines
-    //@{
-    bool InitConsole();
-    bool InitFileSystem();
-    bool InitFileSystem_LoadEngineFolders(const SSystemInitParams& initParams);
-    bool InitAudioSystem(const SSystemInitParams& initParams);
-
-    //@}
-
-    //////////////////////////////////////////////////////////////////////////
-    // Helper functions.
-    //////////////////////////////////////////////////////////////////////////
-    void CreateSystemVars();
-    void CreateAudioVars();
-
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> LoadDLL(const char* dllName);
-
-    void FreeLib(AZStd::unique_ptr<AZ::DynamicModuleHandle>& hLibModule);
-
-    bool UnloadDLL(const char* dllName);
-    void QueryVersionInfo();
-    void LogVersion();
-    void LogBuildInfo();
-    void SetDevMode(bool bEnable);
-
-#ifndef _RELEASE
-    static void SystemVersionChanged(ICVar* pCVar);
-#endif // #ifndef _RELEASE
-
-    bool ReLaunchMediaCenter();
-    void UpdateAudioSystems();
-
-    void AddCVarGroupDirectory(const string& sPath);
-
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> LoadDynamiclibrary(const char* dllName) const;
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEM_H_SECTION_3
-#include AZ_RESTRICTED_FILE(System_h)
-#elif defined(WIN32)
-    bool GetWinGameFolder(char* szMyDocumentsPath, int maxPathSize);
-#endif
-
-public:
-    void EnableFloatExceptions(int type);
-
-    // interface ISystem -------------------------------------------
-    virtual IDataProbe* GetIDataProbe() { return m_pDataProbe; };
-    virtual void SetForceNonDevMode(bool bValue);
-    virtual bool GetForceNonDevMode() const;
-    virtual bool WasInDevMode() const { return m_bWasInDevMode; };
-    virtual bool IsDevMode() const { return m_bInDevMode && !GetForceNonDevMode(); }
-
-    virtual void SetConsoleDrawEnabled(bool enabled) { m_bDrawConsole = enabled; }
-    virtual void SetUIDrawEnabled(bool enabled) { m_bDrawUI = enabled; }
-
-    // -------------------------------------------------------------
-
-    //! attaches the given variable to the given container;
-    //! recreates the variable if necessary
-    ICVar* attachVariable (const char* szVarName, int* pContainer, const char* szComment, int dwFlags = 0);
-
-    const CTimeValue& GetLastTickTime(void) const { return m_lastTickTime; }
-    const ICVar* GetDedicatedMaxRate(void) const { return m_svDedicatedMaxRate; }
-
-    std::shared_ptr<AZ::IO::FileIOBase> CreateLocalFileIO();
-
-private: // ------------------------------------------------------
-
-    // System environment.
-    SSystemGlobalEnvironment m_env;
-
-    CTimer                              m_Time;                             //!<
-    CCamera                             m_ViewCamera;                   //!<
-    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.
-
-
-    std::map<CCryNameCRC, AZStd::unique_ptr<AZ::DynamicModuleHandle> > m_moduleDLLHandles;
-
-    //! current active process
-    IProcess* m_pProcess;
-
-    CCamera m_PhysRendererCamera;
-    ICVar* m_p_draw_helpers_str;
-    int m_iJumpToPhysProfileEnt;
-
-    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;
-
-    int m_iApplicationInstance;
-
-    //! to hold the values stored in system.cfg
-    //! because editor uses it's own values,
-    //! and then saves them to file, overwriting the user's resolution.
-    int m_iHeight;
-    int m_iWidth;
-    int m_iColorBits;
-
-    // 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;
-    ICVar* m_game_load_screen_sequence_to_auto_play;
-    ICVar* m_level_load_screen_sequence_to_auto_play;
-    ICVar* m_game_load_screen_sequence_fixed_fps;
-    ICVar* m_level_load_screen_sequence_fixed_fps;
-    ICVar* m_game_load_screen_max_fps;
-    ICVar* m_level_load_screen_max_fps;
-    ICVar* m_game_load_screen_minimum_time{};
-    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)
-#define AZ_RESTRICTED_SECTION SYSTEM_H_SECTION_4
-#include AZ_RESTRICTED_FILE(System_h)
-#endif
-
-    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;
-
-    string  m_sSavedRDriver;                                //!< to restore the driver when quitting the dedicated server
-
-    //////////////////////////////////////////////////////////////////////////
-    //! User define callback for system events.
-    ISystemUserCallback* m_pUserCallback;
-
-    SFileVersion m_fileVersion;
-    SFileVersion m_productVersion;
-    SFileVersion m_buildVersion;
-    IDataProbe* m_pDataProbe;
-
-    class CLocalizedStringsManager* m_pLocalizationManager;
-
-    // Name table.
-    CNameTable m_nameTable;
-
-    ESystemConfigSpec m_nServerConfigSpec;
-    ESystemConfigSpec m_nMaxConfigSpec;
-    ESystemConfigPlatform m_ConfigPlatform;
-
-    CProfilingSystem m_ProfilingSystem;
-
-    // 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.
-    //////////////////////////////////////////////////////////////////////////
-    virtual const SFileVersion& GetFileVersion();
-    virtual const SFileVersion& GetProductVersion();
-    virtual const SFileVersion& GetBuildVersion();
-
-    bool InitVTuneProfiler();
-
-    void OpenBasicPaks();
-    void OpenLanguagePak(const char* sLanguage);
-    void OpenLanguageAudioPak(const char* sLanguage);
-    void GetLocalizedPath(const char* sLanguage, string& sLocalizedPath);
-    void GetLocalizedAudioPath(const char* sLanguage, string& sLocalizedPath);
-    void CloseLanguagePak(const char* sLanguage);
-    void CloseLanguageAudioPak(const char* sLanguage);
-    void UpdateMovieSystem(const int updateFlags, const float fFrameTime, const bool bPreUpdate);
-
-    //////////////////////////////////////////////////////////////////////////
-    // CryAssert and error related.
-    virtual bool RegisterErrorObserver(IErrorObserver* errorObserver);
-    bool UnregisterErrorObserver(IErrorObserver* errorObserver);
-    virtual void OnAssert(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber);
-    void OnFatalError(const char* message);
-
-    bool IsAssertDialogVisible() const;
-    void SetAssertVisible(bool bAssertVisble);
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void ClearErrorMessages()
-    {
-        m_ErrorMessages.clear();
-    }
-
-    bool IsLoading()
-    {
-        return m_eRuntimeState == ESYSTEM_EVENT_LEVEL_LOAD_START_LOADINGSCREEN;
-    }
-
-    virtual ESystemGlobalState  GetSystemGlobalState(void);
-    virtual void SetSystemGlobalState(ESystemGlobalState systemGlobalState);
-
-#if !defined(_RELEASE)
-    virtual bool IsSavingResourceList() const { return (g_cvars.archiveVars.nSaveLevelResourceList != 0); }
-#endif
-
-private:
-    std::vector<IErrorObserver*> m_errorObservers;
-    ESystemGlobalState m_systemGlobalState;
-    static const char* GetSystemGlobalStateName(const ESystemGlobalState systemGlobalState);
-
-public:
-    void InitLocalization();
-
-protected: // -------------------------------------------------------------
-
-    CCmdLine*                                      m_pCmdLine;
-
-    string  m_currentLanguageAudio;
-    string  m_systemConfigName; // computed from system_(hardwareplatform)_(assetsPlatform) - eg, system_android_android.cfg or system_windows_pc.cfg
-
-    std::vector< std::pair<CTimeValue, float> > m_updateTimes;
-
-    struct SErrorMessage
-    {
-        string m_Message;
-        float m_fTimeToShow;
-        float m_Color[4];
-        bool m_HardFailure;
-    };
-    typedef std::list<SErrorMessage> TErrorMessages;
-    TErrorMessages m_ErrorMessages;
-    bool m_bHasRenderedErrorMessage;
-    bool m_bNeedDoWorkDuringOcclusionChecks;
-
-    ESystemEvent m_eRuntimeState;
-    bool m_bIsAsserting;
-
-    std::vector<IWindowMessageHandler*> m_windowMessageHandlers;
-    bool m_initedOSAllocator = false;
-    bool m_initedSysAllocator = false;
-};
diff --git a/Code/CryEngine/CrySystem/SystemCFG.cpp b/Code/CryEngine/CrySystem/SystemCFG.cpp
deleted file mode 100644
index 0930045b3c..0000000000
--- a/Code/CryEngine/CrySystem/SystemCFG.cpp
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : handles system cfg
-
-
-#include "CrySystem_precompiled.h"
-#include "System.h"
-#include <time.h>
-#include "XConsole.h"
-#include "CryFile.h"
-#include "CryPath.h"
-
-#include <AzCore/Console/IConsole.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Utils/Utils.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-
-#include "SystemCFG.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define SYSTEMCFG_CPP_SECTION_1 1
-#define SYSTEMCFG_CPP_SECTION_2 2
-#define SYSTEMCFG_CPP_SECTION_3 3
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#include "ILog.h"
-
-#endif
-
-#ifndef EXE_VERSION_INFO_0
-#define EXE_VERSION_INFO_0 1
-#endif
-
-#ifndef EXE_VERSION_INFO_1
-#define EXE_VERSION_INFO_1 0
-#endif
-
-#ifndef EXE_VERSION_INFO_2
-#define EXE_VERSION_INFO_2 0
-#endif
-
-#ifndef EXE_VERSION_INFO_3
-#define EXE_VERSION_INFO_3 1
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMCFG_CPP_SECTION_1
-#include AZ_RESTRICTED_FILE(SystemCFG_cpp)
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-const SFileVersion& CSystem::GetFileVersion()
-{
-    return m_fileVersion;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const SFileVersion& CSystem::GetProductVersion()
-{
-    return m_productVersion;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const SFileVersion& CSystem::GetBuildVersion()
-{
-    return m_buildVersion;
-}
-
-//////////////////////////////////////////////////////////////////////////
-#ifndef _RELEASE
-void CSystem::SystemVersionChanged(ICVar* pCVar)
-{
-    if (CSystem* pThis = static_cast<CSystem*>(gEnv->pSystem))
-    {
-        pThis->SetVersionInfo(pCVar->GetString());
-    }
-}
-
-void CSystem::SetVersionInfo(const char* const szVersion)
-{
-    m_fileVersion.Set(szVersion);
-    m_productVersion.Set(szVersion);
-    m_buildVersion.Set(szVersion);
-    CryLog("SetVersionInfo '%s'", szVersion);
-    CryLog("FileVersion: %d.%d.%d.%d", m_fileVersion.v[3], m_fileVersion.v[2], m_fileVersion.v[1], m_fileVersion.v[0]);
-    CryLog("ProductVersion: %d.%d.%d.%d", m_productVersion.v[3], m_productVersion.v[2], m_productVersion.v[1], m_productVersion.v[0]);
-    CryLog("BuildVersion: %d.%d.%d.%d", m_buildVersion.v[3], m_buildVersion.v[2], m_buildVersion.v[1], m_buildVersion.v[0]);
-}
-#endif // #ifndef _RELEASE
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::QueryVersionInfo()
-{
-#ifndef WIN32
-    //do we need some other values here?
-    m_fileVersion.v[0] = m_productVersion.v[0] = EXE_VERSION_INFO_3;
-    m_fileVersion.v[1] = m_productVersion.v[1] = EXE_VERSION_INFO_2;
-    m_fileVersion.v[2] = m_productVersion.v[2] = EXE_VERSION_INFO_1;
-    m_fileVersion.v[3] = m_productVersion.v[3] = EXE_VERSION_INFO_0;
-    m_buildVersion = m_fileVersion;
-#else  //WIN32
-    char moduleName[_MAX_PATH];
-    DWORD dwHandle;
-    UINT len;
-
-    char ver[1024 * 8];
-
-    GetModuleFileName(NULL, moduleName, _MAX_PATH);  //retrieves the PATH for the current module
-
-#ifdef AZ_MONOLITHIC_BUILD
-    GetModuleFileName(NULL, moduleName, _MAX_PATH);  //retrieves the PATH for the current module
-#else // AZ_MONOLITHIC_BUILD
-    azstrcpy(moduleName, AZ_ARRAY_SIZE(moduleName), "CrySystem.dll"); // we want to version from the system dll
-#endif // AZ_MONOLITHIC_BUILD
-
-    int verSize = GetFileVersionInfoSize(moduleName, &dwHandle);
-    if (verSize > 0)
-    {
-        GetFileVersionInfo(moduleName, dwHandle, 1024 * 8, ver);
-        VS_FIXEDFILEINFO* vinfo;
-        VerQueryValue(ver, "\\", (void**)&vinfo, &len);
-
-        const uint32 verIndices[4] = {0, 1, 2, 3};
-        m_fileVersion.v[verIndices[0]] = m_productVersion.v[verIndices[0]] = vinfo->dwFileVersionLS & 0xFFFF;
-        m_fileVersion.v[verIndices[1]] = m_productVersion.v[verIndices[1]] = vinfo->dwFileVersionLS >> 16;
-        m_fileVersion.v[verIndices[2]] = m_productVersion.v[verIndices[2]] = vinfo->dwFileVersionMS & 0xFFFF;
-        m_fileVersion.v[verIndices[3]] = m_productVersion.v[verIndices[3]] = vinfo->dwFileVersionMS >> 16;
-        m_buildVersion = m_fileVersion;
-
-        struct LANGANDCODEPAGE
-        {
-            WORD wLanguage;
-            WORD wCodePage;
-        }* lpTranslate;
-
-        UINT count = 0;
-        char path[256];
-        char* version = NULL;
-
-        VerQueryValue(ver, "\\VarFileInfo\\Translation", (LPVOID*)&lpTranslate, &count);
-        if (lpTranslate != NULL)
-        {
-            azsnprintf(path, sizeof(path), "\\StringFileInfo\\%04x%04x\\InternalName", lpTranslate[0].wLanguage, lpTranslate[0].wCodePage);
-            VerQueryValue(ver, path, (LPVOID*)&version, &count);
-            if (version)
-            {
-                m_buildVersion.Set(version);
-            }
-        }
-    }
-#endif //WIN32
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::LogVersion()
-{
-    // Get time.
-    time_t ltime;
-    time(&ltime);
-
-#ifdef AZ_COMPILER_MSVC
-    tm today;
-    localtime_s(&today, &ltime);
-    char s[1024];
-    strftime(s, 128, "%d %b %y (%H %M %S)", &today);
-#else
-    char s[1024];
-    auto today = localtime(&ltime);
-    strftime(s, 128, "%d %b %y (%H %M %S)", today);
-#endif
-
-    const SFileVersion& ver = GetFileVersion();
-
-    CryLogAlways("BackupNameAttachment=\" Build(%d) %s\"  -- used by backup system\n", ver.v[0], s);          // read by CreateBackupFile()
-
-    // Use strftime to build a customized time string.
-#ifdef AZ_COMPILER_MSVC
-    strftime(s, 128, "Log Started at %c", &today);
-#else
-    strftime(s, 128, "Log Started at %c", today);
-#endif
-    CryLogAlways(s);
-
-    CryLogAlways("Built on " __DATE__ " " __TIME__);
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMCFG_CPP_SECTION_2
-#include AZ_RESTRICTED_FILE(SystemCFG_cpp)
-#elif defined(ANDROID)
-    CryLogAlways("Running 32 bit Android version API VER:%d", __ANDROID_API__);
-#elif defined(IOS)
-    CryLogAlways("Running 64 bit iOS version");
-#elif defined(WIN64)
-    CryLogAlways("Running 64 bit Windows version");
-#elif defined(WIN32)
-    CryLogAlways("Running 32 bit Windows version");
-#elif defined(LINUX64)
-    CryLogAlways("Running 64 bit Linux version");
-#elif defined(LINUX32)
-    CryLogAlways("Running 32 bit Linux version");
-#elif defined(MAC)
-    CryLogAlways("Running 64 bit Mac version");
-#endif
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_SYSTEMCFG_MODULENAME
-    GetModuleFileName(NULL, s, sizeof(s));
-
-    // Log EXE filename only if possible (not full EXE path which could contain sensitive info)
-    AZStd::string exeName;
-    if (AzFramework::StringFunc::Path::GetFullFileName(s, exeName)) {
-        CryLogAlways("Executable: %s", exeName.c_str());
-    }
-#endif
-
-    CryLogAlways("FileVersion: %d.%d.%d.%d", m_fileVersion.v[3], m_fileVersion.v[2], m_fileVersion.v[1], m_fileVersion.v[0]);
-#if defined(LY_BUILD)
-    CryLogAlways("ProductVersion: %d.%d.%d.%d - Build %d", m_productVersion.v[3], m_productVersion.v[2], m_productVersion.v[1], m_productVersion.v[0], LY_BUILD);
-#else // defined(LY_BUILD)
-    CryLogAlways("ProductVersion: %d.%d.%d.%d", m_productVersion.v[3], m_productVersion.v[2], m_productVersion.v[1], m_productVersion.v[0]);
-#endif // defined(LY_BUILD)
-
-
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMCFG_CPP_SECTION_3
-#include AZ_RESTRICTED_FILE(SystemCFG_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(_MSC_VER)
-    CryLogAlways("Using Microsoft (tm) C++ Standard Library implementation\n");
-#elif defined(__clang__)
-    CryLogAlways("Using CLANG C++ Standard Library implementation\n");
-#elif defined(__GNUC__)
-    CryLogAlways("Using GNU C++ Standard Library implementation\n");
-#else
-#error "Please specify C++ STL library"
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::LogBuildInfo()
-{
-    auto projectName = AZ::Utils::GetProjectName();
-    CryLogAlways("GameName: %s", projectName.c_str());
-    CryLogAlways("BuildTime: " __DATE__ " " __TIME__);
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////
-class CCVarSaveDump
-    : public ICVarDumpSink
-{
-public:
-
-    CCVarSaveDump(FILE* pFile)
-    {
-        m_pFile = pFile;
-    }
-
-    virtual void OnElementFound(ICVar* pCVar)
-    {
-        if (!pCVar)
-        {
-            return;
-        }
-        int nFlags = pCVar->GetFlags();
-        if (((nFlags & VF_DUMPTODISK) && (nFlags & VF_MODIFIED)) || (nFlags & VF_WASINCONFIG))
-        {
-            string szValue = pCVar->GetString();
-            int pos;
-
-            pos = 1;
-            for (;; )
-            {
-                pos = szValue.find_first_of("\\", pos);
-
-                if (pos == string::npos)
-                {
-                    break;
-                }
-
-                szValue.replace(pos, 1, "\\\\", 2);
-                pos += 2;
-            }
-
-            // replace " with \"
-            pos = 1;
-            for (;; )
-            {
-                pos = szValue.find_first_of("\"", pos);
-
-                if (pos == string::npos)
-                {
-                    break;
-                }
-
-                szValue.replace(pos, 1, "\\\"", 2);
-                pos += 2;
-            }
-
-            string szLine = pCVar->GetName();
-
-            if (pCVar->GetType() == CVAR_STRING)
-            {
-                szLine += " = \"" + szValue + "\"\r\n";
-            }
-            else
-            {
-                szLine += " = " + szValue + "\r\n";
-            }
-
-            if (pCVar->GetFlags() & VF_WARNING_NOTUSED)
-            {
-                fputs("-- REMARK: the following was not assigned to a console variable\r\n", m_pFile);
-            }
-
-            fputs(szLine.c_str(), m_pFile);
-        }
-    }
-
-private: // --------------------------------------------------------
-
-    FILE*              m_pFile;                     //
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::SaveConfiguration()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-// system cfg
-//////////////////////////////////////////////////////////////////////////
-CSystemConfiguration::CSystemConfiguration(const string& strSysConfigFilePath, CSystem* pSystem, ILoadConfigurationEntrySink* pSink, bool warnIfMissing)
-    : m_strSysConfigFilePath(strSysConfigFilePath)
-    , m_bError(false)
-    , m_pSink(pSink)
-    , m_warnIfMissing(warnIfMissing)
-{
-    assert(pSink);
-
-    m_pSystem = pSystem;
-    m_bError = !ParseSystemConfig();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CSystemConfiguration::~CSystemConfiguration()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSystemConfiguration::ParseSystemConfig()
-{
-    string filename = m_strSysConfigFilePath;
-    if (strlen(PathUtil::GetExt(filename)) == 0)
-    {
-        filename = PathUtil::ReplaceExtension(filename, "cfg");
-    }
-
-    CCryFile file;
-    string filenameLog;
-    {
-        int flags = AZ::IO::IArchive::FOPEN_HINT_QUIET | AZ::IO::IArchive::FOPEN_ONDISK;
-
-        if (filename[0] == '@')
-        {
-            // this is used when theres a very specific file to read, like @user@/game.cfg which is read
-            // IN ADDITION to the one in the game folder, and afterwards to override values in it.
-            // if the file is missing and its already prefixed with an alias, there is no need to look any further.
-            if (!(file.Open(filename, "rb", flags)))
-            {
-                if (m_warnIfMissing)
-                {
-                    CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Config file %s not found!", filename.c_str());
-                }
-                return false;
-            }
-        }
-        else
-        {
-            // otherwise, if the file isn't prefixed with an alias, then its likely one of the convenience mappings
-            // to either root or assets/config.  this is done so that code can just request a simple file name and get its data
-            if (
-                !(file.Open(filename, "rb", flags)) &&
-                !(file.Open(string("@root@/") + filename, "rb", flags)) &&
-                !(file.Open(string("@assets@/") + filename, "rb", flags)) &&
-                !(file.Open(string("@assets@/config/") + filename, "rb", flags)) &&
-                !(file.Open(string("@assets@/config/spec/") + filename, "rb", flags))
-                )
-            {
-                if (m_warnIfMissing)
-                {
-                    CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Config file %s not found!", filename.c_str());
-                }
-                return false;
-            }
-        }
-
-        filenameLog = file.GetAdjustedFilename();
-    }
-
-    INDENT_LOG_DURING_SCOPE();
-
-    int nLen = file.GetLength();
-    if (nLen == 0)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Couldn't get length for Config file %s", filename.c_str());
-        return false;
-    }
-    char* sAllText = new char [nLen + 16];
-    if (file.ReadRaw(sAllText, nLen) < (size_t)nLen)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Couldn't read Config file %s", filename.c_str());
-        return false;
-    }
-    sAllText[nLen] = '\0';
-    sAllText[nLen + 1] = '\0';
-
-    string strGroup;            // current group e.g. "[General]"
-
-    char* strLast = sAllText + nLen;
-    char* str = sAllText;
-    while (str < strLast)
-    {
-        char* s = str;
-        while (str < strLast && *str != '\n' && *str != '\r')
-        {
-            str++;
-        }
-        *str = '\0';
-        str++;
-        while (str < strLast && (*str == '\n' || *str == '\r'))
-        {
-            str++;
-        }
-
-        string strLine = s;
-
-        // detect groups e.g. "[General]"   should set strGroup="General"
-        {
-            string strTrimmedLine(RemoveWhiteSpaces(strLine));
-            size_t size = strTrimmedLine.size();
-
-            if (size >= 3)
-            {
-                if (strTrimmedLine[0] == '[' && strTrimmedLine[size - 1] == ']')       // currently no comments are allowed to be behind groups
-                {
-                    strGroup = &strTrimmedLine[1];
-                    strGroup.resize(size - 2);                                  // remove [ and ]
-                    continue;                                       // next line
-                }
-            }
-        }
-
-        //trim all whitespace characters at the beginning and the end of the current line and store its size
-        strLine.Trim();
-        size_t strLineSize = strLine.size();
-
-        //skip comments, comments start with ";" or "--" but may have preceding whitespace characters
-        if (strLineSize > 0)
-        {
-            if (strLine[0] == ';')
-            {
-                continue;
-            }
-            else if (strLine.find("--") == 0)
-            {
-                continue;
-            }
-        }
-        //skip empty lines
-        else
-        {
-            continue;
-        }
-
-        //if line contains a '=' try to read and assign console variable
-        string::size_type posEq(strLine.find("=", 0));
-        if (string::npos != posEq)
-        {
-            string stemp(strLine, 0, posEq);
-            string strKey(RemoveWhiteSpaces(stemp));
-
-            {
-                // extract value
-                string::size_type posValueStart(strLine.find("\"", posEq + 1) + 1);
-                string::size_type posValueEnd(strLine.rfind('\"'));
-
-                string strValue;
-
-                if (string::npos != posValueStart && string::npos != posValueEnd)
-                {
-                    strValue = string(strLine, posValueStart, posValueEnd - posValueStart);
-                }
-                else
-                {
-                    string strTmp(strLine, posEq + 1, strLine.size() - (posEq + 1));
-                    strValue = RemoveWhiteSpaces(strTmp);
-                }
-
-                {
-                    // replace '\\\\' with '\\' and '\\\"' with '\"'
-                    strValue.replace("\\\\", "\\");
-                    strValue.replace("\\\"", "\"");
-                    
-                    m_pSink->OnLoadConfigurationEntry(strKey, strValue, strGroup);
-                }
-            }
-        }
-        else
-        {
-            gEnv->pLog->LogWithType(ILog::eWarning, "%s -> invalid configuration line: %s", filename.c_str(), strLine.c_str());
-        }
-    }
-
-    delete []sAllText;
-
-    CryLog("Loading Config file %s (%s)", filename.c_str(), filenameLog.c_str());
-
-    m_pSink->OnLoadConfigurationEntry_End();
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::OnLoadConfigurationEntry(const char* szKey, const char* szValue, [[maybe_unused]] const char* szGroup)
-{
-    bool azConsoleProcessed = false;
-    auto console = AZ::Interface<AZ::IConsole>::Get();
-    if (console)
-    {
-        AZStd::string command(AZStd::string::format("%s %s", szKey, szValue));
-
-        azConsoleProcessed = console->PerformCommand(command.c_str());
-    }
-
-    if (!azConsoleProcessed)
-    {
-        if (!gEnv->pConsole)
-        {
-            return;
-        }
-
-        if (*szKey != 0)
-        {
-            gEnv->pConsole->LoadConfigVar(szKey, szValue);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::LoadConfiguration(const char* sFilename, ILoadConfigurationEntrySink* pSink, bool warnIfMissing)
-{
-    if (sFilename && strlen(sFilename) > 0)
-    {
-        if (!pSink)
-        {
-            pSink = this;
-        }
-
-        CSystemConfiguration tempConfig(sFilename, this, pSink, warnIfMissing);
-    }
-}
-
diff --git a/Code/CryEngine/CrySystem/SystemCFG.h b/Code/CryEngine/CrySystem/SystemCFG.h
deleted file mode 100644
index 4e8479d72f..0000000000
--- a/Code/CryEngine/CrySystem/SystemCFG.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_SYSTEMCFG_H
-#define CRYINCLUDE_CRYSYSTEM_SYSTEMCFG_H
-
-#pragma once
-
-#include <math.h>
-#include <map>
-
-typedef string SysConfigKey;
-typedef string SysConfigValue;
-
-//////////////////////////////////////////////////////////////////////////
-class CSystemConfiguration
-{
-public:
-    CSystemConfiguration(const string& strSysConfigFilePath, CSystem* pSystem, ILoadConfigurationEntrySink* pSink, bool warnIfMissing = true);
-    ~CSystemConfiguration();
-
-    string RemoveWhiteSpaces(string& s)
-    {
-        s.Trim();
-        return s;
-    }
-
-    bool IsError() const { return m_bError; }
-
-private: // ----------------------------------------
-
-    // Returns:
-    //   success
-    bool ParseSystemConfig();
-
-    CSystem*                                               m_pSystem;
-    string                                                  m_strSysConfigFilePath;
-    bool                                                        m_bError;
-    ILoadConfigurationEntrySink*       m_pSink;                                         // never 0
-    bool m_warnIfMissing;
-};
-
-
-#endif // CRYINCLUDE_CRYSYSTEM_SYSTEMCFG_H
diff --git a/Code/CryEngine/CrySystem/SystemEventDispatcher.cpp b/Code/CryEngine/CrySystem/SystemEventDispatcher.cpp
deleted file mode 100644
index c07bf8fb5d..0000000000
--- a/Code/CryEngine/CrySystem/SystemEventDispatcher.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "SystemEventDispatcher.h"
-
-CSystemEventDispatcher::CSystemEventDispatcher()
-    : m_listeners(0)
-{
-}
-
-bool CSystemEventDispatcher::RegisterListener(ISystemEventListener* pListener)
-{
-    m_listenerRegistrationLock.Lock();
-    bool ret = m_listeners.Add(pListener);
-    m_listenerRegistrationLock.Unlock();
-    return ret;
-}
-
-bool CSystemEventDispatcher::RemoveListener(ISystemEventListener* pListener)
-{
-    m_listenerRegistrationLock.Lock();
-    m_listeners.Remove(pListener);
-    m_listenerRegistrationLock.Unlock();
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CSystemEventDispatcher::OnSystemEventAnyThread(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam)
-{
-    m_listenerRegistrationLock.Lock();
-    for (TSystemEventListeners::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
-    {
-        notifier->OnSystemEventAnyThread(event, wparam, lparam);
-    }
-    m_listenerRegistrationLock.Unlock();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CSystemEventDispatcher::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam)
-{
-    if (gEnv && gEnv->mMainThreadId == CryGetCurrentThreadId())
-    {
-        for (TSystemEventListeners::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
-        {
-            notifier->OnSystemEvent(event, wparam, lparam);
-        }
-    }
-    else
-    {
-        SEventParams params;
-        params.event = event;
-        params.wparam = wparam;
-        params.lparam = lparam;
-        m_systemEventQueue.push(params);
-    }
-
-    // Also dispatch the event on this thread. This technically means the event
-    //  will be sent twice (thru different OnSystemEventXX functions), therefore it is up to listeners which one they react to.
-    OnSystemEventAnyThread(event, wparam, lparam);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystemEventDispatcher::Update()
-{
-    AZ_TRACE_METHOD();
-    assert(gEnv && gEnv->mMainThreadId == CryGetCurrentThreadId());
-
-    SEventParams params;
-    while (m_systemEventQueue.try_pop(params))
-    {
-        OnSystemEvent(params.event, params.wparam, params.lparam);
-    }
-}
-
-
-
-
diff --git a/Code/CryEngine/CrySystem/SystemEventDispatcher.h b/Code/CryEngine/CrySystem/SystemEventDispatcher.h
deleted file mode 100644
index d07fea3a88..0000000000
--- a/Code/CryEngine/CrySystem/SystemEventDispatcher.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_SYSTEMEVENTDISPATCHER_H
-#define CRYINCLUDE_CRYSYSTEM_SYSTEMEVENTDISPATCHER_H
-#pragma once
-
-
-#include <ISystem.h>
-#include <CryListenerSet.h>
-
-class CSystemEventDispatcher
-    : public ISystemEventDispatcher
-{
-public:
-    CSystemEventDispatcher();
-    virtual ~CSystemEventDispatcher(){}
-
-    // ISystemEventDispatcher
-    virtual bool RegisterListener(ISystemEventListener* pListener);
-    virtual bool RemoveListener(ISystemEventListener* pListener);
-
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
-    virtual void Update();
-
-    // ~ISystemEventDispatcher
-private:
-    void OnSystemEventAnyThread(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
-
-    typedef CListenerSet<ISystemEventListener*> TSystemEventListeners;
-    TSystemEventListeners   m_listeners;
-
-    // for the events coming from other threads
-    struct SEventParams
-    {
-        ESystemEvent event;
-        UINT_PTR wparam;
-        UINT_PTR lparam;
-    };
-
-    typedef CryMT::queue<SEventParams> TSystemEventQueue;
-    TSystemEventQueue m_systemEventQueue;
-    CryCriticalSection m_listenerRegistrationLock;
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_SYSTEMEVENTDISPATCHER_H
diff --git a/Code/CryEngine/CrySystem/SystemInit.cpp b/Code/CryEngine/CrySystem/SystemInit.cpp
deleted file mode 100644
index 4b07de6933..0000000000
--- a/Code/CryEngine/CrySystem/SystemInit.cpp
+++ /dev/null
@@ -1,2218 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "System.h"
-
-#if defined(AZ_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#undef AZ_RESTRICTED_SECTION
-#define SYSTEMINIT_CPP_SECTION_1 1
-#define SYSTEMINIT_CPP_SECTION_2 2
-#define SYSTEMINIT_CPP_SECTION_3 3
-#define SYSTEMINIT_CPP_SECTION_4 4
-#define SYSTEMINIT_CPP_SECTION_5 5
-#define SYSTEMINIT_CPP_SECTION_6 6
-#define SYSTEMINIT_CPP_SECTION_7 7
-#define SYSTEMINIT_CPP_SECTION_8 8
-#define SYSTEMINIT_CPP_SECTION_9 9
-#define SYSTEMINIT_CPP_SECTION_10 10
-#define SYSTEMINIT_CPP_SECTION_11 11
-#define SYSTEMINIT_CPP_SECTION_12 12
-#define SYSTEMINIT_CPP_SECTION_13 13
-#define SYSTEMINIT_CPP_SECTION_14 14
-#define SYSTEMINIT_CPP_SECTION_15 15
-#define SYSTEMINIT_CPP_SECTION_16 16
-#define SYSTEMINIT_CPP_SECTION_17 17
-#endif
-
-#include "CryLibrary.h"
-#include "CryPath.h"
-#include <StringUtils.h>
-
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
-#include <AzFramework/IO/LocalFileIO.h>
-
-#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
-#include <AzCore/IO/Streamer/Streamer.h>
-#include <AzCore/IO/Streamer/StreamerComponent.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/Asset/AssetProcessorMessages.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include "AZCoreLogSink.h"
-#include <AzCore/Math/MathUtils.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzFramework/Archive/INestedArchive.h>
-#include <AzFramework/Archive/ArchiveFileIO.h>
-
-#include <LoadScreenBus.h>
-#include <LyShine/Bus/UiSystemBus.h>
-#include <AzFramework/Logging/MissingAssetLogger.h>
-#include <AzFramework/Platform/PlatformDefaults.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Utils/Utils.h>
-
-#if defined(APPLE) || defined(LINUX)
-#include <dlfcn.h>
-#include <cstdlib>
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include "windows.h"
-#include <float.h>
-
-// To enable profiling with vtune (https://software.intel.com/en-us/intel-vtune-amplifier-xe), make sure the line below is not commented out
-//#define  PROFILE_WITH_VTUNE
-
-#endif //WIN32
-
-#include <IRenderer.h>
-#include <AzCore/IO/FileIO.h>
-#include <IMovieSystem.h>
-#include <ILog.h>
-#include <IAudioSystem.h>
-#include <ICmdLine.h>
-#include <IProcess.h>
-#include <LyShine/ILyShine.h>
-#include <HMDBus.h>
-
-#include <AzFramework/Archive/Archive.h>
-#include "XConsole.h"
-#include "Log.h"
-#include "XML/xml.h"
-#include "LocalizedStringManager.h"
-#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>
-#include <AzFramework/Driller/DrillerConsoleAPI.h>
-
-#if defined(ANDROID)
-    #include <AzCore/Android/Utils.h>
-#endif
-
-#if defined(EXTERNAL_CRASH_REPORTING)
-#include <CrashHandler.h>
-#endif
-
-// select the asset processor based on cvars and defines.
-// uncomment the following and edit the path where it is instantiated if you'd like to use the test file client
-//#define USE_TEST_FILE_CLIENT
-
-#if defined(REMOTE_ASSET_PROCESSOR)
-// Over here, we'd put the header to the Remote Asset Processor interface (as opposed to the Local built in version  below)
-#   include <AzFramework/Network/AssetProcessorConnection.h>
-#endif
-
-#ifdef WIN32
-extern LONG WINAPI CryEngineExceptionFilterWER(struct _EXCEPTION_POINTERS* pExceptionPointers);
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_14
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-
-#if AZ_TRAIT_USE_CRY_SIGNAL_HANDLER
-
-#include <execinfo.h>
-#include <signal.h>
-void CryEngineSignalHandler(int signal)
-{
-    char resolvedPath[_MAX_PATH];
-
-    // it is assumed that @log@ points at the appropriate place (so for apple, to the user profile dir)
-    if (AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath("@log@/crash.log", resolvedPath, _MAX_PATH))
-    {
-        fprintf(stderr, "Crash Signal Handler - logged to %s\n", resolvedPath);
-        FILE* file = fopen(resolvedPath, "a");
-        if (file)
-        {
-            char sTime[128];
-            time_t ltime;
-            time(&ltime);
-            struct tm* today = localtime(&ltime);
-            strftime(sTime, 40, "<%Y-%m-%d %H:%M:%S> ", today);
-            fprintf(file, "%s: Error: signal %s:\n", sTime, strsignal(signal));
-            fflush(file);
-            void* array[100];
-            int s = backtrace(array, 100);
-            backtrace_symbols_fd(array, s, fileno(file));
-            fclose(file);
-            CryLogAlways("Successfully recorded crash file:  '%s'", resolvedPath);
-            abort();
-        }
-    }
-
-    CryLogAlways("Could not record crash file...");
-    abort();
-}
-
-#endif // AZ_TRAIT_USE_CRY_SIGNAL_HANDLER
-
-//////////////////////////////////////////////////////////////////////////
-#define DEFAULT_LOG_FILENAME "@log@/Log.txt"
-
-#define CRYENGINE_ENGINE_FOLDER "Engine"
-
-//////////////////////////////////////////////////////////////////////////
-#define CRYENGINE_DEFAULT_LOCALIZATION_LANG "en-US"
-
-#define LOCALIZATION_TRANSLATIONS_LIST_FILE_NAME "Libs/Localization/localization.xml"
-
-//////////////////////////////////////////////////////////////////////////
-#if defined(WIN32) || defined(LINUX) || defined(APPLE)
-#   define DLL_MODULE_INIT_ISYSTEM "ModuleInitISystem"
-#   define DLL_MODULE_SHUTDOWN_ISYSTEM "ModuleShutdownISystem"
-#   define DLL_INITFUNC_RENDERER "PackageRenderConstructor"
-#   define DLL_INITFUNC_SOUND "CreateSoundSystem"
-#   define DLL_INITFUNC_FONT "CreateCryFontInterface"
-#   define DLL_INITFUNC_3DENGINE "CreateCry3DEngine"
-#   define DLL_INITFUNC_UI "CreateLyShineInterface"
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_1
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-#   define DLL_MODULE_INIT_ISYSTEM (LPCSTR)2
-#   define DLL_MODULE_SHUTDOWN_ISYSTEM (LPCSTR)3
-#   define DLL_INITFUNC_RENDERER  (LPCSTR)1
-#   define DLL_INITFUNC_RENDERER  (LPCSTR)1
-#   define DLL_INITFUNC_SOUND     (LPCSTR)1
-#   define DLL_INITFUNC_PHYSIC    (LPCSTR)1
-#   define DLL_INITFUNC_FONT      (LPCSTR)1
-#   define DLL_INITFUNC_3DENGINE  (LPCSTR)1
-#   define DLL_INITFUNC_UI        (LPCSTR)1
-#endif
-
-#define AZ_TRACE_SYSTEM_WINDOW AZ::Debug::Trace::GetDefaultSystemWindow()
-
-#ifdef WIN32
-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;
-
-struct SCVarsClientConfigSink
-    : public ILoadConfigurationEntrySink
-{
-    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, [[maybe_unused]] const char* szGroup)
-    {
-        gEnv->pConsole->SetClientDataProbeString(szKey, szValue);
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-static inline void InlineInitializationProcessing([[maybe_unused]] const char* sDescription)
-{
-    if (gEnv->pLog)
-    {
-        gEnv->pLog->UpdateLoadingScreen(0);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZ_PUSH_DISABLE_WARNING(4723, "-Wunknown-warning-option") // potential divide by 0 (needs to wrap the function)
-static void CmdCrashTest(IConsoleCmdArgs* pArgs)
-{
-    assert(pArgs);
-
-    if (pArgs->GetArgCount() == 2)
-    {
-        //This method intentionally crashes, a lot.
-
-        int crashType = atoi(pArgs->GetArg(1));
-        switch (crashType)
-        {
-        case 1:
-        {
-            int* p = 0;
-            PREFAST_SUPPRESS_WARNING(6011) * p = 0xABCD;
-        }
-        break;
-        case 2:
-        {
-            float a = 1.0f;
-            memset(&a, 0, sizeof(a));
-            float* b = &a;
-            float c = 3;
-            CryLog("%f", (c / *b));
-        }
-        break;
-        case 3:
-            while (true)
-            {
-                new char[10240];
-            }
-            break;
-        case 4:
-            CryFatalError("sys_crashtest 4");
-            break;
-        case 5:
-            while (true)
-            {
-                new char[128];     //testing the crash handler an exception in the cry memory allocation occurred
-            }
-        case 6:
-        {
-            AZ_Assert(false, "Testing assert for testing crashes");
-        }
-        break;
-        case 7:
-            __debugbreak();
-            break;
-        case 8:
-            CrySleep(1000 * 60 * 10);
-            break;
-        }
-    }
-}
-AZ_POP_DISABLE_WARNING
-
-//////////////////////////////////////////////////////////////////////////
-struct SysSpecOverrideSink
-    : public ILoadConfigurationEntrySink
-{
-    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup)
-    {
-        ICVar* pCvar = gEnv->pConsole->GetCVar(szKey);
-
-        if (pCvar)
-        {
-            const bool wasNotInConfig = ((pCvar->GetFlags() & VF_WASINCONFIG) == 0);
-            bool applyCvar = wasNotInConfig;
-            if (applyCvar == false)
-            {
-                // Special handling for sys_spec_full
-                if (azstricmp(szKey, "sys_spec_full") == 0)
-                {
-                    // If it is set to 0 then ignore this request to set to something else
-                    // If it is set to 0 then the user wants to changes system spec settings in system.cfg
-                    if (pCvar->GetIVal() != 0)
-                    {
-                        applyCvar = true;
-                    }
-                }
-                else
-                {
-                    // This could bypass the restricted cvar checks that exist elsewhere depending on
-                    // the calling code so we also need check here before setting.
-                    bool isConst = pCvar->IsConstCVar();
-                    bool isCheat = ((pCvar->GetFlags() & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0);
-                    bool isReadOnly = ((pCvar->GetFlags() & VF_READONLY) != 0);
-                    bool isDeprecated = ((pCvar->GetFlags() & VF_DEPRECATED) != 0);
-                    bool allowApplyCvar = true;
-
-                    if ((isConst || isCheat || isReadOnly) || isDeprecated)
-                    {
-                        allowApplyCvar = !isDeprecated && (gEnv->pSystem->IsDevMode()) || (gEnv->IsEditor());
-                    }
-
-                    if ((allowApplyCvar) || ALLOW_CONST_CVAR_MODIFICATIONS)
-                    {
-                        applyCvar = true;
-                    }
-                }
-            }
-
-            if (applyCvar)
-            {
-                pCvar->Set(szValue);
-            }
-            else
-            {
-                CryLogAlways("NOT VF_WASINCONFIG Ignoring cvar '%s' new value '%s' old value '%s' group '%s'", szKey, szValue, pCvar->GetString(), szGroup);
-            }
-        }
-        else
-        {
-            CryLogAlways("Can't find cvar '%s' value '%s' group '%s'", szKey, szValue, szGroup);
-        }
-    }
-};
-
-#if !defined(CONSOLE)
-struct SysSpecOverrideSinkConsole
-    : public ILoadConfigurationEntrySink
-{
-    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup)
-    {
-        // Ignore platform-specific cvars that should just be executed on the console
-        if (azstricmp(szGroup, "Platform") == 0)
-        {
-            return;
-        }
-
-        ICVar* pCvar = gEnv->pConsole->GetCVar(szKey);
-        if (pCvar)
-        {
-            pCvar->Set(szValue);
-        }
-        else
-        {
-            // If the cvar doesn't exist, calling this function only saves the value in case it's registered later where
-            // at that point it will be set from the stored value. This is required because otherwise registering the
-            // cvar bypasses any callbacks and uses values directly from the cvar group files.
-            gEnv->pConsole->LoadConfigVar(szKey, szValue);
-        }
-    }
-};
-#endif
-
-static ESystemConfigPlatform GetDevicePlatform()
-{
-#if defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
-    return CONFIG_PC;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_2
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_PLATFORM_ANDROID)
-    return CONFIG_ANDROID;
-#elif defined(AZ_PLATFORM_IOS)
-    return CONFIG_IOS;
-#elif defined(AZ_PLATFORM_MAC)
-    return CONFIG_OSX_METAL;
-#else
-    AZ_Assert(false, "Platform not supported");
-    return CONFIG_INVALID_PLATFORM;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-#if !defined(AZ_MONOLITHIC_BUILD)
-
-AZStd::unique_ptr<AZ::DynamicModuleHandle> CSystem::LoadDynamiclibrary(const char* dllName) const
-{
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> handle = AZ::DynamicModuleHandle::Create(dllName);
-
-    bool libraryLoaded = handle->Load(false);
-    // We need to inject the environment first thing so that allocators are available immediately
-    InjectEnvironmentFunction injectEnv = handle->GetFunction<InjectEnvironmentFunction>(INJECT_ENVIRONMENT_FUNCTION);
-    if (injectEnv)
-    {
-        auto env = AZ::Environment::GetInstance();
-        injectEnv(env);
-    }
-
-    if (!libraryLoaded)
-    {
-        handle.release();
-    }
-    return handle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZStd::unique_ptr<AZ::DynamicModuleHandle> CSystem::LoadDLL(const char* dllName)
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    AZ_TracePrintf(AZ_TRACE_SYSTEM_WINDOW, "Loading DLL: %s", dllName);
-
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> handle = LoadDynamiclibrary(dllName);
-
-    if (!handle)
-    {
-#if defined(LINUX) || defined(APPLE)
-        AZ_Assert(false, "Error loading dylib: %s, error :  %s\n", dllName, dlerror());
-#else
-        AZ_Assert(false, "Error loading dll: %s, error code %d", dllName, GetLastError());
-#endif
-        return handle;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // After loading DLL initialize it by calling ModuleInitISystem
-    //////////////////////////////////////////////////////////////////////////
-    string moduleName = PathUtil::GetFileName(dllName);
-
-    typedef void*(*PtrFunc_ModuleInitISystem)(ISystem* pSystem, const char* moduleName);
-    PtrFunc_ModuleInitISystem pfnModuleInitISystem = handle->GetFunction<PtrFunc_ModuleInitISystem>(DLL_MODULE_INIT_ISYSTEM);
-    if (pfnModuleInitISystem)
-    {
-        pfnModuleInitISystem(this, moduleName.c_str());
-    }
-
-    return handle;
-}
-
-// TODO:DLL  #endif //#if defined(AZ_HAS_DLL_SUPPORT) && !defined(AZ_MONOLITHIC_BUILD)
-#endif //if !defined(AZ_MONOLITHIC_BUILD)
-//////////////////////////////////////////////////////////////////////////
-bool CSystem::LoadEngineDLLs()
-{
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSystem::UnloadDLL(const char* dllName)
-{
-    bool isSuccess = false;
-
-    CCryNameCRC key(dllName);
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> empty;
-    AZStd::unique_ptr<AZ::DynamicModuleHandle>& hModule = stl::find_in_map_ref(m_moduleDLLHandles, key, empty);
-    if ((hModule) && (hModule->IsLoaded()))
-    {
-        DetachEnvironmentFunction detachEnv = hModule->GetFunction<DetachEnvironmentFunction>(DETACH_ENVIRONMENT_FUNCTION);
-        if (detachEnv)
-        {
-            detachEnv();
-        }
-
-        isSuccess = hModule->Unload();
-        hModule.release();
-    }
-
-    return isSuccess;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::ShutdownModuleLibraries()
-{
-#if !defined(AZ_MONOLITHIC_BUILD)
-    for (auto iterator = m_moduleDLLHandles.begin(); iterator != m_moduleDLLHandles.end(); ++iterator)
-    {
-        typedef void*( * PtrFunc_ModuleShutdownISystem )(ISystem* pSystem);
-
-        PtrFunc_ModuleShutdownISystem pfnModuleShutdownISystem = iterator->second->GetFunction<PtrFunc_ModuleShutdownISystem>(DLL_MODULE_SHUTDOWN_ISYSTEM);
-        if (pfnModuleShutdownISystem)
-        {
-            pfnModuleShutdownISystem(this);
-        }
-        if (iterator->second->IsLoaded())
-        {
-            iterator->second->Unload();
-        }
-        iterator->second.release();
-    }
-
-    m_moduleDLLHandles.clear();
-
-#endif // !defined(AZ_MONOLITHIC_BUILD)
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////
-
-#if defined(WIN32) || defined(WIN64)
-wstring GetErrorStringUnsupportedGPU(const char* gpuName, unsigned int gpuVendorId, unsigned int gpuDeviceId)
-{
-    const size_t fullLangID = (size_t) GetKeyboardLayout(0);
-    const size_t primLangID = fullLangID & 0x3FF;
-
-    const wchar_t* pFmt = L"Unsupported video card detected! Continuing to run might lead to unexpected results or crashes. "
-        L"Please check the manual for further information on hardware requirements.\n\n\"%S\" [vendor id = 0x%.4x, device id = 0x%.4x]";
-
-    switch (primLangID)
-    {
-    case 0x04: // Chinese
-    {
-        static const wchar_t fmt[] = {0x5075, 0x6E2C, 0x5230, 0x4E0D, 0x652F, 0x63F4, 0x7684, 0x986F, 0x793A, 0x5361, 0xFF01, 0x7E7C, 0x7E8C, 0x57F7, 0x884C, 0x53EF, 0x80FD, 0x5C0E, 0x81F4, 0x7121, 0x6CD5, 0x9810, 0x671F, 0x7684, 0x7D50, 0x679C, 0x6216, 0x7576, 0x6A5F, 0x3002, 0x8ACB, 0x6AA2, 0x67E5, 0x8AAA, 0x660E, 0x66F8, 0x4E0A, 0x7684, 0x786C, 0x9AD4, 0x9700, 0x6C42, 0x4EE5, 0x53D6, 0x5F97, 0x66F4, 0x591A, 0x76F8, 0x95DC, 0x8CC7, 0x8A0A, 0x3002, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x5EE0, 0x5546, 0x7DE8, 0x865F, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x88DD, 0x7F6E, 0x7DE8, 0x865F, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x05: // Czech
-    {
-        static const wchar_t fmt[] = {0x0042, 0x0079, 0x006C, 0x0061, 0x0020, 0x0064, 0x0065, 0x0074, 0x0065, 0x006B, 0x006F, 0x0076, 0x00E1, 0x006E, 0x0061, 0x0020, 0x0067, 0x0072, 0x0061, 0x0066, 0x0069, 0x0063, 0x006B, 0x00E1, 0x0020, 0x006B, 0x0061, 0x0072, 0x0074, 0x0061, 0x002C, 0x0020, 0x006B, 0x0074, 0x0065, 0x0072, 0x00E1, 0x0020, 0x006E, 0x0065, 0x006E, 0x00ED, 0x0020, 0x0070, 0x006F, 0x0064, 0x0070, 0x006F, 0x0072, 0x006F, 0x0076, 0x00E1, 0x006E, 0x0061, 0x002E, 0x0020, 0x0050, 0x006F, 0x006B, 0x0072, 0x0061, 0x010D, 0x006F, 0x0076, 0x00E1, 0x006E, 0x00ED, 0x0020, 0x006D, 0x016F, 0x017E, 0x0065, 0x0020, 0x0076, 0x00E9, 0x0073, 0x0074, 0x0020, 0x006B, 0x0065, 0x0020, 0x006B, 0x0072, 0x0069, 0x0074, 0x0069, 0x0063, 0x006B, 0x00FD, 0x006D, 0x0020, 0x0063, 0x0068, 0x0079, 0x0062, 0x00E1, 0x006D, 0x0020, 0x006E, 0x0065, 0x0062, 0x006F, 0x0020, 0x006E, 0x0065, 0x0073, 0x0074, 0x0061, 0x0062, 0x0069, 0x006C, 0x0069, 0x0074, 0x011B, 0x0020, 0x0073, 0x0079, 0x0073, 0x0074, 0x00E9, 0x006D, 0x0075, 0x002E, 0x0020, 0x0050, 0x0159, 0x0065, 0x010D, 0x0074, 0x011B, 0x0074, 0x0065, 0x0020, 0x0073, 0x0069, 0x0020, 0x0070, 0x0072, 0x006F, 0x0073, 0x00ED, 0x006D, 0x0020, 0x0075, 0x017E, 0x0069, 0x0076, 0x0061, 0x0074, 0x0065, 0x006C, 0x0073, 0x006B, 0x006F, 0x0075, 0x0020, 0x0070, 0x0159, 0x00ED, 0x0072, 0x0075, 0x010D, 0x006B, 0x0075, 0x0020, 0x0070, 0x0072, 0x006F, 0x0020, 0x0070, 0x006F, 0x0064, 0x0072, 0x006F, 0x0062, 0x006E, 0x00E9, 0x0020, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0063, 0x0065, 0x0020, 0x006F, 0x0020, 0x0073, 0x0079, 0x0073, 0x0074, 0x00E9, 0x006D, 0x006F, 0x0076, 0x00FD, 0x0063, 0x0068, 0x0020, 0x0070, 0x006F, 0x017E, 0x0061, 0x0064, 0x0061, 0x0076, 0x0063, 0x00ED, 0x0063, 0x0068, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x07: // German
-    {
-        static const wchar_t fmt[] = {0x004E, 0x0069, 0x0063, 0x0068, 0x0074, 0x002D, 0x0075, 0x006E, 0x0074, 0x0065, 0x0072, 0x0073, 0x0074, 0x00FC, 0x0074, 0x007A, 0x0074, 0x0065, 0x0020, 0x0056, 0x0069, 0x0064, 0x0065, 0x006F, 0x006B, 0x0061, 0x0072, 0x0074, 0x0065, 0x0020, 0x0067, 0x0065, 0x0066, 0x0075, 0x006E, 0x0064, 0x0065, 0x006E, 0x0021, 0x0020, 0x0046, 0x006F, 0x0072, 0x0074, 0x0066, 0x0061, 0x0068, 0x0072, 0x0065, 0x006E, 0x0020, 0x006B, 0x0061, 0x006E, 0x006E, 0x0020, 0x007A, 0x0075, 0x0020, 0x0075, 0x006E, 0x0065, 0x0072, 0x0077, 0x0061, 0x0072, 0x0074, 0x0065, 0x0074, 0x0065, 0x006E, 0x0020, 0x0045, 0x0072, 0x0067, 0x0065, 0x0062, 0x006E, 0x0069, 0x0073, 0x0073, 0x0065, 0x006E, 0x0020, 0x006F, 0x0064, 0x0065, 0x0072, 0x0020, 0x0041, 0x0062, 0x0073, 0x0074, 0x00FC, 0x0072, 0x007A, 0x0065, 0x006E, 0x0020, 0x0066, 0x00FC, 0x0068, 0x0072, 0x0065, 0x006E, 0x002E, 0x0020, 0x0042, 0x0069, 0x0074, 0x0074, 0x0065, 0x0020, 0x006C, 0x0069, 0x0065, 0x0073, 0x0020, 0x0064, 0x0061, 0x0073, 0x0020, 0x004D, 0x0061, 0x006E, 0x0075, 0x0061, 0x006C, 0x0020, 0x0066, 0x00FC, 0x0072, 0x0020, 0x0077, 0x0065, 0x0069, 0x0074, 0x0065, 0x0072, 0x0065, 0x0020, 0x0049, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0074, 0x0069, 0x006F, 0x006E, 0x0065, 0x006E, 0x0020, 0x007A, 0x0075, 0x0020, 0x0048, 0x0061, 0x0072, 0x0064, 0x0077, 0x0061, 0x0072, 0x0065, 0x002D, 0x0041, 0x006E, 0x0066, 0x006F, 0x0072, 0x0064, 0x0065, 0x0072, 0x0075, 0x006E, 0x0067, 0x0065, 0x006E, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x0a: // Spanish
-    {
-        static const wchar_t fmt[] = {0x0053, 0x0065, 0x0020, 0x0068, 0x0061, 0x0020, 0x0064, 0x0065, 0x0074, 0x0065, 0x0063, 0x0074, 0x0061, 0x0064, 0x006F, 0x0020, 0x0075, 0x006E, 0x0061, 0x0020, 0x0074, 0x0061, 0x0072, 0x006A, 0x0065, 0x0074, 0x0061, 0x0020, 0x0067, 0x0072, 0x00E1, 0x0066, 0x0069, 0x0063, 0x0061, 0x0020, 0x006E, 0x006F, 0x0020, 0x0063, 0x006F, 0x006D, 0x0070, 0x0061, 0x0074, 0x0069, 0x0062, 0x006C, 0x0065, 0x002E, 0x0020, 0x0053, 0x0069, 0x0020, 0x0073, 0x0069, 0x0067, 0x0075, 0x0065, 0x0073, 0x0020, 0x0065, 0x006A, 0x0065, 0x0063, 0x0075, 0x0074, 0x0061, 0x006E, 0x0064, 0x006F, 0x0020, 0x0065, 0x006C, 0x0020, 0x006A, 0x0075, 0x0065, 0x0067, 0x006F, 0x002C, 0x0020, 0x0065, 0x0073, 0x0020, 0x0070, 0x006F, 0x0073, 0x0069, 0x0062, 0x006C, 0x0065, 0x0020, 0x0071, 0x0075, 0x0065, 0x0020, 0x0073, 0x0065, 0x0020, 0x0070, 0x0072, 0x006F, 0x0064, 0x0075, 0x007A, 0x0063, 0x0061, 0x006E, 0x0020, 0x0065, 0x0066, 0x0065, 0x0063, 0x0074, 0x006F, 0x0073, 0x0020, 0x0069, 0x006E, 0x0065, 0x0073, 0x0070, 0x0065, 0x0072, 0x0061, 0x0064, 0x006F, 0x0073, 0x0020, 0x006F, 0x0020, 0x0071, 0x0075, 0x0065, 0x0020, 0x0065, 0x006C, 0x0020, 0x0070, 0x0072, 0x006F, 0x0067, 0x0072, 0x0061, 0x006D, 0x0061, 0x0020, 0x0064, 0x0065, 0x006A, 0x0065, 0x0020, 0x0064, 0x0065, 0x0020, 0x0066, 0x0075, 0x006E, 0x0063, 0x0069, 0x006F, 0x006E, 0x0061, 0x0072, 0x002E, 0x0020, 0x0050, 0x006F, 0x0072, 0x0020, 0x0066, 0x0061, 0x0076, 0x006F, 0x0072, 0x002C, 0x0020, 0x0063, 0x006F, 0x006D, 0x0070, 0x0072, 0x0075, 0x0065, 0x0062, 0x0061, 0x0020, 0x0065, 0x006C, 0x0020, 0x006D, 0x0061, 0x006E, 0x0075, 0x0061, 0x006C, 0x0020, 0x0070, 0x0061, 0x0072, 0x0061, 0x0020, 0x006F, 0x0062, 0x0074, 0x0065, 0x006E, 0x0065, 0x0072, 0x0020, 0x006D, 0x00E1, 0x0073, 0x0020, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0063, 0x0069, 0x00F3, 0x006E, 0x0020, 0x0061, 0x0063, 0x0065, 0x0072, 0x0063, 0x0061, 0x0020, 0x0064, 0x0065, 0x0020, 0x006C, 0x006F, 0x0073, 0x0020, 0x0072, 0x0065, 0x0071, 0x0075, 0x0069, 0x0073, 0x0069, 0x0074, 0x006F, 0x0073, 0x0020, 0x0064, 0x0065, 0x006C, 0x0020, 0x0073, 0x0069, 0x0073, 0x0074, 0x0065, 0x006D, 0x0061, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x0c: // French
-    {
-        static const wchar_t fmt[] = {0x0041, 0x0074, 0x0074, 0x0065, 0x006E, 0x0074, 0x0069, 0x006F, 0x006E, 0x002C, 0x0020, 0x006C, 0x0061, 0x0020, 0x0063, 0x0061, 0x0072, 0x0074, 0x0065, 0x0020, 0x0076, 0x0069, 0x0064, 0x00E9, 0x006F, 0x0020, 0x0064, 0x00E9, 0x0074, 0x0065, 0x0063, 0x0074, 0x00E9, 0x0065, 0x0020, 0x006E, 0x2019, 0x0065, 0x0073, 0x0074, 0x0020, 0x0070, 0x0061, 0x0073, 0x0020, 0x0073, 0x0075, 0x0070, 0x0070, 0x006F, 0x0072, 0x0074, 0x00E9, 0x0065, 0x0020, 0x0021, 0x0020, 0x0050, 0x006F, 0x0075, 0x0072, 0x0073, 0x0075, 0x0069, 0x0076, 0x0072, 0x0065, 0x0020, 0x006C, 0x2019, 0x0061, 0x0070, 0x0070, 0x006C, 0x0069, 0x0063, 0x0061, 0x0074, 0x0069, 0x006F, 0x006E, 0x0020, 0x0070, 0x006F, 0x0075, 0x0072, 0x0072, 0x0061, 0x0069, 0x0074, 0x0020, 0x0065, 0x006E, 0x0067, 0x0065, 0x006E, 0x0064, 0x0072, 0x0065, 0x0072, 0x0020, 0x0064, 0x0065, 0x0073, 0x0020, 0x0069, 0x006E, 0x0073, 0x0074, 0x0061, 0x0062, 0x0069, 0x006C, 0x0069, 0x0074, 0x00E9, 0x0073, 0x0020, 0x006F, 0x0075, 0x0020, 0x0064, 0x0065, 0x0073, 0x0020, 0x0063, 0x0072, 0x0061, 0x0073, 0x0068, 0x0073, 0x002E, 0x0020, 0x0056, 0x0065, 0x0075, 0x0069, 0x006C, 0x006C, 0x0065, 0x007A, 0x0020, 0x0076, 0x006F, 0x0075, 0x0073, 0x0020, 0x0072, 0x0065, 0x0070, 0x006F, 0x0072, 0x0074, 0x0065, 0x0072, 0x0020, 0x0061, 0x0075, 0x0020, 0x006D, 0x0061, 0x006E, 0x0075, 0x0065, 0x006C, 0x0020, 0x0070, 0x006F, 0x0075, 0x0072, 0x0020, 0x0070, 0x006C, 0x0075, 0x0073, 0x0020, 0x0064, 0x2019, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0074, 0x0069, 0x006F, 0x006E, 0x0073, 0x0020, 0x0073, 0x0075, 0x0072, 0x0020, 0x006C, 0x0065, 0x0073, 0x0020, 0x0070, 0x0072, 0x00E9, 0x002D, 0x0072, 0x0065, 0x0071, 0x0075, 0x0069, 0x0073, 0x0020, 0x006D, 0x0061, 0x0074, 0x00E9, 0x0072, 0x0069, 0x0065, 0x006C, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x10: // Italian
-    {
-        static const wchar_t fmt[] = {0x00C8, 0x0020, 0x0073, 0x0074, 0x0061, 0x0074, 0x0061, 0x0020, 0x0072, 0x0069, 0x006C, 0x0065, 0x0076, 0x0061, 0x0074, 0x0061, 0x0020, 0x0075, 0x006E, 0x0061, 0x0020, 0x0073, 0x0063, 0x0068, 0x0065, 0x0064, 0x0061, 0x0020, 0x0067, 0x0072, 0x0061, 0x0066, 0x0069, 0x0063, 0x0061, 0x0020, 0x006E, 0x006F, 0x006E, 0x0020, 0x0073, 0x0075, 0x0070, 0x0070, 0x006F, 0x0072, 0x0074, 0x0061, 0x0074, 0x0061, 0x0021, 0x0020, 0x0053, 0x0065, 0x0020, 0x0073, 0x0069, 0x0020, 0x0063, 0x006F, 0x006E, 0x0074, 0x0069, 0x006E, 0x0075, 0x0061, 0x002C, 0x0020, 0x0073, 0x0069, 0x0020, 0x0070, 0x006F, 0x0074, 0x0072, 0x0065, 0x0062, 0x0062, 0x0065, 0x0072, 0x006F, 0x0020, 0x0076, 0x0065, 0x0072, 0x0069, 0x0066, 0x0069, 0x0063, 0x0061, 0x0072, 0x0065, 0x0020, 0x0072, 0x0069, 0x0073, 0x0075, 0x006C, 0x0074, 0x0061, 0x0074, 0x0069, 0x0020, 0x0069, 0x006E, 0x0061, 0x0074, 0x0074, 0x0065, 0x0073, 0x0069, 0x0020, 0x006F, 0x0020, 0x0063, 0x0072, 0x0061, 0x0073, 0x0068, 0x002E, 0x0020, 0x0043, 0x006F, 0x006E, 0x0073, 0x0075, 0x006C, 0x0074, 0x0061, 0x0020, 0x0069, 0x006C, 0x0020, 0x006D, 0x0061, 0x006E, 0x0075, 0x0061, 0x006C, 0x0065, 0x0020, 0x0070, 0x0065, 0x0072, 0x0020, 0x0075, 0x006C, 0x0074, 0x0065, 0x0072, 0x0069, 0x006F, 0x0072, 0x0069, 0x0020, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x007A, 0x0069, 0x006F, 0x006E, 0x0069, 0x0020, 0x0073, 0x0075, 0x0069, 0x0020, 0x0072, 0x0065, 0x0071, 0x0075, 0x0069, 0x0073, 0x0069, 0x0074, 0x0069, 0x0020, 0x0064, 0x0069, 0x0020, 0x0073, 0x0069, 0x0073, 0x0074, 0x0065, 0x006D, 0x0061, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x11: // Japanese
-    {
-        static const wchar_t fmt[] = {0x30B5, 0x30DD, 0x30FC, 0x30C8, 0x3055, 0x308C, 0x3066, 0x3044, 0x306A, 0x3044, 0x30D3, 0x30C7, 0x30AA, 0x30AB, 0x30FC, 0x30C9, 0x304C, 0x691C, 0x51FA, 0x3055, 0x308C, 0x307E, 0x3057, 0x305F, 0xFF01, 0x0020, 0x3053, 0x306E, 0x307E, 0x307E, 0x7D9A, 0x3051, 0x308B, 0x3068, 0x4E88, 0x671F, 0x3057, 0x306A, 0x3044, 0x7D50, 0x679C, 0x3084, 0x30AF, 0x30E9, 0x30C3, 0x30B7, 0x30E5, 0x306E, 0x6050, 0x308C, 0x304C, 0x3042, 0x308A, 0x307E, 0x3059, 0x3002, 0x0020, 0x30DE, 0x30CB, 0x30E5, 0x30A2, 0x30EB, 0x306E, 0x5FC5, 0x8981, 0x52D5, 0x4F5C, 0x74B0, 0x5883, 0x3092, 0x3054, 0x78BA, 0x8A8D, 0x304F, 0x3060, 0x3055, 0x3044, 0x3002, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x30D9, 0x30F3, 0x30C0, 0x30FC, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x30C7, 0x30D0, 0x30A4, 0x30B9, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x15: // Polish
-    {
-        static const wchar_t fmt[] = {0x0057, 0x0079, 0x006B, 0x0072, 0x0079, 0x0074, 0x006F, 0x0020, 0x006E, 0x0069, 0x0065, 0x006F, 0x0062, 0x0073, 0x0142, 0x0075, 0x0067, 0x0069, 0x0077, 0x0061, 0x006E, 0x0105, 0x0020, 0x006B, 0x0061, 0x0072, 0x0074, 0x0119, 0x0020, 0x0067, 0x0072, 0x0061, 0x0066, 0x0069, 0x0063, 0x007A, 0x006E, 0x0105, 0x0021, 0x0020, 0x0044, 0x0061, 0x006C, 0x0073, 0x007A, 0x0065, 0x0020, 0x006B, 0x006F, 0x0072, 0x007A, 0x0079, 0x0073, 0x0074, 0x0061, 0x006E, 0x0069, 0x0065, 0x0020, 0x007A, 0x0020, 0x0070, 0x0072, 0x006F, 0x0064, 0x0075, 0x006B, 0x0074, 0x0075, 0x0020, 0x006D, 0x006F, 0x017C, 0x0065, 0x0020, 0x0073, 0x0070, 0x006F, 0x0077, 0x006F, 0x0064, 0x006F, 0x0077, 0x0061, 0x0107, 0x0020, 0x006E, 0x0069, 0x0065, 0x0070, 0x006F, 0x017C, 0x0105, 0x0064, 0x0061, 0x006E, 0x0065, 0x0020, 0x007A, 0x0061, 0x0063, 0x0068, 0x006F, 0x0077, 0x0061, 0x006E, 0x0069, 0x0065, 0x0020, 0x006C, 0x0075, 0x0062, 0x0020, 0x0077, 0x0073, 0x0074, 0x0072, 0x007A, 0x0079, 0x006D, 0x0061, 0x006E, 0x0069, 0x0065, 0x0020, 0x0070, 0x0072, 0x006F, 0x0067, 0x0072, 0x0061, 0x006D, 0x0075, 0x002E, 0x0020, 0x0041, 0x0062, 0x0079, 0x0020, 0x0075, 0x007A, 0x0079, 0x0073, 0x006B, 0x0061, 0x0107, 0x0020, 0x0077, 0x0069, 0x0119, 0x0063, 0x0065, 0x006A, 0x0020, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0063, 0x006A, 0x0069, 0x002C, 0x0020, 0x0073, 0x006B, 0x006F, 0x006E, 0x0073, 0x0075, 0x006C, 0x0074, 0x0075, 0x006A, 0x0020, 0x0073, 0x0069, 0x0119, 0x0020, 0x007A, 0x0020, 0x0069, 0x006E, 0x0073, 0x0074, 0x0072, 0x0075, 0x006B, 0x0063, 0x006A, 0x0105, 0x0020, 0x006F, 0x0062, 0x0073, 0x0142, 0x0075, 0x0067, 0x0069, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x19: // Russian
-    {
-        static const wchar_t fmt[] = {0x0412, 0x0430, 0x0448, 0x0430, 0x0020, 0x0432, 0x0438, 0x0434, 0x0435, 0x043E, 0x0020, 0x043A, 0x0430, 0x0440, 0x0442, 0x0430, 0x0020, 0x043D, 0x0435, 0x0020, 0x043F, 0x043E, 0x0434, 0x0434, 0x0435, 0x0440, 0x0436, 0x0438, 0x0432, 0x0430, 0x0435, 0x0442, 0x0441, 0x044F, 0x0021, 0x0020, 0x042D, 0x0442, 0x043E, 0x0020, 0x043C, 0x043E, 0x0436, 0x0435, 0x0442, 0x0020, 0x043F, 0x0440, 0x0438, 0x0432, 0x0435, 0x0441, 0x0442, 0x0438, 0x0020, 0x043A, 0x0020, 0x043D, 0x0435, 0x043F, 0x0440, 0x0435, 0x0434, 0x0441, 0x043A, 0x0430, 0x0437, 0x0443, 0x0435, 0x043C, 0x043E, 0x043C, 0x0443, 0x0020, 0x043F, 0x043E, 0x0432, 0x0435, 0x0434, 0x0435, 0x043D, 0x0438, 0x044E, 0x0020, 0x0438, 0x0020, 0x0437, 0x0430, 0x0432, 0x0438, 0x0441, 0x0430, 0x043D, 0x0438, 0x044E, 0x0020, 0x0438, 0x0433, 0x0440, 0x044B, 0x002E, 0x0020, 0x0414, 0x043B, 0x044F, 0x0020, 0x043F, 0x043E, 0x043B, 0x0443, 0x0447, 0x0435, 0x043D, 0x0438, 0x044F, 0x0020, 0x0438, 0x043D, 0x0444, 0x043E, 0x0440, 0x043C, 0x0430, 0x0446, 0x0438, 0x0438, 0x0020, 0x043E, 0x0020, 0x0441, 0x0438, 0x0441, 0x0442, 0x0435, 0x043C, 0x043D, 0x044B, 0x0445, 0x0020, 0x0442, 0x0440, 0x0435, 0x0431, 0x043E, 0x0432, 0x0430, 0x043D, 0x0438, 0x044F, 0x0445, 0x0020, 0x043E, 0x0431, 0x0440, 0x0430, 0x0442, 0x0438, 0x0442, 0x0435, 0x0441, 0x044C, 0x0020, 0x043A, 0x0020, 0x0440, 0x0443, 0x043A, 0x043E, 0x0432, 0x043E, 0x0434, 0x0441, 0x0442, 0x0432, 0x0443, 0x0020, 0x043F, 0x043E, 0x043B, 0x044C, 0x0437, 0x043E, 0x0432, 0x0430, 0x0442, 0x0435, 0x043B, 0x044F, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-    case 0x1f: // Turkish
-    {
-        static const wchar_t fmt[] = {0x0044, 0x0065, 0x0073, 0x0074, 0x0065, 0x006B, 0x006C, 0x0065, 0x006E, 0x006D, 0x0065, 0x0079, 0x0065, 0x006E, 0x0020, 0x0062, 0x0069, 0x0072, 0x0020, 0x0065, 0x006B, 0x0072, 0x0061, 0x006E, 0x0020, 0x006B, 0x0061, 0x0072, 0x0074, 0x0131, 0x0020, 0x0061, 0x006C, 0x0067, 0x0131, 0x006C, 0x0061, 0x006E, 0x0064, 0x0131, 0x0021, 0x0020, 0x0044, 0x0065, 0x0076, 0x0061, 0x006D, 0x0020, 0x0065, 0x0074, 0x006D, 0x0065, 0x006B, 0x0020, 0x0062, 0x0065, 0x006B, 0x006C, 0x0065, 0x006E, 0x006D, 0x0065, 0x0064, 0x0069, 0x006B, 0x0020, 0x0073, 0x006F, 0x006E, 0x0075, 0x00E7, 0x006C, 0x0061, 0x0072, 0x0061, 0x0020, 0x0076, 0x0065, 0x0020, 0x00E7, 0x00F6, 0x006B, 0x006D, 0x0065, 0x006C, 0x0065, 0x0072, 0x0065, 0x0020, 0x0079, 0x006F, 0x006C, 0x0020, 0x0061, 0x00E7, 0x0061, 0x0062, 0x0069, 0x006C, 0x0069, 0x0072, 0x002E, 0x0020, 0x0044, 0x006F, 0x006E, 0x0061, 0x006E, 0x0131, 0x006D, 0x0020, 0x0067, 0x0065, 0x0072, 0x0065, 0x006B, 0x006C, 0x0069, 0x006C, 0x0069, 0x006B, 0x006C, 0x0065, 0x0072, 0x0069, 0x0020, 0x0069, 0x00E7, 0x0069, 0x006E, 0x0020, 0x006C, 0x00FC, 0x0074, 0x0066, 0x0065, 0x006E, 0x0020, 0x0072, 0x0065, 0x0068, 0x0062, 0x0065, 0x0072, 0x0069, 0x006E, 0x0069, 0x007A, 0x0065, 0x0020, 0x0062, 0x0061, 0x015F, 0x0076, 0x0075, 0x0072, 0x0075, 0x006E, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
-        pFmt = fmt;
-        break;
-    }
-
-    case 0x09: // English
-    default:
-        break;
-    }
-
-    wchar_t msg[1024];
-    msg[0] = L'\0';
-    msg[sizeof(msg) / sizeof(msg[0]) - 1] = L'\0';
-    azsnwprintf(msg, sizeof(msg) / sizeof(msg[0]) - 1, pFmt, gpuName, gpuVendorId, gpuDeviceId);
-
-    return msg;
-}
-#endif
-
-/////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////
-bool CSystem::InitConsole()
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    if (m_env.pConsole)
-    {
-        m_env.pConsole->Init(this);
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// attaches the given variable to the given container;
-// recreates the variable if necessary
-ICVar* CSystem::attachVariable (const char* szVarName, int* pContainer, const char* szComment, int dwFlags)
-{
-    IConsole* pConsole = GetIConsole();
-
-    ICVar* pOldVar = pConsole->GetCVar (szVarName);
-    int nDefault = 0;
-    if (pOldVar)
-    {
-        nDefault = pOldVar->GetIVal();
-        pConsole->UnregisterVariable(szVarName, true);
-    }
-
-    // NOTE: maybe we should preserve the actual value of the variable across the registration,
-    // because of the strange architecture of IConsole that converts int->float->int
-
-    REGISTER_CVAR2(szVarName, pContainer, *pContainer, dwFlags, szComment);
-
-    ICVar* pVar = pConsole->GetCVar(szVarName);
-
-#ifdef _DEBUG
-    // test if the variable really has this container
-    assert (*pContainer == pVar->GetIVal());
-    ++*pContainer;
-    assert (*pContainer == pVar->GetIVal());
-    --*pContainer;
-#endif
-
-    if (pOldVar)
-    {
-        // carry on the default value from the old variable anyway
-        pVar->Set(nDefault);
-    }
-    return pVar;
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-bool CSystem::InitFileSystem()
-{
-    LOADING_TIME_PROFILE_SECTION;
-    using namespace AzFramework::AssetSystem;
-
-    if (m_pUserCallback)
-    {
-        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");
-    AZ_Assert(m_env.pFileIO, "FileIOBase has not been initialized");
-
-    if (m_bEditor)
-    {
-        m_env.pCryPak->RecordFileOpen(AZ::IO::IArchive::RFOM_EngineStartup);
-    }
-
-    //init crypak
-    if (m_env.pCryPak->Init(""))
-    {
-#if !defined(_RELEASE)
-        const ICmdLineArg* pakalias = m_pCmdLine->FindArg(eCLAT_Pre, "pakalias");
-#else
-        const ICmdLineArg* pakalias = nullptr;
-#endif // !defined(_RELEASE)
-        if (pakalias && strlen(pakalias->GetValue()) > 0)
-        {
-            m_env.pCryPak->ParseAliases(pakalias->GetValue());
-        }
-    }
-    else
-    {
-        AZ_Assert(false, "Failed to initialize CryPak.");
-        return false;
-    }
-
-    // Now that file systems are init, we will clear any events that have arrived
-    // during file system init, so that systems do not reload assets that were already compiled in the
-    // critical compilation section.
-
-    AzFramework::LegacyAssetEventBus::ClearQueuedEvents();
-
-    //we are good to go
-    return true;
-}
-
-
-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;
-}
-
-/////////////////////////////////////////////////////////////////////////////////
-bool CSystem::InitFileSystem_LoadEngineFolders(const SSystemInitParams&)
-{
-    LOADING_TIME_PROFILE_SECTION;
-    {
-        LoadConfiguration(m_systemConfigName.c_str());
-        AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Loading system configuration from %s...", m_systemConfigName.c_str());
-    }
-
-#if defined(AZ_PLATFORM_ANDROID)
-    AZ::Android::Utils::SetLoadFilesToMemory(m_sys_load_files_to_memory->GetString());
-#endif
-
-    GetISystem()->SetConfigPlatform(GetDevicePlatform());
-
-    auto projectPath = AZ::Utils::GetProjectPath();
-    AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Project Path: %s\n", projectPath.empty() ? "None specified" : projectPath.c_str());
-
-    auto projectName = AZ::Utils::GetProjectName();
-    AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Project Name: %s\n", projectName.empty() ? "None specified" : projectName.c_str());
-
-    OpenBasicPaks();
-
-    // Load game-specific folder.
-    LoadConfiguration("game.cfg");
-    // Load the client/sever-specific configuration
-    static const char* g_additionalConfig = gEnv->IsDedicated() ? "server_cfg" : "client_cfg";
-    LoadConfiguration(g_additionalConfig, nullptr, false);
-
-    // We do not use CVar groups on the consoles
-    AddCVarGroupDirectory("Config/CVarGroups");
-
-    return (true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSystem::InitAudioSystem(const SSystemInitParams& initParams)
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    if (!Audio::Gem::AudioSystemGemRequestBus::HasHandlers())
-    {
-        // AudioSystem Gem has not been enabled for this project.
-        // This should not generate an error, but calling scope will warn.
-        return false;
-    }
-
-    bool useRealAudioSystem = false;
-    if (!initParams.bPreview
-        && !m_bDedicatedServer
-        && m_sys_audio_disable->GetIVal() == 0)
-    {
-        useRealAudioSystem = true;
-    }
-
-    bool result = false;
-    if (useRealAudioSystem)
-    {
-        Audio::Gem::AudioSystemGemRequestBus::BroadcastResult(result, &Audio::Gem::AudioSystemGemRequestBus::Events::Initialize, &initParams);
-    }
-    else
-    {
-        Audio::Gem::AudioSystemGemRequestBus::BroadcastResult(result, &Audio::Gem::AudioSystemGemRequestBus::Events::Initialize, nullptr);
-    }
-
-    if (result)
-    {
-        AZ_Assert(Audio::AudioSystemRequestBus::HasHandlers(),
-            "Initialization of the Audio System succeeded, but the Audio System EBus is not connected!\n");
-    }
-    else
-    {
-        AZ_Error(AZ_TRACE_SYSTEM_WINDOW, result, "The Audio System did not initialize correctly!\n");
-    }
-
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSystem::InitVTuneProfiler()
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-#ifdef PROFILE_WITH_VTUNE
-
-    WIN_HMODULE hModule = LoadDLL("VTuneApi.dll");
-    if (!hModule)
-    {
-        return false;
-    }
-
-        VTPause = (VTuneFunction) CryGetProcAddress(hModule, "VTPause");
-        VTResume = (VTuneFunction) CryGetProcAddress(hModule, "VTResume");
-        if (!VTPause || !VTResume)
-        {
-        AZ_Assert(false, "VTune did not initialize correctly.")
-        return false;
-    }
-    else
-    {
-        AZ_TracePrintf(AZ_TRACE_SYSTEM_WINDOW, "VTune API Initialized");
-    }
-#endif //PROFILE_WITH_VTUNE
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::InitLocalization()
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-    // Set the localization folder
-    ICVar* pCVar = m_env.pConsole != 0 ? m_env.pConsole->GetCVar("sys_localization_folder") : 0;
-    if (pCVar)
-    {
-        static_cast<AZ::IO::Archive* const>(m_env.pCryPak)->SetLocalizationFolder(g_cvars.sys_localization_folder->GetString());
-    }
-
-    // Removed line that assigned language based on a #define
-
-    if (m_pLocalizationManager == nullptr)
-    {
-        m_pLocalizationManager = new CLocalizedStringsManager(this);
-    }
-
-    // Platform-specific implementation of getting the system language
-    ILocalizationManager::EPlatformIndependentLanguageID languageID = m_pLocalizationManager->GetSystemLanguage();
-    if (!m_pLocalizationManager->IsLanguageSupported(languageID))
-    {
-        languageID = ILocalizationManager::EPlatformIndependentLanguageID::ePILID_English_US;
-    }
-
-    string language = m_pLocalizationManager->LangNameFromPILID(languageID);
-    m_pLocalizationManager->SetLanguage(language.c_str());
-    if (m_pLocalizationManager->GetLocalizationFormat() == 1)
-    {
-        string translationsListXML = LOCALIZATION_TRANSLATIONS_LIST_FILE_NAME;
-        m_pLocalizationManager->InitLocalizationData(translationsListXML);
-
-        m_pLocalizationManager->LoadAllLocalizationData();
-    }
-    else
-    {
-        // if the language value cannot be found, let's default to the english pak
-        OpenLanguagePak(language);
-    }
-
-    pCVar = m_env.pConsole != 0 ? m_env.pConsole->GetCVar("g_languageAudio") : 0;
-    if (pCVar)
-    {
-        if (strlen(pCVar->GetString()) == 0)
-        {
-            pCVar->Set(language);
-        }
-        else
-        {
-            language = pCVar->GetString();
-        }
-    }
-    OpenLanguageAudioPak(language);
-}
-
-void CSystem::OpenBasicPaks()
-{
-    static bool bBasicPaksLoaded = false;
-    if (bBasicPaksLoaded)
-    {
-        return;
-    }
-    bBasicPaksLoaded = true;
-
-    LOADING_TIME_PROFILE_SECTION;
-
-    // open pak files
-    constexpr AZStd::string_view paksFolder = "@assets@/*.pak"; // (@assets@ assumed)
-    m_env.pCryPak->OpenPacks(paksFolder);
-
-    InlineInitializationProcessing("CSystem::OpenBasicPaks OpenPacks( paksFolder.c_str() )");
-
-    //////////////////////////////////////////////////////////////////////////
-    // Open engine packs
-    //////////////////////////////////////////////////////////////////////////
-
-    const char* const assetsDir = "@assets@";
-
-    // After game paks to have same search order as with files on disk
-    m_env.pCryPak->OpenPack(assetsDir, "Engine.pak");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_15
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-
-#ifdef AZ_PLATFORM_ANDROID
-    // Load Android Obb files if available
-    const char* obbStorage = AZ::Android::Utils::GetObbStoragePath();
-    AZStd::string mainObbPath = AZStd::move(AZStd::string::format("%s/%s", obbStorage, AZ::Android::Utils::GetObbFileName(true)));
-    AZStd::string patchObbPath = AZStd::move(AZStd::string::format("%s/%s", obbStorage, AZ::Android::Utils::GetObbFileName(false)));
-    m_env.pCryPak->OpenPack(assetsDir, mainObbPath.c_str());
-    m_env.pCryPak->OpenPack(assetsDir, patchObbPath.c_str());
-#endif //AZ_PLATFORM_ANDROID
-
-    InlineInitializationProcessing("CSystem::OpenBasicPaks OpenPacks( Engine... )");
-
-    // Load paks required for game init to mem
-    gEnv->pCryPak->LoadPakToMemory("Engine.pak", AZ::IO::IArchive::eInMemoryPakLocale_GPU);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::OpenLanguagePak(const char* sLanguage)
-{
-    // Don't attempt to open a language PAK file if the game doesn't have a
-    // loc folder configured.
-    bool projUsesLocalization = false;
-    LocalizationManagerRequestBus::BroadcastResult(projUsesLocalization, &LocalizationManagerRequestBus::Events::ProjectUsesLocalization);
-    if (!projUsesLocalization)
-    {
-        return;
-    }
-
-    // Initialize languages.
-
-    // Omit the trailing slash!
-    string sLocalizationFolder = PathUtil::GetLocalizationFolder();
-
-    // load xml pak with full filenames to perform wildcard searches.
-    string sLocalizedPath;
-    GetLocalizedPath(sLanguage, sLocalizedPath);
-    if (!m_env.pCryPak->OpenPacks({ sLocalizationFolder.c_str(), sLocalizationFolder.size() }, { sLocalizedPath.c_str(), sLocalizedPath.size() }, 0))
-    {
-        // make sure the localized language is found - not really necessary, for TC
-        AZ_Printf("Localization", "Localized language content(%s) not available or modified from the original installation.", sLanguage);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::OpenLanguageAudioPak([[maybe_unused]] const char* sLanguage)
-{
-    // Don't attempt to open a language PAK file if the game doesn't have a
-    // loc folder configured.
-    bool projUsesLocalization = false;
-    LocalizationManagerRequestBus::BroadcastResult(projUsesLocalization, &LocalizationManagerRequestBus::Events::ProjectUsesLocalization);
-    if (!projUsesLocalization)
-    {
-        return;
-    }
-
-    // Initialize languages.
-
-    int nPakFlags = 0;
-
-    // Omit the trailing slash!
-    string sLocalizationFolder(string().assign(PathUtil::GetLocalizationFolder(), 0, PathUtil::GetLocalizationFolder().size() - 1));
-
-    if (sLocalizationFolder.compareNoCase("Languages") == 0)
-    {
-        sLocalizationFolder = "@assets@";
-    }
-
-    // load localized pak with crc32 filenames on consoles to save memory.
-    string sLocalizedPath = "loc.pak";
-
-    if (!m_env.pCryPak->OpenPacks(sLocalizationFolder.c_str(), sLocalizedPath.c_str(), nPakFlags))
-    {
-        // make sure the localized language is found - not really necessary, for TC
-        AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "Localized language content(%s) not available or modified from the original installation.", sLanguage);
-    }
-}
-
-
-string GetUniqueLogFileName(string logFileName)
-{
-    string logFileNamePrefix = logFileName;
-    if ((logFileNamePrefix[0] != '@') && (AzFramework::StringFunc::Path::IsRelative(logFileNamePrefix)))
-    {
-        logFileNamePrefix = "@log@/";
-        logFileNamePrefix += logFileName;
-    }
-
-    char resolvedLogFilePathBuffer[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(logFileNamePrefix.c_str(), resolvedLogFilePathBuffer, AZ_MAX_PATH_LEN);
-
-    int instance = gEnv->pSystem->GetApplicationLogInstance(resolvedLogFilePathBuffer);
-
-    if (instance == 0)
-    {
-        return logFileNamePrefix;
-    }
-
-    string logFileExtension;
-    size_t extensionIndex = logFileName.find_last_of('.');
-    if (extensionIndex != string::npos)
-    {
-        logFileExtension = logFileName.substr(extensionIndex, logFileName.length() - extensionIndex);
-        logFileNamePrefix = logFileName.substr(0, extensionIndex);
-    }
-
-    logFileName.Format("%s(%d)%s", logFileNamePrefix.c_str(), instance, logFileExtension.c_str());
-
-    return logFileName;
-}
-
-class AzConsoleToCryConsoleBinder final
-{
-public:
-    static void OnInvoke(IConsoleCmdArgs* args)
-    {
-        std::string command = args->GetCommandLine();
-        const size_t delim = command.find_first_of('=');
-        if (delim != std::string::npos)
-        {
-            // All Cry executed cfg files will come in through this pathway in addition to regular commands
-            // We strip out the = sign at this layer to maintain compatibility with cvars that use the '=' as a separator
-            // Swap the '=' character for a space
-            command[delim] = ' ';
-        }
-
-        AZ::Interface<AZ::IConsole>::Get()->PerformCommand(command.c_str(), AZ::ConsoleSilentMode::Silent, AZ::ConsoleInvokedFrom::CryBinding);
-    }
-
-    static void OnVarChanged(ICVar* cvar)
-    {
-        AZ::CVarFixedString command = AZ::CVarFixedString::format("%s %s", cvar->GetName(), cvar->GetString());
-        AZ::Interface<AZ::IConsole>::Get()->PerformCommand(command.c_str(), AZ::ConsoleSilentMode::Silent, AZ::ConsoleInvokedFrom::CryBinding);
-    }
-
-    static void Visit(AZ::ConsoleFunctorBase* functor)
-    {
-        if (gEnv->pConsole == nullptr)
-        {
-            AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Cry console was NULL while attempting to register Az CVars and CFuncs.\n");
-            return;
-        }
-
-        int32_t cryFlags = VF_NET_SYNCED;
-        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::DontReplicate) != AZ::ConsoleFunctorFlags::Null)
-        {
-            cryFlags = VF_NULL;
-        }
-        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::ServerOnly) != AZ::ConsoleFunctorFlags::Null)
-        {
-            cryFlags |= VF_DEDI_ONLY;
-        }
-        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::ReadOnly) != AZ::ConsoleFunctorFlags::Null)
-        {
-            cryFlags |= VF_READONLY;
-        }
-        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::IsCheat) != AZ::ConsoleFunctorFlags::Null)
-        {
-            cryFlags |= VF_CHEAT;
-        }
-        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::IsInvisible) != AZ::ConsoleFunctorFlags::Null)
-        {
-            cryFlags |= VF_INVISIBLE;
-        }
-        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::IsDeprecated) != AZ::ConsoleFunctorFlags::Null)
-        {
-            cryFlags |= VF_DEPRECATED;
-        }
-        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::NeedsReload) != AZ::ConsoleFunctorFlags::Null)
-        {
-            cryFlags |= VF_REQUIRE_APP_RESTART;
-        }
-        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::AllowClientSet) != AZ::ConsoleFunctorFlags::Null)
-        {
-            cryFlags |= VF_DEV_ONLY;
-        }
-
-        gEnv->pConsole->RemoveCommand(functor->GetName());
-        if (functor->GetTypeId() != AZ::TypeId::CreateNull())
-        {
-            AZ::CVarFixedString value;
-            functor->GetValue(value);
-            gEnv->pConsole->RegisterString(functor->GetName(), value.c_str(), cryFlags, functor->GetDesc(), AzConsoleToCryConsoleBinder::OnVarChanged);
-        }
-        else
-        {
-            gEnv->pConsole->AddCommand(functor->GetName(), AzConsoleToCryConsoleBinder::OnInvoke, cryFlags, functor->GetDesc());
-        }
-    }
-
-    using CommandRegisteredHandler = AZ::IConsole::ConsoleCommandRegisteredEvent::Handler;
-    static inline CommandRegisteredHandler s_commandRegisteredHandler = CommandRegisteredHandler([](AZ::ConsoleFunctorBase* functor) { Visit(functor); });
-};
-
-// System initialization
-/////////////////////////////////////////////////////////////////////////////////
-// INIT
-/////////////////////////////////////////////////////////////////////////////////
-bool CSystem::Init(const SSystemInitParams& startupParams)
-{
-#if AZ_TRAIT_USE_CRY_SIGNAL_HANDLER
-    signal(SIGSEGV, CryEngineSignalHandler);
-    signal(SIGTRAP, CryEngineSignalHandler);
-    signal(SIGILL, CryEngineSignalHandler);
-#endif // AZ_TRAIT_USE_CRY_SIGNAL_HANDLER
-
-    // Temporary Fix for an issue accessing gEnv from this object instance. The gEnv is not resolving to the
-    // global gEnv, instead its resolving an some uninitialized gEnv elsewhere (NULL). Since gEnv is
-    // initialized to this instance's SSystemGlobalEnvironment (m_env), we will force set it again here
-    // to m_env
-    if (!gEnv)
-    {
-        gEnv = &m_env;
-    }
-
-    LOADING_TIME_PROFILE_SECTION;
-
-    SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_INIT);
-    gEnv->mMainThreadId = GetCurrentThreadId();         //Set this ASAP on startup
-
-    InlineInitializationProcessing("CSystem::Init start");
-
-    m_env.bNoAssertDialog = false;
-
-    m_bNoCrashDialog = gEnv->IsDedicated();
-
-    if (startupParams.bUnattendedMode)
-    {
-        m_bNoCrashDialog = true;
-        m_env.bNoAssertDialog = true; //this also suppresses CryMessageBox
-        g_cvars.sys_no_crash_dialog = true;
-    }
-
-#if defined(AZ_PLATFORM_LINUX)
-    // Linux is all console for now and so no room for dialog boxes!
-    m_env.bNoAssertDialog = true;
-#endif
-
-    m_pCmdLine = new CCmdLine(startupParams.szSystemCmdLine);
-
-    AZCoreLogSink::Connect();
-
-    // Registers all AZ Console Variables functors specified within CrySystem
-    if (auto azConsole = AZ::Interface<AZ::IConsole>::Get(); azConsole)
-    {
-        azConsole->LinkDeferredFunctors(AZ::ConsoleFunctorBase::GetDeferredHead());
-    }
-    
-    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry)
-    {
-        AZ::SettingsRegistryInterface::FixedValueString assetPlatform;
-        if (!AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, assetPlatform,
-            AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, "assets"))
-        {
-            assetPlatform = AzFramework::OSPlatformToDefaultAssetPlatform(AZ_TRAIT_OS_PLATFORM_CODENAME);
-            AZ_Warning(AZ_TRACE_SYSTEM_WINDOW, false, R"(A valid asset platform is missing in "%s/assets" key in the SettingsRegistry.)""\n"
-                R"(This typically done by setting the "assets" field within a .setreg file)""\n"
-                R"(A fallback of %s will be used.)",
-                AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey,
-                assetPlatform.c_str());
-        }
-
-        m_systemConfigName = "system_" AZ_TRAIT_OS_PLATFORM_CODENAME_LOWER "_";
-        m_systemConfigName += assetPlatform.c_str();
-        m_systemConfigName += ".cfg";
-    }
-
-#if defined(WIN32) || defined(WIN64)
-    // check OS version - we only want to run on XP or higher - talk to Martin Mittring if you want to change this
-    {
-        OSVERSIONINFO osvi;
-
-        osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
-        GetVersionExA(&osvi);
-AZ_POP_DISABLE_WARNING
-
-        bool bIsWindowsXPorLater = osvi.dwMajorVersion > 5 || (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion >= 1);
-
-        if (!bIsWindowsXPorLater)
-        {
-            AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "Open 3D Engine requires an OS version of Windows XP or later.");
-            return false;
-        }
-    }
-#endif
-
-    // Get file version information.
-    QueryVersionInfo();
-    DetectGameFolderAccessRights();
-
-    m_bEditor = startupParams.bEditor;
-    m_bPreviewMode = startupParams.bPreview;
-    m_bTestMode = startupParams.bTestMode;
-    m_pUserCallback = startupParams.pUserCallback;
-
-    m_bDedicatedServer = startupParams.bDedicatedServer;
-    m_currentLanguageAudio = "";
-
-#if !defined(CONSOLE)
-    m_env.SetIsEditor(m_bEditor);
-    m_env.SetIsEditorGameMode(false);
-    m_env.SetIsEditorSimulationMode(false);
-#endif
-
-    m_env.SetToolMode(startupParams.bToolMode);
-
-    if (m_bEditor)
-    {
-        m_bInDevMode = true;
-    }
-
-    if (!gEnv->IsDedicated())
-    {
-        const ICmdLineArg* crashdialog = m_pCmdLine->FindArg(eCLAT_Post, "sys_no_crash_dialog");
-        if (crashdialog)
-        {
-            m_bNoCrashDialog = true;
-        }
-    }
-
-#if !defined(_RELEASE)
-    if (!m_bDedicatedServer)
-    {
-        const ICmdLineArg* dedicated = m_pCmdLine->FindArg(eCLAT_Pre, "dedicated");
-        if (dedicated)
-        {
-            m_bDedicatedServer = true;
-        }
-    }
-#endif // !defined(_RELEASE)
-
-#if !defined(CONSOLE)
-    gEnv->SetIsDedicated(m_bDedicatedServer);
-#endif
-
-    {
-        EBUS_EVENT(CrySystemEventBus, OnCrySystemPreInitialize, *this, startupParams);
-
-        //////////////////////////////////////////////////////////////////////////
-        // File system, must be very early
-        //////////////////////////////////////////////////////////////////////////
-        if (!InitFileSystem())
-        {
-            return false;
-        }
-        //////////////////////////////////////////////////////////////////////////
-        InlineInitializationProcessing("CSystem::Init InitFileSystem");
-
-        m_missingAssetLogger = AZStd::make_unique<AzFramework::MissingAssetLogger>();
-
-        //////////////////////////////////////////////////////////////////////////
-        // Logging is only available after file system initialization.
-        //////////////////////////////////////////////////////////////////////////
-        if (!startupParams.pLog)
-        {
-            m_env.pLog = new CLog(this);
-            if (startupParams.pLogCallback)
-            {
-                m_env.pLog->AddCallback(startupParams.pLogCallback);
-            }
-
-            const ICmdLineArg* logfile = m_pCmdLine->FindArg(eCLAT_Pre, "logfile"); //see if the user specified a log name, if so use it
-            if (logfile && strlen(logfile->GetValue()) > 0)
-            {
-                m_env.pLog->SetFileName(logfile->GetValue(), startupParams.autoBackupLogs);
-            }
-            else if (startupParams.sLogFileName)    //otherwise see if the startup params has a log file name, if so use it
-            {
-                const string sUniqueLogFileName = GetUniqueLogFileName(startupParams.sLogFileName);
-                m_env.pLog->SetFileName(sUniqueLogFileName.c_str(), startupParams.autoBackupLogs);
-            }
-            else//use the default log name
-            {
-                m_env.pLog->SetFileName(DEFAULT_LOG_FILENAME, startupParams.autoBackupLogs);
-            }
-        }
-        else
-        {
-            m_env.pLog = startupParams.pLog;
-        }
-
-        // The log backup system expects the version number to be the first line of the log
-        // so we log this immediately after setting the log filename
-        LogVersion();
-
-        bool devModeEnable = true;
-
-#if defined(_RELEASE)
-        // disable devmode by default in release builds outside the editor
-        devModeEnable = m_bEditor;
-#endif
-
-        // disable devmode in launcher if someone really wants to (even in non release builds)
-        if (!m_bEditor && m_pCmdLine->FindArg(eCLAT_Pre, "nodevmode"))
-        {
-            devModeEnable = false;
-        }
-
-        SetDevMode(devModeEnable);
-
-        //////////////////////////////////////////////////////////////////////////
-        // CREATE CONSOLE
-        //////////////////////////////////////////////////////////////////////////
-        if (!startupParams.bSkipConsole)
-        {
-            m_env.pConsole = new CXConsole;
-
-            if (startupParams.pPrintSync)
-            {
-                m_env.pConsole->AddOutputPrintSink(startupParams.pPrintSync);
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-
-        if (m_pUserCallback)
-        {
-            m_pUserCallback->OnInit(this);
-        }
-
-        m_env.pLog->RegisterConsoleVariables();
-
-        GetIRemoteConsole()->RegisterConsoleVariables();
-
-        if (!startupParams.bSkipConsole)
-        {
-            // Register system console variables.
-            CreateSystemVars();
-
-            // Register Audio-related system CVars
-            CreateAudioVars();
-
-            // Register any AZ CVar commands created above with the AZ Console system.
-            AZ::ConsoleFunctorBase*& deferredHead = AZ::ConsoleFunctorBase::GetDeferredHead();
-            AZ::Interface<AZ::IConsole>::Get()->LinkDeferredFunctors(deferredHead);
-
-            // Callback
-            if (m_pUserCallback && m_env.pConsole)
-            {
-                m_pUserCallback->OnConsoleCreated(m_env.pConsole);
-            }
-
-            // Let listeners know its safe to register cvars
-            EBUS_EVENT(CrySystemEventBus, OnCrySystemCVarRegistry);
-        }
-
-
-        // Set this as soon as the system cvars got initialized.
-        static_cast<AZ::IO::Archive* const>(m_env.pCryPak)->SetLocalizationFolder(g_cvars.sys_localization_folder->GetString());
-
-        InlineInitializationProcessing("CSystem::Init Create console");
-
-        // Need to load the engine.pak that includes the config files needed during initialization
-        m_env.pCryPak->OpenPack("@assets@", "Engine.pak");
-
-        InitFileSystem_LoadEngineFolders(startupParams);
-
-#if !defined(RELEASE) || defined(RELEASE_LOGGING)
-        // now that the system cfgs have been loaded, we can start the remote console
-        GetIRemoteConsole()->Update();
-#endif
-
-        InlineInitializationProcessing("CSystem::Init Load Engine Folders");
-
-        //////////////////////////////////////////////////////////////////////////
-        //Load config files
-        //////////////////////////////////////////////////////////////////////////
-
-        int curSpecVal = 0;
-        ICVar* pSysSpecCVar = gEnv->pConsole->GetCVar("r_GraphicsQuality");
-        if (gEnv->pSystem->IsDevMode())
-        {
-            if (pSysSpecCVar && pSysSpecCVar->GetFlags() & VF_WASINCONFIG)
-            {
-                curSpecVal = pSysSpecCVar->GetIVal();
-                pSysSpecCVar->SetFlags(pSysSpecCVar->GetFlags() | VF_SYSSPEC_OVERWRITE);
-            }
-        }
-
-        // tools may not interact with @user@
-        if (!gEnv->IsInToolMode())
-        {
-            if (m_pCmdLine->FindArg(eCLAT_Pre, "ResetProfile") == 0)
-            {
-                LoadConfiguration("@user@/game.cfg", 0, false);
-            }
-        }
-
-        // If sys spec variable was specified, is not 0, and we are in devmode restore the value from before loading game.cfg
-        // This enables setting of a specific sys_spec outside menu and game.cfg
-        if (gEnv->pSystem->IsDevMode())
-        {
-            if (pSysSpecCVar && curSpecVal && curSpecVal != pSysSpecCVar->GetIVal())
-            {
-                pSysSpecCVar->Set(curSpecVal);
-            }
-        }
-
-        {
-            // We have to load this file again since first time we did it without devmode
-            LoadConfiguration(m_systemConfigName.c_str());
-            // Optional user defined overrides
-            LoadConfiguration("user.cfg");
-
-#if defined(ENABLE_STATS_AGENT)
-            if (m_pCmdLine->FindArg(eCLAT_Pre, "useamblecfg"))
-            {
-                LoadConfiguration("amble.cfg");
-            }
-#endif
-        }
-
-#if defined(PERFORMANCE_BUILD)
-        LoadConfiguration("performance.cfg");
-#endif
-
-        //////////////////////////////////////////////////////////////////////////
-        if (g_cvars.sys_asserts == 0)
-        {
-            gEnv->bIgnoreAllAsserts = true;
-        }
-        if (g_cvars.sys_asserts == 2)
-        {
-            gEnv->bNoAssertDialog = true;
-        }
-
-        LogBuildInfo();
-
-        InlineInitializationProcessing("CSystem::Init LoadConfigurations");
-
-#ifdef WIN32
-        if (g_cvars.sys_WER)
-        {
-            SetUnhandledExceptionFilter(CryEngineExceptionFilterWER);
-        }
-#endif
-
-        //////////////////////////////////////////////////////////////////////////
-        // Localization
-        //////////////////////////////////////////////////////////////////////////
-        {
-            InitLocalization();
-        }
-        InlineInitializationProcessing("CSystem::Init InitLocalizations");
-
-        //////////////////////////////////////////////////////////////////////////
-        // Open basic pak files after intro movie playback started
-        //////////////////////////////////////////////////////////////////////////
-        OpenBasicPaks();
-
-        //////////////////////////////////////////////////////////////////////////
-        // AUDIO
-        //////////////////////////////////////////////////////////////////////////
-        {
-            if (InitAudioSystem(startupParams))
-            {
-                // Pump the Log - Audio initialization happened on a non-main thread, there may be log messages queued up.
-                gEnv->pLog->Update();
-            }
-            else
-            {
-                // Failure to initialize audio system is no longer a fatal or an error.  A warning is sufficient.
-                AZ_Warning(AZ_TRACE_SYSTEM_WINDOW, false, "<Audio>: Running without any AudioSystem!");
-            }
-        }
-
-
-        // Compiling the default system textures can be the lengthiest portion of
-        // editor initialization, so it is useful to inform users that they are waiting on
-        // the necessary default textures to compile.
-        if (m_pUserCallback)
-        {
-            m_pUserCallback->OnInitProgress("First time asset processing - may take a minute...");
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        // System cursor
-        //////////////////////////////////////////////////////////////////////////
-        // - Dedicated server is in console mode by default (system cursor is always shown when console is)
-        // - System cursor is always visible by default in Editor (we never start directly in Game Mode)
-        // - System cursor has to be enabled manually by the Game if needed; the custom UiCursor will typically be used instead
-
-        if (!gEnv->IsDedicated() &&
-            !gEnv->IsEditor())
-        {
-            AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-                                                            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-                                                            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())
-        {
-            return false;
-        }
-
-        if (m_pUserCallback)
-        {
-            m_pUserCallback->OnInitProgress("Initializing additional systems...");
-        }
-        AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Initializing additional systems");
-
-
-        InlineInitializationProcessing("CSystem::Init AIInit");
-
-        //////////////////////////////////////////////////////////////////////////
-        // LEVEL SYSTEM
-        bool usePrefabSystemForLevels = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(
-            usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-        if (usePrefabSystemForLevels)
-        {
-            m_pLevelSystem = new LegacyLevelSystem::SpawnableLevelSystem(this);
-        }
-        else
-        {
-            // [LYN-2376] Remove once legacy slice support is removed
-            m_pLevelSystem = new LegacyLevelSystem::CLevelSystem(this, ILevelSystem::GetLevelsDirectoryName());
-        }
-
-        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();
-        }
-
-        InlineInitializationProcessing("CSystem::Init InitLmbrAWS");
-
-        // Az to Cry console binding
-        AZ::Interface<AZ::IConsole>::Get()->VisitRegisteredFunctors([](AZ::ConsoleFunctorBase* functor) { AzConsoleToCryConsoleBinder::Visit(functor); });
-        AzConsoleToCryConsoleBinder::s_commandRegisteredHandler.Connect(AZ::Interface<AZ::IConsole>::Get()->GetConsoleCommandRegisteredEvent());
-
-        if (g_cvars.sys_float_exceptions > 0)
-        {
-            if (g_cvars.sys_float_exceptions == 3 && gEnv->IsEditor()) // Turn off float exceptions in editor if sys_float_exceptions = 3
-            {
-                g_cvars.sys_float_exceptions = 0;
-            }
-            if (g_cvars.sys_float_exceptions > 0)
-            {
-                AZ_TracePrintf(AZ_TRACE_SYSTEM_WINDOW, "Enabled float exceptions(sys_float_exceptions %d). This makes the performance slower.", g_cvars.sys_float_exceptions);
-            }
-        }
-        EnableFloatExceptions(g_cvars.sys_float_exceptions);
-    }
-
-    InlineInitializationProcessing("CSystem::Init End");
-
-#if defined(IS_PROSDK)
-    SDKEvaluation::InitSDKEvaluation(gEnv, &m_pUserCallback);
-#endif
-
-    InlineInitializationProcessing("CSystem::Init End");
-
-    if (gEnv->IsDedicated())
-    {
-        SCVarsClientConfigSink CVarsClientConfigSink;
-        LoadConfiguration("client.cfg", &CVarsClientConfigSink);
-    }
-
-    //Connect to the render bus
-    AZ::RenderNotificationsBus::Handler::BusConnect();
-
-    // Send out EBus event
-    EBUS_EVENT(CrySystemEventBus, OnCrySystemInitialized, *this, startupParams);
-
-    // Verify that the Maestro Gem initialized the movie system correctly. This can be removed if and when Maestro is not a required Gem
-    if (gEnv->IsEditor() && !gEnv->pMovieSystem)
-    {
-        AZ_Assert(false, "Error initializing the Cinematic System. Please check that the Maestro Gem is enabled for this project.");
-        return false;
-    }
-
-    if (ISystemEventDispatcher* systemEventDispatcher = GetISystemEventDispatcher())
-    {
-        systemEventDispatcher->OnSystemEvent(ESYSTEM_EVENT_GAME_POST_INIT, 0, 0);
-        systemEventDispatcher->OnSystemEvent(ESYSTEM_EVENT_GAME_POST_INIT_DONE, 0, 0);
-    }
-
-    m_bInitializedSuccessfully = true;
-
-    return (true);
-}
-
-
-static void LoadConfigurationCmd(IConsoleCmdArgs* pParams)
-{
-    assert(pParams);
-
-    if (pParams->GetArgCount() != 2)
-    {
-        gEnv->pLog->LogError("LoadConfiguration failed, one parameter needed");
-        return;
-    }
-
-    GetISystem()->LoadConfiguration(string("Config/") + pParams->GetArg(1));
-}
-
-
-// --------------------------------------------------------------------------------------------------------------------------
-
-static string ConcatPath(const char* szPart1, const char* szPart2)
-{
-    if (szPart1[0] == 0)
-    {
-        return szPart2;
-    }
-
-    string ret;
-
-    ret.reserve(strlen(szPart1) + 1 + strlen(szPart2));
-
-    ret = szPart1;
-    ret += "/";
-    ret += 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 CmdDrillToFile(IConsoleCmdArgs* pArgs)
-{
-    if (azstricmp(pArgs->GetArg(0), "DrillerStop") == 0)
-    {
-        EBUS_EVENT(AzFramework::DrillerConsoleCommandBus, StopDrillerSession, AZ::Crc32("DefaultDrillerSession"));
-    }
-    else
-    {
-        if (pArgs->GetArgCount() > 1)
-        {
-            AZ::Debug::DrillerManager::DrillerListType drillersToEnable;
-            for (int iArg = 1; iArg < pArgs->GetArgCount(); ++iArg)
-            {
-                if (azstricmp(pArgs->GetArg(iArg), "Replica") == 0)
-                {
-                    drillersToEnable.push_back();
-                    drillersToEnable.back().id = AZ::Crc32("ReplicaDriller");
-                }
-                else if (azstricmp(pArgs->GetArg(iArg), "Carrier") == 0)
-                {
-                    drillersToEnable.push_back();
-                    drillersToEnable.back().id = AZ::Crc32("CarrierDriller");
-                }
-                else
-                {
-                    CryLogAlways("Driller %s not supported.", pArgs->GetArg(iArg));
-                }
-            }
-            EBUS_EVENT(AzFramework::DrillerConsoleCommandBus, StartDrillerSession, drillersToEnable, AZ::Crc32("DefaultDrillerSession"));
-        }
-        else
-        {
-            CryLogAlways("Syntax: DrillerStart [Driller1] [Driller2] [...]");
-            CryLogAlways("Supported Drillers:");
-            CryLogAlways("    Carrier");
-            CryLogAlways("    Replica");
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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.");
-    m_game_load_screen_sequence_to_auto_play = REGISTER_STRING("game_load_screen_sequence_to_auto_play", "", 0, "Game load screen UiCanvas animation sequence to play on load.");
-    m_level_load_screen_sequence_to_auto_play = REGISTER_STRING("level_load_screen_sequence_to_auto_play", "", 0, "Level load screen UiCanvas animation sequence to play on load.");
-    m_game_load_screen_sequence_fixed_fps = REGISTER_FLOAT("game_load_screen_sequence_fixed_fps", 60.0f, 0, "Fixed frame rate fed to updates of the game load screen sequence.");
-    m_level_load_screen_sequence_fixed_fps = REGISTER_FLOAT("level_load_screen_sequence_fixed_fps", 60.0f, 0, "Fixed frame rate fed to updates of the level load screen sequence.");
-    m_game_load_screen_max_fps = REGISTER_FLOAT("game_load_screen_max_fps", 30.0f, 0, "Max frame rate to update the game load screen sequence.");
-    m_level_load_screen_max_fps = REGISTER_FLOAT("level_load_screen_max_fps", 30.0f, 0, "Max frame rate to update the level load screen sequence.");
-    m_game_load_screen_minimum_time = REGISTER_FLOAT("game_load_screen_minimum_time", 0.0f, 0, "Minimum amount of time to show the game load screen. Important to prevent short loads from flashing the load screen. 0 means there is no limit.");
-    m_level_load_screen_minimum_time = REGISTER_FLOAT("level_load_screen_minimum_time", 0.0f, 0, "Minimum amount of time to show the level load screen. Important to prevent short loads from flashing the load screen. 0 means there is no limit.");
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
-
-    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
-    (
-        "quit",
-        "Quit/Shutdown the engine",
-        AZ::ConsoleFunctorFlags::AllowClientSet | AZ::ConsoleFunctorFlags::DontReplicate,
-        AZ::TypeId::CreateNull(),
-        []([[maybe_unused]] const AZ::ConsoleCommandContainer& params) { GetISystem()->Quit(); }
-    );
-
-    m_sys_load_files_to_memory = REGISTER_STRING("sys_load_files_to_memory", "shadercache.pak", 0,
-            "Specify comma separated list of filenames that need to be loaded to memory.\n"
-            "Partial names also work. Eg. \"shader\" will load:\n"
-            "shaders.pak, shadercache.pak, and shadercachestartup.pak");
-
-#ifndef _RELEASE
-    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");
-
-    REGISTER_CVAR2("sys_deferAudioUpdateOptim", &g_cvars.sys_deferAudioUpdateOptim, 1, VF_NULL,
-        "0 - disable optimisation\n"
-        "1 - enable optimisation\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
-    {
-        e_sysKeyboardDefault = 0
-    };
-#else
-    enum
-    {
-        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"
-            "Usage: sv_DedicatedMaxRate [5..500]\n"
-            "Default is 30.");
-
-    REGISTER_FLOAT("sv_DedicatedCPUPercent", 0.0f, 0,
-        "Sets the target CPU usage when running as a dedicated server, or disable this feature if it's zero.\n"
-        "Usage: sv_DedicatedCPUPercent [0..100]\n"
-        "Default is 0 (disabled).");
-    REGISTER_FLOAT("sv_DedicatedCPUVariance", 10.0f, 0,
-        "Sets how much the CPU can vary from sv_DedicateCPU (up or down) without adjusting the framerate.\n"
-        "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)");
-
-#if defined(WIN32) || defined(WIN64)
-    const uint32 nJobSystemDefaultCoreNumber = 8;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_11
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    const uint32 nJobSystemDefaultCoreNumber = 4;
-#endif
-
-    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");
-
-    REGISTER_CVAR2("sys_vtune", &g_cvars.sys_vtune, 0, VF_NULL, "");
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_17
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-#   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,
-            "Sets the folder where to look for localized data.\n"
-            "This cvar allows for backwards compatibility so localized data under the game folder can still be found.\n"
-            "Usage: sys_localization_folder <folder name>\n"
-            "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.
-    REGISTER_CVAR2("sys_float_exceptions", &g_cvars.sys_float_exceptions, 0, 0, "Use or not use floating point exceptions.");
-#endif
-
-    REGISTER_CVAR2("sys_update_profile_time", &g_cvars.sys_update_profile_time, 1.0f, 0, "Time to keep updates timings history for.");
-    REGISTER_CVAR2("sys_no_crash_dialog", &g_cvars.sys_no_crash_dialog, m_bNoCrashDialog, VF_NULL, "Whether to disable the crash dialog window");
-    REGISTER_CVAR2("sys_no_error_report_window", &g_cvars.sys_no_error_report_window, m_bNoErrorReportWindow, VF_NULL, "Whether to disable the error report list");
-#if defined(_RELEASE)
-    if (!gEnv->IsDedicated())
-    {
-        REGISTER_CVAR2("sys_WER", &g_cvars.sys_WER, 1, 0, "Enables Windows Error Reporting");
-    }
-#else
-    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,
-        "Specifies type of crash dump to create - see MINIDUMP_TYPE in dbghelp.h for full list of values\n"
-        "0: Do not create a minidump\n"
-        "1: Create a small minidump (stacktrace)\n"
-        "2: Create a medium minidump (+ some variables)\n"
-        "3: Create a full minidump (+ all memory)\n"
-        );
-    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
-    const int DEFAULT_SYS_MAX_FPS = -1;
-#endif
-    REGISTER_CVAR2("sys_MaxFPS", &g_cvars.sys_MaxFPS, DEFAULT_SYS_MAX_FPS, VF_NULL, "Limits the frame rate to specified number n (if n>0 and if vsync is disabled).\n"
-        " 0 = on PC if vsync is off auto throttles fps while in menu or game is paused (default)\n"
-        "-1 = off");
-
-    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"
-        "2=floating point exception\n"
-        "3=memory allocation exception\n"
-        "4=cry fatal error is called\n"
-        "5=memory allocation for small blocks\n"
-        "6=assert\n"
-        "7=debugbreak\n"
-        "8=10min sleep"
-        );
-
-    REGISTER_FLOAT("sys_scale3DMouseTranslation", 0.2f, 0, "Scales translation speed of supported 3DMouse devices.");
-    REGISTER_FLOAT("sys_Scale3DMouseYPR", 0.05f, 0, "Scales rotation speed of supported 3DMouse devices.");
-
-    REGISTER_INT("capture_frames", 0, 0, "Enables capturing of frames. 0=off, 1=on");
-    REGISTER_STRING("capture_folder", "CaptureOutput", 0, "Specifies sub folder to write captured frames.");
-    REGISTER_INT("capture_frame_once", 0, 0, "Makes capture single frame only");
-    REGISTER_STRING("capture_file_name", "", 0, "If set, specifies the path and name to use for the captured frame");
-    REGISTER_STRING("capture_file_prefix", "", 0, "If set, specifies the prefix to use for the captured frame instead of the default 'Frame'.");
-
-    m_gpu_particle_physics = REGISTER_INT("gpu_particle_physics", 0, VF_REQUIRE_APP_RESTART, "Enable GPU physics if available (0=off / 1=enabled).");
-    assert(m_gpu_particle_physics);
-
-    REGISTER_COMMAND("LoadConfig", &LoadConfigurationCmd, 0,
-        "Load .cfg file from disk (from the {Game}/Config directory)\n"
-        "e.g. LoadConfig lowspec.cfg\n"
-        "Usage: LoadConfig <filename>");
-    assert(m_env.pConsole);
-    m_env.pConsole->CreateKeyBind("alt_keyboard_key_function_F12", "Screenshot");
-    m_env.pConsole->CreateKeyBind("alt_keyboard_key_function_F11", "RecordClip");
-
-    /*
-        // experimental feature? - needs to be created very early
-        m_sys_filecache = REGISTER_INT("sys_FileCache",0,0,
-            "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);
-    REGISTER_STRING_CB("g_languageAudio", "", VF_NULL, "Will automatically match g_language setting unless specified otherwise", CSystem::OnLanguageAudioCVarChanged);
-
-#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,
-        "0 = Suppress Asserts\n"
-        "1 = Log Asserts\n"
-        "2 = Show Assert Dialog\n"
-        "3 = Crashes the Application on Assert\n"
-        "Note: when set to '0 = Suppress Asserts', assert expressions are still evaluated. To turn asserts into a no-op, undefine AZ_ENABLE_TRACING and recompile.",
-        OnAssertLevelCvarChanged);
-    CSystem::SetAssertLevel(defaultAssertValue);
-
-    REGISTER_CVAR2("sys_error_debugbreak", &g_cvars.sys_error_debugbreak, 0, VF_CHEAT, "__debugbreak() if a VALIDATOR_ERROR_DBGBREAK message is hit");
-
-    REGISTER_STRING("dlc_directory", "", 0, "Holds the path to the directory where DLC should be installed to and read from");
-
-#if defined(WIN32) || defined(WIN64)
-    REGISTER_INT("sys_screensaver_allowed", 0, VF_NULL, "Specifies if screen saver is allowed to start up while the game is running.");
-#endif
-
-    // 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_DEV_ONLY("DrillerStart", CmdDrillToFile, VF_DEV_ONLY, "Start a driller capture.");
-    REGISTER_COMMAND_DEV_ONLY("DrillerStop", CmdDrillToFile, VF_DEV_ONLY, "Stop a driller capture.");
-
-    REGISTER_COMMAND("sys_SetLogLevel", CmdSetAwsLogLevel, 0, "Set AWS log level [0 - 6].");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::CreateAudioVars()
-{
-    assert(gEnv);
-    assert(gEnv->pConsole);
-
-    m_sys_audio_disable = REGISTER_INT("sys_audio_disable", 0, VF_REQUIRE_APP_RESTART,
-            "Specifies whether to use the NULLAudioSystem in place of the regular AudioSystem\n"
-            "Usage: sys_audio_disable [0/1]\n"
-            "0: use regular AudioSystem.\n"
-            "1: use NullAudioSystem (disable all audio functionality).\n"
-            "Default: 0 (enable audio functionality)");
-}
-
-/////////////////////////////////////////////////////////////////////
-void CSystem::AddCVarGroupDirectory(const string& sPath)
-{
-    CryLog("creating CVarGroups from directory '%s' ...", sPath.c_str());
-    INDENT_LOG_DURING_SCOPE();
-
-    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst(ConcatPath(sPath, "*.cfg").c_str());
-
-    if (!handle)
-    {
-        return;
-    }
-
-    do
-    {
-        if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-        {
-            if (handle.m_filename != "." && handle.m_filename != "..")
-            {
-                AddCVarGroupDirectory(ConcatPath(sPath, handle.m_filename.data()));
-            }
-        }
-        else
-        {
-            string sFilePath = ConcatPath(sPath, handle.m_filename.data());
-
-            string sCVarName = sFilePath;
-            PathUtil::RemoveExtension(sCVarName);
-        }
-    } while (handle = gEnv->pCryPak->FindNext(handle));
-
-    gEnv->pCryPak->FindClose(handle);
-}
-
-bool CSystem::RegisterErrorObserver(IErrorObserver* errorObserver)
-{
-    return stl::push_back_unique(m_errorObservers, errorObserver);
-}
-
-bool CSystem::UnregisterErrorObserver(IErrorObserver* errorObserver)
-{
-    return stl::find_and_erase(m_errorObservers, errorObserver);
-}
-
-void CSystem::OnAssert(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber)
-{
-    if (g_cvars.sys_asserts == 0)
-    {
-        return;
-    }
-
-    std::vector<IErrorObserver*>::const_iterator end = m_errorObservers.end();
-    for (std::vector<IErrorObserver*>::const_iterator it = m_errorObservers.begin(); it != end; ++it)
-    {
-        (*it)->OnAssert(condition, message, fileName, fileLineNumber);
-    }
-    if (g_cvars.sys_asserts > 1)
-    {
-        CryFatalError("<assert> %s\r\n%s\r\n%s (%d)\r\n", condition, message, fileName, fileLineNumber);
-    }
-}
-
-void CSystem::OnFatalError(const char* message)
-{
-    std::vector<IErrorObserver*>::const_iterator end = m_errorObservers.end();
-    for (std::vector<IErrorObserver*>::const_iterator it = m_errorObservers.begin(); it != end; ++it)
-    {
-        (*it)->OnFatalError(message);
-    }
-}
-
-bool CSystem::IsAssertDialogVisible() const
-{
-    return m_bIsAsserting;
-}
-
-void CSystem::SetAssertVisible(bool bAssertVisble)
-{
-    m_bIsAsserting = bAssertVisble;
-}
diff --git a/Code/CryEngine/CrySystem/SystemWin32.cpp b/Code/CryEngine/CrySystem/SystemWin32.cpp
deleted file mode 100644
index 531c927095..0000000000
--- a/Code/CryEngine/CrySystem/SystemWin32.cpp
+++ /dev/null
@@ -1,654 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "System.h"
-#include <time.h>
-
-#include <IRenderer.h>
-#include <IMovieSystem.h>
-#include <ILog.h>
-#include <CryLibrary.h>
-#include <StringUtils.h>
-#include <AzCore/Debug/StackTracer.h>
-#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
-#include <AzCore/std/allocator_stack.h>
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#undef AZ_RESTRICTED_SECTION
-#define SYSTEMWIN32_CPP_SECTION_1 1
-#define SYSTEMWIN32_CPP_SECTION_2 2
-#define SYSTEMWIN32_CPP_SECTION_3 3
-#endif
-
-#if defined(LINUX) || defined(APPLE)
-#include <unistd.h>
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include "windows.h"
-#include <float.h>
-#include <shellapi.h> // Needed for ShellExecute.
-#include <Psapi.h>
-#include <Aclapi.h>
-
-#include <shlobj.h>
-#endif
-
-#include "IDebugCallStack.h"
-
-#if defined(APPLE) || defined(LINUX)
-#include <pwd.h>
-#endif
-
-#include "XConsole.h"
-#include "LocalizedStringManager.h"
-#include "XML/XmlUtils.h"
-
-#if defined(WIN32)
-__pragma(comment(lib, "wininet.lib"))
-__pragma(comment(lib, "Winmm.lib"))
-#endif
-
-#if defined(APPLE)
-#include <AzFramework/Utils/SystemUtilsApple.h>
-#endif
-
-// this is the list of modules that can be loaded into the game process
-// Each array element contains 2 strings: the name of the module (case-insensitive)
-// and the name of the group the module belongs to
-//////////////////////////////////////////////////////////////////////////
-const char g_szGroupCore[] = "CryEngine";
-const char* g_szModuleGroups[][2] = {
-    {"Editor.exe", g_szGroupCore},
-    {"CrySystem.dll", g_szGroupCore},
-    {"CryFont.dll", g_szGroupCore},
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::SetAffinity()
-{
-    // the following code is only for Windows
-#ifdef WIN32
-    // set the process affinity
-    ICVar* pcvAffinityMask = GetIConsole()->GetCVar("sys_affinity");
-    if (!pcvAffinityMask)
-    {
-        pcvAffinityMask = REGISTER_INT("sys_affinity", 0, VF_NULL, "");
-    }
-
-    if (pcvAffinityMask)
-    {
-        unsigned nAffinity = pcvAffinityMask->GetIVal();
-        if (nAffinity)
-        {
-            typedef BOOL (WINAPI * FnSetProcessAffinityMask)(IN HANDLE hProcess, IN DWORD_PTR dwProcessAffinityMask);
-            HMODULE hKernel = CryLoadLibrary ("kernel32.dll");
-            if (hKernel)
-            {
-                FnSetProcessAffinityMask SetProcessAffinityMask = (FnSetProcessAffinityMask)GetProcAddress(hKernel, "SetProcessAffinityMask");
-                if (SetProcessAffinityMask && !SetProcessAffinityMask(GetCurrentProcess(), nAffinity))
-                {
-                    GetILog()->LogError("Error: Cannot set affinity mask %d, error code %d", nAffinity, GetLastError());
-                }
-                FreeLibrary (hKernel);
-            }
-        }
-    }
-#endif
-}
-
-#if defined(WIN32)
-#pragma pack(push,1)
-struct PEHeader_DLL
-{
-    DWORD signature;
-    IMAGE_FILE_HEADER _head;
-    IMAGE_OPTIONAL_HEADER opt_head;
-    IMAGE_SECTION_HEADER* section_header;  // actual number in NumberOfSections
-};
-#pragma pack(pop)
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-const char* CSystem::GetUserName()
-{
-#if defined(WIN32) || defined(WIN64)
-    static const int iNameBufferSize = 1024;
-    static char szNameBuffer[iNameBufferSize];
-    memset(szNameBuffer, 0, iNameBufferSize);
-
-    DWORD dwSize = iNameBufferSize;
-    wchar_t nameW[iNameBufferSize];
-    ::GetUserNameW(nameW, &dwSize);
-    cry_strcpy(szNameBuffer, CryStringUtils::WStrToUTF8(nameW));
-    return szNameBuffer;
-#else
-#if defined(LINUX)
-    static uid_t uid = geteuid ();
-    static struct passwd* pw = getpwuid (uid);
-    if (pw)
-    {
-        return  (pw->pw_name);
-    }
-    else
-    {
-        return NULL;
-    }
-#elif defined(APPLE)
-    static const int iNameBufferSize = 1024;
-    static char szNameBuffer[iNameBufferSize];
-    if(SystemUtilsApple::GetUserName(szNameBuffer, iNameBufferSize))
-    {
-        return szNameBuffer;
-    }
-    else
-    {
-        return "";
-    }
-#else
-    return "";
-#endif
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSystem::GetApplicationInstance()
-{
-#ifdef WIN32
-    // tools that declare themselves as in "tool mode" may not access @user@ and may also not lock it
-    if (gEnv->IsInToolMode())
-    {
-        return 0;
-    }
-
-    // this code below essentially "locks" an instance of the USER folder to a specific running application
-    if (m_iApplicationInstance == -1)
-    {
-        string suffix;
-        for (int instance = 0;; ++instance)
-        {
-            suffix.Format("(%d)", instance);
-
-            CreateMutex(NULL, TRUE, "LumberyardApplication" + suffix);
-            // search for duplicates
-            if (GetLastError() != ERROR_ALREADY_EXISTS)
-            {
-                m_iApplicationInstance = instance;
-                break;
-            }
-        }
-    }
-
-    return m_iApplicationInstance;
-#else
-    return 0;
-#endif
-}
-
-int CSystem::GetApplicationLogInstance([[maybe_unused]] const char* logFilePath)
-{
-#if AZ_TRAIT_OS_USE_WINDOWS_MUTEX
-    string suffix;
-    int instance = 0;
-    for (;; ++instance)
-    {
-        suffix.Format("(%d)", instance);
-
-        CreateMutex(NULL, TRUE, logFilePath + suffix);
-        if (GetLastError() != ERROR_ALREADY_EXISTS)
-        {
-            break;
-        }
-    }
-    return instance;
-#else
-    return 0;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-struct CryDbgModule
-{
-    HANDLE heap;
-    WIN_HMODULE handle;
-    string name;
-    DWORD dwSize;
-};
-
-#ifdef WIN32
-//////////////////////////////////////////////////////////////////////////
-class CStringOrder
-{
-public:
-    bool operator () (const char* szLeft, const char* szRight) const {return azstricmp(szLeft, szRight) < 0; }
-};
-typedef std::map<const char*, unsigned, CStringOrder> StringToSizeMap;
-void AddSize (StringToSizeMap& mapSS, const char* szString, unsigned nSize)
-{
-    StringToSizeMap::iterator it = mapSS.find (szString);
-    if (it == mapSS.end())
-    {
-        mapSS.insert (StringToSizeMap::value_type(szString, nSize));
-    }
-    else
-    {
-        it->second += nSize;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* GetModuleGroup (const char* szString)
-{
-    for (unsigned i = 0; i < sizeof(g_szModuleGroups) / sizeof(g_szModuleGroups[0]); ++i)
-    {
-        if (azstricmp(szString, g_szModuleGroups[i][0]) == 0)
-        {
-            return g_szModuleGroups[i][1];
-        }
-    }
-    return "Other";
-}
-
-#endif
-
-// Make system error message string
-//////////////////////////////////////////////////////////////////////////
-//! \return pointer to the null terminated error string or 0
-static const char* GetLastSystemErrorMessage()
-{
-#ifdef WIN32
-    DWORD dwError = GetLastError();
-
-    static char szBuffer[512]; // function will return pointer to this buffer
-
-    if (dwError)
-    {
-        LPVOID lpMsgBuf = 0;
-
-        if (FormatMessage(
-                FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                FORMAT_MESSAGE_FROM_SYSTEM |
-                FORMAT_MESSAGE_IGNORE_INSERTS,
-                NULL,
-                GetLastError(),
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-                (LPTSTR) &lpMsgBuf,
-                0,
-                NULL))
-        {
-            cry_strcpy(szBuffer, (char*)lpMsgBuf);
-            LocalFree(lpMsgBuf);
-        }
-        else
-        {
-            return 0;
-        }
-
-        return szBuffer;
-    }
-#else
-    return 0;
-
-#endif //WIN32
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::FatalError(const char* format, ...)
-{
-    // Guard against reentrancy - out of memory fatal errors can become reentrant since logging can try to alloc.
-    static bool currentlyReportingError = false;
-    if (currentlyReportingError == true)
-    {
-        return;
-    }
-    currentlyReportingError = true;
-
-    // format message
-    va_list ArgList;
-    char szBuffer[MAX_WARNING_LENGTH];
-    const char* sPrefix = "";
-    azstrcpy(szBuffer, MAX_WARNING_LENGTH, sPrefix);
-    va_start(ArgList, format);
-    azvsnprintf(szBuffer + strlen(sPrefix), MAX_WARNING_LENGTH - strlen(sPrefix), format, ArgList);
-    va_end(ArgList);
-
-    // get system error message before any attempt to write into log
-    const char* szSysErrorMessage = GetLastSystemErrorMessage();
-
-    CryLogAlways("=============================================================================");
-    CryLogAlways("*ERROR");
-    CryLogAlways("=============================================================================");
-    // write both messages into log
-    CryLogAlways("%s", szBuffer);
-
-    if (szSysErrorMessage)
-    {
-        CryLogAlways("Last System Error: %s", szSysErrorMessage);
-    }
-
-    if (GetUserCallback())
-    {
-        GetUserCallback()->OnError(szBuffer);
-    }
-
-    assert(szBuffer[0] >= ' ');
-    //  strcpy(szBuffer,szBuffer+1);    // remove verbosity tag since it is not supported by ::MessageBox
-
-    OutputDebugString(szBuffer);
-#ifdef WIN32
-    OnFatalError(szBuffer);
-    if (!g_cvars.sys_no_crash_dialog)
-    {
-        ::MessageBox(NULL, szBuffer, "Open 3D Engine Error", MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
-    }
-
-    // Dump callstack.
-    IDebugCallStack::instance()->FatalError(szBuffer);
-#endif
-
-    CryDebugBreak();
-
-    // app can not continue
-#ifdef _DEBUG
-
-#if defined(WIN32) && !defined(WIN64)
-    DEBUG_BREAK;
-#endif
-
-#else
-
-#if defined(WIN32) || defined(WIN64)
-    _flushall();
-    // on windows, _exit does all sorts of things which can cause cleanup to fail during a crash, we need to terminate instead.
-    TerminateProcess(GetCurrentProcess(), 1);
-#endif
-
-#if defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMWIN32_CPP_SECTION_2
-#include AZ_RESTRICTED_FILE(SystemWin32_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    _exit(1);
-#endif
-#endif
-}
-
-void CSystem::ReportBug([[maybe_unused]] const char* format, ...)
-{
-#if defined (WIN32)
-    va_list ArgList;
-    char szBuffer[MAX_WARNING_LENGTH];
-    const char* sPrefix = "";
-    azstrcpy(szBuffer, MAX_WARNING_LENGTH, sPrefix);
-    va_start(ArgList, format);
-    azvsnprintf(szBuffer + strlen(sPrefix), MAX_WARNING_LENGTH - strlen(sPrefix), format, ArgList);
-    va_end(ArgList);
-
-    IDebugCallStack::instance()->ReportBug(szBuffer);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::debug_GetCallStack(const char** pFunctions, int& nCount)
-{
-#if defined(WIN32)
-    using namespace AZ::Debug;
-
-    int nMaxCount = nCount;
-    StackFrame* frames = (StackFrame*)AZ_ALLOCA(sizeof(StackFrame)*nMaxCount);
-    unsigned int numFrames = StackRecorder::Record(frames, nMaxCount, 1);
-    SymbolStorage::StackLine* textLines = (SymbolStorage::StackLine*)AZ_ALLOCA(sizeof(SymbolStorage::StackLine)*nMaxCount);
-    SymbolStorage::DecodeFrames(frames, numFrames, textLines);
-    for (int i = 0; i < numFrames; i++)
-    {
-        pFunctions[i] = textLines[i];
-    }
-    nCount = numFrames;
-#define AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMWIN32_CPP_SECTION_3
-#include AZ_RESTRICTED_FILE(SystemWin32_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#else
-    AZ_UNUSED(pFunctions);
-    nCount = 0;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::debug_LogCallStack(int nMaxFuncs, [[maybe_unused]] int nFlags)
-{
-    if (nMaxFuncs > 32)
-    {
-        nMaxFuncs = 32;
-    }
-    // Print call stack for each find.
-    const char* funcs[32];
-    int nCount = nMaxFuncs;
-    GetISystem()->debug_GetCallStack(funcs, nCount);
-    for (int i = 1; i < nCount; i++) // start from 1 to skip this function.
-    {
-        CryLogAlways("    %02d) %s", i, funcs[i]);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// 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
-    char szExpandedPath[AZ_MAX_PATH_LEN];
-    if (!ExpandEnvironmentStrings("%SystemRoot%\\ehome\\ehshell.exe", szExpandedPath, AZ_MAX_PATH_LEN))
-    {
-        return false;
-    }
-
-    // Skip if ehshell.exe doesn't exist
-    if (GetFileAttributes(szExpandedPath) == 0xFFFFFFFF)
-    {
-        return false;
-    }
-
-    // Launch ehshell.exe
-    INT_PTR result = (INT_PTR)ShellExecute(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)
-{
-    bool bSucceeded  = false;
-    // check Vista and later OS first
-
-    HMODULE shell32 = LoadLibraryA("Shell32.dll");
-    if (shell32)
-    {
-        typedef long (__stdcall * T_SHGetKnownFolderPath)(REFKNOWNFOLDERID rfid, unsigned long dwFlags, void* hToken, wchar_t** ppszPath);
-        T_SHGetKnownFolderPath SHGetKnownFolderPath = (T_SHGetKnownFolderPath)GetProcAddress(shell32, "SHGetKnownFolderPath");
-        if (SHGetKnownFolderPath)
-        {
-            // We must be running Vista or newer
-            wchar_t* wMyDocumentsPath;
-            HRESULT hr = SHGetKnownFolderPath(FOLDERID_SavedGames, KF_FLAG_CREATE | KF_FLAG_DONT_UNEXPAND, NULL, &wMyDocumentsPath);
-            bSucceeded = SUCCEEDED(hr);
-            if (bSucceeded)
-            {
-                // Convert from UNICODE to UTF-8
-                cry_strcpy(szMyDocumentsPath, maxPathSize, CryStringUtils::WStrToUTF8(wMyDocumentsPath));
-                CoTaskMemFree(wMyDocumentsPath);
-            }
-        }
-        FreeLibrary(shell32);
-    }
-
-    if (!bSucceeded)
-    {
-        // check pre-vista OS if not succeeded before
-        wchar_t wMyDocumentsPath[AZ_MAX_PATH_LEN];
-        bSucceeded = SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, NULL, 0, wMyDocumentsPath));
-        if (bSucceeded)
-        {
-            cry_strcpy(szMyDocumentsPath, maxPathSize, CryStringUtils::WStrToUTF8(wMyDocumentsPath));
-        }
-    }
-
-    return bSucceeded;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-void CSystem::DetectGameFolderAccessRights()
-{
-    // This code is trying to figure out if the current folder we are now running under have write access.
-    // By default assume folder is not writable.
-    // If folder is writable game.log is saved there, otherwise it is saved in user documents folder.
-
-#if defined(WIN32)
-
-    DWORD DesiredAccess = FILE_GENERIC_WRITE;
-    DWORD GrantedAccess = 0;
-    DWORD dwRes = 0;
-    PACL pDACL = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    HANDLE hClientToken = 0;
-    PRIVILEGE_SET PrivilegeSet;
-    DWORD PrivilegeSetLength = sizeof(PrivilegeSet);
-    BOOL bAccessStatus = FALSE;
-
-    // Get a pointer to the existing DACL.
-    dwRes = GetNamedSecurityInfo(".", SE_FILE_OBJECT,
-            DACL_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION,
-            NULL, NULL, &pDACL, NULL, &pSD);
-
-    if (ERROR_SUCCESS != dwRes)
-    {
-        //
-        assert(0);
-    }
-
-    if (!ImpersonateSelf(SecurityIdentification))
-    {
-        return;
-    }
-    if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &hClientToken) && hClientToken != 0)
-    {
-        return;
-    }
-
-    GENERIC_MAPPING GenMap;
-    GenMap.GenericRead = FILE_GENERIC_READ;
-    GenMap.GenericWrite = FILE_GENERIC_WRITE;
-    GenMap.GenericExecute = FILE_GENERIC_EXECUTE;
-    GenMap.GenericAll = FILE_ALL_ACCESS;
-
-    MapGenericMask(&DesiredAccess, &GenMap);
-    if (!AccessCheck(pSD, hClientToken, DesiredAccess, &GenMap, &PrivilegeSet, &PrivilegeSetLength, &GrantedAccess, &bAccessStatus))
-    {
-        RevertToSelf();
-        CloseHandle(hClientToken);
-        return;
-    }
-    CloseHandle(hClientToken);
-    RevertToSelf();
-
-    if (bAccessStatus)
-    {
-        m_bGameFolderWritable = true;
-    }
-#elif defined(MOBILE)
-    char cwd[AZ_MAX_PATH_LEN];
-
-    if (getcwd(cwd, AZ_MAX_PATH_LEN) != NULL)
-    {
-        if (0 == access(cwd, W_OK))
-        {
-            m_bGameFolderWritable = true;
-        }
-    }
-#endif //WIN32
-}
-
-/////////////////////////////////`/////////////////////////////////////////
-void CSystem::EnableFloatExceptions([[maybe_unused]] int type)
-{
-#ifndef _RELEASE
-
-#if defined(WIN32)
-
-#if defined(WIN32) && !defined(WIN64)
-
-    // Optimization
-    // Enable DAZ/FZ
-    // Denormals Are Zeros
-    // Flush-to-Zero
-
-    _controlfp(_DN_FLUSH, _MCW_DN);
-
-#endif //#if defined(WIN32) && !defined(WIN64)
-
-AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
-    _controlfp(_DN_FLUSH, _MCW_DN);
-
-    if (type == 0)
-    {
-        // mask all floating exceptions off.
-        _controlfp(_EM_INEXACT | _EM_UNDERFLOW | _EM_OVERFLOW | _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE, _MCW_EM);
-    }
-    else
-    {
-        // Clear pending exceptions
-        _fpreset();
-
-        if (type == 1)
-        {
-            // enable just the most important fp-exceptions.
-            _controlfp(_EM_INEXACT | _EM_UNDERFLOW | _EM_OVERFLOW, _MCW_EM); // Enable floating point exceptions.
-        }
-
-        if (type == 2)
-        {
-            // enable ALL floating point exceptions.
-            _controlfp(_EM_INEXACT, _MCW_EM);
-        }
-    }
-AZ_POP_DISABLE_WARNING
-
-#endif //#if defined(WIN32) && !defined(WIN64)
-
-#ifdef WIN32
-    _mm_setcsr(_mm_getcsr() & ~0x280 | (type > 0 ? 0 : 0x280));
-#endif
-
-    #endif //_RELEASE
-}
diff --git a/Code/CryEngine/CrySystem/Timer.cpp b/Code/CryEngine/CrySystem/Timer.cpp
deleted file mode 100644
index 9f5304020f..0000000000
--- a/Code/CryEngine/CrySystem/Timer.cpp
+++ /dev/null
@@ -1,724 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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)
-        {
-            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)
-{
-    const int64 previousOffset = m_lOffsetTime;
-    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/CryEngine/CrySystem/Timer.h b/Code/CryEngine/CrySystem/Timer.h
deleted file mode 100644
index c55eed0ebb..0000000000
--- a/Code/CryEngine/CrySystem/Timer.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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() {};
-
-    bool Init();
-
-    // interface ITimer ----------------------------------------------------------
-
-    // TODO: Review m_time usage in System.cpp
-    //       if it wants Game Time / UI Time or a new Render Time?
-
-    virtual void ResetTimer();
-    virtual void UpdateOnFrameStart();
-    virtual float GetCurrTime(ETimer which = ETIMER_GAME) const;
-    virtual CTimeValue GetAsyncTime() const;
-    virtual float GetAsyncCurTime(); // retrieve the actual wall clock time passed since the game started, in seconds
-    virtual float GetFrameTime(ETimer which = ETIMER_GAME) const;
-    virtual float GetRealFrameTime() const;
-    virtual float GetTimeScale() const;
-    virtual float GetTimeScale(uint32 channel) const;
-    virtual void SetTimeScale(float scale, uint32 channel = 0);
-    virtual void ClearTimeScales();
-    virtual void EnableTimer(bool bEnable);
-    virtual float GetFrameRate();
-    virtual float GetProfileFrameBlending(float* pfBlendTime = 0, int* piBlendMode = 0);
-    virtual void Serialize(TSerialize ser);
-    virtual bool IsTimerEnabled() const;
-
-    //! try to pause/unpause a timer
-    //  returns true if successfully paused/unpaused, false otherwise
-    virtual bool PauseTimer(ETimer which, bool bPause);
-
-    //! determine if a timer is paused
-    //  returns true if paused, false otherwise
-    virtual bool IsTimerPaused(ETimer which);
-
-    //! try to set a timer
-    //  return true if successful, false otherwise
-    virtual bool SetTimer(ETimer which, float timeInSeconds);
-
-    //! make a tm struct from a time_t in UTC (like gmtime)
-    virtual void SecondsToDateUTC(time_t time, struct tm& outDateUTC);
-
-    //! make a UTC time from a tm (like timegm, but not available on all platforms)
-    virtual time_t DateToSecondsUTC(struct tm& timePtr);
-
-    //! Convert from Tics to Seconds
-    virtual float TicksToSeconds(int64 ticks)
-    {
-        return float((double)ticks * m_fSecsPerTick);
-    }
-
-    //! Get number of ticks per second
-    virtual int64 GetTicksPerSecond()
-    {
-        return m_lTicksPerSec;
-    }
-
-    virtual const CTimeValue& GetFrameStartTime(ETimer which = ETIMER_GAME) const { return m_CurrTime[(int)which]; }
-    virtual ITimer* CreateNewTimer();
-
-    virtual 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/CryEngine/CrySystem/ViewSystem/DebugCamera.cpp b/Code/CryEngine/CrySystem/ViewSystem/DebugCamera.cpp
deleted file mode 100644
index 89086d5c25..0000000000
--- a/Code/CryEngine/CrySystem/ViewSystem/DebugCamera.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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 = gEnv->pSystem->GetViewCamera().GetPosition();
-    m_moveInput = Vec3_Zero;
-
-    Ang3 cameraAngles = Ang3(gEnv->pSystem->GetViewCamera().GetMatrix());
-    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);
-
-    // update the listener of the active view
-    if (IView* view = gEnv->pSystem->GetIViewSystem()->GetActiveView())
-    {
-        view->UpdateAudioListener(Matrix34(m_view, m_position));
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::PostUpdate()
-{
-    if (m_cameraMode == DebugCamera::ModeOff)
-    {
-        return;
-    }
-
-    CCamera& camera = gEnv->pSystem->GetViewCamera();
-    camera.SetMatrix(Matrix34(m_view, m_position));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-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/CryEngine/CrySystem/ViewSystem/DebugCamera.h b/Code/CryEngine/CrySystem/ViewSystem/DebugCamera.h
deleted file mode 100644
index a8e24a7de9..0000000000
--- a/Code/CryEngine/CrySystem/ViewSystem/DebugCamera.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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/CryEngine/CrySystem/ViewSystem/View.cpp b/Code/CryEngine/CrySystem/ViewSystem/View.cpp
deleted file mode 100644
index 02b5625f9d..0000000000
--- a/Code/CryEngine/CrySystem/ViewSystem/View.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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 <IStereoRenderer.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(float frameTime, bool isActive)
-{
-    //FIXME:some cameras may need to be updated always
-    if (!isActive)
-    {
-        return;
-    }
-
-    if (m_azEntity)
-    {
-        m_viewParams.SaveLast();
-
-        CCamera* pSysCam = &m_pSystem->GetViewCamera();
-
-        //process screen shaking
-        ProcessShaking(frameTime);
-
-        //FIXME:to let the updateView implementation use the correct shakeVector
-        m_viewParams.currentShakeShift = m_viewParams.rotation * m_viewParams.currentShakeShift;
-
-        m_viewParams.frameTime = frameTime;
-        //update view position/rotation
-        if (m_azEntity != nullptr)
-        {
-            auto entityTransform = m_azEntity->GetTransform();
-            if (entityTransform != nullptr)
-            {
-                AZ::Transform transform = entityTransform->GetWorldTM();
-                m_viewParams.position = AZVec3ToLYVec3(transform.GetTranslation());
-                m_viewParams.rotation = AZQuaternionToLYQuaternion(transform.GetRotation());
-            }
-        }
-
-        ApplyFrameAdditiveAngles(m_viewParams.rotation);
-
-        const float fNearZ = gEnv->pSystem->GetIViewSystem()->GetDefaultZNear();
-
-        //see if the view have to use a custom near clipping plane
-        const float nearPlane = (m_viewParams.nearplane >= CAMERA_MIN_NEAR) ? (m_viewParams.nearplane) : fNearZ;
-        const float farPlane = (m_viewParams.farplane > 0.f) ? m_viewParams.farplane : DEFAULT_FAR;
-        float fov = (m_viewParams.fov < 0.001f) ? DEFAULT_FOV : m_viewParams.fov;
-
-        m_camera.SetFrustum(pSysCam->GetViewSurfaceX(), pSysCam->GetViewSurfaceZ(), fov, nearPlane, farPlane, pSysCam->GetPixelAspectRatio());
-
-        //apply shake & set the view matrix
-        m_viewParams.rotation *= m_viewParams.currentShakeQuat;
-        m_viewParams.rotation.NormalizeSafe();
-        m_viewParams.position += m_viewParams.currentShakeShift;
-
-        // Blending between cameras needs to happen after Camera space rendering calculations have been applied
-        // so that the m_viewParams.position is in World Space again
-        m_viewParams.UpdateBlending(frameTime);
-
-        // [VR] specific
-        // Add HMD's pose tracking on top of current camera pose
-        // Each game-title can decide whether to keep this functionality here or (most likely)
-        // move it somewhere else.
-
-        Quat q = m_viewParams.rotation;
-        Vec3 pos = m_viewParams.position;
-        Vec3 p = Vec3(ZERO);
-
-        Matrix34 viewMtx(q);
-        viewMtx.SetTranslation(pos + p);
-        m_camera.SetMatrix(viewMtx);
-
-        m_camera.SetEntityRotation(m_viewParams.rotation);
-        m_camera.SetEntityPos(pos);
-    }
-    else
-    {
-        m_linkedTo = AZ::EntityId(0);
-    }
-}
-
-//-----------------------------------------------------------------------
-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(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(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 = 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::GetMemoryUsage(ICrySizer* s) const
-{
-    s->AddObject(this, sizeof(*this));
-    s->AddObject(m_shakes);
-}
-
-void CView::Serialize(TSerialize ser)
-{
-    if (ser.IsReading())
-    {
-        ResetShaking();
-    }
-}
-
-void CView::PostSerialize()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::UpdateAudioListener([[maybe_unused]] Matrix34 const& rMatrix)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::SetActive([[maybe_unused]] bool const bActive)
-{
-}
-
-} // namespace LegacyViewSystem
diff --git a/Code/CryEngine/CrySystem/ViewSystem/View.h b/Code/CryEngine/CrySystem/ViewSystem/View.h
deleted file mode 100644
index 8565f53ec8..0000000000
--- a/Code/CryEngine/CrySystem/ViewSystem/View.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : View System interfaces.
-
-# pragma once
-
-#include "IViewSystem.h"
-#include <Cry_Camera.h>
-
-class CGameObject;
-
-namespace LegacyViewSystem
-{
-
-class CView
-    : public IView
-{
-public:
-
-    CView(ISystem* pSystem);
-    virtual ~CView();
-
-    //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;
-        }
-
-        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
-    };
-
-
-    // IView
-    virtual void Release();
-    virtual void Update(float frameTime, bool isActive);
-    virtual void ProcessShaking(float frameTime);
-    virtual void ProcessShake(SShake* pShake, float frameTime);
-    virtual void ResetShaking();
-    virtual void ResetBlending() { m_viewParams.ResetBlending(); }
-    virtual void LinkTo(AZ::Entity* follow);
-    virtual void Unlink();
-    virtual AZ::EntityId GetLinkedId() {return m_linkedTo; };
-    virtual void SetCurrentParams(SViewParams& params) { m_viewParams = params; };
-    virtual const SViewParams* GetCurrentParams() {return &m_viewParams; }
-    virtual void SetViewShake(Ang3 shakeAngle, Vec3 shakeShift, float duration, float frequency, float randomness, int shakeID, bool bFlipVec = true, bool bUpdateOnly = false, bool bGroundOnly = false);
-    virtual void SetViewShakeEx(const SShakeParams& params);
-    virtual void StopShake(int shakeID);
-    virtual void SetFrameAdditiveCameraAngles(const Ang3& addFrameAngles);
-    virtual void SetScale(const float scale);
-    virtual void SetZoomedScale(const float scale);
-    virtual void SetActive(const bool bActive);
-    // ~IView
-
-    void Serialize(TSerialize ser) override;
-    void PostSerialize() override;
-    CCamera& GetCamera() override { return m_camera; }
-    const CCamera& GetCamera() const override { return m_camera; }
-    void UpdateAudioListener(const Matrix34& rMatrix) override;
-
-    void GetMemoryUsage(ICrySizer* s) const;
-
-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/CryEngine/CrySystem/ViewSystem/ViewSystem.cpp b/Code/CryEngine/CrySystem/ViewSystem/ViewSystem.cpp
deleted file mode 100644
index 18404b5d5d..0000000000
--- a/Code/CryEngine/CrySystem/ViewSystem/ViewSystem.cpp
+++ /dev/null
@@ -1,684 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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*);                                            \
-            PREFAST_SUPPRESS_WARNING(6255) 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) && !defined(DEDICATED_SERVER)
-    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);
-    }
-}
-
-//------------------------------------------------------------------------
-void CViewSystem::Update(float frameTime)
-{
-    FUNCTION_PROFILER(GetISystem(), PROFILE_ACTION);
-
-    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 (!s_debugCamera || !s_debugCamera->IsEnabled())
-            {
-                pView->UpdateAudioListener(rCamera.GetMatrix());
-            }
-
-            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);
-                }
-            }
-
-            m_pSystem->SetViewCamera(rCamera);
-        }
-    }
-
-    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 = ~0;
-    }
-
-    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::UpdateSoundListeners()
-{
-    assert(gEnv->IsEditor() && !gEnv->IsEditorGameMode());
-
-    // In Editor we may want to control global listeners outside of the game view.
-    if (m_bControlsAudioListeners)
-    {
-        IView* const pActiveView = static_cast<IView*>(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);
-            CCamera const& rCamera = bIsActive ? gEnv->pSystem->GetViewCamera() : pView->GetCamera();
-            pView->UpdateAudioListener(rCamera.GetMatrix());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////
-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::GetMemoryUsage(ICrySizer* s) const
-{
-    SIZER_SUBCOMPONENT_NAME(s, "ViewSystem");
-    s->Add(*this);
-    s->AddContainer(m_views);
-}
-
-void CViewSystem::Serialize(TSerialize ser)
-{
-    TViewMap::iterator iter = m_views.begin();
-    TViewMap::iterator iterEnd = m_views.end();
-    while (iter != iterEnd)
-    {
-        iter->second->Serialize(ser);
-        ++iter;
-    }
-}
-
-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/CryEngine/CrySystem/ViewSystem/ViewSystem.h b/Code/CryEngine/CrySystem/ViewSystem/ViewSystem.h
deleted file mode 100644
index 739f89efb4..0000000000
--- a/Code/CryEngine/CrySystem/ViewSystem/ViewSystem.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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:
-
-    typedef std::map<unsigned int, IView*> TViewMap;
-    typedef std::vector<unsigned int> TViewIdVector;
-
-public:
-
-    //IViewSystem
-    virtual IView* CreateView();
-    virtual unsigned int AddView(IView* pView) override;
-    virtual void RemoveView(IView* pView);
-    virtual void RemoveView(unsigned int viewId);
-
-    virtual void SetActiveView(IView* pView);
-    virtual void SetActiveView(unsigned int viewId);
-
-    //CameraSystemRequestBus
-    AZ::EntityId GetActiveCamera() override { return m_activeViewId ? GetActiveView()->GetLinkedId() : AZ::EntityId(); }
-
-    //utility functions
-    virtual IView* GetView(unsigned int viewId);
-    virtual IView* GetActiveView();
-
-    virtual unsigned int GetViewId(IView* pView);
-    virtual unsigned int GetActiveViewId();
-
-    virtual void Serialize(TSerialize ser);
-    virtual void PostSerialize();
-
-    virtual IView* GetViewByEntityId(const AZ::EntityId& id, bool forceCreate);
-
-    virtual float GetDefaultZNear() { return m_fDefaultCameraNearZ; };
-    virtual void SetBlendParams(float fBlendPosSpeed, float fBlendRotSpeed, bool performBlendOut) { m_fBlendInPosSpeed = fBlendPosSpeed; m_fBlendInRotSpeed = fBlendRotSpeed; m_bPerformBlendOut = performBlendOut; };
-    virtual void SetOverrideCameraRotation(bool bOverride, Quat rotation);
-    virtual bool IsPlayingCutScene() const
-    {
-        return m_cutsceneCount > 0;
-    }
-    virtual void UpdateSoundListeners();
-
-    virtual void SetDeferredViewSystemUpdate(bool const bDeferred){ m_useDeferredViewSystemUpdate = bDeferred; }
-    virtual bool UseDeferredViewSystemUpdate() const { return m_useDeferredViewSystemUpdate; }
-    virtual void SetControlAudioListeners(bool const bActive);
-    //~IViewSystem
-
-    //IMovieUser
-    virtual void SetActiveCamera(const SCameraParams& Params);
-    virtual void BeginCutScene(IAnimSequence* pSeq, unsigned long dwFlags, bool bResetFX);
-    virtual void EndCutScene(IAnimSequence* pSeq, unsigned long dwFlags);
-    virtual void SendGlobalEvent(const char* pszEvent);
-    //~IMovieUser
-
-    // ILevelSystemListener
-    virtual void OnLevelNotFound([[maybe_unused]] const char* levelName) {};
-    virtual void OnLoadingStart([[maybe_unused]] const char* levelName);
-    virtual void OnLoadingComplete([[maybe_unused]] const char* levelName){};
-    virtual void OnLoadingError([[maybe_unused]] const char* levelName, [[maybe_unused]] const char* error){};
-    virtual void OnLoadingProgress([[maybe_unused]] const char* levelName, [[maybe_unused]] int progressAmount){};
-    virtual void OnUnloadComplete([[maybe_unused]] const char* levelName);
-    //~ILevelSystemListener
-
-    CViewSystem(ISystem* pSystem);
-    ~CViewSystem();
-
-    void Release() override { delete this; };
-    void Update(float frameTime) override;
-
-    virtual void ForceUpdate(float elapsed) { Update(elapsed); }
-
-    //void RegisterViewClass(const char *name, IView *(*func)());
-
-    bool AddListener(IViewSystemListener* pListener)
-    {
-        return stl::push_back_unique(m_listeners, pListener);
-    }
-
-    bool RemoveListener(IViewSystemListener* pListener)
-    {
-        return stl::find_and_erase(m_listeners, pListener);
-    }
-
-    void GetMemoryUsage(ICrySizer* s) const;
-
-    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/CryEngine/CrySystem/WindowsErrorReporting.cpp b/Code/CryEngine/CrySystem/WindowsErrorReporting.cpp
deleted file mode 100644
index 73dce0678b..0000000000
--- a/Code/CryEngine/CrySystem/WindowsErrorReporting.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Support for Windows Error Reporting (WER)
-
-
-#include "CrySystem_precompiled.h"
-
-#ifdef WIN32
-
-#include "System.h"
-#include <windows.h>
-#include <tchar.h>
-#include "errorrep.h"
-#include "ISystem.h"
-
-#include <DbgHelp.h>
-
-static WCHAR szPath[MAX_PATH + 1];
-static WCHAR szFR[] = L"\\System32\\FaultRep.dll";
-
-WCHAR* GetFullPathToFaultrepDll(void)
-{
-    UINT rc = GetSystemWindowsDirectoryW(szPath, ARRAYSIZE(szPath));
-    if (rc == 0 || rc > ARRAYSIZE(szPath) - ARRAYSIZE(szFR) - 1)
-    {
-        return NULL;
-    }
-
-    wcscat_s(szPath, szFR);
-    return szPath;
-}
-
-
-typedef BOOL (WINAPI * MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType,
-    CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-    CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
-    CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam
-    );
-
-//////////////////////////////////////////////////////////////////////////
-LONG WINAPI CryEngineExceptionFilterMiniDump(struct _EXCEPTION_POINTERS* pExceptionPointers, const char* szDumpPath, MINIDUMP_TYPE DumpType)
-{
-    // note:  In debug mode, this dll is loaded on startup anyway, so this should not incur an additional load unless it crashes
-    // very early during startup.
-
-    fflush(nullptr); // according to MSDN on fflush, calling fflush on null flushes all buffers.
-    HMODULE hndDBGHelpDLL = LoadLibraryA("DBGHELP.DLL");
-
-    if (!hndDBGHelpDLL)
-    {
-        CryLogAlways("Failed to record DMP file: Could not open DBGHELP.DLL");
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    MINIDUMPWRITEDUMP dumpFnPtr = (MINIDUMPWRITEDUMP)::GetProcAddress(hndDBGHelpDLL, "MiniDumpWriteDump");
-    if (!dumpFnPtr)
-    {
-        CryLogAlways("Failed to record DMP file: Unable to find MiniDumpWriteDump in DBGHELP.DLL");
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    HANDLE hFile = ::CreateFile(szDumpPath, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (hFile == INVALID_HANDLE_VALUE)
-    {
-        CryLogAlways("Failed to record DMP file: could not open file '%s' for writing - error code: %d", szDumpPath, GetLastError());
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    _MINIDUMP_EXCEPTION_INFORMATION ExInfo;
-    ExInfo.ThreadId = ::GetCurrentThreadId();
-    ExInfo.ExceptionPointers = pExceptionPointers;
-    ExInfo.ClientPointers = NULL;
-
-    BOOL bOK = dumpFnPtr(GetCurrentProcess(), GetCurrentProcessId(), hFile, DumpType, &ExInfo, NULL, NULL);
-    ::CloseHandle(hFile);
-
-    if (bOK)
-    {
-        CryLogAlways("Successfully recorded DMP file:  '%s'", szDumpPath);
-        return EXCEPTION_EXECUTE_HANDLER; // SUCCESS!  you can execute your handlers now
-    }
-    else
-    {
-        CryLogAlways("Failed to record DMP file: '%s' - error code: %d", szDumpPath, GetLastError());
-    }
-
-    return EXCEPTION_CONTINUE_SEARCH;
-}
-
-//////////////////////////////////////////////////////////////////////////
-LONG WINAPI CryEngineExceptionFilterWER(struct _EXCEPTION_POINTERS* pExceptionPointers)
-{
-    if (g_cvars.sys_WER > 1)
-    {
-        char szScratch [_MAX_PATH];
-        const char* szDumpPath = gEnv->pCryPak->AdjustFileName("@log@/CE2Dump.dmp", szScratch, AZ_ARRAY_SIZE(szScratch), 0);
-
-        MINIDUMP_TYPE mdumpValue = (MINIDUMP_TYPE)(MiniDumpNormal);
-        if (g_cvars.sys_WER > 1)
-        {
-            mdumpValue = (MINIDUMP_TYPE)(g_cvars.sys_WER - 2);
-        }
-
-        return CryEngineExceptionFilterMiniDump(pExceptionPointers, szDumpPath, mdumpValue);
-    }
-
-    LONG lRet = EXCEPTION_CONTINUE_SEARCH;
-    WCHAR* psz = GetFullPathToFaultrepDll();
-    if (psz)
-    {
-        HMODULE hFaultRepDll = LoadLibraryW(psz);
-        if (hFaultRepDll)
-        {
-            pfn_REPORTFAULT pfn = (pfn_REPORTFAULT)GetProcAddress(hFaultRepDll, "ReportFault");
-            if (pfn)
-            {
-                pfn(pExceptionPointers, 0);
-                lRet = EXCEPTION_EXECUTE_HANDLER;
-            }
-            FreeLibrary(hFaultRepDll);
-        }
-    }
-    return lRet;
-}
-
-#endif // WIN32
diff --git a/Code/CryEngine/CrySystem/XConsole.cpp b/Code/CryEngine/CrySystem/XConsole.cpp
deleted file mode 100644
index 0e75e4910d..0000000000
--- a/Code/CryEngine/CrySystem/XConsole.cpp
+++ /dev/null
@@ -1,3627 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation of the CXConsole class.
-
-
-#include "CrySystem_precompiled.h"
-#include "XConsole.h"
-#include "XConsoleVariable.h"
-#include "System.h"
-#include "ConsoleBatchFile.h"
-#include "StringUtils.h"
-#include "UnicodeFunctions.h"
-#include "UnicodeIterator.h"
-
-#include <ITimer.h>
-#include <IRenderer.h>
-#include <ISystem.h>
-#include <ILog.h>
-#include <IProcess.h>
-#include <IRenderAuxGeom.h>
-#include "ConsoleHelpGen.h"         // CConsoleHelpGen
-
-#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzCore/std/algorithm.h>
-
-#include <LyShine/Bus/UiCursorBus.h>
-//#define DEFENCE_CVAR_HASH_LOGGING
-
-static inline void AssertName([[maybe_unused]] const char* szName)
-{
-#ifdef _DEBUG
-    assert(szName);
-
-    // test for good console variable / command name
-    const char* p = szName;
-    bool bFirstChar = true;
-
-    while (*p)
-    {
-        assert((*p >= 'a' && *p <= 'z')
-            || (*p >= 'A' && *p <= 'Z')
-            || (*p >= '0' && *p <= '9' && !bFirstChar)
-            || *p == '_'
-            || *p == '.');
-
-        ++p;
-        bFirstChar = false;
-    }
-#endif
-}
-
-void ResetCVars(IConsoleCmdArgs*)
-{
-    if (gEnv->pSystem)
-    {
-        CXConsole* pConsole = static_cast<CXConsole*>(gEnv->pSystem->GetIConsole());
-        if (pConsole)
-        {
-            pConsole->ResetCVarsToDefaults();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// user defined comparison - for nicer printout
-inline int GetCharPrio(char x)
-{
-    if (x >= 'a' && x <= 'z')
-    {
-        x += 'A' - 'a';                 // make upper case
-    }
-    if (x == '_')
-    {
-        return 300;
-    }
-    else
-    {
-        return x;
-    }
-}
-// case sensitive
-inline bool less_CVar(const char* left, const char* right)
-{
-    for (;; )
-    {
-        uint32 l = GetCharPrio(*left), r = GetCharPrio(*right);
-
-        if (l < r)
-        {
-            return true;
-        }
-        if (l > r)
-        {
-            return false;
-        }
-
-        if (*left == 0 || *right == 0)
-        {
-            break;
-        }
-
-        ++left;
-        ++right;
-    }
-
-    return false;
-}
-
-void Command_SetWaitSeconds(IConsoleCmdArgs* pCmd)
-{
-    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
-
-    if (pCmd->GetArgCount() > 1)
-    {
-        pConsole->m_waitSeconds.SetSeconds(atof(pCmd->GetArg(1)));
-        pConsole->m_waitSeconds += gEnv->pTimer->GetFrameStartTime();
-    }
-}
-
-void Command_SetWaitFrames(IConsoleCmdArgs* pCmd)
-{
-    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
-
-    if (pCmd->GetArgCount() > 1)
-    {
-        pConsole->m_waitFrames = max(0, atoi(pCmd->GetArg(1)));
-    }
-}
-
-void ConsoleShow(IConsoleCmdArgs*)
-{
-    gEnv->pConsole->ShowConsole(true);
-}
-void ConsoleHide(IConsoleCmdArgs*)
-{
-    gEnv->pConsole->ShowConsole(false);
-}
-
-void Bind(IConsoleCmdArgs* cmdArgs)
-{
-    if (cmdArgs->GetArgCount() >= 3)
-    {
-        string arg;
-        for (int i = 2; i < cmdArgs->GetArgCount(); ++i)
-        {
-            arg += cmdArgs->GetArg(i);
-            arg += " ";
-        }
-        gEnv->pConsole->CreateKeyBind(cmdArgs->GetArg(1), arg.c_str());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CXConsole::con_display_last_messages = 0;
-int CXConsole::con_line_buffer_size = 500;
-int CXConsole::con_showonload = 0;
-int CXConsole::con_debug = 0;
-int CXConsole::con_restricted = 0;
-
-namespace
-{
-    const AzFramework::InputChannelId s_nullRepeatEventId("xconsole_null_repeat_event_id");
-}
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-CXConsole::CXConsole()
-    : AzFramework::InputChannelEventListener(AzFramework::InputChannelEventListener::GetPriorityDebug())
-    , AzFramework::InputTextEventListener(AzFramework::InputTextEventListener::GetPriorityDebug())
-    , m_nRepeatEventId(s_nullRepeatEventId)
-{
-    m_fRepeatTimer = 0;
-    m_pSysDeactivateConsole = 0;
-    m_pFont = NULL;
-    m_pImage = NULL;
-    m_nCursorPos = 0;
-    m_nScrollPos = 0;
-    m_nScrollMax = 300;
-    m_nTempScrollMax = m_nScrollMax;
-    m_nScrollLine = 0;
-    m_nHistoryPos = -1;
-    m_nTabCount = 0;
-    m_bConsoleActive = false;
-    m_bActivationKeyEnable = true;
-    m_bIsProcessingGroup = false;
-    m_bIsConsoleKeyPressed = false;
-    m_sdScrollDir = sdNONE;
-    m_pSystem = NULL;
-    m_bDrawCursor = true;
-    m_fCursorBlinkTimer = 0;
-
-    m_nCheatHashRangeFirst = 0;
-    m_nCheatHashRangeLast = 0;
-    m_bCheatHashDirty = false;
-    m_nCheatHash = 0;
-
-    m_bStaticBackground = false;
-    m_nProgress = 0;
-    m_nProgressRange = 0;
-    m_nLoadingBackTexID = 0;
-
-    m_deferredExecution = false;
-    m_waitFrames = 0;
-    m_waitSeconds = 0.0f;
-    m_blockCounter = 0;
-
-    AzFramework::ConsoleRequestBus::Handler::BusConnect();
-    AzFramework::CommandRegistrationBus::Handler::BusConnect();
-
-    AddCommand("resetcvars", (ConsoleCommandFunc)ResetCVars, 0, "Resets all cvars to their initial values");
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CXConsole::~CXConsole()
-{
-    AzFramework::ConsoleRequestBus::Handler::BusDisconnect();
-    AzFramework::CommandRegistrationBus::Handler::BusDisconnect();
-
-    if (gEnv->pSystem)
-    {
-        gEnv->pSystem->GetIRemoteConsole()->UnregisterListener(this);
-    }
-
-    if (!m_mapVariables.empty())
-    {
-        while (!m_mapVariables.empty())
-        {
-            m_mapVariables.begin()->second->Release();
-        }
-
-        m_mapVariables.clear();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::FreeRenderResources()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::Release()
-{
-    delete this;
-}
-
-
-#if ALLOW_AUDIT_CVARS
-void Command_AuditCVars(IConsoleCmdArgs* pArg)
-{
-    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
-    if (pConsole != NULL)
-    {
-        pConsole->AuditCVars(pArg);
-    }
-}
-#endif // ALLOW_AUDIT_CVARS
-
-
-
-#if !defined(_RELEASE) && !defined(LINUX) && !defined(APPLE)
-void Command_DumpCommandsVars(IConsoleCmdArgs* Cmd)
-{
-    const char* arg = "";
-
-    if (Cmd->GetArgCount() > 1)
-    {
-        arg = Cmd->GetArg(1);
-    }
-
-    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
-
-    // txt
-    pConsole->DumpCommandsVarsTxt(arg);
-
-#if defined(WIN32) || defined(WIN64)
-    // HTML
-    {
-        CConsoleHelpGen Generator(*pConsole);
-
-        Generator.Work();
-    }
-#endif
-}
-
-void Command_DumpVars(IConsoleCmdArgs* Cmd)
-{
-    bool includeCheat = false;
-
-    if (Cmd->GetArgCount() > 1)
-    {
-        const char* arg = Cmd->GetArg(1);
-        int incCheat = atoi(arg);
-        if (incCheat == 1)
-        {
-            includeCheat = true;
-        }
-    }
-
-    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
-
-    // txt
-    pConsole->DumpVarsTxt(includeCheat);
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::Init(ISystem* pSystem)
-{
-    m_pSystem = static_cast<CSystem*>(pSystem);
-    if (pSystem->GetICryFont())
-    {
-        m_pFont = pSystem->GetICryFont()->GetFont("default");
-    }
-    m_pTimer = pSystem->GetITimer();
-
-    AzFramework::InputChannelEventListener::Connect();
-    AzFramework::InputTextEventListener::Connect();
-
-#if defined(_RELEASE) && !defined(PERFORMANCE_BUILD)
-    static const int kDeactivateConsoleDefault = 1;
-#else
-    static const int kDeactivateConsoleDefault = 0;
-#endif
-    m_pSysDeactivateConsole = REGISTER_INT("sys_DeactivateConsole", kDeactivateConsoleDefault, 0,
-            "0: normal console behavior\n"
-            "1: hide the console");
-
-    REGISTER_CVAR(con_display_last_messages, 0, VF_NULL, "");  // keep default at 1, needed for gameplay
-    REGISTER_CVAR(con_line_buffer_size, 1000, VF_NULL, "");
-    REGISTER_CVAR(con_showonload, 0, VF_NULL, "Show console on level loading");
-    REGISTER_CVAR(con_debug, 0, VF_CHEAT, "Log call stack on every GetCVar call");
-    REGISTER_CVAR(con_restricted, con_restricted, VF_RESTRICTEDMODE, "0=normal mode / 1=restricted access to the console");                // later on VF_RESTRICTEDMODE should be removed (to 0)
-
-    if (m_pSystem->IsDevMode()       // unrestricted console for -DEVMODE
-        || gEnv->IsDedicated())     // unrestricted console for dedicated server
-    {
-        con_restricted = 0;
-    }
-
-    // test cases -----------------------------------------------
-    assert(GetCVar("con_debug") != 0);        // should be registered a few lines above
-    assert(GetCVar("Con_Debug") == GetCVar("con_debug"));     // different case
-
-    // editor
-    assert(strcmp(AutoComplete("con_"), "con_debug") == 0);
-    assert(strcmp(AutoComplete("CON_"), "con_debug") == 0);
-    assert(strcmp(AutoComplete("con_debug"), "con_display_last_messages") == 0);       // actually we should reconsider this behavior
-    assert(strcmp(AutoComplete("Con_Debug"), "con_display_last_messages") == 0);       // actually we should reconsider this behavior
-
-    // game
-    assert(strcmp(ProcessCompletion("con_"), "con_debug ") == 0);
-    ResetAutoCompletion();
-    assert(strcmp(ProcessCompletion("CON_"), "con_debug ") == 0);
-    ResetAutoCompletion();
-    assert(strcmp(ProcessCompletion("con_debug"), "con_debug ") == 0);
-    ResetAutoCompletion();
-    assert(strcmp(ProcessCompletion("Con_Debug"), "con_debug ") == 0);
-    ResetAutoCompletion();
-
-    // ----------------------------------------------------------
-
-    m_nLoadingBackTexID = -1;
-
-    if (gEnv->IsDedicated())
-    {
-        m_bConsoleActive = true;
-    }
-
-    REGISTER_COMMAND("ConsoleShow", &ConsoleShow, VF_NULL, "Opens the console");
-    REGISTER_COMMAND("ConsoleHide", &ConsoleHide, VF_NULL, "Closes the console");
-
-#if ALLOW_AUDIT_CVARS
-    REGISTER_COMMAND("audit_cvars", &Command_AuditCVars, VF_NULL, "Logs all console commands and cvars");
-#endif // ALLOW_AUDIT_CVARS
-
-#if !defined(_RELEASE) && !defined(LINUX) && !defined(APPLE)
-    REGISTER_COMMAND("DumpCommandsVars", &Command_DumpCommandsVars, VF_NULL,
-        "This console command dumps all console variables and commands to disk\n"
-        "DumpCommandsVars [prefix]");
-    REGISTER_COMMAND("DumpVars", &Command_DumpVars, VF_NULL,
-        "This console command dumps all console variables to disk\n"
-        "DumpVars [IncludeCheatCvars]");
-#endif
-
-    REGISTER_COMMAND("Bind", &Bind, VF_NULL, "");
-    REGISTER_COMMAND("wait_seconds", &Command_SetWaitSeconds, VF_BLOCKFRAME,
-        "Forces the console to wait for a given number of seconds before the next deferred command is processed\n"
-        "Works only in deferred command mode");
-    REGISTER_COMMAND("wait_frames", &Command_SetWaitFrames, VF_BLOCKFRAME,
-        "Forces the console to wait for a given number of frames before the next deferred command is processed\n"
-        "Works only in deferred command mode");
-
-    CConsoleBatchFile::Init();
-
-    if (con_showonload)
-    {
-        ShowConsole(true);
-    }
-
-    pSystem->GetIRemoteConsole()->RegisterListener(this, "CXConsole");
-}
-
-void CXConsole::LogChangeMessage(const char* name, const bool isConst, const bool isCheat, const bool isReadOnly, const bool isDeprecated,
-    const char* oldValue, const char* newValue, [[maybe_unused]] const bool isProcessingGroup, const bool allowChange)
-{
-    string logMessage;
-
-    logMessage.Format
-        ("[CVARS]: [%s] variable [%s] from [%s] to [%s]%s; Marked as%s%s%s%s",
-        (allowChange) ? "CHANGED" : "IGNORED CHANGE",
-        name,
-        oldValue,
-        newValue,
-        (m_bIsProcessingGroup) ? " as part of a cvar group" : "",
-        (isConst) ? " [VF_CONST_CVAR]" : "",
-        (isCheat) ? " [VF_CHEAT]" : "",
-        (isReadOnly) ? " [VF_READONLY]" : "",
-        (isDeprecated) ? " [VF_DEPRECATED]" : "");
-
-    if (allowChange)
-    {
-        gEnv->pLog->LogWarning(logMessage.c_str());
-        gEnv->pLog->LogWarning("Modifying marked variables will not be allowed in Release mode!");
-    }
-    else
-    {
-        gEnv->pLog->LogError(logMessage.c_str());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::RegisterVar(ICVar* pCVar, ConsoleVarFunc pChangeFunc)
-{
-    // first register callback so setting the value from m_configVars
-    // is calling pChangeFunc         (that would be more correct but to not introduce new problems this code was not changed)
-    //  if (pChangeFunc)
-    //      pCVar->SetOnChangeCallback(pChangeFunc);
-
-    bool isConst = pCVar->IsConstCVar();
-    bool isCheat = ((pCVar->GetFlags() & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0);
-    bool isReadOnly = ((pCVar->GetFlags() & VF_READONLY) != 0);
-    bool isDeprecated = ((pCVar->GetFlags() & VF_DEPRECATED) != 0);
-
-    ConfigVars::iterator it = m_configVars.find(CONST_TEMP_STRING(pCVar->GetName()));
-    if (it != m_configVars.end())
-    {
-        SConfigVar& var = it->second;
-        bool allowChange = true;
-        bool wasProcessingGroup = GetIsProcessingGroup();
-        SetProcessingGroup(var.m_partOfGroup);
-
-        if (
-#if CVAR_GROUPS_ARE_PRIVILEGED
-            !m_bIsProcessingGroup &&
-#endif // !CVAR_GROUPS_ARE_PRIVILEGED
-            (isConst || isCheat || isReadOnly || isDeprecated))
-        {
-            allowChange = !isDeprecated && ((gEnv->pSystem->IsDevMode()) || (gEnv->IsEditor()));
-            if ((strcmp(pCVar->GetString(), var.m_value.c_str()) != 0) && (!(gEnv->IsEditor()) || isDeprecated))
-            {
-#if LOG_CVAR_INFRACTIONS
-                LogChangeMessage(pCVar->GetName(), isConst, isCheat,
-                    isReadOnly, isDeprecated, pCVar->GetString(), var.m_value.c_str(), m_bIsProcessingGroup, allowChange);
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-                gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-#endif // LOG_CVAR_INFRACTIONS
-            }
-        }
-
-        if (allowChange || ALLOW_CONST_CVAR_MODIFICATIONS)
-        {
-            pCVar->Set(var.m_value.c_str());
-            pCVar->SetFlags(pCVar->GetFlags() | VF_WASINCONFIG);
-        }
-
-        SetProcessingGroup(wasProcessingGroup);
-    }
-    else
-    {
-        // Variable is not modified when just registered.
-        pCVar->ClearFlags(VF_MODIFIED);
-    }
-
-    if (pChangeFunc)
-    {
-        pCVar->SetOnChangeCallback(pChangeFunc);
-    }
-
-    ConsoleVariablesMapItor::value_type value = ConsoleVariablesMapItor::value_type(pCVar->GetName(), pCVar);
-
-    m_mapVariables.insert(value);
-
-    int flags = pCVar->GetFlags();
-
-    if (flags & VF_CHEAT_ALWAYS_CHECK)
-    {
-        AddCheckedCVar(m_alwaysCheckedVariables, value);
-    }
-    else if ((flags & (VF_CHEAT | VF_CHEAT_NOCHECK)) == VF_CHEAT)
-    {
-        AddCheckedCVar(m_randomCheckedVariables, value);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::AddCheckedCVar(ConsoleVariablesVector& vector, const ConsoleVariablesVector::value_type& value)
-{
-    ConsoleVariablesVector::iterator it = std::lower_bound(vector.begin(), vector.end(), value, CVarNameLess);
-
-    if ((it == vector.end()) || strcmp(it->first, value.first))
-    {
-        vector.insert(it, value);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::CVarNameLess(const std::pair<const char*, ICVar*>& lhs, const std::pair<const char*, ICVar*>& rhs)
-{
-    return strcmp(lhs.first, rhs.first) < 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::LoadConfigVar(const char* sVariable, const char* sValue)
-{
-    ICVar* pCVar = GetCVar(sVariable);
-    if (pCVar)
-    {
-        bool isConst = pCVar->IsConstCVar();
-        bool isCheat = ((pCVar->GetFlags() & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0);
-        bool isReadOnly = ((pCVar->GetFlags() & VF_READONLY) != 0);
-        bool isDeprecated = ((pCVar->GetFlags() & VF_DEPRECATED) != 0);
-        bool allowChange = true;
-
-        if (
-#if CVAR_GROUPS_ARE_PRIVILEGED
-            !m_bIsProcessingGroup &&
-#endif // !CVAR_GROUPS_ARE_PRIVILEGED
-            (isConst || isCheat || isReadOnly) || isDeprecated)
-        {
-            allowChange = !isDeprecated && (gEnv->pSystem->IsDevMode()) || (gEnv->IsEditor());
-            if (!(gEnv->IsEditor()) || isDeprecated)
-            {
-#if LOG_CVAR_INFRACTIONS
-                LogChangeMessage(pCVar->GetName(), isConst, isCheat,
-                    isReadOnly, isDeprecated, pCVar->GetString(), sValue, m_bIsProcessingGroup, allowChange);
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-                gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-#endif // LOG_CVAR_INFRACTIONS
-            }
-        }
-
-        if (allowChange || ALLOW_CONST_CVAR_MODIFICATIONS)
-        {
-            pCVar->Set(sValue);
-            pCVar->SetFlags(pCVar->GetFlags() | VF_WASINCONFIG);
-        }
-        return;
-    }
-
-    SConfigVar temp;
-    temp.m_value = sValue;
-    temp.m_partOfGroup = m_bIsProcessingGroup;
-
-    m_configVars[sVariable] = temp;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::EnableActivationKey(bool bEnable)
-{
-    m_bActivationKeyEnable = bEnable;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::SetClientDataProbeString(const char* pName, const char* pValue)
-{
-    ICVar*                  pCVar = GetCVar(pName);
-
-    if (pCVar)
-    {
-        pCVar->SetDataProbeString(pValue);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::Register(const char* sName, int* src, int iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify)
-{
-    AssertName(sName);
-
-    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
-    if (pCVar)
-    {
-        gEnv->pLog->LogError("[CVARS]: [DUPLICATE] CXConsole::Register(int): variable [%s] is already registered", pCVar->GetName());
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-        return pCVar;
-    }
-
-    if (!allowModify)
-    {
-        nFlags |= VF_CONST_CVAR;
-    }
-    pCVar = new CXConsoleVariableIntRef(this, sName, src, nFlags, help);
-    *src = iValue;
-    RegisterVar(pCVar, pChangeFunc);
-    return pCVar;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::RegisterCVarGroup(const char* szName, const char* szFileName)
-{
-    AssertName(szName);
-    assert(szFileName);
-
-    // suppress cvars not starting with sys_spec_ as
-    // cheaters might create cvars before we created ours
-    if (_strnicmp(szName, "sys_spec_", 9) != 0)
-    {
-        return 0;
-    }
-
-    ICVar* pCVar = stl::find_in_map(m_mapVariables, szName, NULL);
-    if (pCVar)
-    {
-        AZ_Error("System", false, "CVar groups should only be registered once");
-        return pCVar;
-    }
-
-    CXConsoleVariableCVarGroup* pCVarGroup = new CXConsoleVariableCVarGroup(this, szName, szFileName, VF_COPYNAME);
-
-    pCVar = pCVarGroup;
-
-    RegisterVar(pCVar, CXConsoleVariableCVarGroup::OnCVarChangeFunc);
-
-    return pCVar;
-}
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::Register(const char* sName, float* src, float fValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify)
-{
-    AssertName(sName);
-
-    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
-    if (pCVar)
-    {
-        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::Register(float): variable [%s] is already registered", pCVar->GetName());
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-        return pCVar;
-    }
-    if (!allowModify)
-    {
-        nFlags |= VF_CONST_CVAR;
-    }
-    pCVar = new CXConsoleVariableFloatRef(this, sName, src, nFlags, help);
-    *src = fValue;
-    RegisterVar(pCVar, pChangeFunc);
-    return pCVar;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::Register(const char* sName, const char** src, const char* defaultValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify)
-{
-    AssertName(sName);
-
-    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
-    if (pCVar)
-    {
-        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::Register(const char*): variable [%s] is already registered", pCVar->GetName());
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-        return pCVar;
-    }
-    if (!allowModify)
-    {
-        nFlags |= VF_CONST_CVAR;
-    }
-    pCVar = new CXConsoleVariableStringRef(this, sName, src, defaultValue, nFlags, help);
-    RegisterVar(pCVar, pChangeFunc);
-    return pCVar;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::RegisterString(const char* sName, const char* sValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc)
-{
-    AssertName(sName);
-
-    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
-    if (pCVar)
-    {
-        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::RegisterString(const char*): variable [%s] is already registered", pCVar->GetName());
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-        return pCVar;
-    }
-
-    pCVar = new CXConsoleVariableString(this, sName, sValue, nFlags, help);
-    RegisterVar(pCVar, pChangeFunc);
-    return pCVar;
-}
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::RegisterFloat(const char* sName, float fValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc)
-{
-    AssertName(sName);
-
-    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
-    if (pCVar)
-    {
-        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::RegisterFloat(): variable [%s] is already registered", pCVar->GetName());
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-        return pCVar;
-    }
-
-    pCVar = new CXConsoleVariableFloat(this, sName, fValue, nFlags, help);
-    RegisterVar(pCVar, pChangeFunc);
-    return pCVar;
-}
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::RegisterInt(const char* sName, int iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc)
-{
-    AssertName(sName);
-
-    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
-    if (pCVar)
-    {
-        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::RegisterInt(): variable [%s] is already registered", pCVar->GetName());
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-        return pCVar;
-    }
-
-    pCVar = new CXConsoleVariableInt(this, sName, iValue, nFlags, help);
-    RegisterVar(pCVar, pChangeFunc);
-    return pCVar;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::RegisterInt64(const char* sName, int64 iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc)
-{
-    AssertName(sName);
-
-    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
-    if (pCVar)
-    {
-        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::RegisterInt64(): variable [%s] is already registered", pCVar->GetName());
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-        return pCVar;
-    }
-
-    pCVar = new CXConsoleVariableInt64(this, sName, iValue, nFlags, help);
-    RegisterVar(pCVar, pChangeFunc);
-    return pCVar;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::UnregisterVariable(const char* sVarName, [[maybe_unused]] bool bDelete)
-{
-    ConsoleVariablesMapItor itor;
-    itor = m_mapVariables.find(sVarName);
-
-    if (itor == m_mapVariables.end())
-    {
-        return;
-    }
-
-    ICVar* pCVar = itor->second;
-
-    int32 flags = pCVar->GetFlags();
-
-    if (flags & VF_CHEAT_ALWAYS_CHECK)
-    {
-        RemoveCheckedCVar(m_alwaysCheckedVariables, *itor);
-    }
-    else if ((flags & (VF_CHEAT | VF_CHEAT_NOCHECK)) == VF_CHEAT)
-    {
-        RemoveCheckedCVar(m_randomCheckedVariables, *itor);
-    }
-
-    m_mapVariables.erase(sVarName);
-
-    delete pCVar;
-}
-
-void CXConsole::RemoveCheckedCVar(ConsoleVariablesVector& vector, const ConsoleVariablesVector::value_type& value)
-{
-    ConsoleVariablesVector::iterator it = std::lower_bound(vector.begin(), vector.end(), value, CVarNameLess);
-
-    if ((it != vector.end()) && !strcmp(it->first, value.first))
-    {
-        vector.erase(it);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::SetScrollMax(int value)
-{
-    m_nScrollMax = value;
-    m_nTempScrollMax = m_nScrollMax;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void CXConsole::SetImage(ITexture* pImage, bool bDeleteCurrent)
-{
-    if (bDeleteCurrent)
-    {
-        pImage->Release();
-    }
-
-    m_pImage = pImage;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void    CXConsole::ShowConsole(bool show, const int iRequestScrollMax)
-{
-    if (m_pSysDeactivateConsole->GetIVal())
-    {
-        show = false;
-    }
-
-    if (show && !m_bConsoleActive)
-    {
-        UiCursorBus::Broadcast(&UiCursorBus::Events::IncrementVisibleCounter);
-
-        AzFramework::InputSystemCursorRequestBus::EventResult(m_previousSystemCursorState,
-            AzFramework::InputDeviceMouse::Id,
-            &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
-        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-            AzFramework::SystemCursorState::UnconstrainedAndVisible);
-    }
-    else if (!show && m_bConsoleActive)
-    {
-        UiCursorBus::Broadcast(&UiCursorBus::Events::DecrementVisibleCounter);
-
-        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-            m_previousSystemCursorState);
-    }
-
-    SetStatus(show);
-
-    if (iRequestScrollMax > 0)
-    {
-        m_nTempScrollMax = iRequestScrollMax;         // temporary user request
-    }
-    else
-    {
-        m_nTempScrollMax = m_nScrollMax;                  // reset
-    }
-    if (m_bConsoleActive)
-    {
-        m_sdScrollDir = sdDOWN;
-    }
-    else
-    {
-        m_sdScrollDir = sdUP;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::CreateKeyBind(const char* sCmd, const char* sRes)
-{
-    m_mapBinds.insert(ConsoleBindsMapItor::value_type(sCmd, sRes));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::DumpKeyBinds(IKeyBindDumpSink* pCallback)
-{
-    for (ConsoleBindsMap::iterator it = m_mapBinds.begin(); it != m_mapBinds.end(); ++it)
-    {
-        pCallback->OnKeyBindFound(it->first.c_str(), it->second.c_str());
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-const char* CXConsole::FindKeyBind(const char* sCmd) const
-{
-    ConsoleBindsMap::const_iterator it = m_mapBinds.find(CONST_TEMP_STRING(sCmd));
-
-    if (it != m_mapBinds.end())
-    {
-        return it->second.c_str();
-    }
-
-    return 0;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::DumpCVars(ICVarDumpSink* pCallback, unsigned int nFlagsFilter)
-{
-    ConsoleVariablesMapItor It = m_mapVariables.begin();
-
-    while (It != m_mapVariables.end())
-    {
-        if ((nFlagsFilter == 0) || ((nFlagsFilter != 0) && (It->second->GetFlags() & nFlagsFilter)))
-        {
-            pCallback->OnElementFound(It->second);
-        }
-        ++It;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-ICVar* CXConsole::GetCVar(const char* sName)
-{
-    assert(this);
-    assert(sName);
-
-    if (con_debug)
-    {
-        // Log call stack on get cvar.
-        CryLog("GetCVar(\"%s\") called", sName);
-        m_pSystem->debug_LogCallStack();
-    }
-
-    // Fast map lookup for case-sensitive match.
-    ConsoleVariablesMapItor it;
-
-    it = m_mapVariables.find(sName);
-    if (it != m_mapVariables.end())
-    {
-        return it->second;
-    }
-
-    /*
-        if(!bCaseSensitive)
-        {
-            // Much slower but allows names with wrong case (use only where performance doesn't matter).
-            for(it=m_mapVariables.begin(); it!=m_mapVariables.end(); ++it)
-            {
-                if(azstricmp(it->first,sName)==0)
-                    return it->second;
-            }
-        }
-        test else
-        {
-            for(it=m_mapVariables.begin(); it!=m_mapVariables.end(); ++it)
-            {
-                if(azstricmp(it->first,sName)==0)
-                {
-                    CryFatalError("Error: Wrong case for '%s','%s'",it->first,sName);
-                }
-            }
-        }
-    */
-
-    return NULL;        // haven't found this name
-}
-
-//////////////////////////////////////////////////////////////////////////
-char* CXConsole::GetVariable([[maybe_unused]] const char* szVarName, [[maybe_unused]] const char* szFileName, [[maybe_unused]] const char* def_val)
-{
-    assert(m_pSystem);
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CXConsole::GetVariable([[maybe_unused]] const char* szVarName, [[maybe_unused]] const char* szFileName, [[maybe_unused]] float def_val)
-{
-    assert(m_pSystem);
-    return 0;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::GetStatus()
-{
-    return m_bConsoleActive;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::Clear()
-{
-    m_dqConsoleBuffer.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::Update()
-{
-    if (!m_pSystem)
-    {
-        return;
-    }
-
-    if (m_bIsConsoleKeyPressed)
-    {
-        m_sInputBuffer.clear();
-        m_nCursorPos = 0;
-        m_bIsConsoleKeyPressed = false;
-    }
-
-    // Execute the deferred commands
-    ExecuteDeferredCommands();
-
-    if (!m_bConsoleActive)
-    {
-        m_nRepeatEventId = s_nullRepeatEventId;
-    }
-
-    // Process Key press repeat (backspace and cursor on PC)
-    if (m_nRepeatEventId != s_nullRepeatEventId)
-    {
-        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
-
-        if (m_fRepeatTimer <= 0.0f)
-        {
-            if (m_fRepeatTimer < -fHitchDelay)
-            {
-                // bad framerate or hitch
-                m_nRepeatEventId = s_nullRepeatEventId;
-            }
-            else
-            {
-                const AzFramework::InputChannel* repeatInputChannel = AzFramework::InputChannelRequests::FindInputChannel(m_nRepeatEventId);
-                if (repeatInputChannel)
-                {
-                    ProcessInput(*repeatInputChannel);
-                }
-                m_fRepeatTimer = fRepeatDelay;            // next repeat even in .. sec
-            }
-        }
-    }
-}
-
-//enable this for now, we need it for profiling etc
-//MUST DISABLE FOR TCG BUILDS
-#   define PROCESS_XCONSOLE_INPUT
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::OnInputChannelEventFiltered(const AzFramework::InputChannel& inputChannel)
-{
-#ifdef PROCESS_XCONSOLE_INPUT
-    const AzFramework::InputDeviceId& deviceId = inputChannel.GetInputDevice().GetInputDeviceId();
-    if (!AzFramework::InputDeviceKeyboard::IsKeyboardDevice(deviceId))
-    {
-        // Don't consume non-keyboard events
-        return false;
-    }
-
-    if (inputChannel.IsStateEnded() && m_bConsoleActive)
-    {
-        m_nRepeatEventId = s_nullRepeatEventId;
-    }
-
-    if (!inputChannel.IsStateBegan())
-    {
-        // Consume keyboard events if the console is active
-        return m_bConsoleActive;
-    }
-
-    const AzFramework::InputChannelId& channelId = inputChannel.GetInputChannelId();
-    const AzFramework::ModifierKeyStates* customData = inputChannel.GetCustomData<AzFramework::ModifierKeyStates>();
-    const AzFramework::ModifierKeyStates modifierKeyStates = customData ? *customData : AzFramework::ModifierKeyStates();
-
-    // restart cursor blinking
-    m_fCursorBlinkTimer = 0.0f;
-    m_bDrawCursor = true;
-
-    // key repeat
-    const float fStartRepeatDelay = 0.5f;                       // in sec (similar to Windows default but might differ from actual setting)
-    m_nRepeatEventId = channelId;
-    m_fRepeatTimer = fStartRepeatDelay;
-
-    //execute Binds
-    if (!m_bConsoleActive)
-    {
-        const char* cmd = 0;
-
-        if (modifierKeyStates.GetActiveModifierKeys() == AzFramework::ModifierKeyMask::None)
-        {
-            // fast
-            cmd = FindKeyBind(channelId.GetName());
-        }
-        else
-        {
-            // slower
-            char szCombinedName[255];
-            int iLen = 0;
-
-            if (modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::CtrlAny))
-            {
-                azstrcpy(szCombinedName, AZ_ARRAY_SIZE(szCombinedName), "ctrl_");
-                iLen += 5;
-            }
-            if (modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::ShiftAny))
-            {
-                azstrcpy(&szCombinedName[iLen], AZ_ARRAY_SIZE(szCombinedName) - iLen, "shift_");
-                iLen += 6;
-            }
-            if (modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::AltAny))
-            {
-                azstrcpy(&szCombinedName[iLen], AZ_ARRAY_SIZE(szCombinedName) - iLen, "alt_");
-                iLen += 4;
-            }
-            if (modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::SuperAny))
-            {
-                azstrcpy(&szCombinedName[iLen], AZ_ARRAY_SIZE(szCombinedName) - iLen, "win_");
-                iLen += 4;
-            }
-
-            assert(sizeof(szCombinedName) > (iLen + strlen(channelId.GetName()) + 1));
-            azstrcpy(&szCombinedName[iLen], AZ_ARRAY_SIZE(szCombinedName) - iLen, channelId.GetName());
-
-            cmd = FindKeyBind(szCombinedName);
-        }
-
-        if (cmd)
-        {
-            SetInputLine("");
-            ExecuteStringInternal(cmd, true);        // keybinds are treated as they would come from console
-        }
-    }
-    else
-    {
-        if (channelId != AzFramework::InputDeviceKeyboard::Key::EditTab)
-        {
-            ResetAutoCompletion();
-        }
-
-        if (channelId == AzFramework::InputDeviceKeyboard::Key::AlphanumericC &&
-            modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::CtrlAny))
-        {
-            Copy();
-
-            // Consume keyboard events if the console is active, which it will be if we get here
-            return true;
-        }
-        else if (channelId == AzFramework::InputDeviceKeyboard::Key::AlphanumericV &&
-            modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::CtrlAny))
-        {
-            Paste();
-            return true;
-        }
-    }
-
-    if (channelId == AzFramework::InputDeviceKeyboard::Key::PunctuationTilde)
-    {
-        if (m_bActivationKeyEnable)
-        {
-            ShowConsole(!GetStatus());
-            m_nRepeatEventId = s_nullRepeatEventId;
-            m_bIsConsoleKeyPressed = true;
-            return true;
-        }
-    }
-    if (channelId == AzFramework::InputDeviceKeyboard::Key::Escape)
-    {
-        // hide console if it's active
-        if (GetStatus())
-        {
-            ShowConsole(false);
-            m_bIsConsoleKeyPressed = true;
-            return true;
-        }
-
-        //switch process or page or other things
-        if (m_pSystem)
-        {
-            ISystemUserCallback* pCallback = ((CSystem*)m_pSystem)->GetUserCallback();
-            if (pCallback)
-            {
-                pCallback->OnProcessSwitch();
-                m_bIsConsoleKeyPressed = true;
-                // Mark this input as handled. Pressing escape here is used in the editor to exit game mode, and return to edit mode.
-                // If AI/Physics mode was enabled before entering game mode, when returning to edit mode it will be enabled again.
-                // When it is enabled, it will reset input. If this returns false, then other handlers on the ebus would continue to process
-                // input events after the input had been reset. By returning true, the input is marked as handled.
-                return true;
-            }
-        }
-    }
-
-    return ProcessInput(inputChannel);
-
-#else
-
-    return false;
-
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::OnInputTextEventFiltered(const AZStd::string& textUTF8)
-{
-#ifdef PROCESS_XCONSOLE_INPUT
-    // Ignore tilde/accent/power of two character since it is reserved for toggling the console
-    const bool isTilde = (textUTF8 == "~" || textUTF8 == "`" || textUTF8 == "\xC2\xB2");
-    if (m_bConsoleActive && !isTilde)
-    {
-        AddInputUTF8(textUTF8);
-    }
-#endif
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::ProcessInput(const AzFramework::InputChannel& inputChannel)
-{
-#ifdef PROCESS_XCONSOLE_INPUT
-
-    if (!m_bConsoleActive)
-    {
-        return false;
-    }
-
-    const AzFramework::InputChannelId& channelId = inputChannel.GetInputChannelId();
-    const AzFramework::ModifierKeyStates* customData = inputChannel.GetCustomData<AzFramework::ModifierKeyStates>();
-    const AzFramework::ModifierKeyStates modifierKeyStates = customData ? *customData : AzFramework::ModifierKeyStates();
-
-    const bool isAltModifierActive = modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::AltAny);
-    const bool isCtrlModifierActive = modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::CtrlAny);
-
-    if (channelId == AzFramework::InputDeviceKeyboard::Key::EditEnter ||
-        channelId == AzFramework::InputDeviceKeyboard::Key::NumPadEnter)
-    {
-        ExecuteInputBuffer();
-        m_nScrollLine = 0;
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::EditBackspace)
-    {
-        RemoveInputChar(true);
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationArrowLeft)
-    {
-        if (m_nCursorPos)
-        {
-            const char* pCursor = m_sInputBuffer.c_str() + m_nCursorPos;
-            Unicode::CIterator<const char*, false> pUnicode(pCursor);
-            --pUnicode; // Note: This moves back one UCS code-point, but doesn't necessarily match one displayed character (ie, combining diacritics)
-            pCursor = pUnicode.GetPosition();
-            m_nCursorPos = pCursor - m_sInputBuffer.c_str();
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationArrowRight)
-    {
-        if (m_nCursorPos < (int)(m_sInputBuffer.length()))
-        {
-            const char* pCursor = m_sInputBuffer.c_str() + m_nCursorPos;
-            Unicode::CIterator<const char*, false> pUnicode(pCursor);
-            ++pUnicode; // Note: This moves forward one UCS code-point, but doesn't necessarily match one displayed character (ie, combining diacritics)
-            pCursor = pUnicode.GetPosition();
-            m_nCursorPos = pCursor - m_sInputBuffer.c_str();
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationArrowUp)
-    {
-        const char* szHistoryLine = GetHistoryElement(true);      // true=UP
-
-        if (szHistoryLine)
-        {
-            m_sInputBuffer = szHistoryLine;
-            m_nCursorPos = (int)m_sInputBuffer.size();
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationArrowDown)
-    {
-        const char* szHistoryLine = GetHistoryElement(false);     // false=DOWN
-
-        if (szHistoryLine)
-        {
-            m_sInputBuffer = szHistoryLine;
-            m_nCursorPos = (int)m_sInputBuffer.size();
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::EditTab)
-    {
-        if (!isAltModifierActive)
-        {
-            m_sInputBuffer = ProcessCompletion(m_sInputBuffer.c_str());
-            m_nCursorPos = m_sInputBuffer.size();
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationPageUp)
-    {
-        if (isCtrlModifierActive)
-        {
-            m_nScrollLine = min((int)(m_dqConsoleBuffer.size() - 1), m_nScrollLine + 21);
-        }
-        else
-        {
-            m_nScrollLine = min((int)(m_dqConsoleBuffer.size() - 1), m_nScrollLine + 1);
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationPageDown)
-    {
-        if (isCtrlModifierActive)
-        {
-            m_nScrollLine = max(0, m_nScrollLine - 21);
-        }
-        else
-        {
-            m_nScrollLine = max(0, m_nScrollLine - 1);
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationHome)
-    {
-        if (isCtrlModifierActive)
-        {
-            m_nScrollLine = m_dqConsoleBuffer.size() - 1;
-        }
-        else
-        {
-            m_nCursorPos = 0;
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationEnd)
-    {
-        if (isCtrlModifierActive)
-        {
-            m_nScrollLine = 0;
-        }
-        else
-        {
-            m_nCursorPos = (int)m_sInputBuffer.length();
-        }
-        return true;
-    }
-    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationDelete)
-    {
-        RemoveInputChar(false);
-        return true;
-    }
-
-#endif
-
-    // Consume keyboard events if the console is active, which it will be if we get here
-    return true;
-}
-
-#ifdef PROCESS_XCONSOLE_INPUT
-#   undef PROCESS_XCONSOLE_INPUT
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void CXConsole::OnConsoleCommand(const char* cmd)
-{
-    ExecuteString(cmd, false);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-const char* CXConsole::GetHistoryElement(const bool bUpOrDown)
-{
-    if (bUpOrDown)
-    {
-        if (!m_dqHistory.empty())
-        {
-            if (m_nHistoryPos < (int)(m_dqHistory.size() - 1))
-            {
-                m_nHistoryPos++;
-                m_sReturnString = m_dqHistory[m_nHistoryPos];
-                return m_sReturnString.c_str();
-            }
-        }
-    }
-    else
-    {
-        if (m_nHistoryPos > 0)
-        {
-            m_nHistoryPos--;
-            m_sReturnString = m_dqHistory[m_nHistoryPos];
-            return m_sReturnString.c_str();
-        }
-    }
-
-    return 0;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::Draw()
-{
-}
-
-void CXConsole::DrawBuffer(int, const char*)
-{
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::GetLineNo(const int indwLineNo, char* outszBuffer, const int indwBufferSize) const
-{
-    assert(outszBuffer);
-    assert(indwBufferSize > 0);
-
-    outszBuffer[0] = 0;
-
-    ConsoleBuffer::const_reverse_iterator ritor = m_dqConsoleBuffer.rbegin();
-
-    ritor += indwLineNo;
-
-    if (indwLineNo >= (int)m_dqConsoleBuffer.size())
-    {
-        return false;
-    }
-
-    const char* buf = ritor->c_str();// GetBuf(k);
-
-    if (*buf > 0 && *buf < 32)
-    {
-        buf++;                          // to jump over verbosity level character
-    }
-    cry_strcpy(outszBuffer, indwBufferSize, buf);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CXConsole::GetLineCount() const
-{
-    return m_dqConsoleBuffer.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ScrollConsole()
-{
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::AddCommand(const char* sCommand, ConsoleCommandFunc func, int nFlags, const char* sHelp)
-{
-    AssertName(sCommand);
-
-    if (m_mapCommands.find(sCommand) == m_mapCommands.end())
-    {
-        CConsoleCommand cmd;
-        cmd.m_sName = sCommand;
-        cmd.m_func = func;
-        if (sHelp)
-        {
-            cmd.m_sHelp = sHelp;
-        }
-        cmd.m_nFlags = nFlags;
-        m_mapCommands.insert(std::make_pair(cmd.m_sName, cmd));
-
-        return true;
-    }
-    else
-    {
-        gEnv->pLog->LogError("[CVARS]: [DUPLICATE] CXConsole::AddCommand(): console command [%s] is already registered", sCommand);
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-
-        return false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::AddCommand(const char* sCommand, const char* sScriptFunc, int nFlags, const char* sHelp)
-{
-    AssertName(sCommand);
-
-    if (m_mapCommands.find(sCommand) == m_mapCommands.end())
-    {
-        CConsoleCommand cmd;
-        cmd.m_sName = sCommand;
-        cmd.m_sCommand = sScriptFunc;
-        if (sHelp)
-        {
-            cmd.m_sHelp = sHelp;
-        }
-        cmd.m_nFlags = nFlags;
-        m_mapCommands.insert(std::make_pair(cmd.m_sName, cmd));
-
-        return true;
-    }
-    else
-    {
-        gEnv->pLog->LogError("[CVARS]: [DUPLICATE] CXConsole::AddCommand(): script command [%s] is already registered", sCommand);
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-        gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-
-        return false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::RemoveCommand(const char* sName)
-{
-    ConsoleCommandsMap::iterator ite = m_mapCommands.find(sName);
-    if (ite != m_mapCommands.end())
-    {
-        m_mapCommands.erase(ite);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline bool hasprefix(const char* s, const char* prefix)
-{
-    while (*prefix)
-    {
-        if (*prefix++ != *s++)
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CXConsole::GetFlagsString(const uint32 dwFlags)
-{
-    static char sFlags[256];
-
-    // hiding this makes it a bit more difficult for cheaters
-    //  if(dwFlags&VF_CHEAT)                  cry_strcat( sFlags,"CHEAT, ");
-
-    cry_strcpy(sFlags, "");
-
-    if (dwFlags & VF_READONLY)
-    {
-        cry_strcat(sFlags, "READONLY, ");
-    }
-    if (dwFlags & VF_DEPRECATED)
-    {
-        cry_strcat(sFlags, "DEPRECATED, ");
-    }
-    if (dwFlags & VF_DUMPTODISK)
-    {
-        cry_strcat(sFlags, "DUMPTODISK, ");
-    }
-    if (dwFlags & VF_REQUIRE_LEVEL_RELOAD)
-    {
-        cry_strcat(sFlags, "REQUIRE_LEVEL_RELOAD, ");
-    }
-    if (dwFlags & VF_REQUIRE_APP_RESTART)
-    {
-        cry_strcat(sFlags, "REQUIRE_APP_RESTART, ");
-    }
-    if (dwFlags & VF_RESTRICTEDMODE)
-    {
-        cry_strcat(sFlags, "RESTRICTEDMODE, ");
-    }
-
-    if (sFlags[0] != 0)
-    {
-        sFlags[strlen(sFlags) - 2] = 0;  // remove ending ", "
-    }
-    return sFlags;
-}
-
-#if ALLOW_AUDIT_CVARS
-void CXConsole::AuditCVars(IConsoleCmdArgs* pArg)
-{
-    int numArgs = pArg->GetArgCount();
-    int cheatMask = VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK;
-    int constMask = VF_CONST_CVAR;
-    int readOnlyMask = VF_READONLY;
-    int devOnlyMask = VF_DEV_ONLY;
-    int dediOnlyMask = VF_DEDI_ONLY;
-    int excludeMask = cheatMask | constMask | readOnlyMask | devOnlyMask | dediOnlyMask;
-
-    if (numArgs > 1)
-    {
-        while (numArgs > 1)
-        {
-            const char* arg = pArg->GetArg(numArgs - 1);
-
-            if (azstricmp(arg, "cheat") == 0)
-            {
-                excludeMask &= ~cheatMask;
-            }
-
-            if (azstricmp(arg, "const") == 0)
-            {
-                excludeMask &= ~constMask;
-            }
-
-            if (azstricmp(arg, "readonly") == 0)
-            {
-                excludeMask &= ~readOnlyMask;
-            }
-
-            if (azstricmp(arg, "dev") == 0)
-            {
-                excludeMask &= ~devOnlyMask;
-            }
-
-            if (azstricmp(arg, "dedi") == 0)
-            {
-                excludeMask &= ~dediOnlyMask;
-            }
-
-            --numArgs;
-        }
-    }
-
-    int commandCount = 0;
-    int cvarCount = 0;
-
-    CryLogAlways("[CVARS]: [BEGIN AUDIT]");
-
-    for (ConsoleCommandsMapItor it = m_mapCommands.begin(); it != m_mapCommands.end(); ++it)
-    {
-        CConsoleCommand& command = it->second;
-
-        int cheatFlags = (command.m_nFlags & cheatMask);
-        int devOnlyFlags = (command.m_nFlags & devOnlyMask);
-        int dediOnlyFlags = (command.m_nFlags & dediOnlyMask);
-        bool shouldLog = ((cheatFlags | devOnlyFlags | dediOnlyFlags) == 0) || (((cheatFlags | devOnlyFlags | dediOnlyFlags) & ~excludeMask) != 0);
-        if (shouldLog)
-        {
-            CryLogAlways("[CVARS]: [COMMAND] %s%s%s%s%s",
-                command.m_sName.c_str(),
-                (cheatFlags != 0) ? " [VF_CHEAT]" : "",
-                (devOnlyFlags != 0) ? " [VF_DEV_ONLY]" : "",
-                (dediOnlyFlags != 0) ? " [VF_DEDI_ONLY]" : "",
-                ""
-                );
-            ++commandCount;
-        }
-    }
-
-    for (ConsoleVariablesMapItor it = m_mapVariables.begin(); it != m_mapVariables.end(); ++it)
-    {
-        ICVar* pVariable = it->second;
-        int flags = pVariable->GetFlags();
-
-        int cheatFlags = (flags & cheatMask);
-        int constFlags = (flags & constMask);
-        int readOnlyFlags = (flags & readOnlyMask);
-        int devOnlyFlags = (flags & devOnlyMask);
-        int dediOnlyFlags = (flags & dediOnlyMask);
-        bool shouldLog = ((cheatFlags | constFlags | readOnlyFlags | devOnlyFlags | dediOnlyFlags) == 0) || (((cheatFlags | constFlags | readOnlyFlags | devOnlyFlags | dediOnlyFlags) & ~excludeMask) != 0);
-        if (shouldLog)
-        {
-            CryLogAlways("[CVARS]: [VARIABLE] %s%s%s%s%s%s%s",
-                pVariable->GetName(),
-                (cheatFlags != 0) ? " [VF_CHEAT]" : "",
-                (constFlags != 0) ? " [VF_CONST_CVAR]" : "",
-                (readOnlyFlags != 0) ? " [VF_READONLY]" : "",
-                (devOnlyFlags != 0) ? " [VF_DEV_ONLY]" : "",
-                (dediOnlyFlags != 0) ? " [VF_DEDI_ONLY]" : "",
-                ""
-                );
-            ++cvarCount;
-        }
-    }
-
-    CryLogAlways("[CVARS]: [END AUDIT] (commands %d/%" PRISIZE_T "; variables %d/%" PRISIZE_T ")", commandCount, m_mapCommands.size(), cvarCount, m_mapVariables.size());
-}
-#endif // ALLOW_AUDIT_CVARS
-
-//////////////////////////////////////////////////////////////////////////
-#ifndef _RELEASE
-void CXConsole::DumpCommandsVarsTxt(const char* prefix)
-{
-    FILE* f0 = nullptr;
-    azfopen(&f0, "consolecommandsandvars.txt", "w");
-
-    if (!f0)
-    {
-        return;
-    }
-
-    ConsoleCommandsMapItor itrCmd, itrCmdEnd = m_mapCommands.end();
-    ConsoleVariablesMapItor itrVar, itrVarEnd = m_mapVariables.end();
-
-    fprintf(f0, " CHEAT: stays in the default value if cheats are not disabled\n");
-    fprintf(f0, " REQUIRE_NET_SYNC: cannot be changed on client and when connecting it's sent to the client\n");
-    fprintf(f0, " SAVEGAME: stored when saving a savegame\n");
-    fprintf(f0, " READONLY: can not be changed by the user\n");
-    fprintf(f0, "-------------------------\n");
-    fprintf(f0, "\n");
-
-    for (itrCmd = m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
-    {
-        CConsoleCommand& cmd = itrCmd->second;
-
-        if (hasprefix(cmd.m_sName.c_str(), prefix))
-        {
-            const char* sFlags = GetFlagsString(cmd.m_nFlags);
-
-            fprintf(f0, "Command: %s %s\nscript: %s\nhelp: %s\n\n", cmd.m_sName.c_str(), sFlags, cmd.m_sCommand.c_str(), cmd.m_sHelp.c_str());
-        }
-    }
-
-    for (itrVar = m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
-    {
-        ICVar* var = itrVar->second;
-        const char* types[] = { "?", "int", "float", "string", "?" };
-
-        var->GetRealIVal();         // assert inside checks consistency for all cvars
-
-        if (hasprefix(var->GetName(), prefix))
-        {
-            const char* sFlags = GetFlagsString(var->GetFlags());
-
-            fprintf(f0, "variable: %s %s\ntype: %s\ncurrent: %s\nhelp: %s\n\n", var->GetName(), sFlags, types[var->GetType()], var->GetString(), var->GetHelp());
-        }
-    }
-
-    fclose(f0);
-
-    ConsoleLogInputResponse("successfully wrote consolecommandsandvars.txt");
-}
-
-void CXConsole::DumpVarsTxt(const bool includeCheat)
-{
-    FILE* f0 = nullptr;
-    azfopen(&f0, "consolevars.txt", "w");
-    if (!f0)
-    {
-        return;
-    }
-
-    ConsoleVariablesMapItor itrVar, itrVarEnd = m_mapVariables.end();
-
-    fprintf(f0, " REQUIRE_NET_SYNC: cannot be changed on client and when connecting it's sent to the client\n");
-    fprintf(f0, " SAVEGAME: stored when saving a savegame\n");
-    fprintf(f0, " READONLY: can not be changed by the user\n");
-    fprintf(f0, "-------------------------\n");
-    fprintf(f0, "\n");
-
-    for (itrVar = m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
-    {
-        ICVar* var = itrVar->second;
-        const char* types[] = { "?", "int", "float", "string", "?" };
-
-        var->GetRealIVal();         // assert inside checks consistency for all cvars
-        const int flags = var->GetFlags();
-
-        if ((includeCheat == true) || (flags & VF_CHEAT) == 0)
-        {
-            const char* sFlags = GetFlagsString(flags);
-            fprintf(f0, "variable: %s %s\ntype: %s\ncurrent: %s\nhelp: %s\n\n", var->GetName(), sFlags, types[var->GetType()], var->GetString(), var->GetHelp());
-        }
-    }
-
-    fclose(f0);
-
-    ConsoleLogInputResponse("successfully wrote consolevars.txt");
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::DisplayHelp(const char* help, const char* name)
-{
-    if (help == 0 || *help == 0)
-    {
-        ConsoleLogInputResponse("No help available for $3%s", name);
-    }
-    else
-    {
-        char* start, * pos;
-        for (pos = strstr((char*)help, "\n"), start = (char*)help; pos; start = ++pos)
-        {
-            string s = start;
-            s.resize(pos - start);
-            ConsoleLogInputResponse("    $3%s", s.c_str());
-            pos = strstr(pos, "\n");
-        }
-        ConsoleLogInputResponse("    $3%s", start);
-    }
-}
-
-
-void CXConsole::ExecuteString(const char* command, const bool bSilentMode, const bool bDeferExecution)
-{
-    if (!m_deferredExecution && !bDeferExecution)
-    {
-        // This is a regular mode
-        ExecuteStringInternal(command, false, bSilentMode);     // not from console
-
-        return;
-    }
-
-    // Store the string commands into a list and defer the execution for later.
-    // The commands will be processed in CXConsole::Update()
-    string str(command);
-    str.TrimLeft();
-
-    // Unroll the exec command
-    bool unroll = (0 == str.Left(strlen("exec")).compareNoCase("exec"));
-
-    if (unroll)
-    {
-        bool oldDeferredExecution = m_deferredExecution;
-
-        // Make sure that the unrolled commands are processed with deferred mode on
-        m_deferredExecution = true;
-        ExecuteStringInternal(str.c_str(), false, bSilentMode);
-
-        // Restore to the previous setting
-        m_deferredExecution = oldDeferredExecution;
-    }
-    else
-    {
-        m_deferredCommands.push_back(SDeferredCommand(str.c_str(), bSilentMode));
-    }
-}
-
-// This method is used by the ConsoleRequestBus to allow executing of console commands
-// This can be used from anywhere in code or via script since the bus is relected to the behavior context
-void CXConsole::ExecuteConsoleCommand(const char* command)
-{
-    ExecuteString(command, true, true);
-}
-
-void CXConsole::ResetCVarsToDefaults()
-{
-    ConsoleVariablesMapItor It = m_mapVariables.begin();
-
-    while (It != m_mapVariables.end())
-    {
-        It->second->Reset();
-        ++It;
-    }
-
-}
-
-void CXConsole::SplitCommands(const char* line, std::list<string>& split)
-{
-    const char* start = line;
-    string working;
-
-    while (true)
-    {
-        char ch = *line++;
-        switch (ch)
-        {
-        case '\'':
-        case '\"':
-            while ((*line++ != ch) && *line)
-            {
-                ;
-            }
-            break;
-        case '\n':
-        case '\r':
-        case ';':
-        case '\0':
-        {
-            working.assign(start, line - 1);
-            working.Trim();
-
-            if (!working.empty())
-            {
-                split.push_back(working);
-            }
-            start = line;
-
-            if (ch == '\0')
-            {
-                return;
-            }
-        }
-        break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ExecuteStringInternal(const char* command, const bool bFromConsole, const bool bSilentMode)
-{
-    AzFramework::ConsoleNotificationBus::Broadcast(&AzFramework::ConsoleNotificationBus::Events::OnConsoleCommandExecuted, command);
-
-    assert(command);
-    assert(command[0] != '\\');           // caller should remove leading "\\"
-
-    ///////////////////////////
-    //Execute as string
-    if (command[0] == '#' || command[0] == '@')
-    {
-        if (!con_restricted || !bFromConsole)            // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
-        {
-            AddLine(command);
-
-            if (m_pSystem->IsDevMode())
-            {
-                m_bDrawCursor = 0;
-            }
-            else
-            {
-                // Warning.
-                // No Cheat warnings. ConsoleWarning("Console execution is cheat protected");
-            }
-            return;
-        }
-    }
-
-    ConsoleCommandsMapItor itrCmd;
-    ConsoleVariablesMapItor itrVar;
-
-    std::list<string> lineCommands;
-    SplitCommands(command, lineCommands);
-
-    string sTemp;
-    string sCommand, sLineCommand;
-
-    while (!lineCommands.empty())
-    {
-        string::size_type nPos;
-
-        {
-            sTemp = lineCommands.front();
-            sCommand = lineCommands.front();
-            sLineCommand = sCommand;
-            lineCommands.pop_front();
-
-            if (!bSilentMode)
-            {
-                if (GetStatus())
-                {
-                    AddLine(sTemp);
-                }
-            }
-
-            nPos = sTemp.find_first_of('=');
-
-            if (nPos != string::npos)
-            {
-                sCommand = sTemp.substr(0, nPos);
-            }
-            else if ((nPos = sTemp.find_first_of(' ')) != string::npos)
-            {
-                sCommand = sTemp.substr(0, nPos);
-            }
-            else
-            {
-                sCommand = sTemp;
-            }
-
-            sCommand.Trim();
-
-            //////////////////////////////////////////
-            // Search for CVars
-            if (sCommand.length() > 1 && sCommand[0] == '?')
-            {
-                sTemp = sCommand.substr(1);
-                FindVar(sTemp.c_str());
-                continue;
-            }
-        }
-
-        //////////////////////////////////////////
-        //Check if is a command
-        itrCmd = m_mapCommands.find(sCommand);
-        if (itrCmd != m_mapCommands.end())
-        {
-            if (((itrCmd->second).m_nFlags & VF_RESTRICTEDMODE) || !con_restricted || !bFromConsole)           // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
-            {
-                if (itrCmd->second.m_nFlags & VF_BLOCKFRAME)
-                {
-                    m_blockCounter++;
-                }
-
-                {
-                    sTemp = sLineCommand;
-                }
-                ExecuteCommand((itrCmd->second), sTemp);
-
-                continue;
-            }
-        }
-
-        //////////////////////////////////////////
-        //Check  if is a variable
-        itrVar = m_mapVariables.find(sCommand);
-        if (itrVar != m_mapVariables.end())
-        {
-            ICVar* pCVar = itrVar->second;
-
-            if ((pCVar->GetFlags() & VF_RESTRICTEDMODE) || !con_restricted || !bFromConsole)           // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
-            {
-                if (pCVar->GetFlags() & VF_BLOCKFRAME)
-                {
-                    m_blockCounter++;
-                }
-
-                if (nPos != string::npos)
-                {
-                    sTemp = sTemp.substr(nPos + 1);     // remove the command from sTemp
-                    sTemp.Trim(" \t\r\n\"\'");
-
-                    if (sTemp == "?")
-                    {
-                        ICVar* v = itrVar->second;
-                        DisplayHelp(v->GetHelp(), sCommand.c_str());
-                        return;
-                    }
-
-                    if (!sTemp.empty() || (pCVar->GetType() == CVAR_STRING))
-                    {
-                        pCVar->Set(sTemp.c_str());
-                    }
-                }
-
-                // the following line calls AddLine() indirectly
-                if (!bSilentMode)
-                {
-                    DisplayVarValue(pCVar);
-                }
-                //ConsoleLogInputResponse("%s=%s",pCVar->GetName(),pCVar->GetString());
-                continue;
-            }
-        }
-
-        if (!bSilentMode)
-        {
-            ConsoleWarning("Unknown command: %s", sCommand.c_str());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ExecuteDeferredCommands()
-{
-    TDeferredCommandList::iterator it;
-
-    if (m_waitFrames)
-    {
-        --m_waitFrames;
-        return;
-    }
-
-    if (m_waitSeconds.GetValue())
-    {
-        if (m_waitSeconds > gEnv->pTimer->GetFrameStartTime())
-        {
-            return;
-        }
-
-        // Help to avoid overflow problems
-        m_waitSeconds.SetValue(0);
-    }
-
-    const int blockCounter = m_blockCounter;
-
-    // Signal the console that we executing a deferred command
-    //m_deferredExecution = true;
-
-    while (!m_deferredCommands.empty())
-    {
-        it = m_deferredCommands.begin();
-        ExecuteStringInternal(it->command.c_str(), false, it->silentMode);
-        m_deferredCommands.pop_front();
-
-        // A blocker command was executed
-        if (m_blockCounter != blockCounter)
-        {
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ExecuteCommand(CConsoleCommand& cmd, string& str, bool bIgnoreDevMode)
-{
-    CryLog ("[CONSOLE] Executing console command '%s'", str.c_str());
-    INDENT_LOG_DURING_SCOPE();
-
-    std::vector<string> args;
-    size_t t;
-
-    {
-        t = 1;
-
-        const char* start = str.c_str();
-        const char* commandLine = start;
-        while (char ch = *commandLine++)
-        {
-            switch (ch)
-            {
-            case '\'':
-            case '\"':
-            {
-                while ((*commandLine++ != ch) && *commandLine)
-                {
-                    ;
-                }
-                args.push_back(string(start + 1, commandLine - 1));
-                start = commandLine;
-                break;
-            }
-            case ' ':
-                start = commandLine;
-                break;
-            default:
-            {
-                if ((*commandLine == ' ') || !*commandLine)
-                {
-                    args.push_back(string(start, commandLine));
-                    start = commandLine + 1;
-                }
-            }
-            break;
-            }
-        }
-
-        if (args.size() >= 2 && args[1] == "?")
-        {
-            DisplayHelp(cmd.m_sHelp, cmd.m_sName.c_str());
-            return;
-        }
-
-        if (((cmd.m_nFlags & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0) && !(gEnv->IsEditor()))
-        {
-#if LOG_CVAR_INFRACTIONS
-            gEnv->pLog->LogError("[CVARS]: [EXECUTE] command %s is marked [VF_CHEAT]", cmd.m_sName.c_str());
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-            gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-#endif // LOG_CVAR_INFRACTIONS
-            if (!(gEnv->IsEditor()) && !(m_pSystem->IsDevMode()) && !bIgnoreDevMode)
-            {
-                return;
-            }
-        }
-    }
-
-    if (cmd.m_func)
-    {
-        // This is function command, execute it with a list of parameters.
-        CConsoleCommandArgs cmdArgs(str, args);
-        cmd.m_func(&cmdArgs);
-        return;
-    }
-
-    string buf;
-    {
-        // only do this for commands with script implementation
-        for (;; )
-        {
-            t = str.find_first_of("\\", t);
-            if (t == string::npos)
-            {
-                break;
-            }
-            str.replace(t, 1, "\\\\", 2);
-            t += 2;
-        }
-
-        for (t = 1;; )
-        {
-            t = str.find_first_of("\"", t);
-            if (t == string::npos)
-            {
-                break;
-            }
-            str.replace(t, 1, "\\\"", 2);
-            t += 2;
-        }
-
-        buf = cmd.m_sCommand;
-
-        size_t pp = buf.find("%%");
-        if (pp != string::npos)
-        {
-            string list = "";
-            for (unsigned int i = 1; i < args.size(); i++)
-            {
-                list += "\"" + args[i] + "\"";
-                if (i < args.size() - 1)
-                {
-                    list += ",";
-                }
-            }
-            buf.replace(pp, 2, list);
-        }
-        else if ((pp = buf.find("%line")) != string::npos)
-        {
-            string tmp = "\"" + str.substr(str.find(" ") + 1) + "\"";
-            if (args.size() > 1)
-            {
-                buf.replace(pp, 5, tmp);
-            }
-            else
-            {
-                buf.replace(pp, 5, "");
-            }
-        }
-        else
-        {
-            for (unsigned int i = 1; i <= args.size(); i++)
-            {
-                char pat[10];
-                azsprintf(pat, "%%%d", i);
-                size_t pos = buf.find(pat);
-                if (pos == string::npos)
-                {
-                    if (i != args.size())
-                    {
-                        ConsoleWarning("Too many arguments for: %s", cmd.m_sName.c_str());
-                        return;
-                    }
-                }
-                else
-                {
-                    if (i == args.size())
-                    {
-                        ConsoleWarning("Not enough arguments for: %s", cmd.m_sName.c_str());
-                        return;
-                    }
-                    string arg = "\"" + args[i] + "\"";
-                    buf.replace(pos, strlen(pat), arg);
-                }
-            }
-        }
-    }
-
-    m_bDrawCursor = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::Exit(const char* szExitComments, ...)
-{
-    char sResultMessageText[1024] = "";
-
-    if (szExitComments)
-    {
-        // make result string
-        va_list     arglist;
-        va_start(arglist, szExitComments);
-        vsprintf_s(sResultMessageText, szExitComments, arglist);
-        va_end(arglist);
-    }
-    else
-    {
-        azstrcpy(sResultMessageText, AZ_ARRAY_SIZE(sResultMessageText), "No comments from application");
-    }
-
-    CryFatalError("%s", sResultMessageText);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::RegisterAutoComplete(const char* sVarOrCommand, IConsoleArgumentAutoComplete* pArgAutoComplete)
-{
-    m_mapArgumentAutoComplete[sVarOrCommand] = pArgAutoComplete;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::UnRegisterAutoComplete(const char* sVarOrCommand)
-{
-    ArgumentAutoCompleteMap::iterator it;
-    it = m_mapArgumentAutoComplete.find(sVarOrCommand);
-    if (it != m_mapArgumentAutoComplete.end())
-    {
-        m_mapArgumentAutoComplete.erase(it);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ResetAutoCompletion()
-{
-    m_nTabCount = 0;
-    m_sPrevTab = "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CXConsole::ProcessCompletion(const char* szInputBuffer)
-{
-    m_sInputBuffer = szInputBuffer;
-
-    int offset = (szInputBuffer[0] == '\\' ? 1 : 0);        // legacy support
-
-    if ((m_sPrevTab.size() > strlen(szInputBuffer + offset)) || _strnicmp(m_sPrevTab.c_str(), (szInputBuffer + offset), m_sPrevTab.size()))
-    {
-        m_nTabCount = 0;
-        m_sPrevTab = "";
-    }
-
-    if (m_sInputBuffer.empty())
-    {
-        return (char*)m_sInputBuffer.c_str();
-    }
-
-    int nMatch = 0;
-    ConsoleCommandsMapItor itrCmds;
-    ConsoleVariablesMapItor itrVars;
-    bool showlist = !m_nTabCount && m_sPrevTab == "";
-
-    if (m_nTabCount == 0)
-    {
-        if (m_sInputBuffer.size() > 0)
-        {
-            if (m_sInputBuffer[0] == '\\')
-            {
-                m_sPrevTab = &m_sInputBuffer.c_str()[1];      // legacy support
-            }
-            else
-            {
-                m_sPrevTab = m_sInputBuffer;
-            }
-        }
-
-        else
-        {
-            m_sPrevTab = "";
-        }
-    }
-    //try to search in command list
-    bool bArgumentAutoComplete = false;
-    std::vector<string> matches;
-
-    if (m_sPrevTab.find(' ') != string::npos)
-    {
-        bool bProcessAutoCompl = true;
-
-        // Find command.
-        string sVar = m_sPrevTab.substr(0, m_sPrevTab.find(' '));
-        ICVar* pCVar = GetCVar(sVar);
-        if (pCVar)
-        {
-            if (!(pCVar->GetFlags() & VF_RESTRICTEDMODE) && con_restricted)            // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
-            {
-                bProcessAutoCompl = false;
-            }
-        }
-
-        ConsoleCommandsMap::iterator it = m_mapCommands.find(sVar);
-        if (it != m_mapCommands.end())
-        {
-            CConsoleCommand& ccmd = it->second;
-
-            if (!(ccmd.m_nFlags & VF_RESTRICTEDMODE) && con_restricted)            // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
-            {
-                bProcessAutoCompl = false;
-            }
-        }
-
-        if (bProcessAutoCompl)
-        {
-            IConsoleArgumentAutoComplete* pArgumentAutoComplete = stl::find_in_map(m_mapArgumentAutoComplete, sVar, 0);
-            if (pArgumentAutoComplete)
-            {
-                int nMatches = pArgumentAutoComplete->GetCount();
-                for (int i = 0; i < nMatches; i++)
-                {
-                    string cmd = string(sVar) + " " + pArgumentAutoComplete->GetValue(i);
-                    if (_strnicmp(m_sPrevTab.c_str(), cmd.c_str(), m_sPrevTab.length()) == 0)
-                    {
-                        {
-                            bArgumentAutoComplete = true;
-                            matches.push_back(cmd);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (!bArgumentAutoComplete)
-    {
-        itrCmds = m_mapCommands.begin();
-        while (itrCmds != m_mapCommands.end())
-        {
-            CConsoleCommand& cmd = itrCmds->second;
-
-            if ((cmd.m_nFlags & VF_RESTRICTEDMODE) || !con_restricted)         // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
-            {
-                if (_strnicmp(m_sPrevTab.c_str(), itrCmds->first.c_str(), m_sPrevTab.length()) == 0)
-                {
-                    {
-                        matches.push_back((char* const)itrCmds->first.c_str());
-                    }
-                }
-            }
-            ++itrCmds;
-        }
-
-        // try to search in console variables
-
-        itrVars = m_mapVariables.begin();
-        while (itrVars != m_mapVariables.end())
-        {
-            ICVar* pVar = itrVars->second;
-
-            if ((pVar->GetFlags() & VF_RESTRICTEDMODE) || !con_restricted)         // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
-            {//if(itrVars->first.compare(0,m_sPrevTab.length(),m_sPrevTab)==0)
-                if (_strnicmp(m_sPrevTab.c_str(), itrVars->first, m_sPrevTab.length()) == 0)
-                {
-                    {
-                        matches.push_back((char* const)itrVars->first);
-                    }
-                }
-            }
-            ++itrVars;
-        }
-    }
-
-    if (!matches.empty())
-    {
-        std::sort(matches.begin(), matches.end(), less_CVar);       // to sort commands with variables
-    }
-    if (showlist && !matches.empty())
-    {
-        ConsoleLogInput(" ");       // empty line before auto completion
-
-        for (std::vector<string>::iterator i = matches.begin(); i != matches.end(); ++i)
-        {
-            // List matching variables
-            const char* sVar = *i;
-            ICVar* pVar = GetCVar(sVar);
-
-            if (pVar)
-            {
-                DisplayVarValue(pVar);
-            }
-            else
-            {
-                ConsoleLogInputResponse("    $3%s $6(Command)", sVar);
-            }
-        }
-    }
-
-    for (std::vector<string>::iterator i = matches.begin(); i != matches.end(); ++i)
-    {
-        if (m_nTabCount <= nMatch)
-        {
-            m_sInputBuffer = *i;
-            m_sInputBuffer += " ";
-            m_nTabCount = nMatch + 1;
-            return (char*)m_sInputBuffer.c_str();
-        }
-        nMatch++;
-    }
-
-    if (m_nTabCount > 0)
-    {
-        m_nTabCount = 0;
-        m_sInputBuffer = m_sPrevTab;
-        m_sInputBuffer = ProcessCompletion(m_sInputBuffer.c_str());
-    }
-
-    return (char*)m_sInputBuffer.c_str();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::DisplayVarValue(ICVar* pVar)
-{
-    if (!pVar)
-    {
-        return;
-    }
-
-    const char* sFlagsString = GetFlagsString(pVar->GetFlags());
-
-    string sValue = (pVar->GetFlags() & VF_INVISIBLE) ? "" : pVar->GetString();
-    string sVar = pVar->GetName();
-
-    char szRealState[40] = "";
-
-    if (pVar->GetType() == CVAR_INT)
-    {
-        int iRealState = pVar->GetRealIVal();
-
-        if (iRealState != pVar->GetIVal())
-        {
-            if (iRealState == -1)
-            {
-                azstrcpy(szRealState, AZ_ARRAY_SIZE(szRealState), " RealState=Custom");
-            }
-            else
-            {
-                sprintf_s(szRealState, " RealState=%d", iRealState);
-            }
-        }
-    }
-
-    if (pVar->GetFlags() & VF_BITFIELD)
-    {
-        uint64 val64 = pVar->GetI64Val();
-        uint64 alphaBits = val64 & ~63LL;
-        uint32 nonAlphaBits = val64 & 63;
-
-        if (alphaBits != 0)
-        {
-            // the bottom 6 bits can't be set by char entry, so show them separately
-            char alphaChars[65];    // 1 char per bit + '\0'
-            BitsAlpha64(alphaBits, alphaChars);
-            sValue += " (";
-            if (nonAlphaBits != 0)
-            {
-                char nonAlphaChars[3];  // 1..63 + '\0'
-                sValue += azitoa(nonAlphaBits, nonAlphaChars, AZ_ARRAY_SIZE(nonAlphaChars), 10);
-                sValue += ", ";
-            }
-            sValue += alphaChars;
-            sValue += ")";
-        }
-    }
-
-    if (gEnv->IsEditor())
-    {
-        ConsoleLogInputResponse("%s=%s [ %s ]%s", sVar.c_str(), sValue.c_str(), sFlagsString, szRealState);
-    }
-    else
-    {
-        ConsoleLogInputResponse("    $3%s = $6%s $5[%s]$4%s", sVar.c_str(), sValue.c_str(), sFlagsString, szRealState);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::IsOpened()
-{
-    return m_nScrollPos == m_nTempScrollMax;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::PrintLine(const char* s)
-{
-    AddLine(s);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::PrintLinePlus(const char* s)
-{
-    AddLinePlus(s);
-}
-
-static const char* FindNextEndOfLineCharacter(const char* str, size_t length)
-{
-    size_t index = 0;
-    while (index < length)
-    {
-        if ((str[index] == '\r') || (str[index] == '\n'))
-        {
-            return (str + index);
-        }
-
-        index++;
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::AddLine(const char* inputStr)
-{
-    if ((inputStr == nullptr) || (inputStr[0] == 0))
-    {
-        return;
-    }
-
-    size_t totalLen = strlen(inputStr);
-
-    // strip trailing \n or \r.
-    while ((totalLen > 0) && (inputStr[totalLen - 1] == '\n') || (inputStr[totalLen - 1] == '\r'))
-    {
-        totalLen--;
-    }
-
-    // split out each line in a memory efficient way
-    size_t remainingLength = totalLen;
-    const char* lastLine = inputStr;
-    const char* cursor = FindNextEndOfLineCharacter(inputStr, remainingLength);
-    while (cursor != nullptr)
-    {
-        size_t subStrLength = (cursor - lastLine);
-
-        PostLine(lastLine, subStrLength);
-
-        // bump us up to the cursor + 1 to move past the end of line character
-        remainingLength = remainingLength - (subStrLength + 1);
-        lastLine = (cursor + 1);
-
-        // Find the next non-end of line character
-        while ((remainingLength > 0) && ((*lastLine == '\n') || (*lastLine == '\r')))
-        {
-            remainingLength--;
-            lastLine++;
-        }
-
-        cursor = FindNextEndOfLineCharacter(lastLine, remainingLength);
-    }
-
-    // check for leftover
-    if (remainingLength > 0)
-    {
-        PostLine(lastLine, remainingLength);
-    }
-}
-
-void CXConsole::PostLine(const char* lineOfText, size_t len)
-{
-    string line;
-
-    {
-        line = string(lineOfText, len);
-        m_dqConsoleBuffer.push_back(line);
-    }
-
-    int nBufferSize = con_line_buffer_size;
-
-    while (((int)(m_dqConsoleBuffer.size())) > nBufferSize)
-    {
-        m_dqConsoleBuffer.pop_front();
-    }
-
-    // tell everyone who is interested (e.g. dedicated server printout)
-    {
-        std::vector<IOutputPrintSink*>::iterator it;
-
-        for (it = m_OutputSinks.begin(); it != m_OutputSinks.end(); ++it)
-        {
-            (*it)->Print(line.c_str());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ResetProgressBar(int)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::TickProgressBar()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::SetLoadingImage(const char*)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::AddOutputPrintSink(IOutputPrintSink* inpSink)
-{
-    assert(inpSink);
-    m_OutputSinks.push_back(inpSink);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::RemoveOutputPrintSink(IOutputPrintSink* inpSink)
-{
-    assert(inpSink);
-
-    int nCount = m_OutputSinks.size();
-
-    for (int i = 0; i < nCount; i++)
-    {
-        if (m_OutputSinks[i] == inpSink)
-        {
-            if (nCount <= 1)
-            {
-                m_OutputSinks.clear();
-            }
-            else
-            {
-                m_OutputSinks[i] = m_OutputSinks.back();
-                m_OutputSinks.pop_back();
-            }
-            return;
-        }
-    }
-
-    assert(0);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::AddLinePlus(const char* inputStr)
-{
-    string str, tmpStr;
-
-    {
-        if (!m_dqConsoleBuffer.size())
-        {
-            return;
-        }
-
-        str = inputStr;
-
-        // strip trailing \n or \r.
-        if (!str.empty() && (str[str.size() - 1] == '\n' || str[str.size() - 1] == '\r'))
-        {
-            str.resize(str.size() - 1);
-        }
-
-        string::size_type nPos;
-        while ((nPos = str.find('\n')) != string::npos)
-        {
-            str.replace(nPos, 1, 1, ' ');
-        }
-
-        while ((nPos = str.find('\r')) != string::npos)
-        {
-            str.replace(nPos, 1, 1, ' ');
-        }
-
-        tmpStr = m_dqConsoleBuffer.back();// += str;
-
-        m_dqConsoleBuffer.pop_back();
-
-        if (tmpStr.size() < 256)
-        {
-            m_dqConsoleBuffer.push_back(tmpStr + str);
-        }
-        else
-        {
-            m_dqConsoleBuffer.push_back(tmpStr);
-        }
-    }
-
-    // tell everyone who is interested (e.g. dedicated server printout)
-    {
-        std::vector<IOutputPrintSink*>::iterator it;
-
-        for (it = m_OutputSinks.begin(); it != m_OutputSinks.end(); ++it)
-        {
-            (*it)->Print((tmpStr + str).c_str());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::AddInputUTF8(const AZStd::string& textUTF8)
-{
-    // Ignore control characters like backspace and tab
-    AZStd::string textUTF8ToInsert;
-    for (int i = 0; i < textUTF8.length(); ++i)
-    {
-        const char charToInsert = textUTF8.at(i);
-        if (!AZStd::is_cntrl(charToInsert))
-        {
-            textUTF8ToInsert += charToInsert;
-        }
-    }
-
-    const char* utf8_buf = textUTF8ToInsert.c_str();
-
-    if (m_nCursorPos < (int)(m_sInputBuffer.length()))
-    {
-        m_sInputBuffer.insert(m_nCursorPos, utf8_buf);
-    }
-    else
-    {
-        m_sInputBuffer = m_sInputBuffer + utf8_buf;
-    }
-    m_nCursorPos += strlen(utf8_buf);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ExecuteInputBuffer()
-{
-    string sTemp = m_sInputBuffer;
-    if (m_sInputBuffer.empty())
-    {
-        return;
-    }
-    m_sInputBuffer = "";
-
-    AddCommandToHistory(sTemp.c_str());
-
-    {
-        ExecuteStringInternal(sTemp.c_str(), true);     // from console
-    }
-
-    m_nCursorPos = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::RemoveInputChar(bool bBackSpace)
-{
-    if (m_sInputBuffer.empty())
-    {
-        return;
-    }
-
-    if (bBackSpace)
-    {
-        if (m_nCursorPos > 0)
-        {
-            const char* const pBase = m_sInputBuffer.c_str();
-            const char* pCursor = pBase + m_nCursorPos;
-            const char* const pEnd = pCursor;
-            Unicode::CIterator<const char*, false> pUnicode(pCursor);
-            pUnicode--; // Remove one UCS code-point, doesn't account for combining diacritics
-            pCursor = pUnicode.GetPosition();
-            size_t length = pEnd - pCursor;
-            m_sInputBuffer.erase(pCursor - pBase, length);
-            m_nCursorPos -= length;
-        }
-    }
-    else
-    {
-        if (m_nCursorPos < (int)(m_sInputBuffer.length()))
-        {
-            const char* const pBase = m_sInputBuffer.c_str();
-            const char* pCursor = pBase + m_nCursorPos;
-            const char* const pBegin = pCursor;
-            Unicode::CIterator<const char*, false> pUnicode(pCursor);
-            pUnicode--; // Remove one UCS code-point, doesn't account for combining diacritics
-            pCursor = pUnicode.GetPosition();
-            size_t length = pCursor - pBegin;
-            m_sInputBuffer.erase(pBegin - pBase, length);
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::AddCommandToHistory(const char* szCommand)
-{
-    assert(szCommand);
-
-    m_nHistoryPos = -1;
-
-    if (!m_dqHistory.empty())
-    {
-        // add only if the command is != than the last
-        if (m_dqHistory.front() != szCommand)
-        {
-            m_dqHistory.push_front(szCommand);
-        }
-    }
-    else
-    {
-        m_dqHistory.push_front(szCommand);
-    }
-
-    while (m_dqHistory.size() > MAX_HISTORY_ENTRIES)
-    {
-        m_dqHistory.pop_back();
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::Copy()
-{
-#ifdef AZ_PLATFORM_WINDOWS
-    if (m_sInputBuffer.empty())
-    {
-        return;
-    }
-
-    if (!OpenClipboard(NULL))
-    {
-        return;
-    }
-
-    size_t stringLength = m_sInputBuffer.length();
-    size_t requiredBufferSize = stringLength + 1; // for the null
-
-    if (HGLOBAL hGlobal = GlobalAlloc(GHND, requiredBufferSize))
-    {
-        if (LPVOID  pGlobal = GlobalLock(hGlobal))
-        {
-            azstrcpy((char*)pGlobal, requiredBufferSize, m_sInputBuffer.c_str());
-            GlobalUnlock(hGlobal);
-            EmptyClipboard();
-            SetClipboardData(CF_TEXT, hGlobal);
-            CloseClipboard();
-        }
-    }
-
-    return;
-#endif //AZ_PLATFORM_WINDOWS
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::Paste()
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    if (OpenClipboard(NULL) != 0)
-    {
-        wstring data;
-        const HANDLE wideData = GetClipboardData(CF_UNICODETEXT);
-        if (wideData)
-        {
-            const LPCWSTR pWideData = (LPCWSTR)GlobalLock(wideData);
-            if (pWideData)
-            {
-                // Note: This conversion is just to make sure we discard malicious or malformed data
-                Unicode::ConvertSafe<Unicode::eErrorRecovery_Discard>(data, pWideData);
-                GlobalUnlock(wideData);
-            }
-        }
-        CloseClipboard();
-
-        for (Unicode::CIterator<wstring::const_iterator> it(data.begin(), data.end()); it != data.end(); ++it)
-        {
-            const uint32 cp = *it;
-            if (cp != '\r')
-            {
-                // Convert UCS code-point into UTF-8 string
-                char utf8_buf[5];
-                Unicode::Convert(utf8_buf, cp);
-                AddInputUTF8(utf8_buf);
-            }
-        }
-    }
-#endif //AZ_PLATFORM_WINDOWS
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-int CXConsole::GetNumVars()
-{
-    return (int)m_mapVariables.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CXConsole::GetNumVisibleVars()
-{
-    int numVars = 0;
-
-    for (auto& v : m_mapVariables)
-    {
-        if ((v.second->GetFlags() & VF_INVISIBLE) == 0)
-            ++numVars;
-    }
-
-    return numVars;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::IsHashCalculated()
-{
-    return m_bCheatHashDirty == false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CXConsole::GetNumCheatVars()
-{
-    return m_randomCheckedVariables.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint64 CXConsole::GetCheatVarHash()
-{
-    return m_nCheatHash;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::SetCheatVarHashRange(size_t firstVar, size_t lastVar)
-{
-    // check inputs are sane
-#if !defined(NDEBUG)
-    size_t numVars = GetNumCheatVars();
-    assert(firstVar < numVars && lastVar < numVars && lastVar >= firstVar);
-#endif
-
-#if defined(DEFENCE_CVAR_HASH_LOGGING)
-    if (m_bCheatHashDirty)
-    {
-        CryLog("HASHING: WARNING - trying to set up new cvar hash range while existing hash still calculating!");
-    }
-#endif
-
-    m_nCheatHashRangeFirst = firstVar;
-    m_nCheatHashRangeLast = lastVar;
-    m_bCheatHashDirty = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::CalcCheatVarHash()
-{
-    if (!m_bCheatHashDirty)
-    {
-        return;
-    }
-
-    CCrc32 runningNameCrc32;
-    CCrc32 runningNameValueCrc32;
-
-    AddCVarsToHash(m_randomCheckedVariables.begin() + m_nCheatHashRangeFirst, m_randomCheckedVariables.begin() + m_nCheatHashRangeLast, runningNameCrc32, runningNameValueCrc32);
-    AddCVarsToHash(m_alwaysCheckedVariables.begin(), m_alwaysCheckedVariables.end() - 1, runningNameCrc32, runningNameValueCrc32);
-
-    // store hash
-    m_nCheatHash = (((uint64)runningNameCrc32.Get()) << 32) | runningNameValueCrc32.Get();
-    m_bCheatHashDirty = false;
-
-#if defined(DEFENCE_CVAR_HASH_LOGGING)
-    if (!gEnv->IsDedicated())
-    {
-        CryLog("HASHING: Range %d->%d = %llx(%x,%x), max cvars = %d", m_nCheatHashRangeFirst, m_nCheatHashRangeLast,
-            m_nCheatHash, runningNameCrc32.Get(), runningNameValueCrc32.Get(),
-            GetNumCheatVars());
-        PrintCheatVars(true);
-    }
-#endif
-}
-
-void CXConsole::AddCVarsToHash(ConsoleVariablesVector::const_iterator begin, ConsoleVariablesVector::const_iterator end, CCrc32& runningNameCrc32, CCrc32& runningNameValueCrc32)
-{
-    for (ConsoleVariablesVector::const_iterator it = begin; it <= end; ++it)
-    {
-        // add name & variable to string. We add both since adding only the value could cause
-        // many collisions with variables all having value 0 or all 1.
-        string hashStr = it->first;
-
-        runningNameCrc32.Add(hashStr.c_str(), hashStr.length());
-        hashStr += it->second->GetDataProbeString();
-        runningNameValueCrc32.Add(hashStr.c_str(), hashStr.length());
-    }
-}
-
-void CXConsole::CmdDumpAllAnticheatVars([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-#if defined(DEFENCE_CVAR_HASH_LOGGING)
-    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
-
-    if (pConsole->IsHashCalculated())
-    {
-        CryLog("HASHING: Displaying Full Anticheat Cvar list:");
-        pConsole->PrintCheatVars(false);
-    }
-    else
-    {
-        CryLogAlways("DumpAllAnticheatVars - cannot complete, cheat vars are in a state of flux, please retry.");
-    }
-#endif
-}
-
-void CXConsole::CmdDumpLastHashedAnticheatVars([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-#if defined(DEFENCE_CVAR_HASH_LOGGING)
-    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
-
-    if (pConsole->IsHashCalculated())
-    {
-        CryLog("HASHING: Displaying Last Hashed Anticheat Cvar list:");
-        pConsole->PrintCheatVars(true);
-    }
-    else
-    {
-        CryLogAlways("DumpLastHashedAnticheatVars - cannot complete, cheat vars are in a state of flux, please retry.");
-    }
-#endif
-}
-
-void CXConsole::PrintCheatVars([[maybe_unused]] bool bUseLastHashRange)
-{
-#if defined(DEFENCE_CVAR_HASH_LOGGING)
-    if (m_bCheatHashDirty)
-    {
-        return;
-    }
-
-    size_t i = 0;
-    char floatFormatBuf[64];
-
-    size_t nStart = 0;
-    size_t nEnd = m_mapVariables.size();
-
-    if (bUseLastHashRange)
-    {
-        nStart = m_nCheatHashRangeFirst;
-        nEnd = m_nCheatHashRangeLast;
-    }
-
-    // iterate over all const cvars in our range
-    // then hash the string.
-    CryLog("VF_CHEAT & ~VF_CHEAT_NOCHECK list:");
-
-    ConsoleVariablesMap::const_iterator it, end = m_mapVariables.end();
-    for (it = m_mapVariables.begin(); it != end; ++it)
-    {
-        // only count cheat cvars
-        if ((it->second->GetFlags() & VF_CHEAT) == 0 ||
-            (it->second->GetFlags() & VF_CHEAT_NOCHECK) != 0)
-        {
-            continue;
-        }
-
-        // count up
-        i++;
-
-        // if we haven't reached the first var, or have passed the last var, break out
-        if (i - 1 < nStart)
-        {
-            continue;
-        }
-        if (i - 1 > nEnd)
-        {
-            break;
-        }
-
-        // add name & variable to string. We add both since adding only the value could cause
-        // many collisions with variables all having value 0 or all 1.
-        string hashStr = it->first;
-        if (it->second->GetType() == CVAR_FLOAT)
-        {
-            sprintf(floatFormatBuf, "%.1g", it->second->GetFVal());
-            hashStr += floatFormatBuf;
-        }
-        else
-        {
-            hashStr += it->second->GetString();
-        }
-
-        CryLog("%s", hashStr.c_str());
-    }
-
-    // iterate over any must-check variables
-    CryLog("VF_CHEAT_ALWAYS_CHECK list:");
-
-    for (it = m_mapVariables.begin(); it != end; ++it)
-    {
-        // only count cheat cvars
-        if ((it->second->GetFlags() & VF_CHEAT_ALWAYS_CHECK) == 0)
-        {
-            continue;
-        }
-
-        // add name & variable to string. We add both since adding only the value could cause
-        // many collisions with variables all having value 0 or all 1.
-        string hashStr = it->first;
-        hashStr += it->second->GetString();
-
-        CryLog("%s", hashStr.c_str());
-    }
-#endif
-}
-
-char* CXConsole::GetCheatVarAt(uint32 nOffset)
-{
-    if (m_bCheatHashDirty)
-    {
-        return NULL;
-    }
-
-    size_t i = 0;
-    size_t nStart = nOffset;
-
-    // iterate over all const cvars in our range
-    // then hash the string.
-    ConsoleVariablesMap::const_iterator it, end = m_mapVariables.end();
-    for (it = m_mapVariables.begin(); it != end; ++it)
-    {
-        // only count cheat cvars
-        if ((it->second->GetFlags() & VF_CHEAT) == 0 ||
-            (it->second->GetFlags() & VF_CHEAT_NOCHECK) != 0)
-        {
-            continue;
-        }
-
-        // count up
-        i++;
-
-        // if we haven't reached the first var continue
-        if (i - 1 < nStart)
-        {
-            continue;
-        }
-
-        return (char*)it->first;
-    }
-
-    return NULL;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-size_t CXConsole::GetSortedVars(const char** pszArray, size_t numItems, const char* szPrefix)
-{
-    size_t i = 0;
-    size_t iPrefixLen = szPrefix ? strlen(szPrefix) : 0;
-
-    // variables
-    {
-        ConsoleVariablesMap::const_iterator it, end = m_mapVariables.end();
-        for (it = m_mapVariables.begin(); it != end; ++it)
-        {
-            if (pszArray && i >= numItems)
-            {
-                break;
-            }
-
-            if (szPrefix)
-            {
-                if (_strnicmp(it->first, szPrefix, iPrefixLen) != 0)
-                {
-                    continue;
-                }
-            }
-
-            if (it->second->GetFlags() & VF_INVISIBLE)
-            {
-                continue;
-            }
-
-            if (pszArray)
-            {
-                pszArray[i] = it->first;
-            }
-
-            i++;
-        }
-    }
-
-    // commands
-    {
-        ConsoleCommandsMap::iterator it, end = m_mapCommands.end();
-        for (it = m_mapCommands.begin(); it != end; ++it)
-        {
-            if (pszArray && i >= numItems)
-            {
-                break;
-            }
-
-            if (szPrefix)
-            {
-                if (_strnicmp(it->first.c_str(), szPrefix, iPrefixLen) != 0)
-                {
-                    continue;
-                }
-            }
-
-            if (it->second.m_nFlags & VF_INVISIBLE)
-            {
-                continue;
-            }
-
-            if (pszArray)
-            {
-                pszArray[i] = it->first.c_str();
-            }
-
-            i++;
-        }
-    }
-
-    if (i != 0 && pszArray)
-    {
-        std::sort(pszArray, pszArray + i, less_CVar);
-    }
-
-    return i;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::FindVar(const char* substr)
-{
-    std::vector<const char*> cmds;
-    cmds.resize(GetNumVars() + m_mapCommands.size());
-    size_t cmdCount = GetSortedVars(&cmds[0], cmds.size());
-
-    for (size_t i = 0; i < cmdCount; i++)
-    {
-        if (CryStringUtils::stristr(cmds[i], substr))
-        {
-            ICVar* pCvar = gEnv->pConsole->GetCVar(cmds[i]);
-            if (pCvar)
-            {
-                DisplayVarValue(pCvar);
-            }
-            else
-            {
-                ConsoleLogInputResponse("    $3%s $6(Command)", cmds[i]);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CXConsole::AutoComplete(const char* substr)
-{
-    // following code can be optimized
-
-    std::vector<const char*> cmds;
-    cmds.resize(GetNumVars() + m_mapCommands.size());
-    size_t cmdCount = GetSortedVars(&cmds[0], cmds.size());
-
-    size_t substrLen = strlen(substr);
-
-    // If substring is empty return first command.
-    if (substrLen == 0 && cmdCount > 0)
-    {
-        return cmds[0];
-    }
-
-    // find next
-    for (size_t i = 0; i < cmdCount; i++)
-    {
-        const char* szCmd = cmds[i];
-        size_t cmdlen = strlen(szCmd);
-        if (cmdlen >= substrLen && memcmp(szCmd, substr, substrLen) == 0)
-        {
-            if (substrLen == cmdlen)
-            {
-                i++;
-                if (i < cmdCount)
-                {
-                    return cmds[i];
-                }
-                return cmds[i - 1];
-            }
-            return cmds[i];
-        }
-    }
-
-    // then first matching case insensitive
-    for (size_t i = 0; i < cmdCount; i++)
-    {
-        const char* szCmd = cmds[i];
-
-        size_t cmdlen = strlen(szCmd);
-        if (cmdlen >= substrLen && azmemicmp(szCmd, substr, substrLen) == 0)
-        {
-            if (substrLen == cmdlen)
-            {
-                i++;
-                if (i < cmdCount)
-                {
-                    return cmds[i];
-                }
-                return cmds[i - 1];
-            }
-            return cmds[i];
-        }
-    }
-
-    // Not found.
-    return "";
-}
-
-void CXConsole::SetInputLine(const char* szLine)
-{
-    assert(szLine);
-
-    m_sInputBuffer = szLine;
-    m_nCursorPos = m_sInputBuffer.size();
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-const char* CXConsole::AutoCompletePrev(const char* substr)
-{
-    std::vector<const char*> cmds;
-    cmds.resize(GetNumVars() + m_mapCommands.size());
-    size_t cmdCount = GetSortedVars(&cmds[0], cmds.size());
-
-    // If substring is empty return last command.
-    if (strlen(substr) == 0 && cmds.size() > 0)
-    {
-        return cmds[cmdCount - 1];
-    }
-
-    for (unsigned int i = 0; i < cmdCount; i++)
-    {
-        if (azstricmp(substr, cmds[i]) == 0)
-        {
-            if (i > 0)
-            {
-                return cmds[i - 1];
-            }
-            else
-            {
-                return cmds[0];
-            }
-        }
-    }
-    return AutoComplete(substr);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline size_t sizeOf (const string& str)
-{
-    return str.capacity() + 1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline size_t sizeOf (const char* sz)
-{
-    return sz ? strlen(sz) + 1 : 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::GetMemoryUsage (class ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_sInputBuffer);
-    pSizer->AddObject(m_sPrevTab);
-    pSizer->AddObject(m_dqConsoleBuffer);
-    pSizer->AddObject(m_dqHistory);
-    pSizer->AddObject(m_mapCommands);
-    pSizer->AddObject(m_mapBinds);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ConsoleLogInputResponse(const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    gEnv->pLog->LogV(ILog::eInputResponse, format, args);
-    va_end(args);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ConsoleLogInput(const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    gEnv->pLog->LogV(ILog::eInput, format, args);
-    va_end(args);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ConsoleWarning(const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    gEnv->pLog->LogV(ILog::eWarningAlways, format, args);
-    va_end(args);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::OnBeforeVarChange(ICVar* pVar, const char* sNewValue)
-{
-    bool isConst = pVar->IsConstCVar();
-    bool isCheat = ((pVar->GetFlags() & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0);
-    bool isReadOnly = ((pVar->GetFlags() & VF_READONLY) != 0);
-    bool isDeprecated = ((pVar->GetFlags() & VF_DEPRECATED) != 0);
-
-    if (
-#if CVAR_GROUPS_ARE_PRIVILEGED
-        !m_bIsProcessingGroup &&
-#endif // !CVAR_GROUPS_ARE_PRIVILEGED
-        (isConst || isCheat || isReadOnly || isDeprecated))
-    {
-        bool allowChange = !isDeprecated && ((gEnv->pSystem->IsDevMode()) || (gEnv->IsEditor()));
-        if (!(gEnv->IsEditor()) || isDeprecated)
-        {
-#if LOG_CVAR_INFRACTIONS
-            LogChangeMessage(pVar->GetName(), isConst, isCheat,
-                isReadOnly, isDeprecated, pVar->GetString(), sNewValue, m_bIsProcessingGroup, allowChange);
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-            gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-#endif // LOG_CVAR_INFRACTIONS
-        }
-
-        if (!allowChange && !ALLOW_CONST_CVAR_MODIFICATIONS)
-        {
-            return false;
-        }
-    }
-
-    if (!m_consoleVarSinks.empty())
-    {
-        ConsoleVarSinks::iterator it, next;
-        for (it = m_consoleVarSinks.begin(); it != m_consoleVarSinks.end(); it = next)
-        {
-            next = it;
-            next++;
-            if (!(*it)->OnBeforeVarChange(pVar, sNewValue))
-            {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::OnAfterVarChange(ICVar* pVar)
-{
-    if (!m_consoleVarSinks.empty())
-    {
-        ConsoleVarSinks::iterator it, next;
-        for (it = m_consoleVarSinks.begin(); it != m_consoleVarSinks.end(); it = next)
-        {
-            next = it;
-            next++;
-            (*it)->OnAfterVarChange(pVar);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole_ExecuteCommandTrampoline(IConsoleCmdArgs* args)
-{
-    if (gEnv && gEnv->pSystem && gEnv->pSystem->GetIConsole())
-    {
-        CXConsole* pConsole = static_cast<CXConsole*>(gEnv->pSystem->GetIConsole());
-        pConsole->ExecuteRegisteredCommand(args);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::ExecuteRegisteredCommand(IConsoleCmdArgs* args)
-{
-    if (args->GetArgCount() == 0)
-    {
-        AZ_Error("console", false, "Invalid number of args sent");
-        return;
-    }
-
-    const char* commandIdentifier = args->GetArg(0);
-    auto itCommandEntry = m_commandRegistrationMap.find(commandIdentifier);
-    if (itCommandEntry == m_commandRegistrationMap.end())
-    {
-        AZ_Error("console", false, "Command %s not found in the command registry", commandIdentifier);
-        return;
-    }
-
-    AZStd::vector<AZStd::string_view> input;
-    input.reserve(args->GetArgCount());
-    for (int i = 0; i < args->GetArgCount(); ++i)
-    {
-        input.push_back(args->GetArg(i));
-    }
-
-    CommandRegistrationEntry& entry = itCommandEntry->second;
-    const AzFramework::CommandResult output = entry.m_callback(input);
-    if (output != AzFramework::CommandResult::Success)
-    {
-        if (output == AzFramework::CommandResult::ErrorWrongNumberOfArguments)
-        {
-            AZ_Warning("console", false, "Command does not have the right number of arguments (send = %d)", input.size());
-        }
-        else
-        {
-            AZ_Warning("console", false, "Command returned a generic error");
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::RegisterCommand(AZStd::string_view identifier, AZStd::string_view helpText, AZ::u32 commandFlags, AzFramework::CommandFunction callback)
-{
-    if (identifier.empty())
-    {
-        AZ_Error("console", false, "RegisterCommand() requires a valid identifier");
-        return false;
-    }
-
-    if (!callback)
-    {
-        AZ_Error("console", false, "RegisterCommand() requires a valid callback");
-        return false;
-    }
-
-    if (m_commandRegistrationMap.find(identifier) != m_commandRegistrationMap.end())
-    {
-        AZ_Warning("console", false, "Command '%.*s' already found in the command registry.", static_cast<int>(identifier.size()), identifier.data());
-        return false;
-    }
-
-    // command flags should match "enum EVarFlags" values
-    const int flags = static_cast<int>(commandFlags);
-
-    CommandRegistrationEntry entry;
-    entry.m_callback = callback;
-    entry.m_id = identifier;
-    if (!helpText.empty())
-    {
-        entry.m_helpText = helpText;
-    }
-
-    if (!AddCommand(entry.m_id.c_str(), CXConsole_ExecuteCommandTrampoline, flags, entry.m_helpText.empty() ? nullptr : entry.m_helpText.c_str()))
-    {
-        AZ_Warning("console", false, "Command %s already found in the command registry.", entry.m_id.c_str());
-        return false;
-    }
-
-    m_commandRegistrationMap.insert(AZStd::make_pair(entry.m_id, entry));
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXConsole::UnregisterCommand(AZStd::string_view identifier)
-{
-    if (m_commandRegistrationMap.erase(identifier) == 1)
-    {
-        RemoveCommand(identifier.data());
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::AddConsoleVarSink(IConsoleVarSink* pSink)
-{
-    m_consoleVarSinks.push_back(pSink);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsole::RemoveConsoleVarSink(IConsoleVarSink* pSink)
-{
-    m_consoleVarSinks.remove(pSink);
-}
diff --git a/Code/CryEngine/CrySystem/XConsole.h b/Code/CryEngine/CrySystem/XConsole.h
deleted file mode 100644
index b1c5348b6d..0000000000
--- a/Code/CryEngine/CrySystem/XConsole.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XCONSOLE_H
-#define CRYINCLUDE_CRYSYSTEM_XCONSOLE_H
-
-#pragma once
-
-#include <IConsole.h>
-#include <CryCrc32.h>
-#include "Timer.h"
-#include <AzFramework/Components/ConsoleBus.h>
-#include <AzFramework/CommandLine/CommandRegistrationBus.h>
-
-#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
-#include <AzFramework/Input/Events/InputChannelEventListener.h>
-#include <AzFramework/Input/Events/InputTextEventListener.h>
-
-//forward declaration
-struct INetwork;
-class CSystem;
-
-
-#define MAX_HISTORY_ENTRIES 50
-#define LINE_BORDER 10
-
-enum ScrollDir
-{
-    sdDOWN,
-    sdUP,
-    sdNONE
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Console command holds information about commands registered to console.
-//////////////////////////////////////////////////////////////////////////
-struct CConsoleCommand
-{
-    string m_sName;            // Console command name
-    string m_sCommand;         // lua code that is executed when this command is invoked
-    string m_sHelp;            // optional help string - can be shown in the console with "<commandname> ?"
-    int    m_nFlags;           // bitmask consist of flag starting with VF_ e.g. VF_CHEAT
-    ConsoleCommandFunc m_func; // Pointer to console command.
-
-    //////////////////////////////////////////////////////////////////////////
-    CConsoleCommand()
-        : m_func(0)
-        , m_nFlags(0) {}
-    size_t sizeofThis () const {return sizeof(*this) + m_sName.capacity() + 1 + m_sCommand.capacity() + 1; }
-    void GetMemoryUsage (class ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_sName);
-        pSizer->AddObject(m_sCommand);
-        pSizer->AddObject(m_sHelp);
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Implements IConsoleCmdArgs.
-//////////////////////////////////////////////////////////////////////////
-struct CConsoleCommandArgs
-    : public IConsoleCmdArgs
-{
-    CConsoleCommandArgs(string& line, std::vector<string>& args)
-        : m_line(line)
-        , m_args(args) {};
-    virtual int GetArgCount() const { return m_args.size(); };
-    // Get argument by index, nIndex must be in 0 <= nIndex < GetArgCount()
-    virtual const char* GetArg(int nIndex) const
-    {
-        assert(nIndex >= 0 && nIndex < GetArgCount());
-        if (!(nIndex >= 0 && nIndex < GetArgCount()))
-        {
-            return NULL;
-        }
-        return m_args[nIndex].c_str();
-    }
-    virtual const char* GetCommandLine() const
-    {
-        return m_line.c_str();
-    }
-
-private:
-    std::vector<string>& m_args;
-    string& m_line;
-};
-
-
-
-struct string_nocase_lt
-{
-    bool operator()(const char* s1, const char* s2) const
-    {
-        return azstricmp(s1, s2) < 0;
-    }
-};
-
-/* - very dangerous to use with STL containers
-struct string_nocase_lt
-{
-    bool operator()( const char *s1,const char *s2 ) const
-    {
-        return _stricmp(s1,s2) < 0;
-    }
-    bool operator()( const string &s1,const string &s2 ) const
-    {
-        return _stricmp(s1.c_str(),s2.c_str()) < 0;
-    }
-};
-*/
-
-//forward declarations
-class ITexture;
-struct IRenderer;
-
-
-/*! engine console implementation
-    @see IConsole
-*/
-class CXConsole
-    : public IConsole
-    , public AzFramework::InputChannelEventListener
-    , public AzFramework::InputTextEventListener
-    , public IRemoteConsoleListener
-    , public AzFramework::ConsoleRequestBus::Handler
-    , public AzFramework::CommandRegistrationBus::Handler
-{
-public:
-    typedef std::deque<string> ConsoleBuffer;
-    typedef ConsoleBuffer::iterator ConsoleBufferItor;
-    typedef ConsoleBuffer::reverse_iterator ConsoleBufferRItor;
-
-    // constructor
-    CXConsole();
-    // destructor
-    virtual ~CXConsole();
-
-    void SetStatus(bool bActive){ m_bConsoleActive = bActive; }
-    bool GetStatus() const { return m_bConsoleActive; }
-    //
-    void FreeRenderResources();
-    //
-    void Copy();
-    void Paste();
-
-    // interface IConsole ---------------------------------------------------------
-    virtual void Release();
-
-    virtual void Init(ISystem* pSystem);
-    virtual ICVar* RegisterString(const char* sName, const char* sValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0);
-    virtual ICVar* RegisterInt(const char* sName, int iValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0);
-    virtual ICVar* RegisterInt64(const char* sName, int64 iValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0);
-    virtual ICVar* RegisterFloat(const char* sName, float fValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0);
-    virtual ICVar* Register(const char* name, float* src, float defaultvalue, int flags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true);
-    virtual ICVar* Register(const char* name, int* src, int defaultvalue, int flags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true);
-    virtual ICVar* Register(const char* name, const char** src, const char* defaultvalue, int flags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true);
-    virtual ICVar* Register(ICVar* pVar) { RegisterVar(pVar); return pVar; }
-
-    virtual void UnregisterVariable(const char* sVarName, bool bDelete = false);
-    virtual void SetScrollMax(int value);
-    virtual void AddOutputPrintSink(IOutputPrintSink* inpSink);
-    virtual void RemoveOutputPrintSink(IOutputPrintSink* inpSink);
-    virtual void ShowConsole(bool show, int iRequestScrollMax = -1);
-    virtual void DumpCVars(ICVarDumpSink* pCallback, unsigned int nFlagsFilter = 0);
-    virtual void DumpKeyBinds(IKeyBindDumpSink* pCallback);
-    virtual void CreateKeyBind(const char* sCmd, const char* sRes);
-    virtual const char* FindKeyBind(const char* sCmd) const;
-    virtual void    SetImage(ITexture* pImage, bool bDeleteCurrent);
-    virtual inline ITexture* GetImage() { return m_pImage; }
-    virtual void StaticBackground(bool bStatic) { m_bStaticBackground = bStatic; }
-    virtual bool GetLineNo(int indwLineNo, char* outszBuffer, int indwBufferSize) const;
-    virtual int GetLineCount() const;
-    virtual ICVar* GetCVar(const char* name);
-    virtual char* GetVariable(const char* szVarName, const char* szFileName, const char* def_val);
-    virtual float GetVariable(const char* szVarName, const char* szFileName, float def_val);
-    virtual void PrintLine(const char* s);
-    virtual void PrintLinePlus(const char* s);
-    virtual bool GetStatus();
-    virtual void Clear();
-    virtual void Update();
-    virtual void Draw();
-    virtual bool AddCommand(const char* sCommand, ConsoleCommandFunc func, int nFlags = 0, const char* sHelp = NULL);
-    virtual bool AddCommand(const char* sName, const char* sScriptFunc, int nFlags = 0, const char* sHelp = NULL);
-    virtual void RemoveCommand(const char* sName);
-    virtual void ExecuteString(const char* command, bool bSilentMode, bool bDeferExecution = false);
-    virtual void ExecuteConsoleCommand(const char* command) override;
-    virtual void ResetCVarsToDefaults() override;
-    virtual void Exit(const char* command, ...) PRINTF_PARAMS(2, 3);
-    virtual bool IsOpened();
-    virtual int GetNumVars();
-    virtual int GetNumVisibleVars();
-    virtual size_t GetSortedVars(const char** pszArray, size_t numItems, const char* szPrefix = 0);
-    virtual int GetNumCheatVars();
-    virtual void SetCheatVarHashRange(size_t firstVar, size_t lastVar);
-    virtual void CalcCheatVarHash();
-    virtual bool IsHashCalculated();
-    virtual uint64 GetCheatVarHash();
-    virtual void FindVar(const char* substr);
-    virtual const char* AutoComplete(const char* substr);
-    virtual const char* AutoCompletePrev(const char* substr);
-    virtual const char* ProcessCompletion(const char* szInputBuffer);
-    virtual void RegisterAutoComplete(const char* sVarOrCommand, IConsoleArgumentAutoComplete* pArgAutoComplete);
-    virtual void UnRegisterAutoComplete(const char* sVarOrCommand);
-    virtual void ResetAutoCompletion();
-    virtual void GetMemoryUsage (ICrySizer* pSizer) const;
-    virtual void ResetProgressBar(int nProgressRange);
-    virtual void TickProgressBar();
-    virtual void SetLoadingImage(const char* szFilename);
-    virtual void AddConsoleVarSink(IConsoleVarSink* pSink);
-    virtual void RemoveConsoleVarSink(IConsoleVarSink* pSink);
-    virtual const char* GetHistoryElement(bool bUpOrDown);
-    virtual void AddCommandToHistory(const char* szCommand);
-    virtual void SetInputLine(const char* szLine);
-    virtual void LoadConfigVar(const char* sVariable, const char* sValue);
-    virtual void EnableActivationKey(bool bEnable);
-    virtual void SetClientDataProbeString(const char* pName, const char* pValue);
-
-    // InputChannelEventListener / InputTextEventListener
-    bool OnInputChannelEventFiltered(const AzFramework::InputChannel& inputChannel) override;
-    bool OnInputTextEventFiltered(const AZStd::string& textUTF8) override;
-
-    // interface IRemoteConsoleListener ------------------------------------------------------------------
-
-    virtual void OnConsoleCommand(const char* cmd);
-
-    // interface IConsoleVarSink ----------------------------------------------------------------------
-
-    virtual bool OnBeforeVarChange(ICVar* pVar, const char* sNewValue);
-    virtual void OnAfterVarChange(ICVar* pVar);
-
-    // interface CommandRegistration --------------------------------------------------------------------
-    bool RegisterCommand(AZStd::string_view identifier, AZStd::string_view helpText, AZ::u32 commandFlags, AzFramework::CommandFunction callback) override;
-    bool UnregisterCommand(AZStd::string_view identifier) override;
-    void ExecuteRegisteredCommand(IConsoleCmdArgs* pArg);
-
-    //////////////////////////////////////////////////////////////////////////
-
-    // Returns
-    //   0 if the operation failed
-    ICVar* RegisterCVarGroup(const char* sName, const char* szFileName);
-
-    virtual void PrintCheatVars(bool bUseLastHashRange);
-    virtual char* GetCheatVarAt(uint32 nOffset);
-
-    void SetProcessingGroup(bool isGroup) { m_bIsProcessingGroup = isGroup; }
-    bool GetIsProcessingGroup(void) const { return m_bIsProcessingGroup; }
-
-protected: // ----------------------------------------------------------------------------------------
-    void DrawBuffer(int nScrollPos, const char* szEffect);
-
-    void RegisterVar(ICVar* pCVar, ConsoleVarFunc pChangeFunc = 0);
-
-    bool ProcessInput(const AzFramework::InputChannel& inputChannel);
-    void AddLine(const char* inputStr);
-    void AddLinePlus(const char* inputStr);
-    void AddInputUTF8(const AZStd::string& textUTF8);
-    void RemoveInputChar(bool bBackSpace);
-    void ExecuteInputBuffer();
-    void ExecuteCommand(CConsoleCommand& cmd, string& params, bool bIgnoreDevMode = false);
-
-    void ScrollConsole();
-
-    // CommandRegistration usage
-    struct CommandRegistrationEntry
-    {
-        AzFramework::CommandFunction m_callback;
-        AZStd::string m_id;
-        AZStd::string m_helpText;
-    };
-    AZStd::unordered_map<AZStd::string, CommandRegistrationEntry> m_commandRegistrationMap;
-
-#if ALLOW_AUDIT_CVARS
-    void AuditCVars(IConsoleCmdArgs* pArg);
-#endif // ALLOW_AUDIT_CVARS
-
-#ifndef _RELEASE
-    // will be removed once the HTML version is good enough
-    void DumpCommandsVarsTxt(const char* prefix);
-    void DumpVarsTxt(const bool includeCheat);
-#endif
-
-    void ConsoleLogInputResponse(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-    void ConsoleLogInput(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-    void ConsoleWarning(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
-
-    void DisplayHelp(const char* help, const char* name);
-    void DisplayVarValue(ICVar* pVar);
-
-    // Arguments:
-    //   bFromConsole - true=from console, false=from outside
-    void SplitCommands(const char* line, std::list<string>& split);
-    void ExecuteStringInternal(const char* command, const bool bFromConsole, const bool bSilentMode = false);
-    void ExecuteDeferredCommands();
-
-    static const char* GetFlagsString(const uint32 dwFlags);
-
-    static void CmdDumpAllAnticheatVars(IConsoleCmdArgs* pArgs);
-    static void CmdDumpLastHashedAnticheatVars(IConsoleCmdArgs* pArgs);
-
-private: // ----------------------------------------------------------
-
-    typedef std::map<const char*, ICVar*, string_nocase_lt> ConsoleVariablesMap;        // key points into string stored in ICVar or in .exe/.dll
-    typedef ConsoleVariablesMap::iterator ConsoleVariablesMapItor;
-
-    typedef std::vector<std::pair<const char*, ICVar*> > ConsoleVariablesVector;
-
-    void LogChangeMessage(const char* name, const bool isConst, const bool isCheat, const bool isReadOnly, const bool isDeprecated,
-        const char* oldValue, const char* newValue, const bool isProcessingGroup, const bool allowChange);
-
-    void AddCheckedCVar(ConsoleVariablesVector& vector, const ConsoleVariablesVector::value_type& value);
-    void RemoveCheckedCVar(ConsoleVariablesVector& vector, const ConsoleVariablesVector::value_type& value);
-    static void AddCVarsToHash(ConsoleVariablesVector::const_iterator begin, ConsoleVariablesVector::const_iterator end, CCrc32& runningNameCrc32, CCrc32& runningNameValueCrc32);
-    static bool CVarNameLess(const std::pair<const char*, ICVar*>& lhs, const std::pair<const char*, ICVar*>& rhs);
-
-    void PostLine(const char* lineOfText, size_t len);
-
-    typedef std::map<string, CConsoleCommand, string_nocase_lt> ConsoleCommandsMap;
-    typedef ConsoleCommandsMap::iterator ConsoleCommandsMapItor;
-
-    typedef std::map<string, string> ConsoleBindsMap;
-    typedef ConsoleBindsMap::iterator ConsoleBindsMapItor;
-
-    typedef std::map<string, IConsoleArgumentAutoComplete*, stl::less_stricmp<string> > ArgumentAutoCompleteMap;
-
-    struct SConfigVar
-    {
-        string m_value;
-        bool m_partOfGroup;
-    };
-    typedef std::map<string, SConfigVar, string_nocase_lt> ConfigVars;
-
-    struct SDeferredCommand
-    {
-        string  command;
-        bool        silentMode;
-
-        SDeferredCommand(const string& _command, bool _silentMode)
-            : command(_command)
-            , silentMode(_silentMode)
-        {}
-    };
-    typedef std::list<SDeferredCommand> TDeferredCommandList;
-
-    typedef std::list<IConsoleVarSink*> ConsoleVarSinks;
-
-    // --------------------------------------------------------------------------------
-
-    ConsoleBuffer                                       m_dqConsoleBuffer;
-    ConsoleBuffer                                       m_dqHistory;
-
-    bool                                                        m_bStaticBackground;
-    int                                                         m_nLoadingBackTexID;
-    int                                                         m_nProgress;
-    int                                                         m_nProgressRange;
-
-    string                                                  m_sInputBuffer;
-    string                          m_sReturnString;
-
-    string                                                  m_sPrevTab;
-    int                                                         m_nTabCount;
-
-    ConsoleCommandsMap                          m_mapCommands;                      //
-    ConsoleBindsMap                                 m_mapBinds;                             //
-    ConsoleVariablesMap                         m_mapVariables;                     //
-    ConsoleVariablesVector          m_randomCheckedVariables;
-    ConsoleVariablesVector          m_alwaysCheckedVariables;
-    std::vector<IOutputPrintSink*> m_OutputSinks;                       // objects in this vector are not released
-
-    TDeferredCommandList                        m_deferredCommands;             // A fifo of deferred commands
-    bool                                                        m_deferredExecution;            // True when deferred commands are processed
-    int                                                         m_waitFrames;                           // A counter which is used by wait_frames command
-    CTimeValue                                          m_waitSeconds;                      // An absolute timestamp which is used by wait_seconds command
-    int                                                         m_blockCounter;                     // This counter is incremented whenever a blocker command (VF_BLOCKFRAME) is executed.
-
-    ArgumentAutoCompleteMap         m_mapArgumentAutoComplete;
-
-    ConsoleVarSinks                                 m_consoleVarSinks;
-
-    ConfigVars                                          m_configVars;                           // temporary data of cvars that haven't been created yet
-
-    int                                                         m_nScrollPos;
-    int                                                         m_nTempScrollMax;                   // for currently opened console, reset to m_nScrollMax
-    int                                                         m_nScrollMax;                           //
-    int                                                         m_nScrollLine;
-    int                                                         m_nHistoryPos;
-    size_t                                                      m_nCursorPos;                           // x position in characters
-    ITexture*                                               m_pImage;
-
-    float                                                       m_fRepeatTimer;                     // relative, next repeat even in .. decreses over time, repeats when 0, only valid if m_nRepeatEvent.keyId != eKI_Unknown
-    AzFramework::InputChannelId                                 m_nRepeatEventId;                     // event that will be repeated
-
-    float                                                       m_fCursorBlinkTimer;            // relative, increases over time,
-    bool                                                        m_bDrawCursor;
-
-    ScrollDir                                               m_sdScrollDir;
-
-
-    AzFramework::SystemCursorState                              m_previousSystemCursorState;
-    bool                                                        m_bConsoleActive;
-    bool                                                        m_bActivationKeyEnable;
-    bool                                                        m_bIsProcessingGroup;
-    bool m_bIsConsoleKeyPressed;
-
-    size_t                          m_nCheatHashRangeFirst;
-    size_t                          m_nCheatHashRangeLast;
-    bool                            m_bCheatHashDirty;
-    uint64                          m_nCheatHash;
-
-    CSystem*                                               m_pSystem;
-    IFFont*                                                m_pFont;
-    ITimer*                                                m_pTimer;
-
-    ICVar*                                                 m_pSysDeactivateConsole;
-
-    static int con_display_last_messages;
-    static int con_line_buffer_size;
-    static int con_showonload;
-    static int con_debug;
-    static int con_restricted;
-
-    friend void Command_SetWaitSeconds(IConsoleCmdArgs* Cmd);
-    friend void Command_SetWaitFrames(IConsoleCmdArgs* Cmd);
-#if ALLOW_AUDIT_CVARS
-    friend void Command_AuditCVars(IConsoleCmdArgs* pArg);
-#endif // ALLOW_AUDIT_CVARS
-    friend void Command_DumpCommandsVars(IConsoleCmdArgs* Cmd);
-    friend void Command_DumpVars(IConsoleCmdArgs* Cmd);
-    friend class CConsoleHelpGen;
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_XCONSOLE_H
diff --git a/Code/CryEngine/CrySystem/XConsoleVariable.cpp b/Code/CryEngine/CrySystem/XConsoleVariable.cpp
deleted file mode 100644
index 1190c893e4..0000000000
--- a/Code/CryEngine/CrySystem/XConsoleVariable.cpp
+++ /dev/null
@@ -1,735 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation of the CXConsoleVariable class.
-
-
-#include "CrySystem_precompiled.h"
-#include "XConsole.h"
-#include "XConsoleVariable.h"
-
-#include <IConsole.h>
-#include <ISystem.h>
-
-#include <algorithm>
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-CXConsoleVariableBase::CXConsoleVariableBase(CXConsole* pConsole, const char* sName, int nFlags, const char* help)
-    : m_valueMin(0.0f)
-    , m_valueMax(100.0f)
-    , m_hasCustomLimits(false)
-{
-    assert(pConsole);
-
-    m_psHelp = (char*)help;
-    m_pChangeFunc = NULL;
-
-    m_pConsole = pConsole;
-
-    m_nFlags = nFlags;
-
-    if (nFlags & VF_COPYNAME)
-    {
-        m_szName = new char[strlen(sName) + 1];
-        azstrcpy(m_szName, strlen(sName) + 1, sName);
-    }
-    else
-    {
-        m_szName = (char*)sName;
-    }
-
-    if (gEnv->IsDedicated())
-    {
-        m_pDataProbeString = NULL;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CXConsoleVariableBase::~CXConsoleVariableBase()
-{
-    if (m_nFlags & VF_COPYNAME)
-    {
-        delete[] m_szName;
-    }
-
-    if (gEnv->IsDedicated() && m_pDataProbeString)
-    {
-        delete[] m_pDataProbeString;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsoleVariableBase::ForceSet(const char* s)
-{
-    int excludeFlags = (VF_CHEAT | VF_READONLY | VF_NET_SYNCED);
-    int oldFlags = (m_nFlags & excludeFlags);
-    m_nFlags &= ~(excludeFlags);
-    Set(s);
-    m_nFlags |= oldFlags;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CXConsoleVariableBase::ClearFlags (int flags)
-{
-    m_nFlags &= ~flags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CXConsoleVariableBase::GetFlags() const
-{
-    return m_nFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CXConsoleVariableBase::SetFlags(int flags)
-{
-    m_nFlags = flags;
-    return m_nFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CXConsoleVariableBase::GetName() const
-{
-    return m_szName;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CXConsoleVariableBase::GetHelp()
-{
-    return m_psHelp;
-}
-
-void CXConsoleVariableBase::Release()
-{
-    m_pConsole->UnregisterVariable(m_szName);
-}
-
-void CXConsoleVariableBase::SetOnChangeCallback(ConsoleVarFunc pChangeFunc)
-{
-    m_pChangeFunc = pChangeFunc;
-}
-
-uint64 CXConsoleVariableBase::AddOnChangeFunctor(const SFunctor& pChangeFunctor)
-{
-    static int uniqueIdGenerator = 0;
-    int newId = uniqueIdGenerator++;
-    m_changeFunctors.push_back(std::make_pair(newId, pChangeFunctor));
-    return newId;
-}
-
-uint64 CXConsoleVariableBase::GetNumberOfOnChangeFunctors() const
-{
-    return m_changeFunctors.size();
-}
-
-const SFunctor& CXConsoleVariableBase::GetOnChangeFunctor(uint64 nFunctorId) const
-{
-    auto predicate = [nFunctorId](const std::pair<int, SFunctor>& entry) -> bool { return entry.first == nFunctorId; };
-    auto changeFunctor = std::find_if(m_changeFunctors.begin(), m_changeFunctors.end(), predicate);
-    if (changeFunctor != m_changeFunctors.end())
-    {
-        return (*changeFunctor).second;
-    }
-
-    static SFunctor sDummyFunctor;
-    assert(false && "[CXConsoleVariableBase::GetOnChangeFunctor] Trying to get a functor for an id that does not exist.");
-
-    return sDummyFunctor;
-}
-
-bool CXConsoleVariableBase::RemoveOnChangeFunctor(const uint64 nFunctorId)
-{
-    auto predicate = [nFunctorId](const std::pair<int, SFunctor>& entry) -> bool { return entry.first == nFunctorId; };
-    auto changeFunctor = std::find_if(m_changeFunctors.begin(), m_changeFunctors.end(), predicate);
-
-    if (changeFunctor != m_changeFunctors.end())
-    {
-        m_changeFunctors.erase(changeFunctor);
-        return true;
-    }
-
-    return false;
-}
-
-ConsoleVarFunc CXConsoleVariableBase::GetOnChangeCallback() const
-{
-    return m_pChangeFunc;
-}
-
-void CXConsoleVariableBase::CallOnChangeFunctions()
-{
-    if (m_pChangeFunc)
-    {
-        m_pChangeFunc(this);
-    }
-
-    const size_t nTotal(m_changeFunctors.size());
-    for (size_t nCount = 0; nCount < nTotal; ++nCount)
-    {
-        m_changeFunctors[nCount].second.Call();
-    }
-}
-
-void CXConsoleVariableBase::SetLimits(float min, float max)
-{
-    m_valueMin = min;
-    m_valueMax = max;
-
-    // Flag to determine when this variable has custom limits set
-    m_hasCustomLimits = true;
-}
-
-void CXConsoleVariableBase::GetLimits(float& min, float& max)
-{
-    min = m_valueMin;
-    max = m_valueMax;
-}
-
-bool CXConsoleVariableBase::HasCustomLimits()
-{
-    return m_hasCustomLimits;
-}
-
-void CXConsoleVariableCVarGroup::OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup)
-{
-    assert(szGroup);
-    assert(szKey);
-    assert(szValue);
-
-    bool bCheckIfInDefault = false;
-
-    SCVarGroup* pGrp = 0;
-
-    if (azstricmp(szGroup, "default") == 0)              // needs to be before the other groups
-    {
-        pGrp = &m_CVarGroupDefault;
-
-        //      if(azstricmp(GetName(),szKey)==0)
-        if (*szKey == 0)
-        {
-            m_sDefaultValue = szValue;
-            int iGrpValue = atoi(szValue);
-
-            // if default state is not part of the mentioned states generate this state, so GetIRealVal() can return this state as well
-            if (m_CVarGroupStates.find(iGrpValue) == m_CVarGroupStates.end())
-            {
-                m_CVarGroupStates[iGrpValue] = new SCVarGroup;
-            }
-
-            return;
-        }
-    }
-    else
-    {
-        int iGrp;
-
-        if (azsscanf(szGroup, "%d", &iGrp) == 1)
-        {
-            if (m_CVarGroupStates.find(iGrp) == m_CVarGroupStates.end())
-            {
-                m_CVarGroupStates[iGrp] = new SCVarGroup;
-            }
-
-            pGrp = m_CVarGroupStates[iGrp];
-        }
-        else
-        {
-            gEnv->pLog->LogError("[CVARS]: [MISSING] [%s] is not a registered console variable group", szGroup);
-#if LOG_CVAR_INFRACTIONS_CALLSTACK
-            gEnv->pSystem->debug_LogCallStack();
-#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
-            return;
-        }
-
-        if (*szKey == 0)
-        {
-            assert(0);          // =%d only expected in default section
-            return;
-        }
-    }
-
-
-    if (pGrp)
-    {
-        if (pGrp->m_KeyValuePair.find(szKey) != pGrp->m_KeyValuePair.end())
-        {
-            gEnv->pLog->LogError("[CVARS]: [DUPLICATE] [%s] specified multiple times in console variable group [%s] = [%s]", szKey, GetName(), szGroup);
-            bCheckIfInDefault = true;
-        }
-
-        pGrp->m_KeyValuePair[szKey] = szValue;
-
-        if (bCheckIfInDefault)
-        {
-            if (m_CVarGroupDefault.m_KeyValuePair.find(szKey) == m_CVarGroupDefault.m_KeyValuePair.end())
-            {
-                gEnv->pLog->LogError("[CVARS]: [MISSING] [%s] specified in console variable group [%s] = [%s], but missing from default group", szKey, GetName(), szGroup);
-            }
-        }
-    }
-}
-
-
-void CXConsoleVariableCVarGroup::OnLoadConfigurationEntry_End()
-{
-    if (!m_sDefaultValue.empty())
-    {
-        gEnv->pConsole->LoadConfigVar(GetName(), m_sDefaultValue);
-        m_sDefaultValue.clear();
-    }
-}
-
-
-CXConsoleVariableCVarGroup::CXConsoleVariableCVarGroup(CXConsole* pConsole, const char* sName, const char* szFileName, int nFlags)
-    : CXConsoleVariableInt(pConsole, sName, 0, nFlags, 0)
-{
-    gEnv->pSystem->LoadConfiguration(szFileName, this);
-}
-
-
-string CXConsoleVariableCVarGroup::GetDetailedInfo() const
-{
-    string sRet = GetName();
-
-    sRet += " [";
-
-    {
-        TCVarGroupStateMap::const_iterator it, end = m_CVarGroupStates.end();
-
-        for (it = m_CVarGroupStates.begin(); it != end; ++it)
-        {
-            if (it != m_CVarGroupStates.begin())
-            {
-                sRet += "/";
-            }
-
-            char szNum[10];
-
-            azsprintf(szNum, "%d", it->first);
-
-            sRet += szNum;
-        }
-    }
-
-    sRet += "/default] [current]:\n";
-
-
-    std::map<string, string>::const_iterator it, end = m_CVarGroupDefault.m_KeyValuePair.end();
-
-    for (it = m_CVarGroupDefault.m_KeyValuePair.begin(); it != end; ++it)
-    {
-        const string& rKey = it->first;
-
-        sRet += " ... ";
-        sRet += rKey;
-        sRet += " = ";
-
-        TCVarGroupStateMap::const_iterator it2, end2 = m_CVarGroupStates.end();
-
-        for (it2 = m_CVarGroupStates.begin(); it2 != end2; ++it2)
-        {
-            sRet += GetValueSpec(rKey, &(it2->first));
-            sRet += "/";
-        }
-        sRet += GetValueSpec(rKey);
-        ICVar* pCVar = gEnv->pConsole->GetCVar(rKey);
-        if (pCVar)
-        {
-            sRet += " [";
-            sRet += pCVar->GetString();
-            sRet += "]";
-        }
-
-        sRet += "\n";
-    }
-
-    return sRet;
-}
-
-
-
-const char* CXConsoleVariableCVarGroup::GetHelp()
-{
-    if (m_psHelp)
-    {
-        delete m_psHelp;
-        m_psHelp = NULL;
-    }
-
-    // create help on demand
-    string sRet = "Console variable group to apply settings to multiple variables\n\n";
-
-    sRet += GetDetailedInfo();
-
-    m_psHelp = new char[sRet.size() + 1];
-    azstrcpy(m_psHelp, sRet.size() + 1, &sRet[0]);
-
-    return m_psHelp;
-}
-
-
-
-void CXConsoleVariableCVarGroup::DebugLog(const int iExpectedValue, const ICVar::EConsoleLogMode mode) const
-{
-    TCVarGroupStateMap::const_iterator it, end = m_CVarGroupStates.end();
-
-    SCVarGroup* pCurrentGrp = 0;
-    {
-        TCVarGroupStateMap::const_iterator itCurrentGrp = m_CVarGroupStates.find(iExpectedValue);
-
-        if (itCurrentGrp != end)
-        {
-            pCurrentGrp = itCurrentGrp->second;
-        }
-    }
-
-    // try the current state
-    if (TestCVars(pCurrentGrp, mode))
-    {
-        return;
-    }
-}
-
-
-int CXConsoleVariableCVarGroup::GetRealIVal() const
-{
-    TCVarGroupStateMap::const_iterator it, end = m_CVarGroupStates.end();
-
-    int iValue = GetIVal();
-
-    SCVarGroup* pCurrentGrp = 0;
-    {
-        TCVarGroupStateMap::const_iterator itCurrentGrp = m_CVarGroupStates.find(iValue);
-
-        if (itCurrentGrp != end)
-        {
-            pCurrentGrp = itCurrentGrp->second;
-        }
-    }
-
-    // first try the current state
-    if (TestCVars(pCurrentGrp))
-    {
-        return iValue;
-    }
-
-    // then all other
-    for (it = m_CVarGroupStates.begin(); it != end; ++it)
-    {
-        SCVarGroup* pLocalGrp = it->second;
-
-        if (pLocalGrp == pCurrentGrp)
-        {
-            continue;
-        }
-
-        int iLocalState = it->first;
-
-        if (TestCVars(pLocalGrp))
-        {
-            return iLocalState;
-        }
-    }
-
-    return -1;      // no state found that represent the current one
-}
-
-void CXConsoleVariableCVarGroup::Set(const int i)
-{
-    if (i == m_iValue)
-    {
-        SCVarGroup* pCurrentGrp = 0;
-        TCVarGroupStateMap::const_iterator itCurrentGrp = m_CVarGroupStates.find(m_iValue);
-
-        if (itCurrentGrp != m_CVarGroupStates.end())
-        {
-            pCurrentGrp = itCurrentGrp->second;
-        }
-
-        if (TestCVars(pCurrentGrp))
-        {
-            // All cvars in this group match the current state - no further action is necessary
-            return;
-        }
-    }
-
-    char sTemp[128];
-    azsprintf(sTemp, "%d", i);
-
-    bool wasProcessingGroup = m_pConsole->GetIsProcessingGroup();
-    m_pConsole->SetProcessingGroup(true);
-    if (m_pConsole->OnBeforeVarChange(this, sTemp))
-    {
-        m_nFlags |= VF_MODIFIED;
-        m_iValue = i;
-
-        CallOnChangeFunctions();
-        m_pConsole->OnAfterVarChange(this);
-    }
-    m_pConsole->SetProcessingGroup(wasProcessingGroup);
-
-    // Useful for debugging cvar groups
-    //CryLogAlways("[CVARS]: CXConsoleVariableCVarGroup::Set() Group %s in state %d (wanted %d)", GetName(), m_iValue, i);
-}
-
-
-CXConsoleVariableCVarGroup::~CXConsoleVariableCVarGroup()
-{
-    TCVarGroupStateMap::iterator it, end = m_CVarGroupStates.end();
-
-    for (it = m_CVarGroupStates.begin(); it != end; ++it)
-    {
-        SCVarGroup* pGrp = it->second;
-
-        delete pGrp;
-    }
-
-    delete m_psHelp;
-}
-
-
-void CXConsoleVariableCVarGroup::OnCVarChangeFunc(ICVar* pVar)
-{
-    CXConsoleVariableCVarGroup* pThis = (CXConsoleVariableCVarGroup*)pVar;
-
-    int iValue = pThis->GetIVal();
-
-    TCVarGroupStateMap::const_iterator itGrp = pThis->m_CVarGroupStates.find(iValue);
-
-    SCVarGroup* pGrp = 0;
-
-    if (itGrp != pThis->m_CVarGroupStates.end())
-    {
-        pGrp = itGrp->second;
-    }
-
-    if (pGrp)
-    {
-        pThis->ApplyCVars(*pGrp);
-    }
-
-    pThis->ApplyCVars(pThis->m_CVarGroupDefault, pGrp);
-}
-
-
-bool CXConsoleVariableCVarGroup::TestCVars(const SCVarGroup* pGroup, const ICVar::EConsoleLogMode mode) const
-{
-    if (pGroup)
-    {
-        if (!TestCVars(*pGroup, mode))
-        {
-            return false;
-        }
-    }
-
-    if (!TestCVars(m_CVarGroupDefault, mode, pGroup))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool CXConsoleVariableCVarGroup::TestCVars(const SCVarGroup& rGroup, const ICVar::EConsoleLogMode mode, const SCVarGroup* pExclude) const
-{
-    bool bRet = true;
-    std::map<string, string>::const_iterator it, end = rGroup.m_KeyValuePair.end();
-
-    for (it = rGroup.m_KeyValuePair.begin(); it != end; ++it)
-    {
-        const string& rKey = it->first;
-        const string& rValue = it->second;
-
-        if (pExclude)
-        {
-            if (pExclude->m_KeyValuePair.find(rKey) != pExclude->m_KeyValuePair.end())
-            {
-                continue;
-            }
-        }
-
-        ICVar* pVar = gEnv->pConsole->GetCVar(rKey.c_str());
-
-        if (pVar)
-        {
-            if (pVar->GetFlags() & VF_CVARGRP_IGNOREINREALVAL) // Ignore the cvars which change often and shouldn't be used to determine state
-            {
-                continue;
-            }
-
-            bool bOk = true;
-
-            // compare exact type,
-            // simple string comparison would fail on some comparisons e.g. 2.0 == 2
-            // and GetString() for int and float return pointer to shared array so this
-            // can cause problems
-            switch (pVar->GetType())
-            {
-            case CVAR_INT:
-            {
-                int iVal;
-                if (azsscanf(rValue.c_str(), "%d", &iVal) == 1)
-                {
-                    if (pVar->GetIVal() != atoi(rValue.c_str()))
-                    {
-                        bOk = false;
-                        break;
-                    }
-                }
-
-                if (pVar->GetIVal() != pVar->GetRealIVal())
-                {
-                    bOk = false;
-                    break;
-                }
-            }
-            break;
-            case CVAR_FLOAT:
-            {
-                float fVal;
-                if (azsscanf(rValue.c_str(), "%f", &fVal) == 1)
-                {
-                    if (pVar->GetFVal() != fVal)
-                    {
-                        bOk = false;
-                        break;
-                    }
-                }
-            }
-            break;
-            case CVAR_STRING:
-                if (rValue != pVar->GetString())
-                {
-                    bOk = false;
-                    break;
-                }
-                break;
-            default:
-                assert(0);
-            }
-
-            if (!bOk)
-            {
-                if (mode == ICVar::eCLM_Off)
-                {
-                    return false;       // exit as early as possible
-                }
-                bRet = false;             // exit with same return code but log all differences
-
-                if (strcmp(pVar->GetString(), rValue.c_str()) != 0)
-                {
-                    switch (mode)
-                    {
-                    case ICVar::eCLM_ConsoleAndFile:
-                        CryLog("[CVARS]: $3[FAIL] [%s] = $6[%s] $4(expected [%s] in group [%s] = [%s])", rKey.c_str(), pVar->GetString(), rValue.c_str(), GetName(), GetString());
-                        break;
-
-                    case ICVar::eCLM_FileOnly:
-                    case ICVar::eCLM_FullInfo:
-                        gEnv->pLog->LogToFile("[CVARS]: [FAIL] [%s] = [%s] (expected [%s] in group [%s] = [%s])", rKey.c_str(), pVar->GetString(), rValue.c_str(), GetName(), GetString());
-                        break;
-
-                    default:
-                        assert(0);
-                    }
-                }
-                else if (mode == ICVar::eCLM_FullInfo)
-                {
-                    gEnv->pLog->LogToFile("[CVARS]: [FAIL] [%s] = [%s] (expected [%s] in group [%s] = [%s])", rKey.c_str(), pVar->GetString(), rValue.c_str(), GetName(), GetString());
-                }
-
-                pVar->DebugLog(pVar->GetIVal(), mode);       // recursion
-            }
-
-            if (pVar->GetFlags() & (VF_CHEAT | VF_CHEAT_ALWAYS_CHECK | VF_CHEAT_NOCHECK))
-            {
-                // either VF_CHEAT should be removed or the var should be not part of the CVarGroup
-                gEnv->pLog->LogError("[CVARS]: [%s] is cheat protected; referenced in console variable group [%s] = [%s] ", rKey.c_str(), GetName(), GetString());
-            }
-        }
-        else
-        {
-            // Do not warn about D3D registered cvars, which carry the prefix "q_", as they are not actually registered with the cvar system.
-            if (strcmp(rKey.c_str(), "q") == -1)
-            {
-                gEnv->pLog->LogError("[CVARS]: [MISSING] [%s] is not a registered console variable; referenced when testing console variable group [%s] = [%s]", rKey.c_str(), GetName(), GetString());
-            }
-        }
-    }
-
-    return bRet;
-}
-
-
-
-string CXConsoleVariableCVarGroup::GetValueSpec(const string& sKey, const int* pSpec) const
-{
-    if (pSpec)
-    {
-        TCVarGroupStateMap::const_iterator itGrp = m_CVarGroupStates.find(*pSpec);
-
-        if (itGrp != m_CVarGroupStates.end())
-        {
-            const SCVarGroup* pGrp = itGrp->second;
-
-            // check in spec
-            std::map<string, string>::const_iterator it = pGrp->m_KeyValuePair.find(sKey);
-
-            if (it != pGrp->m_KeyValuePair.end())
-            {
-                return it->second;
-            }
-        }
-    }
-
-    // check in default
-    std::map<string, string>::const_iterator it = m_CVarGroupDefault.m_KeyValuePair.find(sKey);
-
-    if (it != m_CVarGroupDefault.m_KeyValuePair.end())
-    {
-        return it->second;
-    }
-
-    assert(0);      // internal error
-    return "";
-}
-
-void CXConsoleVariableCVarGroup::ApplyCVars(const SCVarGroup& rGroup, const SCVarGroup* pExclude)
-{
-    std::map<string, string>::const_iterator it, end = rGroup.m_KeyValuePair.end();
-
-    bool wasProcessingGroup = m_pConsole->GetIsProcessingGroup();
-    m_pConsole->SetProcessingGroup(true);
-
-    for (it = rGroup.m_KeyValuePair.begin(); it != end; ++it)
-    {
-        const string& rKey = it->first;
-
-        if (pExclude)
-        {
-            if (pExclude->m_KeyValuePair.find(rKey) != pExclude->m_KeyValuePair.end())
-            {
-                continue;
-            }
-        }
-
-        // Useful for debugging cvar groups
-        //CryLogAlways("[CVARS]: [APPLY] ([%s]) [%s] = [%s]", GetName(), rKey.c_str(), it->second.c_str());
-
-        m_pConsole->LoadConfigVar(rKey, it->second);
-    }
-
-    m_pConsole->SetProcessingGroup(wasProcessingGroup);
-}
-
diff --git a/Code/CryEngine/CrySystem/XConsoleVariable.h b/Code/CryEngine/CrySystem/XConsoleVariable.h
deleted file mode 100644
index a4db880898..0000000000
--- a/Code/CryEngine/CrySystem/XConsoleVariable.h
+++ /dev/null
@@ -1,842 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XCONSOLEVARIABLE_H
-#define CRYINCLUDE_CRYSYSTEM_XCONSOLEVARIABLE_H
-#pragma once
-
-#include <ISystem.h>
-#include "BitFiddling.h"
-#include "SFunctor.h"
-
-class CXConsole;
-
-inline int64 TextToInt64(const char* s, int64 nCurrent, bool bBitfield)
-{
-    int64 nValue = 0;
-    if (s)
-    {
-        char* e;
-        if (bBitfield)
-        {
-            // Bit manipulation.
-            if (*s == '^')
-            // Bit number
-#if defined(_MSC_VER)
-            {
-                nValue = 1LL << _strtoi64(++s, &e, 10);
-            }
-#else
-            {
-                nValue = 1LL << strtoll(++s, &e, 10);
-            }
-#endif
-            else
-            // Full number
-#if defined(_MSC_VER)
-            {
-                nValue = _strtoi64(s, &e, 10);
-            }
-#else
-            {
-                nValue = strtoll(s, &e, 10);
-            }
-#endif
-            // Check letter codes.
-            for (; (*e >= 'a' && *e <= 'z') || (*e >= 'A' && *e <= 'Z'); e++)
-            {
-                nValue |= AlphaBit64(*e);
-            }
-
-            if (*e == '+')
-            {
-                nValue = nCurrent | nValue;
-            }
-            else if (*e == '-')
-            {
-                nValue = nCurrent & ~nValue;
-            }
-            else if (*e == '^')
-            {
-                nValue = nCurrent ^ nValue;
-            }
-        }
-        else
-#if defined(_MSC_VER)
-        {
-            nValue = _strtoi64(s, &e, 10);
-        }
-#else
-        {
-            nValue = strtoll(s, &e, 10);
-        }
-#endif
-    }
-    return nValue;
-}
-
-inline int TextToInt(const char* s, int nCurrent, bool bBitfield)
-{
-    return (int)TextToInt64(s, nCurrent, bBitfield);
-}
-
-class CXConsoleVariableBase
-    : public ICVar
-{
-public:
-    //! constructor
-    //! \param pConsole must not be 0
-    CXConsoleVariableBase(CXConsole* pConsole, const char* sName, int nFlags, const char* help);
-    //! destructor
-    virtual ~CXConsoleVariableBase();
-
-    // interface ICVar --------------------------------------------------------------------------------------
-
-    virtual void ClearFlags(int flags);
-    virtual int GetFlags() const;
-    virtual int SetFlags(int flags);
-    virtual const char* GetName() const;
-    virtual const char* GetHelp();
-    virtual void Release();
-    virtual void ForceSet(const char* s);
-    virtual void SetOnChangeCallback(ConsoleVarFunc pChangeFunc);
-    virtual uint64 AddOnChangeFunctor(const SFunctor& pChangeFunctor) override;
-    virtual bool RemoveOnChangeFunctor(const uint64 nFunctorId) override;
-    virtual uint64 GetNumberOfOnChangeFunctors() const;
-    virtual const SFunctor& GetOnChangeFunctor(uint64 nFunctorId) const override;
-    virtual ConsoleVarFunc GetOnChangeCallback() const;
-
-    virtual bool ShouldReset() const { return (m_nFlags & VF_RESETTABLE) != 0; }
-    virtual void Reset() override
-    {
-        if (ShouldReset())
-        {
-            ResetImpl();
-        }
-    }
-
-    virtual void ResetImpl() = 0;
-
-    virtual void SetLimits(float min, float max) override;
-    virtual void GetLimits(float& min, float& max) override;
-    virtual bool HasCustomLimits() override;
-
-    virtual int GetRealIVal() const { return GetIVal(); }
-    virtual bool IsConstCVar() const {return (m_nFlags & VF_CONST_CVAR) != 0; }
-    virtual void SetDataProbeString(const char* pDataProbeString)
-    {
-        CRY_ASSERT(m_pDataProbeString == NULL);
-        m_pDataProbeString = new char[ strlen(pDataProbeString) + 1 ];
-        azstrcpy(m_pDataProbeString, strlen(pDataProbeString) + 1, pDataProbeString);
-    }
-    virtual const char* GetDataProbeString() const
-    {
-        if (gEnv->IsDedicated() && m_pDataProbeString)
-        {
-            return m_pDataProbeString;
-        }
-        return GetOwnDataProbeString();
-    }
-
-protected: // ------------------------------------------------------------------------------------------
-
-    virtual const char* GetOwnDataProbeString() const
-    {
-        return GetString();
-    }
-
-    void CallOnChangeFunctions();
-
-    char*                      m_szName;                                            // if VF_COPYNAME then this data need to be deleteed, otherwise it's pointer to .dll/.exe
-
-    char*                      m_psHelp;                                            // pointer to the help string, might be 0
-    char*            m_pDataProbeString;            // value client is required to have for data probes
-    int                             m_nFlags;                                           // e.g. VF_CHEAT, ...
-
-    typedef std::vector<std::pair<int, SFunctor> > ChangeFunctorContainer;
-    ChangeFunctorContainer m_changeFunctors;
-    ConsoleVarFunc    m_pChangeFunc;                // Callback function that is called when this variable changes.
-    CXConsole*             m_pConsole;                                      // used for the callback OnBeforeVarChange()
-
-    float m_valueMin;
-    float m_valueMax;
-    bool m_hasCustomLimits;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CXConsoleVariableString
-    : public CXConsoleVariableBase
-{
-public:
-    // constructor
-    CXConsoleVariableString(CXConsole* pConsole, const char* sName, const char* szDefault, int nFlags, const char* help)
-        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
-    {
-        m_sValue = szDefault;
-        m_sDefault = szDefault;
-    }
-
-    // interface ICVar --------------------------------------------------------------------------------------
-
-    virtual int GetIVal() const { return atoi(m_sValue); }
-    virtual int64 GetI64Val() const { return _atoi64(m_sValue); }
-    virtual float GetFVal() const { return (float)atof(m_sValue); }
-    virtual const char* GetString() const { return m_sValue; }
-    virtual void ResetImpl()
-    {
-        Set(m_sDefault);
-    }
-    virtual void Set(const char* s)
-    {
-        if (!s)
-        {
-            return;
-        }
-
-        if ((m_sValue == s) && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        if (m_pConsole->OnBeforeVarChange(this, s))
-        {
-            m_nFlags |= VF_MODIFIED;
-            {
-                m_sValue = s;
-            }
-
-            CallOnChangeFunctions();
-
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-
-    virtual void Set(float f)
-    {
-        stack_string s;
-        s.Format("%g", f);
-
-        if ((m_sValue == s.c_str()) && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        m_nFlags |= VF_MODIFIED;
-        Set(s.c_str());
-    }
-
-    virtual void Set(int i)
-    {
-        stack_string s;
-        s.Format("%d", i);
-
-        if ((m_sValue == s.c_str()) && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        m_nFlags |= VF_MODIFIED;
-        Set(s.c_str());
-    }
-    virtual int GetType() { return CVAR_STRING; }
-
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
-private: // --------------------------------------------------------------------------------------------
-    string m_sValue;                                            
-    string m_sDefault;                                                                              //!<
-};
-
-
-
-class CXConsoleVariableInt
-    : public CXConsoleVariableBase
-{
-public:
-    // constructor
-    CXConsoleVariableInt(CXConsole* pConsole, const char* sName, const int iDefault, int nFlags, const char* help)
-        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
-        , m_iValue(iDefault)
-        , m_iDefault(iDefault)
-    {
-    }
-
-    // interface ICVar --------------------------------------------------------------------------------------
-
-    virtual int GetIVal() const { return m_iValue; }
-    virtual int64 GetI64Val() const { return m_iValue; }
-    virtual float GetFVal() const { return (float)GetIVal(); }
-    virtual const char* GetString() const
-    {
-        static char szReturnString[256];
-
-        sprintf_s(szReturnString, "%d", GetIVal());
-        return szReturnString;
-    }
-    virtual void ResetImpl() { Set(m_iDefault); }
-    virtual void Set(const char* s)
-    {
-        int nValue = TextToInt(s, m_iValue, (m_nFlags & VF_BITFIELD) != 0);
-
-        Set(nValue);
-    }
-    virtual void Set(float f)
-    {
-        Set((int)f);
-    }
-    virtual void Set(int i)
-    {
-        if (i == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        stack_string s;
-        s.Format("%d", i);
-
-        if (m_pConsole->OnBeforeVarChange(this, s.c_str()))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_iValue = i;
-
-            CallOnChangeFunctions();
-
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual int GetType() { return CVAR_INT; }
-
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
-protected: // --------------------------------------------------------------------------------------------
-
-    int                             m_iValue;                                           
-    int                             m_iDefault;                                 //!<
-};
-
-
-class CXConsoleVariableInt64
-    : public CXConsoleVariableBase
-{
-public:
-    // constructor
-    CXConsoleVariableInt64(CXConsole* pConsole, const char* sName, const int64 iDefault, int nFlags, const char* help)
-        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
-        , m_iValue(iDefault)
-        , m_iDefault(iDefault)
-    {
-    }
-
-    // interface ICVar --------------------------------------------------------------------------------------
-
-    virtual int GetIVal() const { return (int)m_iValue; }
-    virtual int64 GetI64Val() const { return m_iValue; }
-    virtual float GetFVal() const { return (float)GetIVal(); }
-    virtual const char* GetString() const
-    {
-        static char szReturnString[256];
-        sprintf_s(szReturnString, "%lld", GetI64Val());
-        return szReturnString;
-    }
-    virtual void ResetImpl() { Set(m_iDefault); }
-    virtual void Set(const char* s)
-    {
-        int64 nValue = TextToInt64(s, m_iValue, (m_nFlags & VF_BITFIELD) != 0);
-
-        Set(nValue);
-    }
-    virtual void Set(float f)
-    {
-        Set((int)f);
-    }
-    virtual void Set(int i)
-    {
-        Set((int64)i);
-    }
-    virtual void Set(int64 i)
-    {
-        if (i == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        stack_string s;
-        s.Format("%lld", i);
-
-        if (m_pConsole->OnBeforeVarChange(this, s.c_str()))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_iValue = i;
-
-            CallOnChangeFunctions();
-
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual int GetType() { return CVAR_INT; }
-
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
-protected: // --------------------------------------------------------------------------------------------
-
-    int64                           m_iValue;                                           
-    int64                           m_iDefault;                                 //!<
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CXConsoleVariableFloat
-    : public CXConsoleVariableBase
-{
-public:
-    // constructor
-    CXConsoleVariableFloat(CXConsole* pConsole, const char* sName, const float fDefault, int nFlags, const char* help)
-        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
-        , m_fValue(fDefault)
-        , m_fDefault(fDefault)
-    {
-    }
-
-    // interface ICVar --------------------------------------------------------------------------------------
-
-    virtual int GetIVal() const { return (int)m_fValue; }
-    virtual int64 GetI64Val() const { return (int64)m_fValue; }
-    virtual float GetFVal() const { return m_fValue; }
-    virtual const char* GetString() const
-    {
-        static char szReturnString[256];
-
-        sprintf_s(szReturnString, "%g", m_fValue);        // %g -> "2.01",   %f -> "2.01000"
-        return szReturnString;
-    }
-    virtual void ResetImpl() { Set(m_fDefault); }
-    virtual void Set(const char* s)
-    {
-        float fValue = 0;
-        if (s)
-        {
-            fValue = (float)atof(s);
-        }
-
-        if (fValue == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        if (m_pConsole->OnBeforeVarChange(this, s))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_fValue = fValue;
-
-            CallOnChangeFunctions();
-
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual void Set(float f)
-    {
-        if (f == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        stack_string s;
-        s.Format("%g", f);
-
-        if (m_pConsole->OnBeforeVarChange(this, s.c_str()))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_fValue = f;
-
-            CallOnChangeFunctions();
-
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual void Set(int i)
-    {
-        if ((float)i == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        char sTemp[128];
-        sprintf_s(sTemp, "%d", i);
-
-        if (m_pConsole->OnBeforeVarChange(this, sTemp))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_fValue = (float)i;
-            CallOnChangeFunctions();
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual int GetType() { return CVAR_FLOAT; }
-
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
-
-protected:
-
-    virtual const char* GetOwnDataProbeString() const
-    {
-        static char szReturnString[8];
-
-        sprintf_s(szReturnString, "%.1g", m_fValue);
-        return szReturnString;
-    }
-
-private: // --------------------------------------------------------------------------------------------
-
-    float                           m_fValue;                                           
-    float                           m_fDefault;                             //!<
-};
-
-
-class CXConsoleVariableIntRef
-    : public CXConsoleVariableBase
-{
-public:
-    //! constructor
-    //!\param pVar must not be 0
-    CXConsoleVariableIntRef(CXConsole* pConsole, const char* sName, int32* pVar, int nFlags, const char* help)
-        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
-        , m_iValue(*pVar)
-        , m_iDefault(*pVar)
-    {
-        assert(pVar);
-    }
-
-    // interface ICVar --------------------------------------------------------------------------------------
-
-    virtual int GetIVal() const { return m_iValue; }
-    virtual int64 GetI64Val() const { return m_iValue; }
-    virtual float GetFVal() const { return (float)m_iValue; }
-    virtual const char* GetString() const
-    {
-        static char szReturnString[256];
-
-        sprintf_s(szReturnString, "%d", m_iValue);
-        return szReturnString;
-    }
-    virtual void ResetImpl() { Set(m_iDefault); }
-    virtual void Set(const char* s)
-    {
-        int nValue = TextToInt(s, m_iValue, (m_nFlags & VF_BITFIELD) != 0);
-        if (nValue == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        if (m_pConsole->OnBeforeVarChange(this, s))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_iValue = nValue;
-
-            CallOnChangeFunctions();
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual void Set(float f)
-    {
-        if ((int)f == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        char sTemp[128];
-        sprintf_s(sTemp, "%g", f);
-
-        if (m_pConsole->OnBeforeVarChange(this, sTemp))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_iValue = (int)f;
-            CallOnChangeFunctions();
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual void Set(int i)
-    {
-        if (i == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        char sTemp[128];
-        sprintf_s(sTemp, "%d", i);
-
-        if (m_pConsole->OnBeforeVarChange(this, sTemp))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_iValue = i;
-            CallOnChangeFunctions();
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual int GetType() { return CVAR_INT; }
-
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
-private: // --------------------------------------------------------------------------------------------
-
-    int&                           m_iValue;                                            
-    int                            m_iDefault;                                  //!<
-};
-
-
-
-
-
-class CXConsoleVariableFloatRef
-    : public CXConsoleVariableBase
-{
-public:
-    //! constructor
-    //!\param pVar must not be 0
-    CXConsoleVariableFloatRef(CXConsole* pConsole, const char* sName, float* pVar, int nFlags, const char* help)
-        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
-        , m_fValue(*pVar)
-        , m_fDefault(*pVar)
-    {
-        assert(pVar);
-    }
-
-    // interface ICVar --------------------------------------------------------------------------------------
-
-    virtual int GetIVal() const { return (int)m_fValue; }
-    virtual int64 GetI64Val() const { return (int64)m_fValue; }
-    virtual float GetFVal() const { return m_fValue; }
-    virtual const char* GetString() const
-    {
-        static char szReturnString[256];
-
-        sprintf_s(szReturnString, "%g", m_fValue);
-        return szReturnString;
-    }
-    virtual void ResetImpl() { Set(m_fDefault); }
-    virtual void Set(const char* s)
-    {
-        float fValue = 0;
-        if (s)
-        {
-            fValue = (float)atof(s);
-        }
-        if (fValue == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        if (m_pConsole->OnBeforeVarChange(this, s))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_fValue = fValue;
-
-            CallOnChangeFunctions();
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual void Set(float f)
-    {
-        if (f == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        char sTemp[128];
-        sprintf_s(sTemp, "%g", f);
-
-        if (m_pConsole->OnBeforeVarChange(this, sTemp))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_fValue = f;
-            CallOnChangeFunctions();
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual void Set(int i)
-    {
-        if ((float)i == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        char sTemp[128];
-        sprintf_s(sTemp, "%d", i);
-
-        if (m_pConsole->OnBeforeVarChange(this, sTemp))
-        {
-            m_nFlags |= VF_MODIFIED;
-            m_fValue = (float)i;
-            CallOnChangeFunctions();
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual int GetType() { return CVAR_FLOAT; }
-
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
-
-protected:
-
-    virtual const char* GetOwnDataProbeString() const
-    {
-        static char szReturnString[8];
-
-        sprintf_s(szReturnString, "%.1g", m_fValue);
-        return szReturnString;
-    }
-
-private: // --------------------------------------------------------------------------------------------
-
-    float&                         m_fValue;
-    float                          m_fDefault;                                  //!<
-};
-
-
-
-class CXConsoleVariableStringRef
-    : public CXConsoleVariableBase
-{
-public:
-    //! constructor
-    //!\param userBuf must not be 0
-    CXConsoleVariableStringRef(CXConsole* pConsole, const char* sName, const char** userBuf, const char* defaultValue, int nFlags, const char* help)
-        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
-        , m_sValue(defaultValue)
-        , m_sDefault(defaultValue)
-        , m_userPtr(*userBuf)
-    {
-        m_userPtr = m_sValue.c_str();
-        assert(userBuf);
-    }
-
-    // interface ICVar --------------------------------------------------------------------------------------
-
-    virtual int GetIVal() const { return atoi(m_sValue.c_str()); }
-    virtual int64 GetI64Val() const { return _atoi64(m_sValue.c_str()); }
-    virtual float GetFVal() const { return (float)atof(m_sValue.c_str()); }
-    virtual const char* GetString() const
-    {
-        return m_sValue.c_str();
-    }
-    virtual void ResetImpl() { Set(m_sDefault); }
-    virtual void Set(const char* s)
-    {
-        if ((m_sValue == s) && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
-        {
-            return;
-        }
-
-        if (m_pConsole->OnBeforeVarChange(this, s))
-        {
-            m_nFlags |= VF_MODIFIED;
-            {
-                m_sValue = s;
-                m_userPtr = m_sValue.c_str();
-            }
-
-            CallOnChangeFunctions();
-            m_pConsole->OnAfterVarChange(this);
-        }
-    }
-    virtual void Set(float f)
-    {
-        stack_string s;
-        s.Format("%g", f);
-        Set(s.c_str());
-    }
-    virtual void Set(int i)
-    {
-        stack_string s;
-        s.Format("%d", i);
-        Set(s.c_str());
-    }
-    virtual int GetType() { return CVAR_STRING; }
-
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
-private: // --------------------------------------------------------------------------------------------
-
-    string m_sValue;
-    string m_sDefault;
-    const char*& m_userPtr;                                         //!<
-};
-
-
-
-// works like CXConsoleVariableInt but when changing it sets other console variables
-// getting the value returns the last value it was set to - if that is still what was applied
-// to the cvars can be tested with GetRealIVal()
-class CXConsoleVariableCVarGroup
-    : public CXConsoleVariableInt
-    , public ILoadConfigurationEntrySink
-{
-public:
-    // constructor
-    CXConsoleVariableCVarGroup(CXConsole* pConsole, const char* sName, const char* szFileName, int nFlags);
-
-    // destructor
-    ~CXConsoleVariableCVarGroup();
-
-    // Returns:
-    //   part of the help string - useful to log out detailed description without additional help text
-    string GetDetailedInfo() const;
-
-    // interface ICVar -----------------------------------------------------------------------------------
-
-    virtual const char* GetHelp();
-
-    virtual int GetRealIVal() const;
-
-    virtual void DebugLog(const int iExpectedValue, const ICVar::EConsoleLogMode mode) const;
-
-    virtual void Set(int i);
-
-    // ConsoleVarFunc ------------------------------------------------------------------------------------
-
-    static void OnCVarChangeFunc(ICVar* pVar);
-
-    // interface ILoadConfigurationEntrySink -------------------------------------------------------------
-
-    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup);
-    virtual void OnLoadConfigurationEntry_End();
-
-    virtual void GetMemoryUsage(class ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_sDefaultValue);
-        pSizer->AddObject(m_CVarGroupStates);
-    }
-private: // --------------------------------------------------------------------------------------------
-
-    struct SCVarGroup
-    {
-        std::map<string, string>                         m_KeyValuePair;                 // e.g. m_KeyValuePair["r_fullscreen"]="0"
-        void GetMemoryUsage(class ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(m_KeyValuePair);
-        }
-    };
-
-    SCVarGroup                                                      m_CVarGroupDefault;
-    typedef std::map<int, SCVarGroup*>      TCVarGroupStateMap;
-    TCVarGroupStateMap                                      m_CVarGroupStates;
-    string                                                              m_sDefaultValue;                // used by OnLoadConfigurationEntry_End()
-
-    void ApplyCVars(const SCVarGroup& rGroup, const SCVarGroup* pExclude = 0);
-
-    // Arguments:
-    //   sKey - must exist, at least in default
-    //   pSpec - can be 0
-    string GetValueSpec(const string& sKey, const int* pSpec = 0) const;
-
-    // should only be used by TestCVars()
-    // Returns:
-    //   true=all console variables match the state (excluding default state), false otherwise
-    bool TestCVars(const SCVarGroup& rGroup, const ICVar::EConsoleLogMode mode, const SCVarGroup* pExclude = 0) const;
-
-    // Arguments:
-    //   pGroup - can be 0 to test if the default state is set
-    // Returns:
-    //   true=all console variables match the state (including default state), false otherwise
-    bool TestCVars(const SCVarGroup* pGroup, const ICVar::EConsoleLogMode mode = ICVar::eCLM_Off) const;
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_XCONSOLEVARIABLE_H
diff --git a/Code/CryEngine/CrySystem/XML/CMakeLists.txt b/Code/CryEngine/CrySystem/XML/CMakeLists.txt
deleted file mode 100644
index cc63dbf9c1..0000000000
--- a/Code/CryEngine/CrySystem/XML/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-ly_add_target(
-    NAME CrySystem.XMLBinary STATIC
-    NAMESPACE Legacy
-    FILES_CMAKE
-        crysystem_xmlbinary_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PUBLIC
-            Legacy::CryCommon
-)
diff --git a/Code/CryEngine/CrySystem/XML/ReadWriteXMLSink.h b/Code/CryEngine/CrySystem/XML/ReadWriteXMLSink.h
deleted file mode 100644
index ad6c057c23..0000000000
--- a/Code/CryEngine/CrySystem/XML/ReadWriteXMLSink.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_READWRITEXMLSINK_H
-#define CRYINCLUDE_CRYSYSTEM_XML_READWRITEXMLSINK_H
-#pragma once
-
-
-#include <ISystem.h>
-#include <IReadWriteXMLSink.h>
-
-class CReadWriteXMLSink
-    : public IReadWriteXMLSink
-{
-public:
-    bool ReadXML(const char* definitionFile, const char* dataFile, IReadXMLSink* pSink);
-    bool ReadXML(const char* definitionFile, XmlNodeRef node, IReadXMLSink* pSink);
-    bool ReadXML(XmlNodeRef definition, const char* dataFile, IReadXMLSink* pSink);
-    bool ReadXML(XmlNodeRef definition, XmlNodeRef node, IReadXMLSink* pSink);
-
-    XmlNodeRef CreateXMLFromSource(const char* definitionFile, IWriteXMLSource* pSource);
-    bool WriteXML(const char* definitionFile, const char* dataFile, IWriteXMLSource* pSource);
-};
-
-
-// helper to define the if/else chain that we need in a few locations...
-// types must match IReadXMLSink::TValueTypes
-#define XML_SET_PROPERTY_HELPER(ELSE_LOAD_PROPERTY) \
-    if (false) {; }                                 \
-    ELSE_LOAD_PROPERTY(Vec3);                       \
-    ELSE_LOAD_PROPERTY(int);                        \
-    ELSE_LOAD_PROPERTY(float);                      \
-    ELSE_LOAD_PROPERTY(string);                     \
-    ELSE_LOAD_PROPERTY(bool);
-
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_READWRITEXMLSINK_H
diff --git a/Code/CryEngine/CrySystem/XML/ReadXMLSink.cpp b/Code/CryEngine/CrySystem/XML/ReadXMLSink.cpp
deleted file mode 100644
index aef4f06801..0000000000
--- a/Code/CryEngine/CrySystem/XML/ReadXMLSink.cpp
+++ /dev/null
@@ -1,681 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "ReadWriteXMLSink.h"
-
-#include <ISystem.h>
-#include <stack>
-
-typedef std::map<string, XmlNodeRef> IdTable;
-struct SParseParams
-{
-    IdTable idTable;
-    XmlNodeRef useAlways;
-    bool strict;
-
-    SParseParams()
-    {
-        strict = true;
-    }
-};
-
-static XmlNodeRef Clone(XmlNodeRef source);
-static void CopyAttributes(const XmlNodeRef& source, XmlNodeRef& dest);
-static bool IsOptionalReadXML(const SParseParams& parseParams, XmlNodeRef& definition);
-static bool CheckEnum(const SParseParams& parseParams, const char* name, XmlNodeRef& definition, XmlNodeRef& data);
-
-static bool LoadTableInner(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
-static bool LoadArray(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
-static bool LoadProperty(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
-static bool LoadTable(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
-static bool LoadReferencedId(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
-static bool LoadSomething(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
-static bool LoadArraySetValueTable(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem);
-
-typedef bool (* LoadArraySetValue)(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem);
-typedef bool (* LoadDefinitionFunction)(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
-
-
-template <class T>
-struct ReadPropertyTyped;
-
-template <class T>
-struct ReadPropertyTyped
-{
-    static bool Load(const SParseParams& parseParams, const char* name, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
-    {
-        T value;
-        memset(&value, 0, sizeof(T));
-
-        if (!pSink->IsCreationMode())
-        {
-            if (!data->haveAttr(name))
-            {
-                return false;
-            }
-            if (!data->getAttr(name, value))
-            {
-                return false;
-            }
-            if (!CheckEnum(parseParams, name, definition, data))
-            {
-                return false;
-            }
-        }
-
-        IReadXMLSink::TValue vvalue(value);
-        pSink->SetValue(name, vvalue, definition);
-        return true;
-    }
-    static bool LoadArray([[maybe_unused]] const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem)
-    {
-        T value;
-        memset(&value, 0, sizeof(T));
-
-        if (!pSink->IsCreationMode())
-        {
-            if (!data->haveAttr("value"))
-            {
-                return false;
-            }
-            if (!data->getAttr("value", value))
-            {
-                return false;
-            }
-        }
-
-        IReadXMLSink::TValue vvalue(value);
-        pSink->SetAt(elem, vvalue, definition);
-        return true;
-    }
-};
-
-template <>
-struct ReadPropertyTyped<string>
-{
-    static bool Load(const SParseParams& parseParams, const char* name, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
-    {
-        const char* value = 0;
-
-        if (!pSink->IsCreationMode())
-        {
-            if (!data->haveAttr(name))
-            {
-                return false;
-            }
-            if (!CheckEnum(parseParams, name, definition, data))
-            {
-                return false;
-            }
-
-            value = data->getAttr(name);
-        }
-
-        IReadXMLSink::TValue vvalue(value);
-        pSink->SetValue(name, vvalue, definition);
-        return true;
-    }
-    static bool LoadArray([[maybe_unused]] const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem)
-    {
-        const char* value = 0;
-
-        if (!pSink->IsCreationMode())
-        {
-            if (!data->haveAttr("value"))
-            {
-                return false;
-            }
-
-            value = data->getAttr("value");
-        }
-
-        IReadXMLSink::TValue vvalue(value);
-        pSink->SetAt(elem, vvalue, definition);
-        return true;
-    }
-};
-
-XmlNodeRef Clone(XmlNodeRef source)
-{
-    assert(source != (IXmlNode*)NULL);
-
-    // Can't use clone() on XmlNodeRef objects since they can contain a CXMLBinaryNode, which doesn't support
-    // clone(). Instead we just create a regular xml node and manually copy content, tag, attributes and children
-    XmlNodeRef cloned = GetISystem()->CreateXmlNode(source->getTag());
-    cloned->setContent(source->getContent());
-    CopyAttributes(source, cloned);
-    const int iChildCount = source->getChildCount();
-    for (int i = 0; i < iChildCount; ++i)
-    {
-        cloned->addChild(Clone(source->getChild(i)));
-    }
-
-    return cloned;
-}
-
-void CopyAttributes(const XmlNodeRef& source, XmlNodeRef& dest)
-{
-    // Not as fast as CXmlNode::copyAttributes(), but that method will have undefined behavior if the XmlNodeRef contains
-    // a CBinaryXmlNode object
-    int nNumAttributes = source->getNumAttributes();
-    for (int i = 0; i < nNumAttributes; ++i)
-    {
-        const char* key = NULL;
-        const char* value = NULL;
-        if (source->getAttributeByIndex(i, &key, &value))
-        {
-            dest->setAttr(key, value);
-        }
-    }
-}
-
-bool IsOptionalReadXML(const SParseParams& parseParams, XmlNodeRef& definition)
-{
-    // If strict mode is off, then everything is optional
-    if (parseParams.strict == false)
-    {
-        return true;
-    }
-
-    bool optional = false;
-    definition->getAttr("optional", optional);
-    return optional;
-}
-
-bool CheckEnum([[maybe_unused]] const SParseParams& parseParams, [[maybe_unused]] const char* name, XmlNodeRef& definition, [[maybe_unused]] XmlNodeRef& data)
-{
-    if (XmlNodeRef enumNode = definition->findChild("Enum"))
-    {
-        // If strict mode is off, then no need to check the enum value
-        return true;
-    }
-    return true;
-}
-
-bool LoadProperty(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
-{
-    const char* name = definition->getAttr("name");
-    if (0 == strlen(name))
-    {
-        CryLog("Property has no name");
-        return false;
-    }
-
-    const char* type = definition->getAttr("type");
-    if (0 == strlen(type))
-    {
-        CryLog("Property '%s' has no type", type);
-        return false;
-    }
-
-    XmlNodeRef dataToRead = data;
-    if (!pSink->IsCreationMode())
-    {
-        // This check is done so the data xml can specify child elements instead of attributes if desired,
-        // since the rest of the code assume only attributes
-        if (XmlNodeRef childRef = data->findChild(name))
-        {
-            if (data->haveAttr(name))
-            {
-                CryLog("Duplicate definition (attribute and element) for %s", name);
-                return false;
-            }
-            if (childRef->getChildCount())
-            {
-                CryLog("Property-style elements can not have children (property was %s)", name);
-                return false;
-            }
-
-            dataToRead = GetISystem()->CreateXmlNode(data->getTag());
-
-            string content = childRef->getContent();
-            dataToRead->setAttr(name, content.Trim().c_str());
-        }
-
-        if (!dataToRead->haveAttr(name))
-        {
-            if (!IsOptionalReadXML(parseParams, definition))
-            {
-                CryLog("Failed to load property %s", name);
-                return false;
-            }
-            return true;
-        }
-    }
-
-    bool ok = false;
-#define LOAD_PROPERTY(whichType) else if (0 == strcmp(type, #whichType)) ok = ReadPropertyTyped<whichType>::Load(parseParams, name, definition, dataToRead, pSink)
-    XML_SET_PROPERTY_HELPER(LOAD_PROPERTY);
-#undef LOAD_PROPERTY
-
-    if (!ok)
-    {
-        CryLog("Failed loading attribute %s of type %s", name, type);
-    }
-
-    return ok;
-}
-
-bool LoadArraySetValueTable(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem)
-{
-    IReadXMLSinkPtr pChildSink = pSink->BeginTableAt(elem, definition);
-
-    if (pSink->IsCreationMode() && definition->haveAttr("type"))
-    {
-        if (!LoadSomething(parseParams, definition, data, &*pChildSink))
-        {
-            return false;
-        }
-    }
-    else
-    {
-        if (!LoadTableInner(parseParams, definition, data, &*pChildSink))
-        {
-            return false;
-        }
-    }
-
-    if (!pChildSink->EndTableAt(elem))
-    {
-        CryLog("Failed to finish table at element %d", elem);
-        return false;
-    }
-
-    return true;
-}
-
-bool LoadArray(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
-{
-    const char* name = definition->getAttr("name");
-    if (0 == strlen(name))
-    {
-        CryLog("Array has no name");
-        return false;
-    }
-
-    const char* elementName = definition->getAttr("elementName");
-    if (0 == strlen(elementName))
-    {
-        elementName = "element";
-    }
-
-    bool validateArray = true;
-    if (definition->haveAttr(elementName))
-    {
-        definition->getAttr("validate", validateArray);
-    }
-
-
-    XmlNodeRef childData;
-
-    if (!pSink->IsCreationMode())
-    {
-        childData = data->findChild(name);
-        if (!childData)
-        {
-            bool ok = IsOptionalReadXML(parseParams, definition);
-            if (!ok)
-            {
-                CryLog("Failed to load child table %s", name);
-            }
-            return ok;
-        }
-    }
-
-    IReadXMLSinkPtr childSink = pSink->BeginArray(name, definition);
-    if (!childSink)
-    {
-        CryLog("Failed to begin array named %s", name);
-        return false;
-    }
-
-    LoadArraySetValue setter = NULL;
-    if (definition->haveAttr("type"))
-    {
-        setter = NULL;
-        const char* type = definition->getAttr("type");
-#define SETTER_PROPERTY(whichType) else if (0 == strcmp(type, #whichType)) setter = ReadPropertyTyped<whichType>::LoadArray
-        XML_SET_PROPERTY_HELPER(SETTER_PROPERTY);
-#undef SETTER_PROPERTY
-        if (!setter)
-        {
-            CryLog("Unknown type %s in array %s", type, name);
-            return false;
-        }
-    }
-    else
-    {
-        setter = LoadArraySetValueTable;
-    }
-
-    if (!pSink->IsCreationMode())
-    {
-        int numElems = childData->getChildCount();
-        int elem = 1;
-        for (int i = 0; i < numElems; i++)
-        {
-            XmlNodeRef elemData = childData->getChild(i);
-            if (0 == strcmp(elemData->getTag(), elementName))
-            {
-                int increment = 1;
-                if (elemData->haveAttr("_index"))
-                {
-                    if (!elemData->getAttr("_index", elem))
-                    {
-                        CryLog("_index is not an integer in array %s (pos hint=%d)", name, elem);
-                        return false;
-                    }
-                }
-                if (!setter(parseParams, definition, elemData, &*childSink, elem))
-                {
-                    CryLog("Failed loading element %d of array %s", elem, name);
-                    return false;
-                }
-                elem += increment;
-            }
-            else if (validateArray)
-            {
-                CryLog("Invalid node %s in array %s", elemData->getTag(), name);
-                return false;
-            }
-        }
-    }
-    else
-    {
-        // only process array content for the array being created
-        if (0 == strcmp(name, pSink->GetCreationNode()->getAttr("name")))
-        {
-            if (!setter(parseParams, definition, data, &*childSink, 1))
-            {
-                CryLog("[ReadXML CreationMode]: Failed loading element %d of array %s", 1, name);
-                return false;
-            }
-        }
-    }
-
-    if (!pSink->EndArray(name))
-    {
-        CryLog("Failed to finish array named %s", name);
-        return false;
-    }
-
-    return true;
-}
-
-bool LoadTable(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
-{
-    const char* name = definition->getAttr("name");
-    if (0 == strlen(name))
-    {
-        CryLog("Child-table has no name");
-        return false;
-    }
-
-    XmlNodeRef childData;
-
-    if (!pSink->IsCreationMode())
-    {
-        childData = data->findChild(name);
-        if (!childData)
-        {
-            bool ok = IsOptionalReadXML(parseParams, definition);
-            if (!ok)
-            {
-                CryLog("Failed to load child table %s", name);
-            }
-            return ok;
-        }
-    }
-
-    IReadXMLSinkPtr childSink = pSink->BeginTable(name, definition);
-    if (!childSink)
-    {
-        CryLog("Sink creation failed for table %s", name);
-        return false;
-    }
-
-
-    if (!LoadTableInner(parseParams, definition, childData, childSink))
-    {
-        CryLog("Failed to load data for child table %s", name);
-        return false;
-    }
-
-    if (!pSink->EndTable(name))
-    {
-        CryLog("Table %s failed to complete in sink", name);
-        return false;
-    }
-
-    return true;
-}
-
-bool LoadSomething(const SParseParams& parseParams, XmlNodeRef& nodeDefinition, XmlNodeRef& data, IReadXMLSink* pSink)
-{
-    // Ignore if it's the useAlways array
-    if (parseParams.useAlways == nodeDefinition)
-    {
-        return true;
-    }
-
-    static struct
-    {
-        const char* name;
-        LoadDefinitionFunction loader;
-    } loaderTypes[] = {
-        {"Property", &LoadProperty},
-        {"Array", &LoadArray},
-        {"Table", &LoadTable},
-        {"Use", &LoadReferencedId},
-    };
-    static const int numLoaderTypes = sizeof(loaderTypes) / sizeof(*loaderTypes);
-
-    const char* nodeDefinitionTag = nodeDefinition->getTag();
-    bool ok = false;
-    int i;
-
-    for (i = 0; i < numLoaderTypes; i++)
-    {
-        if (0 == strcmp(loaderTypes[i].name, nodeDefinitionTag))
-        {
-            ok = loaderTypes[i].loader(parseParams, nodeDefinition, data, pSink);
-            break;
-        }
-    }
-
-    if (0 == _stricmp("Settings", nodeDefinitionTag))
-    {
-        return true;
-    }
-
-    if (!ok)
-    {
-        if (i == numLoaderTypes)
-        {
-            CryLog("Invalid definition node type %s, line %d", nodeDefinitionTag, nodeDefinition->getLine());
-        }
-    }
-    return ok;
-}
-
-bool LoadReferencedId(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
-{
-    IdTable::const_iterator iter = parseParams.idTable.find(definition->getAttr("id"));
-    if (iter == parseParams.idTable.end())
-    {
-        CryLog("No definition with id '%s'", definition->getAttr("id"));
-        return false;
-    }
-    XmlNodeRef useDefinition = Clone(iter->second);
-    CopyAttributes(definition, useDefinition);
-
-    return LoadSomething(parseParams, useDefinition, data, pSink);
-}
-
-bool LoadTableInner(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
-{
-    const int nChildrenDefinition = definition->getChildCount();
-
-    for (int nChildDefinition = 0; nChildDefinition < nChildrenDefinition; nChildDefinition++)
-    {
-        XmlNodeRef nodeDefinition = definition->getChild(nChildDefinition);
-
-        if (!LoadSomething(parseParams, nodeDefinition, data, pSink))
-        {
-            return false;
-        }
-    }
-
-    if (parseParams.useAlways != (IXmlNode*)NULL)
-    {
-        assert(!definition->haveAttr("type"));
-
-        const int nUseAlwaysDefCount = parseParams.useAlways->getChildCount();
-        for (int i = 0; i < nUseAlwaysDefCount; ++i)
-        {
-            XmlNodeRef nodeDefinition = parseParams.useAlways->getChild(i);
-
-            // Don't continue loading useAlways nodes in creation mode
-            if (!pSink->IsCreationMode())
-            {
-                if (!LoadSomething(parseParams, nodeDefinition, data, pSink))
-                {
-                    return false;
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-bool CReadWriteXMLSink::ReadXML(XmlNodeRef rootDefinition, XmlNodeRef rootData, IReadXMLSink* pSink)
-{
-    if (!pSink->IsCreationMode())
-    {
-        if (0 == rootData)
-        {
-            return false;
-        }
-
-        if (0 != strcmp(rootDefinition->getTag(), "Definition"))
-        {
-            CryLog("Root tag of definition file was %s; expected Definition", rootDefinition->getTag());
-            return false;
-        }
-        if (rootDefinition->haveAttr("root"))
-        {
-            if (0 != strcmp(rootDefinition->getAttr("root"), rootData->getTag()))
-            {
-                CryLog("Root data has wrong tag; was %s expected %s", rootData->getTag(), rootDefinition->getAttr("root"));
-                return false;
-            }
-        }
-    }
-
-    SParseParams parseParams;
-    parseParams.useAlways = rootDefinition->findChild("AllowAlways");
-
-    if (XmlNodeRef settingsParams = rootDefinition->findChild("Settings"))
-    {
-        settingsParams->getAttr("strict", parseParams.strict);
-    }
-
-    // scan for id's in the structure (for the Use member)
-    std::stack<XmlNodeRef> scanStack;
-    scanStack.push(rootDefinition);
-    while (!scanStack.empty())
-    {
-        XmlNodeRef refNode = scanStack.top();
-        scanStack.pop();
-
-        int numChildren = refNode->getChildCount();
-        const char* tag = refNode->getTag();
-
-        for (int i = 0; i < numChildren; i++)
-        {
-            const XmlNodeRef& childNodeRef = refNode->getChild(i);
-            if (parseParams.useAlways != childNodeRef)
-            {
-                scanStack.push(childNodeRef);
-            }
-        }
-
-        // If the element has an attribute id="" and is not a "<Use>" element add it to the idTable map
-        if (refNode->haveAttr("id") && 0 != strcmp("Use", tag))
-        {
-            parseParams.idTable[refNode->getAttr("id")] = refNode;
-        }
-    }
-
-    if (pSink->IsCreationMode() && rootDefinition->haveAttr("type"))
-    {
-        // if creating from a 0-child definition node, load itself
-        if (!LoadSomething(parseParams, rootDefinition, rootData, pSink))
-        {
-            return false;
-        }
-    }
-    else
-    {
-        // load content
-        if (!LoadTableInner(parseParams, rootDefinition, rootData, pSink))
-        {
-            return false;
-        }
-    }
-
-    bool ok = pSink->Complete();
-    if (!ok)
-    {
-        CryLog("Warning: sink failed to complete reading");
-    }
-
-    return ok;
-}
-
-bool CReadWriteXMLSink::ReadXML(XmlNodeRef definition, const char* dataFile, IReadXMLSink* pSink)
-{
-    XmlNodeRef rootData = GetISystem()->LoadXmlFromFile(dataFile);
-    if (!rootData)
-    {
-        CryLog("Unable to load XML-Lua data file: %s", dataFile);
-        return false;
-    }
-    return ReadXML(definition, rootData, pSink);
-}
-
-bool CReadWriteXMLSink::ReadXML(const char* definitionFile, XmlNodeRef rootData, IReadXMLSink* pSink)
-{
-    XmlNodeRef rootDefinition = GetISystem()->LoadXmlFromFile(definitionFile);
-    if (!rootDefinition)
-    {
-        CryLog("Unable to load XML-Lua definition file: %s", definitionFile);
-        return false;
-    }
-    return ReadXML(rootDefinition, rootData, pSink);
-}
-
-bool CReadWriteXMLSink::ReadXML(const char* definitionFile, const char* dataFile, IReadXMLSink* pSink)
-{
-    XmlNodeRef rootData = GetISystem()->LoadXmlFromFile(dataFile);
-    if (!rootData)
-    {
-        CryLog("Unable to load XML-Lua data file: %s", dataFile);
-        return false;
-    }
-    if (!ReadXML(definitionFile, rootData, pSink))
-    {
-        CryLog("Unable to load file %s", dataFile);
-        return false;
-    }
-    return true;
-}
-
-
diff --git a/Code/CryEngine/CrySystem/XML/SerializeXMLReader.cpp b/Code/CryEngine/CrySystem/XML/SerializeXMLReader.cpp
deleted file mode 100644
index 94f2812ba3..0000000000
--- a/Code/CryEngine/CrySystem/XML/SerializeXMLReader.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "SerializeXMLReader.h"
-#include <ISystem.h>
-
-#define TAG_SCRIPT_VALUE "v"
-#define TAG_SCRIPT_TYPE "t"
-#define TAG_SCRIPT_NAME "n"
-
-//#define LOG_SERIALIZE_STACK(tag,szName) CryLogAlways( "<%s> %s/%s",tag,GetStackInfo(),szName );
-#define LOG_SERIALIZE_STACK(tag, szName)
-
-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);
-}
-
-bool CSerializeXMLReaderImpl::Value(const char* name, int8& value)
-{
-    DefaultValue(value); // Set input value to default.
-    if (m_nErrors)
-    {
-        return false;
-    }
-    int temp;
-    bool bResult = Value(name, temp);
-    if (temp < -128 || temp > 127)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Attribute %s is out of range (%d)", name, temp);
-        Failed();
-        bResult = false;
-    }
-    else
-    {
-        value = temp;
-    }
-    return bResult;
-}
-
-bool CSerializeXMLReaderImpl::Value(const char* name, string& value)
-{
-    DefaultValue(value); // Set input value to default.
-    if (m_nErrors)
-    {
-        return false;
-    }
-    if (!CurNode()->haveAttr(name))
-    {
-        //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"No such attribute %s (invalid type?)", name);
-        //Failed();
-        return false;
-    }
-    else
-    {
-        value = CurNode()->getAttr(name);
-    }
-    return true;
-}
-
-bool CSerializeXMLReaderImpl::Value(const char* name, CTimeValue& value)
-{
-    DefaultValue(value); // Set input value to default.
-    if (m_nErrors)
-    {
-        return false;
-    }
-    XmlNodeRef nodeRef = CurNode();
-    if (!nodeRef)
-    {
-        return false;
-    }
-    if (0 == strcmp("zero", nodeRef->getAttr(name)))
-    {
-        value = CTimeValue(0.0f);
-    }
-    else
-    {
-        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)
-            // 0.0 means current time, whereas "zero" really means CTimeValue(0.0), see above
-            return false;
-        }
-        else
-        {
-            value = CTimeValue(gEnv->pTimer->GetFrameStartTime() + delta);
-        }
-    }
-    return true;
-}
-
-bool CSerializeXMLReaderImpl::Value(const char* name, XmlNodeRef& value)
-{
-    DefaultValue(value); // Set input value to default.
-    if (m_nErrors)
-    {
-        return false;
-    }
-
-    if (BeginOptionalGroup(name, true))
-    {
-        value = CurNode()->getChild(0);
-        EndGroup();
-    }
-
-    return true;
-}
-
-void CSerializeXMLReaderImpl::BeginGroup(const char* szName)
-{
-    if (m_nErrors)
-    {
-        //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"BeginGroup %s called on non-existant group", szName);
-        m_nErrors++;
-    }
-    else if (XmlNodeRef node = NextOf(szName))
-    {
-        m_nodeStack.push_back(CParseState());
-        m_nodeStack.back().Init(node);
-        LOG_SERIALIZE_STACK("BeginGroup:ok", szName);
-    }
-    else
-    {
-        LOG_SERIALIZE_STACK("BeginGroup:fail", szName);
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!BeginGroup( %s ) not found", szName);
-        m_nErrors++;
-    }
-}
-
-bool CSerializeXMLReaderImpl::BeginOptionalGroup(const char* szName, [[maybe_unused]] bool condition)
-{
-    if (m_nErrors)
-    {
-        //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"BeginOptionalGroup %s called on non-existant group", szName);
-        m_nErrors++;
-    }
-    else if (XmlNodeRef node = NextOf(szName))
-    {
-        m_nodeStack.push_back(CParseState());
-        m_nodeStack.back().Init(node);
-        LOG_SERIALIZE_STACK("BeginOptionalGroup:ok", szName);
-        return true;
-    }
-    LOG_SERIALIZE_STACK("BeginOptionalGroup:fail", szName);
-    return false;
-}
-
-void CSerializeXMLReaderImpl::EndGroup()
-{
-    if (m_nErrors)
-    {
-        m_nErrors--;
-    }
-    else
-    {
-        LOG_SERIALIZE_STACK("EndGroup", "");
-        m_nodeStack.pop_back();
-    }
-    assert(!m_nodeStack.empty());
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CSerializeXMLReaderImpl::GetStackInfo() const
-{
-    static string str;
-    str.assign("");
-    for (int i = 0; i < (int)m_nodeStack.size(); i++)
-    {
-        const char* name = m_nodeStack[i].m_node->getAttr(TAG_SCRIPT_NAME);
-        if (name && name[0])
-        {
-            str += name;
-        }
-        else
-        {
-            str += m_nodeStack[i].m_node->getTag();
-        }
-        if (i != m_nodeStack.size() - 1)
-        {
-            str += "/";
-        }
-    }
-    return str.c_str();
-}
-
-void CSerializeXMLReaderImpl::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->Add(*this);
-    pSizer->AddContainer(m_nodeStack);
-}
diff --git a/Code/CryEngine/CrySystem/XML/SerializeXMLReader.h b/Code/CryEngine/CrySystem/XML/SerializeXMLReader.h
deleted file mode 100644
index 70860632d4..0000000000
--- a/Code/CryEngine/CrySystem/XML/SerializeXMLReader.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLREADER_H
-#define CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLREADER_H
-#pragma once
-
-
-#include "SimpleSerialize.h"
-#include <stack>
-#include <IXml.h>
-#include <ITimer.h>
-#include <IValidator.h>
-#include <ISystem.h>
-#include "xml.h"
-
-class CSerializeXMLReaderImpl
-    : public CSimpleSerializeImpl<true, eST_SaveGame>
-{
-public:
-    CSerializeXMLReaderImpl(const XmlNodeRef& nodeRef);
-
-    template <class T_Value>
-    ILINE bool GetAttr(const XmlNodeRef& node, const char* name, T_Value& value)
-    {
-        XmlStrCmpFunc pPrevCmpFunc = g_pXmlStrCmp;
-        g_pXmlStrCmp = &strcmp; // Do case-sensitive compare
-        bool bReturn = node->getAttr(name, value);
-        g_pXmlStrCmp = pPrevCmpFunc;
-        return bReturn;
-    }
-    ILINE bool GetAttr(const XmlNodeRef& node, const char* name, SSerializeString& value)
-    {
-        XmlStrCmpFunc pPrevCmpFunc = g_pXmlStrCmp;
-        g_pXmlStrCmp = &strcmp; // Do case-sensitive compare
-        bool bReturn = node->haveAttr(name);
-        if (bReturn)
-        {            
-            value = node->getAttr(name);
-        }
-        g_pXmlStrCmp = pPrevCmpFunc;
-        return bReturn;
-    }
-    ILINE bool GetAttr([[maybe_unused]] XmlNodeRef& node, [[maybe_unused]] const char* name, [[maybe_unused]] const string& value)
-    {
-        return false;
-    }
-    ILINE bool GetAttr([[maybe_unused]] const XmlNodeRef& node, [[maybe_unused]] const char* name, [[maybe_unused]] SNetObjectID& value)
-    {
-        return false;
-    }
-
-    template <class T_Value>
-    bool Value(const char* name, T_Value& value)
-    {
-        DefaultValue(value); // Set input value to default.
-        if (m_nErrors)
-        {
-            return false;
-        }
-
-        if (!GetAttr(CurNode(), name, value))
-        {
-            //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"Unable to read attribute %s (invalid type?)", name);
-            //Failed();
-            return false;
-        }
-        return true;
-    }
-
-    bool Value(const char* name, int8& value);
-    bool Value(const char* name, string& value);
-    bool Value(const char* name, CTimeValue& value);
-    bool Value(const char* name, XmlNodeRef& value);
-
-    template <class T_Value, class T_Policy>
-    bool Value(const char* name, T_Value& value, [[maybe_unused]] const T_Policy& policy)
-    {
-        return Value(name, value);
-    }
-
-    void BeginGroup(const char* szName);
-    bool BeginOptionalGroup(const char* szName, bool condition);
-    void EndGroup();
-    const char* GetStackInfo() const;
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-private:
-    //CTimeValue m_curTime;
-    XmlNodeRef CurNode() { return m_nodeStack.back().m_node; }
-    XmlNodeRef NextOf(const char* name)
-    {
-        XmlStrCmpFunc pPrevCmpFunc = g_pXmlStrCmp;
-        g_pXmlStrCmp = &strcmp; // Do case-sensitive compare
-        assert(!m_nodeStack.empty());
-        CParseState& ps = m_nodeStack.back();
-        XmlNodeRef node = ps.GetNext(name);
-        g_pXmlStrCmp = pPrevCmpFunc;
-        return node;
-    }
-
-    class CParseState
-    {
-    public:
-        CParseState() {}
-        void Init(const XmlNodeRef& node)
-        {
-            m_node = node;
-            m_nCurrent = 0;
-        }
-
-        XmlNodeRef GetNext(const char* name)
-        {
-            int i;
-            int num = m_node->getChildCount();
-            for (i = m_nCurrent; i < num; i++)
-            {
-                XmlNodeRef child = m_node->getChild(i);
-                if (strcmp(child->getTag(), name) == 0)
-                {
-                    m_nCurrent = i + 1;
-                    return child;
-                }
-            }
-            int ncount = min(m_nCurrent, num);
-            // Try searching from begining.
-            for (i = 0; i < ncount; i++)
-            {
-                XmlNodeRef child = m_node->getChild(i);
-                if (strcmp(child->getTag(), name) == 0)
-                {
-                    m_nCurrent = i + 1;
-                    return child;
-                }
-            }
-            return XmlNodeRef();
-        }
-
-    public:
-        // TODO: make this much more efficient
-        int m_nCurrent;
-        XmlNodeRef m_node;
-    };
-
-    int m_nErrors;
-    std::vector<CParseState> m_nodeStack;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set Defaults.
-    //////////////////////////////////////////////////////////////////////////
-    void DefaultValue(bool& v) const { v = false; }
-    void DefaultValue(float& v) const { v = 0; }
-    void DefaultValue(double& v) const { v = 0; }
-    void DefaultValue(int8& v) const { v = 0; }
-    void DefaultValue(uint8& v) const { v = 0; }
-    void DefaultValue(int16& v) const { v = 0; }
-    void DefaultValue(uint16& v) const { v = 0; }
-    void DefaultValue(int32& v) const { v = 0; }
-    void DefaultValue(uint32& v) const { v = 0; }
-    void DefaultValue(int64& v) const { v = 0; }
-    void DefaultValue(uint64& v) const { v = 0; }
-    void DefaultValue(Vec2& v) const { v.x = 0; v.y = 0; }
-    void DefaultValue(Vec3& v) const { v.x = 0; v.y = 0; v.z = 0; }
-    void DefaultValue(Ang3& v) const { v.x = 0; v.y = 0; v.z = 0; }
-    void DefaultValue(Quat& v) const { v.w = 1.0f; v.v.x = 0; v.v.y = 0; v.v.z = 0; }
-    void DefaultValue(CTimeValue& v) const { v.SetValue(0); }
-    //void DefaultValue( char *str ) const { if (str) str[0] = 0; }
-    void DefaultValue(string& str) const { str = ""; }
-    void DefaultValue([[maybe_unused]] const string& str) const {}
-    void DefaultValue([[maybe_unused]] SNetObjectID& id) const {}
-    void DefaultValue([[maybe_unused]] SSerializeString& str) const {}
-    void DefaultValue(XmlNodeRef& ref) const { ref = NULL; }
-    //////////////////////////////////////////////////////////////////////////
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLREADER_H
diff --git a/Code/CryEngine/CrySystem/XML/SerializeXMLWriter.cpp b/Code/CryEngine/CrySystem/XML/SerializeXMLWriter.cpp
deleted file mode 100644
index 2a4e317994..0000000000
--- a/Code/CryEngine/CrySystem/XML/SerializeXMLWriter.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "SerializeXMLWriter.h"
-
-static const size_t MAX_NODE_STACK_DEPTH = 40;
-
-#define TAG_SCRIPT_VALUE "v"
-#define TAG_SCRIPT_TYPE "t"
-#define TAG_SCRIPT_NAME "n"
-
-CSerializeXMLWriterImpl::CSerializeXMLWriterImpl(const XmlNodeRef& nodeRef)
-{
-    m_curTime = gEnv->pTimer->GetFrameStartTime();
-    assert(!!nodeRef);
-    m_nodeStack.push_back(nodeRef);
-
-    m_luaSaveStack.reserve(10);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CSerializeXMLWriterImpl::~CSerializeXMLWriterImpl()
-{
-    if (m_nodeStack.size() != 1)
-    {
-        // Node stack is incorrect.
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!BeginGroup/EndGroup mismatch in SaveGame");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSerializeXMLWriterImpl::Value(const char* name, CTimeValue value)
-{
-    if (value == CTimeValue(0.0f))
-    {
-        AddValue(name, "zero");
-    }
-    else
-    {
-        AddValue(name, (value - m_curTime).GetSeconds());
-    }
-    return true;
-}
-
-bool CSerializeXMLWriterImpl::Value(const char* name, XmlNodeRef& value)
-{
-    if (BeginOptionalGroup(name, value != NULL))
-    {
-        CurNode()->addChild(value);
-        EndGroup();
-    }
-    return true;
-}
-
-void CSerializeXMLWriterImpl::BeginGroup(const char* szName)
-{
-    if (strchr(szName, ' ') != 0)
-    {
-        assert(0 && "Spaces in group name not supported");
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Spaces in group name not supported: %s/%s", GetStackInfo(), szName);
-    }
-    XmlNodeRef node = CreateNodeNamed(szName);
-    CurNode()->addChild(node);
-    m_nodeStack.push_back(node);
-    if (m_nodeStack.size() > MAX_NODE_STACK_DEPTH)
-    {
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Too Deep Node Stack:\r\n%s", GetStackInfo());
-    }
-}
-
-bool CSerializeXMLWriterImpl::BeginOptionalGroup(const char* szName, bool condition)
-{
-    if (condition)
-    {
-        BeginGroup(szName);
-        return true;
-    }
-
-    return condition;
-}
-
-XmlNodeRef CSerializeXMLWriterImpl::CreateNodeNamed(const char* name)
-{
-    XmlNodeRef newNode = CurNode()->createNode(name);
-    return newNode;
-}
-
-void CSerializeXMLWriterImpl::EndGroup()
-{
-    if (m_nodeStack.size() == 1)
-    {
-        //
-        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Misplaced EndGroup() for BeginGroup(%s)", CurNode()->getTag());
-    }
-    assert(!m_nodeStack.empty());
-    m_nodeStack.pop_back();
-    assert(!m_nodeStack.empty());
-}
-
-void CSerializeXMLWriterImpl::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->Add(*this);
-    pSizer->AddObject(m_nodeStack);
-    pSizer->AddContainer(m_luaSaveStack);
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CSerializeXMLWriterImpl::GetStackInfo() const
-{
-    static string str;
-    str.assign("");
-    for (int i = 0; i < (int)m_nodeStack.size(); i++)
-    {
-        const char* name = m_nodeStack[i]->getAttr(TAG_SCRIPT_NAME);
-        if (name && name[0])
-        {
-            str += name;
-        }
-        else
-        {
-            str += m_nodeStack[i]->getTag();
-        }
-        if (i != m_nodeStack.size() - 1)
-        {
-            str += "/";
-        }
-    }
-    return str.c_str();
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CSerializeXMLWriterImpl::GetLuaStackInfo() const
-{
-    static string str;
-    str.assign("");
-    for (int i = 0; i < (int)m_luaSaveStack.size(); i++)
-    {
-        const char* name = m_luaSaveStack[i];
-        str += name;
-        if (i != m_luaSaveStack.size() - 1)
-        {
-            str += ".";
-        }
-    }
-    return str.c_str();
-}
diff --git a/Code/CryEngine/CrySystem/XML/SerializeXMLWriter.h b/Code/CryEngine/CrySystem/XML/SerializeXMLWriter.h
deleted file mode 100644
index add59166b1..0000000000
--- a/Code/CryEngine/CrySystem/XML/SerializeXMLWriter.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLWRITER_H
-#define CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLWRITER_H
-#pragma once
-
-
-#include <ISystem.h>
-#include <ITimer.h>
-#include <IXml.h>
-#include "IValidator.h"
-#include "SimpleSerialize.h"
-
-class CSerializeXMLWriterImpl
-    : public CSimpleSerializeImpl<false, eST_SaveGame>
-{
-public:
-    CSerializeXMLWriterImpl(const XmlNodeRef& nodeRef);
-    ~CSerializeXMLWriterImpl();
-
-    template <class T_Value>
-    bool Value(const char* name, T_Value& value)
-    {
-        AddValue(name, value);
-        return true;
-    }
-
-    template <class T_Value, class T_Policy>
-    bool Value(const char* name, T_Value& value, [[maybe_unused]] const T_Policy& policy)
-    {
-        return Value(name, value);
-    }
-
-    bool Value(const char* name, CTimeValue value);
-    bool Value(const char* name, XmlNodeRef& value);
-
-    void BeginGroup(const char* szName);
-    bool BeginOptionalGroup(const char* szName, bool condition);
-    void EndGroup();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-private:
-    //////////////////////////////////////////////////////////////////////////
-    // Vars.
-    //////////////////////////////////////////////////////////////////////////
-    CTimeValue m_curTime;
-
-    std::vector<XmlNodeRef> m_nodeStack;
-    std::vector<const char*> m_luaSaveStack;
-    //////////////////////////////////////////////////////////////////////////
-
-
-    ILINE const XmlNodeRef& CurNode()
-    {
-        assert(!m_nodeStack.empty());
-        if (m_nodeStack.empty())
-        {
-            static XmlNodeRef temp = GetISystem()->CreateXmlNode("Error");
-            return temp;
-        }
-        return m_nodeStack.back();
-    }
-
-    XmlNodeRef CreateNodeNamed(const char* name);
-
-    template <class T>
-    void AddValue(const char* name, const T& value)
-    {
-        if (strchr(name, ' ') != 0)
-        {
-            assert(0 && "Spaces in Value name not supported");
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Spaces in Value name not supported: %s in Group %s", name, GetStackInfo());
-            return;
-        }
-        if (GetISystem()->IsDevMode() && CurNode())
-        {
-            // Check if this attribute already added.
-            if (CurNode()->haveAttr(name))
-            {
-                assert(0);
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Duplicate tag Value( \"%s\" ) in Group %s", name, GetStackInfo());
-            }
-        }
-
-        if (!IsDefaultValue(value))
-        {
-            CurNode()->setAttr(name, value);
-        }
-    }
-    void AddValue(const char* name, const SSerializeString& value)
-    {
-        AddValue(name, value.c_str());
-    }
-    void AddValue([[maybe_unused]] const char* name, [[maybe_unused]] const SNetObjectID& value)
-    {
-        assert(false);
-    }
-    template <class T>
-    void AddTypedValue(const char* name, const T& value, const char* type)
-    {
-        if (!IsDefaultValue(value))
-        {
-            XmlNodeRef newNode = CreateNodeNamed(name);
-            newNode->setAttr("v", value);
-            newNode->setAttr("t", type);
-        }
-    }
-
-    // Used for printing currebnt stack info for warnings.
-    const char* GetStackInfo() const;
-    const char* GetLuaStackInfo() const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check For Defaults.
-    //////////////////////////////////////////////////////////////////////////
-    bool IsDefaultValue(bool v) const { return v == false; };
-    bool IsDefaultValue(float v) const { return v == 0; };
-    bool IsDefaultValue(double v) const { return v == 0; };
-    bool IsDefaultValue(int8 v) const { return v == 0; };
-    bool IsDefaultValue(uint8 v) const { return v == 0; };
-    bool IsDefaultValue(int16 v) const { return v == 0; };
-    bool IsDefaultValue(uint16 v) const { return v == 0; };
-    bool IsDefaultValue(int32 v) const { return v == 0; };
-    bool IsDefaultValue(uint32 v) const { return v == 0; };
-    bool IsDefaultValue(int64 v) const { return v == 0; };
-    bool IsDefaultValue(uint64 v) const { return v == 0; };
-    bool IsDefaultValue(const Vec2& v) const { return v.x == 0 && v.y == 0; };
-    bool IsDefaultValue(const Vec3& v) const { return v.x == 0 && v.y == 0 && v.z == 0; };
-    bool IsDefaultValue(const Ang3& v) const { return v.x == 0 && v.y == 0 && v.z == 0; };
-    bool IsDefaultValue(const Quat& v) const { return v.w == 1.0f && v.v.x == 0 && v.v.y == 0 && v.v.z == 0; };
-    bool IsDefaultValue(const CTimeValue& v) const { return v.GetValue() == 0; };
-    bool IsDefaultValue(const char* str) const { return !str || !*str; };
-    bool IsDefaultValue(const string& str) const { return str.empty(); };
-    bool IsDefaultValue(const SSerializeString& str) const { return str.empty(); };
-    //////////////////////////////////////////////////////////////////////////
-
-    /*
-
-    template <class T>
-    bool IsDefaultValue( const T& v ) const { return false; };
-    */
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLWRITER_H
diff --git a/Code/CryEngine/CrySystem/XML/WriteXMLSource.cpp b/Code/CryEngine/CrySystem/XML/WriteXMLSource.cpp
deleted file mode 100644
index 8b4063722e..0000000000
--- a/Code/CryEngine/CrySystem/XML/WriteXMLSource.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "ReadWriteXMLSink.h"
-
-#include <stack>
-
-typedef std::map<string, XmlNodeRef> IdTable;
-
-static bool IsOptionalWriteXML(XmlNodeRef& definition);
-
-static bool SaveTableInner(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
-static bool SaveReferencedId(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
-static bool SaveSomething(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
-static bool SaveArray(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
-static bool SaveProperty(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
-static bool SaveTable(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
-static bool SaveArraySetValueTable(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource, int elem);
-
-typedef bool (* SaveArraySetValue)(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource, int elem);
-typedef bool (* SaveDefinitionFunction)(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
-
-template <class T>
-struct WritePropertyTyped;
-
-template <class T>
-struct WritePropertyTyped
-{
-    static bool Save(const char* name, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
-    {
-        IWriteXMLSource::TValue vvalue((T()));
-        if (!pSource->GetValue(name, vvalue, definition))
-        {
-            return false;
-        }
-        T* pValue = AZStd::get_if<T>(&vvalue);
-        if (!pValue)
-        {
-            return false;
-        }
-        data->setAttr(name, *pValue);
-        return true;
-    }
-    static bool SaveArray([[maybe_unused]] const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource, int elem)
-    {
-        IWriteXMLSource::TValue vvalue((T()));
-        if (!pSource->GetAt(elem, vvalue, definition))
-        {
-            return false;
-        }
-        T* pValue = AZStd::get_if<T>(&vvalue);
-        if (!pValue)
-        {
-            return false;
-        }
-        data->setAttr("value", *pValue);
-        return true;
-    }
-};
-
-template <>
-struct WritePropertyTyped<string>
-    : public WritePropertyTyped<const char*>
-{
-};
-
-bool IsOptionalWriteXML(XmlNodeRef& definition)
-{
-    bool optional = false;
-    definition->getAttr("optional", optional);
-    return optional;
-}
-
-bool SaveProperty([[maybe_unused]] const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
-{
-    const char* name = definition->getAttr("name");
-    if (0 == strlen(name))
-    {
-        CryLog("Property has no name");
-        return false;
-    }
-
-    const char* type = definition->getAttr("type");
-    if (0 == strlen(type))
-    {
-        CryLog("Property '%s' has no type", type);
-        return false;
-    }
-
-    if (IsOptionalWriteXML(definition) && !pSource->HaveValue(name))
-    {
-        return true;
-    }
-
-    bool ok = false;
-#define SAVE_PROPERTY(whichType) else if (0 == strcmp(type, #whichType)) ok = WritePropertyTyped<whichType>::Save(name, definition, data, pSource)
-    XML_SET_PROPERTY_HELPER(SAVE_PROPERTY);
-#undef SAVE_PROPERTY
-
-    if (!ok)
-    {
-        CryLog("Failed loading attribute %s of type %s", name, type);
-    }
-
-    return ok;
-}
-
-bool SaveArraySetValueTable(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource, int elem)
-{
-    IWriteXMLSourcePtr pChildSource = pSource->BeginTableAt(elem);
-    if (!pChildSource)
-    {
-        CryLog("Failed to find source table at %d", elem);
-        return false;
-    }
-
-    if (!SaveTableInner(idTable, definition, data, &*pChildSource))
-    {
-        return false;
-    }
-
-    if (!pChildSource->EndTableAt(elem))
-    {
-        CryLog("Failed to finish table at element %d", elem);
-        return false;
-    }
-
-    return true;
-}
-
-bool SaveArray(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
-{
-    const char* name = definition->getAttr("name");
-    if (0 == strlen(name))
-    {
-        CryLog("Array has no name");
-        return false;
-    }
-
-    const char* elementName = definition->getAttr("elementName");
-    if (0 == strlen(elementName))
-    {
-        elementName = "element";
-    }
-
-    bool validateArray = true;
-    if (definition->haveAttr(elementName))
-    {
-        definition->getAttr("validate", validateArray);
-    }
-
-    size_t numElems = 0;
-    IWriteXMLSourcePtr childSource = pSource->BeginArray(name, &numElems, definition);
-    if (!childSource)
-    {
-        bool ok = IsOptionalWriteXML(definition);
-        if (!ok)
-        {
-            CryLog("Failed to begin array named %s", name);
-        }
-        return ok;
-    }
-
-    XmlNodeRef childData = data->createNode(name);
-
-    SaveArraySetValue setter = NULL;
-    if (definition->haveAttr("type"))
-    {
-        setter = NULL;
-        const char* type = definition->getAttr("type");
-#define SETTER_PROPERTY(whichType) else if (0 == strcmp(type, #whichType)) setter = WritePropertyTyped<whichType>::SaveArray
-        XML_SET_PROPERTY_HELPER(SETTER_PROPERTY);
-#undef SETTER_PROPERTY
-        if (!setter)
-        {
-            CryLog("Unknown type %s in array %s", type, name);
-            return false;
-        }
-    }
-    else
-    {
-        setter = SaveArraySetValueTable;
-    }
-
-    bool needIndex = false;
-    for (size_t i = 1; i <= numElems; i++)
-    {
-        if (!childSource->HaveElemAt(i))
-        {
-            needIndex = true;
-        }
-        else
-        {
-            XmlNodeRef elemData = childData->createNode(elementName);
-            if (needIndex)
-            {
-                elemData->setAttr("_index", i);
-            }
-            needIndex = false;
-
-            if (!setter(idTable, definition, elemData, &*childSource, i))
-            {
-                CryLog("Failed saving element %d of array %s", int(i), name);
-                return false;
-            }
-
-            childData->addChild(elemData);
-        }
-    }
-
-    if (!pSource->EndArray(name))
-    {
-        CryLog("Failed to finish array named %s", name);
-        return false;
-    }
-
-    data->addChild(childData);
-
-    return true;
-}
-
-bool SaveTable(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
-{
-    const char* name = definition->getAttr("name");
-    if (0 == strlen(name))
-    {
-        CryLog("Child-table has no name");
-        return false;
-    }
-
-    IWriteXMLSourcePtr childSource = pSource->BeginTable(name);
-    if (!childSource)
-    {
-        bool ok = IsOptionalWriteXML(definition);
-        if (!ok)
-        {
-            CryLog("Source creation failed for table %s", name);
-        }
-        return ok;
-    }
-
-    XmlNodeRef childData = data->createNode(name);
-
-    if (!SaveTableInner(idTable, definition, childData, childSource))
-    {
-        CryLog("Failed to load data for child table %s", name);
-        return false;
-    }
-
-    if (!pSource->EndTable(name))
-    {
-        CryLog("Table %s failed to complete in sink", name);
-        return false;
-    }
-
-    data->addChild(childData);
-
-    return true;
-}
-
-bool SaveSomething(const IdTable& idTable, XmlNodeRef& nodeDefinition, XmlNodeRef& data, IWriteXMLSource* pSource)
-{
-    static struct
-    {
-        const char* name;
-        SaveDefinitionFunction saver;
-    } saverTypes[] = {
-        {"Property", &SaveProperty},
-        {"Array", &SaveArray},
-        {"Table", &SaveTable},
-        {"Use", &SaveReferencedId},
-    };
-    static const int numSaverTypes = sizeof(saverTypes) / sizeof(*saverTypes);
-
-    const char* nodeDefinitionTag = nodeDefinition->getTag();
-    bool ok = false;
-    int i;
-    for (i = 0; i < numSaverTypes; i++)
-    {
-        if (0 == strcmp(saverTypes[i].name, nodeDefinitionTag))
-        {
-            ok = saverTypes[i].saver(idTable, nodeDefinition, data, pSource);
-            break;
-        }
-    }
-    if (!ok)
-    {
-        if (i == numSaverTypes)
-        {
-            CryLog("Invalid definition node type %s", nodeDefinitionTag);
-        }
-    }
-    return ok;
-}
-
-bool SaveReferencedId(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
-{
-    IdTable::const_iterator iter = idTable.find(definition->getAttr("id"));
-    if (iter == idTable.end())
-    {
-        CryLog("No definition with id '%s'", definition->getAttr("id"));
-        return false;
-    }
-    XmlNodeRef useDefinition = iter->second;
-    useDefinition = useDefinition->clone();
-    int numAttrs = definition->getNumAttributes();
-    for (int i = 0; i < numAttrs; i++)
-    {
-        const char* key, * value;
-        definition->getAttributeByIndex(i, &key, &value);
-        useDefinition->setAttr(key, value);
-    }
-    return SaveSomething(idTable, useDefinition, data, pSource);
-}
-
-bool SaveTableInner(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
-{
-    const int nChildrenDefinition = definition->getChildCount();
-    for (int nChildDefinition = 0; nChildDefinition < nChildrenDefinition; nChildDefinition++)
-    {
-        XmlNodeRef nodeDefinition = definition->getChild(nChildDefinition);
-
-        if (!SaveSomething(idTable, nodeDefinition, data, pSource))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-XmlNodeRef CReadWriteXMLSink::CreateXMLFromSource(const char* definitionFile, IWriteXMLSource* pSource)
-{
-    XmlNodeRef rootDefinition = GetISystem()->LoadXmlFromFile(definitionFile);
-    if (!rootDefinition)
-    {
-        CryLog("Unable to load XML-Lua definition file: %s", definitionFile);
-        return 0;
-    }
-    if (0 != strcmp(rootDefinition->getTag(), "Definition"))
-    {
-        CryLog("Root tag of definition file was %s; expected Definition", rootDefinition->getTag());
-        return 0;
-    }
-    const char* rootNode = "Root";
-    if (rootDefinition->haveAttr("root"))
-    {
-        rootNode = rootDefinition->getAttr("root");
-    }
-    XmlNodeRef rootData = GetISystem()->CreateXmlNode(rootNode);
-
-    XmlNodeRef allowAlways = rootDefinition->findChild("AllowAlways");
-    if (allowAlways != 0)
-    {
-        rootDefinition->removeChild(allowAlways);
-    }
-
-    XmlNodeRef settingsParams = rootDefinition->findChild("Settings");
-    if (settingsParams != 0)
-    {
-        rootDefinition->removeChild(settingsParams);
-    }
-
-    // scan for id's in the structure (for the Use member)
-    IdTable idTable;
-    std::stack<XmlNodeRef> scanStack;
-    scanStack.push(rootDefinition);
-    while (!scanStack.empty())
-    {
-        XmlNodeRef refNode = scanStack.top();
-        scanStack.pop();
-
-        int numChildren = refNode->getChildCount();
-        const char* tag = refNode->getTag();
-
-        for (int i = 0; i < numChildren; i++)
-        {
-            scanStack.push(refNode->getChild(i));
-        }
-
-        if (refNode->haveAttr("id") && 0 != strcmp("Use", tag))
-        {
-            idTable[refNode->getAttr("id")] = refNode;
-        }
-
-        if (allowAlways != 0 && (!strcmp("Table", tag) || !strcmp("Array", tag)))
-        {
-            for (int i = 0; i < allowAlways->getChildCount(); ++i)
-            {
-                refNode->addChild(allowAlways->getChild(i)->clone());
-            }
-        }
-    }
-
-    if (!SaveTableInner(idTable, rootDefinition, rootData, pSource))
-    {
-        CryLog("Error createing xml using definition %s", definitionFile);
-        return 0;
-    }
-
-    bool ok = pSource->Complete();
-    if (!ok)
-    {
-        CryLog("Warning: sink failed to complete writing");
-        return 0;
-    }
-
-    return rootData;
-}
-
-bool CReadWriteXMLSink::WriteXML(const char* definitionFile, const char* dataFile, IWriteXMLSource* pSource)
-{
-    XmlNodeRef data = CreateXMLFromSource(definitionFile, pSource);
-    if (!data)
-    {
-        CryLog("Failed creating %s", dataFile);
-        return false;
-    }
-    if (!data->saveToFile(dataFile))
-    {
-        CryLog("Failed saving %s", dataFile);
-        return false;
-    }
-    return true;
-}
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryNode.cpp b/Code/CryEngine/CrySystem/XML/XMLBinaryNode.cpp
deleted file mode 100644
index 0495db417e..0000000000
--- a/Code/CryEngine/CrySystem/XML/XMLBinaryNode.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <platform.h>
-#include "XMLBinaryNode.h"
-#include <CrySizer.h>
-
-//////////////////////////////////////////////////////////////////////////
-CBinaryXmlData::CBinaryXmlData()
-    : pNodes(0)
-    , pAttributes(0)
-    , pChildIndices(0)
-    , pStringData(0)
-    , pFileContents(0)
-    , nFileSize(0)
-    , bOwnsFileContentsMemory(true)
-    , pBinaryNodes(0)
-    , nRefCount(0)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBinaryXmlData::~CBinaryXmlData()
-{
-    if (bOwnsFileContentsMemory)
-    {
-        delete [] pFileContents;
-    }
-    pFileContents = 0;
-
-    delete [] pBinaryNodes;
-    pBinaryNodes = 0;
-}
-
-void CBinaryXmlData::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(pFileContents, nFileSize);
-    const XMLBinary::BinaryFileHeader* pHeader = reinterpret_cast<const XMLBinary::BinaryFileHeader*>(pFileContents);
-    pSizer->AddObject(pBinaryNodes, sizeof(CBinaryXmlNode) * pHeader->nNodeCount);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CBinaryXmlNode implementation.
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-// collect allocated memory  informations
-void CBinaryXmlNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(m_pData);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CBinaryXmlNode::getParent() const
-{
-    const XMLBinary::Node* const pNode = _node();
-    if (pNode->nParentIndex != (XMLBinary::NodeIndex)-1)
-    {
-        return &m_pData->pBinaryNodes[pNode->nParentIndex];
-    }
-    return XmlNodeRef();
-}
-
-XmlNodeRef CBinaryXmlNode::createNode([[maybe_unused]] const char* tag)
-{
-    assert(0);
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::isTag(const char* tag) const
-{
-    return g_pXmlStrCmp(tag, getTag()) == 0;
-}
-
-const char* CBinaryXmlNode::getAttr(const char* key) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        return svalue;
-    }
-    return "";
-}
-
-bool CBinaryXmlNode::getAttr(const char* key, const char** value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        *value = svalue;
-        return true;
-    }
-    else
-    {
-        *value = "";
-        return false;
-    }
-}
-
-
-bool CBinaryXmlNode::haveAttr(const char* key) const
-{
-    return (GetValue(key) != 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, int& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = atoi(svalue);
-        return true;
-    }
-    return false;
-}
-
-bool CBinaryXmlNode::getAttr(const char* key, unsigned int& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = strtoul(svalue, NULL, 10);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, int64& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        azsscanf(svalue, "%" PRId64, &value);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, uint64& value, bool useHexFormat) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        if (useHexFormat)
-        {
-            azsscanf(svalue, "%" PRIX64, &value);
-        }
-        else
-        {
-            azsscanf(svalue, "%" PRIu64, &value);
-        }
-        return true;
-    }
-    return false;
-}
-
-bool CBinaryXmlNode::getAttr(const char* key, bool& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = atoi(svalue) != 0;
-        return true;
-    }
-    return false;
-}
-
-bool CBinaryXmlNode::getAttr(const char* key, float& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = (float)atof(svalue);
-        return true;
-    }
-    return false;
-}
-
-bool CBinaryXmlNode::getAttr(const char* key, double& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = atof(svalue);
-        return true;
-    }
-    return false;
-}
-
-bool CBinaryXmlNode::getAttr(const char* key, Ang3& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        float x, y, z;
-        if (azsscanf(svalue, "%f,%f,%f", &x, &y, &z) == 3)
-        {
-            value(x, y, z);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, Vec3& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        float x, y, z;
-        if (azsscanf(svalue, "%f,%f,%f", &x, &y, &z) == 3)
-        {
-            value = Vec3(x, y, z);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, Vec4& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        float x, y, z, w;
-        if (azsscanf(svalue, "%f,%f,%f,%f", &x, &y, &z, &w) == 4)
-        {
-            value = Vec4(x, y, z, w);
-            return true;
-        }
-    }
-    return false;
-}
-
-bool CBinaryXmlNode::getAttr(const char* key, Vec3d& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        double x, y, z;
-        if (azsscanf(svalue, "%lf,%lf,%lf", &x, &y, &z) == 3)
-        {
-            value = Vec3d(x, y, z);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, Vec2& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        float x, y;
-        if (azsscanf(svalue, "%f,%f", &x, &y) == 2)
-        {
-            value = Vec2(x, y);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, Vec2d& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        double x, y;
-        if (azsscanf(svalue, "%lf,%lf", &x, &y) == 2)
-        {
-            value = Vec2d(x, y);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, Quat& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        float w, x, y, z;
-        if (azsscanf(svalue, "%f,%f,%f,%f", &w, &x, &y, &z) == 4)
-        {
-            value = Quat(w, x, y, z);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttr(const char* key, ColorB& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        unsigned int r, g, b, a = 255;
-        int numFound = azsscanf(svalue, "%u,%u,%u,%u", &r, &g, &b, &a);
-        if (numFound == 3 || numFound == 4)
-        {
-            // If we only found 3 values, a should be unchanged, and still be 255
-            if (r < 256 && g < 256 && b < 256 && a < 256)
-            {
-                value = ColorB(r, g, b, a);
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-
-XmlNodeRef CBinaryXmlNode::findChild(const char* tag) const
-{
-    const XMLBinary::Node* const pNode = _node();
-    const uint32 nFirst = pNode->nFirstChildIndex;
-    const uint32 nAfterLast = pNode->nFirstChildIndex + pNode->nChildCount;
-    for (uint32 i = nFirst; i < nAfterLast; ++i)
-    {
-        const char* sChildTag = m_pData->pStringData + m_pData->pNodes[m_pData->pChildIndices[i]].nTagStringOffset;
-        if (g_pXmlStrCmp(tag, sChildTag) == 0)
-        {
-            return m_pData->pBinaryNodes + m_pData->pChildIndices[i];
-        }
-    }
-    return 0;
-}
-
-//! Get XML Node child nodes.
-XmlNodeRef CBinaryXmlNode::getChild(int i) const
-{
-    const XMLBinary::Node* const pNode = _node();
-    assert(i >= 0 && i < (int)pNode->nChildCount);
-    return m_pData->pBinaryNodes + m_pData->pChildIndices[pNode->nFirstChildIndex + i];
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttributeByIndex(int index, const char** key, const char** value)
-{
-    const XMLBinary::Node* const pNode = _node();
-    if (index >= 0 && index < pNode->nAttributeCount)
-    {
-        const XMLBinary::Attribute& attr = m_pData->pAttributes[pNode->nFirstAttributeIndex + index];
-        *key = _string(attr.nKeyStringOffset);
-        *value = _string(attr.nValueStringOffset);
-        return true;
-    }
-    return false;
-}
-//////////////////////////////////////////////////////////////////////////
-bool CBinaryXmlNode::getAttributeByIndex(int index, XmlString& key, XmlString& value)
-{
-    const XMLBinary::Node* const pNode = _node();
-    if (index >= 0 && index < pNode->nAttributeCount)
-    {
-        const XMLBinary::Attribute& attr = m_pData->pAttributes[pNode->nFirstAttributeIndex + index];
-        key = _string(attr.nKeyStringOffset);
-        value = _string(attr.nValueStringOffset);
-        return true;
-    }
-    return false;
-}
-//////////////////////////////////////////////////////////////////////////
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryNode.h b/Code/CryEngine/CrySystem/XML/XMLBinaryNode.h
deleted file mode 100644
index d4b0aaf5ae..0000000000
--- a/Code/CryEngine/CrySystem/XML/XMLBinaryNode.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H
-#pragma once
-
-
-#include <algorithm>
-#include "IXml.h"
-#include "XMLBinaryHeaders.h"
-
-// Compare function for string comparison, can be strcmp or _stricmp
-typedef int (__cdecl * XmlStrCmpFunc)(const char* str1, const char* str2);
-extern XmlStrCmpFunc g_pXmlStrCmp;
-
-class CBinaryXmlNode;
-
-//////////////////////////////////////////////////////////////////////////
-class CBinaryXmlData
-{
-public:
-    const XMLBinary::Node*       pNodes;
-    const XMLBinary::Attribute*  pAttributes;
-    const XMLBinary::NodeIndex*  pChildIndices;
-    const char*                  pStringData;
-
-    const char*                  pFileContents;
-    size_t                       nFileSize;
-    bool                         bOwnsFileContentsMemory;
-
-    CBinaryXmlNode*              pBinaryNodes;
-
-    int                          nRefCount;
-
-    CBinaryXmlData();
-    ~CBinaryXmlData();
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-};
-
-// forward declaration
-namespace XMLBinary
-{
-    class XMLBinaryReader;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CBinaryXmlNode class only used for fast read only binary XML import
-//////////////////////////////////////////////////////////////////////////
-class CBinaryXmlNode
-    : public IXmlNode
-{
-public:
-
-    // collect allocated memory  informations
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Custom new/delete with pool allocator.
-    //////////////////////////////////////////////////////////////////////////
-    //void* operator new( size_t nSize );
-    //void operator delete( void *ptr );
-
-    virtual void DeleteThis() { }
-
-    //! Create new XML node.
-    XmlNodeRef createNode(const char* tag);
-
-    // Summary:
-    //   Reference counting.
-    virtual void AddRef() { ++m_pData->nRefCount; };
-    // Notes:
-    //   When ref count reach zero XML node dies.
-    virtual void Release()
-    {
-        if (--m_pData->nRefCount <= 0)
-        {
-            delete m_pData;
-        }
-    };
-
-    //! Get XML node tag.
-    const char* getTag() const { return _string(_node()->nTagStringOffset); };
-    void    setTag([[maybe_unused]] const char* tag) { assert(0); };
-
-    //! Return true if given tag is equal to node tag.
-    bool isTag(const char* tag) const;
-
-    //! Get XML Node attributes.
-    virtual int getNumAttributes() const { return (int)_node()->nAttributeCount; };
-    //! Return attribute key and value by attribute index.
-    virtual bool getAttributeByIndex(int index, const char** key, const char** value);
-    //! Return attribute key and value by attribute index, string version.
-    virtual bool getAttributeByIndex(int index, XmlString& key, XmlString& value);
-
-
-    virtual void shareChildren([[maybe_unused]] const XmlNodeRef& fromNode) { assert(0); };
-    virtual void copyAttributes(XmlNodeRef fromNode) { assert(0); };
-
-    //! Get XML Node attribute for specified key.
-    const char* getAttr(const char* key) const;
-
-    //! Get XML Node attribute for specified key.
-    // Returns true if the attribute exists, false otherwise.
-    bool getAttr(const char* key, const char** value) const;
-
-    //! Check if attributes with specified key exist.
-    bool haveAttr(const char* key) const;
-
-    XmlNodeRef newChild([[maybe_unused]] const char* tagName) { assert(0); return 0; };
-    void replaceChild([[maybe_unused]] int inChild, [[maybe_unused]] const XmlNodeRef& node) { assert(0); };
-    void insertChild([[maybe_unused]] int inChild, [[maybe_unused]] const XmlNodeRef& node) { assert(0); };
-    void addChild([[maybe_unused]] const XmlNodeRef& node) { assert(0); };
-    void removeChild([[maybe_unused]] const XmlNodeRef& node) { assert(0); };
-
-    //! Remove all child nodes.
-    void removeAllChilds() { assert(0); };
-
-    //! Get number of child XML nodes.
-    int getChildCount() const { return (int)_node()->nChildCount; };
-
-    //! Get XML Node child nodes.
-    XmlNodeRef getChild(int i) const;
-
-    //! Find node with specified tag.
-    XmlNodeRef findChild(const char* tag) const;
-    void deleteChild([[maybe_unused]] const char* tag) { assert(0); };
-    void deleteChildAt([[maybe_unused]] int nIndex) { assert(0); };
-
-    //! Get parent XML node.
-    XmlNodeRef  getParent() const;
-
-    //! Returns content of this node.
-    const char* getContent() const { return _string(_node()->nContentStringOffset); };
-    void setContent([[maybe_unused]] const char* str) { assert(0); };
-
-    XmlNodeRef  clone()  { assert(0); return 0; };
-
-    //! Returns line number for XML tag.
-    int getLine() const { return 0; };
-    //! Set line number in xml.
-    void setLine([[maybe_unused]] int line) { assert(0); };
-
-    //! Returns XML of this node and sub nodes.
-    virtual IXmlStringData* getXMLData([[maybe_unused]] int nReserveMem = 0) const { assert(0); return 0; };
-    XmlString getXML([[maybe_unused]] int level = 0) const { assert(0); return ""; };
-    bool saveToFile([[maybe_unused]] const char* fileName) { assert(0); return false; };   // saves in one huge chunk
-    bool saveToFile([[maybe_unused]] const char* fileName, [[maybe_unused]] size_t chunkSizeBytes, [[maybe_unused]] AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle) { assert(0); return false; };   // save in small memory chunks
-
-    //! Set new XML Node attribute (or override attribute with same key).
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const char* value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] int value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] unsigned int value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] int64 value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] uint64 value, [[maybe_unused]] bool useHexFormat = true /* ignored */) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] float value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] f64 value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec2& value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec2d& value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Ang3& value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec3& value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec4& value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec3d& value) { assert(0); };
-    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Quat& value) { assert(0); };
-    void delAttr([[maybe_unused]] const char* key) { assert(0); };
-    void removeAllAttributes() { assert(0); };
-
-    //! 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, f64& value) const;
-    bool getAttr(const char* key, bool& value) const;
-    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, Vec2& value) const;
-    bool getAttr(const char* key, Vec2d& 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, Vec3d& value) const;
-    bool getAttr(const char* key, Quat& value) const;
-    bool getAttr(const char* key, ColorB& value) const;
-    //  bool getAttr( const char *key,CString &value ) const { XmlString v; if (getAttr(key,v)) { value = (const char*)v; return true; } else return false; }
-
-
-private:
-    //////////////////////////////////////////////////////////////////////////
-    // INTERNAL METHODS
-    //////////////////////////////////////////////////////////////////////////
-    const char* GetValue(const char* key) const
-    {
-        const XMLBinary::Attribute* const pAttributes = m_pData->pAttributes;
-        const char* const pStringData = m_pData->pStringData;
-
-        const int nFirst = _node()->nFirstAttributeIndex;
-        const int nLast = nFirst + _node()->nAttributeCount;
-        for (int i = nFirst; i < nLast; i++)
-        {
-            const char* const attrKey = pStringData + pAttributes[i].nKeyStringOffset;
-            if (g_pXmlStrCmp(key, attrKey) == 0)
-            {
-                const char* attrValue = pStringData + pAttributes[i].nValueStringOffset;
-                return attrValue;
-            }
-        }
-        return 0;
-    }
-
-    // Return current node in binary data.
-    const XMLBinary::Node* _node() const
-    {
-        return &m_pData->pNodes[this - m_pData->pBinaryNodes];
-    }
-
-    const char* _string(int nIndex) const
-    {
-        return m_pData->pStringData + nIndex;
-    }
-
-protected:
-    virtual void setParent([[maybe_unused]] const XmlNodeRef& inRef)     { assert(0); }
-
-    //////////////////////////////////////////////////////////////////////////
-private:
-    CBinaryXmlData* m_pData;
-
-    friend class XMLBinary::XMLBinaryReader;
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryReader.cpp b/Code/CryEngine/CrySystem/XML/XMLBinaryReader.cpp
deleted file mode 100644
index 6a2cc68d4e..0000000000
--- a/Code/CryEngine/CrySystem/XML/XMLBinaryReader.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <platform.h>
-#include "XMLBinaryReader.h"
-#include "XMLBinaryNode.h"
-#include "CryPath.h"
-
-
-XMLBinary::XMLBinaryReader::XMLBinaryReader()
-{
-    m_errorDescription[0] = 0;
-}
-
-
-XMLBinary::XMLBinaryReader::~XMLBinaryReader()
-{
-}
-
-
-const char* XMLBinary::XMLBinaryReader::GetErrorDescription() const
-{
-    return &m_errorDescription[0];
-}
-
-
-void XMLBinary::XMLBinaryReader::SetErrorDescription(const char* text)
-{
-    cry_strcpy(m_errorDescription, text);
-}
-
-
-XmlNodeRef XMLBinary::XMLBinaryReader::LoadFromFile(
-    const char* filename,
-    XMLBinary::XMLBinaryReader::EResult& result)
-{
-    m_errorDescription[0] = 0;
-    result = eResult_Error;
-
-    CCryFile xmlFile;
-
-    if (!xmlFile.Open(filename, "rb"))
-    {
-        SetErrorDescription("Can't open file.");
-        return 0;
-    }
-
-    const size_t fileSize = xmlFile.GetLength();
-    if (fileSize < sizeof(BinaryFileHeader))
-    {
-        result = eResult_NotBinXml;
-        SetErrorDescription("File is not a binary XML file (file size is too small).");
-        return 0;
-    }
-
-    // Read in the entire file - this buffer will not be deallocated immediately, since the nodes
-    // will contain pointers directly into it. It will be deleted once the reference count on the
-    // CBinaryXmlData object reaches 0 again.
-
-    char* const pFileContents = new char[fileSize];
-
-    if (!pFileContents)
-    {
-        SetErrorDescription("Can't allocate memory for binary XML file contents.");
-        return 0;
-    }
-
-    if (xmlFile.ReadRaw(pFileContents, fileSize) != fileSize)
-    {
-        delete [] pFileContents;
-        SetErrorDescription("Failed to read binary XML file, the file is corrupt.");
-        return 0;
-    }
-
-    Check(pFileContents, fileSize, result);
-
-    if (result != eResult_Success)
-    {
-        delete [] pFileContents;
-        return 0;
-    }
-
-    CBinaryXmlData* const pData = Create(pFileContents, fileSize, result);
-
-    if (result != eResult_Success)
-    {
-        assert(pData == 0);
-        delete [] pFileContents;
-        return 0;
-    }
-
-    assert(pData);
-    pData->bOwnsFileContentsMemory = true;
-
-    // Return first node
-    return &pData->pBinaryNodes[0];
-}
-
-
-XmlNodeRef XMLBinary::XMLBinaryReader::LoadFromBuffer(
-    EBufferMemoryHandling bufferMemoryHandling,
-    const char* buffer,
-    size_t size,
-    XMLBinary::XMLBinaryReader::EResult& result)
-{
-    m_errorDescription[0] = 0;
-    result = eResult_Error;
-
-    Check(buffer, size, result);
-
-    if (result != eResult_Success)
-    {
-        return 0;
-    }
-
-    CBinaryXmlData* pData = 0;
-
-    if (bufferMemoryHandling == eBufferMemoryHandling_MakeCopy)
-    {
-        char* ownBuffer = new char[size];
-        if (!ownBuffer)
-        {
-            SetErrorDescription("Can't allocate memory for binary XML data.");
-            return 0;
-        }
-        memcpy(ownBuffer, buffer, size);
-
-        pData = Create(ownBuffer, size, result);
-
-        if (result != eResult_Success)
-        {
-            assert(pData == 0);
-            delete [] ownBuffer;
-            return 0;
-        }
-    }
-    else
-    {
-        assert(bufferMemoryHandling == eBufferMemoryHandling_TakeOwnership);
-
-        pData = Create(buffer, size, result);
-
-        if (result != eResult_Success)
-        {
-            assert(pData == 0);
-            return 0;
-        }
-    }
-
-    assert(pData);
-    pData->bOwnsFileContentsMemory = true;
-
-    // Return first node
-    return &pData->pBinaryNodes[0];
-}
-
-
-void XMLBinary::XMLBinaryReader::Check(const char* buffer, size_t size, EResult& result)
-{
-    m_errorDescription[0] = 0;
-    result = eResult_Error;
-
-    if (buffer == 0)
-    {
-        SetErrorDescription("Buffer is null.");
-        return;
-    }
-
-    if (size < sizeof(BinaryFileHeader))
-    {
-        result = eResult_NotBinXml;
-        SetErrorDescription("Not a binary XML - data size is too small.");
-        return;
-    }
-
-    const BinaryFileHeader& header = *(reinterpret_cast<const BinaryFileHeader*>(buffer));
-
-    CheckHeader(header, size, result);
-}
-
-
-void XMLBinary::XMLBinaryReader::CheckHeader(const BinaryFileHeader& header, size_t size, EResult& result)
-{
-    assert(size >= sizeof(BinaryFileHeader));
-
-    m_errorDescription[0] = 0;
-
-    // Check the signature of the file to make sure that it is a binary XML file.
-    {
-        static const char signature[] = "CryXmlB";
-        COMPILE_TIME_ASSERT(sizeof(signature) == sizeof(header.szSignature));
-        if (memcmp(header.szSignature, signature, sizeof(header.szSignature)) != 0)
-        {
-            result = eResult_NotBinXml;
-            SetErrorDescription("Not a binary XML - has no signature.");
-            return;
-        }
-    }
-
-    // Check contents of the file header.
-    const uint32 nNodeTableEnd = header.nNodeTablePosition + header.nNodeCount * sizeof(Node);
-    const uint32 nChildTableEnd = header.nChildTablePosition + header.nChildCount * sizeof(NodeIndex);
-    const uint32 nAttributeTableEnd = header.nAttributeTablePosition + header.nAttributeCount * sizeof(Attribute);
-    const uint32 nStringDataEnd = header.nStringDataPosition + header.nStringDataSize;
-
-    bool bCorrupt = false;
-    bCorrupt = bCorrupt || header.nXMLSize > size;
-    bCorrupt = bCorrupt || nNodeTableEnd > header.nChildTablePosition;
-    bCorrupt = bCorrupt || nChildTableEnd > header.nAttributeTablePosition;
-    bCorrupt = bCorrupt || nAttributeTableEnd > header.nStringDataPosition;
-    bCorrupt = bCorrupt || nStringDataEnd > header.nXMLSize;
-    if (bCorrupt)
-    {
-        result = eResult_Error;
-        SetErrorDescription("Binary XML data is corrupt.");
-        return;
-    }
-
-    result = eResult_Success;
-}
-
-
-CBinaryXmlData* XMLBinary::XMLBinaryReader::Create(const char* buffer, size_t size, EResult& result)
-{
-    assert((buffer != 0) && (size >= sizeof(BinaryFileHeader)));
-
-    m_errorDescription[0] = 0;
-    result = eResult_Error;
-
-    CBinaryXmlData* const pData = new CBinaryXmlData;
-    if (!pData)
-    {
-        SetErrorDescription("Can't allocate memory for binary XML object.");
-        return 0;
-    }
-
-    pData->pFileContents = buffer;
-    pData->nFileSize = size;
-    pData->bOwnsFileContentsMemory = false;
-
-    const BinaryFileHeader& header = *(reinterpret_cast<const BinaryFileHeader*>(buffer));
-
-    // Create nodes
-    pData->pBinaryNodes = new CBinaryXmlNode[header.nNodeCount];
-    if (!pData->pBinaryNodes)
-    {
-        delete pData;
-        SetErrorDescription("Can't allocate memory for binary XML nodes.");
-        return 0;
-    }
-
-    pData->pAttributes   = reinterpret_cast<const Attribute*>(buffer + header.nAttributeTablePosition);
-    pData->pChildIndices = reinterpret_cast<const NodeIndex*>(buffer + header.nChildTablePosition);
-    pData->pNodes        = reinterpret_cast<const Node*>(buffer + header.nNodeTablePosition);
-    pData->pStringData   = buffer + header.nStringDataPosition;
-
-    for (uint32 nNode = 0; nNode < header.nNodeCount; ++nNode)
-    {
-        CBinaryXmlNode* const pNode = &pData->pBinaryNodes[nNode];
-        pNode->m_nRefCount = 0;
-        pNode->m_pData = pData;
-    }
-
-    result = eResult_Success;
-    return pData;
-}
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryReader.h b/Code/CryEngine/CrySystem/XML/XMLBinaryReader.h
deleted file mode 100644
index 59eaa0b77c..0000000000
--- a/Code/CryEngine/CrySystem/XML/XMLBinaryReader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYREADER_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYREADER_H
-#pragma once
-
-
-#include "XMLBinaryHeaders.h"
-#include "IXml.h"
-#include "CryFile.h"
-
-class CBinaryXmlData;
-
-namespace XMLBinary
-{
-    class XMLBinaryReader
-    {
-    public:
-        enum EResult
-        {
-            eResult_Success,
-            eResult_NotBinXml,
-            eResult_Error
-        };
-
-        enum EBufferMemoryHandling
-        {
-            eBufferMemoryHandling_MakeCopy,
-            eBufferMemoryHandling_TakeOwnership
-        };
-
-    public:
-        XMLBinaryReader();
-        ~XMLBinaryReader();
-
-        XmlNodeRef LoadFromFile(const char* filename, EResult& result);
-
-        // Note: if bufferMemoryHandling == eBufferMemoryHandling_TakeOwnership and
-        // returned result is eResult_Success, then buffer's memory is owned and
-        // will be released by XMLBinaryReader (by a 'delete[] buffer' call).
-        // Otherwise, the caller is responsible for releasing buffer's memory.
-        XmlNodeRef LoadFromBuffer(EBufferMemoryHandling bufferMemoryHandling, const char* buffer, size_t size, EResult& result);
-
-        const char* GetErrorDescription() const;
-
-    private:
-        void Check(const char* buffer, size_t size, EResult& result);
-        void CheckHeader(const BinaryFileHeader& layout, size_t size, EResult& result);
-        CBinaryXmlData* Create(const char* buffer, size_t size, EResult& result);
-        void SetErrorDescription(const char* text);
-
-    private:
-        char m_errorDescription[64];
-    };
-}
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYREADER_H
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryWriter.cpp b/Code/CryEngine/CrySystem/XML/XMLBinaryWriter.cpp
deleted file mode 100644
index 6bbe1eb494..0000000000
--- a/Code/CryEngine/CrySystem/XML/XMLBinaryWriter.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <platform.h>
-#include "XMLBinaryWriter.h"
-#include "CryEndian.h"
-#include <string.h>  // memcpy()
-
-//////////////////////////////////////////////////////////////////////////
-namespace XMLBinary
-{
-    void SwapEndianness_Node(Node& t)
-    {
-        SwapEndian(t.nTagStringOffset, true);
-        SwapEndian(t.nContentStringOffset, true);
-        SwapEndian(t.nAttributeCount, true);
-        SwapEndian(t.nChildCount, true);
-        SwapEndian(t.nParentIndex, true);
-        SwapEndian(t.nFirstAttributeIndex, true);
-        SwapEndian(t.nFirstChildIndex, true);
-    }
-
-    void SwapEndianness_Attribute(Attribute& t)
-    {
-        SwapEndian(t.nKeyStringOffset, true);
-        SwapEndian(t.nValueStringOffset, true);
-    }
-
-    void SwapEndianness_Header(BinaryFileHeader& t)
-    {
-        SwapEndian(t.nXMLSize, true);
-        SwapEndian(t.nNodeTablePosition, true);
-        SwapEndian(t.nNodeCount, true);
-        SwapEndian(t.nAttributeTablePosition, true);
-        SwapEndian(t.nAttributeCount, true);
-        SwapEndian(t.nChildTablePosition, true);
-        SwapEndian(t.nChildCount, true);
-        SwapEndian(t.nStringDataPosition, true);
-        SwapEndian(t.nStringDataSize, true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-XMLBinary::CXMLBinaryWriter::CXMLBinaryWriter()
-{
-    m_nStringDataSize = 0;
-}
-
-static void align(size_t& nPosition, const size_t nAlignment)
-{
-    const size_t nPadSize = ((nPosition + (nAlignment - 1)) & ~(nAlignment - 1)) - nPosition;
-    nPosition += nPadSize;
-}
-
-static void alignWrite(XMLBinary::IDataWriter* const pFile, size_t& nPosition, const size_t nAlignment)
-{
-    size_t nPadSize = ((nPosition + (nAlignment - 1)) & ~(nAlignment - 1)) - nPosition;
-
-    if (nPadSize > 0)
-    {
-        nPosition += nPadSize;
-
-        static const char zeroes[32] = { 0 };
-
-        while (nPadSize > 0)
-        {
-            const size_t n = (nPadSize <= sizeof(zeroes)) ? nPadSize : sizeof(zeroes);
-            nPadSize -= n;
-            pFile->Write(zeroes, n);
-        }
-    }
-}
-
-static void write(XMLBinary::IDataWriter* const pFile, size_t& nPosition, const void* const pData, const size_t nDataSize)
-{
-    pFile->Write(pData, nDataSize);
-    nPosition += nDataSize;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool XMLBinary::CXMLBinaryWriter::WriteNode(IDataWriter* pFile, XmlNodeRef node, bool bNeedSwapEndian, XMLBinary::IFilter* pFilter, string& error)
-{
-    error = "";
-
-    // Scan the node tree, building a flat node list, attribute list and string table.
-    m_nStringDataSize = 0;
-
-    if (!CompileTables(node, pFilter, error))
-    {
-        return false;
-    }
-
-    static const uint nMaxNodeCount = (NodeIndex) ~0;
-    if (m_nodes.size() > nMaxNodeCount)
-    {
-        error.Format("XMLBinary: Too many nodes: %d (max is %i)", m_nodes.size(), nMaxNodeCount);
-        return false;
-    }
-
-    // Initialize the file header.
-    size_t nTheoreticalPosition = 0;
-    static const size_t nAlignment = sizeof(uint32);
-
-    BinaryFileHeader header;
-    static const char signature[] = "CryXmlB";
-    COMPILE_TIME_ASSERT(sizeof(signature) == sizeof(header.szSignature));
-    memcpy(header.szSignature, signature, sizeof(header.szSignature));
-    nTheoreticalPosition += sizeof(header);
-    align(nTheoreticalPosition, nAlignment);
-
-    header.nNodeTablePosition = nTheoreticalPosition;
-    header.nNodeCount = int(m_nodes.size());
-    nTheoreticalPosition += header.nNodeCount * sizeof(Node);
-    align(nTheoreticalPosition, nAlignment);
-
-    header.nChildTablePosition = nTheoreticalPosition;
-    header.nChildCount = int(m_childs.size());
-    nTheoreticalPosition += header.nChildCount * sizeof(NodeIndex);
-    align(nTheoreticalPosition, nAlignment);
-
-    header.nAttributeTablePosition = nTheoreticalPosition;
-    header.nAttributeCount = int(m_attributes.size());
-    nTheoreticalPosition += header.nAttributeCount * sizeof(Attribute);
-    align(nTheoreticalPosition, nAlignment);
-
-    header.nStringDataPosition = nTheoreticalPosition;
-    header.nStringDataSize = m_nStringDataSize;
-    nTheoreticalPosition += header.nStringDataSize;
-
-    header.nXMLSize = nTheoreticalPosition;
-
-    // Swap endianness of the data structures
-    if (bNeedSwapEndian)
-    {
-        SwapEndianness_Header(header);
-        for (size_t i = 0, iCount = m_nodes.size(); i < iCount; ++i)
-        {
-            SwapEndianness_Node(m_nodes[i]);
-        }
-        for (size_t i = 0, iCount = m_attributes.size(); i < iCount; ++i)
-        {
-            SwapEndianness_Attribute(m_attributes[i]);
-        }
-        for (size_t i = 0, iCount = m_childs.size(); i < iCount; ++i)
-        {
-            SwapEndian(m_childs[i], true);
-        }
-    }
-
-    // Write file
-    {
-        nTheoreticalPosition = 0;
-
-        // Write out the file header.
-        write(pFile, nTheoreticalPosition, &header, sizeof(header));
-        alignWrite(pFile, nTheoreticalPosition, nAlignment);
-
-        // Write out the node table.
-        if (!m_nodes.empty())
-        {
-            write(pFile, nTheoreticalPosition, &m_nodes[0], sizeof(m_nodes[0]) * m_nodes.size());
-            alignWrite(pFile, nTheoreticalPosition, nAlignment);
-        }
-
-        // Write out the children table.
-        if (!m_childs.empty())
-        {
-            write(pFile, nTheoreticalPosition, &m_childs[0], sizeof(m_childs[0]) * m_childs.size());
-            alignWrite(pFile, nTheoreticalPosition, nAlignment);
-        }
-
-        // Write out the attribute table.
-        if (!m_attributes.empty())
-        {
-            write(pFile, nTheoreticalPosition, &m_attributes[0], sizeof(m_attributes[0]) * m_attributes.size());
-            alignWrite(pFile, nTheoreticalPosition, nAlignment);
-        }
-
-        // Write out the data of all the m_strings.
-        for (size_t nString = 0; nString < m_strings.size(); ++nString)
-        {
-            pFile->Write(m_strings[nString].c_str(), m_strings[nString].size() + 1);
-        }
-    }
-
-    return true;
-}
-
-bool XMLBinary::CXMLBinaryWriter::CompileTables(XmlNodeRef node, XMLBinary::IFilter* pFilter, string& error)
-{
-    bool ok = CompileTablesForNode(node, -1, pFilter, error);
-    ok = ok && CompileChildTable(node, pFilter, error);
-    return ok;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool XMLBinary::CXMLBinaryWriter::CompileTablesForNode(XmlNodeRef node, int nParentIndex, XMLBinary::IFilter* pFilter, string& error)
-{
-    // Add the tag to the string table.
-    int nTagStringOffset = AddString(node->getTag());
-
-    // Add the content string to the string table.
-    int nContentStringOffset = AddString(node->getContent());
-
-    // Add all the attributes to the attributes table.
-    const char* szKey;
-    const char* szValue;
-    const int nFirstAttributeIndex = int(m_attributes.size());
-    for (int i = 0, attrCount = node->getNumAttributes(); i < attrCount; ++i)
-    {
-        if (node->getAttributeByIndex(i, &szKey, &szValue) &&
-            (!pFilter || pFilter->IsAccepted(IFilter::eType_AttributeName, szKey)))
-        {
-            // Add the key and the value to the string table.
-            Attribute attribute;
-            attribute.nKeyStringOffset = AddString(szKey);
-            attribute.nValueStringOffset = AddString(szValue);
-
-            // Add the attribute to the attribute table.
-            m_attributes.push_back(attribute);
-        }
-    }
-    const int nAttributeCount = int(m_attributes.size()) - nFirstAttributeIndex;
-
-    static const int nMaxAttributeCount = (uint16) ~0;
-    if (nAttributeCount > nMaxAttributeCount)
-    {
-        error.Format("XMLBinary: Too many attributes in a node: %d (max is %i)", nAttributeCount, nMaxAttributeCount);
-        return false;
-    }
-
-    // Add ourselves to the node list.
-    const int nIndex = int(m_nodes.size());
-    {
-        Node nd;
-        memset(&nd, 0, sizeof(nd));
-        nd.nTagStringOffset = nTagStringOffset;
-        nd.nContentStringOffset = nContentStringOffset;
-        nd.nParentIndex = nParentIndex;
-        nd.nFirstAttributeIndex = nFirstAttributeIndex;
-        nd.nAttributeCount = nAttributeCount;
-
-        m_nodes.push_back(nd);
-    }
-
-    m_nodesMap.insert(NodesMap::value_type(node, nIndex));
-
-    // Recurse to the child nodes.
-    int nChildCount = 0;
-    static const int nMaxChildCount = (uint16) ~0;
-    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
-    {
-        XmlNodeRef childNode = node->getChild(nChild);
-        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
-        {
-            if (++nChildCount > nMaxChildCount)
-            {
-                error.Format("XMLBinary: Too many children in node '%s': %d (max is %i)", childNode->getTag(), nChildCount, nMaxChildCount);
-                return false;
-            }
-            if (!CompileTablesForNode(childNode, nIndex, pFilter, error))
-            {
-                return false;
-            }
-        }
-    }
-
-    m_nodes[nIndex].nChildCount = nChildCount;
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool XMLBinary::CXMLBinaryWriter::CompileChildTable(XmlNodeRef node, XMLBinary::IFilter* pFilter, string& error)
-{
-    const int nIndex = m_nodesMap.find(node)->second; // Assume node always exist in map.
-    const int nFirstChildIndex = (int)m_childs.size();
-
-    Node& nd = m_nodes[nIndex];
-    nd.nFirstChildIndex = nFirstChildIndex;
-
-    int nChildCount = 0;
-    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
-    {
-        XmlNodeRef childNode = node->getChild(nChild);
-        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
-        {
-            ++nChildCount;
-            const int nChildIndex = m_nodesMap.find(childNode)->second; // Assume node always exist in map.
-            m_childs.push_back(nChildIndex);
-        }
-    }
-    if (nChildCount != nd.nChildCount)
-    {
-        error.Format("XMLBinary: Internal error in CompileChildTable()");
-        return false;
-    }
-
-    // Recurse to the child nodes.
-    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
-    {
-        XmlNodeRef childNode = node->getChild(nChild);
-        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
-        {
-            if (!CompileChildTable(childNode, pFilter, error))
-            {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int XMLBinary::CXMLBinaryWriter::AddString(const XmlString& sString)
-{
-    // If we have such string already, then we will re-use its data.
-    StringMap::const_iterator itStringEntry = m_stringMap.find(sString);
-    if (itStringEntry == m_stringMap.end())
-    {
-        // We don't have such string yet, so we should add it to the tables.
-        m_strings.push_back(sString);
-        itStringEntry = m_stringMap.insert(StringMap::value_type(sString, m_nStringDataSize)).first;
-        m_nStringDataSize += sString.length() + 1;
-    }
-
-    // Return offset of the string in the string data buffer.
-    return (*itStringEntry).second;
-}
diff --git a/Code/CryEngine/CrySystem/XML/XMLBinaryWriter.h b/Code/CryEngine/CrySystem/XML/XMLBinaryWriter.h
deleted file mode 100644
index c1a4d54e67..0000000000
--- a/Code/CryEngine/CrySystem/XML/XMLBinaryWriter.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H
-#pragma once
-
-
-#include "IXml.h"
-#include "XMLBinaryHeaders.h"
-#include <vector>
-#include <map>
-
-class IXMLDataSink;
-
-namespace XMLBinary
-{
-    class CXMLBinaryWriter
-    {
-    public:
-        CXMLBinaryWriter();
-        bool WriteNode(IDataWriter* pFile, XmlNodeRef node, bool bNeedSwapEndian, XMLBinary::IFilter* pFilter, string& error);
-
-    private:
-        bool CompileTables(XmlNodeRef node, XMLBinary::IFilter* pFilter, string& error);
-
-        bool CompileTablesForNode(XmlNodeRef node, int nParentIndex, XMLBinary::IFilter* pFilter, string& error);
-        bool CompileChildTable(XmlNodeRef node, XMLBinary::IFilter* pFilter, string& error);
-        int AddString(const XmlString& sString);
-
-    private:
-        // tables.
-        typedef std::map<IXmlNode*, int> NodesMap;
-        typedef std::map<string, uint> StringMap;
-
-        std::vector<Node> m_nodes;
-        NodesMap m_nodesMap;
-        std::vector<Attribute> m_attributes;
-        std::vector<NodeIndex> m_childs;
-        std::vector<string> m_strings;
-        StringMap m_stringMap;
-
-        uint m_nStringDataSize;
-    };
-}
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H
diff --git a/Code/CryEngine/CrySystem/XML/XMLPatcher.cpp b/Code/CryEngine/CrySystem/XML/XMLPatcher.cpp
deleted file mode 100644
index e585ecd53b..0000000000
--- a/Code/CryEngine/CrySystem/XML/XMLPatcher.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "XMLPatcher.h"
-#include "StringUtils.h"
-
-CXMLPatcher::CXMLPatcher(XmlNodeRef& patchXML)
-{
-    m_patchXML = patchXML;
-
-#if DATA_PATCH_DEBUG
-    m_pDumpFilesCVar = REGISTER_INT("g_datapatcher_dumpfiles", 0, NULL, "will dump a copy of every file data patched, before and after patching");
-#endif
-}
-
-CXMLPatcher::~CXMLPatcher()
-{
-#if DATA_PATCH_DEBUG
-    if (IConsole* pIC = gEnv->pConsole)
-    {
-        pIC->UnregisterVariable(m_pDumpFilesCVar->GetName());
-    }
-#endif
-}
-
-XmlNodeRef CXMLPatcher::DuplicateForPatching(
-    const XmlNodeRef& inOrig,
-    bool                                        inShareChildren)
-{
-    XmlNodeRef                          newNode(0);
-
-    if (m_patchXML)
-    {
-        newNode = m_patchXML->createNode(inOrig->getTag());
-        if (newNode)
-        {
-            // copy attributes in a safe way, copyAttributes() itself assumes the node being copied from is of the same type
-            int         numAttr = inOrig->getNumAttributes();
-
-            for (int i = 0; i < numAttr; i++)
-            {
-                const char* pKey, * pValue;
-                if (inOrig->getAttributeByIndex(i, &pKey, &pValue))
-                {
-                    newNode->setAttr(pKey, pValue);
-                }
-            }
-
-            if (inShareChildren)
-            {
-                newNode->shareChildren(inOrig);
-            }
-        }
-    }
-
-    return newNode;
-}
-
-void CXMLPatcher::PatchFail(
-    const char* pInReason)
-{
-    CryLogAlways("Failed to apply data patch for file '%s' - reason '%s'", m_pFileBeingPatched, pInReason);
-}
-
-XmlNodeRef CXMLPatcher::FindPatchForFile(
-    const char* pInFileToPatch)
-{
-    XmlNodeRef              result;
-
-    if (m_patchXML)
-    {
-        for (int i = 0, m = m_patchXML->getChildCount(); i < m; i++)
-        {
-            XmlNodeRef      child = m_patchXML->getChild(i);
-
-            if (child->isTag("patch"))
-            {
-                const char* pForFile = child->getAttr("forfile");
-
-                if (pForFile && CryStringUtils::stristr(pForFile, pInFileToPatch) != 0)
-                {
-                    result = child;
-                    break;
-                }
-            }
-        }
-    }
-
-    return result;
-}
-
-XmlNodeRef CXMLPatcher::ApplyPatchToNode(
-    const XmlNodeRef& inNode,
-    const XmlNodeRef& inPatch)
-{
-    XmlNodeRef                          result = inNode;
-
-    for (int i = 0, m = inPatch->getChildCount(); i < m; i++)
-    {
-        XmlNodeRef                      patchNode = inPatch->getChild(i);
-        if (!patchNode || _stricmp(patchNode->getTag(), "patchnode") != 0)
-        {
-            continue;
-        }
-
-        int                                     indexToPatch;
-        if (!patchNode->getAttr("index", indexToPatch))
-        {
-            PatchFail("found patchnode missing index");
-            continue;
-        }
-
-        int                                     maxChildren = result->getChildCount();
-
-        if ((indexToPatch < 0 || indexToPatch >= maxChildren) && indexToPatch != -1)
-        {
-            PatchFail("patchnode index out of valid range");
-            continue;
-        }
-
-        XmlNodeRef                      childToPatch = (indexToPatch != -1) ? result->getChild(indexToPatch) : XmlNodeRef(0);
-        XmlNodeRef                      matchTag = GetMatchTag(patchNode);
-
-        if (childToPatch && matchTag && !CompareTags(matchTag, childToPatch))
-        {
-            PatchFail("patch failed to apply, data did not match what was expected");
-            continue;
-        }
-
-        // we need to apply a patch to this child, make it patchable by duplicating the node
-
-        if (inNode == result)
-        {
-            // make parent patchable if not already
-            result = DuplicateForPatching(inNode, true);
-        }
-
-        if (XmlNodeRef insertTag = GetInsertTag(patchNode))
-        {
-            // insert a new child after this node
-            XmlNodeRef              newChild = DuplicateForPatching(insertTag, true);               // have to duplicate it as we don't have an 'insert shared child' function
-            result->insertChild(indexToPatch + 1, newChild);
-        }
-        else
-        {
-            if (indexToPatch == -1)
-            {
-                PatchFail("child indices of -1 can only be used when inserting new nodes");
-                continue;
-            }
-        }
-
-        bool shouldReplaceChildren = false;
-
-        if (XmlNodeRef replaceTag = GetReplaceTag(patchNode, &shouldReplaceChildren))
-        {
-            XmlNodeRef      newChild = DuplicateForPatching(replaceTag, false);
-
-            if (!shouldReplaceChildren)
-            {
-                newChild->shareChildren(childToPatch);
-            }
-            else
-            {
-                // note: this is inserting children that belong to the data patcher into the data being patched
-                // this is fine to do, as long as the caller doesn't make any permanent changes to the xml tree
-                // returned. if they did they would alter the patcher's nodes and thus affect future patches
-                // applied using the same patch
-                // as most callers are working with binary xmls they don't try and modify them - as this is not
-                // a supported operation
-                // note, if a second patch was applied to this patched tree containing the patch nodes, it
-                // wouldn't mess up the patch, as patching a tree never modifies it, it always returns a new tree
-                // that may share parts of the original tree
-                newChild->shareChildren(replaceTag);
-            }
-
-            result->replaceChild(indexToPatch, newChild);
-
-            childToPatch = newChild;
-        }
-
-        if (XmlNodeRef deleteTag = GetDeleteTag(patchNode))
-        {
-            result->deleteChildAt(indexToPatch);
-            childToPatch = 0;       // deleted - don't recurse into it
-        }
-
-        if (childToPatch)
-        {
-            // Apply recursively
-            XmlNodeRef      newChild = ApplyPatchToNode(childToPatch, patchNode);
-
-            // child has been patched, insert new child into parent
-            if (newChild != childToPatch)
-            {
-                result->replaceChild(indexToPatch, newChild);
-            }
-        }
-    }
-
-    return result;
-}
-
-XmlNodeRef CXMLPatcher::ApplyXMLDataPatch(
-    const XmlNodeRef& inNode,
-    const char* pInXMLFileName)
-{
-    XmlNodeRef                          result = inNode;
-
-    if (m_patchingEnabled)
-    {
-        if (m_patchXML)
-        {
-            XmlNodeRef                      patchForFile = FindPatchForFile(pInXMLFileName);
-            if (patchForFile)
-            {
-                m_pFileBeingPatched = pInXMLFileName;
-                CryLog("Applying game data patch to %s", pInXMLFileName);
-                XmlNodeRef      containerNode = m_patchXML->createNode("");
-                containerNode->addChild(inNode);
-                containerNode = ApplyPatchToNode(containerNode, patchForFile);
-                result = containerNode->getChild(0);
-                m_pFileBeingPatched = NULL;
-
-#if DATA_PATCH_DEBUG
-                if (inNode != result)
-                {
-                    DumpFiles(pInXMLFileName, inNode, result);
-                }
-#endif
-            }
-        }
-    }
-
-    return result;
-}
-
-XmlNodeRef CXMLPatcher::GetMatchTag(
-    const XmlNodeRef& inNode)
-{
-    XmlNodeRef      result;
-    XmlNodeRef      nr = inNode->findChild("match");
-    if (nr && nr->getChildCount() == 1)
-    {
-        result = nr->getChild(0);
-    }
-    return result;
-}
-
-XmlNodeRef CXMLPatcher::GetReplaceTag(
-    const XmlNodeRef& inNode,
-    bool* outShouldReplaceChildren)
-{
-    XmlNodeRef      result;
-    XmlNodeRef      nr = inNode->findChild("replacewith");
-    if (nr && nr->getChildCount() == 1)
-    {
-        if (!nr->getAttr("replaceChildren", *outShouldReplaceChildren))
-        {
-            *outShouldReplaceChildren = false;
-        }
-        result = nr->getChild(0);
-    }
-    return result;
-}
-
-
-XmlNodeRef CXMLPatcher::GetInsertTag(
-    const XmlNodeRef& inNode)
-{
-    XmlNodeRef      result;
-    XmlNodeRef      nr = inNode->findChild("insertAfter");
-    if (nr && nr->getChildCount() == 1)
-    {
-        result = nr->getChild(0);
-    }
-    return result;
-}
-
-XmlNodeRef CXMLPatcher::GetDeleteTag(
-    const XmlNodeRef& inNode)
-{
-    XmlNodeRef      result = inNode->findChild("delete");
-    return result;
-}
-
-// compares the two tags for equality of tag and attributes
-// used to ensure the source data being patched meets the patches expectations
-// only compares tag and attribs, doesn't do deep compare of children
-bool CXMLPatcher::CompareTags(
-    const XmlNodeRef& inA,
-    const XmlNodeRef& inB)
-{
-    bool        result = true;
-
-    if (inA != inB)
-    {
-        result = false;
-
-        if (_stricmp(inA->getTag(), inB->getTag()) == 0)
-        {
-            if (inA->getNumAttributes() == inB->getNumAttributes())
-            {
-                result = true;
-
-                for (int i = 0, m = inA->getNumAttributes(); i < m; i++)
-                {
-                    const char* pAKey, * pBKey;
-                    const char* pAValue, * pBValue;
-
-                    inA->getAttributeByIndex(i, &pAKey, &pAValue);
-                    inB->getAttributeByIndex(i, &pBKey, &pBValue);
-
-                    if (_stricmp(pAKey, pBKey) || _stricmp(pAValue, pBValue))
-                    {
-                        result = false;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    return result;
-}
-
-#if DATA_PATCH_DEBUG
-
-static const char* k_lotsOfTabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-#define INDENT()                                            \
-    if (inIndent > 0)                                       \
-    {                                                       \
-        pPak->FWrite(k_lotsOfTabs, inIndent, inFileHandle); \
-    }
-
-void CXMLPatcher::DumpXMLNodes(
-    AZ::IO::HandleType inFileHandle,
-    int inIndent,
-    const XmlNodeRef& inNode,
-    CryFixedStringT<512>* ioTempString)
-{
-    auto pPak = gEnv->pCryPak;
-
-    inIndent = min(inIndent, int(sizeof(k_lotsOfTabs) - 1));
-
-    INDENT();
-
-    ioTempString->Format("<%s ", inNode->getTag());
-
-    pPak->FWrite(ioTempString->c_str(), ioTempString->length(), inFileHandle);
-
-    for (int i = 0, m = inNode->getNumAttributes(); i < m; i++)
-    {
-        const char* pKey, * pVal;
-        inNode->getAttributeByIndex(i, &pKey, &pVal);
-        ioTempString->Format("%s=\"%s\" ", pKey, pVal);
-        pPak->FWrite(ioTempString->c_str(), ioTempString->length(), inFileHandle);
-    }
-    pPak->FWrite(">\n", 2, inFileHandle);
-
-    for (int i = 0, m = inNode->getChildCount(); i < m; i++)
-    {
-        DumpXMLNodes(inFileHandle, inIndent + 1, inNode->getChild(i), ioTempString);
-    }
-
-    INDENT();
-    ioTempString->Format("</%s>\n", inNode->getTag());
-    pPak->FWrite(ioTempString->c_str(), ioTempString->length(), inFileHandle);
-}
-
-
-void CXMLPatcher::DumpFiles(
-    const char* pInXMLFileName,
-    const XmlNodeRef& inBefore,
-    const XmlNodeRef& inAfter)
-{
-    if (m_pDumpFilesCVar->GetIVal())
-    {
-        CryLog("Dumping before and after data files for '%s'", pInXMLFileName);
-
-        const char* pOrigFileName = strrchr(pInXMLFileName, '/');
-        if (pOrigFileName)
-        {
-            pOrigFileName++;
-
-            DumpXMLFile(string().Format("PATCH_%s", pOrigFileName), inBefore);
-
-            CryFixedStringT<128>        newFileName(pOrigFileName);
-            newFileName.replace(".xml", "_patched.xml");
-
-            DumpXMLFile(string().Format("PATCH_%s", newFileName.c_str()), inAfter);
-        }
-        else
-        {
-            CryLog("Couldn't determine file name for path '%s' can't output diffs", pInXMLFileName);
-        }
-    }
-}
-
-void CXMLPatcher::DumpXMLFile(
-    const char* pInFilePath,
-    const XmlNodeRef& inNode)
-{
-    auto pIPak = GetISystem()->GetIPak();
-    AZ::IO::HandleType fileHandle = pIPak->FOpen(pInFilePath, "wb");
-
-    if (fileHandle != AZ::IO::InvalidHandle)
-    {
-        CryFixedStringT<512>        tempStr;
-
-        DumpXMLNodes(fileHandle, 0, inNode, &tempStr);
-
-        pIPak->FClose(fileHandle);
-    }
-}
-#endif
diff --git a/Code/CryEngine/CrySystem/XML/XMLPatcher.h b/Code/CryEngine/CrySystem/XML/XMLPatcher.h
deleted file mode 100644
index 64a0badbd5..0000000000
--- a/Code/CryEngine/CrySystem/XML/XMLPatcher.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLPATCHER_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XMLPATCHER_H
-#pragma once
-
-
-#if defined(WIN32) && !defined(_RELEASE)
-#define DATA_PATCH_DEBUG    1
-#else
-#define DATA_PATCH_DEBUG    0
-#endif
-
-class CXMLPatcher
-{
-protected:
-#if DATA_PATCH_DEBUG
-    ICVar                                               * m_pDumpFilesCVar;
-#endif
-
-    XmlNodeRef                                  m_patchXML;
-    const char* m_pFileBeingPatched;
-    bool                                                m_patchingEnabled;
-
-    void                                                PatchFail(
-        const char* pInReason);
-    XmlNodeRef                                  ApplyPatchToNode(
-        const XmlNodeRef& inNode,
-        const XmlNodeRef& inPatch);
-
-    XmlNodeRef                                  DuplicateForPatching(
-        const XmlNodeRef& inOrig,
-        bool                                                inShareChildren);
-
-    bool                                                CompareTags(
-        const XmlNodeRef& inA,
-        const XmlNodeRef& inB);
-    XmlNodeRef                                  GetMatchTag(
-        const XmlNodeRef& inNode);
-    XmlNodeRef                                  GetReplaceTag(
-        const XmlNodeRef& inNode,
-        bool* outShouldReplaceChildren);
-    XmlNodeRef                                  GetInsertTag(
-        const XmlNodeRef& inNode);
-    XmlNodeRef                                  GetDeleteTag(
-        const XmlNodeRef& inNode);
-    XmlNodeRef                                  FindPatchForFile(
-        const char* pInFileToPatch);
-
-#if DATA_PATCH_DEBUG
-    void                                                DumpXMLNodes(
-        AZ::IO::HandleType                                  inFileHandle,
-        int                                                 inIndent,
-        const XmlNodeRef& inNode,
-        CryFixedStringT<512>* ioTempString);
-    void                                                DumpFiles(
-        const char* pInXMLFileName,
-        const XmlNodeRef& inBefore,
-        const XmlNodeRef& inAfter);
-    void                                                DumpXMLFile(
-        const char* pInFilePath,
-        const XmlNodeRef& inNode);
-#endif
-
-public:
-    CXMLPatcher(XmlNodeRef& patchXML);
-    ~CXMLPatcher();
-
-    XmlNodeRef                                  ApplyXMLDataPatch(
-        const XmlNodeRef& inNode,
-        const char* pInXMLFileName);
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLPATCHER_H
diff --git a/Code/CryEngine/CrySystem/XML/XmlUtils.cpp b/Code/CryEngine/CrySystem/XML/XmlUtils.cpp
deleted file mode 100644
index 9dfca6aa17..0000000000
--- a/Code/CryEngine/CrySystem/XML/XmlUtils.cpp
+++ /dev/null
@@ -1,712 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include <IXml.h>
-#include "xml.h"
-#include "XmlUtils.h"
-#include "ReadWriteXMLSink.h"
-
-#include "../SimpleStringPool.h"
-#include "SerializeXMLReader.h"
-#include "SerializeXMLWriter.h"
-
-#include "XMLBinaryWriter.h"
-#include "XMLBinaryReader.h"
-
-#include "XMLPatcher.h"
-#include <md5.h>
-
-//////////////////////////////////////////////////////////////////////////
-CXmlNode_PoolAlloc* g_pCXmlNode_PoolAlloc = 0;
-#ifdef CRY_COLLECT_XML_NODE_STATS
-SXmlNodeStats* g_pCXmlNode_Stats = 0;
-#endif
-
-extern bool g_bEnableBinaryXmlLoading;
-
-//////////////////////////////////////////////////////////////////////////
-CXmlUtils::CXmlUtils(ISystem* pSystem)
-{
-    m_pSystem = pSystem;
-    m_pSystem->GetISystemEventDispatcher()->RegisterListener(this);
-
-    // create IReadWriteXMLSink object
-    m_pReadWriteXMLSink = new CReadWriteXMLSink();
-    g_pCXmlNode_PoolAlloc = new CXmlNode_PoolAlloc;
-#ifdef CRY_COLLECT_XML_NODE_STATS
-    g_pCXmlNode_Stats = new SXmlNodeStats();
-#endif
-    m_pStatsXmlNodePool = 0;
-#ifndef _RELEASE
-    m_statsThreadOwner = CryGetCurrentThreadId();
-#endif
-    m_pXMLPatcher = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CXmlUtils::~CXmlUtils()
-{
-    m_pSystem->GetISystemEventDispatcher()->RemoveListener(this);
-    delete g_pCXmlNode_PoolAlloc;
-#ifdef CRY_COLLECT_XML_NODE_STATS
-    delete g_pCXmlNode_Stats;
-#endif
-    SAFE_DELETE(m_pStatsXmlNodePool);
-    SAFE_DELETE(m_pXMLPatcher);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IXmlParser* CXmlUtils::CreateXmlParser()
-{
-    const bool bReuseStrings = false; //TODO: do we ever want to reuse strings here?
-    return new XmlParser(bReuseStrings);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CXmlUtils::LoadXmlFromFile(const char* sFilename, bool bReuseStrings, bool bEnablePatching)
-{
-    XmlParser parser(bReuseStrings);
-    XmlNodeRef node = parser.ParseFile(sFilename, true);
-
-    // XmlParser is supposed to log warnings and errors (if any),
-    // so we don't need to call parser.getErrorString(),
-    // CryLog() etc here.
-
-    if (node && bEnablePatching && m_pXMLPatcher)
-    {
-        node = m_pXMLPatcher->ApplyXMLDataPatch(node, sFilename);
-    }
-
-    return node;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CXmlUtils::LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings, bool bSuppressWarnings)
-{
-    XmlParser parser(bReuseStrings);
-    XmlNodeRef node = parser.ParseBuffer(buffer, size, true, bSuppressWarnings);
-    return node;
-}
-
-
-void GetMD5(const char* pSrcBuffer, int nSrcSize, char signatureMD5[16])
-{
-    MD5Context md5c;
-    MD5Init(&md5c);
-    MD5Update(&md5c, (unsigned char*)pSrcBuffer, nSrcSize);
-    MD5Final((unsigned char*)signatureMD5, &md5c);
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CXmlUtils::HashXml(XmlNodeRef node)
-{
-    static char signature[16 * 2 + 1];
-    static char temp[16];
-    static const char* hex = "0123456789abcdef";
-    XmlString str = node->getXML();
-    GetMD5(str.data(), str.length(), temp);
-    for (int i = 0; i < 16; i++)
-    {
-        signature[2 * i + 0] = hex[((uint8)temp[i]) >> 4];
-        signature[2 * i + 1] = hex[((uint8)temp[i]) & 0xf];
-    }
-    signature[16 * 2] = 0;
-    return signature;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IReadWriteXMLSink* CXmlUtils::GetIReadWriteXMLSink()
-{
-    return m_pReadWriteXMLSink;
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CXmlSerializer
-    : public IXmlSerializer
-{
-public:
-    CXmlSerializer()
-        : m_nRefCount(0)
-        , m_pReaderImpl(NULL)
-        , m_pReaderSer(NULL)
-        , m_pWriterSer(NULL)
-        , m_pWriterImpl(NULL)
-    {
-    }
-    ~CXmlSerializer()
-    {
-        ClearAll();
-    }
-    void ClearAll()
-    {
-        SAFE_DELETE(m_pReaderSer);
-        SAFE_DELETE(m_pReaderImpl);
-        SAFE_DELETE(m_pWriterSer);
-        SAFE_DELETE(m_pWriterImpl);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void AddRef() { ++m_nRefCount; }
-    virtual void Release()
-    {
-        if (--m_nRefCount <= 0)
-        {
-            delete this;
-        }
-    }
-
-    virtual ISerialize* GetWriter(XmlNodeRef& node)
-    {
-        ClearAll();
-        m_pWriterImpl = new CSerializeXMLWriterImpl(node);
-        m_pWriterSer = new CSimpleSerializeWithDefaults<CSerializeXMLWriterImpl>(*m_pWriterImpl);
-        return m_pWriterSer;
-    }
-    virtual ISerialize* GetReader(XmlNodeRef& node)
-    {
-        ClearAll();
-        m_pReaderImpl = new CSerializeXMLReaderImpl(node);
-        m_pReaderSer = new CSimpleSerializeWithDefaults<CSerializeXMLReaderImpl>(*m_pReaderImpl);
-        return m_pReaderSer;
-    }
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->Add(*this);
-        pSizer->AddObject(m_pReaderImpl);
-        pSizer->AddObject(m_pWriterImpl);
-    }
-    //////////////////////////////////////////////////////////////////////////
-private:
-    int m_nRefCount;
-    CSerializeXMLReaderImpl* m_pReaderImpl;
-    CSimpleSerializeWithDefaults<CSerializeXMLReaderImpl>* m_pReaderSer;
-
-    CSerializeXMLWriterImpl* m_pWriterImpl;
-    CSimpleSerializeWithDefaults<CSerializeXMLWriterImpl>* m_pWriterSer;
-};
-
-//////////////////////////////////////////////////////////////////////////
-IXmlSerializer* CXmlUtils::CreateXmlSerializer()
-{
-    return new CXmlSerializer;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlUtils::GetMemoryUsage(ICrySizer* pSizer)
-{
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Nodes");
-        g_pCXmlNode_PoolAlloc->GetMemoryUsage(pSizer);
-    }
-
-#ifdef CRY_COLLECT_XML_NODE_STATS
-    // yes, slow
-    std::vector<const CXmlNode*> rootNodes;
-    {
-        TXmlNodeSet::const_iterator iter = g_pCXmlNode_Stats->nodeSet.begin();
-        TXmlNodeSet::const_iterator iterEnd = g_pCXmlNode_Stats->nodeSet.end();
-        while (iter != iterEnd)
-        {
-            const CXmlNode* pNode = *iter;
-            if (pNode->getParent() == 0)
-            {
-                rootNodes.push_back(pNode);
-            }
-            ++iter;
-        }
-    }
-
-    // use the following to log to console
-#if 0
-    CryLogAlways("NumXMLRootNodes=%d NumXMLNodes=%d TotalAllocs=%d TotalFrees=%d",
-        rootNodes.size(), g_pCXmlNode_Stats->nodeSet.size(),
-        g_pCXmlNode_Stats->nAllocs, g_pCXmlNode_Stats->nFrees);
-#endif
-
-
-    // use the following to debug the nodes in the system
-#if 0
-    {
-        std::vector<const CXmlNode*>::const_iterator iter = rootNodes.begin();
-        std::vector<const CXmlNode*>::const_iterator iterEnd = rootNodes.end();
-        while (iter != iterEnd)
-        {
-            const CXmlNode* pNode = *iter;
-            CryLogAlways("Node 0x%p Tag='%s'", pNode, pNode->getTag());
-            ++iter;
-        }
-    }
-#endif
-
-    // only for debugging, add it as pseudo numbers to the CrySizer.
-    // shift it by 10, so we get the actual number
-    {
-        SIZER_COMPONENT_NAME(pSizer, "#NumTotalNodes");
-        pSizer->Add("#NumTotalNodes", g_pCXmlNode_Stats->nodeSet.size() << 10);
-    }
-
-    {
-        SIZER_COMPONENT_NAME(pSizer, "#NumRootNodes");
-        pSizer->Add("#NumRootNodes", rootNodes.size() << 10);
-    }
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlUtils::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-    switch (event)
-    {
-    case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
-    case ESYSTEM_EVENT_LEVEL_LOAD_END:
-        g_pCXmlNode_PoolAlloc->FreeMemoryIfEmpty();
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CXmlBinaryDataWriterFile
-    : public XMLBinary::IDataWriter
-{
-public:
-    CXmlBinaryDataWriterFile(const char* file)
-    {
-        m_fileHandle = gEnv->pCryPak->FOpen(file, "wb");
-    }
-    ~CXmlBinaryDataWriterFile()
-    {
-        if (m_fileHandle != AZ::IO::InvalidHandle)
-        {
-            gEnv->pCryPak->FClose(m_fileHandle);
-        }
-    };
-    virtual bool IsOk()
-    {
-        return m_fileHandle != AZ::IO::InvalidHandle;
-    }
-    ;
-    virtual void Write(const void* pData, size_t size)
-    {
-        if (m_fileHandle != AZ::IO::InvalidHandle)
-        {
-            gEnv->pCryPak->FWrite(pData, size, 1, m_fileHandle);
-        }
-    }
-private:
-    AZ::IO::HandleType m_fileHandle;
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlUtils::SaveBinaryXmlFile(const char* filename, XmlNodeRef root)
-{
-    CXmlBinaryDataWriterFile fileSink(filename);
-    if (!fileSink.IsOk())
-    {
-        return false;
-    }
-    XMLBinary::CXMLBinaryWriter writer;
-    string error;
-    return writer.WriteNode(&fileSink, root, false, 0, error);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CXmlUtils::LoadBinaryXmlFile(const char* filename, bool bEnablePatching)
-{
-    XMLBinary::XMLBinaryReader reader;
-    XMLBinary::XMLBinaryReader::EResult result;
-    XmlNodeRef root = reader.LoadFromFile(filename, result);
-
-    if (result == XMLBinary::XMLBinaryReader::eResult_Success && bEnablePatching == true && m_pXMLPatcher != NULL)
-    {
-        root = m_pXMLPatcher->ApplyXMLDataPatch(root, filename);
-    }
-
-    return root;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlUtils::EnableBinaryXmlLoading(bool bEnable)
-{
-    bool bPrev = g_bEnableBinaryXmlLoading;
-    g_bEnableBinaryXmlLoading = bEnable;
-    return bPrev;
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CXmlTableReader
-    : public IXmlTableReader
-{
-public:
-    CXmlTableReader();
-    virtual ~CXmlTableReader();
-
-    virtual void Release();
-
-    virtual bool Begin(XmlNodeRef rootNode);
-    virtual int  GetEstimatedRowCount();
-    virtual bool ReadRow(int& rowIndex);
-    virtual bool ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize);
-    float GetCurrentRowHeight() override;
-
-private:
-    bool m_bExcel;
-
-    XmlNodeRef m_tableNode;
-
-    XmlNodeRef m_rowNode;
-
-    float m_currentRowHeight;
-    int m_rowNodeIndex;
-    int m_row;
-
-    int m_columnNodeIndex;  // used if m_bExcel == true
-    int m_column;
-
-    size_t m_rowTextSize;   // used if m_bExcel == false
-    size_t m_rowTextPos;    // used if m_bExcel == false
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-CXmlTableReader::CXmlTableReader()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CXmlTableReader::~CXmlTableReader()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTableReader::Release()
-{
-    delete this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlTableReader::Begin(XmlNodeRef rootNode)
-{
-    m_tableNode = 0;
-
-    if (!rootNode)
-    {
-        return false;
-    }
-
-    XmlNodeRef worksheetNode = rootNode->findChild("Worksheet");
-    if (worksheetNode)
-    {
-        m_bExcel = true;
-        m_tableNode = worksheetNode->findChild("Table");
-    }
-    else
-    {
-        m_bExcel = false;
-        m_tableNode = rootNode->findChild("Table");
-    }
-
-    m_rowNode = 0;
-    m_rowNodeIndex = -1;
-    m_row = -1;
-
-    return (m_tableNode != 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CXmlTableReader::GetEstimatedRowCount()
-{
-    if (!m_tableNode)
-    {
-        return -1;
-    }
-    return m_tableNode->getChildCount();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlTableReader::ReadRow(int& rowIndex)
-{
-    m_currentRowHeight = 0.0f;
-    if (!m_tableNode)
-    {
-        return false;
-    }
-
-    m_columnNodeIndex = -1;
-    m_column = -1;
-
-    const int rowNodeCount = m_tableNode->getChildCount();
-
-    if (m_bExcel)
-    {
-        for (;; )
-        {
-            if (++m_rowNodeIndex >= rowNodeCount)
-            {
-                m_rowNodeIndex = rowNodeCount;
-                return false;
-            }
-
-            m_rowNode = m_tableNode->getChild(m_rowNodeIndex);
-            if (!m_rowNode)
-            {
-                m_rowNodeIndex = rowNodeCount;
-                return false;
-            }
-
-            if (!m_rowNode->isTag("Row"))
-            {
-                m_rowNode = 0;
-                continue;
-            }
-
-            ++m_row;
-
-            int index = 0;
-            if (m_rowNode->getAttr("ss:Index", index))
-            {
-                --index;  // one-based -> zero-based
-                if (index < m_row)
-                {
-                    m_rowNodeIndex = rowNodeCount;
-                    m_rowNode = 0;
-                    return false;
-                }
-                m_row = index;
-            }
-            float height;
-            if (m_rowNode->getAttr("ss:Height", height))
-            {
-                m_currentRowHeight = height;
-            }
-
-            rowIndex = m_row;
-            return true;
-        }
-    }
-
-    {
-        m_rowTextSize = 0;
-        m_rowTextPos = 0;
-
-        if (++m_rowNodeIndex >= rowNodeCount)
-        {
-            m_rowNodeIndex = rowNodeCount;
-            return false;
-        }
-
-        m_rowNode = m_tableNode->getChild(m_rowNodeIndex);
-        if (!m_rowNode)
-        {
-            m_rowNodeIndex = rowNodeCount;
-            return false;
-        }
-
-        const char* const pContent = m_rowNode->getContent();
-        if (pContent)
-        {
-            m_rowTextSize = strlen(pContent);
-        }
-
-        m_row = m_rowNodeIndex;
-        rowIndex = m_rowNodeIndex;
-        return true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlTableReader::ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize)
-{
-    pContent = 0;
-    contentSize = 0;
-
-    if (!m_tableNode)
-    {
-        return false;
-    }
-
-    if (!m_rowNode)
-    {
-        return false;
-    }
-
-    if (m_bExcel)
-    {
-        const int columnNodeCount = m_rowNode->getChildCount();
-
-        for (;; )
-        {
-            if (++m_columnNodeIndex >= columnNodeCount)
-            {
-                m_columnNodeIndex = columnNodeCount;
-                return false;
-            }
-
-            XmlNodeRef columnNode = m_rowNode->getChild(m_columnNodeIndex);
-            if (!columnNode)
-            {
-                m_columnNodeIndex = columnNodeCount;
-                return false;
-            }
-
-            if (!columnNode->isTag("Cell"))
-            {
-                continue;
-            }
-
-            ++m_column;
-
-            int index = 0;
-            if (columnNode->getAttr("ss:Index", index))
-            {
-                --index;  // one-based -> zero-based
-                if (index < m_column)
-                {
-                    m_columnNodeIndex = columnNodeCount;
-                    return false;
-                }
-                m_column = index;
-            }
-            columnIndex = m_column;
-
-            XmlNodeRef dataNode = columnNode->findChild("Data");
-            if (dataNode)
-            {
-                pContent = dataNode->getContent();
-                if (pContent)
-                {
-                    contentSize = strlen(pContent);
-                }
-            }
-            return true;
-        }
-    }
-
-    {
-        if (m_rowTextPos >= m_rowTextSize)
-        {
-            return false;
-        }
-
-        const char* const pRowContent = m_rowNode->getContent();
-        if (!pRowContent)
-        {
-            m_rowTextPos = m_rowTextSize;
-            return false;
-        }
-        pContent = &pRowContent[m_rowTextPos];
-
-        columnIndex = ++m_column;
-
-        for (;; )
-        {
-            char c = pRowContent[m_rowTextPos++];
-
-            if ((c == '\n') || (c == '\0'))
-            {
-                return true;
-            }
-
-            if (c == '\r')
-            {
-                // ignore all '\r' chars
-                for (;; )
-                {
-                    c = pRowContent[m_rowTextPos++];
-                    if ((c == '\n') || (c == '\0'))
-                    {
-                        return true;
-                    }
-                    if (c != '\r')
-                    {
-                        // broken data. '\r' expected to be followed by '\n' or '\0'.
-                        contentSize = 0;
-                        m_rowTextPos = m_rowTextSize;
-                        return false;
-                    }
-                }
-            }
-
-            ++contentSize;
-        }
-    }
-}
-
-float CXmlTableReader::GetCurrentRowHeight()
-{
-    return m_currentRowHeight;
-}
-//////////////////////////////////////////////////////////////////////////
-IXmlTableReader* CXmlUtils::CreateXmlTableReader()
-{
-    return new CXmlTableReader;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Init xml stats nodes pool
-void CXmlUtils::InitStatsXmlNodePool(uint32 nPoolSize)
-{
-    CHECK_STATS_THREAD_OWNERSHIP();
-    if (0 == m_pStatsXmlNodePool)
-    {
-        // create special xml node pools for game statistics
-
-        const bool bReuseStrings = true;    // TODO parameterise?
-        m_pStatsXmlNodePool = new CXmlNodePool(nPoolSize, bReuseStrings);
-        assert(m_pStatsXmlNodePool);
-    }
-    else
-    {
-        CryLog("[CXmlNodePool]: Xml stats nodes pool already initialized");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Creates new xml node for statistics.
-XmlNodeRef CXmlUtils::CreateStatsXmlNode(const char* sNodeName)
-{
-    CHECK_STATS_THREAD_OWNERSHIP();
-    if (0 == m_pStatsXmlNodePool)
-    {
-        CryLog("[CXmlNodePool]: Xml stats nodes pool isn't initialized. Perform default initialization.");
-        InitStatsXmlNodePool();
-    }
-    return m_pStatsXmlNodePool->GetXmlNode(sNodeName);
-}
-
-void CXmlUtils::SetStatsOwnerThread([[maybe_unused]] threadID threadId)
-{
-#ifndef _RELEASE
-    m_statsThreadOwner = threadId;
-#endif
-}
-
-void CXmlUtils::FlushStatsXmlNodePool()
-{
-    CHECK_STATS_THREAD_OWNERSHIP();
-    if (m_pStatsXmlNodePool)
-    {
-        if (m_pStatsXmlNodePool->empty())
-        {
-            SAFE_DELETE(m_pStatsXmlNodePool);
-        }
-    }
-}
-
-void CXmlUtils::SetXMLPatcher(XmlNodeRef* pPatcher)
-{
-    SAFE_DELETE(m_pXMLPatcher);
-
-    if (pPatcher != NULL)
-    {
-        m_pXMLPatcher = new CXMLPatcher(*pPatcher);
-    }
-}
-
-
diff --git a/Code/CryEngine/CrySystem/XML/XmlUtils.h b/Code/CryEngine/CrySystem/XML/XmlUtils.h
deleted file mode 100644
index 07e3034120..0000000000
--- a/Code/CryEngine/CrySystem/XML/XmlUtils.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLUTILS_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XMLUTILS_H
-#pragma once
-
-#include "ISystem.h"
-
-#ifdef _RELEASE
-#define CHECK_STATS_THREAD_OWNERSHIP()
-#else
-#define CHECK_STATS_THREAD_OWNERSHIP() if (m_statsThreadOwner != CryGetCurrentThreadId()) {__debugbreak(); }
-#endif
-
-class CXmlNodePool;
-class CXMLPatcher;
-
-//////////////////////////////////////////////////////////////////////////
-// Implements IXmlUtils interface.
-//////////////////////////////////////////////////////////////////////////
-class CXmlUtils
-    : public IXmlUtils
-    , public ISystemEventListener
-{
-public:
-    CXmlUtils(ISystem* pSystem);
-    virtual ~CXmlUtils();
-
-    //////////////////////////////////////////////////////////////////////////
-    // IXmlUtils
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual IXmlParser* CreateXmlParser();
-
-    // Load xml from file, returns 0 if load failed.
-    virtual XmlNodeRef LoadXmlFromFile(const char* sFilename, bool bReuseStrings = false, bool bEnablePatching = true);
-    // Load xml from memory buffer, returns 0 if load failed.
-    virtual XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings = false, bool bSuppressWarnings = false);
-
-    // create an MD5 hash of an XML file
-    virtual const char* HashXml(XmlNodeRef node);
-
-    // Get an object that can read a xml into a IReadXMLSink
-    // and write a xml from a IWriteXMLSource
-    virtual IReadWriteXMLSink* GetIReadWriteXMLSink();
-
-    virtual IXmlSerializer* CreateXmlSerializer();
-
-    virtual bool SaveBinaryXmlFile(const char* sFilename, XmlNodeRef root);
-    virtual XmlNodeRef LoadBinaryXmlFile(const char* sFilename, bool bEnablePatching = true);
-
-    virtual bool EnableBinaryXmlLoading(bool bEnable);
-
-    // Create XML Table reader.
-    virtual IXmlTableReader* CreateXmlTableReader();
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // ISystemEventListener
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void GetMemoryUsage(ICrySizer* pSizer);
-
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-    // Init xml stats nodes pool
-    virtual void InitStatsXmlNodePool(uint32 nPoolSize = 1024*1024);
-
-    // Create new xml node for statistics
-    virtual XmlNodeRef CreateStatsXmlNode(const char* sNodeName = "");
-
-    // Set owner thread
-    virtual void SetStatsOwnerThread(threadID threadId);
-
-    // Free memory if stats xml node pool is empty
-    virtual void FlushStatsXmlNodePool();
-
-    // Set the XML Patcher. This is an XML object that modifies named XML files as they are loaded
-    // EXCEPT for xml files loaded from a buffer, for which names aren't passed in
-    virtual void SetXMLPatcher(XmlNodeRef* pPatcher);
-
-private:
-    ISystem* m_pSystem;
-    IReadWriteXMLSink*    m_pReadWriteXMLSink;
-    CXmlNodePool*                   m_pStatsXmlNodePool;
-    CXMLPatcher*                    m_pXMLPatcher;              //If set, applies data patches to any XML file that is loaded by this class
-#ifndef _RELEASE
-    threadID m_statsThreadOwner;
-#endif
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLUTILS_H
diff --git a/Code/CryEngine/CrySystem/XML/crysystem_xmlbinary_files.cmake b/Code/CryEngine/CrySystem/XML/crysystem_xmlbinary_files.cmake
deleted file mode 100644
index 683a286220..0000000000
--- a/Code/CryEngine/CrySystem/XML/crysystem_xmlbinary_files.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    XMLBinaryNode.cpp
-    XMLBinaryNode.h
-    XMLBinaryReader.cpp
-    XMLBinaryReader.h
-    XMLBinaryWriter.cpp
-    XMLBinaryWriter.h
-)
diff --git a/Code/CryEngine/CrySystem/XML/xml.cpp b/Code/CryEngine/CrySystem/XML/xml.cpp
deleted file mode 100644
index c8357907d7..0000000000
--- a/Code/CryEngine/CrySystem/XML/xml.cpp
+++ /dev/null
@@ -1,1959 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-
-//#define _CRT_SECURE_NO_DEPRECATE 1
-//#define _CRT_NONSTDC_NO_DEPRECATE
-#include <stdlib.h>
-
-#define XML_STATIC // Alternative to defining this here would be setting it project-wide
-#include <expat.h>
-#include "xml.h"
-#include <algorithm>
-#include <stdio.h>
-#include <AzFramework/Archive/IArchive.h>
-#include "XMLBinaryReader.h"
-
-#define FLOAT_FMT   "%.8g"
-#define DOUBLE_FMT  "%.17g"
-
-#include "../SimpleStringPool.h"
-
-#include "System.h"
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-#include <clocale>
-#include <locale>
-
-class LocaleResetter
-{
-public:
-    LocaleResetter()
-    {
-        m_oldLocale = std::setlocale(LC_NUMERIC, "C");
-    }
-    ~LocaleResetter()
-    {
-        std::setlocale(LC_NUMERIC, m_oldLocale);
-    }
-
-private:
-    char* m_oldLocale;
-};
-#define SCOPED_LOCALE_RESETTER LocaleResetter l
-#else
-// noop on Windows
-#define SCOPED_LOCALE_RESETTER
-#endif
-
-// Global counter for memory allocated in XML string pools.
-size_t CSimpleStringPool::g_nTotalAllocInXmlStringPools = 0;
-
-//////////////////////////////////////////////////////////////////////////
-static int __cdecl ascii_stricmp(const char* dst, const char* src)
-{
-    int f, l;
-    do
-    {
-        if (((f = (unsigned char)(*(dst++))) >= 'A') && (f <= 'Z'))
-        {
-            f -= 'A' - 'a';
-        }
-        if (((l = (unsigned char)(*(src++))) >= 'A') && (l <= 'Z'))
-        {
-            l -= 'A' - 'a';
-        }
-    }
-    while (f && (f == l));
-    return(f - l);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlStrCmpFunc g_pXmlStrCmp = &ascii_stricmp;
-bool g_bEnableBinaryXmlLoading = true;
-
-//////////////////////////////////////////////////////////////////////////
-class CXmlStringData
-    : public IXmlStringData
-{
-public:
-    int m_nRefCount;
-    XmlString m_string;
-
-    CXmlStringData() { m_nRefCount = 0; }
-    virtual void AddRef() { ++m_nRefCount; }
-    virtual void Release()
-    {
-        if (--m_nRefCount <= 0)
-        {
-            delete this;
-        }
-    }
-
-    virtual const char* GetString() { return m_string.c_str(); };
-    virtual size_t GetStringLength() { return m_string.size(); };
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CXmlStringPool
-    : public IXmlStringPool
-{
-public:
-    explicit CXmlStringPool(bool bReuseStrings)
-        : m_stringPool(bReuseStrings) {}
-
-    const char* AddString(const char* str) { return m_stringPool.Append(str, (int)strlen(str)); }
-    void Clear() { m_stringPool.Clear(); }
-    void SetBlockSize(unsigned int nBlockSize) { m_stringPool.SetBlockSize(nBlockSize); }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(m_stringPool);
-    }
-private:
-    CSimpleStringPool m_stringPool;
-};
-
-//xml_node_allocator XmlDynArrayAlloc::allocator;
-//size_t XmlDynArrayAlloc::m_iAllocated = 0;
-/**
-******************************************************************************
-* CXmlNode implementation.
-******************************************************************************
-*/
-
-void CXmlNode::DeleteThis()
-{
-    delete this;
-}
-
-CXmlNode::~CXmlNode()
-{
-    m_nRefCount = 1;      // removeAllChildsImpl can make an XmlNodeRef to this node whilst it is deleting the children
-    // doing this will cause the ref count to be increment and decremented and cause delete to be called again,
-    // leading to a recursion crash. upping the ref count here once destruction has started avoids this problem
-    removeAllChildsImpl();
-
-    SAFE_DELETE(m_pAttributes);
-
-    m_pStringPool->Release();
-}
-
-CXmlNode::CXmlNode()
-    : m_pStringPool(NULL) // must be changed later.
-    , m_tag("")
-    , m_content("")
-    , m_parent(NULL)
-    , m_pChilds(NULL)
-    , m_pAttributes(NULL)
-    , m_line(0)
-    , m_isProcessingInstruction(false)
-{
-    m_nRefCount = 0; //TODO: move initialization to IXmlNode constructor
-}
-
-CXmlNode::CXmlNode(const char* tag, bool bReuseStrings, bool bIsProcessingInstruction)
-    : m_content("")
-    , m_parent(NULL)
-    , m_pChilds(NULL)
-    , m_pAttributes(NULL)
-    , m_line(0)
-    , m_isProcessingInstruction(bIsProcessingInstruction)
-{
-    m_nRefCount = 0; //TODO: move initialization to IXmlNode constructor
-
-    m_pStringPool = new CXmlStringPool(bReuseStrings);
-    m_pStringPool->AddRef();
-    m_tag = m_pStringPool->AddString(tag);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// collect allocated memory  informations
-void CXmlNode::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_pStringPool);
-
-    if (m_pChilds)
-    {
-        pSizer->AddObject(*m_pChilds);
-    }
-    if (m_pAttributes)
-    {
-        pSizer->AddContainer(*m_pAttributes);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CXmlNode::createNode(const char* tag)
-{
-    CXmlNode* pNewNode = new CXmlNode;
-    pNewNode->m_pStringPool = m_pStringPool;
-    m_pStringPool->AddRef();
-    pNewNode->m_tag = m_pStringPool->AddString(tag);
-    return XmlNodeRef(pNewNode);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlNode::setTag(const char* tag)
-{
-    m_tag = m_pStringPool->AddString(tag);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlNode::setContent(const char* str)
-{
-    m_content = m_pStringPool->AddString(str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::isTag(const char* tag) const
-{
-    return g_pXmlStrCmp(tag, m_tag) == 0;
-}
-
-const char* CXmlNode::getAttr(const char* key) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        return svalue;
-    }
-    return "";
-}
-
-bool    CXmlNode::getAttr(const char* key, const char** value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        *value = svalue;
-        return true;
-    }
-    else
-    {
-        *value = "";
-        return false;
-    }
-}
-
-bool CXmlNode::haveAttr(const char* key) const
-{
-    if (m_pAttributes)
-    {
-        XmlAttrConstIter it = GetAttrConstIterator(key);
-        if (it != m_pAttributes->end())
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-void CXmlNode::delAttr(const char* key)
-{
-    if (m_pAttributes)
-    {
-        XmlAttrIter it = GetAttrIterator(key);
-        if (it != m_pAttributes->end())
-        {
-            m_pAttributes->erase(it);
-        }
-    }
-}
-
-void CXmlNode::removeAllAttributes()
-{
-    if (m_pAttributes)
-    {
-        m_pAttributes->clear();
-        SAFE_DELETE(m_pAttributes);
-    }
-}
-
-void CXmlNode::setAttr(const char* key, const char* value)
-{
-    if (!m_pAttributes)
-    {
-        m_pAttributes = new XmlAttributes;
-    }
-    assert(m_pAttributes);
-
-    XmlAttrIter it = GetAttrIterator(key);
-    if (it == m_pAttributes->end())
-    {
-        XmlAttribute tempAttr;
-        tempAttr.key = m_pStringPool->AddString(key);
-        tempAttr.value = m_pStringPool->AddString(value);
-        m_pAttributes->push_back(tempAttr);
-        // Sort attributes.
-        //std::sort( m_pAttributes->begin(),m_pAttributes->end() );
-    }
-    else
-    {
-        // If already exist, override this member.
-        it->value = m_pStringPool->AddString(value);
-    }
-}
-
-void CXmlNode::setAttr(const char* key, int value)
-{
-    char str[128];
-    azitoa(value, str, AZ_ARRAY_SIZE(str), 10);
-    setAttr(key, str);
-}
-
-void CXmlNode::setAttr(const char* key, unsigned int value)
-{
-    char str[128];
-    azui64toa(value, str, AZ_ARRAY_SIZE(str), 10);
-    setAttr(key, str);
-}
-
-void CXmlNode::setAttr(const char* key, float value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, FLOAT_FMT, value);
-    setAttr(key, str);
-}
-
-void CXmlNode::setAttr(const char* key, double value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, DOUBLE_FMT, value);
-    setAttr(key, str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlNode::setAttr(const char* key, int64 value)
-{
-    char str[32];
-    sprintf_s(str, "%" PRId64, value);
-    setAttr(key, str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlNode::setAttr(const char* key, uint64 value, bool useHexFormat)
-{
-    char str[32];
-    if (useHexFormat)
-    {
-        sprintf_s(str, "%" PRIX64, value);
-    }
-    else
-    {
-        sprintf_s(str, "%" PRIu64, value);
-    }
-    setAttr(key, str);
-}
-
-void CXmlNode::setAttr(const char* key, const Ang3& value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT, value.x, value.y, value.z);
-    setAttr(key, str);
-}
-void CXmlNode::setAttr(const char* key, const Vec3& value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT, value.x, value.y, value.z);
-    setAttr(key, str);
-}
-void CXmlNode::setAttr(const char* key, const Vec4& value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT, value.x, value.y, value.z, value.w);
-    setAttr(key, str);
-}
-
-void CXmlNode::setAttr(const char* key, const Vec3d& value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, DOUBLE_FMT "," DOUBLE_FMT "," DOUBLE_FMT, value.x, value.y, value.z);
-    setAttr(key, str);
-}
-void CXmlNode::setAttr(const char* key, const Vec2& value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT, value.x, value.y);
-    setAttr(key, str);
-}
-void CXmlNode::setAttr(const char* key, const Vec2d& value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, DOUBLE_FMT "," DOUBLE_FMT, value.x, value.y);
-    setAttr(key, str);
-}
-
-void CXmlNode::setAttr(const char* key, const Quat& value)
-{
-    char str[128];
-    SCOPED_LOCALE_RESETTER;
-    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT, value.w, value.v.x, value.v.y, value.v.z);
-    setAttr(key, str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttr(const char* key, int& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = atoi(svalue);
-        return true;
-    }
-    return false;
-}
-
-bool CXmlNode::getAttr(const char* key, unsigned int& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = strtoul(svalue, NULL, 10);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttr(const char* key, int64& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        azsscanf(svalue, "%" PRId64, &value);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttr(const char* key, uint64& value, bool useHexFormat) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        if (useHexFormat)
-        {
-            azsscanf(svalue, "%" PRIX64, &value);
-        }
-        else
-        {
-            azsscanf(svalue, "%" PRIu64, &value);
-        }
-        return true;
-    }
-    return false;
-}
-
-bool CXmlNode::getAttr(const char* key, bool& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        if (azstricmp(svalue, "true") == 0)
-        {
-            value = true;
-        }
-        else if (azstricmp(svalue, "false") == 0)
-        {
-            value = false;
-        }
-        else
-        {
-            value = atoi(svalue) != 0;
-        }
-        return true;
-    }
-    return false;
-}
-
-bool CXmlNode::getAttr(const char* key, float& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = (float)atof(svalue);
-        return true;
-    }
-    return false;
-}
-
-bool CXmlNode::getAttr(const char* key, double& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        value = atof(svalue);
-        return true;
-    }
-    return false;
-}
-
-bool CXmlNode::getAttr(const char* key, Ang3& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        SCOPED_LOCALE_RESETTER;
-        float x, y, z;
-        if (azsscanf(svalue, "%f,%f,%f", &x, &y, &z) == 3)
-        {
-            value(x, y, z);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttr(const char* key, Vec3& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        SCOPED_LOCALE_RESETTER;
-        float x, y, z;
-        if (azsscanf(svalue, "%f,%f,%f", &x, &y, &z) == 3)
-        {
-            value = Vec3(x, y, z);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttr(const char* key, Vec4& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        SCOPED_LOCALE_RESETTER;
-        float x, y, z, w;
-        if (azsscanf(svalue, "%f,%f,%f,%f", &x, &y, &z, &w) == 4)
-        {
-            value = Vec4(x, y, z, w);
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool CXmlNode::getAttr(const char* key, Vec3d& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        SCOPED_LOCALE_RESETTER;
-        double x, y, z;
-        if (azsscanf(svalue, "%lf,%lf,%lf", &x, &y, &z) == 3)
-        {
-            value = Vec3d(x, y, z);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttr(const char* key, Vec2& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        SCOPED_LOCALE_RESETTER;
-        float x, y;
-        if (azsscanf(svalue, "%f,%f", &x, &y) == 2)
-        {
-            value = Vec2(x, y);
-            return true;
-        }
-    }
-    return false;
-}
-
-bool CXmlNode::getAttr(const char* key, Vec2d& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        SCOPED_LOCALE_RESETTER;
-        double x, y;
-        if (azsscanf(svalue, "%lf,%lf", &x, &y) == 2)
-        {
-            value = Vec2d(x, y);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttr(const char* key, Quat& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        SCOPED_LOCALE_RESETTER;
-        float w, x, y, z;
-        if (azsscanf(svalue, "%f,%f,%f,%f", &w, &x, &y, &z) == 4)
-        {
-            if (fabs(w) > VEC_EPSILON || fabs(x) > VEC_EPSILON || fabs(y) > VEC_EPSILON || fabs(z) > VEC_EPSILON)
-            {
-                //[AlexMcC|02.03.10] directly assign to members to avoid triggering the assert in Quat() with data from bad assets
-                value.w = w;
-                value.v = Vec3(x, y, z);
-                return value.IsValid();
-            }
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttr(const char* key, ColorB& value) const
-{
-    const char* svalue = GetValue(key);
-    if (svalue)
-    {
-        unsigned int r, g, b, a = 255;
-        int numFound = azsscanf(svalue, "%u,%u,%u,%u", &r, &g, &b, &a);
-        if (numFound == 3 || numFound == 4)
-        {
-            // If we only found 3 values, a should be unchanged, and still be 255
-            if (r < 256 && g < 256 && b < 256 && a < 256)
-            {
-                value = ColorB(r, g, b, a);
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-
-XmlNodeRef CXmlNode::findChild(const char* tag) const
-{
-    if (m_pChilds)
-    {
-        XmlNodes& childs = *m_pChilds;
-        for (int i = 0, num = childs.size(); i < num; ++i)
-        {
-            if (childs[i]->isTag(tag))
-            {
-                return childs[i];
-            }
-        }
-    }
-    return 0;
-}
-
-void CXmlNode::removeChild(const XmlNodeRef& node)
-{
-    if (m_pChilds)
-    {
-        XmlNodes::iterator it = std::find(m_pChilds->begin(), m_pChilds->end(), (IXmlNode*)node);
-        if (it != m_pChilds->end())
-        {
-            ReleaseChild(*it);
-            m_pChilds->erase(it);
-        }
-    }
-}
-
-void CXmlNode::removeAllChilds()
-{
-    removeAllChildsImpl();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlNode::deleteChild(const char* tag)
-{
-    if (m_pChilds)
-    {
-        XmlNodes& childs = *m_pChilds;
-        for (int i = 0, num = childs.size(); i < num; ++i)
-        {
-            if (childs[i]->isTag(tag))
-            {
-                ReleaseChild(childs[i]);
-                childs.erase(childs.begin() + i);
-                return;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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)
-{
-    if (!m_pChilds)
-    {
-        m_pChilds = new XmlNodes;
-    }
-
-    assert(node != 0);
-    IXmlNode* pNode = ((IXmlNode*)node);
-    pNode->AddRef();
-    m_pChilds->push_back(pNode);
-    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);
-    addChild(node);
-    return node;
-}
-
-//! Get XML Node child nodes.
-XmlNodeRef CXmlNode::getChild(int i) const
-{
-    assert(m_pChilds);
-    XmlNodes& childs = *m_pChilds;
-    assert(i >= 0 && i < (int)childs.size());
-    return childs[i];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlNode::copyAttributes(XmlNodeRef fromNode)
-{
-    IXmlNode* inode = fromNode;
-    CXmlNode* n = (CXmlNode*)inode;
-    assert(n);
-    PREFAST_ASSUME(n);
-
-    if (n != this)
-    {
-        if (n->m_pAttributes)
-        {
-            if (!m_pAttributes)
-            {
-                m_pAttributes = new XmlAttributes;
-            }
-
-            if (n->m_pStringPool == m_pStringPool)
-            {
-                *m_pAttributes = *(n->m_pAttributes);
-            }
-            else
-            {
-                XmlAttributes& lhs = *m_pAttributes;
-                const XmlAttributes& rhs = *(n->m_pAttributes);
-                lhs.resize(rhs.size());
-                for (size_t i = 0; i < rhs.size(); ++i)
-                {
-                    lhs[i].key = m_pStringPool->AddString(rhs[i].key);
-                    lhs[i].value = m_pStringPool->AddString(rhs[i].value);
-                }
-            }
-        }
-        else
-        {
-            SAFE_DELETE(m_pAttributes);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttributeByIndex(int index, const char** key, const char** value)
-{
-    if (m_pAttributes)
-    {
-        XmlAttributes::iterator it = m_pAttributes->begin();
-        if (it != m_pAttributes->end())
-        {
-            std::advance(it, index);
-            if (it != m_pAttributes->end())
-            {
-                *key = it->key;
-                *value = it->value;
-                return true;
-            }
-        }
-    }
-    return false;
-}
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::getAttributeByIndex(int index, XmlString& key, XmlString& value)
-{
-    if (m_pAttributes)
-    {
-        XmlAttributes::iterator it = m_pAttributes->begin();
-        if (it != m_pAttributes->end())
-        {
-            std::advance(it, index);
-            if (it != m_pAttributes->end())
-            {
-                key = it->key;
-                value = it->value;
-                return true;
-            }
-        }
-    }
-    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 = childs.size(); i < num; ++i)
-        {
-            node->addChild(childs[i]->clone());
-        }
-    }
-
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void AddTabsToString(XmlString& xml, int level)
-{
-    static const char* tabs[] = {
-        "",
-        " ",
-        "  ",
-        "   ",
-        "    ",
-        "     ",
-        "      ",
-        "       ",
-        "        ",
-        "         ",
-        "          ",
-        "           ",
-    };
-    // Add tabs.
-    if (level < sizeof(tabs) / sizeof(tabs[0]))
-    {
-        xml += tabs[level];
-    }
-    else
-    {
-        for (int i = 0; i < level; i++)
-        {
-            xml += "  ";
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlNode::IsValidXmlString(const char* str) const
-{
-    int len = strlen(str);
-
-    {
-        // Prevents invalid characters not from standard ASCII set to propagate to xml.
-        // A bit of hack for efficiency, fixes input string in place.
-        char* s = const_cast<char*>(str);
-        for (int i = 0; i < len; i++)
-        {
-            if ((unsigned char)s[i] > 0x7F)
-            {
-                s[i] = ' ';
-            }
-        }
-    }
-
-    if (strcspn(str, "\"\'&><") == len)
-    {
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlString CXmlNode::MakeValidXmlString(const XmlString& instr) const
-{
-    XmlString str = instr;
-
-    // check if str contains any invalid characters
-    str.replace("&", "&amp;");
-    str.replace("\"", "&quot;");
-    str.replace("\'", "&apos;");
-    str.replace("<", "&lt;");
-    str.replace(">", "&gt;");
-    str.replace("...", "&gt;");
-    str.replace("\n", "&#10;");
-
-    return str;
-}
-
-void CXmlNode::ReleaseChild(IXmlNode* pChild)
-{
-    if (pChild)
-    {
-        if (pChild->getParent() == this)      // if check to handle shared children which are supported by the CXmlNode impl
-        {
-            pChild->setParent(NULL);
-        }
-        pChild->Release();
-    }
-}
-
-void CXmlNode::removeAllChildsImpl()
-{
-    if (m_pChilds)
-    {
-        for (XmlNodes::iterator iter = m_pChilds->begin(), endIter = m_pChilds->end(); iter != endIter; ++iter)
-        {
-            ReleaseChild(*iter);
-        }
-        SAFE_DELETE(m_pChilds);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlNode::AddToXmlString(XmlString& xml, int level, AZ::IO::HandleType fileHandle, size_t chunkSize) const
-{
-    if (fileHandle != AZ::IO::InvalidHandle && chunkSize > 0)
-    {
-        size_t len = xml.length();
-        if (len >= chunkSize)
-        {
-            gEnv->pCryPak->FWrite(xml.c_str(), len, 1, fileHandle);
-            xml.assign (""); // should not free memory and does not!
-        }
-    }
-
-    AddTabsToString(xml, level);
-
-    const bool bHasChildren = (m_pChilds && !m_pChilds->empty());
-
-    // Begin Tag
-    if (!m_pAttributes || m_pAttributes->empty())
-    {
-        xml += "<";
-        if (m_isProcessingInstruction)
-        {
-            xml += "?";
-        }
-        xml += m_tag;
-        if (*m_content == 0 && !bHasChildren)
-        {
-            if (m_isProcessingInstruction)
-            {
-                xml += "?>\n";
-            }
-            else
-            {
-            // Compact tag form.
-            xml += " />\n";
-            }
-            return;
-        }
-        xml += ">";
-    }
-    else
-    {
-        xml += "<";
-        if (m_isProcessingInstruction)
-        {
-            xml += "?";
-        }
-        xml += m_tag;
-        xml += " ";
-
-        // Put attributes.
-        for (XmlAttributes::const_iterator it = m_pAttributes->begin(); it != m_pAttributes->end(); )
-        {
-            xml += it->key;
-            xml += "=\"";
-            if (IsValidXmlString(it->value))
-            {
-                xml += it->value;
-            }
-            else
-            {
-                xml += MakeValidXmlString(it->value);
-            }
-            ++it;
-            if (it != m_pAttributes->end())
-            {
-                xml += "\" ";
-            }
-            else
-            {
-                xml += "\"";
-            }
-        }
-        if (*m_content == 0 && !bHasChildren)
-        {
-            if (m_isProcessingInstruction)
-            {
-                xml += "?>\n";
-            }
-            else
-            {
-            // Compact tag form.
-            xml += "/>\n";
-            }
-            return;
-        }
-        xml += ">";
-    }
-
-    // Put node content.
-    if (IsValidXmlString(m_content))
-    {
-        xml += m_content;
-    }
-    else
-    {
-        xml += MakeValidXmlString(m_content);
-    }
-
-    if (!bHasChildren)
-    {
-        xml += "</";
-        xml += m_tag;
-        xml += ">\n";
-        return;
-    }
-
-    xml += "\n";
-
-    // Add sub nodes.
-    for (XmlNodes::iterator it = m_pChilds->begin(), itEnd = m_pChilds->end(); it != itEnd; ++it)
-    {
-        IXmlNode* node = *it;
-        ((CXmlNode*)node)->AddToXmlString(xml, level + 1, fileHandle, chunkSize);
-    }
-
-    // Add tabs.
-    AddTabsToString(xml, level);
-    xml += "</";
-    xml += m_tag;
-    xml += ">\n";
-}
-
-#if !defined(APPLE) && !defined(LINUX) && !defined(AZ_LEGACY_CRYSYSTEM_TRAIT_HASSTPCPY)
-ILINE static char* stpcpy(char* dst, const char* src)
-{
-    while (src[0])
-    {
-        dst[0] = src[0];
-        dst++;
-        src++;
-    }
-    return dst;
-}
-#endif
-
-char* CXmlNode::AddToXmlStringUnsafe(char* xml, int level, char* endPtr, AZ::IO::HandleType fileHandle, size_t chunkSize) const
-{
-    const bool bHasChildren = (m_pChilds && !m_pChilds->empty());
-
-    for (int i = 0; i < level; i++)
-    {
-        *(xml++) = ' ';
-        *(xml++) = ' ';
-    }
-
-    // Begin Tag
-    if (!m_pAttributes || m_pAttributes->empty())
-    {
-        *(xml++) = '<';
-        xml = stpcpy(xml, m_tag);
-        if (*m_content == 0 && !bHasChildren)
-        {
-            *(xml++) = '/';
-            *(xml++) = '>';
-            *(xml++) = '\n';
-            return xml;
-        }
-        *(xml++) = '>';
-    }
-    else
-    {
-        *(xml++) = '<';
-        xml = stpcpy(xml, m_tag);
-        *(xml++) = ' ';
-
-        // Put attributes.
-        for (XmlAttributes::const_iterator it = m_pAttributes->begin(); it != m_pAttributes->end(); )
-        {
-            xml = stpcpy(xml, it->key);
-            *(xml++) = '=';
-            *(xml++) = '\"';
-#ifndef _RELEASE
-            if (it->value[strcspn(it->value, "\"\'&><")])
-            {
-                __debugbreak();
-            }
-#endif
-            xml = stpcpy(xml, it->value);
-            ++it;
-            *(xml++) = '\"';
-            if (it != m_pAttributes->end())
-            {
-                *(xml++) = ' ';
-            }
-        }
-        if (*m_content == 0 && !bHasChildren)
-        {
-            // Compact tag form.
-            *(xml++) = '/';
-            *(xml++) = '>';
-            *(xml++) = '\n';
-            return xml;
-        }
-        *(xml++) = '>';
-    }
-
-#ifndef _RELEASE
-    if (m_content[strcspn(m_content, "\"\'&><")])
-    {
-        __debugbreak();
-    }
-#endif
-    xml = stpcpy(xml, m_content);
-
-    if (!bHasChildren)
-    {
-        *(xml++) = '<';
-        *(xml++) = '/';
-        xml = stpcpy(xml, m_tag);
-        *(xml++) = '>';
-        *(xml++) = '\n';
-        return xml;
-    }
-
-    *(xml++) = '\n';
-
-    // Add sub nodes.
-    for (XmlNodes::iterator it = m_pChilds->begin(), itEnd = m_pChilds->end(); it != itEnd; ++it)
-    {
-        IXmlNode* node = *it;
-        xml = ((CXmlNode*)node)->AddToXmlStringUnsafe(xml, level + 1, endPtr, fileHandle, chunkSize);
-    }
-
-    for (int i = 0; i < level; i++)
-    {
-        *(xml++) = ' ';
-        *(xml++) = ' ';
-    }
-    *(xml++) = '<';
-    *(xml++) = '/';
-    xml = stpcpy(xml, m_tag);
-    *(xml++) = '>';
-    *(xml++) = '\n';
-
-    assert(xml < endPtr);
-
-    return xml;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IXmlStringData* CXmlNode::getXMLData(int nReserveMem) const
-{
-    CXmlStringData* pStrData = new CXmlStringData;
-    pStrData->m_string.reserve(nReserveMem);
-    AddToXmlString(pStrData->m_string, 0);
-    return pStrData;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlString CXmlNode::getXML(int level) const
-{
-    XmlString xml;
-    xml = "";
-    xml.reserve(1024);
-
-    AddToXmlString(xml, level);
-    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)
-{
-    const size_t chunkSizeBytes = (15 * 1024);
-    if (!fileName)
-    {
-        return false;
-    }
-
-    {
-        AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(fileName, "wt");
-        if (fileHandle != AZ::IO::InvalidHandle)
-        {
-#ifdef WIN32
-            XmlString xml = getXML();   // this would not work in consoles because the size limits in strings
-            const char* sxml = (const char*)xml;
-            gEnv->pCryPak->FWrite(sxml, xml.length(), fileHandle);
-            gEnv->pCryPak->FClose(fileHandle);
-            return true;
-#else
-            bool ret = saveToFile(fileName, chunkSizeBytes, fileHandle);
-            gEnv->pCryPak->FClose(fileHandle);
-            return ret;
-#endif
-        }
-        return false;
-    }
-}
-
-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
-
-    if (chunkSize < 256 * 1024)   // make at least 256k
-    {
-        chunkSize = 256 * 1024;
-    }
-
-
-    XmlString xml;
-    xml.assign ("");
-    xml.reserve(chunkSize * 2); // we reserve double memory, as writing in chunks is not really writing in fixed blocks but a bit fuzzy
-    auto pCryPak = gEnv->pCryPak;
-    if (fileHandle == AZ::IO::InvalidHandle)
-    {
-        return false;
-    }
-    AddToXmlString(xml, 0, fileHandle, chunkSize);
-    size_t len = xml.length();
-    if (len > 0)
-    {
-        pCryPak->FWrite(xml.c_str(), len, 1, fileHandle);
-    }
-    xml.clear(); // xml.resize(0) would not reclaim memory
-    return true;
-}
-
-
-/**
-******************************************************************************
-* XmlParserImp class.
-******************************************************************************
-*/
-class XmlParserImp
-    : public IXmlStringPool
-{
-public:
-    explicit XmlParserImp(bool bReuseStrings);
-    ~XmlParserImp();
-
-    void ParseBegin(bool bCleanPools);
-    XmlNodeRef ParseFile(const char* filename, XmlString& errorString, bool bCleanPools);
-    XmlNodeRef ParseBuffer(const char* buffer, size_t bufLen, XmlString& errorString, bool bCleanPools, bool bSuppressWarnings = false);
-    void ParseEnd();
-
-    // Add new string to pool.
-    const char* AddString(const char* str) { return m_stringPool.Append(str, (int)strlen(str)); }
-    //char* AddString( const char *str ) { return (char*)str; }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const
-    {
-        pSizer->AddObject(this, sizeof(*this));
-        pSizer->AddObject(m_stringPool);
-        pSizer->AddObject(m_nodeStack);
-    }
-protected:
-    void    onStartElement(const char* tagName, const char** atts);
-    void    onEndElement(const char* tagName);
-    void    onRawData(const char* data);
-
-    static void startElement(void* userData, const char* name, const char** atts)
-    {
-        ((XmlParserImp*)userData)->onStartElement(name, atts);
-    }
-    static void endElement(void* userData, const char* name)
-    {
-        ((XmlParserImp*)userData)->onEndElement(name);
-    }
-    static void characterData(void* userData, const char* s, int len) PREFAST_SUPPRESS_WARNING(6262)
-    {
-        char str[32700];
-        if (len > sizeof(str) - 1)
-        {
-            assert(0);
-            len = sizeof(str) - 1;
-        }
-        // Note that XML buffer userData has no terminating '\0'.
-        memcpy(str, s, len);
-        str[len] = 0;
-        ((XmlParserImp*)userData)->onRawData(str);
-    }
-
-    void CleanStack();
-
-    struct SStackEntity
-    {
-        XmlNodeRef node;
-        std::vector<IXmlNode*> childs; //TODO: is it worth lazily initializing this, like CXmlNode::m_pChilds?
-
-        void GetMemoryUsage(ICrySizer* pSizer) const
-        {
-            pSizer->AddObject(node);
-            pSizer->AddObject(childs);
-        }
-    };
-
-    // First node will become root node.
-    std::vector<SStackEntity> m_nodeStack;
-    int m_nNodeStackTop;
-
-    XmlNodeRef m_root;
-
-    XML_Parser m_parser;
-    CSimpleStringPool m_stringPool;
-};
-
-//////////////////////////////////////////////////////////////////////////
-void XmlParserImp::CleanStack()
-{
-    m_nNodeStackTop = 0;
-    for (int i = 0, num = m_nodeStack.size(); i < num; i++)
-    {
-        m_nodeStack[i].node = 0;
-        m_nodeStack[i].childs.resize(0);
-    }
-}
-
-/**
-******************************************************************************
-* XmlParserImp
-******************************************************************************
-*/
-void    XmlParserImp::onStartElement(const char* tagName, const char** atts)
-{
-    CXmlNode* pCNode = new CXmlNode;
-    pCNode->m_pStringPool = this;
-    pCNode->m_pStringPool->AddRef();
-    pCNode->m_tag = AddString(tagName);
-
-    XmlNodeRef node = pCNode;
-
-    m_nNodeStackTop++;
-    if (m_nNodeStackTop >= (int)m_nodeStack.size())
-    {
-        m_nodeStack.resize(m_nodeStack.size() * 2);
-    }
-
-    m_nodeStack[m_nNodeStackTop].node = pCNode;
-    m_nodeStack[m_nNodeStackTop - 1].childs.push_back(pCNode);
-
-    if (!m_root)
-    {
-        m_root = node;
-    }
-    else
-    {
-        pCNode->m_parent = (IXmlNode*)m_nodeStack[m_nNodeStackTop - 1].node;
-        node->AddRef(); // Childs need to be add refed.
-    }
-
-    node->setLine(XML_GetCurrentLineNumber((XML_Parser)m_parser));
-
-    // Call start element callback.
-    int i = 0;
-    int numAttrs = 0;
-    while (atts[i] != 0)
-    {
-        numAttrs++;
-        i += 2;
-    }
-    if (numAttrs > 0)
-    {
-        i = 0;
-        if (!pCNode->m_pAttributes)
-        {
-            pCNode->m_pAttributes = new XmlAttributes;
-        }
-
-        XmlAttributes& nodeAtts = *(pCNode->m_pAttributes);
-        nodeAtts.resize(numAttrs);
-        int nAttr = 0;
-        while (atts[i] != 0)
-        {
-            nodeAtts[nAttr].key = AddString(atts[i]);
-            nodeAtts[nAttr].value = AddString(atts[i + 1]);
-            nAttr++;
-            i += 2;
-        }
-        // Sort attributes.
-        //std::sort( pCNode->m_attributes.begin(),pCNode->m_attributes.end() );
-    }
-}
-
-void    XmlParserImp::onEndElement([[maybe_unused]] const char* tagName)
-{
-    assert(m_nNodeStackTop > 0);
-
-    if (m_nNodeStackTop > 0)
-    {
-        // Copy current childs to the parent.
-        SStackEntity& entry = m_nodeStack[m_nNodeStackTop];
-        CXmlNode* currNode = static_cast<CXmlNode*>(static_cast<IXmlNode*>(entry.node));
-        if (!entry.childs.empty())
-        {
-            if (!currNode->m_pChilds)
-            {
-                currNode->m_pChilds = new CXmlNode::XmlNodes;
-            }
-            *currNode->m_pChilds = entry.childs;
-        }
-        entry.childs.resize(0);
-        entry.node = NULL;
-    }
-    m_nNodeStackTop--;
-}
-
-void    XmlParserImp::onRawData(const char* data)
-{
-    assert(m_nNodeStackTop >= 0);
-    if (m_nNodeStackTop >= 0)
-    {
-        size_t len = strlen(data);
-        if (len > 0)
-        {
-            if (strspn(data, "\r\n\t ") != len)
-            {
-                CXmlNode* node = (CXmlNode*)(IXmlNode*)m_nodeStack[m_nNodeStackTop].node;
-                if (*node->m_content != '\0')
-                {
-                    node->m_content = m_stringPool.ReplaceString(node->m_content, data);
-                }
-                else
-                {
-                    node->m_content = AddString(data);
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlParserImp::XmlParserImp(bool bReuseStrings)
-    : m_nNodeStackTop(0)
-    , m_parser(NULL)
-    , m_stringPool(bReuseStrings)
-{
-    m_nodeStack.resize(32);
-    CleanStack();
-}
-
-XmlParserImp::~XmlParserImp()
-{
-    ParseEnd();
-}
-
-namespace
-{
-    void* custom_xml_malloc(size_t nSize)
-    {
-        return CryModuleMalloc(nSize);
-    }
-    void* custom_xml_realloc(void* p, size_t nSize)
-    {
-        return CryModuleRealloc(p, nSize);
-    }
-    void custom_xml_free(void* p)
-    {
-        CryModuleFree(p);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void XmlParserImp::ParseBegin(bool bCleanPools)
-{
-    m_root = 0;
-    CleanStack();
-
-    if (bCleanPools)
-    {
-        m_stringPool.Clear();
-    }
-
-    XML_Memory_Handling_Suite memHandler;
-    memHandler.malloc_fcn = custom_xml_malloc;
-    memHandler.realloc_fcn = custom_xml_realloc;
-    memHandler.free_fcn = custom_xml_free;
-
-    m_parser = XML_ParserCreate_MM(NULL, &memHandler, NULL);
-
-    XML_SetUserData(m_parser, this);
-    XML_SetElementHandler(m_parser, startElement, endElement);
-    XML_SetCharacterDataHandler(m_parser, characterData);
-    XML_SetEncoding(m_parser, "utf-8");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void XmlParserImp::ParseEnd()
-{
-    if (m_parser)
-    {
-        XML_ParserFree(m_parser);
-    }
-    m_parser = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef XmlParserImp::ParseBuffer(const char* buffer, size_t bufLen, XmlString& errorString, bool bCleanPools, bool bSuppressWarnings)
-{
-    static const char* const errorPrefix = "XML parser: ";
-
-    XmlNodeRef root = 0;
-
-    // Let's try to parse the buffer as binary XML
-    {
-        XMLBinary::XMLBinaryReader reader;
-        XMLBinary::XMLBinaryReader::EResult result;
-        root = reader.LoadFromBuffer(XMLBinary::XMLBinaryReader::eBufferMemoryHandling_MakeCopy, buffer, bufLen, result);
-        if (root)
-        {
-            return root;
-        }
-        if (result != XMLBinary::XMLBinaryReader::eResult_NotBinXml)
-        {
-            const char* const str = reader.GetErrorDescription();
-            errorString = str;
-            if (!bSuppressWarnings)
-            {
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s%s (data size: %u)", errorPrefix, str, static_cast<unsigned>(bufLen));
-            }
-            return 0;
-        }
-    }
-
-    // This is not binary XML, so let's use text XML parser.
-    {
-        ParseBegin(bCleanPools);
-        m_stringPool.SetBlockSize(static_cast<unsigned>(bufLen) / 16);
-
-        if (XML_Parse(m_parser, buffer, static_cast<int>(bufLen), 1))
-        {
-            root = m_root;
-        }
-        else
-        {
-            char str[1024];
-            sprintf_s(str, "%s%s at line %d", errorPrefix, XML_ErrorString(XML_GetErrorCode(m_parser)), (int)XML_GetCurrentLineNumber(m_parser));
-            errorString = str;
-            if (!bSuppressWarnings)
-            {
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
-            }
-        }
-
-        m_root = 0;
-        ParseEnd();
-    }
-
-    return root;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef XmlParserImp::ParseFile(const char* filename, XmlString& errorString, bool bCleanPools)
-{
-    LOADING_TIME_PROFILE_SECTION(GetISystem());
-
-    if (!filename)
-    {
-        return 0;
-    }
-
-    static const char* const errorPrefix = "XML reader: ";
-
-    XmlNodeRef root = 0;
-
-    char* pFileContents = 0;
-    size_t fileSize = 0;
-
-    char str[1024];
-
-    CryStackStringT<char, 256> adjustedFilename;
-    CryStackStringT<char, 256> pakPath;
-    if (fileSize <= 0)
-    {
-        CCryFile xmlFile;
-
-        if (!xmlFile.Open(filename, "rb"))
-        {
-            sprintf_s(str, "%sCan't open file (%s)", errorPrefix, filename);
-            errorString = str;
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
-            return 0;
-        }
-
-        fileSize = xmlFile.GetLength();
-        if (fileSize <= 0)
-        {
-            sprintf_s(str, "%sFile is empty (%s)", errorPrefix, filename);
-            errorString = str;
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
-            return 0;
-        }
-
-        pFileContents = new char[fileSize];
-        if (!pFileContents)
-        {
-            sprintf_s(str, "%sCan't allocate %u bytes of memory (%s)", errorPrefix, static_cast<unsigned>(fileSize), filename);
-            errorString = str;
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
-            return 0;
-        }
-
-        if (xmlFile.ReadRaw(pFileContents, fileSize) != fileSize)
-        {
-            delete [] pFileContents;
-            sprintf_s(str, "%sCan't read file (%s)", errorPrefix, filename);
-            errorString = str;
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
-            return 0;
-        }
-        adjustedFilename = xmlFile.GetAdjustedFilename();
-        adjustedFilename.replace('\\', '/');
-        pakPath = xmlFile.GetPakPath();
-        pakPath.replace('\\', '/');
-    }
-
-    if (g_bEnableBinaryXmlLoading)
-    {
-        LOADING_TIME_PROFILE_SECTION_NAMED("XMLBinaryReader::Parse");
-
-        XMLBinary::XMLBinaryReader reader;
-        XMLBinary::XMLBinaryReader::EResult result;
-        root = reader.LoadFromBuffer(XMLBinary::XMLBinaryReader::eBufferMemoryHandling_TakeOwnership, pFileContents, fileSize, result);
-        if (root)
-        {
-            return root;
-        }
-        if (result != XMLBinary::XMLBinaryReader::eResult_NotBinXml)
-        {
-            delete [] pFileContents;
-            sprintf_s(str, "%s%s (%s)", errorPrefix, reader.GetErrorDescription(), filename);
-            errorString = str;
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
-            return 0;
-        }
-        else
-        {
-            // not binary XML - refuse to load if in scripts dir and not in bin xml to help reduce hacking
-            // wish we could compile the text xml parser out, but too much work to get everything moved over
-            static const char SCRIPTS_DIR[] = "Scripts/";
-            CryFixedStringT<32> strScripts("S");
-            strScripts += "c";
-            strScripts += "r";
-            strScripts += "i";
-            strScripts += "p";
-            strScripts += "t";
-            strScripts += "s";
-            strScripts += "/";
-            // exclude files and PAKs from Mods folder
-            CryFixedStringT<8> modsStr("M");
-            modsStr += "o";
-            modsStr += "d";
-            modsStr += "s";
-            modsStr += "/";
-            if (_strnicmp(filename, strScripts.c_str(), strScripts.length()) == 0 &&
-                _strnicmp(adjustedFilename.c_str(), modsStr.c_str(), modsStr.length()) != 0 &&
-                _strnicmp(pakPath.c_str(), modsStr.c_str(), modsStr.length()) != 0)
-            {
-#ifdef _RELEASE
-                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Non binary XML found in scripts dir (%s)", filename);
-#endif
-            }
-        }
-    }
-
-    {
-        ParseBegin(bCleanPools);
-        m_stringPool.SetBlockSize(static_cast<unsigned>(fileSize / 16));
-
-        if (XML_Parse(m_parser, pFileContents, static_cast<int>(fileSize), 1))
-        {
-            root = m_root;
-        }
-        else
-        {
-            sprintf_s(str, "%s%s at line %d (%s)", errorPrefix, XML_ErrorString(XML_GetErrorCode(m_parser)), (int)XML_GetCurrentLineNumber(m_parser), filename);
-            errorString = str;
-            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
-        }
-
-        m_root = 0;
-        ParseEnd();
-    }
-
-    delete [] pFileContents;
-
-    return root;
-}
-
-XmlParser::XmlParser(bool bReuseStrings)
-{
-    m_nRefCount = 0;
-    m_pImpl = new XmlParserImp(bReuseStrings);
-    m_pImpl->AddRef();
-}
-
-XmlParser::~XmlParser()
-{
-    m_pImpl->Release();
-}
-
-void XmlParser::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    pSizer->AddObject(this, sizeof(*this));
-    pSizer->AddObject(m_pImpl);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef XmlParser::ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings)
-{
-    m_errorString = "";
-    return m_pImpl->ParseBuffer(buffer, nBufLen, m_errorString, bCleanPools, bSuppressWarnings);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef XmlParser::ParseFile(const char* filename, bool bCleanPools)
-{
-    m_errorString = "";
-    return m_pImpl->ParseFile(filename, m_errorString, bCleanPools);
-}
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Implements special reusable XmlNode for XmlNode pool
-//
-//////////////////////////////////////////////////////////////////////////
-CXmlNodeReuse::CXmlNodeReuse(const char* tag, CXmlNodePool* pPool)
-    : m_pPool(pPool)
-{
-    SAFE_RELEASE(m_pStringPool);
-    m_pStringPool = m_pPool->GetStringPool();
-    m_pStringPool->AddRef();
-    m_tag = m_pStringPool->AddString(tag);
-}
-
-void CXmlNodeReuse::Release()
-{
-    m_pPool->OnRelease(m_nRefCount, this);
-    CXmlNode::Release();
-}
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Pool of reusable XML nodes with shared string pool
-//
-//////////////////////////////////////////////////////////////////////////
-CXmlNodePool::CXmlNodePool(unsigned int nBlockSize, bool bReuseStrings)
-{
-    m_pStringPool = new CXmlStringPool(bReuseStrings);
-    assert(m_pStringPool != 0);
-
-    // in order to avoid memory fragmentation
-    // allocates 1Mb buffer for shared string pool
-    static_cast<CXmlStringPool*>(m_pStringPool)->SetBlockSize(nBlockSize);
-    m_pStringPool->AddRef();
-    m_nAllocated = 0;
-}
-
-CXmlNodePool::~CXmlNodePool()
-{
-    while (!m_pNodePool.empty())
-    {
-        CXmlNodeReuse* pNode = m_pNodePool.top();
-        m_pNodePool.pop();
-        pNode->Release();
-    }
-    m_pStringPool->Release();
-}
-
-XmlNodeRef CXmlNodePool::GetXmlNode(const char* sNodeName)
-{
-    CXmlNodeReuse* pNode = 0;
-
-    // NOTE: at the moment xml node pool is dedicated for statistics nodes only
-
-    // first at all check if we have already free node
-    if (!m_pNodePool.empty())
-    {
-        pNode = m_pNodePool.top();
-        m_pNodePool.pop();
-
-        // init it to new node name
-        pNode->setTag(sNodeName);
-
-        m_nAllocated++;
-        //if (0 == m_nAllocated % 1000)
-        //CryLog("[CXmlNodePool]: already reused nodes [%d]", m_nAllocated);
-    }
-    else
-    {
-        // there is no free nodes so create new one
-        // later it will be reused as soon as no external references left
-        pNode = new CXmlNodeReuse(sNodeName, this);
-        assert(pNode != 0);
-
-        // increase ref counter for reusing node later
-        pNode->AddRef();
-
-        m_nAllocated++;
-        //if (0 == m_nAllocated % 1000)
-        //CryLog("[CXmlNodePool]: already allocated nodes [%d]", m_nAllocated);
-    }
-    return pNode;
-}
-
-void CXmlNodePool::OnRelease(int iRefCount, void* pThis)
-{
-    // each reusable node call OnRelease before parent release
-    // since we keep reference on xml node so when ref count equals
-    // to 2 means that it is last external object releases reference
-    // to reusable node and it can be save for reuse later
-    if (2 == iRefCount)
-    {
-        CXmlNodeReuse* pNode = static_cast<CXmlNodeReuse*>(pThis);
-
-        pNode->removeAllChilds();
-        pNode->removeAllAttributes();
-
-        m_pNodePool.push(pNode);
-
-        // decrease totally allocated by xml node pool counter
-        // when counter equals to zero it means that all external
-        // objects do not have references to allocated reusable node
-        // at that point it is safe to clear shared string pool
-        m_nAllocated--;
-
-        if (0 == m_nAllocated)
-        {
-            //CryLog("[CXmlNodePool]: clear shared string pool");
-            static_cast<CXmlStringPool*>(m_pStringPool)->Clear();
-        }
-    }
-}
-
-#undef SCOPED_LOCALE_RESETTER
-
-
diff --git a/Code/CryEngine/CrySystem/XML/xml.h b/Code/CryEngine/CrySystem/XML/xml.h
deleted file mode 100644
index 4ba48a570b..0000000000
--- a/Code/CryEngine/CrySystem/XML/xml.h
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XML_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XML_H
-#pragma once
-
-
-#include <algorithm>
-#include <PoolAllocator.h>
-#include <stack>
-
-#include "IXml.h"
-
-// track some XML stats. only to find persistent XML nodes in the system
-// slow, so disable by default
-//#define CRY_COLLECT_XML_NODE_STATS
-//#undef CRY_COLLECT_XML_NODE_STATS
-
-
-struct IXmlStringPool
-{
-public:
-    IXmlStringPool() { m_refCount = 0; }
-    virtual ~IXmlStringPool() {};
-    void AddRef() { m_refCount++; };
-    void Release()
-    {
-        if (--m_refCount <= 0)
-        {
-            delete this;
-        }
-    };
-    virtual const char* AddString(const char* str) = 0;
-    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
-private:
-    int m_refCount;
-};
-
-/************************************************************************/
-/* XmlParser class, Parse xml and return root xml node if success.      */
-/************************************************************************/
-class XmlParser
-    : public IXmlParser
-{
-public:
-    explicit XmlParser(bool bReuseStrings);
-    ~XmlParser();
-
-    void AddRef()
-    {
-        ++m_nRefCount;
-    }
-
-    void Release()
-    {
-        if (--m_nRefCount <= 0)
-        {
-            delete this;
-        }
-    }
-
-    virtual XmlNodeRef ParseFile(const char* filename, bool bCleanPools);
-
-    virtual XmlNodeRef ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings = false);
-
-    const char* getErrorString() const { return m_errorString; }
-
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-private:
-    int m_nRefCount;
-    XmlString m_errorString;
-    class XmlParserImp* m_pImpl;
-};
-
-// Compare function for string comparasion, can be strcmp or _stricmp
-typedef int (__cdecl * XmlStrCmpFunc)(const char* str1, const char* str2);
-extern XmlStrCmpFunc g_pXmlStrCmp;
-
-//////////////////////////////////////////////////////////////////////////
-// XmlAttribute class
-//////////////////////////////////////////////////////////////////////////
-struct XmlAttribute
-{
-    const char* key;
-    const char* value;
-
-    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
-
-    bool operator<(const XmlAttribute& attr) const { return g_pXmlStrCmp(key, attr.key) < 0; }
-    bool operator>(const XmlAttribute& attr) const { return g_pXmlStrCmp(key, attr.key) > 0; }
-    bool operator==(const XmlAttribute& attr) const { return g_pXmlStrCmp(key, attr.key) == 0; }
-    bool operator!=(const XmlAttribute& attr) const { return g_pXmlStrCmp(key, attr.key) != 0; }
-};
-
-//! Xml node attributes class.
-
-typedef std::vector<XmlAttribute>   XmlAttributes;
-typedef XmlAttributes::iterator XmlAttrIter;
-typedef XmlAttributes::const_iterator XmlAttrConstIter;
-
-/**
-******************************************************************************
-* CXmlNode class
-* Never use CXmlNode directly instead use reference counted XmlNodeRef.
-******************************************************************************
-*/
-
-class CXmlNode
-    : public IXmlNode
-{
-public:
-    //! Constructor.
-    CXmlNode();
-    CXmlNode(const char* tag, bool bReuseStrings, bool bIsProcessingInstruction = false);
-    //! Destructor.
-    ~CXmlNode();
-
-    // collect allocated memory  informations
-    void GetMemoryUsage(ICrySizer* pSizer) const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Custom new/delete with pool allocator.
-    //////////////////////////////////////////////////////////////////////////
-    //void* operator new( size_t nSize );
-    //void operator delete( void *ptr );
-
-    virtual void DeleteThis();
-
-    //! Create new XML node.
-    XmlNodeRef createNode(const char* tag);
-
-    //! Get XML node tag.
-    const char* getTag() const { return m_tag; };
-    void    setTag(const char* tag);
-
-    //! Return true if given tag equal to node tag.
-    bool isTag(const char* tag) const;
-
-    //! Get XML Node attributes.
-    virtual int getNumAttributes() const { 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);
-
-    //! 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);
-
-    //! Get XML Node attribute for specified key.
-    const char* getAttr(const char* key) const;
-
-    //! Get XML Node attribute for specified key.
-    // Returns true if the attribute existes, alse otherwise.
-    bool                getAttr(const char* key, const char** value) const;
-
-    //! Check if attributes with specified key exist.
-    bool haveAttr(const char* key) const;
-
-    //! Creates new xml node and add it to childs list.
-    XmlNodeRef newChild(const char* tagName);
-
-    //! Adds new child node.
-    void addChild(const XmlNodeRef& node);
-    //! Remove child node.
-    void removeChild(const XmlNodeRef& node);
-
-    void insertChild(int nIndex, const XmlNodeRef& node);
-    void replaceChild(int nIndex, const XmlNodeRef& node);
-
-    //! Remove all child nodes.
-    void removeAllChilds();
-
-    //! Get number of child XML nodes.
-    int getChildCount() const { return m_pChilds ? (int)m_pChilds->size() : 0; };
-
-    //! Get XML Node child nodes.
-    XmlNodeRef getChild(int i) const;
-
-    //! Find node with specified tag.
-    XmlNodeRef findChild(const char* tag) const;
-    void deleteChild(const char* tag);
-    void deleteChildAt(int nIndex);
-
-    //! Get parent XML node.
-    XmlNodeRef  getParent() const { return m_parent; }
-    void                setParent(const XmlNodeRef& inRef);
-
-
-    //! Returns content of this node.
-    const char* getContent() const { return m_content; };
-    void setContent(const char* str);
-
-    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; };
-
-    //! 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
-
-    //! Set new XML Node attribute (or override attribute with same key).
-    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 Vec2d& 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 Vec3d& value);
-    void setAttr(const char* key, const Quat& value);
-
-    //! Delete attrbute.
-    void delAttr(const char* key);
-    //! Remove all node attributes.
-    void removeAllAttributes();
-
-    //! 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, XmlString& value) const  {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, Vec2d& 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, Vec3d& value) const;
-    bool getAttr(const char* key, Quat& value) const;
-    bool getAttr(const char* key, ColorB& value) const;
-
-protected:
-
-private:
-    CXmlNode(const CXmlNode&);
-    CXmlNode& operator = (const CXmlNode&);
-
-private:
-    void ReleaseChild(IXmlNode* pChild);
-    void removeAllChildsImpl();
-
-    void AddToXmlString(XmlString& xml, int level, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle, size_t chunkSizeBytes = 0) const;
-    char* AddToXmlStringUnsafe(char* xml, int level, char* endPtr, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle, size_t chunkSizeBytes = 0) const;
-    XmlString MakeValidXmlString(const XmlString& xml) const;
-    bool IsValidXmlString(const char* str) const;
-    XmlAttrConstIter GetAttrConstIterator(const char* key) const
-    {
-        assert(m_pAttributes);
-
-        XmlAttribute tempAttr;
-        tempAttr.key = key;
-
-        XmlAttributes::const_iterator it = std::find(m_pAttributes->begin(), m_pAttributes->end(), tempAttr);
-        return it;
-
-        /*
-        XmlAttributes::const_iterator it = std::lower_bound( m_attributes.begin(),m_attributes.end(),tempAttr );
-        if (it != m_attributes.end() && _stricmp(it->key,key) == 0)
-        return it;
-        return m_attributes.end();
-        */
-    }
-    XmlAttrIter GetAttrIterator(const char* key)
-    {
-        assert(m_pAttributes);
-
-        XmlAttribute tempAttr;
-        tempAttr.key = key;
-
-        XmlAttributes::iterator it = std::find(m_pAttributes->begin(), m_pAttributes->end(), tempAttr);
-        return it;
-
-        //      XmlAttributes::iterator it = std::lower_bound( m_attributes.begin(),m_attributes.end(),tempAttr );
-        //if (it != m_attributes.end() && _stricmp(it->key,key) == 0)
-        //return it;
-        //return m_attributes.end();
-    }
-    const char* GetValue(const char* key) const
-    {
-        if (m_pAttributes)
-        {
-            XmlAttrConstIter it = GetAttrConstIterator(key);
-            if (it != m_pAttributes->end())
-            {
-                return it->value;
-            }
-        }
-        return 0;
-    }
-
-protected:
-    // String pool used by this node.
-    IXmlStringPool* m_pStringPool;
-
-    //! Tag of XML node.
-    const char* m_tag;
-
-private:
-
-    //! Content of XML node.
-    const char* m_content;
-    //! Parent XML node.
-    IXmlNode* m_parent;
-
-    //typedef DynArray<CXmlNode*,XmlDynArrayAlloc>  XmlNodes;
-    typedef std::vector<IXmlNode*>  XmlNodes;
-    //XmlNodes m_childs;
-    XmlNodes* m_pChilds;
-
-    //! Xml node attributes.
-    //XmlAttributes m_attributes;
-    XmlAttributes* m_pAttributes;
-
-    //! Line in XML file where this node firstly appeared (useful for debugging).
-    int m_line;
-
-    bool m_isProcessingInstruction;
-    friend class XmlParserImp;
-};
-
-typedef stl::PoolAllocatorNoMT<sizeof(CXmlNode)> CXmlNode_PoolAlloc;
-extern CXmlNode_PoolAlloc* g_pCXmlNode_PoolAlloc;
-
-#ifdef CRY_COLLECT_XML_NODE_STATS
-typedef std::set<CXmlNode*> TXmlNodeSet; // yes, slow, but really only for one-shot debugging
-struct SXmlNodeStats
-{
-    SXmlNodeStats()
-        : nAllocs(0)
-        , nFrees(0) {}
-    TXmlNodeSet nodeSet;
-    uint32 nAllocs;
-    uint32 nFrees;
-};
-extern SXmlNodeStats* g_pCXmlNode_Stats;
-#endif
-
-/*
-//////////////////////////////////////////////////////////////////////////
-inline void* CXmlNode::operator new( size_t nSize )
-{
-    void *ptr = g_pCXmlNode_PoolAlloc->Allocate();
-    if (ptr)
-    {
-        memset( ptr,0,nSize ); // Clear objects memory.
-#ifdef CRY_COLLECT_XML_NODE_STATS
-        g_pCXmlNode_Stats->nodeSet.insert(reinterpret_cast<CXmlNode*> (ptr));
-        ++g_pCXmlNode_Stats->nAllocs;
-#endif
-    }
-    return ptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline void CXmlNode::operator delete( void *ptr )
-{
-    if (ptr)
-    {
-        g_pCXmlNode_PoolAlloc->Deallocate(ptr);
-#ifdef CRY_COLLECT_XML_NODE_STATS
-        g_pCXmlNode_Stats->nodeSet.erase(reinterpret_cast<CXmlNode*> (ptr));
-        ++g_pCXmlNode_Stats->nFrees;
-#endif
-    }
-}
-*/
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Reusable XmlNode for XmlNode pool with shared xml string pool
-//
-//////////////////////////////////////////////////////////////////////////
-class CXmlNodePool;
-
-class CXmlNodeReuse
-    : public CXmlNode
-{
-public:
-    CXmlNodeReuse(const char* tag, CXmlNodePool* pPool);
-    virtual void Release();
-
-protected:
-    CXmlNodePool* m_pPool;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Pool of reusable XML nodes with shared string pool
-//
-//////////////////////////////////////////////////////////////////////////
-class CXmlNodePool
-{
-public:
-    CXmlNodePool(unsigned int nBlockSize, bool bReuseStrings);
-    virtual ~CXmlNodePool();
-
-    XmlNodeRef GetXmlNode(const char* sNodeName);
-    bool empty() const { return (m_nAllocated == 0); }
-
-protected:
-    virtual void OnRelease(int iRefCount, void* pThis);
-    IXmlStringPool* GetStringPool() { return m_pStringPool; }
-
-private:
-    friend class CXmlNodeReuse;
-
-    IXmlStringPool* m_pStringPool;
-    unsigned int m_nAllocated;
-    std::stack<CXmlNodeReuse*> m_pNodePool;
-};
-
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XML_H
diff --git a/Code/CryEngine/CrySystem/XML/xml_string.h b/Code/CryEngine/CrySystem/XML/xml_string.h
deleted file mode 100644
index 83624672c7..0000000000
--- a/Code/CryEngine/CrySystem/XML/xml_string.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XML_STRING_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XML_STRING_H
-#pragma once
-
-
-typedef string xml_string;
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XML_STRING_H
diff --git a/Code/CryEngine/CrySystem/crysystem_files.cmake b/Code/CryEngine/CrySystem/crysystem_files.cmake
deleted file mode 100644
index 34dc27922b..0000000000
--- a/Code/CryEngine/CrySystem/crysystem_files.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    AZCrySystemInitLogSink.cpp
-    CmdLine.cpp
-    CmdLineArg.cpp
-    ConsoleBatchFile.cpp
-    ConsoleHelpGen.cpp
-    DebugCallStack.cpp
-    IDebugCallStack.cpp
-    Log.cpp
-    System.cpp
-    SystemCFG.cpp
-    SystemEventDispatcher.cpp
-    SystemInit.cpp
-    SystemWin32.cpp
-    Timer.cpp
-    XConsole.cpp
-    XConsoleVariable.cpp
-    XML/ReadWriteXMLSink.h
-    AZCrySystemInitLogSink.h
-    AZCoreLogSink.h
-    CmdLine.h
-    CmdLineArg.h
-    ConsoleBatchFile.h
-    ConsoleHelpGen.h
-    DebugCallStack.h
-    IDebugCallStack.h
-    Log.h
-    SimpleStringPool.h
-    CrySystem_precompiled.h
-    System.h
-    SystemCFG.h
-    SystemEventDispatcher.h
-    Timer.h
-    XConsole.h
-    XConsoleVariable.h
-    XML/SerializeXMLReader.cpp
-    XML/SerializeXMLWriter.cpp
-    XML/xml.cpp
-    XML/XMLPatcher.cpp
-    XML/XmlUtils.cpp
-    XML/SerializeXMLReader.h
-    XML/SerializeXMLWriter.h
-    XML/xml.h
-    XML/XMLPatcher.h
-    XML/xml_string.h
-    XML/XmlUtils.h
-    XML/ReadXMLSink.cpp
-    XML/WriteXMLSource.cpp
-    LocalizedStringManager.cpp
-    LocalizedStringManager.h
-    Huffman.cpp
-    Huffman.h
-    RemoteConsole/RemoteConsole.cpp
-    RemoteConsole/RemoteConsole.h
-    RemoteConsole/RemoteConsole_impl.inl
-    RemoteConsole/RemoteConsole_none.inl
-    LevelSystem/LevelSystem.cpp
-    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/CryEngine/CrySystem/crysystem_shared_files.cmake b/Code/CryEngine/CrySystem/crysystem_shared_files.cmake
deleted file mode 100644
index c476c71c04..0000000000
--- a/Code/CryEngine/CrySystem/crysystem_shared_files.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    DllMain.cpp
-)
diff --git a/Code/Editor/2DViewport.cpp b/Code/Editor/2DViewport.cpp
new file mode 100644
index 0000000000..2c256237e3
--- /dev/null
+++ b/Code/Editor/2DViewport.cpp
@@ -0,0 +1,1185 @@
+/*
+ * 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"
+
+// Qt
+#include <QTimer>
+
+// Editor
+#include "2DViewport.h"
+#include "CryEditDoc.h"
+#include "DisplaySettings.h"
+#include "GameEngine.h"
+#include "Settings.h"
+#include "ViewManager.h"
+#include "Include/IObjectManager.h"
+#include "Include/HitContext.h"
+#include "Objects/SelectionGroup.h"
+
+
+#define MARKER_SIZE 6.0f
+#define MARKER_DIR_SIZE 10.0f
+#define SELECTION_RADIUS 30.0f
+
+#define GL_RGBA 0x1908
+#define GL_BGRA 0x80E1
+
+#define BACKGROUND_COLOR Vec3(1.0f, 1.0f, 1.0f)
+#define SELECTION_RECT_COLOR Vec3(0.8f, 0.8f, 0.8f)
+#define MINOR_GRID_COLOR    Vec3(0.55f, 0.55f, 0.55f)
+#define MAJOR_GRID_COLOR    Vec3(0.6f, 0.6f, 0.6f)
+#define AXIS_GRID_COLOR     Vec3(0, 0, 0)
+#define GRID_TEXT_COLOR     Vec3(0, 0, 1.0f)
+
+#define MAX_WORLD_SIZE 10000
+
+enum Viewport2dTitleMenuCommands
+{
+    ID_SHOW_LABELS,
+    ID_SHOW_GRID
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+static void OnMenuLabels()
+{
+    GetIEditor()->GetDisplaySettings()->DisplayLabels(!GetIEditor()->GetDisplaySettings()->IsDisplayLabels());
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void OnMenuGrid()
+{
+    CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
+    if (pViewport)
+    {
+        if (Q2DViewport* p2DViewport = viewport_cast<Q2DViewport*>(pViewport))
+        {
+            p2DViewport->SetShowGrid(!p2DViewport->GetShowGrid());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline Vec3 SnapToSize(Vec3 v, double size)
+{
+    Vec3 snapped;
+    snapped.x = floor((v.x / size) + 0.5) * size;
+    snapped.y = floor((v.y / size) + 0.5) * size;
+    snapped.z = floor((v.z / size) + 0.5) * size;
+    return snapped;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+Q2DViewport::Q2DViewport(QWidget* parent)
+    : QtViewport(parent)
+{
+    // Scroll offset equals origin
+    m_rcSelect.setRect(0, 0, 0, 0);
+
+    m_viewType = ET_ViewportXY;
+    m_axis = VPA_XY;
+
+    m_bShowTerrain = true;
+    m_bShowGrid = true;
+    m_bShowObjectsInfo = true;
+    m_bShowMinorGridLines = true;
+    m_bShowMajorGridLines = true;
+    m_bShowNumbers = true;
+    m_bAutoAdjustGrids = true;
+    m_gridAlpha = 1;
+
+    m_origin2D.Set(0, 0, 0);
+
+    m_colorGridText = QColor(220, 220, 220);
+    m_colorAxisText = QColor(220, 220, 220);
+    m_colorBackground = QColor(128, 128, 128);
+
+    m_screenTM.SetIdentity();
+    m_screenTM_Inverted.SetIdentity();
+
+    m_fZoomFactor = 1;
+    m_bContentValid = false;
+
+    m_bShowViewMarker = true;
+
+    m_displayContext.pIconManager = GetIEditor()->GetIconManager();
+
+    /*
+       In MFC OnCreate was delayed behind the scenes, being called at some time
+       after the constructor but just before the window is shown for the first
+       time. Using QTimer is simple way to accomplish the same thing. 
+       
+       QTimer relies on the event loop, so by calling QTimer::singleShot with 0
+       timeout, the constructor will finish immediately, followed by a call to
+       OnCreate shortly after, once Qt's event loop is up and running. 
+    */
+    QTimer::singleShot(0, [&]() { OnCreate(); });
+}
+
+//////////////////////////////////////////////////////////////////////////
+Q2DViewport::~Q2DViewport()
+{
+    OnDestroy();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::SetType(EViewportType type)
+{
+    m_viewType = type;
+
+    switch (m_viewType)
+    {
+    case ET_ViewportXY:
+        m_axis = VPA_XY;
+        break;
+    case ET_ViewportXZ:
+        m_axis = VPA_XZ;
+        break;
+    case ET_ViewportYZ:
+        m_axis = VPA_YZ;
+        break;
+    }
+    ;
+
+    SetAxis(m_axis);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::SetAxis(EViewportAxis axis)
+{
+    m_axis = axis;
+    switch (m_axis)
+    {
+    case VPA_XY:
+        m_cullAxis = 2;
+        break;
+    case VPA_YX:
+        m_cullAxis = 2;
+        break;
+    case VPA_XZ:
+        m_cullAxis = 1;
+        break;
+    case VPA_YZ:
+        m_cullAxis = 0;
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::CalculateViewTM()
+{
+    Matrix34 viewTM;
+    Matrix34 tm;
+    tm.SetIdentity();
+    viewTM.SetIdentity();
+    float fScale = GetZoomFactor();
+    Vec3 origin = GetOrigin2D();
+
+    float height = m_rcClient.height() / fScale;
+
+    Vec3 v1;
+    switch (m_axis)
+    {
+    case VPA_XY:
+        tm = Matrix33::CreateScale(Vec3(fScale, -fScale, fScale)) * tm; // No fScale for Z
+        tm.SetTranslation(Vec3(-origin.x, height + origin.y, 0) * fScale);
+        break;
+    case VPA_YX:
+        tm.SetFromVectors(Vec3(0, 1, 0) * fScale, Vec3(1, 0, 0) * fScale, Vec3(0, 0, 1) * fScale, Vec3(0, 0, 0));
+        tm.SetTranslation(Vec3(-origin.x, height + origin.y, 0) * fScale);
+        break;
+    case VPA_XZ:
+        viewTM.SetFromVectors(Vec3(1, 0, 0), Vec3(0, 0, 1), Vec3(0, 1, 0), Vec3(0, 0, 0));
+        tm.SetFromVectors(Vec3(1, 0, 0) * fScale, Vec3(0, 0, 1) * fScale, Vec3(0, -1, 0) * fScale, Vec3(0, 0, 0));
+        tm.SetTranslation(Vec3(-origin.x, height + origin.z, 0) * fScale);
+        break;
+
+    case VPA_YZ:
+        viewTM.SetFromVectors(Vec3(0, 1, 0), Vec3(0, 0, 1), Vec3(1, 0, 0), Vec3(0, 0, 0));
+        tm.SetFromVectors(Vec3(0, 0, 1) * fScale, Vec3(1, 0, 0) * fScale, Vec3(0, -1, 0) * fScale, Vec3(0, 0, 0)); // No fScale for Z
+        tm.SetTranslation(Vec3(-origin.y, height + origin.z, 0) * fScale);
+        break;
+    }
+    SetViewTM(viewTM);
+    m_screenTM = tm;
+    m_screenTM_Inverted = m_screenTM.GetInverted();
+
+    SetConstructionMatrix(COORDS_VIEW, GetViewTM());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::ResetContent()
+{
+    QtViewport::ResetContent();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::UpdateContent(int flags)
+{
+    QtViewport::UpdateContent(flags);
+    if (flags & eUpdateObjects)
+    {
+        m_bContentValid = false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    if (GetIEditor()->IsInGameMode())
+    {
+        return;
+    }
+
+    if (!hasFocus())
+    {
+        setFocus();
+    }
+
+    // Check Edit Tool.
+    MouseCallback(eMouseRDown, point, modifiers);
+
+    SetCurrentCursor(STD_CURSOR_MOVE, QString());
+
+    // Save the mouse down position
+    m_RMouseDownPos = point;
+
+    m_prevZoomFactor = GetZoomFactor();
+    //m_prevScrollOffset = m_cScrollOffset;
+
+    CaptureMouse();
+    SetViewMode(ScrollZoomMode);
+
+    m_bContentValid = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnRButtonUp([[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
+{
+    ReleaseMouse();
+    SetViewMode(NothingMode);
+
+    GetViewManager()->UpdateViews(eUpdateObjects);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnMButtonDown(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;
+
+    SetCurrentCursor(STD_CURSOR_MOVE, QString());
+
+    // Save the mouse down position
+    m_RMouseDownPos = point;
+
+    m_prevZoomFactor = GetZoomFactor();
+
+    SetViewMode(ScrollZoomMode);
+
+    m_bContentValid = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    // Check Edit Tool.
+    if (MouseCallback(eMouseMUp, point, modifiers))
+    {
+        return;
+    }
+
+    SetViewMode(NothingMode);
+
+    ReleaseMouse();
+    m_bContentValid = false;
+    GetViewManager()->UpdateViews(eUpdateObjects);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    ////////////////////////////////////////////////////////////////////////
+    // User pressed the left mouse button
+    ////////////////////////////////////////////////////////////////////////
+    if (GetViewMode() != NothingMode)
+    {
+        return;
+    }
+
+    m_cMouseDownPos = point;
+    m_prevZoomFactor = GetZoomFactor();
+    //m_prevScrollOffset = m_cScrollOffset;
+
+    QtViewport::OnLButtonDown(modifiers, point);
+    m_bContentValid = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Process the various events depending on the selection and the view
+    // mode
+    ////////////////////////////////////////////////////////////////////////
+    QtViewport::OnLButtonUp(modifiers, point);
+
+    GetViewManager()->UpdateViews(eUpdateObjects);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnMouseWheel(Qt::KeyboardModifiers, short zDelta, [[maybe_unused]] const QPoint& pt)
+{
+    float z = GetZoomFactor();
+    float scale = 1.2f * fabs(zDelta / 120.0f);
+    if (zDelta >= 0)
+    {
+        z = z * scale;
+    }
+    else
+    {
+        z = z / scale;
+    }
+    SetZoom(z, m_cMousePos);
+
+    GetViewManager()->UpdateViews(eUpdateObjects);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point)
+{
+    m_cMousePos = point;
+
+    if (GetViewMode() == ScrollZoomMode)
+    {
+        // Capture the mouse after the user has moved a bit, otherwise the
+        // right click context menu won't popup
+        if (!m_mouseCaptured && ((point - m_RMouseDownPos).manhattanLength() > QApplication::startDragDistance()))
+        {
+            CaptureMouse();
+        }
+
+        // You can only scroll while the middle mouse button is down
+        if (buttons & Qt::RightButton || buttons & Qt::MiddleButton)
+        {
+            if (modifiers & Qt::ShiftModifier)
+            {
+                // Zoom to mouse position.
+                float z = m_prevZoomFactor + (point.y() - m_RMouseDownPos.y()) * 0.02f;
+                SetZoom(z, m_RMouseDownPos);
+            }
+            else
+            {
+                // Set the new scrolled coordinates
+                float fScale = GetZoomFactor();
+                float ofsx, ofsy;
+                GetScrollOffset(ofsx, ofsy);
+                ofsx -= (point.x() - m_RMouseDownPos.x()) / fScale;
+                ofsy += (point.y() - m_RMouseDownPos.y()) / fScale;
+                SetScrollOffset(ofsx, ofsy);
+                m_RMouseDownPos = point;
+            }
+        }
+        return;
+    }
+
+    QtViewport::OnMouseMove(modifiers, buttons, point);
+
+    m_bContentValid = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::SetScrollOffset(float x, float y, [[maybe_unused]] bool bLimits)
+{
+    Vec3 org = GetOrigin2D();
+    switch (m_axis)
+    {
+    case VPA_XY:
+    case VPA_YX:
+        org.x = x;
+        org.y = y;
+        break;
+    case VPA_XZ:
+        org.x = x;
+        org.z = y;
+        break;
+    case VPA_YZ:
+        org.y = x;
+        org.z = y;
+        break;
+    }
+
+    SetOrigin2D(org);
+
+    CalculateViewTM();
+    //GetViewManager()->UpdateViews(eUpdateObjects);
+    m_bContentValid = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::GetScrollOffset(float& x, float& y)
+{
+    Vec3 origin = GetOrigin2D();
+    switch (m_axis)
+    {
+    case VPA_XY:
+    case VPA_YX:
+        x = origin.x;
+        y = origin.y;
+        break;
+    case VPA_XZ:
+        x = origin.x;
+        y = origin.z;
+        break;
+    case VPA_YZ:
+        x = origin.y;
+        y = origin.z;
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::SetZoom(float fZoomFactor, const QPoint& center)
+{
+    if (fZoomFactor < m_minZoom)
+    {
+        fZoomFactor = m_minZoom;
+    }
+    else if (fZoomFactor > m_maxZoom)
+    {
+        fZoomFactor = m_maxZoom;
+    }
+
+    // Zoom to mouse position.
+    float ofsx, ofsy;
+    GetScrollOffset(ofsx, ofsy);
+
+    float s1 = GetZoomFactor();
+    float s2 = fZoomFactor;
+
+    SetZoomFactor(fZoomFactor);
+
+    // Calculate new offset to center zoom on mouse.
+    float x2 = center.x();
+    float y2 = m_rcClient.height() - center.y();
+    ofsx = -(x2 / s2 - x2 / s1 - ofsx);
+    ofsy = -(y2 / s2 - y2 / s1 - ofsy);
+    SetScrollOffset(ofsx, ofsy, true);
+
+    CalculateViewTM();
+
+    m_bContentValid = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::resizeEvent(QResizeEvent* event)
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Re-evaluate the zoom / scroll offset values
+    // TODO: Restore the zoom rectangle instead of resetting it
+    ////////////////////////////////////////////////////////////////////////
+
+    QtViewport::resizeEvent(event);
+
+    m_rcClient = rect();
+    CalculateViewTM();
+    m_bContentValid = false;
+}
+
+void Q2DViewport::showEvent(QShowEvent* event)
+{
+    QtViewport::showEvent(event);
+    m_bContentValid = false;
+    QMetaObject::invokeMethod(this, "Update", Qt::QueuedConnection);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::paintEvent([[maybe_unused]] QPaintEvent* event)
+{
+    // nothing to draw here, Render() draws on the overlay widget which has no updates enabled to avoid flicker
+    CGameEngine* ge = GetIEditor()->GetGameEngine();
+    setRenderOverlayVisible(ge ? ge->IsLevelLoaded() : false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+int Q2DViewport::OnCreate()
+{
+    // Calculate the View transformation matrix.
+    CalculateViewTM();
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::Update()
+{
+    if (!m_bContentValid)
+    {
+        Render();
+    }
+    m_bContentValid = true;
+    QtViewport::Update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint Q2DViewport::WorldToView(const Vec3& wp) const
+{
+    Vec3 sp = m_screenTM.TransformPoint(wp);
+    QPoint p = QPoint(sp.x, 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(sp.x, 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
+{
+    Vec3 wp = m_screenTM_Inverted.TransformPoint(Vec3(vp.x(), vp.y(), 0));
+    switch (m_axis)
+    {
+    case VPA_XY:
+    case VPA_YX:
+        wp.z = 0;
+        break;
+    case VPA_XZ:
+        wp.y = 0;
+        break;
+    case VPA_YZ:
+        wp.x = 0;
+        break;
+    }
+    return wp;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void    Q2DViewport::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const
+{
+    raySrc = ViewToWorld(vp);
+    switch (m_axis)
+    {
+    case VPA_XY:
+    case VPA_YX:
+        raySrc.z = MAX_WORLD_SIZE;
+        rayDir(0, 0, -1);
+        break;
+    case VPA_XZ:
+        raySrc.y = MAX_WORLD_SIZE;
+        rayDir(0, -1, 0);
+        break;
+    case VPA_YZ:
+        raySrc.x = MAX_WORLD_SIZE;
+        rayDir(-1, 0, 0);
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float Q2DViewport::GetScreenScaleFactor([[maybe_unused]] const Vec3& worldPoint) const
+{
+    return 400.0f / GetZoomFactor();
+    //return 100.0f / ;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnTitleMenu(QMenu* menu)
+{
+    bool bShowGrid = true;
+    if (Q2DViewport* p2DViewport = viewport_cast<Q2DViewport*>(GetIEditor()->GetViewManager()->GetSelectedViewport()))
+    {
+        bShowGrid = p2DViewport->GetShowGrid();
+    }
+
+    QAction* action = menu->addAction(tr("Labels"));
+    action->setCheckable(true);
+    action->setChecked(GetIEditor()->GetDisplaySettings()->IsDisplayLabels());
+    connect(action, &QAction::triggered, this, OnMenuLabels);
+
+    action = menu->addAction(tr("Grid"));
+    action->setCheckable(true);
+    action->setChecked(bShowGrid);
+    connect(action, &QAction::triggered, this, OnMenuGrid);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnDestroy()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::Render()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::Draw(DisplayContext& dc)
+{
+    dc.DepthTestOff();
+    dc.DepthWriteOff();
+    if (m_bShowGrid)
+    {
+        DrawGrid(dc);
+    }
+
+    DrawObjects(dc);
+    DrawSelection(dc);
+    if (m_bShowViewMarker)
+    {
+        DrawViewerMarker(dc);
+    }
+    DrawAxis(dc);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::DrawGrid(DisplayContext& dc, bool bNoXNumbers)
+{
+    float gridSize = 1.0f;
+    if (gridSize < 0.00001f)
+    {
+        return;
+    }
+
+    float fZ = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    float fScale = GetZoomFactor();
+
+    int width = m_rcClient.width();
+    int height = m_rcClient.height();
+
+    float origin[2];
+    GetScrollOffset(origin[0], origin[1]);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Draw Minor grid lines.
+    //////////////////////////////////////////////////////////////////////////
+
+    float pixelsPerGrid = gridSize * fScale;
+
+    m_fGridZoom = 1.0f;
+
+    if (m_bAutoAdjustGrids)
+    {
+        int griditers = 0;
+        pixelsPerGrid = gridSize * fScale;
+        while (pixelsPerGrid <= 5 && griditers++ < 20)
+        {
+            pixelsPerGrid = gridSize * fScale;
+        }
+    }
+
+    Matrix34 viewTM = GetViewTM().GetInverted() * m_screenTM_Inverted;
+    Matrix34 viewTM_Inv = m_screenTM * GetViewTM();
+
+    Vec3 viewP0 = viewTM.TransformPoint(Vec3(0, 0, 0));
+    Vec3 viewP1 = viewTM.TransformPoint(Vec3(m_rcClient.width(), m_rcClient.height(), 0));
+
+    Vec3 viewP_Text = viewTM.TransformPoint(Vec3(0, m_rcClient.height(), 0));
+
+    if (m_bShowMinorGridLines && (!m_bAutoAdjustGrids || pixelsPerGrid > 5))
+    {
+        //////////////////////////////////////////////////////////////////////////
+        // Draw Minor grid lines.
+        //////////////////////////////////////////////////////////////////////////
+
+        Vec3 vec0 = SnapToSize(viewP0, gridSize);
+        Vec3 vec1 = SnapToSize(viewP1, gridSize);
+        if (vec0.x > vec1.x)
+        {
+            std::swap(vec0.x, vec1.x);
+        }
+        if (vec0.y > vec1.y)
+        {
+            std::swap(vec0.y, vec1.y);
+        }
+
+        dc.SetColor(MINOR_GRID_COLOR, m_gridAlpha);
+        for (float dy = vec0.y; dy < vec1.y; dy += gridSize)
+        {
+            Vec3 p0 = viewTM_Inv.TransformPoint(Vec3(viewP0.x, dy, 0));
+            Vec3 p1 = viewTM_Inv.TransformPoint(Vec3(viewP1.x, dy, 0));
+            dc.DrawLine(Vec3(p0.x, p0.y, fZ), Vec3(p1.x, p1.y, fZ));
+        }
+        for (float dx = vec0.x; dx < vec1.x; dx += gridSize)
+        {
+            Vec3 p0 = viewTM_Inv.TransformPoint(Vec3(dx, viewP0.y, 0));
+            Vec3 p1 = viewTM_Inv.TransformPoint(Vec3(dx, viewP1.y, 0));
+            dc.DrawLine(Vec3(p0.x, p0.y, fZ), Vec3(p1.x, p1.y, fZ));
+        }
+    }
+    if (m_bShowMajorGridLines)
+    {
+        //////////////////////////////////////////////////////////////////////////
+        // Draw Major grid lines.
+        //////////////////////////////////////////////////////////////////////////
+        gridSize = gridSize * 1.0f;
+
+        if (m_bAutoAdjustGrids)
+        {
+            int iters = 0;
+            pixelsPerGrid = gridSize * fScale;
+            while (pixelsPerGrid < 20 && iters < 20)
+            {
+                gridSize = gridSize * 2;
+                pixelsPerGrid = gridSize * fScale;
+                iters++;
+            }
+        }
+        if (!m_bAutoAdjustGrids || pixelsPerGrid > 20)
+        {
+            Vec3 vec0 = SnapToSize(viewP0, gridSize);
+            Vec3 vec1 = SnapToSize(viewP1, gridSize);
+            if (vec0.x > vec1.x)
+            {
+                std::swap(vec0.x, vec1.x);
+            }
+            if (vec0.y > vec1.y)
+            {
+                std::swap(vec0.y, vec1.y);
+            }
+
+            dc.SetColor(MAJOR_GRID_COLOR, m_gridAlpha);
+
+            for (float dy = vec0.y; dy < vec1.y; dy += gridSize)
+            {
+                Vec3 p0 = viewTM_Inv.TransformPoint(Vec3(viewP0.x, dy, 0));
+                Vec3 p1 = viewTM_Inv.TransformPoint(Vec3(viewP1.x, dy, 0));
+                dc.DrawLine(Vec3(p0.x, p0.y, fZ), Vec3(p1.x, p1.y, fZ));
+            }
+            for (float dx = vec0.x; dx < vec1.x; dx += gridSize)
+            {
+                Vec3 p0 = viewTM_Inv.TransformPoint(Vec3(dx, viewP0.y, 0));
+                Vec3 p1 = viewTM_Inv.TransformPoint(Vec3(dx, viewP1.y, 0));
+                dc.DrawLine(Vec3(p0.x, p0.y, fZ), Vec3(p1.x, p1.y, fZ));
+            }
+
+            // Draw numbers.
+            if (m_bShowNumbers)
+            {
+                char text[64];
+                dc.SetColor(m_colorGridText);
+
+                if (!bNoXNumbers)
+                {
+                    // Draw horizontal grid text.
+                    for (float dx = vec0.x; dx <= vec1.x; dx += gridSize)
+                    {
+                        Vec3 p = viewTM_Inv.TransformPoint(Vec3(dx, viewP_Text.y, 0));
+                        sprintf_s(text, "%i", (int)(dx));
+                        dc.Draw2dTextLabel(p.x - 8, p.y - 13, 1, text);
+                    }
+                }
+                for (float dy = vec0.y; dy <= vec1.y; dy += gridSize)
+                {
+                    Vec3 p = viewTM_Inv.TransformPoint(Vec3(viewP_Text.x, dy, 0));
+                    sprintf_s(text, "%i", (int)(dy));
+                    dc.Draw2dTextLabel(p.x + 3, p.y - 12, 1, text);
+                }
+            }
+        }
+    }
+
+    // Draw Main Axis.
+    {
+        Vec3 org = m_screenTM.TransformPoint(Vec3(0, 0, 0));
+        dc.SetColor(AXIS_GRID_COLOR);
+        dc.DrawLine(Vec3(org.x, 0, fZ), Vec3(org.x, height, fZ));
+        dc.DrawLine(Vec3(0, org.y, fZ), Vec3(width, org.y, fZ));
+    }
+    //////////////////////////////////////////////////////////////////////////
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::DrawAxis(DisplayContext& dc)
+{
+    float cl = 0.85f;
+    char xstr[2], ystr[2], zstr[2];
+    Vec3 colx, coly, colz;
+    Vec3 colorX(cl, 0, 0);
+    Vec3 colorY(0, cl, 0);
+    Vec3 colorZ(0, 0, cl);
+    switch (m_axis)
+    {
+    case VPA_XY:
+        azstrcpy(xstr, AZ_ARRAY_SIZE(xstr), "x");
+        azstrcpy(ystr, AZ_ARRAY_SIZE(ystr),  "y");
+        azstrcpy(zstr, AZ_ARRAY_SIZE(zstr),  "z");
+        colx = colorX;
+        coly = colorY;
+        colz = colorZ;
+        break;
+    case VPA_YX:
+        azstrcpy(xstr, AZ_ARRAY_SIZE(xstr), "x");
+        azstrcpy(ystr, AZ_ARRAY_SIZE(ystr), "y");
+        azstrcpy(zstr, AZ_ARRAY_SIZE(zstr), "z");
+        colx = colorY;
+        coly = colorX;
+        colz = colorZ;
+        break;
+    case VPA_XZ:
+        azstrcpy(xstr, AZ_ARRAY_SIZE(xstr), "x");
+        azstrcpy(ystr, AZ_ARRAY_SIZE(ystr), "z");
+        azstrcpy(zstr, AZ_ARRAY_SIZE(zstr), "y");
+        colx = colorX;
+        coly = colorZ;
+        colz = colorY;
+        break;
+    case VPA_YZ:
+        azstrcpy(xstr, AZ_ARRAY_SIZE(xstr), "y");
+        azstrcpy(ystr, AZ_ARRAY_SIZE(ystr), "z");
+        azstrcpy(zstr, AZ_ARRAY_SIZE(zstr), "x");
+        colx = colorY;
+        coly = colorZ;
+        colz = colorX;
+        break;
+    }
+
+    int height = m_rcClient.height();
+
+    int size = 25;
+    Vec3 pos(30, height - 15, 1);
+
+    dc.SetColor(colx.x, colx.y, colx.z, 1);
+    dc.DrawLine(pos, pos + Vec3(size, 0, 0));
+
+    dc.SetColor(coly.x, coly.y, coly.z, 1);
+    dc.DrawLine(pos, pos - Vec3(0, size, 0));
+
+    dc.SetColor(m_colorAxisText);
+    pos.x -= 3;
+    pos.y -= 4;
+    pos.z = 2;
+    dc.Draw2dTextLabel(pos.x + size + 4, pos.y - 2, 1, xstr);
+    dc.Draw2dTextLabel(pos.x + 3, pos.y - size, 1, ystr);
+    dc.Draw2dTextLabel(pos.x - 5, pos.y + 5, 1, zstr);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::DrawSelection(DisplayContext& dc)
+{
+    AABB box;
+    GetIEditor()->GetSelectedRegion(box);
+
+    if (!IsEquivalent(box.min, box.max, 0))
+    {
+        switch (m_axis)
+        {
+        case VPA_XY:
+        case VPA_YX:
+            box.min.z = box.max.z = 0;
+            break;
+        case VPA_XZ:
+            box.min.y = box.max.y = 0;
+            break;
+        case VPA_YZ:
+            box.min.x = box.max.x = 0;
+            break;
+        }
+
+        dc.PushMatrix(GetScreenTM());
+        dc.SetColor(SELECTION_RECT_COLOR.x, SELECTION_RECT_COLOR.y, SELECTION_RECT_COLOR.z, 1);
+        dc.DrawWireBox(box.min, box.max);
+        dc.PopMatrix();
+    }
+
+    if (!m_selectedRect.isEmpty())
+    {
+        dc.SetColor(SELECTION_RECT_COLOR.x, SELECTION_RECT_COLOR.y, SELECTION_RECT_COLOR.z, 1);
+        QPoint p1(m_selectedRect.left(), m_selectedRect.top());
+        QPoint p2(m_selectedRect.right() + 1, m_selectedRect.bottom() +1);
+        dc.DrawLine(Vec3(p1.x(), p1.y(), 0), Vec3(p2.x(), p1.y(), 0));
+        dc.DrawLine(Vec3(p1.x(), p2.y(), 0), Vec3(p2.x(), p2.y(), 0));
+        dc.DrawLine(Vec3(p1.x(), p1.y(), 0), Vec3(p1.x(), p2.y(), 0));
+        dc.DrawLine(Vec3(p2.x(), p1.y(), 0), Vec3(p2.x(), p2.y(), 0));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::DrawViewerMarker(DisplayContext& dc)
+{
+    float noScale = 1.0f / GetZoomFactor();
+
+    CViewport* pVP = GetViewManager()->GetGameViewport();
+    if (!pVP)
+    {
+        return;
+    }
+
+    Ang3 viewAngles = Ang3::GetAnglesXYZ(Matrix33(pVP->GetViewTM()));
+
+    Matrix34 tm;
+    switch (m_axis)
+    {
+    case VPA_XY:
+    case VPA_YX:
+        tm = Matrix34::CreateRotationXYZ(Ang3(0, 0, viewAngles.z));
+        break;
+    case VPA_XZ:
+        tm = Matrix34::CreateRotationXYZ(Ang3(viewAngles.x, viewAngles.y, viewAngles.z));
+        break;
+    case VPA_YZ:
+        tm = Matrix34::CreateRotationXYZ(Ang3(viewAngles.x, 0, viewAngles.z));
+        break;
+    }
+    tm.SetTranslation(pVP->GetViewTM().GetTranslation());
+
+    dc.PushMatrix(GetScreenTM() * tm);
+
+    Vec3 dim(MARKER_SIZE, MARKER_SIZE / 2, MARKER_SIZE);
+    dc.SetColor(QColor(0, 0, 255)); // blue
+    dc.DrawWireBox(-dim * noScale, dim * noScale);
+
+    float fov = GetIEditor()->GetSystem()->GetViewCamera().GetFov();
+
+    Vec3 q[4];
+    float dist = 30;
+    float ta = (float)tan(0.5f * fov);
+    float h = dist * ta;
+    float w = h * gSettings.viewports.fDefaultAspectRatio; //  ASPECT ??
+    //float h = w / GetAspect();
+    q[0] = Vec3(w, dist, h) * noScale;
+    q[1] = Vec3(-w, dist, h) * noScale;
+    q[2] = Vec3(-w, dist, -h) * noScale;
+    q[3] = Vec3(w, dist, -h) * noScale;
+
+    // Draw frustum.
+    dc.DrawLine(Vec3(0, 0, 0), q[0]);
+    dc.DrawLine(Vec3(0, 0, 0), q[1]);
+    dc.DrawLine(Vec3(0, 0, 0), q[2]);
+    dc.DrawLine(Vec3(0, 0, 0), q[3]);
+
+    // Draw quad.
+    dc.DrawPolyLine(q, 4);
+
+    dc.PopMatrix();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::DrawObjects(DisplayContext& dc)
+{
+    dc.PushMatrix(GetScreenTM());
+    if (m_bShowObjectsInfo)
+    {
+        GetIEditor()->GetObjectManager()->Display(dc);
+    }
+
+    dc.PopMatrix();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::MakeConstructionPlane([[maybe_unused]] int axis)
+{
+    m_constructionMatrix[COORDS_VIEW] = GetViewTM();
+
+    Vec3 p(0, 0, 0);
+
+    switch (m_axis)
+    {
+    case VPA_XY:
+        AssignConstructionPlane(p, p + Vec3(0, 1, 0), p + Vec3(1, 0, 0));
+        break;
+    case VPA_YX:
+        m_constructionPlane.SetPlane(p, p + Vec3(1, 0, 0), p + Vec3(0, 1, 0));
+        break;
+    case VPA_XZ:
+        AssignConstructionPlane(p, p + Vec3(0, 0, 1), p + Vec3(1, 0, 0));
+        break;
+    case VPA_YZ:
+        AssignConstructionPlane(p, p + Vec3(0, 0, 1), p + Vec3(0, 1, 0));
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const Matrix34& Q2DViewport::GetConstructionMatrix(RefCoordSys coordSys)
+{
+    if (coordSys == COORDS_VIEW)
+    {
+        return GetViewTM();
+    }
+    return m_constructionMatrix[coordSys];
+}
+
+//////////////////////////////////////////////////////////////////////////
+AABB Q2DViewport::GetWorldBounds(const QPoint& pnt1, const QPoint& pnt2)
+{
+    Vec3 org;
+    AABB box;
+    box.Reset();
+    box.Add(ViewToWorld(pnt1));
+    box.Add(ViewToWorld(pnt2));
+
+    int maxSize = MAX_WORLD_SIZE;
+    switch (m_axis)
+    {
+    case VPA_XY:
+    case VPA_YX:
+        box.min.z = -maxSize;
+        box.max.z = maxSize;
+        break;
+    case VPA_XZ:
+        box.min.y = -maxSize;
+        box.max.y = maxSize;
+        break;
+    case VPA_YZ:
+        box.min.x = -maxSize;
+        box.max.x = maxSize;
+        break;
+    }
+    return box;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::OnDragSelectRectangle(const QRect &rect, [[maybe_unused]] bool bNormalizeRect)
+{
+    Vec3 org;
+    AABB box;
+    box.Reset();
+
+    Vec3 p1 = ViewToWorld(rect.topLeft());
+    Vec3 p2 = ViewToWorld(rect.bottomRight() + QPoint(1,1));
+    org = p1;
+
+    // Calculate selection volume.
+    box.Add(p1);
+    box.Add(p2);
+
+    int maxSize = MAX_WORLD_SIZE;
+
+    char szNewStatusText[512];
+    float w, h;
+
+    switch (m_axis)
+    {
+    case VPA_XY:
+        box.min.z = -maxSize;
+        box.max.z = maxSize;
+
+        w = box.max.x - box.min.x;
+        h = box.max.y - box.min.y;
+        sprintf_s(szNewStatusText, "X:%g Y:%g W:%g H:%g", org.x, org.y, w, h);
+        break;
+    case VPA_YX:
+        box.min.z = -maxSize;
+        box.max.z = maxSize;
+
+        w = box.max.y - box.min.y;
+        h = box.max.x - box.min.x;
+        sprintf_s(szNewStatusText, "X:%g Y:%g W:%g H:%g", org.x, org.y, w, h);
+        break;
+    case VPA_XZ:
+        box.min.y = -maxSize;
+        box.max.y = maxSize;
+
+        w = box.max.x - box.min.x;
+        h = box.max.z - box.min.z;
+        sprintf_s(szNewStatusText, "X:%g Z:%g  W:%g H:%g", org.x, org.z, w, h);
+        break;
+    case VPA_YZ:
+        box.min.x = -maxSize;
+        box.max.x = maxSize;
+
+        w = box.max.y - box.min.y;
+        h = box.max.z - box.min.z;
+        sprintf_s(szNewStatusText, "Y:%g Z:%g  W:%g H:%g", org.y, org.z, w, h);
+        break;
+    }
+
+    GetIEditor()->SetSelectedRegion(box);
+
+    // Show marker position in the status bar
+    GetIEditor()->SetStatusText(szNewStatusText);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool Q2DViewport::HitTest(const QPoint& point, HitContext& hitInfo)
+{
+    hitInfo.bounds = &m_displayBounds;
+    return QtViewport::HitTest(point, hitInfo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+bool Q2DViewport::IsBoundsVisible(const AABB& box) const
+{
+    // If at least part of bbox is visible then its visible.
+    if (m_displayBounds.IsIntersectBox(box))
+    {
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::CenterOnSelection()
+{
+    CSelectionGroup* sel = GetIEditor()->GetSelection();
+    if (sel->IsEmpty())
+    {
+        return;
+    }
+
+    AABB bounds = sel->GetBounds();
+    CenterOnAABB(bounds);
+}
+
+void Q2DViewport::CenterOnAABB(const AABB& aabb)
+{
+    Vec3 selPos = aabb.GetCenter();
+
+    Vec3 v1 = ViewToWorld(m_rcClient.bottomLeft());
+    Vec3 v2 = ViewToWorld(m_rcClient.topRight());
+    Vec3 vofs = (v2 - v1) * 0.5f;
+    selPos -= vofs;
+    SetOrigin2D(selPos);
+
+    m_bContentValid = false;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 Q2DViewport::GetOrigin2D() const
+{
+    if (gSettings.viewports.bSync2DViews)
+    {
+        return GetViewManager()->GetOrigin2D();
+    }
+    else
+    {
+        return m_origin2D;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void Q2DViewport::SetOrigin2D(const Vec3& org)
+{
+    m_origin2D = org;
+    if (gSettings.viewports.bSync2DViews)
+    {
+        GetViewManager()->SetOrigin2D(m_origin2D);
+    }
+}
+
+#include <moc_2DViewport.cpp>
diff --git a/Code/Editor/2DViewport.h b/Code/Editor/2DViewport.h
new file mode 100644
index 0000000000..208984c275
--- /dev/null
+++ b/Code/Editor/2DViewport.h
@@ -0,0 +1,251 @@
+/*
+ * 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_2DVIEWPORT_H
+#define CRYINCLUDE_EDITOR_2DVIEWPORT_H
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "Viewport.h"
+#include "Objects/DisplayContext.h"
+#endif
+
+class QMenu;
+
+/** 2D Viewport used mostly for indoor editing, Front/Top/Left viewports.
+*/
+class Q2DViewport
+    : public QtViewport
+{
+    Q_OBJECT
+public:
+    enum ViewMode
+    {
+        NothingMode = 0,
+        ScrollZoomMode,
+    };
+
+    Q2DViewport(QWidget* parent = nullptr);
+    virtual ~Q2DViewport();
+
+    virtual void SetType(EViewportType type);
+    virtual EViewportType GetType() const { return m_viewType; }
+    virtual float GetAspectRatio() const { return 1.0f; };
+
+    virtual void ResetContent();
+    virtual void UpdateContent(int flags);
+
+public slots:
+    // Called every frame to update viewport.
+    virtual void Update();
+
+public:
+    //! Map world space position to viewport position.
+    virtual QPoint     WorldToView(const Vec3& wp) const;
+
+    virtual QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const; //Eric@conffx
+
+    //! Map viewport position to world space position.
+    virtual 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.
+    virtual void        ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const;
+
+    void OnTitleMenu(QMenu* menu) override;
+
+    virtual bool HitTest(const QPoint& point, HitContext& hitInfo) override;
+    virtual bool IsBoundsVisible(const AABB& box) const;
+
+    // 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;
+    void CenterOnSelection() override;
+    void CenterOnAABB(const AABB& aabb) override;
+
+    /** Get 2D viewports origin.
+    */
+    Vec3 GetOrigin2D() const;
+
+    /** Assign 2D viewports origin.
+    */
+    void SetOrigin2D(const Vec3& org);
+
+
+    void SetShowViewMarker(bool bEnable) { m_bShowViewMarker = bEnable; }
+
+    void SetShowGrid(bool bShowGrid) { m_bShowGrid = bShowGrid; }
+    bool GetShowGrid() const { return m_bShowGrid; };
+
+    void SetShowObjectsInfo(bool bShowObjectsInfo) { m_bShowObjectsInfo = bShowObjectsInfo; }
+    bool GetShowObjectsInfo() const { return m_bShowObjectsInfo; }
+
+    void SetGridLines(bool bShowMinor, bool bShowMajor) { m_bShowMinorGridLines = bShowMinor; m_bShowMajorGridLines = bShowMajor; }
+    void SetGridLineNumbers(bool bShowNumbers) { m_bShowNumbers = bShowNumbers; }
+    void SetAutoAdjust(bool bAuto) { m_bAutoAdjustGrids = bAuto; }
+
+
+protected:
+    enum EViewportAxis
+    {
+        VPA_XY,
+        VPA_XZ,
+        VPA_YZ,
+        VPA_YX,
+    };
+
+    void SetAxis(EViewportAxis axis);
+
+    // Scrolling / zooming related
+    virtual void SetScrollOffset(float x, float y, bool bLimits = true);
+    virtual void GetScrollOffset(float& x, float& y); // Only x and y components used.
+
+    virtual void SetZoom(float fZoomFactor, const QPoint& center);
+
+    // overrides from CViewport.
+    virtual void MakeConstructionPlane(int axis);
+    virtual const Matrix34& GetConstructionMatrix(RefCoordSys coordSys);
+
+    //! Calculate view transformation matrix.
+    virtual void CalculateViewTM();
+
+    virtual void SetViewMode(ViewMode eViewMode)    { m_eViewMode = eViewMode; };
+    ViewMode GetViewMode() { return m_eViewMode; };
+
+protected slots:
+    // Render
+    void Render();
+
+protected:
+    // Draw everything.
+    virtual void Draw(DisplayContext& dc);
+
+    // Draw elements of viewport.
+    void DrawGrid(DisplayContext& dc, bool bNoXNumbers = false);
+    void DrawAxis(DisplayContext& dc);
+    void DrawSelection(DisplayContext& dc);
+    void DrawObjects(DisplayContext& dc);
+    void DrawViewerMarker(DisplayContext& dc);
+
+    AABB GetWorldBounds(const QPoint& p1, const QPoint& p2);
+
+    void OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point) override;
+    void resizeEvent(QResizeEvent* event) override;
+    void showEvent(QShowEvent* event) override;
+    void paintEvent(QPaintEvent* event) override;
+    int OnCreate();
+    void OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta, const QPoint& pt);
+    void OnDestroy();
+
+protected:
+    //////////////////////////////////////////////////////////////////////////
+    // Variables.
+    //////////////////////////////////////////////////////////////////////////
+
+    //! XY/XZ/YZ mode of this 2D viewport.
+    EViewportType m_viewType;
+    EViewportAxis m_axis;
+
+    //! Axis to cull normals with in this Viewport.
+    int m_cullAxis;
+
+    // Viewport origin point.
+    Vec3 m_origin2D;
+
+    // Scrolling / zooming related
+    QPoint m_cMousePos;
+    QPoint m_RMouseDownPos;
+
+    float m_prevZoomFactor;
+    QSize m_prevScrollOffset;
+
+    QRect m_rcSelect;
+    QRect m_rcClient;
+
+    AABB m_displayBounds;
+
+    bool m_bShowTerrain;
+    bool m_bShowViewMarker;
+    bool m_bShowGrid;
+    bool m_bShowObjectsInfo;
+    bool m_bShowMinorGridLines;
+    bool m_bShowMajorGridLines;
+    bool m_bShowNumbers;
+    bool m_bAutoAdjustGrids;
+
+    Matrix34 m_screenTM_Inverted;
+
+    float m_gridAlpha;
+    QColor m_colorGridText;
+    QColor m_colorAxisText;
+    QColor m_colorBackground;
+    bool m_bContentValid;
+
+    DisplayContext m_displayContext;
+    ViewMode m_eViewMode = NothingMode;
+
+    //May be changed by parent classes of Q2DViewport
+    //CTopRendererWnd for example will change m_maxZoom to 250.0f
+    float m_minZoom = 0.01f;
+    float m_maxZoom = 500.0f;
+};
+
+//////////////////////////////////////////////////////////////////////////
+class C2DViewport_XY
+    : public Q2DViewport
+{
+    Q_OBJECT
+public:
+    static const GUID& GetClassID()
+    {
+        return QtViewport::GetClassID<C2DViewport_XY>();
+    }
+
+    C2DViewport_XY(QWidget* parent = nullptr)
+        : Q2DViewport(parent) { SetType(ET_ViewportXY); }
+};
+
+//////////////////////////////////////////////////////////////////////////
+class C2DViewport_XZ
+    : public Q2DViewport
+{
+    Q_OBJECT
+public:
+    static const GUID& GetClassID()
+    {
+        return QtViewport::GetClassID<C2DViewport_XZ>();
+    }
+
+    C2DViewport_XZ(QWidget* parent = nullptr)
+        : Q2DViewport(parent) { SetType(ET_ViewportXZ); }
+};
+
+//////////////////////////////////////////////////////////////////////////
+class C2DViewport_YZ
+    : public Q2DViewport
+{
+    Q_OBJECT
+public:
+    static const GUID& GetClassID()
+    {
+        return QtViewport::GetClassID<C2DViewport_YZ>();
+    }
+
+    C2DViewport_YZ(QWidget* parent = nullptr)
+        : Q2DViewport(parent) { SetType(ET_ViewportYZ); }
+};
+
+#endif // CRYINCLUDE_EDITOR_2DVIEWPORT_H
diff --git a/Code/Editor/AboutDialog.cpp b/Code/Editor/AboutDialog.cpp
new file mode 100644
index 0000000000..f7385b39b7
--- /dev/null
+++ b/Code/Editor/AboutDialog.cpp
@@ -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
+ *
+ */
+
+
+
+#include "EditorDefs.h"
+
+#include "AboutDialog.h"
+
+// Qt
+#include <QPainter>
+#include <QDesktopServices>
+#include <QSvgWidget>
+
+// AzCore
+#include <AzCore/Casting/numeric_cast.h>    // for aznumeric_cast
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_AboutDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_ui(new Ui::CAboutDialog)
+{
+    m_ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+    connect(m_ui->m_transparentAgreement, &QLabel::linkActivated, this, &CAboutDialog::OnCustomerAgreement);
+
+    m_ui->m_transparentTrademarks->setText(versionText);
+
+    m_ui->m_transparentAllRightReserved->setObjectName("copyrightNotice");
+    m_ui->m_transparentAllRightReserved->setTextFormat(Qt::RichText);
+    m_ui->m_transparentAllRightReserved->setText(richTextCopyrightNotice);
+
+    m_ui->m_transparentAgreement->setObjectName("link");
+
+    setStyleSheet( "CAboutDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; }\
+                    CAboutDialog > QLabel#link { text-decoration: underline; color: #94D2FF; }");
+
+    // Prepare background image
+    QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg"));
+    m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+
+    // Draw the Open 3D Engine logo from svg
+    m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/o3de_logo.svg"));
+
+    // Prevent re-sizing
+    setFixedSize(m_enforcedWidth, m_enforcedHeight);
+}
+
+CAboutDialog::~CAboutDialog()
+{
+}
+
+void CAboutDialog::paintEvent(QPaintEvent*)
+{
+    QPainter painter(this);
+
+    QRect drawTarget = rect();
+    painter.drawPixmap(drawTarget, m_backgroundImage);
+}
+
+void CAboutDialog::mouseReleaseEvent(QMouseEvent* event)
+{
+    if (event->button() == Qt::LeftButton)
+    {
+        accept();
+    }
+
+    QDialog::mouseReleaseEvent(event);
+}
+
+void CAboutDialog::OnCustomerAgreement()
+{
+    QDesktopServices::openUrl(QUrl(QStringLiteral("https://www.o3debinaries.org/license")));
+}
+
+#include <moc_AboutDialog.cpp>
diff --git a/Code/Editor/AboutDialog.h b/Code/Editor/AboutDialog.h
new file mode 100644
index 0000000000..0c5fb2c158
--- /dev/null
+++ b/Code/Editor/AboutDialog.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
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include <QString>
+#include <QPixmap>
+#endif
+
+namespace Ui {
+    class CAboutDialog;
+}
+
+class CAboutDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CAboutDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent = nullptr);
+    ~CAboutDialog();
+
+private:
+
+    void OnCustomerAgreement();
+
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void paintEvent(QPaintEvent* event) override;
+
+    QScopedPointer<Ui::CAboutDialog>    m_ui;
+    QPixmap                             m_backgroundImage;
+
+    int m_enforcedWidth = 600;
+    int m_enforcedHeight = 400;
+};
+
diff --git a/Code/Editor/AboutDialog.ui b/Code/Editor/AboutDialog.ui
new file mode 100644
index 0000000000..9341a00d48
--- /dev/null
+++ b/Code/Editor/AboutDialog.ui
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CAboutDialog</class>
+ <widget class="QWidget" name="CAboutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>600</width>
+    <height>360</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>600</width>
+    <height>360</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>600</width>
+    <height>360</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>About Open 3D Engine Editor</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">background-color: transparent</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="sizeConstraint">
+      <enum>QLayout::SetFixedSize</enum>
+     </property>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>4</number>
+       </property>
+       <property name="topMargin">
+        <number>10</number>
+       </property>
+       <property name="bottomMargin">
+        <number>10</number>
+       </property>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_42">
+         <property name="leftMargin">
+          <number>11</number>
+         </property>
+         <property name="topMargin">
+          <number>12</number>
+         </property>
+         <property name="bottomMargin">
+          <number>12</number>
+         </property>
+         <item>
+          <widget class="QSvgWidget" name="m_logo" native="true">
+           <property name="minimumSize">
+            <size>
+             <width>175</width>
+             <height>66</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>175</width>
+             <height>66</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="sizeConstraint">
+          <enum>QLayout::SetNoConstraint</enum>
+         </property>
+         <property name="leftMargin">
+          <number>20</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>16</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>O3DE Editor</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="m_transparentDevelopedBy">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>18</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Developer Preview</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::AutoText</enum>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+           <widget class="QLabel" name="m_transparentCopyright">
+            <property name="geometry">
+             <rect>
+              <x>0</x>
+              <y>0</y>
+              <width>180</width>
+              <height>0</height>
+             </rect>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+            </property>
+           </widget>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="m_transparentTrademarks">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>18</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="ClickableLabel" name="m_transparentAgreement">
+           <property name="text">
+            <string>Terms of Use</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+           <property name="showDecoration" stdset="0">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>16</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="m_transparentAllRightReserved">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>260</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>260</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Specified in AboutDialog.cpp</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>300</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QSvgWidget</class>
+   <extends>QWidget</extends>
+   <header>qsvgwidget.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>QtUI/ClickableLabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Editor/ActionManager.cpp b/Code/Editor/ActionManager.cpp
new file mode 100644
index 0000000000..9611e23d87
--- /dev/null
+++ b/Code/Editor/ActionManager.cpp
@@ -0,0 +1,650 @@
+/*
+ * 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 "ActionManager.h"
+
+// Qt
+#include <QSignalMapper>
+#include <QDebug>
+#include <QMenuBar>
+#include <QScopedValueRollback>
+
+// Editor
+#include "MainWindow.h"
+#include "QtViewPaneManager.h"
+#include "ShortcutDispatcher.h"
+#include "ToolbarManager.h"
+
+
+static const char* const s_reserved = "Reserved"; ///< "Reserved" property used for actions that cannot be overridden.
+                                                  ///< (e.g. KeySequences such as Ctrl+S and Ctrl+Z for Save/Undo etc.)
+
+static const char* const s_menuIdProperty = "MenuId"; ///< "MenuId" property used when adding top level menus to the
+                                                      ///<  menu bar so they can be uniquely identified with FindMenu()
+
+static const int s_invalidGuardActionId = -1;
+
+ActionManagerExecutionGuard::ActionManagerExecutionGuard(ActionManager* actionManager, QAction* action)
+    : m_actionManager(actionManager)
+    , m_actionId(s_invalidGuardActionId)
+    , m_canExecute(true)
+{
+    // both actionManager and action can be nullptr, and this is totally valid.
+    // the lambdas using this might be out of scope and their QPointers may have been cleared
+    if (actionManager && action)
+    {
+        m_actionId = action->data().toInt();
+        m_canExecute = actionManager->InsertActionExecuting(m_actionId);
+    }
+}
+
+ActionManagerExecutionGuard::ActionManagerExecutionGuard(ActionManager* actionManager, int actionId)
+    : m_actionManager(actionManager)
+    , m_actionId(actionId)
+    , m_canExecute(true)
+{
+    // both actionManager and action can be nullptr, and this is totally valid. The lambdas using this might be out of scope and
+    // their QPointers may have been cleared
+    if (actionManager)
+    {
+        m_canExecute = actionManager->InsertActionExecuting(m_actionId);
+    }
+}
+
+ActionManagerExecutionGuard::~ActionManagerExecutionGuard()
+{
+    // Only bother removing the action if it successfully inserted, indicated by m_canExecute.
+    // If during the insert, it was found that the action was already present, then there
+    // is no need to remove it, and doing so might cause problems because any it implies
+    // that something has already executed the action higher up the callstack and we don't
+    // want to remove the id so that future action triggers within the same callstack are prevented
+    // from executing.
+    if (m_canExecute && m_actionManager && (m_actionId != s_invalidGuardActionId))
+    {
+        m_actionManager->RemoveActionExecuting(m_actionId);
+    }
+}
+
+PatchedAction::PatchedAction(const QString& name, QObject* parent)
+    : QAction(name, parent)
+{
+}
+
+bool PatchedAction::event(QEvent* ev)
+{
+    // *Really* honor Qt::WindowShortcut. Floating dock widgets are a separate window (Qt::Window flag is set) even though they have a parent.
+
+    if (ev->type() == QEvent::Shortcut && shortcutContext() == Qt::WindowShortcut)
+    {
+        // This prevents shortcuts from firing while we're in a long running operation
+        // started by a shortcut
+        static bool reentranceLock = false;
+        if (reentranceLock)
+        {
+            return true;
+        }
+
+        QScopedValueRollback<bool> reset(reentranceLock, true);
+
+        QWidget* focusWidget = ShortcutDispatcher::focusWidget();
+        if (!focusWidget)
+        {
+            return QAction::event(ev);
+        }
+
+        for (QWidget* associatedWidget : associatedWidgets())
+        {
+            QWidget* associatedWindow = associatedWidget->window();
+            QWidget* focusWindow = focusWidget->window();
+            if (associatedWindow == focusWindow)
+            {
+                // Fair enough, we accept it.
+                return QAction::event(ev);
+            }
+            else if (associatedWindow && focusWindow)
+            {
+                /**
+                 * But do allow if the focused window is actually a floating dock widget.
+                 * For example, If Entity Outliner is floating, the gizmos (key 1, 2, 3 4) should still work.
+                 *
+                 * FIXME: But then why are those main toolbar actions using Qt::WindowShortcut instead of Qt::ApplicationShortcut ?
+                 * This block goes against what the original PatchedAction fixed.
+                 * Consider either removing it and using regular QActions, or using Qt::ApplicationShortcut
+                 * See also LY-35177
+                 */
+                QString focusWindowName = focusWindow->objectName();
+                if (focusWindowName.isEmpty())
+                {
+                    continue;
+                }
+
+                QWidget* child = associatedWindow->findChild<QWidget*>(focusWindowName);
+                if (child)
+                {
+                    // Also accept if the focus window is a child of the associated window
+                    return QAction::event(ev);
+                }
+            }
+        }
+
+        // Bug detected: Qt is propagating a shortcut with context Qt::WindowShortcut outside of window boundaries
+        // Consume the event instead of processing it.
+        qDebug() << "Discarding buggy shortcut";
+        return true;
+    }
+
+    return QAction::event(ev);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// ActionWrapper
+/////////////////////////////////////////////////////////////////////////////
+ActionManager::ActionWrapper& ActionManager::ActionWrapper::SetMenu(DynamicMenu* menu)
+{
+    menu->SetAction(m_action, m_actionManager);
+    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);
+    return *this;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// DynamicMenu
+/////////////////////////////////////////////////////////////////////////////
+DynamicMenu::DynamicMenu(QObject* parent)
+    : QObject(parent)
+    , m_action(nullptr)
+    , m_menu(nullptr)
+{
+    m_actionMapper = new QSignalMapper(this);
+    connect(m_actionMapper, SIGNAL(mapped(int)), this, SLOT(TriggerAction(int)));
+}
+
+void DynamicMenu::SetAction(QAction* action, ActionManager* am)
+{
+    Q_ASSERT(action);
+    Q_ASSERT(am);
+    m_action = action;
+    m_menu = new QMenu();
+    m_action->setMenu(m_menu);
+    connect(m_menu, &QMenu::aboutToShow, this, &DynamicMenu::ShowMenu);
+    m_actionManager = am;
+    setParent(m_action);
+}
+
+void DynamicMenu::SetParentMenu(QMenu* menu, ActionManager* am)
+{
+    Q_ASSERT(menu && !m_menu);
+    Q_ASSERT(!m_action);
+    m_menu = menu;
+    connect(m_menu, &QMenu::aboutToShow, this, &DynamicMenu::ShowMenu);
+    m_actionManager = am;
+}
+
+void DynamicMenu::AddAction(int id, QAction* action)
+{
+    Q_ASSERT(!m_actions.contains(id));
+    action->setData(id);
+    m_actions[id] = action;
+    m_menu->addAction(action);
+
+    connect(action, SIGNAL(triggered()), m_actionMapper, SLOT(map()));
+    m_actionMapper->setMapping(action, id);
+}
+
+void DynamicMenu::AddSeparator()
+{
+    Q_ASSERT(m_menu);
+    m_menu->addSeparator();
+}
+
+ActionManager::ActionWrapper DynamicMenu::AddAction(int id, const QString& name)
+{
+    QAction* action = new PatchedAction(name, this);
+    AddAction(id, action);
+    return ActionManager::ActionWrapper(action, m_actionManager);
+}
+
+void DynamicMenu::UpdateAllActions()
+{
+    for (auto action : m_menu->actions())
+    {
+        int id = action->data().toInt();
+        OnMenuUpdate(id, action);
+    }
+}
+
+void DynamicMenu::ShowMenu()
+{
+    if (m_actions.isEmpty())
+    {
+        CreateMenu();
+    }
+    UpdateAllActions();
+}
+
+void DynamicMenu::TriggerAction(int id)
+{
+    OnMenuChange(id, m_actions.value(id));
+    UpdateAllActions();
+}
+
+#include <QTimer>
+
+/////////////////////////////////////////////////////////////////////////////
+// ActionManager
+/////////////////////////////////////////////////////////////////////////////
+ActionManager::ActionManager(
+    MainWindow* parent, QtViewPaneManager* const qtViewPaneManager, ShortcutDispatcher* shortcutDispatcher)
+    : QObject(parent)
+    , m_mainWindow(parent)
+    , m_qtViewPaneManager(qtViewPaneManager)
+    , m_shortcutDispatcher(shortcutDispatcher)
+{
+    m_actionMapper = new QSignalMapper(this);
+    connect(m_actionMapper, SIGNAL(mapped(int)), this, SLOT(ActionTriggered(int)));
+
+    connect(m_qtViewPaneManager, &QtViewPaneManager::registeredPanesChanged, this, &ActionManager::RebuildRegisteredViewPaneIds);
+
+    // KDAB_TODO: This will be used later, particularly for the toolbars
+    //connect(QCoreApplication::eventDispatcher(), SIGNAL(aboutToBlock()),
+    //    this, SLOT(UpdateActions()));
+    // so long use a simple timer to make it work
+    QTimer* timer = new QTimer(this);
+    timer->setInterval(250);
+    connect(timer, &QTimer::timeout, this, &ActionManager::UpdateActions);
+    timer->start();
+
+    // connect to the Action Request Bus and notify other listeners this has happened
+    AzToolsFramework::EditorActionRequestBus::Handler::BusConnect();
+}
+
+ActionManager::~ActionManager()
+{
+    AzToolsFramework::EditorActionRequestBus::Handler::BusDisconnect();
+}
+
+void ActionManager::AddMenu(QMenu* menu)
+{
+    m_menus.push_back(menu);
+    connect(menu, &QMenu::aboutToShow, this, &ActionManager::UpdateMenu);
+}
+
+ActionManager::MenuWrapper ActionManager::AddMenu(const QString& title, const QString& menuId)
+{
+    const auto menu = new QMenu(title);
+
+    // set a unique identifier for this menu item so it
+    // can be looked up later using FindMenu()
+    if (!menuId.isEmpty())
+    {
+        menu->setProperty(s_menuIdProperty, menuId);
+    }
+
+    AddMenu(menu);
+
+    return MenuWrapper(menu, this);
+}
+
+ActionManager::MenuWrapper ActionManager::FindMenu(const QString& menuId)
+{
+    // attempt to find menu by menuId
+    auto menuIt = AZStd::find_if(m_menus.begin(), m_menus.end(), [&menuId](const QMenu* menu)
+    {
+        if (!menu->property(s_menuIdProperty).isNull())
+        {
+            return menu->property(s_menuIdProperty).toString() == menuId;
+        }
+
+        return false;
+    });
+
+    // return the menu with the matching name, if not found return nullptr
+    QMenu* menu = [this, menuIt, &menuId]() -> QMenu*
+    {
+        if (menuIt != m_menus.end())
+        {
+            return *menuIt;
+        }
+
+        AZ_Warning("ActionManager", false, "Did not find menu with menuId %s", menuId.toUtf8().data());
+        return nullptr;
+    }();
+
+    return MenuWrapper(menu, this);
+}
+
+void ActionManager::AddToolBar(QToolBar* toolBar)
+{
+    m_toolBars.push_back(toolBar);
+}
+
+ActionManager::ToolBarWrapper ActionManager::AddToolBar(int id)
+{
+    AmazonToolbar t = m_mainWindow->GetToolbarManager()->GetToolbar(id);
+    Q_ASSERT(t.IsInstantiated());
+
+    AddToolBar(t.Toolbar());
+    return ToolBarWrapper(t.Toolbar(), this);
+}
+
+bool ActionManager::eventFilter([[maybe_unused]] QObject* watched, QEvent* event)
+{
+    // if events are shortcut events, we don't want to filter out
+    if (event->type() == QEvent::Shortcut)
+    {
+        m_isShortcutEvent = true;
+    }
+
+    return false;
+}
+
+bool ActionManager::InsertActionExecuting(int id)
+{
+    // If the action handler puts up a modal dialog, the event queue will be pumped
+    // and double clicks on menu items will go through, in some cases.
+    // This is to guard against that.
+    if (m_executingIds.find(id) != m_executingIds.end())
+    {
+        return false;
+    }
+
+    m_executingIds.insert(id);
+    return true;
+}
+
+bool ActionManager::RemoveActionExecuting(int id)
+{
+    bool idWasInList = m_executingIds.remove(id);
+    Q_ASSERT(idWasInList);
+    return idWasInList;
+}
+
+
+void ActionManager::AddAction(int id, QAction* action)
+{
+    action->setData(id);
+    AddAction(action);
+}
+
+void ActionManager::AddAction(QAction* action)
+{
+    const int id = action->data().toInt();
+
+    if (m_actions.contains(id))
+    {
+        qWarning() << "ActionManager already contains action with id=" << id;
+        Q_ASSERT(false);
+    }
+
+    m_actions[id] = action;
+    connect(action, SIGNAL(triggered()), m_actionMapper, SLOT(map()));
+    m_actionMapper->setMapping(action, id);
+
+    action->installEventFilter(this);
+
+    // Add the action if the parent is a widget
+    auto widget = qobject_cast<QWidget*>(parent());
+    if (widget)
+    {
+        widget->addAction(action);
+    }
+}
+
+void ActionManager::RemoveAction(QAction* action)
+{
+    auto storedAction = m_actions.find(action->data().toInt());
+    if (storedAction != m_actions.end())
+    {
+        m_actions.remove(action->data().toInt());
+    }
+
+    action->removeEventFilter(this);
+    m_actionMapper->removeMappings(action);
+
+    if (auto widget = qobject_cast<QWidget*>(parent()))
+    {
+        widget->removeAction(action);
+    }
+}
+
+ActionManager::ActionWrapper ActionManager::AddAction(int id, const QString& name)
+{
+    QAction* action = ActionIsWidget(id) ? new WidgetAction(id, m_mainWindow, name, this)
+        : static_cast<QAction*>(new PatchedAction(name, this)); // static cast to base so ternary compiles
+    AddAction(id, action);
+    return ActionWrapper(action, this);
+}
+
+bool ActionManager::HasAction(QAction* action) const
+{
+    return action && HasAction(action->data().toInt());
+}
+
+bool ActionManager::HasAction(int id) const
+{
+    return m_actions.contains(id);
+}
+
+QAction* ActionManager::GetAction(int id) const
+{
+    auto it = m_actions.find(id);
+
+    if (it == m_actions.cend())
+    {
+        qWarning() << Q_FUNC_INFO << "Couldn't get action " << id;
+        Q_ASSERT(false);
+        return nullptr;
+    }
+    else
+    {
+        return *it;
+    }
+}
+
+void ActionManager::ActionTriggered(int id)
+{
+    if (m_mainWindow->menuBar()->isEnabled())
+    {
+        if (m_actionHandlers.contains(id))
+        {
+            ActionManagerExecutionGuard guard(this, id);
+
+            if (guard.CanExecute())
+            {
+                m_actionHandlers[id]();
+            }
+        }
+    }
+}
+
+void ActionManager::RebuildRegisteredViewPaneIds()
+{
+    QtViewPanes views = QtViewPaneManager::instance()->GetRegisteredPanes();
+
+    for (auto& view : views)
+    {
+        m_registeredViewPaneIds.insert(view.m_id);
+    }
+}
+
+// is this action suspended (allowed to respond or not)
+static bool ActionSuspended(const bool defaultActionsSuspended, const QAction* const action)
+{
+    // if default actions are suspended and this is not a reserved action, do not update
+    return defaultActionsSuspended && !action->property(s_reserved).toBool();
+}
+
+// for the menu that is about to be opened, visit each action (menu item) and
+// update callbacks for unsuspended actions.
+// recurse one level deep if the action is itself a menu, if all actions
+// in that menu are suspended, gray out the menu so it cannot be selected.
+static void UpdateMenus(
+    QMenu* menu, const bool defaultActionsSuspended,
+    QHash<int, std::function<void()>>& updateCallbacks,
+    QList<QAction*> topLevelMenuActions, int depth)
+{
+    const auto actions = menu->actions();
+    const int actionCount = actions.size();
+    int suspendedActionCounter =  0;
+
+    for (auto action : actions)
+    {
+        // if an action is itself a menu, we want to check its
+        // own menu actions (children), but only one level down
+        if (action->menu() && depth == 0)
+        {
+            UpdateMenus(
+                action->menu(), defaultActionsSuspended,
+                updateCallbacks, topLevelMenuActions, depth + 1);
+        }
+
+        if (ActionSuspended(defaultActionsSuspended, action))
+        {
+            suspendedActionCounter++;
+            continue;
+        }
+
+        // call all update callbacks for the given menu
+        // only do this at the level of the menu we clicked/hovered
+        const auto id = action->data().toInt();
+        if (updateCallbacks.contains(id) && depth == 0)
+        {
+            updateCallbacks.value(id)();
+        }
+    }
+
+    // check if we are a top level menu action
+    if (AZStd::find(
+        topLevelMenuActions.begin(), topLevelMenuActions.end(),
+        menu->menuAction()) == topLevelMenuActions.end())
+    {
+        // if we're not a top level menu action, we want to disable
+        // the sub menu if none of the child actions are active, otherwise
+        // ensure the menu is returned to an enabled state
+        menu->menuAction()->setEnabled(
+            defaultActionsSuspended
+                ? suspendedActionCounter != actionCount
+                : true);
+    }
+}
+
+void ActionManager::UpdateMenu()
+{
+    auto menu = qobject_cast<QMenu*>(sender());
+    AZ_Assert(menu, "sender() was not convertible to a QMenu*");
+
+    int depth = 0;
+    UpdateMenus(
+        menu, m_defaultActionsSuspended, m_updateCallbacks,
+        m_mainWindow->menuBar()->actions(), depth);
+}
+
+void ActionManager::UpdateActions()
+{
+    for (auto it = m_updateCallbacks.constBegin(); it != m_updateCallbacks.constEnd(); ++it)
+    {
+        if (ActionSuspended(m_defaultActionsSuspended, GetAction(it.key())))
+        {
+            continue;
+        }
+
+        it.value()();
+    }
+}
+
+QList<QAction*> ActionManager::GetActions() const
+{
+    return m_actions.values();
+}
+
+bool ActionManager::ActionIsWidget(int id) const
+{
+    return id >= ID_TOOLBAR_WIDGET_FIRST && id <= ID_TOOLBAR_WIDGET_LAST;
+}
+
+// either enable or disable all registered actions
+void SetDefaultActionsEnabled(
+    const QList<QAction*>& actions, const bool enabled)
+{
+    AZStd::for_each(
+        actions.begin(), actions.end(),
+        [enabled](QAction* action)
+    {
+        if (!action->property(s_reserved).toBool())
+        {
+            action->setEnabled(enabled);
+        }
+    });
+}
+
+void ActionManager::AddActionViaBus(int id, QAction* action)
+{
+    AddAction(id, action);
+}
+
+void ActionManager::RemoveActionViaBus(QAction* action)
+{
+    RemoveAction(action);
+}
+
+void ActionManager::EnableDefaultActions()
+{
+     SetDefaultActionsEnabled(GetActions(), true);
+     m_defaultActionsSuspended = false;
+}
+
+void ActionManager::DisableDefaultActions()
+{
+    SetDefaultActionsEnabled(GetActions(), false);
+    m_defaultActionsSuspended = true;
+}
+
+void ActionManager::AttachOverride(QWidget* object)
+{
+    m_shortcutDispatcher->AttachOverride(object);
+}
+
+void ActionManager::DetachOverride()
+{
+    m_shortcutDispatcher->DetachOverride();
+}
+
+WidgetAction::WidgetAction(int actionId, MainWindow* mainWindow, const QString& name, QObject* parent)
+    : QWidgetAction(parent)
+    , m_actionId(actionId)
+    , m_mainWindow(mainWindow)
+{
+    setText(name);
+}
+
+QWidget* WidgetAction::createWidget(QWidget* parent)
+{
+    QWidget* w = m_mainWindow->CreateToolbarWidget(m_actionId);
+    if (w)
+    {
+        w->setParent(parent);
+    }
+
+    return w;
+}
+
+#include <moc_ActionManager.cpp>
diff --git a/Code/Editor/ActionManager.h b/Code/Editor/ActionManager.h
new file mode 100644
index 0000000000..49f38ec255
--- /dev/null
+++ b/Code/Editor/ActionManager.h
@@ -0,0 +1,432 @@
+/*
+ * 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 ACTIONMANAGER_H
+#define ACTIONMANAGER_H
+
+#if !defined(Q_MOC_RUN)
+#include <QObject>
+
+#include <QPointer>
+#include <QHash>
+#include <QVector>
+#include <QAction>
+#include <QMenu>
+#include <QToolBar>
+#include <QIcon>
+#include <QWidgetAction>
+
+#include <QSet>
+
+#include <functional>
+#include <utility>
+
+#include <AzToolsFramework/Viewport/ActionBus.h>
+#endif
+
+class QSignalMapper;
+class QPixmap;
+class QDockWidget;
+class DynamicMenu;
+class MainWindow;
+class QtViewPaneManager;
+class ShortcutDispatcher;
+
+class PatchedAction
+    : public QAction
+{
+    // PatchedAction is a workaround for the fact that Qt doesn't honour Qt::WindowShortcut context for floating dock widgets.
+
+    Q_OBJECT
+public:
+    explicit PatchedAction(const QString& name, QObject* parent = nullptr);
+    bool event(QEvent*) override;
+};
+
+
+class WidgetAction
+    : public QWidgetAction
+{
+    Q_OBJECT
+public:
+    explicit WidgetAction(int actionId, MainWindow* mainWindow, const QString& name, QObject* parent);
+protected:
+    QWidget* createWidget(QWidget* parent) override;
+private:
+    const int m_actionId;
+    MainWindow* const m_mainWindow;
+};
+
+class ActionManager;
+
+// If the action handler puts up a modal dialog, the event queue will be pumped
+// and double clicks on menu items will go through, in some cases.
+// This class can be used to guard against that.
+class ActionManagerExecutionGuard
+{
+public:
+    ActionManagerExecutionGuard(ActionManager* actionManager, QAction* action);
+    ActionManagerExecutionGuard(ActionManager* actionManager, int actionId);
+    ~ActionManagerExecutionGuard();
+
+    // Only execute the action of this returns true
+    bool CanExecute() const { return m_canExecute; }
+
+private:
+    QPointer<ActionManager> m_actionManager;
+    int m_actionId;
+    bool m_canExecute;
+};
+
+class ActionManager
+    : public QObject
+    , private AzToolsFramework::EditorActionRequestBus::Handler
+{
+    Q_OBJECT
+
+public:
+    class ActionWrapper
+    {
+    public:
+        ActionWrapper& SetText(const QString& text) { m_action->setText(text); return *this; }
+        ActionWrapper& SetIcon(const QIcon& icon) { m_action->setIcon(icon); return *this; }
+        ActionWrapper& SetIcon(const QPixmap& icon) { m_action->setIcon(QIcon(icon)); return *this; }
+        ActionWrapper& SetShortcut(const QString& shortcut) { m_action->setShortcut(shortcut); return *this; }
+        ActionWrapper& SetShortcut(const QKeySequence& shortcut) { m_action->setShortcut(shortcut); return *this; }
+        ActionWrapper& SetToolTip(const QString& toolTip) { m_action->setToolTip(toolTip); return *this; }
+        ActionWrapper& SetStatusTip(const QString& statusTip) { m_action->setStatusTip(statusTip); return *this; }
+        ActionWrapper& SetCheckable(bool value) { m_action->setCheckable(value); return *this; }
+        ActionWrapper& SetReserved(); // if reserved, the action should not be allowed to be disabled or overridden
+
+        //ActionWrapper &SetMenu(QMenu *menu) { m_action->setMenu(menu); return *this; }
+        //ActionWrapper &SetMenu(QMenu *menu) { m_action->setMenu(menu); return *this; }
+        template <typename Func1, typename Func2>
+        ActionWrapper& Connect(Func1 signal, Func2 slot)
+        {
+            // The ActionWrapper class is stack based usually so
+            // the lambda below can't use the this pointer.
+            // As a result, wrap the actionManager and the action in
+            // a QPointer, and capture them in the lambda
+            QPointer<ActionManager> actionManager = m_actionManager;
+            QPointer<QAction> action = m_action;
+
+            QObject::connect(m_action, signal, m_action, [action, actionManager, slot]()
+                {
+                    ActionManagerExecutionGuard guard(actionManager.data(), action.data());
+
+                    if (!GetIEditor()->IsInGameMode() && guard.CanExecute())
+                    {
+                        slot();
+                    }
+                });
+            return *this;
+        }
+
+        template <typename Func1, typename Object, typename Func2>
+        ActionWrapper& Connect(Func1 signal, Object* context, const Func2 slot, Qt::ConnectionType type = Qt::AutoConnection)
+        {
+            // The ActionWrapper class is stack based usually so
+            // the lambda below can't use the this pointer.
+            // As a result, wrap the actionManager and the action in
+            // a QPointer, and capture them in the lambda
+            QPointer<ActionManager> actionManager = m_actionManager;
+            QPointer<QAction> action = m_action;
+
+            QObject::connect(m_action, signal, context, [action, actionManager, context, slot]()
+                {
+                    ActionManagerExecutionGuard guard(actionManager.data(), action.data());
+
+                    if (!GetIEditor()->IsInGameMode() && guard.CanExecute())
+                    {
+                        (context->*slot)();
+                    }
+                }, type);
+
+            return *this;
+        }
+
+        ActionWrapper& SetMenu(DynamicMenu* menu);
+        ActionWrapper& SetApplyHoverEffect();
+
+        operator QAction*() const {
+            return m_action;
+        }
+        QAction* operator->() const { return m_action; }
+
+        template<typename T>
+        ActionWrapper& RegisterUpdateCallback(T* object, void (T::* method)(QAction*))
+        {
+            m_actionManager->RegisterUpdateCallback(m_action->data().toInt(), object, method);
+            return *this;
+        }
+
+        template<typename Fn>
+        ActionWrapper& RegisterUpdateCallback(Fn&& fn)
+        {
+            m_actionManager->RegisterUpdateCallback(m_action->data().toInt(), AZStd::forward<Fn>(fn));
+            return *this;
+        }
+
+    private:
+        friend ActionManager;
+        friend DynamicMenu;
+        ActionWrapper(QAction* action, ActionManager* am)
+            : m_action(action)
+            , m_actionManager(am) { Q_ASSERT(m_action); }
+
+        QAction* m_action;
+        ActionManager* m_actionManager;
+    };
+
+    class MenuWrapper
+    {
+    public:
+        MenuWrapper() = default;
+        MenuWrapper(QMenu* menu, ActionManager* am)
+            : m_menu(menu)
+            , m_actionManager(am) {}
+
+        MenuWrapper& SetTitle(const QString& text) { m_menu->setTitle(text); return *this; }
+        MenuWrapper& SetIcon(const QIcon& icon) { m_menu->setIcon(icon); return *this; }
+
+        QAction* AddAction(int id)
+        {
+            auto action = m_actionManager->GetAction(id);
+            Q_ASSERT(action);
+            m_menu->addAction(action);
+
+            return action;
+        }
+
+        QAction* AddSeparator()
+        {
+            return m_menu->addSeparator();
+        }
+
+        MenuWrapper AddMenu(const QString& name, const QString& menuId = QString())
+        {
+            auto menu = m_actionManager->AddMenu(name, menuId);
+            m_menu->addMenu(menu);
+            return menu;
+        }
+
+        bool isNull() const
+        {
+            return !m_menu;
+        }
+
+        operator QMenu*()
+        {
+            return m_menu;
+        }
+
+        QMenu* operator->()
+        {
+            return m_menu;
+        }
+
+        QMenu* Get()
+        {
+            return m_menu;
+        }
+
+    private:
+        friend ActionManager;
+
+        QPointer<QMenu> m_menu = nullptr;
+        ActionManager* m_actionManager = nullptr;
+    };
+
+    class ToolBarWrapper
+    {
+    public:
+        QAction* AddAction(int id)
+        {
+            auto action = m_actionManager->GetAction(id);
+            Q_ASSERT(action);
+            m_toolBar->addAction(action);
+
+            return action;
+        }
+
+        QAction* AddSeparator()
+        {
+            QAction* action = m_toolBar->addSeparator();
+
+            // For the Dnd to work:
+            action->setData(ID_TOOLBAR_SEPARATOR);
+            QWidget* w = m_toolBar->widgetForAction(action);
+            w->addAction(action);
+
+            return action;
+        }
+
+        void AddWidget(QWidget* widget)
+        {
+            m_toolBar->addWidget(widget);
+        }
+
+        operator QToolBar*() const {
+            return m_toolBar;
+        }
+        QToolBar* operator->() const { return m_toolBar; }
+
+    private:
+        friend ActionManager;
+        ToolBarWrapper(QToolBar* toolBar, ActionManager* am)
+            : m_toolBar(toolBar)
+            , m_actionManager(am) { Q_ASSERT(m_toolBar); }
+
+        QToolBar* m_toolBar;
+        ActionManager* m_actionManager;
+    };
+
+public:
+    explicit ActionManager(
+        MainWindow* parent, QtViewPaneManager* qtViewPaneManager,
+        ShortcutDispatcher* shortcutDispatcher);
+    ~ActionManager();
+    void AddMenu(QMenu* menu);
+    MenuWrapper AddMenu(const QString& title, const QString& menuId);
+    MenuWrapper FindMenu(const QString& menuId);
+    bool ActionIsWidget(int actionId) const;
+
+    void AddToolBar(QToolBar* toolBar);
+    ToolBarWrapper AddToolBar(int id);
+
+    void AddAction(QAction* action);
+    void AddAction(int id, QAction* action);
+    void RemoveAction(QAction* action);
+    ActionWrapper AddAction(int id, const QString& name);
+    bool HasAction(QAction*) const;
+    bool HasAction(int id) const;
+
+    QAction* GetAction(int id) const;
+    QList<QAction*> GetActions() const;
+
+    // AzToolsFramework::EditorActionRequests
+    void AddActionViaBus(int id, QAction* action) override;
+    void RemoveActionViaBus(QAction* action) override;
+    void EnableDefaultActions() override;
+    void DisableDefaultActions() override;
+    void AttachOverride(QWidget* object) override;
+    void DetachOverride() override;
+
+    template<typename T>
+    void RegisterUpdateCallback(int id, T* object, void (T::*method)(QAction*))
+    {
+        Q_ASSERT(m_actions.contains(id));
+        m_updateCallbacks[id] = [action = m_actions.value(id), object, method] { AZStd::invoke(method, object, action); };
+    }
+
+    template<typename Fn>
+    void RegisterUpdateCallback(int id, Fn&& fn)
+    {
+        Q_ASSERT(m_actions.contains(id));
+        m_updateCallbacks[id] = [action = m_actions.value(id), fn] { fn(action); };
+    }
+
+    template<typename T>
+    void RegisterActionHandler(int id, T method)
+    {
+        m_actionHandlers[id] = method;
+    }
+    template<typename T>
+    void RegisterActionHandler(int id, T* object, void (T::* method)())
+    {
+        m_actionHandlers[id] = std::bind(method, object);
+    }
+    template<typename T>
+    void RegisterActionHandler(int id, T* object, void (T::* method)(UINT))
+    {
+        m_actionHandlers[id] = std::bind(method, object, id);
+    }
+
+    bool eventFilter(QObject* watched, QEvent* event);
+
+    // returns false if the action was already inserted, indicating that the action should not be processed again
+    bool InsertActionExecuting(int id);
+
+    // returns true if the action was inserted with InsertActionExecuting previously
+    bool RemoveActionExecuting(int id);
+
+Q_SIGNALS:
+    void SendMetricsSignal(const char* viewPaneName, const char* openLocation);
+
+public slots:
+    void ActionTriggered(int id);
+
+private slots:
+    void UpdateMenu();
+    void UpdateActions();
+
+private:
+    QHash<int, QAction*> m_actions;
+    QVector<QMenu*> m_menus;
+    QVector<QToolBar*> m_toolBars;
+    QSignalMapper* m_actionMapper;
+    QHash<int, std::function<void()> > m_updateCallbacks;
+    QHash<int, std::function<void()> > m_actionHandlers;
+    MainWindow* const m_mainWindow;
+
+    QtViewPaneManager* m_qtViewPaneManager;
+    ShortcutDispatcher* m_shortcutDispatcher = nullptr;
+
+    // for sending shortcut metrics events
+    bool m_isShortcutEvent = false;
+
+    // for sending toolbar metrics events
+    QSet<int> m_editorToolbarIds;
+
+    // for sending main menu metrics events
+    QSet<int> m_registeredViewPaneIds;
+
+    // update the registered view pane Ids when the registered view pane list is modified
+    void RebuildRegisteredViewPaneIds();
+
+    // Guard against recursive actions being triggered by double clicks on menu items
+    // while modal dialogs are in the process of popping up
+    QSet<int> m_executingIds;
+
+    // have all default actions (not including reserved actions) been suspended
+    bool m_defaultActionsSuspended = false;
+};
+
+class DynamicMenu
+    : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit DynamicMenu(QObject* parent = nullptr);
+    void SetAction(QAction* action, ActionManager* am);
+    void SetParentMenu(QMenu* menu, ActionManager* am);
+
+protected:
+    virtual void CreateMenu() = 0;
+    virtual void OnMenuUpdate(int id, QAction* action) = 0;
+    virtual void OnMenuChange(int id, QAction* action) = 0;
+
+    void AddAction(int id, QAction* action);
+    ActionManager::ActionWrapper AddAction(int id, const QString& name);
+    void AddSeparator();
+
+    void UpdateAllActions();
+    ActionManager* m_actionManager;
+
+private slots:
+    void ShowMenu();
+    void TriggerAction(int id);
+
+private:
+    QAction* m_action;
+    QMenu* m_menu;
+    QSignalMapper* m_actionMapper;
+    QHash<int, QAction*> m_actions;
+};
+
+#endif // ACTIONMANAGER_H
diff --git a/Code/Editor/Animation/AnimationBipedBoneNames.cpp b/Code/Editor/Animation/AnimationBipedBoneNames.cpp
new file mode 100644
index 0000000000..14823f6923
--- /dev/null
+++ b/Code/Editor/Animation/AnimationBipedBoneNames.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 "EditorDefs.h"
+
+#include "AnimationBipedBoneNames.h"
+
+namespace EditorAnimationBones
+{
+    namespace Biped
+    {
+        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* 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* RightHeel = "Bip01 R Heel";
+        const char* RightToe[2] = { "Bip01 R Toe0", "Bip01 R Toe1" };
+    }
+}
diff --git a/Code/Editor/Animation/AnimationBipedBoneNames.h b/Code/Editor/Animation/AnimationBipedBoneNames.h
new file mode 100644
index 0000000000..fd5918c936
--- /dev/null
+++ b/Code/Editor/Animation/AnimationBipedBoneNames.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#ifndef CRYINCLUDE_EDITOR_ANIMATION_ANIMATIONBIPEDBONENAMES_H
+#define CRYINCLUDE_EDITOR_ANIMATION_ANIMATIONBIPEDBONENAMES_H
+#pragma once
+
+namespace EditorAnimationBones
+{
+    namespace Biped
+    {
+        extern const char* Pelvis;
+        extern const char* Head;
+        extern const char* Weapon;
+
+        extern const char* Spine[5];
+        extern const char* Neck[2];
+
+        extern const char* LeftEye;
+        extern const char* RightEye;
+
+        extern const char* LeftHeel;
+        extern const char* RightHeel;
+        extern const char* LeftToe[2];
+        extern const char* RightToe[2];
+    }
+}
+
+
+#endif // CRYINCLUDE_EDITOR_ANIMATION_ANIMATIONBIPEDBONENAMES_H
diff --git a/Code/Editor/Animation/SkeletonHierarchy.cpp b/Code/Editor/Animation/SkeletonHierarchy.cpp
new file mode 100644
index 0000000000..b0bb9fc05b
--- /dev/null
+++ b/Code/Editor/Animation/SkeletonHierarchy.cpp
@@ -0,0 +1,148 @@
+/*
+ * 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 "SkeletonHierarchy.h"
+
+using namespace Skeleton;
+
+/*
+
+  CHierarchy
+
+*/
+
+CHierarchy::CHierarchy()
+{
+}
+
+CHierarchy::~CHierarchy()
+{
+}
+
+//
+
+uint32 CHierarchy::AddNode(const char* name, const QuatT& pose, int32 parent)
+{
+    int32 index = FindNodeIndexByName(name);
+
+    if (index < 0)
+    {
+        m_nodes.push_back(SNode());
+        index = int32(m_nodes.size() - 1);
+    }
+
+    m_nodes[index].name = name;
+    m_nodes[index].pose = pose;
+    m_nodes[index].parent = parent;
+    return uint32(index);
+}
+
+int32 CHierarchy::FindNodeIndexByName(const char* name) const
+{
+    uint32 count = uint32(m_nodes.size());
+    for (uint32 i = 0; i < count; ++i)
+    {
+        if (::_stricmp(m_nodes[i].name, name))
+        {
+            continue;
+        }
+
+        return i;
+    }
+
+    return -1;
+}
+
+const CHierarchy::SNode* CHierarchy::FindNode(const char* name) const
+{
+    int32 index = FindNodeIndexByName(name);
+    return index < 0 ? NULL : &m_nodes[index];
+}
+
+void CHierarchy::CreateFrom(IDefaultSkeleton* pIDefaultSkeleton)
+{
+    const uint32 jointCount = pIDefaultSkeleton->GetJointCount();
+
+    m_nodes.clear();
+    m_nodes.reserve(jointCount);
+    for (uint32 i = 0; i < jointCount; ++i)
+    {
+        m_nodes.push_back(SNode());
+
+        m_nodes.back().name = pIDefaultSkeleton->GetJointNameByID(int32(i));
+        m_nodes.back().pose = pIDefaultSkeleton->GetDefaultAbsJointByID(int32(i));
+
+        m_nodes.back().parent = pIDefaultSkeleton->GetJointParentIDByID(int32(i));
+    }
+
+    ValidateReferences();
+}
+
+void CHierarchy::ValidateReferences()
+{
+    uint32 nodeCount = m_nodes.size();
+    if (!nodeCount)
+    {
+        return;
+    }
+
+    for (uint32 i = 0; i < nodeCount; ++i)
+    {
+        if (m_nodes[i].parent < nodeCount)
+        {
+            continue;
+        }
+
+        m_nodes[i].parent = -1;
+    }
+}
+
+void CHierarchy::AbsoluteToRelative(const QuatT* pSource, QuatT* pDestination)
+{
+    uint32 count = uint32(m_nodes.size());
+    std::vector<QuatT> absolutes(count);
+    for (uint32 i = 0; i < count; ++i)
+    {
+        absolutes[i] = pSource[i];
+    }
+
+    for (uint32 i = 0; i < count; ++i)
+    {
+        int32 parent = m_nodes[i].parent;
+        if (parent < 0)
+        {
+            pDestination[i] = absolutes[i];
+            continue;
+        }
+
+        pDestination[i].t = (absolutes[i].t - absolutes[parent].t) * absolutes[parent].q;
+        pDestination[i].q = absolutes[parent].q.GetInverted() * absolutes[i].q;
+    }
+}
+
+bool CHierarchy::SerializeTo(XmlNodeRef& node)
+{
+    XmlNodeRef hierarchy = node->newChild("Hierarchy");
+
+    uint32 nodeCount = uint32(m_nodes.size());
+    std::vector<IXmlNode*> nodes(nodeCount);
+    for (uint32 i = 0; i < nodeCount; ++i)
+    {
+        XmlNodeRef parent = hierarchy;
+        if (m_nodes[i].parent > -1)
+        {
+            parent = nodes[m_nodes[i].parent];
+        }
+
+        nodes[i] = parent->newChild("Node");
+        nodes[i]->setAttr("name", m_nodes[i].name);
+    }
+
+    return true;
+}
diff --git a/Code/Editor/Animation/SkeletonHierarchy.h b/Code/Editor/Animation/SkeletonHierarchy.h
new file mode 100644
index 0000000000..bd2978b972
--- /dev/null
+++ b/Code/Editor/Animation/SkeletonHierarchy.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
+#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
+#pragma once
+
+namespace Skeleton {
+    class CHierarchy
+        : public _reference_target_t
+    {
+    public:
+        struct SNode
+        {
+            string name;
+            QuatT pose;
+
+            int32 parent;
+
+            /* TODO: Implement
+                    uint32 childrenIndex;
+                    uint32 childrenCount;
+            */
+        };
+
+    public:
+        CHierarchy();
+        ~CHierarchy();
+
+    public:
+        uint32 AddNode(const char* name, const QuatT& pose, int32 parent = -1);
+        uint32 GetNodeCount() const { return uint32(m_nodes.size()); }
+        SNode* GetNode(uint32 index) { return &m_nodes[index]; }
+        const SNode* GetNode(uint32 index) const { return &m_nodes[index]; }
+        int32 FindNodeIndexByName(const char* name) const;
+        const SNode* FindNode(const char* name) const;
+        void ClearNodes() { m_nodes.clear(); }
+
+        void CreateFrom(IDefaultSkeleton* rIDefaultSkeleton);
+        void ValidateReferences();
+
+        void AbsoluteToRelative(const QuatT* pSource, QuatT* pDestination);
+
+        bool SerializeTo(XmlNodeRef& node);
+
+    private:
+        std::vector<SNode> m_nodes;
+    };
+} // namespace Skeleton
+
+#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
diff --git a/Code/Editor/Animation/SkeletonMapper.cpp b/Code/Editor/Animation/SkeletonMapper.cpp
new file mode 100644
index 0000000000..63206cb56f
--- /dev/null
+++ b/Code/Editor/Animation/SkeletonMapper.cpp
@@ -0,0 +1,367 @@
+/*
+ * 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 "SkeletonMapper.h"
+
+using namespace Skeleton;
+
+/*
+
+  CMapper
+
+*/
+
+CMapper::CMapper()
+{
+}
+
+CMapper::~CMapper()
+{
+}
+
+//
+
+void CMapper::CreateFromHierarchy()
+{
+    m_nodes.clear();
+
+    uint32 nodeCount = m_hierarchy.GetNodeCount();
+    m_nodes.resize(nodeCount);
+}
+
+//
+
+uint32 CMapper::CreateLocation(const char* name)
+{
+    int32 index = FindLocation(name);
+    if (index < 1)
+    {
+        CMapperLocation* pLocation = new CMapperLocation();
+        pLocation->SetName(name);
+        m_locations.push_back(pLocation);
+    }
+    return uint32(m_locations.size() - 1);
+}
+
+void CMapper::ClearLocations()
+{
+    uint32 count = uint32(m_nodes.size());
+    for (uint32 i = 0; i < count; ++i)
+    {
+        m_nodes[i].position = NULL;
+        m_nodes[i].orientation = NULL;
+    }
+
+    m_locations.clear();
+}
+
+int32 CMapper::FindLocation(const char* name) const
+{
+    uint32 count = uint32(m_locations.size());
+    for (uint32 i = 0; i < count; ++i)
+    {
+        if (::_stricmp(m_locations[i]->GetName(), name))
+        {
+            continue;
+        }
+
+        return int32(i);
+    }
+
+    return -1;
+}
+
+void CMapper::SetLocation(CMapperLocation& location)
+{
+    int32 index = FindLocation(location.GetName());
+    if (index < 0)
+    {
+        m_locations.push_back(&location);
+        return;
+    }
+
+    m_locations[index] = &location;
+}
+
+//
+
+bool CMapper::CreateLocationsHierarchy(uint32 index, CHierarchy& hierarchy, int32 hierarchyParent)
+{
+    if (NodeHasLocation(index))
+    {
+        const CHierarchy::SNode* pNode = m_hierarchy.GetNode(index);
+        uint32 nodeIndex = hierarchy.AddNode(pNode->name, pNode->pose, hierarchyParent);
+        hierarchyParent = uint32(nodeIndex);
+    }
+
+    std::vector<uint32> children;
+    GetChildrenIndices(index, children);
+    uint32 childCount = uint32(children.size());
+    for (uint32 i = 0; i < childCount; ++i)
+    {
+        CreateLocationsHierarchy(children[i], hierarchy, hierarchyParent);
+    }
+
+    return hierarchy.GetNodeCount() != 0;
+}
+
+bool CMapper::CreateLocationsHierarchy(CHierarchy& hierarchy)
+{
+    hierarchy.ClearNodes();
+    if (!CreateLocationsHierarchy(0, hierarchy, -1))
+    {
+        return false;
+    }
+
+    hierarchy.ValidateReferences();
+    return true;
+}
+
+void CMapper::Map(QuatT* pResult)
+{
+    uint32 outputCount = m_hierarchy.GetNodeCount();
+    std::vector<Quat> absolutes(outputCount);
+    for (uint32 i = 0; i < outputCount; ++i)
+    {
+        pResult[i].SetIdentity();
+        absolutes[i].SetIdentity();
+
+        CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
+        if (!pNode)
+        {
+            continue;
+        }
+
+        CHierarchy::SNode* pParent = pNode->parent < 0 ?
+            NULL : m_hierarchy.GetNode(pNode->parent);
+        if (pParent)
+        {
+            pResult[i].t =
+                (pNode->pose.t - pParent->pose.t) * pParent->pose.q;
+        }
+
+        if (m_nodes[i].position)
+        {
+            pResult[i].t = m_nodes[i].position->Compute().t;
+        }
+
+        if (m_nodes[i].orientation)
+        {
+            absolutes[i] = m_nodes[i].orientation->Compute().q;
+        }
+        else if (pParent)
+        {
+            Quat relative = pParent->pose.q.GetInverted() * pNode->pose.q;
+            absolutes[i] = absolutes[pNode->parent] * relative;
+        }
+    }
+
+    for (uint32 i = 0; i < outputCount; ++i)
+    {
+        CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
+        if (!pNode)
+        {
+            continue;
+        }
+
+        CHierarchy::SNode* pParent = pNode->parent < 0 ?
+            NULL : m_hierarchy.GetNode(pNode->parent);
+        if (!pParent)
+        {
+            pResult[i].q = absolutes[i];
+            continue;
+        }
+
+        pResult[i].q = absolutes[i];
+        if (!m_nodes[i].position)
+        {
+            pResult[i].t = pResult[pNode->parent].t +
+                pResult[i].t * absolutes[pNode->parent].GetInverted();
+        }
+    }
+}
+
+//
+
+bool CMapper::NodeHasLocation(uint32 index)
+{
+    if (CMapperOperator* pOperator = m_nodes[index].position)
+    {
+        if (pOperator->IsOfClass("Location"))
+        {
+            return true;
+        }
+        if (pOperator->HasLinksOfClass("Location"))
+        {
+            return true;
+        }
+    }
+
+    if (CMapperOperator* pOperator = m_nodes[index].orientation)
+    {
+        if (pOperator->IsOfClass("Location"))
+        {
+            return true;
+        }
+        if (pOperator->HasLinksOfClass("Location"))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void CMapper::GetChildrenIndices(uint32 parent, std::vector<uint32>& children)
+{
+    uint32 nodeCount = m_hierarchy.GetNodeCount();
+    for (uint32 i = 0; i < nodeCount; ++i)
+    {
+        if (m_hierarchy.GetNode(i)->parent != parent)
+        {
+            continue;
+        }
+
+        children.push_back(i);
+    }
+}
+
+bool CMapper::ChildrenHaveLocation(uint32 index)
+{
+    std::vector<uint32> children;
+    GetChildrenIndices(index, children);
+
+    uint32 childrenCount = uint32(children.size());
+    for (uint32 i = 0; i < childrenCount; ++i)
+    {
+        if (ChildrenHaveLocation(children[i]))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool CMapper::NodeOrChildrenHaveLocation(uint32 index)
+{
+    if (NodeHasLocation(index))
+    {
+        return true;
+    }
+
+    std::vector<uint32> children;
+    GetChildrenIndices(index, children);
+
+    uint32 childrenCount = uint32(children.size());
+    for (uint32 i = 0; i < childrenCount; ++i)
+    {
+        if (NodeOrChildrenHaveLocation(children[i]))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool CMapper::SerializeTo(XmlNodeRef& node)
+{
+    XmlNodeRef hierarchy = node->newChild("Hierarchy");
+
+    uint32 nodeCount = GetNodeCount();
+    std::vector<IXmlNode*> nodes(nodeCount);
+    for (uint32 i = 0; i < nodeCount; ++i)
+    {
+        if (!NodeOrChildrenHaveLocation(i))
+        {
+            continue;
+        }
+
+        CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
+        if (!pNode)
+        {
+            return false;
+        }
+
+        XmlNodeRef xmlParent = hierarchy;
+        int32 parent = pNode->parent;
+        if (parent > -1)
+        {
+            xmlParent = nodes[parent];
+        }
+
+        nodes[i] = xmlParent->newChild("Node");
+        nodes[i]->setAttr("name", pNode->name);
+
+        if (CMapperOperator* pOperator = m_nodes[i].position)
+        {
+            XmlNodeRef position = nodes[i]->newChild("Position");
+            XmlNodeRef child = position->newChild("Operator");
+            if (!pOperator->SerializeWithLinksTo(child))
+            {
+                return false;
+            }
+        }
+
+        if (CMapperOperator* pOperator = m_nodes[i].orientation)
+        {
+            XmlNodeRef orientation = nodes[i]->newChild("Orientation");
+            XmlNodeRef child = orientation->newChild("Operator");
+            if (!pOperator->SerializeWithLinksTo(child))
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+bool CMapper::SerializeFrom(XmlNodeRef& node, int32 parent)
+{
+    int childCount = uint32(node->getChildCount());
+    for (int i = 0; i < childCount; ++i)
+    {
+        XmlNodeRef child = node->getChild(i);
+        if (::_stricmp(child->getTag(), "Node"))
+        {
+            continue;
+        }
+
+        uint32 index = m_hierarchy.AddNode(child->getAttr("name"), QuatT(IDENTITY), parent);
+        if (!SerializeFrom(child, int32(index)))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool CMapper::SerializeFrom(XmlNodeRef& node)
+{
+    XmlNodeRef hierarchy = node->findChild("Hierarchy");
+    if (!hierarchy)
+    {
+        return false;
+    }
+
+    m_hierarchy.ClearNodes();
+
+    if (!SerializeFrom(hierarchy, -1))
+    {
+        return false;
+    }
+
+    m_nodes.resize(m_hierarchy.GetNodeCount());
+
+    return true;
+}
diff --git a/Code/Editor/Animation/SkeletonMapper.h b/Code/Editor/Animation/SkeletonMapper.h
new file mode 100644
index 0000000000..8c990b9d73
--- /dev/null
+++ b/Code/Editor/Animation/SkeletonMapper.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
+#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
+#pragma once
+
+
+#include "SkeletonHierarchy.h"
+#include "SkeletonMapperOperator.h"
+
+namespace Skeleton {
+    class CMapper
+    {
+    public:
+        struct SNode
+        {
+            _smart_ptr<CMapperOperator> position;
+            _smart_ptr<CMapperOperator> orientation;
+        };
+
+    public:
+        CMapper();
+        ~CMapper();
+
+    public:
+        CHierarchy& GetHierarchy() { return m_hierarchy; }
+        void CreateFromHierarchy();
+
+        uint32 GetNodeCount() const { return uint32(m_nodes.size()); }
+        SNode* GetNode(uint32 index) { return &m_nodes[index]; }
+        const SNode* GetNode(uint32 index) const { return &m_nodes[index]; }
+
+        uint32 CreateLocation(const char* name);
+        void ClearLocations();
+        int32 FindLocation(const char* name) const;
+
+        uint32 GetLocationCount() const { return uint32(m_locations.size()); }
+        void SetLocation(CMapperLocation& location);
+        CMapperLocation* GetLocation(uint32 index) { return m_locations[index]; }
+        const CMapperLocation* GetLocation(uint32 index)  const { return m_locations[index]; }
+
+        bool CreateLocationsHierarchy(CHierarchy& hierarchy);
+
+        void Map(QuatT* pResult);
+
+        bool SerializeTo(XmlNodeRef& node);
+        bool SerializeFrom(XmlNodeRef& node);
+
+    private:
+        bool NodeHasLocation(uint32 index);
+        bool ChildrenHaveLocation(uint32 index);
+        bool NodeOrChildrenHaveLocation(uint32 index);
+
+        bool SerializeFrom(XmlNodeRef& node, int32 parent);
+
+        bool CreateLocationsHierarchy(uint32 index, CHierarchy& hierarchy, int32 hierarchyParent = -1);
+
+        // TEMP
+        void GetChildrenIndices(uint32 parent, std::vector<uint32>& children);
+
+    private:
+        CHierarchy m_hierarchy;
+        std::vector<_smart_ptr<CMapperLocation> > m_locations;
+
+        std::vector<SNode> m_nodes;
+    };
+} // namespace Skeleton
+
+#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
diff --git a/Code/Editor/Animation/SkeletonMapperOperator.cpp b/Code/Editor/Animation/SkeletonMapperOperator.cpp
new file mode 100644
index 0000000000..6245f0e3b6
--- /dev/null
+++ b/Code/Editor/Animation/SkeletonMapperOperator.cpp
@@ -0,0 +1,283 @@
+/*
+ * 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 "SkeletonMapperOperator.h"
+
+using namespace Skeleton;
+
+/*
+
+  CMapperOperatorDesc
+
+*/
+
+std::vector<CMapperOperatorDesc*> CMapperOperatorDesc::s_descs;
+
+//
+
+CMapperOperatorDesc::CMapperOperatorDesc(const char* name)
+{
+    s_descs.push_back(this);
+}
+
+/*
+
+  CMapperOperator
+
+*/
+
+CMapperOperator::CMapperOperator(const char* className, uint32 positionCount, uint32 orientationCount)
+{
+    m_className = className;
+    m_position.resize(positionCount, NULL);
+    m_orientation.resize(orientationCount, NULL);
+}
+
+CMapperOperator::~CMapperOperator()
+{
+}
+
+//
+
+bool CMapperOperator::IsOfClass(const char* className)
+{
+    if (::_stricmp(m_className, className))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+uint32 CMapperOperator::HasLinksOfClass(const char* className)
+{
+    uint32 count = 0;
+
+    uint32 positionCount = m_position.size();
+    for (uint32 i = 0; i < positionCount; ++i)
+    {
+        CMapperOperator* pOperator = m_position[i];
+        if (!pOperator)
+        {
+            continue;
+        }
+
+        if (pOperator->IsOfClass(className))
+        {
+            ++count;
+        }
+    }
+
+    uint32 orientationCount = m_orientation.size();
+    for (uint32 i = 0; i < orientationCount; ++i)
+    {
+        CMapperOperator* pOperator = m_orientation[i];
+        if (!pOperator)
+        {
+            continue;
+        }
+
+        if (pOperator->IsOfClass(className))
+        {
+            ++count;
+        }
+    }
+
+    return count;
+}
+
+//
+
+bool CMapperOperator::SerializeTo(XmlNodeRef& node)
+{
+    node->setAttr("class", m_className);
+
+    uint32 parameterCount = uint32(m_parameters.size());
+    for (uint32 i = 0; i < parameterCount; ++i)
+    {
+        m_parameters[i]->Serialize(node, false);
+    }
+
+    return true;
+}
+
+bool CMapperOperator::SerializeFrom(XmlNodeRef& node)
+{
+    uint32 parameterCount = uint32(m_parameters.size());
+    for (uint32 i = 0; i < parameterCount; ++i)
+    {
+        m_parameters[i]->Serialize(node, true);
+    }
+
+    return true;
+}
+
+bool CMapperOperator::SerializeWithLinksTo(XmlNodeRef& node)
+{
+    if (!SerializeTo(node))
+    {
+        return false;
+    }
+
+    uint32 positionCount = uint32(m_position.size());
+    for (uint32 i = 0; i < positionCount; ++i)
+    {
+        CMapperOperator* pOperator = m_position[i];
+        if (!pOperator)
+        {
+            continue;
+        }
+
+        XmlNodeRef position = node->newChild("Position");
+        position->setAttr("index", i);
+
+        XmlNodeRef child = position->newChild("Operator");
+        if (!pOperator->SerializeWithLinksTo(child))
+        {
+            return false;
+        }
+    }
+
+    uint32 orientationCount = uint32(m_orientation.size());
+    for (uint32 i = 0; i < orientationCount; ++i)
+    {
+        CMapperOperator* pOperator = m_orientation[i];
+        if (!pOperator)
+        {
+            continue;
+        }
+
+        XmlNodeRef orientation = node->newChild("Orientation");
+        orientation->setAttr("index", i);
+
+        XmlNodeRef child = orientation->newChild("Operator");
+        if (!pOperator->SerializeWithLinksTo(child))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool CMapperOperator::SerializeWithLinksFrom(XmlNodeRef& node)
+{
+    if (!SerializeFrom(node))
+    {
+        return false;
+    }
+
+    return true;
+}
+/*
+
+  CMapperOperator_Transform
+
+*/
+
+class CMapperOperator_Transform
+    : public CMapperOperator
+{
+public:
+    CMapperOperator_Transform()
+        : CMapperOperator("Transform", 1, 1)
+    {
+        m_pAngles = new CVariable<Vec3>();
+        m_pAngles->SetName("rotation");
+        m_pAngles->Set(Vec3(0.0f, 0.0f, 0.0f));
+        m_pAngles->SetLimits(-180.0f, 180.0f);
+        AddParameter(*m_pAngles);
+
+        m_pVector = new CVariable<Vec3>();
+        m_pVector->SetName("vector");
+        m_pVector->Set(Vec3(0.0f, 0.0f, 0.0f));
+        AddParameter(*m_pVector);
+
+        m_pScale = new CVariable<Vec3>();
+        m_pScale->SetName("scale");
+        m_pScale->Set(Vec3(1.0f, 1.0f, 1.0f));
+        AddParameter(*m_pScale);
+    }
+
+    // CMapperOperator
+public:
+    virtual QuatT CMapperOperator_Transform::Compute()
+    {
+        QuatT result(IDENTITY);
+        m_pVector->Get(result.t);
+
+        Vec3 scale;
+        m_pScale->Get(scale);
+
+        Vec3 angles;
+        m_pAngles->Get(angles);
+
+        result.q = Quat::CreateRotationXYZ(
+                Ang3(DEG2RAD(angles.x), DEG2RAD(angles.y), DEG2RAD(angles.z)));
+
+        if (CMapperOperator* pOperator = GetPosition(0))
+        {
+            result.t = pOperator->Compute().t.CompMul(scale) + result.t;
+        }
+        if (CMapperOperator* pOperator = GetOrientation(0))
+        {
+            result.q = pOperator->Compute().q * result.q;
+        }
+        return result;
+    }
+
+private:
+    CVariable<Vec3>* m_pVector;
+    CVariable<Vec3>* m_pAngles;
+    CVariable<Vec3>* m_pScale;
+};
+
+SkeletonMapperOperatorRegister(Transform, CMapperOperator_Transform)
+
+class CMapperOperator_PositionsToOrientation
+    : public CMapperOperator
+{
+public:
+    CMapperOperator_PositionsToOrientation()
+        : CMapperOperator("PositionsToOrientation", 3, 0)
+    {
+    }
+
+    // CMapperOperator
+public:
+    virtual QuatT Compute()
+    {
+        CMapperOperator* pOperator0 = GetPosition(0);
+        CMapperOperator* pOperator1 = GetPosition(1);
+        CMapperOperator* pOperator2 = GetPosition(2);
+        if (!pOperator0 || !pOperator1 || !pOperator2)
+        {
+            return QuatT(IDENTITY);
+        }
+
+        Vec3 p0 = pOperator0->Compute().t;
+        Vec3 p1 = pOperator1->Compute().t;
+        Vec3 p2 = pOperator2->Compute().t;
+
+        Vec3 m = (p1 + p2) * 0.5f;
+        Vec3 y = (m - p0).GetNormalized();
+        Vec3 z = (p1 - p2).GetNormalized();
+        Vec3 x = y % z;
+        z = x % y;
+
+        Matrix33 m33;
+        m33.SetFromVectors(x, y, z);
+        QuatT result(IDENTITY);
+        result.q = Quat(m33);
+        return result;
+    }
+};
+
+SkeletonMapperOperatorRegister(PositionsToOrientation, CMapperOperator_PositionsToOrientation)
diff --git a/Code/Editor/Animation/SkeletonMapperOperator.h b/Code/Editor/Animation/SkeletonMapperOperator.h
new file mode 100644
index 0000000000..4435c2b291
--- /dev/null
+++ b/Code/Editor/Animation/SkeletonMapperOperator.h
@@ -0,0 +1,163 @@
+/*
+ * 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_ANIMATION_SKELETONMAPPEROPERATOR_H
+#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPEROPERATOR_H
+#pragma once
+
+
+#include "../Util/Variable.h"
+
+#undef GetClassName
+
+#define SkeletonMapperOperatorRegister(name, className)               \
+    class CMapperOperatorDesc_##name                                  \
+        : public CMapperOperatorDesc                                  \
+    {                                                                 \
+    public:                                                           \
+        CMapperOperatorDesc_##name()                                  \
+            : CMapperOperatorDesc(#name) { }                          \
+    protected:                                                        \
+        virtual const char* GetName() { return #name; }               \
+        virtual CMapperOperator* Create() { return new className(); } \
+    } mapperOperatorDesc__##name;
+
+namespace Skeleton {
+    class CMapperOperator;
+
+    class CMapperOperatorDesc
+    {
+    public:
+        static uint32 GetCount() { return uint32(s_descs.size()); }
+        static const char* GetName(uint32 index) { return s_descs[index]->GetName(); }
+        static CMapperOperator* Create(uint32 index) { return s_descs[index]->Create(); }
+
+    private:
+        static std::vector<CMapperOperatorDesc*> s_descs;
+
+    public:
+        CMapperOperatorDesc(const char* name);
+
+    protected:
+        virtual const char* GetName() = 0;
+        virtual CMapperOperator* Create() = 0;
+    };
+
+    class CMapperOperator
+        : public _reference_target_t
+    {
+    protected:
+        CMapperOperator(const char* className, uint32 positionCount, uint32 orientationCount);
+        ~CMapperOperator();
+
+    public:
+        const char* GetClassName() { return m_className; }
+
+        uint32 GetPositionCount() const { return uint32(m_position.size()); }
+        void SetPosition(uint32 index, CMapperOperator* pOperator) { m_position[index] = pOperator; }
+        CMapperOperator* GetPosition(uint32 index) { return m_position[index]; }
+
+        uint32 GetOrientationCount() const { return uint32(m_orientation.size()); }
+        void SetOrientation(uint32 index, CMapperOperator* pOperator) { m_orientation[index] = pOperator; }
+        CMapperOperator* GetOrientation(uint32 index) { return m_orientation[index]; }
+
+        uint32 GetParameterCount() { return uint32(m_parameters.size()); }
+        IVariable* GetParameter(uint32 index) { return m_parameters[index]; }
+
+        bool IsOfClass(const char* className);
+        uint32 HasLinksOfClass(const char* className);
+
+        bool SerializeTo(XmlNodeRef& node);
+        bool SerializeFrom(XmlNodeRef& node);
+
+        bool SerializeWithLinksTo(XmlNodeRef& node);
+        bool SerializeWithLinksFrom(XmlNodeRef& node);
+
+    protected:
+        void AddParameter(IVariable& variable) { m_parameters.push_back(&variable); }
+
+    public:
+        virtual QuatT Compute() = 0;
+
+    private:
+        const char* m_className;
+        std::vector<_smart_ptr<CMapperOperator> > m_position;
+        std::vector<_smart_ptr<CMapperOperator> > m_orientation;
+
+        std::vector<IVariablePtr> m_parameters;
+    };
+
+    class CMapperLocation
+        : public CMapperOperator
+    {
+    public:
+        CMapperLocation()
+            : CMapperOperator("Location", 0, 0)
+        {
+            m_pName = new CVariable<CString>();
+            m_pName->SetName("name");
+            m_pName->SetFlags(m_pName->GetFlags() | IVariable::UI_INVISIBLE);
+            AddParameter(*m_pName);
+
+            m_pAxis = new CVariable<Vec3>();
+            m_pAxis->SetName("axis");
+            m_pAxis->SetLimits(-3.0f, +3.0f);
+            m_pAxis->Set(Vec3(1.0f, 2.0f, 3.0f));
+            AddParameter(*m_pAxis);
+
+            m_location = QuatT(IDENTITY);
+        }
+
+    public:
+        void SetName(const char* name) { m_pName->Set(name); }
+        CString GetName() const { CString s; m_pName->Get(s); return s; }
+
+        void SetLocation(const QuatT& location) { m_location = location; }
+        const QuatT& GetLocation() const { return m_location; }
+
+        // CMapperOperator
+    public:
+        virtual QuatT Compute()
+        {
+            Vec3 axis;
+            m_pAxis->Get(axis);
+
+            uint32 x = fabs_tpl(axis.x);
+            uint32 y = fabs_tpl(axis.y);
+            uint32 z = fabs_tpl(axis.z);
+            if (x < 1 || y < 1 || z < 1 ||
+                x > 3 || y > 3 || y > 3 ||
+                x == y || x == z || y == z)
+            {
+                return QuatT(IDENTITY);
+            }
+
+            Matrix33 matrix;
+            matrix.SetFromVectors(
+                m_location.q.GetColumn(x - 1) * f32(::sgn(axis.x)),
+                m_location.q.GetColumn(y - 1) * f32(::sgn(axis.y)),
+                m_location.q.GetColumn(z - 1) * f32(::sgn(axis.z)));
+            if (!matrix.IsOrthonormalRH(0.01f))
+            {
+                return QuatT(IDENTITY);
+            }
+
+            QuatT result = m_location;
+            result.q = Quat(matrix);
+            return result;
+        }
+
+    private:
+        CVariable<CString>* m_pName;
+        CVariable<Vec3>* m_pAxis;
+
+        QuatT m_location;
+    };
+} // namespace Skeleton
+
+#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPEROPERATOR_H
diff --git a/Code/Editor/AnimationContext.cpp b/Code/Editor/AnimationContext.cpp
new file mode 100644
index 0000000000..f7d3e4191c
--- /dev/null
+++ b/Code/Editor/AnimationContext.cpp
@@ -0,0 +1,816 @@
+/*
+ * 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 "AnimationContext.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Bus/EditorSequenceBus.h>
+
+// Editor
+#include "TrackView/TrackViewDialog.h"
+#include "RenderViewport.h"
+#include "ViewManager.h"
+#include "Objects/SelectionGroup.h"
+#include "Include/IObjectManager.h"
+#include "Objects/EntityObject.h"
+
+//////////////////////////////////////////////////////////////////////////
+// Movie Callback.
+//////////////////////////////////////////////////////////////////////////
+class CMovieCallback
+    : public IMovieCallback
+{
+protected:
+    virtual void OnMovieCallback(ECallbackReason reason, [[maybe_unused]] IAnimNode* pNode)
+    {
+        switch (reason)
+        {
+        case CBR_CHANGENODE:
+            // Invalidate nodes
+            break;
+        case CBR_CHANGETRACK:
+        {
+            // Invalidate tracks
+            CTrackViewDialog* pTrackViewDialog = CTrackViewDialog::GetCurrentInstance();
+            if (pTrackViewDialog)
+            {
+                pTrackViewDialog->InvalidateDopeSheet();
+            }
+        }
+        break;
+        }
+    }
+
+    void OnSetCamera(const SCameraParams& Params)
+    {
+        // Only switch camera when in Play mode.
+        GUID camObjId = GUID_NULL;
+        if (Params.cameraEntityId.IsValid())
+        {
+            // Find owner editor entity.
+            CEntityObject* pEditorEntity = CEntityObject::FindFromEntityId(Params.cameraEntityId);
+            if (pEditorEntity)
+            {
+                camObjId = pEditorEntity->GetId();
+            }
+
+            CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
+            if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(pViewport))
+            {
+                if (!rvp->IsSequenceCamera())
+                {
+                    return;
+                }
+            }
+        }
+
+        // Switch camera in active rendering view.
+        if (GetIEditor()->GetViewManager())
+        {
+            GetIEditor()->GetViewManager()->SetCameraObjectId(camObjId);
+        }
+    };
+
+    bool IsSequenceCamUsed() const
+    {
+        if (gEnv->IsEditorGameMode() == true)
+        {
+            return true;
+        }
+
+        if (GetIEditor()->GetViewManager() == NULL)
+        {
+            return false;
+        }
+
+        CViewport* pRendView = GetIEditor()->GetViewManager()->GetViewport(ET_ViewportCamera);
+        if (pRendView)
+        {
+            return pRendView->IsSequenceCamera();
+        }
+
+        return false;
+    }
+};
+
+static CMovieCallback s_movieCallback;
+
+//////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//!
+class CAnimationContextPostRender
+    : public IPostRenderer
+{
+public:
+    CAnimationContextPostRender(CAnimationContext* pAC)
+        : m_pAC(pAC){}
+
+    void OnPostRender() const { assert(m_pAC); m_pAC->OnPostRender(); }
+
+protected:
+    CAnimationContext* m_pAC;
+};
+
+//////////////////////////////////////////////////////////////////////////
+CAnimationContext::CAnimationContext()
+{
+    m_paused = 0;
+    m_playing = false;
+    m_recording = false;
+    m_bSavedRecordingState = false;
+    m_timeRange.Set(0, 0);
+    m_timeMarker.Set(0, 0);
+    m_currTime = 0.0f;
+    m_lastTimeChangedNotificationTime = .0f;
+    m_bForceUpdateInNextFrame = false;
+    m_fTimeScale = 1.0f;
+    m_pSequence = nullptr;
+    m_mostRecentSequenceId.SetInvalid();
+    m_mostRecentSequenceTime = 0.0f;
+    m_bLooping = false;
+    m_bAutoRecording = false;
+    m_fRecordingTimeStep = 0;
+    m_bSingleFrame = false;
+    m_bPostRenderRegistered = false;
+    m_bForcingAnimation = false;
+    GetIEditor()->GetUndoManager()->AddListener(this);
+    GetIEditor()->GetSequenceManager()->AddListener(this);
+    GetIEditor()->RegisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CAnimationContext::~CAnimationContext()
+{
+    GetIEditor()->GetSequenceManager()->RemoveListener(this);
+    GetIEditor()->GetUndoManager()->RemoveListener(this);
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::Init()
+{
+    gEnv->pMovieSystem->SetCallback(&s_movieCallback);
+
+    REGISTER_COMMAND("mov_goToFrameEditor", (ConsoleCommandFunc)GoToFrameCmd, 0, "Make a specified sequence go to a given frame time in the editor.");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::AddListener(IAnimationContextListener* pListener)
+{
+    stl::push_back_unique(m_contextListeners, pListener);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::RemoveListener(IAnimationContextListener* pListener)
+{
+    stl::find_and_erase(m_contextListeners, pListener);
+}
+
+void CAnimationContext::NotifyTimeChangedListenersUsingCurrTime() const
+{
+    for (size_t i = 0; i < m_contextListeners.size(); ++i)
+    {
+        m_contextListeners[i]->OnTimeChanged(m_currTime);
+    }
+    m_lastTimeChangedNotificationTime = m_currTime;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::SetSequence(CTrackViewSequence* sequence, bool force, bool noNotify, bool user)
+{
+    float newSeqStartTime = .0f;
+    CTrackViewSequence* pCurrentSequence = m_pSequence;
+
+    if (!force && sequence == pCurrentSequence)
+    {
+        return;
+    }
+
+    // Prevent keys being created from time change
+    const bool bRecording = m_recording;
+    m_recording = false;
+    SetRecordingInternal(false);
+
+    if (sequence)
+    {
+        newSeqStartTime = sequence->GetTimeRange().start;
+    }
+
+    m_currTime = newSeqStartTime;
+    m_fRecordingCurrTime = newSeqStartTime;
+
+    if (!m_bPostRenderRegistered)
+    {
+        if (GetIEditor() && GetIEditor()->GetViewManager())
+        {
+            CViewport* pViewport = GetIEditor()->GetViewManager()->GetViewport(ET_ViewportCamera);
+            if (pViewport)
+            {
+                pViewport->AddPostRenderer(new CAnimationContextPostRender(this));
+                m_bPostRenderRegistered = true;
+            }
+        }
+    }
+
+    if (m_pSequence)
+    {
+        m_pSequence->Deactivate();
+        if (m_playing)
+        {
+            m_pSequence->EndCutScene();
+        }
+
+        m_pSequence->UnBindFromEditorObjects();
+    }
+    m_pSequence = sequence;
+    
+    // Notify a new sequence was just selected.
+    Maestro::EditorSequenceNotificationBus::Broadcast(&Maestro::EditorSequenceNotificationBus::Events::OnSequenceSelected, m_pSequence ? m_pSequence->GetSequenceComponentEntityId() : AZ::EntityId());
+
+    if (m_pSequence)
+    {
+        // Set the last valid sequence that was selected.
+        m_mostRecentSequenceId = m_pSequence->GetSequenceComponentEntityId();
+
+        if (m_playing)
+        {
+            m_pSequence->BeginCutScene(true);
+        }
+
+        m_timeRange = m_pSequence->GetTimeRange();
+        m_timeMarker = m_timeRange;
+
+        m_pSequence->Activate();
+        m_pSequence->PrecacheData(newSeqStartTime);
+
+        m_pSequence->BindToEditorObjects();
+    }
+    else if (user)
+    {
+        // If this was a sequence that was selected by the user in Track View
+        // and it was "No Sequence" clear the m_mostRecentSequenceId so the sequence
+        // will not be reselected at unwanted events like a slice reload or an undo operation.
+        m_mostRecentSequenceId.SetInvalid();
+    }
+
+    ForceAnimation();
+
+    if (!noNotify)
+    {
+        NotifyTimeChangedListenersUsingCurrTime();
+        for (size_t i = 0; i < m_contextListeners.size(); ++i)
+        {
+            m_contextListeners[i]->OnSequenceChanged(m_pSequence);
+        }
+    }
+
+    TimeChanged(newSeqStartTime);
+
+    m_recording = bRecording;
+    SetRecordingInternal(bRecording);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::UpdateTimeRange()
+{
+    if (m_pSequence)
+    {
+        m_timeRange = m_pSequence->GetTimeRange();
+
+        // reset the current time to make sure it is clamped
+        // to the new range.
+        SetTime(m_currTime);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::SetTime(float t)
+{
+    if (t < m_timeRange.start)
+    {
+        t = m_timeRange.start;
+    }
+
+    if (t > m_timeRange.end)
+    {
+        t = m_timeRange.end;
+    }
+
+    if (fabs(m_currTime - t) < 0.001f)
+    {
+        return;
+    }
+
+    m_currTime = t;
+    m_fRecordingCurrTime = t;
+    ForceAnimation();
+    UpdateAnimatedLights();
+
+    NotifyTimeChangedListenersUsingCurrTime();
+}
+
+void CAnimationContext::TimeChanged(float newTime)
+{
+    if (m_pSequence)
+    {
+        m_mostRecentSequenceTime = newTime;
+        m_pSequence->TimeChanged(newTime);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::OnSequenceActivated(AZ::EntityId entityId)
+{
+    // If nothing is selected and there is a valid most recent selected
+    // try to find that sequence by id and select it. This is useful
+    // for restoring the selected sequence during undo and redo.
+    if (m_pSequence == nullptr && m_mostRecentSequenceId.IsValid())
+    {
+        if (entityId == m_mostRecentSequenceId)
+        {
+            auto editor = GetIEditor();
+            if (editor != nullptr)
+            {
+                auto manager = editor->GetSequenceManager();
+                if (manager != nullptr)
+                {
+                    auto sequence = manager->GetSequenceByEntityId(m_mostRecentSequenceId);
+                    if (sequence != nullptr)
+                    {
+                        // Hang onto this because SetSequence() will reset it.
+                        float lastTime = m_mostRecentSequenceTime;
+                        
+                        SetSequence(sequence, false, false);
+
+                        // Restore the current time.
+                        SetTime(lastTime);
+
+                        // Notify time may have changed, use m_currTime incase it was clamped by SetTime()
+                        TimeChanged(m_currTime);
+                    }
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::Pause()
+{
+    assert(m_paused >= 0);
+    m_paused++;
+
+    if (m_recording)
+    {
+        SetRecordingInternal(false);
+    }
+
+    GetIEditor()->GetMovieSystem()->Pause();
+    if (m_pSequence)
+    {
+        m_pSequence->Pause();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::Resume()
+{
+    assert(m_paused > 0);
+    m_paused--;
+    if (m_recording && m_paused == 0)
+    {
+        SetRecordingInternal(true);
+    }
+    GetIEditor()->GetMovieSystem()->Resume();
+
+    if (m_pSequence)
+    {
+        m_pSequence->Resume();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::SetRecording(bool recording)
+{
+    if (recording == m_recording)
+    {
+        return;
+    }
+    m_paused = 0;
+    m_recording = recording;
+    m_playing = false;
+
+    if (!recording && m_fRecordingTimeStep != 0)
+    {
+        SetAutoRecording(false, 0);
+    }
+
+    // If started recording, assume we have modified the document.
+    GetIEditor()->SetModifiedFlag();
+
+    SetRecordingInternal(recording);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::SetPlaying(bool playing)
+{
+    if (playing == m_playing)
+    {
+        return;
+    }
+
+    m_paused = 0;
+    m_playing = playing;
+    m_recording = false;
+    SetRecordingInternal(false);
+
+    if (playing)
+    {
+        IMovieSystem* pMovieSystem = GetIEditor()->GetMovieSystem();
+
+        pMovieSystem->Resume();
+        if (m_pSequence)
+        {
+            m_pSequence->Resume();
+
+            IMovieUser* pMovieUser = pMovieSystem->GetUser();
+
+            if (pMovieUser)
+            {
+                m_pSequence->BeginCutScene(true);
+            }
+        }
+        pMovieSystem->ResumeCutScenes();
+    }
+    else
+    {
+        IMovieSystem* pMovieSystem = GetIEditor()->GetMovieSystem();
+
+        pMovieSystem->Pause();
+
+        if (m_pSequence)
+        {
+            m_pSequence->Pause();
+        }
+
+        pMovieSystem->PauseCutScenes();
+        if (m_pSequence)
+        {
+            IMovieUser* pMovieUser = pMovieSystem->GetUser();
+
+            if (pMovieUser)
+            {
+                m_pSequence->EndCutScene();
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::Update()
+{
+    if (m_bForceUpdateInNextFrame)
+    {
+        ForceAnimation();
+        m_bForceUpdateInNextFrame = false;
+    }
+
+    // If looking through camera object and recording animation, do not allow camera shake
+    if ((GetIEditor()->GetViewManager()->GetCameraObjectId() != GUID_NULL) && GetIEditor()->GetAnimation()->IsRecording())
+    {
+        GetIEditor()->GetMovieSystem()->EnableCameraShake(false);
+    }
+    else
+    {
+        GetIEditor()->GetMovieSystem()->EnableCameraShake(true);
+    }
+
+    if (m_paused > 0 || !(m_playing || m_bAutoRecording))
+    {
+        if (m_pSequence)
+        {
+            m_pSequence->StillUpdate();
+        }
+
+        if (!m_recording)
+        {
+            GetIEditor()->GetMovieSystem()->StillUpdate();
+        }
+
+        return;
+    }
+
+    ITimer* pTimer = GetIEditor()->GetSystem()->GetITimer();
+
+    if (!m_bAutoRecording)
+    {
+        AnimateActiveSequence();
+
+        float dt = pTimer->GetFrameTime();
+        m_currTime += dt * m_fTimeScale;
+
+        if (!m_recording)
+        {
+            GetIEditor()->GetMovieSystem()->PreUpdate(dt);
+            GetIEditor()->GetMovieSystem()->PostUpdate(dt);
+        }
+    }
+    else
+    {
+        float dt = pTimer->GetFrameTime();
+        m_fRecordingCurrTime += dt * m_fTimeScale;
+        if (fabs(m_fRecordingCurrTime - m_currTime) > m_fRecordingTimeStep)
+        {
+            m_currTime += m_fRecordingTimeStep;
+        }
+    }
+
+    if (m_currTime > m_timeMarker.end)
+    {
+        if (m_bAutoRecording)
+        {
+            SetAutoRecording(false, 0);
+        }
+        else
+        {
+            if (m_bLooping)
+            {
+                m_currTime = m_timeMarker.start;
+                if (m_pSequence)
+                {
+                    m_pSequence->OnLoop();
+                }
+            }
+            else
+            {
+                SetPlaying(false);
+                m_currTime = m_timeMarker.end;
+            }
+        }
+    }
+
+    if (m_bAutoRecording)
+    {
+        // This is auto recording mode.
+        // Send sync with physics event to all selected entities.
+        GetIEditor()->GetSelection()->SendEvent(EVENT_PHYSICS_GETSTATE);
+    }
+
+    if (fabs(m_lastTimeChangedNotificationTime - m_currTime) > 0.001f)
+    {
+        NotifyTimeChangedListenersUsingCurrTime();
+    }
+
+    UpdateAnimatedLights();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::ForceAnimation()
+{
+    if (m_bForcingAnimation)
+    {
+        // reentrant calls are possible when using subsequences
+        return;
+    }
+
+    m_bForcingAnimation = true;
+
+    // Before animating node, pause recording.
+    if (m_bAutoRecording)
+    {
+        Pause();
+    }
+
+    AnimateActiveSequence();
+    // Animate a second time to properly update camera DoF
+    AnimateActiveSequence();
+
+    if (m_bAutoRecording)
+    {
+        Resume();
+    }
+
+    m_bForcingAnimation = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::SetAutoRecording(bool bEnable, float fTimeStep)
+{
+    if (bEnable)
+    {
+        m_bAutoRecording = true;
+        m_fRecordingTimeStep = fTimeStep;
+        SetRecording(bEnable);
+    }
+    else
+    {
+        m_bAutoRecording = false;
+        m_fRecordingTimeStep = 0;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::GoToFrameCmd(IConsoleCmdArgs* pArgs)
+{
+    if (pArgs->GetArgCount() < 2)
+    {
+        gEnv->pLog->LogError("GoToFrame: You must provide a 'frame time' to go to");
+        return;
+    }
+
+    assert(GetIEditor()->GetAnimation());
+    CTrackViewSequence* pSeq = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSeq)
+    {
+        gEnv->pLog->LogError("GoToFrame: No active animation sequence");
+        return;
+    }
+
+    float targetFrame = (float)atof(pArgs->GetArg(1));
+    if (pSeq->GetTimeRange().start > targetFrame || targetFrame > pSeq->GetTimeRange().end)
+    {
+        gEnv->pLog->LogError("GoToFrame: requested time %f is outside the range of sequence %s (%f, %f)", targetFrame, pSeq->GetName(), pSeq->GetTimeRange().start, pSeq->GetTimeRange().end);
+        return;
+    }
+    GetIEditor()->GetAnimation()->m_currTime = targetFrame;
+    GetIEditor()->GetAnimation()->m_bSingleFrame = true;
+
+    GetIEditor()->GetAnimation()->ForceAnimation();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::OnPostRender()
+{
+    if (m_pSequence)
+    {
+        SAnimContext ac;
+        ac.dt = 0;
+        ac.fps = GetIEditor()->GetSystem()->GetITimer()->GetFrameRate();
+        ac.time = m_currTime;
+        ac.singleFrame = true;
+        ac.forcePlay = true;
+        m_pSequence->Render(ac);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::UpdateAnimatedLights()
+{
+    bool bLightAnimationSetActive = m_pSequence && (m_pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet);
+    if (bLightAnimationSetActive == false)
+    {
+        return;
+    }
+
+    std::vector<CBaseObject*> entityObjects;
+    GetIEditor()->GetObjectManager()->FindObjectsOfType(&CEntityObject::staticMetaObject, entityObjects);
+    std::for_each(std::begin(entityObjects), std::end(entityObjects),
+        [this](CBaseObject* pBaseObject)
+        {
+            CEntityObject* pEntityObject = static_cast<CEntityObject*>(pBaseObject);
+            bool bLight = pEntityObject && pEntityObject->GetEntityClass().compare("Light") == 0;
+            if (bLight)
+            {
+                bool bTimeScrubbing = pEntityObject->GetEntityPropertyBool("bTimeScrubbingInTrackView");
+                if (bTimeScrubbing)
+                {
+                    pEntityObject->SetEntityPropertyFloat("_fTimeScrubbed", m_currTime);
+                }
+            }
+        });
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::BeginUndoTransaction()
+{
+    m_bSavedRecordingState = m_recording;
+    SetRecordingInternal(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::EndUndoTransaction()
+{
+    if (m_pSequence)
+    {
+        m_pSequence->BindToEditorObjects();
+    }
+
+    SetRecordingInternal(m_bSavedRecordingState);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::TogglePlay()
+{
+    if (!IsPlaying())
+    {
+        SetPlaying(true);
+    }
+    else
+    {
+        SetPlaying(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::OnSequenceRemoved(CTrackViewSequence* pSequence)
+{
+    if (m_pSequence == pSequence)
+    {
+        SetSequence(nullptr, true, false);
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+void CAnimationContext::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnBeginGameMode:
+        if (m_pSequence)
+        {
+            m_pSequence->Resume();
+        }
+    case eNotify_OnBeginSceneSave:
+    case eNotify_OnBeginLayerExport:
+        if (m_pSequence)
+        {
+            m_sequenceToRestore = m_pSequence->GetSequenceComponentEntityId();
+        }
+        else
+        {
+            m_sequenceToRestore.SetInvalid();
+        }
+
+        m_sequenceRestoreTime = GetTime();
+
+        m_bSavedRecordingState = m_recording;
+        SetRecordingInternal(false);
+        SetSequence(nullptr, true, true);
+        break;
+
+    case eNotify_OnEndGameMode:
+    case eNotify_OnEndSceneSave:
+    case eNotify_OnEndLayerExport:
+        m_currTime = m_sequenceRestoreTime;
+        SetSequence(GetIEditor()->GetSequenceManager()->GetSequenceByEntityId(m_sequenceToRestore), true, true);
+        SetTime(m_sequenceRestoreTime);
+
+        SetRecordingInternal(m_bSavedRecordingState);
+        break;
+
+    case eNotify_OnQuit:
+    case eNotify_OnCloseScene:
+        SetSequence(nullptr, true, false);
+        break;
+
+    case eNotify_OnBeginNewScene:
+        SetSequence(nullptr, false, false);
+        break;
+
+    case eNotify_OnBeginLoad:
+        m_mostRecentSequenceId.SetInvalid();
+        m_mostRecentSequenceTime = 0.0f;
+        m_bSavedRecordingState = m_recording;
+        SetRecordingInternal(false);
+        GetIEditor()->GetAnimation()->SetSequence(nullptr, false, false);
+        break;
+
+    case eNotify_OnEndLoad:
+        SetRecordingInternal(m_bSavedRecordingState);
+        break;
+    }
+}
+
+void CAnimationContext::SetRecordingInternal(bool enableRecording)
+{
+    GetIEditor()->GetMovieSystem()->SetRecording(enableRecording);
+    if (m_pSequence)
+    {
+        m_pSequence->SetRecording(enableRecording);
+    }
+}
+
+void CAnimationContext::AnimateActiveSequence()
+{
+    if (!m_pSequence)
+    {
+        return;
+    }
+
+    SAnimContext ac;
+    ac.dt = 0;
+    ac.fps = GetIEditor()->GetSystem()->GetITimer()->GetFrameRate();
+    ac.time = m_currTime;
+    ac.singleFrame = true;
+    ac.forcePlay = true;
+
+    m_pSequence->Animate(ac);
+    m_pSequence->SyncToConsole(ac);
+}
diff --git a/Code/Sandbox/Editor/AnimationContext.cpp.rej b/Code/Editor/AnimationContext.cpp.rej
similarity index 100%
rename from Code/Sandbox/Editor/AnimationContext.cpp.rej
rename to Code/Editor/AnimationContext.cpp.rej
diff --git a/Code/Editor/AnimationContext.h b/Code/Editor/AnimationContext.h
new file mode 100644
index 0000000000..411f7ed479
--- /dev/null
+++ b/Code/Editor/AnimationContext.h
@@ -0,0 +1,269 @@
+/*
+ * 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_ANIMATIONCONTEXT_H
+#define CRYINCLUDE_EDITOR_ANIMATIONCONTEXT_H
+
+#pragma once
+
+#include "Undo/Undo.h"
+#include "TrackView/TrackViewSequenceManager.h"
+#include <Range.h>
+#include <IMovieSystem.h>
+
+class CTrackViewSequence;
+
+/** CAnimationContext listener interface
+*/
+struct IAnimationContextListener
+{
+    virtual void OnSequenceChanged([[maybe_unused]] CTrackViewSequence* pNewSequence) {}
+    virtual void OnTimeChanged([[maybe_unused]] float newTime) {}
+};
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+/** CAnimationContext stores information about current editable animation sequence.
+        Stores information about whenever animation is being recorded know,
+        current sequence, current time in sequence etc.
+*/
+class SANDBOX_API CAnimationContext
+    : public IEditorNotifyListener
+    , public IUndoManagerListener
+    , public ITrackViewSequenceManagerListener
+{
+    AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    //////////////////////////////////////////////////////////////////////////
+    // Constructors.
+    //////////////////////////////////////////////////////////////////////////
+    /** Constructor.
+    */
+    CAnimationContext();
+    ~CAnimationContext();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Accessors
+    //////////////////////////////////////////////////////////////////////////
+
+    void Init();
+
+    // Listeners
+    void AddListener(IAnimationContextListener* pListener);
+    void RemoveListener(IAnimationContextListener* pListener);
+
+    /** Return current animation time in active sequence.
+        @return Current time.
+    */
+    float GetTime() const { return m_currTime; };
+
+    float GetTimeScale() const { return m_fTimeScale; }
+    void SetTimeScale(float fScale) { m_fTimeScale = fScale; }
+
+    /** Set active editing sequence.
+        @param sequence New active sequence.
+        @param force Set to true to always run all of the new active sequence code including listeners even if the sequences is already selected.
+        @param noNotify Set to true to skip over notifying listeners when a new sequences is selected.
+        @param user Set to true if the new sequence is being selected by the user, false if set by internal system code.
+        */
+    void SetSequence(CTrackViewSequence* sequence, bool force, bool noNotify, bool user = false);
+
+    /** Get currently edited sequence.
+    */
+    CTrackViewSequence* GetSequence() const { return m_pSequence; };
+
+    /** Set time markers to play within.
+    */
+    void SetMarkers(Range Marker) { m_timeMarker = Marker; }
+
+    /** Get time markers to play within.
+    */
+    Range GetMarkers() { return m_timeMarker; }
+
+    /** Get time range of active animation sequence.
+    */
+    Range GetTimeRange() const { return m_timeRange; }
+
+    /** Returns true if editor is recording animations now.
+    */
+    bool IsRecording() const { return m_recording && m_paused == 0; };
+
+    /** Returns true if editor is playing animation now.
+    */
+    bool IsPlaying() const { return m_playing && m_paused == 0; };
+
+    /** Returns true if currently playing or recording is paused.
+    */
+    bool IsPaused() const { return m_paused > 0; }
+
+    /** Return if animation context is now in playing mode.
+            In difference from IsPlaying function this function not affected by pause state.
+    */
+    bool IsPlayMode() const { return m_playing; };
+
+    /** Return if animation context is now in recording mode.
+            In difference from IsRecording function this function not affected by pause state.
+    */
+    bool IsRecordMode() const { return m_recording; };
+
+    /** Returns true if currently looping as activated.
+    */
+    bool IsLoopMode() const { return m_bLooping; }
+
+    /** Enable/Disable looping.
+    */
+    void SetLoopMode(bool bLooping) { m_bLooping = bLooping; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Operators
+    //////////////////////////////////////////////////////////////////////////
+
+    /** Set current animation time in active sequence.
+        @param seq New active time.
+    */
+    void SetTime(float t);
+
+    /** Set time in active sequence for reset animation.
+        @param seq New active time.
+    */
+    void SetResetTime(float t) {m_resetTime = t; };
+
+    /** Start animation recorduing.
+        Automatically stop playing.
+        @param recording True to start recording, false to stop.
+    */
+    void SetRecording(bool playing);
+
+    /** Enables/Disables automatic recording, sets the time step for each recorded frame.
+    */
+    void SetAutoRecording(bool bEnable, float fTimeStep);
+
+    //! Check if auto recording enabled.
+    bool IsAutoRecording() const { return m_bAutoRecording; };
+
+    /** Start/Stop animation playing.
+        Automatically stop recording.
+        @param playing True to start playing, false to stop.
+    */
+    void SetPlaying(bool playing);
+
+    /** Pause animation playing/recording.
+    */
+    void Pause();
+
+    /** Toggle playback
+    */
+    void TogglePlay();
+
+    /** Resume animation playing/recording.
+    */
+    void Resume();
+
+    /** Called every frame to update all animations if animation should be playing.
+    */
+    void Update();
+
+    /** Force animation for current sequence.
+    */
+    void ForceAnimation();
+
+    void OnPostRender();
+    void UpdateTimeRange();
+
+    /** Notify after a time change is complete and time control is released to 'playback' controls, for example after
+     *  a timeline drag
+    */
+    void TimeChanged(float newTime);
+
+    /** Notify after a sequence has been activated, useful for Undo/Redo
+    */
+    void OnSequenceActivated(AZ::EntityId entityId);
+
+private:
+    static void GoToFrameCmd(IConsoleCmdArgs* pArgs);
+
+    // Updates the animation time of lights animated by the light animation set.
+    void UpdateAnimatedLights();
+
+    void NotifyTimeChangedListenersUsingCurrTime() const;
+
+    virtual void BeginUndoTransaction() override;
+    virtual void EndUndoTransaction() override;
+
+    virtual void OnSequenceRemoved(CTrackViewSequence* pSequence) override;
+
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
+
+    void AnimateActiveSequence();
+
+    void SetRecordingInternal(bool enableRecording);
+
+    //! Current time within active animation sequence.
+    float m_currTime;
+
+    //! Used to stash the time we send out OnTimeChanged notifications
+    mutable float m_lastTimeChangedNotificationTime;
+
+    //! Force update in next frame
+    bool m_bForceUpdateInNextFrame;
+
+    //! Time within active animation sequence while reset animation.
+    float m_resetTime;
+
+    float m_fTimeScale;
+
+    // Recording time step.
+    float m_fRecordingTimeStep;
+    float m_fRecordingCurrTime;
+
+    bool m_bAutoRecording;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //! Time range of active animation sequence.
+    Range m_timeRange;
+
+    Range m_timeMarker;
+
+    //! Currently active animation sequence.
+    CTrackViewSequence* m_pSequence;
+
+    //! Id of latest valid sequence that was selected. Useful for restoring the selected
+    //! sequence after undo has destroyed and recreated it.
+    AZ::EntityId m_mostRecentSequenceId;
+
+    //! The current time of the most recent selected sequence. It's very useful to restore this after an undo.
+    float m_mostRecentSequenceTime;
+
+    //! Id of active sequence to restore (for switching back from game mode and saving)
+    AZ::EntityId m_sequenceToRestore;
+
+    //! Time of active sequence (for switching back from game mode and saving)
+    float m_sequenceRestoreTime;
+
+    bool m_bLooping;
+
+    //! True if editor is recording animations now.
+    bool m_recording;
+    bool m_bSavedRecordingState;
+
+    //! True if editor is playing animation now.
+    bool m_playing;
+
+    //! Stores how many times animation have been paused prior to calling resume.
+    int m_paused;
+
+    bool m_bSingleFrame;
+
+    bool m_bPostRenderRegistered;
+    bool m_bForcingAnimation;
+
+    //! Listeners
+    std::vector<IAnimationContextListener*> m_contextListeners;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif // CRYINCLUDE_EDITOR_ANIMATIONCONTEXT_H
diff --git a/Code/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp b/Code/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp
new file mode 100644
index 0000000000..21ef4bb999
--- /dev/null
+++ b/Code/Editor/AssetDatabase/AssetDatabaseLocationListener.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 "EditorDefs.h"
+
+#include "AssetDatabaseLocationListener.h"
+
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
+#include <AzToolsFramework/API/AssetDatabaseBus.h>
+
+namespace AssetDatabase
+{
+    AssetDatabaseLocationListener::AssetDatabaseLocationListener()
+    {
+        BusConnect();
+
+        m_assetDatabaseConnection = new AzToolsFramework::AssetDatabase::AssetDatabaseConnection();
+        m_assetDatabaseConnection->OpenDatabase();
+
+        AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotificationBus::Broadcast(&AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotifications::OnDatabaseInitialized);
+    }
+
+    AssetDatabaseLocationListener::~AssetDatabaseLocationListener()
+    {
+        BusDisconnect();
+
+        delete m_assetDatabaseConnection;
+        m_assetDatabaseConnection = nullptr;
+    }
+
+    AzToolsFramework::AssetDatabase::AssetDatabaseConnection* AssetDatabaseLocationListener::GetAssetDatabaseConnection() const
+    {
+        return m_assetDatabaseConnection;
+    }
+
+    bool AssetDatabaseLocationListener::GetAssetDatabaseLocation(AZStd::string& result)
+    {
+        if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr)
+        {
+            AZ::SettingsRegistryInterface::FixedValueString projectCacheRootValue;
+            if (registry->Get(projectCacheRootValue, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheProjectRootFolder);
+                !projectCacheRootValue.empty())
+            {
+                result = projectCacheRootValue;
+                result += "/assetdb.sqlite";
+                return true;
+            }
+        }
+
+        return false;
+    }
+}//namespace AssetDatabase
diff --git a/Code/Editor/AssetDatabase/AssetDatabaseLocationListener.h b/Code/Editor/AssetDatabase/AssetDatabaseLocationListener.h
new file mode 100644
index 0000000000..07385ad4b3
--- /dev/null
+++ b/Code/Editor/AssetDatabase/AssetDatabaseLocationListener.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/std/string/string.h>
+#include <AzToolsFramework/API/AssetDatabaseBus.h>
+#include <AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h>
+
+namespace AssetDatabase
+{
+    class AssetDatabaseLocationListener
+        : protected AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler
+    {
+    public:
+        AssetDatabaseLocationListener();
+        ~AssetDatabaseLocationListener();
+
+        AzToolsFramework::AssetDatabase::AssetDatabaseConnection* GetAssetDatabaseConnection() const;
+
+    protected:
+        //////////////////////////////////////////////////////////////////////////
+        //AzToolsFramework::AssetDatabase::AssetDatabaseRequests::Bus::Listener
+        bool GetAssetDatabaseLocation(AZStd::string& result) override;
+
+        //////////////////////////////////////////////////////////////////////////
+
+    private:
+
+        AzToolsFramework::AssetDatabase::AssetDatabaseConnection* m_assetDatabaseConnection = nullptr;
+    };
+}//namespace AssetDatabase
diff --git a/Code/Editor/AssetEditor/AssetEditorRequestsHandler.cpp b/Code/Editor/AssetEditor/AssetEditorRequestsHandler.cpp
new file mode 100644
index 0000000000..9f663dbcb3
--- /dev/null
+++ b/Code/Editor/AssetEditor/AssetEditorRequestsHandler.cpp
@@ -0,0 +1,68 @@
+/*
+ * 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 "AssetEditorRequestsHandler.h"
+
+// AzCore
+#include <AzCore/Asset/AssetManager.h>
+
+// Editor
+#include "AssetEditorWindow.h"
+#include "QtViewPaneManager.h"
+
+AssetEditorRequestsHandler::AssetEditorRequestsHandler()
+{
+    AzToolsFramework::AssetEditor::AssetEditorRequestsBus::Handler::BusConnect();
+    AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
+}
+
+AssetEditorRequestsHandler::~AssetEditorRequestsHandler()
+{
+    AzToolsFramework::AssetEditor::AssetEditorRequestsBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
+}
+
+void AssetEditorRequestsHandler::NotifyRegisterViews()
+{
+    using namespace AzToolsFramework::AssetEditor;
+    if (auto assetsWindowsToRestore = AZ::UserSettings::CreateFind<AssetEditorWindowSettings>(AZ::Crc32(AssetEditorWindowSettings::s_name), AZ::UserSettings::CT_GLOBAL))
+    {
+        //copy the current list and clear it since they will be re-added as we request to open them
+        auto windowsToOpen = assetsWindowsToRestore->m_openAssets;
+        assetsWindowsToRestore->m_openAssets.clear();
+        for (auto&& assetRef : windowsToOpen)
+        {
+            AssetEditorWindow::RegisterViewClass(assetRef);
+        }
+    }
+}
+
+void AssetEditorRequestsHandler::CreateNewAsset(const AZ::Data::AssetType& assetType)
+{
+    using namespace AzToolsFramework::AssetEditor;
+    AzToolsFramework::OpenViewPane(LyViewPane::AssetEditor);
+
+    AssetEditorWidgetRequestsBus::Broadcast(&AssetEditorWidgetRequests::CreateAsset, assetType);
+}
+
+void AssetEditorRequestsHandler::OpenAssetEditor(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
+{
+    using namespace AzToolsFramework::AssetEditor;
+
+    // Open the AssetEditor if it isn't open already.
+    QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetEditor, QtViewPane::OpenMode::RestoreLayout);
+
+    AssetEditorWidgetRequestsBus::Broadcast(&AssetEditorWidgetRequests::OpenAsset, asset);
+}
+
+void AssetEditorRequestsHandler::OpenAssetEditorById(const AZ::Data::AssetId assetId)
+{
+    AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::AssetManager::Instance().GetAsset<AZ::Data::AssetData>(assetId, AZ::Data::AssetLoadBehavior::NoLoad);
+    OpenAssetEditor(asset);
+}
diff --git a/Code/Editor/AssetEditor/AssetEditorRequestsHandler.h b/Code/Editor/AssetEditor/AssetEditorRequestsHandler.h
new file mode 100644
index 0000000000..0f5c61f687
--- /dev/null
+++ b/Code/Editor/AssetEditor/AssetEditorRequestsHandler.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzToolsFramework/AssetEditor/AssetEditorBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+class AssetEditorRequestsHandler 
+    : public AzToolsFramework::AssetEditor::AssetEditorRequestsBus::Handler
+    , public AzToolsFramework::EditorEvents::Bus::Handler
+{
+public:
+    AZ_CLASS_ALLOCATOR(AssetEditorRequestsHandler, AZ::SystemAllocator, 0);
+
+    AssetEditorRequestsHandler();
+    ~AssetEditorRequestsHandler() override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // AssetEditorRequests
+    //////////////////////////////////////////////////////////////////////////
+    void CreateNewAsset(const AZ::Data::AssetType& assetType) override;
+    void OpenAssetEditor(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
+    void OpenAssetEditorById(const AZ::Data::AssetId assetId) override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorEvents::Bus::Handler
+    //////////////////////////////////////////////////////////////////////////
+    void NotifyRegisterViews() override;
+};
diff --git a/Code/Editor/AssetEditor/AssetEditorWindow.cpp b/Code/Editor/AssetEditor/AssetEditorWindow.cpp
new file mode 100644
index 0000000000..5af816d28f
--- /dev/null
+++ b/Code/Editor/AssetEditor/AssetEditorWindow.cpp
@@ -0,0 +1,163 @@
+/*
+ * 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 "AssetEditorWindow.h"
+
+// Qt
+#include <QMessageBox>
+
+// AzCore
+#include <AzCore/Asset/AssetManager.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+#include <AzCore/Utils/Utils.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/ViewPaneOptions.h>
+
+// Editor
+#include "LyViewPaneNames.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <AssetEditor/ui_AssetEditorWindow.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+namespace AssetEditorUtils
+{
+    AssetEditorWindow* CreateAssetEditorWithAsset(const AZ::Data::Asset<AZ::Data::AssetData> assetRef)
+    {
+        AssetEditorWindow* assetEditorWindow = new AssetEditorWindow();
+        if (auto assetsWindowsToRestore = AZ::UserSettings::CreateFind<AzToolsFramework::AssetEditor::AssetEditorWindowSettings>(AZ::Crc32(AzToolsFramework::AssetEditor::AssetEditorWindowSettings::s_name), AZ::UserSettings::CT_GLOBAL))
+        {
+            assetsWindowsToRestore->m_openAssets.emplace(assetRef);
+        }
+
+        AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequestBus::Events::Save);
+
+        auto&& loadedAsset = AZ::Data::AssetManager::Instance().GetAsset(assetRef.GetId(), assetRef.GetType(), assetRef.GetAutoLoadBehavior());
+        loadedAsset.BlockUntilLoadComplete();
+        assetEditorWindow->OpenAsset(loadedAsset);
+        return assetEditorWindow;
+    }
+}
+
+AssetEditorWindow::AssetEditorWindow(QWidget* parent)
+    : QWidget(parent)
+    , m_ui(new Ui::AssetEditorWindowClass())
+{
+    using namespace AzToolsFramework::AssetEditor;
+
+    m_ui->setupUi(this);
+
+    connect(m_ui->m_assetEditorWidget, &AssetEditorWidget::OnAssetSaveFailedSignal, this, &AssetEditorWindow::OnAssetSaveFailed);
+    connect(m_ui->m_assetEditorWidget, &AssetEditorWidget::OnAssetOpenedSignal, this, &AssetEditorWindow::OnAssetOpened);
+
+    BusConnect();
+}
+
+AssetEditorWindow::~AssetEditorWindow()
+{
+    using namespace AzToolsFramework::AssetEditor;
+    BusDisconnect();
+}
+
+void AssetEditorWindow::RegisterViewClass(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
+{
+    AzToolsFramework::ViewPaneOptions options;
+    options.showInMenu = false;
+    auto& assetName = asset.GetHint();
+    const char* paneName = assetName.c_str();
+    AzToolsFramework::RegisterViewPane<AssetEditorWindow>(paneName, LyViewPane::CategoryTools, options, [asset](QWidget*) {return AssetEditorUtils::CreateAssetEditorWithAsset(asset); });
+}
+
+void AssetEditorWindow::CreateAsset(const AZ::Data::AssetType& assetType)
+{
+    m_ui->m_assetEditorWidget->CreateAsset(assetType);
+}
+
+void AssetEditorWindow::OpenAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
+{
+    m_ui->m_assetEditorWidget->OpenAsset(asset);
+}
+
+void AssetEditorWindow::OpenAssetById(const AZ::Data::AssetId assetId)
+{
+    AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::AssetManager::Instance().GetAsset<AZ::Data::AssetData>(assetId, AZ::Data::AssetLoadBehavior::NoLoad);
+    OpenAsset(asset);
+}
+
+void AssetEditorWindow::SaveAssetAs(const AZStd::string_view assetPath)
+{
+    if (assetPath.empty())
+    {
+        AZ_Warning("Asset Editor", false, "Could not save asset to empty path.");
+        return;
+    }
+
+    auto absoluteAssetPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / assetPath;
+
+    if (!m_ui->m_assetEditorWidget->SaveAssetToPath(absoluteAssetPath.Native()))
+    {
+        AZ_Warning("Asset Editor", false, "File was not saved correctly via SaveAssetAs.");
+    }
+}
+
+void AssetEditorWindow::RegisterViewClass()
+{
+    AzToolsFramework::ViewPaneOptions options;
+    options.preferedDockingArea = Qt::LeftDockWidgetArea;
+    options.showOnToolsToolbar = true;
+    options.toolbarIcon = ":/Menu/asset_editor.svg";
+    AzToolsFramework::RegisterViewPane<AssetEditorWindow>(LyViewPane::AssetEditor, LyViewPane::CategoryTools, options);
+}
+
+void AssetEditorWindow::OnAssetOpened(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
+{
+    if (asset)
+    {
+        AZStd::string assetPath;
+        AZStd::string assetName;
+        AZStd::string extension;
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetPath, &AZ::Data::AssetCatalogRequests::GetAssetPathById, asset.GetId());
+        AzFramework::StringFunc::Path::Split(assetPath.c_str(), nullptr, nullptr, &assetName, &extension);
+//        AZStd::string windowTitle = AZStd::string::format("Edit Asset: %s", (assetName + extension).c_str());
+
+        AZStd::string windowTitle = asset.GetHint();
+
+        qobject_cast<QWidget*>(parent())->setWindowTitle(tr(windowTitle.c_str()));
+    }
+    else
+    {
+        qobject_cast<QWidget*>(parent())->setWindowTitle(tr("Asset Editor"));
+    }
+}
+
+void AssetEditorWindow::closeEvent(QCloseEvent* event)
+{
+    if (m_ui->m_assetEditorWidget->WaitingToSave())
+    {
+        // Don't need to ask to save, as a save is already queued.
+        m_ui->m_assetEditorWidget->SetCloseAfterSave();
+        event->ignore();
+        return;
+    }
+
+    if (m_ui->m_assetEditorWidget->TrySave([this]() {  qobject_cast<QWidget*>(parent())->close(); }))
+    {
+        event->ignore();
+    }
+}
+
+void AssetEditorWindow::OnAssetSaveFailed(const AZStd::string& error)
+{
+    QMessageBox::warning(this, tr("Unable to Save Asset"),
+        tr(error.c_str()), QMessageBox::Ok, QMessageBox::Ok);
+}
+
+#include <AssetEditor/moc_AssetEditorWindow.cpp>
diff --git a/Code/Editor/AssetEditor/AssetEditorWindow.h b/Code/Editor/AssetEditor/AssetEditorWindow.h
new file mode 100644
index 0000000000..3b8695f8d4
--- /dev/null
+++ b/Code/Editor/AssetEditor/AssetEditorWindow.h
@@ -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
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/UserSettings/UserSettings.h>
+#include <AzToolsFramework/AssetEditor/AssetEditorBus.h>
+#include <QWidget>
+#endif
+
+namespace Ui
+{
+    class AssetEditorWindowClass;
+}
+
+/**
+* Window pane wrapper for the Asset Editor widget.
+*/
+class AssetEditorWindow
+    : public QWidget
+    , AzToolsFramework::AssetEditor::AssetEditorWidgetRequestsBus::Handler
+{
+    Q_OBJECT
+
+public:
+    AZ_CLASS_ALLOCATOR(AssetEditorWindow, AZ::SystemAllocator, 0);
+
+    explicit AssetEditorWindow(QWidget* parent = nullptr);
+    ~AssetEditorWindow() override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // AssetEditorWindow
+    //////////////////////////////////////////////////////////////////////////
+    void CreateAsset(const AZ::Data::AssetType& assetType) override;
+    void OpenAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
+    void OpenAssetById(const AZ::Data::AssetId assetId) override;
+    void SaveAssetAs(const AZStd::string_view assetPath) override;
+
+    static void RegisterViewClass();
+    static void RegisterViewClass(const AZ::Data::Asset<AZ::Data::AssetData>& asset);
+
+protected Q_SLOTS:
+    void OnAssetSaveFailed(const AZStd::string& error);
+    void OnAssetOpened(const AZ::Data::Asset<AZ::Data::AssetData>& asset);
+
+protected:
+    void closeEvent(QCloseEvent* event) override;
+
+private:
+    QScopedPointer<Ui::AssetEditorWindowClass> m_ui;
+};
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.ui b/Code/Editor/AssetEditor/AssetEditorWindow.ui
similarity index 100%
rename from Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.ui
rename to Code/Editor/AssetEditor/AssetEditorWindow.ui
diff --git a/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
new file mode 100644
index 0000000000..f1637f2d46
--- /dev/null
+++ b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
@@ -0,0 +1,214 @@
+/*
+ * 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 "AssetImporterDragAndDropHandler.h"
+
+// Qt
+#include <QMimeData>
+
+// AzToolsFramework
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
+
+// AzQtComponents
+#include <AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h>
+
+// Editor
+#include "AssetImporter/AssetImporterManager/AssetImporterManager.h"
+
+bool AssetImporterDragAndDropHandler::m_dragAccepted = false;
+
+AssetImporterDragAndDropHandler::AssetImporterDragAndDropHandler(QObject* parent, AssetImporterManager* const assetImporterManager)
+    : QObject(parent)
+    , m_assetImporterManager(assetImporterManager)
+{
+    AzQtComponents::DragAndDropEventsBus::Handler::BusConnect(AzQtComponents::DragAndDropContexts::EditorMainWindow);
+
+    // They are used to prevent opening the Asset Importer by dragging and dropping files and folders to the Main Window when it is already running
+    connect(m_assetImporterManager, &AssetImporterManager::StartAssetImporter, this, &AssetImporterDragAndDropHandler::OnStartAssetImporter);
+    connect(m_assetImporterManager, &AssetImporterManager::StopAssetImporter, this, &AssetImporterDragAndDropHandler::OnStopAssetImporter);
+}
+
+AssetImporterDragAndDropHandler::~AssetImporterDragAndDropHandler()
+{
+    AzQtComponents::DragAndDropEventsBus::Handler::BusDisconnect(AzQtComponents::DragAndDropContexts::EditorMainWindow);
+}
+
+void AssetImporterDragAndDropHandler::DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& /*context*/)
+{
+    if (!m_isAssetImporterRunning)
+    {
+        ProcessDragEnter(event);
+    }
+}
+
+void AssetImporterDragAndDropHandler::Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& /*context*/)
+{
+    if (!m_dragAccepted)
+    {
+        return;
+    }
+
+    QStringList fileList = GetFileList(event);
+
+    if (!fileList.isEmpty())
+    {
+        Q_EMIT OpenAssetImporterManager(fileList);
+    }
+
+    // reset
+    m_dragAccepted = false;
+}
+
+void AssetImporterDragAndDropHandler::ProcessDragEnter(QDragEnterEvent* event)
+{
+    m_dragAccepted = false;
+
+    const QMimeData* mimeData = event->mimeData();
+
+    // if the event hasn't been accepted already and the mimeData hasUrls()
+    if (event->isAccepted() || !mimeData->hasUrls())
+    {
+        return;
+    }
+
+    // prevent users from dragging and dropping files from the Asset Browser
+    if (mimeData->hasFormat(AzToolsFramework::AssetBrowser::AssetBrowserEntry::GetMimeType()))
+    {
+        return;
+    }
+
+    QList<QUrl> urlList = mimeData->urls();
+    int urlListSize = urlList.size();
+
+    // runs through the file list first and checks for any "crate" files - if it finds ANY, return (and don't accept the event)
+    for (int i = 0; i < urlListSize; ++i)
+    {
+        QUrl currentUrl = urlList.at(i);
+
+        if (currentUrl.isLocalFile())
+        {
+            QString path = urlList.at(i).toLocalFile();
+
+            if (ContainCrateFiles(path))
+            {
+                return;
+            }
+        }
+    }
+
+    for (int i = 0; i < urlListSize; ++i)
+    {
+        // Get the local file path
+        QString path = urlList.at(i).toLocalFile();
+
+        QDir dir(path);
+        QString relativePath = dir.relativeFilePath(path);
+        QString absPath = dir.absolutePath();
+
+        // check if the files/folders are under the game root directory
+        QDir gameRoot(Path::GetEditingGameDataFolder().c_str());
+        QString gameRootAbsPath = gameRoot.absolutePath();
+
+        if (absPath.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
+        {
+            return;
+        }
+
+        QDirIterator it(absPath, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::Subdirectories);
+
+        QFileInfo info(absPath);
+        QString extension = info.completeSuffix();
+
+        // if it's not an empty folder directory or if it's a file,
+        // then allow the drag and drop process.
+        // Otherwise, prevent users from dragging and dropping empty folders
+        if (it.hasNext() || !extension.isEmpty())
+        {
+            // this is used in Drop()
+            m_dragAccepted = true;
+        }
+    }
+
+    // at this point, all files should be legal to be imported
+    // since they are not in the database
+    if (m_dragAccepted)
+    {
+        event->acceptProposedAction();
+    }
+}
+
+QStringList AssetImporterDragAndDropHandler::GetFileList(QDropEvent* event)
+{
+    QStringList fileList;
+    const QMimeData* mimeData = event->mimeData();
+
+    QList<QUrl> urlList = mimeData->urls();
+
+    for (int i = 0; i < urlList.size(); ++i)
+    {
+        QUrl currentUrl = urlList.at(i);
+
+        if (currentUrl.isLocalFile())
+        {
+            QString path = urlList.at(i).toLocalFile();
+
+            if (!ContainCrateFiles(path))
+            {
+                fileList.append(path);
+            }
+        }
+    }
+
+    return fileList;
+}
+
+void AssetImporterDragAndDropHandler::OnStartAssetImporter()
+{
+    m_isAssetImporterRunning = true;
+}
+
+void AssetImporterDragAndDropHandler::OnStopAssetImporter()
+{
+    m_isAssetImporterRunning = false;
+}
+
+
+bool AssetImporterDragAndDropHandler::ContainCrateFiles(QString path)
+{
+    QFileInfo fileInfo(path);
+
+    if (fileInfo.isFile())
+    {
+        return isCrateFile(fileInfo);
+    }
+    else
+    {
+        QDirIterator it(path, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::Subdirectories);
+
+        while (it.hasNext())
+        {
+            QString str = it.next();
+            QFileInfo info(str);
+
+            if (isCrateFile(info))
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool AssetImporterDragAndDropHandler::isCrateFile(QFileInfo fileInfo)
+{
+    return QStringLiteral("crate").compare(fileInfo.suffix(), Qt::CaseInsensitive) == 0;
+}
+
+#include <AssetImporter/AssetImporterManager/moc_AssetImporterDragAndDropHandler.cpp>
diff --git a/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
new file mode 100644
index 0000000000..949459b6ee
--- /dev/null
+++ b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
@@ -0,0 +1,68 @@
+/*
+ * 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 <QObject>
+#include <QFileInfo>
+#include <QString>
+
+#include <AzCore/EBus/EBus.h>
+#include <AzQtComponents/Buses/DragAndDrop.h>
+#include <AzToolsFramework/API/AssetDatabaseBus.h>
+#include <AzCore/std/smart_ptr/scoped_ptr.h>
+#endif
+
+class MainWindow;
+class AssetImporterManager;
+
+
+namespace AzToolsFramework
+{
+    namespace AssetDatabase
+    {
+        class AssetDatabaseConnection;
+    }
+}
+
+class AssetImporterDragAndDropHandler
+    : public QObject
+    , public AzQtComponents::DragAndDropEventsBus::Handler
+{
+    Q_OBJECT
+
+public:
+    explicit AssetImporterDragAndDropHandler(QObject* parent, AssetImporterManager* const assetImporterManager);
+    ~AssetImporterDragAndDropHandler();
+
+    void DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
+    void Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
+
+    static void ProcessDragEnter(QDragEnterEvent* event);
+    static QStringList GetFileList(QDropEvent* event);
+
+Q_SIGNALS:
+    void OpenAssetImporterManager(const QStringList& fileList);
+
+public Q_SLOTS:
+    void OnStartAssetImporter();
+    void OnStopAssetImporter();
+
+private:
+    bool m_isAssetImporterRunning = false;
+    AssetImporterManager* m_assetImporterManager;
+
+    static bool ContainCrateFiles(QString path);
+    static bool isCrateFile(QFileInfo fileInfo);
+
+    // it is used because MainWindow's dropEvent will ask the Ebus to call the Drop() function in AssetImporterDragAndDropHandler.
+    // That will cause the problem that even the crate objects are blocked by the DragEnter() in AssetImporterDragAndDropHandler,
+    // it will still open the Asset Importer
+    static bool m_dragAccepted;
+};
diff --git a/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
new file mode 100644
index 0000000000..43074c9c02
--- /dev/null
+++ b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
@@ -0,0 +1,811 @@
+/*
+ * 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 "AssetImporterManager.h"
+
+// Qt
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QSettings>
+#include <QStandardPaths>
+
+// AzFramework
+#include <AzFramework/Asset/AssetSystemBus.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+
+// Editor
+#include "AssetImporter/UI/FilesAlreadyExistDialog.h"
+#include "AssetImporter/UI/ProcessingAssetsDialog.h"
+
+namespace AssetImporterManagerPrivate
+{
+    const char* g_selectFilesPath = "AssetImporter/SelectFilesPath";
+    const char* g_selectDestinationFilesPath = "AssetImporter/SelectDestinationFilesPath";
+    const char* g_errorMessageBoxTitle = "File failed to process.";
+    const char* g_crateError = "Crate files cannot be imported.";
+    static const char* s_crateFileExtension = "crate";
+};
+
+AssetImporterManager::AssetImporterManager(QWidget* parent)
+    : QObject(parent)
+{
+}
+
+AssetImporterManager::~AssetImporterManager()
+{
+}
+
+void AssetImporterManager::Exec()
+{
+    // tell the AssetImporterDragAndDropHandler that the Asset Importer now is running
+    Q_EMIT StartAssetImporter();
+    bool success = OnBrowseFiles();
+
+    // prevent users from selecting crate files from the File Explorer and open the Asset Importer.
+    if (!success)
+    {
+        reject();
+    }
+    else
+    {
+        OnOpenSelectDestinationDialog();
+    }
+}
+
+void AssetImporterManager::Exec(const QStringList& dragAndDropFileList)
+{
+    // note: dragging and dropping an empty folder can also trigger this condition
+    if (!dragAndDropFileList.isEmpty())
+    {
+        OnDragAndDropFiles(&dragAndDropFileList);
+
+        // only open the Asset Importer when the folder contains correct type files
+        if (!m_pathMap.isEmpty())
+        {
+            // tell the AssetImporterDragAndDropHandler that the Asset Importer now is running
+            Q_EMIT StartAssetImporter();
+            OnOpenSelectDestinationDialog();
+        }
+        else
+        {
+            reject();
+        }
+    }
+}
+
+// used to cancel actions and close the dialog
+void AssetImporterManager::reject()
+{
+    m_pathMap.clear();
+    m_destinationRootDirectory = "";
+    Q_EMIT StopAssetImporter();
+}
+
+void AssetImporterManager::OnDragAndDropFiles(const QStringList* fileList)
+{
+    for (int i = 0; i < fileList->size(); ++i)
+    {
+        // if the list contains a crate file,
+        // the whole process should stop
+        if (!GetAndCheckAllFilesInFolder(fileList->at(i)))
+        {
+            QMessageBox::warning(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, AssetImporterManagerPrivate::g_crateError);
+            reject();
+            return;
+        }
+    }
+}
+
+bool AssetImporterManager::OnBrowseFiles()
+{
+    QFileDialog fileDialog;
+    fileDialog.setFileMode(QFileDialog::ExistingFiles);
+    fileDialog.setWindowModality(Qt::WindowModality::ApplicationModal);
+    fileDialog.setViewMode(QFileDialog::Detail);
+    fileDialog.setWindowTitle(tr("Select files to import"));
+    fileDialog.setLabelText(QFileDialog::Accept, "Select");
+
+    QSettings settings;
+    QString currentAbsolutePath = settings.value(AssetImporterManagerPrivate::g_selectFilesPath).toString();
+
+    QDir gameRoot(Path::GetEditingGameDataFolder().c_str());
+    QString gameRootAbsPath = gameRoot.absolutePath();
+
+    // Case 1: if currentAbsolutePath is empty at this point, that means this is the first time
+    //         users using the Asset Importer, set the default directory to be users' PC's desktop.
+    // Case 2: if the current folder directory stored in the registry doesn't exist anymore,
+    //         that means users have removed the directory already (deleted or use the Move feature).
+    // Case 3: if it's a directory under the game root folder, then in general,
+    //         users have modified the folder directory in the registry. It should not be happening.
+    if (currentAbsolutePath.isEmpty() || !QFile(currentAbsolutePath).exists() || currentAbsolutePath.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
+    {
+        currentAbsolutePath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
+    }
+
+    fileDialog.setDirectory(currentAbsolutePath);
+
+    if (!fileDialog.exec())
+    {
+        return false;
+    }
+
+    bool encounteredCrate = false;
+    QStringList invalidFiles;
+
+    for (QString path : fileDialog.selectedFiles())
+    {
+        QString fileName = GetFileName(path);
+        QFileInfo info(path);
+        QString extension = info.completeSuffix(); // extension without '.'
+
+        if (QString(AssetImporterManagerPrivate::s_crateFileExtension).compare(extension, Qt::CaseInsensitive) != 0)
+        {
+            // prevent users from importing files under the game root directory
+            if (path.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
+            {
+                invalidFiles << fileName;
+            }
+            else
+            {
+                // store paths into the map.
+                m_pathMap[path] = fileName;
+            }
+        }
+        else
+        {
+            encounteredCrate = true;
+        }
+    }
+
+    if (invalidFiles.size() > 0)
+    {
+        QString fileWarning = QString("Files cannot be imported into their own project. The following files will not be moved or copied:\n");
+        fileWarning.append(invalidFiles.join(", "));
+        fileWarning.append('.');
+        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, fileWarning);
+    }
+    if (encounteredCrate)
+    {
+        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, AssetImporterManagerPrivate::g_crateError);
+    }
+
+    currentAbsolutePath = fileDialog.directory().absolutePath();
+    settings.setValue(AssetImporterManagerPrivate::g_selectFilesPath, currentAbsolutePath);
+
+    // prevent users from selecting crate files from the File Explorer and open the Asset Importer.
+    return (m_pathMap.size() > 0);
+}
+
+void AssetImporterManager::OnBrowseDestinationFilePath(QLineEdit* destinationLineEdit)
+{
+    QFileDialog fileDialog;
+    fileDialog.setOption(QFileDialog::ShowDirsOnly, true);
+    fileDialog.setViewMode(QFileDialog::List);
+    fileDialog.setWindowModality(Qt::WindowModality::ApplicationModal);
+    fileDialog.setWindowTitle(tr("Select import destination"));
+
+    QSettings settings;
+    QString currentDestination = settings.value(AssetImporterManagerPrivate::g_selectDestinationFilesPath).toString();
+
+    QDir gameRoot(Path::GetEditingGameDataFolder().c_str());
+    QString gameRootAbsPath = gameRoot.absolutePath();
+
+    // Case 1: if currentDestination is empty at this point, that means this is the first time
+    //         users using the Asset Importer, set the default directory to be the current game project's root folder
+    // Case 2: if the current folder directory stored in the registry doesn't exist anymore,
+    //         that means users have removed the directory already (deleted or use the Move feature).
+    // Case 3: if it's a directory outside of the game root folder, then in general,
+    //         users have modified the folder directory in the registry. It should not be happening.
+    if (currentDestination.isEmpty() || !QDir(currentDestination).exists() || !currentDestination.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
+    {
+        currentDestination = gameRootAbsPath;
+    }
+
+    fileDialog.setDirectory(currentDestination);
+
+    // The default file path is the game project root folder.
+    // After that, the default file path will be the previous opened folder path.
+    connect(&fileDialog, &QFileDialog::directoryEntered, this, [&fileDialog, &gameRoot, &gameRootAbsPath](const QString& path)
+        {
+            // get current relative path
+            QString relativePath = gameRoot.relativeFilePath(path);
+
+            // Guard against navigating outside of the project folder. Lambda used as the dialog had to be captured.
+            // checking the directory and prevent users from changing the directory outside of the game root
+            if (!path.startsWith(gameRootAbsPath, Qt::CaseInsensitive) || (relativePath.length() > 2 && relativePath[0] == '.' && relativePath[1] == '.'))
+            {
+                fileDialog.setDirectory(gameRoot);
+            }
+        });
+
+    if (!fileDialog.exec())
+    {
+        return;
+    }
+
+    // users can only select one folder at a time, so the index is always 0.
+    // This fixes the issue that QFileDialog does not select the highlighted folder
+    QString destinationDirectory = fileDialog.selectedFiles().at(0);
+
+    OnSetDestinationDirectory(destinationDirectory);
+
+    destinationLineEdit->setText(destinationDirectory);
+}
+
+// Copy + Paste
+void AssetImporterManager::OnCopyFiles()
+{
+    m_importMethod = ImportFilesMethod::CopyFiles;
+    ProcessCopyFiles();
+}
+
+// Cut + Paste
+void AssetImporterManager::OnMoveFiles()
+{
+    m_importMethod = ImportFilesMethod::MoveFiles;
+    ProcessMoveFiles();
+}
+
+bool AssetImporterManager::OnOverwriteFiles(QString relativePath, QString oldAbsolutePath)
+{
+    // this is the absolute path in the destination folder
+    QString destinationAbsolutePath = GenerateAbsolutePath(relativePath);
+
+    return Overwrite(relativePath, oldAbsolutePath, destinationAbsolutePath);
+}
+
+bool AssetImporterManager::OnKeepBothFiles(QString relativePath, QString oldAbsolutePath)
+{
+    // this is the absolute path in the destination folder
+    QString destinationAbsolutePath = GenerateAbsolutePath(relativePath);
+
+    QString subPath = QFileInfo(destinationAbsolutePath).absoluteDir().absolutePath();
+
+    QFileInfo info(destinationAbsolutePath);
+    QString extension = info.completeSuffix(); // extension without '.'
+    QString fileName = info.baseName(); //file name without extension
+
+    int number = 1;
+    int index = destinationAbsolutePath.indexOf(extension);
+
+    QString newFileName = CreateFileNameWithNumber(number, fileName, index, extension);
+    QString newDestinationAbsolutePath = subPath + '/' + newFileName;
+
+    while (QFile(newDestinationAbsolutePath).exists())
+    {
+        number++;
+        newFileName = CreateFileNameWithNumber(number, fileName, index, extension);
+        newDestinationAbsolutePath = subPath + '/' + newFileName;
+    }
+
+    if (m_importMethod == ImportFilesMethod::CopyFiles)
+    {
+        return Copy(relativePath, oldAbsolutePath, newDestinationAbsolutePath);
+    }
+    else if (m_importMethod == ImportFilesMethod::MoveFiles)
+    {
+        return Move(relativePath, oldAbsolutePath, newDestinationAbsolutePath);
+    }
+
+    return false;
+}
+
+void AssetImporterManager::OnOpenLogDialog()
+{
+    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::ShowAssetProcessor);
+    reject();
+}
+
+void AssetImporterManager::OnSetDestinationDirectory(QString destinationDirectory)
+{
+    QSettings settings;
+    QString currentDestination = settings.value(AssetImporterManagerPrivate::g_selectDestinationFilesPath).toString();
+
+    m_destinationRootDirectory = (!destinationDirectory.isEmpty()) ? destinationDirectory : currentDestination;
+    settings.setValue(AssetImporterManagerPrivate::g_selectDestinationFilesPath, destinationDirectory);
+}
+
+void AssetImporterManager::OnOpenSelectDestinationDialog()
+{
+    QWidget* mainWindow = nullptr;
+    AzToolsFramework::EditorRequestBus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::GetMainWindow);
+
+    QString numberOfFilesMessage = m_pathMap.size() == 1 ? QString(tr("Importing 1 asset")) : QString(tr("Importing %1 assets").arg(m_pathMap.size()));
+
+    SelectDestinationDialog selectDestinationDialog(numberOfFilesMessage, mainWindow);
+
+    // Browse Destination File Path
+    connect(&selectDestinationDialog, &SelectDestinationDialog::BrowseDestinationPath, this, &AssetImporterManager::OnBrowseDestinationFilePath);
+    connect(&selectDestinationDialog, &SelectDestinationDialog::DoCopyFiles, this, &AssetImporterManager::OnCopyFiles);
+    connect(&selectDestinationDialog, &SelectDestinationDialog::DoMoveFiles, this, &AssetImporterManager::OnMoveFiles);
+    connect(&selectDestinationDialog, &SelectDestinationDialog::Cancel, this, &AssetImporterManager::reject);
+    connect(&selectDestinationDialog, &SelectDestinationDialog::SetDestinationDirectory, this, &AssetImporterManager::OnSetDestinationDirectory);
+    selectDestinationDialog.exec();
+}
+
+ProcessFilesMethod AssetImporterManager::OnOpenFilesAlreadyExistDialog(QString message, int numberOfFiles)
+{
+    ProcessFilesMethod processMethod = ProcessFilesMethod::Default;
+
+    // make sure the dialog is opened in front of the Editor main window
+    QWidget* mainWindow = nullptr;
+    AzToolsFramework::EditorRequestBus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::GetMainWindow);
+
+    FilesAlreadyExistDialog filesAlreadyExistDialog(message, numberOfFiles, mainWindow);
+
+    bool applyToAll = false;
+
+    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::ApplyActionToAllFiles, this, [&applyToAll](bool result)
+        {
+            applyToAll = result;
+        });
+
+    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::OverWriteFiles, this, [this, &processMethod, &applyToAll]()
+        {
+            processMethod = UpdateProcessFileMethod(ProcessFilesMethod::OverwriteFile, applyToAll);
+        });
+
+    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::KeepBothFiles, this, [this, &processMethod, &applyToAll]()
+        {
+            processMethod = UpdateProcessFileMethod(ProcessFilesMethod::KeepBothFile, applyToAll);
+        });
+
+    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::SkipCurrentProcess, this, [this, &processMethod, &applyToAll]()
+        {
+            processMethod = UpdateProcessFileMethod(ProcessFilesMethod::SkipProcessingFile, applyToAll);
+        });
+
+    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::CancelAllProcesses, this, [&processMethod]()
+        {
+            processMethod = ProcessFilesMethod::Cancel;
+        });
+
+    if (!applyToAll && processMethod != ProcessFilesMethod::Cancel)
+    {
+        filesAlreadyExistDialog.exec();
+    }
+
+    return processMethod;
+}
+
+ProcessFilesMethod AssetImporterManager::UpdateProcessFileMethod(ProcessFilesMethod processMethod, bool applyToAll)
+{
+    if (applyToAll)
+    {
+        switch (processMethod)
+        {
+        case ProcessFilesMethod::OverwriteFile:
+            processMethod = ProcessFilesMethod::OverwriteAllFiles;
+            break;
+        case ProcessFilesMethod::KeepBothFile:
+            processMethod = ProcessFilesMethod::KeepBothAllFiles;
+            break;
+        case ProcessFilesMethod::SkipProcessingFile:
+            processMethod = ProcessFilesMethod::SkipProcessingAllFiles;
+        }
+    }
+
+    return processMethod;
+}
+
+bool AssetImporterManager::ProcessFileMethod(ProcessFilesMethod processMethod, QString relativePath, QString oldAbsolutePath)
+{
+    switch (processMethod)
+    {
+    case ProcessFilesMethod::OverwriteFile:
+    case ProcessFilesMethod::OverwriteAllFiles:
+        return OnOverwriteFiles(relativePath, oldAbsolutePath);
+    case ProcessFilesMethod::KeepBothFile:
+    case ProcessFilesMethod::KeepBothAllFiles:
+        return OnKeepBothFiles(relativePath, oldAbsolutePath);
+    case ProcessFilesMethod::SkipProcessingAllFiles:
+        return false;
+    }
+
+    return false;
+}
+
+void AssetImporterManager::OnOpenProcessingAssetsDialog(int numberOfProcessedFiles)
+{
+    // make sure the dialog is opened in front of the Editor main window
+    QWidget* mainWindow = nullptr;
+    AzToolsFramework::EditorRequestBus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::GetMainWindow);
+
+    ProcessingAssetsDialog processingAssetsDialog(numberOfProcessedFiles, mainWindow);
+    connect(&processingAssetsDialog, &ProcessingAssetsDialog::OpenLogDialog, this, &AssetImporterManager::OnOpenLogDialog);
+    connect(&processingAssetsDialog, &ProcessingAssetsDialog::CloseProcessingAssetsDialog, this, &AssetImporterManager::reject);
+
+    processingAssetsDialog.exec();
+}
+
+void AssetImporterManager::ProcessCopyFiles()
+{
+    int numberOfFiles = m_pathMap.size();
+    int numberOfProcessedFiles = 0;
+
+    ProcessFilesMethod processMethod = ProcessFilesMethod::Default;
+
+    for (int i = 0; i < m_pathMap.size(); ++i)
+    {
+        QString relativePath = m_pathMap.values().at(i);
+        QString oldAbsolutePath = m_pathMap.keys().at(i);
+
+        // this is the absolute path in the destination folder
+        QString destinationAbsolutePath = GenerateAbsolutePath(relativePath);
+
+        // check if the file exists in the destination folder
+        if (!QFile::exists(destinationAbsolutePath))
+        {
+            if (Copy(relativePath, oldAbsolutePath, destinationAbsolutePath))
+            {
+                numberOfProcessedFiles++;
+            }
+        }
+        else
+        {
+            if (processMethod == ProcessFilesMethod::Default ||
+                processMethod == ProcessFilesMethod::OverwriteFile ||
+                processMethod == ProcessFilesMethod::KeepBothFile ||
+                processMethod == ProcessFilesMethod::SkipProcessingFile)
+            {
+                QString fileName = GetFileName(oldAbsolutePath);
+                QString message = QString("The destination already has a file named \"%1\". What would you like to do?").arg(fileName);
+
+                processMethod = OnOpenFilesAlreadyExistDialog(message, numberOfFiles);
+            }
+
+            if (ProcessFileMethod(processMethod, relativePath, oldAbsolutePath))
+            {
+                numberOfProcessedFiles++;
+            }
+        }
+
+        numberOfFiles--;
+    }
+
+    if (numberOfProcessedFiles > 0)
+    {
+        OnOpenProcessingAssetsDialog(numberOfProcessedFiles);
+    }
+    else
+    {
+        reject();
+    }
+}
+
+void AssetImporterManager::ProcessMoveFiles()
+{
+    int numberOfFiles = m_pathMap.size();
+    int numberOfProcessedFiles = 0;
+
+    ProcessFilesMethod processMethod = ProcessFilesMethod::Default;
+
+    for (int i = 0; i < m_pathMap.size(); ++i)
+    {
+        QString relativePath = m_pathMap.values().at(i);
+        QString oldAbsolutePath = m_pathMap.keys().at(i);
+
+        // this is the absolute path in the destination folder
+        QString destinationAbsolutePath = GenerateAbsolutePath(relativePath);
+
+        // check if the file exists in the destination folder
+        if (!QFile::exists(destinationAbsolutePath))
+        {
+            if (Move(relativePath, oldAbsolutePath, destinationAbsolutePath))
+            {
+                numberOfProcessedFiles++;
+            }
+        }
+        else
+        {
+            if (processMethod == ProcessFilesMethod::Default ||
+                processMethod == ProcessFilesMethod::OverwriteFile ||
+                processMethod == ProcessFilesMethod::KeepBothFile ||
+                processMethod == ProcessFilesMethod::SkipProcessingFile)
+            {
+                QString fileName = GetFileName(oldAbsolutePath);
+                QString message = QString("The destination already has a file named \"%1\". What would you like to do?").arg(fileName);
+
+                processMethod = OnOpenFilesAlreadyExistDialog(message, numberOfFiles);
+            }
+
+            if (ProcessFileMethod(processMethod, relativePath, oldAbsolutePath))
+            {
+                numberOfProcessedFiles++;
+            }
+        }
+
+        numberOfFiles--;
+    }
+
+    if (numberOfProcessedFiles > 0)
+    {
+        OnOpenProcessingAssetsDialog(numberOfProcessedFiles);
+    }
+    else
+    {
+        reject();
+    }
+}
+
+bool AssetImporterManager::Copy(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath)
+{
+    QString fileName = GetFileName(destinationAbsolutePath);
+    QString subPath = QFileInfo(destinationAbsolutePath).absoluteDir().absolutePath();
+    QDir dir;
+
+    bool directoryExistedAlready = QDir(subPath).exists();
+    if (!directoryExistedAlready)
+    {
+        dir.mkpath(subPath);
+    }
+
+    QString newDestinationAbsolutePath = subPath;
+    newDestinationAbsolutePath = newDestinationAbsolutePath.append('/' + fileName);
+
+    // Copy the file from the old path to the new path
+    if (!QFile::copy(oldAbsolutePath, newDestinationAbsolutePath))
+    {
+        QString reason = tr("an unknown issue occurred.");
+
+        if (!directoryExistedAlready)
+        {
+            dir.rmdir(subPath);
+        }
+
+        // if the original files got deleted at this condition
+        if (!QFile(oldAbsolutePath).exists())
+        {
+            reason = tr("%1 no longer exists.").arg(fileName);
+        }
+        // if users manually copy the file into the destination folder at this condition
+        if (QFile(newDestinationAbsolutePath).exists())
+        {
+            reason = tr("%1 already exists in the target directory.").arg(fileName);
+        }
+
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, QObject::tr("We're sorry, but the file failed to process because %1").arg(reason));
+        return false;
+    }
+
+    // set the destination file to be writable by user himself/herself if it's read-only
+    QFile destinationFile(newDestinationAbsolutePath);
+    SetDestinationFileWritable(destinationFile);
+
+    return true;
+}
+
+bool AssetImporterManager::Move(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath)
+{
+    QString fileName = GetFileName(destinationAbsolutePath);
+    QString subPath = QFileInfo(destinationAbsolutePath).absoluteDir().absolutePath();
+    QString newDestinationAbsolutePath = subPath;
+    QDir dir;
+
+    bool directoryExistedAlready = QDir(subPath).exists();
+    if (!directoryExistedAlready)
+    {
+        dir.mkpath(subPath);
+    }
+
+    if (QFile::rename(oldAbsolutePath, newDestinationAbsolutePath.append('/' + fileName)))
+    {
+        QString oldFileName = GetFileName(oldAbsolutePath);
+
+        // Only remove the old directory if the relative path is the file name itself.
+        // That also means users are dragging and dropping files, but not a folder containing those files.
+        if (oldFileName.compare(relativePath) != 0)
+        {
+            RemoveOldPath(oldAbsolutePath, relativePath);
+        }
+
+        // set the destination file to be writable by user himself/herself if it's read-only
+        QFile destinationFile(newDestinationAbsolutePath);
+        SetDestinationFileWritable(destinationFile);
+
+        return true;
+    }
+    else
+    {
+        QString reason = tr("an unknown issue occurred.");
+        QString oldFileName = GetFileName(oldAbsolutePath);
+
+        if (!directoryExistedAlready)
+        {
+            dir.rmdir(subPath);
+        }
+
+        // if the original files got deleted at this condition
+        if (!QFile(oldAbsolutePath).exists())
+        {
+            reason = tr("%1 no longer exists.").arg(oldFileName);
+        }
+        // if users manually copy the file into the destination folder at this condition
+        if (QFile(newDestinationAbsolutePath).exists())
+        {
+            reason = tr("%1 already exists in the target directory.").arg(oldFileName);
+        }
+
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, QObject::tr("We're sorry, but the file failed to process because %1").arg(reason));
+        return false;
+    }
+}
+
+bool AssetImporterManager::Overwrite(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath)
+{
+    QFile newFile(destinationAbsolutePath);
+    QFile oldFile(oldAbsolutePath);
+
+    // double check if paths are valid
+    if ((!oldFile.open(QIODevice::ReadOnly)))
+    {
+        QString fileName = GetFileName(oldAbsolutePath);
+        QString reason = tr("%1 no longer exists.").arg(fileName);
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, QObject::tr("We're sorry, but the file failed to process because %1").arg(reason));
+        return false;
+    }
+
+    if (!newFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+    {
+        QString reason = tr("We're sorry, but the file failed to process.");
+        QString fileName = GetFileName(destinationAbsolutePath);
+
+        if (!newFile.exists())
+        {
+            reason = tr("%1 from the destination directory is removed.").arg(fileName);
+        }
+        else
+        {
+            reason = tr("%1 from the destination directory cannot be overwritten.").arg(fileName);
+        }
+
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, QObject::tr("We're sorry, but the file failed to process because %1").arg(reason));
+        return false;
+    }
+
+    QDataStream dataStream(&oldFile);
+    QDataStream out(&newFile);
+
+    int bufferSize = 1024 * 1024;
+    char* buffer = new char[bufferSize];
+
+    while (!dataStream.atEnd())
+    {
+        int bytesRead = dataStream.readRawData(buffer, bufferSize);
+        out.writeRawData(buffer, bytesRead);
+    }
+
+    delete[] buffer;
+    oldFile.close();
+    newFile.close();
+
+    // if it's the move file method, got to remove the original files
+    if (m_importMethod == ImportFilesMethod::MoveFiles)
+    {
+        QString fileName = GetFileName(oldAbsolutePath);
+        QFile file(oldAbsolutePath);
+        QDir absoluteDir = QFileInfo(oldAbsolutePath).absoluteDir();
+
+        if (file.exists())
+        {
+            // if the original file is read-only,
+            // then it got to be writable in order to be deleted successfully
+            SetDestinationFileWritable(file);
+            absoluteDir.remove(fileName);
+        }
+
+        // Only remove the old directory if the relative path is the file name itself.
+        // That also means users are dragging and dropping files, but not a folder containing those files.
+        if (fileName.compare(relativePath) != 0)
+        {
+            RemoveOldPath(oldAbsolutePath, relativePath);
+        }
+    }
+
+    return true;
+}
+
+bool AssetImporterManager::GetAndCheckAllFilesInFolder(QString path)
+{
+    QString formattedPath = path;
+
+    // Paths ending with '/' return from QFileInfo().fileName() with a value of ""
+    // Strip a trailing slash so we can correctly get rootFolderName on all platforms
+    if (formattedPath.endsWith("/"))
+    {
+        formattedPath.truncate(formattedPath.lastIndexOf(QChar('/')));
+    }
+
+    QString rootFolderName = GetFileName(formattedPath);
+    QDirIterator it(formattedPath, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::Subdirectories);
+    QFileInfo info(formattedPath);
+
+    if (!info.isDir() && !it.hasNext() && info.exists())
+    {
+        m_pathMap[formattedPath] = rootFolderName;
+        return true;
+    }
+
+    // Get the index of the last sub folder name in the path
+    QStringList directoryNameList = formattedPath.split('/');
+    int lastFolderIndex = directoryNameList.size() - 1;
+
+    QString pathToBeRelativeTo = directoryNameList.mid(0, lastFolderIndex).join('/');
+
+    while (it.hasNext())
+    {
+        QString absolutePath = it.next();
+        QFileInfo absoluteInfo(absolutePath);
+        QString extension = absoluteInfo.completeSuffix();
+
+        if (QString(AssetImporterManagerPrivate::s_crateFileExtension).compare(extension, Qt::CaseInsensitive) == 0)
+        {
+            return false;
+        }
+
+        Q_ASSERT(absolutePath.startsWith(pathToBeRelativeTo));
+        QString relativePath = absolutePath.mid(pathToBeRelativeTo.size() + 1);
+        m_pathMap[absolutePath] = relativePath;
+    }
+
+    return true;
+}
+
+void AssetImporterManager::RemoveOldPath(QString oldAbsolutePath, QString oldRelativePath)
+{
+    QDir absoluteDir = QFileInfo(oldAbsolutePath).absoluteDir();
+    QStringList directoryList = oldRelativePath.split('/');
+
+    // remove each folder from the leave to the root, based on the relative path
+    for (int i = 0; i < directoryList.size(); ++i)
+    {
+        QString currentDir = absoluteDir.path();
+        absoluteDir.rmpath(currentDir);
+        absoluteDir.cdUp();
+    }
+}
+
+void AssetImporterManager::SetDestinationFileWritable(QFile& destinationFile)
+{
+    if (destinationFile.open(QIODevice::ReadOnly))
+    {
+        destinationFile.setPermissions(QFile::WriteOwner | destinationFile.permissions());
+    }
+
+    destinationFile.close();
+}
+
+QString AssetImporterManager::CreateFileNameWithNumber(int number, QString fileName, int index, QString extension)
+{
+    QString newFileName;
+
+    newFileName = fileName.isEmpty() ? fileName : fileName.left(index);
+
+    newFileName += "(" + QString::number(number) + ")";
+
+    if (extension.size() > 0)
+    {
+        newFileName += "." + extension;
+    }
+
+    return newFileName;
+}
+
+QString AssetImporterManager::GenerateAbsolutePath(QString relativePath)
+{
+    return QDir(m_destinationRootDirectory).absoluteFilePath(relativePath);
+}
+
+QString AssetImporterManager::GetFileName(QString path)
+{
+    return QFileInfo(path).fileName();
+}
+
+#include <AssetImporter/AssetImporterManager/moc_AssetImporterManager.cpp>
diff --git a/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h
new file mode 100644
index 0000000000..ba67dade3f
--- /dev/null
+++ b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QMainWindow>
+#include <AssetImporter/UI/SelectDestinationDialog.h>
+#endif
+
+class QStringList;
+class QFile;
+
+enum class ImportFilesMethod
+{
+    CopyFiles,
+    MoveFiles
+};
+
+enum class ProcessFilesMethod
+{
+    OverwriteFile,
+    KeepBothFile,
+    SkipProcessingFile,
+    OverwriteAllFiles,
+    KeepBothAllFiles,
+    SkipProcessingAllFiles,
+    Cancel,
+
+    Default
+};
+
+class AssetImporterManager
+    : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AssetImporterManager(QWidget* parent = nullptr);
+    ~AssetImporterManager();
+
+    // Modal, but blocking.
+    void Exec(); // for browsing files
+    void Exec(const QStringList& dragAndDropFileList); // for drag and drop
+
+Q_SIGNALS:
+    void StartAssetImporter();
+    void StopAssetImporter();
+
+private Q_SLOTS:
+    void reject();
+    void OnDragAndDropFiles(const QStringList* fileList);
+    bool OnBrowseFiles();
+    void OnBrowseDestinationFilePath(QLineEdit* destinationLineEdit);
+    void OnCopyFiles();
+    void OnMoveFiles();
+    bool OnOverwriteFiles(QString relativePath, QString oldAbsolutePath);
+    bool OnKeepBothFiles(QString relativePath, QString oldAbsolutePath);
+    void OnOpenLogDialog();
+    void OnSetDestinationDirectory(QString destinationDirectory);
+
+private:
+    void OnOpenSelectDestinationDialog();
+
+    ProcessFilesMethod OnOpenFilesAlreadyExistDialog(QString message, int numberOfFiles);
+    ProcessFilesMethod UpdateProcessFileMethod(ProcessFilesMethod processMethod, bool applyToAll);
+    bool ProcessFileMethod(ProcessFilesMethod processMethod, QString relativePath, QString oldAbsolutePath);
+    
+    void OnOpenProcessingAssetsDialog(int numberOfProcessedFiles);
+
+    void ProcessCopyFiles();
+    void ProcessMoveFiles();
+
+    bool Copy(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath);
+    bool Move(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath);
+    bool Overwrite(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath);
+
+    bool GetAndCheckAllFilesInFolder(QString path);
+    void RemoveOldPath(QString oldAbsolutePath, QString oldRelativePath);
+    void SetDestinationFileWritable(QFile& destinationFile);
+
+    QString CreateFileNameWithNumber(int number, QString fileName, int index, QString extension);
+    QString GenerateAbsolutePath(QString relativePath);
+    QString GetFileName(QString path);
+
+    ImportFilesMethod m_importMethod;
+
+    // Key = absolute path, Value = relative path
+    QMap<QString, QString> m_pathMap;
+    QString m_destinationRootDirectory;
+};
diff --git a/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp b/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp
new file mode 100644
index 0000000000..bbd3d6239f
--- /dev/null
+++ b/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp
@@ -0,0 +1,100 @@
+/*
+ * 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 "FilesAlreadyExistDialog.h"
+
+// Qt
+#include <QPushButton>
+#include <QStyle>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <AssetImporter/UI/ui_FilesAlreadyExistDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+FilesAlreadyExistDialog::FilesAlreadyExistDialog(QString message ,int numberOfFiles, QWidget* parent)
+    : QDialog(parent)
+    , m_ui(new Ui::FilesAlreadyExistDialog)
+{
+    m_ui->setupUi(this);
+
+    UpdateMessage(message);
+    InitializeButtons();
+    UpdateCheckBoxState(numberOfFiles);
+}
+
+FilesAlreadyExistDialog::~FilesAlreadyExistDialog()
+{
+}
+
+void FilesAlreadyExistDialog::InitializeButtons()
+{
+    m_ui->buttonBox->setContentsMargins(0, 0, 16, 16);
+    QPushButton* overwriteButton = m_ui->buttonBox->addButton(tr("Overwrite"), QDialogButtonBox::AcceptRole);
+    QPushButton* keepBothButton = m_ui->buttonBox->addButton(tr("Keep Both"), QDialogButtonBox::AcceptRole);
+    QPushButton* skipButton = m_ui->buttonBox->addButton(tr("Skip"), QDialogButtonBox::AcceptRole);
+
+    overwriteButton->setProperty("class", "Primary");
+    overwriteButton->setDefault(true);
+
+    keepBothButton->setProperty("class", "AssetImporterLargerButton");
+    keepBothButton->style()->unpolish(keepBothButton);
+    keepBothButton->style()->polish(keepBothButton);
+    keepBothButton->update();
+
+    skipButton->setProperty("class", "AssetImporterButton");
+    skipButton->style()->unpolish(skipButton);
+    skipButton->style()->polish(skipButton);
+    skipButton->update();
+
+    connect(overwriteButton, &QPushButton::clicked, this, &FilesAlreadyExistDialog::DoOverwrite);
+    connect(keepBothButton, &QPushButton::clicked, this, &FilesAlreadyExistDialog::DoKeepBoth);
+    connect(skipButton, &QPushButton::clicked, this, &FilesAlreadyExistDialog::DoSkipCurrentProcess);
+}
+
+void FilesAlreadyExistDialog::UpdateMessage(QString message)
+{
+    m_ui->message->setText(message);
+}
+
+void FilesAlreadyExistDialog::DoSkipCurrentProcess()
+{
+    QDialog::accept();
+    Q_EMIT SkipCurrentProcess();
+}
+
+void FilesAlreadyExistDialog::DoOverwrite()
+{
+    QDialog::accept();
+    Q_EMIT OverWriteFiles();
+}
+
+void FilesAlreadyExistDialog::DoKeepBoth()
+{
+    QDialog::accept();
+    Q_EMIT KeepBothFiles();
+}
+
+void FilesAlreadyExistDialog::DoApplyActionToAllFiles()
+{
+    Q_EMIT ApplyActionToAllFiles(m_ui->applyToAllCheckBox->isChecked());
+}
+
+void FilesAlreadyExistDialog::UpdateCheckBoxState(int numberOfFiles)
+{
+    m_ui->applyToAllCheckBox->setVisible((numberOfFiles > 1));
+    connect(m_ui->applyToAllCheckBox, &QCheckBox::stateChanged, this, &FilesAlreadyExistDialog::DoApplyActionToAllFiles);
+}
+
+void FilesAlreadyExistDialog::closeEvent([[maybe_unused]] QCloseEvent* ev)
+{
+    QDialog::reject();
+    Q_EMIT CancelAllProcesses();
+}
+
+#include <AssetImporter/UI/moc_FilesAlreadyExistDialog.cpp>
diff --git a/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h b/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h
new file mode 100644
index 0000000000..c2cff5ec44
--- /dev/null
+++ b/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h
@@ -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
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+class QTreeView;
+
+namespace Ui {
+    class FilesAlreadyExistDialog;
+}
+
+class FilesAlreadyExistDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    FilesAlreadyExistDialog(QString message, int numberOfFiles, QWidget* parent = nullptr);
+    ~FilesAlreadyExistDialog();
+
+Q_SIGNALS:
+    void OverWriteFiles();
+    void KeepBothFiles();
+    void SkipCurrentProcess();
+    void CancelAllProcesses();
+    void ApplyActionToAllFiles(bool result);
+
+public Q_SLOTS:
+    void DoSkipCurrentProcess();
+    void DoOverwrite();
+    void DoKeepBoth();
+    void DoApplyActionToAllFiles();
+
+private:
+    void InitializeButtons();
+    void UpdateMessage(QString message);
+    void UpdateCheckBoxState(int numberOfFiles);
+    void closeEvent(QCloseEvent* ev) override;
+    QScopedPointer<Ui::FilesAlreadyExistDialog> m_ui;
+};
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui b/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui
rename to Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui
diff --git a/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp b/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp
new file mode 100644
index 0000000000..759a28179e
--- /dev/null
+++ b/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp
@@ -0,0 +1,79 @@
+/*
+ * 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 "ProcessingAssetsDialog.h"
+
+// Qt
+#include <QPushButton>
+#include <QStyle>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <AssetImporter/UI/ui_ProcessingAssetsDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+ProcessingAssetsDialog::ProcessingAssetsDialog(int numberOfProcessedFiles, QWidget* parent)
+    : QDialog(parent)
+    , m_ui(new Ui::ProcessingAssetsDialog)
+{
+    m_ui->setupUi(this);
+    UpdateTextsAndTitle(numberOfProcessedFiles);
+    InitializeButtons();
+}
+
+ProcessingAssetsDialog::~ProcessingAssetsDialog()
+{
+}
+
+void ProcessingAssetsDialog::InitializeButtons()
+{
+    QPushButton* viewStatusButton = m_ui->buttonBox->addButton(tr("View status"), QDialogButtonBox::AcceptRole);
+    QPushButton* closeButton = m_ui->buttonBox->addButton(tr("Close"), QDialogButtonBox::RejectRole);
+
+    viewStatusButton->setDefault(true);
+    viewStatusButton->setProperty("class", "AssetImporterLargerButton");
+    viewStatusButton->style()->unpolish(viewStatusButton);
+    viewStatusButton->style()->polish(viewStatusButton);
+    viewStatusButton->update();
+
+    closeButton->setProperty("class", "AssetImporterButton");
+    closeButton->style()->unpolish(closeButton);
+    closeButton->style()->polish(closeButton);
+    closeButton->update();
+
+    connect(viewStatusButton, &QPushButton::clicked, this, &ProcessingAssetsDialog::accept);
+    connect(closeButton, &QPushButton::clicked, this, &ProcessingAssetsDialog::reject); 
+}
+
+void ProcessingAssetsDialog::accept()
+{
+    Q_EMIT OpenLogDialog();
+    QDialog::accept();
+}
+
+void ProcessingAssetsDialog::reject()
+{
+    Q_EMIT CloseProcessingAssetsDialog();
+    QDialog::reject();
+}
+
+void ProcessingAssetsDialog::UpdateTextsAndTitle(int numberOfProcessedFiles)
+{
+    if (numberOfProcessedFiles > 1)
+    {
+        setWindowTitle("Processing assets");
+        m_ui->label->setText("The Asset Processor will process your assets and when they are finished they will appear in the Asset Browser. You can view the status of your assets in the Asset Processor.");
+    }
+    else
+    {
+        setWindowTitle("Processing asset");
+        m_ui->label->setText("The Asset Processor will process your asset and when it is finished it will appear in the Asset Browser. You can view the status of your asset in the Asset Processor.");
+    }   
+}
+
+#include <AssetImporter/UI/moc_ProcessingAssetsDialog.cpp>
diff --git a/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.h b/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.h
new file mode 100644
index 0000000000..5c9c0e69c1
--- /dev/null
+++ b/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.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
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui {
+    class ProcessingAssetsDialog;
+}
+
+class ProcessingAssetsDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    ProcessingAssetsDialog(int numberOfProcessedFiles, QWidget* parent = nullptr);
+    ~ProcessingAssetsDialog();
+
+    void InitializeButtons();
+
+Q_SIGNALS:
+    void CloseProcessingAssetsDialog();
+    void OpenLogDialog();
+
+public Q_SLOTS:
+    void accept();
+    void reject();
+
+private:
+    void UpdateTextsAndTitle(int numberOfProcessedFiles);
+    QScopedPointer<Ui::ProcessingAssetsDialog> m_ui;
+};
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui b/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui
rename to Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui
diff --git a/Code/Editor/AssetImporter/UI/SelectDestinationDialog.cpp b/Code/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
new file mode 100644
index 0000000000..34723a6747
--- /dev/null
+++ b/Code/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
@@ -0,0 +1,251 @@
+/*
+ * 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 "SelectDestinationDialog.h"
+
+// Qt
+#include <QValidator>
+#include <QSettings>
+#include <QStyle>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <AssetImporter/UI/ui_SelectDestinationDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+static const char* g_assetProcessorLink = "<a href=\"https://o3de.org/docs/user-guide/assets/pipeline/processor-ui/\">Asset Processor</a>";
+static const char* g_copyFilesMessage = "The original file will remain outside of the project and the %1 will not monitor the file.";
+static const char* g_moveFilesMessage = "The original file will be moved inside of the project and the %1 will monitor the file for changes.";
+static const char* g_selectDestinationFilesPath = "AssetImporter/SelectDestinationFilesPath";
+
+static const char* g_toolTipInvalidRoot = "<p style='white-space:pre'> <span style=\"color:#cccccc;\">Invalid directory. Please choose a destination directory within your game project: %1.</span> </p>";
+static const char* g_toolTipPathMustExist = "<p style='white-space:pre'> <span style=\"color:#cccccc;\">Invalid directory. Please choose a destination directory that exists.</span> </p>";
+static const char* g_toolTipPathMustBeDirectory = "<p style='white-space:pre'> <span style=\"color:#cccccc;\">Invalid directory. Please choose a valid destination directory.</span> </p>";
+static const char* g_toolTipInvalidLength = "<p style='white-space:pre'> <span style=\"color:#cccccc;\">Invalid directory name length. Please choose a destination path that has fewer than %1 characters.</span> </p>";
+
+namespace
+{
+    static QString GetAbsoluteRootDirectoryPath()
+    {
+        QDir gameRoot(Path::GetEditingGameDataFolder().c_str());
+        return gameRoot.absolutePath();
+    }
+}
+
+class DestinationDialogValidator
+    : public QValidator
+{
+public:
+    DestinationDialogValidator(QObject* parent)
+        : QValidator(parent)
+        , m_gameRootAbsolutePath(GetAbsoluteRootDirectoryPath())
+    {
+    }
+
+    State validate(QString& input, [[maybe_unused]] int& pos) const override
+    {
+        m_toolTip = "";
+
+        if (input.isEmpty())
+        {
+            return QValidator::Acceptable;
+        }
+
+        // The underlying file system code can't cope with long file paths, regardless of platform
+        if (input.length() > (AZ_MAX_PATH_LEN - 1))
+        {
+            m_toolTip = QString(g_toolTipInvalidLength).arg(AZ_MAX_PATH_LEN);
+            return QValidator::Intermediate;
+        }
+
+        QString normalizedInput = QDir::fromNativeSeparators(input);
+
+        // Note: the check for the root directory is case insensitive.
+        // We check if the directory actually exists after this, and at that point,
+        // if the file path has to be case sensitive, the directory won't exist anyways
+        // and QFileInfo::exists() will tell us so this should still work even on
+        // case sensitive file systems (such as Mac and Linux)
+        if (!normalizedInput.startsWith(m_gameRootAbsolutePath, Qt::CaseInsensitive))
+        {
+            m_toolTip = QString(g_toolTipInvalidRoot).arg(m_gameRootAbsolutePath);
+            return QValidator::Intermediate;
+        }
+
+        QFileInfo fileInfo(normalizedInput);
+        if (!fileInfo.exists())
+        {
+            m_toolTip = g_toolTipPathMustExist;
+            return QValidator::Intermediate;
+        }
+
+        if (!fileInfo.isDir())
+        {
+            m_toolTip = g_toolTipPathMustBeDirectory;
+            return QValidator::Intermediate;
+        }
+
+        return QValidator::Acceptable;
+    }
+
+    QString infoToolTip() const
+    {
+        return m_toolTip;
+    }
+
+private:
+    QString m_gameRootAbsolutePath;
+    mutable QString m_toolTip;
+};
+
+SelectDestinationDialog::SelectDestinationDialog(QString message, QWidget* parent)
+    : QDialog(parent)
+    , m_ui(new Ui::SelectDestinationDialog)
+    , m_validator(new DestinationDialogValidator(this))
+{
+    m_ui->setupUi(this);
+
+    QString radioButtonMessage = QString(g_copyFilesMessage).arg(g_assetProcessorLink);
+    m_ui->RaidoButtonMessage->setText(radioButtonMessage);
+
+    SetPreviousDestinationDirectory();
+
+    m_ui->DestinationLineEdit->setValidator(m_validator);
+    m_ui->DestinationLineEdit->setAlignment(Qt::AlignVCenter);
+
+    // Based on the current code structure, in order to prevent texts from overlapping the 
+    // invalid icon, intentionally insert an empty icon at the end of the line edit field can do the trick.
+    m_ui->DestinationLineEdit->addAction(QIcon(""), QLineEdit::TrailingPosition);
+
+    connect(m_ui->DestinationLineEdit, &QLineEdit::textChanged, this, &SelectDestinationDialog::ValidatePath);
+    connect(m_ui->BrowseButton, &QPushButton::clicked, this, &SelectDestinationDialog::OnBrowseDestinationFilePath, Qt::UniqueConnection);
+    connect(m_ui->CopyFileRadioButton, &QRadioButton::toggled, this, &SelectDestinationDialog::ShowMessage);
+
+    UpdateMessage(message);
+    InitializeButtons();
+}
+
+SelectDestinationDialog::~SelectDestinationDialog()
+{
+}
+
+void SelectDestinationDialog::InitializeButtons()
+{
+    m_ui->CopyFileRadioButton->setChecked(true);
+
+    m_ui->buttonBox->setContentsMargins(0, 0, 16, 16);
+
+    QPushButton* importButton = m_ui->buttonBox->addButton(tr("Import"), QDialogButtonBox::AcceptRole);
+    QPushButton* cancelButton = m_ui->buttonBox->addButton(QDialogButtonBox::Cancel);
+
+    importButton->setProperty("class", "Primary");
+    importButton->setDefault(true);
+
+    cancelButton->setProperty("class", "AssetImporterButton");
+    cancelButton->style()->unpolish(cancelButton);
+    cancelButton->style()->polish(cancelButton);
+    cancelButton->update();
+
+    connect(importButton, &QPushButton::clicked, this, &SelectDestinationDialog::accept);
+    connect(cancelButton, &QPushButton::clicked, this, &SelectDestinationDialog::reject);
+    connect(this, &SelectDestinationDialog::UpdateImportButtonState, importButton, &QPushButton::setEnabled);
+
+    // To make sure the import button state is up to date
+    ValidatePath();
+    importButton->setAutoDefault(true);
+
+}
+
+void SelectDestinationDialog::SetPreviousDestinationDirectory()
+{
+    QString gameRootAbsPath = GetAbsoluteRootDirectoryPath();
+    QSettings settings;
+    QString previousDestination = settings.value(g_selectDestinationFilesPath).toString();
+
+    // Case 1: if currentDestination is empty at this point, that means this is the first time
+    //         users using the Asset Importer, set the default directory to be the current game project's root folder
+    // Case 2: if the current folder directory stored in the registry doesn't exist anymore,
+    //         that means users have removed the directory already (deleted or use the Move feature).
+    // Case 3: if it's a directory outside of the game root folder, then in general,
+    //         users have modified the folder directory in the registry. It should not be happening.
+    if (previousDestination.isEmpty() || !QDir(previousDestination).exists() || !previousDestination.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
+    {
+        previousDestination = gameRootAbsPath;
+    }
+
+    m_ui->DestinationLineEdit->setText(QDir::toNativeSeparators(previousDestination));
+}
+
+void SelectDestinationDialog::accept()
+{
+    QDialog::accept();
+
+    // This prevent users from not editing the destination line edit (manually type the directory or browse for the directory)
+    Q_EMIT SetDestinationDirectory(DestinationDirectory());
+
+    if (m_ui->CopyFileRadioButton->isChecked())
+    {
+        Q_EMIT DoCopyFiles();
+    }
+    else if (m_ui->MoveFileRadioButton->isChecked())
+    {
+        Q_EMIT DoMoveFiles();
+    }
+}
+
+void SelectDestinationDialog::reject()
+{
+    Q_EMIT Cancel();
+    QDialog::reject();
+}
+
+void SelectDestinationDialog::ShowMessage()
+{
+    QString message = m_ui->CopyFileRadioButton->isChecked() ? g_copyFilesMessage : g_moveFilesMessage;
+    m_ui->RaidoButtonMessage->setText(message.arg(g_assetProcessorLink));
+}
+
+void SelectDestinationDialog::OnBrowseDestinationFilePath()
+{
+    Q_EMIT BrowseDestinationPath(m_ui->DestinationLineEdit);
+}
+
+void SelectDestinationDialog::UpdateMessage(QString message)
+{
+    m_ui->NumberOfFilesMessage->setText(message);
+}
+
+void SelectDestinationDialog::ValidatePath()
+{
+    if (!m_ui->DestinationLineEdit->hasAcceptableInput())
+    {
+        m_ui->DestinationLineEdit->setToolTip(m_validator->infoToolTip());
+        Q_EMIT UpdateImportButtonState(false);
+    }
+    else
+    {
+        QString destinationDirectory = DestinationDirectory();
+        int strLength = destinationDirectory.length();
+
+        // store the updated acceptable destination directory into the registry,
+        // so that when users manually modify the directory,
+        // the Asset Importer will remember it
+        Q_EMIT SetDestinationDirectory(destinationDirectory);
+
+        m_ui->DestinationLineEdit->setToolTip("");
+        Q_EMIT UpdateImportButtonState(strLength > 0);   
+    } 
+}
+
+QString SelectDestinationDialog::DestinationDirectory() const
+{
+    return QDir::fromNativeSeparators(m_ui->DestinationLineEdit->text());
+}
+
+#include <AssetImporter/UI/moc_SelectDestinationDialog.cpp>
+
diff --git a/Code/Editor/AssetImporter/UI/SelectDestinationDialog.h b/Code/Editor/AssetImporter/UI/SelectDestinationDialog.h
new file mode 100644
index 0000000000..119244ac55
--- /dev/null
+++ b/Code/Editor/AssetImporter/UI/SelectDestinationDialog.h
@@ -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
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzQtComponents/Components/StyledLineEdit.h>
+#include <QLabel>
+#include <QDialog>
+#include <QDialogButtonBox>
+#endif
+
+class StyledLineEdit;
+class QValidator;
+
+class DestinationDialogValidator;
+
+namespace Ui {
+    class SelectDestinationDialog;
+}
+
+class SelectDestinationDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    SelectDestinationDialog(QString message, QWidget* parent = nullptr);
+    ~SelectDestinationDialog();
+    
+Q_SIGNALS:
+    void GoBack();
+    void DoCopyFiles();
+    void DoMoveFiles();
+    void BrowseDestinationPath(QLineEdit* destinationLineEdit);
+    void Cancel();
+    void UpdateImportButtonState(bool enabled);
+    void SetDestinationDirectory(QString destinationDirectory);
+
+public Q_SLOTS:
+    void accept();
+    void reject();
+    void ShowMessage();
+    void OnBrowseDestinationFilePath();
+    void ValidatePath();
+
+private:
+    void UpdateMessage(QString message);
+    void InitializeButtons();
+    void SetPreviousDestinationDirectory();
+    QString DestinationDirectory() const;
+
+    QScopedPointer<Ui::SelectDestinationDialog> m_ui;
+    DestinationDialogValidator* m_validator;
+};
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.ui b/Code/Editor/AssetImporter/UI/SelectDestinationDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.ui
rename to Code/Editor/AssetImporter/UI/SelectDestinationDialog.ui
diff --git a/Code/Editor/AzAssetBrowser/AssetBrowserWindow.cpp b/Code/Editor/AzAssetBrowser/AssetBrowserWindow.cpp
new file mode 100644
index 0000000000..885d3583c4
--- /dev/null
+++ b/Code/Editor/AzAssetBrowser/AssetBrowserWindow.cpp
@@ -0,0 +1,72 @@
+/*
+ * 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 "AzAssetBrowserWindow.h"
+#include "AzAssetBrowser/ui_AssetBrowserWindow.h"
+
+#include <AzToolsFramework/AssetBrowser/UI/AssetTreeView.h>
+#include <AzToolsFramework/AssetBrowser/UI/SortFilterProxyModel.hxx>
+#include <AzToolsFramework/AssetBrowser/UI/AssetBrowserModel.h>
+#include <AzToolsFramework/AssetBrowser/AssetCache/AssetCacheBus.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserRequestBus.h>
+
+const char* ASSET_BROWSER_PREVIEW_NAME = "Asset Browser (PREVIEW)";
+
+AzAssetBrowserWindow::AzAssetBrowserWindow(const QString& name, QWidget* parent)
+        : QDialog(parent)
+        , m_ui(new Ui::AssetBrowserWindowClass())
+        , m_assetDatabaseSortFilterProxyModel(new AssetBrowser::UI::SortFilterProxyModel(parent))
+        , m_name(name)
+        , m_assetBrowser(new AssetBrowser::UI::AssetTreeView(name, this))
+    {
+        EBUS_EVENT_RESULT(m_assetBrowserModel, AssetBrowser::AssetCache::AssetCacheRequestsBus, GetAssetBrowserModel);
+        AZ_Assert(m_assetBrowserModel, "Failed to get filebrowser model");
+        m_assetDatabaseSortFilterProxyModel->setSourceModel(m_assetBrowserModel);
+
+        m_ui->setupUi(this);
+
+        connect(m_ui->searchCriteriaWidget,
+            &AzToolsFramework::SearchCriteriaWidget::SearchCriteriaChanged,
+            m_assetDatabaseSortFilterProxyModel.data(),
+            &AssetBrowser::UI::SortFilterProxyModel::OnSearchCriteriaChanged);
+
+        connect(m_assetBrowser, &QTreeView::customContextMenuRequested, this, &AzAssetBrowserWindow::OnContextMenu);
+    }
+
+    AzAssetBrowserWindow::~AzAssetBrowserWindow()
+    {
+        m_assetBrowser->SaveState();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    const AZ::Uuid& AzAssetBrowserWindow::GetClassID()
+    {
+        return AZ::AzTypeInfo<AzAssetBrowserWindow>::Uuid();
+    }
+
+    void AzAssetBrowserWindow::OnContextMenu(const QPoint& point)
+    {
+        (void)point;
+        //get the selected entries
+        QModelIndexList sourceIndexes;
+        for (const auto& index : m_assetBrowser->selectedIndexes())
+        {
+            sourceIndexes.push_back(m_assetDatabaseSortFilterProxyModel->mapToSource(index));
+        }
+        AZStd::vector<AssetBrowser::UI::Entry*> entries;
+        m_assetBrowserModel->SourceIndexesToAssetDatabaseEntries(sourceIndexes, entries);
+
+        if (entries.empty() || entries.size() > 1)
+        {
+            return;
+        }
+        auto entry = entries.front();
+
+        EBUS_EVENT(AssetBrowser::AssetBrowserRequestBus::Bus, OnItemContextMenu, this, entry);
+    }
+
+#include <AzAssetBrowser/moc_AzAssetBrowserWindow.cpp>
+
diff --git a/Code/Editor/AzAssetBrowser/AssetBrowserWindow.h b/Code/Editor/AzAssetBrowser/AssetBrowserWindow.h
new file mode 100644
index 0000000000..9a4b7f17ad
--- /dev/null
+++ b/Code/Editor/AzAssetBrowser/AssetBrowserWindow.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
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Math/Uuid.h>
+
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class AssetBrowserWindowClass;
+}
+
+namespace AssetBrowser
+{
+    namespace UI
+    {
+        class AssetTreeView;
+        class SortFilterProxyModel;
+        class AssetBrowserModel;
+    }
+}
+
+class AzAssetBrowserWindow
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    AZ_CLASS_ALLOCATOR(AzAssetBrowserWindow, AZ::SystemAllocator, 0);
+    AZ_TYPE_INFO(AzAssetBrowserWindow, "{20238D23-2670-44BC-9110-A51374C18B5A}");
+
+    explicit AzAssetBrowserWindow(const QString& name = "default", QWidget* parent = nullptr);
+    virtual ~AzAssetBrowserWindow();
+
+    static const AZ::Uuid& GetClassID();
+
+protected Q_SLOTS:
+    void OnContextMenu(const QPoint& point);
+
+private:
+    QScopedPointer<Ui::AssetBrowserWindowClass> m_ui;
+    QScopedPointer<AssetBrowser::UI::AssetBrowserModel> m_assetDatabaseModel;
+    QScopedPointer<AssetBrowser::UI::SortFilterProxyModel> m_assetDatabaseSortFilterProxyModel;
+    QString m_name;
+    AssetBrowser::UI::AssetTreeView* m_assetBrowser;
+    AssetBrowser::UI::AssetBrowserModel* m_assetBrowserModel;
+};
+
+extern const char* ASSET_BROWSER_PREVIEW_NAME;
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
new file mode 100644
index 0000000000..ae061e5b35
--- /dev/null
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
@@ -0,0 +1,718 @@
+
+/*
+ * 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 "AzAssetBrowserRequestHandler.h"
+
+// Qt
+#include <QMenu>
+#include <QDesktopServices>
+
+// AzCore
+#include <AzCore/std/string/wildcard.h>
+#include <AzCore/Asset/AssetManager.h>
+#include <AzCore/Asset/AssetTypeInfoBus.h>
+
+// AzFramework
+#include <AzFramework/API/ApplicationAPI.h>
+#include <AzFramework/Asset/GenericAssetHandler.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/AssetBrowser/AssetBrowserSourceDropBus.h>
+#include <AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.h>
+#include <AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h>
+#include <AzToolsFramework/AssetEditor/AssetEditorBus.h>
+#include <AzToolsFramework/Commands/EntityStateCommand.h>
+#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
+#include <AzToolsFramework/Slice/SliceUtilities.h>
+#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
+#include <AzToolsFramework/ToolsComponents/EditorLayerComponent.h>
+#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
+#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
+#include <AzToolsFramework/UI/Slice/SliceRelationshipBus.h>
+
+// AzQtComponents
+#include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
+
+// Editor
+#include "IEditor.h"
+#include "Include/IObjectManager.h"
+#include "CryEditDoc.h"
+#include "QtViewPaneManager.h"
+
+namespace AzAssetBrowserRequestHandlerPrivate
+{
+    using namespace AzToolsFramework;
+    using namespace AzToolsFramework::AssetBrowser;
+    // return true ONLY if we can handle the drop request in the viewport.
+    bool CanSpawnEntityForProduct(const ProductAssetBrowserEntry* product,
+        AZStd::optional<const AZStd::vector<AZ::Data::AssetType>> optionalProductAssetTypes = AZStd::nullopt)
+    {
+        if (!product)
+        {
+            return false;
+        }
+
+        if (product->GetAssetType() == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
+        {
+            return true; // we can always spawn slices.
+        }
+
+        bool canCreateComponent = false;
+        AZ::AssetTypeInfoBus::EventResult(canCreateComponent, product->GetAssetType(), &AZ::AssetTypeInfo::CanCreateComponent, product->GetAssetId());
+        if (!canCreateComponent)
+        {
+            return false;
+        }
+
+        AZ::Uuid componentTypeId = AZ::Uuid::CreateNull();
+        AZ::AssetTypeInfoBus::EventResult(componentTypeId, product->GetAssetType(), &AZ::AssetTypeInfo::GetComponentTypeId);
+        if (componentTypeId.IsNull())
+        {
+            // we have a component type that handles this asset.
+            return false;
+        }
+
+        if (optionalProductAssetTypes.has_value())
+        {
+            bool hasConflictingProducts = false;
+            AZ::AssetTypeInfoBus::EventResult(hasConflictingProducts, product->GetAssetType(), &AZ::AssetTypeInfo::HasConflictingProducts, optionalProductAssetTypes.value());
+            if (hasConflictingProducts)
+            {
+                return false;
+            }
+        }
+
+        // additional operations can be added here.
+
+        return true;
+    }
+
+    void SpawnEntityAtPoint(const ProductAssetBrowserEntry* product, AzQtComponents::ViewportDragContext* viewportDragContext, EntityIdList& spawnList, AzFramework::SliceInstantiationTicket& spawnTicket)
+    {
+        // Calculate the drop location.
+        if ((!viewportDragContext) || (!product))
+        {
+            return;
+        }
+
+        const AZ::Transform worldTransform = AZ::Transform::CreateTranslation(viewportDragContext->m_hitLocation);
+
+        // Handle instantiation of slices.
+        if (product->GetAssetType() == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
+        {
+            // Instantiate the slice at the specified location.
+            AZ::Data::Asset<AZ::SliceAsset> asset = AZ::Data::AssetManager::Instance().FindOrCreateAsset<AZ::SliceAsset>(product->GetAssetId(), AZ::Data::AssetLoadBehavior::Default);
+            if (asset)
+            {
+                SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(spawnTicket,
+                    &SliceEditorEntityOwnershipServiceRequests::InstantiateEditorSlice, asset, worldTransform);
+            }
+        }
+        else
+        {
+            ScopedUndoBatch undo("Create entities from asset");
+
+            //  Add the component(s).
+            AZ::Uuid componentTypeId = AZ::Uuid::CreateNull();
+            AZ::AssetTypeInfoBus::EventResult(componentTypeId, product->GetAssetType(), &AZ::AssetTypeInfo::GetComponentTypeId);
+            if (!componentTypeId.IsNull())
+            {
+                AZStd::string entityName;
+
+                // If the entity is being created from an asset, name it after said asset.
+                const AZ::Data::AssetId assetId = product->GetAssetId();
+                AZStd::string assetPath;
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetPath, &AZ::Data::AssetCatalogRequests::GetAssetPathById, assetId);
+                if (!assetPath.empty())
+                {
+                    AzFramework::StringFunc::Path::GetFileName(assetPath.c_str(), entityName);
+                }
+
+                // If not sourced from an asset, generate a generic name.
+                if (entityName.empty())
+                {
+                    entityName = AZStd::string::format("Entity%d", GetIEditor()->GetObjectManager()->GetObjectCount());
+                }
+
+                AZ::EntityId targetEntityId;
+                EditorRequests::Bus::BroadcastResult(targetEntityId, &EditorRequests::CreateNewEntityAtPosition, worldTransform.GetTranslation(), AZ::EntityId());
+
+                AZ::Entity* newEntity = nullptr;
+                AZ::ComponentApplicationBus::BroadcastResult(newEntity, &AZ::ComponentApplicationRequests::FindEntity, targetEntityId);
+
+                if (newEntity == nullptr)
+                {
+                    return;
+                }
+
+                newEntity->SetName(entityName);
+
+                newEntity->Deactivate();
+
+                // Create component.
+                AZ::Component* newComponent = newEntity->CreateComponent(componentTypeId);
+                // If it's not an "editor component" then wrap it in a GenericComponentWrapper.
+                bool needsGenericWrapper = azrtti_cast<AzToolsFramework::Components::EditorComponentBase*>(newComponent) == nullptr;
+                if (needsGenericWrapper)
+                {
+                    newEntity->RemoveComponent(newComponent);
+                    newComponent = aznew AzToolsFramework::Components::GenericComponentWrapper(newComponent);
+                    newEntity->AddComponent(newComponent);
+                }
+
+                newEntity->Activate();
+
+                // set asset after components have been activated in AddEditorEntity method
+                if (newComponent)
+                {
+                    Components::EditorComponentBase* asEditorComponent =
+                        azrtti_cast<Components::EditorComponentBase*>(newComponent);
+
+                    if (asEditorComponent)
+                    {
+                        asEditorComponent->SetPrimaryAsset(assetId);
+                    }
+                }
+
+                bool isPrefabSystemEnabled = false;
+                AzFramework::ApplicationRequests::Bus::BroadcastResult(
+                    isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+                if (!isPrefabSystemEnabled)
+                {
+                    // Prepare undo command last so it captures the final state of the entity.
+                    EntityCreateCommand* command = aznew EntityCreateCommand(static_cast<AZ::u64>(newEntity->GetId()));
+                    command->Capture(newEntity);
+                    command->SetParent(undo.GetUndoBatch());
+                }
+
+                ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::AddDirtyEntity, newEntity->GetId());
+                spawnList.push_back(newEntity->GetId());
+            }
+        }
+    }
+
+    // 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()
+{
+    using namespace AzToolsFramework::AssetBrowser;
+
+    AssetBrowserInteractionNotificationBus::Handler::BusConnect();
+    AzQtComponents::DragAndDropEventsBus::Handler::BusConnect(AzQtComponents::DragAndDropContexts::EditorViewport);
+}
+
+AzAssetBrowserRequestHandler::~AzAssetBrowserRequestHandler()
+{
+    AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
+    AzQtComponents::DragAndDropEventsBus::Handler::BusDisconnect();
+}
+
+void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu* menu, const AZStd::vector<AzToolsFramework::AssetBrowser::AssetBrowserEntry*>& entries)
+{
+    using namespace AzToolsFramework::AssetBrowser;
+
+    AssetBrowserEntry* entry = entries.empty() ? nullptr : entries.front();
+    if (!entry)
+    {
+        return;
+    }
+
+    AZStd::string fullFileDirectory;
+    AZStd::string fullFilePath;
+    AZStd::string fileName;
+    AZStd::string extension;
+
+    switch (entry->GetEntryType())
+    {
+    case AssetBrowserEntry::AssetEntryType::Product:
+        // if its a product, we actually want to perform these operations on the source
+        // which will be the parent of the product.
+        entry = entry->GetParent();
+        if ((!entry) || (entry->GetEntryType() != AssetBrowserEntry::AssetEntryType::Source))
+        {
+            AZ_Assert(false, "Asset Browser entry product has a non-source parent?");
+            break;     // no valid parent.
+        }
+    // the fall through to the next case is intentional here.
+    case AssetBrowserEntry::AssetEntryType::Source:
+    {
+        AZ::Uuid sourceID = azrtti_cast<SourceAssetBrowserEntry*>(entry)->GetSourceUuid();
+        fullFilePath = entry->GetFullPath();
+        fullFileDirectory = fullFilePath.substr(0, fullFilePath.find_last_of(AZ_CORRECT_DATABASE_SEPARATOR));
+        fileName = entry->GetName();
+        AzFramework::StringFunc::Path::GetExtension(fullFilePath.c_str(), extension);
+
+        // Add the "Open" menu item.
+        // Note that source file openers are allowed to "veto" the showing of the "Open" menu if it is 100% known that they aren't openable!
+        // for example, custom data formats that are made by Open 3D Engine that can not have a program associated in the operating system to view them.
+        // If the only opener that can open that file has no m_opener, then it is not openable.
+        SourceFileOpenerList openers;
+        AssetBrowserInteractionNotificationBus::Broadcast(&AssetBrowserInteractionNotificationBus::Events::AddSourceFileOpeners, fullFilePath.c_str(), sourceID, openers);
+        bool validOpenersFound = false;
+        bool vetoOpenerFound = false;
+        for (const SourceFileOpenerDetails& openerDetails : openers)
+        {
+            if (openerDetails.m_opener) 
+            {
+                // we found a valid opener (non-null).  This means that the system is saying that it knows how to internally
+                // edit this source file and has a custom editor for it.
+                validOpenersFound = true;
+            }
+            else
+            {
+                // if we get here it means someone intentionally registered a callback with a null function pointer
+                // the API treats this as a 'veto' opener - meaning that the system wants us NOT to allow the operating system
+                // to open this source file as a default fallback.
+                vetoOpenerFound = true;
+            }
+        }
+
+        if (validOpenersFound)
+        {
+            // if we get here then there is an opener installed for this kind of asset
+            // and it is not null, meaning that it is not vetoing our ability to open the file.
+            for (const SourceFileOpenerDetails& openerDetails : openers)
+            {
+                // bind that function to the current loop element.
+                if (openerDetails.m_opener) // only VALID openers with an actual callback.
+                {
+                    menu->addAction(openerDetails.m_iconToUse, QObject::tr(openerDetails.m_displayText.c_str()), [sourceID, fullFilePath, openerDetails]()
+                    {
+                        openerDetails.m_opener(fullFilePath.c_str(), sourceID);
+                    });
+                }
+            }
+        }
+        
+        // we always add the default "open with your operating system" unless a veto opener is found
+        if (!vetoOpenerFound)
+        {
+            // if we found no valid openers and no veto openers then just allow it to be opened with the operating system itself.
+            menu->addAction(QObject::tr("Open with associated application..."), [this, fullFilePath]()
+            {
+                OpenWithOS(fullFilePath);
+            });
+        }
+
+        AZStd::vector<const ProductAssetBrowserEntry*> products;
+        entry->GetChildrenRecursively<ProductAssetBrowserEntry>(products);
+
+        // slice source files need to react by adding additional menu items, regardless of status of compile or presence of products.
+        if (AzFramework::StringFunc::Equal(extension.c_str(), AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str(), false))
+        {
+            AzToolsFramework::SliceUtilities::CreateSliceAssetContextMenu(menu, fullFilePath);
+
+            // SliceUtilities is in AZToolsFramework and can't open viewports, so add the relationship view open command here.
+            if (!products.empty())
+            {
+                const ProductAssetBrowserEntry* productEntry = products[0];
+                menu->addAction("Open in Slice Relationship View", [productEntry]()
+                {
+                    QtViewPaneManager::instance()->OpenPane(LyViewPane::SliceRelationships);
+
+                    const ProductAssetBrowserEntry* product = azrtti_cast<const ProductAssetBrowserEntry*>(productEntry);
+
+                    AzToolsFramework::SliceRelationshipRequestBus::Broadcast(&AzToolsFramework::SliceRelationshipRequests::OnSliceRelationshipViewRequested, product->GetAssetId());
+                });
+            }
+        }
+        else if (AzFramework::StringFunc::Equal(extension.c_str(), AzToolsFramework::Layers::EditorLayerComponent::GetLayerExtensionWithDot().c_str(), false))
+        {
+            QString levelPath = Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName());
+            AzToolsFramework::Layers::EditorLayerComponent::CreateLayerAssetContextMenu(menu, fullFilePath, levelPath);
+        }
+
+        if (products.empty())
+        {
+            if (entry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Source)
+            {
+                CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
+            }
+            return;
+        }
+      
+        CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
+    }
+    break;
+    case AssetBrowserEntry::AssetEntryType::Folder:
+    {
+        fullFileDirectory = entry->GetFullPath();
+        // we are sending an empty filename to indicate that it is a folder and not a file
+        CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
+    }
+    break;
+    default:
+        break;
+    }
+}
+
+bool AzAssetBrowserRequestHandler::CanAcceptDragAndDropEvent(
+    QDropEvent* event,
+    AzQtComponents::DragAndDropContextBase& context,
+    AZStd::optional<AZStd::vector<const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry*>*> outSources,
+    AZStd::optional<AZStd::vector<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>*> outProducts
+) const
+{
+    using namespace AzQtComponents;
+    using namespace AzToolsFramework;
+    using namespace AzToolsFramework::AssetBrowser;
+    using namespace AzAssetBrowserRequestHandlerPrivate;
+
+    // if a listener with a higher priority already claimed this event, do not touch it.
+    ViewportDragContext* viewportDragContext = azrtti_cast<ViewportDragContext*>(&context);
+    if ((!event) || (!event->mimeData()) || (event->isAccepted()) || (!viewportDragContext))
+    {
+        return false;
+    }
+
+    bool canAcceptEvent = false;
+
+    // Detects Source Asset Entries whose extensions are handled by a system
+    AzToolsFramework::AssetBrowser::AssetBrowserEntry::ForEachEntryInMimeData<SourceAssetBrowserEntry>(
+        event->mimeData(), [&](const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry* source) {
+            if (AssetBrowser::AssetBrowserSourceDropBus::HasHandlers(source->GetExtension()))
+            {
+                if (outSources.has_value())
+                {
+                    outSources.value()->push_back(source);
+                }
+                canAcceptEvent = true;
+            }
+        });
+
+    // Detects Product Assets that are dragged directly, or child Products of other entry types.
+    AzToolsFramework::AssetBrowser::AssetBrowserEntry::ForEachEntryInMimeData<ProductAssetBrowserEntry>(
+        event->mimeData(), [&](const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* product)
+    {
+        // Skip if this product is a child of a source file that is handled
+        if (outSources.has_value() && !outSources.value()->empty())
+        {
+            auto parent = azrtti_cast<const SourceAssetBrowserEntry*>(product->GetParent());
+            if (parent != nullptr && AZStd::find(outSources.value()->begin(), outSources.value()->end(), parent) != outSources.value()->end())
+            {
+                return;
+            }
+        }
+
+        if (CanSpawnEntityForProduct(product))
+        {
+            if (outProducts.has_value())
+            {
+                outProducts.value()->push_back(product);
+            }
+            canAcceptEvent = true;
+        }
+    });
+
+    return canAcceptEvent;
+}
+
+void AzAssetBrowserRequestHandler::DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context)
+{
+    if (CanAcceptDragAndDropEvent(event, context))
+    {
+        event->setDropAction(Qt::CopyAction);
+        event->setAccepted(true);
+    }
+}
+
+void AzAssetBrowserRequestHandler::DragMove(QDragMoveEvent* event, AzQtComponents::DragAndDropContextBase& context)
+{
+    if (CanAcceptDragAndDropEvent(event, context))
+    {
+        event->setDropAction(Qt::CopyAction);
+        event->setAccepted(true);
+    }
+}
+
+void AzAssetBrowserRequestHandler::DragLeave(QDragLeaveEvent* /*event*/)
+{
+    // opportunities to show ghosted entities or previews here.
+}
+
+void AzAssetBrowserRequestHandler::Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context)
+{
+    using namespace AzToolsFramework;
+    using namespace AzToolsFramework::AssetBrowser;
+    using namespace AzQtComponents;
+    using namespace AzAssetBrowserRequestHandlerPrivate;
+
+    AZStd::vector<const SourceAssetBrowserEntry*> sources;
+    AZStd::vector<const ProductAssetBrowserEntry*> products;
+
+    if (!CanAcceptDragAndDropEvent(event, context, &sources, &products))
+    {
+        // ALWAYS CHECK - you are not the only one connected to this bus, and someone else may have already
+        // handled the event or accepted the drop - it might not contain types relevant to you.
+        // you still get informed about the drop event in case you did some stuff in your gui and need to clean it up.
+        return;
+    }
+
+    //  we wouldn't reach this code if the following cast is null or the event was null or accepted was already true.
+    ViewportDragContext* viewportDragContext = azrtti_cast<ViewportDragContext*>(&context);
+
+    event->setDropAction(Qt::CopyAction);
+    event->setAccepted(true);
+
+    EntityIdList spawnedEntities;
+    AzFramework::SliceInstantiationTicket spawnTicket;
+
+    // Make a scoped undo that covers the ENTIRE operation.
+    ScopedUndoBatch undo("Create entities from asset");
+
+    // Handle sources
+    for (const SourceAssetBrowserEntry* source : sources)
+    {
+        AssetBrowser::AssetBrowserSourceDropBus::Event(
+            source->GetExtension(),
+            &AssetBrowser::AssetBrowserSourceDropEvents::HandleSourceFileType,
+            source->GetFullPath(),
+            AZ::EntityId(),
+            viewportDragContext->m_hitLocation
+        );
+    }
+
+    // Handle products
+    AZStd::vector<AZ::Data::AssetType> productAssetTypes;
+    productAssetTypes.reserve(products.size());
+    for (const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* entry : products)
+    {
+        productAssetTypes.emplace_back(entry->GetAssetType());
+    }
+
+    for (const ProductAssetBrowserEntry* product : products)
+    {
+        if (CanSpawnEntityForProduct(product, productAssetTypes))
+        {
+            SpawnEntityAtPoint(product, viewportDragContext, spawnedEntities, spawnTicket);
+        }
+    }
+
+    // Select the new entity (and deselect others).
+    if (!spawnedEntities.empty())
+    {
+        ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, spawnedEntities);
+    }
+}
+
+void AzAssetBrowserRequestHandler::AddSourceFileOpeners(const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers)
+{
+    using namespace AzToolsFramework;
+
+    //Get asset group to support a variety of file extensions
+    const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry* fullDetails =
+        AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry::GetSourceByUuid(sourceUUID);
+    if (!fullDetails)
+    {
+        return;
+    }
+    QString assetGroup;
+    AZ::AssetTypeInfoBus::EventResult(assetGroup, fullDetails->GetPrimaryAssetType(), &AZ::AssetTypeInfo::GetGroup);
+
+    if (AZStd::wildcard_match("*.lua", fullSourceFileName))
+    {
+        AZStd::string fullName(fullSourceFileName);
+        // LUA files can be opened with the O3DE LUA editor.
+        openers.push_back(
+            {
+                "O3DE_LUA_Editor",
+                "Open in Open 3D Engine LUA Editor...",
+                QIcon(),
+                [](const char* fullSourceFileNameInCallback, const AZ::Uuid& /*sourceUUID*/)
+                {
+                    // we know how to handle LUA files (open with the lua Editor.
+                    EditorRequestBus::Broadcast(&EditorRequests::LaunchLuaEditor, fullSourceFileNameInCallback);
+                }
+            });
+    }
+
+    if (!openers.empty())
+    {
+        return; // we found one
+    }
+    
+    // if we still havent found one, check to see if it is a default "generic" serializable asset
+    // and open the asset editor if so. Check whether the Generic Asset handler handles this kind of asset.
+    // to do so we need the actual type of that asset, which requires an asset type, not a source type.
+    AZ::Data::AssetManager& manager = AZ::Data::AssetManager::Instance();
+
+    // find a product type to query against.
+    AZStd::vector<const AssetBrowser::ProductAssetBrowserEntry*> candidates;
+    fullDetails->GetChildrenRecursively<AssetBrowser::ProductAssetBrowserEntry>(candidates);
+
+    // find the first one that is handled by something:
+    for (const AssetBrowser::ProductAssetBrowserEntry* productEntry : candidates)
+    {
+        // is there a Generic Asset Handler for it?
+        AZ::Data::AssetType productAssetType = productEntry->GetAssetType();
+        if ((productAssetType == AZ::Data::s_invalidAssetType) || (!productEntry->GetAssetId().IsValid()))
+        {
+            continue;
+        }
+
+        if (const AZ::Data::AssetHandler* assetHandler = manager.GetHandler(productAssetType))
+        {
+            if (!azrtti_istypeof<AzFramework::GenericAssetHandlerBase*>(assetHandler))
+            {
+                // it is not the generic asset handler.
+                continue;
+            }
+            
+            // yes, it is the generic asset handler, so install an opener that sends it to the Asset Editor.
+
+            AZ::Data::AssetId assetId = productEntry->GetAssetId();
+            AZ::Data::AssetType assetType = productEntry->GetAssetType();
+
+            openers.push_back(
+            {
+                "Open_In_Asset_Editor",
+                "Open in Asset Editor...",
+                QIcon(),
+                [assetId, assetType](const char* /*fullSourceFileNameInCallback*/, const AZ::Uuid& /*sourceUUID*/)
+            {
+                AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::AssetManager::Instance().FindOrCreateAsset(assetId, assetType, AZ::Data::AssetLoadBehavior::Default);
+                AzToolsFramework::AssetEditor::AssetEditorRequestsBus::Broadcast(&AzToolsFramework::AssetEditor::AssetEditorRequests::OpenAssetEditor, asset);
+            }
+            });
+            break; // no need to proceed further
+        }
+    }
+}
+
+void AzAssetBrowserRequestHandler::OpenAssetInAssociatedEditor(const AZ::Data::AssetId& assetId, bool& alreadyHandled)
+{
+    using namespace AzToolsFramework::AssetBrowser;
+    if (alreadyHandled)
+    {
+        // a higher priority listener has already taken this request.
+        return;
+    }
+    const SourceAssetBrowserEntry* source = SourceAssetBrowserEntry::GetSourceByUuid(assetId.m_guid);
+    if (!source)
+    {
+        return;
+    }
+
+    AZStd::string fullEntryPath = source->GetFullPath();
+    AZ::Uuid sourceID = source->GetSourceUuid();
+
+    if (fullEntryPath.empty())
+    {
+        return;
+    }
+
+    QWidget* mainWindow = nullptr;
+    AzToolsFramework::EditorRequestBus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::GetMainWindow);
+
+    SourceFileOpenerList openers;
+    AssetBrowserInteractionNotificationBus::Broadcast(&AssetBrowserInteractionNotificationBus::Events::AddSourceFileOpeners, fullEntryPath.c_str(), sourceID, openers);
+
+    // did anyone actually accept it?
+    if (!openers.empty())
+    {
+        // yes, call the opener and return.
+
+        // are there more than one opener(s)?
+        const SourceFileOpenerDetails* openerToUse = nullptr;
+        // a function which reassigns openerToUse to be the selected one.
+        AZStd::function<void(const SourceFileOpenerDetails*)> switchToOpener = [&openerToUse](const SourceFileOpenerDetails* switchTo)
+            {
+                openerToUse = switchTo;
+            };
+
+        // callers are allowed to add nullptr to openers.  So we only evaluate the valid ones.
+        // and if there is only one valid one, we use that one.
+        const SourceFileOpenerDetails* firstValidOpener = nullptr;
+        int numValidOpeners = 0;
+        QMenu menu(mainWindow);
+        for (const SourceFileOpenerDetails& openerDetails : openers)
+        {
+            // bind that function to the current loop element.
+            if (openerDetails.m_opener) // only VALID openers with an actual callback.
+            {
+                ++numValidOpeners;
+                if (!firstValidOpener)
+                {
+                    firstValidOpener = &openerDetails;
+                }
+                // bind a callback such that when the menu item is clicked, it sets that as the opener to use.
+                menu.addAction(openerDetails.m_iconToUse, QObject::tr(openerDetails.m_displayText.c_str()), mainWindow, AZStd::bind(switchToOpener, &openerDetails));
+            }
+        }
+
+        if (numValidOpeners > 1) // more than one option was added
+        {
+            menu.addSeparator();
+            menu.addAction(QObject::tr("Cancel"), AZStd::bind(switchToOpener, nullptr)); // just something to click on to avoid doing anything.
+            menu.exec(QCursor::pos());
+        }
+        else if (numValidOpeners == 1)
+        {
+            openerToUse = firstValidOpener;
+        }
+
+        // did we select one and did it have a function to call?
+        if ((openerToUse) && (openerToUse->m_opener))
+        {
+            openerToUse->m_opener(fullEntryPath.c_str(), sourceID);
+        }
+        alreadyHandled = true;
+        return; // an opener handled this, no need to proceed further.
+    }
+
+    // if we get here, nothing handled it, so try the operating system.
+    alreadyHandled = OpenWithOS(fullEntryPath);
+}
+
+bool AzAssetBrowserRequestHandler::OpenWithOS(const AZStd::string& fullEntryPath)
+{
+    bool openedSuccessfully = QDesktopServices::openUrl(QUrl::fromLocalFile(QString::fromUtf8(fullEntryPath.c_str())));
+    if (!openedSuccessfully)
+    {
+        AZ_Printf("Asset Browser", "Unable to open '%s' using the operating system.  There might be no editor associated with this kind of file.\n", fullEntryPath.c_str());
+    }
+
+    return openedSuccessfully;
+}
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h
new file mode 100644
index 0000000000..59507483bc
--- /dev/null
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzQtComponents/Buses/DragAndDrop.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
+#include <AzToolsFramework/AssetBrowser/Previewer/PreviewerBus.h>
+
+namespace AZ
+{
+    class Entity;
+}
+
+namespace AzQtComponents
+{
+    class DragAndDropContextBase;
+}
+
+namespace AzToolsFramework
+{
+    namespace AssetBrowser
+    {
+        class AssetBrowserEntry;
+        class PreviewerFactory;
+        class ProductAssetBrowserEntry;
+        class SourceAssetBrowserEntry;
+    }
+}
+
+class AzAssetBrowserRequestHandler
+    : protected AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
+    , protected AzQtComponents::DragAndDropEventsBus::Handler
+{
+public:
+    AzAssetBrowserRequestHandler();
+    ~AzAssetBrowserRequestHandler() override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // AssetBrowserInteractionNotificationBus
+    //////////////////////////////////////////////////////////////////////////
+    void AddContextMenuActions(QWidget* caller, QMenu* menu, const AZStd::vector<AzToolsFramework::AssetBrowser::AssetBrowserEntry*>& entries) override;
+    void AddSourceFileOpeners(const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers) override;
+    void OpenAssetInAssociatedEditor(const AZ::Data::AssetId& assetId, bool& alreadyHandled) override;
+
+    static bool OpenWithOS(const AZStd::string& fullEntryPath);
+protected:
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzQtComponents::DragAndDropEventsBus::Handler
+    //////////////////////////////////////////////////////////////////////////
+    void DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
+    void DragMove(QDragMoveEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
+    void DragLeave(QDragLeaveEvent* event) override;
+    void Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
+
+    bool CanAcceptDragAndDropEvent(
+        QDropEvent* event, AzQtComponents::DragAndDropContextBase& context,
+        AZStd::optional<AZStd::vector<const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry*>*> outSources = AZStd::nullopt,
+        AZStd::optional<AZStd::vector<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>*> outProducts = AZStd::nullopt) const;
+};
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
new file mode 100644
index 0000000000..a75780bda7
--- /dev/null
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
@@ -0,0 +1,289 @@
+/*
+ * 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 "AzAssetBrowserWindow.h"
+
+// AzToolsFramework
+#include <AzCore/Console/IConsole.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/ViewPaneOptions.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserModel.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserTableModel.h>
+
+// AzQtComponents
+#include <AzQtComponents/Utilities/QtWindowUtilities.h>
+
+// Editor
+#include "AzAssetBrowser/AzAssetBrowserRequestHandler.h"
+#include "LyViewPaneNames.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <AzAssetBrowser/ui_AzAssetBrowserWindow.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+AZ_CVAR_EXTERNED(bool, ed_useNewAssetBrowserTableView);
+
+class ListenerForShowAssetEditorEvent
+    : public QObject
+    , private AzToolsFramework::EditorEvents::Bus::Handler
+{
+public:
+    ListenerForShowAssetEditorEvent(QObject* parent = nullptr)
+        : QObject(parent)
+    {
+        AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
+    }
+
+    ~ListenerForShowAssetEditorEvent()
+    {
+        AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
+    }
+
+    void SelectAsset(const QString& assetPath) override
+    {
+        AzToolsFramework::OpenViewPane(LyViewPane::AssetBrowser);
+
+        AzAssetBrowserWindow* assetBrowser = AzToolsFramework::GetViewPaneWidget<AzAssetBrowserWindow>(LyViewPane::AssetBrowser);
+        if (assetBrowser)
+        {
+            AzQtComponents::bringWindowToTop(assetBrowser);
+
+            assetBrowser->SelectAsset(assetPath);
+        }
+    }
+};
+
+AzAssetBrowserWindow::AzAssetBrowserWindow(QWidget* parent)
+    : QWidget(parent)
+    , m_ui(new Ui::AzAssetBrowserWindowClass())
+    , m_filterModel(new AzToolsFramework::AssetBrowser::AssetBrowserFilterModel(parent))
+    , m_tableModel(new AzToolsFramework::AssetBrowser::AssetBrowserTableModel(parent))
+{
+    m_ui->setupUi(this);
+    m_ui->m_searchWidget->Setup(true, true);
+
+    namespace AzAssetBrowser = AzToolsFramework::AssetBrowser;
+
+    AzAssetBrowser::AssetBrowserComponentRequestBus::BroadcastResult(m_assetBrowserModel, &AzAssetBrowser::AssetBrowserComponentRequests::GetAssetBrowserModel);
+    AZ_Assert(m_assetBrowserModel, "Failed to get filebrowser model");
+    m_filterModel->setSourceModel(m_assetBrowserModel);
+    m_filterModel->SetFilter(m_ui->m_searchWidget->GetFilter());
+
+    m_ui->m_viewSwitcherCheckBox->setVisible(false);
+    m_ui->m_assetBrowserTableViewWidget->setVisible(false);
+    if (ed_useNewAssetBrowserTableView)
+    {
+        m_ui->m_viewSwitcherCheckBox->setVisible(true);
+        m_tableModel->setFilterRole(Qt::DisplayRole);
+        m_tableModel->setSourceModel(m_filterModel.data());
+        m_ui->m_assetBrowserTableViewWidget->setModel(m_tableModel.data());
+        connect(
+            m_filterModel.data(), &AzAssetBrowser::AssetBrowserFilterModel::filterChanged, this,
+            [this]()
+            {
+                if (!m_ui->m_searchWidget->GetFilterString().isEmpty())
+                {
+                    m_tableModel->UpdateTableModelMaps();
+                }
+            });
+        connect(
+            m_ui->m_assetBrowserTableViewWidget, &AzAssetBrowser::AssetBrowserTableView::selectionChangedSignal, this,
+            &AzAssetBrowserWindow::SelectionChangedSlot);
+        connect(
+            m_ui->m_assetBrowserTableViewWidget, &QAbstractItemView::doubleClicked, this,
+            &AzAssetBrowserWindow::DoubleClickedItem);
+        connect(
+            m_ui->m_assetBrowserTableViewWidget, &AzAssetBrowser::AssetBrowserTableView::ClearStringFilter, m_ui->m_searchWidget,
+            &AzAssetBrowser::SearchWidget::ClearStringFilter);
+        connect(
+            m_ui->m_assetBrowserTableViewWidget, &AzAssetBrowser::AssetBrowserTableView::ClearTypeFilter, m_ui->m_searchWidget,
+            &AzAssetBrowser::SearchWidget::ClearTypeFilter);
+
+        m_ui->m_assetBrowserTableViewWidget->SetName("AssetBrowserTableView_main");
+
+        connect(
+            m_filterModel.data(), &AzAssetBrowser::AssetBrowserFilterModel::filterChanged, this,
+            [this]()
+            {
+                const bool hasFilter = !m_ui->m_searchWidget->GetFilterString().isEmpty();
+                m_ui->m_assetBrowserTableViewWidget->setVisible(hasFilter);
+                m_ui->m_assetBrowserTreeViewWidget->setVisible(!hasFilter);
+            });
+        connect(
+            m_ui->m_viewSwitcherCheckBox, &QCheckBox::stateChanged, this,
+            [this](bool visible)
+            {
+                m_ui->m_assetBrowserTableViewWidget->setVisible(visible);
+                m_ui->m_assetBrowserTreeViewWidget->setVisible(!visible);
+            });
+    }
+
+    m_ui->m_assetBrowserTreeViewWidget->setModel(m_filterModel.data());
+
+    connect(
+        m_ui->m_searchWidget->GetFilter().data(), &AzAssetBrowser::AssetBrowserEntryFilter::updatedSignal, m_filterModel.data(),
+        &AzAssetBrowser::AssetBrowserFilterModel::filterUpdatedSlot);
+    connect(
+        m_filterModel.data(), &AzAssetBrowser::AssetBrowserFilterModel::filterChanged, this,
+        [this]()
+        {
+            const bool hasFilter = !m_ui->m_searchWidget->GetFilterString().isEmpty();
+            const bool selectFirstFilteredIndex = false;
+            m_ui->m_assetBrowserTreeViewWidget->UpdateAfterFilter(hasFilter, selectFirstFilteredIndex);
+        });
+
+    connect(
+        m_ui->m_assetBrowserTreeViewWidget, &AzAssetBrowser::AssetBrowserTreeView::selectionChangedSignal, this,
+        &AzAssetBrowserWindow::SelectionChangedSlot);
+
+    connect(m_ui->m_assetBrowserTreeViewWidget, &QAbstractItemView::doubleClicked, this, &AzAssetBrowserWindow::DoubleClickedItem);
+
+    connect(
+        m_ui->m_assetBrowserTreeViewWidget, &AzAssetBrowser::AssetBrowserTreeView::ClearStringFilter, m_ui->m_searchWidget,
+        &AzAssetBrowser::SearchWidget::ClearStringFilter);
+    connect(
+        m_ui->m_assetBrowserTreeViewWidget, &AzAssetBrowser::AssetBrowserTreeView::ClearTypeFilter, m_ui->m_searchWidget,
+        &AzAssetBrowser::SearchWidget::ClearTypeFilter);
+
+    m_ui->m_assetBrowserTreeViewWidget->SetName("AssetBrowserTreeView_main");
+}
+
+AzAssetBrowserWindow::~AzAssetBrowserWindow()
+{
+    m_ui->m_assetBrowserTreeViewWidget->SaveState();
+}
+
+void AzAssetBrowserWindow::RegisterViewClass()
+{
+    AzToolsFramework::ViewPaneOptions options;
+    options.preferedDockingArea = Qt::LeftDockWidgetArea;
+    AzToolsFramework::RegisterViewPane<AzAssetBrowserWindow>(LyViewPane::AssetBrowser, LyViewPane::CategoryTools, options);
+}
+
+QObject* AzAssetBrowserWindow::createListenerForShowAssetEditorEvent(QObject* parent)
+{
+    auto* listener = new ListenerForShowAssetEditorEvent(parent);
+
+    // the listener is attached to the parent and will get cleaned up then
+    return listener;
+}
+
+void AzAssetBrowserWindow::UpdatePreview() const
+{
+    const auto& selectedAssets = m_ui->m_assetBrowserTreeViewWidget->isVisible()
+        ? m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets()
+        : m_ui->m_assetBrowserTableViewWidget->GetSelectedAssets();
+
+    if (selectedAssets.size() != 1)
+    {
+        m_ui->m_previewerFrame->Clear();
+        return;
+    }
+
+    m_ui->m_previewerFrame->Display(selectedAssets.front());
+}
+
+static void ExpandTreeToIndex(QTreeView* treeView, const QModelIndex& index)
+{
+    treeView->collapseAll();
+
+    // Note that we deliberately don't expand the index passed in
+
+    // collapseAll above will close all but the top level nodes.
+    // treeView->expand(index) marks a node as expanded, but if it's parent isn't expanded,
+    // there won't be any paint updates because it doesn't expand parent nodes.
+    // So, to minimize paint updates, we expand everything in reverse order (leaf up to root), so that
+    // painting will only actually occur once the top level parent is expanded.
+    QModelIndex parentIndex = index.parent();
+    while (parentIndex.isValid())
+    {
+        treeView->expand(parentIndex);
+        parentIndex = parentIndex.parent();
+    }
+}
+
+void AzAssetBrowserWindow::SelectAsset(const QString& assetPath)
+{
+    QModelIndex index = m_assetBrowserModel->findIndex(assetPath);
+    if (index.isValid())
+    {
+        m_ui->m_searchWidget->ClearTextFilter();
+        m_ui->m_searchWidget->ClearTypeFilter();
+
+        // Queue the expand and select stuff, so that it doesn't get processed the same
+        // update as the search widget clearing - something with the search widget clearing
+        // interferes with the update from the select and expand, and if you don't
+        // queue it, the tree doesn't expand reliably.
+
+        QTimer::singleShot(
+            0, this,
+            [this, filteredIndex = index]
+            {
+                // the treeview has a filter model so we have to backwards go from that
+                QModelIndex index = m_filterModel->mapFromSource(filteredIndex);
+
+                QTreeView* treeView = m_ui->m_assetBrowserTreeViewWidget;
+                ExpandTreeToIndex(treeView, index);
+
+                treeView->scrollTo(index);
+                treeView->setCurrentIndex(index);
+
+                treeView->selectionModel()->select(index, QItemSelectionModel::ClearAndSelect);
+            });
+    }
+}
+
+void AzAssetBrowserWindow::SelectionChangedSlot(const QItemSelection& /*selected*/, const QItemSelection& /*deselected*/) const
+{
+    UpdatePreview();
+}
+
+// while its tempting to use Activated here, we dont actually want it to count as activation
+// just becuase on some OS clicking once is activation.
+void AzAssetBrowserWindow::DoubleClickedItem([[maybe_unused]] const QModelIndex& element)
+{
+    namespace AzAssetBrowser = AzToolsFramework::AssetBrowser;
+    
+    const auto& selectedAssets = m_ui->m_assetBrowserTreeViewWidget->isVisible()
+        ? m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets()
+        : m_ui->m_assetBrowserTableViewWidget->GetSelectedAssets();
+
+    for (const AzAssetBrowser::AssetBrowserEntry* entry : selectedAssets)
+    {
+        AZ::Data::AssetId assetIdToOpen;
+        AZStd::string fullFilePath;
+
+        if (const AzAssetBrowser::ProductAssetBrowserEntry* productEntry = azrtti_cast<const AzAssetBrowser::ProductAssetBrowserEntry*>(entry))
+        {
+            assetIdToOpen = productEntry->GetAssetId();
+            fullFilePath = entry->GetFullPath();
+        }
+        else if (const AzAssetBrowser::SourceAssetBrowserEntry* sourceEntry = azrtti_cast<const AzAssetBrowser::SourceAssetBrowserEntry*>(entry))
+        {
+            // manufacture an empty AssetID with the source's UUID
+            assetIdToOpen = AZ::Data::AssetId(sourceEntry->GetSourceUuid(), 0);
+            fullFilePath = entry->GetFullPath();
+        }
+
+        bool handledBySomeone = false;
+        if (assetIdToOpen.IsValid())
+        {
+            AzAssetBrowser::AssetBrowserInteractionNotificationBus::Broadcast(
+                &AzAssetBrowser::AssetBrowserInteractionNotifications::OpenAssetInAssociatedEditor, assetIdToOpen, handledBySomeone);
+        }
+
+        if (!handledBySomeone && !fullFilePath.empty())
+        {
+            AzAssetBrowserRequestHandler::OpenWithOS(fullFilePath);
+        }
+    }
+}
+
+#include <AzAssetBrowser/moc_AzAssetBrowserWindow.cpp>
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.h b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
new file mode 100644
index 0000000000..84691bc30e
--- /dev/null
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.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
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/Memory/SystemAllocator.h>
+
+#include <QWidget>
+#endif
+
+class QItemSelection;
+
+namespace Ui
+{
+    class AzAssetBrowserWindowClass;
+}
+
+namespace AzToolsFramework
+{
+    namespace AssetBrowser
+    {
+        class AssetBrowserFilterModel;
+        class AssetBrowserTableModel;
+        class AssetBrowserModel;
+        class AssetBrowserTableFilterModel;
+    }
+}
+
+class AzAssetBrowserWindow
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    AZ_CLASS_ALLOCATOR(AzAssetBrowserWindow, AZ::SystemAllocator, 0);
+
+    explicit AzAssetBrowserWindow(QWidget* parent = nullptr);
+    virtual ~AzAssetBrowserWindow();
+
+    void SelectAsset(const QString& assetPath);
+
+    static void RegisterViewClass();
+
+    static QObject* createListenerForShowAssetEditorEvent(QObject* parent);
+
+private:
+
+    QScopedPointer<Ui::AzAssetBrowserWindowClass> m_ui;
+    QScopedPointer<AzToolsFramework::AssetBrowser::AssetBrowserFilterModel> m_filterModel;
+    QScopedPointer<AzToolsFramework::AssetBrowser::AssetBrowserTableModel> m_tableModel;
+    AzToolsFramework::AssetBrowser::AssetBrowserModel* m_assetBrowserModel;
+    
+    void UpdatePreview() const;
+
+private Q_SLOTS:
+    void SelectionChangedSlot(const QItemSelection& selected, const QItemSelection& deselected) const;
+    void DoubleClickedItem(const QModelIndex& element);
+};
+
+extern const char* AZ_ASSET_BROWSER_PREVIEW_NAME;
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
similarity index 100%
rename from Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
rename to Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
diff --git a/Code/Editor/BaseLibrary.cpp b/Code/Editor/BaseLibrary.cpp
new file mode 100644
index 0000000000..f048001fb1
--- /dev/null
+++ b/Code/Editor/BaseLibrary.cpp
@@ -0,0 +1,292 @@
+/*
+ * 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 "BaseLibrary.h"
+#include "BaseLibraryItem.h"
+#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 = 0)
+        : m_pLib(pLib)
+        , m_description(description)
+        , m_redo(0)
+        , m_selectedItem(selectedItem)
+    {
+        assert(m_pLib);
+
+        m_undo = GetIEditor()->GetSystem()->CreateXmlNode("Undo");
+        m_pLib->Serialize(m_undo, false);
+    }
+
+    virtual QString GetEditorObjectName()
+    {
+        return m_selectedItem;
+    }
+
+protected:
+    virtual int GetSize() { return sizeof(CUndoBaseLibrary); }
+    virtual QString GetDescription() { return m_description; };
+
+    virtual void Undo(bool bUndo)
+    {
+        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);
+    }
+
+    virtual void Redo()
+    {
+        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.
+//////////////////////////////////////////////////////////////////////////
+CBaseLibrary::CBaseLibrary(IBaseLibraryManager* pManager)
+    : m_pManager(pManager)
+    , m_bModified(false)
+    , m_bLevelLib(false)
+    , m_bNewLibrary(true)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseLibrary::~CBaseLibrary()
+{
+    m_items.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+IBaseLibraryManager* CBaseLibrary::GetManager()
+{
+    return m_pManager;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibrary::RemoveAllItems()
+{
+    AddRef();
+    for (int i = 0; i < m_items.size(); i++)
+    {
+        // Unregister item in case it was registered.  It is ok if it wasn't.  This is still safe to call.
+        m_pManager->UnregisterItem(m_items[i]);
+        // Clear library item.
+        m_items[i]->m_library = NULL;
+    }
+    m_items.clear();
+    Release();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibrary::SetName(const QString& name)
+{
+    //the fullname of the items in the library will be changed due to library's name change
+    //so we need unregistered them and register them after their name changed.
+    for (int i = 0; i < m_items.size(); i++)
+    {
+        m_pManager->UnregisterItem(m_items[i]);
+    }
+
+    m_name = name;
+
+    for (int i = 0; i < m_items.size(); i++)
+    {
+        m_pManager->RegisterItem(m_items[i]);
+    }
+
+    SetModified();
+}
+
+//////////////////////////////////////////////////////////////////////////
+const QString& CBaseLibrary::GetName() const
+{
+    return m_name;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseLibrary::Save()
+{
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseLibrary::Load(const QString& filename)
+{
+    m_filename = filename;
+    SetModified(false);
+    m_bNewLibrary = false;
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibrary::SetModified(bool bModified)
+{
+    if (bModified != m_bModified)
+    {
+        m_bModified = bModified;
+        emit Modified(bModified);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibrary::AddItem(IDataBaseItem* item, bool bRegister)
+{
+
+    CBaseLibraryItem* pLibItem = (CBaseLibraryItem*)item;
+    // Check if item is already assigned to this library.
+    if (pLibItem->m_library != this)
+    {
+        pLibItem->m_library = this;
+        m_items.push_back(pLibItem);
+        SetModified();
+        if (bRegister)
+        {
+            m_pManager->RegisterItem(pLibItem);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibrary::GetItem(int index)
+{
+    assert(index >= 0 && index < m_items.size());
+    return m_items[index];
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibrary::RemoveItem(IDataBaseItem* item)
+{
+
+    for (int i = 0; i < m_items.size(); i++)
+    {
+        if (m_items[i] == item)
+        {
+            // Unregister item in case it was registered.  It is ok if it wasn't.  This is still safe to call.
+            m_pManager->UnregisterItem(m_items[i]);
+            m_items.erase(m_items.begin() + i);
+            SetModified();
+            break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibrary::FindItem(const QString& name)
+{
+    for (int i = 0; i < m_items.size(); i++)
+    {
+        if (QString::compare(m_items[i]->GetName(), name, Qt::CaseInsensitive) == 0)
+        {
+            return m_items[i];
+        }
+    }
+    return NULL;
+}
+
+bool CBaseLibrary::AddLibraryToSourceControl(const QString& fullPathName) const
+{
+    IEditor* pEditor = GetIEditor();
+    IFileUtil* pFileUtil = pEditor ? pEditor->GetFileUtil() : nullptr;
+    if (pFileUtil)
+    {
+        return pFileUtil->CheckoutFile(fullPathName.toUtf8().data(), nullptr);
+    }
+
+    return false;
+}
+
+bool CBaseLibrary::SaveLibrary(const char* name, bool saveEmptyLibrary)
+{
+    assert(name != NULL);
+    if (name == NULL)
+    {
+        CryFatalError("The library you are attempting to save has no name specified.");
+        return false;
+    }
+
+    QString fileName(GetFilename());
+    if (fileName.isEmpty() && !saveEmptyLibrary)
+    {
+        return false;
+    }
+
+    fileName = Path::GamePathToFullPath(fileName);
+
+    XmlNodeRef root = GetIEditor()->GetSystem()->CreateXmlNode(name);
+    Serialize(root, false);
+    bool bRes = XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), root, fileName.toUtf8().data());
+    if (m_bNewLibrary)
+    {
+        AddLibraryToSourceControl(fileName);
+        m_bNewLibrary = false;
+    }
+    if (!bRes)
+    {
+        string strMessage;
+        QByteArray filenameUtf8 = fileName.toUtf8();
+        strMessage.Format("The file %s is read-only and the save of the library couldn't be performed. Try to remove the \"read-only\" flag or check-out the file and then try again.", filenameUtf8.data());
+        CryMessageBox(strMessage.c_str(), "Saving Error", MB_OK | MB_ICONWARNING);
+    }
+    return bRes;
+}
+
+//CONFETTI BEGIN
+void CBaseLibrary::ChangeItemOrder(CBaseLibraryItem* item, unsigned int newLocation)
+{
+    std::vector<_smart_ptr<CBaseLibraryItem> > temp;
+    for (unsigned int i = 0; i < m_items.size(); i++)
+    {
+        if (i == newLocation)
+        {
+            temp.push_back(_smart_ptr<CBaseLibraryItem>(item));
+        }
+        if (m_items[i] != item)
+        {
+            temp.push_back(m_items[i]);
+        }
+    }
+    // If newLocation is greater than the original size, append the item to end of the list
+    if (newLocation >= m_items.size())
+    {
+        temp.push_back(_smart_ptr<CBaseLibraryItem>(item));
+    }
+    m_items = temp;
+}
+//CONFETTI END
+
+#include <moc_BaseLibrary.cpp>
diff --git a/Code/Editor/BaseLibrary.h b/Code/Editor/BaseLibrary.h
new file mode 100644
index 0000000000..74ee4267bf
--- /dev/null
+++ b/Code/Editor/BaseLibrary.h
@@ -0,0 +1,128 @@
+/*
+ * 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_BASELIBRARY_H
+#define CRYINCLUDE_EDITOR_BASELIBRARY_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "Include/IDataBaseLibrary.h"
+#include "Include/IBaseLibraryManager.h"
+#include "Include/EditorCoreAPI.h"
+#include "Util/TRefCountBase.h"
+
+#include <QObject>
+#endif
+
+// Ensure we don't try to dllimport when moc includes us
+#if defined(Q_MOC_BUILD) && !defined(EDITOR_CORE)
+#define EDITOR_CORE
+#endif
+
+/** This a base class for all Libraries used by Editor.
+*/
+class EDITOR_CORE_API CBaseLibrary
+    : public QObject
+    , public TRefCountBase<IDataBaseLibrary>
+{
+    Q_OBJECT
+
+public:
+    explicit CBaseLibrary(IBaseLibraryManager* pManager);
+    ~CBaseLibrary();
+
+    //! Set library name.
+    virtual void SetName(const QString& name);
+    //! Get library name.
+    const QString& GetName() const;
+
+    //! Set new filename for this library.
+    virtual bool SetFilename(const QString& filename, [[maybe_unused]] bool checkForUnique = true) { m_filename = filename.toLower(); return true; };
+    const QString& GetFilename() const { return m_filename; };
+
+    virtual bool Save() = 0;
+    virtual bool Load(const QString& filename) = 0;
+    virtual void Serialize(XmlNodeRef& node, bool bLoading) = 0;
+
+    //! Mark library as modified.
+    void SetModified(bool bModified = true);
+    //! Check if library was modified.
+    bool IsModified() const { return m_bModified; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Working with items.
+    //////////////////////////////////////////////////////////////////////////
+    //! Add a new prototype to library.
+    void AddItem(IDataBaseItem* item, bool bRegister = true);
+    //! Get number of known prototypes.
+    int GetItemCount() const { return static_cast<int>(m_items.size()); }
+    //! Get prototype by index.
+    IDataBaseItem* GetItem(int index);
+
+    //! Delete item by pointer of item.
+    void RemoveItem(IDataBaseItem* item);
+
+    //! Delete all items from library.
+    void RemoveAllItems();
+
+    //! Find library item by name.
+    //! Using linear search.
+    IDataBaseItem* FindItem(const QString& name);
+
+    //! Check if this library is local level library.
+    bool IsLevelLibrary() const { return m_bLevelLib; };
+
+    //! Set library to be level library.
+    void SetLevelLibrary(bool bEnable) { m_bLevelLib = bEnable; };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Return manager for this library.
+    IBaseLibraryManager* GetManager();
+
+    // Saves the library with the main tag defined by the parameter name
+    bool SaveLibrary(const char* name, bool saveEmptyLibrary = false);
+
+    //CONFETTI BEGIN
+    // Used to change the library item order
+    virtual void ChangeItemOrder(CBaseLibraryItem* item, unsigned int newLocation) override;
+    //CONFETTI END
+
+signals:
+    void Modified(bool bModified);
+
+private:
+    // Add the library to the source control
+    bool AddLibraryToSourceControl(const QString& fullPathName) const;
+
+protected:
+
+    //! Name of the library.
+    QString m_name;
+    //! Filename of the library.
+    QString m_filename;
+
+    //! Flag set when library was modified.
+    bool m_bModified;
+
+    // Flag set when the library is just created and it's not yet saved for the first time.
+    bool m_bNewLibrary;
+
+    //! Level library is saved within the level .ly file and is local for this level.
+    bool m_bLevelLib;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Manager.
+    IBaseLibraryManager* m_pManager;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    // Array of all our library items.
+    std::vector<_smart_ptr<CBaseLibraryItem> > m_items;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif // CRYINCLUDE_EDITOR_BASELIBRARY_H
diff --git a/Code/Editor/BaseLibraryItem.cpp b/Code/Editor/BaseLibraryItem.cpp
new file mode 100644
index 0000000000..ffb3dea74b
--- /dev/null
+++ b/Code/Editor/BaseLibraryItem.cpp
@@ -0,0 +1,272 @@
+/*
+ * 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 "BaseLibraryItem.h"
+#include "BaseLibrary.h"
+#include "BaseLibraryManager.h"
+#include "Undo/IUndoObject.h"
+
+#include <AzCore/Math/Uuid.h>
+
+//undo object for multi-changes inside library item. such as set all variables to default values. 
+//For example: change particle emitter shape will lead to multiple variable changes
+class CUndoBaseLibraryItem
+    : public IUndoObject
+{
+public:
+    CUndoBaseLibraryItem(IBaseLibraryManager *libMgr, CBaseLibraryItem* libItem, bool ignoreChild)
+        : m_libMgr(libMgr)
+    {
+        assert(libItem);
+        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");
+        m_undoCtx.bIgnoreChilds = ignoreChild;
+        m_undoCtx.bLoading = false; //saving
+        m_undoCtx.bUniqName = false; //don't generate new name
+        m_undoCtx.bCopyPaste = true; //so it won't override guid
+        m_undoCtx.bUndo = true;
+        libItem->Serialize(m_undoCtx);
+
+        //evaluate size
+        XmlString xmlStr = m_undoCtx.node->getXML();
+        m_size = sizeof(CUndoBaseLibraryItem);
+        m_size += xmlStr.GetAllocatedMemory();
+        m_size += m_itemPath.length();
+        m_size += m_description.length();
+    }
+
+    QString GetEditorObjectName() override
+    {
+        return m_itemPath;
+    }
+
+protected:
+    virtual int GetSize() 
+    { 
+        return m_size;
+    }
+
+    QString GetDescription() override
+    { 
+        return m_description; 
+    }
+
+    virtual void Undo(bool bUndo)
+    {
+        //find the libItem
+        IDataBaseItem *libItem = m_libMgr->FindItemByName(m_itemPath);
+        if (libItem == nullptr)
+        {
+            //the undo stack is not reliable any more..
+            assert(false);  
+            return;
+        }
+
+        //save for redo
+        if (bUndo)
+        {
+            m_redoCtx.node = GetIEditor()->GetSystem()->CreateXmlNode("Redo");
+            m_redoCtx.bIgnoreChilds = m_undoCtx.bIgnoreChilds;
+            m_redoCtx.bLoading = false; //saving
+            m_redoCtx.bUniqName = false;
+            m_redoCtx.bCopyPaste = true;
+            m_redoCtx.bUndo = true;
+            libItem->Serialize(m_redoCtx);
+
+            XmlString xmlStr = m_redoCtx.node->getXML();
+            m_size += xmlStr.GetAllocatedMemory();
+        }
+
+        //load previous saved data
+        m_undoCtx.bLoading = true;
+        libItem->Serialize(m_undoCtx);
+    }
+
+    virtual void Redo()
+    {
+        //find the libItem
+        IDataBaseItem *libItem = m_libMgr->FindItemByName(m_itemPath);
+        if (libItem == nullptr || m_redoCtx.node == nullptr)
+        {
+            //the undo stack is not reliable any more..
+            assert(false);
+            return;
+        }
+
+        m_redoCtx.bLoading = true;
+        libItem->Serialize(m_redoCtx);
+    }
+
+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
+    IBaseLibraryManager* m_libMgr;
+    int m_size;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// CBaseLibraryItem implementation.
+//////////////////////////////////////////////////////////////////////////
+CBaseLibraryItem::CBaseLibraryItem()
+{
+    m_library = 0;
+    GenerateId();
+    m_bModified = false;
+}
+
+CBaseLibraryItem::~CBaseLibraryItem()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CBaseLibraryItem::GetFullName() const
+{
+    QString name;
+    if (m_library)
+    {
+        name = m_library->GetName() + ".";
+    }
+    name += m_name;
+    return name;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CBaseLibraryItem::GetGroupName()
+{
+    QString str = GetName();
+    int p = str.lastIndexOf('.');
+    if (p >= 0)
+    {
+        return str.mid(0, p);
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CBaseLibraryItem::GetShortName()
+{
+    QString str = GetName();
+    int p = str.lastIndexOf('.');
+    if (p >= 0)
+    {
+        return str.mid(p + 1);
+    }
+    p = str.lastIndexOf('/');
+    if (p >= 0)
+    {
+        return str.mid(p + 1);
+    }
+    return str;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryItem::SetName(const QString& name)
+{
+    assert(m_library);
+    if (name == m_name)
+    {
+        return;
+    }
+    QString oldName = GetFullName();
+    m_name = name;
+    ((CBaseLibraryManager*)m_library->GetManager())->OnRenameItem(this, oldName);
+}
+
+//////////////////////////////////////////////////////////////////////////
+const QString& CBaseLibraryItem::GetName() const
+{
+    return m_name;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryItem::GenerateId()
+{
+    GUID guid = AZ::Uuid::CreateRandom();
+    SetGUID(guid);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryItem::SetGUID(REFGUID guid)
+{
+    if (m_library)
+    {
+        ((CBaseLibraryManager*)m_library->GetManager())->RegisterItem(this, guid);
+    }
+    m_guid = guid;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryItem::Serialize(SerializeContext& ctx)
+{
+    assert(m_library);
+
+    XmlNodeRef node = ctx.node;
+    if (ctx.bLoading)
+    {
+        QString name = m_name;
+        // Loading
+        node->getAttr("Name", name);
+
+        if (!ctx.bUniqName)
+        {
+            SetName(name);
+        }
+        else
+        {
+            SetName(GetLibrary()->GetManager()->MakeUniqueItemName(name));
+        }
+
+        if (!ctx.bCopyPaste)
+        {
+            GUID guid;
+            if (node->getAttr("Id", guid))
+            {
+                SetGUID(guid);
+            }
+        }
+    }
+    else
+    {
+        // Saving.
+        node->setAttr("Name", m_name.toUtf8().data());
+        node->setAttr("Id", m_guid);
+        node->setAttr("Library", GetLibrary()->GetName().toUtf8().data());
+    }
+    m_bModified = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseLibrary* CBaseLibraryItem::GetLibrary() const
+{
+    return m_library;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryItem::SetLibrary(CBaseLibrary* pLibrary)
+{
+    m_library = pLibrary;
+}
+
+//! Mark library as modified.
+void CBaseLibraryItem::SetModified(bool bModified)
+{
+    m_bModified = bModified;
+    if (m_bModified && m_library != NULL)
+    {
+        m_library->SetModified(bModified);
+    }
+}
diff --git a/Code/Editor/BaseLibraryItem.h b/Code/Editor/BaseLibraryItem.h
new file mode 100644
index 0000000000..d41439dce8
--- /dev/null
+++ b/Code/Editor/BaseLibraryItem.h
@@ -0,0 +1,113 @@
+/*
+ * 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_BASELIBRARYITEM_H
+#define CRYINCLUDE_EDITOR_BASELIBRARYITEM_H
+#pragma once
+
+#include "Include/IDataBaseItem.h"
+#include "BaseLibrary.h"
+
+#include <QMetaType>
+
+class CBaseLibrary;
+
+//////////////////////////////////////////////////////////////////////////
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+/** Base class for all items contained in BaseLibraray.
+*/
+class EDITOR_CORE_API CBaseLibraryItem
+    : public TRefCountBase<IDataBaseItem>
+{
+    AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    CBaseLibraryItem();
+    ~CBaseLibraryItem();
+
+    //! Set item name.
+    //! Its virtual, in case you want to override it in derrived item.
+    virtual void SetName(const QString& name);
+    //! Get item name.
+    const QString& GetName() const;
+
+    //! Get full item name, including name of library.
+    //! Name formed by adding dot after name of library
+    //! eg. library Pickup and item PickupRL form full item name: "Pickups.PickupRL".
+    QString GetFullName() const;
+
+    //! Get only nameof group from prototype.
+    QString GetGroupName();
+    //! Get short name of prototype without group.
+    QString GetShortName();
+
+    //! Return Library this item are contained in.
+    //! Item can only be at one library.
+    IDataBaseLibrary* GetLibrary() const;
+    void SetLibrary(CBaseLibrary* pLibrary);
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Serialize library item to archive.
+    virtual void Serialize(SerializeContext& ctx);
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Generate new unique id for this item.
+    void GenerateId();
+    //! Returns GUID of this material.
+    const GUID& GetGUID() const { return m_guid; }
+
+    //! Mark library as modified.
+    void SetModified(bool bModified = true);
+    //! Check if library was modified.
+    bool IsModified() const { return m_bModified; };
+
+    //! Returns true if the item is registered, otherwise false
+    bool IsRegistered() const { return m_bRegistered; };
+
+    //! Validate item for errors.
+    virtual void Validate() {};
+
+    //! Get number of sub childs.
+    virtual int GetChildCount() const { return 0; }
+    //! Get sub child by index.
+    virtual CBaseLibraryItem* GetChild([[maybe_unused]] int index) const { return nullptr; }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Gathers resources by this item.
+    virtual void GatherUsedResources([[maybe_unused]] CUsedResources& resources) {};
+
+    //! Get if stored item is enabled
+    virtual bool GetIsEnabled() { return true; };
+
+
+    int IsParticleItem = -1;
+protected:
+    void SetGUID(REFGUID guid);
+    friend class CBaseLibrary;
+    friend class CBaseLibraryManager;
+    // Name of this prototype.
+    QString m_name;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //! Reference to prototype library who contains this prototype.
+    _smart_ptr<CBaseLibrary> m_library;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    //! Every base library item have unique id.
+    GUID m_guid;
+    // True when item modified by editor.
+    bool m_bModified;
+    // True when item registered in manager.
+    bool m_bRegistered = false;
+};
+
+Q_DECLARE_METATYPE(CBaseLibraryItem*);
+
+TYPEDEF_AUTOPTR(CBaseLibraryItem);
+
+
+#endif // CRYINCLUDE_EDITOR_BASELIBRARYITEM_H
diff --git a/Code/Editor/BaseLibraryManager.cpp b/Code/Editor/BaseLibraryManager.cpp
new file mode 100644
index 0000000000..038af3eca7
--- /dev/null
+++ b/Code/Editor/BaseLibraryManager.cpp
@@ -0,0 +1,937 @@
+/*
+ * 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 "BaseLibraryManager.h"
+
+// Editor
+#include "BaseLibraryItem.h"
+#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 = 0)
+        : m_pMngr(pMngr)
+        , m_description(description)
+        , m_editorObject(modifiedManager)
+    {
+        assert(m_pMngr);
+        SerializeTo(m_undos);
+    }
+
+    virtual QString GetEditorObjectName()
+    {
+        return m_editorObject;
+    }
+
+protected:
+    virtual int GetSize() { return sizeof(CUndoBaseLibraryManager); }
+    virtual QString GetDescription() { return m_description; };
+
+    virtual void Undo(bool bUndo)
+    {
+        if (bUndo)
+        {
+            SerializeTo(m_redos);
+        }
+        m_pMngr->ClearAll();
+        UnserializeFrom(m_undos);
+        GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
+    }
+
+    virtual void Redo()
+    {
+        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.
+//////////////////////////////////////////////////////////////////////////
+CBaseLibraryManager::CBaseLibraryManager()
+{
+    m_bUniqNameMap = false;
+    m_bUniqGuidMap = true;
+    GetIEditor()->RegisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseLibraryManager::~CBaseLibraryManager()
+{
+    ClearAll();
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::ClearAll()
+{
+    // Delete all items from all libraries.
+    for (int i = 0; i < m_libs.size(); i++)
+    {
+        m_libs[i]->RemoveAllItems();
+    }
+
+    // if we will not copy maps locally then destructors of the elements of
+    // the map will operate on the already invalid map object
+    // see:
+    //  CBaseLibraryManager::UnregisterItem()
+    //  CBaseLibraryManager::DeleteItem()
+    //  CMaterial::~CMaterial()
+
+    ItemsGUIDMap itemsGuidMap;
+    ItemsNameMap itemsNameMap;
+
+    {
+        AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
+        std::swap(itemsGuidMap, m_itemsGuidMap);
+        std::swap(itemsNameMap, m_itemsNameMap);
+
+        m_libs.clear();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseLibrary* CBaseLibraryManager::FindLibrary(const QString& library)
+{
+    const int index = FindLibraryIndex(library);
+    return index == -1 ? nullptr : m_libs[index];
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CBaseLibraryManager::FindLibraryIndex(const QString& library)
+{
+    QString lib = library;
+    lib.replace('\\', '/');
+    for (int i = 0; i < m_libs.size(); i++)
+    {
+        QString _lib = m_libs[i]->GetFilename();
+        _lib.replace('\\', '/');
+        if (QString::compare(lib, m_libs[i]->GetName(), Qt::CaseInsensitive) == 0 || QString::compare(lib, _lib, Qt::CaseInsensitive) == 0)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibraryManager::FindItem(REFGUID guid) const
+{
+    CBaseLibraryItem* pMtl = stl::find_in_map(m_itemsGuidMap, guid, (CBaseLibraryItem*)0);
+    return pMtl;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::SplitFullItemName(const QString& fullItemName, QString& libraryName, QString& itemName)
+{
+    int p;
+    p = fullItemName.indexOf('.');
+    if (p < 0 || !QString::compare(fullItemName.mid(p + 1), "mtl", Qt::CaseInsensitive))
+    {
+        libraryName = "";
+        itemName = fullItemName;
+        return;
+    }
+    libraryName = fullItemName.mid(0, p);
+    itemName = fullItemName.mid(p + 1);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibraryManager::FindItemByName(const QString& fullItemName)
+{
+    AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
+    return stl::find_in_map(m_itemsNameMap, fullItemName, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibraryManager::LoadItemByName(const QString& fullItemName)
+{
+    QString libraryName, itemName;
+    SplitFullItemName(fullItemName, libraryName, itemName);
+
+    if (!FindLibrary(libraryName))
+    {
+        LoadLibrary(MakeFilename(libraryName));
+    }
+
+    return FindItemByName(fullItemName);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibraryManager::FindItemByName(const char* fullItemName)
+{
+    return FindItemByName(QString(fullItemName));
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibraryManager::LoadItemByName(const char* fullItemName)
+{
+    return LoadItemByName(QString(fullItemName));
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibraryManager::CreateItem(IDataBaseLibrary* pLibrary)
+{
+    assert(pLibrary);
+
+    // Add item to this library.
+    TSmartPtr<CBaseLibraryItem> pItem = MakeNewItem();
+    pLibrary->AddItem(pItem);
+    return pItem;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::DeleteItem(IDataBaseItem* pItem)
+{
+    assert(pItem);
+
+    UnregisterItem((CBaseLibraryItem*)pItem);
+    if (pItem->GetLibrary())
+    {
+        pItem->GetLibrary()->RemoveItem(pItem);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseLibrary* CBaseLibraryManager::LoadLibrary(const QString& inFilename, [[maybe_unused]] bool bReload)
+{
+    if (auto lib = FindLibrary(inFilename))
+    {
+        return lib;
+    }
+
+    TSmartPtr<CBaseLibrary> pLib = MakeNewLibrary();
+    if (!pLib->Load(MakeFilename(inFilename)))
+    {
+        Error(QObject::tr("Failed to Load Item Library: %1").arg(inFilename).toUtf8().data());
+        return nullptr;
+    }
+
+    m_libs.push_back(pLib);
+    return pLib;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CBaseLibraryManager::GetModifiedLibraryCount() const
+{
+    int count = 0;
+    for (int i = 0; i < m_libs.size(); i++)
+    {
+        if (m_libs[i]->IsModified())
+        {
+            count++;
+        }
+    }
+    return count;
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseLibrary* CBaseLibraryManager::AddLibrary(const QString& library, bool bIsLevelLibrary, bool bIsLoading)
+{
+    // Make a filename from name of library.
+    QString filename = library;
+
+    if (filename.indexOf(".xml") == -1) // if its already a filename, we don't do anything
+    {
+        filename.replace(' ', '_');
+        if (!bIsLevelLibrary)
+        {
+            filename = MakeFilename(library);
+        }
+        else
+        {
+            // if its the level library it gets saved in the level and should not be concatenated with any other file name
+            filename = filename + ".xml";
+        }
+    }
+
+    IDataBaseLibrary* pBaseLib = FindLibrary(library);  //library name
+    if (!pBaseLib)
+    {
+        pBaseLib = FindLibrary(filename); //library file name
+    }
+    if (pBaseLib)
+    {
+        return pBaseLib;
+    }
+
+    CBaseLibrary* lib = MakeNewLibrary();
+    lib->SetName(library);
+    lib->SetLevelLibrary(bIsLevelLibrary);
+    lib->SetFilename(filename, !bIsLoading);
+    // set modified to true, so even empty particle libraries get saved
+    lib->SetModified(true);
+
+    m_libs.push_back(lib);
+    return lib;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CBaseLibraryManager::MakeFilename(const QString& library)
+{
+    QString filename = library;
+    filename.replace(' ', '_');
+    filename.replace(".xml", "");
+
+    // make it contain the canonical libs path:
+    Path::ConvertBackSlashToSlash(filename);
+
+    QString LibsPath(GetLibsPath());
+    Path::ConvertBackSlashToSlash(LibsPath);
+
+    if (filename.left(LibsPath.length()).compare(LibsPath, Qt::CaseInsensitive) == 0)
+    {
+        filename = filename.mid(LibsPath.length());
+    }
+
+    return LibsPath + filename + ".xml";
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseLibraryManager::IsUniqueFilename(const QString& library)
+{
+    QString resultPath = MakeFilename(library);
+    CCryFile xmlFile;
+    // If we can find a file for the path
+    return !xmlFile.Open(resultPath.toUtf8().data(), "rb");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::DeleteLibrary(const QString& library, bool forceDeleteLevel)
+{
+    for (int i = 0; i < m_libs.size(); i++)
+    {
+        if (QString::compare(library, m_libs[i]->GetName(), Qt::CaseInsensitive) == 0)
+        {
+            CBaseLibrary* pLibrary = m_libs[i];
+            // Check if not level library, they cannot be deleted.
+            if (!pLibrary->IsLevelLibrary() || forceDeleteLevel)
+            {
+                for (int j = 0; j < pLibrary->GetItemCount(); j++)
+                {
+                    UnregisterItem((CBaseLibraryItem*)pLibrary->GetItem(j));
+                }
+                pLibrary->RemoveAllItems();
+                
+                if (pLibrary->IsLevelLibrary())
+                {
+                    m_pLevelLibrary = nullptr;
+                }
+                m_libs.erase(m_libs.begin() + i);
+            }
+            break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseLibrary* CBaseLibraryManager::GetLibrary(int index) const
+{
+    assert(index >= 0 && index < m_libs.size());
+    return m_libs[index];
+};
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseLibrary* CBaseLibraryManager::GetLevelLibrary() const
+{
+    IDataBaseLibrary* pLevelLib = NULL;
+
+    for (int i = 0; i < GetLibraryCount(); i++)
+    {
+        if (GetLibrary(i)->IsLevelLibrary())
+        {
+            pLevelLib = GetLibrary(i);
+            break;
+        }
+    }
+
+
+    return pLevelLib;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::SaveAllLibs()
+{
+    for (int i = 0; i < GetLibraryCount(); i++)
+    {
+        // Check if library is modified.
+        IDataBaseLibrary* pLibrary = GetLibrary(i);
+
+        //Level library is saved when the level is saved
+        if (pLibrary->IsLevelLibrary())
+        {
+            continue;
+        }
+        if (pLibrary->IsModified())
+        {
+            if (pLibrary->Save())
+            {
+                pLibrary->SetModified(false);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::Serialize(XmlNodeRef& node, bool bLoading)
+{
+    static const char* const LEVEL_LIBRARY_TAG = "LevelLibrary";
+
+    QString rootNodeName = GetRootNodeName();
+    if (bLoading)
+    {
+        XmlNodeRef libs = node->findChild(rootNodeName.toUtf8().data());
+        if (libs)
+        {
+            for (int i = 0; i < libs->getChildCount(); i++)
+            {
+                // Load only library name.
+                XmlNodeRef libNode = libs->getChild(i);
+                if (strcmp(libNode->getTag(), LEVEL_LIBRARY_TAG) == 0)
+                {
+                    if (!m_pLevelLibrary)
+                    {
+                        QString libName;
+                        libNode->getAttr("Name", libName);
+                        m_pLevelLibrary = static_cast<CBaseLibrary*>(AddLibrary(libName, true));
+                    }
+                    m_pLevelLibrary->Serialize(libNode, bLoading);
+                }
+                else
+                {
+                    QString libName;
+                    if (libNode->getAttr("Name", libName))
+                    {
+                        // Load this library.
+                        if (!FindLibrary(libName))
+                        {
+                            LoadLibrary(MakeFilename(libName));
+                        }
+                    }
+                }
+            }
+        }
+    }
+    else
+    {
+        // Save all libraries.
+        XmlNodeRef libs = node->newChild(rootNodeName.toUtf8().data());
+        for (int i = 0; i < GetLibraryCount(); i++)
+        {
+            IDataBaseLibrary* pLib = GetLibrary(i);
+            if (pLib->IsLevelLibrary())
+            {
+                // Level libraries are saved in in level.
+                XmlNodeRef libNode = libs->newChild(LEVEL_LIBRARY_TAG);
+                pLib->Serialize(libNode, bLoading);
+            }
+            else
+            {
+                // Save only library name.
+                XmlNodeRef libNode = libs->newChild("Library");
+                libNode->setAttr("Name", pLib->GetName().toUtf8().data());
+            }
+        }
+        SaveAllLibs();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CBaseLibraryManager::MakeUniqueItemName(const QString& srcName, const QString& libName)
+{
+    // unlikely we'll ever encounter more than 16
+    std::vector<string> possibleDuplicates;
+    possibleDuplicates.reserve(16);
+
+    // search for strings in the database that might have a similar name (ignore case)
+    IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
+    for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
+    {
+        //Check if the item is in the target library first. 
+        IDataBaseLibrary* itemLibrary = pItem->GetLibrary();
+        QString itemLibraryName;
+        if (itemLibrary)
+        {
+            itemLibraryName = itemLibrary->GetName();
+        }
+
+        // Item is not in the library so there cannot be a naming conflict.
+        if (!libName.isEmpty() && !itemLibraryName.isEmpty() && itemLibraryName != libName)
+        {
+            continue;
+        }
+
+        const QString& name = pItem->GetName();
+        if (name.startsWith(srcName, Qt::CaseInsensitive))
+        {
+            possibleDuplicates.push_back(string(name.toUtf8().data()));
+        }
+    }
+    pEnum->Release();
+
+    if (possibleDuplicates.empty())
+    {
+        return srcName;
+    }
+
+    std::sort(possibleDuplicates.begin(), possibleDuplicates.end(), [](const string& strOne, const string& strTwo)
+        {
+            // I can assume size sorting since if the length is different, either one of the two strings doesn't
+            // closely match the string we are trying to duplicate, or it's a bigger number (X1 vs X10)
+            if (strOne.size() != strTwo.size())
+            {
+                return strOne.size() < strTwo.size();
+            }
+            else
+            {
+                return azstricmp(strOne.c_str(), strTwo.c_str()) < 0;
+            }
+        }
+        );
+
+    int num = 0;
+    QString returnValue = srcName;
+    while (num < possibleDuplicates.size() && QString::compare(possibleDuplicates[num].c_str(), returnValue, Qt::CaseInsensitive) == 0)
+    {
+        returnValue = QStringLiteral("%1%2%3").arg(srcName).arg("_").arg(num);
+        ++num;
+    }
+
+    return returnValue;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::Validate()
+{
+    IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
+    for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
+    {
+        pItem->Validate();
+    }
+    pEnum->Release();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid)
+{
+    assert(pItem);
+
+    bool bNotify = false;
+
+    if (m_bUniqGuidMap)
+    {
+        bool bNewItem = true;
+        REFGUID oldGuid = pItem->GetGUID();
+        if (!GuidUtil::IsEmpty(oldGuid))
+        {
+            bNewItem = false;
+            m_itemsGuidMap.erase(oldGuid);
+        }
+        if (GuidUtil::IsEmpty(newGuid))
+        {
+            return;
+        }
+        CBaseLibraryItem* pOldItem = stl::find_in_map(m_itemsGuidMap, newGuid, (CBaseLibraryItem*)0);
+        if (!pOldItem)
+        {
+            pItem->m_guid = newGuid;
+            m_itemsGuidMap[newGuid] = pItem;
+            pItem->m_bRegistered = true;
+            bNotify = true;
+        }
+        else
+        {
+            if (pOldItem != pItem)
+            {
+                ReportDuplicateItem(pItem, pOldItem);
+            }
+        }
+    }
+
+    if (m_bUniqNameMap)
+    {
+        QString fullName = pItem->GetFullName();
+        if (!pItem->GetName().isEmpty())
+        {
+            CBaseLibraryItem* pOldItem = static_cast<CBaseLibraryItem*>(FindItemByName(fullName));
+            if (!pOldItem)
+            {
+                AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
+                m_itemsNameMap[fullName] = pItem;
+                pItem->m_bRegistered = true;
+                bNotify = true;
+            }
+            else
+            {
+                if (pOldItem != pItem)
+                {
+                    ReportDuplicateItem(pItem, pOldItem);
+                }
+            }
+        }
+    }
+
+    // Notify listeners.
+    if (bNotify)
+    {
+        NotifyItemEvent(pItem, EDB_ITEM_EVENT_ADD);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem)
+{
+    assert(pItem);
+
+    bool bNotify = false;
+
+    if (m_bUniqGuidMap)
+    {
+        if (GuidUtil::IsEmpty(pItem->GetGUID()))
+        {
+            return;
+        }
+        CBaseLibraryItem* pOldItem = stl::find_in_map(m_itemsGuidMap, pItem->GetGUID(), (CBaseLibraryItem*)0);
+        if (!pOldItem)
+        {
+            m_itemsGuidMap[pItem->GetGUID()] = pItem;
+            pItem->m_bRegistered = true;
+            bNotify = true;
+        }
+        else
+        {
+            if (pOldItem != pItem)
+            {
+                ReportDuplicateItem(pItem, pOldItem);
+            }
+        }
+    }
+
+    if (m_bUniqNameMap)
+    {
+        QString fullName = pItem->GetFullName();
+        if (!fullName.isEmpty())
+        {
+            CBaseLibraryItem* pOldItem = static_cast<CBaseLibraryItem*>(FindItemByName(fullName));
+            if (!pOldItem)
+            {
+                AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
+                m_itemsNameMap[fullName] = pItem;
+                pItem->m_bRegistered = true;
+                bNotify = true;
+            }
+            else
+            {
+                if (pOldItem != pItem)
+                {
+                    ReportDuplicateItem(pItem, pOldItem);
+                }
+            }
+        }
+    }
+
+    // Notify listeners.
+    if (bNotify)
+    {
+        NotifyItemEvent(pItem, EDB_ITEM_EVENT_ADD);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::SetRegisteredFlag(CBaseLibraryItem* pItem, bool bFlag)
+{
+    pItem->m_bRegistered = bFlag;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::ReportDuplicateItem(CBaseLibraryItem* pItem, CBaseLibraryItem* pOldItem)
+{
+    QString sLibName;
+    if (pOldItem->GetLibrary())
+    {
+        sLibName = pOldItem->GetLibrary()->GetName();
+    }
+    CErrorRecord err;
+    err.pItem = pItem;
+    err.error = QStringLiteral("Item %1 with duplicate GUID to loaded item %2 ignored").arg(pItem->GetFullName(), pOldItem->GetFullName());
+    GetIEditor()->GetErrorReport()->ReportError(err);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::UnregisterItem(CBaseLibraryItem* pItem)
+{
+    // Notify listeners.
+    NotifyItemEvent(pItem, EDB_ITEM_EVENT_DELETE);
+
+    if (!pItem)
+    {
+        return;
+    }
+
+    if (m_bUniqGuidMap)
+    {
+        m_itemsGuidMap.erase(pItem->GetGUID());
+    }
+    if (m_bUniqNameMap && !pItem->GetFullName().isEmpty())
+    {
+        AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
+        auto findIter = m_itemsNameMap.find(pItem->GetFullName());
+        if (findIter != m_itemsNameMap.end())
+        {
+            _smart_ptr<CBaseLibraryItem> item = findIter->second;
+            m_itemsNameMap.erase(findIter);
+        }
+    }
+
+    pItem->m_bRegistered = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CBaseLibraryManager::MakeFullItemName(IDataBaseLibrary* pLibrary, const QString& group, const QString& itemName)
+{
+    assert(pLibrary);
+    QString name = pLibrary->GetName() + ".";
+    if (!group.isEmpty())
+    {
+        name += group + ".";
+    }
+    name += itemName;
+    return name;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::GatherUsedResources(CUsedResources& resources)
+{
+    IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
+    for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
+    {
+        pItem->GatherUsedResources(resources);
+    }
+    pEnum->Release();
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItemEnumerator* CBaseLibraryManager::GetItemEnumerator()
+{
+    if (m_bUniqNameMap)
+    {
+        return new CDataBaseItemEnumerator<ItemsNameMap>(&m_itemsNameMap);
+    }
+    else
+    {
+        return new CDataBaseItemEnumerator<ItemsGUIDMap>(&m_itemsGuidMap);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnBeginNewScene:
+        SetSelectedItem(0);
+        ClearAll();
+        break;
+    case eNotify_OnBeginSceneOpen:
+        SetSelectedItem(0);
+        ClearAll();
+        break;
+    case eNotify_OnCloseScene:
+        SetSelectedItem(0);
+        ClearAll();
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::OnRenameItem(CBaseLibraryItem* pItem, const QString& oldName)
+{
+    m_itemsNameMapMutex.lock();
+    if (!oldName.isEmpty())
+    {
+        m_itemsNameMap.erase(oldName);
+    }
+    if (!pItem->GetFullName().isEmpty())
+    {
+        m_itemsNameMap[pItem->GetFullName()] = pItem;
+    }
+    m_itemsNameMapMutex.unlock();
+
+    OnItemChanged(pItem);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::AddListener(IDataBaseManagerListener* pListener)
+{
+    stl::push_back_unique(m_listeners, pListener);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::RemoveListener(IDataBaseManagerListener* pListener)
+{
+    stl::find_and_erase(m_listeners, pListener);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::NotifyItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event)
+{
+    // Notify listeners.
+    if (!m_listeners.empty())
+    {
+        for (int i = 0; i < m_listeners.size(); i++)
+        {
+            m_listeners[i]->OnDataBaseItemEvent(pItem, event);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::OnItemChanged(IDataBaseItem* pItem)
+{
+    NotifyItemEvent(pItem, EDB_ITEM_EVENT_CHANGED);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::OnUpdateProperties(IDataBaseItem* pItem, bool bRefresh)
+{
+    NotifyItemEvent(pItem, bRefresh ? EDB_ITEM_EVENT_UPDATE_PROPERTIES
+        : EDB_ITEM_EVENT_UPDATE_PROPERTIES_NO_EDITOR_REFRESH);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseLibraryManager::SetSelectedItem(IDataBaseItem* pItem)
+{
+    if (m_pSelectedItem == pItem)
+    {
+        return;
+    }
+    m_pSelectedItem = (CBaseLibraryItem*)pItem;
+    NotifyItemEvent(m_pSelectedItem, EDB_ITEM_EVENT_SELECTED);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibraryManager::GetSelectedItem() const
+{
+    return m_pSelectedItem;
+}
+
+//////////////////////////////////////////////////////////////////////////
+IDataBaseItem* CBaseLibraryManager::GetSelectedParentItem() const
+{
+    return m_pSelectedParent;
+}
+
+void CBaseLibraryManager::ChangeLibraryOrder(IDataBaseLibrary* lib, unsigned int newLocation)
+{
+    if (!lib || newLocation >= m_libs.size() || lib == m_libs[newLocation])
+    {
+        return;
+    }
+    
+    for (int i = 0; i < m_libs.size(); i++)
+    {
+        if (lib == m_libs[i])
+        {
+            _smart_ptr<CBaseLibrary> curLib = m_libs[i];
+            m_libs.erase(m_libs.begin() + i);
+            m_libs.insert(m_libs.begin() + newLocation, curLib);
+            return;
+        }
+    }
+}
+
+bool CBaseLibraryManager::SetLibraryName(CBaseLibrary* lib, const QString& name)
+{
+    // SetFilename will validate if the name is duplicate with exist libraries.
+    if (lib->SetFilename(MakeFilename(name)))
+    {
+        lib->SetName(name);
+        return true;
+    }
+    return false;
+}
diff --git a/Code/Editor/BaseLibraryManager.h b/Code/Editor/BaseLibraryManager.h
new file mode 100644
index 0000000000..50c7c2b3bd
--- /dev/null
+++ b/Code/Editor/BaseLibraryManager.h
@@ -0,0 +1,225 @@
+/*
+ * 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_BASELIBRARYMANAGER_H
+#define CRYINCLUDE_EDITOR_BASELIBRARYMANAGER_H
+#pragma once
+
+#include "Include/IBaseLibraryManager.h"
+#include "Include/IDataBaseItem.h"
+#include "Include/IDataBaseLibrary.h"
+#include "Include/IDataBaseManager.h"
+#include "Util/TRefCountBase.h"
+#include "Util/GuidUtil.h"
+#include "BaseLibrary.h"
+#include "Util/smartptr.h"
+#include <EditorDefs.h>
+#include <QtUtil.h>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+/** Manages all Libraries and Items.
+*/
+class SANDBOX_API  CBaseLibraryManager
+    : public IBaseLibraryManager
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    CBaseLibraryManager();
+    ~CBaseLibraryManager();
+
+    //! Clear all libraries.
+    virtual void ClearAll() override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // IDocListener implementation.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Library items.
+    //////////////////////////////////////////////////////////////////////////
+    //! Make a new item in specified library.
+    virtual IDataBaseItem* CreateItem(IDataBaseLibrary* pLibrary) override;
+    //! Delete item from library and manager.
+    virtual void DeleteItem(IDataBaseItem* pItem) override;
+
+    //! Find Item by its GUID.
+    virtual IDataBaseItem* FindItem(REFGUID guid) const;
+    virtual IDataBaseItem* FindItemByName(const QString& fullItemName);
+    virtual IDataBaseItem* LoadItemByName(const QString& fullItemName);
+    virtual IDataBaseItem* FindItemByName(const char* fullItemName);
+    virtual IDataBaseItem* LoadItemByName(const char* fullItemName);
+
+    virtual IDataBaseItemEnumerator* GetItemEnumerator() override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set item currently selected.
+    virtual void SetSelectedItem(IDataBaseItem* pItem) override;
+    // Get currently selected item.
+    virtual IDataBaseItem* GetSelectedItem() const override;
+    virtual IDataBaseItem* GetSelectedParentItem() const override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Libraries.
+    //////////////////////////////////////////////////////////////////////////
+    //! Add Item library.
+    virtual IDataBaseLibrary* AddLibrary(const QString& library, bool bIsLevelLibrary = false, bool bIsLoading = true) override;
+    virtual void DeleteLibrary(const QString& library, bool forceDeleteLevel = false) override;
+    //! Get number of libraries.
+    virtual int GetLibraryCount() const override { return m_libs.size(); };
+    //! Get number of modified libraries.
+    virtual int GetModifiedLibraryCount() const override;
+
+    //! Get Item library by index.
+    virtual IDataBaseLibrary* GetLibrary(int index) const override;
+
+    //! Get Level Item library.
+    virtual IDataBaseLibrary* GetLevelLibrary() const override;
+
+    //! Find Items Library by name.
+    virtual IDataBaseLibrary* FindLibrary(const QString& library) override;
+
+    //! Find Items Library's index by name.
+    int FindLibraryIndex(const QString& library) override;
+    
+    //! Load Items library.
+    virtual IDataBaseLibrary* LoadLibrary(const QString& filename, bool bReload = false) override;
+
+    //! Save all modified libraries.
+    virtual void SaveAllLibs() override;
+
+    //! Serialize property manager.
+    virtual void Serialize(XmlNodeRef& node, bool bLoading) override;
+
+    //! Export items to game.
+    virtual void Export([[maybe_unused]] XmlNodeRef& node) override {};
+
+    //! Returns unique name base on input name.
+    virtual QString MakeUniqueItemName(const QString& name, const QString& libName = "") override;
+    virtual QString MakeFullItemName(IDataBaseLibrary* pLibrary, const QString& group, const QString& itemName) override;
+
+    //! Root node where this library will be saved.
+    virtual QString GetRootNodeName() override = 0;
+    //! Path to libraries in this manager.
+    virtual QString GetLibsPath() override = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Validate library items for errors.
+    virtual void Validate() override;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void GatherUsedResources(CUsedResources& resources) override;
+
+    virtual void AddListener(IDataBaseManagerListener* pListener) override;
+    virtual void RemoveListener(IDataBaseManagerListener* pListener) override;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid) override;
+    virtual void RegisterItem(CBaseLibraryItem* pItem) override;
+    virtual void UnregisterItem(CBaseLibraryItem* pItem) override;
+
+    // Only Used internally.
+    virtual void OnRenameItem(CBaseLibraryItem* pItem, const QString& oldName) override;
+
+    // Called by items to indicated that they have been modified.
+    // Sends item changed event to listeners.
+    virtual void OnItemChanged(IDataBaseItem* pItem) override;
+    virtual void OnUpdateProperties(IDataBaseItem* pItem, bool bRefresh) override;
+
+    QString MakeFilename(const QString& library);
+    virtual bool IsUniqueFilename(const QString& library) override;
+
+    //CONFETTI BEGIN
+    // Used to change the library item order
+    virtual void ChangeLibraryOrder(IDataBaseLibrary* lib, unsigned int newLocation) override;
+
+    virtual bool SetLibraryName(CBaseLibrary* lib, const QString& name) override;
+
+protected:
+    void SplitFullItemName(const QString& fullItemName, QString& libraryName, QString& itemName);
+    void NotifyItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event);
+    void SetRegisteredFlag(CBaseLibraryItem* pItem, bool bFlag);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Must be overriden.
+    //! Makes a new Item.
+    virtual CBaseLibraryItem* MakeNewItem() = 0;
+    virtual CBaseLibrary* MakeNewLibrary() = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual void ReportDuplicateItem(CBaseLibraryItem* pItem, CBaseLibraryItem* pOldItem);
+
+protected:
+    bool m_bUniqGuidMap;
+    bool m_bUniqNameMap;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //! Array of all loaded entity items libraries.
+    std::vector<_smart_ptr<CBaseLibrary> > m_libs;
+
+    // There is always one current level library.
+    TSmartPtr<CBaseLibrary> m_pLevelLibrary;
+
+    // GUID to item map.
+    typedef std::map<GUID, _smart_ptr<CBaseLibraryItem>, guid_less_predicate> ItemsGUIDMap;
+    ItemsGUIDMap m_itemsGuidMap;
+
+    // Case insensitive name to items map.
+    typedef std::map<QString, _smart_ptr<CBaseLibraryItem>, stl::less_stricmp<QString>> ItemsNameMap;
+    ItemsNameMap m_itemsNameMap;
+    AZStd::mutex m_itemsNameMapMutex;
+
+    std::vector<IDataBaseManagerListener*> m_listeners;
+
+    // Currently selected item.
+    _smart_ptr<CBaseLibraryItem> m_pSelectedItem;
+    _smart_ptr<CBaseLibraryItem> m_pSelectedParent;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+//////////////////////////////////////////////////////////////////////////
+template <class TMap>
+class CDataBaseItemEnumerator
+    : public IDataBaseItemEnumerator
+{
+    TMap* m_pMap;
+    typename TMap::iterator m_iterator;
+
+public:
+    CDataBaseItemEnumerator(TMap* pMap)
+    {
+        assert(pMap);
+        m_pMap = pMap;
+        m_iterator = m_pMap->begin();
+    }
+    virtual void Release() { delete this; };
+    virtual IDataBaseItem* GetFirst()
+    {
+        m_iterator = m_pMap->begin();
+        if (m_iterator == m_pMap->end())
+        {
+            return 0;
+        }
+        return m_iterator->second;
+    }
+    virtual IDataBaseItem* GetNext()
+    {
+        if (m_iterator != m_pMap->end())
+        {
+            m_iterator++;
+        }
+        if (m_iterator == m_pMap->end())
+        {
+            return 0;
+        }
+        return m_iterator->second;
+    }
+};
+
+#endif // CRYINCLUDE_EDITOR_BASELIBRARYMANAGER_H
diff --git a/Code/Editor/CMakeLists.txt b/Code/Editor/CMakeLists.txt
new file mode 100644
index 0000000000..8a5f35fb92
--- /dev/null
+++ b/Code/Editor/CMakeLists.txt
@@ -0,0 +1,249 @@
+#
+# 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 PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+add_subdirectory(Plugins)
+
+ly_add_target(
+    NAME EditorCore SHARED
+    NAMESPACE Legacy
+    AUTOMOC
+    AUTOUIC
+    FILES_CMAKE
+        editor_core_files.cmake
+        Platform/${PAL_PLATFORM_NAME}/editor_core_files_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            Include
+            .
+            ..
+    COMPILE_DEFINITIONS
+        PRIVATE
+            EDITOR_CORE
+        PUBLIC
+            EDITOR
+    BUILD_DEPENDENCIES
+        PRIVATE
+            Legacy::CryCommon
+            3rdParty::zlib
+        PUBLIC
+            3rdParty::Qt::Core
+            3rdParty::Qt::Gui
+            3rdParty::Qt::Widgets
+            AZ::AzToolsFramework
+)
+
+# Header only target to prevent linkage against editor libraries when is not needed. Eventually the targets that depend
+# on editor headers should cleanup dependencies and interact with the editor through buses or other mechanisms
+ly_add_target(
+    NAME Editor.Headers HEADERONLY
+    NAMESPACE Legacy
+    FILES_CMAKE
+        editor_headers_files.cmake
+    INCLUDE_DIRECTORIES
+        INTERFACE
+            Include
+            .
+            ..
+    BUILD_DEPENDENCIES
+        INTERFACE
+            Legacy::EditorCommon.Headers
+)
+
+################################################################################
+# EditorLib
+################################################################################
+set(pal_cmake_files "")
+foreach(enabled_platform ${LY_PAL_TOOLS_ENABLED})
+    string(TOLOWER ${enabled_platform} enabled_platform_lowercase)
+    ly_get_list_relative_pal_filename(pal_cmake_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${enabled_platform})
+    list(APPEND pal_cmake_files ${pal_cmake_dir}/editor_lib_${enabled_platform_lowercase}_files.cmake)
+endforeach()
+
+ly_get_pal_tool_dirs(pal_tool_dirs ${CMAKE_CURRENT_LIST_DIR}/Platform)
+
+ly_add_target(
+    NAME EditorLib SHARED
+    NAMESPACE Legacy
+    AUTOMOC
+    AUTOUIC
+    AUTORCC
+    FILES_CMAKE
+        editor_lib_files.cmake
+        Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+    PLATFORM_INCLUDE_FILES
+        Platform/${PAL_PLATFORM_NAME}/editor_lib_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
+        Platform/Common/${PAL_TRAIT_COMPILER_ID}/editor_lib_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
+        ${pal_cmake_files}
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            Include
+        PRIVATE
+            .
+            ..
+            AssetBrowser/AssetTypes/Character
+            ${pal_tool_dirs}
+    COMPILE_DEFINITIONS
+        PRIVATE
+            SANDBOX_EXPORTS
+            ${LY_LEGACY_TERRAIN_EDITOR_DEFINES}
+        INTERFACE
+            SANDBOX_IMPORTS
+    BUILD_DEPENDENCIES
+        PRIVATE
+            3rdParty::Qt::Core
+            3rdParty::Qt::Gui
+            3rdParty::Qt::Widgets
+            3rdParty::Qt::Concurrent
+            3rdParty::tiff
+            3rdParty::squish-ccr
+            3rdParty::zlib
+            3rdParty::AWSNativeSDK::STS
+            Legacy::CryCommon
+            Legacy::EditorCommon
+            AZ::AzCore
+            AZ::AzToolsFramework
+            Gem::LmbrCentral.Static
+            Legacy::NewsShared
+            AZ::AWSNativeSDKInit
+            AZ::AtomCore
+            Gem::Atom_RPI.Edit
+            Gem::Atom_RPI.Public
+            Gem::Atom_Feature_Common.Static
+            Gem::AtomToolsFramework.Static
+            Gem::AtomViewportDisplayInfo
+            ${additional_dependencies}
+        PUBLIC
+            3rdParty::AWSNativeSDK::Core
+            3rdParty::Qt::Network
+            Legacy::EditorCore
+    RUNTIME_DEPENDENCIES
+        Gem::AtomViewportDisplayInfo
+        Legacy::EditorCommon
+)
+ly_add_source_properties(
+    SOURCES CryEdit.cpp
+    PROPERTY COMPILE_DEFINITIONS 
+    VALUES 
+        O3DE_COPYRIGHT_YEAR=${LY_VERSION_COPYRIGHT_YEAR}
+        LY_BUILD=${LY_VERSION_BUILD_NUMBER}
+        ${LY_PAL_TOOLS_DEFINES}
+)
+ly_add_source_properties(
+    SOURCES
+        Core/LevelEditorMenuHandler.cpp
+        GraphicsSettingsDialog.cpp
+        MainWindow.cpp
+    PROPERTY COMPILE_DEFINITIONS 
+    VALUES ${LY_PAL_TOOLS_DEFINES}
+)
+
+get_property(editor_plugins GLOBAL PROPERTY LY_EDITOR_PLUGINS)
+string (REPLACE ";" "," editor_plugins "${editor_plugins}")
+ly_add_source_properties(
+    SOURCES PluginManager.cpp
+    PROPERTY COMPILE_DEFINITIONS 
+    VALUES LY_EDITOR_PLUGINS="${editor_plugins}"
+)
+
+################################################################################
+# Editor
+################################################################################
+ly_add_target(
+    NAME Editor APPLICATION
+    NAMESPACE Legacy
+    AUTORCC
+    FILES_CMAKE
+        editor_files.cmake
+    PLATFORM_INCLUDE_FILES
+        Platform/${PAL_PLATFORM_NAME}/editor_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
+    BUILD_DEPENDENCIES
+        PRIVATE
+            3rdParty::Qt::Core
+            Legacy::CryCommon
+    RUNTIME_DEPENDENCIES
+        Legacy::CrySystem
+        Legacy::EditorLib
+        ProjectManager
+)
+set_property(SOURCE
+    CryEdit.cpp
+    APPEND PROPERTY
+        COMPILE_DEFINITIONS LY_CMAKE_TARGET="Editor"
+)
+ly_add_translations(
+    TARGETS Editor
+    PREFIX Translations
+    FILES
+        Translations/editor_en-us.ts 
+        Translations/assetbrowser_en-us.ts 
+)
+ly_add_dependencies(Editor AssetProcessor)
+
+if(LY_DEFAULT_PROJECT_PATH)
+    set_property(TARGET Editor APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_DEFAULT_PROJECT_PATH}\"")
+endif()
+
+################################################################################
+# Tests
+################################################################################
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+
+    ly_add_target(
+        NAME EditorCore.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+        NAMESPACE Legacy
+        AUTOMOC
+        FILES_CMAKE
+            editor_core_test_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                .
+        BUILD_DEPENDENCIES
+            PRIVATE
+                AZ::AzTest
+                3rdParty::Qt::Gui
+                3rdParty::Qt::Widgets
+                Legacy::EditorCore
+                Legacy::CryCommon
+                AZ::AzCore
+    )
+    ly_add_googletest(
+        NAME Legacy::EditorCore.Tests
+    )
+
+    ly_add_target(
+        NAME EditorLib.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+        NAMESPACE Legacy
+        AUTOMOC
+        FILES_CMAKE
+            editor_lib_test_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                Include
+                .
+        COMPILE_DEFINITIONS
+            PRIVATE
+                ${LY_LEGACY_TERRAIN_EDITOR_DEFINES}
+        BUILD_DEPENDENCIES
+            PRIVATE
+                AZ::AzTest
+                3rdParty::Qt::Core
+                3rdParty::Qt::Gui
+                3rdParty::Qt::Widgets
+                Legacy::CryCommon
+                AZ::AzToolsFramework
+                Legacy::EditorLib
+        RUNTIME_DEPENDENCIES
+            Gem::LmbrCentral
+    )
+    ly_add_googletest(
+        NAME Legacy::EditorLib.Tests
+    )
+endif()
diff --git a/Code/Editor/CVarMenu.cpp b/Code/Editor/CVarMenu.cpp
new file mode 100644
index 0000000000..db34031337
--- /dev/null
+++ b/Code/Editor/CVarMenu.cpp
@@ -0,0 +1,185 @@
+/*
+ * 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 "CVarMenu.h"
+
+CVarMenu::CVarMenu(QWidget* parent)
+    : QMenu(parent)
+{
+}
+
+void CVarMenu::AddCVarToggleItem(CVarToggle cVarToggle)
+{
+    // Add CVar toggle action
+    QAction* action = addAction(cVarToggle.m_displayName);
+    connect(action, &QAction::triggered, [this, cVarToggle](bool checked)
+        {
+            // Update the CVar's value based on the action's new checked state
+            ICVar* cVar = gEnv->pConsole->GetCVar(cVarToggle.m_cVarName.toUtf8().data());
+            if (cVar)
+            {
+                SetCVar(cVar, checked ? cVarToggle.m_onValue : cVarToggle.m_offValue);
+            }
+        });
+    action->setCheckable(true);
+
+    // Initialize the action's checked state based on the associated CVar's value
+    ICVar* cVar = gEnv->pConsole->GetCVar(cVarToggle.m_cVarName.toUtf8().data());
+    bool checked = (cVar && cVar->GetFVal() == cVarToggle.m_onValue);
+    action->setChecked(checked);
+}
+
+void CVarMenu::AddCVarValuesItem(QString cVarName,
+    QString displayName,
+    CVarDisplayNameValuePairs availableCVarValues,
+    float offValue)
+{
+    // Add a submenu offering multiple values for one CVar
+    QMenu* menu = addMenu(displayName);
+    QActionGroup* group = new QActionGroup(menu);
+    group->setExclusive(true);
+
+    ICVar* cVar = gEnv->pConsole->GetCVar(cVarName.toUtf8().data());
+    float cVarValue = cVar ? cVar->GetFVal() : 0.0f;
+    for (const auto& availableCVarValue : availableCVarValues)
+    {
+        QAction* action = menu->addAction(availableCVarValue.first);
+        action->setCheckable(true);
+        group->addAction(action);
+
+        float availableOnValue = availableCVarValue.second;
+        connect(action, &QAction::triggered, [this, action, cVarName, availableOnValue, offValue](bool checked)
+            {
+                ICVar* cVar = gEnv->pConsole->GetCVar(cVarName.toUtf8().data());
+                if (cVar)
+                {
+                    if (!checked)
+                    {
+                        SetCVar(cVar, offValue);
+                    }
+                    else
+                    {
+                        // Toggle the CVar and update the action's checked state to
+                        // allow none of the items to be checked in the exclusive group.
+                        // Otherwise we could have just used the action's currently checked
+                        // state and updated the CVar's value only
+                        bool cVarOn = (cVar->GetFVal() == availableOnValue);
+                        checked = !cVarOn;
+                        SetCVar(cVar, checked ? availableOnValue : offValue);
+                        action->setChecked(checked);
+                    }
+                }
+            });
+
+        // Initialize the action's checked state based on the CVar's current value
+        bool checked = (cVarValue == availableOnValue);
+        action->setChecked(checked);
+    }
+}
+
+void CVarMenu::AddUniqueCVarsItem(QString displayName,
+    AZStd::vector<CVarToggle> availableCVars)
+{
+    // Add a submenu of actions offering values for unique CVars
+    QMenu* menu = addMenu(displayName);
+    QActionGroup* group = new QActionGroup(menu);
+    group->setExclusive(true);
+
+    for (const CVarToggle& availableCVar : availableCVars)
+    {
+        QAction* action = menu->addAction(availableCVar.m_displayName);
+        action->setCheckable(true);
+        group->addAction(action);
+
+        connect(action, &QAction::triggered, [this, action, availableCVar, availableCVars](bool checked)
+            {
+                ICVar* cVar = gEnv->pConsole->GetCVar(availableCVar.m_cVarName.toUtf8().data());
+                if (cVar)
+                {
+                    if (!checked)
+                    {
+                        SetCVar(cVar, availableCVar.m_offValue);
+                    }
+                    else
+                    {
+                        // Toggle the CVar and update the action's checked state to
+                        // allow none of the items to be checked in the exclusive group.
+                        // Otherwise we could have just used the action's currently checked
+                        // state and updated the CVar's value only
+                        bool cVarOn = (cVar->GetFVal() == availableCVar.m_onValue);
+                        bool cVarChecked = !cVarOn;
+                        SetCVar(cVar, cVarChecked ? availableCVar.m_onValue : availableCVar.m_offValue);
+                        action->setChecked(cVarChecked);
+                        if (cVarChecked)
+                        {
+                            // Set the rest of the CVars in the group to their off values
+                            SetCVarsToOffValue(availableCVars, availableCVar);
+                        }
+                    }
+                }
+            });
+
+        // Initialize the action's checked state based on its associated CVar's current value
+        ICVar* cVar = gEnv->pConsole->GetCVar(availableCVar.m_cVarName.toUtf8().data());
+        bool cVarChecked = (cVar && cVar->GetFVal() == availableCVar.m_onValue);
+        action->setChecked(cVarChecked);
+        if (cVarChecked)
+        {
+            // Set the rest of the CVars in the group to their off values
+            SetCVarsToOffValue(availableCVars, availableCVar);
+        }
+    }
+}
+
+void CVarMenu::AddResetCVarsItem()
+{
+    QAction* action = addAction(tr("Reset to Default"));
+    connect(action, &QAction::triggered, this, [this]()
+        {
+            for (auto it : m_originalCVarValues)
+            {
+                ICVar* cVar = gEnv->pConsole->GetCVar(it.first.c_str());
+                if (cVar)
+                {
+                    cVar->Set(it.second);
+                }
+            }
+        });
+}
+
+void CVarMenu::SetCVarsToOffValue(const AZStd::vector<CVarToggle>& cVarToggles, const CVarToggle& excludeCVarToggle)
+{
+    // Set all but the specified CVars to their off values
+    for (const CVarToggle& cVarToggle : cVarToggles)
+    {
+        if (cVarToggle.m_cVarName != excludeCVarToggle.m_cVarName
+            || cVarToggle.m_onValue != excludeCVarToggle.m_onValue)
+        {
+            ICVar* cVar = gEnv->pConsole->GetCVar(cVarToggle.m_cVarName.toUtf8().data());
+            if (cVar)
+            {
+                SetCVar(cVar, cVarToggle.m_offValue);
+            }
+        }
+    }
+}
+
+void CVarMenu::SetCVar(ICVar* cVar, float newValue)
+{
+    float oldValue = cVar->GetFVal();
+    cVar->Set(newValue);
+
+    // Store original value for CVar if not already in the list
+    m_originalCVarValues.emplace(AZStd::string(cVar->GetName()), oldValue);
+}
+
+void CVarMenu::AddSeparator()
+{
+    addSeparator();
+}
diff --git a/Code/Editor/CVarMenu.h b/Code/Editor/CVarMenu.h
new file mode 100644
index 0000000000..dd51e4c4ac
--- /dev/null
+++ b/Code/Editor/CVarMenu.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <QMenu>
+#include <QString>
+
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/utils.h>
+
+class CVarMenu
+    : public QMenu
+{
+public:
+    // CVar that can be toggled on and off
+    struct CVarToggle
+    {
+        QString m_cVarName;
+        QString m_displayName;
+        float m_onValue;
+        float m_offValue;
+    };
+
+    // List of a CVar's available values and their descriptions
+    using CVarDisplayNameValuePairs = AZStd::vector<AZStd::pair<QString, float>>;
+
+    CVarMenu(QWidget* parent = nullptr);
+
+    // Add an action that turns a CVar on/off
+    void AddCVarToggleItem(CVarToggle cVarToggle);
+
+    // Add a submenu of actions for a CVar that offers multiple values for exclusive selection
+    void AddCVarValuesItem(QString cVarName,
+        QString displayName,
+        CVarDisplayNameValuePairs availableCVarValues,
+        float offValue);
+
+    // Add a submenu of actions for exclusively turning unique CVars on/off
+    void AddUniqueCVarsItem(QString displayName,
+        AZStd::vector<CVarToggle> availableCVars);
+
+    // Add an action to reset all CVars to their original values before they
+    // were modified by this menu
+    void AddResetCVarsItem();
+
+    void AddSeparator();
+
+private:
+    void SetCVarsToOffValue(const AZStd::vector<CVarToggle>& cVarToggles, const CVarToggle& excludeCVarToggle);
+    void SetCVar(ICVar* cVar, float newValue);
+
+    // Original CVar values before they were modified by this menu
+    AZStd::unordered_map<AZStd::string, float> m_originalCVarValues;
+};
diff --git a/Code/Editor/CheckOutDialog.cpp b/Code/Editor/CheckOutDialog.cpp
new file mode 100644
index 0000000000..b744cd9d2e
--- /dev/null
+++ b/Code/Editor/CheckOutDialog.cpp
@@ -0,0 +1,134 @@
+/*
+ * 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 "CheckOutDialog.h"
+
+// Qt
+#include <QStyle>
+
+// AzToolsFramework
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h> // for AzToolsFramework::SourceControlConnectionRequestBus
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_CheckOutDialog.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+
+// CCheckOutDialog dialog
+int CCheckOutDialog::m_lastResult = CCheckOutDialog::CANCEL;
+
+CCheckOutDialog::CCheckOutDialog(const QString& file, QWidget* pParent)
+    : QDialog(pParent)
+    , m_ui(new Ui::CheckOutDialog)
+{
+    m_ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+    m_file = file;
+
+    m_ui->icon->setPixmap(style()->standardIcon(QStyle::SP_MessageBoxQuestion).pixmap(m_ui->icon->width()));
+
+    OnInitDialog();
+
+    connect(m_ui->buttonCancel, &QPushButton::clicked, this, &CCheckOutDialog::OnBnClickedCancel);
+    connect(m_ui->buttonCheckout, &QPushButton::clicked, this, &CCheckOutDialog::OnBnClickedCheckout);
+    connect(m_ui->buttonOverwrite, &QPushButton::clicked, this, &CCheckOutDialog::OnBnClickedOverwrite);
+}
+
+CCheckOutDialog::~CCheckOutDialog()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCheckOutDialog::OnBnClickedCancel()
+{
+    // Cancel operation
+    HandleResult(CANCEL);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CCheckOutDialog message handlers
+void CCheckOutDialog::OnBnClickedCheckout()
+{
+    // Check out this file.
+    HandleResult(CHECKOUT);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCheckOutDialog::OnBnClickedOverwrite()
+{
+    // Overwrite this file.
+    HandleResult(OVERWRITE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCheckOutDialog::HandleResult(int result)
+{
+    m_lastResult = result;
+    InstanceIsForAll() = m_ui->chkForAll->isChecked();
+    done(result);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCheckOutDialog::OnInitDialog()
+{
+    setWindowTitle(tr("Source Control"));
+
+    using namespace AzToolsFramework;
+    SourceControlState state = SourceControlState::Disabled;
+    SourceControlConnectionRequestBus::BroadcastResult(state, &SourceControlConnectionRequestBus::Events::GetSourceControlState);
+    bool sccAvailable = state == SourceControlState::Active ? true : false;
+
+    QString text(tr("%1\n\nis read-only, and needs to be writable to continue.").arg(m_file));
+
+    if (!sccAvailable)
+    {
+        text.append("\nEnable and connect to source control for more options.");
+    }
+
+    m_ui->m_text->setText(text);
+
+    m_ui->chkForAll->setEnabled(InstanceEnableForAll());
+    m_ui->chkForAll->setChecked(InstanceIsForAll());
+    m_ui->buttonCheckout->setEnabled(sccAvailable);
+
+    adjustSize();
+}
+
+//static ////////////////////////////////////////////////////////////////
+bool& CCheckOutDialog::InstanceEnableForAll()
+{
+    static bool isEnableForAll = false;
+    return isEnableForAll;
+}
+
+//static ////////////////////////////////////////////////////////////////
+bool& CCheckOutDialog::InstanceIsForAll()
+{
+    static bool isForAll = false;
+    return isForAll;
+}
+
+//static ////////////////////////////////////////////////////////////////
+bool CCheckOutDialog::EnableForAll(bool isEnable)
+{
+    bool bPrevEnable = InstanceEnableForAll();
+    InstanceEnableForAll() = isEnable;
+    if (!bPrevEnable || !isEnable)
+    {
+        InstanceIsForAll() = false;
+        m_lastResult = CANCEL;
+    }
+    return bPrevEnable;
+}
+
+#include <moc_CheckOutDialog.cpp>
diff --git a/Code/Editor/CheckOutDialog.h b/Code/Editor/CheckOutDialog.h
new file mode 100644
index 0000000000..d986a42c77
--- /dev/null
+++ b/Code/Editor/CheckOutDialog.h
@@ -0,0 +1,82 @@
+/*
+ * 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
+
+//////////////////////////////////////////////////////////////////////////
+// CCheckOutDialog dialog
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class CheckOutDialog;
+}
+
+class CCheckOutDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    // Checkout dialog result.
+    enum EResult
+    {
+        CHECKOUT = QDialog::Accepted,
+        OVERWRITE,
+        CANCEL = QDialog::Rejected
+    };
+
+    CCheckOutDialog(const QString& file, QWidget* pParent = NULL);   // standard constructor
+    virtual ~CCheckOutDialog();
+
+    // Dialog Data
+    void OnInitDialog();
+
+    // Enable functionality For All. In the end call with false to return it in init state.
+    // Returns previous enable state
+    static bool EnableForAll(bool isEnable);
+    static bool IsForAll() { return InstanceIsForAll(); }
+
+    static int LastResult() { return m_lastResult; }
+
+protected:
+    void OnBnClickedCancel();
+    void OnBnClickedCheckout();
+    void OnBnClickedOverwrite();
+
+private:
+    static bool& InstanceEnableForAll();
+    static bool& InstanceIsForAll();
+
+    void HandleResult(int result);
+
+    QString m_file;
+    QScopedPointer<Ui::CheckOutDialog> m_ui;
+
+    static int m_lastResult;
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CAutoCheckOutDialogEnableForAll
+{
+public:
+    CAutoCheckOutDialogEnableForAll()
+    {
+        m_bPrevState = CCheckOutDialog::EnableForAll(true);
+    }
+
+    ~CAutoCheckOutDialogEnableForAll()
+    {
+        CCheckOutDialog::EnableForAll(m_bPrevState);
+    }
+
+private:
+    bool m_bPrevState;
+};
diff --git a/Code/Sandbox/Editor/CheckOutDialog.ui b/Code/Editor/CheckOutDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/CheckOutDialog.ui
rename to Code/Editor/CheckOutDialog.ui
diff --git a/Code/Editor/Clipboard.cpp b/Code/Editor/Clipboard.cpp
new file mode 100644
index 0000000000..3b50dd4510
--- /dev/null
+++ b/Code/Editor/Clipboard.cpp
@@ -0,0 +1,134 @@
+/*
+ * 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 "Clipboard.h"
+
+#include "Util/Image.h"
+
+#include <QClipboard>
+#include <QMessageBox>
+#include <QVariant>
+
+XmlNodeRef CClipboard::m_node;
+QString CClipboard::m_title;
+QVariant CClipboard::s_pendingPut;
+
+//////////////////////////////////////////////////////////////////////////
+// Clipboard implementation.
+//////////////////////////////////////////////////////////////////////////
+CClipboard::CClipboard(QWidget* parent)
+    : m_parent(parent != nullptr ? parent : QApplication::activeWindow())
+{
+    m_putDebounce.setSingleShot(true);
+    m_putDebounce.setInterval(0);
+    // Wait one frame before setting clipboard contents, in case we're updated frequently
+    QObject::connect(&m_putDebounce, &QTimer::timeout, [this](){SendPendingPut();});
+}
+
+void CClipboard::Put(XmlNodeRef& node, const QString& title)
+{
+    m_title = title;
+    if (m_title.isEmpty())
+    {
+        m_title = node->getTag();
+    }
+    m_node = node;
+
+    PutString(m_node->getXML().c_str(), title);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CClipboard::Get() const
+{
+    QString str = GetString();
+    return XmlHelpers::LoadXmlFromBuffer(str.toUtf8().data(), str.toUtf8().length(), true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CClipboard::PutString(const QString& text, [[maybe_unused]] const QString& title /* = ""  */)
+{
+    s_pendingPut = text;
+    m_putDebounce.start();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CClipboard::GetString() const
+{
+    if (s_pendingPut.type() == QVariant::String)
+    {
+        return s_pendingPut.toString();
+    }
+    return QApplication::clipboard()->text();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CClipboard::IsEmpty() const
+{
+    return GetString().isEmpty();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CClipboard::PutImage(const CImageEx& img)
+{
+    QImage image(img.GetWidth(), img.GetHeight(), QImage::Format_RGBA8888);
+    s_pendingPut = image;
+    m_putDebounce.start();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CClipboard::GetImage(CImageEx& img)
+{
+    QImage image;
+    if (s_pendingPut.type() == QVariant::Image)
+    {
+        image = s_pendingPut.value<QImage>();
+    }
+    else
+    {
+        image = QApplication::clipboard()->image();
+    }
+
+    img.Allocate(image.width(), image.height());
+
+    unsigned char* pSrc = (unsigned char*)image.scanLine(0);
+    unsigned char* pDst = (unsigned char*)img.GetData();
+
+    int stSrc = (image.depth() == 24) ? 3 : 4;
+
+    for (int y = 0; y < image.height(); y++)
+    {
+        for (int x = 0; x < image.width(); x++)
+        {
+            pDst[x * 4 + (image.height() - y - 1) * image.width() * 4] = pSrc[x * stSrc + y * image.bytesPerLine()];
+            pDst[x * 4 + (image.height() - y - 1) * image.width() * 4 + 1] = pSrc[x * stSrc + y * image.bytesPerLine() + 1];
+            pDst[x * 4 + (image.height() - y - 1) * image.width() * 4 + 2] = pSrc[x * stSrc + y * image.bytesPerLine() + 2];
+            pDst[x * 4 + (image.height() - y - 1) * image.width() * 4 + 3] = 0;
+        }
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CClipboard::SendPendingPut()
+{
+    if (s_pendingPut.type() == QVariant::String)
+    {
+        QString text = s_pendingPut.toString();
+        QApplication::clipboard()->setText(text);
+    }
+    else if (s_pendingPut.type() == QVariant::Image)
+    {
+        QImage image = s_pendingPut.value<QImage>();
+        QApplication::clipboard()->setImage(image);
+    }
+    s_pendingPut = {};
+}
diff --git a/Code/Editor/Clipboard.h b/Code/Editor/Clipboard.h
new file mode 100644
index 0000000000..ccca0db028
--- /dev/null
+++ b/Code/Editor/Clipboard.h
@@ -0,0 +1,66 @@
+/*
+ * 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_CLIPBOARD_H
+#define CRYINCLUDE_EDITOR_CLIPBOARD_H
+
+#pragma once
+
+#include "Include/EditorCoreAPI.h"
+
+#include <QTimer>
+
+class CImageEx;
+class QVariant;
+class QWidget;
+
+/** Use this class to put and get stuff from windows clipboard.
+*/
+class EDITOR_CORE_API CClipboard
+{
+public:
+    CClipboard(QWidget* parent);
+
+    //! Put xml node into clipboard
+    void Put(XmlNodeRef& node, const QString& title = QString());
+    //! Get xml node to clipboard.
+    XmlNodeRef Get() const;
+
+    //! Put string into Windows clipboard.
+    void PutString(const QString& text, const QString& title = QString());
+    //! Get string from Windows clipboard.
+    QString GetString() const;
+
+    //! Return name of what is in clipboard now.
+    QString GetTitle() const { return m_title; };
+
+    //! Put image into Windows clipboard.
+    void PutImage(const CImageEx& img);
+
+    //! Get image from Windows clipboard.
+    bool GetImage(CImageEx& img);
+
+    //! Return true if clipboard is empty.
+    bool IsEmpty() const;
+private:
+    // Resolves the last request Put operation
+    void SendPendingPut();
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    static XmlNodeRef m_node;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    static QString m_title;
+
+    static QVariant s_pendingPut;
+
+    QWidget* m_parent;
+    QTimer m_putDebounce;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_CLIPBOARD_H
diff --git a/Code/Editor/Commands/CommandManager.cpp b/Code/Editor/Commands/CommandManager.cpp
new file mode 100644
index 0000000000..cda76eb152
--- /dev/null
+++ b/Code/Editor/Commands/CommandManager.cpp
@@ -0,0 +1,569 @@
+/*
+ * 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 "CommandManager.h"
+
+#include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
+
+// Editor
+#include "QtViewPaneManager.h"
+#include "Include/IIconManager.h"
+
+// AzToolsFramework
+#include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
+
+CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pFirst = 0;
+CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pLast = 0;
+
+CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::GetFirst()
+{
+    return s_pFirst;
+}
+
+CAutoRegisterCommandHelper::CAutoRegisterCommandHelper(void(*registerFunc)(CEditorCommandManager &))
+{
+    m_registerFunc = registerFunc;
+    m_pNext = 0;
+
+    if (!s_pLast)
+    {
+        s_pFirst = this;
+    }
+    else
+    {
+        s_pLast->m_pNext = this;
+    }
+
+    s_pLast = this;
+}
+
+CEditorCommandManager::CEditorCommandManager()
+    : m_bWarnDuplicate(true) {}
+
+void CEditorCommandManager::RegisterAutoCommands()
+{
+    CAutoRegisterCommandHelper* pHelper = CAutoRegisterCommandHelper::GetFirst();
+
+    while (pHelper)
+    {
+        pHelper->m_registerFunc(*this);
+        pHelper = pHelper->m_pNext;
+    }
+}
+
+CEditorCommandManager::~CEditorCommandManager()
+{
+    CommandTable::const_iterator iter = m_commands.begin(), end = m_commands.end();
+
+    for (; iter != end; ++iter)
+    {
+        if (iter->second.deleter)
+        {
+            iter->second.deleter(iter->second.pCommand);
+        }
+        else
+        {
+            delete iter->second.pCommand;
+        }
+    }
+
+    m_commands.clear();
+    m_uiCommands.clear();
+}
+
+string CEditorCommandManager::GetFullCommandName(const string& module, const string& name)
+{
+    string fullName = module;
+    fullName += ".";
+    fullName += name;
+    return fullName;
+}
+
+bool CEditorCommandManager::AddCommand(CCommand* pCommand, TPfnDeleter deleter)
+{
+    assert(pCommand);
+
+    string module = pCommand->GetModule();
+    string name = pCommand->GetName();
+
+    if (IsRegistered(module, name) && m_bWarnDuplicate)
+    {
+        QString errMsg;
+
+        errMsg = QStringLiteral("Error: Command %1.%2 already registered!").arg(module.c_str(), name.c_str());
+        Warning(errMsg.toUtf8().data());
+
+        return false;
+    }
+
+    SCommandTableEntry entry;
+
+    entry.pCommand = pCommand;
+    entry.deleter = deleter;
+
+    m_commands.insert(
+        CommandTable::value_type(GetFullCommandName(module, name),
+            entry));
+
+    return true;
+}
+
+bool CEditorCommandManager::UnregisterCommand(const char* module, const char* name)
+{
+    string fullName = GetFullCommandName(module, name);
+    CommandTable::iterator itr = m_commands.find(fullName);
+
+    if (itr != m_commands.end())
+    {
+        if (itr->second.deleter)
+        {
+            itr->second.deleter(itr->second.pCommand);
+        }
+        else
+        {
+            delete itr->second.pCommand;
+        }
+
+        m_commands.erase(itr);
+
+        return true;
+    }
+    return false;
+}
+
+bool CEditorCommandManager::RegisterUICommand(
+    const char* module,
+    const char* name,
+    const char* description,
+    const char* example,
+    const AZStd::function<void()>& functor,
+    const CCommand0::SUIInfo& uiInfo)
+{
+    bool ok = CommandManagerHelper::RegisterCommand(this, module, name, description, example, functor);
+
+    if (ok == false)
+    {
+        return false;
+    }
+
+    return AttachUIInfo(GetFullCommandName(module, name), uiInfo);
+}
+
+bool CEditorCommandManager::AttachUIInfo(const char* fullCmdName, const CCommand0::SUIInfo& uiInfo)
+{
+    CommandTable::iterator iter = m_commands.find(fullCmdName);
+
+    if (iter == m_commands.end())
+    {
+        return false;
+    }
+
+    if (iter->second.pCommand->CanBeUICommand() == false)
+    {
+        return false;
+    }
+
+    CCommand0* pCommand = static_cast<CCommand0*>(iter->second.pCommand);
+
+    pCommand->m_uiInfo = uiInfo;
+
+    if (pCommand->m_uiInfo.commandId == 0)
+    {
+        pCommand->m_uiInfo.commandId = GenNewCommandId();
+    }
+
+    m_uiCommands.insert(UICommandTable::value_type(pCommand->m_uiInfo.commandId, pCommand));
+
+    if (uiInfo.iconFilename.empty() == false)
+    {
+        GetIEditor()->GetIconManager()->RegisterCommandIcon(uiInfo.iconFilename.c_str(), pCommand->m_uiInfo.commandId);
+    }
+
+    return true;
+}
+
+bool CEditorCommandManager::GetUIInfo(const string& module, const string& name, CCommand0::SUIInfo& uiInfo) const
+{
+    string fullName = GetFullCommandName(module, name);
+
+    return GetUIInfo(fullName, uiInfo);
+}
+
+bool CEditorCommandManager::GetUIInfo(const string& fullCmdName, CCommand0::SUIInfo& uiInfo) const
+{
+    CommandTable::const_iterator iter = m_commands.find(fullCmdName);
+
+    if (iter == m_commands.end())
+    {
+        return false;
+    }
+
+    if (iter->second.pCommand->CanBeUICommand() == false)
+    {
+        return false;
+    }
+
+    CCommand0* pCommand = static_cast<CCommand0*>(iter->second.pCommand);
+    uiInfo = pCommand->m_uiInfo;
+
+    return true;
+}
+
+int CEditorCommandManager::GenNewCommandId()
+{
+    static int uniqueId = CUSTOM_COMMAND_ID_FIRST;
+    return uniqueId++;
+}
+
+QString CEditorCommandManager::Execute(const string& module, const string& name, const CCommand::CArgs& args)
+{
+    string fullName = GetFullCommandName(module, name);
+    CommandTable::iterator iter = m_commands.find(fullName);
+
+    if (iter != m_commands.end())
+    {
+        LogCommand(fullName, args);
+
+        return ExecuteAndLogReturn(iter->second.pCommand, args);
+    }
+    else
+    {
+        QString errMsg;
+
+        errMsg = QStringLiteral("Error: Trying to execute a unknown command, '%1'!").arg(fullName.c_str());
+        CryLogAlways(errMsg.toUtf8().data());
+    }
+
+    return "";
+}
+
+QString CEditorCommandManager::Execute(const string& cmdLine)
+{
+    string cmdTxt, argsTxt;
+    size_t argStart = cmdLine.find_first_of(' ');
+
+    cmdTxt = cmdLine.substr(0, argStart);
+    argsTxt = "";
+
+    if (argStart != string::npos)
+    {
+        argsTxt = cmdLine.substr(argStart + 1);
+        argsTxt.Trim();
+    }
+
+    CommandTable::iterator itr = m_commands.find(cmdTxt);
+
+    if (itr != m_commands.end())
+    {
+        CCommand::CArgs argList;
+
+        GetArgsFromString(argsTxt, argList);
+        LogCommand(cmdTxt, argList);
+
+        return ExecuteAndLogReturn(itr->second.pCommand, argList);
+    }
+    else
+    {
+        QString errMsg;
+
+        errMsg = QStringLiteral("Error: Trying to execute a unknown command, '%1'!").arg(cmdLine.c_str());
+        CryLogAlways(errMsg.toUtf8().data());
+    }
+
+    return "";
+}
+
+void CEditorCommandManager::Execute(int commandId)
+{
+    UICommandTable::iterator iter = m_uiCommands.find(commandId);
+
+    if (iter != m_uiCommands.end())
+    {
+        LogCommand(
+            GetFullCommandName(iter->second->GetModule(), iter->second->GetName()),
+            CCommand::CArgs());
+        iter->second->Execute(CCommand::CArgs());
+    }
+    else
+    {
+        QString errMsg;
+
+        errMsg = QStringLiteral("Error: Trying to execute a unknown command of ID '%1'!").arg(commandId);
+        CryLogAlways(errMsg.toUtf8().data());
+    }
+}
+
+void CEditorCommandManager::GetCommandList(std::vector<string>& cmds) const
+{
+    cmds.clear();
+    cmds.reserve(m_commands.size());
+    CommandTable::const_iterator iter = m_commands.begin(), end = m_commands.end();
+
+    for (; iter != end; ++iter)
+    {
+        cmds.push_back(iter->first);
+    }
+
+    std::sort(cmds.begin(), cmds.end());
+}
+
+string CEditorCommandManager::AutoComplete(const string& substr) const
+{
+    std::vector<string> cmds;
+    GetCommandList(cmds);
+
+    // If substring is empty return first command.
+    if (substr.empty() && (cmds.empty() == false))
+    {
+        return cmds[0];
+    }
+
+    size_t substrLen = substr.length();
+
+    for (size_t i = 0; i < cmds.size(); ++i)
+    {
+        size_t cmdLen = cmds[i].length();
+
+        if (cmdLen >= substrLen && !strncmp(cmds[i].c_str(), substr.c_str(), substrLen))
+        {
+            if (substrLen == cmdLen)
+            {
+                ++i;
+
+                if (i < cmds.size())
+                {
+                    return cmds[i];
+                }
+                else
+                {
+                    return cmds[i - 1];
+                }
+            }
+
+            return cmds[i];
+        }
+    }
+
+    // Not found
+    return "";
+}
+
+bool CEditorCommandManager::IsRegistered(const char* module, const char* name) const
+{
+    string fullName = GetFullCommandName(module, name);
+    CommandTable::const_iterator iter = m_commands.find(fullName);
+
+    if (iter != m_commands.end())
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool CEditorCommandManager::IsRegistered(const char* cmdLine_) const
+{
+    string cmdTxt, argsTxt, cmdLine(cmdLine_);
+    size_t argStart = cmdLine.find_first_of(' ');
+    cmdTxt = cmdLine.substr(0, argStart);
+    CommandTable::const_iterator iter = m_commands.find(cmdTxt);
+
+    if (iter != m_commands.end())
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool CEditorCommandManager::IsRegistered(int commandId) const
+{
+    if (CUSTOM_COMMAND_ID_FIRST <= commandId && commandId < CUSTOM_COMMAND_ID_LAST)
+    {
+        UICommandTable::const_iterator iter = m_uiCommands.find(commandId);
+
+        if (iter != m_uiCommands.end())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+void CEditorCommandManager::SetCommandAvailableInScripting(const string& module, const string& name)
+{
+    string fullName = GetFullCommandName(module, name);
+    CommandTable::iterator iter = m_commands.find(fullName);
+
+    if (iter != m_commands.end())
+    {
+        iter->second.pCommand->SetAvailableInScripting();
+    }
+}
+
+bool CEditorCommandManager::IsCommandAvailableInScripting(const string& fullCmdName) const
+{
+    CommandTable::const_iterator iter = m_commands.find(fullCmdName);
+
+    if (iter != m_commands.end())
+    {
+        return iter->second.pCommand->IsAvailableInScripting();
+    }
+
+    return false;
+}
+
+bool CEditorCommandManager::IsCommandAvailableInScripting(const string& module, const string& name) const
+{
+    string fullName = GetFullCommandName(module, name);
+
+    return IsCommandAvailableInScripting(fullName);
+}
+
+void CEditorCommandManager::LogCommand(const string& fullCmdName, const CCommand::CArgs& args) const
+{
+    string cmdLine = fullCmdName;
+
+    for (int i = 0; i < args.GetArgCount(); ++i)
+    {
+        cmdLine += " ";
+        bool bString = args.IsStringArg(i);
+
+        if (bString)
+        {
+            cmdLine += "'";
+        }
+
+        cmdLine += args.GetArg(i);
+
+        if (bString)
+        {
+            cmdLine += "'";
+        }
+    }
+
+    CLogFile::WriteLine(cmdLine.c_str());
+
+    if (IsCommandAvailableInScripting(fullCmdName) == false)
+    {
+        return;
+    }
+
+    /// If this same command is also available in the script system,
+    /// log this to the script terminal, too.
+
+    // First, recreate a command line to be compatible to the script system.
+    cmdLine = fullCmdName;
+    cmdLine += "(";
+
+    for (int i = 0; i < args.GetArgCount(); ++i)
+    {
+        bool bString = args.IsStringArg(i);
+
+        if (bString)
+        {
+            cmdLine += "\"";
+        }
+
+        cmdLine += args.GetArg(i);
+
+        if (bString)
+        {
+            cmdLine += "\"";
+        }
+
+        if (i < args.GetArgCount() - 1)
+        {
+            cmdLine += ",";
+        }
+    }
+
+    cmdLine += ")";
+
+    // If it's not SandBox main editor (one case is the standalone material editor triggered by 3ds Max exporter),
+    // we should not cast it into main editor for further operation.
+    if (GetIEditor()->IsInMatEditMode())
+    {
+        return;
+    }
+
+    // Then, register it to the terminal.
+    QtViewPane* scriptTermPane = QtViewPaneManager::instance()->GetPane(SCRIPT_TERM_WINDOW_NAME);
+    if (!scriptTermPane)
+    {
+        return;
+    }
+    AzToolsFramework::CScriptTermDialog* pScriptTermDialog = qobject_cast<AzToolsFramework::CScriptTermDialog*>(scriptTermPane->Widget());
+
+    if (pScriptTermDialog)
+    {
+        string text = "> ";
+        text += cmdLine;
+        text += "\r\n";
+        pScriptTermDialog->AppendText(text.c_str());
+    }
+}
+
+QString CEditorCommandManager::ExecuteAndLogReturn(CCommand* pCommand, const CCommand::CArgs& args)
+{
+    const QString result = pCommand->Execute(args);
+    const QString returnMsg = QString("Returned: %1").arg(result);
+
+    CLogFile::WriteLine(returnMsg.toUtf8().constData());
+
+    return result;
+}
+
+void CEditorCommandManager::GetArgsFromString(const string& argsTxt, CCommand::CArgs& argList)
+{
+    const char quoteSymbol = '\'';
+    int curPos = 0;
+    int prevPos = 0;
+    string arg = argsTxt.Tokenize(" ", curPos);
+
+    while (!arg.empty())
+    {
+        if (arg[0] == quoteSymbol)   // A special consideration for a quoted string
+        {
+            if (arg.length() < 2 || arg[arg.length() - 1] != quoteSymbol)
+            {
+                size_t openingQuotePos = argsTxt.find(quoteSymbol, prevPos);
+                size_t closingQuotePos = argsTxt.find(quoteSymbol, curPos);
+
+                if (closingQuotePos != string::npos)
+                {
+                    arg = argsTxt.substr(openingQuotePos + 1, closingQuotePos - openingQuotePos - 1);
+                    size_t nextArgPos = argsTxt.find(' ', closingQuotePos + 1);
+                    curPos = nextArgPos != string::npos ? nextArgPos + 1 : argsTxt.length();
+
+                    for (; curPos < argsTxt.length(); ++curPos)    // Skip spaces.
+                    {
+                        if (argsTxt[curPos] != ' ')
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                arg = arg.substr(1, arg.length() - 2);
+            }
+        }
+
+        argList.Add(arg.c_str());
+        prevPos = curPos;
+        arg = argsTxt.Tokenize(" ", curPos);
+    }
+}
diff --git a/Code/Editor/Commands/CommandManager.h b/Code/Editor/Commands/CommandManager.h
new file mode 100644
index 0000000000..96808ee59f
--- /dev/null
+++ b/Code/Editor/Commands/CommandManager.h
@@ -0,0 +1,117 @@
+/*
+ * 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 : the command manager
+
+
+#ifndef CRYINCLUDE_EDITOR_COMMANDS_COMMANDMANAGER_H
+#define CRYINCLUDE_EDITOR_COMMANDS_COMMANDMANAGER_H
+#pragma once
+
+#include "platform.h"
+
+#include <ISystem.h>
+
+#include "Include/SandboxAPI.h"
+#include "Include/ICommandManager.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+class SANDBOX_API CEditorCommandManager
+    : public ICommandManager
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    enum
+    {
+        CUSTOM_COMMAND_ID_FIRST = 10000,
+        CUSTOM_COMMAND_ID_LAST  = 15000
+    };
+
+    CEditorCommandManager();
+    ~CEditorCommandManager();
+
+    void RegisterAutoCommands();
+
+    bool AddCommand(CCommand* pCommand, TPfnDeleter deleter = NULL);
+    bool UnregisterCommand(const char* module, const char* name);
+    bool RegisterUICommand(
+        const char* module,
+        const char* name,
+        const char* description,
+        const char* example,
+        const AZStd::function<void()>& functor,
+        const CCommand0::SUIInfo& uiInfo);
+    bool AttachUIInfo(const char* fullCmdName, const CCommand0::SUIInfo& uiInfo);
+    bool GetUIInfo(const string& module, const string& name, CCommand0::SUIInfo& uiInfo) const;
+    bool GetUIInfo(const string& fullCmdName, CCommand0::SUIInfo& uiInfo) const;
+    QString Execute(const string& cmdLine);
+    QString Execute(const string& module, const string& name, const CCommand::CArgs& args);
+    void Execute(int commandId);
+    void GetCommandList(std::vector<string>& cmds) const;
+    //! Used in the console dialog
+    string AutoComplete(const string& substr) const;
+    bool IsRegistered(const char* module, const char* name) const;
+    bool IsRegistered(const char* cmdLine) const;
+    bool IsRegistered(int commandId) const;
+    void SetCommandAvailableInScripting(const string& module, const string& name);
+    bool IsCommandAvailableInScripting(const string& module, const string& name) const;
+    bool IsCommandAvailableInScripting(const string& fullCmdName) const;
+    //! Turning off the warning is needed for reloading the ribbon bar.
+    void TurnDuplicateWarningOn() { m_bWarnDuplicate = true; }
+    void TurnDuplicateWarningOff() { m_bWarnDuplicate = false; }
+
+protected:
+    struct SCommandTableEntry
+    {
+        CCommand* pCommand;
+        TPfnDeleter deleter;
+    };
+
+    //! A full command name to an actual command mapping
+    typedef std::map<string, SCommandTableEntry> CommandTable;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    CommandTable m_commands;
+
+    //! A command ID to an actual UI command mapping
+    //! This table will contain a subset of commands among all registered to the above table.
+    typedef std::map<int, CCommand0*> UICommandTable;
+    UICommandTable m_uiCommands;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    bool m_bWarnDuplicate;
+
+    static int GenNewCommandId();
+    static string GetFullCommandName(const string& module, const string& name);
+    static void GetArgsFromString(const string& argsTxt, CCommand::CArgs& argList);
+    void LogCommand(const string& fullCmdName, const CCommand::CArgs& args) const;
+    QString ExecuteAndLogReturn(CCommand* pCommand, const CCommand::CArgs& args);
+};
+
+//! A helper class for an automatic command registration
+class SANDBOX_API CAutoRegisterCommandHelper
+{
+public:
+    static CAutoRegisterCommandHelper* GetFirst();
+
+    CAutoRegisterCommandHelper(void(*registerFunc)(CEditorCommandManager &));
+    void (* m_registerFunc)(CEditorCommandManager&);
+    CAutoRegisterCommandHelper* m_pNext;
+
+private:
+
+    static CAutoRegisterCommandHelper* s_pFirst;
+    static CAutoRegisterCommandHelper* s_pLast;
+};
+
+#define REGISTER_EDITOR_COMMAND(boundFunction, moduleName, functionName, description, example)                                  \
+    void RegisterCommand##moduleName##functionName(CEditorCommandManager & cmdMgr)                                              \
+    {                                                                                                                           \
+        CommandManagerHelper::RegisterCommand(&cmdMgr, #moduleName, #functionName, description, example, boundFunction);        \
+    }                                                                                                                           \
+    CAutoRegisterCommandHelper g_AutoRegCmdHelper##moduleName##functionName(RegisterCommand##moduleName##functionName)
+
+#endif // CRYINCLUDE_EDITOR_COMMANDS_COMMANDMANAGER_H
diff --git a/Code/Editor/Commands/CommandManagerBus.h b/Code/Editor/Commands/CommandManagerBus.h
new file mode 100644
index 0000000000..ee9eaf7be2
--- /dev/null
+++ b/Code/Editor/Commands/CommandManagerBus.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/EBus/EBus.h>
+
+class CommandManagerRequests : public AZ::EBusTraits
+{
+public:
+
+    struct CommandDetails
+    {
+        AZStd::string m_name;
+        AZStd::vector<AZStd::string> m_arguments;
+    };
+
+    virtual AZStd::vector<AZStd::string> GetCommands() const = 0;
+    virtual void ExecuteCommand(const AZStd::string& commandLine) {}
+
+    virtual void GetCommandDetails(AZStd::string commandName, CommandDetails& outArguments) const = 0;
+
+};
+
+using CommandManagerRequestBus = AZ::EBus<CommandManagerRequests>;
diff --git a/Code/Sandbox/Editor/Common/spline_edit-00.png b/Code/Editor/Common/spline_edit-00.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-00.png
rename to Code/Editor/Common/spline_edit-00.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-01.png b/Code/Editor/Common/spline_edit-01.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-01.png
rename to Code/Editor/Common/spline_edit-01.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-02.png b/Code/Editor/Common/spline_edit-02.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-02.png
rename to Code/Editor/Common/spline_edit-02.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-03.png b/Code/Editor/Common/spline_edit-03.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-03.png
rename to Code/Editor/Common/spline_edit-03.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-04.png b/Code/Editor/Common/spline_edit-04.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-04.png
rename to Code/Editor/Common/spline_edit-04.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-05.png b/Code/Editor/Common/spline_edit-05.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-05.png
rename to Code/Editor/Common/spline_edit-05.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-06.png b/Code/Editor/Common/spline_edit-06.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-06.png
rename to Code/Editor/Common/spline_edit-06.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-07.png b/Code/Editor/Common/spline_edit-07.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-07.png
rename to Code/Editor/Common/spline_edit-07.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-08.png b/Code/Editor/Common/spline_edit-08.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-08.png
rename to Code/Editor/Common/spline_edit-08.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-09.png b/Code/Editor/Common/spline_edit-09.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-09.png
rename to Code/Editor/Common/spline_edit-09.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-10.png b/Code/Editor/Common/spline_edit-10.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-10.png
rename to Code/Editor/Common/spline_edit-10.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-11.png b/Code/Editor/Common/spline_edit-11.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-11.png
rename to Code/Editor/Common/spline_edit-11.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-12.png b/Code/Editor/Common/spline_edit-12.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-12.png
rename to Code/Editor/Common/spline_edit-12.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-13.png b/Code/Editor/Common/spline_edit-13.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-13.png
rename to Code/Editor/Common/spline_edit-13.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-14.png b/Code/Editor/Common/spline_edit-14.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-14.png
rename to Code/Editor/Common/spline_edit-14.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-15.png b/Code/Editor/Common/spline_edit-15.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-15.png
rename to Code/Editor/Common/spline_edit-15.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-16.png b/Code/Editor/Common/spline_edit-16.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-16.png
rename to Code/Editor/Common/spline_edit-16.png
diff --git a/Code/Editor/ConfigGroup.cpp b/Code/Editor/ConfigGroup.cpp
new file mode 100644
index 0000000000..fd1a18a36c
--- /dev/null
+++ b/Code/Editor/ConfigGroup.cpp
@@ -0,0 +1,202 @@
+/*
+ * 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 "ConfigGroup.h"
+
+namespace Config
+{
+    CConfigGroup::CConfigGroup()
+    {
+    }
+
+    CConfigGroup::~CConfigGroup()
+    {
+        for (TConfigVariables::const_iterator it = m_vars.begin();
+             it != m_vars.end(); ++it)
+        {
+            delete (*it);
+        }
+    }
+
+    void CConfigGroup::AddVar(IConfigVar* var)
+    {
+        m_vars.push_back(var);
+    }
+
+    uint32 CConfigGroup::GetVarCount()
+    {
+        return m_vars.size();
+    }
+
+    IConfigVar* CConfigGroup::GetVar(const char* szName)
+    {
+        for (TConfigVariables::const_iterator it = m_vars.begin();
+             it != m_vars.end(); ++it)
+        {
+            IConfigVar* var = (*it);
+            if (0 == _stricmp(szName, var->GetName().c_str()))
+            {
+                return var;
+            }
+        }
+
+        return NULL;
+    }
+
+    const IConfigVar* CConfigGroup::GetVar(const char* szName) const
+    {
+        for (TConfigVariables::const_iterator it = m_vars.begin();
+             it != m_vars.end(); ++it)
+        {
+            IConfigVar* var = (*it);
+            if (0 == _stricmp(szName, var->GetName().c_str()))
+            {
+                return var;
+            }
+        }
+
+        return NULL;
+    }
+
+    IConfigVar* CConfigGroup::GetVar(uint index)
+    {
+        if (index < m_vars.size())
+        {
+            return m_vars[index];
+        }
+
+        return NULL;
+    }
+
+    const IConfigVar* CConfigGroup::GetVar(uint index) const
+    {
+        if (index < m_vars.size())
+        {
+            return m_vars[index];
+        }
+
+        return NULL;
+    }
+
+    void CConfigGroup::SaveToXML(XmlNodeRef node)
+    {
+        // save only values that don't have default values
+        for (TConfigVariables::const_iterator it = m_vars.begin();
+             it != m_vars.end(); ++it)
+        {
+            IConfigVar* var = (*it);
+            if (!var->IsFlagSet(IConfigVar::eFlag_DoNotSave))
+            {
+                if (!var->IsDefault())
+                {
+                    const char* szName = var->GetName().c_str();
+
+                    switch (var->GetType())
+                    {
+                    case IConfigVar::eType_BOOL:
+                    {
+                        bool currentValue = false;
+                        var->Get(&currentValue);
+                        node->setAttr(szName, currentValue);
+                        break;
+                    }
+
+                    case IConfigVar::eType_INT:
+                    {
+                        int currentValue = 0;
+                        var->Get(&currentValue);
+                        node->setAttr(szName, currentValue);
+                        break;
+                    }
+
+                    case IConfigVar::eType_FLOAT:
+                    {
+                        float currentValue = 0;
+                        var->Get(&currentValue);
+                        node->setAttr(szName, currentValue);
+                        break;
+                    }
+
+                    case IConfigVar::eType_STRING:
+                    {
+                        string currentValue = 0;
+                        var->Get(&currentValue);
+                        node->setAttr(szName, currentValue);
+                        break;
+                    }
+                    }
+                }
+            }
+        }
+    }
+
+    void CConfigGroup::LoadFromXML(XmlNodeRef node)
+    {
+        // save only values that don't have default values
+        for (TConfigVariables::const_iterator it = m_vars.begin();
+             it != m_vars.end(); ++it)
+        {
+            IConfigVar* var = (*it);
+            if (!var->IsFlagSet(IConfigVar::eFlag_DoNotSave))
+            {
+                const char* szName = var->GetName().c_str();
+
+                switch (var->GetType())
+                {
+                case IConfigVar::eType_BOOL:
+                {
+                    bool currentValue = false;
+                    var->GetDefault(&currentValue);
+                    if (node->getAttr(szName, currentValue))
+                    {
+                        var->Set(&currentValue);
+                    }
+                    break;
+                }
+
+                case IConfigVar::eType_INT:
+                {
+                    int currentValue = 0;
+                    var->GetDefault(&currentValue);
+                    if (node->getAttr(szName, currentValue))
+                    {
+                        var->Set(&currentValue);
+                    }
+                    break;
+                }
+
+                case IConfigVar::eType_FLOAT:
+                {
+                    float currentValue = 0;
+                    var->GetDefault(&currentValue);
+                    if (node->getAttr(szName, currentValue))
+                    {
+                        var->Set(&currentValue);
+                    }
+                    break;
+                }
+
+                case IConfigVar::eType_STRING:
+                {
+                    string currentValue = 0;
+                    var->GetDefault(&currentValue);
+                    QString readValue(currentValue.c_str());
+                    if (node->getAttr(szName, readValue))
+                    {
+                        currentValue = readValue.toUtf8().data();
+                        var->Set(&currentValue);
+                    }
+                    break;
+                }
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Editor/ConfigGroup.h b/Code/Editor/ConfigGroup.h
new file mode 100644
index 0000000000..de970f16f7
--- /dev/null
+++ b/Code/Editor/ConfigGroup.h
@@ -0,0 +1,160 @@
+/*
+ * 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_EDITOR_CONFIGGROUP_H
+#define CRYINCLUDE_EDITOR_CONFIGGROUP_H
+
+namespace Config
+{
+    // Abstract configurable variable
+    struct IConfigVar
+    {
+    public:
+        enum EType
+        {
+            eType_BOOL,
+            eType_INT,
+            eType_FLOAT,
+            eType_STRING,
+        };
+
+        enum EFlags
+        {
+            eFlag_NoUI = 1 << 0,
+            eFlag_NoCVar = 1 << 1,
+            eFlag_DoNotSave = 1 << 2,
+        };
+
+        IConfigVar(const char* szName, const char* szDescription, EType varType, uint8 flags)
+            : m_name(szName)
+            , m_description(szDescription)
+            , m_type(varType)
+            , m_flags(flags)
+            , m_ptr(NULL)
+        {};
+
+        virtual ~IConfigVar() = default;
+        
+        ILINE EType GetType() const
+        {
+            return m_type;
+        }
+
+        ILINE const string& GetName() const
+        {
+            return m_name;
+        }
+
+        ILINE const string& GetDescription() const
+        {
+            return m_description;
+        }
+
+        ILINE bool IsFlagSet(EFlags flag) const
+        {
+            return 0 != (m_flags & flag);
+        }
+
+        virtual void Get(void* outPtr) const = 0;
+        virtual void Set(const void* ptr) = 0;
+        virtual bool IsDefault() const = 0;
+        virtual void GetDefault(void* outPtr) const = 0;
+        virtual void Reset() = 0;
+
+        static EType TranslateType(const bool&) { return eType_BOOL; }
+        static EType TranslateType(const int&) { return eType_INT; }
+        static EType TranslateType(const float&) { return eType_FLOAT; }
+        static EType TranslateType(const string&) { return eType_STRING; }
+
+    protected:
+        EType m_type;
+        uint8 m_flags;
+        string m_name;
+        string m_description;
+        void* m_ptr;
+        ICVar* m_pCVar;
+    };
+
+    // Typed wrapper for config variable
+    template<class T>
+    class TConfigVar
+        : public IConfigVar
+    {
+    private:
+        T m_default;
+
+    public:
+        TConfigVar(const char* szName, const char* szDescription, uint8 flags, T& ptr, const T& defaultValue)
+            : IConfigVar(szName, szDescription, IConfigVar::TranslateType(ptr), flags)
+            , m_default(defaultValue)
+        {
+            m_ptr = &ptr;
+
+            // reset to default value on initializations
+            ptr = defaultValue;
+        }
+
+        virtual void Get(void* outPtr) const
+        {
+            *reinterpret_cast<T*>(outPtr) = *reinterpret_cast<const T*>(m_ptr);
+        }
+
+        virtual void Set(const void* ptr)
+        {
+            *reinterpret_cast<T*>(m_ptr) = *reinterpret_cast<const T*>(ptr);
+        }
+
+        virtual void Reset()
+        {
+            *reinterpret_cast<T*>(m_ptr) = m_default;
+        }
+
+        virtual void GetDefault(void* outPtr) const
+        {
+            *reinterpret_cast<T*>(outPtr) = m_default;
+        }
+
+        virtual bool IsDefault() const
+        {
+            return *reinterpret_cast<const T*>(m_ptr) == m_default;
+        }
+    };
+
+    // Group of configuration variables with optional mapping to CVars
+    class CConfigGroup
+    {
+    private:
+        typedef std::vector<IConfigVar*> TConfigVariables;
+        TConfigVariables m_vars;
+
+        typedef std::vector<ICVar*> TConsoleVariables;
+        TConsoleVariables m_consoleVars;
+
+    public:
+        CConfigGroup();
+        virtual ~CConfigGroup();
+
+        void AddVar(IConfigVar* var);
+        uint32 GetVarCount();
+        IConfigVar* GetVar(const char* szName);
+        IConfigVar* GetVar(uint index);
+        const IConfigVar* GetVar(const char* szName) const;
+        const IConfigVar* GetVar(uint index) const;
+
+        void SaveToXML(XmlNodeRef node);
+        void LoadFromXML(XmlNodeRef node);
+
+        template<class T>
+        void AddVar(const char* szName, const char* szDescription, T& var, const T& defaultValue, uint8 flags = 0)
+        {
+            AddVar(new TConfigVar<T>(szName, szDescription, flags, var, defaultValue));
+        }
+    };
+};
+#endif // CRYINCLUDE_EDITOR_CONFIGGROUP_H
diff --git a/Code/Editor/ConsoleDialog.cpp b/Code/Editor/ConsoleDialog.cpp
new file mode 100644
index 0000000000..42afc02b96
--- /dev/null
+++ b/Code/Editor/ConsoleDialog.cpp
@@ -0,0 +1,51 @@
+/*
+ * 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 "ConsoleDialog.h"
+
+// Qt
+#include <QVBoxLayout>
+
+// Editor
+#include "Controls/ConsoleSCB.h"    // For CConsoleSCB
+#include "LyViewPaneNames.h"        // for LyViewPane::
+
+
+CConsoleDialog::CConsoleDialog(QWidget* parent)
+    : QDialog(parent)
+    , m_consoleWidget(new CConsoleSCB(this))
+{
+    QVBoxLayout* outterLayout = new QVBoxLayout(this);
+    outterLayout->addWidget(m_consoleWidget);
+    outterLayout->setMargin(0);
+
+    setWindowTitle(LyViewPane::Console);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    resize(842, 480);
+}
+
+void CConsoleDialog::SetInfoText(const char* text)
+{
+    if (gEnv && gEnv->pLog)                             // before log system was initialized
+    {
+        CryLogAlways(text);
+    }
+}
+
+void CConsoleDialog::closeEvent(QCloseEvent* ev)
+{
+    if (GetISystem())
+    {
+        GetISystem()->Quit();
+    }
+    QDialog::closeEvent(ev);
+}
+
+#include <moc_ConsoleDialog.cpp>
diff --git a/Code/Editor/ConsoleDialog.h b/Code/Editor/ConsoleDialog.h
new file mode 100644
index 0000000000..717334e460
--- /dev/null
+++ b/Code/Editor/ConsoleDialog.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_CONSOLEDIALOG_H
+#define CRYINCLUDE_EDITOR_CONSOLEDIALOG_H
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+class CConsoleSCB;
+
+class CConsoleDialog
+    : public QDialog
+    , public IInitializeUIInfo
+{
+    Q_OBJECT
+public:
+    explicit CConsoleDialog(QWidget* parent = nullptr);
+    void SetInfoText(const char* text) override;
+    void closeEvent(QCloseEvent*) override;
+
+private:
+    CConsoleSCB* const m_consoleWidget;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONSOLEDIALOG_H
diff --git a/Code/Editor/ControlMRU.cpp b/Code/Editor/ControlMRU.cpp
new file mode 100644
index 0000000000..9254965805
--- /dev/null
+++ b/Code/Editor/ControlMRU.cpp
@@ -0,0 +1,134 @@
+/*
+ * 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 "ControlMRU.h"
+
+IMPLEMENT_XTP_CONTROL(CControlMRU, CXTPControlRecentFileList)
+
+bool CControlMRU::DoesFileExist(CString& sFileName)
+{
+    return (_access(sFileName.GetBuffer(), 0) == 0);
+}
+
+void CControlMRU::OnCalcDynamicSize(DWORD dwMode)
+{
+    CRecentFileList* pRecentFileList = GetRecentFileList();
+
+    if (!pRecentFileList)
+    {
+        return;
+    }
+
+    CString* pArrNames = pRecentFileList->m_arrNames;
+
+    assert(pArrNames != NULL);
+    if (!pArrNames)
+    {
+        return;
+    }
+
+    while (m_nIndex + 1 < m_pControls->GetCount())
+    {
+        CXTPControl* pControl = m_pControls->GetAt(m_nIndex + 1);
+        assert(pControl);
+        if (pControl->GetID() >= GetFirstMruID()
+            && pControl->GetID() <= GetFirstMruID() + pRecentFileList->m_nSize)
+        {
+            m_pControls->Remove(pControl);
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    if (m_pParent->IsCustomizeMode())
+    {
+        m_dwHideFlags = 0;
+        SetEnabled(TRUE);
+        return;
+    }
+
+    if (pArrNames[0].IsEmpty())
+    {
+        SetCaption(CString(MAKEINTRESOURCE(IDS_NORECENTFILE_CAPTION)));
+        SetDescription("No recently opened files");
+        m_dwHideFlags = 0;
+        SetEnabled(FALSE);
+
+        return;
+    }
+    else
+    {
+        SetCaption(CString(MAKEINTRESOURCE(IDS_RECENTFILE_CAPTION)));
+        SetDescription("Open this document");
+    }
+
+    m_dwHideFlags |= xtpHideGeneric;
+
+    CString sCurDir = (Path::GetEditingGameDataFolder() + "\\").c_str();
+    int nCurDir = sCurDir.GetLength();
+
+    CString strName;
+    CString strTemp;
+    int iLastValidMRU = 0;
+
+    for (int iMRU = 0; iMRU < pRecentFileList->m_nSize; iMRU++)
+    {
+        if (!pRecentFileList->GetDisplayName(strName, iMRU, sCurDir.GetBuffer(), nCurDir))
+        {
+            break;
+        }
+
+        if (DoesFileExist(pArrNames[iMRU]))
+        {
+            CString sCurEntryDir = pArrNames[iMRU].Left(nCurDir);
+
+            if (sCurEntryDir.CompareNoCase(sCurDir) != 0)
+            {
+                //unavailable entry (wrong directory)
+                continue;
+            }
+        }
+        else
+        {
+            //invalid entry (not existing)
+            continue;
+        }
+
+        int nId = iMRU + GetFirstMruID();
+
+        CXTPControl* pControl = m_pControls->Add(xtpControlButton, nId, _T(""), m_nIndex + iLastValidMRU + 1, TRUE);
+        assert(pControl);
+
+        pControl->SetCaption(CXTPControlWindowList::ConstructCaption(strName, iLastValidMRU + 1));
+        pControl->SetFlags(xtpFlagManualUpdate);
+        pControl->SetBeginGroup(iLastValidMRU == 0 && m_nIndex != 0);
+        pControl->SetParameter(pArrNames[iMRU]);
+
+        CString sDescription = "Open file:  " + pArrNames[iMRU];
+        pControl->SetDescription(sDescription);
+
+        if ((GetFlags() & xtpFlagWrapRow) && iMRU == 0)
+        {
+            pControl->SetFlags(pControl->GetFlags() | xtpFlagWrapRow);
+        }
+
+        ++iLastValidMRU;
+    }
+
+    //if no entry was valid, treat as none would exist
+    if (iLastValidMRU == 0)
+    {
+        SetCaption(CString(MAKEINTRESOURCE(IDS_NORECENTFILE_CAPTION)));
+        SetDescription("No recently opened files");
+        m_dwHideFlags = 0;
+        SetEnabled(FALSE);
+    }
+}
diff --git a/Code/Editor/ControlMRU.h b/Code/Editor/ControlMRU.h
new file mode 100644
index 0000000000..4adf769942
--- /dev/null
+++ b/Code/Editor/ControlMRU.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
+#ifndef CRYINCLUDE_EDITOR_CONTROLMRU_H
+#define CRYINCLUDE_EDITOR_CONTROLMRU_H
+
+class CControlMRU
+    : public CXTPControlRecentFileList
+{
+protected:
+    virtual void OnCalcDynamicSize(DWORD dwMode);
+
+private:
+    DECLARE_XTP_CONTROL(CControlMRU)
+    bool DoesFileExist(CString& sFileName);
+};
+#endif // CRYINCLUDE_EDITOR_CONTROLMRU_H
diff --git a/Code/Editor/Controls/BitmapToolTip.cpp b/Code/Editor/Controls/BitmapToolTip.cpp
new file mode 100644
index 0000000000..e60a845d14
--- /dev/null
+++ b/Code/Editor/Controls/BitmapToolTip.cpp
@@ -0,0 +1,368 @@
+/*
+ * 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 : Tooltip that displays bitmap.
+
+
+#include "EditorDefs.h"
+
+#include "BitmapToolTip.h"
+
+// Qt
+#include <QVBoxLayout>
+
+// Editor
+#include "Util/Image.h"
+#include "Util/ImageUtil.h"
+
+
+static const int STATIC_TEXT_C_HEIGHT = 42;
+static const int HISTOGRAM_C_HEIGHT = 130;
+
+/////////////////////////////////////////////////////////////////////////////
+// CBitmapToolTip
+CBitmapToolTip::CBitmapToolTip(QWidget* parent)
+    : QWidget(parent, Qt::ToolTip)
+    , m_staticBitmap(new QLabel(this))
+    , m_staticText(new QLabel(this))
+    , m_rgbaHistogram(new CImageHistogramCtrl(this))
+    , m_alphaChannelHistogram(new CImageHistogramCtrl(this))
+{
+    m_nTimer = 0;
+    m_hToolWnd = nullptr;
+    m_bShowHistogram = true;
+    m_bShowFullsize = false;
+    m_eShowMode = ESHOW_RGB;
+
+    connect(&m_timer, &QTimer::timeout, this, &CBitmapToolTip::OnTimer);
+
+    auto* layout = new QVBoxLayout(this);
+    layout->setSizeConstraint(QLayout::SetFixedSize);
+
+    layout->addWidget(m_staticBitmap);
+    layout->addWidget(m_staticText);
+
+    auto* histogramLayout = new QHBoxLayout();
+    histogramLayout->addWidget(m_rgbaHistogram);
+    histogramLayout->addWidget(m_alphaChannelHistogram);
+    m_alphaChannelHistogram->setVisible(false);
+
+    layout->addLayout(histogramLayout);
+
+    setLayout(layout);
+}
+
+CBitmapToolTip::~CBitmapToolTip()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBitmapToolTip::GetShowMode(EShowMode& eShowMode, bool& bShowInOriginalSize) const
+{
+    bShowInOriginalSize = CheckVirtualKey(Qt::Key_Space);
+    eShowMode = ESHOW_RGB;
+
+    if (m_bHasAlpha)
+    {
+        if (CheckVirtualKey(Qt::Key_Control))
+        {
+            eShowMode = ESHOW_RGB_ALPHA;
+        }
+        else if (CheckVirtualKey(Qt::Key_Alt))
+        {
+            eShowMode = ESHOW_ALPHA;
+        }
+        else if (CheckVirtualKey(Qt::Key_Shift))
+        {
+            eShowMode = ESHOW_RGBA;
+        }
+    }
+    else if (m_bIsLimitedHDR)
+    {
+        if (CheckVirtualKey(Qt::Key_Shift))
+        {
+            eShowMode = ESHOW_RGBE;
+        }
+    }
+}
+
+const char* CBitmapToolTip::GetShowModeDescription(EShowMode eShowMode, [[maybe_unused]] bool bShowInOriginalSize) const
+{
+    switch (eShowMode)
+    {
+    case ESHOW_RGB:
+        return "RGB";
+    case ESHOW_RGB_ALPHA:
+        return "RGB+A";
+    case ESHOW_ALPHA:
+        return "Alpha";
+    case ESHOW_RGBA:
+        return "RGBA";
+    case ESHOW_RGBE:
+        return "RGBExp";
+    }
+
+    return "";
+}
+
+void CBitmapToolTip::RefreshViewmode()
+{
+    LoadImage(m_filename);
+
+    if (m_eShowMode == ESHOW_RGB_ALPHA || m_eShowMode == ESHOW_RGBA)
+    {
+        m_rgbaHistogram->setVisible(true);
+        m_alphaChannelHistogram->setVisible(true);
+    }
+    else if (m_eShowMode == ESHOW_ALPHA)
+    {
+        m_rgbaHistogram->setVisible(false);
+        m_alphaChannelHistogram->setVisible(true);
+    }
+    else
+    {
+        m_rgbaHistogram->setVisible(true);
+        m_alphaChannelHistogram->setVisible(false);
+    }
+}
+
+bool CBitmapToolTip::LoadImage(const QString& imageFilename)
+{
+    EShowMode eShowMode = ESHOW_RGB;
+    const char* pShowModeDescription = "RGB";
+    bool bShowInOriginalSize = false;
+
+    GetShowMode(eShowMode, bShowInOriginalSize);
+    pShowModeDescription = GetShowModeDescription(eShowMode, bShowInOriginalSize);
+
+    QString convertedFileName = Path::GamePathToFullPath(Path::ReplaceExtension(imageFilename, ".dds"));
+
+    // We need to check against both the image filename and the converted filename as it is possible that the
+    // converted file existed but failed to load previously and we reverted to loading the source asset.
+    bool alreadyLoadedImage = ((m_filename == convertedFileName) || (m_filename == imageFilename));
+    if (alreadyLoadedImage && (m_eShowMode == eShowMode) && (m_bShowFullsize == bShowInOriginalSize))
+    {
+        return true;
+    }
+
+    CCryFile fileCheck;
+    if (!fileCheck.Open(convertedFileName.toUtf8().data(), "rb"))
+    {
+        // if we didn't find it, then default back to just using what we can find (if any)
+        convertedFileName = imageFilename;
+    }
+    else
+    {
+        fileCheck.Close();
+    }
+
+    m_eShowMode = eShowMode;
+    m_bShowFullsize = bShowInOriginalSize;
+
+    CImageEx image;
+    image.SetHistogramEqualization(CheckVirtualKey(Qt::Key_Shift));
+    bool loadedRequestedAsset = true;
+    if (!CImageUtil::LoadImage(convertedFileName, image))
+    {
+        //Failed to load the requested asset,  let's try loading the source asset if available.
+        loadedRequestedAsset = false;
+        if (!CImageUtil::LoadImage(imageFilename, image))
+        {
+            m_staticBitmap->clear();
+            return false;
+        }
+    }
+
+    QString imginfo;
+
+    m_filename = loadedRequestedAsset ? convertedFileName : imageFilename;
+    m_bHasAlpha = image.HasAlphaChannel();
+    m_bIsLimitedHDR = image.IsLimitedHDR();
+
+    GetShowMode(eShowMode, bShowInOriginalSize);
+    pShowModeDescription = GetShowModeDescription(eShowMode, bShowInOriginalSize);
+
+    if (m_bHasAlpha)
+    {
+        imginfo = tr("%1x%2 %3\nShowing %4 (ALT=Alpha, SHIFT=RGBA, CTRL=RGB+A, SPACE=see in original size)");
+    }
+    else if (m_bIsLimitedHDR)
+    {
+        imginfo = tr("%1x%2 %3\nShowing %4 (SHIFT=see hist.-equalized, SPACE=see in original size)");
+    }
+    else
+    {
+        imginfo = tr("%1x%2 %3\nShowing %4 (SPACE=see in original size)");
+    }
+
+    imginfo = imginfo.arg(image.GetWidth()).arg(image.GetHeight()).arg(image.GetFormatDescription()).arg(pShowModeDescription);
+
+    m_staticText->setText(imginfo);
+
+    int w = image.GetWidth();
+    int h = image.GetHeight();
+    int multiplier = (m_eShowMode == ESHOW_RGB_ALPHA ? 2 : 1);
+    int originalW = w * multiplier;
+    int originalH = h;
+
+    if (!bShowInOriginalSize || (w == 0))
+    {
+        w = 256;
+    }
+    if (!bShowInOriginalSize || (h == 0))
+    {
+        h = 256;
+    }
+
+    w *= multiplier;
+
+    resize(w + 4, h + 4 + STATIC_TEXT_C_HEIGHT + HISTOGRAM_C_HEIGHT);
+    setVisible(true);
+
+    CImageEx scaledImage;
+
+    if (bShowInOriginalSize && (originalW < w))
+    {
+        w = originalW;
+    }
+    if (bShowInOriginalSize && (originalH < h))
+    {
+        h = originalH;
+    }
+
+    scaledImage.Allocate(w, h);
+
+    if (m_eShowMode == ESHOW_RGB_ALPHA)
+    {
+        CImageUtil::ScaleToDoubleFit(image, scaledImage);
+    }
+    else
+    {
+        CImageUtil::ScaleToFit(image, scaledImage);
+    }
+
+    if (m_eShowMode == ESHOW_RGB || m_eShowMode == ESHOW_RGBE)
+    {
+        scaledImage.SwapRedAndBlue();
+        scaledImage.FillAlpha();
+    }
+    else if (m_eShowMode == ESHOW_ALPHA)
+    {
+        for (int hh = 0; hh < scaledImage.GetHeight(); hh++)
+        {
+            for (int ww = 0; ww < scaledImage.GetWidth(); ww++)
+            {
+                int a = scaledImage.ValueAt(ww, hh) >> 24;
+                scaledImage.ValueAt(ww, hh) = RGB(a, a, a);
+            }
+        }
+    }
+    else if (m_eShowMode == ESHOW_RGB_ALPHA)
+    {
+        int halfWidth = scaledImage.GetWidth() / 2;
+        for (int hh = 0; hh < scaledImage.GetHeight(); hh++)
+        {
+            for (int ww = 0; ww < halfWidth; ww++)
+            {
+                int r = GetRValue(scaledImage.ValueAt(ww, hh));
+                int g = GetGValue(scaledImage.ValueAt(ww, hh));
+                int b = GetBValue(scaledImage.ValueAt(ww, hh));
+                int a = scaledImage.ValueAt(ww, hh) >> 24;
+                scaledImage.ValueAt(ww, hh) = RGB(b, g, r);
+                scaledImage.ValueAt(ww + halfWidth, hh) = RGB(a, a, a);
+            }
+        }
+    }
+    else //if (m_showMode == ESHOW_RGBA)
+    {
+        scaledImage.SwapRedAndBlue();
+    }
+
+    QImage qImage(scaledImage.GetWidth(), scaledImage.GetHeight(), QImage::Format_RGB32);
+    memcpy(qImage.bits(), scaledImage.GetData(), qImage.sizeInBytes());
+    m_staticBitmap->setPixmap(QPixmap::fromImage(qImage));
+
+    if (m_bShowHistogram && scaledImage.GetData())
+    {
+        m_rgbaHistogram->ComputeHistogram(image, CImageHistogram::eImageFormat_32BPP_BGRA);
+        m_rgbaHistogram->setDrawMode(EHistogramDrawMode::OverlappedRGB);
+
+        m_alphaChannelHistogram->histogramDisplay()->CopyComputedDataFrom(m_rgbaHistogram->histogramDisplay());
+        m_alphaChannelHistogram->setDrawMode(EHistogramDrawMode::AlphaChannel);
+    }
+
+    return true;
+}
+
+void CBitmapToolTip::OnTimer()
+{
+    /*
+    if (IsWindowVisible())
+    {
+        if (m_bHaveAnythingToRender)
+            Invalidate();
+    }
+    */
+    if (m_hToolWnd)
+    {
+        QRect toolRc(m_toolRect);
+        QRect rc = geometry();
+        QPoint cursorPos = QCursor::pos();
+        toolRc.moveTopLeft(m_hToolWnd->mapToGlobal(toolRc.topLeft()));
+        if (!toolRc.contains(cursorPos) && !rc.contains(cursorPos))
+        {
+            setVisible(false);
+        }
+        else
+        {
+            RefreshViewmode();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBitmapToolTip::showEvent([[maybe_unused]] QShowEvent* event)
+{
+    QPoint cursorPos = QCursor::pos();
+    move(cursorPos);
+    m_timer.start(500);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBitmapToolTip::hideEvent([[maybe_unused]] QHideEvent* event)
+{
+    m_timer.stop();
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+void CBitmapToolTip::keyPressEvent(QKeyEvent* event)
+{
+    if (event->key() == Qt::Key_Control || event->key() == Qt::Key_Alt || event->key() == Qt::Key_Shift)
+    {
+        RefreshViewmode();
+    }
+}
+
+void CBitmapToolTip::keyReleaseEvent(QKeyEvent* event)
+{
+    if (event->key() == Qt::Key_Control || event->key() == Qt::Key_Alt || event->key() == Qt::Key_Shift)
+    {
+        RefreshViewmode();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBitmapToolTip::SetTool(QWidget* pWnd, const QRect& rect)
+{
+    assert(pWnd);
+    m_hToolWnd = pWnd;
+    m_toolRect = rect;
+}
+
+#include <Controls/moc_BitmapToolTip.cpp>
diff --git a/Code/Editor/Controls/BitmapToolTip.h b/Code/Editor/Controls/BitmapToolTip.h
new file mode 100644
index 0000000000..291ca59073
--- /dev/null
+++ b/Code/Editor/Controls/BitmapToolTip.h
@@ -0,0 +1,87 @@
+/*
+ * 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 : Tooltip that displays bitmap.
+
+
+#ifndef CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
+#define CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
+#pragma once
+
+
+#if !defined(Q_MOC_RUN)
+#include "Controls/ImageHistogramCtrl.h"
+
+#include <QLabel>
+#include <QTimer>
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+class CBitmapToolTip
+    : public QWidget
+{
+    Q_OBJECT
+    // Construction
+public:
+
+    enum EShowMode
+    {
+        ESHOW_RGB = 0,
+        ESHOW_ALPHA,
+        ESHOW_RGBA,
+        ESHOW_RGB_ALPHA,
+        ESHOW_RGBE
+    };
+
+    CBitmapToolTip(QWidget* parent = nullptr);
+    virtual ~CBitmapToolTip();
+
+    BOOL Create(const RECT& rect);
+
+    // Attributes
+public:
+
+    // Operations
+public:
+    void RefreshViewmode();
+
+    bool LoadImage(const QString& imageFilename);
+    void SetTool(QWidget* pWnd, const QRect& rect);
+
+    // Generated message map functions
+protected:
+    void OnTimer();
+
+    void keyPressEvent(QKeyEvent* event) override;
+    void keyReleaseEvent(QKeyEvent* event) override;
+
+    void showEvent(QShowEvent* event) override;
+    void hideEvent(QHideEvent* event) override;
+
+private:
+    void GetShowMode(EShowMode& showMode, bool& showInOriginalSize) const;
+    const char* GetShowModeDescription(EShowMode showMode, bool showInOriginalSize) const;
+
+    QLabel* m_staticBitmap;
+    QLabel* m_staticText;
+    QString m_filename;
+    bool        m_bShowHistogram;
+    EShowMode m_eShowMode;
+    bool    m_bShowFullsize;
+    bool    m_bHasAlpha;
+    bool    m_bIsLimitedHDR;
+    CImageHistogramCtrl* m_rgbaHistogram;
+    CImageHistogramCtrl* m_alphaChannelHistogram;
+    int m_nTimer;
+    QWidget* m_hToolWnd;
+    QRect m_toolRect;
+    QTimer m_timer;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
diff --git a/Code/Editor/Controls/ColorGradientCtrl.cpp b/Code/Editor/Controls/ColorGradientCtrl.cpp
new file mode 100644
index 0000000000..e7abbdc647
--- /dev/null
+++ b/Code/Editor/Controls/ColorGradientCtrl.cpp
@@ -0,0 +1,927 @@
+/*
+ * 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 "ColorGradientCtrl.h"
+
+// Qt
+#include <QPainter>
+#include <QToolTip>
+
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/ColorPicker.h>
+
+
+#define MIN_TIME_EPSILON 0.01f
+
+//////////////////////////////////////////////////////////////////////////
+CColorGradientCtrl::CColorGradientCtrl(QWidget* parent)
+    : QWidget(parent)
+{
+    m_nActiveKey = -1;
+    m_nHitKeyIndex = -1;
+    m_nKeyDrawRadius = 3;
+    m_bTracking = false;
+    m_pSpline = 0;
+    m_fMinTime = -1;
+    m_fMaxTime = 1;
+    m_fMinValue = -1;
+    m_fMaxValue = 1;
+    m_fTooltipScaleX = 1;
+    m_fTooltipScaleY = 1;
+    m_bNoTimeMarker = true;
+    m_bLockFirstLastKey = false;
+    m_bNoZoom = true;
+
+    ClearSelection();
+
+    m_bSelectedKeys.reserve(0);
+
+    m_fTimeMarker = -10;
+
+    m_grid.zoom.x = 100;
+
+    setMouseTracking(true);
+}
+
+CColorGradientCtrl::~CColorGradientCtrl()
+{
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// QColorGradientCtrl message handlers
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+
+    QRect rc(QPoint(0, 0), event->size());
+    m_rcGradient = rc;
+    m_rcGradient.setHeight(m_rcGradient.height() - 11);
+    //m_rcGradient.DeflateRect(4,4);
+
+    m_grid.rect = m_rcGradient;
+    if (m_bNoZoom)
+    {
+        m_grid.zoom.x = m_grid.rect.width();
+    }
+
+    m_rcKeys = rc;
+    m_rcKeys.setTop(m_rcKeys.bottom() - 10);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::SetZoom(float fZoom)
+{
+    m_grid.zoom.x = fZoom;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::SetOrigin(float fOffset)
+{
+    m_grid.origin.x = fOffset;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint CColorGradientCtrl::KeyToPoint(int nKey)
+{
+    if (nKey >= 0)
+    {
+        return TimeToPoint(m_pSpline->GetKeyTime(nKey));
+    }
+    return QPoint(0, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint CColorGradientCtrl::TimeToPoint(float time)
+{
+    return QPoint(m_grid.WorldToClient(Vec2(time, 0)).x(), m_rcGradient.height() / 2);
+
+    QPoint point;
+    point.rx() = (time - m_fMinTime) * (m_rcGradient.width() / (m_fMaxTime - m_fMinTime)) + m_rcGradient.left();
+    point.ry() = m_rcGradient.height() / 2;
+    return point;
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZ::Color CColorGradientCtrl::TimeToColor(float time)
+{
+    ISplineInterpolator::ValueType val;
+    m_pSpline->Interpolate(time, val);
+    const AZ::Color col = ValueToColor(val);
+    return col;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::PointToTimeValue(QPoint point, float& time, ISplineInterpolator::ValueType& val)
+{
+    time = XOfsToTime(point.x());
+    ColorToValue(TimeToColor(time), val);
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CColorGradientCtrl::XOfsToTime(int x)
+{
+    return m_grid.ClientToWorld(QPoint(x, 0)).x;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint CColorGradientCtrl::XOfsToPoint(int x)
+{
+    return TimeToPoint(XOfsToTime(x));
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZ::Color CColorGradientCtrl::XOfsToColor(int x)
+{
+    return TimeToColor(XOfsToTime(x));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::paintEvent(QPaintEvent* e)
+{
+    QPainter painter(this);
+
+    QRect rcClient = rect();
+
+    if (m_pSpline)
+    {
+        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
+    }
+    {
+        if (!isEnabled())
+        {
+            painter.setBrush(palette().button());
+            painter.drawRect(rcClient);
+            return;
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        // Fill keys backgound.
+        //////////////////////////////////////////////////////////////////////////
+        QRect rcKeys = m_rcKeys.intersected(e->rect());
+        painter.setBrush(palette().button());
+        painter.drawRect(rcKeys);
+        //////////////////////////////////////////////////////////////////////////
+
+        //Draw Keys and Curve
+        if (m_pSpline)
+        {
+            DrawGradient(e, &painter);
+            DrawKeys(e, &painter);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::DrawGradient(QPaintEvent* e, QPainter* painter)
+{
+    //Draw Curve
+    // create and select a thick, white pen
+    painter->setPen(QPen(QColor(128, 255, 128), 1, Qt::SolidLine));
+
+    const QRect rcClip = e->rect().intersected(m_rcGradient);
+    const int right = rcClip.left() + rcClip.width();
+    for (int x = rcClip.left(); x < right; x++)
+    {
+        const AZ::Color col = XOfsToColor(x);
+        QPen pen(QColor(col.GetR8(), col.GetG8(), col.GetR8(), col.GetA8()), 1, Qt::SolidLine);
+        painter->setPen(pen);
+        painter->drawLine(x, m_rcGradient.top(), x, m_rcGradient.top() + m_rcGradient.height());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::DrawKeys(QPaintEvent* e, QPainter* painter)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    // create and select a white pen
+    painter->setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+
+    QRect rcClip = e->rect();
+
+    m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
+
+    for (int i = 0; i < m_pSpline->GetKeyCount(); i++)
+    {
+        float time = m_pSpline->GetKeyTime(i);
+        QPoint pt = TimeToPoint(time);
+
+        if (pt.x() < rcClip.left() - 8 || pt.x() > rcClip.left() + rcClip.width() + 8)
+        {
+            continue;
+        }
+
+        const AZ::Color clr = TimeToColor(time);
+        QBrush brush(QColor(clr.GetR8(), clr.GetG8(), clr.GetB8(), clr.GetA8()));
+        painter->setBrush(brush);
+
+        // Find the midpoints of the top, right, left, and bottom
+        // of the client area. They will be the vertices of our polygon.
+        QPoint pts[3];
+        pts[0].rx() = pt.x();
+        pts[0].ry() = m_rcKeys.top() + 1;
+        pts[1].rx() = pt.x() - 5;
+        pts[1].ry() = m_rcKeys.top() + 8;
+        pts[2].rx() = pt.x() + 5;
+        pts[2].ry() = m_rcKeys.top() + 8;
+        painter->drawPolygon(pts, 3);
+
+        if (m_bSelectedKeys[i])
+        {
+            QPen pen(QColor(200, 0, 0), 1, Qt::SolidLine);
+            QPen oldPen = painter->pen();
+            painter->setPen(pen);
+            painter->drawPolygon(pts, 3);
+            painter->setPen(oldPen);
+        }
+    }
+
+    if (!m_bNoTimeMarker)
+    {
+        QPen timePen(QColor(255, 0, 255), 1, Qt::SolidLine);
+        painter->setPen(timePen);
+        QPoint pt = TimeToPoint(m_fTimeMarker);
+        painter->drawLine(pt.x(), m_rcGradient.top() + 1, pt.x(), m_rcGradient.bottom() - 1);
+    }
+}
+
+void CColorGradientCtrl::UpdateTooltip(QPoint pos)
+{
+    if (m_nHitKeyIndex >= 0)
+    {
+        float time = m_pSpline->GetKeyTime(m_nHitKeyIndex);
+        ISplineInterpolator::ValueType val;
+        m_pSpline->GetKeyValue(m_nHitKeyIndex, val);
+
+        AZ::Color col = TimeToColor(time);
+        int cont_s = (m_pSpline->GetKeyFlags(m_nHitKeyIndex) >> SPLINE_KEY_TANGENT_IN_SHIFT) & SPLINE_KEY_TANGENT_LINEAR ? 1 : 2;
+        int cont_d = (m_pSpline->GetKeyFlags(m_nHitKeyIndex) >> SPLINE_KEY_TANGENT_OUT_SHIFT) & SPLINE_KEY_TANGENT_LINEAR ? 1 : 2;
+
+        QString tipText(tr("%1 : %2,%3,%4 [%5,%6]").arg(time * m_fTooltipScaleX, 0, 'f', 2).arg(col.GetR8()).arg(col.GetG8()).arg(col.GetB8()).arg(cont_s).arg(cont_d));
+        const QPoint globalPos = mapToGlobal(pos);
+        QToolTip::showText(mapToGlobal(pos), tipText, this, QRect(globalPos, QSize(1, 1)));
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//Mouse Message Handlers
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::mousePressEvent(QMouseEvent* event)
+{
+    if (event->button() == Qt::LeftButton)
+    {
+        OnLButtonDown(event);
+    }
+    else if (event->button() == Qt::RightButton)
+    {
+        OnRButtonDown(event);
+    }
+}
+
+void CColorGradientCtrl::OnLButtonDown([[maybe_unused]] QMouseEvent* event)
+{
+    if (m_bTracking)
+    {
+        return;
+    }
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    setFocus();
+
+    switch (m_hitCode)
+    {
+    case HIT_KEY:
+        StartTracking();
+        SetActiveKey(m_nHitKeyIndex);
+        break;
+
+    /*
+    case HIT_SPLINE:
+    {
+        // Cycle the spline slope of the nearest key.
+        int flags = m_pSpline->GetKeyFlags(m_nHitKeyIndex);
+        if (m_nHitKeyDist < 0)
+            // Toggle left side.
+            flags ^= SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_IN_SHIFT;
+        if (m_nHitKeyDist > 0)
+            // Toggle right side.
+            flags ^= SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_OUT_SHIFT;
+        m_pSpline->SetKeyFlags(m_nHitKeyIndex, flags);
+        m_pSpline->Update();
+
+        SetActiveKey(-1);
+        SendNotifyEvent( CLRGRDN_CHANGE );
+        if (m_updateCallback)
+            m_updateCallback(this);
+        break;
+    }
+    */
+
+    case HIT_NOTHING:
+        SetActiveKey(-1);
+        break;
+    }
+    update();
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::OnRButtonDown([[maybe_unused]] QMouseEvent* event)
+{
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::mouseDoubleClickEvent(QMouseEvent* event)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    if (event->button() != Qt::LeftButton)
+    {
+        return;
+    }
+
+    switch (m_hitCode)
+    {
+    case HIT_SPLINE:
+    {
+        int iIndex = InsertKey(event->pos());
+        SetActiveKey(iIndex);
+        EditKey(iIndex);
+
+        update();
+    }
+    break;
+    case HIT_KEY:
+    {
+        EditKey(m_nHitKeyIndex);
+    }
+    break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::mouseMoveEvent(QMouseEvent* event)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    if (!m_bTracking)
+    {
+        switch (HitTest(event->pos()))
+        {
+        case HIT_SPLINE:
+        {
+            setCursor(CMFCUtils::LoadCursor(IDC_ARRWHITE));
+        } break;
+        case HIT_KEY:
+        {
+            setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCK));
+        } break;
+        default:
+            break;
+        }
+    }
+
+    if (m_bTracking)
+    {
+        TrackKey(event->pos());
+    }
+
+    if (m_bTracking || m_nHitKeyIndex >= 0)
+    {
+        UpdateTooltip(event->pos());
+    }
+    else
+    {
+        QToolTip::hideText();
+    }
+}
+
+void CColorGradientCtrl::mouseReleaseEvent(QMouseEvent* event)
+{
+    if (event->button() == Qt::LeftButton)
+    {
+        OnLButtonUp(event);
+    }
+    else if (event->button() == Qt::RightButton)
+    {
+        OnRButtonUp(event);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::OnLButtonUp(QMouseEvent* event)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    if (m_bTracking)
+    {
+        StopTracking(event->pos());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::OnRButtonUp([[maybe_unused]] QMouseEvent* event)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::SetActiveKey(int nIndex)
+{
+    ClearSelection();
+
+    //Activate New Key
+    if (nIndex >= 0)
+    {
+        m_bSelectedKeys[nIndex] = true;
+    }
+    m_nActiveKey = nIndex;
+    update();
+
+    SendNotifyEvent(CLRGRDN_ACTIVE_KEY_CHANGE);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw)
+{
+    if (pSpline != m_pSpline)
+    {
+        //if (pSpline && pSpline->GetNumDimensions() != 3)
+        //return;
+        m_pSpline = pSpline;
+        m_nActiveKey = -1;
+    }
+
+    ClearSelection();
+
+    if (bRedraw)
+    {
+        update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+ISplineInterpolator* CColorGradientCtrl::GetSpline()
+{
+    return m_pSpline;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::keyPressEvent(QKeyEvent* event)
+{
+    BOOL bProcessed = false;
+
+    if (m_nActiveKey != -1 && m_pSpline)
+    {
+        switch (event->key())
+        {
+        case Qt::Key_Delete:
+        {
+            RemoveKey(m_nActiveKey);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Up:
+        {
+            CUndo undo("Move Spline Key");
+            QPoint point = KeyToPoint(m_nActiveKey);
+            point.rx() -= 1;
+            SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
+            TrackKey(point);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Down:
+        {
+            CUndo undo("Move Spline Key");
+            QPoint point = KeyToPoint(m_nActiveKey);
+            point.rx() += 1;
+            SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
+            TrackKey(point);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Left:
+        {
+            CUndo undo("Move Spline Key");
+            QPoint point = KeyToPoint(m_nActiveKey);
+            point.rx() -= 1;
+            SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
+            TrackKey(point);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Right:
+        {
+            CUndo undo("Move Spline Key");
+            QPoint point = KeyToPoint(m_nActiveKey);
+            point.rx() += 1;
+            SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
+            TrackKey(point);
+            bProcessed = true;
+        } break;
+
+        default:
+            break; //do nothing
+        }
+
+        update();
+    }
+
+    event->setAccepted(bProcessed);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+CColorGradientCtrl::EHitCode CColorGradientCtrl::HitTest(QPoint point)
+{
+    if (!m_pSpline)
+    {
+        return HIT_NOTHING;
+    }
+
+    ISplineInterpolator::ValueType val;
+    float time;
+    PointToTimeValue(point, time, val);
+
+    QRect rc = rect();
+
+    m_nHitKeyIndex = -1;
+
+    if (rc.contains(point))
+    {
+        m_nHitKeyDist = 0xFFFF;
+        m_hitCode = HIT_SPLINE;
+
+        for (int i = 0; i < m_pSpline->GetKeyCount(); i++)
+        {
+            QPoint splinePt = TimeToPoint(m_pSpline->GetKeyTime(i));
+            if (abs(point.x() - splinePt.x()) < abs(m_nHitKeyDist))
+            {
+                m_nHitKeyIndex = i;
+                m_nHitKeyDist = point.x() - splinePt.x();
+            }
+        }
+        if (abs(m_nHitKeyDist) < 4)
+        {
+            m_hitCode = HIT_KEY;
+        }
+    }
+    else
+    {
+        m_hitCode = HIT_NOTHING;
+    }
+
+    return m_hitCode;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::StartTracking()
+{
+    m_bTracking = true;
+
+    GetIEditor()->BeginUndo();
+    SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
+
+    setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCKCROSS));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::TrackKey(QPoint point)
+{
+    if (point.x() < m_rcGradient.left() || point.y() > m_rcGradient.right())
+    {
+        return;
+    }
+
+    int nKey = m_nHitKeyIndex;
+
+    if (nKey >= 0)
+    {
+        ISplineInterpolator::ValueType val;
+        float time;
+        PointToTimeValue(point, time, val);
+
+        // Clamp to min/max time.
+        if (time < m_fMinTime || time > m_fMaxTime)
+        {
+            return;
+        }
+
+        int i;
+        for (i = 0; i < m_pSpline->GetKeyCount(); i++)
+        {
+            // Switch to next key.
+            if ((m_pSpline->GetKeyTime(i) < time && i > nKey) ||
+                (m_pSpline->GetKeyTime(i) > time && i < nKey))
+            {
+                m_pSpline->SetKeyTime(nKey, time);
+                m_pSpline->Update();
+                SetActiveKey(i);
+                m_nHitKeyIndex = i;
+                return;
+            }
+        }
+
+        if (!m_bLockFirstLastKey || (nKey != 0 && nKey != m_pSpline->GetKeyCount() - 1))
+        {
+            m_pSpline->SetKeyTime(nKey, time);
+            m_pSpline->Update();
+        }
+
+        SendNotifyEvent(CLRGRDN_CHANGE);
+        if (m_updateCallback)
+        {
+            m_updateCallback(this);
+        }
+
+        update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::StopTracking(QPoint point)
+{
+    if (!m_bTracking)
+    {
+        return;
+    }
+
+    GetIEditor()->AcceptUndo("Spline Move");
+
+    if (m_nHitKeyIndex >= 0)
+    {
+        QRect rc = rect();
+        rc = rc.marginsAdded(QMargins(100, 100, 100, 100));
+        if (!rc.contains(point))
+        {
+            RemoveKey(m_nHitKeyIndex);
+        }
+    }
+
+    m_bTracking = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::EditKey(int nKey)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    if (nKey < 0 || nKey >= m_pSpline->GetKeyCount())
+    {
+        return;
+    }
+
+    SetActiveKey(nKey);
+
+    ISplineInterpolator::ValueType val;
+    m_pSpline->GetKeyValue(nKey, val);
+
+    SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
+
+    AzQtComponents::ColorPicker dlg(AzQtComponents::ColorPicker::Configuration::RGB);
+    dlg.setCurrentColor(ValueToColor(val));
+    dlg.setSelectedColor(ValueToColor(val));
+    connect(&dlg, &AzQtComponents::ColorPicker::currentColorChanged, this, &CColorGradientCtrl::OnKeyColorChanged);
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        CUndo undo("Modify Gradient Color");
+        OnKeyColorChanged(dlg.selectedColor());
+    }
+    else
+    {
+        OnKeyColorChanged(ValueToColor(val));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::OnKeyColorChanged(const AZ::Color& color)
+{
+    int nKey = m_nActiveKey;
+    if (!m_pSpline)
+    {
+        return;
+    }
+    if (nKey < 0 || nKey >= m_pSpline->GetKeyCount())
+    {
+        return;
+    }
+
+    ISplineInterpolator::ValueType val;
+    ColorToValue(color, val);
+    m_pSpline->SetKeyValue(nKey, val);
+    update();
+
+    if (m_bLockFirstLastKey)
+    {
+        if (nKey == 0)
+        {
+            m_pSpline->SetKeyValue(m_pSpline->GetKeyCount() - 1, val);
+        }
+        else if (nKey == m_pSpline->GetKeyCount() - 1)
+        {
+            m_pSpline->SetKeyValue(0, val);
+        }
+    }
+    m_pSpline->Update();
+    SendNotifyEvent(CLRGRDN_CHANGE);
+    if (m_updateCallback)
+    {
+        m_updateCallback(this);
+    }
+
+    GetIEditor()->UpdateViews(eRedrawViewports);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::RemoveKey(int nKey)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+    if (m_bLockFirstLastKey)
+    {
+        if (nKey == 0 || nKey == m_pSpline->GetKeyCount() - 1)
+        {
+            return;
+        }
+    }
+
+    CUndo undo("Remove Spline Key");
+
+    SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
+    m_nActiveKey = -1;
+    m_nHitKeyIndex = -1;
+    if (m_pSpline)
+    {
+        m_pSpline->RemoveKey(nKey);
+        m_pSpline->Update();
+    }
+    SendNotifyEvent(CLRGRDN_CHANGE);
+    if (m_updateCallback)
+    {
+        m_updateCallback(this);
+    }
+
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CColorGradientCtrl::InsertKey(QPoint point)
+{
+    CUndo undo("Spline Insert Key");
+
+    ISplineInterpolator::ValueType val;
+
+    float time;
+    PointToTimeValue(point, time, val);
+
+    if (time < m_fMinTime || time > m_fMaxTime)
+    {
+        return -1;
+    }
+
+    int i;
+    for (i = 0; i < m_pSpline->GetKeyCount(); i++)
+    {
+        // Skip if any key already have time that is very close.
+        if (fabs(m_pSpline->GetKeyTime(i) - time) < MIN_TIME_EPSILON)
+        {
+            return i;
+        }
+    }
+
+    SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
+
+    m_pSpline->InsertKey(time, val);
+    m_pSpline->Interpolate(time, val);
+    ClearSelection();
+    update();
+
+    SendNotifyEvent(CLRGRDN_CHANGE);
+    if (m_updateCallback)
+    {
+        m_updateCallback(this);
+    }
+
+    for (i = 0; i < m_pSpline->GetKeyCount(); i++)
+    {
+        // Find key with added time.
+        if (m_pSpline->GetKeyTime(i) == time)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::ClearSelection()
+{
+    m_nActiveKey = -1;
+    if (m_pSpline)
+    {
+        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
+    }
+    for (int i = 0; i < (int)m_bSelectedKeys.size(); i++)
+    {
+        m_bSelectedKeys[i] = false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::SetTimeMarker(float fTime)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    {
+        QPoint pt = TimeToPoint(m_fTimeMarker);
+        QRect rc = QRect(pt.x(), m_rcGradient.top(), 0, m_rcGradient.bottom() - m_rcGradient.top()).normalized();
+        rc += QMargins(1, 0, 1, 0);
+        update(rc);
+    }
+    {
+        QPoint pt = TimeToPoint(fTime);
+        QRect rc = QRect(pt.x(), m_rcGradient.top(), 0, m_rcGradient.bottom() - m_rcGradient.top()).normalized();
+        rc += QMargins(1, 0, 1, 0);
+        update(rc);
+    }
+    m_fTimeMarker = fTime;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::SendNotifyEvent(int nEvent)
+{
+    switch (nEvent)
+    {
+    case CLRGRDN_BEFORE_CHANGE:
+        emit beforeChange();
+        break;
+    case CLRGRDN_CHANGE:
+        emit change();
+        break;
+    case CLRGRDN_ACTIVE_KEY_CHANGE:
+        emit activeKeyChange();
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZ::Color CColorGradientCtrl::ValueToColor(ISplineInterpolator::ValueType val)
+{
+    const AZ::Color color(val[0], val[1], val[2], 1.0);
+    return color.LinearToGamma();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CColorGradientCtrl::ColorToValue(const AZ::Color& col, ISplineInterpolator::ValueType& val)
+{
+    const AZ::Color colLin = col.GammaToLinear();
+    val[0] = colLin.GetR();
+    val[1] = colLin.GetG();
+    val[2] = colLin.GetB();
+    val[3] = 0;
+}
+
+void CColorGradientCtrl::SetNoTimeMarker(bool noTimeMarker)
+{
+    m_bNoTimeMarker = noTimeMarker;
+    update();
+}
+
+
+#include <Controls/moc_ColorGradientCtrl.cpp>
diff --git a/Code/Editor/Controls/ColorGradientCtrl.h b/Code/Editor/Controls/ColorGradientCtrl.h
new file mode 100644
index 0000000000..9e127062ef
--- /dev/null
+++ b/Code/Editor/Controls/ColorGradientCtrl.h
@@ -0,0 +1,167 @@
+/*
+ * 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_CONTROLS_COLORGRADIENTCTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_COLORGRADIENTCTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QWidget>
+#include <ISplines.h>
+#include "Controls/WndGridHelper.h"
+#endif
+
+namespace AZ
+{
+    class Color;
+}
+
+// Notify event sent when spline is being modified.
+#define CLRGRDN_CHANGE (0x0001)
+// Notify event sent just before when spline is modified.
+#define CLRGRDN_BEFORE_CHANGE (0x0002)
+// Notify event sent when the active key changes
+#define CLRGRDN_ACTIVE_KEY_CHANGE (0x0003)
+
+//////////////////////////////////////////////////////////////////////////
+// Spline control.
+//////////////////////////////////////////////////////////////////////////
+class CColorGradientCtrl
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    CColorGradientCtrl(QWidget* parent = nullptr);
+    virtual ~CColorGradientCtrl();
+
+    //Key functions
+    int  GetActiveKey() { return m_nActiveKey; };
+    void SetActiveKey(int nIndex);
+    int InsertKey(QPoint point);
+
+    // Turns on/off zooming and scroll support.
+    void SetNoZoom([[maybe_unused]] bool bNoZoom) { m_bNoZoom = false; };
+
+    void SetTimeRange(float tmin, float tmax) { m_fMinTime = tmin; m_fMaxTime = tmax; }
+    void SetValueRange(float tmin, float tmax) { m_fMinValue = tmin; m_fMaxValue = tmax; }
+    void SetTooltipValueScale(float x, float y) { m_fTooltipScaleX = x; m_fTooltipScaleY = y; };
+    // Lock value of first and last key to be the same.
+    void LockFirstAndLastKeys(bool bLock) { m_bLockFirstLastKey = bLock; }
+
+    void SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw = FALSE);
+    ISplineInterpolator* GetSpline();
+
+    void SetTimeMarker(float fTime);
+
+    // Zoom in pixels per time unit.
+    void SetZoom(float fZoom);
+    void SetOrigin(float fOffset);
+
+    typedef AZStd::function<void(CColorGradientCtrl*)> UpdateCallback;
+    void SetUpdateCallback(const UpdateCallback& cb) { m_updateCallback = cb; };
+
+    void SetNoTimeMarker(bool noTimeMarker);
+
+signals:
+    void change();
+    void beforeChange();
+    void activeKeyChange();
+
+protected:
+    enum EHitCode
+    {
+        HIT_NOTHING,
+        HIT_KEY,
+        HIT_SPLINE,
+    };
+
+    void paintEvent(QPaintEvent* e);
+    void resizeEvent(QResizeEvent* event) override;
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void OnLButtonDown(QMouseEvent* event);
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void OnLButtonUp(QMouseEvent* event);
+    void OnRButtonUp(QMouseEvent* event);
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+    void OnRButtonDown(QMouseEvent* event);
+    void keyPressEvent(QKeyEvent* event) override;
+
+    // Drawing functions
+    void DrawGradient(QPaintEvent* e, QPainter* painter);
+    void DrawKeys(QPaintEvent* e, QPainter* painter);
+    void UpdateTooltip(QPoint pos);
+
+    EHitCode HitTest(QPoint point);
+
+    //Tracking support helper functions
+    void StartTracking();
+    void TrackKey(QPoint point);
+    void StopTracking(QPoint point);
+    void RemoveKey(int nKey);
+    void EditKey(int nKey);
+
+    QPoint KeyToPoint(int nKey);
+    QPoint TimeToPoint(float time);
+    void PointToTimeValue(QPoint point, float& time, ISplineInterpolator::ValueType& val);
+    float  XOfsToTime(int x);
+    QPoint XOfsToPoint(int x);
+
+    AZ::Color XOfsToColor(int x);
+    AZ::Color TimeToColor(float time);
+
+    void ClearSelection();
+
+    void SendNotifyEvent(int nEvent);
+
+    AZ::Color ValueToColor(ISplineInterpolator::ValueType val);
+    void ColorToValue(const AZ::Color& col, ISplineInterpolator::ValueType& val);
+
+
+private:
+    void OnKeyColorChanged(const AZ::Color& color);
+
+private:
+    ISplineInterpolator* m_pSpline;
+
+    bool m_bAutoDelete;
+    bool m_bNoZoom;
+
+    QRect m_rcClipRect;
+    QRect m_rcGradient;
+    QRect m_rcKeys;
+
+    QPoint m_hitPoint;
+    EHitCode m_hitCode;
+    int    m_nHitKeyIndex;
+    int    m_nHitKeyDist;
+    QPoint m_curvePoint;
+
+    float m_fTimeMarker;
+
+    int m_nActiveKey;
+    int m_nKeyDrawRadius;
+
+    bool  m_bTracking;
+
+    float m_fMinTime, m_fMaxTime;
+    float m_fMinValue, m_fMaxValue;
+    float m_fTooltipScaleX, m_fTooltipScaleY;
+
+    bool m_bLockFirstLastKey;
+
+    bool m_bNoTimeMarker;
+
+    std::vector<int> m_bSelectedKeys;
+
+    UpdateCallback m_updateCallback;
+
+    CWndGridHelper m_grid;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_COLORGRADIENTCTRL_H
diff --git a/Code/Editor/Controls/ConsoleSCB.cpp b/Code/Editor/Controls/ConsoleSCB.cpp
new file mode 100644
index 0000000000..32ec6506b1
--- /dev/null
+++ b/Code/Editor/Controls/ConsoleSCB.cpp
@@ -0,0 +1,1354 @@
+/*
+ * 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 "ConsoleSCB.h"
+
+// Qt
+#include <QHeaderView>
+#include <QSortFilterProxyModel>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QTableView>
+#include <QtGui/QSyntaxHighlighter>
+
+// AzQtComponents
+#include <AzQtComponents/Components/StyledLineEdit.h>
+#include <AzQtComponents/Components/StyleManager.h>
+#include <AzQtComponents/Components/Widgets/LineEdit.h>
+#include <AzQtComponents/Components/Widgets/ScrollBar.h>
+#include <AzQtComponents/Components/Widgets/SliderCombo.h>
+
+// CryCommon
+#include <CryCommon/SFunctor.h>
+
+// Editor
+#include "QtViewPaneManager.h"
+#include "Core/QtEditorApplication.h"
+#include "Commands/CommandManager.h"
+#include "Util/Variable.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <Controls/ui_ConsoleSCB.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+class CConsoleSCB::SearchHighlighter : public QSyntaxHighlighter
+{
+public:
+    SearchHighlighter(QObject *parent)
+        : QSyntaxHighlighter(parent)
+    {
+
+    }
+
+    SearchHighlighter(QTextDocument *parent)
+        : QSyntaxHighlighter(parent)
+    {
+
+    }
+
+    void setSearchTerm(const QString &term)
+    {
+        m_searchTerm = term;
+        rehighlight();
+    }
+
+protected:
+    void highlightBlock(const QString &text)
+    {
+        auto pos = -1;
+        QTextCharFormat myClassFormat;
+        myClassFormat.setFontWeight(QFont::Bold);
+        myClassFormat.setBackground(Qt::yellow);
+
+        while (1)
+        {
+            pos = text.indexOf(m_searchTerm, pos+1, Qt::CaseInsensitive);
+
+            if (pos == -1)
+            {
+                break;
+            }
+
+            setFormat(pos, m_searchTerm.length(), myClassFormat);
+        }
+    }
+
+private:
+    QString m_searchTerm;
+};
+
+static CConsoleSCB* s_consoleSCB = nullptr;
+// Constant for the modified console variable color
+static const QColor g_modifiedConsoleVariableColor(243, 129, 29);
+
+namespace {
+    enum Column
+    {
+        ColumnType,
+        ColumnName,
+        ColumnValue,
+        ColumnCount // keep at end, for iteration purposes
+    };
+}
+
+static QString RemoveColorCode(const QString& text, int& iColorCode)
+{
+    QString cleanString;
+    cleanString.reserve(text.size());
+
+    const int textSize = text.size();
+    for (int i = 0; i < textSize; ++i)
+    {
+        QChar c = text.at(i);
+        bool isLast = i == textSize - 1;
+        if (c == '$' && !isLast && text.at(i + 1).isDigit())
+        {
+            if (iColorCode == 0)
+            {
+                iColorCode = text.at(i + 1).digitValue();
+            }
+            ++i;
+            continue;
+        }
+
+        // convert \r \n to just \n
+        if (c == '\r')
+        {
+            ++i;
+            continue;
+        }
+
+        cleanString.append(c);
+    }
+
+    return cleanString;
+}
+
+ConsoleLineEdit::ConsoleLineEdit(QWidget* parent)
+    : QLineEdit(parent)
+    , m_historyIndex(0)
+    , m_bReusedHistory(false)
+{
+}
+
+void ConsoleLineEdit::mouseDoubleClickEvent([[maybe_unused]] QMouseEvent* ev)
+{
+    Q_EMIT variableEditorRequested();
+}
+
+bool ConsoleLineEdit::event(QEvent* ev)
+{
+    // Tab key doesn't go to keyPressEvent(), must be processed here
+
+    if (ev->type() != QEvent::KeyPress)
+    {
+        return QLineEdit::event(ev);
+    }
+
+    QKeyEvent* ke = static_cast<QKeyEvent*>(ev);
+    if (ke->key() != Qt::Key_Tab)
+    {
+        return QLineEdit::event(ev);
+    }
+
+    QString inputStr = text();
+    QString newStr;
+
+    QStringList tokens = inputStr.split(" ");
+    inputStr = tokens.isEmpty() ? QString() : tokens.first();
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+
+    const bool ctrlPressed = ke->modifiers() & Qt::ControlModifier;
+    QString cstring = inputStr;
+    if (ctrlPressed)
+    {
+        newStr = console->AutoCompletePrev(cstring.toUtf8().data());
+    }
+    else
+    {
+        newStr = console->ProcessCompletion(cstring.toUtf8().data());
+        newStr = console->AutoComplete(cstring.toUtf8().data());
+
+        if (newStr.isEmpty())
+        {
+            newStr = GetIEditor()->GetCommandManager()->AutoComplete(cstring.toUtf8().data());
+        }
+    }
+
+    if (!newStr.isEmpty())
+    {
+        newStr += " ";
+        setText(newStr);
+    }
+
+    deselect();
+    return true;
+}
+
+void ConsoleLineEdit::keyPressEvent(QKeyEvent* ev)
+{
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+    auto commandManager = GetIEditor()->GetCommandManager();
+
+    console->ResetAutoCompletion();
+
+    switch (ev->key())
+    {
+    case Qt::Key_Enter:
+    case Qt::Key_Return:
+    {
+        QString str = text().trimmed();
+        if (!str.isEmpty())
+        {
+            if (commandManager->IsRegistered(str.toUtf8().data()))
+            {
+                commandManager->Execute(QtUtil::ToString(str));
+            }
+            else
+            {
+                CLogFile::WriteLine(str.toUtf8().data());
+                GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(str.toUtf8().data());
+            }
+
+            // If a history command was reused directly via up arrow enter, do not reset history index
+            if (m_history.size() > 0 && m_historyIndex < m_history.size() && m_history[m_historyIndex] == str)
+            {
+                m_bReusedHistory = true;
+            }
+            else
+            {
+                ResetHistoryIndex();
+            }
+
+            // Do not add the same string if it is the top of the stack, but allow duplicate entries otherwise
+            if (m_history.isEmpty() || m_history.back() != str)
+            {
+                m_history.push_back(str);
+                if (!m_bReusedHistory)
+                {
+                    ResetHistoryIndex();
+                }
+            }
+        }
+        else
+        {
+            ResetHistoryIndex();
+        }
+
+        setText(QString());
+        break;
+    }
+    case Qt::Key_AsciiTilde: // ~
+    case Qt::Key_Agrave: // `
+        // disable log.
+        GetIEditor()->ShowConsole(false);
+        setText(QString());
+        ResetHistoryIndex();
+        break;
+    case Qt::Key_Escape:
+        setText(QString());
+        ResetHistoryIndex();
+        break;
+    case Qt::Key_Up:
+        DisplayHistory(false /*bForward*/);
+        break;
+    case Qt::Key_Down:
+        DisplayHistory(true /*bForward*/);
+        break;
+    default:
+        QLineEdit::keyPressEvent(ev);
+    }
+}
+
+void ConsoleLineEdit::DisplayHistory(bool bForward)
+{
+    if (m_history.isEmpty())
+    {
+        return;
+    }
+
+    const int increment = bForward ? 1
+        : m_bReusedHistory ? 0 // Immediately after reusing a history entry, ensure up arrow re-displays command just used
+        : -1;
+    const int newHistoryIndex = static_cast<int>(m_historyIndex) + increment;
+
+    m_bReusedHistory = false;
+    m_historyIndex = static_cast<unsigned int>(clamp_tpl(newHistoryIndex, 0, m_history.size() - 1));
+
+    setText(m_history[m_historyIndex]);
+}
+
+void ConsoleLineEdit::ResetHistoryIndex()
+{
+    m_historyIndex = m_history.size();
+    m_bReusedHistory = false;
+}
+
+Lines CConsoleSCB::s_pendingLines;
+
+CConsoleSCB::CConsoleSCB(QWidget* parent)
+    : QWidget(parent)
+    , ui(new Ui::Console())
+    , m_richEditTextLength(0)
+    , m_backgroundTheme(gSettings.consoleBackgroundColorTheme)
+{
+    m_lines = s_pendingLines;
+    s_pendingLines.clear();
+    s_consoleSCB = this;
+    ui->setupUi(this);
+    m_highlighter = new SearchHighlighter(ui->textEdit);
+    m_highlighter->setDocument(ui->textEdit->document());
+
+    setMinimumHeight(120);
+
+    ui->findBar->setVisible(false);
+    ui->lineEditFind->setPlaceholderText(QObject::tr("Search..."));
+    ui->lineEditFind->setClearButtonEnabled(true);
+    AzQtComponents::LineEdit::applySearchStyle(ui->lineEditFind);
+
+    // Setup the color table for the default (light) theme
+    m_colorTable << QColor(0, 0, 0)
+        << QColor(0, 0, 0)
+        << QColor(0, 0, 200) // blue
+        << QColor(0, 200, 0) // green
+        << QColor(200, 0, 0) // red
+        << QColor(0, 200, 200) // cyan
+        << QColor(128, 112, 0) // yellow
+        << QColor(200, 0, 200) // red+blue
+        << QColor(0x000080ff)
+        << QColor(0x008f8f8f);
+    RefreshStyle();
+
+    auto findNextAction = new QAction(this);
+    findNextAction->setShortcut(QKeySequence::FindNext);
+    connect(findNextAction, &QAction::triggered, this, &CConsoleSCB::findNext);
+    ui->findNextButton->addAction(findNextAction);
+
+    auto findPreviousAction = new QAction(this);
+    findPreviousAction->setShortcut(QKeySequence::FindPrevious);
+    connect(findPreviousAction, &QAction::triggered, this, &CConsoleSCB::findPrevious);
+    ui->findPrevButton->addAction(findPreviousAction);
+
+    connect(ui->button, &QPushButton::clicked, this, &CConsoleSCB::showVariableEditor);
+    connect(ui->findButton, &QPushButton::clicked, this, &CConsoleSCB::toggleConsoleSearch);
+    connect(ui->textEdit, &ConsoleTextEdit::searchBarRequested, this, [this]
+    {
+        this->ui->findBar->setVisible(true);
+        this->ui->lineEditFind->setFocus();
+    });
+
+    connect(ui->lineEditFind, &QLineEdit::returnPressed, this, &CConsoleSCB::findNext);
+
+    connect(ui->closeButton, &QPushButton::clicked, [=]
+    {
+        ui->findBar->setVisible(false);
+    });
+
+    connect(ui->findPrevButton, &QPushButton::clicked, this, &CConsoleSCB::findPrevious);
+    connect(ui->findNextButton, &QPushButton::clicked, this, &CConsoleSCB::findNext);
+
+    connect(ui->lineEditFind, &QLineEdit::textChanged, [=](auto text)
+    {
+        m_highlighter->setSearchTerm(text);
+    });
+
+    connect(ui->lineEdit, &ConsoleLineEdit::variableEditorRequested, this, &CConsoleSCB::showVariableEditor);
+
+    if (GetIEditor()->IsInConsolewMode())
+    {
+        // Attach / register edit box
+        //CLogFile::AttachEditBox(m_edit.GetSafeHwnd()); // FIXME
+    }
+
+    AzToolsFramework::EditorPreferencesNotificationBus::Handler::BusConnect();
+}
+
+CConsoleSCB::~CConsoleSCB()
+{
+    AzToolsFramework::EditorPreferencesNotificationBus::Handler::BusDisconnect();
+
+    s_consoleSCB = nullptr;
+    CLogFile::AttachEditBox(nullptr);
+}
+
+void CConsoleSCB::RegisterViewClass()
+{
+    AzToolsFramework::ViewPaneOptions opts;
+    opts.preferedDockingArea = Qt::BottomDockWidgetArea;
+    opts.isDeletable = false;
+    opts.isStandard = true;
+    opts.showInMenu = true;
+    opts.builtInActionId = ID_VIEW_CONSOLEWINDOW;
+    opts.shortcut = QKeySequence(Qt::Key_QuoteLeft);
+    
+    AzToolsFramework::RegisterViewPane<CConsoleSCB>(LyViewPane::Console, LyViewPane::CategoryTools, opts);
+}
+
+void CConsoleSCB::OnEditorPreferencesChanged()
+{
+    RefreshStyle();
+}
+
+void CConsoleSCB::RefreshStyle()
+{
+    ui->button->setIcon(QIcon(QString(":/controls/img/cvar_dark.bmp")));
+    ui->findButton->setIcon(QIcon(QString(":/stylesheet/img/search.png")));
+    ui->closeButton->setIcon(QIcon(QString(":/stylesheet/img/lineedit-clear.png")));
+
+    // Set the debug/warning text colors appropriately for the background theme
+    // (e.g. not have black text on black background)
+    QColor textColor = Qt::black;
+    m_colorTable[4] = QColor(200, 0, 0);                // Error (Red)
+    m_colorTable[6] = QColor(128, 112, 0);              // Warning (Yellow)
+    m_backgroundTheme = gSettings.consoleBackgroundColorTheme;
+
+    if (m_backgroundTheme == AzToolsFramework::ConsoleColorTheme::Dark)
+    {
+        textColor = Qt::white;
+        m_colorTable[4] = QColor(0xfa, 0x27, 0x27);     // Error (Red)
+        m_colorTable[6] = QColor(0xff, 0xaa, 0x22);     // Warning (Yellow)
+    }
+
+    m_colorTable[0] = textColor;
+    m_colorTable[1] = textColor;
+
+    const bool uiAndDark = !GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == AzToolsFramework::ConsoleColorTheme::Dark;
+
+    QColor bgColor;
+    if (!GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == AzToolsFramework::ConsoleColorTheme::Dark)
+    {
+        bgColor = Qt::black;
+        AzQtComponents::ScrollBar::applyLightStyle(ui->textEdit);
+    }
+    else
+    {
+        bgColor = Qt::white;
+        AzQtComponents::ScrollBar::applyDarkStyle(ui->textEdit);
+    }
+    ui->textEdit->setBackgroundVisible(!uiAndDark);
+    ui->textEdit->setStyleSheet(uiAndDark ? QString() : QString("QPlainTextEdit{ background: %1 }").arg(bgColor.name(QColor::HexRgb)));
+
+    // Clear out the console text when we change our background color since
+    // some of the previous text colors may not be appropriate for the
+    // new background color
+    QString text = ui->textEdit->toPlainText();
+    ui->textEdit->clear();
+    m_lines.push_back({ text, false });
+    FlushText();
+}
+
+void CConsoleSCB::SetInputFocus()
+{
+    ui->lineEdit->setFocus();
+    ui->lineEdit->setText(QString());
+}
+
+void CConsoleSCB::AddToConsole(const QString& text, bool bNewLine)
+{
+    m_lines.push_back({ text, bNewLine });
+    FlushText();
+}
+
+void CConsoleSCB::FlushText()
+{
+    if (m_lines.empty())
+    {
+        return;
+    }
+
+    // Store our current cursor in case we need to restore it, and check if
+    // the user has scrolled the text edit away from the bottom
+    const QTextCursor oldCursor = ui->textEdit->textCursor();
+    QScrollBar* scrollBar = ui->textEdit->verticalScrollBar();
+    const int oldScrollValue = scrollBar->value();
+    bool scrolledOffBottom = oldScrollValue != scrollBar->maximum();
+
+    ui->textEdit->moveCursor(QTextCursor::End);
+    QTextCursor textCursor = ui->textEdit->textCursor();
+
+    while (!m_lines.empty())
+    {
+        ConsoleLine line = m_lines.front();
+        m_lines.pop_front();
+
+        int iColor = 0;
+        QString text = RemoveColorCode(line.text, iColor);
+        if (iColor < 0 || iColor >= m_colorTable.size())
+        {
+            iColor = 0;
+        }
+
+        if (line.newLine)
+        {
+            text = QtUtil::trimRight(text);
+            text = "\n" + text;
+        }
+
+        QTextCharFormat format;
+        const QColor color(m_colorTable[iColor]);
+        format.setForeground(color);
+
+        if (iColor != 0)
+        {
+            format.setFontWeight(QFont::Bold);
+        }
+
+        textCursor.setCharFormat(format);
+        textCursor.insertText(text);
+    }
+
+    // If the user has selected some text in the text edit area or has scrolled
+    // away from the bottom, then restore the previous cursor and keep the scroll
+    // bar in the same location
+    if (oldCursor.hasSelection() || scrolledOffBottom)
+    {
+        ui->textEdit->setTextCursor(oldCursor);
+        scrollBar->setValue(oldScrollValue);
+    }
+    // Otherwise scroll to the bottom so the latest text can be seen
+    else
+    {
+        scrollBar->setValue(scrollBar->maximum());
+        ui->textEdit->moveCursor(QTextCursor::StartOfLine);
+    }
+}
+
+QSize CConsoleSCB::minimumSizeHint() const
+{
+    return QSize(-1, -1);
+}
+
+QSize CConsoleSCB::sizeHint() const
+{
+    return QSize(100, 100);
+}
+
+/** static */
+void CConsoleSCB::AddToPendingLines(const QString& text, bool bNewLine)
+{
+    s_pendingLines.push_back({ text, bNewLine });
+}
+
+/**
+ * When a CVar variable is updated, we need to tell alert our console variables
+ * pane so it can update the corresponding row
+ */
+static void OnVariableUpdated([[maybe_unused]] int row, ICVar* pCVar)
+{
+    QtViewPane* pane = QtViewPaneManager::instance()->GetPane(LyViewPane::ConsoleVariables);
+    if (!pane)
+    {
+        return;
+    }
+
+    ConsoleVariableEditor* variableEditor = qobject_cast<ConsoleVariableEditor*>(pane->Widget());
+    if (!variableEditor)
+    {
+        return;
+    }
+
+    variableEditor->HandleVariableRowUpdated(pCVar);
+}
+
+static CVarBlock* VarBlockFromConsoleVars()
+{
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+    std::vector<const char*> cmds;
+    cmds.resize(console->GetNumVars());
+    size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
+
+    CVarBlock* vb = new CVarBlock;
+    IVariable* pVariable = 0;
+    for (int i = 0; i < cmdCount; i++)
+    {
+        ICVar* pCVar = console->GetCVar(cmds[i]);
+        if (!pCVar)
+        {
+            continue;
+        }
+        int varType = pCVar->GetType();
+
+        switch (varType)
+        {
+        case CVAR_INT:
+            pVariable = new CVariable<int>();
+            pVariable->Set(pCVar->GetIVal());
+            break;
+        case CVAR_FLOAT:
+            pVariable = new CVariable<float>();
+            pVariable->Set(pCVar->GetFVal());
+            break;
+        case CVAR_STRING:
+            pVariable = new CVariable<QString>();
+            pVariable->Set(pCVar->GetString());
+            break;
+        default:
+            assert(0);
+        }
+
+        // Add our on change handler so we can update the CVariable created for
+        // the matching ICVar that has been modified
+        SFunctor onChange;
+        onChange.Set(OnVariableUpdated, i, pCVar);
+        pCVar->AddOnChangeFunctor(onChange);
+
+        pVariable->SetDescription(pCVar->GetHelp());
+        pVariable->SetName(cmds[i]);
+
+        // Transfer the custom limits have they have been set for this variable
+        if (pCVar->HasCustomLimits())
+        {
+            float min, max;
+            pCVar->GetLimits(min, max);
+            pVariable->SetLimits(min, max);
+        }
+
+        if (pVariable)
+        {
+            vb->AddVariable(pVariable);
+        }
+    }
+    return vb;
+}
+
+static void OnConsoleVariableUpdated(IVariable* pVar)
+{
+    if (!pVar)
+    {
+        return;
+    }
+    QString varName = pVar->GetName();
+    ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(varName.toUtf8().data());
+    if (!pCVar)
+    {
+        return;
+    }
+    if (pVar->GetType() == IVariable::INT)
+    {
+        int val;
+        pVar->Get(val);
+        pCVar->Set(val);
+    }
+    else if (pVar->GetType() == IVariable::FLOAT)
+    {
+        float val;
+        pVar->Get(val);
+        pCVar->Set(val);
+    }
+    else if (pVar->GetType() == IVariable::STRING)
+    {
+        QString val;
+        pVar->Get(val);
+        pCVar->Set(val.toUtf8().data());
+    }
+}
+
+ConsoleTextEdit::ConsoleTextEdit(QWidget* parent)
+    : QPlainTextEdit(parent)
+    , m_contextMenu(new QMenu(this))
+{
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(this, &QPlainTextEdit::customContextMenuRequested, this, &ConsoleTextEdit::showContextMenu);
+
+    // Make sure to add the actions to this widget, so that the ShortCutDispatcher picks them up properly
+
+    QAction* copyAction = m_contextMenu->addAction(tr("&Copy"));
+    copyAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    copyAction->setShortcut(QKeySequence::Copy);
+    copyAction->setEnabled(false);
+    connect(copyAction, &QAction::triggered, this, &QPlainTextEdit::copy);
+    addAction(copyAction);
+
+    QAction* selectAllAction = m_contextMenu->addAction(tr("Select &All"));
+    selectAllAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    selectAllAction->setShortcut(QKeySequence::SelectAll);
+    selectAllAction->setEnabled(false);
+    connect(selectAllAction, &QAction::triggered, this, &QPlainTextEdit::selectAll);
+    addAction(selectAllAction);
+
+    m_contextMenu->addSeparator();
+
+    QAction* deleteAction = m_contextMenu->addAction(tr("Delete"));
+    deleteAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    deleteAction->setShortcut(QKeySequence::Delete);
+    deleteAction->setEnabled(false);
+    connect(deleteAction, &QAction::triggered, this, [=]() { textCursor().removeSelectedText(); } );
+    addAction(deleteAction);
+
+    QAction* clearAction = m_contextMenu->addAction(tr("Clear"));
+    clearAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    clearAction->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_C);
+    clearAction->setEnabled(false);
+    connect(clearAction, &QAction::triggered, this, &QPlainTextEdit::clear);
+    addAction(clearAction);
+
+    QAction* findAction = m_contextMenu->addAction(tr("Find"));
+    findAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    findAction->setShortcut(QKeySequence::Find);
+    findAction->setEnabled(true);
+    connect(findAction, &QAction::triggered, this, &ConsoleTextEdit::searchBarRequested);
+    addAction(findAction);
+
+    connect(this, &QPlainTextEdit::copyAvailable, copyAction, &QAction::setEnabled);
+    connect(this, &QPlainTextEdit::copyAvailable, deleteAction, &QAction::setEnabled);
+    connect(this, &QPlainTextEdit::textChanged, selectAllAction, [=]
+        {
+            if (document() && !document()->isEmpty())
+            {
+                clearAction->setEnabled(true);
+                selectAllAction->setEnabled(true);
+            }
+            else
+            {
+                clearAction->setEnabled(false);
+                selectAllAction->setEnabled(false);
+            }
+        });
+}
+
+bool ConsoleTextEdit::event(QEvent* theEvent)
+{
+    if (theEvent->type() == QEvent::ShortcutOverride)
+    {
+        // ignore several possible key combinations to prevent them bubbling up to the main editor
+        QKeyEvent* shortcutEvent = static_cast<QKeyEvent*>(theEvent);
+
+        QKeySequence::StandardKey ignoredKeys[] = { QKeySequence::Backspace };
+
+        for (auto& currKey : ignoredKeys)
+        {
+            if (shortcutEvent->matches(currKey))
+            {
+                // these shortcuts are ignored. Accept them and do nothing.
+                theEvent->accept();
+                return true;
+            }
+        }
+    }
+
+    return QPlainTextEdit::event(theEvent);
+}
+
+void ConsoleTextEdit::showContextMenu(const QPoint &pt)
+{
+    m_contextMenu->exec(mapToGlobal(pt));
+}
+
+ConsoleVariableItemDelegate::ConsoleVariableItemDelegate(QObject* parent)
+    : QStyledItemDelegate(parent)
+    , m_varBlock(nullptr)
+{
+}
+
+/**
+ * This method is called when after an editor widget has been created for an item
+ * in the model to set its initial value
+ */
+void ConsoleVariableItemDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
+{
+    if (auto* doubleEditor = qobject_cast<AzQtComponents::SliderDoubleCombo*>(editor))
+    {
+        // If this is a float variable, we need to set the decimal precision of
+        // our editor to fit the precision of the variable's default value
+        QVariant value = index.data();
+        IVariable* var = index.data(ConsoleVariableModel::VariableCustomRole).value<IVariable*>();
+        Q_ASSERT(var->GetType() == IVariable::FLOAT);
+
+        QString valStr = QString::number(value.toFloat());
+        int decimalIndex = valStr.indexOf('.');
+        if (decimalIndex != -1)
+        {
+            valStr.remove(0, decimalIndex + 1);
+            doubleEditor->setDecimals(valStr.size());
+        }
+
+        // Set the initial value to our editor
+        doubleEditor->setValue(value.toDouble());
+    }
+    else if (auto* intEditor = qobject_cast<AzQtComponents::SliderCombo*>(editor))
+    {
+        QVariant value = index.data();
+        IVariable* var = index.data(ConsoleVariableModel::VariableCustomRole).value<IVariable*>();
+        Q_ASSERT(var->GetType() == IVariable::INT);
+
+        // Set the initial value to our editor
+        intEditor->setValue(value.toInt());
+    }
+    // Otherwise the value is a string, so the editor will be our styled line edit
+    else
+    {
+        AzQtComponents::StyledLineEdit* lineEdit = qobject_cast<AzQtComponents::StyledLineEdit*>(editor);
+        if (!lineEdit)
+        {
+            return;
+        }
+
+        lineEdit->setText(index.data().toString());
+    }
+}
+
+/**
+ * This method is called when the editor widget has triggered to write back a value to the model
+ */
+void ConsoleVariableItemDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+{
+    if (auto* doubleEditor = qobject_cast<AzQtComponents::SliderDoubleCombo*>(editor))
+    {
+        model->setData(index, doubleEditor->value());
+    }
+    else if (auto* intEditor = qobject_cast<AzQtComponents::SliderCombo*>(editor))
+    {
+        model->setData(index, intEditor->value());
+    }
+    else if (auto* lineEdit = qobject_cast<AzQtComponents::StyledLineEdit*>(editor))
+    {
+        model->setData(index, lineEdit->text());
+    }
+}
+
+template <typename EditorType>
+static void SetEditorRange(EditorType* editor, IVariable* var)
+{
+    // Retrieve the limits set for the variable
+    float min;
+    float max;
+    float step;
+    bool hardMin;
+    bool hardMax;
+    var->GetLimits(min, max, step, hardMin, hardMax);
+
+    // If this variable has custom limits set, then use that as the min/max
+    // Otherwise, the min/max for the input box will be bounded by the type
+    // limit, but the slider will be constricted to a smaller default range
+    static const double defaultMin = -100.0f;
+    static const double defaultMax = 100.0f;
+    if (var->HasCustomLimits())
+    {
+        editor->setRange(min, max);
+    }
+    else
+    {
+        editor->setSoftRange(defaultMin, defaultMax);
+    }
+
+    // Set the step size. The default variable step is 0, so if it's
+    // not set then set our step size to 0.1 for float variables.
+    // The default step size for our spin box is 1.0 so we can just
+    // use that for the int values
+    if (step > 0)
+    {
+        editor->spinbox()->setSingleStep(step);
+    }
+    else if (auto doubleSpinBox = qobject_cast<AzQtComponents::DoubleSpinBox*>(editor->spinbox()))
+    {
+        doubleSpinBox->setSingleStep(0.1);
+    }
+}
+
+/**
+ * This method is called when the user tries to edit one of the values in the
+ * table so that a widget can be created to use for editing the value
+ */
+QWidget* ConsoleVariableItemDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    // This shouldn't happen, but just in case this gets called before we've
+    // been given a var block, just let the item delegate create a default
+    // editor for the value
+    if (!m_varBlock)
+    {
+        return QStyledItemDelegate::createEditor(parent, option, index);
+    }
+
+    // Retrieve a reference to our IVariable for the specified index
+    IVariable* var = index.data(ConsoleVariableModel::VariableCustomRole).value<IVariable*>();
+    if (var)
+    {
+        // Create the proper editor for the int or float value
+        QWidget* editor = nullptr;
+        QVariant value = index.data();
+
+        // Use the IVariable type; it's more stable than Qt's
+        IVariable::EType type = var->GetType();
+        bool hasCustomLimits = var->HasCustomLimits();
+        if (type == IVariable::INT)
+        {
+            // We need to make sure this is casted to the regular StyledSpinBox
+            // instead of the StyledDoubleSpinBox base class because when we
+            // set the min/max it has overridden that method to update the validator
+            auto* intEditor = new AzQtComponents::SliderCombo(parent);
+            editor = intEditor;
+
+            // If this variable doesn't have custom limits set, use the type min/max
+            if (!hasCustomLimits)
+            {
+                intEditor->setMinimum(INT_MIN);
+                intEditor->setMaximum(INT_MAX);
+            }
+
+            SetEditorRange(intEditor, var);
+        }
+        else if (type == IVariable::FLOAT)
+        {
+            auto* doubleEditor = new AzQtComponents::SliderDoubleCombo(parent);
+            editor = doubleEditor;
+
+            // If this variable doesn't have custom limits set, use the integer
+            // type min/max because if we use the DBL_MIN/MAX the minimum will
+            // be interpreted as 0
+            if (!hasCustomLimits)
+            {
+                doubleEditor->setMinimum(INT_MIN);
+                doubleEditor->setMaximum(INT_MAX);
+            }
+
+            SetEditorRange(doubleEditor, var);
+        }
+
+        if (editor)
+        {
+            // Set the given geometry
+            editor->setGeometry(option.rect);
+            return editor;
+        }
+    }
+    
+    // If we get here, value being edited is a string, so use our styled line
+    // edit widget
+    AzQtComponents::StyledLineEdit* lineEdit = new AzQtComponents::StyledLineEdit(parent);
+    lineEdit->setGeometry(option.rect);
+    return lineEdit;
+}
+
+void ConsoleVariableItemDelegate::SetVarBlock(CVarBlock* varBlock)
+{
+    m_varBlock = varBlock;
+}
+
+ConsoleVariableModel::ConsoleVariableModel(QObject* parent)
+    : QAbstractTableModel(parent)
+    , m_varBlock(nullptr)
+{
+    qRegisterMetaType<IVariable*>("IVariable");
+}
+
+QVariant ConsoleVariableModel::data(const QModelIndex& index, int role) const
+{
+    if (index.row() < 0 || index.row() >= rowCount() || index.column() < 0 || index.column() >= ColumnCount)
+    {
+        return QVariant();
+    }
+
+    IVariable* var = m_varBlock->GetVariable(index.row());
+    if (!var)
+    {
+        return QVariant();
+    }
+
+    // Return data for the display and edit roles for when the table data is
+    // displayed and when a user is attempting to edit a value
+    const int col = index.column();
+    IVariable::EType type = var->GetType();
+    if (role == Qt::DisplayRole || role == Qt::EditRole)
+    {
+        switch (col)
+        {
+        case ColumnType:
+            if (type == IVariable::STRING)
+            {
+                return QString("ab");
+            }
+            else
+            {
+                return QString("n");
+            }
+        case ColumnName:
+            return QString(var->GetName());
+        case ColumnValue:
+            if (type == IVariable::INT)
+            {
+                int value;
+                var->Get(value);
+                return value;
+            }
+            else if (type == IVariable::FLOAT)
+            {
+                float value;
+                var->Get(value);
+                return value;
+            }
+            else // string
+            {
+                QString value;
+                var->Get(value);
+                return value;
+            }
+        }
+    }
+    // Set the tooltip role for the text to display when the mouse is hovered
+    // over a row in the table
+    else if (role == Qt::ToolTipRole)
+    {
+        QString typeName;
+        switch (type)
+        {
+        case IVariable::INT:
+            typeName = tr("Int");
+            break;
+        case IVariable::FLOAT:
+            typeName = tr("Float");
+            break;
+        case IVariable::STRING:
+            typeName = tr("String");
+            break;
+        }
+
+        QString toolTip = QString("[%1] %2 = %3\n%4").arg(type).arg(var->GetName()).arg(QString(var->GetDisplayValue())).arg(var->GetDescription());
+        return toolTip;
+    }
+    // Set a different text color for the row if its value has been modified
+    else if (role == Qt::ForegroundRole)
+    {
+        if (m_modifiedRows.indexOf(index.row()) != -1)
+        {
+            return g_modifiedConsoleVariableColor;
+        }
+    }
+    // Change the text alignment just for the type column to be right/center
+    // so that it looks cleaner (the name/value columns are left/center by default)
+    else if (role == Qt::TextAlignmentRole && col == ColumnType)
+    {
+        int alignment = Qt::AlignRight | Qt::AlignVCenter;
+        return alignment;
+    }
+    // Make the text in the type column bold
+    else if (role == Qt::FontRole && col == ColumnType)
+    {
+        QFont font;
+        font.setBold(true);
+        return font;
+    }
+    else if (role == VariableCustomRole)
+    {
+        return QVariant::fromValue(var);
+    }
+
+    return QVariant();
+}
+
+bool ConsoleVariableModel::setData(const QModelIndex& index, const QVariant& value, int role)
+{
+    // Don't continue if the index is invalid, we aren't in edit mode, or if the
+    // new value isn't different than the current value
+    if (!index.isValid() || role != Qt::EditRole || (index.data() == value))
+    {
+        return false;
+    }
+
+    const int row = index.row();
+    IVariable* var = m_varBlock->GetVariable(row);
+    if (!var)
+    {
+        return false;
+    }
+
+    // Attempt to set new values for our int/float/string variables
+    bool ok = false;
+    switch (var->GetType())
+    {
+    case IVariable::INT:
+    {
+        int intValue = value.toInt(&ok);
+        if (ok)
+        {
+            var->Set(intValue);
+        }
+        break;
+    }
+    case IVariable::FLOAT:
+    {
+        float floatValue = value.toFloat(&ok);
+        if (ok)
+        {
+            var->Set(floatValue);
+        }
+        break;
+    }
+    case IVariable::STRING:
+    {
+        ok = true;
+        QString strValue = value.toString();
+        var->Set(strValue);
+        break;
+    }
+    }
+
+    // Update our data if the variable set was successful
+    if (ok)
+    {
+        // Update the actual cvar
+        OnConsoleVariableUpdated(var);
+
+        // Emit this signal so the model knows to update
+        emit dataChanged(index, index);
+
+        // Add this row to our list of modified rows so we can change its text color
+        m_modifiedRows.append(row);
+        return true;
+    }
+
+    return false;
+}
+
+int ConsoleVariableModel::rowCount(const QModelIndex& parent) const
+{
+    if (parent.isValid() || !m_varBlock)
+    {
+        return 0;
+    }
+
+    return m_varBlock->GetNumVariables();
+}
+
+int ConsoleVariableModel::columnCount(const QModelIndex& parent) const
+{
+    if (parent.isValid())
+    {
+        return 0;
+    }
+
+    return ColumnCount;
+}
+
+Qt::ItemFlags ConsoleVariableModel::flags(const QModelIndex& index) const
+{
+    // Can select any row, but can only edit the value column
+    Qt::ItemFlags itemFlags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+    if (index.column() == ColumnValue)
+    {
+        itemFlags |= Qt::ItemIsEditable;
+    }
+
+    return itemFlags;
+}
+
+QVariant ConsoleVariableModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (section < 0 || section >= ColumnCount || orientation == Qt::Vertical)
+    {
+        return QVariant();
+    }
+
+    return QAbstractTableModel::headerData(section, orientation, role);
+}
+
+void ConsoleVariableModel::SetVarBlock(CVarBlock* varBlock)
+{
+    beginResetModel();
+
+    m_varBlock = varBlock;
+
+    endResetModel();
+}
+
+void ConsoleVariableModel::ClearModifiedRows()
+{
+    m_modifiedRows.clear();
+}
+
+ConsoleVariableEditor::ConsoleVariableEditor(QWidget* parent)
+    : QWidget(parent)
+    , m_tableView(new QTableView(this))
+    , m_model(new ConsoleVariableModel(this))
+    , m_itemDelegate(new ConsoleVariableItemDelegate(this))
+{
+    setWindowTitle(tr("Console Variables"));
+
+    // Setup our table view, don't show the actual headers
+    m_tableView->setEditTriggers(QAbstractItemView::SelectedClicked
+        | QAbstractItemView::DoubleClicked
+        | QAbstractItemView::EditKeyPressed
+        | QAbstractItemView::CurrentChanged);
+    m_tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_tableView->verticalHeader()->hide();
+    m_tableView->horizontalHeader()->hide();
+
+    // Setup a filter widget with a search label and line edit input for filtering
+    // the console variables
+    QWidget* m_filterWidget = new QWidget(this);
+    QLabel* label = new QLabel(tr("Search"), this);
+    QLineEdit* m_filterLineEdit = new QLineEdit(this);
+    QHBoxLayout* filterlayout = new QHBoxLayout(m_filterWidget);
+    filterlayout->addWidget(label);
+    filterlayout->addWidget(m_filterLineEdit);
+
+    // Setup our model to be filterable by the name column from our line edit
+    QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
+    proxyModel->setSourceModel(m_model);
+    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    proxyModel->setFilterKeyColumn(ColumnName);
+    m_tableView->setModel(proxyModel);
+    QObject::connect(m_filterLineEdit, &QLineEdit::textChanged, proxyModel, &QSortFilterProxyModel::setFilterWildcard);
+
+    // Set our value column to use our custom item delegate so we can inject
+    // our styled spin box for modifying the int/float values
+    m_tableView->setItemDelegateForColumn(ColumnValue, m_itemDelegate);
+
+    // Give our dialog a vertical layout with the search field on top and our
+    // table below it that will expand if the dialog is resized
+    QVBoxLayout* mainLayout = new QVBoxLayout(this);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+    mainLayout->addWidget(m_filterWidget);
+    mainLayout->addWidget(m_tableView, 1);
+
+    // Set the console variables
+    m_varBlock = VarBlockFromConsoleVars();
+    SetVarBlock(m_varBlock);
+}
+
+void ConsoleVariableEditor::SetVarBlock(CVarBlock* varBlock)
+{
+    // Send our item delegate the new cvar block so it can use it to pull the
+    // limits for the selected variable
+    m_itemDelegate->SetVarBlock(varBlock);
+
+    // Update our model with the new cvar block
+    m_model->SetVarBlock(varBlock);
+
+    // Size our type column to be fit to the contents and allow our name and value
+    // columns to be stretched
+    m_tableView->resizeColumnToContents(ColumnType);
+    m_tableView->horizontalHeader()->setSectionResizeMode(ColumnName, QHeaderView::Stretch);
+    m_tableView->horizontalHeader()->setSectionResizeMode(ColumnValue, QHeaderView::Stretch);
+
+    // Select the first row by default after setting the model, or else the table
+    // view will just select the first cell on the first row by default which looks
+    // weird, and the other API calls like clear selection don't seem to affect it
+    m_tableView->selectRow(0);
+}
+
+void ConsoleVariableEditor::RegisterViewClass()
+{
+    AzToolsFramework::ViewPaneOptions opts;
+    opts.paneRect = QRect(100, 100, 340, 500);
+    opts.isDeletable = false;
+
+    AzToolsFramework::RegisterViewPane<ConsoleVariableEditor>(LyViewPane::ConsoleVariables, LyViewPane::CategoryOther, opts);
+}
+
+/**
+ * Update the IVariable in our var block when the corresponding ICVar has been
+ * changed
+ */
+void ConsoleVariableEditor::HandleVariableRowUpdated(ICVar* pCVar)
+{
+    const int varCount = m_varBlock->GetNumVariables();
+    for (int row = 0; row < varCount; ++row)
+    {
+        IVariable* var = m_varBlock->GetVariable(row);
+        if (var == nullptr)
+        {
+            continue;
+        }
+
+        if (var->GetName() == pCVar->GetName())
+        {
+            int varType = pCVar->GetType();
+            switch (varType)
+            {
+            case CVAR_INT:
+                var->Set(pCVar->GetIVal());
+                break;
+            case CVAR_FLOAT:
+                var->Set(pCVar->GetFVal());
+                break;
+            case CVAR_STRING:
+                var->Set(pCVar->GetString());
+                break;
+            }
+
+            // We need to let our model know that the underlying data has changed so
+            // that the view will be updated
+            QModelIndex index = m_model->index(row, ColumnValue);
+            Q_EMIT m_model->dataChanged(index, index);
+            return;
+        }
+    }
+}
+
+void ConsoleVariableEditor::showEvent(QShowEvent* event)
+{
+    // Clear out our list of modified rows whenever our view is re-shown
+    m_model->ClearModifiedRows();
+
+    QWidget::showEvent(event);
+}
+
+void CConsoleSCB::showVariableEditor()
+{
+    // Open the console variables pane
+    QtViewPaneManager::instance()->OpenPane(LyViewPane::ConsoleVariables);
+}
+
+void CConsoleSCB::toggleConsoleSearch()
+{
+    if (!ui->findBar->isVisible())
+    {
+        ui->findBar->setVisible(true);
+        ui->lineEditFind->setFocus();
+    }
+    else
+    {
+        ui->findBar->setVisible(false);
+    }
+}
+
+void CConsoleSCB::findPrevious()
+{
+    const auto text = ui->lineEditFind->text();
+    auto found = ui->textEdit->find(text, QTextDocument::FindBackward);
+
+    if (!found)
+    {
+        auto prevCursor = ui->textEdit->textCursor();
+        ui->textEdit->moveCursor(QTextCursor::End);
+        found = ui->textEdit->find(text, QTextDocument::FindBackward);
+
+        if (!found)
+        {
+            ui->textEdit->setTextCursor(prevCursor);
+        }
+    }
+}
+
+void CConsoleSCB::findNext()
+{
+    const auto text = ui->lineEditFind->text();
+    auto found = ui->textEdit->find(text);
+
+    if (!found)
+    {
+        auto prevCursor = ui->textEdit->textCursor();
+        ui->textEdit->moveCursor(QTextCursor::Start);
+        found = ui->textEdit->find(text);
+
+        if (!found)
+        {
+            ui->textEdit->setTextCursor(prevCursor);
+        }
+    }
+}
+
+CConsoleSCB* CConsoleSCB::GetCreatedInstance()
+{
+    return s_consoleSCB;
+}
+
+#include <Controls/moc_ConsoleSCB.cpp>
diff --git a/Code/Editor/Controls/ConsoleSCB.h b/Code/Editor/Controls/ConsoleSCB.h
new file mode 100644
index 0000000000..faa8c06124
--- /dev/null
+++ b/Code/Editor/Controls/ConsoleSCB.h
@@ -0,0 +1,203 @@
+/*
+ * 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_CONTROLS_CONSOLESCB_H
+#define CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCB_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+
+#include "Settings.h"
+#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
+
+#include <QLineEdit>
+#include <QPlainTextEdit>
+
+#include <QAbstractTableModel>
+#include <QDialog>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QScopedPointer>
+#include <QStyledItemDelegate>
+#endif
+
+class QMenu;
+class ConsoleWidget;
+class QFocusEvent;
+class QTableView;
+class CVarBlock;
+
+namespace Ui {
+    class Console;
+}
+
+struct ConsoleLine
+{
+    QString text;
+    bool newLine;
+};
+typedef std::deque<ConsoleLine> Lines;
+
+
+class ConsoleLineEdit
+    : public QLineEdit
+{
+    Q_OBJECT
+public:
+    explicit ConsoleLineEdit(QWidget* parent = nullptr);
+
+protected:
+    void mouseDoubleClickEvent(QMouseEvent* ev) override;
+    void keyPressEvent(QKeyEvent* ev) override;
+    bool event(QEvent* ev) override;
+
+signals:
+    void variableEditorRequested();
+
+private:
+    void DisplayHistory(bool bForward);
+    void ResetHistoryIndex();
+
+    QStringList m_history;
+    unsigned int m_historyIndex;
+    bool m_bReusedHistory;
+};
+
+class ConsoleTextEdit
+    : public QPlainTextEdit
+{
+    Q_OBJECT
+public:
+    explicit ConsoleTextEdit(QWidget* parent = nullptr);
+    virtual bool event(QEvent* theEvent) override;
+
+signals:
+    void searchBarRequested();
+
+private:
+    void showContextMenu(const QPoint& pt);
+
+    QScopedPointer<QMenu> m_contextMenu;
+};
+
+class ConsoleVariableItemDelegate
+    : public QStyledItemDelegate
+{
+    Q_OBJECT
+public:
+    explicit ConsoleVariableItemDelegate(QObject* parent = nullptr);
+
+    // Item delegate overrides for creating the custom editor widget and
+    // setting/retrieving data to/from it
+    void setEditorData(QWidget* editor, const QModelIndex& index) const override;
+    void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
+    QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+
+    void SetVarBlock(CVarBlock* varBlock);
+
+private:
+    CVarBlock* m_varBlock;
+};
+
+class ConsoleVariableModel
+    : public QAbstractTableModel
+{
+    Q_OBJECT
+public:
+    enum CustomRoles
+    {
+        VariableCustomRole = Qt::UserRole
+    };
+
+    explicit ConsoleVariableModel(QObject* parent = nullptr);
+
+    // Table model overrides
+    QVariant data(const QModelIndex& index, int role) const override;
+    bool setData(const QModelIndex& index, const QVariant& value, int role) override;
+    int rowCount(const QModelIndex& = {}) const override;
+    int columnCount(const QModelIndex& = {}) const override;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+    void SetVarBlock(CVarBlock* varBlock);
+    void ClearModifiedRows();
+
+private:
+    CVarBlock* m_varBlock;
+    QList<int> m_modifiedRows;
+};
+
+class ConsoleVariableEditor
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit ConsoleVariableEditor(QWidget* parent = nullptr);
+
+    static void RegisterViewClass();
+    void HandleVariableRowUpdated(ICVar* pCVar);
+
+protected:
+    void showEvent(QShowEvent* event) override;
+
+private:
+    void SetVarBlock(CVarBlock* varBlock);
+
+    QTableView* m_tableView;
+    ConsoleVariableModel* m_model;
+    ConsoleVariableItemDelegate* m_itemDelegate;
+    CVarBlock* m_varBlock;
+};
+
+class CConsoleSCB
+    : public QWidget
+    , private AzToolsFramework::EditorPreferencesNotificationBus::Handler
+{
+    Q_OBJECT
+public:
+    explicit CConsoleSCB(QWidget* parent = nullptr);
+    ~CConsoleSCB();
+
+    static void RegisterViewClass();
+    void SetInputFocus();
+    void AddToConsole(const QString& text, bool bNewLine);
+    void FlushText();
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
+    static CConsoleSCB* GetCreatedInstance();
+
+    static void AddToPendingLines(const QString& text, bool bNewLine);        // call this function instead of AddToConsole() until an instance of CConsoleSCB exists to prevent messages from getting lost
+
+    // EditorPreferencesNotificationBus...
+    void OnEditorPreferencesChanged() override;
+
+    void RefreshStyle();
+
+private Q_SLOTS:
+    void showVariableEditor();
+    void toggleConsoleSearch();
+    void findPrevious();
+    void findNext();
+
+private:
+    QScopedPointer<Ui::Console> ui;
+    int m_richEditTextLength;
+
+    Lines m_lines;
+    static Lines s_pendingLines;
+
+    QList<QColor> m_colorTable;
+    AzToolsFramework::ConsoleColorTheme m_backgroundTheme;
+
+    class SearchHighlighter;
+    SearchHighlighter* m_highlighter;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCB_H
+
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCB.qrc b/Code/Editor/Controls/ConsoleSCB.qrc
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCB.qrc
rename to Code/Editor/Controls/ConsoleSCB.qrc
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCB.ui b/Code/Editor/Controls/ConsoleSCB.ui
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCB.ui
rename to Code/Editor/Controls/ConsoleSCB.ui
diff --git a/Code/Editor/Controls/ConsoleSCBMFC.cpp b/Code/Editor/Controls/ConsoleSCBMFC.cpp
new file mode 100644
index 0000000000..d61bee554d
--- /dev/null
+++ b/Code/Editor/Controls/ConsoleSCBMFC.cpp
@@ -0,0 +1,542 @@
+/*
+ * 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 "ConsoleSCBMFC.h"
+#include "PropertiesDialog.h"
+#include "QtViewPaneManager.h"
+#include "Core/QtEditorApplication.h"
+
+#include <Controls/ui_ConsoleSCBMFC.h>
+
+#include <QtUtil.h>
+#include <QtUtilWin.h>
+
+#include <QtCore/QStringList>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QPoint>
+#include <QtGui/QCursor>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStyleFactory>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QVBoxLayout>
+
+#include <vector>
+#include <iostream>
+
+namespace MFC
+{
+
+static CPropertiesDialog* gPropertiesDlg = nullptr;
+static CString mfc_popup_helper(HWND hwnd, int x, int y);
+static CConsoleSCB* s_consoleSCB = nullptr;
+
+static QString RemoveColorCode(const QString& text, int& iColorCode)
+{
+    QString cleanString;
+    cleanString.reserve(text.size());
+
+    const int textSize = text.size();
+    for (int i = 0; i < textSize; ++i)
+    {
+        QChar c = text.at(i);
+        bool isLast = i == textSize - 1;
+        if (c == '$' && !isLast && text.at(i + 1).isDigit())
+        {
+            if (iColorCode == 0)
+            {
+                iColorCode = text.at(i + 1).digitValue();
+            }
+            ++i;
+            continue;
+        }
+
+        if (c == '\r' || c == '\n')
+        {
+            ++i;
+            continue;
+        }
+
+        cleanString.append(c);
+    }
+
+    return cleanString;
+}
+
+ConsoleLineEdit::ConsoleLineEdit(QWidget* parent)
+    : QLineEdit(parent)
+    , m_historyIndex(0)
+    , m_bReusedHistory(false)
+{
+}
+
+void ConsoleLineEdit::mousePressEvent(QMouseEvent* ev)
+{
+    if (ev->type() == QEvent::MouseButtonPress && ev->button() & Qt::RightButton)
+    {
+        Q_EMIT variableEditorRequested();
+    }
+
+    QLineEdit::mousePressEvent(ev);
+}
+
+void ConsoleLineEdit::mouseDoubleClickEvent(QMouseEvent* ev)
+{
+    Q_EMIT variableEditorRequested();
+}
+
+bool ConsoleLineEdit::event(QEvent* ev)
+{
+    // Tab key doesn't go to keyPressEvent(), must be processed here
+
+    if (ev->type() != QEvent::KeyPress)
+    {
+        return QLineEdit::event(ev);
+    }
+
+    QKeyEvent* ke = static_cast<QKeyEvent*>(ev);
+    if (ke->key() != Qt::Key_Tab)
+    {
+        return QLineEdit::event(ev);
+    }
+
+    QString inputStr = text();
+    QString newStr;
+
+    QStringList tokens = inputStr.split(" ");
+    inputStr = tokens.isEmpty() ? QString() : tokens.first();
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+
+    const bool ctrlPressed = ke->modifiers() & Qt::ControlModifier;
+    CString cstring = QtUtil::ToCString(inputStr); // TODO: Use QString once the backend stops using QString
+    if (ctrlPressed)
+    {
+        newStr = QtUtil::ToString(console->AutoCompletePrev(cstring));
+    }
+    else
+    {
+        newStr = QtUtil::ToString(console->ProcessCompletion(cstring));
+        newStr = QtUtil::ToString(console->AutoComplete(cstring));
+
+        if (newStr.isEmpty())
+        {
+            newStr = QtUtil::ToQString(GetIEditor()->GetCommandManager()->AutoComplete(QtUtil::ToString(newStr)));
+        }
+    }
+
+    if (!newStr.isEmpty())
+    {
+        newStr += " ";
+        setText(newStr);
+    }
+
+    deselect();
+    return true;
+}
+
+void ConsoleLineEdit::keyPressEvent(QKeyEvent* ev)
+{
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+    auto commandManager = GetIEditor()->GetCommandManager();
+
+    console->ResetAutoCompletion();
+
+    switch (ev->key())
+    {
+    case Qt::Key_Enter:
+    case Qt::Key_Return:
+    {
+        QString str = text().trimmed();
+        if (!str.isEmpty())
+        {
+            if (commandManager->IsRegistered(QtUtil::ToCString(str)))
+            {
+                commandManager->Execute(QtUtil::ToString(str));
+            }
+            else
+            {
+                CLogFile::WriteLine(QtUtil::ToCString(str));
+                GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(QtUtil::ToCString(str));
+            }
+
+            // If a history command was reused directly via up arrow enter, do not reset history index
+            if (m_history.size() > 0 && m_historyIndex < m_history.size() && m_history[m_historyIndex] == str)
+            {
+                m_bReusedHistory = true;
+            }
+            else
+            {
+                m_historyIndex = m_history.size();
+            }
+
+            // Do not add the same string if it is the top of the stack, but allow duplicate entries otherwise
+            if (m_history.isEmpty() || m_history.back() != str)
+            {
+                m_history.push_back(str);
+                if (!m_bReusedHistory)
+                {
+                    m_historyIndex = m_history.size();
+                }
+            }
+        }
+        else
+        {
+            m_historyIndex = m_history.size();
+        }
+
+        setText(QString());
+        break;
+    }
+    case Qt::Key_AsciiTilde: // ~
+    case Qt::Key_Agrave: // `
+        // disable log.
+        GetIEditor()->ShowConsole(false);
+        setText(QString());
+        m_historyIndex = m_history.size();
+        break;
+    case Qt::Key_Escape:
+        setText(QString());
+        m_historyIndex = m_history.size();
+        break;
+    case Qt::Key_Up:
+        DisplayHistory(false /*bForward*/);
+        break;
+    case Qt::Key_Down:
+        DisplayHistory(true /*bForward*/);
+        break;
+    default:
+        QLineEdit::keyPressEvent(ev);
+    }
+}
+
+void ConsoleLineEdit::DisplayHistory(bool bForward)
+{
+    if (m_history.isEmpty())
+    {
+        return;
+    }
+
+    // Immediately after reusing a history entry, ensure up arrow re-displays command just used
+    if (!m_bReusedHistory || bForward)
+    {
+        m_historyIndex = static_cast<unsigned int>(clamp_tpl(static_cast<int>(m_historyIndex) + (bForward ? 1 : -1), 0, m_history.size() - 1));
+    }
+    m_bReusedHistory = false;
+
+    setText(m_history[m_historyIndex]);
+}
+
+ConsoleTextEdit::ConsoleTextEdit(QWidget* parent)
+    : QTextEdit(parent)
+{
+}
+
+
+Lines CConsoleSCB::s_pendingLines;
+
+CConsoleSCB::CConsoleSCB(QWidget* parent)
+    : QWidget(parent)
+    , ui(new Ui::ConsoleMFC())
+    , m_richEditTextLength(0)
+    , m_backgroundTheme(gSettings.consoleBackgroundColorTheme)
+{
+    m_lines = s_pendingLines;
+    s_pendingLines.clear();
+    s_consoleSCB = this;
+    ui->setupUi(this);
+    setMinimumHeight(120);
+
+    // Setup the color table for the default (light) theme
+    m_colorTable << QColor(0, 0, 0)
+        << QColor(0, 0, 0)
+        << QColor(0, 0, 200) // blue
+        << QColor(0, 200, 0) // green
+        << QColor(200, 0, 0) // red
+        << QColor(0, 200, 200) // cyan
+        << QColor(128, 112, 0) // yellow
+        << QColor(200, 0, 200) // red+blue
+        << QColor(0x000080ff)
+        << QColor(0x008f8f8f);
+    OnStyleSettingsChanged();
+
+    connect(ui->button, &QPushButton::clicked, this, &CConsoleSCB::showVariableEditor);
+    connect(ui->lineEdit, &MFC::ConsoleLineEdit::variableEditorRequested, this, &MFC::CConsoleSCB::showVariableEditor);
+    connect(Editor::EditorQtApplication::instance(), &Editor::EditorQtApplication::skinChanged, this, &MFC::CConsoleSCB::OnStyleSettingsChanged);
+
+    if (GetIEditor()->IsInConsolewMode())
+    {
+        // Attach / register edit box
+        //CLogFile::AttachEditBox(m_edit.GetSafeHwnd()); // FIXME
+    }
+}
+
+CConsoleSCB::~CConsoleSCB()
+{
+    s_consoleSCB = nullptr;
+    delete gPropertiesDlg;
+    gPropertiesDlg = nullptr;
+    CLogFile::AttachEditBox(nullptr);
+}
+
+void CConsoleSCB::RegisterViewClass()
+{
+    QtViewOptions opts;
+    opts.preferedDockingArea = Qt::BottomDockWidgetArea;
+    opts.isDeletable = false;
+    opts.isStandard = true;
+    opts.showInMenu = true;
+    opts.builtInActionId = ID_VIEW_CONSOLEWINDOW;
+    opts.sendViewPaneNameBackToAmazonAnalyticsServers = true;
+    RegisterQtViewPane<CConsoleSCB>(GetIEditor(), LyViewPane::Console, LyViewPane::CategoryTools, opts);
+}
+
+void CConsoleSCB::OnStyleSettingsChanged()
+{
+    ui->button->setIcon(QIcon(QString(":/controls/img/cvar_dark.bmp")));
+
+    // Set the debug/warning text colors appropriately for the background theme
+    // (e.g. not have black text on black background)
+    QColor textColor = Qt::black;
+    m_backgroundTheme = gSettings.consoleBackgroundColorTheme;
+    if (m_backgroundTheme == SEditorSettings::ConsoleColorTheme::Dark)
+    {
+        textColor = Qt::white;
+    }
+    m_colorTable[0] = textColor;
+    m_colorTable[1] = textColor;
+
+    QColor bgColor;
+    if (!GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == SEditorSettings::ConsoleColorTheme::Dark)
+    {
+        bgColor = Qt::black;
+    }
+    else
+    {
+        bgColor = Qt::white;
+    }
+
+    ui->textEdit->setStyleSheet(QString("QTextEdit{ background: %1 }").arg(bgColor.name(QColor::HexRgb)));
+
+    // Clear out the console text when we change our background color since
+    // some of the previous text colors may not be appropriate for the
+    // new background color
+    ui->textEdit->clear();
+}
+
+void CConsoleSCB::showVariableEditor()
+{
+    const QPoint cursorPos = QCursor::pos();
+    CString str = mfc_popup_helper(0, cursorPos.x(), cursorPos.y());
+    if (!str.IsEmpty())
+    {
+        ui->lineEdit->setText(QtUtil::ToQString(str));
+    }
+}
+
+void CConsoleSCB::SetInputFocus()
+{
+    ui->lineEdit->setFocus();
+    ui->lineEdit->setText(QString());
+}
+
+void CConsoleSCB::AddToConsole(const QString& text, bool bNewLine)
+{
+    m_lines.push_back({ text, bNewLine });
+    FlushText();
+}
+
+void CConsoleSCB::FlushText()
+{
+    if (m_lines.empty())
+    {
+        return;
+    }
+
+    // Store our current cursor in case we need to restore it, and check if
+    // the user has scrolled the text edit away from the bottom
+    const QTextCursor oldCursor = ui->textEdit->textCursor();
+    QScrollBar* scrollBar = ui->textEdit->verticalScrollBar();
+    const int oldScrollValue = scrollBar->value();
+    bool scrolledOffBottom = oldScrollValue != scrollBar->maximum();
+
+    ui->textEdit->moveCursor(QTextCursor::End);
+    QTextCursor textCursor = ui->textEdit->textCursor();
+
+    while (!m_lines.empty())
+    {
+        ConsoleLine line = m_lines.front();
+        m_lines.pop_front();
+
+        int iColor = 0;
+        QString text = MFC::RemoveColorCode(line.text, iColor);
+        if (iColor < 0 || iColor >= m_colorTable.size())
+        {
+            iColor = 0;
+        }
+
+        if (line.newLine)
+        {
+            text = QtUtil::trimRight(text);
+            text = "\r\n" + text;
+        }
+
+        QTextCharFormat format;
+        const QColor color(m_colorTable[iColor]);
+        format.setForeground(color);
+
+        if (iColor != 0)
+        {
+            format.setFontWeight(QFont::Bold);
+        }
+
+        textCursor.setCharFormat(format);
+        textCursor.insertText(text);
+    }
+
+    // If the user has selected some text in the text edit area or has scrolled
+    // away from the bottom, then restore the previous cursor and keep the scroll
+    // bar in the same location
+    if (oldCursor.hasSelection() || scrolledOffBottom)
+    {
+        ui->textEdit->setTextCursor(oldCursor);
+        scrollBar->setValue(oldScrollValue);
+    }
+    // Otherwise scroll to the bottom so the latest text can be seen
+    else
+    {
+        scrollBar->setValue(scrollBar->maximum());
+    }
+}
+
+QSize CConsoleSCB::minimumSizeHint() const
+{
+    return QSize(-1, -1);
+}
+
+QSize CConsoleSCB::sizeHint() const
+{
+    return QSize(100, 100);
+}
+
+/** static */
+void CConsoleSCB::AddToPendingLines(const QString& text, bool bNewLine)
+{
+    s_pendingLines.push_back({ text, bNewLine });
+}
+
+static CVarBlock* VarBlockFromConsoleVars()
+{
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+    std::vector<const char*> cmds;
+    cmds.resize(console->GetNumVars());
+    size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
+
+    CVarBlock* vb = new CVarBlock;
+    IVariable* pVariable = 0;
+    for (int i = 0; i < cmdCount; i++)
+    {
+        ICVar* pCVar = console->GetCVar(cmds[i]);
+        if (!pCVar)
+        {
+            continue;
+        }
+        int varType = pCVar->GetType();
+
+        switch (varType)
+        {
+        case CVAR_INT:
+            pVariable = new CVariable<int>();
+            pVariable->Set(pCVar->GetIVal());
+            break;
+        case CVAR_FLOAT:
+            pVariable = new CVariable<float>();
+            pVariable->Set(pCVar->GetFVal());
+            break;
+        case CVAR_STRING:
+            pVariable = new CVariable<CString>();
+            pVariable->Set(pCVar->GetString());
+            break;
+        default:
+            assert(0);
+        }
+
+        pVariable->SetDescription(pCVar->GetHelp());
+        pVariable->SetName(cmds[i]);
+
+        if (pVariable)
+        {
+            vb->AddVariable(pVariable);
+        }
+    }
+    return vb;
+}
+
+static void OnConsoleVariableUpdated(IVariable* pVar)
+{
+    if (!pVar)
+    {
+        return;
+    }
+    CString varName = pVar->GetName();
+    ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(varName);
+    if (!pCVar)
+    {
+        return;
+    }
+    if (pVar->GetType() == IVariable::INT)
+    {
+        int val;
+        pVar->Get(val);
+        pCVar->Set(val);
+    }
+    else if (pVar->GetType() == IVariable::FLOAT)
+    {
+        float val;
+        pVar->Get(val);
+        pCVar->Set(val);
+    }
+    else if (pVar->GetType() == IVariable::STRING)
+    {
+        CString val;
+        pVar->Get(val);
+        pCVar->Set(val);
+    }
+}
+
+static CString mfc_popup_helper(HWND hwnd, int x, int y)
+{
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+
+    TSmartPtr<CVarBlock> vb = VarBlockFromConsoleVars();
+    XmlNodeRef node;
+    if (!gPropertiesDlg)
+    {
+        gPropertiesDlg = new CPropertiesDialog("Console Variables", node, AfxGetMainWnd(), true);
+    }
+    if (!gPropertiesDlg->m_hWnd)
+    {
+        gPropertiesDlg->Create(CPropertiesDialog::IDD, AfxGetMainWnd());
+        gPropertiesDlg->SetUpdateCallback(AZStd::bind(OnConsoleVariableUpdated, AZStd::placeholders::_1));
+    }
+    gPropertiesDlg->ShowWindow(SW_SHOW);
+    gPropertiesDlg->BringWindowToTop();
+    gPropertiesDlg->GetPropertyCtrl()->AddVarBlock(vb);
+
+    return "";
+}
+
+CConsoleSCB* CConsoleSCB::GetCreatedInstance()
+{
+    return s_consoleSCB;
+}
+
+} // namespace MFC
+
+#include <Controls/moc_ConsoleSCBMFC.cpp>
diff --git a/Code/Editor/Controls/ConsoleSCBMFC.h b/Code/Editor/Controls/ConsoleSCBMFC.h
new file mode 100644
index 0000000000..faaaf4f626
--- /dev/null
+++ b/Code/Editor/Controls/ConsoleSCBMFC.h
@@ -0,0 +1,110 @@
+/*
+ * 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_CONTROLS_CONSOLESCBMFC_H
+#define CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCBMFC_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QPushButton>
+
+#include "ConsoleSCB.h"
+#endif
+
+class QMenu;
+class ConsoleWidget;
+class QFocusEvent;
+
+namespace Ui {
+    class ConsoleMFC;
+}
+
+namespace MFC
+{
+
+struct ConsoleLine
+{
+    QString text;
+    bool newLine;
+};
+typedef std::deque<ConsoleLine> Lines;
+
+class ConsoleLineEdit
+    : public QLineEdit
+{
+    Q_OBJECT
+public:
+    explicit ConsoleLineEdit(QWidget* parent = nullptr);
+
+protected:
+    void mousePressEvent(QMouseEvent* ev) override;
+    void mouseDoubleClickEvent(QMouseEvent* ev) override;
+    void keyPressEvent(QKeyEvent* ev) override;
+    bool event(QEvent* ev) override;
+
+signals:
+    void variableEditorRequested();
+    void setWindowTitle(const QString&);
+
+private:
+    void DisplayHistory(bool bForward);
+    QStringList m_history;
+    unsigned int m_historyIndex;
+    bool m_bReusedHistory;
+};
+
+class ConsoleTextEdit
+    : public QTextEdit
+{
+    Q_OBJECT
+public:
+    explicit ConsoleTextEdit(QWidget* parent = nullptr);
+};
+
+class CConsoleSCB
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit CConsoleSCB(QWidget* parent = nullptr);
+    ~CConsoleSCB();
+
+    static void RegisterViewClass();
+    void SetInputFocus();
+    void AddToConsole(const QString& text, bool bNewLine);
+    void FlushText();
+    void showPopupAndSetTitle();
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
+    static CConsoleSCB* GetCreatedInstance();
+
+    static void AddToPendingLines(const QString& text, bool bNewLine);        // call this function instead of AddToConsole() until an instance of CConsoleSCB exists to prevent messages from getting lost
+
+public Q_SLOTS:
+    void OnStyleSettingsChanged();
+
+private Q_SLOTS:
+    void showVariableEditor();
+
+private:
+    QScopedPointer<Ui::ConsoleMFC> ui;
+    int m_richEditTextLength;
+
+    Lines m_lines;
+    static Lines s_pendingLines;
+
+    QList<QColor> m_colorTable;
+    SEditorSettings::ConsoleColorTheme m_backgroundTheme;
+};
+
+} // namespace MFC
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCB_H
+
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.ui b/Code/Editor/Controls/ConsoleSCBMFC.ui
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCBMFC.ui
rename to Code/Editor/Controls/ConsoleSCBMFC.ui
diff --git a/Code/Editor/Controls/FolderTreeCtrl.cpp b/Code/Editor/Controls/FolderTreeCtrl.cpp
new file mode 100644
index 0000000000..afb9244bb5
--- /dev/null
+++ b/Code/Editor/Controls/FolderTreeCtrl.cpp
@@ -0,0 +1,502 @@
+/*
+ * 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 "FolderTreeCtrl.h"
+
+// Qt
+#include <QMenu>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
+
+// AzQtComponents
+#include <AzQtComponents/Utilities/DesktopUtilities.h>      // for AzQtComponents::ShowFileOnDesktop
+
+
+enum ETreeImage
+{
+    eTreeImage_Folder = 0,
+    eTreeImage_File = 2
+};
+
+enum CustomRoles
+{
+    IsFolderRole = Qt::UserRole
+};
+
+//////////////////////////////////////////////////////////////////////////
+// CFolderTreeCtrl
+//////////////////////////////////////////////////////////////////////////
+CFolderTreeCtrl::CFolderTreeCtrl(const QStringList& folders, const QString& fileNameSpec,
+    const QString& rootName, bool bDisableMonitor, bool bFlatTree, QWidget* parent)
+    : QTreeView(parent)
+    , m_rootTreeItem(nullptr)
+    , m_folders(folders)
+    , m_fileNameSpec(fileNameSpec)
+    , m_rootName(rootName)
+    , m_bDisableMonitor(bDisableMonitor)
+    , m_bFlatStyle(bFlatTree)
+{
+    init(folders, fileNameSpec, rootName, bDisableMonitor, bFlatTree);
+}
+
+CFolderTreeCtrl::CFolderTreeCtrl(QWidget* parent)
+    : QTreeView(parent)
+    , m_rootTreeItem(nullptr)
+    , m_bDisableMonitor(false)
+    , m_bFlatStyle(true)
+
+{
+}
+
+
+void CFolderTreeCtrl::init(const QStringList& folders, const QString& fileNameSpec, const QString& rootName, bool bDisableMonitor /*= false*/, bool bFlatTree /*= true*/)
+{
+    m_model = new QStandardItemModel(this);
+    m_proxyModel = new QSortFilterProxyModel(this);
+    m_proxyModel->setRecursiveFilteringEnabled(true);
+
+    m_proxyModel->setSourceModel(m_model);
+    setModel(m_proxyModel);
+
+    m_folders = folders;
+    m_fileNameSpec = fileNameSpec;
+    m_rootName = rootName;
+    m_bDisableMonitor = bDisableMonitor;
+    m_bFlatStyle = bFlatTree;
+    m_fileIcon = QIcon(":/TreeView/default-icon.svg");
+    m_folderIcon = QIcon(":/TreeView/folder-icon.svg");
+
+    for (auto item = m_folders.begin(), end = m_folders.end(); item != end; ++item)
+    {
+        (*item) = Path::RemoveBackslash(Path::ToUnixPath((*item)));
+
+        if (CFileUtil::PathExists(*item))
+        {
+            m_foldersSegments.insert(std::make_pair((*item), Path::SplitIntoSegments((*item)).size()));
+        }
+        else if (Path::IsFolder((*item).toLocal8Bit().constData()))
+        {
+            m_foldersSegments.insert(std::make_pair((*item), Path::SplitIntoSegments((*item)).size()));
+        }
+        else
+        {
+            (*item).clear();
+        }
+    }
+
+    setHeaderHidden(true);
+
+    QObject::connect(this, &QTreeView::doubleClicked, this, &CFolderTreeCtrl::OnIndexDoubleClicked);
+
+    InitTree();
+
+    setSortingEnabled(true);
+}
+
+QString CFolderTreeCtrl::GetPath(QStandardItem* item) const
+{
+    CTreeItem* treeItem = static_cast<CTreeItem*>(item);
+
+    if (treeItem)
+    {
+        return treeItem->GetPath();
+    }
+
+    return "";
+}
+
+bool CFolderTreeCtrl::IsFolder(QStandardItem* item) const
+{
+    return item->data(IsFolderRole).toBool();
+}
+
+bool CFolderTreeCtrl::IsFile(QStandardItem* item) const
+{
+    return !IsFolder(item);
+}
+
+CFolderTreeCtrl::~CFolderTreeCtrl()
+{
+    // Obliterate tree items before destroying the controls
+    m_rootTreeItem.reset(nullptr);
+
+    // Unsubscribe from file change notifications
+    if (!m_bDisableMonitor)
+    {
+        CFileChangeMonitor::Instance()->Unsubscribe(this);
+    }
+}
+
+void CFolderTreeCtrl::OnIndexDoubleClicked(const QModelIndex& index)
+{
+    if (!m_proxyModel || !m_model)
+    {
+        return;
+    }
+
+    QStandardItem* item = GetSourceItemByIndex(index);
+    if (item)
+    {
+        Q_EMIT ItemDoubleClicked(item);
+    }
+}
+
+void CFolderTreeCtrl::OnFileMonitorChange(const SFileChangeInfo& rChange)
+{
+    const QString filePath = Path::ToUnixPath(Path::GetRelativePath(rChange.filename));
+    for (auto item = m_folders.begin(), end = m_folders.end(); item != end; ++item)
+    {
+        // Only look for changes in folder
+        if (filePath.indexOf((*item)) != 0)
+        {
+            return;
+        }
+
+        if (rChange.changeType == rChange.eChangeType_Created || rChange.changeType == rChange.eChangeType_RenamedNewName)
+        {
+            if (CFileUtil::PathExists(filePath))
+            {
+                LoadTreeRec(filePath);
+            }
+            else
+            {
+                AddItem(filePath);
+            }
+        }
+        else if (rChange.changeType == rChange.eChangeType_Deleted || rChange.changeType == rChange.eChangeType_RenamedOldName)
+        {
+            RemoveItem(filePath);
+        }
+    }
+}
+
+void CFolderTreeCtrl::contextMenuEvent(QContextMenuEvent* e)
+{
+    if (!m_model)
+    {
+        return;
+    }
+
+    auto index = indexAt(e->pos());
+    QStandardItem* item = GetSourceItemByIndex(index);
+
+    if (!item)
+    {
+        return;
+    }
+
+    const QString path = GetPath(item);
+
+    QMenu menu;
+    QAction* editAction = menu.addAction(tr("Edit"));
+    connect(editAction, &QAction::triggered, this, [=]()
+        {
+            this->Edit(path);
+        });
+    QAction* showInExplorerAction = menu.addAction(tr("Show In Explorer"));
+    connect(showInExplorerAction, &QAction::triggered, this, [=]()
+        {
+            this->ShowInExplorer(path);
+        });
+    menu.exec(QCursor::pos());
+}
+
+void CFolderTreeCtrl::InitTree()
+{
+    m_rootTreeItem.reset(new CTreeItem(*this, m_rootName));
+
+    for (auto item = m_folders.begin(), end = m_folders.end(); item != end; ++item)
+    {
+        if (!(*item).isEmpty())
+        {
+            LoadTreeRec((*item));
+        }
+    }
+
+    if (!m_bDisableMonitor)
+    {
+        CFileChangeMonitor::Instance()->Subscribe(this);
+    }
+
+
+    expandAll();
+}
+
+void CFolderTreeCtrl::LoadTreeRec(const QString& currentFolder)
+{
+    CFileEnum fileEnum;
+    QFileInfo fileData;
+
+    QString currentFolderSlash = Path::AddSlash(currentFolder);
+    QString targetFolder = currentFolder;
+
+    if (currentFolder.startsWith('@'))
+    {
+        char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
+        if (AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(currentFolder.toLocal8Bit().constData(), resolvedPath, AZ_MAX_PATH_LEN))
+        {
+            targetFolder = resolvedPath;
+        }
+
+        // update the base folder name
+        QStringList parts =  Path::SplitIntoSegments(currentFolderSlash);
+        if (parts.size() > 1)
+        {
+            parts.removeFirst();
+            currentFolderSlash = Path::AddSlash(parts.join(QDir::separator()));
+        }
+    }
+
+    for (bool bFoundFile = fileEnum.StartEnumeration(targetFolder, "*", &fileData);
+         bFoundFile; bFoundFile = fileEnum.GetNextFile(&fileData))
+    {
+        const QString fileName = fileData.fileName();
+
+        // Have we found a folder?
+        if (fileData.isDir())
+        {
+            // Skip the parent folder entries
+            if (fileName == "." || fileName == "..")
+            {
+                continue;
+            }
+
+            LoadTreeRec(currentFolderSlash + fileName);
+        }
+
+        AddItem(currentFolderSlash + fileName);
+    }
+}
+
+void CFolderTreeCtrl::AddItem(const QString& path)
+{
+    QString folder;
+    QString fileNameWithoutExtension;
+    QString ext;
+
+    Path::Split(path, folder, fileNameWithoutExtension, ext);
+
+    auto regex = QRegExp(m_fileNameSpec, Qt::CaseInsensitive, QRegExp::Wildcard);
+    if (regex.exactMatch(path))
+    {
+        CTreeItem* folderTreeItem = CreateFolderItems(folder);
+        folderTreeItem->AddChild(fileNameWithoutExtension, path, eTreeImage_File);
+    }
+}
+
+void CFolderTreeCtrl::RemoveItem(const QString& path)
+{
+    if (!CFileUtil::FileExists(path))
+    {
+        auto findIter = m_pathToTreeItem.find(path);
+
+        if (findIter != m_pathToTreeItem.end())
+        {
+            CTreeItem* foundItem = findIter->second;
+            foundItem->Remove();
+            RemoveEmptyFolderItems(Path::GetPath(path));
+        }
+    }
+}
+
+CFolderTreeCtrl::CTreeItem* CFolderTreeCtrl::GetItem(const QString& path)
+{
+    auto findIter = m_pathToTreeItem.find(path);
+
+    if (findIter == m_pathToTreeItem.end())
+    {
+        return nullptr;
+    }
+
+    return findIter->second;
+}
+
+QStandardItem* CFolderTreeCtrl::GetSourceItemByIndex(const QModelIndex& index) const
+{
+    if (!m_proxyModel || !m_model)
+    {
+        return nullptr;
+    }
+
+    // Since our tree view has a proxy model to handle the sorting/filtering, any index
+    // found on the tree view (e.g. the selected index) needs to be mapped back to the source
+    // model to find the actual item.
+    auto sourceIndex = m_proxyModel->mapToSource(index);
+    return m_model->itemFromIndex(sourceIndex);
+}
+
+QString CFolderTreeCtrl::CalculateFolderFullPath(const QStringList& splittedFolder, int idx)
+{
+    QString path;
+    for (int segIdx = 0; segIdx <= idx; ++segIdx)
+    {
+        if (segIdx != 0)
+        {
+            path.append(QLatin1Char('/'));
+        }
+        path.append(splittedFolder[segIdx]);
+    }
+    return path;
+}
+
+CFolderTreeCtrl::CTreeItem* CFolderTreeCtrl::CreateFolderItems(const QString& folder)
+{
+    QStringList splittedFolder = Path::SplitIntoSegments(folder);
+    CTreeItem* currentTreeItem = m_rootTreeItem.get();
+
+    if (!m_bFlatStyle)
+    {
+        QString currentFolder;
+        QString fullpath;
+        const int splittedFoldersCount = splittedFolder.size();
+        for (int idx = 0; idx < splittedFoldersCount; ++idx)
+        {
+            currentFolder = Path::RemoveBackslash(splittedFolder[idx]);
+            fullpath = CalculateFolderFullPath(splittedFolder, idx);
+
+            CTreeItem* folderItem = GetItem(fullpath);
+            if (!folderItem)
+            {
+                currentTreeItem = currentTreeItem->AddChild(currentFolder, fullpath, eTreeImage_Folder);
+            }
+            else
+            {
+                currentTreeItem = folderItem;
+            }
+        }
+    }
+
+    return currentTreeItem;
+}
+
+void CFolderTreeCtrl::RemoveEmptyFolderItems(const QString& folder)
+{
+    QStringList splittedFolder = Path::SplitIntoSegments(folder);
+    const int splittedFoldersCount = splittedFolder.size();
+    QString fullpath;
+    for (int idx = 0; idx < splittedFoldersCount; ++idx)
+    {
+        fullpath = CalculateFolderFullPath(splittedFolder, idx);
+        CTreeItem* folderItem = GetItem(fullpath);
+        if (!folderItem)
+        {
+            continue;
+        }
+
+        if (!folderItem->hasChildren())
+        {
+            folderItem->Remove();
+        }
+    }
+}
+
+void CFolderTreeCtrl::Edit(const QString& path)
+{
+    CFileUtil::EditTextFile(QtUtil::ToString(path), 0, IFileUtil::FILE_TYPE_SCRIPT);
+}
+
+void CFolderTreeCtrl::ShowInExplorer(const QString& path)
+{
+    QString absolutePath = QDir::currentPath();
+
+    CTreeItem* root = m_rootTreeItem.get();
+    CTreeItem* item = GetItem(path);
+
+    if (item != root)
+    {
+        absolutePath += QStringLiteral("/%1").arg(path);
+    }
+
+    AzQtComponents::ShowFileOnDesktop(absolutePath);
+}
+
+QIcon CFolderTreeCtrl::GetItemIcon(int image) const
+{
+    return image == eTreeImage_File ? m_fileIcon : m_folderIcon;
+}
+
+QList<QStandardItem*> CFolderTreeCtrl::GetSelectedItems() const
+{
+    QList<QStandardItem*> items;
+
+    for (auto index : selectedIndexes())
+    {
+        QStandardItem* item = GetSourceItemByIndex(index);
+        if (item)
+        {
+            items.append(item);
+        }
+    }
+
+    return items;
+}
+
+void CFolderTreeCtrl::SetSearchFilter(const QString& searchText)
+{
+    if (m_proxyModel)
+    {
+        m_proxyModel->setFilterFixedString(searchText);
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// CFolderTreeCtrl::CTreeItem
+//////////////////////////////////////////////////////////////////////////
+CFolderTreeCtrl::CTreeItem::CTreeItem(CFolderTreeCtrl& folderTreeCtrl, const QString& path)
+    : QStandardItem(folderTreeCtrl.GetItemIcon(eTreeImage_Folder), folderTreeCtrl.m_rootName)
+    , m_folderTreeCtrl(folderTreeCtrl)
+    , m_path(path)
+{
+    setData(true, IsFolderRole);
+
+    m_folderTreeCtrl.m_model->invisibleRootItem()->appendRow(this);
+    m_folderTreeCtrl.m_pathToTreeItem[ m_path ] = this;
+}
+
+CFolderTreeCtrl::CTreeItem::CTreeItem(CFolderTreeCtrl& folderTreeCtrl, CFolderTreeCtrl::CTreeItem* parent,
+    const QString& name, const QString& path, const int image)
+    : QStandardItem(folderTreeCtrl.GetItemIcon(image), name)
+    , m_folderTreeCtrl(folderTreeCtrl)
+    , m_path(path)
+{
+    parent->appendRow(this);
+    setData(image == eTreeImage_Folder, IsFolderRole);
+
+    m_folderTreeCtrl.m_pathToTreeItem[ m_path ] = this;
+}
+
+CFolderTreeCtrl::CTreeItem::~CTreeItem()
+{
+    m_folderTreeCtrl.m_pathToTreeItem.erase(m_path);
+}
+
+void CFolderTreeCtrl::CTreeItem::Remove()
+{
+    // Root can't be deleted this way
+    if (auto parentItem = parent())
+    {
+        int numRows = parentItem->rowCount();
+        for (int i = 0; i < numRows; ++i)
+        {
+            if (parentItem->child(i) == this)
+            {
+                parentItem->removeRow(i);
+                break;
+            }
+        }
+    }
+}
+
+CFolderTreeCtrl::CTreeItem* CFolderTreeCtrl::CTreeItem::AddChild(const QString& name, const QString& path, const int image)
+{
+    CTreeItem* newItem = new CTreeItem(m_folderTreeCtrl, this, name, path, image);
+    return newItem;
+}
diff --git a/Code/Editor/Controls/FolderTreeCtrl.h b/Code/Editor/Controls/FolderTreeCtrl.h
new file mode 100644
index 0000000000..e43c4cd224
--- /dev/null
+++ b/Code/Editor/Controls/FolderTreeCtrl.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_CONTROLS_FOLDERTREECTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_FOLDERTREECTRL_H
+#pragma once
+
+#include "Util/FileChangeMonitor.h"
+#include <QList>
+#include <QStandardItem>
+#include <QTreeView>
+#include <QIcon>
+
+class QSortFilterProxyModel;
+class QStandardItemModel;
+
+//! Case insensetive less key for any type convertable to const char*.
+struct qstring_icmp
+{
+    bool operator()(const QString& left, const QString& right) const
+    {
+        return QString::compare(left, right, Qt::CaseInsensitive) < 0;
+    }
+};
+
+class CFolderTreeCtrl
+    : public QTreeView
+    , public CFileChangeMonitorListener
+{
+    Q_OBJECT // AUTOMOC
+
+    friend class CTreeItem;
+
+    class CTreeItem
+        : public QStandardItem
+    {
+        // Only allow destruction through std::unique_ptr
+        friend struct std::default_delete<CTreeItem>;
+
+    public:
+        explicit CTreeItem(CFolderTreeCtrl& folderTreeCtrl, const QString& path);
+        explicit CTreeItem(CFolderTreeCtrl& folderTreeCtrl, CTreeItem* parent,
+            const QString& name, const QString& path, const int image);
+
+        void Remove();
+        CTreeItem* AddChild(const QString& name, const QString& path, const int image);
+        QString GetPath() const { return m_path; }
+    private:
+        ~CTreeItem();
+
+        CFolderTreeCtrl& m_folderTreeCtrl;
+        QString m_path;
+    };
+
+public:
+    CFolderTreeCtrl(QWidget* parent = 0);
+    CFolderTreeCtrl(const QStringList& folders, const QString& fileNameSpec,
+        const QString& rootName, bool bDisableMonitor = false, bool bFlatTree = true, QWidget* parent = 0);
+    virtual ~CFolderTreeCtrl();
+
+    void init(const QStringList& folders, const QString& fileNameSpec,
+        const QString& rootName, bool bDisableMonitor = false, bool bFlatTree = true);
+
+    QString GetPath(QStandardItem* item) const;
+    bool IsFolder(QStandardItem* item) const;
+    bool IsFile(QStandardItem* item) const;
+
+    QIcon GetItemIcon(int image) const;
+    QList<QStandardItem*> GetSelectedItems() const;
+
+    void SetSearchFilter(const QString& searchText);
+
+Q_SIGNALS:
+    void ItemDoubleClicked(QStandardItem* item);
+
+protected Q_SLOTS:
+    void OnIndexDoubleClicked(const QModelIndex& index);
+
+protected:
+    virtual void OnFileMonitorChange(const SFileChangeInfo& rChange);
+    void contextMenuEvent(QContextMenuEvent* e) override;
+
+    void InitTree();
+    void LoadTreeRec(const QString& currentFolder);
+
+    void AddItem(const QString& path);
+    void RemoveItem(const QString& path);
+    CTreeItem* GetItem(const QString& path);
+
+    QStandardItem* GetSourceItemByIndex(const QModelIndex& index) const;
+
+    QString CalculateFolderFullPath(const QStringList& splittedFolder, int idx);
+    CTreeItem* CreateFolderItems(const QString& folder);
+    void RemoveEmptyFolderItems(const QString& folder);
+
+    void Edit(const QString& path);
+    void ShowInExplorer(const QString& path);
+
+    bool m_bDisableMonitor;
+    bool m_bFlatStyle;
+    std::unique_ptr< CTreeItem > m_rootTreeItem;
+    QString m_fileNameSpec;
+    QStringList m_folders;
+    QString m_rootName;
+    std::map<QString, unsigned int> m_foldersSegments;
+    QIcon m_folderIcon;
+    QIcon m_fileIcon;
+
+    QSortFilterProxyModel* m_proxyModel = nullptr;
+    QStandardItemModel* m_model = nullptr;
+    std::map< QString, CTreeItem*, qstring_icmp > m_pathToTreeItem;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_FOLDERTREECTRL_H
diff --git a/Code/Editor/Controls/HotTrackingTreeCtrl.cpp b/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
new file mode 100644
index 0000000000..79e9ce837d
--- /dev/null
+++ b/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "HotTrackingTreeCtrl.h"
+
+// Qt
+#include <QMouseEvent>
+
+
+CHotTrackingTreeCtrl::CHotTrackingTreeCtrl(QWidget* parent)
+    : QTreeWidget(parent)
+{
+    setMouseTracking(true);
+    m_hHoverItem = NULL;
+}
+
+void CHotTrackingTreeCtrl::mouseMoveEvent(QMouseEvent* event)
+{
+    QTreeWidgetItem* hItem = itemAt(event->pos());
+
+    if (m_hHoverItem != NULL)
+    {
+        QFont font = m_hHoverItem->font(0);
+        font.setBold(false);
+        m_hHoverItem->setFont(0, font);
+        m_hHoverItem = NULL;
+    }
+
+    if (hItem != NULL)
+    {
+        QFont font = hItem->font(0);
+        font.setBold(true);
+        hItem->setFont(0, font);
+        m_hHoverItem = hItem;
+    }
+
+    QTreeWidget::mouseMoveEvent(event);
+}
+
+#include <Controls/moc_HotTrackingTreeCtrl.cpp>
diff --git a/Code/Editor/Controls/HotTrackingTreeCtrl.h b/Code/Editor/Controls/HotTrackingTreeCtrl.h
new file mode 100644
index 0000000000..643a721d9e
--- /dev/null
+++ b/Code/Editor/Controls/HotTrackingTreeCtrl.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_CONTROLS_HOTTRACKINGTREECTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_HOTTRACKINGTREECTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QTreeWidget>
+#endif
+
+class CHotTrackingTreeCtrl
+    : public QTreeWidget
+{
+    Q_OBJECT
+
+public:
+    CHotTrackingTreeCtrl(QWidget* parent = 0);
+    virtual ~CHotTrackingTreeCtrl(){};
+
+protected:
+    void mouseMoveEvent(QMouseEvent* event) override;
+
+private:
+    QTreeWidgetItem* m_hHoverItem;
+};
+#endif // CRYINCLUDE_EDITOR_CONTROLS_HOTTRACKINGTREECTRL_H
diff --git a/Code/Editor/Controls/ImageHistogramCtrl.cpp b/Code/Editor/Controls/ImageHistogramCtrl.cpp
new file mode 100644
index 0000000000..76b2bc8b6c
--- /dev/null
+++ b/Code/Editor/Controls/ImageHistogramCtrl.cpp
@@ -0,0 +1,446 @@
+/*
+ * 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 "ImageHistogramCtrl.h"
+
+// Qt
+#include <QPainter>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QComboBox>
+
+
+// CImageHistogramCtrl
+
+// control tweak constants
+namespace ImageHistogram
+{
+    const float     kGraphHeightPercent = 0.7f;
+    const int       kGraphMargin = 4;
+    const QColor    kBackColor = QColor(100, 100, 100);
+    const QColor    kRedSectionColor = QColor(255, 220, 220);
+    const QColor    kGreenSectionColor = QColor(220, 255, 220);
+    const QColor    kBlueSectionColor = QColor(220, 220, 255);
+    const QColor    kSplitSeparatorColor = QColor(100, 100, 0);
+    const QColor    kButtonBackColor = QColor(20, 20, 20);
+    const QColor    kBtnLightColor(200, 200, 200);
+    const QColor    kBtnShadowColor(50, 50, 50);
+    const int       kButtonWidth = 40;
+    const QColor    kButtonTextColor(255, 255, 0);
+    const int       kTextLeftSpacing = 4;
+    const int       kTextFontSize = 70;
+    const char*     kTextFontFace = "Arial";
+    const QColor    kTextColor(255, 255, 255);
+};
+
+CImageHistogramCtrl::CImageHistogramCtrl(QWidget* parent)
+    : QWidget(parent)
+    , m_display(new CImageHistogramDisplay(this))
+    , m_drawMode(new QComboBox(this))
+    , m_infoText(new QLabel)
+{
+    setWindowTitle("Image Histogram");
+
+    m_drawMode->setFocusPolicy(Qt::NoFocus);
+    m_drawMode->addItem(tr("Luminosity"),
+                        QVariant::fromValue(EHistogramDrawMode::Luminosity));
+    m_drawMode->addItem(tr("Overlapped RGBA"),
+                        QVariant::fromValue(EHistogramDrawMode::OverlappedRGB));
+    m_drawMode->addItem(tr("Split RGB"),
+                        QVariant::fromValue(EHistogramDrawMode::SplitRGB));
+    m_drawMode->addItem(tr("Red Channel"),
+                        QVariant::fromValue(EHistogramDrawMode::RedChannel));
+    m_drawMode->addItem(tr("Green Channel"),
+                        QVariant::fromValue(EHistogramDrawMode::GreenChannel));
+    m_drawMode->addItem(tr("Blue Channel"),
+                        QVariant::fromValue(EHistogramDrawMode::BlueChannel));
+    m_drawMode->addItem(tr("Alpha Channel"),
+                        QVariant::fromValue(EHistogramDrawMode::AlphaChannel));
+
+    connect(m_drawMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
+            [=]([[maybe_unused]] int index){
+                auto mode = drawMode();
+                m_display->m_drawMode = mode;
+                m_display->update();
+            });
+
+    auto* layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(m_drawMode);
+    layout->addWidget(m_display);
+    setLayout(layout);
+
+    setMinimumSize(200,150);
+}
+
+CImageHistogramCtrl::~CImageHistogramCtrl()
+{
+}
+
+EHistogramDrawMode CImageHistogramCtrl::drawMode() const
+{
+    return m_drawMode->currentData().value<EHistogramDrawMode>();
+}
+
+void CImageHistogramCtrl::setDrawMode(EHistogramDrawMode mode)
+{
+    auto index = m_drawMode->findData(QVariant::fromValue(mode));
+    if (index != -1)
+    {
+        m_drawMode->setCurrentIndex(index);
+    }
+}
+
+void CImageHistogramCtrl::ComputeHistogram(CImageEx& image, CImageHistogram::EImageFormat format)
+{
+    m_display->ComputeHistogram((BYTE*)image.GetData(), image.GetWidth(), image.GetHeight(), format);
+}
+
+
+CImageHistogramDisplay::CImageHistogramDisplay(QWidget* parent)
+    : QWidget(parent)
+{
+    m_graphMargin = ImageHistogram::kGraphMargin;
+    m_drawMode = EHistogramDrawMode::Luminosity;
+    m_backColor = ImageHistogram::kBackColor;
+    m_graphHeightPercent = ImageHistogram::kGraphHeightPercent;
+}
+
+CImageHistogramDisplay::~CImageHistogramDisplay()
+{}
+
+void CImageHistogramDisplay::paintEvent([[maybe_unused]] QPaintEvent* event)
+{
+    QPainter painter(this);
+
+    QColor   penColor;
+    QString  str, mode;
+    QRect    rc, rcGraph;
+    QPen     penSpikes;
+    QFont    fnt;
+    QPen     redPen, greenPen, bluePen, alphaPen;
+
+    redPen = QColor(255, 0, 0);
+    greenPen = QColor(0, 255, 0);
+    bluePen = QColor(0, 0, 255);
+    alphaPen = QColor(120, 120, 120);
+
+    rc = rect();
+
+    if (rc.isEmpty())
+    {
+        return;
+    }
+
+    painter.fillRect(rc, m_backColor);
+    penColor = QColor(0, 0, 0);
+
+    switch (m_drawMode)
+    {
+    case EHistogramDrawMode::Luminosity:
+        mode = "Lum";
+        break;
+    case EHistogramDrawMode::OverlappedRGB:
+        mode = "Overlap";
+        break;
+    case EHistogramDrawMode::SplitRGB:
+        mode = "R|G|B";
+        break;
+    case EHistogramDrawMode::RedChannel:
+        mode = "Red";
+        penColor = QColor(255, 0, 0);
+        break;
+    case EHistogramDrawMode::GreenChannel:
+        mode = "Green";
+        penColor = QColor(0, 255, 0);
+        break;
+    case EHistogramDrawMode::BlueChannel:
+        mode = "Blue";
+        penColor = QColor(0, 0, 255);
+        break;
+    case EHistogramDrawMode::AlphaChannel:
+        mode = "Alpha";
+        penColor = QColor(120, 120, 120);
+        break;
+    }
+
+    penSpikes = penColor;
+    painter.setPen(Qt::black);
+    painter.setBrush(Qt::white);
+    rcGraph = QRect(QPoint(m_graphMargin, m_graphMargin), QPoint(abs(rc.width() - m_graphMargin), abs(rc.height() * m_graphHeightPercent)));
+    painter.drawRect(rcGraph);
+    painter.setPen(penSpikes);
+
+    int i = 0;
+    int graphWidth = rcGraph.width() != 0 ? abs(rcGraph.width()) : 1;
+    int graphHeight = abs(rcGraph.height() - 1);
+    int graphBottom = abs(rcGraph.top() + rcGraph.height());
+
+    if (m_drawMode != EHistogramDrawMode::SplitRGB &&
+        m_drawMode != EHistogramDrawMode::OverlappedRGB)
+    {
+        int crtX = 0;
+
+        for (size_t x = 0, xCount = abs(rcGraph.width()); x < xCount; ++x)
+        {
+            float scale = 0;
+
+            i = ((float)x / graphWidth) * (kNumColorLevels - 1);
+            i = CLAMP(i, 0, kNumColorLevels - 1);
+
+            switch (m_drawMode)
+            {
+            case EHistogramDrawMode::Luminosity:
+            {
+                if (m_maxLumCount)
+                {
+                    scale = (float)m_lumCount[i] / m_maxLumCount;
+                }
+                break;
+            }
+
+            case EHistogramDrawMode::RedChannel:
+            {
+                if (m_maxCount[0])
+                {
+                    scale = (float)m_count[0][i] / m_maxCount[0];
+                }
+                break;
+            }
+
+            case EHistogramDrawMode::GreenChannel:
+            {
+                if (m_maxCount[1])
+                {
+                    scale = (float)m_count[1][i] / m_maxCount[1];
+                }
+                break;
+            }
+
+            case EHistogramDrawMode::BlueChannel:
+            {
+                if (m_maxCount[2])
+                {
+                    scale = (float)m_count[2][i] / m_maxCount[2];
+                }
+                break;
+            }
+
+            case EHistogramDrawMode::AlphaChannel:
+            {
+                if (m_maxCount[3])
+                {
+                    scale = (float)m_count[3][i] / m_maxCount[3];
+                }
+                break;
+            }
+            }
+
+            crtX = rcGraph.left() + x + 1;
+            painter.drawLine(crtX, graphBottom, crtX, graphBottom - scale * graphHeight);
+        }
+    }
+    else
+    if (m_drawMode == EHistogramDrawMode::OverlappedRGB)
+    {
+        int lastHeight[kNumChannels] = { INT_MAX, INT_MAX, INT_MAX, INT_MAX };
+        int heightR, heightG, heightB, heightA;
+        float scaleR, scaleG, scaleB, scaleA;
+        UINT crtX, prevX = INT_MAX;
+
+        for (size_t x = 0, xCount = abs(rcGraph.width()); x < xCount; ++x)
+        {
+            i = ((float)x / graphWidth) * (kNumColorLevels - 1);
+            i = CLAMP(i, 0, kNumColorLevels - 1);
+            crtX = rcGraph.left() + x + 1;
+            scaleR = scaleG = scaleB = scaleA = 0;
+
+            if (m_maxCount[0])
+            {
+                scaleR = (float)m_count[0][i] / m_maxCount[0];
+            }
+
+            if (m_maxCount[1])
+            {
+                scaleG = (float)m_count[1][i] / m_maxCount[1];
+            }
+
+            if (m_maxCount[2])
+            {
+                scaleB = (float)m_count[2][i] / m_maxCount[2];
+            }
+
+            if (m_maxCount[3])
+            {
+                scaleA = (float)m_count[3][i] / m_maxCount[3];
+            }
+
+            heightR = graphBottom - scaleR * graphHeight;
+            heightG = graphBottom - scaleG * graphHeight;
+            heightB = graphBottom - scaleB * graphHeight;
+            heightA = graphBottom - scaleA * graphHeight;
+
+            if (lastHeight[0] == INT_MAX)
+            {
+                lastHeight[0] = heightR;
+            }
+
+            if (lastHeight[1] == INT_MAX)
+            {
+                lastHeight[1] = heightG;
+            }
+
+            if (lastHeight[2] == INT_MAX)
+            {
+                lastHeight[2] = heightB;
+            }
+
+            if (lastHeight[3] == INT_MAX)
+            {
+                lastHeight[3] = heightA;
+            }
+
+            if (prevX == INT_MAX)
+            {
+                prevX = crtX;
+            }
+
+            painter.setPen(redPen);
+            painter.drawLine(prevX, lastHeight[0], crtX, heightR);
+
+            painter.setPen(greenPen);
+            painter.drawLine(prevX, lastHeight[1], crtX, heightG);
+
+            painter.setPen(bluePen);
+            painter.drawLine(prevX, lastHeight[2], crtX, heightB);
+
+            painter.setPen(alphaPen);
+            painter.drawLine(prevX, lastHeight[3], crtX, heightA);
+
+            lastHeight[0] = heightR;
+            lastHeight[1] = heightG;
+            lastHeight[2] = heightB;
+            lastHeight[3] = heightA;
+            prevX = crtX;
+        }
+    }
+    else
+    if (m_drawMode == EHistogramDrawMode::SplitRGB)
+    {
+        const float aThird = 1.0f / 3.0f;
+        const int aThirdOfNumColorLevels = kNumColorLevels / 3;
+        const int aThirdOfWidth = rcGraph.width() / 3;
+        QPen pPen;
+        float scale = 0, pos = 0;
+
+        // draw 3 blocks so we can see channel spaces
+        painter.fillRect(QRect(QPoint(rcGraph.left() + 1, rcGraph.top() + 1), QSize(aThirdOfWidth, rcGraph.height() - 2)), ImageHistogram::kRedSectionColor);
+        painter.fillRect(QRect(QPoint(rcGraph.left() + 1 + aThirdOfWidth, rcGraph.top() + 1), QSize(aThirdOfWidth, rcGraph.height() - 2)), ImageHistogram::kGreenSectionColor);
+        painter.fillRect(QRect(QPoint(rcGraph.left() + 1 + aThirdOfWidth * 2, rcGraph.top() + 1), QSize(aThirdOfWidth, rcGraph.height() - 2)), ImageHistogram::kBlueSectionColor);
+
+        // 3 split RGB channel histograms
+        for (size_t x = 0, xCount = abs(rcGraph.width()); x < xCount; ++x)
+        {
+            pos = (float)x / graphWidth;
+            i = (float)((int)(pos * kNumColorLevels) % aThirdOfNumColorLevels) / aThirdOfNumColorLevels * kNumColorLevels;
+            i = CLAMP(i, 0, kNumColorLevels - 1);
+            scale = 0;
+
+            // R
+            if (pos < aThird)
+            {
+                if (m_maxCount[0])
+                {
+                    scale = (float)m_count[0][i] / m_maxCount[0];
+                }
+                pPen = redPen;
+            }
+
+            // G
+            if (pos > aThird && pos < aThird * 2)
+            {
+                if (m_maxCount[1])
+                {
+                    scale = (float) m_count[1][i] / m_maxCount[1];
+                }
+                pPen = greenPen;
+            }
+
+            // B
+            if (pos > aThird * 2)
+            {
+                if (m_maxCount[2])
+                {
+                    scale = (float) m_count[2][i] / m_maxCount[2];
+                }
+                pPen = bluePen;
+            }
+
+            painter.setPen(pPen);
+            painter.drawLine(rcGraph.left() + x + 1, graphBottom, rcGraph.left() + x + 1, graphBottom - scale * graphHeight);
+        }
+
+        // then draw 3 lines so we separate the channels
+        QPen wallPen(ImageHistogram::kSplitSeparatorColor, 1, Qt::DotLine);
+        painter.setPen(wallPen);
+        painter.drawLine(rcGraph.left() + aThirdOfWidth, rcGraph.bottom(), rcGraph.left() + aThirdOfWidth, rcGraph.top());
+        painter.drawLine(rcGraph.left() + aThirdOfWidth * 2, rcGraph.bottom(), rcGraph.left() + aThirdOfWidth * 2, rcGraph.top());
+    }
+
+    QRect rcText;
+    rcText = QRect(QPoint(m_graphMargin, rcGraph.height() + m_graphMargin * 2),
+                   QPoint(rc.width(), rc.height() - m_graphMargin));
+
+    float mean = 0, stdDev = 0, median = 0;
+
+    switch (m_drawMode)
+    {
+    case EHistogramDrawMode::Luminosity:
+    case EHistogramDrawMode::SplitRGB:
+    case EHistogramDrawMode::OverlappedRGB:
+        mean = m_meanAvg;
+        stdDev = m_stdDevAvg;
+        median = m_medianAvg;
+        break;
+    case EHistogramDrawMode::RedChannel:
+        mean = m_mean[0];
+        stdDev = m_stdDev[0];
+        median = m_median[0];
+        break;
+    case EHistogramDrawMode::GreenChannel:
+        mean = m_mean[1];
+        stdDev = m_stdDev[1];
+        median = m_median[1];
+        break;
+    case EHistogramDrawMode::BlueChannel:
+        mean = m_mean[2];
+        stdDev = m_stdDev[2];
+        median = m_median[2];
+        break;
+    case EHistogramDrawMode::AlphaChannel:
+        mean = m_mean[3];
+        stdDev = m_stdDev[3];
+        median = m_median[3];
+        break;
+    }
+
+    str = tr("Mean: %1 StdDev: %2 Median: %3").arg(mean, 0, 'f', 2).arg(stdDev, 0, 'f', 2).arg(median, 0, 'f', 2);
+    fnt = QFont(ImageHistogram::kTextFontFace, ImageHistogram::kTextFontSize / 10);
+    painter.setFont(fnt);
+    painter.setPen(ImageHistogram::kTextColor);
+    painter.drawText(rcText, Qt::AlignCenter | Qt::TextSingleLine, painter.fontMetrics().elidedText(str, Qt::ElideRight, rcText.width(), Qt::TextSingleLine));
+}
+
+CImageHistogramDisplay* CImageHistogramCtrl::histogramDisplay() const
+{
+    return m_display;
+}
+
+#include <Controls/moc_ImageHistogramCtrl.cpp>
diff --git a/Code/Editor/Controls/ImageHistogramCtrl.h b/Code/Editor/Controls/ImageHistogramCtrl.h
new file mode 100644
index 0000000000..d5be6a42f2
--- /dev/null
+++ b/Code/Editor/Controls/ImageHistogramCtrl.h
@@ -0,0 +1,79 @@
+/*
+ * 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_CONTROLS_IMAGEHISTOGRAMCTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_IMAGEHISTOGRAMCTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+
+#include "Util/Image.h"
+#include "Util/ImageHistogram.h"
+
+#include <QWidget>
+#endif
+
+class QComboBox;
+class QLabel;
+
+enum class EHistogramDrawMode
+{
+    Luminosity,
+    OverlappedRGB,
+    SplitRGB,
+    RedChannel,
+    GreenChannel,
+    BlueChannel,
+    AlphaChannel
+};
+Q_ENUMS(EHistogramDrawMode)
+Q_DECLARE_METATYPE(EHistogramDrawMode)
+
+
+class SANDBOX_API CImageHistogramDisplay
+    : public QWidget
+    , public CImageHistogram
+{
+    Q_OBJECT
+public:
+    CImageHistogramDisplay(QWidget* parent = nullptr);
+    virtual ~CImageHistogramDisplay();
+
+    void paintEvent(QPaintEvent* event) override;
+
+    EHistogramDrawMode  m_drawMode;
+    int                 m_graphMargin;
+    float               m_graphHeightPercent;
+    QColor              m_backColor;
+};
+
+class SANDBOX_API CImageHistogramCtrl
+    : public QWidget
+{
+    Q_OBJECT
+
+public:
+    CImageHistogramCtrl(QWidget* parent = nullptr);
+    virtual ~CImageHistogramCtrl();
+
+    EHistogramDrawMode drawMode() const;
+    void setDrawMode(EHistogramDrawMode drawMode);
+
+    void ComputeHistogram(CImageEx& img, CImageHistogram::EImageFormat format);
+
+    CImageHistogramDisplay* histogramDisplay() const;
+
+private:
+    CImageHistogramDisplay* m_display;
+    QComboBox*              m_drawMode;
+    QLabel*                 m_infoText;
+};
+
+
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_IMAGEHISTOGRAMCTRL_H
diff --git a/Code/Editor/Controls/ImageListCtrl.cpp b/Code/Editor/Controls/ImageListCtrl.cpp
new file mode 100644
index 0000000000..f41d4d0517
--- /dev/null
+++ b/Code/Editor/Controls/ImageListCtrl.cpp
@@ -0,0 +1,566 @@
+/*
+ * 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 "ImageListCtrl.h"
+
+// Qt
+#include <QPainter>
+#include <QScrollBar>
+
+//////////////////////////////////////////////////////////////////////////
+CImageListCtrl::CImageListCtrl(QWidget* parent)
+    : QAbstractItemView(parent)
+    , m_itemSize(60, 60)
+    , m_borderSize(4, 4)
+    , m_style(DefaultStyle)
+{
+    setItemDelegate(new QImageListDelegate(this));
+    setAutoFillBackground(false);
+
+    QPalette p = palette();
+    p.setColor(QPalette::Highlight, QColor(255, 55, 50));
+    setPalette(p);
+
+    horizontalScrollBar()->setRange(0, 0);
+    verticalScrollBar()->setRange(0, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CImageListCtrl::~CImageListCtrl()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CImageListCtrl::ListStyle CImageListCtrl::Style() const
+{
+    return m_style;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageListCtrl::SetStyle(ListStyle style)
+{
+    m_style = style;
+    scheduleDelayedItemsLayout();
+}
+
+//////////////////////////////////////////////////////////////////////////
+const QSize& CImageListCtrl::ItemSize() const
+{
+    return m_itemSize;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageListCtrl::SetItemSize(QSize size)
+{
+    Q_ASSERT(size.isValid());
+    m_itemSize = size;
+    scheduleDelayedItemsLayout();
+}
+
+//////////////////////////////////////////////////////////////////////////
+const QSize& CImageListCtrl::BorderSize() const
+{
+    return m_borderSize;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageListCtrl::SetBorderSize(QSize size)
+{
+    Q_ASSERT(size.isValid());
+    m_borderSize = size;
+    scheduleDelayedItemsLayout();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QModelIndexList CImageListCtrl::ItemsInRect(const QRect& rect) const
+{
+    QModelIndexList list;
+
+    if (!model())
+    {
+        return list;
+    }
+
+    QHash<int, QRect>::const_iterator i;
+    QHash<int, QRect>::const_iterator c = m_geometry.cend();
+    for (i = m_geometry.cbegin(); i != c; ++i)
+    {
+        if (i.value().intersects(rect))
+        {
+            list << model()->index(i.key(), 0, rootIndex());
+        }
+    }
+
+    return list;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageListCtrl::paintEvent(QPaintEvent* event)
+{
+    QAbstractItemView::paintEvent(event);
+
+    if (!model())
+    {
+        return;
+    }
+
+    const int rowCount = model()->rowCount();
+
+    if (m_geometry.isEmpty() && rowCount)
+    {
+        updateGeometries();
+    }
+
+    QPainter painter(viewport());
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
+    painter.setBackground(palette().window());
+    painter.setFont(font());
+
+    QStyleOptionViewItem option;
+    option.palette = palette();
+    option.font = font();
+    option.fontMetrics = fontMetrics();
+    option.decorationAlignment = Qt::AlignCenter;
+
+    const QRect visibleRect(QPoint(horizontalOffset(), verticalOffset()), viewport()->contentsRect().size());
+
+    painter.translate(-horizontalOffset(), -verticalOffset());
+
+    for (int r = 0; r < rowCount; ++r)
+    {
+        const QModelIndex& index = model()->index(r, 0, rootIndex());
+
+        option.rect = m_geometry.value(r);
+        if (!option.rect.intersects(visibleRect))
+        {
+            continue;
+        }
+
+        option.state = QStyle::State_None;
+
+        if (selectionModel()->isSelected(index))
+        {
+            option.state |= QStyle::State_Selected;
+        }
+
+        if (currentIndex() == index)
+        {
+            option.state |= QStyle::State_HasFocus;
+        }
+
+        QAbstractItemDelegate* idt = itemDelegate(index);
+        idt->paint(&painter, option, index);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageListCtrl::rowsInserted(const QModelIndex& parent, int start, int end)
+{
+    QAbstractItemView::rowsInserted(parent, start, end);
+
+    if (isVisible())
+    {
+        scheduleDelayedItemsLayout();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageListCtrl::updateGeometries()
+{
+    ClearItemGeometries();
+
+    if (!model())
+    {
+        return;
+    }
+
+    const int rowCount = model()->rowCount();
+
+    const int nPageHorz = viewport()->width();
+    const int nPageVert = viewport()->height();
+
+    if (nPageHorz == 0 || nPageVert == 0 || rowCount <= 0)
+    {
+        return;
+    }
+
+    int x = m_borderSize.width();
+    int y = m_borderSize.height();
+
+    const int nItemWidth = m_itemSize.width() + m_borderSize.width();
+
+    if (m_style == HorizontalStyle)
+    {
+        for (int row = 0; row < rowCount; ++row)
+        {
+            m_geometry.insert(row, QRect(QPoint(x, y), m_itemSize));
+            x += nItemWidth;
+        }
+
+        horizontalScrollBar()->setPageStep(viewport()->width());
+        horizontalScrollBar()->setRange(0, x - viewport()->width());
+    }
+    else
+    {
+        const int nTextHeight = fontMetrics().height();
+        const int nItemHeight = m_itemSize.height() + m_borderSize.height() + nTextHeight;
+
+        int nNumOfHorzItems = nPageHorz / nItemWidth;
+        if (nNumOfHorzItems <= 0)
+        {
+            nNumOfHorzItems = 1;
+        }
+
+        for (int row = 0; row < rowCount; ++row)
+        {
+            m_geometry.insert(row, QRect(QPoint(x, y), m_itemSize));
+
+            if ((row + 1) % nNumOfHorzItems == 0)
+            {
+                y += nItemHeight;
+                x = m_borderSize.width();
+            }
+            else
+            {
+                x += nItemWidth;
+            }
+        }
+
+        verticalScrollBar()->setPageStep(viewport()->height());
+        verticalScrollBar()->setRange(0, (y + nItemHeight) - viewport()->height());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+QModelIndex CImageListCtrl::indexAt(const QPoint& point) const
+{
+    if (!model())
+    {
+        return QModelIndex();
+    }
+
+    const QPoint p = point +
+        QPoint(horizontalOffset(), verticalOffset());
+
+    QHash<int, QRect>::const_iterator i;
+    QHash<int, QRect>::const_iterator c = m_geometry.cend();
+    for (i = m_geometry.cbegin(); i != c; ++i)
+    {
+        if (i.value().contains(p))
+        {
+            return model()->index(i.key(), 0, rootIndex());
+        }
+    }
+
+    return QModelIndex();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageListCtrl::scrollTo(const QModelIndex& index, ScrollHint hint)
+{
+    if (!index.isValid())
+    {
+        return;
+    }
+
+    QRect rect = m_geometry.value(index.row());
+
+    switch (hint)
+    {
+    case EnsureVisible:
+        if (horizontalOffset() > rect.right())
+        {
+            horizontalScrollBar()->setValue(rect.left());
+        }
+        else if ((horizontalOffset() + viewport()->width()) < rect.left())
+        {
+            horizontalScrollBar()->setValue(rect.right() - viewport()->width());
+        }
+
+        if (verticalOffset() > rect.bottom())
+        {
+            verticalScrollBar()->setValue(rect.top());
+        }
+        else if ((verticalOffset() + viewport()->height()) < rect.top())
+        {
+            verticalScrollBar()->setValue(rect.bottom() - viewport()->height());
+        }
+        break;
+
+    case PositionAtTop:
+        horizontalScrollBar()->setValue(rect.left());
+        verticalScrollBar()->setValue(rect.top());
+        break;
+
+    case PositionAtBottom:
+        horizontalScrollBar()->setValue(rect.right() - viewport()->width());
+        verticalScrollBar()->setValue(rect.bottom() - viewport()->height());
+        break;
+
+    case PositionAtCenter:
+        horizontalScrollBar()->setValue(rect.center().x() - (viewport()->width() / 2));
+        verticalScrollBar()->setValue(rect.center().y() - (viewport()->height() / 2));
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+QRect CImageListCtrl::visualRect(const QModelIndex& index) const
+{
+    if (!index.isValid())
+    {
+        return QRect();
+    }
+
+
+    if (!m_geometry.contains(index.row()))
+    {
+        return QRect();
+    }
+
+    return m_geometry.value(index.row())
+               .translated(-horizontalOffset(), -verticalOffset());
+}
+
+//////////////////////////////////////////////////////////////////////////
+QRect CImageListCtrl::ItemGeometry(const QModelIndex& index) const
+{
+    Q_ASSERT(index.model() == model());
+    Q_ASSERT(m_geometry.contains(index.row()));
+
+    return m_geometry.value(index.row());
+}
+
+void CImageListCtrl::SetItemGeometry(const QModelIndex& index, const QRect& rect)
+{
+    Q_ASSERT(index.model() == model());
+    m_geometry.insert(index.row(), rect);
+    update(rect);
+}
+
+void CImageListCtrl::ClearItemGeometries()
+{
+    m_geometry.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CImageListCtrl::horizontalOffset() const
+{
+    return horizontalScrollBar()->value();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CImageListCtrl::verticalOffset() const
+{
+    return verticalScrollBar()->value();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageListCtrl::isIndexHidden([[maybe_unused]] const QModelIndex& index) const
+{
+    return false; /* not supported */
+}
+
+//////////////////////////////////////////////////////////////////////////
+QModelIndex CImageListCtrl::moveCursor(CursorAction cursorAction, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+{
+    if (!model())
+    {
+        return QModelIndex();
+    }
+
+    const int rowCount = model()->rowCount();
+
+    if (0 == rowCount)
+    {
+        return QModelIndex();
+    }
+
+    switch (cursorAction)
+    {
+    case MoveHome:
+        return model()->index(0, 0, rootIndex());
+
+    case MoveEnd:
+        return model()->index(rowCount - 1, 0, rootIndex());
+
+    case MovePrevious:
+    {
+        QModelIndex current = currentIndex();
+        if (current.isValid())
+        {
+            return model()->index((current.row() - 1) % rowCount, 0, rootIndex());
+        }
+    } break;
+
+    case MoveNext:
+    {
+        QModelIndex current = currentIndex();
+        if (current.isValid())
+        {
+            return model()->index((current.row() + 1) % rowCount, 0, rootIndex());
+        }
+    } break;
+
+    case MoveUp:
+    case MoveDown:
+    case MoveLeft:
+    case MoveRight:
+    case MovePageUp:
+    case MovePageDown:
+        /* TODO */
+        break;
+    }
+    return QModelIndex();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageListCtrl::setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags)
+{
+    if (!model())
+    {
+        return;
+    }
+
+    const QRect lrect =
+        rect.translated(horizontalOffset(), verticalOffset());
+
+    QHash<int, QRect>::const_iterator i;
+    QHash<int, QRect>::const_iterator c = m_geometry.cend();
+    for (i = m_geometry.cbegin(); i != c; ++i)
+    {
+        if (i.value().intersects(lrect))
+        {
+            selectionModel()->select(model()->index(i.key(), 0, rootIndex()), flags);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+QRegion CImageListCtrl::visualRegionForSelection(const QItemSelection& selection) const
+{
+    QRegion region;
+
+    foreach(const QModelIndex &index, selection.indexes())
+    {
+        region += visualRect(index);
+    }
+
+    return region;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QImageListDelegate::QImageListDelegate(QObject* parent)
+    : QAbstractItemDelegate(parent)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QImageListDelegate::paint(QPainter* painter,
+    const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    painter->save();
+
+    painter->setFont(option.font);
+
+    if (option.rect.isValid())
+    {
+        painter->setClipRect(option.rect);
+    }
+
+    QRect innerRect = option.rect.adjusted(1, 1, -1, -1);
+
+    QRect textRect(innerRect.left(), innerRect.bottom() - option.fontMetrics.height(),
+        innerRect.width(), option.fontMetrics.height() + 1);
+
+    /* fill item background */
+
+    painter->fillRect(option.rect, option.palette.color(QPalette::Base));
+
+    /* draw image */
+
+    if (index.data(Qt::DecorationRole).isValid())
+    {
+        const QPixmap& p = index.data(Qt::DecorationRole).value<QPixmap>();
+        if (p.isNull() || p.size() == QSize(1, 1))
+        {
+            emit InvalidPixmapGenerated(index);
+        }
+        else
+        {
+            painter->drawPixmap(innerRect, p);
+        }
+    }
+
+    /* draw text */
+
+    const QColor trColor = option.palette.color(QPalette::Shadow);
+    painter->fillRect(textRect, (option.state & QStyle::State_Selected) ?
+        trColor.lighter() : trColor);
+
+    if (option.state & QStyle::State_Selected)
+    {
+        painter->setPen(QPen(option.palette.color(QPalette::HighlightedText)));
+
+        QFont f = painter->font();
+        f.setBold(true);
+        painter->setFont(f);
+    }
+    else
+    {
+        painter->setPen(QPen(option.palette.color(QPalette::Text)));
+    }
+
+    painter->drawText(textRect, index.data(Qt::DisplayRole).toString(),
+        QTextOption(option.decorationAlignment));
+
+    painter->setPen(QPen(option.palette.color(QPalette::Shadow)));
+    painter->drawRect(textRect);
+
+    /* draw border */
+
+    if (option.state & QStyle::State_Selected)
+    {
+        QPen pen(option.palette.color(QPalette::Highlight));
+        pen.setWidth(2);
+        painter->setPen(pen);
+        painter->drawRect(innerRect);
+    }
+    else
+    {
+        painter->setPen(QPen(option.palette.color(QPalette::Shadow)));
+        painter->drawRect(option.rect);
+    }
+
+    if (option.state & QStyle::State_HasFocus)
+    {
+        QPen pen(Qt::DotLine);
+        pen.setColor(option.palette.color(QPalette::AlternateBase));
+        painter->setPen(pen);
+        painter->drawRect(option.rect);
+    }
+
+    painter->restore();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QSize QImageListDelegate::sizeHint(const QStyleOptionViewItem& option,
+    [[maybe_unused]] const QModelIndex& index) const
+{
+    return option.rect.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QVector<int> QImageListDelegate::paintingRoles() const
+{
+    return QVector<int>() << Qt::DecorationRole << Qt::DisplayRole;
+}
+
+#include <Controls/moc_ImageListCtrl.cpp>
diff --git a/Code/Editor/Controls/ImageListCtrl.h b/Code/Editor/Controls/ImageListCtrl.h
new file mode 100644
index 0000000000..f55c667491
--- /dev/null
+++ b/Code/Editor/Controls/ImageListCtrl.h
@@ -0,0 +1,96 @@
+/*
+ * 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_CONTROLS_IMAGELISTCTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_IMAGELISTCTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QAbstractItemView>
+
+#include <QHash>
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// Custom control to display list of images.
+//////////////////////////////////////////////////////////////////////////
+class CImageListCtrl
+    : public QAbstractItemView
+{
+    Q_OBJECT
+public:
+    enum ListStyle
+    {
+        DefaultStyle,
+        HorizontalStyle
+    };
+
+public:
+    CImageListCtrl(QWidget* parent = nullptr);
+    ~CImageListCtrl();
+
+    ListStyle Style() const;
+    void SetStyle(ListStyle style);
+
+    const QSize& ItemSize() const;
+    void SetItemSize(QSize size);
+
+    const QSize& BorderSize() const;
+    void SetBorderSize(QSize size);
+
+    // Get all items inside specified rectangle.
+    QModelIndexList ItemsInRect(const QRect& rect) const;
+
+    QModelIndex indexAt(const QPoint& point) const override;
+    void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible) override;
+    QRect visualRect(const QModelIndex& index) const override;
+
+protected:
+    QRect ItemGeometry(const QModelIndex& index) const;
+    void SetItemGeometry(const QModelIndex& index, const QRect& rect);
+    void ClearItemGeometries();
+
+    int horizontalOffset() const override;
+    int verticalOffset() const override;
+    bool isIndexHidden(const QModelIndex& index) const override;
+    QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override;
+    void setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags) override;
+    QRegion visualRegionForSelection(const QItemSelection& selection) const override;
+
+    void paintEvent(QPaintEvent* event) override;
+    void rowsInserted(const QModelIndex& parent, int start, int end) override;
+
+    void updateGeometries() override;
+
+private:
+    QHash<int, QRect> m_geometry;
+    QSize m_itemSize;
+    QSize m_borderSize;
+    ListStyle m_style;
+};
+
+class QImageListDelegate
+    : public QAbstractItemDelegate
+{
+    Q_OBJECT
+signals:
+    void InvalidPixmapGenerated(const QModelIndex& index) const;
+public:
+    QImageListDelegate(QObject* parent = nullptr);
+
+    void paint(QPainter* painter,
+        const QStyleOptionViewItem& option,
+        const QModelIndex& index) const override;
+
+    QSize sizeHint(const QStyleOptionViewItem& option,
+        const QModelIndex& index) const override;
+
+    QVector<int> paintingRoles() const override;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_IMAGELISTCTRL_H
diff --git a/Code/Editor/Controls/MultiMonHelper.cpp b/Code/Editor/Controls/MultiMonHelper.cpp
new file mode 100644
index 0000000000..9c5b29ac78
--- /dev/null
+++ b/Code/Editor/Controls/MultiMonHelper.cpp
@@ -0,0 +1,66 @@
+/*
+ * 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 "MultiMonHelper.h"
+
+// Qt
+#include <QScreen>
+
+////////////////////////////////////////////////////////////////////////////
+void ClipOrCenterRectToMonitor(QRect *prc, const UINT flags)
+{
+    const QScreen* currentScreen = nullptr;
+    QRect rc;
+
+    Q_ASSERT(prc);
+
+    const auto screens = qApp->screens();
+    for (auto screen : screens)
+    {
+        if (screen->geometry().contains(prc->center()))
+        {
+            currentScreen = screen;
+            break;
+        }
+    }
+
+    if (!currentScreen)
+    {
+        return;
+    }
+
+    const int w = prc->width();
+    const int h = prc->height();
+
+    if (flags & MONITOR_WORKAREA)
+    {
+        rc = currentScreen->availableGeometry();
+    }
+    else
+    {
+        rc = currentScreen->geometry();
+    }
+
+    // center or clip the passed rect to the monitor rect
+    if (flags & MONITOR_CENTER)
+    {
+        prc->setLeft(rc.left() + (rc.right()  - rc.left() - w) / 2);
+        prc->setTop(rc.top() + (rc.bottom() - rc.top() - h) / 2);
+        prc->setRight(prc->left() + w);
+        prc->setBottom(prc->top() + h);
+    }
+    else
+    {
+        prc->setLeft(qMax(rc.left(), qMin(rc.right() - w, prc->left())));
+        prc->setTop(qMax(rc.top(), qMin(rc.bottom() - h, prc->top())));
+        prc->setRight(prc->left() + w);
+        prc->setBottom(prc->top() + h);
+    }
+}
diff --git a/Code/Editor/Controls/MultiMonHelper.h b/Code/Editor/Controls/MultiMonHelper.h
new file mode 100644
index 0000000000..3295346842
--- /dev/null
+++ b/Code/Editor/Controls/MultiMonHelper.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_CONTROLS_MULTIMONHELPER_H
+#define CRYINCLUDE_EDITOR_CONTROLS_MULTIMONHELPER_H
+#pragma once
+
+// Taken from: http://msdn.microsoft.com/en-us/library/dd162826(v=vs.85).aspx
+#define MONITOR_CENTER   0x0001        // center rect to monitor
+#define MONITOR_CLIP     0x0000        // clip rect to monitor
+#define MONITOR_WORKAREA 0x0002        // use monitor work area
+#define MONITOR_AREA     0x0000        // use monitor entire area
+
+//
+//  ClipOrCenterRectToMonitor
+//
+//  The most common problem apps have when running on a
+//  multimonitor system is that they "clip" or "pin" windows
+//  based on the SM_CXSCREEN and SM_CYSCREEN system metrics.
+//  Because of app compatibility reasons these system metrics
+//  return the size of the primary monitor.
+//
+//  This shows how you use the multi-monitor functions
+//  to do the same thing.
+//
+// params:
+// prc : pointer to QRect to modify
+// flags : some combination of the MONITOR_* flags above
+//
+// example:
+//
+//  ClipOrCenterRectToMonitor(&aRect, MONITOR_CLIP | MONITOR_WORKAREA);
+//
+//  Takes parameter pointer to RECT "aRect" and flags MONITOR_CLIP | MONITOR_WORKAREA
+//      This will modify aRect without resizing it so that it remains within the on-screen boundaries.
+void ClipOrCenterRectToMonitor(QRect *prc, const UINT flags);
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_MULTIMONHELPER_H
diff --git a/Code/Editor/Controls/NumberCtrl.cpp b/Code/Editor/Controls/NumberCtrl.cpp
new file mode 100644
index 0000000000..d89ad3e84e
--- /dev/null
+++ b/Code/Editor/Controls/NumberCtrl.cpp
@@ -0,0 +1,142 @@
+/*
+ * 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 "NumberCtrl.h"
+
+
+QNumberCtrl::QNumberCtrl(QWidget* parent)
+    : QDoubleSpinBox(parent)
+    , m_bMouseDown(false)
+    , m_bDragged(false)
+    , m_bUndoEnabled(false)
+    , m_prevValue(0)
+{
+    connect(this, &QAbstractSpinBox::editingFinished, this, &QNumberCtrl::onEditingFinished);
+}
+
+void QNumberCtrl::changeEvent(QEvent* event)
+{
+    if (event->type() == QEvent::EnabledChange)
+    {
+        setButtonSymbols(isEnabled() ? UpDownArrows : NoButtons);
+    }
+
+    QDoubleSpinBox::changeEvent(event);
+}
+
+
+void QNumberCtrl::SetRange(double newMin, double newMax)
+{
+    // Avoid setting this value if its close to the current value, because otherwise qt will pump events into the queue to redraw/etc.
+    if ( (!AZ::IsClose(this->minimum(), newMin, DBL_EPSILON)) || (!AZ::IsClose(this->maximum(), newMax, DBL_EPSILON)) )
+    {
+        setRange(newMin, newMax);
+    }
+}
+
+
+void QNumberCtrl::mousePressEvent(QMouseEvent* event)
+{
+    if (event->button() == Qt::LeftButton)
+    {
+        emit mousePressed();
+
+        m_bMouseDown = true;
+        m_bDragged = false;
+        m_mousePos = event->pos();
+
+        if (m_bUndoEnabled && !CUndo::IsRecording())
+        {
+            GetIEditor()->BeginUndo();
+        }
+
+        emit dragStarted();
+
+        grabMouse();
+    }
+
+    QDoubleSpinBox::mousePressEvent(event);
+}
+
+void QNumberCtrl::mouseReleaseEvent(QMouseEvent* event)
+{
+    QDoubleSpinBox::mouseReleaseEvent(event);
+
+    if (event->button() == Qt::LeftButton)
+    {
+        m_bMouseDown = m_bDragged = false;
+
+        emit valueUpdated();
+        emit valueChanged();
+
+        if (m_bUndoEnabled && CUndo::IsRecording())
+        {
+            GetIEditor()->AcceptUndo(m_undoText);
+        }
+
+        emit dragFinished();
+
+        releaseMouse();
+
+        m_prevValue = value();
+
+        emit mouseReleased();
+    }
+}
+
+void QNumberCtrl::mouseMoveEvent(QMouseEvent* event)
+{
+    QDoubleSpinBox::mousePressEvent(event);
+
+    if (m_bMouseDown)
+    {
+        m_bDragged = true;
+
+        int dy = event->pos().y() - m_mousePos.y();
+        setValue(value() - singleStep() * dy);
+
+        emit valueUpdated();
+
+        m_mousePos = event->pos();
+    }
+}
+
+void QNumberCtrl::EnableUndo(const QString& undoText)
+{
+    m_undoText = undoText;
+    m_bUndoEnabled = true;
+}
+
+void QNumberCtrl::focusInEvent(QFocusEvent* event)
+{
+    m_prevValue = value();
+    QDoubleSpinBox::focusInEvent(event);
+}
+
+void QNumberCtrl::onEditingFinished()
+{
+    bool undo = m_bUndoEnabled && !CUndo::IsRecording() && m_prevValue != value();
+    if (undo)
+    {
+        GetIEditor()->BeginUndo();
+    }
+
+    emit valueUpdated();
+    emit valueChanged();
+
+    if (undo)
+    {
+        GetIEditor()->AcceptUndo(m_undoText);
+    }
+
+    m_prevValue = value();
+}
+
+#include <Controls/moc_NumberCtrl.cpp>
diff --git a/Code/Editor/Controls/NumberCtrl.h b/Code/Editor/Controls/NumberCtrl.h
new file mode 100644
index 0000000000..e36177925b
--- /dev/null
+++ b/Code/Editor/Controls/NumberCtrl.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_CONTROLS_NUMBERCTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_NUMBERCTRL_H
+#pragma once
+
+// NumberCtrl.h : header file
+//
+
+#if !defined(Q_MOC_RUN)
+#include <QDoubleSpinBox>
+#endif
+
+class QNumberCtrl
+    : public QDoubleSpinBox
+{
+    Q_OBJECT
+
+public:
+    QNumberCtrl(QWidget* parent = nullptr);
+
+    bool IsDragging() const { return m_bDragged; }
+
+    //! If called will enable undo with given text when control is modified.
+    void EnableUndo(const QString& undoText);
+    void SetRange(double newMin, double maxRange);
+
+Q_SIGNALS:
+    void dragStarted();
+    void dragFinished();
+
+    void valueUpdated();
+    void valueChanged();
+
+    void mouseReleased();
+    void mousePressed();
+
+protected:
+    void changeEvent(QEvent* event) override;
+    void focusInEvent(QFocusEvent* event) override;
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+
+private:
+    void onEditingFinished();
+    void onValueChanged(double d);
+
+    bool m_bMouseDown;
+    bool m_bDragged;
+    QPoint m_mousePos;
+    bool m_bUndoEnabled;
+    double m_prevValue;
+    QString m_undoText;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_NUMBERCTRL_H
diff --git a/Code/Editor/Controls/QBitmapPreviewDialog.cpp b/Code/Editor/Controls/QBitmapPreviewDialog.cpp
new file mode 100644
index 0000000000..9ad6103f31
--- /dev/null
+++ b/Code/Editor/Controls/QBitmapPreviewDialog.cpp
@@ -0,0 +1,171 @@
+/*
+ * 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 "QBitmapPreviewDialog.h"
+#include <Controls/ui_QBitmapPreviewDialog.h>
+
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QPainter>
+#include <QScreen>
+
+void QBitmapPreviewDialog::ImageData::setRgba8888(const void* buffer, const int& w, const int& h)
+{
+    const unsigned long bytes = w * h * 4;
+    m_buffer.resize(bytes);
+    memcpy(m_buffer.data(), buffer, bytes);
+    m_image = QImage((uchar*)m_buffer.constData(), w, h, QImage::Format::Format_RGBA8888);
+}
+
+static void fillChecker(int w, int h, unsigned int* dst)
+{
+    for (int y = 0; y < h; y++)
+    {
+        for (int x = 0; x < w; x++)
+        {
+            dst[y * w + x] = 0xFF000000 | (((x >> 2) + (y >> 2)) % 2 == 0 ? 0x007F7F7F : 0x00000000);
+        }
+    }
+}
+
+QBitmapPreviewDialog::QBitmapPreviewDialog(QWidget* parent)
+    : QWidget(parent)
+    , ui(new Ui::QBitmapTooltip)
+{
+    ui->setupUi(this);
+    setAttribute(Qt::WA_TranslucentBackground);
+    setAttribute(Qt::WA_ShowWithoutActivating);
+
+    // Clear label text
+    ui->m_placeholderBitmap->setText("");
+    ui->m_placeholderHistogram->setText("");
+
+    ui->m_bitmapSize->setProperty("tableRow", "Odd");
+    ui->m_Mips->setProperty("tableRow", "Even");
+    ui->m_Mean->setProperty("tableRow", "Odd");
+    ui->m_StdDev->setProperty("tableRow", "Even");
+    ui->m_Median->setProperty("tableRow", "Odd");
+    ui->m_labelForBitmapSize->setProperty("tooltipLabel", "content");
+    ui->m_labelForMean->setProperty("tooltipLabel", "content");
+    ui->m_labelForMedian->setProperty("tooltipLabel", "content");
+    ui->m_labelForMips->setProperty("tooltipLabel", "content");
+    ui->m_labelForStdDev->setProperty("tooltipLabel", "content");
+    ui->m_vBitmapSize->setProperty("tooltipLabel", "content");
+    ui->m_vMean->setProperty("tooltipLabel", "content");
+    ui->m_vMedian->setProperty("tooltipLabel", "content");
+    ui->m_vMips->setProperty("tooltipLabel", "content");
+    ui->m_vStdDev->setProperty("tooltipLabel", "content");
+
+    // Initialize placeholder images
+    const int w = 64;
+    const int h = 64;
+    QByteArray buffer;
+    buffer.resize(w * h * 4);
+    unsigned int* dst = (unsigned int*)buffer.data();
+    fillChecker(w, h, dst);
+    m_checker.setRgba8888(buffer.constData(), w, h);
+
+    m_initialSize = window()->window()->geometry().size();
+}
+
+QBitmapPreviewDialog::~QBitmapPreviewDialog()
+{
+    delete ui;
+}
+
+void QBitmapPreviewDialog::setImageRgba8888(const void* buffer, const int& w, const int& h, [[maybe_unused]] const QString& info)
+{
+    m_imageMain.setRgba8888(buffer, w, h);
+}
+
+
+QRect QBitmapPreviewDialog::getHistogramArea()
+{
+    return QRect(ui->m_placeholderHistogram->pos(), ui->m_placeholderHistogram->size());
+}
+
+void QBitmapPreviewDialog::setFullSize(const bool& fullSize)
+{
+    if (fullSize)
+    {
+        QSize desktop = QApplication::screenAt(ui->m_placeholderBitmap->pos())->availableGeometry().size();
+        QSize image = m_imageMain.m_image.size();
+        QPoint location = mapToGlobal(ui->m_placeholderBitmap->pos());
+        QSize finalSize;
+        finalSize.setWidth((image.width() < (desktop.width() - location.x())) ? image.width() : (desktop.width() - location.x()));
+        finalSize.setHeight((image.height() < (desktop.height() - location.y())) ? image.height() : (desktop.height() - location.y()));
+        float scale = (finalSize.width() < finalSize.height()) ? finalSize.width() / float(m_imageMain.m_image.width()) : finalSize.height() / float(m_imageMain.m_image.height());
+        ui->m_placeholderBitmap->setFixedSize(scale * m_imageMain.m_image.size());
+    }
+    else
+    {
+        ui->m_placeholderBitmap->setFixedSize(256, 256);
+    }
+
+    adjustSize();
+
+    update();
+}
+
+void QBitmapPreviewDialog::paintEvent(QPaintEvent* e)
+{
+    QWidget::paintEvent(e);
+    QRect rect(ui->m_placeholderBitmap->pos(), ui->m_placeholderBitmap->size());
+    drawImageData(rect, m_imageMain);
+}
+
+void QBitmapPreviewDialog::drawImageData(const QRect& rect, const ImageData& imgData)
+{
+    // Draw the
+    QPainter p(this);
+    p.drawImage(rect.topLeft(), m_checker.m_image.scaled(rect.size()));
+    p.drawImage(rect.topLeft(), imgData.m_image.scaled(rect.size()));
+
+    // Draw border
+    QPen pen;
+    pen.setColor(QColor(0, 0, 0));
+    p.drawRect(rect.top(), rect.left(), rect.width() - 1, rect.height());
+}
+
+void QBitmapPreviewDialog::setSize(QString _value)
+{
+    ui->m_vBitmapSize->setText(_value);
+}
+
+void QBitmapPreviewDialog::setMips(QString _value)
+{
+    ui->m_vMips->setText(_value);
+}
+
+void QBitmapPreviewDialog::setMean(QString _value)
+{
+    ui->m_vMean->setText(_value);
+}
+
+void QBitmapPreviewDialog::setMedian(QString _value)
+{
+    ui->m_vMedian->setText(_value);
+}
+
+void QBitmapPreviewDialog::setStdDev(QString _value)
+{
+    ui->m_vStdDev->setText(_value);
+}
+
+QSize QBitmapPreviewDialog::GetCurrentBitmapSize()
+{
+    return ui->m_placeholderBitmap->size();
+}
+
+QSize QBitmapPreviewDialog::GetOriginalImageSize()
+{
+    return m_imageMain.m_image.size();
+}
+
+
+#include <Controls/moc_QBitmapPreviewDialog.cpp>
diff --git a/Code/Editor/Controls/QBitmapPreviewDialog.h b/Code/Editor/Controls/QBitmapPreviewDialog.h
new file mode 100644
index 0000000000..5766dd4727
--- /dev/null
+++ b/Code/Editor/Controls/QBitmapPreviewDialog.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
+ *
+ */
+#ifndef QBITMAPPREVIEWDIALOG_H
+#define QBITMAPPREVIEWDIALOG_H
+
+#if !defined(Q_MOC_RUN)
+#include <QWidget>
+#include <QPixmap>
+#include <QImage>
+#endif
+
+class QLabel;
+
+namespace Ui {
+    class QBitmapTooltip;
+}
+
+class QBitmapPreviewDialog
+    : public QWidget
+{
+    Q_OBJECT
+
+    struct ImageData
+    {
+        QByteArray  m_buffer;
+        QImage      m_image;
+
+        void setRgba8888(const void* buffer, const int& w, const int& h);
+    };
+
+public:
+    explicit QBitmapPreviewDialog(QWidget* parent = 0);
+    virtual ~QBitmapPreviewDialog();
+    QSize GetCurrentBitmapSize();
+    QSize GetOriginalImageSize();
+
+protected:
+    void setImageRgba8888(const void* buffer, const int& w, const int& h, const QString& info);
+    void setSize(QString _value);
+    void setMips(QString _value);
+    void setMean(QString _value);
+    void setMedian(QString _value);
+    void setStdDev(QString _value);
+    QRect getHistogramArea();
+    void setFullSize(const bool& fullSize);
+
+    void paintEvent(QPaintEvent* e) override;
+
+private:
+    void drawImageData(const QRect& rect, const ImageData& imgData);
+
+protected:
+    Ui::QBitmapTooltip* ui;
+    QSize       m_initialSize;
+    ImageData   m_checker;
+    ImageData   m_imageMain;
+};
+
+#endif // QBITMAPPREVIEWDIALOG_H
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.ui b/Code/Editor/Controls/QBitmapPreviewDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.ui
rename to Code/Editor/Controls/QBitmapPreviewDialog.ui
diff --git a/Code/Editor/Controls/QBitmapPreviewDialogImp.cpp b/Code/Editor/Controls/QBitmapPreviewDialogImp.cpp
new file mode 100644
index 0000000000..0943737599
--- /dev/null
+++ b/Code/Editor/Controls/QBitmapPreviewDialogImp.cpp
@@ -0,0 +1,527 @@
+/*
+ * 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 "QBitmapPreviewDialogImp.h"
+
+// Cry
+#include <ITexture.h>
+
+// EditorCore
+#include <Util/Image.h>
+#include <Include/IImageUtil.h>
+
+// QT
+AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: class '...' needs to have dll-interface to be used by clients of class '...'
+#include <QEvent>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QPainterPath>
+#include <qmath.h>
+AZ_POP_DISABLE_WARNING
+
+#include <Controls/ui_QBitmapPreviewDialog.h>
+
+static const int kDefaultWidth  = 256;
+static const int kDefaultHeight = 256;
+
+QBitmapPreviewDialogImp::QBitmapPreviewDialogImp(QWidget* parent)
+    : QBitmapPreviewDialog(parent)
+    , m_image(new CImageEx())
+    , m_showOriginalSize(false)
+    , m_showMode(ESHOW_RGB)
+    , m_histrogramMode(eHistogramMode_OverlappedRGB)
+{
+    setMouseTracking(true);
+    setImage("");
+    ui->m_placeholderBitmap->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
+    ui->m_placeholderHistogram->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
+
+    ui->m_labelForBitmapSize->setProperty("tooltipLabel", "Content");
+    ui->m_labelForMean->setProperty("tooltipLabel", "Content");
+    ui->m_labelForMedian->setProperty("tooltipLabel", "Content");
+    ui->m_labelForMips->setProperty("tooltipLabel", "Content");
+    ui->m_labelForStdDev->setProperty("tooltipLabel", "Content");
+
+    ui->m_vBitmapSize->setProperty("tooltipLabel", "Content");
+    ui->m_vMean->setProperty("tooltipLabel", "Content");
+    ui->m_vMedian->setProperty("tooltipLabel", "Content");
+    ui->m_vMips->setProperty("tooltipLabel", "Content");
+    ui->m_vStdDev->setProperty("tooltipLabel", "Content");
+
+    setUIStyleMode(EUISTYLE_IMAGE_ONLY);
+}
+
+QBitmapPreviewDialogImp::~QBitmapPreviewDialogImp()
+{
+    SAFE_DELETE(m_image);
+}
+
+void QBitmapPreviewDialogImp::setImage(const QString path)
+{
+    if (path.isEmpty()
+        ||  m_path == path
+        ||  !GetIEditor()->GetImageUtil()->LoadImage(path.toUtf8().data(), *m_image))
+    {
+        return;
+    }
+    
+    m_showOriginalSize = isSizeSmallerThanDefault();
+    m_path = path;
+    refreshData();
+}
+
+void QBitmapPreviewDialogImp::setShowMode(EShowMode mode)
+{
+    if (mode == ESHOW_NumModes)
+    {
+        return;
+    }
+
+    m_showMode = mode;
+    refreshData();
+    update();
+}
+
+void QBitmapPreviewDialogImp::toggleShowMode()
+{
+    m_showMode = (EShowMode)(((int)m_showMode + 1) % ESHOW_NumModes);
+    refreshData();
+    update();
+}
+
+void QBitmapPreviewDialogImp::setUIStyleMode(EUIStyle mode)
+{
+    if (mode >= EUISTYLE_NumModes)
+    {
+        return;
+    }
+
+    m_uiStyle = mode;
+    if (m_uiStyle == EUISTYLE_IMAGE_ONLY)
+    {
+        ui->m_placeholderHistogram->hide();
+
+        ui->m_labelForBitmapSize->hide();
+        ui->m_labelForMean->hide();
+        ui->m_labelForMedian->hide();
+        ui->m_labelForMips->hide();
+        ui->m_labelForStdDev->hide();
+
+        ui->m_vBitmapSize->hide();
+        ui->m_vMean->hide();
+        ui->m_vMedian->hide();
+        ui->m_vMips->hide();
+        ui->m_vStdDev->hide();
+    }
+    else
+    {
+        ui->m_placeholderHistogram->show();
+
+        ui->m_labelForBitmapSize->show();
+        ui->m_labelForMean->show();
+        ui->m_labelForMedian->show();
+        ui->m_labelForMips->show();
+        ui->m_labelForStdDev->show();
+
+        ui->m_vBitmapSize->show();
+        ui->m_vMean->show();
+        ui->m_vMedian->show();
+        ui->m_vMips->show();
+        ui->m_vStdDev->show();
+    }
+}
+
+const QBitmapPreviewDialogImp::EShowMode& QBitmapPreviewDialogImp::getShowMode() const
+{
+    return m_showMode;
+}
+
+void QBitmapPreviewDialogImp::setHistogramMode(EHistogramMode mode)
+{
+    if (mode == eHistogramMode_NumModes)
+    {
+        return;
+    }
+
+    m_histrogramMode = mode;
+}
+
+void QBitmapPreviewDialogImp::toggleHistrogramMode()
+{
+    m_histrogramMode = (EHistogramMode)(((int)m_histrogramMode + 1) % eHistogramMode_NumModes);
+    update();
+}
+
+const QBitmapPreviewDialogImp::EHistogramMode& QBitmapPreviewDialogImp::getHistogramMode() const
+{
+    return m_histrogramMode;
+}
+
+void QBitmapPreviewDialogImp::toggleOriginalSize()
+{
+    m_showOriginalSize = !m_showOriginalSize;
+
+    refreshData();
+    update();
+}
+
+bool QBitmapPreviewDialogImp::isSizeSmallerThanDefault()
+{
+    return m_image->GetWidth() < kDefaultWidth && m_image->GetHeight() < kDefaultHeight;
+}
+
+void QBitmapPreviewDialogImp::setOriginalSize(bool value)
+{
+    m_showOriginalSize = value;
+
+    refreshData();
+    update();
+}
+
+
+const char* QBitmapPreviewDialogImp::GetShowModeDescription(EShowMode eShowMode, [[maybe_unused]] bool bShowInOriginalSize) const
+{
+    switch (eShowMode)
+    {
+    case ESHOW_RGB:
+        return "RGB";
+    case ESHOW_RGB_ALPHA:
+        return "RGB+A";
+    case ESHOW_ALPHA:
+        return "Alpha";
+    case ESHOW_RGBA:
+        return "RGBA";
+    case ESHOW_RGBE:
+        return "RGBExp";
+    }
+
+    return "";
+}
+
+const char* getHistrogramModeStr(QBitmapPreviewDialogImp::EHistogramMode mode, bool shortName)
+{
+    switch (mode)
+    {
+    case QBitmapPreviewDialogImp::eHistogramMode_Luminosity:
+        return shortName ? "Lum" : "Luminosity";
+    case QBitmapPreviewDialogImp::eHistogramMode_OverlappedRGB:
+        return shortName ? "Overlap" : "Overlapped RGBA";
+    case QBitmapPreviewDialogImp::eHistogramMode_SplitRGB:
+        return shortName ? "R|G|B" : "Split RGB";
+    case QBitmapPreviewDialogImp::eHistogramMode_RedChannel:
+        return shortName ? "Red" : "Red Channel";
+    case QBitmapPreviewDialogImp::eHistogramMode_GreenChannel:
+        return shortName ? "Green" : "Green Channel";
+    case QBitmapPreviewDialogImp::eHistogramMode_BlueChannel:
+        return shortName ? "Blue" : "Blue Channel";
+    case QBitmapPreviewDialogImp::eHistogramMode_AlphaChannel:
+        return shortName ? "Alpha" : "Alpha Channel";
+    default:
+        break;
+    }
+
+    return "";
+}
+
+void QBitmapPreviewDialogImp::refreshData()
+{
+    // Check if we have some usefull data loaded
+    if (m_image->GetWidth() * m_image->GetHeight() == 0)
+    {
+        return;
+    }
+
+    int w = m_image->GetWidth();
+    int h = m_image->GetHeight();
+
+    int multiplier = (m_showMode == ESHOW_RGB_ALPHA ? 2 : 1);
+    int originalW = w * multiplier;
+    int originalH = h;
+
+    if (!m_showOriginalSize || (w == 0))
+    {
+        w = kDefaultWidth;
+    }
+    if (!m_showOriginalSize || (h == 0))
+    {
+        h = kDefaultHeight;
+    }
+
+    w *= multiplier;
+
+    CImageEx scaledImage;
+
+    if (m_showOriginalSize && (originalW < w))
+    {
+        w = originalW;
+    }
+    if (m_showOriginalSize && (originalH < h))
+    {
+        h = originalH;
+    }
+
+    scaledImage.Allocate(w, h);
+
+    if (m_showMode == ESHOW_RGB_ALPHA)
+    {
+        GetIEditor()->GetImageUtil()->ScaleToDoubleFit(*m_image, scaledImage);
+    }
+    else
+    {
+        GetIEditor()->GetImageUtil()->ScaleToFit(*m_image, scaledImage);
+    }
+
+    if (m_showMode == ESHOW_RGB || m_showMode == ESHOW_RGBE)
+    {
+        scaledImage.FillAlpha();
+    }
+    else if (m_showMode == ESHOW_ALPHA)
+    {
+        for (int h2 = 0; h2 < scaledImage.GetHeight(); h2++)
+        {
+            for (int w2 = 0; w2 < scaledImage.GetWidth(); w2++)
+            {
+                int a = scaledImage.ValueAt(w2, h2) >> 24;
+                scaledImage.ValueAt(w2, h2) = RGB(a, a, a) | (a << 24);
+            }
+        }
+    }
+    else if (m_showMode == ESHOW_RGB_ALPHA)
+    {
+        int halfWidth = scaledImage.GetWidth() / 2;
+        for (int h2 = 0; h2 < scaledImage.GetHeight(); h2++)
+        {
+            for (int w2 = 0; w2 < halfWidth; w2++)
+            {
+                int r = GetRValue(scaledImage.ValueAt(w2, h2));
+                int g = GetGValue(scaledImage.ValueAt(w2, h2));
+                int b = GetBValue(scaledImage.ValueAt(w2, h2));
+                int a = scaledImage.ValueAt(w2, h2) >> 24;
+                scaledImage.ValueAt(w2, h2) = RGB(r, g, b) | (a << 24);
+                scaledImage.ValueAt(w2 + halfWidth, h2) = RGB(a, a, a) | (a << 24);
+            }
+        }
+    }
+
+
+    setImageRgba8888(scaledImage.GetData(), w, h, "");
+    setSize(QString().asprintf("%d x %d", m_image->GetWidth(), m_image->GetHeight()));
+    setMips(QString().asprintf("%d", m_image->GetNumberOfMipMaps()));
+
+    setFullSize(m_showOriginalSize);
+
+    // Compute histogram
+    m_histogram.ComputeHistogram((BYTE*)scaledImage.GetData(), w, h, CImageHistogram::eImageFormat_32BPP_RGBA);
+}
+
+void QBitmapPreviewDialogImp::paintEvent(QPaintEvent* e)
+{
+    QBitmapPreviewDialog::paintEvent(e);
+
+    //if showing original size hide other information so it's easier to see
+    if (m_showOriginalSize)
+    {
+        return;
+    }
+    if (m_uiStyle == EUISTYLE_IMAGE_ONLY)
+    {
+        return;
+    }
+
+    QPainter p(this);
+    QPen pen;
+    QPainterPath path[4];
+
+    // Fill background color
+    QRect histogramRect = getHistogramArea();
+    p.fillRect(histogramRect, QColor(255, 255, 255));
+
+    // Draw borders
+    pen.setColor(QColor(0, 0, 0));
+    p.setPen(pen);
+    p.drawRect(histogramRect);
+
+    // Draw histogram
+
+    QVector<int> drawChannels;
+
+    switch (m_histrogramMode)
+    {
+    case eHistogramMode_Luminosity:
+        drawChannels.push_back(3);
+        break;
+    case eHistogramMode_SplitRGB:
+        drawChannels.push_back(0);
+        drawChannels.push_back(1);
+        drawChannels.push_back(2);
+        break;
+    case eHistogramMode_OverlappedRGB:
+        drawChannels.push_back(0);
+        drawChannels.push_back(1);
+        drawChannels.push_back(2);
+        break;
+    case eHistogramMode_RedChannel:
+        drawChannels.push_back(0);
+        break;
+    case eHistogramMode_GreenChannel:
+        drawChannels.push_back(1);
+        break;
+    case eHistogramMode_BlueChannel:
+        drawChannels.push_back(2);
+        break;
+    case eHistogramMode_AlphaChannel:
+        drawChannels.push_back(3);
+        break;
+    }
+
+    int graphWidth =  qMax(histogramRect.width(), 1);
+    int graphHeight = qMax(histogramRect.height() - 2, 0);
+    int graphBottom = histogramRect.bottom() + 1;
+    int currX[4] = {0, 0, 0, 0};
+    int prevX[4] = {0, 0, 0, 0};
+    float scale = 0.0f;
+    static const int numSubGraphs = 3;
+    const int subGraph = qCeil(graphWidth / numSubGraphs);
+
+    // Fill background for Split RGB histogram
+    if (m_histrogramMode == eHistogramMode_SplitRGB)
+    {
+        const static QColor backgroundColor[numSubGraphs] =
+        {
+            QColor(255, 220, 220),
+            QColor(220, 255, 220),
+            QColor(220, 220, 255)
+        };
+
+        for (int i = 0; i < numSubGraphs; i++)
+        {
+            p.fillRect(histogramRect.left() + subGraph * i,
+                histogramRect.top(),
+                subGraph + (i == numSubGraphs - 1 ? 1 : 0),
+                histogramRect.height(), backgroundColor[i]);
+        }
+    }
+
+    int lastHeight[CImageHistogram::kNumChannels] = { INT_MAX, INT_MAX, INT_MAX, INT_MAX };
+
+    for (int x = 0; x < graphWidth; ++x)
+    {
+        for (int j = 0; j < drawChannels.size(); j++)
+        {
+            const int c = drawChannels[j];
+            int& curr_x = currX[c];
+            int& prev_x = prevX[c];
+            int& last_height = lastHeight[c];
+            QPainterPath& curr_path = path[c];
+
+
+            curr_x = histogramRect.left() + x + 1;
+            int i = ((float)x / (graphWidth - 1)) * (CImageHistogram::kNumColorLevels - 1);
+            if (m_histrogramMode == eHistogramMode_SplitRGB)
+            {
+                // Filter out to area which we are interested
+                const int k = x / subGraph;
+                if (k != c)
+                {
+                    continue;
+                }
+
+                i = qCeil((i - (subGraph * c)) * numSubGraphs);
+                i = qMin(i, CImageHistogram::kNumColorLevels - 1);
+                i = qMax(i, 0);
+            }
+
+            if (m_histrogramMode == eHistogramMode_Luminosity)
+            {
+                scale = (float)m_histogram.m_lumCount[i] / m_histogram.m_maxLumCount;
+            }
+            else if (m_histogram.m_maxCount[c])
+            {
+                scale = (float)m_histogram.m_count[c][i] / m_histogram.m_maxCount[c];
+            }
+
+            int height = graphBottom - graphHeight * scale;
+            if (last_height == INT_MAX)
+            {
+                last_height = height;
+            }
+
+            curr_path.moveTo(prev_x, last_height);
+            curr_path.lineTo(curr_x, height);
+            last_height = height;
+
+            if (prev_x == INT_MAX)
+            {
+                prev_x = curr_x;
+            }
+
+            prev_x = curr_x;
+        }
+    }
+
+    static const QColor kChannelColor[4] =
+    {
+        QColor(255, 0, 0),
+        QColor(0, 255, 0),
+        QColor(0, 0, 255),
+        QColor(120, 120, 120)
+    };
+
+    for (int i = 0; i < drawChannels.size(); i++)
+    {
+        const int c = drawChannels[i];
+        pen.setColor(kChannelColor[c]);
+        p.setPen(pen);
+        p.drawPath(path[c]);
+    }
+
+    // Update histogram info
+    {
+        float mean = 0, stdDev = 0, median = 0;
+
+        switch (m_histrogramMode)
+        {
+        case eHistogramMode_Luminosity:
+        case eHistogramMode_SplitRGB:
+        case eHistogramMode_OverlappedRGB:
+            mean = m_histogram.m_meanAvg;
+            stdDev = m_histogram.m_stdDevAvg;
+            median = m_histogram.m_medianAvg;
+            break;
+        case eHistogramMode_RedChannel:
+            mean = m_histogram.m_mean[0];
+            stdDev = m_histogram.m_stdDev[0];
+            median = m_histogram.m_median[0];
+            break;
+        case eHistogramMode_GreenChannel:
+            mean = m_histogram.m_mean[1];
+            stdDev = m_histogram.m_stdDev[1];
+            median = m_histogram.m_median[1];
+            break;
+        case eHistogramMode_BlueChannel:
+            mean = m_histogram.m_mean[2];
+            stdDev = m_histogram.m_stdDev[2];
+            median = m_histogram.m_median[2];
+            break;
+        case eHistogramMode_AlphaChannel:
+            mean = m_histogram.m_mean[3];
+            stdDev = m_histogram.m_stdDev[3];
+            median = m_histogram.m_median[3];
+            break;
+        }
+        QString val;
+        val.setNum(mean);
+        setMean(val);
+        val.setNum(stdDev);
+        setStdDev(val);
+        val.setNum(median);
+        setMedian(val);
+    }
+}
+
+#include <Controls/moc_QBitmapPreviewDialogImp.cpp>
diff --git a/Code/Editor/Controls/QBitmapPreviewDialogImp.h b/Code/Editor/Controls/QBitmapPreviewDialogImp.h
new file mode 100644
index 0000000000..d4c466d8d8
--- /dev/null
+++ b/Code/Editor/Controls/QBitmapPreviewDialogImp.h
@@ -0,0 +1,88 @@
+/*
+ * 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 QBITMAPPREVIEWDIALOG_IMP_H
+#define QBITMAPPREVIEWDIALOG_IMP_H
+
+#if !defined(Q_MOC_RUN)
+#include "QBitmapPreviewDialog.h"
+#include <Util/ImageHistogram.h>
+#endif
+
+class CImageEx;
+
+class QBitmapPreviewDialogImp
+    : public QBitmapPreviewDialog
+{
+    Q_OBJECT;
+public:
+
+    enum EUIStyle
+    {
+        EUISTYLE_IMAGE_ONLY,
+        EUISTYLE_IMAGE_HISTOGRAM,
+        EUISTYLE_NumModes
+    };
+
+    enum EShowMode
+    {
+        ESHOW_RGB = 0,
+        ESHOW_ALPHA,
+        ESHOW_RGBA,
+        ESHOW_RGB_ALPHA,
+        ESHOW_RGBE,
+        ESHOW_NumModes,
+    };
+
+    enum EHistogramMode
+    {
+        eHistogramMode_Luminosity,
+        eHistogramMode_OverlappedRGB,
+        eHistogramMode_SplitRGB,
+        eHistogramMode_RedChannel,
+        eHistogramMode_GreenChannel,
+        eHistogramMode_BlueChannel,
+        eHistogramMode_AlphaChannel,
+        eHistogramMode_NumModes,
+    };
+
+    explicit QBitmapPreviewDialogImp(QWidget* parent = 0);
+    virtual ~QBitmapPreviewDialogImp();
+
+    void setImage(const QString path);
+
+    void setShowMode(EShowMode mode);
+    void toggleShowMode();
+    void setUIStyleMode(EUIStyle mode);
+    const EShowMode& getShowMode() const;
+
+    void setHistogramMode(EHistogramMode mode);
+    void toggleHistrogramMode();
+    const EHistogramMode& getHistogramMode() const;
+
+    void setOriginalSize(bool value);
+    void toggleOriginalSize();
+
+    bool isSizeSmallerThanDefault();
+    void paintEvent(QPaintEvent* e) override;
+
+protected:
+    void refreshData();
+
+private:
+    const char* GetShowModeDescription(EShowMode eShowMode, bool bShowInOriginalSize) const;
+
+private:
+    CImageEx*       m_image;
+    QString         m_path;
+    CImageHistogram m_histogram;
+    bool            m_showOriginalSize;
+    EShowMode       m_showMode;
+    EHistogramMode  m_histrogramMode;
+    EUIStyle        m_uiStyle;
+};
+
+#endif // QBITMAPPREVIEWDIALOG_IMP_H
diff --git a/Code/Editor/Controls/QToolTipWidget.cpp b/Code/Editor/Controls/QToolTipWidget.cpp
new file mode 100644
index 0000000000..7ef3a519bc
--- /dev/null
+++ b/Code/Editor/Controls/QToolTipWidget.cpp
@@ -0,0 +1,641 @@
+/*
+ * 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 <Controls/QToolTipWidget.h>
+
+#include "QBitmapPreviewDialogImp.h"
+#include "qcoreapplication.h"
+#include "qguiapplication.h"
+#include "qapplication.h"
+#include <QDesktopWidget>
+#include <QPainter>
+#include <QtGlobal>
+#include <qgraphicseffect.h>
+
+void QToolTipWidget::RebuildLayout()
+{
+    if (m_title != nullptr)
+    {
+        m_title->hide();
+    }
+    if (m_content != nullptr)
+    {
+        m_content->hide();
+    }
+    if (m_specialContent != nullptr)
+    {
+        m_specialContent->hide();
+    }
+
+    //empty layout
+    while (m_layout->count() > 0)
+    {
+        m_layout->takeAt(0);
+    }
+    qDeleteAll(m_currentShortcuts);
+    m_currentShortcuts.clear();
+    if (m_includeTextureShortcuts)
+    {
+        m_currentShortcuts.append(new QLabel(tr("Alt - Alpha"), this));
+        m_currentShortcuts.back()->setProperty("tooltipLabel", "Shortcut");
+        m_currentShortcuts.append(new QLabel(tr("Shift - RGBA"), this));
+        m_currentShortcuts.back()->setProperty("tooltipLabel", "Shortcut");
+    }
+
+    if (m_title != nullptr && !m_title->text().isEmpty())
+    {
+        m_layout->addWidget(m_title);
+        m_title->show();
+    }
+
+    for (QLabel* var : m_currentShortcuts)
+    {
+        if (var != nullptr)
+        {
+            m_layout->addWidget(var);
+            var->show();
+        }
+    }
+    if (m_specialContent != nullptr)
+    {
+        m_layout->addWidget(m_specialContent);
+        m_specialContent->show();
+    }
+    if (m_content != nullptr && !m_content->text().isEmpty())
+    {
+        m_layout->addWidget(m_content);
+        m_content->show();
+    }
+    m_background->adjustSize();
+    adjustSize();
+}
+
+void QToolTipWidget::Hide()
+{
+    m_currentShortcuts.clear();
+    hide();
+}
+
+void QToolTipWidget::Show(QPoint pos, ArrowDirection dir)
+{
+    if (!IsValid())
+    {
+        return;
+    }
+    m_arrow->m_direction = dir;
+    pos = AdjustTipPosByArrowSize(pos, dir);
+    m_normalPos = pos;
+    move(pos);
+    RebuildLayout();
+    show();
+    m_arrow->show();
+}
+
+void QToolTipWidget::Display(QRect targetRect, ArrowDirection preferredArrowDir)
+{
+    if (!IsValid())
+    {
+        return;
+    }
+
+    KeepTipOnScreen(targetRect, preferredArrowDir);
+
+    RebuildLayout();
+    show();
+    m_arrow->show();
+}
+
+void QToolTipWidget::TryDisplay(QPoint mousePos, const QRect& rect, [[maybe_unused]] ArrowDirection preferredArrowDir)
+{
+    if (rect.contains(mousePos))
+    {
+        Display(rect, QToolTipWidget::ArrowDirection::ARROW_RIGHT);
+    }
+    else
+    {
+        hide();
+    }
+   }
+
+void QToolTipWidget::TryDisplay(QPoint mousePos, const QWidget* widget, ArrowDirection preferredArrowDir)
+{
+    const QRect rect(widget->mapToGlobal(QPoint(0,0)), widget->size());
+    TryDisplay(mousePos, rect, preferredArrowDir);
+}
+
+void QToolTipWidget::SetTitle(QString title)
+{
+    if (!title.isEmpty())
+    {
+        m_title->setText(title);
+    }
+    m_title->setProperty("tooltipLabel", "Title");
+
+    setWindowTitle("ToolTip - " + title);
+}
+
+void QToolTipWidget::SetContent(QString content)
+{
+    m_content->setWordWrap(true);
+
+    m_content->setProperty("tooltipLabel", "Content");
+    //line-height is not supported via stylesheet so we use the html rich-text subset in QT for it.
+    m_content->setText(QString("<span style=\"line-height: 14px;\">%1</span>").arg(content));
+}
+
+void QToolTipWidget::AppendContent(QString content)
+{
+    m_content->setText(m_content->text() + "\n\n" + content);
+    update();
+    RebuildLayout();
+    m_content->update();
+    m_content->repaint();
+}
+
+QToolTipWidget::QToolTipWidget(QWidget* parent)
+    : QWidget(parent)
+{
+    m_background = new QWidget(this);
+    m_background->setProperty("tooltip", "Background");
+    m_background->stackUnder(this);
+    m_title = new QLabel(this);
+    m_currentShortcuts = QVector<QLabel*>();
+    m_content = new QLabel(this);
+    m_specialContent = nullptr;
+    setWindowTitle("ToolTip");
+    setObjectName("ToolTip");
+    m_layout = new QVBoxLayout(this);
+    m_normalPos = QPoint(0, 0);
+    m_arrow = new QArrow(m_background);
+    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
+    m_arrow->setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
+    m_arrow->setAttribute(Qt::WA_TranslucentBackground, true);
+    m_background->setLayout(m_layout);
+    m_arrow->setObjectName("ToolTipArrow");
+    m_background->setObjectName("ToolTipBackground");
+
+    //we need a drop shadow for the background
+    QGraphicsDropShadowEffect* dropShadow = new QGraphicsDropShadowEffect(this);
+    dropShadow->setBlurRadius(m_shadowRadius);
+    dropShadow->setColor(Qt::black);
+    dropShadow->setOffset(0);
+    dropShadow->setEnabled(true);
+    m_background->setGraphicsEffect(dropShadow);
+    //we need a second drop shadow effect for the arrow
+    dropShadow = new QGraphicsDropShadowEffect(m_arrow);
+    dropShadow->setBlurRadius(m_shadowRadius);
+    dropShadow->setColor(Qt::black);
+    dropShadow->setOffset(0);
+    dropShadow->setEnabled(true);
+    m_arrow->setGraphicsEffect(dropShadow);
+}
+
+QToolTipWidget::~QToolTipWidget()
+{
+}
+
+void QToolTipWidget::AddSpecialContent(QString type, QString dataStream)
+{
+    if (type.isEmpty())
+    {
+        m_includeTextureShortcuts = false;
+        if (m_specialContent != nullptr)
+        {
+            delete m_specialContent;
+            m_specialContent = nullptr;
+        }
+        return;
+    }
+    if (type == "TEXTURE")
+    {
+        if (m_specialContent == nullptr)
+        {
+            QCoreApplication::instance()->installEventFilter(this); //grab the event filter while displaying the advanced texture tooltip
+            m_specialContent = new QBitmapPreviewDialogImp(this);
+        }
+        QString path(dataStream);
+        qobject_cast<QBitmapPreviewDialogImp*>(m_specialContent)->setImage(path);
+        // set default showmode to RGB
+        qobject_cast<QBitmapPreviewDialogImp*>(m_specialContent)->setShowMode(QBitmapPreviewDialogImp::EShowMode::ESHOW_RGB);
+        QString dir = (path.split("/").count() > path.split("\\").count()) ? path.split("/").back() : path.split("\\").back();
+        SetTitle(dir);
+        //always use default size but not image size
+        qobject_cast<QBitmapPreviewDialogImp*>(m_specialContent)->setOriginalSize(false);
+        m_includeTextureShortcuts = true;
+    }
+    else if (type == "ADD TO CONTENT")
+    {
+        AppendContent(dataStream);
+
+        m_includeTextureShortcuts = false;
+        if (m_specialContent != nullptr)
+        {
+            delete m_specialContent;
+            m_specialContent = nullptr;
+        }
+    }
+    else if (type == "REPLACE TITLE")
+    {
+        SetTitle(dataStream);
+        m_includeTextureShortcuts = false;
+        if (m_specialContent != nullptr)
+        {
+            delete m_specialContent;
+            m_specialContent = nullptr;
+        }
+    }
+    else if (type == "REPLACE CONTENT")
+    {
+        SetContent(dataStream);
+        m_includeTextureShortcuts = false;
+        if (m_specialContent != nullptr)
+        {
+            delete m_specialContent;
+            m_specialContent = nullptr;
+        }
+    }
+    else
+    {
+        m_includeTextureShortcuts = false;
+        if (m_specialContent != nullptr)
+        {
+            delete m_specialContent;
+            m_specialContent = nullptr;
+        }
+        return;
+    }
+
+    m_special = type;
+}
+
+
+bool QToolTipWidget::eventFilter(QObject* obj, QEvent* event)
+{
+    if (event->type() == QEvent::KeyPress)
+    {
+        if (m_special == "TEXTURE" && m_specialContent != nullptr)
+        {
+            const QKeyEvent* ke = static_cast<QKeyEvent*>(event);
+            Qt::KeyboardModifiers mods = ke->modifiers();
+            if (mods & Qt::KeyboardModifier::AltModifier)
+            {
+                ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_ALPHA);
+            }
+            else if (mods & Qt::KeyboardModifier::ShiftModifier && !(mods & Qt::KeyboardModifier::ControlModifier))
+            {
+                ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_RGBA);
+            }            
+        }
+    }
+    if (event->type() == QEvent::KeyRelease)
+    {
+        if (m_special == "TEXTURE" && m_specialContent != nullptr)
+        {
+            const QKeyEvent* ke = static_cast<QKeyEvent*>(event);
+            Qt::KeyboardModifiers mods = ke->modifiers();
+            if (!(mods& Qt::KeyboardModifier::AltModifier) && !(mods & Qt::KeyboardModifier::ShiftModifier))
+            {
+                ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_RGB);
+            }            
+        }
+    }
+    return QWidget::eventFilter(obj, event);
+}
+
+void QToolTipWidget::hideEvent(QHideEvent* event)
+{
+    QWidget::hideEvent(event);
+    m_arrow->hide();
+}
+
+void QToolTipWidget::UpdateOptionalData(QString optionalData)
+{
+    AddSpecialContent(m_special, optionalData);
+}
+
+
+
+QPoint QToolTipWidget::AdjustTipPosByArrowSize(QPoint pos, ArrowDirection dir)
+{
+    switch (dir)
+    {
+    case QToolTipWidget::ArrowDirection::ARROW_UP:
+    {
+        m_arrow->move(pos);
+        pos.setY(pos.y() + 10);
+        m_arrow->setFixedSize(20, 10);
+        pos -= QPoint(m_shadowRadius, m_shadowRadius);
+        break;
+    }
+    case QToolTipWidget::ArrowDirection::ARROW_LEFT:
+    {
+        m_arrow->move(pos);
+        pos.setX(pos.x() + 10);
+        m_arrow->setFixedSize(10, 20);
+        pos -= QPoint(m_shadowRadius, m_shadowRadius);
+        break;
+    }
+    case QToolTipWidget::ArrowDirection::ARROW_RIGHT:
+    {
+        pos.setX(pos.x() - 10);
+        m_arrow->move(QPoint(pos.x() + width(), pos.y()));
+        m_arrow->setFixedSize(10, 20);
+        pos -= QPoint(-m_shadowRadius, m_shadowRadius);
+        break;
+    }
+    case QToolTipWidget::ArrowDirection::ARROW_DOWN:
+    {
+        pos.setY(pos.y() - 10);
+        m_arrow->move(QPoint(pos.x(), pos.y() + height()));
+        m_arrow->setFixedSize(20, 10);
+        pos -= QPoint(m_shadowRadius, -m_shadowRadius);
+        break;
+    }
+    default:
+        m_arrow->move(-10, -10);
+        break;
+    }
+    return pos;
+}
+
+bool QToolTipWidget::IsValid()
+{
+    if (m_title->text().isEmpty() ||
+        (m_content->text().isEmpty() && m_specialContent == nullptr))
+    {
+        return false;
+    }
+    return true;
+}
+
+void QToolTipWidget::KeepTipOnScreen(QRect targetRect, ArrowDirection preferredArrowDir)
+{
+    QRect desktop = QApplication::desktop()->availableGeometry(this);
+
+    if (this->isHidden())
+    {
+        setAttribute(Qt::WA_DontShowOnScreen, true);
+        Show(QPoint(0, 0), preferredArrowDir);
+        hide();
+        setAttribute(Qt::WA_DontShowOnScreen, false);
+    }
+    //else assume the size is right
+
+    //calculate initial rect
+    QRect tipRect = QRect(0, 0, 0, 0);
+    switch (preferredArrowDir)
+    {
+    case QToolTipWidget::ArrowDirection::ARROW_UP:
+    {
+        //tip is below the widget with a left alignment
+        tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.bottomLeft(), preferredArrowDir));
+        break;
+    }
+    case QToolTipWidget::ArrowDirection::ARROW_LEFT:
+    {
+        //tip is on the right with the top being even
+        tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), preferredArrowDir));
+        break;
+    }
+    case QToolTipWidget::ArrowDirection::ARROW_RIGHT:
+    {
+        //tip is on the left with the top being even
+        tipRect.setY(targetRect.top());
+        tipRect.setX(targetRect.left() - width());
+        tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), preferredArrowDir));
+        break;
+    }
+    case QToolTipWidget::ArrowDirection::ARROW_DOWN:
+    {
+        //tip is above the widget with a left alignment
+        tipRect.setX(targetRect.left());
+        tipRect.setY(targetRect.top() - height());
+        tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), preferredArrowDir));
+        break;
+    }
+    default:
+    {
+        //tip is on the right with the top being even
+        preferredArrowDir = QToolTipWidget::ArrowDirection::ARROW_LEFT;
+        tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), QToolTipWidget::ArrowDirection::ARROW_LEFT));
+        break;
+    }
+    }
+    tipRect.setSize(size());
+
+    //FixPositioning
+    if (preferredArrowDir == ArrowDirection::ARROW_LEFT || preferredArrowDir == ArrowDirection::ARROW_RIGHT)
+    {
+        if (tipRect.left() <= desktop.left())
+        {
+            m_arrow->m_direction = ArrowDirection::ARROW_LEFT;
+            tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), m_arrow->m_direction));
+        }
+        else if (tipRect.right() >= desktop.right())
+        {
+            m_arrow->m_direction = ArrowDirection::ARROW_RIGHT;
+            tipRect.setLeft(targetRect.left() - width());
+            tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), m_arrow->m_direction));
+        }
+    }
+    else if (preferredArrowDir == ArrowDirection::ARROW_UP || preferredArrowDir == ArrowDirection::ARROW_DOWN)
+    {
+        if (tipRect.top() <= desktop.top())
+        {
+            m_arrow->m_direction = ArrowDirection::ARROW_UP;
+            tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.bottomLeft(), m_arrow->m_direction));
+        }
+        else if (tipRect.bottom() >= desktop.bottom())
+        {
+            m_arrow->m_direction = ArrowDirection::ARROW_DOWN;
+            tipRect.setY(targetRect.top() - height());
+            tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), m_arrow->m_direction));
+        }
+    }
+
+    //Nudge tip without arrow
+    if (preferredArrowDir == ArrowDirection::ARROW_UP || preferredArrowDir == ArrowDirection::ARROW_DOWN)
+    {
+        if (tipRect.left() <= desktop.left())
+        {
+            tipRect.setLeft(desktop.left());
+        }
+        else if (tipRect.right() >= desktop.right())
+        {
+            tipRect.setLeft(desktop.right() - width());
+        }
+    }
+    else if (preferredArrowDir == ArrowDirection::ARROW_RIGHT || preferredArrowDir == ArrowDirection::ARROW_LEFT)
+    {
+        if (tipRect.top() <= desktop.top())
+        {
+            tipRect.setTop(desktop.top());
+        }
+        else if (tipRect.bottom() >= desktop.bottom())
+        {
+            tipRect.setTop(desktop.bottom() - height());
+        }
+    }
+
+
+    m_normalPos = tipRect.topLeft();
+    move(m_normalPos);
+}
+
+QPolygonF QToolTipWidget::QArrow::CreateArrow()
+{
+    QVector<QPointF> vertex;
+    //3 points in triangle
+    vertex.reserve(3);
+    //all magic number below are given in order to draw smooth transitions between tooltip and arrow
+    if (m_direction == ArrowDirection::ARROW_UP)
+    {
+        vertex.push_back(QPointF(10, 1));
+        vertex.push_back(QPointF(19, 10));
+        vertex.push_back(QPointF(0, 10));
+    }
+    else if (m_direction == ArrowDirection::ARROW_RIGHT)
+    {
+        vertex.push_back(QPointF(9, 10));
+        vertex.push_back(QPointF(0, 19));
+        vertex.push_back(QPointF(0, 1));
+    }
+    else if (m_direction == ArrowDirection::ARROW_LEFT)
+    {
+        vertex.push_back(QPointF(1, 10));
+        vertex.push_back(QPointF(10, 19));
+        vertex.push_back(QPointF(10, 0));
+    }
+    else //ArrowDirection::ARROW_DOWN
+    {
+        vertex.push_back(QPointF(10, 10));
+        vertex.push_back(QPointF(19, 0));
+        vertex.push_back(QPointF(0, 0));
+    }
+    return QPolygonF(vertex);
+}
+
+void QToolTipWidget::QArrow::paintEvent([[maybe_unused]] QPaintEvent* event)
+{
+    QColor color(255, 255, 255, 255);
+    QPainter painter(this);
+    painter.fillRect(rect(), Qt::transparent); //force transparency
+    painter.setRenderHint(QPainter::Antialiasing, false);
+    painter.setBrush(color);
+    painter.setPen(Qt::NoPen);
+    painter.drawPolygon(CreateArrow());
+    //painter.setRenderHint(QPainter::Antialiasing, false);
+}
+
+QToolTipWrapper::QToolTipWrapper(QWidget* parent)
+    : QObject(parent)
+{
+}
+
+void QToolTipWrapper::SetTitle(QString title)
+{
+    m_title = title;
+}
+
+void QToolTipWrapper::SetContent(QString content)
+{
+    AddSpecialContent("REPLACE CONTENT", content);
+}
+
+void QToolTipWrapper::AppendContent(QString content)
+{
+    AddSpecialContent("ADD TO CONTENT", content);
+}
+
+void QToolTipWrapper::AddSpecialContent(QString type, QString dataStream)
+{
+    if (type == "REPLACE CONTENT")
+    {
+        m_contentOperations.clear();
+    }
+    m_contentOperations.push_back({type, dataStream});
+}
+
+void QToolTipWrapper::UpdateOptionalData(QString optionalData)
+{
+    m_contentOperations.push_back({"UPDATE OPTIONAL", optionalData});
+}
+
+void QToolTipWrapper::Display(QRect targetRect, QToolTipWidget::ArrowDirection preferredArrowDir)
+{
+    GetOrCreateToolTip()->Display(targetRect, preferredArrowDir);
+}
+
+void QToolTipWrapper::TryDisplay(QPoint mousePos, const QWidget * widget, QToolTipWidget::ArrowDirection preferredArrowDir)
+{
+    GetOrCreateToolTip()->TryDisplay(mousePos, widget, preferredArrowDir);
+}
+
+void QToolTipWrapper::TryDisplay(QPoint mousePos, const QRect & widget, QToolTipWidget::ArrowDirection preferredArrowDir)
+{
+    GetOrCreateToolTip()->TryDisplay(mousePos, widget, preferredArrowDir);
+}
+
+void QToolTipWrapper::hide()
+{
+    DestroyToolTip();
+}
+
+void QToolTipWrapper::show()
+{
+    GetOrCreateToolTip()->show();
+}
+
+bool QToolTipWrapper::isVisible() const
+{
+    return m_actualTooltip && m_actualTooltip->isVisible();
+}
+
+void QToolTipWrapper::update()
+{
+    if (m_actualTooltip)
+    {
+        m_actualTooltip->update();
+    }
+}
+
+void QToolTipWrapper::ReplayContentOperations(QToolTipWidget* tooltipWidget)
+{
+    tooltipWidget->SetTitle(m_title);
+    for (const auto& operation : m_contentOperations)
+    {
+        if (operation.first == "UPDATE OPTIONAL")
+        {
+            tooltipWidget->UpdateOptionalData(operation.second);
+        }
+        else
+        {
+            tooltipWidget->AddSpecialContent(operation.first, operation.second);
+        }
+    }
+}
+
+QToolTipWidget * QToolTipWrapper::GetOrCreateToolTip()
+{
+    if (!m_actualTooltip)
+    {
+        QToolTipWidget* tooltipWidget = new QToolTipWidget(static_cast<QWidget*>(parent()));
+        tooltipWidget->setAttribute(Qt::WA_DeleteOnClose);
+        ReplayContentOperations(tooltipWidget);
+        m_actualTooltip = tooltipWidget;
+    }
+    return m_actualTooltip.data();
+}
+
+void QToolTipWrapper::DestroyToolTip()
+{
+    if (m_actualTooltip)
+    {
+        m_actualTooltip->deleteLater();
+    }
+}
diff --git a/Code/Editor/Controls/QToolTipWidget.h b/Code/Editor/Controls/QToolTipWidget.h
new file mode 100644
index 0000000000..c5347c6a5f
--- /dev/null
+++ b/Code/Editor/Controls/QToolTipWidget.h
@@ -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
+ *
+ */
+#ifndef QToolTipWidget_h__
+#define QToolTipWidget_h__
+
+#include "EditorCoreAPI.h"
+
+#include <QPointer>
+#include <QWidget>
+#include <QLabel>
+#include <QString>
+#include <QMap>
+#include <QMapIterator>
+#include <QVector>
+#include <QVBoxLayout>
+
+#include <memory>
+
+class IQToolTip
+{
+public:
+    virtual void SetTitle(QString title) = 0;
+    virtual void SetContent(QString content) = 0;
+    virtual void AppendContent(QString content) = 0;
+    virtual void AddSpecialContent(QString type, QString dataStream) = 0;
+    virtual void UpdateOptionalData(QString optionalData) = 0;
+};
+
+class EDITOR_CORE_API QToolTipWidget
+    : public QWidget
+    , public IQToolTip
+{
+public:
+    enum class ArrowDirection
+    {
+        ARROW_UP,
+        ARROW_LEFT,
+        ARROW_RIGHT,
+        ARROW_DOWN
+    };
+    class QArrow
+        : public QWidget
+    {
+    public:
+        ArrowDirection m_direction;
+        QPoint m_pos;
+        QArrow(QWidget* parent)
+            : QWidget(parent){ setWindowFlags(Qt::ToolTip); }
+        virtual ~QArrow(){}
+
+        QPolygonF CreateArrow();
+        virtual void paintEvent(QPaintEvent*) override;
+    };
+    QToolTipWidget(QWidget* parent);
+    ~QToolTipWidget();
+    void SetTitle(QString title) override;
+    void SetContent(QString content) override;
+    void AppendContent(QString content) override;
+    void AddSpecialContent(QString type, QString dataStream) override;
+    void UpdateOptionalData(QString optionalData) override;
+    void Display(QRect targetRect, ArrowDirection preferredArrowDir);
+
+    //! Displays the tooltip on the given widget, only if the mouse is over it.
+    void TryDisplay(QPoint mousePos, const QWidget* widget, ArrowDirection preferredArrowDir);
+
+    //! Displays the tooltip on the given rect, only if the mouse is over it.
+    void TryDisplay(QPoint mousePos, const QRect& widget, ArrowDirection preferredArrowDir);
+
+    void Hide();
+    
+protected:
+    void Show(QPoint pos, ArrowDirection dir);
+    bool IsValid();
+    void KeepTipOnScreen(QRect targetRect, ArrowDirection preferredArrowDir);
+    QPoint AdjustTipPosByArrowSize(QPoint pos, ArrowDirection dir);
+    virtual bool eventFilter(QObject* obj, QEvent* event) override;
+    void RebuildLayout();
+    virtual void hideEvent(QHideEvent*) override;
+
+    QLabel* m_title;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QVector<QLabel*> m_currentShortcuts;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //can be anything from QLabel to QBitMapPreviewDialog
+    //must allow movement, and show/hide calls
+    QLabel* m_content;
+    QWidget* m_specialContent;
+    QWidget* m_background;
+    QVBoxLayout* m_layout;
+    QString m_special;
+    QPoint m_normalPos;
+    QArrow* m_arrow;
+    const int m_shadowRadius = 5;
+    bool m_includeTextureShortcuts; //added since Qt does not support modifier only shortcuts
+};
+
+// HACK: The EditorUI_QT classes all were keeping persistent references to QToolTipWidgets around
+// This led to many, many top-level widget creations, which led to many platform-side window allocations
+// which led to crashes in Qt5.15. As this is legacy code, this is a drop-in replacement that only
+// allocates the actual QToolTipWidget (and thus platform window) while the tooltip is visible
+class EDITOR_CORE_API QToolTipWrapper
+    : public QObject
+    , public IQToolTip
+{
+public:
+    QToolTipWrapper(QWidget* parent);
+
+    void SetTitle(QString title) override;
+    void SetContent(QString content) override;
+    void AppendContent(QString content) override;
+    void AddSpecialContent(QString type, QString dataStream) override;
+    void UpdateOptionalData(QString optionalData) override;
+
+    void Display(QRect targetRect, QToolTipWidget::ArrowDirection preferredArrowDir);
+    void TryDisplay(QPoint mousePos, const QWidget* widget, QToolTipWidget::ArrowDirection preferredArrowDir);
+    void TryDisplay(QPoint mousePos, const QRect& widget, QToolTipWidget::ArrowDirection preferredArrowDir);
+    void hide();
+    void show();
+    bool isVisible() const;
+    void update();
+    void repaint(){update();} //Things really shouldn't be calling repaint on these...
+
+    void Hide(){hide();}
+    void close(){hide();}
+
+private:
+    void ReplayContentOperations(QToolTipWidget* tooltipWidget);
+
+    QToolTipWidget* GetOrCreateToolTip();
+    void DestroyToolTip();
+
+    AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // conditional expression is constant, needs to have dll-interface to be used by clients of class 'AzQtComponents::FilteredSearchWidget'
+        QPointer<QToolTipWidget> m_actualTooltip;
+    AZ_POP_DISABLE_WARNING
+
+    QString m_title;
+    AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // conditional expression is constant, needs to have dll-interface to be used by clients of class 'AzQtComponents::FilteredSearchWidget'
+        QVector<QPair<QString, QString>> m_contentOperations;
+    AZ_POP_DISABLE_WARNING
+};
+
+
+#endif // QToolTipWidget_h__
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
new file mode 100644
index 0000000000..73e649b72a
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
@@ -0,0 +1,130 @@
+/*
+ * 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 "PropertyAnimationCtrl.h"
+
+// Qt
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QToolButton>
+
+// Editor
+#include "Util/UIEnumerations.h"
+#include "IResourceSelectorHost.h"
+
+AnimationPropertyCtrl::AnimationPropertyCtrl(QWidget *pParent)
+    : QWidget(pParent)
+{
+    m_animationLabel = new QLabel;
+
+    m_pApplyButton = new QToolButton;
+    m_pApplyButton->setIcon(QIcon(":/reflectedPropertyCtrl/img/apply.png"));
+
+    m_pApplyButton->setFocusPolicy(Qt::StrongFocus);
+
+    QHBoxLayout *pLayout = new QHBoxLayout(this);
+    pLayout->setContentsMargins(0, 0, 0, 0);
+    pLayout->addWidget(m_animationLabel, 1);
+    pLayout->addWidget(m_pApplyButton);
+
+    connect(m_pApplyButton, &QAbstractButton::clicked, this, &AnimationPropertyCtrl::OnApplyClicked);
+};
+
+AnimationPropertyCtrl::~AnimationPropertyCtrl()
+{
+}
+
+
+void AnimationPropertyCtrl::SetValue(const CReflectedVarAnimation &animation)
+{
+    m_animation = animation;
+    m_animationLabel->setText(animation.m_animation.c_str());
+}
+
+CReflectedVarAnimation AnimationPropertyCtrl::value() const
+{
+    return m_animation;
+}
+
+void AnimationPropertyCtrl::OnApplyClicked()
+{
+    QStringList cSelectedAnimations;
+    size_t nTotalAnimations(0);
+    size_t nCurrentAnimation(0);
+
+    QString combinedString = GetIEditor()->GetResourceSelectorHost()->GetGlobalSelection("animation");
+    SplitString(combinedString, cSelectedAnimations, ',');
+
+    nTotalAnimations = cSelectedAnimations.size();
+    for (nCurrentAnimation = 0; nCurrentAnimation < nTotalAnimations; ++nCurrentAnimation)
+    {
+        QString& rstrCurrentAnimAction = cSelectedAnimations[nCurrentAnimation];
+        if (!rstrCurrentAnimAction.isEmpty())
+        {
+            m_animation.m_animation = rstrCurrentAnimAction.toUtf8().data();
+            m_animationLabel->setText(m_animation.m_animation.c_str());
+            emit ValueChanged(m_animation);
+        }
+    }
+}
+
+QWidget* AnimationPropertyCtrl::GetFirstInTabOrder()
+{
+    return m_pApplyButton;
+}
+QWidget* AnimationPropertyCtrl::GetLastInTabOrder()
+{
+    return m_pApplyButton;
+}
+
+void AnimationPropertyCtrl::UpdateTabOrder()
+{
+    setTabOrder(m_pApplyButton, m_pApplyButton);
+}
+
+
+QWidget* AnimationPropertyWidgetHandler::CreateGUI(QWidget *pParent)
+{
+    AnimationPropertyCtrl* newCtrl = aznew AnimationPropertyCtrl(pParent);
+    connect(newCtrl, &AnimationPropertyCtrl::ValueChanged, newCtrl, [newCtrl]()
+    {
+        EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
+    });
+    return newCtrl;
+}
+
+
+void AnimationPropertyWidgetHandler::ConsumeAttribute(AnimationPropertyCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+{
+    Q_UNUSED(GUI);
+    Q_UNUSED(attrib);
+    Q_UNUSED(attrValue);
+    Q_UNUSED(debugName);
+}
+
+void AnimationPropertyWidgetHandler::WriteGUIValuesIntoProperty(size_t index, AnimationPropertyCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
+{
+    Q_UNUSED(index);
+    Q_UNUSED(node);
+    CReflectedVarAnimation val = GUI->value();
+    instance = static_cast<property_t>(val);
+}
+
+bool AnimationPropertyWidgetHandler::ReadValuesIntoGUI(size_t index, AnimationPropertyCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
+{
+    Q_UNUSED(index);
+    Q_UNUSED(node);
+    CReflectedVarAnimation val = instance;
+    GUI->SetValue(val);
+    return false;
+}
+
+
+#include <Controls/ReflectedPropertyControl/moc_PropertyAnimationCtrl.cpp>
+
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
new file mode 100644
index 0000000000..a5154978e6
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYANIMATIONCTRL_H
+#define CRYINCLUDE_EDITOR_UTILS_PROPERTYANIMATIONCTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include "ReflectedVar.h"
+#include <QWidget>
+#include <QPointer>
+#endif
+
+class QToolButton;
+class QLabel;
+class QHBoxLayout;
+
+class AnimationPropertyCtrl
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    AZ_CLASS_ALLOCATOR(AnimationPropertyCtrl, AZ::SystemAllocator, 0);
+
+    AnimationPropertyCtrl(QWidget* pParent = nullptr);
+    virtual ~AnimationPropertyCtrl();
+
+    CReflectedVarAnimation value() const;
+
+    QWidget* GetFirstInTabOrder();
+    QWidget* GetLastInTabOrder();
+    void UpdateTabOrder();
+
+signals:
+    void ValueChanged(CReflectedVarAnimation value);
+
+public slots:
+    void SetValue(const CReflectedVarAnimation& animation);
+
+protected slots:
+    void OnApplyClicked();
+
+private:
+    QToolButton* m_pApplyButton;
+    QLabel* m_animationLabel;
+
+    CReflectedVarAnimation m_animation;
+};
+
+class AnimationPropertyWidgetHandler
+    : QObject
+    , public AzToolsFramework::PropertyHandler < CReflectedVarAnimation, AnimationPropertyCtrl >
+{
+public:
+    AZ_CLASS_ALLOCATOR(AnimationPropertyWidgetHandler, AZ::SystemAllocator, 0);
+
+    virtual AZ::u32 GetHandlerName(void) const override  { return AZ_CRC("Animation", 0x8d5284dc); }
+    virtual bool IsDefaultHandler() const override { return true; }
+    virtual QWidget* GetFirstInTabOrder(AnimationPropertyCtrl* widget) override { return widget->GetFirstInTabOrder(); }
+    virtual QWidget* GetLastInTabOrder(AnimationPropertyCtrl* widget) override { return widget->GetLastInTabOrder(); }
+    virtual void UpdateWidgetInternalTabbing(AnimationPropertyCtrl* widget) override { widget->UpdateTabOrder(); }
+
+    virtual QWidget* CreateGUI(QWidget* pParent) override;
+    virtual void ConsumeAttribute(AnimationPropertyCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+    virtual void WriteGUIValuesIntoProperty(size_t index, AnimationPropertyCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+    virtual bool ReadValuesIntoGUI(size_t index, AnimationPropertyCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYANIMATIONCTRL_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
new file mode 100644
index 0000000000..8281837b4a
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "EditorDefs.h"
+
+// Editor
+#include "PropertyCtrl.h"
+#include "PropertyAnimationCtrl.h"
+#include "PropertyResourceCtrl.h"
+#include "PropertyGenericCtrl.h"
+#include "PropertyMiscCtrl.h"
+#include "PropertyMotionCtrl.h"
+
+void RegisterReflectedVarHandlers()
+{
+    static bool registered = false;
+    if (!registered)
+    {
+        registered = true;
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew AnimationPropertyWidgetHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew FileResourceSelectorWidgetHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew ReverbPresetPropertyHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequencePropertyHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequenceIdPropertyHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LocalStringPropertyHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LightAnimationPropertyHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew UserPopupWidgetHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew ColorCurveHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew FloatCurveHandler());
+        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew MotionPropertyWidgetHandler());
+    }
+}
+
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h
new file mode 100644
index 0000000000..2414492fd8
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h
@@ -0,0 +1,17 @@
+/*
+ * 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_UTILS_PROPERTYCTRL_H
+#define CRYINCLUDE_EDITOR_UTILS_PROPERTYCTRL_H
+#pragma once
+
+void RegisterReflectedVarHandlers();
+
+
+
+
+#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYCTRL_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
new file mode 100644
index 0000000000..d989a3d878
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
@@ -0,0 +1,257 @@
+/*
+ * 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 "PropertyGenericCtrl.h"
+
+// Qt
+#include <QMessageBox>
+#include <QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QLineEdit>
+#include <QStringListModel>
+#include <QToolButton>
+
+// CryCommon
+#include <CryCommon/ILocalizationManager.h>
+
+// Editor
+#include "SelectLightAnimationDialog.h"
+#include "SelectSequenceDialog.h"
+#include "SelectEAXPresetDlg.h"
+#include "QtViewPaneManager.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <QtWidgets/QListView>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+GenericPopupPropertyEditor::GenericPopupPropertyEditor(QWidget *pParent, bool showTwoButtons)
+    :QWidget(pParent)
+{
+    m_valueLabel = new QLabel;
+
+    QToolButton *mainButton = new QToolButton;
+    mainButton->setAutoRaise(true);
+    mainButton->setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/browse-edit.svg")));
+    connect(mainButton, &QToolButton::clicked, this, &GenericPopupPropertyEditor::onEditClicked);
+
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->addWidget(m_valueLabel, 1);
+    mainLayout->addWidget(mainButton);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+
+    if (showTwoButtons)
+    {
+        QToolButton *button2 = new QToolButton;
+        button2->setAutoRaise(true);
+        button2->setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/more.svg")));
+        connect(button2, &QToolButton::clicked, this, &GenericPopupPropertyEditor::onButton2Clicked);
+        mainLayout->insertWidget(1, button2);
+    }
+}
+
+void GenericPopupPropertyEditor::SetValue(const QString &value, bool notify)
+{
+    if (m_value != value)
+    {
+        m_value = value;
+        m_valueLabel->setText(m_value);
+        if (notify)
+            emit ValueChanged(m_value);
+    }
+}
+
+void GenericPopupPropertyEditor::SetPropertyType(PropertyType type)
+{
+    m_propertyType = type;
+}
+
+void ReverbPresetPropertyEditor::onEditClicked()
+{
+    CSelectEAXPresetDlg PresetDlg(this);
+    PresetDlg.SetCurrPreset(GetValue());
+    if (PresetDlg.exec() == QDialog::Accepted)
+    {
+        SetValue(PresetDlg.GetCurrPreset());
+    }
+}
+
+void SequencePropertyEditor::onEditClicked()
+{
+    CSelectSequenceDialog gtDlg(this);
+    gtDlg.PreSelectItem(GetValue());
+    if (gtDlg.exec() == QDialog::Accepted)
+        SetValue(gtDlg.GetSelectedItem());
+}
+
+void SequenceIdPropertyEditor::onEditClicked()
+{
+    CSelectSequenceDialog gtDlg;
+    uint32 id = GetValue().toUInt();
+    IAnimSequence *pSeq = GetIEditor()->GetMovieSystem()->FindSequenceById(id);
+    if (pSeq)
+        gtDlg.PreSelectItem(pSeq->GetName());
+    if (gtDlg.exec() == QDialog::Accepted)
+    {
+        pSeq = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(gtDlg.GetSelectedItem().toUtf8().data());
+        assert(pSeq);
+        if (pSeq->GetId() > 0)
+        {
+            // This sequence is a new one with a valid ID.
+            SetValue(QString::number(pSeq->GetId()));
+        }
+        else
+        {
+            // This sequence is an old one without an ID.
+            QMessageBox::warning(this, tr("Old Sequence"), tr("This is an old sequence without an ID.\nSo it cannot be used with the new ID-based linking."));
+        }
+    }
+}
+
+void LocalStringPropertyEditor::onEditClicked()
+{
+    std::vector<IVariable::IGetCustomItems::SItem> items;
+    ILocalizationManager* pMgr = gEnv->pSystem->GetLocalizationManager();
+    if (!pMgr)
+        return;
+    int nCount = pMgr->GetLocalizedStringCount();
+    if (nCount <= 0)
+        return;
+    items.reserve(nCount);
+    IVariable::IGetCustomItems::SItem item;
+    SLocalizedInfoEditor sInfo;
+    for (int i = 0; i < nCount; ++i)
+    {
+        if (pMgr->GetLocalizedInfoByIndex(i, sInfo))
+        {
+            item.desc = tr("English Text:\r\n");
+            item.desc += QString::fromWCharArray(Unicode::Convert<wstring>(sInfo.sUtf8TranslatedText).c_str());
+            item.name = sInfo.sKey;
+            items.push_back(item);
+        }
+    }
+    CGenericSelectItemDialog gtDlg;
+    const bool bUseTree = true;
+    if (bUseTree)
+    {
+        gtDlg.SetMode(CGenericSelectItemDialog::eMODE_TREE);
+        gtDlg.SetTreeSeparator("/");
+    }
+    gtDlg.SetItems(items);
+    gtDlg.setWindowTitle(tr("Choose Localized String"));
+    QString preselect = GetValue();
+    if (!preselect.isEmpty() && preselect.at(0) == '@')
+        preselect = preselect.mid(1);
+    gtDlg.PreSelectItem(preselect);
+    if (gtDlg.exec() == QDialog::Accepted)
+    {
+        preselect = "@";
+        preselect += gtDlg.GetSelectedItem();
+        SetValue(preselect);
+    }
+}
+
+void LightAnimationPropertyEditor::onEditClicked()
+{
+    // First, check if there is any light animation defined.
+    bool bLightAnimationExists = false;
+    IMovieSystem *pMovieSystem = GetIEditor()->GetMovieSystem();
+    for (int i = 0; i < pMovieSystem->GetNumSequences(); ++i)
+    {
+        IAnimSequence *pSequence = pMovieSystem->GetSequence(i);
+        if (pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet)
+        {
+            bLightAnimationExists = pSequence->GetNodeCount() > 0;
+            break;
+        }
+    }
+
+    if (bLightAnimationExists) // If exists, show the selection dialog.
+    {
+        CSelectLightAnimationDialog dlg;
+        dlg.PreSelectItem(GetValue());
+        if (dlg.exec() == QDialog::Accepted)
+            SetValue(dlg.GetSelectedItem());
+    }
+    else                       // If not, remind the user of creating one in TrackView.
+    {
+        QMessageBox::warning(this, tr("No Available Animation"), tr("There is no available light animation.\nPlease create one in TrackView, first."));
+    }
+}
+
+ListEditWidget::ListEditWidget(QWidget *pParent /*= nullptr*/)
+    :QWidget(pParent)
+{
+    m_valueEdit = new QLineEdit;
+
+    m_model = new QStringListModel(this);
+
+    m_listView = new QListView;
+    m_listView->setModel(m_model);
+    m_listView->setMaximumHeight(50);
+    m_listView->setVisible(false);
+
+    QToolButton *expandButton = new QToolButton();
+    expandButton->setCheckable(true);
+    expandButton->setText("+");
+    
+    QToolButton *editButton = new QToolButton();
+    editButton->setText("..");
+
+    connect(editButton, &QAbstractButton::clicked, this, &ListEditWidget::OnEditClicked);
+    connect(expandButton, &QAbstractButton::toggled, m_listView, &QWidget::setVisible);
+
+    connect(m_model, &QAbstractItemModel::dataChanged, this, &ListEditWidget::OnModelDataChange);
+    connect(m_valueEdit, &QLineEdit::editingFinished, this, [this](){SetValue(m_valueEdit->text(), true); } );
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    QHBoxLayout *topLayout = new QHBoxLayout;
+    topLayout->addWidget(expandButton);
+    topLayout->addWidget(m_valueEdit,1);
+    topLayout->addWidget(editButton);
+
+    mainLayout->addLayout(topLayout);
+    mainLayout->addWidget(m_listView,1);
+    mainLayout->setContentsMargins(1,1,1,1);
+}
+
+void ListEditWidget::SetValue(const QString &value, bool notify /*= true*/)
+{
+    if (m_value != value)
+    {
+        m_value = value;
+        m_valueEdit->setText(value);
+        QStringList list = m_value.split(",", Qt::SkipEmptyParts);
+        m_model->setStringList(list);
+
+        if (notify)
+            emit ValueChanged(m_value);
+    }
+}
+
+
+void ListEditWidget::OnModelDataChange()
+{
+    m_value = m_model->stringList().join(",");
+    m_valueEdit->setText(m_value);
+    emit ValueChanged(m_value);
+}
+
+
+QWidget* ListEditWidget::GetFirstInTabOrder()
+{
+    return m_valueEdit;
+}
+
+QWidget* ListEditWidget::GetLastInTabOrder()
+{
+    return m_listView;
+}
+
+#include <Controls/ReflectedPropertyControl/moc_PropertyGenericCtrl.cpp>
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
new file mode 100644
index 0000000000..d13316a1cd
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
@@ -0,0 +1,232 @@
+/*
+ * 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_UTILS_PROPERTYGENERICCTRL_H
+#define CRYINCLUDE_EDITOR_UTILS_PROPERTYGENERICCTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include "ReflectedVar.h"
+#include "Util/VariablePropertyType.h"
+#include <QWidget>
+#endif
+
+class QStringListModel;
+class QListView;
+class QLabel;
+class QLineEdit;
+
+class GenericPopupPropertyEditor
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    AZ_CLASS_ALLOCATOR(GenericPopupPropertyEditor, AZ::SystemAllocator, 0);
+    GenericPopupPropertyEditor(QWidget* pParent = nullptr, bool showTwoButtons = false);
+
+    void SetValue(const QString& value, bool notify = true);
+    QString GetValue() const { return m_value; }
+    void SetPropertyType(PropertyType type);
+    PropertyType GetPropertyType() const { return m_propertyType; }
+
+    //override in derived classes to show appropriate editor
+    virtual void onEditClicked() {};
+    virtual void onButton2Clicked() {};
+
+signals:
+    void ValueChanged(const QString& value);
+
+private:
+    QLabel* m_valueLabel;
+    PropertyType m_propertyType;
+    QString m_value;
+};
+
+template <class T, AZ::u32 CRC>
+class GenericPopupWidgetHandler
+    : public QObject
+    , public AzToolsFramework::PropertyHandler < CReflectedVarGenericProperty, GenericPopupPropertyEditor >
+{
+public:
+    AZ_CLASS_ALLOCATOR(GenericPopupWidgetHandler, AZ::SystemAllocator, 0);
+    virtual bool IsDefaultHandler() const override { return false; }
+
+    virtual AZ::u32 GetHandlerName(void) const override  { return CRC; }
+    virtual QWidget* CreateGUI(QWidget* pParent) override
+    {
+        GenericPopupPropertyEditor* newCtrl = aznew T(pParent);
+        connect(newCtrl, &GenericPopupPropertyEditor::ValueChanged, newCtrl, [newCtrl]()
+            {
+                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
+            });
+        return newCtrl;
+    }
+    virtual void ConsumeAttribute(GenericPopupPropertyEditor* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override
+    {
+        Q_UNUSED(GUI);
+        Q_UNUSED(attrib);
+        Q_UNUSED(attrValue);
+        Q_UNUSED(debugName);
+    }
+    virtual void WriteGUIValuesIntoProperty(size_t index, GenericPopupPropertyEditor* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override
+    {
+        Q_UNUSED(index);
+        Q_UNUSED(node);
+        CReflectedVarGenericProperty val = instance;
+        val.m_propertyType = GUI->GetPropertyType();
+        val.m_value = GUI->GetValue().toUtf8().data();
+        instance = static_cast<property_t>(val);
+    }
+    virtual bool ReadValuesIntoGUI(size_t index, GenericPopupPropertyEditor* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override
+    {
+        Q_UNUSED(index);
+        Q_UNUSED(node);
+        CReflectedVarGenericProperty val = instance;
+        GUI->SetPropertyType(val.m_propertyType);
+        GUI->SetValue(val.m_value.c_str(), false);
+        return false;
+    }
+};
+
+class ReverbPresetPropertyEditor
+    : public GenericPopupPropertyEditor
+{
+public:
+    ReverbPresetPropertyEditor(QWidget* pParent = nullptr)
+        : GenericPopupPropertyEditor(pParent){}
+    void onEditClicked() override;
+};
+
+class MissionObjPropertyEditor
+    : public GenericPopupPropertyEditor
+{
+public:
+    MissionObjPropertyEditor(QWidget* pParent = nullptr)
+        : GenericPopupPropertyEditor(pParent){}
+    void onEditClicked() override;
+};
+
+class SequencePropertyEditor
+    : public GenericPopupPropertyEditor
+{
+public:
+    SequencePropertyEditor(QWidget* pParent = nullptr)
+        : GenericPopupPropertyEditor(pParent){}
+    void onEditClicked() override;
+};
+
+class SequenceIdPropertyEditor
+    : public GenericPopupPropertyEditor
+{
+public:
+    SequenceIdPropertyEditor(QWidget* pParent = nullptr)
+        : GenericPopupPropertyEditor(pParent){}
+    void onEditClicked() override;
+};
+
+class LocalStringPropertyEditor
+    : public GenericPopupPropertyEditor
+{
+public:
+    LocalStringPropertyEditor(QWidget* pParent = nullptr)
+        : GenericPopupPropertyEditor(pParent){}
+    void onEditClicked() override;
+};
+
+class LightAnimationPropertyEditor
+    : public GenericPopupPropertyEditor
+{
+public:
+    LightAnimationPropertyEditor(QWidget* pParent = nullptr)
+        : GenericPopupPropertyEditor(pParent){}
+    void onEditClicked() override;
+};
+
+
+// AZ_CRC changed recently - it used to be evaluated by the preprocessor to AZ::u32(value); now it evaluates to Az::Crc32, and can't be used as a const template parameter
+// So we use our own
+#define CONST_AZ_CRC(name, value) AZ::u32(value)
+
+using ReverbPresetPropertyHandler = GenericPopupWidgetHandler<ReverbPresetPropertyEditor, CONST_AZ_CRC("ePropertyReverbPreset", 0x51469f38)>;
+using MissionObjPropertyHandler = GenericPopupWidgetHandler<MissionObjPropertyEditor, CONST_AZ_CRC("ePropertyMissionObj", 0x4a2d0dc8)>;
+using SequencePropertyHandler = GenericPopupWidgetHandler<SequencePropertyEditor, CONST_AZ_CRC("ePropertySequence", 0xdd1c7d44)>;
+using SequenceIdPropertyHandler = GenericPopupWidgetHandler<SequenceIdPropertyEditor, CONST_AZ_CRC("ePropertySequenceId", 0x05983dcc)>;
+using LocalStringPropertyHandler = GenericPopupWidgetHandler<LocalStringPropertyEditor, CONST_AZ_CRC("ePropertyLocalString", 0x0cd9609a)>;
+using LightAnimationPropertyHandler = GenericPopupWidgetHandler<LightAnimationPropertyEditor, CONST_AZ_CRC("ePropertyLightAnimation", 0x277097da)>;
+
+class ListEditWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    AZ_CLASS_ALLOCATOR(ListEditWidget, AZ::SystemAllocator, 0);
+    ListEditWidget(QWidget *pParent = nullptr);
+
+    void SetValue(const QString &value, bool notify = true);
+    QString GetValue() const { return m_value; }
+
+    QWidget* GetFirstInTabOrder();
+    QWidget* GetLastInTabOrder();
+
+signals:
+    void ValueChanged(const QString &value);
+
+private:
+    void OnModelDataChange();
+    virtual void OnEditClicked() {};
+
+protected:
+    QLineEdit *m_valueEdit;
+    QString m_value;
+    QListView *m_listView;
+    QStringListModel *m_model;
+};
+
+template <class T, AZ::u32 CRC>
+class ListEditWidgetHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarGenericProperty, ListEditWidget >
+{
+public:
+    AZ_CLASS_ALLOCATOR(ListEditWidgetHandler, AZ::SystemAllocator, 0);
+    virtual bool IsDefaultHandler() const override { return false; }
+
+    virtual AZ::u32 GetHandlerName(void) const override  { return CRC; }
+    virtual QWidget* CreateGUI(QWidget *pParent) override
+    {
+        ListEditWidget* newCtrl = aznew T(pParent);
+        connect(newCtrl, &ListEditWidget::ValueChanged, newCtrl, [newCtrl]()
+        {
+            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
+        });
+        return newCtrl;
+    }
+    virtual void ConsumeAttribute(ListEditWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override {
+        Q_UNUSED(GUI); Q_UNUSED(attrib); Q_UNUSED(attrValue); Q_UNUSED(debugName);
+    }
+    virtual void WriteGUIValuesIntoProperty(size_t index, ListEditWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override
+    {
+        Q_UNUSED(index);
+        Q_UNUSED(node);
+        CReflectedVarGenericProperty val = instance;
+        val.m_value = GUI->GetValue().toUtf8().data();
+        instance = static_cast<property_t>(val);
+    }
+    virtual bool ReadValuesIntoGUI(size_t index, ListEditWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override
+    {
+        Q_UNUSED(index);
+        Q_UNUSED(node);
+        CReflectedVarGenericProperty val = instance;
+        GUI->SetValue(val.m_value.c_str(), false);
+        return false;
+    }
+    QWidget* GetFirstInTabOrder(ListEditWidget* widget) override { return widget->GetFirstInTabOrder(); }
+    QWidget* GetLastInTabOrder(ListEditWidget* widget) override {return widget->GetLastInTabOrder(); }
+
+};
+
+#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYGENERICCTRL_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
new file mode 100644
index 0000000000..058d3aa70f
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
@@ -0,0 +1,198 @@
+/*
+ * 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 "PropertyMiscCtrl.h"
+
+// Qt
+#include <QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QLineEdit>
+#include <QtWidgets/QToolButton>
+#include <QtCore/QTimer>
+#include <QtUtilWin.h>
+
+// Editor
+#include "GenericSelectItemDialog.h"
+#include "QtViewPaneManager.h"
+
+
+UserPropertyEditor::UserPropertyEditor(QWidget *pParent /*= nullptr*/)
+    : QWidget(pParent)
+    , m_canEdit(false)
+    , m_useTree(false)
+{
+    m_valueLabel = new QLabel;
+
+    QToolButton *mainButton = new QToolButton;
+    mainButton->setText("..");
+    connect(mainButton, &QToolButton::clicked, this, &UserPropertyEditor::onEditClicked);
+
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->addWidget(m_valueLabel, 1);
+    mainLayout->addWidget(mainButton);
+    mainLayout->setContentsMargins(1, 1, 1, 1);
+}
+
+void UserPropertyEditor::SetValue(const QString &value, bool notify /*= true*/)
+{
+    if (m_value != value)
+    {
+        m_value = value;
+        m_valueLabel->setText(m_value);
+        if (notify)
+        {
+            emit ValueChanged(m_value);
+        }
+    }
+
+}
+
+void UserPropertyEditor::SetData(bool canEdit, bool useTree, const QString &treeSeparator, const QString &dialogTitle, const std::vector<IVariable::IGetCustomItems::SItem>& items)
+{
+    m_canEdit = canEdit;
+    m_useTree = useTree;
+    m_treeSeparator = treeSeparator;
+    m_dialogTitle = dialogTitle;
+    m_items = items;
+}
+
+void UserPropertyEditor::onEditClicked()
+{
+    // call the user supplied callback to fill-in items and get dialog title
+    emit RefreshItems();
+    if (m_canEdit) // if func didn't veto, show the dialog
+    {
+        CGenericSelectItemDialog gtDlg;
+        if (m_useTree)
+        {
+            gtDlg.SetMode(CGenericSelectItemDialog::eMODE_TREE);
+            if (!m_treeSeparator.isEmpty())
+            {
+                gtDlg.SetTreeSeparator(m_treeSeparator);
+            }
+        }
+        gtDlg.SetItems(m_items);
+        if (m_dialogTitle.isEmpty() == false)
+            gtDlg.setWindowTitle(m_dialogTitle);
+        gtDlg.PreSelectItem(GetValue());
+        if (gtDlg.exec() == QDialog::Accepted)
+        {
+            QString selectedItemStr = gtDlg.GetSelectedItem();
+
+            if (selectedItemStr.isEmpty() == false)
+            {
+                SetValue(selectedItemStr);
+            }
+        }
+    }
+}
+
+
+QWidget* UserPopupWidgetHandler::CreateGUI(QWidget *pParent)
+{
+    UserPropertyEditor* newCtrl = aznew UserPropertyEditor(pParent);
+    connect(newCtrl, &UserPropertyEditor::ValueChanged, newCtrl, [newCtrl]()
+    {
+        EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
+    });
+
+    return newCtrl;
+}
+
+void UserPopupWidgetHandler::ConsumeAttribute(UserPropertyEditor* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+{
+    Q_UNUSED(GUI);
+    Q_UNUSED(attrib);
+    Q_UNUSED(attrValue);
+    Q_UNUSED(debugName);
+}
+
+void UserPopupWidgetHandler::WriteGUIValuesIntoProperty(size_t index, UserPropertyEditor* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
+{
+    Q_UNUSED(index);
+    Q_UNUSED(node);
+    CReflectedVarUser val = instance;
+    val.m_value = GUI->GetValue().toUtf8().data();
+    instance = static_cast<property_t>(val);
+}
+
+bool UserPopupWidgetHandler::ReadValuesIntoGUI(size_t index, UserPropertyEditor* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
+{
+    Q_UNUSED(index);
+    Q_UNUSED(node);
+    CReflectedVarUser val = instance;
+
+    assert(val.m_itemNames.size() == val.m_itemDescriptions.size());
+
+    std::vector<IVariable::IGetCustomItems::SItem> items(val.m_itemNames.size());
+    int i = -1;
+    std::generate(items.begin(), items.end(), [&val, &i]() { ++i; return IVariable::IGetCustomItems::SItem(val.m_itemNames[i].c_str(), val.m_itemDescriptions[i].c_str());});
+
+    GUI->SetData(val.m_enableEdit, val.m_useTree, val.m_treeSeparator.c_str(), val.m_dialogTitle.c_str(), items);
+    GUI->SetValue(val.m_value.c_str(), false);
+    return false;
+}
+
+#include <Controls/ReflectedPropertyControl/moc_PropertyMiscCtrl.cpp>
+
+QWidget* FloatCurveHandler::CreateGUI(QWidget *pParent)
+{
+    CSplineCtrl *cSpline = new CSplineCtrl(pParent);
+    cSpline->SetUpdateCallback(AZStd::bind(&FloatCurveHandler::OnSplineChange, this, AZStd::placeholders::_1));
+    cSpline->SetTimeRange(0, 1);
+    cSpline->SetValueRange(0, 1);
+    cSpline->SetGrid(12, 12);
+    cSpline->setFixedHeight(52);
+    return cSpline;
+}
+void FloatCurveHandler::OnSplineChange(CSplineCtrl*)
+{
+//    EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, splineWidget);
+}
+
+void FloatCurveHandler::ConsumeAttribute(CSplineCtrl *, AZ::u32, AzToolsFramework::PropertyAttributeReader*, const char*)
+{}
+
+void FloatCurveHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, [[maybe_unused]] CSplineCtrl* GUI, [[maybe_unused]] property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+{
+    //nothing to do here. the spline itself will have it's new values.
+}
+
+bool FloatCurveHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, CSplineCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+{
+    GUI->SetSpline(reinterpret_cast<ISplineInterpolator*>(instance.m_spline));
+    return false;
+}
+
+
+QWidget* ColorCurveHandler::CreateGUI(QWidget *pParent)
+{
+    CColorGradientCtrl* gradientCtrl = new CColorGradientCtrl(pParent);
+    //connect(gradientCtrl, &CColorGradientCtrl::change, [gradientCtrl]()
+    //{
+    //    EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, gradientCtrl);
+    //});
+    gradientCtrl->SetTimeRange(0, 1);
+    gradientCtrl->setFixedHeight(36);
+    return gradientCtrl;
+
+}
+
+void ColorCurveHandler::ConsumeAttribute(CColorGradientCtrl*, AZ::u32, AzToolsFramework::PropertyAttributeReader*, const char*)
+{}
+
+void ColorCurveHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, [[maybe_unused]] CColorGradientCtrl* GUI, [[maybe_unused]] property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+{}
+
+bool ColorCurveHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, CColorGradientCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+{
+    GUI->SetSpline(reinterpret_cast<ISplineInterpolator*>(instance.m_spline));
+    return false;
+}
+
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
new file mode 100644
index 0000000000..e6637e2d4c
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
@@ -0,0 +1,97 @@
+/*
+ * 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_UTILS_PROPERTYMISCCTRL_H
+#define CRYINCLUDE_EDITOR_UTILS_PROPERTYMISCCTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include "ReflectedVar.h"
+#include "Util/VariablePropertyType.h"
+#include "Controls/ColorGradientCtrl.h"
+#include "Controls/SplineCtrl.h"
+#include <QWidget>
+#endif
+
+class QLabel;
+class QLineEdit;
+
+class UserPropertyEditor : public QWidget
+{
+    Q_OBJECT
+public:
+    AZ_CLASS_ALLOCATOR(UserPropertyEditor, AZ::SystemAllocator, 0);
+    UserPropertyEditor(QWidget *pParent = nullptr);
+
+    void SetValue(const QString &value, bool notify = true);
+    QString GetValue() const { return m_value; }
+
+    void SetData(bool canEdit, bool useTree, const QString &treeSeparator, const QString &dialogTitle, const std::vector<IVariable::IGetCustomItems::SItem>& items);
+    void onEditClicked();
+
+signals:
+    void ValueChanged(const QString &value);
+    void RefreshItems();
+
+private:
+    QLabel *m_valueLabel;
+    QString m_value;
+
+    bool m_canEdit;
+    bool m_useTree;
+    QString m_treeSeparator;
+    QString m_dialogTitle;
+    std::vector<IVariable::IGetCustomItems::SItem> m_items;
+};
+
+class UserPopupWidgetHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarUser, UserPropertyEditor>
+{
+public:
+    AZ_CLASS_ALLOCATOR(UserPopupWidgetHandler, AZ::SystemAllocator, 0);
+    bool IsDefaultHandler() const override { return false; }
+    QWidget* CreateGUI(QWidget *pParent) override;
+
+    AZ::u32 GetHandlerName(void) const override  {return AZ_CRC("ePropertyUser", 0x65b972c0); }
+    void ConsumeAttribute(UserPropertyEditor* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+    void WriteGUIValuesIntoProperty(size_t index, UserPropertyEditor* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+    bool ReadValuesIntoGUI(size_t index, UserPropertyEditor* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+
+};
+
+class FloatCurveHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarSpline, CSplineCtrl>
+{
+public:
+    AZ_CLASS_ALLOCATOR(FloatCurveHandler, AZ::SystemAllocator, 0);
+    bool IsDefaultHandler() const override { return false; }
+    QWidget* CreateGUI(QWidget *pParent) override;
+
+    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("ePropertyFloatCurve", 0x7440ccce); }
+
+    void ConsumeAttribute(CSplineCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+    void WriteGUIValuesIntoProperty(size_t index, CSplineCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+    bool ReadValuesIntoGUI(size_t index, CSplineCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+
+    void OnSplineChange(CSplineCtrl*);
+};
+
+class ColorCurveHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarSpline, CColorGradientCtrl>
+{
+public:
+    AZ_CLASS_ALLOCATOR(ColorCurveHandler, AZ::SystemAllocator, 0);
+    bool IsDefaultHandler() const override { return false; }
+    QWidget* CreateGUI(QWidget *pParent) override;
+
+    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("ePropertyColorCurve", 0xa30da4ec); }
+
+    void ConsumeAttribute(CColorGradientCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+    void WriteGUIValuesIntoProperty(size_t index, CColorGradientCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+    bool ReadValuesIntoGUI(size_t index, CColorGradientCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+};
+#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYMISCCTRL_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
new file mode 100644
index 0000000000..c8a52b0cd0
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.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 "EditorDefs.h"
+
+#include "PropertyMotionCtrl.h"
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
+
+QWidget* MotionPropertyWidgetHandler::CreateGUI(QWidget* pParent)
+{
+    AzToolsFramework::PropertyAssetCtrl* newCtrl = aznew AzToolsFramework::PropertyAssetCtrl(pParent);
+    connect(
+        newCtrl, &AzToolsFramework::PropertyAssetCtrl::OnAssetIDChanged, this, [newCtrl]([[maybe_unused]] AZ::Data::AssetId newAssetId) {
+            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, newCtrl);
+        });
+    return newCtrl;
+}
+
+void MotionPropertyWidgetHandler::ConsumeAttribute(
+    [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, [[maybe_unused]] AZ::u32 attrib,
+    [[maybe_unused]] AzToolsFramework::PropertyAttributeReader* attrValue, [[maybe_unused]] const char* debugName)
+{
+}
+
+void MotionPropertyWidgetHandler::WriteGUIValuesIntoProperty(
+    [[maybe_unused]] size_t index, [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, property_t& instance,
+    [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+{
+    CReflectedVarMotion val;
+    val.m_motion = GUI->GetCurrentAssetHint();
+    val.m_assetId = GUI->GetSelectedAssetID();
+    instance = static_cast<property_t>(val);
+}
+
+bool MotionPropertyWidgetHandler::ReadValuesIntoGUI(
+    [[maybe_unused]] size_t index, [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, const property_t& instance,
+    [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+{
+    static const AZ::Data::AssetType emotionFXMotionAssetType(
+        "{00494B8E-7578-4BA2-8B28-272E90680787}"); // from MotionAsset.h in EMotionFX Gem
+
+    GUI->blockSignals(true);
+    GUI->SetSelectedAssetID(instance.m_assetId);
+    GUI->SetCurrentAssetType(emotionFXMotionAssetType);
+    GUI->blockSignals(false);
+
+    return false;
+}
+
+#include <Controls/ReflectedPropertyControl/moc_PropertyMotionCtrl.cpp>
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
new file mode 100644
index 0000000000..4e91992412
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "ReflectedVar.h"
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/base.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include <QPointer>
+#include <QWidget>
+#endif
+
+class MotionPropertyWidgetHandler : QObject,
+                                    public AzToolsFramework::PropertyHandler<CReflectedVarMotion, AzToolsFramework::PropertyAssetCtrl>
+{
+    Q_OBJECT
+
+public:
+    AZ_CLASS_ALLOCATOR(MotionPropertyWidgetHandler, AZ::SystemAllocator, 0);
+
+    virtual AZ::u32 GetHandlerName(void) const override
+    {
+        return AZ_CRC("Motion", 0xf5fea1e8);
+    }
+
+    virtual bool IsDefaultHandler() const override
+    {
+        return true;
+    }
+
+    virtual QWidget* GetFirstInTabOrder(AzToolsFramework::PropertyAssetCtrl* widget) override
+    {
+        return widget->GetFirstInTabOrder();
+    }
+
+    virtual QWidget* GetLastInTabOrder(AzToolsFramework::PropertyAssetCtrl* widget) override
+    {
+        return widget->GetLastInTabOrder();
+    }
+
+    virtual void UpdateWidgetInternalTabbing(AzToolsFramework::PropertyAssetCtrl* widget) override
+    {
+        widget->UpdateTabOrder();
+    }
+
+    virtual QWidget* CreateGUI(QWidget* pParent) override;
+    virtual void ConsumeAttribute(
+        AzToolsFramework::PropertyAssetCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue,
+        const char* debugName) override;
+    virtual void WriteGUIValuesIntoProperty(
+        size_t index, AzToolsFramework::PropertyAssetCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+    virtual bool ReadValuesIntoGUI(
+        size_t index, AzToolsFramework::PropertyAssetCtrl* GUI, const property_t& instance,
+        AzToolsFramework::InstanceDataNode* node) override;
+};
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
new file mode 100644
index 0000000000..2d095ab1db
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
@@ -0,0 +1,392 @@
+/*
+ * 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 "PropertyResourceCtrl.h"
+
+// Qt
+#include <QHBoxLayout>
+#include <QLineEdit>
+
+// AzToolsFramework
+#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+// Editor
+#include "IResourceSelectorHost.h"
+#include "Controls/QToolTipWidget.h"
+#include "Controls/BitmapToolTip.h"
+
+
+BrowseButton::BrowseButton(PropertyType type, QWidget* parent /*= nullptr*/)
+    : QToolButton(parent)
+    , m_propertyType(type)
+{
+    setAutoRaise(true);
+    setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/browse-edit.svg")));
+    connect(this, &QAbstractButton::clicked, this, &BrowseButton::OnClicked);
+}
+
+void BrowseButton::SetPathAndEmit(const QString& path)
+{
+    //only emit if path changes, except for ePropertyGeomCache. Old property control
+    if (path != m_path || m_propertyType == ePropertyGeomCache)
+    {
+        m_path = path;
+        emit PathChanged(m_path);
+    }
+}
+
+class FileBrowseButton
+    : public BrowseButton
+{
+public:
+    AZ_CLASS_ALLOCATOR(FileBrowseButton, AZ::SystemAllocator, 0);
+    FileBrowseButton(PropertyType type, QWidget* pParent = nullptr)
+        : BrowseButton(type, pParent)
+    {
+        setToolTip("Browse...");
+    }
+
+private:
+    void OnClicked() override
+    {
+        QString tempValue("");
+        QString ext("");
+        if (m_path.isEmpty() == false)
+        {
+            if (Path::GetExt(m_path) == "")
+            {
+                tempValue = "";
+            }
+            else
+            {
+                tempValue = m_path;
+            }
+        }
+
+        AssetSelectionModel selection;
+
+        if (m_propertyType == ePropertyTexture)
+        {
+            // Filters for texture.
+            selection = AssetSelectionModel::AssetGroupSelection("Texture");
+        }
+        else if (m_propertyType == ePropertyModel)
+        {
+            // Filters for models.
+            selection = AssetSelectionModel::AssetGroupSelection("Geometry");
+        }
+        else if (m_propertyType == ePropertyGeomCache)
+        {
+            // Filters for geom caches.
+            selection = AssetSelectionModel::AssetTypeSelection("Geom Cache");
+        }
+        else if (m_propertyType == ePropertyFile)
+        {
+            // Filters for files.
+            selection = AssetSelectionModel::AssetTypeSelection("File");
+        }
+        else
+        {
+            return;
+        }
+
+        AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
+        if (selection.IsValid())
+        {
+            QString newPath = Path::FullPathToGamePath(selection.GetResult()->GetFullPath().c_str()).c_str();
+
+            switch (m_propertyType)
+            {
+            case ePropertyTexture:
+            case ePropertyModel:
+                newPath.replace("\\\\", "/");
+            }
+            switch (m_propertyType)
+            {
+            case ePropertyTexture:
+            case ePropertyModel:
+            case ePropertyFile:
+                if (newPath.size() > MAX_PATH)
+                {
+                    newPath.resize(MAX_PATH);
+                }
+            }
+
+            SetPathAndEmit(newPath);
+        }
+    }
+};
+
+class ResourceSelectorButton
+    : public BrowseButton
+{
+public:
+    AZ_CLASS_ALLOCATOR(ResourceSelectorButton, AZ::SystemAllocator, 0);
+
+    ResourceSelectorButton(PropertyType type, QWidget* pParent = nullptr)
+        : BrowseButton(type, pParent)
+    {
+        setToolTip(tr("Select resource"));
+    }
+
+private:
+    void OnClicked() override
+    {
+        SResourceSelectorContext x;
+        x.parentWidget = this;
+        x.typeName = Prop::GetPropertyTypeToResourceType(m_propertyType);
+        QString newPath = GetIEditor()->GetResourceSelectorHost()->SelectResource(x, m_path);
+        SetPathAndEmit(newPath);
+    }
+};
+
+class TextureEditButton
+    : public BrowseButton
+{
+public:
+    AZ_CLASS_ALLOCATOR(TextureEditButton, AZ::SystemAllocator, 0);
+    TextureEditButton(QWidget* pParent = nullptr)
+        : BrowseButton(ePropertyTexture, pParent)
+    {
+        setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/open-in-internal-app.svg")));
+        setToolTip(tr("Launch default editor"));
+    }
+
+private:
+    void OnClicked() override
+    {
+        CFileUtil::EditTextureFile(m_path.toUtf8().data(), true);
+    }
+};
+
+FileResourceSelectorWidget::FileResourceSelectorWidget(QWidget* pParent /*= nullptr*/)
+    : QWidget(pParent)
+    , m_propertyType(ePropertyInvalid)
+    , m_tooltip(nullptr)
+{
+    m_pathEdit = new QLineEdit;
+    m_mainLayout = new QHBoxLayout(this);
+    m_mainLayout->addWidget(m_pathEdit, 1);
+
+    m_mainLayout->setContentsMargins(0, 0, 0, 0);
+
+// KDAB just ported the MFC texture preview tooltip, but looks like Amazon added their own. Not sure which to use.
+// To switch to Amazon QToolTipWidget, remove FileResourceSelectorWidget::event and m_previewTooltip 
+#ifdef USE_QTOOLTIPWIDGET
+    m_tooltip = new QToolTipWidget(this);
+
+    installEventFilter(this);
+#endif
+    connect(m_pathEdit, &QLineEdit::editingFinished, this, [this]() { OnPathChanged(m_pathEdit->text()); });
+}
+
+bool FileResourceSelectorWidget::eventFilter([[maybe_unused]] QObject* obj, QEvent* event)
+{
+    if (m_propertyType == ePropertyTexture)
+    {
+        if (event->type() == QEvent::ToolTip)
+        {
+            QHelpEvent* e = (QHelpEvent*)event;
+
+            m_tooltip->AddSpecialContent("TEXTURE", m_path);
+            m_tooltip->TryDisplay(e->globalPos(), m_pathEdit, QToolTipWidget::ArrowDirection::ARROW_RIGHT);
+
+            return true;
+        }
+
+        if (event->type() == QEvent::Leave)
+        {
+            m_tooltip->hide();
+        }
+    }
+
+    return false;
+}
+
+void FileResourceSelectorWidget::SetPropertyType(PropertyType type)
+{
+    if (m_propertyType == type)
+    {
+        return;
+    }
+
+    //if the property type changed for some reason, delete all the existing widgets
+    if (!m_buttons.isEmpty())
+    {
+        qDeleteAll(m_buttons.begin(), m_buttons.end());
+        m_buttons.clear();
+    }
+
+    m_previewToolTip.reset();
+    m_propertyType = type;
+
+    switch (type)
+    {
+    case ePropertyTexture:
+        AddButton(new FileBrowseButton(type));
+        AddButton(new TextureEditButton);
+        m_previewToolTip.reset(new CBitmapToolTip);
+        break;
+    case ePropertyModel:
+    case ePropertyGeomCache:
+    case ePropertyAudioTrigger:
+    case ePropertyAudioSwitch:
+    case ePropertyAudioSwitchState:
+    case ePropertyAudioRTPC:
+    case ePropertyAudioEnvironment:
+    case ePropertyAudioPreloadRequest:
+        AddButton(new ResourceSelectorButton(type));
+        break;
+    case ePropertyFile:
+        AddButton(new FileBrowseButton(type));
+        break;
+    default:
+        break;
+    }
+
+    m_mainLayout->invalidate();
+}
+
+void FileResourceSelectorWidget::AddButton(BrowseButton* button)
+{
+    m_mainLayout->addWidget(button);
+    m_buttons.push_back(button);
+    connect(button, &BrowseButton::PathChanged, this, &FileResourceSelectorWidget::OnPathChanged);
+}
+
+void FileResourceSelectorWidget::OnPathChanged(const QString& path)
+{
+    bool changed = SetPath(path);
+    if (changed)
+    {
+        emit PathChanged(m_path);
+    }
+}
+
+bool FileResourceSelectorWidget::SetPath(const QString& path)
+{
+    bool changed = false;
+
+    const QString newPath = path.toLower();
+    if (m_path != newPath)
+    {
+        m_path = newPath;
+        UpdateWidgets();
+
+        changed = true;
+    }
+
+    return changed;
+}
+
+
+void FileResourceSelectorWidget::UpdateWidgets()
+{
+    m_pathEdit->setText(m_path);
+
+    foreach(BrowseButton * button, m_buttons)
+    {
+        button->SetPath(m_path);
+    }
+
+    if (m_previewToolTip)
+    {
+        m_previewToolTip->SetTool(this, rect());
+    }
+}
+
+QString FileResourceSelectorWidget::GetPath() const
+{
+    return m_path;
+}
+
+
+
+QWidget* FileResourceSelectorWidget::GetLastInTabOrder()
+{
+    return m_buttons.empty() ? nullptr : m_buttons.last();
+}
+
+QWidget* FileResourceSelectorWidget::GetFirstInTabOrder()
+{
+    return m_buttons.empty() ? nullptr : m_buttons.first();
+}
+
+void FileResourceSelectorWidget::UpdateTabOrder()
+{
+    if (m_buttons.count() >= 2)
+    {
+        for (int i = 0; i < m_buttons.count() - 1; ++i)
+        {
+            setTabOrder(m_buttons[i], m_buttons[i + 1]);
+        }
+    }
+}
+
+bool FileResourceSelectorWidget::event(QEvent* event)
+{
+    if (event->type() == QEvent::ToolTip && m_previewToolTip && !m_previewToolTip->isVisible())
+    {
+        if (!m_path.isEmpty())
+        {
+            m_previewToolTip->LoadImage(m_path);
+            m_previewToolTip->setVisible(true);
+        }
+        event->accept();
+        return true;
+    }
+
+    if (event->type() == QEvent::Resize && m_previewToolTip)
+    {
+        m_previewToolTip->SetTool(this, rect());
+    }
+
+    return QWidget::event(event);
+}
+
+QWidget* FileResourceSelectorWidgetHandler::CreateGUI(QWidget* pParent)
+{
+    FileResourceSelectorWidget* newCtrl = aznew FileResourceSelectorWidget(pParent);
+    connect(newCtrl, &FileResourceSelectorWidget::PathChanged, newCtrl, [newCtrl]()
+        {
+            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
+        });
+    return newCtrl;
+}
+
+void FileResourceSelectorWidgetHandler::ConsumeAttribute(FileResourceSelectorWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+{
+    Q_UNUSED(GUI);
+    Q_UNUSED(attrib);
+    Q_UNUSED(attrValue);
+    Q_UNUSED(debugName);
+}
+
+void FileResourceSelectorWidgetHandler::WriteGUIValuesIntoProperty(size_t index, FileResourceSelectorWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
+{
+    Q_UNUSED(index);
+    Q_UNUSED(node);
+    CReflectedVarResource val = instance;
+    val.m_propertyType = GUI->GetPropertyType();
+    val.m_path = GUI->GetPath().toUtf8().data();
+    instance = static_cast<property_t>(val);
+}
+
+bool FileResourceSelectorWidgetHandler::ReadValuesIntoGUI(size_t index, FileResourceSelectorWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
+{
+    Q_UNUSED(index);
+    Q_UNUSED(node);
+    CReflectedVarResource val = instance;
+    GUI->SetPropertyType(val.m_propertyType);
+    GUI->SetPath(val.m_path.c_str());
+    return false;
+}
+
+#include <Controls/ReflectedPropertyControl/moc_PropertyResourceCtrl.cpp>
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
new file mode 100644
index 0000000000..e48370d92c
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
+#define CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include "ReflectedVar.h"
+#include "Util/VariablePropertyType.h"
+#include <QWidget>
+#include <QtWidgets/QToolButton>
+#include <QtCore/QVector>
+#endif
+
+class QLineEdit;
+class QHBoxLayout;
+class CBitmapToolTip;
+class QToolTipWidget;
+
+class BrowseButton
+    : public QToolButton
+{
+    Q_OBJECT
+public:
+    AZ_CLASS_ALLOCATOR(BrowseButton, AZ::SystemAllocator, 0);
+
+    BrowseButton(PropertyType type, QWidget* parent = nullptr);
+
+    void SetPath(const QString& path) { m_path = path; }
+    QString GetPath() const { return m_path; }
+
+    PropertyType GetPropertyType() const {return m_propertyType; }
+
+signals:
+    void PathChanged(const QString& path);
+
+protected:
+    void SetPathAndEmit(const QString& path);
+    virtual void OnClicked() = 0;
+
+    PropertyType m_propertyType;
+    QString m_path;
+};
+
+class FileResourceSelectorWidget
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    AZ_CLASS_ALLOCATOR(FileResourceSelectorWidget, AZ::SystemAllocator, 0);
+    FileResourceSelectorWidget(QWidget* pParent = nullptr);
+
+    bool SetPath(const QString& path);
+    QString GetPath() const;
+    void SetPropertyType(PropertyType type);
+    PropertyType GetPropertyType() const { return m_propertyType; }
+
+    QWidget* GetFirstInTabOrder();
+    QWidget* GetLastInTabOrder();
+    void UpdateTabOrder();
+
+    bool eventFilter(QObject* obj, QEvent* event) override;
+
+signals:
+    void PathChanged(const QString& path);
+
+protected:
+    bool event(QEvent* event) override;
+
+private:
+    void OnAssignClicked();
+    void OnMaterialClicked();
+
+    void UpdateWidgets();
+    void AddButton(BrowseButton* button);
+    void OnPathChanged(const QString& path);
+
+private:
+    QLineEdit* m_pathEdit;
+    PropertyType m_propertyType;
+    QString m_path;
+
+    QHBoxLayout* m_mainLayout;
+    QVector<BrowseButton*> m_buttons;
+    QScopedPointer<CBitmapToolTip> m_previewToolTip;
+    QToolTipWidget* m_tooltip;
+};
+
+class FileResourceSelectorWidgetHandler
+    : QObject
+    , public AzToolsFramework::PropertyHandler < CReflectedVarResource, FileResourceSelectorWidget >
+{
+public:
+    AZ_CLASS_ALLOCATOR(FileResourceSelectorWidgetHandler, AZ::SystemAllocator, 0);
+
+    virtual AZ::u32 GetHandlerName(void) const override  { return AZ_CRC("Resource", 0xbc91f416); }
+    virtual bool IsDefaultHandler() const override { return true; }
+    virtual QWidget* GetFirstInTabOrder(FileResourceSelectorWidget* widget) override { return widget->GetFirstInTabOrder(); }
+    virtual QWidget* GetLastInTabOrder(FileResourceSelectorWidget* widget) override { return widget->GetLastInTabOrder(); }
+    virtual void UpdateWidgetInternalTabbing(FileResourceSelectorWidget* widget) override { widget->UpdateTabOrder(); }
+
+    virtual QWidget* CreateGUI(QWidget* pParent) override;
+    virtual void ConsumeAttribute(FileResourceSelectorWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+    virtual void WriteGUIValuesIntoProperty(size_t index, FileResourceSelectorWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+    virtual bool ReadValuesIntoGUI(size_t index, FileResourceSelectorWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
new file mode 100644
index 0000000000..72328f5661
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
@@ -0,0 +1,92 @@
+/*
+ * 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 : implementation file
+
+#include "EditorDefs.h"
+
+#include "ReflectedPropertiesPanel.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// ReflectedPropertiesPanel dialog
+
+
+ReflectedPropertiesPanel::ReflectedPropertiesPanel(QWidget* pParent)
+    : ReflectedPropertyControl(pParent)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void ReflectedPropertiesPanel::DeleteVars()
+{
+    ClearVarBlock();
+    m_updateCallbacks.clear();
+    m_varBlock = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void ReflectedPropertiesPanel::SetVarBlock(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* updCallback, const char* category)
+{
+    assert(vb);
+
+    m_varBlock = vb;
+
+    RemoveAllItems();
+    m_varBlock = vb;
+    AddVarBlock(m_varBlock, category);
+
+    SetUpdateCallback(AZStd::bind(&ReflectedPropertiesPanel::OnPropertyChanged, this, AZStd::placeholders::_1));
+
+    // When new object set all previous callbacks freed.
+    m_updateCallbacks.clear();
+    if (updCallback)
+    {
+        stl::push_back_unique(m_updateCallbacks, updCallback);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void ReflectedPropertiesPanel::AddVars(CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* updCallback, const char* category)
+{
+    assert(vb);
+
+    bool bNewBlock = false;
+    // Make a clone of properties.
+    if (!m_varBlock)
+    {
+        RemoveAllItems();
+        m_varBlock = vb->Clone(true);
+        AddVarBlock(m_varBlock, category);
+        bNewBlock = true;
+    }
+    m_varBlock->Wire(vb);
+
+    if (bNewBlock)
+    {
+        SetUpdateCallback(AZStd::bind(&ReflectedPropertiesPanel::OnPropertyChanged, this, AZStd::placeholders::_1));
+
+        // When new object set all previous callbacks freed.
+        m_updateCallbacks.clear();
+    }
+
+    if (updCallback)
+    {
+        stl::push_back_unique(m_updateCallbacks, updCallback);
+    }
+}
+
+void ReflectedPropertiesPanel::OnPropertyChanged(IVariable* pVar)
+{
+    std::list<ReflectedPropertyControl::UpdateVarCallback*>::iterator iter;
+    for (iter = m_updateCallbacks.begin(); iter != m_updateCallbacks.end(); ++iter)
+    {
+        (*iter)->operator()(pVar);
+    }
+}
+
+
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
new file mode 100644
index 0000000000..5e78542398
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
@@ -0,0 +1,45 @@
+/*
+ * 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_REFLECTEDPROPERTIESPANEL_H
+#define CRYINCLUDE_EDITOR_REFLECTEDPROPERTIESPANEL_H
+
+#pragma once
+
+#include "Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h"
+#include "Util/Variable.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// ReflectedPropertiesPanel dialog
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+//This class is a port of ReflectedPropertiesPanel to use the ReflectedPropertyControl
+class SANDBOX_API ReflectedPropertiesPanel
+    : public ReflectedPropertyControl
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    ReflectedPropertiesPanel(QWidget* pParent = nullptr);   // standard constructor
+
+    void DeleteVars();
+    void AddVars(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* func = nullptr, const char* category = nullptr);
+
+    void SetVarBlock(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* func = nullptr, const char* category = nullptr);
+
+protected:
+    void OnPropertyChanged(IVariable* pVar);
+
+protected:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    TSmartPtr<CVarBlock> m_varBlock;
+
+    std::list<ReflectedPropertyControl::UpdateVarCallback*> m_updateCallbacks;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+
+#endif // CRYINCLUDE_EDITOR_REFLECTEDPROPERTIESPANEL_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
new file mode 100644
index 0000000000..36b9c6296a
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
@@ -0,0 +1,1289 @@
+/*
+ * 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 "ReflectedPropertyCtrl.h"
+
+// Qt
+#include <QScopedValueRollback>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMenu>
+#include <QScrollArea>
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.hxx>
+#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx>
+#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
+#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
+
+// Editor
+#include "Clipboard.h"
+
+
+ReflectedPropertyControl::ReflectedPropertyControl(QWidget *parent /*= nullptr*/, Qt::WindowFlags windowFlags /*= Qt::WindowFlags()*/)
+    : QWidget(parent, windowFlags)
+    , AzToolsFramework::IPropertyEditorNotify()
+    , m_filterLineEdit(nullptr)
+    , m_filterWidget(nullptr)
+    , m_titleLabel(nullptr)
+    , m_bEnableCallback(true)
+    , m_updateVarFunc(nullptr)
+    , m_updateObjectFunc(nullptr)
+    , m_selChangeFunc(nullptr)
+    , m_undoFunc(nullptr)
+    , m_bStoreUndoByItems(true)
+    , m_bForceModified(false)
+    , m_groupProperties(false)
+    , m_sortProperties(false)
+    , m_bSendCallbackOnNonModified(true)
+    , m_initialized(false)
+    , m_isTwoColumnSection(false)
+{
+    EBUS_EVENT_RESULT(m_serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(m_serializeContext, "Serialization context not available");
+    qRegisterMetaType<IVariable*>("IVariablePtr");
+
+    m_editor = new AzToolsFramework::ReflectedPropertyEditor(nullptr);
+    m_editor->SetAutoResizeLabels(true);
+
+    m_titleLabel = new QLabel;
+    m_titleLabel->hide();
+
+    m_filterWidget = new QWidget;
+    QLabel *label = new QLabel(tr("Search"));
+    m_filterLineEdit = new QLineEdit;
+    QHBoxLayout *filterlayout = new QHBoxLayout(m_filterWidget);
+    filterlayout->addWidget(label);
+    filterlayout->addWidget(m_filterLineEdit);
+    connect(m_filterLineEdit, &QLineEdit::textChanged, this, &ReflectedPropertyControl::RestrictToItemsContaining);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+    mainLayout->addWidget(m_titleLabel, 0, Qt::AlignHCenter);
+    mainLayout->addWidget(m_filterWidget);
+    mainLayout->addWidget(m_editor, 1);
+
+    SetShowFilterWidget(false);
+    setMinimumSize(330, 0);
+}
+
+void ReflectedPropertyControl::Setup(bool showScrollbars /*= true*/, int labelWidth /*= 150*/)
+{
+    if (!m_initialized)
+    {
+        m_editor->Setup(m_serializeContext, this, showScrollbars, labelWidth);
+        m_initialized = true;
+    }
+}
+
+QSize ReflectedPropertyControl::sizeHint() const
+{
+    return m_editor->sizeHint();
+}
+
+ReflectedPropertyItem* ReflectedPropertyControl::AddVarBlock(CVarBlock *varBlock, const char *szCategory /*= nullptr*/)
+{
+    AZ_Assert(m_initialized, "ReflectedPropertyControl not initialized. Setup must be called first.");
+
+    if (!varBlock)
+        return nullptr;
+
+    m_pVarBlock = varBlock;
+
+    if (!m_root)
+    {
+        m_root = new ReflectedPropertyItem(this, nullptr);
+        m_rootContainer.reset(new CPropertyContainer(szCategory ? AZStd::string(szCategory) : AZStd::string()));
+        m_rootContainer->SetAutoExpand(true);
+        m_editor->AddInstance(m_rootContainer.get());
+    }
+
+
+    AZStd::vector<IVariable*> variables(varBlock->GetNumVariables());
+
+    //Copy variables into vector
+    int n = 0;
+    std::generate(variables.begin(), variables.end(), [&n, varBlock]{return varBlock->GetVariable(n++); });
+
+    //filter list based on search string
+    if (!m_filterString.isEmpty())
+    {
+        AZStd::vector<IVariable*> newVariables;
+        for (IVariable* var : variables)
+        {
+            if (QString(var->GetName()).toLower().contains(m_filterString))
+            {
+                newVariables.emplace_back(var);
+            }
+        }
+        variables.swap(newVariables);
+    }
+
+    //sorting if needed.  sort first when grouping to make grouping easier
+    if (m_sortProperties || m_groupProperties)
+    {
+        std::sort(variables.begin(), variables.end(), [](IVariable *var1, IVariable *var2) {return QString::compare(var1->GetName(), var2->GetName(), Qt::CaseInsensitive) <=0; } );
+    }
+
+    CPropertyContainer *parentContainer = m_rootContainer.get();
+    ReflectedPropertyItem *parentItem = m_root;
+    QChar currentGroupInitial;
+    for (auto var : variables)
+    {
+        if (m_groupProperties)
+        {
+            //check to see if this item starts with same letter as last. If not, create a new group for it.
+            const QChar groupInitial = var->GetName().toUpper().at(0);
+            if (groupInitial != currentGroupInitial)
+            {
+                currentGroupInitial = groupInitial;
+                //make new group be the parent for this item
+                parentItem = new ReflectedPropertyItem(this, parentItem);
+
+                QString groupName(groupInitial);
+                parentContainer = new CPropertyContainer(AZStd::string(groupName.toUtf8().data()));
+                parentContainer->SetAutoExpand(false);
+                m_rootContainer->AddProperty(parentContainer);
+            }
+        }
+        ReflectedPropertyItemPtr childItem = new ReflectedPropertyItem(this, parentItem);
+        childItem->SetVariable(var);
+        CReflectedVar *reflectedVar = childItem->GetReflectedVar();
+        parentContainer->AddProperty(reflectedVar);
+    }
+    m_editor->QueueInvalidation(AzToolsFramework::Refresh_EntireTree);
+
+    return parentItem;
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void AddVariable(CVariableBase& varArray, CVariableBase& var, const char* varName, const char* humanVarName, const char* description, IVariable::OnSetCallback* func, void* pUserData, char dataType = IVariable::DT_SIMPLE)
+{
+    if (varName)
+    {
+        var.SetName(varName);
+    }
+    if (humanVarName)
+    {
+        var.SetHumanName(humanVarName);
+    }
+    if (description)
+    {
+        var.SetDescription(description);
+    }
+    var.SetDataType(dataType);
+    var.SetUserData(QVariant::fromValue<void *>(pUserData));
+    if (func)
+    {
+        var.AddOnSetCallback(func);
+    }
+    varArray.AddVariable(&var);
+}
+
+void ReflectedPropertyControl::CreateItems(XmlNodeRef node)
+{
+    CVarBlockPtr out;
+    CreateItems(node, out, nullptr);
+}
+
+void ReflectedPropertyControl::CreateItems(XmlNodeRef node, CVarBlockPtr& outBlockPtr, IVariable::OnSetCallback* func, bool splitCamelCaseIntoWords)
+{
+    SelectItem(0);
+
+    outBlockPtr = new CVarBlock;
+    for (size_t i = 0, iGroupCount(node->getChildCount()); i < iGroupCount; ++i)
+    {
+        XmlNodeRef groupNode = node->getChild(i);
+
+        if (groupNode->haveAttr("hidden"))
+        {
+            bool isGroupHidden = false;
+            groupNode->getAttr("hidden", isGroupHidden);
+            if (isGroupHidden)
+            {
+                // do not create visual editors for this group
+                continue;
+            }
+        }
+
+        CSmartVariableArray group;
+        group->SetName(groupNode->getTag());
+        group->SetHumanName(groupNode->getTag());
+        group->SetDescription("");
+        group->SetDataType(IVariable::DT_SIMPLE);
+        outBlockPtr->AddVariable(&*group);
+
+        for (int k = 0, iChildCount(groupNode->getChildCount()); k < iChildCount; ++k)
+        {
+            XmlNodeRef child = groupNode->getChild(k);
+
+            const char* type;
+            if (!child->getAttr("type", &type))
+            {
+                continue;
+            }
+
+            // read parameter description from the tip tag and from associated console variable
+            QString strDescription;
+            child->getAttr("tip", strDescription);
+            QString strTipCVar;
+            child->getAttr("TipCVar", strTipCVar);
+            if (!strTipCVar.isEmpty())
+            {
+                strTipCVar.replace("*", child->getTag());
+                if (ICVar* pCVar = gEnv->pConsole->GetCVar(strTipCVar.toUtf8().data()))
+                {
+                    if (!strDescription.isEmpty())
+                    {
+                        strDescription += QString("\r\n");
+                    }
+                    strDescription = pCVar->GetHelp();
+
+#ifdef FEATURE_SVO_GI
+                    // Hide or unlock experimental items
+                    if ((pCVar->GetFlags() & VF_EXPERIMENTAL) && strstr(groupNode->getTag(), "Total_Illumination"))
+                    {
+                        AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome outcome;
+                        AzToolsFramework::EditorSettingsAPIBus::BroadcastResult(outcome, &AzToolsFramework::EditorSettingsAPIBus::Handler::GetValue, "Settings\\ExperimentalFeatures|TotalIlluminationEnabled");
+                        AZStd::any outcomeValue = outcome.GetValue<AZStd::any>();
+                        if (outcomeValue.is<bool>())
+                        {
+                            bool featureEnabled = AZStd::any_cast<bool>(outcomeValue);
+                            if (!featureEnabled)
+                            {
+                                continue;
+                            }
+                        }
+                    }
+#endif
+                }
+            }
+            QString humanReadableName;
+            child->getAttr("human", humanReadableName);
+            if (humanReadableName.isEmpty())
+            {
+                humanReadableName = child->getTag();
+
+                if (splitCamelCaseIntoWords)
+                {
+                    for (int index = 1; index < humanReadableName.length() - 1; index++)
+                    {
+                        // insert spaces between words
+                        if ((humanReadableName[index - 1].isLower() && humanReadableName[index].isUpper()) || (humanReadableName[index + 1].isLower() && humanReadableName[index - 1].isUpper() && humanReadableName[index].isUpper()))
+                        {
+                            humanReadableName.insert(index++, ' ');
+                        }
+
+                        // convert single upper cases letters to lower case
+                        if (humanReadableName[index].isUpper() && humanReadableName[index + 1].isLower())
+                        {
+                            humanReadableName[index] = humanReadableName[index].toLower();
+                        }
+                    }
+                }
+            }
+
+            void* pUserData = reinterpret_cast<void*>((i << 16) | k);
+
+            if (!azstricmp(type, "int"))
+            {
+                CSmartVariable<int> intVar;
+                AddVariable(group, intVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData);
+                int nValue(0);
+                if (child->getAttr("value", nValue))
+                {
+                    intVar->Set(nValue);
+                }
+
+                int nMin(0), nMax(0);
+                if (child->getAttr("min", nMin) && child->getAttr("max", nMax))
+                {
+                    intVar->SetLimits(nMin, nMax);
+                }
+            }
+            else if (!azstricmp(type, "float"))
+            {
+                CSmartVariable<float> floatVar;
+                AddVariable(group, floatVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData);
+                float fValue(0.0f);
+                if (child->getAttr("value", fValue))
+                {
+                    floatVar->Set(fValue);
+                }
+
+                float fMin(0), fMax(0);
+                if (child->getAttr("min", fMin) && child->getAttr("max", fMax))
+                {
+                    floatVar->SetLimits(fMin, fMax);
+                }
+            }
+            else if (!azstricmp(type, "vector"))
+            {
+                CSmartVariable<Vec3> vec3Var;
+                AddVariable(group, vec3Var, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData);
+                Vec3 vValue(0, 0, 0);
+                if (child->getAttr("value", vValue))
+                {
+                    vec3Var->Set(vValue);
+                }
+            }
+            else if (!azstricmp(type, "bool"))
+            {
+                CSmartVariable<bool> bVar;
+                AddVariable(group, bVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData);
+                bool bValue(false);
+                if (child->getAttr("value", bValue))
+                {
+                    bVar->Set(bValue);
+                }
+            }
+            else if (!azstricmp(type, "texture"))
+            {
+                CSmartVariable<QString> textureVar;
+                AddVariable(group, textureVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData, IVariable::DT_TEXTURE);
+                const char* textureName;
+                if (child->getAttr("value", &textureName))
+                {
+                    textureVar->Set(textureName);
+                }
+            }
+            else if (!azstricmp(type, "color"))
+            {
+                CSmartVariable<Vec3> colorVar;
+                AddVariable(group, colorVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData, IVariable::DT_COLOR);
+                ColorB color;
+                if (child->getAttr("value", color))
+                {
+                    ColorF colorLinear = ColorGammaToLinear(QColor(color.r, color.g, color.b));
+                    Vec3 colorVec3(colorLinear.r, colorLinear.g, colorLinear.b);
+                    colorVar->Set(colorVec3);
+                }
+            }
+        }
+    }
+
+    AddVarBlock(outBlockPtr);
+
+    InvalidateCtrl();
+}
+
+void ReflectedPropertyControl::ReplaceVarBlock(IVariable *categoryItem, CVarBlock *varBlock)
+{
+    assert(m_root);
+    ReflectedPropertyItem *pCategoryItem = m_root->findItem(categoryItem);
+    if (pCategoryItem)
+    {
+        pCategoryItem->ReplaceVarBlock(varBlock);
+        m_editor->QueueInvalidation(AzToolsFramework::Refresh_EntireTree);
+    }
+}
+
+void ReflectedPropertyControl::ReplaceRootVarBlock(CVarBlock* newVarBlock)
+{
+    const AZStd::string category = m_rootContainer->m_varName;
+    RemoveAllItems();
+    AddVarBlock(newVarBlock, category.c_str());
+}
+
+void ReflectedPropertyControl::UpdateVarBlock(CVarBlock *pVarBlock)
+{
+    UpdateVarBlock(m_root, pVarBlock, m_pVarBlock);
+    m_editor->QueueInvalidation(AzToolsFramework::Refresh_AttributesAndValues);
+}
+
+void ReflectedPropertyControl::UpdateVarBlock(ReflectedPropertyItem* pPropertyItem, IVariableContainer *pSourceContainer, IVariableContainer *pTargetContainer)
+{
+    for (int i = 0; i < pPropertyItem->GetChildCount(); ++i)
+    {
+        ReflectedPropertyItem *pChild = pPropertyItem->GetChild(i);
+
+        if (pChild->GetType() != ePropertyInvalid)
+        {
+            const QString pPropertyVariableName = pChild->GetVariable()->GetName();
+
+            IVariable* pTargetVariable = pTargetContainer->FindVariable(pPropertyVariableName.toUtf8().data());
+            IVariable* pSourceVariable = pSourceContainer->FindVariable(pPropertyVariableName.toUtf8().data());
+
+            if (pSourceVariable && pTargetVariable)
+            {
+                pTargetVariable->SetFlags(pSourceVariable->GetFlags());
+                pTargetVariable->SetDisplayValue(pSourceVariable->GetDisplayValue());
+                pTargetVariable->SetUserData(pSourceVariable->GetUserData());
+
+                UpdateVarBlock(pChild, pSourceVariable, pTargetVariable);
+            }
+        }
+    }
+}
+
+ReflectedPropertyItem* ReflectedPropertyControl::FindItemByVar(IVariable* pVar)
+{
+    return m_root->findItem(pVar);
+}
+
+ReflectedPropertyItem* ReflectedPropertyControl::GetRootItem()
+{
+    return m_root;
+}
+
+int ReflectedPropertyControl::GetContentHeight() const
+{
+    return m_editor->GetContentHeight();
+}
+
+
+void ReflectedPropertyControl::AddCustomPopupMenuPopup(const QString& text, const AZStd::function<void(int)>& handler, const QStringList& items)
+{
+    m_customPopupMenuPopups.push_back(SCustomPopupMenu(text, handler, items));
+}
+
+
+void ReflectedPropertyControl::AddCustomPopupMenuItem(const QString& text, const SCustomPopupItem::Callback handler)
+{
+    m_customPopupMenuItems.push_back(SCustomPopupItem(text, handler));
+}
+
+//////////////////////////////////////////////////////////////////////////
+template<typename T>
+void ReflectedPropertyControl::RemoveCustomPopup(const QString& text, T& customPopup)
+{
+    for (auto itr = customPopup.begin(); itr != customPopup.end(); ++itr)
+    {
+        if (text == itr->m_text)
+        {
+            customPopup.erase(itr);
+            break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void ReflectedPropertyControl::RemoveCustomPopupMenuItem(const QString& text)
+{
+    RemoveCustomPopup(text, m_customPopupMenuItems);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void ReflectedPropertyControl::RemoveCustomPopupMenuPopup(const QString& text)
+{
+    RemoveCustomPopup(text, m_customPopupMenuPopups);
+}
+
+void ReflectedPropertyControl::RestrictToItemsContaining(const QString &searchName)
+{
+   m_filterString = searchName.toLower();
+   RecreateAllItems();
+}
+
+void ReflectedPropertyControl::SetUpdateCallback(const ReflectedPropertyControl::UpdateVarCallback& callback)
+{
+    m_updateVarFunc = callback;
+}
+
+void ReflectedPropertyControl::SetSavedStateKey(AZ::u32 key)
+{
+    m_editor->SetSavedStateKey(key);
+}
+
+void ReflectedPropertyControl::RemoveAllItems()
+{
+    m_editor->ClearInstances();
+    m_rootContainer.reset();
+    m_root.reset();
+}
+
+void ReflectedPropertyControl::ClearVarBlock()
+{
+    RemoveAllItems();
+    m_pVarBlock = 0;
+}
+
+void ReflectedPropertyControl::RecreateAllItems()
+{
+    RemoveAllItems();
+    AddVarBlock(m_pVarBlock);
+}
+
+
+void ReflectedPropertyControl::SetGroupProperties(bool group)
+{
+    m_groupProperties = group;
+    RecreateAllItems();
+}
+
+void ReflectedPropertyControl::SetSortProperties(bool sort)
+{
+    m_sortProperties = sort;
+    RecreateAllItems();
+}
+
+
+void ReflectedPropertyControl::AfterPropertyModified(AzToolsFramework::InstanceDataNode* pNode)
+{
+    if (!pNode)
+        return;
+
+    CReflectedVar *pReflectedVar = GetReflectedVarFromCallbackInstance(pNode);
+    ReflectedPropertyItem *item = m_root->findItem(pReflectedVar);
+    AZ_Assert(item, "No item found in property modification callback");
+    item->OnReflectedVarChanged();
+
+    OnItemChange(item);
+}
+
+
+void ReflectedPropertyControl::SetIsTwoColumnCtrlSection(bool isSection)
+{
+    m_isTwoColumnSection = isSection;
+}
+
+void ReflectedPropertyControl::RequestPropertyContextMenu(AzToolsFramework::InstanceDataNode* pNode, const QPoint& pos)
+{
+    if (!pNode)
+        return;
+
+    CReflectedVar *pReflectedVar = GetReflectedVarFromCallbackInstance(pNode);
+    ReflectedPropertyItem *pItem = m_root->findItem(pReflectedVar);
+    AZ_Assert(pItem, "No item found in Context Menu callback");
+
+    CClipboard clipboard(nullptr);
+
+    // Popup Menu with Event selection.
+    QMenu menu;
+    UINT i = 0;
+
+    const int ePPA_CustomItemBase = 10; // reserved from 10 to 99
+    const int ePPA_CustomPopupBase = 100; // reserved from 100 to x*100+100 where x is size of m_customPopupMenuPopups
+
+    menu.addAction(tr("Copy"), [&]() { OnCopy({ pItem }, false); });
+    menu.addAction(tr("Copy Recursively"), [&]() { OnCopy({ pItem }, true); });
+    if (m_isTwoColumnSection)
+    {
+        // For a two-column control, OnCopyAll will only copy all for this section
+            // Emit a signal to the two-column control if we want to copy all sections
+        menu.addAction(tr("Copy Section"), [&]() { OnCopyAll(); });
+        menu.addAction(tr("Copy All"), [&]() { emit CopyAllSections(); });
+        menu.addSeparator();
+        menu.addAction(tr("Paste"), [&]() { emit PasteAllSections(); })->setEnabled(!clipboard.IsEmpty());
+    }
+    else
+    {
+        menu.addAction(tr("Copy All"), [&]() { OnCopyAll(); });
+        menu.addSeparator();
+        menu.addAction(tr("Paste"), [&]() { OnPaste(); })->setEnabled(!clipboard.IsEmpty());
+    }
+
+
+    if (!m_customPopupMenuItems.empty() || !m_customPopupMenuPopups.empty())
+    {
+        menu.addSeparator();
+    }
+
+    for (auto itr = m_customPopupMenuItems.cbegin(); itr != m_customPopupMenuItems.cend(); ++itr, ++i)
+    {
+        QAction *action = menu.addAction(itr->m_text);
+        action->setData(ePPA_CustomItemBase + i);
+    }
+
+    for (UINT j = 0; j < m_customPopupMenuPopups.size(); ++j)
+    {
+        SCustomPopupMenu* pMenuInfo = &m_customPopupMenuPopups[j];
+        QMenu* pSubMenu = menu.addMenu(pMenuInfo->m_text);
+
+        for (UINT k = 0; k < pMenuInfo->m_subMenuText.size(); ++k)
+        {
+            const UINT uID = ePPA_CustomPopupBase + ePPA_CustomPopupBase * j + k;
+            QAction *action = pSubMenu->addAction(pMenuInfo->m_subMenuText[k]);
+            action->setData(uID);
+        }
+    }
+
+    QAction *result = menu.exec(pos);
+    if (!result)
+    {
+        return;
+    }
+    const int res = result->data().toInt();
+    if (res >= ePPA_CustomItemBase && res < m_customPopupMenuItems.size() + ePPA_CustomItemBase)
+    {
+        m_customPopupMenuItems[res - ePPA_CustomItemBase].m_callback();
+    }
+    else if (res >= ePPA_CustomPopupBase && res < ePPA_CustomPopupBase + ePPA_CustomPopupBase * m_customPopupMenuPopups.size())
+    {
+        const int menuid = res / ePPA_CustomPopupBase - 1;
+        const int option = res % ePPA_CustomPopupBase;
+        m_customPopupMenuPopups[menuid].m_callback(option);
+    }
+}
+void ReflectedPropertyControl::SetSelChangeCallback(SelChangeCallback callback)
+{
+    m_selChangeFunc = callback;
+    m_editor->SetSelectionEnabled(true);
+}
+
+void ReflectedPropertyControl::PropertySelectionChanged(AzToolsFramework::InstanceDataNode *pNode, bool selected)
+{
+    if (!pNode)
+    {
+        return;
+    }
+
+    CReflectedVar *pReflectedVar = GetReflectedVarFromCallbackInstance(pNode);
+    ReflectedPropertyItem *pItem = m_root->findItem(pReflectedVar);
+    AZ_Assert(pItem, "No item found in selectoin change callback");
+
+    if (m_selChangeFunc)
+    {
+        //keep same logic as MFC where pass null if it's deselection
+        m_selChangeFunc(selected ? pItem->GetVariable() : nullptr);
+    }
+}
+
+CReflectedVar * ReflectedPropertyControl::GetReflectedVarFromCallbackInstance(AzToolsFramework::InstanceDataNode *pNode)
+{
+    if (!pNode)
+        return nullptr;
+    const AZ::SerializeContext::ClassData *classData = pNode->GetClassMetadata();
+    if (classData->m_azRtti && classData->m_azRtti->IsTypeOf(CReflectedVar::TYPEINFO_Uuid()))
+        return reinterpret_cast<CReflectedVar *>(pNode->GetInstance(0));
+    else
+        return GetReflectedVarFromCallbackInstance(pNode->GetParent());
+}
+
+
+AzToolsFramework::PropertyRowWidget* ReflectedPropertyControl::FindPropertyRowWidget(ReflectedPropertyItem* item)
+{
+    if (!item)
+    {
+        return nullptr;
+    }
+    const AzToolsFramework::ReflectedPropertyEditor::WidgetList& widgets = m_editor->GetWidgets();
+    for (auto instance : widgets)
+    {
+        if (instance.second->label() == item->GetPropertyName())
+        {
+            return instance.second;
+        }
+    }
+    return nullptr;
+}
+
+
+void ReflectedPropertyControl::OnItemChange(ReflectedPropertyItem *item, bool deferCallbacks)
+{
+    if (!item->IsModified() || !m_bSendCallbackOnNonModified)
+        return;
+
+    // variable updates/changes can trigger widgets being shown/hidden; allow a delay triggering the update
+    // callback until after the current event queue is processed, so that we aren't changing other widgets
+    // as a ton of them are still being created.
+    Qt::ConnectionType connectionType = deferCallbacks ? Qt::QueuedConnection : Qt::DirectConnection;
+    if (m_updateVarFunc != 0 && m_bEnableCallback)
+    {
+        QMetaObject::invokeMethod(this, "DoUpdateCallback", connectionType, Q_ARG(IVariable*, item->GetVariable()));
+    }
+    if (m_updateObjectFunc != 0 && m_bEnableCallback)
+    {
+        // KDAB: This callback has same signature as DoUpdateCallback. I think the only reason there are 2 is because some
+        // EntityObject registers callback and some derived objects want to register their own callback. the normal UpdateCallback
+        // can only be registered for item at a time so the original authors added a 2nd callback function, so we ported it this way.
+        // This can probably get cleaned up to only on callback function with multiple receivers.
+        QMetaObject::invokeMethod(this, "DoUpdateObjectCallback", connectionType, Q_ARG(IVariable*, item->GetVariable()));
+    }
+}
+
+
+void ReflectedPropertyControl::DoUpdateCallback(IVariable *var)
+{
+    // guard against element containing the IVariable being removed during a deferred callback
+    const bool variableStillExists = FindVariable(var);
+    AZ_Assert(variableStillExists, "This variable and the item containing it were destroyed during a deferred callback. Change to non-deferred callback.");
+
+    if (m_updateVarFunc == 0 || !variableStillExists)
+    {
+        return;
+    }
+
+    QScopedValueRollback<bool> rb(m_bEnableCallback, false);
+    m_updateVarFunc(var);
+}
+
+void ReflectedPropertyControl::DoUpdateObjectCallback(IVariable *var)
+{
+    // guard against element containing the IVariable being removed during a deferred callback
+    const bool variableStillExists = FindVariable(var);
+    AZ_Assert(variableStillExists, "This variable and the item containing it were destroyed during a deferred callback. Change to non-deferred callback.");
+
+    if (m_updateVarFunc == 0 || !variableStillExists)
+    {
+        return;
+    }
+
+    QScopedValueRollback<bool> rb(m_bEnableCallback, false);
+    m_updateObjectFunc(var);
+}
+
+void ReflectedPropertyControl::InvalidateCtrl(bool queued)
+{
+    if (queued)
+    {
+        m_editor->QueueInvalidation(AzToolsFramework::Refresh_AttributesAndValues);
+    }
+    else
+    {
+        m_editor->InvalidateAttributesAndValues();
+    }
+}
+
+void ReflectedPropertyControl::RebuildCtrl(bool queued)
+{
+    if (queued)
+    {
+        m_editor->QueueInvalidation(AzToolsFramework::Refresh_EntireTree);
+    }
+    else
+    {
+        m_editor->InvalidateAll();
+    }
+}
+
+bool ReflectedPropertyControl::CallUndoFunc(ReflectedPropertyItem *item)
+{
+    if (!m_undoFunc)
+        return false;
+
+    m_undoFunc(item->GetVariable());
+    return true;
+
+}
+
+void ReflectedPropertyControl::ClearSelection()
+{
+    m_editor->SelectInstance(nullptr);
+}
+
+void ReflectedPropertyControl::SelectItem(ReflectedPropertyItem* item)
+{
+    AzToolsFramework::PropertyRowWidget *widget = FindPropertyRowWidget(item);
+    if (widget)
+    {
+        m_editor->SelectInstance(m_editor->GetNodeFromWidget(widget));
+    }
+}
+
+ReflectedPropertyItem* ReflectedPropertyControl::GetSelectedItem()
+{
+    AzToolsFramework::PropertyRowWidget *widget = m_editor->GetWidgetFromNode(m_editor->GetSelectedInstance());
+    if (widget)
+    {
+       return m_root->findItem(widget->label());
+    }
+    return nullptr;
+}
+
+
+QVector<ReflectedPropertyItem*> ReflectedPropertyControl::GetSelectedItems()
+{
+    auto item = GetSelectedItem();
+    return item == nullptr ? QVector<ReflectedPropertyItem*>() : QVector<ReflectedPropertyItem*>{item};
+}
+
+void ReflectedPropertyControl::OnCopy(QVector<ReflectedPropertyItem*> itemsToCopy, bool bRecursively)
+{
+    if (!itemsToCopy.isEmpty())
+    {
+        CClipboard clipboard(nullptr);
+        auto rootNode = XmlHelpers::CreateXmlNode("PropertyCtrl");
+        for (auto item : itemsToCopy)
+        {
+            CopyItem(rootNode, item, bRecursively);
+        }
+        clipboard.Put(rootNode);
+    }
+}
+
+void ReflectedPropertyControl::OnCopyAll()
+{
+    if (m_root)
+    {
+        CClipboard clipboard(nullptr);
+        auto rootNode = XmlHelpers::CreateXmlNode("PropertyCtrl");
+        OnCopyAll(rootNode);
+        clipboard.Put(rootNode);
+    }
+}
+
+void ReflectedPropertyControl::OnCopyAll(XmlNodeRef rootNode)
+{
+    if (m_root)
+    {
+        for (int i = 0; i < m_root->GetChildCount(); i++)
+        {
+            CopyItem(rootNode, m_root->GetChild(i), true);
+        }
+    }
+}
+
+void ReflectedPropertyControl::OnPaste()
+{
+    CClipboard clipboard(nullptr);
+
+    CUndo undo("Paste Properties");
+
+    XmlNodeRef rootNode = clipboard.Get();
+    SetValuesFromNode(rootNode);
+}
+
+void ReflectedPropertyControl::SetValuesFromNode(XmlNodeRef rootNode)
+{
+    if (!rootNode || !rootNode->isTag("PropertyCtrl"))
+    {
+        return;
+    }
+
+    for (int i = 0; i < rootNode->getChildCount(); i++)
+    {
+        XmlNodeRef node = rootNode->getChild(i);
+        QString value;
+        QString name;
+        node->getAttr("Name", name);
+        node->getAttr("Value", value);
+        auto pItem = m_root->FindItemByFullName(name);
+        if (pItem)
+        {
+            pItem->SetValue(value);
+            // process callbacks immediately. In some cases, like the MaterialEditor the changing
+            // the value of one item will change the properties available in this control
+            // which needs to happen before we paste other values.
+            OnItemChange(pItem, false);
+        }
+    }
+}
+
+void ReflectedPropertyControl::CopyItem(XmlNodeRef rootNode, ReflectedPropertyItem* pItem, bool bRecursively)
+{
+    XmlNodeRef node = rootNode->newChild("PropertyItem");
+    node->setAttr("Name", pItem->GetFullName().toLatin1().data());
+    node->setAttr("Value", pItem->GetVariable()->GetDisplayValue().toLatin1().data());
+    if (bRecursively)
+    {
+        for (int i = 0; i < pItem->GetChildCount(); i++)
+        {
+            CopyItem(rootNode, pItem->GetChild(i), bRecursively);
+        }
+    }
+}
+
+void ReflectedPropertyControl::ReloadValues()
+{
+    if (m_root)
+        m_root->ReloadValues();
+
+    InvalidateCtrl();
+}
+
+void ReflectedPropertyControl::SetShowFilterWidget(bool showFilter)
+{
+    m_filterWidget->setVisible(showFilter);
+}
+
+void ReflectedPropertyControl::SetUndoCallback(UndoCallback &callback)
+{
+    m_undoFunc = callback;
+}
+
+void ReflectedPropertyControl::ClearUndoCallback()
+{
+    m_undoFunc = 0;
+}
+
+bool ReflectedPropertyControl::FindVariable(IVariable *categoryItem) const
+{
+    assert(m_root);
+    if (!m_root)
+    {
+        return false;
+    }
+
+    ReflectedPropertyItem *pItem = m_root->findItem(categoryItem);
+    return pItem != nullptr;
+}
+
+void ReflectedPropertyControl::EnableUpdateCallback(bool bEnable)
+{
+    // Handle case where update callbacks were disabled and we're enabling them now
+    // Need to force immediate invalidation of any queued invalidations made while callbacks were disabled
+    // to make them fire now, while m_bEnableCallback is still false.
+    if (bEnable && !m_bEnableCallback)
+    {
+        m_editor->ForceQueuedInvalidation();
+    }
+    m_bEnableCallback = bEnable;
+}
+
+void ReflectedPropertyControl::SetGrayed([[maybe_unused]] bool grayed)
+{
+    //KDAB_PROPERTYCTRL_PORT_TODO
+    //control should be grayed out but not disabled?
+}
+
+void ReflectedPropertyControl::SetReadOnly(bool readonly)
+{
+    setEnabled(!readonly);
+}
+
+
+void ReflectedPropertyControl::SetMultiSelect([[maybe_unused]] bool multiselect)
+{
+    //KDAB_PROPERTYCTRL_PORT_TODO
+}
+
+void ReflectedPropertyControl::EnableNotifyWithoutValueChange(bool bFlag)
+{
+    m_bForceModified = bFlag;
+}
+
+void ReflectedPropertyControl::SetTitle(const QString &title)
+{
+    m_titleLabel->setText(title);
+    m_titleLabel->setHidden(title.isEmpty());
+}
+
+void ReflectedPropertyControl::ExpandAll()
+{
+    m_editor->ExpandAll();
+}
+
+void ReflectedPropertyControl::CollapseAll()
+{
+    m_editor->CollapseAll();
+}
+
+void ReflectedPropertyControl::Expand(ReflectedPropertyItem* item, bool expand)
+{
+    item->Expand(expand);
+}
+
+void ReflectedPropertyControl::ExpandAllChildren(ReflectedPropertyItem* item, bool recursive)
+{
+    item->ExpandAllChildren(recursive);
+}
+
+TwoColumnPropertyControl::TwoColumnPropertyControl(QWidget *parent /*= nullptr*/)
+    : QWidget(parent)
+    , m_twoColumns(true)
+{
+    QHBoxLayout *mainlayout = new QHBoxLayout(this);
+
+    m_leftContainer = new QWidget;
+    auto leftLayout = new QVBoxLayout(m_leftContainer);
+    leftLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_leftScrollArea = new QScrollArea;
+    m_leftScrollArea->setMinimumWidth(minimumColumnWidth);
+
+    m_leftScrollArea->setWidget(m_leftContainer);
+    m_leftScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_leftScrollArea->setWidgetResizable(true);
+    mainlayout->addWidget(m_leftScrollArea);
+
+    m_rightContainer = new QWidget;
+
+    auto rightLayout = new QVBoxLayout(m_rightContainer);
+    rightLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_rightScrollArea = new QScrollArea;
+    m_rightScrollArea->setMinimumWidth(minimumColumnWidth);
+
+    m_rightScrollArea->setWidget(m_rightContainer);
+    m_rightScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_rightScrollArea->setWidgetResizable(true);
+    mainlayout->addWidget(m_rightScrollArea);
+}
+
+void TwoColumnPropertyControl::Setup([[maybe_unused]] bool showScrollbars /*= true*/, [[maybe_unused]] int labelWidth /*= 150*/)
+{
+}
+void TwoColumnPropertyControl::AddVarBlock(CVarBlock *varBlock, [[maybe_unused]] const char *szCategory /*= nullptr*/)
+{
+    m_pVarBlock = varBlock;
+
+    auto leftLayout = static_cast<QBoxLayout *>(m_leftContainer->layout());
+    auto rightLayout = static_cast<QBoxLayout *>(m_rightContainer->layout());
+
+    for (int i = 0; i < m_pVarBlock->GetNumVariables(); ++i)
+    {
+        CVarBlock *vb = new CVarBlock;
+        PropertyCard *ctrl = new PropertyCard;
+        m_varBlockList.append(vb);
+        m_controlList.append(ctrl);
+        IVariable *var = m_pVarBlock->GetVariable(i);
+        vb->AddVariable(var);
+        ctrl->AddVarBlock(vb);
+
+        if (var->GetFlags() & IVariable::UI_ROLLUP2)
+        {
+            rightLayout->addWidget(ctrl);
+        }
+        else
+        {
+            leftLayout->addWidget(ctrl);
+        }
+
+        ctrl->GetControl()->SetIsTwoColumnCtrlSection(true);
+        connect(ctrl->GetControl(), &ReflectedPropertyControl::CopyAllSections, this, &TwoColumnPropertyControl::OnCopyAll);
+        connect(ctrl->GetControl(), &ReflectedPropertyControl::PasteAllSections, this, &TwoColumnPropertyControl::OnPaste);
+    }
+
+    leftLayout->addStretch(1);
+    rightLayout->addStretch(1);
+}
+
+void TwoColumnPropertyControl::resizeEvent(QResizeEvent *event)
+{
+    const bool twoColumns = event->size().width() >= minimumTwoColumnWidth;
+    if (m_twoColumns != twoColumns)
+    {
+        ToggleTwoColumnLayout();
+    }
+}
+
+void TwoColumnPropertyControl::ToggleTwoColumnLayout()
+{
+    auto leftLayout = static_cast<QBoxLayout *>(m_leftContainer->layout());
+
+    if (m_twoColumns)
+    {
+        // change layout to one column
+        leftLayout->insertWidget(0, m_rightScrollArea->takeWidget());
+        m_rightScrollArea->hide();
+    }
+    else
+    {
+        // change layout to two columns
+        auto item = leftLayout->takeAt(0);
+        m_rightScrollArea->setWidget(item->widget());
+        delete item;
+        m_rightScrollArea->show();
+    }
+
+    m_twoColumns = !m_twoColumns;
+}
+
+void TwoColumnPropertyControl::ReplaceVarBlock(IVariable *categoryItem, CVarBlock *varBlock)
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->ReplaceVarBlock(categoryItem, varBlock);
+    }
+}
+
+void TwoColumnPropertyControl::RemoveAllItems()
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->RemoveAllItems();
+    }
+}
+
+bool TwoColumnPropertyControl::FindVariable(IVariable *categoryItem) const
+{
+    for (auto ctrl : m_controlList)
+    {
+        if (ctrl->GetControl()->FindVariable(categoryItem))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void TwoColumnPropertyControl::InvalidateCtrl()
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->InvalidateCtrl();
+    }
+}
+
+void TwoColumnPropertyControl::RebuildCtrl()
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->RebuildCtrl();
+    }
+}
+
+void TwoColumnPropertyControl::SetStoreUndoByItems(bool bStoreUndoByItems)
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->SetStoreUndoByItems(bStoreUndoByItems);
+    }
+}
+
+void TwoColumnPropertyControl::SetUndoCallback(ReflectedPropertyControl::UndoCallback callback)
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->SetUndoCallback(callback);
+    }
+}
+
+void TwoColumnPropertyControl::ClearUndoCallback()
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->ClearUndoCallback();
+    }
+}
+
+void TwoColumnPropertyControl::EnableUpdateCallback(bool bEnable)
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->EnableUpdateCallback(bEnable);
+    }
+}
+
+void TwoColumnPropertyControl::SetUpdateCallback(ReflectedPropertyControl::UpdateVarCallback callback)
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->SetUpdateCallback(callback);
+    }
+}
+
+void TwoColumnPropertyControl::SetGrayed(bool grayed)
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->SetGrayed(grayed);
+    }
+}
+
+
+void TwoColumnPropertyControl::SetSavedStateKey(const QString &key)
+{
+    for (int i = 0; i < m_controlList.count(); ++i)
+    {
+        m_controlList[i]->GetControl()->SetSavedStateKey(AZ::Crc32((key + QString::number(i)).toUtf8().data()));
+    }
+}
+
+void TwoColumnPropertyControl::ExpandAllChildren(ReflectedPropertyItem* item, bool recursive)
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->ExpandAllChildren(item, recursive);
+    }
+}
+
+void TwoColumnPropertyControl::ExpandAllChildren(bool recursive)
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->ExpandAllChildren(ctrl->GetControl()->GetRootItem(), recursive);
+    }
+}
+
+void TwoColumnPropertyControl::ReloadItems()
+{
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->ReloadValues();
+    }
+}
+
+void TwoColumnPropertyControl::OnCopyAll()
+{
+    CClipboard clipboard(nullptr);
+    auto rootNode = XmlHelpers::CreateXmlNode("PropertyCtrl");
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->OnCopyAll(rootNode);
+    }
+    clipboard.Put(rootNode);
+}
+
+void TwoColumnPropertyControl::OnPaste()
+{
+    CClipboard clipboard(nullptr);
+
+    CUndo undo("Paste Properties");
+
+    XmlNodeRef rootNode = clipboard.Get();
+    for (auto ctrl : m_controlList)
+    {
+        ctrl->GetControl()->SetValuesFromNode(rootNode);
+    }
+}
+
+
+PropertyCard::PropertyCard([[maybe_unused]] QWidget* parent /*= nullptr*/)
+{
+    // create header bar
+    m_header = new AzToolsFramework::ComponentEditorHeader(this);
+    m_header->SetExpandable(true);
+
+    // create property editor
+    m_propertyEditor = new ReflectedPropertyControl(this);
+    m_propertyEditor->Setup(false);
+    m_propertyEditor->GetEditor()->SetHideRootProperties(true);
+    m_propertyEditor->setProperty("ComponentDisabl", true); // used by stylesheet
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+    mainLayout->addWidget(m_header);
+    mainLayout->addWidget(m_propertyEditor);
+    setLayout(mainLayout);
+
+    connect(m_header, &AzToolsFramework::ComponentEditorHeader::OnExpanderChanged, this, &PropertyCard::OnExpanderChanged);
+    connect(m_propertyEditor->GetEditor(), &AzToolsFramework::ReflectedPropertyEditor::OnExpansionContractionDone, this, &PropertyCard::OnExpansionContractionDone);
+
+    SetExpanded(true);
+}
+
+void PropertyCard::AddVarBlock(CVarBlock *varBlock)
+{
+    if (varBlock->GetNumVariables() > 0)
+    {
+        m_header->SetTitle(varBlock->GetVariable(0)->GetName());
+        m_propertyEditor->AddVarBlock(varBlock);
+    }
+}
+
+ReflectedPropertyControl* PropertyCard::GetControl()
+{
+    return m_propertyEditor;
+}
+
+void PropertyCard::SetExpanded(bool expanded)
+{
+    m_header->SetExpanded(expanded);
+    m_propertyEditor->setVisible(expanded);
+}
+
+bool PropertyCard::IsExpanded() const
+{
+    return m_header->IsExpanded();
+}
+
+void PropertyCard::OnExpanderChanged(bool expanded)
+{
+    SetExpanded(expanded);
+    emit OnExpansionContractionDone();
+}
+
+#include <Controls/ReflectedPropertyControl/moc_ReflectedPropertyCtrl.cpp>
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
new file mode 100644
index 0000000000..4f6c8c754e
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
@@ -0,0 +1,375 @@
+/*
+ * 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_UTILS_REFLECTEDPROPERTYCTRL_H
+#define CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYCTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include "Include/EditorCoreAPI.h"
+#include "ReflectedPropertyItem.h"
+#include "ReflectedVar.h"
+#include <QFrame>
+#endif
+
+class QLineEdit;
+class QLabel;
+class QVBoxLayout;
+class PropertyCard;
+class QScrollArea;
+
+namespace AzToolsFramework {
+    class ReflectedPropertyEditor;
+    class PropertyRowWidget;
+    class ComponentEditorHeader;
+}
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+//ReflectedPropertyEditor-based implementation of the MFC CPropertyCtrl API
+class EDITOR_CORE_API ReflectedPropertyControl
+    : public QWidget
+    , public AzToolsFramework::IPropertyEditorNotify
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+        Q_OBJECT
+public:
+    //! For alternative undo.
+    typedef AZStd::function<void(IVariable*)> UndoCallback;
+
+    explicit ReflectedPropertyControl(QWidget* parent = nullptr, Qt::WindowFlags windowFlags = Qt::WindowFlags());
+
+    void Setup(bool showScrollbars = true, int labelWidth = 150);
+
+    ReflectedPropertyItem* AddVarBlock(CVarBlock* varBlock, const char* szCategory = nullptr);
+
+    void CreateItems(XmlNodeRef node);
+    void CreateItems(XmlNodeRef node, CVarBlockPtr& varBlock, IVariable::OnSetCallback* func, bool splitCamelCaseIntoWords = false);
+
+    // Replace category item contents with the specified var block.
+    virtual void ReplaceVarBlock(IVariable* categoryItem, CVarBlock* varBlock);
+
+    //replace top-level var block.  (used to port ctrl->ReplaceVarBlock(ctrl->GetRootItem(), varBlock);
+    virtual void ReplaceRootVarBlock(CVarBlock* newVarBlock);
+
+    void RemoveAllItems();
+
+    bool FindVariable(IVariable* categoryItem) const;
+
+    //! When item change, this callback fired variable that changed.
+    typedef AZStd::function<void(IVariable*)> UpdateVarCallback;
+    //! When item change, update object.
+    typedef AZStd::function<void(IVariable*)> UpdateObjectCallback;
+    //! When selection changes, this callback fired variable that changed.
+    typedef AZStd::function<void(IVariable*)> SelChangeCallback;
+
+    /** Set update callback to be used for this property window.
+    */
+    void SetUpdateCallback(const UpdateVarCallback& callback);
+    void ClearUpdateCallback() { m_updateVarFunc = nullptr; }
+
+    void SetUpdateObjectCallback(UpdateObjectCallback callback) { m_updateObjectFunc = callback; }
+    void ClearUpdateObjectCallback() { m_updateObjectFunc = nullptr; }
+
+    /** Set selchange callback to be used for this property window.
+    */
+    void SetSelChangeCallback(SelChangeCallback callback);
+
+    //set a key that can be used to save/restore expanded state.
+    void SetSavedStateKey(AZ::u32 key);
+
+    void ExpandAll();
+    void CollapseAll();
+
+    virtual void Expand(ReflectedPropertyItem* item, bool expand);
+    void ExpandAllChildren(ReflectedPropertyItem* item, bool recursive);
+
+    //IPropertyEditorNotify Interface
+    void BeforePropertyModified([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode) override {}
+    void AfterPropertyModified(AzToolsFramework::InstanceDataNode* pNode) override;
+    void SetPropertyEditingActive([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode) override {}
+    void SetPropertyEditingComplete([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode) override {}
+    void SealUndoStack() override {}
+    void RequestPropertyContextMenu(AzToolsFramework::InstanceDataNode*, const QPoint&) override;
+    void PropertySelectionChanged(AzToolsFramework::InstanceDataNode *pNode, bool selected) override;
+
+    void SetStoreUndoByItems(bool bStoreUndoByItems) { m_bStoreUndoByItems = bStoreUndoByItems; }
+    bool IsStoreUndoByItems() const { return m_bStoreUndoByItems; }
+
+    void ClearSelection();
+    ReflectedPropertyItem* GetSelectedItem();
+    virtual void SelectItem(ReflectedPropertyItem* item);
+
+    QVector<ReflectedPropertyItem*> GetSelectedItems();
+
+    /** Set alternative undo callback.
+    */
+    void SetUndoCallback(UndoCallback& callback);
+    void ClearUndoCallback();
+
+    /** Enable of disable calling update callback when some values change.
+    */
+    void EnableUpdateCallback(bool bEnable);
+    void SetDeferredUpdateCallback(bool deferred);
+
+    // Control is grayed, but is not readonly.
+    void SetGrayed(bool grayed);
+
+    // Sets control to be read only, User cannot modify content of properties.
+    void SetReadOnly(bool readonly);
+
+    void SetMultiSelect(bool multiSelect);
+
+    void EnableNotifyWithoutValueChange(bool bFlag);
+
+    void CopyItem(XmlNodeRef rootNode, ReflectedPropertyItem* pItem, bool bRecursively);
+
+    // set to false if you don't want to receive callbacks when the item is not modified (when items are expanded etc)
+    void SetCallbackOnNonModified(bool bEnable) { m_bSendCallbackOnNonModified = bEnable; }
+
+    void ReloadValues();
+
+    //whether to group child properties alphabetically under expanding elements
+    void SetGroupProperties(bool group);
+
+    //whether to sort child properties alphabetically
+    void SetSortProperties(bool sort);
+
+    //whether to show line edit for filtering properties
+    void SetShowFilterWidget(bool showFilter);
+
+    // It doesn't add any property item, but instead it updates all property items with
+    // a new variable block (sets display value, flags and user data).
+    virtual void UpdateVarBlock(CVarBlock* pVarBlock);
+
+    //! Find item that reference specified property.
+    ReflectedPropertyItem* FindItemByVar(IVariable* pVar);
+
+    ReflectedPropertyItem* GetRootItem();
+
+    int GetContentHeight() const;
+    int GetVisibleHeight() const {return GetContentHeight();}
+
+    //whether this control is a section of a TwoColumnPropertyCtrl (so we can show correct copy/paste options)
+    void SetIsTwoColumnCtrlSection(bool isSection);
+
+    struct SCustomPopupItem
+    {
+        typedef AZStd::function<void()> Callback;
+
+        QString m_text;
+        Callback m_callback;
+
+        SCustomPopupItem(const QString& text, const Callback& callback)
+            : m_text(text)
+            , m_callback(callback) {}
+    };
+
+    struct SCustomPopupMenu
+    {
+        typedef AZStd::function<void(int)> Callback;
+
+        QString m_text;
+        Callback m_callback;
+        QStringList m_subMenuText;
+
+        SCustomPopupMenu(const QString& text, const Callback& callback, const QStringList& subMenuText)
+            : m_text(text)
+            , m_callback(callback)
+            , m_subMenuText(subMenuText) {}
+    };
+
+    void AddCustomPopupMenuPopup(const QString& text, const AZStd::function<void(int)>& handler, const QStringList& items);
+    void RemoveCustomPopupMenuPopup(const QString& text);
+
+    void AddCustomPopupMenuItem(const QString& text, const SCustomPopupItem::Callback handler);
+    void RemoveCustomPopupMenuItem(const QString& text);
+
+    AzToolsFramework::PropertyRowWidget* FindPropertyRowWidget(ReflectedPropertyItem* item);
+
+    QSize sizeHint() const override;
+    AzToolsFramework::ReflectedPropertyEditor* GetEditor() { return m_editor; }
+
+    void SetValuesFromNode(XmlNodeRef rootNode);
+
+public slots:
+    //invalidates attributes and values
+    void InvalidateCtrl(bool queued = true);
+    void RebuildCtrl(bool queued = true);
+
+    void SetTitle(const QString &title);
+
+    void OnCopy(QVector<ReflectedPropertyItem*> items, bool bRecursively);
+    void OnCopyAll();
+    void OnCopyAll(XmlNodeRef node);
+    void OnPaste();
+
+Q_SIGNALS:
+    void CopyAllSections();
+    void PasteAllSections();
+
+protected:
+    friend class ReflectedPropertyItem;
+
+    virtual void OnItemChange(ReflectedPropertyItem* item, bool deferCallbacks = true);
+    CReflectedVar* GetReflectedVarFromCallbackInstance(AzToolsFramework::InstanceDataNode* pNode);
+    void RecreateAllItems();
+
+    // only shows items containing the string in their name. All items shown if string is empty.
+    void RestrictToItemsContaining(const QString& searchName);
+
+    bool CallUndoFunc(ReflectedPropertyItem* item);
+
+    virtual void UpdateVarBlock(ReflectedPropertyItem* pPropertyItem, IVariableContainer* pSourceContainer, IVariableContainer* pTargetContainer);
+
+    void ClearVarBlock();
+
+private slots:
+    void DoUpdateCallback(IVariable *var);
+    void DoUpdateObjectCallback(IVariable *var);
+
+private:
+    AzToolsFramework::ReflectedPropertyEditor* m_editor;
+    QLineEdit* m_filterLineEdit;
+    QWidget* m_filterWidget;
+    QLabel* m_titleLabel;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    _smart_ptr<CVarBlock> m_pVarBlock;
+    _smart_ptr<ReflectedPropertyItem> m_root;
+    AZStd::unique_ptr<CPropertyContainer> m_rootContainer;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    AZ::SerializeContext* m_serializeContext;
+
+    bool m_bEnableCallback;
+    QString m_filterString;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    UpdateVarCallback m_updateVarFunc;
+    UpdateObjectCallback m_updateObjectFunc;
+    SelChangeCallback m_selChangeFunc;
+    UndoCallback m_undoFunc;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    bool m_bStoreUndoByItems;
+    bool m_bForceModified;
+
+    bool m_groupProperties;
+    bool m_sortProperties;
+    bool m_bSendCallbackOnNonModified;
+    bool m_initialized;
+
+    bool m_isTwoColumnSection;
+
+    //custom popup menu
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    std::vector<SCustomPopupItem> m_customPopupMenuItems;
+    std::vector<SCustomPopupMenu> m_customPopupMenuPopups;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    template<typename T>
+    void RemoveCustomPopup(const QString& text, T& customPopup);
+};
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+class EDITOR_CORE_API TwoColumnPropertyControl
+    : public QWidget
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    Q_OBJECT
+public:
+    TwoColumnPropertyControl(QWidget* parent = nullptr);
+    void Setup(bool showScrollbars = true, int labelWidth = 150);
+
+    void AddVarBlock(CVarBlock* varBlock, const char* szCategory = nullptr);
+
+    // Replace category item contents with the specified var block.
+    virtual void ReplaceVarBlock(IVariable* categoryItem, CVarBlock* varBlock);
+
+    void RemoveAllItems();
+
+    bool FindVariable(IVariable* categoryItem) const;
+
+    void InvalidateCtrl();
+    void RebuildCtrl();
+
+    void SetStoreUndoByItems(bool bStoreUndoByItems);
+
+    /** Set alternative undo callback.
+    */
+    void SetUndoCallback(ReflectedPropertyControl::UndoCallback callback);
+    void ClearUndoCallback();
+
+    /** Enable of disable calling update callback when some values change.
+    */
+    void EnableUpdateCallback(bool bEnable);
+    void SetUpdateCallback(ReflectedPropertyControl::UpdateVarCallback callback);
+
+    // Control is grayed, but is not readonly.
+    void SetGrayed(bool grayed);
+
+    //set a key that can be used to save/restore expanded state.
+    void SetSavedStateKey(const QString& key);
+
+    void ExpandAllChildren(ReflectedPropertyItem* item, bool recursive);
+    void ExpandAllChildren(bool recursive);
+
+    void ReloadItems();
+
+    void OnCopyAll();
+    void OnPaste();
+
+protected:
+    void resizeEvent(QResizeEvent *event) override;
+
+private:
+    void ToggleTwoColumnLayout();
+
+ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QVector<PropertyCard*> m_controlList;
+    QVector<_smart_ptr<CVarBlock>> m_varBlockList;
+    _smart_ptr<CVarBlock> m_pVarBlock;
+ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    QWidget *m_leftContainer;
+    QWidget *m_rightContainer;
+    QScrollArea *m_leftScrollArea;
+    QScrollArea *m_rightScrollArea;
+
+    bool m_twoColumns;
+
+    static const int minimumColumnWidth = 320;
+    static const int minimumTwoColumnWidth = 660;
+};
+
+
+class PropertyCard
+    : public QFrame
+{
+    Q_OBJECT
+public:
+    PropertyCard(QWidget* parent = nullptr);
+
+    void AddVarBlock(CVarBlock *varBlock);
+
+    ReflectedPropertyControl* GetControl();
+
+    void SetExpanded(bool expanded);
+    bool IsExpanded() const;
+
+Q_SIGNALS:
+    void OnExpansionContractionDone();
+
+private:
+    void OnExpanderChanged(bool expanded);
+
+    AzToolsFramework::ComponentEditorHeader* m_header = nullptr;
+    ReflectedPropertyControl* m_propertyEditor = nullptr;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
new file mode 100644
index 0000000000..48e986c905
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
@@ -0,0 +1,685 @@
+/*
+ * 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 "ReflectedPropertyItem.h"
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx>
+
+// Editor
+#include "ReflectedVarWrapper.h"
+#include "ReflectedPropertyCtrl.h"
+#include "Undo/UndoVariableChange.h"
+
+// default number of increments to cover the range of a property - determined experimentally by feel
+const float ReflectedPropertyItem::s_DefaultNumStepIncrements = 500.0f;
+
+
+//A ReflectedVarAdapter for holding IVariableContainers
+
+//The extra ReflectedVarAdapter is the extra case of a container (has children) but also has a value itself.
+//An example is an IVariable array whose type is forced to IVariable::DT_TEXTURE. The base Ivariable has a texture,
+//but it also has children that are parameters of the texture. The ReflectedPropertyEditor does not support this case
+//so we work around by adding the base property to the list of children and showing the value of the base property
+//in the container value space instead of "X Elements"
+
+static ColorF StringToColor(const QString &value)
+{
+    ColorF color;
+    float r, g, b, a;
+    int res = azsscanf(value.toUtf8().data(), "%f,%f,%f,%f", &r, &g, &b, &a);
+    if (res == 4)
+    {
+        color.Set(r, g, b, a);
+    }
+    else if (res == 3)
+    {
+        color.Set(r, g, b);
+    }
+    else
+    {
+        unsigned abgr;
+        azsscanf(value.toUtf8().data(), "%u", &abgr);
+        color = ColorF(abgr);
+    }
+    return color;
+}
+
+class ReflectedVarContainerAdapter : public ReflectedVarAdapter
+{
+public:
+    ReflectedVarContainerAdapter(ReflectedPropertyItem *item, ReflectedPropertyControl *control, ReflectedVarAdapter *variableAdapter = nullptr)
+        : m_extraVariableAdapter(variableAdapter)
+        , m_item(item)
+        , m_propertyCtrl(control)
+        , m_containerVar(new CPropertyContainer(AZStd::string()))
+    {
+        m_containerVar->SetAutoExpand(false);
+    }
+
+    void SetVariable(IVariable *pVariable) override
+    {
+        if (m_extraVariableAdapter)
+            m_extraVariableAdapter->SetVariable(pVariable);
+
+        //Check whether the parent container has autoExpand flag set, and if so, the autoexpand flag for this item
+        //We need to do this because the default IVariable flags has the item expanded, so most items are expanded,
+        //but the ReflectedPropertyEditor expands all ancestors if any item is expanded.
+        //This is not what we want -- the old property editor did not expand ancestors. In case of Material editor,
+        //this expansion can be really expensive!
+        const bool parentIsAutoExpand = m_item->GetParent() == nullptr || m_item->GetParent()->GetContainer() == nullptr || m_item->GetParent()->GetContainer()->m_containerVar->AutoExpand();
+        const bool bDefaultExpand = (pVariable->GetFlags() & IVariable::UI_COLLAPSED) == 0 || (pVariable->GetFlags() & IVariable::UI_AUTO_EXPAND);
+        m_containerVar->SetAutoExpand(parentIsAutoExpand && bDefaultExpand);
+
+        UpdateCommon(pVariable, pVariable);
+    }
+
+    //helps implement ReflectedPropertyControl::ReplaceVarBlock
+    void ReplaceVarBlock(CVarBlock *varBlock)
+    {
+        m_containerVar->Clear();
+        UpdateCommon(m_item->GetVariable(), varBlock);
+    }
+
+    void SyncReflectedVarToIVar(IVariable *pVariable) override
+    {
+        if (m_extraVariableAdapter)
+        {
+            m_extraVariableAdapter->SyncReflectedVarToIVar(pVariable);
+            //update text on parent container. Do not have control update attributes since this will happen anyway as part of updating ReflectedVar
+            updateContainerText(pVariable, false);
+        }
+    };
+
+    void SyncIVarToReflectedVar(IVariable *pVariable) override
+    {
+        if (m_extraVariableAdapter)
+        {
+            m_extraVariableAdapter->SyncIVarToReflectedVar(pVariable);
+            //update text on parent container. Force control to update attributes since this doesn't normally happen when updating an IVar from ReflectedVar
+            updateContainerText(pVariable, true);
+        }
+    };
+
+    CReflectedVar *GetReflectedVar() override { return m_containerVar.data(); }
+
+    bool Contains(CReflectedVar *var) override { return var == m_containerVar.data() || (m_extraVariableAdapter && m_extraVariableAdapter->GetReflectedVar() == var); }
+
+private:
+
+    void UpdateCommon(IVariable *nameVariable, IVariableContainer *childContainer)
+    {
+        m_containerVar->m_varName = nameVariable->GetHumanName().toUtf8().data();
+        m_containerVar->m_description = nameVariable->GetDescription().toUtf8().data();
+        if (m_extraVariableAdapter)
+        {
+            m_containerVar->AddProperty(m_extraVariableAdapter->GetReflectedVar());
+        }
+        //Handle adding empty varblock
+        if (!childContainer)
+            return;
+
+        for (int i = 0; i < childContainer->GetNumVariables(); i++)
+        {
+            AddChild(childContainer->GetVariable(i));
+        }
+    }
+
+    void AddChild(IVariable *var)
+    {
+        if (var->GetFlags() & IVariable::UI_INVISIBLE)
+            return;
+        ReflectedPropertyItemPtr item = new ReflectedPropertyItem(m_propertyCtrl, m_item);
+        item->SetVariable(var);
+        m_containerVar->AddProperty(item->GetReflectedVar());
+    }
+
+    void updateContainerText(IVariable *pVariable, bool updateAttributes)
+    {
+        //set text of the container to the value of the main variable.  If it's empty, use space, otherwise ReflectedPropertyEditor doesn't update it!
+        m_containerVar->SetValueText(pVariable->GetDisplayValue().isEmpty() ? AZStd::string(" ") : AZStd::string(pVariable->GetDisplayValue().toUtf8().data()));
+        if (updateAttributes)
+            m_propertyCtrl->InvalidateCtrl();
+    }
+
+private:
+    //optional adapter for case where this item contains a variable in addition to a container of variables.
+    ReflectedVarAdapter *m_extraVariableAdapter;
+    QScopedPointer<CPropertyContainer> m_containerVar;
+    ReflectedPropertyItem *m_item;
+    ReflectedPropertyControl *m_propertyCtrl;
+};
+
+ReflectedPropertyItem::ReflectedPropertyItem(ReflectedPropertyControl *control, ReflectedPropertyItem *parent)
+    : m_pVariable(nullptr)
+    , m_reflectedVarAdapter(nullptr)
+    , m_reflectedVarContainerAdapter(nullptr)
+    , m_parent(parent)
+    , m_propertyCtrl(control)
+    , m_syncingIVar(false)
+    , m_strNoScriptDefault("<<undefined>>")
+    , m_strScriptDefault(m_strNoScriptDefault)
+{
+    m_type = ePropertyInvalid;
+    m_modified = false;
+    if (parent)
+        parent->AddChild(this);
+
+    m_onSetCallback = AZStd::bind(&ReflectedPropertyItem::OnVariableChange, this, AZStd::placeholders::_1);
+    m_onSetEnumCallback = AZStd::bind(&ReflectedPropertyItem::OnVariableEnumChange, this, AZStd::placeholders::_1);
+}
+
+ReflectedPropertyItem::~ReflectedPropertyItem()
+{
+    // just to make sure we dont double (or infinitely recurse...) delete
+    AddRef();
+
+    if (m_pVariable)
+        ReleaseVariable();
+
+    RemoveAllChildren();
+}
+
+void ReflectedPropertyItem::SetVariable(IVariable *var)
+{
+    if (var == m_pVariable)
+    {
+        // Early exit optimization if setting the same var as the current var.
+        // A common use case, in Track View for example, is to re-use the save var for a property when switching to a new
+        // instance of the same variable. The visible display of the value is often handled by invalidating the property,
+        // but the non-visible attributes, i.e. the range values, are usually set using this method. Thus we reset the ranges
+        // explicitly here when the Ivariable var is the same
+
+        if (m_reflectedVarAdapter)
+            m_reflectedVarAdapter->UpdateRangeLimits(var);
+        return;
+    }
+    _smart_ptr<IVariable> pInputVar = var;
+    // Release previous variable.
+    if (m_pVariable)
+        ReleaseVariable();
+
+    m_pVariable = pInputVar;
+    assert(m_pVariable != NULL);
+
+    m_pVariable->AddOnSetCallback(&m_onSetCallback);
+    m_pVariable->AddOnSetEnumCallback(&m_onSetEnumCallback);
+
+    // Fetch base parameter description
+    Prop::Description desc(m_pVariable);
+    m_type = desc.m_type;
+
+    switch (m_type)
+    {
+    case ePropertyVector2:
+        m_reflectedVarAdapter = new ReflectedVarVector2Adapter;
+        break;
+    case ePropertyVector:
+        m_reflectedVarAdapter = new ReflectedVarVector3Adapter;
+        break;
+    case ePropertyVector4:
+        m_reflectedVarAdapter = new ReflectedVarVector4Adapter;
+        break;
+    case ePropertyFloat:
+    case ePropertyAngle:
+        //if the Description has a valid global enumDB lookup, edit as an enum, otherwise use normal float editor
+        if (desc.m_pEnumDBItem)
+            m_reflectedVarAdapter = new ReflectedVarDBEnumAdapter;
+        else
+            m_reflectedVarAdapter = new ReflectedVarFloatAdapter;
+        break;
+    case ePropertyInt:
+        //if the Description has a valid global enumDB lookup, edit as an enum, otherwise use normal int editor
+        if (desc.m_pEnumDBItem)
+            m_reflectedVarAdapter = new ReflectedVarDBEnumAdapter;
+        else
+            m_reflectedVarAdapter = new ReflectedVarIntAdapter;
+        break;
+    case ePropertyBool:
+        m_reflectedVarAdapter = new ReflectedVarBoolAdapter;
+        break;
+    case ePropertyString:
+        //if the Description has a valid global enumDB lookup, edit as an enum, otherwise use normal string editor
+        if (desc.m_pEnumDBItem)
+            m_reflectedVarAdapter = new ReflectedVarDBEnumAdapter;
+        else
+            m_reflectedVarAdapter = new ReflectedVarStringAdapter;
+        break;
+    case ePropertySelection:
+        m_reflectedVarAdapter = new ReflectedVarEnumAdapter;
+        break;
+    case ePropertyAnimation:
+        m_reflectedVarAdapter = new ReflectedVarAnimationAdapter;
+        break;
+    case ePropertyColor:
+        m_reflectedVarAdapter = new ReflectedVarColorAdapter;
+        break;
+    case ePropertyUser:
+        m_reflectedVarAdapter = new ReflectedVarUserAdapter;
+        break;
+    case ePropertyEquip:
+    case ePropertyReverbPreset:
+    case ePropertyGameToken:
+    case ePropertyMissionObj:
+    case ePropertySequence:
+    case ePropertySequenceId:
+    case ePropertyLocalString:
+    case ePropertyLightAnimation:
+    case ePropertyParticleName:
+        m_reflectedVarAdapter = new ReflectedVarGenericPropertyAdapter(desc.m_type);
+        break;
+    case ePropertyTexture:
+    case ePropertyModel:
+    case ePropertyGeomCache:
+    case ePropertyAudioTrigger:
+    case ePropertyAudioSwitch:
+    case ePropertyAudioSwitchState:
+    case ePropertyAudioRTPC:
+    case ePropertyAudioEnvironment:
+    case ePropertyAudioPreloadRequest:
+    case ePropertyFile:
+        m_reflectedVarAdapter = new ReflectedVarResourceAdapter;
+        break;
+    case ePropertyFloatCurve:
+    case ePropertyColorCurve:
+        m_reflectedVarAdapter = new ReflectedVarSplineAdapter(this, m_type);
+        break;
+    case ePropertyMotion:
+        m_reflectedVarAdapter = new ReflectedVarMotionAdapter;
+        break;
+    default:
+        break;
+    }
+
+    const bool hasChildren = (m_pVariable->GetNumVariables() > 0 || desc.m_type == ePropertyTable || m_pVariable->GetType() == IVariable::ARRAY);
+    //const bool isNotContainerType = (m_pVariable->GetType() != IVariable::ARRAY && desc.m_type != ePropertyTable  && desc.m_type != ePropertyInvalid);
+    if (hasChildren )
+    {
+        m_reflectedVarContainerAdapter = new ReflectedVarContainerAdapter(this, m_propertyCtrl, m_reflectedVarAdapter);
+        m_reflectedVarAdapter = m_reflectedVarContainerAdapter;
+    }
+
+    if (m_reflectedVarAdapter)
+    {
+        m_reflectedVarAdapter->SetVariable(m_pVariable);
+        m_reflectedVarAdapter->SyncReflectedVarToIVar(m_pVariable);
+    }
+
+    m_modified = false;
+}
+
+void ReflectedPropertyItem::ReplaceVarBlock(CVarBlock *varBlock)
+{
+    RemoveAllChildren();
+    if (m_reflectedVarAdapter)
+        m_reflectedVarAdapter->ReplaceVarBlock(varBlock);
+}
+
+void ReflectedPropertyItem::AddChild(ReflectedPropertyItem *item)
+{
+    assert(item);
+    m_childs.push_back(item);
+}
+
+void ReflectedPropertyItem::RemoveAllChildren()
+{
+    for (int i = 0; i < m_childs.size(); i++)
+    {
+        m_childs[i]->m_parent = 0;
+    }
+
+    m_childs.clear();
+}
+
+void ReflectedPropertyItem::RemoveChild(ReflectedPropertyItem* item)
+{
+    for (int i = 0; i < m_childs.size(); i++)
+    {
+        if (m_childs[i] == item)
+        {
+            item->m_parent = nullptr;
+            m_childs.erase(m_childs.begin() + i);
+            return;
+        }
+    }
+}
+
+CReflectedVar * ReflectedPropertyItem::GetReflectedVar() const
+{
+    return m_reflectedVarAdapter ? m_reflectedVarAdapter->GetReflectedVar() : nullptr;
+}
+
+ReflectedPropertyItem * ReflectedPropertyItem::findItem(CReflectedVar *var)
+{
+    if (m_reflectedVarAdapter && m_reflectedVarAdapter->Contains(var) )
+        return this;
+    for (auto child : m_childs)
+    {
+        ReflectedPropertyItem *result = child->findItem(var);
+        if (result)
+            return result;
+    }
+    return nullptr;
+}
+
+
+ReflectedPropertyItem * ReflectedPropertyItem::findItem(IVariable *var)
+{
+    if (m_pVariable == var)
+        return this;
+    for (auto child : m_childs)
+    {
+        ReflectedPropertyItem *result = child->findItem(var);
+        if (result)
+            return result;
+    }
+    return nullptr;
+}
+
+ReflectedPropertyItem* ReflectedPropertyItem::findItem(const QString &name)
+{
+    if (m_pVariable && m_pVariable->GetHumanName() == name)
+        return this;
+    for (auto child : m_childs)
+    {
+        ReflectedPropertyItem *result = child->findItem(name);
+        if (result)
+            return result;
+    }
+    return nullptr;
+
+}
+
+ReflectedPropertyItem * ReflectedPropertyItem::FindItemByFullName(const QString& fullName)
+{
+    if (GetFullName() == fullName)
+    {
+        return this;
+    }
+    for (int i = 0; i < m_childs.size(); ++i)
+    {
+        auto pFound = m_childs[i]->FindItemByFullName(fullName);
+        if (pFound)
+        {
+            return pFound;
+        }
+    }
+    return nullptr;
+}
+
+QString ReflectedPropertyItem::GetName() const
+{
+    return m_pVariable ? m_pVariable->GetHumanName() : QString();
+}
+
+QString ReflectedPropertyItem::GetFullName() const
+{
+    if (m_parent && m_pVariable)
+    {
+        return m_parent->GetFullName() + "::" + m_pVariable->GetName();
+    }
+    else if (m_pVariable)
+    {
+        return m_pVariable->GetName();
+    }
+    else
+    {
+        return {};
+    }
+}
+
+void ReflectedPropertyItem::OnReflectedVarChanged()
+{
+    m_syncingIVar = true;
+    if (m_reflectedVarAdapter)
+    {
+        std::unique_ptr<CUndo> undo;
+        if (!CUndo::IsRecording())
+        {
+            if (!m_propertyCtrl->CallUndoFunc(this))
+                undo.reset(new CUndo((m_pVariable->GetHumanName() + " Modified").toUtf8().data()));
+        }
+
+        m_reflectedVarAdapter->SyncIVarToReflectedVar(m_pVariable);
+
+        if (m_propertyCtrl->IsStoreUndoByItems() && CUndo::IsRecording())
+            CUndo::Record(new CUndoVariableChange(m_pVariable, "PropertyChange"));
+
+        m_modified = true;
+    }
+    m_syncingIVar = false;
+}
+
+void ReflectedPropertyItem::SyncReflectedVarToIVar()
+{
+    if (m_reflectedVarAdapter)
+    {
+        m_reflectedVarAdapter->SyncReflectedVarToIVar(m_pVariable);
+    }
+}
+
+void ReflectedPropertyItem::ReleaseVariable()
+{
+    if (m_pVariable)
+    {
+        // Unwire all from variable.
+        m_pVariable->RemoveOnSetCallback(&m_onSetCallback);
+        m_pVariable->RemoveOnSetEnumCallback(&m_onSetEnumCallback);
+    }
+    m_pVariable = 0;
+    delete m_reflectedVarAdapter;
+    m_reflectedVarAdapter = nullptr;
+}
+
+void ReflectedPropertyItem::OnVariableChange(IVariable* pVar)
+{
+    assert(pVar != 0 && pVar == m_pVariable);
+
+    if (m_syncingIVar)
+        return;
+
+    // When variable changes, invalidate UI.
+    m_modified = true;
+
+    if (m_reflectedVarAdapter)
+    {
+        m_reflectedVarAdapter->OnVariableChange(pVar);
+    }
+    SyncReflectedVarToIVar();
+
+    m_propertyCtrl->InvalidateCtrl();
+}
+
+void ReflectedPropertyItem::OnVariableEnumChange([[maybe_unused]] IVariable* pVar)
+{
+
+    if (m_reflectedVarAdapter && m_reflectedVarAdapter->UpdateReflectedVarEnums())
+    {
+        m_propertyCtrl->InvalidateCtrl(true);
+    }
+}
+
+void ReflectedPropertyItem::ReloadValues()
+{
+    m_modified = false;
+
+    if (m_pVariable)
+        SetVariable(m_pVariable);
+
+    for (int i = 0; i < GetChildCount(); i++)
+    {
+        GetChild(i)->ReloadValues();
+    }
+    SyncReflectedVarToIVar();
+}
+
+
+/** Changes value of item.
+*/
+void ReflectedPropertyItem::SetValue(const QString& sValue, bool bRecordUndo, bool bForceModified)
+{
+    if (!m_pVariable)
+    {
+        return;
+    }
+
+    _smart_ptr<ReflectedPropertyItem> holder = this; // Make sure we are not released during this function.
+
+    QString value = sValue;
+
+    switch (m_type)
+    {
+    case ePropertyBool:
+        if (QString::compare(value, "true", Qt::CaseInsensitive) == 0 || value.toInt() != 0)
+        {
+            value = "1";
+        }
+        else
+        {
+            value = "0";
+        }
+        break;
+
+    case ePropertyVector2:
+        if (!value.contains(','))
+        {
+            value = value + ", " + value;
+        }
+        break;
+
+    case ePropertyVector4:
+        if (!value.contains(','))
+        {
+            value = value + ", " + value + ", " + value + ", " + value;
+        }
+        break;
+
+    case ePropertyVector:
+        if (!value.contains(','))
+        {
+            value = value + ", " + value + ", " + value;
+        }
+        break;
+
+    case ePropertyTexture:
+    case ePropertyModel:
+        value.replace('\\', '/');
+        break;
+    }
+
+    // correct the length of value
+    switch (m_type)
+    {
+    case ePropertyTexture:
+    case ePropertyModel:
+    case ePropertyFile:
+        if (value.length() >= MAX_PATH)
+        {
+            value = value.left(MAX_PATH);
+        }
+        break;
+    }
+
+
+    bool bModified = bForceModified || m_pVariable->GetDisplayValue() != value;
+    bool bStoreUndo = (m_pVariable->GetDisplayValue() != value || bForceModified) && bRecordUndo;
+
+    std::unique_ptr<CUndo> undo;
+    if (bStoreUndo && !CUndo::IsRecording())
+    {
+        if (!m_propertyCtrl->CallUndoFunc(this))
+        {
+            undo.reset(new CUndo((GetName() + " Modified").toUtf8().data()));
+        }
+    }
+
+    if (m_pVariable)
+    {
+        if (bModified)
+        {
+            if (m_propertyCtrl->IsStoreUndoByItems() && bStoreUndo && CUndo::IsRecording())
+            {
+                CUndo::Record(new CUndoVariableChange(m_pVariable, "PropertyChange"));
+            }
+
+            if (bForceModified)
+            {
+                m_pVariable->SetForceModified(true);
+            }
+
+            switch (m_type)
+            {
+            case ePropertyColor:
+            {
+                ColorF color = StringToColor(value);
+                if (m_pVariable->GetType() == IVariable::VECTOR)
+                {
+                    m_pVariable->Set(color.toVec3());
+                }
+                else
+                {
+                    m_pVariable->Set(static_cast<int>(color.pack_abgr8888()));
+                }
+                break;
+            }
+            case ePropertyInvalid:
+                break;
+            default:
+                m_pVariable->SetDisplayValue(value);
+                break;
+            }
+        }
+    }
+    else
+    {
+        if (bModified)
+        {
+            m_modified = true;
+            // If Value changed mark document modified.
+            // Notify parent that this Item have been modified.
+            m_propertyCtrl->OnItemChange(this);
+        }
+    }
+}
+
+void ReflectedPropertyItem::SendOnItemChange()
+{
+    m_propertyCtrl->OnItemChange(this);
+}
+
+void ReflectedPropertyItem::ExpandAllChildren(bool recursive)
+{
+    Expand(true);
+    for (auto child : m_childs)
+    {
+        if (recursive)
+        {
+            child->ExpandAllChildren(recursive);
+        }
+        else
+        {
+            child->Expand(true);
+        }
+    }
+}
+
+void ReflectedPropertyItem::Expand(bool expand)
+{
+    AzToolsFramework::PropertyRowWidget *widget = m_propertyCtrl->FindPropertyRowWidget(this);
+    if (widget)
+    {
+        widget->SetExpanded(expand);
+    }
+}
+
+QString ReflectedPropertyItem::GetPropertyName() const
+{
+    return m_pVariable ? m_pVariable->GetHumanName() : QString();
+}
+
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
new file mode 100644
index 0000000000..2dcf5a2d9a
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
@@ -0,0 +1,170 @@
+/*
+ * 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_UTILS_REFLECTEDPROPERTYITEM_H
+#define CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYITEM_H
+#pragma once
+
+#include "Util/Variable.h"
+#include <Util/VariablePropertyType.h>
+
+namespace AzToolsFramework {
+    class ReflectedPropertyEditor;
+}
+
+class CReflectedVar;
+class CPropertyContainer;
+class ReflectedPropertyControl;
+class ReflectedVarAdapter;
+class ReflectedVarContainerAdapter;
+
+// Class representing a property inside a ReflectedPropertyCtrl.
+// It contains the IVariable and corresponding CReflectedVar for that property
+// and any children properties if the IVariable is a container.
+
+// This class is loosely based on the MFC-based CPropertyItem to make porting easier.
+// The CPropertyItem created editor widgets for each property type, but this class
+// just holds a CReflectedVar and updates it's values. The editing is done by the
+// reflection system and registered property handlers for each CReflectedVar.
+class EDITOR_CORE_API ReflectedPropertyItem
+    : public CRefCountBase
+{
+public:
+    ReflectedPropertyItem(ReflectedPropertyControl* control, ReflectedPropertyItem* parent);
+    ~ReflectedPropertyItem();
+
+    void SetVariable(IVariable* var);
+    IVariable* GetVariable() const { return m_pVariable; }
+
+    void ReplaceVarBlock(CVarBlock* varBlock);
+
+    CReflectedVar* GetReflectedVar() const;
+
+    ReflectedPropertyItem* findItem(CReflectedVar* var);
+    ReflectedPropertyItem* findItem(IVariable* var);
+    ReflectedPropertyItem* findItem(const QString &name);
+    ReflectedPropertyItem* FindItemByFullName(const QString& fullName);
+
+    //update the internal IVariable as result of ReflectedVar changing
+    void OnReflectedVarChanged();
+
+    //update the ReflectedVar to current value of IVar
+    void SyncReflectedVarToIVar();
+
+    //! Return true if this property item is modified.
+    bool IsModified() const { return m_modified; }
+
+    void ReloadValues();
+
+    ReflectedVarContainerAdapter* GetContainer() { return m_reflectedVarContainerAdapter; }
+    ReflectedPropertyItem* GetParent() { return m_parent; }
+
+    /** Get script default value of property item.
+    */
+    virtual bool HasScriptDefault() const { return m_strScriptDefault != m_strNoScriptDefault; };
+
+    /** Get script default value of property item.
+    */
+    virtual QString GetScriptDefault() const { return m_strScriptDefault; };
+
+    /** Set script default value of property item.
+    */
+    virtual void SetScriptDefault(const QString& sScriptDefault) { m_strScriptDefault = sScriptDefault; };
+
+    /** Set script default value of property item.
+    */
+    virtual void ClearScriptDefault() { m_strScriptDefault = m_strNoScriptDefault; };
+
+
+    /** Changes value of item.
+    */
+    virtual void SetValue(const QString& sValue, bool bRecordUndo = true, bool bForceModified = false);
+
+    //hack for calling ReflectedPropertyControl::OnItemChange from a wrapper class
+    //this is used because changes to Splines should not actually change anything in the IVariable,
+    //but we need OnItemChanged as if the IVariable did change.
+    void SendOnItemChange();
+
+    void ExpandAllChildren(bool recursive);
+    void Expand(bool expand);
+
+    QString GetPropertyName() const;
+
+    void AddChild(ReflectedPropertyItem* item);
+    void RemoveAllChildren();
+    void RemoveChild(ReflectedPropertyItem* item);
+
+    // default number of increments to cover the range of a property
+    static const float s_DefaultNumStepIncrements;
+
+    // for a consistent Feel, compute the step size for a numerical slider for the specified min/max, rounded to precision
+    inline static float ComputeSliderStep(float sliderMin, float sliderMax, const float precision = .01f)
+    {
+        float step;
+        step = int_round(((sliderMax - sliderMin) / ReflectedPropertyItem::s_DefaultNumStepIncrements) / precision) * precision;
+        // prevent rounding down to zero
+        return (step > precision) ? step : precision;
+    }
+
+protected:
+    friend class ReflectedPropertyControl;
+
+    //! Release used variable.
+    void ReleaseVariable();
+    //! Callback called when variable change.
+    void OnVariableChange(IVariable* var);
+    void OnVariableEnumChange(IVariable* var);
+
+public:
+    //! Get number of child nodes.
+    int GetChildCount() const { return m_childs.size(); };
+    //! Get Child by id.
+    ReflectedPropertyItem* GetChild(int index) const { return m_childs[index]; }
+    PropertyType GetType() const { return m_type; }
+
+    /** Get name of property item.
+    */
+    virtual QString GetName() const;
+
+    QString GetFullName() const;
+
+protected:
+    PropertyType m_type;
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //The variable being edited.
+    _smart_ptr<IVariable> m_pVariable;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    //holds the CReflectedVar and syncs its value with IVariable when either changes
+    ReflectedVarAdapter* m_reflectedVarAdapter;
+    ReflectedVarContainerAdapter* m_reflectedVarContainerAdapter;
+
+    ReflectedPropertyItem* m_parent;
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    std::vector<_smart_ptr<ReflectedPropertyItem> > m_childs;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    ReflectedPropertyControl* m_propertyCtrl;
+
+    unsigned int m_modified : 1;
+
+    bool m_syncingIVar;
+
+    QString m_strNoScriptDefault;
+    QString m_strScriptDefault;
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    IVariable::OnSetCallback m_onSetCallback;
+    IVariable::OnSetEnumCallback m_onSetEnumCallback;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+typedef _smart_ptr<ReflectedPropertyItem> ReflectedPropertyItemPtr;
+
+
+#endif // CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYITEM_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
new file mode 100644
index 0000000000..2044e78eda
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.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 "EditorDefs.h"
+
+#include "ReflectedVar.h"
+
+// AzCore
+#include <AzCore/Serialization/EditContext.h>
+
+
+bool ReflectedVarInit::s_reflectionDone = false;
+
+void ReflectedVarInit::setupReflection(AZ::SerializeContext* serializeContext)
+{
+    if (!serializeContext)
+        return;
+
+    if (s_reflectionDone)
+        return;
+
+    s_reflectionDone = true;
+
+    serializeContext->Class< CReflectedVar>()
+        ->Version(1)
+        ->Field("description", &CReflectedVar::m_description)
+        ->Field("varName", &CReflectedVar::m_varName);
+
+    serializeContext->Class <CReflectedVarAnimation, CReflectedVar >()
+        ->Version(1)
+        ->Field("animation", &CReflectedVarAnimation::m_animation)
+        ->Field("entityID", &CReflectedVarAnimation::m_entityID)
+        ;
+
+    serializeContext->Class <CReflectedVarResource, CReflectedVar >()
+        ->Version(1)
+        ->Field("path", &CReflectedVarResource::m_path)
+        ->Field("propertyType", &CReflectedVarResource::m_propertyType)
+        ;
+
+    serializeContext->Class< CReflectedVarColor, CReflectedVar>()
+        ->Version(1)
+        ->Field("color", &CReflectedVarColor::m_color);
+
+    serializeContext->Class< CReflectedVarUser, CReflectedVar>()
+        ->Version(1)
+        ->Field("value", &CReflectedVarUser::m_value)
+        ->Field("enableEdit", &CReflectedVarUser::m_enableEdit)
+        ->Field("title", &CReflectedVarUser::m_dialogTitle)
+        ->Field("useTree", &CReflectedVarUser::m_useTree)
+        ->Field("treeSeparator", &CReflectedVarUser::m_treeSeparator)
+        ->Field("itemNames", &CReflectedVarUser::m_itemNames)
+        ->Field("itemDescriptions", &CReflectedVarUser::m_itemDescriptions);
+
+    serializeContext->Class <CReflectedVarSpline, CReflectedVar >()
+        ->Version(1)
+        ->Field("spline", &CReflectedVarSpline::m_spline)
+        ->Field("propertyType", &CReflectedVarSpline::m_propertyType)
+        ;
+
+    serializeContext->Class< CPropertyContainer, CReflectedVar>()
+        ->Version(1)
+        ->Field("properties", &CPropertyContainer::m_properties);
+
+    serializeContext->Class <CReflectedVarMotion, CReflectedVar >()
+        ->Version(1)
+        ->Field("motion", &CReflectedVarMotion::m_motion)
+        ->Field("assetId", &CReflectedVarMotion::m_assetId)
+        ;
+
+    AZ::EditContext* ec = serializeContext->GetEditContext();
+    if (ec)
+    {
+        ec->Class< CReflectedVarAnimation >("VarAnimation", "Animation")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarAnimation::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarAnimation::description)
+            ;
+
+        ec->Class< CReflectedVarResource >("VarResource", "Resource")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarResource::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarResource::description)
+            ;
+
+        ec->Class< CReflectedVarUser >("VarUser", "")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarUser::varName)
+            ->Attribute(AZ::Edit::Attributes::Handler, AZ_CRC("ePropertyUser", 0x65b972c0))
+            ;
+
+        ec->Class< CReflectedVarColor >("VarColor", "")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Color, &CReflectedVarColor::m_color, "Color", "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarColor::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarColor::description)
+            ;
+
+        ec->Class< CReflectedVarSpline >("VarSpline", "")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarSpline::varName)
+            ->Attribute(AZ::Edit::Attributes::Handler, &CReflectedVarSpline::handler)
+            ;
+
+        ec->Class< CPropertyContainer >("PropertyContainer", "")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CPropertyContainer::m_properties, "Properties", "")
+            ->Attribute(AZ::Edit::Attributes::ContainerCanBeModified, false)
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CPropertyContainer::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CPropertyContainer::description)
+            ->Attribute(AZ::Edit::Attributes::Visibility, &CPropertyContainer::GetVisibility)
+            ->Attribute(AZ::Edit::Attributes::AutoExpand, &CPropertyContainer::m_autoExpand)
+            ->Attribute(AZ::Edit::Attributes::ValueText, &CPropertyContainer::m_valueText) //will be ignored if blank
+            ;
+
+        ec->Class< CReflectedVarMotion >("VarMotion", "Motion")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarMotion::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarMotion::description)
+            ;
+    }
+    CReflectedVarString::reflect(serializeContext);
+    CReflectedVarBool::reflect(serializeContext);
+    CReflectedVarFloat::reflect(serializeContext);
+    CReflectedVarInt::reflect(serializeContext);
+    CReflectedVarVector2::reflect(serializeContext);
+    CReflectedVarVector3::reflect(serializeContext);
+    CReflectedVarVector4::reflect(serializeContext);
+    CReflectedVarAny<AZStd::vector<AZStd::string>>::reflect(serializeContext);
+    CReflectedVarEnum<int>::reflect(serializeContext);
+    CReflectedVarEnum<AZStd::string>::reflect(serializeContext);
+    CReflectedVarGenericProperty::reflect(serializeContext);
+}
+
+
+template<class T>
+void CReflectedVarAny<T>::reflect(AZ::SerializeContext* serializeContext)
+{
+    static bool reflected = false;
+    if (reflected)
+        return;
+    reflected = true;
+
+    serializeContext->Class< CReflectedVarAny<T>, CReflectedVar>()
+        ->Version(1)
+        ->Field("value", &CReflectedVarAny<T>::m_value);
+
+    AZ::EditContext* ec = serializeContext->GetEditContext();
+    if (ec)
+    {
+        ec->Class< CReflectedVarAny<T> >("VarAny", "")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CReflectedVarAny<T>::m_value, "Value", "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarAny<T>::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarAny<T>::description)
+            ;
+    }
+}
+
+
+template<class T, class R>
+void CReflectedVarRanged<T, R>::reflect(AZ::SerializeContext* serializeContext)
+{
+    static bool reflected = false;
+    if (reflected)
+        return;
+    reflected = true;
+
+    serializeContext->Class< CReflectedVarRanged<T, R>, CReflectedVar>()
+        ->Version(1)
+        ->Field("value", &CReflectedVarRanged<T, R>::m_value)
+        ->Field("min", &CReflectedVarRanged<T, R>::m_minVal)
+        ->Field("max", &CReflectedVarRanged<T, R>::m_maxVal)
+        ->Field("step", &CReflectedVarRanged<T, R>::m_stepSize)
+        ->Field("softMin", &CReflectedVarRanged<T, R>::m_softMinVal)
+        ->Field("softMax", &CReflectedVarRanged<T, R>::m_softMaxVal)
+        ;
+
+    AZ::EditContext* ec = serializeContext->GetEditContext();
+    if (ec)
+    {
+        ec->Class< CReflectedVarRanged<T, R> >("VarAny", "")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Slider, &CReflectedVarRanged<T, R>::m_value, "Value", "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarRanged<T, R>::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarRanged<T, R>::description)
+            ->Attribute(AZ::Edit::Attributes::Min, &CReflectedVarRanged<T, R>::minValue)
+            ->Attribute(AZ::Edit::Attributes::Max, &CReflectedVarRanged<T, R>::maxValue)
+            ->Attribute(AZ::Edit::Attributes::Step, &CReflectedVarRanged<T, R>::stepSize)
+            ->Attribute(AZ::Edit::Attributes::SoftMin, &CReflectedVarRanged<T, R>::softMinVal)
+            ->Attribute(AZ::Edit::Attributes::SoftMax, &CReflectedVarRanged<T, R>::softMaxVal)
+            ;
+    }
+
+}
+
+
+template<class T>
+void CReflectedVarEnum<T>::reflect(AZ::SerializeContext* serializeContext)
+{
+    static bool reflected = false;
+    if (reflected)
+        return;
+    reflected = true;
+
+    serializeContext->Class< CReflectedVarEnum<T>, CReflectedVar>()
+        ->Version(1)
+        ->Field("value", &CReflectedVarEnum<T>::m_value)
+        ->Field("selectedName", &CReflectedVarEnum<T>::m_selectedEnumName)
+        ->Field("availableValues", &CReflectedVarEnum<T>::m_enums)
+        ;
+
+    AZ::EditContext* ec = serializeContext->GetEditContext();
+    if (ec)
+    {
+        ec->Class< CReflectedVarEnum<T> >("Enum Variable", "")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::ComboBox, &CReflectedVarEnum<T>::m_selectedEnumName, "Value", "")
+            ->Attribute(AZ::Edit::Attributes::StringList, &CReflectedVarEnum<T>::GetEnums)
+            ->Attribute(AZ::Edit::Attributes::ChangeNotify, &CReflectedVarEnum<T>::OnEnumChanged)
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarEnum<T>::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarEnum<T>::description)
+            ;
+    }
+}
+
+
+void CReflectedVarGenericProperty::reflect(AZ::SerializeContext* serializeContext)
+{
+    static bool reflected = false;
+    if (reflected)
+        return;
+    reflected = true;
+
+    serializeContext->Class< CReflectedVarGenericProperty, CReflectedVar>()
+        ->Version(1)
+        ->Field("value", &CReflectedVarGenericProperty::m_value)
+        ->Field("propertyType", &CReflectedVarGenericProperty::m_propertyType)
+        ;
+
+    AZ::EditContext* ec = serializeContext->GetEditContext();
+    if (ec)
+    {
+        ec->Class< CReflectedVarGenericProperty >("GenericProperty", "GenericProperty")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarGenericProperty::varName)
+            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarGenericProperty::description)
+            ->Attribute(AZ::Edit::Attributes::Handler, &CReflectedVarGenericProperty::handler)
+            ;
+    }
+
+}
+
+AZ::u32 CReflectedVarSpline::handler()
+{
+    switch (m_propertyType)
+    {
+    case ePropertyFloatCurve:
+        return AZ_CRC("ePropertyFloatCurve", 0x7440ccce);
+    case ePropertyColorCurve:
+        return AZ_CRC("ePropertyColorCurve", 0xa30da4ec);
+    default:
+        AZ_Assert(false, "CReflectedVarSpline property type must be ePropertyFloatCurve or ePropertyColorCurve");
+        return AZ::Edit::UIHandlers::Default;
+    }
+}
+
+
+AZ::u32 CReflectedVarGenericProperty::handler()
+{
+    switch (m_propertyType)
+    {
+    case ePropertyShader:
+        return AZ_CRC("ePropertyShader", 0xc40932f1);
+    case ePropertyEquip:
+        return AZ_CRC("ePropertyEquip", 0x66ffd290);
+    case ePropertyReverbPreset:
+        return AZ_CRC("ePropertyReverbPreset", 0x51469f38);
+    case ePropertyDeprecated0:
+        return AZ_CRC("ePropertyCustomAction", 0x4ffa5ba5);
+    case ePropertyGameToken:
+        return AZ_CRC("ePropertyGameToken", 0x34855b6f);
+    case ePropertyMissionObj:
+        return AZ_CRC("ePropertyMissionObj", 0x4a2d0dc8);
+    case ePropertySequence:
+        return AZ_CRC("ePropertySequence", 0xdd1c7d44);
+    case ePropertySequenceId:
+        return AZ_CRC("ePropertySequenceId", 0x05983dcc);
+    case ePropertyLocalString:
+        return AZ_CRC("ePropertyLocalString", 0x0cd9609a);
+    case ePropertyLightAnimation:
+        return AZ_CRC("ePropertyLightAnimation", 0x277097da);
+    case ePropertyParticleName:
+        return AZ_CRC("ePropertyParticleName", 0xf44c7133);
+    default:
+        AZ_Assert(false, "No property handlers defined for the property type");
+        return AZ_CRC("Default", 0xe35e00df);
+    }
+}
+
+
+void CPropertyContainer::AddProperty(CReflectedVar *property)
+{
+    if (property)
+        m_properties.push_back(property);
+}
+
+void CPropertyContainer::Clear()
+{
+    m_properties.clear();
+}
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
new file mode 100644
index 0000000000..ac6a07d424
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
@@ -0,0 +1,429 @@
+/*
+ * 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_UTILS_REFLECTEDVAR_H
+#define CRYINCLUDE_EDITOR_UTILS_REFLECTEDVAR_H
+#pragma once
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <algorithm>
+#include <limits>
+#include "Util/VariablePropertyType.h"
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/Math/Vector4.h>
+
+
+//Base class for generic reflected variables
+class CReflectedVar
+{
+public:
+    AZ_RTTI(CReflectedVar, "{9CF461B5-4093-4F7E-9A28-75531F0D046C}")
+
+    CReflectedVar() = default;
+    CReflectedVar(const AZStd::string& name)
+        : m_varName(name){}
+    virtual ~CReflectedVar(){}
+
+    AZStd::string m_varName;
+    AZStd::string m_description;
+};
+
+
+// Reflected container of reflected values.  Also holds ePropertyTable data
+class CPropertyContainer
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI(CPropertyContainer, "{99500790-241A-4274-BAD8-C4510E869FC6}", CReflectedVar)
+    CPropertyContainer(const AZStd::string& name)
+        : CReflectedVar(name) {}
+    CPropertyContainer() = default;
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+
+    void AddProperty(CReflectedVar* property);
+
+    void Clear();
+
+    //If we're an unnamed container, just show our children in flat list.  Otherwise show the container name with children underneath
+    AZ::u32 GetVisibility() const
+    {
+        return m_varName.empty() ? AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20) : AZ_CRC("PropertyVisibility_Show", 0xa43c82dd);
+    }
+
+    void SetAutoExpand(bool autoExpand) { m_autoExpand = autoExpand; }
+    bool AutoExpand() const { return m_autoExpand; }
+
+    AZStd::vector<CReflectedVar*> GetProperties() const { return m_properties; }
+
+    void SetValueText(const AZStd::string& valueText) { m_valueText = valueText; }
+
+    friend class ReflectedVarInit;
+
+private:
+    AZStd::vector<CReflectedVar*> m_properties;
+    bool m_autoExpand = false;
+    AZStd::string m_valueText;
+};
+
+
+template<class T>
+class CReflectedVarAny
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI((CReflectedVarAny<T>, "{EE8293C3-9B1E-470B-9922-2CBB8DA13D78}", T), CReflectedVar)
+
+    CReflectedVarAny(const AZStd::string& name, const T& val = T())
+        : CReflectedVar(name)
+        , m_value(val) {}
+    CReflectedVarAny() = default;
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+
+    static void reflect(AZ::SerializeContext* serializeContext);
+
+    T m_value;
+};
+
+// Class to hold values that have min/max
+// T = data type held in this variable
+// R = data type of the range
+template<class T, class R>
+class CReflectedVarRanged
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI((CReflectedVarRanged, "{6AB4EC29-E17B-4B3B-A153-BFDAA48B8CF8}", T, R), CReflectedVar)
+
+    CReflectedVarRanged(const AZStd::string& name, const T& val = T())
+        : CReflectedVar(name)
+        , m_value(val)
+        , m_minVal(std::numeric_limits<R>::lowest())
+        , m_maxVal(std::numeric_limits<R>::max())
+        , m_stepSize(1)
+        , m_softMinVal(std::numeric_limits<R>::lowest())
+        , m_softMaxVal(std::numeric_limits<R>::max())
+    {}
+    CReflectedVarRanged()
+        : CReflectedVarRanged(AZStd::string(), T()){}
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+
+    R minValue() const { return m_minVal; }
+    R maxValue() const { return m_maxVal; }
+    R stepSize() const { return m_stepSize; }
+    R softMinVal() const { return m_softMinVal; }
+    R softMaxVal() const { return m_softMaxVal; }
+
+    static void reflect(AZ::SerializeContext* serializeContext);
+
+    T m_value;
+    R m_minVal;
+    R m_maxVal;
+    R m_stepSize;
+    R m_softMinVal;
+    R m_softMaxVal;
+};
+
+//name some commonly-used variable types
+template <class T>
+using  CReflectedVarNumeric = CReflectedVarRanged<T, T>;
+
+//ePropertyFloat
+using CReflectedVarFloat = CReflectedVarNumeric<float>;
+
+//ePropertyInt
+using CReflectedVarInt = CReflectedVarNumeric<int>;
+
+//ePropertyString
+using CReflectedVarString = CReflectedVarAny<AZStd::string>;
+
+//ePropertyBool
+using CReflectedVarBool = CReflectedVarAny<bool>;
+
+//ePropertyVector2
+using CReflectedVarVector2 = CReflectedVarRanged<AZ::Vector2, float>;
+
+//ePropertyVector
+using CReflectedVarVector3 = CReflectedVarRanged<AZ::Vector3, float>;
+
+//ePropertyVector4
+using CReflectedVarVector4 = CReflectedVarRanged<AZ::Vector4, float>;
+
+// Class for holding enumerated values, ePropertySelection
+// Keeps a key-value pair values (int, string, float, etc) and names corresponding to each value
+// The names are displayed to user when editing, the values are used by underlying code.
+
+template<class T>
+class CReflectedVarEnum
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI((CReflectedVarEnum<T>, "{40AE7D74-7E3A-41A9-8F71-2BBC3067118B}", T), CReflectedVar)
+
+    CReflectedVarEnum(const AZStd::string& name)
+        : CReflectedVar(name) {}
+    CReflectedVarEnum() = default;
+
+    void setEnums(const AZStd::vector<AZStd::pair<T, AZStd::string> >& enums)
+    {
+        m_enums = enums;
+        if (m_enums.size() > 0)
+        {
+            m_value = m_enums.at(0).first;
+            m_selectedEnumName = m_enums.at(0).second;
+        }
+        else
+        {
+            m_value = T();
+            m_selectedEnumName.clear();
+        }
+    }
+
+    void addEnum(const T& value, const AZStd::string& name)
+    {
+        m_enums.push_back(AZStd::pair<T, AZStd::string>(value, name));
+        if (m_enums.size() == 1)
+        {
+            m_selectedEnumName = name;
+            m_value = value;
+        }
+    }
+
+    void setEnumValue(const T& value)
+    {
+        auto it = std::find_if(m_enums.cbegin(), m_enums.cend(), [value](const AZStd::pair<T, AZStd::string>& item) -> bool { return item.first == value; });
+        if (it != m_enums.end())
+        {
+            m_value = it->first;
+            m_selectedEnumName = it->second;
+        }
+    }
+
+    void setEnumByName(const AZStd::string& name)
+    {
+        auto it = std::find_if(m_enums.cbegin(), m_enums.cend(), [name](const AZStd::pair<T, AZStd::string>& item) -> bool { return item.second == name; });
+        if (it != m_enums.end())
+        {
+            m_value = it->first;
+            m_selectedEnumName = it->second;
+        }
+    }
+
+    void OnEnumChanged()
+    {
+        setEnumByName(m_selectedEnumName);
+    }
+
+    AZStd::vector < AZStd::string> GetEnums() const
+    {
+        AZStd::vector < AZStd::string> returnVal;
+        for (const auto& i : m_enums)
+        {
+            returnVal.push_back(i.second);
+        }
+
+        return returnVal;
+    }
+
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+
+    static void reflect(AZ::SerializeContext* serializeContext);
+
+    T m_value;
+    AZStd::string m_selectedEnumName;
+    AZStd::vector<AZStd::pair<T, AZStd::string> > m_enums;
+};
+
+//Class to hold ePropertyColor (IVariable::DT_COLOR)
+class CReflectedVarColor
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI(CReflectedVarColor, "{CC69E773-B4FA-4B6D-8A46-0B580097B6D2}", CReflectedVar)
+
+    CReflectedVarColor(const AZStd::string& name, AZ::Vector3 color = AZ::Vector3())
+        : CReflectedVar(name)
+        , m_color(color) {}
+    CReflectedVarColor() {}
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+
+    AZ::Vector3 m_color;
+};
+
+//Class to hold ePropertyAnimation (IVariable::DT_ANIMATION )
+class CReflectedVarAnimation
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI(CReflectedVarAnimation, "{635D982E-23EC-463F-8F33-4FC2C19D5673}", CReflectedVar)
+
+    CReflectedVarAnimation(const AZStd::string& name)
+        : CReflectedVar(name)
+        , m_entityID(0)
+    {}
+    CReflectedVarAnimation()
+        : m_entityID(0){}
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+
+    AZStd::string m_animation;
+    AZ::EntityId m_entityID;
+};
+
+//Class to hold:
+// ePropertyTexture          (IVariable::DT_TEXTURE)
+// ePropertyMaterial         (IVariable::DT_MATERIAL)
+// ePropertyModel            (IVariable::DT_OBJECT)
+// ePropertyGeomCache        (IVariable::DT_GEOM_CACHE)
+// ePropertyAudioTrigger        (IVariable::DT_AUDIO_TRIGGER)
+// ePropertyAudioSwitch         (IVariable::DT_AUDIO_SWITCH )
+// ePropertyAudioSwitchState    (IVariable::DT_AUDIO_SWITCH_STATE)
+// ePropertyAudioRTPC           (IVariable::DT_AUDIO_RTPC)
+// ePropertyAudioEnvironment    (IVariable::DT_AUDIO_ENVIRONMENT)
+// ePropertyAudioPreloadRequest (IVariable::DT_AUDIO_PRELOAD_REQUEST)
+
+class CReflectedVarResource
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI(CReflectedVarResource, "{162864C2-0C3E-4B6A-84D3-BBAD975B4FD2}", CReflectedVar)
+
+    CReflectedVarResource(const AZStd::string& name)
+        : CReflectedVar(name)
+        , m_propertyType(ePropertyInvalid)
+    {}
+    CReflectedVarResource()
+        : m_propertyType(ePropertyInvalid){}
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+
+    AZStd::string m_path;
+    PropertyType m_propertyType;
+};
+
+//Class to hold ePropertyUser (IVariable::DT_USERITEMCB)
+class CReflectedVarUser 
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI(CReflectedVarUser, "{A901DA91-3893-4848-9AE8-62C0ED074970}", CReflectedVar)
+
+        CReflectedVarUser(const AZStd::string &name)
+        : CReflectedVar(name)
+        , m_enableEdit(false)
+        , m_useTree(false)
+    {}
+    CReflectedVarUser() : m_enableEdit(false), m_useTree(false) {}
+
+    AZStd::string varName() const { return m_varName; }
+
+    AZStd::string m_value;
+
+    bool m_enableEdit;
+    bool m_useTree;
+    AZStd::string m_dialogTitle;
+    AZStd::string m_treeSeparator;
+    AZStd::vector<AZStd::string> m_itemNames;
+    AZStd::vector<AZStd::string> m_itemDescriptions;
+};
+
+//Class to hold ePropertyAnimation (IVariable::DT_ANIMATION )
+class CReflectedVarSpline
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI(CReflectedVarSpline, "{9A928683-7C84-48BF-8A2E-F7BEC423EE4E}", CReflectedVar)
+
+        CReflectedVarSpline(PropertyType propertyType, const AZStd::string &name)
+        : CReflectedVar(name)
+        , m_spline(0)
+        , m_propertyType(propertyType)
+    {}
+
+    CReflectedVarSpline()
+        : m_spline(0)
+        , m_propertyType(ePropertyInvalid) 
+    {}
+
+    AZStd::string varName() const { return m_varName; }
+    AZ::u32 handler();
+
+    uint64_t m_spline;
+    PropertyType m_propertyType;
+};
+
+//Class to wrap all the many properties that can be represented by a string and edited via a popup
+class CReflectedVarGenericProperty
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI(CReflectedVarGenericProperty, "{C4A34C95-3D71-40CE-86D2-DDE314B33CC5}", CReflectedVar)
+
+    CReflectedVarGenericProperty(PropertyType pType, const AZStd::string& name = AZStd::string(), const AZStd::string& val = AZStd::string())
+        : CReflectedVar(name)
+        , m_propertyType(pType)
+        , m_value(val) {}
+    CReflectedVarGenericProperty()
+        : CReflectedVar()
+        , m_propertyType(ePropertyInvalid){}
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+    PropertyType propertyType() const { return m_propertyType; }
+
+    AZ::u32 handler();
+
+    static void reflect(AZ::SerializeContext* serializeContext);
+
+    PropertyType m_propertyType;
+    AZStd::string m_value;
+};
+
+
+class EDITOR_CORE_API ReflectedVarInit
+{
+public:
+    static void setupReflection(AZ::SerializeContext* serializeContext);
+private:
+    static bool s_reflectionDone;
+};
+
+//Class to hold ePropertyMotion (IVariable::DT_MOTION )
+class CReflectedVarMotion
+    : public CReflectedVar
+{
+public:
+    AZ_RTTI(CReflectedVarMotion, "{66397EFB-620A-40B8-8C66-D6AECF690DF5}", CReflectedVar)
+
+    CReflectedVarMotion(const AZStd::string& name)
+        : CReflectedVar(name)
+        , m_assetId(0) {}
+
+    CReflectedVarMotion()
+        : m_assetId(0) {}
+
+    AZStd::string varName() const { return m_varName; }
+    AZStd::string description() const { return m_description; }
+
+    AZStd::string m_motion;
+    AZ::Data::AssetId m_assetId;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTILS_REFLECTEDVAR_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
new file mode 100644
index 0000000000..ebeef23175
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
@@ -0,0 +1,579 @@
+/*
+ * 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 "ReflectedVarWrapper.h"
+
+// AzCore
+#include <AzCore/Asset/AssetManagerBus.h>
+
+// Editor
+#include "ReflectedPropertyCtrl.h"
+#include "UIEnumsDatabase.h"
+
+namespace {
+
+    //setting the IVariable to itself in property items was trigger to update limits for that variable. 
+    //limits were obtained using IVariable::GetLimits instead of from the Prop::Description
+    template <class T, class R>
+    void setRangeParams(CReflectedVarRanged<T, R> *reflectedVar, IVariable *pVariable, bool updatingExistingVariable = false)
+    {
+        float min, max, step;
+        bool  hardMin, hardMax;
+        if (updatingExistingVariable)
+        {
+            pVariable->GetLimits(min, max, step, hardMin, hardMax);
+        }
+        else
+        {
+            Prop::Description desc(pVariable);
+            min = desc.m_rangeMin;
+            max = desc.m_rangeMax;
+            step = desc.m_step;
+            hardMin = desc.m_bHardMin;
+            hardMax = desc.m_bHardMax;
+        }
+        reflectedVar->m_softMinVal = min;
+        reflectedVar->m_softMaxVal = max;
+
+        if (hardMin)
+        {
+            reflectedVar->m_minVal = min;
+        }
+        else
+        {
+            reflectedVar->m_minVal = std::numeric_limits<int>::lowest();
+        }
+        if (hardMax)
+        {
+            reflectedVar->m_maxVal = max;
+        }
+        else
+        {
+            // There is an issue with assigning std::numeric_limits<int>::max() to a float
+            // A float can't actually represent the value of 2147483647 and clang
+            // compilers actually warn on this fact.
+            // A static_cast is used here to indicate explicit acceptance of the value change here
+            /* The clang compiler warning is below
+              ../Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp:59:38: error: implicit conversion from 'int' to 'float' changes value from 2147483647 to 2147483648 [-Werror,-Wimplicit-int-float-conversion]
+              reflectedVar->m_maxVal = std::numeric_limits<int>::max();
+            */
+            reflectedVar->m_maxVal = static_cast<float>(std::numeric_limits<int>::max());
+        }
+        reflectedVar->m_stepSize = step;
+    }
+}
+
+void ReflectedVarIntAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarInt(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+    UpdateRangeLimits(pVariable);
+    Prop::Description desc(pVariable);
+    m_valueMultiplier = desc.m_valueMultiplier;
+}
+
+void ReflectedVarIntAdapter::UpdateRangeLimits(IVariable *pVariable)
+{
+    setRangeParams<int>(m_reflectedVar.data(), pVariable);
+}
+
+void ReflectedVarIntAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    float value;
+    if (pVariable->GetType() == IVariable::FLOAT)
+    {
+        pVariable->Get(value);
+    }
+    else
+    {
+        int intValue;
+        pVariable->Get(intValue);
+        value = intValue;
+    }
+    m_reflectedVar->m_value = std::round(value * m_valueMultiplier);
+}
+
+void ReflectedVarIntAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    //don't round here.  Often the IVariable is actually a float under-the hood
+    //for example: DT_PERCENT is stored in float (0 to 1) but has ePropertyType::Integer because editor should be an integer editor ranging from 0 to 100.
+    pVariable->Set(m_reflectedVar->m_value / m_valueMultiplier);
+}
+
+
+
+void ReflectedVarFloatAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarFloat(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+    UpdateRangeLimits(pVariable);
+    Prop::Description desc(pVariable);
+    m_valueMultiplier = desc.m_valueMultiplier;
+}
+
+void ReflectedVarFloatAdapter::UpdateRangeLimits(IVariable *pVariable)
+{
+    setRangeParams<float>(m_reflectedVar.data(), pVariable);
+}
+
+void ReflectedVarFloatAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    float value;
+    pVariable->Get(value);
+    m_reflectedVar->m_value = value * m_valueMultiplier;
+}
+
+void ReflectedVarFloatAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->Set(m_reflectedVar->m_value/m_valueMultiplier);
+}
+
+
+
+void ReflectedVarStringAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarString(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+}
+
+void ReflectedVarStringAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    QString value;
+    pVariable->Get(value);
+    m_reflectedVar->m_value = value.toUtf8().data();
+}
+
+void ReflectedVarStringAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->Set(m_reflectedVar->m_value.c_str());
+}
+
+
+
+
+void ReflectedVarBoolAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarBool(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+}
+
+void ReflectedVarBoolAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    bool value;
+    pVariable->Get(value);
+    m_reflectedVar->m_value = value;
+}
+
+void ReflectedVarBoolAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->Set(m_reflectedVar->m_value);
+}
+
+
+
+
+ReflectedVarEnumAdapter::ReflectedVarEnumAdapter()
+    : m_updatingEnums(false)
+    , m_pVariable(nullptr)
+{}
+
+void ReflectedVarEnumAdapter::SetVariable(IVariable *pVariable)
+{
+    m_pVariable = pVariable;
+    Prop::Description desc(pVariable);
+    m_enumList = desc.m_enumList;
+    m_reflectedVar.reset(new CReflectedVarEnum<AZStd::string>(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+    UpdateReflectedVarEnums();
+}
+
+bool ReflectedVarEnumAdapter::UpdateReflectedVarEnums()
+{
+    if (!m_pVariable || m_updatingEnums)
+    {
+        return false;
+    }
+
+    m_updatingEnums = true;
+    //Allow derived classes to populate the IVariable's enumList
+    updateIVariableEnumList(m_pVariable);
+    m_enumList = m_pVariable->GetEnumList();
+    m_updatingEnums = false;
+
+    bool changed = false;
+    //Copy the updated enums to the ReflecteVar
+    if (m_enumList)
+    {
+        const AZStd::vector<AZStd::string> oldEnums = m_reflectedVar->GetEnums();
+
+        AZStd::vector<AZStd::pair<AZStd::string, AZStd::string>> enums;
+        for (uint i = 0; !m_enumList->GetItemName(i).isNull(); i++)
+        {
+            QString sEnumName = m_enumList->GetItemName(i);
+            enums.push_back(AZStd::pair<AZStd::string, AZStd::string>(sEnumName.toUtf8().data(), sEnumName.toUtf8().data()));
+
+        }
+        m_reflectedVar->setEnums(enums);
+
+        changed = m_reflectedVar->GetEnums() != oldEnums;
+        if (changed)
+        {
+            // set the current enum value from the IVariable
+            SyncReflectedVarToIVar(m_pVariable);
+        }
+    }
+    return changed;
+}
+
+void ReflectedVarEnumAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    const AZStd::string value = pVariable->GetDisplayValue().toUtf8().data();
+    m_reflectedVar->setEnumByName(value);
+}
+
+void ReflectedVarEnumAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    QString iVarVal = m_reflectedVar->m_selectedEnumName.c_str();
+    pVariable->SetDisplayValue(iVarVal);
+}
+
+void ReflectedVarEnumAdapter::OnVariableChange([[maybe_unused]] IVariable* pVariable)
+{
+    //setting the enums on the pVariable will cause the variable to change getting us back here
+    //The original property editor did need to update things immediately because it did so when creating the in-place editing control
+    if (!m_updatingEnums)
+    {
+        UpdateReflectedVarEnums();
+    }
+}
+
+void ReflectedVarDBEnumAdapter::SetVariable(IVariable *pVariable)
+{
+    Prop::Description desc(pVariable);
+    m_pEnumDBItem = desc.m_pEnumDBItem;
+    m_reflectedVar.reset(new CReflectedVarEnum<AZStd::string>(pVariable->GetHumanName().toUtf8().data()));
+    if (m_pEnumDBItem)
+    {
+        for (int i = 0; i < m_pEnumDBItem->strings.size(); i++)
+        {
+            QString name = m_pEnumDBItem->strings[i];
+            m_reflectedVar->addEnum( m_pEnumDBItem->NameToValue(name).toUtf8().data(), name.toUtf8().data() );
+        }
+    }
+}
+
+void ReflectedVarDBEnumAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    const AZStd::string valueStr = pVariable->GetDisplayValue().toUtf8().data();
+    const AZStd::string value = m_pEnumDBItem ? AZStd::string(m_pEnumDBItem->ValueToName(valueStr.c_str()).toUtf8().data()) : valueStr;
+    m_reflectedVar->setEnumByName(value);
+
+}
+
+void ReflectedVarDBEnumAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    QString iVarVal = m_reflectedVar->m_selectedEnumName.c_str();
+    if (m_pEnumDBItem)
+    {
+        iVarVal = m_pEnumDBItem->NameToValue(iVarVal);
+    }
+    pVariable->SetDisplayValue(iVarVal);
+}
+
+
+
+void ReflectedVarVector2Adapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarVector2(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+    UpdateRangeLimits(pVariable);
+}
+
+void ReflectedVarVector2Adapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    Vec2 vec;
+    pVariable->Get(vec);
+    m_reflectedVar->m_value = AZ::Vector2(vec.x, vec.y);
+}
+
+void ReflectedVarVector2Adapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->Set(Vec2(m_reflectedVar->m_value.GetX(), m_reflectedVar->m_value.GetY()));
+}
+
+
+void ReflectedVarVector3Adapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarVector3(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+    UpdateRangeLimits(pVariable);
+}
+
+void ReflectedVarVector3Adapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    Vec3 vec;
+    pVariable->Get(vec);
+    m_reflectedVar->m_value = AZ::Vector3(vec.x, vec.y, vec.z);
+}
+
+void ReflectedVarVector3Adapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->Set(Vec3(m_reflectedVar->m_value.GetX(), m_reflectedVar->m_value.GetY(), m_reflectedVar->m_value.GetZ()));
+}
+
+
+void ReflectedVarVector4Adapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarVector4(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+    UpdateRangeLimits(pVariable);
+}
+
+void ReflectedVarVector4Adapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    Vec4 vec;
+    pVariable->Get(vec);
+    m_reflectedVar->m_value = AZ::Vector4(vec.x, vec.y, vec.z, vec.w);
+}
+
+void ReflectedVarVector4Adapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->Set(Vec4(m_reflectedVar->m_value.GetX(), m_reflectedVar->m_value.GetY(), m_reflectedVar->m_value.GetZ(), m_reflectedVar->m_value.GetW()));
+}
+
+
+void ReflectedVarColorAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarColor(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+}
+
+void ReflectedVarColorAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    if (pVariable->GetType() == IVariable::VECTOR)
+    {
+        Vec3 v(0, 0, 0);
+        pVariable->Get(v);
+        const QColor col = ColorLinearToGamma(ColorF(v.x, v.y, v.z));
+        m_reflectedVar->m_color.Set(col.redF(), col.greenF(), col.blueF());
+    }
+    else
+    {
+        int col(0);
+        pVariable->Get(col);
+        const QColor qcolor = ColorToQColor((uint32)col);
+        m_reflectedVar->m_color.Set(qcolor.redF(), qcolor.greenF(), qcolor.blueF());
+    }
+}
+
+void ReflectedVarColorAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    if (pVariable->GetType() == IVariable::VECTOR)
+    {
+        ColorF colLin = ColorGammaToLinear(QColor::fromRgbF(m_reflectedVar->m_color.GetX(), m_reflectedVar->m_color.GetY(), m_reflectedVar->m_color.GetZ()));
+        pVariable->Set(Vec3(colLin.r, colLin.g, colLin.b));
+    }
+    else
+    {
+        int ir = m_reflectedVar->m_color.GetX() * 255.0f;
+        int ig = m_reflectedVar->m_color.GetY() * 255.0f;
+        int ib = m_reflectedVar->m_color.GetZ() * 255.0f;
+
+        pVariable->Set(static_cast<int>(RGB(ir, ig, ib)));
+    }
+}
+
+
+
+void ReflectedVarAnimationAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarAnimation(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+}
+
+void ReflectedVarAnimationAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    m_reflectedVar->m_entityID = static_cast<AZ::EntityId>(pVariable->GetUserData().value<AZ::u64>());
+    m_reflectedVar->m_animation = pVariable->GetDisplayValue().toUtf8().data();
+}
+
+void ReflectedVarAnimationAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->SetUserData(static_cast<AZ::u64>(m_reflectedVar->m_entityID));
+    pVariable->SetDisplayValue(m_reflectedVar->m_animation.c_str());
+
+}
+
+void ReflectedVarResourceAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarResource(pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+}
+
+void ReflectedVarResourceAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    QString path;
+    pVariable->Get(path);
+    m_reflectedVar->m_path = path.toUtf8().data();
+    Prop::Description desc(pVariable);
+    m_reflectedVar->m_propertyType = desc.m_type;
+
+}
+
+void ReflectedVarResourceAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    const bool bForceModified = (m_reflectedVar->m_propertyType == ePropertyGeomCache);
+    pVariable->SetForceModified(bForceModified);
+    pVariable->SetDisplayValue(m_reflectedVar->m_path.c_str());
+
+    //shouldn't be able to change the type, so ignore m_reflecatedVar->m_properyType
+}
+
+
+ReflectedVarGenericPropertyAdapter::ReflectedVarGenericPropertyAdapter(PropertyType propertyType)
+    :m_propertyType(propertyType)
+{}
+
+void ReflectedVarGenericPropertyAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarGenericProperty(m_propertyType, pVariable->GetHumanName().toUtf8().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
+}
+
+void ReflectedVarGenericPropertyAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    QString value;
+    pVariable->Get(value);
+
+    m_reflectedVar->m_value = value.toUtf8().data();
+}
+
+void ReflectedVarGenericPropertyAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->Set(m_reflectedVar->m_value.c_str());
+}
+
+void ReflectedVarUserAdapter::SetVariable(IVariable *pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarUser( pVariable->GetHumanName().toUtf8().data()));
+}
+
+void ReflectedVarUserAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    QString value;
+    pVariable->Get(value);
+    m_reflectedVar->m_value = value.toUtf8().data();
+
+    //extract the list of custom items from the IVariable user data
+    IVariable::IGetCustomItems* pGetCustomItems = static_cast<IVariable::IGetCustomItems*> (pVariable->GetUserData().value<void *>());
+    if (pGetCustomItems != 0)
+    {
+        std::vector<IVariable::IGetCustomItems::SItem> items;
+        QString dlgTitle;
+        // call the user supplied callback to fill-in items and get dialog title
+        bool bShowIt = pGetCustomItems->GetItems(pVariable, items, dlgTitle);
+        if (bShowIt) // if func didn't veto, show the dialog
+        {
+            m_reflectedVar->m_enableEdit = true;
+            m_reflectedVar->m_useTree = pGetCustomItems->UseTree();
+            m_reflectedVar->m_treeSeparator = pGetCustomItems->GetTreeSeparator();
+            m_reflectedVar->m_dialogTitle = dlgTitle.toUtf8().data();
+            m_reflectedVar->m_itemNames.resize(items.size());
+            m_reflectedVar->m_itemDescriptions.resize(items.size());
+
+            QByteArray ba;
+            int i = -1;
+            std::generate(m_reflectedVar->m_itemNames.begin(), m_reflectedVar->m_itemNames.end(), [&items, &i, &ba]() { ++i; ba = items[i].name.toUtf8(); return ba.data(); });
+            i = -1;
+            std::generate(m_reflectedVar->m_itemDescriptions.begin(), m_reflectedVar->m_itemDescriptions.end(), [&items, &i, &ba]() { ++i; ba = items[i].desc.toUtf8(); return ba.data(); });
+
+        }
+    }
+    else
+    {
+        m_reflectedVar->m_enableEdit = false;
+    }
+}
+
+void ReflectedVarUserAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->Set(m_reflectedVar->m_value.c_str());
+}
+
+
+ReflectedVarSplineAdapter::ReflectedVarSplineAdapter(ReflectedPropertyItem *parentItem, PropertyType propertyType)
+    : m_propertyType(propertyType)
+    , m_bDontSendToControl(false)
+    , m_parentItem(parentItem)
+{
+}
+
+void ReflectedVarSplineAdapter::SetVariable(IVariable* pVariable)
+{
+    m_reflectedVar.reset(new CReflectedVarSpline(m_propertyType, pVariable->GetHumanName().toUtf8().data()));
+
+}
+
+void ReflectedVarSplineAdapter::SyncReflectedVarToIVar(IVariable* pVariable)
+{
+    if (!m_bDontSendToControl)
+    {
+        m_reflectedVar->m_spline = reinterpret_cast<uint64_t>(pVariable->GetSpline());
+    }
+}
+
+
+void ReflectedVarSplineAdapter::SyncIVarToReflectedVar(IVariable* pVariable)
+{
+    // Splines update variables directly so don't call OnVariableChange or SetValue here or values will be overwritten.
+
+    // Call OnSetValue to force this field to notify this variable that its model has changed without going through the
+    // full OnVariableChange pass
+    //
+    // Set m_bDontSendToControl to prevent the control's data from being overwritten (as the variable's data won't
+    // necessarily be up to date vs the controls at the point this happens).
+    m_bDontSendToControl = true;
+    pVariable->OnSetValue(false);
+    m_bDontSendToControl = false;
+
+    m_parentItem->SendOnItemChange();
+}
+
+void ReflectedVarMotionAdapter::SetVariable(IVariable *pVariable)
+{
+    // Create new reflected var
+    m_reflectedVar.reset(new CReflectedVarMotion(pVariable->GetHumanName().toLatin1().data()));
+    m_reflectedVar->m_description = pVariable->GetDescription().toLatin1().data();
+
+    // Set the asset id
+    AZStd::string stringGuid = pVariable->GetDisplayValue().toLatin1().data();
+    AZ::Uuid guid(stringGuid.c_str(), stringGuid.length());
+    AZ::u32 subId = pVariable->GetUserData().value<AZ::u32>();
+    m_reflectedVar->m_assetId = AZ::Data::AssetId(guid, subId);
+
+    // Lookup Filename by assetId and get the filename part of the description
+    EBUS_EVENT_RESULT(m_reflectedVar->m_motion, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, m_reflectedVar->m_assetId);
+}
+
+void ReflectedVarMotionAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
+{
+    AZStd::string stringGuid = pVariable->GetDisplayValue().toLatin1().data();
+    AZ::Uuid guid(stringGuid.c_str(), stringGuid.length());
+    AZ::u32 subId = pVariable->GetUserData().value<AZ::u32>();
+    m_reflectedVar->m_assetId = AZ::Data::AssetId(guid, subId);
+
+    // Lookup Filename by assetId and get the filename part of the description
+    EBUS_EVENT_RESULT(m_reflectedVar->m_motion, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, m_reflectedVar->m_assetId);
+}
+
+void ReflectedVarMotionAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
+{
+    pVariable->SetUserData(m_reflectedVar->m_assetId.m_subId);
+    pVariable->SetDisplayValue(m_reflectedVar->m_assetId.m_guid.ToString<AZStd::string>().c_str());
+}
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
new file mode 100644
index 0000000000..c04bc6431c
--- /dev/null
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
@@ -0,0 +1,316 @@
+/*
+ * 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_UTILS_REFLECTEDVARWRAPPER_H
+#define CRYINCLUDE_EDITOR_UTILS_REFLECTEDVARWRAPPER_H
+#pragma once
+
+#include "Util/Variable.h"
+#include <Util/VariablePropertyType.h>
+#include "ReflectedVar.h"
+
+#include <QScopedPointer>
+
+struct CUIEnumsDatabase_SEnum;
+class ReflectedPropertyItem;
+
+// Class to wrap the CReflectedVars and sync them with corresponding IVariable.
+// Most of this code is ported from CPropertyItem functions that marshal data between
+// IVariable and editor widgets.
+
+class EDITOR_CORE_API ReflectedVarAdapter
+{
+public:
+    virtual ~ReflectedVarAdapter(){};
+
+    // update the range limits in CReflectedVar to range specified in IVariable
+    virtual void UpdateRangeLimits([[maybe_unused]] IVariable* pVariable) {};
+
+    //set IVariable for this property and create a CReflectedVar to represent it
+    virtual void SetVariable(IVariable* pVariable) = 0;
+
+    //update the ReflectedVar to current value of IVar
+    virtual void SyncReflectedVarToIVar(IVariable* pVariable) = 0;
+
+    //update the internal IVariable as result of ReflectedVar changing
+    virtual void SyncIVarToReflectedVar(IVariable* pVariable) = 0;
+
+    // Callback called when variable change. SyncReflectedVarToIVar will be called after
+    virtual void OnVariableChange([[maybe_unused]] IVariable* var) {};
+
+    virtual bool UpdateReflectedVarEnums() { return false; }
+
+    virtual CReflectedVar* GetReflectedVar() = 0;
+
+    //needed for containers that can have new values filled in
+    virtual void ReplaceVarBlock([[maybe_unused]] CVarBlock* varBlock) {};
+
+    virtual bool Contains(CReflectedVar* var) { return GetReflectedVar() == var; }
+};
+
+
+class EDITOR_CORE_API ReflectedVarIntAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void UpdateRangeLimits(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarInt > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    float m_valueMultiplier = 1.0f;
+};
+
+class EDITOR_CORE_API ReflectedVarFloatAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void UpdateRangeLimits(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarFloat > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    float m_valueMultiplier = 1.0f;
+};
+
+class EDITOR_CORE_API ReflectedVarStringAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarString > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+class EDITOR_CORE_API ReflectedVarBoolAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarBool > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+class EDITOR_CORE_API ReflectedVarEnumAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    ReflectedVarEnumAdapter();
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    virtual void OnVariableChange(IVariable* var);
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+
+protected:
+    //update the ReflectedVar with the allowable enum options
+    bool UpdateReflectedVarEnums() override;
+    
+    //virtual function to allow derived classes to update the enum list before syncing with ReflectedVar.
+    virtual void updateIVariableEnumList([[maybe_unused]] IVariable* pVariable) {};
+
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarEnum<AZStd::string>  > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    IVariable* m_pVariable;
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    IVarEnumListPtr m_enumList;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    bool m_updatingEnums;
+};
+
+class EDITOR_CORE_API ReflectedVarDBEnumAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarEnum<AZStd::string>  > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    CUIEnumsDatabase_SEnum* m_pEnumDBItem;
+};
+
+class EDITOR_CORE_API ReflectedVarVector2Adapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarVector2 > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+class EDITOR_CORE_API ReflectedVarVector3Adapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarVector3 > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+class EDITOR_CORE_API ReflectedVarVector4Adapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarVector4 > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+
+class EDITOR_CORE_API ReflectedVarColorAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarColor > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+class EDITOR_CORE_API ReflectedVarAnimationAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarAnimation > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+class EDITOR_CORE_API ReflectedVarResourceAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarResource> m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+class EDITOR_CORE_API ReflectedVarUserAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable *pVariable) override;
+    void SyncReflectedVarToIVar(IVariable *pVariable) override;
+    void SyncIVarToReflectedVar(IVariable *pVariable) override;
+    CReflectedVar *GetReflectedVar() override {
+        return m_reflectedVar.data();
+    }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarUser> m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+class EDITOR_CORE_API ReflectedVarSplineAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    ReflectedVarSplineAdapter(ReflectedPropertyItem *parentItem, PropertyType propertyType);
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override {
+        return m_reflectedVar.data();
+    }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarSpline > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    bool m_bDontSendToControl;
+    PropertyType m_propertyType;
+    ReflectedPropertyItem *m_parentItem;
+};
+
+
+class EDITOR_CORE_API ReflectedVarGenericPropertyAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    ReflectedVarGenericPropertyAdapter(PropertyType propertyType);
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarGenericProperty > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    PropertyType m_propertyType;
+};
+
+class EDITOR_CORE_API ReflectedVarMotionAdapter
+    : public ReflectedVarAdapter
+{
+public:
+    void SetVariable(IVariable* pVariable) override;
+    void SyncReflectedVarToIVar(IVariable* pVariable) override;
+    void SyncIVarToReflectedVar(IVariable* pVariable) override;
+    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
+private:
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QScopedPointer<CReflectedVarMotion > m_reflectedVar;
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTILS_REFLECTEDVARWRAPPER_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/resources/apply.png b/Code/Editor/Controls/ReflectedPropertyControl/resources/apply.png
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/resources/apply.png
rename to Code/Editor/Controls/ReflectedPropertyControl/resources/apply.png
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/resources/file_browse.png b/Code/Editor/Controls/ReflectedPropertyControl/resources/file_browse.png
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/resources/file_browse.png
rename to Code/Editor/Controls/ReflectedPropertyControl/resources/file_browse.png
diff --git a/Code/Editor/Controls/SplineCtrl.cpp b/Code/Editor/Controls/SplineCtrl.cpp
new file mode 100644
index 0000000000..851e38576b
--- /dev/null
+++ b/Code/Editor/Controls/SplineCtrl.cpp
@@ -0,0 +1,835 @@
+/*
+ * 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 "SplineCtrl.h"
+
+// Qt
+#include <QPainter>
+#include <QPainterPath>
+#include <QToolTip>
+
+// Editor
+#include "TimelineCtrl.h"
+
+
+#define MIN_TIME_EPSILON 0.01f
+
+//////////////////////////////////////////////////////////////////////////
+CSplineCtrl::CSplineCtrl(QWidget* parent)
+    : QWidget(parent)
+{
+    m_nActiveKey = -1;
+    m_nHitKeyIndex = -1;
+    m_nKeyDrawRadius = 3;
+    m_bTracking = false;
+    m_pSpline = 0;
+    m_gridX = 10;
+    m_gridY = 10;
+    m_fMinTime = -1;
+    m_fMaxTime = 1;
+    m_fMinValue = -1;
+    m_fMaxValue = 1;
+    m_fTooltipScaleX = 1;
+    m_fTooltipScaleY = 1;
+    m_bLockFirstLastKey = false;
+    m_pTimelineCtrl = 0;
+
+    m_bSelectedKeys.reserve(0);
+
+    m_fTimeMarker = -10;
+
+    setMouseTracking(true);
+}
+
+CSplineCtrl::~CSplineCtrl()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CSplineCtrl message handlers
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::resizeEvent([[maybe_unused]] QResizeEvent* event)
+{
+    m_rcSpline = rect();
+
+    if (m_pTimelineCtrl)
+    {
+        QRect rct = m_rcSpline;
+        rct.setHeight(20);
+        m_rcSpline.setTop(rct.bottom() + 1);
+        m_pTimelineCtrl->setGeometry(rct);
+    }
+
+    m_rcSpline.adjust(2, 2, -2, -2);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint CSplineCtrl::KeyToPoint(int nKey)
+{
+    if (nKey >= 0)
+    {
+        return TimeToPoint(m_pSpline->GetKeyTime(nKey));
+    }
+    return QPoint(0, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint CSplineCtrl::TimeToPoint(float time)
+{
+    QPoint point;
+    point.setX((time - m_fMinTime) * (m_rcSpline.width() / (m_fMaxTime - m_fMinTime)) + m_rcSpline.left());
+    float val = 0;
+    if (m_pSpline)
+    {
+        m_pSpline->InterpolateFloat(time, val);
+    }
+    point.setY((floor((m_fMaxValue - val) * (m_rcSpline.height() / (m_fMaxValue - m_fMinValue)) + 0.5f) + m_rcSpline.top()));
+    return point;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::PointToTimeValue(const QPoint& point, float& time, float& value)
+{
+    time = XOfsToTime(point.x());
+    float t = float(m_rcSpline.bottom() - point.y()) / m_rcSpline.height();
+    value = LERP(m_fMinValue, m_fMaxValue, t);
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CSplineCtrl::XOfsToTime(int x)
+{
+    // m_fMinTime to m_fMaxTime time range.
+    float t = float(x - m_rcSpline.left()) / m_rcSpline.width();
+    return LERP(m_fMinTime, m_fMaxTime, t);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint CSplineCtrl::XOfsToPoint(int x)
+{
+    return TimeToPoint(XOfsToTime(x));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::paintEvent(QPaintEvent* event)
+{
+    QPainter painter(this);
+
+    QRect rcClient = rect();
+
+    if (m_pSpline)
+    {
+        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
+    }
+
+    {
+        if (m_TimeUpdateRect != event->rect())
+        {
+            painter.fillRect(event->rect(), QColor(140, 140, 140));
+
+            //Draw Grid
+            DrawGrid(&painter);
+
+            //Draw Keys and Curve
+            if (m_pSpline)
+            {
+                DrawSpline(&painter);
+                DrawKeys(&painter);
+            }
+        }
+        m_TimeUpdateRect = QRect();
+    }
+    DrawTimeMarker(&painter);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::DrawGrid(QPainter* painter)
+{
+    QPen pOldPen = painter->pen();
+
+    int cx = m_rcSpline.width();
+    int cy = m_rcSpline.height();
+
+    QPen pen(QColor(90, 90, 90), 1, Qt::DotLine);
+    pen.setCosmetic(true);
+    painter->setPen(pen);
+
+    //Draw Vertical Grid Lines
+    for (int y = 1; y < m_gridX; y++)
+    {
+        painter->drawLine(m_rcSpline.left() + y * cx / m_gridX, m_rcSpline.top() + cy, m_rcSpline.left() + y * cx / m_gridX, m_rcSpline.top());
+    }
+
+    //Draw Horizontal Grid Lines
+    for (int x = 1; x < m_gridY; x++)
+    {
+        painter->drawLine(m_rcSpline.left(), m_rcSpline.top() + x * cy / m_gridY, m_rcSpline.left() + cx, m_rcSpline.top() + x * cy / m_gridY);
+    }
+
+    painter->setPen(QColor(75, 75, 75));
+
+    painter->drawLine(m_rcSpline.left() + (m_gridX / 2) * cx / m_gridX, m_rcSpline.top() + cy, m_rcSpline.left() + (m_gridX / 2) * cx / m_gridX, m_rcSpline.top() + 0);
+    painter->drawLine(m_rcSpline.left() + 0, m_rcSpline.left() + (m_gridY / 2) * cy / m_gridY, m_rcSpline.left() + cx, m_rcSpline.left() + (m_gridY / 2) * cy / m_gridY);
+
+    painter->drawRect(m_rcSpline);
+
+    painter->setPen(pOldPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::DrawSpline(QPainter* painter)
+{
+    //Draw Curve
+    // create and select a thick, white pen
+    const QPen pOldPen = painter->pen();
+    painter->setPen(QColor(128, 255, 128));
+
+    const QRect rcClip = painter->hasClipping() ? painter->clipBoundingRect().intersected(m_rcSpline).toRect() : m_rcSpline;
+
+    bool bFirst = true;
+    QPainterPath path;
+    for (int x = rcClip.left(); x < rcClip.right(); x++)
+    {
+        QPoint pt = XOfsToPoint(x);
+        if (!bFirst)
+        {
+            path.lineTo(pt);
+        }
+        else
+        {
+            path.moveTo(pt);
+            bFirst = false;
+        }
+    }
+    painter->drawPath(path);
+
+    // Put back the old objects
+    painter->setPen(pOldPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::DrawKeys(QPainter* painter)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    // create and select a white pen
+    const QPen pOldPen = painter->pen();
+    painter->setPen(Qt::black);
+
+    m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
+
+    for (int i = 0; i < m_pSpline->GetKeyCount(); i++)
+    {
+        float time = m_pSpline->GetKeyTime(i);
+        const QPoint pt = TimeToPoint(time);
+
+        QColor clr(220, 220, 0);
+        if (m_bSelectedKeys[i])
+        {
+            clr = QColor(255, 0, 0);
+        }
+        const QBrush pOldBrush = painter->brush();
+        painter->setBrush(clr);
+
+        // Draw this key.
+        painter->drawRect(QRect(QPoint(pt.x() - m_nKeyDrawRadius, pt.y() - m_nKeyDrawRadius), QPoint(pt.x() + m_nKeyDrawRadius - 1, pt.y() + m_nKeyDrawRadius - 1)));
+
+        painter->setBrush(pOldBrush);
+    }
+
+    painter->setPen(pOldPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::DrawTimeMarker(QPainter* painter)
+{
+    painter->setPen(QColor(255, 0, 255));
+    const QPoint pt = TimeToPoint(m_fTimeMarker);
+    painter->drawLine(pt.x(), m_rcSpline.top() + 1, pt.x(), m_rcSpline.bottom() - 1);
+}
+
+void CSplineCtrl::UpdateToolTip()
+{
+    if (m_nHitKeyIndex >= 0 && m_pSpline)
+    {
+        float time = m_pSpline->GetKeyTime(m_nHitKeyIndex);
+        float val;
+        m_pSpline->GetKeyValueFloat(m_nHitKeyIndex, val);
+        int cont_s = (m_pSpline->GetKeyFlags(m_nHitKeyIndex) >> SPLINE_KEY_TANGENT_IN_SHIFT) & SPLINE_KEY_TANGENT_LINEAR ? 1 : 2;
+        int cont_d = (m_pSpline->GetKeyFlags(m_nHitKeyIndex) >> SPLINE_KEY_TANGENT_OUT_SHIFT) & SPLINE_KEY_TANGENT_LINEAR ? 1 : 2;
+
+        const QString tipText = tr("%1, %2, [%3|%4").arg(time * m_fTooltipScaleX, 3, 'f').arg(val * m_fTooltipScaleY, 3, 'f').arg(cont_s).arg(cont_d);
+        QToolTip::showText(QCursor::pos(), tipText, this);
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//Mouse Message Handlers
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::mousePressEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonDown(event->pos(), event->modifiers());
+        break;
+    case Qt::RightButton:
+        OnRButtonDown(event->pos(), event->modifiers());
+        break;
+    }
+}
+
+void CSplineCtrl::mouseReleaseEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonUp(event->pos(), event->modifiers());
+        break;
+    }
+}
+
+void CSplineCtrl::OnLButtonDown([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+{
+    if (m_bTracking)
+    {
+        return;
+    }
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    setFocus();
+
+    switch (m_hitCode)
+    {
+    case HIT_KEY:
+        StartTracking();
+        SetActiveKey(m_nHitKeyIndex);
+        break;
+
+    case HIT_SPLINE:
+        // Cycle the spline slope of the nearest key.
+        ToggleKeySlope(m_nHitKeyIndex, m_nHitKeyDist);
+        SetActiveKey(-1);
+        break;
+
+    case HIT_NOTHING:
+        SetActiveKey(-1);
+        break;
+    }
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::OnRButtonDown([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+{
+    setFocus();
+
+    if (!m_pSpline)
+    {
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::mouseDoubleClickEvent(QMouseEvent* event)
+{
+    if (!m_pSpline || event->button() != Qt::LeftButton)
+    {
+        return;
+    }
+
+    switch (m_hitCode)
+    {
+    case HIT_NOTHING:
+    {
+        int iIndex = InsertKey(event->pos());
+        SetActiveKey(iIndex);
+
+        update();
+    }
+    break;
+    case HIT_KEY:
+    {
+        RemoveKey(m_nHitKeyIndex);
+    }
+    break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::mouseMoveEvent(QMouseEvent* event)
+{
+    OnSetCursor();
+
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    if (m_bTracking)
+    {
+        TrackKey(event->pos());
+        UpdateToolTip();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::OnLButtonUp([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    if (m_bTracking)
+    {
+        StopTracking();
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::SetActiveKey(int nIndex)
+{
+    ClearSelection();
+
+    // Activate New Key
+    if (nIndex >= 0)
+    {
+        m_bSelectedKeys[nIndex] = true;
+    }
+    m_nActiveKey = nIndex;
+    update();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw)
+{
+    if (pSpline != m_pSpline)
+    {
+        m_pSpline = pSpline;
+    }
+
+    ValidateSpline();
+    ClearSelection();
+
+    if (bRedraw)
+    {
+        update();
+    }
+}
+
+void CSplineCtrl::ValidateSpline()
+{
+    // Add initial control points (will be  serialised only if edited).
+    if (m_pSpline->GetKeyCount() == 0)
+    {
+        m_pSpline->InsertKeyFloat(0.f, 1.f);
+        m_pSpline->InsertKeyFloat(1.f, 1.f);
+        m_pSpline->Update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+ISplineInterpolator* CSplineCtrl::GetSpline()
+{
+    return m_pSpline;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::OnSetCursor()
+{
+    const QPoint point = mapFromGlobal(QCursor::pos());
+
+    const int hitKey = m_nHitKeyIndex;
+
+    switch (HitTest(point))
+    {
+    case HIT_SPLINE:
+    {
+        setCursor(CMFCUtils::LoadCursor(IDC_ARRWHITE));
+    } break;
+    case HIT_KEY:
+    {
+        setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCK));
+    } break;
+    default:
+        unsetCursor();
+        break;
+    }
+
+    if (m_bTracking)
+    {
+        m_nHitKeyIndex = hitKey;
+    }
+
+    if (m_pSpline)
+    {
+        if (m_nHitKeyIndex >= 0)
+        {
+            UpdateToolTip();
+        }
+        else if (!m_bTracking)
+        {
+            QToolTip::hideText();
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::keyPressEvent(QKeyEvent* event)
+{
+    bool bProcessed = false;
+
+    if (m_nActiveKey != -1 && m_pSpline)
+    {
+        switch (event->key())
+        {
+        case Qt::Key_Space:
+        {
+            ToggleKeySlope(m_nActiveKey, 0);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Delete:
+        {
+            RemoveKey(m_nActiveKey);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Up:
+        {
+            CUndo undo("Move Spline Key");
+            QPoint point = KeyToPoint(m_nActiveKey);
+            point.ry() -= 1;
+            emit beforeChange();
+            TrackKey(point);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Down:
+        {
+            CUndo undo("Move Spline Key");
+            QPoint point = KeyToPoint(m_nActiveKey);
+            point.ry() += 1;
+            emit beforeChange();
+            TrackKey(point);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Left:
+        {
+            CUndo undo("Move Spline Key");
+            QPoint point = KeyToPoint(m_nActiveKey);
+            point.rx() -= 1;
+            emit beforeChange();
+            TrackKey(point);
+            bProcessed = true;
+        } break;
+        case Qt::Key_Right:
+        {
+            CUndo undo("Move Spline Key");
+            QPoint point = KeyToPoint(m_nActiveKey);
+            point.ry() += 1;
+            emit beforeChange();
+            TrackKey(point);
+            bProcessed = true;
+        } break;
+
+        default:
+            break; //do nothing
+        }
+
+        update();
+    }
+
+    event->setAccepted(bProcessed);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+CSplineCtrl::EHitCode CSplineCtrl::HitTest(const QPoint& point)
+{
+    if (!m_pSpline)
+    {
+        return HIT_NOTHING;
+    }
+
+    float time, val;
+    PointToTimeValue(point, time, val);
+
+    m_nHitKeyIndex = -1;
+    m_nHitKeyDist = 0xFFFF;
+    m_hitCode = HIT_NOTHING;
+
+    QPoint splinePt = TimeToPoint(time);
+    if (abs(splinePt.y() - point.y()) < 4)
+    {
+        m_hitCode = HIT_SPLINE;
+        for (int i = 0; i < m_pSpline->GetKeyCount(); i++)
+        {
+            const QPoint splinePt2 = TimeToPoint(m_pSpline->GetKeyTime(i));
+            if (abs(point.x() - splinePt2.x()) < abs(m_nHitKeyDist))
+            {
+                m_nHitKeyIndex = i;
+                m_nHitKeyDist = point.x() - splinePt2.x();
+            }
+        }
+        if (abs(m_nHitKeyDist) < 4)
+        {
+            m_hitCode = HIT_KEY;
+        }
+    }
+
+    return m_hitCode;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::StartTracking()
+{
+    m_bTracking = TRUE;
+
+    GetIEditor()->BeginUndo();
+
+    emit beforeChange();
+
+    setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCKCROSS));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::TrackKey(const QPoint& p)
+{
+    int nKey = m_nHitKeyIndex;
+
+    QPoint point = p;
+
+    if (nKey >= 0)
+    {
+        float time, val;
+
+        // Editing time & value.
+        Limit(point.rx(), m_rcSpline.left(), m_rcSpline.right());
+        Limit(point.ry(), m_rcSpline.top(), m_rcSpline.bottom());
+        PointToTimeValue(point, time, val);
+
+        int i;
+        for (i = 0; i < m_pSpline->GetKeyCount(); i++)
+        {
+            // Switch to next key.
+            if (fabs(m_pSpline->GetKeyTime(i) - time) < MIN_TIME_EPSILON)
+            {
+                if (i != nKey)
+                {
+                    return;
+                }
+            }
+        }
+
+        m_pSpline->SetKeyValueFloat(nKey, val);
+        if ((nKey != 0 && nKey != m_pSpline->GetKeyCount() - 1) || !m_bLockFirstLastKey)
+        {
+            m_pSpline->SetKeyTime(nKey, time);
+        }
+        else if (m_bLockFirstLastKey)
+        {
+            int first = 0;
+            int last = m_pSpline->GetKeyCount() - 1;
+            if (nKey == first)
+            {
+                m_pSpline->SetKeyValueFloat(last, val);
+            }
+            else if (nKey == last)
+            {
+                m_pSpline->SetKeyValueFloat(first, val);
+            }
+        }
+
+        m_pSpline->Update();
+        emit change();
+        if (m_updateCallback)
+        {
+            m_updateCallback(this);
+        }
+
+        update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::StopTracking()
+{
+    if (!m_bTracking)
+    {
+        return;
+    }
+
+    GetIEditor()->AcceptUndo("Spline Move");
+
+    m_bTracking = FALSE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::RemoveKey(int nKey)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+    if (nKey)
+    {
+        if (m_bLockFirstLastKey)
+        {
+            if (nKey == 0 || nKey == m_pSpline->GetKeyCount() - 1)
+            {
+                return;
+            }
+        }
+    }
+
+    CUndo undo("Remove Spline Key");
+
+    emit beforeChange();
+    m_nActiveKey = -1;
+    m_nHitKeyIndex = -1;
+    if (m_pSpline)
+    {
+        m_pSpline->RemoveKey(nKey);
+        m_pSpline->Update();
+        ValidateSpline();
+    }
+    emit change();
+    if (m_updateCallback)
+    {
+        m_updateCallback(this);
+    }
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CSplineCtrl::InsertKey(const QPoint& point)
+{
+    CUndo undo("Spline Insert Key");
+
+    float time, val;
+    PointToTimeValue(point, time, val);
+
+    int i;
+    for (i = 0; i < m_pSpline->GetKeyCount(); i++)
+    {
+        // Skip if any key already have time that is very close.
+        if (fabs(m_pSpline->GetKeyTime(i) - time) < MIN_TIME_EPSILON)
+        {
+            return i;
+        }
+    }
+
+    emit beforeChange();
+
+    m_pSpline->InsertKeyFloat(time, val);
+    m_pSpline->Update();
+    ClearSelection();
+    update();
+
+    emit change();
+    if (m_updateCallback)
+    {
+        m_updateCallback(this);
+    }
+
+    for (i = 0; i < m_pSpline->GetKeyCount(); i++)
+    {
+        // Find key with added time.
+        if (m_pSpline->GetKeyTime(i) == time)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+void CSplineCtrl::ToggleKeySlope(int nIndex, int nDir)
+{
+    if (nIndex >= 0)
+    {
+        int flags = m_pSpline->GetKeyFlags(nIndex);
+        if (nDir <= 0)
+        {
+            // Toggle left side.
+            flags ^= SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_IN_SHIFT;
+        }
+        if (nDir >= 0)
+        {
+            // Toggle right side.
+            flags ^= SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_OUT_SHIFT;
+        }
+        m_pSpline->SetKeyFlags(nIndex, flags);
+        m_pSpline->Update();
+        emit change();
+        if (m_updateCallback)
+        {
+            m_updateCallback(this);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::ClearSelection()
+{
+    m_nActiveKey = -1;
+    if (m_pSpline)
+    {
+        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
+    }
+    for (int i = 0; i < (int)m_bSelectedKeys.size(); i++)
+    {
+        m_bSelectedKeys[i] = false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::SetTimeMarker(float fTime)
+{
+    if (!m_pSpline)
+    {
+        return;
+    }
+
+    if (fTime == m_fTimeMarker)
+    {
+        return;
+    }
+
+    // Erase old first.
+    QPoint pt0 = TimeToPoint(m_fTimeMarker);
+    QPoint pt1 = TimeToPoint(fTime);
+    QRect rc(QPoint(pt0.x(), m_rcSpline.top()), QPoint(pt1.x(), m_rcSpline.bottom()));
+    rc = rc.normalized();
+    rc.adjust(-5, 0, 5, 0);
+    rc = rc.intersected(m_rcSpline);
+
+    m_TimeUpdateRect = rc;
+    update(rc);
+
+    m_fTimeMarker = fTime;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSplineCtrl::SetTimelineCtrl(TimelineWidget* pTimelineCtrl)
+{
+    m_pTimelineCtrl = pTimelineCtrl;
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->setParent(this);
+    }
+}
+
+#include <Controls/moc_SplineCtrl.cpp>
diff --git a/Code/Editor/Controls/SplineCtrl.h b/Code/Editor/Controls/SplineCtrl.h
new file mode 100644
index 0000000000..5d08c45117
--- /dev/null
+++ b/Code/Editor/Controls/SplineCtrl.h
@@ -0,0 +1,155 @@
+/*
+ * 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_CONTROLS_SPLINECTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QWidget>
+#include <ISplines.h>
+#endif
+
+// Custom styles for this control.
+#define SPLINE_STYLE_NOGRID 0x0001
+#define SPLINE_STYLE_NO_TIME_MARKER 0x0002
+
+// Notify event sent when spline is being modified.
+#define SPLN_CHANGE (0x0001)
+// Notify event sent just before when spline is modified.
+#define SPLN_BEFORE_CHANGE (0x0002)
+
+class TimelineWidget;
+
+//////////////////////////////////////////////////////////////////////////
+// Spline control.
+//////////////////////////////////////////////////////////////////////////
+class CSplineCtrl
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    CSplineCtrl(QWidget* parent = nullptr);
+    virtual ~CSplineCtrl();
+
+    //Key functions
+    int  GetActiveKey() { return m_nActiveKey; };
+    void SetActiveKey(int nIndex);
+    int InsertKey(const QPoint& point);
+    void ToggleKeySlope(int nIndex, int nDist);
+
+    void SetGrid(int numX, int numY) { m_gridX = numX; m_gridY = numY; };
+    void SetTimeRange(float tmin, float tmax) { m_fMinTime = tmin; m_fMaxTime = tmax; }
+    void SetValueRange(float tmin, float tmax)
+    {
+        m_fMinValue = tmin;
+        m_fMaxValue = tmax;
+        if (m_fMinValue == m_fMaxValue)
+        {
+            m_fMaxValue = m_fMinValue + 0.001f;
+        }
+    }
+    void SetTooltipValueScale(float x, float y) { m_fTooltipScaleX = x; m_fTooltipScaleY = y; };
+    // Lock value of first and last key to be the same.
+    void LockFirstAndLastKeys(bool bLock) { m_bLockFirstLastKey = bLock; }
+
+    void SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw = FALSE);
+    ISplineInterpolator* GetSpline();
+
+    void SetTimeMarker(float fTime);
+    void SetTimelineCtrl(TimelineWidget* pTimelineCtrl);
+    void UpdateToolTip();
+
+    typedef AZStd::function<void(CSplineCtrl*)> UpdateCallback;
+    void SetUpdateCallback(UpdateCallback cb) { m_updateCallback = cb; };
+
+Q_SIGNALS:
+    void beforeChange();
+    void change();
+
+protected:
+    enum EHitCode
+    {
+        HIT_NOTHING,
+        HIT_KEY,
+        HIT_SPLINE,
+    };
+
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void paintEvent(QPaintEvent* event) override;
+    void resizeEvent(QResizeEvent* event) override;
+    void OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void OnLButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnRButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnSetCursor();
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+    void keyPressEvent(QKeyEvent* event) override;
+
+    // Drawing functions
+    void DrawGrid(QPainter* pDC);
+    void DrawSpline(QPainter* pDC);
+    void DrawKeys(QPainter* pDC);
+    void DrawTimeMarker(QPainter* pDC);
+
+    EHitCode HitTest(const QPoint& point);
+
+    //Tracking support helper functions
+    void StartTracking();
+    void TrackKey(const QPoint& point);
+    void StopTracking();
+    void RemoveKey(int nKey);
+
+    QPoint KeyToPoint(int nKey);
+    QPoint TimeToPoint(float time);
+    void PointToTimeValue(const QPoint& point, float& time, float& value);
+    float  XOfsToTime(int x);
+    QPoint XOfsToPoint(int x);
+
+    void ClearSelection();
+    void ValidateSpline();
+
+private:
+    ISplineInterpolator* m_pSpline;
+
+    QRect m_rcClipRect;
+    QRect m_rcSpline;
+
+    QPoint m_hitPoint;
+    EHitCode m_hitCode;
+    int m_nHitKeyIndex;
+    int m_nHitKeyDist;
+
+    float m_fTimeMarker;
+
+    int m_nActiveKey;
+    int m_nKeyDrawRadius;
+
+    bool  m_bTracking;
+
+    int m_gridX;
+    int m_gridY;
+
+    float m_fMinTime, m_fMaxTime;
+    float m_fMinValue, m_fMaxValue;
+    float m_fTooltipScaleX, m_fTooltipScaleY;
+
+    bool m_bLockFirstLastKey;
+
+    std::vector<int> m_bSelectedKeys;
+
+    TimelineWidget* m_pTimelineCtrl;
+
+    QRect m_TimeUpdateRect;
+
+    UpdateCallback m_updateCallback;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRL_H
diff --git a/Code/Editor/Controls/SplineCtrlEx.cpp b/Code/Editor/Controls/SplineCtrlEx.cpp
new file mode 100644
index 0000000000..4c9e243bf0
--- /dev/null
+++ b/Code/Editor/Controls/SplineCtrlEx.cpp
@@ -0,0 +1,3349 @@
+/*
+ * 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 "SplineCtrlEx.h"
+
+// Qt
+#include <QPainter>
+#include <QPainterPath>
+#include <QToolTip>
+#include <QRubberBand>
+
+// Editor
+#include "TimelineCtrl.h"
+#include "Clipboard.h"
+#include "GridUtils.h"
+
+
+#define DEFAULT_MIN_TIME_EPSILON 0.001f
+#define MIN_TIME_EPSILON_FOR_SCALING 0.1f
+
+#define ACTIVE_BKG_COLOR      QColor(190, 190, 190)
+#define GRID_COLOR            QColor(110, 110, 110)
+#define EDIT_SPLINE_COLOR     QColor(128, 255, 128)
+
+#define MIN_PIXEL_PER_GRID_X 50
+#define MIN_PIXEL_PER_GRID_Y 10
+
+#define LEFT_BORDER_OFFSET 40
+
+const float AbstractSplineWidget::threshold = 0.015f;
+static const float minViewRange = 0.1f;
+
+//////////////////////////////////////////////////////////////////////////
+
+static void SetKeyTangentType(ISplineInterpolator* pSpline, int key, ESplineKeyTangentType type)
+{
+    int flags = (pSpline->GetKeyFlags(key) & ~SPLINE_KEY_TANGENT_IN_MASK) & ~SPLINE_KEY_TANGENT_OUT_MASK;
+    pSpline->SetKeyFlags(key, flags | (type << SPLINE_KEY_TANGENT_IN_SHIFT) | (type << SPLINE_KEY_TANGENT_OUT_SHIFT));
+}
+
+//////////////////////////////////////////////////////////////////////////
+class CUndoSplineCtrlEx
+    : public ISplineCtrlUndo
+{
+public:
+    CUndoSplineCtrlEx(AbstractSplineWidget* pCtrl, std::vector<ISplineInterpolator*>& splineContainer)
+    {
+        m_pCtrl = FindControl(pCtrl);
+
+        for (size_t splineIndex = 0; splineIndex < splineContainer.size(); ++splineIndex)
+        {
+            AddSpline(splineContainer[splineIndex]);
+        }
+
+        SerializeSplines(&SplineEntry::undo, false);
+    }
+
+protected:
+    void AddSpline(ISplineInterpolator* pSpline)
+    {
+        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
+        m_splineEntries.resize(m_splineEntries.size() + 1);
+        SplineEntry& entry = m_splineEntries.back();
+        ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
+        entry.id = (pSplineSet ? pSplineSet->GetIDFromSpline(pSpline) : 0);
+        entry.pSpline = pSpline;
+
+        const int numKeys = pSpline->GetKeyCount();
+        entry.keySelectionFlags.reserve(numKeys);
+        for (int i = 0; i < numKeys; ++i)
+        {
+            entry.keySelectionFlags.push_back(pSpline->GetKeyFlags(i) & ESPLINE_KEY_UI_SELECTED_MASK);
+        }
+    }
+
+    virtual int GetSize() { return sizeof(*this); }
+    virtual QString GetDescription() { return "UndoSplineCtrlEx"; };
+
+    virtual void Undo(bool bUndo)
+    {
+        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
+        if (pCtrl)
+        {
+            pCtrl->SendNotifyEvent(SPLN_BEFORE_CHANGE);
+        }
+        if (bUndo)
+        {
+            SerializeSplines(&SplineEntry::redo, false);
+        }
+        SerializeSplines(&SplineEntry::undo, true);
+        if (pCtrl && bUndo)
+        {
+            pCtrl->m_bKeyTimesDirty = true;
+            pCtrl->SendNotifyEvent(SPLN_CHANGE);
+            pCtrl->update();
+        }
+    }
+
+    virtual void Redo()
+    {
+        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
+        if (pCtrl)
+        {
+            pCtrl->SendNotifyEvent(SPLN_BEFORE_CHANGE);
+        }
+        SerializeSplines(&SplineEntry::redo, true);
+        if (pCtrl)
+        {
+            pCtrl->m_bKeyTimesDirty = true;
+            pCtrl->SendNotifyEvent(SPLN_CHANGE);
+            pCtrl->update();
+        }
+    }
+
+private:
+    class SplineEntry
+    {
+    public:
+        std::vector<int> keySelectionFlags;
+        _smart_ptr<ISplineBackup> undo;
+        _smart_ptr<ISplineBackup> redo;
+        string id;
+        ISplineInterpolator* pSpline;
+    };
+
+    void SerializeSplines(_smart_ptr<ISplineBackup> SplineEntry::* backup, bool bLoading)
+    {
+        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
+        ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
+        for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
+        {
+            SplineEntry& entry = *it;
+            ISplineInterpolator* pSpline = (pSplineSet ? pSplineSet->GetSplineFromID(entry.id) : entry.pSpline);
+
+            if (!pSpline && pCtrl && pCtrl->GetSplineCount() > 0)
+            {
+                pSpline = pCtrl->GetSpline(0);
+            }
+
+            if (pSpline && bLoading)
+            {
+                pSpline->Restore(entry.*backup);
+            }
+            else if (pSpline)
+            {
+                (entry.*backup) = pSpline->Backup();
+            }
+        }
+    }
+
+public:
+    typedef std::list<AbstractSplineWidget*> CSplineCtrls;
+
+    static AbstractSplineWidget* FindControl(AbstractSplineWidget* pCtrl)
+    {
+        if (!pCtrl)
+        {
+            return 0;
+        }
+
+        auto iter = std::find(s_activeCtrls.begin(), s_activeCtrls.end(), pCtrl);
+        if (iter == s_activeCtrls.end())
+        {
+            return 0;
+        }
+
+        return *iter;
+    }
+
+    static void RegisterControl(AbstractSplineWidget* pCtrl)
+    {
+        if (!FindControl(pCtrl))
+        {
+            s_activeCtrls.push_back(pCtrl);
+        }
+    }
+
+    static void UnregisterControl(AbstractSplineWidget* pCtrl)
+    {
+        if (FindControl(pCtrl))
+        {
+            s_activeCtrls.remove(pCtrl);
+        }
+    }
+
+    static CSplineCtrls s_activeCtrls;
+
+    virtual bool IsSelectionChanged() const
+    {
+        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
+        ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
+
+        for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
+        {
+            const SplineEntry& entry = *it;
+            ISplineInterpolator* pSpline = (pSplineSet ? pSplineSet->GetSplineFromID(entry.id) : entry.pSpline);
+
+            if (!pSpline && pCtrl && pCtrl->GetSplineCount() > 0)
+            {
+                pSpline = pCtrl->GetSpline(0);
+            }
+
+            if (!pSpline)
+            {
+                return false;
+            }
+
+            if (pSpline->GetKeyCount() != entry.keySelectionFlags.size())
+            {
+                return true;
+            }
+
+            for (int i = 0; i < pSpline->GetKeyCount(); ++i)
+            {
+                if (entry.keySelectionFlags[i] != (pSpline->GetKeyFlags(i) & ESPLINE_KEY_UI_SELECTED_MASK))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+private:
+    AbstractSplineWidget* m_pCtrl;
+    std::vector<SplineEntry> m_splineEntries;
+    std::vector<float> m_keyTimes;
+};
+
+CUndoSplineCtrlEx::CSplineCtrls CUndoSplineCtrlEx::s_activeCtrls;
+
+SplineWidget::SplineWidget(QWidget* parent)
+    : QWidget(parent)
+    , m_rubberBand(new QRubberBand(QRubberBand::Rectangle, this))
+{
+    m_rubberBand->setVisible(false);
+    setMouseTracking(true);
+
+    setFocusPolicy(Qt::StrongFocus);
+}
+
+SplineWidget::~SplineWidget()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+AbstractSplineWidget::AbstractSplineWidget()
+    : m_defaultKeyTangentType(SPLINE_KEY_TANGENT_NONE)
+{
+    m_pTimelineCtrl = 0;
+
+    m_totalSplineCount = 0;
+    m_pHitSpline = 0;
+    m_pHitDetailSpline = 0;
+    m_nHitKeyIndex = -1;
+    m_nHitDimension = -1;
+    m_bHitIncomingHandle = true;
+    m_nKeyDrawRadius = 3;
+    m_gridX = 10;
+    m_gridY = 10;
+    m_timeRange.start = 0;
+    m_timeRange.end = 1;
+    m_fMinValue = -1;
+    m_fMaxValue = 1;
+    m_valueRange.Set(-1, 1);
+    m_fTooltipScaleX = 1;
+    m_fTooltipScaleY = 1;
+
+    m_cMousePos = QPoint(0, 0);
+    m_fTimeScale = 1;
+    m_fValueScale = 1;
+    m_fGridTimeScale = 30.0f;
+
+    m_ticksStep = 10;
+
+    m_fTimeMarker = -10;
+    m_editMode = NothingMode;
+
+    m_bSnapTime = false;
+    m_bSnapValue = false;
+    m_bBitmapValid = false;
+
+    m_nLeftOffset = LEFT_BORDER_OFFSET;
+
+    m_grid.zoom.x = 200;
+    m_grid.zoom.y = 100;
+
+    m_bKeyTimesDirty = false;
+
+    m_rcSelect = QRect();
+    m_rcSpline = QRect();
+
+    m_boLeftMouseButtonDown = false;
+
+    m_pSplineSet = 0;
+
+    m_controlAmplitude = false;
+
+    m_fMinTimeEpsilon = DEFAULT_MIN_TIME_EPSILON;
+
+    m_defaultValueRange.Set(-1.1f, 1.1f);
+
+    m_bEditLock = false;
+
+    m_pCurrentUndo = nullptr;
+
+    CUndoSplineCtrlEx::RegisterControl(this);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+AbstractSplineWidget::~AbstractSplineWidget()
+{
+    CUndoSplineCtrlEx::UnregisterControl(this);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+Vec2 AbstractSplineWidget::GetZoom()
+{
+    return m_grid.zoom;
+}
+
+Vec2 AbstractSplineWidget::GetScrollOffset()
+{
+    return m_grid.origin;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SetZoom(Vec2 zoom, const QPoint& center)
+{
+    m_grid.SetZoom(zoom, QPoint(center.x(), m_rcSpline.bottom() + 1 - center.y()));
+    SetScrollOffset(m_grid.origin);
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->setZoom(zoom.x, m_grid.origin.x);
+    }
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SetZoom(Vec2 zoom)
+{
+    m_grid.zoom = zoom;
+    SetScrollOffset(m_grid.origin);
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->setZoom(zoom.x, m_grid.origin.x);
+    }
+    SendNotifyEvent(SPLN_SCROLL_ZOOM);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SetScrollOffset(Vec2 ofs)
+{
+    m_grid.origin = ofs;
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->setZoom(m_grid.zoom.x, m_grid.origin.x);
+    }
+    SendNotifyEvent(SPLN_SCROLL_ZOOM);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+float AbstractSplineWidget::SnapTime(float time)
+{
+    if (m_bSnapTime)
+    {
+        float step = m_grid.step.x / 10.0f;
+        return floor((time / step) + 0.5f) * step;
+    }
+    return time;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float AbstractSplineWidget::SnapValue(float val)
+{
+    if (m_bSnapValue)
+    {
+        float step = m_grid.step.y;
+        return floor((val / step) + 0.5f) * step;
+    }
+    return val;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int AbstractSplineWidget::GetKeyTimeCount() const
+{
+    UpdateKeyTimes();
+
+    return int(m_keyTimes.size());
+}
+
+//////////////////////////////////////////////////////////////////////////
+float AbstractSplineWidget::GetKeyTime(int index) const
+{
+    UpdateKeyTimes();
+
+    return m_keyTimes[index].time;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool AbstractSplineWidget::GetKeyTimeSelected(int index) const
+{
+    UpdateKeyTimes();
+
+    return m_keyTimes[index].selected;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SetKeyTimeSelected(int index, bool selected)
+{
+    m_keyTimes[index].selected = selected;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int AbstractSplineWidget::GetKeyCount(int index) const
+{
+    UpdateKeyTimes();
+
+    return m_keyTimes[index].count;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int AbstractSplineWidget::GetKeyCountBound() const
+{
+    UpdateKeyTimes();
+
+    return m_totalSplineCount;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::BeginEdittingKeyTimes()
+{
+    if (CUndo::IsRecording())
+    {
+        GetIEditor()->CancelUndo();
+        m_pCurrentUndo = nullptr;
+    }
+    GetIEditor()->BeginUndo();
+
+    for (int keyTimeIndex = 0; keyTimeIndex < int(m_keyTimes.size()); ++keyTimeIndex)
+    {
+        m_keyTimes[keyTimeIndex].oldTime = m_keyTimes[keyTimeIndex].time;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::EndEdittingKeyTimes()
+{
+    if (CUndo::IsRecording())
+    {
+        GetIEditor()->AcceptUndo("Batch key move");
+        m_pCurrentUndo = nullptr;
+    }
+
+    m_bKeyTimesDirty = true;
+    update();
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::MoveKeyTimes(int numChanges, int* indices, float scale, float offset, bool copyKeys)
+{
+    if (CUndo::IsRecording())
+    {
+        GetIEditor()->RestoreUndo();
+
+        std::vector<ISplineInterpolator*> splines;
+        for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
+        {
+            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+            if (pSpline)
+            {
+                splines.push_back(pSpline);
+            }
+        }
+        CUndo::Record(m_pCurrentUndo = CreateSplineCtrlUndoObject(splines));
+
+        for (int keyTimeIndex = 0; keyTimeIndex < int(m_keyTimes.size()); ++keyTimeIndex)
+        {
+            m_keyTimes[keyTimeIndex].time = m_keyTimes[keyTimeIndex].oldTime;
+        }
+    }
+
+    class KeyChange
+    {
+    public:
+        KeyChange(ISplineInterpolator* pSpline, int keyIndex, float oldTime, float newTime, int flags)
+            : pSpline(pSpline)
+            , keyIndex(keyIndex)
+            , oldTime(oldTime)
+            , newTime(newTime)
+            , flags(flags) {}
+
+        ISplineInterpolator* pSpline;
+        int keyIndex;
+        float oldTime;
+        float newTime;
+        ISplineInterpolator::ValueType value;
+        int flags;
+        ISplineInterpolator::ValueType tin, tout;
+    };
+
+    std::vector<KeyChange> individualKeyChanges;
+    for (int changeIndex = 0; indices && changeIndex < numChanges; ++changeIndex)
+    {
+        int index = (indices ? indices[changeIndex] : 0);
+
+        float oldTime = m_keyTimes[index].time;
+        float time = __max(m_timeRange.start, __min(m_timeRange.end, scale * oldTime + offset));
+
+        for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
+        {
+            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+            for (int keyIndex = 0; pSpline && keyIndex < pSpline->GetKeyCount(); ++keyIndex)
+            {
+                float keyTime = pSpline->GetKeyTime(keyIndex);
+                KeyChange change(pSpline, keyIndex, keyTime, SnapTimeToGridVertical(time), pSpline->GetKeyFlags(keyIndex));
+
+                pSpline->GetKeyValue(keyIndex, change.value);
+                pSpline->GetKeyTangents(keyIndex, change.tin, change.tout);
+
+                if (fabsf(keyTime - oldTime) < threshold)
+                {
+                    individualKeyChanges.push_back(change);
+                }
+            }
+        }
+
+        m_keyTimes[index].time = SnapTimeToGridVertical(time);
+    }
+
+    for (std::vector<KeyChange>::iterator itChange = individualKeyChanges.begin(); itChange != individualKeyChanges.end(); ++itChange)
+    {
+        (*itChange).pSpline->SetKeyTime((*itChange).keyIndex, (*itChange).newTime);
+    }
+
+    if (copyKeys)
+    {
+        for (std::vector<KeyChange>::iterator keyToAdd = individualKeyChanges.begin(), endKeysToAdd = individualKeyChanges.end(); keyToAdd != endKeysToAdd; ++keyToAdd)
+        {
+            int keyIndex = (*keyToAdd).pSpline->InsertKey((*keyToAdd).oldTime, (*keyToAdd).value);
+            (*keyToAdd).pSpline->SetKeyTangents(keyIndex, (*keyToAdd).tin, (*keyToAdd).tout);
+            (*keyToAdd).pSpline->SetKeyFlags(keyIndex, (*keyToAdd).flags & (~ESPLINE_KEY_UI_SELECTED_MASK));
+        }
+    }
+
+    // Loop through all moved keys, checking whether there are multiple keys on the same frame.
+    for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        float lastKeyTime = -FLT_MAX;
+        pSpline->Update();
+        for (int keyIndex = 0, keys = pSpline->GetKeyCount(); keyIndex <= keys; )
+        {
+            float keyTime = pSpline->GetKeyTime(keyIndex);
+            if (fabsf(keyTime - lastKeyTime) < m_fMinTimeEpsilon)
+            {
+                --keys;
+                pSpline->RemoveKey(keyIndex);
+            }
+            else
+            {
+                ++keyIndex;
+                lastKeyTime = keyTime;
+            }
+        }
+    }
+
+    SendNotifyEvent(SPLN_CHANGE);
+    update();
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::resizeEvent(QResizeEvent* event)
+{
+    QRect oldRect = m_rcSpline;
+
+    QWidget::resizeEvent(event);
+
+    m_rcClient = rect();
+    m_rcSpline = m_rcClient;
+
+    if (m_pTimelineCtrl)
+    {
+        QRect rct = m_rcSpline;
+        const int timelineControlHeight = 16;
+        rct.setHeight(timelineControlHeight);
+        m_rcSpline.setTop(rct.bottom() + 1);
+        rct.setLeft(rct.left() + m_nLeftOffset);
+        m_pTimelineCtrl->setGeometry(rct);
+    }
+
+    m_rcSpline.setLeft(m_rcSpline.left() + m_nLeftOffset);
+
+    m_grid.rect = m_rcSpline;
+
+    int oldW = oldRect.width();
+    int oldH = oldRect.height();
+
+    if (width() > 1 && height() > 1 && oldW > 1 && oldH > 1 && m_rcSpline.width() > 0 && m_rcSpline.height())
+    {
+        SetZoom(Vec2(float(m_rcSpline.width()) / oldW * GetZoom().x, float(m_rcSpline.height()) / oldH * GetZoom().y));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint AbstractSplineWidget::TimeToPoint(float time, ISplineInterpolator* pSpline)
+{
+    float val = 0;
+    if (pSpline)
+    {
+        pSpline->InterpolateFloat(time, val);
+    }
+
+    return WorldToClient(Vec2(time, val));
+    ;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float AbstractSplineWidget::TimeToXOfs(float x)
+{
+    return WorldToClient(Vec2(float(x), 0.0f)).x();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::PointToTimeValue(QPoint point, float& time, float& value)
+{
+    Vec2 v = ClientToWorld(point);
+    value = v.y;
+    time = XOfsToTime(point.x());
+}
+
+//////////////////////////////////////////////////////////////////////////
+float AbstractSplineWidget::XOfsToTime(int x)
+{
+    Vec2 v = ClientToWorld(QPoint(x, 0));
+    float time = v.x;
+    return time;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint AbstractSplineWidget::XOfsToPoint(int x, ISplineInterpolator* pSpline)
+{
+    return TimeToPoint(XOfsToTime(x), pSpline);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint AbstractSplineWidget::WorldToClient(Vec2 v)
+{
+    QPoint p = m_grid.WorldToClient(v);
+    p.setY(m_rcSpline.bottom() - p.y());
+    return p;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec2 AbstractSplineWidget::ClientToWorld(const QPoint& point)
+{
+    Vec2 v = m_grid.ClientToWorld(QPoint(point.x(), m_rcSpline.bottom() + 1 - point.y()));
+    return v;
+}
+
+void SplineWidget::paintEvent(QPaintEvent* event)
+{
+    QPainter painter(this);
+
+    if (m_TimeUpdateRect != event->rect())
+    {
+        painter.fillRect(event->rect(), QColor(160, 160, 160));
+
+        m_grid.CalculateGridLines();
+
+        //Draw Grid
+        DrawGrid(&painter);
+
+        const QRect drawSplineRect = event->rect().intersected(m_rcSpline);
+
+        // Calculate the times corresponding to the left and right of the area to be painted -
+        // we can use this to draw only the necessary parts of the splines.
+        float startTime = XOfsToTime(drawSplineRect.left());
+        float endTime = XOfsToTime(drawSplineRect.right());
+
+        //Draw Keys and Curve
+        for (int i = 0; i < int(m_splines.size()); ++i)
+        {
+            DrawSpline(&painter, m_splines[i], startTime, endTime);
+            DrawKeys(&painter, i, startTime, endTime);
+        }
+    }
+    m_TimeUpdateRect = QRect();
+
+    DrawTimeMarker(&painter);
+}
+
+//////////////////////////////////////////////////////////////////////////
+class SplineControlVerticalLineDrawer
+{
+public:
+    SplineControlVerticalLineDrawer(QPainter* painter, const QRect& rect)
+        : rect(rect)
+        , painter(painter)
+    {
+    }
+
+    void operator()([[maybe_unused]] int frameIndex, int x)
+    {
+        if (painter)
+        {
+            painter->drawLine(x, rect.top(), x, rect.bottom());
+        }
+    }
+
+    QPainter* painter;
+    QRect rect;
+};
+
+void SplineWidget::DrawGrid(QPainter* painter)
+{
+    QPoint ptTop = WorldToClient(Vec2(0.0f, m_valueRange.end));
+    QPoint ptBottom = WorldToClient(Vec2(0.0f, m_valueRange.start));
+    QPoint pt0 = WorldToClient(Vec2(m_timeRange.start, 0));
+    QPoint pt1 = WorldToClient(Vec2(m_timeRange.end, 0));
+    QRect timeRc = QRect(QPoint(pt0.x() - 2, ptTop.y()), QPoint(pt1.x() + 2, ptBottom.y()) - QPoint(1, 1));
+    timeRc = timeRc.intersected(m_rcSpline);
+    painter->fillRect(timeRc, ACTIVE_BKG_COLOR);
+
+    //////////////////////////////////////////////////////////////////////////
+    QPen pOldPen = painter->pen();
+    painter->setPen(GRID_COLOR);
+
+    /// Draw Left Separator.
+    painter->fillRect(QRect(QPoint(m_rcClient.left(), m_rcClient.top()), QPoint(m_rcClient.left() + m_nLeftOffset - 1, m_rcClient.bottom()) - QPoint(1, 1)), ACTIVE_BKG_COLOR);
+    painter->drawLine(m_rcClient.left() + m_nLeftOffset, m_rcClient.bottom(), m_rcClient.left() + m_nLeftOffset, m_rcClient.top());
+    //////////////////////////////////////////////////////////////////////////
+
+    int gy;
+
+    QPen pen(QColor(GRID_COLOR), 1, Qt::DotLine);
+    pen.setCosmetic(true);
+    painter->setPen(pen);
+
+    //if (m_grid.pixelsPerGrid.y >= MIN_PIXEL_PER_GRID_Y)
+    {
+        // Draw horizontal grid lines.
+        for (gy = m_grid.firstGridLine.y(); gy < m_grid.firstGridLine.y() + m_grid.numGridLines.y() + 1; gy++)
+        {
+            int y = m_grid.GetGridLineY(gy);
+            if (y < 0)
+            {
+                continue;
+            }
+            int py = m_rcSpline.height() - y;
+            if (py < m_rcSpline.top() || py > m_rcSpline.bottom() + 1)
+            {
+                continue;
+            }
+            painter->setPen(pen);
+            painter->drawLine(m_rcSpline.left(), py, m_rcSpline.right(), py);
+
+            float v = m_grid.GetGridLineYValue(gy);
+            v = floor(v * 1000.0f + 0.5f) / 1000.0f;
+
+            if ((v >= m_valueRange.start && v <= m_valueRange.end) || fabs(v - m_valueRange.start) < 0.01f || fabs(v - m_valueRange.end) < 0.01f)
+            {
+                painter->setPen(Qt::black);
+                painter->drawText(m_rcClient.left() + 2, py - 8, QString::number(v));
+            }
+        }
+    }
+
+    // Draw vertical grid lines.
+    SplineControlVerticalLineDrawer verticalLineDrawer(painter, m_rcSpline);
+    GridUtils::IterateGrid(verticalLineDrawer, 50.0f, m_grid.zoom.x, m_grid.origin.x, m_fGridTimeScale, m_grid.rect.left(), m_grid.rect.right() + 1);
+
+    //////////////////////////////////////////////////////////////////////////
+    {
+        const QPen pen0(QColor(110, 100, 100), 2);
+        const QPoint p = WorldToClient(Vec2(0, 0));
+
+        painter->setPen(pen0);
+
+        /// Draw X axis.
+        painter->drawLine(m_rcSpline.left(), p.y(), m_rcSpline.right() + 1, p.y());
+
+        // Draw Y Axis.
+        if (p.x() > m_rcSpline.left() && p.y() < m_rcSpline.right() + 1)
+        {
+            painter->drawLine(p.x(), m_rcSpline.top(), p.x(), m_rcSpline.bottom() + 1);
+        }
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    painter->setPen(pOldPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::DrawSpline(QPainter* painter, SSplineInfo& splineInfo, float startTime, float endTime)
+{
+    const QPen pOldPen = painter->pen();
+
+    const QRect rcClip = painter->clipBoundingRect().intersected(m_rcSpline).toRect();
+
+    //////////////////////////////////////////////////////////////////////////
+    ISplineInterpolator* pSpline = splineInfo.pSpline;
+    ISplineInterpolator* pDetailSpline = splineInfo.pDetailSpline;
+    if (!pSpline)
+    {
+        return;
+    }
+
+    int nTotalNumberOfDimensions(0);
+    int nCurrentDimension(0);
+
+    int left = TimeToXOfs(startTime);//rcClip.left;
+    int right = TimeToXOfs(endTime);//rcClip.right;
+    QPoint p0 = TimeToPoint(pSpline->GetKeyTime(0), pSpline);
+    QPoint p1 = TimeToPoint(pSpline->GetKeyTime(pSpline->GetKeyCount() - 1), pSpline);
+
+    nTotalNumberOfDimensions = pSpline->GetNumDimensions();
+    for (nCurrentDimension = 0; nCurrentDimension < nTotalNumberOfDimensions; nCurrentDimension++)
+    {
+        QColor splineColor = EDIT_SPLINE_COLOR;
+        splineColor = splineInfo.anColorArray[nCurrentDimension];
+        const QPen pen(splineColor, 2);
+
+        if (p0.x() > left && !pDetailSpline)
+        {
+            QPen alternatePen(splineColor, 1, Qt::DotLine);
+            alternatePen.setCosmetic(true);
+            painter->setPen(alternatePen);
+
+            painter->drawLine(m_rcSpline.left(), p0.y(), p0.x(), p0.y());
+            left = p0.x();
+        }
+
+        if (p1.x() < right && !pDetailSpline)
+        {
+            QPen alternatePen(splineColor, 1, Qt::DotLine);
+            alternatePen.setCosmetic(true);
+            painter->setPen(alternatePen);
+
+            painter->drawLine(p1.x(), p1.y(), m_rcSpline.right() + 1, p1.y());
+            right = p1.x();
+        }
+
+        painter->setPen(pen);
+
+        int linesDrawn = 0;
+        int pixels = 0;
+
+        float gradient = 0.0f;
+        int pointsInLine = -1;
+        QPoint lineStart;
+        QPainterPath path;
+        for (int x = left; x <= right; x++)
+        {
+            ++pixels;
+
+            float time = XOfsToTime(x);
+            ISplineInterpolator::ValueType value;
+            ISplineInterpolator::ZeroValue(value);
+
+            pSpline->Interpolate(time, value);
+
+            if (pDetailSpline)
+            {
+                ISplineInterpolator::ValueType value2;
+                ISplineInterpolator::ZeroValue(value2);
+
+                pDetailSpline->Interpolate(time, value2);
+
+                value[nCurrentDimension] = value[nCurrentDimension] + value2[nCurrentDimension];
+            }
+
+
+            QPoint pt = WorldToClient(Vec2(time, value[nCurrentDimension]));
+
+            if ((x == right && pointsInLine >= 0) || (pointsInLine > 0 && fabs(lineStart.y() + gradient * (pt.x() - lineStart.x()) - pt.y()) > 1.0f))
+            {
+                lineStart = QPoint(pt.x() - 1, lineStart.y() + gradient * (pt.x() - 1 - lineStart.x()));
+                path.lineTo(lineStart);
+                gradient = float(pt.y() - lineStart.y()) / (pt.x() - lineStart.x());
+                pointsInLine = 1;
+                ++linesDrawn;
+            }
+            else if ((x == right && pointsInLine >= 0) || (pointsInLine > 0 && fabs(lineStart.y() + gradient * (pt.x() - lineStart.x()) - pt.y()) == 1.0f))
+            {
+                lineStart = pt;
+                path.lineTo(lineStart);
+                gradient = 0.0f;
+                pointsInLine = 0;
+                ++linesDrawn;
+            }
+            else if (pointsInLine > 0)
+            {
+                ++pointsInLine;
+            }
+            else if (pointsInLine == 0)
+            {
+                gradient = float(pt.y() - lineStart.y()) / (pt.x() - lineStart.x());
+                ++pointsInLine;
+            }
+            else
+            {
+                path.moveTo(pt);
+                lineStart = pt;
+                ++pointsInLine;
+                gradient = 0.0f;
+            }
+        }
+
+        painter->drawPath(path);
+
+        // Put back the old objects
+        painter->setPen(pOldPen);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::DrawKeys(QPainter* painter, int splineIndex, [[maybe_unused]] float startTime, float endTime)
+{
+    SSplineInfo& splineInfo = m_splines[splineIndex];
+    ISplineInterpolator* pSpline = splineInfo.pSpline;
+    ISplineInterpolator* pDetailSpline = splineInfo.pDetailSpline;
+
+    if (!pSpline)
+    {
+        return;
+    }
+
+    // create and select a white pen - nope, black
+    const QPen pOldPen = painter->pen();
+    painter->setPen(Qt::black);
+
+    int i;
+
+    int nTotalNumberOfDimensions(0);
+    int nCurrentDimension(0);
+
+    nTotalNumberOfDimensions = pSpline->GetNumDimensions();
+    for (nCurrentDimension = 0; nCurrentDimension < nTotalNumberOfDimensions; nCurrentDimension++)
+    {
+        // Why is this here? Not even god knows...
+        //for (i = 0; i < pSpline->GetKeyCount() && pSpline->GetKeyTime(i) < startTime; ++i);
+        QPoint lastKeyPt;
+
+        int numKeys = pSpline->GetKeyCount();
+        for (i = 0; i < numKeys; i++)
+        {
+            float time = pSpline->GetKeyTime(i);
+            if (time >= endTime)
+            {
+                break;
+            }
+
+            ISplineInterpolator::ValueType value;
+            ISplineInterpolator::ZeroValue(value);
+
+            pSpline->Interpolate(time, value);
+
+            if (pDetailSpline)
+            {
+                ISplineInterpolator::ValueType value2;
+                ISplineInterpolator::ZeroValue(value2);
+
+                pDetailSpline->Interpolate(time, value2);
+
+                value[nCurrentDimension] = value[nCurrentDimension] + value2[nCurrentDimension];
+            }
+            QPoint pt = WorldToClient(Vec2(time, value[nCurrentDimension]));
+            ;
+
+            if (pt.x() < m_rcSpline.left())
+            {
+                continue;
+            }
+
+            if (i > 0 && (pt - lastKeyPt).manhattanLength() < 4)
+            {
+                continue;
+            }
+
+            QColor clr(220, 220, 0);
+            if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
+            {
+                clr = Qt::red;
+                DrawTangentHandle(painter, splineIndex, i, nCurrentDimension);
+            }
+
+            const QBrush brush(clr);
+            const QBrush pOldBrush = painter->brush();
+            painter->setBrush(brush);
+
+            // Draw this key.
+            painter->drawRect(QRect(QPoint(pt.x() - m_nKeyDrawRadius, pt.y() - m_nKeyDrawRadius), QPoint(pt.x() + m_nKeyDrawRadius - 1, pt.y() + m_nKeyDrawRadius - 1)));
+
+            lastKeyPt = pt;
+
+            painter->setBrush(pOldBrush);
+        }
+    }
+
+    painter->setPen(pOldPen);
+}
+
+bool AbstractSplineWidget::GetTangentHandlePts(QPoint&, QPoint&, QPoint&, int, int, int)
+{
+    return false;
+}
+
+void SplineWidget::DrawTangentHandle(QPainter* painter, int nSpline, int nKey, int nDimension)
+{
+    // create and select a white pen
+    const QPen pOldPen = painter->pen();
+    painter->setPen(QColor(96, 96, 96));
+
+    // Draw in-tangent & out-tangent lines.
+    QPoint a, b, pt;
+    if (GetTangentHandlePts(a, pt, b, nSpline, nKey, nDimension))
+    {
+        painter->drawLine(a, pt);
+        painter->drawLine(pt, b);
+
+        // Draw end-effectors.
+        const QBrush pOldBrush = painter->brush();
+        painter->setBrush(QColor(0, 220, 0));
+
+        painter->drawRect(QRect(QPoint(a.x() - m_nKeyDrawRadius, a.y() - m_nKeyDrawRadius), QPoint(a.x() + m_nKeyDrawRadius - 1, a.y() + m_nKeyDrawRadius - 1)));
+        painter->drawRect(QRect(QPoint(b.x() - m_nKeyDrawRadius, b.y() - m_nKeyDrawRadius), QPoint(b.x() + m_nKeyDrawRadius - 1, b.y() + m_nKeyDrawRadius - 1)));
+
+        painter->setBrush(pOldBrush);
+    }
+
+    painter->setPen(pOldPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::DrawTimeMarker(QPainter* painter)
+{
+    const QPen pOldPen = painter->pen();
+    painter->setPen(QColor(255, 0, 255));
+    float x = TimeToXOfs(m_fTimeMarker);
+    if (x >= m_rcSpline.left() && x <= m_rcSpline.right() + 1)
+    {
+        painter->drawLine(x, m_rcSpline.top(), x, m_rcSpline.bottom() + 1);
+    }
+    painter->setPen(pOldPen);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//Mouse Message Handlers
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::mousePressEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonDown(event->pos(), event->modifiers());
+        break;
+    case Qt::MiddleButton:
+        OnMButtonDown(event->pos(), event->modifiers());
+        break;
+    case Qt::RightButton:
+        OnRButtonDown(event->pos(), event->modifiers());
+        break;
+    }
+}
+
+void SplineWidget::mouseReleaseEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonUp(event->pos(), event->modifiers());
+        break;
+    case Qt::MiddleButton:
+        OnMButtonUp(event->pos(), event->modifiers());
+        break;
+    }
+}
+
+void SplineWidget::OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers)
+{
+    m_pCurrentUndo = nullptr;
+
+    if (m_bEditLock)
+    {
+        return;
+    }
+
+    m_boLeftMouseButtonDown = true;
+
+    if (m_editMode == TrackingMode)
+    {
+        return;
+    }
+
+    SendNotifyEvent(NM_CLICK);
+
+    m_cMouseDownPos = point;
+
+    ISplineInterpolator* pSpline = HitSpline(m_cMouseDownPos);
+
+    // Get control key status.
+    bool bCtrlClick = modifiers & Qt::ControlModifier;
+
+    switch (m_hitCode)
+    {
+    case HIT_KEY:
+    {
+        {
+            CUndo undo("Select Spline Key");
+            StoreUndo();
+
+            SendNotifyEvent(SPLN_BEFORE_CHANGE);
+            bool bHitSelection = IsKeySelected(m_pHitSpline, m_nHitKeyIndex, m_nHitDimension);
+            bool bAddSelect = bCtrlClick;
+            if (!bAddSelect && !bHitSelection)
+            {
+                ClearSelection();
+            }
+            SelectKey(pSpline, m_nHitKeyIndex, m_nHitDimension, true);
+            SendNotifyEvent(SPLN_CHANGE);
+
+            if (m_pCurrentUndo && !m_pCurrentUndo->IsSelectionChanged())
+            {
+                undo.Cancel();
+            }
+
+            m_pCurrentUndo = nullptr;
+        }
+
+        GetIEditor()->BeginUndo();
+        StartTracking(bCtrlClick);
+    }
+    break;
+
+    case HIT_TANGENT_HANDLE:
+    {
+        {
+            CUndo undo("Select Tangent Handle");
+            SendNotifyEvent(SPLN_BEFORE_CHANGE);
+            ClearSelection();
+            SelectKey(pSpline, m_nHitKeyIndex, m_nHitDimension, true);
+            SendNotifyEvent(SPLN_CHANGE);
+        }
+        StartTracking(false);
+    }
+    break;
+
+    case HIT_SPLINE:
+    {
+        if (GetNumSelected() > 0)
+        {
+            StartTracking(bCtrlClick);
+        }
+    }
+    break;
+
+    case HIT_TIMEMARKER:
+    {
+        SendNotifyEvent(SPLN_TIME_START_CHANGE);
+        m_editMode = TimeMarkerMode;
+        grabMouse();
+    }
+    break;
+
+    case HIT_NOTHING:
+    {
+        if (m_rcSpline.contains(point))
+        {
+            GetIEditor()->BeginUndo();
+            StoreUndo();
+            m_rcSelect = QRect();
+            m_rubberBand->setVisible(false);
+            m_editMode = SelectMode;
+            grabMouse();
+        }
+    }
+    break;
+    }
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::OnRButtonDown(const QPoint&, Qt::KeyboardModifiers)
+{
+    m_pCurrentUndo = nullptr;
+
+    SendNotifyEvent(NM_RCLICK);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::OnMButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers)
+{
+    m_pCurrentUndo = nullptr;
+
+    bool bShiftClick = modifiers & Qt::ShiftModifier;
+
+    if (m_editMode == NothingMode)
+    {
+        if (bShiftClick)
+        {
+            m_editMode = ZoomMode;
+            setCursor(Qt::SizeAllCursor);
+        }
+        else
+        {
+            setCursor(Qt::SizeAllCursor);
+            m_editMode = ScrollMode;
+        }
+        m_cMouseDownPos = point;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::OnMButtonUp(const QPoint&, Qt::KeyboardModifiers)
+{
+    if (m_editMode == ScrollMode || m_editMode == ZoomMode)
+    {
+        m_editMode = NothingMode;
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::mouseDoubleClickEvent(QMouseEvent* event)
+{
+    if (event->button() != Qt::LeftButton)
+    {
+        return;
+    }
+
+    const QPoint point = event->pos();
+    m_pCurrentUndo = nullptr;
+
+    if (m_bEditLock)
+    {
+        return;
+    }
+
+    switch (m_hitCode)
+    {
+    case HIT_SPLINE:
+    {
+        if (m_pHitSpline)
+        {
+            InsertKey(m_pHitSpline, m_pHitDetailSpline, point);
+        }
+        update();
+        if (m_pTimelineCtrl)
+        {
+            m_pTimelineCtrl->update();
+        }
+    }
+    break;
+    case HIT_KEY:
+    {
+        RemoveKey(m_pHitSpline, m_nHitKeyIndex);
+    }
+    break;
+    case HIT_TANGENT_HANDLE:
+    {
+        if (m_bHitIncomingHandle)
+        {
+            ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK, 0);
+        }
+        else
+        {
+            ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_OUT_MASK, 0);
+        }
+    }
+    break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::mouseMoveEvent(QMouseEvent* event)
+{
+    const QPoint point = event->pos();
+
+    switch (HitTest(point))
+    {
+    case HIT_SPLINE:
+        setCursor(CMFCUtils::LoadCursor(IDC_ARRWHITE));
+        break;
+    case HIT_KEY:
+    case HIT_TANGENT_HANDLE:
+        setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCK));
+        break;
+    default:
+        setCursor(Qt::ArrowCursor);
+        break;
+    }
+
+    if (m_pHitSpline && m_nHitKeyIndex >= 0)
+    {
+        float time = m_pHitSpline->GetKeyTime(m_nHitKeyIndex);
+        ISplineInterpolator::ValueType  afValue;
+        m_pHitSpline->GetKeyValue(m_nHitKeyIndex, afValue);
+        const QString tipText = QString::fromLatin1("t=%1  v=%2").arg(time * m_fTooltipScaleX, 0, 'f', 3).arg(afValue[m_nHitDimension] * m_fTooltipScaleY, 2, 'f', 3);
+
+        m_tooltipText = tipText;
+        if (m_lastToolTipPos != point)
+        {
+            m_lastToolTipPos = point;
+            QToolTip::showText(event->globalPos(), tipText);
+        }
+    }
+    else if (m_editMode != TrackingMode)
+    {
+        if (!m_tooltipText.isEmpty())
+        {
+            QToolTip::hideText();
+        }
+    }
+
+    if (m_bEditLock)
+    {
+        return;
+    }
+
+    m_cMousePos = event->pos();
+
+    if (m_editMode == SelectMode)
+    {
+        setCursor(Qt::BlankCursor);
+        QRect rc(QPoint(m_cMouseDownPos.x(), m_cMouseDownPos.y()), point - QPoint(1, 1));
+        rc = rc.normalized().intersected(m_rcSpline);
+
+        m_rcSelect = rc;
+        m_rubberBand->setGeometry(m_rcSelect);
+        m_rubberBand->setVisible(true);
+
+        // Trigger a repaint so that the spline lines will be drawn correctly,
+        // or else they end up being chopped up if you drag the selection area
+        // over them
+        update();
+    }
+
+    if (m_editMode == TimeMarkerMode)
+    {
+        setCursor(Qt::BlankCursor);
+        SetTimeMarker(XOfsToTime(event->x()));
+        SendNotifyEvent(SPLN_TIME_CHANGE);
+    }
+
+    if (m_boLeftMouseButtonDown)
+    {
+        if (m_editMode == TrackingMode && event->pos() != m_cMouseDownPos)
+        {
+            m_startedDragging = true;
+            GetIEditor()->RestoreUndo();
+            m_pCurrentUndo = nullptr;
+
+            StoreUndo();
+
+            bool bAltClick = event->modifiers() & Qt::AltModifier;
+
+            Vec2 v0 = ClientToWorld(m_cMouseDownPos);
+            Vec2 v1 = ClientToWorld(event->pos());
+            if (bAltClick)
+            {
+                TimeScaleKeys(m_fTimeMarker, v0.x, v1.x);
+            }
+            else if (m_controlAmplitude)
+            {
+                ScaleAmplitudeKeys(v0.x, v0.y, v1.y - v0.y);
+            }
+            else
+            {
+                MoveSelectedKeys(v1 - v0, m_copyKeys);
+            }
+        }
+    }
+
+    switch (m_editMode)
+    {
+    case ScrollMode:
+    {
+        // Set the new scrolled coordinates
+        float ofsx = m_grid.origin.x - (event->x() - m_cMouseDownPos.x()) / m_grid.zoom.x;
+        float ofsy = m_grid.origin.y + (event->y() - m_cMouseDownPos.y()) / m_grid.zoom.y;
+        SetScrollOffset(Vec2(ofsx, ofsy));
+        m_cMouseDownPos = event->pos();
+    }
+    break;
+
+    case ZoomMode:
+    {
+        float ofsx = (event->x() - m_cMouseDownPos.x()) * 0.01f;
+        float ofsy = (event->y() - m_cMouseDownPos.y()) * 0.01f;
+
+        Vec2 z = m_grid.zoom;
+        if (ofsx != 0)
+        {
+            z.x = max(z.x * (1.0f + ofsx), 0.001f);
+        }
+        if (ofsy != 0)
+        {
+            z.y = max(z.y * (1.0f + ofsy), 0.001f);
+        }
+        SetZoom(z, m_cMouseDownPos);
+        m_cMouseDownPos = event->pos();
+    }
+    break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::UpdateKeyTimes() const
+{
+    if (!m_bKeyTimesDirty)
+    {
+        return;
+    }
+
+    std::vector<float> selectedKeyTimes;
+    selectedKeyTimes.reserve(m_keyTimes.size());
+    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
+    {
+        if ((*it).selected)
+        {
+            selectedKeyTimes.push_back((*it).time);
+        }
+    }
+    std::sort(selectedKeyTimes.begin(), selectedKeyTimes.end());
+
+    m_keyTimes.clear();
+    for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        for (int keyIndex = 0; pSpline && keyIndex < pSpline->GetKeyCount(); ++keyIndex)
+        {
+            float value = pSpline->GetKeyTime(keyIndex);
+
+            int lower = 0;
+            int upper = int(m_keyTimes.size());
+            while (lower < upper - 1)
+            {
+                int mid = ((lower + upper) >> 1);
+                ((m_keyTimes[mid].time >= value) ? upper : lower) = mid;
+            }
+
+            if ((lower >= int(m_keyTimes.size()) || fabsf(m_keyTimes[lower].time - value) > threshold) &&
+                (upper >= int(m_keyTimes.size()) || fabsf(m_keyTimes[upper].time - value) > threshold))
+            {
+                m_keyTimes.insert(m_keyTimes.begin() + upper, KeyTime(value, 0));
+            }
+        }
+    }
+
+    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
+    {
+        (*it).count = (m_pSplineSet ? m_pSplineSet->GetKeyCountAtTime((*it).time, threshold) : 0);
+    }
+
+    std::vector<float>::iterator itSelected = selectedKeyTimes.begin(), endSelected = selectedKeyTimes.end();
+    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
+    {
+        const float thisThreshold = 0.01f;
+        for (; itSelected != endSelected && (*itSelected) < (*it).time - thisThreshold; ++itSelected)
+        {
+            ;
+        }
+        if (itSelected != endSelected && fabsf((*itSelected) - (*it).time) < thisThreshold)
+        {
+            (*it).selected = true;
+        }
+    }
+
+    m_totalSplineCount = (m_pSplineSet ? m_pSplineSet->GetSplineCount() : 0);
+
+    m_bKeyTimesDirty = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::OnLButtonUp([[maybe_unused]] const QPoint& point, Qt::KeyboardModifiers modifiers)
+{
+    if (m_bEditLock)
+    {
+        return;
+    }
+
+    m_boLeftMouseButtonDown = false;
+
+    if (m_editMode == TrackingMode)
+    {
+        StopTracking();
+
+        if (!m_startedDragging)
+        {
+            HitSpline(m_cMouseDownPos);
+        }
+    }
+
+    if (m_editMode == SelectMode)
+    {
+        // Get control key status.
+        bool bAltClick = modifiers & Qt::AltModifier;
+        bool bCtrlClick = modifiers & Qt::ControlModifier;
+
+        bool bAddSelect = bCtrlClick;
+        bool bUnselect = bAltClick;
+
+        // Stop tracking first or else the clear selection will end up being
+        // undone
+        StopTracking();
+
+        if (!bAddSelect && !bUnselect)
+        {
+            ClearSelection();
+        }
+
+        SelectRectangle(m_rcSelect, !bUnselect);
+
+        m_rcSelect = QRect();
+        m_rubberBand->setVisible(false);
+        setCursor(Qt::ArrowCursor);
+    }
+
+    if (m_editMode == TimeMarkerMode)
+    {
+        m_editMode = NothingMode;
+        releaseMouse();
+        SendNotifyEvent(SPLN_TIME_END_CHANGE);
+    }
+
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->update();
+    }
+
+    m_tooltipText = "";
+    update();
+    m_editMode = NothingMode;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect)
+{
+    if (nKey >= 0)
+    {
+        pSpline->SelectKeyAtDimension(nKey, nDimension, bSelect);
+        SendNotifyEvent(SPLN_KEY_SELECTION_CHANGE);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool AbstractSplineWidget::IsKeySelected(ISplineInterpolator* pSpline, int nKey, int nHitDimension) const
+{
+    if (pSpline && nKey >= 0)
+    {
+        return (pSpline->IsKeySelectedAtDimension(nKey, nHitDimension));
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int AbstractSplineWidget::GetNumSelected()
+{
+    int nSelected = 0;
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        if (ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline)
+        {
+            for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
+            {
+                for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+                {
+                    if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
+                    {
+                        nSelected++;
+                    }
+                }
+            }
+        }
+    }
+    return nSelected;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SetSplineSet(ISplineSet* pSplineSet)
+{
+    m_pSplineSet = pSplineSet;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::wheelEvent(QWheelEvent* event)
+{
+    int zDelta = event->angleDelta().y();
+    if (zDelta == 0)
+    {
+        return;
+    }
+    Vec2 z = m_grid.zoom;
+    float scale = 1.2f * fabs(zDelta / 120.0f);
+    if (zDelta > 0)
+    {
+        z *= scale;
+    }
+    else
+    {
+        z /= scale;
+    }
+    SetZoom(z, m_cMousePos);
+
+    event->accept();
+}
+
+void SplineWidget::keyPressEvent(QKeyEvent* e)
+{
+    BOOL bProcessed = false;
+
+    switch (e->key())
+    {
+        case Qt::Key_Delete:
+        {
+            RemoveSelectedKeys();
+            RemoveSelectedKeyTimes();
+            bProcessed = true;
+        }
+        break;
+
+        case Qt::Key_Up:
+        {
+            CUndo undo("Move Spline Key(s)");
+            SendNotifyEvent(SPLN_BEFORE_CHANGE);
+            MoveSelectedKeys(ClientToWorld(QPoint(0, -1)), false);
+            bProcessed = true;
+        }
+        break;
+
+        case Qt::Key_Down:
+        {
+            CUndo undo("Move Spline Key(s)");
+            SendNotifyEvent(SPLN_BEFORE_CHANGE);
+            MoveSelectedKeys(ClientToWorld(QPoint(0, 1)), false);
+            bProcessed = true;
+        }
+        break;
+
+        case Qt::Key_Left:
+        {
+            CUndo undo("Move Spline Key(s)");
+            SendNotifyEvent(SPLN_BEFORE_CHANGE);
+            MoveSelectedKeys(ClientToWorld(QPoint(-1, 0)), false);
+            bProcessed = true;
+        }
+        break;
+
+        case Qt::Key_Right:
+        {
+            CUndo undo("Move Spline Key(s)");
+            SendNotifyEvent(SPLN_BEFORE_CHANGE);
+            MoveSelectedKeys(ClientToWorld(QPoint(1, 0)), false);
+            bProcessed = true;
+        }
+        break;
+
+        default:
+        break; //do nothing
+    }
+
+    bool bCtrl = e->modifiers() & Qt::ControlModifier;
+    if (e->key() == Qt::Key_C && bCtrl)
+    {
+        CopyKeys();
+        return;
+    }
+
+    if (e->key() == Qt::Key_V && bCtrl)
+    {
+        PasteKeys();
+        return;
+    }
+
+    if (e->key() == Qt::Key_Z && bCtrl)
+    {
+        GetIEditor()->Undo();
+        return;
+    }
+
+    if (e->key() == Qt::Key_Y && bCtrl)
+    {
+        GetIEditor()->Redo();
+        return;
+    }
+
+    if (!bProcessed)
+    {
+        QWidget::keyPressEvent(e);
+    }
+}
+
+bool SplineWidget::event(QEvent* e)
+{
+    // Shortcut override events are sent to allow a widget to say that it wants to get the matching
+    // keypress event, and for it not to be treated as a shortcut by the shortcut/QAction system.
+    // So we need to handle it here, return true and mark the event as accepted, if it's a key combination we care
+    // about
+    if (e->type() == QEvent::ShortcutOverride)
+    {
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
+
+        bool filterOutEvent = false;
+
+        switch (keyEvent->key())
+        {
+            case Qt::Key_Delete:
+            case Qt::Key_Up:
+            case Qt::Key_Down:
+            case Qt::Key_Left:
+            case Qt::Key_Right:
+                filterOutEvent = true;
+            break;
+
+            case Qt::Key_C:
+            case Qt::Key_V:
+            case Qt::Key_Z:
+            case Qt::Key_Y:
+                filterOutEvent = (keyEvent->modifiers() & Qt::ControlModifier) != 0;
+            break;
+
+            default:
+            break; //do nothing
+        }
+
+        if (filterOutEvent)
+        {
+            e->accept();
+            return true;
+        }
+    }
+
+    return QWidget::event(e);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SetHorizontalExtent([[maybe_unused]] int min, [[maybe_unused]] int max)
+{
+    /*
+    m_scrollMin.x = min;
+    m_scrollMax.x = max;
+    int width = max - min;
+    int nPage = m_rcClient.Width()/2;
+    int sx = width - nPage + m_rcSpline.left;
+
+    SCROLLINFO si;
+    ZeroStruct(si);
+    si.cbSize = sizeof(si);
+    si.fMask = SIF_ALL;
+    si.nMin = m_scrollMin.x;
+    si.nMax = m_scrollMax.x - nPage + m_rcSpline.left;
+    si.nPage = m_rcClient.Width()/2;
+    si.nPos = m_scrollOffset.x;
+    //si.nPage = max(0,m_rcClient.Width() - m_leftOffset*2);
+    //si.nPage = 1;
+    //si.nPage = 1;
+    SetScrollInfo( SB_HORZ,&si,TRUE );
+    */
+}
+
+//////////////////////////////////////////////////////////////////////////
+ISplineInterpolator* AbstractSplineWidget::HitSpline(const QPoint& point)
+{
+    if (HitTest(point) != HIT_NOTHING)
+    {
+        return m_pHitSpline;
+    }
+
+    return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+AbstractSplineWidget::EHitCode AbstractSplineWidget::HitTest(const QPoint& point)
+{
+    float   time, val;
+    int     nTotalNumberOfDimensions(0);
+    int     nCurrentDimension(0);
+
+
+    PointToTimeValue(point, time, val);
+
+    m_hitCode = HIT_NOTHING;
+    m_pHitSpline = NULL;
+    m_pHitDetailSpline = NULL;
+    m_nHitKeyIndex = -1;
+    m_nHitDimension = -1;
+    m_bHitIncomingHandle = true;
+
+    if (abs(point.x() - TimeToXOfs(m_fTimeMarker)) < 4)
+    {
+        m_hitCode = HIT_TIMEMARKER;
+    }
+
+    // For each Spline...
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+        ISplineInterpolator* pDetailSpline = m_splines[splineIndex].pDetailSpline;
+
+        // If there is no spline, you can't hit nor a spline nor a key... isn't that logical?
+        if (!pSpline)
+        {
+            return m_hitCode;
+        }
+
+        ISplineInterpolator::ValueType stSplineValue;
+        ISplineInterpolator::ValueType stDetailSplineValue;
+        ISplineInterpolator::ZeroValue(stSplineValue);
+        ISplineInterpolator::ZeroValue(stDetailSplineValue);
+
+        pSpline->Interpolate(time, stSplineValue);
+
+        if (pDetailSpline)
+        {
+            pDetailSpline->Interpolate(time, stDetailSplineValue);
+        }
+
+        // For each dimension...
+        nTotalNumberOfDimensions = pSpline->GetNumDimensions();
+        for (nCurrentDimension = 0; nCurrentDimension < nTotalNumberOfDimensions; nCurrentDimension++)
+        {
+            if (pDetailSpline)
+            {
+                stSplineValue[nCurrentDimension] = stSplineValue[nCurrentDimension] + stDetailSplineValue[nCurrentDimension];
+            }
+
+            for (int i = 0; i < pSpline->GetKeyCount(); i++)
+            {
+                if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
+                // Check tangent handles first.
+                {
+                    QPoint incomingHandlePt, outgoingHandlePt, pt;
+                    if (GetTangentHandlePts(incomingHandlePt, pt, outgoingHandlePt, splineIndex, i, nCurrentDimension))
+                    {
+                        // For the incoming handle
+                        if (abs(incomingHandlePt.x() - point.x()) < 4 && abs(incomingHandlePt.y() - point.y()) < 4)
+                        {
+                            m_hitCode = HIT_TANGENT_HANDLE;
+                            m_pHitSpline = pSpline;
+                            m_pHitDetailSpline = m_splines[splineIndex].pDetailSpline;
+                            m_nHitKeyIndex = i;
+                            m_nHitDimension = nCurrentDimension;
+                            m_bHitIncomingHandle = true;
+                            return m_hitCode;
+                        }
+                        // For the outgoing handle
+                        else if (abs(outgoingHandlePt.x() - point.x()) < 4 && abs(outgoingHandlePt.y() - point.y()) < 4)
+                        {
+                            m_hitCode = HIT_TANGENT_HANDLE;
+                            m_pHitSpline = pSpline;
+                            m_pHitDetailSpline = m_splines[splineIndex].pDetailSpline;
+                            m_nHitKeyIndex = i;
+                            m_nHitDimension = nCurrentDimension;
+                            m_bHitIncomingHandle = false;
+                            return m_hitCode;
+                        }
+                    }
+                }
+            }
+
+            QPoint splinePt = WorldToClient(Vec2(time, stSplineValue[nCurrentDimension]));
+            bool bSplineHit = abs(splinePt.x() - point.x()) < 4 && abs(splinePt.y() - point.y()) < 4;
+
+            if (bSplineHit)
+            {
+                m_hitCode = HIT_SPLINE;
+                m_pHitSpline = pSpline;
+                m_pHitDetailSpline = m_splines[splineIndex].pDetailSpline;
+                for (int i = 0; i < pSpline->GetKeyCount(); i++)
+                {
+                    QPoint splinePt2 = TimeToPoint(pSpline->GetKeyTime(i), pSpline);
+                    if (abs(splinePt2.x() - point.x()) < 4 /* && abs(splinePt.y()-point.y()) < 4*/)
+                    {
+                        m_nHitKeyIndex = i;
+                        m_nHitDimension = nCurrentDimension;
+                        m_hitCode = HIT_KEY;
+                        return m_hitCode;
+                    }
+                }
+            }
+        }
+    }
+
+    return m_hitCode;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::StartTracking(bool copyKeys)
+{
+    m_copyKeys = copyKeys;
+    m_startedDragging = false;
+
+    m_editMode = TrackingMode;
+    captureMouseImpl();
+
+    GetIEditor()->BeginUndo();
+
+    SendNotifyEvent(SPLN_BEFORE_CHANGE);
+
+    setCursorImpl(IDC_ARRBLCKCROSS);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::StopTracking()
+{
+    if ((m_editMode == TrackingMode) && (m_cMousePos != m_cMouseDownPos))
+    {
+        GetIEditor()->AcceptUndo("Spline Move");
+    }
+    else if (m_pCurrentUndo && (m_cMousePos == m_cMouseDownPos))
+    {
+        if (m_editMode == SelectMode)
+        {
+            if (m_pCurrentUndo->IsSelectionChanged())
+            {
+                GetIEditor()->AcceptUndo("Key Selection");
+            }
+            else
+            {
+                GetIEditor()->CancelUndo();
+            }
+        }
+        else if ((m_editMode == TrackingMode))
+        {
+            GetIEditor()->CancelUndo();
+        }
+    }
+    else
+    {
+        GetIEditor()->CancelUndo();
+    }
+
+    // Undo has been accepted or cancelled, so clear the m_pCurrentUndo pointer.
+    m_pCurrentUndo = nullptr;
+
+    m_editMode = NothingMode;
+    releaseMouseImpl();
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::ScaleAmplitudeKeys(float time, float startValue, float offset)
+{
+    //TODO: Test it in the facial animation pane and fix it...
+    m_pHitSpline = 0;
+    m_pHitDetailSpline = 0;
+    m_nHitKeyIndex = -1;
+    m_nHitDimension = -1;
+
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        // Find the range of keys to process.
+        int keyCount = (pSpline ? pSpline->GetKeyCount() : 0);
+        int firstKeyIndex = keyCount;
+        int lastKeyIndex = -1;
+        for (int i = 0; i < keyCount; ++i)
+        {
+            if (pSpline->IsKeySelectedAtAnyDimension(i))
+            {
+                firstKeyIndex = min(firstKeyIndex, i);
+                lastKeyIndex = max(lastKeyIndex, i);
+            }
+        }
+
+        // Find the parameters of a line between the start and end points. This will form the centre line
+        // around which the amplitude of the keys will be scaled.
+        float rangeStartTime = (firstKeyIndex >= 0 && pSpline ? pSpline->GetKeyTime(firstKeyIndex) : 0.0f);
+        float rangeEndTime = (lastKeyIndex >= 0 && pSpline ? pSpline->GetKeyTime(lastKeyIndex) : 0.0f);
+        float rangeLength = max(0.01f, rangeEndTime - rangeStartTime);
+
+        for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+        {
+            ISplineInterpolator::ValueType afRangeStartValue;
+            if (firstKeyIndex >= 0 && pSpline)
+            {
+                pSpline->GetKeyValue(firstKeyIndex, afRangeStartValue);
+            }
+            else
+            {
+                memset(afRangeStartValue, 0, sizeof(ISplineInterpolator::ValueType));
+            }
+
+            ISplineInterpolator::ValueType afRangeEndValue;
+            if (lastKeyIndex >= 0 && pSpline)
+            {
+                pSpline->GetKeyValue(lastKeyIndex, afRangeEndValue);
+            }
+            else
+            {
+                memset(afRangeEndValue, 0, sizeof(ISplineInterpolator::ValueType));
+            }
+            float centreM = (afRangeEndValue[nCurrentDimension] - afRangeStartValue[nCurrentDimension]) / rangeLength;
+            float centreC = afRangeStartValue[nCurrentDimension] - centreM * rangeStartTime;
+            // Calculate the scale factor, based on how the mouse was dragged.
+            float dragCentreValue = centreM * time + centreC;
+            float dragCentreOffset = startValue - dragCentreValue;
+            float offsetScale = (fabs(dragCentreOffset) > 0.001 ? (offset + dragCentreOffset) / dragCentreOffset : 1.0f);
+            // Scale all the selected keys around this central line.
+            for (int i = 0; i < keyCount; ++i)
+            {
+                if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
+                {
+                    float keyTime = (pSpline ? pSpline->GetKeyTime(i) : 0.0f);
+                    float centreValue = keyTime * centreM + centreC;
+                    ISplineInterpolator::ValueType afKeyValue;
+                    if (pSpline)
+                    {
+                        pSpline->GetKeyValue(i, afKeyValue);
+                    }
+                    else
+                    {
+                        memset(afKeyValue, 0, sizeof(ISplineInterpolator::ValueType));
+                    }
+                    float keyOffset = afKeyValue[nCurrentDimension] - centreValue;
+                    float newKeyOffset = keyOffset * offsetScale;
+                    if (pSpline)
+                    {
+                        afKeyValue[nCurrentDimension] = centreValue + newKeyOffset;
+                        pSpline->SetKeyValue(i, afKeyValue);
+                    }
+                }
+            }
+        }
+    }
+
+    update();
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->update();
+    }
+    SendNotifyEvent(SPLN_CHANGE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::TimeScaleKeys(float time, float startTime, float endTime)
+{
+    // Calculate the scaling parameters (ie t1 = t0 * M + C).
+    float timeScaleM = 1.0f;
+    if (fabsf(startTime - time) > MIN_TIME_EPSILON_FOR_SCALING)
+    {
+        timeScaleM = (endTime - time) / (startTime - time);
+    }
+    float timeScaleC = endTime - startTime * timeScaleM;
+
+    // Loop through all keys that are selected.
+    m_pHitSpline = 0;
+    m_pHitDetailSpline = 0;
+    m_nHitKeyIndex = -1;
+
+    float affectedRangeMin = FLT_MAX;
+    float affectedRangeMax = -FLT_MAX;
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        int keyCount = pSpline->GetKeyCount();
+        float keyRangeMin = FLT_MAX;
+        float keyRangeMax = -FLT_MAX;
+        for (int i = 0; i < keyCount; i++)
+        {
+            if (pSpline->IsKeySelectedAtAnyDimension(i))
+            {
+                float oldTime = pSpline->GetKeyTime(i);
+                float t = SnapTime(oldTime * timeScaleM + timeScaleC);
+
+                pSpline->SetKeyTime(i, SnapTimeToGridVertical(t));
+
+                keyRangeMin = min(keyRangeMin, oldTime);
+                keyRangeMin = min(keyRangeMin, t);
+                keyRangeMax = max(keyRangeMax, oldTime);
+                keyRangeMax = max(keyRangeMax, t);
+            }
+        }
+        if (keyRangeMin <= keyRangeMax)
+        {
+            // Changes to a key's value affect spline up to two keys away.
+            int lastMovedKey = 0;
+            for (int keyIndex = 0; keyIndex < keyCount; ++keyIndex)
+            {
+                if (pSpline->GetKeyTime(keyIndex) <= keyRangeMax)
+                {
+                    lastMovedKey = keyIndex + 1;
+                }
+            }
+            int firstMovedKey = pSpline->GetKeyCount();
+            for (int keyIndex = pSpline->GetKeyCount() - 1; keyIndex >= 0; --keyIndex)
+            {
+                if (pSpline->GetKeyTime(keyIndex) >= keyRangeMin)
+                {
+                    firstMovedKey = keyIndex;
+                }
+            }
+
+            int firstAffectedKey = max(0, firstMovedKey - 2);
+            int lastAffectedKey = min(keyCount - 1, lastMovedKey + 2);
+
+            affectedRangeMin = min(affectedRangeMin, (firstAffectedKey <= 0 ? m_timeRange.start : pSpline->GetKeyTime(firstAffectedKey)));
+            affectedRangeMax = max(affectedRangeMax, (lastAffectedKey >= keyCount - 1 ? m_timeRange.end : pSpline->GetKeyTime(lastAffectedKey)));
+
+            // Loop through all moved keys, checking whether there are multiple keys on the same frame.
+            float lastKeyTime = -FLT_MAX;
+            pSpline->Update();
+            for (int keyIndex = 0, keys = pSpline->GetKeyCount(); keyIndex <= keys; )
+            {
+                float keyTime = pSpline->GetKeyTime(keyIndex);
+                if (fabsf(keyTime - lastKeyTime) < m_fMinTimeEpsilon)
+                {
+                    --keys;
+                    pSpline->RemoveKey(keyIndex);
+                }
+                else
+                {
+                    ++keyIndex;
+                    lastKeyTime = keyTime;
+                }
+            }
+        }
+    }
+
+    int rangeMin = TimeToXOfs(affectedRangeMin);
+    int rangeMax = TimeToXOfs(affectedRangeMax);
+
+    if (m_timeRange.start == affectedRangeMin)
+    {
+        rangeMin = m_rcSpline.left();
+    }
+    if (m_timeRange.end == affectedRangeMax)
+    {
+        rangeMax = m_rcSpline.right();
+    }
+
+    QRect invalidRect(QPoint(rangeMin - 3, m_rcSpline.top()), QPoint(rangeMax + 3, m_rcSpline.bottom() + 1) - QPoint(1, 1));
+    update(invalidRect);
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->update();
+    }
+
+    m_bKeyTimesDirty = true;
+    SendNotifyEvent(SPLN_CHANGE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::ValueScaleKeys(float startValue, float endValue)
+{
+    // Calculate the scaling parameters.
+    float valueScale = 1.0f;
+    if (fabsf(startValue) > MIN_TIME_EPSILON_FOR_SCALING)
+    {
+        valueScale = endValue / startValue;
+    }
+
+    // Loop through all keys that are selected.
+    m_pHitSpline = 0;
+    m_pHitDetailSpline = 0;
+    m_nHitKeyIndex = -1;
+    m_nHitDimension = -1;
+
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        int keyCount = pSpline->GetKeyCount();
+        for (int i = 0; i < keyCount; i++)
+        {
+            for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+            {
+                if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
+                {
+                    ISplineInterpolator::ValueType  afValue;
+                    pSpline->GetKeyValue(i, afValue);
+
+                    afValue[nCurrentDimension] = SnapValue(afValue[nCurrentDimension] * valueScale);
+                    pSpline->SetKeyValue(i, afValue);
+                }
+            }
+        }
+    }
+
+    update();
+    SendNotifyEvent(SPLN_CHANGE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::MoveSelectedKeys(Vec2 offset, bool copyKeys)
+{
+    m_pHitSpline = 0;
+    m_pHitDetailSpline = 0;
+    m_nHitKeyIndex = -1;
+    m_nHitDimension = -1;
+
+    if (copyKeys)
+    {
+        DuplicateSelectedKeys();
+    }
+
+    // For each spline...
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        int  keyCount = pSpline->GetKeyCount();
+        for (int i = 0; i < keyCount; i++)
+        {
+            float   oldTime = pSpline->GetKeyTime(i);
+            float   t = SnapTime(oldTime + offset.x);
+
+            if (pSpline->IsKeySelectedAtAnyDimension(i))
+            {
+                if (pSpline->FindKey(t, m_fMinTimeEpsilon) < 0)
+                {
+                    pSpline->SetKeyTime(i, SnapTimeToGridVertical(t));
+                }
+            }
+
+            for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+            {
+                if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
+                {
+                    ISplineInterpolator::ValueType  afValue;
+                    pSpline->GetKeyValue(i, afValue);
+
+                    afValue[nCurrentDimension] = SnapValue(afValue[nCurrentDimension] + offset.y);
+                    pSpline->SetKeyValue(i, afValue);
+                }
+            }
+        }
+    }
+
+    update();
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->update();
+    }
+
+    m_bKeyTimesDirty = true;
+    SendNotifyEvent(SPLN_CHANGE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::RemoveKey(ISplineInterpolator* pSpline, int nKey)
+{
+    CUndo undo("Remove Spline Key");
+    ConditionalStoreUndo();
+
+    m_bKeyTimesDirty = true;
+
+    SendNotifyEvent(SPLN_BEFORE_CHANGE);
+
+    m_pHitSpline = 0;
+    m_pHitDetailSpline = 0;
+    m_nHitKeyIndex = -1;
+    if (nKey != -1)
+    {
+        pSpline->RemoveKey(nKey);
+    }
+    SendNotifyEvent(SPLN_CHANGE);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::RemoveSelectedKeys()
+{
+    CUndo undo("Remove Spline Key");
+    StoreUndo();
+
+    SendNotifyEvent(SPLN_BEFORE_CHANGE);
+
+    m_pHitSpline = 0;
+    m_pHitDetailSpline = 0;
+    m_nHitKeyIndex = -1;
+
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        for (int i = 0; i < (int)pSpline->GetKeyCount(); )
+        {
+            if (pSpline->IsKeySelectedAtAnyDimension(i))
+            {
+                pSpline->RemoveKey(i);
+            }
+            else
+            {
+                i++;
+            }
+        }
+    }
+
+    m_bKeyTimesDirty = true;
+    SendNotifyEvent(SPLN_CHANGE);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::RemoveSelectedKeyTimesImpl()
+{
+    int numSelectedKeyTimes = 0;
+    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
+    {
+        if ((*it).selected)
+        {
+            ++numSelectedKeyTimes;
+        }
+    }
+
+    if (numSelectedKeyTimes)
+    {
+        CUndo undo("Remove Spline Key");
+        StoreUndo();
+        SendNotifyEvent(SPLN_BEFORE_CHANGE);
+
+        for (int splineIndex = 0, end = m_splines.size(); splineIndex < end; ++splineIndex)
+        {
+            std::vector<KeyTime>::iterator itTime = m_keyTimes.begin(), endTime = m_keyTimes.end();
+            for (int keyIndex = 0, endIndex = m_splines[splineIndex].pSpline->GetKeyCount(); keyIndex < endIndex; )
+            {
+                const float thisThreshold = 0.01f;
+                for (; itTime != endTime && (*itTime).time < m_splines[splineIndex].pSpline->GetKeyTime(keyIndex) - thisThreshold; ++itTime)
+                {
+                    ;
+                }
+                if (itTime != endTime && fabsf((*itTime).time - m_splines[splineIndex].pSpline->GetKeyTime(keyIndex)) < thisThreshold && (*itTime).selected)
+                {
+                    m_splines[splineIndex].pSpline->RemoveKey(keyIndex);
+                }
+                else
+                {
+                    ++keyIndex;
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::RemoveSelectedKeyTimes()
+{
+    RemoveSelectedKeyTimesImpl();
+
+    m_bKeyTimesDirty = true;
+    SendNotifyEvent(SPLN_CHANGE);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::RedrawWindowAroundMarker()
+{
+    UpdateKeyTimes();
+    std::vector<KeyTime>::iterator itKeyTime = std::lower_bound(m_keyTimes.begin(), m_keyTimes.end(), KeyTime(m_fTimeMarker, 0));
+    int keyTimeIndex = (itKeyTime != m_keyTimes.end() ? itKeyTime - m_keyTimes.begin() : m_keyTimes.size());
+    int redrawRangeStart = (keyTimeIndex >= 2 ? TimeToXOfs(m_keyTimes[keyTimeIndex - 2].time) : m_rcSpline.left());
+    int redrawRangeEnd = (keyTimeIndex < int(m_keyTimes.size()) - 2 ? TimeToXOfs(m_keyTimes[keyTimeIndex + 2].time) : m_rcSpline.right() + 1);
+
+    QRect rc(QPoint(redrawRangeStart, m_rcSpline.top()), QPoint(redrawRangeEnd, m_rcSpline.bottom() + 1) - QPoint(1, 1));
+    rc = rc.normalized().intersected(m_rcSpline);
+
+    m_TimeUpdateRect = QRect(QPoint(1, 2), QSize(2, 2));
+    update(rc);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SplinesChanged()
+{
+    m_bKeyTimesDirty = true;
+    UpdateKeyTimes();
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SetControlAmplitude(bool controlAmplitude)
+{
+    m_controlAmplitude = controlAmplitude;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool AbstractSplineWidget::GetControlAmplitude() const
+{
+    return m_controlAmplitude;
+}
+
+float AbstractSplineWidget::SnapTimeToGridVertical(float time)
+{
+    //float fSnapTime = int((time * m_fGridTimeScale) + 0.5f) * (1.0f / m_fGridTimeScale);
+    float fSnapTime = time;
+    return fSnapTime;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int AbstractSplineWidget::InsertKey(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, const QPoint& point)
+{
+    CUndo undo("Spline Insert Key");
+    StoreUndo();
+
+    float time, val;
+    PointToTimeValue(point, time, val);
+
+    time = SnapTimeToGridVertical(time);
+
+    int i;
+    for (i = 0; i < pSpline->GetKeyCount(); i++)
+    {
+        // Skip if any key already have time that is very close.
+        if (fabs(pSpline->GetKeyTime(i) - time) < m_fMinTimeEpsilon)
+        {
+            return i;
+        }
+    }
+
+    SendNotifyEvent(SPLN_BEFORE_CHANGE);
+
+    // The proper key value for a spline that has a detail spline is not what is shown in the control - we have
+    // to remove the detail value to get back to the underlying spline value.
+    if (pDetailSpline)
+    {
+        float offset = 0.0f;
+        pDetailSpline->InterpolateFloat(time, offset);
+        val -= offset;
+    }
+
+    ClearSelection();
+    ISplineInterpolator::ValueType currValue;
+    ISplineInterpolator::ZeroValue(currValue);
+
+    pSpline->Interpolate(time, currValue);
+
+    if (pSpline->GetNumDimensions() > 1)
+    {
+    }
+
+    int nKey = pSpline->InsertKey(time, currValue);  // TODO: Don't use FE specific snapping!
+    if (m_defaultKeyTangentType != SPLINE_KEY_TANGENT_NONE)
+    {
+        SetKeyTangentType(pSpline, nKey, m_defaultKeyTangentType);
+    }
+
+    //int nKey = pSpline->InsertKeyFloat( time,val ); // TODO: Don't use FE specific snapping!
+    SelectKey(pSpline, nKey, 0, true);
+    update();
+
+    m_bKeyTimesDirty = true;
+
+    SendNotifyEvent(SPLN_CHANGE);
+
+    return nKey;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::ClearSelection()
+{
+    ConditionalStoreUndo();
+
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
+        {
+            pSpline->SelectKeyAllDimensions(i, false);
+        }
+    }
+
+    ClearSelectedKeys();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SetTimeMarker(float fTime)
+{
+    if (m_pTimelineCtrl)
+    {
+        m_pTimelineCtrl->SetTimeMarker(fTime);
+    }
+
+    if (fTime == m_fTimeMarker)
+    {
+        return;
+    }
+
+    //// Erase old first.
+    //float x1 = TimeToXOfs(m_fTimeMarker);
+    //float x2 = TimeToXOfs(fTime);
+    //QRect rc(QPoint(x1, m_rcSpline.top()), QPoint(x2, m_rcSpline.bottom()));
+    //rc = rc.normalized().adjusted(-3, 0, 3, 0);// .intersected(m_rcSpline);
+
+    m_TimeUpdateRect = {};
+    m_fTimeMarker = fTime;
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::StoreUndo()
+{
+    if (CUndo::IsRecording() && !m_pCurrentUndo)
+    {
+        std::vector<ISplineInterpolator*> splines(m_splines.size());
+        for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+        {
+            splines[splineIndex] = m_splines[splineIndex].pSpline;
+        }
+        CUndo::Record(m_pCurrentUndo = CreateSplineCtrlUndoObject(splines));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::ConditionalStoreUndo()
+{
+    if (m_editMode == TrackingMode || m_editMode == SelectMode)
+    {
+        StoreUndo();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::ClearSelectedKeys()
+{
+    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
+    {
+        (*it).selected = false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+class CKeyCopyInfo
+{
+public:
+    ISplineInterpolator::ValueType value;
+    float time;
+    int flags;
+    ISplineInterpolator::ValueType tin, tout;
+};
+void AbstractSplineWidget::DuplicateSelectedKeys()
+{
+    m_pHitSpline = 0;
+    m_pHitDetailSpline = 0;
+    m_nHitKeyIndex = -1;
+
+    typedef std::vector<CKeyCopyInfo> KeysToAddContainer;
+    KeysToAddContainer keysToInsert;
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        keysToInsert.resize(0);
+        for (int i = 0; i < pSpline->GetKeyCount(); i++)
+        {
+            // In this particular case, the dimension doesn't matter.
+            if (pSpline->IsKeySelectedAtAnyDimension(i))
+            {
+                keysToInsert.resize(keysToInsert.size() + 1);
+                CKeyCopyInfo& copyInfo = keysToInsert.back();
+
+                copyInfo.time = pSpline->GetKeyTime(i);
+                pSpline->GetKeyValue(i, copyInfo.value);
+                pSpline->GetKeyTangents(i, copyInfo.tin, copyInfo.tout);
+                copyInfo.flags = pSpline->GetKeyFlags(i);
+            }
+        }
+
+        for (KeysToAddContainer::iterator keyToAdd = keysToInsert.begin(), endKeysToAdd = keysToInsert.end(); keyToAdd != endKeysToAdd; ++keyToAdd)
+        {
+            int keyIndex = pSpline->InsertKey(SnapTimeToGridVertical((*keyToAdd).time), (*keyToAdd).value);
+            pSpline->SetKeyTangents(keyIndex, (*keyToAdd).tin, (*keyToAdd).tout);
+            pSpline->SetKeyFlags(keyIndex, (*keyToAdd).flags & (~ESPLINE_KEY_UI_SELECTED_MASK));
+        }
+    }
+
+    m_bKeyTimesDirty = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::ZeroAll()
+{
+    GetIEditor()->BeginUndo();
+
+    typedef std::vector<ISplineInterpolator*> SplineContainer;
+    SplineContainer splines;
+    for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+        int keyIndex = (pSpline ? pSpline->FindKey(m_fTimeMarker, 0.015f) : -1);
+        if (pSpline && keyIndex >= 0)
+        {
+            splines.push_back(pSpline);
+        }
+    }
+
+    CUndo::Record(CreateSplineCtrlUndoObject(splines));
+
+    for (SplineContainer::iterator itSpline = splines.begin(); itSpline != splines.end(); ++itSpline)
+    {
+        int keyIndex = ((*itSpline) ? (*itSpline)->FindKey(m_fTimeMarker, 0.015f) : -1);
+        if ((*itSpline) && keyIndex >= 0)
+        {
+            (*itSpline)->SetKeyValueFloat(keyIndex, 0.0f);
+        }
+    }
+
+    GetIEditor()->AcceptUndo("Zero All");
+    m_pCurrentUndo = nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::KeyAll()
+{
+    GetIEditor()->BeginUndo();
+
+    typedef std::vector<ISplineInterpolator*> SplineContainer;
+    SplineContainer splines;
+    for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+        int keyIndex = (pSpline ? pSpline->FindKey(m_fTimeMarker, 0.015f) : -1);
+        if (pSpline && keyIndex == -1)
+        {
+            splines.push_back(pSpline);
+        }
+    }
+
+    CUndo::Record(CreateSplineCtrlUndoObject(splines));
+
+    for (SplineContainer::iterator itSpline = splines.begin(); itSpline != splines.end(); ++itSpline)
+    {
+        float value = 0.0f;
+        (*itSpline)->InterpolateFloat(m_fTimeMarker, value);
+        int keyIndex = (*itSpline)->InsertKeyFloat(SnapTimeToGridVertical(m_fTimeMarker), value);
+        if (m_defaultKeyTangentType != SPLINE_KEY_TANGENT_NONE)
+        {
+            SetKeyTangentType(*itSpline, keyIndex, m_defaultKeyTangentType);
+        }
+    }
+
+    GetIEditor()->AcceptUndo("Key All");
+    m_pCurrentUndo = nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SelectAll()
+{
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
+        {
+            pSpline->SelectKeyAllDimensions(i, true);
+        }
+    }
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::SendNotifyEvent(int nEvent)
+{
+    if (nEvent == SPLN_BEFORE_CHANGE)
+    {
+        ConditionalStoreUndo();
+    }
+
+    switch (nEvent)
+    {
+    case SPLN_BEFORE_CHANGE:
+        Q_EMIT beforeChange();
+        break;
+    case SPLN_CHANGE:
+        Q_EMIT change();
+        break;
+    case SPLN_TIME_CHANGE:
+        Q_EMIT timeChange();
+        break;
+    case SPLN_SCROLL_ZOOM:
+        Q_EMIT scrollZoomRequested();
+        break;
+    case SPLN_KEY_SELECTION_CHANGE:
+        Q_EMIT keySelectionChange();
+        break;
+    case NM_CLICK:
+        Q_EMIT clicked();
+        break;
+    case NM_RCLICK:
+        Q_EMIT rightClicked();
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SplineWidget::SetTimelineCtrl(TimelineWidget* pTimelineCtrl)
+{
+    m_pTimelineCtrl = pTimelineCtrl;
+    if (m_pTimelineCtrl)
+    {
+        pTimelineCtrl->setParent(this);
+        pTimelineCtrl->SetZoom(m_grid.zoom.x);
+        pTimelineCtrl->SetOrigin(m_grid.origin.x);
+        pTimelineCtrl->SetKeyTimeSet(this);
+        pTimelineCtrl->update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::AddSpline(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, const QColor& color)
+{
+    for (int i = 0; i < (int)m_splines.size(); i++)
+    {
+        if (m_splines[i].pSpline == pSpline)
+        {
+            return;
+        }
+    }
+    SSplineInfo si;
+
+    for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+    {
+        si.anColorArray[nCurrentDimension] = color;
+    }
+
+    si.pSpline = pSpline;
+    si.pDetailSpline = pDetailSpline;
+    m_splines.push_back(si);
+    m_bKeyTimesDirty = true;
+    update();
+}
+
+void AbstractSplineWidget::AddSpline(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, QColor anColorArray[4])
+{
+    for (int i = 0; i < (int)m_splines.size(); i++)
+    {
+        if (m_splines[i].pSpline == pSpline)
+        {
+            return;
+        }
+    }
+    SSplineInfo si;
+
+    for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+    {
+        si.anColorArray[nCurrentDimension] = anColorArray[nCurrentDimension];
+    }
+
+    si.pSpline = pSpline;
+    si.pDetailSpline = pDetailSpline;
+    m_splines.push_back(si);
+    m_bKeyTimesDirty = true;
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::RemoveSpline(ISplineInterpolator* pSpline)
+{
+    for (int i = 0; i < (int)m_splines.size(); i++)
+    {
+        if (m_splines[i].pSpline == pSpline)
+        {
+            m_splines.erase(m_splines.begin() + i);
+            return;
+        }
+    }
+    m_bKeyTimesDirty = true;
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::RemoveAllSplines()
+{
+    m_splines.clear();
+    m_bKeyTimesDirty = true;
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::SelectRectangle(const QRect& rc, bool bSelect)
+{
+    ConditionalStoreUndo();
+
+    ClearSelectedKeys();
+
+    Vec2 vec0 = ClientToWorld(rc.topLeft());
+    Vec2 vec1 = ClientToWorld(rc.bottomRight());
+    float t0 = vec0.x;
+    float t1 = vec1.x;
+    float v0 = vec0.y;
+    float v1 = vec1.y;
+    if (v0 > v1)
+    {
+        std::swap(v0, v1);
+    }
+    if (t0 > t1)
+    {
+        std::swap(t0, t1);
+    }
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+        ISplineInterpolator* pDetailSpline = m_splines[splineIndex].pDetailSpline;
+
+        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
+        {
+            float t = pSpline->GetKeyTime(i);
+            ISplineInterpolator::ValueType  afValue;
+            pSpline->GetKeyValue(i, afValue);
+
+            int nTotalNumberOfDimensions(pSpline->GetNumDimensions());
+
+            ISplineInterpolator::ValueType afDetailValue;
+            if (pDetailSpline)
+            {
+                ISplineInterpolator::ZeroValue(afDetailValue);
+                pDetailSpline->Interpolate(t, afDetailValue);
+            }
+
+            for (int nCurrentDimension = 0; nCurrentDimension < nTotalNumberOfDimensions; nCurrentDimension++)
+            {
+                if (pDetailSpline)
+                {
+                    afValue[nCurrentDimension] = afValue[nCurrentDimension] + afDetailValue[nCurrentDimension];
+                }
+                if (t >= t0 && t <= t1 && afValue[nCurrentDimension] >= v0 && afValue[nCurrentDimension] <= v1)
+                {
+                    pSpline->SelectKeyAtDimension(i, nCurrentDimension, bSelect);
+                }
+            }
+        }
+    }
+    SendNotifyEvent(SPLN_CHANGE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::CopyKeys()
+{
+    // Copy selected keys.
+    if (m_splines.empty() || GetNumSelected() == 0)
+    {
+        return;
+    }
+
+    XmlNodeRef rootNode = XmlHelpers::CreateXmlNode("SplineKeys");
+
+    int i;
+    float minTime = FLT_MAX;
+    float maxTime = -FLT_MAX;
+
+    ISplineInterpolator* pSpline = m_splines[0].pSpline;
+
+    for (i = 0; i < (int)pSpline->GetKeyCount(); i++)
+    {
+        if (!pSpline->IsKeySelectedAtAnyDimension(i))
+        {
+            continue;
+        }
+        float t = pSpline->GetKeyTime(i);
+        if (t < minTime)
+        {
+            minTime = t;
+        }
+        if (t > maxTime)
+        {
+            maxTime = t;
+        }
+    }
+
+    rootNode->setAttr("start", minTime);
+    rootNode->setAttr("end", maxTime);
+
+    for (i = 0; i < (int)pSpline->GetKeyCount(); i++)
+    {
+        if (!pSpline->IsKeySelectedAtAnyDimension(i))
+        {
+            continue;
+        }
+
+        float t = pSpline->GetKeyTime(i); // Store offset time from copy/paste range.
+        ISplineInterpolator::ValueType afValue;
+        pSpline->GetKeyValue(i, afValue);
+
+        float tin, tout;
+        ISplineInterpolator::ValueType vtin, vtout;
+        pSpline->GetKeyTangents(i, vtin, vtout);
+        tin = vtin[0];
+        tout = vtout[0];
+
+        XmlNodeRef keyNode = rootNode->newChild("Key");
+        keyNode->setAttr("time", t);
+        keyNode->setAttr("flags", (int)pSpline->GetKeyFlags(i));
+        keyNode->setAttr("in", tin);
+        keyNode->setAttr("out", tout);
+
+
+        for (int ii = 0; ii < pSpline->GetNumDimensions(); ++ii)
+        {
+            XmlNodeRef dimensionNode = keyNode->newChild("values");
+            dimensionNode->setAttr("value", afValue[ii]);
+        }
+    }
+
+    CClipboard clipboard(WidgetCast());
+    clipboard.Put(rootNode);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::PasteKeys()
+{
+    if (m_splines.empty() || GetNumSelected() == 0)
+    {
+        return;
+    }
+
+    ISplineInterpolator* pSpline = m_splines[0].pSpline;
+
+    CClipboard clipboard(WidgetCast());
+    if (clipboard.IsEmpty())
+    {
+        return;
+    }
+
+    XmlNodeRef rootNode = clipboard.Get();
+    if (!rootNode)
+    {
+        return;
+    }
+    if (!rootNode->isTag("SplineKeys"))
+    {
+        return;
+    }
+
+    float minTime = 0;
+    float maxTime = 0;
+    rootNode->getAttr("start", minTime);
+    rootNode->getAttr("end", maxTime);
+
+    const QPoint point = mapFromGlobal(QCursor::pos());
+    float fTime = XOfsToTime(point.x());
+    float fTimeRange = (maxTime - minTime);
+
+    CUndo undo("Paste Spline Keys");
+
+    ConditionalStoreUndo();
+
+    ClearSelection();
+
+    int i;
+    // Delete keys in range min to max time.
+    for (i = 0; i < pSpline->GetKeyCount(); )
+    {
+        float t = pSpline->GetKeyTime(i);
+        if (t >= fTime && t <= fTime + fTimeRange)
+        {
+            pSpline->RemoveKey(i);
+        }
+        else
+        {
+            i++;
+        }
+    }
+
+    for (i = 0; i < rootNode->getChildCount(); i++)
+    {
+        XmlNodeRef keyNode = rootNode->getChild(i);
+        float t = 0;
+        float tin = 0;
+        float tout = 0;
+        int flags = 0;
+
+        keyNode->getAttr("time", t);
+        keyNode->getAttr("flags", flags);
+        keyNode->getAttr("in", tin);
+        keyNode->getAttr("out", tout);
+
+        int nNumberOfChildXMLNodes(0);
+        int nCurrentChildXMLNode(0);
+        int nCurrentValue(0);
+
+        ISplineInterpolator::ValueType  afValue;
+
+        nNumberOfChildXMLNodes = keyNode->getChildCount();
+        for (nCurrentChildXMLNode = 0; nCurrentChildXMLNode < nNumberOfChildXMLNodes; ++nCurrentChildXMLNode)
+        {
+            XmlNodeRef rSubKeyNode = keyNode->getChild(nCurrentChildXMLNode);
+            if (rSubKeyNode->isTag("values"))
+            {
+                rSubKeyNode->getAttr("value", afValue[nCurrentValue]);
+                nCurrentValue++;
+            }
+        }
+
+        int key = pSpline->InsertKey(SnapTimeToGridVertical(t - minTime + fTime), afValue);
+        if (key >= 0)
+        {
+            pSpline->SelectKeyAllDimensions(key, true);
+            ISplineInterpolator::ValueType vtin, vtout;
+            vtin[0] = tin;
+            vtout[0] = tout;
+            pSpline->SetKeyTangents(key, vtin, vtout);
+        }
+    }
+    m_bKeyTimesDirty = true;
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::ModifySelectedKeysFlags(int nRemoveFlags, int nAddFlags)
+{
+    CUndo undo("Modify Spline Keys");
+    StoreUndo();
+
+    SendNotifyEvent(SPLN_BEFORE_CHANGE);
+
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
+        {
+            // If the key is selected in any dimension...
+            for (
+                int nCurrentDimension = 0;
+                nCurrentDimension < pSpline->GetNumDimensions();
+                nCurrentDimension++
+                )
+            {
+                if (IsKeySelected(pSpline, i, nCurrentDimension))
+                {
+                    int flags = pSpline->GetKeyFlags(i);
+                    flags &= ~nRemoveFlags;
+                    flags |= nAddFlags;
+
+                    pSpline->SetKeyFlags(i, flags);
+                    break;
+                }
+            }
+        }
+    }
+
+    SendNotifyEvent(SPLN_CHANGE);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::FitSplineToViewWidth()
+{
+    // Calculate time zoom so that whole time range fits.
+    float t0 = FLT_MAX;
+    float t1 = -FLT_MAX;
+
+    bool bAnyKey = false;
+    for (int i = 0; i < int(m_splines.size()); ++i)
+    {
+        //////////////////////////////////////////////////////////////////////////
+        ISplineInterpolator* pSpline = m_splines[i].pSpline;
+        if (!pSpline)
+        {
+            continue;
+        }
+
+        for (int keyIndex = 0; pSpline && keyIndex < pSpline->GetKeyCount(); ++keyIndex)
+        {
+            float keyTime = pSpline->GetKeyTime(keyIndex);
+            t0 = std::min(t0, keyTime);
+            t1 = std::max(t1, keyTime);
+            bAnyKey = true;
+        }
+    }
+    if (!bAnyKey)
+    {
+        t0 = m_timeRange.start;
+        t1 = m_timeRange.end;
+    }
+
+    float zoom = abs(m_rcSpline.width() - 20) / max(1.0f, fabs(t1 - t0));
+    SetZoom(Vec2(zoom, m_grid.zoom.y));
+    SetScrollOffset(Vec2(t0, m_grid.origin.y));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::FitSplineToViewHeight()
+{
+    // Calculate time zoom so that whole value range fits.
+    Range splineRange = GetSplinesRange();
+    if (splineRange.start == FLT_MAX)
+    {
+        splineRange = m_valueRange;
+    }
+
+    float zoom = abs(m_rcSpline.height() - 40) / max(minViewRange, splineRange.Length());
+    SetZoom(Vec2(m_grid.zoom.x, zoom));
+
+    // Center the range if it's less than the minRange by adjusting it's offset.
+    float scrollOffset = max(0.0f, minViewRange - splineRange.Length()) / 2.0f;
+
+    SetScrollOffset(Vec2(m_grid.origin.x, splineRange.start - scrollOffset));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::FitSplineHeightToValueRange()
+{
+    Range splineRange = GetSplinesRange();
+    splineRange.start = min(splineRange.start, m_valueRange.start);
+    splineRange.end = max(splineRange.end, m_valueRange.end);
+
+    float zoom = abs(m_rcSpline.height() - 40) / max(minViewRange, splineRange.Length());
+    SetZoom(Vec2(m_grid.zoom.x, zoom));
+    SetScrollOffset(Vec2(m_grid.origin.x, splineRange.start));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::OnUserCommand(UINT cmd)
+{
+    switch (cmd)
+    {
+    case ID_TANGENT_IN_ZERO:
+        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK, SPLINE_KEY_TANGENT_ZERO << SPLINE_KEY_TANGENT_IN_SHIFT);
+        break;
+    case ID_TANGENT_IN_STEP:
+        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK, SPLINE_KEY_TANGENT_STEP << SPLINE_KEY_TANGENT_IN_SHIFT);
+        break;
+    case ID_TANGENT_IN_LINEAR:
+        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK, SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_IN_SHIFT);
+        break;
+
+    case ID_TANGENT_OUT_ZERO:
+        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_OUT_MASK, SPLINE_KEY_TANGENT_ZERO << SPLINE_KEY_TANGENT_OUT_SHIFT);
+        break;
+    case ID_TANGENT_OUT_STEP:
+        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_OUT_MASK, SPLINE_KEY_TANGENT_STEP << SPLINE_KEY_TANGENT_OUT_SHIFT);
+        break;
+    case ID_TANGENT_OUT_LINEAR:
+        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_OUT_MASK, SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_OUT_SHIFT);
+        break;
+
+    case ID_TANGENT_AUTO:
+        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK | SPLINE_KEY_TANGENT_OUT_MASK, 0);
+        break;
+
+    case ID_SPLINE_FIT_X:
+        FitSplineToViewWidth();
+        break;
+    case ID_SPLINE_FIT_Y:
+        FitSplineToViewHeight();
+        break;
+    case ID_SPLINE_SNAP_GRID_X:
+        SetSnapTime(!m_bSnapTime);
+        break;
+    case ID_SPLINE_SNAP_GRID_Y:
+        SetSnapValue(!m_bSnapValue);
+        break;
+    case ID_SPLINE_PREVIOUS_KEY:
+        GotoNextKey(true);
+        break;
+    case ID_SPLINE_NEXT_KEY:
+        GotoNextKey(false);
+        break;
+    case ID_SPLINE_FLATTEN_ALL:
+        RemoveAllKeysButThis();
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::GotoNextKey(bool previousKey)
+{
+    if (GetNumSelected() == 1)
+    {
+        bool boFoundTheSelectedKey(false);
+
+        for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
+        {
+            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+            for (int i = 0; i < pSpline->GetKeyCount(); i++)
+            {
+                for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+                {
+                    if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
+                    {
+                        boFoundTheSelectedKey = true;
+
+                        if ((previousKey && i > 0) || (!previousKey && i + 1 < pSpline->GetKeyCount()))
+                        {
+                            int nextKey = previousKey ? i - 1 : i + 1;
+                            float keyTime = pSpline->GetKeyTime(nextKey);
+
+                            SetTimeMarker(keyTime);
+
+                            ISplineInterpolator::ValueType afValue;
+                            pSpline->GetKeyValue(nextKey, afValue);
+
+                            pSpline->SelectKeyAtDimension(i, nCurrentDimension, false);
+                            pSpline->SelectKeyAtDimension(nextKey, nCurrentDimension, true);
+
+                            // Set the new scrolled coordinates
+                            float ofsx = keyTime - ((m_grid.rect.right() + 1) / 2) / m_grid.zoom.x;
+                            float ofsy = afValue[nCurrentDimension] - ((m_grid.rect.bottom() + 1) / 2) / m_grid.zoom.y;
+
+                            SetScrollOffset(Vec2(ofsx, ofsy));
+                        }
+                        break;
+                    }
+                }
+                if (boFoundTheSelectedKey)
+                {
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
+        {
+            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+            float fClosestKeyTime = -1.0f;
+            float fClosestDist = 1E8;
+
+            for (int i = 0; i < pSpline->GetKeyCount(); i++)
+            {
+                float fKeyTime = pSpline->GetKeyTime(i);
+                float fKeyDist = previousKey ? m_fTimeMarker - fKeyTime : fKeyTime - m_fTimeMarker;
+
+                if ((fKeyDist > 0.0f) && (fKeyDist < fClosestDist))
+                {
+                    fClosestDist = fKeyDist;
+                    fClosestKeyTime = pSpline->GetKeyTime(i);
+                }
+            }
+
+            if (fClosestKeyTime >= 0.0f)
+            {
+                SetTimeMarker(fClosestKeyTime);
+
+                float averageValue = 0.f;
+                int dimensions = pSpline->GetNumDimensions();
+
+                for (int i = 0; i < dimensions; i++)
+                {
+                    float keyValue;
+                    int keyNum = pSpline->FindKey(fClosestKeyTime);
+
+                    pSpline->GetKeyValueFloat(keyNum, keyValue);
+                    averageValue += keyValue;
+                }
+
+                // Set the new scrolled coordinates
+                float ofsx = fClosestKeyTime - ((m_grid.rect.right() + 1) / 2) / m_grid.zoom.x;
+                float ofsy = averageValue / dimensions - ((m_grid.rect.bottom() + 1) / 2) / m_grid.zoom.y;
+
+                SetScrollOffset(Vec2(ofsx, ofsy));
+            }
+        }
+    }
+    SendNotifyEvent(SPLN_TIME_CHANGE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void AbstractSplineWidget::RemoveAllKeysButThis()
+{
+    std::vector<int> keys;
+
+    for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        for (int i = 0; i < pSpline->GetKeyCount(); i++)
+        {
+            if (pSpline->IsKeySelectedAtAnyDimension(i))
+            {
+                keys.push_back(i);
+            }
+        }
+
+        for (int i = pSpline->GetKeyCount(); i >= 0; i--)
+        {
+            bool saveKey = false;
+
+            for (int nIndex = 0; nIndex < keys.size(); nIndex++)
+            {
+                if (keys[nIndex] == i)
+                {
+                    saveKey = true;
+                }
+            }
+
+            if (!saveKey)
+            {
+                RemoveKey(pSpline, i);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+ISplineCtrlUndo* AbstractSplineWidget::CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer)
+{
+    return new CUndoSplineCtrlEx(this, splineContainer);
+}
+
+Range AbstractSplineWidget::GetSplinesRange()
+{
+    Range range(FLT_MAX, -FLT_MAX);
+
+    for (int i = 0; i < int(m_splines.size()); ++i)
+    {
+        //////////////////////////////////////////////////////////////////////////
+        ISplineInterpolator* pSpline = m_splines[i].pSpline;
+        if (!pSpline)
+        {
+            continue;
+        }
+
+        ISplineInterpolator::ValueType value;
+        for (int keyIndex = 0; pSpline && keyIndex < pSpline->GetKeyCount(); ++keyIndex)
+        {
+            pSpline->GetKeyValue(keyIndex, value);
+            for (int d = 0, numDim = pSpline->GetNumDimensions(); d < numDim; d++)
+            {
+                range.start = std::min(range.start, value[d]);
+                range.end = std::max(range.end, value[d]);
+            }
+        }
+    }
+
+    return range;
+}
+
+#include <Controls/moc_SplineCtrlEx.cpp>
diff --git a/Code/Editor/Controls/SplineCtrlEx.h b/Code/Editor/Controls/SplineCtrlEx.h
new file mode 100644
index 0000000000..f99dcaa270
--- /dev/null
+++ b/Code/Editor/Controls/SplineCtrlEx.h
@@ -0,0 +1,415 @@
+/*
+ * 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_CONTROLS_SPLINECTRLEX_H
+#define CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRLEX_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <ISplines.h>
+#include "Controls/WndGridHelper.h"
+#include "IKeyTimeSet.h"
+#include "Undo/IUndoObject.h"
+#include <QWidget>
+#endif
+
+// Custom styles for this control.
+#define SPLINE_STYLE_NOGRID 0x0001
+#define SPLINE_STYLE_NO_TIME_MARKER 0x0002
+
+// Notify event sent when spline is being modified.
+#define SPLN_CHANGE (0x0001)
+// Notify event sent just before when spline is modified.
+#define SPLN_BEFORE_CHANGE (0x0002)
+// Notify when spline control is scrolled/zoomed.
+#define SPLN_SCROLL_ZOOM (0x0003)
+// Notify when time changed.
+#define SPLN_TIME_START_CHANGE  (0x0001)
+#define SPLN_TIME_END_CHANGE        (0x0002)
+#define SPLN_TIME_CHANGE (0x0004)
+// Notify event sent when a key selection changes
+#define SPLN_KEY_SELECTION_CHANGE (0x0005)
+
+#ifndef NM_CLICK
+#define NM_CLICK (-2)
+#define NM_RCLICK (-5)
+#endif
+
+#ifdef LoadCursor
+#undef LoadCursor
+#endif
+
+class AbstractTimelineWidget;
+class TimelineWidget;
+
+class QRubberBand;
+
+class ISplineSet
+{
+public:
+    virtual ISplineInterpolator* GetSplineFromID(const string& id) = 0;
+    virtual string GetIDFromSpline(ISplineInterpolator* pSpline) = 0;
+    virtual int GetSplineCount() const = 0;
+    virtual int GetKeyCountAtTime(float time, float threshold) const = 0;
+};
+
+class ISplineCtrlUndo
+    : public IUndoObject
+{
+public:
+    virtual bool IsSelectionChanged() const = 0;
+};
+
+class AbstractSplineWidget
+    : public IKeyTimeSet
+{
+    friend class CUndoSplineCtrlEx;
+public:
+    AbstractSplineWidget();
+    virtual ~AbstractSplineWidget();
+
+    int InsertKey(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, const QPoint& point);
+
+    virtual void update() = 0;
+    virtual void update(const QRect& rect) = 0;
+
+    virtual QPoint mapFromGlobal(const QPoint& point) const = 0;
+
+    virtual void SetCapture() {}
+
+    virtual QWidget* WidgetCast() = 0;
+
+    void SetGrid(int numX, int numY) { m_gridX = numX; m_gridY = numY; };
+    void SetTimeRange(const Range& range) { m_timeRange = range; }
+    void SetValueRange(const Range& range) { m_valueRange = range; }
+    void SetDefaultValueRange(const Range& range) { m_defaultValueRange = range; }
+    void SetDefaultKeyTangentType(ESplineKeyTangentType type) { m_defaultKeyTangentType = type; }
+    ESplineKeyTangentType GetDefaultKeyTangentType() const { return m_defaultKeyTangentType; }
+    void SetTooltipValueScale(float x, float y) { m_fTooltipScaleX = x; m_fTooltipScaleY = y; };
+    void SetSplineSet(ISplineSet* pSplineSet);
+
+    void AddSpline(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, const QColor& color);
+    void AddSpline(ISplineInterpolator * pSpline, ISplineInterpolator * pDetailSpline, QColor anColorArray[4]);
+    void RemoveSpline(ISplineInterpolator* pSpline);
+    void RemoveAllSplines();
+    int  GetSplineCount() const { return m_splines.size(); }
+    ISplineInterpolator* GetSpline(int nIndex) const { return m_splines[nIndex].pSpline; }
+
+    void SetTimeMarker(float fTime);
+    float GetTimeMarker() const { return m_fTimeMarker; }
+    void SetTimeScale(float timeScale) { m_fTimeScale = timeScale; }
+    void SetGridTimeScale(float fGridTimeScale) { m_fGridTimeScale = fGridTimeScale; }
+    float GetGridTimeScale() { return m_fGridTimeScale; }
+
+    void  SetMinTimeEpsilon(float fMinTimeEpsilon) { m_fMinTimeEpsilon = fMinTimeEpsilon; }
+    float GetMinTimeEpsilon() const { return m_fMinTimeEpsilon; }
+
+    void SetSnapTime(bool bOn) { m_bSnapTime = bOn; }
+    void SetSnapValue(bool bOn) { m_bSnapValue = bOn; }
+    bool IsSnapTime() const { return m_bSnapTime; }
+    bool IsSnapValue() const { return m_bSnapValue; }
+
+    float SnapTimeToGridVertical(float time);
+
+    void OnUserCommand(UINT cmd);
+    void FitSplineToViewWidth();
+    void FitSplineToViewHeight();
+    void FitSplineHeightToValueRange();
+
+    void CopyKeys();
+    void PasteKeys();
+
+    void StoreUndo();
+
+    void ZeroAll();
+    void KeyAll();
+    void SelectAll();
+
+    void RemoveSelectedKeyTimes();
+
+    void RedrawWindowAroundMarker();
+
+    void SplinesChanged();
+    void SetControlAmplitude(bool controlAmplitude);
+    bool GetControlAmplitude() const;
+
+    //void SelectPreviousKey();
+    //void SelectNextKey();
+    void GotoNextKey(bool previousKey);
+    void RemoveAllKeysButThis();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Scrolling/Zooming.
+    //////////////////////////////////////////////////////////////////////////
+    Vec2   ClientToWorld(const QPoint& point);
+    QPoint WorldToClient(Vec2 v);
+    Vec2 GetZoom();
+    void SetZoom(Vec2 zoom, const QPoint& center);
+    void SetZoom(Vec2 zoom);
+    void SetScrollOffset(Vec2 ofs);
+    Vec2 GetScrollOffset();
+    float SnapTime(float time);
+    float SnapValue(float val);
+    //////////////////////////////////////////////////////////////////////////
+
+    // IKeyTimeSet Implementation
+    virtual int GetKeyTimeCount() const;
+    virtual float GetKeyTime(int index) const;
+    virtual void MoveKeyTimes(int numChanges, int* indices, float scale, float offset, bool copyKeys);
+    virtual bool GetKeyTimeSelected(int index) const;
+    virtual void SetKeyTimeSelected(int index, bool selected);
+    virtual int GetKeyCount(int index) const;
+    virtual int GetKeyCountBound() const;
+    virtual void BeginEdittingKeyTimes();
+    virtual void EndEdittingKeyTimes();
+
+    void SetEditLock(bool bLock) { m_bEditLock = bLock; }
+
+    int leftBorderOffset() const
+    {
+        return m_nLeftOffset;
+    }
+
+protected:
+    enum EHitCode
+    {
+        HIT_NOTHING,
+        HIT_KEY,
+        HIT_SPLINE,
+        HIT_TIMEMARKER,
+        HIT_TANGENT_HANDLE
+    };
+    enum EEditMode
+    {
+        NothingMode = 0,
+        SelectMode,
+        TrackingMode,
+        ScrollZoomMode,
+        ScrollMode,
+        ZoomMode,
+        TimeMarkerMode,
+    };
+
+    struct SSplineInfo
+    {
+        QColor anColorArray[4];
+        ISplineInterpolator* pSpline;
+        ISplineInterpolator* pDetailSpline;
+    };
+
+    virtual bool GetTangentHandlePts(QPoint& inTangentPt, QPoint& pt, QPoint& outTangentPt, int nSpline, int nKey, int nDimension);
+
+    EHitCode HitTest(const QPoint& point);
+    ISplineInterpolator* HitSpline(const QPoint& point);
+
+    //Tracking support helper functions
+    void StartTracking(bool copyKeys);
+    void StopTracking();
+    void RemoveKey(ISplineInterpolator* pSpline, int nKey);
+    void RemoveSelectedKeys();
+    void RemoveSelectedKeyTimesImpl();
+    void MoveSelectedKeys(Vec2 offset, bool copyKeys);
+    void ScaleAmplitudeKeys(float time, float startValue, float offset);
+    void TimeScaleKeys(float time, float startTime, float endTime);
+    void ValueScaleKeys(float startValue, float endValue);
+    void ModifySelectedKeysFlags(int nRemoveFlags, int nAddFlags);
+
+    QPoint TimeToPoint(float time, ISplineInterpolator* pSpline);
+    float TimeToXOfs(float x);
+    void PointToTimeValue(QPoint point, float& time, float& value);
+    float  XOfsToTime(int x);
+    QPoint XOfsToPoint(int x, ISplineInterpolator* pSpline);
+
+    virtual void ClearSelection();
+    virtual void SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect);
+    bool IsKeySelected(ISplineInterpolator* pSpline, int nKey, int nDimension) const;
+    int GetNumSelected();
+
+    void SetHorizontalExtent(int min, int max);
+
+    virtual void SendNotifyEvent(int nEvent) = 0;
+
+    virtual void SelectRectangle(const QRect& rc, bool bSelect);
+    //////////////////////////////////////////////////////////////////////////
+    void UpdateKeyTimes() const;
+
+    void ConditionalStoreUndo();
+
+    void ClearSelectedKeys();
+    void DuplicateSelectedKeys();
+
+    Range GetSplinesRange();
+
+    virtual void captureMouseImpl() = 0;
+    virtual void releaseMouseImpl() = 0;
+    virtual void setCursorImpl(UINT cursor) = 0;
+
+    virtual ISplineCtrlUndo* CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer);
+
+    QRect m_rcClipRect;
+    QRect m_rcSpline;
+    QRect m_rcClient;
+
+    QPoint m_cMousePos;
+    QPoint m_cMouseDownPos;
+    QPoint m_hitPoint;
+    EHitCode m_hitCode;
+    int m_nHitKeyIndex;
+    int m_nHitDimension;
+    int m_bHitIncomingHandle;
+    ISplineInterpolator* m_pHitSpline;
+    ISplineInterpolator* m_pHitDetailSpline;
+    QPoint m_curvePoint;
+
+    float m_fTimeMarker;
+
+    int m_nKeyDrawRadius;
+
+    bool m_bSnapTime;
+    bool m_bSnapValue;
+    bool m_bBitmapValid;
+
+    int m_gridX;
+    int m_gridY;
+
+    float m_fMinTime, m_fMaxTime;
+    float m_fMinValue, m_fMaxValue;
+    float m_fTooltipScaleX, m_fTooltipScaleY;
+
+    float m_fMinTimeEpsilon;
+
+    QPoint m_lastToolTipPos;
+    QString m_tooltipText;
+
+    QRect m_rcSelect;
+
+    QRect m_TimeUpdateRect;
+
+    float m_fTimeScale;
+    float m_fValueScale;
+    float m_fGridTimeScale;
+
+    Range m_timeRange;
+    Range m_valueRange;
+    Range m_defaultValueRange;
+
+    //! This is how often to place ticks.
+    //! value of 10 means place ticks every 10 second.
+    double m_ticksStep;
+
+    EEditMode m_editMode;
+
+    int m_nLeftOffset;
+    CWndGridHelper m_grid;
+
+    //////////////////////////////////////////////////////////////////////////
+    std::vector<SSplineInfo> m_splines;
+
+    mutable bool m_bKeyTimesDirty;
+    class KeyTime
+    {
+    public:
+        KeyTime(float time, int count)
+            : time(time)
+            , oldTime(0.0f)
+            , selected(false)
+            , count(count) {}
+        bool operator<(const KeyTime& other) const { return this->time < other.time; }
+        float time;
+        float oldTime;
+        bool selected;
+        int count;
+    };
+    mutable std::vector<KeyTime> m_keyTimes;
+    mutable int m_totalSplineCount;
+
+    static const float threshold;
+
+    bool m_copyKeys;
+    bool m_startedDragging;
+
+    bool m_controlAmplitude;
+    ESplineKeyTangentType m_defaultKeyTangentType;
+    // Improving mouse control...
+    bool m_boLeftMouseButtonDown;
+
+    ISplineSet* m_pSplineSet;
+
+    bool m_bEditLock;
+
+    ISplineCtrlUndo* m_pCurrentUndo;
+    AbstractTimelineWidget* m_pTimelineCtrl;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Spline control.
+//////////////////////////////////////////////////////////////////////////
+
+
+class SplineWidget
+    : public QWidget
+    , public AbstractSplineWidget
+{
+    Q_OBJECT
+public:
+    SplineWidget(QWidget* parent);
+    virtual ~SplineWidget();
+
+    void update() { QWidget::update(); }
+    void update(const QRect& rect) { QWidget::update(rect); }
+
+    QPoint mapFromGlobal(const QPoint& point) const override { return QWidget::mapFromGlobal(point); }
+
+    void SetTimelineCtrl(TimelineWidget* pTimelineCtrl);
+
+    QWidget* WidgetCast() override { return this; }
+
+Q_SIGNALS:
+    void beforeChange();
+    void change();
+    void timeChange();
+    void scrollZoomRequested();
+    void clicked();
+    void rightClicked();
+    void keySelectionChange();
+
+protected:
+    void paintEvent(QPaintEvent* event) override;
+    void resizeEvent(QResizeEvent* event) override;
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+    void wheelEvent(QWheelEvent* event) override;
+    void keyPressEvent(QKeyEvent* event) override;
+    bool event(QEvent* event) override;
+
+    void OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnLButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnRButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnMButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnMButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
+
+    void DrawGrid(QPainter* painter);
+    void DrawSpline(QPainter* pDC, SSplineInfo& splineInfo, float startTime, float endTime);
+    void DrawKeys(QPainter* painter, int splineIndex, float startTime, float endTime);
+    void DrawTimeMarker(QPainter* pDC);
+
+    void DrawTangentHandle(QPainter* pDC, int nSpline, int nKey, int nDimension);
+
+    void SendNotifyEvent(int nEvent) override;
+
+    void captureMouseImpl() override { grabMouse(); }
+    void releaseMouseImpl() override { releaseMouse(); }
+    void setCursorImpl(UINT cursor) override { setCursor(CMFCUtils::LoadCursor(cursor)); }
+
+protected:
+    QRubberBand* m_rubberBand;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRLEX_H
diff --git a/Code/Editor/Controls/TextEditorCtrl.cpp b/Code/Editor/Controls/TextEditorCtrl.cpp
new file mode 100644
index 0000000000..964a952064
--- /dev/null
+++ b/Code/Editor/Controls/TextEditorCtrl.cpp
@@ -0,0 +1,92 @@
+/*
+ * 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 "TextEditorCtrl.h"
+
+
+// CTextEditorCtrl
+CTextEditorCtrl::CTextEditorCtrl(QWidget* pParent)
+    : QTextEdit(pParent)
+{
+     m_bModified = true;
+
+    QFont font;
+    font.setFamily("Courier New");
+    font.setFixedPitch(true);
+    font.setPointSize(10);
+    setFont(font);
+
+    setLineWrapMode(NoWrap);
+
+    connect(this, &QTextEdit::textChanged, this, &CTextEditorCtrl::OnChange);
+}
+
+CTextEditorCtrl::~CTextEditorCtrl()
+{
+}
+
+
+// CTextEditorCtrl message handlers
+
+void CTextEditorCtrl::LoadFile(const QString& sFileName)
+{
+    if (m_filename == sFileName)
+    {
+        return;
+    }
+
+    m_filename = sFileName;
+
+    clear();
+
+    CCryFile file(sFileName.toUtf8().data(), "rb");
+    if (file.Open(sFileName.toUtf8().data(), "rb"))
+    {
+        size_t length = file.GetLength();
+
+        QByteArray text;
+        text.resize(length);
+        file.ReadRaw(text.data(), length);
+
+        setPlainText(text);
+    }
+
+    m_bModified = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTextEditorCtrl::SaveFile(const QString& sFileName)
+{
+    if (sFileName.isEmpty())
+    {
+        return;
+    }
+
+    if (!CFileUtil::OverwriteFile(sFileName.toUtf8().data()))
+    {
+        return;
+    }
+
+    QFile file(sFileName);
+    file.open(QFile::WriteOnly);
+
+    file.write(toPlainText().toUtf8());
+
+    m_bModified = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTextEditorCtrl::OnChange()
+{
+
+    m_bModified = true;
+}
+
+#include <Controls/moc_TextEditorCtrl.cpp>
diff --git a/Code/Editor/Controls/TextEditorCtrl.h b/Code/Editor/Controls/TextEditorCtrl.h
new file mode 100644
index 0000000000..23a17a059c
--- /dev/null
+++ b/Code/Editor/Controls/TextEditorCtrl.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_CONTROLS_TEXTEDITORCTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_TEXTEDITORCTRL_H
+#pragma once
+
+// CTextEditorCtrl
+#if !defined(Q_MOC_RUN)
+#include <QTextEdit>
+#endif
+
+class CTextEditorCtrl
+    : public QTextEdit
+{
+    Q_OBJECT
+
+public:
+    CTextEditorCtrl(QWidget* pParent = nullptr);
+    virtual ~CTextEditorCtrl();
+
+    void LoadFile(const QString& sFileName);
+    void SaveFile(const QString& sFileName);
+    QString GetFilename() const { return m_filename; }
+
+    bool IsModified() const { return m_bModified; }
+
+    //! Must be called after OnChange message.
+    void OnChange();
+
+protected:
+    QString m_filename;
+    bool m_bModified;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_TEXTEDITORCTRL_H
diff --git a/Code/Editor/Controls/TimelineCtrl.cpp b/Code/Editor/Controls/TimelineCtrl.cpp
new file mode 100644
index 0000000000..e6b21725e5
--- /dev/null
+++ b/Code/Editor/Controls/TimelineCtrl.cpp
@@ -0,0 +1,676 @@
+/*
+ * 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 "TimelineCtrl.h"
+
+// Qt
+#include <QPainter>
+
+// Editor
+#include "ScopedVariableSetter.h"
+#include "GridUtils.h"
+
+
+static const QColor timeMarkerCol = QColor(255, 0, 255);
+static const QColor textCol = QColor(0, 0, 0);
+static const QColor ltgrayCol = QColor(110, 110, 110);
+
+QColor InterpolateColor(const QColor& c1, const QColor& c2, float fraction)
+{
+    const int r = (c2.red() - c1.red()) * fraction + c1.red();
+    const int g = (c2.green() - c1.green()) * fraction + c1.green();
+    const int b = (c2.blue() - c1.blue()) * fraction + c1.blue();
+    return QColor(r, g, b);
+}
+
+//////////////////////////////////////////////////////////////////////////
+TimelineWidget::TimelineWidget(QWidget* parent /* = nullptr */)
+    : QWidget(parent)
+{
+    setMouseTracking(true);
+
+    m_timeRange.start = 0;
+    m_timeRange.end = 1;
+
+    m_timeScale = 1;
+    m_fTicksTextScale = 1.0f;
+
+    m_fTimeMarker = -10;
+
+    m_nTicksStep = 100;
+
+    m_trackingMode = TRACKING_MODE_NONE;
+
+    m_leftOffset = 0;
+    m_scrollOffset = 0;
+
+    m_ticksStep = 10.0f;
+
+    m_grid.zoom.x = 100;
+
+    m_bIgnoreSetTime = false;
+
+    m_pKeyTimeSet = 0;
+
+    m_markerStyle = MARKER_STYLE_SECONDS;
+    m_fps = 30.0f;
+
+    m_copyKeyTimes = false;
+    m_bTrackingSnapToFrames = false;
+}
+
+TimelineWidget::~TimelineWidget()
+{
+}
+/////////////////////////////////////////////////////////////////////////////
+// CTimelineCtrl message handlers
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::resizeEvent(QResizeEvent* event)
+{
+    Q_UNUSED(event);
+    m_rcTimeline = rect();
+    m_grid.rect = m_rcTimeline;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int TimelineWidget::TimeToClient(float time)
+{
+    return m_grid.WorldToClient(Vec2(time, 0)).x();
+}
+
+//////////////////////////////////////////////////////////////////////////
+float TimelineWidget::ClientToTime(int x)
+{
+    return m_grid.ClientToWorld(QPoint(x, 0)).x;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::paintEvent(QPaintEvent* event)
+{
+    QPainter painter(this);
+
+    QRect rcClient = rect();
+
+    {
+        //////////////////////////////////////////////////////////////////////////
+        // Fill keys background.
+        //////////////////////////////////////////////////////////////////////////
+        const QRect rc = rcClient.intersected(event->rect());
+        painter.fillRect(rc, palette().color(QPalette::Button));
+        painter.drawRect(rc);
+        //////////////////////////////////////////////////////////////////////////
+
+        m_grid.CalculateGridLines();
+
+        DrawTicks(&painter);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float TimelineWidget::SnapTime(float time)
+{
+    double t = floor((double)time * m_ticksStep + 0.5);
+    t = t / m_ticksStep;
+    return t;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::DrawTicks(QPainter* painter)
+{
+    const QRectF rc = rect();
+
+    const QPen pOldPen = painter->pen();
+
+    const QPen ltgray(QColor(110, 110, 110));
+    const QPen black(palette().color(QPalette::Normal, QPalette::Text));
+    const QPen redpen(QColor(255, 0, 255));
+
+    // Draw time ticks every tick step seconds.
+    Range timeRange = m_timeRange;
+
+    painter->setPen(ltgray);
+
+    switch (m_markerStyle)
+    {
+    case MARKER_STYLE_SECONDS:
+        DrawSecondTicks(painter);
+        break;
+
+    case MARKER_STYLE_FRAMES:
+        DrawFrameTicks(painter);
+        break;
+    }
+
+    painter->setPen(redpen);
+    int x = TimeToClient(m_fTimeMarker);
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(QRect(QPoint(x - 3, rc.top()), QPoint(x + 2, rc.bottom())));
+
+    painter->setPen(redpen);
+    painter->drawLine(x, rc.top(), x, rc.bottom());
+    painter->setBrush(Qt::NoBrush);
+
+    // Draw vertical line showing current time.
+    {
+        int x2 = TimeToClient(m_fTimeMarker);
+        if (x2 > m_rcTimeline.left() && x2 < m_rcTimeline.right())
+        {
+            painter->setPen(QColor(255, 0, 255));
+            painter->drawLine(x2, 0, x2, m_rcTimeline.bottom());
+        }
+    }
+
+    // Draw the key times.
+    painter->setPen(redpen);
+    painter->setBrush(Qt::NoBrush);
+    const QPen keySelectedPen(QColor(100, 255, 255));
+    const QBrush keySelectedBrush(QColor(100, 255, 255));
+    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
+    {
+        int keyCountBound = __max(m_pKeyTimeSet->GetKeyCountBound(), 1);
+        int keyCount = __min(m_pKeyTimeSet->GetKeyCount(keyTimeIndex), keyCountBound);
+        float colorCodeFraction = float(keyCount) / keyCountBound;
+        const QColor keyMarkerCol = InterpolateColor(Qt::green, Qt::red, colorCodeFraction);
+
+        const QPen keyPen(keyMarkerCol);
+        const QBrush keyBrush(keyMarkerCol);
+        bool keyTimeSelected = m_pKeyTimeSet && m_pKeyTimeSet->GetKeyTimeSelected(keyTimeIndex);
+        painter->setBrush(keyTimeSelected ? keySelectedBrush : keyBrush);
+        painter->setPen(keyTimeSelected ? keySelectedPen : keyPen);
+
+        float keyTime = (m_pKeyTimeSet ? m_pKeyTimeSet->GetKeyTime(keyTimeIndex) : 0.0f);
+
+        int x2 = TimeToClient(keyTime);
+        painter->drawRect(QRect(QPoint(x2 - 1, rc.top()), QPoint(x2 + 2, rc.bottom())));
+    }
+
+    painter->setPen(pOldPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+Range TimelineWidget::GetVisibleRange() const
+{
+    Range r;
+
+    r.start = (m_scrollOffset - m_leftOffset) / m_timeScale;
+    r.end = r.start + (m_rcTimeline.width()) / m_timeScale;
+    // Intersect range with global time range.
+    r = m_timeRange & r;
+
+    return r;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+//Mouse Message Handlers
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::mousePressEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonDown(event->pos(), event->modifiers());
+        break;
+    case Qt::RightButton:
+        OnRButtonDown(event->pos(), event->modifiers());
+        break;
+    }
+}
+
+void TimelineWidget::mouseReleaseEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonUp(event->pos(), event->modifiers());
+        break;
+    case Qt::RightButton:
+        OnRButtonUp(event->pos(), event->modifiers());
+        break;
+    }
+}
+
+namespace
+{
+    const float EDITOR_FPS = 30.0f;
+    float SnapTimeToFrame(float time) {return int((time * EDITOR_FPS) + 0.5f) * (1.0f / EDITOR_FPS); }
+}
+
+void TimelineWidget::OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers)
+{
+    if (m_trackingMode != TRACKING_MODE_NONE)
+    {
+        return;
+    }
+
+    Q_EMIT clicked();
+
+    int hitKeyTimeIndex = HitKeyTimes(point);
+    bool autoDeselect = !(modifiers& Qt::ControlModifier) && (m_pKeyTimeSet && ((hitKeyTimeIndex >= 0) ? !m_pKeyTimeSet->GetKeyTimeSelected(hitKeyTimeIndex) : true));
+    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
+    {
+        bool shouldBeSelected;
+        if (keyTimeIndex == hitKeyTimeIndex)
+        {
+            shouldBeSelected = (modifiers& Qt::ControlModifier) || !((modifiers& Qt::ShiftModifier) && m_pKeyTimeSet->GetKeyTimeSelected(keyTimeIndex));
+        }
+        else
+        {
+            shouldBeSelected = (!autoDeselect || (modifiers & Qt::ShiftModifier)) && m_pKeyTimeSet->GetKeyTimeSelected(keyTimeIndex);
+        }
+
+        m_pKeyTimeSet->SetKeyTimeSelected(keyTimeIndex, shouldBeSelected);
+    }
+    TrackingMode trackingMode = (hitKeyTimeIndex >= 0 ? TRACKING_MODE_MOVE_KEYS : TRACKING_MODE_NONE);
+    if (trackingMode == TRACKING_MODE_NONE)
+    {
+        trackingMode = ((modifiers& Qt::ControlModifier) ? TRACKING_MODE_SELECTION_RANGE : TRACKING_MODE_SET_TIME);
+    }
+    StartTracking(trackingMode);
+
+    switch (m_trackingMode)
+    {
+    case TRACKING_MODE_SET_TIME:
+    {
+        if (m_bTrackingSnapToFrames)
+        {
+            SetTimeMarker(SnapTimeToFrame(ClientToTime(point.x())));
+        }
+        else
+        {
+            SetTimeMarker(ClientToTime(point.x()));
+        }
+        CScopedVariableSetter<bool> ignoreSetTime(m_bIgnoreSetTime, true);
+        Q_EMIT startChange();
+        Q_EMIT change();
+    }
+    break;
+
+    case TRACKING_MODE_MOVE_KEYS:
+        m_bChangedKeyTimeSet = false;
+        m_copyKeyTimes = (modifiers & Qt::ControlModifier ? true : false);
+        break;
+
+    case TRACKING_MODE_NONE:
+        break;
+    }
+
+    m_lastPoint = point;
+
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::OnRButtonDown(const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+{
+    Q_EMIT clicked();
+
+    if (m_trackingMode != TRACKING_MODE_NONE)
+    {
+        return;
+    }
+
+    StartTracking(TRACKING_MODE_SET_TIME);
+
+    if (m_bTrackingSnapToFrames)
+    {
+        SetTimeMarker(SnapTimeToFrame(ClientToTime(point.x())));
+    }
+    else
+    {
+        SetTimeMarker(ClientToTime(point.x()));
+    }
+    CScopedVariableSetter<bool> ignoreSetTime(m_bIgnoreSetTime, true);
+    Q_EMIT startChange();
+    Q_EMIT change();
+
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::OnRButtonUp([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+{
+    switch (m_trackingMode)
+    {
+    case TRACKING_MODE_SET_TIME:
+    {
+        Q_EMIT endChange();
+    }
+    break;
+    }
+
+    if (m_trackingMode != TRACKING_MODE_NONE)
+    {
+        StopTracking();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::keyPressEvent(QKeyEvent* event)
+{
+    if (event->matches(QKeySequence::Delete))
+    {
+        Q_EMIT deleteRequested();
+    }
+    if (event->key() == Qt::Key_Space && m_playCallback)
+    {
+        m_playCallback();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::mouseMoveEvent(QMouseEvent* event)
+{
+    switch (m_trackingMode)
+    {
+    case TRACKING_MODE_SET_TIME:
+    {
+        if (m_bTrackingSnapToFrames)
+        {
+            SetTimeMarker(SnapTimeToFrame(ClientToTime(event->x())));
+        }
+        else
+        {
+            SetTimeMarker(ClientToTime(event->x()));
+        }
+        CScopedVariableSetter<bool> ignoreSetTime(m_bIgnoreSetTime, true);
+        Q_EMIT change();
+    }
+    break;
+
+    case TRACKING_MODE_MOVE_KEYS:
+    {
+        if (m_pKeyTimeSet && !m_bChangedKeyTimeSet)
+        {
+            m_bChangedKeyTimeSet = true;
+            m_pKeyTimeSet->BeginEdittingKeyTimes();
+        }
+
+        const bool altClicked = (Qt::AltModifier & QApplication::queryKeyboardModifiers());
+        float scale, offset;
+        float startTime = ClientToTime(m_lastPoint.x());
+        float endTime = ClientToTime(event->x());
+        if (altClicked)
+        {
+            // Alt was pressed, so we should scale the key times rather than translate.
+            // Calculate the scaling parameters (ie t1 = t0 * M + C).
+            scale = 1.0f;
+            if (fabsf(startTime - m_fTimeMarker) > 0.1)
+            {
+                scale = (endTime - m_fTimeMarker) / (startTime - m_fTimeMarker);
+            }
+            offset = endTime - startTime * scale;
+        }
+        else
+        {
+            // Simply move the keys.
+            offset = endTime - startTime;
+            scale = 1.0f;
+        }
+
+        MoveSelectedKeyTimes(scale, offset);
+    }
+    break;
+
+    case TRACKING_MODE_SELECTION_RANGE:
+    {
+        float start = min(ClientToTime(m_lastPoint.x()), ClientToTime(event->x()));
+        float end = max(ClientToTime(m_lastPoint.x()), ClientToTime(event->x()));
+        SelectKeysInRange(start, end, !(event->modifiers() & Qt::ShiftModifier));
+        m_lastPoint = event->pos();
+        update();
+    }
+    break;
+
+    case TRACKING_MODE_NONE:
+        break;
+    }
+
+    //m_lastPoint = point;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString TimelineWidget::TimeToString(float time)
+{
+    return QString::number(time, 'f', 3);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::OnLButtonUp([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+{
+    switch (m_trackingMode)
+    {
+    case TRACKING_MODE_MOVE_KEYS:
+    {
+        if (m_pKeyTimeSet && m_bChangedKeyTimeSet)
+        {
+            m_pKeyTimeSet->EndEdittingKeyTimes();
+        }
+    }
+    break;
+
+    case TRACKING_MODE_SET_TIME:
+    {
+        Q_EMIT endChange();
+    }
+    break;
+
+    case TRACKING_MODE_NONE:
+        break;
+    }
+
+    if (m_trackingMode != TRACKING_MODE_NONE)
+    {
+        StopTracking();
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void TimelineWidget::StartTracking(TrackingMode trackingMode)
+{
+    m_trackingMode = trackingMode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::StopTracking()
+{
+    if (!m_trackingMode)
+    {
+        return;
+    }
+
+    m_trackingMode = TRACKING_MODE_NONE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::SetTimeMarker(float fTime)
+{
+    if (fTime < m_timeRange.start)
+    {
+        fTime = m_timeRange.start;
+    }
+    else if (fTime > m_timeRange.end)
+    {
+        fTime = m_timeRange.end;
+    }
+
+    if (fTime == m_fTimeMarker || m_bIgnoreSetTime)
+    {
+        return;
+    }
+
+    int x0 = TimeToClient(m_fTimeMarker);
+    int x1 = TimeToClient(fTime);
+    QRect rc(QPoint(x0, m_rcClient.top()), QPoint(x1, m_rcClient.bottom()));
+    rc = rc.normalized();
+    rc.adjust(-5, 0, 5, 0);
+    update(rc);
+
+    m_fTimeMarker = fTime;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::SetZoom(float fZoom)
+{
+    m_grid.zoom.x = fZoom;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::SetOrigin(float fOffset)
+{
+    m_grid.origin.x = fOffset;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::SetKeyTimeSet(IKeyTimeSet* pKeyTimeSet)
+{
+    m_pKeyTimeSet = pKeyTimeSet;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int TimelineWidget::HitKeyTimes(const QPoint& point)
+{
+    const int threshold = 3;
+
+    int hitKeyTimeIndex = -1;
+    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
+    {
+        float keyTime = (m_pKeyTimeSet ? m_pKeyTimeSet->GetKeyTime(keyTimeIndex) : 0.0f);
+        int x = TimeToClient(keyTime);
+        if (abs(point.x() - x) <= threshold)
+        {
+            hitKeyTimeIndex = keyTimeIndex;
+        }
+    }
+
+    return hitKeyTimeIndex;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::MoveSelectedKeyTimes(float scale, float offset)
+{
+    std::vector<int> indices;
+    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
+    {
+        if (m_pKeyTimeSet && m_pKeyTimeSet->GetKeyTimeSelected(keyTimeIndex))
+        {
+            indices.push_back(keyTimeIndex);
+        }
+    }
+
+    if (m_pKeyTimeSet)
+    {
+        m_pKeyTimeSet->MoveKeyTimes(int(indices.size()), &indices[0], scale, offset, m_copyKeyTimes);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::SelectKeysInRange(float start, float end, bool select)
+{
+    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
+    {
+        float time = (m_pKeyTimeSet ? m_pKeyTimeSet->GetKeyTime(keyTimeIndex) : 0.0f);
+        if (m_pKeyTimeSet && time >= start && time <= end)
+        {
+            m_pKeyTimeSet->SetKeyTimeSelected(keyTimeIndex, select);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::SetMarkerStyle(MarkerStyle markerStyle)
+{
+    m_markerStyle = markerStyle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::SetFPS(float fps)
+{
+    m_fps = fps;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void TimelineWidget::DrawSecondTicks(QPainter* painter)
+{
+    const QPen ltgray(QColor(110, 110, 110));
+    const QPen black(palette().color(QPalette::Normal, QPalette::Text));
+    const QPen redpen(QColor(255, 0, 255));
+
+    for (int gx = m_grid.firstGridLine.x(); gx < m_grid.firstGridLine.x() + m_grid.numGridLines.x() + 1; gx++)
+    {
+        painter->setPen(ltgray);
+
+        int x = m_grid.GetGridLineX(gx);
+        if (x < 0)
+        {
+            continue;
+        }
+
+        painter->drawLine(m_rcTimeline.left() + x, m_rcTimeline.bottom() - 2, m_rcTimeline.left() + x, m_rcTimeline.bottom() - 4);
+
+        //if (gx % 10 == 0)
+        {
+            float t = m_grid.GetGridLineXValue(gx);
+            t = floor(t * 1000.0f + 0.5f) / 1000.0f;
+
+            const QString str = QString::number(t * m_fTicksTextScale, 'g');
+
+            //t = t / pow(10,precision);
+            painter->setPen(black);
+            painter->drawLine(m_rcTimeline.left() + x, m_rcTimeline.bottom() - 2, m_rcTimeline.left() + x, m_rcTimeline.bottom() - 14);
+            painter->drawText(m_rcTimeline.left() + x + 2, m_rcTimeline.top(), str);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+class TickDrawer
+{
+public:
+    TickDrawer(QPainter* painter, const QRect& rect)
+        : rect(rect)
+        , painter(painter)
+    {
+    }
+
+    void operator()(int frameIndex, int x)
+    {
+        if (painter)
+        {
+            painter->setPen(QColor(110, 110, 110));
+            painter->drawLine(rect.left() + x, rect.bottom() - 2, rect.left() + x, rect.bottom() - 4);
+
+            {
+                const QString str = QString::number(frameIndex);
+
+                painter->setPen(Qt::black);
+                painter->drawLine(rect.left() + x, rect.bottom() - 2, rect.left() + x, rect.bottom() - 14);
+                painter->drawText(rect.left() + x + 2, rect.top(), str);
+            }
+        }
+    }
+
+    QRect rect;
+    QPainter* painter;
+};
+
+void TimelineWidget::DrawFrameTicks(QPainter* painter)
+{
+    TickDrawer tickDrawer(painter, m_rcTimeline);
+    GridUtils::IterateGrid(tickDrawer, 50.0f, m_grid.zoom.x, m_grid.origin.x, m_fps, m_grid.rect.left(), m_grid.rect.right() + 1);
+}
+
+void TimelineWidget::SetPlayCallback(const std::function<void()>& callback)
+{
+    m_playCallback = callback;
+}
+
+#include <Controls/moc_TimelineCtrl.cpp>
diff --git a/Code/Editor/Controls/TimelineCtrl.h b/Code/Editor/Controls/TimelineCtrl.h
new file mode 100644
index 0000000000..dd6620410e
--- /dev/null
+++ b/Code/Editor/Controls/TimelineCtrl.h
@@ -0,0 +1,172 @@
+/*
+ * 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_CONTROLS_TIMELINECTRL_H
+#define CRYINCLUDE_EDITOR_CONTROLS_TIMELINECTRL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "Range.h"
+#include "SplineCtrlEx.h"
+#include "Controls/WndGridHelper.h"
+#include "Util/fastlib.h"
+#endif
+
+// Custom styles for this control.
+#define TL_STYLE_AUTO_DELETE    0x0001
+#define TL_STYLE_NO_TICKS       0x0002
+#define TL_STYLE_NO_TIME_MARKER 0x0004
+#define TL_STYLE_NO_TEXT        0x0008
+
+// Notify event sent when current time is change on the timeline control.
+#define TLN_START_CHANGE    (0x0001)
+#define TLN_END_CHANGE      (0x0002)
+#define TLN_CHANGE              (0x0003)
+#define TLN_DELETE              (0x0004)
+
+class AbstractTimelineWidget
+{
+public:
+    virtual void setZoom(float zoom, float origin) = 0;
+    virtual void update(const QRect& r = QRect()) = 0;
+    virtual void setGeometry(const QRect& r) = 0;
+    virtual void SetTimeMarker(float marker) = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Timeline control.
+//////////////////////////////////////////////////////////////////////////
+class TimelineWidget
+    : public QWidget
+    , public AbstractTimelineWidget
+{
+    Q_OBJECT
+public:
+    TimelineWidget(QWidget* parent = nullptr);
+    ~TimelineWidget();
+
+    void setZoom(float zoom, float origin) override { SetZoom(zoom); SetOrigin(origin); update(); }
+    void update(const QRect& r = QRect()) override { QWidget::update(r); }
+    void setGeometry(const QRect& r) override { QWidget::setGeometry(r); }
+
+    void SetTimeRange(const Range& r) { m_timeRange = r; }
+    void SetTimeMarker(float fTime);
+    float GetTimeMarker() const { return m_fTimeMarker; }
+
+    void SetZoom(float fZoom);
+    void SetOrigin(float fOffset);
+
+    void SetKeyTimeSet(IKeyTimeSet* pKeyTimeSet);
+
+    void SetTicksTextScale(float fScale) { m_fTicksTextScale = fScale; }
+    float GetTicksTextScale() const { return m_fTicksTextScale; }
+
+    void SetTrackingSnapToFrames(bool bEnable) { m_bTrackingSnapToFrames = bEnable; }
+
+    enum MarkerStyle
+    {
+        MARKER_STYLE_SECONDS,
+        MARKER_STYLE_FRAMES
+    };
+    void SetMarkerStyle(MarkerStyle markerStyle);
+    void SetFPS(float fps); // Only referred to if MarkerStyle == MARKER_STYLE_FRAMES.
+    float GetFPS() const
+    {
+        return m_fps;
+    }
+
+    void SetPlayCallback(const std::function<void()>& callback);
+
+Q_SIGNALS:
+    void deleteRequested();
+    void clicked();
+
+    void startChange();
+    void change();
+    void endChange();
+
+protected:
+    enum TrackingMode
+    {
+        TRACKING_MODE_NONE,
+        TRACKING_MODE_SET_TIME,
+        TRACKING_MODE_MOVE_KEYS,
+        TRACKING_MODE_SELECTION_RANGE
+    };
+
+    int HitKeyTimes(const QPoint& point);
+    void MoveSelectedKeyTimes(float scale, float offset);
+    void SelectKeysInRange(float start, float end, bool select);
+
+    void paintEvent(QPaintEvent* event) override;
+    void resizeEvent(QResizeEvent* event) override;
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnLButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnRButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void OnRButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void keyPressEvent(QKeyEvent* event);
+
+    // Drawing functions
+    float  ClientToTime(int x);
+    int    TimeToClient(float fTime);
+
+    void DrawTicks(QPainter* painter);
+
+    Range GetVisibleRange() const;
+
+    void StartTracking(TrackingMode trackingMode);
+    void StopTracking();
+
+    QString TimeToString(float time);
+    // Convert time in seconds into the milliseconds.
+    int ToMillis(float time) { return RoundFloatToInt(time * 1000.0f); };
+    float MillisToTime(int nMillis) { return nMillis / 1000.0f; }
+    float SnapTime(float time);
+
+    void DrawSecondTicks(QPainter* dc);
+    void DrawFrameTicks(QPainter* dc);
+
+private:
+    bool m_bAutoDelete;
+    QRect m_rcClient;
+    QRect m_rcTimeline;
+    float m_fTimeMarker;
+    float m_fTicksTextScale;
+    TrackingMode m_trackingMode;
+    QPoint m_lastPoint;
+
+    Range m_timeRange;
+
+    float m_timeScale;
+
+    int m_scrollOffset;
+    int m_leftOffset;
+
+    // Tick every Nth millisecond.
+    int m_nTicksStep;
+
+    double m_ticksStep;
+
+    CWndGridHelper m_grid;
+
+    bool m_bIgnoreSetTime;
+
+    IKeyTimeSet* m_pKeyTimeSet;
+    bool m_bChangedKeyTimeSet;
+
+    MarkerStyle m_markerStyle;
+    float m_fps;
+    bool m_copyKeyTimes;
+    bool m_bTrackingSnapToFrames;
+    std::function<void()> m_playCallback;
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_TIMELINECTRL_H
diff --git a/Code/Editor/Controls/TreeCtrlUtils.h b/Code/Editor/Controls/TreeCtrlUtils.h
new file mode 100644
index 0000000000..5dcc477f85
--- /dev/null
+++ b/Code/Editor/Controls/TreeCtrlUtils.h
@@ -0,0 +1,321 @@
+/*
+ * 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_CONTROLS_TREECTRLUTILS_H
+#define CRYINCLUDE_EDITOR_CONTROLS_TREECTRLUTILS_H
+#pragma once
+
+#include <iterator>
+
+namespace TreeCtrlUtils
+{
+    template <typename P>
+    class TreeItemIterator
+        : public P
+    {
+    public:
+        typedef P Traits;
+
+        //iterator traits, required by STL
+        typedef ptrdiff_t difference_type;
+        typedef HTREEITEM value_type;
+        typedef HTREEITEM* pointer;
+        typedef HTREEITEM& reference;
+        typedef std::forward_iterator_tag iterator_category;
+
+        TreeItemIterator()
+            : pCtrl(0)
+            , hItem(0) {}
+        explicit TreeItemIterator(const P& traits)
+            : P(traits)
+            , pCtrl(0)
+            , hItem(0) {}
+        TreeItemIterator(const TreeItemIterator& other)
+            : P(other)
+            , pCtrl(other.pCtrl)
+            , hItem(other.hItem) {}
+        TreeItemIterator(CTreeCtrl* pCtrl, HTREEITEM hItem)
+            : pCtrl(pCtrl)
+            , hItem(hItem) {}
+        TreeItemIterator(CTreeCtrl* pCtrl, HTREEITEM hItem, const P& traits)
+            : P(traits)
+            , pCtrl(pCtrl)
+            , hItem(hItem) {}
+
+        HTREEITEM operator*() {return hItem; }
+        bool operator==(const TreeItemIterator& other) const {return pCtrl == other.pCtrl && hItem == other.hItem; }
+        bool operator!=(const TreeItemIterator& other) const {return pCtrl != other.pCtrl || hItem != other.hItem; }
+
+        TreeItemIterator& operator++()
+        {
+            HTREEITEM hNextItem = 0;
+            if (RecurseToChildren(hItem))
+            {
+                hNextItem = (pCtrl ? pCtrl->GetChildItem(hItem) : 0);
+            }
+            while (pCtrl && hItem && !hNextItem)
+            {
+                hNextItem = pCtrl->GetNextSiblingItem(hItem);
+                if (!hNextItem)
+                {
+                    hItem = pCtrl->GetParentItem(hItem);
+                }
+            }
+            hItem = hNextItem;
+
+            return *this;
+        }
+
+        TreeItemIterator operator++(int) {TreeItemIterator old = *this; ++(*this); return old; }
+
+        CTreeCtrl* pCtrl;
+        HTREEITEM hItem;
+    };
+
+    class NonRecursiveTreeItemIteratorTraits
+    {
+    public:
+        bool RecurseToChildren(HTREEITEM hItem) {return false; }
+    };
+    typedef TreeItemIterator<NonRecursiveTreeItemIteratorTraits> NonRecursiveTreeItemIterator;
+
+    class RecursiveTreeItemIteratorTraits
+    {
+    public:
+        bool RecurseToChildren(HTREEITEM hItem) {return true; }
+    };
+    typedef TreeItemIterator<RecursiveTreeItemIteratorTraits> RecursiveTreeItemIterator;
+
+    inline RecursiveTreeItemIterator BeginTreeItemsRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
+    {
+        if (hItem == 0)
+        {
+            hItem = (pCtrl ? pCtrl->GetRootItem() : 0);
+        }
+        return RecursiveTreeItemIterator(pCtrl, hItem);
+    }
+
+    inline RecursiveTreeItemIterator EndTreeItemsRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
+    {
+        HTREEITEM hEndItem = 0;
+        HTREEITEM hParent = hItem;
+        do
+        {
+            if (hParent)
+            {
+                hEndItem = pCtrl->GetNextSiblingItem(hParent);
+            }
+            hParent = (pCtrl && hParent ? pCtrl->GetParentItem(hParent) : 0);
+        }
+        while (hParent && !hEndItem);
+        return RecursiveTreeItemIterator(pCtrl, hEndItem);
+    }
+
+    inline NonRecursiveTreeItemIterator BeginTreeItemsNonRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
+    {
+        if (hItem == 0)
+        {
+            hItem = (pCtrl ? pCtrl->GetRootItem() : 0);
+        }
+        if (hItem)
+        {
+            hItem = pCtrl->GetChildItem(hItem);
+        }
+        return NonRecursiveTreeItemIterator(pCtrl, hItem);
+    }
+
+    inline NonRecursiveTreeItemIterator EndTreeItemsNonRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
+    {
+        HTREEITEM hEndItem = 0;
+        HTREEITEM hParent = 0;
+        while (hParent && !hEndItem)
+        {
+            hParent = (pCtrl && hItem ? pCtrl->GetParentItem(hItem) : 0);
+            if (hParent)
+            {
+                hEndItem = pCtrl->GetNextSiblingItem(hParent);
+            }
+        }
+        return NonRecursiveTreeItemIterator(pCtrl, hEndItem);
+    }
+
+    template <typename T, typename P>
+    class TreeItemDataIterator
+    {
+    public:
+        typedef T Type;
+        typedef TreeItemIterator<P> InternalIterator;
+
+        //iterator traits, required by STL
+        typedef ptrdiff_t difference_type;
+        typedef Type* value_type;
+        typedef Type** pointer;
+        typedef Type*& reference;
+        typedef std::forward_iterator_tag iterator_category;
+
+        TreeItemDataIterator() {}
+        TreeItemDataIterator(const TreeItemDataIterator& other)
+            : iterator(other.iterator) {AdvanceToValidIterator(); }
+        explicit TreeItemDataIterator(const InternalIterator& iterator)
+            : iterator(iterator) {AdvanceToValidIterator(); }
+
+        Type* operator*() {return reinterpret_cast<Type*>(iterator.pCtrl->GetItemData(iterator.hItem)); }
+        bool operator==(const TreeItemDataIterator& other) const {return iterator == other.iterator; }
+        bool operator!=(const TreeItemDataIterator& other) const {return iterator != other.iterator; }
+
+        HTREEITEM GetTreeItem() {return iterator.hItem; }
+
+        TreeItemDataIterator& operator++()
+        {
+            ++iterator;
+            AdvanceToValidIterator();
+            return *this;
+        }
+
+        TreeItemDataIterator operator++(int) {TreeItemDataIterator old = *this; ++(*this); return old; }
+
+    private:
+        void AdvanceToValidIterator()
+        {
+            while (iterator.pCtrl && iterator.hItem && !iterator.pCtrl->GetItemData(iterator.hItem))
+            {
+                ++iterator;
+            }
+        }
+
+        InternalIterator iterator;
+    };
+
+    template <typename T>
+    class RecursiveItemDataIteratorType
+    {
+    public: typedef TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits> type;
+    };
+    template <typename T>
+    inline TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits> BeginTreeItemDataRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
+    {
+        return TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits>(BeginTreeItemsRecursive(pCtrl, hItem));
+    }
+
+    template <typename T>
+    inline TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits> EndTreeItemDataRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
+    {
+        return TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits>(EndTreeItemsRecursive(pCtrl, hItem));
+    }
+
+    template <typename T>
+    class NonRecursiveItemDataIteratorType
+    {
+        typedef TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits> type;
+    };
+    template <typename T>
+    inline TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits> BeginTreeItemDataNonRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
+    {
+        return TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits>(BeginTreeItemsNonRecursive(pCtrl, hItem));
+    }
+
+    template <typename T>
+    inline TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits> EndTreeItemDataNonRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
+    {
+        return TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits>(EndTreeItemsNonRecursive(pCtrl, hItem));
+    }
+
+    class SelectedTreeItemIterator
+    {
+    public:
+        SelectedTreeItemIterator()
+            : pCtrl(0)
+            , hItem(0) {}
+        SelectedTreeItemIterator(const SelectedTreeItemIterator& other)
+            : pCtrl(other.pCtrl)
+            , hItem(other.hItem) {}
+        SelectedTreeItemIterator(CXTTreeCtrl* pCtrl, HTREEITEM hItem)
+            : pCtrl(pCtrl)
+            , hItem(hItem) {}
+
+        HTREEITEM operator*() {return hItem; }
+        bool operator==(const SelectedTreeItemIterator& other) const {return pCtrl == other.pCtrl && hItem == other.hItem; }
+        bool operator!=(const SelectedTreeItemIterator& other) const {return pCtrl != other.pCtrl || hItem != other.hItem; }
+
+        SelectedTreeItemIterator& operator++()
+        {
+            hItem = (pCtrl ? pCtrl->GetNextSelectedItem(hItem) : 0);
+
+            return *this;
+        }
+
+        SelectedTreeItemIterator operator++(int) {SelectedTreeItemIterator old = *this; ++(*this); return old; }
+
+        CXTTreeCtrl* pCtrl;
+        HTREEITEM hItem;
+    };
+
+    SelectedTreeItemIterator BeginSelectedTreeItems(CXTTreeCtrl* pCtrl)
+    {
+        return SelectedTreeItemIterator(pCtrl, (pCtrl ? pCtrl->GetFirstSelectedItem() : 0));
+    }
+
+    SelectedTreeItemIterator EndSelectedTreeItems(CXTTreeCtrl* pCtrl)
+    {
+        return SelectedTreeItemIterator(pCtrl, 0);
+    }
+
+    template <typename T>
+    class SelectedTreeItemDataIterator
+    {
+    public:
+        typedef T Type;
+        typedef SelectedTreeItemIterator InternalIterator;
+
+        SelectedTreeItemDataIterator() {}
+        SelectedTreeItemDataIterator(const SelectedTreeItemDataIterator& other)
+            : iterator(other.iterator) {AdvanceToValidIterator(); }
+        explicit SelectedTreeItemDataIterator(const InternalIterator& iterator)
+            : iterator(iterator) {AdvanceToValidIterator(); }
+
+        Type* operator*() {return reinterpret_cast<Type*>(iterator.pCtrl->GetItemData(iterator.hItem)); }
+        bool operator==(const SelectedTreeItemDataIterator& other) const {return iterator == other.iterator; }
+        bool operator!=(const SelectedTreeItemDataIterator& other) const {return iterator != other.iterator; }
+
+        HTREEITEM GetTreeItem() {return iterator.hItem; }
+
+        SelectedTreeItemDataIterator& operator++()
+        {
+            ++iterator;
+            AdvanceToValidIterator();
+            return *this;
+        }
+
+        SelectedTreeItemDataIterator operator++(int) {SelectedTreeItemDataIterator old = *this; ++(*this); return old; }
+
+    private:
+        void AdvanceToValidIterator()
+        {
+            while (iterator.pCtrl && iterator.hItem && !iterator.pCtrl->GetItemData(iterator.hItem))
+            {
+                ++iterator;
+            }
+        }
+
+        InternalIterator iterator;
+    };
+
+    template <typename T>
+    SelectedTreeItemDataIterator<T> BeginSelectedTreeItemData(CXTTreeCtrl* pCtrl)
+    {
+        return SelectedTreeItemDataIterator<T>(BeginSelectedTreeItems(pCtrl));
+    }
+
+    template <typename T>
+    SelectedTreeItemDataIterator<T> EndSelectedTreeItemData(CXTTreeCtrl* pCtrl)
+    {
+        return SelectedTreeItemDataIterator<T>(EndSelectedTreeItems(pCtrl));
+    }
+}
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_TREECTRLUTILS_H
diff --git a/Code/Editor/Controls/WndGridHelper.h b/Code/Editor/Controls/WndGridHelper.h
new file mode 100644
index 0000000000..62cba4f8a2
--- /dev/null
+++ b/Code/Editor/Controls/WndGridHelper.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_CONTROLS_WNDGRIDHELPER_H
+#define CRYINCLUDE_EDITOR_CONTROLS_WNDGRIDHELPER_H
+#pragma once
+
+#include <QPoint>
+#include <QRect>
+#include "Cry_Vector2.h"
+
+//////////////////////////////////////////////////////////////////////////
+class CWndGridHelper
+{
+public:
+    Vec2 zoom;
+    Vec2 origin;
+    Vec2 step;
+    Vec2 pixelsPerGrid;
+    int nMajorLines;
+    QRect rect;
+    QPoint nMinPixelsPerGrid;
+    QPoint nMaxPixelsPerGrid;
+    //////////////////////////////////////////////////////////////////////////
+    QPoint firstGridLine;
+    QPoint numGridLines;
+
+    //////////////////////////////////////////////////////////////////////////
+    CWndGridHelper()
+    {
+        zoom = Vec2(1, 1);
+        step = Vec2(10, 10);
+        pixelsPerGrid = Vec2(10, 10);
+        origin = Vec2(0, 0);
+        nMajorLines = 10;
+        nMinPixelsPerGrid = QPoint(50, 10);
+        nMaxPixelsPerGrid = QPoint(100, 20);
+        firstGridLine = QPoint(0, 0);
+        numGridLines = QPoint(0, 0);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    Vec2 ClientToWorld(const QPoint& point)
+    {
+        Vec2 v;
+        v.x = (point.x() - rect.left()) / zoom.x + origin.x;
+        v.y = (point.y() - rect.top()) / zoom.y + origin.y;
+        return v;
+    }
+    //////////////////////////////////////////////////////////////////////////
+   QPoint WorldToClient(Vec2 v)
+    {
+        QPoint p(aznumeric_cast<int>(floor((v.x - origin.x) * zoom.x + 0.5f) + rect.left()),
+            aznumeric_cast<int>(floor((v.y - origin.y) * zoom.y + 0.5f) + rect.top()));
+        return p;
+    }
+
+    void SetOrigin(Vec2 neworigin)
+    {
+        origin = neworigin;
+    }
+    void SetZoom(Vec2 newzoom)
+    {
+        zoom = newzoom;
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void SetZoom(Vec2 newzoom, const QPoint& center)
+    {
+        if (newzoom.x < 0.01f)
+        {
+            newzoom.x = 0.01f;
+        }
+        if (newzoom.y < 0.01f)
+        {
+            newzoom.y = 0.01f;
+        }
+
+        Vec2 prevz = zoom;
+
+        // Zoom to mouse position.
+        float ofsx = origin.x;
+        float ofsy = origin.y;
+
+        Vec2 z1 = zoom;
+        Vec2 z2 = newzoom;
+
+        zoom = newzoom;
+
+        // Calculate new offset to center zoom on mouse.
+        float x2 = aznumeric_cast<float>(center.x() - rect.left());
+        float y2 = aznumeric_cast<float>(center.y() - rect.top());
+        ofsx = -(x2 / z2.x - x2 / z1.x - ofsx);
+        ofsy = -(y2 / z2.y - y2 / z1.y - ofsy);
+        origin.x = ofsx;
+        origin.y = ofsy;
+    }
+    void CalculateGridLines()
+    {
+        pixelsPerGrid.x = zoom.x;
+        pixelsPerGrid.y = zoom.y;
+
+        step = Vec2(1.00f, 1.00f);
+        nMajorLines = 2;
+
+        int griditers;
+        if (pixelsPerGrid.x <= nMinPixelsPerGrid.x())
+        {
+            griditers = 0;
+            while (pixelsPerGrid.x <= nMinPixelsPerGrid.x() && griditers++ < 1000)
+            {
+                step.x = step.x * nMajorLines;
+                pixelsPerGrid.x = step.x * zoom.x;
+            }
+        }
+        else
+        {
+            griditers = 0;
+            while (pixelsPerGrid.x >= nMaxPixelsPerGrid.x() && griditers++ < 1000)
+            {
+                step.x = step.x / nMajorLines;
+                pixelsPerGrid.x = step.x * zoom.x;
+            }
+        }
+
+        if (pixelsPerGrid.y <= nMinPixelsPerGrid.y())
+        {
+            griditers = 0;
+            while (pixelsPerGrid.y <= nMinPixelsPerGrid.y() && griditers++ < 1000)
+            {
+                step.y = step.y * nMajorLines;
+                pixelsPerGrid.y = step.y * zoom.y;
+            }
+        }
+        else
+        {
+            griditers = 0;
+            while (pixelsPerGrid.y >= nMaxPixelsPerGrid.y() && griditers++ < 1000)
+            {
+                step.y = step.y / nMajorLines;
+                pixelsPerGrid.y = step.y * zoom.y;
+            }
+        }
+
+        firstGridLine.rx() = aznumeric_cast<int>(origin.x / step.x);
+        firstGridLine.ry() = aznumeric_cast<int>(origin.y / step.y);
+
+        numGridLines.rx() = aznumeric_cast<int>((rect.width() / zoom.x) / step.x + 1);
+        numGridLines.ry() = aznumeric_cast<int>((rect.height() / zoom.y) / step.y + 1);
+    }
+    int GetGridLineX(int nGridLineX) const
+    {
+        return aznumeric_cast<int>(floor((nGridLineX * step.x - origin.x) * zoom.x + 0.5f));
+    }
+    int GetGridLineY(int nGridLineY) const
+    {
+        return aznumeric_cast<int>(floor((nGridLineY * step.y - origin.y) * zoom.y + 0.5f));
+    }
+    float GetGridLineXValue(int nGridLineX) const
+    {
+        return (nGridLineX * step.x);
+    }
+    float GetGridLineYValue(int nGridLineY) const
+    {
+        return (nGridLineY * step.y);
+    }
+};
+
+#endif // CRYINCLUDE_EDITOR_CONTROLS_WNDGRIDHELPER_H
diff --git a/Code/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp b/Code/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp
new file mode 100644
index 0000000000..4a9bc84f6d
--- /dev/null
+++ b/Code/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "EditorDefs.h"
+
+#include "EditorMetricsPlainTextNameRegistration.h"
+
+namespace Editor
+{
+
+EditorMetricsPlainTextNameRegistrationBusListener::EditorMetricsPlainTextNameRegistrationBusListener()
+{
+    AzFramework::MetricsPlainTextNameRegistrationBus::Handler::BusConnect();
+}
+
+EditorMetricsPlainTextNameRegistrationBusListener::~EditorMetricsPlainTextNameRegistrationBusListener()
+{
+    AzFramework::MetricsPlainTextNameRegistrationBus::Handler::BusDisconnect();
+}
+
+void EditorMetricsPlainTextNameRegistrationBusListener::RegisterForNameSending(const AZStd::vector<AZ::Uuid>& typeIdsThatCanBeSentAsPlainText)
+{
+    m_registeredTypeIds.insert(typeIdsThatCanBeSentAsPlainText.begin(), typeIdsThatCanBeSentAsPlainText.end());
+}
+
+bool EditorMetricsPlainTextNameRegistrationBusListener::IsTypeRegisteredForNameSending(const AZ::Uuid& typeId)
+{
+    return (m_registeredTypeIds.find(typeId) != m_registeredTypeIds.end());
+}
+
+} // namespace editor
diff --git a/Code/Editor/Core/EditorMetricsPlainTextNameRegistration.h b/Code/Editor/Core/EditorMetricsPlainTextNameRegistration.h
new file mode 100644
index 0000000000..5e82fee4ac
--- /dev/null
+++ b/Code/Editor/Core/EditorMetricsPlainTextNameRegistration.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
+
+#include <AzFramework/Metrics/MetricsPlainTextNameRegistration.h>
+#include <AzCore/std/containers/set.h>
+
+namespace Editor
+{
+    class EditorMetricsPlainTextNameRegistrationBusListener : public AzFramework::MetricsPlainTextNameRegistrationBus::Handler
+    {
+    public:
+        EditorMetricsPlainTextNameRegistrationBusListener();
+        virtual ~EditorMetricsPlainTextNameRegistrationBusListener();
+
+        void RegisterForNameSending(const AZStd::vector<AZ::Uuid>& typeIdsThatCanBeSentAsPlainText) override;
+
+        bool IsTypeRegisteredForNameSending(const AZ::Uuid& typeId) override;
+
+    private:
+        AZStd::set<AZ::Uuid> m_registeredTypeIds;
+    };
+
+} // namespace editor
diff --git a/Code/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Editor/Core/LevelEditorMenuHandler.cpp
new file mode 100644
index 0000000000..187036f49a
--- /dev/null
+++ b/Code/Editor/Core/LevelEditorMenuHandler.cpp
@@ -0,0 +1,1289 @@
+/*
+ * 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"
+
+// Editor
+#include "Resource.h"
+#include "LevelEditorMenuHandler.h"
+#include "CryEdit.h"
+#include "MainWindow.h"
+#include "QtViewPaneManager.h"
+#include "ToolBox.h"
+#include "Include/IObjectManager.h"
+#include "Objects/SelectionGroup.h"
+#include "ViewManager.h"
+
+#include <AzCore/Interface/Interface.h>
+
+// Qt
+#include <QMenuBar>
+#include <QUrlQuery>
+#include <QDesktopServices>
+#include <QHBoxLayout>
+#include <QUrl>
+
+// AzFramework
+#include <AzFramework/API/ApplicationAPI.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/SearchLineEdit.h>
+
+using namespace AZ;
+using namespace AzToolsFramework;
+
+static const char* const s_LUAEditorName = "Lua Editor";
+static const char* const s_shortTimeInterval = "debug";
+static const char* const s_assetImporterMetricsIdentifier = "AssetImporter";
+
+// top level menu ids
+static const char* const s_fileMenuId = "FileMenu";
+static const char* const s_editMenuId = "EditMenu";
+static const char* const s_gameMenuId = "GameMenu";
+static const char* const s_toolMenuId = "ToolMenu";
+static const char* const s_viewMenuId = "ViewMenu";
+static const char* const s_awsMenuId = "AwsMenu";
+static const char* const s_helpMenuId = "HelpMenu";
+
+static bool CompareLayoutNames(const QString& name1, const QString& name2)
+{
+    return name1.compare(name2, Qt::CaseInsensitive) < 0;
+}
+
+static void AddOpenViewPaneAction(ActionManager::MenuWrapper& menu, const char* viewPaneName, const char* menuActionText = nullptr)
+{
+    QAction* action = menu->addAction(QObject::tr(menuActionText ? menuActionText : viewPaneName));
+    QObject::connect(action, &QAction::triggered, action, [viewPaneName]()
+        {
+            QtViewPaneManager::instance()->OpenPane(viewPaneName);
+        });
+}
+
+namespace
+{
+    // This helper allows us to watch editor notifications to control action enable states
+    class EditorListener
+        : public QObject
+        , public IEditorNotifyListener
+    {
+    public:
+        explicit EditorListener(QObject* parent, AZStd::function<void(EEditorNotifyEvent)> trigger)
+            : QObject(parent)
+            , m_trigger(trigger)
+        {}
+
+        virtual ~EditorListener()
+        {
+            GetIEditor()->UnregisterNotifyListener(this);
+        }
+
+        void OnEditorNotifyEvent(EEditorNotifyEvent event)
+        {
+            m_trigger(event);
+        }
+
+    private:
+        AZStd::function<void(EEditorNotifyEvent)> m_trigger;
+    };
+
+    void DisableActionWhileLevelChanges(QAction* action, EEditorNotifyEvent e)
+    {
+        if (e == eNotify_OnBeginNewScene || e == eNotify_OnBeginLoad)
+        {
+            action->setDisabled(true);
+        }
+        else if (e == eNotify_OnEndNewScene || e == eNotify_OnEndLoad)
+        {
+            action->setDisabled(false);
+        }
+    }
+
+    void HideActionWhileEntitiesDeselected(QAction* action, EEditorNotifyEvent editorNotifyEvent)
+    {
+        if (action == nullptr)
+        {
+            return;
+        }
+
+        switch (editorNotifyEvent)
+        {
+        case eNotify_OnEntitiesDeselected:
+        {
+            action->setVisible(false);
+            break;
+        }
+        case eNotify_OnEntitiesSelected:
+        {
+            action->setVisible(true);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+
+    void DisableActionWhileInSimMode(QAction* action, EEditorNotifyEvent editorNotifyEvent)
+    {
+        if (action == nullptr)
+        {
+            return;
+        }
+
+        switch (editorNotifyEvent)
+        {
+        case eNotify_OnBeginSimulationMode:
+        {
+            action->setVisible(false);
+            action->setDisabled(true);
+            break;
+        }
+        case eNotify_OnEndSimulationMode:
+        {
+            action->setVisible(true);
+            action->setDisabled(false);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+}
+
+LevelEditorMenuHandler::LevelEditorMenuHandler(
+    MainWindow* mainWindow, QtViewPaneManager* const viewPaneManager, QSettings& settings)
+    : QObject(mainWindow)
+    , m_mainWindow(mainWindow)
+    , m_viewPaneManager(viewPaneManager)
+    , m_actionManager(mainWindow->GetActionManager())
+    , m_settings(settings)
+{
+#if defined(AZ_PLATFORM_MAC)
+    // Hide the non-native toolbar, then setNativeMenuBar to ensure it is always visible on macOS.
+    m_mainWindow->menuBar()->hide();
+    m_mainWindow->menuBar()->setNativeMenuBar(true);
+#endif
+
+    ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
+        AzToolsFramework::GetEntityContextId());
+    EditorMenuRequestBus::Handler::BusConnect();
+}
+
+LevelEditorMenuHandler::~LevelEditorMenuHandler()
+{
+    EditorMenuRequestBus::Handler::BusDisconnect();
+    ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
+}
+
+void LevelEditorMenuHandler::Initialize()
+{
+    // make sure we can fix the view menus
+    connect(
+        m_viewPaneManager, &QtViewPaneManager::registeredPanesChanged,
+        this, &LevelEditorMenuHandler::ResetToolsMenus);
+
+    m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+
+    m_topLevelMenus << CreateFileMenu();
+
+    auto editMenu = CreateEditMenu();
+    auto editMenuWrapper = ActionManager::MenuWrapper(editMenu, m_actionManager);
+    PopulateEditMenu(editMenuWrapper);
+
+    m_editmenu = editMenu;
+
+    m_topLevelMenus << editMenu;
+    m_topLevelMenus << CreateGameMenu();
+    m_topLevelMenus << CreateToolsMenu();
+    m_topLevelMenus << CreateViewMenu();
+    m_topLevelMenus << CreateHelpMenu();
+
+    // have to do this after creating the AWS Menu for the first time
+    ResetToolsMenus();
+
+    // Add our menus to the main window menu bar
+    QMenuBar* menuBar = m_mainWindow->menuBar();
+    menuBar->clear();
+    for (QMenu* menu : m_topLevelMenus)
+    {
+        menuBar->addMenu(menu);
+    }
+}
+
+bool LevelEditorMenuHandler::MRUEntryIsValid(const QString& entry, const QString& gameFolderPath)
+{
+    if (entry.isEmpty())
+    {
+        return false;
+    }
+
+    QFileInfo info(entry);
+    if (!info.exists())
+    {
+        return false;
+    }
+
+    if (!entry.endsWith(m_levelExtension))
+    {
+        return false;
+    }
+
+    const QDir gameDir(gameFolderPath);
+    QDir dir(entry); // actually pointing at file, first cdUp() gets us the parent dir
+    while (dir.cdUp())
+    {
+        if (dir == gameDir)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void LevelEditorMenuHandler::IncrementViewPaneVersion()
+{
+    m_viewPaneVersion++;
+}
+
+int LevelEditorMenuHandler::GetViewPaneVersion() const
+{
+    return m_viewPaneVersion;
+}
+
+void LevelEditorMenuHandler::UpdateViewLayoutsMenu(ActionManager::MenuWrapper& layoutsMenu)
+{
+    if (layoutsMenu.isNull())
+    {
+        return;
+    }
+
+    QStringList layoutNames = m_viewPaneManager->LayoutNames();
+    std::sort(layoutNames.begin(), layoutNames.end(), CompareLayoutNames);
+    layoutsMenu->clear();
+    const int MAX_LAYOUTS = ID_VIEW_LAYOUT_LAST - ID_VIEW_LAYOUT_FIRST + 1;
+
+    // Component entity layout is the default
+    QString componentLayoutLabel = tr("Component Entity Layout");
+    QAction* componentLayoutAction = layoutsMenu->addAction(componentLayoutLabel);
+    connect(componentLayoutAction, &QAction::triggered, this, &LevelEditorMenuHandler::LoadComponentLayout);
+
+    layoutsMenu.AddSeparator();
+
+    for (int i = 0; i < layoutNames.size() && i <= MAX_LAYOUTS; i++)
+    {
+        const QString layoutName = layoutNames[i];
+        QAction* action = layoutsMenu->addAction(layoutName);
+        QMenu* subSubMenu = new QMenu();
+
+        QAction* subSubAction = subSubMenu->addAction(tr("Load"));
+        connect(subSubAction, &QAction::triggered, this, [layoutName, this]() { m_mainWindow->ViewLoadPaneLayout(layoutName); });
+
+        subSubAction = subSubMenu->addAction(tr("Save"));
+        connect(subSubAction, &QAction::triggered, this, [layoutName, this]() { m_mainWindow->ViewSavePaneLayout(layoutName); });
+
+        subSubAction = subSubMenu->addAction(tr("Rename..."));
+        connect(subSubAction, &QAction::triggered, this, [layoutName, this]() { m_mainWindow->ViewRenamePaneLayout(layoutName); });
+
+        subSubAction = subSubMenu->addAction(tr("Delete"));
+        connect(subSubAction, &QAction::triggered, this, [layoutName, this]() { m_mainWindow->ViewDeletePaneLayout(layoutName); });
+
+        action->setMenu(subSubMenu);
+    }
+
+    layoutsMenu.AddAction(ID_VIEW_SAVELAYOUT);
+
+    layoutsMenu.AddAction(ID_VIEW_LAYOUT_LOAD_DEFAULT);
+}
+
+void LevelEditorMenuHandler::ResetToolsMenus()
+{
+    if (!m_toolsMenu->isEmpty())
+    {
+        // Clear everything from the Tools menu
+        m_toolsMenu->clear();
+        AzToolsFramework::EditorMenuNotificationBus::Broadcast(&AzToolsFramework::EditorMenuNotificationBus::Handler::OnResetToolMenuItems);
+    }
+
+    QtViewPanes allRegisteredViewPanes = QtViewPaneManager::instance()->GetRegisteredPanes();
+
+    QMap<QString, QList<QtViewPane*> > menuMap;
+
+    CreateMenuMap(menuMap, allRegisteredViewPanes);
+
+    CreateMenuOptions(&menuMap, m_toolsMenu, LyViewPane::CategoryTools);
+
+    AzToolsFramework::EditorMenuNotificationBus::Broadcast(&AzToolsFramework::EditorMenuNotificationBus::Handler::OnPopulateToolMenuItems);
+
+    m_toolsMenu.AddSeparator();
+
+    // Other
+    auto otherSubMenu = m_toolsMenu.AddMenu(QObject::tr("Other"));
+
+    CreateMenuOptions(&menuMap, otherSubMenu, LyViewPane::CategoryOther);
+
+    m_toolsMenu.AddSeparator();
+
+    // Optional Sub Menus
+    if (!menuMap.isEmpty())
+    {
+        QMap<QString, QList<QtViewPane*> >::iterator it = menuMap.begin();
+
+        while (it != menuMap.end())
+        {
+            auto currentSubMenu = m_toolsMenu.AddMenu(it.key());
+            CreateMenuOptions(&menuMap, currentSubMenu, it.key().toStdString().c_str());
+
+            it = menuMap.begin();
+        }
+    }
+}
+
+QMenu* LevelEditorMenuHandler::CreateFileMenu()
+{
+    auto fileMenu = m_actionManager->AddMenu(tr("&File"), s_fileMenuId);
+    connect(fileMenu, &QMenu::aboutToShow, this, &LevelEditorMenuHandler::OnUpdateOpenRecent);
+
+    // New level
+    auto fileNew = fileMenu.AddAction(ID_FILE_NEW);
+    GetIEditor()->RegisterNotifyListener(new EditorListener(fileNew, [fileNew](EEditorNotifyEvent e)
+    {
+        DisableActionWhileLevelChanges(fileNew, e);
+    }));
+
+    // Open level...
+    auto fileOpenLevel = fileMenu.AddAction(ID_FILE_OPEN_LEVEL);
+    GetIEditor()->RegisterNotifyListener(new EditorListener(fileOpenLevel, [fileOpenLevel](EEditorNotifyEvent e)
+    {
+        DisableActionWhileLevelChanges(fileOpenLevel, e);
+    }));
+
+#ifdef ENABLE_SLICE_EDITOR
+    // New slice
+    auto fileNewSlice = fileMenu.AddAction(ID_FILE_NEW_SLICE);
+    GetIEditor()->RegisterNotifyListener(new EditorListener(fileNewSlice, [fileNewSlice](EEditorNotifyEvent e)
+    {
+        DisableActionWhileLevelChanges(fileNewSlice, e);
+    }));
+
+    // Open slice...
+    auto fileOpenSlice = fileMenu.AddAction(ID_FILE_OPEN_SLICE);
+    GetIEditor()->RegisterNotifyListener(new EditorListener(fileOpenSlice, [fileOpenSlice](EEditorNotifyEvent e)
+    {
+        DisableActionWhileLevelChanges(fileOpenSlice, e);
+    }));
+#endif
+
+    // Save Selected Slice
+    auto saveSelectedSlice = fileMenu.AddAction(ID_FILE_SAVE_SELECTED_SLICE);
+    saveSelectedSlice->setVisible(false);
+    GetIEditor()->RegisterNotifyListener(new EditorListener(saveSelectedSlice, [saveSelectedSlice](EEditorNotifyEvent e)
+    {
+        HideActionWhileEntitiesDeselected(saveSelectedSlice, e);
+    }));
+
+    // Save Slice to Root
+    auto saveSliceToRoot = fileMenu.AddAction(ID_FILE_SAVE_SLICE_TO_ROOT);
+    saveSliceToRoot->setVisible(false);
+    GetIEditor()->RegisterNotifyListener(new EditorListener(saveSliceToRoot, [saveSliceToRoot](EEditorNotifyEvent e)
+    {
+        HideActionWhileEntitiesDeselected(saveSliceToRoot, e);
+    }));
+
+    // Open Recent
+    m_mostRecentLevelsMenu = fileMenu.AddMenu(tr("Open Recent"));
+    connect(m_mostRecentLevelsMenu, &QMenu::aboutToShow, this, &LevelEditorMenuHandler::UpdateMRUFiles);
+
+    OnUpdateOpenRecent();
+
+    // Import...
+    auto assetImporterMenu = fileMenu.Get()->addAction(tr("Import..."));
+    connect(assetImporterMenu, &QAction::triggered, this, &LevelEditorMenuHandler::ActivateAssetImporter);
+
+    fileMenu.AddSeparator();
+
+    // Save
+    fileMenu.AddAction(ID_FILE_SAVE_LEVEL);
+
+    // Save As...
+    fileMenu.AddAction(ID_FILE_SAVE_AS);
+
+    // Save Level Statistics
+    fileMenu.AddAction(ID_TOOLS_LOGMEMORYUSAGE);
+    fileMenu.AddSeparator();
+
+    // Project Settings
+    fileMenu.AddAction(ID_FILE_PROJECT_MANAGER_SETTINGS);
+
+    // Platform Settings - Project Settings Tool
+    // Shortcut must be set while adding the action otherwise it doesn't work
+    fileMenu.Get()->addAction(
+        tr(LyViewPane::ProjectSettingsTool),
+        []() { QtViewPaneManager::instance()->OpenPane(LyViewPane::ProjectSettingsTool); },
+        tr("Ctrl+Shift+P"));
+
+    fileMenu.AddSeparator();
+    fileMenu.AddAction(ID_FILE_PROJECT_MANAGER_NEW);
+    fileMenu.AddAction(ID_FILE_PROJECT_MANAGER_OPEN);
+    fileMenu.AddSeparator();
+
+    // NEWMENUS: NEEDS IMPLEMENTATION
+    // should have the equivalent of a Close here; it should be close the current slice, but the editor isn't slice based right now
+    // so that won't work.
+    // instead, it should be Close of the level, but we don't have that either. I'm leaving it here so that it's obvious where UX intended it
+    // to go
+    //fileMenu.AddAction(ID_FILE_CLOSE);
+
+    // Show Log File
+    fileMenu.AddAction(ID_FILE_EDITLOGFILE);
+
+    fileMenu.AddSeparator();
+
+    fileMenu.AddAction(ID_FILE_RESAVESLICES);
+
+    fileMenu.AddSeparator();
+
+    fileMenu.AddAction(ID_APP_EXIT);
+
+    return fileMenu;
+}
+
+void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMenu)
+{
+    // Undo
+    editMenu.AddAction(ID_UNDO);
+
+    // Redo
+    editMenu.AddAction(ID_REDO);
+
+    editMenu.AddSeparator();
+
+    // NEWMENUS: NEEDS IMPLEMENTATION
+    // Not quite ready for these yet. Have to register them with the ActionManager in MainWindow.cpp when we're ready
+    // editMenu->addAction(ID_EDIT_CUT);
+    // editMenu->addAction(ID_EDIT_COPY);
+    // editMenu->addAction(ID_EDIT_PASTE);
+    // editMenu.AddSeparator();
+
+    // Duplicate
+    editMenu.AddAction(ID_EDIT_CLONE);
+
+    // Delete
+    editMenu.AddAction(ID_EDIT_DELETE);
+
+    editMenu.AddSeparator();
+
+    // Select All
+    editMenu.AddAction(ID_EDIT_SELECTALL);
+
+    // Invert Selection
+    editMenu.AddAction(ID_EDIT_INVERTSELECTION);
+
+    editMenu.AddSeparator();
+
+    // New Viewport Interaction Model actions/shortcuts
+    editMenu.AddAction(ID_EDIT_PIVOT);
+    editMenu.AddAction(ID_EDIT_RESET);
+    editMenu.AddAction(ID_EDIT_RESET_MANIPULATOR);
+    editMenu.AddAction(ID_EDIT_RESET_LOCAL);
+    editMenu.AddAction(ID_EDIT_RESET_WORLD);
+
+    // Hide Selection
+    editMenu.AddAction(ID_EDIT_HIDE);
+
+    // Unhide All
+    editMenu.AddAction(ID_EDIT_UNHIDEALL);
+
+    /*
+     * The following block of code is part of the feature "Isolation Mode" and is temporarily
+     * disabled for 1.10 release.
+     * Jira: LY-49532
+
+    // Isolate Selected
+    QAction* isolateSelectedAction = editMenu->addAction(tr("Isolate Selected"));
+    connect(isolateSelectedAction, &QAction::triggered, this, []() {
+        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::EnterEditorIsolationMode);
+    });
+
+    // Exit Isolation
+    QAction* exitIsolationAction = editMenu->addAction(tr("Exit Isolation"));
+    connect(exitIsolationAction, &QAction::triggered, this, []() {
+        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::ExitEditorIsolationMode);
+    });
+
+    connect(editMenu, &QMenu::aboutToShow, this, [isolateSelectedAction, exitIsolationAction]() {
+        bool isInIsolationMode = false;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(isInIsolationMode, &AzToolsFramework::ToolsApplicationRequestBus::Events::IsEditorInIsolationMode);
+        if (isInIsolationMode)
+        {
+            isolateSelectedAction->setDisabled(true);
+            exitIsolationAction->setDisabled(false);
+        }
+        else
+        {
+            isolateSelectedAction->setDisabled(false);
+            exitIsolationAction->setDisabled(true);
+        }
+    });
+
+    */
+
+    editMenu.AddSeparator();
+
+    // Modify Menu
+    auto modifyMenu = editMenu.AddMenu(tr("&Modify"));
+
+    auto snapMenu = modifyMenu.AddMenu(tr("Snap"));
+
+    snapMenu.AddAction(ID_SNAPANGLE);
+
+    auto transformModeMenu = modifyMenu.AddMenu(tr("Transform Mode"));
+    transformModeMenu.AddAction(ID_EDITMODE_MOVE);
+    transformModeMenu.AddAction(ID_EDITMODE_ROTATE);
+    transformModeMenu.AddAction(ID_EDITMODE_SCALE);
+
+    editMenu.AddSeparator();
+
+    // Editor Settings
+    auto editorSettingsMenu = editMenu.AddMenu(tr("Editor Settings"));
+
+    // Global Preferences...
+    editorSettingsMenu.AddAction(ID_TOOLS_PREFERENCES);
+
+    // Graphics Settings...
+    editorSettingsMenu.AddAction(ID_GRAPHICS_SETTINGS);
+
+    // Editor Settings Manager
+    AddOpenViewPaneAction(editorSettingsMenu, LyViewPane::EditorSettingsManager);
+
+    // Graphics Performance
+    auto graphicPerformanceSubMenu = editorSettingsMenu.AddMenu(QObject::tr("Graphics Performance"));
+
+    auto pcMenu = graphicPerformanceSubMenu.AddMenu(tr("PC"));
+    pcMenu.AddAction(ID_GAME_PC_ENABLEVERYHIGHSPEC);
+    pcMenu.AddAction(ID_GAME_PC_ENABLEHIGHSPEC);
+    pcMenu.AddAction(ID_GAME_PC_ENABLEMEDIUMSPEC);
+    pcMenu.AddAction(ID_GAME_PC_ENABLELOWSPEC);
+
+    auto osxmetalMenu = graphicPerformanceSubMenu.AddMenu(tr("OSX Metal"));
+    osxmetalMenu.AddAction(ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC);
+    osxmetalMenu.AddAction(ID_GAME_OSXMETAL_ENABLEHIGHSPEC);
+    osxmetalMenu.AddAction(ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC);
+    osxmetalMenu.AddAction(ID_GAME_OSXMETAL_ENABLELOWSPEC);
+
+    auto androidMenu = graphicPerformanceSubMenu.AddMenu(tr("Android"));
+    androidMenu.AddAction(ID_GAME_ANDROID_ENABLEVERYHIGHSPEC);
+    androidMenu.AddAction(ID_GAME_ANDROID_ENABLEHIGHSPEC);
+    androidMenu.AddAction(ID_GAME_ANDROID_ENABLEMEDIUMSPEC);
+    androidMenu.AddAction(ID_GAME_ANDROID_ENABLELOWSPEC);
+
+    auto iosMenu = graphicPerformanceSubMenu.AddMenu(tr("iOS"));
+    iosMenu.AddAction(ID_GAME_IOS_ENABLEVERYHIGHSPEC);
+    iosMenu.AddAction(ID_GAME_IOS_ENABLEHIGHSPEC);
+    iosMenu.AddAction(ID_GAME_IOS_ENABLEMEDIUMSPEC);
+    iosMenu.AddAction(ID_GAME_IOS_ENABLELOWSPEC);
+
+#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)\
+    auto publicname##Menu = graphicPerformanceSubMenu.AddMenu(tr(PublicAuxName2));\
+    publicname##Menu.AddAction(ID_GAME_##CODENAME##_ENABLEHIGHSPEC);\
+    publicname##Menu.AddAction(ID_GAME_##CODENAME##_ENABLEMEDIUMSPEC);\
+    publicname##Menu.AddAction(ID_GAME_##CODENAME##_ENABLELOWSPEC);
+    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
+#undef AZ_RESTRICTED_PLATFORM_EXPANSION
+#endif
+
+    // Keyboard Customization
+    auto keyboardCustomizationMenu = editorSettingsMenu.AddMenu(tr("Keyboard Customization"));
+    keyboardCustomizationMenu.AddAction(ID_TOOLS_CUSTOMIZEKEYBOARD);
+    keyboardCustomizationMenu.AddAction(ID_TOOLS_EXPORT_SHORTCUTS);
+    keyboardCustomizationMenu.AddAction(ID_TOOLS_IMPORT_SHORTCUTS);
+}
+
+QMenu* LevelEditorMenuHandler::CreateEditMenu()
+{
+    return m_actionManager->AddMenu(tr("&Edit"), s_editMenuId);
+}
+
+QMenu* LevelEditorMenuHandler::CreateGameMenu()
+{
+    auto gameMenu = m_actionManager->AddMenu(tr("&Game"), s_gameMenuId);
+
+    // Play Game
+    gameMenu.AddAction(ID_VIEW_SWITCHTOGAME);
+
+    // Enable Physics/AI
+    gameMenu.AddAction(ID_SWITCH_PHYSICS);
+    gameMenu.AddSeparator();
+
+
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+    if (!usePrefabSystemForLevels)
+    {
+        // Export to Engine
+        gameMenu.AddAction(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE);
+    }
+
+    // Export Selected Objects
+    gameMenu.AddAction(ID_FILE_EXPORT_SELECTEDOBJECTS);
+
+    // Export Occlusion Mesh
+    gameMenu.AddAction(ID_FILE_EXPORTOCCLUSIONMESH);
+
+    gameMenu.AddSeparator();
+
+    // Synchronize Player with Camera
+    gameMenu.AddAction(ID_GAME_SYNCPLAYER);
+
+    gameMenu.AddSeparator();
+
+    // Audio
+    auto audioMenu = gameMenu.AddMenu(tr("Audio"));
+
+    // Stop All Sounds
+    audioMenu.AddAction(ID_SOUND_STOPALLSOUNDS);
+
+    // Refresh Audio
+    audioMenu.AddAction(ID_AUDIO_REFRESH_AUDIO_SYSTEM);
+
+    gameMenu.AddSeparator();
+
+    CreateDebuggingSubMenu(gameMenu);
+
+    return gameMenu;
+}
+
+QMenu* LevelEditorMenuHandler::CreateToolsMenu()
+{
+    // Tools
+    m_toolsMenu = m_actionManager->AddMenu(tr("&Tools"), s_toolMenuId);
+    return m_toolsMenu;
+}
+
+QMenu* LevelEditorMenuHandler::CreateViewMenu()
+{
+    auto viewMenu = m_actionManager->AddMenu(tr("&View"), s_viewMenuId);
+
+    // NEWMENUS: NEEDS IMPLEMENTATION
+    // minimize window - Ctrl+M
+    // Zoom - Ctrl+Plus(+) -> Need the inverse too?
+
+#ifdef FEATURE_ORTHOGRAPHIC_VIEW
+    // Cycle Viewports
+    viewMenu.AddAction(ID_VIEW_CYCLE2DVIEWPORT);
+#endif
+
+    // Center on Selection
+    viewMenu.AddAction(ID_MODIFY_GOTO_SELECTION);
+
+    // Show Quick Access Bar
+    viewMenu.AddAction(ID_OPEN_QUICK_ACCESS_BAR);
+
+    // Layouts
+    if (CViewManager::IsMultiViewportEnabled()) // Only supports 1 viewport for now.
+    {
+        // Disable Layouts menu
+        m_layoutsMenu = viewMenu.AddMenu(tr("Layouts"));
+        connect(m_viewPaneManager, &QtViewPaneManager::savedLayoutsChanged, this, [this]()
+            {
+                UpdateViewLayoutsMenu(m_layoutsMenu);
+            });
+
+        UpdateViewLayoutsMenu(m_layoutsMenu);
+    }
+
+    // Viewport
+    auto viewportViewsMenuWrapper = viewMenu.AddMenu(tr("Viewport"));
+
+#ifdef FEATURE_ORTHOGRAPHIC_VIEW
+    auto viewportTypesMenuWrapper = viewportViewsMenuWrapper.AddMenu(tr("Viewport Type"));
+
+    m_viewportViewsMenu = viewportViewsMenuWrapper;
+    connect(viewportTypesMenuWrapper, &QMenu::aboutToShow, this, &LevelEditorMenuHandler::UpdateOpenViewPaneMenu);
+
+    InitializeViewPaneMenu(m_actionManager, viewportTypesMenuWrapper, [](const QtViewPane& view)
+        {
+            return view.IsViewportPane();
+        });
+
+    viewportViewsMenuWrapper.AddSeparator();
+
+#endif
+
+    if (CViewManager::IsMultiViewportEnabled())
+    {
+        viewportViewsMenuWrapper.AddAction(ID_VIEW_CONFIGURELAYOUT);
+    }
+    viewportViewsMenuWrapper.AddSeparator();
+
+    viewportViewsMenuWrapper.AddAction(ID_DISPLAY_GOTOPOSITION);
+    viewportViewsMenuWrapper.AddAction(ID_MODIFY_GOTO_SELECTION);
+
+    auto gotoLocationMenu = viewportViewsMenuWrapper.AddMenu(tr("Go to Location"));
+    gotoLocationMenu.AddAction(ID_GOTO_LOC1);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC2);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC3);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC4);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC5);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC6);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC7);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC8);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC9);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC10);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC11);
+    gotoLocationMenu.AddAction(ID_GOTO_LOC12);
+
+    auto rememberLocationMenu = viewportViewsMenuWrapper.AddMenu(tr("Remember Location"));
+    rememberLocationMenu.AddAction(ID_TAG_LOC1);
+    rememberLocationMenu.AddAction(ID_TAG_LOC2);
+    rememberLocationMenu.AddAction(ID_TAG_LOC3);
+    rememberLocationMenu.AddAction(ID_TAG_LOC4);
+    rememberLocationMenu.AddAction(ID_TAG_LOC5);
+    rememberLocationMenu.AddAction(ID_TAG_LOC6);
+    rememberLocationMenu.AddAction(ID_TAG_LOC7);
+    rememberLocationMenu.AddAction(ID_TAG_LOC8);
+    rememberLocationMenu.AddAction(ID_TAG_LOC9);
+    rememberLocationMenu.AddAction(ID_TAG_LOC10);
+    rememberLocationMenu.AddAction(ID_TAG_LOC11);
+    rememberLocationMenu.AddAction(ID_TAG_LOC12);
+
+    viewportViewsMenuWrapper.AddSeparator();
+
+    auto switchCameraMenu = viewportViewsMenuWrapper.AddMenu(tr("Switch Camera"));
+    switchCameraMenu.AddAction(ID_SWITCHCAMERA_DEFAULTCAMERA);
+    switchCameraMenu.AddAction(ID_SWITCHCAMERA_SEQUENCECAMERA);
+    switchCameraMenu.AddAction(ID_SWITCHCAMERA_SELECTEDCAMERA);
+    switchCameraMenu.AddAction(ID_SWITCHCAMERA_NEXT);
+
+    // NEWMENUS:
+    // MISSING AVIRECORDER
+
+    viewportViewsMenuWrapper.AddSeparator();
+    viewportViewsMenuWrapper.AddAction(ID_DISPLAY_SHOWHELPERS);
+
+    // Refresh Style
+    viewMenu.AddAction(ID_SKINS_REFRESH);
+
+    return viewMenu;
+}
+
+QMenu* LevelEditorMenuHandler::CreateHelpMenu()
+{
+    // Help
+    auto helpMenu = m_actionManager->AddMenu(tr("&Help"), s_helpMenuId);
+
+    auto lineEditSearchAction = new QWidgetAction(m_mainWindow);
+    auto containerWidget = new QWidget(m_mainWindow);
+    auto lineEdit = new AzQtComponents::SearchLineEdit(m_mainWindow);
+    QHBoxLayout *layout = new QHBoxLayout;
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(lineEdit);
+    containerWidget->setLayout(layout);
+    containerWidget->setContentsMargins(2, 0, 2, 0);
+    lineEdit->setPlaceholderText(tr("Search documentation"));
+    lineEditSearchAction->setDefaultWidget(containerWidget);
+
+    auto searchAction = [lineEdit]()
+        {
+            auto text = lineEdit->text();
+            if (text.isEmpty())
+            {
+                QDesktopServices::openUrl(QUrl("https://o3de.org/docs/"));
+            }
+            else
+            {
+                static const int versionStringSize = 128;
+                char productVersionString[versionStringSize];
+                const SFileVersion& productVersion = gEnv->pSystem->GetProductVersion();
+                productVersion.ToString(productVersionString, versionStringSize);
+
+                QUrl docSearchUrl("https://o3de.org/docs/");
+                QUrlQuery docSearchQuery;
+                docSearchQuery.addQueryItem("query", text);
+                docSearchUrl.setQuery(docSearchQuery);
+                QDesktopServices::openUrl(docSearchUrl);
+            }
+            lineEdit->clear();
+        };
+    connect(lineEdit, &QLineEdit::returnPressed, this, searchAction);
+    connect(helpMenu.Get(), &QMenu::aboutToHide, lineEdit, &QLineEdit::clear);
+    connect(helpMenu.Get(), &QMenu::aboutToShow, lineEdit, &QLineEdit::clearFocus);
+    helpMenu->addAction(lineEditSearchAction);
+
+    // Tutorials
+    helpMenu.AddAction(ID_DOCUMENTATION_TUTORIALS);
+
+    // Documentation
+    auto documentationMenu = helpMenu.AddMenu(tr("Documentation"));
+
+    // Open 3D Engine Documentation
+    documentationMenu.AddAction(ID_DOCUMENTATION_O3DE);
+
+    // GameLift Documentation
+    documentationMenu.AddAction(ID_DOCUMENTATION_GAMELIFT);
+
+    // Release Notes
+    documentationMenu.AddAction(ID_DOCUMENTATION_RELEASENOTES);
+
+    // GameDev Resources
+    auto gameDevResourceMenu = helpMenu.AddMenu(tr("GameDev Resources"));
+
+    // Game Dev Blog
+    gameDevResourceMenu.AddAction(ID_DOCUMENTATION_GAMEDEVBLOG);
+
+    // Forums
+    gameDevResourceMenu.AddAction(ID_DOCUMENTATION_FORUMS);
+
+    // AWS Support
+    gameDevResourceMenu.AddAction(ID_DOCUMENTATION_AWSSUPPORT);
+
+    helpMenu.AddSeparator();
+
+    // About Open 3D Engine
+    helpMenu.AddAction(ID_APP_ABOUT);
+
+    // Welcome dialog
+    auto helpWelcome = helpMenu.AddAction(ID_APP_SHOW_WELCOME);
+    GetIEditor()->RegisterNotifyListener(new EditorListener(helpWelcome, [helpWelcome](EEditorNotifyEvent e)
+        {
+            DisableActionWhileLevelChanges(helpWelcome, e);
+        }));
+
+    return helpMenu;
+}
+
+QAction* LevelEditorMenuHandler::CreateViewPaneAction(const QtViewPane* view)
+{
+    QAction* action = m_actionManager->HasAction(view->m_id) ? m_actionManager->GetAction(view->m_id) : nullptr;
+
+    if (!action)
+    {
+        const QString menuText = view->m_options.optionalMenuText.length() > 0
+            ? view->m_options.optionalMenuText
+            : view->m_name;
+
+        action = new QAction(menuText, this);
+        action->setObjectName(view->m_name);
+        action->setCheckable(true);
+
+        if (view->m_options.showOnToolsToolbar)
+        {
+            action->setIcon(QIcon(view->m_options.toolbarIcon));
+        }
+
+        m_actionManager->AddAction(view->m_id, action);
+
+        if (!view->m_options.shortcut.isEmpty())
+        {
+            action->setShortcut(view->m_options.shortcut);
+        }
+
+        QObject::connect(
+            action, &QAction::triggered, this, &LevelEditorMenuHandler::checkOrOpenView, Qt::UniqueConnection);
+    }
+
+    return action;
+}
+
+// Function used to show menu options without its icon and be able to toggle shortcut visibility in the new menu layout
+// This is a work around for the fact that setting the shortcut on the original action isn't working for some reasons
+// and we need to investigate it further in the future.
+QAction* LevelEditorMenuHandler::CreateViewPaneMenuItem(
+    [[maybe_unused]] ActionManager* actionManager, ActionManager::MenuWrapper& menu, const QtViewPane* view)
+{
+    QAction* action = CreateViewPaneAction(view);
+
+    if (action && view->m_options.isDisabledInSimMode)
+    {
+        AddDisableActionInSimModeListener(action);
+    }
+
+    menu->addAction(action);
+
+    if (view->m_options.showOnToolsToolbar)
+    {
+        m_mainWindow->GetToolbarManager()->AddButtonToEditToolbar(action);
+    }
+
+    return action;
+}
+
+void LevelEditorMenuHandler::InitializeViewPaneMenu(
+    ActionManager* actionManager, ActionManager::MenuWrapper& menu,
+    AZStd::function <bool(const QtViewPane& view)> functor)
+{
+    QtViewPanes views = QtViewPaneManager::instance()->GetRegisteredPanes();
+
+    for (auto it = views.cbegin(), end = views.cend(); it != end; ++it)
+    {
+        const QtViewPane& view = *it;
+        if (!functor(view))
+        {
+            continue;
+        }
+
+        CreateViewPaneMenuItem(actionManager, menu, it);
+    }
+}
+
+void LevelEditorMenuHandler::LoadComponentLayout()
+{
+    m_viewPaneManager->RestoreDefaultLayout();
+}
+
+QMap<QString, QList<QtViewPane*>> LevelEditorMenuHandler::CreateMenuMap(
+    QMap<QString, QList<QtViewPane*> >& menuMap, QtViewPanes& allRegisteredViewPanes)
+{
+    // set up view panes to each category
+    for (QtViewPane& viewpane : allRegisteredViewPanes)
+    {
+        // only store the view panes that should be shown in the menu
+        if (!viewpane.IsViewportPane())
+        {
+            menuMap[viewpane.m_category].push_back(&viewpane);
+        }
+    }
+
+    return menuMap;
+}
+
+// sort the menu option name in alphabetically order
+struct CaseInsensitiveStringCompare
+{
+    bool operator() (const QString& left, const QString& right) const
+    {
+        return left.toLower() < right.toLower();
+    }
+};
+
+static void LaunchLuaEditor()
+{
+    AzToolsFramework::EditorRequestBus::Broadcast(
+        &AzToolsFramework::EditorRequests::LaunchLuaEditor, nullptr);
+}
+
+void LevelEditorMenuHandler::CreateMenuOptions(
+    QMap<QString, QList<QtViewPane*> >* menuMap, ActionManager::MenuWrapper& menu, const char* category)
+{
+    // list in the menu and remove this menu category from the menuMap
+    QList<QtViewPane*> menuList = menuMap->take(category);
+
+    std::map<QString, std::function<void()>, CaseInsensitiveStringCompare> sortMenuMap;
+
+    // store menu options into the map
+    // name as a key, functionality as a value
+    for (QtViewPane* viewpane : menuList)
+    {
+        if (viewpane->m_options.builtInActionId != LyViewPane::NO_BUILTIN_ACTION)
+        {
+            sortMenuMap[viewpane->m_name] = [this, &menu, viewpane]()
+            {
+                // Handle shortcuts for actions with a built-in ID since they
+                // bypass our CreateViewPaneMenuItem method
+                QAction* action = menu.AddAction(viewpane->m_options.builtInActionId);
+                if (action)
+                {
+                    if (viewpane->m_options.isDisabledInSimMode)
+                    {
+                        AddDisableActionInSimModeListener(action);
+                    }
+                    if (!viewpane->m_options.shortcut.isEmpty())
+                    {
+                        action->setShortcut(viewpane->m_options.shortcut);
+                    }
+                }
+            };
+        }
+        else
+        {
+            const QString menuText = viewpane->m_options.optionalMenuText.length() > 0
+                ? viewpane->m_options.optionalMenuText
+                : viewpane->m_name;
+
+            sortMenuMap[menuText] = [this, viewpane, &menu]()
+            {
+                CreateViewPaneMenuItem(m_actionManager, menu, viewpane);
+            };
+        }
+    }
+
+    if (category == LyViewPane::CategoryTools)
+    {
+        // Add LUA Editor into the Tools map
+        sortMenuMap[s_LUAEditorName] = [this, &menu]()
+        {
+            auto luaEditormenu = menu.AddAction(ID_TOOLS_LUA_EDITOR);
+            connect(luaEditormenu, &QAction::triggered, this, &LaunchLuaEditor, Qt::UniqueConnection);
+        };
+    }
+
+    // add each menu option into the menu
+    std::map<QString, std::function<void()>, CaseInsensitiveStringCompare>::iterator iter;
+    for (iter = sortMenuMap.begin(); iter != sortMenuMap.end(); ++iter)
+    {
+        iter->second();
+    }
+}
+
+void LevelEditorMenuHandler::CreateDebuggingSubMenu(ActionManager::MenuWrapper gameMenu)
+{
+    // DebuggingSubMenu
+    auto debuggingSubMenu = gameMenu.AddMenu(QObject::tr("Debugging"));
+
+    // Error Report
+    AddOpenViewPaneAction(debuggingSubMenu, LyViewPane::ErrorReport);
+
+    debuggingSubMenu.AddSeparator();
+
+    // Configure Toolbox Macros
+    debuggingSubMenu.AddAction(ID_TOOLS_CONFIGURETOOLS);
+
+    // Toolbox Macros
+    m_macrosMenu = debuggingSubMenu.AddMenu(tr("ToolBox Macros"));
+    connect(m_macrosMenu, &QMenu::aboutToShow, this, &LevelEditorMenuHandler::UpdateMacrosMenu, Qt::UniqueConnection);
+
+    UpdateMacrosMenu();
+}
+
+void LevelEditorMenuHandler::UpdateMRUFiles()
+{
+    auto cryEdit = CCryEditApp::instance();
+    RecentFileList* mruList = cryEdit->GetRecentFileList();
+    const int numMru = mruList->GetSize();
+
+    if (!m_mostRecentLevelsMenu)
+    {
+        return;
+    }
+
+    // Remove most recent items
+    m_mostRecentLevelsMenu->clear();
+
+    // Insert mrus
+    QString sCurDir = QString(Path::GetEditingGameDataFolder().c_str()) + QDir::separator();
+
+    QFileInfo gameDir(sCurDir); // Pass it through QFileInfo so it comes out normalized
+    const QString gameDirPath = gameDir.absolutePath();
+
+    for (int i = 0; i < numMru; ++i)
+    {
+        if (!MRUEntryIsValid((*mruList)[i], gameDirPath))
+        {
+            continue;
+        }
+
+        QString displayName;
+        mruList->GetDisplayName(displayName, i, sCurDir);
+
+        QString entry = QString("%1 %2").arg(i + 1).arg(displayName);
+        QAction* action = m_actionManager->GetAction(ID_FILE_MRU_FILE1 + i);
+        action->setText(entry);
+
+        m_actionManager->RegisterActionHandler(ID_FILE_MRU_FILE1 + i, [i]()
+            {
+                auto cryEdit = CCryEditApp::instance();
+                RecentFileList* mruList = cryEdit->GetRecentFileList();
+                // Check file is still available
+                if (mruList->GetSize() > i)
+                {
+                    cryEdit->OpenDocumentFile((*mruList)[i].toUtf8().data());
+                }
+            });
+        m_actionManager->RegisterUpdateCallback(ID_FILE_MRU_FILE1 + i, cryEdit, &CCryEditApp::OnUpdateFileOpen);
+
+        GetIEditor()->RegisterNotifyListener(new EditorListener(action, [action](EEditorNotifyEvent e)
+            {
+                DisableActionWhileLevelChanges(action, e);
+            }));
+
+        m_mostRecentLevelsMenu->addAction(action);
+    }
+
+    // Used when disabling the "Open Recent" menu options
+    OnUpdateOpenRecent();
+
+    m_mostRecentLevelsMenu->addSeparator();
+
+    // Clear All
+    auto clearAllMenu = m_mostRecentLevelsMenu->addAction(tr("Clear All"));
+    connect(clearAllMenu, &QAction::triggered, this, &LevelEditorMenuHandler::ClearAll);
+}
+
+void LevelEditorMenuHandler::ClearAll()
+{
+    RecentFileList* mruList = CCryEditApp::instance()->GetRecentFileList();
+
+    // remove everything from the mru list
+    for (int i = mruList->GetSize(); i > 0; i--)
+    {
+        mruList->Remove(i - 1);
+    }
+
+    // save the settings immediately to the registry
+    mruList->WriteList();
+
+    // re-update the menus
+    UpdateMRUFiles();
+}
+
+// Used for disabling "Open Recent" menu option
+void LevelEditorMenuHandler::OnUpdateOpenRecent()
+{
+    RecentFileList* mruList = CCryEditApp::instance()->GetRecentFileList();
+    const int numMru = mruList->GetSize();
+    QString currentMru = numMru > 0 ? (*mruList)[0] : QString();
+
+    if (!currentMru.isEmpty())
+    {
+        m_mostRecentLevelsMenu->setEnabled(true);
+    }
+    else
+    {
+        m_mostRecentLevelsMenu->setEnabled(false);
+    }
+}
+
+void LevelEditorMenuHandler::OnUpdateMacrosMenu()
+{
+    auto tools = GetIEditor()->GetToolBoxManager();
+    const int macroCount = tools->GetMacroCount(true);
+
+    if (macroCount <= 0)
+    {
+        m_macrosMenu->setEnabled(false);
+    }
+    else
+    {
+        m_macrosMenu->setEnabled(true);
+    }
+}
+
+void LevelEditorMenuHandler::UpdateMacrosMenu()
+{
+    m_macrosMenu->clear();
+
+    auto tools = GetIEditor()->GetToolBoxManager();
+    const int macroCount = tools->GetMacroCount(true);
+
+    for (int i = 0; i < macroCount; ++i)
+    {
+        auto macro = tools->GetMacro(i, true);
+        const int toolbarId = macro->GetToolbarId();
+        if (toolbarId == -1 || toolbarId == ID_TOOLS_TOOL1)
+        {
+            m_macrosMenu->addAction(macro->action());
+        }
+    }
+}
+
+void LevelEditorMenuHandler::UpdateOpenViewPaneMenu()
+{
+    // This function goes through all the viewport menu actions (top, left, perspective...)
+    // and adds a check mark on the viewport that has focus
+
+    QtViewport* viewport = m_mainWindow->GetActiveViewport();
+    QString activeViewportName = viewport ? viewport->GetName() : QString();
+
+    for (QAction* action : m_viewportViewsMenu->actions())
+    {
+        action->setChecked(action->objectName() == activeViewportName);
+    }
+}
+
+void LevelEditorMenuHandler::checkOrOpenView()
+{
+    QAction* action = qobject_cast<QAction*>(sender());
+    const QString viewPaneName = action->objectName();
+    // If this action is checkable and was just unchecked, then we
+    // should close the view pane
+    if (action->isCheckable() && !action->isChecked())
+    {
+        QtViewPaneManager::instance()->ClosePane(viewPaneName);
+    }
+    // Otherwise, this action should open the view pane
+    else
+    {
+        const QtViewPane* pane = QtViewPaneManager::instance()->OpenPane(viewPaneName);
+
+        QObject::connect(pane->Widget(), &QWidget::destroyed, action, [action]
+        {
+            action->setChecked(false);
+        });
+    }
+}
+
+void LevelEditorMenuHandler::AddDisableActionInSimModeListener(QAction* action)
+{
+    GetIEditor()->RegisterNotifyListener(new EditorListener(action, [action](EEditorNotifyEvent e)
+    {
+        DisableActionWhileInSimMode(action, e);
+    }));
+}
+
+void LevelEditorMenuHandler::EnteredComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
+{
+    auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
+    if (!menuWrapper.isNull())
+    {
+        // copy of menu actions
+        auto actions = menuWrapper.Get()->actions();
+        // remove all non-reserved edit menu options
+        actions.erase(
+            std::remove_if(actions.begin(), actions.end(), [](QAction* action)
+            {
+                return !action->property("Reserved").toBool();
+            }),
+            actions.end());
+
+        // clear and update the menu with new actions
+        menuWrapper.Get()->clear();
+        menuWrapper.Get()->addActions(actions);
+    }
+}
+
+void LevelEditorMenuHandler::LeftComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
+{
+    RestoreEditMenuToDefault();
+}
+
+void LevelEditorMenuHandler::AddEditMenuAction(QAction* action)
+{
+    auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
+    if (!menuWrapper.isNull())
+    {
+        menuWrapper.Get()->addAction(action);
+    }
+}
+
+void LevelEditorMenuHandler::AddMenuAction(AZStd::string_view categoryId, QAction* action, bool addToToolsToolbar)
+{
+    auto menuWrapper = m_actionManager->FindMenu(categoryId.data());
+    if (menuWrapper.isNull())
+    {
+        AZ_Assert(false, "No %s category exists in Editor menu.");
+        return;
+    }
+    menuWrapper.Get()->addAction(action);
+
+    if (addToToolsToolbar)
+    {
+        m_mainWindow->GetToolbarManager()->AddButtonToEditToolbar(action);
+    }
+}
+
+void LevelEditorMenuHandler::RestoreEditMenuToDefault()
+{
+    auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
+    if (!menuWrapper.isNull())
+    {
+        menuWrapper.Get()->clear();
+        PopulateEditMenu(menuWrapper);
+    }
+}
+
+#include <Core/moc_LevelEditorMenuHandler.cpp>
diff --git a/Code/Editor/Core/LevelEditorMenuHandler.h b/Code/Editor/Core/LevelEditorMenuHandler.h
new file mode 100644
index 0000000000..bb23314419
--- /dev/null
+++ b/Code/Editor/Core/LevelEditorMenuHandler.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#ifndef LEVELEDITORMENUHANDLER_H
+#define LEVELEDITORMENUHANDLER_H
+
+#if !defined(Q_MOC_RUN)
+#include <QObject>
+#include <QString>
+#include <QMenu>
+#include <QPointer>
+#include "ActionManager.h"
+#include "QtViewPaneManager.h"
+#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
+#endif
+
+class MainWindow;
+class QtViewPaneManager;
+class QSettings;
+struct QtViewPane;
+
+class LevelEditorMenuHandler
+    : public QObject
+    , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
+    , private AzToolsFramework::EditorMenuRequestBus::Handler
+{
+    Q_OBJECT
+public:
+    LevelEditorMenuHandler(MainWindow* mainWindow, QtViewPaneManager* const viewPaneManager, QSettings& settings);
+    ~LevelEditorMenuHandler();
+
+    void Initialize();
+
+    bool MRUEntryIsValid(const QString& entry, const QString& gameFolderPath);
+
+    void IncrementViewPaneVersion();
+    int GetViewPaneVersion() const;
+
+    void UpdateViewLayoutsMenu(ActionManager::MenuWrapper& layoutsMenu);
+
+    void ResetToolsMenus();
+
+    QAction* CreateViewPaneAction(const QtViewPane* view);
+
+    // It's used when users update the Tool Box Macro list in the Configure Tool Box Macro dialog
+    void UpdateMacrosMenu();
+
+Q_SIGNALS:
+    void ActivateAssetImporter();
+
+private:
+    QMenu* CreateFileMenu();
+    QMenu* CreateEditMenu();
+    void PopulateEditMenu(ActionManager::MenuWrapper& editMenu);
+    QMenu* CreateGameMenu();
+    QMenu* CreateToolsMenu();
+    QMenu* CreateViewMenu();
+    QMenu* CreateHelpMenu();
+
+    void checkOrOpenView();
+
+    QMap<QString, QList<QtViewPane*>> CreateMenuMap(QMap<QString, QList<QtViewPane*>>& menuMap, QtViewPanes& allRegisteredViewPanes);
+    void CreateMenuOptions(QMap<QString, QList<QtViewPane*>>* menuMap, ActionManager::MenuWrapper& menu, const char* category);
+
+    void CreateDebuggingSubMenu(ActionManager::MenuWrapper gameMenu);
+
+    void UpdateMRUFiles();
+
+    void ClearAll();
+    void OnUpdateOpenRecent();
+
+    void OnUpdateMacrosMenu();
+
+    void UpdateOpenViewPaneMenu();
+
+    QAction* CreateViewPaneMenuItem(ActionManager* actionManager, ActionManager::MenuWrapper& menu, const QtViewPane* view);
+
+    void InitializeViewPaneMenu(ActionManager* actionManager, ActionManager::MenuWrapper& menu, AZStd::function < bool(const QtViewPane& view)> functor);
+
+    void LoadComponentLayout();
+
+    void AddDisableActionInSimModeListener(QAction* action);
+
+    // EditorComponentModeNotificationBus
+    void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
+    void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
+
+    // EditorMenuRequestBus
+    void AddEditMenuAction(QAction* action) override;
+    void AddMenuAction(AZStd::string_view categoryId, QAction* action, bool addToToolsToolbar) override;
+    void RestoreEditMenuToDefault() override;
+
+    MainWindow* m_mainWindow;
+    ActionManager* m_actionManager;
+    QtViewPaneManager* m_viewPaneManager;
+
+    QPointer<QMenu> m_viewportViewsMenu;
+
+    ActionManager::MenuWrapper m_toolsMenu;
+
+    QMenu* m_mostRecentLevelsMenu = nullptr;
+    QMenu* m_mostRecentProjectsMenu = nullptr;
+    QMenu* m_editmenu = nullptr;
+
+    ActionManager::MenuWrapper m_viewPanesMenu;
+    ActionManager::MenuWrapper m_layoutsMenu;
+    ActionManager::MenuWrapper m_macrosMenu;
+
+    const char* m_levelExtension = nullptr;
+    int m_viewPaneVersion = 0;
+
+    QList<QMenu*> m_topLevelMenus;
+    QSettings& m_settings;
+};
+
+#endif // LEVELEDITORMENUHANDLER_H
diff --git a/Code/Editor/Core/QtEditorApplication.cpp b/Code/Editor/Core/QtEditorApplication.cpp
new file mode 100644
index 0000000000..f5c886761c
--- /dev/null
+++ b/Code/Editor/Core/QtEditorApplication.cpp
@@ -0,0 +1,659 @@
+
+/*
+ * 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 "QtEditorApplication.h"
+
+// Qt
+#include <QAbstractEventDispatcher>
+#include <QScopedValueRollback>
+#include <QToolBar>
+#include <QLoggingCategory>
+#if defined(AZ_PLATFORM_WINDOWS)
+#include <QtGui/qpa/qplatformnativeinterface.h>
+#include <QtGui/private/qhighdpiscaling_p.h>
+#endif
+
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+// AzFramework
+#if defined(AZ_PLATFORM_WINDOWS)
+#   include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
+#endif // defined(AZ_PLATFORM_WINDOWS)
+
+// AzQtComponents
+#include <AzQtComponents/Components/GlobalEventFilter.h>
+#include <AzQtComponents/Components/O3DEStylesheet.h>
+#include <AzQtComponents/Components/Titlebar.h>
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+
+// Editor
+#include "Settings.h"
+#include "CryEdit.h"
+
+
+enum
+{
+    // in milliseconds
+    GameModeIdleFrequency = 0,
+    EditorModeIdleFrequency = 1,
+    InactiveModeFrequency = 10,
+    UninitializedFrequency = 9999,
+};
+
+Q_LOGGING_CATEGORY(InputDebugging, "o3de.editor.input")
+
+// internal, private namespace:
+namespace
+{
+    class EditorGlobalEventFilter
+        : public AzQtComponents::GlobalEventFilter
+    {
+    public:
+        explicit EditorGlobalEventFilter(QObject* watch)
+            : AzQtComponents::GlobalEventFilter(watch) {}
+
+        bool eventFilter(QObject* obj, QEvent* e) override
+        {
+            static bool isRecursing = false;
+
+            if (isRecursing)
+            {
+                return false;
+            }
+
+            QScopedValueRollback<bool> guard(isRecursing, true);
+
+            // Detect Widget move
+            // We're doing this before the events are actually consumed to avoid confusion
+            if (IsDragGuardedWidget(obj))
+            {
+                switch (e->type())
+                {
+                    case QEvent::MouseButtonPress:
+                    {
+                        m_widgetDraggedState = WidgetDraggedState::Clicked;
+                        break;
+                    }
+                    case QEvent::Move:
+                    case QEvent::MouseMove:
+                    {
+                        if (m_widgetDraggedState == WidgetDraggedState::Clicked)
+                        {
+                            m_widgetDraggedState = WidgetDraggedState::Dragged;
+                        }
+                        break;
+                    }
+                }
+            }
+
+            if (e->type() == QEvent::MouseButtonRelease)
+            {
+                m_widgetDraggedState = WidgetDraggedState::None;
+            }
+
+            switch (e->type())
+            {
+                case QEvent::KeyPress:
+                case QEvent::KeyRelease:
+                {
+                    if (GetIEditor()->IsInGameMode())
+                    {
+                        // don't let certain keys fall through to the game when it's running
+                        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
+                        auto key = keyEvent->key();
+
+                        if ((key == Qt::Key_Alt) || (key == Qt::Key_AltGr) || ((key >= Qt::Key_F1) && (key <= Qt::Key_F35)))
+                        {
+                            return true;
+                        }
+                    }
+                }
+                break;
+
+                case QEvent::Shortcut:
+                {
+                    // Eat shortcuts in game mode or when a guarded widget is being dragged
+                    if (GetIEditor()->IsInGameMode() || m_widgetDraggedState == WidgetDraggedState::Dragged)
+                    {
+                        return true;
+                    }
+                }
+                break;
+
+                case QEvent::MouseButtonPress:
+                case QEvent::MouseButtonRelease:
+                case QEvent::MouseButtonDblClick:
+                case QEvent::MouseMove:
+                {
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+                    auto widget = qobject_cast<QWidget*>(obj);
+                    if (widget && widget->graphicsProxyWidget() != nullptr)
+                    {
+                        QMouseEvent* me = static_cast<QMouseEvent*>(e);
+                        QWidget* target = qApp->widgetAt(QCursor::pos());
+                        if (target)
+                        {
+                            QMouseEvent ev(me->type(), target->mapFromGlobal(QCursor::pos()), me->button(), me->buttons(), me->modifiers());
+                            qApp->notify(target, &ev);
+                            return true;
+                        }
+                    }
+#endif
+                    GuardMouseEventSelectionChangeMetrics(e);
+                }
+                break;
+            }
+
+            return GlobalEventFilter::eventFilter(obj, e);
+        }
+
+    private:
+        bool m_mouseButtonWasDown = false;
+
+        void GuardMouseEventSelectionChangeMetrics(QEvent* e)
+        {
+            // Force the metrics collector to queue up any selection changed metrics until mouse release, so that we don't
+            // get flooded with multiple selection changed events when one, sent on mouse release, is enough.
+            if (e->type() == QEvent::MouseButtonPress)
+            {
+                if (!m_mouseButtonWasDown)
+                {
+                    m_mouseButtonWasDown = true;
+                }
+            }
+            else if (e->type() == QEvent::MouseButtonRelease)
+            {
+                // This is a tricky case. We don't want to send the end selection change event too early
+                // because there might be other things responding to the mouse release after this, and we want to
+                // block handling of the selection change events until we're entirely finished with the mouse press.
+                // So, queue the handling with a single shot timer, but then check the state of the mouse buttons
+                // to ensure that they haven't been pressed in between the release and the timer firing off.
+                QTimer::singleShot(0, this, [this]() {
+                    if (!QApplication::mouseButtons() && m_mouseButtonWasDown)
+                    {
+                        m_mouseButtonWasDown = false;
+                    }
+                });
+            }
+        }
+
+        //! Detect if the event's target is a Widget we want to guard from shortcuts while it's being dragged.
+        //! This function can be easily expanded to handle exceptions.
+        bool IsDragGuardedWidget(const QObject* obj)
+        {
+            return qobject_cast<const QWidget*>(obj) != nullptr;
+        }
+
+        //! Enum to keep track of Widget dragged state
+        enum class WidgetDraggedState
+        {
+            None,       //!< No widget is being clicked nor dragged
+            Clicked,    //!< A widget has been clicked on but has not been dragged
+            Dragged,    //!< A widget is being dragged
+        };
+
+        WidgetDraggedState m_widgetDraggedState = WidgetDraggedState::None;
+    };
+
+    static void LogToDebug([[maybe_unused]] QtMsgType Type, [[maybe_unused]] const QMessageLogContext& Context, const QString& message)
+    {
+#if defined(WIN32) || defined(WIN64)
+        OutputDebugStringW(L"Qt: ");
+        OutputDebugStringW(reinterpret_cast<const wchar_t*>(message.utf16()));
+        OutputDebugStringW(L"\n");
+#endif
+    }
+}
+
+namespace Editor
+{
+    void ScanDirectories(QFileInfoList& directoryList, const QStringList& filters, QFileInfoList& files, ScanDirectoriesUpdateCallBack updateCallback)
+    {
+        while (!directoryList.isEmpty())
+        {
+            QDir directory(directoryList.front().absoluteFilePath(), "*", QDir::Name | QDir::IgnoreCase, QDir::AllEntries);
+            directoryList.pop_front();
+
+            if (directory.exists())
+            {
+                // Append each file from this directory that matches one of the filters to files
+                directory.setNameFilters(filters);
+                directory.setFilter(QDir::Files);
+                files.append(directory.entryInfoList());
+
+                // Add all of the subdirectories from this directory to the queue to be searched
+                directory.setNameFilters(QStringList("*"));
+                directory.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+                directoryList.append(directory.entryInfoList());
+                if (updateCallback)
+                {
+                    updateCallback();
+                }
+            }
+        }
+    }
+
+    EditorQtApplication::EditorQtApplication(int& argc, char** argv)
+        : QApplication(argc, argv)
+        , m_inWinEventFilter(false)
+        , m_stylesheet(new AzQtComponents::O3DEStylesheet(this))
+        , m_idleTimer(new QTimer(this))
+    {
+        m_idleTimer->setInterval(UninitializedFrequency);
+
+        setWindowIcon(QIcon(":/Application/res/o3de_editor.ico"));
+
+        // set the default key store for our preferences:
+        setOrganizationName("O3DE");
+        setOrganizationDomain("o3de.org");
+        setApplicationName("O3DE Editor");
+
+        connect(m_idleTimer, &QTimer::timeout, this, &EditorQtApplication::maybeProcessIdle);
+
+        connect(this, &QGuiApplication::applicationStateChanged, this, [this] { ResetIdleTimerInterval(PollState); });
+        installEventFilter(this);
+
+        // Disable our debugging input helpers by default
+        QLoggingCategory::setFilterRules(QStringLiteral("o3de.editor.input.*=false"));
+
+        // Initialize our stylesheet here to allow Gems to register stylesheets when their system components activate.
+        AZ::IO::FixedMaxPath engineRootPath;
+        {
+            // Create a ComponentApplication to initialize the AZ::SystemAllocator and initialize the SettingsRegistry
+            AZ::ComponentApplication application(argc, argv);
+            auto settingsRegistry = AZ::SettingsRegistry::Get();
+            settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        }
+        m_stylesheet->initialize(this, engineRootPath);
+    }
+
+    void EditorQtApplication::Initialize()
+    {
+        GetIEditor()->RegisterNotifyListener(this);
+
+        // install QTranslator
+        InstallEditorTranslators();
+
+        // install hooks and filters last and revoke them first
+        InstallFilters();
+
+        // install this filter. It will be a parent of the application and cleaned up when it is cleaned up automically
+        auto globalEventFilter = new EditorGlobalEventFilter(this);
+        installEventFilter(globalEventFilter);
+    }
+
+    void EditorQtApplication::LoadSettings()
+    {
+        AZ::SerializeContext* context;
+        EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ_Assert(context, "No serialize context");
+        char resolvedPath[AZ_MAX_PATH_LEN];
+        AZ::IO::FileIOBase::GetInstance()->ResolvePath("@user@/EditorUserSettings.xml", resolvedPath, AZ_MAX_PATH_LEN);
+        m_localUserSettings.Load(resolvedPath, context);
+        m_localUserSettings.Activate(AZ::UserSettings::CT_LOCAL);
+        AZ::UserSettingsOwnerRequestBus::Handler::BusConnect(AZ::UserSettings::CT_LOCAL);
+        m_activatedLocalUserSettings = true;
+    }
+
+    void EditorQtApplication::UnloadSettings()
+    {
+        if (m_activatedLocalUserSettings)
+        {
+            SaveSettings();
+            m_localUserSettings.Deactivate();
+            AZ::UserSettingsOwnerRequestBus::Handler::BusDisconnect();
+            m_activatedLocalUserSettings = false;
+        }
+    }
+
+    void EditorQtApplication::SaveSettings()
+    {
+        if (m_activatedLocalUserSettings)
+        {
+            AZ::SerializeContext* context;
+            EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+            AZ_Assert(context, "No serialize context");
+
+            char resolvedPath[AZ_MAX_PATH_LEN];
+            AZ::IO::FileIOBase::GetInstance()->ResolvePath("@user@/EditorUserSettings.xml", resolvedPath, AZ_ARRAY_SIZE(resolvedPath));
+            m_localUserSettings.Save(resolvedPath, context);
+        }
+    }
+
+    void EditorQtApplication::maybeProcessIdle()
+    {
+        if (!m_isMovingOrResizing)
+        {
+            if (auto winapp = CCryEditApp::instance())
+            {
+                winapp->OnIdle(0);
+            }
+        }
+    }
+
+    void EditorQtApplication::InstallQtLogHandler()
+    {
+        qInstallMessageHandler(LogToDebug);
+    }
+
+    void EditorQtApplication::InstallFilters()
+    {
+        if (auto dispatcher = QAbstractEventDispatcher::instance())
+        {
+            dispatcher->installNativeEventFilter(this);
+        }
+    }
+
+    void EditorQtApplication::UninstallFilters()
+    {
+        if (auto dispatcher = QAbstractEventDispatcher::instance())
+        {
+            dispatcher->removeNativeEventFilter(this);
+        }
+    }
+
+    EditorQtApplication::~EditorQtApplication()
+    {
+        if (GetIEditor())
+        {
+            GetIEditor()->UnregisterNotifyListener(this);
+        }
+
+        UninstallFilters();
+
+        UninstallEditorTranslators();
+    }
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    bool EditorQtApplication::nativeEventFilter([[maybe_unused]] const QByteArray& eventType, void* message, long* result)
+    {
+        MSG* msg = (MSG*)message;
+
+        if (msg->message == WM_MOVING || msg->message == WM_SIZING)
+        {
+            m_isMovingOrResizing = true;
+        }
+        else if (msg->message == WM_EXITSIZEMOVE)
+        {
+            m_isMovingOrResizing = false;
+        }
+
+        // Prevent the user from being able to move the window in game mode.
+        // This is done during the hit test phase to bypass the native window move messages. If the window
+        // decoration wrapper title bar contains the cursor, set the result to HTCLIENT instead of
+        // HTCAPTION.
+        if (msg->message == WM_NCHITTEST && GetIEditor()->IsInGameMode())
+        {
+            const LRESULT defWinProcResult = DefWindowProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
+            if (defWinProcResult == 1)
+            {
+                if (QWidget* widget = QWidget::find((WId)msg->hwnd))
+                {
+                    if (auto wrapper = qobject_cast<const AzQtComponents::WindowDecorationWrapper *>(widget))
+                    {
+                        AzQtComponents::TitleBar* titleBar = wrapper->titleBar();
+                        const short global_x = static_cast<short>(LOWORD(msg->lParam));
+                        const short global_y = static_cast<short>(HIWORD(msg->lParam));
+
+                        const QPoint globalPos = QHighDpi::fromNativePixels(QPoint(global_x, global_y), widget->window()->windowHandle());
+                        const QPoint local = titleBar->mapFromGlobal(globalPos);
+                        if (titleBar->draggableRect().contains(local) && !titleBar->isTopResizeArea(globalPos))
+                        {
+                            *result = HTCLIENT;
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+
+        // Ensure that the Windows WM_INPUT messages get passed through to the AzFramework input system.
+        // These events are now consumed both in and out of game mode.
+        if (msg->message == WM_INPUT)
+        {
+            UINT rawInputSize;
+            const UINT rawInputHeaderSize = sizeof(RAWINPUTHEADER);
+            GetRawInputData((HRAWINPUT)msg->lParam, RID_INPUT, NULL, &rawInputSize, rawInputHeaderSize);
+
+            AZStd::array<BYTE, sizeof(RAWINPUT)> rawInputBytesArray;
+            LPBYTE rawInputBytes = rawInputBytesArray.data();
+
+            const UINT bytesCopied = GetRawInputData((HRAWINPUT)msg->lParam, RID_INPUT, rawInputBytes, &rawInputSize, rawInputHeaderSize);
+            CRY_ASSERT(bytesCopied == rawInputSize);
+
+            RAWINPUT* rawInput = (RAWINPUT*)rawInputBytes;
+            CRY_ASSERT(rawInput);
+
+            AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputEvent, *rawInput);
+
+            return false;
+        }
+        else if (msg->message == WM_DEVICECHANGE)
+        {
+            if (msg->wParam == 0x0007) // DBT_DEVNODES_CHANGED
+            {
+                AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputDeviceChangeEvent);
+            }
+            return true;
+        }
+
+        return false;
+    }
+#endif
+
+    void EditorQtApplication::OnEditorNotifyEvent(EEditorNotifyEvent event)
+    {
+        switch (event)
+        {
+            case eNotify_OnStyleChanged:
+                RefreshStyleSheet();
+                emit skinChanged();
+            break;
+
+            case eNotify_OnQuit:
+                GetIEditor()->UnregisterNotifyListener(this);
+            break;
+
+            case eNotify_OnBeginGameMode:
+                // GetIEditor()->IsInGameMode() Isn't reliable when called from within the notification handler
+                ResetIdleTimerInterval(GameMode);
+            break;
+            case eNotify_OnEndGameMode:
+                ResetIdleTimerInterval(EditorMode);
+            break;
+        }
+    }
+
+    QColor EditorQtApplication::InterpolateColors(QColor a, QColor b, float factor)
+    {
+        return QColor(int(a.red() * (1.0f - factor) + b.red() * factor),
+            int(a.green() * (1.0f - factor) + b.green() * factor),
+            int(a.blue() * (1.0f - factor) + b.blue() * factor),
+            int(a.alpha() * (1.0f - factor) + b.alpha() * factor));
+    }
+
+    void EditorQtApplication::RefreshStyleSheet()
+    {
+        m_stylesheet->Refresh();
+    }
+
+    void EditorQtApplication::setIsMovingOrResizing(bool isMovingOrResizing)
+    {
+        if (m_isMovingOrResizing == isMovingOrResizing)
+        {
+            return;
+        }
+
+        m_isMovingOrResizing = isMovingOrResizing;
+    }
+
+    bool EditorQtApplication::isMovingOrResizing() const
+    {
+        return m_isMovingOrResizing;
+    }
+
+    const QColor& EditorQtApplication::GetColorByName(const QString& name)
+    {
+        return m_stylesheet->GetColorByName(name);
+    }
+
+    EditorQtApplication* EditorQtApplication::instance()
+    {
+        return static_cast<EditorQtApplication*>(QApplication::instance());
+    }
+
+    bool EditorQtApplication::IsActive()
+    {
+        return applicationState() == Qt::ApplicationActive;
+    }
+
+    QTranslator* EditorQtApplication::CreateAndInitializeTranslator(const QString& filename, const QString& directory)
+    {
+        Q_ASSERT(QFile::exists(directory + "/" + filename));
+
+        QTranslator* translator = new QTranslator();
+        translator->load(filename, directory);
+        installTranslator(translator);
+        return translator;
+    }
+
+    void EditorQtApplication::InstallEditorTranslators()
+    {
+        m_editorTranslator =        CreateAndInitializeTranslator("editor_en-us.qm", ":/Translations");
+        m_assetBrowserTranslator =  CreateAndInitializeTranslator("assetbrowser_en-us.qm", ":/Translations");
+    }
+
+    void EditorQtApplication::DeleteTranslator(QTranslator*& translator)
+    {
+        removeTranslator(translator);
+        delete translator;
+        translator = nullptr;
+    }
+
+    void EditorQtApplication::UninstallEditorTranslators()
+    {
+        DeleteTranslator(m_editorTranslator);
+        DeleteTranslator(m_assetBrowserTranslator);
+    }
+
+    void EditorQtApplication::EnableOnIdle(bool enable)
+    {
+        if (enable)
+        {
+            if (m_idleTimer->interval() == UninitializedFrequency)
+            {
+                ResetIdleTimerInterval();
+            }
+
+            m_idleTimer->start();
+        }
+        else
+        {
+            m_idleTimer->stop();
+        }
+    }
+
+    bool EditorQtApplication::OnIdleEnabled() const
+    {
+        if (m_idleTimer->interval() == UninitializedFrequency)
+        {
+            return false;
+        }
+
+        return m_idleTimer->isActive();
+    }
+
+    void EditorQtApplication::ResetIdleTimerInterval(TimerResetFlag flag)
+    {
+        bool isInGameMode = flag == GameMode;
+        if (flag == PollState)
+        {
+            isInGameMode = GetIEditor() ? GetIEditor()->IsInGameMode() : false;
+        }
+
+        // Game mode takes precedence over anything else
+        if (isInGameMode)
+        {
+            m_idleTimer->setInterval(GameModeIdleFrequency);
+        }
+        else
+        {
+            if (applicationState() & Qt::ApplicationActive)
+            {
+                m_idleTimer->setInterval(EditorModeIdleFrequency);
+            }
+            else
+            {
+                m_idleTimer->setInterval(InactiveModeFrequency);
+            }
+        }
+    }
+
+    bool EditorQtApplication::eventFilter(QObject* object, QEvent* event)
+    {
+        switch (event->type())
+        {
+        case QEvent::MouseButtonPress:
+            m_pressedButtons |= reinterpret_cast<QMouseEvent*>(event)->button();
+            break;
+        case QEvent::MouseButtonRelease:
+            m_pressedButtons &= ~(reinterpret_cast<QMouseEvent*>(event)->button());
+            break;
+        case QEvent::KeyPress:
+            m_pressedKeys.insert(reinterpret_cast<QKeyEvent*>(event)->key());
+            break;
+        case QEvent::KeyRelease:
+            m_pressedKeys.remove(reinterpret_cast<QKeyEvent*>(event)->key());
+            break;
+#ifdef AZ_PLATFORM_WINDOWS
+        case QEvent::Leave:
+        {
+            // if we receive a leave event for a toolbar on Windows
+            // check first whether we really left it. If we didn't: start checking
+            // for the tool bar under the mouse by timer to check when we really left.
+            // Synthesize a new leave event then. Workaround for LY-69788
+            auto toolBarAt = [](const QPoint& pos) -> QToolBar* {
+                QWidget* widget = qApp->widgetAt(pos);
+                while (widget != nullptr)
+                {
+                    if (QToolBar* tb = qobject_cast<QToolBar*>(widget))
+                    {
+                        return tb;
+                    }
+                    widget = widget->parentWidget();
+                }
+                return nullptr;
+            };
+            if (object == toolBarAt(QCursor::pos()))
+            {
+                QTimer* t = new QTimer(object);
+                t->start(100);
+                connect(t, &QTimer::timeout, object, [t, object, toolBarAt]() {
+                    if (object != toolBarAt(QCursor::pos()))
+                    {
+                        QEvent event(QEvent::Leave);
+                        qApp->sendEvent(object, &event);
+                        t->deleteLater();
+                    }
+                });
+                return true;
+            }
+            break;
+        }
+#endif
+        default:
+            break;
+        }
+        return QApplication::eventFilter(object, event);
+    }
+} // end namespace Editor
+
+#include <Core/moc_QtEditorApplication.cpp>
diff --git a/Code/Editor/Core/QtEditorApplication.h b/Code/Editor/Core/QtEditorApplication.h
new file mode 100644
index 0000000000..7baaae8e28
--- /dev/null
+++ b/Code/Editor/Core/QtEditorApplication.h
@@ -0,0 +1,138 @@
+/*
+ * 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 <QApplication>
+#include <QAbstractNativeEventFilter>
+#include <QColor>
+#include <QMap>
+#include <QTranslator>
+#include <QSet>
+#include "IEventLoopHook.h"
+#include <unordered_map>
+
+#include <AzCore/PlatformDef.h>
+#include <AzCore/UserSettings/UserSettingsProvider.h>
+#include <IEditor.h>
+#endif
+
+class QFileInfo;
+typedef QList<QFileInfo> QFileInfoList;
+class QByteArray;
+
+namespace AzQtComponents
+{
+    class O3DEStylesheet;
+}
+
+enum EEditorNotifyEvent;
+
+// This contains the main "QApplication"-derived class for the editor itself.
+// it performs the message hooking and other functions to allow CryEdit to function.
+
+namespace Editor
+{
+    typedef void(* ScanDirectoriesUpdateCallBack)(void);
+    /*!
+      \param directoryList A list of directories to search. ScanDirectories will also search the subdirectories of each of these.
+      \param filters A list of filename filters. Supports * and ? wildcards. The filters will not apply to the directory names.
+      \param files Any file that is found and matches any of the filters will be added to files.
+      \param updateCallback An optional callback function that will be called once for every directory and subdirectory that is scanned.
+    */
+    void ScanDirectories(QFileInfoList& directoryList, const QStringList& filters, QFileInfoList& files, ScanDirectoriesUpdateCallBack updateCallback = nullptr);
+
+    class EditorQtApplication
+        : public QApplication
+        , public QAbstractNativeEventFilter
+        , public IEditorNotifyListener
+        , public AZ::UserSettingsOwnerRequestBus::Handler
+    {
+        Q_OBJECT
+        Q_PROPERTY(QSet<int> pressedKeys READ pressedKeys)
+        Q_PROPERTY(int pressedMouseButtons READ pressedMouseButtons)
+    public:
+        // Call this before creating this object:
+        static void InstallQtLogHandler();
+
+        EditorQtApplication(int& argc, char** argv);
+        virtual ~EditorQtApplication();
+        void Initialize();
+
+        void LoadSettings();
+        void UnloadSettings();
+
+        // AZ::UserSettingsOwnerRequestBus::Handler
+        void SaveSettings() override;
+        ////
+
+        static EditorQtApplication* instance();
+
+        static bool IsActive();
+
+        bool isMovingOrResizing() const;
+
+        // QAbstractNativeEventFilter:
+        bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override;
+
+        // IEditorNotifyListener:
+        void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+
+        const QColor& GetColorByName(const QString& colorName);
+
+        void EnableOnIdle(bool enable = true);
+        bool OnIdleEnabled() const;
+
+        bool eventFilter(QObject* object, QEvent* event) override;
+
+        QSet<int> pressedKeys() const { return m_pressedKeys; }
+        int pressedMouseButtons() const { return m_pressedButtons; }
+
+    public Q_SLOTS:
+
+        void setIsMovingOrResizing(bool isMovingOrResizing);
+
+    signals:
+        void skinChanged();
+
+    private:
+        enum TimerResetFlag
+        {
+            PollState,
+            GameMode,
+            EditorMode
+        };
+        void ResetIdleTimerInterval(TimerResetFlag = PollState);
+        static QColor InterpolateColors(QColor a, QColor b, float factor);
+        void RefreshStyleSheet();
+        void InstallFilters();
+        void UninstallFilters();
+        void maybeProcessIdle();
+
+        AzQtComponents::O3DEStylesheet* m_stylesheet;
+
+        bool m_inWinEventFilter = false;
+
+        // Translators
+        void InstallEditorTranslators();
+        void UninstallEditorTranslators();
+        QTranslator* CreateAndInitializeTranslator(const QString& filename, const QString& directory);
+        void DeleteTranslator(QTranslator*& translator);
+
+        QTranslator* m_editorTranslator = nullptr;
+        QTranslator* m_assetBrowserTranslator = nullptr;
+        QTimer* const m_idleTimer = nullptr;
+        bool m_isMovingOrResizing = false;
+
+        AZ::UserSettingsProvider m_localUserSettings;
+
+        Qt::MouseButtons m_pressedButtons = Qt::NoButton;
+        QSet<int> m_pressedKeys;
+
+        bool m_activatedLocalUserSettings = false;
+    };
+} // namespace editor
diff --git a/Code/Editor/Core/QtEditorApplication_linux.cpp b/Code/Editor/Core/QtEditorApplication_linux.cpp
new file mode 100644
index 0000000000..844240bcb8
--- /dev/null
+++ b/Code/Editor/Core/QtEditorApplication_linux.cpp
@@ -0,0 +1,17 @@
+/*
+ * 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 "QtEditorApplication.h"
+
+namespace Editor
+{
+    bool EditorQtApplication::nativeEventFilter(const QByteArray& , void* , long* )
+    {
+        // TODO_KDAB_LINUX
+        return false;
+    }
+}
diff --git a/Code/Editor/Core/QtEditorApplication_mac.mm b/Code/Editor/Core/QtEditorApplication_mac.mm
new file mode 100644
index 0000000000..f9d1bc8b29
--- /dev/null
+++ b/Code/Editor/Core/QtEditorApplication_mac.mm
@@ -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
+ *
+ */
+#import <AppKit/NSEvent.h>
+
+#include "EditorDefs.h"
+#include "QtEditorApplication.h"
+
+// AzFramework
+#include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
+
+// Qt
+#include <QCursor>
+
+namespace Editor
+{
+    bool EditorQtApplication::nativeEventFilter(const QByteArray& eventType, void* message, long* result)
+    {
+        NSEvent* event = (NSEvent*)message;
+        if (GetIEditor()->IsInGameMode())
+        {
+            AzFramework::RawInputNotificationBusMac::Broadcast(&AzFramework::RawInputNotificationsMac::OnRawInputEvent, event);
+            return true;
+        }
+
+        if ([event type] == NSEventTypeMouseEntered)
+        {
+            // filter out mouse enter events when the widget the mouse entered into
+            // does not exist anymore. This happened occasionally on startup when hovering
+            // over the splash screen - LY-84100
+            if (widgetAt(QCursor::pos()) == nullptr)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+} // end namespace Editor
diff --git a/Code/Editor/Core/Tests/test_Archive.cpp b/Code/Editor/Core/Tests/test_Archive.cpp
new file mode 100644
index 0000000000..e5ac6c8e78
--- /dev/null
+++ b/Code/Editor/Core/Tests/test_Archive.cpp
@@ -0,0 +1,196 @@
+/*
+ * 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"
+
+// AzTest
+#include <AzTest/AzTest.h>
+
+// Qt
+#include <QBuffer>
+
+static QString CreateTestString(int size)
+{
+    QString testString;
+    testString.resize(size);
+
+    // generate a string with some kind of pattern, so that
+    // decoding is verified against something semi-realistic
+    QString pattern = "TestPattern";
+    for (int i = 0; i < size; i++)
+    {
+        testString[i] = pattern[i % pattern.length()];
+    }
+
+    return testString;
+}
+
+TEST(CArchive, 1ByteLengthString)
+{
+    QString outString = CreateTestString(20); // use a test size less than 2^8, so it takes only 1 byte for the length
+
+    QBuffer memBlock;
+    memBlock.open(QIODevice::ReadWrite);
+    CArchive writeArchive(&memBlock, CArchive::store);
+    writeArchive << outString;
+
+    QByteArray dataBuffer = memBlock.buffer();
+
+    // buffer size after write is the 1 byte for the string length followed by the string
+    EXPECT_EQ(memBlock.pos(), (1 + outString.length()));
+
+    const char* data = dataBuffer.constData();
+    EXPECT_EQ(data[0], outString.length());
+
+    for (int i = 0; i < outString.length(); i++)
+    {
+        EXPECT_EQ(data[1 + i], outString[i]);
+    }
+
+    // now confirm that we can read it back out
+    memBlock.reset();
+    CArchive readArchive(&memBlock, CArchive::load);
+    QString inString;
+    readArchive >> inString;
+
+    EXPECT_EQ(inString, outString);
+}
+
+TEST(CArchive, test2ByteLengthString)
+{
+    int testSize = 0xff + 1; // use a test size greater than 2^8, so it takes more than 1 byte for the length
+    QString outString = CreateTestString(testSize);
+
+    QBuffer memBlock;
+    memBlock.open(QIODevice::ReadWrite);
+    CArchive writeArchive(&memBlock, CArchive::store);
+    writeArchive << outString;
+
+    QByteArray dataBuffer = memBlock.buffer();
+
+    // buffer size after write is the 1 marker byte (0xff), 2 bytes for the string length followed by the string
+    EXPECT_EQ(memBlock.pos(), (1 + 2 + testSize));
+
+    const char* data = dataBuffer.constData();
+    EXPECT_EQ(data[0], '\xff');
+    short shortLength = 0;
+    memcpy(&shortLength, data + 1, 2);
+    EXPECT_EQ(shortLength, testSize);
+
+    for (int i = 0; i < testSize; i++)
+    {
+        EXPECT_EQ(data[3 + i], outString[i]);
+    }
+
+    // now confirm that we can read it back out
+    memBlock.reset();
+    CArchive readArchive(&memBlock, CArchive::load);
+    QString inString;
+    readArchive >> inString;
+
+    EXPECT_EQ(inString, outString);
+}
+
+TEST(CArchive, test4ByteLengthString)
+{
+    int testSize = 0xffff + 1; // use a test size greater than 2^16, so it takes more than 2 bytes for the length
+    QString outString = CreateTestString(testSize);
+
+    QBuffer memBlock;
+    memBlock.open(QIODevice::ReadWrite);
+    CArchive writeArchive(&memBlock, CArchive::store);
+    writeArchive << outString;
+
+    QByteArray dataBuffer = memBlock.buffer();
+
+    // buffer size after write is the 1 marker byte (0xff), the 2 byte marker (0xffff), 4 bytes for the string length followed by the string
+    EXPECT_EQ(memBlock.pos(), (1 + 2 + 4 + testSize));
+
+    const char* data = dataBuffer.constData();
+    EXPECT_EQ(data[0], '\xff');
+    EXPECT_EQ(data[1], '\xff');
+    EXPECT_EQ(data[2], '\xff');
+    uint32 doubleWordLength = 0;
+    memcpy(&doubleWordLength, data + 3, 4);
+    EXPECT_EQ(doubleWordLength, testSize);
+
+    for (int i = 0; i < testSize; i++)
+    {
+        EXPECT_EQ(data[7 + i], outString[i]);
+    }
+
+    // now confirm that we can read it back out
+    memBlock.reset();
+    CArchive readArchive(&memBlock, CArchive::load);
+    QString inString;
+    readArchive >> inString;
+
+    EXPECT_EQ(inString, outString);
+}
+
+TEST(CArchive, testWindowsWideCharacterString1ByteLength)
+{
+    // NOTE: CArchive only writes out Utf-8 now, so we can't actually
+    // use that class to encode to Windows wide character strings.
+    // That is why this test (unlike the non-Windows wide character tests)
+    // is manually creating a stream and only confirming that CArchive can decode it.
+
+    QString outString = CreateTestString(20); // use a test size smaller than 2^8, so that we only need one byte to store the length
+
+    // we have to write the 0xff marker, then the 2 byte marker to indicate it's wide characters, 
+    // then the actual length (1 byte), then the string, with windows wide characters (2 bytes per)
+    QByteArray testBuffer;
+    testBuffer.resize(1 + 2 + 1 + (outString.length() * 2));
+    testBuffer[0] = '\xff';
+    testBuffer[1] = '\xfe';
+    testBuffer[2] = '\xff';
+    testBuffer[3] = aznumeric_cast<char>(outString.length());
+
+    memcpy(testBuffer.data() + 4, outString.utf16(), outString.length() * 2);
+
+    // now confirm that we can read it back out
+    QBuffer memBlock(&testBuffer);
+    memBlock.open(QIODevice::ReadOnly);
+    CArchive readArchive(&memBlock, CArchive::load);
+    QString inString;
+    readArchive >> inString;
+
+    EXPECT_EQ(inString, outString);
+}
+
+TEST(CArchive, testWindowsWideCharacterString2ByteLength)
+{
+    // NOTE: CArchive only writes out Utf-8 now, so we can't actually
+    // use that class to encode to Windows wide character strings.
+    // That is why this test (unlike the non-Windows wide character tests)
+    // is manually creating a stream and only confirming that CArchive can decode it.
+
+    int testSize = 0xff + 1; // use a test size greater than 2^8, so that we need two bytes to store the length
+    QString outString = CreateTestString(testSize);
+
+    // we have to write the 0xff marker, then the 2 byte marker to indicate it's wide characters, 
+    // then the marker to indicate it's more than a 1 byte length, then the actual length (2 byte),
+    // then the string, with windows wide characters (2 bytes per)
+    QByteArray testBuffer;
+    testBuffer.resize(1 + 2 + 1 + 2 + (testSize * 2));
+    testBuffer[0] = '\xff';
+    testBuffer[1] = '\xfe';
+    testBuffer[2] = '\xff';
+    testBuffer[3] = '\xff';
+
+    memcpy(testBuffer.data() + 4, &testSize, 2);
+
+    memcpy(testBuffer.data() + 6, outString.utf16(), testSize * 2);
+
+    // now confirm that we can read it back out 
+    QBuffer memBlock(&testBuffer);
+    memBlock.open(QIODevice::ReadOnly);
+    CArchive readArchive(&memBlock, CArchive::load);
+    QString inString;
+    readArchive >> inString;
+
+    EXPECT_EQ(inString, outString);
+}
diff --git a/Code/Editor/Core/Tests/test_Main.cpp b/Code/Editor/Core/Tests/test_Main.cpp
new file mode 100644
index 0000000000..d62fc1e18c
--- /dev/null
+++ b/Code/Editor/Core/Tests/test_Main.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 "EditorDefs.h"
+
+// AzTest
+#include <AzTest/AzTest.h>
+
+// AzCore
+#include <AzCore/Memory/AllocatorScope.h>
+
+// AzFramework
+#include <AzFramework/IO/LocalFileIO.h>
+
+#include <Mocks/ICryPakMock.h>
+
+using ::testing::NiceMock;
+
+class EditorCoreTestEnvironment
+    : public AZ::Test::ITestEnvironment
+{
+public:
+    AZ_TEST_CLASS_ALLOCATOR(EditorCoreTestEnvironment);
+
+    virtual ~EditorCoreTestEnvironment()
+    {
+    }
+
+protected:
+    void SetupEnvironment() override
+    {
+        m_allocatorScope.ActivateAllocators();
+        m_cryPak = new NiceMock<CryPakMock>();
+
+        // Initialize the fileIO
+        AZ::IO::FileIOBase::SetInstance(&m_fileIO);
+
+        // Setup gEnv with the systems/mocks we will be using for the unit tests
+        m_stubEnv.pCryPak = m_cryPak;
+        m_stubEnv.pFileIO = &m_fileIO;
+        gEnv = &m_stubEnv;
+    }
+
+    void TeardownEnvironment() override
+    {
+        delete m_cryPak;
+        m_allocatorScope.DeactivateAllocators();
+    }
+
+private:
+    AZ::AllocatorScope<AZ::OSAllocator, AZ::SystemAllocator, AZ::LegacyAllocator, CryStringAllocator> m_allocatorScope;
+    SSystemGlobalEnvironment m_stubEnv;
+    AZ::IO::LocalFileIO m_fileIO;
+    NiceMock<CryPakMock>* m_cryPak;
+};
+
+AZ_UNIT_TEST_HOOK(new EditorCoreTestEnvironment);
diff --git a/Code/Editor/Core/Tests/test_PathUtil.cpp b/Code/Editor/Core/Tests/test_PathUtil.cpp
new file mode 100644
index 0000000000..50cfb70ddb
--- /dev/null
+++ b/Code/Editor/Core/Tests/test_PathUtil.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include "Util/PathUtil.h"
+#include <CrySystemBus.h>
+
+TEST(PathUtil, GamePathToFullPath_DoesNotBufferOverflow)
+{
+    // There are no test assertions in this test because the purpose is just to verify that the test runs without crashing
+    QString pngExtension(".png");
+
+    // Create a string of lenth AZ_MAX_PATH_LEN that ends in .png
+    QString longStringMaxPath(AZ_MAX_PATH_LEN, 'x');
+    longStringMaxPath.replace(longStringMaxPath.length() - pngExtension.length(), longStringMaxPath.length(), pngExtension);
+    Path::GamePathToFullPath(longStringMaxPath);
+
+    QString longStringMaxPathPlusOne(AZ_MAX_PATH_LEN + 1, 'x');
+    longStringMaxPathPlusOne.replace(longStringMaxPathPlusOne.length() - pngExtension.length(), longStringMaxPathPlusOne.length(), pngExtension);
+    Path::GamePathToFullPath(longStringMaxPathPlusOne);
+}
diff --git a/Code/Editor/CrtDebug.cpp b/Code/Editor/CrtDebug.cpp
new file mode 100644
index 0000000000..df9b8cd1a1
--- /dev/null
+++ b/Code/Editor/CrtDebug.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 "EditorDefs.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+
+//#ifdef _CRTDBG_MAP_ALLOC
+#ifdef CRTDBG_MAP_ALLOC
+#pragma pack (push,1)
+#define nNoMansLandSize 4
+typedef struct MyCrtMemBlockHeader
+{
+    struct MyCrtMemBlockHeader* pBlockHeaderNext;
+    struct MyCrtMemBlockHeader* pBlockHeaderPrev;
+    char*                      szFileName;
+    int                         nLine;
+    size_t                      nDataSize;
+    int                         nBlockUse;
+    long                        lRequest;
+    unsigned char               gap[nNoMansLandSize];
+    /* followed by:
+    *  unsigned char           data[nDataSize];
+    *  unsigned char           anotherGap[nNoMansLandSize];
+    */
+} MyCrtMemBlockHeader;
+#pragma pack (pop)
+
+#define pbData(pblock) ((unsigned char*)((MyCrtMemBlockHeader*)pblock + 1))
+#define pHdr(pbData) (((MyCrtMemBlockHeader*)pbData) - 1)
+
+
+void crtdebug(const char* s, ...)
+{
+    char str[32768];
+    va_list arg_ptr;
+    va_start(arg_ptr, s);
+    vsprintf(str, s, arg_ptr);
+    va_end(arg_ptr);
+
+    FILE* l = nullptr;
+    azfopen(&l, "crtdump.txt", "a+t");
+    if (l)
+    {
+        fprintf(l, "%s", str);
+        fclose(l);
+    }
+}
+
+int crtAllocHook(int nAllocType, void* pvData,
+    size_t nSize, int nBlockUse, long lRequest,
+    const unsigned char* szFileName, int nLine)
+{
+    if (nBlockUse == _CRT_BLOCK)
+    {
+        return(TRUE);
+    }
+
+    static int total_cnt = 0;
+    static int total_mem = 0;
+    if (nAllocType == _HOOK_ALLOC)
+    {
+        //total_mem += nSize;
+        //total_cnt++;
+        //_CrtMemState mem_state;
+        //_CrtMemCheckpoint( &mem_state );
+        //total_cnt = mem_state.lCounts[_NORMAL_BLOCK];
+        //total_mem = mem_state.lTotalCount;
+        if ((total_cnt & 0xF) == 0)
+        {
+            //_CrtCheckMemory();
+        }
+
+        total_cnt++;
+        total_mem += nSize;
+
+        //crtdebug( "<CRT> Alloc %d,size=%d,in: %s %d (total size=%d,num=%d)\n",lRequest,nSize,szFileName,nLine,total_mem,total_cnt );
+        crtdebug("Size=%d,  [Total=%d,N=%d] [%s:%d]\n", nSize, total_mem, total_cnt, szFileName, nLine);
+    }
+    else if (nAllocType == _HOOK_FREE)
+    {
+        MyCrtMemBlockHeader* pHead;
+        pHead = pHdr(pvData);
+
+        total_cnt--;
+        total_mem -= pHead->nDataSize;
+
+        crtdebug("Size=%d,  [Total=%d,N=%d] [%s:%d]\n", pHead->nDataSize, total_mem, total_cnt, pHead->szFileName, pHead->nLine);
+        //crtdebug( "<CRT> Free size=%d,in: %s %d (total size=%d,num=%d)\n",pHead->nDataSize,pHead->szFileName,pHead->nLine,total_mem,total_cnt );
+        //total_mem -= nSize;
+        //total_cnt--;
+    }
+    return TRUE;
+}
+
+int crtReportHook(int nRptType, char* szMsg, int* retVal)
+{
+    static int gl_num_asserts = 0;
+    if (gl_num_asserts != 0)
+    {
+        return TRUE;
+    }
+    gl_num_asserts++;
+    switch (nRptType)
+    {
+    case _CRT_WARN:
+        crtdebug("<CRT WARNING> %s\n", szMsg);
+        break;
+    case _CRT_ERROR:
+        crtdebug("<CRT ERROR> %s\n", szMsg);
+        break;
+    case _CRT_ASSERT:
+        crtdebug("<CRT ASSERT> %s\n", szMsg);
+        break;
+    }
+    gl_num_asserts--;
+    return TRUE;
+}
+
+void InitCrt()
+{
+    FILE* l = nullptr;
+    azfopen(&l, "crtdump.txt", "w");
+    if (l)
+    {
+        fclose(l);
+    }
+
+    //_CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_DEBUG );
+    //_CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_DEBUG );
+    //_CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_DEBUG );
+
+    _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_WNDW);
+    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW);
+    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_WNDW);
+
+    //_CrtSetDbgFlag( _CRTDBG_CHECK_ALWAYS_DF|_CRTDBG_CHECK_CRT_DF|_CRTDBG_LEAK_CHECK_DF|_CRTDBG_DELAY_FREE_MEM_DF | _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) );
+    //_CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF|_CRTDBG_LEAK_CHECK_DF/*|_CRTDBG_DELAY_FREE_MEM_DF*/ | _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) );
+    int flags = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+    flags &= ~_CRTDBG_DELAY_FREE_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_CRT_DF;
+
+    _CrtSetDbgFlag(flags);
+
+    _CrtSetAllocHook (crtAllocHook);
+    _CrtSetReportHook(crtReportHook);
+}
+
+void DoneCrt()
+{
+    //_CrtCheckMemory();
+    //_CrtDumpMemoryLeaks();
+}
+
+// Autoinit CRT.
+//struct __autoinit_crt { __autoinit_crt() { InitCrt(); }; ~__autoinit_crt() { DoneCrt(); } } __autoinit_crt_var;
+#endif
+
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp
new file mode 100644
index 0000000000..d05b2fc2ce
--- /dev/null
+++ b/Code/Editor/CryEdit.cpp
@@ -0,0 +1,4331 @@
+/*
+ * 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"
+
+#ifdef WIN32
+AZ_PUSH_DISABLE_WARNING(4458, "-Wunknown-warning-option")
+#include <gdiplus.h>
+AZ_POP_DISABLE_WARNING
+#pragma comment (lib, "Gdiplus.lib")
+
+#include <WinUser.h> // needed for MessageBoxW in the assert handler
+#endif
+
+#include <array>
+#include <string>
+
+#include "CryEdit.h"
+
+// Qt
+#include <QCommandLineParser>
+#include <QSharedMemory>
+#include <QSystemSemaphore>
+#include <QDesktopServices>
+#include <QElapsedTimer>
+#include <QProcess>
+#include <QScopedValueRollback>
+#include <QClipboard>
+#include <QMenuBar>
+
+// Aws Native SDK
+#include <aws/sts/STSClient.h>
+#include <aws/core/auth/AWSCredentialsProvider.h>
+#include <aws/sts/model/GetFederationTokenRequest.h>
+#include <aws/core/http/HttpClient.h>
+#include <aws/core/http/HttpResponse.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+// AzCore
+#include <AzCore/Casting/numeric_cast.h>
+#include <AzCore/Module/Environment.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/Utils/Utils.h>
+#include <AzCore/Console/IConsole.h>
+
+// AzFramework
+#include <AzFramework/Components/CameraBus.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
+#include <AzFramework/ProjectManager/ProjectManager.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/Component/EditorComponentAPIBus.h>
+#include <AzToolsFramework/Component/EditorLevelComponentAPIBus.h>
+#include <AzToolsFramework/UI/UICore/ProgressShield.hxx>
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <AzToolsFramework/Slice/SliceUtilities.h>
+#include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
+#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
+#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
+#include <AzToolsFramework/PythonTerminal/ScriptHelpDialog.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/StyleManager.h>
+#include <AzQtComponents/Utilities/HandleDpiAwareness.h>
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+#include <AzQtComponents/Utilities/QtPluginPaths.h>
+
+// CryCommon
+#include <CryCommon/ITimer.h>
+#include <CryCommon/IPhysics.h>
+#include <CryCommon/ILevelSystem.h>
+
+// Editor
+#include "Settings.h"
+
+#include "GameExporter.h"
+#include "GameResourcesExporter.h"
+
+#include "ActionManager.h"
+#include "MainWindow.h"
+
+#include "Core/QtEditorApplication.h"
+#include "StringDlg.h"
+#include "NewLevelDialog.h"
+#include "LayoutConfigDialog.h"
+#include "ViewManager.h"
+#include "FileTypeUtils.h"
+#include "PluginManager.h"
+
+#include "IEditorImpl.h"
+#include "StartupLogoDialog.h"
+#include "DisplaySettings.h"
+#include "GameEngine.h"
+
+#include "StartupTraceHandler.h"
+#include "ToolsConfigPage.h"
+#include "Objects/SelectionGroup.h"
+#include "Include/IObjectManager.h"
+#include "WaitProgress.h"
+
+#include "ToolBox.h"
+#include "LevelInfo.h"
+#include "EditorPreferencesDialog.h"
+#include "GraphicsSettingsDialog.h"
+#include "AnimationContext.h"
+
+#include "GotoPositionDlg.h"
+
+#include "ConsoleDialog.h"
+#include "Controls/ConsoleSCB.h"
+
+#include "ScopedVariableSetter.h"
+
+#include "Util/3DConnexionDriver.h"
+
+#include "DimensionsDialog.h"
+
+#include "Util/AutoDirectoryRestoreFileDialog.h"
+#include "Util/EditorAutoLevelLoadTest.h"
+#include "Util/IndexedFiles.h"
+#include "AboutDialog.h"
+#include <AzToolsFramework/PythonTerminal/ScriptHelpDialog.h>
+
+#include "QuickAccessBar.h"
+
+#include "Export/ExportManager.h"
+
+#include "LevelFileDialog.h"
+#include "LevelIndependentFileMan.h"
+#include "WelcomeScreen/WelcomeScreenDialog.h"
+
+#include "Controls/ReflectedPropertyControl/PropertyCtrl.h"
+#include "Controls/ReflectedPropertyControl/ReflectedVar.h"
+
+#include "EditorToolsApplication.h"
+
+#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
+
+// AWSNativeSDK
+#include <AzToolsFramework/Undo/UndoSystem.h>
+#include <AWSNativeSDKInit/AWSNativeSDKInit.h>
+
+
+#if defined(AZ_PLATFORM_WINDOWS)
+#include <AzFramework/API/ApplicationAPI_Platform.h>
+#endif
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+#include "WindowObserver_mac.h"
+#endif
+
+#include <AzCore/RTTI/BehaviorContext.h>
+
+#include <AzFramework/Render/Intersector.h>
+
+#include <AzCore/std/smart_ptr/make_shared.h>
+
+static const char O3DEEditorClassName[] = "O3DEEditorClass";
+static const char O3DEApplicationName[] = "O3DEApplication";
+
+static AZ::EnvironmentVariable<bool> inEditorBatchMode = nullptr;
+
+RecentFileList::RecentFileList()
+{
+    m_settings.beginGroup(QStringLiteral("Application"));
+    m_settings.beginGroup(QStringLiteral("Recent File List"));
+
+    ReadList();
+}
+
+void RecentFileList::Remove(int index)
+{
+    m_arrNames.removeAt(index);
+}
+
+void RecentFileList::Add(const QString& f)
+{
+    QString filename = QDir::toNativeSeparators(f);
+    m_arrNames.removeAll(filename);
+    m_arrNames.push_front(filename);
+    while (m_arrNames.count() > Max)
+    {
+        m_arrNames.removeAt(Max);
+    }
+}
+
+int RecentFileList::GetSize()
+{
+    return m_arrNames.count();
+}
+
+void RecentFileList::GetDisplayName(QString& name, int index, const QString& curDir)
+{
+    name = m_arrNames[index];
+
+    const QDir cur(curDir);
+    QDir fileDir(name); // actually pointing at file, first cdUp() gets us the parent dir
+    while (fileDir.cdUp())
+    {
+        if (fileDir == cur)
+        {
+            name = cur.relativeFilePath(name);
+            break;
+        }
+    }
+
+    name = QDir::toNativeSeparators(name);
+}
+
+QString& RecentFileList::operator[](int index)
+{
+    return m_arrNames[index];
+}
+
+void RecentFileList::ReadList()
+{
+    m_arrNames.clear();
+
+    for (int i = 1; i <= Max; ++i)
+    {
+        QString f = m_settings.value(QStringLiteral("File%1").arg(i)).toString();
+        if (!f.isEmpty())
+        {
+            m_arrNames.push_back(f);
+        }
+    }
+}
+
+void RecentFileList::WriteList()
+{
+    m_settings.remove(QString());
+
+    int i = 1;
+    for (auto f : m_arrNames)
+    {
+        m_settings.setValue(QStringLiteral("File%1").arg(i++), f);
+    }
+}
+
+
+
+#define ERROR_LEN 256
+
+
+CCryDocManager::CCryDocManager()
+{
+}
+
+CCrySingleDocTemplate* CCryDocManager::SetDefaultTemplate(CCrySingleDocTemplate* pNew)
+{
+    CCrySingleDocTemplate* pOld = m_pDefTemplate;
+    m_pDefTemplate = pNew;
+    m_templateList.clear();
+    m_templateList.push_back(m_pDefTemplate);
+    return pOld;
+}
+// Copied from MFC to get rid of the silly ugly unoverridable doc-type pick dialog
+void CCryDocManager::OnFileNew()
+{
+    assert(m_pDefTemplate != NULL);
+
+    m_pDefTemplate->OpenDocumentFile(NULL);
+    // if returns NULL, the user has already been alerted
+}
+BOOL CCryDocManager::DoPromptFileName(QString& fileName, [[maybe_unused]] UINT nIDSTitle,
+    [[maybe_unused]] DWORD lFlags, BOOL bOpenFileDialog, [[maybe_unused]] CDocTemplate* pTemplate)
+{
+    CLevelFileDialog levelFileDialog(bOpenFileDialog);
+    levelFileDialog.show();
+    levelFileDialog.adjustSize();
+
+    if (levelFileDialog.exec() == QDialog::Accepted)
+    {
+        fileName = levelFileDialog.GetFileName();
+        return true;
+    }
+
+    return false;
+}
+CCryEditDoc* CCryDocManager::OpenDocumentFile(LPCTSTR lpszFileName, BOOL bAddToMRU)
+{
+    assert(lpszFileName != NULL);
+
+    // find the highest confidence
+    auto pos = m_templateList.begin();
+    CCrySingleDocTemplate::Confidence bestMatch = CCrySingleDocTemplate::noAttempt;
+    CCrySingleDocTemplate* pBestTemplate = NULL;
+    CCryEditDoc* pOpenDocument = NULL;
+
+    if (lpszFileName[0] == '\"')
+    {
+        ++lpszFileName;
+    }
+    QString szPath = QString::fromUtf8(lpszFileName);
+    if (szPath.endsWith('"'))
+    {
+        szPath.remove(szPath.length() - 1, 1);
+    }
+
+    while (pos != m_templateList.end())
+    {
+        auto pTemplate = *(pos++);
+
+        CCrySingleDocTemplate::Confidence match;
+        assert(pOpenDocument == NULL);
+        match = pTemplate->MatchDocType(szPath.toUtf8().data(), pOpenDocument);
+        if (match > bestMatch)
+        {
+            bestMatch = match;
+            pBestTemplate = pTemplate;
+        }
+        if (match == CCrySingleDocTemplate::yesAlreadyOpen)
+        {
+            break;      // stop here
+        }
+    }
+
+    if (pOpenDocument != NULL)
+    {
+        return pOpenDocument;
+    }
+
+    if (pBestTemplate == NULL)
+    {
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Failed to open document."));
+        return NULL;
+    }
+
+    return pBestTemplate->OpenDocumentFile(szPath.toUtf8().data(), bAddToMRU, FALSE);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// CCryEditApp
+
+#undef ON_COMMAND
+#define ON_COMMAND(id, method) \
+    MainWindow::instance()->GetActionManager()->RegisterActionHandler(id, this, &CCryEditApp::method);
+
+#undef ON_COMMAND_RANGE
+#define ON_COMMAND_RANGE(idStart, idEnd, method) \
+    for (int i = idStart; i <= idEnd; ++i) \
+        ON_COMMAND(i, method);
+
+AZ_CVAR_EXTERNED(bool, ed_previewGameInFullscreen_once);
+
+void CCryEditApp::RegisterActionHandlers()
+{
+    ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
+    ON_COMMAND(ID_APP_SHOW_WELCOME, OnAppShowWelcomeScreen)
+    ON_COMMAND(ID_DOCUMENTATION_TUTORIALS, OnDocumentationTutorials)
+    ON_COMMAND(ID_DOCUMENTATION_O3DE, OnDocumentationO3DE)
+    ON_COMMAND(ID_DOCUMENTATION_GAMELIFT, OnDocumentationGamelift)
+    ON_COMMAND(ID_DOCUMENTATION_RELEASENOTES, OnDocumentationReleaseNotes)
+    ON_COMMAND(ID_DOCUMENTATION_GAMEDEVBLOG, OnDocumentationGameDevBlog)
+    ON_COMMAND(ID_DOCUMENTATION_FORUMS, OnDocumentationForums)
+    ON_COMMAND(ID_DOCUMENTATION_AWSSUPPORT, OnDocumentationAWSSupport)
+    ON_COMMAND(ID_FILE_EXPORT_SELECTEDOBJECTS, OnExportSelectedObjects)
+    ON_COMMAND(ID_EDIT_HOLD, OnEditHold)
+    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_MOVE_OBJECT, OnMoveObject)
+    ON_COMMAND(ID_RENAME_OBJ, OnRenameObj)
+    ON_COMMAND(ID_EDITMODE_MOVE, OnEditmodeMove)
+    ON_COMMAND(ID_EDITMODE_ROTATE, OnEditmodeRotate)
+    ON_COMMAND(ID_EDITMODE_SCALE, OnEditmodeScale)
+    ON_COMMAND(ID_UNDO, OnUndo)
+    ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnUndo)     // Can't use the same ID, because for the menu we can't have a QWidgetAction, while for the toolbar we want one
+    ON_COMMAND(ID_IMPORT_ASSET, OnOpenAssetImporter)
+    ON_COMMAND(ID_EDIT_LEVELDATA, OnEditLevelData)
+    ON_COMMAND(ID_FILE_EDITLOGFILE, OnFileEditLogFile)
+    ON_COMMAND(ID_FILE_RESAVESLICES, OnFileResaveSlices)
+    ON_COMMAND(ID_FILE_EDITEDITORINI, OnFileEditEditorini)
+    ON_COMMAND(ID_PREFERENCES, OnPreferences)
+    ON_COMMAND(ID_REDO, OnRedo)
+    ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnRedo)
+    ON_COMMAND(ID_FILE_OPEN_LEVEL, OnOpenLevel)
+#ifdef ENABLE_SLICE_EDITOR
+    ON_COMMAND(ID_FILE_NEW_SLICE, OnCreateSlice)
+    ON_COMMAND(ID_FILE_OPEN_SLICE, OnOpenSlice)
+#endif
+    ON_COMMAND(ID_SWITCH_PHYSICS, OnSwitchPhysics)
+    ON_COMMAND(ID_GAME_SYNCPLAYER, OnSyncPlayer)
+    ON_COMMAND(ID_RESOURCES_REDUCEWORKINGSET, OnResourcesReduceworkingset)
+
+    ON_COMMAND(ID_VIEW_CONFIGURELAYOUT, OnViewConfigureLayout)
+
+    ON_COMMAND(IDC_SELECTION, OnDummyCommand)
+    //////////////////////////////////////////////////////////////////////////
+    ON_COMMAND(ID_TAG_LOC1, OnTagLocation1)
+    ON_COMMAND(ID_TAG_LOC2, OnTagLocation2)
+    ON_COMMAND(ID_TAG_LOC3, OnTagLocation3)
+    ON_COMMAND(ID_TAG_LOC4, OnTagLocation4)
+    ON_COMMAND(ID_TAG_LOC5, OnTagLocation5)
+    ON_COMMAND(ID_TAG_LOC6, OnTagLocation6)
+    ON_COMMAND(ID_TAG_LOC7, OnTagLocation7)
+    ON_COMMAND(ID_TAG_LOC8, OnTagLocation8)
+    ON_COMMAND(ID_TAG_LOC9, OnTagLocation9)
+    ON_COMMAND(ID_TAG_LOC10, OnTagLocation10)
+    ON_COMMAND(ID_TAG_LOC11, OnTagLocation11)
+    ON_COMMAND(ID_TAG_LOC12, OnTagLocation12)
+    //////////////////////////////////////////////////////////////////////////
+    ON_COMMAND(ID_GOTO_LOC1, OnGotoLocation1)
+    ON_COMMAND(ID_GOTO_LOC2, OnGotoLocation2)
+    ON_COMMAND(ID_GOTO_LOC3, OnGotoLocation3)
+    ON_COMMAND(ID_GOTO_LOC4, OnGotoLocation4)
+    ON_COMMAND(ID_GOTO_LOC5, OnGotoLocation5)
+    ON_COMMAND(ID_GOTO_LOC6, OnGotoLocation6)
+    ON_COMMAND(ID_GOTO_LOC7, OnGotoLocation7)
+    ON_COMMAND(ID_GOTO_LOC8, OnGotoLocation8)
+    ON_COMMAND(ID_GOTO_LOC9, OnGotoLocation9)
+    ON_COMMAND(ID_GOTO_LOC10, OnGotoLocation10)
+    ON_COMMAND(ID_GOTO_LOC11, OnGotoLocation11)
+    ON_COMMAND(ID_GOTO_LOC12, OnGotoLocation12)
+    //////////////////////////////////////////////////////////////////////////
+
+    ON_COMMAND(ID_TOOLS_LOGMEMORYUSAGE, OnToolsLogMemoryUsage)
+    ON_COMMAND(ID_TOOLS_CUSTOMIZEKEYBOARD, OnCustomizeKeyboard)
+    ON_COMMAND(ID_TOOLS_CONFIGURETOOLS, OnToolsConfiguretools)
+    ON_COMMAND(ID_TOOLS_SCRIPTHELP, OnToolsScriptHelp)
+#ifdef FEATURE_ORTHOGRAPHIC_VIEW
+    ON_COMMAND(ID_VIEW_CYCLE2DVIEWPORT, OnViewCycle2dviewport)
+#endif
+    ON_COMMAND(ID_DISPLAY_GOTOPOSITION, OnDisplayGotoPosition)
+    ON_COMMAND(ID_FILE_SAVELEVELRESOURCES, OnFileSavelevelresources)
+    ON_COMMAND(ID_CLEAR_REGISTRY, OnClearRegistryData)
+    ON_COMMAND(ID_VALIDATELEVEL, OnValidatelevel)
+    ON_COMMAND(ID_TOOLS_PREFERENCES, OnToolsPreferences)
+    ON_COMMAND(ID_GRAPHICS_SETTINGS, OnGraphicsSettings)
+    ON_COMMAND(ID_SWITCHCAMERA_DEFAULTCAMERA, OnSwitchToDefaultCamera)
+    ON_COMMAND(ID_SWITCHCAMERA_SEQUENCECAMERA, OnSwitchToSequenceCamera)
+    ON_COMMAND(ID_SWITCHCAMERA_SELECTEDCAMERA, OnSwitchToSelectedcamera)
+    ON_COMMAND(ID_SWITCHCAMERA_NEXT, OnSwitchcameraNext)
+    ON_COMMAND(ID_OPEN_SUBSTANCE_EDITOR, OnOpenProceduralMaterialEditor)
+    ON_COMMAND(ID_OPEN_ASSET_BROWSER, OnOpenAssetBrowserView)
+    ON_COMMAND(ID_OPEN_AUDIO_CONTROLS_BROWSER, OnOpenAudioControlsEditor)
+
+    ON_COMMAND(ID_DISPLAY_SHOWHELPERS, OnShowHelpers)
+    ON_COMMAND(ID_OPEN_TRACKVIEW, OnOpenTrackView)
+    ON_COMMAND(ID_OPEN_UICANVASEDITOR, OnOpenUICanvasEditor)
+
+    ON_COMMAND_RANGE(ID_GAME_PC_ENABLELOWSPEC, ID_GAME_PC_ENABLEVERYHIGHSPEC, OnChangeGameSpec)
+
+    ON_COMMAND_RANGE(ID_GAME_OSXMETAL_ENABLELOWSPEC, ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC, OnChangeGameSpec)
+
+    ON_COMMAND_RANGE(ID_GAME_ANDROID_ENABLELOWSPEC, ID_GAME_ANDROID_ENABLEVERYHIGHSPEC, OnChangeGameSpec)
+
+    ON_COMMAND_RANGE(ID_GAME_IOS_ENABLELOWSPEC, ID_GAME_IOS_ENABLEVERYHIGHSPEC, OnChangeGameSpec)
+
+#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)\
+    ON_COMMAND_RANGE(ID_GAME_##CODENAME##_ENABLELOWSPEC, ID_GAME_##CODENAME##_ENABLEHIGHSPEC, OnChangeGameSpec)
+    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
+#undef AZ_RESTRICTED_PLATFORM_EXPANSION
+#endif
+
+    ON_COMMAND(ID_OPEN_QUICK_ACCESS_BAR, OnOpenQuickAccessBar)
+
+    ON_COMMAND(ID_FILE_SAVE_LEVEL, OnFileSave)
+    ON_COMMAND(ID_FILE_EXPORTOCCLUSIONMESH, OnFileExportOcclusionMesh)
+
+    // Project Manager 
+    ON_COMMAND(ID_FILE_PROJECT_MANAGER_SETTINGS, OnOpenProjectManagerSettings)
+    ON_COMMAND(ID_FILE_PROJECT_MANAGER_NEW, OnOpenProjectManagerNew)
+    ON_COMMAND(ID_FILE_PROJECT_MANAGER_OPEN, OnOpenProjectManager)
+}
+
+CCryEditApp* CCryEditApp::s_currentInstance = nullptr;
+/////////////////////////////////////////////////////////////////////////////
+// CCryEditApp construction
+CCryEditApp::CCryEditApp()
+{
+    s_currentInstance = this;
+
+    m_sPreviewFile[0] = 0;
+
+    // Place all significant initialization in InitInstance
+    ZeroStruct(m_tagLocations);
+    ZeroStruct(m_tagAngles);
+
+    AzFramework::AssetSystemInfoBus::Handler::BusConnect();
+
+    m_disableIdleProcessingCounter = 0;
+    EditorIdleProcessingBus::Handler::BusConnect();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CCryEditApp::~CCryEditApp()
+{
+    EditorIdleProcessingBus::Handler::BusDisconnect();
+    AzFramework::AssetSystemInfoBus::Handler::BusDisconnect();
+    s_currentInstance = nullptr;
+}
+
+CCryEditApp* CCryEditApp::instance()
+{
+    return s_currentInstance;
+}
+
+class CEditCommandLineInfo
+{
+public:
+    bool m_bTest = false;
+    bool m_bAutoLoadLevel = false;
+    bool m_bExport = false;
+    bool m_bExportTexture = false;
+
+    bool m_bMatEditMode = false;
+
+    bool m_bConsoleMode = false;
+    bool m_bNullRenderer = false;
+    bool m_bDeveloperMode = false;
+    bool m_bRunPythonScript = false;
+    bool m_bRunPythonTestScript = false;
+    bool m_bShowVersionInfo = false;
+    QString m_exportFile;
+    QString m_strFileName;
+    QString m_appRoot;
+    QString m_logFile;
+    QString m_pythonArgs;
+    QString m_pythontTestCase;
+    QString m_execFile;
+    QString m_execLineCmd;
+
+    bool m_bSkipWelcomeScreenDialog = false;
+    bool m_bAutotestMode = false;
+
+    struct CommandLineStringOption
+    {
+        QString name;
+        QString description;
+        QString valueName;
+    };
+
+    CEditCommandLineInfo()
+    {
+        bool dummy;
+        QCommandLineParser parser;
+        parser.addHelpOption();
+        parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+        parser.setApplicationDescription(QObject::tr("O3DE Editor"));
+        // nsDocumentRevisionDebugMode is an argument that the macOS system passed into an App bundle that is being debugged.
+        // Need to include it here so that Qt argument parser does not error out.
+        bool nsDocumentRevisionsDebugMode = false;
+        const std::vector<std::pair<QString, bool&> > options = {
+            { "export", m_bExport },
+            { "exportTexture", m_bExportTexture },
+            { "test", m_bTest },
+            { "auto_level_load", m_bAutoLoadLevel },
+            { "MatEdit", m_bMatEditMode },
+            { "BatchMode", m_bConsoleMode },
+            { "NullRenderer", m_bNullRenderer },
+            { "devmode", m_bDeveloperMode },
+            { "VTUNE", dummy },
+            { "runpython", m_bRunPythonScript },
+            { "runpythontest", m_bRunPythonTestScript },
+            { "version", m_bShowVersionInfo },
+            { "NSDocumentRevisionsDebugMode", nsDocumentRevisionsDebugMode},
+            { "skipWelcomeScreenDialog", m_bSkipWelcomeScreenDialog},
+            { "autotest_mode", m_bAutotestMode},
+            { "regdumpall", dummy }
+        };
+
+        QString dummyString;
+        const std::vector<std::pair<CommandLineStringOption, QString&> > stringOptions = {
+            {{"logfile", "File name of the log file to write out to.", "logfile"}, m_logFile},
+            {{"runpythonargs", "Command-line argument string to pass to the python script if --runpython or --runpythontest was used.", "runpythonargs"}, m_pythonArgs},
+            {{"pythontestcase", "Test case name of python test script if --runpythontest was used.", "pythontestcase"}, m_pythontTestCase},
+            {{"exec", "cfg file to run on startup, used for systems like automation", "exec"}, m_execFile},
+            {{"rhi", "Command-line argument to force which rhi to use", "dummyString"}, dummyString },
+            {{"rhi-device-validation", "Command-line argument to configure rhi validation", "dummyString"}, dummyString },
+            {{"exec_line", "command to run on startup, used for systems like automation", "exec_line"}, m_execLineCmd},
+            {{"regset", "Command-line argument to override settings registry values", "regset"}, dummyString},
+            {{"regremove", "Deletes a value within the global settings registry at the JSON pointer path @key", "regremove"}, dummyString},
+            {{"regdump", "Sets a value within the global settings registry at the JSON pointer path @key with value of @value", "regdump"}, dummyString},
+            {{"project-path", "Supplies the path to the project that the Editor should use", "project-path"}, dummyString},
+            {{"engine-path", "Supplies the path to the engine", "engine-path"}, dummyString},
+            {{"project-cache-path", "Path to the project cache", "project-cache-path"}, dummyString},
+            // add dummy entries here to prevent QCommandLineParser error-ing out on cmd line args that will be parsed later
+        };
+
+
+        parser.addPositionalArgument("file", QCoreApplication::translate("main", "file to open"));
+        for (const auto& option : options)
+        {
+            parser.addOption(QCommandLineOption(option.first));
+        }
+
+        for (const auto& option : stringOptions)
+        {
+            parser.addOption(QCommandLineOption(option.first.name, option.first.description, option.first.valueName));
+        }
+
+        QStringList args = qApp->arguments();
+
+#ifdef Q_OS_WIN32
+        for (QString& arg : args)
+        {
+            if (!arg.isEmpty() && arg[0] == '/')
+            {
+                arg[0] = '-'; // QCommandLineParser only supports - and -- prefixes
+            }
+        }
+#endif
+
+        if (!parser.parse(args))
+        {
+            AZ_TracePrintf("QT CommandLine Parser", "QT command line parsing warned with message %s."
+                " Has the QCommandLineParser had these options added to it", parser.errorText().toUtf8().constData());
+        }
+
+        // Get boolean options
+        const int numOptions = options.size();
+        for (int i = 0; i < numOptions; ++i)
+        {
+            options[i].second = parser.isSet(options[i].first);
+        }
+
+        // Get string options
+        for (auto& option : stringOptions)
+        {
+            option.second = parser.value(option.first.valueName);
+        }
+
+        m_bExport = m_bExport || m_bExportTexture;
+
+        const QStringList positionalArgs = parser.positionalArguments();
+
+        if (!positionalArgs.isEmpty())
+        {
+            m_strFileName = positionalArgs.first();
+
+            if (positionalArgs.first().at(0) != '[')
+            {
+                m_exportFile = positionalArgs.first();
+            }
+        }
+    }
+};
+
+struct SharedData
+{
+    bool raise = false;
+    char text[_MAX_PATH];
+};
+/////////////////////////////////////////////////////////////////////////////
+// CTheApp::FirstInstance
+//      FirstInstance checks for an existing instance of the application.
+//      If one is found, it is activated.
+//
+//      This function uses a technique similar to that described in KB
+//      article Q141752 to locate the previous instance of the application. .
+BOOL CCryEditApp::FirstInstance(bool bForceNewInstance)
+{
+    QSystemSemaphore sem(QString(O3DEApplicationName) + "_sem", 1);
+    sem.acquire();
+    {
+        FixDanglingSharedMemory(O3DEEditorClassName);
+    }
+    sem.release();
+    m_mutexApplication = new QSharedMemory(O3DEEditorClassName);
+    if (!m_mutexApplication->create(sizeof(SharedData)) && !bForceNewInstance)
+    {
+        m_mutexApplication->attach();
+        // another instance is already running - activate it
+        sem.acquire();
+        SharedData* data = reinterpret_cast<SharedData*>(m_mutexApplication->data());
+        data->raise = true;
+
+        if (m_bPreviewMode)
+        {
+            // IF in preview mode send this window copy data message to load new preview file.
+            azstrcpy(data->text, MAX_PATH, m_sPreviewFile);
+        }
+        return false;
+    }
+    else
+    {
+        m_mutexApplication->attach();
+        // this is the first instance
+        sem.acquire();
+        ::memset(m_mutexApplication->data(), 0, m_mutexApplication->size());
+        sem.release();
+        QTimer* t = new QTimer(this);
+        connect(t, &QTimer::timeout, this, [this]() {
+            QSystemSemaphore sem(QString(O3DEApplicationName) + "_sem", 1);
+            sem.acquire();
+            SharedData* data = reinterpret_cast<SharedData*>(m_mutexApplication->data());
+            QString preview = QString::fromLatin1(data->text);
+            if (data->raise)
+            {
+                QWidget* w = MainWindow::instance();
+                w->setWindowState((w->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
+                w->raise();
+                w->activateWindow();
+                data->raise = false;
+            }
+            if (!preview.isEmpty())
+            {
+                // Load this file
+                LoadFile(preview);
+                data->text[0] = 0;
+            }
+            sem.release();
+        });
+        t->start(1000);
+
+        return true;
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnFileSave()
+{
+    if (m_savingLevel)
+    {
+        return;
+    }
+
+    const QScopedValueRollback<bool> rollback(m_savingLevel, true);
+
+    GetIEditor()->GetDocument()->DoFileSave();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateDocumentReady(QAction* action)
+{
+    action->setEnabled(GetIEditor()
+        && GetIEditor()->GetDocument()
+        && GetIEditor()->GetDocument()->IsDocumentReady()
+        && !m_bIsExportingLegacyData
+        && !m_creatingNewLevel
+        && !m_openingLevel
+        && !m_savingLevel);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateFileOpen(QAction* action)
+{
+    action->setEnabled(!m_bIsExportingLegacyData && !m_creatingNewLevel && !m_openingLevel && !m_savingLevel);
+}
+
+bool CCryEditApp::ShowEnableDisableGemDialog(const QString& title, const QString& message)
+{
+    const QString informativeMessage = QObject::tr("Please follow the instructions <a href=\"http://docs.aws.amazon.com/lumberyard/latest/userguide/gems-system-gems.html\">here</a>, after which the Editor will be re-launched automatically.");
+
+    QMessageBox box(AzToolsFramework::GetActiveWindow());
+    box.addButton(QObject::tr("Continue"), QMessageBox::AcceptRole);
+    box.addButton(QObject::tr("Back"), QMessageBox::RejectRole);
+    box.setWindowTitle(title);
+    box.setText(message);
+    box.setInformativeText(informativeMessage);
+    box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    if (box.exec() == QMessageBox::AcceptRole)
+    {
+        // Called from a modal dialog with the main window as its parent. Best not to close the main window while the dialog is still active.
+        QTimer::singleShot(0, MainWindow::instance(), &MainWindow::close);
+        return true;
+    }
+
+    return false;
+}
+
+QString CCryEditApp::ShowWelcomeDialog()
+{
+    WelcomeScreenDialog wsDlg(MainWindow::instance());
+    wsDlg.SetRecentFileList(GetRecentFileList());
+    wsDlg.exec();
+    QString levelName = wsDlg.GetLevelPath();
+    return levelName;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::InitDirectory()
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Initializes Root folder of the game.
+    //////////////////////////////////////////////////////////////////////////
+    QString szExeFileName = qApp->applicationDirPath();
+    const static char* s_engineMarkerFile = "engine.json";
+
+    while (!QFile::exists(QString("%1/%2").arg(szExeFileName, s_engineMarkerFile)))
+    {
+        QDir currentdir(szExeFileName);
+        if (!currentdir.cdUp())
+        {
+            break;
+        }
+        szExeFileName = currentdir.absolutePath();
+    }
+    QDir::setCurrent(szExeFileName);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// Needed to work with custom memory manager.
+//////////////////////////////////////////////////////////////////////////
+
+CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(LPCTSTR lpszPathName, BOOL bMakeVisible /*= true*/)
+{
+    return OpenDocumentFile(lpszPathName, true, bMakeVisible);
+}
+
+CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(LPCTSTR lpszPathName, BOOL bAddToMRU, [[maybe_unused]] BOOL bMakeVisible)
+{
+    CCryEditDoc* pCurDoc = GetIEditor()->GetDocument();
+
+    if (pCurDoc)
+    {
+        if (!pCurDoc->SaveModified())
+        {
+            return nullptr;
+        }
+    }
+
+    if (!pCurDoc)
+    {
+        pCurDoc = qobject_cast<CCryEditDoc*>(m_documentClass->newInstance());
+        if (pCurDoc == nullptr)
+            return nullptr;
+        pCurDoc->setParent(this);
+    }
+
+    pCurDoc->SetModifiedFlag(false);
+    if (lpszPathName == nullptr)
+    {
+        pCurDoc->SetTitle(tr("Untitled"));
+        pCurDoc->OnNewDocument();
+    }
+    else
+    {
+        pCurDoc->OnOpenDocument(lpszPathName);
+        pCurDoc->SetPathName(lpszPathName);
+        if (bAddToMRU)
+        {
+            CCryEditApp::instance()->AddToRecentFileList(lpszPathName);
+        }
+    }
+
+    return pCurDoc;
+}
+
+CCrySingleDocTemplate::Confidence CCrySingleDocTemplate::MatchDocType(LPCTSTR lpszPathName, CCryEditDoc*& rpDocMatch)
+{
+    assert(lpszPathName != NULL);
+    rpDocMatch = NULL;
+
+    // go through all documents
+    CCryEditDoc* pDoc = GetIEditor()->GetDocument();
+    if (pDoc)
+    {
+        QString prevPathName = pDoc->GetLevelPathName();
+        // all we need to know here is whether it is the same file as before.
+        if (!prevPathName.isEmpty())
+        {
+            // QFileInfo is guaranteed to return true iff the two paths refer to the same path.
+            if (QFileInfo(prevPathName) == QFileInfo(QString::fromUtf8(lpszPathName)))
+            {
+                // already open
+                rpDocMatch = pDoc;
+                return yesAlreadyOpen;
+            }
+        }
+    }
+
+    // see if it matches our default suffix
+
+    const QString strFilterExt = EditorUtils::LevelFile::GetDefaultFileExtension();
+    const QString strOldFilterExt = EditorUtils::LevelFile::GetOldCryFileExtension();
+    const QString strSliceFilterExt = AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str();
+
+    // see if extension matches
+    assert(strFilterExt[0] == '.');
+    QString strDot = "." + Path::GetExt(lpszPathName);
+    if (!strDot.isEmpty())
+    {
+        if(strDot == strFilterExt || strDot == strOldFilterExt || strDot == strSliceFilterExt)
+        {
+            return yesAttemptNative; // extension matches, looks like ours
+        }
+    }
+    // otherwise we will guess it may work
+    return yesAttemptForeign;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+namespace
+{
+    CryMutex g_splashScreenStateLock;
+    CryConditionVariable g_splashScreenStateChange;
+    enum ESplashScreenState
+    {
+        eSplashScreenState_Init, eSplashScreenState_Started, eSplashScreenState_Destroy
+    };
+    ESplashScreenState g_splashScreenState = eSplashScreenState_Init;
+    IInitializeUIInfo* g_pInitializeUIInfo = nullptr;
+    QWidget* g_splashScreen = nullptr;
+}
+
+QString FormatVersion(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
+}
+
+QString FormatRichTextCopyrightNotice()
+{
+    // copyright symbol is HTML Entity = &#xA9;
+    QString copyrightHtmlSymbol = "&#xA9;";
+    QString copyrightString = QObject::tr("Copyright %1 Contributors to the Open 3D Engine Project");
+
+    return copyrightString.arg(copyrightHtmlSymbol);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CCryEditApp::ShowSplashScreen(CCryEditApp* app)
+{
+    g_splashScreenStateLock.Lock();
+
+    CStartupLogoDialog* splashScreen = new CStartupLogoDialog(FormatVersion(app->m_pEditor->GetFileVersion()), FormatRichTextCopyrightNotice());
+
+    g_pInitializeUIInfo = splashScreen;
+    g_splashScreen = splashScreen;
+    g_splashScreenState = eSplashScreenState_Started;
+
+    g_splashScreenStateLock.Unlock();
+    g_splashScreenStateChange.Notify();
+
+    splashScreen->show();
+    // Make sure the initial paint of the splash screen occurs so we dont get stuck with a blank window
+    QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+
+    QObject::connect(splashScreen, &QObject::destroyed, splashScreen, [=]
+    {
+        g_splashScreenStateLock.Lock();
+        g_pInitializeUIInfo = nullptr;
+        g_splashScreen = nullptr;
+        g_splashScreenStateLock.Unlock();
+    });
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CCryEditApp::CreateSplashScreen()
+{
+    if (!m_bConsoleMode && !IsInAutotestMode())
+    {
+        // Create startup output splash
+        ShowSplashScreen(this);
+
+        GetIEditor()->Notify(eNotify_OnSplashScreenCreated);
+    }
+    else
+    {
+        // Create console
+        m_pConsoleDialog = new CConsoleDialog();
+        m_pConsoleDialog->show();
+
+        g_pInitializeUIInfo = m_pConsoleDialog;
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CCryEditApp::CloseSplashScreen()
+{
+    if (CStartupLogoDialog::instance())
+    {
+        delete CStartupLogoDialog::instance();
+        g_splashScreenStateLock.Lock();
+        g_splashScreenState = eSplashScreenState_Destroy;
+        g_splashScreenStateLock.Unlock();
+    }
+
+    GetIEditor()->Notify(eNotify_OnSplashScreenDestroyed);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OutputStartupMessage(QString str)
+{
+    g_splashScreenStateLock.Lock();
+    if (g_pInitializeUIInfo)
+    {
+        g_pInitializeUIInfo->SetInfoText(str.toUtf8().data());
+    }
+    g_splashScreenStateLock.Unlock();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::InitFromCommandLine(CEditCommandLineInfo& cmdInfo)
+{
+    m_bConsoleMode |= cmdInfo.m_bConsoleMode;
+    inEditorBatchMode = AZ::Environment::CreateVariable<bool>("InEditorBatchMode", m_bConsoleMode);
+
+    m_bTestMode |= cmdInfo.m_bTest;
+
+    m_bSkipWelcomeScreenDialog = cmdInfo.m_bSkipWelcomeScreenDialog || !cmdInfo.m_execFile.isEmpty() || !cmdInfo.m_execLineCmd.isEmpty() || cmdInfo.m_bAutotestMode;
+    m_bExportMode = cmdInfo.m_bExport;
+    m_bRunPythonTestScript = cmdInfo.m_bRunPythonTestScript;
+    m_bRunPythonScript = cmdInfo.m_bRunPythonScript || cmdInfo.m_bRunPythonTestScript;
+    m_execFile = cmdInfo.m_execFile;
+    m_execLineCmd = cmdInfo.m_execLineCmd;
+    m_bAutotestMode = cmdInfo.m_bAutotestMode || cmdInfo.m_bConsoleMode;
+
+    m_pEditor->SetMatEditMode(cmdInfo.m_bMatEditMode);
+
+    if (m_bExportMode)
+    {
+        m_exportFile = cmdInfo.m_exportFile;
+    }
+
+    // Do we have a passed filename ?
+    if (!cmdInfo.m_strFileName.isEmpty())
+    {
+        if (!m_bRunPythonScript && IsPreviewableFileType(cmdInfo.m_strFileName.toUtf8().constData()))
+        {
+            m_bPreviewMode = true;
+            azstrncpy(m_sPreviewFile, _MAX_PATH, cmdInfo.m_strFileName.toUtf8().constData(), _MAX_PATH);
+        }
+    }
+
+    if (cmdInfo.m_bAutoLoadLevel)
+    {
+        m_bLevelLoadTestMode = true;
+        gEnv->bNoAssertDialog = true;
+        CEditorAutoLevelLoadTest::Instance();
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+AZ::Outcome<void, AZStd::string> CCryEditApp::InitGameSystem(HWND hwndForInputSystem)
+{
+    CGameEngine* pGameEngine = new CGameEngine;
+
+    AZ::Outcome<void, AZStd::string> initOutcome = pGameEngine->Init(m_bPreviewMode, m_bTestMode, qApp->arguments().join(" ").toUtf8().data(), g_pInitializeUIInfo, hwndForInputSystem);
+    if (!initOutcome.IsSuccess())
+    {
+        return initOutcome;
+    }
+
+    AZ_Assert(pGameEngine, "Game engine initialization failed, but initOutcome returned success.");
+
+    m_pEditor->SetGameEngine(pGameEngine);
+
+    // needs to be called after CrySystem has been loaded.
+    gSettings.LoadDefaultGamePaths();
+
+    return AZ::Success();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+BOOL CCryEditApp::CheckIfAlreadyRunning()
+{
+    bool bForceNewInstance = false;
+
+    if (!m_bPreviewMode)
+    {
+        FixDanglingSharedMemory(O3DEApplicationName);
+        m_mutexApplication = new QSharedMemory(O3DEApplicationName);
+        if (!m_mutexApplication->create(16))
+        {
+            // Don't prompt the user in non-interactive export mode.  Instead, default to allowing multiple instances to
+            // run simultaneously, so that multiple level exports can be run in parallel on the same machine.
+            // NOTE:  If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs
+            // from trying to write to the same level at the same time.
+            // If we're running interactively, let's ask and make sure the user actually intended to do this.
+            if (!m_bExportMode && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Too many apps"), QObject::tr("There is already an Open 3D Engine application running\nDo you want to start another one?")) != QMessageBox::Yes)
+            {
+                return false;
+            }
+
+            bForceNewInstance = true;
+        }
+    }
+
+    if (!FirstInstance(bForceNewInstance))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+bool CCryEditApp::InitGame()
+{
+    if (!m_bPreviewMode && !GetIEditor()->IsInMatEditMode())
+    {
+        AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
+        Log((QString("project_path = %1").arg(!projectPath.empty() ? projectPath.c_str() : "<not set>")).toUtf8().data());
+
+        ICVar* pVar = gEnv->pConsole->GetCVar("sys_localization_folder");
+        const char* sLocalizationFolder = pVar ? pVar->GetString() : nullptr;
+        Log((QString("sys_localization_folder = ") + (sLocalizationFolder && sLocalizationFolder[0] ? sLocalizationFolder : "<not set>")).toUtf8().data());
+
+        OutputStartupMessage("Starting Game...");
+
+        if (!GetIEditor()->GetGameEngine()->InitGame(nullptr))
+        {
+            return false;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Apply settings post engine initialization.
+    GetIEditor()->GetDisplaySettings()->PostInitApply();
+    gSettings.PostInitApply();
+    return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CCryEditApp::InitPlugins()
+{
+    OutputStartupMessage("Loading Plugins...");
+    // Load the plugins
+    {
+        GetIEditor()->LoadPlugins();
+
+#if defined(AZ_PLATFORM_WINDOWS)
+        C3DConnexionDriver* p3DConnexionDriver = new C3DConnexionDriver;
+        GetIEditor()->GetPluginManager()->RegisterPlugin(0, p3DConnexionDriver);
+#endif
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+// Be careful when calling this function: it should be called after
+// everything else has finished initializing, otherwise, certain things
+// aren't set up yet. If in doubt, wrap it in a QTimer::singleShot(0ms);
+void CCryEditApp::InitLevel(const CEditCommandLineInfo& cmdInfo)
+{
+    const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+    const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
+
+    if (m_bPreviewMode)
+    {
+        GetIEditor()->EnableAcceleratos(false);
+
+        // Load geometry object.
+        if (!cmdInfo.m_strFileName.isEmpty())
+        {
+            LoadFile(cmdInfo.m_strFileName);
+        }
+    }
+    else if (m_bExportMode && !m_exportFile.isEmpty())
+    {
+        GetIEditor()->SetModifiedFlag(false);
+        GetIEditor()->SetModifiedModule(eModifiedNothing);
+        auto pDocument = OpenDocumentFile(m_exportFile.toUtf8().constData());
+        if (pDocument)
+        {
+            GetIEditor()->SetModifiedFlag(false);
+            GetIEditor()->SetModifiedModule(eModifiedNothing);
+            ExportLevel(cmdInfo.m_bExport, cmdInfo.m_bExportTexture, true);
+            // Terminate process.
+            CLogFile::WriteLine("Editor: Terminate Process after export");
+        }
+        // the call to quit() must be posted to the event queue because the app is currently not yet running.
+        // if we were to call quit() right now directly, the app would ignore it.
+        QTimer::singleShot(0, QCoreApplication::instance(), &QCoreApplication::quit);
+        return;
+    }
+    else if ((cmdInfo.m_strFileName.endsWith(defaultExtension, Qt::CaseInsensitive))
+            || (cmdInfo.m_strFileName.endsWith(oldExtension, Qt::CaseInsensitive)))
+    {
+        auto pDocument = OpenDocumentFile(cmdInfo.m_strFileName.toUtf8().constData());
+        if (pDocument)
+        {
+            GetIEditor()->SetModifiedFlag(false);
+            GetIEditor()->SetModifiedModule(eModifiedNothing);
+        }
+    }
+    else
+    {
+        //////////////////////////////////////////////////////////////////////////
+        //It can happen that if you are switching between projects and you have auto load set that
+        //you could inadvertently load the wrong project and not know it, you would think you are editing
+        //one level when in fact you are editing the old one. This can happen if both projects have the same
+        //relative path... which is often the case when branching.
+        // Ex. D:\cryengine\dev\ gets branched to D:\cryengine\branch\dev
+        // Now you have gamesdk in both roots and therefore GameSDK\Levels\Singleplayer\Forest in both
+        // If you execute the branch the m_pRecentFileList will be an absolute path to the old gamesdk,
+        // then if auto load is set simply takes the old level and loads it in the new branch...
+        //I would question ever trying to load a level not in our gamesdk, what happens when there are things that
+        //an not exist in the level when built in a different gamesdk.. does it erase them, most likely, then you
+        //just screwed up the level for everyone in the other gamesdk...
+        //So if we are auto loading a level outside our current gamesdk we should act as though the flag
+        //was unset and pop the dialog which should be in the correct location. This is not fool proof, but at
+        //least this its a compromise that doesn't automatically do something you probably shouldn't.
+        bool autoloadLastLevel = gSettings.bAutoloadLastLevelAtStartup;
+        if (autoloadLastLevel
+            && GetRecentFileList()
+            && GetRecentFileList()->GetSize())
+        {
+            QString gamePath = Path::GetEditingGameDataFolder().c_str();
+            Path::ConvertSlashToBackSlash(gamePath);
+            gamePath = Path::ToUnixPath(gamePath.toLower());
+            gamePath = Path::AddSlash(gamePath);
+
+            QString fullPath = GetRecentFileList()->m_arrNames[0];
+            Path::ConvertSlashToBackSlash(fullPath);
+            fullPath = Path::ToUnixPath(fullPath.toLower());
+            fullPath = Path::AddSlash(fullPath);
+
+            if (fullPath.indexOf(gamePath, 0) != 0)
+            {
+                autoloadLastLevel = false;
+            }
+        }
+        //////////////////////////////////////////////////////////////////////////
+
+        QString levelName;
+        bool isLevelNameValid = false;
+        bool doLevelNeedLoading = true;
+        const bool runningPythonScript = cmdInfo.m_bRunPythonScript || cmdInfo.m_bRunPythonTestScript;
+
+        AZ::EBusLogicalResult<bool, AZStd::logical_or<bool> > skipStartupUIProcess(false);
+        EBUS_EVENT_RESULT(skipStartupUIProcess, AzToolsFramework::EditorEvents::Bus, SkipEditorStartupUI);
+
+        if (!skipStartupUIProcess.value)
+        {
+            do
+            {
+                isLevelNameValid = false;
+                doLevelNeedLoading = true;
+                if (gSettings.bShowDashboardAtStartup
+                    && !runningPythonScript
+                    && !GetIEditor()->IsInMatEditMode()
+                    && !m_bConsoleMode
+                    && !m_bSkipWelcomeScreenDialog
+                    && !m_bPreviewMode
+                    && !autoloadLastLevel)
+                {
+                    levelName = ShowWelcomeDialog();
+                }
+                else if (autoloadLastLevel
+                         && GetRecentFileList()
+                         && GetRecentFileList()->GetSize())
+                {
+                    levelName = GetRecentFileList()->m_arrNames[0];
+                }
+
+                if (levelName.isEmpty())
+                {
+                    break;
+                }
+                if (levelName == "new")
+                {
+                    //implies that the user has clicked the create new level option
+                    bool wasCreateLevelOperationCancelled = false;
+                    bool isNewLevelCreationSuccess = false;
+                    // This will show the new level dialog until a valid input has been entered by the user or until the user click cancel
+                    while (!isNewLevelCreationSuccess && !wasCreateLevelOperationCancelled)
+                    {
+                        isNewLevelCreationSuccess = CreateLevel(wasCreateLevelOperationCancelled);
+                        if (isNewLevelCreationSuccess == true)
+                        {
+                            doLevelNeedLoading = false;
+                            isLevelNameValid = true;
+                        }
+                    }
+                    ;
+                }
+                else if (levelName == "new slice")
+                {
+                    QMessageBox::warning(AzToolsFramework::GetActiveWindow(), "Not implemented", "New Slice is not yet implemented.");
+                }
+                else
+                {
+                    //implies that the user wants to open an existing level
+                    doLevelNeedLoading = true;
+                    isLevelNameValid = true;
+                }
+            } while (!isLevelNameValid);// if we reach here and levelName is not valid ,it implies that the user has clicked cancel on the create new level dialog
+
+            // load level
+            if (doLevelNeedLoading && !levelName.isEmpty())
+            {
+                if (!CFileUtil::Exists(levelName, false))
+                {
+                    QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QObject::tr("Missing level"), QObject::tr("Failed to auto-load last opened level. Level file does not exist:\n\n%1").arg(levelName));
+                    return;
+                }
+
+                QString str;
+                str = tr("Loading level %1 ...").arg(levelName);
+                OutputStartupMessage(str);
+
+                OpenDocumentFile(levelName.toUtf8().data());
+            }
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+BOOL CCryEditApp::InitConsole()
+{
+    // Execute command from cmdline -exec_line if applicable
+    if (!m_execLineCmd.isEmpty())
+    {
+        gEnv->pConsole->ExecuteString(QString("%1").arg(m_execLineCmd).toLocal8Bit());
+    }
+
+    // Execute cfg from cmdline -exec if applicable
+    if (!m_execFile.isEmpty())
+    {
+        gEnv->pConsole->ExecuteString(QString("exec %1").arg(m_execFile).toLocal8Bit());
+    }
+
+    // Execute special configs.
+    gEnv->pConsole->ExecuteString("exec editor_autoexec.cfg");
+    gEnv->pConsole->ExecuteString("exec editor.cfg");
+    gEnv->pConsole->ExecuteString("exec user.cfg");
+
+    GetISystem()->ExecuteCommandLine();
+
+    return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CCryEditApp::CompileCriticalAssets() const
+{
+    // regardless of what is set in the bootstrap wait for AP to be ready
+    // wait a maximum of 100 milliseconds and pump the system event loop until empty
+    struct AssetsInQueueNotification
+        : public AzFramework::AssetSystemInfoBus::Handler
+    {
+        void CountOfAssetsInQueue(const int& count) override
+        {
+            CCryEditApp::OutputStartupMessage(QString("Asset Processor working... %1 jobs remaining.").arg(count));
+        }
+    };
+    AssetsInQueueNotification assetsInQueueNotifcation;
+    assetsInQueueNotifcation.BusConnect();
+    bool ready{};
+    while (!ready)
+    {
+        AzFramework::AssetSystemRequestBus::BroadcastResult(ready, &AzFramework::AssetSystemRequestBus::Events::WaitUntilAssetProcessorReady, AZStd::chrono::milliseconds(100));
+        if (!ready)
+        {
+            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::PumpSystemEventLoopUntilEmpty);
+        }
+    }
+    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
+{
+    bool connectedToAssetProcessor = false;
+
+    // When the AssetProcessor is already launched it should take less than a second to perform a connection
+    // but when the AssetProcessor needs to be launch it could take up to 15 seconds to have the AssetProcessor initialize
+    // and able to negotiate a connection when running a debug build
+    // and to negotiate a connection
+
+    // Setting the connectTimeout to 3 seconds if not set within the settings registry
+    AZStd::chrono::seconds connectTimeout(3);
+    // Initialize the launchAssetProcessorTimeout to 15 seconds by default and check the settings registry for an override
+    AZStd::chrono::seconds launchAssetProcessorTimeout(15);
+    AZ::SettingsRegistryInterface* settingsRegistry = AZ::SettingsRegistry::Get();
+    if (settingsRegistry)
+    {
+        AZ::s64 timeoutValue{};
+        if (AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, timeoutValue,
+            AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, "connect_ap_timeout"))
+        {
+            connectTimeout = AZStd::chrono::seconds(timeoutValue);
+        }
+
+        // Reset timeout integer
+        timeoutValue = {};
+        if (AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, timeoutValue,
+            AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, "launch_ap_timeout"))
+        {
+            launchAssetProcessorTimeout = AZStd::chrono::seconds(timeoutValue);
+        }
+    }
+
+    CCryEditApp::OutputStartupMessage(QString("Connecting to Asset Processor... "));
+
+    AzFramework::AssetSystem::ConnectionSettings connectionSettings;
+    AzFramework::AssetSystem::ReadConnectionSettingsFromSettingsRegistry(connectionSettings);
+
+    connectionSettings.m_launchAssetProcessorOnFailedConnection = true;
+    connectionSettings.m_connectionDirection = AzFramework::AssetSystem::ConnectionSettings::ConnectionDirection::ConnectToAssetProcessor;
+    connectionSettings.m_connectionIdentifier = AzFramework::AssetSystem::ConnectionIdentifiers::Editor;
+    connectionSettings.m_loggingCallback = [](AZStd::string_view logData)
+    {
+        CCryEditApp::OutputStartupMessage(QString::fromUtf8(logData.data(), aznumeric_cast<int>(logData.size())));
+    };
+
+    AzFramework::AssetSystemRequestBus::BroadcastResult(connectedToAssetProcessor, &AzFramework::AssetSystemRequestBus::Events::EstablishAssetProcessorConnection, connectionSettings);
+
+    if (connectedToAssetProcessor)
+    {
+        CCryEditApp::OutputStartupMessage(QString("Connected to Asset Processor"));
+        CompileCriticalAssets();
+        return true;
+    }
+
+    CCryEditApp::OutputStartupMessage(QString("Failed to connect to Asset Processor"));
+    return false;
+}
+
+//! This handles the normal logging of Python output in the Editor by outputting
+//! the data to both the Editor Console and the Editor.log file
+struct CCryEditApp::PythonOutputHandler
+    : public AzToolsFramework::EditorPythonConsoleNotificationBus::Handler
+{
+    PythonOutputHandler()
+    {
+        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusConnect();
+    }
+
+    virtual ~PythonOutputHandler()
+    {
+        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
+    }
+
+    int GetOrder() override
+    {
+        return 0;
+    }
+
+    void OnTraceMessage([[maybe_unused]] AZStd::string_view message) override
+    {
+        AZ_TracePrintf("python_test", "%.*s", static_cast<int>(message.size()), message.data());
+    }
+
+    void OnErrorMessage([[maybe_unused]] AZStd::string_view message) override
+    {
+        AZ_Error("python_test", false, "%.*s", static_cast<int>(message.size()), message.data());
+    }
+
+    void OnExceptionMessage([[maybe_unused]] AZStd::string_view message) override
+    {
+        AZ_Error("python_test", false, "EXCEPTION: %.*s", static_cast<int>(message.size()), message.data());
+    }
+};
+
+//! Outputs Python test script print() to stdout
+//! If an exception happens in a Python test script, the process terminates
+struct PythonTestOutputHandler final
+    : public CCryEditApp::PythonOutputHandler
+{
+    PythonTestOutputHandler() = default;
+    virtual ~PythonTestOutputHandler() = default;
+
+    void OnTraceMessage(AZStd::string_view message) override
+    {
+        PythonOutputHandler::OnTraceMessage(message);
+        printf("%.*s\n", static_cast<int>(message.size()), message.data());
+    }
+
+    void OnErrorMessage(AZStd::string_view message) override
+    {
+        PythonOutputHandler::OnErrorMessage(message);
+        printf("ERROR: %.*s\n", static_cast<int>(message.size()), message.data());
+    }
+
+    void OnExceptionMessage(AZStd::string_view message) override
+    {
+        PythonOutputHandler::OnExceptionMessage(message);
+        printf("EXCEPTION: %.*s\n", static_cast<int>(message.size()), message.data());
+        AZ::Debug::Trace::Terminate(1);
+    }
+};
+
+void CCryEditApp::RunInitPythonScript(CEditCommandLineInfo& cmdInfo)
+{
+    if (cmdInfo.m_bRunPythonTestScript)
+    {
+        m_pythonOutputHandler = AZStd::make_shared<PythonTestOutputHandler>();
+    }
+    else
+    {
+        m_pythonOutputHandler = AZStd::make_shared<PythonOutputHandler>();
+    }
+
+    using namespace AzToolsFramework;
+    if (cmdInfo.m_bRunPythonScript || cmdInfo.m_bRunPythonTestScript)
+    {
+        if (cmdInfo.m_pythonArgs.length() > 0 || cmdInfo.m_bRunPythonTestScript)
+        {
+            AZStd::vector<AZStd::string> tokens;
+            AzFramework::StringFunc::Tokenize(cmdInfo.m_pythonArgs.toUtf8().constData(), tokens, ' ');
+            AZStd::vector<AZStd::string_view> pythonArgs;
+            std::transform(tokens.begin(), tokens.end(), std::back_inserter(pythonArgs), [](auto& tokenData) { return tokenData.c_str(); });
+            if (cmdInfo.m_bRunPythonTestScript)
+            {
+                AZStd::string pythonTestCase;
+                if (!cmdInfo.m_pythontTestCase.isEmpty())
+                {
+                    pythonTestCase = cmdInfo.m_pythontTestCase.toUtf8().constData();
+                }
+
+                EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByFilenameAsTest, cmdInfo.m_strFileName.toUtf8().constData(), pythonTestCase, pythonArgs);
+
+                // Close the editor gracefully as the test has completed
+                GetIEditor()->GetDocument()->SetModifiedFlag(false);
+                QTimer::singleShot(0, qApp, &QApplication::closeAllWindows);
+            }
+            else
+            {
+                EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, cmdInfo.m_strFileName.toUtf8().constData(), pythonArgs);
+            }
+        }
+        else
+        {
+            EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByFilename, cmdInfo.m_strFileName.toUtf8().constData());
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CCryEditApp initialization
+BOOL CCryEditApp::InitInstance()
+{
+    QElapsedTimer startupTimer;
+    startupTimer.start();
+    InitDirectory();
+
+    // create / attach to the environment:
+    AttachEditorCoreAZEnvironment(AZ::Environment::GetInstance());
+    m_pEditor = new CEditorImpl();
+
+    // parameters must be parsed early to capture arguments for test bootstrap
+    CEditCommandLineInfo cmdInfo;
+
+    InitFromCommandLine(cmdInfo);
+
+    InitDirectory();
+
+    qobject_cast<Editor::EditorQtApplication*>(qApp)->Initialize(); // Must be done after CEditorImpl() is created
+    m_pEditor->Initialize();
+
+    // let anything listening know that they can use the IEditor now
+    AzToolsFramework::EditorEvents::Bus::Broadcast(&AzToolsFramework::EditorEvents::NotifyIEditorAvailable, m_pEditor);
+
+    if (cmdInfo.m_bShowVersionInfo)
+    {
+        CAboutDialog aboutDlg(FormatVersion(m_pEditor->GetFileVersion()), FormatRichTextCopyrightNotice());
+        aboutDlg.exec();
+        return FALSE;
+    }
+
+    // Reflect property control classes to the serialize context...
+    AZ::SerializeContext* serializeContext = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+    AZ_Assert(serializeContext, "Serialization context not available");
+    ReflectedVarInit::setupReflection(serializeContext);
+    RegisterReflectedVarHandlers();
+
+
+    QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
+
+    CreateSplashScreen();
+
+    // Register the application's document templates. Document templates
+    // serve as the connection between documents, frame windows and views
+    CCrySingleDocTemplate* pDocTemplate = CCrySingleDocTemplate::create<CCryEditDoc>();
+
+    m_pDocManager = new CCryDocManager;
+    ((CCryDocManager*)m_pDocManager)->SetDefaultTemplate(pDocTemplate);
+
+    auto mainWindow = new MainWindow();
+#ifdef Q_OS_MACOS
+    auto mainWindowWrapper = new AzQtComponents::WindowDecorationWrapper(AzQtComponents::WindowDecorationWrapper::OptionDisabled);
+#else
+    // No need for mainwindow wrapper for MatEdit mode
+    auto mainWindowWrapper = new AzQtComponents::WindowDecorationWrapper(cmdInfo.m_bMatEditMode ? AzQtComponents::WindowDecorationWrapper::OptionDisabled
+        : AzQtComponents::WindowDecorationWrapper::OptionAutoTitleBarButtons);
+#endif
+    mainWindowWrapper->setGuest(mainWindow);
+    HWND mainWindowWrapperHwnd = (HWND)mainWindowWrapper->winId();
+
+    AZ::IO::FixedMaxPath engineRootPath;
+    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+    {
+        settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+    }
+    QDir engineRoot = QString::fromUtf8(engineRootPath.c_str(), aznumeric_cast<int>(engineRootPath.Native().size()));
+    AzQtComponents::StyleManager::addSearchPaths(
+        QStringLiteral("style"),
+        engineRoot.filePath(QStringLiteral("Code/Editor/Style")),
+        QStringLiteral(":/Assets/Editor/Style"),
+        engineRootPath);
+    AzQtComponents::StyleManager::setStyleSheet(mainWindow, QStringLiteral("style:Editor.qss"));
+
+    // Note: we should use getNativeHandle to get the HWND from the widget, but
+    // it returns an invalid handle unless the widget has been shown and polished and even then
+    // it sometimes returns an invalid handle.
+    // So instead, we use winId(), which does consistently work
+    //mainWindowWrapperHwnd = QtUtil::getNativeHandle(mainWindowWrapper);
+
+    // Connect to the AssetProcessor at this point
+    // It will be launched if not running
+    ConnectToAssetProcessor();
+
+    auto initGameSystemOutcome = InitGameSystem(mainWindowWrapperHwnd);
+    if (!initGameSystemOutcome.IsSuccess())
+    {
+        return false;
+    }
+
+    // Process some queued events come from system init
+    // Such as asset catalog loaded notification.
+    // There are some systems need to load configurations from assets for post initialization but before loading level
+    AZ::TickBus::ExecuteQueuedEvents();
+
+    qobject_cast<Editor::EditorQtApplication*>(qApp)->LoadSettings();
+
+    // Create Sandbox user folder if necessary
+    AZ::IO::FileIOBase::GetDirectInstance()->CreatePath(Path::GetUserSandboxFolder().toUtf8().data());
+
+    if (!InitGame())
+    {
+        if (gEnv && gEnv->pLog)
+        {
+            gEnv->pLog->LogError("Game can not be initialized, InitGame() failed.");
+        }
+        if (!cmdInfo.m_bExport)
+        {
+            QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Game can not be initialized, please refer to the editor log file"));
+        }
+        return false;
+    }
+
+    // Meant to be called before MainWindow::Initialize
+    InitPlugins();
+
+    mainWindow->Initialize();
+
+    GetIEditor()->GetCommandManager()->RegisterAutoCommands();
+    GetIEditor()->AddUIEnums();
+
+    mainWindowWrapper->enableSaveRestoreGeometry("O3DE", "O3DE", "mainWindowGeometry");
+    m_pDocManager->OnFileNew();
+
+    if (IsInRegularEditorMode())
+    {
+        CIndexedFiles::Create();
+
+        if (gEnv->pConsole->GetCVar("ed_indexfiles")->GetIVal())
+        {
+            Log("Started game resource files indexing...");
+            CIndexedFiles::StartFileIndexing();
+        }
+        else
+        {
+            Log("Game resource files indexing is disabled.");
+        }
+
+        // QuickAccessBar creation should be before m_pMainWnd->SetFocus(),
+        // since it receives the focus at creation time. It brakes MainFrame key accelerators.
+        m_pQuickAccessBar = new CQuickAccessBar;
+        m_pQuickAccessBar->setVisible(false);
+    }
+
+    if (MainWindow::instance())
+    {
+        if (m_bConsoleMode || IsInAutotestMode())
+        {
+            AZ::Environment::FindVariable<int>("assertVerbosityLevel").Set(1);
+            m_pConsoleDialog->raise();
+        }
+        else if (!GetIEditor()->IsInMatEditMode())
+        {
+            MainWindow::instance()->show();
+            MainWindow::instance()->raise();
+            MainWindow::instance()->update();
+            MainWindow::instance()->setFocus();
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+            QWindow* window = mainWindowWrapper->windowHandle();
+            if (window)
+            {
+                Editor::WindowObserver* observer = new Editor::WindowObserver(window, this);
+                connect(observer, &Editor::WindowObserver::windowIsMovingOrResizingChanged, Editor::EditorQtApplication::instance(), &Editor::EditorQtApplication::setIsMovingOrResizing);
+            }
+#endif
+        }
+    }
+
+    if (m_bAutotestMode)
+    {
+        ICVar* const noErrorReportWindowCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_error_report_window") : nullptr;
+        if (noErrorReportWindowCVar)
+        {
+            noErrorReportWindowCVar->Set(true);
+        }
+        ICVar* const showErrorDialogOnLoadCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("ed_showErrorDialogOnLoad") : nullptr;
+        if (showErrorDialogOnLoadCVar)
+        {
+            showErrorDialogOnLoadCVar->Set(false);
+        }
+    }
+
+    SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), 0);
+    if (!GetIEditor()->IsInMatEditMode())
+    {
+        m_pEditor->InitFinished();
+    }
+
+    // Make sure Python is started before we attempt to restore the Editor layout, since the user
+    // might have custom view panes in the saved layout that will need to be registered.
+    auto editorPythonEventsInterface = AZ::Interface<AzToolsFramework::EditorPythonEventsInterface>::Get();
+    if (editorPythonEventsInterface)
+    {
+        editorPythonEventsInterface->StartPython();
+    }
+
+    if (!GetIEditor()->IsInMatEditMode() && !GetIEditor()->IsInConsolewMode())
+    {
+        bool restoreDefaults = !mainWindowWrapper->restoreGeometryFromSettings();
+        QtViewPaneManager::instance()->RestoreLayout(restoreDefaults);
+    }
+
+    CloseSplashScreen();
+
+    // DON'T CHANGE ME!
+    // Test scripts listen for this line, so please don't touch this without updating them.
+    // We consider ourselves "initialized enough" at this stage because all further initialization may be blocked by the modal welcome screen.
+    CLogFile::WriteLine(QString("Engine initialized, took %1s.").arg(startupTimer.elapsed() / 1000.0, 0, 'f', 2));
+
+    // Init the level after everything else is finished initializing, otherwise, certain things aren't set up yet
+    QTimer::singleShot(0, this, [this, cmdInfo] {
+        InitLevel(cmdInfo);
+    });
+
+#ifdef USE_WIP_FEATURES_MANAGER
+    // load the WIP features file
+    CWipFeatureManager::Instance()->EnableManager(!cmdInfo.m_bDeveloperMode);
+    CWipFeatureManager::Init();
+#endif
+
+    if (!m_bConsoleMode && !m_bPreviewMode)
+    {
+        GetIEditor()->UpdateViews();
+        if (MainWindow::instance())
+        {
+            MainWindow::instance()->setFocus();
+        }
+    }
+
+    if (!InitConsole())
+    {
+        return true;
+    }
+
+    if (IsInRegularEditorMode())
+    {
+        int startUpMacroIndex = GetIEditor()->GetToolBoxManager()->GetMacroIndex("startup", true);
+        if (startUpMacroIndex >= 0)
+        {
+            CryLogAlways("Executing the startup macro");
+            GetIEditor()->GetToolBoxManager()->ExecuteMacro(startUpMacroIndex, true);
+        }
+    }
+
+    if (GetIEditor()->GetCommandManager()->IsRegistered("editor.open_lnm_editor"))
+    {
+        CCommand0::SUIInfo uiInfo;
+#if !defined(NDEBUG)
+        bool ok =
+#endif
+            GetIEditor()->GetCommandManager()->GetUIInfo("editor.open_lnm_editor", uiInfo);
+        assert(ok);
+    }
+
+    RunInitPythonScript(cmdInfo);
+
+    return true;
+}
+
+void CCryEditApp::RegisterEventLoopHook(IEventLoopHook* pHook)
+{
+    pHook->pNextHook = m_pEventLoopHook;
+    m_pEventLoopHook = pHook;
+}
+
+void CCryEditApp::UnregisterEventLoopHook(IEventLoopHook* pHookToRemove)
+{
+    IEventLoopHook* pPrevious = 0;
+    for (IEventLoopHook* pHook = m_pEventLoopHook; pHook != 0; pHook = pHook->pNextHook)
+    {
+        if (pHook == pHookToRemove)
+        {
+            if (pPrevious)
+            {
+                pPrevious->pNextHook = pHookToRemove->pNextHook;
+            }
+            else
+            {
+                m_pEventLoopHook = pHookToRemove->pNextHook;
+            }
+
+            pHookToRemove->pNextHook = 0;
+            return;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::LoadFile(QString fileName)
+{
+    //CEditCommandLineInfo cmdLine;
+    //ProcessCommandLine(cmdinfo);
+
+    //bool bBuilding = false;
+    //CString file = cmdLine.SpanExcluding()
+    if (GetIEditor()->GetViewManager()->GetViewCount() == 0)
+    {
+        return;
+    }
+
+    LoadTagLocations();
+
+    if (MainWindow::instance() || m_pConsoleDialog)
+    {
+        SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), GetIEditor()->GetGameEngine()->GetLevelName());
+    }
+
+    GetIEditor()->SetModifiedFlag(false);
+    GetIEditor()->SetModifiedModule(eModifiedNothing);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline void ExtractMenuName(QString& str)
+{
+    // eliminate &
+    int pos = str.indexOf('&');
+    if (pos >= 0)
+    {
+        str = str.left(pos) + str.right(str.length() - pos - 1);
+    }
+    // cut the string
+    for (int i = 0; i < str.length(); i++)
+    {
+        if (str[i] == 9)
+        {
+            str = str.left(i);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::EnableAccelerator([[maybe_unused]] bool bEnable)
+{
+    /*
+    if (bEnable)
+    {
+        //LoadAccelTable( MAKEINTRESOURCE(IDR_MAINFRAME) );
+        m_AccelManager.UpdateWndTable();
+        CLogFile::WriteLine( "Enable Accelerators" );
+    }
+    else
+    {
+        CMainFrame *mainFrame = (CMainFrame*)m_pMainWnd;
+        if (mainFrame->m_hAccelTable)
+            DestroyAcceleratorTable( mainFrame->m_hAccelTable );
+        mainFrame->m_hAccelTable = NULL;
+        mainFrame->LoadAccelTable( MAKEINTRESOURCE(IDR_GAMEACCELERATOR) );
+        CLogFile::WriteLine( "Disable Accelerators" );
+    }
+    */
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::SaveAutoRemind()
+{
+    // Added a static variable here to avoid multiple messageboxes to
+    // remind the user of saving the file. Many message boxes would appear as this
+    // is triggered by a timer even which does not stop when the message box is called.
+    // Used a static variable instead of a member variable because this value is not
+    // Needed anywhere else.
+    static bool boIsShowingWarning(false);
+
+    // Ingore in game mode, or if no level created, or level not modified
+    if (GetIEditor()->IsInGameMode() || !GetIEditor()->GetGameEngine()->IsLevelLoaded() || !GetIEditor()->GetDocument()->IsModified())
+    {
+        return;
+    }
+
+    if (boIsShowingWarning)
+    {
+        return;
+    }
+
+    boIsShowingWarning = true;
+    if (QMessageBox::question(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Auto Reminder: You did not save level for at least %1 minute(s)\r\nDo you want to save it now?").arg(gSettings.autoRemindTime), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
+    {
+        // Save now.
+        GetIEditor()->SaveDocument();
+    }
+    boIsShowingWarning = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::WriteConfig()
+{
+    IEditor* pEditor = GetIEditor();
+    if (pEditor && pEditor->GetDisplaySettings())
+    {
+        pEditor->GetDisplaySettings()->SaveRegistry();
+    }
+}
+
+// App command to run the dialog
+void CCryEditApp::OnAppAbout()
+{
+    CAboutDialog aboutDlg(FormatVersion(m_pEditor->GetFileVersion()), FormatRichTextCopyrightNotice());
+    aboutDlg.exec();
+}
+
+// App command to run the Welcome to Open 3D Engine dialog
+void CCryEditApp::OnAppShowWelcomeScreen()
+{
+    // This logic is a simplified version of the startup
+    // flow that also shows the Welcome dialog
+
+    if (m_bIsExportingLegacyData
+        || m_creatingNewLevel
+        || m_openingLevel
+        || m_savingLevel)
+    {
+        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), QString(), "The Welcome screen cannot be displayed because a level load/save is in progress.");
+        return;
+    }
+
+    QString levelName;
+    bool showWelcomeDialog = true;
+    while (showWelcomeDialog)
+    {
+        // Keep showing the Welcome dialog as long as the user cancels
+        // a level creation/load triggered from the Welcome dialog
+        levelName = ShowWelcomeDialog();
+
+        if (levelName == "new")
+        {
+            // The user has clicked on the create new level option
+            bool wasCreateLevelOperationCancelled = false;
+            bool isNewLevelCreationSuccess = false;
+            // This will show the new level dialog until a valid input has been entered by the user or until the user click cancel
+            while (!isNewLevelCreationSuccess && !wasCreateLevelOperationCancelled)
+            {
+                isNewLevelCreationSuccess = CreateLevel(wasCreateLevelOperationCancelled);
+            }
+
+            if (isNewLevelCreationSuccess)
+            {
+                showWelcomeDialog = false;
+                levelName.clear();
+            }
+        }
+        else if (levelName == "new slice")
+        {
+            QMessageBox::warning(AzToolsFramework::GetActiveWindow(), "Not implemented", "New Slice is not yet implemented.");
+        }
+        else
+        {
+            // The user has selected an existing level to open
+            showWelcomeDialog = false;
+        }
+    }
+
+    if (!levelName.isEmpty())
+    {
+        // load level
+        if (!CFileUtil::Exists(levelName, false))
+        {
+            QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QObject::tr("Missing level"), QObject::tr("Failed to auto-load last opened level. Level file does not exist:\n\n%1").arg(levelName));
+        }
+        else
+        {
+            OpenDocumentFile(levelName.toUtf8().data());
+        }
+    }
+}
+
+void CCryEditApp::OnUpdateShowWelcomeScreen(QAction* action)
+{
+    action->setEnabled(!m_bIsExportingLegacyData
+        && !m_creatingNewLevel
+        && !m_openingLevel
+        && !m_savingLevel);
+}
+
+void CCryEditApp::OnDocumentationTutorials()
+{
+    QString webLink = tr("https://o3deorg.netlify.app/docs/learning-guide/");
+    QDesktopServices::openUrl(QUrl(webLink));
+}
+
+void CCryEditApp::OnDocumentationGlossary()
+{
+    QString webLink = tr("https://docs.o3de.org/docs/user-guide/appendix/glossary/");
+    QDesktopServices::openUrl(QUrl(webLink));
+}
+
+void CCryEditApp::OnDocumentationO3DE()
+{
+    QString webLink = tr("https://o3deorg.netlify.app/docs/");
+    QDesktopServices::openUrl(QUrl(webLink));
+}
+
+void CCryEditApp::OnDocumentationGamelift()
+{
+    QString webLink = tr("https://docs.aws.amazon.com/gamelift/");
+    QDesktopServices::openUrl(QUrl(webLink));
+}
+
+void CCryEditApp::OnDocumentationReleaseNotes()
+{
+    QString webLink = tr("https://o3deorg.netlify.app/docs/release-notes/");
+    QDesktopServices::openUrl(QUrl(webLink));
+}
+
+void CCryEditApp::OnDocumentationGameDevBlog()
+{
+    QString webLink = tr("https://aws.amazon.com/blogs/gamedev");
+    QDesktopServices::openUrl(QUrl(webLink));
+}
+
+void CCryEditApp::OnDocumentationForums()
+{
+    QString webLink = tr("https://o3deorg.netlify.app/community/");
+    QDesktopServices::openUrl(QUrl(webLink));
+}
+
+void CCryEditApp::OnDocumentationAWSSupport()
+{
+    QString webLink = tr("https://aws.amazon.com/contact-us");
+    QDesktopServices::openUrl(QUrl(webLink));
+}
+
+bool CCryEditApp::FixDanglingSharedMemory(const QString& sharedMemName) const
+{
+    QSystemSemaphore sem(sharedMemName + "_sem", 1);
+    sem.acquire();
+    {
+        QSharedMemory fix(sharedMemName);
+        if (!fix.attach())
+        {
+            if (fix.error() != QSharedMemory::NotFound)
+            {
+                sem.release();
+                return false;
+            }
+        }
+        // fix.detach() when destructed, taking out any dangling shared memory
+        // on unix
+    }
+    sem.release();
+    return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CCryEditApp message handlers
+
+
+int CCryEditApp::ExitInstance(int exitCode)
+{
+    if (m_pEditor)
+    {
+        m_pEditor->OnBeginShutdownSequence();
+    }
+    qobject_cast<Editor::EditorQtApplication*>(qApp)->UnloadSettings();
+
+    #ifdef USE_WIP_FEATURES_MANAGER
+    //
+    // close wip features manager
+    //
+    CWipFeatureManager::Shutdown();
+    #endif
+
+    if (IsInRegularEditorMode())
+    {
+        if (GetIEditor())
+        {
+            int shutDownMacroIndex = GetIEditor()->GetToolBoxManager()->GetMacroIndex("shutdown", true);
+            if (shutDownMacroIndex >= 0)
+            {
+                CryLogAlways("Executing the shutdown macro");
+                GetIEditor()->GetToolBoxManager()->ExecuteMacro(shutDownMacroIndex, true);
+            }
+        }
+    }
+
+    if (IsInRegularEditorMode())
+    {
+        CIndexedFiles::AbortFileIndexing();
+        CIndexedFiles::Destroy();
+    }
+
+    if (GetIEditor() && !GetIEditor()->IsInMatEditMode())
+    {
+        //Nobody seems to know in what case that kind of exit can happen so instrumented to see if it happens at all
+        if (m_pEditor)
+        {
+            m_pEditor->OnEarlyExitShutdownSequence();
+        }
+
+        gEnv->pLog->FlushAndClose();
+
+        // note: the intention here is to quit immediately without processing anything further
+        // on linux and mac, _exit has that effect
+        // however, on windows, _exit() still invokes CRT functions, unloads, and destructors
+        // so on windows, we need to use TerminateProcess
+#if defined(AZ_PLATFORM_WINDOWS)
+       TerminateProcess(GetCurrentProcess(), exitCode);
+#else
+
+        _exit(exitCode);
+#endif
+    }
+
+    SAFE_DELETE(m_pConsoleDialog);
+    SAFE_DELETE(m_pQuickAccessBar);
+
+    if (GetIEditor())
+    {
+        GetIEditor()->Notify(eNotify_OnQuit);
+    }
+
+    // if we're aborting due to an unexpected shutdown then don't call into objects that don't exist yet.
+    if ((gEnv) && (gEnv->pSystem) && (gEnv->pSystem->GetILevelSystem()))
+    {
+        gEnv->pSystem->GetILevelSystem()->UnloadLevel();
+    }
+
+    if (GetIEditor())
+    {
+        GetIEditor()->GetDocument()->DeleteTemporaryLevel();
+    }
+
+    m_bExiting = true;
+
+    HEAP_CHECK
+    ////////////////////////////////////////////////////////////////////////
+    // Executed directly before termination of the editor, just write a
+    // quick note to the log so that we can later see that the editor
+    // terminated flawlessly. Also delete temporary files.
+    ////////////////////////////////////////////////////////////////////////
+        WriteConfig();
+
+    if (m_pEditor)
+    {
+        // Ensure component entities are wiped prior to unloading plugins,
+        // since components may be implemented in those plugins.
+        EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, ResetEditorContext);
+
+        // vital, so that the Qt integration can unhook itself!
+        m_pEditor->UnloadPlugins();
+        m_pEditor->Uninitialize();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Quick end for editor.
+    if (gEnv && gEnv->pSystem)
+    {
+        gEnv->pSystem->Quit();
+        SAFE_RELEASE(gEnv->pSystem);
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    if (m_pEditor)
+    {
+        m_pEditor->DeleteThis();
+        m_pEditor = nullptr;
+    }
+
+    // save accelerator manager configuration.
+    //m_AccelManager.SaveOnExit();
+
+#ifdef WIN32
+    Gdiplus::GdiplusShutdown(m_gdiplusToken);
+#endif
+
+    if (m_mutexApplication)
+    {
+        delete m_mutexApplication;
+    }
+
+    DetachEditorCoreAZEnvironment();
+    return 0;
+}
+
+bool CCryEditApp::IsWindowInForeground()
+{
+    return Editor::EditorQtApplication::instance()->IsActive();
+}
+
+void CCryEditApp::DisableIdleProcessing()
+{
+    m_disableIdleProcessingCounter++;
+}
+
+void CCryEditApp::EnableIdleProcessing()
+{
+    m_disableIdleProcessingCounter--;
+    AZ_Assert(m_disableIdleProcessingCounter >= 0, "m_disableIdleProcessingCounter must be nonnegative");
+}
+
+BOOL CCryEditApp::OnIdle([[maybe_unused]] LONG lCount)
+{
+    if (0 == m_disableIdleProcessingCounter)
+    {
+        return IdleProcessing(false);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+int CCryEditApp::IdleProcessing(bool bBackgroundUpdate)
+{
+    AZ_Assert(m_disableIdleProcessingCounter == 0, "We should not be in IdleProcessing()");
+
+    //HEAP_CHECK
+    if (!MainWindow::instance())
+    {
+        return 0;
+    }
+
+    if (!GetIEditor()->GetSystem())
+    {
+        return 0;
+    }
+
+    // Ensure we don't get called re-entrantly
+    // This can occur when a nested Qt event loop fires (e.g. by way of a modal dialog calling exec)
+    if (m_idleProcessingRunning)
+    {
+        return 0;
+    }
+    QScopedValueRollback<bool> guard(m_idleProcessingRunning, true);
+
+    ////////////////////////////////////////////////////////////////////////
+    // Call the update function of the engine
+    ////////////////////////////////////////////////////////////////////////
+    if (m_bTestMode && !bBackgroundUpdate)
+    {
+        // Terminate process.
+        CLogFile::WriteLine("Editor: Terminate Process");
+        exit(0);
+    }
+
+    bool bIsAppWindow = IsWindowInForeground();
+    bool bActive = false;
+    int res = 0;
+    if (bIsAppWindow || m_bForceProcessIdle || m_bKeepEditorActive)
+    {
+        res = 1;
+        bActive = true;
+    }
+
+    if (m_bForceProcessIdle && bIsAppWindow)
+    {
+        m_bForceProcessIdle = false;
+    }
+
+    // focus changed
+    if (m_bPrevActive != bActive)
+    {
+        GetIEditor()->GetSystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_CHANGE_FOCUS, bActive, 0);
+    #if defined(AZ_PLATFORM_WINDOWS)
+        // This is required for the audio system to be notified of focus changes in the editor.  After discussing it
+        // with the macOS team, they are working on unifying the system events between the editor and standalone
+        // launcher so this is only needed on windows.
+        if (bActive)
+        {
+            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnSetFocus);
+        }
+        else
+        {
+            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnKillFocus);
+        }
+    #endif
+    }
+
+    m_bPrevActive = bActive;
+
+    // Don't tick application if we're doing idle processing during an assert.
+    const bool isErrorWindowVisible = (gEnv && gEnv->pSystem->IsAssertDialogVisible());
+    if (isErrorWindowVisible)
+    {
+        if (m_pEditor)
+        {
+            m_pEditor->Update();
+        }
+    }
+    else if (bActive || (bBackgroundUpdate && !bIsAppWindow))
+    {
+        // Update Game
+        GetIEditor()->GetGameEngine()->Update();
+
+        if (!GetIEditor()->IsInGameMode())
+        {
+            if (m_pEditor)
+            {
+                m_pEditor->Update();
+            }
+
+            GetIEditor()->Notify(eNotify_OnIdleUpdate);
+
+        AZ::ComponentApplication* componentApplication = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(componentApplication, &AZ::ComponentApplicationRequests::GetApplication);
+        if (componentApplication)
+        {
+            componentApplication->TickSystem();
+        }
+    }
+    else if (GetIEditor()->GetSystem() && GetIEditor()->GetSystem()->GetILog())
+    {
+        GetIEditor()->GetSystem()->GetILog()->Update(); // print messages from other threads
+    }
+
+    DisplayLevelLoadErrors();
+
+    if (CConsoleSCB::GetCreatedInstance())
+    {
+        CConsoleSCB::GetCreatedInstance()->FlushText();
+    }
+
+    return res;
+}
+
+void CCryEditApp::DisplayLevelLoadErrors()
+{
+    CCryEditDoc* currentLevel = GetIEditor()->GetDocument();
+    if (currentLevel && currentLevel->IsDocumentReady() && !m_levelErrorsHaveBeenDisplayed)
+    {
+        // Generally it takes a few idle updates for meshes to load and be processed by their components. This value
+        // was picked based on examining when mesh components are updated and their materials are checked for
+        // errors (2 updates) plus one more for good luck.
+        const int IDLE_FRAMES_TO_WAIT = 3;
+        ++m_numBeforeDisplayErrorFrames;
+        if (m_numBeforeDisplayErrorFrames > IDLE_FRAMES_TO_WAIT)
+        {
+            GetIEditor()->CommitLevelErrorReport();
+            GetIEditor()->GetErrorReport()->Display();
+            m_numBeforeDisplayErrorFrames = 0;
+            m_levelErrorsHaveBeenDisplayed = true;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::ExportLevel(bool bExportToGame, bool bExportTexture, bool bAutoExport)
+{
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+    if (usePrefabSystemForLevels)
+    {
+        AZ_Assert(false, "Prefab system doesn't require level exports.");
+        return;
+    }
+
+    if (bExportTexture)
+    {
+        CGameExporter gameExporter;
+        gameExporter.SetAutoExportMode(bAutoExport);
+        gameExporter.Export(eExp_SurfaceTexture);
+    }
+    else if (bExportToGame)
+    {
+        CGameExporter gameExporter;
+        gameExporter.SetAutoExportMode(bAutoExport);
+        gameExporter.Export();
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnEditHold()
+{
+    GetIEditor()->GetDocument()->Hold(HOLD_FETCH_FILE);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnEditFetch()
+{
+    GetIEditor()->GetDocument()->Fetch(HOLD_FETCH_FILE);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CCryEditApp::UserExportToGame(bool bNoMsgBox)
+{
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+    if (usePrefabSystemForLevels)
+    {
+        AZ_Assert(false, "Export Level should no longer exist.");
+        return false;
+    }
+
+    if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
+    {
+        if (bNoMsgBox == false)
+        {
+            QMessageBox::warning(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Please load a level before attempting to export."));
+        }
+        return false;
+    }
+    else
+    {
+        EditorUtils::AzWarningAbsorber absorb("Source Control");
+
+        // Record errors and display a dialog with them at the end.
+        CErrorsRecorder errRecorder(GetIEditor());
+
+        // Temporarily disable auto backup.
+        CScopedVariableSetter<bool> autoBackupEnabledChange(gSettings.autoBackupEnabled, false);
+        CScopedVariableSetter<int> autoRemindTimeChange(gSettings.autoRemindTime, 0);
+
+        m_bIsExportingLegacyData = true;
+        CGameExporter gameExporter;
+
+        unsigned int flags = eExp_CoverSurfaces;
+
+        // Change the cursor to show that we're busy.
+        QWaitCursor wait;
+
+        if (gameExporter.Export(flags, eLittleEndian, "."))
+        {
+            m_bIsExportingLegacyData = false;
+            return true;
+        }
+        m_bIsExportingLegacyData = false;
+        return false;
+    }
+}
+
+void CCryEditApp::ExportToGame(bool bNoMsgBox)
+{
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+    if (usePrefabSystemForLevels)
+    {
+        AZ_Assert(false, "Prefab system no longer exports levels.");
+        return;
+    }
+
+    CGameEngine* pGameEngine = GetIEditor()->GetGameEngine();
+    if (!pGameEngine->IsLevelLoaded())
+    {
+        if (pGameEngine->GetLevelPath().isEmpty())
+        {
+            QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), ("Open or create a level first."));
+            return;
+        }
+
+        CErrorsRecorder errRecorder(GetIEditor());
+        // If level not loaded first fast export terrain.
+        m_bIsExportingLegacyData = true;
+        CGameExporter gameExporter;
+        gameExporter.Export();
+        m_bIsExportingLegacyData = false;
+    }
+
+    {
+        UserExportToGame(bNoMsgBox);
+    }
+}
+
+void CCryEditApp::OnFileExportToGameNoSurfaceTexture()
+{
+    UserExportToGame(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::DeleteSelectedEntities([[maybe_unused]] bool includeDescendants)
+{
+    GetIEditor()->BeginUndo();
+    CUndo undo("Delete Selected Object");
+    GetIEditor()->GetObjectManager()->DeleteSelection();
+    GetIEditor()->AcceptUndo("Delete Selection");
+    GetIEditor()->SetModifiedFlag();
+    GetIEditor()->SetModifiedModule(eModifiedBrushes);
+}
+
+void CCryEditApp::OnMoveObject()
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Move the selected object to the marker position
+    ////////////////////////////////////////////////////////////////////////
+}
+
+void CCryEditApp::OnRenameObj()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnEditmodeMove()
+{
+    using namespace AzToolsFramework;
+    EditorTransformComponentSelectionRequestBus::Event(
+        GetEntityContextId(),
+        &EditorTransformComponentSelectionRequests::SetTransformMode,
+        EditorTransformComponentSelectionRequests::Mode::Translation);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnEditmodeRotate()
+{
+    using namespace AzToolsFramework;
+    EditorTransformComponentSelectionRequestBus::Event(
+        GetEntityContextId(),
+        &EditorTransformComponentSelectionRequests::SetTransformMode,
+        EditorTransformComponentSelectionRequests::Mode::Rotation);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnEditmodeScale()
+{
+    using namespace AzToolsFramework;
+    EditorTransformComponentSelectionRequestBus::Event(
+        GetEntityContextId(),
+        &EditorTransformComponentSelectionRequests::SetTransformMode,
+        EditorTransformComponentSelectionRequests::Mode::Scale);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateEditmodeMove(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+
+    AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
+    AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+        mode, AzToolsFramework::GetEntityContextId(),
+        &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
+
+    action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Translation);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateEditmodeRotate(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+
+    AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
+    AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+        mode, AzToolsFramework::GetEntityContextId(),
+        &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
+
+    action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Rotation);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateEditmodeScale(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+
+    AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
+    AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+        mode, AzToolsFramework::GetEntityContextId(),
+        &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
+
+    action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Scale);
+}
+
+void CCryEditApp::OnViewSwitchToGame()
+{
+    if (IsInPreviewMode())
+    {
+        return;
+    }
+    // close all open menus
+    auto activePopup = qApp->activePopupWidget();
+    if (qobject_cast<QMenu*>(activePopup))
+    {
+        activePopup->hide();
+    }
+    // TODO: Add your command handler code here
+    bool inGame = !GetIEditor()->IsInGameMode();
+    GetIEditor()->SetInGameMode(inGame);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnExportSelectedObjects()
+{
+    CExportManager* pExportManager = static_cast<CExportManager*> (GetIEditor()->GetExportManager());
+    QString filename = "untitled";
+    CBaseObject* pObj = GetIEditor()->GetSelectedObject();
+    if (pObj)
+    {
+        filename = pObj->GetName();
+    }
+    else
+    {
+        QString levelName = GetIEditor()->GetGameEngine()->GetLevelName();
+        if (!levelName.isEmpty())
+        {
+            filename = levelName;
+        }
+    }
+    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
+    pExportManager->Export(filename.toUtf8().data(), "obj", levelPath.toUtf8().data());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnFileExportOcclusionMesh()
+{
+    CExportManager* pExportManager = static_cast<CExportManager*> (GetIEditor()->GetExportManager());
+    QString levelName = GetIEditor()->GetGameEngine()->GetLevelName();
+    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
+    pExportManager->Export(levelName.toUtf8().data(), "ocm", levelPath.toUtf8().data(), false, false, true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnOpenAssetImporter()
+{
+    QtViewPaneManager::instance()->OpenPane(LyViewPane::SceneSettings);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateSelected(QAction* action)
+{
+    action->setEnabled(!GetIEditor()->GetSelection()->IsEmpty());
+}
+
+void CCryEditApp::OnShowHelpers()
+{
+    GetIEditor()->GetDisplaySettings()->DisplayHelpers(!GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
+    GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnEditLevelData()
+{
+    auto dir = QFileInfo(GetIEditor()->GetDocument()->GetLevelPathName()).dir();
+    CFileUtil::EditTextFile(dir.absoluteFilePath("LevelData.xml").toUtf8().data());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnFileEditLogFile()
+{
+    CFileUtil::EditTextFile(CLogFile::GetLogFileName(), 0, IFileUtil::FILE_TYPE_SCRIPT);
+}
+
+void CCryEditApp::OnFileResaveSlices()
+{
+    AZStd::vector<AZ::Data::AssetInfo> sliceAssetInfos;
+    sliceAssetInfos.reserve(5000);
+    AZ::Data::AssetCatalogRequests::AssetEnumerationCB sliceCountCb = [&sliceAssetInfos]([[maybe_unused]] const AZ::Data::AssetId id, const AZ::Data::AssetInfo& info)
+    {
+        // Only add slices and nothing that has been temporarily added to the catalog with a macro in it (ie @devroot@)
+        if (info.m_assetType == azrtti_typeid<AZ::SliceAsset>() && info.m_relativePath[0] != '@')
+        {
+            sliceAssetInfos.push_back(info);
+        }
+    };
+    AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequestBus::Events::EnumerateAssets, nullptr, sliceCountCb, nullptr);
+
+    QString warningMessage = QString("Resaving all slices can be *extremely* slow depending on source control and on the number of slices in your project!\n\nYou can speed this up dramatically by checking out all your slices before starting this!\n\n Your project has %1 slices.\n\nDo you want to continue?").arg(sliceAssetInfos.size());
+
+    if (QMessageBox::Cancel == QMessageBox::warning(MainWindow::instance(), tr("!!!WARNING!!!"), warningMessage, QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel))
+    {
+        return;
+    }
+
+    AZ::SerializeContext* serialize = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(serialize, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
+
+    if (!serialize)
+    {
+        AZ_TracePrintf("Resave Slices", "Couldn't get the serialize context.  Something is very wrong.  Aborting!!!");
+        return;
+    }
+
+    AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
+    if (!fileIO)
+    {
+        AZ_Error("Resave Slices", false, "File IO is not initialized.");
+        return;
+    }
+
+    int numFailures = 0;
+
+    // Create a lambda for load & save logic to make the lambda below easier to read
+    auto LoadAndSaveSlice = [serialize, &numFailures](const AZStd::string& filePath)
+    {
+        AZ::Entity* newRootEntity = nullptr;
+
+        // Read in the slice file first
+        {
+            AZ::IO::FileIOStream readStream(filePath.c_str(), AZ::IO::OpenMode::ModeRead);
+            newRootEntity = AZ::Utils::LoadObjectFromStream<AZ::Entity>(readStream, serialize, AZ::ObjectStream::FilterDescriptor(AZ::Data::AssetFilterNoAssetLoading));
+        }
+
+        // If we successfully loaded the file
+        if (newRootEntity)
+        {
+            if (!AZ::Utils::SaveObjectToFile(filePath, AZ::DataStream::ST_XML, newRootEntity))
+            {
+                AZ_TracePrintf("Resave Slices", "Unable to serialize the slice (%s) out to a file.  Unable to resave this slice\n", filePath.c_str());
+                numFailures++;
+            }
+        }
+        else
+        {
+            AZ_TracePrintf("Resave Slices", "Unable to read a slice (%s) file from disk.  Unable to resave this slice.\n", filePath.c_str());
+            numFailures++;
+        }
+    };
+
+    const size_t numSlices = sliceAssetInfos.size();
+    int slicesProcessed = 0;
+    int slicesRequestedForProcessing = 0;
+
+    if (numSlices > 0)
+    {
+        AzToolsFramework::ProgressShield::LegacyShowAndWait(MainWindow::instance(), tr("Checking out and resaving slices..."),
+            [numSlices, &slicesProcessed, &sliceAssetInfos, &LoadAndSaveSlice, &slicesRequestedForProcessing, &numFailures](int& current, int& max)
+            {
+                const static int numToProcessPerCall = 5;
+
+                if (slicesRequestedForProcessing < numSlices)
+                {
+                    for (int index = 0; index < numToProcessPerCall; index++)
+                    {
+                        if (slicesRequestedForProcessing < numSlices)
+                        {
+                            AZStd::string sourceFile;
+                            AzToolsFramework::AssetSystemRequestBus::Broadcast(&AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath, sliceAssetInfos[slicesRequestedForProcessing].m_relativePath, sourceFile);
+
+                            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::RequestEditForFile, sourceFile.c_str(), [&slicesProcessed, sourceFile, &LoadAndSaveSlice, &numFailures](bool success)
+                                {
+                                    slicesProcessed++;
+
+                                    if (success)
+                                    {
+                                        LoadAndSaveSlice(sourceFile);
+                                    }
+                                    else
+                                    {
+                                        AZ_TracePrintf("Resave Slices", "Unable to check a slice (%s) out of source control.  Unable to resave this slice\n", sourceFile.c_str());
+                                        numFailures++;
+                                    }
+                                }
+                            );
+                            slicesRequestedForProcessing++;
+                        }
+                    }
+                }
+
+                current = slicesProcessed;
+                max = static_cast<int>(numSlices);
+                return slicesProcessed == numSlices;
+            }
+        );
+
+        QString completeMessage;
+        if (numFailures > 0)
+        {
+            completeMessage = QString("All slices processed.  There were %1 slices that could not be resaved.  Please check the console for details.").arg(numFailures);
+        }
+        else
+        {
+            completeMessage = QString("All slices successfully process and re-saved!");
+        }
+
+        QMessageBox::information(MainWindow::instance(), tr("Re-saving complete"), completeMessage, QMessageBox::Ok);
+    }
+    else
+    {
+        QMessageBox::information(MainWindow::instance(), tr("No slices found"), tr("There were no slices found to resave."), QMessageBox::Ok);
+    }
+
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnFileEditEditorini()
+{
+    CFileUtil::EditTextFile(EDITOR_CFG_FILE);
+}
+
+void CCryEditApp::OnPreferences()
+{
+    /*
+    //////////////////////////////////////////////////////////////////////////////
+    // Accels edit by CPropertyPage
+    CAcceleratorManager tmpAccelManager;
+    tmpAccelManager = m_AccelManager;
+    CAccelMapPage page(&tmpAccelManager);
+    CPropertySheet sheet;
+    sheet.SetTitle( _T("Preferences") );
+    sheet.AddPage(&page);
+    if (sheet.DoModal() == IDOK) {
+        m_AccelManager = tmpAccelManager;
+        m_AccelManager.UpdateWndTable();
+    }
+    */
+}
+
+void CCryEditApp::OnOpenProjectManagerSettings()
+{
+    OpenProjectManager("UpdateProject");
+}
+
+void CCryEditApp::OnOpenProjectManagerNew()
+{
+    OpenProjectManager("CreateProject");
+}
+
+void CCryEditApp::OnOpenProjectManager()
+{
+    OpenProjectManager("Projects");
+}
+
+void CCryEditApp::OpenProjectManager(const AZStd::string& screen)
+{
+    // provide the current project path for in case we want to update the project
+    AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
+    const AZStd::string commandLineOptions = AZStd::string::format(" --screen %s --project-path %s", screen.c_str(), projectPath.c_str());
+    bool launchSuccess = AzFramework::ProjectManager::LaunchProjectManager(commandLineOptions);
+    if (!launchSuccess)
+    {
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QObject::tr("Failed to launch O3DE Project Manager"), QObject::tr("Failed to find or start the O3dE Project Manager"));
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUndo()
+{
+    //GetIEditor()->GetObjectManager()->UndoLastOp();
+    GetIEditor()->Undo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnRedo()
+{
+    GetIEditor()->Redo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateRedo(QAction* action)
+{
+    if (GetIEditor()->GetUndoManager()->IsHaveRedo())
+    {
+        action->setEnabled(true);
+    }
+    else
+    {
+        action->setEnabled(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateUndo(QAction* action)
+{
+    if (GetIEditor()->GetUndoManager()->IsHaveUndo())
+    {
+        action->setEnabled(true);
+    }
+    else
+    {
+        action->setEnabled(false);
+    }
+}
+
+/// Undo command to track entering and leaving Simulation Mode.
+class SimulationModeCommand
+    : public AzToolsFramework::UndoSystem::URSequencePoint
+{
+public:
+    AZ_CLASS_ALLOCATOR(SimulationModeCommand, AZ::SystemAllocator, 0);
+    AZ_RTTI(SimulationModeCommand, "{FB9FB958-5C56-47F6-B168-B5F564F70E69}");
+
+    SimulationModeCommand(const AZStd::string& friendlyName);
+
+    void Undo() override;
+    void Redo() override;
+
+    bool Changed() const override { return true; } // State will always have changed.
+
+private:
+    void UndoRedo()
+    {
+        if (ActionManager* actionManager = MainWindow::instance()->GetActionManager())
+        {
+            if (auto* action = actionManager->GetAction(ID_SWITCH_PHYSICS))
+            {
+                action->trigger();
+            }
+        }
+    }
+};
+
+SimulationModeCommand::SimulationModeCommand(const AZStd::string& friendlyName)
+    : URSequencePoint(friendlyName)
+{
+}
+
+void SimulationModeCommand::Undo()
+{
+    UndoRedo();
+}
+
+void SimulationModeCommand::Redo()
+{
+    UndoRedo();
+}
+
+namespace UndoRedo
+{
+    static bool IsHappening()
+    {
+        bool undoRedo = false;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            undoRedo, &AzToolsFramework::ToolsApplicationRequests::IsDuringUndoRedo);
+
+        return undoRedo;
+    }
+} // namespace UndoRedo
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnSwitchPhysics()
+{
+    if (GetIEditor()->GetGameEngine() && !GetIEditor()->GetGameEngine()->GetSimulationMode() && !GetIEditor()->GetGameEngine()->IsLevelLoaded())
+    {
+        // Don't allow physics to be toggled on if we haven't loaded a level yet
+        return;
+    }
+
+    QWaitCursor wait;
+
+    AZStd::unique_ptr<AzToolsFramework::ScopedUndoBatch> undoBatch;
+    if (!UndoRedo::IsHappening())
+    {
+        undoBatch = AZStd::make_unique<AzToolsFramework::ScopedUndoBatch>("Switching Physics Simulation");
+
+        auto simulationModeCommand = AZStd::make_unique<SimulationModeCommand>(AZStd::string("Switch Physics"));
+        // simulationModeCommand managed by undoBatch
+        simulationModeCommand->SetParent(undoBatch->GetUndoBatch());
+        simulationModeCommand.release();
+    }
+
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_SWITCH_START, 0, 0);
+
+    uint32 flags = GetIEditor()->GetDisplaySettings()->GetSettings();
+    if (flags & SETTINGS_PHYSICS)
+    {
+        flags &= ~SETTINGS_PHYSICS;
+    }
+    else
+    {
+        flags |= SETTINGS_PHYSICS;
+    }
+
+    GetIEditor()->GetDisplaySettings()->SetSettings(flags);
+
+    if ((flags & SETTINGS_PHYSICS) == 0)
+    {
+        GetIEditor()->GetGameEngine()->SetSimulationMode(false);
+        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_CHANGED, 0, 0);
+    }
+    else
+    {
+        GetIEditor()->GetGameEngine()->SetSimulationMode(true);
+        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_CHANGED, 1, 0);
+    }
+
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_SWITCH_END, 0, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnSwitchPhysicsUpdate(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+    action->setChecked(!m_bIsExportingLegacyData && GetIEditor()->GetGameEngine()->GetSimulationMode());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnSyncPlayer()
+{
+    GetIEditor()->GetGameEngine()->SyncPlayerPosition(!GetIEditor()->GetGameEngine()->IsSyncPlayerPosition());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnSyncPlayerUpdate(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+    action->setChecked(!GetIEditor()->GetGameEngine()->IsSyncPlayerPosition());
+}
+
+void CCryEditApp::OnUpdateNonGameMode(QAction* action)
+{
+    action->setEnabled(!GetIEditor()->IsInGameMode());
+}
+
+void CCryEditApp::OnUpdateNewLevel(QAction* action)
+{
+    action->setEnabled(!m_bIsExportingLegacyData);
+}
+
+void CCryEditApp::OnUpdatePlayGame(QAction* action)
+{
+    action->setEnabled(!m_bIsExportingLegacyData && GetIEditor()->IsLevelLoaded());
+}
+
+//////////////////////////////////////////////////////////////////////////
+CCryEditApp::ECreateLevelResult CCryEditApp::CreateLevel(const QString& levelName, QString& fullyQualifiedLevelName /* ={} */)
+{
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+    // If we are creating a new level and we're in simulate mode, then switch it off before we do anything else
+    if (GetIEditor()->GetGameEngine() && GetIEditor()->GetGameEngine()->GetSimulationMode())
+    {
+        // Preserve the modified flag, we don't want this switch of physics to change that flag
+        bool bIsDocModified = GetIEditor()->GetDocument()->IsModified();
+        OnSwitchPhysics();
+        GetIEditor()->GetDocument()->SetModifiedFlag(bIsDocModified);
+    }
+
+    const QScopedValueRollback<bool> rollback(m_creatingNewLevel);
+    m_creatingNewLevel = true;
+    GetIEditor()->Notify(eNotify_OnBeginCreate);
+    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorBeginCreate);
+
+    QString currentLevel = GetIEditor()->GetLevelFolder();
+    if (!currentLevel.isEmpty())
+    {
+        GetIEditor()->GetSystem()->GetIPak()->ClosePacks(currentLevel.toUtf8().data());
+    }
+
+    QString cryFileName = levelName.mid(levelName.lastIndexOf('/') + 1, levelName.length() - levelName.lastIndexOf('/') + 1);
+    QString levelPath = QStringLiteral("%1/Levels/%2/").arg(Path::GetEditingGameDataFolder().c_str(), levelName);
+    fullyQualifiedLevelName = levelPath + cryFileName + EditorUtils::LevelFile::GetDefaultFileExtension();
+
+    //_MAX_PATH includes null terminator, so we actually want to cap at _MAX_PATH-1
+    if (fullyQualifiedLevelName.length() >= _MAX_PATH-1)
+    {
+        GetIEditor()->Notify(eNotify_OnEndCreate);
+        return ECLR_MAX_PATH_EXCEEDED;
+    }
+
+    // Does the directory already exist ?
+    if (QFileInfo(levelPath).exists())
+    {
+        GetIEditor()->Notify(eNotify_OnEndCreate);
+        return ECLR_ALREADY_EXISTS;
+    }
+
+    // Create the directory
+    CLogFile::WriteLine("Creating level directory");
+    if (!CFileUtil::CreatePath(levelPath))
+    {
+        GetIEditor()->Notify(eNotify_OnEndCreate);
+        return ECLR_DIR_CREATION_FAILED;
+    }
+
+    if (GetIEditor()->GetDocument()->IsDocumentReady())
+    {
+        m_pDocManager->OnFileNew();
+    }
+
+    ICVar* sv_map = gEnv->pConsole->GetCVar("sv_map");
+    if (sv_map)
+    {
+        sv_map->Set(levelName.toUtf8().data());
+    }
+
+
+    GetIEditor()->GetDocument()->InitEmptyLevel(128, 1);
+
+    GetIEditor()->SetStatusText("Creating Level...");
+
+    // Save the document to this folder
+    GetIEditor()->GetDocument()->SetPathName(fullyQualifiedLevelName);
+    GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
+
+    if (usePrefabSystemForLevels)
+    {
+        auto* service = AZ::Interface<AzToolsFramework::PrefabEditorEntityOwnershipInterface>::Get();
+        if (service)
+        {
+            service->CreateNewLevelPrefab(fullyQualifiedLevelName.toUtf8().constData(), DefaultLevelTemplateName);
+        }
+    }
+
+    if (GetIEditor()->GetDocument()->Save())
+    {
+        if (!usePrefabSystemForLevels)
+        {
+            m_bIsExportingLegacyData = true;
+            CGameExporter gameExporter;
+            gameExporter.Export();
+            m_bIsExportingLegacyData = false;
+        }
+
+        GetIEditor()->GetGameEngine()->LoadLevel(true, true);
+        GetIEditor()->GetSystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_START, 0, 0);
+
+        GetIEditor()->GetSystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_END, 0, 0);
+    }
+
+    if (!usePrefabSystemForLevels)
+    {
+        // No terrain, but still need to export default octree and visarea data.
+        CGameExporter gameExporter;
+        gameExporter.Export(eExp_CoverSurfaces | eExp_SurfaceTexture, eLittleEndian, ".");
+    }
+
+    GetIEditor()->GetDocument()->CreateDefaultLevelAssets(128, 1);
+    GetIEditor()->GetDocument()->SetDocumentReady(true);
+    GetIEditor()->SetStatusText("Ready");
+
+    // At the end of the creating level process, add this level to the MRU list
+    CCryEditApp::instance()->AddToRecentFileList(fullyQualifiedLevelName);
+
+    GetIEditor()->Notify(eNotify_OnEndCreate);
+    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorEndCreate);
+    return ECLR_OK;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnCreateLevel()
+{
+    if (m_creatingNewLevel)
+    {
+        return;
+    }
+    bool wasCreateLevelOperationCancelled = false;
+    bool isNewLevelCreationSuccess = false;
+    // This will show the new level dialog until a valid input has been entered by the user or until the user click cancel
+    while (!isNewLevelCreationSuccess && !wasCreateLevelOperationCancelled)
+    {
+        wasCreateLevelOperationCancelled = false;
+        isNewLevelCreationSuccess = CreateLevel(wasCreateLevelOperationCancelled);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CCryEditApp::CreateLevel(bool& wasCreateLevelOperationCancelled)
+{
+    BOOL bIsDocModified = GetIEditor()->GetDocument()->IsModified();
+    if (GetIEditor()->GetDocument()->IsDocumentReady() && bIsDocModified)
+    {
+        QString str = QObject::tr("Level %1 has been changed. Save Level?").arg(GetIEditor()->GetGameEngine()->GetLevelName());
+        int result = QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Save Level"), str, QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+        if (QMessageBox::Yes == result)
+        {
+            if (!GetIEditor()->GetDocument()->DoFileSave())
+            {
+                // if the file save operation failed, assume that the user was informed of why
+                // already and treat it as a cancel
+                wasCreateLevelOperationCancelled = true;
+                return false;
+            }
+
+            bIsDocModified = false;
+        }
+        else if (QMessageBox::No == result)
+        {
+            // Set Modified flag to false to prevent show Save unchanged dialog again
+            GetIEditor()->GetDocument()->SetModifiedFlag(false);
+        }
+        else if (QMessageBox::Cancel == result)
+        {
+            wasCreateLevelOperationCancelled = true;
+            return false;
+        }
+    }
+
+    const char* temporaryLevelName = GetIEditor()->GetDocument()->GetTemporaryLevelName();
+
+    CNewLevelDialog dlg;
+    dlg.m_level = "";
+
+    if (dlg.exec() != QDialog::Accepted)
+    {
+        wasCreateLevelOperationCancelled = true;
+        GetIEditor()->GetDocument()->SetModifiedFlag(bIsDocModified);
+        return false;
+    }
+
+    if (!GetIEditor()->GetLevelIndependentFileMan()->PromptChangedFiles())
+    {
+        return false;
+    }
+
+    QString levelNameWithPath = dlg.GetLevel();
+    QString levelName = levelNameWithPath.mid(levelNameWithPath.lastIndexOf('/') + 1);
+
+    if (levelName == temporaryLevelName && GetIEditor()->GetLevelName() != temporaryLevelName)
+    {
+        GetIEditor()->GetDocument()->DeleteTemporaryLevel();
+    }
+
+    if (levelName.length() == 0 || !CryStringUtils::IsValidFileName(levelName.toUtf8().data()))
+    {
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Level name is invalid, please choose another name."));
+        return false;
+    }
+
+    //Verify that we are not using the temporary level name
+    if (QString::compare(levelName, temporaryLevelName) == 0)
+    {
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Please enter a level name that is different from the temporary name."));
+        return false;
+    }
+
+    // We're about to start creating a level, so start recording errors to display at the end.
+    GetIEditor()->StartLevelErrorReportRecording();
+
+    QString fullyQualifiedLevelName;
+    ECreateLevelResult result = CreateLevel(levelNameWithPath, fullyQualifiedLevelName);
+
+    if (result == ECLR_ALREADY_EXISTS)
+    {
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Level with this name already exists, please choose another name."));
+        return false;
+    }
+    else if (result == ECLR_DIR_CREATION_FAILED)
+    {
+        QString szLevelRoot = QStringLiteral("%1\\Levels\\%2").arg(Path::GetEditingGameDataFolder().c_str(), levelName);
+
+        QByteArray windowsErrorMessage(ERROR_LEN, 0);
+        QByteArray cwd(ERROR_LEN, 0);
+        DWORD dw = GetLastError();
+
+#ifdef WIN32
+        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+            NULL,
+            dw,
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+            windowsErrorMessage.data(),
+            windowsErrorMessage.length(), NULL);
+        _getcwd(cwd.data(), cwd.length());
+#else
+        windowsErrorMessage = strerror(dw);
+        cwd = QDir::currentPath().toUtf8();
+#endif
+
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Failed to create level directory: %1\n Error: %2\nCurrent Path: %3").arg(szLevelRoot, windowsErrorMessage, cwd));
+        return false;
+    }
+    else if (result == ECLR_MAX_PATH_EXCEEDED)
+    {
+        QFileInfo info(fullyQualifiedLevelName);
+        const AZStd::string rawProjectDirectory = Path::GetEditingGameDataFolder();
+        const QString projectDirectory = QDir::toNativeSeparators(QString::fromUtf8(rawProjectDirectory.data(), rawProjectDirectory.size()));
+        const QString elidedLevelName = QStringLiteral("%1...%2").arg(levelName.left(10)).arg(levelName.right(10));
+        const QString elidedLevelFileName = QStringLiteral("%1...%2").arg(info.fileName().left(10)).arg(info.fileName().right(10));
+        const QString message = QObject::tr(
+            "The fully-qualified path for the new level exceeds the maximum supported path length of %1 characters (it's %2 characters long). Please choose a smaller name.\n\n"
+            "The fully-qualified path is made up of the project folder (\"%3\", %4 characters), the \"Levels\" sub-folder, a folder named for the level (\"%5\", %6 characters) and the level file (\"%7\", %8 characters), plus necessary separators.\n\n"
+            "Please also note that on most platforms, individual components of the path (folder/file names can't exceed  approximately 255 characters)\n\n"
+            "Click \"Copy to Clipboard\" to copy the fully-qualified name and close this message.")
+            .arg(_MAX_PATH - 1).arg(fullyQualifiedLevelName.size())
+            .arg(projectDirectory).arg(projectDirectory.size())
+            .arg(elidedLevelName).arg(levelName.size())
+            .arg(elidedLevelFileName).arg(info.fileName().size());
+        QMessageBox messageBox(QMessageBox::Critical, QString(), message, QMessageBox::Ok, AzToolsFramework::GetActiveWindow());
+        QPushButton* copyButton = messageBox.addButton(QObject::tr("Copy to Clipboard"), QMessageBox::ActionRole);
+        QObject::connect(copyButton, &QPushButton::pressed, this, [fullyQualifiedLevelName]() { QGuiApplication::clipboard()->setText(fullyQualifiedLevelName); });
+        messageBox.exec();
+        return false;
+    }
+
+    // force the level being rendered at least once
+    m_bForceProcessIdle = true;
+
+    m_levelErrorsHaveBeenDisplayed = false;
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnCreateSlice()
+{
+    QMessageBox::warning(AzToolsFramework::GetActiveWindow(), "Not implemented", "New Slice is not yet implemented.");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnOpenLevel()
+{
+    CLevelFileDialog levelFileDialog(true);
+    levelFileDialog.show();
+    levelFileDialog.adjustSize();
+
+    if (levelFileDialog.exec() == QDialog::Accepted)
+    {
+        OpenDocumentFile(levelFileDialog.GetFileName().toUtf8().data());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnOpenSlice()
+{
+    QString fileName = QFileDialog::getOpenFileName(MainWindow::instance(),
+        tr("Open Slice"),
+        Path::GetEditingGameDataFolder().c_str(),
+        tr("Slice (*.slice)"));
+
+    if (!fileName.isEmpty())
+    {
+        OpenDocumentFile(fileName.toUtf8().data());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CCryEditDoc* CCryEditApp::OpenDocumentFile(LPCTSTR lpszFileName)
+{
+    if (m_openingLevel)
+    {
+        return GetIEditor()->GetDocument();
+    }
+
+    // If we are loading and we're in simulate mode, then switch it off before we do anything else
+    if (GetIEditor()->GetGameEngine() && GetIEditor()->GetGameEngine()->GetSimulationMode())
+    {
+        // Preserve the modified flag, we don't want this switch of physics to change that flag
+        bool bIsDocModified = GetIEditor()->GetDocument()->IsModified();
+        OnSwitchPhysics();
+        GetIEditor()->GetDocument()->SetModifiedFlag(bIsDocModified);
+    }
+
+    // We're about to start loading a level, so start recording errors to display at the end.
+    GetIEditor()->StartLevelErrorReportRecording();
+
+    const QScopedValueRollback<bool> rollback(m_openingLevel, true);
+
+    MainWindow::instance()->menuBar()->setEnabled(false);
+
+    CCryEditDoc* doc = nullptr;
+    bool bVisible = false;
+    bool bTriggerConsole = false;
+
+    doc = GetIEditor()->GetDocument();
+    bVisible = GetIEditor()->ShowConsole(true);
+    bTriggerConsole = true;
+
+    if (GetIEditor()->GetLevelIndependentFileMan()->PromptChangedFiles())
+    {
+        SandboxEditor::StartupTraceHandler openDocTraceHandler;
+        openDocTraceHandler.StartCollection();
+        if (m_bAutotestMode)
+        {
+            openDocTraceHandler.SetShowWindow(false);
+        }
+
+        // in this case, we set bAddToMRU to always be true because adding files to the MRU list
+        // automatically culls duplicate and normalizes paths anyway
+        m_pDocManager->OpenDocumentFile(lpszFileName, true);
+
+        if (openDocTraceHandler.HasAnyErrors())
+        {
+            doc->SetHasErrors();
+        }
+    }
+
+    if (bTriggerConsole)
+    {
+        GetIEditor()->ShowConsole(bVisible);
+    }
+    LoadTagLocations();
+
+    MainWindow::instance()->menuBar()->setEnabled(true);
+
+    if (doc->GetEditMode() == CCryEditDoc::DocumentEditingMode::SliceEdit)
+    {
+        // center camera on entities in slice
+        if (ActionManager* actionManager = MainWindow::instance()->GetActionManager())
+        {
+            GetIEditor()->GetUndoManager()->Suspend();
+            actionManager->GetAction(ID_EDIT_SELECTALL)->trigger();
+            actionManager->GetAction(ID_GOTO_SELECTED)->trigger();
+            GetIEditor()->GetUndoManager()->Resume();
+        }
+    }
+
+    m_levelErrorsHaveBeenDisplayed = false;
+
+    return doc; // the API wants a CDocument* to be returned. It seems not to be used, though, in our current state.
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnResourcesReduceworkingset()
+{
+#ifdef WIN32 // no such thing on macOS
+    SetProcessWorkingSetSize(GetCurrentProcess(), -1, -1);
+#endif
+}
+
+void CCryEditApp::OnUpdateWireframe(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+    int             nWireframe(R_SOLID_MODE);
+    ICVar*      r_wireframe(gEnv->pConsole->GetCVar("r_wireframe"));
+
+    if (r_wireframe)
+    {
+        nWireframe = r_wireframe->GetIVal();
+    }
+
+    action->setChecked(nWireframe == R_WIREFRAME_MODE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnViewConfigureLayout()
+{
+    if (GetIEditor()->IsInGameMode())
+    {
+        // you may not change your viewports while game mode is running.
+        CryLog("You may not change viewport configuration while in game mode.");
+        return;
+    }
+    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+    if (layout)
+    {
+        CLayoutConfigDialog dlg;
+        dlg.SetLayout(layout->GetLayout());
+        if (dlg.exec() == QDialog::Accepted)
+        {
+            // Will kill this Pane. so must be last line in this function.
+            layout->CreateLayout(dlg.GetLayout());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::TagLocation(int index)
+{
+    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+    if (!pRenderViewport)
+    {
+        return;
+    }
+
+    Vec3 vPosVec = pRenderViewport->GetViewTM().GetTranslation();
+
+    m_tagLocations[index - 1] = vPosVec;
+    m_tagAngles[index - 1] = Ang3::GetAnglesXYZ(Matrix33(pRenderViewport->GetViewTM()));
+
+    QString sTagConsoleText("");
+    sTagConsoleText = tr("Camera Tag Point %1 set to the position: x=%2, y=%3, z=%4 ").arg(index).arg(vPosVec.x, 0, 'f', 2).arg(vPosVec.y, 0, 'f', 2).arg(vPosVec.z, 0, 'f', 2);
+
+    GetIEditor()->WriteToConsole(sTagConsoleText.toUtf8().data());
+
+    if (gSettings.bAutoSaveTagPoints)
+    {
+        SaveTagLocations();
+    }
+}
+
+void CCryEditApp::SaveTagLocations()
+{
+    // Save to file.
+    QString filename = QFileInfo(GetIEditor()->GetDocument()->GetLevelPathName()).dir().absoluteFilePath("tags.txt");
+    QFile f(filename);
+    if (f.open(QFile::WriteOnly))
+    {
+        QTextStream stream(&f);
+        for (int i = 0; i < 12; i++)
+        {
+            stream <<
+                m_tagLocations[i].x << "," << m_tagLocations[i].y << "," <<  m_tagLocations[i].z << "," <<
+                m_tagAngles[i].x << "," << m_tagAngles[i].y << "," << m_tagAngles[i].z << Qt::endl;
+        }
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::GotoTagLocation(int index)
+{
+    QString sTagConsoleText("");
+    Vec3 pos = m_tagLocations[index - 1];
+
+    if (!IsVectorsEqual(m_tagLocations[index - 1], Vec3(0, 0, 0)))
+    {
+        // Change render viewport view TM to the stored one.
+        CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+        if (pRenderViewport)
+        {
+            Matrix34 tm = Matrix34::CreateRotationXYZ(m_tagAngles[index - 1]);
+            tm.SetTranslation(pos);
+            pRenderViewport->SetViewTM(tm);
+            Vec3 vPosVec(tm.GetTranslation());
+
+            GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_BEAM_PLAYER_TO_CAMERA_POS, (UINT_PTR)&tm, 0);
+
+            sTagConsoleText = tr("Moved Camera To Tag Point %1 (x=%2, y=%3, z=%4)").arg(index).arg(vPosVec.x, 0, 'f', 2).arg(vPosVec.y, 0, 'f', 2).arg(vPosVec.z, 0, 'f', 2);
+        }
+    }
+    else
+    {
+        sTagConsoleText = tr("Camera Tag Point %1 not set").arg(index);
+    }
+
+    if (!sTagConsoleText.isEmpty())
+    {
+        GetIEditor()->WriteToConsole(sTagConsoleText.toUtf8().data());
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::LoadTagLocations()
+{
+    QString filename = QFileInfo(GetIEditor()->GetDocument()->GetLevelPathName()).dir().absoluteFilePath("tags.txt");
+    // Load tag locations from file.
+
+    ZeroStruct(m_tagLocations);
+
+    QFile f(filename);
+    if (f.open(QFile::ReadOnly))
+    {
+        QTextStream stream(&f);
+        for (int i = 0; i < 12; i++)
+        {
+            QStringList line = stream.readLine().split(",");
+            float x = 0, y = 0, z = 0, ax = 0, ay = 0, az = 0;
+            if (line.count() == 6)
+            {
+                x = line[0].toFloat();
+                y = line[1].toFloat();
+                z = line[2].toFloat();
+                ax = line[3].toFloat();
+                ay = line[4].toFloat();
+                az = line[5].toFloat();
+            }
+
+            m_tagLocations[i] = Vec3(x, y, z);
+            m_tagAngles[i] = Ang3(ax, ay, az);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnToolsLogMemoryUsage()
+{
+    gEnv->pConsole->ExecuteString("SaveLevelStats");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnTagLocation1() { TagLocation(1); }
+void CCryEditApp::OnTagLocation2() { TagLocation(2); }
+void CCryEditApp::OnTagLocation3() { TagLocation(3); }
+void CCryEditApp::OnTagLocation4() { TagLocation(4); }
+void CCryEditApp::OnTagLocation5() { TagLocation(5); }
+void CCryEditApp::OnTagLocation6() { TagLocation(6); }
+void CCryEditApp::OnTagLocation7() { TagLocation(7); }
+void CCryEditApp::OnTagLocation8() { TagLocation(8); }
+void CCryEditApp::OnTagLocation9() { TagLocation(9); }
+void CCryEditApp::OnTagLocation10() { TagLocation(10); }
+void CCryEditApp::OnTagLocation11() { TagLocation(11); }
+void CCryEditApp::OnTagLocation12() { TagLocation(12); }
+
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnGotoLocation1() { GotoTagLocation(1); }
+void CCryEditApp::OnGotoLocation2() { GotoTagLocation(2); }
+void CCryEditApp::OnGotoLocation3() { GotoTagLocation(3); }
+void CCryEditApp::OnGotoLocation4() { GotoTagLocation(4); }
+void CCryEditApp::OnGotoLocation5() { GotoTagLocation(5); }
+void CCryEditApp::OnGotoLocation6() { GotoTagLocation(6); }
+void CCryEditApp::OnGotoLocation7() { GotoTagLocation(7); }
+void CCryEditApp::OnGotoLocation8() { GotoTagLocation(8); }
+void CCryEditApp::OnGotoLocation9() { GotoTagLocation(9); }
+void CCryEditApp::OnGotoLocation10() { GotoTagLocation(10); }
+void CCryEditApp::OnGotoLocation11() { GotoTagLocation(11); }
+void CCryEditApp::OnGotoLocation12() { GotoTagLocation(12); }
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnCustomizeKeyboard()
+{
+    MainWindow::instance()->OnCustomizeToolbar();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnToolsConfiguretools()
+{
+    ToolsConfigDialog dlg;
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        MainWindow::instance()->UpdateToolsMenu();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnToolsScriptHelp()
+{
+    AzToolsFramework::CScriptHelpDialog::GetInstance()->show();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnViewCycle2dviewport()
+{
+    GetIEditor()->GetViewManager()->Cycle2DViewport();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnDisplayGotoPosition()
+{
+    GotoPositionDialog dialog;
+    dialog.exec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnFileSavelevelresources()
+{
+    CGameResourcesExporter saver;
+    saver.GatherAllLoadedResources();
+    saver.ChooseDirectoryAndSave();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnClearRegistryData()
+{
+    if (QMessageBox::warning(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Clear all sandbox registry data ?"),
+        QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
+    {
+        QSettings settings;
+        settings.clear();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnValidatelevel()
+{
+    // TODO: Add your command handler code here
+    CLevelInfo levelInfo;
+    levelInfo.Validate();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnToolsPreferences()
+{
+    EditorPreferencesDialog dlg(MainWindow::instance());
+    dlg.exec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnGraphicsSettings()
+{
+    GraphicsSettingsDialog dlg(MainWindow::instance());
+    dlg.exec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnSwitchToDefaultCamera()
+{
+    CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
+    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
+    {
+        rvp->SetDefaultCamera();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateSwitchToDefaultCamera(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+    CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
+    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(pViewport))
+    {
+        action->setEnabled(true);
+        action->setChecked(rvp->IsDefaultCamera());
+    }
+    else
+    {
+        action->setEnabled(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnSwitchToSequenceCamera()
+{
+    CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
+    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
+    {
+        rvp->SetSequenceCamera();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateSwitchToSequenceCamera(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+
+    CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
+
+    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(pViewport))
+    {
+        bool enableAction = false;
+
+        // only enable if we're editing a sequence in Track View and have cameras in the level
+        if (GetIEditor()->GetAnimation()->GetSequence())
+        {
+
+            AZ::EBusAggregateResults<AZ::EntityId> componentCameras;
+            Camera::CameraBus::BroadcastResult(componentCameras, &Camera::CameraRequests::GetCameras);
+
+            const int numCameras = componentCameras.values.size();
+            enableAction = (numCameras > 0);
+        }
+
+        action->setEnabled(enableAction);
+        action->setChecked(rvp->IsSequenceCamera());
+    }
+    else
+    {
+        action->setEnabled(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnSwitchToSelectedcamera()
+{
+    CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
+    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
+    {
+        rvp->SetSelectedCamera();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateSwitchToSelectedCamera(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+    AzToolsFramework::EntityIdList selectedEntityList;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+    AZ::EBusAggregateResults<AZ::EntityId> cameras;
+    Camera::CameraBus::BroadcastResult(cameras, &Camera::CameraRequests::GetCameras);
+    bool isCameraComponentSelected = selectedEntityList.size() > 0 ? AZStd::find(cameras.values.begin(), cameras.values.end(), *selectedEntityList.begin()) != cameras.values.end() : false;
+
+    CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
+    CRenderViewport* rvp = viewport_cast<CRenderViewport*>(pViewport);
+    if (isCameraComponentSelected && rvp)
+    {
+        action->setEnabled(true);
+        action->setChecked(rvp->IsSelectedCamera());
+    }
+    else
+    {
+        action->setEnabled(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnSwitchcameraNext()
+{
+    CViewport* vp = GetIEditor()->GetActiveView();
+    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
+    {
+        rvp->CycleCamera();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnOpenAssetBrowserView()
+{
+    QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetBrowser);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnOpenTrackView()
+{
+    QtViewPaneManager::instance()->OpenPane(LyViewPane::TrackView);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnOpenAudioControlsEditor()
+{
+    QtViewPaneManager::instance()->OpenPane(LyViewPane::AudioControlsEditor);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnOpenUICanvasEditor()
+{
+    QtViewPaneManager::instance()->OpenPane(LyViewPane::UiEditor);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::SetGameSpecCheck(ESystemConfigSpec spec, ESystemConfigPlatform platform, int &nCheck, bool &enable)
+{
+    if (GetIEditor()->GetEditorConfigSpec() == spec && GetIEditor()->GetEditorConfigPlatform() == platform)
+    {
+        nCheck = 1;
+    }
+    enable = spec <= GetIEditor()->GetSystem()->GetMaxConfigSpec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnUpdateGameSpec(QAction* action)
+{
+    Q_ASSERT(action->isCheckable());
+    int nCheck = 0;
+    bool enable = true;
+    switch (action->data().toInt())
+    {
+    case ID_GAME_PC_ENABLELOWSPEC:
+        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_PC, nCheck, enable);
+        break;
+    case ID_GAME_PC_ENABLEMEDIUMSPEC:
+        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_PC, nCheck, enable);
+        break;
+    case ID_GAME_PC_ENABLEHIGHSPEC:
+        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_PC, nCheck, enable);
+        break;
+    case ID_GAME_PC_ENABLEVERYHIGHSPEC:
+        SetGameSpecCheck(CONFIG_VERYHIGH_SPEC, CONFIG_PC, nCheck, enable);
+        break;
+    case ID_GAME_OSXMETAL_ENABLELOWSPEC:
+        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_OSX_METAL, nCheck, enable);
+        break;
+    case ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC:
+        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_OSX_METAL, nCheck, enable);
+        break;
+    case ID_GAME_OSXMETAL_ENABLEHIGHSPEC:
+        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_OSX_METAL, nCheck, enable);
+        break;
+    case ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC:
+        SetGameSpecCheck(CONFIG_VERYHIGH_SPEC, CONFIG_OSX_METAL, nCheck, enable);
+        break;
+    case ID_GAME_ANDROID_ENABLELOWSPEC:
+        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_ANDROID, nCheck, enable);
+        break;
+    case ID_GAME_ANDROID_ENABLEMEDIUMSPEC:
+        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_ANDROID, nCheck, enable);
+        break;
+    case ID_GAME_ANDROID_ENABLEHIGHSPEC:
+        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_ANDROID, nCheck, enable);
+        break;
+    case ID_GAME_ANDROID_ENABLEVERYHIGHSPEC:
+        SetGameSpecCheck(CONFIG_VERYHIGH_SPEC, CONFIG_ANDROID, nCheck, enable);
+        break;
+    case ID_GAME_IOS_ENABLELOWSPEC:
+        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_IOS, nCheck, enable);
+        break;
+    case ID_GAME_IOS_ENABLEMEDIUMSPEC:
+        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_IOS, nCheck, enable);
+        break;
+    case ID_GAME_IOS_ENABLEHIGHSPEC:
+        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_IOS, nCheck, enable);
+        break;
+    case ID_GAME_IOS_ENABLEVERYHIGHSPEC:
+        SetGameSpecCheck(CONFIG_VERYHIGH_SPEC, CONFIG_IOS, nCheck, enable);
+        break;
+#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)\
+    case ID_GAME_##CODENAME##_ENABLELOWSPEC:\
+        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_##CODENAME, nCheck, enable);\
+        break;\
+    case ID_GAME_##CODENAME##_ENABLEMEDIUMSPEC:\
+        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_##CODENAME, nCheck, enable);\
+        break;\
+    case ID_GAME_##CODENAME##_ENABLEHIGHSPEC:\
+        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_##CODENAME, nCheck, enable);\
+        break;
+        AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
+#undef AZ_RESTRICTED_PLATFORM_EXPANSION
+#endif
+    }
+    action->setChecked(nCheck);
+    action->setEnabled(enable);
+}
+
+//////////////////////////////////////////////////////////////////////////
+RecentFileList* CCryEditApp::GetRecentFileList()
+{
+    static RecentFileList list;
+    return &list;
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::AddToRecentFileList(const QString& lpszPathName)
+{
+    // In later MFC implementations (WINVER >= 0x0601) files must exist before they can be added to the recent files list.
+    // Here we override the new CWinApp::AddToRecentFileList code with the old implementation to remove this requirement.
+
+    if (IsInAutotestMode())
+    {
+        // Never add to the recent file list when in auto test mode
+        // This would cause issues for devs running tests locally impacting their normal workflows/setups
+        return;
+    }
+
+
+    if (GetRecentFileList())
+    {
+        GetRecentFileList()->Add(lpszPathName);
+    }
+
+    // write the list immediately so it will be remembered even after a crash
+    if (GetRecentFileList())
+    {
+        GetRecentFileList()->WriteList();
+    }
+    else
+    {
+        CLogFile::WriteLine("ERROR: Recent File List is NULL!");
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CCryEditApp::IsInRegularEditorMode()
+{
+    return !IsInTestMode() && !IsInPreviewMode()
+           && !IsInExportMode() && !IsInConsoleMode() && !IsInLevelLoadTestMode() && !GetIEditor()->IsInMatEditMode();
+}
+
+void CCryEditApp::OnOpenQuickAccessBar()
+{
+    if (m_pQuickAccessBar == NULL)
+    {
+        return;
+    }
+
+    QRect geo = m_pQuickAccessBar->geometry();
+    geo.moveCenter(MainWindow::instance()->geometry().center());
+    m_pQuickAccessBar->setGeometry(geo);
+    m_pQuickAccessBar->setVisible(true);
+    m_pQuickAccessBar->setFocus();
+}
+
+void CCryEditApp::SetEditorWindowTitle(QString sTitleStr, QString sPreTitleStr, QString sPostTitleStr)
+{
+    if (MainWindow::instance() || m_pConsoleDialog)
+    {
+        if (sTitleStr.isEmpty())
+        {
+            sTitleStr = QObject::tr("O3DE Editor [Developer Preview]");
+        }
+
+        if (!sPreTitleStr.isEmpty())
+        {
+            sTitleStr.insert(sTitleStr.length(), QStringLiteral(" - %1").arg(sPreTitleStr));
+        }
+
+        if (!sPostTitleStr.isEmpty())
+        {
+            sTitleStr.insert(sTitleStr.length(), QStringLiteral(" - %1").arg(sPostTitleStr));
+        }
+
+        MainWindow::instance()->setWindowTitle(sTitleStr);
+        if (m_pConsoleDialog)
+        {
+            m_pConsoleDialog->setWindowTitle(sTitleStr);
+        }
+    }
+}
+
+bool CCryEditApp::Command_ExportToEngine()
+{
+    return CCryEditApp::instance()->UserExportToGame(true);
+}
+
+CMainFrame * CCryEditApp::GetMainFrame() const
+{
+    return MainWindow::instance()->GetOldMainFrame();
+}
+
+void CCryEditApp::StartProcessDetached(const char* process, const char* args)
+{
+    // Build the arguments as a QStringList
+    AZStd::vector<AZStd::string> tokens;
+
+    // separate the string based on spaces for paths like "-launch", "lua", "-files";
+    // also separate the string and keep spaces inside the folder path;
+    // Ex: C:\dev\Foundation\dev\Cache\AutomatedTesting\pc\automatedtesting\scripts\components\a a\empty.lua;
+    // Ex: C:\dev\Foundation\dev\Cache\AutomatedTesting\pc\automatedtesting\scripts\components\a a\'empty'.lua;
+    AZStd::string currentStr(args);
+    AZStd::size_t firstQuotePos = AZStd::string::npos;
+    AZStd::size_t secondQuotePos = 0;
+    AZStd::size_t pos = 0;
+
+    while (!currentStr.empty())
+    {
+        firstQuotePos = currentStr.find_first_of('\"');
+        pos = currentStr.find_first_of(" ");
+
+        if ((firstQuotePos != AZStd::string::npos) && (firstQuotePos < pos || pos == AZStd::string::npos))
+        {
+            secondQuotePos = currentStr.find_first_of('\"', firstQuotePos + 1);
+            if (secondQuotePos == AZStd::string::npos)
+            {
+                AZ_Warning("StartProcessDetached", false, "String tokenize failed, no matching \" found.");
+                return;
+            }
+
+            AZStd::string newElement(AZStd::string(currentStr.data() + (firstQuotePos + 1), (secondQuotePos - 1)));
+            tokens.push_back(newElement);
+
+            currentStr = currentStr.substr(secondQuotePos + 1);
+
+            firstQuotePos = AZStd::string::npos;
+            secondQuotePos = 0;
+            continue;
+        }
+        else
+        {
+            if (pos != AZStd::string::npos)
+            {
+                AZStd::string newElement(AZStd::string(currentStr.data() + 0, pos));
+                tokens.push_back(newElement);
+                currentStr = currentStr.substr(pos + 1);
+            }
+            else
+            {
+                tokens.push_back(AZStd::string(currentStr));
+                break;
+            }
+        }
+    }
+
+    QStringList argsList;
+    for (const auto& arg : tokens)
+    {
+        argsList.push_back(QString(arg.c_str()));
+    }
+
+    // Launch the process
+    [[maybe_unused]] bool startDetachedReturn = QProcess::startDetached(
+        process,
+        argsList,
+        QCoreApplication::applicationDirPath()
+    );
+    AZ_Warning("StartProcessDetached", startDetachedReturn, "Failed to start process:%s args:%s", process, args);
+}
+
+void CCryEditApp::OpenLUAEditor(const char* files)
+{
+    AZStd::string args = "-launch lua";
+    if (files && strlen(files) > 0)
+    {
+        AZStd::vector<AZStd::string> resolvedPaths;
+
+        AZStd::vector<AZStd::string> tokens;
+
+        AzFramework::StringFunc::Tokenize(files, tokens, '|');
+
+        for (const auto& file : tokens)
+        {
+            char resolved[AZ_MAX_PATH_LEN];
+
+            AZStd::string fullPath = Path::GamePathToFullPath(file.c_str()).toUtf8().data();
+            azstrncpy(resolved, AZ_MAX_PATH_LEN, fullPath.c_str(), fullPath.size());
+
+            if (AZ::IO::FileIOBase::GetInstance()->Exists(resolved))
+            {
+                AZStd::string current = '\"' + AZStd::string(resolved) + '\"';
+                AZStd::replace(current.begin(), current.end(), '\\', '/');
+                resolvedPaths.push_back(current);
+            }
+        }
+
+        if (!resolvedPaths.empty())
+        {
+            for (const auto& resolvedPath : resolvedPaths)
+            {
+                args.append(AZStd::string::format(" -files %s", resolvedPath.c_str()));
+            }
+        }
+    }
+
+    const char* engineRoot = nullptr;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
+    AZ_Assert(engineRoot != nullptr, "Unable to communicate to AzFramework::ApplicationRequests::Bus");
+
+    AZStd::string_view exePath;
+    AZ::ComponentApplicationBus::BroadcastResult(exePath, &AZ::ComponentApplicationRequests::GetExecutableFolder);
+
+    AZStd::string process = AZStd::string::format("\"%.*s" AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING "LuaIDE"
+#if defined(AZ_PLATFORM_WINDOWS)
+        ".exe"
+#endif
+        "\"", aznumeric_cast<int>(exePath.size()), exePath.data());
+
+    AZStd::string processArgs = AZStd::string::format("%s -engine-path \"%s\"", args.c_str(), engineRoot);
+    StartProcessDetached(process.c_str(), processArgs.c_str());
+}
+
+void CCryEditApp::PrintAlways(const AZStd::string& output)
+{
+    m_stdoutRedirection.WriteBypassingRedirect(output.c_str(), output.size());
+}
+
+QString CCryEditApp::GetRootEnginePath() const
+{
+    return m_rootEnginePath;
+}
+
+void CCryEditApp::RedirectStdoutToNull()
+{
+    m_stdoutRedirection.RedirectTo(AZ::IO::SystemFile::GetNullFilename());
+}
+
+void CCryEditApp::OnError(AzFramework::AssetSystem::AssetSystemErrors error)
+{
+    AZStd::string errorMessage = "";
+
+    switch (error)
+    {
+    case AzFramework::AssetSystem::ASSETSYSTEM_FAILED_TO_LAUNCH_ASSETPROCESSOR:
+        errorMessage = AZStd::string::format("Failed to start the Asset Processor.\r\nPlease make sure that AssetProcessor is available in the same folder the Editor is in.\r\n");
+        break;
+    case AzFramework::AssetSystem::ASSETSYSTEM_FAILED_TO_CONNECT_TO_ASSETPROCESSOR:
+        errorMessage = AZStd::string::format("Failed to connect to the Asset Processor.\r\nPlease make sure that AssetProcessor is available in the same folder the Editor is in and another copy is not already running somewhere else.\r\n");
+        break;
+    }
+
+    CryMessageBox(errorMessage.c_str(), "Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
+}
+
+void CCryEditApp::OnOpenProceduralMaterialEditor()
+{
+    QtViewPaneManager::instance()->OpenPane(LyViewPane::SubstanceEditor);
+}
+
+namespace Editor
+{
+    //! This function returns the build system target name
+    AZStd::string_view GetBuildTargetName()
+    {
+#if !defined (LY_CMAKE_TARGET)
+#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
+#endif
+        return AZStd::string_view{ LY_CMAKE_TARGET };
+    }
+}
+
+#if defined(AZ_PLATFORM_WINDOWS)
+//Due to some laptops not autoswitching to the discrete gpu correctly we are adding these
+//dllspecs as defined in the amd and nvidia white papers to 'force on' the use of the
+//discrete chips.  This will be overriden by users setting application profiles
+//and may not work on older drivers or bios. In theory this should be enough to always force on
+//the discrete chips.
+
+//http://developer.download.nvidia.com/devzone/devcenter/gamegraphics/files/OptimusRenderingPolicies.pdf
+//https://community.amd.com/thread/169965
+
+// It is unclear if this is also needed for linux or osx at this time(22/02/2017)
+extern "C"
+{
+    __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+    __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
+}
+#endif
+
+#ifdef Q_OS_WIN
+#pragma comment(lib, "Shell32.lib")
+#endif
+
+struct CryAllocatorsRAII
+{
+    CryAllocatorsRAII()
+    {
+        AZ_Assert(!AZ::AllocatorInstance<AZ::LegacyAllocator>::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
+        AZ_Assert(!AZ::AllocatorInstance<CryStringAllocator>::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
+
+        AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
+        AZ::AllocatorInstance<CryStringAllocator>::Create();
+    }
+
+    ~CryAllocatorsRAII()
+    {
+        AZ::AllocatorInstance<CryStringAllocator>::Destroy();
+        AZ::AllocatorInstance<AZ::LegacyAllocator>::Destroy();
+    }
+};
+
+
+extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
+{
+    CryAllocatorsRAII cryAllocatorsRAII;
+
+    // ensure the EditorEventsBus context gets created inside EditorLib
+    [[maybe_unused]] const auto& editorEventsContext = AzToolsFramework::EditorEvents::Bus::GetOrCreateContext();
+
+    // connect relevant buses to global settings
+    gSettings.Connect();
+
+    auto theApp = AZStd::make_unique<CCryEditApp>();
+    // this does some magic to set the current directory...
+    {
+        QCoreApplication app(argc, argv);
+        CCryEditApp::InitDirectory();
+    }
+
+    // Must be set before QApplication is initialized, so that we support HighDpi monitors, like the Retina displays
+    // on Windows 10
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+
+    // QtOpenGL attributes and surface format setup.
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
+    QSurfaceFormat format = QSurfaceFormat::defaultFormat();
+    format.setDepthBufferSize(24);
+    format.setStencilBufferSize(8);
+    format.setVersion(2, 1);
+    format.setProfile(QSurfaceFormat::CoreProfile);
+    format.setSamples(8);
+    format.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
+    format.setRenderableType(QSurfaceFormat::OpenGL);
+    format.setSwapInterval(0);
+#ifdef AZ_DEBUG_BUILD
+    format.setOption(QSurfaceFormat::DebugContext);
+#endif
+    QSurfaceFormat::setDefaultFormat(format);
+
+    Editor::EditorQtApplication::InstallQtLogHandler();
+
+    AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::SystemDpiAware);
+    Editor::EditorQtApplication app(argc, argv);
+
+    if (app.arguments().contains("-autotest_mode"))
+    {
+        // Nullroute all stdout to null for automated tests, this way we make sure
+        // that the test result output is not polluted with unrelated output data.
+        theApp->RedirectStdoutToNull();
+    }
+
+    // Hook the trace bus to catch errors, boot the AZ app after the QApplication is up
+    int ret = 0;
+
+    // open a scope to contain the AZToolsApp instance;
+    {
+        EditorInternal::EditorToolsApplication AZToolsApp(&argc, &argv);
+
+        {
+            CEditCommandLineInfo cmdInfo;
+            if (!cmdInfo.m_bAutotestMode && !cmdInfo.m_bConsoleMode && !cmdInfo.m_bExport && !cmdInfo.m_bExportTexture &&
+                !cmdInfo.m_bNullRenderer && !cmdInfo.m_bMatEditMode && !cmdInfo.m_bTest)
+            {
+                if (auto nativeUI = AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get(); nativeUI != nullptr)
+                {
+                    nativeUI->SetMode(AZ::NativeUI::Mode::ENABLED);
+                }
+            }
+        }
+
+        // The settings registry has been created by the AZ::ComponentApplication constructor at this point
+        AZ::SettingsRegistryInterface& registry = *AZ::SettingsRegistry::Get();
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
+            registry, Editor::GetBuildTargetName());
+
+        if (!AZToolsApp.Start())
+        {
+            return -1;
+        }
+
+        AzToolsFramework::EditorEvents::Bus::Broadcast(&AzToolsFramework::EditorEvents::NotifyQtApplicationAvailable, &app);
+
+    #if defined(AZ_PLATFORM_MAC)
+        // Native menu bars do not work on macOS due to all the tool dialogs
+        QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+    #endif
+
+        int exitCode = 0;
+
+        BOOL didCryEditStart = CCryEditApp::instance()->InitInstance();
+        AZ_Error("Editor", didCryEditStart, "O3DE Editor did not initialize correctly, and will close."
+            "\nThis could be because of incorrectly configured components, or missing required gems."
+            "\nSee other errors for more details.");
+
+        if (didCryEditStart)
+        {
+            app.EnableOnIdle();
+
+            ret = app.exec();
+        }
+        else
+        {
+            exitCode = 1;
+        }
+
+        CCryEditApp::instance()->ExitInstance(exitCode);
+
+    }
+
+    gSettings.Disconnect();
+
+    return ret;
+}
+
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env)
+{
+    AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(env));
+}
+
+extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule()
+{
+    AZ::Environment::Detach();
+}
+
+#include <moc_CryEdit.cpp>
diff --git a/Code/Editor/CryEdit.h b/Code/Editor/CryEdit.h
new file mode 100644
index 0000000000..0628289897
--- /dev/null
+++ b/Code/Editor/CryEdit.h
@@ -0,0 +1,522 @@
+/*
+ * 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_CRYEDIT_H
+#define CRYINCLUDE_EDITOR_CRYEDIT_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/Outcome/Outcome.h>
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include "WipFeatureManager.h"
+#include "CryEditDoc.h"
+#include "ViewPane.h"
+
+#include <QSettings>
+
+#endif
+
+class CCryDocManager;
+class CQuickAccessBar;
+class CCryEditDoc;
+class CEditCommandLineInfo;
+class CMainFrame;
+class CConsoleDialog;
+struct mg_connection;
+struct mg_request_info;
+struct mg_context;
+struct IEventLoopHook;
+class QAction;
+class MainWindow;
+class QSharedMemory;
+
+class SANDBOX_API RecentFileList
+{
+public:
+    RecentFileList();
+
+    void Remove(int index);
+    void Add(const QString& filename);
+
+    int GetSize();
+
+    void GetDisplayName(QString& name, int index, const QString& curDir);
+
+    QString& operator[](int index);
+
+    void ReadList();
+    void WriteList();
+
+    static const int Max = 12;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QStringList m_arrNames;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QSettings m_settings;
+};
+
+
+#define PROJECT_CONFIGURATOR_GEM_PAGE "Gems Settings"
+
+
+/**
+* Bus for controlling the application's idle processing (may include things like entity updates, ticks, viewport rendering, etc.).
+* This is sometimes necessary in special event-processing loops to prevent long (or infinite) processing time because Idle Processing
+* can perpetually generate more events.
+*/
+class EditorIdleProcessing : public AZ::EBusTraits
+{
+public:
+    using Bus = AZ::EBus<EditorIdleProcessing>;
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+
+    /// Disable the Editor's idle processing. EnableIdleProcessing() must be called exactly once when special processing is complete.
+    virtual void DisableIdleProcessing() {}
+
+    /// Re-enables Idle Processing. Must be called exactly one time for every call to DisableIdleProcessing().
+    virtual void EnableIdleProcessing() {}
+};
+
+using EditorIdleProcessingBus = AZ::EBus<EditorIdleProcessing>;
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+class SANDBOX_API CCryEditApp
+    : public QObject
+    , protected AzFramework::AssetSystemInfoBus::Handler
+    , protected EditorIdleProcessingBus::Handler
+{
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    friend MainWindow;
+    Q_OBJECT
+public:
+    enum ECreateLevelResult
+    {
+        ECLR_OK = 0,
+        ECLR_ALREADY_EXISTS,
+        ECLR_DIR_CREATION_FAILED,
+        ECLR_MAX_PATH_EXCEEDED
+    };
+
+
+    CCryEditApp();
+    ~CCryEditApp();
+
+    static CCryEditApp* instance();
+
+    bool GetRootEnginePath(QDir& rootEnginePath) const;
+    bool CreateLevel(bool& wasCreateLevelOperationCancelled);
+    void LoadFile(QString fileName);
+    void ForceNextIdleProcessing() { m_bForceProcessIdle = true; }
+    void KeepEditorActive(bool bActive) { m_bKeepEditorActive = bActive; };
+    bool IsInTestMode() const { return m_bTestMode; };
+    bool IsInPreviewMode() const { return m_bPreviewMode; };
+    bool IsInExportMode() const { return m_bExportMode; };
+    bool IsExportingLegacyData() const { return m_bIsExportingLegacyData; }
+    bool IsInConsoleMode() const { return m_bConsoleMode; };
+    bool IsInAutotestMode() const { return m_bAutotestMode; };
+    bool IsInLevelLoadTestMode() const { return m_bLevelLoadTestMode; }
+    bool IsInRegularEditorMode();
+    bool IsExiting() const { return m_bExiting; }
+    void EnableAccelerator(bool bEnable);
+    void SaveAutoBackup();
+    void SaveAutoRemind();
+    void ExportToGame(bool bNoMsgBox = true);
+    //! \param sTitleStr overwrites the default title of the Editor
+    void SetEditorWindowTitle(QString sTitleStr = QString(), QString sPreTitleStr = QString(), QString sPostTitleStr = QString());
+    RecentFileList* GetRecentFileList();
+    virtual void AddToRecentFileList(const QString& lpszPathName);
+    ECreateLevelResult CreateLevel(const QString& levelName, QString& fullyQualifiedLevelName);
+    static void InitDirectory();
+    BOOL FirstInstance(bool bForceNewInstance = false);
+    void InitFromCommandLine(CEditCommandLineInfo& cmdInfo);
+    BOOL CheckIfAlreadyRunning();
+    //! @return successful outcome if initialization succeeded. or failed outcome with error message.
+    AZ::Outcome<void, AZStd::string> InitGameSystem(HWND hwndForInputSystem);
+    void CreateSplashScreen();
+    void InitPlugins();
+    bool InitGame();
+
+    BOOL InitConsole();
+    int IdleProcessing(bool bBackground);
+    bool IsWindowInForeground();
+    void RunInitPythonScript(CEditCommandLineInfo& cmdInfo);
+    void RegisterEventLoopHook(IEventLoopHook* pHook);
+    void UnregisterEventLoopHook(IEventLoopHook* pHook);
+
+    void DisableIdleProcessing() override;
+    void EnableIdleProcessing() override;
+
+    // Print to stdout even if there out has been redirected
+    void PrintAlways(const AZStd::string& output);
+
+    //! Launches a detached process
+    //! \param process The path to the process to start
+    //! \param args Space separated list of arguments to pass to the process on start.
+    void StartProcessDetached(const char* process, const char* args);
+
+    //! Launches the Lua Editor/Debugger
+    //! \param files A space separated list of aliased paths
+    void OpenLUAEditor(const char* files);
+
+    QString GetRootEnginePath() const;
+    void RedirectStdoutToNull();
+    // Overrides
+    // ClassWizard generated virtual function overrides
+public:
+    virtual BOOL InitInstance();
+    virtual int ExitInstance(int exitCode = 0);
+    virtual BOOL OnIdle(LONG lCount);
+    virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszFileName);
+
+    CCryDocManager* GetDocManager() { return m_pDocManager; }
+
+    void RegisterActionHandlers();
+
+    // Implementation
+    void OnCreateLevel();
+    void OnOpenLevel();
+    void OnCreateSlice();
+    void OnOpenSlice();
+    void OnAppAbout();
+    void OnAppShowWelcomeScreen();
+    void OnUpdateShowWelcomeScreen(QAction* action);
+    void OnDocumentationTutorials();
+    void OnDocumentationGlossary();
+    void OnDocumentationO3DE();
+    void OnDocumentationGamelift();
+    void OnDocumentationReleaseNotes();
+    void OnDocumentationGameDevBlog();
+    void OnDocumentationForums();
+    void OnDocumentationAWSSupport();
+    void OnCommercePublish();
+    void OnCommerceMerch();
+    void SaveTagLocations();
+    void OnExportSelectedObjects();
+    void OnEditHold();
+    void OnEditFetch();
+    void OnFileExportToGameNoSurfaceTexture();
+    void OnViewSwitchToGame();
+    void OnViewDeploy();
+    void DeleteSelectedEntities(bool includeDescendants);
+    void OnMoveObject();
+    void OnRenameObj();
+    void OnEditmodeMove();
+    void OnEditmodeRotate();
+    void OnEditmodeScale();
+    void OnUpdateEditmodeMove(QAction* action);
+    void OnUpdateEditmodeRotate(QAction* action);
+    void OnUpdateEditmodeScale(QAction* action);
+    void OnUndo();
+    void OnOpenAssetImporter();
+    void OnUpdateSelected(QAction* action);
+    void OnEditLevelData();
+    void OnFileEditLogFile();
+    void OnFileResaveSlices();
+    void OnFileEditEditorini();
+    void OnPreferences();
+    void OnOpenProjectManagerSettings();
+    void OnOpenProjectManagerNew();
+    void OnOpenProjectManager();
+    void OnRedo();
+    void OnUpdateRedo(QAction* action);
+    void OnUpdateUndo(QAction* action);
+    void OnSwitchPhysics();
+    void OnSwitchPhysicsUpdate(QAction* action);
+    void OnSyncPlayer();
+    void OnSyncPlayerUpdate(QAction* action);
+    void OnResourcesReduceworkingset();
+    void OnDummyCommand() {};
+    void OnShowHelpers();
+    void OnFileSave();
+    void OnUpdateDocumentReady(QAction* action);
+    void OnUpdateFileOpen(QAction* action);
+    void OnUpdateNonGameMode(QAction* action);
+    void OnUpdateNewLevel(QAction* action);
+    void OnUpdatePlayGame(QAction* action);
+
+protected:
+    // ------- AzFramework::AssetSystemInfoBus::Handler ------
+    void OnError(AzFramework::AssetSystem::AssetSystemErrors error) override;
+    // -------------------------------------------
+
+private:
+    void InitLevel(const CEditCommandLineInfo& cmdInfo);
+
+    bool ConnectToAssetProcessor() const;
+    void CompileCriticalAssets() const;
+
+    CMainFrame* GetMainFrame() const;
+    void WriteConfig();
+    void TagLocation(int index);
+    void GotoTagLocation(int index);
+    void LoadTagLocations();
+    bool UserExportToGame(bool bNoMsgBox = true);
+    static void ShowSplashScreen(CCryEditApp* app);
+    static void CloseSplashScreen();
+    static void OutputStartupMessage(QString str);
+    bool ShowEnableDisableGemDialog(const QString& title, const QString& message);
+    QString ShowWelcomeDialog();
+
+    bool FixDanglingSharedMemory(const QString& sharedMemName) const;
+
+    //! Displays level load errors after a certain number of idle frames have been processed.
+    //! Due to the asyncrhonous nature of loading assets any errors that are reported by components
+    //! can happen after the level is loaded. This method will wait for a few idle updates and then
+    //! display the load errors to ensure all errors are displayed properly.
+    void DisplayLevelLoadErrors();
+
+    class CEditorImpl* m_pEditor = nullptr;
+    static CCryEditApp* s_currentInstance;
+    //! True if editor is in test mode.
+    //! Test mode is a special mode enabled when Editor ran with /test command line.
+    //! In this mode editor starts up, but exit immediately after all initialization.
+    bool m_bTestMode = false;
+    //! In this mode editor will load specified cry file, export t, and then close.
+    bool m_bExportMode = false;
+    QString m_exportFile;
+    //! This flag is set to true every time any of the "Export" commands is being executed.
+    //! Once exporting is finished the flag is set back to false.
+    //! UI events like "New Level" or "Open Level", should not be allowed while m_bIsExportingLegacyData==true.
+    //! Otherwise it could trigger crashes trying to export while exporting.
+    bool m_bIsExportingLegacyData = false;
+    //! If application exiting.
+    bool m_bExiting = false;
+    //! True if editor is in preview mode.
+    //! In this mode only very limited functionality is available and only for fast preview of models.
+    bool m_bPreviewMode = false;
+    // Only console window is created.
+    bool m_bConsoleMode = false;
+    // Skip showing the WelcomeScreenDialog
+    bool m_bSkipWelcomeScreenDialog = false;
+    // Level load test mode
+    bool m_bLevelLoadTestMode = false;
+    //! Current file in preview mode.
+    char m_sPreviewFile[_MAX_PATH];
+    //! True if "/runpythontest" was passed as a flag.
+    bool m_bRunPythonTestScript = false;
+    //! True if "/runpython" was passed as a flag.
+    bool m_bRunPythonScript = false;
+    //! File to run on startup
+    QString m_execFile;
+    //! Command to run on startup
+    QString m_execLineCmd;
+    //! Autotest mode: Special mode meant for automated testing, things like blocking dialogs or error report windows won't appear
+    bool m_bAutotestMode = false;
+
+    CConsoleDialog* m_pConsoleDialog = nullptr;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Vec3 m_tagLocations[12];
+    Ang3 m_tagAngles[12];
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    float m_fastRotateAngle = 45.0f;
+    float m_moveSpeedStep = 0.1f;
+
+    ULONG_PTR m_gdiplusToken;
+    QSharedMemory* m_mutexApplication = nullptr;
+    //! was the editor active in the previous frame ... needed to detect if the game lost focus and
+    //! dispatch proper SystemEvent (needed to release input keys)
+    bool m_bPrevActive = false;
+    // If this flag is set, the next OnIdle() will update, even if the app is in the background, and then
+    // this flag will be reset.
+    bool m_bForceProcessIdle = false;
+    // This is set while IdleProcessing is running to prevent re-entrancy
+    bool m_idleProcessingRunning = false;
+    // Keep the editor alive, even if no focus is set
+    bool m_bKeepEditorActive = false;
+    // Currently creating a new level
+    bool m_creatingNewLevel = false;
+    bool m_openingLevel = false;
+    bool m_savingLevel = false;
+    // Flag indicating if the errors for the currently loaded level have been displayed
+    bool m_levelErrorsHaveBeenDisplayed = false;
+    // Number of idle frames that have passed before displaying level errors
+    int m_numBeforeDisplayErrorFrames = 0;
+
+    QString m_lastOpenLevelPath;
+    CQuickAccessBar* m_pQuickAccessBar = nullptr;
+    IEventLoopHook* m_pEventLoopHook = nullptr;
+    QString m_rootEnginePath;
+
+    int m_disableIdleProcessingCounter = 0; //!< Counts requests to disable idle processing. When non-zero, idle processing will be disabled.
+
+    CCryDocManager* m_pDocManager = nullptr;
+
+// Disable warning for dll export since this member won't be used outside this class
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    AZ::IO::FileDescriptorRedirector m_stdoutRedirection = AZ::IO::FileDescriptorRedirector(1); // < 1 for STDOUT
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING 
+
+private:
+    static inline constexpr const char* DefaultLevelTemplateName = "Prefabs/Default_Level.prefab";
+
+    struct PythonOutputHandler;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    AZStd::shared_ptr<PythonOutputHandler> m_pythonOutputHandler;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    friend struct PythonTestOutputHandler;
+
+    void OpenProjectManager(const AZStd::string& screen);
+    void OnUpdateWireframe(QAction* action);
+    void OnViewConfigureLayout();
+
+    // Tag Locations.
+    void OnTagLocation1();
+    void OnTagLocation2();
+    void OnTagLocation3();
+    void OnTagLocation4();
+    void OnTagLocation5();
+    void OnTagLocation6();
+    void OnTagLocation7();
+    void OnTagLocation8();
+    void OnTagLocation9();
+    void OnTagLocation10();
+    void OnTagLocation11();
+    void OnTagLocation12();
+
+    void OnGotoLocation1();
+    void OnGotoLocation2();
+    void OnGotoLocation3();
+    void OnGotoLocation4();
+    void OnGotoLocation5();
+    void OnGotoLocation6();
+    void OnGotoLocation7();
+    void OnGotoLocation8();
+    void OnGotoLocation9();
+    void OnGotoLocation10();
+    void OnGotoLocation11();
+    void OnGotoLocation12();
+    void OnToolsLogMemoryUsage();
+    void OnCustomizeKeyboard();
+    void OnToolsConfiguretools();
+    void OnToolsScriptHelp();
+    void OnViewCycle2dviewport();
+    void OnDisplayGotoPosition();
+    void OnFileSavelevelresources();
+    void OnClearRegistryData();
+    void OnValidatelevel();
+    void OnToolsPreferences();
+    void OnGraphicsSettings();
+    void OnSwitchToDefaultCamera();
+    void OnUpdateSwitchToDefaultCamera(QAction* action);
+    void OnSwitchToSequenceCamera();
+    void OnUpdateSwitchToSequenceCamera(QAction* action);
+    void OnSwitchToSelectedcamera();
+    void OnUpdateSwitchToSelectedCamera(QAction* action);
+    void OnSwitchcameraNext();
+    void OnOpenProceduralMaterialEditor();
+    void OnOpenAssetBrowserView();
+    void OnOpenTrackView();
+    void OnOpenAudioControlsEditor();
+    void OnOpenUICanvasEditor();
+    void OnChangeGameSpec(UINT nID);
+    void SetGameSpecCheck(ESystemConfigSpec spec, ESystemConfigPlatform platform, int &nCheck, bool &enable);
+    void OnUpdateGameSpec(QAction* action);
+    void OnOpenQuickAccessBar();
+
+public:
+    void ExportLevel(bool bExportToGame, bool bExportTexture, bool bAutoExport);
+    static bool Command_ExportToEngine();
+
+    void OnFileExportOcclusionMesh();
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CCrySingleDocTemplate 
+    : public QObject
+{
+private:
+    explicit CCrySingleDocTemplate(const QMetaObject* pDocClass)
+        : QObject()
+        , m_documentClass(pDocClass)
+    {
+    }
+public:
+    enum Confidence
+    {
+        noAttempt,
+        maybeAttemptForeign,
+        maybeAttemptNative,
+        yesAttemptForeign,
+        yesAttemptNative,
+        yesAlreadyOpen
+    };
+
+    template<typename DOCUMENT>
+    static CCrySingleDocTemplate* create()
+    {
+        return new CCrySingleDocTemplate(&DOCUMENT::staticMetaObject);
+    }
+    ~CCrySingleDocTemplate() {};
+    // avoid creating another CMainFrame
+    // close other type docs before opening any things
+    virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszPathName, BOOL bAddToMRU, BOOL bMakeVisible);
+    virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszPathName, BOOL bMakeVisible = TRUE);
+    virtual Confidence MatchDocType(LPCTSTR lpszPathName, CCryEditDoc*& rpDocMatch);
+
+private:
+    const QMetaObject* m_documentClass = nullptr;
+};
+
+class CDocTemplate;
+class CCryDocManager
+{
+    CCrySingleDocTemplate* m_pDefTemplate = nullptr;
+public:
+    CCryDocManager();
+    CCrySingleDocTemplate* SetDefaultTemplate(CCrySingleDocTemplate* pNew);
+    // Copied from MFC to get rid of the silly ugly unoverridable doc-type pick dialog
+    virtual void OnFileNew();
+    virtual BOOL DoPromptFileName(QString& fileName, UINT nIDSTitle,
+        DWORD lFlags, BOOL bOpenFileDialog, CDocTemplate* pTemplate);
+    virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszFileName, BOOL bAddToMRU);
+
+    QVector<CCrySingleDocTemplate*> m_templateList;
+};
+
+#include <AzCore/Component/Component.h>
+
+namespace AzToolsFramework
+{
+    //! A component to reflect scriptable commands for the Editor
+    class CryEditPythonHandler final
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(CryEditPythonHandler, "{D4B19973-54D9-44BD-9E70-6069462A0CDC}")
+        virtual ~CryEditPythonHandler() = default;
+
+        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+
+        class CryEditHandler
+        {
+        public:
+            AZ_RTTI(CryEditHandler, "{6C1FD05A-2F39-4094-80D4-CA526676F13E}")
+            virtual ~CryEditHandler() = default;
+        };
+
+        class CryEditCheckoutHandler
+        {
+        public:
+            AZ_RTTI(CryEditCheckoutHandler, "{C65EF439-6754-4ACD-AEA2-196F2DBA0AF3}")
+            virtual ~CryEditCheckoutHandler() = default;
+        };
+    };
+
+} // namespace AzToolsFramework
+
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env);
+extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule();
+
+#endif // CRYINCLUDE_EDITOR_CRYEDIT_H
diff --git a/Code/Sandbox/Editor/CryEdit.rc b/Code/Editor/CryEdit.rc
similarity index 100%
rename from Code/Sandbox/Editor/CryEdit.rc
rename to Code/Editor/CryEdit.rc
diff --git a/Code/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp
new file mode 100644
index 0000000000..0072f4e010
--- /dev/null
+++ b/Code/Editor/CryEditDoc.cpp
@@ -0,0 +1,2274 @@
+/*
+ * 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 "CryEditDoc.h"
+
+// Qt
+#include <QDateTime>
+
+// AzCore
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/Asset/AssetManager.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Utils/Utils.h>
+
+// AzFramework
+#include <AzFramework/Archive/IArchive.h>
+#include <AzFramework/API/ApplicationAPI.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/Slice/SliceUtilities.h>
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <AzToolsFramework/UI/Layer/NameConflictWarning.hxx>
+#include <AzToolsFramework/API/EditorLevelNotificationBus.h>
+#include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
+
+// CryCommon
+#include <CryCommon/IAudioSystem.h>
+
+// Editor
+#include "Settings.h"
+
+#include "PluginManager.h"
+#include "ViewManager.h"
+#include "DisplaySettings.h"
+#include "GameEngine.h"
+
+#include "CryEdit.h"
+#include "ActionManager.h"
+#include "Include/IObjectManager.h"
+#include "ErrorReportDialog.h"
+#include "SurfaceTypeValidator.h"
+#include "Util/AutoLogTime.h"
+#include "CheckOutDialog.h"
+#include "GameExporter.h"
+#include "MainWindow.h"
+#include "LevelFileDialog.h"
+#include "StatObjBus.h"
+
+#include <Atom/RPI.Public/ViewportContext.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
+
+// LmbrCentral
+#include <LmbrCentral/Rendering/EditorLightComponentBus.h> // for LmbrCentral::EditorLightComponentRequestBus
+
+//#define PROFILE_LOADING_WITH_VTUNE
+
+// profilers api.
+//#include "pure.h"
+#ifdef PROFILE_LOADING_WITH_VTUNE
+#include "C:\Program Files\Intel\Vtune\Analyzer\Include\VTuneApi.h"
+#pragma comment(lib,"C:\\Program Files\\Intel\\Vtune\\Analyzer\\Lib\\VTuneApi.lib")
+#endif
+
+static const char* kAutoBackupFolder = "_autobackup";
+static const char* kHoldFolder = "$tmp_hold"; // conform to the ignored file types $tmp[0-9]*_ regex
+static const char* kSaveBackupFolder = "_savebackup";
+static const char* kResizeTempFolder = "$tmp_resize"; // conform to the ignored file types $tmp[0-9]*_ regex
+
+static const char* kBackupOrTempFolders[] =
+{
+    kAutoBackupFolder,
+    kHoldFolder,
+    kSaveBackupFolder,
+    kResizeTempFolder,
+    "_hold", // legacy name
+    "_tmpresize", // legacy name
+};
+
+static const char* kLevelPathForSliceEditing = "EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly";
+
+static bool IsSliceFile(const QString& filePath)
+{
+    return filePath.endsWith(AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str(), Qt::CaseInsensitive);
+}
+
+namespace Internal
+{
+    bool SaveLevel()
+    {
+        if (!GetIEditor()->GetDocument()->DoSave(GetIEditor()->GetDocument()->GetActivePathName(), TRUE))
+        {
+            return false;
+        }
+
+        return true;
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CCryEditDoc construction/destruction
+
+CCryEditDoc::CCryEditDoc()
+    : doc_validate_surface_types(0)
+    , m_modifiedModuleFlags(eModifiedNothing)
+    // It assumes loaded levels have already been exported. Can be a big fat lie, though.
+    // The right way would require us to save to the level folder the export status of the
+    // level.
+    , m_boLevelExported(true)
+    , m_modified(false)
+    , m_envProbeHeight(200.0f)
+    , m_envProbeSliceRelativePath("EngineAssets/Slices/DefaultLevelSetup.slice")
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Set member variables to initial values
+    ////////////////////////////////////////////////////////////////////////
+    m_bLoadFailed = false;
+    m_waterColor = QColor(0, 0, 255);
+
+    m_fogTemplate = GetIEditor()->FindTemplate("Fog");
+    m_environmentTemplate = GetIEditor()->FindTemplate("Environment");
+
+    if (m_environmentTemplate)
+    {
+        m_fogTemplate = m_environmentTemplate->findChild("Fog");
+    }
+    else
+    {
+        m_environmentTemplate = XmlHelpers::CreateXmlNode("Environment");
+    }
+
+    m_bDocumentReady = false;
+    GetIEditor()->SetDocument(this);
+    CLogFile::WriteLine("Document created");
+    RegisterConsoleVariables();
+
+    MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_FILE_SAVE_AS, this, &CCryEditDoc::OnFileSaveAs);
+}
+
+CCryEditDoc::~CCryEditDoc()
+{
+    GetIEditor()->SetDocument(nullptr);
+
+    CLogFile::WriteLine("Document destroyed");
+
+    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
+}
+
+bool CCryEditDoc::IsModified() const
+{
+    return m_modified;
+}
+
+void CCryEditDoc::SetModifiedFlag(bool modified)
+{
+    m_modified = modified;
+}
+
+QString CCryEditDoc::GetLevelPathName() const
+{
+    return m_pathName;
+}
+
+void CCryEditDoc::SetPathName(const QString& pathName)
+{
+    if (IsSliceFile(pathName))
+    {
+        m_pathName = kLevelPathForSliceEditing;
+        m_slicePathName = pathName;
+    }
+    else
+    {
+        m_pathName = pathName;
+        m_slicePathName.clear();
+    }
+    SetTitle(pathName.isEmpty() ? tr("Untitled") : PathUtil::GetFileName(pathName.toUtf8().data()).c_str());
+}
+
+QString CCryEditDoc::GetSlicePathName() const
+{
+    return m_slicePathName;
+}
+
+CCryEditDoc::DocumentEditingMode CCryEditDoc::GetEditMode() const
+{
+    return m_slicePathName.isEmpty() ? CCryEditDoc::DocumentEditingMode::LevelEdit : CCryEditDoc::DocumentEditingMode::SliceEdit;
+}
+
+QString CCryEditDoc::GetActivePathName() const
+{
+    return DocumentEditingMode() == CCryEditDoc::DocumentEditingMode::SliceEdit ? GetSlicePathName() : GetLevelPathName();
+}
+
+QString CCryEditDoc::GetTitle() const
+{
+    return m_title;
+}
+
+void CCryEditDoc::SetTitle(const QString& title)
+{
+    m_title = title;
+}
+
+bool CCryEditDoc::IsBackupOrTempLevelSubdirectory(const QString& folderName)
+{
+    for (const char* backupOrTempFolderName : kBackupOrTempFolders)
+    {
+        if (!folderName.compare(backupOrTempFolderName, Qt::CaseInsensitive))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool CCryEditDoc::DoSave(const QString& pathName, bool replace)
+{
+    if (!OnSaveDocument(pathName.isEmpty() ? GetActivePathName() : pathName))
+    {
+        return false;
+    }
+
+    if (replace)
+    {
+        SetPathName(pathName);
+    }
+
+    return true;
+}
+
+bool CCryEditDoc::Save()
+{
+    return OnSaveDocument(GetActivePathName());
+}
+
+void CCryEditDoc::DeleteContents()
+{
+    m_hasErrors = false;
+    SetDocumentReady(false);
+
+    GetIEditor()->Notify(eNotify_OnCloseScene);
+    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorCloseScene);
+
+    EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, ResetEditorContext);
+
+    // [LY-90904] move this to the EditorVegetationManager component
+    InstanceStatObjEventBus::Broadcast(&InstanceStatObjEventBus::Events::ReleaseData);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Clear all undo info.
+    //////////////////////////////////////////////////////////////////////////
+    GetIEditor()->FlushUndo();
+
+    // Notify listeners.
+    for (std::list<IDocListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        (*it)->OnCloseDocument();
+    }
+
+    GetIEditor()->ResetViews();
+
+    // Delete all objects from Object Manager.
+    GetIEditor()->GetObjectManager()->DeleteAllObjects();
+
+    // Load scripts data
+    SetModifiedFlag(FALSE);
+    SetModifiedModules(eModifiedNothing);
+    // Clear error reports if open.
+    CErrorReportDialog::Clear();
+
+    // Unload level specific audio binary data.
+    Audio::SAudioManagerRequestData<Audio::eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE> oAMData(Audio::eADS_LEVEL_SPECIFIC);
+    Audio::SAudioRequest oAudioRequestData;
+    oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING);
+    oAudioRequestData.pData = &oAMData;
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+    // Now unload level specific audio config data.
+    Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_CONTROLS_DATA> oAMData2(Audio::eADS_LEVEL_SPECIFIC);
+    oAudioRequestData.pData = &oAMData2;
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+    Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_PRELOADS_DATA> oAMData3(Audio::eADS_LEVEL_SPECIFIC);
+    oAudioRequestData.pData = &oAMData3;
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+    GetIEditor()->Notify(eNotify_OnSceneClosed);
+    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorSceneClosed);
+}
+
+
+void CCryEditDoc::Save(CXmlArchive& xmlAr)
+{
+    TDocMultiArchive arrXmlAr;
+    FillXmlArArray(arrXmlAr, &xmlAr);
+    Save(arrXmlAr);
+}
+
+void CCryEditDoc::Save(TDocMultiArchive& arrXmlAr)
+{
+    bool isPrefabEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    if (!isPrefabEnabled)
+    {
+        CAutoDocNotReady autoDocNotReady;
+
+        if (arrXmlAr[DMAS_GENERAL] != NULL)
+        {
+            (*arrXmlAr[DMAS_GENERAL]).root = XmlHelpers::CreateXmlNode("Level");
+            (*arrXmlAr[DMAS_GENERAL]).root->setAttr("WaterColor", m_waterColor);
+
+            char version[50];
+            GetIEditor()->GetFileVersion().ToString(version, AZ_ARRAY_SIZE(version));
+            (*arrXmlAr[DMAS_GENERAL]).root->setAttr("SandboxVersion", version);
+
+            SerializeViewSettings((*arrXmlAr[DMAS_GENERAL]));
+
+            // Fog settings  ///////////////////////////////////////////////////////
+            SerializeFogSettings((*arrXmlAr[DMAS_GENERAL]));
+
+            SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
+        }
+    }
+    AfterSave();
+}
+
+
+void CCryEditDoc::Load(CXmlArchive& xmlAr, const QString& szFilename)
+{
+    TDocMultiArchive arrXmlAr;
+    FillXmlArArray(arrXmlAr, &xmlAr);
+    CCryEditDoc::Load(arrXmlAr, szFilename);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
+{
+    bool isPrefabEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    m_hasErrors = false;
+
+    // Register a unique load event
+    QString fileName = Path::GetFileName(szFilename);
+    QString levelHash;
+    if (!isPrefabEnabled)
+    {
+        levelHash = GetIEditor()->GetSettingsManager()->GenerateContentHash(arrXmlAr[DMAS_GENERAL]->root, fileName);
+    }
+    else
+    {
+        levelHash = szFilename;
+    }
+    SEventLog loadEvent("Level_" + Path::GetFileName(fileName), "", levelHash);
+
+    // Register this level and its content hash as version
+    GetIEditor()->GetSettingsManager()->AddToolVersion(fileName, levelHash);
+    GetIEditor()->GetSettingsManager()->RegisterEvent(loadEvent);
+    LOADING_TIME_PROFILE_SECTION(gEnv->pSystem);
+    CAutoDocNotReady autoDocNotReady;
+
+    HEAP_CHECK
+
+    CLogFile::FormatLine("Loading from %s...", szFilename.toUtf8().data());
+    QString szLevelPath = Path::GetPath(szFilename);
+
+    {
+        // Set game g_levelname variable to the name of current level.
+        QString szGameLevelName = Path::GetFileName(szFilename);
+        ICVar* sv_map = gEnv->pConsole->GetCVar("sv_map");
+        if (sv_map)
+        {
+            sv_map->Set(szGameLevelName.toUtf8().data());
+        }
+    }
+
+    // Starts recording the opening of files using the level category
+    if (auto archive = AZ::Interface<AZ::IO::IArchive>::Get(); archive && archive->GetRecordFileOpenList() == AZ::IO::IArchive::RFOM_EngineStartup)
+    {
+        archive->RecordFileOpen(AZ::IO::IArchive::RFOM_Level);
+    }
+
+    GetIEditor()->Notify(eNotify_OnBeginSceneOpen);
+    GetIEditor()->GetMovieSystem()->RemoveAllSequences();
+
+    {
+        // Start recording errors
+        const ICVar* pShowErrorDialogOnLoad = gEnv->pConsole->GetCVar("ed_showErrorDialogOnLoad");
+        CErrorsRecorder errorsRecorder(pShowErrorDialogOnLoad && (pShowErrorDialogOnLoad->GetIVal() != 0));
+
+        bool usePrefabSystemForLevels = false;
+        AzFramework::ApplicationRequests::Bus::BroadcastResult(
+            usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+        if (!usePrefabSystemForLevels)
+        {
+            AZStd::string levelPakPath;
+            if (AzFramework::StringFunc::Path::ConstructFull(szLevelPath.toUtf8().data(), "level", "pak", levelPakPath, true))
+            {
+                // Check whether level.pak is present
+                if (!gEnv->pFileIO->Exists(levelPakPath.c_str()))
+                {
+                    CryWarning(
+                        VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING,
+                        "level.pak is missing.  This will cause other errors.  To fix this, re-export the level.");
+                }
+            }
+        }
+
+        int t0 = GetTickCount();
+
+#ifdef PROFILE_LOADING_WITH_VTUNE
+        VTResume();
+#endif
+        // Parse level specific config data.
+        const char* controlsPath = nullptr;
+        Audio::AudioSystemRequestBus::BroadcastResult(controlsPath, &Audio::AudioSystemRequestBus::Events::GetControlsPath);
+        QString sAudioLevelPath(controlsPath);
+        sAudioLevelPath += "levels/";
+        string const sLevelNameOnly = PathUtil::GetFileName(fileName.toUtf8().data());
+        sAudioLevelPath += sLevelNameOnly;
+        QByteArray path = sAudioLevelPath.toUtf8();
+        Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_CONTROLS_DATA> oAMData(path, Audio::eADS_LEVEL_SPECIFIC);
+        Audio::SAudioRequest oAudioRequestData;
+        oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING); // Needs to be blocking so data is available for next preloading request!
+        oAudioRequestData.pData = &oAMData;
+        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+        Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_PRELOADS_DATA> oAMData2(path, Audio::eADS_LEVEL_SPECIFIC);
+        oAudioRequestData.pData = &oAMData2;
+        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+        Audio::TAudioPreloadRequestID nPreloadRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID;
+        Audio::AudioSystemRequestBus::BroadcastResult(nPreloadRequestID, &Audio::AudioSystemRequestBus::Events::GetAudioPreloadRequestID, sLevelNameOnly.c_str());
+        if (nPreloadRequestID != INVALID_AUDIO_PRELOAD_REQUEST_ID)
+        {
+            Audio::SAudioManagerRequestData<Audio::eAMRT_PRELOAD_SINGLE_REQUEST> oAMData3(nPreloadRequestID);
+            oAudioRequestData.pData = &oAMData3;
+            Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+        }
+
+        {
+            CAutoLogTime logtime("Game Engine level load");
+            GetIEditor()->GetGameEngine()->LoadLevel(true, true);
+        }
+
+        if (!isPrefabEnabled)
+        {
+            //////////////////////////////////////////////////////////////////////////
+            // Load water color.
+            //////////////////////////////////////////////////////////////////////////
+                (*arrXmlAr[DMAS_GENERAL]).root->getAttr("WaterColor", m_waterColor);
+
+            //////////////////////////////////////////////////////////////////////////
+            // Load View Settings
+            //////////////////////////////////////////////////////////////////////////
+            SerializeViewSettings((*arrXmlAr[DMAS_GENERAL]));
+
+            //////////////////////////////////////////////////////////////////////////
+            // Fog settings
+            //////////////////////////////////////////////////////////////////////////
+            SerializeFogSettings((*arrXmlAr[DMAS_GENERAL]));
+        }
+
+        if (!isPrefabEnabled)
+        {
+            // Serialize Shader Cache.
+            CAutoLogTime logtime("Load Level Shader Cache");
+        }
+
+        {
+            // support old version of sequences
+            IMovieSystem* pMs = GetIEditor()->GetMovieSystem();
+
+            if (pMs)
+            {
+                for (int k = 0; k < pMs->GetNumSequences(); ++k)
+                {
+                    IAnimSequence* seq = pMs->GetSequence(k);
+                    QString fullname = seq->GetName();
+                    CBaseObject* pObj = GetIEditor()->GetObjectManager()->FindObject(fullname);
+
+                    if (!pObj)
+                    {
+                        pObj = GetIEditor()->GetObjectManager()->NewObject("SequenceObject", 0, fullname);
+                    }
+                }
+            }
+        }
+
+        if (!isPrefabEnabled)
+        {
+            // Name Selection groups
+            SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
+        }
+
+        {
+            CAutoLogTime logtime("Post Load");
+
+            // Notify listeners.
+            for (std::list<IDocListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+            {
+                (*it)->OnLoadDocument();
+            }
+        }
+
+        CSurfaceTypeValidator().Validate();
+
+#ifdef PROFILE_LOADING_WITH_VTUNE
+        VTPause();
+#endif
+
+        LogLoadTime(GetTickCount() - t0);
+        // Loaded with success, remove event from log file
+        GetIEditor()->GetSettingsManager()->UnregisterEvent(loadEvent);
+    }
+
+    GetIEditor()->Notify(eNotify_OnEndSceneOpen);
+}
+
+void CCryEditDoc::AfterSave()
+{
+    // When saving level also save editor settings
+    // Save settings
+    gSettings.Save();
+    GetIEditor()->GetDisplaySettings()->SaveRegistry();
+    MainWindow::instance()->SaveConfig();
+}
+
+void CCryEditDoc::SerializeViewSettings(CXmlArchive& xmlAr)
+{
+    // Load or restore the viewer settings from an XML
+    if (xmlAr.bLoading)
+    {
+        bool useOldViewFormat = false;
+        // Loading
+        CLogFile::WriteLine("Loading View settings...");
+
+        int numberOfGameViewports = GetIEditor()->GetViewManager()->GetNumberOfGameViewports();
+
+        for (int i = 0; i < numberOfGameViewports; i++)
+        {
+            XmlNodeRef view;
+            Vec3 vp(0.0f, 0.0f, 256.0f);
+            Ang3 va(ZERO);
+
+            auto viewName = QString("View%1").arg(i);
+            view = xmlAr.root->findChild(viewName.toUtf8().constData());
+
+            if (!view)
+            {
+                view = xmlAr.root->findChild("View");
+                if (view)
+                {
+                    useOldViewFormat = true;
+                }
+            }
+
+            if (view)
+            {
+                auto viewerPosName = QString("ViewerPos%1").arg(useOldViewFormat ? "" : QString::number(i));
+                view->getAttr(viewerPosName.toUtf8().constData(), vp);
+                auto viewerAnglesName = QString("ViewerAngles%1").arg(useOldViewFormat ? "" : QString::number(i));
+                view->getAttr(viewerAnglesName.toUtf8().constData(), va);
+            }
+
+            Matrix34 tm = Matrix34::CreateRotationXYZ(va);
+            tm.SetTranslation(vp);
+
+            auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
+            if (auto viewportContext = viewportContextManager->GetViewportContextById(i))
+            {
+                viewportContext->SetCameraTransform(LYTransformToAZTransform(tm));
+            }
+        }
+    }
+    else
+    {
+        // Storing
+        CLogFile::WriteLine("Storing View settings...");
+
+        int numberOfGameViewports = GetIEditor()->GetViewManager()->GetNumberOfGameViewports();
+
+        for (int i = 0; i < numberOfGameViewports; i++)
+        {
+            auto viewName = QString("View%1").arg(i);
+            XmlNodeRef view = xmlAr.root->newChild(viewName.toUtf8().constData());
+
+            CViewport* pVP = GetIEditor()->GetViewManager()->GetView(i);
+
+            if (pVP)
+            {
+                Vec3 pos = pVP->GetViewTM().GetTranslation();
+                Ang3 angles = Ang3::GetAnglesXYZ(Matrix33(pVP->GetViewTM()));
+                auto viewerPosName = QString("ViewerPos%1").arg(i);
+                view->setAttr(viewerPosName.toUtf8().constData(), pos);
+                auto viewerAnglesName = QString("ViewerAngles%1").arg(i);
+                view->setAttr(viewerAnglesName.toUtf8().constData(), angles);
+            }
+        }
+    }
+}
+
+void CCryEditDoc::SerializeFogSettings(CXmlArchive& xmlAr)
+{
+    if (xmlAr.bLoading)
+    {
+        CLogFile::WriteLine("Loading Fog settings...");
+
+        XmlNodeRef fog = xmlAr.root->findChild("Fog");
+
+        if (!fog)
+        {
+            return;
+        }
+
+        if (m_fogTemplate)
+        {
+            CXmlTemplate::GetValues(m_fogTemplate, fog);
+        }
+    }
+    else
+    {
+        CLogFile::WriteLine("Storing Fog settings...");
+
+        XmlNodeRef fog = xmlAr.root->newChild("Fog");
+
+        if (m_fogTemplate)
+        {
+            CXmlTemplate::SetValues(m_fogTemplate, fog);
+        }
+    }
+}
+
+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)
+    {
+        m_modifiedModuleFlags &= ~eModifiedModule;
+    }
+    else
+    {
+        if (eModifiedModule == eModifiedNothing)
+        {
+            m_modifiedModuleFlags = eModifiedNothing;
+        }
+        else
+        {
+            m_modifiedModuleFlags |= eModifiedModule;
+        }
+    }
+}
+
+int CCryEditDoc::GetModifiedModule()
+{
+    return m_modifiedModuleFlags;
+}
+
+BOOL CCryEditDoc::CanCloseFrame()
+{
+    // Ask the base class to ask for saving, which also includes the save
+    // status of the plugins. Additionaly we query if all the plugins can exit
+    // now. A reason for a failure might be that one of the plugins isn't
+    // currently processing data or has other unsaved information which
+    // are not serialized in the project file
+    if (!SaveModified())
+    {
+        return FALSE;
+    }
+
+    if (!GetIEditor()->GetPluginManager()->CanAllPluginsExitNow())
+    {
+        return FALSE;
+    }
+
+    // If there is an export in process, exiting will corrupt it
+    if (CGameExporter::GetCurrentExporter() != nullptr)
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+bool CCryEditDoc::SaveModified()
+{
+    if (!IsModified())
+    {
+        return true;
+    }
+
+    auto button = QMessageBox::question(AzToolsFramework::GetActiveWindow(), QString(), tr("Save changes to %1?").arg(GetTitle()), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+    switch (button)
+    {
+    case QMessageBox::Cancel:
+        return false;
+    case QMessageBox::Yes:
+        return DoFileSave();
+    case QMessageBox::No:
+        SetModifiedFlag(false);
+        return true;
+    }
+    Q_UNREACHABLE();
+}
+
+void CCryEditDoc::OnFileSaveAs()
+{
+    CLevelFileDialog levelFileDialog(false);
+    levelFileDialog.show();
+    levelFileDialog.adjustSize();
+
+    if (levelFileDialog.exec() == QDialog::Accepted)
+    {
+        if (OnSaveDocument(levelFileDialog.GetFileName()))
+        {
+            CCryEditApp::instance()->AddToRecentFileList(levelFileDialog.GetFileName());
+        }
+    }
+}
+
+bool CCryEditDoc::OnOpenDocument(const QString& lpszPathName)
+{
+    TOpenDocContext context;
+    if (!BeforeOpenDocument(lpszPathName, context))
+    {
+        return FALSE;
+    }
+    return DoOpenDocument(context);
+}
+
+bool CCryEditDoc::BeforeOpenDocument(const QString& lpszPathName, TOpenDocContext& context)
+{
+    CTimeValue loading_start_time = gEnv->pTimer->GetAsyncTime();
+
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+    if (!usePrefabSystemForLevels)
+    {
+        // ensure we close any open packs
+        if (!GetIEditor()->GetLevelFolder().isEmpty())
+        {
+            GetIEditor()->GetSystem()->GetIPak()->ClosePack((GetIEditor()->GetLevelFolder() + "\\level.pak").toUtf8().data());
+        }
+    }
+
+    // restore directory to root.
+    QDir::setCurrent(GetIEditor()->GetPrimaryCDFolder());
+
+    QString absolutePath = lpszPathName;
+    QFileInfo fileInfo(absolutePath);
+    QString friendlyDisplayName = Path::GetRelativePath(absolutePath, true);
+    CLogFile::FormatLine("Opening level %s", friendlyDisplayName.toUtf8().data());
+
+    // normalize the file path.
+    absolutePath = Path::ToUnixPath(QFileInfo(absolutePath).canonicalFilePath());
+    context.loading_start_time = loading_start_time;
+    if (IsSliceFile(absolutePath))
+    {
+        context.absoluteLevelPath = Path::GamePathToFullPath(kLevelPathForSliceEditing);
+        context.absoluteSlicePath = absolutePath;
+    }
+    else
+    {
+        context.absoluteLevelPath = absolutePath;
+        context.absoluteSlicePath = "";
+    }
+    return TRUE;
+}
+
+bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
+{
+    CTimeValue& loading_start_time = context.loading_start_time;
+
+    bool isPrefabEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    // normalize the path so that its the same in all following calls:
+    QString levelFilePath = QFileInfo(context.absoluteLevelPath).absoluteFilePath();
+    context.absoluteLevelPath = levelFilePath;
+
+    m_bLoadFailed = false;
+
+    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
+
+    QString levelFolderAbsolutePath = QFileInfo(context.absoluteLevelPath).absolutePath();
+
+
+    if (!isPrefabEnabled)
+    {
+        // if the level pack exists, open that, too:
+        QString levelPackFileAbsolutePath = QDir(levelFolderAbsolutePath).absoluteFilePath("level.pak");
+
+        // we mount the pack (level.pak) using the folder its sitting in as the mountpoint (first parameter)
+        pIPak->OpenPack(levelFolderAbsolutePath.toUtf8().constData(), levelPackFileAbsolutePath.toUtf8().constData());
+    }
+
+    TDocMultiArchive arrXmlAr = {};
+
+    if (!isPrefabEnabled)
+    {
+        if (!LoadXmlArchiveArray(arrXmlAr, levelFilePath, levelFolderAbsolutePath))
+        {
+            m_bLoadFailed = true;
+            return FALSE;
+        }
+    }
+    if (!LoadLevel(arrXmlAr, context.absoluteLevelPath))
+    {
+        m_bLoadFailed = true;
+    }
+
+    ReleaseXmlArchiveArray(arrXmlAr);
+
+    if (m_bLoadFailed)
+    {
+        return FALSE;
+    }
+
+    // Load AZ entities for the editor.
+    if (context.absoluteSlicePath.isEmpty())
+    {
+        if (!LoadEntitiesFromLevel(context.absoluteLevelPath))
+        {
+            m_bLoadFailed = true;
+        }
+    }
+    else
+    {
+        if (!LoadEntitiesFromSlice(context.absoluteSlicePath))
+        {
+            m_bLoadFailed = true;
+        }
+    }
+
+    if (m_bLoadFailed)
+    {
+        return FALSE;
+    }
+
+    StartStreamingLoad();
+
+    CTimeValue loading_end_time = gEnv->pTimer->GetAsyncTime();
+
+    CLogFile::FormatLine("-----------------------------------------------------------");
+    CLogFile::FormatLine("Successfully opened document %s", context.absoluteLevelPath.toUtf8().data());
+    CLogFile::FormatLine("Level loading time: %.2f seconds", (loading_end_time - loading_start_time).GetSeconds());
+    CLogFile::FormatLine("-----------------------------------------------------------");
+
+    // It assumes loaded levels have already been exported. Can be a big fat lie, though.
+    // The right way would require us to save to the level folder the export status of the
+    // level.
+    SetLevelExported(true);
+
+    return TRUE;
+}
+
+bool CCryEditDoc::OnNewDocument()
+{
+    DeleteContents();
+    m_pathName.clear();
+    m_slicePathName.clear();
+    SetModifiedFlag(false);
+    return true;
+}
+
+bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
+{
+    bool saveSuccess = false;
+    bool shouldSaveLevel = true;
+    if (gEnv->IsEditorSimulationMode())
+    {
+        // Don't allow saving in AI/Physics mode.
+        // Prompt the user to exit Simulation Mode (aka AI/Phyics mode) before saving.
+        QWidget* mainWindow = nullptr;
+        EBUS_EVENT_RESULT(mainWindow, AzToolsFramework::EditorRequests::Bus, GetMainWindow);
+
+        QMessageBox msgBox(mainWindow);
+        msgBox.setText(tr("You must exit AI/Physics mode before saving."));
+        msgBox.setInformativeText(tr("The level will not be saved."));
+        msgBox.setIcon(QMessageBox::Warning);
+        msgBox.exec();
+    }
+    else
+    {
+        if (m_hasErrors || m_bLoadFailed)
+        {
+            QWidget* mainWindow = nullptr;
+            AzToolsFramework::EditorRequests::Bus::BroadcastResult(
+                mainWindow,
+                &AzToolsFramework::EditorRequests::Bus::Events::GetMainWindow);
+
+            // Prompt the user that saving may result in data loss. Most of the time this is not desired
+            // (which is why 'cancel' is the default interaction), but this does provide users a way to still
+            // save their level if this is the only way they can solve the erroneous data.
+            QMessageBox msgBox(mainWindow);
+            msgBox.setText(tr("Your level loaded with errors, you may lose work if you save."));
+            msgBox.setInformativeText(tr("Do you want to save your changes?"));
+            msgBox.setIcon(QMessageBox::Warning);
+            msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Cancel);
+            msgBox.setDefaultButton(QMessageBox::Cancel);
+            int result = msgBox.exec();
+            switch (result)
+            {
+            case QMessageBox::Save:
+                // The user wishes to save, so don't bail.
+                break;
+            case QMessageBox::Cancel:
+                // The user is canceling the save operation, so stop any saving from occuring.
+                shouldSaveLevel = false;
+                break;
+            }
+        }
+
+        TSaveDocContext context;
+        if (shouldSaveLevel &&
+            BeforeSaveDocument(lpszPathName, context))
+        {
+            DoSaveDocument(lpszPathName, context);
+            saveSuccess = AfterSaveDocument(lpszPathName, context);
+        }
+    }
+
+    return saveSuccess;
+}
+
+bool CCryEditDoc::BeforeSaveDocument(const QString& lpszPathName, TSaveDocContext& context)
+{
+    // Don't save level data if any conflict exists
+    if (HasLayerNameConflicts())
+    {
+        return false;
+    }
+
+    // Restore directory to root.
+    QDir::setCurrent(GetIEditor()->GetPrimaryCDFolder());
+
+    // If we do not have a level loaded, we will also have an empty path, and that will
+    // cause problems later in the save process.  Early out here if that's the case
+    QString levelFriendlyName = QFileInfo(lpszPathName).fileName();
+    if (levelFriendlyName.isEmpty())
+    {
+        return false;
+    }
+
+    CryLog("Saving to %s...", levelFriendlyName.toUtf8().data());
+    GetIEditor()->Notify(eNotify_OnBeginSceneSave);
+
+    bool bSaved(true);
+
+    context.bSaved = bSaved;
+    return TRUE;
+}
+
+bool CCryEditDoc::HasLayerNameConflicts()
+{
+    AZStd::vector<AZ::Entity*> editorEntities;
+    AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
+        &AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
+        editorEntities);
+
+    AZStd::unordered_map<AZStd::string, int> nameConflictMapping;
+    for (AZ::Entity* entity : editorEntities)
+    {
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+            entity->GetId(),
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::UpdateLayerNameConflictMapping,
+            nameConflictMapping);
+    }
+
+    if (!nameConflictMapping.empty())
+    {
+        AzToolsFramework::Layers::NameConflictWarning* nameConflictWarning = new AzToolsFramework::Layers::NameConflictWarning(
+            MainWindow::instance(),
+            nameConflictMapping);
+        nameConflictWarning->exec();
+
+        return true;
+    }
+
+    return false;
+}
+
+bool CCryEditDoc::DoSaveDocument(const QString& filename, TSaveDocContext& context)
+{
+    bool& bSaved = context.bSaved;
+    if (bSaved)
+    {
+        // Paranoia - we shouldn't get this far into the save routine without a level loaded (empty levelPath)
+        // If nothing is loaded, we don't need to save anything
+        if (filename.isEmpty())
+        {
+            bSaved = false;
+        }
+        else
+        {
+            // Save Tag Point locations to file if auto save of tag points disabled
+            if (!gSettings.bAutoSaveTagPoints)
+            {
+                CCryEditApp::instance()->SaveTagLocations();
+            }
+
+            QString normalizedPath = Path::ToUnixPath(filename);
+            if (IsSliceFile(normalizedPath))
+            {
+                bSaved = SaveSlice(normalizedPath);
+            }
+            else
+            {
+                bSaved = SaveLevel(normalizedPath);
+            }
+
+            // Changes filename for this document.
+            SetPathName(normalizedPath);
+        }
+    }
+
+    return bSaved;
+}
+
+bool CCryEditDoc::AfterSaveDocument([[maybe_unused]] const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt)
+{
+    bool& bSaved = context.bSaved;
+
+    GetIEditor()->Notify(eNotify_OnEndSceneSave);
+
+    if (!bSaved)
+    {
+        if (bShowPrompt)
+        {
+            QMessageBox::warning(QApplication::activeWindow(), QString(), QObject::tr("Save Failed"), QMessageBox::Ok);
+        }
+        CLogFile::WriteLine("$4Document saving has failed.");
+    }
+    else
+    {
+        CLogFile::WriteLine("$3Document successfully saved");
+        SetModifiedFlag(FALSE);
+        SetModifiedModules(eModifiedNothing);
+        MainWindow::instance()->ResetAutoSaveTimers();
+    }
+
+    return bSaved;
+}
+
+
+static void GetUserSettingsFile(const QString& levelFolder, QString& userSettings)
+{
+    const char* pUserName = GetISystem()->GetUserName();
+    QString fileName;
+    fileName = QStringLiteral("%1_usersettings.editor_xml").arg(pUserName);
+    userSettings = Path::Make(levelFolder, fileName);
+}
+
+static bool TryRenameFile(const QString& oldPath, const QString& newPath, int retryAttempts=10)
+{
+    QFile(newPath).setPermissions(QFile::ReadOther | QFile::WriteOther);
+    QFile::remove(newPath);
+
+    // try a few times, something can lock the file (such as virus scanner, etc).
+    for (int attempts = 0; attempts < retryAttempts; ++attempts)
+    {
+        if (QFile::rename(oldPath, newPath))
+        {
+            return true;
+        }
+
+        AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(100));
+    }
+
+    return false;
+}
+
+bool CCryEditDoc::SaveLevel(const QString& filename)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    QWaitCursor wait;
+
+    CAutoCheckOutDialogEnableForAll enableForAll;
+
+    QString fullPathName = Path::ToUnixPath(filename);
+    QString originaLevelFilename = Path::GetFile(m_pathName);
+    if (QFileInfo(filename).isRelative())
+    {
+        // Resolving the path through resolvepath would normalize and lowcase it, and in this case, we don't want that.
+        fullPathName = Path::ToUnixPath(QDir(QString::fromUtf8(gEnv->pFileIO->GetAlias("@devassets@"))).absoluteFilePath(fullPathName));
+    }
+
+    if (!CFileUtil::OverwriteFile(fullPathName))
+    {
+        return false;
+    }
+
+    {
+
+        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel BackupBeforeSave");
+        BackupBeforeSave();
+    }
+
+    // need to copy existing level data before saving to different folder
+    const QString oldLevelFolder = Path::GetPath(GetLevelPathName()); // get just the folder name
+    QString newLevelFolder = Path::GetPath(fullPathName);
+
+    CFileUtil::CreateDirectory(newLevelFolder.toUtf8().data());
+    GetIEditor()->GetGameEngine()->SetLevelPath(newLevelFolder);
+
+    // QFileInfo operator== takes care of many side cases and will return true
+    // if the folder is the same folder, even if other things (like slashes, etc) are wrong
+    if (QFileInfo(oldLevelFolder) != QFileInfo(newLevelFolder))
+    {
+        // if we're saving to a new folder, we need to copy the old folder tree.
+        auto pIPak = GetIEditor()->GetSystem()->GetIPak();
+        pIPak->Lock();
+
+        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);
+        if (findHandle)
+        {
+            do
+            {
+                const QString sourceName{ QString::fromUtf8(findHandle.m_filename.data(), aznumeric_cast<int>(findHandle.m_filename.size())) };
+                if ((findHandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
+                {
+                    // we only end up here if sourceName is a folder name.
+                    bool skipDir = sourceName == "." || sourceName == "..";
+                    skipDir |= IsBackupOrTempLevelSubdirectory(sourceName);
+                    skipDir |= sourceName == "Layers"; // layers folder will be created and written out as part of saving
+                    if (!skipDir)
+                    {
+                        QString oldFolderName = QDir(oldLevelFolder).absoluteFilePath(sourceName);
+                        QString newFolderName = QDir(newLevelFolder).absoluteFilePath(sourceName);
+
+                        CFileUtil::CreateDirectory(newFolderName.toUtf8().data());
+                        CFileUtil::CopyTree(oldFolderName, newFolderName);
+                    }
+                    continue;
+                }
+
+                bool skipFile = sourceName.endsWith(".cry", Qt::CaseInsensitive) ||
+                                sourceName.endsWith(".ly", Qt::CaseInsensitive) ||
+                                sourceName == originaLevelFilename; // level file will be written out by saving, ignore the source one
+                if (skipFile)
+                {
+                    continue;
+                }
+
+                // close any paks in the source folder so that when the paks are re-opened there is
+                // no stale cached metadata in the pak system
+                if (sourceName.endsWith(".pak", Qt::CaseInsensitive))
+                {
+                    QString oldPackName = QDir(oldLevelFolder).absoluteFilePath(sourceName);
+                    pIPak->ClosePack(oldPackName.toUtf8().constData());
+                }
+
+                QString destName = sourceName;
+                // copy oldLevel.xml -> newLevel.xml
+                if (sourceName.compare(oldLevelXml, Qt::CaseInsensitive) == 0)
+                {
+                    destName = Path::ReplaceExtension(Path::GetFile(fullPathName), "xml");
+                }
+
+                QString oldFilePath = QDir(oldLevelFolder).absoluteFilePath(sourceName);
+                QString newFilePath = QDir(newLevelFolder).absoluteFilePath(sourceName);
+                CFileUtil::CopyFile(oldFilePath, newFilePath);
+            } while (findHandle = pIPak->FindNext(findHandle));
+            pIPak->FindClose(findHandle);
+        }
+
+        // ensure that copied files are not read-only
+        CFileUtil::ForEach(newLevelFolder, [](const QString& filePath)
+        {
+            QFile(filePath).setPermissions(QFile::ReadOther | QFile::WriteOther);
+        });
+
+        pIPak->Unlock();
+    }
+
+    // Save level to XML archive.
+    CXmlArchive xmlAr;
+    Save(xmlAr);
+
+    // temp files (to be ignored by AssetProcessor take the form $tmp[0-9]*_...).  we will conform
+    // to that to make this file invisible to AP until it has been written completely.
+    QString tempSaveFile = QDir(newLevelFolder).absoluteFilePath("$tmp_levelSave.tmp");
+    QFile(tempSaveFile).setPermissions(QFile::ReadOther | QFile::WriteOther);
+    QFile::remove(tempSaveFile);
+
+    // Save AZ entities to the editor level.
+
+    bool contentsAllSaved = false; // abort level save if anything within it fails
+
+    auto tempFilenameStrData = tempSaveFile.toStdString();
+    auto filenameStrData = fullPathName.toStdString();
+
+    bool isPrefabEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    if (!isPrefabEnabled)
+    {
+        AZStd::vector<char> entitySaveBuffer;
+        bool savedEntities = false;
+        CPakFile pakFile;
+
+        {
+            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Open PakFile");
+            if (!pakFile.Open(tempSaveFile.toUtf8().data(), false))
+            {
+                gEnv->pLog->LogWarning("Unable to open pack file %s for writing", tempSaveFile.toUtf8().data());
+                return false;
+            }
+        }
+
+
+        AZStd::vector<AZ::Entity*> editorEntities;
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
+            &AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
+            editorEntities);
+
+        AZStd::vector<AZ::Entity*> layerEntities;
+        AZ::SliceComponent::SliceReferenceToInstancePtrs instancesInLayers;
+        for (AZ::Entity* entity : editorEntities)
+        {
+            AzToolsFramework::Layers::LayerResult layerSaveResult(AzToolsFramework::Layers::LayerResult::CreateSuccess());
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+                layerSaveResult,
+                entity->GetId(),
+                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::WriteLayerAndGetEntities,
+                newLevelFolder,
+                layerEntities,
+                instancesInLayers);
+            layerSaveResult.MessageResult();
+        }
+
+        AZ::IO::ByteContainerStream<AZStd::vector<char>> entitySaveStream(&entitySaveBuffer);
+        {
+            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Save Entities To Stream");
+            EBUS_EVENT_RESULT(
+                savedEntities, AzToolsFramework::EditorEntityContextRequestBus, SaveToStreamForEditor, entitySaveStream, layerEntities,
+                instancesInLayers);
+        }
+
+        for (AZ::Entity* entity : editorEntities)
+        {
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+                entity->GetId(), &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::RestoreEditorData);
+        }
+
+        if (savedEntities)
+        {
+            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Updated PakFile levelEntities.editor_xml");
+            pakFile.UpdateFile("LevelEntities.editor_xml", entitySaveBuffer.begin(), entitySaveBuffer.size());
+
+            // Save XML archive to pak file.
+            bool bSaved = xmlAr.SaveToPak(Path::GetPath(tempSaveFile), pakFile);
+            if (bSaved)
+            {
+                contentsAllSaved = true;
+            }
+            else
+            {
+                gEnv->pLog->LogWarning("Unable to write the level data to file %s", tempSaveFile.toUtf8().data());
+            }
+        }
+        else
+        {
+            gEnv->pLog->LogWarning("Unable to generate entity data for level save %s", tempSaveFile.toUtf8().data());
+        }
+
+        pakFile.Close();
+    }
+    else
+    {
+        auto prefabEditorEntityOwnershipInterface = AZ::Interface<AzToolsFramework::PrefabEditorEntityOwnershipInterface>::Get();
+        if (prefabEditorEntityOwnershipInterface)
+        {
+            AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
+            AZ_Assert(fileIO, "No File IO implementation available");
+
+            AZ::IO::HandleType tempSaveFileHandle;
+            AZ::IO::Result openResult = fileIO->Open(tempFilenameStrData.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeBinary, tempSaveFileHandle);
+            contentsAllSaved = openResult;
+            if (openResult)
+            {
+                AZ::IO::FileIOStream stream(tempSaveFileHandle, AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeBinary, false);
+                contentsAllSaved = prefabEditorEntityOwnershipInterface->SaveToStream(stream, AZStd::string_view(filenameStrData.data(), filenameStrData.size()));
+                stream.Close();
+            }
+        }
+    }
+
+    if (!contentsAllSaved)
+    {
+        AZ_Error("Editor", false, "Error when writing level '%s' into tmpfile '%s'", filenameStrData.c_str(), tempFilenameStrData.c_str());
+        QFile::remove(tempSaveFile);
+        return false;
+    }
+
+    if (!TryRenameFile(tempSaveFile, fullPathName))
+    {
+        gEnv->pLog->LogWarning("Unable to move file %s to %s when saving", tempSaveFile.toUtf8().data(), fullPathName.toUtf8().data());
+        return false;
+    }
+
+    // Commit changes to the disk.
+    _flushall();
+
+    AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(&AzToolsFramework::ToolsApplicationEvents::OnSaveLevel);
+
+    return true;
+}
+
+bool CCryEditDoc::SaveSlice(const QString& filename)
+{
+    using namespace AzToolsFramework::SliceUtilities;
+
+    // Gather entities from live slice in memory
+    AZ::SliceComponent* liveSlice = nullptr;
+    AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(liveSlice,
+        &AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::GetEditorRootSlice);
+    if (!liveSlice)
+    {
+        gEnv->pLog->LogWarning("Slice data not found.");
+        return false;
+    }
+
+    AZStd::unordered_set<AZ::EntityId> liveEntityIds;
+    if (!liveSlice->GetEntityIds(liveEntityIds))
+    {
+        gEnv->pLog->LogWarning("Error getting entities from slice.");
+        return false;
+    }
+
+
+    // Prevent save when there are multiple root entities.
+    bool foundRootEntity = false;
+    for (AZ::EntityId entityId : liveEntityIds)
+    {
+        AZ::EntityId parentId;
+        AZ::TransformBus::EventResult(parentId, entityId, &AZ::TransformBus::Events::GetParentId);
+        if (!parentId.IsValid())
+        {
+            if (foundRootEntity)
+            {
+                gEnv->pLog->LogWarning("Cannot save a slice with multiple root entities.");
+                return false;
+            }
+
+            foundRootEntity = true;
+        }
+    }
+
+    // Find target slice asset, and check if it's the same asset we opened
+    AZ::Data::AssetId targetAssetId;
+    AZ::Data::AssetCatalogRequestBus::BroadcastResult(targetAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, filename.toUtf8().data(), azrtti_typeid<AZ::SliceAsset>(), false);
+
+    QString openedFilepath = Path::ToUnixPath(Path::GetRelativePath(m_slicePathName, true));
+    AZ::Data::AssetId openedAssetId;
+    AZ::Data::AssetCatalogRequestBus::BroadcastResult(openedAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, openedFilepath.toUtf8().data(), azrtti_typeid<AZ::SliceAsset>(), false);
+
+    if (!targetAssetId.IsValid() || openedAssetId != targetAssetId)
+    {
+        gEnv->pLog->LogWarning("Slice editor can only modify existing slices. 'New Slice' and 'Save As' are not currently supported.");
+        return false;
+    }
+
+    AZ::Data::Asset<AZ::SliceAsset> sliceAssetRef = AZ::Data::AssetManager::Instance().GetAsset<AZ::SliceAsset>(targetAssetId, AZ::Data::AssetLoadBehavior::Default);
+
+    sliceAssetRef.BlockUntilLoadComplete();
+
+    if (!sliceAssetRef)
+    {
+        gEnv->pLog->LogWarning("Error loading slice: %s", filename.toUtf8().data());
+        return false;
+    }
+
+    // Get entities from target slice asset.
+    AZ::SliceComponent* assetSlice = sliceAssetRef.Get()->GetComponent();
+    if (!assetSlice)
+    {
+        gEnv->pLog->LogWarning("Error reading slice: %s", filename.toUtf8().data());
+        return false;
+    }
+
+    AZStd::unordered_set<AZ::EntityId> assetEntityIds;
+    if (!assetSlice->GetEntityIds(assetEntityIds))
+    {
+        gEnv->pLog->LogWarning("Error getting entities from slice: %s", filename.toUtf8().data());
+        return false;
+    }
+
+    AZStd::unordered_set<AZ::EntityId> entityAdds;
+    AZStd::unordered_set<AZ::EntityId> entityUpdates;
+    AZStd::unordered_set<AZ::EntityId> entityRemovals = assetEntityIds;
+
+    for (AZ::EntityId liveEntityId : liveEntityIds)
+    {
+        entityRemovals.erase(liveEntityId);
+        if (assetEntityIds.find(liveEntityId) != assetEntityIds.end())
+        {
+            entityUpdates.insert(liveEntityId);
+        }
+        else
+        {
+            entityAdds.insert(liveEntityId);
+        }
+    }
+
+    // Make a transaction targeting the specified slice
+    SliceTransaction::TransactionPtr transaction = SliceTransaction::BeginSlicePush(sliceAssetRef);
+    if (!transaction)
+    {
+        gEnv->pLog->LogWarning("Unable to update slice: %s", filename.toUtf8().data());
+        return false;
+    }
+
+    // Tell the transaction about all adds/updates/removals
+    for (AZ::EntityId id : entityAdds)
+    {
+        SliceTransaction::Result result = transaction->AddEntity(id);
+        if (!result)
+        {
+            gEnv->pLog->LogWarning("Error adding entity with ID %s to slice: %s\n\n%s",
+                id.ToString().c_str(), filename.toUtf8().data(), result.GetError().c_str());
+            return false;
+        }
+    }
+
+    for (AZ::EntityId id : entityRemovals)
+    {
+        SliceTransaction::Result result = transaction->RemoveEntity(id);
+        if (!result)
+        {
+            gEnv->pLog->LogWarning("Error removing entity with ID %s from slice: %s\n\n%s",
+                id.ToString().c_str(), filename.toUtf8().data(), result.GetError().c_str());
+            return false;
+        }
+    }
+
+    for (AZ::EntityId id : entityUpdates)
+    {
+        SliceTransaction::Result result = transaction->UpdateEntity(id);
+        if (!result)
+        {
+            gEnv->pLog->LogWarning("Error updating entity with ID %s in slice: %s\n\n%s",
+                id.ToString().c_str(), filename.toUtf8().data(), result.GetError().c_str());
+            return false;
+        }
+    }
+
+    // Commit
+    SliceTransaction::Result commitResult = transaction->Commit(
+        targetAssetId,
+        SlicePreSaveCallbackForWorldEntities,
+        nullptr,
+        SliceTransaction::SliceCommitFlags::DisableUndoCapture);
+
+    if (!commitResult)
+    {
+        gEnv->pLog->LogWarning("Failed to to save slice \"%s\".\n\nError:\n%s",
+            filename.toUtf8().data(), commitResult.GetError().c_str());
+        return false;
+    }
+
+    return true;
+}
+
+bool CCryEditDoc::LoadEntitiesFromLevel(const QString& levelPakFile)
+{
+    bool isPrefabEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    bool loadedSuccessfully = false;
+
+    if (!isPrefabEnabled)
+    {
+        auto pakSystem = GetIEditor()->GetSystem()->GetIPak();
+        bool pakOpened = pakSystem->OpenPack(levelPakFile.toUtf8().data());
+        if (pakOpened)
+        {
+            const QString entityFilename = Path::GetPath(levelPakFile) + "LevelEntities.editor_xml";
+
+            CCryFile entitiesFile;
+            if (entitiesFile.Open(entityFilename.toUtf8().data(), "rt"))
+            {
+                AZStd::vector<char> fileBuffer;
+                fileBuffer.resize(entitiesFile.GetLength());
+                if (fileBuffer.size() > 0)
+                {
+                    if (fileBuffer.size() == entitiesFile.ReadRaw(fileBuffer.begin(), fileBuffer.size()))
+                    {
+                        AZ::IO::ByteContainerStream<AZStd::vector<char>> fileStream(&fileBuffer);
+
+                        EBUS_EVENT_RESULT(
+                            loadedSuccessfully, AzToolsFramework::EditorEntityContextRequestBus, LoadFromStreamWithLayers, fileStream,
+                            levelPakFile);
+                    }
+                    else
+                    {
+                        AZ_Error(
+                            "Editor", false, "Failed to load level entities because the file \"%s\" could not be read.",
+                            entityFilename.toUtf8().data());
+                    }
+                }
+                else
+                {
+                    AZ_Error(
+                        "Editor", false, "Failed to load level entities because the file \"%s\" is empty.", entityFilename.toUtf8().data());
+                }
+
+                entitiesFile.Close();
+            }
+            else
+            {
+                AZ_Error(
+                    "Editor", false, "Failed to load level entities because the file \"%s\" was not found.",
+                    entityFilename.toUtf8().data());
+            }
+
+            pakSystem->ClosePack(levelPakFile.toUtf8().data());
+        }
+    }
+    else
+    {
+        AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
+        AZ_Assert(fileIO, "No File IO implementation available");
+
+        AZ::IO::HandleType fileHandle;
+        AZ::IO::Result openResult = fileIO->Open(levelPakFile.toUtf8().data(), AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, fileHandle);
+        if (openResult)
+        {
+            AZ::IO::FileIOStream stream(fileHandle, AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, false);
+            AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
+                loadedSuccessfully, &AzToolsFramework::EditorEntityContextRequests::LoadFromStreamWithLayers, stream, levelPakFile);
+            stream.Close();
+        }
+    }
+
+    return loadedSuccessfully;
+}
+
+bool CCryEditDoc::LoadEntitiesFromSlice(const QString& sliceFile)
+{
+    bool sliceLoaded = false;
+    {
+        AZ::IO::FileIOStream sliceFileStream(sliceFile.toUtf8().data(), AZ::IO::OpenMode::ModeRead);
+        if (!sliceFileStream.IsOpen())
+        {
+            AZ_Error("Editor", false, "Failed to load entities because the file \"%s\" could not be read.", sliceFile.toUtf8().data());
+            return false;
+        }
+
+        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(sliceLoaded, &AzToolsFramework::EditorEntityContextRequestBus::Events::LoadFromStream, sliceFileStream);
+    }
+
+    if (!sliceLoaded)
+    {
+        AZ_Error("Editor", false, "Failed to load entities from slice file \"%s\"", sliceFile.toUtf8().data());
+        return false;
+    }
+
+    return true;
+}
+
+bool CCryEditDoc::LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteCryFilePath)
+{
+    bool isPrefabEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
+
+    QString folderPath = QFileInfo(absoluteCryFilePath).absolutePath();
+
+    OnStartLevelResourceList();
+
+    // Load next level resource list.
+    if (!isPrefabEnabled)
+    {
+        pIPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Load(Path::Make(folderPath, "resourcelist.txt").toUtf8().data());
+    }
+
+    GetIEditor()->Notify(eNotify_OnBeginLoad);
+    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorBeginLoad);
+    //GetISystem()->GetISystemEventDispatcher()->OnSystemEvent( ESYSTEM_EVENT_LEVEL_LOAD_START,0,0 );
+    DeleteContents();
+
+    // Set level path directly *after* DeleteContents(), since that will unload the previous level and clear the level path.
+    GetIEditor()->GetGameEngine()->SetLevelPath(folderPath);
+
+    SetModifiedFlag(TRUE);  // dirty during de-serialize
+    SetModifiedModules(eModifiedAll);
+    Load(arrXmlAr, absoluteCryFilePath);
+
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
+    // We don't need next level resource list anymore.
+    if (!isPrefabEnabled)
+    {
+        pIPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Clear();
+    }
+    SetModifiedFlag(FALSE); // start off with unmodified
+    SetModifiedModules(eModifiedNothing);
+    SetDocumentReady(true);
+    GetIEditor()->Notify(eNotify_OnEndLoad);
+    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorEndLoad);
+
+    GetIEditor()->SetStatusText("Ready");
+
+    return true;
+}
+
+void CCryEditDoc::Hold(const QString& holdName)
+{
+    Hold(holdName, holdName);
+}
+
+void CCryEditDoc::Hold(const QString& holdName, const QString& relativeHoldPath)
+{
+    if (!IsDocumentReady() || GetEditMode() == CCryEditDoc::DocumentEditingMode::SliceEdit)
+    {
+        return;
+    }
+
+    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
+    char resolvedLevelPath[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(levelPath.toUtf8().data(), resolvedLevelPath, AZ_MAX_PATH_LEN);
+
+    QString holdPath = QString::fromUtf8(resolvedLevelPath) + "/" + relativeHoldPath + "/";
+    QString holdFilename = holdPath + holdName + GetIEditor()->GetGameEngine()->GetLevelExtension();
+
+    // never auto-backup while we're trying to hold.
+    bool oldBackup = gSettings.bBackupOnSave;
+    gSettings.bBackupOnSave = false;
+    SaveLevel(holdFilename);
+    gSettings.bBackupOnSave = oldBackup;
+
+    GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
+}
+
+void CCryEditDoc::Fetch(const QString& relativeHoldPath, bool bShowMessages, bool bDelHoldFolder)
+{
+    Fetch(relativeHoldPath, relativeHoldPath, bShowMessages, bDelHoldFolder ? FetchPolicy::DELETE_FOLDER : FetchPolicy::PRESERVE);
+}
+
+void CCryEditDoc::Fetch(const QString& holdName, const QString& relativeHoldPath, bool bShowMessages, FetchPolicy policy)
+{
+    if (!IsDocumentReady() || GetEditMode() == CCryEditDoc::DocumentEditingMode::SliceEdit)
+    {
+        return;
+    }
+
+    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
+    char resolvedLevelPath[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(levelPath.toUtf8().data(), resolvedLevelPath, AZ_MAX_PATH_LEN);
+
+    QString holdPath = QString::fromUtf8(resolvedLevelPath) + "/" + relativeHoldPath + "/";
+    QString holdFilename = holdPath + holdName + GetIEditor()->GetGameEngine()->GetLevelExtension();
+
+    {
+        QFile cFile(holdFilename);
+        // Open the file for writing, create it if needed
+        if (!cFile.open(QFile::ReadOnly))
+        {
+            if (bShowMessages)
+            {
+                QMessageBox::information(QApplication::activeWindow(), QString(), QObject::tr("You have to use 'Hold' before you can fetch!"));
+            }
+            return;
+        }
+    }
+
+    // Does the document contain unsaved data ?
+    if (bShowMessages && IsModified() &&
+        QMessageBox::question(QApplication::activeWindow(), QString(), QObject::tr("The document contains unsaved data, it will be lost if fetched.\r\nReally fetch old state?")) != QMessageBox::Yes)
+    {
+        return;
+    }
+
+    GetIEditor()->FlushUndo();
+
+    TDocMultiArchive arrXmlAr = {};
+    if (!LoadXmlArchiveArray(arrXmlAr, holdFilename, holdPath))
+    {
+        QMessageBox::critical(QApplication::activeWindow(), "Error", "The temporary 'Hold' level failed to load successfully.  Your level might be corrupted, you should restart the Editor.", QMessageBox::Ok);
+        AZ_Error("EditDoc", false, "Fetch failed to load the Xml Archive");
+        return;
+    }
+
+    // Load the state
+    LoadLevel(arrXmlAr, holdFilename);
+
+    // Load AZ entities for the editor.
+    LoadEntitiesFromLevel(holdFilename);
+
+    GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
+
+    GetIEditor()->FlushUndo();
+
+    switch (policy)
+    {
+    case FetchPolicy::DELETE_FOLDER:
+        CFileUtil::Deltree(holdPath.toUtf8().data(), true);
+        break;
+
+    case FetchPolicy::DELETE_LY_FILE:
+        CFileUtil::DeleteFile(holdFilename);
+        break;
+
+    default:
+        break;
+    }
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+namespace {
+    struct SFolderTime
+    {
+        QString folder;
+        time_t creationTime;
+    };
+
+    bool SortByCreationTime(SFolderTime& a, SFolderTime& b)
+    {
+        return a.creationTime < b.creationTime;
+    }
+
+    // This function, given a source folder to scan, returns all folders within that folder
+    // non-recursively.  They will be sorted by time, with most recent first, and oldest last.
+    void CollectAllFoldersByTime(const char* sourceFolder, std::vector<SFolderTime>& outputFolders)
+    {
+        QString folderMask(sourceFolder);
+        AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst((folderMask + "/*").toUtf8().data());
+        if (handle)
+        {
+            do
+            {
+                if (handle.m_filename.front() == '.')
+                {
+                    continue;
+                }
+
+                if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
+                {
+                    SFolderTime ft;
+                    ft.folder = QString::fromUtf8(handle.m_filename.data(), aznumeric_cast<int>(handle.m_filename.size()));
+                    ft.creationTime = handle.m_fileDesc.tCreate;
+                    outputFolders.push_back(ft);
+                }
+            } while (handle = gEnv->pCryPak->FindNext(handle));
+
+            gEnv->pCryPak->FindClose(handle);
+        }
+        std::sort(outputFolders.begin(), outputFolders.end(), SortByCreationTime);
+    }
+}
+
+bool CCryEditDoc::BackupBeforeSave(bool force)
+{
+    // This function will copy the contents of an entire level folder to a backup folder
+    // and delete older ones based on user preferences.
+    if (!force && !gSettings.bBackupOnSave)
+    {
+        return true; // not an error
+    }
+
+    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
+    if (levelPath.isEmpty())
+    {
+        return false;
+    }
+
+    char resolvedLevelPath[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(levelPath.toUtf8().data(), resolvedLevelPath, AZ_MAX_PATH_LEN);
+    QWaitCursor wait;
+
+    QString saveBackupPath = QString::fromUtf8(resolvedLevelPath) + "/" + kSaveBackupFolder;
+
+    std::vector<SFolderTime> folders;
+    CollectAllFoldersByTime(saveBackupPath.toUtf8().data(), folders);
+
+    for (int i = int(folders.size()) - gSettings.backupOnSaveMaxCount; i >= 0; --i)
+    {
+        CFileUtil::Deltree(QStringLiteral("%1/%2/").arg(saveBackupPath, folders[i].folder).toUtf8().data(), true);
+    }
+
+    QDateTime theTime = QDateTime::currentDateTime();
+    QString subFolder = theTime.toString("yyyy-MM-dd [HH.mm.ss]");
+
+    QString levelName = GetIEditor()->GetGameEngine()->GetLevelName();
+    QString backupPath = saveBackupPath + "/" + subFolder + "/";
+    gEnv->pCryPak->MakeDir(backupPath.toUtf8().data());
+
+    QString sourcePath = QString::fromUtf8(resolvedLevelPath) + "/";
+
+    QString ignoredFiles;
+
+    for (const char* backupOrTempFolderName : kBackupOrTempFolders)
+    {
+        if (!ignoredFiles.isEmpty())
+        {
+            ignoredFiles += "|";
+        }
+        ignoredFiles += QString::fromUtf8(backupOrTempFolderName);
+    }
+
+    // copy that whole tree:
+    AZ_TracePrintf("Editor", "Saving level backup to '%s'...\n", backupPath.toUtf8().data());
+    if (IFileUtil::ETREECOPYOK != CFileUtil::CopyTree(sourcePath, backupPath, true, false, ignoredFiles.toUtf8().data()))
+    {
+        gEnv->pLog->LogWarning("Attempting to save backup to %s before saving, but could not write all files.", backupPath.toUtf8().data());
+        return false;
+    }
+    return true;
+}
+
+void CCryEditDoc::SaveAutoBackup(bool bForce)
+{
+    if (!bForce && (!gSettings.autoBackupEnabled || GetIEditor()->IsInGameMode()))
+    {
+        return;
+    }
+
+    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
+    if (levelPath.isEmpty())
+    {
+        return;
+    }
+
+    static bool isInProgress = false;
+    if (isInProgress)
+    {
+        return;
+    }
+
+    isInProgress = true;
+
+    QWaitCursor wait;
+
+    QString autoBackupPath = levelPath + "/" + kAutoBackupFolder;
+
+    // collect all subfolders
+    std::vector<SFolderTime> folders;
+
+    CollectAllFoldersByTime(autoBackupPath.toUtf8().data(), folders);
+
+    for (int i = int(folders.size()) - gSettings.autoBackupMaxCount; i >= 0; --i)
+    {
+        CFileUtil::Deltree(QStringLiteral("%1/%2/").arg(autoBackupPath, folders[i].folder).toUtf8().data(), true);
+    }
+
+    // save new backup
+    QDateTime theTime = QDateTime::currentDateTime();
+    QString subFolder = theTime.toString(QStringLiteral("yyyy-MM-dd [HH.mm.ss]"));
+
+    QString levelName = GetIEditor()->GetGameEngine()->GetLevelName();
+    QString filename = autoBackupPath + "/" + subFolder + "/" + levelName + "/" + levelName + GetIEditor()->GetGameEngine()->GetLevelExtension();
+    SaveLevel(filename);
+    GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
+
+    isInProgress = false;
+}
+
+bool CCryEditDoc::IsLevelExported() const
+{
+    return m_boLevelExported;
+}
+
+void CCryEditDoc::SetLevelExported(bool boExported)
+{
+    m_boLevelExported = boExported;
+}
+
+void CCryEditDoc::RegisterListener(IDocListener* listener)
+{
+    if (listener == nullptr)
+    {
+        return;
+    }
+
+    if (std::find(m_listeners.begin(), m_listeners.end(), listener) == m_listeners.end())
+    {
+        m_listeners.push_back(listener);
+    }
+}
+
+void CCryEditDoc::UnregisterListener(IDocListener* listener)
+{
+    m_listeners.remove(listener);
+}
+
+void CCryEditDoc::LogLoadTime(int time)
+{
+    QString appFilePath = QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
+    QString exePath = Path::GetPath(appFilePath);
+    QString filename = Path::Make(exePath, "LevelLoadTime.log");
+    QString level = GetIEditor()->GetGameEngine()->GetLevelPath();
+
+    CLogFile::FormatLine("[LevelLoadTime] Level %s loaded in %d seconds", level.toUtf8().data(), time / 1000);
+#if defined(AZ_PLATFORM_WINDOWS)
+    SetFileAttributes(filename.toUtf8().data(), FILE_ATTRIBUTE_ARCHIVE);
+#endif
+
+    FILE* file = nullptr;
+    azfopen(&file, filename.toUtf8().data(), "at");
+
+    if (file)
+    {
+        char version[50];
+        GetIEditor()->GetFileVersion().ToShortString(version, AZ_ARRAY_SIZE(version));
+
+        QString text;
+
+        time = time / 1000;
+        text = QStringLiteral("\n[%1] Level %2 loaded in %3 seconds").arg(version, level).arg(time);
+        fwrite(text.toUtf8().data(), text.toUtf8().length(), 1, file);
+        fclose(file);
+    }
+}
+
+void CCryEditDoc::SetDocumentReady(bool bReady)
+{
+    m_bDocumentReady = bReady;
+}
+
+void CCryEditDoc::GetMemoryUsage(ICrySizer* pSizer)
+{
+    {
+        SIZER_COMPONENT_NAME(pSizer, "UndoManager(estimate)");
+        GetIEditor()->GetUndoManager()->GetMemoryUsage(pSizer);
+    }
+
+    pSizer->Add(*this);
+}
+
+void CCryEditDoc::RegisterConsoleVariables()
+{
+    doc_validate_surface_types = gEnv->pConsole->GetCVar("doc_validate_surface_types");
+
+    if (!doc_validate_surface_types)
+    {
+        doc_validate_surface_types = REGISTER_INT_CB("doc_validate_surface_types", 0, 0,
+            "Flag indicating whether icons are displayed on the animation graph.\n"
+            "Default is 1.\n",
+            OnValidateSurfaceTypesChanged);
+    }
+}
+
+void CCryEditDoc::OnValidateSurfaceTypesChanged(ICVar*)
+{
+    CErrorsRecorder errorsRecorder(GetIEditor());
+    CSurfaceTypeValidator().Validate();
+}
+
+void CCryEditDoc::OnStartLevelResourceList()
+{
+    // after loading another level we clear the RFOM_Level list, the first time the list should be empty
+    static bool bFirstTime = true;
+
+    if (bFirstTime)
+    {
+        const char* pResFilename = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level)->GetFirst();
+
+        while (pResFilename)
+        {
+            // This should be fixed because ExecuteCommandLine is executed right after engine init as we assume the
+            // engine already has all data loaded an is initialized to process commands. Loading data afterwards means
+            // some init was done later which can cause problems when running in the engine batch mode (executing console commands).
+            gEnv->pLog->LogError("'%s' was loaded after engine init but before level load/new (should be fixed)", pResFilename);
+            pResFilename = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level)->GetNext();
+        }
+
+        bFirstTime = false;
+    }
+
+    gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level)->Clear();
+}
+
+BOOL CCryEditDoc::DoFileSave()
+{
+    if (GetEditMode() == CCryEditDoc::DocumentEditingMode::LevelEdit)
+    {
+        // If the file to save is the temporary level it should 'save as' since temporary levels will get deleted
+        const char* temporaryLevelName = GetTemporaryLevelName();
+        if (QString::compare(GetIEditor()->GetLevelName(), temporaryLevelName) == 0)
+        {
+            QString filename;
+            if (CCryEditApp::instance()->GetDocManager()->DoPromptFileName(filename, ID_FILE_SAVE_AS, 0, false, nullptr)
+                && !filename.isEmpty() && !QFileInfo(filename).exists())
+            {
+                if (SaveLevel(filename))
+                {
+                    DeleteTemporaryLevel();
+                    QString newLevelPath = filename.left(filename.lastIndexOf('/') + 1);
+                    GetIEditor()->GetDocument()->SetPathName(filename);
+                    GetIEditor()->GetGameEngine()->SetLevelPath(newLevelPath);
+                    return TRUE;
+                }
+            }
+            return FALSE;
+        }
+    }
+    if (!IsDocumentReady())
+    {
+        return FALSE;
+    }
+
+    return Internal::SaveLevel();
+}
+
+const char* CCryEditDoc::GetTemporaryLevelName() const
+{
+    return gEnv->pConsole->GetCVar("g_TemporaryLevelName")->GetString();
+}
+
+void CCryEditDoc::DeleteTemporaryLevel()
+{
+    QString tempLevelPath = (Path::GetEditingGameDataFolder() + "/Levels/" + GetTemporaryLevelName()).c_str();
+    GetIEditor()->GetSystem()->GetIPak()->ClosePacks(tempLevelPath.toUtf8().data(), AZ::IO::IArchive::EPathResolutionRules::FLAGS_ADD_TRAILING_SLASH);
+    CFileUtil::Deltree(tempLevelPath.toUtf8().data(), true);
+}
+
+void CCryEditDoc::InitEmptyLevel(int /*resolution*/, int /*unitSize*/, bool /*bUseTerrain*/)
+{
+    GetIEditor()->SetStatusText("Initializing Level...");
+
+    OnStartLevelResourceList();
+
+    GetIEditor()->Notify(eNotify_OnBeginNewScene);
+    CLogFile::WriteLine("Preparing new document...");
+
+    //cleanup resources!
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_POST_UNLOAD, 0, 0);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Initialize defaults.
+    //////////////////////////////////////////////////////////////////////////
+    if (!GetIEditor()->IsInPreviewMode())
+    {
+        GetIEditor()->ReloadTemplates();
+        m_environmentTemplate = GetIEditor()->FindTemplate("Environment");
+
+        GetIEditor()->GetGameEngine()->SetLevelCreated(true);
+        GetIEditor()->GetGameEngine()->SetLevelCreated(false);
+    }
+
+    {
+        // Notify listeners.
+        std::list<IDocListener*> listeners = m_listeners;
+        std::list<IDocListener*>::iterator it, next;
+        for (it = listeners.begin(); it != listeners.end(); it = next)
+        {
+            next = it;
+            next++;
+            (*it)->OnNewDocument();
+        }
+    }
+
+    // Tell the system that the level has been created/loaded.
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
+
+    GetIEditor()->Notify(eNotify_OnEndNewScene);
+    SetModifiedFlag(FALSE);
+    SetLevelExported(false);
+    SetModifiedModules(eModifiedNothing);
+
+    GetIEditor()->SetStatusText("Ready");
+}
+
+void CCryEditDoc::CreateDefaultLevelAssets([[maybe_unused]] int resolution, [[maybe_unused]] int unitSize)
+{
+    AzToolsFramework::EditorLevelNotificationBus::Broadcast(&AzToolsFramework::EditorLevelNotificationBus::Events::OnNewLevelCreated);
+}
+
+void CCryEditDoc::OnEnvironmentPropertyChanged(IVariable* pVar)
+{
+    if (pVar == NULL)
+    {
+        return;
+    }
+
+    XmlNodeRef node = GetEnvironmentTemplate();
+    if (node == NULL)
+    {
+        return;
+    }
+
+    // QVariant will not convert a void * to int, so do it manually.
+    int nKey = reinterpret_cast<intptr_t>(pVar->GetUserData().value<void*>());
+
+    int nGroup = (nKey & 0xFFFF0000) >> 16;
+    int nChild = (nKey & 0x0000FFFF);
+
+    if (nGroup < 0 || nGroup >= node->getChildCount())
+    {
+        return;
+    }
+
+    XmlNodeRef groupNode = node->getChild(nGroup);
+
+    if (groupNode == NULL)
+    {
+        return;
+    }
+
+    if (nChild < 0 || nChild >= groupNode->getChildCount())
+    {
+        return;
+    }
+
+    XmlNodeRef childNode = groupNode->getChild(nChild);
+    if (childNode == NULL)
+    {
+        return;
+    }
+
+    if (pVar->GetDataType() == IVariable::DT_COLOR)
+    {
+        Vec3 value;
+        pVar->Get(value);
+        QString buff;
+        QColor gammaColor = ColorLinearToGamma(ColorF(value.x, value.y, value.z));
+        buff = QStringLiteral("%1,%2,%3").arg(gammaColor.red()).arg(gammaColor.green()).arg(gammaColor.blue());
+        childNode->setAttr("value", buff.toUtf8().data());
+    }
+    else
+    {
+        QString value;
+        pVar->Get(value);
+        childNode->setAttr("value", value.toUtf8().data());
+    }
+}
+
+QString CCryEditDoc::GetCryIndexPath(const LPCTSTR levelFilePath)
+{
+    QString levelPath = Path::GetPath(levelFilePath);
+    QString levelName = Path::GetFileName(levelFilePath);
+    return Path::AddPathSlash(levelPath + levelName + "_editor");
+}
+
+BOOL CCryEditDoc::LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString& absoluteLevelPath, const QString& levelPath)
+{
+    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
+
+    //if (m_pSWDoc->IsNull())
+    {
+        CXmlArchive* pXmlAr = new CXmlArchive();
+        if (!pXmlAr)
+        {
+            return FALSE;
+        }
+
+        CXmlArchive& xmlAr = *pXmlAr;
+        xmlAr.bLoading = true;
+
+        // bound to the level folder, as if it were the assets folder.
+        // this mounts (whateverlevelname.ly) as @assets@/Levels/whateverlevelname/ and thus it works...
+        bool openLevelPakFileSuccess = pIPak->OpenPack(levelPath.toUtf8().data(), absoluteLevelPath.toUtf8().data());
+        if (!openLevelPakFileSuccess)
+        {
+            return FALSE;
+        }
+
+        CPakFile pakFile;
+        bool loadFromPakSuccess;
+        loadFromPakSuccess = xmlAr.LoadFromPak(levelPath, pakFile);
+        pIPak->ClosePack(absoluteLevelPath.toUtf8().data());
+        if (!loadFromPakSuccess)
+        {
+            return FALSE;
+        }
+
+        FillXmlArArray(arrXmlAr, &xmlAr);
+    }
+
+    return TRUE;
+}
+
+void CCryEditDoc::ReleaseXmlArchiveArray(TDocMultiArchive& arrXmlAr)
+{
+    SAFE_DELETE(arrXmlAr[0]);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// AzToolsFramework::EditorEntityContextNotificationBus interface implementation
+void CCryEditDoc::OnSliceInstantiated(const AZ::Data::AssetId& sliceAssetId, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/)
+{
+    if (m_envProbeSliceAssetId == sliceAssetId)
+    {
+        const AZ::SliceComponent::EntityList& entities = sliceAddress.GetInstance()->GetInstantiated()->m_entities;
+        const AZ::Uuid editorEnvProbeComponentId("{8DBD6035-583E-409F-AFD9-F36829A0655D}");
+        AzToolsFramework::EntityIdList entityIds;
+        entityIds.reserve(entities.size());
+        for (const AZ::Entity* entity : entities)
+        {
+            if (entity->FindComponent(editorEnvProbeComponentId))
+            {
+                // Update Probe Area size to cover the whole terrain
+                LmbrCentral::EditorLightComponentRequestBus::Event(entity->GetId(), &LmbrCentral::EditorLightComponentRequests::SetProbeAreaDimensions, AZ::Vector3(m_terrainSize, m_terrainSize, m_envProbeHeight));
+
+                // Force update the light to apply cubemap
+                LmbrCentral::EditorLightComponentRequestBus::Event(entity->GetId(), &LmbrCentral::EditorLightComponentRequests::RefreshLight);
+            }
+            entityIds.push_back(entity->GetId());
+        }
+
+        //Detach instantiated env probe entities from engine slice
+        AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
+            &AzToolsFramework::SliceEditorEntityOwnershipServiceRequests::DetachSliceEntities, entityIds);
+
+        sliceAddress.SetInstance(nullptr);
+        sliceAddress.SetReference(nullptr);
+        SetModifiedFlag(true);
+        SetModifiedModules(eModifiedEntities);
+
+        AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
+
+        //save after level default slice fully instantiated
+        Save();
+    }
+    GetIEditor()->ResumeUndo();
+}
+
+
+void CCryEditDoc::OnSliceInstantiationFailed(const AZ::Data::AssetId& sliceAssetId, const AzFramework::SliceInstantiationTicket& /*ticket*/)
+{
+    if (m_envProbeSliceAssetId == sliceAssetId)
+    {
+        AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
+        AZ_Warning("Editor", false, "Failed to instantiate default environment probe slice.");
+    }
+    GetIEditor()->ResumeUndo();
+}
+//////////////////////////////////////////////////////////////////////////
+
+namespace AzToolsFramework
+{
+    void CryEditDocFuncsHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            // this will put these methods into the 'azlmbr.legacy.general' module
+            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
+            };
+            addLegacyGeneral(behaviorContext->Method("save_level", ::Internal::SaveLevel, nullptr, "Saves the current level."));
+        }
+    }
+}
+
+#include <moc_CryEditDoc.cpp>
diff --git a/Code/Editor/CryEditDoc.h b/Code/Editor/CryEditDoc.h
new file mode 100644
index 0000000000..2a6bf8bc63
--- /dev/null
+++ b/Code/Editor/CryEditDoc.h
@@ -0,0 +1,246 @@
+/*
+ * 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_CRYEDITDOC_H
+#define CRYINCLUDE_EDITOR_CRYEDITDOC_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "DocMultiArchive.h"
+#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
+#include <AzCore/Component/Component.h>
+#include <TimeValue.h>
+#endif
+
+class CClouds;
+struct LightingSettings;
+struct IVariable;
+struct ICVar;
+
+// Filename of the temporary file used for the hold / fetch operation
+// conform to the "$tmp[0-9]_" naming convention
+#define HOLD_FETCH_FILE "$tmp_hold" 
+
+class CCryEditDoc
+    : public QObject
+    , protected AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
+{
+    Q_OBJECT
+    Q_PROPERTY(bool modified READ IsModified WRITE SetModifiedFlag);
+    Q_PROPERTY(QString pathName READ GetLevelPathName WRITE SetPathName);
+    Q_PROPERTY(QString title READ GetTitle WRITE SetTitle);
+ 
+public: // Create from serialization only
+    enum DocumentEditingMode
+    {
+        LevelEdit,
+        SliceEdit
+    };
+
+    Q_INVOKABLE CCryEditDoc();
+
+    virtual ~CCryEditDoc();
+
+    bool IsModified() const;
+    void SetModifiedFlag(bool modified);
+    // Currently it's not possible to disable one single flag and eModifiedModule is ignored
+    // if bModified is false.
+    virtual void SetModifiedModules(EModifiedModule eModifiedModule, bool boSet = true);
+    int GetModifiedModule();
+
+    // Return level path.
+    // If a slice is being edited then the path to a placeholder level is returned.
+    QString GetLevelPathName() const;
+
+    // Set path of slice or level being edited.
+    void SetPathName(const QString& pathName);
+
+    // Return slice path, if slice is open, an empty string otherwise. Use GetEditMode() to determine if a slice is open.
+    QString GetSlicePathName() const;
+
+    // Return The current type of document being edited, a level or a slice
+    // While editing a slice, a placeholder level is opened since the editor requires an open level to function.
+    // While editing a slice, saving will only affect the slice and not the placeholder level.
+    DocumentEditingMode GetEditMode() const;
+
+    // Return slice path if editing slice, level path if editing level.
+    SANDBOX_API QString GetActivePathName() const;
+
+    QString GetTitle() const;
+    void SetTitle(const QString& title);
+
+    virtual bool OnNewDocument();
+    void InitEmptyLevel(int resolution = 0, int unitSize = 0, bool bUseTerrain = false);
+    void CreateDefaultLevelAssets(int resolution = 0, int unitSize = 0);
+
+    bool DoSave(const QString& pathName, bool replace);
+    SANDBOX_API bool Save();
+    virtual BOOL DoFileSave();
+    bool SaveModified();
+
+    virtual bool BackupBeforeSave(bool bForce = false);
+    void SaveAutoBackup(bool bForce = false);
+
+    // ClassWizard generated virtual function overrides
+    virtual bool OnOpenDocument(const QString& lpszPathName);
+
+    const bool IsLevelLoadFailed() const { return m_bLoadFailed; }
+
+    //! Marks this document as having errors.
+    void SetHasErrors() { m_hasErrors = true; }
+
+    bool IsDocumentReady() const { return m_bDocumentReady; }
+    void SetDocumentReady(bool bReady);
+
+    bool IsLevelExported() const;
+    void SetLevelExported(bool boExported = true);
+
+    BOOL CanCloseFrame();
+
+    enum class FetchPolicy
+    {
+        DELETE_FOLDER,
+        DELETE_LY_FILE,
+        PRESERVE
+    };
+
+    void Hold(const QString& holdName);
+    void Hold(const QString& holdName, const QString& relativeHoldPath);
+    void Fetch(const QString& relativeHoldPath, bool bShowMessages = true, bool bDelHoldFolder = false);
+    void Fetch(const QString& holdName, const QString& relativeHoldPath, bool bShowMessages, FetchPolicy policy);
+
+    const char* GetTemporaryLevelName() const;
+    void DeleteTemporaryLevel();
+
+    CClouds* GetClouds() { return m_pClouds; }
+    void SetWaterColor(const QColor& col) { m_waterColor = col; }
+    QColor GetWaterColor() { return m_waterColor; }
+    XmlNodeRef& GetFogTemplate() { return m_fogTemplate; }
+    XmlNodeRef& GetEnvironmentTemplate() { return m_environmentTemplate; }
+    void OnEnvironmentPropertyChanged(IVariable* pVar);
+
+    void RegisterListener(IDocListener* listener);
+    void UnregisterListener(IDocListener* listener);
+
+    void GetMemoryUsage(ICrySizer* pSizer);
+
+    static bool IsBackupOrTempLevelSubdirectory(const QString& folderName);
+protected:
+
+    virtual void DeleteContents();
+
+    struct TOpenDocContext
+    {
+        CTimeValue loading_start_time;
+        QString absoluteLevelPath;
+        QString absoluteSlicePath;
+    };
+    bool BeforeOpenDocument(const QString& lpszPathName, TOpenDocContext& context);
+    bool DoOpenDocument(TOpenDocContext& context);
+    virtual BOOL LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString& absoluteLevelPath, const QString& levelPath);
+    virtual void ReleaseXmlArchiveArray(TDocMultiArchive& arrXmlAr);
+
+    virtual void Load(TDocMultiArchive& arrXmlAr, const QString& szFilename);
+    virtual void StartStreamingLoad(){}
+
+    void Save(CXmlArchive& xmlAr);
+    void Load(CXmlArchive& xmlAr, const QString& szFilename);
+    void Save(TDocMultiArchive& arrXmlAr);
+    bool SaveLevel(const QString& filename);
+    bool SaveSlice(const QString& filename);
+    bool LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteCryFilePath);
+    bool LoadEntitiesFromLevel(const QString& levelPakFile);
+    bool LoadEntitiesFromSlice(const QString& sliceFile);
+    void SerializeFogSettings(CXmlArchive& xmlAr);
+    virtual void SerializeViewSettings(CXmlArchive& xmlAr);
+    void SerializeNameSelection(CXmlArchive& xmlAr);
+    void LogLoadTime(int time);
+
+    struct TSaveDocContext
+    {
+        bool bSaved;
+    };
+    bool BeforeSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
+    bool HasLayerNameConflicts();
+    bool DoSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
+    bool AfterSaveDocument(const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt = true);
+
+    virtual bool OnSaveDocument(const QString& lpszPathName);
+    virtual void OnFileSaveAs();
+    //! called immediately after saving the level.
+    void AfterSave();
+    void RegisterConsoleVariables();
+    void OnStartLevelResourceList();
+    static void OnValidateSurfaceTypesChanged(ICVar*);
+
+    QString GetCryIndexPath(const LPCTSTR levelFilePath);
+
+    //////////////////////////////////////////////////////////////////////////
+    // SliceEditorEntityOwnershipServiceNotificationBus::Handler
+    void OnSliceInstantiated(const AZ::Data::AssetId& sliceAssetId, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/) override;
+    void OnSliceInstantiationFailed(const AZ::Data::AssetId& sliceAssetId, const AzFramework::SliceInstantiationTicket& /*ticket*/) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    bool m_bLoadFailed;
+    QColor m_waterColor;
+    XmlNodeRef m_fogTemplate;
+    XmlNodeRef m_environmentTemplate;
+    CClouds* m_pClouds;
+    std::list<IDocListener*> m_listeners;
+    bool m_bDocumentReady;
+    ICVar* doc_validate_surface_types;
+    int m_modifiedModuleFlags;
+    bool m_boLevelExported;
+    bool m_modified;
+    QString m_pathName;
+    QString m_slicePathName;
+    QString m_title;
+    AZ::Data::AssetId m_envProbeSliceAssetId;
+    float m_terrainSize;
+    const char* m_envProbeSliceRelativePath;
+    const float m_envProbeHeight;
+    bool m_hasErrors = false; ///< This is used to warn the user that they may lose work when they go to save.
+};
+
+class CAutoDocNotReady
+{
+public:
+    CAutoDocNotReady()
+    {
+        m_prevState = GetIEditor()->GetDocument()->IsDocumentReady();
+        GetIEditor()->GetDocument()->SetDocumentReady(false);
+    }
+
+    ~CAutoDocNotReady()
+    {
+        GetIEditor()->GetDocument()->SetDocumentReady(m_prevState);
+    }
+
+private:
+    bool m_prevState;
+};
+
+namespace AzToolsFramework
+{
+    //! A component to reflect scriptable commands for the Editor
+    class CryEditDocFuncsHandler
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(CryEditDocFuncsHandler, "{628CE458-72E7-4B7B-B8A2-62F95F55E738}")
+
+        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+    };
+
+} // namespace AzToolsFramework
+
+#endif // CRYINCLUDE_EDITOR_CRYEDITDOC_H
diff --git a/Code/Sandbox/Editor/CryEditLiveCreate.rc b/Code/Editor/CryEditLiveCreate.rc
similarity index 100%
rename from Code/Sandbox/Editor/CryEditLiveCreate.rc
rename to Code/Editor/CryEditLiveCreate.rc
diff --git a/Code/Editor/CryEditPy.cpp b/Code/Editor/CryEditPy.cpp
new file mode 100644
index 0000000000..02833a84e0
--- /dev/null
+++ b/Code/Editor/CryEditPy.cpp
@@ -0,0 +1,564 @@
+/*
+ * 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 "CryEdit.h"
+
+// Qt
+#include <QTimer>
+
+// AzCore
+#include <AzCore/Component/TickBus.h>
+#include <AzCore/Console/IConsole.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
+#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
+
+// Editor
+#include "Core/QtEditorApplication.h"
+#include "CheckOutDialog.h"
+#include "GameEngine.h"
+#include "UndoConfigSpec.h"
+#include "ViewManager.h"
+#include "EditorViewportCamera.h"
+
+// Atom
+#include <Atom/RPI.Public/ViewportContextBus.h>
+#include <Atom/RPI.Public/ViewportContext.h>
+
+//////////////////////////////////////////////////////////////////////////
+namespace
+{
+    void PyRunFile(const AZ::ConsoleCommandContainer& args)
+    {
+        if (args.empty())
+        {
+            // We expect at least "pyRunFile" and the filename
+            AZ_Warning("editor", false, "The pyRunFile requires a file script name.");
+            return;
+        }
+        else if (args.size() == 1)
+        {
+            // If we only have "pyRunFile filename", there are no args to pass through.
+            AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(
+                &AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilename,
+                args.front().data());
+        }
+        else
+        {
+            // We have "pyRunFile filename x y z", so copy everything past filename into a new vector
+            AZStd::vector<AZStd::string_view> pythonArgs;
+            AZStd::transform(args.begin() + 1, args.end(), std::back_inserter(pythonArgs), [](auto&& value) { return value; });
+            AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(
+                &AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs,
+                args[0],
+                pythonArgs);
+        }
+    }
+    AZ_CONSOLEFREEFUNC("pyRunFile", PyRunFile, AZ::ConsoleFunctorFlags::Null, "Runs the Python script from the console.");
+
+    //! We have explicitly not exposed this CloseCurrentLevel API to Python Scripting since the Editor
+    //! doesn't officially support it (it doesn't exist in the File menu). It is used for cases
+    //! where a level with legacy entities are unable to be converted and so the level that has
+    //! been opened needs to be closed, but it hasn't been fully tested for a normal workflow.
+    void CloseCurrentLevel()
+    {
+        CCryEditDoc* currentLevel = GetIEditor()->GetDocument();
+        if (currentLevel && currentLevel->IsDocumentReady())
+        {
+            // This closes the current document (level)
+            currentLevel->OnNewDocument();
+
+            // Then we freeze the viewport's input
+            AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Broadcast(
+                &AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Events::FreezeViewportInput, true);
+
+            // Then we need to tell the game engine there is no level to render anymore
+            if (GetIEditor()->GetGameEngine())
+            {
+                GetIEditor()->GetGameEngine()->SetLevelPath("");
+                GetIEditor()->GetGameEngine()->SetLevelLoaded(false);
+
+                CViewManager* pViewManager = GetIEditor()->GetViewManager();
+                CViewport* pGameViewport = pViewManager ? pViewManager->GetGameViewport() : nullptr;
+                if (pGameViewport)
+                {
+                    pGameViewport->SetViewTM(Matrix34::CreateIdentity());
+                }
+            }
+        }
+    }
+
+    const char* PyGetGameFolder()
+    {
+        return Path::GetEditingGameDataFolder().c_str();
+    }
+
+    AZStd::string PyGetGameFolderAsString()
+    {
+        return Path::GetEditingGameDataFolder();
+    }
+
+    bool PyOpenLevel(const char* pLevelName)
+    {
+        const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
+        const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+
+        QString levelPath = pLevelName;
+
+        if (!QFile::exists(levelPath))
+        {
+            // if the input path can't be found, let's automatically add on the game folder and the levels
+            QString levelsDir = QString("%1/%2").arg(Path::GetEditingGameDataFolder().c_str()).arg("Levels");
+
+            // now let's check if they pre-pended directories (Samples/SomeLevelName)
+            QString levelFileName = levelPath;
+            QStringList splitLevelPath = levelPath.contains('/') ? levelPath.split('/') : levelPath.split('\\');
+            if (splitLevelPath.length() > 1)
+            {
+                // take the last one as the level directory name and the level file name in that directory
+                levelFileName = splitLevelPath.last();
+            }
+
+            levelPath = levelsDir / levelPath / levelFileName;
+
+            // make sure the level path includes the cry extension, if needed
+            if (!levelFileName.endsWith(oldExtension) && !levelFileName.endsWith(defaultExtension))
+            {
+                QString newLevelPath = levelPath + defaultExtension;
+                QString oldLevelPath = levelPath + oldExtension;
+
+                // Check if there is a .cry file, otherwise assume it is a new .ly file
+                if (QFileInfo(oldLevelPath).exists())
+                {
+                    levelPath = oldLevelPath;
+                }
+                else
+                {
+                    levelPath = newLevelPath;
+                }
+            }
+
+            if (!QFile::exists(levelPath))
+            {
+                return false;
+            }
+        }
+
+        auto previousDocument = GetIEditor()->GetDocument();
+        QString previousPathName = (previousDocument != nullptr) ? previousDocument->GetLevelPathName() : "";
+        auto newDocument = CCryEditApp::instance()->OpenDocumentFile(levelPath.toUtf8().data());
+
+        // the underlying document pointer doesn't change, so we can't check that; use the path name's instead
+
+        bool result = true;
+        if (newDocument == nullptr || newDocument->IsLevelLoadFailed() || (newDocument->GetLevelPathName() == previousPathName))
+        {
+            result = false;
+        }
+
+        return result;
+    }
+
+    bool PyOpenLevelNoPrompt(const char* pLevelName)
+    {
+        GetIEditor()->GetDocument()->SetModifiedFlag(false);
+        return PyOpenLevel(pLevelName);
+    }
+
+    bool PyReloadCurrentLevel()
+    {
+        if (GetIEditor()->IsLevelLoaded())
+        {
+            // Close the current level so that the subsequent call to open the same level will be allowed
+            QString currentLevelPath = GetIEditor()->GetDocument()->GetLevelPathName();
+            CloseCurrentLevel();
+
+            return PyOpenLevel(currentLevelPath.toUtf8().constData());
+        }
+
+        return false;
+    }
+
+    int PyCreateLevel(const char* levelName, [[maybe_unused]] int resolution, [[maybe_unused]] int unitSize, [[maybe_unused]] bool bUseTerrain)
+    {
+        QString qualifiedName;
+        return CCryEditApp::instance()->CreateLevel(levelName, qualifiedName);
+    }
+
+    int PyCreateLevelNoPrompt(const char* levelName, [[maybe_unused]] int heightmapResolution, [[maybe_unused]] int heightmapUnitSize,
+        [[maybe_unused]] int terrainExportTextureSize, [[maybe_unused]] bool useTerrain)
+    {
+        // If a level was open, ignore any unsaved changes if it had been modified
+        if (GetIEditor()->IsLevelLoaded())
+        {
+            GetIEditor()->GetDocument()->SetModifiedFlag(false);
+        }
+
+        QString qualifiedName;
+        return CCryEditApp::instance()->CreateLevel(levelName, qualifiedName);
+    }
+
+    const char* PyGetCurrentLevelName()
+    {
+        // Using static member to capture temporary data
+        static string tempLevelName;
+        tempLevelName = GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().data();
+        return tempLevelName.c_str();
+    }
+
+    const char* PyGetCurrentLevelPath()
+    {
+        // Using static member to capture temporary data
+        static string tempLevelPath;
+        tempLevelPath = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
+        return tempLevelPath.c_str();
+    }
+
+    void Command_LoadPlugins()
+    {
+        GetIEditor()->LoadPlugins();
+    }
+
+    AZ::Vector3 PyGetCurrentViewPosition()
+    {
+        auto viewportContextRequests = AZ::RPI::ViewportContextRequests::Get();
+        if (viewportContextRequests)
+        {
+            AZ::RPI::ViewportContextPtr viewportContext = viewportContextRequests->GetDefaultViewportContext();
+            AZ::Transform transform = viewportContext->GetCameraTransform();
+            return transform.GetTranslation();
+        }
+        return AZ::Vector3();
+    }
+
+    AZ::Vector3 PyGetCurrentViewRotation()
+    {
+        auto viewportContextRequests = AZ::RPI::ViewportContextRequests::Get();
+        if (viewportContextRequests)
+        {
+            AZ::RPI::ViewportContextPtr viewportContext = viewportContextRequests->GetDefaultViewportContext();
+            AZ::Transform transform = viewportContext->GetCameraTransform();
+            return transform.GetRotation().GetEulerDegrees();
+        }
+        return AZ::Vector3();
+    }
+
+    void PySetCurrentViewPosition(float x, float y, float z)
+    {
+        auto viewportContextRequests = AZ::RPI::ViewportContextRequests::Get();
+        if (viewportContextRequests)
+        {
+            AZ::RPI::ViewportContextPtr viewportContext = viewportContextRequests->GetDefaultViewportContext();
+            AZ::Transform transform = viewportContext->GetCameraTransform();
+            transform.SetTranslation(x, y, z);
+            viewportContextRequests->GetDefaultViewportContext()->SetCameraTransform(transform);
+        }
+    }
+
+    void PySetCurrentViewRotation(float x, [[maybe_unused]] float y, float z)
+    {
+        auto viewportContextRequests = AZ::RPI::ViewportContextRequests::Get();
+        if (viewportContextRequests)
+        {
+            AZ::RPI::ViewportContextPtr viewportContext = viewportContextRequests->GetDefaultViewportContext();
+            AZ::Transform transform = viewportContext->GetCameraTransform();
+            transform.SetRotation(AZ::Quaternion::CreateFromEulerAnglesDegrees(AZ::Vector3(x, y, z)));
+            viewportContextRequests->GetDefaultViewportContext()->SetCameraTransform(transform);
+        }
+    }
+}
+
+namespace
+{
+    void PyStartProcessDetached(const char* process, const char* args)
+    {
+        CCryEditApp::instance()->StartProcessDetached(process, args);
+    }
+
+    void PyLaunchLUAEditor(const char* files)
+    {
+        CCryEditApp::instance()->OpenLUAEditor(files);
+    }
+
+    bool PyCheckOutDialogEnableForAll(bool isEnable)
+    {
+        return CCheckOutDialog::EnableForAll(isEnable);
+    }
+}
+
+namespace
+{
+    bool g_runScriptResult = false; // true -> success, false -> failure
+}
+
+namespace
+{
+    void PySetResultToSuccess()
+    {
+        g_runScriptResult = true;
+    }
+
+    void PySetResultToFailure()
+    {
+        g_runScriptResult = false;
+    }
+
+    void PyIdleEnable(bool enable)
+    {
+        if (Editor::EditorQtApplication::instance())
+        {
+            Editor::EditorQtApplication::instance()->EnableOnIdle(enable);
+        }
+    }
+
+    bool PyIdleIsEnabled()
+    {
+        if (!Editor::EditorQtApplication::instance())
+        {
+            return false;
+        }
+        return Editor::EditorQtApplication::instance()->OnIdleEnabled();
+    }
+
+    void PyIdleWait(double timeInSec)
+    {
+        const bool wasIdleEnabled = PyIdleIsEnabled();
+        if (!wasIdleEnabled)
+        {
+            PyIdleEnable(true);
+        }
+
+        clock_t start = clock();
+        do
+        {
+            QEventLoop loop;
+            QTimer::singleShot(timeInSec * 1000, &loop, &QEventLoop::quit);
+            loop.exec();
+        } while ((double)(clock() - start) / CLOCKS_PER_SEC < timeInSec);
+
+        if (!wasIdleEnabled)
+        {
+            PyIdleEnable(false);
+        }
+    }
+
+    void PyIdleWaitFrames(uint32 frames)
+    {
+        struct Ticker : public AZ::TickBus::Handler
+        {
+            Ticker(QEventLoop* loop, uint32 targetFrames) : m_loop(loop), m_targetFrames(targetFrames)
+            {
+                AZ::TickBus::Handler::BusConnect();
+            }
+            ~Ticker()
+            {
+                AZ::TickBus::Handler::BusDisconnect();
+            }
+
+            void OnTick(float deltaTime, AZ::ScriptTimePoint time) override
+            {
+                AZ_UNUSED(deltaTime);
+                AZ_UNUSED(time);
+                if (++m_elapsedFrames >= m_targetFrames)
+                {
+                    m_loop->quit();
+                }
+            }
+            QEventLoop* m_loop = nullptr;
+            uint32 m_elapsedFrames = 0;
+            uint32 m_targetFrames = 0;
+        };
+
+        QEventLoop loop;
+        Ticker ticker(&loop, frames);
+        loop.exec();
+    }
+}
+
+
+inline namespace Commands
+{
+    void PySetConfigSpec(int spec, int platform)
+    {
+        CUndo undo("Set Config Spec");
+        if (CUndo::IsRecording())
+        {
+            CUndo::Record(new CUndoConficSpec());
+        }
+        GetIEditor()->SetEditorConfigSpec((ESystemConfigSpec)spec, (ESystemConfigPlatform)platform);
+    }
+
+    int PyGetConfigSpec()
+    {
+        return static_cast<int>(GetIEditor()->GetEditorConfigSpec());
+    }
+
+    int PyGetConfigPlatform()
+    {
+        return static_cast<int>(GetIEditor()->GetEditorConfigPlatform());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CCryEditApp::OnChangeGameSpec(UINT nID)
+{
+    switch (nID)
+    {
+    case ID_GAME_PC_ENABLELOWSPEC:
+        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_PC);
+        break;
+    case ID_GAME_PC_ENABLEMEDIUMSPEC:
+        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_PC);
+        break;
+    case ID_GAME_PC_ENABLEHIGHSPEC:
+        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_PC);
+        break;
+    case ID_GAME_PC_ENABLEVERYHIGHSPEC:
+        Commands::PySetConfigSpec(CONFIG_VERYHIGH_SPEC, CONFIG_PC);
+        break;
+    case ID_GAME_OSXMETAL_ENABLELOWSPEC:
+        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_OSX_METAL);
+        break;
+    case ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC:
+        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_OSX_METAL);
+        break;
+    case ID_GAME_OSXMETAL_ENABLEHIGHSPEC:
+        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_OSX_METAL);
+        break;
+    case ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC:
+        Commands::PySetConfigSpec(CONFIG_VERYHIGH_SPEC, CONFIG_OSX_METAL);
+        break;
+    case ID_GAME_ANDROID_ENABLELOWSPEC:
+        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_ANDROID);
+        break;
+    case ID_GAME_ANDROID_ENABLEMEDIUMSPEC:
+        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_ANDROID);
+        break;
+    case ID_GAME_ANDROID_ENABLEHIGHSPEC:
+        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_ANDROID);
+        break;
+    case ID_GAME_ANDROID_ENABLEVERYHIGHSPEC:
+        Commands::PySetConfigSpec(CONFIG_VERYHIGH_SPEC, CONFIG_ANDROID);
+        break;
+    case ID_GAME_IOS_ENABLELOWSPEC:
+        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_IOS);
+        break;
+    case ID_GAME_IOS_ENABLEMEDIUMSPEC:
+        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_IOS);
+        break;
+    case ID_GAME_IOS_ENABLEHIGHSPEC:
+        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_IOS);
+        break;
+    case ID_GAME_IOS_ENABLEVERYHIGHSPEC:
+        Commands::PySetConfigSpec(CONFIG_VERYHIGH_SPEC, CONFIG_IOS);
+        break;
+#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)\
+    case ID_GAME_##CODENAME##_ENABLELOWSPEC:\
+        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_##CODENAME);\
+        break;\
+    case ID_GAME_##CODENAME##_ENABLEMEDIUMSPEC:\
+        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_##CODENAME);\
+        break;\
+    case ID_GAME_##CODENAME##_ENABLEHIGHSPEC:\
+        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_##CODENAME);\
+        break;
+    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
+#undef AZ_RESTRICTED_PLATFORM_EXPANSION
+#endif
+    }
+}
+
+
+
+namespace AzToolsFramework
+{
+    void CryEditPythonHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            // this will put these methods into the 'azlmbr.legacy.general' module
+            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
+            };
+            addLegacyGeneral(behaviorContext->Method("open_level", ::PyOpenLevel, nullptr, "Opens a level."));
+            addLegacyGeneral(behaviorContext->Method("open_level_no_prompt", ::PyOpenLevelNoPrompt, nullptr, "Opens a level. Doesn't prompt user about saving a modified level."));
+            addLegacyGeneral(behaviorContext->Method("reload_current_level", ::PyReloadCurrentLevel, nullptr, "Re-loads the current level. If no level is loaded, then does nothing."));
+            addLegacyGeneral(behaviorContext->Method("create_level", ::PyCreateLevel, nullptr, "Creates a level with the parameters of 'levelName', 'resolution', 'unitSize' and 'bUseTerrain'."));
+            addLegacyGeneral(behaviorContext->Method("create_level_no_prompt", ::PyCreateLevelNoPrompt, nullptr, "Creates a level with the parameters of 'levelName', 'resolution', 'unitSize' and 'bUseTerrain'."));
+            addLegacyGeneral(behaviorContext->Method("get_game_folder", PyGetGameFolderAsString, nullptr, "Gets the path to the Game folder of current project."));
+            addLegacyGeneral(behaviorContext->Method("get_current_level_name", PyGetCurrentLevelName, nullptr, "Gets the name of the current level."));
+            addLegacyGeneral(behaviorContext->Method("get_current_level_path", PyGetCurrentLevelPath, nullptr, "Gets the fully specified path of the current level."));
+
+            addLegacyGeneral(behaviorContext->Method("load_all_plugins", ::Command_LoadPlugins, nullptr, "Loads all available plugins."));
+            addLegacyGeneral(behaviorContext->Method("get_current_view_position", PyGetCurrentViewPosition, nullptr, "Returns the position of the current view as a Vec3."));
+            addLegacyGeneral(behaviorContext->Method("get_current_view_rotation", PyGetCurrentViewRotation, nullptr, "Returns the rotation of the current view as a Vec3 of Euler angles in degrees."));
+            addLegacyGeneral(behaviorContext->Method("set_current_view_position", PySetCurrentViewPosition, nullptr, "Sets the position of the current view as given x, y, z coordinates."));
+            addLegacyGeneral(behaviorContext->Method("set_current_view_rotation", PySetCurrentViewRotation, nullptr, "Sets the rotation of the current view as given x, y, z Euler angles in degrees."));
+
+            addLegacyGeneral(behaviorContext->Method("export_to_engine", CCryEditApp::Command_ExportToEngine, nullptr, "Exports the current level to the engine."));
+            addLegacyGeneral(behaviorContext->Method("set_config_spec", PySetConfigSpec, nullptr, "Sets the system config spec and platform."));
+            addLegacyGeneral(behaviorContext->Method("get_config_platform", PyGetConfigPlatform, nullptr, "Gets the system config platform."));
+            addLegacyGeneral(behaviorContext->Method("get_config_spec", PyGetConfigSpec, nullptr, "Gets the system config spec."));
+
+            addLegacyGeneral(behaviorContext->Method("set_result_to_success", PySetResultToSuccess, nullptr, "Sets the result of a script execution to success. Used only for Sandbox AutoTests."));
+            addLegacyGeneral(behaviorContext->Method("set_result_to_failure", PySetResultToFailure, nullptr, "Sets the result of a script execution to failure. Used only for Sandbox AutoTests."));
+
+            addLegacyGeneral(behaviorContext->Method("idle_enable", PyIdleEnable, nullptr, "Enables/Disables idle processing for the Editor. Primarily used for auto-testing."));
+            addLegacyGeneral(behaviorContext->Method("is_idle_enabled", PyIdleIsEnabled, nullptr, "Returns whether or not idle processing is enabled for the Editor. Primarily used for auto-testing."));
+            addLegacyGeneral(behaviorContext->Method("idle_is_enabled", PyIdleIsEnabled, nullptr, "Returns whether or not idle processing is enabled for the Editor. Primarily used for auto-testing."));
+            addLegacyGeneral(behaviorContext->Method("idle_wait", PyIdleWait, nullptr, "Waits idling for a given seconds. Primarily used for auto-testing."));
+            addLegacyGeneral(behaviorContext->Method("idle_wait_frames", PyIdleWaitFrames, nullptr, "Waits idling for a frames. Primarily used for auto-testing."));
+
+            addLegacyGeneral(behaviorContext->Method("start_process_detached", PyStartProcessDetached, nullptr, "Launches a detached process with an optional space separated list of arguments."));
+            addLegacyGeneral(behaviorContext->Method("launch_lua_editor", PyLaunchLUAEditor, nullptr, "Launches the Lua editor, may receive a list of space separate file paths, or an empty string to only open the editor."));
+
+            // this will put these methods into the 'azlmbr.legacy.checkout_dialog' module
+            auto addCheckoutDialog = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/CheckoutDialog")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.checkout_dialog");
+            };
+            addCheckoutDialog(behaviorContext->Method("enable_for_all", PyCheckOutDialogEnableForAll, nullptr, "Enables the 'Apply to all' button in the checkout dialog; useful for allowing the user to apply a decision to check out files to multiple, related operations."));
+
+            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_AUTO_SPEC>("SystemConfigSpec_Auto")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_LOW_SPEC>("SystemConfigSpec_Low")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_MEDIUM_SPEC>("SystemConfigSpec_Medium")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_HIGH_SPEC>("SystemConfigSpec_High")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_VERYHIGH_SPEC>("SystemConfigSpec_VeryHigh")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_INVALID_PLATFORM>("SystemConfigPlatform_InvalidPlatform")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_PC>("SystemConfigPlatform_Pc")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_MAC>("SystemConfigPlatform_Mac")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_OSX_METAL>("SystemConfigPlatform_OsxMetal")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_ANDROID>("SystemConfigPlatform_Android")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_IOS>("SystemConfigPlatform_Ios")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_PROVO>("SystemConfigPlatform_Provo")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+        }
+    }
+
+}
diff --git a/Code/Editor/CustomAspectRatioDlg.cpp b/Code/Editor/CustomAspectRatioDlg.cpp
new file mode 100644
index 0000000000..47ae4711b5
--- /dev/null
+++ b/Code/Editor/CustomAspectRatioDlg.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
+ *
+ */
+
+
+// Description : A dialog for getting an aspect ratio info from users
+// Notice      : Refer to ViewportTitleDlg cpp for a use case
+
+
+#include "EditorDefs.h"
+
+#include "CustomAspectRatioDlg.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_CustomAspectRatioDlg.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+#define MIN_ASPECT 1
+#define MAX_ASPECT 16384
+
+CCustomAspectRatioDlg::CCustomAspectRatioDlg(int x, int y, QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_xDefault(x)
+    , m_yDefault(y)
+    , m_ui(new Ui::CustomAspectRatioDlg)
+{
+    m_ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+    OnInitDialog();
+}
+
+CCustomAspectRatioDlg::~CCustomAspectRatioDlg()
+{
+}
+
+void CCustomAspectRatioDlg::OnInitDialog()
+{
+    m_ui->m_x->setRange(MIN_ASPECT, MAX_ASPECT);
+    m_ui->m_x->setValue(m_xDefault);
+
+    m_ui->m_y->setRange(MIN_ASPECT, MAX_ASPECT);
+    m_ui->m_y->setValue(m_yDefault);
+}
+
+int CCustomAspectRatioDlg::GetX() const
+{
+    return m_ui->m_x->value();
+}
+
+int CCustomAspectRatioDlg::GetY() const
+{
+    return m_ui->m_y->value();
+}
+
+#include <moc_CustomAspectRatioDlg.cpp>
diff --git a/Code/Editor/CustomAspectRatioDlg.h b/Code/Editor/CustomAspectRatioDlg.h
new file mode 100644
index 0000000000..c2ec694ad7
--- /dev/null
+++ b/Code/Editor/CustomAspectRatioDlg.h
@@ -0,0 +1,45 @@
+/*
+ * 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 : A dialog for getting an aspect ratio info from users
+// Notice      : Refer to ViewportTitleDlg cpp for a use case
+
+
+#ifndef CRYINCLUDE_EDITOR_CUSTOMASPECTRATIODLG_H
+#define CRYINCLUDE_EDITOR_CUSTOMASPECTRATIODLG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class CustomAspectRatioDlg;
+}
+
+class CCustomAspectRatioDlg
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CCustomAspectRatioDlg(int x, int y, QWidget* pParent = nullptr);
+    ~CCustomAspectRatioDlg();
+
+    int GetX() const;
+    int GetY() const;
+
+protected:
+    void OnInitDialog();
+
+    int m_xDefault, m_yDefault;
+
+    QScopedPointer<Ui::CustomAspectRatioDlg> m_ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_CUSTOMASPECTRATIODLG_H
diff --git a/Code/Sandbox/Editor/CustomAspectRatioDlg.ui b/Code/Editor/CustomAspectRatioDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/CustomAspectRatioDlg.ui
rename to Code/Editor/CustomAspectRatioDlg.ui
diff --git a/Code/Editor/CustomResolutionDlg.cpp b/Code/Editor/CustomResolutionDlg.cpp
new file mode 100644
index 0000000000..f16ea82b81
--- /dev/null
+++ b/Code/Editor/CustomResolutionDlg.cpp
@@ -0,0 +1,69 @@
+/*
+ * 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 : A dialog for getting a resolution info from users
+// Notice      : Refer to ViewportTitleDlg cpp for a use case
+
+
+#include "EditorDefs.h"
+
+#include "CustomResolutionDlg.h"
+
+// Qt
+#include <QTextStream>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_CustomResolutionDlg.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+#define MIN_RES 64
+#define MAX_RES 8192
+
+CCustomResolutionDlg::CCustomResolutionDlg(int w, int h, QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_wDefault(w)
+    , m_hDefault(h)
+    , m_ui(new Ui::CustomResolutionDlg)
+{
+    m_ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+    OnInitDialog();
+}
+
+CCustomResolutionDlg::~CCustomResolutionDlg()
+{
+}
+
+void CCustomResolutionDlg::OnInitDialog()
+{
+    m_ui->m_width->setRange(MIN_RES, MAX_RES);
+    m_ui->m_width->setValue(m_wDefault);
+
+    m_ui->m_height->setRange(MIN_RES, MAX_RES);
+    m_ui->m_height->setValue(m_hDefault);
+
+    QString maxDimensionString;
+    QTextStream(&maxDimensionString) 
+        << "Maximum Dimension: " << MAX_RES << Qt::endl 
+        << Qt::endl
+        << "Note: Dimensions over 8K may be" << Qt::endl
+        << "unstable depending on hardware.";
+    
+    m_ui->m_maxDimension->setText(maxDimensionString);
+}
+
+int CCustomResolutionDlg::GetWidth() const
+{
+    return m_ui->m_width->value();
+}
+
+int CCustomResolutionDlg::GetHeight() const
+{
+    return m_ui->m_height->value();
+}
diff --git a/Code/Editor/CustomResolutionDlg.h b/Code/Editor/CustomResolutionDlg.h
new file mode 100644
index 0000000000..11a21104a4
--- /dev/null
+++ b/Code/Editor/CustomResolutionDlg.h
@@ -0,0 +1,45 @@
+/*
+ * 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 : A dialog for getting a resolution info from users
+
+//  Notice     : Refer to ViewportTitleDlg.cpp for a use case.
+
+
+#ifndef CRYINCLUDE_EDITOR_CUSTOMRESOLUTIONDLG_H
+#define CRYINCLUDE_EDITOR_CUSTOMRESOLUTIONDLG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class CustomResolutionDlg;
+}
+
+class CCustomResolutionDlg
+    : public QDialog
+{
+public:
+    CCustomResolutionDlg(int w, int h, QWidget* pParent = nullptr);
+    ~CCustomResolutionDlg();
+
+    int GetWidth() const;
+    int GetHeight() const;
+
+protected:
+    void OnInitDialog();
+
+    int m_wDefault, m_hDefault;
+
+    QScopedPointer<Ui::CustomResolutionDlg> m_ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_CUSTOMRESOLUTIONDLG_H
diff --git a/Code/Sandbox/Editor/CustomResolutionDlg.ui b/Code/Editor/CustomResolutionDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/CustomResolutionDlg.ui
rename to Code/Editor/CustomResolutionDlg.ui
diff --git a/Code/Editor/CustomizeKeyboardDialog.cpp b/Code/Editor/CustomizeKeyboardDialog.cpp
new file mode 100644
index 0000000000..a0eb58bb59
--- /dev/null
+++ b/Code/Editor/CustomizeKeyboardDialog.cpp
@@ -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
+ *
+ */
+
+#include "EditorDefs.h"
+
+#include "CustomizeKeyboardDialog.h"
+
+// Qt
+#include <QMenu>
+#include <QMenuBar>
+#include <QMessageBox>
+
+// AzQtComponents
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_CustomizeKeyboardDialog.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+using namespace AzQtComponents;
+
+namespace
+{
+    enum CustomRole
+    {
+        ActionRole = Qt::UserRole,
+        KeySequenceRole
+    };
+}
+
+class NestedQAction
+{
+public:
+    NestedQAction()
+        : m_action(nullptr)
+    {
+    }
+    NestedQAction(const QString& path, QAction* action)
+        : m_path(path)
+        , m_action(action)
+    {
+    }
+
+    QString Path() const { return m_path; }
+    QAction* Action() const { return m_action; }
+
+private:
+    QString m_path;
+    QAction* m_action;
+};
+
+QVector<NestedQAction> GetAllActionsForMenu(const QMenu* menu, const QString& path)
+{
+    QList<QAction*> menuActions = menu->actions();
+    QVector<NestedQAction> actions;
+    actions.reserve(menuActions.size());
+    foreach(QAction * action, menuActions)
+    {
+        if (action->menu() != nullptr)
+        {
+            QString newPath = path + action->text() + QStringLiteral(" | ");
+            newPath = RemoveAcceleratorAmpersands(newPath);
+
+            QVector<NestedQAction> subMenuActions = GetAllActionsForMenu(action->menu(), newPath);
+            actions.reserve(actions.size() + subMenuActions.size());
+            actions += subMenuActions;
+        }
+        else if (!action->isSeparator())
+        {
+            actions.push_back(NestedQAction(path + RemoveAcceleratorAmpersands(action->text()), action));
+        }
+    }
+
+    return actions;
+}
+
+class MenuActionsModel
+    : public QAbstractListModel
+{
+public:
+    MenuActionsModel(QObject* parent = nullptr)
+        : QAbstractListModel(parent)
+    {
+    }
+    virtual ~MenuActionsModel() {}
+
+    int rowCount([[maybe_unused]] const QModelIndex& parent = QModelIndex()) const override
+    {
+        return m_actions.size();
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (index.row() < 0 || index.row() >= m_actions.size())
+        {
+            return {};
+        }
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+        {
+            return m_actions[index.row()].Path();
+        }
+        case ActionRole:
+            return QVariant::fromValue(m_actions[index.row()].Action());
+        }
+
+        return {};
+    }
+
+    void Reset(const QVector<NestedQAction>& actions)
+    {
+        beginResetModel();
+        m_actions = actions;
+        endResetModel();
+    }
+
+private:
+    QVector<NestedQAction> m_actions;
+};
+
+class ActionShortcutsModel
+    : public QAbstractListModel
+{
+public:
+    ActionShortcutsModel(QObject* parent = nullptr)
+        : QAbstractListModel(parent)
+        , m_action(nullptr)
+    {
+    }
+    virtual ~ActionShortcutsModel() {}
+
+    int rowCount([[maybe_unused]] const QModelIndex& parent = QModelIndex()) const override
+    {
+        if (m_action)
+        {
+            return m_action->shortcuts().size();
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        auto shortcuts = m_action->shortcuts();
+        if (index.row() < 0 || index.row() >= shortcuts.size())
+        {
+            return {};
+        }
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+            return shortcuts.at(index.row()).toString();
+        case KeySequenceRole:
+            return QVariant::fromValue(shortcuts.at(index.row()));
+        }
+
+        return {};
+    }
+
+    void RemoveAll()
+    {
+        auto shortcuts = m_action->shortcuts();
+        beginRemoveRows({}, 0, shortcuts.size() - 1);
+        shortcuts.clear();
+        m_action->setShortcuts(shortcuts);
+        endRemoveRows();
+    }
+
+    void Remove(const QKeySequence& sequence)
+    {
+        auto shortcuts = m_action->shortcuts();
+        int index = shortcuts.indexOf(sequence);
+        if (index >= 0)
+        {
+            beginRemoveRows({}, index, index);
+            shortcuts.removeAll(sequence);
+            m_action->setShortcuts(shortcuts);
+            endRemoveRows();
+        }
+    }
+
+    QModelIndex Add(const QKeySequence& sequence)
+    {
+        auto shortcuts = m_action->shortcuts();
+        int position = shortcuts.indexOf(sequence);
+        if (-1 == position)
+        {
+            position = shortcuts.size();
+            beginInsertRows({}, position, position);
+            shortcuts.append(sequence);
+            m_action->setShortcuts(shortcuts);
+            endInsertRows();
+        }
+        return index(position);
+    }
+
+    bool Contains(const QKeySequence& sequence) const
+    {
+        return m_action->shortcuts().contains(sequence);
+    }
+
+    void Reset(QAction& action)
+    {
+        emit beginResetModel();
+        m_action = &action;
+        emit endResetModel();
+    }
+
+private:
+    QAction* m_action;
+};
+
+CustomizeKeyboardDialog::CustomizeKeyboardDialog(KeyboardCustomizationSettings& settings, QWidget* parent /* = nullptr */)
+    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, parent))
+    , m_ui(new Ui::CustomizeKeyboardDialog)
+    , m_settings(settings)
+    , m_settingsSnapshot(m_settings.CreateSnapshot())
+{
+    m_ui->setupUi(this);
+
+    m_menuActionsModel = new MenuActionsModel(this);
+    m_actionShortcutsModel = new ActionShortcutsModel(this);
+    m_ui->commandsView->setModel(m_menuActionsModel);
+    m_ui->shortcutsView->setModel(m_actionShortcutsModel);
+
+    QStringList categories = BuildModels(parent);
+
+    connect(m_ui->categories, &QComboBox::currentTextChanged, this, &CustomizeKeyboardDialog::CategoryChanged);
+    connect(m_ui->commandsView->selectionModel(), &QItemSelectionModel::currentChanged, this, &CustomizeKeyboardDialog::CommandSelectionChanged);
+    connect(m_ui->shortcutsView->selectionModel(), &QItemSelectionModel::currentChanged, this, &CustomizeKeyboardDialog::ShortcutsViewSelectionChanged);
+    connect(m_actionShortcutsModel, &QAbstractItemModel::rowsRemoved, this, &CustomizeKeyboardDialog::ShortcutsViewDataChanged);
+    connect(m_actionShortcutsModel, &QAbstractItemModel::rowsInserted, this, &CustomizeKeyboardDialog::ShortcutsViewDataChanged);
+    connect(m_ui->keySequenceEdit, &QKeySequenceEdit::editingFinished, this, &CustomizeKeyboardDialog::KeySequenceEditingFinished);
+    connect(m_ui->assignButton, &QPushButton::clicked, this, &CustomizeKeyboardDialog::AssignButtonClicked);
+    connect(m_ui->removeButton, &QPushButton::clicked, this, &CustomizeKeyboardDialog::ShortcutRemoved);
+    connect(m_ui->clearButton, &QPushButton::clicked, m_actionShortcutsModel, &ActionShortcutsModel::RemoveAll);
+    connect(m_ui->buttonBox, &QDialogButtonBox::clicked, this, &CustomizeKeyboardDialog::DialogButtonClicked);
+    connect(this, &QDialog::rejected, this, [&]() { m_settings.Load(m_settingsSnapshot); });
+
+    m_ui->categories->addItems(categories);
+}
+
+CustomizeKeyboardDialog::~CustomizeKeyboardDialog()
+{
+}
+
+QStringList CustomizeKeyboardDialog::BuildModels(QWidget* parent)
+{
+    QMenuBar* menuBar = parent->findChild<QMenuBar*>();
+    QList<QAction*> menuBarActions = menuBar->actions();
+
+    QStringList categories;
+    foreach(QAction * menuAction, menuBarActions)
+    {
+        QString category = RemoveAcceleratorAmpersands(menuAction->text());
+        categories.append(category);
+
+        QMenu* menu = menuAction->menu();
+        m_menuActions[category] = GetAllActionsForMenu(menu, QStringLiteral(""));
+    }
+
+    return categories;
+}
+
+void CustomizeKeyboardDialog::CategoryChanged(const QString& category)
+{
+    m_menuActionsModel->Reset(m_menuActions[category]);
+
+    // Must reset the shortcut sequence text box back to disabled state
+    // if the category is changed
+    m_ui->keySequenceEdit->setEnabled(false);
+    m_ui->commandsView->scrollToTop();
+}
+
+void CustomizeKeyboardDialog::CommandSelectionChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
+{
+    QAction* action = current.data(ActionRole).value<QAction*>();
+    m_actionShortcutsModel->Reset(*action);
+
+    m_ui->removeButton->setEnabled(false);
+    m_ui->clearButton->setEnabled(m_actionShortcutsModel->rowCount() > 0);
+    m_ui->keySequenceEdit->setEnabled(true);
+
+    const auto& description = action->statusTip().size() > 0 ? action->statusTip() : action->toolTip();
+    m_ui->descriptionLabel->setText(description);
+    m_ui->keySequenceEdit->clear();
+}
+
+void CustomizeKeyboardDialog::ShortcutsViewSelectionChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
+{
+    m_ui->removeButton->setEnabled(current.isValid());
+}
+
+void CustomizeKeyboardDialog::ShortcutsViewDataChanged()
+{
+    m_ui->clearButton->setEnabled(m_actionShortcutsModel->rowCount() > 0);
+}
+
+void CustomizeKeyboardDialog::ShortcutRemoved()
+{
+    auto index = m_ui->shortcutsView->selectionModel()->selectedIndexes().first();
+    m_actionShortcutsModel->Remove(index.data(KeySequenceRole).value<QKeySequence>());
+}
+
+void CustomizeKeyboardDialog::KeySequenceEditingFinished()
+{
+    auto keySequence = m_ui->keySequenceEdit->keySequence();
+    m_ui->assignButton->setEnabled(!keySequence.isEmpty() && !m_actionShortcutsModel->Contains(keySequence));
+}
+
+void CustomizeKeyboardDialog::AssignButtonClicked()
+{
+    auto sequence = m_ui->keySequenceEdit->keySequence();
+    m_ui->keySequenceEdit->clear();
+
+    auto currentAction = m_settings.FindActionForShortcut(sequence);
+    if (currentAction)
+    {
+        auto result = QMessageBox::warning(
+                this,
+                tr("Shortcut already in use"),
+                tr("%1 is currently assigned to '%2'.\n\nAssign and replace?")
+                    .arg(sequence.toString()).arg(RemoveAcceleratorAmpersands(currentAction->text())),
+                QMessageBox::Yes | QMessageBox::No,
+                QMessageBox::No);
+        if (result == QMessageBox::No)
+        {
+            m_ui->keySequenceEdit->setFocus();
+            return;
+        }
+
+        //remove this sequence from the current shortcut
+        auto shortcuts = currentAction->shortcuts();
+        shortcuts.removeAll(sequence);
+        currentAction->setShortcuts(shortcuts);
+    }
+
+    QModelIndex index = m_actionShortcutsModel->Add(sequence);
+    m_ui->shortcutsView->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Clear | QItemSelectionModel::SelectCurrent);
+    m_ui->assignButton->setEnabled(false);
+    m_ui->removeButton->setFocus();
+}
+
+void CustomizeKeyboardDialog::DialogButtonClicked(const QAbstractButton* button)
+{
+    if (button == m_ui->buttonBox->button(QDialogButtonBox::RestoreDefaults))
+    {
+        auto result = QMessageBox::question(
+                this,
+                tr("Restore Default Keyboard Shortcuts"),
+                tr("Are you sure you wish to restore all keyboard shortcuts to factory defaults?"));
+        if (result == QMessageBox::Yes)
+        {
+            m_settings.LoadDefaults();
+        }
+    }
+    else if (button == m_ui->buttonBox->button(QDialogButtonBox::Close))
+    {
+        m_settings.Save();
+        accept();
+    }
+    else if (button == m_ui->buttonBox->button(QDialogButtonBox::Cancel))
+    {
+        m_settings.Load(m_settingsSnapshot);
+        reject();
+    }
+}
+
+#include <moc_CustomizeKeyboardDialog.cpp>
diff --git a/Code/Editor/CustomizeKeyboardDialog.h b/Code/Editor/CustomizeKeyboardDialog.h
new file mode 100644
index 0000000000..6f66b8c7d4
--- /dev/null
+++ b/Code/Editor/CustomizeKeyboardDialog.h
@@ -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
+ *
+ */
+#ifndef CRYINCLUDE_EDITOR_CUSTOMIZE_KEYBOARD_DIALOG_H
+#define CRYINCLUDE_EDITOR_CUSTOMIZE_KEYBOARD_DIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include "KeyboardCustomizationSettings.h"
+#endif
+
+namespace Ui
+{
+    class CustomizeKeyboardDialog;
+}
+
+class QAbstractButton;
+class NestedQAction;
+class MenuActionsModel;
+class ActionShortcutsModel;
+
+class CustomizeKeyboardDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CustomizeKeyboardDialog(KeyboardCustomizationSettings& settings, QWidget* parent = nullptr);
+    virtual ~CustomizeKeyboardDialog();
+
+private slots:
+    void CommandSelectionChanged(const QModelIndex& current, const QModelIndex& previous);
+
+    void CategoryChanged(const QString& category);
+    void DialogButtonClicked(const QAbstractButton* button);
+    void KeySequenceEditingFinished();
+    void AssignButtonClicked();
+    void ShortcutsViewSelectionChanged(const QModelIndex& current, const QModelIndex& previous);
+    void ShortcutsViewDataChanged();
+    void ShortcutRemoved();
+
+private:
+    QScopedPointer<Ui::CustomizeKeyboardDialog> m_ui;
+    QHash<QString, QVector<NestedQAction> > m_menuActions;
+
+    KeyboardCustomizationSettings& m_settings;
+    const KeyboardCustomizationSettings::Snapshot m_settingsSnapshot;
+
+    MenuActionsModel* m_menuActionsModel;
+    ActionShortcutsModel* m_actionShortcutsModel;
+
+    QStringList BuildModels(QWidget* parent);
+};
+
+#endif //CRYINCLUDE_EDITOR_CUSTOMIZE_KEYBOARD_DIALOG_H
diff --git a/Code/Sandbox/Editor/CustomizeKeyboardDialog.ui b/Code/Editor/CustomizeKeyboardDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/CustomizeKeyboardDialog.ui
rename to Code/Editor/CustomizeKeyboardDialog.ui
diff --git a/Code/Sandbox/Editor/DPIAware.xml b/Code/Editor/DPIAware.xml
similarity index 100%
rename from Code/Sandbox/Editor/DPIAware.xml
rename to Code/Editor/DPIAware.xml
diff --git a/Code/Editor/Dialogs/ErrorsDlg.cpp b/Code/Editor/Dialogs/ErrorsDlg.cpp
new file mode 100644
index 0000000000..db3f4febbc
--- /dev/null
+++ b/Code/Editor/Dialogs/ErrorsDlg.cpp
@@ -0,0 +1,102 @@
+/*
+ * 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 "ErrorsDlg.h"
+
+// Qt
+#include <QClipboard>
+#include <QStyle>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <Dialogs/ui_ErrorsDlg.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+CErrorsDlg::CErrorsDlg(QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , ui(new Ui::CErrorsDlg)
+{
+    ui->setupUi(this);
+
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+    m_bFirstMessage = true;
+
+    OnInitDialog();
+
+    connect(ui->m_buttonCopyErrors, &QPushButton::clicked, this, &CErrorsDlg::OnCopyErrors);
+    connect(ui->m_buttonClearErrors, &QPushButton::clicked, this, &CErrorsDlg::OnClearErrors);
+    connect(ui->m_buttonCancel, &QPushButton::clicked, this, &CErrorsDlg::OnCancel);
+}
+
+CErrorsDlg::~CErrorsDlg()
+{
+}
+
+void CErrorsDlg::OnInitDialog()
+{
+    auto icon = style()->standardIcon(QStyle::SP_MessageBoxCritical);
+    
+    ui->m_errorIconCtrl->setPixmap(icon.pixmap(ui->m_errorIconCtrl->width()));
+}
+
+void CErrorsDlg::AddMessage(const QString& text, const QString& caption)
+{
+    // At the load time this dialog is frozen, cause there is no message loop in progress.
+    // We need to dispatch messages before showing a window if it was closed by user.
+    if (!isVisible())
+    {
+        show();
+    }
+
+    ui->m_richEdit->moveCursor(QTextCursor::End);
+    auto textCursor = ui->m_richEdit->textCursor();
+
+    if (m_bFirstMessage)
+    {
+        m_bFirstMessage = false;
+    }
+    else
+    {
+        textCursor.insertText("\n\n");
+    }
+
+    QTextCharFormat format;
+    format.setFontWeight(QFont::Bold);
+
+    textCursor.setCharFormat(format);
+    textCursor.insertText(caption + "\n");
+
+    format.setFontWeight(QFont::Normal);
+    // Show message in a dialog
+    textCursor.setCharFormat(format);
+    textCursor.insertText(text);
+}
+
+void CErrorsDlg::OnCancel()
+{
+    hide();
+}
+
+
+void CErrorsDlg::OnCopyErrors()
+{
+    QString text = ui->m_richEdit->toPlainText();
+    QApplication::clipboard()->setText(text);
+}
+
+
+void CErrorsDlg::OnClearErrors()
+{
+    m_bFirstMessage = true;
+    ui->m_richEdit->clear();
+}
+
+#include <Dialogs/moc_ErrorsDlg.cpp>
diff --git a/Code/Editor/Dialogs/ErrorsDlg.h b/Code/Editor/Dialogs/ErrorsDlg.h
new file mode 100644
index 0000000000..be1dcd1598
--- /dev/null
+++ b/Code/Editor/Dialogs/ErrorsDlg.h
@@ -0,0 +1,49 @@
+/*
+ * 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 : Modeless dialog for list of errors.
+//               To avoid interuption on start Editor time and on load level time.
+//               Using: To add messages from any part of CryEngine you can use this style:
+//               gEnv->pSystem->ShowMessage("Text", "Caption", MB_OK);
+
+
+#ifndef CRYINCLUDE_EDITOR_DIALOGS_ERRORSDLG_H
+#define CRYINCLUDE_EDITOR_DIALOGS_ERRORSDLG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui {
+    class CErrorsDlg;
+}
+
+class CErrorsDlg
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CErrorsDlg(QWidget* pParent = nullptr);
+    virtual ~CErrorsDlg();
+    void AddMessage(const QString& text, const QString& caption);
+
+protected:
+    void OnCancel();
+    void OnInitDialog();
+
+    void OnCopyErrors();
+    void OnClearErrors();
+
+private:
+    bool m_bFirstMessage;
+    QScopedPointer<Ui::CErrorsDlg> ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_DIALOGS_ERRORSDLG_H
diff --git a/Code/Sandbox/Editor/Dialogs/ErrorsDlg.ui b/Code/Editor/Dialogs/ErrorsDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/ErrorsDlg.ui
rename to Code/Editor/Dialogs/ErrorsDlg.ui
diff --git a/Code/Editor/Dialogs/Generic/UserOptions.cpp b/Code/Editor/Dialogs/Generic/UserOptions.cpp
new file mode 100644
index 0000000000..c7e574e963
--- /dev/null
+++ b/Code/Editor/Dialogs/Generic/UserOptions.cpp
@@ -0,0 +1,74 @@
+/*
+ * 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 : These are helper classes for containing the data from the
+//               generic overwrite dialog
+
+
+#include "EditorDefs.h"
+
+#include "UserOptions.h"
+
+//////////////////////////////////////////////////////////////////////////
+CUserOptions::CUserOptionsReferenceCountHelper::CUserOptionsReferenceCountHelper(CUserOptions& roUserOptions)
+    : m_roReferencedUserOptionsObject(roUserOptions)
+{
+    m_roReferencedUserOptionsObject.IncRef();
+}
+//////////////////////////////////////////////////////////////////////////
+CUserOptions::CUserOptionsReferenceCountHelper::~CUserOptionsReferenceCountHelper()
+{
+    m_roReferencedUserOptionsObject.DecRef();
+}
+//////////////////////////////////////////////////////////////////////////
+CUserOptions::CUserOptions()
+{
+    m_boToAll = false;
+    m_nCurrentOption = ENotSet;
+}
+//////////////////////////////////////////////////////////////////////////
+bool    CUserOptions::IsOptionValid()
+{
+    return m_nCurrentOption != ENotSet;
+}
+//////////////////////////////////////////////////////////////////////////
+int CUserOptions::GetOption()
+{
+    return m_nCurrentOption;
+}
+//////////////////////////////////////////////////////////////////////////
+bool    CUserOptions::IsOptionToAll()
+{
+    return m_boToAll;
+}
+//////////////////////////////////////////////////////////////////////////
+void    CUserOptions::SetOption(int nNewOption, bool boToAll)
+{
+    m_nCurrentOption = nNewOption;
+    m_boToAll = boToAll;
+}
+//////////////////////////////////////////////////////////////////////////
+int CUserOptions::DecRef()
+{
+    if (m_nNumberOfReferences >= 1)
+    {
+        --m_nNumberOfReferences;
+        if (m_nNumberOfReferences == 0)
+        {
+            SetOption(CUserOptions::ENotSet, false);
+        }
+    }
+    return m_nNumberOfReferences;
+}
+//////////////////////////////////////////////////////////////////////////
+int CUserOptions::IncRef()
+{
+    ++m_nNumberOfReferences;
+    return m_nNumberOfReferences;
+}
+//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Dialogs/Generic/UserOptions.h b/Code/Editor/Dialogs/Generic/UserOptions.h
new file mode 100644
index 0000000000..d198753f02
--- /dev/null
+++ b/Code/Editor/Dialogs/Generic/UserOptions.h
@@ -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
+ *
+ */
+
+
+// Description : These are helper classes for containing the data from the
+//               generic overwrite dialog.
+
+#ifndef CRYINCLUDE_EDITOR_DIALOGS_GENERIC_USEROPTIONS_H
+#define CRYINCLUDE_EDITOR_DIALOGS_GENERIC_USEROPTIONS_H
+#pragma once
+
+
+// Small helper class.
+// Hint: have one for files and other for directories.
+// Hint: used a CUserOptionsReferenceCountHelper to automatically control the reference counts
+// of any CUserOptions variable: usefull for recursion when you don't want to use
+// only static variables. See example in FileUtill.cpp, function CopyTree.
+class CUserOptions
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Types & typedefs
+public:
+    enum EOption
+    {
+        ENotSet,
+        EYes = 6,
+        ENo = 7,
+        ECancel = 2,
+    };
+
+    class CUserOptionsReferenceCountHelper
+    {
+    public:
+        CUserOptionsReferenceCountHelper(CUserOptions& roUserOptions);
+        virtual ~CUserOptionsReferenceCountHelper();
+    protected:
+        CUserOptions&   m_roReferencedUserOptionsObject;
+    };
+protected:
+private:
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Methods
+public:
+    CUserOptions();
+
+    bool        IsOptionValid();
+
+    int         GetOption();
+
+    bool        IsOptionToAll();
+
+    void        SetOption(int   nNewOption, bool boToAll);
+
+    int DecRef();
+    int IncRef();
+protected:
+private:
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Data
+public:
+protected:
+    int                         m_nCurrentOption;
+    bool                        m_boToAll;
+    int                         m_nNumberOfReferences;
+private:
+    //////////////////////////////////////////////////////////////////////////
+};
+#endif // CRYINCLUDE_EDITOR_DIALOGS_GENERIC_USEROPTIONS_H
diff --git a/Code/Editor/Dialogs/PythonScriptsDialog.cpp b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
new file mode 100644
index 0000000000..ef9c812296
--- /dev/null
+++ b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
@@ -0,0 +1,174 @@
+/*
+ * 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 "PythonScriptsDialog.h"
+
+// AzCore
+#include <AzCore/Module/Module.h>                               // for AZ::ModuleData
+#include <AzCore/Module/ModuleManagerBus.h>                     // for AZ::ModuleManagerRequestBus
+#include <AzCore/Module/DynamicModuleHandle.h>                  // for AZ::DynamicModuleHandle
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/Utils/Utils.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ViewPaneOptions.h>               // for AzToolsFramework::ViewPaneOptions
+#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h> // for AzToolsFramework::EditorPythonRunnerRequestBus
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/LineEdit.h>
+
+// Editor
+#include "Settings.h"
+#include "LyViewPaneNames.h"
+
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <Dialogs/ui_PythonScriptsDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+//////////////////////////////////////////////////////////////////////////
+namespace
+{
+    // File name extension for python files
+    const QString s_kPythonFileNameSpec = "*.py";
+
+    // Tree root element name
+    const QString s_kRootElementName = "Python Scripts";
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CPythonScriptsDialog::RegisterViewClass()
+{
+    if (AzToolsFramework::EditorPythonRunnerRequestBus::HasHandlers())
+    {
+        AzToolsFramework::ViewPaneOptions options;
+        options.canHaveMultipleInstances = true;
+        AzToolsFramework::RegisterViewPane<CPythonScriptsDialog>("Python Scripts", LyViewPane::CategoryOther, options);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CPythonScriptsDialog::CPythonScriptsDialog(QWidget* parent)
+    : QWidget(parent)
+    , ui(new Ui::CPythonScriptsDialog)
+{
+    ui->setupUi(this);
+
+    AzQtComponents::LineEdit::applySearchStyle(ui->searchField);
+
+    QStringList scriptFolders;
+    auto engineScriptPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets" / "Editor" / "Scripts";
+    scriptFolders.push_back(engineScriptPath.c_str());
+
+    AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
+    ScanFolderForScripts(QString("%1/Editor/Scripts").arg(projectPath.c_str()), scriptFolders);
+
+    struct GetGemSourcePathsVisitor
+        : AZ::SettingsRegistryInterface::Visitor
+    {
+        GetGemSourcePathsVisitor(AZ::SettingsRegistryInterface& settingsRegistry)
+            : m_settingsRegistry(settingsRegistry)
+        {}
+        void Visit(AZStd::string_view path, AZStd::string_view, AZ::SettingsRegistryInterface::Type,
+            AZStd::string_view value) override
+        {
+            AZStd::string_view jsonSourcePathPointer{ path };
+            // Remove the array index from the path and check if the JSON path ends with "/SourcePaths"
+            AZ::StringFunc::TokenizeLast(jsonSourcePathPointer, "/");
+            if (jsonSourcePathPointer.ends_with("/SourcePaths"))
+            {
+                AZ::IO::Path newSourcePath = jsonSourcePathPointer;
+                // Resolve any file aliases first - Do not use ResolvePath() as that assumes
+                // any relative path is underneath the @assets@ alias
+                if (auto fileIoBase = AZ::IO::FileIOBase::GetInstance(); fileIoBase != nullptr)
+                {
+                    AZ::IO::FixedMaxPath replacedAliasPath;
+                    if (fileIoBase->ReplaceAlias(replacedAliasPath, value))
+                    {
+                        newSourcePath = AZ::IO::PathView(replacedAliasPath);
+                    }
+                }
+
+                // The current assumption is that the gem source path is the relative to the engine root
+                AZ::IO::Path engineRootPath;
+                m_settingsRegistry.Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+                newSourcePath = (engineRootPath / newSourcePath).LexicallyNormal();
+
+                if (auto gemSourcePathIter = AZStd::find(m_gemSourcePaths.begin(), m_gemSourcePaths.end(), newSourcePath);
+                    gemSourcePathIter == m_gemSourcePaths.end())
+                {
+                    m_gemSourcePaths.emplace_back(AZStd::move(newSourcePath));
+                }
+            }
+        }
+
+        AZStd::vector<AZ::IO::Path> m_gemSourcePaths;
+    private:
+        AZ::SettingsRegistryInterface& m_settingsRegistry;
+    };
+
+    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+    {
+        GetGemSourcePathsVisitor visitor{ *settingsRegistry };
+        constexpr auto gemListKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::OrganizationRootKey)
+            + "/Gems";
+        settingsRegistry->Visit(visitor, gemListKey);
+        for (const AZ::IO::Path& gemSourcePath : visitor.m_gemSourcePaths)
+        {
+            ScanFolderForScripts(QString("%1/Editor/Scripts").arg(gemSourcePath.c_str()), scriptFolders);
+        }
+    }
+
+    ui->treeView->init(scriptFolders, s_kPythonFileNameSpec, s_kRootElementName, false, false);
+    QObject::connect(ui->treeView, &CFolderTreeCtrl::ItemDoubleClicked, this, &CPythonScriptsDialog::OnExecute);
+    QObject::connect(ui->executeButton, &QPushButton::clicked, this, &CPythonScriptsDialog::OnExecute);
+    QObject::connect(ui->searchField, &QLineEdit::textChanged, ui->treeView, &CFolderTreeCtrl::SetSearchFilter);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CPythonScriptsDialog::ScanFolderForScripts(QString path, QStringList& scriptFolders) const
+{
+    char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
+    if (AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(path.toLocal8Bit().constData(), resolvedPath, AZ_MAX_PATH_LEN))
+    {
+        if (AZ::IO::SystemFile::Exists(resolvedPath))
+        {
+            scriptFolders.push_back(path);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CPythonScriptsDialog::~CPythonScriptsDialog()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CPythonScriptsDialog::OnExecute()
+{
+    QList<QStandardItem*> selectedItems = ui->treeView->GetSelectedItems();
+    QStandardItem* selectedItem = selectedItems.empty() ? nullptr : selectedItems.first();
+
+    if (selectedItem == NULL)
+    {
+        return;
+    }
+
+    if (ui->treeView->IsFile(selectedItem))
+    {
+        auto scriptPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / ui->treeView->GetPath(selectedItem).toUtf8().constData();
+        using namespace AzToolsFramework;
+        EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByFilename, scriptPath.Native());
+    }
+}
+
+#include <Dialogs/moc_PythonScriptsDialog.cpp>
diff --git a/Code/Editor/Dialogs/PythonScriptsDialog.h b/Code/Editor/Dialogs/PythonScriptsDialog.h
new file mode 100644
index 0000000000..40c53e48bd
--- /dev/null
+++ b/Code/Editor/Dialogs/PythonScriptsDialog.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_DIALOGS_PYTHONSCRIPTSDIALOG_H
+#define CRYINCLUDE_EDITOR_DIALOGS_PYTHONSCRIPTSDIALOG_H
+#pragma once
+
+
+#if !defined(Q_MOC_RUN)
+#include <QWidget>
+#include <QScopedPointer>
+#endif
+
+namespace Ui {
+    class CPythonScriptsDialog;
+}
+
+class CPythonScriptsDialog
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit CPythonScriptsDialog(QWidget* parent = nullptr);
+    ~CPythonScriptsDialog();
+
+    static const GUID& GetClassID()
+    {
+        // {C61C9C4C-CFED-47C4-8FE1-79069D0284E1}
+        static const GUID guid = {
+            0xc61c9c4c, 0xcfed, 0x47c4, { 0x8f, 0xe1, 0x79, 0x6, 0x9d, 0x2, 0x84, 0xe1 }
+        };
+
+        return guid;
+    }
+
+    static void RegisterViewClass();
+
+private slots:
+    void OnExecute();
+
+protected:
+    void ScanFolderForScripts(QString path, QStringList& scriptFolders) const;
+
+private:
+    QScopedPointer<Ui::CPythonScriptsDialog> ui;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_DIALOGS_PYTHONSCRIPTSDIALOG_H
diff --git a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.ui b/Code/Editor/Dialogs/PythonScriptsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.ui
rename to Code/Editor/Dialogs/PythonScriptsDialog.ui
diff --git a/Code/Editor/DimensionsDialog.cpp b/Code/Editor/DimensionsDialog.cpp
new file mode 100644
index 0000000000..004ed4acbb
--- /dev/null
+++ b/Code/Editor/DimensionsDialog.cpp
@@ -0,0 +1,70 @@
+/*
+ * 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 "DimensionsDialog.h"
+
+// Qt
+#include <QButtonGroup>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_DimensionsDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+CDimensionsDialog::CDimensionsDialog(QWidget* pParent /*=nullptr*/)
+    : QDialog(pParent)
+    , m_group(new QButtonGroup(this))
+    , ui(new Ui::CDimensionsDialog)
+{
+    ui->setupUi(this);
+
+    setWindowTitle(tr("Generate Terrain Texture"));
+
+    m_group->addButton(ui->Dim512, 512);
+    m_group->addButton(ui->Dim1024, 1024);
+    m_group->addButton(ui->Dim2048, 2048);
+    m_group->addButton(ui->Dim4096, 4096);
+    m_group->addButton(ui->Dim8192, 8192);
+    m_group->addButton(ui->Dim16384, 16384);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CDimensionsDialog::~CDimensionsDialog()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDimensionsDialog::SetDimensions(unsigned int iWidth)
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Select a dimension option button in the dialog
+    ////////////////////////////////////////////////////////////////////////
+
+    QAbstractButton* button = m_group->button(iWidth);
+    assert(button);
+
+    button->setChecked(true);
+}
+
+UINT CDimensionsDialog::GetDimensions()
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Get the currently selected dimension option button in the dialog
+    ////////////////////////////////////////////////////////////////////////
+
+    assert(m_group->checkedId() != -1);
+
+    return m_group->checkedId();
+}
+
+#include <moc_DimensionsDialog.cpp>
diff --git a/Code/Editor/DimensionsDialog.h b/Code/Editor/DimensionsDialog.h
new file mode 100644
index 0000000000..d362f41eeb
--- /dev/null
+++ b/Code/Editor/DimensionsDialog.h
@@ -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
+ *
+ */
+
+
+#pragma once
+#ifndef CRYINCLUDE_EDITOR_DIMENSIONSDIALOG_H
+#define CRYINCLUDE_EDITOR_DIMENSIONSDIALOG_H
+
+#if !defined(Q_MOC_RUN)
+#include <QScopedPointer>
+
+#include <QDialog>
+#endif
+
+class QButtonGroup;
+
+namespace Ui {
+    class CDimensionsDialog;
+}
+
+class CDimensionsDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CDimensionsDialog(QWidget* pParent = nullptr);   // standard constructor
+    ~CDimensionsDialog();
+
+    UINT GetDimensions();
+    void SetDimensions(unsigned int iWidth);
+
+protected:
+    void UpdateData(bool fromUi = true);    // DDX/DDV support
+
+private:
+    QButtonGroup* m_group;
+
+    QScopedPointer<Ui::CDimensionsDialog> ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_DIMENSIONSDIALOG_H
diff --git a/Code/Sandbox/Editor/DimensionsDialog.ui b/Code/Editor/DimensionsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/DimensionsDialog.ui
rename to Code/Editor/DimensionsDialog.ui
diff --git a/Code/Editor/DisplaySettings.cpp b/Code/Editor/DisplaySettings.cpp
new file mode 100644
index 0000000000..18373a8bfc
--- /dev/null
+++ b/Code/Editor/DisplaySettings.cpp
@@ -0,0 +1,244 @@
+/*
+ * 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 : Display Settings implementation.
+
+#include "EditorDefs.h"
+
+#include "DisplaySettings.h"
+
+// Qt
+#include <QSettings>
+
+// Editor
+#include "Settings.h"
+
+
+
+//////////////////////////////////////////////////////////////////////////
+CDisplaySettings::CDisplaySettings()
+{
+    m_flags = SETTINGS_NOLABELS | SETTINGS_NOCOLLISION;
+    m_objectHideMask = 0;
+
+    // All flags besides GI enabled by default
+    m_renderFlags = RENDER_FLAG_LAST_ONE - 1;
+    m_renderFlags &= ~(RENDER_FLAG_BBOX);
+    m_renderFlags &= ~(RENDER_FLAG_GI);
+    m_debugFlags = 0;
+    m_labelsDistance = 100;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CDisplaySettings::~CDisplaySettings()
+{
+}
+
+void CDisplaySettings::SaveRegistry()
+{
+    SaveValue("Settings", "ObjectHideMask", m_objectHideMask);
+    SaveValue("Settings", "RenderFlags", m_renderFlags);
+    SaveValue("Settings", "DisplayFlags", m_flags & SETTINGS_SERIALIZABLE_FLAGS_MASK);
+    SaveValue("Settings", "DebugFlags", m_debugFlags);
+    SaveValue("Settings", "LabelsDistance", m_labelsDistance);
+}
+
+void CDisplaySettings::LoadRegistry()
+{
+    LoadValue("Settings", "ObjectHideMask", m_objectHideMask);
+    LoadValue("Settings", "RenderFlags", m_renderFlags);
+    LoadValue("Settings", "DisplayFlags", m_flags);
+    m_flags &= SETTINGS_SERIALIZABLE_FLAGS_MASK;
+    LoadValue("Settings", "DebugFlags", m_debugFlags);
+    int temp = m_labelsDistance;
+    LoadValue("Settings", "LabelsDistance", temp);
+    m_labelsDistance = temp;
+
+    gSettings.objectHideMask = m_objectHideMask;
+}
+
+void CDisplaySettings::SetObjectHideMask(int hideMask)
+{
+    m_objectHideMask = hideMask;
+
+    gSettings.objectHideMask = m_objectHideMask;
+
+    GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::PostInitApply()
+{
+    SetRenderFlags(m_renderFlags);
+    SetDebugFlags(m_debugFlags);
+}
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::SetRenderFlags(int flags)
+{
+    m_renderFlags = flags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::SetDebugFlags(int flags)
+{
+    m_debugFlags = flags;
+
+    //
+    //SetCVar( "ai_DebugDraw",m_debugFlags&DBG_AI_DEBUGDRAW );
+    //SetCVarInt( "r_TexLog",(m_debugFlags&DBG_TEXTURE_MEMINFO) ? 2:0 );
+    //SetCVarInt( "MemStats",(m_debugFlags&DBG_MEMSTATS) ? 1000:0 );
+    //SetCVarInt( "p_draw_helpers",(m_debugFlags&DBG_PHYSICS_DEBUGDRAW) ? 5634:0 );
+
+    //SetCVar( "r_ProfileShaders",(m_debugFlags&DBG_RENDERER_PROFILESHADERS) );
+
+    SetCVarInt("r_MeasureOverdraw", (m_debugFlags & DBG_RENDERER_OVERDRAW) ? 1 : 0);   //Eric@conffx display Overdraw in Particle editor preview window
+    //SetCVarInt( "r_Stats",(m_debugFlags&DBG_RENDERER_RESOURCES) ? 4:0 );
+    //SetCVarInt( "sys_enable_budgetmonitoring",(m_debugFlags&DBG_BUDGET_MONITORING) ? 4:0 );
+
+    //SetCVarInt( "Profile",(m_debugFlags&DBG_FRAMEPROFILE) ? 1:0 );
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::SetCVar(const char* cvar, bool value)
+{
+    ICVar* var = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(cvar);
+    if (var)
+    {
+        var->Set((value) ? 1 : 0);
+    }
+    else
+    {
+        CLogFile::FormatLine("Console Variable %s not declared", cvar);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::SetCVarInt(const char* cvar, int value)
+{
+    ICVar* var = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(cvar);
+    if (var)
+    {
+        var->Set(value);
+    }
+    else
+    {
+        CLogFile::FormatLine("Console Variable %s not declared", cvar);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::DisplayLabels(bool bEnable)
+{
+    if (bEnable)
+    {
+        m_flags &= ~SETTINGS_NOLABELS;
+    }
+    else
+    {
+        m_flags |= SETTINGS_NOLABELS;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::DisplayTracks(bool bEnable)
+{
+    if (bEnable)
+    {
+        m_flags &= ~SETTINGS_HIDE_TRACKS;
+    }
+    else
+    {
+        m_flags |= SETTINGS_HIDE_TRACKS;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::DisplayLinks(bool bEnable)
+{
+    if (bEnable)
+    {
+        m_flags &= ~SETTINGS_HIDE_LINKS;
+    }
+    else
+    {
+        m_flags |= SETTINGS_HIDE_LINKS;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::DisplayHelpers(bool bEnable)
+{
+    if (bEnable)
+    {
+        m_flags &= ~SETTINGS_HIDE_HELPERS;
+    }
+    else
+    {
+        m_flags |= SETTINGS_HIDE_HELPERS;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::DisplayDimensionFigures(bool bEnable)
+{
+    if (bEnable)
+    {
+        m_flags |= SETTINGS_SHOW_DIMENSIONFIGURES;
+    }
+    else
+    {
+        m_flags &= ~SETTINGS_SHOW_DIMENSIONFIGURES;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::SetHighlightBreakable(bool bHighlight)
+{
+    if (bHighlight)
+    {
+        m_debugFlags |= DBG_HIGHLIGHT_BREAKABLE;
+    }
+    else
+    {
+        m_debugFlags &= ~DBG_HIGHLIGHT_BREAKABLE;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::SetHighlightMissingSurfaceType(bool bHighlight)
+{
+    if (bHighlight)
+    {
+        m_debugFlags |= DBG_HIGHLIGHT_MISSING_SURFACE_TYPE;
+    }
+    else
+    {
+        m_debugFlags &= ~DBG_HIGHLIGHT_MISSING_SURFACE_TYPE;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::SaveValue(const char* sSection, const char* sKey, int value)
+{
+    QSettings settings;
+    settings.setValue(QStringLiteral("%1/%2").arg(sSection, sKey), value);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::LoadValue(const char* sSection, const char* sKey, int& value)
+{
+    QSettings settings;
+    value = settings.value(QStringLiteral("%1/%2").arg(sSection, sKey), value).toInt();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CDisplaySettings::LoadValue(const char* sSection, const char* sKey, bool& value)
+{
+    QSettings settings;
+    value = settings.value(QStringLiteral("%1/%2").arg(sSection, sKey), value).toInt();
+}
diff --git a/Code/Editor/DisplaySettings.h b/Code/Editor/DisplaySettings.h
new file mode 100644
index 0000000000..64136050c7
--- /dev/null
+++ b/Code/Editor/DisplaySettings.h
@@ -0,0 +1,155 @@
+/*
+ * 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 : Display Settings definition.
+
+
+#ifndef CRYINCLUDE_EDITOR_DISPLAYSETTINGS_H
+#define CRYINCLUDE_EDITOR_DISPLAYSETTINGS_H
+
+#pragma once
+
+//////////////////////////////////////////////////////////////////////////
+enum EDisplayRenderFlags
+{
+    RENDER_FLAG_BBOX            = 1 << 0,
+    RENDER_FLAG_ROADS           = 1 << 1,
+    RENDER_FLAG_DECALS      = 1 << 2,
+    RENDER_FLAG_DETAILTEX   = 1 << 3,
+    RENDER_FLAG_FOG             = 1 << 4,
+    RENDER_FLAG_INDOORS     = 1 << 5,
+    RENDER_FLAG_LIVINGOBJ   = 1 << 6,
+    RENDER_FLAG_STATICOBJ   = 1 << 7,
+    RENDER_FLAG_SHADOWMAPS = 1 << 8,
+    RENDER_FLAG_SKYBOX      = 1 << 9,
+    RENDER_FLAG_TERRAIN     = 1 << 10,
+    RENDER_FLAG_WATER           = 1 << 11,
+    RENDER_FLAG_DETAILOBJ   = 1 << 12,
+
+    RENDER_FLAG_PARTICLES = 1 << 14,
+    RENDER_FLAG_VOXELS    = 1 << 15,
+    RENDER_FLAG_CLOUDS    = 1 << 16,
+    RENDER_FLAG_IMPOSTERS = 1 << 17,
+    RENDER_FLAG_BEAMS     = 1 << 18,
+    RENDER_FLAG_GI              = 1 << 19,
+    RENDER_FLAG_ALPHABLEND = 1 << 20,
+
+    //update this!
+    RENDER_FLAG_LAST_ONE = 1 << 21
+
+        // Debugging options.
+        //RENDER_FLAG_PROFILE = 1<<22,
+        //RENDER_FLAG_AIDEBUGDRAW = 1<<23,
+        //RENDER_FLAG_MEMINFO = 1<<24,
+};
+
+//////////////////////////////////////////////////////////////////////////
+enum EDisplaySettingsFlags
+{
+    SETTINGS_NOCOLLISION = 0x01,//!< Disable collision with terrain.
+    SETTINGS_NOLABELS = 0x02,       //!< Do not draw labels.
+    SETTINGS_PHYSICS = 0x04,        //!< Physics simulation is enabled.
+    SETTINGS_HIDE_TRACKS = 0x08, //!< Enable displaying of animation tracks in views.
+    SETTINGS_HIDE_LINKS = 0x10, //!< Enable displaying of links between objects.
+    SETTINGS_HIDE_HELPERS = 0x20, //!< Disable displaying of all object helpers.
+    SETTINGS_SHOW_DIMENSIONFIGURES = 0x40, //!< Enable displaying of dimension figures.
+
+    SETTINGS_SERIALIZABLE_FLAGS_MASK = ~(SETTINGS_PHYSICS),
+};
+
+//////////////////////////////////////////////////////////////////////////
+enum EDebugSettingsFlags
+{
+    DBG_MEMINFO                     = 0x002,
+    DBG_MEMSTATS                    = 0x004,
+    DBG_TEXTURE_MEMINFO     = 0x008,
+    DBG_AI_DEBUGDRAW            = 0x010,
+    DBG_PHYSICS_DEBUGDRAW   = 0x020,
+    DBG_RENDERER_PROFILE    = 0x040,
+    DBG_RENDERER_PROFILESHADERS = 0x080,
+    DBG_RENDERER_OVERDRAW   = 0x100,
+    DBG_RENDERER_RESOURCES  = 0x200,
+    DBG_FRAMEPROFILE                = 0x400,
+    DBG_DEBUG_LIGHTS                = 0x800,
+    DBG_BUDGET_MONITORING       = 0x1000,
+    DBG_HIGHLIGHT_BREAKABLE = 0x2000,
+    DBG_HIGHLIGHT_MISSING_SURFACE_TYPE = 0x4000
+};
+
+/*!
+ *  CDisplaySettings is a collection of information about how to display current views.
+ */
+class SANDBOX_API CDisplaySettings
+{
+public:
+    CDisplaySettings();
+    ~CDisplaySettings();
+
+    void PostInitApply();
+
+    void SetSettings(int flags) { m_flags = flags; };
+    int GetSettings() const { return m_flags; };
+
+    void SetObjectHideMask(int m_objectHideMask);
+    int GetObjectHideMask() const { return m_objectHideMask; }
+
+    void SetRenderFlags(int flags);
+    int GetRenderFlags() const { return m_renderFlags; }
+
+    void SetDebugFlags(int flags);
+    int GetDebugFlags() const { return m_debugFlags; }
+
+    void DisplayLabels(bool bEnable);
+    bool IsDisplayLabels() const { return (m_flags & SETTINGS_NOLABELS) == 0; };
+
+    void DisplayTracks(bool bEnable);
+    bool IsDisplayTracks() const { return (m_flags & SETTINGS_HIDE_TRACKS) == 0; };
+
+    void DisplayLinks(bool bEnable);
+    bool IsDisplayLinks() const { return (m_flags & SETTINGS_HIDE_LINKS) == 0; };
+
+    void DisplayHelpers(bool bEnable);
+    bool IsDisplayHelpers() const { return (m_flags & SETTINGS_HIDE_HELPERS) == 0; };
+
+    void DisplayDimensionFigures(bool bEnable);
+    bool IsDisplayDimensionFigures() const {    return m_flags & SETTINGS_SHOW_DIMENSIONFIGURES;  };
+
+    void SetLabelsDistance(float dist) { m_labelsDistance = dist; };
+    float GetLabelsDistance() const { return m_labelsDistance; };
+
+    bool IsHighlightBreakable() const { return (m_debugFlags & DBG_HIGHLIGHT_BREAKABLE) != 0; }
+    void SetHighlightBreakable(bool bEnable);
+
+    bool IsHighlightMissingSurfaceType() const { return (m_debugFlags & DBG_HIGHLIGHT_MISSING_SURFACE_TYPE) != 0; }
+    void SetHighlightMissingSurfaceType(bool bEnable);
+
+    void SaveRegistry();
+    void LoadRegistry();
+
+private:
+    // Restrict access.
+    CDisplaySettings(const CDisplaySettings&) {}
+    void operator=(const CDisplaySettings&) {}
+
+    void SetCVar(const char* cvar, bool val);
+    void SetCVarInt(const char* cvar, int val);
+    void SaveValue(const char* sSection, const char* sKey, int value);
+    void LoadValue(const char* sSection, const char* sKey, int& value);
+    void LoadValue(const char* sSection, const char* sKey, bool& value);
+
+    int m_objectHideMask;
+    int m_renderFlags;
+    int m_flags;
+
+    //! Debug/profile settings.
+    //! @see EDebugSettingsFlags.
+    int m_debugFlags;
+    float m_labelsDistance;
+};
+
+#endif // CRYINCLUDE_EDITOR_DISPLAYSETTINGS_H
diff --git a/Code/Editor/DisplaySettingsPythonFuncs.cpp b/Code/Editor/DisplaySettingsPythonFuncs.cpp
new file mode 100644
index 0000000000..85806d2c0c
--- /dev/null
+++ b/Code/Editor/DisplaySettingsPythonFuncs.cpp
@@ -0,0 +1,196 @@
+/*
+ * 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 "DisplaySettingsPythonFuncs.h"
+
+// AzCore
+#include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+// Editor
+#include "DisplaySettings.h"
+
+namespace
+{
+    int PyGetMiscDisplaySettings()
+    {
+        return GetIEditor()->GetDisplaySettings()->GetSettings();
+    }
+
+    void PySetMiscDisplaySettings(int flags)
+    {
+        GetIEditor()->GetDisplaySettings()->SetSettings(flags);
+    }
+}
+
+namespace AzToolsFramework
+{
+    bool DisplaySettingsState::operator==(const DisplaySettingsState& rhs) const
+    {
+        return this->m_noCollision == rhs.m_noCollision &&
+            this->m_noLabels == rhs.m_noLabels &&
+            this->m_simulate == rhs.m_simulate &&
+            this->m_hideTracks == rhs.m_hideTracks &&
+            this->m_hideLinks == rhs.m_hideLinks &&
+            this->m_hideHelpers == rhs.m_hideHelpers &&
+            this->m_showDimensionFigures == rhs.m_showDimensionFigures;
+    }
+
+    AZStd::string DisplaySettingsState::ToString() const
+    {
+        auto boolToPyString = [](bool v)
+        {
+            return v ? "True" : "False";
+        };
+
+        return AZStd::string::format("(no_collision=%s, no_labels=%s, simulate=%s, hide_tracks=%s, hide_links=%s, hide_helpers=%s, show_dimension_figures=%s)",
+            boolToPyString(this->m_noCollision),
+            boolToPyString(this->m_noLabels),
+            boolToPyString(this->m_simulate),
+            boolToPyString(this->m_hideTracks),
+            boolToPyString(this->m_hideLinks),
+            boolToPyString(this->m_hideHelpers),
+            boolToPyString(this->m_showDimensionFigures)
+            );
+    }
+
+    void DisplaySettingsPythonFuncsHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            // this will put these methods into the 'azlmbr.legacy.settings' module
+            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Settings")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.settings");
+            };
+            addLegacyGeneral(behaviorContext->Method("get_misc_editor_settings", PyGetMiscDisplaySettings, nullptr, "Get miscellaneous Editor settings (camera collides with terrain, AI/Physics enabled, etc)."));
+            addLegacyGeneral(behaviorContext->Method("set_misc_editor_settings", PySetMiscDisplaySettings, nullptr, "Set miscellaneous Editor settings (camera collides with terrain, AI/Physics enabled, etc)."));
+            
+            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_NOCOLLISION>("DisplaySettings_NoCollision")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_NOLABELS>("DisplaySettings_NoLabels")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_PHYSICS>("DisplaySettings_Physics")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_HIDE_TRACKS>("DisplaySettings_HideTracks")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_HIDE_LINKS>("DisplaySettings_HideLinks")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_HIDE_HELPERS>("DisplaySettings_HideHelpers")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_SHOW_DIMENSIONFIGURES>("DisplaySettings_ShowDimensionFigures")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_SERIALIZABLE_FLAGS_MASK>("DisplaySettings_SerializableFlagsMask")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
+        }
+    }
+
+    void DisplaySettingsComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<DisplaySettingsComponent, AZ::Component>();
+
+            serializeContext->Class<DisplaySettingsState>()
+                ->Version(1)
+                ->Field("NoCollision", &DisplaySettingsState::m_noCollision)
+                ->Field("NoLabels", &DisplaySettingsState::m_noLabels)
+                ->Field("Simulate", &DisplaySettingsState::m_simulate)
+                ->Field("HideTracks", &DisplaySettingsState::m_hideTracks)
+                ->Field("HideLinks", &DisplaySettingsState::m_hideLinks)
+                ->Field("HideHelpers", &DisplaySettingsState::m_hideHelpers)
+                ->Field("ShowDimensionFigures", &DisplaySettingsState::m_showDimensionFigures)
+                ;
+        }
+
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->Class<DisplaySettingsState>("DisplaySettingsState")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                ->Attribute(AZ::Script::Attributes::Category, "DisplaySettings")
+                ->Attribute(AZ::Script::Attributes::Module, "display_settings")
+                ->Property("NoCollision", BehaviorValueProperty(&DisplaySettingsState::m_noCollision))
+                    ->Attribute(AZ::Script::Attributes::Alias, "no_collision")
+                ->Property("NoLabels", BehaviorValueProperty(&DisplaySettingsState::m_noLabels))
+                    ->Attribute(AZ::Script::Attributes::Alias, "no_labels")
+                ->Property("Simulate", BehaviorValueProperty(&DisplaySettingsState::m_simulate))
+                    ->Attribute(AZ::Script::Attributes::Alias, "simulate")
+                ->Property("HideTracks", BehaviorValueProperty(&DisplaySettingsState::m_hideTracks))
+                    ->Attribute(AZ::Script::Attributes::Alias, "hide_tracks")
+                ->Property("HideLinks", BehaviorValueProperty(&DisplaySettingsState::m_hideLinks))
+                    ->Attribute(AZ::Script::Attributes::Alias, "hide_links")
+                ->Property("HideHelpers", BehaviorValueProperty(&DisplaySettingsState::m_hideHelpers))
+                    ->Attribute(AZ::Script::Attributes::Alias, "hide_helpers")
+                ->Property("ShowDimensionFigures", BehaviorValueProperty(&DisplaySettingsState::m_showDimensionFigures))
+                    ->Attribute(AZ::Script::Attributes::Alias, "show_dimension_figures")
+                ->Method("ToString", &DisplaySettingsState::ToString)
+                ;
+
+            behaviorContext->EBus<DisplaySettingsBus>("DisplaySettingsBus")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                ->Attribute(AZ::Script::Attributes::Category, "DisplaySettings")
+                ->Attribute(AZ::Script::Attributes::Module, "display_settings")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                ->Event("GetSettingsState", &DisplaySettingsRequests::GetSettingsState)
+                ->Event("SetSettingsState", &DisplaySettingsRequests::SetSettingsState)
+            ;
+        }
+    }
+
+    void DisplaySettingsComponent::Activate()
+    {
+        DisplaySettingsBus::Handler::BusConnect();
+    }
+
+    void DisplaySettingsComponent::Deactivate()
+    {
+        DisplaySettingsBus::Handler::BusDisconnect();
+    }
+
+    DisplaySettingsState DisplaySettingsComponent::GetSettingsState() const
+    {
+        return ConvertToSettings(GetIEditor()->GetDisplaySettings()->GetSettings());
+    }
+
+    void DisplaySettingsComponent::SetSettingsState(const DisplaySettingsState& settingsState)
+    {
+        uint flags = ConvertToFlags(settingsState);
+        GetIEditor()->GetDisplaySettings()->SetSettings(flags);
+    }
+
+    int DisplaySettingsComponent::ConvertToFlags(const DisplaySettingsState& state) const
+    {
+        int flags = 0;
+        flags |= state.m_noCollision ? SETTINGS_NOCOLLISION : 0x0;
+        flags |= state.m_noLabels ? SETTINGS_NOLABELS : 0x0;
+        flags |= state.m_simulate ? SETTINGS_PHYSICS : 0x0;
+        flags |= state.m_hideTracks ? SETTINGS_HIDE_TRACKS : 0x0;
+        flags |= state.m_hideLinks ? SETTINGS_HIDE_LINKS : 0x0;
+        flags |= state.m_hideHelpers ? SETTINGS_HIDE_HELPERS : 0x0;
+        flags |= state.m_showDimensionFigures ? SETTINGS_SHOW_DIMENSIONFIGURES : 0x0;
+
+        return flags;
+    }
+
+    DisplaySettingsState DisplaySettingsComponent::ConvertToSettings(int settings) const
+    {
+        DisplaySettingsState state;
+        state.m_noCollision = settings & SETTINGS_NOCOLLISION;
+        state.m_noLabels = settings & SETTINGS_NOLABELS;
+        state.m_simulate = settings & SETTINGS_PHYSICS;
+        state.m_hideTracks = settings & SETTINGS_HIDE_TRACKS;
+        state.m_hideLinks = settings & SETTINGS_HIDE_LINKS;
+        state.m_hideHelpers = settings & SETTINGS_HIDE_HELPERS;
+        state.m_showDimensionFigures = settings & SETTINGS_SHOW_DIMENSIONFIGURES;
+
+        return state;
+    }
+}
diff --git a/Code/Editor/DisplaySettingsPythonFuncs.h b/Code/Editor/DisplaySettingsPythonFuncs.h
new file mode 100644
index 0000000000..400c8b156c
--- /dev/null
+++ b/Code/Editor/DisplaySettingsPythonFuncs.h
@@ -0,0 +1,97 @@
+#pragma once
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Component/Component.h>
+#include <AzCore/EBus/EBus.h>
+
+namespace AzToolsFramework
+{
+    //! A legacy component to reflect scriptable commands for the Editor
+    class DisplaySettingsPythonFuncsHandler
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(DisplaySettingsPythonFuncsHandler, "{517AC40C-4A1F-4E02-ABA2-5A927582ECB4}")
+
+            static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+    };
+
+    //! Class to store the Display Settings
+    class DisplaySettingsState
+    {
+    public:
+        AZ_TYPE_INFO(DisplaySettingsState, "{EBEDA5EC-29D3-4F23-ABCC-C7C4EE48FA36}")
+
+        //! Disable collision with terrain.
+        bool m_noCollision;
+        //! Do not draw labels.
+        bool m_noLabels;
+        //! Simulation is enabled.
+        bool m_simulate;
+        //! Enable displaying of animation tracks in views.
+        bool m_hideTracks;
+        //! Enable displaying of links between objects.
+        bool m_hideLinks;
+        //! Disable displaying of all object helpers.
+        bool m_hideHelpers;
+        //! Enable displaying of dimension figures.
+        bool m_showDimensionFigures;
+
+        //! Equality test operator
+        bool operator==(const DisplaySettingsState& rhs) const;
+
+        //! String representation of the current state
+        AZStd::string ToString() const;
+    };
+
+    //! API to retrieve and set the Display Settings
+    class DisplaySettingsRequests : public AZ::EBusTraits
+    {
+    public:
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+
+        //! Get the current display settings state
+        virtual DisplaySettingsState GetSettingsState() const = 0;
+        //! Set the display settings state
+        virtual void SetSettingsState(const DisplaySettingsState& settingsState) = 0;
+
+        ~DisplaySettingsRequests() = default;
+    };
+    using DisplaySettingsBus = AZ::EBus<DisplaySettingsRequests>;
+
+    //! Component to modify Display Settings 
+    class DisplaySettingsComponent final
+        : public AZ::Component
+        , public DisplaySettingsBus::Handler
+    {
+    public:
+        AZ_COMPONENT(DisplaySettingsComponent, "{A7CDBF22-3904-46C6-85D2-073CD902DD7F}")
+
+        DisplaySettingsComponent() = default;
+        ~DisplaySettingsComponent() override = default;
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        // Component...
+        void Activate() override;
+        void Deactivate() override;
+
+        // DisplaySettingsBus...
+        DisplaySettingsState GetSettingsState() const override;
+        void SetSettingsState(const DisplaySettingsState& settingsState) override;
+
+        int ConvertToFlags(const DisplaySettingsState& settingsState) const;
+        DisplaySettingsState ConvertToSettings(int settings) const;
+    };
+} // namespace AzToolsFramework
diff --git a/Code/Editor/DocMultiArchive.h b/Code/Editor/DocMultiArchive.h
new file mode 100644
index 0000000000..f4c51a5cf2
--- /dev/null
+++ b/Code/Editor/DocMultiArchive.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_DOCMULTIARCHIVE_H
+#define CRYINCLUDE_EDITOR_DOCMULTIARCHIVE_H
+#pragma once
+
+#include "Util/XmlArchive.h"
+
+// Segmented World need XML Archive of editor level being split into multiple Archives
+// Because multiArchive is a super set of single archive, Doc can always use it, with or without SW Level
+// so some of the interface functions was written as always using MultiArchive
+// However, to decouple other sandbox interfaces with SW stuff(prevent important header files from being polluted),
+// it's better put it here as a generic implement and be included in both sides
+
+// the current available slots for MultiArchive
+// used by segmented world code through enum mapping (to EWDBType)
+enum EDocMultiArchiveSlot
+{
+    DMAS_GENERAL = 0,
+    DMAS_TERRAIN_LAYERS,
+    DMAS_VEGETATION,
+    DMAS_TIME_OF_DAY,
+    DMAS_ENVIRONMENT,
+    DMAS_GENERAL_NAMED_DATA,
+
+    DMAS_USER,                      // Per user data,
+
+    DMAS_COUNT,
+};
+
+
+typedef CXmlArchive* TDocMultiArchive [DMAS_COUNT];
+inline void FillXmlArArray(TDocMultiArchive& arrXmlAr, CXmlArchive* pXmlAr)
+{
+    for (int i = 0; i < DMAS_COUNT; i++)
+    {
+        arrXmlAr[i] = pXmlAr;
+    }
+}
+
+inline bool IsLoadingXmlArArray(TDocMultiArchive& arrXmlAr)
+{
+    bool bLoading = false;
+    for (int i = 0; i < DMAS_COUNT; i++)
+    {
+        if (arrXmlAr[i])
+        {
+            bLoading = arrXmlAr[i]->bLoading;
+            break;
+        }
+    }
+    return bLoading;
+}
+
+#endif // CRYINCLUDE_EDITOR_DOCMULTIARCHIVE_H
diff --git a/Code/Editor/EditMode/DeepSelection.cpp b/Code/Editor/EditMode/DeepSelection.cpp
new file mode 100644
index 0000000000..8d1c6d741e
--- /dev/null
+++ b/Code/Editor/EditMode/DeepSelection.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 "EditorDefs.h"
+
+#include "DeepSelection.h"
+
+// Editor
+#include "Objects/BaseObject.h"
+
+
+//! Functor for sorting selected objects on deep selection mode.
+struct NearDistance
+{
+    NearDistance(){}
+    bool operator()(const CDeepSelection::RayHitObject& lhs, const CDeepSelection::RayHitObject& rhs) const
+    {
+        return lhs.distance < rhs.distance;
+    }
+};
+
+//-----------------------------------------------------------------------------
+CDeepSelection::CDeepSelection()
+    : m_Mode(DSM_NONE)
+    , m_previousMode(DSM_NONE)
+    , m_CandidateObjectCount(0)
+    , m_CurrentSelectedPos(-1)
+{
+    m_LastPickPoint = QPoint(-1, -1);
+}
+
+//-----------------------------------------------------------------------------
+CDeepSelection::~CDeepSelection()
+{
+}
+
+//-----------------------------------------------------------------------------
+void CDeepSelection::Reset(bool bResetLastPick)
+{
+    for (int i = 0; i < m_CandidateObjectCount; ++i)
+    {
+        m_RayHitObjects[i].object->ClearFlags(OBJFLAG_NO_HITTEST);
+    }
+
+    m_CandidateObjectCount = 0;
+    m_CurrentSelectedPos = -1;
+
+    m_RayHitObjects.clear();
+
+    if (bResetLastPick)
+    {
+        m_LastPickPoint = QPoint(-1, -1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void CDeepSelection::AddObject(float distance, CBaseObject* pObj)
+{
+    m_RayHitObjects.push_back(RayHitObject(distance, pObj));
+}
+
+//-----------------------------------------------------------------------------
+bool CDeepSelection::OnCycling (const QPoint& pt)
+{
+    QPoint diff = m_LastPickPoint - pt;
+    LONG epsilon = 2;
+    m_LastPickPoint = pt;
+
+    if (abs(diff.x()) < epsilon && abs(diff.y()) < epsilon)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void CDeepSelection::ExcludeHitTest(int except)
+{
+    int nExcept = except % m_CandidateObjectCount;
+
+    for (int i = 0; i < m_CandidateObjectCount; ++i)
+    {
+        m_RayHitObjects[i].object->SetFlags(OBJFLAG_NO_HITTEST);
+    }
+
+    m_RayHitObjects[nExcept].object->ClearFlags(OBJFLAG_NO_HITTEST);
+}
+
+//-----------------------------------------------------------------------------
+int CDeepSelection::CollectCandidate(float fMinDistance, float fRange)
+{
+    m_CandidateObjectCount = 0;
+
+    if (!m_RayHitObjects.empty())
+    {
+        std::sort(m_RayHitObjects.begin(), m_RayHitObjects.end(), NearDistance());
+
+        for (std::vector<CDeepSelection::RayHitObject>::iterator itr = m_RayHitObjects.begin();
+             itr != m_RayHitObjects.end(); ++itr)
+        {
+            if (itr->distance - fMinDistance < fRange)
+            {
+                ++m_CandidateObjectCount;
+            }
+            else
+            {
+                break;
+            }
+        }
+    }
+
+    return m_CandidateObjectCount;
+}
+
+//-----------------------------------------------------------------------------
+CBaseObject* CDeepSelection::GetCandidateObject(int index)
+{
+    m_CurrentSelectedPos = index % m_CandidateObjectCount;
+
+    return m_RayHitObjects[m_CurrentSelectedPos].object;
+}
+
+//-----------------------------------------------------------------------------
+//!
+void CDeepSelection::SetMode(EDeepSelectionMode mode)
+{
+    m_previousMode = m_Mode;
+    m_Mode = mode;
+}
diff --git a/Code/Editor/EditMode/DeepSelection.h b/Code/Editor/EditMode/DeepSelection.h
new file mode 100644
index 0000000000..9f716cf81c
--- /dev/null
+++ b/Code/Editor/EditMode/DeepSelection.h
@@ -0,0 +1,86 @@
+/*
+ * 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 : Deep Selection Header
+
+
+#ifndef CRYINCLUDE_EDITOR_EDITMODE_DEEPSELECTION_H
+#define CRYINCLUDE_EDITOR_EDITMODE_DEEPSELECTION_H
+#pragma once
+
+class CBaseObject;
+
+//! Deep Selection
+//! Additional output information of HitContext on using "deep selection mode".
+//! At the deep selection mode, it supports second selection pass for easy
+//! selection on crowded area with two different method.
+//! One is to show pop menu of candidate objects list. Another is the cyclic
+//! selection on pick clicking.
+class CDeepSelection
+    : public _i_reference_target_t
+{
+public:
+    //! Deep Selection Mode Definition
+    enum EDeepSelectionMode
+    {
+        DSM_NONE    = 0,    // Not using deep selection.
+        DSM_POP     = 1,    // Deep selection mode with pop context menu.
+        DSM_CYCLE   = 2     // Deep selection mode with cyclic selection on each clinking same point.
+    };
+
+    //! Subclass for container of the selected object with hit distance.
+    struct RayHitObject
+    {
+        RayHitObject(float dist, CBaseObject* pObj)
+            : distance(dist)
+            , object(pObj)
+        {
+        }
+
+        float distance;
+        CBaseObject* object;
+    };
+
+    //! Constructor
+    CDeepSelection();
+    virtual ~CDeepSelection();
+
+    void Reset(bool bResetLastPick = false);
+    void AddObject(float distance, CBaseObject* pObj);
+    //! Check if clicking point is same position with last position,
+    //! to decide whether to continue cycling mode.
+    bool OnCycling (const QPoint& pt);
+    //! All objects in list are excluded for hitting test except one, current selection.
+    void ExcludeHitTest(int except);
+    void SetMode(EDeepSelectionMode mode);
+    inline EDeepSelectionMode GetMode() const { return m_Mode; }
+    inline EDeepSelectionMode GetPreviousMode() const { return m_previousMode; }
+    //! Collect object in the deep selection range. The distance from the minimum
+    //! distance is less than deep selection range.
+    int CollectCandidate(float fMinDistance, float fRange);
+    //! Return the candidate object in index position, then it is to be current
+    //! selection position.
+    CBaseObject* GetCandidateObject(int index);
+    //! Return the current selection position that is update in "GetCandidateObject"
+    //! function call.
+    inline int GetCurrentSelectPos() const { return m_CurrentSelectedPos; }
+    //! Return the number of objects in the deep selection range.
+    inline int GetCandidateObjectCount() const { return m_CandidateObjectCount; }
+
+private:
+    //! Current mode
+    EDeepSelectionMode m_Mode;
+    EDeepSelectionMode m_previousMode;
+    //! Last picking point to check whether cyclic selection continue.
+    QPoint m_LastPickPoint;
+    //! List of the selected objects with ray hitting
+    std::vector<RayHitObject> m_RayHitObjects;
+    int m_CandidateObjectCount;
+    int m_CurrentSelectedPos;
+};
+#endif // CRYINCLUDE_EDITOR_EDITMODE_DEEPSELECTION_H
diff --git a/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp b/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
new file mode 100644
index 0000000000..4763ec74f7
--- /dev/null
+++ b/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
@@ -0,0 +1,74 @@
+/*
+ * 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 : Calculate the reference frame for sub-object selections.
+
+#include "EditorDefs.h"
+
+#include "SubObjectSelectionReferenceFrameCalculator.h"
+
+SubObjectSelectionReferenceFrameCalculator::SubObjectSelectionReferenceFrameCalculator(ESubObjElementType selectionType)
+    :   m_anySelected(false)
+    , pos(0.0f, 0.0f, 0.0f)
+    , normal(0.0f, 0.0f, 0.0f)
+    , nNormals(0)
+    , selectionType(selectionType)
+    , bUseExplicitFrame(false)
+    , bExplicitAnySelected(false)
+{
+}
+
+void SubObjectSelectionReferenceFrameCalculator::SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame)
+{
+    this->m_refFrame = refFrame;
+    this->bUseExplicitFrame = true;
+    this->bExplicitAnySelected = bAnySelected;
+}
+
+bool SubObjectSelectionReferenceFrameCalculator::GetFrame(Matrix34& refFrame)
+{
+    if (this->bUseExplicitFrame)
+    {
+        refFrame = this->m_refFrame;
+        return this->bExplicitAnySelected;
+    }
+    else
+    {
+        refFrame.SetIdentity();
+
+        if (this->nNormals > 0)
+        {
+            this->normal = this->normal / this->nNormals;
+            if (!this->normal.IsZero())
+            {
+                this->normal.Normalize();
+            }
+
+            // Average position.
+            this->pos = this->pos / this->nNormals;
+            refFrame.SetTranslation(this->pos);
+        }
+
+        if (this->m_anySelected)
+        {
+            if (!this->normal.IsZero())
+            {
+                Vec3 xAxis(1, 0, 0), yAxis(0, 1, 0), zAxis(0, 0, 1);
+                if (this->normal.IsEquivalent(zAxis) || normal.IsEquivalent(-zAxis))
+                {
+                    zAxis = xAxis;
+                }
+                xAxis = this->normal.Cross(zAxis).GetNormalized();
+                yAxis = xAxis.Cross(this->normal).GetNormalized();
+                refFrame.SetFromVectors(xAxis, yAxis, normal, pos);
+            }
+        }
+
+        return m_anySelected;
+    }
+}
diff --git a/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h b/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
new file mode 100644
index 0000000000..bb449e203f
--- /dev/null
+++ b/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Calculate the reference frame for sub-object selections.
+
+
+#ifndef CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
+#define CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
+#pragma once
+
+
+#include "ISubObjectSelectionReferenceFrameCalculator.h"
+#include "Objects/SubObjSelection.h"
+
+class SubObjectSelectionReferenceFrameCalculator
+    : public ISubObjectSelectionReferenceFrameCalculator
+{
+public:
+    SubObjectSelectionReferenceFrameCalculator(ESubObjElementType selectionType);
+
+    virtual void SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame);
+    bool GetFrame(Matrix34& refFrame);
+
+private:
+    bool m_anySelected;
+    Vec3 pos;
+    Vec3 normal;
+    int nNormals;
+    ESubObjElementType selectionType;
+    std::vector<Vec3> positions;
+    Matrix34 m_refFrame;
+    bool bUseExplicitFrame;
+    bool bExplicitAnySelected;
+};
+
+#endif // CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
diff --git a/Code/Sandbox/Editor/EditorCryEdit.rc b/Code/Editor/EditorCryEdit.rc
similarity index 100%
rename from Code/Sandbox/Editor/EditorCryEdit.rc
rename to Code/Editor/EditorCryEdit.rc
diff --git a/Code/Editor/EditorDefs.h b/Code/Editor/EditorDefs.h
new file mode 100644
index 0000000000..30c1ed4381
--- /dev/null
+++ b/Code/Editor/EditorDefs.h
@@ -0,0 +1,202 @@
+/*
+ * 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_EDITOR_EDITORDEFS_H
+#define CRYINCLUDE_EDITOR_EDITORDEFS_H
+
+#include <AzCore/PlatformDef.h>
+
+// It is vital that at least some Qt header is pulled in to this header, so that
+// QT_VERSION is defined and the editor gets the correct set of overloads in the
+// IXML interface. This also disambiguates the GUID/REFGUID situation in Guid.h
+#include <QUuid>
+
+#include <platform.h>
+
+#include "ProjectDefines.h"
+
+#ifdef NOMINMAX
+#include "Cry_Math.h"
+#endif //NOMINMAX
+
+// Resource includes
+#include "Resource.h"
+
+
+#include <Include/SandboxAPI.h>
+#include <Include/EditorCoreAPI.h>
+
+// Warnings in STL
+#pragma warning (disable : 4786) // identifier was truncated to 'number' characters in the debug information.
+#pragma warning (disable : 4244) // conversion from 'long' to 'float', possible loss of data
+#pragma warning (disable : 4018) // signed/unsigned mismatch
+#pragma warning (disable : 4800) // BOOL bool conversion
+
+// Disable warning when a function returns a value inside an __asm block
+#pragma warning (disable : 4035)
+
+//////////////////////////////////////////////////////////////////////////
+// 64-bits related warnings.
+#pragma warning (disable : 4267) // conversion from 'size_t' to 'int', possible loss of data
+
+//////////////////////////////////////////////////////////////////////////
+// Simple type definitions.
+//////////////////////////////////////////////////////////////////////////
+#include "BaseTypes.h"
+
+// Which cfg file to use.
+#define EDITOR_CFG_FILE "editor.cfg"
+
+//////////////////////////////////////////////////////////////////////////
+// C runtime lib includes
+//////////////////////////////////////////////////////////////////////////
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+#include <cfloat>
+#include <climits>
+
+/////////////////////////////////////////////////////////////////////////////
+// STL
+/////////////////////////////////////////////////////////////////////////////
+#include <memory>
+#include <vector>
+#include <list>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <functional>
+
+#undef rand // remove cryengine protection against wrong rand usage
+
+/////////////////////////////////////////////////////////////////////////////
+// VARIOUS MACROS AND DEFINES
+/////////////////////////////////////////////////////////////////////////////
+#ifdef new
+#undef new
+#endif
+
+#ifndef SAFE_DELETE
+#define SAFE_DELETE(p)          { if (p) { delete (p);       (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_DELETE_ARRAY
+#define SAFE_DELETE_ARRAY(p)    { if (p) { delete[] (p);     (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CRY Stuff ////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+#include <platform.h>
+#include <Cry_Math.h>
+#include <Cry_Geo.h>
+#include <Range.h>
+#include <StlUtils.h>
+
+#include <smartptr.h>
+#define TSmartPtr _smart_ptr
+
+#define TOOLBAR_TRANSPARENT_COLOR QColor(0xC0, 0xC0, 0xC0)
+
+/////////////////////////////////////////////////////////////////////////////
+// Interfaces ///////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+#include <IRenderer.h>
+#include <CryFile.h>
+#include <ISystem.h>
+#include <IIndexedMesh.h>
+#include <ITimer.h>
+#include <IXml.h>
+#include <IMovieSystem.h>
+
+//////////////////////////////////////////////////////////////////////////
+// Commonly used Editor includes.
+//////////////////////////////////////////////////////////////////////////
+
+// Utility classes.
+#include "Util/EditorUtils.h"
+#include "Util/FileEnum.h"
+#include "Util/Math.h"
+#include "Util/AffineParts.h"
+
+// Xml support.
+#include "Util/XmlArchive.h"
+#include "Util/XmlTemplate.h"
+
+// Utility classes.
+#include "Util/bitarray.h"
+#include "Util/RefCountBase.h"
+#include "Util/TRefCountBase.h"
+#include "Util/MemoryBlock.h"
+#include "Util/PathUtil.h"
+
+// Main Editor interface definition.
+#include "IEditor.h"
+
+// Log file access
+#include "LogFile.h"
+
+// Prevent macros to override certain function names
+#ifdef GetObject
+#undef GetObject
+#endif
+
+#ifdef max
+#undef max
+#undef min
+#endif
+
+#ifdef DeleteFile
+#undef DeleteFile
+#endif
+
+#ifdef CreateDirectory
+#undef CreateDirectory
+#endif
+
+#ifdef RemoveDirectory
+#undef RemoveDirectory
+#endif
+
+#ifdef CopyFile
+#undef CopyFile
+#endif
+
+#ifdef GetUserName
+#undef GetUserName
+#endif
+
+#ifdef LoadCursor
+#undef LoadCursor
+#endif
+
+
+#ifdef _DEBUG
+#if !defined(AZ_PLATFORM_LINUX)
+#ifdef assert
+#undef assert
+#if defined(USE_AZ_ASSERT)
+#define assert(condition) AZ_Assert(condition, "")
+#else
+#define assert CRY_ASSERT
+#endif
+#endif // !defined(AZ_PLATFORM_LINUX)
+#endif
+#endif
+
+
+#endif // CRYINCLUDE_EDITOR_EDITORDEFS_H
diff --git a/Code/Editor/EditorEnvironment.cpp b/Code/Editor/EditorEnvironment.cpp
new file mode 100644
index 0000000000..45b0ceb573
--- /dev/null
+++ b/Code/Editor/EditorEnvironment.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+
+#include "EditorEnvironment.h"
+
+void SetEditorEnvironment(SSystemGlobalEnvironment* pEnv)
+{
+    assert(!gEnv || gEnv != pEnv);
+    gEnv = pEnv;
+}
+
+void AttachEditorAZEnvironment(AZ::EnvironmentInstance azEnv)
+{
+    AZ::Environment::Attach(azEnv, true);
+}
+
+void DetachEditorAZEnvironment()
+{
+    AZ::Environment::Detach();
+}
diff --git a/Code/Editor/EditorEnvironment.h b/Code/Editor/EditorEnvironment.h
new file mode 100644
index 0000000000..3b1c60b3e4
--- /dev/null
+++ b/Code/Editor/EditorEnvironment.h
@@ -0,0 +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
+
+#include <SandboxAPI.h>
+#include <AzCore/Module/Environment.h>
+
+SANDBOX_API void  SetEditorEnvironment(struct SSystemGlobalEnvironment* pEnv);
+
+SANDBOX_API void AttachEditorAZEnvironment(AZ::EnvironmentInstance azEnv);
+
+SANDBOX_API void DetachEditorAZEnvironment();
diff --git a/Code/Editor/EditorFileMonitor.cpp b/Code/Editor/EditorFileMonitor.cpp
new file mode 100644
index 0000000000..b1ab20c24f
--- /dev/null
+++ b/Code/Editor/EditorFileMonitor.cpp
@@ -0,0 +1,227 @@
+/*
+ * 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 "EditorFileMonitor.h"
+
+// Editor
+#include "CryEdit.h"
+
+//////////////////////////////////////////////////////////////////////////
+CEditorFileMonitor::CEditorFileMonitor()
+{
+    GetIEditor()->RegisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CEditorFileMonitor::~CEditorFileMonitor()
+{
+    CFileChangeMonitor::DeleteInstance();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEditorFileMonitor::OnEditorNotifyEvent(EEditorNotifyEvent ev)
+{
+    if (ev == eNotify_OnInit)
+    {
+        // We don't want the file monitor to be enabled while
+        // in console mode...
+        if (!GetIEditor()->IsInConsolewMode())
+        {
+            MonitorDirectories();
+        }
+
+        CFileChangeMonitor::Instance()->Subscribe(this);
+    }
+    else if (ev == eNotify_OnQuit)
+    {
+        CFileChangeMonitor::Instance()->StopMonitor();
+        GetIEditor()->UnregisterNotifyListener(this);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CEditorFileMonitor::RegisterListener(IFileChangeListener* pListener, const char* sMonitorItem)
+{
+    return RegisterListener(pListener, sMonitorItem, "*");
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+static string CanonicalizePath(const char* path)
+{
+    auto canon = QFileInfo(path).canonicalFilePath();
+    return canon.isEmpty() ? string(path) : string(canon.toUtf8());
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CEditorFileMonitor::RegisterListener(IFileChangeListener* pListener, const char* sFolderRelativeToGame, const char* sExtension)
+{
+    bool success = true;
+
+    string gameFolder = Path::GetEditingGameDataFolder().c_str();
+    string naivePath;
+    CFileChangeMonitor* fileChangeMonitor = CFileChangeMonitor::Instance();
+    AZ_Assert(fileChangeMonitor, "CFileChangeMonitor singleton missing.");
+
+    naivePath += gameFolder;
+    // Append slash in preparation for appending the second part.
+    naivePath = PathUtil::AddSlash(naivePath);
+    naivePath += sFolderRelativeToGame;
+    naivePath.replace('/', '\\');
+
+    // Remove the final slash if the given item is a folder so the file change monitor correctly picks up on it.
+    naivePath = PathUtil::RemoveSlash(naivePath);
+
+    string canonicalizedPath = CanonicalizePath(naivePath.c_str());
+
+    if (fileChangeMonitor->IsDirectory(canonicalizedPath.c_str()) || fileChangeMonitor->IsFile(canonicalizedPath.c_str()))
+    {
+        if (fileChangeMonitor->MonitorItem(canonicalizedPath.c_str()))
+        {
+            m_vecFileChangeCallbacks.push_back(SFileChangeCallback(pListener, sFolderRelativeToGame, sExtension));
+        }
+        else
+        {
+            CryLogAlways("File Monitor: [%s] not found outside of PAK files. Monitoring disabled for this item", sFolderRelativeToGame);
+            success = false;
+        }
+    }
+
+    return success;
+}
+
+bool CEditorFileMonitor::UnregisterListener(IFileChangeListener* pListener)
+{
+    bool bRet = false;
+
+    // Note that we remove the listener, but we don't currently remove the monitored item
+    // from the file monitor. This is fine, but inefficient
+
+    std::vector<SFileChangeCallback>::iterator iter = m_vecFileChangeCallbacks.begin();
+    while (iter != m_vecFileChangeCallbacks.end())
+    {
+        if (iter->pListener == pListener)
+        {
+            iter = m_vecFileChangeCallbacks.erase(iter);
+            bRet = true;
+        }
+        else
+        {
+            iter++;
+        }
+    }
+
+    return bRet;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEditorFileMonitor::MonitorDirectories()
+{
+    QString primaryCD = Path::AddPathSlash(QString(GetIEditor()->GetPrimaryCDFolder()));
+
+    // NOTE: Instead of monitoring each sub-directory we monitor the whole root
+    // folder. This is needed since if the sub-directory does not exist when
+    // we register it it will never get monitored properly.
+    CFileChangeMonitor::Instance()->MonitorItem(QStringLiteral("%1/%2/").arg(primaryCD).arg(QString::fromLatin1(Path::GetEditingGameDataFolder().c_str())));
+
+    // Add editor directory for scripts
+    CFileChangeMonitor::Instance()->MonitorItem(QStringLiteral("%1/Editor/").arg(primaryCD));
+}
+
+QString RemoveGameName(const QString &filename)
+{
+    // Remove first part of path.  File coming in has the game name included
+    // eg (AutomatedTesting/Animations/Chicken/anim_chicken_flapping.i_caf)->(Animations/Chicken/anim_chicken_flapping.i_caf)
+
+    int indexOfFirstSlash = filename.indexOf('/');
+    int indexOfFirstBackSlash = filename.indexOf('\\');
+    if (indexOfFirstSlash >= 0)
+    {
+        if (indexOfFirstBackSlash >= 0 && indexOfFirstBackSlash < indexOfFirstSlash)
+        {
+            indexOfFirstSlash = indexOfFirstBackSlash;
+        }
+    }
+    else
+    {
+        indexOfFirstSlash = indexOfFirstBackSlash;
+    }
+    return filename.mid(indexOfFirstSlash + 1);
+}
+///////////////////////////////////////////////////////////////////////////
+
+// Called when file monitor message is received
+void CEditorFileMonitor::OnFileMonitorChange(const SFileChangeInfo& rChange)
+{
+    CCryEditApp* app = CCryEditApp::instance();
+    if (app == NULL || app->IsExiting())
+    {
+        return;
+    }
+
+    // skip folders!
+    if (QFileInfo(rChange.filename).isDir())
+    {
+        return;
+    }
+
+    // Process updated file.
+    // Make file relative to PrimaryCD folder.
+    QString filename = rChange.filename;
+
+    // Remove game directory if present in path.
+    const QString rootPath =
+        QDir::fromNativeSeparators(QString::fromLatin1(Path::GetEditingRootFolder().c_str()));
+    if (filename.startsWith(rootPath, Qt::CaseInsensitive))
+    {
+        filename = filename.right(filename.length() - rootPath.length());
+    }
+
+    // Make sure there is no leading slash
+    if (!filename.isEmpty() && (filename[0] == '\\' || filename[0] == '/'))
+    {
+        filename = filename.mid(1);
+    }
+
+    if (!filename.isEmpty())
+    {
+        //remove game name. Make it relative to the game folder
+        const QString filenameRelGame = RemoveGameName(filename);
+        const int extIndex = filename.lastIndexOf('.');
+        const QString ext = filename.right(filename.length() - 1 - extIndex);
+
+        // Check for File Monitor callback
+        std::vector<SFileChangeCallback>::iterator iter;
+        for (iter = m_vecFileChangeCallbacks.begin(); iter != m_vecFileChangeCallbacks.end(); ++iter)
+        {
+            SFileChangeCallback& sCallback = *iter;
+
+            // We compare against length of callback string, so we get directory matches as well as full filenames
+            if (sCallback.pListener)
+            {
+                if (sCallback.extension == "*" || ext.compare(sCallback.extension, Qt::CaseInsensitive) == 0)
+                {
+                    if (filenameRelGame.compare(sCallback.item, Qt::CaseInsensitive) == 0)
+                    {
+                        sCallback.pListener->OnFileChange(qPrintable(filenameRelGame), IFileChangeListener::EChangeType(rChange.changeType));
+                    }
+                    else if (filename.compare(sCallback.item, Qt::CaseInsensitive) == 0)
+                    {
+                        sCallback.pListener->OnFileChange(qPrintable(filename), IFileChangeListener::EChangeType(rChange.changeType));
+                    }
+                }
+            }
+        }
+
+        // Set this flag to make sure that the viewport will update at least once,
+        // so that the changes will be shown, even if the app does not have focus.
+        CCryEditApp::instance()->ForceNextIdleProcessing();
+    }
+}
diff --git a/Code/Editor/EditorFileMonitor.h b/Code/Editor/EditorFileMonitor.h
new file mode 100644
index 0000000000..0fe6bfb9cf
--- /dev/null
+++ b/Code/Editor/EditorFileMonitor.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_EDITORFILEMONITOR_H
+#define CRYINCLUDE_EDITOR_EDITORFILEMONITOR_H
+#pragma once
+#include "Include/IEditorFileMonitor.h"
+#include "Util/FileChangeMonitor.h"
+
+class CEditorFileMonitor
+    : public IEditorFileMonitor
+    , public CFileChangeMonitorListener
+    , public IEditorNotifyListener
+{
+public:
+    CEditorFileMonitor();
+    ~CEditorFileMonitor();
+
+    bool RegisterListener(IFileChangeListener* pListener, const char* filename) override;
+    bool RegisterListener(IFileChangeListener* pListener, const char* folderRelativeToGame, const char* ext) override;
+    bool UnregisterListener(IFileChangeListener* pListener) override;
+
+    // from CFileChangeMonitorListener
+    void OnFileMonitorChange(const SFileChangeInfo& rChange) override;
+
+    // from IEditorNotifyListener
+    void OnEditorNotifyEvent(EEditorNotifyEvent ev) override;
+private:
+
+    void MonitorDirectories();
+    // File Change Monitor stuff
+    struct SFileChangeCallback
+    {
+        IFileChangeListener* pListener;
+        QString item;
+        QString extension;
+
+        SFileChangeCallback()
+            : pListener(NULL)
+        {}
+
+        SFileChangeCallback(IFileChangeListener* pListener, const char* item, const char* extension)
+            : pListener(pListener)
+            , item(item)
+            , extension(extension)
+        {}
+    };
+
+    std::vector<SFileChangeCallback> m_vecFileChangeCallbacks;
+};
+
+#endif // CRYINCLUDE_EDITOR_EDITORFILEMONITOR_H
diff --git a/Code/Editor/EditorPanelUtils.cpp b/Code/Editor/EditorPanelUtils.cpp
new file mode 100644
index 0000000000..9df6091748
--- /dev/null
+++ b/Code/Editor/EditorPanelUtils.cpp
@@ -0,0 +1,548 @@
+/*
+ * 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 "EditorPanelUtils.h"
+
+#include <AzCore/Utils/Utils.h>
+
+// Qt
+#include <QInputDialog>
+#include <QFileDialog>
+#include <QXmlStreamReader>
+
+// Editor
+#include "IEditorPanelUtils.h"
+#include "Objects/EntityObject.h"
+#include "CryEditDoc.h"
+#include "ViewManager.h"
+#include "Controls/QToolTipWidget.h"
+#include "Objects/SelectionGroup.h"
+
+
+
+#ifndef PI
+#define PI 3.14159265358979323f
+#endif
+
+
+struct ToolTip
+{
+    bool isValid;
+    QString title;
+    QString content;
+    QString specialContent;
+    QString disabledContent;
+};
+
+// internal implementation for better compile times - should also never be used externally, use IParticleEditorUtils interface for that.
+class CEditorPanelUtils_Impl
+    : public IEditorPanelUtils
+{
+    #pragma region Drag & Drop
+public:
+    virtual void SetViewportDragOperation(void(* dropCallback)(CViewport* viewport, int dragPointX, int dragPointY, void* custom), void* custom) override
+    {
+        for (int i = 0; i < GetIEditor()->GetViewManager()->GetViewCount(); i++)
+        {
+            GetIEditor()->GetViewManager()->GetView(i)->SetGlobalDropCallback(dropCallback, custom);
+        }
+    }
+    #pragma endregion
+    #pragma region Preview Window
+public:
+
+    virtual int PreviewWindow_GetDisplaySettingsDebugFlags(CDisplaySettings* settings)
+    {
+        CRY_ASSERT(settings);
+        return settings->GetDebugFlags();
+    }
+
+    virtual void PreviewWindow_SetDisplaySettingsDebugFlags(CDisplaySettings* settings, int flags)
+    {
+        CRY_ASSERT(settings);
+        settings->SetDebugFlags(flags);
+    }
+
+    #pragma endregion
+    #pragma region Shortcuts
+protected:
+    QVector<HotKey> hotkeys;
+    bool m_hotkeysAreEnabled;
+public:
+
+    virtual bool HotKey_Import() override
+    {
+        QVector<QPair<QString, QString> > keys;
+        QString filepath = QFileDialog::getOpenFileName(nullptr, "Select shortcut configuration to load",
+                QString(), "HotKey Config Files (*.hkxml)");
+        QFile file(filepath);
+        if (!file.open(QIODevice::ReadOnly))
+        {
+            return false;
+        }
+        QXmlStreamReader stream(&file);
+        bool result = true;
+
+        while (!stream.isEndDocument())
+        {
+            if (stream.isStartElement())
+            {
+                if (stream.name() == "HotKey")
+                {
+                    QPair<QString, QString> key;
+                    QXmlStreamAttributes att = stream.attributes();
+                    for (QXmlStreamAttribute attr : att)
+                    {
+                        if (attr.name().compare(QLatin1String("path"), Qt::CaseInsensitive) == 0)
+                        {
+                            key.first = attr.value().toString();
+                        }
+                        if (attr.name().compare(QLatin1String("sequence"), Qt::CaseInsensitive) == 0)
+                        {
+                            key.second = attr.value().toString();
+                        }
+                    }
+                    if (!key.first.isEmpty())
+                    {
+                        keys.push_back(key); // we allow blank key sequences for unassigned shortcuts
+                    }
+                    else
+                    {
+                        result = false; //but not blank paths!
+                    }
+                }
+            }
+            stream.readNext();
+        }
+        file.close();
+
+        if (result)
+        {
+            HotKey_BuildDefaults();
+            for (QPair<QString, QString> key : keys)
+            {
+                for (unsigned int j = 0; j < hotkeys.count(); j++)
+                {
+                    if (hotkeys[j].path.compare(key.first, Qt::CaseInsensitive) == 0)
+                    {
+                        hotkeys[j].SetPath(key.first.toStdString().c_str());
+                        hotkeys[j].SetSequenceFromString(key.second.toStdString().c_str());
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    virtual void HotKey_Export() override
+    {
+        auto settingDir = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Editor" / "Plugins" / "ParticleEditorPlugin" / "settings";
+        QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", settingDir.c_str(), "HotKey Config Files (*.hkxml)");
+        QFile file(filepath);
+        if (!file.open(QIODevice::WriteOnly))
+        {
+            return;
+        }
+
+        QXmlStreamWriter stream(&file);
+        stream.setAutoFormatting(true);
+        stream.writeStartDocument();
+        stream.writeStartElement("HotKeys");
+
+        for (HotKey key : hotkeys)
+        {
+            stream.writeStartElement("HotKey");
+            stream.writeAttribute("path", key.path);
+            stream.writeAttribute("sequence", key.sequence.toString());
+            stream.writeEndElement();
+        }
+        stream.writeEndElement();
+        stream.writeEndDocument();
+        file.close();
+    }
+
+    virtual QKeySequence HotKey_GetShortcut(const char* path) override
+    {
+        for (HotKey combo : hotkeys)
+        {
+            if (combo.IsMatch(path))
+            {
+                return combo.sequence;
+            }
+        }
+        return QKeySequence();
+    }
+
+    virtual bool HotKey_IsPressed(const QKeyEvent* event, const char* path) override
+    {
+        if (!m_hotkeysAreEnabled)
+        {
+            return false;
+        }
+        unsigned int keyInt = 0;
+        //Capture any modifiers
+        Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers();
+        if (modifiers & Qt::ShiftModifier)
+        {
+            keyInt += Qt::SHIFT;
+        }
+        if (modifiers & Qt::ControlModifier)
+        {
+            keyInt += Qt::CTRL;
+        }
+        if (modifiers & Qt::AltModifier)
+        {
+            keyInt += Qt::ALT;
+        }
+        if (modifiers & Qt::MetaModifier)
+        {
+            keyInt += Qt::META;
+        }
+        //Capture any key
+        keyInt += event->key();
+
+        QString t0 = QKeySequence(keyInt).toString();
+        QString t1 = HotKey_GetShortcut(path).toString();
+
+        //if strings match then shortcut is pressed
+        if (t1.compare(t0, Qt::CaseInsensitive) == 0)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    virtual bool HotKey_IsPressed(const QShortcutEvent* event, const char* path) override
+    {
+        if (!m_hotkeysAreEnabled)
+        {
+            return false;
+        }
+
+        QString t0 = event->key().toString();
+        QString t1 = HotKey_GetShortcut(path).toString();
+
+        //if strings match then shortcut is pressed
+        if (t1.compare(t0, Qt::CaseInsensitive) == 0)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    virtual bool HotKey_LoadExisting() override
+    {
+        QSettings settings("O3DE", "O3DE");
+        QString group = "Hotkeys/";
+
+        HotKey_BuildDefaults();
+
+        int size = settings.beginReadArray(group);
+
+        for (int i = 0; i < size; i++)
+        {
+            settings.setArrayIndex(i);
+            QPair<QString, QString> hotkey;
+            hotkey.first = settings.value("name").toString();
+            hotkey.second = settings.value("keySequence").toString();
+            if (!hotkey.first.isEmpty())
+            {
+                for (unsigned int j = 0; j < hotkeys.count(); j++)
+                {
+                    if (hotkeys[j].path.compare(hotkey.first, Qt::CaseInsensitive) == 0)
+                    {
+                        hotkeys[j].SetPath(hotkey.first.toStdString().c_str());
+                        hotkeys[j].SetSequenceFromString(hotkey.second.toStdString().c_str());
+                    }
+                }
+            }
+        }
+
+        settings.endArray();
+        if (hotkeys.isEmpty())
+        {
+            return false;
+        }
+        return true;
+    }
+
+    virtual void HotKey_SaveCurrent() override
+    {
+        QSettings settings("O3DE", "O3DE");
+        QString group = "Hotkeys/";
+        settings.remove("Hotkeys/");
+        settings.sync();
+        settings.beginWriteArray(group);
+        int saveIndex = 0;
+        for (HotKey key : hotkeys)
+        {
+            if (!key.path.isEmpty())
+            {
+                settings.setArrayIndex(saveIndex++);
+                settings.setValue("name", key.path);
+                settings.setValue("keySequence", key.sequence.toString());
+            }
+        }
+        settings.endArray();
+        settings.sync();
+    }
+
+    virtual void HotKey_BuildDefaults() override
+    {
+        m_hotkeysAreEnabled = true;
+        QVector<QPair<QString, QString> > keys;
+        while (hotkeys.count() > 0)
+        {
+            hotkeys.takeAt(0);
+        }
+
+        //MENU SELECTION SHORTCUTS////////////////////////////////////////////////
+        keys.push_back(QPair<QString, QString>("Menus.File Menu", "Alt+F"));
+        keys.push_back(QPair<QString, QString>("Menus.Edit Menu", "Alt+E"));
+        keys.push_back(QPair<QString, QString>("Menus.View Menu", "Alt+V"));
+        //FILE MENU SHORTCUTS/////////////////////////////////////////////////////
+        keys.push_back(QPair<QString, QString>("File Menu.Create new emitter", "Ctrl+N"));
+        keys.push_back(QPair<QString, QString>("File Menu.Create new library", "Ctrl+Shift+N"));
+        keys.push_back(QPair<QString, QString>("File Menu.Create new folder", ""));
+        keys.push_back(QPair<QString, QString>("File Menu.Import", "Ctrl+I"));
+        keys.push_back(QPair<QString, QString>("File Menu.Import level library", "Ctrl+Shift+I"));
+        keys.push_back(QPair<QString, QString>("File Menu.Save", "Ctrl+S"));
+        keys.push_back(QPair<QString, QString>("File Menu.Close", "Ctrl+Q"));
+        //EDIT MENU SHORTCUTS/////////////////////////////////////////////////////
+        keys.push_back(QPair<QString, QString>("Edit Menu.Copy", "Ctrl+C"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Paste", "Ctrl+V"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Duplicate", "Ctrl+D"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Undo", "Ctrl+Z"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Redo", "Ctrl+Shift+Z"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Group", "Ctrl+G"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Ungroup", "Ctrl+Shift+G"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Rename", "Ctrl+R"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Reset", ""));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Edit Hotkeys", ""));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Assign to selected", "Ctrl+Space"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Insert Comment", "Ctrl+Alt+M"));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Enable/Disable Emitter", "Ctrl+E"));
+        keys.push_back(QPair<QString, QString>("File Menu.Enable All", ""));
+        keys.push_back(QPair<QString, QString>("File Menu.Disable All", ""));
+        keys.push_back(QPair<QString, QString>("Edit Menu.Delete", "Del"));
+        //VIEW MENU SHORTCUTS/////////////////////////////////////////////////////
+        keys.push_back(QPair<QString, QString>("View Menu.Reset Layout", ""));
+        //PLAYBACK CONTROL////////////////////////////////////////////////////////
+        keys.push_back(QPair<QString, QString>("Previewer.Play/Pause Toggle", "Space"));
+        keys.push_back(QPair<QString, QString>("Previewer.Step forward through time", "c"));
+        keys.push_back(QPair<QString, QString>("Previewer.Loop Toggle", "z"));
+        keys.push_back(QPair<QString, QString>("Previewer.Reset Playback", "x"));
+        keys.push_back(QPair<QString, QString>("Previewer.Focus", "Ctrl+F"));
+        keys.push_back(QPair<QString, QString>("Previewer.Zoom In", "w"));
+        keys.push_back(QPair<QString, QString>("Previewer.Zoom Out", "s"));
+        keys.push_back(QPair<QString, QString>("Previewer.Pan Left", "a"));
+        keys.push_back(QPair<QString, QString>("Previewer.Pan Right", "d"));
+
+        for (QPair<QString, QString> key : keys)
+        {
+            unsigned int index = hotkeys.count();
+            hotkeys.push_back(HotKey());
+            hotkeys[index].SetPath(key.first.toStdString().c_str());
+            hotkeys[index].SetSequenceFromString(key.second.toStdString().c_str());
+        }
+    }
+
+    virtual void HotKey_SetKeys(QVector<HotKey> keys) override
+    {
+        hotkeys = keys;
+    }
+
+    virtual QVector<HotKey> HotKey_GetKeys() override
+    {
+        return hotkeys;
+    }
+
+    virtual QString HotKey_GetPressedHotkey(const QKeyEvent* event) override
+    {
+        if (!m_hotkeysAreEnabled)
+        {
+            return "";
+        }
+        for (HotKey key : hotkeys)
+        {
+            if (HotKey_IsPressed(event, key.path.toUtf8()))
+            {
+                return key.path;
+            }
+        }
+        return "";
+    }
+    virtual QString HotKey_GetPressedHotkey(const QShortcutEvent* event) override
+    {
+        if (!m_hotkeysAreEnabled)
+        {
+            return "";
+        }
+        for (HotKey key : hotkeys)
+        {
+            if (HotKey_IsPressed(event, key.path.toUtf8()))
+            {
+                return key.path;
+            }
+        }
+        return "";
+    }
+    //building the default hotkey list re-enables hotkeys
+    //do not use this when rebuilding the default list is a possibility.
+    virtual void HotKey_SetEnabled(bool val) override
+    {
+        m_hotkeysAreEnabled = val;
+    }
+
+    virtual bool HotKey_IsEnabled() const override
+    {
+        return m_hotkeysAreEnabled;
+    }
+
+    #pragma  endregion
+    #pragma region ToolTip
+protected:
+    QMap<QString, ToolTip> m_tooltips;
+
+    void ToolTip_ParseNode(XmlNodeRef node)
+    {
+        if (QString(node->getTag()).compare("tooltip", Qt::CaseInsensitive) != 0)
+        {
+            unsigned int childCount = node->getChildCount();
+
+            for (unsigned int i = 0; i < childCount; i++)
+            {
+                ToolTip_ParseNode(node->getChild(i));
+            }
+        }
+
+        QString title = node->getAttr("title");
+        QString content = node->getAttr("content");
+        QString specialContent = node->getAttr("special_content");
+        QString disabledContent = node->getAttr("disabled_content");
+
+        QMap<QString, ToolTip>::iterator itr = m_tooltips.insert(node->getAttr("path"), ToolTip());
+        itr->isValid = true;
+        itr->title = title;
+        itr->content = content;
+        itr->specialContent = specialContent;
+        itr->disabledContent = disabledContent;
+
+        unsigned int childCount = node->getChildCount();
+
+        for (unsigned int  i = 0; i < childCount; i++)
+        {
+            ToolTip_ParseNode(node->getChild(i));
+        }
+    }
+
+    ToolTip GetToolTip(QString path)
+    {
+        if (m_tooltips.contains(path))
+        {
+            return m_tooltips[path];
+        }
+        ToolTip temp;
+        temp.isValid = false;
+        return temp;
+    }
+
+public:
+    virtual void ToolTip_LoadConfigXML(QString filepath) override
+    {
+        XmlNodeRef node = GetIEditor()->GetSystem()->LoadXmlFromFile(filepath.toStdString().c_str());
+        ToolTip_ParseNode(node);
+    }
+
+    virtual void ToolTip_BuildFromConfig(IQToolTip* tooltip, QString path, QString option, QString optionalData = "", bool isEnabled = true)
+    {
+        AZ_Assert(tooltip, "tooltip cannot be null");
+
+        QString title = ToolTip_GetTitle(path, option);
+        QString content = ToolTip_GetContent(path, option);
+        QString specialContent = ToolTip_GetSpecialContentType(path, option);
+        QString disabledContent = ToolTip_GetDisabledContent(path, option);
+
+        // Even if these items are empty, we set them anyway to clear out any data that was left over from when the tooltip was used for a different object.
+        tooltip->SetTitle(title);
+        tooltip->SetContent(content);
+
+        //this only handles simple creation...if you need complex call this then add specials separate
+        if (!specialContent.contains("::"))
+        {
+            tooltip->AddSpecialContent(specialContent, optionalData);
+        }
+
+        if (!isEnabled) // If disabled, add disabled value
+        {
+            tooltip->AppendContent(disabledContent);
+        }
+    }
+
+    virtual QString ToolTip_GetTitle(QString path, QString option) override
+    {
+        if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
+        {
+            return GetToolTip(path + "." + option).title;
+        }
+        if (!option.isEmpty() && GetToolTip("Options." + option).isValid)
+        {
+            return GetToolTip("Options." + option).title;
+        }
+        return GetToolTip(path).title;
+    }
+
+    virtual QString ToolTip_GetContent(QString path, QString option) override
+    {
+        if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
+        {
+            return GetToolTip(path + "." + option).content;
+        }
+        if (!option.isEmpty() && GetToolTip("Options." + option).isValid)
+        {
+            return GetToolTip("Options." + option).content;
+        }
+        return GetToolTip(path).content;
+    }
+
+    virtual QString ToolTip_GetSpecialContentType(QString path, QString option) override
+    {
+        if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
+        {
+            return GetToolTip(path + "." + option).specialContent;
+        }
+        if (!option.isEmpty() && GetToolTip("Options." + option).isValid)
+        {
+            return GetToolTip("Options." + option).specialContent;
+        }
+        return GetToolTip(path).specialContent;
+    }
+
+    virtual QString ToolTip_GetDisabledContent(QString path, QString option) override
+    {
+        if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
+        {
+            return GetToolTip(path + "." + option).disabledContent;
+        }
+        if (!option.isEmpty() && GetToolTip("Options." + option).isValid)
+        {
+            return GetToolTip("Options." + option).disabledContent;
+        }
+        return GetToolTip(path).disabledContent;
+    }
+    #pragma endregion ToolTip
+};
+
+IEditorPanelUtils* CreateEditorPanelUtils()
+{
+    return new CEditorPanelUtils_Impl();
+}
+
diff --git a/Code/Editor/EditorPanelUtils.h b/Code/Editor/EditorPanelUtils.h
new file mode 100644
index 0000000000..e0dcf91916
--- /dev/null
+++ b/Code/Editor/EditorPanelUtils.h
@@ -0,0 +1,15 @@
+/*
+ * 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
+ *
+ */
+// Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#ifndef CRYINCLUDE_CRYEDITOR_EDITORPANELUTILS_H
+#define CRYINCLUDE_CRYEDITOR_EDITORPANELUTILS_H
+#pragma once
+
+struct IEditorPanelUtils;
+IEditorPanelUtils* CreateEditorPanelUtils();
+
+#endif
diff --git a/Code/Editor/EditorPreferencesBus.h b/Code/Editor/EditorPreferencesBus.h
new file mode 100644
index 0000000000..01dc778213
--- /dev/null
+++ b/Code/Editor/EditorPreferencesBus.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>
+
+//! Allows handlers to be notified when settings are changed to refresh accordingly
+class EditorPreferencesNotifications
+    : public AZ::EBusTraits
+{
+public:
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        
+    //! Notifies about changes in the Editor Preferences
+    virtual void OnEditorPreferencesChanged() {}
+};
+using EditorPreferencesNotificationBus = AZ::EBus<EditorPreferencesNotifications>;
diff --git a/Code/Editor/EditorPreferencesDialog.cpp b/Code/Editor/EditorPreferencesDialog.cpp
new file mode 100644
index 0000000000..148e115607
--- /dev/null
+++ b/Code/Editor/EditorPreferencesDialog.cpp
@@ -0,0 +1,309 @@
+/*
+ * 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 "EditorPreferencesDialog.h"
+
+// AzQtComponents
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+#include <AzQtComponents/Components/StyleManager.h>
+
+#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
+
+#include "EditorPreferencesTreeWidgetItemDelegate.h"
+
+// Editor
+#include "MainWindow.h"
+#include "EditorPreferencesTreeWidgetItem.h"
+#include "PreferencesStdPages.h"
+#include "DisplaySettings.h"
+#include "CryEditDoc.h"
+#include "Controls/ConsoleSCB.h"
+#include "EditorPreferencesPageGeneral.h"
+#include "EditorPreferencesPageFiles.h"
+#include "EditorPreferencesPageViewportGeneral.h"
+#include "EditorPreferencesPageViewportGizmo.h"
+#include "EditorPreferencesPageViewportMovement.h"
+#include "EditorPreferencesPageViewportDebug.h"
+#include "EditorPreferencesPageExperimentalLighting.h"
+#include "EditorPreferencesPageAWS.h"
+#include "LyViewPaneNames.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_EditorPreferencesDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+using namespace AzQtComponents;
+
+EditorPreferencesDialog::EditorPreferencesDialog(QWidget* pParent)
+    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, pParent))
+    , ui(new Ui::EditorPreferencesDialog)
+    , m_currentPageItem(nullptr)
+{
+    ui->setupUi(this);
+
+    ui->filter->SetTypeFilterVisible(false);
+    connect(ui->filter, &FilteredSearchWidget::TextFilterChanged, this, &EditorPreferencesDialog::SetFilter);
+
+    AZ::SerializeContext* serializeContext = nullptr;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(serializeContext, "Serialization context not available");
+
+    static bool bAlreadyRegistered = false;
+    if (!bAlreadyRegistered)
+    {
+        bAlreadyRegistered = true;
+        GetIEditor()->GetClassFactory()->RegisterClass(new CStdPreferencesClassDesc);
+
+        if (serializeContext)
+        {
+            CEditorPreferencesPage_General::Reflect(*serializeContext);
+            CEditorPreferencesPage_Files::Reflect(*serializeContext);
+            CEditorPreferencesPage_ViewportGeneral::Reflect(*serializeContext);
+            CEditorPreferencesPage_ViewportGizmo::Reflect(*serializeContext);
+            CEditorPreferencesPage_ViewportMovement::Reflect(*serializeContext);
+            CEditorPreferencesPage_ViewportDebug::Reflect(*serializeContext);
+            CEditorPreferencesPage_ExperimentalLighting::Reflect(*serializeContext);
+            CEditorPreferencesPage_AWS::Reflect(*serializeContext);
+        }
+    }
+
+    ui->propertyEditor->SetAutoResizeLabels(true);
+    ui->propertyEditor->Setup(serializeContext, this, true, 250);
+
+    ui->pageTree->setColumnCount(1);
+
+    // There are no expandable categories, so hide the column.
+    ui->pageTree->setRootIsDecorated(false);
+
+    // Set the delegate so we can use the svg icons.
+    ui->pageTree->setItemDelegate(new EditorPreferencesTreeWidgetItemDelegate(ui->pageTree));
+
+    // Shrink the spacer so that the search bar fills the dialog.
+    ui->horizontalSpacer_2->changeSize(0, 0, QSizePolicy::Maximum);
+
+    connect(ui->pageTree, &QTreeWidget::currentItemChanged, this, &EditorPreferencesDialog::OnTreeCurrentItemChanged);
+
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &EditorPreferencesDialog::OnAccept);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &EditorPreferencesDialog::OnReject);
+    connect(ui->MANAGE_BTN, &QPushButton::clicked, this, &EditorPreferencesDialog::OnManage);
+
+    AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral("style:EditorPreferencesDialog.qss"));
+}
+
+EditorPreferencesDialog::~EditorPreferencesDialog()
+{
+}
+
+void EditorPreferencesDialog::showEvent(QShowEvent* event)
+{
+    origAutoBackup.bEnabled = gSettings.autoBackupEnabled;
+    origAutoBackup.nTime = gSettings.autoBackupTime;
+    origAutoBackup.nRemindTime = gSettings.autoRemindTime;
+
+    CreateImages();
+    CreatePages();
+    ui->pageTree->setCurrentItem(ui->pageTree->topLevelItem(0));
+    QDialog::showEvent(event);
+}
+
+void EditorPreferencesDialog::OnTreeCurrentItemChanged()
+{
+    QTreeWidgetItem* currentItem = ui->pageTree->currentItem();
+
+    if (currentItem->type() == EditorPreferencesTreeWidgetItem::EditorPreferencesPage)
+    {
+        EditorPreferencesTreeWidgetItem* currentPageItem = static_cast<EditorPreferencesTreeWidgetItem*>(currentItem);
+        if (currentPageItem != m_currentPageItem)
+        {
+            SetActivePage(currentPageItem);
+        }
+    }
+    else
+    {
+        if (m_currentPageItem == nullptr || m_currentPageItem->parent() != currentItem)
+        {
+            EditorPreferencesTreeWidgetItem* child = (EditorPreferencesTreeWidgetItem*)currentItem->child(0);
+            SetActivePage(child);
+        }
+    }
+}
+
+void EditorPreferencesDialog::OnAccept()
+{
+    // Call on OK for all pages.
+    QTreeWidgetItemIterator it(ui->pageTree);
+    while (*it)
+    {
+        QTreeWidgetItem* item = *it;
+        if (item->type() == EditorPreferencesTreeWidgetItem::EditorPreferencesPage)
+        {
+            EditorPreferencesTreeWidgetItem* pageItem = (EditorPreferencesTreeWidgetItem*)*it;
+            pageItem->GetPreferencesPage()->OnApply();
+        }
+        ++it;
+    }
+
+    // Save settings.
+    gSettings.Save();
+    GetIEditor()->GetDisplaySettings()->SaveRegistry();
+
+    if (GetIEditor()->GetDocument()->IsDocumentReady() && (
+            origAutoBackup.bEnabled != gSettings.autoBackupEnabled ||
+            origAutoBackup.nTime != gSettings.autoBackupTime ||
+            origAutoBackup.nRemindTime != gSettings.autoRemindTime))
+    {
+        MainWindow::instance()->ResetAutoSaveTimers(true);
+    }
+
+    AzToolsFramework::EditorPreferencesNotificationBus::Broadcast(&AzToolsFramework::EditorPreferencesNotifications::OnEditorPreferencesChanged);
+
+    accept();
+}
+
+void EditorPreferencesDialog::OnReject()
+{
+    // QueryCancel for all pages.
+    QTreeWidgetItemIterator it(ui->pageTree);
+    while (*it)
+    {
+        QTreeWidgetItem* item = *it;
+        if (item->type() == EditorPreferencesTreeWidgetItem::EditorPreferencesPage)
+        {
+            EditorPreferencesTreeWidgetItem* pageItem = (EditorPreferencesTreeWidgetItem*)*it;
+            if (!pageItem->GetPreferencesPage()->OnQueryCancel())
+            {
+                return;
+            }
+        }
+        ++it;
+    }
+
+    QTreeWidgetItemIterator cancelIt(ui->pageTree);
+    while (*cancelIt)
+    {
+        QTreeWidgetItem* item = *cancelIt;
+        if (item->type() == EditorPreferencesTreeWidgetItem::EditorPreferencesPage)
+        {
+            EditorPreferencesTreeWidgetItem* pageItem = (EditorPreferencesTreeWidgetItem*)*cancelIt;
+            pageItem->GetPreferencesPage()->OnCancel();
+        }
+        ++cancelIt;
+    }
+
+
+    reject();
+}
+
+void EditorPreferencesDialog::OnManage()
+{
+    GetIEditor()->OpenView(LyViewPane::EditorSettingsManager);
+    OnAccept();
+}
+
+void EditorPreferencesDialog::SetActivePage(EditorPreferencesTreeWidgetItem* pageItem)
+{
+    m_currentPageItem = pageItem;
+
+    ui->propertyEditor->ClearInstances();
+    IPreferencesPage* instance = m_currentPageItem->GetPreferencesPage();
+    const AZ::Uuid& classId = AZ::SerializeTypeInfo<IPreferencesPage>::GetUuid(instance);
+    ui->propertyEditor->AddInstance(instance, classId);
+    m_currentPageItem->UpdateEditorFilter(ui->propertyEditor, m_filter);
+
+    ui->propertyEditor->show();
+
+    // Refresh the Stylesheet - style would break on page load sometimes.
+    AzQtComponents::StyleManager::repolishStyleSheet(this);
+}
+
+void EditorPreferencesDialog::SetFilter(const QString& filter)
+{
+    m_filter = filter;
+
+    QTreeWidgetItem* firstVisiblePage = nullptr;
+
+    std::function<void(QTreeWidgetItem* item)> filterItem = [&](QTreeWidgetItem* item)
+    {
+        // Hide categories that have no pages remaining in them after filtering their pages
+        if (item->childCount() > 0)
+        {
+            bool shouldHide = true;
+            for (int i = item->childCount() - 1; i >= 0; --i)
+            {
+                QTreeWidgetItem* child = item->child(i);
+                filterItem(child);
+                shouldHide = shouldHide && child->isHidden();
+            }
+            item->setHidden(shouldHide);
+        }
+        else
+        {
+            EditorPreferencesTreeWidgetItem* pageItem = static_cast<EditorPreferencesTreeWidgetItem*>(item);
+            pageItem->Filter(filter);
+            if (!firstVisiblePage && !pageItem->isHidden())
+            {
+                firstVisiblePage = pageItem;
+            }
+        }
+    };
+    filterItem(ui->pageTree->invisibleRootItem());
+
+    // If we're searching and we don't have a current selection any more (the old page got filtered)
+    // go ahead and select the first valid page
+    if ((!m_currentPageItem || m_currentPageItem->isHidden())
+        && !filter.isEmpty() && firstVisiblePage)
+    {
+        ui->pageTree->setCurrentItem(firstVisiblePage);
+    }
+    else if (m_currentPageItem)
+    {
+        m_currentPageItem->UpdateEditorFilter(ui->propertyEditor, m_filter);
+    }
+}
+
+void EditorPreferencesDialog::CreateImages()
+{
+    m_selectedPixmap = QPixmap(":/res/Preferences_00.png");
+    m_unSelectedPixmap = QPixmap(":/res/Preferences_01.png");
+}
+
+void EditorPreferencesDialog::CreatePages()
+{
+    std::vector<IClassDesc*> classes;
+    GetIEditor()->GetClassFactory()->GetClassesBySystemID(ESYSTEM_CLASS_PREFERENCE_PAGE, classes);
+
+    for (int i = 0; i < classes.size(); i++)
+    {
+        auto pUnknown = classes[i];
+
+        IPreferencesPageCreator* pPageCreator = 0;
+        if (FAILED(pUnknown->QueryInterface(&pPageCreator)))
+        {
+            continue;
+        }
+
+        int numPages = pPageCreator->GetPagesCount();
+        for (int pindex = 0; pindex < numPages; pindex++)
+        {
+            IPreferencesPage* pPage = pPageCreator->CreateEditorPreferencesPage(pindex);
+            if (!pPage)
+            {
+                continue;
+            }
+
+            ui->pageTree->addTopLevelItem(new EditorPreferencesTreeWidgetItem(pPage, pPage->GetIcon()));
+        }
+    }
+}
+
+void EditorPreferencesDialog::AfterPropertyModified([[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+{
+    // ensure we refresh all the property editor values as it is possible for them to
+    // change based on other values (e.g. legacy ui and new viewport not being compatible)
+    ui->propertyEditor->InvalidateValues();
+}
diff --git a/Code/Editor/EditorPreferencesDialog.h b/Code/Editor/EditorPreferencesDialog.h
new file mode 100644
index 0000000000..ce595012b0
--- /dev/null
+++ b/Code/Editor/EditorPreferencesDialog.h
@@ -0,0 +1,71 @@
+/*
+ * 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 <QDialog>
+#include <QScopedPointer>
+#include <QPixmap>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+
+namespace Ui
+{
+    class EditorPreferencesDialog;
+}
+
+class EditorPreferencesTreeWidgetItem;
+
+class EditorPreferencesDialog
+    : public QDialog
+    , public AzToolsFramework::IPropertyEditorNotify
+{
+public:
+    EditorPreferencesDialog(QWidget* pParent = nullptr);
+    ~EditorPreferencesDialog();
+
+    // IPropertyEditorNotify
+    void BeforePropertyModified([[maybe_unused]] AzToolsFramework::InstanceDataNode* node) override {}
+    void AfterPropertyModified(AzToolsFramework::InstanceDataNode* node) override;
+    void SetPropertyEditingActive([[maybe_unused]] AzToolsFramework::InstanceDataNode* node) override {}
+    void SetPropertyEditingComplete([[maybe_unused]] AzToolsFramework::InstanceDataNode* node) override {}
+    void SealUndoStack() override {}
+
+protected:
+    void showEvent(QShowEvent* event) override;
+
+private:
+    void CreateImages();
+    void CreatePages();
+    void SetActivePage(EditorPreferencesTreeWidgetItem* pageItem);
+    void SetFilter(const QString& filter);
+
+    void OnTreeCurrentItemChanged();
+    void OnReject();
+    void OnAccept();
+    void OnManage();
+
+    struct SAutoBackup
+    {
+        AZ_TYPE_INFO(SAutoBackup, "{547A0B74-B513-4A74-A27B-28256BE730E7}")
+
+        SAutoBackup()
+            : bEnabled(false)
+            , nTime(0)
+            , nRemindTime(0) { }
+
+        bool bEnabled;
+        int nTime;
+        int nRemindTime;
+    };
+    SAutoBackup origAutoBackup;
+
+    QScopedPointer<Ui::EditorPreferencesDialog> ui;
+
+    QPixmap m_selectedPixmap;
+    QPixmap m_unSelectedPixmap;
+    EditorPreferencesTreeWidgetItem* m_currentPageItem;
+    QString m_filter;
+};
diff --git a/Code/Sandbox/Editor/EditorPreferencesDialog.ui b/Code/Editor/EditorPreferencesDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesDialog.ui
rename to Code/Editor/EditorPreferencesDialog.ui
diff --git a/Code/Editor/EditorPreferencesPageAWS.cpp b/Code/Editor/EditorPreferencesPageAWS.cpp
new file mode 100644
index 0000000000..24dff8676d
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageAWS.cpp
@@ -0,0 +1,144 @@
+/*
+ * 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 "EditorPreferencesPageAWS.h"
+
+// AzCore
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/Jobs/JobFunction.h>
+
+void CEditorPreferencesPage_AWS::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<UsageOptions>()
+        ->Version(1)
+        ->Field("AWSAttributionEnabled", &UsageOptions::m_awsAttributionEnabled);
+
+    serialize.Class<CEditorPreferencesPage_AWS>()
+        ->Version(1)
+        ->Field("UsageOptions", &CEditorPreferencesPage_AWS::m_usageOptions);
+
+    AZ::EditContext* editContext = serialize.GetEditContext();
+    if (editContext)
+    {
+        editContext->Class<UsageOptions>("Options", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &UsageOptions::m_awsAttributionEnabled, "Allow O3DE to send information about your use of AWS Core Gem to AWS",
+            "");
+
+        editContext->Class<CEditorPreferencesPage_AWS>("AWS Preferences", "AWS Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_AWS::m_usageOptions, "AWS Data Collection and Use", "AWS Data Collection and Use");
+    }
+}
+
+
+CEditorPreferencesPage_AWS::CEditorPreferencesPage_AWS()
+{
+    m_settingsRegistry = AZStd::make_unique<AZ::SettingsRegistryImpl>();
+    InitializeSettings();
+    m_icon = QIcon(":/res/AWS_preferences_icon.svg");
+}
+
+CEditorPreferencesPage_AWS::~CEditorPreferencesPage_AWS()
+{
+    m_settingsRegistry.reset();
+}
+
+const char* CEditorPreferencesPage_AWS::GetTitle()
+{
+    return "Cloud";
+}
+
+QIcon& CEditorPreferencesPage_AWS::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_AWS::OnApply()
+{
+    m_settingsRegistry->Set(AWSAttributionEnabledKey, m_usageOptions.m_awsAttributionEnabled);
+    SaveSettingsRegistryFile();
+}
+
+const CEditorPreferencesPage_AWS::UsageOptions& CEditorPreferencesPage_AWS::GetUsageOptions()
+{
+    return m_usageOptions;
+}
+
+void CEditorPreferencesPage_AWS::SaveSettingsRegistryFile()
+{
+    AZ::Job* job = AZ::CreateJobFunction(
+        [this]()
+        {
+            AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
+            AZ_Assert(fileIO, "File IO is not initialized.");
+
+            // Resolve path to editor_aws_preferences.setreg
+            AZStd::string editorPreferencesFilePath =
+                AZStd::string::format("@user@/%s/%s", AZ::SettingsRegistryInterface::RegistryFolder, EditorAWSPreferencesFileName);
+            AZStd::array<char, AZ::IO::MaxPathLength> resolvedPath{};
+            fileIO->ResolvePath(editorPreferencesFilePath.c_str(), resolvedPath.data(), resolvedPath.size());
+
+            AZ::SettingsRegistryMergeUtils::DumperSettings dumperSettings;
+            dumperSettings.m_prettifyOutput = true;
+            dumperSettings.m_jsonPointerPrefix = AWSAttributionSettingsPrefixKey;
+
+            AZStd::string stringBuffer;
+            AZ::IO::ByteContainerStream stringStream(&stringBuffer);
+            if (!AZ::SettingsRegistryMergeUtils::DumpSettingsRegistryToStream(
+                    *m_settingsRegistry, AWSAttributionSettingsPrefixKey, stringStream, dumperSettings))
+            {
+                AZ_Warning(
+                    "AWSAttributionManager", false, R"(Unable to save changes to the Editor AWS Preferences registry file at "%s"\n)",
+                    resolvedPath.data());
+                return;
+            }
+
+            bool saved{};
+            constexpr auto configurationMode =
+                AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
+            if (AZ::IO::SystemFile outputFile; outputFile.Open(resolvedPath.data(), configurationMode))
+            {
+                saved = outputFile.Write(stringBuffer.data(), stringBuffer.size()) == stringBuffer.size();
+            }
+
+            AZ_Warning(
+                "AWSAttributionManager", saved, R"(Unable to save Editor AWS Preferences registry file to path "%s"\n)",
+                editorPreferencesFilePath.c_str());
+        },
+        true);
+    job->Start();
+}
+
+void CEditorPreferencesPage_AWS::InitializeSettings()
+{
+    AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
+    AZ_Assert(fileIO, "File IO is not initialized.");
+
+    // Resolve path to editor_aws_preferences.setreg
+    AZStd::string editorAWSPreferencesFilePath =
+        AZStd::string::format("@user@/%s/%s", AZ::SettingsRegistryInterface::RegistryFolder, EditorAWSPreferencesFileName);
+    AZStd::array<char, AZ::IO::MaxPathLength> resolvedPathAWSPreference{};
+    if (!fileIO->ResolvePath(editorAWSPreferencesFilePath.c_str(), resolvedPathAWSPreference.data(), resolvedPathAWSPreference.size()))
+    {
+        AZ_Warning("AWSAttributionManager", false, "Error resolving path %s", resolvedPathAWSPreference.data());
+        return;
+    }
+
+    if (fileIO->Exists(resolvedPathAWSPreference.data()))
+    {
+        m_settingsRegistry->MergeSettingsFile(resolvedPathAWSPreference.data(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, "");
+    }
+
+    if (!m_settingsRegistry->Get(m_usageOptions.m_awsAttributionEnabled, AWSAttributionEnabledKey))
+    {
+        // If key is missing default to on.
+        m_usageOptions.m_awsAttributionEnabled = true;
+    }
+}
diff --git a/Code/Editor/EditorPreferencesPageAWS.h b/Code/Editor/EditorPreferencesPageAWS.h
new file mode 100644
index 0000000000..23495b7dd0
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageAWS.h
@@ -0,0 +1,55 @@
+/*
+ * 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 "Include/IPreferencesPage.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Settings/SettingsRegistryImpl.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <QIcon>
+
+class CEditorPreferencesPage_AWS
+    : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_AWS, "{51FB9557-ABA3-4FD7-803A-1784F5B06F5F}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_AWS();
+    virtual ~CEditorPreferencesPage_AWS();
+
+    // IPreferencesPage interface methods.
+    virtual const char* GetCategory() override { return "AWS"; }
+    virtual const char* GetTitle() override;
+    virtual QIcon& GetIcon() override;
+    virtual void OnApply() override;
+    virtual void OnCancel() override {}
+    virtual bool OnQueryCancel() override { return true; }
+
+protected:
+    struct UsageOptions
+    {
+        AZ_TYPE_INFO(UsageOptions, "{2B7D9B19-D13B-4E54-B724-B2FD8D0828B3}")
+
+        bool m_awsAttributionEnabled;
+    };
+
+    const UsageOptions& GetUsageOptions();
+
+private:
+    void InitializeSettings();
+    void SaveSettingsRegistryFile();
+    UsageOptions m_usageOptions;
+    QIcon m_icon;
+    AZStd::unique_ptr<AZ::SettingsRegistryImpl> m_settingsRegistry;
+
+    static constexpr char AWSAttributionEnabledKey[] = "/Amazon/AWS/Preferences/AWSAttributionEnabled";
+    static constexpr char EditorPreferencesFileName[] = "editorpreferences.setreg";
+    static constexpr char EditorAWSPreferencesFileName[] = "editor_aws_preferences.setreg";
+    static constexpr char AWSAttributionSettingsPrefixKey[] = "/Amazon/AWS/Preferences";
+};
diff --git a/Code/Editor/EditorPreferencesPageExperimentalLighting.cpp b/Code/Editor/EditorPreferencesPageExperimentalLighting.cpp
new file mode 100644
index 0000000000..48ddd261d9
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageExperimentalLighting.cpp
@@ -0,0 +1,69 @@
+/*
+ * 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 "EditorPreferencesPageExperimentalLighting.h"
+
+// AzCore
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzQtComponents/Components/StyleManager.h>
+
+// Editor
+#include "Settings.h"
+
+
+void CEditorPreferencesPage_ExperimentalLighting::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<Options>()
+        ->Version(1)
+        ->Field("TotalIlluminationEnabled", &Options::m_totalIlluminationEnabled);
+
+    serialize.Class<CEditorPreferencesPage_ExperimentalLighting>()
+        ->Version(1)
+        ->Field("Options", &CEditorPreferencesPage_ExperimentalLighting::m_options);
+
+    AZ::EditContext* editContext = serialize.GetEditContext();
+    if (editContext)
+    {
+        editContext->Class<Options>("Options", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Options::m_totalIlluminationEnabled, "Total Illumination", "Enable Total Illumination");
+
+        editContext->Class<CEditorPreferencesPage_ExperimentalLighting>("Experimental Features Preferences", "Experimental Features Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ExperimentalLighting::m_options, "Options", "Experimental Features Options");
+    }
+}
+
+
+CEditorPreferencesPage_ExperimentalLighting::CEditorPreferencesPage_ExperimentalLighting()
+{
+    InitializeSettings();
+
+    m_icon = QIcon(":/res/Experimental.svg");
+}
+
+const char* CEditorPreferencesPage_ExperimentalLighting::GetTitle()
+{
+    return "Experimental Features";
+}
+
+QIcon& CEditorPreferencesPage_ExperimentalLighting::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_ExperimentalLighting::OnApply()
+{
+    gSettings.sExperimentalFeaturesSettings.bTotalIlluminationEnabled = m_options.m_totalIlluminationEnabled;
+}
+
+void CEditorPreferencesPage_ExperimentalLighting::InitializeSettings()
+{
+    m_options.m_totalIlluminationEnabled = gSettings.sExperimentalFeaturesSettings.bTotalIlluminationEnabled;
+}
diff --git a/Code/Editor/EditorPreferencesPageExperimentalLighting.h b/Code/Editor/EditorPreferencesPageExperimentalLighting.h
new file mode 100644
index 0000000000..be070673ae
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageExperimentalLighting.h
@@ -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
+ *
+ */
+#pragma once
+
+#include "Include/IPreferencesPage.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <QIcon>
+
+
+class CEditorPreferencesPage_ExperimentalLighting
+    : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_ExperimentalLighting, "{5D65D6A2-22B3-4CB7-A3F7-DC2B5034C9C2}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_ExperimentalLighting();
+    virtual ~CEditorPreferencesPage_ExperimentalLighting() = default;
+
+    virtual const char* GetCategory() override { return "Experimental Features"; }
+    virtual const char* GetTitle() override;
+    virtual QIcon& GetIcon() override;
+    virtual void OnApply() override;
+    virtual void OnCancel() override {}
+    virtual bool OnQueryCancel() override { return true; }
+
+
+private:
+    void InitializeSettings();
+
+    struct Options
+    {
+        AZ_TYPE_INFO(Options, "{ED7400E6-3978-4C92-B366-7369E05760FD}")
+
+        bool m_totalIlluminationEnabled;
+    };
+
+    Options m_options;
+    QIcon m_icon;
+};
+
diff --git a/Code/Editor/EditorPreferencesPageFiles.cpp b/Code/Editor/EditorPreferencesPageFiles.cpp
new file mode 100644
index 0000000000..6948ff31c0
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageFiles.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 "EditorDefs.h"
+
+#include "EditorPreferencesPageFiles.h"
+
+// AzToolsFramework
+#include <AzToolsFramework/Slice/SliceUtilities.h>
+
+// Editor
+#include "Settings.h"
+
+
+
+void CEditorPreferencesPage_Files::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<Files>()
+        ->Version(2)
+        ->Field("AutoNumberSlices", &Files::m_autoNumberSlices)
+        ->Field("BackupOnSave", &Files::m_backupOnSave)
+        ->Field("BackupOnSaveMaxCount", &Files::m_backupOnSaveMaxCount)
+        ->Field("TempDirectory", &Files::m_standardTempDirectory)
+        ->Field("AutoSaveTagPoints", &Files::m_autoSaveTagPoints)
+        ->Field("SliceSaveLocation", &Files::m_saveLocation);
+
+    serialize.Class<ExternalEditors>()
+        ->Version(1)
+        ->Field("Scripts", &ExternalEditors::m_scripts)
+        ->Field("Shaders", &ExternalEditors::m_shaders)
+        ->Field("BSpaces", &ExternalEditors::m_BSpaces)
+        ->Field("Textures", &ExternalEditors::m_textures)
+        ->Field("Animations", &ExternalEditors::m_animations);
+
+    serialize.Class<AutoBackup>()
+        ->Version(1)
+        ->Field("Enabled", &AutoBackup::m_enabled)
+        ->Field("Interval", &AutoBackup::m_timeInterval)
+        ->Field("MaxCount", &AutoBackup::m_maxCount)
+        ->Field("RemindTime", &AutoBackup::m_remindTime);
+
+    serialize.Class<CEditorPreferencesPage_Files>()
+        ->Version(1)
+        ->Field("Files", &CEditorPreferencesPage_Files::m_files)
+        ->Field("Editors", &CEditorPreferencesPage_Files::m_editors)
+        ->Field("AutoBackup", &CEditorPreferencesPage_Files::m_autoBackup);
+
+
+    AZ::EditContext* editContext = serialize.GetEditContext();
+    if (editContext)
+    {
+        editContext->Class<Files>("Files", "File Preferences")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Files::m_autoNumberSlices, "Append numeric value to slices", "Should the name of the slice file be automatically numbered. e.g SliceName_001.slice vs. SliceName.slice")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Files::m_backupOnSave, "Backup on Save", "Backup on Save")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Files::m_backupOnSaveMaxCount, "Maximum Save Backups", "Maximum Save Backups")
+            ->Attribute(AZ::Edit::Attributes::Min, 1)
+            ->Attribute(AZ::Edit::Attributes::Max, 100)
+            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &Files::m_standardTempDirectory, "Standard Temporary Directory", "Standard Temporary Directory")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Files::m_autoSaveTagPoints, "Auto Save Camera Tag Points", "Instantly Save Changed Camera Tag Points")
+            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &Files::m_saveLocation, "Slice Save location", "Specify the default location to save new slices");
+
+        editContext->Class<ExternalEditors>("External Editors", "External Editors")
+            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_scripts, "Scripts Editor", "Scripts Text Editor")
+            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_shaders, "Shaders Editor", "Shaders Text Editor")
+            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_BSpaces, "BSpace Editor", "Bspace Text Editor")
+            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_textures, "Texture Editor", "Texture Editor")
+            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_animations, "Animation Editor", "Animation Editor");
+
+        editContext->Class<AutoBackup>("Auto Backup", "Auto Backup")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &AutoBackup::m_enabled, "Enable", "Enable Auto Backup")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AutoBackup::m_timeInterval, "Time Interval", "Auto Backup Interval (Minutes)")
+            ->Attribute(AZ::Edit::Attributes::Min, 2)
+            ->Attribute(AZ::Edit::Attributes::Max, 10000)
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AutoBackup::m_maxCount, "Maximum Backups", "Maximum Auto Backups")
+            ->Attribute(AZ::Edit::Attributes::Min, 1)
+            ->Attribute(AZ::Edit::Attributes::Max, 100)
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AutoBackup::m_remindTime, "Remind Time", "Auto Remind Every (Minutes)");
+
+        editContext->Class<CEditorPreferencesPage_Files>("File Preferences", "Class for handling File Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_files, "Files", "File Preferences")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_editors, "External Editors", "External Editors")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_autoBackup, "Auto Backup", "Auto Backup");
+    }
+}
+
+
+CEditorPreferencesPage_Files::CEditorPreferencesPage_Files()
+{
+    InitializeSettings();
+
+    m_icon = QIcon(":/res/Files.svg");
+}
+
+QIcon& CEditorPreferencesPage_Files::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_Files::OnApply()
+{
+    using namespace AzToolsFramework::SliceUtilities;
+    auto sliceSettings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC("SliceUserSettings", 0x055b32eb), AZ::UserSettings::CT_LOCAL);
+    sliceSettings->m_autoNumber = m_files.m_autoNumberSlices;
+    sliceSettings->m_saveLocation = m_files.m_saveLocation;
+
+    gSettings.bBackupOnSave = m_files.m_backupOnSave;
+    gSettings.backupOnSaveMaxCount = m_files.m_backupOnSaveMaxCount;
+    gSettings.bAutoSaveTagPoints = m_files.m_autoSaveTagPoints;
+    gSettings.strStandardTempDirectory = m_files.m_standardTempDirectory.c_str();
+
+    gSettings.textEditorForScript = m_editors.m_scripts.c_str();
+    gSettings.textEditorForShaders = m_editors.m_shaders.c_str();
+    gSettings.textEditorForBspaces = m_editors.m_BSpaces.c_str();
+    gSettings.textureEditor = m_editors.m_textures.c_str();
+    gSettings.animEditor = m_editors.m_animations.c_str();
+
+    gSettings.autoBackupEnabled = m_autoBackup.m_enabled;
+    gSettings.autoBackupTime = m_autoBackup.m_timeInterval;
+    gSettings.autoBackupMaxCount = m_autoBackup.m_maxCount;
+    gSettings.autoRemindTime = m_autoBackup.m_remindTime;
+}
+
+void CEditorPreferencesPage_Files::InitializeSettings()
+{
+    using namespace AzToolsFramework::SliceUtilities;
+    auto sliceSettings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC("SliceUserSettings", 0x055b32eb), AZ::UserSettings::CT_LOCAL);
+
+    m_files.m_autoNumberSlices = sliceSettings->m_autoNumber;
+    m_files.m_saveLocation = sliceSettings->m_saveLocation;
+    m_files.m_backupOnSave = gSettings.bBackupOnSave;
+    m_files.m_backupOnSaveMaxCount = gSettings.backupOnSaveMaxCount;
+    m_files.m_autoSaveTagPoints = gSettings.bAutoSaveTagPoints;
+    m_files.m_standardTempDirectory = gSettings.strStandardTempDirectory.toUtf8().data();
+
+    m_editors.m_scripts = gSettings.textEditorForScript.toUtf8().data();
+    m_editors.m_shaders = gSettings.textEditorForShaders.toUtf8().data();
+    m_editors.m_BSpaces = gSettings.textEditorForBspaces.toUtf8().data();
+    m_editors.m_textures = gSettings.textureEditor.toUtf8().data();
+    m_editors.m_animations = gSettings.animEditor.toUtf8().data();
+
+    m_autoBackup.m_enabled = gSettings.autoBackupEnabled;
+    m_autoBackup.m_timeInterval = gSettings.autoBackupTime;
+    m_autoBackup.m_maxCount = gSettings.autoBackupMaxCount;
+    m_autoBackup.m_remindTime = gSettings.autoRemindTime;
+}
diff --git a/Code/Editor/EditorPreferencesPageFiles.h b/Code/Editor/EditorPreferencesPageFiles.h
new file mode 100644
index 0000000000..211f2de261
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageFiles.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 "Include/IPreferencesPage.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/Math/Vector3.h>
+#include <QIcon>
+
+
+class CEditorPreferencesPage_Files
+    : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_Files, "{5574AAD2-7619-4C61-A095-CBE70BDB3BF3}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_Files();
+    virtual ~CEditorPreferencesPage_Files() = default;
+
+    virtual const char* GetCategory() override { return "General Settings"; }
+    virtual const char* GetTitle() override { return "Files"; }
+    virtual QIcon& GetIcon() override;
+    virtual void OnApply() override;
+    virtual void OnCancel() override {}
+    virtual bool OnQueryCancel() override { return true; }
+
+private:
+    void InitializeSettings();
+
+    struct Files
+    {
+        AZ_TYPE_INFO(Files, "{9952889C-2A03-4A8B-8ECB-27A2BCC9D7F6}")
+
+        AZStd::string m_standardTempDirectory;
+        AZStd::string m_saveLocation;
+        int m_backupOnSaveMaxCount;
+        bool m_autoNumberSlices;
+        bool m_backupOnSave;
+        bool m_autoSaveTagPoints;
+    };
+
+    struct ExternalEditors
+    {
+        AZ_TYPE_INFO(ExternalEditors, "{6D04DAA8-C0DF-4AFE-B263-9B95619B2527}")
+
+        AZStd::string m_scripts;
+        AZStd::string m_shaders;
+        AZStd::string m_BSpaces;
+        AZStd::string m_textures;
+        AZStd::string m_animations;
+    };
+
+    struct AutoBackup
+    {
+        AZ_TYPE_INFO(AutoBackup, "{C4EC2E11-EBE4-4DAE-B1E2-EB4C8731ECEE}")
+
+        bool m_enabled;
+        int m_timeInterval;
+        int m_maxCount;
+        int m_remindTime;
+    };
+
+
+    Files m_files;
+    ExternalEditors m_editors;
+    AutoBackup m_autoBackup;
+    QIcon m_icon;
+};
+
+
diff --git a/Code/Editor/EditorPreferencesPageGeneral.cpp b/Code/Editor/EditorPreferencesPageGeneral.cpp
new file mode 100644
index 0000000000..861ef10c23
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageGeneral.cpp
@@ -0,0 +1,201 @@
+/*
+ * 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 "EditorPreferencesPageGeneral.h"
+
+// Qt
+#include <QMessageBox>
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <AzQtComponents/Components/StyleManager.h>
+
+// Editor
+#include "MainWindow.h"
+#include "Core/QtEditorApplication.h"
+
+#define EDITORPREFS_EVENTNAME "EPGEvent"
+#define EDITORPREFS_EVENTVALTOGGLE "operation"
+#define UNDOSLICESAVE_VALON "UndoSliceSaveValueOn"
+#define UNDOSLICESAVE_VALOFF "UndoSliceSaveValueOff"
+
+void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<GeneralSettings>()
+        ->Version(3)
+        ->Field("PreviewPanel", &GeneralSettings::m_previewPanel)
+        ->Field("ApplyConfigSpec", &GeneralSettings::m_applyConfigSpec)
+        ->Field("EnableSourceControl", &GeneralSettings::m_enableSourceControl)
+        ->Field("ConsoleBackgroundColorTheme", &GeneralSettings::m_consoleBackgroundColorTheme)
+        ->Field("AutoloadLastLevel", &GeneralSettings::m_autoLoadLastLevel)
+        ->Field("ShowTimeInConsole", &GeneralSettings::m_bShowTimeInConsole)
+        ->Field("ToolbarIconSize", &GeneralSettings::m_toolbarIconSize)
+        ->Field("StylusMode", &GeneralSettings::m_stylusMode)
+        ->Field("ShowNews", &GeneralSettings::m_bShowNews)
+        ->Field("EnableSceneInspector", &GeneralSettings::m_enableSceneInspector)
+        ->Field("RestoreViewportCamera", &GeneralSettings::m_restoreViewportCamera);
+
+    serialize.Class<Messaging>()
+        ->Version(2)
+        ->Field("ShowDashboard", &Messaging::m_showDashboard)
+        ->Field("ShowCircularDependencyError", &Messaging::m_showCircularDependencyError);
+
+    serialize.Class<Undo>()
+        ->Version(2)
+        ->Field("UndoLevels", &Undo::m_undoLevels)
+        ->Field("UndoSliceOverrideSaves", &Undo::m_undoSliceOverrideSaveValue);;
+
+    serialize.Class<DeepSelection>()
+        ->Version(2)
+        ->Field("DeepSelectionRange", &DeepSelection::m_deepSelectionRange)
+        ->Field("StickDuplicate", &DeepSelection::m_stickDuplicate);
+
+    serialize.Class<SliceSettings>()
+        ->Version(1)
+        ->Field("DynamicByDefault", &SliceSettings::m_slicesDynamicByDefault);
+
+    serialize.Class<CEditorPreferencesPage_General>()
+        ->Version(1)
+        ->Field("General Settings", &CEditorPreferencesPage_General::m_generalSettings)
+        ->Field("Messaging", &CEditorPreferencesPage_General::m_messaging)
+        ->Field("Undo", &CEditorPreferencesPage_General::m_undo)
+        ->Field("Deep Selection", &CEditorPreferencesPage_General::m_deepSelection)
+        ->Field("Slice Settings", &CEditorPreferencesPage_General::m_sliceSettings);
+
+
+
+    AZ::EditContext* editContext = serialize.GetEditContext();
+    if (editContext)
+    {
+        editContext->Class<GeneralSettings>("General Settings", "General Editor Preferences")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_previewPanel, "Show Geometry Preview Panel", "Show Geometry Preview Panel")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_applyConfigSpec, "Hide objects by config spec", "Hide objects by config spec")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSourceControl, "Enable Source Control", "Enable Source Control")
+            ->DataElement(AZ::Edit::UIHandlers::ComboBox, &GeneralSettings::m_consoleBackgroundColorTheme, "Console Background", "Console Background")
+                ->EnumAttribute(AzToolsFramework::ConsoleColorTheme::Light, "Light")
+                ->EnumAttribute(AzToolsFramework::ConsoleColorTheme::Dark, "Dark")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_autoLoadLastLevel, "Auto-load last level at startup", "Auto-load last level at startup")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_bShowTimeInConsole, "Show Time In Console", "Show Time In Console")
+            ->DataElement(AZ::Edit::UIHandlers::ComboBox, &GeneralSettings::m_toolbarIconSize, "Toolbar Icon Size", "Toolbar Icon Size")
+                ->EnumAttribute(AzQtComponents::ToolBar::ToolBarIconSize::IconNormal, "Default")
+                ->EnumAttribute(AzQtComponents::ToolBar::ToolBarIconSize::IconLarge, "Large")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_stylusMode, "Stylus Mode", "Stylus Mode for tablets and other pointing devices")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_restoreViewportCamera, EditorPreferencesGeneralRestoreViewportCameraSettingName, "Keep the original editor viewport transform when exiting game mode.")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSceneInspector, "Enable Scene Inspector (EXPERIMENTAL)", "Enable the option to inspect the internal data loaded from scene files like .fbx. This is an experimental feature. Restart the Scene Settings if the option is not visible under the Help menu.");
+
+        editContext->Class<Messaging>("Messaging", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showDashboard, "Show Welcome to Open 3D Engine at startup", "Show Welcome to Open 3D Engine at startup")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showCircularDependencyError, "Show Error: Circular dependency", "Show an error message when adding a slice instance to the target slice would create a cyclic asset dependency. All other valid overrides will be saved even if this is turned off.");
+
+        editContext->Class<Undo>("Undo", "")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Undo::m_undoLevels, "Undo Levels", "This field specifies the number of undo levels")
+            ->Attribute(AZ::Edit::Attributes::Min, 0)
+            ->Attribute(AZ::Edit::Attributes::Max, 10000)
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Undo::m_undoSliceOverrideSaveValue, "Undo Slice Override Saves", "Allow slice saves to be undone");
+
+        editContext->Class<DeepSelection>("Selection", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &DeepSelection::m_stickDuplicate, "Stick duplicate to cursor", "Stick duplicate to cursor")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &DeepSelection::m_deepSelectionRange, "Deep selection range", "Deep Selection Range")
+            ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
+            ->Attribute(AZ::Edit::Attributes::Max, 1000.0f);
+
+        editContext->Class<SliceSettings>("Slices", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &SliceSettings::m_slicesDynamicByDefault, "New Slices Dynamic By Default", "When creating slices, they will be set to dynamic by default");
+
+        editContext->Class<CEditorPreferencesPage_General>("General Editor Preferences", "Class for handling General Editor Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_generalSettings, "General Settings", "General Editor Preferences")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_messaging, "Messaging", "Messaging")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_undo, "Undo", "Undo Preferences")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_deepSelection, "Selection", "Selection")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_sliceSettings, "Slices", "Slice Settings");
+    }
+}
+
+CEditorPreferencesPage_General::CEditorPreferencesPage_General()
+{
+    InitializeSettings();
+
+    m_icon = QIcon(":/res/Global.svg");
+}
+
+const char* CEditorPreferencesPage_General::GetTitle()
+{
+    return "General Settings";
+}
+
+QIcon& CEditorPreferencesPage_General::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_General::OnApply()
+{
+    //general settings
+    gSettings.bPreviewGeometryWindow = m_generalSettings.m_previewPanel;
+    gSettings.bApplyConfigSpecInEditor = m_generalSettings.m_applyConfigSpec;
+    gSettings.enableSourceControl = m_generalSettings.m_enableSourceControl;
+    gSettings.consoleBackgroundColorTheme = m_generalSettings.m_consoleBackgroundColorTheme;
+    gSettings.bShowTimeInConsole = m_generalSettings.m_bShowTimeInConsole;
+    gSettings.bShowDashboardAtStartup = m_messaging.m_showDashboard;
+    gSettings.m_showCircularDependencyError = m_messaging.m_showCircularDependencyError;
+    gSettings.bAutoloadLastLevelAtStartup = m_generalSettings.m_autoLoadLastLevel;
+    gSettings.stylusMode = m_generalSettings.m_stylusMode;
+    gSettings.restoreViewportCamera = m_generalSettings.m_restoreViewportCamera;
+    gSettings.enableSceneInspector = m_generalSettings.m_enableSceneInspector;
+
+    if (static_cast<int>(m_generalSettings.m_toolbarIconSize) != gSettings.gui.nToolbarIconSize)
+    {
+        gSettings.gui.nToolbarIconSize = static_cast<int>(m_generalSettings.m_toolbarIconSize);
+        MainWindow::instance()->AdjustToolBarIconSize(m_generalSettings.m_toolbarIconSize);
+    }
+
+    //undo
+    gSettings.undoLevels = m_undo.m_undoLevels;
+
+    gSettings.m_undoSliceOverrideSaveValue = m_undo.m_undoSliceOverrideSaveValue;
+
+    //deep selection
+    gSettings.deepSelectionSettings.fRange = m_deepSelection.m_deepSelectionRange;
+    gSettings.deepSelectionSettings.bStickDuplicate = m_deepSelection.m_stickDuplicate;
+
+    //slices
+    gSettings.sliceSettings.dynamicByDefault = m_sliceSettings.m_slicesDynamicByDefault;
+}
+
+void CEditorPreferencesPage_General::InitializeSettings()
+{
+    //general settings
+    m_generalSettings.m_previewPanel = gSettings.bPreviewGeometryWindow;
+    m_generalSettings.m_applyConfigSpec = gSettings.bApplyConfigSpecInEditor;
+    m_generalSettings.m_enableSourceControl = gSettings.enableSourceControl;
+    m_generalSettings.m_consoleBackgroundColorTheme = gSettings.consoleBackgroundColorTheme;
+    m_generalSettings.m_bShowTimeInConsole = gSettings.bShowTimeInConsole;
+    m_generalSettings.m_autoLoadLastLevel = gSettings.bAutoloadLastLevelAtStartup;
+    m_generalSettings.m_stylusMode = gSettings.stylusMode;
+    m_generalSettings.m_restoreViewportCamera = gSettings.restoreViewportCamera;
+    m_generalSettings.m_enableSceneInspector = gSettings.enableSceneInspector;
+
+    m_generalSettings.m_toolbarIconSize = static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(gSettings.gui.nToolbarIconSize);
+
+    //Messaging
+    m_messaging.m_showDashboard = gSettings.bShowDashboardAtStartup;
+    m_messaging.m_showCircularDependencyError = gSettings.m_showCircularDependencyError;
+
+    //undo
+    m_undo.m_undoLevels = gSettings.undoLevels;
+    m_undo.m_undoSliceOverrideSaveValue = gSettings.m_undoSliceOverrideSaveValue;
+
+    //deep selection
+    m_deepSelection.m_deepSelectionRange = gSettings.deepSelectionSettings.fRange;
+    m_deepSelection.m_stickDuplicate = gSettings.deepSelectionSettings.bStickDuplicate;
+
+    //slices
+    m_sliceSettings.m_slicesDynamicByDefault = gSettings.sliceSettings.dynamicByDefault;
+}
diff --git a/Code/Editor/EditorPreferencesPageGeneral.h b/Code/Editor/EditorPreferencesPageGeneral.h
new file mode 100644
index 0000000000..ca315c2d01
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageGeneral.h
@@ -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
+ *
+ */
+#pragma once
+
+#include "Include/IPreferencesPage.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzQtComponents/Components/Widgets/ToolBar.h>
+#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
+#include <QIcon>
+
+#include "Settings.h"
+
+class CEditorPreferencesPage_General
+    : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_General, "{9CFBBE85-560D-4720-A830-50EF25D06ED5}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_General();
+    virtual ~CEditorPreferencesPage_General() = default;
+
+    virtual const char* GetCategory() override { return "General Settings"; }
+    virtual const char* GetTitle() override;
+    virtual QIcon& GetIcon() override;
+    virtual void OnApply() override;
+    virtual void OnCancel() override {}
+    virtual bool OnQueryCancel() override { return true; }
+
+private:
+    void InitializeSettings();
+
+    struct GeneralSettings
+    {
+        AZ_TYPE_INFO(GeneralSettings, "{C2AE8F6D-7AA6-499E-A3E8-ECCD0AC6F3D2}")
+
+        bool m_previewPanel;
+        bool m_applyConfigSpec;
+        bool m_enableSourceControl;
+        AzToolsFramework::ConsoleColorTheme m_consoleBackgroundColorTheme;
+        bool m_autoLoadLastLevel;
+        bool m_bShowTimeInConsole;
+        AzQtComponents::ToolBar::ToolBarIconSize m_toolbarIconSize;
+        bool m_stylusMode;
+        bool m_restoreViewportCamera;
+        bool m_bShowNews;
+        bool m_enableSceneInspector;
+    };
+
+    struct Messaging
+    {
+        AZ_TYPE_INFO(Messaging, "{A6AD87CB-E905-409B-A2BF-C43CDCE63B0C}")
+
+        bool m_showDashboard;
+        bool m_showCircularDependencyError;
+    };
+
+    struct Undo
+    {
+        AZ_TYPE_INFO(Undo, "{A3AC0728-F132-4BF2-B122-8A631B636E81}")
+
+        int m_undoLevels;
+        bool m_undoSliceOverrideSaveValue;
+    };
+
+    struct DeepSelection
+    {
+        AZ_TYPE_INFO(DeepSelection, "{225616BF-66DE-41EC-9FDD-F5A104112547}")
+
+        float m_deepSelectionRange;
+        bool m_stickDuplicate;
+    };
+
+    struct SliceSettings
+    {
+        AZ_TYPE_INFO(SliceSettings, "{8505CCC1-874C-4389-B51A-B9E5FF70CFDA}")
+
+        bool m_slicesDynamicByDefault;
+    };
+
+    GeneralSettings m_generalSettings;
+    Messaging m_messaging;
+    Undo m_undo;
+    DeepSelection m_deepSelection;
+    SliceSettings m_sliceSettings;
+    QIcon m_icon;
+};
+
+static const char* EditorPreferencesGeneralRestoreViewportCameraSettingName = "Restore Viewport Camera on Game Mode Exit";
+
diff --git a/Code/Editor/EditorPreferencesPageViewportDebug.cpp b/Code/Editor/EditorPreferencesPageViewportDebug.cpp
new file mode 100644
index 0000000000..be329d0172
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageViewportDebug.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+
+#include "EditorPreferencesPageViewportDebug.h"
+
+// AzCore
+#include <AzCore/Serialization/EditContext.h>
+
+// Editor
+#include "Settings.h"
+
+void CEditorPreferencesPage_ViewportDebug::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<Profiling>()
+        ->Version(1)
+        ->Field("ShowMeshStatsOnMouseOver", &Profiling::m_showMeshStatsOnMouseOver);
+
+    serialize.Class<Warnings>()
+        ->Version(1)
+        ->Field("WarningIconsDrawDistance", &Warnings::m_warningIconsDrawDistance)
+        ->Field("ShowScaleWarnings", &Warnings::m_showScaleWarnings)
+        ->Field("ShowRotationWarnings", &Warnings::m_showRotationWarnings);
+
+    serialize.Class<CEditorPreferencesPage_ViewportDebug>()
+        ->Version(1)
+        ->Field("Profiling", &CEditorPreferencesPage_ViewportDebug::m_profiling)
+        ->Field("Warnings", &CEditorPreferencesPage_ViewportDebug::m_warnings);
+
+
+    AZ::EditContext* editContext = serialize.GetEditContext();
+    if (editContext)
+    {
+        editContext->Class<Profiling>("Profiling", "Profiling")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Profiling::m_showMeshStatsOnMouseOver, "Show Mesh Statistics", "Show Mesh Statistics on Mouse Over");
+
+        editContext->Class<Warnings>("Viewport Warning Settings", "")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Warnings::m_warningIconsDrawDistance, "Warning Icons Draw Distance", "Warning Icons Draw Distance")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Warnings::m_showScaleWarnings, "Show Scale Warnings", "Show Scale Warnings")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Warnings::m_showRotationWarnings, "Show Rotation Warnings", "Show Rotation Warnings");
+
+        editContext->Class<CEditorPreferencesPage_ViewportDebug>("Viewport Debug Preferences", "Viewport Debug Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportDebug::m_profiling, "Profiling", "Profiling")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportDebug::m_warnings, "Viewport Warning Settings", "Viewport Warning Settings");
+    }
+}
+
+
+CEditorPreferencesPage_ViewportDebug::CEditorPreferencesPage_ViewportDebug()
+{
+    InitializeSettings();
+    m_icon = QIcon(":/res/Debug.svg");
+}
+
+QIcon& CEditorPreferencesPage_ViewportDebug::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_ViewportDebug::OnApply()
+{
+    gSettings.viewports.bShowMeshStatsOnMouseOver = m_profiling.m_showMeshStatsOnMouseOver;
+    gSettings.viewports.bShowRotationWarnings = m_warnings.m_showRotationWarnings;
+    gSettings.viewports.bShowScaleWarnings = m_warnings.m_showScaleWarnings;
+    gSettings.viewports.fWarningIconsDrawDistance = m_warnings.m_warningIconsDrawDistance;
+}
+
+void CEditorPreferencesPage_ViewportDebug::InitializeSettings()
+{
+    m_profiling.m_showMeshStatsOnMouseOver = gSettings.viewports.bShowMeshStatsOnMouseOver;
+    m_warnings.m_showRotationWarnings = gSettings.viewports.bShowRotationWarnings;
+    m_warnings.m_showScaleWarnings = gSettings.viewports.bShowScaleWarnings;
+    m_warnings.m_warningIconsDrawDistance = gSettings.viewports.fWarningIconsDrawDistance;
+}
diff --git a/Code/Editor/EditorPreferencesPageViewportDebug.h b/Code/Editor/EditorPreferencesPageViewportDebug.h
new file mode 100644
index 0000000000..ee339d51c2
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageViewportDebug.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 "Include/IPreferencesPage.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <QIcon>
+
+
+class CEditorPreferencesPage_ViewportDebug
+    : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_ViewportDebug, "{BD98FC0D-9F07-46AF-A123-BE34EC33E454}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_ViewportDebug();
+    virtual ~CEditorPreferencesPage_ViewportDebug() = default;
+
+    virtual const char* GetCategory() override { return "Viewports"; }
+    virtual const char* GetTitle() override { return "Debug"; }
+    virtual QIcon& GetIcon() override;
+    virtual void OnApply() override;
+    virtual void OnCancel() override {}
+    virtual bool OnQueryCancel() override { return true; }
+
+private:
+    void InitializeSettings();
+
+    struct Profiling
+    {
+        AZ_TYPE_INFO(Profiling, "{AF413B5A-DDF3-4635-9D8B-1E1A3DF60287}")
+
+        bool m_showMeshStatsOnMouseOver;
+    };
+
+    struct Warnings
+    {
+        AZ_TYPE_INFO(Warnings, "{6CC8A276-24A4-4100-8F7F-7695ABAF6905}")
+
+        float m_warningIconsDrawDistance;
+        bool m_showScaleWarnings;
+        bool m_showRotationWarnings;
+    };
+
+    Profiling m_profiling;
+    Warnings m_warnings;
+    QIcon m_icon;
+};
+
diff --git a/Code/Editor/EditorPreferencesPageViewportGeneral.cpp b/Code/Editor/EditorPreferencesPageViewportGeneral.cpp
new file mode 100644
index 0000000000..5a7538322a
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageViewportGeneral.cpp
@@ -0,0 +1,260 @@
+/*
+ * 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 "EditorPreferencesPageViewportGeneral.h"
+
+#include <AzQtComponents/Components/StyleManager.h>
+
+// Editor
+#include "DisplaySettings.h"
+#include "Settings.h"
+
+
+void CEditorPreferencesPage_ViewportGeneral::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<General>()
+        ->Version(1)
+        ->Field("Sync2DViews", &General::m_sync2DViews)
+        ->Field("DefaultFOV", &General::m_defaultFOV)
+        ->Field("DefaultAspectRatio", &General::m_defaultAspectRatio)
+        ->Field("EnableContextMenu", &General::m_enableContextMenu);
+
+    serialize.Class<Display>()
+        ->Version(1)
+        ->Field("ShowSafeFrame", &Display::m_showSafeFrame)
+        ->Field("HighlightSelGeom", &Display::m_highlightSelGeom)
+        ->Field("HighlightSelVegetation", &Display::m_highlightSelVegetation)
+        ->Field("HighlightOnMouseOver", &Display::m_highlightOnMouseOver)
+        ->Field("HideMouseCursorWhenCaptured", &Display::m_hideMouseCursorWhenCaptured)
+        ->Field("DragSquareSize", &Display::m_dragSquareSize)
+        ->Field("DisplayLinks", &Display::m_displayLinks)
+        ->Field("DisplayTracks", &Display::m_displayTracks)
+        ->Field("AlwaysShowRadii", &Display::m_alwaysShowRadii)
+        ->Field("ShowBBoxes", &Display::m_showBBoxes)
+        ->Field("DrawEntityLabels", &Display::m_drawEntityLabels)
+        ->Field("ShowTriggerBounds", &Display::m_showTriggerBounds)
+        ->Field("ShowIcons", &Display::m_showIcons)
+        ->Field("DistanceScaleIcons", &Display::m_distanceScaleIcons)
+        ->Field("ShowFrozenHelpers", &Display::m_showFrozenHelpers)
+        ->Field("FillSelectedShapes", &Display::m_fillSelectedShapes)
+        ->Field("ShowGridGuide", &Display::m_showGridGuide)
+        ->Field("DisplayDimensions", &Display::m_displayDimension);
+
+    serialize.Class<MapViewport>()
+        ->Version(1)
+        ->Field("SwapXY", &MapViewport::m_swapXY)
+        ->Field("Resolution", &MapViewport::m_resolution);
+
+    serialize.Class<TextLabels>()
+        ->Version(1)
+        ->Field("LabelsOn", &TextLabels::m_labelsOn)
+        ->Field("LabelsDistance", &TextLabels::m_labelsDistance);
+
+    serialize.Class<SelectionPreviewColor>()
+        ->Version(1)
+        ->Field("ColorGroupBBox", &SelectionPreviewColor::m_colorGroupBBox)
+        ->Field("ColorEntityBBox", &SelectionPreviewColor::m_colorEntityBBox)
+        ->Field("BBoxAlpha", &SelectionPreviewColor::m_fBBoxAlpha)
+        ->Field("GeometryHighlihgtColor", &SelectionPreviewColor::m_geometryHighlightColor)
+        ->Field("SolidBrushGeometryColor", &SelectionPreviewColor::m_solidBrushGeometryColor)
+        ->Field("GeomAlpha", &SelectionPreviewColor::m_fgeomAlpha)
+        ->Field("ChildObjectGeomAlpha", &SelectionPreviewColor::m_childObjectGeomAlpha);
+
+    serialize.Class<CEditorPreferencesPage_ViewportGeneral>()
+        ->Version(1)
+        ->Field("General Viewport Settings", &CEditorPreferencesPage_ViewportGeneral::m_general)
+        ->Field("Viewport Displaying", &CEditorPreferencesPage_ViewportGeneral::m_display)
+        ->Field("Map Viewport", &CEditorPreferencesPage_ViewportGeneral::m_map)
+        ->Field("Test Labels", &CEditorPreferencesPage_ViewportGeneral::m_textLabels)
+        ->Field("Selection Preview Color", &CEditorPreferencesPage_ViewportGeneral::m_selectionPreviewColor);
+
+    AZ::EditContext* editContext = serialize.GetEditContext();
+    if (editContext)
+    {
+        editContext->Class<General>("General Viewport Settings", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &General::m_sync2DViews, "Synchronize 2D Viewports", "Synchronize 2D Viewports")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &General::m_defaultFOV, "Perspective View FOV", "Perspective View FOV")
+                ->Attribute("Multiplier", RAD2DEG(1))
+                ->Attribute(AZ::Edit::Attributes::Min, 1.0f)
+                ->Attribute(AZ::Edit::Attributes::Max, 120.0f)
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &General::m_defaultAspectRatio, "Perspective View Aspect Ratio", "Perspective View Aspect Ratio")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &General::m_enableContextMenu, "Enable Right-Click Context Menu", "Enable Right-Click Context Menu");
+
+        editContext->Class<Display>("Viewport Display Settings", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showSafeFrame, "Show 4:3 Aspect Ratio Frame", "Show 4:3 Aspect Ratio Frame")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_highlightSelGeom, "Highlight Selected Geometry", "Highlight Selected Geometry")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_highlightSelVegetation, "Highlight Selected Vegetation", "Highlight Selected Vegetation")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_highlightOnMouseOver, "Highlight Geometry On Mouse Over", "Highlight Geometry On Mouse Over")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_hideMouseCursorWhenCaptured, "Hide Cursor When Captured", "Hide Mouse Cursor When Captured")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Display::m_dragSquareSize, "Drag Square Size", "Drag Square Size")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_displayLinks, "Display Object Links", "Display Object Links")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_displayTracks, "Display Animation Tracks", "Display Animation Tracks")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_alwaysShowRadii, "Always Show Radii", "Always Show Radii")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showBBoxes, "Show Bounding Boxes", "Show Bounding Boxes")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_drawEntityLabels, "Always Draw Entity Labels", "Always Draw Entity Labels")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showTriggerBounds, "Always Show Trigger Bounds", "Always Show Trigger Bounds")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showIcons, "Show Object Icons", "Show Object Icons")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_distanceScaleIcons, "Scale Object Icons with Distance", "Scale Object Icons with Distance")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showFrozenHelpers, "Show Helpers of Frozen Objects", "Show Helpers of Frozen Objects")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_fillSelectedShapes, "Fill Selected Shapes", "Fill Selected Shapes")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showGridGuide, "Show Snapping Grid Guide", "Show Snapping Grid Guide")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_displayDimension, "Display Dimension Figures", "Display Dimension Figures");
+
+        editContext->Class<MapViewport>("Map Viewport Settings", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &MapViewport::m_swapXY, "Swap X/Y Axis", "Swap X/Y Axis")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &MapViewport::m_resolution, "Map Texture Resolution", "Map Texture Resolution");
+
+        editContext->Class<TextLabels>("Text Label Settings", "")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &TextLabels::m_labelsOn, "Enabled", "Enabled")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &TextLabels::m_labelsDistance, "Distance", "Distance")
+                ->Attribute(AZ::Edit::Attributes::Min, 0.f)
+                ->Attribute(AZ::Edit::Attributes::Max, 100000.f);
+
+        editContext->Class<SelectionPreviewColor>("Selection Preview Color Settings", "")
+            ->DataElement(AZ::Edit::UIHandlers::Color, &SelectionPreviewColor::m_colorGroupBBox, "Group Bounding Box", "Group Bounding Box")
+            ->DataElement(AZ::Edit::UIHandlers::Color, &SelectionPreviewColor::m_colorEntityBBox, "Entity Bounding Box", "Entity Bounding Box")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &SelectionPreviewColor::m_fBBoxAlpha, "Bounding Box Highlight Alpha", "Bounding Box Highlight Alpha")
+                ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
+                ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
+            ->DataElement(AZ::Edit::UIHandlers::Color, &SelectionPreviewColor::m_geometryHighlightColor, "Geometry Color", "Geometry Color")
+            ->DataElement(AZ::Edit::UIHandlers::Color, &SelectionPreviewColor::m_solidBrushGeometryColor, "Solid Brush Geometry Color", "Solid Brush Geometry Color")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &SelectionPreviewColor::m_fgeomAlpha, "Geometry Highlight Alpha", "Geometry Highlight Alpha")
+                ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
+                ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &SelectionPreviewColor::m_childObjectGeomAlpha, "Child Geometry Highlight Alpha", "Child Geometry Highlight Alpha")
+                ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
+                ->Attribute(AZ::Edit::Attributes::Max, 1.0f);
+
+        editContext->Class<CEditorPreferencesPage_ViewportGeneral>("General Viewport Preferences", "General Viewport Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_general, "General Viewport Settings", "General Viewport Settings")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_display, "Viewport Display Settings", "Viewport Display Settings")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_map, "Map Viewport Settings", "Map Viewport Settings")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_textLabels, "Text Label Settings", "Text Label Settings")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_selectionPreviewColor, "Selection Preview Color Settings", "Selection Preview Color Settings");
+    }
+}
+
+
+CEditorPreferencesPage_ViewportGeneral::CEditorPreferencesPage_ViewportGeneral()
+{
+    InitializeSettings();
+    m_icon = QIcon(":/res/Viewport.svg");
+}
+
+const char* CEditorPreferencesPage_ViewportGeneral::GetTitle()
+{
+    return "Viewport";
+}
+
+QIcon& CEditorPreferencesPage_ViewportGeneral::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_ViewportGeneral::OnApply()
+{
+    CDisplaySettings* ds = GetIEditor()->GetDisplaySettings();
+
+    gSettings.viewports.fDefaultAspectRatio = m_general.m_defaultAspectRatio;
+    gSettings.viewports.fDefaultFov = m_general.m_defaultFOV;
+    gSettings.viewports.bEnableContextMenu = m_general.m_enableContextMenu;
+    gSettings.viewports.bSync2DViews = m_general.m_sync2DViews;
+
+    gSettings.viewports.bShowSafeFrame = m_display.m_showSafeFrame;
+    gSettings.viewports.bHighlightSelectedGeometry = m_display.m_highlightSelGeom;
+    gSettings.viewports.bHighlightSelectedVegetation = m_display.m_highlightSelVegetation;
+    gSettings.viewports.bHighlightMouseOverGeometry = m_display.m_highlightOnMouseOver;
+    gSettings.viewports.bHideMouseCursorWhenCaptured = m_display.m_hideMouseCursorWhenCaptured;
+    gSettings.viewports.nDragSquareSize = m_display.m_dragSquareSize;
+    ds->DisplayLinks(m_display.m_displayLinks);
+    ds->DisplayTracks(m_display.m_displayTracks);
+    gSettings.viewports.bAlwaysShowRadiuses = m_display.m_alwaysShowRadii;
+    if (m_display.m_showBBoxes)
+    {
+        ds->SetRenderFlags(ds->GetRenderFlags() | RENDER_FLAG_BBOX);
+    }
+    else
+    {
+        ds->SetRenderFlags(ds->GetRenderFlags() & (~RENDER_FLAG_BBOX));
+    }
+    gSettings.viewports.bDrawEntityLabels = m_display.m_drawEntityLabels;
+    gSettings.viewports.bShowTriggerBounds = m_display.m_showTriggerBounds;
+    gSettings.viewports.bShowIcons = m_display.m_showIcons;
+    gSettings.viewports.bDistanceScaleIcons = m_display.m_distanceScaleIcons;
+    gSettings.viewports.nShowFrozenHelpers = m_display.m_showFrozenHelpers;
+    gSettings.viewports.bFillSelectedShapes = m_display.m_fillSelectedShapes;
+    gSettings.viewports.bShowGridGuide = m_display.m_showGridGuide;
+    ds->DisplayDimensionFigures(m_display.m_displayDimension);
+
+    gSettings.viewports.nTopMapTextureResolution = m_map.m_resolution;
+    gSettings.viewports.bTopMapSwapXY = m_map.m_swapXY;
+
+    ds->DisplayLabels(m_textLabels.m_labelsOn);
+    ds->SetLabelsDistance(m_textLabels.m_labelsDistance);
+
+    gSettings.objectColorSettings.fChildGeomAlpha = m_selectionPreviewColor.m_childObjectGeomAlpha;
+    gSettings.objectColorSettings.entityHighlight = QColor(m_selectionPreviewColor.m_colorEntityBBox.GetR() * 255.0f,
+            m_selectionPreviewColor.m_colorEntityBBox.GetG() * 255.0f,
+            m_selectionPreviewColor.m_colorEntityBBox.GetB() * 255.0f);
+    gSettings.objectColorSettings.groupHighlight = QColor(m_selectionPreviewColor.m_colorGroupBBox.GetR() * 255.0f,
+            m_selectionPreviewColor.m_colorGroupBBox.GetG() * 255.0f,
+            m_selectionPreviewColor.m_colorGroupBBox.GetB() * 255.0f);
+    gSettings.objectColorSettings.fBBoxAlpha = m_selectionPreviewColor.m_fBBoxAlpha;
+    gSettings.objectColorSettings.fGeomAlpha = m_selectionPreviewColor.m_fgeomAlpha;
+    gSettings.objectColorSettings.geometryHighlightColor = QColor(m_selectionPreviewColor.m_geometryHighlightColor.GetR() * 255.0f,
+            m_selectionPreviewColor.m_geometryHighlightColor.GetG() * 255.0f,
+            m_selectionPreviewColor.m_geometryHighlightColor.GetB() * 255.0f);
+    gSettings.objectColorSettings.solidBrushGeometryColor = QColor(m_selectionPreviewColor.m_solidBrushGeometryColor.GetR() * 255.0f,
+            m_selectionPreviewColor.m_solidBrushGeometryColor.GetG() * 255.0f,
+            m_selectionPreviewColor.m_solidBrushGeometryColor.GetB() * 255.0f);
+}
+
+void CEditorPreferencesPage_ViewportGeneral::InitializeSettings()
+{
+    CDisplaySettings* ds = GetIEditor()->GetDisplaySettings();
+
+    m_general.m_defaultAspectRatio = gSettings.viewports.fDefaultAspectRatio;
+    m_general.m_defaultFOV = gSettings.viewports.fDefaultFov;
+    m_general.m_enableContextMenu = gSettings.viewports.bEnableContextMenu;
+    m_general.m_sync2DViews = gSettings.viewports.bSync2DViews;
+
+    m_display.m_showSafeFrame = gSettings.viewports.bShowSafeFrame;
+    m_display.m_highlightSelGeom = gSettings.viewports.bHighlightSelectedGeometry;
+    m_display.m_highlightSelVegetation = gSettings.viewports.bHighlightSelectedVegetation;
+    m_display.m_highlightOnMouseOver = gSettings.viewports.bHighlightMouseOverGeometry;
+    m_display.m_hideMouseCursorWhenCaptured = gSettings.viewports.bHideMouseCursorWhenCaptured;
+    m_display.m_dragSquareSize = gSettings.viewports.nDragSquareSize;
+    m_display.m_displayLinks = ds->IsDisplayLinks();
+    m_display.m_displayTracks = ds->IsDisplayTracks();
+    m_display.m_alwaysShowRadii = gSettings.viewports.bAlwaysShowRadiuses;
+    m_display.m_showBBoxes = (ds->GetRenderFlags() & RENDER_FLAG_BBOX) == RENDER_FLAG_BBOX;
+    m_display.m_drawEntityLabels = gSettings.viewports.bDrawEntityLabels;
+    m_display.m_showTriggerBounds = gSettings.viewports.bShowTriggerBounds;
+    m_display.m_showIcons = gSettings.viewports.bShowIcons;
+    m_display.m_distanceScaleIcons = gSettings.viewports.bDistanceScaleIcons;
+    m_display.m_showFrozenHelpers = gSettings.viewports.nShowFrozenHelpers;
+    m_display.m_fillSelectedShapes = gSettings.viewports.bFillSelectedShapes;
+    m_display.m_showGridGuide = gSettings.viewports.bShowGridGuide;
+    m_display.m_displayDimension = ds->IsDisplayDimensionFigures();
+
+    m_map.m_resolution = gSettings.viewports.nTopMapTextureResolution;
+    m_map.m_swapXY = gSettings.viewports.bTopMapSwapXY;
+
+    m_textLabels.m_labelsOn = ds->IsDisplayLabels();
+    m_textLabels.m_labelsDistance = ds->GetLabelsDistance();
+
+    m_selectionPreviewColor.m_childObjectGeomAlpha = gSettings.objectColorSettings.fChildGeomAlpha;
+    m_selectionPreviewColor.m_colorEntityBBox.Set(gSettings.objectColorSettings.entityHighlight.redF(), gSettings.objectColorSettings.entityHighlight.greenF(), gSettings.objectColorSettings.entityHighlight.blueF(), 1.0f);
+    m_selectionPreviewColor.m_colorGroupBBox.Set(gSettings.objectColorSettings.groupHighlight.redF(), gSettings.objectColorSettings.groupHighlight.greenF(), gSettings.objectColorSettings.groupHighlight.blueF(), 1.0f);
+    m_selectionPreviewColor.m_fBBoxAlpha = gSettings.objectColorSettings.fBBoxAlpha;
+    m_selectionPreviewColor.m_fgeomAlpha = gSettings.objectColorSettings.fGeomAlpha;
+    m_selectionPreviewColor.m_geometryHighlightColor.Set(gSettings.objectColorSettings.geometryHighlightColor.redF(), gSettings.objectColorSettings.geometryHighlightColor.greenF(), gSettings.objectColorSettings.geometryHighlightColor.blueF(), 1.0f);
+    m_selectionPreviewColor.m_solidBrushGeometryColor.Set(gSettings.objectColorSettings.solidBrushGeometryColor.redF(), gSettings.objectColorSettings.solidBrushGeometryColor.greenF(), gSettings.objectColorSettings.solidBrushGeometryColor.blueF(), 1.0f);
+}
diff --git a/Code/Editor/EditorPreferencesPageViewportGeneral.h b/Code/Editor/EditorPreferencesPageViewportGeneral.h
new file mode 100644
index 0000000000..2988b544e7
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageViewportGeneral.h
@@ -0,0 +1,109 @@
+/*
+ * 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 "Include/IPreferencesPage.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/Math/Color.h>
+#include <QIcon>
+
+
+class CEditorPreferencesPage_ViewportGeneral
+    : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_ViewportGeneral, "{8511FF7F-F774-47E1-A99B-3DE3A867E403}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_ViewportGeneral();
+    virtual ~CEditorPreferencesPage_ViewportGeneral() = default;
+
+    virtual const char* GetCategory() override { return "Viewports"; }
+    virtual const char* GetTitle() override;
+    virtual QIcon& GetIcon() override;
+    virtual void OnApply() override;
+    virtual void OnCancel() override {}
+    virtual bool OnQueryCancel() override { return true; }
+
+private:
+    void InitializeSettings();
+
+    struct General
+    {
+        AZ_TYPE_INFO(General, "{3BAC6F1C-E954-4EDD-95B0-90741B1010E0}")
+
+        bool m_sync2DViews;
+        float m_defaultFOV;
+        float m_defaultAspectRatio;
+        bool m_enableContextMenu;
+    };
+
+    struct Display
+    {
+        AZ_TYPE_INFO(Display, "{F0376933-FA0B-4B58-9DD9-6F6EBC7386CA}")
+
+        bool m_showSafeFrame;
+        bool m_highlightSelGeom;
+        bool m_highlightSelVegetation;
+        bool m_highlightOnMouseOver;
+        bool m_hideMouseCursorWhenCaptured;
+        int m_dragSquareSize;
+        bool m_displayLinks;
+        bool m_displayTracks;
+        bool m_alwaysShowRadii;
+        bool m_showBBoxes;
+        bool m_drawEntityLabels;
+        bool m_showTriggerBounds;
+        bool m_showIcons;
+        bool m_distanceScaleIcons;
+        bool m_showFrozenHelpers;
+        bool m_fillSelectedShapes;
+        bool m_showGridGuide;
+        bool m_displayDimension;
+    };
+
+    struct MapViewport
+    {
+        AZ_TYPE_INFO(MapViewport, "{FF49D39D-9A92-4605-B20A-C1E72934DD16}")
+
+        bool m_swapXY;
+        int m_resolution;
+    };
+
+    struct TextLabels
+    {
+        AZ_TYPE_INFO(TextLabels, "{DD3972ED-5120-4552-8D55-3D3967A29360}")
+
+        bool m_labelsOn;
+        float m_labelsDistance;
+    };
+
+    struct SelectionPreviewColor
+    {
+        AZ_TYPE_INFO(SelectionPreviewColor, "{801A5252-B238-4832-BDA4-EAE0D0F98850}")
+
+        AZ::Color m_colorGroupBBox;
+        AZ::Color m_colorEntityBBox;
+        float m_fBBoxAlpha;
+        AZ::Color m_geometryHighlightColor;
+        AZ::Color m_solidBrushGeometryColor;
+        float m_fgeomAlpha;
+        float m_childObjectGeomAlpha;
+    };
+
+    General m_general;
+    Display m_display;
+    MapViewport m_map;
+    TextLabels m_textLabels;
+    SelectionPreviewColor m_selectionPreviewColor;
+    QIcon m_icon;
+};
+
+
diff --git a/Code/Editor/EditorPreferencesPageViewportGizmo.cpp b/Code/Editor/EditorPreferencesPageViewportGizmo.cpp
new file mode 100644
index 0000000000..9822a99835
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageViewportGizmo.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 "EditorDefs.h"
+
+#include "EditorPreferencesPageViewportGizmo.h"
+
+// Editor
+#include "Settings.h"
+
+
+void CEditorPreferencesPage_ViewportGizmo::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<AxisGizmo>()
+        ->Version(1)
+        ->Field("Size", &AxisGizmo::m_size)
+        ->Field("Text", &AxisGizmo::m_text)
+        ->Field("MaxCount", &AxisGizmo::m_maxCount);
+
+    serialize.Class<Helpers>()
+        ->Version(1)
+        ->Field("LabelsOn", &Helpers::m_helpersGlobalScale)
+        ->Field("LabelsOn", &Helpers::m_tagpointScaleMulti)
+        ->Field("LabelsOn", &Helpers::m_rulerSphereScale)
+        ->Field("LabelsDistance", &Helpers::m_rulerSphereTrans);
+
+    serialize.Class<CEditorPreferencesPage_ViewportGizmo>()
+        ->Version(1)
+        ->Field("Axis Gizmo", &CEditorPreferencesPage_ViewportGizmo::m_axisGizmo)
+        ->Field("Helpers", &CEditorPreferencesPage_ViewportGizmo::m_helpers);
+
+    AZ::EditContext* editContext = serialize.GetEditContext();
+    if (editContext)
+    {
+        editContext->Class<AxisGizmo>("Axis Gizmo", "")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AxisGizmo::m_size, "Size", "Axis Gizmo Size")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &AxisGizmo::m_text, "Text Labels", "Text Labels on Axis Gizmo")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AxisGizmo::m_maxCount, "Max Count", "Max Count of Axis Gizmos");
+
+        editContext->Class<Helpers>("Helpers", "")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_helpersGlobalScale, "Helpers Scale", "Helpers Scale")
+                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_tagpointScaleMulti, "Tagpoint Scale Multiplier", "Tagpoint Scale Multiplier")
+                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_rulerSphereScale, "Ruler Sphere Scale", "Ruler Sphere Scale")
+                ->Attribute(AZ::Edit::Attributes::Min, 0.1f)
+                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
+                ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_rulerSphereTrans, "Ruler Sphere Transparency", "Ruler Sphere Transparency")
+                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+                ->Attribute(AZ::Edit::Attributes::Max, 100.0f);
+
+        editContext->Class<CEditorPreferencesPage_ViewportGizmo>("Gizmo Viewport Preferences", "Gizmo Viewport Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGizmo::m_axisGizmo, "Axis Gizmo", "Axis Gizmo")
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGizmo::m_helpers, "Helpers", "Helpers");
+    }
+}
+
+CEditorPreferencesPage_ViewportGizmo::CEditorPreferencesPage_ViewportGizmo()
+{
+    InitializeSettings();
+    m_icon = QIcon(":/res/Gizmos.svg");
+}
+
+QIcon& CEditorPreferencesPage_ViewportGizmo::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_ViewportGizmo::OnApply()
+{
+    gSettings.gizmo.axisGizmoSize = m_axisGizmo.m_size;
+    gSettings.gizmo.axisGizmoText = m_axisGizmo.m_text;
+    gSettings.gizmo.axisGizmoMaxCount = m_axisGizmo.m_maxCount;
+
+    gSettings.gizmo.helpersScale = m_helpers.m_helpersGlobalScale;
+    gSettings.gizmo.tagpointScaleMulti = m_helpers.m_tagpointScaleMulti;
+    gSettings.gizmo.rulerSphereScale = m_helpers.m_rulerSphereScale;
+    gSettings.gizmo.rulerSphereTrans = m_helpers.m_rulerSphereTrans;
+}
+
+void CEditorPreferencesPage_ViewportGizmo::InitializeSettings()
+{
+    m_axisGizmo.m_size = gSettings.gizmo.axisGizmoSize;
+    m_axisGizmo.m_text = gSettings.gizmo.axisGizmoText;
+    m_axisGizmo.m_maxCount = gSettings.gizmo.axisGizmoMaxCount;
+
+    m_helpers.m_helpersGlobalScale = gSettings.gizmo.helpersScale;
+    m_helpers.m_tagpointScaleMulti = gSettings.gizmo.tagpointScaleMulti;
+    m_helpers.m_rulerSphereScale = gSettings.gizmo.rulerSphereScale;
+    m_helpers.m_rulerSphereTrans = gSettings.gizmo.rulerSphereTrans;
+}
diff --git a/Code/Editor/EditorPreferencesPageViewportGizmo.h b/Code/Editor/EditorPreferencesPageViewportGizmo.h
new file mode 100644
index 0000000000..d71370cf36
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageViewportGizmo.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include "Include/IPreferencesPage.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/Math/Vector3.h>
+#include <QIcon>
+
+
+class CEditorPreferencesPage_ViewportGizmo
+    : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_ViewportGizmo, "{14433511-8175-4348-954E-82D903475B06}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_ViewportGizmo();
+    virtual ~CEditorPreferencesPage_ViewportGizmo() = default;
+
+    virtual const char* GetCategory() override { return "Viewports"; }
+    virtual const char* GetTitle() override { return "Gizmos"; }
+    virtual QIcon& GetIcon() override;
+    virtual void OnApply() override;
+    virtual void OnCancel() override {}
+    virtual bool OnQueryCancel() override { return true; }
+
+private:
+    void InitializeSettings();
+
+    struct AxisGizmo
+    {
+        AZ_TYPE_INFO(AxisGizmo, "{7D90D60E-996B-4F54-8748-B26EFA781EE2}")
+
+        float m_size;
+        bool m_text;
+        int m_maxCount;
+    };
+
+    struct Helpers
+    {
+        AZ_TYPE_INFO(Helpers, "{EC99922E-F61C-4AA0-9A51-630E09AB55AA}")
+
+        float m_helpersGlobalScale;
+        float m_tagpointScaleMulti;
+        float m_rulerSphereScale;
+        float m_rulerSphereTrans;
+    };
+
+    AxisGizmo m_axisGizmo;
+    Helpers m_helpers;
+    QIcon m_icon;
+};
+
+
diff --git a/Code/Editor/EditorPreferencesPageViewportMovement.cpp b/Code/Editor/EditorPreferencesPageViewportMovement.cpp
new file mode 100644
index 0000000000..d019446982
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageViewportMovement.cpp
@@ -0,0 +1,111 @@
+/*
+ * 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 "EditorPreferencesPageViewportMovement.h"
+
+#include <AzQtComponents/Components/StyleManager.h>
+
+// Editor
+#include "Settings.h"
+#include "EditorViewportSettings.h"
+
+void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<CameraMovementSettings>()
+        ->Version(1)
+        ->Field("MoveSpeed", &CameraMovementSettings::m_moveSpeed)
+        ->Field("RotateSpeed", &CameraMovementSettings::m_rotateSpeed)
+        ->Field("FastMoveSpeed", &CameraMovementSettings::m_fastMoveSpeed)
+        ->Field("WheelZoomSpeed", &CameraMovementSettings::m_wheelZoomSpeed)
+        ->Field("InvertYAxis", &CameraMovementSettings::m_invertYRotation)
+        ->Field("InvertPan", &CameraMovementSettings::m_invertPan);
+
+    serialize.Class<CEditorPreferencesPage_ViewportMovement>()
+        ->Version(1)
+        ->Field("CameraMovementSettings", &CEditorPreferencesPage_ViewportMovement::m_cameraMovementSettings);
+
+
+    AZ::EditContext* editContext = serialize.GetEditContext();
+    if (editContext)
+    {
+        editContext->Class<CameraMovementSettings>("Camera Movement Settings", "")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_moveSpeed, "Camera Movement Speed", "Camera Movement Speed")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_rotateSpeed, "Camera Rotation Speed", "Camera Rotation Speed")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_fastMoveSpeed, "Fast Movement Scale", "Fast Movement Scale (holding shift")
+            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_wheelZoomSpeed, "Wheel Zoom Speed", "Wheel Zoom Speed")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_invertYRotation, "Invert Y Axis", "Invert Y Rotation (holding RMB)")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_invertPan, "Invert Pan", "Invert Pan (holding MMB)");
+
+        editContext->Class<CEditorPreferencesPage_ViewportMovement>("Gizmo Movement Preferences", "Gizmo Movement Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportMovement::m_cameraMovementSettings, "Camera Movement Settings", "Camera Movement Settings");
+    }
+}
+
+
+CEditorPreferencesPage_ViewportMovement::CEditorPreferencesPage_ViewportMovement()
+{
+    InitializeSettings();
+    m_icon = QIcon(":/res/Camera.svg");
+}
+
+const char* CEditorPreferencesPage_ViewportMovement::GetTitle()
+{
+    return "Camera";
+}
+
+QIcon& CEditorPreferencesPage_ViewportMovement::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_ViewportMovement::OnApply()
+{
+    if (SandboxEditor::UsingNewCameraSystem())
+    {
+        SandboxEditor::SetCameraTranslateSpeed(m_cameraMovementSettings.m_moveSpeed);
+        SandboxEditor::SetCameraRotateSpeed(m_cameraMovementSettings.m_rotateSpeed);
+        SandboxEditor::SetCameraBoostMultiplier(m_cameraMovementSettings.m_fastMoveSpeed);
+        SandboxEditor::SetCameraScrollSpeed(m_cameraMovementSettings.m_wheelZoomSpeed);
+        SandboxEditor::SetCameraOrbitYawRotationInverted(m_cameraMovementSettings.m_invertYRotation);
+        SandboxEditor::SetCameraPanInvertedX(m_cameraMovementSettings.m_invertPan);
+        SandboxEditor::SetCameraPanInvertedY(m_cameraMovementSettings.m_invertPan);
+    }
+    else
+    {
+        gSettings.cameraMoveSpeed = m_cameraMovementSettings.m_moveSpeed;
+        gSettings.cameraRotateSpeed = m_cameraMovementSettings.m_rotateSpeed;
+        gSettings.cameraFastMoveSpeed = m_cameraMovementSettings.m_fastMoveSpeed;
+        gSettings.wheelZoomSpeed = m_cameraMovementSettings.m_wheelZoomSpeed;
+        gSettings.invertYRotation = m_cameraMovementSettings.m_invertYRotation;
+        gSettings.invertPan = m_cameraMovementSettings.m_invertPan;
+    }
+}
+
+void CEditorPreferencesPage_ViewportMovement::InitializeSettings()
+{
+    if (SandboxEditor::UsingNewCameraSystem())
+    {
+        m_cameraMovementSettings.m_moveSpeed = SandboxEditor::CameraTranslateSpeed();
+        m_cameraMovementSettings.m_rotateSpeed = SandboxEditor::CameraRotateSpeed();
+        m_cameraMovementSettings.m_fastMoveSpeed = SandboxEditor::CameraBoostMultiplier();
+        m_cameraMovementSettings.m_wheelZoomSpeed = SandboxEditor::CameraScrollSpeed();
+        m_cameraMovementSettings.m_invertYRotation = SandboxEditor::CameraOrbitYawRotationInverted();
+        m_cameraMovementSettings.m_invertPan = SandboxEditor::CameraPanInvertedX() && SandboxEditor::CameraPanInvertedY();
+    }
+    else
+    {
+        m_cameraMovementSettings.m_moveSpeed = gSettings.cameraMoveSpeed;
+        m_cameraMovementSettings.m_rotateSpeed = gSettings.cameraRotateSpeed;
+        m_cameraMovementSettings.m_fastMoveSpeed = gSettings.cameraFastMoveSpeed;
+        m_cameraMovementSettings.m_wheelZoomSpeed = gSettings.wheelZoomSpeed;
+        m_cameraMovementSettings.m_invertYRotation = gSettings.invertYRotation;
+        m_cameraMovementSettings.m_invertPan = gSettings.invertPan;
+    }
+}
diff --git a/Code/Editor/EditorPreferencesPageViewportMovement.h b/Code/Editor/EditorPreferencesPageViewportMovement.h
new file mode 100644
index 0000000000..ea0c2fa8cc
--- /dev/null
+++ b/Code/Editor/EditorPreferencesPageViewportMovement.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include "Include/IPreferencesPage.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <QIcon>
+
+
+class CEditorPreferencesPage_ViewportMovement
+    : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_ViewportMovement, "{BC593332-7EAF-4171-8A35-1C5DE5B40909}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_ViewportMovement();
+    virtual ~CEditorPreferencesPage_ViewportMovement() = default;
+
+    virtual const char* GetCategory() override { return "Viewports"; }
+    virtual const char* GetTitle();
+    virtual QIcon& GetIcon() override;
+    virtual void OnApply() override;
+    virtual void OnCancel() override {}
+    virtual bool OnQueryCancel() override { return true; }
+
+private:
+    void InitializeSettings();
+
+    struct CameraMovementSettings
+    {
+        AZ_TYPE_INFO(CameraMovementSettings, "{60B8C07E-5F48-4171-A50B-F45558B5CCA1}")
+
+        float m_moveSpeed;
+        float m_rotateSpeed;
+        float m_fastMoveSpeed;
+        float m_wheelZoomSpeed;
+        bool m_invertYRotation;
+        bool m_invertPan;
+    };
+
+    CameraMovementSettings m_cameraMovementSettings;
+    QIcon m_icon;
+};
+
+
diff --git a/Code/Editor/EditorPreferencesTreeWidgetItem.cpp b/Code/Editor/EditorPreferencesTreeWidgetItem.cpp
new file mode 100644
index 0000000000..dda1949c84
--- /dev/null
+++ b/Code/Editor/EditorPreferencesTreeWidgetItem.cpp
@@ -0,0 +1,110 @@
+/*
+ * 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 "EditorPreferencesTreeWidgetItem.h"
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
+
+// Editor
+#include "IPreferencesPage.h"
+
+#include <AzQtComponents/Components/StyleManager.h>
+
+EditorPreferencesTreeWidgetItem::EditorPreferencesTreeWidgetItem(IPreferencesPage* page, const QPixmap& selectedImage, QPixmap& unselectedImage)
+    : QTreeWidgetItem(EditorPreferencesPage)
+    , m_preferencesPage(page)
+    , m_selectedImage(selectedImage)
+    , m_unselectedImage(unselectedImage)
+    , m_entirePageMatchesFilter(true)
+{
+    Setup(page);
+}
+
+EditorPreferencesTreeWidgetItem::EditorPreferencesTreeWidgetItem(IPreferencesPage* page, const QIcon& icon)
+    : QTreeWidgetItem(EditorPreferencesPage)
+    , m_preferencesPage(page)
+    , m_entirePageMatchesFilter(true)
+{
+    setIcon(0, icon);
+
+    setData(0, Qt::DecorationRole, icon);
+    Setup(page);
+}
+
+void EditorPreferencesTreeWidgetItem::Setup(IPreferencesPage* page)
+{
+    setData(0, Qt::DisplayRole, m_preferencesPage->GetTitle());
+
+    AZ::SerializeContext* serializeContext = nullptr;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(serializeContext, "Serialization context not available");
+
+    // Grab all property names on the page so we can filter by property text by recursing through the hierarchy
+    AzToolsFramework::InstanceDataHierarchy hierarchy;
+    hierarchy.AddRootInstance(page);
+    hierarchy.Build(serializeContext, AZ::SerializeContext::ENUM_ACCESS_FOR_READ);
+    std::function<void(AzToolsFramework::InstanceDataNode&)> visitNode = [&](AzToolsFramework::InstanceDataNode& node)
+    {
+        const AZ::Edit::ElementData* data = node.GetElementEditMetadata();
+        QString text;
+        if (data)
+        {
+            text = data->m_name;
+        }
+
+        if (!text.isEmpty() && !m_propertyNames.contains(text))
+        {
+            m_propertyNames.append(text);
+        }
+
+        for (AzToolsFramework::InstanceDataNode& child : node.GetChildren())
+        {
+            visitNode(child);
+        }
+    };
+    visitNode(hierarchy);
+}
+
+EditorPreferencesTreeWidgetItem::~EditorPreferencesTreeWidgetItem()
+{
+}
+
+
+IPreferencesPage* EditorPreferencesTreeWidgetItem::GetPreferencesPage() const
+{
+    return m_preferencesPage;
+}
+
+void EditorPreferencesTreeWidgetItem::Filter(const QString& filter)
+{
+    // Everything on a page matches the filter if its or any of its parents' text matches
+    m_entirePageMatchesFilter = false;
+    QTreeWidgetItem* item = this;
+    while (item && !m_entirePageMatchesFilter)
+    {
+        m_entirePageMatchesFilter = item->text(0).contains(filter, Qt::CaseInsensitive);
+        item = item->parent();
+    }
+
+    // Otherwise, just check the contents to see if there's a match
+    bool filtered = !m_entirePageMatchesFilter;
+    for (auto it = m_propertyNames.begin(), end = m_propertyNames.end(); it != end && filtered; ++it)
+    {
+        filtered = !(*it).contains(filter, Qt::CaseInsensitive);
+    }
+
+    setHidden(filtered);
+}
+
+void EditorPreferencesTreeWidgetItem::UpdateEditorFilter(AzToolsFramework::ReflectedPropertyEditor* editor, const QString& filter)
+{
+    QString filterText = m_entirePageMatchesFilter ? QString() : filter;
+    editor->InvalidateAll(filterText.toUtf8().constData());
+    editor->ExpandAll();
+}
diff --git a/Code/Editor/EditorPreferencesTreeWidgetItem.h b/Code/Editor/EditorPreferencesTreeWidgetItem.h
new file mode 100644
index 0000000000..1808903d24
--- /dev/null
+++ b/Code/Editor/EditorPreferencesTreeWidgetItem.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <QTreeWidgetItem>
+#include <QPixmap>
+
+struct IPreferencesPage;
+
+namespace AzToolsFramework
+{
+    class ReflectedPropertyEditor;
+}
+
+class EditorPreferencesTreeWidgetItem
+    : public QTreeWidgetItem
+{
+public:
+
+    enum CustomType
+    {
+        EditorPreferencesPage = QTreeWidgetItem::UserType
+    };
+
+    EditorPreferencesTreeWidgetItem(IPreferencesPage* page, const QPixmap& selectedImage, QPixmap& unselectedImage);
+    EditorPreferencesTreeWidgetItem(IPreferencesPage* page, const QIcon& icon);
+    ~EditorPreferencesTreeWidgetItem();
+
+    void Filter(const QString& filter);
+    void UpdateEditorFilter(AzToolsFramework::ReflectedPropertyEditor* editor, const QString& filter);
+
+    IPreferencesPage* GetPreferencesPage() const;
+
+private:
+    void Setup(IPreferencesPage* page);
+
+    IPreferencesPage* m_preferencesPage;
+    QPixmap m_selectedImage;
+    QPixmap m_unselectedImage;
+    QStringList m_propertyNames;
+    bool m_entirePageMatchesFilter;
+};
+
diff --git a/Code/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp b/Code/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp
new file mode 100644
index 0000000000..3dd2f44b14
--- /dev/null
+++ b/Code/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp
@@ -0,0 +1,70 @@
+/*
+ * 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 "EditorPreferencesTreeWidgetItemDelegate.h"
+#include <QIcon>
+#include <QPainter>
+#include <QStyledItemDelegate>
+
+static const int IconX = 26;
+static const int TextX = 27;
+
+EditorPreferencesTreeWidgetItemDelegate::EditorPreferencesTreeWidgetItemDelegate(QWidget* parent)
+    : QStyledItemDelegate(parent)
+{
+    m_mouseOverBrush = QBrush(QColor(0x40, 0x40, 0x40));
+    m_selectedBrush = QBrush(QColor(0x47, 0x47, 0x47));
+}
+
+void EditorPreferencesTreeWidgetItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    painter->save();
+    painter->setPen(Qt::NoPen);
+
+    const auto textHeight = option.fontMetrics.height();
+    int vCenter = option.rect.bottom() - option.rect.height() / 2;
+    int iconSize = option.decorationSize.width();
+
+    if ((option.state & QStyle::State_Selected) || (option.state & QStyle::State_MouseOver))
+    {
+        if ((option.state & QStyle::State_Selected))
+        {
+            painter->setBrush(m_selectedBrush);
+        }
+        else if ((option.state & QStyle::State_MouseOver))
+        {
+            painter->setBrush(m_mouseOverBrush);
+        }
+
+        const QRect backGroundRect(option.rect.left(), option.rect.top(), option.rect.width(), option.rect.height());
+        painter->drawRect(backGroundRect);
+    }
+
+    const auto& iconVariant = index.data(Qt::DecorationRole);
+    if (!iconVariant.isNull())
+    {
+        const auto& icon = iconVariant.value<QIcon>();
+        QRect r(IconX, vCenter - iconSize/2, iconSize, iconSize);
+        r.setX(-r.width());
+        icon.paint(painter, r);
+    }
+
+    const QString& text = index.data(Qt::DisplayRole).toString();
+    painter->setPen(Qt::white);
+    const auto textRect = QRect{ TextX, vCenter - textHeight/2, option.rect.width() - TextX, textHeight };
+    painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text);
+
+    painter->restore();
+}
+
+QSize EditorPreferencesTreeWidgetItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    return QStyledItemDelegate::sizeHint(option, index);
+}
+
+#include <moc_EditorPreferencesTreeWidgetItemDelegate.cpp>
diff --git a/Code/Editor/EditorPreferencesTreeWidgetItemDelegate.h b/Code/Editor/EditorPreferencesTreeWidgetItemDelegate.h
new file mode 100644
index 0000000000..a71113872a
--- /dev/null
+++ b/Code/Editor/EditorPreferencesTreeWidgetItemDelegate.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 <QStyledItemDelegate>
+
+class EditorPreferencesTreeWidgetItemDelegate
+    : public QStyledItemDelegate
+{
+    Q_OBJECT
+
+public:
+    explicit EditorPreferencesTreeWidgetItemDelegate(QWidget* parent = nullptr);
+
+    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+
+private:
+    QBrush m_selectedBrush;
+    QBrush m_mouseOverBrush;
+};
+
diff --git a/Code/Editor/EditorToolsApplication.cpp b/Code/Editor/EditorToolsApplication.cpp
new file mode 100644
index 0000000000..381cdf12cb
--- /dev/null
+++ b/Code/Editor/EditorToolsApplication.cpp
@@ -0,0 +1,277 @@
+/*
+ * 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 "EditorToolsApplication.h"
+
+// Qt
+#include <QMessageBox>
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <AzToolsFramework/Thumbnails/ThumbnailerComponent.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserComponent.h>
+
+// Editor
+#include "MainWindow.h"
+#include "CryEdit.h"
+#include "DisplaySettingsPythonFuncs.h"
+#include "GameEngine.h"
+#include "PythonEditorFuncs.h"
+#include "TrackView/TrackViewPythonFuncs.h"
+#include "Include/IObjectManager.h"
+#include "Objects/ObjectManager.h"
+
+namespace EditorInternal
+{
+    EditorToolsApplication::EditorToolsApplication(int* argc, char*** argv)
+        : ToolsApplication(argc, argv)
+    {
+        EditorToolsApplicationRequests::Bus::Handler::BusConnect();
+    }
+
+    EditorToolsApplication::~EditorToolsApplication()
+    {
+        EditorToolsApplicationRequests::Bus::Handler::BusDisconnect();
+        Stop();
+    }
+
+
+    bool EditorToolsApplication::IsStartupAborted() const
+    {
+        return m_StartupAborted;
+    }
+
+
+    void EditorToolsApplication::RegisterCoreComponents()
+    {
+        AzToolsFramework::ToolsApplication::RegisterCoreComponents();
+
+        // Expose Legacy Python Bindings to Behavior Context for EditorPythonBindings Gem
+        RegisterComponentDescriptor(AzToolsFramework::CryEditPythonHandler::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::CryEditDocFuncsHandler::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsPythonFuncsHandler::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::MainWindowEditorFuncsHandler::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::ObjectManagerFuncsHandler::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::PythonEditorComponent::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::PythonEditorFuncsHandler::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsComponent::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::TrackViewComponent::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::TrackViewFuncsHandler::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::ViewPanePythonFuncsHandler::CreateDescriptor());
+        RegisterComponentDescriptor(AzToolsFramework::ViewportTitleDlgPythonFuncsHandler::CreateDescriptor());
+    }
+
+    AZ::ComponentTypeList EditorToolsApplication::GetRequiredSystemComponents() const
+    {
+        AZ::ComponentTypeList components = AzToolsFramework::ToolsApplication::GetRequiredSystemComponents();
+
+        components.emplace_back(azrtti_typeid<AzToolsFramework::Thumbnailer::ThumbnailerComponent>());
+        components.emplace_back(azrtti_typeid<AzToolsFramework::AssetBrowser::AssetBrowserComponent>());
+
+        // Add new Bus-based Python Bindings
+        components.emplace_back(azrtti_typeid<AzToolsFramework::DisplaySettingsComponent>());
+        components.emplace_back(azrtti_typeid<AzToolsFramework::PythonEditorComponent>());
+        components.emplace_back(azrtti_typeid<AzToolsFramework::TrackViewComponent>());
+
+        return components;
+    }
+
+
+    void EditorToolsApplication::StartCommon(AZ::Entity* systemEntity)
+    {
+        AzToolsFramework::ToolsApplication::StartCommon(systemEntity);
+
+        m_StartupAborted = m_moduleManager->m_quitRequested;
+
+        if (systemEntity->GetState() != AZ::Entity::State::Active)
+        {
+            m_StartupAborted = true;
+        }
+    }
+
+    bool EditorToolsApplication::Start()
+    {
+        AzFramework::Application::StartupParameters params;
+
+        // Must be done before creating QApplication, otherwise asserts when we alloc
+        AzToolsFramework::ToolsApplication::Start({}, params);
+        if (IsStartupAborted() || !m_systemEntity)
+        {
+            AzToolsFramework::ToolsApplication::Stop();
+            return false;
+        }
+        return true;
+    }
+
+    void EditorToolsApplication::QueryApplicationType(AZ::ApplicationTypeQuery& appType) const
+    { 
+        appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Editor | AZ::ApplicationTypeQuery::Masks::Tool;
+    };
+
+    void EditorToolsApplication::CreateReflectionManager()
+    {
+        ToolsApplication::CreateReflectionManager();
+
+        GetSerializeContext()->CreateEditContext();
+    }
+
+    void EditorToolsApplication::Reflect(AZ::ReflectContext* context)
+    {
+        ToolsApplication::Reflect(context);
+
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->EBus<EditorToolsApplicationRequestBus>("EditorToolsApplicationRequestBus")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                ->Attribute(AZ::Script::Attributes::Category, "Editor")
+                ->Attribute(AZ::Script::Attributes::Module, "editor")
+                ->Event("OpenLevel", &EditorToolsApplicationRequests::OpenLevel)
+                ->Event("OpenLevelNoPrompt", &EditorToolsApplicationRequests::OpenLevelNoPrompt)
+                ->Event("CreateLevel", &EditorToolsApplicationRequests::CreateLevel)
+                ->Event("CreateLevelNoPrompt", &EditorToolsApplicationRequests::CreateLevelNoPrompt)
+                ->Event("GetGameFolder", &EditorToolsApplicationRequests::GetGameFolder)
+                ->Event("GetCurrentLevelName", &EditorToolsApplicationRequests::GetCurrentLevelName)
+                ->Event("GetCurrentLevelPath", &EditorToolsApplicationRequests::GetCurrentLevelPath)
+                ->Event("Exit", &EditorToolsApplicationRequests::Exit)
+                ->Event("ExitNoPrompt", &EditorToolsApplicationRequests::ExitNoPrompt)
+                ;
+        }
+    }
+
+    AZStd::string EditorToolsApplication::GetGameFolder() const
+    {
+        return Path::GetEditingGameDataFolder();
+    }
+
+    bool EditorToolsApplication::OpenLevel(AZStd::string_view levelName)
+    {
+        AZStd::string levelPath = levelName;
+
+        if (!AZ::IO::SystemFile::Exists(levelPath.c_str()))
+        {
+            // now let's check if they pre-pended directories (Samples/SomeLevelName)
+            AZStd::string levelFileName;
+            {
+                AZStd::size_t found = levelPath.find_last_of("/\\");
+                if (found == AZStd::string::npos)
+                {
+                    levelFileName = levelPath.substr(found + 1);
+                }
+                else
+                {
+                    levelFileName = levelPath;
+                }
+            }
+
+            // if the input path can't be found, let's automatically add on the game folder and the levels
+            AzFramework::StringFunc::Path::Join(levelPath.c_str(), levelFileName.c_str(), levelPath);
+            AzFramework::StringFunc::Path::Join(DefaultLevelFolder, levelPath.c_str(), levelPath);
+            AzFramework::StringFunc::Path::Join(GetGameFolder().c_str(), levelPath.c_str(), levelPath);
+
+            // make sure the level path includes the cry extension, if needed
+            if (!levelFileName.ends_with(GetOldCryLevelExtension()) && !levelFileName.ends_with(GetLevelExtension()))
+            {
+                AZStd::size_t levelPathLength = levelPath.length();
+                levelPath += GetOldCryLevelExtension();
+
+                // Check if there is a .cry file, otherwise assume it is a new .ly file
+                if (!AZ::IO::SystemFile::Exists(levelPath.c_str()))
+                {
+                    levelPath.replace(levelPathLength, sizeof(GetOldCryLevelExtension()) - 1, GetLevelExtension());
+                }
+            }
+
+            if (!AZ::IO::SystemFile::Exists(levelPath.c_str()))
+            {
+                return false;
+            }
+        }
+        
+        auto previousDocument = GetIEditor()->GetDocument();
+        QString previousPathName = (previousDocument != nullptr) ? previousDocument->GetLevelPathName() : "";
+        auto newDocument = CCryEditApp::instance()->OpenDocumentFile(levelPath.c_str());
+
+        // the underlying document pointer doesn't change, so we can't check that; use the path name's instead
+        return newDocument && !newDocument->IsLevelLoadFailed() && (newDocument->GetLevelPathName() != previousPathName);
+    }
+
+    bool EditorToolsApplication::OpenLevelNoPrompt(AZStd::string_view levelName)
+    {
+        GetIEditor()->GetDocument()->SetModifiedFlag(false);
+        return OpenLevel(levelName);
+    }
+
+    int EditorToolsApplication::CreateLevel(AZStd::string_view levelName, bool /*bUseTerrain*/)
+    {
+        // Clang warns about a temporary being created in a function's argument list, so fullyQualifiedLevelName before the call
+        QString fullyQualifiedLevelName;
+        return CCryEditApp::instance()->CreateLevel(QString::fromUtf8(levelName.data(), static_cast<int>(levelName.size())), fullyQualifiedLevelName);
+    }
+
+    int EditorToolsApplication::CreateLevelNoPrompt(AZStd::string_view levelName, int /*terrainExportTextureSize*/, bool /*useTerrain*/)
+    {
+        // If a level was open, ignore any unsaved changes if it had been modified
+        if (GetIEditor()->IsLevelLoaded())
+        {
+            GetIEditor()->GetDocument()->SetModifiedFlag(false);
+        }
+
+        // Clang warns about a temporary being created in a function's argument list, so fullyQualifiedLevelName before the call
+        QString fullyQualifiedLevelName;
+        return CCryEditApp::instance()->CreateLevel(QString::fromUtf8(levelName.data(), static_cast<int>(levelName.size())), fullyQualifiedLevelName);
+    }
+
+    AZStd::string EditorToolsApplication::GetCurrentLevelName() const
+    {
+        return AZStd::string(GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().data());
+    }
+
+    AZStd::string EditorToolsApplication::GetCurrentLevelPath() const
+    {
+        return AZStd::string(GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data());
+    }
+
+    const char* EditorToolsApplication::GetLevelExtension() const
+    {
+        bool prefabSystemEnabled = false;
+        AzFramework::ApplicationRequests::Bus::BroadcastResult(
+            prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+        if (!prefabSystemEnabled)
+        {
+            return ".ly";
+        }
+        else
+        {
+            return ".prefab";
+        }
+    }
+
+    const char* EditorToolsApplication::GetOldCryLevelExtension() const
+    {
+        return ".cry";
+    }
+
+    void EditorToolsApplication::Exit()
+    {
+        // Adding a single-shot QTimer to PyExit delays the QApplication::closeAllWindows call until
+        // all the events in the event queue have been processed. Calling QApplication::closeAllWindows instead
+        // of MainWindow::close ensures the Metal render window is cleaned up on macOS.
+        QTimer::singleShot(0, qApp, &QApplication::closeAllWindows);
+    }
+
+    void EditorToolsApplication::ExitNoPrompt()
+    {
+        // Set the level to "unmodified" so that it doesn't prompt to save on exit.
+        GetIEditor()->GetDocument()->SetModifiedFlag(false);
+        Exit();
+    }
+
+}
+
diff --git a/Code/Editor/EditorToolsApplication.h b/Code/Editor/EditorToolsApplication.h
new file mode 100644
index 0000000000..240adc636f
--- /dev/null
+++ b/Code/Editor/EditorToolsApplication.h
@@ -0,0 +1,73 @@
+/*
+ * 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 <AzToolsFramework/Application/ToolsApplication.h>
+
+#include "Core/EditorMetricsPlainTextNameRegistration.h"
+#include "EditorToolsApplicationAPI.h"
+
+namespace EditorInternal
+{
+    // Override the ToolsApplication so that we can special case when the config file is not
+    // found and give the user of the Editor a specific message about it.
+    class EditorToolsApplication
+        : public AzToolsFramework::ToolsApplication
+        , public EditorToolsApplicationRequests::Bus::Handler
+    {
+    public:
+        EditorToolsApplication(int* argc, char*** argv);
+        ~EditorToolsApplication();
+
+        bool IsStartupAborted() const;
+
+        void RegisterCoreComponents() override;
+
+        AZ::ComponentTypeList GetRequiredSystemComponents() const;
+
+        void StartCommon(AZ::Entity* systemEntity) override;
+
+        using AzToolsFramework::ToolsApplication::Start;
+        bool Start();
+
+        //////////////////////////////////////////////////////////////////////////
+        // AzFramework::ApplicationRequests::Bus
+        void QueryApplicationType(AZ::ApplicationTypeQuery& appType) const override;
+        //////////////////////////////////////////////////////////////////////////
+
+        // From AzToolsFramework::ToolsApplication
+        void CreateReflectionManager() override;
+        void Reflect(AZ::ReflectContext* context) override;
+
+    protected:
+        // From EditorToolsApplicationRequests
+        bool OpenLevel(AZStd::string_view levelName) override;
+        bool OpenLevelNoPrompt(AZStd::string_view levelName) override;
+
+        int CreateLevel(AZStd::string_view levelName, bool bUseTerrain) override;
+        int CreateLevelNoPrompt(AZStd::string_view levelName, int terrainExportTextureSize, bool useTerrain) override;
+
+        void Exit() override;
+        void ExitNoPrompt() override;
+
+        AZStd::string GetGameFolder() const override;
+        AZStd::string GetCurrentLevelName() const override;
+        AZStd::string GetCurrentLevelPath() const override;
+
+        const char* GetOldCryLevelExtension() const override;
+        const char* GetLevelExtension() const override;
+
+    private:
+        static constexpr char DefaultLevelFolder[] = "Levels";
+
+        bool m_StartupAborted = false;
+        Editor::EditorMetricsPlainTextNameRegistrationBusListener m_metricsPlainTextRegistrar;
+    };
+
+}
+
+
diff --git a/Code/Editor/EditorToolsApplicationAPI.h b/Code/Editor/EditorToolsApplicationAPI.h
new file mode 100644
index 0000000000..1462198f02
--- /dev/null
+++ b/Code/Editor/EditorToolsApplicationAPI.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+namespace EditorInternal
+{
+    /**
+     * Bus used to make general requests to the ToolsApplication.
+     */
+    class EditorToolsApplicationRequests
+        : public AZ::EBusTraits
+    {
+    public:
+
+        using Bus = AZ::EBus<EditorToolsApplicationRequests>;
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+        //////////////////////////////////////////////////////////////////////////
+
+        virtual bool OpenLevel(AZStd::string_view levelName) = 0;
+        virtual bool OpenLevelNoPrompt(AZStd::string_view levelName) = 0;
+
+        virtual int CreateLevel(AZStd::string_view levelName, bool bUseTerrain) = 0;
+        virtual int CreateLevelNoPrompt(AZStd::string_view levelName, int terrainExportTextureSize, bool useTerrain) = 0;
+
+        virtual AZStd::string GetGameFolder() const = 0;
+        virtual AZStd::string GetCurrentLevelName() const = 0;
+        virtual AZStd::string GetCurrentLevelPath() const = 0;
+
+        //! Retrieve old cry level file extension (With prepending '.')
+        virtual const char* GetOldCryLevelExtension() const = 0;
+        //! Retrieve default level file extension (With prepending '.')
+        virtual const char* GetLevelExtension() const = 0;
+
+        virtual void Exit() = 0;
+        virtual void ExitNoPrompt() = 0;
+    };
+
+    using EditorToolsApplicationRequestBus = AZ::EBus<EditorToolsApplicationRequests>;
+    
+} // namespace EditorInternal
+
diff --git a/Code/Sandbox/Editor/EditorVersion.rc b/Code/Editor/EditorVersion.rc
similarity index 100%
rename from Code/Sandbox/Editor/EditorVersion.rc
rename to Code/Editor/EditorVersion.rc
diff --git a/Code/Sandbox/Editor/EditorViewportCamera.cpp b/Code/Editor/EditorViewportCamera.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorViewportCamera.cpp
rename to Code/Editor/EditorViewportCamera.cpp
diff --git a/Code/Sandbox/Editor/EditorViewportCamera.h b/Code/Editor/EditorViewportCamera.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorViewportCamera.h
rename to Code/Editor/EditorViewportCamera.h
diff --git a/Code/Editor/EditorViewportSettings.cpp b/Code/Editor/EditorViewportSettings.cpp
new file mode 100644
index 0000000000..5a852c0ae5
--- /dev/null
+++ b/Code/Editor/EditorViewportSettings.cpp
@@ -0,0 +1,247 @@
+/*
+ * 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 <EditorViewportSettings.h>
+
+#include <AzCore/Casting/numeric_cast.h>
+#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/std/string/string_view.h>
+
+namespace SandboxEditor
+{
+    constexpr AZStd::string_view GridSnappingSetting = "/Amazon/Preferences/Editor/GridSnapping";
+    constexpr AZStd::string_view GridSizeSetting = "/Amazon/Preferences/Editor/GridSize";
+    constexpr AZStd::string_view AngleSnappingSetting = "/Amazon/Preferences/Editor/AngleSnapping";
+    constexpr AZStd::string_view AngleSizeSetting = "/Amazon/Preferences/Editor/AngleSize";
+    constexpr AZStd::string_view ShowGridSetting = "/Amazon/Preferences/Editor/ShowGrid";
+    constexpr AZStd::string_view CameraTranslateSpeedSetting = "/Amazon/Preferences/Editor/Camera/TranslateSpeed";
+    constexpr AZStd::string_view CameraBoostMultiplierSetting = "/Amazon/Preferences/Editor/Camera/BoostMultiplier";
+    constexpr AZStd::string_view CameraRotateSpeedSetting = "/Amazon/Preferences/Editor/Camera/RotateSpeed";
+    constexpr AZStd::string_view CameraScrollSpeedSetting = "/Amazon/Preferences/Editor/Camera/DollyScrollSpeed";
+    constexpr AZStd::string_view CameraDollyMotionSpeedSetting = "/Amazon/Preferences/Editor/Camera/DollyMotionSpeed";
+    constexpr AZStd::string_view CameraOrbitYawRotationInvertedSetting = "/Amazon/Preferences/Editor/Camera/YawRotationInverted";
+    constexpr AZStd::string_view CameraPanInvertedXSetting = "/Amazon/Preferences/Editor/Camera/PanInvertedX";
+    constexpr AZStd::string_view CameraPanInvertedYSetting = "/Amazon/Preferences/Editor/Camera/PanInvertedY";
+    constexpr AZStd::string_view CameraPanSpeedSetting = "/Amazon/Preferences/Editor/Camera/PanSpeed";
+    constexpr AZStd::string_view CameraRotateSmoothnessSetting = "/Amazon/Preferences/Editor/Camera/RotateSmoothness";
+    constexpr AZStd::string_view CameraTranslateSmoothnessSetting = "/Amazon/Preferences/Editor/Camera/TranslateSmoothness";
+
+    template<typename T>
+    void SetRegistry(const AZStd::string_view setting, T&& value)
+    {
+        if (auto* registry = AZ::SettingsRegistry::Get())
+        {
+            registry->Set(setting, AZStd::forward<T>(value));
+        }
+    }
+
+    template<typename T>
+    AZStd::remove_cvref_t<T> GetRegistry(const AZStd::string_view setting, T&& defaultValue)
+    {
+        AZStd::remove_cvref_t<T> value = AZStd::forward<T>(defaultValue);
+        if (auto* registry = AZ::SettingsRegistry::Get())
+        {
+            registry->Get(value, setting);
+        }
+
+        return value;
+    }
+
+    struct EditorViewportSettingsCallbacksImpl : public EditorViewportSettingsCallbacks
+    {
+        EditorViewportSettingsCallbacksImpl()
+        {
+            if (auto* registry = AZ::SettingsRegistry::Get())
+            {
+                using AZ::SettingsRegistryMergeUtils::IsPathAncestorDescendantOrEqual;
+
+                m_notifyEventHandler = registry->RegisterNotifier(
+                    [this](const AZStd::string_view path, [[maybe_unused]] const AZ::SettingsRegistryInterface::Type type)
+                    {
+                        if (IsPathAncestorDescendantOrEqual(GridSnappingSetting, path))
+                        {
+                            m_gridSnappingChanged.Signal(GridSnappingEnabled());
+                        }
+                    });
+            }
+        }
+
+        void SetGridSnappingChangedEvent(GridSnappingChangedEvent::Handler& handler) override
+        {
+            handler.Connect(m_gridSnappingChanged);
+        }
+
+        GridSnappingChangedEvent m_gridSnappingChanged;
+        AZ::SettingsRegistryInterface::NotifyEventHandler m_notifyEventHandler;
+    };
+
+    AZStd::unique_ptr<EditorViewportSettingsCallbacks> CreateEditorViewportSettingsCallbacks()
+    {
+        return AZStd::make_unique<EditorViewportSettingsCallbacksImpl>();
+    }
+
+    bool GridSnappingEnabled()
+    {
+        return GetRegistry(GridSnappingSetting, false);
+    }
+
+    void SetGridSnapping(const bool enabled)
+    {
+        SetRegistry(GridSnappingSetting, enabled);
+    }
+
+    float GridSnappingSize()
+    {
+        return aznumeric_cast<float>(GetRegistry(GridSizeSetting, 0.1));
+    }
+
+    void SetGridSnappingSize(const float size)
+    {
+        SetRegistry(GridSizeSetting, size);
+    }
+
+    bool AngleSnappingEnabled()
+    {
+        return GetRegistry(AngleSnappingSetting, false);
+    }
+
+    void SetAngleSnapping(const bool enabled)
+    {
+        SetRegistry(AngleSnappingSetting, enabled);
+    }
+
+    float AngleSnappingSize()
+    {
+        return aznumeric_cast<float>(GetRegistry(AngleSizeSetting, 5.0));
+    }
+
+    void SetAngleSnappingSize(const float size)
+    {
+        SetRegistry(AngleSizeSetting, size);
+    }
+
+    bool ShowingGrid()
+    {
+        return GetRegistry(ShowGridSetting, false);
+    }
+
+    void SetShowingGrid(const bool showing)
+    {
+        SetRegistry(ShowGridSetting, showing);
+    }
+
+    float CameraTranslateSpeed()
+    {
+        return aznumeric_cast<float>(GetRegistry(CameraTranslateSpeedSetting, 10.0));
+    }
+
+    void SetCameraTranslateSpeed(const float speed)
+    {
+        SetRegistry(CameraTranslateSpeedSetting, speed);
+    }
+
+    float CameraBoostMultiplier()
+    {
+        return aznumeric_cast<float>(GetRegistry(CameraBoostMultiplierSetting, 3.0));
+    }
+
+    void SetCameraBoostMultiplier(const float multiplier)
+    {
+        SetRegistry(CameraBoostMultiplierSetting, multiplier);
+    }
+
+    float CameraRotateSpeed()
+    {
+        return aznumeric_cast<float>(GetRegistry(CameraRotateSpeedSetting, 0.005));
+    }
+
+    void SetCameraRotateSpeed(const float speed)
+    {
+        SetRegistry(CameraRotateSpeedSetting, speed);
+    }
+
+    float CameraScrollSpeed()
+    {
+        return aznumeric_cast<float>(GetRegistry(CameraScrollSpeedSetting, 0.02));
+    }
+
+    void SetCameraScrollSpeed(const float speed)
+    {
+        SetRegistry(CameraScrollSpeedSetting, speed);
+    }
+
+    float CameraDollyMotionSpeed()
+    {
+        return aznumeric_cast<float>(GetRegistry(CameraDollyMotionSpeedSetting, 0.01));
+    }
+
+    void SetCameraDollyMotionSpeed(const float speed)
+    {
+        SetRegistry(CameraDollyMotionSpeedSetting, speed);
+    }
+
+    bool CameraOrbitYawRotationInverted()
+    {
+        return GetRegistry(CameraOrbitYawRotationInvertedSetting, false);
+    }
+
+    void SetCameraOrbitYawRotationInverted(const bool inverted)
+    {
+        SetRegistry(CameraOrbitYawRotationInvertedSetting, inverted);
+    }
+
+    bool CameraPanInvertedX()
+    {
+        return GetRegistry(CameraPanInvertedXSetting, true);
+    }
+
+    void SetCameraPanInvertedX(const bool inverted)
+    {
+        SetRegistry(CameraPanInvertedXSetting, inverted);
+    }
+
+    bool CameraPanInvertedY()
+    {
+        return GetRegistry(CameraPanInvertedYSetting, true);
+    }
+
+    void SetCameraPanInvertedY(const bool inverted)
+    {
+        SetRegistry(CameraPanInvertedYSetting, inverted);
+    }
+
+    float CameraPanSpeed()
+    {
+        return aznumeric_cast<float>(GetRegistry(CameraPanSpeedSetting, 0.01));
+    }
+
+    void SetCameraPanSpeed(float speed)
+    {
+        SetRegistry(CameraPanSpeedSetting, speed);
+    }
+
+    float CameraRotateSmoothness()
+    {
+        return aznumeric_cast<float>(GetRegistry(CameraRotateSmoothnessSetting, 5.0));
+    }
+
+    void SetCameraRotateSmoothness(const float smoothness)
+    {
+        SetRegistry(CameraRotateSmoothnessSetting, smoothness);
+    }
+
+    float CameraTranslateSmoothness()
+    {
+        return aznumeric_cast<float>(GetRegistry(CameraTranslateSmoothnessSetting, 5.0));
+    }
+
+    void SetCameraTranslateSmoothness(const float smoothness)
+    {
+        SetRegistry(CameraTranslateSmoothnessSetting, smoothness);
+    }
+} // namespace SandboxEditor
diff --git a/Code/Editor/EditorViewportSettings.h b/Code/Editor/EditorViewportSettings.h
new file mode 100644
index 0000000000..718782ccd5
--- /dev/null
+++ b/Code/Editor/EditorViewportSettings.h
@@ -0,0 +1,84 @@
+/*
+ * 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 <SandboxAPI.h>
+
+#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+
+namespace SandboxEditor
+{
+    using GridSnappingChangedEvent = AZ::Event<bool>;
+
+    //! Set callbacks to listen for editor settings change events.
+    class EditorViewportSettingsCallbacks
+    {
+    public:
+        virtual ~EditorViewportSettingsCallbacks() = default;
+
+        virtual void SetGridSnappingChangedEvent(GridSnappingChangedEvent::Handler& handler) = 0;
+    };
+
+    //! Create an instance of EditorViewportSettingsCallbacks
+    //! Note: EditorViewportSettingsCallbacks is implemented in EditorViewportSettings.cpp - a change
+    //! event will fire when a value in the settings registry (editorpreferences.setreg) is modified.
+    SANDBOX_API AZStd::unique_ptr<EditorViewportSettingsCallbacks> CreateEditorViewportSettingsCallbacks();
+
+    SANDBOX_API bool GridSnappingEnabled();
+    SANDBOX_API void SetGridSnapping(bool enabled);
+
+    SANDBOX_API float GridSnappingSize();
+    SANDBOX_API void SetGridSnappingSize(float size);
+
+    SANDBOX_API bool AngleSnappingEnabled();
+    SANDBOX_API void SetAngleSnapping(bool enabled);
+
+    SANDBOX_API float AngleSnappingSize();
+    SANDBOX_API void SetAngleSnappingSize(float size);
+
+    SANDBOX_API bool ShowingGrid();
+    SANDBOX_API void SetShowingGrid(bool showing);
+
+    SANDBOX_API float CameraTranslateSpeed();
+    SANDBOX_API void SetCameraTranslateSpeed(float speed);
+
+    SANDBOX_API float CameraBoostMultiplier();
+    SANDBOX_API void SetCameraBoostMultiplier(float multiplier);
+
+    SANDBOX_API float CameraRotateSpeed();
+    SANDBOX_API void SetCameraRotateSpeed(float speed);
+
+    SANDBOX_API float CameraScrollSpeed();
+    SANDBOX_API void SetCameraScrollSpeed(float speed);
+
+    SANDBOX_API float CameraDollyMotionSpeed();
+    SANDBOX_API void SetCameraDollyMotionSpeed(float speed);
+
+    SANDBOX_API bool CameraOrbitYawRotationInverted();
+    SANDBOX_API void SetCameraOrbitYawRotationInverted(bool inverted);
+
+    SANDBOX_API bool CameraPanInvertedX();
+    SANDBOX_API void SetCameraPanInvertedX(bool inverted);
+
+    SANDBOX_API bool CameraPanInvertedY();
+    SANDBOX_API void SetCameraPanInvertedY(bool inverted);
+
+    SANDBOX_API float CameraPanSpeed();
+    SANDBOX_API void SetCameraPanSpeed(float speed);
+
+    SANDBOX_API float CameraRotateSmoothness();
+    SANDBOX_API void SetCameraRotateSmoothness(float smoothness);
+
+    SANDBOX_API float CameraTranslateSmoothness();
+    SANDBOX_API void SetCameraTranslateSmoothness(float smoothness);
+
+    //! Return if the new editor camera system is enabled or not.
+    //! @note This is implemented in EditorViewportWidget.cpp
+    SANDBOX_API bool UsingNewCameraSystem();
+} // namespace SandboxEditor
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
new file mode 100644
index 0000000000..36b3941492
--- /dev/null
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -0,0 +1,3192 @@
+/*
+ * 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 : implementation filefov
+
+#include "EditorDefs.h"
+
+#include "EditorViewportWidget.h"
+
+// Qt
+#include <QPainter>
+#include <QScopedValueRollback>
+#include <QCheckBox>
+#include <QMessageBox>
+#include <QTimer>
+#include <QBoxLayout>
+
+// AzCore
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Math/VectorConversions.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Console/IConsole.h>
+
+// AzFramework
+#include <AzFramework/Components/CameraBus.h>
+#include <AzFramework/Viewport/DisplayContextRequestBus.h>
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
+#if defined(AZ_PLATFORM_WINDOWS)
+#   include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
+#endif // defined(AZ_PLATFORM_WINDOWS)
+#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>                   // for AzFramework::InputDeviceMouse
+#include <AzFramework/Viewport/ViewportControllerList.h>
+
+// AzQtComponents
+#include <AzQtComponents/Utilities/QtWindowUtilities.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
+#include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
+#include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
+
+// AtomToolsFramework
+#include <AtomToolsFramework/Viewport/RenderViewportWidget.h>
+#include <AtomToolsFramework/Viewport/ModularViewportCameraController.h>
+
+// CryCommon
+#include <CryCommon/HMDBus.h>
+
+// AzFramework
+#include <AzFramework/Render/IntersectorInterface.h>
+
+// Editor
+#include "Util/fastlib.h"
+#include "CryEditDoc.h"
+#include "GameEngine.h"
+#include "ViewManager.h"
+#include "Objects/DisplayContext.h"
+#include "DisplaySettings.h"
+#include "Include/IObjectManager.h"
+#include "Include/IDisplayViewport.h"
+#include "Objects/ObjectManager.h"
+#include "ProcessInfo.h"
+#include "IPostEffectGroup.h"
+#include "EditorPreferencesPageGeneral.h"
+#include "ViewportManipulatorController.h"
+#include "LegacyViewportCameraController.h"
+
+#include "ViewPane.h"
+#include "CustomResolutionDlg.h"
+#include "AnimationContext.h"
+#include "Objects/SelectionGroup.h"
+#include "Core/QtEditorApplication.h"
+#include "MainWindow.h"
+#include "LayoutWnd.h"
+
+// ComponentEntityEditorPlugin
+#include <Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h>
+
+// LmbrCentral
+#include <LmbrCentral/Rendering/EditorCameraCorrectionBus.h>
+
+// Atom
+#include <Atom/RPI.Public/View.h>
+#include <Atom/RPI.Public/ViewportContextManager.h>
+#include <AzCore/Console/IConsole.h>
+#include <AzCore/Math/MatrixUtils.h>
+
+#include <QtGui/private/qhighdpiscaling_p.h>
+
+#include <IEntityRenderState.h>
+#include <IPhysics.h>
+#include <IStatObj.h>
+
+AZ_CVAR(
+    bool, ed_visibility_logTiming, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Output the timing of the new IVisibilitySystem query");
+AZ_CVAR(bool, ed_useNewCameraSystem, true, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Editor camera system");
+
+namespace SandboxEditor
+{
+    bool UsingNewCameraSystem()
+    {
+        return ed_useNewCameraSystem;
+    }
+} // namespace SandboxEditor
+
+EditorViewportWidget* EditorViewportWidget::m_pPrimaryViewport = nullptr;
+
+namespace AzFramework
+{
+    extern InputChannelId CameraFreeLookButton;
+    extern InputChannelId CameraFreePanButton;
+    extern InputChannelId CameraOrbitLookButton;
+    extern InputChannelId CameraOrbitDollyButton;
+    extern InputChannelId CameraOrbitPanButton;
+} // namespace AzFramework
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+void StopFixedCursorMode();
+void StartFixedCursorMode(QObject *viewport);
+#endif
+
+#define RENDER_MESH_TEST_DISTANCE (0.2f)
+#define CURSOR_FONT_HEIGHT  8.0f
+
+//! Viewport settings for the EditorViewportWidget
+struct EditorViewportSettings : public AzToolsFramework::ViewportInteraction::ViewportSettings
+{
+    bool GridSnappingEnabled() const override;
+    float GridSize() const override;
+    bool ShowGrid() const override;
+    bool AngleSnappingEnabled() const override;
+    float AngleStep() const override;
+};
+
+static const EditorViewportSettings g_EditorViewportSettings;
+
+namespace AZ::ViewportHelpers
+{
+    static const char TextCantCreateCameraNoLevel[] = "Cannot create camera when no level is loaded.";
+
+    class EditorEntityNotifications
+        : public AzToolsFramework::EditorEntityContextNotificationBus::Handler
+    {
+    public:
+        EditorEntityNotifications(EditorViewportWidget& renderViewport)
+            : m_renderViewport(renderViewport)
+        {
+            AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
+        }
+
+        ~EditorEntityNotifications() override
+        {
+            AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
+        }
+
+        // AzToolsFramework::EditorEntityContextNotificationBus
+        void OnStartPlayInEditor() override
+        {
+            m_renderViewport.OnStartPlayInEditor();
+        }
+        void OnStopPlayInEditor() override
+        {
+            m_renderViewport.OnStopPlayInEditor();
+        }
+
+    private:
+        EditorViewportWidget& m_renderViewport;
+    };
+} // namespace AZ::ViewportHelpers
+
+//////////////////////////////////////////////////////////////////////////
+// EditorViewportWidget
+//////////////////////////////////////////////////////////////////////////
+
+EditorViewportWidget::EditorViewportWidget(const QString& name, QWidget* parent)
+    : QtViewport(parent)
+    , m_Camera(GetIEditor()->GetSystem()->GetViewCamera())
+    , m_camFOV(gSettings.viewports.fDefaultFov)
+    , m_defaultViewName(name)
+    , m_renderViewport(nullptr) //m_renderViewport is initialized later, in SetViewportId
+{
+    // need this to be set in order to allow for language switching on Windows
+    setAttribute(Qt::WA_InputMethodEnabled);
+    LockCameraMovement(true);
+
+    EditorViewportWidget::SetViewTM(m_Camera.GetMatrix());
+    m_defaultViewTM.SetIdentity();
+
+    if (GetIEditor()->GetViewManager()->GetSelectedViewport() == nullptr)
+    {
+        GetIEditor()->GetViewManager()->SelectViewport(this);
+    }
+
+    GetIEditor()->RegisterNotifyListener(this);
+
+    m_displayContext.pIconManager = GetIEditor()->GetIconManager();
+    GetIEditor()->GetUndoManager()->AddListener(this);
+
+    m_PhysicalLocation.SetIdentity();
+
+    // The renderer requires something, so don't allow us to shrink to absolutely nothing
+    // This won't in fact stop the viewport from being shrunk, when it's the centralWidget for
+    // the MainWindow, but it will stop the viewport from getting resize events
+    // once it's smaller than that, which from the renderer's perspective works out
+    // to be the same thing.
+    setMinimumSize(50, 50);
+
+    OnCreate();
+
+    setMouseTracking(true);
+
+    Camera::EditorCameraRequestBus::Handler::BusConnect();
+    m_editorEntityNotifications = AZStd::make_unique<AZ::ViewportHelpers::EditorEntityNotifications>(*this);
+    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
+
+    auto handleCameraChange = [this](const AZ::Matrix4x4&)
+    {
+        UpdateCameraFromViewportContext();
+    };
+
+    m_cameraViewMatrixChangeHandler = AZ::RPI::ViewportContext::MatrixChangedEvent::Handler(handleCameraChange);
+    m_cameraProjectionMatrixChangeHandler = AZ::RPI::ViewportContext::MatrixChangedEvent::Handler(handleCameraChange);
+
+    m_manipulatorManager = GetIEditor()->GetViewManager()->GetManipulatorManager();
+    if (!m_pPrimaryViewport)
+    {
+        SetAsActiveViewport();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+EditorViewportWidget::~EditorViewportWidget()
+{
+    if (m_pPrimaryViewport == this)
+    {
+        m_pPrimaryViewport = nullptr;
+    }
+
+    DisconnectViewportInteractionRequestBus();
+    m_editorEntityNotifications.reset();
+    Camera::EditorCameraRequestBus::Handler::BusDisconnect();
+    OnDestroy();
+    GetIEditor()->GetUndoManager()->RemoveListener(this);
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// EditorViewportWidget message handlers
+//////////////////////////////////////////////////////////////////////////
+int EditorViewportWidget::OnCreate()
+{
+    CreateRenderContext();
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::resizeEvent(QResizeEvent* event)
+{
+    PushDisableRendering();
+    QtViewport::resizeEvent(event);
+    PopDisableRendering();
+
+    const QRect rcWindow = rect().translated(mapToGlobal(QPoint()));
+
+    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_MOVE, rcWindow.left(), rcWindow.top());
+
+    m_rcClient = rect();
+    m_rcClient.setBottomRight(WidgetToViewport(m_rcClient.bottomRight()));
+
+    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, width(), height());
+
+    // We queue the window resize event because the render overlay may be hidden.
+    // If the render overlay is not visible, the native window that is backing it will
+    // also be hidden, and it will not resize until it becomes visible.
+    m_windowResizedEvent = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::paintEvent([[maybe_unused]] QPaintEvent* event)
+{
+    // Do not call CViewport::OnPaint() for painting messages
+    // FIXME: paintEvent() isn't the best place for such logic. Should listen to proper eNotify events and to the stuff there instead. (Repeats for other view port classes too).
+    CGameEngine* ge = GetIEditor()->GetGameEngine();
+    if ((ge && ge->IsLevelLoaded()) || (GetType() != ET_ViewportCamera))
+    {
+        setRenderOverlayVisible(true);
+    }
+    else
+    {
+        setRenderOverlayVisible(false);
+        QPainter painter(this); // device context for painting
+
+        // draw gradient background
+        const QRect rc = rect();
+        QLinearGradient gradient(rc.topLeft(), rc.bottomLeft());
+        gradient.setColorAt(0, QColor(80, 80, 80));
+        gradient.setColorAt(1, QColor(200, 200, 200));
+        painter.fillRect(rc, gradient);
+
+        // if we have some level loaded/loading/new
+        // we draw a text
+        if (!GetIEditor()->GetLevelFolder().isEmpty())
+        {
+            const int kFontSize = 200;
+            const char* kFontName = "Arial";
+            const QColor kTextColor(255, 255, 255);
+            const QColor kTextShadowColor(0, 0, 0);
+            const QFont font(kFontName, kFontSize / 10.0);
+            painter.setFont(font);
+
+            QString friendlyName = QFileInfo(GetIEditor()->GetLevelName()).fileName();
+            const QString strMsg = tr("Preparing level %1...").arg(friendlyName);
+
+            // draw text shadow
+            painter.setPen(kTextShadowColor);
+            painter.drawText(rc, Qt::AlignCenter, strMsg);
+            painter.setPen(kTextColor);
+            // offset rect for normal text
+            painter.drawText(rc.translated(-1, -1), Qt::AlignCenter, strMsg);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::mousePressEvent(QMouseEvent* event)
+{
+    GetIEditor()->GetViewManager()->SelectViewport(this);
+
+    QtViewport::mousePressEvent(event);
+}
+
+AzToolsFramework::ViewportInteraction::MousePick EditorViewportWidget::BuildMousePickInternal(const QPoint& point) const
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+
+    MousePick mousePick;
+    mousePick.m_screenCoordinates = ScreenPointFromQPoint(point);
+    const auto& ray = m_renderViewport->ViewportScreenToWorldRay(mousePick.m_screenCoordinates);
+    if (ray.has_value())
+    {
+        mousePick.m_rayOrigin = ray.value().origin;
+        mousePick.m_rayDirection = ray.value().direction;
+    }
+    return mousePick;
+}
+
+AzToolsFramework::ViewportInteraction::MousePick EditorViewportWidget::BuildMousePick(const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+
+    PreWidgetRendering();
+    const MousePick mousePick = BuildMousePickInternal(point);
+    PostWidgetRendering();
+    return mousePick;
+}
+
+AzToolsFramework::ViewportInteraction::MouseInteraction EditorViewportWidget::BuildMouseInteractionInternal(
+    const AzToolsFramework::ViewportInteraction::MouseButtons buttons,
+    const AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
+    const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+
+    MouseInteraction mouse;
+    mouse.m_interactionId.m_cameraId = m_viewEntityId;
+    mouse.m_interactionId.m_viewportId = GetViewportId();
+    mouse.m_mouseButtons = buttons;
+    mouse.m_mousePick = mousePick;
+    mouse.m_keyboardModifiers = modifiers;
+    return mouse;
+}
+
+AzToolsFramework::ViewportInteraction::MouseInteraction EditorViewportWidget::BuildMouseInteraction(
+    const Qt::MouseButtons buttons, const Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+
+    return BuildMouseInteractionInternal(
+        BuildMouseButtons(buttons),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(WidgetToViewport(point)));
+}
+
+void EditorViewportWidget::InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons)
+{
+    // this is required, otherwise the user will see the context menu
+    OnMouseMove(Qt::NoModifier, buttons, QCursor::pos() + QPoint(deltaX, deltaY));
+    // we simply move the prev mouse position, so the change will be picked up
+    // by the next ProcessMouse call
+    m_prevMousePos -= QPoint(deltaX, deltaY);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::event(QEvent* event)
+{
+    switch (event->type())
+    {
+    case QEvent::WindowActivate:
+        GetIEditor()->GetViewManager()->SelectViewport(this);
+        // also kill the keys; if we alt-tab back to the viewport, or come back from the debugger, it's done (and there's no guarantee we'll get the keyrelease event anyways)
+        m_keyDown.clear();
+        break;
+
+    case QEvent::Shortcut:
+        // a shortcut should immediately clear us, otherwise the release event never gets sent
+        m_keyDown.clear();
+        break;
+    }
+
+    return QtViewport::event(event);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::ResetContent()
+{
+    QtViewport::ResetContent();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::UpdateContent(int flags)
+{
+    QtViewport::UpdateContent(flags);
+    if (flags & eUpdateObjects)
+    {
+        m_bUpdateViewport = true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::Update()
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    if (Editor::EditorQtApplication::instance()->isMovingOrResizing())
+    {
+        return;
+    }
+
+    if (m_rcClient.isEmpty() || GetIEditor()->IsInMatEditMode())
+    {
+        return;
+    }
+
+    if (!isVisible())
+    {
+        return;
+    }
+
+    if (m_updateCameraPositionNextTick)
+    {
+        auto cameraState = m_renderViewport->GetCameraState();
+        AZ::Matrix3x4 matrix;
+        matrix.SetBasisAndTranslation(cameraState.m_side, cameraState.m_forward, cameraState.m_up, cameraState.m_position);
+        auto m = AZMatrix3x4ToLYMatrix3x4(matrix);
+
+        SetViewTM(m);
+        SetFOV(cameraState.m_fovOrZoom);
+        m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
+    }
+    else if (!ed_useNewCameraSystem)
+    {
+        m_renderViewport->GetViewportContext()->SetCameraTransform(LYTransformToAZTransform(m_Camera.GetMatrix()));
+    }
+
+    // Don't override the game mode FOV
+    if (!GetIEditor()->IsInGameMode())
+    {
+        AZ::Matrix4x4 clipMatrix;
+        AZ::MakePerspectiveFovMatrixRH(
+            clipMatrix,
+            GetFOV(),
+            aznumeric_cast<float>(width()) / aznumeric_cast<float>(height()),
+            m_Camera.GetNearPlane(),
+            m_Camera.GetFarPlane(),
+            true
+        );
+        m_renderViewport->GetViewportContext()->SetCameraProjectionMatrix(clipMatrix);
+    }
+    // Reset the camera update flag now that we're finished updating our viewport context
+    m_updateCameraPositionNextTick = false;
+
+    // Don't wait for changes to update the focused viewport.
+    if (CheckRespondToInput())
+    {
+        m_bUpdateViewport = true;
+    }
+
+    // While Renderer doesn't support fast rendering of the scene to more then 1 viewport
+    // render only focused viewport if more then 1 are opened and always update is off.
+    if (!m_isOnPaint && m_viewManager->GetNumberOfGameViewports() > 1 && GetType() == ET_ViewportCamera)
+    {
+        if (m_pPrimaryViewport != this)
+        {
+            if (CheckRespondToInput()) // If this is the focused window, set primary viewport.
+            {
+                SetAsActiveViewport();
+            }
+            else if (!m_bUpdateViewport) // Skip this viewport.
+            {
+                return;
+            }
+        }
+    }
+
+    const bool isGameMode = GetIEditor()->IsInGameMode();
+    const bool isSimulationMode = GetIEditor()->GetGameEngine()->GetSimulationMode();
+
+    // Allow debug visualization in both 'game' (Ctrl-G) and 'simulation' (Ctrl-P) modes
+    if (isGameMode || isSimulationMode)
+    {
+        if (!IsRenderingDisabled())
+        {
+            // Disable rendering to avoid recursion into Update()
+            PushDisableRendering();
+
+
+            //get debug display interface for the viewport
+            AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
+            AzFramework::DebugDisplayRequestBus::Bind(debugDisplayBus, GetViewportId());
+            AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
+
+            AzFramework::DebugDisplayRequests* debugDisplay =
+                AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
+
+
+            // draw debug visualizations
+            if (debugDisplay)
+            {
+                const AZ::u32 prevState = debugDisplay->GetState();
+                debugDisplay->SetState(
+                    e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
+
+                AzFramework::EntityDebugDisplayEventBus::Broadcast(
+                    &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport,
+                    AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
+
+                debugDisplay->SetState(prevState);
+            }
+
+            QtViewport::Update();
+            PopDisableRendering();
+        }
+
+        // Game mode rendering is handled by CryAction
+        if (isGameMode)
+        {
+            return;
+        }
+    }
+
+    // Prevents rendering recursion due to recursive Paint messages.
+    if (IsRenderingDisabled())
+    {
+        return;
+    }
+
+    PushDisableRendering();
+
+    m_viewTM = m_Camera.GetMatrix(); // synchronize.
+
+    // Render
+    {
+        // TODO: Move out this logic to a controller and refactor to work with Atom
+
+        OnRender();
+
+        ProcessRenderLisneters(m_displayContext);
+
+        m_displayContext.Flush2D();
+
+        // m_renderer->SwitchToNativeResolutionBackbuffer();
+
+        // 3D engine stats
+
+        CCamera CurCamera = gEnv->pSystem->GetViewCamera();
+        gEnv->pSystem->SetViewCamera(m_Camera);
+
+        // Post Render Callback
+        {
+            PostRenderers::iterator itr = m_postRenderers.begin();
+            PostRenderers::iterator end = m_postRenderers.end();
+            for (; itr != end; ++itr)
+            {
+                (*itr)->OnPostRender();
+            }
+        }
+
+        gEnv->pSystem->SetViewCamera(CurCamera);
+    }
+
+    {
+        auto start = std::chrono::steady_clock::now();
+
+        m_entityVisibilityQuery.UpdateVisibility(GetCameraState());
+
+        if (ed_visibility_logTiming)
+        {
+            auto stop = std::chrono::steady_clock::now();
+            std::chrono::duration<double> diff = stop - start;
+            AZ_Printf("Visibility", "FindVisibleEntities (new) - Duration: %f", diff);
+        }
+    }
+
+    QtViewport::Update();
+
+    PopDisableRendering();
+    m_bUpdateViewport = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::SetViewEntity(const AZ::EntityId& viewEntityId, bool lockCameraMovement)
+{
+    // if they've picked the same camera, then that means they want to toggle
+    if (viewEntityId.IsValid() && viewEntityId != m_viewEntityId)
+    {
+        LockCameraMovement(lockCameraMovement);
+        m_viewEntityId = viewEntityId;
+        AZStd::string entityName;
+        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, viewEntityId);
+        SetName(QString("Camera entity: %1").arg(entityName.c_str()));
+    }
+    else
+    {
+        SetDefaultCamera();
+    }
+
+    PostCameraSet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::ResetToViewSourceType(const ViewSourceType& viewSourceType)
+{
+    LockCameraMovement(true);
+    m_pCameraFOVVariable = nullptr;
+    m_viewEntityId.SetInvalid();
+    m_cameraObjectId = GUID_NULL;
+    m_viewSourceType = viewSourceType;
+    SetViewTM(GetViewTM());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::PostCameraSet()
+{
+    if (m_viewPane)
+    {
+        m_viewPane->OnFOVChanged(GetFOV());
+    }
+
+    GetIEditor()->Notify(eNotify_CameraChanged);
+    QScopedValueRollback<bool> rb(m_ignoreSetViewFromEntityPerspective, true);
+    Camera::EditorCameraNotificationBus::Broadcast(
+        &Camera::EditorCameraNotificationBus::Events::OnViewportViewEntityChanged, m_viewEntityId);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* EditorViewportWidget::GetCameraObject() const
+{
+    CBaseObject* pCameraObject = nullptr;
+
+    if (m_viewSourceType == ViewSourceType::SequenceCamera)
+    {
+        m_cameraObjectId = GetViewManager()->GetCameraObjectId();
+    }
+    if (m_cameraObjectId != GUID_NULL)
+    {
+        // Find camera object from id.
+        pCameraObject = GetIEditor()->GetObjectManager()->FindObject(m_cameraObjectId);
+    }
+    else if (m_viewSourceType == ViewSourceType::CameraComponent || m_viewSourceType == ViewSourceType::AZ_Entity)
+    {
+        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(
+            pCameraObject, m_viewEntityId, &AzToolsFramework::ComponentEntityEditorRequests::GetSandboxObject);
+    }
+    return pCameraObject;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnBeginGameMode:
+    {
+        if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
+        {
+            m_preGameModeViewTM = GetViewTM();
+            // 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())
+            {
+                StartFullscreenPreview();
+            }
+        }
+
+        if (m_renderViewport)
+        {
+            m_renderViewport->GetControllerList()->SetEnabled(false);
+        }
+    }
+    break;
+
+    case eNotify_OnEndGameMode:
+        if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
+        {
+            SetCurrentCursor(STD_CURSOR_DEFAULT);
+            m_bInRotateMode = false;
+            m_bInMoveMode = false;
+            m_bInOrbitMode = false;
+            m_bInZoomMode = false;
+
+            if (m_inFullscreenPreview)
+            {
+                StopFullscreenPreview();
+            }
+
+            RestoreViewportAfterGameMode();
+        }
+
+        if (m_renderViewport)
+        {
+            m_renderViewport->GetControllerList()->SetEnabled(true);
+        }
+        break;
+
+    case eNotify_OnCloseScene:
+        m_renderViewport->SetScene(nullptr);
+        SetDefaultCamera();
+        break;
+
+    case eNotify_OnEndSceneOpen:
+        UpdateScene();
+        break;
+
+    case eNotify_OnBeginNewScene:
+        PushDisableRendering();
+        break;
+
+    case eNotify_OnEndNewScene:
+        PopDisableRendering();
+
+        {
+            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
+            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
+            float sx = terrainAabb.GetXExtent();
+            float sy = terrainAabb.GetYExtent();
+
+            Matrix34 viewTM;
+            viewTM.SetIdentity();
+            // Initial camera will be at middle of the map at the height of 2
+            // meters above the terrain (default terrain height is 32)
+            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
+            SetViewTM(viewTM);
+
+            UpdateScene();
+        }
+        break;
+
+    case eNotify_OnBeginTerrainCreate:
+        PushDisableRendering();
+        break;
+
+    case eNotify_OnEndTerrainCreate:
+        PopDisableRendering();
+
+        {
+            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
+            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
+            float sx = terrainAabb.GetXExtent();
+            float sy = terrainAabb.GetYExtent();
+
+            Matrix34 viewTM;
+            viewTM.SetIdentity();
+            // Initial camera will be at middle of the map at the height of 2
+            // meters above the terrain (default terrain height is 32)
+            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
+            SetViewTM(viewTM);
+        }
+        break;
+
+    case eNotify_OnBeginLayerExport:
+    case eNotify_OnBeginSceneSave:
+        PushDisableRendering();
+        break;
+    case eNotify_OnEndLayerExport:
+    case eNotify_OnEndSceneSave:
+        PopDisableRendering();
+        break;
+
+    case eNotify_OnBeginLoad: // disables viewport input when starting to load an existing level
+    case eNotify_OnBeginCreate: // disables viewport input when starting to create a new level
+        m_freezeViewportInput = true;
+        break;
+
+    case eNotify_OnEndLoad: // enables viewport input when finished loading an existing level
+    case eNotify_OnEndCreate: // enables viewport input when finished creating a new level
+        m_freezeViewportInput = false;
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::OnRender()
+{
+    if (m_rcClient.isEmpty())
+    {
+        // Even in null rendering, update the view camera.
+        // This is necessary so that automated editor tests using the null renderer to test systems like dynamic vegetation
+        // are still able to manipulate the current logical camera position, even if nothing is rendered.
+        GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
+        return;
+    }
+
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+}
+
+void EditorViewportWidget::OnBeginPrepareRender()
+{
+    if (!m_debugDisplay)
+    {
+        AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
+        AzFramework::DebugDisplayRequestBus::Bind(debugDisplayBus, GetViewportId());
+        AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
+
+        m_debugDisplay = AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
+    }
+
+    if (!m_debugDisplay)
+    {
+        return;
+    }
+
+    m_isOnPaint = true;
+    Update();
+    m_isOnPaint = false;
+
+    float fNearZ = GetIEditor()->GetConsoleVar("cl_DefaultNearPlane");
+    float fFarZ = m_Camera.GetFarPlane();
+
+    CBaseObject* cameraObject = GetCameraObject();
+    if (cameraObject)
+    {
+        AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
+        if (m_viewEntityId.IsValid())
+        {
+            Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
+            Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
+            LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
+                lookThroughEntityCorrection, m_viewEntityId, &LmbrCentral::EditorCameraCorrectionRequests::GetTransformCorrection);
+        }
+
+        m_viewTM = cameraObject->GetWorldTM() * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection);
+        m_viewTM.OrthonormalizeFast();
+
+        m_Camera.SetMatrix(m_viewTM);
+
+        int w = m_rcClient.width();
+        int h = m_rcClient.height();
+
+        m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
+    }
+    else if (m_viewEntityId.IsValid())
+    {
+        Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
+        Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
+        int w = m_rcClient.width();
+        int h = m_rcClient.height();
+
+        m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
+    }
+    else
+    {
+        // Normal camera.
+        m_cameraObjectId = GUID_NULL;
+        int w = m_rcClient.width();
+        int h = m_rcClient.height();
+
+        // Don't bother doing an FOV calculation if we don't have a valid viewport
+        // This prevents frustum calculation bugs with a null viewport
+        if (w <= 1 || h <= 1)
+        {
+            return;
+        }
+
+        float fov = gSettings.viewports.fDefaultFov;
+
+        // match viewport fov to default / selected title menu fov
+        if (GetFOV() != fov)
+        {
+            if (m_viewPane)
+            {
+                m_viewPane->OnFOVChanged(fov);
+                SetFOV(fov);
+            }
+        }
+
+        // Just for editor: Aspect ratio fix when changing the viewport
+        if (!GetIEditor()->IsInGameMode())
+        {
+            float viewportAspectRatio = float( w ) / h;
+            float targetAspectRatio = GetAspectRatio();
+            if (targetAspectRatio > viewportAspectRatio)
+            {
+                // Correct for vertical FOV change.
+                float maxTargetHeight = float( w ) / targetAspectRatio;
+                fov = 2 * atanf((h * tan(fov / 2)) / maxTargetHeight);
+            }
+        }
+        m_Camera.SetFrustum(w, h, fov, fNearZ);
+    }
+
+    GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
+
+    if (GetIEditor()->IsInGameMode())
+    {
+        return;
+    }
+
+    PreWidgetRendering();
+
+    RenderAll();
+
+    // Draw 2D helpers.
+    TransformationMatrices backupSceneMatrices;
+    m_debugDisplay->DepthTestOff();
+    //m_renderer->Set2DMode(m_rcClient.right(), m_rcClient.bottom(), backupSceneMatrices);
+    auto prevState = m_debugDisplay->GetState();
+    m_debugDisplay->SetState(e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
+
+    if (gSettings.viewports.bShowSafeFrame)
+    {
+        UpdateSafeFrame();
+        RenderSafeFrame();
+    }
+
+    AzFramework::ViewportDebugDisplayEventBus::Event(
+        AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport2d,
+        AzFramework::ViewportInfo{GetViewportId()}, *m_debugDisplay);
+
+    m_debugDisplay->SetState(prevState);
+    m_debugDisplay->DepthTestOn();
+
+    PostWidgetRendering();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::RenderAll()
+{
+    if (!m_debugDisplay)
+    {
+        return;
+    }
+
+    // allow the override of in-editor visualization
+    AzFramework::ViewportDebugDisplayEventBus::Event(
+        AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport,
+        AzFramework::ViewportInfo{ GetViewportId() }, *m_debugDisplay);
+
+    m_entityVisibilityQuery.DisplayVisibility(*m_debugDisplay);
+
+    if (m_manipulatorManager != nullptr)
+    {
+        using namespace AzToolsFramework::ViewportInteraction;
+
+        m_debugDisplay->DepthTestOff();
+        m_manipulatorManager->DrawManipulators(
+            *m_debugDisplay, GetCameraState(),
+            BuildMouseInteractionInternal(
+                MouseButtons(TranslateMouseButtons(QGuiApplication::mouseButtons())),
+                BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers()),
+                BuildMousePickInternal(WidgetToViewport(mapFromGlobal(QCursor::pos())))));
+        m_debugDisplay->DepthTestOn();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::UpdateSafeFrame()
+{
+    m_safeFrame = m_rcClient;
+
+    if (m_safeFrame.height() == 0)
+    {
+        return;
+    }
+
+    const bool allowSafeFrameBiggerThanViewport = false;
+
+    float safeFrameAspectRatio = float( m_safeFrame.width()) / m_safeFrame.height();
+    float targetAspectRatio = GetAspectRatio();
+    bool viewportIsWiderThanSafeFrame = (targetAspectRatio <= safeFrameAspectRatio);
+    if (viewportIsWiderThanSafeFrame || allowSafeFrameBiggerThanViewport)
+    {
+        float maxSafeFrameWidth = m_safeFrame.height() * targetAspectRatio;
+        float widthDifference = m_safeFrame.width() - maxSafeFrameWidth;
+
+        m_safeFrame.setLeft(m_safeFrame.left() + widthDifference * 0.5);
+        m_safeFrame.setRight(m_safeFrame.right() - widthDifference * 0.5);
+    }
+    else
+    {
+        float maxSafeFrameHeight = m_safeFrame.width() / targetAspectRatio;
+        float heightDifference = m_safeFrame.height() - maxSafeFrameHeight;
+
+        m_safeFrame.setTop(m_safeFrame.top() + heightDifference * 0.5);
+        m_safeFrame.setBottom(m_safeFrame.bottom() - heightDifference * 0.5);
+    }
+
+    m_safeFrame.adjust(0, 0, -1, -1); // <-- aesthetic improvement.
+
+    const float SAFE_ACTION_SCALE_FACTOR = 0.05f;
+    m_safeAction = m_safeFrame;
+    m_safeAction.adjust(m_safeFrame.width() * SAFE_ACTION_SCALE_FACTOR, m_safeFrame.height() * SAFE_ACTION_SCALE_FACTOR,
+        -m_safeFrame.width() * SAFE_ACTION_SCALE_FACTOR, -m_safeFrame.height() * SAFE_ACTION_SCALE_FACTOR);
+
+    const float SAFE_TITLE_SCALE_FACTOR = 0.1f;
+    m_safeTitle = m_safeFrame;
+    m_safeTitle.adjust(m_safeFrame.width() * SAFE_TITLE_SCALE_FACTOR, m_safeFrame.height() * SAFE_TITLE_SCALE_FACTOR,
+        -m_safeFrame.width() * SAFE_TITLE_SCALE_FACTOR, -m_safeFrame.height() * SAFE_TITLE_SCALE_FACTOR);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::RenderSafeFrame()
+{
+    RenderSafeFrame(m_safeFrame, 0.75f, 0.75f, 0, 0.8f);
+    RenderSafeFrame(m_safeAction, 0, 0.85f, 0.80f, 0.8f);
+    RenderSafeFrame(m_safeTitle, 0.80f, 0.60f, 0, 0.8f);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::RenderSafeFrame(const QRect& frame, float r, float g, float b, float a)
+{
+    m_debugDisplay->SetColor(r, g, b, a);
+
+    const int LINE_WIDTH = 2;
+    for (int i = 0; i < LINE_WIDTH; i++)
+    {
+        AZ::Vector3 topLeft(frame.left() + i, frame.top() + i, 0);
+        AZ::Vector3 bottomRight(frame.right() - i, frame.bottom() - i, 0);
+        m_debugDisplay->DrawWireBox(topLeft, bottomRight);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float EditorViewportWidget::GetAspectRatio() const
+{
+    return gSettings.viewports.fDefaultAspectRatio;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::RenderSnapMarker()
+{
+    if (!gSettings.snap.markerDisplay)
+    {
+        return;
+    }
+
+    QPoint point = QCursor::pos();
+    ScreenToClient(point);
+    Vec3 p = MapViewToCP(point);
+
+    DisplayContext& dc = m_displayContext;
+
+    float fScreenScaleFactor = GetScreenScaleFactor(p);
+
+    Vec3 x(1, 0, 0);
+    Vec3 y(0, 1, 0);
+    Vec3 z(0, 0, 1);
+    x = x * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
+    y = y * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
+    z = z * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
+
+    dc.SetColor(gSettings.snap.markerColor);
+    dc.DrawLine(p - x, p + x);
+    dc.DrawLine(p - y, p + y);
+    dc.DrawLine(p - z, p + z);
+
+    point = WorldToView(p);
+
+    int s = 8;
+    dc.DrawLine2d(point + QPoint(-s, -s), point + QPoint(s, -s), 0);
+    dc.DrawLine2d(point + QPoint(-s, s), point + QPoint(s, s), 0);
+    dc.DrawLine2d(point + QPoint(-s, -s), point + QPoint(-s, s), 0);
+    dc.DrawLine2d(point + QPoint(s, -s), point + QPoint(s, s), 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::OnMenuResolutionCustom()
+{
+    CCustomResolutionDlg resDlg(width(), height(), parentWidget());
+    if (resDlg.exec() == QDialog::Accepted)
+    {
+        ResizeView(resDlg.GetWidth(), resDlg.GetHeight());
+
+        const QString text = QString::fromLatin1("%1 x %2").arg(resDlg.GetWidth()).arg(resDlg.GetHeight());
+
+        QStringList customResPresets;
+        CViewportTitleDlg::LoadCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
+        CViewportTitleDlg::UpdateCustomPresets(text, customResPresets);
+        CViewportTitleDlg::SaveCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::OnMenuCreateCameraEntityFromCurrentView()
+{
+    Camera::EditorCameraSystemRequestBus::Broadcast(&Camera::EditorCameraSystemRequests::CreateCameraEntityFromViewport);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::OnMenuSelectCurrentCamera()
+{
+    CBaseObject* pCameraObject = GetCameraObject();
+
+    if (pCameraObject && !pCameraObject->IsSelected())
+    {
+        GetIEditor()->BeginUndo();
+        IObjectManager* pObjectManager = GetIEditor()->GetObjectManager();
+        pObjectManager->ClearSelection();
+        pObjectManager->SelectObject(pCameraObject);
+        GetIEditor()->AcceptUndo("Select Current Camera");
+    }
+}
+
+AzFramework::CameraState EditorViewportWidget::GetCameraState()
+{
+    return m_renderViewport->GetCameraState();
+}
+
+AZ::Vector3 EditorViewportWidget::PickTerrain(const AzFramework::ScreenPoint& point)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    return LYVec3ToAZVec3(ViewToWorld(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), nullptr, true));
+}
+
+AZ::EntityId EditorViewportWidget::PickEntity(const AzFramework::ScreenPoint& point)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    PreWidgetRendering();
+
+    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();
+        }
+    }
+
+    PostWidgetRendering();
+
+    return entityId;
+}
+
+float EditorViewportWidget::TerrainHeight(const AZ::Vector2& position)
+{
+    return GetIEditor()->GetTerrainElevation(position.GetX(), position.GetY());
+}
+
+void EditorViewportWidget::FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    visibleEntitiesOut.assign(m_entityVisibilityQuery.Begin(), m_entityVisibilityQuery.End());
+}
+
+AzFramework::ScreenPoint EditorViewportWidget::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
+{
+    return m_renderViewport->ViewportWorldToScreen(worldPosition);
+}
+
+bool EditorViewportWidget::IsViewportInputFrozen()
+{
+    return m_freezeViewportInput;
+}
+
+void EditorViewportWidget::FreezeViewportInput(bool freeze)
+{
+    m_freezeViewportInput = freeze;
+}
+
+QWidget* EditorViewportWidget::GetWidgetForViewportContextMenu()
+{
+    return this;
+}
+
+void EditorViewportWidget::BeginWidgetContext()
+{
+    PreWidgetRendering();
+}
+
+void EditorViewportWidget::EndWidgetContext()
+{
+    PostWidgetRendering();
+}
+
+bool EditorViewportWidget::ShowingWorldSpace()
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    return BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers()).Shift();
+}
+
+AZStd::shared_ptr<AtomToolsFramework::ModularViewportCameraController> CreateModularViewportCameraController(
+    AzFramework::ViewportId viewportId)
+{
+    AzFramework::ReloadCameraKeyBindings();
+
+    auto controller = AZStd::make_shared<AtomToolsFramework::ModularViewportCameraController>();
+    controller->SetCameraPropsBuilderCallback(
+        [](AzFramework::CameraProps& cameraProps)
+        {
+            cameraProps.m_rotateSmoothnessFn = []
+            {
+                return SandboxEditor::CameraRotateSmoothness();
+            };
+
+            cameraProps.m_translateSmoothnessFn = []
+            {
+                return SandboxEditor::CameraTranslateSmoothness();
+            };
+        });
+
+    controller->SetCameraListBuilderCallback(
+        [viewportId](AzFramework::Cameras& cameras)
+        {
+            auto firstPersonRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(AzFramework::CameraFreeLookButton);
+            firstPersonRotateCamera->m_rotateSpeedFn = []
+            {
+                return SandboxEditor::CameraRotateSpeed();
+            };
+
+            auto firstPersonPanCamera =
+                AZStd::make_shared<AzFramework::PanCameraInput>(AzFramework::CameraFreePanButton, AzFramework::LookPan);
+            firstPersonPanCamera->m_panSpeedFn = []
+            {
+                return SandboxEditor::CameraPanSpeed();
+            };
+            firstPersonPanCamera->m_invertPanXFn = []
+            {
+                return SandboxEditor::CameraPanInvertedX();
+            };
+            firstPersonPanCamera->m_invertPanYFn = []
+            {
+                return SandboxEditor::CameraPanInvertedY();
+            };
+
+            auto firstPersonTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(AzFramework::LookTranslation);
+            firstPersonTranslateCamera->m_translateSpeedFn = []
+            {
+                return SandboxEditor::CameraTranslateSpeed();
+            };
+            firstPersonTranslateCamera->m_boostMultiplierFn = []
+            {
+                return SandboxEditor::CameraBoostMultiplier();
+            };
+
+            auto firstPersonWheelCamera = AZStd::make_shared<AzFramework::ScrollTranslationCameraInput>();
+            firstPersonWheelCamera->m_scrollSpeedFn = []
+            {
+                return SandboxEditor::CameraScrollSpeed();
+            };
+
+            auto orbitCamera = AZStd::make_shared<AzFramework::OrbitCameraInput>();
+            orbitCamera->SetLookAtFn(
+                [viewportId](const AZ::Vector3& position, const AZ::Vector3& direction) -> AZStd::optional<AZ::Vector3>
+                {
+                    AZStd::optional<AZ::Vector3> lookAtAfterInterpolation;
+                    AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+                        lookAtAfterInterpolation, viewportId,
+                        &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::LookAtAfterInterpolation);
+
+                    // initially attempt to use the last set look at point after an interpolation has finished
+                    if (lookAtAfterInterpolation.has_value())
+                    {
+                        return *lookAtAfterInterpolation;
+                    }
+
+                    const float RayDistance = 1000.0f;
+                    AzFramework::RenderGeometry::RayRequest ray;
+                    ray.m_startWorldPosition = position;
+                    ray.m_endWorldPosition = position + direction * RayDistance;
+                    ray.m_onlyVisible = true;
+
+                    AzFramework::RenderGeometry::RayResult renderGeometryIntersectionResult;
+                    AzFramework::RenderGeometry::IntersectorBus::EventResult(
+                        renderGeometryIntersectionResult, AzToolsFramework::GetEntityContextId(),
+                        &AzFramework::RenderGeometry::IntersectorBus::Events::RayIntersect, ray);
+
+                    // attempt a ray intersection with any visible mesh and return the intersection position if successful
+                    if (renderGeometryIntersectionResult)
+                    {
+                        return renderGeometryIntersectionResult.m_worldPosition;
+                    }
+
+                    // if there is no selection or no intersection, fallback to default camera orbit behavior (ground plane
+                    // intersection)
+                    return {};
+                });
+
+            auto orbitRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(AzFramework::CameraOrbitLookButton);
+            orbitRotateCamera->m_rotateSpeedFn = []
+            {
+                return SandboxEditor::CameraRotateSpeed();
+            };
+            orbitRotateCamera->m_invertYawFn = []
+            {
+                return SandboxEditor::CameraOrbitYawRotationInverted();
+            };
+
+            auto orbitTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(AzFramework::OrbitTranslation);
+            orbitTranslateCamera->m_translateSpeedFn = []
+            {
+                return SandboxEditor::CameraTranslateSpeed();
+            };
+            orbitTranslateCamera->m_boostMultiplierFn = []
+            {
+                return SandboxEditor::CameraBoostMultiplier();
+            };
+
+            auto orbitDollyWheelCamera = AZStd::make_shared<AzFramework::OrbitDollyScrollCameraInput>();
+            orbitDollyWheelCamera->m_scrollSpeedFn = []
+            {
+                return SandboxEditor::CameraScrollSpeed();
+            };
+
+            auto orbitDollyMoveCamera =
+                AZStd::make_shared<AzFramework::OrbitDollyCursorMoveCameraInput>(AzFramework::CameraOrbitDollyButton);
+            orbitDollyMoveCamera->m_cursorSpeedFn = []
+            {
+                return SandboxEditor::CameraDollyMotionSpeed();
+            };
+
+            auto orbitPanCamera = AZStd::make_shared<AzFramework::PanCameraInput>(AzFramework::CameraOrbitPanButton, AzFramework::OrbitPan);
+            orbitPanCamera->m_panSpeedFn = []
+            {
+                return SandboxEditor::CameraPanSpeed();
+            };
+            orbitPanCamera->m_invertPanXFn = []
+            {
+                return SandboxEditor::CameraPanInvertedX();
+            };
+            orbitPanCamera->m_invertPanYFn = []
+            {
+                return SandboxEditor::CameraPanInvertedY();
+            };
+
+            orbitCamera->m_orbitCameras.AddCamera(orbitRotateCamera);
+            orbitCamera->m_orbitCameras.AddCamera(orbitTranslateCamera);
+            orbitCamera->m_orbitCameras.AddCamera(orbitDollyWheelCamera);
+            orbitCamera->m_orbitCameras.AddCamera(orbitDollyMoveCamera);
+            orbitCamera->m_orbitCameras.AddCamera(orbitPanCamera);
+
+            cameras.AddCamera(firstPersonRotateCamera);
+            cameras.AddCamera(firstPersonPanCamera);
+            cameras.AddCamera(firstPersonTranslateCamera);
+            cameras.AddCamera(firstPersonWheelCamera);
+            cameras.AddCamera(orbitCamera);
+        });
+
+    return controller;
+}
+
+void EditorViewportWidget::SetViewportId(int id)
+{
+    CViewport::SetViewportId(id);
+
+    // Clear the cached debugdisplay pointer. we're about to delete that render viewport, and deleting the render
+    // viewport invalidates the debugdisplay.
+    m_debugDisplay = nullptr;
+
+    // First delete any existing layout
+    // This also deletes any existing render viewport widget (since it will be added to the layout)
+    // Below is the typical method of clearing a QLayout, see e.g. https://doc.qt.io/qt-5/qlayout.html#takeAt
+    if (QLayout* thisLayout = layout())
+    {
+        QLayoutItem* item;
+        while ((item = thisLayout->takeAt(0)) != nullptr)
+        {
+            if (QWidget* widget = item->widget())
+            {
+                delete widget;
+            }
+            thisLayout->removeItem(item);
+            delete item;
+        }
+        delete thisLayout;
+    }
+
+    // Now that we have an ID, we can initialize our viewport.
+    m_renderViewport = new AtomToolsFramework::RenderViewportWidget(this, false);
+    if (!m_renderViewport->InitializeViewportContext(id))
+    {
+        AZ_Warning("EditorViewportWidget", false, "Failed to initialize RenderViewportWidget's ViewportContext");
+        delete m_renderViewport;
+        m_renderViewport = nullptr;
+        return;
+    }
+    auto viewportContext = m_renderViewport->GetViewportContext();
+    m_defaultViewportContextName = viewportContext->GetName();
+    QBoxLayout* layout = new QBoxLayout(QBoxLayout::Direction::TopToBottom, this);
+    layout->setContentsMargins(QMargins());
+    layout->addWidget(m_renderViewport);
+
+    viewportContext->ConnectViewMatrixChangedHandler(m_cameraViewMatrixChangeHandler);
+    viewportContext->ConnectProjectionMatrixChangedHandler(m_cameraProjectionMatrixChangeHandler);
+
+    m_renderViewport->GetControllerList()->Add(AZStd::make_shared<SandboxEditor::ViewportManipulatorController>());
+
+    if (ed_useNewCameraSystem)
+    {
+        m_renderViewport->GetControllerList()->Add(CreateModularViewportCameraController(AzFramework::ViewportId(id)));
+    }
+    else
+    {
+        m_renderViewport->GetControllerList()->Add(AZStd::make_shared<SandboxEditor::LegacyViewportCameraController>());
+    }
+
+    m_renderViewport->SetViewportSettings(&g_EditorViewportSettings);
+
+    UpdateScene();
+
+    if (m_pPrimaryViewport == this)
+    {
+        SetAsActiveViewport();
+    }
+
+    m_editorViewportSettingsCallbacks = SandboxEditor::CreateEditorViewportSettingsCallbacks();
+
+    m_gridSnappingHandler = SandboxEditor::GridSnappingChangedEvent::Handler(
+        [id](const bool snapping)
+        {
+            AzToolsFramework::ViewportInteraction::ViewportSettingsNotificationBus::Event(
+                id, &AzToolsFramework::ViewportInteraction::ViewportSettingsNotificationBus::Events::OnGridSnappingChanged, snapping);
+        });
+
+    m_editorViewportSettingsCallbacks->SetGridSnappingChangedEvent(m_gridSnappingHandler);
+}
+
+void EditorViewportWidget::ConnectViewportInteractionRequestBus()
+{
+    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusConnect(GetViewportId());
+    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
+    m_viewportUi.ConnectViewportUiBus(GetViewportId());
+
+    AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusConnect();
+}
+
+void EditorViewportWidget::DisconnectViewportInteractionRequestBus()
+{
+    AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusDisconnect();
+
+    m_viewportUi.DisconnectViewportUiBus();
+    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusDisconnect();
+    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusDisconnect();
+}
+
+namespace AZ::ViewportHelpers
+{
+    void ToggleBool(bool* variable, bool* disableVariableIfOn)
+    {
+        *variable = !*variable;
+        if (*variable && disableVariableIfOn)
+        {
+            *disableVariableIfOn = false;
+        }
+    }
+
+    void ToggleInt(int* variable)
+    {
+        *variable = !*variable;
+    }
+
+    void AddCheckbox(QMenu* menu, const QString& text, bool* variable, bool* disableVariableIfOn = nullptr)
+    {
+        QAction* action = menu->addAction(text);
+        QObject::connect(action, &QAction::triggered, action, [variable, disableVariableIfOn] { ToggleBool(variable, disableVariableIfOn);
+            });
+        action->setCheckable(true);
+        action->setChecked(*variable);
+    }
+
+    void AddCheckbox(QMenu* menu, const QString& text, int* variable)
+    {
+        QAction* action = menu->addAction(text);
+        QObject::connect(action, &QAction::triggered, action, [variable] { ToggleInt(variable);
+            });
+        action->setCheckable(true);
+        action->setChecked(*variable);
+    }
+} // namespace AZ::ViewportHelpers
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::OnTitleMenu(QMenu* menu)
+{
+    const bool bDisplayLabels = GetIEditor()->GetDisplaySettings()->IsDisplayLabels();
+    QAction* action = menu->addAction(tr("Labels"));
+    connect(action, &QAction::triggered, this, [bDisplayLabels] {GetIEditor()->GetDisplaySettings()->DisplayLabels(!bDisplayLabels);
+        });
+    action->setCheckable(true);
+    action->setChecked(bDisplayLabels);
+
+    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Safe Frame"), &gSettings.viewports.bShowSafeFrame);
+    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Construction Plane"), &gSettings.snap.constructPlaneDisplay);
+    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Trigger Bounds"), &gSettings.viewports.bShowTriggerBounds);
+    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Icons"), &gSettings.viewports.bShowIcons, &gSettings.viewports.bShowSizeBasedIcons);
+    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Size-based Icons"), &gSettings.viewports.bShowSizeBasedIcons, &gSettings.viewports.bShowIcons);
+    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Helpers of Frozen Objects"), &gSettings.viewports.nShowFrozenHelpers);
+
+    if (!m_predefinedAspectRatios.IsEmpty())
+    {
+        QMenu* aspectRatiosMenu = menu->addMenu(tr("Target Aspect Ratio"));
+
+        for (size_t i = 0; i < m_predefinedAspectRatios.GetCount(); ++i)
+        {
+            const QString& aspectRatioString = m_predefinedAspectRatios.GetName(i);
+            QAction* aspectRatioAction = aspectRatiosMenu->addAction(aspectRatioString);
+            connect(aspectRatioAction, &QAction::triggered, this, [i, this] {
+                const float aspect = m_predefinedAspectRatios.GetValue(i);
+                gSettings.viewports.fDefaultAspectRatio = aspect;
+            });
+            aspectRatioAction->setCheckable(true);
+            aspectRatioAction->setChecked(m_predefinedAspectRatios.IsCurrent(i));
+        }
+    }
+
+    // Set ourself as the active viewport so the following actions create a camera from this view
+    GetIEditor()->GetViewManager()->SelectViewport(this);
+
+    CGameEngine* gameEngine = GetIEditor()->GetGameEngine();
+
+    if (Camera::EditorCameraSystemRequestBus::HasHandlers())
+    {
+        action = menu->addAction(tr("Create camera entity from current view"));
+        connect(action, &QAction::triggered, this, &EditorViewportWidget::OnMenuCreateCameraEntityFromCurrentView);
+
+        if (!gameEngine || !gameEngine->IsLevelLoaded())
+        {
+            action->setEnabled(false);
+            action->setToolTip(tr(AZ::ViewportHelpers::TextCantCreateCameraNoLevel));
+            menu->setToolTipsVisible(true);
+        }
+    }
+
+    if (!gameEngine || !gameEngine->IsLevelLoaded())
+    {
+        action->setEnabled(false);
+        action->setToolTip(tr(AZ::ViewportHelpers::TextCantCreateCameraNoLevel));
+        menu->setToolTipsVisible(true);
+    }
+
+    if (GetCameraObject())
+    {
+        action = menu->addAction(tr("Select Current Camera"));
+        connect(action, &QAction::triggered, this, &EditorViewportWidget::OnMenuSelectCurrentCamera);
+    }
+
+    // Add Cameras.
+    bool bHasCameras = AddCameraMenuItems(menu);
+    EditorViewportWidget* pFloatingViewport = nullptr;
+
+    if (GetIEditor()->GetViewManager()->GetViewCount() > 1)
+    {
+        for (int i = 0; i < GetIEditor()->GetViewManager()->GetViewCount(); ++i)
+        {
+            CViewport* vp = GetIEditor()->GetViewManager()->GetView(i);
+            if (!vp)
+            {
+                continue;
+            }
+
+            if (viewport_cast<EditorViewportWidget*>(vp) == nullptr)
+            {
+                continue;
+            }
+
+            if (vp->GetViewportId() == MAX_NUM_VIEWPORTS - 1)
+            {
+                menu->addSeparator();
+
+                QMenu* floatViewMenu = menu->addMenu(tr("Floating View"));
+
+                pFloatingViewport = (EditorViewportWidget*)vp;
+                pFloatingViewport->AddCameraMenuItems(floatViewMenu);
+
+                if (bHasCameras)
+                {
+                    floatViewMenu->addSeparator();
+                }
+
+                QMenu* resolutionMenu = floatViewMenu->addMenu(tr("Resolution"));
+
+                QStringList customResPresets;
+                CViewportTitleDlg::LoadCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
+                CViewportTitleDlg::AddResolutionMenus(resolutionMenu, [this](int width, int height) { ResizeView(width, height); }, customResPresets);
+                if (!resolutionMenu->actions().isEmpty())
+                {
+                    resolutionMenu->addSeparator();
+                }
+                QAction* customResolutionAction = resolutionMenu->addAction(tr("Custom..."));
+                connect(customResolutionAction, &QAction::triggered, this, &EditorViewportWidget::OnMenuResolutionCustom);
+                break;
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::AddCameraMenuItems(QMenu* menu)
+{
+    if (!menu->isEmpty())
+    {
+        menu->addSeparator();
+    }
+
+    AZ::ViewportHelpers::AddCheckbox(menu, "Lock Camera Movement", &m_bLockCameraMovement);
+    menu->addSeparator();
+
+    // Camera Sub menu
+    QMenu* customCameraMenu = menu->addMenu(tr("Camera"));
+
+    QAction* action = customCameraMenu->addAction("Editor Camera");
+    action->setCheckable(true);
+    action->setChecked(m_viewSourceType == ViewSourceType::None);
+    connect(action, &QAction::triggered, this, &EditorViewportWidget::SetDefaultCamera);
+
+    AZ::EBusAggregateResults<AZ::EntityId> getCameraResults;
+    Camera::CameraBus::BroadcastResult(getCameraResults, &Camera::CameraRequests::GetCameras);
+
+    const int numCameras = getCameraResults.values.size();
+
+    // only enable if we're editing a sequence in Track View and have cameras in the level
+    bool enableSequenceCameraMenu = (GetIEditor()->GetAnimation()->GetSequence() && numCameras);
+
+    action = customCameraMenu->addAction(tr("Sequence Camera"));
+    action->setCheckable(true);
+    action->setChecked(m_viewSourceType == ViewSourceType::SequenceCamera);
+    action->setEnabled(enableSequenceCameraMenu);
+    connect(action, &QAction::triggered, this, &EditorViewportWidget::SetSequenceCamera);
+
+    QVector<QAction*> additionalCameras;
+    additionalCameras.reserve(getCameraResults.values.size());
+
+    for (const AZ::EntityId& entityId : getCameraResults.values)
+    {
+        AZStd::string entityName;
+        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, entityId);
+        action = new QAction(QString(entityName.c_str()), nullptr);
+        additionalCameras.append(action);
+        action->setCheckable(true);
+        action->setChecked(m_viewEntityId == entityId && m_viewSourceType == ViewSourceType::CameraComponent);
+        connect(action, &QAction::triggered, this, [this, entityId](bool isChecked)
+            {
+                if (isChecked)
+                {
+                    SetComponentCamera(entityId);
+                }
+                else
+                {
+                    SetDefaultCamera();
+                }
+            });
+    }
+
+    std::sort(additionalCameras.begin(), additionalCameras.end(), [] (QAction* a1, QAction* a2) {
+        return QString::compare(a1->text(), a2->text(), Qt::CaseInsensitive) < 0;
+    });
+
+    for (QAction* cameraAction : additionalCameras)
+    {
+        customCameraMenu->addAction(cameraAction);
+    }
+
+    action = customCameraMenu->addAction(tr("Look through entity"));
+    bool areAnyEntitiesSelected = false;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
+    action->setCheckable(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
+    action->setEnabled(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
+    action->setChecked(m_viewSourceType == ViewSourceType::AZ_Entity);
+    connect(action, &QAction::triggered, this, [this](bool isChecked)
+        {
+            if (isChecked)
+            {
+                AzToolsFramework::EntityIdList selectedEntityList;
+                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+                if (selectedEntityList.size())
+                {
+                    SetEntityAsCamera(*selectedEntityList.begin());
+                }
+            }
+            else
+            {
+                SetDefaultCamera();
+            }
+        });
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::ResizeView(int width, int height)
+{
+    const QRect rView = rect().translated(mapToGlobal(QPoint()));
+    int deltaWidth = width - rView.width();
+    int deltaHeight = height - rView.height();
+
+    if (window()->isFullScreen())
+    {
+        setGeometry(rView.left(), rView.top(), rView.width() + deltaWidth, rView.height() + deltaHeight);
+    }
+    else
+    {
+        QWidget* window = this->window();
+        if (window->isMaximized())
+        {
+            window->showNormal();
+        }
+
+        const QSize deltaSize = QSize(width, height) - size();
+        window->move(0, 0);
+        window->resize(window->size() + deltaSize);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::ToggleCameraObject()
+{
+    if (m_viewSourceType == ViewSourceType::SequenceCamera)
+    {
+        ResetToViewSourceType(ViewSourceType::LegacyCamera);
+    }
+    else
+    {
+        ResetToViewSourceType(ViewSourceType::SequenceCamera);
+    }
+    PostCameraSet();
+    GetIEditor()->GetAnimation()->ForceAnimation();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::SetCamera(const CCamera& camera)
+{
+    m_Camera = camera;
+    SetViewTM(m_Camera.GetMatrix());
+}
+
+//////////////////////////////////////////////////////////////////////////
+EditorViewportWidget* EditorViewportWidget::GetPrimaryViewport()
+{
+    return m_pPrimaryViewport;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::focusOutEvent([[maybe_unused]] QFocusEvent* event)
+{
+    // if we lose focus, the keyboard map needs to be cleared immediately
+    if (!m_keyDown.isEmpty())
+    {
+        m_keyDown.clear();
+
+        releaseKeyboard();
+    }
+}
+
+void EditorViewportWidget::keyPressEvent(QKeyEvent* event)
+{
+    // Special case Escape key and bubble way up to the top level parent so that it can cancel us out of any active tool
+    // or clear the current selection
+    if (event->key() == Qt::Key_Escape)
+    {
+        QCoreApplication::sendEvent(GetIEditor()->GetEditorMainWindow(), event);
+    }
+
+    // NOTE: we keep track of key presses and releases explicitly because the OS/Qt will insert a slight delay between sending
+    // key events when the key is held down. This is standard, but makes responding to key events for game style input silly
+    // because we want the movement to be butter smooth.
+    if (!event->isAutoRepeat())
+    {
+        m_keyDown.insert(event->key());
+    }
+
+    QtViewport::keyPressEvent(event);
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    // In game mode on windows we need to forward raw text events to the input system.
+    if (GetIEditor()->IsInGameMode() && GetType() == ET_ViewportCamera)
+    {
+        // Get the QString as a '\0'-terminated array of unsigned shorts.
+        // The result remains valid until the string is modified.
+        const ushort* codeUnitsUTF16 = event->text().utf16();
+        while (ushort codeUnitUTF16 = *codeUnitsUTF16)
+        {
+            AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputCodeUnitUTF16Event, codeUnitUTF16);
+            ++codeUnitsUTF16;
+        }
+    }
+#endif // defined(AZ_PLATFORM_WINDOWS)
+}
+
+void EditorViewportWidget::SetViewTM(const Matrix34& viewTM, bool bMoveOnly)
+{
+    Matrix34 camMatrix = viewTM;
+
+    // If no collision flag set do not check for terrain elevation.
+    if (GetType() == ET_ViewportCamera)
+    {
+        if ((GetIEditor()->GetDisplaySettings()->GetSettings() & SETTINGS_NOCOLLISION) == 0)
+        {
+            Vec3 p = camMatrix.GetTranslation();
+            bool adjustCameraElevation = true;
+            auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+            if (terrain)
+            {
+                AZ::Aabb terrainAabb(terrain->GetTerrainAabb());
+
+                // Adjust the AABB to include all Z values.  Since the goal here is to snap the camera to the terrain height if
+                // it's below the terrain, we only want to verify the camera is within the XY bounds of the terrain to adjust the elevation.
+                terrainAabb.SetMin(AZ::Vector3(terrainAabb.GetMin().GetX(), terrainAabb.GetMin().GetY(), -AZ::Constants::FloatMax));
+                terrainAabb.SetMax(AZ::Vector3(terrainAabb.GetMax().GetX(), terrainAabb.GetMax().GetY(), AZ::Constants::FloatMax));
+
+                if (!terrainAabb.Contains(LYVec3ToAZVec3(p)))
+                {
+                    adjustCameraElevation = false;
+                }
+                else if (terrain->GetIsHoleFromFloats(p.x, p.y))
+                {
+                    adjustCameraElevation = false;
+                }
+            }
+
+            if (adjustCameraElevation)
+            {
+                float z = GetIEditor()->GetTerrainElevation(p.x, p.y);
+                if (p.z < z + 0.25)
+                {
+                    p.z = z + 0.25;
+                    camMatrix.SetTranslation(p);
+                }
+            }
+        }
+
+        // Also force this position on game.
+        if (GetIEditor()->GetGameEngine())
+        {
+            GetIEditor()->GetGameEngine()->SetPlayerViewMatrix(viewTM);
+        }
+    }
+
+    CBaseObject* cameraObject = GetCameraObject();
+    if (cameraObject)
+    {
+        // Ignore camera movement if locked.
+        if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
+        {
+            return;
+        }
+
+        AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
+        if (m_viewEntityId.IsValid())
+        {
+            LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
+                lookThroughEntityCorrection, m_viewEntityId,
+                &LmbrCentral::EditorCameraCorrectionRequests::GetInverseTransformCorrection);
+        }
+
+        if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
+        {
+            CUndo undo("Move Camera");
+            if (bMoveOnly)
+            {
+                // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
+                cameraObject->SetWorldPos(camMatrix.GetTranslation(), eObjectUpdateFlags_UserInput);
+            }
+            else
+            {
+                // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
+                cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection), eObjectUpdateFlags_UserInput);
+            }
+        }
+        else
+        {
+            if (bMoveOnly)
+            {
+                // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
+                cameraObject->SetWorldPos(camMatrix.GetTranslation());
+            }
+            else
+            {
+                // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
+                cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection));
+            }
+        }
+    }
+    else if (m_viewEntityId.IsValid())
+    {
+        // Ignore camera movement if locked.
+        if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
+        {
+            return;
+        }
+
+        if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
+        {
+            CUndo undo("Move Camera");
+            if (bMoveOnly)
+            {
+                AZ::TransformBus::Event(
+                    m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
+                    LYVec3ToAZVec3(camMatrix.GetTranslation()));
+            }
+            else
+            {
+                AZ::TransformBus::Event(
+                    m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
+                    LYTransformToAZTransform(camMatrix));
+            }
+        }
+        else
+        {
+            if (bMoveOnly)
+            {
+                AZ::TransformBus::Event(
+                    m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
+                    LYVec3ToAZVec3(camMatrix.GetTranslation()));
+            }
+            else
+            {
+                AZ::TransformBus::Event(
+                    m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
+                    LYTransformToAZTransform(camMatrix));
+            }
+        }
+
+        AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+            &AzToolsFramework::PropertyEditorGUIMessages::RequestRefresh,
+            AzToolsFramework::PropertyModificationRefreshLevel::Refresh_AttributesAndValues);
+    }
+
+    if (m_pressedKeyState == KeyPressedState::PressedThisFrame)
+    {
+        m_pressedKeyState = KeyPressedState::PressedInPreviousFrame;
+    }
+
+    QtViewport::SetViewTM(camMatrix);
+
+    m_Camera.SetMatrix(camMatrix);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::RenderSelectedRegion()
+{
+    AABB box;
+    GetIEditor()->GetSelectedRegion(box);
+    if (box.IsEmpty())
+    {
+        return;
+    }
+
+    float x1 = box.min.x;
+    float y1 = box.min.y;
+    float x2 = box.max.x;
+    float y2 = box.max.y;
+
+    DisplayContext& dc = m_displayContext;
+
+    float fMaxSide = MAX(y2 - y1, x2 - x1);
+    if (fMaxSide < 0.1f)
+    {
+        return;
+    }
+    float fStep = fMaxSide / 100.0f;
+
+    float fMinZ = 0;
+    float fMaxZ = 0;
+
+    // Draw yellow border lines.
+    dc.SetColor(1, 1, 0, 1);
+    float offset = 0.01f;
+    Vec3 p1, p2;
+
+    const float defaultTerrainHeight = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
+    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+
+    for (float y = y1; y < y2; y += fStep)
+    {
+        p1.x = x1;
+        p1.y = y;
+        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
+
+        p2.x = x1;
+        p2.y = y + fStep;
+        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
+        dc.DrawLine(p1, p2);
+
+        p1.x = x2;
+        p1.y = y;
+        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
+
+        p2.x = x2;
+        p2.y = y + fStep;
+        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
+        dc.DrawLine(p1, p2);
+
+        fMinZ = min(fMinZ, min(p1.z, p2.z));
+        fMaxZ = max(fMaxZ, max(p1.z, p2.z));
+    }
+    for (float x = x1; x < x2; x += fStep)
+    {
+        p1.x = x;
+        p1.y = y1;
+        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
+
+        p2.x = x + fStep;
+        p2.y = y1;
+        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
+        dc.DrawLine(p1, p2);
+
+        p1.x = x;
+        p1.y = y2;
+        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
+
+        p2.x = x + fStep;
+        p2.y = y2;
+        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
+        dc.DrawLine(p1, p2);
+
+        fMinZ = min(fMinZ, min(p1.z, p2.z));
+        fMaxZ = max(fMaxZ, max(p1.z, p2.z));
+    }
+
+    {
+        // Draw a box area
+        float fBoxOver = fMaxSide / 5.0f;
+        float fBoxHeight = fBoxOver + fMaxZ - fMinZ;
+
+        ColorB boxColor(64, 64, 255, 128); // light blue
+        ColorB transparent(boxColor.r, boxColor.g, boxColor.b, 0);
+
+        Vec3 base[] = {
+            Vec3(x1, y1, fMinZ),
+            Vec3(x2, y1, fMinZ),
+            Vec3(x2, y2, fMinZ),
+            Vec3(x1, y2, fMinZ)
+        };
+
+        // Generate vertices
+        static AABB boxPrev(AABB::RESET);
+        static std::vector<Vec3> verts;
+        static std::vector<ColorB> colors;
+
+        if (!IsEquivalent(boxPrev, box))
+        {
+            verts.resize(0);
+            colors.resize(0);
+            for (int i = 0; i < 4; ++i)
+            {
+                Vec3& p = base[i];
+
+                verts.push_back(p);
+                verts.push_back(Vec3(p.x, p.y, p.z + fBoxHeight));
+                verts.push_back(Vec3(p.x, p.y, p.z + fBoxHeight + fBoxOver));
+
+                colors.push_back(boxColor);
+                colors.push_back(boxColor);
+                colors.push_back(transparent);
+            }
+            boxPrev = box;
+        }
+
+        // Generate indices
+        const int numInds = 4 * 12;
+        static vtx_idx inds[numInds];
+        static bool bNeedIndsInit = true;
+        if (bNeedIndsInit)
+        {
+            vtx_idx* pInds = &inds[0];
+
+            for (int i = 0; i < 4; ++i)
+            {
+                int over = 0;
+                if (i == 3)
+                {
+                    over = -12;
+                }
+
+                int ind = i * 3;
+                *pInds++ = ind;
+                *pInds++ = ind + 3 + over;
+                *pInds++ = ind + 1;
+
+                *pInds++ = ind + 1;
+                *pInds++ = ind + 3 + over;
+                *pInds++ = ind + 4 + over;
+
+                ind = i * 3 + 1;
+                *pInds++ = ind;
+                *pInds++ = ind + 3 + over;
+                *pInds++ = ind + 1;
+
+                *pInds++ = ind + 1;
+                *pInds++ = ind + 3 + over;
+                *pInds++ = ind + 4 + over;
+            }
+            bNeedIndsInit = false;
+        }
+
+        // Draw lines
+        for (int i = 0; i < 4; ++i)
+        {
+            Vec3& p = base[i];
+
+            dc.DrawLine(p, Vec3(p.x, p.y, p.z + fBoxHeight), ColorF(1, 1, 0, 1), ColorF(1, 1, 0, 1));
+            dc.DrawLine(Vec3(p.x, p.y, p.z + fBoxHeight), Vec3(p.x, p.y, p.z + fBoxHeight + fBoxOver), ColorF(1, 1, 0, 1), ColorF(1, 1, 0, 0));
+        }
+
+        // Draw volume
+        dc.DepthWriteOff();
+        dc.CullOff();
+        dc.pRenderAuxGeom->DrawTriangles(&verts[0], verts.size(), &inds[0], numInds, &colors[0]);
+        dc.CullOn();
+        dc.DepthWriteOn();
+    }
+}
+
+Vec3 EditorViewportWidget::WorldToView3D(const Vec3& wp, [[maybe_unused]] int nFlags) const
+{
+    Vec3 out(0, 0, 0);
+    float x, y, z;
+
+    ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
+    if (_finite(x) && _finite(y) && _finite(z))
+    {
+        out.x = (x / 100) * m_rcClient.width();
+        out.y = (y / 100) * m_rcClient.height();
+        out.x /= QHighDpiScaling::factor(windowHandle()->screen());
+        out.y /= QHighDpiScaling::factor(windowHandle()->screen());
+        out.z = z;
+    }
+    return out;
+}
+
+//////////////////////////////////////////////////////////////////////////
+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() = (x / 100) * width;
+        p.ry() = (y / 100) * height;
+    }
+    else
+    {
+        QPoint(0, 0);
+    }
+    return p;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 EditorViewportWidget::ViewToWorld(
+    const QPoint& vp, bool* collideWithTerrain, bool onlyTerrain, bool bSkipVegetation, bool bTestRenderMesh, bool* collideWithObject) const
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    AZ_UNUSED(collideWithTerrain)
+    AZ_UNUSED(onlyTerrain)
+    AZ_UNUSED(bTestRenderMesh)
+    AZ_UNUSED(bSkipVegetation)
+    AZ_UNUSED(bSkipVegetation)
+    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;
+
+    if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z))
+    {
+        return Vec3(0, 0, 0);
+    }
+
+    Vec3 colp = AZVec3ToLYVec3(ray.value().origin) + 0.002f * v;
+
+    return colp;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 EditorViewportWidget::ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh)
+{
+    AZ_UNUSED(vp)
+    AZ_UNUSED(onlyTerrain)
+    AZ_UNUSED(bTestRenderMesh)
+
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    return Vec3(0, 0, 1);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const
+{
+    Matrix34A objMat, objMatInv;
+    Matrix33 objRot, objRotInv;
+
+    if (hit.pCollider->GetiForeignData() != PHYS_FOREIGN_ID_STATIC)
+    {
+        return false;
+    }
+
+    IRenderNode* pNode = (IRenderNode*) hit.pCollider->GetForeignData(PHYS_FOREIGN_ID_STATIC);
+    if (!pNode || !pNode->GetEntityStatObj())
+    {
+        return false;
+    }
+
+    IStatObj* pEntObject  = pNode->GetEntityStatObj(hit.partid, 0, &objMat, false);
+    if (!pEntObject || !pEntObject->GetRenderMesh())
+    {
+        return false;
+    }
+
+    objRot = Matrix33(objMat);
+    objRot.NoScale(); // No scale.
+    objRotInv = objRot;
+    objRotInv.Invert();
+
+    float fWorldScale = objMat.GetColumn(0).GetLength(); // GetScale
+    float fWorldScaleInv = 1.0f / fWorldScale;
+
+    // transform decal into object space
+    objMatInv = objMat;
+    objMatInv.Invert();
+
+    // put into normal object space hit direction of projection
+    Vec3 invhitn = -(hit.n);
+    Vec3 vOS_HitDir = objRotInv.TransformVector(invhitn).GetNormalized();
+
+    // put into position object space hit position
+    Vec3 vOS_HitPos = objMatInv.TransformPoint(hit.pt);
+    vOS_HitPos -= vOS_HitDir * RENDER_MESH_TEST_DISTANCE * fWorldScaleInv;
+
+    IRenderMesh* pRM = pEntObject->GetRenderMesh();
+
+    AABB aabbRNode;
+    pRM->GetBBox(aabbRNode.min, aabbRNode.max);
+    Vec3 vOut(0, 0, 0);
+    if (!Intersect::Ray_AABB(Ray(vOS_HitPos, vOS_HitDir), aabbRNode, vOut))
+    {
+        return false;
+    }
+
+    if (!pRM || !pRM->GetVerticesCount())
+    {
+        return false;
+    }
+
+    if (RayRenderMeshIntersection(pRM, vOS_HitPos, vOS_HitDir, outPos, outNormal))
+    {
+        outNormal = objRot.TransformVector(outNormal).GetNormalized();
+        outPos = objMat.TransformPoint(outPos);
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal) const
+{
+    AZ_UNUSED(pRenderMesh);
+    AZ_UNUSED(vInPos);
+    AZ_UNUSED(vInDir);
+    AZ_UNUSED(vOutPos);
+    AZ_UNUSED(vOutNormal);
+    return false;
+    /*SRayHitInfo hitInfo;
+    hitInfo.bUseCache = false;
+    hitInfo.bInFirstHit = false;
+    hitInfo.inRay.origin = vInPos;
+    hitInfo.inRay.direction = vInDir.GetNormalized();
+    hitInfo.inReferencePoint = vInPos;
+    hitInfo.fMaxHitDistance = 0;
+    bool bRes = ???->RenderMeshRayIntersection(pRenderMesh, hitInfo, nullptr);
+    vOutPos = hitInfo.vHitPos;
+    vOutNormal = hitInfo.vHitNormal;
+    return bRes;*/
+}
+
+void EditorViewportWidget::UnProjectFromScreen(float sx, float sy, float sz, 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);
+    *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
+{
+    AzFramework::ScreenPoint screenPosition = m_renderViewport->ViewportWorldToScreen(AZ::Vector3{ptx, pty, ptz});
+    *sx = screenPosition.m_x;
+    *sy = screenPosition.m_y;
+    *sz = 0.f;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const
+{
+    QRect rc = m_rcClient;
+
+    Vec3 pos0, pos1;
+    float wx, wy, wz;
+    UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 0, &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(vp.x(), rc.bottom() - vp.y(), 1, &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);
+
+    Vec3 v = (pos1 - pos0);
+    v = v.GetNormalized();
+
+    raySrc = pos0;
+    rayDir = v;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float EditorViewportWidget::GetScreenScaleFactor(const Vec3& worldPoint) const
+{
+    float dist = m_Camera.GetPosition().GetDistance(worldPoint);
+    if (dist < m_Camera.GetNearPlane())
+    {
+        dist = m_Camera.GetNearPlane();
+    }
+    return dist;
+}
+//////////////////////////////////////////////////////////////////////////
+float EditorViewportWidget::GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position)
+{
+    Vec3 camPos = camera.GetPosition();
+    float dist = camPos.GetDistance(object_position);
+    return dist;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::OnDestroy()
+{
+    DestroyRenderContext();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::CheckRespondToInput() const
+{
+    if (!Editor::EditorQtApplication::IsActive())
+    {
+        return false;
+    }
+
+    if (!hasFocus() && !m_renderViewport->hasFocus())
+    {
+        return false;
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::HitTest(const QPoint& point, HitContext& hitInfo)
+{
+    hitInfo.camera = &m_Camera;
+    hitInfo.pExcludedObject = GetCameraObject();
+    return QtViewport::HitTest(point, hitInfo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::IsBoundsVisible(const AABB& box) const
+{
+    // If at least part of bbox is visible then its visible.
+    return m_Camera.IsAABBVisible_F(AABB(box.min, box.max));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::CenterOnSelection()
+{
+    if (!GetIEditor()->GetSelection()->IsEmpty())
+    {
+        // Get selection bounds & center
+        CSelectionGroup* sel = GetIEditor()->GetSelection();
+        AABB selectionBounds = sel->GetBounds();
+        CenterOnAABB(selectionBounds);
+    }
+}
+
+void EditorViewportWidget::CenterOnAABB(const AABB& aabb)
+{
+    Vec3 selectionCenter = aabb.GetCenter();
+
+    // Minimum center size is 40cm
+    const float minSelectionRadius = 0.4f;
+    const float selectionSize = std::max(minSelectionRadius, aabb.GetRadius());
+
+    // Move camera 25% further back than required
+    const float centerScale = 1.25f;
+
+    // Decompose original transform matrix
+    const Matrix34& originalTM = GetViewTM();
+    AffineParts affineParts;
+    affineParts.SpectralDecompose(originalTM);
+
+    // Forward vector is y component of rotation matrix
+    Matrix33 rotationMatrix(affineParts.rot);
+    const Vec3 viewDirection = rotationMatrix.GetColumn1().GetNormalized();
+
+    // Compute adjustment required by FOV != 90 degrees
+    const float fov = GetFOV();
+    const float fovScale = (1.0f / tan(fov * 0.5f));
+
+    // Compute new transform matrix
+    const float distanceToTarget = selectionSize * fovScale * centerScale;
+    const Vec3 newPosition = selectionCenter - (viewDirection * distanceToTarget);
+    Matrix34 newTM = Matrix34(rotationMatrix, newPosition);
+
+    // Set new orbit distance
+    m_orbitDistance = distanceToTarget;
+    m_orbitDistance = fabs(m_orbitDistance);
+
+    SetViewTM(newTM);
+    SandboxEditor::OrbitCameraControlsBus::Event(GetViewportId(), &SandboxEditor::OrbitCameraControlsBus::Events::SetOrbitDistance, m_orbitDistance);
+}
+
+void EditorViewportWidget::CenterOnSliceInstance()
+{
+    AzToolsFramework::EntityIdList selectedEntityList;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    AZ::SliceComponent::SliceInstanceAddress sliceAddress;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(sliceAddress,
+        &AzToolsFramework::ToolsApplicationRequestBus::Events::FindCommonSliceInstanceAddress, selectedEntityList);
+
+    if (!sliceAddress.IsValid())
+    {
+        return;
+    }
+
+    AZ::EntityId sliceRootEntityId;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(sliceRootEntityId,
+        &AzToolsFramework::ToolsApplicationRequestBus::Events::GetRootEntityIdOfSliceInstance, sliceAddress);
+
+    if (!sliceRootEntityId.IsValid())
+    {
+        return;
+    }
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList{sliceRootEntityId});
+
+    const AZ::SliceComponent::InstantiatedContainer* instantiatedContainer = sliceAddress.GetInstance()->GetInstantiated();
+
+    AABB aabb(Vec3(std::numeric_limits<float>::max()), Vec3(-std::numeric_limits<float>::max()));
+    for (AZ::Entity* entity : instantiatedContainer->m_entities)
+    {
+        CEntityObject* entityObject = nullptr;
+        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(entityObject, entity->GetId(),
+            &AzToolsFramework::ComponentEntityEditorRequestBus::Events::GetSandboxObject);
+        AABB box;
+        entityObject->GetBoundBox(box);
+        aabb.Add(box.min);
+        aabb.Add(box.max);
+    }
+    CenterOnAABB(aabb);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::SetFOV(float fov)
+{
+    if (m_pCameraFOVVariable)
+    {
+        m_pCameraFOVVariable->Set(fov);
+    }
+    else
+    {
+        m_camFOV = fov;
+    }
+
+    if (m_viewPane)
+    {
+        m_viewPane->OnFOVChanged(fov);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float EditorViewportWidget::GetFOV() const
+{
+    if (m_viewSourceType == ViewSourceType::SequenceCamera)
+    {
+        CBaseObject* cameraObject = GetCameraObject();
+
+        AZ::EntityId cameraEntityId;
+        AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(cameraEntityId, cameraObject, &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
+        if (cameraEntityId.IsValid())
+        {
+            // component Camera
+            float fov = DEFAULT_FOV;
+            Camera::CameraRequestBus::EventResult(fov, cameraEntityId, &Camera::CameraComponentRequests::GetFov);
+            return AZ::DegToRad(fov);
+        }
+    }
+
+    if (m_pCameraFOVVariable)
+    {
+        float fov;
+        m_pCameraFOVVariable->Get(fov);
+        return fov;
+    }
+    else if (m_viewEntityId.IsValid())
+    {
+        float fov = AZ::RadToDeg(m_camFOV);
+        Camera::CameraRequestBus::EventResult(fov, m_viewEntityId, &Camera::CameraComponentRequests::GetFov);
+        return AZ::DegToRad(fov);
+    }
+
+    return m_camFOV;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::CreateRenderContext()
+{
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::DestroyRenderContext()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::SetDefaultCamera()
+{
+    if (IsDefaultCamera())
+    {
+        return;
+    }
+    ResetToViewSourceType(ViewSourceType::None);
+    GetViewManager()->SetCameraObjectId(m_cameraObjectId);
+    SetName(m_defaultViewName);
+    SetViewTM(m_defaultViewTM);
+    PostCameraSet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::IsDefaultCamera() const
+{
+    return m_viewSourceType == ViewSourceType::None;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::SetSequenceCamera()
+{
+    if (m_viewSourceType == ViewSourceType::SequenceCamera)
+    {
+        // Reset if we were checked before
+        SetDefaultCamera();
+    }
+    else
+    {
+        ResetToViewSourceType(ViewSourceType::SequenceCamera);
+
+        SetName(tr("Sequence Camera"));
+        SetViewTM(GetViewTM());
+
+        GetViewManager()->SetCameraObjectId(m_cameraObjectId);
+        PostCameraSet();
+
+        // ForceAnimation() so Track View will set the Camera params
+        // if a camera is animated in the sequences.
+        if (GetIEditor() && GetIEditor()->GetAnimation())
+        {
+            GetIEditor()->GetAnimation()->ForceAnimation();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::SetComponentCamera(const AZ::EntityId& entityId)
+{
+    ResetToViewSourceType(ViewSourceType::CameraComponent);
+    SetViewEntity(entityId);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement)
+{
+    ResetToViewSourceType(ViewSourceType::AZ_Entity);
+    SetViewEntity(entityId, lockCameraMovement);
+}
+
+void EditorViewportWidget::SetFirstComponentCamera()
+{
+    AZ::EBusAggregateResults<AZ::EntityId> results;
+    Camera::CameraBus::BroadcastResult(results, &Camera::CameraRequests::GetCameras);
+    AZStd::sort_heap(results.values.begin(), results.values.end());
+    AZ::EntityId entityId;
+    if (results.values.size() > 0)
+    {
+        entityId = results.values[0];
+    }
+    SetComponentCamera(entityId);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::SetSelectedCamera()
+{
+    AZ::EBusAggregateResults<AZ::EntityId> cameraList;
+    Camera::CameraBus::BroadcastResult(cameraList, &Camera::CameraRequests::GetCameras);
+    if (cameraList.values.size() > 0)
+    {
+        AzToolsFramework::EntityIdList selectedEntityList;
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        for (const AZ::EntityId& entityId : selectedEntityList)
+        {
+            if (AZStd::find(cameraList.values.begin(), cameraList.values.end(), entityId) != cameraList.values.end())
+            {
+                SetComponentCamera(entityId);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::IsSelectedCamera() const
+{
+    CBaseObject* pCameraObject = GetCameraObject();
+    if (pCameraObject && pCameraObject == GetIEditor()->GetSelectedObject())
+    {
+        return true;
+    }
+
+    AzToolsFramework::EntityIdList selectedEntityList;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    if ((m_viewSourceType == ViewSourceType::CameraComponent  || m_viewSourceType == ViewSourceType::AZ_Entity)
+        && !selectedEntityList.empty()
+        && AZStd::find(selectedEntityList.begin(), selectedEntityList.end(), m_viewEntityId) != selectedEntityList.end())
+    {
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::CycleCamera()
+{
+    // None -> Sequence -> LegacyCamera -> ... LegacyCamera -> CameraComponent -> ... CameraComponent -> None
+    // AZ_Entity has been intentionally left out of the cycle for now.
+    switch (m_viewSourceType)
+    {
+    case EditorViewportWidget::ViewSourceType::None:
+    {
+        SetFirstComponentCamera();
+        break;
+    }
+    case EditorViewportWidget::ViewSourceType::SequenceCamera:
+    {
+        AZ_Error("EditorViewportWidget", false, "Legacy cameras no longer exist, unable to set sequence camera.");
+        break;
+    }
+    case EditorViewportWidget::ViewSourceType::LegacyCamera:
+    {
+        AZ_Warning("EditorViewportWidget", false, "Legacy cameras no longer exist, using first found component camera instead.");
+        SetFirstComponentCamera();
+        break;
+    }
+    case EditorViewportWidget::ViewSourceType::CameraComponent:
+    {
+        AZ::EBusAggregateResults<AZ::EntityId> results;
+        Camera::CameraBus::BroadcastResult(results, &Camera::CameraRequests::GetCameras);
+        AZStd::sort_heap(results.values.begin(), results.values.end());
+        auto&& currentCameraIterator = AZStd::find(results.values.begin(), results.values.end(), m_viewEntityId);
+        if (currentCameraIterator != results.values.end())
+        {
+            ++currentCameraIterator;
+            if (currentCameraIterator != results.values.end())
+            {
+                SetComponentCamera(*currentCameraIterator);
+                break;
+            }
+        }
+        SetDefaultCamera();
+        break;
+    }
+    case EditorViewportWidget::ViewSourceType::AZ_Entity:
+    {
+        // we may decide to have this iterate over just selected entities
+        SetDefaultCamera();
+        break;
+    }
+    default:
+    {
+        SetDefaultCamera();
+        break;
+    }
+    }
+}
+
+void EditorViewportWidget::SetViewFromEntityPerspective(const AZ::EntityId& entityId)
+{
+    SetViewAndMovementLockFromEntityPerspective(entityId, false);
+}
+
+void EditorViewportWidget::SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement)
+{
+    if (!m_ignoreSetViewFromEntityPerspective)
+    {
+        SetEntityAsCamera(entityId, lockCameraMovement);
+    }
+}
+
+bool EditorViewportWidget::GetActiveCameraPosition(AZ::Vector3& cameraPos)
+{
+    if (m_pPrimaryViewport == this)
+    {
+        if (GetIEditor()->IsInGameMode())
+        {
+            cameraPos = m_renderViewport->GetViewportContext()->GetCameraTransform().GetTranslation();
+        }
+        else
+        {
+            // Use viewTM, which is synced with the camera and guaranteed to be up-to-date
+            cameraPos = LYVec3ToAZVec3(m_viewTM.GetTranslation());
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+bool EditorViewportWidget::GetActiveCameraState(AzFramework::CameraState& cameraState)
+{
+    if (m_pPrimaryViewport == this)
+    {
+        cameraState = GetCameraState();
+
+        return true;
+    }
+
+    return false;
+}
+
+void EditorViewportWidget::OnStartPlayInEditor()
+{
+    if (m_viewEntityId.IsValid())
+    {
+        m_viewEntityIdCachedForEditMode = m_viewEntityId;
+        AZ::EntityId runtimeEntityId;
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
+            &AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId,
+            m_viewEntityId, runtimeEntityId);
+
+        m_viewEntityId = runtimeEntityId;
+    }
+}
+
+void EditorViewportWidget::OnStopPlayInEditor()
+{
+    if (m_viewEntityIdCachedForEditMode.IsValid())
+    {
+        m_viewEntityId = m_viewEntityIdCachedForEditMode;
+        m_viewEntityIdCachedForEditMode.SetInvalid();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::OnCameraFOVVariableChanged([[maybe_unused]] IVariable* var)
+{
+    if (m_viewPane)
+    {
+        m_viewPane->OnFOVChanged(GetFOV());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::HideCursor()
+{
+    if (m_bCursorHidden || !gSettings.viewports.bHideMouseCursorWhenCaptured)
+    {
+        return;
+    }
+
+    qApp->setOverrideCursor(Qt::BlankCursor);
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    StartFixedCursorMode(this);
+#endif
+    m_bCursorHidden = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::ShowCursor()
+{
+    if (!m_bCursorHidden || !gSettings.viewports.bHideMouseCursorWhenCaptured)
+    {
+        return;
+    }
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    StopFixedCursorMode();
+#endif
+    qApp->restoreOverrideCursor();
+    m_bCursorHidden = false;
+}
+
+bool EditorViewportWidget::IsKeyDown(Qt::Key key) const
+{
+    return m_keyDown.contains(key);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::PushDisableRendering()
+{
+    assert(m_disableRenderingCount >= 0);
+    ++m_disableRenderingCount;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::PopDisableRendering()
+{
+    assert(m_disableRenderingCount >= 1);
+    --m_disableRenderingCount;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool EditorViewportWidget::IsRenderingDisabled() const
+{
+    return m_disableRenderingCount > 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint EditorViewportWidget::WidgetToViewport(const QPoint& point) const
+{
+    return point * WidgetToViewportFactor();
+}
+
+QPoint EditorViewportWidget::ViewportToWidget(const QPoint& point) const
+{
+    return point / WidgetToViewportFactor();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QSize EditorViewportWidget::WidgetToViewport(const QSize& size) const
+{
+    return size * WidgetToViewportFactor();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::BeginUndoTransaction()
+{
+    PushDisableRendering();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void EditorViewportWidget::EndUndoTransaction()
+{
+    PopDisableRendering();
+    Update();
+}
+
+void EditorViewportWidget::UpdateCurrentMousePos(const QPoint& newPosition)
+{
+    m_prevMousePos = m_mousePos;
+    m_mousePos = newPosition;
+}
+
+void* EditorViewportWidget::GetSystemCursorConstraintWindow() const
+{
+    AzFramework::SystemCursorState systemCursorState = AzFramework::SystemCursorState::Unknown;
+
+    AzFramework::InputSystemCursorRequestBus::EventResult(
+        systemCursorState, AzFramework::InputDeviceMouse::Id, &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
+
+    const bool systemCursorConstrained =
+        (systemCursorState == AzFramework::SystemCursorState::ConstrainedAndHidden ||
+         systemCursorState == AzFramework::SystemCursorState::ConstrainedAndVisible);
+
+    return systemCursorConstrained ? renderOverlayHWND() : nullptr;
+}
+
+void EditorViewportWidget::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt)
+{
+    const auto scaledPoint = WidgetToViewport(pt);
+    QtViewport::BuildDragDropContext(context, scaledPoint);
+}
+
+void EditorViewportWidget::RestoreViewportAfterGameMode()
+{
+    Matrix34 preGameModeViewTM = m_preGameModeViewTM;
+
+    QString text = QString("You are exiting Game Mode. Would you like to restore the camera in the viewport to where it was before you entered Game Mode?<br/><br/><small>This option can always be changed in the General Preferences tab of the Editor Settings, by toggling the \"%1\" option.</small><br/><br/>").arg(EditorPreferencesGeneralRestoreViewportCameraSettingName);
+    QString restoreOnExitGameModePopupDisabledRegKey("Editor/AutoHide/ViewportCameraRestoreOnExitGameMode");
+
+    // Read the popup disabled registry value
+    QSettings settings;
+    QVariant restoreOnExitGameModePopupDisabledRegValue = settings.value(restoreOnExitGameModePopupDisabledRegKey);
+
+    // Has the user previously disabled being asked about restoring the camera on exiting game mode?
+    if (restoreOnExitGameModePopupDisabledRegValue.isNull())
+    {
+        // No, ask them now
+        QMessageBox messageBox(QMessageBox::Question, "O3DE", text, QMessageBox::StandardButtons(QMessageBox::No | QMessageBox::Yes), this);
+        messageBox.setDefaultButton(QMessageBox::Yes);
+
+        QCheckBox* checkBox = new QCheckBox(QStringLiteral("Do not show this message again"));
+        messageBox.setCheckBox(checkBox);
+
+        // Unconstrain the system cursor and make it visible before we show the dialog box, otherwise the user can't see the cursor.
+        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+            AzFramework::SystemCursorState::UnconstrainedAndVisible);
+
+        int response = messageBox.exec();
+
+        if (checkBox->isChecked())
+        {
+            settings.setValue(restoreOnExitGameModePopupDisabledRegKey, response);
+        }
+
+        // Update the value only if the popup hasn't previously been disabled and the value has changed
+        bool newSetting = (response == QMessageBox::Yes);
+        if (newSetting != GetIEditor()->GetEditorSettings()->restoreViewportCamera)
+        {
+            GetIEditor()->GetEditorSettings()->restoreViewportCamera = newSetting;
+            GetIEditor()->GetEditorSettings()->Save();
+        }
+    }
+
+    bool restoreViewportCamera = GetIEditor()->GetEditorSettings()->restoreViewportCamera;
+    if (restoreViewportCamera)
+    {
+        SetViewTM(preGameModeViewTM);
+    }
+    else
+    {
+        SetViewTM(m_gameTM);
+    }
+}
+
+void EditorViewportWidget::UpdateScene()
+{
+    auto sceneSystem = AzFramework::SceneSystemInterface::Get();
+    if (sceneSystem)
+    {
+        AZStd::shared_ptr<AzFramework::Scene> mainScene = sceneSystem->GetScene(AzFramework::Scene::MainSceneName);
+        if (mainScene)
+        {
+            AZ::RPI::SceneNotificationBus::Handler::BusDisconnect();
+            m_renderViewport->SetScene(mainScene);
+            AZ::RPI::SceneNotificationBus::Handler::BusConnect(m_renderViewport->GetViewportContext()->GetRenderScene()->GetId());
+        }
+    }
+}
+
+void EditorViewportWidget::UpdateCameraFromViewportContext()
+{
+   // Queue a sync for the next tick, to ensure the latest version of the viewport context transform is used
+    m_updateCameraPositionNextTick = true;
+}
+
+void EditorViewportWidget::SetAsActiveViewport()
+{
+    auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
+
+    const AZ::Name defaultContextName = viewportContextManager->GetDefaultViewportContextName();
+
+    // If another viewport was active before, restore its name to its per-ID one.
+    if (m_pPrimaryViewport && m_pPrimaryViewport != this && m_pPrimaryViewport->m_renderViewport)
+    {
+        auto viewportContext = m_pPrimaryViewport->m_renderViewport->GetViewportContext();
+        if (viewportContext)
+        {
+            // Remove the old viewport's camera from the stack, as it's no longer the owning viewport
+            viewportContextManager->PopView(defaultContextName, viewportContext->GetDefaultView());
+            viewportContextManager->RenameViewportContext(viewportContext, m_pPrimaryViewport->m_defaultViewportContextName);
+        }
+    }
+
+    m_pPrimaryViewport = this;
+    if (m_renderViewport)
+    {
+        auto viewportContext = m_renderViewport->GetViewportContext();
+        if (viewportContext)
+        {
+            // Push our camera onto the default viewport's view stack to preserve camera state continuity
+            // Other views can still be pushed on top of our view for e.g. game mode
+            viewportContextManager->PushView(defaultContextName, viewportContext->GetDefaultView());
+            viewportContextManager->RenameViewportContext(viewportContext, defaultContextName);
+        }
+    }
+}
+
+bool EditorViewportSettings::GridSnappingEnabled() const
+{
+    return SandboxEditor::GridSnappingEnabled();
+}
+
+float EditorViewportSettings::GridSize() const
+{
+    return SandboxEditor::GridSnappingSize();
+}
+
+bool EditorViewportSettings::ShowGrid() const
+{
+    return SandboxEditor::ShowingGrid();
+}
+
+bool EditorViewportSettings::AngleSnappingEnabled() const
+{
+    return SandboxEditor::AngleSnappingEnabled();
+}
+
+float EditorViewportSettings::AngleStep() const
+{
+    return SandboxEditor::AngleSnappingSize();
+}
+
+AZ_CVAR_EXTERNED(bool, ed_previewGameInFullscreen_once);
+
+bool EditorViewportWidget::ShouldPreviewFullscreen() const
+{
+    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+    if (!layout)
+    {
+        AZ_Assert(false, "CRenderViewport: No View Manager layout");
+        return false;
+    }
+
+    // Doesn't work with split layout
+    if (layout->GetLayout() != EViewLayout::ET_Layout0)
+    {
+        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())
+    {
+        if (!ge->IsLevelLoaded())
+        {
+            return false;
+        }
+    }
+
+    // Check 'ed_previewGameInFullscreen_once'
+    if (ed_previewGameInFullscreen_once)
+    {
+        ed_previewGameInFullscreen_once = false;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+void EditorViewportWidget::StartFullscreenPreview()
+{
+    AZ_Assert(!m_inFullscreenPreview, "EditorViewportWidget::StartFullscreenPreview called when already in full screen preview");
+    m_inFullscreenPreview = true;
+
+    // Pick the screen on which the main window lies to use as the screen for the full screen preview
+    const QScreen* screen = MainWindow::instance()->screen();
+    const QRect screenGeometry = screen->geometry();
+
+    // Unparent this and show it, which turns it into a free floating window
+    // Also set style to frameless and disable resizing by user
+    setParent(nullptr);
+    setWindowFlag(Qt::FramelessWindowHint, true);
+    setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, true);
+    setFixedSize(screenGeometry.size());
+    move(QPoint(screenGeometry.x(), screenGeometry.y()));
+    showMaximized();
+
+    // This must be done after unparenting this widget above
+    MainWindow::instance()->hide();
+}
+
+void EditorViewportWidget::StopFullscreenPreview()
+{
+    AZ_Assert(m_inFullscreenPreview, "EditorViewportWidget::StartFullscreenPreview called when not in full screen preview");
+    m_inFullscreenPreview = false;
+
+    // Unset frameless window flags
+    setWindowFlag(Qt::FramelessWindowHint, false);
+    setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, false);
+
+    // Unset fixed size (note that 50x50 is the minimum set in the constructor)
+    setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+    setMinimumSize(50, 50);
+
+    // Attach this viewport to the primary view pane (whose index is 0).
+    if (CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout())
+    {
+        if (CLayoutViewPane* viewPane = layout->GetViewPaneByIndex(0))
+        {
+            // Force-reattach this viewport to its view pane by first detaching
+            viewPane->DetachViewport();
+            viewPane->AttachViewport(this);
+
+            // Set the main widget of the layout, which causes this widgets size to be bound to the layout
+            // and the viewport title bar to be displayed
+            layout->SetMainWidget(viewPane);
+        }
+        else
+        {
+            AZ_Assert(false, "CRenderViewport: No view pane with ID 0 (primary view pane)");
+        }
+    }
+    else
+    {
+        AZ_Assert(false, "CRenderViewport: No View Manager layout");
+    }
+
+    // Set this as the selected viewport
+    GetIEditor()->GetViewManager()->SelectViewport(this);
+
+    // Show this widget (setting flags may hide it)
+    showNormal();
+
+    // Show the main window
+    MainWindow::instance()->show();
+}
+
+#include <moc_EditorViewportWidget.cpp>
diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h
new file mode 100644
index 0000000000..a395ef50a4
--- /dev/null
+++ b/Code/Editor/EditorViewportWidget.h
@@ -0,0 +1,594 @@
+/*
+ * 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
+// RenderViewport.h : header file
+//
+
+#if !defined(Q_MOC_RUN)
+#include <Cry_Camera.h>
+
+#include <QSet>
+
+#include "Viewport.h"
+#include "Objects/DisplayContext.h"
+#include "Undo/Undo.h"
+#include "Util/PredefinedAspectRatios.h"
+#include "EditorViewportSettings.h"
+
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/std/optional.h>
+#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
+#include <AzFramework/Asset/AssetCatalogBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/EditorCameraBus.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <MathConversion.h>
+#include <Atom/RPI.Public/ViewportContext.h>
+#include <Atom/RPI.Public/SceneBus.h>
+#endif
+
+#include <AzFramework/Windowing/WindowBus.h>
+#include <AzFramework/Visibility/EntityVisibilityQuery.h>
+
+// forward declarations.
+class CBaseObject;
+class QMenu;
+class QKeyEvent;
+struct ray_hit;
+struct IRenderMesh;
+struct IVariable;
+
+namespace AZ::ViewportHelpers
+{
+    class EditorEntityNotifications;
+} //namespace AZ::ViewportHelpers
+
+namespace AtomToolsFramework
+{
+    class RenderViewportWidget;
+}
+
+namespace AzToolsFramework
+{
+    class ManipulatorManager;
+}
+
+// EditorViewportWidget window
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+class SANDBOX_API EditorViewportWidget
+    : public QtViewport
+    , public IEditorNotifyListener
+    , public IUndoManagerListener
+    , public Camera::EditorCameraRequestBus::Handler
+    , public AzFramework::InputSystemCursorConstraintRequestBus::Handler
+    , public AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler
+    , public AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler
+    , public AzFramework::AssetCatalogEventBus::Handler
+    , public AZ::RPI::SceneNotificationBus::Handler
+{
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    Q_OBJECT
+public:
+    struct SResolution
+    {
+        SResolution()
+            : width(0)
+            , height(0)
+        {
+        }
+
+        SResolution(int w, int h)
+            : width(w)
+            , height(h)
+        {
+        }
+
+        int width;
+        int height;
+    };
+
+public:
+    EditorViewportWidget(const QString& name, QWidget* parent = nullptr);
+
+    static const GUID& GetClassID()
+    {
+        return QtViewport::GetClassID<EditorViewportWidget>();
+    }
+
+    /** Get type of this viewport.
+    */
+    virtual EViewportType GetType() const { return ET_ViewportCamera; }
+    virtual void SetType([[maybe_unused]] EViewportType type) { assert(type == ET_ViewportCamera); };
+
+    virtual ~EditorViewportWidget();
+
+    Q_INVOKABLE void InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons);
+
+    // Replacement for still used CRenderer methods
+    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;
+
+public:
+    virtual void Update();
+
+    virtual void ResetContent();
+    virtual void UpdateContent(int flags);
+
+    void OnTitleMenu(QMenu* menu) override;
+
+    void SetCamera(const CCamera& camera);
+    const CCamera& GetCamera() const { return m_Camera; };
+    virtual void SetViewTM(const Matrix34& tm)
+    {
+        if (m_viewSourceType == ViewSourceType::None)
+        {
+            m_defaultViewTM = tm;
+        }
+        SetViewTM(tm, false);
+    }
+
+    //! Map world space position to viewport position.
+    virtual QPoint WorldToView(const Vec3& wp) const;
+    virtual QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const;
+    virtual Vec3 WorldToView3D(const Vec3& wp, int nFlags = 0) const;
+
+    //! Map viewport position to world space position.
+    virtual Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
+    virtual void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
+    virtual Vec3 ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
+    virtual float GetScreenScaleFactor(const Vec3& worldPoint) const;
+    virtual float GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position);
+    virtual float GetAspectRatio() const;
+    virtual bool HitTest(const QPoint& point, HitContext& hitInfo);
+    virtual bool IsBoundsVisible(const AABB& box) const;
+    virtual void CenterOnSelection();
+    virtual void CenterOnAABB(const AABB& aabb);
+    void CenterOnSliceInstance() override;
+
+    void focusOutEvent(QFocusEvent* event) override;
+    void keyPressEvent(QKeyEvent* event) override;
+
+    void SetFOV(float fov);
+    float GetFOV() const;
+
+    void SetDefaultCamera();
+    bool IsDefaultCamera() const;
+    void SetSequenceCamera();
+    bool IsSequenceCamera() const { return m_viewSourceType == ViewSourceType::SequenceCamera; }
+    void SetSelectedCamera();
+    bool IsSelectedCamera() const;
+    void SetComponentCamera(const AZ::EntityId& entityId);
+    void SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement = false);
+    void SetFirstComponentCamera();
+    void SetViewEntity(const AZ::EntityId& cameraEntityId, bool lockCameraMovement = false);
+    void PostCameraSet();
+    // This switches the active camera to the next one in the list of (default, all custom cams).
+    void CycleCamera();
+
+    // Camera::EditorCameraRequestBus
+    void SetViewFromEntityPerspective(const AZ::EntityId& entityId) override;
+    void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
+    AZ::EntityId GetCurrentViewEntityId() override { return m_viewEntityId; }
+    bool GetActiveCameraPosition(AZ::Vector3& cameraPos) override;
+    bool GetActiveCameraState(AzFramework::CameraState& cameraState) override;
+
+    // AzToolsFramework::EditorEntityContextNotificationBus (handler moved to cpp to resolve link issues in unity builds)
+    virtual void OnStartPlayInEditor();
+    virtual void OnStopPlayInEditor();
+
+    AzFramework::CameraState GetCameraState();
+    AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
+
+    // AzToolsFramework::ViewportFreezeRequestBus
+    bool IsViewportInputFrozen() override;
+    void FreezeViewportInput(bool freeze) override;
+
+    // AzToolsFramework::MainEditorViewportInteractionRequestBus
+    AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) override;
+    AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override;
+    float TerrainHeight(const AZ::Vector2& position) override;
+    void FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut) override;
+    bool ShowingWorldSpace() override;
+    QWidget* GetWidgetForViewportContextMenu() override;
+    void BeginWidgetContext() override;
+    void EndWidgetContext() override;
+
+    // CViewport...
+    void SetViewportId(int id) override;
+
+    void ConnectViewportInteractionRequestBus();
+    void DisconnectViewportInteractionRequestBus();
+
+    void LockCameraMovement(bool bLock) { m_bLockCameraMovement = bLock; }
+    bool IsCameraMovementLocked() const { return m_bLockCameraMovement; }
+
+    void EnableCameraObjectMove(bool bMove) { m_bMoveCameraObject = bMove; }
+    bool IsCameraObjectMove() const { return m_bMoveCameraObject; }
+
+    void SetPlayerControl(uint32 i) { m_PlayerControl = i; };
+    uint32 GetPlayerControl() { return m_PlayerControl; };
+
+    const DisplayContext& GetDisplayContext() const { return m_displayContext; }
+    CBaseObject* GetCameraObject() const;
+
+    QPoint WidgetToViewport(const QPoint& point) const;
+    QPoint ViewportToWidget(const QPoint& point) const;
+    QSize WidgetToViewport(const QSize& size) const;
+
+    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+
+    void SetPlayerPos()
+    {
+        Matrix34 m = GetViewTM();
+        m.SetTranslation(m.GetTranslation() - m_PhysicalLocation.t);
+        SetViewTM(m);
+
+        m_AverageFrameTime = 0.14f;
+
+        m_PhysicalLocation.SetIdentity();
+
+        m_LocalEntityMat.SetIdentity();
+        m_PrevLocalEntityMat.SetIdentity();
+
+        m_absCameraHigh = 2.0f;
+        m_absCameraPos = Vec3(0, 3, 2);
+        m_absCameraPosVP = Vec3(0, -3, 1.5);
+
+        m_absCurrentSlope = 0.0f;
+
+        m_absLookDirectionXY = Vec2(0, 1);
+
+        m_LookAt = Vec3(ZERO);
+        m_LookAtRate = Vec3(ZERO);
+        m_vCamPos = Vec3(ZERO);
+        m_vCamPosRate = Vec3(ZERO);
+
+        m_relCameraRotX = 0;
+        m_relCameraRotZ = 0;
+
+        uint32 numSample6 = m_arrAnimatedCharacterPath.size();
+        for (uint32 i = 0; i < numSample6; i++)
+        {
+            m_arrAnimatedCharacterPath[i] = Vec3(ZERO);
+        }
+
+        numSample6 = m_arrSmoothEntityPath.size();
+        for (uint32 i = 0; i < numSample6; i++)
+        {
+            m_arrSmoothEntityPath[i] = Vec3(ZERO);
+        }
+
+        uint32 numSample7 = m_arrRunStrafeSmoothing.size();
+        for (uint32 i = 0; i < numSample7; i++)
+        {
+            m_arrRunStrafeSmoothing[i] = 0;
+        }
+
+        m_vWorldDesiredBodyDirection = Vec2(0, 1);
+        m_vWorldDesiredBodyDirectionSmooth = Vec2(0, 1);
+        m_vWorldDesiredBodyDirectionSmoothRate = Vec2(0, 1);
+
+        m_vWorldDesiredBodyDirection2 = Vec2(0, 1);
+
+        m_vWorldDesiredMoveDirection = Vec2(0, 1);
+        m_vWorldDesiredMoveDirectionSmooth = Vec2(0, 1);
+        m_vWorldDesiredMoveDirectionSmoothRate = Vec2(0, 1);
+        m_vLocalDesiredMoveDirection = Vec2(0, 1);
+        m_vLocalDesiredMoveDirectionSmooth = Vec2(0, 1);
+        m_vLocalDesiredMoveDirectionSmoothRate = Vec2(0, 1);
+
+        m_vWorldAimBodyDirection = Vec2(0, 1);
+
+        m_MoveSpeedMSec = 5.0f;
+        m_key_W = 0;
+        m_keyrcr_W = 0;
+        m_key_S = 0;
+        m_keyrcr_S = 0;
+        m_key_A = 0;
+        m_keyrcr_A = 0;
+        m_key_D = 0;
+        m_keyrcr_D = 0;
+        m_key_SPACE = 0;
+        m_keyrcr_SPACE = 0;
+        m_ControllMode = 0;
+
+        m_State = -1;
+        m_Stance = 1; //combat
+
+        m_udGround = 0.0f;
+        m_lrGround = 0.0f;
+        AABB aabb = AABB(Vec3(-40.0f, -40.0f, -0.25f), Vec3(+40.0f, +40.0f, +0.0f));
+        m_GroundOBB = OBB::CreateOBBfromAABB(Matrix33(IDENTITY), aabb);
+        m_GroundOBBPos = Vec3(0, 0, -0.01f);
+    };
+
+    static EditorViewportWidget* GetPrimaryViewport();
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    CCamera m_Camera;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+protected:
+    struct SScopedCurrentContext;
+
+    void SetViewTM(const Matrix34& tm, bool bMoveOnly);
+
+    // Called to render stuff.
+    virtual void OnRender();
+
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
+
+    //! Get currently active camera object.
+    void ToggleCameraObject();
+
+    void RenderConstructionPlane();
+    void RenderSnapMarker();
+
+    void RenderAll();
+
+    void OnBeginPrepareRender() override;
+
+    // Update the safe frame, safe action, safe title, and borders rectangles based on
+    // viewport size and target aspect ratio.
+    void UpdateSafeFrame();
+
+    // Draw safe frame, safe action, safe title rectangles and borders.
+    void RenderSafeFrame();
+
+    // Draw one of the safe frame rectangles with the desired color.
+    void RenderSafeFrame(const QRect& frame, float r, float g, float b, float a);
+
+    // Draw a selected region if it has been selected
+    void RenderSelectedRegion();
+
+    virtual bool CreateRenderContext();
+    virtual void DestroyRenderContext();
+
+    void OnMenuCommandChangeAspectRatio(unsigned int commandId);
+
+    bool AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const;
+    bool RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal) const;
+
+    bool AddCameraMenuItems(QMenu* menu);
+    void ResizeView(int width, int height);
+
+    void OnCameraFOVVariableChanged(IVariable* var);
+
+    void HideCursor();
+    void ShowCursor();
+
+    bool IsKeyDown(Qt::Key key) const;
+
+    enum class ViewSourceType
+    {
+        None,
+        SequenceCamera,
+        LegacyCamera,
+        CameraComponent,
+        AZ_Entity,
+        ViewSourceTypesCount,
+    };
+    void ResetToViewSourceType(const ViewSourceType& viewSourType);
+
+    bool ShouldPreviewFullscreen() const;
+    void StartFullscreenPreview();
+    void StopFullscreenPreview();
+
+    bool m_inFullscreenPreview = false;
+    bool m_bRenderContextCreated = false;
+    bool m_bInRotateMode = false;
+    bool m_bInMoveMode = false;
+    bool m_bInOrbitMode = false;
+    bool m_bInZoomMode = false;
+
+    QPoint m_mousePos = QPoint(0, 0);
+    QPoint m_prevMousePos = QPoint(0, 0);  // for tablets, you can't use SetCursorPos and need to remember the prior point and delta with that.
+
+
+    float m_moveSpeed = 1;
+
+    float m_orbitDistance = 10.0f;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Vec3 m_orbitTarget;
+
+    //-------------------------------------------
+    //---   player-control in CharEdit        ---
+    //-------------------------------------------
+    f32 m_MoveSpeedMSec;
+
+    uint32 m_key_W, m_keyrcr_W;
+    uint32 m_key_S, m_keyrcr_S;
+    uint32 m_key_A, m_keyrcr_A;
+    uint32 m_key_D, m_keyrcr_D;
+
+    uint32 m_key_SPACE, m_keyrcr_SPACE;
+    uint32 m_ControllMode;
+
+    int32 m_Stance;
+    int32 m_State;
+    f32 m_AverageFrameTime;
+
+    uint32 m_PlayerControl = 0;
+
+    f32 m_absCameraHigh;
+    Vec3 m_absCameraPos;
+    Vec3 m_absCameraPosVP;
+
+    f32  m_absCurrentSlope;  //in radiants
+
+    Vec2 m_absLookDirectionXY;
+
+    Vec3 m_LookAt;
+    Vec3 m_LookAtRate;
+    Vec3 m_vCamPos;
+    Vec3 m_vCamPosRate;
+    float m_camFOV;
+
+    f32 m_relCameraRotX;
+    f32 m_relCameraRotZ;
+
+    QuatTS m_PhysicalLocation;
+
+    Matrix34 m_AnimatedCharacterMat;
+
+    Matrix34 m_LocalEntityMat;  //this is used for data-driven animations where the character is running on the spot
+    Matrix34 m_PrevLocalEntityMat;
+
+    std::vector<Vec3> m_arrVerticesHF;
+    std::vector<vtx_idx> m_arrIndicesHF;
+
+    std::vector<Vec3> m_arrAnimatedCharacterPath;
+    std::vector<Vec3> m_arrSmoothEntityPath;
+    std::vector<f32> m_arrRunStrafeSmoothing;
+
+    Vec2 m_vWorldDesiredBodyDirection;
+    Vec2 m_vWorldDesiredBodyDirectionSmooth;
+    Vec2 m_vWorldDesiredBodyDirectionSmoothRate;
+
+    Vec2 m_vWorldDesiredBodyDirection2;
+
+
+    Vec2 m_vWorldDesiredMoveDirection;
+    Vec2 m_vWorldDesiredMoveDirectionSmooth;
+    Vec2 m_vWorldDesiredMoveDirectionSmoothRate;
+    Vec2 m_vLocalDesiredMoveDirection;
+    Vec2 m_vLocalDesiredMoveDirectionSmooth;
+    Vec2 m_vLocalDesiredMoveDirectionSmoothRate;
+    Vec2 m_vWorldAimBodyDirection;
+
+    f32 m_udGround;
+    f32 m_lrGround;
+    OBB m_GroundOBB;
+    Vec3 m_GroundOBBPos;
+
+    // Index of camera objects.
+    mutable GUID m_cameraObjectId;
+    mutable AZ::EntityId m_viewEntityId;
+    mutable ViewSourceType m_viewSourceType = ViewSourceType::None;
+    AZ::EntityId m_viewEntityIdCachedForEditMode;
+    Matrix34 m_preGameModeViewTM;
+    uint m_disableRenderingCount = 0;
+    bool m_bLockCameraMovement;
+    bool m_bUpdateViewport = false;
+    bool m_bMoveCameraObject = true;
+
+    enum class KeyPressedState
+    {
+        AllUp,
+        PressedThisFrame,
+        PressedInPreviousFrame,
+    };
+    KeyPressedState m_pressedKeyState = KeyPressedState::AllUp;
+
+    Matrix34 m_defaultViewTM;
+    const QString m_defaultViewName;
+
+    DisplayContext m_displayContext;
+
+
+    bool m_isOnPaint = false;
+    static EditorViewportWidget* m_pPrimaryViewport;
+
+    QRect m_safeFrame;
+    QRect m_safeAction;
+    QRect m_safeTitle;
+
+    CPredefinedAspectRatios m_predefinedAspectRatios;
+
+    IVariable* m_pCameraFOVVariable = nullptr;
+    bool m_bCursorHidden = false;
+
+    void OnMenuResolutionCustom();
+    void OnMenuCreateCameraEntityFromCurrentView();
+    void OnMenuSelectCurrentCamera();
+
+    int OnCreate();
+    void resizeEvent(QResizeEvent* event) override;
+    void paintEvent(QPaintEvent* event) override;
+    void mousePressEvent(QMouseEvent* event) override;
+
+    // From a series of input primitives, compose a complete mouse interaction.
+    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteractionInternal(
+        AzToolsFramework::ViewportInteraction::MouseButtons buttons,
+        AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
+        const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const;
+    // Given a point in the viewport, return the pick ray into the scene.
+    // note: The argument passed to parameter **point**, originating
+    // from a Qt event, must first be passed to WidgetToViewport before being
+    // passed to BuildMousePick.
+    AzToolsFramework::ViewportInteraction::MousePick BuildMousePick(const QPoint& point);
+
+    bool event(QEvent* event) override;
+    void OnDestroy();
+
+    bool CheckRespondToInput() const;
+
+    // AzFramework::InputSystemCursorConstraintRequestBus
+    void* GetSystemCursorConstraintWindow() const override;
+
+    void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) override;
+
+private:
+    void SetAsActiveViewport();
+    void PushDisableRendering();
+    void PopDisableRendering();
+    bool IsRenderingDisabled() const;
+    AzToolsFramework::ViewportInteraction::MousePick BuildMousePickInternal(const QPoint& point) const;
+
+    void RestoreViewportAfterGameMode();
+    void UpdateCameraFromViewportContext();
+
+    double WidgetToViewportFactor() const
+    {
+#if defined(AZ_PLATFORM_WINDOWS)
+        // Needed for high DPI mode on windows
+        return devicePixelRatioF();
+#else
+        return 1.0f;
+#endif
+    }
+
+    void BeginUndoTransaction() override;
+    void EndUndoTransaction() override;
+
+    void UpdateCurrentMousePos(const QPoint& newPosition);
+    void UpdateScene();
+
+    AzFramework::EntityVisibilityQuery m_entityVisibilityQuery;
+
+    SandboxEditor::GridSnappingChangedEvent::Handler m_gridSnappingHandler;
+    AZStd::unique_ptr<SandboxEditor::EditorViewportSettingsCallbacks> m_editorViewportSettingsCallbacks;
+
+    QSet<int> m_keyDown;
+
+    bool m_freezeViewportInput = false;
+
+    AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager;
+
+    // Used to prevent circular set camera events
+    bool m_ignoreSetViewFromEntityPerspective = false;
+    bool m_windowResizedEvent = false;
+
+    AZStd::unique_ptr<AZ::ViewportHelpers::EditorEntityNotifications> m_editorEntityNotifications;
+    AtomToolsFramework::RenderViewportWidget* m_renderViewport = nullptr;
+
+    bool m_updateCameraPositionNextTick = false;
+    AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
+    AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraProjectionMatrixChangeHandler;
+    AzFramework::DebugDisplayRequests* m_debugDisplay = nullptr;
+
+    AZ::Name m_defaultViewportContextName;
+
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
diff --git a/Code/Editor/ErrorDialog.cpp b/Code/Editor/ErrorDialog.cpp
new file mode 100644
index 0000000000..182552ac0a
--- /dev/null
+++ b/Code/Editor/ErrorDialog.cpp
@@ -0,0 +1,109 @@
+/*
+ * 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 "ErrorDialog.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_ErrorDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+namespace SandboxEditor
+{
+    ErrorDialog::ErrorDialog(QWidget* parent)
+        : QDialog(parent)
+        , m_ui(new Ui::ErrorLogDialog())
+    {
+        m_ui->setupUi(this);
+        connect(m_ui->okButton, &QPushButton::clicked, this, &ErrorDialog::OnOK);
+        connect(
+            m_ui->messages, 
+            SIGNAL(itemSelectionChanged()), 
+            this, 
+            SLOT(MessageSelectionChanged()));
+    }
+
+    ErrorDialog::~ErrorDialog()
+    {
+    }
+
+    void ErrorDialog::OnOK()
+    {
+        close();
+    }
+
+    void ErrorDialog::AddMessages(MessageType messageType, const AZStd::list<QString>& messages)
+    {
+        AZ_Assert(m_ui != nullptr, "ErrorDialog's AddMessages cannot be used without a valid UI.");
+        for (const QString& message : messages)
+        {
+            // filter out duplicate messages
+            if (m_uniqueStrings.contains(message))
+            {
+                continue;
+            }
+            m_uniqueStrings.insert(message);
+
+            // Attempt to split the message up by newline, so the list of errors can be kept shorter.
+            // This returns a QStringList with one element, the original string, if the split fails.
+            QStringList messageSplitPerLine = message.split('\n');
+
+            QStringList messageList;
+
+            // MessageColumn::MessageType
+            messageList << GetMessageTypeString(messageType);
+            // MessageColumn::ShortMessage
+            messageList << messageSplitPerLine[0];
+            // MessageColumn::DetailedMessage
+            messageList << message;
+
+            // Add the message to the tree widget at the root.
+            m_ui->messages->insertTopLevelItem(0, new QTreeWidgetItem(messageList));
+        }
+    }
+
+    void ErrorDialog::MessageSelectionChanged()
+    {
+        AZ_Assert(m_ui != nullptr, "ErrorDialog's MessageSelectionChanged cannot be used without a valid UI.");
+        AZ_Assert(m_ui->messages != nullptr, "ErrorDialog's MessageSelectionChanged cannot be used without a valid messages QTreeWidget.");
+        AZ_Assert(m_ui->details != nullptr, "ErrorDialog's MessageSelectionChanged cannot be used without a valid details QLabel.");
+        QList<QTreeWidgetItem*> selectedItem = m_ui->messages->selectedItems();
+        
+        QTreeWidgetItem* firstSelected = !selectedItem.isEmpty() ? selectedItem.first() : nullptr;
+        if (firstSelected)
+        {
+            m_ui->details->setText(firstSelected->text((int)MessageColumn::DetailedMessage));
+        }
+    }
+
+    QString ErrorDialog::GetMessageTypeString(MessageType messageType) const
+    {
+        switch (messageType)
+        {
+        case ErrorDialog::MessageType::Warning:
+            return QObject::tr("Warning");
+        case MessageType::Error:
+            return QObject::tr("Error");
+        default:
+            {
+                AZ_Warning(
+                    "ErrorDialog", 
+                    false,
+                    "No message type string is available for message type %u",
+                    messageType);
+
+                return QObject::tr("Unknown");
+            }
+        }
+    }
+}
+
+
+
+#include <moc_ErrorDialog.cpp>
diff --git a/Code/Editor/ErrorDialog.h b/Code/Editor/ErrorDialog.h
new file mode 100644
index 0000000000..a2a807aa49
--- /dev/null
+++ b/Code/Editor/ErrorDialog.h
@@ -0,0 +1,70 @@
+/*
+ * 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>
+
+#include "Include/EditorCoreAPI.h"
+#endif
+
+namespace Ui 
+{
+    class ErrorLogDialog;
+}
+class QItemSelection;
+
+namespace SandboxEditor
+{
+    /// Used to display a collection of error and warning messages.
+    /// This is used instead of QMessageBox because the details section of QMessageBox is not
+    /// very resizeable, making it hard to show multiple errors at once.
+    class EDITOR_CORE_API ErrorDialog
+        : public QDialog
+    {
+        Q_OBJECT
+    public:
+        enum class MessageType
+        {
+            Warning,
+            Error
+        };
+        
+        //! ErrorDialog constructor.
+        //! @param parent the optional QWidget to use as a parent.
+        explicit ErrorDialog(QWidget* parent = nullptr);
+        ~ErrorDialog();
+
+        //! Adds messages to the dialog, marked with the passed in message type.
+        //! @param messageType what message type to use to mark passed in messages.
+        //! @param messages the list of messages to add.
+        void AddMessages(MessageType messageType, const AZStd::list<QString>& messages);
+
+    protected Q_SLOTS:
+        void OnOK();
+        void MessageSelectionChanged();
+
+    private:
+        /// Tracks which column the message information is used in.
+        enum class MessageColumn
+        {
+            MessageType,
+            ShortMessage,
+            DetailedMessage,
+        };
+
+        //! Converts MessageType to QString.
+        //! @param messageType the message type to convert.
+        //! @return the QString representation of that message type.
+        QString GetMessageTypeString(MessageType messageType) const;
+
+        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        QScopedPointer<Ui::ErrorLogDialog> m_ui; ///< Tracks the Qt UI associated with this class.
+        QSet<QString> m_uniqueStrings;
+        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    };
+}
diff --git a/Code/Sandbox/Editor/ErrorDialog.ui b/Code/Editor/ErrorDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/ErrorDialog.ui
rename to Code/Editor/ErrorDialog.ui
diff --git a/Code/Editor/ErrorRecorder.cpp b/Code/Editor/ErrorRecorder.cpp
new file mode 100644
index 0000000000..549aaf813f
--- /dev/null
+++ b/Code/Editor/ErrorRecorder.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 "EditorDefs.h"
+#include "ErrorRecorder.h"
+#include "BaseLibraryItem.h"
+#include "Include/IErrorReport.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+CErrorsRecorder::CErrorsRecorder(bool showErrors)
+{
+    GetIEditor()->GetErrorReport()->SetImmediateMode(false);
+    GetIEditor()->GetErrorReport()->SetShowErrors(showErrors);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CErrorsRecorder::~CErrorsRecorder()
+{
+    GetIEditor()->GetErrorReport()->Display();
+}
diff --git a/Code/Editor/ErrorRecorder.h b/Code/Editor/ErrorRecorder.h
new file mode 100644
index 0000000000..365c520725
--- /dev/null
+++ b/Code/Editor/ErrorRecorder.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
+ *
+ */
+
+
+
+// Description : Class that collects error reports to present them later.
+
+#ifndef CRYINCLUDE_EDITOR_CORE_ERRORRECORDER_H
+#define CRYINCLUDE_EDITOR_CORE_ERRORRECORDER_H
+#pragma once
+
+//////////////////////////////////////////////////////////////////////////
+//! Automatic class to record and display error.
+class EDITOR_CORE_API CErrorsRecorder
+{
+public:
+    CErrorsRecorder(bool showErrors = true);
+    ~CErrorsRecorder();
+};
+
+#endif // CRYINCLUDE_EDITOR_ERRORREPORT_H
diff --git a/Code/Editor/ErrorReport.cpp b/Code/Editor/ErrorReport.cpp
new file mode 100644
index 0000000000..95d1fcd386
--- /dev/null
+++ b/Code/Editor/ErrorReport.cpp
@@ -0,0 +1,321 @@
+/*
+ * 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 "ErrorReport.h"
+
+// Editor
+#include "ErrorReportDialog.h"
+
+//////////////////////////////////////////////////////////////////////////
+QString CErrorRecord::GetErrorText() const
+{
+    QString str = error.trimmed();
+
+    const char* sModuleName = "";
+    // Module name
+    switch (module)
+    {
+    case VALIDATOR_MODULE_UNKNOWN:
+        sModuleName = "";
+        break;
+    case VALIDATOR_MODULE_RENDERER:
+        sModuleName = "Renderer";
+        break;
+    case VALIDATOR_MODULE_3DENGINE:
+        sModuleName = "Engine";
+        break;
+    case VALIDATOR_MODULE_SYSTEM:
+        sModuleName = "System";
+        break;
+    case VALIDATOR_MODULE_AUDIO:
+        sModuleName = "Audio";
+        break;
+    case VALIDATOR_MODULE_MOVIE:
+        sModuleName = "Movie";
+        break;
+    case VALIDATOR_MODULE_EDITOR:
+        sModuleName = "Editor";
+        break;
+    case VALIDATOR_MODULE_NETWORK:
+        sModuleName = "Network";
+        break;
+    case VALIDATOR_MODULE_PHYSICS:
+        sModuleName = "Physics";
+        break;
+    case VALIDATOR_MODULE_FEATURETESTS:
+        sModuleName = "FeatureTests";
+        break;
+    case VALIDATOR_MODULE_SHINE:
+        sModuleName = "UI";
+        break;
+    }
+    str = QStringLiteral("[%1]\t[%2]\t%3").arg(count, 2).arg(QString(sModuleName).leftJustified(6), error).trimmed();
+
+    if (!file.isEmpty())
+    {
+        str += QString("\t") + file;
+    }
+    else
+    {
+        str += QString("\t ");
+    }
+    if (pItem)
+    {
+        switch (pItem->GetType())
+        {
+        case EDB_TYPE_MATERIAL:
+            str += QString("\t Material=\"");
+            break;
+        case EDB_TYPE_PARTICLE:
+            str += QString("\t Particle=\"");
+            break;
+        case EDB_TYPE_MUSIC:
+            str += QString("\t Music=\"");
+            break;
+        default:
+            str += QString("\t Item=\"");
+        }
+        str += pItem->GetFullName() + "\"";
+    }
+    if (pObject)
+    {
+        str += QString("\t Object=\"") + pObject->GetName() + "\"";
+    }
+    return str;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CError Report.
+//////////////////////////////////////////////////////////////////////////
+CErrorReport::CErrorReport()
+{
+    m_errors.reserve(100);
+    m_bImmediateMode = true;
+    m_bShowErrors = true;
+    m_pObject = nullptr;
+    m_pItem = nullptr;
+    m_pParticle = nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReport::ReportError(CErrorRecord& err)
+{
+    static bool bNoRecurse = false;
+    if (bNoRecurse)
+    {
+        return;
+    }
+
+    bNoRecurse = true;
+    if (m_bImmediateMode)
+    {
+        if (err.module == VALIDATOR_MODULE_EDITOR && err.severity == static_cast<int>(VALIDATOR_ERROR))
+        {
+            Warning(err.error.toUtf8().data());
+        }
+        else
+        {
+            // Show dialog if first character of warning is !.
+            if (!err.error.isEmpty() && err.error[0] == '!')
+            {
+                Warning(err.error.toUtf8().data());
+            }
+            else
+            {
+                m_errors.push_back(err);
+            }
+        }
+    }
+    else
+    {
+        if (err.pObject == NULL && m_pObject != NULL)
+        {
+            err.pObject = m_pObject;
+        }
+        else if (err.pItem == NULL && m_pItem != NULL)
+        {
+            err.pItem = m_pItem;
+        }
+        m_errors.push_back(err);
+    }
+    bNoRecurse = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReport::Clear()
+{
+    m_errors.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline bool SortErrorsByModule(const CErrorRecord& e1, const CErrorRecord& e2)
+{
+    if (e1.module == e2.module)
+    {
+        if (e1.error == e2.error)
+        {
+            return e1.file < e2.file;
+        }
+        else
+        {
+            return e1.error < e2.error;
+        }
+    }
+    return e1.module < e2.module;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReport::Display()
+{
+    if (m_errors.empty() || !m_bShowErrors)
+    {
+        SetImmediateMode(true);
+        return;
+    }
+
+    // Sort by module.
+    std::sort(m_errors.begin(), m_errors.end(), SortErrorsByModule);
+
+    std::vector<CErrorRecord> errorList;
+    errorList.swap(m_errors);
+
+    m_errors.reserve(errorList.size());
+
+    QString prevName = "";
+    QString prevFile = "";
+    for (int i = 0; i < errorList.size(); i++)
+    {
+        CErrorRecord& err = errorList[i];
+        if (err.error != prevName || err.file != prevFile)
+        {
+            err.count = 1;
+            m_errors.push_back(err);
+        }
+        else if (!m_errors.empty())
+        {
+            m_errors.back().count++;
+        }
+        prevName = err.error;
+        prevFile = err.file;
+    }
+
+    // Log all errors.
+    CryLogAlways("========================= Errors =========================");
+    for (int i = 0; i < m_errors.size(); i++)
+    {
+        CErrorRecord& err = m_errors[i];
+        QString str = err.GetErrorText();
+        CryLogAlways("%3d) %s", i, str.toUtf8().data());
+    }
+    CryLogAlways("========================= End Errors =========================");
+
+    ICVar* const noErrorReportWindowCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_error_report_window") : nullptr;
+    if (noErrorReportWindowCVar && noErrorReportWindowCVar->GetIVal() == 0)
+    {
+        CErrorReportDialog::Open(this);
+    }
+
+    SetImmediateMode(true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CErrorReport::IsEmpty() const
+{
+    return m_errors.empty();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CErrorRecord& CErrorReport::GetError(int i)
+{
+    assert(i >= 0 && i < m_errors.size());
+    return m_errors[i];
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReport::SetImmediateMode(bool bEnable)
+{
+    if (bEnable != m_bImmediateMode)
+    {
+        Clear();
+        m_bImmediateMode = bEnable;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReport::Report(SValidatorRecord& record)
+{
+    if ((record.flags & VALIDATOR_FLAG_IGNORE_IN_EDITOR))
+    {
+        return;
+    }
+
+    CErrorRecord err;
+    if (record.text)
+    {
+        err.error = record.text;
+    }
+    if (record.description)
+    {
+        err.description = record.description;
+    }
+    if (record.file)
+    {
+        err.file = record.file;
+    }
+    else
+    {
+        err.file = m_currentFilename;
+    }
+    err.severity = (CErrorRecord::ESeverity)record.severity;
+
+    err.assetScope = record.assetScope;
+
+    err.flags = 0;
+    if (record.flags & VALIDATOR_FLAG_FILE)
+    {
+        err.flags |= CErrorRecord::FLAG_NOFILE;
+    }
+    if (record.flags & VALIDATOR_FLAG_TEXTURE)
+    {
+        err.flags |= CErrorRecord::FLAG_TEXTURE;
+    }
+    if (record.flags & VALIDATOR_FLAG_SCRIPT)
+    {
+        err.flags |= CErrorRecord::FLAG_SCRIPT;
+    }
+    if (record.flags & VALIDATOR_FLAG_AI)
+    {
+        err.flags |= CErrorRecord::FLAG_AI;
+    }
+
+    err.module = record.module;
+    err.pObject = m_pObject;
+    err.pItem = m_pItem;
+
+    ReportError(err);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReport::SetCurrentValidatorObject(CBaseObject* pObject)
+{
+    m_pObject = pObject;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReport::SetCurrentValidatorItem(CBaseLibraryItem* pItem)
+{
+    m_pItem = pItem;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReport::SetCurrentFile(const QString& file)
+{
+    m_currentFilename = file;
+}
diff --git a/Code/Editor/ErrorReport.h b/Code/Editor/ErrorReport.h
new file mode 100644
index 0000000000..747c8c269c
--- /dev/null
+++ b/Code/Editor/ErrorReport.h
@@ -0,0 +1,140 @@
+/*
+ * 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 : Class that collects error reports to present them later.
+
+
+#ifndef CRYINCLUDE_EDITOR_ERRORREPORT_H
+#define CRYINCLUDE_EDITOR_ERRORREPORT_H
+#pragma once
+
+// forward declarations.
+class CParticleItem;
+
+#include "BaseLibraryItem.h"
+#include "Objects/BaseObject.h"
+#include "Include/IErrorReport.h"
+#include "ErrorRecorder.h"
+
+/*! Single error entry in error report.
+ */
+class CErrorRecord
+{
+public:
+    enum ESeverity
+    {
+        ESEVERITY_ERROR,
+        ESEVERITY_WARNING,
+        ESEVERITY_COMMENT
+    };
+    enum EFlags
+    {
+        FLAG_NOFILE         = 0x0001,   // Indicate that required file was not found.
+        FLAG_SCRIPT         = 0x0002,   // Error with scripts.
+        FLAG_TEXTURE        = 0x0004,   // Error with scripts.
+        FLAG_OBJECTID       = 0x0008,   // Error with object Ids, Unresolved/Duplicate etc...
+        FLAG_AI                 = 0x0010,   // Error with AI.
+    };
+    //! Severety of this error.
+    ESeverity severity;
+    //! Module of error.
+    EValidatorModule module;
+    //! Error Text.
+    QString error;
+    //! File which is missing or causing problem.
+    QString file;
+    //! More detailed description for this error.
+    QString description;
+    // Asset dependencies
+    QString assetScope;
+    int count;
+    //! Object that caused this error.
+    _smart_ptr<CBaseObject> pObject;
+    //! Library Item that caused this error.
+    _smart_ptr<CBaseLibraryItem> pItem;
+    int flags;
+
+    CErrorRecord(CBaseObject* object, ESeverity _severity, const QString& _error, int _flags = 0, int _count = 0,
+        CBaseLibraryItem* item = 0, EValidatorModule _module = VALIDATOR_MODULE_EDITOR)
+        : severity(_severity)
+        , module(_module)
+        , pObject(object)
+        , pItem(item)
+        , flags(_flags)
+        , count(_count)
+        , error(_error)
+    {
+    }
+
+    CErrorRecord()
+    {
+        severity = ESEVERITY_WARNING;
+        module = VALIDATOR_MODULE_EDITOR;
+        pObject = 0;
+        pItem = 0;
+        flags = 0;
+        count = 0;
+    }
+    QString GetErrorText() const;
+};
+
+/*! Error report manages collection of errors occured duruing map analyzes or level load.
+ */
+class CErrorReport
+    : public IErrorReport
+{
+public:
+    CErrorReport();
+
+    //! If enabled errors are reported immidiatly and not stored.
+    void SetImmediateMode(bool bEnable);
+    bool IsImmediateMode() const { return m_bImmediateMode; };
+
+    void SetShowErrors(bool bShowErrors = true) { m_bShowErrors = bShowErrors; };
+
+    //! Adds new error to report.
+    void ReportError(CErrorRecord& err);
+
+    //! Check if error report have any errors.
+    bool IsEmpty() const;
+
+    //! Get number of contained error records.
+    int GetErrorCount() const { return m_errors.size(); };
+    //! Get access to indexed error record.
+    CErrorRecord& GetError(int i);
+    //! Clear all error records.
+    void Clear();
+
+    //! Display dialog with all errors.
+    void Display();
+
+    //! Assign current Object to which new reported warnings are assigned.
+    void SetCurrentValidatorObject(CBaseObject* pObject);
+    //! Assign current Item to which new reported warnings are assigned.
+    void SetCurrentValidatorItem(CBaseLibraryItem* pItem);
+    //! Assign current filename.
+    void SetCurrentFile(const QString& file);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Implement IValidator interface.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void Report(SValidatorRecord& record);
+
+private:
+    //! Array of all error records added to report.
+    std::vector<CErrorRecord> m_errors;
+    bool m_bImmediateMode;
+    bool m_bShowErrors;
+    _smart_ptr<CBaseObject> m_pObject;
+    _smart_ptr<CBaseLibraryItem> m_pItem;
+    CParticleItem* m_pParticle;
+    QString m_currentFilename;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_ERRORREPORT_H
diff --git a/Code/Editor/ErrorReportDialog.cpp b/Code/Editor/ErrorReportDialog.cpp
new file mode 100644
index 0000000000..df90b6eb1b
--- /dev/null
+++ b/Code/Editor/ErrorReportDialog.cpp
@@ -0,0 +1,601 @@
+/*
+ * 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 "ErrorReportDialog.h"
+
+// Qt
+#include <QClipboard>
+#include <QDesktopServices>
+#include <QFile>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QUrl>
+#include <QDateTime>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/ViewPaneOptions.h>
+
+// Editor
+#include "ErrorReportTableModel.h"
+#include "Viewport.h"
+#include "Util/Mailer.h"
+#include "GameEngine.h"
+#include "LyViewPaneNames.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_ErrorReportDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+
+//////////////////////////////////////////////////////////////////////////
+CErrorReportDialog* CErrorReportDialog::m_instance = 0;
+
+// CErrorReportDialog dialog
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::RegisterViewClass()
+{
+    AzToolsFramework::ViewPaneOptions options;
+    options.showInMenu = false;
+    AzToolsFramework::RegisterViewPane<CErrorReportDialog>(LyViewPane::ErrorReport, LyViewPane::CategoryOther, options);
+}
+
+CErrorReportDialog::CErrorReportDialog(QWidget* parent)
+    : QWidget(parent)
+    , ui(new Ui::CErrorReportDialog)
+    , m_errorReportModel(new CErrorReportTableModel(this))
+    , m_sortIndicatorColumn(-1)
+    , m_sortIndicatorOrder(Qt::AscendingOrder)
+{
+    ui->setupUi(this);
+    ui->treeView->setModel(m_errorReportModel);
+
+    ui->treeView->header()->setContextMenuPolicy(Qt::CustomContextMenu);
+    ui->treeView->header()->setSectionsMovable(true);
+    ui->treeView->viewport()->setMouseTracking(true);
+    ui->treeView->viewport()->installEventFilter(this);
+
+    ui->treeView->header()->setSectionResizeMode(CErrorReportTableModel::ColumnSeverity, QHeaderView::ResizeToContents);
+    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnCount, 30);
+    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnText, 200);
+    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnFile, 150);
+    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnObject, 150);
+    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnModule, 100);
+    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnDescription, 100);
+    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnAssetScope, 200);
+
+    connect(ui->treeView, SIGNAL(clicked(QModelIndex)), this, SLOT(OnReportItemClick(QModelIndex)));
+    connect(ui->treeView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnReportItemDblClick(QModelIndex)));
+    connect(ui->treeView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(OnReportItemRClick()));
+    connect(ui->treeView->header(), SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(OnReportColumnRClick()));
+    connect(ui->treeView->header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(OnSortIndicatorChanged(int,Qt::SortOrder)));
+
+    ui->treeView->AddGroup(CErrorReportTableModel::ColumnModule);
+
+    ui->treeView->header()->setSortIndicator(-1, Qt::AscendingOrder);
+
+    m_instance = this;
+    //CErrorReport *report,
+    //m_pErrorReport = report;
+    m_pErrorReport = 0;
+}
+
+CErrorReportDialog::~CErrorReportDialog()
+{
+    m_instance = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::Open(CErrorReport* pReport)
+{
+    if (!m_instance)
+    {
+        GetIEditor()->OpenView(LyViewPane::ErrorReport);
+    }
+
+    if (!m_instance)
+    {
+        return;
+    }
+
+    m_instance->SetReport(pReport);
+    m_instance->UpdateErrors();
+    m_instance->setFocus();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::Close()
+{
+    if (m_instance)
+    {
+        /*
+        CCryMemFile memFile( new BYTE[256], 256, 256 );
+        CArchive ar( &memFile, CArchive::store );
+        m_instance->m_wndReport.SerializeState( ar );
+        ar.Close();
+
+        UINT nSize = (UINT)memFile.GetLength();
+        LPBYTE pbtData = memFile.Detach();
+        CXTRegistryManager regManager;
+        regManager.WriteProfileBinary( "Dialogs\\ErrorReport", "Configuration", pbtData, nSize);
+        if ( pbtData )
+            delete [] pbtData;
+*/
+        m_instance->close();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::Clear()
+{
+    if (m_instance)
+    {
+        m_instance->SetReport(0);
+        m_instance->UpdateErrors();
+    }
+}
+
+bool CErrorReportDialog::eventFilter(QObject* watched, QEvent* event)
+{
+    if (event->type() == QEvent::MouseMove && watched == ui->treeView->viewport())
+    {
+        QMouseEvent* ev = static_cast<QMouseEvent*>(event);
+        const QModelIndex index = ui->treeView->indexAt(ev->pos());
+        QRect rect = ui->treeView->visualRect(index);
+        rect.moveTopLeft(ui->treeView->viewport()->mapToGlobal(rect.topLeft()));
+        const QRect target = fontMetrics().boundingRect(rect, index.data(Qt::TextAlignmentRole).toInt(), index.data().toString());
+
+        if (index.column() == CErrorReportTableModel::ColumnObject && target.contains(QCursor::pos()))
+        {
+            ui->treeView->viewport()->setCursor(Qt::PointingHandCursor);
+        }
+        else
+        {
+            ui->treeView->viewport()->setCursor(Qt::ArrowCursor);
+        }
+    }
+    return QWidget::eventFilter(watched, event);
+}
+
+// CErrorReportDialog message handlers
+
+void CErrorReportDialog::SetReport(CErrorReport* report)
+{
+    m_pErrorReport = report;
+    m_errorReportModel->setErrorReport(report);
+}
+
+
+void CErrorReportDialog::UpdateErrors()
+{
+    m_errorReportModel->setErrorReport(m_pErrorReport);
+}
+
+//////////////////////////////////////////////////////////////////////////
+#define ID_REMOVE_ITEM  1
+#define ID_SORT_ASC     2
+#define ID_SORT_DESC        3
+#define ID_GROUP_BYTHIS 4
+#define ID_SHOW_GROUPBOX        5
+#define ID_SHOW_FIELDCHOOSER 6
+#define ID_COLUMN_BESTFIT       7
+#define ID_COLUMN_ARRANGEBY 100
+#define ID_COLUMN_ALIGMENT  200
+#define ID_COLUMN_ALIGMENT_LEFT ID_COLUMN_ALIGMENT + 1
+#define ID_COLUMN_ALIGMENT_RIGHT    ID_COLUMN_ALIGMENT + 2
+#define ID_COLUMN_ALIGMENT_CENTER   ID_COLUMN_ALIGMENT + 3
+#define ID_COLUMN_SHOW      500
+
+void CErrorReportDialog::OnReportColumnRClick()
+{
+    QHeaderView* header = ui->treeView->header();
+
+    int column = header->logicalIndexAt(ui->treeView->mapFromGlobal(QCursor::pos()));
+    if (column < 0)
+    {
+        return;
+    }
+
+    QMenu menu;
+    QAction* actionSortAscending = menu.addAction(tr("Sort &Ascending"));
+    QAction* actionSortDescending = menu.addAction(tr("Sort Des&cending"));
+    menu.addSeparator();
+    QAction* actionGroupByThis = menu.addAction(tr("&Group by this field"));
+    QAction* actionGroupByBox = menu.addAction(tr("Group &by box"));
+    menu.addSeparator();
+    QAction* actionRemoveItem = menu.addAction(tr("&Remove column"));
+    QAction* actionFieldChooser = menu.addAction(tr("Field &Chooser"));
+    menu.addSeparator();
+    QAction* actionBestFit = menu.addAction(tr("Best &Fit"));
+
+    actionGroupByBox->setCheckable(true);
+    actionGroupByBox->setChecked(ui->treeView->IsGroupsShown());
+
+    // create arrange by items
+    QMenu menuArrange;
+    const int nColumnCount = m_errorReportModel->columnCount();
+    for (int nColumn = 0; nColumn < nColumnCount; nColumn++)
+    {
+        if (!header->isSectionHidden(nColumn))
+        {
+            const QString sCaption = m_errorReportModel->headerData(nColumn, Qt::Horizontal).toString();
+            if (!sCaption.isEmpty())
+            {
+                menuArrange.addAction(sCaption)->setData(nColumn);
+            }
+        }
+    }
+
+    menuArrange.addSeparator();
+
+    QAction* actionClearGroups = menuArrange.addAction(tr("Clear groups"));
+    menuArrange.setTitle(tr("Arrange By"));
+    menu.insertMenu(actionSortAscending, &menuArrange);
+
+    // create columns items
+    QMenu menuColumns;
+    for (int nColumn = 0; nColumn < nColumnCount; nColumn++)
+    {
+        const QString sCaption = m_errorReportModel->headerData(nColumn, Qt::Horizontal).toString();
+        //if (!sCaption.isEmpty())
+        QAction* action = menuColumns.addAction(sCaption);
+        action->setCheckable(true);
+        action->setChecked(!ui->treeView->header()->isSectionHidden(nColumn));
+    }
+
+    menuColumns.setTitle(tr("Columns"));
+    menu.insertMenu(menuArrange.menuAction(), &menuColumns);
+
+    //create Text alignment submenu
+    QMenu menuAlign;
+
+    QAction* actionAlignLeft = menuAlign.addAction(tr("Align Left"));
+    QAction* actionAlignRight = menuAlign.addAction(tr("Align Right"));
+    QAction* actionAlignCenter = menuAlign.addAction(tr("Align Center"));
+    actionAlignLeft->setCheckable(true);
+    actionAlignRight->setCheckable(true);
+    actionAlignCenter->setCheckable(true);
+
+    const int alignment = m_errorReportModel->headerData(column, Qt::Horizontal, Qt::TextAlignmentRole).toInt();
+    actionAlignLeft->setChecked(alignment & Qt::AlignLeft);
+    actionAlignRight->setChecked(alignment & Qt::AlignRight);
+    actionAlignCenter->setChecked(alignment & Qt::AlignHCenter);
+
+    menuAlign.setTitle(tr("&Alignment"));
+    menu.insertMenu(actionBestFit, &menuAlign);
+
+    // track menu
+    QAction* nMenuResult = menu.exec(QCursor::pos());
+
+    // arrange by items
+    if (menuArrange.actions().contains(nMenuResult))
+    {
+        // group by item
+        if (actionClearGroups == nMenuResult)
+        {
+            ui->treeView->ClearGroups();
+        }
+        else
+        {
+            column = nMenuResult->data().toInt();
+            ui->treeView->ToggleSortOrder(column);
+        }
+    }
+
+    // process Alignment options
+    if (nMenuResult == actionAlignLeft)
+    {
+        m_errorReportModel->setHeaderData(column, Qt::Horizontal, Qt::AlignLeft, Qt::TextAlignmentRole);
+    }
+    else if (nMenuResult == actionAlignRight)
+    {
+        m_errorReportModel->setHeaderData(column, Qt::Horizontal, Qt::AlignRight, Qt::TextAlignmentRole);
+    }
+    else if (nMenuResult == actionAlignCenter)
+    {
+        m_errorReportModel->setHeaderData(column, Qt::Horizontal, Qt::AlignCenter, Qt::TextAlignmentRole);
+    }
+
+    // process column selection item
+    if (menuColumns.actions().contains(nMenuResult))
+    {
+        ui->treeView->header()->setSectionHidden(menuColumns.actions().indexOf(nMenuResult), !nMenuResult->isChecked());
+    }
+
+
+    // other general items
+    if (nMenuResult == actionSortAscending || nMenuResult == actionSortDescending)
+    {
+        ui->treeView->sortByColumn(column, nMenuResult == actionSortAscending ? Qt::AscendingOrder : Qt::DescendingOrder);
+    }
+    else if (nMenuResult == actionFieldChooser)
+    {
+        //OnShowFieldChooser();
+    }
+    else if (nMenuResult == actionBestFit)
+    {
+        ui->treeView->resizeColumnToContents(column);
+    }
+    else if (nMenuResult == actionRemoveItem)
+    {
+        ui->treeView->header()->setSectionHidden(column, true);
+    }
+    // other general items
+    else if (nMenuResult == actionGroupByThis)
+    {
+        ui->treeView->AddGroup(column);
+        ui->treeView->ShowGroups(true);
+    }
+    else if (nMenuResult == actionGroupByBox)
+    {
+        ui->treeView->ShowGroups(!ui->treeView->IsGroupsShown());
+    }
+}
+
+#define ID_POPUP_COLLAPSEALLGROUPS 1
+#define ID_POPUP_EXPANDALLGROUPS 2
+
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::CopyToClipboard()
+{
+    QString str;
+    const QModelIndexList selRows = ui->treeView->selectionModel()->selectedRows();
+    for (const QModelIndex& index : selRows)
+    {
+        const CErrorRecord* pRecord = index.data(Qt::UserRole).value<const CErrorRecord*>();
+        if (pRecord)
+        {
+            str += pRecord->GetErrorText();
+            if (pRecord->pObject)
+            {
+                str += QString::fromLatin1(" [Object: %1]").arg(pRecord->pObject->GetName());
+            }
+            if (pRecord->pItem)
+            {
+                str += QString::fromLatin1(" [Material: %1]").arg(pRecord->pItem->GetName());
+            }
+            str += QString::fromLatin1("\r\n");
+        }
+    }
+    if (!str.isEmpty())
+    {
+        QApplication::clipboard()->setText(str);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::OnReportItemRClick()
+{
+    const QModelIndex index = ui->treeView->indexAt(ui->treeView->viewport()->mapFromGlobal(QCursor::pos()));
+
+    if (!index.isValid())
+    {
+        return;
+    }
+
+    if (ui->treeView->model()->hasChildren(index))
+    {
+        QMenu menu;
+        menu.addAction(tr("Collapse &All Groups"), ui->treeView, SLOT(collapseAll()));
+        menu.addAction(tr("E&xpand All Groups"), ui->treeView, SLOT(expandAll()));
+
+        // track menu
+        menu.exec(QCursor::pos());
+    }
+    else
+    {
+        QMenu menu;
+        //menu.addAction(tr("Select Object(s)")); // TODO: does nothing?
+        menu.addAction(tr("Copy Warning(s) To Clipboard"), this, SLOT(CopyToClipboard()));
+        menu.addAction(tr("E-mail Error Report"), this, SLOT(SendInMail()));
+        menu.addAction(tr("Open in Excel"), this, SLOT(OpenInExcel()));
+
+        // track menu
+        menu.exec(QCursor::pos());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::SendInMail()
+{
+    if (!m_pErrorReport)
+    {
+        return;
+    }
+
+    // Send E-Mail.
+    QString textMsg;
+    for (int i = 0; i < m_errorReportModel->rowCount(); ++i)
+    {
+        const CErrorRecord* err = m_errorReportModel->index(i, 0).data(Qt::UserRole).value<const CErrorRecord*>();
+        textMsg += err->GetErrorText() + QString::fromLatin1("\n");
+    }
+
+    std::vector<const char*> who;
+    const QString subject = QString::fromLatin1("Level %1 Error Report").arg(GetIEditor()->GetGameEngine()->GetLevelPath());
+    CMailer::SendMail(subject.toUtf8().data(), textMsg.toUtf8().data(), who, who, true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::OpenInExcel()
+{
+    if (!m_pErrorReport)
+    {
+        return;
+    }
+
+    const QString levelName = Path::GetFileName(GetIEditor()->GetGameEngine()->GetLevelName());
+
+    const QString filename = QString::fromLatin1("ErrorList_%1_%2.csv").arg(levelName).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd-HH-mm-ss"));
+
+    // Save to temp file.
+    QFile f(filename);
+    if (f.open(QIODevice::WriteOnly))
+    {
+        for (int i = 0; i < m_errorReportModel->rowCount(); ++i)
+        {
+            const CErrorRecord* err = m_errorReportModel->index(i, 0).data(Qt::UserRole).value<const CErrorRecord*>();
+            QString text = err->GetErrorText();
+            text.replace(',', '.');
+            text.replace('\t', ',');
+            f.write((text + QString::fromLatin1("\n")).toUtf8().data());
+        }
+        f.close();
+        QDesktopServices::openUrl(QUrl::fromLocalFile(filename));
+    }
+    else
+    {
+        Warning("Failed to save %s", (const char*)filename.toUtf8().data());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::OnReportItemClick(const QModelIndex& index)
+{
+    QRect rect = ui->treeView->visualRect(index);
+    rect.moveTopLeft(ui->treeView->viewport()->mapToGlobal(rect.topLeft()));
+    const QRect target = fontMetrics().boundingRect(rect, index.data(Qt::TextAlignmentRole).toInt(), index.data().toString());
+
+    if (index.column() == CErrorReportTableModel::ColumnObject && target.contains(QCursor::pos()))
+    {
+        OnReportHyperlink(index);
+    }
+
+    /*
+    if (pItemNotify->pColumn->GetItemIndex() == COLUMN_CHECK)
+    {
+        m_wndReport.Populate();
+    }
+    */
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::keyPressEvent(QKeyEvent* event)
+{
+    if (event->matches(QKeySequence::Copy))
+    {
+        CopyToClipboard();
+        event->accept();
+    }
+    else
+    {
+        QWidget::keyPressEvent(event);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::OnReportItemDblClick(const QModelIndex& index)
+{
+    bool bDone = false;
+    const CErrorRecord* pError = index.data(Qt::UserRole).value<const CErrorRecord*>();
+    if (pError && pError->pObject != NULL)
+    {
+        CUndo undo("Select Object(s)");
+        // Clear other selection.
+        GetIEditor()->ClearSelection();
+        // Select this object.
+        GetIEditor()->SelectObject(pError->pObject);
+
+        CViewport* vp = GetIEditor()->GetActiveView();
+        if (vp)
+        {
+            vp->CenterOnSelection();
+        }
+        bDone = true;
+    }
+
+    if (!bDone && pError && GetIEditor()->GetActiveView())
+    {
+        float x, y, z;
+        if (GetPositionFromString(pError->error, &x, &y, &z))
+        {
+            CViewport* vp = GetIEditor()->GetActiveView();
+            Matrix34 tm = vp->GetViewTM();
+            tm.SetTranslation(Vec3(x, y, z));
+            vp->SetViewTM(tm);
+        }
+    }
+
+    /*
+    if (index.isValid())
+    {
+        TRACE(_T("Double Click on row %d\n"),
+            index.row());
+
+        CErrorMessageRecord* pRecord = DYNAMIC_DOWNCAST(CErrorMessageRecord, pItemNotify->pRow->GetRecord());
+        if (pRecord)
+        {
+            {
+                m_wndReport.Populate();
+            }
+        }
+    }
+    */
+}
+
+void CErrorReportDialog::OnSortIndicatorChanged(int logicalIndex, Qt::SortOrder order)
+{
+    if (logicalIndex == 0)
+    {
+        ui->treeView->header()->setSortIndicator(m_sortIndicatorColumn, m_sortIndicatorOrder);
+    }
+    else
+    {
+        m_sortIndicatorColumn = logicalIndex;
+        m_sortIndicatorOrder = order;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::OnReportHyperlink(const QModelIndex& index)
+{
+    const CErrorRecord* pError = index.data(Qt::UserRole).value<const CErrorRecord*>();
+    bool bDone = false;
+    if (pError && pError->pObject != NULL)
+    {
+        CUndo undo("Select Object(s)");
+        // Clear other selection.
+        GetIEditor()->ClearSelection();
+        // Select this object.
+        GetIEditor()->SelectObject(pError->pObject);
+        bDone = true;
+    }
+
+    if (!bDone && pError && GetIEditor()->GetActiveView())
+    {
+        float x, y, z;
+        if (GetPositionFromString(pError->error, &x, &y, &z))
+        {
+            CViewport* vp = GetIEditor()->GetActiveView();
+            Matrix34 tm = vp->GetViewTM();
+            tm.SetTranslation(Vec3(x, y, z));
+            vp->SetViewTM(tm);
+        }
+    }
+}
+
+/*
+//////////////////////////////////////////////////////////////////////////
+void CErrorReportDialog::OnShowFieldChooser()
+{
+    CMainFrm* pMainFrm = (CMainFrame*)AfxGetMainWnd();
+    if (pMainFrm)
+    {
+        BOOL bShow = !pMainFrm->m_wndFieldChooser.IsVisible();
+        pMainFrm->ShowControlBar(&pMainFrm->m_wndFieldChooser, bShow, FALSE);
+    }
+}
+*/
+
+#include <moc_ErrorReportDialog.cpp>
diff --git a/Code/Editor/ErrorReportDialog.h b/Code/Editor/ErrorReportDialog.h
new file mode 100644
index 0000000000..a1637b7eb2
--- /dev/null
+++ b/Code/Editor/ErrorReportDialog.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_ERRORREPORTDIALOG_H
+#define CRYINCLUDE_EDITOR_ERRORREPORTDIALOG_H
+#pragma once
+
+// CErrorReportDialog dialog
+
+#if !defined(Q_MOC_RUN)
+#include "ErrorReport.h"
+
+namespace Ui {
+    class CErrorReportDialog;
+}
+
+class CErrorReportTableModel;
+
+#include <QWidget>
+#endif
+
+class CErrorReportDialog
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit CErrorReportDialog(QWidget* parent = nullptr);   // standard constructor
+    virtual ~CErrorReportDialog();
+
+    static void RegisterViewClass();
+
+    static void Open(CErrorReport* pReport);
+    static void Close();
+    static void Clear();
+
+    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
+    // make sure you pick a unique GUID
+    static const GUID& GetClassID()
+    {
+        // {ea523b7e-3f63-821b-4823-a131fc5b46a3}
+        static const GUID guid =
+        {
+            0xea523b7e, 0x3f63, 0x821b, { 0x48, 0x23, 0xa1, 0x31, 0xfc, 0x5b, 0x46, 0xa3 }
+        };
+        return guid;
+    }
+
+    bool eventFilter(QObject* watched, QEvent* event) override;
+
+public Q_SLOTS:
+    void CopyToClipboard();
+
+    void SendInMail();
+    void OpenInExcel();
+
+protected:
+    void SetReport(CErrorReport* report);
+    void UpdateErrors();
+
+protected Q_SLOTS:
+    void OnReportItemClick(const QModelIndex& index);
+    void OnReportItemRClick();
+    void OnReportColumnRClick();
+    void OnReportItemDblClick(const QModelIndex& index);
+    void OnSortIndicatorChanged(int logicalIndex, Qt::SortOrder order);
+
+protected:
+    void OnReportHyperlink(const QModelIndex& index);
+
+    void keyPressEvent(QKeyEvent* event) override;
+
+
+    CErrorReport* m_pErrorReport;
+
+    static CErrorReportDialog* m_instance;
+
+    QScopedPointer<Ui::CErrorReportDialog> ui;
+    CErrorReportTableModel* m_errorReportModel;
+
+    int m_sortIndicatorColumn;
+    Qt::SortOrder m_sortIndicatorOrder;
+};
+
+#endif // CRYINCLUDE_EDITOR_ERRORREPORTDIALOG_H
diff --git a/Code/Sandbox/Editor/ErrorReportDialog.ui b/Code/Editor/ErrorReportDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/ErrorReportDialog.ui
rename to Code/Editor/ErrorReportDialog.ui
diff --git a/Code/Editor/ErrorReportTableModel.cpp b/Code/Editor/ErrorReportTableModel.cpp
new file mode 100644
index 0000000000..405c9985ee
--- /dev/null
+++ b/Code/Editor/ErrorReportTableModel.cpp
@@ -0,0 +1,316 @@
+/*
+ * 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 "ErrorReportTableModel.h"
+
+// Editor
+#include "ErrorReport.h"
+
+bool GetPositionFromString(QString er, float* x, float* y, float* z)
+{
+    er = er.toLower();
+    int ind = er.indexOf("pos:");
+    int shift = 4;
+    if (ind < 0)
+    {
+        ind = er.indexOf("position:");
+        shift = 9;
+    }
+    if (ind >= 0)
+    {
+        er = er.mid(ind + shift);
+        er.remove(QRegExp("^ *"));
+        if (er[0] == '(')
+        {
+            er = er.mid(1);
+            er.remove(QRegExp("^ *"));
+            ind = er.indexOf(")");
+            if (ind > 0)
+            {
+                er = er.mid(0, ind);
+                er.remove(QRegExp(" *$"));
+
+                ind = er.indexOf(" ");
+                int ind2 = er.indexOf(",");
+                if (ind < 0 || (ind2 > 0 && ind > ind2))
+                {
+                    ind = ind2;
+                }
+                if (ind > 0)
+                {
+                    *x = er.mid(0, ind).toDouble();
+                    er = er.mid(ind);
+                    er.remove(QRegExp("^[ ,]*"));
+
+                    ind = er.indexOf(" ");
+                    ind2 = er.indexOf(",");
+                    if (ind < 0 || (ind2 > 0 && ind > ind2))
+                    {
+                        ind = ind2;
+                    }
+                    if (ind > 0)
+                    {
+                        *y = er.mid(0, ind).toDouble();
+                        er = er.mid(ind);
+                        er.remove(QRegExp("^[ ,]*"));
+                        if (er.length())
+                        {
+                            *z = er.toDouble();
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+
+CErrorReportTableModel::CErrorReportTableModel(QObject* parent)
+    : AbstractSortModel(parent)
+{
+    QIcon error_icon = QIcon(":/error_report_error.svg");
+    error_icon.addFile(":/error_report_error.svg", QSize(), QIcon::Selected);
+    m_imageList.push_back(error_icon);
+
+    // VALIDATOR_ERROR_DBGBRK - this is never used but we need to space the icon list correctly.
+    QIcon dbg_icon = QIcon(":/error_report_error.svg");
+    dbg_icon.addFile(":/error_report_error.svg", QSize(), QIcon::Selected);
+    m_imageList.push_back(dbg_icon);
+
+    QIcon warning_icon = QIcon(":/error_report_warning.svg");
+    warning_icon.addFile(":/error_report_warning.svg", QSize(), QIcon::Selected);
+    m_imageList.push_back(warning_icon);
+
+    QIcon comment_icon = QIcon(":/error_report_comment.svg");
+    comment_icon.addFile(":/error_report_comment.svg", QSize(), QIcon::Selected);
+    m_imageList.push_back(comment_icon);
+}
+
+CErrorReportTableModel::~CErrorReportTableModel()
+{
+}
+
+void CErrorReportTableModel::setErrorReport(CErrorReport* report)
+{
+    beginResetModel();
+    if (!m_errorRecords.empty())
+    {
+        m_errorRecords.clear();
+    }
+    if (report != 0)
+    {
+        const int count = report->GetErrorCount();
+        m_errorRecords.reserve(count);
+        for (int i = 0; i < count; ++i)
+        {
+            m_errorRecords.push_back(report->GetError(i));
+        }
+    }
+    endResetModel();
+}
+
+int CErrorReportTableModel::rowCount(const QModelIndex& parent) const
+{
+    return parent.isValid() ? 0 : m_errorRecords.size();
+}
+
+int CErrorReportTableModel::columnCount(const QModelIndex& parent) const
+{
+    return parent.isValid() ? 0 : 8;
+}
+
+QVariant CErrorReportTableModel::data(const QModelIndex& index, int role) const
+{
+    assert(index.row() < m_errorRecords.size());
+    const CErrorRecord& record = m_errorRecords[index.row()];
+    return data(record, index.column(), role);
+}
+
+QVariant CErrorReportTableModel::data(const CErrorRecord& record, int column, int role) const
+{
+    switch (role)
+    {
+    case Qt::DisplayRole:
+    {
+        switch (column)
+        {
+        case ColumnCount:
+            return record.count;
+        case ColumnText:
+            return QString(record.error).simplified();
+        case ColumnFile:
+            return record.file;
+        case ColumnObject:
+            if (record.pItem)
+            {
+                return record.pItem->GetFullName();
+            }
+            else if (record.pObject)
+            {
+                return record.pObject->GetName();
+            }
+            else if (!record.error.isEmpty())
+            {
+                float x, y, z;
+                if (GetPositionFromString(record.error, &x, &y, &z))
+                {
+                    return tr("Pos: (%1, %2, %3)").arg(x, 0, 'f').arg(y, 0, 'f').arg(z, 0, 'f');
+                }
+            }
+            break;
+        case ColumnModule:
+            switch (record.module)
+            {
+            case VALIDATOR_MODULE_RENDERER:
+                return tr("Renderer");
+            case VALIDATOR_MODULE_3DENGINE:
+                return tr("3DEngine");
+            case VALIDATOR_MODULE_ASSETS:
+                return tr("Assets");
+            case VALIDATOR_MODULE_SYSTEM:
+                return tr("System");
+            case VALIDATOR_MODULE_AUDIO:
+                return tr("Audio");
+            case VALIDATOR_MODULE_MOVIE:
+                return tr("Movie");
+            case VALIDATOR_MODULE_EDITOR:
+                return tr("Editor");
+            case VALIDATOR_MODULE_NETWORK:
+                return tr("Network");
+            case VALIDATOR_MODULE_PHYSICS:
+                return tr("Physics");
+            case VALIDATOR_MODULE_FEATURETESTS:
+                return tr("FeatureTests");
+            default:
+                return tr("Unknown");
+            }
+        case ColumnDescription:
+            return record.description;
+        case ColumnAssetScope:
+            return record.assetScope;
+        }
+        break;
+    }
+    case Qt::DecorationRole:
+    {
+        if (column == ColumnSeverity)
+        {
+            return m_imageList[record.severity];
+        }
+        break;
+    }
+    case Qt::UserRole:
+    {
+        return QVariant::fromValue(&record);
+    }
+    case Qt::TextAlignmentRole:
+    {
+        return m_alignments.value(column, Qt::AlignLeft) | Qt::AlignVCenter;
+    }
+    case Qt::ForegroundRole:
+    {
+        if (column == ColumnObject)
+        {
+            return QPalette().color(QPalette::Link);
+        }
+        break;
+    }
+    case Qt::FontRole:
+    {
+        if (column == ColumnObject)
+        {
+            static QFont f;
+            f.setUnderline(true);
+            return f;
+        }
+        break;
+    }
+    case SeverityRole:
+        return record.severity;
+    }
+    return QVariant();
+}
+
+QVariant CErrorReportTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (orientation != Qt::Horizontal)
+    {
+        return QVariant();
+    }
+    else if (role == Qt::TextAlignmentRole)
+    {
+        return m_alignments.value(section, Qt::AlignLeft) | Qt::AlignVCenter;
+    }
+    else if (role == Qt::DisplayRole)
+    {
+        switch (section)
+        {
+        case ColumnSeverity:
+            return tr("");
+        case ColumnCount:
+            return tr("N");
+        case ColumnText:
+            return tr("Text");
+        case ColumnFile:
+            return tr("File");
+        case ColumnObject:
+            return tr("Object/Material");
+        case ColumnModule:
+            return tr("Module");
+        case ColumnDescription:
+            return tr("Description");
+        case ColumnAssetScope:
+            return tr("Scope");
+        default:
+            return QString();
+        }
+    }
+    else
+    {
+        return QVariant();
+    }
+}
+
+bool CErrorReportTableModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role)
+{
+    if (orientation == Qt::Horizontal && section >= 0 && section < columnCount() && value.canConvert<int>() && role == Qt::TextAlignmentRole)
+    {
+        m_alignments.insert(section, value.toInt());
+        Q_EMIT headerDataChanged(orientation, section, section);
+        const int rows = rowCount();
+        if (rows > 0)
+        {
+            Q_EMIT dataChanged(index(0, section), index(rows - 1, section));
+        }
+        return true;
+    }
+    return QAbstractTableModel::setHeaderData(section, orientation, value, role);
+}
+
+bool CErrorReportTableModel::LessThan(const QModelIndex& lhs, const QModelIndex& rhs) const
+{
+    int column = lhs.column();
+    if (column == ColumnSeverity)
+    {
+        return lhs.data(SeverityRole).toInt() < rhs.data(SeverityRole).toInt();
+    }
+    const QVariant l = lhs.data();
+    const QVariant r = rhs.data();
+    bool ok;
+    const int lInt = l.toInt(&ok);
+    const int rInt = r.toInt(&ok);
+    if (ok)
+    {
+        return lInt < rInt;
+    }
+    return l.toString() < r.toString();
+}
+
+#include <moc_ErrorReportTableModel.cpp>
diff --git a/Code/Editor/ErrorReportTableModel.h b/Code/Editor/ErrorReportTableModel.h
new file mode 100644
index 0000000000..694a89794a
--- /dev/null
+++ b/Code/Editor/ErrorReportTableModel.h
@@ -0,0 +1,71 @@
+/*
+ * 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 ERRORREPORTTABLEMODEL_H
+#define ERRORREPORTTABLEMODEL_H
+
+#if !defined(Q_MOC_RUN)
+#include "Util/AbstractSortModel.h"
+
+#include <QMetaType>
+#include <QPixmap>
+#endif
+
+
+class CErrorReport;
+class CErrorRecord;
+
+bool GetPositionFromString(QString er, float* x, float* y, float* z);
+
+class CErrorReportTableModel
+    : public AbstractSortModel
+{
+    Q_OBJECT
+public:
+    enum Column
+    {
+        ColumnSeverity,
+        ColumnCount,
+        ColumnText,
+        ColumnFile,
+        ColumnObject,
+        ColumnModule,
+        ColumnDescription,
+        ColumnAssetScope
+    };
+
+    enum Roles
+    {
+        SeverityRole = Qt::UserRole + 1
+    };
+
+    CErrorReportTableModel(QObject* parent = 0);
+    ~CErrorReportTableModel();
+
+    void setErrorReport(CErrorReport* report);
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+    bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role = Qt::EditRole) override;
+
+    bool LessThan(const QModelIndex& lhs, const QModelIndex& rhs) const override;
+
+protected:
+    QVariant data(const CErrorRecord& record, int column, int role = Qt::DisplayRole) const;
+
+private:
+    QHash<int, int> m_alignments;
+    std::vector<CErrorRecord> m_errorRecords;
+    QVector<QIcon> m_imageList;
+};
+
+Q_DECLARE_METATYPE(const CErrorRecord*)
+
+#endif
diff --git a/Code/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp
new file mode 100644
index 0000000000..de1d123463
--- /dev/null
+++ b/Code/Editor/Export/ExportManager.cpp
@@ -0,0 +1,1289 @@
+/*
+ * 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 "ExportManager.h"
+
+// Qt
+#include <QMessageBox>
+
+// Maestro
+#include <Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "ViewManager.h"
+#include "OBJExporter.h"
+#include "OCMExporter.h"
+#include "FBXExporterDialog.h"
+#include "RenderViewport.h"
+#include "TrackViewExportKeyTimeDlg.h"
+#include "AnimationContext.h"
+#include "TrackView/DirectorNodeAnimator.h"
+#include "Util/AutoDirectoryRestoreFileDialog.h"
+#include "QtUI/WaitCursor.h"
+#include "WaitProgress.h"
+#include "Objects/SelectionGroup.h"
+#include "Include/IObjectManager.h"
+#include "TrackView/TrackViewTrack.h"
+#include "TrackView/TrackViewSequenceManager.h"
+#include "Resource.h"
+#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
+
+#include <IEntityRenderState.h>
+#include <IStatObj.h>
+
+namespace
+{
+    void SetTexture(Export::TPath& outName, IRenderShaderResources* pRes, int nSlot)
+    {
+        SEfResTexture* pTex = pRes->GetTextureResource(nSlot);
+        if (pTex)
+        {
+            cry_strcat(outName, Path::GamePathToFullPath(pTex->m_Name.c_str()).toUtf8().data());
+        }
+    }
+
+    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
+    const QString kPrimaryCameraName = "PrimaryCamera";
+} // namespace
+
+
+
+//////////////////////////////////////////////////////////
+// CMesh
+Export::CMesh::CMesh()
+{
+    ::ZeroMemory(&material, sizeof(material));
+    material.opacity = 1.0f;
+}
+
+
+//////////////////////////////////////////////////////////
+// CObject
+Export::CObject::CObject(const char* pName)
+    : m_MeshHash(0)
+{
+    pos.x = pos.y = pos.z = 0;
+    rot.v.x = rot.v.y = rot.v.z = 0;
+    rot.w = 1.0f;
+    scale.x = scale.y = scale.z = 1.0f;
+
+    nParent = -1;
+
+    cry_strcpy(name, pName);
+
+    materialName[0] = '\0';
+
+    entityType = Export::eEntity;
+
+    cameraTargetNodeName[0] = '\0';
+
+    m_pLastObject = 0;
+}
+
+
+void Export::CObject::SetMaterialName(const char* pName)
+{
+    cry_strcpy(materialName, pName);
+}
+
+
+// CExportData
+void Export::CData::Clear()
+{
+    m_objects.clear();
+}
+
+
+// CExportManager
+CExportManager::CExportManager()
+    : m_isPrecaching(false)
+    , m_pBaseObj(0)
+    , m_FBXBakedExportFPS(0.0f)
+    , m_fScale(100.0f)
+    ,                 // this scale is used by CryEngine RC
+    m_bAnimationExport(false)
+    , m_bExportLocalCoords(false)
+    , m_numberOfExportFrames(0)
+    , m_pivotEntityObject(0)
+    , m_bBakedKeysSequenceExport(true)
+    , m_animTimeExportPrimarySequenceCurrentTime(0.0f)
+    , m_animKeyTimeExport(true)
+    , m_soundKeyTimeExport(true)
+    , m_bExportOnlyPrimaryCamera(false)
+{
+    RegisterExporter(new COBJExporter());
+    RegisterExporter(new COCMExporter());
+}
+
+
+CExportManager::~CExportManager()
+{
+    m_data.Clear();
+    for (TExporters::iterator ppExporter = m_exporters.begin(); ppExporter != m_exporters.end(); ++ppExporter)
+    {
+        (*ppExporter)->Release();
+    }
+}
+
+
+bool CExportManager::RegisterExporter(IExporter* pExporter)
+{
+    if (!pExporter)
+    {
+        return false;
+    }
+
+    m_exporters.push_back(pExporter);
+    return true;
+}
+
+inline f32 Sandbox2MayaFOVDeg(const f32 fov, const f32 ratio) { return RAD2DEG(2.0f * atan_tpl(tan(DEG2RAD(fov) / 2.0f) * ratio)); };
+inline f32 Sandbox2MayaFOVRad2Deg(const f32 fov, const f32 ratio) { return RAD2DEG(2.0f * atan_tpl(tan(fov / 2.0f) * ratio)); };
+
+void CExportManager::AddEntityAnimationData(const CTrackViewTrack* pTrack, Export::CObject* pObj, AnimParamType entityTrackParamType)
+{
+    int keyCount = pTrack->GetKeyCount();
+    pObj->m_entityAnimData.reserve(keyCount * kReserveCount);
+
+    for (int keyNumber = 0; keyNumber < keyCount; keyNumber++)
+    {
+        const CTrackViewKeyConstHandle currentKeyHandle = pTrack->GetKey(keyNumber);
+        const float fCurrentKeytime = currentKeyHandle.GetTime();
+
+        float trackValue = 0.0f;
+        pTrack->GetValue(fCurrentKeytime, trackValue);
+
+        ISplineInterpolator* pSpline = pTrack->GetSpline();
+
+        if (pSpline)
+        {
+            Export::EntityAnimData entityData;
+            entityData.dataType = (Export::AnimParamType)pTrack->GetParameterType().GetType();
+            entityData.keyValue = trackValue;
+            entityData.keyTime = fCurrentKeytime;
+
+            if (entityTrackParamType == AnimParamType::Position)
+            {
+                entityData.keyValue *= 100.0f;
+            }
+            else if (entityTrackParamType == AnimParamType::FOV)
+            {
+                entityData.keyValue = Sandbox2MayaFOVDeg(entityData.keyValue, kAspectRatio);
+            }
+
+
+            ISplineInterpolator::ValueType tin;
+            ISplineInterpolator::ValueType tout;
+            ZeroStruct(tin);
+            ZeroStruct(tout);
+            pSpline->GetKeyTangents(keyNumber, tin, tout);
+
+            float fInTantentX = tin[0];
+            float fInTantentY = tin[1];
+
+            float fOutTantentX = tout[0];
+            float fOutTantentY = tout[1];
+
+            if (fInTantentX == 0.0f)
+            {
+                fInTantentX = kTangentDelta;
+            }
+
+            if (fOutTantentX == 0.0f)
+            {
+                fOutTantentX = kTangentDelta;
+            }
+
+            entityData.leftTangent = fInTantentY / fInTantentX;
+            entityData.rightTangent = fOutTantentY / fOutTantentX;
+
+            if (entityTrackParamType == AnimParamType::Position)
+            {
+                entityData.leftTangent *= 100.0f;
+                entityData.rightTangent *= 100.0f;
+            }
+
+            float fPrevKeyTime = 0.0f;
+            float fNextKeyTime = 0.0f;
+
+            bool bIsFirstKey = false;
+            bool bIsMiddleKey = false;
+            bool bIsLastKey = false;
+
+            if (keyNumber == 0 && keyNumber < (keyCount - 1))
+            {
+                const CTrackViewKeyConstHandle nextKeyHandle = pTrack->GetKey(keyNumber + 1);
+                fNextKeyTime = nextKeyHandle.GetTime();
+
+                if (fNextKeyTime != 0.0f)
+                {
+                    bIsFirstKey = true;
+                }
+            }
+            else if (keyNumber > 0)
+            {
+                const CTrackViewKeyConstHandle prevKeyHandle = pTrack->GetKey(keyNumber - 1);
+                fPrevKeyTime = prevKeyHandle.GetTime();
+
+                if (keyNumber < (keyCount - 1))
+                {
+                    const CTrackViewKeyConstHandle nextKeyHandle = pTrack->GetKey(keyNumber + 1);
+                    fNextKeyTime = nextKeyHandle.GetTime();
+
+                    if (fNextKeyTime != 0.0f)
+                    {
+                        bIsMiddleKey = true;
+                    }
+                }
+                else
+                {
+                    bIsLastKey = true;
+                }
+            }
+
+            float fLeftTangentWeightValue = 0.0f;
+            float fRightTangentWeightValue = 0.0f;
+
+            if (bIsFirstKey)
+            {
+                fRightTangentWeightValue = fOutTantentX / fNextKeyTime;
+            }
+            else if (bIsMiddleKey)
+            {
+                fLeftTangentWeightValue = fInTantentX / (fCurrentKeytime - fPrevKeyTime);
+                fRightTangentWeightValue = fOutTantentX / (fNextKeyTime - fCurrentKeytime);
+            }
+            else if (bIsLastKey)
+            {
+                fLeftTangentWeightValue = fInTantentX / (fCurrentKeytime - fPrevKeyTime);
+            }
+
+            entityData.leftTangentWeight = fLeftTangentWeightValue;
+            entityData.rightTangentWeight = fRightTangentWeightValue;
+
+            pObj->m_entityAnimData.push_back(entityData);
+        }
+    }
+}
+
+
+void CExportManager::ProcessEntityAnimationTrack(
+    const AZ::EntityId entityId, Export::CObject* pObj, AnimParamType entityTrackParamType)
+{
+    CTrackViewAnimNode* pEntityNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(entityId);
+    CTrackViewTrack* pEntityTrack = (pEntityNode ? pEntityNode->GetTrackForParameter(entityTrackParamType) : 0);
+
+    if (!pEntityTrack)
+    {
+        return;
+    }
+
+    if (pEntityTrack->GetParameterType() == AnimParamType::FOV)
+    {
+        AddEntityAnimationData(pEntityTrack, pObj, entityTrackParamType);
+        return;
+    }
+
+    for (int trackNumber = 0; trackNumber < pEntityTrack->GetChildCount(); ++trackNumber)
+    {
+        CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pEntityTrack->GetChild(trackNumber));
+
+        if (pSubTrack)
+        {
+            AddEntityAnimationData(pSubTrack, pObj, entityTrackParamType);
+        }
+    }
+}
+
+
+void CExportManager::AddEntityAnimationData(AZ::EntityId entityId)
+{
+    Export::CObject* pObj = new Export::CObject(m_pBaseObj->GetName().toUtf8().data());
+
+    ProcessEntityAnimationTrack(entityId, pObj, AnimParamType::Position);
+    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)
+    {
+        Export::UV tc;
+        meshDesc.m_pTexCoord[v].ExportTo(tc.u, tc.v);
+        tc.v = 1.0f - tc.v;
+        pObj->m_texCoords.push_back(tc);
+    }
+
+    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 != 0)
+        {
+            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 = 0;
+
+    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 = 0;
+                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)
+    {
+        return false;
+    }
+
+    m_pBaseObj = pBaseObj;
+
+    if (m_bAnimationExport)
+    {
+        if (pBaseObj->GetType() == OBJTYPE_AZENTITY)
+        {
+            const auto componentEntityObject = static_cast<CComponentEntityObject*>(pBaseObj);
+            AddEntityAnimationData(componentEntityObject->GetAssociatedEntityId());
+            return true;
+        }
+    }
+
+    if (m_isPrecaching)
+    {
+        AddMeshes(0);
+        return true;
+    }
+
+    Export::CObject* pObj = new Export::CObject(m_pBaseObj->GetName().toUtf8().data());
+
+    AddPosRotScale(pObj, pBaseObj);
+    m_data.m_objects.push_back(pObj);
+
+    m_objectMap[pBaseObj] = int(m_data.m_objects.size() - 1);
+
+    AddMeshes(pObj);
+    m_pBaseObj = 0;
+
+    return true;
+}
+
+
+void CExportManager::AddPosRotScale(Export::CObject* pObj, const CBaseObject* pBaseObj)
+{
+    Vec3 pos = pBaseObj->GetPos();
+    pObj->pos.x = pos.x * m_fScale;
+    pObj->pos.y = pos.y * m_fScale;
+    pObj->pos.z = pos.z * m_fScale;
+
+    Quat rot = pBaseObj->GetRotation();
+    pObj->rot.v.x = rot.v.x;
+    pObj->rot.v.y = rot.v.y;
+    pObj->rot.v.z = rot.v.z;
+    pObj->rot.w = rot.w;
+
+    Vec3 scale = pBaseObj->GetScale();
+    pObj->scale.x = scale.x;
+    pObj->scale.y = scale.y;
+    pObj->scale.z = scale.z;
+}
+
+void CExportManager::AddEntityData(Export::CObject* pObj, Export::AnimParamType dataType, const float fValue, const float fTime)
+{
+    Export::EntityAnimData entityData;
+    entityData.dataType = dataType;
+    entityData.leftTangent = kTangentDelta;
+    entityData.rightTangent = kTangentDelta;
+    entityData.rightTangentWeight = 0.0f;
+    entityData.leftTangentWeight = 0.0f;
+    entityData.keyValue = fValue;
+    entityData.keyTime = fTime;
+    pObj->m_entityAnimData.push_back(entityData);
+}
+
+
+void CExportManager::SolveHierarchy()
+{
+    for (TObjectMap::iterator it = m_objectMap.begin(); it != m_objectMap.end(); ++it)
+    {
+        CBaseObject* pObj = it->first;
+        int index = it->second;
+        if (pObj && pObj->GetParent())
+        {
+            CBaseObject* pParent = pObj->GetParent();
+            TObjectMap::iterator itFind = m_objectMap.find(pParent);
+            if (itFind != m_objectMap.end())
+            {
+                int indexOfParent = itFind->second;
+                if (indexOfParent >= 0 && index >= 0)
+                {
+                    m_data.m_objects[index]->nParent = indexOfParent;
+                }
+            }
+        }
+    }
+
+    m_objectMap.clear();
+}
+
+bool CExportManager::ShowFBXExportDialog()
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!pSequence)
+    {
+        return false;
+    }
+
+    CFBXExporterDialog fpsDialog;
+
+    CTrackViewNode* pivotObjectNode = pSequence->GetFirstSelectedNode();
+
+    if (pivotObjectNode && !pivotObjectNode->IsGroupNode())
+    {
+        m_pivotEntityObject = static_cast<CEntityObject*>(GetIEditor()->GetObjectManager()->FindObject(pivotObjectNode->GetName()));
+
+        if (m_pivotEntityObject)
+        {
+            fpsDialog.SetExportLocalCoordsCheckBoxEnable(true);
+        }
+    }
+
+    if (fpsDialog.exec() != QDialog::Accepted)
+    {
+        return false;
+    }
+
+    SetFBXExportSettings(fpsDialog.GetExportCoordsLocalToTheSelectedObject(), fpsDialog.GetExportOnlyPrimaryCamera(), fpsDialog.GetFPS());
+
+    return true;
+}
+
+bool CExportManager::ProcessObjectsForExport()
+{
+    Export::CObject* pObj = new Export::CObject(kPrimaryCameraName.toUtf8().data());
+    pObj->entityType = Export::eCamera;
+    m_data.m_objects.push_back(pObj);
+
+    float fpsTimeInterval = 1.0f / m_FBXBakedExportFPS;
+    float timeValue = 0.0f;
+
+    GetIEditor()->GetAnimation()->SetRecording(false);
+    GetIEditor()->GetAnimation()->SetPlaying(false);
+
+    CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
+    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
+    {
+        rvp->SetSequenceCamera();
+    }
+
+    int startFrame = 0;
+    timeValue = startFrame * fpsTimeInterval;
+
+    for (int frameID = startFrame; frameID <= m_numberOfExportFrames; ++frameID)
+    {
+        GetIEditor()->GetAnimation()->SetTime(timeValue);
+
+        for (size_t objectID = 0; objectID < m_data.m_objects.size(); ++objectID)
+        {
+            Export::CObject* pObj2 =  m_data.m_objects[objectID];
+            CBaseObject* pObject = 0;
+
+            if (QString::compare(pObj2->name, kPrimaryCameraName) == 0)
+            {
+                pObject = GetIEditor()->GetObjectManager()->FindObject(GetIEditor()->GetViewManager()->GetCameraObjectId());
+            }
+            else
+            {
+                if (m_bExportOnlyPrimaryCamera && pObj2->entityType != Export::eCameraTarget)
+                {
+                    continue;
+                }
+
+                pObject = pObj2->GetLastObjectPtr();
+            }
+
+            if (!pObject)
+            {
+                continue;
+            }
+
+            Quat rotation(pObject->GetRotation());
+
+            if (pObject->GetParent())
+            {
+                CBaseObject* pParentObject = pObject->GetParent();
+                Quat parentWorldRotation;
+
+                const Vec3& parentScale = pParentObject->GetScale();
+                float threshold = 0.0003f;
+
+                bool bParentScaled = false;
+
+                if ((fabsf(parentScale.x - 1.0f) + fabsf(parentScale.y - 1.0f) + fabsf(parentScale.z - 1.0f)) >= threshold)
+                {
+                    bParentScaled = true;
+                }
+
+                if (bParentScaled)
+                {
+                    Matrix34 tm = pParentObject->GetWorldTM();
+                    tm.OrthonormalizeFast();
+                    parentWorldRotation = Quat(tm);
+                }
+                else
+                {
+                    parentWorldRotation = Quat(pParentObject->GetWorldTM());
+                }
+
+                rotation = parentWorldRotation * rotation;
+            }
+
+            Vec3 objectPos = pObject->GetWorldPos();
+
+            if (m_bExportLocalCoords && m_pivotEntityObject && m_pivotEntityObject != pObject)
+            {
+                Matrix34 currentObjectTM = pObject->GetWorldTM();
+                Matrix34 invParentTM = m_pivotEntityObject->GetWorldTM();
+                invParentTM.Invert();
+                currentObjectTM = invParentTM * currentObjectTM;
+
+                objectPos = currentObjectTM.GetTranslation();
+                rotation = Quat(currentObjectTM);
+            }
+
+            Ang3 worldAngles = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(rotation)));
+
+            Export::EntityAnimData entityData;
+            entityData.keyTime = timeValue;
+            entityData.leftTangentWeight = 0.0f;
+            entityData.rightTangentWeight = 0.0f;
+            entityData.leftTangent = 0.0f;
+            entityData.rightTangent = 0.0f;
+
+            entityData.keyValue = objectPos.x;
+            entityData.keyValue *= 100.0f;
+            entityData.dataType = (Export::AnimParamType)AnimParamType::PositionX;
+            pObj2->m_entityAnimData.push_back(entityData);
+
+            entityData.keyValue = objectPos.y;
+            entityData.keyValue *= 100.0f;
+            entityData.dataType = (Export::AnimParamType)AnimParamType::PositionY;
+            pObj2->m_entityAnimData.push_back(entityData);
+
+            entityData.keyValue = objectPos.z;
+            entityData.keyValue *= 100.0f;
+            entityData.dataType = (Export::AnimParamType)AnimParamType::PositionZ;
+            pObj2->m_entityAnimData.push_back(entityData);
+
+            entityData.keyValue = worldAngles.x;
+            entityData.dataType = (Export::AnimParamType)AnimParamType::RotationX;
+            pObj2->m_entityAnimData.push_back(entityData);
+
+            entityData.keyValue = worldAngles.y;
+            entityData.dataType = (Export::AnimParamType)AnimParamType::RotationY;
+            pObj2->m_entityAnimData.push_back(entityData);
+
+            entityData.dataType = (Export::AnimParamType)AnimParamType::RotationZ;
+            entityData.keyValue = worldAngles.z;
+            pObj2->m_entityAnimData.push_back(entityData);
+        }
+
+        timeValue += fpsTimeInterval;
+    }
+
+    return true;
+}
+
+bool CExportManager::IsDuplicateObjectBeingAdded(const QString& newObjectName)
+{
+    for (int objectID = 0; objectID < m_data.m_objects.size(); ++objectID)
+    {
+        if (newObjectName.compare(m_data.m_objects[objectID]->name, Qt::CaseInsensitive) == 0)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+QString CExportManager::CleanXMLText(const QString& text)
+{
+    QString outText(text);
+    outText.replace("\\", "_");
+    outText.replace("/", "_");
+    outText.replace(" ", "_");
+    outText.replace(":", "-");
+    outText.replace(";", "-");
+    return outText;
+}
+
+void CExportManager::FillAnimTimeNode(XmlNodeRef writeNode, CTrackViewAnimNode* pObjectNode, [[maybe_unused]] CTrackViewSequence* currentSequence)
+{
+    if (!writeNode)
+    {
+        return;
+    }
+
+    CTrackViewTrackBundle allTracks = pObjectNode->GetAllTracks();
+    const unsigned int numAllTracks = allTracks.GetCount();
+    bool bCreatedSubNodes = false;
+
+    if (numAllTracks > 0)
+    {
+        XmlNodeRef objNode = writeNode->createNode(CleanXMLText(pObjectNode->GetName()).toUtf8().data());
+        writeNode->setAttr("time", m_animTimeExportPrimarySequenceCurrentTime);
+
+        for (unsigned int trackID = 0; trackID < numAllTracks; ++trackID)
+        {
+            CTrackViewTrack* childTrack = allTracks.GetTrack(trackID);
+
+            AnimParamType trackType = childTrack->GetParameterType().GetType();
+
+            if (trackType == AnimParamType::Animation || trackType == AnimParamType::Sound)
+            {
+                QString childName = CleanXMLText(childTrack->GetName());
+
+                if (childName.isEmpty())
+                {
+                    continue;
+                }
+
+                XmlNodeRef subNode = objNode->createNode(childName.toUtf8().data());
+                CTrackViewKeyBundle keyBundle = childTrack->GetAllKeys();
+                uint keysNumber = keyBundle.GetKeyCount();
+
+                for (uint keyID = 0; keyID < keysNumber; ++keyID)
+                {
+                    const CTrackViewKeyHandle& keyHandle = keyBundle.GetKey(keyID);
+
+                    QString keyContentName;
+                    float keyStartTime = 0.0f;
+                    float keyEndTime = 0.0f;
+                    ;
+                    float keyTime = 0.0f;
+                    float keyDuration = 0.0f;
+
+                    if (trackType == AnimParamType::Animation)
+                    {
+                        if (!m_animKeyTimeExport)
+                        {
+                            continue;
+                        }
+
+                        ICharacterKey animationKey;
+                        keyHandle.GetKey(&animationKey);
+                        keyStartTime = animationKey.m_startTime;
+                        keyEndTime = animationKey.m_endTime;
+                        keyTime = animationKey.time;
+                        keyContentName = CleanXMLText(animationKey.m_animation.c_str());
+                        keyDuration = animationKey.GetActualDuration();
+                    }
+                    else if (trackType == AnimParamType::Sound)
+                    {
+                        if (!m_soundKeyTimeExport)
+                        {
+                            continue;
+                        }
+
+                        ISoundKey soundKey;
+                        keyHandle.GetKey(&soundKey);
+                        keyTime = soundKey.time;
+                        keyContentName = CleanXMLText(soundKey.sStartTrigger.c_str());
+                        keyDuration = soundKey.fDuration;
+                    }
+
+                    if (keyContentName.isEmpty())
+                    {
+                        continue;
+                    }
+
+                    XmlNodeRef keyNode = subNode->createNode(keyContentName.toUtf8().data());
+
+                    float keyGlobalTime = m_animTimeExportPrimarySequenceCurrentTime + keyTime;
+                    keyNode->setAttr("keyTime", keyGlobalTime);
+
+                    if (keyStartTime > 0)
+                    {
+                        keyNode->setAttr("startTime", keyStartTime);
+                    }
+
+                    if (keyEndTime > 0)
+                    {
+                        keyNode->setAttr("endTime", keyEndTime);
+                    }
+
+                    if (keyDuration > 0)
+                    {
+                        keyNode->setAttr("duration", keyDuration);
+                    }
+
+                    subNode->addChild(keyNode);
+                    objNode->addChild(subNode);
+                    bCreatedSubNodes = true;
+                }
+            }
+        }
+
+        if (bCreatedSubNodes)
+        {
+            writeNode->addChild(objNode);
+        }
+    }
+}
+
+
+bool CExportManager::AddObjectsFromSequence(CTrackViewSequence* pSequence, XmlNodeRef seqNode)
+{
+    CTrackViewAnimNodeBundle allNodes = pSequence->GetAllAnimNodes();
+    const unsigned int numAllNodes = allNodes.GetCount();
+
+    for (unsigned int nodeID = 0; nodeID < numAllNodes; ++nodeID)
+    {
+        CTrackViewAnimNode* pAnimNode = allNodes.GetNode(nodeID);
+
+        if (seqNode && pAnimNode)
+        {
+            FillAnimTimeNode(seqNode, pAnimNode, pSequence);
+        }
+
+        AZ::Entity* entity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(
+            entity, &AZ::ComponentApplicationBus::Events::FindEntity, pAnimNode->GetAzEntityId());
+
+        if (entity)
+        {
+            QString addObjectName = entity->GetName().c_str();
+
+            if (IsDuplicateObjectBeingAdded(addObjectName))
+            {
+                continue;
+            }
+
+            Export::CObject* pObj = new Export::CObject(entity->GetName().c_str());
+
+            pObj->m_entityAnimData.reserve(m_numberOfExportFrames * kReserveCount);
+            m_data.m_objects.push_back(pObj);
+        }
+    }
+
+    CTrackViewTrackBundle trackBundle = pSequence->GetTracksByParam(AnimParamType::Sequence);
+
+    const uint numSequenceTracks = trackBundle.GetCount();
+    for (uint i = 0; i < numSequenceTracks; ++i)
+    {
+        CTrackViewTrack* pSequenceTrack = trackBundle.GetTrack(i);
+        if (pSequenceTrack->IsDisabled())
+        {
+            continue;
+        }
+
+        const uint numKeys = pSequenceTrack->GetKeyCount();
+        for (int keyIndex = 0; keyIndex < numKeys; ++keyIndex)
+        {
+            const CTrackViewKeyHandle& keyHandle = pSequenceTrack->GetKey(keyIndex);
+            ISequenceKey sequenceKey;
+            keyHandle.GetKey(&sequenceKey);
+
+            CTrackViewSequence* pSubSequence = CDirectorNodeAnimator::GetSequenceFromSequenceKey(sequenceKey);
+
+            if (pSubSequence)
+            {
+                if (pSubSequence && !pSubSequence->IsDisabled())
+                {
+                    XmlNodeRef subSeqNode = 0;
+
+                    if (!seqNode)
+                    {
+                        AddObjectsFromSequence(pSubSequence);
+                    }
+                    else
+                    {
+                        // In case of exporting animation/sound times data
+                        const QString sequenceName = pSubSequence->GetName();
+                        XmlNodeRef subSeqNode2 = seqNode->createNode(sequenceName.toUtf8().data());
+
+                        if (sequenceName == m_animTimeExportPrimarySequenceName)
+                        {
+                            m_animTimeExportPrimarySequenceCurrentTime = sequenceKey.time;
+                        }
+                        else
+                        {
+                            m_animTimeExportPrimarySequenceCurrentTime += sequenceKey.time;
+                        }
+
+                        AddObjectsFromSequence(pSubSequence, subSeqNode2);
+                        seqNode->addChild(subSeqNode2);
+                    }
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+bool CExportManager::AddSelectedEntityObjects()
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSequence)
+    {
+        return false;
+    }
+
+    CTrackViewAnimNodeBundle selectedNodes = pSequence->GetSelectedAnimNodes();
+    const unsigned int numSelectedNodes = selectedNodes.GetCount();
+
+    for (unsigned int nodeNumber = 0; nodeNumber < numSelectedNodes; ++nodeNumber)
+    {
+        if (m_bAnimationExport)
+        {
+            CTrackViewAnimNode* pAnimNode = selectedNodes.GetNode(nodeNumber);
+            AddEntityAnimationData(pAnimNode->GetAzEntityId());
+        }
+    }
+
+    return true;
+}
+
+bool CExportManager::AddSelectedRegionObjects()
+{
+    AABB box;
+    GetIEditor()->GetSelectedRegion(box);
+    if (box.IsEmpty())
+    {
+        return false;
+    }
+
+    std::vector<CBaseObject*> objects;
+    GetIEditor()->GetObjectManager()->FindObjectsInAABB(box, objects);
+
+    int numObjects = objects.size();
+    if (numObjects > m_data.m_objects.size())
+    {
+        m_data.m_objects.reserve(numObjects + 1); // +1 for terrain
+    }
+    // First run pipeline to precache geometry
+    m_isPrecaching = true;
+    for (size_t i = 0; i < numObjects; ++i)
+    {
+        AddObject(objects[i]);
+    }
+
+    // Repeat pipeline to collect geometry
+    m_isPrecaching = false;
+    for (size_t i = 0; i < numObjects; ++i)
+    {
+        AddObject(objects[i]);
+    }
+
+    return true;
+}
+
+bool CExportManager::ExportToFile(const char* filename, bool bClearDataAfterExport)
+{
+    bool bRet = false;
+    QString ext = PathUtil::GetExt(filename);
+
+    if (m_data.GetObjectCount() == 0)
+    {
+        QMessageBox::warning(QApplication::activeWindow(), QString(), QObject::tr("Track View selection does not exist as an object."));
+        return false;
+    }
+
+    for (int i = 0; i < m_exporters.size(); ++i)
+    {
+        IExporter* pExporter = m_exporters[i];
+        if (!QString::compare(ext, pExporter->GetExtension(), Qt::CaseInsensitive))
+        {
+            bRet = pExporter->ExportToFile(filename, &m_data);
+            break;
+        }
+    }
+
+    if (bClearDataAfterExport)
+    {
+        m_data.Clear();
+    }
+    return bRet;
+}
+
+
+bool CExportManager::Export(const char* defaultName, const char* defaultExt, const char* defaultPath, [[maybe_unused]] bool isSelectedObjects, bool isSelectedRegionObjects, bool isOccluder, bool bAnimationExport)
+{
+    m_bAnimationExport = bAnimationExport;
+
+    m_isOccluder    =   isOccluder;
+    const float OldScale    =   m_fScale;
+    if (isOccluder)
+    {
+        m_fScale    =   1.f;
+    }
+
+    m_data.Clear();
+    m_objectMap.clear();
+
+    QString filters;
+    for (TExporters::iterator ppExporter = m_exporters.begin(); ppExporter != m_exporters.end(); ++ppExporter)
+    {
+        IExporter* pExporter = (*ppExporter);
+        if (pExporter)
+        {
+            const QString ext = pExporter->GetExtension();
+            const QString newFilter = QString("%1 (*.%2)").arg(pExporter->GetShortDescription(), ext);
+            if (filters.isEmpty())
+            {
+                filters = newFilter;
+            }
+            else if (ext == defaultExt) // the default extension should be the first item in the list, so it's the default export options
+            {
+                filters = newFilter + ";;" + filters;
+            }
+            else
+            {
+                filters = filters + ";;" + newFilter;
+            }
+        }
+    }
+    filters += ";;All files (*)";
+
+    bool returnRes = false;
+
+    QString newFilename(defaultName);
+    if (m_bAnimationExport || CFileUtil::SelectSaveFile(filters, defaultExt, defaultPath, newFilename))
+    {
+        WaitCursor wait;
+        if (isSelectedRegionObjects)
+        {
+            AddSelectedRegionObjects();
+        }
+
+        if (!bAnimationExport)
+        {
+            SolveHierarchy();
+        }
+
+        if (m_bAnimationExport)
+        {
+            CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+            if (pSequence)
+            {
+                // Save To FBX custom selected nodes
+                if (!m_bBakedKeysSequenceExport)
+                {
+                    returnRes = AddSelectedEntityObjects();
+                }
+                else
+                {
+                    // Export the whole sequence with baked keys
+                    if (ShowFBXExportDialog())
+                    {
+                        m_numberOfExportFrames = pSequence->GetTimeRange().end * m_FBXBakedExportFPS;
+
+                        if (!m_bExportOnlyPrimaryCamera)
+                        {
+                            AddObjectsFromSequence(pSequence);
+                        }
+
+                        returnRes = ProcessObjectsForExport();
+                        SolveHierarchy();
+                    }
+                }
+            }
+
+            if (returnRes)
+            {
+                returnRes = ExportToFile(defaultName);
+            }
+        }
+        else
+        {
+            returnRes = ExportToFile(newFilename.toStdString().c_str());
+        }
+    }
+
+    m_fScale = OldScale;
+    m_bBakedKeysSequenceExport = true;
+    m_FBXBakedExportFPS = 0.0f;
+
+    return returnRes;
+}
+
+void CExportManager::SetFBXExportSettings(bool bLocalCoordsToSelectedObject, bool bExportOnlyPrimaryCamera, const float fps)
+{
+    m_bExportLocalCoords = bLocalCoordsToSelectedObject;
+    m_bExportOnlyPrimaryCamera = bExportOnlyPrimaryCamera;
+    m_FBXBakedExportFPS = fps;
+}
+
+Export::Object* Export::CData::AddObject(const char* objectName)
+{
+    for (size_t objectID = 0; objectID < m_objects.size(); ++objectID)
+    {
+        if (strcmp(m_objects[objectID]->name, objectName) == 0)
+        {
+            return m_objects[objectID];
+        }
+    }
+
+    CObject* pObj = new CObject(objectName);
+    m_objects.push_back(pObj);
+    return m_objects[m_objects.size() - 1];
+}
+
+bool CExportManager::ImportFromFile(const char* filename)
+{
+    bool bRet = false;
+    QString ext = PathUtil::GetExt(filename);
+
+    m_data.Clear();
+
+    for (size_t handlerID = 0; handlerID < m_exporters.size(); ++handlerID)
+    {
+        IExporter* pExporter = m_exporters[handlerID];
+        if (!QString::compare(ext, pExporter->GetExtension(), Qt::CaseInsensitive))
+        {
+            bRet = pExporter->ImportFromFile(filename, &m_data);
+            break;
+        }
+    }
+
+    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();
+    if (!pSequence)
+    {
+        return;
+    }
+
+    CTrackViewExportKeyTimeDlg exportDialog;
+
+    if (exportDialog.exec() == QDialog::Accepted)
+    {
+        m_animKeyTimeExport = exportDialog.IsAnimationExportChecked();
+        m_soundKeyTimeExport = exportDialog.IsSoundExportChecked();
+
+        QString filters = "All files (*.xml)";
+        QString defaultName = QString(pSequence->GetName()) + ".xml";
+
+        QtUtil::QtMFCScopedHWNDCapture cap;
+        CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptSave, QFileDialog::AnyFile, "xml", defaultName, filters, {}, {}, cap);
+        if (dlg.exec())
+        {
+            m_animTimeNode = XmlHelpers::CreateXmlNode(pSequence->GetName());
+            m_animTimeExportPrimarySequenceName = pSequence->GetName();
+
+            m_data.Clear();
+            m_animTimeExportPrimarySequenceCurrentTime = 0.0;
+
+            AddObjectsFromSequence(pSequence, m_animTimeNode);
+
+            m_animTimeNode->saveToFile(dlg.selectedFiles().constFirst().toStdString().c_str());
+            QMessageBox::information(QApplication::activeWindow(), QString(), QObject::tr("Export Finished"));
+        }
+    }
+}
diff --git a/Code/Editor/Export/ExportManager.h b/Code/Editor/Export/ExportManager.h
new file mode 100644
index 0000000000..489ac542d1
--- /dev/null
+++ b/Code/Editor/Export/ExportManager.h
@@ -0,0 +1,199 @@
+/*
+ * 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 : Manager for export geometry
+
+
+#ifndef CRYINCLUDE_EDITOR_EXPORT_EXPORTMANAGER_H
+#define CRYINCLUDE_EDITOR_EXPORT_EXPORTMANAGER_H
+#pragma once
+
+
+#include <AzCore/Component/EntityId.h>
+#include <IExportManager.h>
+
+class CExportManager;
+class CTrackViewTrack;
+class CTrackViewSequence;
+class CTrackViewAnimNode;
+class CEntityObject;
+
+typedef std::vector<IExporter*> TExporters;
+
+
+namespace Export
+{
+    class CMesh
+        : public Mesh
+        , public CRefCountBase
+    {
+    public:
+        CMesh();
+
+        virtual int GetFaceCount() const { return m_faces.size(); }
+        virtual const Face* GetFaceBuffer() const { return m_faces.size() ? &m_faces[0] : 0; }
+
+    private:
+        std::vector<Face> m_faces;
+
+        friend CExportManager;
+    };
+
+
+    class CObject
+        : public Object
+        , public CRefCountBase
+    {
+    public:
+        CObject(const char* pName);
+
+        virtual int GetVertexCount() const { return m_vertices.size(); }
+        virtual const Vector3D* GetVertexBuffer() const{ return m_vertices.size() ? &m_vertices[0] : 0; }
+
+        virtual int GetNormalCount() const { return m_normals.size(); }
+        virtual const Vector3D* GetNormalBuffer() const { return m_normals.size() ? &m_normals[0] : 0; }
+
+        virtual int GetTexCoordCount() const { return m_texCoords.size(); }
+        virtual const UV* GetTexCoordBuffer() const { return m_texCoords.size() ? &m_texCoords[0] : 0; }
+
+        virtual int GetMeshCount() const { return m_meshes.size(); }
+        virtual Mesh* GetMesh(int index) const { return m_meshes[index]; }
+
+        virtual size_t  MeshHash() const{return m_MeshHash; }
+
+        void SetMaterialName(const char* pName);
+        virtual int GetEntityAnimationDataCount() const {return m_entityAnimData.size(); }
+        virtual const EntityAnimData* GetEntityAnimationData(int index) const {return &m_entityAnimData[index]; }
+        virtual void SetEntityAnimationData(EntityAnimData entityData){ m_entityAnimData.push_back(entityData); };
+        void SetLastPtr(CBaseObject* pObject){m_pLastObject = pObject; };
+        CBaseObject* GetLastObjectPtr(){return m_pLastObject; };
+
+    private:
+        CBaseObject* m_pLastObject;
+        std::vector<Vector3D> m_vertices;
+        std::vector<Vector3D> m_normals;
+        std::vector<UV> m_texCoords;
+        std::vector< _smart_ptr<CMesh> > m_meshes;
+        std::vector<EntityAnimData> m_entityAnimData;
+
+        size_t  m_MeshHash;
+
+        friend CExportManager;
+    };
+
+
+    class CData
+        : public IData
+    {
+    public:
+        virtual int GetObjectCount() const { return m_objects.size(); }
+        virtual Object* GetObject(int index) const { return m_objects[index]; }
+        virtual Object* AddObject(const char* objectName);
+        void Clear();
+
+    private:
+        std::vector< _smart_ptr<Export::CObject> > m_objects;
+
+        friend CExportManager;
+    };
+}
+
+
+typedef std::map<CBaseObject*, int> TObjectMap;
+
+class CExportManager
+    : public IExportManager
+{
+public:
+
+    CExportManager();
+    virtual ~CExportManager();
+
+    //! Register exporter
+    //! return true if succeed, otherwise false
+    virtual bool RegisterExporter(IExporter* pExporter);
+
+    //! Export specified geometry
+    //! return true if succeed, otherwise false
+    bool Export(const char* defaultName, const char* defaultExt = "", const char* defaultPath = "", bool isSelectedObjects = true,
+        bool isSelectedRegionObjects = false, bool isOccluder = false, bool bAnimationExport = false);
+
+    bool AddSelectedEntityObjects();
+
+    //! Add to Export Data geometry from objects inside selected region volume
+    //! return true if succeed, otherwise false
+    bool AddSelectedRegionObjects();
+
+    //! Export to file collected data, using specified exporter throughout the file extension
+    //! return true if succeed, otherwise false
+    bool ExportToFile(const char* filename, bool bClearDataAfterExport = true);
+
+    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
+    virtual bool ExportSingleStatObj(IStatObj* pStatObj, const char* filename);
+
+    void SetBakedKeysSequenceExport(bool bBaked){m_bBakedKeysSequenceExport = bBaked; };
+
+    void SaveNodeKeysTimeToXML();
+
+private:
+    void AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh, Matrix34A* pTm = 0);
+    bool AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm = 0);
+    bool AddMeshes(Export::CObject* pObj);
+    bool AddObject(CBaseObject* pBaseObj);
+    void SolveHierarchy();
+
+    void AddEntityAnimationData(AZ::EntityId entityId);
+    void ProcessEntityAnimationTrack(AZ::EntityId entityId, Export::CObject* pObj, AnimParamType entityTrackParamType);
+    void AddEntityAnimationData(const CTrackViewTrack* pTrack, Export::CObject* pObj, AnimParamType entityTrackParamType);
+
+    void AddPosRotScale(Export::CObject* pObj, const CBaseObject* pBaseObj);
+    void AddEntityData(Export::CObject* pObj, Export::AnimParamType dataType, const float fValue, const float fTime);
+
+    bool AddObjectsFromSequence(CTrackViewSequence* pSequence, XmlNodeRef seqNode = 0);
+    bool IsDuplicateObjectBeingAdded(const QString& newObject);
+    void SetFBXExportSettings(bool bLocalCoordsToSelectedObject, bool bExportOnlyPrimaryCamera, const float fps);
+    bool ProcessObjectsForExport();
+
+    bool ShowFBXExportDialog();
+
+    void FillAnimTimeNode(XmlNodeRef writeNode, CTrackViewAnimNode* pObjectNode, CTrackViewSequence* currentSequence);
+    QString CleanXMLText(const QString& text);
+
+private:
+
+    TExporters m_exporters;
+    Export::CData m_data;
+    bool m_isPrecaching;
+    bool m_isOccluder;
+    float m_fScale;
+    TObjectMap m_objectMap;
+    bool m_bAnimationExport;
+
+    CBaseObject* m_pBaseObj;
+
+    float m_FBXBakedExportFPS;
+    bool m_bExportLocalCoords;
+    bool m_bExportOnlyPrimaryCamera;
+    int m_numberOfExportFrames;
+    CEntityObject* m_pivotEntityObject;
+    bool m_bBakedKeysSequenceExport;
+
+    QString m_animTimeExportPrimarySequenceName;
+    float m_animTimeExportPrimarySequenceCurrentTime;
+    XmlNodeRef m_animTimeNode;
+
+    bool m_animKeyTimeExport;
+    bool m_soundKeyTimeExport;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_EXPORT_EXPORTMANAGER_H
diff --git a/Code/Editor/Export/OBJExporter.cpp b/Code/Editor/Export/OBJExporter.cpp
new file mode 100644
index 0000000000..e3efab3647
--- /dev/null
+++ b/Code/Editor/Export/OBJExporter.cpp
@@ -0,0 +1,283 @@
+/*
+ * 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 "OBJExporter.h"
+
+
+const char* COBJExporter::GetExtension() const
+{
+    return "obj";
+}
+
+
+const char* COBJExporter::GetShortDescription() const
+{
+    return "Object files";
+}
+
+
+bool COBJExporter::ExportToFile(const char* filename, const Export::IData* pExportData)
+{
+    CLogFile::FormatLine("Exporting OBJ file to '%s'", filename);
+
+    FILE* hFile = nullptr;
+    azfopen(&hFile, filename, "w");
+    if (!hFile)
+    {
+        CLogFile::FormatLine("Error while opening file '%s'!", filename);
+        assert(hFile);
+        return false;
+    }
+
+    // Write header
+    fprintf(hFile, "# Object file exported by Sandbox\n");
+    fprintf(hFile, "# Attention: while import to 3DS Max Unify checkbox for normals must be unchecked.\n");
+    fprintf(hFile, "#\n");
+
+    // Create MTL library filename
+    QString materialFilename = filename;
+    materialFilename = Path::ReplaceExtension(materialFilename, "mtl");
+    materialFilename = Path::GetFile(materialFilename);
+
+    // Write material library import statement
+    fprintf(hFile, "mtllib %s\n", materialFilename.toUtf8().data());
+    fprintf(hFile, "#\n");
+
+    int numObjects = pExportData->GetObjectCount();
+    for (int i = 0; i < numObjects; ++i)
+    {
+        const Export::Object* pObj = pExportData->GetObject(i);
+
+        Vec3 pos(pObj->pos.x, pObj->pos.y, pObj->pos.z);
+        Quat rot(pObj->rot.w, pObj->rot.v.x, pObj->rot.v.y, pObj->rot.v.z);
+        Vec3 scale(pObj->scale.x, pObj->scale.y, pObj->scale.z);
+
+        Matrix34 tm = Matrix33::CreateScale(scale) * Matrix34(rot);
+        tm.SetTranslation(pos);
+
+        int nParent = pObj->nParent;
+        while (nParent >= 0 && nParent < pExportData->GetObjectCount())
+        {
+            const Export::Object* pParentObj = pExportData->GetObject(nParent);
+            assert(NULL != pParentObj);
+
+            Vec3 pos2(pParentObj->pos.x, pParentObj->pos.y, pParentObj->pos.z);
+            Quat rot2(pParentObj->rot.w, pParentObj->rot.v.x, pParentObj->rot.v.y, pParentObj->rot.v.z);
+            Vec3 scale2(pParentObj->scale.x, pParentObj->scale.y, pParentObj->scale.z);
+
+            Matrix34 parentTm = Matrix33::CreateScale(scale2) * Matrix34(rot2);
+            parentTm.SetScale(scale2);
+            parentTm.SetTranslation(pos2);
+
+            tm = tm * parentTm;
+            nParent = pParentObj->nParent;
+        }
+
+        fprintf(hFile, "g %s\n", pObj->name); //For XSI
+        fprintf(hFile, "# object %s\n", pObj->name);
+        fprintf(hFile, "#\n");
+
+        int numVertices = pObj->GetVertexCount();
+        const Export::Vector3D* pVerts = pObj->GetVertexBuffer();
+
+        for (int ii = 0; ii < numVertices; ++ii)
+        {
+            const Export::Vector3D& vertex = pVerts[ii];
+
+            Vec3 vec(vertex.x, vertex.y, vertex.z);
+            vec = tm.TransformPoint(vec);
+
+            fprintf(hFile, "v %s %s %s\n", TrimFloat(vec.x), TrimFloat(vec.y), TrimFloat(vec.z));
+        }
+        fprintf(hFile, "# %i vertices\n\n", numVertices);
+
+        // Write object texture coordinates
+        int numTexCoords = pObj->GetTexCoordCount();
+        const Export::UV* pTexCoord = pObj->GetTexCoordBuffer();
+        for (int ii = 0; ii < numTexCoords; ++ii)
+        {
+            const Export::UV& textCoord = pTexCoord[ii];
+            fprintf(hFile, "vt %s %s 0\n", TrimFloat(textCoord.u), TrimFloat(textCoord.v));
+        }
+        fprintf(hFile, "# %i texture vertices\n\n", numTexCoords);
+
+        // Write object normals
+        int numNormals = pObj->GetNormalCount();
+        const Export::Vector3D* pNormals = pObj->GetNormalBuffer();
+        for (int ii = 0; ii < numNormals; ++ii)
+        {
+            const Export::Vector3D& normal = pNormals[ii];
+            fprintf(hFile, "vn %s %s %s\n", TrimFloat(normal.x), TrimFloat(normal.y), TrimFloat(normal.z));
+        }
+        fprintf(hFile, "# %i vertex normals\n\n", numNormals);
+
+
+        // Write submeshes
+        int numMeshes = pObj->GetMeshCount();
+        for (int j = 0; j < numMeshes; ++j)
+        {
+            const Export::Mesh* pMesh = pObj->GetMesh(j);
+            if (pMesh->material.name[0] != '\0')
+            {
+                fprintf(hFile, "usemtl %s\n", pMesh->material.name);
+            }
+
+            // TODO: if it's a smoth group fix it to bit difference
+            fprintf(hFile, "s %d\n", j);
+
+            // Write all faces, convert the indices to one based indices
+            int numFaces = pMesh->GetFaceCount();
+            const Export::Face* pFaceBuf = pMesh->GetFaceBuffer();
+            for (int ii = 0; ii < numFaces; ++ii)
+            {
+                const Export::Face& face = pFaceBuf[ii];
+                fprintf(hFile, "f %i/%i/%i %i/%i/%i %i/%i/%i\n",
+                    face.idx[0] - numVertices, face.idx[0] - numTexCoords, face.idx[0] - numNormals,
+                    face.idx[1] - numVertices, face.idx[1] - numTexCoords, face.idx[1] - numNormals,
+                    face.idx[2] - numVertices, face.idx[2] - numTexCoords, face.idx[2] - numNormals);
+            }
+            fprintf(hFile, "# %i faces\n\n", numFaces);
+        }
+    }
+
+    fprintf(hFile, "g\n");
+    fclose(hFile);
+
+
+    // Export Material
+    materialFilename = Path::ReplaceExtension(filename, "mtl");
+
+    // Open the material file
+    hFile = nullptr;
+    azfopen(&hFile, materialFilename.toUtf8().data(), "w");
+    if (!hFile)
+    {
+        CLogFile::FormatLine("Error while opening file '%s'!", materialFilename.toUtf8().data());
+        assert(hFile);
+        return false;
+    }
+
+    // Write header
+    fprintf(hFile, "# Material file exported by Sandbox\n\n");
+
+    for (int i = 0; i < numObjects; ++i)
+    {
+        const Export::Object* pObj = pExportData->GetObject(i);
+
+        int numMeshes = pObj->GetMeshCount();
+        for (int j = 0; j < numMeshes; j++)
+        {
+            const Export::Mesh* pMesh = pObj->GetMesh(j);
+            if (pMesh->material.name[0] != '\0')
+            {
+                // Write material
+                const Export::Material& mtl = pMesh->material;
+                fprintf(hFile, "newmtl %s\n", mtl.name);
+                fprintf(hFile, "Ka %s %s %s\n", TrimFloat(mtl.diffuse.r), TrimFloat(mtl.diffuse.g), TrimFloat(mtl.diffuse.b));
+                fprintf(hFile, "Kd %s %s %s\n", TrimFloat(mtl.diffuse.r), TrimFloat(mtl.diffuse.g), TrimFloat(mtl.diffuse.b));
+                fprintf(hFile, "Ks %s %s %s\n", TrimFloat(mtl.specular.r), TrimFloat(mtl.specular.g), TrimFloat(mtl.specular.b));
+                fprintf(hFile, "d %s\n", TrimFloat(1.0f - mtl.opacity));
+                fprintf(hFile, "Tr %s\n", TrimFloat(1.0f - mtl.opacity));
+                fprintf(hFile, "Ns %s\n", TrimFloat(mtl.smoothness));
+                if (strlen(mtl.mapDiffuse))
+                {
+                    fprintf(hFile, "map_Kd %s\n", MakeRelativePath(filename, mtl.mapDiffuse).toUtf8().constData());
+                }
+                if (strlen(mtl.mapSpecular))
+                {
+                    fprintf(hFile, "map_Ns %s\n", MakeRelativePath(filename, mtl.mapSpecular).toUtf8().constData());
+                }
+                if (strlen(mtl.mapOpacity))
+                {
+                    fprintf(hFile, "map_d %s\n", MakeRelativePath(filename, mtl.mapOpacity).toUtf8().constData());
+                }
+                if (strlen(mtl.mapNormals))
+                {
+                    fprintf(hFile, "bump %s\n", MakeRelativePath(filename, mtl.mapNormals).toUtf8().constData());
+                }
+                if (strlen(mtl.mapDecal))
+                {
+                    fprintf(hFile, "decal %s\n", MakeRelativePath(filename, mtl.mapDecal).toUtf8().constData());
+                }
+                if (strlen(mtl.mapDisplacement))
+                {
+                    fprintf(hFile, "disp %s\n", MakeRelativePath(filename, mtl.mapDisplacement).toUtf8().constData());
+                }
+                fprintf(hFile, "\n");
+            }
+        }
+    }
+
+    fclose(hFile);
+
+    return true;
+}
+
+
+QString COBJExporter::MakeRelativePath(const char* pMainFileName, const char* pFileName) const
+{
+    const char* ch = strrchr(pMainFileName, '\\');
+    if (ch)
+    {
+        if (strlen(pFileName) > ch - pMainFileName && !_strnicmp(pMainFileName, pFileName, ch - pMainFileName))
+        {
+            return QString(pFileName + (ch - pMainFileName) + 1);
+        }
+    }
+
+    return QString(pFileName);
+}
+
+
+const char* COBJExporter::TrimFloat(float fValue) const
+{
+    // Convert a float into a string representation and remove all
+    // uneccessary zeroes and the decimal dot if it is not needed
+    const int nMaxAccessInTime = 4;
+
+    static char ppBufs[nMaxAccessInTime][16];
+    static int nCurBuf = 0;
+
+    if (nCurBuf >= nMaxAccessInTime)
+    {
+        nCurBuf = 0;
+    }
+
+    char* pBuf = ppBufs[nCurBuf];
+    size_t bufSize = sizeof(ppBufs[nCurBuf]);
+    ++nCurBuf;
+    sprintf_s(pBuf, bufSize, "%f", fValue);
+
+    for (int i = strlen(pBuf) - 1; i > 0; --i)
+    {
+        if (pBuf[i] == '0')
+        {
+            pBuf[i] = 0;
+        }
+        else if (pBuf[i] == '.')
+        {
+            pBuf[i] = 0;
+            break;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    return pBuf;
+}
+
+
+
+void COBJExporter::Release()
+{
+    delete this;
+}
diff --git a/Code/Editor/Export/OBJExporter.h b/Code/Editor/Export/OBJExporter.h
new file mode 100644
index 0000000000..420535f8de
--- /dev/null
+++ b/Code/Editor/Export/OBJExporter.h
@@ -0,0 +1,36 @@
+/*
+ * 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 : Export geometry OBJ file format
+
+
+#ifndef CRYINCLUDE_EDITOR_EXPORT_OBJEXPORTER_H
+#define CRYINCLUDE_EDITOR_EXPORT_OBJEXPORTER_H
+#pragma once
+
+
+#include <IExportManager.h>
+
+
+class COBJExporter
+    : public IExporter
+{
+public:
+    virtual const char* GetExtension() const;
+    virtual const char* GetShortDescription() const;
+    virtual bool ExportToFile(const char* filename, const Export::IData* pExportData);
+    virtual bool ImportFromFile([[maybe_unused]] const char* filename, [[maybe_unused]] Export::IData* pData){return false; };
+    virtual void Release();
+
+private:
+    const char* TrimFloat(float fValue) const;
+    QString MakeRelativePath(const char* pMainFileName, const char* pFileName) const;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_EXPORT_OBJEXPORTER_H
diff --git a/Code/Editor/Export/OCMExporter.cpp b/Code/Editor/Export/OCMExporter.cpp
new file mode 100644
index 0000000000..7b809742e0
--- /dev/null
+++ b/Code/Editor/Export/OCMExporter.cpp
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "OCMExporter.h"
+
+
+class CFileEndianWriter
+{
+    std::vector<uint8>              m_Data;
+    size_t                                      m_Offset;
+public:
+    CFileEndianWriter()
+        : m_Offset(0){}
+    void                                            Seek(size_t Offset){m_Offset = Offset; }
+    void                                            Write(const void* pData, size_t Size)
+    {
+        if (m_Offset + Size > m_Data.size())
+        {
+            m_Data.resize(m_Offset + Size);
+        }
+        memcpy(&m_Data[m_Offset], pData, Size);
+        m_Offset += Size;
+    }
+    size_t                                      Pos() const{return m_Offset; }
+    template<size_t Padding>
+    void                                            Align(){m_Offset = (m_Offset + (Padding - 1)) & ~(Padding - 1); }
+    template<class T>
+    void                                            Write(T D){Write(&D, sizeof(T)); }
+
+
+    const std::vector<uint8>&   Data() const{return m_Data; }
+};
+
+const char* COCMExporter::GetExtension() const
+{
+    return "ocm";
+}
+
+const char* COCMExporter::GetShortDescription() const
+{
+    return "occlusion culler mesh";
+}
+
+Matrix44 MatRotate(f32 a, f32 b, f32 g)
+{
+    const f32   CosR    =   cosf(a);
+    const f32   SinR    =   sinf(a);
+    const f32   CosP    =   cosf(b);
+    const f32   SinP    =   sinf(b);
+    const f32   CosY    =   cosf(g);
+    const f32   SinY    =   sinf(g);
+    const f32   SRSP    =   SinR * SinP;
+    const f32   CRSP    =   CosR * SinP;
+
+    Matrix44 Mat;
+    Mat.m00 = CosP * CosY;
+    Mat.m01 = CosP * SinY;
+    Mat.m02 = -SinP;
+    Mat.m03 = 0.f;
+    Mat.m10 = SRSP * CosY - CosR * SinY;
+    Mat.m11 = SRSP * SinY + CosR * CosY;
+    Mat.m12 = SinR * CosP;
+    Mat.m13 = 0.f;
+    Mat.m20 = CRSP * CosY + SinR * SinY;
+    Mat.m21 = CRSP * SinY - SinR * CosY;
+    Mat.m22 = CosR * CosP;
+    Mat.m23 = 0.f;
+    Mat.m30 = 0.f;
+    Mat.m31 = 0.f;
+    Mat.m32 = 0.f;
+    Mat.m33 = 1.f;
+    return Mat;
+};
+
+void COCMExporter::Extends(const Matrix44& rTransform, const Export::Object* pMesh, f32& rMinX, f32& rMaxX, f32& rMinY, f32& rMaxY, f32& rMinZ, f32& rMaxZ)    const
+{
+    rMinX = rMinY = rMinZ   =   FLT_MAX;
+    rMaxX = rMaxY = rMaxZ   =   -FLT_MAX;
+    const uint32 TriCount   =   pMesh->GetVertexCount();
+    const Export::Vector3D* pVerts = pMesh->GetVertexBuffer();
+    for (size_t a = 0; a < TriCount; a++)
+    {
+        const Export::Vector3D& rV = pVerts[a];
+        const Vec3  VO(rV.x, rV.y, rV.z);
+        const Vec3  V   =   rTransform.TransformPoint(VO);
+        rMinX   =   std::min(rMinX, V.x);
+        rMinY   =   std::min(rMinY, V.y);
+        rMinZ   =   std::min(rMinZ, V.z);
+        rMaxX   =   std::max(rMaxX, V.x);
+        rMaxY   =   std::max(rMaxY, V.y);
+        rMaxZ   =   std::max(rMaxZ, V.z);
+    }
+}
+
+Matrix44 COCMExporter::CalcOBB(const Export::Object* pMesh)
+{
+    Matrix44 OBBMat(IDENTITY);
+    f32 MinX, MaxX, MinY, MaxY, MinZ, MaxZ;
+    Extends(OBBMat, pMesh, MinX, MaxX, MinY, MaxY, MinZ, MaxZ);
+
+    OBBMat.m03  =   -(MaxX + MinX) * 0.5f;
+    OBBMat.m13  =   -(MaxY + MinY) * 0.5f;
+    OBBMat.m23  =   -(MaxZ + MinZ) * 0.5f;
+
+    return OBBMat;
+}
+
+size_t COCMExporter::SaveMesh(CFileEndianWriter& rWriter, const Export::Object* pMesh, Matrix44& rOBBMat)
+{
+    const size_t PosStart   =   rWriter.Pos();
+    rOBBMat =   CalcOBB(pMesh);
+    const Export::Vector3D* pVerts = pMesh->GetVertexBuffer();
+    std::vector<float> Pos;
+    const uint32 SubMeshCount = pMesh->GetMeshCount();
+    for (uint32 b = 0; b < SubMeshCount; b++)
+    {
+        const Export::Mesh* pSubMesh = pMesh->GetMesh(b);
+        const uint32 FaceCount  = pSubMesh->GetFaceCount();
+        const Export::Face* pFaces = pSubMesh->GetFaceBuffer();
+        Pos.reserve(Pos.size() + FaceCount * 9);
+        for (size_t a = 0; a < FaceCount; a++)
+        {
+            const Export::Vector3D& rV0 = pVerts[pFaces[a].idx[0]];
+            const Export::Vector3D& rV1 = pVerts[pFaces[a].idx[1]];
+            const Export::Vector3D& rV2 = pVerts[pFaces[a].idx[2]];
+            const Vec3  VO0(rV0.x, rV0.y, rV0.z);
+            const Vec3  VO1(rV1.x, rV1.y, rV1.z);
+            const Vec3  VO2(rV2.x, rV2.y, rV2.z);
+            const Vec3  V0  =   rOBBMat.TransformPoint(VO0);
+            const Vec3  V1  =   rOBBMat.TransformPoint(VO1);
+            const Vec3  V2  =   rOBBMat.TransformPoint(VO2);
+            const Vec3  N   =   (V2 - V0).cross(V1 - V0);
+            if (fabsf(N.dot(N)) <= FLT_EPSILON)//degenerated?
+            {
+                continue;
+            }
+            Pos.push_back(V0.x);
+            Pos.push_back(V0.y);
+            Pos.push_back(V0.z);
+            Pos.push_back(1.f);
+            Pos.push_back(V1.x);
+            Pos.push_back(V1.y);
+            Pos.push_back(V1.z);
+            Pos.push_back(1.f);
+            Pos.push_back(V2.x);
+            Pos.push_back(V2.y);
+            Pos.push_back(V2.z);
+            Pos.push_back(1.f);
+        }
+    }
+    const uint32 TriCount       =   static_cast<uint16>(std::min<size_t>(65535, Pos.size() / 4));//vertex count at 4float/vertex
+    rWriter.Write(TriCount);
+    rWriter.Align<16>();
+    rWriter.Write(&Pos[0], 4 * TriCount * sizeof(float));
+    rWriter.Align<4>();
+    const size_t PosEnd =   rWriter.Pos();
+    return PosEnd - PosStart;//sizeof(TriCount)+sizeof(Pos[0])*Pos.size();
+}
+
+void COCMExporter::SaveInstance(CFileEndianWriter& rWriter, const Export::Object* pInstance, const SOCMeshInfo& rMeshInfo)
+{
+    Vec3 pos(pInstance->pos.x, pInstance->pos.y, pInstance->pos.z);
+    Quat rot(pInstance->rot.w, pInstance->rot.v.x, pInstance->rot.v.y, pInstance->rot.v.z);
+    Vec3 scale(pInstance->scale.x, pInstance->scale.y, pInstance->scale.z);
+
+    Matrix44 tm = Matrix33::CreateScale(scale) * Matrix34(rot);
+    tm.SetTranslation(pos);
+
+    tm  =   tm * rMeshInfo.m_OBBMat.GetInverted();
+
+    //const uint32 MeshID   =   pInstance->MeshToUse()->ID();
+    rWriter.Write(rMeshInfo.m_Offset);
+    for (size_t a = 0; a < 12; a++)//just savin the 3x4 matrix
+    {
+        rWriter.Write(*(reinterpret_cast<float*>(&tm) + a));
+    }
+}
+
+bool COCMExporter::ExportToFile(const char* filename, const Export::IData* pExportData)
+{
+    CLogFile::FormatLine("Exporting OCM file to '%s'", filename);
+
+    FILE* pFile = nullptr;
+    azfopen(&pFile, filename, "wb");
+    if (!pFile)
+    {
+        CLogFile::FormatLine("Error while opening file '%s'!", filename);
+        assert(pFile);
+        return false;
+    }
+
+    CFileEndianWriter Writer;
+    // Write header
+    const uint32 Version        =   ~(4u << 24);
+    const uint32 MeshCount  =   pExportData->GetObjectCount();
+    const uint32 InstCount  =   pExportData->GetObjectCount();
+    uint32  OffsetInstances =   0;
+    Writer.Write(Version);
+    Writer.Write(MeshCount);
+    Writer.Write(InstCount);
+    Writer.Write(OffsetInstances);//keep header end aligned to 16byte
+
+    tdMeshOffset    MeshOffsets;
+    MeshOffsets.reserve(MeshCount);
+    size_t Offset = 16;
+    //std::map<void*,size_t> MeshO
+    for (size_t a = 0; a < MeshCount; a++)
+    {
+        SOCMeshInfo MeshInfo;
+        MeshInfo.m_MeshHash =    pExportData->GetObject(a)->MeshHash();
+        const tdMeshOffset::iterator it =   std::find(MeshOffsets.begin(), MeshOffsets.end(), MeshInfo);
+        if (it != MeshOffsets.end())
+        {
+            MeshInfo    =   *it;
+        }
+        else
+        {
+            MeshInfo.m_Offset   =   Offset;
+            Offset += SaveMesh(Writer, pExportData->GetObject(a), MeshInfo.m_OBBMat);
+        }
+        MeshOffsets.push_back(MeshInfo);
+    }
+    OffsetInstances =   Offset;
+    for (size_t a = 0; a < InstCount; a++)
+    {
+        SaveInstance(Writer, pExportData->GetObject(a), MeshOffsets[a]);
+    }
+    Writer.Seek(4);
+    Writer.Write(static_cast<uint32>(MeshOffsets.size()));
+    Writer.Seek(12);
+    Writer.Write(OffsetInstances);
+
+    fwrite(&Writer.Data()[0], 1, Writer.Data().size(), pFile);
+
+    fclose(pFile);
+    return true;
+}
+
+const char* COCMExporter::TrimFloat(float fValue) const
+{
+    // Convert a float into a string representation and remove all
+    // unnecessary zeros and the decimal dot if it is not needed
+    const int nMaxAccessInTime = 4;
+
+    static char ppBufs[nMaxAccessInTime][16];
+    static int nCurBuf = 0;
+
+    if (nCurBuf >= nMaxAccessInTime)
+    {
+        nCurBuf = 0;
+    }
+
+    char* pBuf = ppBufs[nCurBuf];
+    size_t bufSize = sizeof(ppBufs[nCurBuf]);
+    ++nCurBuf;
+    sprintf_s(pBuf, bufSize, "%f", fValue);
+
+    for (int i = strlen(pBuf) - 1; i > 0; --i)
+    {
+        if (pBuf[i] == '0')
+        {
+            pBuf[i] = 0;
+        }
+        else if (pBuf[i] == '.')
+        {
+            pBuf[i] = 0;
+            break;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    return pBuf;
+}
+
+
+
+void COCMExporter::Release()
+{
+    delete this;
+}
diff --git a/Code/Editor/Export/OCMExporter.h b/Code/Editor/Export/OCMExporter.h
new file mode 100644
index 0000000000..3dc8b15ff9
--- /dev/null
+++ b/Code/Editor/Export/OCMExporter.h
@@ -0,0 +1,49 @@
+/*
+ * 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 : Export geometry OCM file format
+
+
+#ifndef CRYINCLUDE_EDITOR_EXPORT_OCMEXPORTER_H
+#define CRYINCLUDE_EDITOR_EXPORT_OCMEXPORTER_H
+#pragma once
+
+#include <IExportManager.h>
+
+class CFileEndianWriter;
+
+struct SOCMeshInfo
+{
+    Matrix44    m_OBBMat;
+    uint32      m_Offset;
+    size_t      m_MeshHash;
+    bool    operator==(const SOCMeshInfo& rOther) const{return m_MeshHash == rOther.m_MeshHash; }
+};
+typedef std::vector<SOCMeshInfo>    tdMeshOffset;
+
+class COCMExporter
+    : public IExporter
+{
+public:
+    virtual const char* GetExtension() const;
+    virtual const char* GetShortDescription() const;
+    virtual bool ExportToFile(const char* filename, const Export::IData* pExportData);
+    virtual bool ImportFromFile([[maybe_unused]] const char* filename, [[maybe_unused]] Export::IData* pData){return false; };
+    virtual void Release();
+
+private:
+    const char* TrimFloat(float fValue) const;
+    void SaveInstance(CFileEndianWriter& rWriter, const Export::Object* pInstance, const SOCMeshInfo& rMeshInfo);
+    size_t SaveMesh(CFileEndianWriter& rWriter, const Export::Object* pMesh, Matrix44& rOBBMat);
+
+    void Extends(const Matrix44& rTransform, const Export::Object* pMesh, f32& rMinX, f32& rMaxX, f32& rMinY, f32& rMaxY, f32& rMinZ, f32& rMaxZ)  const;
+    Matrix44 CalcOBB(const Export::Object* pMesh);
+};
+
+
+#endif // CRYINCLUDE_EDITOR_EXPORT_OCMEXPORTER_H
diff --git a/Code/Editor/FBXExporterDialog.cpp b/Code/Editor/FBXExporterDialog.cpp
new file mode 100644
index 0000000000..a79172a0e4
--- /dev/null
+++ b/Code/Editor/FBXExporterDialog.cpp
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "FBXExporterDialog.h"
+
+#include <QMessageBox>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_FBXExporterDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+namespace
+{
+    const uint kDefaultFPS = 30.0f;
+}
+
+CFBXExporterDialog::CFBXExporterDialog(bool bDisplayOnlyFPSSetting, QWidget* pParent)
+    : QDialog(pParent)
+    , m_ui(new Ui::FBXExporterDialog)
+{
+    m_ui->setupUi(this);
+    setFixedSize(size());
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+    m_ui->m_exportLocalCoordsCheckbox->setChecked(false);
+    m_bDisplayOnlyFPSSetting = bDisplayOnlyFPSSetting;
+
+    connect(m_ui->m_fpsCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &CFBXExporterDialog::OnFPSChange);
+}
+
+CFBXExporterDialog::~CFBXExporterDialog()
+{
+}
+
+float CFBXExporterDialog::GetFPS() const
+{
+    return m_ui->m_fpsCombo->currentText().toDouble();
+}
+
+bool CFBXExporterDialog::GetExportCoordsLocalToTheSelectedObject() const
+{
+    return m_ui->m_exportLocalCoordsCheckbox->isChecked();
+}
+
+bool CFBXExporterDialog::GetExportOnlyPrimaryCamera() const
+{
+    return m_ui->m_exportOnlyPrimaryCameraCheckBox->isChecked();
+}
+
+void CFBXExporterDialog::SetExportLocalCoordsCheckBoxEnable(bool checked)
+{
+    if (!m_bDisplayOnlyFPSSetting)
+    {
+        m_ui->m_exportLocalCoordsCheckbox->setEnabled(checked);
+    }
+}
+
+void CFBXExporterDialog::accept()
+{
+    const QString fpsStr = m_ui->m_fpsCombo->currentText();
+
+    bool ok;
+    const double fps = fpsStr.toDouble(&ok);
+
+    if (fps <= 0 && !fpsStr.isEmpty() || fpsStr.isEmpty() || !ok)
+    {
+        QMessageBox::information(this, QString(), tr("Please enter a correct FPS value"));
+        m_ui->m_fpsCombo->setCurrentIndex(2);
+        return;
+    }
+
+    QDialog::accept();
+}
+
+void CFBXExporterDialog::OnFPSChange()
+{
+    const QString fpsStr = m_ui->m_fpsCombo->currentText();
+
+    if (QString::compare(fpsStr, tr("Custom"), Qt::CaseInsensitive) == 0)
+    {
+        m_ui->m_fpsCombo->setCurrentIndex(-1);
+    }
+}
+
+int CFBXExporterDialog::exec()
+{
+    if (m_bDisplayOnlyFPSSetting)
+    {
+        m_ui->m_exportLocalCoordsCheckbox->setEnabled(false);
+        m_ui->m_exportOnlyPrimaryCameraCheckBox->setEnabled(false);
+    }
+
+    m_ui->m_fpsCombo->addItem("24");
+    m_ui->m_fpsCombo->addItem("25");
+    m_ui->m_fpsCombo->addItem("30");
+    m_ui->m_fpsCombo->addItem("48");
+    m_ui->m_fpsCombo->addItem("60");
+    m_ui->m_fpsCombo->addItem(tr("Custom"));
+    m_ui->m_fpsCombo->setCurrentIndex(2);
+
+    return QDialog::exec();
+}
+
+#include <moc_FBXExporterDialog.cpp>
diff --git a/Code/Editor/FBXExporterDialog.h b/Code/Editor/FBXExporterDialog.h
new file mode 100644
index 0000000000..41168e437e
--- /dev/null
+++ b/Code/Editor/FBXExporterDialog.h
@@ -0,0 +1,50 @@
+/*
+ * 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_FBXEXPORTERDIALOG_H
+#define CRYINCLUDE_EDITOR_FBXEXPORTERDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "Resource.h"
+
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class FBXExporterDialog;
+}
+
+class CFBXExporterDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CFBXExporterDialog (bool bDisplayOnlyFPSSetting = false, QWidget* pParent = nullptr);
+    ~CFBXExporterDialog();
+
+    float GetFPS() const;
+    bool GetExportCoordsLocalToTheSelectedObject() const;
+    bool GetExportOnlyPrimaryCamera() const;
+    void SetExportLocalCoordsCheckBoxEnable(bool checked);
+
+    int exec() override;
+
+protected:
+    void OnFPSChange();
+    void SetExportLocalToTheSelectedObjectCheckBox();
+    void SetExportOnlyPrimaryCameraCheckBox();
+
+    void accept() override;
+
+    bool m_bDisplayOnlyFPSSetting;
+private:
+    QScopedPointer<Ui::FBXExporterDialog> m_ui;
+};
+#endif // CRYINCLUDE_EDITOR_FBXEXPORTERDIALOG_H
diff --git a/Code/Sandbox/Editor/FBXExporterDialog.ui b/Code/Editor/FBXExporterDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/FBXExporterDialog.ui
rename to Code/Editor/FBXExporterDialog.ui
diff --git a/Code/Editor/FileTypeUtils.cpp b/Code/Editor/FileTypeUtils.cpp
new file mode 100644
index 0000000000..937671e136
--- /dev/null
+++ b/Code/Editor/FileTypeUtils.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "FileTypeUtils.h"
+
+// the supported file types
+static const char* szSupportedExt[] =
+{
+    "chr",
+    "chr(c)",
+    "skin",
+    "skin(c)",
+    "cdf",
+    "cdf(c)",
+    "cgf",
+    "cgf(c)",
+    "cga",
+    "cga(c)",
+    "cid",
+    "caf"
+};
+
+bool IsPreviewableFileType (const char* szPath)
+{
+    QString szExt = Path::GetExt(szPath);
+
+    for (unsigned int i = 0; i < sizeof(szSupportedExt) / sizeof(szSupportedExt[0]); ++i)
+    {
+        if (QString::compare(szExt, szSupportedExt[i], Qt::CaseInsensitive) == 0)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
diff --git a/Code/Editor/FileTypeUtils.h b/Code/Editor/FileTypeUtils.h
new file mode 100644
index 0000000000..4d8a8f3c21
--- /dev/null
+++ b/Code/Editor/FileTypeUtils.h
@@ -0,0 +1,17 @@
+/*
+ * 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_FILETYPEUTILS_H
+#define CRYINCLUDE_EDITOR_FILETYPEUTILS_H
+#pragma once
+
+// returns true if the given file path represents a file
+// that can be previewed in Preview mode in Editor (e.g. cgf, cga etc.)
+extern bool IsPreviewableFileType(const char* szPath);
+
+#endif // CRYINCLUDE_EDITOR_FILETYPEUTILS_H
diff --git a/Code/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp
new file mode 100644
index 0000000000..a729be9175
--- /dev/null
+++ b/Code/Editor/GameEngine.cpp
@@ -0,0 +1,928 @@
+/*
+ * 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 "GameEngine.h"
+
+// Qt
+#include <QMessageBox>
+#include <QThread>
+
+// AzCore
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/IO/IStreamer.h>
+#include <AzCore/std/parallel/binary_semaphore.h>
+#include <AzCore/Console/IConsole.h>
+
+// AzFramework
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
+#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>      // for TerrainDataRequests
+#include <AzFramework/Archive/IArchive.h>
+
+// Editor
+#include "IEditorImpl.h"
+#include "CryEditDoc.h"
+#include "Settings.h"
+
+// CryCommon
+#include <CryCommon/INavigationSystem.h>
+#include <CryCommon/LyShine/ILyShine.h>
+#include <CryCommon/MainThreadRenderRequestBus.h>
+
+// Editor
+#include "CryEdit.h"
+
+#include "ViewManager.h"
+#include "AnimationContext.h"
+#include "UndoViewPosition.h"
+#include "UndoViewRotation.h"
+#include "MainWindow.h"
+#include "Include/IObjectManager.h"
+#include "ActionManager.h"
+
+// Including this too early will result in a linker error
+#include <CryCommon/CryLibrary.h>
+
+// Implementation of System Callback structure.
+struct SSystemUserCallback
+    : public ISystemUserCallback
+{
+    SSystemUserCallback(IInitializeUIInfo* logo) : m_threadErrorHandler(this) { m_pLogo = logo; };
+    virtual void OnSystemConnect(ISystem* pSystem)
+    {
+        ModuleInitISystem(pSystem, "Editor");
+    }
+
+    virtual bool OnError(const char* szErrorString)
+    {
+        // since we show a message box, we have to use the GUI thread
+        if (QThread::currentThread() != qApp->thread())
+        {
+            bool result = false;
+            QMetaObject::invokeMethod(&m_threadErrorHandler, "OnError", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, result), Q_ARG(const char*, szErrorString));
+            return result;
+        }
+
+        if (szErrorString)
+        {
+            Log(szErrorString);
+        }
+
+        if (GetIEditor()->IsInTestMode())
+        {
+            exit(1);
+        }
+
+        char str[4096];
+
+        if (szErrorString)
+        {
+            azsnprintf(str, 4096, "%s\r\nSave Level Before Exiting the Editor?", szErrorString);
+        }
+        else
+        {
+            azsnprintf(str, 4096, "Unknown Error\r\nSave Level Before Exiting the Editor?");
+        }
+
+        int res = IDNO;
+
+        ICVar* pCVar = gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_crash_dialog") : NULL;
+
+        if (!pCVar || pCVar->GetIVal() == 0)
+        {
+            res = QMessageBox::critical(QApplication::activeWindow(), QObject::tr("Engine Error"), str, QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+        }
+
+        if (res == QMessageBox::Yes || res == QMessageBox::No)
+        {
+            if (res == QMessageBox::Yes)
+            {
+                if (GetIEditor()->SaveDocument())
+                {
+                    QMessageBox::information(QApplication::activeWindow(), QObject::tr("Save"), QObject::tr("Level has been successfully saved!\r\nPress Ok to terminate Editor."));
+                }
+            }
+        }
+
+        return true;
+    }
+
+    virtual bool OnSaveDocument()
+    {
+        bool success = false;
+
+        if (GetIEditor())
+        {
+            // Turn off save backup as we force a backup before reaching this point
+            bool prevSaveBackup = gSettings.bBackupOnSave;
+            gSettings.bBackupOnSave = false;
+
+            success = GetIEditor()->SaveDocument();
+            gSettings.bBackupOnSave = prevSaveBackup;
+        }
+
+        return success;
+    }
+
+    virtual bool OnBackupDocument()
+    {
+        CCryEditDoc* level = GetIEditor() ? GetIEditor()->GetDocument() : nullptr;
+        if (level)
+        {
+            return level->BackupBeforeSave(true);
+        }
+
+        return false;
+    }
+
+    virtual void OnProcessSwitch()
+    {
+        if (GetIEditor()->IsInGameMode())
+        {
+            GetIEditor()->SetInGameMode(false);
+        }
+    }
+
+    virtual void OnInitProgress(const char* sProgressMsg)
+    {
+        if (m_pLogo)
+        {
+            m_pLogo->SetInfoText(sProgressMsg);
+        }
+    }
+
+    virtual int ShowMessage(const char* text, const char* caption, unsigned int uType)
+    {
+        if (CCryEditApp::instance()->IsInAutotestMode())
+        {
+            return IDOK;
+        }
+
+        const UINT kMessageBoxButtonMask = 0x000f;
+        if (!GetIEditor()->IsInGameMode() && (uType == 0 || uType == MB_OK || !(uType & kMessageBoxButtonMask)))
+        {
+            static_cast<CEditorImpl*>(GetIEditor())->AddErrorMessage(text, caption);
+            return IDOK;
+        }
+        return CryMessageBox(text, caption, uType);
+    }
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer)
+    {
+        GetIEditor()->GetMemoryUsage(pSizer);
+    }
+
+    void OnSplashScreenDone()
+    {
+        m_pLogo = nullptr;
+    }
+
+private:
+    IInitializeUIInfo* m_pLogo;
+    ThreadedOnErrorHandler m_threadErrorHandler;
+};
+
+ThreadedOnErrorHandler::ThreadedOnErrorHandler(ISystemUserCallback* callback)
+    : m_userCallback(callback)
+{
+    moveToThread(qApp->thread());
+}
+
+ThreadedOnErrorHandler::~ThreadedOnErrorHandler()
+{
+}
+
+bool ThreadedOnErrorHandler::OnError(const char* error)
+{
+    return m_userCallback->OnError(error);
+}
+
+//! This class will be used by CSystem to find out whether the negotiation with the assetprocessor failed
+class AssetProcessConnectionStatus
+    : public AzFramework::AssetSystemConnectionNotificationsBus::Handler
+{
+public:
+    AssetProcessConnectionStatus()
+    {
+        AzFramework::AssetSystemConnectionNotificationsBus::Handler::BusConnect();
+    };
+    ~AssetProcessConnectionStatus()
+    {
+        AzFramework::AssetSystemConnectionNotificationsBus::Handler::BusDisconnect();
+    }
+
+    //! Notifies listeners that connection to the Asset Processor failed
+    void ConnectionFailed() override
+    {
+        m_connectionFailed = true;
+    }
+
+    void NegotiationFailed() override
+    {
+        m_negotiationFailed = true;
+    }
+
+    bool CheckConnectionFailed()
+    {
+        return m_connectionFailed;
+    }
+
+    bool CheckNegotiationFailed()
+    {
+        return m_negotiationFailed;
+    }
+private:
+    bool m_connectionFailed = false;
+    bool m_negotiationFailed = false;
+};
+
+AZ_PUSH_DISABLE_WARNING(4273, "-Wunknown-warning-option")
+CGameEngine::CGameEngine()
+    : m_gameDll(0)
+    , m_bIgnoreUpdates(false)
+    , m_ePendingGameMode(ePGM_NotPending)
+    , m_modalWindowDismisser(nullptr)
+AZ_POP_DISABLE_WARNING
+{
+    m_pISystem = NULL;
+    m_bLevelLoaded = false;
+    m_bInGameMode = false;
+    m_bSimulationMode = false;
+    m_bSyncPlayerPosition = true;
+    m_hSystemHandle = 0;
+    m_bJustCreated = false;
+    m_levelName = "Untitled";
+    m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+    m_playerViewTM.SetIdentity();
+    GetIEditor()->RegisterNotifyListener(this);
+}
+
+AZ_PUSH_DISABLE_WARNING(4273, "-Wunknown-warning-option")
+CGameEngine::~CGameEngine()
+{
+AZ_POP_DISABLE_WARNING
+    GetIEditor()->UnregisterNotifyListener(this);
+    m_pISystem->GetIMovieSystem()->SetCallback(NULL);
+
+    if (m_gameDll)
+    {
+        CryFreeLibrary(m_gameDll);
+    }
+
+    delete m_pISystem;
+    m_pISystem = NULL;
+
+    if (m_hSystemHandle)
+    {
+        CryFreeLibrary(m_hSystemHandle);
+    }
+
+    delete m_pSystemUserCallback;
+}
+
+static int ed_killmemory_size;
+static int ed_indexfiles;
+
+void KillMemory(IConsoleCmdArgs* /* pArgs */)
+{
+    while (true)
+    {
+        const int kLimit = 10000000;
+        int size;
+
+        if (ed_killmemory_size > 0)
+        {
+            size = ed_killmemory_size;
+        }
+        else
+        {
+            size = rand() * rand();
+            size = size > kLimit ? kLimit : size;
+        }
+
+        new uint8[size];
+    }
+}
+
+static void CmdGotoEditor(IConsoleCmdArgs* pArgs)
+{
+    // feature is mostly useful for QA purposes, this works with the game "goto" command
+    // this console command actually is used by the game command, the editor command shouldn't be used by the user
+    int iArgCount = pArgs->GetArgCount();
+
+    CViewManager* pViewManager = GetIEditor()->GetViewManager();
+    CViewport* pRenderViewport = pViewManager->GetGameViewport();
+    if (!pRenderViewport)
+    {
+        return;
+    }
+
+    float x, y, z, wx, wy, wz;
+
+    if (iArgCount == 7
+        && azsscanf(pArgs->GetArg(1), "%f", &x) == 1
+        && azsscanf(pArgs->GetArg(2), "%f", &y) == 1
+        && azsscanf(pArgs->GetArg(3), "%f", &z) == 1
+        && azsscanf(pArgs->GetArg(4), "%f", &wx) == 1
+        && azsscanf(pArgs->GetArg(5), "%f", &wy) == 1
+        && azsscanf(pArgs->GetArg(6), "%f", &wz) == 1)
+    {
+        Matrix34 tm = pRenderViewport->GetViewTM();
+
+        tm.SetTranslation(Vec3(x, y, z));
+        tm.SetRotation33(Matrix33::CreateRotationXYZ(DEG2RAD(Ang3(wx, wy, wz))));
+        pRenderViewport->SetViewTM(tm);
+    }
+}
+
+AZ::Outcome<void, AZStd::string> CGameEngine::Init(
+    bool bPreviewMode,
+    bool bTestMode,
+    const char* sInCmdLine,
+    IInitializeUIInfo* logo,
+    HWND hwndForInputSystem)
+{
+    m_pSystemUserCallback = new SSystemUserCallback(logo);
+    m_hSystemHandle = CryLoadLibraryDefName("CrySystem");
+
+    if (!m_hSystemHandle)
+    {
+        auto errorMessage = AZStd::string::format("%s Loading Failed", CryLibraryDefName("CrySystem"));
+        Error(errorMessage.c_str());
+        return AZ::Failure(errorMessage);
+    }
+
+    PFNCREATESYSTEMINTERFACE pfnCreateSystemInterface =
+        (PFNCREATESYSTEMINTERFACE)CryGetProcAddress(m_hSystemHandle, "CreateSystemInterface");
+
+
+    SSystemInitParams sip;
+
+    sip.bEditor = true;
+    sip.bDedicatedServer = false;
+    AZ::Interface<AZ::IConsole>::Get()->PerformCommand("sv_isDedicated false");
+    sip.bPreview = bPreviewMode;
+    sip.bTestMode = bTestMode;
+    sip.hInstance = nullptr;
+
+    sip.pSharedEnvironment = AZ::Environment::GetInstance();
+
+#ifdef AZ_PLATFORM_MAC
+    // Create a hidden QWidget. Would show a black window on macOS otherwise.
+    auto window = new QWidget();
+    QObject::connect(qApp, &QApplication::lastWindowClosed, window, &QWidget::deleteLater);
+    sip.hWnd = (HWND)window->winId();
+#else
+    sip.hWnd = hwndForInputSystem;
+#endif
+
+    sip.pLogCallback = &m_logFile;
+    sip.sLogFileName = "@log@/Editor.log";
+    sip.pUserCallback = m_pSystemUserCallback;
+
+    if (sInCmdLine)
+    {
+        azstrncpy(sip.szSystemCmdLine, AZ_COMMAND_LINE_LEN, sInCmdLine, AZ_COMMAND_LINE_LEN);
+        if (strstr(sInCmdLine, "-export") || strstr(sInCmdLine, "/export") || strstr(sInCmdLine, "-autotest_mode"))
+        {
+            sip.bUnattendedMode = true;
+        }
+    }
+
+    if (sip.bUnattendedMode)
+    {
+        m_modalWindowDismisser = AZStd::make_unique<ModalWindowDismisser>();
+    }
+
+    AssetProcessConnectionStatus apConnectionStatus;
+
+    m_pISystem = pfnCreateSystemInterface(sip);
+
+    if (!gEnv)
+    {
+        gEnv = m_pISystem->GetGlobalEnvironment();
+    }
+
+    if (!m_pISystem)
+    {
+        AZStd::string errorMessage = "Could not initialize CSystem.  View the logs for more details.";
+
+        gEnv = nullptr;
+        Error("CreateSystemInterface Failed");
+        return AZ::Failure(errorMessage);
+    }
+
+    if (apConnectionStatus.CheckNegotiationFailed())
+    {
+        auto errorMessage = AZStd::string::format("Negotiation with Asset Processor failed.\n"
+            "Please ensure the Asset Processor is running on the same branch and try again.");
+        gEnv = nullptr;
+        return AZ::Failure(errorMessage);
+    }
+
+    if (apConnectionStatus.CheckConnectionFailed())
+    {
+        AzFramework::AssetSystem::ConnectionSettings connectionSettings;
+        AzFramework::AssetSystem::ReadConnectionSettingsFromSettingsRegistry(connectionSettings);
+        auto errorMessage = AZStd::string::format("Unable to connect to the local Asset Processor.\n\n"
+                                                  "The Asset Processor is either not running locally or not accepting connections on port %hu. "
+                                                  "Check your remote_port settings in bootstrap.cfg or view the Asset Processor's \"Logs\" tab "
+                                                  "for any errors.", connectionSettings.m_assetProcessorPort);
+        gEnv = nullptr;
+        return AZ::Failure(errorMessage);
+    }
+
+    SetEditorCoreEnvironment(gEnv);
+
+    if (gEnv && gEnv->pMovieSystem)
+    {
+        gEnv->pMovieSystem->EnablePhysicsEvents(m_bSimulationMode);
+    }
+
+    CLogFile::AboutSystem();
+    REGISTER_CVAR(ed_killmemory_size, -1, VF_DUMPTODISK, "Sets the testing allocation size. -1 for random");
+    REGISTER_CVAR(ed_indexfiles, 1, VF_DUMPTODISK, "Index game resource files, 0 - inactive, 1 - active");
+    REGISTER_COMMAND("ed_killmemory", KillMemory, VF_NULL, "");
+    REGISTER_COMMAND("ed_goto", CmdGotoEditor, VF_CHEAT, "Internal command, used by the 'GOTO' console command\n");
+
+    // The editor needs to handle the quit command differently
+    gEnv->pConsole->RemoveCommand("quit");
+    REGISTER_COMMAND("quit", CGameEngine::HandleQuitRequest, VF_RESTRICTEDMODE, "Quit/Shutdown the engine");
+
+    EBUS_EVENT(CrySystemEventBus, OnCryEditorInitialized);
+    
+    return AZ::Success();
+}
+
+bool CGameEngine::InitGame(const char*)
+{
+    m_pISystem->ExecuteCommandLine();
+
+    return true;
+}
+
+void CGameEngine::SetLevelPath(const QString& path)
+{
+    QByteArray levelPath;
+    levelPath.reserve(AZ_MAX_PATH_LEN);
+    levelPath = Path::ToUnixPath(Path::RemoveBackslash(path)).toUtf8();
+    m_levelPath = levelPath;
+
+    m_levelName = m_levelPath.mid(m_levelPath.lastIndexOf('/') + 1);
+
+    const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
+    const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+
+    // Store off if 
+    if (QFileInfo(path + oldExtension).exists())
+    {
+        m_levelExtension = oldExtension;
+    }
+    else
+    {
+        m_levelExtension = defaultExtension;
+    }
+}
+
+bool CGameEngine::LoadLevel(
+    [[maybe_unused]] bool bDeleteAIGraph,
+    bool bReleaseResources)
+{
+    LOADING_TIME_PROFILE_SECTION(GetIEditor()->GetSystem());
+    m_bLevelLoaded = false;
+    CLogFile::FormatLine("Loading map '%s' into engine...", m_levelPath.toUtf8().data());
+    // Switch the current directory back to the Primary CD folder first.
+    // The engine might have trouble to find some files when the current
+    // directory is wrong
+    QDir::setCurrent(GetIEditor()->GetPrimaryCDFolder());
+
+
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+    if (!usePrefabSystemForLevels)
+    {
+        QString pakFile = m_levelPath + "/level.pak";
+
+        // Open Pak file for this level.
+        if (!m_pISystem->GetIPak()->OpenPack(m_levelPath.toUtf8().data(), pakFile.toUtf8().data()))
+        {
+            CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "Level Pack File %s Not Found", pakFile.toUtf8().data());
+        }
+    }
+
+    // Initialize physics grid.
+    if (bReleaseResources)
+    {
+        AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
+        AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
+        int physicsEntityGridSize = static_cast<int>(terrainAabb.GetXExtent());
+
+        //CryPhysics under performs if physicsEntityGridSize < nTerrainSize.
+        if (physicsEntityGridSize <= 0)
+        {
+            ICVar* pCvar = m_pISystem->GetIConsole()->GetCVar("e_PhysEntityGridSizeDefault");
+            physicsEntityGridSize = pCvar ? pCvar->GetIVal() : 4096;
+        }
+
+    }
+
+    // Audio: notify audio of level loading start?
+    GetIEditor()->GetObjectManager()->SendEvent(EVENT_REFRESH);
+
+    m_bLevelLoaded = true;
+
+    return true;
+}
+
+bool CGameEngine::ReloadLevel()
+{
+    if (!LoadLevel(false, false))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+void CGameEngine::SwitchToInGame()
+{
+    auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
+    if (streamer)
+    {
+        AZStd::binary_semaphore wait;
+        AZ::IO::FileRequestPtr flush = streamer->FlushCaches();
+        streamer->SetRequestCompleteCallback(flush, [&wait](AZ::IO::FileRequestHandle) { wait.release(); });
+        streamer->QueueRequest(flush);
+        wait.acquire();
+    }
+    
+    GetIEditor()->Notify(eNotify_OnBeginGameMode);
+
+    m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(true);
+    m_bInGameMode = true;
+
+    gEnv->pSystem->GetViewCamera().SetMatrix(m_playerViewTM);
+
+    // Disable accelerators.
+    GetIEditor()->EnableAcceleratos(false);
+    //! Send event to switch into game.
+    GetIEditor()->GetObjectManager()->SendEvent(EVENT_INGAME);
+
+    m_pISystem->GetIMovieSystem()->Reset(true, false);
+
+    // Transition to runtime entity context.
+    EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, StartPlayInEditor);
+
+    if (!CCryEditApp::instance()->IsInAutotestMode())
+    {
+        // Constrain and hide the system cursor (important to do this last)
+        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+                                                    &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+                                                    AzFramework::SystemCursorState::ConstrainedAndHidden);
+    }
+
+    Log("Entered game mode");
+}
+
+void CGameEngine::SwitchToInEditor()
+{
+    // Transition to editor entity context.
+    EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, StopPlayInEditor);
+
+    // Reset movie system
+    for (int i = m_pISystem->GetIMovieSystem()->GetNumPlayingSequences(); --i >= 0;)
+    {
+        m_pISystem->GetIMovieSystem()->GetPlayingSequence(i)->Deactivate();
+    }
+    m_pISystem->GetIMovieSystem()->Reset(false, false);
+
+    CViewport* pGameViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+
+    m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(m_bSimulationMode);
+
+    // Enable accelerators.
+    GetIEditor()->EnableAcceleratos(true);
+
+
+    // reset UI system
+    if (gEnv->pLyShine)
+    {
+        gEnv->pLyShine->Reset();
+    }
+
+    // [Anton] - order changed, see comments for CGameEngine::SetSimulationMode
+    //! Send event to switch out of game.
+    GetIEditor()->GetObjectManager()->SendEvent(EVENT_OUTOFGAME);
+
+    m_bInGameMode = false;
+
+    // save the current gameView matrix for editor
+    if (pGameViewport)
+    {
+        Matrix34 gameView = gEnv->pSystem->GetViewCamera().GetMatrix();
+        pGameViewport->SetGameTM(gameView);
+    }
+
+    // Out of game in Editor mode.
+    if (pGameViewport)
+    {
+        pGameViewport->SetViewTM(m_playerViewTM);
+    }
+
+
+    GetIEditor()->Notify(eNotify_OnEndGameMode);
+
+    // Unconstrain the system cursor and make it visible (important to do this last)
+    AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+                                                    &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+                                                    AzFramework::SystemCursorState::UnconstrainedAndVisible);
+
+    Log("Exited game mode");
+}
+
+void CGameEngine::HandleQuitRequest(IConsoleCmdArgs* /*args*/)
+{
+    if (GetIEditor()->GetGameEngine()->IsInGameMode())
+    {
+        GetIEditor()->GetGameEngine()->RequestSetGameMode(false);
+        gEnv->pConsole->ShowConsole(false);
+    }
+    else
+    {
+        MainWindow::instance()->GetActionManager()->GetAction(ID_APP_EXIT)->trigger();
+    }
+}
+
+void CGameEngine::RequestSetGameMode(bool inGame)
+{
+    m_ePendingGameMode = inGame ? ePGM_SwitchToInGame : ePGM_SwitchToInEditor;
+
+    if (m_ePendingGameMode == ePGM_SwitchToInGame)
+    {
+        AzToolsFramework::EditorLegacyGameModeNotificationBus::Broadcast(
+            &AzToolsFramework::EditorLegacyGameModeNotificationBus::Events::OnStartGameModeRequest);
+    }
+    else if (m_ePendingGameMode == ePGM_SwitchToInEditor)
+    {
+        AzToolsFramework::EditorLegacyGameModeNotificationBus::Broadcast(
+            &AzToolsFramework::EditorLegacyGameModeNotificationBus::Events::OnStopGameModeRequest);
+    }
+}
+
+void CGameEngine::SetGameMode(bool bInGame)
+{
+    if (m_bInGameMode == bInGame)
+    {
+        return;
+    }
+
+    if (!GetIEditor()->GetDocument())
+    {
+        return;
+    }
+
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_GAME_MODE_SWITCH_START, bInGame, 0);
+
+    // Enables engine to know about that.
+    gEnv->SetIsEditorGameMode(bInGame);
+
+    // Ignore updates while changing in and out of game mode
+    m_bIgnoreUpdates = true;
+
+    // Switching modes will destroy the current AzFramework::EntityConext which may contain
+    // data the queued events hold on to, so execute all queued events before switching.
+    ExecuteQueuedEvents();
+
+    if (bInGame)
+    {
+        SwitchToInGame();
+    }
+    else
+    {
+        SwitchToInEditor();
+    }
+
+    GetIEditor()->GetObjectManager()->SendEvent(EVENT_PHYSICS_APPLYSTATE);
+
+    // Enables engine to know about that.
+    if (MainWindow::instance())
+    {
+        AzFramework::InputChannelRequestBus::Broadcast(&AzFramework::InputChannelRequests::ResetState);
+        MainWindow::instance()->setFocus();
+    }
+
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_GAME_MODE_CHANGED, bInGame, 0);
+
+    m_bIgnoreUpdates = false;
+
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_GAME_MODE_SWITCH_END, bInGame, 0);
+}
+
+void CGameEngine::SetSimulationMode(bool enabled, bool bOnlyPhysics)
+{
+    if (m_bSimulationMode == enabled)
+    {
+        return;
+    }
+
+    m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(enabled);
+
+    if (enabled)
+    {
+        GetIEditor()->Notify(eNotify_OnBeginSimulationMode);
+    }
+    else
+    {
+        GetIEditor()->Notify(eNotify_OnEndSimulationMode);
+    }
+
+    m_bSimulationMode = enabled;
+
+    // Enables engine to know about simulation mode.
+    gEnv->SetIsEditorSimulationMode(enabled);
+
+    if (m_bSimulationMode)
+    {
+        // [Anton] the order of the next 3 calls changed, since, EVENT_INGAME loads physics state (if any),
+        // and Reset should be called before it
+        GetIEditor()->GetObjectManager()->SendEvent(EVENT_INGAME);
+    }
+    else
+    {
+        GetIEditor()->GetObjectManager()->SendEvent(EVENT_OUTOFGAME);
+    }
+
+    GetIEditor()->GetObjectManager()->SendEvent(EVENT_PHYSICS_APPLYSTATE);
+
+    // Execute all queued events before switching modes.
+    ExecuteQueuedEvents();
+
+    // Transition back to editor entity context.
+    // Symmetry is not critical. It's okay to call this even if we never called StartPlayInEditor
+    // (bOnlyPhysics was true when we entered simulation mode).
+    AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::StopPlayInEditor);
+
+    if (m_bSimulationMode && !bOnlyPhysics)
+    {
+        // Transition to runtime entity context.
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::StartPlayInEditor);
+    }
+
+    AzFramework::InputChannelRequestBus::Broadcast(&AzFramework::InputChannelRequests::ResetState);
+}
+
+void CGameEngine::SetPlayerViewMatrix(const Matrix34& tm, [[maybe_unused]] bool bEyePos)
+{
+    m_playerViewTM = tm;
+}
+
+void CGameEngine::SyncPlayerPosition(bool bEnable)
+{
+    m_bSyncPlayerPosition = bEnable;
+
+    if (m_bSyncPlayerPosition)
+    {
+        SetPlayerViewMatrix(m_playerViewTM);
+    }
+}
+
+void CGameEngine::SetCurrentMOD(const char* sMod)
+{
+    m_MOD = sMod;
+}
+
+QString CGameEngine::GetCurrentMOD() const
+{
+    return m_MOD;
+}
+
+void CGameEngine::Update()
+{
+    if (m_bIgnoreUpdates)
+    {
+        return;
+    }
+
+    switch (m_ePendingGameMode)
+    {
+    case ePGM_SwitchToInGame:
+    {
+        SetGameMode(true);
+        m_ePendingGameMode = ePGM_NotPending;
+        break;
+    }
+
+    case ePGM_SwitchToInEditor:
+    {
+        bool wasInSimulationMode = GetIEditor()->GetGameEngine()->GetSimulationMode();
+        if (wasInSimulationMode)
+        {
+            GetIEditor()->GetGameEngine()->SetSimulationMode(false);
+        }
+        SetGameMode(false);
+        if (wasInSimulationMode)
+        {
+            GetIEditor()->GetGameEngine()->SetSimulationMode(true);
+        }
+        m_ePendingGameMode = ePGM_NotPending;
+        break;
+    }
+    }
+
+    AZ::ComponentApplication* componentApplication = nullptr;
+    EBUS_EVENT_RESULT(componentApplication, AZ::ComponentApplicationBus, GetApplication);
+
+    if (m_bInGameMode)
+    {
+        if (gEnv->pSystem)
+        {
+            gEnv->pSystem->UpdatePreTickBus();
+            componentApplication->Tick(gEnv->pTimer->GetFrameTime(ITimer::ETIMER_GAME));
+            gEnv->pSystem->UpdatePostTickBus();
+        }
+
+        if (CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport())
+        {
+            pRenderViewport->Update();
+        }
+    }
+    else
+    {
+        // [marco] check current sound and vis areas for music etc.
+        // but if in game mode, 'cos is already done in the above call to game->update()
+        unsigned int updateFlags = ESYSUPDATE_EDITOR;
+        GetIEditor()->GetAnimation()->Update();
+        GetIEditor()->GetSystem()->UpdatePreTickBus(updateFlags);
+        componentApplication->Tick(gEnv->pTimer->GetFrameTime(ITimer::ETIMER_GAME));
+        GetIEditor()->GetSystem()->UpdatePostTickBus(updateFlags);
+    }
+}
+
+void CGameEngine::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnSplashScreenDestroyed:
+    {
+        if (m_pSystemUserCallback != NULL)
+        {
+            m_pSystemUserCallback->OnSplashScreenDone();
+        }
+    }
+    break;
+    }
+}
+
+void CGameEngine::OnTerrainModified(const Vec2& modPosition, float modAreaRadius, bool fullTerrain)
+{
+    INavigationSystem* pNavigationSystem = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
+
+    if (pNavigationSystem)
+    {
+        // Only report local modifications, not a change in the full terrain (probably happening during initialization)
+        if (fullTerrain == false)
+        {
+            const Vec2 offset(modAreaRadius * 1.5f, modAreaRadius * 1.5f);
+            AABB updateBox;
+            updateBox.min = modPosition - offset;
+            updateBox.max = modPosition + offset;
+            AzFramework::Terrain::TerrainDataRequests* terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+            AZ_Assert(terrain != nullptr, "Expecting a valid terrain handler when the terrain is modified");
+            const float terrainHeight1 = terrain->GetHeightFromFloats(updateBox.min.x, updateBox.min.y);
+            const float terrainHeight2 = terrain->GetHeightFromFloats(updateBox.max.x, updateBox.max.y);
+            const float terrainHeight3 = terrain->GetHeightFromFloats(modPosition.x, modPosition.y);
+
+            updateBox.min.z = min(terrainHeight1, min(terrainHeight2, terrainHeight3)) - (modAreaRadius * 2.0f);
+            updateBox.max.z = max(terrainHeight1, max(terrainHeight2, terrainHeight3)) + (modAreaRadius * 2.0f);
+            pNavigationSystem->WorldChanged(updateBox);
+        }
+    }
+}
+
+void CGameEngine::OnAreaModified(const AABB& modifiedArea)
+{
+    INavigationSystem* pNavigationSystem = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
+    if (pNavigationSystem)
+    {
+        pNavigationSystem->WorldChanged(modifiedArea);
+    }
+}
+
+void CGameEngine::ExecuteQueuedEvents()
+{
+    AZ::Data::AssetBus::ExecuteQueuedEvents();
+    AZ::TickBus::ExecuteQueuedEvents();
+    AZ::MainThreadRenderRequestBus::ExecuteQueuedEvents();
+}
+
+#include <moc_GameEngine.cpp>
diff --git a/Code/Editor/GameEngine.h b/Code/Editor/GameEngine.h
new file mode 100644
index 0000000000..436d3bff3d
--- /dev/null
+++ b/Code/Editor/GameEngine.h
@@ -0,0 +1,166 @@
+/*
+ * 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 : 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
+
+class CStartupLogoDialog;
+struct IInitializeUIInfo;
+
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Math/Vector3.h>
+
+class ThreadedOnErrorHandler : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ThreadedOnErrorHandler(ISystemUserCallback* callback);
+    ~ThreadedOnErrorHandler();
+
+public slots:
+    bool OnError(const char* error);
+
+private:
+    ISystemUserCallback* m_userCallback;
+};
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+//! This class serves as a high-level wrapper for CryEngine game.
+class SANDBOX_API CGameEngine
+    : public IEditorNotifyListener
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    CGameEngine();
+    ~CGameEngine(void);
+    //! Initialize System.
+    //! @return successful outcome if initialization succeeded. or failed outcome with error message.
+    AZ::Outcome<void, AZStd::string> Init(
+        bool bPreviewMode,
+        bool bTestMode,
+        const char* sCmdLine,
+        IInitializeUIInfo* logo,
+        HWND hwndForInputSystem);
+    //! Initialize game.
+    //! @return true if initialization succeeded, false otherwise
+    bool InitGame(const char* sGameDLL);
+    //! Load new terrain level into 3d engine.
+    //! Also load AI triangulation for this level.
+    bool LoadLevel(
+        bool bDeleteAIGraph,
+        bool bReleaseResources);
+    //!* Reload level if it was already loaded.
+    bool ReloadLevel();
+    //! Request to switch In/Out of game mode on next update.
+    //! The switch will happen when no sub systems are currently being updated.
+    //! @param inGame When true editor switch to game mode.
+    void RequestSetGameMode(bool inGame);
+    //! Switch In/Out of AI and Physics simulation mode.
+    //! @param enabled When true editor switch to simulation mode.
+    void SetSimulationMode(bool enabled, bool bOnlyPhysics = false);
+    //! Get current simulation mode.
+    bool GetSimulationMode() const { return m_bSimulationMode; };
+    //! Returns true if level is loaded.
+    bool IsLevelLoaded() const { return m_bLevelLoaded; };
+    //! Assign new level path name.
+    void SetLevelPath(const QString& path);
+    //! Return name of currently loaded level.
+    const QString& GetLevelName() const { return m_levelName; };
+    //! Return extension of currently loaded level.
+    const QString& GetLevelExtension() const { return m_levelExtension; };
+    //! Get fully specified level path.
+    const QString& GetLevelPath() const { return m_levelPath; };
+    //! Query if engine is in game mode.
+    bool IsInGameMode() const { return m_bInGameMode; };
+    //! Force level loaded variable to true.
+    void SetLevelLoaded(bool bLoaded) { m_bLevelLoaded = bLoaded; }
+    //! Force level just created variable to true.
+    void SetLevelCreated(bool bJustCreated) { m_bJustCreated = bJustCreated; }
+    //! Query ISystem interface.
+    ISystem* GetSystem() { return m_pISystem; };
+    //! Set player position in game.
+    //! @param bEyePos If set then given position is position of player eyes.
+    void SetPlayerViewMatrix(const Matrix34& tm, bool bEyePos = true);
+    //! When set, player in game will be every frame synchronized with editor camera.
+    void SyncPlayerPosition(bool bEnable);
+    bool IsSyncPlayerPosition() const { return m_bSyncPlayerPosition; };
+    //! Set game's current Mod name.
+    void SetCurrentMOD(const char* sMod);
+    //! Returns game's current Mod name.
+    QString GetCurrentMOD() const;
+    //! Called every frame.
+    void Update();
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
+    void OnTerrainModified(const Vec2& modPosition, float modAreaRadius, bool fullTerrain);
+    void OnAreaModified(const AABB& modifiedArea);
+
+    void ExecuteQueuedEvents();
+
+    //! mutex used by other threads to lock up the PAK modification,
+    //! so only one thread can modify the PAK at once
+    static CryMutex& GetPakModifyMutex()
+    {
+        //! mutex used to halt copy process while the export to game
+        //! or other pak operation is done in the main thread
+        static CryMutex s_pakModifyMutex;
+        return s_pakModifyMutex;
+    }
+
+    inline HMODULE GetGameModule() const
+    {
+        return m_gameDll;
+    }
+
+private:
+    void SetGameMode(bool inGame);
+    void SwitchToInGame();
+    void SwitchToInEditor();
+    static void HandleQuitRequest(IConsoleCmdArgs*);
+
+    CLogFile m_logFile;
+    QString m_levelName;
+    QString m_levelExtension;
+    QString m_levelPath;
+    QString m_MOD;
+    bool m_bLevelLoaded;
+    bool m_bInGameMode;
+    bool m_bSimulationMode;
+    bool m_bSyncPlayerPosition;
+    bool m_bJustCreated;
+    bool m_bIgnoreUpdates;
+    ISystem* m_pISystem;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Matrix34 m_playerViewTM;
+    struct SSystemUserCallback* m_pSystemUserCallback;
+    HMODULE m_hSystemHandle;
+    HMODULE m_gameDll;
+    enum EPendingGameMode
+    {
+        ePGM_NotPending,
+        ePGM_SwitchToInGame,
+        ePGM_SwitchToInEditor,
+    };
+    EPendingGameMode m_ePendingGameMode;
+    AZStd::unique_ptr<class ModalWindowDismisser> m_modalWindowDismisser;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+
+#endif // CRYINCLUDE_EDITOR_GAMEENGINE_H
diff --git a/Code/Editor/GameExporter.cpp b/Code/Editor/GameExporter.cpp
new file mode 100644
index 0000000000..98c9baeeef
--- /dev/null
+++ b/Code/Editor/GameExporter.cpp
@@ -0,0 +1,526 @@
+/*
+ * 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"
+
+// AzCore
+#include <AzCore/IO/IStreamer.h>
+#include <AzCore/std/parallel/binary_semaphore.h>
+
+// CryCommon
+#include <CryCommon/ILevelSystem.h>
+
+// Editor
+#include "GameExporter.h"
+#include "GameEngine.h"
+#include "CryEditDoc.h"
+#include "UsedResources.h"
+#include "WaitProgress.h"
+#include "Util/CryMemFile.h"
+#include "Objects/ObjectManager.h"
+
+#include "Objects/EntityObject.h"
+
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
+
+//////////////////////////////////////////////////////////////////////////
+#define MUSIC_LEVEL_LIBRARY_FILE "Music.xml"
+#define MATERIAL_LEVEL_LIBRARY_FILE "Materials.xml"
+#define RESOURCE_LIST_FILE "ResourceList.txt"
+#define USED_RESOURCE_LIST_FILE "UsedResourceList.txt"
+#define SHADER_LIST_FILE "ShadersList.txt"
+
+#define GetAValue(rgb)      ((BYTE)((rgb) >> 24))
+
+//////////////////////////////////////////////////////////////////////////
+// SGameExporterSettings
+//////////////////////////////////////////////////////////////////////////
+SGameExporterSettings::SGameExporterSettings()
+    : iExportTexWidth(4096)
+    , nApplySS(1)
+{
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void SGameExporterSettings::SetLowQuality()
+{
+    iExportTexWidth = 4096;
+    nApplySS = 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void SGameExporterSettings::SetHiQuality()
+{
+    iExportTexWidth = 16384;
+    nApplySS = 1;
+}
+
+CGameExporter* CGameExporter::m_pCurrentExporter = NULL;
+
+//////////////////////////////////////////////////////////////////////////
+// CGameExporter
+//////////////////////////////////////////////////////////////////////////
+CGameExporter::CGameExporter()
+    : m_bAutoExportMode(false)
+{
+    m_pCurrentExporter = this;
+}
+
+CGameExporter::~CGameExporter()
+{
+    m_pCurrentExporter = NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportEndian, const char* subdirectory)
+{
+    CAutoDocNotReady autoDocNotReady;
+    CObjectManagerLevelIsExporting levelIsExportingFlag;
+    QWaitCursor waitCursor;
+
+    IEditor* pEditor = GetIEditor();
+    CGameEngine* pGameEngine = pEditor->GetGameEngine();
+    if (pGameEngine->GetLevelPath().isEmpty())
+    {
+        return false;
+    }
+
+    bool exportSuccessful = true;
+
+    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorBeginLevelExport);
+
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+    if (usePrefabSystemForLevels)
+    {
+        // Level.pak and all the data contained within it is unused when using the prefab system for levels, so there's nothing
+        // to do here.
+
+        CCryEditDoc* pDocument = pEditor->GetDocument();
+        pDocument->SetLevelExported(true);
+    }
+    else
+    {
+        QDir::setCurrent(pEditor->GetPrimaryCDFolder());
+
+        QString sLevelPath = Path::AddSlash(pGameEngine->GetLevelPath());
+        if (subdirectory && subdirectory[0] && strcmp(subdirectory, ".") != 0)
+        {
+            sLevelPath = Path::AddSlash(sLevelPath + subdirectory);
+            QDir().mkpath(sLevelPath);
+        }
+
+        m_levelPak.m_sPath = QString(sLevelPath) + GetLevelPakFilename();
+
+        m_levelPath = Path::RemoveBackslash(sLevelPath);
+        QString rootLevelPath = Path::AddSlash(pGameEngine->GetLevelPath());
+
+        CCryEditDoc* pDocument = pEditor->GetDocument();
+
+        if (flags & eExp_Fast)
+        {
+            m_settings.SetLowQuality();
+        }
+        else if (m_bAutoExportMode)
+        {
+            m_settings.SetHiQuality();
+        }
+
+        CryAutoLock<CryMutex> autoLock(CGameEngine::GetPakModifyMutex());
+
+        // Close this pak file.
+        if (!CloseLevelPack(m_levelPak, true))
+        {
+            Error("Cannot close Pak file " + m_levelPak.m_sPath);
+            exportSuccessful = false;
+        }
+
+        if (exportSuccessful)
+        {
+            if (m_bAutoExportMode)
+            {
+                // Remove read-only flags.
+                CrySetFileAttributes(m_levelPak.m_sPath.toUtf8().data(), FILE_ATTRIBUTE_NORMAL);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        if (exportSuccessful)
+        {
+            if (!CFileUtil::OverwriteFile(m_levelPak.m_sPath))
+            {
+                Error("Cannot overwrite Pak file " + m_levelPak.m_sPath);
+                exportSuccessful = false;
+            }
+        }
+
+        if (exportSuccessful)
+        {
+            if (!OpenLevelPack(m_levelPak, false))
+            {
+                Error("Cannot open Pak file " + m_levelPak.m_sPath + " for writing.");
+                exportSuccessful = false;
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        // Export all data to the game
+        ////////////////////////////////////////////////////////////////////////
+        if (exportSuccessful)
+        {
+            ////////////////////////////////////////////////////////////////////////
+            // Exporting map setttings
+            ////////////////////////////////////////////////////////////////////////
+            ExportOcclusionMesh(sLevelPath.toUtf8().data());
+
+            //! Export Level data.
+            CLogFile::WriteLine("Exporting LevelData.xml");
+            ExportLevelData(sLevelPath);
+            CLogFile::WriteLine("Exporting LevelData.xml done.");
+
+            ExportLevelInfo(sLevelPath);
+
+            ExportLevelResourceList(sLevelPath);
+            ExportLevelUsedResourceList(sLevelPath);
+
+            //////////////////////////////////////////////////////////////////////////
+            // End Exporting Game data.
+            //////////////////////////////////////////////////////////////////////////
+
+            // Close all packs.
+            CloseLevelPack(m_levelPak, false);
+            //  m_texturePakFile.Close();
+
+            pEditor->SetStatusText(QObject::tr("Ready"));
+
+            // Reopen this pak file.
+            if (!OpenLevelPack(m_levelPak, true))
+            {
+                Error("Cannot open Pak file " + m_levelPak.m_sPath);
+                exportSuccessful = false;
+            }
+        }
+
+        if (exportSuccessful)
+        {
+            // Commit changes to the disk.
+            _flushall();
+
+            // finally create filelist.xml
+            QString levelName = Path::GetFileName(pGameEngine->GetLevelPath());
+            ExportFileList(sLevelPath, levelName);
+
+            pDocument->SetLevelExported(true);
+        }
+    }
+
+    // Always notify that we've finished exporting, whether it was successful or not.
+    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorEndLevelExport, exportSuccessful);
+
+    if (exportSuccessful)
+    {
+        // Notify the level system that there's a new level, so that the level info is populated.
+        gEnv->pSystem->GetILevelSystem()->Rescan(ILevelSystem::GetLevelsDirectoryName());
+
+        CLogFile::WriteLine("Exporting was successful.");
+    }
+
+    return exportSuccessful;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameExporter::ExportOcclusionMesh(const char* pszGamePath)
+{
+    IEditor* pEditor = GetIEditor();
+    pEditor->SetStatusText(QObject::tr("including Occluder Mesh \"occluder.ocm\" if available"));
+
+    char resolvedLevelPath[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(pszGamePath, resolvedLevelPath, AZ_MAX_PATH_LEN);
+    QString levelDataFile = QString(resolvedLevelPath) + "occluder.ocm";
+    QFile FileIn(levelDataFile);
+    if (FileIn.open(QFile::ReadOnly))
+    {
+        CMemoryBlock Temp;
+        const size_t Size   =   FileIn.size();
+        Temp.Allocate(Size);
+        FileIn.read(reinterpret_cast<char*>(Temp.GetBuffer()), Size);
+        FileIn.close();
+        CCryMemFile FileOut;
+        FileOut.Write(Temp.GetBuffer(), Size);
+        m_levelPak.m_pakFile.UpdateFile(levelDataFile.toUtf8().data(), FileOut);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameExporter::ExportLevelData(const QString& path, bool /*bExportMission*/)
+{
+    IEditor* pEditor = GetIEditor();
+    pEditor->SetStatusText(QObject::tr("Exporting LevelData.xml..."));
+
+    char versionString[256];
+    pEditor->GetFileVersion().ToString(versionString);
+
+    XmlNodeRef root = XmlHelpers::CreateXmlNode("LevelData");
+    root->setAttr("SandboxVersion", versionString);
+    XmlNodeRef rootAction = XmlHelpers::CreateXmlNode("LevelDataAction");
+    rootAction->setAttr("SandboxVersion", versionString);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Save Level Data XML
+    //////////////////////////////////////////////////////////////////////////
+    QString levelDataFile = path + "LevelData.xml";
+    XmlString xmlData = root->getXML();
+    CCryMemFile file;
+    file.Write(xmlData.c_str(), xmlData.length());
+    m_levelPak.m_pakFile.UpdateFile(levelDataFile.toUtf8().data(), file);
+
+    QString levelDataActionFile = path + "LevelDataAction.xml";
+    XmlString xmlDataAction = rootAction->getXML();
+    CCryMemFile fileAction;
+    fileAction.Write(xmlDataAction.c_str(), xmlDataAction.length());
+    m_levelPak.m_pakFile.UpdateFile(levelDataActionFile.toUtf8().data(), fileAction);
+
+    AZStd::vector<char> entitySaveBuffer;
+    AZ::IO::ByteContainerStream<AZStd::vector<char> > entitySaveStream(&entitySaveBuffer);
+    bool savedEntities = false;
+    EBUS_EVENT_RESULT(savedEntities, AzToolsFramework::EditorEntityContextRequestBus, SaveToStreamForGame, entitySaveStream, AZ::DataStream::ST_BINARY);
+    if (savedEntities)
+    {
+        QString entitiesFile;
+        entitiesFile = QStringLiteral("%1%2.entities_xml").arg(path, "Mission0");
+        m_levelPak.m_pakFile.UpdateFile(entitiesFile.toUtf8().data(), entitySaveBuffer.begin(), entitySaveBuffer.size());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameExporter::ExportLevelInfo(const QString& path)
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Export short level info xml.
+    //////////////////////////////////////////////////////////////////////////
+    IEditor* pEditor = GetIEditor();
+    XmlNodeRef root = XmlHelpers::CreateXmlNode("LevelInfo");
+    char versionString[256];
+    pEditor->GetFileVersion().ToString(versionString);
+    root->setAttr("SandboxVersion", versionString);
+
+    QString levelName = pEditor->GetGameEngine()->GetLevelPath();
+    root->setAttr("Name", levelName.toUtf8().data());
+    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+    const AZ::Aabb terrainAabb = terrain ? terrain->GetTerrainAabb() : AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
+    const AZ::Vector2 terrainGridResolution = terrain ? terrain->GetTerrainGridResolution() : AZ::Vector2::CreateOne();
+    const int compiledHeightmapSize = static_cast<int>(terrainAabb.GetXExtent() / terrainGridResolution.GetX());
+    root->setAttr("HeightmapSize", compiledHeightmapSize);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Save LevelInfo file.
+    //////////////////////////////////////////////////////////////////////////
+    QString filename = path + "LevelInfo.xml";
+    XmlString xmlData = root->getXML();
+
+    CCryMemFile file;
+    file.Write(xmlData.c_str(), xmlData.length());
+    m_levelPak.m_pakFile.UpdateFile(filename.toUtf8().data(), file);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameExporter::ExportLevelResourceList(const QString& path)
+{
+    auto pResList = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level);
+
+    // Write resource list to file.
+    CCryMemFile memFile;
+    for (const char* filename = pResList->GetFirst(); filename; filename = pResList->GetNext())
+    {
+        memFile.Write(filename, strlen(filename));
+        memFile.Write("\n", 1);
+    }
+
+    QString resFile = Path::Make(path, RESOURCE_LIST_FILE);
+
+    m_levelPak.m_pakFile.UpdateFile(resFile.toUtf8().data(), memFile, true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameExporter::ExportLevelUsedResourceList(const QString& path)
+{
+    // Write used resource list to file.
+    CCryMemFile memFile;
+
+    CUsedResources resources;
+    GetIEditor()->GetObjectManager()->GatherUsedResources(resources);
+
+    for (CUsedResources::TResourceFiles::const_iterator it = resources.files.begin(); it != resources.files.end(); it++)
+    {
+        QString filePath = Path::MakeGamePath(*it).toLower();
+
+        memFile.Write(filePath.toUtf8().data(), filePath.toUtf8().length());
+        memFile.Write("\n", 1);
+    }
+
+    QString resFile = Path::Make(path, USED_RESOURCE_LIST_FILE);
+
+    m_levelPak.m_pakFile.UpdateFile(resFile.toUtf8().data(), memFile, true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameExporter::ExportFileList(const QString& path, const QString& levelName)
+{
+    // process the folder of the specified map name, producing a filelist.xml file
+    //  that can later be used for map downloads
+    string newpath;
+
+    QString filename = levelName;
+    string mapname = (filename + ".dds").toUtf8().data();
+    string metaname = (filename + ".xml").toUtf8().data();
+
+    XmlNodeRef rootNode = gEnv->pSystem->CreateXmlNode("download");
+    rootNode->setAttr("name", filename.toUtf8().data());
+    rootNode->setAttr("type", "Map");
+    XmlNodeRef indexNode = rootNode->newChild("index");
+    if (indexNode)
+    {
+        indexNode->setAttr("src", "filelist.xml");
+        indexNode->setAttr("dest", "filelist.xml");
+    }
+    XmlNodeRef filesNode = rootNode->newChild("files");
+    if (filesNode)
+    {
+        newpath = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
+        newpath += "/*";
+        AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst(newpath.c_str());
+        if (!handle)
+        {
+            return;
+        }
+        do
+        {
+            // ignore "." and ".."
+            if (handle.m_filename.front() == '.')
+            {
+                continue;
+            }
+            // do we need any files from sub directories?
+            if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
+            {
+                continue;
+            }
+
+            // only need the following files for multiplayer downloads
+            if (!_stricmp(handle.m_filename.data(), GetLevelPakFilename())
+                || !_stricmp(handle.m_filename.data(), mapname.c_str())
+                || !_stricmp(handle.m_filename.data(), metaname.c_str()))
+            {
+                XmlNodeRef newFileNode = filesNode->newChild("file");
+                if (newFileNode)
+                {
+                    // TEMP: this is just for testing. src probably needs to be blank.
+                    //      string src = "http://server41/updater/";
+                    //      src += m_levelName;
+                    //      src += "/";
+                    //      src += fileinfo.name;
+                    newFileNode->setAttr("src", handle.m_filename.data());
+                    newFileNode->setAttr("dest", handle.m_filename.data());
+                    newFileNode->setAttr("size", handle.m_fileDesc.nSize);
+
+                    unsigned char md5[16];
+                    string filenameToHash = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
+                    filenameToHash += "/";
+                    filenameToHash += string{ handle.m_filename.data(), handle.m_filename.size() };
+                    if (gEnv->pCryPak->ComputeMD5(filenameToHash.data(), md5))
+                    {
+                        char md5string[33];
+                        sprintf_s(md5string, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                            md5[0], md5[1], md5[2], md5[3],
+                            md5[4], md5[5], md5[6], md5[7],
+                            md5[8], md5[9], md5[10], md5[11],
+                            md5[12], md5[13], md5[14], md5[15]);
+                        newFileNode->setAttr("md5", md5string);
+                    }
+                    else
+                    {
+                        newFileNode->setAttr("md5", "");
+                    }
+                }
+            }
+        } while (handle = gEnv->pCryPak->FindNext(handle));
+
+        gEnv->pCryPak->FindClose (handle);
+    }
+
+    // save filelist.xml
+    newpath = path.toUtf8().data();
+    newpath += "/filelist.xml";
+    rootNode->saveToFile(newpath.c_str());
+}
+
+void CGameExporter::Error(const QString& error)
+{
+    if (m_bAutoExportMode)
+    {
+        CLogFile::WriteLine((QString("Export failed! ") + error).toUtf8().data());
+    }
+    else
+    {
+        Warning((QString("Export failed! ") + error).toUtf8().data());
+    }
+}
+
+
+bool CGameExporter::OpenLevelPack(SLevelPakHelper& lphelper, bool bCryPak)
+{
+    bool bRet = false;
+
+    assert(lphelper.m_bPakOpened == false);
+    assert(lphelper.m_bPakOpenedCryPak == false);
+
+    if (bCryPak)
+    {
+        assert(!lphelper.m_sPath.isEmpty());
+        bRet = gEnv->pCryPak->OpenPack(lphelper.m_sPath.toUtf8().data());
+        assert(bRet);
+        lphelper.m_bPakOpenedCryPak = true;
+    }
+    else
+    {
+        bRet = lphelper.m_pakFile.Open(lphelper.m_sPath.toUtf8().data());
+        assert(bRet);
+        lphelper.m_bPakOpened = true;
+    }
+    return bRet;
+}
+
+
+bool CGameExporter::CloseLevelPack(SLevelPakHelper& lphelper, bool bCryPak)
+{
+    bool bRet = false;
+
+    if (bCryPak)
+    {
+        assert(lphelper.m_bPakOpenedCryPak == true);
+        assert(!lphelper.m_sPath.isEmpty());
+        bRet = gEnv->pCryPak->ClosePack(lphelper.m_sPath.toUtf8().data());
+        assert(bRet);
+        lphelper.m_bPakOpenedCryPak = false;
+    }
+    else
+    {
+        assert(lphelper.m_bPakOpened == true);
+        lphelper.m_pakFile.Close();
+        bRet = true;
+        lphelper.m_bPakOpened = false;
+    }
+
+    assert(lphelper.m_bPakOpened == false);
+    assert(lphelper.m_bPakOpenedCryPak == false);
+    return bRet;
+}
diff --git a/Code/Editor/GameExporter.h b/Code/Editor/GameExporter.h
new file mode 100644
index 0000000000..ed97011737
--- /dev/null
+++ b/Code/Editor/GameExporter.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_GAMEEXPORTER_H
+#define CRYINCLUDE_EDITOR_GAMEEXPORTER_H
+#pragma once
+
+#include "Util/PakFile.h"
+#include "Util/Image.h"
+#include <AzFramework/API/ApplicationAPI.h>
+
+enum EGameExport
+{
+    eExp_SurfaceTexture = BIT(0),
+    eExp_CoverSurfaces  = BIT(2),
+    eExp_Fast           = BIT(3)
+};
+
+
+class CWaitProgress;
+class CUsedResources;
+
+struct SGameExporterSettings
+{
+    UINT iExportTexWidth;
+    int nApplySS;
+
+    SGameExporterSettings();
+    void SetLowQuality();
+    void SetHiQuality();
+};
+
+struct SANDBOX_API SLevelPakHelper
+{
+    SLevelPakHelper()
+        :  m_bPakOpened(false)
+        , m_bPakOpenedCryPak(true) {}
+
+    QString m_sPath;
+    CPakFile m_pakFile;
+    bool m_bPakOpened;
+    bool m_bPakOpenedCryPak;
+};
+
+
+/*! CGameExporter implements exporting of data fom Editor to Game format.
+        It will produce level.pak file in current level folder, with nececcary exported files.
+ */
+class SANDBOX_API CGameExporter
+{
+public:
+    CGameExporter();
+    ~CGameExporter();
+    SGameExporterSettings& GetSettings() { return m_settings; }
+
+    // In auto exporting mode, highest possible settings will be chosen and no UI dialogs will be shown.
+    void SetAutoExportMode(bool bAuto) { m_bAutoExportMode = bAuto; }
+
+    bool Export(unsigned int flags = 0, EEndian eExportEndian = GetPlatformEndian(), const char* subdirectory = 0);
+
+    static CGameExporter* GetCurrentExporter() { return m_pCurrentExporter; }
+
+private:
+    bool OpenLevelPack(SLevelPakHelper& lphelper, bool bCryPak = false);
+    bool CloseLevelPack(SLevelPakHelper& lphelper, bool bCryPak = false);
+
+    static const char* GetLevelPakFilename()
+    {
+        bool usePrefabSystemForLevels = false;
+        AzFramework::ApplicationRequests::Bus::BroadcastResult(
+            usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+        if (usePrefabSystemForLevels)
+        {
+            AZ_Assert(false, "Level.pak should no longer be used when prefabs are used for levels.");
+            return "";
+        }
+
+        return "level.pak";
+    }
+
+    void ExportLevelData(const QString& path, bool bExportMission = true);
+    void ExportLevelInfo(const QString& path);
+
+    void ExportOcclusionMesh(const char* pszGamePath);
+
+    void ExportLevelResourceList(const QString& path);
+    void ExportLevelUsedResourceList(const QString& path);
+    void ExportFileList(const QString& path, const QString& levelName);
+
+    void Error(const QString& error);
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QString m_levelPath;
+    SLevelPakHelper m_levelPak;
+    SGameExporterSettings m_settings;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    bool m_bAutoExportMode;
+    int m_numExportedMaterials;
+
+    static CGameExporter* m_pCurrentExporter;
+};
+
+// Helper to setup terrain info.
+template<typename Func>
+void SetupTerrainInfo(const size_t octreeCompiledDataSize, Func&& setupTerrainFn)
+{
+    // only setup the terrain if we know space has been allocated for the octree
+    if (octreeCompiledDataSize > 0)
+    {
+        setupTerrainFn(octreeCompiledDataSize);
+    }
+}
+
+#endif // CRYINCLUDE_EDITOR_GAMEEXPORTER_H
diff --git a/Code/Editor/GameResourcesExporter.cpp b/Code/Editor/GameResourcesExporter.cpp
new file mode 100644
index 0000000000..6d3bc059f0
--- /dev/null
+++ b/Code/Editor/GameResourcesExporter.cpp
@@ -0,0 +1,153 @@
+/*
+ * 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 "GameResourcesExporter.h"
+
+// Qt
+#include <QFileDialog>
+
+// Editor
+#include "UsedResources.h"
+#include "GameEngine.h"
+#include "Include/IObjectManager.h"
+#include "WaitProgress.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// Static data.
+//////////////////////////////////////////////////////////////////////////
+CGameResourcesExporter::Files CGameResourcesExporter::m_files;
+
+//////////////////////////////////////////////////////////////////////////
+void CGameResourcesExporter::ChooseDirectoryAndSave()
+{
+    ChooseDirectory();
+    if (!m_path.isEmpty())
+    {
+        Save(m_path);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameResourcesExporter::ChooseDirectory()
+{
+    m_path = QFileDialog::getExistingDirectory(nullptr, QObject::tr("Choose Target (root/PrimaryCD) Folder"));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameResourcesExporter::GatherAllLoadedResources()
+{
+    m_files.clear();
+    m_files.reserve(100000);        // count from GetResourceList, GetFilesFromObjects ...  is unknown
+
+    auto pResList = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level);
+    {
+        for (const char* filename = pResList->GetFirst(); filename; filename = pResList->GetNext())
+        {
+            m_files.push_back(filename);
+        }
+    }
+
+    GetFilesFromObjects();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameResourcesExporter::SetUsedResources(CUsedResources& resources)
+{
+    for (CUsedResources::TResourceFiles::const_iterator it = resources.files.begin(); it != resources.files.end(); it++)
+    {
+        m_files.push_back(*it);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGameResourcesExporter::Save(const QString& outputDirectory)
+{
+    CMemoryBlock data;
+
+    int numFiles = m_files.size();
+
+    CLogFile::WriteLine("===========================================================================");
+    CLogFile::FormatLine("Exporting Level %s resources, %d files", GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().data(), numFiles);
+    CLogFile::WriteLine("===========================================================================");
+
+    // Needed files.
+    CWaitProgress wait("Exporting Resources");
+    for (int i = 0; i < numFiles; i++)
+    {
+        QString srcFilename = m_files[i];
+        if (!wait.Step((i * 100) / numFiles))
+        {
+            break;
+        }
+        wait.SetText(srcFilename.toUtf8().data());
+
+        CLogFile::WriteLine(srcFilename.toUtf8().data());
+
+        CCryFile file;
+        if (file.Open(srcFilename.toUtf8().data(), "rb"))
+        {
+            // Save this file in target folder.
+            QString trgFilename = Path::Make(outputDirectory, srcFilename);
+            int fsize = file.GetLength();
+            if (fsize > data.GetSize())
+            {
+                data.Allocate(fsize + 16);
+            }
+            // Read data.
+            file.ReadRaw(data.GetBuffer(), fsize);
+
+            // Save this data to target file.
+            QString trgFileDir = Path::GetPath(trgFilename);
+            CFileUtil::CreateDirectory(trgFileDir.toUtf8().data());
+            // Create a file.
+            FILE* trgFile = nullptr;
+            azfopen(&trgFile, trgFilename.toUtf8().data(), "wb");
+            if (trgFile)
+            {
+                // Save data to new file.
+                fwrite(data.GetBuffer(), fsize, 1, trgFile);
+                fclose(trgFile);
+            }
+        }
+    }
+    CLogFile::WriteLine("===========================================================================");
+    m_files.clear();
+}
+
+#if defined(WIN64) || defined(APPLE) || defined(AZ_PLATFORM_LINUX)
+template <class Container1, class Container2>
+void Append(Container1& a, const Container2& b)
+{
+    a.reserve (a.size() + b.size());
+    for (auto it = b.begin(); it != b.end(); ++it)
+    {
+        a.insert(a.end(), *it);
+    }
+}
+#else
+template <class Container1, class Container2>
+void Append(Container1& a, const Container2& b)
+{
+    a.insert (a.end(), b.begin(), b.end());
+}
+#endif
+//////////////////////////////////////////////////////////////////////////
+//
+// Go through all editor objects and gathers files from thier properties.
+//
+//////////////////////////////////////////////////////////////////////////
+void CGameResourcesExporter::GetFilesFromObjects()
+{
+    CUsedResources rs;
+    GetIEditor()->GetObjectManager()->GatherUsedResources(rs);
+
+    Append(m_files, rs.files);
+}
diff --git a/Code/Editor/GameResourcesExporter.h b/Code/Editor/GameResourcesExporter.h
new file mode 100644
index 0000000000..97a557e655
--- /dev/null
+++ b/Code/Editor/GameResourcesExporter.h
@@ -0,0 +1,45 @@
+/*
+ * 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_GAMERESOURCESEXPORTER_H
+#define CRYINCLUDE_EDITOR_GAMERESOURCESEXPORTER_H
+#pragma once
+
+class CUsedResources;
+class CVarBlock;
+struct IVariable;
+
+/*! Implements exporting of all loaded resources to specified directory.
+ *
+ */
+class CGameResourcesExporter
+{
+public:
+    void ChooseDirectoryAndSave();
+    void ChooseDirectory();
+    void Save(const QString& outputDirectory);
+
+    void GatherAllLoadedResources();
+    void SetUsedResources(CUsedResources& resources);
+
+private:
+    typedef QStringList Files;
+    static Files m_files;
+
+    QString m_path;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Functions that gather files from editor subsystems.
+    //////////////////////////////////////////////////////////////////////////
+    void GetFilesFromObjects();
+    void GetFilesFromVarBlock(CVarBlock* pVB);
+    void GetFilesFromVariable(IVariable* pVar);
+};
+
+#endif // CRYINCLUDE_EDITOR_GAMERESOURCESEXPORTER_H
+
diff --git a/Code/Editor/GenericSelectItemDialog.cpp b/Code/Editor/GenericSelectItemDialog.cpp
new file mode 100644
index 0000000000..bec23d0559
--- /dev/null
+++ b/Code/Editor/GenericSelectItemDialog.cpp
@@ -0,0 +1,288 @@
+/*
+ * 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 "GenericSelectItemDialog.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_GenericSelectItemDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+// CGenericSelectItemDialog dialog
+
+CGenericSelectItemDialog::CGenericSelectItemDialog(QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , ui(new Ui::CGenericSelectItemDialog)
+    , m_initialized(false)
+{
+    m_mode = eMODE_LIST;
+    m_bSet = false;
+    m_bAllowNew = false;
+    m_bShowDesc = true;
+
+    setWindowTitle(tr("Please choose..."));
+
+    ui->setupUi(this);
+
+    connect(ui->m_listBox, &QListWidget::itemSelectionChanged, this, &CGenericSelectItemDialog::OnLbnSelchangeList);
+    connect(ui->m_listBox, &QListWidget::itemDoubleClicked, this, &CGenericSelectItemDialog::OnLbnDoubleClick);
+    connect(ui->m_tree, &QTreeWidget::itemSelectionChanged, this, &CGenericSelectItemDialog::OnTvnSelchangedTree);
+    connect(ui->m_tree, &QTreeWidget::itemDoubleClicked, this, &CGenericSelectItemDialog::OnTvnDoubleClick);
+    connect(ui->m_buttonBox, &QDialogButtonBox::accepted, this, &CGenericSelectItemDialog::accept);
+    connect(ui->m_buttonBox, &QDialogButtonBox::rejected, this, &CGenericSelectItemDialog::reject);
+    connect(ui->m_newButton, &QAbstractButton::clicked, this, &CGenericSelectItemDialog::OnBnClickedNew);
+}
+
+CGenericSelectItemDialog::~CGenericSelectItemDialog()
+{
+}
+
+// CGenericSelectItemDialog message handlers
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::OnInitDialog()
+{
+    if (m_mode == eMODE_LIST)
+    {
+        ui->m_tree->hide();
+    }
+    else
+    {
+        ui->m_listBox->hide();
+    }
+
+    ui->m_newButton->setVisible(m_bAllowNew);
+
+    ui->m_desc->setVisible(m_bShowDesc);
+
+    if (m_bSet == false)
+    {
+        GetItems(m_items);
+    }
+
+    ReloadItems();
+
+    if (m_mode == eMODE_TREE)
+    {
+        ui->m_tree->setFocus();
+    }
+    else
+    {
+        ui->m_listBox->setFocus();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::GetItems([[maybe_unused]] std::vector<SItem>& outItems)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::ReloadTree()
+{
+    ui->m_tree->clear();
+
+    QTreeWidgetItem* hSelected = nullptr;
+
+    /*
+    std::vector<CString>::const_iterator iter = m_items.begin();
+    while (iter != m_items.end())
+    {
+        const CString& itemName = *iter;
+        HTREEITEM hItem = m_tree.InsertItem(itemName, 0, 0, TVI_ROOT, TVI_SORT);
+        if (!m_preselect.IsEmpty() && m_preselect.CompareNoCase(itemName) == 0)
+        {
+            hSelected = hItem;
+        }
+        ++iter;
+    }
+    */
+
+    std::map<QString, QTreeWidgetItem*, less_qstring_icmp> items;
+
+    QRegularExpression sep(QStringLiteral("[\\/.") + m_treeSeparator + QStringLiteral("]+"));
+
+    for (SItem& item : m_items)
+    {
+        QString name = item.name;
+
+        QTreeWidgetItem* hRoot = nullptr;
+
+        QString itemName;
+
+        for (const QString& token : name.split(sep))
+        {
+            itemName += token + QStringLiteral("/");
+
+            QTreeWidgetItem* hParentItem = stl::find_in_map(items, itemName, nullptr);
+            if (!hParentItem)
+            {
+                hRoot = hRoot == nullptr ? new QTreeWidgetItem(ui->m_tree) : new QTreeWidgetItem(hRoot);
+                hRoot->setText(0, token);
+                items[itemName] = hRoot;
+            }
+            else
+            {
+                hRoot = hParentItem;
+            }
+        }
+
+        Q_ASSERT(hRoot);
+        hRoot->setData(0, Qt::UserRole, QVariant::fromValue<void*>(&item));
+
+        if (!m_preselect.isEmpty() && m_preselect.compare(name, Qt::CaseInsensitive) == 0)
+        {
+            hSelected = hRoot;
+        }
+    }
+
+    ui->m_tree->expandAll();
+
+    if (hSelected != nullptr)
+    {
+        ui->m_tree->scrollToItem(hSelected);
+        ui->m_tree->setCurrentItem(hSelected, 0);
+        OnTvnSelchangedTree();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::ReloadItems()
+{
+    m_selectedItem.clear();
+    m_selectedDesc.clear();
+    if (m_mode == eMODE_TREE)
+    {
+        ReloadTree();
+    }
+    else // eMODE_LIST
+    {
+        std::vector<SItem>::const_iterator iter = m_items.begin();
+        while (iter != m_items.end())
+        {
+            const SItem* pItem = &*iter;
+            QListWidgetItem* item = new QListWidgetItem(pItem->name, ui->m_listBox);
+            item->setData(Qt::UserRole, pItem->desc);
+            ui->m_listBox->addItem(item);
+            ++iter;
+        }
+        if (!m_preselect.isEmpty())
+        {
+            QList<QListWidgetItem*> foundItems = ui->m_listBox->findItems(m_preselect, Qt::MatchExactly);
+            if (!foundItems.isEmpty())
+            {
+                ui->m_listBox->setCurrentItem(foundItems[0]);
+                OnLbnSelchangeList();
+            }
+        }
+    }
+    ItemSelected();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::OnTvnSelchangedTree()
+{
+    QTreeWidgetItem* item = ui->m_tree->currentItem();
+    if (item)
+    {
+        SItem* pItem = reinterpret_cast<SItem*>(item->data(0, Qt::UserRole).value<void*>());
+        if (pItem)
+        {
+            m_selectedItem = pItem->name;
+            m_selectedDesc = pItem->desc;
+        }
+        else
+        {
+            m_selectedItem.clear();
+            m_selectedDesc.clear();
+        }
+
+        ItemSelected();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::OnTvnDoubleClick()
+{
+    if (m_selectedItem.isEmpty() == false)
+    {
+        accept();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CGenericSelectItemDialog::GetSelectedItem()
+{
+    return m_selectedItem;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::OnLbnDoubleClick()
+{
+    if (m_selectedItem.isEmpty() == false)
+    {
+        accept();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::OnLbnSelchangeList()
+{
+    QListWidgetItem* item = ui->m_listBox->currentItem();
+    if (item == nullptr)
+    {
+        m_selectedItem.clear();
+    }
+    else
+    {
+        m_selectedItem = item->text();
+        m_selectedDesc = item->data(Qt::UserRole).toString();
+    }
+    ItemSelected();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::OnBnClickedNew()
+{
+    done(New);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGenericSelectItemDialog::ItemSelected()
+{
+    if (m_selectedItem.isEmpty())
+    {
+        ui->m_desc->setText(tr("<Nothing selected>"));
+    }
+    else
+    {
+        if (m_selectedDesc.isEmpty())
+        {
+            ui->m_desc->setText(m_selectedItem);
+        }
+        else
+        {
+            ui->m_desc->setText(m_selectedDesc);
+        }
+    }
+}
+
+void CGenericSelectItemDialog::showEvent(QShowEvent* event)
+{
+    if (!m_initialized)
+    {
+        OnInitDialog();
+        m_initialized = true;
+    }
+
+    QDialog::showEvent(event);
+}
+
+#include <moc_GenericSelectItemDialog.cpp>
diff --git a/Code/Editor/GenericSelectItemDialog.h b/Code/Editor/GenericSelectItemDialog.h
new file mode 100644
index 0000000000..05402359cb
--- /dev/null
+++ b/Code/Editor/GenericSelectItemDialog.h
@@ -0,0 +1,157 @@
+/*
+ * 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_GENERICSELECTITEMDIALOG_H
+#define CRYINCLUDE_EDITOR_GENERICSELECTITEMDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include <QScopedPointer>
+#include "Util/Variable.h"
+#endif
+
+// CGenericSelectItem dialog
+
+namespace Ui {
+    class CGenericSelectItemDialog;
+}
+
+class CGenericSelectItemDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    typedef enum
+    {
+        eMODE_LIST, eMODE_TREE
+    } TDialogMode;
+    typedef IVariable::IGetCustomItems::SItem SItem;
+
+    CGenericSelectItemDialog(QWidget* pParent = nullptr);   // standard constructor
+    virtual ~CGenericSelectItemDialog();
+
+    void ShowDescription(bool bShow)
+    {
+        m_bShowDesc = bShow;
+    }
+
+    virtual QString GetSelectedItem();
+
+    virtual void PreSelectItem(const QString& name)
+    {
+        m_preselect = name;
+    }
+
+    void SetMode(TDialogMode inMode)
+    {
+        m_mode = inMode;
+    }
+
+    void AllowNew(bool bAllow)
+    {
+        m_bAllowNew = bAllow;
+    }
+
+    void SetTreeSeparator(const QString& sep)
+    {
+        m_treeSeparator = sep;
+    }
+
+    // Override items which are otherwise fetched by GetItems
+    void SetItems(const QStringList& items)
+    {
+        m_bSet = true;
+        m_items.resize(0);
+        m_items.reserve(items.size());
+        QStringList::const_iterator iter = items.begin();
+        QStringList::const_iterator iterEnd = items.end();
+        SItem item;
+        while (iter != iterEnd)
+        {
+            item.name = item.desc = *iter;
+            m_items.push_back(item);
+            ++iter;
+        }
+    }
+
+    // Override items which are otherwise fetched by GetItems
+    void SetItems(const std::vector<QString>& items)
+    {
+        m_bSet = true;
+        m_items.resize(0);
+        m_items.reserve(items.size());
+        std::vector<QString>::const_iterator iter = items.begin();
+        std::vector<QString>::const_iterator iterEnd = items.end();
+        SItem item;
+        while (iter != iterEnd)
+        {
+            item.name = item.desc = *iter;
+            m_items.push_back(item);
+            ++iter;
+        }
+    }
+
+    // Override items which are otherwise fetched by GetItems
+    void SetItems(const std::vector<SItem>& items)
+    {
+        m_bSet = true;
+        m_items = items;
+    }
+
+    void showEvent(QShowEvent* event) override;
+
+    enum
+    {
+        New = QDialog::Accepted + 1
+    };
+
+protected:
+    // Derived Dialogs should override this
+    virtual void GetItems(std::vector<SItem>& outItems);
+
+    // Called whenever an item gets selected
+    virtual void ItemSelected();
+
+    void OnTvnSelchangedTree();
+    void OnTvnDoubleClick();
+    void OnLbnSelchangeList();
+    void OnLbnDoubleClick();
+    void OnBnClickedNew();
+    virtual void OnInitDialog();
+
+    void ReloadItems();
+    void ReloadTree();
+
+    struct less_qstring_icmp
+    {
+        bool operator()(const QString& left, const QString& right) const
+        {
+            return QString::compare(left, right, Qt::CaseInsensitive) < 0;
+        }
+    };
+
+    QString m_preselect;
+    QString m_selectedItem;
+    QString m_selectedDesc;
+    QString m_treeSeparator;
+
+    std::vector<SItem> m_items;
+    TDialogMode m_mode;
+    bool m_bSet;
+    bool m_bAllowNew;
+    bool m_bShowDesc;
+
+    QScopedPointer<Ui::CGenericSelectItemDialog> ui;
+
+private:
+    bool m_initialized;
+};
+
+#endif // CRYINCLUDE_EDITOR_GENERICSELECTITEMDIALOG_H
diff --git a/Code/Sandbox/Editor/GenericSelectItemDialog.ui b/Code/Editor/GenericSelectItemDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/GenericSelectItemDialog.ui
rename to Code/Editor/GenericSelectItemDialog.ui
diff --git a/Code/Editor/Geometry/TriMesh.cpp b/Code/Editor/Geometry/TriMesh.cpp
new file mode 100644
index 0000000000..452f056ecf
--- /dev/null
+++ b/Code/Editor/Geometry/TriMesh.cpp
@@ -0,0 +1,711 @@
+/*
+ * 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 "TriMesh.h"
+
+// Editor
+#include "Util/fastlib.h"
+#include "Objects/SubObjSelection.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+CTriMesh::CTriMesh()
+{
+    pFaces = NULL;
+    pVertices = NULL;
+    pWSVertices = NULL;
+    pUV = NULL;
+    pColors = NULL;
+    pEdges = NULL;
+    pWeights = NULL;
+
+    nFacesCount = 0;
+    nVertCount = 0;
+    nUVCount = 0;
+    nEdgeCount = 0;
+
+    selectionType = SO_ELEM_NONE;
+
+    memset(m_streamSize, 0, sizeof(m_streamSize));
+    memset(m_streamSel, 0, sizeof(m_streamSel));
+    streamSelMask = 0;
+
+    m_streamSel[VERTICES] = &vertSel;
+    m_streamSel[EDGES] = &edgeSel;
+    m_streamSel[FACES] = &faceSel;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTriMesh::~CTriMesh()
+{
+    free(pFaces);
+    free(pEdges);
+    free(pVertices);
+    free(pUV);
+    free(pColors);
+    free(pWSVertices);
+    free(pWeights);
+}
+
+// Set stream size.
+void CTriMesh::ReallocStream(int stream, int nNewCount)
+{
+    assert(stream >= 0 && stream < LAST_STREAM);
+    if (stream < 0 || stream >= LAST_STREAM)
+    {
+        return;
+    }
+    if (m_streamSize[stream] == nNewCount)
+    {
+        return; // Stream already have required size.
+    }
+    void* pStream = 0;
+    int nElementSize = 0;
+    GetStreamInfo(stream, pStream, nElementSize);
+    pStream = ReAllocElements(pStream, nNewCount, nElementSize);
+    m_streamSize[stream] = nNewCount;
+
+    switch (stream)
+    {
+    case VERTICES:
+        pVertices = (CTriVertex*)pStream;
+        nVertCount = nNewCount;
+        vertSel.resize(nNewCount);
+        break;
+    case FACES:
+        pFaces = (CTriFace*)pStream;
+        nFacesCount = nNewCount;
+        faceSel.resize(nNewCount);
+        break;
+    case EDGES:
+        pEdges = (CTriEdge*)pStream;
+        nEdgeCount = nNewCount;
+        edgeSel.resize(nNewCount);
+        break;
+    case TEXCOORDS:
+        pUV = (SMeshTexCoord*)pStream;
+        nUVCount = nNewCount;
+        break;
+    case COLORS:
+        pColors = (SMeshColor*)pStream;
+        break;
+    case WEIGHTS:
+        pWeights = (float*)pStream;
+        break;
+    case LINES:
+        pLines = (CTriLine*)pStream;
+        break;
+    case WS_POSITIONS:
+        pWSVertices = (Vec3*)pStream;
+        break;
+    default:
+        assert(0); // unknown stream.
+    }
+    m_streamSize[stream] = nNewCount;
+}
+
+// Set stream size.
+void CTriMesh::GetStreamInfo(int stream, void*& pStream, int& nElementSize) const
+{
+    assert(stream >= 0 && stream < LAST_STREAM);
+    switch (stream)
+    {
+    case VERTICES:
+        pStream = pVertices;
+        nElementSize = sizeof(CTriVertex);
+        break;
+    case FACES:
+        pStream = pFaces;
+        nElementSize = sizeof(CTriFace);
+        break;
+    case EDGES:
+        pStream = pEdges;
+        nElementSize = sizeof(CTriEdge);
+        break;
+    case TEXCOORDS:
+        pStream = pUV;
+        nElementSize = sizeof(SMeshTexCoord);
+        break;
+    case COLORS:
+        pStream = pColors;
+        nElementSize = sizeof(SMeshColor);
+        break;
+    case WEIGHTS:
+        pStream = pWeights;
+        nElementSize = sizeof(float);
+        break;
+    case LINES:
+        pStream = pLines;
+        nElementSize = sizeof(CTriLine);
+        break;
+    case WS_POSITIONS:
+        pStream = pWSVertices;
+        nElementSize = sizeof(Vec3);
+        break;
+    default:
+        assert(0); // unknown stream.
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CTriMesh::ReAllocElements(void* old_ptr, int new_elem_num, int size_of_element)
+{
+    return realloc(old_ptr, new_elem_num * size_of_element);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Unshare all vertices and split on 3 arrays, positions/texcoords.
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::SetFromMesh(CMesh& mesh)
+{
+    bbox = mesh.m_bbox;
+
+    int maxVerts = mesh.GetIndexCount();
+
+    SetVertexCount(maxVerts);
+    SetUVCount(maxVerts);
+    if (mesh.m_pColor0)
+    {
+        SetColorsCount(maxVerts);
+    }
+
+    SetFacesCount(mesh.GetIndexCount());
+
+    int numv = 0;
+    int numface = 0;
+    for (int nSubset = 0; nSubset < mesh.GetSubSetCount(); nSubset++)
+    {
+        SMeshSubset& subset = mesh.m_subsets[nSubset];
+        for (int i = subset.nFirstIndexId; i < subset.nFirstIndexId + subset.nNumIndices; i += 3)
+        {
+            CTriFace& face = pFaces[numface++];
+            for (int j = 0; j < 3; j++)
+            {
+                int idx = mesh.m_pIndices[i + j];
+                pVertices[numv].pos = mesh.m_pPositions ? mesh.m_pPositions[idx] : mesh.m_pPositionsF16[idx].ToVec3();
+                pWeights[numv] = 0.0f;
+                pUV[numv] = mesh.m_pTexCoord[idx];
+                if (mesh.m_pColor0)
+                {
+                    pColors[numv] = mesh.m_pColor0[idx];
+                }
+
+                face.v [j] = numv;
+                face.uv[j] = numv;
+                face.n [j] = mesh.m_pNorms[idx].GetN();
+                face.MatID = subset.nMatID;
+                face.flags = 0;
+
+                numv++;
+            }
+        }
+    }
+    SetFacesCount(numface);
+    SharePositions();
+    ShareUV();
+    UpdateEdges();
+
+    CalcFaceNormals();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+inline int FindVertexInHash(const Vec3& vPosToFind, const CTriVertex* pVectors, std::vector<int>& hash, float fEpsilon)
+{
+    for (uint32 i = 0; i < hash.size(); i++)
+    {
+        const Vec3& v0 = pVectors[hash[i]].pos;
+        const Vec3& v1 = vPosToFind;
+        if (fabsf(v0.y - v1.y) < fEpsilon &&  fabsf(v0.x - v1.x) < fEpsilon &&  fabsf(v0.z - v1.z) < fEpsilon)
+        {
+            return hash[i];
+        }
+    }
+    return -1;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+inline int FindTexCoordInHash(const SMeshTexCoord& coordToFind, const SMeshTexCoord* pCoords, std::vector<int>& hash, float fEpsilon)
+{
+    for (uint32 i = 0; i < hash.size(); i++)
+    {
+        const SMeshTexCoord& t0 = pCoords[hash[i]];
+        const SMeshTexCoord& t1 = coordToFind;
+
+        if (t0.IsEquivalent(t1, fEpsilon))
+        {
+            return hash[i];
+        }
+    }
+    return -1;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::SharePositions()
+{
+    float fEpsilon = 0.0001f;
+    float fHashScale = 256.0f / MAX(bbox.GetSize().GetLength(), fEpsilon);
+    std::vector<int> arrHashTable[256];
+
+    CTriVertex* pNewVerts = new CTriVertex[GetVertexCount()];
+    SMeshColor* pNewColors = 0;
+    if (pColors)
+    {
+        pNewColors = new SMeshColor[GetVertexCount()];
+    }
+
+    int nLastIndex = 0;
+    for (int f = 0; f < GetFacesCount(); f++)
+    {
+        CTriFace& face = pFaces[f];
+        for (int i = 0; i < 3; i++)
+        {
+            const Vec3& v = pVertices[face.v[i]].pos;
+            uint8 nHash = RoundFloatToInt((v.x + v.y + v.z) * fHashScale);
+
+            int find = FindVertexInHash(v, pNewVerts, arrHashTable[nHash], fEpsilon);
+            if (find < 0)
+            {
+                pNewVerts[nLastIndex] = pVertices[face.v[i]];
+                if (pColors)
+                {
+                    pNewColors[nLastIndex] = pColors[face.v[i]];
+                }
+                face.v[i] = nLastIndex;
+                // Reserve some space already.
+                arrHashTable[nHash].reserve(100);
+                arrHashTable[nHash].push_back(nLastIndex);
+                nLastIndex++;
+            }
+            else
+            {
+                face.v[i] = find;
+            }
+        }
+    }
+
+    SetVertexCount(nLastIndex);
+    memcpy(pVertices, pNewVerts, nLastIndex * sizeof(CTriVertex));
+    delete []pNewVerts;
+
+    if (pColors)
+    {
+        SetColorsCount(nLastIndex);
+        memcpy(pColors, pNewColors, nLastIndex * sizeof(SMeshColor));
+        delete []pNewColors;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::ShareUV()
+{
+    float fEpsilon = 0.0001f;
+    float fHashScale = 256.0f;
+    std::vector<int> arrHashTable[256];
+
+    SMeshTexCoord* pNewUV = new SMeshTexCoord[GetUVCount()];
+
+    int nLastIndex = 0;
+    for (int f = 0; f < GetFacesCount(); f++)
+    {
+        CTriFace& face = pFaces[f];
+        for (int i = 0; i < 3; i++)
+        {
+            const Vec2 uv = pUV[face.uv[i]].GetUV();
+            uint8 nHash = RoundFloatToInt((uv.x + uv.y) * fHashScale);
+
+            int find = FindTexCoordInHash(pUV[face.uv[i]], pNewUV, arrHashTable[nHash], fEpsilon);
+            if (find < 0)
+            {
+                pNewUV[nLastIndex] = pUV[face.uv[i]];
+                face.uv[i] = nLastIndex;
+                arrHashTable[nHash].reserve(100);
+                arrHashTable[nHash].push_back(nLastIndex);
+                nLastIndex++;
+            }
+            else
+            {
+                face.uv[i] = find;
+            }
+        }
+    }
+
+    SetUVCount(nLastIndex);
+    memcpy(pUV, pNewUV, nLastIndex * sizeof(SMeshTexCoord));
+    delete []pNewUV;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::CalcFaceNormals()
+{
+    for (int i = 0; i < nFacesCount; i++)
+    {
+        CTriFace& face = pFaces[i];
+        Vec3 p1 = pVertices[face.v[0]].pos;
+        Vec3 p2 = pVertices[face.v[1]].pos;
+        Vec3 p3 = pVertices[face.v[2]].pos;
+        face.normal = (p2 - p1).Cross(p3 - p1);
+        face.normal.Normalize();
+    }
+}
+
+#define TEX_EPS 0.001f
+#define VER_EPS 0.001f
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::UpdateIndexedMesh(IIndexedMesh* pIndexedMesh) const
+{
+    {
+        const int maxVerts = nFacesCount * 3;
+
+        pIndexedMesh->SetVertexCount(maxVerts);
+        pIndexedMesh->SetTexCoordCount(maxVerts);
+        if (pColors)
+        {
+            pIndexedMesh->SetColorCount(maxVerts);
+        }
+        pIndexedMesh->SetIndexCount(0);
+        pIndexedMesh->SetFaceCount(nFacesCount);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // To find really used materials
+    std::vector<int> usedMaterialIds;
+    uint16 MatIdToSubset[MAX_SUB_MATERIALS];
+    int nLastSubsetId = 0;
+    memset(MatIdToSubset, 0, sizeof(MatIdToSubset));
+    //////////////////////////////////////////////////////////////////////////
+
+    CMesh& mesh = *pIndexedMesh->GetMesh();
+    AABB bb;
+    bb.Reset();
+    for (int i = 0; i < nFacesCount; ++i)
+    {
+        const CTriFace& face = pFaces[i];
+        SMeshFace& meshFace = mesh.m_pFaces[i];
+
+        // Remap new used material ID to index of chunk id.
+        if (!MatIdToSubset[face.MatID])
+        {
+            MatIdToSubset[face.MatID] = 1 + nLastSubsetId++;
+            usedMaterialIds.push_back(face.MatID); // Order of material ids in usedMaterialIds correspond to the indices of chunks.
+        }
+        meshFace.nSubset = MatIdToSubset[face.MatID] - 1;
+
+        for (int j = 0; j < 3; ++j)
+        {
+            const int dstVIdx = i * 3 + j;
+
+            mesh.m_pPositions[dstVIdx] = pVertices[face.v[j]].pos;
+            mesh.m_pNorms[dstVIdx] = SMeshNormal(face.n[j]);
+            mesh.m_pTexCoord[dstVIdx] = pUV[face.uv[j]];
+            if (pColors)
+            {
+                mesh.m_pColor0[dstVIdx] = pColors[face.v[j]];
+            }
+
+            meshFace.v[j] = dstVIdx;
+
+            bb.Add(mesh.m_pPositions[dstVIdx]);
+        }
+    }
+
+    pIndexedMesh->SetBBox(bb);
+
+    pIndexedMesh->SetSubSetCount(usedMaterialIds.size());
+    for (int i = 0; i < usedMaterialIds.size(); i++)
+    {
+        pIndexedMesh->SetSubsetMaterialId(i, usedMaterialIds[i]);
+    }
+
+    pIndexedMesh->Optimize();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::CopyStream(CTriMesh& fromMesh, int stream)
+{
+    void* pTrgStream = 0;
+    void* pSrcStream = 0;
+    int nElemSize = 0;
+    fromMesh.GetStreamInfo(stream, pSrcStream, nElemSize);
+    if (pSrcStream)
+    {
+        ReallocStream(stream, fromMesh.GetStreamSize(stream));
+        GetStreamInfo(stream, pTrgStream, nElemSize);
+        memcpy(pTrgStream, pSrcStream, nElemSize * fromMesh.GetStreamSize(stream));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::Copy(CTriMesh& fromMesh, int nCopyFlags)
+{
+    streamSelMask = fromMesh.streamSelMask;
+
+    if (nCopyFlags & COPY_VERTICES)
+    {
+        CopyStream(fromMesh, VERTICES);
+    }
+    if (nCopyFlags & COPY_FACES)
+    {
+        CopyStream(fromMesh, FACES);
+    }
+    if (nCopyFlags & COPY_EDGES)
+    {
+        CopyStream(fromMesh, EDGES);
+    }
+    if (nCopyFlags & COPY_TEXCOORDS)
+    {
+        CopyStream(fromMesh, TEXCOORDS);
+    }
+    if (nCopyFlags & COPY_COLORS)
+    {
+        CopyStream(fromMesh, COLORS);
+    }
+    if (nCopyFlags & COPY_WEIGHTS)
+    {
+        CopyStream(fromMesh, WEIGHTS);
+    }
+    if (nCopyFlags & COPY_LINES)
+    {
+        CopyStream(fromMesh, LINES);
+    }
+
+    if (nCopyFlags & COPY_VERT_SEL)
+    {
+        vertSel = fromMesh.vertSel;
+    }
+    if (nCopyFlags & COPY_EDGE_SEL)
+    {
+        edgeSel = fromMesh.edgeSel;
+    }
+    if (nCopyFlags & COPY_FACE_SEL)
+    {
+        faceSel = fromMesh.faceSel;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::UpdateEdges()
+{
+    SetEdgeCount(GetFacesCount() * 3);
+
+    std::map<CTriEdge, int> edgemap;
+
+    int nEdges = 0;
+    for (int i = 0; i < GetFacesCount(); i++)
+    {
+        CTriFace& face = pFaces[i];
+        for (int j = 0; j < 3; j++)
+        {
+            int v0 = j;
+            int v1 = (j != 2) ? j + 1 : 0;
+            CTriEdge edge;
+            edge.flags = 0;
+
+            // First vertex index must always be smaller.
+            if (face.v[v0] < face.v[v1])
+            {
+                edge.v[0] = face.v[v0];
+                edge.v[1] = face.v[v1];
+            }
+            else
+            {
+                edge.v[0] = face.v[v1];
+                edge.v[1] = face.v[v0];
+            }
+            edge.face[0] = i;
+            edge.face[1] = -1;
+            int nedge = stl::find_in_map(edgemap, edge, -1);
+            if (nedge >= 0)
+            {
+                // Assign this face as a second member of the edge.
+                if (pEdges[nedge].face[1] < 0)
+                {
+                    pEdges[nedge].face[1] = i;
+                }
+
+                face.edge[j] = nedge;
+            }
+            else
+            {
+                edgemap[edge] = nEdges;
+                pEdges[nEdges] = edge;
+                face.edge[j] = nEdges;
+                nEdges++;
+            }
+        }
+    }
+
+    SetEdgeCount(nEdges);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::SoftSelection(const SSubObjSelOptions& options)
+{
+    int i;
+    int nVerts = GetVertexCount();
+    CTriVertex* pVerts = pVertices;
+
+    for (i = 0; i < nVerts; i++)
+    {
+        if (pWeights[i] == 1.0f)
+        {
+            const Vec3& vp = pVerts[i].pos;
+            for (int j = 0; j < nVerts; j++)
+            {
+                if (pWeights[j] != 1.0f)
+                {
+                    if (vp.IsEquivalent(pVerts[j].pos, options.fSoftSelFalloff))
+                    {
+                        float fDist = vp.GetDistance(pVerts[j].pos);
+                        if (fDist < options.fSoftSelFalloff)
+                        {
+                            float fWeight = 1.0f - (fDist / options.fSoftSelFalloff);
+                            if (fWeight > pWeights[j])
+                            {
+                                pWeights[j] = fWeight;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTriMesh::UpdateSelection()
+{
+    bool bAnySelected = false;
+    if (selectionType == SO_ELEM_VERTEX)
+    {
+        for (int i = 0; i < GetVertexCount(); i++)
+        {
+            if (vertSel[i])
+            {
+                bAnySelected = true;
+                pWeights[i] = 1.0f;
+            }
+            else
+            {
+                pWeights[i] = 0;
+            }
+        }
+    }
+    if (selectionType == SO_ELEM_EDGE)
+    {
+        // Clear weights.
+        for (int i = 0; i < GetVertexCount(); i++)
+        {
+            pWeights[i] = 0;
+        }
+
+        for (int i = 0; i < GetEdgeCount(); i++)
+        {
+            if (edgeSel[i])
+            {
+                bAnySelected = true;
+                CTriEdge& edge = pEdges[i];
+                for (int j = 0; j < 2; j++)
+                {
+                    pWeights[edge.v[j]] = 1.0f;
+                }
+            }
+        }
+    }
+    else if (selectionType == SO_ELEM_FACE)
+    {
+        // Clear weights.
+        for (int i = 0; i < GetVertexCount(); i++)
+        {
+            pWeights[i] = 0;
+        }
+
+        for (int i = 0; i < GetFacesCount(); i++)
+        {
+            if (faceSel[i])
+            {
+                bAnySelected = true;
+                CTriFace& face = pFaces[i];
+                for (int j = 0; j < 3; j++)
+                {
+                    pWeights[face.v[j]] = 1.0f;
+                }
+            }
+        }
+    }
+    return bAnySelected;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CTriMesh::ClearSelection()
+{
+    bool bWasSelected = false;
+    // Remove all selections.
+    int i;
+    for (i = 0; i < GetVertexCount(); i++)
+    {
+        pWeights[i] = 0;
+    }
+    streamSelMask = 0;
+    for (int ii = 0; ii < LAST_STREAM; ii++)
+    {
+        if (m_streamSel[ii] && !m_streamSel[ii]->is_zero())
+        {
+            bWasSelected = true;
+            m_streamSel[ii]->clear();
+        }
+    }
+    return bWasSelected;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::GetEdgesByVertex(MeshElementsArray& inVertices, MeshElementsArray& outEdges)
+{
+    // Brute force algorithm using binary search.
+    // for every edge check if edge vertex is inside inVertices array.
+    std::sort(inVertices.begin(), inVertices.end());
+    for (int i = 0; i < GetEdgeCount(); i++)
+    {
+        if (stl::binary_find(inVertices.begin(), inVertices.end(), pEdges[i].v[0]) != inVertices.end())
+        {
+            outEdges.push_back(i);
+        }
+        else if (stl::binary_find(inVertices.begin(), inVertices.end(), pEdges[i].v[1]) != inVertices.end())
+        {
+            outEdges.push_back(i);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTriMesh::GetFacesByVertex(MeshElementsArray& inVertices, MeshElementsArray& outFaces)
+{
+    // Brute force algorithm using binary search.
+    // for every face check if face vertex is inside inVertices array.
+    std::sort(inVertices.begin(), inVertices.end());
+    for (int i = 0; i < GetFacesCount(); i++)
+    {
+        if (stl::binary_find(inVertices.begin(), inVertices.end(), pFaces[i].v[0]) != inVertices.end())
+        {
+            outFaces.push_back(i);
+        }
+        else if (stl::binary_find(inVertices.begin(), inVertices.end(), pFaces[i].v[1]) != inVertices.end())
+        {
+            outFaces.push_back(i);
+        }
+        else if (stl::binary_find(inVertices.begin(), inVertices.end(), pFaces[i].v[2]) != inVertices.end())
+        {
+            outFaces.push_back(i);
+        }
+    }
+}
diff --git a/Code/Editor/Geometry/TriMesh.h b/Code/Editor/Geometry/TriMesh.h
new file mode 100644
index 0000000000..f0e01e253e
--- /dev/null
+++ b/Code/Editor/Geometry/TriMesh.h
@@ -0,0 +1,239 @@
+/*
+ * 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_GEOMETRY_TRIMESH_H
+#define CRYINCLUDE_EDITOR_GEOMETRY_TRIMESH_H
+#pragma once
+
+#include <IIndexedMesh.h>
+#include "Util/bitarray.h"
+
+struct SSubObjSelOptions;
+
+typedef std::vector<int> MeshElementsArray;
+
+//////////////////////////////////////////////////////////////////////////
+// Vertex used in the TriMesh.
+//////////////////////////////////////////////////////////////////////////
+struct CTriVertex
+{
+    Vec3 pos;
+    //float weight;    // Selection weight in 0-1 range.
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Triangle face used by the Triangle mesh.
+//////////////////////////////////////////////////////////////////////////
+struct CTriFace
+{
+    uint32 v[3];  // Indices to vertices array.
+    uint32 uv[3]; // Indices to texture coordinates array.
+    Vec3 n[3];    // Vertex normals at face vertices.
+    Vec3 normal;  // Face normal.
+    uint32 edge[3]; // Indices to the face edges.
+    unsigned char MatID; // Index of face sub material.
+    unsigned char flags; // see ETriMeshFlags
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Mesh edge.
+//////////////////////////////////////////////////////////////////////////
+struct CTriEdge
+{
+    uint32 v[2];   // Indices to edge vertices.
+    int face[2];   // Indices to edge faces (-1 if no face).
+    uint32 flags;  // see ETriMeshFlags
+
+    CTriEdge() {}
+    bool operator==(const CTriEdge& edge) const
+    {
+        if ((v[0] == edge.v[0] && v[1] == edge.v[1]) ||
+            (v[0] == edge.v[1] && v[1] == edge.v[0]))
+        {
+            return true;
+        }
+        return false;
+    }
+    bool operator!=(const CTriEdge& edge) const { return !(*this == edge); }
+    bool operator<(const CTriEdge& edge) const { return (*(uint64*)v < *(uint64*)edge.v); }
+    bool operator>(const CTriEdge& edge) const { return (*(uint64*)v > *(uint64*)edge.v); }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Mesh line.
+//////////////////////////////////////////////////////////////////////////
+struct CTriLine
+{
+    uint32 v[2];   // Indices to edge vertices.
+
+    CTriLine() {}
+    bool operator==(const CTriLine& edge) const
+    {
+        if ((v[0] == edge.v[0] && v[1] == edge.v[1]) ||
+            (v[0] == edge.v[1] && v[1] == edge.v[0]))
+        {
+            return true;
+        }
+        return false;
+    }
+    bool operator!=(const CTriLine& edge) const { return !(*this == edge); }
+    bool operator<(const CTriLine& edge) const { return (*(uint64*)v < *(uint64*)edge.v); }
+    bool operator>(const CTriLine& edge) const { return (*(uint64*)v > *(uint64*)edge.v); }
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct CTriMeshPoly
+{
+    std::vector<uint32> v;  // Indices to vertices array.
+    std::vector<uint32> uv; // Indices to texture coordinates array.
+    std::vector<Vec3> n;    // Vertex normals at face vertices.
+    Vec3 normal;  // Polygon normal.
+    uint32 edge[3]; // Indices to the face edges.
+    unsigned char MatID; // Index of face sub material.
+    unsigned char flags; // optional flags.
+};
+
+//////////////////////////////////////////////////////////////////////////
+// CTriMesh is used in the Editor as a general purpose editable triangle mesh.
+//////////////////////////////////////////////////////////////////////////
+class CTriMesh
+{
+public:
+    enum EStream
+    {
+        VERTICES,
+        FACES,
+        EDGES,
+        TEXCOORDS,
+        COLORS,
+        WEIGHTS,
+        LINES,
+        WS_POSITIONS,
+        LAST_STREAM,
+    };
+    enum ECopyFlags
+    {
+        COPY_VERTICES   = BIT(1),
+        COPY_FACES      = BIT(2),
+        COPY_EDGES      = BIT(3),
+        COPY_TEXCOORDS  = BIT(4),
+        COPY_COLORS     = BIT(5),
+        COPY_VERT_SEL   = BIT(6),
+        COPY_EDGE_SEL   = BIT(7),
+        COPY_FACE_SEL   = BIT(8),
+        COPY_WEIGHTS    = BIT(9),
+        COPY_LINES      = BIT(10),
+        COPY_ALL        = 0xFFFF,
+    };
+    // geometry data
+    CTriFace* pFaces;
+    CTriEdge* pEdges;
+    CTriVertex* pVertices;
+    SMeshTexCoord* pUV;
+    SMeshColor* pColors; // If allocated same size as pVerts array.
+    Vec3* pWSVertices; // World space vertices.
+    float* pWeights;
+    CTriLine* pLines;
+
+    int nFacesCount;
+    int nVertCount;
+    int nUVCount;
+    int nEdgeCount;
+    int nLinesCount;
+
+    AABB bbox;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Selections.
+    //////////////////////////////////////////////////////////////////////////
+    CBitArray vertSel;
+    CBitArray edgeSel;
+    CBitArray faceSel;
+    // Every bit of the selection mask correspond to a stream, if bit is set this stream have some elements selected
+    int streamSelMask;
+
+    // Selection element type.
+    // see ESubObjElementType
+    int selectionType;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Vertices of the front facing triangles.
+    CBitArray frontFacingVerts;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Functions.
+    //////////////////////////////////////////////////////////////////////////
+    CTriMesh();
+    ~CTriMesh();
+
+    int GetFacesCount() const { return nFacesCount; }
+    int GetVertexCount() const { return nVertCount; }
+    int GetUVCount() const { return nUVCount; }
+    int GetEdgeCount() const { return nEdgeCount; }
+    int GetLinesCount() const { return nLinesCount; }
+
+    //////////////////////////////////////////////////////////////////////////
+    void SetFacesCount(int nNewCount) { ReallocStream(FACES, nNewCount); }
+    void SetVertexCount(int nNewCount)
+    {
+        ReallocStream(VERTICES, nNewCount);
+        if (pColors)
+        {
+            ReallocStream(COLORS, nNewCount);
+        }
+        ReallocStream(WEIGHTS, nNewCount);
+    }
+    void SetColorsCount(int nNewCount) { ReallocStream(COLORS, nNewCount); }
+    void SetUVCount(int nNewCount) { ReallocStream(TEXCOORDS, nNewCount); }
+    void SetEdgeCount(int nNewCount)  { ReallocStream(EDGES, nNewCount); }
+    void SetLinesCount(int nNewCount)  { ReallocStream(LINES, nNewCount); }
+
+    void ReallocStream(int stream, int nNewCount);
+    void GetStreamInfo(int stream, void*& pStream, int& nElementSize) const;
+    int  GetStreamSize(int stream) const { return m_streamSize[stream]; };
+
+    void SetFromMesh(CMesh& mesh);
+    void UpdateIndexedMesh(IIndexedMesh* pIndexedMesh) const;
+    // Calculate per face normal.
+    void CalcFaceNormals();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Welding functions.
+    //////////////////////////////////////////////////////////////////////////
+    void SharePositions();
+    void ShareUV();
+    //////////////////////////////////////////////////////////////////////////
+    // Recreate edges of the mesh.
+    void UpdateEdges();
+
+    void Copy(CTriMesh& fromMesh, int nCopyFlags = COPY_ALL);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Sub-object selection specific methods.
+    //////////////////////////////////////////////////////////////////////////
+    // Return true if something is selected.
+    bool UpdateSelection();
+    // Clear all selections, return true if something was selected.
+    bool ClearSelection();
+    void SoftSelection(const SSubObjSelOptions& options);
+    CBitArray* GetStreamSelection(int nStream) { return m_streamSel[nStream]; };
+    // Returns true if specified stream have any selected elements.
+    bool StreamHaveSelection(int nStream) { return streamSelMask & (1 << nStream); }
+    void GetEdgesByVertex(MeshElementsArray& inVertices, MeshElementsArray& outEdges);
+    void GetFacesByVertex(MeshElementsArray& inVertices, MeshElementsArray& outFaces);
+
+private:
+    void* ReAllocElements(void* old_ptr, int new_elem_num, int size_of_element);
+    void CopyStream(CTriMesh& fromMesh, int stream);
+
+    // For internal use.
+    int m_streamSize[LAST_STREAM];
+    CBitArray* m_streamSel[LAST_STREAM];
+};
+
+#endif // CRYINCLUDE_EDITOR_GEOMETRY_TRIMESH_H
diff --git a/Code/Editor/GotoPositionDlg.cpp b/Code/Editor/GotoPositionDlg.cpp
new file mode 100644
index 0000000000..1dbf8d61e0
--- /dev/null
+++ b/Code/Editor/GotoPositionDlg.cpp
@@ -0,0 +1,132 @@
+/*
+ * 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 "GotoPositionDlg.h"
+#include "EditorDefs.h"
+
+// Editor
+#include "EditorViewportCamera.h"
+#include "EditorViewportSettings.h"
+#include "GameEngine.h"
+#include "ViewManager.h"
+
+#include <AzFramework/Viewport/CameraInput.h>
+
+#include <AzCore/Math/Transform.h>
+#include <AzCore/Math/Vector3.h>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_GotoPositionDlg.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+GotoPositionDialog::GotoPositionDialog(QWidget* parent)
+    : QDialog(parent)
+    , m_ui(new Ui::GotoPositionDialog)
+{
+    m_ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setFixedSize(size());
+    OnInitDialog();
+
+    auto doubleValueChanged = static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged);
+
+    connect(m_ui->m_posEdit, &QLineEdit::editingFinished, this, &GotoPositionDialog::OnChangeEdit);
+    connect(m_ui->m_dymX, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
+    connect(m_ui->m_dymY, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
+    connect(m_ui->m_dymZ, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
+    connect(m_ui->m_dymAnglePitch, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
+    connect(m_ui->m_dymAngleYaw, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
+}
+
+GotoPositionDialog::~GotoPositionDialog() = default;
+
+void GotoPositionDialog::OnInitDialog()
+{
+    const auto cameraTransform = SandboxEditor::GetDefaultViewportCameraTransform();
+    const auto cameraTranslation = cameraTransform.GetTranslation();
+    const auto cameraRotation = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromQuaternion(cameraTransform.GetRotation()));
+    const auto pitchDegrees = AZ::RadToDeg(cameraRotation.GetX());
+    const auto yawDegrees = AZ::RadToDeg(cameraRotation.GetZ());
+
+    // position
+    m_ui->m_dymX->setRange(-64000.0, 64000.0);
+    m_ui->m_dymX->setValue(cameraTranslation.GetX());
+
+    m_ui->m_dymY->setRange(-64000.0, 64000.0);
+    m_ui->m_dymY->setValue(cameraTranslation.GetY());
+
+    m_ui->m_dymZ->setRange(-64000.0, 64000.0);
+    m_ui->m_dymZ->setValue(cameraTranslation.GetZ());
+
+    // rotation
+    m_ui->m_dymAnglePitch->setRange(-180.0, 180.0);
+    m_ui->m_dymAnglePitch->setValue(pitchDegrees);
+
+    m_ui->m_dymAngleYaw->setRange(-180.0, 180.0);
+    m_ui->m_dymAngleYaw->setValue(yawDegrees);
+
+    // ensure the goto button is highlighted correctly.
+    m_ui->pushButton->setDefault(true);
+
+    OnUpdateNumbers();
+}
+
+void GotoPositionDialog::OnChangeEdit()
+{
+    const int argCount = 5;
+    AZStd::vector<float> transform(argCount);
+
+    m_transform = m_ui->m_posEdit->text();
+    const QStringList parts = m_transform.split(QRegularExpression("[\\s,;\\t]"), Qt::SkipEmptyParts);
+    for (int i = 0; i < argCount && i < parts.count(); ++i)
+    {
+        transform[i] = parts[i].toDouble();
+    }
+
+    m_ui->m_dymX->setValue(transform[0]);
+    m_ui->m_dymY->setValue(transform[1]);
+    m_ui->m_dymZ->setValue(transform[2]);
+    m_ui->m_dymAnglePitch->setValue(transform[3]);
+    m_ui->m_dymAngleYaw->setValue(transform[4]);
+}
+
+void GotoPositionDialog::OnUpdateNumbers()
+{
+    m_ui->m_posEdit->setText(QString::fromLatin1("%1, %2, %3, %4, %5")
+                                 .arg(m_ui->m_dymX->value(), 2, 'f', 2)
+                                 .arg(m_ui->m_dymY->value(), 2, 'f', 2)
+                                 .arg(m_ui->m_dymZ->value(), 2, 'f', 2)
+                                 .arg(m_ui->m_dymAnglePitch->value(), 2, 'f', 2)
+                                 .arg(m_ui->m_dymAngleYaw->value(), 2, 'f', 2));
+}
+
+void GotoPositionDialog::accept()
+{
+    if (SandboxEditor::UsingNewCameraSystem())
+    {
+        SandboxEditor::InterpolateDefaultViewportCameraToTransform(
+            AZ::Vector3(
+                aznumeric_cast<float>(m_ui->m_dymX->value()), aznumeric_cast<float>(m_ui->m_dymY->value()),
+                aznumeric_cast<float>(m_ui->m_dymZ->value())),
+            AZ::DegToRad(aznumeric_cast<float>(m_ui->m_dymAnglePitch->value())),
+            AZ::DegToRad(aznumeric_cast<float>(m_ui->m_dymAngleYaw->value())));
+    }
+    else
+    {
+        SandboxEditor::SetDefaultViewportCameraPosition(AZ::Vector3(
+            aznumeric_cast<float>(m_ui->m_dymX->value()), aznumeric_cast<float>(m_ui->m_dymY->value()),
+            aznumeric_cast<float>(m_ui->m_dymZ->value())));
+        SandboxEditor::SetDefaultViewportCameraRotation(
+            AZ::DegToRad(aznumeric_cast<float>(m_ui->m_dymAnglePitch->value())),
+            AZ::DegToRad(aznumeric_cast<float>(m_ui->m_dymAngleYaw->value())));
+    }
+
+    QDialog::accept();
+}
+
+#include <moc_GotoPositionDlg.cpp>
diff --git a/Code/Editor/GotoPositionDlg.h b/Code/Editor/GotoPositionDlg.h
new file mode 100644
index 0000000000..09d169dce4
--- /dev/null
+++ b/Code/Editor/GotoPositionDlg.h
@@ -0,0 +1,42 @@
+/*
+ * 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 Ui
+{
+    class GotoPositionDialog;
+}
+
+//! GotoPositionDialog for setting camera position and rotation.
+class GotoPositionDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit GotoPositionDialog(QWidget* parent = nullptr);
+    ~GotoPositionDialog();
+
+protected:
+    void OnInitDialog();
+    void accept() override;
+
+    void OnUpdateNumbers();
+    void OnChangeEdit();
+
+public:
+    QString m_transform;
+
+private:
+    QScopedPointer<Ui::GotoPositionDialog> m_ui;
+};
diff --git a/Code/Sandbox/Editor/GotoPositionDlg.ui b/Code/Editor/GotoPositionDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/GotoPositionDlg.ui
rename to Code/Editor/GotoPositionDlg.ui
diff --git a/Code/Editor/GraphicsSettingsDialog.cpp b/Code/Editor/GraphicsSettingsDialog.cpp
new file mode 100644
index 0000000000..dbd7a7fc1a
--- /dev/null
+++ b/Code/Editor/GraphicsSettingsDialog.cpp
@@ -0,0 +1,1392 @@
+/*
+ * 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/PlatformDef.h>
+#include <QUuid>
+#include <platform.h>
+#include "ProjectDefines.h"
+#include "EditorDefs.h"
+
+#include "GraphicsSettingsDialog.h"
+
+#include <QVector>
+#include <QMessageBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QFile>
+#include <QLineEdit>
+#include <QGridLayout>
+#include <QDebug>
+#include <QFontMetrics>
+#include <QSettings>
+
+#include <AzCore/Utils/Utils.h>
+
+// AzFramework
+#include <AzFramework/IO/LocalFileIO.h>
+#include <AzQtComponents/Components/Widgets/PushButton.h>
+#include <AzQtComponents/Components/Widgets/SpinBox.h>
+#include <AzQtComponents/Components/StyleManager.h>
+
+// Editor
+#include "Util/AutoDirectoryRestoreFileDialog.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_graphicssettingsdialog.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+QString groupNames[] =
+{
+    "Game Effects",
+    "Light",
+    "Object Detail",
+    "Particles",
+    "Physics",
+    "Post Processing",
+    "Quality",
+    "Shading",
+    "Shadows",
+    "Sound",
+    "Texture",
+    "Texture Resolution",
+    "Volumetric Effects",
+    "Water",
+    "Miscellaneous"
+};
+
+GraphicsSettingsDialog::GraphicsSettingsDialog(QWidget* parent /* = nullptr */)
+    : QDialog(parent)
+    , m_ui(new Ui::GraphicsSettingsDialog())
+{
+    //Update qlabel color when disabled
+    setStyleSheet("QLabel::disabled{color: gray;}");
+
+    // Start initialization the dialog
+    m_ui->setupUi(this);
+    setWindowTitle("Graphics Settings");
+    m_ui->m_applyButton->setDefault(true);
+    m_headerView = new GraphicsSettingsHeaderView(this, Qt::Horizontal);
+    m_headerView->setMouseTracking(true);
+    m_ui->m_graphicsSettingsTreeView->setHeader(m_headerView);
+    /////////////////////////////////////////////
+
+    m_currentPlatform = GetISystem()->GetConfigPlatform();
+    m_currentSpecIndex = 0;
+    m_dirtyCVarCount = 0;
+
+    m_showCustomSpec = true;
+    ShowCustomSpecOption(false);
+
+    // Show categories, disable apply button
+    m_showCategories = true;
+    m_ui->m_applyButton->setEnabled(false);
+
+    m_graphicsSettingsModel = new GraphicsSettingsModel(this);
+    m_ui->m_graphicsSettingsTreeView->setModel(m_graphicsSettingsModel);
+
+    m_cfgFiles[CONFIG_PC].push_back("pc_low.cfg");
+    m_cfgFiles[CONFIG_PC].push_back("pc_medium.cfg");
+    m_cfgFiles[CONFIG_PC].push_back("pc_high.cfg");
+    m_cfgFiles[CONFIG_PC].push_back("pc_veryhigh.cfg");
+    m_cfgFiles[CONFIG_OSX_METAL].push_back("osx_metal_low.cfg");
+    m_cfgFiles[CONFIG_OSX_METAL].push_back("osx_metal_medium.cfg");
+    m_cfgFiles[CONFIG_OSX_METAL].push_back("osx_metal_high.cfg");
+    m_cfgFiles[CONFIG_OSX_METAL].push_back("osx_metal_veryhigh.cfg");
+    m_cfgFiles[CONFIG_ANDROID].push_back("android_low.cfg");
+    m_cfgFiles[CONFIG_ANDROID].push_back("android_medium.cfg");
+    m_cfgFiles[CONFIG_ANDROID].push_back("android_high.cfg");
+    m_cfgFiles[CONFIG_ANDROID].push_back("android_veryhigh.cfg");
+    m_cfgFiles[CONFIG_IOS].push_back("ios_low.cfg");
+    m_cfgFiles[CONFIG_IOS].push_back("ios_medium.cfg");
+    m_cfgFiles[CONFIG_IOS].push_back("ios_high.cfg");
+    m_cfgFiles[CONFIG_IOS].push_back("ios_veryhigh.cfg");
+#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)\
+    m_cfgFiles[CONFIG_##CODENAME].push_back(#publicname "_low.cfg");\
+    m_cfgFiles[CONFIG_##CODENAME].push_back(#publicname "_medium.cfg");\
+    m_cfgFiles[CONFIG_##CODENAME].push_back(#publicname "_high.cfg");
+    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
+#undef AZ_RESTRICTED_PLATFORM_EXPANSION
+#endif
+    // Since the layout order is set by the .ui file we need to match the order here so that tabbing works correctly.
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_gameeffects.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_light.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_objectdetail.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_particles.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_physics.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_postprocessing.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_quality.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_shading.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_shadows.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_sound.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_texture.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_textureresolution.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_volumetriceffects.cfg");
+    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_water.cfg");
+    m_cvarGroupOrder.push_back("miscellaneous");
+
+    m_platformStrings.push_back(AZStd::make_pair("PC", CONFIG_PC));
+    m_platformStrings.push_back(AZStd::make_pair("OSX Metal", CONFIG_OSX_METAL));
+    m_platformStrings.push_back(AZStd::make_pair("Android", CONFIG_ANDROID));
+    m_platformStrings.push_back(AZStd::make_pair("iOS", CONFIG_IOS));
+#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)\
+    m_platformStrings.push_back(AZStd::make_pair(PublicAuxName2, CONFIG_##CODENAME));
+    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
+#undef AZ_RESTRICTED_PLATFORM_EXPANSION
+#endif
+    m_platformStrings.push_back(AZStd::make_pair("Custom", CONFIG_INVALID_PLATFORM));
+
+    for (auto& platformString : m_platformStrings)
+    {
+        QString platform = platformString.first.c_str();
+        m_ui->m_platformEntry->addItem(platform);
+    }
+
+    QSettings settings("O3DE", "O3DE");
+    settings.beginGroup("GraphicsSettingsDialog");
+
+    if (settings.contains("Platform"))
+    {
+        QString platformName = settings.value("Platform").toString();
+        AZStd::string azPlatform = platformName.toUtf8().data();
+        m_currentPlatform = GetConfigPlatformFromName(azPlatform);
+        if (m_currentPlatform == CONFIG_INVALID_PLATFORM)
+        {
+            ShowCustomSpecOption(true);
+        }
+    }
+
+    settings.endGroup();
+
+    SetPlatformEntry(m_currentPlatform);
+
+    BuildUI();
+
+    connect(m_ui->m_graphicsSettingsTreeView, &QTreeView::collapsed, this, [&](const QModelIndex& index) { SetCollapsed(index, true); });
+    connect(m_ui->m_graphicsSettingsTreeView, &QTreeView::expanded, this, [&](const QModelIndex& index) { SetCollapsed(index, false); });
+
+    AzQtComponents::StyleManager::setStyleSheet(this, "style:GraphicsSettingsDialog.qss");
+}
+
+GraphicsSettingsDialog::~GraphicsSettingsDialog()
+{
+    QSettings settings("O3DE", "O3DE");
+    settings.beginGroup("GraphicsSettingsDialog");
+
+    auto platformCheck = [this](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return stringConfigPair.second == m_currentPlatform; };
+    auto platformStringsIterator = AZStd::find_if(m_platformStrings.begin(), m_platformStrings.end(), platformCheck);
+    if (platformStringsIterator != m_platformStrings.end())
+    {
+        settings.setValue("Platform", platformStringsIterator->first.c_str());
+    }
+    else
+    {
+        settings.remove("Platform");
+    }
+
+    settings.beginGroup("cvarGroup");
+
+    for (auto& collapseIterator : m_uiCollapseGroup)
+    {
+        settings.setValue(collapseIterator->m_groupName, collapseIterator->m_isCollapsed);
+    }
+
+    settings.endGroup();
+    settings.endGroup();
+    settings.sync();
+
+    for (CollapseGroup* group : m_uiCollapseGroup)
+    {
+        // Destructor of CollapseGroup will set the members
+        // pointing to nullptr. The actually destruction of the
+        // widgets will be done on destruction of m_ui
+        delete group;
+    }
+
+    for (ParameterWidget* widget : m_parameterWidgets)
+    {
+        // Destructor of ParameterWidget will set the members
+        // pointing to nullptr. The actually destruction of the
+        // widgets will be done on destruction of m_ui
+        delete widget;
+    }
+
+    // Delete m_ui will destruct all the UI elements with in the ui file
+    // Since m_ui is a QScopedPointer which will cleanup itself on the end
+    // of the scope.
+}
+
+void GraphicsSettingsDialog::SetSettingsTree(int numColumns)
+{
+    m_graphicsSettingsModel->clear();
+    m_uiCollapseGroup.clear();
+    m_graphicsSettingsModel->setColumnCount(numColumns);
+
+    for (int i = 1; i < numColumns; ++i)
+    {
+        m_ui->m_graphicsSettingsTreeView->header()->setSectionResizeMode(i, QHeaderView::Stretch);
+    }
+
+    m_ui->m_graphicsSettingsTreeView->setColumnWidth(0, 200);
+    m_ui->m_graphicsSettingsTreeView->header()->setMinimumSectionSize(100);
+
+    m_graphicsSettingsModel->setHeaderData(0, Qt::Horizontal, "Properties");
+
+    auto parentItem = m_graphicsSettingsModel->invisibleRootItem();
+
+    for (int i = 0; i < aznumeric_cast<int>(GraphicsSettings::numSettings); ++i)
+    {
+        QStandardItem* row = new QStandardItem();
+        row->setData(groupNames[i], Qt::DisplayRole);
+        parentItem->appendRow(row);
+        SetCollapsedLayout(groupNames[i].replace(" ", ""), row);
+    }
+    m_numColumns = numColumns;
+
+    m_cvarGroupData["Config/CVarGroups/sys_spec_gameeffects.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::GameEffects));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_light.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Light));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_objectdetail.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::ObjectDetail));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_particles.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Particles));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_physics.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Physics));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_postprocessing.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::PostProcessing));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_quality.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Quality));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_shading.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Shading));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_shadows.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Shadows));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_sound.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Sound));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_texture.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Texture));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_textureresolution.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::TextureResolution));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_volumetriceffects.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::VolumetricEffects));
+    m_cvarGroupData["Config/CVarGroups/sys_spec_water.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Water));
+    m_cvarGroupData["miscellaneous"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Miscellaneous));
+}
+
+void GraphicsSettingsDialog::OnLoadConfigurationEntry(const char* strKey, const char* strValue, const char* strGroup)
+{
+    AZStd::string key = strKey;
+    ICVar* cvar = gEnv->pConsole->GetCVar(strKey);
+
+    if (cvar)
+    {
+        AZStd::transform(key.begin(), key.end(), key.begin(), tolower);
+        if (azstricmp(key.c_str(), "sys_spec_full") == 0 || key.find("sys_spec_") == key.npos)
+        {
+            int type = cvar->GetType();
+            AZStd::any val;
+            if (type == CVAR_INT)
+            {
+                val = atoi(strValue);
+            }
+            else if (type == CVAR_FLOAT)
+            {
+                val = static_cast<float>(atof(strValue));
+            }
+            else
+            {
+                val = AZStd::string(strValue);
+            }
+
+            // Platform cfg file (ex. pc_veryhigh.cfg)
+            if (strGroup[0] == '\0')
+            {
+                // New cvar loaded into map
+                if (m_cVarTracker.find(key) == m_cVarTracker.end())
+                {
+                    m_cVarTracker[key].type = type;
+                    m_cVarTracker[key].cvarGroup = "miscellaneous";
+                    AZStd::any empty;
+                    if (type == CVAR_INT)
+                    {
+                        empty = 0;
+                    }
+                    else if (type == CVAR_FLOAT)
+                    {
+                        empty = 0.0f;
+                    }
+                    else
+                    {
+                        empty = AZStd::string("");
+                    }
+                    m_cVarTracker[key].fileVals.resize(m_numSpecLevels, CVarFileStatus(empty, empty, empty));
+                }
+
+                m_cVarTracker[key].fileVals[m_currentSpecIndex].editedValue = val;
+                m_cVarTracker[key].fileVals[m_currentSpecIndex].overwrittenValue = val;
+            }
+            // default group in sys_spec cfg file
+            else if (azstricmp(strGroup, "default") == 0)
+            {
+                CVarFileStatus defaultVal(val, val, val);
+                if (m_cVarTracker.find(key) == m_cVarTracker.end())
+                {
+                    // New cvar loaded into map
+                    CVarInfo& currentCVar = m_cVarTracker[key];
+                    currentCVar.type = cvar->GetType();
+                    currentCVar.fileVals.resize(m_numSpecLevels, defaultVal);
+                }
+                else
+                {
+                    // Reset values, if there's a platform override it always follows the sys_spec_*.cfg files.
+                    // Resetting avoids the issue where some spec levels are never set because of an extra platform
+                    // override load happening earlier just to store the value of sys_spec_full.
+                    for (int specLevel = 0; specLevel < m_numSpecLevels; ++specLevel)
+                    {
+                        m_cVarTracker[key].fileVals[specLevel] = defaultVal;
+                    }
+                }
+                // Overwrite miscellaneous if mentioned in platform config file
+                m_cVarTracker[key].cvarGroup = m_currentConfigFilename;
+            }
+            // specific index in sys_spec cfg file
+            else
+            {
+                int group = 0;
+
+                if (azsscanf(strGroup, "%d", &group) == 1)
+                {
+                    auto sysSpecFull = m_cVarTracker.find("sys_spec_full");
+                    if (sysSpecFull != m_cVarTracker.end())
+                    {
+                        CVarFileStatus indexAssignment(val, val, val);
+                        for (int specLevel = 0; specLevel < m_numSpecLevels; ++specLevel)
+                        {
+                            // Only apply cvar change to configurations with sys_spec_Full matching the index
+                            int overwrittenValue = 0;
+                            if (AZStd::any_numeric_cast<int>(&sysSpecFull->second.fileVals[specLevel].overwrittenValue, overwrittenValue) && group == overwrittenValue)
+                            {
+                                m_cVarTracker[key].fileVals[specLevel] = indexAssignment;
+                            }
+                        }
+                    }                    
+                }
+            }
+        }
+    }
+}
+
+// Loads UI column for specific cfg file (ex. pc_low.cfg)
+void GraphicsSettingsDialog::BuildColumn(int specLevel)
+{
+    if (specLevel < 0 || specLevel >= m_numSpecLevels)
+    {
+        return;
+    }
+
+    for (auto& it : m_cvarGroupData)
+    {
+        it.second.m_currentRow = 0;
+    }
+
+    for (auto& it : m_cVarTracker)
+    {
+        QString str = it.first.c_str();
+        QWidget* input = nullptr;
+        if (it.second.type == CVAR_INT)
+        {
+            AzQtComponents::SpinBox* intval = new AzQtComponents::SpinBox(nullptr);
+            intval->setFocusPolicy(Qt::StrongFocus);
+            intval->setMaximum(INT32_MAX);
+            intval->setMinimum(INT32_MIN);
+            int editedValue;
+            if (AZStd::any_numeric_cast<int>(&it.second.fileVals[specLevel].editedValue, editedValue))
+            {
+                intval->setValue(editedValue);
+            }
+            m_cvarGroupData[it.second.cvarGroup].m_cvarSpinBoxes.push_back(intval);
+            connect(intval, SIGNAL(valueChanged(int)), this, SLOT(CVarChanged(int)));
+            input = intval;
+        }
+        else if (it.second.type == CVAR_FLOAT)
+        {
+            AzQtComponents::DoubleSpinBox* doubleval = new AzQtComponents::DoubleSpinBox(nullptr);
+            doubleval->setFocusPolicy(Qt::StrongFocus);
+            doubleval->setMaximum(FLT_MAX);
+            doubleval->setMinimum(-FLT_MAX);
+            float editedValue;
+            if (AZStd::any_numeric_cast<float>(&it.second.fileVals[specLevel].editedValue, editedValue))
+            {
+                doubleval->setValue(editedValue);
+            }
+            m_cvarGroupData[it.second.cvarGroup].m_cvarDoubleSpinBoxes.push_back(doubleval);
+            connect(doubleval, SIGNAL(valueChanged(double)), this, SLOT(CVarChanged(double)));
+            input = doubleval;
+        }
+        else
+        {
+            QLineEdit* stringval = new QLineEdit(nullptr);
+            AZStd::string* editedValue = AZStd::any_cast<AZStd::string>(&it.second.fileVals[specLevel].editedValue);
+            stringval->setText(editedValue->c_str());
+            m_cvarGroupData[it.second.cvarGroup].m_cvarLineEdits.push_back(stringval);
+            connect(stringval, SIGNAL(textChanged(const QString&)), this, SLOT(CVarChanged(const QString&)));
+            input = stringval;
+        }
+
+        if (input)
+        {
+            input->setObjectName(str);
+            input->setProperty("specLevel", specLevel);
+            QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+            sizePolicy.setHeightForWidth(input->sizePolicy().hasHeightForWidth());
+            input->setSizePolicy(sizePolicy);
+            input->setMinimumSize(QSize(INPUT_MIN_WIDTH, INPUT_MIN_HEIGHT));
+            QStandardItem* parentItem = m_cvarGroupData[it.second.cvarGroup].m_treeRowItem;
+            QModelIndex parentIndex = parentItem->index();
+            QModelIndex thisIndex = m_graphicsSettingsModel->index(m_cvarGroupData[it.second.cvarGroup].m_currentRow++, specLevel + CVAR_VALUE_COLUMN_OFFSET, parentIndex);
+            m_ui->m_graphicsSettingsTreeView->setIndexWidget(thisIndex, input);
+            m_parameterWidgets.push_back(new ParameterWidget(input, it.first.c_str()));
+            m_cvarGroupData[it.second.cvarGroup].m_widgetInsertOrder.push_back(input);
+        }
+    }
+}
+
+void GraphicsSettingsDialog::LoadPlatformConfigurations()
+{
+    const int numColumns = m_cfgFiles[m_currentPlatform].size() + 1;
+    SetSettingsTree(numColumns);
+
+    for (ParameterWidget* widget : m_parameterWidgets)
+    {
+        delete widget;
+    }
+    m_parameterWidgets.clear();
+
+    m_ui->m_applyButton->setEnabled(false);
+    m_dirtyCVarCount = 0;
+
+    // Load platform cfg files to load in sys_spec_Full
+    for (size_t cfgFileIndex = 0; cfgFileIndex < m_cfgFiles[m_currentPlatform].size(); ++cfgFileIndex)
+    {
+        m_currentSpecIndex = cfgFileIndex;
+        m_currentConfigFilename = m_cfgFiles[m_currentPlatform][cfgFileIndex];
+        GetISystem()->LoadConfiguration(m_currentConfigFilename.c_str(), this, true);
+    }
+
+    if (m_cVarTracker.find("sys_spec_full") == m_cVarTracker.end())
+    {
+        m_cVarTracker.clear();
+        CleanUI();
+        ShowCategories(false);
+        QMessageBox::warning(this, "Warning", "Invalid custom spec file (missing sys_spec_full).",
+            QMessageBox::Ok);
+        return;
+    }
+
+    // Load sys_spec cfgs based on sys_spec_Full values
+    LoadCVarGroupDirectory(m_cvarGroupsFolder);
+
+    setUpdatesEnabled(false);
+
+    // Reload platform cfg files to override sys_spec index assignments and load rows with filenames of given platform
+    for (size_t cfgFileIndex = 0; cfgFileIndex < m_cfgFiles[m_currentPlatform].size(); ++cfgFileIndex)
+    {
+        m_currentSpecIndex = cfgFileIndex;
+        m_currentConfigFilename = m_cfgFiles[m_currentPlatform][cfgFileIndex];
+        GetISystem()->LoadConfiguration(m_currentConfigFilename.c_str(), this, true);
+
+        /*CVarGroupInfo& specFileGroup =*/ m_cvarGroupData["SpecFile"];
+        m_graphicsSettingsModel->setHeaderData(cfgFileIndex + CVAR_VALUE_COLUMN_OFFSET, Qt::Horizontal, QApplication::translate("GraphicsSettingsDialog", m_cfgFiles[m_currentPlatform][cfgFileIndex].c_str()));
+    }
+
+    // Loads column of cvar names
+    for (auto& it : m_cVarTracker)
+    {
+        QLabel* cVarLabel = new QLabel(nullptr);
+        QString str = it.first.c_str();
+        QString strLabel = str + "Label";
+        cVarLabel->setObjectName(strLabel);
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        sizePolicy.setHeightForWidth(cVarLabel->sizePolicy().hasHeightForWidth());
+        cVarLabel->setSizePolicy(sizePolicy);
+        cVarLabel->setMinimumSize(QSize(INPUT_MIN_WIDTH, INPUT_MIN_HEIGHT));
+        cVarLabel->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
+        QStandardItem* cVarItem = new QStandardItem();
+        cVarItem->setData(QApplication::translate("GraphicsSettingsDialog", it.first.c_str(), 0), Qt::DisplayRole);
+        QList<QStandardItem*> items{ cVarItem };
+        for (int i = 1; i < numColumns; ++i)
+        {
+            items << new QStandardItem();
+        }
+        m_cvarGroupData[it.second.cvarGroup].m_treeRowItem->appendRow(items);
+        cVarLabel->setText(QApplication::translate("GraphicsSettingsDialog", it.first.c_str(), 0));
+        m_cvarGroupData[it.second.cvarGroup].m_cvarLabels.push_back(cVarLabel);
+
+        if (ICVar* cvar = gEnv->pConsole->GetCVar(it.first.c_str()))
+        {
+            cVarLabel->setToolTip(cvar->GetHelp());
+        }
+    }
+
+    // Loads columns of cvar values for each platform cfg file
+    for (int cfgFileIndex = 0; cfgFileIndex < m_cfgFiles[m_currentPlatform].size(); ++cfgFileIndex)
+    {
+        BuildColumn(cfgFileIndex);
+    }
+
+    // Remove any section that has no visible controls
+    for (auto& it : m_cvarGroupData)
+    {
+        int totalControlCount = 0;
+        CVarGroupInfo& currentCvarGroupInfo = it.second;
+        totalControlCount += currentCvarGroupInfo.m_cvarDoubleSpinBoxes.size();
+        totalControlCount += currentCvarGroupInfo.m_cvarSpinBoxes.size();
+        totalControlCount += currentCvarGroupInfo.m_cvarLineEdits.size();
+        totalControlCount += currentCvarGroupInfo.m_platformLabels.size();
+
+        if (totalControlCount == 0)
+        {
+            if (currentCvarGroupInfo.m_treeRowItem)
+            {
+                int i = 0;
+                for (auto& collapseIterator : m_uiCollapseGroup)
+                {
+                    if (collapseIterator->m_groupRow == currentCvarGroupInfo.m_treeRowItem)
+                    {
+                        m_uiCollapseGroup.remove(i);
+                        break;
+                    }
+                    ++i;
+                }
+                m_graphicsSettingsModel->removeRow(currentCvarGroupInfo.m_treeRowItem->row());
+            }
+        }
+    }
+
+    setUpdatesEnabled(true);
+
+    QSettings settings("O3DE", "O3DE");
+    settings.beginGroup("GraphicsSettingsDialog");
+    settings.beginGroup("cvarGroup");
+
+    for (auto& collapseIterator : m_uiCollapseGroup)
+    {
+        bool groupCollapsed = settings.value(collapseIterator->m_groupName, collapseIterator->m_isCollapsed).toBool();
+        if (collapseIterator->m_isCollapsed != groupCollapsed)
+        {
+            collapseIterator->ToggleCollapsed();
+        }
+    }
+
+    settings.endGroup();
+    settings.endGroup();
+}
+
+void GraphicsSettingsDialog::LoadCVarGroupDirectory(const AZStd::string& path)
+{
+    AZ::IO::LocalFileIO::FindFilesCallbackType fileFinderCb;
+    fileFinderCb = [&](const char* fullPath) -> bool
+    {
+        if (gEnv->pFileIO->IsDirectory(fullPath))
+        {
+            // recurse into subdirectory
+            gEnv->pFileIO->FindFiles(fullPath, "*.cfg", fileFinderCb);
+        }
+        else
+        {
+            m_currentConfigFilename = fullPath;
+            GetISystem()->LoadConfiguration(fullPath, this, false);
+        }
+
+        return true; // keep searching
+    };
+
+    gEnv->pFileIO->FindFiles(path.c_str(), "*.cfg", fileFinderCb);
+}
+
+//Build UI, link signals and set the data for device list.
+void GraphicsSettingsDialog::BuildUI()
+{
+    connect(m_ui->m_cancelButton, &QPushButton::clicked, this, &GraphicsSettingsDialog::reject);
+    connect(m_ui->m_applyButton, &QPushButton::clicked, this, &GraphicsSettingsDialog::accept);
+    connect(m_ui->m_platformEntry, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(PlatformChanged(const QString&)));
+    connect(m_ui->m_selectCustomSpecButton, &QPushButton::clicked, this, &GraphicsSettingsDialog::OpenCustomSpecDialog);
+
+    if (!m_cfgFiles[m_currentPlatform].empty())
+    {
+        LoadPlatformConfigurations();
+    }
+    else
+    {
+        m_cVarTracker.clear();
+        CleanUI();
+        ShowCategories(false);
+    }
+}
+
+void GraphicsSettingsDialog::CleanUI()
+{
+    setUpdatesEnabled(false);
+
+    QSettings settings("O3DE", "O3DE");
+    settings.beginGroup("GraphicsSettingsDialog");
+    settings.beginGroup("cvarGroup");
+
+    for (auto& collapseIterator : m_uiCollapseGroup)
+    {
+        settings.setValue(collapseIterator->m_groupName, collapseIterator->m_isCollapsed);
+    }
+
+    settings.endGroup();
+    settings.endGroup();
+    settings.sync();
+
+    m_cVarTracker.clear();
+
+    // Uncollapse groups
+    for (auto& collapseIt : m_uiCollapseGroup)
+    {
+        if (collapseIt->m_isCollapsed)
+        {
+            collapseIt->ToggleCollapsed();
+        }
+    }
+
+    setUpdatesEnabled(true);
+}
+
+void GraphicsSettingsDialog::ShowCategories(bool show)
+{
+    if (m_showCategories == show)
+    {
+        return;
+    }
+
+    m_showCategories = show;
+    m_ui->m_graphicsSettingsTreeView->setVisible(show);
+}
+
+void GraphicsSettingsDialog::ShowCustomSpecOption(bool show)
+{
+    if (m_showCustomSpec == show)
+    {
+        return;
+    }
+
+    m_showCustomSpec = show;
+    m_ui->m_selectCustomSpecButton->setVisible(m_showCustomSpec);
+    m_ui->m_lineSpacer->setVisible(m_showCustomSpec);
+}
+
+void GraphicsSettingsDialog::PlatformChanged(const QString& platform)
+{
+    bool change = true;
+    if (m_dirtyCVarCount > 0 && !SendUnsavedChangesWarning(false))
+    {
+        change = false;
+    }
+
+    if (change)
+    {
+        AZStd::string azPlatform = platform.toStdString().c_str();
+
+        m_currentPlatform = GetConfigPlatformFromName(azPlatform);
+        if (m_currentPlatform == CONFIG_INVALID_PLATFORM) // "Custom" selected
+        {
+            ShowCustomSpecOption(true);
+            CleanUI();
+            if (m_cfgFiles[CONFIG_INVALID_PLATFORM].empty()) // if we don't have a custom spec
+            {
+                ShowCategories(false);
+                m_ui->m_applyButton->setEnabled(false);
+                m_dirtyCVarCount = 0;
+            }
+            else
+            {
+                ShowCategories(true);
+                LoadPlatformConfigurations();
+            }
+        }
+        else
+        {
+            ShowCustomSpecOption(false);
+            ShowCategories(true);
+            CleanUI();
+            LoadPlatformConfigurations();
+        }
+    }
+    else
+    {
+        m_ui->m_platformEntry->blockSignals(true);
+        SetPlatformEntry(m_currentPlatform);
+        m_ui->m_platformEntry->blockSignals(false);
+    }
+}
+
+bool GraphicsSettingsDialog::SendUnsavedChangesWarning(bool cancel)
+{
+    int result = QMessageBox::Yes;
+
+    if (cancel)
+    {
+        result = QMessageBox::question(this, "Warning", "There are currently unsaved changed. Are you sure you want to cancel?",
+            QMessageBox::Yes, QMessageBox::No);
+    }
+    else
+    {
+        result = QMessageBox::question(this, "Warning", "There are currently unsaved changed. Are you sure you want to change configurations?",
+            QMessageBox::Yes, QMessageBox::No);
+    }
+
+    return (result == QMessageBox::Yes);
+}
+
+bool GraphicsSettingsDialog::CVarChanged(AZStd::any val, const char* cvarName, int specLevel)
+{
+    // Checking if the edited value (before change) is equal to the overwritten value
+    bool dirtyBefore = false;
+    AZStd::string azcvarName = cvarName;
+    AZStd::pair<AZStd::string, CVarInfo> cvarInfo = AZStd::make_pair(azcvarName, m_cVarTracker[cvarName]);
+    if (CheckCVarStatesForDiff(&cvarInfo, specLevel, EDITED_OVERWRITTEN_COMPARE))
+    {
+        dirtyBefore = true;
+    }
+
+    if (azstricmp(cvarName, "sys_spec_full") == 0)
+    {
+        //Pop out the warning dialog for sys_spec_Full since all cvars will be changed
+        int result = QMessageBox::Ok;
+
+        result = QMessageBox::question(this, "Warning", "Modifying sys_spec_full will override any unsaved changes.",
+            QMessageBox::Ok, QMessageBox::Cancel);
+
+        // Cancel - Change sys_spec_full qspinbox value back
+        if (result == QMessageBox::Cancel)
+        {
+            return false;
+        }
+        else // OK - reload column
+        {
+            // Updating sys_spec_full for when adding cvargroup directory
+            m_cVarTracker[cvarName].fileVals[specLevel].editedValue = val;
+            gEnv->pSystem->AddCVarGroupDirectory(m_cvarGroupsFolder);
+            m_currentConfigFilename = m_cfgFiles[m_currentPlatform][specLevel];
+            m_currentSpecIndex = specLevel;
+            GetISystem()->LoadConfiguration(m_currentConfigFilename.c_str(), this, true);
+            // Updating sys_spec_full since overwritten from loading platform cfg
+            m_cVarTracker[cvarName].fileVals[specLevel].editedValue = val;
+            BuildColumn(specLevel);
+        }
+    }
+    else
+    {
+        m_cVarTracker[cvarName].fileVals[specLevel].editedValue = val;
+    }
+
+    // Checking if the newly edited value is equal to the overwritten value
+    cvarInfo = AZStd::make_pair(azcvarName, m_cVarTracker[cvarName]);
+    if (CheckCVarStatesForDiff(&cvarInfo, specLevel, EDITED_OVERWRITTEN_COMPARE))
+    {
+        if (!dirtyBefore)
+        {
+            m_ui->m_applyButton->setEnabled(true);
+            m_dirtyCVarCount++;
+        }
+    }
+    else
+    {
+        if (dirtyBefore)
+        {
+            m_dirtyCVarCount--;
+            if (m_dirtyCVarCount == 0)
+            {
+                m_ui->m_applyButton->setEnabled(false);
+            }
+        }
+    }
+
+    return true;
+}
+
+void GraphicsSettingsDialog::CVarChanged(int i)
+{
+    AzQtComponents::SpinBox* box = static_cast<AzQtComponents::SpinBox*>(sender());
+    QString str = box->objectName();
+    QByteArray ba = str.toUtf8();
+    const char* cvarName = ba.data();
+
+    int specLevel = box->property("specLevel").toInt();
+
+    AZStd::any val;
+    val = i;
+
+    if (!CVarChanged(val, cvarName, specLevel))
+    {
+        // sys_spec_full warning cancelled
+        box->blockSignals(true);
+        int editedValue;
+        if (AZStd::any_numeric_cast<int>(&m_cVarTracker[cvarName].fileVals[specLevel].editedValue, editedValue))
+        {
+            box->setValue(editedValue);
+        }
+        box->blockSignals(false);
+    }
+}
+
+void GraphicsSettingsDialog::CVarChanged(double d)
+{
+    AzQtComponents::DoubleSpinBox* box = static_cast<AzQtComponents::DoubleSpinBox*>(sender());
+    QString str = box->objectName();
+    QByteArray ba = str.toUtf8();
+    const char* cvarName = ba.data();
+
+    AZStd::any val;
+    val = d;
+
+    int specLevel = box->property("specLevel").toInt();
+
+    if (!CVarChanged(val, cvarName, specLevel))
+    {
+        // only can return false from sys_spec_full, which is an int cvar
+    }
+}
+
+void GraphicsSettingsDialog::CVarChanged(const QString& s)
+{
+    QLineEdit* box = qobject_cast<QLineEdit*>(sender());
+    QString str = box->objectName();
+    QByteArray ba = str.toUtf8();
+    const char* cvarName = ba.data();
+
+    AZStd::any val;
+    val = AZStd::string(s.toStdString().c_str());
+
+    int specLevel = box->property("specLevel").toInt();
+
+    if (!CVarChanged(val, cvarName, specLevel))
+    {
+        // only can return false from sys_spec_full, which is an int cvar
+    }
+}
+
+// Returns true if there is a difference between the two cvar states
+bool GraphicsSettingsDialog::CheckCVarStatesForDiff(AZStd::pair<AZStd::string, CVarInfo>* it, int cfgFileIndex, CVarStateComparison cmp)
+{
+    if (it->second.type == CVAR_INT)
+    {
+        int editedVal, overwrittenVal, originalVal;
+        if (AZStd::any_numeric_cast<int>(&it->second.fileVals[cfgFileIndex].editedValue, editedVal) &&
+            AZStd::any_numeric_cast<int>(&it->second.fileVals[cfgFileIndex].overwrittenValue, overwrittenVal) &&
+            AZStd::any_numeric_cast<int>(&it->second.fileVals[cfgFileIndex].originalValue, originalVal))
+        {
+            if ((cmp == EDITED_OVERWRITTEN_COMPARE && editedVal != overwrittenVal) ||
+                (cmp == EDITED_ORIGINAL_COMPARE && editedVal != originalVal) ||
+                (cmp == OVERWRITTEN_ORIGINAL_COMPARE && overwrittenVal != originalVal))
+            {
+                return true;
+            }
+        }
+    }
+    else if (it->second.type == CVAR_FLOAT)
+    {
+        float editedVal, overwrittenVal, originalVal;
+        if (AZStd::any_numeric_cast<float>(&it->second.fileVals[cfgFileIndex].editedValue, editedVal) &&
+            AZStd::any_numeric_cast<float>(&it->second.fileVals[cfgFileIndex].overwrittenValue, overwrittenVal) &&
+            AZStd::any_numeric_cast<float>(&it->second.fileVals[cfgFileIndex].originalValue, originalVal))
+        {
+            if ((cmp == EDITED_OVERWRITTEN_COMPARE && editedVal != overwrittenVal) ||
+                (cmp == EDITED_ORIGINAL_COMPARE && editedVal != originalVal) ||
+                (cmp == OVERWRITTEN_ORIGINAL_COMPARE && overwrittenVal != originalVal))
+            {
+                return true;
+            }
+        }
+    }
+    else
+    {
+        AZStd::string editedVal = *AZStd::any_cast<AZStd::string>(&it->second.fileVals[cfgFileIndex].editedValue);
+        AZStd::string overwrittenVal = *AZStd::any_cast<AZStd::string>(&it->second.fileVals[cfgFileIndex].overwrittenValue);
+        AZStd::string originalVal = *AZStd::any_cast<AZStd::string>(&it->second.fileVals[cfgFileIndex].originalValue);
+        if ((cmp == EDITED_OVERWRITTEN_COMPARE && editedVal.compare(overwrittenVal) != 0) ||
+            (cmp == EDITED_ORIGINAL_COMPARE && editedVal.compare(originalVal) != 0) ||
+            (cmp == OVERWRITTEN_ORIGINAL_COMPARE && overwrittenVal.compare(originalVal) != 0))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+///////////////////////////////////////////////////////////////////////
+// settings file management
+void GraphicsSettingsDialog::reject()
+{
+    if (m_dirtyCVarCount > 0)
+    {
+        if (SendUnsavedChangesWarning(true))
+        {
+            QDialog::reject();
+        }
+    }
+    else
+    {
+        QDialog::reject();
+    }
+}
+
+void GraphicsSettingsDialog::accept()
+{
+    int result = QMessageBox::Yes;
+
+    //Pop out the warning dialog for customized setting
+    result = QMessageBox::question(this, "Warning", "A non-tested setting could potentially crash the game if the setting does not match the device. Are you sure you want to apply the customized setting?",
+            QMessageBox::Yes, QMessageBox::No);
+
+    //Save and exit
+    if (result == QMessageBox::Yes)
+    {
+        SaveSystemSettings();
+    }
+}
+
+void GraphicsSettingsDialog::OpenCustomSpecDialog()
+{
+    AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
+    projectPath /= SETTINGS_FILE_PATH.toUtf8().constData();
+    QString settingsPath = QString::fromUtf8(projectPath.c_str(), aznumeric_cast<int>(projectPath.Native().size()));
+
+    CAutoDirectoryRestoreFileDialog importCustomSpecDialog(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, ".cfg", settingsPath, CFG_FILEFILTER, {}, {}, this);
+
+    if (importCustomSpecDialog.exec())
+    {
+        QString file = importCustomSpecDialog.selectedFiles().first();
+        if (!file.isEmpty())
+        {
+            ApplyCustomSpec(file);
+        }
+    }
+}
+
+void GraphicsSettingsDialog::ApplyCustomSpec(const QString& customFilePath)
+{
+    if (customFilePath.isEmpty())
+    {
+        return;
+    }
+
+    QFile customFile(customFilePath);
+    if (!customFile.exists())
+    {
+        QMessageBox::warning(this, "Warning", "Could not find custom spec file.",
+            QMessageBox::Ok);
+        return;
+    }
+
+    bool change = true;
+    if (m_dirtyCVarCount > 0 && !SendUnsavedChangesWarning(false))
+    {
+        change = false;
+    }
+
+    if (change)
+    {
+        AZStd::string filename = customFilePath.toStdString().c_str();
+        filename = filename.substr(filename.find_last_of('/') + 1);
+
+        m_currentPlatform = CONFIG_INVALID_PLATFORM;
+
+        bool alreadyLoaded = IsCustomSpecAlreadyLoaded(filename);
+        if (m_cfgFiles[CONFIG_INVALID_PLATFORM].size() < m_numSpecLevels && !alreadyLoaded)
+        {
+            m_cfgFiles[CONFIG_INVALID_PLATFORM].push_back(filename);
+        }
+        else if (alreadyLoaded)
+        {
+            QMessageBox::warning(this, "Warning", "The selected custom spec file is already loaded. No changes have been made.",
+                QMessageBox::Ok);
+            return;
+        }
+
+        if (m_cfgFiles[CONFIG_INVALID_PLATFORM].size() == m_numSpecLevels)
+        {
+            m_ui->m_selectCustomSpecButton->setEnabled(false);
+        }
+
+        ShowCategories(true);
+
+        CleanUI();
+
+        LoadPlatformConfigurations();
+    }
+}
+
+void GraphicsSettingsDialog::UnloadCustomSpec(int specLevel)
+{
+    if (specLevel < 0 || specLevel >= m_cfgFiles[CONFIG_INVALID_PLATFORM].size())
+    {
+        return;
+    }
+
+    bool shouldUnload = m_dirtyCVarCount <= 0 || SendUnsavedChangesWarning(false);
+
+    if (shouldUnload)
+    {
+        m_cfgFiles[CONFIG_INVALID_PLATFORM].erase(m_cfgFiles[CONFIG_INVALID_PLATFORM].begin() + specLevel);
+
+        CleanUI();
+
+        if (!m_cfgFiles[CONFIG_INVALID_PLATFORM].empty())
+        {
+            LoadPlatformConfigurations();
+        }
+        else
+        {
+            ShowCategories(false);
+        }
+    }
+}
+
+bool GraphicsSettingsDialog::IsCustomSpecAlreadyLoaded(const AZStd::string& filename) const
+{
+    auto& customConfigFilenames = m_cfgFiles.at(CONFIG_INVALID_PLATFORM);
+    const auto& findResult = AZStd::find(customConfigFilenames.begin(), customConfigFilenames.end(), filename.c_str());
+
+    return findResult != customConfigFilenames.end();
+}
+
+void GraphicsSettingsDialog::SetCollapsedLayout(const QString& groupName, QStandardItem* groupRow)
+{
+    CollapseGroup* cgroup = new CollapseGroup(m_ui->m_graphicsSettingsTreeView);
+    cgroup->m_groupName = groupName;
+    cgroup->m_groupRow = groupRow;
+    m_uiCollapseGroup.push_back(cgroup);
+}
+
+void GraphicsSettingsDialog::SetPlatformEntry(ESystemConfigPlatform platform)
+{
+    auto platformCheck = [&platform](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return stringConfigPair.second == platform; };
+    auto platformStringsIterator = AZStd::find_if(m_platformStrings.begin(), m_platformStrings.end(), platformCheck);
+    if (platformStringsIterator != m_platformStrings.end())
+    {
+        int platformIndex = m_ui->m_platformEntry->findText(platformStringsIterator->first.c_str());
+        m_ui->m_platformEntry->setCurrentIndex(platformIndex);
+    }
+    else
+    {
+        AZ_Assert(false, "Platform not found in platform strings vector.");
+    }
+}
+
+ESystemConfigPlatform GraphicsSettingsDialog::GetConfigPlatformFromName(const AZStd::string& platformName)
+{
+    ESystemConfigPlatform configPlatform = CONFIG_INVALID_PLATFORM;
+
+    auto platformNameCheck = [&platformName](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return (stringConfigPair.first == platformName); };
+    auto configPlatformIterator = AZStd::find_if(m_platformStrings.begin(), m_platformStrings.end(), platformNameCheck);
+    if (configPlatformIterator != m_platformStrings.end())
+    {
+        configPlatform = configPlatformIterator->second;
+    }
+    else
+    {
+        AZ_Assert(false, "Platform name not found in platform strings vector.");
+    }
+
+    return configPlatform;
+}
+
+// Save the current UI options to system qsettings
+void GraphicsSettingsDialog::SaveSystemSettings()
+{
+    AZStd::vector<QString> successFiles;
+    AZStd::vector<QString> nochangeFiles;
+
+    for (int cfgFileIndex = 0; cfgFileIndex < m_cfgFiles[m_currentPlatform].size(); ++cfgFileIndex)
+    {
+        const QString eq = " = ";
+        const QString cvarGroupString1 = "\n------------------------\n-- ";
+        const QString cvarGroupString2 = "\n------------------------\n";
+        QString commandList = "";
+
+        int sysSpecFull;
+        if (AZStd::any_numeric_cast<int>(&m_cVarTracker["sys_spec_full"].fileVals[cfgFileIndex].editedValue, sysSpecFull))
+        {
+            commandList += "sys_spec_full" + eq + QString::number(sysSpecFull) + '\n';
+        }
+
+        QMap<QString, QString> cvarGroupStrings;
+
+        // Set to true as soon as cvar is found which is unique from current cfg file and index assignment
+        bool saveOut = false;
+
+        // Adding any dirty cvars not equal to sys_spec_full or any cvar in miscellaneous to command list
+        for (auto& it : m_cVarTracker)
+        {
+            if ((CheckCVarStatesForDiff(&it, cfgFileIndex, EDITED_ORIGINAL_COMPARE) || it.second.cvarGroup == "miscellaneous") && azstricmp(it.first.c_str(), "sys_spec_full"))
+            {
+                AZStd::string cvarGroup = it.second.cvarGroup;
+                if (azstricmp(cvarGroup.c_str(), "miscellaneous") != 0)
+                {
+                    int fileIndex = cvarGroup.find_last_of('/') + 1;
+                    cvarGroup = cvarGroup.substr(fileIndex, cvarGroup.size() - fileIndex - 4);
+                }
+                QString qcvarGroup = cvarGroup.c_str();
+                if (cvarGroupStrings.find(qcvarGroup) == cvarGroupStrings.end())
+                {
+                    cvarGroupStrings[qcvarGroup] = cvarGroupString1 + qcvarGroup + cvarGroupString2;
+                }
+
+                if (it.second.type == CVAR_INT)
+                {
+                    int val;
+                    if (AZStd::any_numeric_cast<int>(&it.second.fileVals[cfgFileIndex].editedValue, val))
+                    {
+                        cvarGroupStrings[qcvarGroup] += it.first.c_str() + eq + QString::number(val) + '\n';
+                    }
+                }
+                else if (it.second.type == CVAR_FLOAT)
+                {
+                    float val;
+                    if (AZStd::any_numeric_cast<float>(&it.second.fileVals[cfgFileIndex].editedValue, val))
+                    {
+                        cvarGroupStrings[qcvarGroup] += it.first.c_str() + eq + QString::number(val) + '\n';
+                    }
+                }
+                else
+                {
+                    cvarGroupStrings[qcvarGroup] += it.first.c_str() + eq + AZStd::any_cast<AZStd::string>(it.second.fileVals[cfgFileIndex].editedValue).c_str() + '\n';
+                }
+            }
+
+            if (!saveOut)
+            {
+                saveOut = CheckCVarStatesForDiff(&it, cfgFileIndex, EDITED_OVERWRITTEN_COMPARE);
+            }
+        }
+
+        // Adding the project name to the path so that the file is created there if it doesn't already exist
+        // as we don't want to modify the version in Engine/config.
+        AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
+        projectPath /= SETTINGS_FILE_PATH.toUtf8().constData();
+        QString settingsPath = QString::fromUtf8(projectPath.c_str(), aznumeric_cast<int>(projectPath.Native().size()));
+
+        QString settingsFile = settingsPath + m_cfgFiles[m_currentPlatform][cfgFileIndex].c_str();
+
+        // Check if current settings differ from existing cfg
+        if (saveOut)
+        {
+            // Adding any dirty cvars not equal to sys_spec_full to command list
+            for (auto& it : cvarGroupStrings)
+            {
+                commandList += it;
+            }
+
+            if (CFileUtil::OverwriteFile(settingsFile.toStdString().c_str()))
+            {
+                if (!CFileUtil::CreateDirectory(settingsPath.toStdString().c_str()))
+                {
+                    QMessageBox::warning(this, "Warning", "Could not create the directory for file \"" + settingsFile + "\". Failed to apply Graphics Setting.",
+                        QMessageBox::Ok);
+                    continue;
+                }
+
+                QByteArray dataArray = commandList.toUtf8().data();
+
+                QFile file(settingsFile);
+                if (!file.open(QIODevice::WriteOnly) || file.write(dataArray) != dataArray.size())
+                {
+                    QMessageBox::warning(this, "Warning", "Could not write settings to file \"" + settingsFile + ". Failed to apply Graphics Setting.",
+                        QMessageBox::Ok);
+                    file.close();
+                    continue;
+                }
+
+                successFiles.push_back(settingsFile);
+
+                // Update platform cvars to reflect new values
+                for (auto& it : m_cVarTracker)
+                {
+                    it.second.fileVals[cfgFileIndex].overwrittenValue = it.second.fileVals[cfgFileIndex].editedValue;
+                }
+
+                file.close();
+            }
+            else
+            {
+                QMessageBox::warning(this, "Warning", "Could not check out or make file writable: \"" + settingsFile + "\". Failed to apply Graphics Setting.",
+                    QMessageBox::Ok);
+            }
+        }
+        else
+        {
+            nochangeFiles.push_back(settingsFile);
+        }
+    }
+
+    // Print list of files which had no changes made
+    if (nochangeFiles.size() > 0)
+    {
+        QString message = "No changes have been made to the following files:\n";
+        for (int i = 0; i < nochangeFiles.size(); ++i)
+        {
+            message += nochangeFiles[i] + "\n";
+        }
+        QMessageBox::information(this, "Log", message, QMessageBox::Ok);
+    }
+
+    // Print list of files which were successfully saved
+    if (successFiles.size() > 0)
+    {
+        QString message = "Updated the graphics setting correctly for the following files:\n";
+        for (int i = 0; i < successFiles.size(); ++i)
+        {
+            message += successFiles[i] + "\n";
+        }
+        QMessageBox::information(this, "Log", message, QMessageBox::Ok);
+    }
+
+    // if we saved all of the files that we needed to then disable the save button again
+    if (nochangeFiles.size() + successFiles.size() == m_cfgFiles[m_currentPlatform].size())
+    {
+        m_dirtyCVarCount = 0;
+        m_ui->m_applyButton->setEnabled(false);
+    }
+}
+
+void GraphicsSettingsDialog::SetCollapsed(const QModelIndex& index, bool flags)
+{
+    QStandardItem* item = m_graphicsSettingsModel->itemFromIndex(index);
+
+    for (auto& collapseIterator : m_uiCollapseGroup)
+    {
+        if (collapseIterator->m_groupRow == item)
+        {
+            collapseIterator->m_isCollapsed = flags;
+            break;
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////
+// Collapse Group
+GraphicsSettingsDialog::CollapseGroup::CollapseGroup(QTreeView* treeView)
+    : m_treeView(treeView)
+    , m_isCollapsed(true)
+{
+}
+
+void GraphicsSettingsDialog::CollapseGroup::ToggleCollapsed()
+{
+    m_isCollapsed = !m_isCollapsed;
+    const QModelIndex index = m_groupRow->index();
+    if (m_isCollapsed)
+    {
+        m_treeView->collapse(index);
+    }
+    else
+    {
+        m_treeView->expand(index);
+    }
+}
+
+///////////////////////////////////////////////////////////////////
+// ParameterWidget
+GraphicsSettingsDialog::ParameterWidget::ParameterWidget(QWidget* widget, QString parameterName)
+    : m_widget(widget)
+    , m_parameterName(parameterName)
+{
+    m_widget->setToolTip(GetToolTip());
+}
+
+QString GraphicsSettingsDialog::ParameterWidget::GetToolTip() const
+{
+    if (!m_parameterName.isEmpty())
+    {
+        QString tooltipText = QString(PARAMETER_TOOLTIP).arg(m_parameterName);
+        return tooltipText;
+    }
+    return "";
+}
+
+GraphicsSettingsTreeView::GraphicsSettingsTreeView(QWidget* parent)
+    : QTreeView(parent)
+{
+}
+
+GraphicsSettingsHeaderView::GraphicsSettingsHeaderView(GraphicsSettingsDialog* dialog, Qt::Orientation orientation, QWidget* parent)
+    : QHeaderView(orientation, parent)
+    , m_dialog(dialog)
+{
+    setDefaultAlignment(Qt::AlignLeft);
+}
+
+bool GraphicsSettingsHeaderView::event(QEvent* e)
+{
+    if (m_dialog->IsCustom())
+    {
+        GraphicsSettingsTreeView* treeView = qobject_cast<GraphicsSettingsTreeView*>(parent());
+        if (treeView)
+        {
+            switch (e->type())
+            {
+                case QEvent::Enter:
+                    m_index = logicalIndexAt(static_cast<QEnterEvent*>(e)->pos());
+                    if (m_index > 0)
+                    {
+                        treeView->setSortingEnabled(true);
+                        treeView->sortByColumn(m_index, Qt::AscendingOrder);
+                    }
+                    break;
+                case QEvent::Leave:
+                    treeView->setSortingEnabled(false);
+                    break;
+            }
+        }
+    }
+    return QHeaderView::event(e);
+}
+
+void GraphicsSettingsHeaderView::mouseReleaseEvent(QMouseEvent* e)
+{
+    AZ_UNUSED(e);
+    if (QMessageBox::question(
+        this, QObject::tr("Unload Resource"),
+        QObject::tr("Are you sure you want to unload the resource?"),
+        QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Yes)
+    {
+        m_dialog->UnloadCustomSpec(m_index - 1);
+    }
+
+}
+
+void GraphicsSettingsHeaderView::mouseMoveEvent(QMouseEvent* e)
+{
+    AZ_UNUSED(e);
+    if (m_dialog->IsCustom())
+    {
+        GraphicsSettingsTreeView* treeView = qobject_cast<GraphicsSettingsTreeView*>(parent());
+        int index = logicalIndexAt(e->pos());
+        if (index != m_index)
+        {
+            m_index = index;
+            if (m_index > 0)
+            {
+                treeView->setSortingEnabled(true);
+                treeView->sortByColumn(m_index, Qt::AscendingOrder);
+            }
+            else
+            {
+                treeView->setSortingEnabled(false);
+            }
+        }
+    }
+}
+
+GraphicsSettingsModel::GraphicsSettingsModel(QObject* parent)
+    : QStandardItemModel(parent)
+{
+}
+
+Qt::ItemFlags GraphicsSettingsModel::flags(const QModelIndex& index) const
+{
+    Qt::ItemFlags flags = Qt::NoItemFlags;
+
+    if (index.column() == 0)
+    {
+        flags |= Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+    }
+    return flags;
+}
+
+#include <moc_GraphicsSettingsDialog.cpp>
diff --git a/Code/Editor/GraphicsSettingsDialog.h b/Code/Editor/GraphicsSettingsDialog.h
new file mode 100644
index 0000000000..66a498cd10
--- /dev/null
+++ b/Code/Editor/GraphicsSettingsDialog.h
@@ -0,0 +1,284 @@
+/*
+ * 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>
+#include <QTreeView>
+#include <QStandardItemModel>
+#include <QHeaderView>
+
+#include <AzQtComponents/Components/Widgets/SpinBox.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/any.h>
+
+#include <ISystem.h>
+#endif
+
+class QGridLayout;
+class QLabel;
+
+namespace Ui
+{
+    class GraphicsSettingsDialog;
+}
+
+// Description:
+//   Status of cvar for a specifc platform and spec level
+//   editedValue - current setting within Graphics Settings Dialog box
+//   overwrittenValue - original setting from platform config file (set to originalValue if not found)
+//   originalValue - original settings from sys_spec config file index
+
+struct CVarFileStatus
+{
+    AZStd::any editedValue;
+    AZStd::any overwrittenValue;
+    AZStd::any originalValue;
+    CVarFileStatus(AZStd::any edit, AZStd::any over, AZStd::any orig) : editedValue(edit), overwrittenValue(over), originalValue(orig) {}
+};
+
+// Description:
+//   Status of specific cvar for Editor mapping
+//   type - CVAR_INT / CVAR_FLOAT / CVAR_STRING
+//   cvarGroup - source of cvar (sys_spec_particles, sys_spec_physics, etc.) or "miscellaneous" if only specified in platform config file
+//   fileVals = CVarFileStatus for each spec level of a specific platform
+
+struct CVarInfo
+{
+    int type;
+    AZStd::string cvarGroup;
+    AZStd::vector<CVarFileStatus> fileVals;
+};
+
+enum class GraphicsSettings
+{
+    GameEffects,
+    Light,
+    ObjectDetail,
+    Particles,
+    Physics,
+    PostProcessing,
+    Quality,
+    Shading,
+    Shadows,
+    Sound,
+    Texture,
+    TextureResolution,
+    VolumetricEffects,
+    Water,
+    Miscellaneous,
+    numSettings
+};
+
+class GraphicsSettingsHeaderView;
+
+class GraphicsSettingsTreeView
+    : public QTreeView
+{
+    Q_OBJECT
+
+public:
+    GraphicsSettingsTreeView(QWidget* parent = nullptr);
+
+};
+
+class GraphicsSettingsModel
+    : public QStandardItemModel
+{
+    Q_OBJECT
+
+public:
+    explicit GraphicsSettingsModel(QObject* parent = 0);
+
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
+};
+
+class GraphicsSettingsDialog
+    : public QDialog,
+      public ILoadConfigurationEntrySink
+{
+    Q_OBJECT
+
+public:
+
+    explicit GraphicsSettingsDialog(QWidget* parent = nullptr);
+    virtual ~GraphicsSettingsDialog();
+
+    bool IsCustom(void) { return m_showCustomSpec; }
+    void UnloadCustomSpec(int specLevel);
+
+    // ILoadConfigurationEntrySink
+    void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup) override;
+
+public slots:
+    //Accept and reject
+    void reject() override;
+    void accept() override;
+
+private slots:
+    //Update UIs
+    void PlatformChanged(const QString& platform);
+    bool CVarChanged(AZStd::any val, const char* cvarName, int specLevel);
+    void CVarChanged(int i);
+    void CVarChanged(double d);
+    void CVarChanged(const QString& s);
+
+private:
+
+    // The struct ParameterWidget is used to store the parameter widget
+    // m_parameterName will be the name of the parameter the widget represent.
+    struct ParameterWidget
+    {
+        ParameterWidget(QWidget* widget, QString parameterName = "");
+
+        QString GetToolTip() const;
+
+        const char* PARAMETER_TOOLTIP = "The variable will update render parameter \"%1\".";
+        QWidget* m_widget;
+        QString m_parameterName;
+    };
+
+    struct CollapseGroup
+    {
+        QString m_groupName;
+        QStandardItem* m_groupRow;
+        QTreeView* m_treeView;
+        bool m_isCollapsed;
+
+        CollapseGroup(QTreeView* treeView);
+
+        void ToggleCollapsed();
+    };
+
+    void OpenCustomSpecDialog();
+    void ApplyCustomSpec(const QString& customFilePath);
+    bool IsCustomSpecAlreadyLoaded(const AZStd::string& filename) const;
+    void SetSettingsTree(int numColumns);
+    void SetCollapsed(const QModelIndex& index, bool flag);
+
+    enum CVarStateComparison
+    {
+        EDITED_OVERWRITTEN_COMPARE = 1,
+        EDITED_ORIGINAL_COMPARE = 2,
+        OVERWRITTEN_ORIGINAL_COMPARE = 3,
+
+        END_CVARSTATE_COMPARE,
+    };
+
+    bool CheckCVarStatesForDiff(AZStd::pair<AZStd::string, CVarInfo>* it, int cfgFileIndex, CVarStateComparison cmp);
+
+    // Save out settings into project-level cfg files
+    void SaveSystemSettings();
+
+    // Load in project-level cfg files for current platform
+    void LoadPlatformConfigurations();
+    // Build UI column for spec level of current platform
+    void BuildColumn(int specLevel);
+    // Initial UI building
+    void BuildUI();
+    // Cleaning out UI before loading new platform information
+    void CleanUI();
+    // Shows/hides custom spec option
+    void ShowCustomSpecOption(bool show);
+    // Shows/hides category labels and dropdowns
+    void ShowCategories(bool show);
+    // Warns about unsaved changes (returns true if accepted)
+    bool SendUnsavedChangesWarning(bool cancel);
+
+    void LoadCVarGroupDirectory(const AZStd::string& path);
+
+    /////////////////////////////////////////////
+    // UI help functions
+
+    // Setup collapsed buttons
+    void SetCollapsedLayout(const QString& groupName, QStandardItem* groupItem);
+    // Sets the platform entry index for the given platform
+    void SetPlatformEntry(ESystemConfigPlatform platform);
+    // Gets the platform enum given the platform name
+    ESystemConfigPlatform GetConfigPlatformFromName(const AZStd::string& platformName);
+
+    ////////////////////////////////////////////
+    // Members
+
+    // Qt values
+    const int INPUT_MIN_WIDTH = 100;
+    const int INPUT_MIN_HEIGHT = 20;
+    const int INPUT_ROW_SPAN = 1;
+    const int INPUT_COLUMN_SPAN = 1;
+    const int CVAR_ROW_OFFSET = 2;
+    const int CVAR_VALUE_COLUMN_OFFSET = 1;
+    const int PLATFORM_LABEL_ROW = 1;
+    const int CVAR_LABEL_COLUMN = 1;
+
+    // Tool tips
+    const QString SETTINGS_FILE_PATH = "Config/spec/";
+    const char* CFG_FILEFILTER = "Cfg File(*.cfg);;All files(*)";
+
+    const int m_numSpecLevels = 4;
+
+    bool m_showCustomSpec;
+    bool m_showCategories;
+    GraphicsSettingsModel* m_graphicsSettingsModel;
+    GraphicsSettingsHeaderView* m_headerView;
+    int m_numColumns{ 0 };
+
+    const char* m_cvarGroupsFolder = "Config/CVarGroups";
+
+    QScopedPointer<Ui::GraphicsSettingsDialog> m_ui;
+
+    QVector<CollapseGroup*> m_uiCollapseGroup;
+
+    QVector<ParameterWidget*> m_parameterWidgets;
+
+    AZStd::string m_currentConfigFilename;
+    size_t m_currentSpecIndex;
+
+    // cvar name --> pair(type, CVarStatus for each file)
+    AZStd::unordered_map<AZStd::string, CVarInfo> m_cVarTracker;
+
+    AZStd::unordered_map<ESystemConfigPlatform, AZStd::vector<AZStd::string> > m_cfgFiles;
+
+    AZStd::vector<AZStd::pair<AZStd::string, ESystemConfigPlatform> > m_platformStrings;
+
+    struct CVarGroupInfo
+    {
+        QVector<QLabel*> m_platformLabels;
+        QVector<QLabel*> m_cvarLabels;
+        QVector<AzQtComponents::SpinBox*> m_cvarSpinBoxes;
+        QVector<AzQtComponents::DoubleSpinBox*> m_cvarDoubleSpinBoxes;
+        QVector<QLineEdit*> m_cvarLineEdits;
+        QVector<QToolButton*> m_specFileArea;
+        QVector<QWidget*> m_widgetInsertOrder;
+        QStandardItem* m_treeRowItem;
+        int m_currentRow;
+    };
+
+    AZStd::unordered_map<AZStd::string, CVarGroupInfo> m_cvarGroupData;
+    AZStd::vector<AZStd::string> m_cvarGroupOrder;
+
+    ESystemConfigPlatform m_currentPlatform;
+
+    int m_dirtyCVarCount;
+};
+
+class GraphicsSettingsHeaderView
+    : public QHeaderView
+{
+        Q_OBJECT
+public:
+    GraphicsSettingsHeaderView(GraphicsSettingsDialog* dialog, Qt::Orientation orientation, QWidget* parent = nullptr);
+
+private:
+    bool event(QEvent* e) override;
+    void mouseMoveEvent(QMouseEvent* e) override;
+    void mouseReleaseEvent(QMouseEvent* e) override;
+
+    GraphicsSettingsDialog* m_dialog;
+    int m_index{ -1 };
+};
+
+
diff --git a/Code/Editor/GridUtils.h b/Code/Editor/GridUtils.h
new file mode 100644
index 0000000000..745d115f2c
--- /dev/null
+++ b/Code/Editor/GridUtils.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_GRIDUTILS_H
+#define CRYINCLUDE_EDITOR_GRIDUTILS_H
+#pragma once
+
+
+namespace GridUtils
+{
+    template <typename F>
+    inline void IterateGrid(F& f, const float minPixelsPerTick, float zoomX, float originX, float fps, int left, int right)
+    {
+        float pixelsPerSecond = zoomX;
+        float pixelsPerFrame = pixelsPerSecond / fps;
+        float framesPerTick = ceil(minPixelsPerTick / pixelsPerFrame);
+        float scale = 1;
+        bool foundScale = false;
+        int numIters = 0;
+        for (float OOM = 1; !foundScale; OOM *= 10)
+        {
+            float scales[] = {1, 2, 5};
+            for (int scaleIndex = 0; !foundScale && scaleIndex < sizeof(scales) / sizeof(scales[0]); ++scaleIndex)
+            {
+                scale = scales[scaleIndex] * OOM;
+                if (framesPerTick <= scale + 0.1f)
+                {
+                    framesPerTick = scale;
+                    foundScale = true;
+                    if (numIters++ > 1000)
+                    {
+                        break;
+                    }
+                }
+            }
+            if (numIters++ > 1000)
+            {
+                break;
+            }
+        }
+        float pixelsPerTick = pixelsPerFrame * framesPerTick;
+        float timeAtLeft = -left / zoomX + originX;
+        float frameAtLeft = ceil(timeAtLeft * fps / framesPerTick) * framesPerTick;
+        float firstTick = floor((frameAtLeft / fps - originX) * zoomX + 0.5f) + left;
+        int frame = int(frameAtLeft);
+        int lockupPreventionCounter = 10000;
+        for (float tickX = firstTick; tickX < right && lockupPreventionCounter >= 0; tickX += pixelsPerTick, --lockupPreventionCounter)
+        {
+            f(frame, aznumeric_cast<int>(tickX));
+
+            frame += int(framesPerTick);
+        }
+    }
+}
+
+#endif // CRYINCLUDE_EDITOR_GRIDUTILS_H
diff --git a/Code/Editor/IEditor.h b/Code/Editor/IEditor.h
new file mode 100644
index 0000000000..4c76d76b7a
--- /dev/null
+++ b/Code/Editor/IEditor.h
@@ -0,0 +1,742 @@
+/*
+ * 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_IEDITOR_H
+#define CRYINCLUDE_EDITOR_IEDITOR_H
+#pragma once
+
+#ifdef PLUGIN_EXPORTS
+#define PLUGIN_API DLL_EXPORT
+#else
+#define PLUGIN_API DLL_IMPORT
+#endif
+
+#include <ISystem.h>
+#include "Include/SandboxAPI.h"
+#include "Util/UndoUtil.h"
+#include <CryVersion.h>
+
+#include <WinWidgetId.h>
+
+#include <AzCore/Component/EntityId.h>
+
+class QMenu;
+
+struct CRuntimeClass;
+struct QtViewPane;
+class QMainWindow;
+struct QMetaObject;
+
+class CBaseObject;
+class CCryEditDoc;
+class CSelectionGroup;
+class CAnimationContext;
+class CTrackViewSequenceManager;
+class CGameEngine;
+struct IIconManager;
+class CToolBoxManager;
+class CClassFactory;
+class CMusicManager;
+struct IEditorParticleManager;
+class CEAXPresetManager;
+class CErrorReport;
+class CBaseLibraryItem;
+class ICommandManager;
+class CEditorCommandManager;
+class CHyperGraphManager;
+class CConsoleSynchronization;
+class CUIEnumsDatabase;
+struct ISourceControl;
+struct IEditorClassFactory;
+struct IDataBaseItem;
+struct ITransformManipulator;
+struct IDataBaseManager;
+class IFacialEditor;
+class CDialog;
+#if defined(AZ_PLATFORM_WINDOWS)
+class C3DConnexionDriver;
+#endif
+class CSettingsManager;
+struct IExportManager;
+class CDisplaySettings;
+struct SGizmoParameters;
+class CLevelIndependentFileMan;
+class CSelectionTreeManager;
+struct IResourceSelectorHost;
+struct SEditorSettings;
+class CGameExporter;
+class IAWSResourceManager;
+struct IEditorPanelUtils;
+
+namespace WinWidget
+{
+    class WinWidgetManager;
+}
+
+struct ISystem;
+struct IRenderer;
+struct AABB;
+struct IEventLoopHook;
+struct IErrorReport; // Vladimir@conffx
+struct IFileUtil;  // Vladimir@conffx
+struct IEditorLog;  // Vladimir@conffx
+struct IEditorMaterialManager;  // Vladimir@conffx
+struct IBaseLibraryManager;  // Vladimir@conffx
+struct IImageUtil;  // Vladimir@conffx
+struct IEditorParticleUtils;  // Leroy@conffx
+struct ILogFile; // Vladimir@conffx
+
+// Qt
+
+class QWidget;
+class QMimeData;
+class QString;
+class QColor;
+class QPixmap;
+
+#if !AZ_TRAIT_OS_PLATFORM_APPLE && !defined(AZ_PLATFORM_LINUX)
+typedef void* HANDLE;
+struct HWND__;
+typedef HWND__* HWND;
+#endif
+
+namespace Editor
+{
+    class EditorQtApplication;
+}
+
+
+// Global editor notify events.
+enum EEditorNotifyEvent
+{
+    // Global events.
+    eNotify_OnInit = 10,               // Sent after editor fully initialized.
+    eNotify_OnQuit,                    // Sent before editor quits.
+    eNotify_OnIdleUpdate,              // Sent every frame while editor is idle.
+
+    // Document events.
+    eNotify_OnBeginNewScene,           // Sent when the document is begin to be cleared.
+    eNotify_OnEndNewScene,             // Sent after the document have been cleared.
+    eNotify_OnBeginSceneOpen,          // Sent when document is about to be opened.
+    eNotify_OnEndSceneOpen,            // Sent after document have been opened.
+    eNotify_OnBeginSceneSave,          // Sent when document is about to be saved.
+    eNotify_OnEndSceneSave,            // Sent after document have been saved.
+    eNotify_OnBeginLayerExport,        // Sent when a layer is about to be exported.
+    eNotify_OnEndLayerExport,          // Sent after a layer have been exported.
+    eNotify_OnCloseScene,              // Send when the document is about to close.
+    eNotify_OnSceneClosed,             // Send when the document is closed.
+    eNotify_OnBeginLoad,               // Sent when the document is start to load.
+    eNotify_OnEndLoad,                 // Sent when the document loading is finished
+
+    // Editing events.
+    eNotify_OnEditModeChange,          // Sent when editing mode change (move,rotate,scale,....)
+    eNotify_OnEditToolChange,          // Sent when edit tool is changed (ObjectMode,TerrainModify,....)
+
+    // Deferred terrain create event.
+    eNotify_OnBeginTerrainCreate,      // Sent when terrain is created later (and not during level creation)
+    eNotify_OnEndTerrainCreate,        // Sent when terrain is created later (and not during level creation)
+
+    // Game related events.
+    eNotify_OnBeginGameMode,           // Sent when editor goes to game mode.
+    eNotify_OnEndGameMode,             // Sent when editor goes out of game mode.
+
+    // AI/Physics simulation related events.
+    eNotify_OnBeginSimulationMode,     // Sent when simulation mode is started.
+    eNotify_OnEndSimulationMode,       // Sent when editor goes out of simulation mode.
+
+    // UI events.
+    eNotify_OnUpdateViewports,         // Sent when editor needs to update data in the viewports.
+    eNotify_OnReloadTrackView,         // Sent when editor needs to update the track view.
+    eNotify_OnSplashScreenCreated,     // Sent when the editor splash screen was created.
+    eNotify_OnSplashScreenDestroyed,   // Sent when the editor splash screen was destroyed.
+
+    eNotify_OnInvalidateControls,      // Sent when editor needs to update some of the data that can be cached by controls like combo boxes.
+    eNotify_OnStyleChanged,            // Sent when UI color theme was changed
+
+    // Object events.
+    eNotify_OnSelectionChange,         // Sent when object selection change.
+    eNotify_OnPlaySequence,            // Sent when editor start playing animation sequence.
+    eNotify_OnStopSequence,            // Sent when editor stop playing animation sequence.
+
+    // Task specific events.
+    eNotify_OnTerrainRebuild,          // Sent when terrain was rebuilt (resized,...)
+    eNotify_OnBeginTerrainRebuild,     // Sent when terrain begin rebuilt (resized,...)
+    eNotify_OnEndTerrainRebuild,       // Sent when terrain end rebuilt (resized,...)
+    eNotify_OnVegetationObjectSelection, // When vegetation objects selection change.
+    eNotify_OnVegetationPanelUpdate,   // When vegetation objects selection change.
+
+    eNotify_OnDisplayRenderUpdate,     // Sent when editor finish terrain texture generation.
+
+    eNotify_OnDataBaseUpdate,          // DataBase Library was modified.
+
+    eNotify_OnLayerImportBegin,         //layer import was started
+    eNotify_OnLayerImportEnd,           //layer import completed
+
+    eNotify_OnBeginSWNewScene,          // Sent when SW document is begin to be cleared.
+    eNotify_OnEndSWNewScene,                // Sent after SW document have been cleared.
+    eNotify_OnBeginSWMoveTo,                // moveto operation was started
+    eNotify_OnEndSWMoveTo,          // moveto operation completed
+    eNotify_OnSWLockUnlock,             // Sent when commit, rollback or getting lock from segmented world
+    eNotify_OnSWVegetationStatusChange, // When changed segmented world status of vegetation map
+
+    eNotify_OnBeginUndoRedo,
+    eNotify_OnEndUndoRedo,
+    eNotify_CameraChanged, // When the active viewport camera was changed
+
+    eNotify_OnTextureLayerChange,      // Sent when texture layer was added, removed or moved
+
+    eNotify_OnSplatmapImport, // Sent when splatmaps get imported
+
+    eNotify_OnParticleUpdate,          // A particle effect was modified.
+    eNotify_OnAddAWSProfile,           // An AWS profile was added
+    eNotify_OnSwitchAWSProfile,        // The AWS profile was switched
+    eNotify_OnSwitchAWSDeployment,     // The AWS deployment was switched
+    eNotify_OnFirstAWSUse,             // This should only be emitted once
+
+    eNotify_OnRefCoordSysChange,
+
+    // Entity selection events.
+    eNotify_OnEntitiesSelected,
+    eNotify_OnEntitiesDeselected,
+
+    // More document events - added here in case enum values matter to any event consumers, metrics reporters, etc.
+    eNotify_OnBeginCreate,               // Sent when the document is starting to be created.
+    eNotify_OnEndCreate,                 // Sent when the document creation is finished.
+
+};
+
+// UI event handler
+struct IUIEvent
+{
+    virtual void OnClick(DWORD dwId) = 0;
+    virtual bool IsEnabled(DWORD dwId) = 0;
+    virtual bool IsChecked(DWORD dwId) = 0;
+    virtual const char* GetUIElementName(DWORD dwId) = 0;
+};
+
+//! Add object that implements this interface to Load listeners of IEditor
+//! To receive notifications when new document is loaded.
+struct IDocListener
+{
+    virtual ~IDocListener() = default;
+
+    //! Called after new level is created.
+    virtual void OnNewDocument() = 0;
+    //! Called after level have been loaded.
+    virtual void OnLoadDocument() = 0;
+    //! Called when document is being closed.
+    virtual void OnCloseDocument() = 0;
+};
+
+//! Derive from this class if you want to register for getting global editor notifications.
+struct IEditorNotifyListener
+{
+    bool m_bIsRegistered;
+
+    IEditorNotifyListener()
+        : m_bIsRegistered(false)
+    {
+    }
+    virtual ~IEditorNotifyListener()
+    {
+        if (m_bIsRegistered)
+        {
+            CryFatalError("Destroying registered IEditorNotifyListener");
+        }
+    }
+
+    //! called by the editor to notify the listener about the specified event.
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) = 0;
+};
+
+//! Axis constrains value.
+enum AxisConstrains
+{
+    AXIS_NONE = 0,
+    AXIS_X,
+    AXIS_Y,
+    AXIS_Z,
+    AXIS_XY,
+    AXIS_YZ,
+    AXIS_XZ,
+    AXIS_XYZ,
+    //! Follow terrain constrain
+    AXIS_TERRAIN,
+};
+
+//! Reference coordinate system values
+enum RefCoordSys
+{ // Don't change this order. Should be in the same order as MainWindow::CreateRefCoordComboBox()
+    COORDS_VIEW = 0,
+    COORDS_LOCAL,
+    COORDS_PARENT,
+    COORDS_WORLD,
+    COORDS_USERDEFINED,
+    LAST_COORD_SYSTEM, // Must always be the last member
+};
+
+// Insert locations for menu items
+enum EMenuInsertLocation
+{
+    // Custom menu of the plugin
+    eMenuPlugin,
+    // Predefined editor menus
+    eMenuEdit,
+    eMenuFile,
+    eMenuInsert,
+    eMenuGenerators,
+    eMenuScript,
+    eMenuView,
+    eMenuHelp
+};
+
+//! Global editor operation mode
+enum EOperationMode
+{
+    eOperationModeNone = 0, // None
+    eCompositingMode, // Normal operation mode where objects are composited in the scene
+    eModellingMode // Geometry modeling mode
+};
+
+//! Mouse events that viewport can send
+enum EMouseEvent
+{
+    eMouseMove,
+    eMouseLDown,
+    eMouseLUp,
+    eMouseLDblClick,
+    eMouseRDown,
+    eMouseRUp,
+    eMouseRDblClick,
+    eMouseMDown,
+    eMouseMUp,
+    eMouseMDblClick,
+    eMouseWheel,
+    eMouseLeave,
+};
+
+//! Viewports update flags
+enum UpdateConentFlags
+{
+    eUpdateHeightmap = 0x01,
+    eUpdateStatObj = 0x02,
+    eUpdateObjects = 0x04, //! Update objects in viewport.
+    eRedrawViewports = 0x08 //! Just redraw viewports..
+};
+
+enum MouseCallbackFlags
+{
+    MK_CALLBACK_FLAGS = 0x100
+};
+
+//! Types of database items
+enum EDataBaseItemType
+{
+    EDB_TYPE_MATERIAL,
+    EDB_TYPE_PARTICLE,
+    EDB_TYPE_MUSIC,
+    EDB_TYPE_EAXPRESET,
+    EDB_TYPE_SOUNDMOOD,
+    EDB_TYPE_FLARE
+};
+
+enum EEditorPathName
+{
+    EDITOR_PATH_OBJECTS,
+    EDITOR_PATH_TEXTURES,
+    EDITOR_PATH_SOUNDS,
+    EDITOR_PATH_MATERIALS,
+    EDITOR_PATH_UI_ICONS,
+    EDITOR_PATH_LAST
+};
+
+enum EModifiedModule
+{
+    eModifiedNothing = 0x0,
+    eModifiedTerrain = BIT(0),
+    eModifiedBrushes = BIT(1),
+    eModifiedEntities = BIT(2),
+    eModifiedAll = -1
+};
+
+//! Class provided by editor for various registration functions.
+struct CRegistrationContext
+{
+    CEditorCommandManager* pCommandManager;
+    CClassFactory* pClassFactory;
+};
+
+//! Interface provided by editor to reach status bar functionality.
+struct IMainStatusBar
+{
+    virtual void SetStatusText(const QString& text) = 0;
+    virtual QWidget* SetItem(QString indicatorName, QString text, QString tip, int iconId) = 0;
+    virtual QWidget* SetItem(QString indicatorName, QString text, QString tip, const QPixmap& icon) = 0;
+
+    virtual QWidget* GetItem(QString indicatorName) = 0;
+};
+
+// forward declaration
+struct IAnimSequence;
+class CTrackViewSequence;
+
+//! Interface to expose TrackViewSequenceManager functionality to SequenceComponent
+struct ITrackViewSequenceManager
+{
+    virtual IAnimSequence* OnCreateSequenceObject(QString name, bool isLegacySequence = true, AZ::EntityId entityId = AZ::EntityId()) = 0;
+
+    //! Notifies of the delete of a sequence entity OR legacy sequence object
+    //! @param entityId The Sequence Component Entity Id OR the legacy sequence object Id packed in the lower 32-bits, as returned from IAnimSequence::GetSequenceEntityId()
+    virtual void OnDeleteSequenceEntity(const AZ::EntityId& entityId) = 0;
+
+    //! Get the first sequence with the given name. They may be more than one sequence with this name.
+    //! Only intended for use with scripting or other cases where a user provides a name.
+    virtual CTrackViewSequence* GetSequenceByName(QString name) const = 0;
+
+    //! Get the sequence with the given EntityId. For legacy support, legacy sequences can be found by giving
+    //! the sequence ID in the lower 32 bits of the EntityId.
+    virtual CTrackViewSequence* GetSequenceByEntityId(const AZ::EntityId& entityId) const = 0;
+
+    virtual void OnCreateSequenceComponent(AZStd::intrusive_ptr<IAnimSequence>& sequence) = 0;
+
+    virtual void OnSequenceActivated(const AZ::EntityId& entityId) = 0;
+};
+
+//! Interface to expose TrackViewSequence functionality to SequenceComponent
+struct ITrackViewSequence
+{
+    virtual void Load() = 0;
+};
+
+//! Interface to permit usage of editor functionality inside the plugin
+struct IEditor
+{
+    virtual void DeleteThis() = 0;
+    //! Access to Editor ISystem interface.
+    virtual ISystem* GetSystem() = 0;
+    //! Access to class factory.
+    virtual IEditorClassFactory* GetClassFactory() = 0;
+    //! Access to commands manager.
+    virtual CEditorCommandManager* GetCommandManager() = 0;
+    virtual ICommandManager* GetICommandManager() = 0;
+    // Executes an Editor command.
+    virtual void ExecuteCommand(const char* sCommand, ...) = 0;
+    virtual void ExecuteCommand(const QString& sCommand) = 0;
+    virtual void SetDocument(CCryEditDoc* pDoc) = 0;
+    //! Get active document
+    virtual CCryEditDoc* GetDocument() const = 0;
+    //! Check if there is a level loaded
+    virtual bool IsLevelLoaded() const = 0;
+    //! Set document modified flag.
+    virtual void SetModifiedFlag(bool modified = true) = 0;
+    virtual void SetModifiedModule(EModifiedModule eModifiedModule, bool boSet = true) = 0;
+    virtual bool IsLevelExported() const = 0;
+    virtual bool SetLevelExported(bool boExported = true) = 0;
+    //! Check if active document is modified.
+    virtual bool IsModified() = 0;
+    //! Save current document.
+    virtual bool SaveDocument() = 0;
+    //! Legacy version of WriteToConsole; don't use.
+    virtual void WriteToConsole(const char* string) = 0;
+    //! Write the passed string to the editors console
+    virtual void WriteToConsole(const QString& string) = 0;
+    //! Set value of console variable.
+    virtual void SetConsoleVar(const char* var, float value) = 0;
+    //! Get value of console variable.
+    virtual float GetConsoleVar(const char* var) = 0;
+    //! Shows or Hides console window.
+    //! @return Previous visibility flag of console.
+    virtual bool ShowConsole(bool show) = 0;
+    // Get Main window status bar
+    virtual IMainStatusBar* GetMainStatusBar() = 0;
+    //! Change the message in the status bar
+    virtual void SetStatusText(const QString& pszString) = 0;
+    //! Query main window of the editor
+    virtual QMainWindow* GetEditorMainWindow() const = 0;
+    //! Returns the path of the editors Primary CD folder
+    virtual QString GetPrimaryCDFolder() = 0;
+    //! Get current level name (name only)
+    virtual QString GetLevelName() = 0;
+    //! Get path to folder of current level (Absolute, contains slash)
+    virtual QString GetLevelFolder() = 0;
+    //! Get path to folder of current level (absolute)
+    virtual QString GetLevelDataFolder() = 0;
+    //! Get path to folder of current level.
+    virtual QString GetSearchPath(EEditorPathName path) = 0;
+    //! This folder is supposed to store Sandbox user settings and state
+    virtual QString GetResolvedUserFolder() = 0;
+    //! Execute application and get console output.
+    virtual bool ExecuteConsoleApp(
+        const QString& CommandLine,
+        QString& OutputText,
+        bool bNoTimeOut = false,
+        bool bShowWindow = false) = 0;
+    //! Sets the document modified flag in the editor
+    virtual void SetDataModified() = 0;
+    //! Tells if editor startup is finished
+    virtual bool IsInitialized() const = 0;
+    //! Check if editor running in gaming mode.
+    virtual bool IsInGameMode() = 0;
+    //! Check if editor running in AI/Physics mode.
+    virtual bool IsInSimulationMode() = 0;
+    //! Set game mode of editor.
+    virtual void SetInGameMode(bool inGame) = 0;
+    //! Return true if Editor runs in the testing mode.
+    virtual bool IsInTestMode() = 0;
+    //! Return true if Editor runs in the preview mode.
+    virtual bool IsInPreviewMode() = 0;
+    //! Return true if Editor runs in the console only mode.
+    virtual bool IsInConsolewMode() = 0;
+    //! return true if editor is running the level load tests mode.
+    virtual bool IsInLevelLoadTestMode() = 0;
+    //! Return true if Editor runs in the material editing mode.
+    virtual bool IsInMatEditMode() = 0;
+    //! Enable/Disable updates of editor.
+    virtual void EnableUpdate(bool enable) = 0;
+    //! Enable/Disable accelerator table, (Enabled by default).
+    virtual void EnableAcceleratos(bool bEnable) = 0;
+    virtual SFileVersion GetFileVersion() = 0;
+    virtual SFileVersion GetProductVersion() = 0;
+    //! Retrieve pointer to game engine instance
+    virtual CGameEngine* GetGameEngine() = 0;
+    virtual CDisplaySettings* GetDisplaySettings() = 0;
+    virtual const SGizmoParameters& GetGlobalGizmoParameters() = 0;
+    //! Create new object
+    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;
+    virtual int ClearSelection() = 0;
+    //! Select object
+    virtual void SelectObject(CBaseObject* obj) = 0;
+    //! Lock current objects selection
+    //! While selection locked, other objects cannot be selected or unselected
+    virtual void LockSelection(bool bLock) = 0;
+    //! Check if selection is currently locked
+    virtual bool IsSelectionLocked() = 0;
+    //! Get access to object manager.
+    virtual struct IObjectManager* GetObjectManager() = 0;
+    virtual CSettingsManager* GetSettingsManager() = 0;
+    //! Get DB manager that own items of specified type.
+    virtual IDataBaseManager* GetDBItemManager(EDataBaseItemType itemType) = 0;
+    virtual IBaseLibraryManager* GetMaterialManagerLibrary() = 0; // Vladimir@conffx
+    virtual IEditorMaterialManager* GetIEditorMaterialManager() = 0; // Vladimir@Conffx
+    //! Returns IconManager.
+    virtual IIconManager* GetIconManager() = 0;
+    //! Get Panel Editor Utilities
+    virtual IEditorPanelUtils* GetEditorPanelUtils() = 0;
+    //! Get Music Manager.
+    virtual CMusicManager* GetMusicManager() = 0;
+    virtual float GetTerrainElevation(float x, float y) = 0;
+    virtual Editor::EditorQtApplication* GetEditorQtApplication() = 0;
+    virtual const QColor& GetColorByName(const QString& name) = 0;
+
+    virtual struct IMovieSystem* GetMovieSystem() = 0;
+    virtual class CPluginManager* GetPluginManager() = 0;
+    virtual class CViewManager* GetViewManager() = 0;
+    virtual class CViewport* GetActiveView() = 0;
+    virtual void SetActiveView(CViewport* viewport) = 0;
+    virtual struct IEditorFileMonitor* GetFileMonitor() = 0;
+
+    // These are needed for Qt integration:
+    virtual void RegisterEventLoopHook(IEventLoopHook* pHook) = 0;
+    virtual void UnregisterEventLoopHook(IEventLoopHook* pHook) = 0;
+    // ^^^
+
+    //! QMimeData is used by the Qt clipboard.
+    //! IMPORTANT: Any QMimeData allocated for the clipboard will be deleted
+    //! when the editor exists. If a QMimeData is allocated by a different
+    //! memory allocator (for example, in a different DLL) than the one used
+    //! by the main editor, a crash will occur on exit, if data is left in
+    //! the clipboard. The solution is to enfore all allocations of QMimeData
+    //! using CreateQMimeData().
+    virtual QMimeData* CreateQMimeData() const = 0;
+    virtual void DestroyQMimeData(QMimeData* data) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Access for CLevelIndependentFileMan
+    // Manager can be used to register as an module that is asked before editor quits / loads level / creates level
+    // This gives the module the change to save changes or cancel the process
+    //////////////////////////////////////////////////////////////////////////
+    virtual class CLevelIndependentFileMan* GetLevelIndependentFileMan() = 0;
+    //! Notify all views that data is changed.
+    virtual void UpdateViews(int flags = 0xFFFFFFFF, const AABB* updateRegion = NULL) = 0;
+    virtual void ResetViews() = 0;
+    //! Update information in track view dialog.
+    virtual void ReloadTrackView() = 0;
+    //! Current position marker
+    virtual Vec3 GetMarkerPosition() = 0;
+    //! Set current position marker.
+    virtual void    SetMarkerPosition(const Vec3& pos) = 0;
+    //! Set current selected region.
+    virtual void    SetSelectedRegion(const AABB& box) = 0;
+    //! Get currently selected region.
+    virtual void    GetSelectedRegion(AABB& box) = 0;
+
+    virtual void SetOperationMode(EOperationMode mode) = 0;
+    virtual EOperationMode GetOperationMode() = 0;
+    //! Shows/Hides transformation manipulator.
+    //! if bShow is true also returns a valid ITransformManipulator pointer.
+    virtual ITransformManipulator* ShowTransformManipulator(bool bShow) = 0;
+    //! Return a pointer to a ITransformManipulator pointer if shown.
+    //! NULL is manipulator is not shown.
+    virtual ITransformManipulator* GetTransformManipulator() = 0;
+    //! Set constrain on specified axis for objects construction and modifications.
+    //! @param axis one of AxisConstrains enumerations.
+    virtual void SetAxisConstraints(AxisConstrains axis) = 0;
+    //! Get axis constrain for objects construction and modifications.
+    virtual AxisConstrains GetAxisConstrains() = 0;
+    //! Set whether axes are forced to the same value when they are changed (x = y = z).
+    virtual void SetAxisVectorLock(bool bAxisVectorLock) = 0;
+    //! Get whether axes are forced to the same value when they are changed (x = y = z).
+    virtual bool IsAxisVectorLocked() = 0;
+    //! If set, when axis terrain constrain is selected, snapping only to terrain.
+    virtual void SetTerrainAxisIgnoreObjects(bool bIgnore) = 0;
+    virtual bool IsTerrainAxisIgnoreObjects() = 0;
+    //! Set current reference coordinate system used when constructing/modifying objects.
+    virtual void SetReferenceCoordSys(RefCoordSys refCoords) = 0;
+    //! Get current reference coordinate system used when constructing/modifying objects.
+    virtual RefCoordSys GetReferenceCoordSys() = 0;
+    virtual XmlNodeRef FindTemplate(const QString& templateName) = 0;
+    virtual void AddTemplate(const QString& templateName, XmlNodeRef& tmpl) = 0;
+
+    virtual const QtViewPane* OpenView(QString sViewClassName, bool reuseOpen = true) = 0;
+    virtual QWidget* FindView(QString viewClassName) = 0;
+
+    virtual bool CloseView(const char* sViewClassName) = 0;
+    virtual bool SetViewFocus(const char* sViewClassName) = 0;
+    virtual void CloseView(const GUID& classId) = 0; // close ALL panels related to classId, used when unloading plugins.
+
+    // We want to open a view object but not wrap it in a view pane)
+    virtual QWidget* OpenWinWidget(WinWidgetId openId) = 0;
+    virtual WinWidget::WinWidgetManager* GetWinWidgetManager() const = 0;
+
+    //! Opens standard color selection dialog.
+    //! Initialized with the color specified in color parameter.
+    //! Returns true if selection is made and false if selection is canceled.
+    virtual bool SelectColor(QColor& color, QWidget* parent = 0) = 0;
+    //! Get shader enumerator.
+    virtual class CUndoManager* GetUndoManager() = 0;
+    //! Begin operation requiring undo
+    //! Undo manager enters holding state.
+    virtual void BeginUndo() = 0;
+    //! Restore all undo objects registered since last BeginUndo call.
+    //! @param bUndo if true all Undo object registered since BeginUpdate call up to this point will be undone.
+    virtual void RestoreUndo(bool undo = true) = 0;
+    //! Accept changes and registers an undo object with the undo manager.
+    //! This will allow the user to undo the operation.
+    virtual void AcceptUndo(const QString& name) = 0;
+    //! Cancel changes and restore undo objects.
+    virtual void CancelUndo() = 0;
+    //! Normally this is NOT needed but in special cases this can be useful.
+    //! This allows to group a set of Begin()/Accept() sequences to be undone in one operation.
+    virtual void SuperBeginUndo() = 0;
+    //! When a SuperBegin() used, this method is used to Accept.
+    //! This leaves the undo database in its modified state and registers the IUndoObjects with the undo system.
+    //! This will allow the user to undo the operation.
+    virtual void SuperAcceptUndo(const QString& name) = 0;
+    //! Cancel changes and restore undo objects.
+    virtual void SuperCancelUndo() = 0;
+    //! Suspend undo recording.
+    virtual void SuspendUndo() = 0;
+    //! Resume undo recording.
+    virtual void ResumeUndo() = 0;
+    // Undo last operation.
+    virtual void Undo() = 0;
+    //! Redo last undo.
+    virtual void Redo() = 0;
+    //! Check if undo information is recording now.
+    virtual bool IsUndoRecording() = 0;
+    //! Check if undo information is suspzended now.
+    virtual bool IsUndoSuspended() = 0;
+    //! Put new undo object, must be called between Begin and Accept/Cancel methods.
+    virtual void RecordUndo(struct IUndoObject* obj) = 0;
+    //! Completely flush all Undo and redo buffers.
+    //! Must be done on level reloads or global Fetch operation.
+    virtual bool FlushUndo(bool isShowMessage = false) = 0;
+    //! Clear the last N number of steps in the undo stack
+    virtual bool ClearLastUndoSteps(int steps) = 0;
+    //! Clear all current Redo steps in the undo stack
+    virtual bool ClearRedoStack() = 0;
+    //! Retrieve current animation context.
+    virtual CAnimationContext* GetAnimation() = 0;
+    //! Retrieve sequence manager
+    virtual CTrackViewSequenceManager* GetSequenceManager() = 0;
+    virtual ITrackViewSequenceManager* GetSequenceManagerInterface() = 0;
+
+    //! Returns external tools manager.
+    virtual CToolBoxManager* GetToolBoxManager() = 0;
+    //! Get global Error Report instance.
+    virtual IErrorReport* GetErrorReport() = 0;
+    virtual IErrorReport* GetLastLoadedLevelErrorReport() = 0;
+    virtual void StartLevelErrorReportRecording() = 0;
+    virtual void CommitLevelErrorReport() = 0;
+    // Retrieve interface to FileUtil
+    virtual IFileUtil* GetFileUtil() = 0;
+    // Notify all listeners about the specified event.
+    virtual void Notify(EEditorNotifyEvent event) = 0;
+    // Notify all listeners about the specified event, except for one.
+    virtual void NotifyExcept(EEditorNotifyEvent event, IEditorNotifyListener* listener) = 0;
+    //! Register Editor notifications listener.
+    virtual void RegisterNotifyListener(IEditorNotifyListener* listener) = 0;
+    //! Unregister Editor notifications listener.
+    virtual void UnregisterNotifyListener(IEditorNotifyListener* listener) = 0;
+    //! Register document notifications listener.
+    virtual void RegisterDocListener(IDocListener* listener) = 0;
+    //! Unregister document notifications listener.
+    virtual void UnregisterDocListener(IDocListener* listener) = 0;
+    //! Retrieve interface to the source control.
+    virtual ISourceControl* GetSourceControl() = 0;
+    //! Retrieve true if source control is provided and enabled in settings
+    virtual bool IsSourceControlAvailable() = 0;
+    //! Only returns true if source control is both available AND currently connected and functioning
+    virtual bool IsSourceControlConnected() = 0;
+
+    virtual CUIEnumsDatabase* GetUIEnumsDatabase() = 0;
+    virtual void AddUIEnums() = 0;
+    virtual void GetMemoryUsage(ICrySizer* pSizer) = 0;
+    virtual void ReduceMemory() = 0;
+
+    //! Export manager for exporting objects and a terrain from the game to DCC tools
+    virtual IExportManager* GetExportManager() = 0;
+    //! Set current configuration spec of the editor.
+    virtual void SetEditorConfigSpec(ESystemConfigSpec spec, ESystemConfigPlatform platform) = 0;
+    virtual ESystemConfigSpec GetEditorConfigSpec() const = 0;
+    virtual ESystemConfigPlatform GetEditorConfigPlatform() const = 0;
+    virtual void ReloadTemplates() = 0;
+    virtual IResourceSelectorHost* GetResourceSelectorHost() = 0;
+    virtual void ShowStatusText(bool bEnable) = 0;
+
+    // Provides a way to extend the context menu of an object. The function gets called every time the menu is opened.
+    typedef AZStd::function<void(QMenu*, const CBaseObject*)> TContextMenuExtensionFunc;
+    virtual void RegisterObjectContextMenuExtension(TContextMenuExtensionFunc func) = 0;
+
+    virtual SSystemGlobalEnvironment* GetEnv() = 0;
+    virtual IImageUtil* GetImageUtil() = 0;  // Vladimir@conffx
+    virtual SEditorSettings* GetEditorSettings() = 0;
+
+    virtual ILogFile* GetLogFile() = 0;  // Vladimir@conffx
+
+    // unload all plugins
+    virtual void UnloadPlugins() = 0;
+
+    // reloads the plugins
+    virtual void LoadPlugins() = 0;
+};
+
+//! Callback used by editor when initializing for info in UI dialogs
+struct IInitializeUIInfo
+{
+    virtual void SetInfoText(const char* text) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_IEDITOR_H
diff --git a/Code/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp
new file mode 100644
index 0000000000..f472e12fc9
--- /dev/null
+++ b/Code/Editor/IEditorImpl.cpp
@@ -0,0 +1,1704 @@
+/*
+ * 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 : CEditorImpl class implementation.
+
+#include "EditorDefs.h"
+
+#include "IEditorImpl.h"
+
+// Qt
+#include <QByteArray>
+
+// AWS Native SDK
+AZ_PUSH_DISABLE_WARNING(4251 4355 4996, "-Wunknown-warning-option")
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/platform/FileSystem.h>
+AZ_POP_DISABLE_WARNING
+
+// AzCore
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/JSON/document.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+
+// AzFramework
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/ColorPicker.h>
+#include <AzQtComponents/Utilities/Conversions.h>
+
+// Editor
+#include "CryEdit.h"
+#include "Dialogs/ErrorsDlg.h"
+#include "PluginManager.h"
+#include "IconManager.h"
+#include "ViewManager.h"
+#include "Objects/GizmoManager.h"
+#include "Objects/AxisGizmo.h"
+#include "DisplaySettings.h"
+#include "KeyboardCustomizationSettings.h"
+#include "Export/ExportManager.h"
+#include "LevelIndependentFileMan.h"
+#include "TrackView/TrackViewSequenceManager.h"
+#include "AnimationContext.h"
+#include "GameEngine.h"
+#include "ToolBox.h"
+#include "MainWindow.h"
+#include "UIEnumsDatabase.h"
+#include "RenderHelpers/AxisHelper.h"
+#include "Settings.h"
+#include "Include/IObjectManager.h"
+#include "Include/ISourceControl.h"
+#include "Objects/SelectionGroup.h"
+#include "Objects/ObjectManager.h"
+
+#include "EditorFileMonitor.h"
+#include "MainStatusBar.h"
+
+#include "ResourceSelectorHost.h"
+#include "Util/FileUtil_impl.h"
+#include "Util/ImageUtil_impl.h"
+#include "LogFileImpl.h"
+
+#include "Editor/AssetDatabase/AssetDatabaseLocationListener.h"
+#include "Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h"
+#include "Editor/AssetEditor/AssetEditorRequestsHandler.h"
+
+// EditorCommon
+#include <WinWidget/WinWidgetManager.h>
+
+// AWSNativeSDK
+#include <AWSNativeSDKInit/AWSNativeSDKInit.h>
+
+#include "IEditorPanelUtils.h"
+#include "EditorPanelUtils.h"
+
+
+// even in Release mode, the editor will return its heap, because there's no Profile build configuration for the editor
+#ifdef _RELEASE
+#undef _RELEASE
+#endif
+
+#include "Core/QtEditorApplication.h"                               // for Editor::EditorQtApplication
+
+static CCryEditDoc * theDocument;
+#include <QMimeData>
+#include <QMessageBox>
+#include <QProcess>
+
+#if defined(EXTERNAL_CRASH_REPORTING)
+#include <ToolsCrashHandler.h>
+#endif
+#ifndef VERIFY
+#define VERIFY(EXPRESSION) { auto e = EXPRESSION; assert(e); }
+#endif
+
+#undef GetCommandLine
+
+const char* CEditorImpl::m_crashLogFileName = "SessionStatus/editor_statuses.json";
+
+CEditorImpl::CEditorImpl()
+    : m_operationMode(eOperationModeNone)
+    , m_pSystem(nullptr)
+    , m_pFileUtil(nullptr)
+    , m_pClassFactory(nullptr)
+    , m_pCommandManager(nullptr)
+    , m_pObjectManager(nullptr)
+    , m_pPluginManager(nullptr)
+    , m_pViewManager(nullptr)
+    , m_pUndoManager(nullptr)
+    , m_marker(0, 0, 0)
+    , m_selectedAxis(AXIS_TERRAIN)
+    , m_refCoordsSys(COORDS_LOCAL)
+    , m_bAxisVectorLock(false)
+    , m_bUpdates(true)
+    , m_bTerrainAxisIgnoreObjects(false)
+    , m_pDisplaySettings(nullptr)
+    , m_pIconManager(nullptr)
+    , m_bSelectionLocked(true)
+    , m_pAxisGizmo(nullptr)
+    , m_pGameEngine(nullptr)
+    , m_pAnimationContext(nullptr)
+    , m_pSequenceManager(nullptr)
+    , m_pToolBoxManager(nullptr)
+    , m_pMusicManager(nullptr)
+    , m_pErrorReport(nullptr)
+    , m_pLasLoadedLevelErrorReport(nullptr)
+    , m_pErrorsDlg(nullptr)
+    , m_pSourceControl(nullptr)
+    , m_pSelectionTreeManager(nullptr)
+    , m_pUIEnumsDatabase(nullptr)
+    , m_pConsoleSync(nullptr)
+    , m_pSettingsManager(nullptr)
+    , m_pLevelIndependentFileMan(nullptr)
+    , m_pExportManager(nullptr)
+    , m_awsResourceManager(nullptr)
+    , m_bMatEditMode(false)
+    , m_bShowStatusText(true)
+    , m_bInitialized(false)
+    , m_bExiting(false)
+    , m_QtApplication(static_cast<Editor::EditorQtApplication*>(qApp))
+    , m_pImageUtil(nullptr)
+    , m_pLogFile(nullptr)
+    , m_panelEditorUtils(nullptr)
+{
+    // note that this is a call into EditorCore.dll, which stores the g_pEditorPointer for all shared modules that share EditorCore.dll
+    // this means that they don't need to do SetIEditor(...) themselves and its available immediately
+    SetIEditor(this);
+
+    m_pFileUtil = new CFileUtil_impl();
+    m_pLogFile = new CLogFileImpl();
+    m_pLevelIndependentFileMan = new CLevelIndependentFileMan;
+    SetPrimaryCDFolder();
+    gSettings.Load();
+
+    m_pErrorReport = new CErrorReport;
+    m_pClassFactory = CClassFactory::Instance();
+    m_pCommandManager = new CEditorCommandManager;
+    CRegistrationContext regCtx;
+    regCtx.pCommandManager = m_pCommandManager;
+    regCtx.pClassFactory = m_pClassFactory;
+    m_pEditorFileMonitor.reset(new CEditorFileMonitor());
+    m_pUIEnumsDatabase = new CUIEnumsDatabase;
+    m_pDisplaySettings = new CDisplaySettings;
+    m_pDisplaySettings->LoadRegistry();
+    m_pPluginManager = new CPluginManager;
+
+    m_panelEditorUtils = CreateEditorPanelUtils();
+
+    m_pObjectManager = new CObjectManager;
+    m_pViewManager = new CViewManager;
+    m_pIconManager = new CIconManager;
+    m_pUndoManager = new CUndoManager;
+    m_pToolBoxManager = new CToolBoxManager;
+    m_pSequenceManager = new CTrackViewSequenceManager;
+    m_pAnimationContext = new CAnimationContext;
+
+    m_pImageUtil = new CImageUtil_impl();
+    m_pResourceSelectorHost.reset(CreateResourceSelectorHost());
+    m_selectedRegion.min = Vec3(0, 0, 0);
+    m_selectedRegion.max = Vec3(0, 0, 0);
+    DetectVersion();
+    RegisterTools();
+
+    m_winWidgetManager.reset(new WinWidget::WinWidgetManager);
+
+    m_pAssetDatabaseLocationListener = nullptr;
+    m_pAssetBrowserRequestHandler = nullptr;
+    m_assetEditorRequestsHandler = nullptr;
+
+    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+    {
+        if (AZ::IO::FixedMaxPath crashLogPath; settingsRegistry->Get(crashLogPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectUserPath))
+        {
+            crashLogPath /= m_crashLogFileName;
+            AZ::IO::SystemFile::CreateDir(crashLogPath.ParentPath().FixedMaxPathString().c_str());
+            QFile::setPermissions(crashLogPath.c_str(), QFileDevice::ReadOther | QFileDevice::WriteOther);
+        }
+    }
+}
+
+void CEditorImpl::Initialize()
+{
+#if defined(EXTERNAL_CRASH_REPORTING)
+    CrashHandler::ToolsCrashHandler::InitCrashHandler("Editor", {});
+#endif
+
+    // Must be set before QApplication is initialized, so that we support HighDpi monitors, like the Retina displays
+    // on Windows 10
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+
+    // Prevents (native) sibling widgets from causing problems with docked QOpenGLWidgets on Windows
+    // The problem is due to native widgets ending up with pixel formats that are incompatible with the GL pixel format
+    // (generally due to a lack of an alpha channel). This blocks the creation of a shared GL context.
+    // And on macOS it prevents all kinds of bugs related to native widgets, specially regarding toolbars (duplicate toolbars, artifacts, crashes).
+    QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
+
+    // Activate QT immediately so that its available as soon as CEditorImpl is (and thus GetIEditor())
+    InitializeEditorCommon(GetIEditor());
+}
+
+//The only purpose of that function is to be called at the very begining of the shutdown sequence so that we can instrument and track
+//how many crashes occur while shutting down
+void CEditorImpl::OnBeginShutdownSequence()
+{
+}
+
+void CEditorImpl::OnEarlyExitShutdownSequence()
+{
+}
+
+void CEditorImpl::Uninitialize()
+{
+    if (m_pSystem)
+    {
+        UninitializeEditorCommonISystem(m_pSystem);
+    }
+    UninitializeEditorCommon();
+}
+
+void CEditorImpl::UnloadPlugins()
+{
+    CryAutoLock<CryMutex> lock(m_pluginMutex);
+
+    // Flush core buses. We're about to unload DLLs and need to ensure we don't have module-owned functions left behind.
+    AZ::Data::AssetBus::ExecuteQueuedEvents();
+    AZ::TickBus::ExecuteQueuedEvents();
+
+    // first, stop anyone from accessing plugins that provide things like source control.
+    // note that m_psSourceControl is re-queried
+    m_pSourceControl = nullptr;
+
+    // Send this message to ensure that any widgets queued for deletion will get deleted before their
+    // plugin containing their vtable is unloaded. If not, access violations can occur
+    QCoreApplication::sendPostedEvents(Q_NULLPTR, QEvent::DeferredDelete);
+
+    GetPluginManager()->ReleaseAllPlugins();
+
+    GetPluginManager()->UnloadAllPlugins();
+}
+
+void CEditorImpl::LoadPlugins()
+{
+    CryAutoLock<CryMutex> lock(m_pluginMutex);
+
+    static const QString editor_plugins_folder("EditorPlugins");
+
+    // Build, verify, and set the engine root's editor plugin folder
+    QString editorPluginPathStr;
+
+    AZStd::string_view exeFolder;
+    AZ::ComponentApplicationBus::BroadcastResult(exeFolder, &AZ::ComponentApplicationRequests::GetExecutableFolder);
+
+    QDir testDir;
+    testDir.setPath(AZStd::string(exeFolder).c_str());
+    if (testDir.exists() && testDir.cd(editor_plugins_folder))
+    {
+        editorPluginPathStr = testDir.absolutePath();
+    }
+
+    // If no editor plugin path was found based on the root engine path, then fallback to the current editor.exe path
+    if (editorPluginPathStr.isEmpty())
+    {
+        editorPluginPathStr = QString("%1/%2").arg(qApp->applicationDirPath(), editor_plugins_folder);
+    }
+
+    QString pluginSearchPath = QDir::toNativeSeparators(QString("%1/*" AZ_DYNAMIC_LIBRARY_EXTENSION).arg(editorPluginPathStr));
+
+    GetPluginManager()->LoadPlugins(pluginSearchPath.toUtf8().data());
+}
+
+CEditorImpl::~CEditorImpl()
+{
+    gSettings.Save();
+    m_bExiting = true; // Can't save level after this point (while Crash)
+    SAFE_RELEASE(m_pSourceControl);
+
+    SAFE_DELETE(m_pIconManager)
+    SAFE_DELETE(m_pViewManager)
+    SAFE_DELETE(m_pObjectManager) // relies on prefab manager
+
+    SAFE_DELETE(m_panelEditorUtils);
+
+    // some plugins may be exporter - this must be above plugin manager delete.
+    SAFE_DELETE(m_pExportManager);
+
+    SAFE_DELETE(m_pPluginManager)
+    SAFE_DELETE(m_pAnimationContext) // relies on undo manager
+    SAFE_DELETE(m_pUndoManager)
+
+    if (m_pDisplaySettings)
+    {
+        m_pDisplaySettings->SaveRegistry();
+    }
+
+    SAFE_DELETE(m_pDisplaySettings)
+    SAFE_DELETE(m_pToolBoxManager)
+    SAFE_DELETE(m_pCommandManager)
+    SAFE_DELETE(m_pClassFactory)
+    SAFE_DELETE(m_pLasLoadedLevelErrorReport)
+    SAFE_DELETE(m_pUIEnumsDatabase)
+
+    SAFE_DELETE(m_pSettingsManager);
+
+    SAFE_DELETE(m_pAssetDatabaseLocationListener);
+    SAFE_DELETE(m_pAssetBrowserRequestHandler);
+    SAFE_DELETE(m_assetEditorRequestsHandler);
+
+    // Game engine should be among the last things to be destroyed, as it
+    // destroys the engine.
+    SAFE_DELETE(m_pErrorsDlg);
+    SAFE_DELETE(m_pLevelIndependentFileMan);
+    SAFE_DELETE(m_pGameEngine);
+    // The error report must be destroyed after the game, as the engine
+    // refers to the error report and the game destroys the engine.
+    SAFE_DELETE(m_pErrorReport);
+
+    SAFE_DELETE(m_pFileUtil); // Vladimir@Conffx
+    SAFE_DELETE(m_pImageUtil); // Vladimir@Conffx
+    SAFE_DELETE(m_pLogFile); // Vladimir@Conffx
+}
+
+void CEditorImpl::SetPrimaryCDFolder()
+{
+    QString szFolder = qApp->applicationDirPath();
+    QDir::setCurrent(szFolder);
+}
+
+void CEditorImpl::SetGameEngine(CGameEngine* ge)
+{
+    m_pAssetDatabaseLocationListener = new AssetDatabase::AssetDatabaseLocationListener();
+    m_pAssetBrowserRequestHandler = new AzAssetBrowserRequestHandler();
+    m_assetEditorRequestsHandler = aznew AssetEditorRequestsHandler();
+
+    m_pSystem = ge->GetSystem();
+    m_pGameEngine = ge;
+
+    InitializeEditorCommonISystem(m_pSystem);
+
+    m_templateRegistry.LoadTemplates("Editor");
+    m_pObjectManager->LoadClassTemplates("Editor");
+    m_pObjectManager->RegisterCVars();
+
+    m_pAnimationContext->Init();
+}
+
+void CEditorImpl::RegisterTools()
+{
+    CRegistrationContext rc;
+
+    rc.pCommandManager = m_pCommandManager;
+    rc.pClassFactory = m_pClassFactory;
+}
+
+void CEditorImpl::ExecuteCommand(const char* sCommand, ...)
+{
+    va_list args;
+    va_start(args, sCommand);
+    ExecuteCommand(QString::asprintf(sCommand, args));
+    va_end(args);
+}
+
+void CEditorImpl::ExecuteCommand(const QString& command)
+{
+    m_pCommandManager->Execute(command.toUtf8().data());
+}
+
+void CEditorImpl::Update()
+{
+    if (!m_bUpdates)
+    {
+        return;
+    }
+
+    // Make sure this is not called recursively
+    m_bUpdates = false;
+
+    FUNCTION_PROFILER(GetSystem(), PROFILE_EDITOR);
+
+    //@FIXME: Restore this latter.
+    //if (GetGameEngine() && GetGameEngine()->IsLevelLoaded())
+    {
+        m_pObjectManager->Update();
+    }
+    if (IsInPreviewMode())
+    {
+        SetModifiedFlag(FALSE);
+        SetModifiedModule(eModifiedNothing);
+    }
+
+    m_bUpdates = true;
+}
+
+ISystem* CEditorImpl::GetSystem()
+{
+    return m_pSystem;
+}
+
+IEditorClassFactory* CEditorImpl::GetClassFactory()
+{
+    return m_pClassFactory;
+}
+
+CCryEditDoc* CEditorImpl::GetDocument() const
+{
+    return theDocument;
+}
+
+bool CEditorImpl::IsLevelLoaded() const
+{
+    return GetDocument() && GetDocument()->IsDocumentReady();
+}
+
+void CEditorImpl::SetDocument(CCryEditDoc* pDoc)
+{
+    theDocument = pDoc;
+}
+
+void CEditorImpl::SetModifiedFlag(bool modified)
+{
+    if (GetDocument() && GetDocument()->IsDocumentReady())
+    {
+        GetDocument()->SetModifiedFlag(modified);
+
+        if (modified)
+        {
+            GetDocument()->SetLevelExported(false);
+        }
+    }
+}
+
+void CEditorImpl::SetModifiedModule(EModifiedModule eModifiedModule, bool boSet)
+{
+    if (GetDocument())
+    {
+        GetDocument()->SetModifiedModules(eModifiedModule, boSet);
+    }
+}
+
+bool CEditorImpl::IsLevelExported() const
+{
+    CCryEditDoc* pDoc = GetDocument();
+
+    if (pDoc)
+    {
+        return pDoc->IsLevelExported();
+    }
+
+    return false;
+}
+
+bool CEditorImpl::SetLevelExported(bool boExported)
+{
+    if (GetDocument())
+    {
+        GetDocument()->SetLevelExported(boExported);
+        return true;
+    }
+    return false;
+}
+
+bool CEditorImpl::IsModified()
+{
+    if (GetDocument())
+    {
+        return GetDocument()->IsModified();
+    }
+    return false;
+}
+
+bool CEditorImpl::SaveDocument()
+{
+    if (m_bExiting)
+    {
+        return false;
+    }
+
+    if (GetDocument())
+    {
+        return GetDocument()->Save();
+    }
+    else
+    {
+        return false;
+    }
+}
+
+QString CEditorImpl::GetPrimaryCDFolder()
+{
+    return m_primaryCDFolder;
+}
+
+QString CEditorImpl::GetLevelFolder()
+{
+    return GetGameEngine()->GetLevelPath();
+}
+
+QString CEditorImpl::GetLevelName()
+{
+    m_levelNameBuffer = GetGameEngine()->GetLevelName();
+    return m_levelNameBuffer;
+}
+
+QString CEditorImpl::GetLevelDataFolder()
+{
+    return Path::AddPathSlash(Path::AddPathSlash(GetGameEngine()->GetLevelPath()) + "LevelData");
+}
+
+QString CEditorImpl::GetSearchPath(EEditorPathName path)
+{
+    return gSettings.searchPaths[path][0];
+}
+
+QString CEditorImpl::GetResolvedUserFolder()
+{
+    m_userFolder = Path::GetResolvedUserSandboxFolder();
+    return m_userFolder;
+}
+
+void CEditorImpl::SetDataModified()
+{
+    GetDocument()->SetModifiedFlag(TRUE);
+}
+
+void CEditorImpl::SetStatusText(const QString& pszString)
+{
+    if (m_bShowStatusText && !m_bMatEditMode && GetMainStatusBar())
+    {
+        GetMainStatusBar()->SetStatusText(pszString);
+    }
+}
+
+IMainStatusBar* CEditorImpl::GetMainStatusBar()
+{
+    return MainWindow::instance()->StatusBar();
+}
+
+void CEditorImpl::SetOperationMode(EOperationMode mode)
+{
+    m_operationMode = mode;
+    gSettings.operationMode = mode;
+}
+
+EOperationMode CEditorImpl::GetOperationMode()
+{
+    return m_operationMode;
+}
+
+ITransformManipulator* CEditorImpl::ShowTransformManipulator(bool bShow)
+{
+    if (bShow)
+    {
+        if (!m_pAxisGizmo)
+        {
+            m_pAxisGizmo = new CAxisGizmo;
+            m_pAxisGizmo->AddRef();
+            GetObjectManager()->GetGizmoManager()->AddGizmo(m_pAxisGizmo);
+        }
+        return m_pAxisGizmo;
+    }
+    else
+    {
+        // Hide gizmo.
+        if (m_pAxisGizmo)
+        {
+            GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_pAxisGizmo);
+            m_pAxisGizmo->Release();
+        }
+        m_pAxisGizmo = 0;
+    }
+    return 0;
+}
+
+ITransformManipulator* CEditorImpl::GetTransformManipulator()
+{
+    return m_pAxisGizmo;
+}
+
+void CEditorImpl::SetAxisConstraints(AxisConstrains axisFlags)
+{
+    m_selectedAxis = axisFlags;
+    m_pViewManager->SetAxisConstrain(axisFlags);
+    SetTerrainAxisIgnoreObjects(false);
+
+    // Update all views.
+    UpdateViews(eUpdateObjects, NULL);
+}
+
+AxisConstrains CEditorImpl::GetAxisConstrains()
+{
+    return m_selectedAxis;
+}
+
+void CEditorImpl::SetTerrainAxisIgnoreObjects(bool bIgnore)
+{
+    m_bTerrainAxisIgnoreObjects = bIgnore;
+}
+
+bool CEditorImpl::IsTerrainAxisIgnoreObjects()
+{
+    return m_bTerrainAxisIgnoreObjects;
+}
+
+void CEditorImpl::SetReferenceCoordSys(RefCoordSys refCoords)
+{
+    m_refCoordsSys = refCoords;
+
+    // Update all views.
+    UpdateViews(eUpdateObjects, NULL);
+
+    // Update the construction plane infos.
+    CViewport* pViewport = GetActiveView();
+    if (pViewport)
+    {
+        //Pre and Post widget rendering calls are made here to make sure that the proper camera state is set.
+        //MakeConstructionPlane will make a call to ViewToWorldRay which needs the correct camera state 
+        //in the CRenderViewport to be set. 
+        pViewport->PreWidgetRendering();
+
+        pViewport->MakeConstructionPlane(GetIEditor()->GetAxisConstrains());
+
+        pViewport->PostWidgetRendering();
+    }
+
+    Notify(eNotify_OnRefCoordSysChange);
+}
+
+RefCoordSys CEditorImpl::GetReferenceCoordSys()
+{
+    return m_refCoordsSys;
+}
+
+CBaseObject* CEditorImpl::NewObject(const char* typeName, const char* fileName, const char* name, float x, float y, float z, bool modifyDoc)
+{
+    CUndo undo("Create new object");
+
+    IEditor* editor = GetIEditor();
+    if (modifyDoc)
+    {
+        editor->SetModifiedFlag();
+        editor->SetModifiedModule(eModifiedBrushes);
+    }
+    CBaseObject* object = editor->GetObjectManager()->NewObject(typeName, 0, fileName, name);
+    if (!object)
+    {
+        return nullptr;
+    }
+
+    object->SetPos(Vec3(x, y, z));
+
+    return object;
+}
+
+const SGizmoParameters& CEditorImpl::GetGlobalGizmoParameters()
+{
+    if (!m_pGizmoParameters.get())
+    {
+        m_pGizmoParameters.reset(new SGizmoParameters());
+    }
+
+    m_pGizmoParameters->axisConstraint = m_selectedAxis;
+    m_pGizmoParameters->referenceCoordSys = m_refCoordsSys;
+    m_pGizmoParameters->axisGizmoScale = gSettings.gizmo.axisGizmoSize;
+    m_pGizmoParameters->axisGizmoText = gSettings.gizmo.axisGizmoText;
+
+    return *m_pGizmoParameters;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEditorImpl::DeleteObject(CBaseObject* obj)
+{
+    SetModifiedFlag();
+    GetIEditor()->SetModifiedModule(eModifiedBrushes);
+    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)
+    {
+        return nullptr;
+    }
+    return m_pObjectManager->GetSelection()->GetObject(0);
+}
+
+void CEditorImpl::SelectObject(CBaseObject* obj)
+{
+    GetObjectManager()->SelectObject(obj);
+}
+
+IObjectManager* CEditorImpl::GetObjectManager()
+{
+    return m_pObjectManager;
+};
+
+CSettingsManager* CEditorImpl::GetSettingsManager()
+{
+    // Do not go any further before XML class is ready to use
+    if (!gEnv)
+    {
+        return nullptr;
+    }
+
+    if (!GetISystem())
+    {
+        return nullptr;
+    }
+
+    if (!m_pSettingsManager)
+    {
+        m_pSettingsManager = new CSettingsManager(eSettingsManagerMemoryStorage);
+    }
+
+    return m_pSettingsManager;
+}
+
+CSelectionGroup* CEditorImpl::GetSelection()
+{
+    return m_pObjectManager->GetSelection();
+}
+
+int CEditorImpl::ClearSelection()
+{
+    if (GetSelection()->IsEmpty())
+    {
+        return 0;
+    }
+    CUndo undo("Clear Selection");
+    return GetObjectManager()->ClearSelection();
+}
+
+void CEditorImpl::LockSelection(bool bLock)
+{
+    // Selection must be not empty to enable selection lock.
+    if (!GetSelection()->IsEmpty())
+    {
+        m_bSelectionLocked = bLock;
+    }
+    else
+    {
+        m_bSelectionLocked = false;
+    }
+}
+
+bool CEditorImpl::IsSelectionLocked()
+{
+    return m_bSelectionLocked;
+}
+
+CViewManager* CEditorImpl::GetViewManager()
+{
+    return m_pViewManager;
+}
+
+CViewport* CEditorImpl::GetActiveView()
+{
+    MainWindow* mainWindow = MainWindow::instance();
+    if (mainWindow)
+    {
+        CLayoutViewPane* viewPane = mainWindow->GetActiveView();
+        if (viewPane)
+        {
+            return qobject_cast<QtViewport*>(viewPane->GetViewport());
+        }
+    }
+    return nullptr;
+}
+
+void CEditorImpl::SetActiveView(CViewport* viewport)
+{
+    m_pViewManager->SelectViewport(viewport);
+}
+
+void CEditorImpl::UpdateViews(int flags, const AABB* updateRegion)
+{
+    AABB prevRegion = m_pViewManager->GetUpdateRegion();
+    if (updateRegion)
+    {
+        m_pViewManager->SetUpdateRegion(*updateRegion);
+    }
+    m_pViewManager->UpdateViews(flags);
+    if (updateRegion)
+    {
+        m_pViewManager->SetUpdateRegion(prevRegion);
+    }
+}
+
+void CEditorImpl::ReloadTrackView()
+{
+    Notify(eNotify_OnReloadTrackView);
+}
+
+void CEditorImpl::ResetViews()
+{
+    m_pViewManager->ResetViews();
+
+    m_pDisplaySettings->SetRenderFlags(m_pDisplaySettings->GetRenderFlags());
+}
+
+IIconManager* CEditorImpl::GetIconManager()
+{
+    return m_pIconManager;
+}
+
+IEditorFileMonitor* CEditorImpl::GetFileMonitor()
+{
+    return m_pEditorFileMonitor.get();
+}
+
+void CEditorImpl::RegisterEventLoopHook(IEventLoopHook* pHook)
+{
+    CCryEditApp::instance()->RegisterEventLoopHook(pHook);
+}
+
+void CEditorImpl::UnregisterEventLoopHook(IEventLoopHook* pHook)
+{
+    CCryEditApp::instance()->UnregisterEventLoopHook(pHook);
+}
+
+float CEditorImpl::GetTerrainElevation(float x, float y)
+{
+    float terrainElevation = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
+    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainElevation
+        , &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats, x, y,
+        AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, nullptr);
+    return terrainElevation;
+}
+
+const QColor& CEditorImpl::GetColorByName(const QString& name)
+{
+    return m_QtApplication->GetColorByName(name);
+}
+
+void CEditorImpl::SetSelectedRegion(const AABB& box)
+{
+    m_selectedRegion = box;
+}
+
+void CEditorImpl::GetSelectedRegion(AABB& box)
+{
+    box = m_selectedRegion;
+}
+
+const QtViewPane* CEditorImpl::OpenView(QString sViewClassName, bool reuseOpened)
+{
+    auto openMode = reuseOpened ? QtViewPane::OpenMode::None : QtViewPane::OpenMode::MultiplePanes;
+    return QtViewPaneManager::instance()->OpenPane(sViewClassName, openMode);
+}
+
+QWidget* CEditorImpl::OpenWinWidget(WinWidgetId openId)
+{
+    if (m_winWidgetManager)
+    {
+        return m_winWidgetManager->OpenWinWidget(openId);
+    }
+    return nullptr;
+}
+
+WinWidget::WinWidgetManager* CEditorImpl::GetWinWidgetManager() const
+{
+    return m_winWidgetManager.get();
+}
+
+QWidget* CEditorImpl::FindView(QString viewClassName)
+{
+    return QtViewPaneManager::instance()->GetView(viewClassName);
+}
+
+// Intended to give a window focus only if it is currently open
+bool CEditorImpl::SetViewFocus(const char* sViewClassName)
+{
+    QWidget* findWindow = FindView(sViewClassName);
+    if (findWindow)
+    {
+        findWindow->setFocus(Qt::OtherFocusReason);
+        return true;
+    }
+    return false;
+}
+
+bool CEditorImpl::CloseView(const char* sViewClassName)
+{
+    return QtViewPaneManager::instance()->ClosePane(sViewClassName);
+}
+
+void CEditorImpl::CloseView(const GUID& classId)
+{
+    IClassDesc* found = GetClassFactory()->FindClass(classId);
+    if (found)
+    {
+        CloseView(found->ClassName().toUtf8().data());
+    }
+}
+
+IDataBaseManager* CEditorImpl::GetDBItemManager([[maybe_unused]] EDataBaseItemType itemType)
+{
+    return 0;
+}
+
+bool CEditorImpl::SelectColor(QColor& color, QWidget* parent)
+{
+    const AZ::Color c = AzQtComponents::fromQColor(color);
+    AzQtComponents::ColorPicker dlg(AzQtComponents::ColorPicker::Configuration::RGB, tr("Select Color"), parent);
+    dlg.setCurrentColor(c);
+    dlg.setSelectedColor(c);
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        color = AzQtComponents::toQColor(dlg.currentColor());
+        return true;
+    }
+    return false;
+}
+
+void CEditorImpl::SetInGameMode(bool inGame)
+{
+    static bool bWasInSimulationMode(false);
+
+    if (inGame)
+    {
+        bWasInSimulationMode = GetIEditor()->GetGameEngine()->GetSimulationMode();
+        GetIEditor()->GetGameEngine()->SetSimulationMode(false);
+        GetIEditor()->GetGameEngine()->RequestSetGameMode(true);
+    }
+    else
+    {
+        GetIEditor()->GetGameEngine()->RequestSetGameMode(false);
+        GetIEditor()->GetGameEngine()->SetSimulationMode(bWasInSimulationMode);
+    }
+}
+
+bool CEditorImpl::IsInGameMode()
+{
+    if (m_pGameEngine)
+    {
+        return m_pGameEngine->IsInGameMode();
+    }
+    return false;
+}
+
+bool CEditorImpl::IsInSimulationMode()
+{
+    if (m_pGameEngine)
+    {
+        return m_pGameEngine->GetSimulationMode();
+    }
+    return false;
+}
+
+bool CEditorImpl::IsInTestMode()
+{
+    return CCryEditApp::instance()->IsInTestMode();
+}
+
+bool CEditorImpl::IsInConsolewMode()
+{
+    return CCryEditApp::instance()->IsInConsoleMode();
+}
+
+bool CEditorImpl::IsInLevelLoadTestMode()
+{
+    return CCryEditApp::instance()->IsInLevelLoadTestMode();
+}
+
+bool CEditorImpl::IsInPreviewMode()
+{
+    return CCryEditApp::instance()->IsInPreviewMode();
+}
+
+void CEditorImpl::EnableAcceleratos(bool bEnable)
+{
+    KeyboardCustomizationSettings::EnableShortcutsGlobally(bEnable);
+}
+
+static AZStd::string SafeGetStringFromDocument(rapidjson::Document& projectCfg, const char* memberName)
+{
+    if (projectCfg.HasMember(memberName) && projectCfg[memberName].IsString())
+    {
+        return projectCfg[memberName].GetString();
+    }
+
+    return "";
+}
+
+AZStd::string CEditorImpl::LoadProjectIdFromProjectData()
+{
+    const char* MissingProjectId = "";
+
+    // get the full path of the project.json
+    AZStd::string fullPath;
+    AZStd::string relPath("project.json");
+    bool fullPathFound = false;
+
+    using namespace AzToolsFramework;
+    AssetSystemRequestBus::BroadcastResult(fullPathFound, &AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath, relPath, fullPath);
+
+    if (!fullPathFound)
+    {
+        return MissingProjectId;
+    }
+
+    QFile file(fullPath.c_str());
+    if (!file.open(QIODevice::ReadOnly))
+    {
+        return MissingProjectId;
+    }
+
+    // Read the project.json file using its full path
+    QByteArray fileContents = file.readAll();
+    file.close();
+
+    rapidjson::Document projectCfg;
+    projectCfg.Parse(fileContents);
+
+    if (!projectCfg.IsObject())
+    {
+        return MissingProjectId;
+    }
+
+    AZStd::string projectId = SafeGetStringFromDocument(projectCfg, "project_id");
+
+    // if we don't have a valid projectId by now, it's not happening
+    if (projectId.empty() || projectId[0] == '\0')
+    {
+        return MissingProjectId;
+    }
+
+    // get the project Id and project name from the project.json file
+    QString projectName(SafeGetStringFromDocument(projectCfg, "project_name").data());
+
+    QFileInfo fileInfo(fullPath.c_str());
+    QDir folderDirectory = fileInfo.dir();
+
+    // get the project name from the folder directory
+    QString editorProjectName = folderDirectory.dirName();
+
+    // if the project name in the file doesn't match the directory name, it probably means that this is
+    // a copied project, and not safe to put any plain text into the projectId string
+    if (editorProjectName.compare(projectName, Qt::CaseInsensitive) != 0)
+    {
+        return projectId;
+    }
+
+    // get the project Id generated by using the project name from the folder directory
+    QByteArray editorProjectNameUtf8 = editorProjectName.toUtf8();
+    AZ::Uuid id = AZ::Uuid::CreateName(editorProjectNameUtf8.constData());
+
+    // The projects that Open 3D Engine ships with had their project IDs hand-generated based on the name of the level.
+    // Therefore, if the UUID from the project name is the same as the UUID in the file, it's one of our projects
+    // and we can therefore send the name back, making it easier for Metrics to determine which level it was.
+    // We are checking to see if this is a project we ship with Open 3D Engine, and therefore we can unobfuscate non-customer information.
+    if (id != AZ::Uuid(projectId.data()))
+    {
+        return projectId;
+    }
+
+    QByteArray projectNameUtf8 = projectName.toUtf8();
+
+    projectId += " [";
+    projectId += projectNameUtf8.constData();
+    projectId += "]";
+
+    return projectId;
+}
+
+void CEditorImpl::DetectVersion()
+{
+#if defined(AZ_PLATFORM_WINDOWS)
+    char exe[_MAX_PATH];
+    DWORD dwHandle;
+    UINT len;
+
+    char ver[1024 * 8];
+
+    GetModuleFileName(NULL, exe, _MAX_PATH);
+
+    int verSize = GetFileVersionInfoSize(exe, &dwHandle);
+    if (verSize > 0)
+    {
+        GetFileVersionInfo(exe, dwHandle, 1024 * 8, ver);
+        VS_FIXEDFILEINFO* vinfo;
+        VerQueryValue(ver, "\\", (void**)&vinfo, &len);
+
+        m_fileVersion.v[0] = vinfo->dwFileVersionLS & 0xFFFF;
+        m_fileVersion.v[1] = vinfo->dwFileVersionLS >> 16;
+        m_fileVersion.v[2] = vinfo->dwFileVersionMS & 0xFFFF;
+        m_fileVersion.v[3] = vinfo->dwFileVersionMS >> 16;
+
+        m_productVersion.v[0] = vinfo->dwProductVersionLS & 0xFFFF;
+        m_productVersion.v[1] = vinfo->dwProductVersionLS >> 16;
+        m_productVersion.v[2] = vinfo->dwProductVersionMS & 0xFFFF;
+        m_productVersion.v[3] = vinfo->dwProductVersionMS >> 16;
+    }
+#else
+    // This requires the application version to be set using QCoreApplication::setApplicationVersion, which isn't done yet.
+    const QString version = qApp->applicationVersion();
+    if (!version.isEmpty())
+    {
+        QByteArray versionBytes = version.toUtf8();
+        m_fileVersion.Set(versionBytes.data());
+        m_productVersion.Set(versionBytes.data());
+    }
+#endif
+}
+
+XmlNodeRef CEditorImpl::FindTemplate(const QString& templateName)
+{
+    return m_templateRegistry.FindTemplate(templateName);
+}
+
+void CEditorImpl::AddTemplate(const QString& templateName, XmlNodeRef& tmpl)
+{
+    m_templateRegistry.AddTemplate(templateName, tmpl);
+}
+
+bool CEditorImpl::ExecuteConsoleApp(const QString& CommandLine, QString& OutputText, [[maybe_unused]] bool bNoTimeOut, bool bShowWindow)
+{
+    CLogFile::FormatLine("Executing console application '%s'", CommandLine.toUtf8().data());
+
+    QProcess process;
+    if (bShowWindow)
+    {
+#if defined(AZ_PLATFORM_WINDOWS)
+        process.start("cmd.exe", { QString("/C %1").arg(CommandLine) });
+#elif defined(AZ_PLATFORM_LINUX)
+       //KDAB_TODO
+#elif defined(AZ_PLATFORM_MAC)
+        process.start("/usr/bin/osascript", { QString("-e 'tell application \"Terminal\" to do script \"%1\"'").arg(QString(CommandLine).replace("\"", "\\\"")) });
+#else
+        process.start("/usr/bin/csh", { QString("-c \"%1\"'").arg(QString(CommandLine).replace("\"", "\\\"")) } );
+#endif
+    }
+    else
+    {
+        process.start(CommandLine, QStringList());
+    }
+
+    if (!process.waitForStarted())
+    {
+        return false;
+    }
+
+    // Wait for the process to finish
+    process.waitForFinished();
+    if (!bShowWindow)
+    {
+        OutputText = process.readAllStandardOutput();
+    }
+
+    return true;
+}
+
+void CEditorImpl::BeginUndo()
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Begin();
+    }
+}
+
+void CEditorImpl::RestoreUndo(bool undo)
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Restore(undo);
+    }
+}
+
+void CEditorImpl::AcceptUndo(const QString& name)
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Accept(name);
+    }
+}
+
+void CEditorImpl::CancelUndo()
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Cancel();
+    }
+}
+
+void CEditorImpl::SuperBeginUndo()
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->SuperBegin();
+    }
+}
+
+void CEditorImpl::SuperAcceptUndo(const QString& name)
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->SuperAccept(name);
+    }
+}
+
+void CEditorImpl::SuperCancelUndo()
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->SuperCancel();
+    }
+}
+
+void CEditorImpl::SuspendUndo()
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Suspend();
+    }
+}
+
+void CEditorImpl::ResumeUndo()
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Resume();
+    }
+}
+
+void CEditorImpl::Undo()
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Undo();
+    }
+}
+
+void CEditorImpl::Redo()
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Redo();
+    }
+}
+
+bool CEditorImpl::IsUndoRecording()
+{
+    if (m_pUndoManager)
+    {
+        return m_pUndoManager->IsUndoRecording();
+    }
+    return false;
+}
+
+bool CEditorImpl::IsUndoSuspended()
+{
+    if (m_pUndoManager)
+    {
+        return m_pUndoManager->IsUndoSuspended();
+    }
+    return false;
+}
+
+void CEditorImpl::RecordUndo(IUndoObject* obj)
+{
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->RecordUndo(obj);
+    }
+}
+
+bool CEditorImpl::FlushUndo(bool isShowMessage)
+{
+    if (isShowMessage && m_pUndoManager && m_pUndoManager->IsHaveUndo() && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Flush Undo"), QObject::tr("After this operation undo will not be available! Are you sure you want to continue?")) != QMessageBox::Yes)
+    {
+        return false;
+    }
+
+    if (m_pUndoManager)
+    {
+        m_pUndoManager->Flush();
+    }
+    return true;
+}
+
+bool CEditorImpl::ClearLastUndoSteps(int steps)
+{
+    if (!m_pUndoManager || !m_pUndoManager->IsHaveUndo())
+    {
+        return false;
+    }
+
+    m_pUndoManager->ClearUndoStack(steps);
+    return true;
+}
+
+bool CEditorImpl::ClearRedoStack()
+{
+    if (!m_pUndoManager || !m_pUndoManager->IsHaveRedo())
+    {
+        return false;
+    }
+
+    m_pUndoManager->ClearRedoStack();
+    return true;
+}
+
+void CEditorImpl::SetConsoleVar(const char* var, float value)
+{
+    ICVar* ivar = GetSystem()->GetIConsole()->GetCVar(var);
+    if (ivar)
+    {
+        ivar->Set(value);
+    }
+}
+
+float CEditorImpl::GetConsoleVar(const char* var)
+{
+    ICVar* ivar = GetSystem()->GetIConsole()->GetCVar(var);
+    if (ivar)
+    {
+        return ivar->GetFVal();
+    }
+    return 0;
+}
+
+CAnimationContext* CEditorImpl::GetAnimation()
+{
+    return m_pAnimationContext;
+}
+
+CTrackViewSequenceManager* CEditorImpl::GetSequenceManager()
+{
+    return m_pSequenceManager;
+}
+
+ITrackViewSequenceManager* CEditorImpl::GetSequenceManagerInterface()
+{
+    return GetSequenceManager();
+}
+
+void CEditorImpl::RegisterDocListener(IDocListener* listener)
+{
+    CCryEditDoc* doc = GetDocument();
+    if (doc)
+    {
+        doc->RegisterListener(listener);
+    }
+}
+
+void CEditorImpl::UnregisterDocListener(IDocListener* listener)
+{
+    CCryEditDoc* doc = GetDocument();
+    if (doc)
+    {
+        doc->UnregisterListener(listener);
+    }
+}
+
+void CEditorImpl::StartLevelErrorReportRecording()
+{
+    IErrorReport* errorReport = GetErrorReport();
+    if (errorReport)
+    {
+        errorReport->Clear();
+        errorReport->SetImmediateMode(false);
+        errorReport->SetShowErrors(true);
+    }
+}
+
+// Confetti Start: Leroy Sikkes
+void CEditorImpl::Notify(EEditorNotifyEvent event)
+{
+    NotifyExcept(event, nullptr);
+}
+
+void CEditorImpl::NotifyExcept(EEditorNotifyEvent event, IEditorNotifyListener* listener)
+{
+    if (m_bExiting)
+    {
+        return;
+    }
+
+    std::list<IEditorNotifyListener*>::iterator it = m_listeners.begin();
+    while (it != m_listeners.end())
+    {
+        if (*it == listener)
+        {
+            it++;
+            continue; // skip "except" listener
+        }
+
+        (*it++)->OnEditorNotifyEvent(event);
+    }
+
+    if (event == eNotify_OnBeginNewScene)
+    {
+        if (m_pAxisGizmo)
+        {
+            m_pAxisGizmo->Release();
+        }
+        m_pAxisGizmo = 0;
+    }
+
+    if (event == eNotify_OnInit)
+    {
+        REGISTER_COMMAND("py", CmdPy, 0, "Execute a Python code snippet.");
+    }
+
+    GetPluginManager()->NotifyPlugins(event);
+}
+// Confetti end: Leroy Sikkes
+
+void CEditorImpl::RegisterNotifyListener(IEditorNotifyListener* listener)
+{
+    listener->m_bIsRegistered = true;
+    stl::push_back_unique(m_listeners, listener);
+}
+
+void CEditorImpl::UnregisterNotifyListener(IEditorNotifyListener* listener)
+{
+    m_listeners.remove(listener);
+    listener->m_bIsRegistered = false;
+}
+
+ISourceControl* CEditorImpl::GetSourceControl()
+{
+    CryAutoLock<CryMutex> lock(m_pluginMutex);
+
+    if (m_pSourceControl)
+    {
+        return m_pSourceControl;
+    }
+
+    IEditorClassFactory* classFactory = GetIEditor() ? GetIEditor()->GetClassFactory() : nullptr;
+    if (classFactory)
+    {
+        std::vector<IClassDesc*> classes;
+        classFactory->GetClassesBySystemID(ESYSTEM_CLASS_SCM_PROVIDER, classes);
+        for (int i = 0; i < classes.size(); i++)
+        {
+            IClassDesc* pClass = classes[i];
+            ISourceControl* pSCM = NULL;
+            HRESULT hRes = pClass->QueryInterface(__uuidof(ISourceControl), (void**)&pSCM);
+            if (!FAILED(hRes) && pSCM)
+            {
+                m_pSourceControl = pSCM;
+                return m_pSourceControl;
+            }
+        }
+    }
+
+    return 0;
+}
+
+bool CEditorImpl::IsSourceControlAvailable()
+{
+    if ((gSettings.enableSourceControl) && (GetSourceControl()))
+    {
+        return true;
+    }
+
+    return false;
+}
+
+bool CEditorImpl::IsSourceControlConnected()
+{
+    if ((gSettings.enableSourceControl) && (GetSourceControl()) && (GetSourceControl()->GetConnectivityState() == ISourceControl::Connected))
+    {
+        return true;
+    }
+
+    return false;
+}
+
+void CEditorImpl::SetMatEditMode(bool bIsMatEditMode)
+{
+    m_bMatEditMode = bIsMatEditMode;
+}
+
+void CEditorImpl::ShowStatusText(bool bEnable)
+{
+    m_bShowStatusText = bEnable;
+}
+
+void CEditorImpl::GetMemoryUsage(ICrySizer* pSizer)
+{
+    SIZER_COMPONENT_NAME(pSizer, "Editor");
+
+    if (GetDocument())
+    {
+        SIZER_COMPONENT_NAME(pSizer, "Document");
+
+        GetDocument()->GetMemoryUsage(pSizer);
+    }
+}
+
+void CEditorImpl::ReduceMemory()
+{
+    GetIEditor()->GetUndoManager()->ClearRedoStack();
+    GetIEditor()->GetUndoManager()->ClearUndoStack();
+    GetIEditor()->GetObjectManager()->SendEvent(EVENT_FREE_GAME_DATA);
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    HANDLE hHeap = GetProcessHeap();
+
+    if (hHeap)
+    {
+        uint64 maxsize = (uint64)HeapCompact(hHeap, 0);
+        CryLogAlways("Max Free Memory Block = %I64d Kb", maxsize / 1024);
+    }
+#endif
+}
+
+IExportManager* CEditorImpl::GetExportManager()
+{
+    if (!m_pExportManager)
+    {
+        m_pExportManager = new CExportManager();
+    }
+
+    return m_pExportManager;
+}
+
+void CEditorImpl::AddUIEnums()
+{
+    // Spec settings for shadow casting lights
+    string SpecString[4];
+    QStringList types;
+    types.push_back("Never=0");
+    SpecString[0].Format("VeryHigh Spec=%d", CONFIG_VERYHIGH_SPEC);
+    types.push_back(SpecString[0].c_str());
+    SpecString[1].Format("High Spec=%d", CONFIG_HIGH_SPEC);
+    types.push_back(SpecString[1].c_str());
+    SpecString[2].Format("Medium Spec=%d", CONFIG_MEDIUM_SPEC);
+    types.push_back(SpecString[2].c_str());
+    SpecString[3].Format("Low Spec=%d", CONFIG_LOW_SPEC);
+    types.push_back(SpecString[3].c_str());
+    m_pUIEnumsDatabase->SetEnumStrings("CastShadows", types);
+
+    // Power-of-two percentages
+    string percentStringPOT[5];
+    types.clear();
+    percentStringPOT[0].Format("Default=%d", 0);
+    types.push_back(percentStringPOT[0].c_str());
+    percentStringPOT[1].Format("12.5=%d", 1);
+    types.push_back(percentStringPOT[1].c_str());
+    percentStringPOT[2].Format("25=%d", 2);
+    types.push_back(percentStringPOT[2].c_str());
+    percentStringPOT[3].Format("50=%d", 3);
+    types.push_back(percentStringPOT[3].c_str());
+    percentStringPOT[4].Format("100=%d", 4);
+    types.push_back(percentStringPOT[4].c_str());
+    m_pUIEnumsDatabase->SetEnumStrings("ShadowMinResPercent", types);
+}
+
+void CEditorImpl::SetEditorConfigSpec(ESystemConfigSpec spec, [[maybe_unused]]ESystemConfigPlatform platform)
+{
+    gSettings.editorConfigSpec = spec;
+}
+
+ESystemConfigSpec CEditorImpl::GetEditorConfigSpec() const
+{
+    return (ESystemConfigSpec)gSettings.editorConfigSpec;
+}
+
+ESystemConfigPlatform CEditorImpl::GetEditorConfigPlatform() const
+{
+    return m_pSystem->GetConfigPlatform();
+}
+
+void CEditorImpl::InitFinished()
+{
+    if (!m_bInitialized)
+    {
+        m_bInitialized = true;
+        Notify(eNotify_OnInit);
+
+        // Let system wide listeners know about this as well.
+        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_ON_INIT, 0, 0);
+    }
+}
+
+void CEditorImpl::ReloadTemplates()
+{
+    m_templateRegistry.LoadTemplates("Editor");
+}
+
+void CEditorImpl::AddErrorMessage(const QString& text, const QString& caption)
+{
+    if (!m_pErrorsDlg)
+    {
+        m_pErrorsDlg = new CErrorsDlg(GetEditorMainWindow());
+        m_pErrorsDlg->show();
+    }
+
+    m_pErrorsDlg->AddMessage(text, caption);
+}
+
+void CEditorImpl::CmdPy(IConsoleCmdArgs* pArgs)
+{
+    if (AzToolsFramework::EditorPythonRunnerRequestBus::HasHandlers())
+    {
+        // Execute the given script command.
+        QString scriptCmd = pArgs->GetCommandLine();
+
+        scriptCmd = scriptCmd.right(scriptCmd.length() - 2); // The part of the text after the 'py'
+        scriptCmd = scriptCmd.trimmed();
+        AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByString, scriptCmd.toUtf8().data(), false);
+    }
+    else
+    {
+        AZ_Warning("python", false, "EditorPythonRunnerRequestBus has no handlers");
+    }
+}
+
+void CEditorImpl::OnObjectContextMenuOpened(QMenu* pMenu, const CBaseObject* pObject)
+{
+    for (auto it : m_objectContextMenuExtensions)
+    {
+        it(pMenu, pObject);
+    }
+}
+
+void CEditorImpl::RegisterObjectContextMenuExtension(TContextMenuExtensionFunc func)
+{
+    m_objectContextMenuExtensions.push_back(func);
+}
+
+// Vladimir@Conffx
+SSystemGlobalEnvironment* CEditorImpl::GetEnv()
+{
+    assert(gEnv);
+    return gEnv;
+}
+
+// Leroy@Conffx
+SEditorSettings* CEditorImpl::GetEditorSettings()
+{
+    return &gSettings;
+}
+
+// Vladimir@Conffx
+IBaseLibraryManager* CEditorImpl::GetMaterialManagerLibrary()
+{
+    return nullptr;
+}
+
+// Vladimir@Conffx
+IEditorMaterialManager* CEditorImpl::GetIEditorMaterialManager()
+{
+    return nullptr;
+}
+
+IImageUtil* CEditorImpl::GetImageUtil()
+{
+    return m_pImageUtil;
+}
+
+QMimeData* CEditorImpl::CreateQMimeData() const
+{
+    return new QMimeData();
+}
+
+void CEditorImpl::DestroyQMimeData(QMimeData* data) const
+{
+    delete data;
+}
+
+IEditorPanelUtils* CEditorImpl::GetEditorPanelUtils()
+{
+    return m_panelEditorUtils;
+}
diff --git a/Code/Editor/IEditorImpl.h b/Code/Editor/IEditorImpl.h
new file mode 100644
index 0000000000..9dc79cadda
--- /dev/null
+++ b/Code/Editor/IEditorImpl.h
@@ -0,0 +1,406 @@
+/*
+ * 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 : IEditor interface implementation.
+
+#pragma once
+
+#include "IEditor.h"
+#include "MainWindow.h"
+
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+
+#include <memory> // for shared_ptr
+#include <QMap>
+#include <QApplication>
+#include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
+#include <AzCore/std/string/string.h>
+
+#include "Commands/CommandManager.h"                
+
+#include "Include/IErrorReport.h"
+#include "ErrorReport.h"
+
+class QMenu;
+
+
+#define GET_PLUGIN_ID_FROM_MENU_ID(ID) (((ID) & 0x000000FF))
+#define GET_UI_ELEMENT_ID_FROM_MENU_ID(ID) ((((ID) & 0x0000FF00) >> 8))
+
+class CObjectManager;
+class CUndoManager;
+class CGameEngine;
+class CExportManager;
+class CErrorsDlg;
+class CIconManager;
+class CTrackViewSequenceManager;
+class CEditorFileMonitor;
+class AzAssetWindow;
+class AzAssetBrowserRequestHandler;
+class AssetEditorRequestsHandler;
+struct IEditorFileMonitor;
+class CVegetationMap;
+
+
+namespace Editor
+{
+    class EditorQtApplication;
+}
+
+namespace WinWidget
+{
+    class WinWidgetManager;
+}
+
+namespace AssetDatabase
+{
+    class AssetDatabaseLocationListener;
+}
+
+class CEditorImpl 
+    : public IEditor
+{
+    Q_DECLARE_TR_FUNCTIONS(CEditorImpl)
+
+public:
+    CEditorImpl();
+    virtual ~CEditorImpl();
+
+    void Initialize();
+    void OnBeginShutdownSequence();
+    void OnEarlyExitShutdownSequence();
+    void Uninitialize();
+
+
+    void SetGameEngine(CGameEngine* ge);
+    void DeleteThis() { delete this; };
+    IEditorClassFactory* GetClassFactory();
+    CEditorCommandManager* GetCommandManager() { return m_pCommandManager; };
+    ICommandManager* GetICommandManager() { return m_pCommandManager; }
+    void ExecuteCommand(const char* sCommand, ...);
+    void ExecuteCommand(const QString& command);
+    void SetDocument(CCryEditDoc* pDoc);
+    CCryEditDoc* GetDocument() const;
+    bool IsLevelLoaded() const override;
+    void SetModifiedFlag(bool modified = true);
+    void SetModifiedModule(EModifiedModule  eModifiedModule, bool boSet = true);
+    bool IsLevelExported() const;
+    bool SetLevelExported(bool boExported = true);
+    void InitFinished();
+    bool IsModified();
+    bool IsInitialized() const{ return m_bInitialized; }
+    bool SaveDocument();
+    ISystem*    GetSystem();
+    void WriteToConsole(const char* string) { CLogFile::WriteLine(string); };
+    void WriteToConsole(const QString& string) { CLogFile::WriteLine(string); };
+    // Change the message in the status bar
+    void SetStatusText(const QString& pszString);
+    virtual IMainStatusBar* GetMainStatusBar() override;
+    bool ShowConsole([[maybe_unused]] bool show)
+    {
+        //if (AfxGetMainWnd())return ((CMainFrame *) (AfxGetMainWnd()))->ShowConsole(show);
+        return false;
+    }
+
+    void SetConsoleVar(const char* var, float value);
+    float GetConsoleVar(const char* var);
+    //! Query main window of the editor
+    QMainWindow* GetEditorMainWindow() const override
+    {
+        return MainWindow::instance();
+    };
+
+    QString GetPrimaryCDFolder();
+    QString GetLevelName() override;
+    QString GetLevelFolder();
+    QString GetLevelDataFolder();
+    QString GetSearchPath(EEditorPathName path);
+    QString GetResolvedUserFolder();
+    bool ExecuteConsoleApp(const QString& CommandLine, QString& OutputText, bool bNoTimeOut = false, bool bShowWindow = false);
+    virtual bool IsInGameMode() override;
+    virtual void SetInGameMode(bool inGame) override;
+    virtual bool IsInSimulationMode() override;
+    virtual bool IsInTestMode() override;
+    virtual bool IsInPreviewMode() override;
+    virtual bool IsInConsolewMode() override;
+    virtual bool IsInLevelLoadTestMode() override;
+    virtual bool IsInMatEditMode() override { return m_bMatEditMode; }
+
+    //! Enables/Disable updates of editor.
+    void EnableUpdate(bool enable) { m_bUpdates = enable; };
+    //! Enable/Disable accelerator table, (Enabled by default).
+    void EnableAcceleratos(bool bEnable);
+    CGameEngine* GetGameEngine() { return m_pGameEngine; };
+    CDisplaySettings*   GetDisplaySettings() { return m_pDisplaySettings; };
+    const SGizmoParameters& GetGlobalGizmoParameters();
+    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);
+    void DeleteObject(CBaseObject* obj);
+    CBaseObject* CloneObject(CBaseObject* obj);
+    IObjectManager* GetObjectManager();
+    // This will return a null pointer if CrySystem is not loaded before
+    // Global Sandbox Settings are loaded from the registry before CrySystem
+    // At that stage GetSettingsManager will return null and xml node in
+    // memory will not be populated with Sandbox Settings.
+    // After m_IEditor is created and CrySystem loaded, it is possible
+    // to feed memory node with all necessary data needed for export
+    // (gSettings.Load() and CXTPDockingPaneManager/CXTPDockingPaneLayout Sandbox layout management)
+    CSettingsManager* GetSettingsManager();
+    CSelectionGroup*    GetSelection();
+    int ClearSelection();
+    CBaseObject* GetSelectedObject();
+    void SelectObject(CBaseObject* obj);
+    void LockSelection(bool bLock);
+    bool IsSelectionLocked();
+
+    IDataBaseManager* GetDBItemManager(EDataBaseItemType itemType);
+    CMusicManager* GetMusicManager() { return m_pMusicManager; };
+
+    IEditorFileMonitor* GetFileMonitor() override;
+    void RegisterEventLoopHook(IEventLoopHook* pHook) override;
+    void UnregisterEventLoopHook(IEventLoopHook* pHook) override;
+    IIconManager* GetIconManager();
+    float GetTerrainElevation(float x, float y);
+    Editor::EditorQtApplication* GetEditorQtApplication() { return m_QtApplication; }
+    const QColor& GetColorByName(const QString& name) override;
+
+    //////////////////////////////////////////////////////////////////////////
+    IMovieSystem* GetMovieSystem()
+    {
+        if (m_pSystem)
+        {
+            return m_pSystem->GetIMovieSystem();
+        }
+        return NULL;
+    };
+
+    CPluginManager* GetPluginManager() { return m_pPluginManager; }
+    CViewManager* GetViewManager();
+    CViewport* GetActiveView();
+    void SetActiveView(CViewport* viewport);
+
+    CLevelIndependentFileMan* GetLevelIndependentFileMan() { return m_pLevelIndependentFileMan; }
+
+    void UpdateViews(int flags, const AABB* updateRegion);
+    void ResetViews();
+    void ReloadTrackView();
+    Vec3 GetMarkerPosition() { return m_marker; };
+    void SetMarkerPosition(const Vec3& pos) { m_marker = pos; };
+    void    SetSelectedRegion(const AABB& box);
+    void    GetSelectedRegion(AABB& box);
+    bool AddToolbarItem(uint8 iId, IUIEvent* pIHandler);
+    void SetDataModified();
+    void SetOperationMode(EOperationMode mode);
+    EOperationMode GetOperationMode();
+
+    ITransformManipulator* ShowTransformManipulator(bool bShow);
+    ITransformManipulator* GetTransformManipulator();
+    void SetAxisConstraints(AxisConstrains axis);
+    AxisConstrains GetAxisConstrains();
+    void SetAxisVectorLock(bool bAxisVectorLock) { m_bAxisVectorLock = bAxisVectorLock; }
+    bool IsAxisVectorLocked() { return m_bAxisVectorLock; }
+    void SetTerrainAxisIgnoreObjects(bool bIgnore);
+    bool IsTerrainAxisIgnoreObjects();
+    void SetReferenceCoordSys(RefCoordSys refCoords);
+    RefCoordSys GetReferenceCoordSys();
+    XmlNodeRef FindTemplate(const QString& templateName);
+    void AddTemplate(const QString& templateName, XmlNodeRef& tmpl);
+   
+    const QtViewPane* OpenView(QString sViewClassName, bool reuseOpened = true) override;
+
+    /**
+     * Returns the top level widget which is showing the view pane with the specified name.
+     * To access the child widget which actually implements the view pane use this instead:
+     * QtViewPaneManager::FindViewPane<MyDialog>(name);
+     */
+    QWidget* FindView(QString viewClassName) override;
+
+    bool CloseView(const char* sViewClassName);
+    bool SetViewFocus(const char* sViewClassName);
+
+    virtual QWidget* OpenWinWidget(WinWidgetId openId) override;
+    virtual WinWidget::WinWidgetManager* GetWinWidgetManager() const override;
+
+    // close ALL panels related to classId, used when unloading plugins.
+    void CloseView(const GUID& classId);
+    bool SelectColor(QColor &color, QWidget *parent = 0) override;
+    void Update();
+    SFileVersion GetFileVersion() { return m_fileVersion; };
+    SFileVersion GetProductVersion() { return m_productVersion; };
+    //! Get shader enumerator.
+    CUndoManager* GetUndoManager() { return m_pUndoManager; };
+    void BeginUndo();
+    void RestoreUndo(bool undo);
+    void AcceptUndo(const QString& name);
+    void CancelUndo();
+    void SuperBeginUndo();
+    void SuperAcceptUndo(const QString& name);
+    void SuperCancelUndo();
+    void SuspendUndo();
+    void ResumeUndo();
+    void Undo();
+    void Redo();
+    bool IsUndoRecording();
+    bool IsUndoSuspended();
+    void RecordUndo(IUndoObject* obj);
+    bool FlushUndo(bool isShowMessage = false);
+    bool ClearLastUndoSteps(int steps);
+    bool ClearRedoStack();
+    //! Retrieve current animation context.
+    CAnimationContext* GetAnimation();
+    CTrackViewSequenceManager* GetSequenceManager() override;
+    ITrackViewSequenceManager* GetSequenceManagerInterface() override;
+
+    CToolBoxManager* GetToolBoxManager() { return m_pToolBoxManager; };
+    IErrorReport* GetErrorReport() { return m_pErrorReport; }
+    IErrorReport* GetLastLoadedLevelErrorReport() { return m_pLasLoadedLevelErrorReport; }
+    void StartLevelErrorReportRecording() override;
+    void CommitLevelErrorReport() {SAFE_DELETE(m_pLasLoadedLevelErrorReport); m_pLasLoadedLevelErrorReport = new CErrorReport(*m_pErrorReport); }
+    virtual IFileUtil* GetFileUtil() override { return m_pFileUtil;  }
+    void Notify(EEditorNotifyEvent event);
+    void NotifyExcept(EEditorNotifyEvent event, IEditorNotifyListener* listener);
+    void RegisterNotifyListener(IEditorNotifyListener* listener);
+    void UnregisterNotifyListener(IEditorNotifyListener* listener);
+    //! Register document notifications listener.
+    void RegisterDocListener(IDocListener* listener);
+    //! Unregister document notifications listener.
+    void UnregisterDocListener(IDocListener* listener);
+    //! Retrieve interface to the source control.
+    ISourceControl* GetSourceControl();
+    //! Retrieve true if source control is provided and enabled in settings
+    bool IsSourceControlAvailable() override;
+    //! Only returns true if source control is both available AND currently connected and functioning
+    bool IsSourceControlConnected() override;
+    //! Setup Material Editor mode
+    void SetMatEditMode(bool bIsMatEditMode);
+    CUIEnumsDatabase* GetUIEnumsDatabase() { return m_pUIEnumsDatabase; };
+    void AddUIEnums();
+    void GetMemoryUsage(ICrySizer* pSizer);
+    void ReduceMemory();
+    // Get Export manager
+    IExportManager* GetExportManager();
+    // Set current configuration spec of the editor.
+    void SetEditorConfigSpec(ESystemConfigSpec spec, ESystemConfigPlatform platform);
+    ESystemConfigSpec GetEditorConfigSpec() const;
+    ESystemConfigPlatform GetEditorConfigPlatform() const;
+    void ReloadTemplates();
+    void AddErrorMessage(const QString& text, const QString& caption);
+    IResourceSelectorHost* GetResourceSelectorHost() { return m_pResourceSelectorHost.get(); }
+    virtual void ShowStatusText(bool bEnable);
+
+    void OnObjectContextMenuOpened(QMenu* pMenu, const CBaseObject* pObject);
+    virtual void RegisterObjectContextMenuExtension(TContextMenuExtensionFunc func) override;
+
+    virtual SSystemGlobalEnvironment* GetEnv() override;
+    virtual IBaseLibraryManager* GetMaterialManagerLibrary() override; // Vladimir@Conffx
+    virtual IEditorMaterialManager* GetIEditorMaterialManager() override; // Vladimir@Conffx
+    virtual IImageUtil* GetImageUtil() override;  // Vladimir@conffx
+    virtual SEditorSettings* GetEditorSettings() override;
+    virtual IEditorPanelUtils* GetEditorPanelUtils() override;
+    virtual ILogFile* GetLogFile() override { return m_pLogFile; }
+
+    void UnloadPlugins() override;
+    void LoadPlugins() override;
+
+    QMimeData* CreateQMimeData() const override;
+    void DestroyQMimeData(QMimeData* data) const override;
+
+protected:
+
+    AZStd::string LoadProjectIdFromProjectData();
+
+    void DetectVersion();
+    void RegisterTools();
+    void SetPrimaryCDFolder();
+
+    //! List of all notify listeners.
+    std::list<IEditorNotifyListener*> m_listeners;
+
+    EOperationMode m_operationMode;
+    ISystem* m_pSystem;
+    IFileUtil* m_pFileUtil;
+    CClassFactory* m_pClassFactory;
+    CEditorCommandManager* m_pCommandManager;
+    CObjectManager* m_pObjectManager;
+    CPluginManager* m_pPluginManager;
+    CViewManager*   m_pViewManager;
+    CUndoManager* m_pUndoManager;
+    Vec3 m_marker;
+    AABB m_selectedRegion;
+    AxisConstrains m_selectedAxis;
+    RefCoordSys m_refCoordsSys;
+    bool m_bAxisVectorLock;
+    bool m_bUpdates;
+    bool m_bTerrainAxisIgnoreObjects;
+    SFileVersion m_fileVersion;
+    SFileVersion m_productVersion;
+    CXmlTemplateRegistry m_templateRegistry;
+    CDisplaySettings* m_pDisplaySettings;
+    CIconManager* m_pIconManager;
+    std::unique_ptr<SGizmoParameters> m_pGizmoParameters;
+    QString m_primaryCDFolder;
+    QString m_userFolder;
+    bool m_bSelectionLocked;
+    class CAxisGizmo* m_pAxisGizmo;
+    CGameEngine* m_pGameEngine;
+    CAnimationContext* m_pAnimationContext;
+    CTrackViewSequenceManager* m_pSequenceManager;
+    CToolBoxManager* m_pToolBoxManager;
+    CMusicManager* m_pMusicManager;
+    CErrorReport* m_pErrorReport;
+    //! Contains the error reports for the last loaded level.
+    CErrorReport* m_pLasLoadedLevelErrorReport;
+    //! Global instance of error report class.
+    CErrorsDlg* m_pErrorsDlg;
+    //! Source control interface.
+    ISourceControl* m_pSourceControl;
+    IEditorPanelUtils* m_panelEditorUtils;
+
+    CSelectionTreeManager* m_pSelectionTreeManager;
+
+    CUIEnumsDatabase* m_pUIEnumsDatabase;
+    //! CConsole Synchronization
+    CConsoleSynchronization* m_pConsoleSync;
+    //! Editor Settings Manager
+    CSettingsManager* m_pSettingsManager;
+
+    CLevelIndependentFileMan* m_pLevelIndependentFileMan;
+
+    //! Export manager for exporting objects and a terrain from the game to DCC tools
+    CExportManager* m_pExportManager;
+    std::unique_ptr<CEditorFileMonitor> m_pEditorFileMonitor;
+    std::unique_ptr<IResourceSelectorHost> m_pResourceSelectorHost;
+    QString m_selectFileBuffer;
+    QString m_levelNameBuffer;
+
+    IAWSResourceManager* m_awsResourceManager;
+    std::unique_ptr<WinWidget::WinWidgetManager> m_winWidgetManager;
+
+    //! True if the editor is in material edit mode. Fast preview of materials.
+    //! In this mode only very limited functionality is available.
+    bool m_bMatEditMode;
+    bool m_bShowStatusText;
+    bool m_bInitialized;
+    bool m_bExiting;
+    static void CmdPy(IConsoleCmdArgs* pArgs);
+
+    std::vector<TContextMenuExtensionFunc> m_objectContextMenuExtensions;
+
+    Editor::EditorQtApplication* const m_QtApplication = nullptr;
+
+    // This has to be absolute for the namespace since there is also a class called AssetDatabase that causes issues in unity builds
+    ::AssetDatabase::AssetDatabaseLocationListener* m_pAssetDatabaseLocationListener;
+    AzAssetBrowserRequestHandler* m_pAssetBrowserRequestHandler;
+    AssetEditorRequestsHandler* m_assetEditorRequestsHandler;
+
+    IImageUtil* m_pImageUtil;  // Vladimir@conffx
+    ILogFile* m_pLogFile;  // Vladimir@conffx
+
+    CryMutex m_pluginMutex; // protect any pointers that come from plugins, such as the source control cached pointer.
+    static const char* m_crashLogFileName;
+};
+
diff --git a/Code/Editor/IEditorPanelUtils.h b/Code/Editor/IEditorPanelUtils.h
new file mode 100644
index 0000000000..20ef2d3ee8
--- /dev/null
+++ b/Code/Editor/IEditorPanelUtils.h
@@ -0,0 +1,130 @@
+/*
+ * 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_CRYEDITOR_IPANELEDITORUTILS_H
+#define CRYINCLUDE_CRYEDITOR_IPANELEDITORUTILS_H
+#pragma once
+
+#include "Cry_Vector3.h"
+
+#include "DisplaySettings.h"
+#include "Include/IDisplayViewport.h"
+#include "Include/IIconManager.h"
+#include <qstringlist.h>
+#include <qkeysequence.h>
+#include <qevent.h>
+#include <QShortcutEvent>
+
+class CBaseObject;
+class CViewport;
+class IQToolTip;
+
+struct HotKey
+{
+    HotKey()
+        : path("")
+        , sequence(QKeySequence())
+    {
+    }
+    void CopyFrom(const HotKey& other)
+    {
+        path = other.path;
+        sequence = other.sequence;
+    }
+    void SetPath(const char* _path)
+    {
+        path = QString(_path);
+    }
+    void SetSequenceFromString(const char* _sequence)
+    {
+        sequence = QKeySequence::fromString(_sequence);
+    }
+    void SetSequence(const QKeySequence& other)
+    {
+        sequence = other;
+    }
+    bool IsMatch(QString _path)
+    {
+        return path.compare(_path, Qt::CaseInsensitive) == 0;
+    }
+    bool IsMatch(QKeySequence _sequence)
+    {
+        return sequence.matches(_sequence);
+    }
+    bool operator < (const HotKey& other) const
+    {
+        //split the paths into lists compare per level
+        QStringList m_categories = path.split('.');
+        QStringList o_categories = other.path.split('.');
+        int m_catSize = m_categories.size();
+        int o_catSize = o_categories.size();
+        int size = (m_catSize < o_catSize) ? m_catSize : o_catSize;
+
+        //sort categories to keep them together
+        for (unsigned int i = 0; i < size; i++)
+        {
+            if (m_categories[i] < o_categories[i])
+            {
+                return true;
+            }
+            if (m_categories[i] > o_categories[i])
+            {
+                return false;
+            }
+        }
+        //if comparing a category and a item in that category the category is < item
+        return m_catSize > o_catSize;
+    }
+    QKeySequence sequence;
+    QString path;
+};
+
+struct IEditorPanelUtils
+{
+    virtual ~IEditorPanelUtils() {}
+    virtual void SetViewportDragOperation(void(*)(CViewport* viewport, int dragPointX, int dragPointY, void* custom), void* custom) = 0;
+
+    //PREVIEW WINDOW UTILS////////////////////////////////////////////////////
+    virtual int PreviewWindow_GetDisplaySettingsDebugFlags(CDisplaySettings* settings) = 0;
+    virtual void PreviewWindow_SetDisplaySettingsDebugFlags(CDisplaySettings* settings, int flags) = 0;
+
+    //HOTKEY UTILS////////////////////////////////////////////////////////////
+    virtual bool HotKey_Import() = 0;
+    virtual void HotKey_Export() = 0;
+    virtual QKeySequence HotKey_GetShortcut(const char* path) = 0;
+    virtual bool HotKey_IsPressed(const QKeyEvent* event, const char* path) = 0;
+    virtual bool HotKey_IsPressed(const QShortcutEvent* event, const char* path) = 0;
+    virtual bool HotKey_LoadExisting() = 0;
+    virtual void HotKey_SaveCurrent() = 0;
+    virtual void HotKey_BuildDefaults() = 0;
+    virtual void HotKey_SetKeys(QVector<HotKey> keys) = 0;
+    virtual QVector<HotKey> HotKey_GetKeys() = 0;
+    virtual QString HotKey_GetPressedHotkey(const QKeyEvent* event) = 0;
+    virtual QString HotKey_GetPressedHotkey(const QShortcutEvent* event) = 0;
+    virtual void HotKey_SetEnabled(bool val) = 0;
+    virtual bool HotKey_IsEnabled() const = 0;
+
+    //TOOLTIP UTILS///////////////////////////////////////////////////////////
+    
+    //! Loads a table of tooltip configuration data from an xml file.
+    virtual void ToolTip_LoadConfigXML(QString filepath) = 0;
+    
+    //! Initializes a QToolTipWidget from loaded configuration data (see ToolTip_LoadConfigXML())
+    //! \param tooltip       Will be initialized using loaded configuration data
+    //! \param path          Variable serialization path. Will be used as the key for looking up data in the configuration table. (ex: "Rotation.Rotation_Rate_X")
+    //! \param option        Name of a sub-option of the variable specified by "path". (ex: "Emitter_Strength" will look up the tooltip data for "Rotation.Rotation_Rate_X.Emitter_Strength")
+    //! \param optionalData  The argument to be used with "special_content" feature. See ToolTip_GetSpecialContentType() and QToolTipWidget::AddSpecialContent().
+    //! \param isEnabled     If false, the tooltip will indicate the reason why the widget is disabled.
+    virtual void ToolTip_BuildFromConfig(IQToolTip* tooltip, QString path, QString option, QString optionalData = "", bool isEnabled = true) = 0;
+    
+    virtual QString ToolTip_GetTitle(QString path, QString option = "") = 0;
+    virtual QString ToolTip_GetContent(QString path, QString option = "") = 0;
+    virtual QString ToolTip_GetSpecialContentType(QString path, QString option = "") = 0;
+    virtual QString ToolTip_GetDisabledContent(QString path, QString option = "") = 0;
+};
+
+
+#endif
diff --git a/Code/Editor/IObservable.h b/Code/Editor/IObservable.h
new file mode 100644
index 0000000000..2e3d7c8c69
--- /dev/null
+++ b/Code/Editor/IObservable.h
@@ -0,0 +1,19 @@
+/*
+ * 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_IOBSERVABLE_H
+#define CRYINCLUDE_EDITOR_IOBSERVABLE_H
+#pragma once
+
+//! Observable macro to be used in pure interfaces
+#define DEFINE_OBSERVABLE_PURE_METHODS(observerClassName)               \
+    virtual bool RegisterObserver(observerClassName * pObserver) = 0;   \
+    virtual bool UnregisterObserver(observerClassName * pObserver) = 0; \
+    virtual void UnregisterAllObservers() = 0;
+
+#endif // CRYINCLUDE_EDITOR_IOBSERVABLE_H
diff --git a/Code/Editor/IPostRenderer.h b/Code/Editor/IPostRenderer.h
new file mode 100644
index 0000000000..353b662f0d
--- /dev/null
+++ b/Code/Editor/IPostRenderer.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_IPOSTRENDERER_H
+#define CRYINCLUDE_EDITOR_IPOSTRENDERER_H
+#pragma once
+
+
+class IPostRenderer
+{
+public:
+    IPostRenderer()
+        : m_refCount(0){}
+
+    virtual void OnPostRender() const = 0;
+
+    void AddRef() { m_refCount++; }
+    void Release()
+    {
+        if (--m_refCount <= 0)
+        {
+            delete this;
+        }
+    }
+
+protected:
+    virtual ~IPostRenderer(){}
+
+    int m_refCount;
+};
+
+#endif // CRYINCLUDE_EDITOR_IPOSTRENDERER_H
diff --git a/Code/Sandbox/Editor/IconListDialog.ui b/Code/Editor/IconListDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/IconListDialog.ui
rename to Code/Editor/IconListDialog.ui
diff --git a/Code/Editor/IconManager.cpp b/Code/Editor/IconManager.cpp
new file mode 100644
index 0000000000..a1cb587f00
--- /dev/null
+++ b/Code/Editor/IconManager.cpp
@@ -0,0 +1,255 @@
+/*
+ * 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 "IconManager.h"
+
+#include <AzCore/Interface/Interface.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+
+// Editor
+#include "Settings.h"
+#include "Util/Image.h"
+#include "Util/ImageUtil.h"
+
+#include <IStatObj.h>
+
+#define HELPER_MATERIAL "Objects/Helper"
+
+namespace
+{
+    // Object names in this array must correspond to EObject enumeration.
+    const char* g_ObjectNames[eStatObject_COUNT] =
+    {
+        "Objects/Arrow.cgf",
+        "Objects/Axis.cgf",
+        "Objects/Sphere.cgf",
+        "Objects/Anchor.cgf",
+        "Objects/entrypoint.cgf",
+        "Objects/hidepoint.cgf",
+        "Objects/hidepoint_sec.cgf",
+        "Objects/reinforcement_point.cgf",
+    };
+
+    const char* g_IconNames[eIcon_COUNT] =
+    {
+        "Icons/ScaleWarning.png",
+        "Icons/RotationWarning.png",
+    };
+};
+
+//////////////////////////////////////////////////////////////////////////
+CIconManager::CIconManager()
+{
+    ZeroStruct(m_icons);
+    ZeroStruct(m_objects);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CIconManager::~CIconManager()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CIconManager::Init()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CIconManager::Done()
+{
+    Reset();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CIconManager::Reset()
+{
+    // Do not unload objects. but clears them.
+    int i;
+    for (i = 0; i < sizeof(m_objects) / sizeof(m_objects[0]); i++)
+    {
+        if (m_objects[i])
+        {
+            m_objects[i]->Release();
+        }
+        m_objects[i] = 0;
+    }
+    for (i = 0; i < eIcon_COUNT; i++)
+    {
+        m_icons[i] = 0;
+    }
+
+    // Free icon bitmaps.
+    for (IconsMap::iterator it = m_iconBitmapsMap.begin(); it != m_iconBitmapsMap.end(); ++it)
+    {
+        delete it->second;
+    }
+    m_iconBitmapsMap.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CIconManager::GetIconTexture(const char* iconName)
+{
+    int id = 0;
+    if (m_textures.Find(iconName, id))
+    {
+        return id;
+    }
+
+    if ((!iconName) || (iconName[0] == 0))
+    {
+        return 0;
+    }
+
+    return id;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CIconManager::GetIconTexture(EIcon icon)
+{
+    assert(icon >= 0 && icon < eIcon_COUNT);
+    if (m_icons[icon])
+    {
+        return m_icons[icon];
+    }
+
+    m_icons[icon] = GetIconTexture(g_IconNames[icon]);
+    return m_icons[icon];
+}
+
+//////////////////////////////////////////////////////////////////////////
+IStatObj*   CIconManager::GetObject(EStatObject)
+{
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QImage* CIconManager::GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects /*=0*/)
+{
+    QImage* pBitmap = 0;
+
+    QString iconFilename = filename;
+
+    if (Path::GetPath(iconFilename).isEmpty())
+    {
+        QString iconsPath;
+        if (!gSettings.searchPaths[EDITOR_PATH_UI_ICONS].empty())
+        {
+            iconsPath = gSettings.searchPaths[EDITOR_PATH_UI_ICONS][0];
+        }
+        iconFilename = Path::Make(iconsPath, iconFilename);
+    }
+
+    if (Path::GetExt(iconFilename).isEmpty())
+    {
+        // By default add .bmp extension to the filename without extension.
+        pBitmap = GetIconBitmap((iconFilename + ".png").toUtf8().data(), bHaveAlpha);
+        if (!pBitmap)
+        {
+            pBitmap = GetIconBitmap((iconFilename + ".bmp").toUtf8().data(), bHaveAlpha);
+        }
+        return pBitmap;
+    }
+
+    BOOL bAlphaBitmap = FALSE;
+    QPixmap pm(iconFilename);
+    bAlphaBitmap = pm.hasAlpha();
+
+    bHaveAlpha = (bAlphaBitmap == TRUE);
+    if (!pm.isNull())
+    {
+        pBitmap = new QImage;
+        *pBitmap = pm.toImage();
+        m_iconBitmapsMap[filename] = pBitmap;
+
+        // apply image effects
+        if (bAlphaBitmap)
+        {
+            const DWORD dataSize = pm.width() * pm.height() * 4;
+            BYTE* pImage = pBitmap->bits();
+
+              if (effects & eIconEffect_ColorEnabled)
+            {
+                for (DWORD i = 0; i < dataSize; i += 4)
+                {
+                    pImage[i + 0] = (BYTE)((DWORD)pImage[i + 0] * 109 / 255);
+                    pImage[i + 1] = (BYTE)((DWORD)pImage[i + 1] * 97 / 255);
+                    pImage[i + 2] = (BYTE)((DWORD)pImage[i + 2] * 89 / 255);
+                }
+            }
+
+            if (effects & eIconEffect_ColorDisabled)
+            {
+                for (DWORD i = 0; i < dataSize; i += 4)
+                {
+                    pImage[i + 0] = (BYTE)((DWORD)pImage[i + 0] * 168 / 255);
+                    pImage[i + 1] = (BYTE)((DWORD)pImage[i + 1] * 164 / 255);
+                    pImage[i + 2] = (BYTE)((DWORD)pImage[i + 2] * 162 / 255);
+                }
+            }
+
+            if (effects & eIconEffect_Dim)
+            {
+                for (DWORD i = 0; i < dataSize; i += 4)
+                {
+                    pImage[i + 0] /= 2;
+                    pImage[i + 1] /= 2;
+                    pImage[i + 2] /= 2;
+                }
+            }
+
+            if (effects & eIconEffect_HalfAlpha)
+            {
+                for (DWORD i = 0; i < dataSize; i += 4)
+                {
+                    pImage[i + 3] /= 2;
+                }
+            }
+
+            if (effects & eIconEffect_TintGreen)
+            {
+                for (DWORD i = 0; i < dataSize; i += 4)
+                {
+                    pImage[i + 0] /= 2;
+                    pImage[i + 2] /= 2;
+                }
+            }
+
+            if (effects & eIconEffect_TintRed)
+            {
+                for (DWORD i = 0; i < dataSize; i += 4)
+                {
+                    pImage[i + 0] /= 2;
+                    pImage[i + 1] /= 2;
+                }
+            }
+
+            if (effects & eIconEffect_TintYellow)
+            {
+                for (DWORD i = 0; i < dataSize; i += 4)
+                {
+                    pImage[i + 0] /= 2;
+                }
+            }
+
+            // alpha premultiply
+            for (DWORD i = 0; i < dataSize; i += 4)
+            {
+                pImage[i + 0] = ((DWORD)pImage[i + 0] * (DWORD)pImage[i + 3]) / 255;
+                pImage[i + 1] = ((DWORD)pImage[i + 1] * (DWORD)pImage[i + 3]) / 255;
+                pImage[i + 2] = ((DWORD)pImage[i + 2] * (DWORD)pImage[i + 3]) / 255;
+            }
+        }
+
+        return pBitmap;
+    }
+    return NULL;
+}
diff --git a/Code/Editor/IconManager.h b/Code/Editor/IconManager.h
new file mode 100644
index 0000000000..40e1ef8aa9
--- /dev/null
+++ b/Code/Editor/IconManager.h
@@ -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
+ *
+ */
+
+
+// Description : Manages Textures used by Icon.
+
+
+#ifndef CRYINCLUDE_EDITOR_ICONMANAGER_H
+#define CRYINCLUDE_EDITOR_ICONMANAGER_H
+
+#pragma once
+
+struct IStatObj;
+struct IMaterial;
+
+#include "Include/IIconManager.h"   // for IIconManager
+#include "IEditor.h"                // for IDocListener
+
+/*!
+ *  CIconManager contains map of icon names to icon textures,
+ *  Ensuring that only one instance of texture for specified icon will be allocated.
+ *  Also release textures when editor exit.
+ *
+ */
+class CIconManager
+    : public IIconManager
+    , public IDocListener
+{
+public:
+    // Construction
+    CIconManager();
+    ~CIconManager();
+
+    void Init();
+    void Done();
+
+    // Unload all loaded resources.
+    void Reset();
+
+    // Operations
+    virtual int GetIconTexture(EIcon icon);
+
+    virtual IStatObj*   GetObject(EStatObject object);
+    virtual int GetIconTexture(const char* iconName);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Icon bitmaps.
+    //////////////////////////////////////////////////////////////////////////
+    virtual QImage* GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects = 0);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Implementation of IDocListener.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void OnNewDocument() { Reset(); };
+    virtual void OnLoadDocument() { Reset(); };
+    virtual void OnCloseDocument() { Reset(); };
+    //////////////////////////////////////////////////////////////////////////
+
+private:
+    StdMap<QString, int> m_textures;
+
+    IStatObj*   m_objects[eStatObject_COUNT];
+    int m_icons[eIcon_COUNT];
+
+    //////////////////////////////////////////////////////////////////////////
+    // Icons bitmaps.
+    //////////////////////////////////////////////////////////////////////////
+    typedef std::map<QString, QImage*> IconsMap;
+    IconsMap m_iconBitmapsMap;
+};
+
+#endif // CRYINCLUDE_EDITOR_ICONMANAGER_H
diff --git a/Code/Editor/Include/Command.h b/Code/Editor/Include/Command.h
new file mode 100644
index 0000000000..fe30c56aa3
--- /dev/null
+++ b/Code/Editor/Include/Command.h
@@ -0,0 +1,791 @@
+/*
+ * 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 : Classes to deal with commands
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_COMMAND_H
+#define CRYINCLUDE_EDITOR_INCLUDE_COMMAND_H
+#pragma once
+
+#include <QString>
+
+#include "Util/EditorUtils.h"
+
+inline string ToString(const QString& s)
+{
+    return s.toUtf8().data();
+}
+
+class CCommand
+{
+public:
+    CCommand(
+        const string& module,
+        const string& name,
+        const string& description,
+        const string& example)
+        : m_module(module)
+        , m_name(name)
+        , m_description(description)
+        , m_example(example)
+        , m_bAlsoAvailableInScripting(false)
+    {}
+
+    virtual ~CCommand()
+    {}
+
+    // Class for storing function parameters as a type-erased string
+    struct CArgs
+    {
+    public:
+        CArgs()
+            : m_stringFlags(0)
+        {}
+
+        template <typename T>
+        void Add(T p)
+        {
+            assert(m_args.size() < 8 * sizeof(m_stringFlags));
+            m_args.push_back(ToString(p));
+        }
+        void Add(const char* p)
+        {
+            assert(m_args.size() < 8 * sizeof(m_stringFlags));
+            m_stringFlags |= 1 << m_args.size();
+            m_args.push_back(p);
+        }
+        bool IsStringArg(int i) const
+        {
+            if (i < 0 || i >= GetArgCount())
+            {
+                return false;
+            }
+
+            if (m_stringFlags & (1 << i))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        int GetArgCount() const
+        { return m_args.size(); }
+        const string& GetArg(int i) const
+        {
+            assert(0 <= i && i < GetArgCount());
+            return m_args[i];
+        }
+    private:
+        DynArray<string> m_args;
+        unsigned char m_stringFlags;    // This is needed to quote string parameters when logging a command.
+    };
+
+    const string& GetName() const { return m_name; }
+    const string& GetModule() const { return m_module; }
+    const string& GetDescription() const { return m_description; }
+    const string& GetExample() const { return m_example; }
+
+    void SetAvailableInScripting() { m_bAlsoAvailableInScripting = true; };
+    bool IsAvailableInScripting() const { return m_bAlsoAvailableInScripting; }
+
+    virtual QString Execute(const CArgs& args) = 0;
+
+    // Only a command without any arguments and return value can be a UI command.
+    virtual bool CanBeUICommand() const { return false; }
+
+protected:
+    friend class CEditorCommandManager;
+    string m_module;
+    string m_name;
+    string m_description;
+    string m_example;
+    bool m_bAlsoAvailableInScripting;
+
+    template <typename T>
+    static string ToString_(T t) { return ::ToString(t); }
+    static inline string ToString_(const char* val)
+    { return val; }
+    template <typename T>
+    static bool FromString_(T& t, const char* s) { return ::FromString(t, s); }
+    static inline bool FromString_(const char*& val, const char* s)
+    { return (val = s) != 0; }
+
+    void PrintHelp()
+    {
+        CryLogAlways("%s.%s:", m_module.c_str(), m_name.c_str());
+        if (m_description.length() > 0)
+        {
+            CryLogAlways("    %s", m_description.c_str());
+        }
+        if (m_example.length() > 0)
+        {
+            CryLogAlways("    Usage:  %s", m_example.c_str());
+        }
+    }
+};
+
+class CCommand0
+    : public CCommand
+{
+public:
+    CCommand0(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<void()>& functor)
+        : CCommand(module, name, description, example)
+        , m_functor(functor) {}
+
+    // UI metadata for this command, if any
+    struct SUIInfo
+    {
+        string caption;
+        string tooltip;
+        string description;
+        string iconFilename;
+        int iconIndex;
+        int commandId; // Windows command id
+
+        SUIInfo()
+            : iconIndex(0)
+            , commandId(0) {}
+    };
+
+    inline QString Execute([[maybe_unused]] const CArgs& args)
+    {
+        assert(args.GetArgCount() == 0);
+
+        m_functor();
+        return "";
+    }
+    const SUIInfo& GetUIInfo() const { return m_uiInfo; }
+    virtual bool CanBeUICommand() const { return true; }
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<void()> m_functor;
+    SUIInfo m_uiInfo;
+};
+
+template <typename RT>
+class CCommand0wRet
+    : public CCommand
+{
+public:
+    CCommand0wRet(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<RT()>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<RT()> m_functor;
+};
+
+template <LIST(1, typename P)>
+class CCommand1
+    : public CCommand
+{
+public:
+    CCommand1(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<void(LIST(1, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<void(LIST(1, P))> m_functor;
+};
+
+template <LIST(1, typename P), typename RT>
+class CCommand1wRet
+    : public CCommand
+{
+public:
+    CCommand1wRet(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<RT(LIST(1, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<RT(LIST(1, P))> m_functor;
+};
+
+template <LIST(2, typename P)>
+class CCommand2
+    : public CCommand
+{
+public:
+    CCommand2(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<void(LIST(2, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<void(LIST(2, P))> m_functor;
+};
+
+template <LIST(2, typename P), typename RT>
+class CCommand2wRet
+    : public CCommand
+{
+public:
+    CCommand2wRet(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<RT(LIST(2, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<RT(LIST(2, P))> m_functor;
+};
+
+template <LIST(3, typename P)>
+class CCommand3
+    : public CCommand
+{
+public:
+    CCommand3(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<void(LIST(3, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<void(LIST(3, P))> m_functor;
+};
+
+template <LIST(3, typename P), typename RT>
+class CCommand3wRet
+    : public CCommand
+{
+public:
+    CCommand3wRet(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<RT(LIST(3, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<RT(LIST(3, P))> m_functor;
+};
+
+template <LIST(4, typename P)>
+class CCommand4
+    : public CCommand
+{
+public:
+    CCommand4(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<void(LIST(4, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<void(LIST(4, P))> m_functor;
+};
+
+template <LIST(4, typename P), typename RT>
+class CCommand4wRet
+    : public CCommand
+{
+public:
+    CCommand4wRet(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<RT(LIST(4, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<RT(LIST(4, P))> m_functor;
+};
+
+template <LIST(5, typename P)>
+class CCommand5
+    : public CCommand
+{
+public:
+    CCommand5(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<void(LIST(5, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<void(LIST(5, P))> m_functor;
+};
+
+template <LIST(6, typename P)>
+class CCommand6
+    : public CCommand
+{
+public:
+    CCommand6(const string& module, const string& name,
+        const string& description, const string& example,
+        const AZStd::function<void(LIST(6, P))>& functor);
+
+    QString Execute(const CArgs& args);
+
+protected:
+    friend class CEditorCommandManager;
+    AZStd::function<void(LIST(6, P))> m_functor;
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+template <typename RT>
+CCommand0wRet<RT>::CCommand0wRet(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<RT()>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <typename RT>
+QString CCommand0wRet<RT>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 0);
+
+    RT ret = m_functor();
+    return ToString_(ret).c_str();
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(1, typename P)>
+CCommand1<LIST(1, P)>::CCommand1(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<void(LIST(1, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(1, typename P)>
+QString CCommand1<LIST(1, P)>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 1);
+    if (args.GetArgCount() < 1)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! One argument required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    bool ok = FromString_(p1, args.GetArg(0).c_str());
+    if (ok)
+    {
+        m_functor(p1);
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s)! Invalid argument type.",
+            m_module, m_name, args.GetArg(0).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(1, typename P), typename RT>
+CCommand1wRet<LIST(1, P), RT>::CCommand1wRet(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<RT(LIST(1, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(1, typename P), typename RT>
+QString CCommand1wRet<LIST(1, P), RT>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 1);
+    if (args.GetArgCount() < 1)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! One argument required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    bool ok = FromString_(p1, args.GetArg(0).c_str());
+    if (ok)
+    {
+        RT ret = m_functor(p1);
+        return ToString_(ret).c_str();
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s)! Invalid argument type.",
+            m_module, m_name, args.GetArg(0).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(2, typename P)>
+CCommand2<LIST(2, P)>::CCommand2(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<void(LIST(2, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(2, typename P)>
+QString CCommand2<LIST(2, P)>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 2);
+    if (args.GetArgCount() < 2)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! Two arguments required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    P2 p2;
+    bool ok = FromString_(p1, args.GetArg(0).c_str())
+        && FromString_(p2, args.GetArg(1).c_str());
+    if (ok)
+    {
+        m_functor(p1, p2);
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s,%s)! Invalid argument type(s).",
+            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(2, typename P), typename RT>
+CCommand2wRet<LIST(2, P), RT>::CCommand2wRet(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<RT(LIST(2, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(2, typename P), typename RT>
+QString CCommand2wRet<LIST(2, P), RT>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 2);
+    if (args.GetArgCount() < 2)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! Two arguments required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    P2 p2;
+    bool ok = FromString_(p1, args.GetArg(0).c_str())
+        && FromString_(p2, args.GetArg(1).c_str());
+    if (ok)
+    {
+        RT ret = m_functor(p1, p2);
+        return ToString_(ret).c_str();
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s,%s)! Invalid argument type(s).",
+            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(3, typename P)>
+CCommand3<LIST(3, P)>::CCommand3(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<void(LIST(3, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(3, typename P)>
+QString CCommand3<LIST(3, P)>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 3);
+    if (args.GetArgCount() < 3)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! Three arguments required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    P2 p2;
+    P3 p3;
+    bool ok = FromString_(p1, args.GetArg(0).c_str())
+        && FromString_(p2, args.GetArg(1).c_str())
+        && FromString_(p3, args.GetArg(2).c_str());
+    if (ok)
+    {
+        m_functor(p1, p2, p3);
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s)! Invalid argument type(s).",
+            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(3, typename P), typename RT>
+CCommand3wRet<LIST(3, P), RT>::CCommand3wRet(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<RT(LIST(3, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(3, typename P), typename RT>
+QString CCommand3wRet<LIST(3, P), RT>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 3);
+    if (args.GetArgCount() < 3)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! Three arguments required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    P2 p2;
+    P3 p3;
+    bool ok = FromString_(p1, args.GetArg(0).c_str())
+        && FromString_(p2, args.GetArg(1).c_str())
+        && FromString_(p3, args.GetArg(2).c_str());
+    if (ok)
+    {
+        RT ret = m_functor(p1, p2, p3);
+        return ToString_(ret).c_str();
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s)! Invalid argument type(s).",
+            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(4, typename P)>
+CCommand4<LIST(4, P)>::CCommand4(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<void(LIST(4, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(4, typename P)>
+QString CCommand4<LIST(4, P)>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 4);
+    if (args.GetArgCount() < 4)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! Four arguments required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    P2 p2;
+    P3 p3;
+    P4 p4;
+    bool ok = FromString_(p1, args.GetArg(0).c_str())
+        && FromString_(p2, args.GetArg(1).c_str())
+        && FromString_(p3, args.GetArg(2).c_str())
+        && FromString_(p4, args.GetArg(3).c_str());
+    if (ok)
+    {
+        m_functor(p1, p2, p3, p4);
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s,%s)! Invalid argument type(s).",
+            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str(),
+            args.GetArg(3).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(4, typename P), typename RT>
+CCommand4wRet<LIST(4, P), RT>::CCommand4wRet(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<RT(LIST(4, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(4, typename P), typename RT>
+QString CCommand4wRet<LIST(4, P), RT>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 4);
+    if (args.GetArgCount() < 4)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! Four arguments required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    P2 p2;
+    P3 p3;
+    P4 p4;
+    bool ok = FromString_(p1, args.GetArg(0).c_str())
+        && FromString_(p2, args.GetArg(1).c_str())
+        && FromString_(p3, args.GetArg(2).c_str())
+        && FromString_(p4, args.GetArg(3).c_str());
+    if (ok)
+    {
+        RT ret = m_functor(p1, p2, p3, p4);
+        return ToString_(ret).c_str();
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s,%s)! Invalid argument type(s).",
+            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str(),
+            args.GetArg(3).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(5, typename P)>
+CCommand5<LIST(5, P)>::CCommand5(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<void(LIST(5, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(5, typename P)>
+QString CCommand5<LIST(5, P)>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 5);
+    if (args.GetArgCount() < 5)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! Five arguments required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1;
+    P2 p2;
+    P3 p3;
+    P4 p4;
+    P5 p5;
+    bool ok = FromString_(p1, args.GetArg(0).c_str())
+        && FromString_(p2, args.GetArg(1).c_str())
+        && FromString_(p3, args.GetArg(2).c_str())
+        && FromString_(p4, args.GetArg(3).c_str())
+        && FromString_(p5, args.GetArg(4).c_str());
+    if (ok)
+    {
+        m_functor(p1, p2, p3, p4, p5);
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s,%s,%s)! Invalid argument type(s).",
+            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str(),
+            args.GetArg(3).c_str(), args.GetArg(4).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <LIST(6, typename P)>
+CCommand6<LIST(6, P)>::CCommand6(const string& module, const string& name,
+    const string& description, const string& example,
+    const AZStd::function<void(LIST(6, P))>& functor)
+    : CCommand(module, name, description, example)
+    , m_functor(functor)
+{
+}
+
+template <LIST(6, typename P)>
+QString CCommand6<LIST(6, P)>::Execute(const CCommand::CArgs& args)
+{
+    assert(args.GetArgCount() == 6);
+    if (args.GetArgCount() < 6)
+    {
+        CryLogAlways("Cannot execute the command %s.%s! Six arguments required.", m_module.c_str(), m_name.c_str());
+        PrintHelp();
+        return "";
+    }
+
+    P1 p1 = 0;
+    P2 p2 = 0;
+    P3 p3 = 0;
+    P4 p4 = 0;
+    P5 p5 = 0;
+    P6 p6 = 0;
+    bool ok = FromString_(p1, args.GetArg(0).c_str())
+        && FromString_(p2, args.GetArg(1).c_str())
+        && FromString_(p3, args.GetArg(2).c_str())
+        && FromString_(p4, args.GetArg(3).c_str())
+        && FromString_(p5, args.GetArg(4).c_str())
+        && FromString_(p6, args.GetArg(5).c_str());
+    if (ok)
+    {
+        m_functor(p1, p2, p3, p4, p5, p6);
+    }
+    else
+    {
+        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s,%s,%s,%s)! Invalid argument type(s).",
+            m_module.c_str(), m_name.c_str(), args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str(),
+            args.GetArg(3).c_str(), args.GetArg(4).c_str(), args.GetArg(5).c_str());
+        PrintHelp();
+    }
+    return "";
+}
+#endif // CRYINCLUDE_EDITOR_INCLUDE_COMMAND_H
diff --git a/Code/Editor/Include/EditorCoreAPI.cpp b/Code/Editor/Include/EditorCoreAPI.cpp
new file mode 100644
index 0000000000..89cc00aebf
--- /dev/null
+++ b/Code/Editor/Include/EditorCoreAPI.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+
+#include "EditorCoreAPI.h"
+
+#include <AzCore/Module/Environment.h>
+
+
+static IEditor* s_pEditor = nullptr;
+
+void SetIEditor(IEditor* pEditor)
+{
+    //this function is called multiple times so only check once if the static editor pointer is null
+    if (s_pEditor == nullptr)
+    {
+        assert(pEditor);
+        s_pEditor = pEditor;
+    }
+    else if (pEditor == nullptr)
+    {
+        //clearing the static editor pointer
+        s_pEditor = nullptr;
+    }
+    else
+    {
+        assert(pEditor == s_pEditor); //trigger a warning that multiple instances of the editor are attempting to register
+    }
+}
+
+IEditor* GetIEditor()
+{
+    return s_pEditor;
+}
+
+void SetEditorCoreEnvironment(SSystemGlobalEnvironment* pEnv)
+{
+    assert(!gEnv);
+    gEnv = pEnv;
+}
+
+void AttachEditorCoreAZEnvironment(AZ::EnvironmentInstance pAzEnv)
+{
+    AZ::Environment::Attach(pAzEnv);
+}
+
+void DetachEditorCoreAZEnvironment()
+{
+    AZ::Environment::Detach();
+}
diff --git a/Code/Editor/Include/EditorCoreAPI.h b/Code/Editor/Include/EditorCoreAPI.h
new file mode 100644
index 0000000000..7de2aa366d
--- /dev/null
+++ b/Code/Editor/Include/EditorCoreAPI.h
@@ -0,0 +1,55 @@
+/*
+ * 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_CORE_INCLUDE_API_H
+#define CRYINCLUDE_EDITOR_CORE_INCLUDE_API_H
+#pragma once
+
+#include <AzCore/PlatformDef.h>
+
+#if defined(AZ_PLATFORM_WINDOWS)
+#if defined(EDITOR_CORE)
+    #define EDITOR_CORE_API AZ_DLL_EXPORT
+#else
+    #define EDITOR_CORE_API AZ_DLL_IMPORT
+#endif
+#elif defined(AZ_PLATFORM_MAC) || defined(AZ_PLATFORM_LINUX)
+#if defined(EDITOR_CORE)
+    #define EDITOR_CORE_API __attribute__ ((visibility ("default")))
+#else
+    #define EDITOR_CORE_API 
+#endif
+#endif
+
+struct IEditor;
+
+
+namespace AZ
+{
+    namespace Internal
+    {
+        class EnvironmentInterface;
+    }
+    typedef Internal::EnvironmentInterface* EnvironmentInstance;
+}
+
+EDITOR_CORE_API void SetIEditor(IEditor* pEditor);
+EDITOR_CORE_API IEditor* GetIEditor();
+
+//! Attach the editorcore dll to the system environmen in the System DLL
+EDITOR_CORE_API void SetEditorCoreEnvironment(struct SSystemGlobalEnvironment* pEnv);
+
+//! Attach the editorcore dll to the AZ Environment which allows ebus and memory allocation - should be done really early
+EDITOR_CORE_API void AttachEditorCoreAZEnvironment(AZ::EnvironmentInstance pAzEnv);
+
+//! Detach the editorcore dll from the AZ Environment, should be done last.
+EDITOR_CORE_API void DetachEditorCoreAZEnvironment();
+
+#if defined(AZ_PLATFORM_WINDOWS)
+#include "../IEditor.h"
+#endif
+
+#endif // CRYINCLUDE_EDITOR_CORE_INCLUDE_API_H
diff --git a/Code/Editor/Include/HitContext.h b/Code/Editor/Include/HitContext.h
new file mode 100644
index 0000000000..15f41cc5aa
--- /dev/null
+++ b/Code/Editor/Include/HitContext.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Hit testing for editor viewport operations
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_HITCONTEXT_H
+#define CRYINCLUDE_EDITOR_INCLUDE_HITCONTEXT_H
+#pragma once
+
+class CGizmo;
+class CBaseObject;
+struct IDisplayViewport;
+class CDeepSelection;
+struct AABB;
+class CCamera;
+
+#include <QRect>
+#include <platform.h>
+
+//! Flags used in HitContext for nSubObjFlags member.
+enum ESubObjHitFlags
+{
+    //! When set all hit elements will be selected.
+    SO_HIT_SELECT = BIT(1),
+    //! Only test selected elements for hit.
+    SO_HIT_TEST_SELECTED = BIT(2),
+    //! Only hit test point2d, not rectangle
+    //! Will only test/select 1 closest element
+    SO_HIT_POINT = BIT(3),
+    //! Adds hit elements to previously selected ones.
+    SO_HIT_SELECT_ADD = BIT(4),
+    //! Remove hit elements from previously selected ones.
+    SO_HIT_SELECT_REMOVE = BIT(5),
+    //! Output flag, set if selection was changed.
+    SO_HIT_SELECTION_CHANGED = BIT(6),
+    //! Hit testing to highlight sub object-element.
+    SO_HIT_HIGHLIGHT_ONLY = BIT(7),
+    //! This hit test is not for editing sub-objects.
+    //! (ex. for moving an object by its face-normal)
+    SO_HIT_NO_EDIT = BIT(8),
+    // Check hit with vertices.
+    SO_HIT_ELEM_VERTEX = BIT(10),
+    // Check hit with edges.
+    SO_HIT_ELEM_EDGE = BIT(11),
+    // Check hit with faces.
+    SO_HIT_ELEM_FACE = BIT(12),
+    // Check hit with polygons.
+    SO_HIT_ELEM_POLYGON = BIT(13)
+};
+
+#define SO_HIT_ELEM_ALL (SO_HIT_ELEM_VERTEX | SO_HIT_ELEM_EDGE | SO_HIT_ELEM_FACE | SO_HIT_ELEM_POLYGON)
+
+//! Collision structure passed to HitTest function.
+struct HitContext
+{
+    //! Viewport that originates hit testing.
+    IDisplayViewport* view;
+    //! 2D point on view that is used for hit testing.
+    QPoint point2d;
+    //! 2D Selection rectangle (Only when HitTestRect)
+    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;
+    //! True if axis collision must be ignored.
+    bool bIgnoreAxis;
+    //! Hit test only gizmo objects
+    bool bOnlyGizmo;
+    //! Test objects using advanced selection helpers.
+    bool bUseSelectionHelpers;
+    //! an object excluded in hittest.
+    CBaseObject* pExcludedObject;
+
+    // Input parameters.
+
+    //! Ray origin.
+    Vec3 raySrc;
+    //! Ray direction.
+    Vec3 rayDir;
+    //! Relaxation parameter for hit testing.
+    float distanceTolerance;
+    //! Sub object hit testing flags, @see ESubObjHitFlags
+    int nSubObjFlags;
+
+    // Output parameters.
+
+    //! true if this hit should have less priority then non weak hits.
+    //! (exp: Ray hit entity bounding box but not entity geometry.)
+    bool weakHit;
+    //! constrain axis if hit AxisGizmo.
+    int axis;
+    //! if hit axis gizmo, 1 - move mode, 2 - rotate mode, 3 - scale mode, 4 - rotate circle mode
+    int manipulatorMode;
+    //! distance to the object from src.
+    float dist;
+    //! object that have been hit.
+    CBaseObject* object;
+    //! gizmo object that have been hit.
+    CGizmo* gizmo;
+    //! for deep selection mode
+    CDeepSelection* pDeepSelection;
+    //! For linking tool
+    const char* name;
+    //! true if this hit was from the object icon
+    bool iconHit;
+
+    HitContext()
+    {
+        rect = QRect();
+        b2DViewport = false;
+        view = 0;
+        camera = 0;
+        point2d = QPoint();
+        axis = 0;
+        distanceTolerance = 0;
+        raySrc(0, 0, 0);
+        rayDir(0, 0, 0);
+        dist = 0;
+        object = 0;
+        weakHit = false;
+        manipulatorMode = 0;
+        nSubObjFlags = 0;
+        bounds = 0;
+        bIgnoreAxis = false;
+        bOnlyGizmo = false;
+        bUseSelectionHelpers = false;
+        pDeepSelection = 0;
+        name = nullptr;
+        iconHit = false;
+    }
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_HITCONTEXT_H
diff --git a/Code/Editor/Include/IAnimationCompressionManager.h b/Code/Editor/Include/IAnimationCompressionManager.h
new file mode 100644
index 0000000000..e17a594288
--- /dev/null
+++ b/Code/Editor/Include/IAnimationCompressionManager.h
@@ -0,0 +1,19 @@
+/*
+ * 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_INCLUDE_IANIMATIONCOMPRESSIONMANAGER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IANIMATIONCOMPRESSIONMANAGER_H
+#pragma once
+
+struct IAnimationCompressionManager
+{
+    virtual bool IsEnabled() const = 0;
+    virtual void UpdateLocalAnimations() = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IANIMATIONCOMPRESSIONMANAGER_H
diff --git a/Code/Editor/Include/IAssetItem.h b/Code/Editor/Include/IAssetItem.h
new file mode 100644
index 0000000000..212ae84da5
--- /dev/null
+++ b/Code/Editor/Include/IAssetItem.h
@@ -0,0 +1,432 @@
+/*
+ * 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 : Standard interface for asset display in the asset browser,
+//               this header should be used to create plugins.
+//               The method Release of this interface should NOT be called.
+//               Instead, the FreeData from the database (from IAssetItemDatabase) should
+//               be used as it will safely release all the items from the database.
+//               It is still possible to call the release method, but this is not the
+//               recomended method, specially for usage outside of the plugins because there
+//               is no guarantee that a the asset will be properly removed from the database
+//               manager.
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IASSETITEM_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IASSETITEM_H
+#pragma once
+
+struct IAssetItemDatabase;
+
+namespace AssetViewer
+{
+    // Used in GetAssetFieldValue for each asset type to check if field name is the right one
+    inline bool IsFieldName(const char* pIncomingFieldName, const char* pFieldName)
+    {
+        return !strncmp(pIncomingFieldName, pFieldName, strlen(pIncomingFieldName));
+    }
+}
+
+// Description:
+//      This interface allows the programmer to extend asset display types visible in the asset browser.
+struct IAssetItem
+    : public IUnknown
+{
+    DEFINE_UUID(0x04F20346, 0x2EC3, 0x43f2, 0xBD, 0xA1, 0x2C, 0x0B, 0x97, 0x76, 0xF3, 0x84);
+
+    // The supported asset flags
+    enum EAssetFlags
+    {
+        // asset is visible in the database for filtering and sorting (not asset view control related)
+        eFlag_Visible = BIT(0),
+        // the asset is loaded
+        eFlag_Loaded = BIT(1),
+        // the asset is loaded
+        eFlag_Cached = BIT(2),
+        // the asset is selected in a selection set
+        eFlag_Selected = BIT(3),
+        // this asset is invalid, no thumb is shown/available
+        eFlag_Invalid = BIT(4),
+        // this asset has some errors/warnings, in the asset browser it will show some blinking/red elements
+        // and the user can check out the errors. Error text will be fetched using GetAssetFieldValue( "errors", &someStringVar )
+        eFlag_HasErrors = BIT(5),
+        // this flag is set when the asset is rendering its contents using GDI, and not the engine's rendering capabilities
+        // (this flags is used as hint for the preview tool, which will use a double-buffer canvas if this flag is set,
+        // and send a memory HDC to the OnBeginPreview method, for drawing of the asset)
+        eFlag_UseGdiRendering = BIT(6),
+        // set if this asset is draggable into the render viewports, and can be created there
+        eFlag_CanBeDraggedInViewports = BIT(7),
+        // set if this asset can be moved after creation, otherwise the asset instance will just be created where user clicked
+        eFlag_CanBeMovedAfterDroppedIntoViewport = BIT(8),
+        // the asset thumbnail image is loaded
+        eFlag_ThumbnailLoaded = BIT(9),
+        // the asset thumbnail image is loaded
+        eFlag_UsedInLevel = BIT(10)
+    };
+
+    // Asset field name and field values map
+    typedef std::map < QString/*fieldName*/, QString/*value*/ > TAssetFieldValuesMap;
+    // Dependency category names and corresponding files map, example: "Textures"=>{ "foam.dds","water.dds","normal.dds" }
+    typedef std::map < QString/*dependencyCategory*/, std::set<QString>/*dependency filenames*/ > TAssetDependenciesMap;
+
+    virtual ~IAssetItem() {
+    }
+
+    // Description:
+    //      Get the hash number/key used for database thumbnail and info records management
+    virtual uint32 GetHash() const = 0;
+    // Description:
+    //      Set the hash number/key used for database thumbnail and info records management
+    virtual void SetHash(uint32 hash) = 0;
+    // Description:
+    //      Get the owner database for this asset
+    // Return Value:
+    //      The owner database for this asset
+    // See Also:
+    //      SetOwnerDatabase()
+    virtual IAssetItemDatabase* GetOwnerDatabase() const = 0;
+    // Description:
+    //      Set the owner database for this asset
+    // Arguments:
+    //      piOwnerDisplayDatabase - the owner database
+    // See Also:
+    //      GetOwnerDatabase()
+    virtual void SetOwnerDatabase(IAssetItemDatabase* pOwnerDisplayDatabase) = 0;
+    // Description:
+    //      Get the asset's dependency files / objects
+    // Return Value:
+    //      The vector with filenames which this asset is dependent upon, ex.: ["Textures"].(vector of textures)
+    virtual const TAssetDependenciesMap& GetDependencies() const = 0;
+    // Description:
+    //      Set the file size of this asset in bytes
+    // Arguments:
+    //      aSize - size of the file in bytes
+    // See Also:
+    //      GetFileSize()
+    virtual void SetFileSize(quint64 aSize) = 0;
+    // Description:
+    //      Get the file size of this asset in bytes
+    // Return Value:
+    //      The file size of this asset in bytes
+    // See Also:
+    //      SetFileSize()
+    virtual quint64 GetFileSize() const = 0;
+    // Description:
+    //      Set asset filename (extension included and no path)
+    // Arguments:
+    //      pName - the asset filename (extension included and no path)
+    // See Also:
+    //      GetFilename()
+    virtual void SetFilename(const char* pName) = 0;
+    // Description:
+    //      Get asset filename (extension included and no path)
+    // Return Value:
+    //      The asset filename (extension included and no path)
+    // See Also:
+    //      SetFilename()
+    virtual QString GetFilename() const = 0;
+    // Description:
+    //      Set the asset's relative path
+    // Arguments:
+    //      pName - file's relative path
+    // See Also:
+    //      GetRelativePath()
+    virtual void SetRelativePath(const char* pName) = 0;
+    // Description:
+    //      Get the asset's relative path
+    // Return Value:
+    //      The asset's relative path
+    // See Also:
+    //      SetRelativePath()
+    virtual QString GetRelativePath()  const = 0;
+    // Description:
+    //      Set the file extension ( dot(s) must be included )
+    // Arguments:
+    //      pExt - the file's extension
+    // See Also:
+    //      GetFileExtension()
+    virtual void SetFileExtension(const char* pExt) = 0;
+    // Description:
+    //      Get the file extension ( dot(s) included )
+    // Return Value:
+    //      The file extension ( dot(s) included )
+    // See Also:
+    //      SetFileExtension()
+    virtual QString GetFileExtension()  const = 0;
+    // Description:
+    //      Get the asset flags, with values from IAssetItem::EAssetFlags
+    // Return Value:
+    //      The asset flags, with values from IAssetItem::EAssetFlags
+    // See Also:
+    //      SetFlags(), SetFlag(), IsFlagSet()
+    virtual UINT GetFlags() const = 0;
+    // Description:
+    //      Set the asset flags
+    // Arguments:
+    //      aFlags - flags, OR-ed values from IAssetItem::EAssetFlags
+    // See Also:
+    //      GetFlags(), SetFlag(), IsFlagSet()
+    virtual void SetFlags(UINT aFlags) = 0;
+    // Description:
+    //      Set/clear a single flag bit for the asset
+    // Arguments:
+    //      aFlag - the flag to set/clear, with values from IAssetItem::EAssetFlags
+    // See Also:
+    //      GetFlags(), SetFlags(), IsFlagSet()
+    virtual void SetFlag(EAssetFlags aFlag, bool bSet = true) = 0;
+    // Description:
+    //      Check if a specified flag is set
+    // Arguments:
+    //      aFlag - the flag to check, with values from IAssetItem::EAssetFlags
+    // Return Value:
+    //      True if the flag is set
+    // See Also:
+    //      GetFlags(), SetFlags(), SetFlag()
+    virtual bool IsFlagSet(EAssetFlags aFlag) const = 0;
+    // Description:
+    //      Set this asset's index; used in sorting, selections, and to know where an asset is in the current list
+    // Arguments:
+    //      aIndex - the asset's index
+    // See Also:
+    //      GetIndex()
+    virtual void SetIndex(UINT aIndex) = 0;
+    // Description:
+    //      Get the asset's index in the current list
+    // Return Value:
+    //      The asset's index in the current list
+    // See Also:
+    //      SetIndex()
+    virtual UINT GetIndex() const = 0;
+    // Description:
+    //      Get the asset's field raw data value into a user location, you must check the field's type ( from asset item's owner database )
+    //      before using this function and send the correct pointer to destination according to the type ( int8, float32, string, etc. )
+    // Arguments:
+    //      pFieldName - the asset field name to query the value for
+    //      pDest - the destination variable address, must be the same type as the field type
+    // Return Value:
+    //      True if the asset field name is found and the value is returned correctly
+    // See Also:
+    //      SetAssetFieldValue()
+    virtual QVariant GetAssetFieldValue(const char* pFieldName) const = 0;
+    // Description:
+    //      Set the asset's field raw data value from a user location, you must check the field's type ( from asset item's owner database )
+    //      before using this function and send the correct pointer to source according to the type ( int8, float32, string, etc. )
+    // Arguments:
+    //      pFieldName - the asset field name to set the value for
+    //      pSrc - the source variable address, must be the same type as the field type
+    // Return Value:
+    //      True if the asset field name is found and the value is set correctly
+    // See Also:
+    //      GetAssetFieldValue()
+    virtual bool SetAssetFieldValue(const char* pFieldName, void* pSrc) = 0;
+    // Description:
+    //      Get the drawing rectangle for the asset's thumb ( absolute viewer canvas location )
+    // Arguments:
+    //      rstDrawingRectangle - destination location to set with the asset's thumbnail rectangle location
+    // See Also:
+    //      SetDrawingRectangle()
+    virtual void GetDrawingRectangle(QRect& rstDrawingRectangle) const = 0;
+    // Description:
+    //      Set the drawing rectangle for the asset's thumb ( absolute viewer canvas location )
+    // Arguments:
+    //      crstDrawingRectangle - source to set the asset's thumbnail rectangle
+    // See Also:
+    //      GetDrawingRectangle()
+    virtual void SetDrawingRectangle(const QRect& crstDrawingRectangle) = 0;
+    // Description:
+    //      Checks if the given 2D point is inside the asset's thumb rectangle
+    // Arguments:
+    //      nX - mouse pointer position on X axis, relative to the asset viewer control
+    //      nY - mouse pointer position on Y axis, relative to the asset viewer control
+    // Return Value:
+    //      True if the given 2D point is inside the asset's thumb rectangle
+    // See Also:
+    //      HitTest(CRect)
+    virtual bool HitTest(int nX, int nY) const = 0;
+    // Description:
+    //      Checks if the given rectangle intersects the asset thumb's rectangle
+    // Arguments:
+    //      nX - mouse pointer position on X axis, relative to the asset viewer control
+    //      nY - mouse pointer position on Y axis, relative to the asset viewer control
+    // Return Value:
+    //      True if the given rectangle intersects the asset thumb's rectangle
+    // See Also:
+    //      HitTest(int nX,int nY)
+    virtual bool HitTest(const QRect& roTestRect) const = 0;
+    // Description:
+    //      When user drags this asset item into a viewport, this method is called when the dragging operation ends
+    //      and the mouse button is released,   for the asset to return an instance of the asset object to be placed in the level
+    // Arguments:
+    //      aX - instance's X position component in world coordinates
+    //      aY - instance's Y position component in world coordinates
+    //      aZ - instance's Z position component in world coordinates
+    // Return Value:
+    //      The newly created asset instance (Example: BrushObject*)
+    // See Also:
+    //      MoveInstanceInViewport()
+    virtual void* CreateInstanceInViewport(float aX, float aY, float aZ) = 0;
+    // Description:
+    //      When the mouse button is released after level object creation, the user now can move the mouse
+    //      and move the asset instance in the 3D world
+    // Arguments:
+    //      pDraggedObject -    the actual entity or brush object (CBaseObject* usually) to be moved around with the mouse
+    //                                          returned by the CreateInstanceInViewport()
+    //      aNewX - the new X world coordinates of the asset instance
+    //      aNewY - the new Y world coordinates of the asset instance
+    //      aNewZ - the new Z world coordinates of the asset instance
+    // Return Value:
+    //      True if asset instance was moved properly
+    // See Also:
+    //      CreateInstanceInViewport()
+    virtual bool MoveInstanceInViewport(const void* pDraggedObject, float aNewX, float aNewY, float aNewZ) = 0;
+    // Description:
+    //      This will be called when the user presses ESCAPE key when dragging the asset in the viewport, you must delete the given object
+    //      because the creation was aborted
+    // Arguments:
+    //      pDraggedObject - the asset instance to be deleted ( you must cast to the needed type, and delete it properly )
+    // See Also:
+    //      CreateInstanceInViewport()
+    virtual void AbortCreateInstanceInViewport(const void* pDraggedObject) = 0;
+    // Description:
+    //      This method is used to cache/load asset's data, so it can be previewed/rendered
+    // Return Value:
+    //      True if the asset was successfully cached
+    // See Also:
+    //      UnCache()
+    virtual bool Cache() = 0;
+    // Description:
+    //      This method is used to force cache/load asset's data, so it can be previewed/rendered
+    // Return Value:
+    //      True if the asset was successfully forced cached
+    // See Also:
+    //      UnCache(), Cache()
+    virtual bool ForceCache() = 0;
+    // Description:
+    //      This method is used to load the thumbnail image of the asset
+    // Return Value:
+    //      True if thumb loaded ok
+    // See Also:
+    //      UnloadThumbnail()
+    virtual bool LoadThumbnail() = 0;
+    // Description:
+    //      This method is used to unload the thumbnail image of the asset
+    // See Also:
+    //      LoadThumbnail()
+    virtual void UnloadThumbnail() = 0;
+    // Description:
+    //      This is called when the asset starts to be previewed in full detail, so here you can load the whole asset, in fine detail
+    //      ( textures are fully loaded, models etc. ). It is called once, when the Preview dialog is shown
+    // Arguments:
+    //      hPreviewWnd - the window handle of the quick preview dialog
+    //      hMemDC - the memory DC used to render assets that can render themselves in the DC, otherwise they will render in the dialog's HWND
+    // See Also:
+    //      OnEndPreview(), GetCustomPreviewPanelHeader()
+    virtual void OnBeginPreview(QWidget* hPreviewWnd) = 0;
+    // Description:
+    //      Called when the Preview dialog is closed, you may release the detail asset data here
+    // See Also:
+    //      OnBeginPreview(), GetCustomPreviewPanelHeader()
+    virtual void OnEndPreview() = 0;
+    // Description:
+    //      If the asset has a special preview panel with utility controls, to be placed at the top of the Preview window, it can return an child dialog window
+    //      otherwise it can return NULL, if no panel is available
+    // Arguments:
+    //      pParentWnd - a valid CDialog*, or NULL
+    // Return Value:
+    //      A valid child dialog window handle, if this asset wants to have a custom panel in the top side of the Asset Preview window,
+    //      otherwise it can return NULL, if no panel is available
+    // See Also:
+    //      OnBeginPreview(), OnEndPreview()
+    virtual QWidget* GetCustomPreviewPanelHeader(QWidget* pParentWnd) = 0;
+    virtual QWidget* GetCustomPreviewPanelFooter(QWidget* pParentWnd) = 0;
+    // Description:
+    //      Used when dragging/rotate/zoom a model, or other asset that can support preview
+    // Arguments:
+    //      hRenderWindow - the rendering window handle
+    //      rstViewport - the viewport rectangle
+    //      aMouseX - the render window relative mouse pointer X coordinate
+    //      aMouseY - the render window relative mouse pointer Y coordinate
+    //      aMouseDeltaX - the X coordinate delta between two mouse movements
+    //      aMouseDeltaY - the Y coordinate delta between two mouse movements
+    //      aMouseWheelDelta - the mouse wheel scroll delta/step
+    //      aKeyFlags - the key flags, see WM_LBUTTONUP
+    // See Also:
+    //      OnPreviewRenderKeyEvent()
+    virtual void PreviewRender(
+        QWidget* hRenderWindow,
+        const QRect& rstViewport,
+        int aMouseX = 0, int aMouseY = 0,
+        int aMouseDeltaX = 0, int aMouseDeltaY = 0,
+        int aMouseWheelDelta = 0, UINT aKeyFlags = 0) = 0;
+    // Description:
+    //      This is called when the user manipulates the assets in interactive render and a key is pressed ( with down or up state )
+    // Arguments:
+    //      bKeyDown - true if this is a WM_KEYDOWN event, else it is a WM_KEYUP event
+    //      aChar - the char/key code pressed/released
+    //      aKeyFlags - the key flags, compatible with WM_KEYDOWN/UP events
+    // See Also:
+    //      InteractiveRender()
+    virtual void OnPreviewRenderKeyEvent(bool bKeyDown, UINT aChar, UINT aKeyFlags) = 0;
+    // Description:
+    //      Called when user clicked once on the thumb image
+    // Arguments:
+    //      point - mouse coordinates relative to the thumbnail rectangle
+    //      aKeyFlags - the key flags, see WM_LBUTTONDOWN
+    // See Also:
+    //      OnThumbDblClick()
+    virtual void OnThumbClick(const QPoint& point, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers) = 0;
+    // Description:
+    //      Called when user double clicked on the thumb image
+    // Arguments:
+    //      point - mouse coordinates relative to the thumbnail rectangle
+    //      aKeyFlags - the key flags, see WM_LBUTTONDOWN
+    // See Also:
+    //      OnThumbClick()
+    //! called when user clicked twice on the thumb image
+    virtual void OnThumbDblClick(const QPoint& point, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers) = 0;
+    // Description:
+    //      Draw the cached thumb bitmap only, if any, no other kind of rendering
+    // Arguments:
+    //      hDC - the destination DC, where to draw the thumb
+    //      rRect - the destination rectangle
+    // Return Value:
+    //      True if drawing of the thumbnail was done OK
+    // See Also:
+    //      Render()
+    virtual bool DrawThumbImage(QPainter* painter, const QRect& rRect) = 0;
+    // Description:
+    //     Writes asset info to a XML node.
+    //     This is needed to save cached info as a persistent XML file for the next run of the editor.
+    // Arguments:
+    //     node - An XML node to contain the info
+    // See Also:
+    //     FromXML()
+    virtual void ToXML(XmlNodeRef& node) const = 0;
+    // Description:
+    //     Gets asset info from a XML node.
+    //       This is needed to get the asset info from previous runs of the editor without re-caching it.
+    // Arguments:
+    //     node - An XML node that contains info for this asset
+    // See Also:
+    //     ToXML()
+    virtual void FromXML(const XmlNodeRef& node) = 0;
+
+    // From IUnknown
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] const IID& riid, [[maybe_unused]] void** ppvObject)
+    {
+        return E_NOINTERFACE;
+    };
+    virtual ULONG STDMETHODCALLTYPE AddRef()
+    {
+        return 0;
+    };
+    virtual ULONG STDMETHODCALLTYPE Release()
+    {
+        return 0;
+    };
+};
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IASSETITEM_H
diff --git a/Code/Editor/Include/IAssetItemDatabase.h b/Code/Editor/Include/IAssetItemDatabase.h
new file mode 100644
index 0000000000..421d61e6f1
--- /dev/null
+++ b/Code/Editor/Include/IAssetItemDatabase.h
@@ -0,0 +1,258 @@
+/*
+ * 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 : Standard interface for asset database creators used to
+//               create an asset plugin for the asset browser
+//               The category of the plugin must be  Asset Item DB
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IASSETITEMDATABASE_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IASSETITEMDATABASE_H
+#pragma once
+struct IAssetItem;
+struct IAssetViewer;
+
+class QString;
+class QStringList;
+
+// Description:
+//  This struct keeps the info, filter and sorting settings for an asset field
+struct SAssetField
+{
+    // the condition for the current filter on the field
+    enum EAssetFilterCondition
+    {
+        eCondition_Any = 0,
+        // string conditions
+        // this also supports '*' and '?' as wildcards inside text
+        eCondition_Contains,
+        // this filter will search the target for at least one of the words specified
+        // ( ex: filter: "water car moon" , field value : "the_great_moon.dds", this will pass the test
+        // it also supports '*' and '?' as wildcards inside words text
+        eCondition_ContainsOneOfTheWords,
+        eCondition_StartsWith,
+        eCondition_EndsWith,
+        // string & numerical conditions
+        eCondition_Equal,
+        eCondition_Greater,
+        eCondition_Less,
+        eCondition_GreaterOrEqual,
+        eCondition_LessOrEqual,
+        eCondition_Not,
+        eCondition_InsideRange
+    };
+
+    // the asset field type
+    enum EAssetFieldType
+    {
+        eType_None = 0,
+        eType_Bool,
+        eType_Int8,
+        eType_Int16,
+        eType_Int32,
+        eType_Int64,
+        eType_Float,
+        eType_Double,
+        eType_String
+    };
+
+    // used when a field can have different specific values
+    typedef QStringList TFieldEnumValues;
+
+    SAssetField(
+        const char* pFieldName = "",
+        const char* pDisplayName = "Unnamed field",
+        EAssetFieldType aFieldType = eType_None,
+        UINT aColumnWidth = 50,
+        bool bVisibleInUI = true,
+        bool bReadOnly = true)
+    {
+        m_fieldName = pFieldName;
+        m_displayName = pDisplayName;
+        m_fieldType = aFieldType;
+        m_filterCondition = eCondition_Equal;
+        m_bUseEnumValues = false;
+        m_bReadOnly = bReadOnly;
+        m_listColumnWidth = aColumnWidth;
+        m_bFieldVisibleInUI = bVisibleInUI;
+        m_bPostFilter = false;
+
+        SetupEnumValues();
+    }
+
+    void SetupEnumValues()
+    {
+        m_bUseEnumValues = true;
+
+        if (m_fieldType == eType_Bool)
+        {
+            m_enumValues.clear();
+            m_enumValues.push_back("Yes");
+            m_enumValues.push_back("No");
+        }
+    }
+
+    // the field's display name, used in UI
+    QString m_displayName,
+    // the field internal name, used in C++ code
+            m_fieldName,
+    // the current filter value, if its empty "" then no filter is applied
+            m_filterValue,
+    // the field's max value, valid when the field's filter condition is eAssertFilterCondition_InsideRange
+            m_maxFilterValue,
+    // the name of the database holding this field, used in Asset Browser preset editor, if its "" then the field
+    // is common to all current databases
+            m_parentDatabaseName;
+    // is this field visible in the UI ?
+    bool m_bFieldVisibleInUI,
+    // if true, then you cannot modify this field of an asset item, only use it
+         m_bReadOnly,
+    // this field filter is applied after the other filters
+         m_bPostFilter;
+    // the field data type
+    EAssetFieldType m_fieldType;
+    // the filter's condition
+    EAssetFilterCondition m_filterCondition;
+    // use the enum list values to choose a value for the field ?
+    bool m_bUseEnumValues;
+    // this map is used when asset field has m_bUseEnumValues on true,
+    // choose a value for the field from this list in the UI
+    TFieldEnumValues m_enumValues;
+    // recommended list column width
+    unsigned int m_listColumnWidth;
+};
+
+struct SFieldFiltersPreset
+{
+    QString presetName2;
+    QStringList checkedDatabaseNames;
+    bool bUsedInLevel;
+    std::vector<SAssetField> fields;
+};
+
+// Description:
+//  This interface allows the programmer to extend asset display types
+//  visible in the asset browser.
+struct IAssetItemDatabase
+    : public IUnknown
+{
+    DEFINE_UUID(0xFB09B039, 0x1D9D, 0x4057, 0xA5, 0xF0, 0xAA, 0x3C, 0x7B, 0x97, 0xAE, 0xA8)
+
+    typedef std::vector<SAssetField> TAssetFields;
+    typedef std::map < QString/*field name*/, SAssetField > TAssetFieldFiltersMap;
+    typedef std::map < QString/*asset filename*/, IAssetItem* > TFilenameAssetMap;
+    typedef AZStd::function<bool(const IAssetItem*)> MetaDataChangeListener;
+
+    // Description:
+    //      Refresh the database by scanning the folders/paks for files, does not load the files, only filename and filesize are fetched
+    virtual void Refresh() = 0;
+    // Description:
+    //      Fills the asset meta data from the loaded xml meta data DB.
+    // Arguments:
+    //      db - the database XML node from where to cache the info
+    virtual void PrecacheFieldsInfoFromFileDB(const XmlNodeRef& db) = 0;
+    // Description:
+    //      Return all assets loaded/scanned by this database
+    // Return Value:
+    //      The assets map reference (filename-asset)
+    virtual TFilenameAssetMap& GetAssets() = 0;
+    // Description:
+    //      Get an asset item by its filename
+    // Return Value:
+    //      A single asset from the database given the filename
+    virtual IAssetItem* GetAsset(const char* pAssetFilename) = 0;
+    // Description:
+    //      Return the asset fields this database's items support
+    // Return Value:
+    //      The asset fields vector reference
+    virtual TAssetFields& GetAssetFields() = 0;
+    // Description:
+    //      Return an asset field object pointer by the field internal name
+    // Arguments:
+    //      pFieldName - the internal field's name (ex: "filename", "relativepath")
+    // Return Value:
+    //      The asset field object pointer
+    virtual SAssetField* GetAssetFieldByName(const char* pFieldName) = 0;
+    // Description:
+    //      Get the database name
+    // Return Value:
+    //      Returns the database name, ex: "Textures"
+    virtual const char* GetDatabaseName() const = 0;
+    // Description:
+    //      Get the database supported file name extension(s)
+    // Return Value:
+    //      Returns the supported extensions, separated by comma, ex: "tga,bmp,dds"
+    virtual const char* GetSupportedExtensions() const = 0;
+    // Description:
+    //      Free the database internal data structures
+    virtual void FreeData() = 0;
+    // Description:
+    //      Apply filters to this database which will set/unset the IAssetItem::eAssetFlag_Visible of each asset, based
+    //      on the given field filters
+    // Arguments:
+    //      rFieldFilters - a reference to the field filters map (fieldname-field)
+    // See Also:
+    //      ClearFilters()
+    virtual void ApplyFilters(const TAssetFieldFiltersMap& rFieldFilters) = 0;
+    // Description:
+    //      Clear the current filters, by setting the IAssetItem::eAssetFlag_Visible of each asset to true
+    // See Also:
+    //      ApplyFilters()
+    virtual void ClearFilters() = 0;
+    virtual QWidget* CreateDbFilterDialog(QWidget* pParent, IAssetViewer* pViewerCtrl) = 0;
+    virtual void UpdateDbFilterDialogUI(QWidget* pDlg) = 0;
+    virtual void OnAssetBrowserOpen() = 0;
+    virtual void OnAssetBrowserClose() = 0;
+    // Description:
+    //       Gets the filename for saving new cached asset info.
+    // Return Value:
+    //     A file name to save new transactions to the persistent asset info DB
+    // See Also:
+    //     CAssetInfoFileDB, IAssetItem::ToXML(), IAssetItem::FromXML()
+    virtual const char* GetTransactionFilename() const = 0;
+    // Description:
+    //     Adds a callback to be called when the meta data of this asset changed.
+    // Arguments:
+    //     callBack - A functor to be added
+    // Return Value:
+    //     True if successful, false otherwise.
+    // See Also:
+    //     RemoveMetaDataChangeListener()
+    virtual bool AddMetaDataChangeListener(MetaDataChangeListener callBack) = 0;
+    // Description:
+    //     Removes a callback from the list of meta data change listeners.
+    // Arguments:
+    //     callBack - A functor to be removed
+    // Return Value:
+    //     True if successful, false otherwise.
+    // See Also:
+    //     AddMetaDataCHangeListener()
+    virtual bool RemoveMetaDataChangeListener(MetaDataChangeListener callBack) = 0;
+    // Description:
+    //          The method that should be called when the meta data of an asset item changes to notify all listeners
+    // Arguments:
+    //     pAssetItem - An asset item whose meta data have changed
+    // See Also:
+    //      AddMetaDataCHangeListener(), RemoveMetaDataChangeListener()
+    virtual void OnMetaDataChange(const IAssetItem* pAssetItem) = 0;
+
+    //! from IUnknown
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] REFIID riid, [[maybe_unused]] void** ppvObject)
+    {
+        return E_NOINTERFACE;
+    };
+    virtual ULONG STDMETHODCALLTYPE AddRef()
+    {
+        return 0;
+    };
+    virtual ULONG STDMETHODCALLTYPE Release()
+    {
+        return 0;
+    };
+};
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IASSETITEMDATABASE_H
diff --git a/Code/Editor/Include/IAssetViewer.h b/Code/Editor/Include/IAssetViewer.h
new file mode 100644
index 0000000000..33585d3102
--- /dev/null
+++ b/Code/Editor/Include/IAssetViewer.h
@@ -0,0 +1,45 @@
+/*
+ * 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 : This file declares a control which objective is to display
+//               multiple assets allowing selection and preview of such things
+//               It also handles scrolling and changes in the thumbnail display size
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IASSETVIEWER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IASSETVIEWER_H
+#pragma once
+#include "IObservable.h"
+#include "IAssetItemDatabase.h"
+
+struct IAssetItem;
+struct IAssetItemDatabase;
+
+// Description:
+//  Observer for the asset viewer events
+struct IAssetViewerObserver
+{
+    virtual void OnChangeStatusBarInfo(UINT nSelectedItems, UINT nVisibleItems, UINT nTotalItems) {};
+    virtual void OnSelectionChanged() {};
+    virtual void OnChangedPreviewedAsset(IAssetItem* pAsset) {};
+    virtual void OnAssetDblClick(IAssetItem* pAsset) {};
+    virtual void OnAssetFilterChanged() {};
+};
+
+// Description:
+//  The asset viewer interface for the asset database plugins to use
+struct IAssetViewer
+{
+    DEFINE_OBSERVABLE_PURE_METHODS(IAssetViewerObserver);
+
+    virtual HWND GetRenderWindow() = 0;
+    virtual void ApplyFilters(const IAssetItemDatabase::TAssetFieldFiltersMap& rFieldFilters) = 0;
+    virtual const IAssetItemDatabase::TAssetFieldFiltersMap& GetCurrentFilters() = 0;
+    virtual void ClearFilters() = 0;
+};
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IASSETVIEWER_H
diff --git a/Code/Editor/Include/IBaseLibraryManager.h b/Code/Editor/Include/IBaseLibraryManager.h
new file mode 100644
index 0000000000..5321ebc9b3
--- /dev/null
+++ b/Code/Editor/Include/IBaseLibraryManager.h
@@ -0,0 +1,142 @@
+/*
+ * 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_INCLUDE_IBASELIBRARYMANAGER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IBASELIBRARYMANAGER_H
+#pragma once
+
+#include <IEditor.h>
+#include "Include/IDataBaseItem.h"
+#include "Include/IDataBaseLibrary.h"
+#include "Include/IDataBaseManager.h"
+#include "Util/TRefCountBase.h"
+
+class CBaseLibraryItem;
+class CBaseLibrary;
+
+struct IBaseLibraryManager
+    : public TRefCountBase<IDataBaseManager>
+    , public IEditorNotifyListener
+{
+    //! Clear all libraries.
+    virtual void ClearAll() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // IDocListener implementation.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Library items.
+    //////////////////////////////////////////////////////////////////////////
+    //! Make a new item in specified library.
+    virtual IDataBaseItem* CreateItem(IDataBaseLibrary* pLibrary) = 0;
+    //! Delete item from library and manager.
+    virtual void DeleteItem(IDataBaseItem* pItem) = 0;
+
+    //! Find Item by its GUID.
+    virtual IDataBaseItem* FindItem(REFGUID guid) const = 0;
+    virtual IDataBaseItem* FindItemByName(const QString& fullItemName) = 0;
+    virtual IDataBaseItem* LoadItemByName(const QString& fullItemName) = 0;
+
+    virtual IDataBaseItemEnumerator* GetItemEnumerator() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set item currently selected.
+    virtual void SetSelectedItem(IDataBaseItem* pItem) = 0;
+    // Get currently selected item.
+    virtual IDataBaseItem* GetSelectedItem() const = 0;
+    virtual IDataBaseItem* GetSelectedParentItem() const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Libraries.
+    //////////////////////////////////////////////////////////////////////////
+    //! Add Item library.
+    virtual IDataBaseLibrary* AddLibrary(const QString& library, bool isLevelLibrary = false, bool bIsLoading = true) = 0;
+    virtual void DeleteLibrary(const QString& library, bool forceDeleteLevel = false) = 0;
+    //! Get number of libraries.
+    virtual int GetLibraryCount() const = 0;
+    //! Get number of modified libraries.
+    virtual int GetModifiedLibraryCount() const = 0;
+
+    //! Get Item library by index.
+    virtual IDataBaseLibrary* GetLibrary(int index) const = 0;
+
+    //! Get Level Item library.
+    virtual IDataBaseLibrary* GetLevelLibrary() const = 0;
+
+    //! Find Items Library by name.
+    virtual IDataBaseLibrary* FindLibrary(const QString& library) = 0;
+
+    //! Find the Library's index by name.
+    virtual int FindLibraryIndex(const QString& library) = 0;
+    
+    //! Load Items library.
+#ifdef LoadLibrary
+#undef LoadLibrary
+#endif
+    virtual IDataBaseLibrary* LoadLibrary(const QString& filename, bool bReload = false) = 0;
+
+    //! Save all modified libraries.
+    virtual void SaveAllLibs() = 0;
+
+    //! Serialize property manager.
+    virtual void Serialize(XmlNodeRef& node, bool bLoading) = 0;
+
+    //! Export items to game.
+    virtual void Export(XmlNodeRef& node) = 0;
+
+    //! Returns unique name base on input name.
+    // Vera@conffx, add LibName parameter so we could make an unique name depends on input library.
+    // Arguments:
+    //    - name: name of the item
+    //    - libName: The library of the item. Given the library name, the function will return a unique name in the library
+    //      Default value "": The function will ignore the library name and return a unique name in the manager
+    virtual QString MakeUniqueItemName(const QString& name, const QString& libName = "") = 0;
+    virtual QString MakeFullItemName(IDataBaseLibrary* pLibrary, const QString& group, const QString& itemName) = 0;
+
+    //! Root node where this library will be saved.
+    virtual QString GetRootNodeName() = 0;
+    //! Path to libraries in this manager.
+    virtual QString GetLibsPath() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Validate library items for errors.
+    virtual void Validate() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void GatherUsedResources(CUsedResources& resources) = 0;
+
+    virtual void AddListener(IDataBaseManagerListener* pListener) = 0;
+    virtual void RemoveListener(IDataBaseManagerListener* pListener) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid) = 0;
+    virtual void RegisterItem(CBaseLibraryItem* pItem) = 0;
+    virtual void UnregisterItem(CBaseLibraryItem* pItem) = 0;
+
+    // Only Used internally.
+    virtual void OnRenameItem(CBaseLibraryItem* pItem, const QString& oldName) = 0;
+
+    // Called by items to indicated that they have been modified.
+    // Sends item changed event to listeners.
+    virtual void OnItemChanged(IDataBaseItem* pItem) = 0;
+    virtual void OnUpdateProperties(IDataBaseItem* pItem, bool bRefresh) = 0;
+
+    //CONFETTI BEGIN
+    // Used to change the library item order
+    virtual void ChangeLibraryOrder(IDataBaseLibrary* lib, unsigned int newLocation) = 0;
+    // simplifies the library renaming process
+    virtual bool SetLibraryName(CBaseLibrary* lib, const QString& name) = 0;
+
+    
+    //Check if the file name is unique.
+    //Params: library: library name. NOT the file path.
+    virtual bool IsUniqueFilename(const QString& library) = 0;
+    //CONFETTI END
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IBASELIBRARYMANAGER_H
diff --git a/Code/Editor/Include/ICommandManager.h b/Code/Editor/Include/ICommandManager.h
new file mode 100644
index 0000000000..d5df081e57
--- /dev/null
+++ b/Code/Editor/Include/ICommandManager.h
@@ -0,0 +1,206 @@
+/*
+ * 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_INCLUDE_ICOMMANDMANAGER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_ICOMMANDMANAGER_H
+#pragma once
+#include "Command.h"
+
+typedef void (* TPfnDeleter)(void*);
+
+class ICommandManager
+{
+public:
+    virtual ~ICommandManager() = default;
+
+    virtual bool AddCommand(CCommand* pCommand, TPfnDeleter deleter = nullptr) = 0;
+    virtual bool UnregisterCommand(const char* module, const char* name) = 0;
+    virtual bool AttachUIInfo(const char* fullCmdName, const CCommand0::SUIInfo& uiInfo) = 0;
+    virtual bool IsRegistered(const char* module, const char* name) const = 0;
+    virtual bool IsRegistered(const char* cmdLine) const = 0;
+    virtual bool IsRegistered(int commandId) const = 0;
+};
+
+/// A set of helper template methods for an easy registration of commands
+namespace CommandManagerHelper
+{
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<void()>& functor);
+    template <typename RT>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<RT()>& functor);
+    template <LIST(1, typename P)>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<void(LIST(1, P))>& functor);
+    template <LIST(1, typename P), typename RT>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<RT(LIST(1, P))>& functor);
+    template <LIST(2, typename P)>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<void(LIST(2, P))>& functor);
+    template <LIST(2, typename P), typename RT>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<RT(LIST(2, P))>& functor);
+    template <LIST(3, typename P)>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<void(LIST(3, P))>& functor);
+    template <LIST(3, typename P), typename RT>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<RT(LIST(3, P))>& functor);
+    template <LIST(4, typename P)>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<void(LIST(4, P))>& functor);
+    template <LIST(4, typename P), typename RT>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<RT(LIST(4, P))>& functor);
+    template <LIST(5, typename P)>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<void(LIST(5, P))>& functor);
+    template <LIST(6, typename P)>
+    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+        const char* description, const char* example,
+        const AZStd::function<void(LIST(6, P))>& functor);
+
+    namespace Private
+    {
+        template <typename FunctorType, typename CommandType>
+        bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+            const char* description, const char* example,
+            const FunctorType& functor);
+    }
+};
+
+template <typename FunctorType, typename CommandType>
+bool CommandManagerHelper::Private::RegisterCommand(ICommandManager* pCmdMgr,
+    const char* module, const char* name,
+    const char* description, const char* example,
+    const FunctorType& functor)
+{
+    assert(functor);
+    if (!functor)
+    {
+        return false;
+    }
+
+    CommandType* pCommand
+        = new CommandType(module, name, description, example, functor);
+    if (pCmdMgr->AddCommand(pCommand) == false)
+    {
+        delete pCommand;
+        return false;
+    }
+    return true;
+}
+
+inline
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<void()>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<void()>, CCommand0>(pCmdMgr, module, name, description, example, functor);
+}
+
+template <typename RT>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<RT()>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<RT()>, CCommand0wRet<RT> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(1, typename P)>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<void(LIST(1, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<void(LIST(1, P))>, CCommand1<LIST(1, P)> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(1, typename P), typename RT>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<RT(LIST(1, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<RT(LIST(1, P))>, CCommand1wRet<LIST(1, P), RT> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(2, typename P)>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<void(LIST(2, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<void(LIST(2, P))>, CCommand2<LIST(2, P)> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(2, typename P), typename RT>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<RT(LIST(2, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<RT(LIST(2, P))>, CCommand2wRet<LIST(2, P), RT> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(3, typename P)>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<void(LIST(3, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<void(LIST(3, P))>, CCommand3<LIST(3, P)> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(3, typename P), typename RT>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<RT(LIST(3, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<RT(LIST(3, P))>, CCommand3wRet<LIST(3, P), RT> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(4, typename P)>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<void(LIST(4, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<void(LIST(4, P))>, CCommand4<LIST(4, P)> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(4, typename P), typename RT>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<RT(LIST(4, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<RT(LIST(4, P))>, CCommand4wRet<LIST(4, P), RT> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(5, typename P)>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<void(LIST(5, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<void(LIST(5, P))>, CCommand5<LIST(5, P)> >(pCmdMgr, module, name, description, example, functor);
+}
+
+template <LIST(6, typename P)>
+bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
+    const char* description, const char* example,
+    const AZStd::function<void(LIST(6, P))>& functor)
+{
+    return Private::RegisterCommand<AZStd::function<void(LIST(6, P))>, CCommand6<LIST(6, P)> >(pCmdMgr, module, name, description, example, functor);
+}
+#endif // CRYINCLUDE_EDITOR_INCLUDE_ICOMMANDMANAGER_H
diff --git a/Code/Editor/Include/IConsoleConnectivity.h b/Code/Editor/Include/IConsoleConnectivity.h
new file mode 100644
index 0000000000..0c5e32ae9a
--- /dev/null
+++ b/Code/Editor/Include/IConsoleConnectivity.h
@@ -0,0 +1,84 @@
+/*
+ * 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 : Standard interface for console connectivity plugins.
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
+#define CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
+#pragma once
+
+
+//////////////////////////////////////////////////////////////////////////
+// Description
+//    This interface provide access to the console connectivity
+// functionality.
+//////////////////////////////////////////////////////////////////////////
+struct IConsoleConnectivity
+    : public IUnknown
+{
+    DEFINE_UUID(0x4DAA85E1, 0x8498, 0x402f, 0x9B, 0x85, 0x7F, 0x62, 0x9D, 0x76, 0x79, 0x8A);
+
+    //////////////////////////////////////////////////////////////////////////
+    //TODO: Must add the useful interface here.
+    //////////////////////////////////////////////////////////////////////////
+
+    // Description:
+    //   Checks if a development console is connected to the development PC.
+    // See Also:
+    // Arguments:
+    //   Nothing
+    // Return:
+    //   bool - true if it is connected, false otherwise.
+    virtual bool IsConnectedToConsole() = 0;
+
+    // Description:
+    //   Send a file from the specified local filename to the console platform creating the full path
+    // as required so it can copy to the remote filename.
+    // See Also:
+    //   Nothing
+    // Arguments:
+    //   szLocalFileName - is the local filename from which you want to copy the file.
+    //   szRemoteFilename - is the full path and filename to where you want to copy the file.
+    // Return:
+    //   bool - true if the copy succeeded, false otherwise.
+    virtual bool SendFile(const char* szLocalFileName, const char* szRemoteFilename) = 0;
+
+    // Description:
+    //   Notifies to the console that a file has been changed, typically uploaded.
+    // This will be usually called after a SendFile (see above) call, so that the
+    // system running on the console may decide what to do with this new file.
+    //   Typically the system will have to load or reloads this new file.
+    // See Also:
+    //   SendFile
+    // Arguments:
+    //   szRemoteFilename - is the full path and filename in the console of the changed
+    // file.
+    // Return:
+    //   bool - true if succeeded sending the notification, false otherwise.
+    virtual bool NotifyFileChange(const char* szRemoteFilename) = 0;
+
+
+    // Description:
+    // Gets the the title IP for the connected console .
+    // Arguments:
+    //  dwConsoleAddressPlaceholder - is the pointer to the placeholder of the variable
+    // which will contain the title IP of the console.
+    // Return:
+    //   bool - true if dwConsoleAddressPlaceholder now contains the IP address, else false.
+    virtual bool GetConsoleAddress(DWORD* dwConsoleAddressPlaceholder) = 0;
+    //////////////////////////////////////////////////////////////////////////
+    // IUnknown
+    //////////////////////////////////////////////////////////////////////////
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) { return E_NOINTERFACE; };
+    virtual ULONG       STDMETHODCALLTYPE AddRef()  { return 0; };
+    virtual ULONG       STDMETHODCALLTYPE Release() { return 0; };
+    //////////////////////////////////////////////////////////////////////////
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
diff --git a/Code/Editor/Include/IDataBaseItem.h b/Code/Editor/Include/IDataBaseItem.h
new file mode 100644
index 0000000000..8f4851631c
--- /dev/null
+++ b/Code/Editor/Include/IDataBaseItem.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IDATABASEITEM_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IDATABASEITEM_H
+#pragma once
+
+#include <qwindowdefs.h>
+#include <IEditor.h>
+
+struct IDataBaseLibrary;
+class CUsedResources;
+
+//////////////////////////////////////////////////////////////////////////
+/** Base class for all items contained in BaseLibraray.
+*/
+struct IDataBaseItem
+{
+    struct SerializeContext
+    {
+        XmlNodeRef node;
+        bool bUndo;
+        bool bLoading;
+        bool bCopyPaste;
+        bool bIgnoreChilds;
+        bool bUniqName;
+        SerializeContext()
+            : node(0)
+            , bLoading(false)
+            , bCopyPaste(false)
+            , bIgnoreChilds(false)
+            , bUniqName(false)
+            , bUndo(false) {};
+        SerializeContext(XmlNodeRef _node, bool bLoad)
+            : node(_node)
+            , bLoading(bLoad)
+            , bCopyPaste(false)
+            , bIgnoreChilds(false)
+            , bUniqName(false)
+            , bUndo(false) {};
+        SerializeContext(const SerializeContext& ctx)
+            : node(ctx.node)
+            , bLoading(ctx.bLoading)
+            , bCopyPaste(ctx.bCopyPaste)
+            , bIgnoreChilds(ctx.bIgnoreChilds)
+            , bUniqName(ctx.bUniqName)
+            , bUndo(ctx.bUndo) {};
+    };
+
+    virtual EDataBaseItemType GetType() const = 0;
+
+    //! Return Library this item are contained in.
+    //! Item can only be at one library.
+    virtual IDataBaseLibrary* GetLibrary() const = 0;
+
+    //! Change item name.
+    virtual void SetName(const QString& name) = 0;
+    //! Get item name.
+    virtual const QString& GetName() const = 0;
+
+    //! Get full item name, including name of library.
+    //! Name formed by adding dot after name of library
+    //! eg. library Pickup and item PickupRL form full item name: "Pickups.PickupRL".
+    virtual QString GetFullName() const = 0;
+
+    //! Get only nameof group from prototype.
+    virtual QString GetGroupName() = 0;
+    //! Get short name of prototype without group.
+    virtual QString GetShortName() = 0;
+
+    //! Serialize library item to archive.
+    virtual void Serialize(SerializeContext& ctx) = 0;
+
+    //! Generate new unique id for this item.
+    virtual void GenerateId() = 0;
+    //! Returns GUID of this material.
+    virtual const GUID& GetGUID() const = 0;
+
+    //! Validate item for errors.
+    virtual void Validate() {};
+
+    //! Gathers resources by this item.
+    virtual void GatherUsedResources([[maybe_unused]] CUsedResources& resources) {};
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IDATABASEITEM_H
diff --git a/Code/Editor/Include/IDataBaseLibrary.h b/Code/Editor/Include/IDataBaseLibrary.h
new file mode 100644
index 0000000000..1e55c476b9
--- /dev/null
+++ b/Code/Editor/Include/IDataBaseLibrary.h
@@ -0,0 +1,117 @@
+/*
+ * 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_INCLUDE_IDATABASELIBRARY_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IDATABASELIBRARY_H
+#pragma once
+
+
+struct IDataBaseManager;
+struct IDataBaseItem;
+
+class QString;
+class XmlNodeRef;
+
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//      Interface to access specific library of editor data base.
+//      Ex. Archetype library, Material Library.
+// See Also:
+//     IDataBaseItem,IDataBaseManager
+//////////////////////////////////////////////////////////////////////////
+struct IDataBaseLibrary
+{
+    // Description:
+    //      Return IDataBaseManager interface to the manager for items stored in this library.
+    virtual IDataBaseManager* GetManager() = 0;
+
+    // Description:
+    //      Return library name.
+    virtual const QString& GetName() const = 0;
+
+    // Description:
+    //      Return filename where this library is stored.
+    virtual const QString& GetFilename() const = 0;
+
+    // Description:
+    //      Save contents of library to file.
+    virtual bool Save() = 0;
+
+    // Description:
+    //      Load library from file.
+    // Arguments:
+    //      filename - Full specified library filename (relative to root game folder).
+    virtual bool Load(const QString& filename) = 0;
+
+    // Description:
+    //      Serialize library parameters and items to/from XML node.
+    virtual void Serialize(XmlNodeRef& node, bool bLoading) = 0;
+
+    // Description:
+    //      Marks library as modified, indicates that some item in library was modified.
+    virtual void SetModified(bool bModified = true) = 0;
+
+    // Description:
+    //      Check if library parameters or any items where modified.
+    //      If any item was modified library may need saving before closing editor.
+    virtual bool IsModified() const = 0;
+
+    // Description:
+    //      Check if this library is not shared and internal to current level.
+    virtual bool IsLevelLibrary() const = 0;
+
+    // Description:
+    //      Make this library accessible only from current Level. (not shared)
+    virtual void SetLevelLibrary(bool bEnable) = 0;
+
+    // Description:
+    //      Associate a new item with the library.
+    //      Watch out if item was already in another library.
+    virtual void AddItem(IDataBaseItem* pItem, bool bRegister = true) = 0;
+
+    // Description:
+    //      Return number of items in library.
+    virtual int GetItemCount() const = 0;
+
+    // Description:
+    //      Get item by index.
+    // See Also:
+    //    GetItemCount
+    // Arguments:
+    //      index - Index from 0 to GetItemCount()
+    virtual IDataBaseItem* GetItem(int index) = 0;
+
+    // Description:
+    //      Remove item from library, does not destroy item,
+    //      only unliks it from this library, to delete item use IDataBaseManager.
+    // See Also:
+    //     AddItem
+    virtual void RemoveItem(IDataBaseItem* item) = 0;
+
+    // Description:
+    //      Remove all items from library, does not destroy items,
+    //      only unliks them from this library, to delete item use IDataBaseManager.
+    // See Also:
+    //      RemoveItem,AddItem
+    virtual void RemoveAllItems() = 0;
+
+    // Description:
+    //      Find item in library by name.
+    //      This function usually uses linear search so it is not particularry fast.
+    // See Also:
+    //      GetItem
+    virtual IDataBaseItem* FindItem(const QString& name) = 0;
+
+
+    //CONFETTI BEGIN
+    // Used to change the library item order
+    virtual void ChangeItemOrder(CBaseLibraryItem* item, unsigned int newLocation) = 0;
+    //CONFETTI END
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IDATABASELIBRARY_H
diff --git a/Code/Editor/Include/IDataBaseManager.h b/Code/Editor/Include/IDataBaseManager.h
new file mode 100644
index 0000000000..f1ef372e6c
--- /dev/null
+++ b/Code/Editor/Include/IDataBaseManager.h
@@ -0,0 +1,133 @@
+/*
+ * 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_INCLUDE_IDATABASEMANAGER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IDATABASEMANAGER_H
+#pragma once
+
+#include <QString>
+
+struct IDataBaseItem;
+struct IDataBaseLibrary;
+class CUsedResources;
+
+enum EDataBaseItemEvent
+{
+    EDB_ITEM_EVENT_ADD,
+    EDB_ITEM_EVENT_DELETE,
+    EDB_ITEM_EVENT_CHANGED,
+    EDB_ITEM_EVENT_SELECTED,
+    EDB_ITEM_EVENT_UPDATE_PROPERTIES,
+    EDB_ITEM_EVENT_UPDATE_PROPERTIES_NO_EDITOR_REFRESH
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//    Callback class to intercept item creation and deletion events.
+//////////////////////////////////////////////////////////////////////////
+struct IDataBaseManagerListener
+{
+    virtual void OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event) = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//    his interface is used to enumerate al items registered to the database manager.
+//////////////////////////////////////////////////////////////////////////
+struct IDataBaseItemEnumerator
+{
+    virtual ~IDataBaseItemEnumerator() = default;
+    
+    virtual void Release() = 0;
+    virtual IDataBaseItem* GetFirst() = 0;
+    virtual IDataBaseItem* GetNext() = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Interface to the collection of all items or specific type
+// in data base libraries.
+//
+//////////////////////////////////////////////////////////////////////////
+struct IDataBaseManager
+{
+    //! Clear all libraries.
+    virtual void ClearAll() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Library items.
+    //////////////////////////////////////////////////////////////////////////
+    //! Make a new item in specified library.
+    virtual IDataBaseItem* CreateItem(IDataBaseLibrary* pLibrary) = 0;
+    //! Delete item from library and manager.
+    virtual void DeleteItem(IDataBaseItem* pItem) = 0;
+
+    //! Find Item by its GUID.
+    virtual IDataBaseItem* FindItem(REFGUID guid) const = 0;
+    virtual IDataBaseItem* FindItemByName(const QString& fullItemName) = 0;
+
+    virtual IDataBaseItemEnumerator* GetItemEnumerator() = 0;
+
+    // Select one item in DB.
+    virtual void SetSelectedItem(IDataBaseItem* pItem) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Libraries.
+    //////////////////////////////////////////////////////////////////////////
+    //! Add Item library.   Set isLevelLibrary to true if its the "level" library which gets saved inside the level
+    virtual IDataBaseLibrary* AddLibrary(const QString& library, bool isLevelLibrary = false, bool bIsLoading = true) = 0;
+    virtual void DeleteLibrary(const QString& library, bool forceDeleteLibrary = false) = 0;
+    //! Get number of libraries.
+    virtual int GetLibraryCount() const = 0;
+    //! Get Item library by index.
+    virtual IDataBaseLibrary* GetLibrary(int index) const = 0;
+
+    //! Find Items Library by name.
+    virtual IDataBaseLibrary* FindLibrary(const QString& library) = 0;
+
+    //! Load Items library.
+#ifdef LoadLibrary
+#undef LoadLibrary
+#endif
+    virtual IDataBaseLibrary* LoadLibrary(const QString& filename, bool bReload = false) = 0;
+
+    //! Save all modified libraries.
+    virtual void SaveAllLibs() = 0;
+
+    //! Serialize property manager.
+    virtual void Serialize(XmlNodeRef& node, bool bLoading) = 0;
+
+    //! Export items to game.
+    virtual void Export([[maybe_unused]] XmlNodeRef& node) {};
+
+    //! Returns unique name base on input name.
+    virtual QString MakeUniqueItemName(const QString& name, const QString& libName = "") = 0;
+    virtual QString MakeFullItemName(IDataBaseLibrary* pLibrary, const QString& group, const QString& itemName) = 0;
+
+    //! Root node where this library will be saved.
+    virtual QString GetRootNodeName() = 0;
+    //! Path to libraries in this manager.
+    virtual QString GetLibsPath() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Validate library items for errors.
+    virtual void Validate() = 0;
+
+    // Description:
+    //      Collects names of all resource files used by managed items.
+    // Arguments:
+    //      resources - Structure where all filenames are collected.
+    virtual void GatherUsedResources(CUsedResources& resources) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Register listeners.
+    virtual void AddListener(IDataBaseManagerListener* pListener) = 0;
+    virtual void RemoveListener(IDataBaseManagerListener* pListener) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IDATABASEMANAGER_H
diff --git a/Code/Editor/Include/IDisplayViewport.h b/Code/Editor/Include/IDisplayViewport.h
new file mode 100644
index 0000000000..d53e1cfca0
--- /dev/null
+++ b/Code/Editor/Include/IDisplayViewport.h
@@ -0,0 +1,70 @@
+/*
+ * 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_INCLUDE_IDISPLAYVIEWPORT_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
+#pragma once
+
+struct DisplayContext;
+class CBaseObjectsCache;
+class QPoint;
+class CCamera;
+struct AABB;
+class CViewport;
+
+// Viewport functionality required for DisplayContext
+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.
+     * @param lineP1 The first point of the line, in world space.
+     * @param lineP2 The second point of the line, in world space.
+     * @param point The point to check the distance from the line. This point is in screen space.
+     * @return The distance of the point to the line.
+    */
+    virtual float GetDistanceToLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& point) const = 0;
+
+    virtual CBaseObjectsCache* GetVisibleObjectsCache() = 0;
+
+    enum EAxis
+    {
+        AXIS_NONE,
+        AXIS_X,
+        AXIS_Y,
+        AXIS_Z
+    };
+    virtual void GetPerpendicularAxis(EAxis* axis, bool* is2D) const = 0;
+
+    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;
+
+    virtual void ScreenToClient(QPoint& pt) const = 0;
+    virtual void GetDimensions(int* width, int* height) const = 0;
+
+    virtual CViewport *asCViewport() { return nullptr; }
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
diff --git a/Code/Editor/Include/IEditorClassFactory.h b/Code/Editor/Include/IEditorClassFactory.h
new file mode 100644
index 0000000000..bbd0979b72
--- /dev/null
+++ b/Code/Editor/Include/IEditorClassFactory.h
@@ -0,0 +1,170 @@
+/*
+ * 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 : Class factory support classes
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEDITORCLASSFACTORY_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IEDITORCLASSFACTORY_H
+#pragma once
+
+#include <vector>
+
+#define DEFINE_UUID(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+static const GUID uuid() { return { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }; }
+
+#ifdef AZ_PLATFORM_WINDOWS
+#include <Unknwn.h>
+#else
+struct IUnknown
+{
+    virtual ~IUnknown() = default;
+};
+#endif
+
+#ifdef __uuidof
+#undef __uuidof
+#endif
+#define __uuidof(T) T::uuid()
+
+#if defined(AZ_PLATFORM_LINUX)
+
+# ifndef _REFGUID_DEFINED
+# define _REFGUID_DEFINED
+typedef const GUID& REFGUID;
+# endif
+
+# ifndef _REFIID_DEFINED
+# define _REFIID_DEFINED
+typedef const GUID& REFIID;
+# endif
+
+# ifndef IID_DEFINED
+# define IID_DEFINED
+typedef GUID IID;
+# endif
+
+#ifndef HRESULT_VALUES_DEFINED
+#define HRESULT_VALUES_DEFINED
+enum
+{
+    E_OUTOFMEMORY  = 0x8007000E,
+    E_FAIL         = 0x80004005,
+    E_ABORT        = 0x80004004,
+    E_INVALIDARG   = 0x80070057,
+    E_NOINTERFACE  = 0x80004002,
+    E_NOTIMPL      = 0x80004001,
+    E_UNEXPECTED   = 0x8000FFFF
+};
+#endif
+
+#endif  // defined(AZ_PLATFORM_LINUX)
+
+#include "SandboxAPI.h"
+
+class QObject;
+class QString;
+
+
+//! System class IDs
+enum ESystemClassID
+{
+    ESYSTEM_CLASS_OBJECT = 0x0001,
+    ESYSTEM_CLASS_EDITTOOL = 0x0002,
+    ESYSTEM_CLASS_PREFERENCE_PAGE = 0x0020,
+    ESYSTEM_CLASS_VIEWPANE = 0x0021,
+    //! Source/Asset Control Management Provider
+    ESYSTEM_CLASS_SCM_PROVIDER = 0x0022,
+    ESYSTEM_CLASS_CONSOLE_CONNECTIVITY = 0x0023,
+    ESYSTEM_CLASS_ASSET_DISPLAY = 0x0024,
+    ESYSTEM_CLASS_ASSET_TAGGING = 0x0025,
+    ESYSTEM_CLASS_FRAMEWND_EXTENSION_PANE = 0x0030,
+    ESYSTEM_CLASS_TRACKVIEW_KEYUI = 0x0040,
+    ESYSTEM_CLASS_UITOOLS = 0x0050, // UI Emulator tool
+    ESYSTEM_CLASS_CONTROL = 0x0900,
+    ESYSTEM_CLASS_USER = 0x1000
+};
+
+//! This interface describes a class created by a plugin
+struct IClassDesc
+    : public IUnknown
+{
+    //////////////////////////////////////////////////////////////////////////
+    // IUnknown implementation.
+    //////////////////////////////////////////////////////////////////////////
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] const IID& riid, [[maybe_unused]] void** ppvObj) { return E_NOINTERFACE; }
+    virtual ULONG STDMETHODCALLTYPE AddRef() { return 0; }
+    virtual ULONG STDMETHODCALLTYPE Release() { return 0; }
+
+    template<class Q>
+    HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)
+    {
+        return QueryInterface(__uuidof(Q), (void**)pp);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Class description.
+    //////////////////////////////////////////////////////////////////////////
+    //! This method returns an Editor defined GUID describing the class this plugin class is associated with.
+    virtual ESystemClassID SystemClassID() = 0;
+    //! Return the GUID of the class created by plugin.
+    virtual REFGUID ClassID() = 0;
+    //! This method returns the human readable name of the class.
+    virtual QString ClassName() = 0;
+    //! This method returns Category of this class, Category is specifying where this plugin class fits best in
+    //! create panel.
+    virtual QString Category() = 0;
+
+#ifdef QSTRING_H
+    virtual QString MenuSuggestion() { return QString(); }
+    virtual QString Tooltip() { return QString(); }
+    virtual QString Description() { return QString(); }
+#else
+    //! This method returns the desired menu in which this plugin class would like to be placed in the editor.
+    //! It is up to the editor to determine if it can and wants to fulfill this request.
+    virtual QString MenuSuggestion();
+    //! This method returns the tooltip for the pane
+    virtual QString Tooltip();
+    //! This method returns the description for the pane
+    virtual QString Description();
+#endif
+
+    //! This method returns if the plugin should have a menu item for its pane.
+    virtual bool ShowInMenu() const { return true; }
+    //! Qt equivalent of CRuntimeClass::CreateObject(). We might create a full QRuntimeClass, if there's a need for it.
+    virtual QObject* CreateQObject() const { return nullptr; }
+
+    //! For any class that may be conditionally enabled or disabled, this function can be overriden to return true if it is enabled, false otherwise.
+    //! The default is to always return true.
+    virtual bool IsEnabled() const { return true; }
+    //////////////////////////////////////////////////////////////////////////
+};
+
+
+struct IViewPaneClass;
+
+struct CRYEDIT_API IEditorClassFactory
+{
+public:
+    virtual ~IEditorClassFactory() = default;
+
+    //! Register new class to the factory.
+    virtual void RegisterClass(IClassDesc* pClassDesc) = 0;
+    //! Find class in the factory by class name.
+    virtual IClassDesc* FindClass(const char* pClassName) const = 0;
+    //! Find class in the factory by class id
+    virtual IClassDesc* FindClass(const GUID& rClassID) const = 0;
+    virtual IViewPaneClass* FindViewPaneClassByTitle(const char* pPaneTitle) const = 0;
+    virtual void UnregisterClass(const char* pClassName) = 0;
+    virtual void UnregisterClass(const GUID& rClassID) = 0;
+    //! Get classes that matching specific requirements.
+    virtual void GetClassesBySystemID(ESystemClassID aSystemClassID, std::vector<IClassDesc*>& rOutClasses) = 0;
+    virtual void GetClassesByCategory(const char* pCategory, std::vector<IClassDesc*>& rOutClasses) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IEDITORCLASSFACTORY_H
diff --git a/Code/Editor/Include/IEditorFileMonitor.h b/Code/Editor/Include/IEditorFileMonitor.h
new file mode 100644
index 0000000000..3bf2fc72da
--- /dev/null
+++ b/Code/Editor/Include/IEditorFileMonitor.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEDITORFILEMONITOR_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IEDITORFILEMONITOR_H
+#pragma once
+
+struct IFileChangeListener
+{
+    enum EChangeType
+    {
+        //! error or unknown change type
+        eChangeType_Unknown,
+        //! the file was created
+        eChangeType_Created,
+        //! the file was deleted
+        eChangeType_Deleted,
+        //! the file was modified (size changed,write)
+        eChangeType_Modified,
+        //! this is the old name of a renamed file
+        eChangeType_RenamedOldName,
+        //! this is the new name of a renamed file
+        eChangeType_RenamedNewName
+    };
+
+    virtual ~IFileChangeListener() = default;
+    
+    virtual void OnFileChange(const char* sFilename, EChangeType eType) = 0;
+};
+
+struct IFileChangeMonitor
+{
+    virtual ~IFileChangeMonitor() = default;
+
+    // <interfuscator:shuffle>
+    // Register the path of a file or directory to monitor
+    // Path is relative to game directory, e.g. "Libs/WoundSystem/" or "Libs/WoundSystem/HitLocations.xml"
+    virtual bool RegisterListener(IFileChangeListener* pListener, const char* sMonitorItem) = 0;
+    // This function can be used to monitor files of specific type, e.g.
+    //   RegisterListener(pListener, "Animations", "caf")
+    virtual bool RegisterListener(IFileChangeListener* pListener, const char* sFolder, const char* sExtension) = 0;
+    virtual bool UnregisterListener(IFileChangeListener* pListener) = 0;
+    // </interfuscator:shuffle>
+};
+
+struct IEditorFileMonitor
+    : public IFileChangeMonitor
+{
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IEDITORFILEMONITOR_H
diff --git a/Code/Editor/Include/IEditorMaterial.h b/Code/Editor/Include/IEditorMaterial.h
new file mode 100644
index 0000000000..59aa19a17a
--- /dev/null
+++ b/Code/Editor/Include/IEditorMaterial.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
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEDITORMATERIAL_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IEDITORMATERIAL_H
+
+
+#include "BaseLibraryItem.h"
+#include <IMaterial.h>
+
+struct IEditorMaterial
+    : public CBaseLibraryItem
+{
+    virtual int GetFlags() const = 0;
+    virtual _smart_ptr<IMaterial> GetMatInfo(bool bUseExistingEngineMaterial = false) = 0;
+    virtual void DisableHighlightForFrame() = 0;
+};
+
+#endif
diff --git a/Code/Editor/Include/IEditorMaterialManager.h b/Code/Editor/Include/IEditorMaterialManager.h
new file mode 100644
index 0000000000..1e6b585221
--- /dev/null
+++ b/Code/Editor/Include/IEditorMaterialManager.h
@@ -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
+ *
+ */
+#ifndef CRYINCLUDE_EDITOR_MATERIAL_IEDITORMATERIALMANAGER_H
+#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>
+
+
+struct IEditorMaterialManager
+{
+    virtual void GotoMaterial(_smart_ptr<IMaterial> pMaterial) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_MATERIAL_MATERIALMANAGER_H
diff --git a/Code/Editor/Include/IErrorReport.h b/Code/Editor/Include/IErrorReport.h
new file mode 100644
index 0000000000..dd0400b61c
--- /dev/null
+++ b/Code/Editor/Include/IErrorReport.h
@@ -0,0 +1,72 @@
+/*
+ * 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 : Class that collects error reports to present them later.
+
+#ifndef CRYINCLUDE_EDITOR_INTERFACE_ERRORREPORT_H
+#define CRYINCLUDE_EDITOR_INTERFACE_ERRORREPORT_H
+#pragma once
+
+#include <IValidator.h>
+
+// forward declarations.
+class CParticleItem;
+class CBaseObject;
+class CBaseLibraryItem;
+class CErrorRecord;
+
+/*! Error report manages collection of errors occurred during map analyzes or level load.
+ */
+struct IErrorReport
+    : public IValidator
+{
+    virtual ~IErrorReport(){}
+
+    //! If enabled errors are reported immediately and not stored.
+    virtual void SetImmediateMode(bool bEnable) = 0;
+
+    virtual bool IsImmediateMode() const = 0;
+
+    virtual void SetShowErrors(bool bShowErrors = true) = 0;
+
+    //! Adds new error to report.
+    virtual void ReportError(CErrorRecord& err) = 0;
+
+    //! Check if error report have any errors.
+    virtual bool IsEmpty() const = 0;
+
+    //! Get number of contained error records.
+    virtual int GetErrorCount() const = 0;
+
+    //! Get access to indexed error record.
+    virtual CErrorRecord& GetError(int i) = 0;
+
+    //! Clear all error records.
+    virtual void Clear() = 0;
+
+    //! Display dialog with all errors.
+    virtual void Display() = 0;
+
+    //! Assign current Object to which new reported warnings are assigned.
+    virtual void SetCurrentValidatorObject(CBaseObject* pObject) = 0;
+
+    //! Assign current Item to which new reported warnings are assigned.
+    virtual void SetCurrentValidatorItem(CBaseLibraryItem* pItem) = 0;
+
+    //! Assign current filename.
+    virtual void SetCurrentFile(const QString& file) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Implement IValidator interface.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void Report(SValidatorRecord& record) = 0;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_ERRORREPORT_H
diff --git a/Code/Editor/Include/IEventLoopHook.h b/Code/Editor/Include/IEventLoopHook.h
new file mode 100644
index 0000000000..aae7c01d7d
--- /dev/null
+++ b/Code/Editor/Include/IEventLoopHook.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
+#pragma once
+
+struct IEventLoopHook
+{
+    IEventLoopHook* pNextHook;
+
+    IEventLoopHook()
+        : pNextHook(0) {}
+
+    virtual bool PrePumpMessage() { return false; }
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
diff --git a/Code/Editor/Include/IExportManager.h b/Code/Editor/Include/IExportManager.h
new file mode 100644
index 0000000000..76e8727e47
--- /dev/null
+++ b/Code/Editor/Include/IExportManager.h
@@ -0,0 +1,194 @@
+/*
+ * 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 : 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
+{
+    struct Vector3D
+    {
+        float x, y, z;
+    };
+
+
+    struct Quat
+    {
+        Vector3D v;
+        float w;
+    };
+
+
+    struct UV
+    {
+        float u, v;
+    };
+
+
+    struct Face
+    {
+        uint32 idx[3];
+    };
+
+
+    struct Color
+    {
+        float r, g, b, a;
+    };
+
+    typedef char TPath[_MAX_PATH];
+
+    struct Material
+    {
+        Color diffuse;
+        Color specular;
+        float opacity;
+        float smoothness;
+        char name[EXP_NAMESIZE];
+        TPath mapDiffuse;
+        TPath mapSpecular;
+        TPath mapOpacity;
+        TPath mapNormals;
+        TPath mapDecal;
+        TPath mapDisplacement;
+    };
+
+
+    struct Mesh
+    {
+        Material material;
+
+        virtual int GetFaceCount() const = 0;
+        virtual const Face* GetFaceBuffer() const = 0;
+    };
+
+    // The numbers in this enum list must reflect the one from AnimParamType.h
+    enum AnimParamType
+    {
+        FOV         = 0,
+        PositionX   = 51,
+        PositionY   = 52,
+        PositionZ   = 53,
+        RotationX   = 54,
+        RotationY   = 55,
+        RotationZ   = 56,
+
+        // FocalLength is an exceptional case for FBX importing from Maya. In engine we use FoV, not Focal Length, therefore
+        // there is no equivalent AnimParamType::FocalLength in IMovieSystem.h. However we enumerate it here so we can detect
+        // and convert it to FoV during import
+        FocalLength,
+    };
+
+    enum EEntityObjectType
+    {
+        eEntity = 0,
+        eCamera = 1,
+        eCameraTarget = 2,
+    };
+
+    struct EntityAnimData
+    {
+        AnimParamType dataType;
+        float keyTime;
+        float keyValue;
+        float leftTangent;
+        float rightTangent;
+        float leftTangentWeight;
+        float rightTangentWeight;
+    };
+
+    struct Object
+    {
+        Vector3D pos;
+        Quat rot;
+        Vector3D scale;
+        char name[EXP_NAMESIZE];
+        char materialName[EXP_NAMESIZE];
+        int nParent;
+        EEntityObjectType entityType;
+        char cameraTargetNodeName[EXP_NAMESIZE];
+
+        virtual int GetVertexCount() const = 0;
+        virtual const Vector3D* GetVertexBuffer() const = 0;
+
+        virtual int GetNormalCount() const = 0;
+        virtual const Vector3D* GetNormalBuffer() const = 0;
+
+        virtual int GetTexCoordCount() const = 0;
+        virtual const UV* GetTexCoordBuffer() const = 0;
+
+        virtual int GetMeshCount() const = 0;
+        virtual Mesh* GetMesh(int index) const = 0;
+
+        virtual size_t  MeshHash() const =   0;
+
+        virtual int GetEntityAnimationDataCount() const = 0;
+        virtual const EntityAnimData* GetEntityAnimationData(int index) const = 0;
+        virtual void SetEntityAnimationData(EntityAnimData entityData) = 0;
+    };
+
+
+    // IData: Collection of data like object meshes, materials, animations, etc.
+    // used for export
+    // This data is collected by Export Manager implementation
+    struct IData
+    {
+        virtual int GetObjectCount() const = 0;
+        virtual Object* GetObject(int index) const = 0;
+        virtual Object* AddObject(const char* objectName) = 0;
+    };
+} // namespace Export
+
+
+
+// IExporter: interface to present an exporter
+// Exporter is responding to export data from object of IData type
+// to file with specified format
+// Exporter could be provided by user through plug-in system
+struct IExporter
+{
+    virtual ~IExporter() = default;
+    
+    // Get file extension of exporter type, f.i. "obj"
+    virtual const char* GetExtension() const = 0;
+
+    // Get short format description for showing it in FileSave dialog
+    // Example: "Object format"
+    virtual const char* GetShortDescription() const = 0;
+
+    // Implementation of en exporting data to the file
+    virtual bool ExportToFile(const char* filename, const Export::IData* pData) = 0;
+    virtual bool ImportFromFile(const char* filename, Export::IData* pData) = 0;
+
+    // Before Export Manager is destroyed Release will be called
+    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/IFacialEditor.h b/Code/Editor/Include/IFacialEditor.h
new file mode 100644
index 0000000000..da282553d1
--- /dev/null
+++ b/Code/Editor/Include/IFacialEditor.h
@@ -0,0 +1,42 @@
+/*
+ * 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_INCLUDE_IFACIALEDITOR_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IFACIALEDITOR_H
+#pragma once
+
+
+class IFacialEditor
+{
+public:
+    enum EyeType
+    {
+        EYE_LEFT,
+        EYE_RIGHT
+    };
+
+    virtual int GetNumMorphTargets() const = 0;
+    virtual const char* GetMorphTargetName(int index) const = 0;
+    virtual void PreviewEffector(int index, float value) = 0;
+    virtual void ClearAllPreviewEffectors() = 0;
+    virtual void SetForcedNeckRotation(const Quat& rotation) = 0;
+    virtual void SetForcedEyeRotation(const Quat& rotation, EyeType eye) = 0;
+    virtual int GetJoystickCount() const = 0;
+    virtual const char* GetJoystickName(int joystickIndex) const = 0;
+    virtual void SetJoystickPosition(int joystickIndex, float x, float y) = 0;
+    virtual void GetJoystickPosition(int joystickIndex, float& x, float& y) const = 0;
+    virtual void LoadJoystickFile(const char* filename) = 0;
+    virtual void LoadCharacter(const char* filename) = 0;
+    virtual void LoadSequence(const char* filename) = 0;
+    virtual void SetVideoFrameResolution(int width, int height, int bpp) = 0;
+    virtual int GetVideoFramePitch() = 0;
+    virtual void* GetVideoFrameBits() = 0;
+    virtual void ShowVideoFramePane() = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IFACIALEDITOR_H
diff --git a/Code/Editor/Include/IFileUtil.h b/Code/Editor/Include/IFileUtil.h
new file mode 100644
index 0000000000..5981963133
--- /dev/null
+++ b/Code/Editor/Include/IFileUtil.h
@@ -0,0 +1,208 @@
+/*
+ * 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 "StringUtils.h"
+#include "../Include/SandboxAPI.h"
+
+class QWidget;
+
+#ifdef CreateDirectory
+#undef CreateDirectory
+#endif
+
+#ifdef RemoveDirectory
+#undef RemoveDirectory
+#endif
+
+#ifdef CopyFile
+#undef CopyFile
+#endif
+
+#ifdef MoveFile
+#undef MoveFile
+#endif
+
+#ifdef DeleteFile
+#undef DeleteFile
+#endif
+
+namespace AzToolsFramework
+{
+    struct SourceControlFileInfo;
+}
+
+typedef int (*ProgressRoutine)(
+    qint64 totalFileSize,
+    qint64 totalBytesTransferred,
+    qint64 streamSize,
+    qint64 streamBytesTransferred,
+    long   streamNumber,
+    long   callbackReason,
+    void*  sourceFile,
+    void*  destinationFile,
+    void*  data
+);
+
+struct IFileUtil
+{
+    //! File types used for File Open dialogs
+    enum ECustomFileType
+    {
+        EFILE_TYPE_ANY,
+        EFILE_TYPE_GEOMETRY,
+        EFILE_TYPE_TEXTURE,
+        EFILE_TYPE_SOUND,
+        EFILE_TYPE_GEOMCACHE,
+        EFILE_TYPE_LAST,
+    };
+
+    struct FileDesc
+    {
+        QString filename;
+        unsigned int attrib;
+        time_t  time_create;    //! -1 for FAT file systems
+        time_t  time_access;    //! -1 for FAT file systems
+        time_t  time_write;
+        int64 size;
+    };
+
+    enum ETextFileType
+    {
+        FILE_TYPE_SCRIPT,
+        FILE_TYPE_SHADER,
+        FILE_TYPE_BSPACE,   // added back in 3.8 integration, may not end up needing this.
+    };
+
+    enum ECopyTreeResult
+    {
+        ETREECOPYOK,
+        ETREECOPYFAIL,
+        ETREECOPYUSERCANCELED,
+        ETREECOPYUSERDIDNTCOPYSOMEITEMS,
+    };
+
+    struct ExtraMenuItems
+    {
+        QStringList names;
+        int selectedIndexIfAny;
+
+        ExtraMenuItems()
+            : selectedIndexIfAny(-1) {}
+
+        int AddItem(const QString& name)
+        {
+            names.push_back(name);
+            return names.size() - 1;
+        }
+    };
+
+    typedef DynArray<FileDesc> FileArray;
+
+    typedef bool (* ScanDirectoryUpdateCallBack)(const QString& msg);
+
+    virtual ~IFileUtil() = default;
+
+    virtual bool ScanDirectory(const QString& path, const QString& fileSpec, FileArray& files, bool recursive = true, bool addDirAlso = false, ScanDirectoryUpdateCallBack updateCB = nullptr, bool bSkipPaks = false) = 0;
+
+    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
+    virtual bool CalculateDccFilename(const QString& assetFilename, QString& dccFilename) = 0;
+
+    //! Reformat filter string for (MFC) CFileDialog style file filtering
+    virtual void FormatFilterString(QString& filter) = 0;
+
+    virtual bool SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName) = 0;
+
+    //! Attempt to make a file writable
+    virtual bool OverwriteFile(const QString& filename) = 0;
+
+    //! Checks out the file from source control API.  Blocks until completed
+    virtual bool CheckoutFile(const char* filename, QWidget* parentWindow = nullptr) = 0;
+
+    //! Discard changes to a file from source control API.  Blocks until completed
+    virtual bool RevertFile(const char* filename, QWidget* parentWindow = nullptr) = 0;
+
+    //! Renames (moves) a file through the source control API.  Blocks until completed
+    virtual bool RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow = nullptr) = 0;
+
+    //! Deletes a file using source control API.  Blocks until completed
+    virtual bool DeleteFromSourceControl(const char* filename, QWidget* parentWindow = nullptr) = 0;
+
+    //! Attempts to get the latest version of a file from source control.  Blocks until completed
+    virtual bool GetLatestFromSourceControl(const char* filename, QWidget* parentWindow = nullptr) = 0;
+
+    //! Gather information about a file using the source control API.  Blocks until completed
+    virtual bool GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow = nullptr) = 0;
+
+    //! Creates this directory.
+    virtual void CreateDirectory(const char* dir) = 0;
+
+    //! Makes a backup file.
+    virtual void BackupFile(const char* filename) = 0;
+
+    //! Makes a backup file, marked with a datestamp, e.g. myfile.20071014.093320.xml
+    //! If bUseBackupSubDirectory is true, moves backup file into a relative subdirectory "backups"
+    virtual void BackupFileDated(const char* filename, bool bUseBackupSubDirectory = false) = 0;
+
+    // ! Added deltree as a copy from the function found in Crypak.
+    virtual bool Deltree(const char* szFolder, bool bRecurse) = 0;
+
+    // Checks if a file or directory exist.
+    // We are using 3 functions here in order to make the names more instructive for the programmers.
+    // Those functions only work for OS files and directories.
+    virtual bool Exists(const QString& strPath, bool boDirectory, FileDesc* pDesc = nullptr) = 0;
+    virtual bool FileExists(const QString& strFilePath, FileDesc* pDesc = nullptr) = 0;
+    virtual bool PathExists(const QString& strPath) = 0;
+    virtual bool GetDiskFileSize(const char* pFilePath, uint64& rOutSize) = 0;
+
+    // This function should be used only with physical files.
+    virtual bool IsFileExclusivelyAccessable(const QString& strFilePath) = 0;
+
+    // Creates the entire path, if needed.
+    virtual bool CreatePath(const QString& strPath) = 0;
+
+    // Attempts to delete a file (if read only it will set its attributes to normal first).
+    virtual bool DeleteFile(const QString& strPath) = 0;
+
+    // Attempts to remove a directory (if read only it will set its attributes to normal first).
+    virtual bool RemoveDirectory(const QString& strPath) = 0;
+
+    // Copies all the elements from the source directory to the target directory.
+    // It doesn't copy the source folder to the target folder, only it's contents.
+    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
+    virtual ECopyTreeResult CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
+    // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
+    virtual ECopyTreeResult CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = nullptr, bool* pbCancel = nullptr) = 0;
+
+    // As we don't have a FileUtil interface here, we have to duplicate some code :-( in order to keep
+    // function calls clean.
+    // Moves all the elements from the source directory to the target directory.
+    // It doesn't move the source folder to the target folder, only it's contents.
+    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
+    virtual ECopyTreeResult MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) = 0;
+
+    virtual void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false) = 0;
+
+    // Get file attributes include source control attributes if available
+    virtual uint32 GetAttributes(const char* filename, bool bUseSourceControl = true) = 0;
+
+    // Returns true if the files have the same content, false otherwise
+    virtual bool CompareFiles(const QString& strFilePath1, const QString& strFilePath2) = 0;
+
+    virtual QString GetPath(const QString& path) = 0;
+};
diff --git a/Code/Editor/Include/IGizmoManager.h b/Code/Editor/Include/IGizmoManager.h
new file mode 100644
index 0000000000..825d049d02
--- /dev/null
+++ b/Code/Editor/Include/IGizmoManager.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IGIZMOMANAGER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IGIZMOMANAGER_H
+#pragma once
+
+class CGizmo;
+struct DisplayContext;
+struct HitContext;
+
+/** GizmoManager manages set of currently active Gizmo objects.
+*/
+struct IGizmoManager
+{
+    virtual ~IGizmoManager() = default;
+    
+    virtual void AddGizmo(CGizmo* gizmo) = 0;
+    virtual void RemoveGizmo(CGizmo* gizmo) = 0;
+
+    virtual int GetGizmoCount() const = 0;
+    virtual CGizmo* GetGizmoByIndex(int nIndex) const = 0;
+
+    virtual void Display(DisplayContext& dc) = 0;
+    virtual bool HitTest(HitContext& hc) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IGIZMOMANAGER_H
diff --git a/Code/Editor/Include/IIconManager.h b/Code/Editor/Include/IIconManager.h
new file mode 100644
index 0000000000..3248a2c67e
--- /dev/null
+++ b/Code/Editor/Include/IIconManager.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
+#pragma once
+
+struct IStatObj;
+struct IMaterial;
+class CBitmap;
+
+// Note: values are used as array indices
+enum EStatObject
+{
+    eStatObject_Arrow = 0,
+    eStatObject_Axis,
+    eStatObject_Sphere,
+    eStatObject_Anchor,
+    eStatObject_Entrance,
+    eStatObject_HidePoint,
+    eStatObject_HidePointSecondary,
+    eStatObject_ReinforcementSpot,
+
+    eStatObject_COUNT
+};
+
+// Note: values are used as array indices
+enum EIcon
+{
+    eIcon_ScaleWarning = 0,
+    eIcon_RotationWarning,
+
+    eIcon_COUNT
+};
+
+// Note: image effects to apply to image
+enum EIconEffect
+{
+    eIconEffect_Dim = 1 << 0,
+    eIconEffect_HalfAlpha = 1 << 1,
+    eIconEffect_TintRed = 1 << 2,
+    eIconEffect_TintGreen = 1 << 3,
+    eIconEffect_TintYellow = 1 << 4,
+    eIconEffect_ColorEnabled = 1 << 5,
+    eIconEffect_ColorDisabled = 1 << 6,
+};
+
+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/IImageUtil.h b/Code/Editor/Include/IImageUtil.h
new file mode 100644
index 0000000000..2a32861d75
--- /dev/null
+++ b/Code/Editor/Include/IImageUtil.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
+ *
+ */
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H
+#pragma once
+
+#include "Util/Image.h"
+class CAlphaBitmap;
+
+struct IImageUtil
+{
+    virtual ~IImageUtil() = default;
+    
+    //! Load image, detect image type by file extension.
+    // Arguments:
+    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
+    virtual bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0) = 0;
+
+    //! Save image, detect image type by file extension.
+    virtual bool SaveImage(const QString& fileName, CImageEx& image) = 0;
+
+    // General image fucntions
+    virtual bool LoadJPEG(const QString& strFileName, CImageEx& image) = 0;
+
+    virtual bool SaveJPEG(const QString& strFileName, CImageEx& image) = 0;
+
+    virtual bool SaveBitmap(const QString& szFileName, CImageEx& image) = 0;
+
+    virtual bool LoadBmp(const QString& file, CImageEx& image) = 0;
+
+    virtual bool SavePGM(const QString& fileName, const CImageEx& image) = 0;
+
+    virtual bool LoadPGM(const QString& fileName, CImageEx& image) = 0;
+
+    //! Scale source image to fit size of target image.
+    virtual void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage) = 0;
+
+    //! Scale source image to fit size of target image.
+    virtual void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage) = 0;
+
+    //! Scale source image to fit twice side by side in target image.
+    virtual void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage) = 0;
+
+    //! Scale source image twice down image with filering
+    enum _EAddrMode
+    {
+        WRAP, CLAMP
+    };
+    virtual void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, _EAddrMode eAddressingMode = WRAP) = 0;
+
+    //! Smooth image.
+    virtual void SmoothImage(CByteImage& image, int numSteps) = 0;
+
+    //! behavior outside of the texture is not defined
+    //! \param iniX in fix point 24.8
+    //! \param iniY in fix point 24.8
+    //! \return 0..255
+    virtual unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image) = 0;
+};
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H
diff --git a/Code/Editor/Include/IKeyTimeSet.h b/Code/Editor/Include/IKeyTimeSet.h
new file mode 100644
index 0000000000..d1edf87dc6
--- /dev/null
+++ b/Code/Editor/Include/IKeyTimeSet.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IKEYTIMESET_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IKEYTIMESET_H
+#pragma once
+
+
+class IKeyTimeSet
+{
+public:
+    virtual int GetKeyTimeCount() const = 0;
+    virtual float GetKeyTime(int index) const = 0;
+    virtual void MoveKeyTimes(int numChanges, int* indices, float scale, float offset, bool copyKeys) = 0;
+    virtual bool GetKeyTimeSelected(int index) const = 0;
+    virtual void SetKeyTimeSelected(int index, bool selected) = 0;
+    virtual int GetKeyCount(int index) const = 0;
+    virtual int GetKeyCountBound() const = 0;
+    virtual void BeginEdittingKeyTimes() = 0;
+    virtual void EndEdittingKeyTimes() = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IKEYTIMESET_H
diff --git a/Code/Editor/Include/ILogFile.h b/Code/Editor/Include/ILogFile.h
new file mode 100644
index 0000000000..9886a7c906
--- /dev/null
+++ b/Code/Editor/Include/ILogFile.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#ifndef CRYINCLUDE_EDITORCORE_INCLUDE_ILOGFILE_H
+#define CRYINCLUDE_EDITORCORE_INCLUDE_ILOGFILE_H
+
+#pragma once
+
+struct ILogFile
+{
+    virtual ~ILogFile() = default;
+    
+    virtual const char* GetLogFileName() = 0;
+
+    //! Write to log spanpshot of current process memory usage.
+    virtual QString GetMemUsage() = 0;
+
+    virtual void WriteString(const char* pszString) = 0;
+    virtual void WriteLine(const char* pszLine) = 0;
+    virtual void FormatLine(const char* pszMessage, ...) = 0;
+
+    // logs some useful information
+    // should be called after CryLog() is available
+    virtual void AboutSystem() = 0;
+
+    virtual void Warning(const char* format, ...) = 0;
+};
+
+#endif // CRYINCLUDE_EDITORCORE_INCLUDE_ILOGFILE_H
diff --git a/Code/Editor/Include/IObjectManager.h b/Code/Editor/Include/IObjectManager.h
new file mode 100644
index 0000000000..7d4856bd33
--- /dev/null
+++ b/Code/Editor/Include/IObjectManager.h
@@ -0,0 +1,278 @@
+/*
+ * 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_INCLUDE_IOBJECTMANAGER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
+#pragma once
+
+// forward declarations.
+class CEntityObject;
+struct DisplayContext;
+struct IGizmoManager;
+class CTrackViewAnimNode;
+class CUsedResources;
+class CSelectionGroup;
+class CObjectClassDesc;
+class CObjectArchive;
+class CViewport;
+struct HitContext;
+enum class ImageRotationDegrees;
+struct IStatObj;
+
+#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.
+//
+//////////////////////////////////////////////////////////////////////////
+struct IObjectManager
+{
+public:
+    virtual ~IObjectManager() = default;
+
+    //! This callback will be called on response to object event.
+    struct EventListener
+    {
+        virtual void OnObjectEvent(CBaseObject*, int) = 0;
+    };
+
+    virtual CBaseObject* NewObject(CObjectClassDesc* cls, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr) = 0;
+    virtual CBaseObject* NewObject(const QString& typeName, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr) = 0;
+    virtual CBaseObject* NewObject(CObjectArchive& archive, CBaseObject* pUndoObject = 0, bool bMakeNewId = false) = 0;
+
+    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;
+
+    //! Get array of objects, managed by manager (not contain sub objects of groups).
+    //! @param layer if 0 get objects for all layers, or layer to get objects from.
+    virtual void GetObjects(CBaseObjectsArray& objects) const = 0;
+    virtual void GetObjects(DynArray<CBaseObject*>& 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;
+
+    //! Send event to all objects.
+    //! Will cause OnEvent handler to be called on all objects.
+    virtual void SendEvent(ObjectEvent event) = 0;
+
+    //! Send event to all objects within given bounding box.
+    //! Will cause OnEvent handler to be called on objects within bounding box.
+    virtual void SendEvent(ObjectEvent event, const AABB& bounds) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find object by ID.
+    virtual CBaseObject* FindObject(REFGUID guid) const = 0;
+    //////////////////////////////////////////////////////////////////////////
+    //! Find object by name.
+    virtual CBaseObject* FindObject(const QString& sName) const = 0;
+    //////////////////////////////////////////////////////////////////////////
+    //! Find objects of given type.
+    virtual void FindObjectsOfType(const QMetaObject* pClass, std::vector<CBaseObject*>& result) = 0;
+    virtual void FindObjectsOfType(ObjectType type, std::vector<CBaseObject*>& result) = 0;
+    //////////////////////////////////////////////////////////////////////////
+    //! 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;
+
+    //! Generates uniq name base on type name of object.
+    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;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! 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/IPlugin.h b/Code/Editor/Include/IPlugin.h
new file mode 100644
index 0000000000..b992da27a4
--- /dev/null
+++ b/Code/Editor/Include/IPlugin.h
@@ -0,0 +1,81 @@
+/*
+ * 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 : To add plug-in to the Editor create a new DLL with class implementation derived from IPlugin
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IPLUGIN_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IPLUGIN_H
+#pragma once
+
+#include <IEditor.h>
+
+// forbid plugins from loading across debug and release:
+
+#define SANDBOX_PLUGIN_SYSTEM_BASE_VERSION 1
+
+#if defined(_DEBUG)
+    #define SANDBOX_PLUGIN_SYSTEM_VERSION (100000 + SANDBOX_PLUGIN_SYSTEM_BASE_VERSION)
+#else
+    #define SANDBOX_PLUGIN_SYSTEM_VERSION SANDBOX_PLUGIN_SYSTEM_BASE_VERSION
+#endif
+
+// Interface for instantiating the plugin for the editor
+struct IPlugin
+{
+    enum EError
+    {
+        eError_None = 0,
+        eError_VersionMismatch = 1
+    };
+
+    virtual ~IPlugin() = default;
+    
+    // Releases plugin.
+    virtual void Release() = 0;
+    //! Show a modal about dialog / message box for the plugin
+    virtual void ShowAbout() = 0;
+    //! Return the GUID of the plugin
+    virtual const char* GetPluginGUID() = 0;
+    virtual DWORD GetPluginVersion() = 0;
+    //! Return the human readable name of the plugin
+    virtual const char* GetPluginName() = 0;
+    //! Asks if the plugin can exit now. This might involve asking the user if he wants to save
+    //! data. The plugin is only supposed to ask for unsaved data which is not serialize into
+    //! the editor project file. When data is modified which is saved into the project file, the
+    //! plugin should call IEditor::SetDataModified() to make the editor ask
+    virtual bool CanExitNow() = 0;
+    //! this method is called when there is an event triggered inside the editor
+    virtual void OnEditorNotify(EEditorNotifyEvent aEventId) = 0;
+};
+
+// Initialization structure
+struct PLUGIN_INIT_PARAM
+{
+    IEditor* pIEditorInterface;
+    int pluginVersion;
+    IPlugin::EError outErrorCode;
+};
+
+// Plugin Settings structure
+struct SPluginSettings
+{
+    // note: the pluginVersion in PLUGIN_INIT_PARAM denotes the version of the plugin manager
+    // whereas this denotes the version of the individual plugin.
+    // future: manage plugin versions.
+    int pluginVersion;
+    bool autoLoad;
+};
+
+// Factory API
+extern "C"
+{
+PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam);
+PLUGIN_API void QueryPluginSettings(SPluginSettings& settings);
+}
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IPLUGIN_H
diff --git a/Code/Editor/Include/IPreferencesPage.h b/Code/Editor/Include/IPreferencesPage.h
new file mode 100644
index 0000000000..611e97d7f4
--- /dev/null
+++ b/Code/Editor/Include/IPreferencesPage.h
@@ -0,0 +1,73 @@
+/*
+ * 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 : Custom preference page interfaces
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IPREFERENCESPAGE_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IPREFERENCESPAGE_H
+#pragma once
+#include "Plugin.h"
+#include <AzCore/RTTI/RTTI.h>
+
+//! The interface class for preferences pages.
+struct IPreferencesPage
+{
+    AZ_RTTI(IPreferencesPage, "{DEB112AD-55AD-4407-8482-BDA095A64752}")
+
+    //! Return category where this preferences page belongs.
+    virtual const char* GetCategory() = 0;
+    //! Title of this preferences page.
+    virtual const char* GetTitle() = 0;
+    //! Return the icon for this page.
+    virtual QIcon& GetIcon() = 0;
+    //! Called by the editor when the Apply Now button is clicked.
+    virtual void OnApply() = 0;
+    //! Called by the editor when the Cancel button is clicked.
+    virtual void OnCancel() = 0;
+    //! Called by the editor when the Cancel button is clicked, and before the cancel has taken place.
+    //! @return true to perform Cancel operation, false to abort Cancel.
+    virtual bool OnQueryCancel() = 0;
+    //! Called by the editor when the preferences page is made the active page or is not longer the active page.
+    //! @param bActive true when page become active, false when page deactivated.
+};
+
+//! Interface used to create new preferences pages.
+//! You can query this interface from any IClassDesc interface with ESYSTEM_CLASS_PREFERENCE_PAGE system class Id.
+struct IPreferencesPageCreator
+{
+    DEFINE_UUID(0xD494113C, 0xBF13, 0x4171, 0x91, 0x71, 0x03, 0x33, 0xDF, 0x10, 0xEA, 0xFC)
+
+    //! Get number of preferences page hosted by this class.
+    virtual int GetPagesCount() = 0;
+    //! Creates a new preferences page by page index.
+    //! @param index must be within 0 <= index < GetPagesCount().
+    virtual IPreferencesPage* CreateEditorPreferencesPage(int index) = 0;
+};
+
+//! A plugin class description for all IPreferencesPage derived classes.
+struct IPreferencesPageClassDesc
+    : public IClassDesc
+{
+    //////////////////////////////////////////////////////////////////////////
+    // IClassDesc implementation.
+    //////////////////////////////////////////////////////////////////////////
+    virtual ESystemClassID SystemClassID() { return ESYSTEM_CLASS_PREFERENCE_PAGE; };
+    //! This method returns the human readable name of the class.
+    virtual QString ClassName() { return "Preferences Page"; };
+    //! This method returns Category of this class,
+    //! Category is specifying where this plugin class fits best in the create panel.
+    virtual QString Category() { return "Preferences"; };
+    //! Show a modal about dialog / message box for the plugin.
+    virtual void ShowAbout() {};
+    virtual bool CanExitNow() { return true; };
+    //! The plugin should write / read its data to the passed stream. The data is saved to or loaded
+    //! from the editor project file. This function is called during the usual save / load process of
+    //! the editor's project file
+    virtual void Serialize([[maybe_unused]] CXmlArchive& ar) {};
+};
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IPREFERENCESPAGE_H
diff --git a/Code/Editor/Include/IRenderListener.h b/Code/Editor/Include/IRenderListener.h
new file mode 100644
index 0000000000..ef961c4b2f
--- /dev/null
+++ b/Code/Editor/Include/IRenderListener.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
+ *
+ */
+
+
+// Description : Interface for rendering custom 3D elements in the main
+//               render viewport. Particularly usefull for debug geometries.
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
+#pragma once
+
+
+struct DisplayContext;
+
+struct IRenderListener
+    : public IUnknown
+{
+    DEFINE_UUID(0x8D52F857, 0x1027, 0x4346, 0xAC, 0x7B, 0xF6, 0x20, 0xDA, 0x7C, 0xCE, 0x42)
+
+    virtual void Render(DisplayContext& rDisplayContext) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
diff --git a/Code/Editor/Include/IResourceSelectorHost.h b/Code/Editor/Include/IResourceSelectorHost.h
new file mode 100644
index 0000000000..8fb5b2bce0
--- /dev/null
+++ b/Code/Editor/Include/IResourceSelectorHost.h
@@ -0,0 +1,134 @@
+/*
+ * 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
+// The aim of IResourceSelectorHost is to unify resource selection dialogs in a one
+// API that can be reused with plugins. It also makes possible to register new
+// resource selectors dynamically, e.g. inside plugins.
+//
+// Here is how new selectors are created. In your implementation file you add handler function:
+//
+//   #include "IResourceSelectorHost.h"
+//
+//   QString SoundFileSelector(const SResourceSelectorContext& x, const QString& previousValue)
+//   {
+//     CMyModalDialog dialog(CWnd::FromHandle(x.parentWindow));
+//     ...
+//     return previousValue;
+//   }
+//   REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "Icons/sound_16x16.png")
+//
+// Here is how it can be invoked directly:
+//
+//   SResourceSelectorContext x;
+//   x.parentWindow = parent.GetSafeHwnd();
+//   x.typeName = "Sound";
+//   string newValue = GetIEditor()->GetResourceSelector()->SelectResource(x, previousValue).c_str();
+//
+// If you have your own resource selectors in the plugin you will need to run
+//
+//    RegisterModuleResourceSelectors(GetIEditor()->GetResourceSelector())
+//
+// during plugin initialization.
+//
+// If you want to be able to pass some custom context to the selector (e.g. source of the information for the
+// list of items or something similar) then you can add a poitner argument to your selector function, i.e.:
+//
+//   QString SoundFileSelector(const SResourceSelectorContext& x, const QString& previousValue,
+//                             SoundFileList* list) // your context argument
+
+#include <QString>
+
+class QWidget;
+
+struct SResourceSelectorContext
+{
+    const char* typeName;
+
+    // use either parentWidget or parentWindow (not both) until everything porting to QWidget.
+    QWidget* parentWidget;
+
+    unsigned int entityId;
+    void* contextObject;
+
+    SResourceSelectorContext()
+        : parentWidget(0)
+        , typeName(0)
+        , entityId(0)
+        , contextObject()
+    {
+    }
+};
+
+// TResourceSelecitonFunction is used to declare handlers for specific types.
+//
+// For canceled dialogs previousValue should be returned.
+typedef QString (* TResourceSelectionFunction)(const SResourceSelectorContext& selectorContext, const QString& previousValue);
+typedef QString (* TResourceSelectionFunctionWithContext)(const SResourceSelectorContext& selectorContext, const QString& previousValue, void* contextObject);
+
+struct SStaticResourceSelectorEntry;
+
+// See note at the beginning of the file.
+struct IResourceSelectorHost
+{
+    virtual ~IResourceSelectorHost() = default;
+    virtual QString SelectResource(const SResourceSelectorContext& context, const QString& previousValue) = 0;
+    virtual const char* ResourceIconPath(const char* typeName) const = 0;
+
+    virtual void RegisterResourceSelector(const SStaticResourceSelectorEntry* entry) = 0;
+
+    // secondary responsibility of this class is to store global selections
+    virtual void SetGlobalSelection(const char* resourceType, const char* value) = 0;
+    virtual const char* GetGlobalSelection(const char* resourceType) const = 0;
+};
+
+// ---------------------------------------------------------------------------
+#define INTERNAL_RSH_COMBINE_UTIL(A, B) A##B
+#define INTERNAL_RSH_COMBINE(A, B) INTERNAL_RSH_COMBINE_UTIL(A, B)
+#define REGISTER_RESOURCE_SELECTOR(name, function, icon) \
+    static SStaticResourceSelectorEntry INTERNAL_RSH_COMBINE(selector_##function, __LINE__)((name), (function), (icon));
+
+struct SStaticResourceSelectorEntry
+{
+    const char* typeName;
+    TResourceSelectionFunction function;
+    TResourceSelectionFunctionWithContext functionWithContext;
+    const char* iconPath;
+
+    static SStaticResourceSelectorEntry*& GetFirst() { static SStaticResourceSelectorEntry* first; return first; }
+    SStaticResourceSelectorEntry* next;
+
+    SStaticResourceSelectorEntry(const char* typeName, TResourceSelectionFunction function, const char* icon)
+        : typeName(typeName)
+        , function(function)
+        , functionWithContext()
+        , iconPath(icon)
+    {
+        next = GetFirst();
+        GetFirst() = this;
+    }
+
+    template<class T>
+    SStaticResourceSelectorEntry(const char* typeName, QString (*function)(const SResourceSelectorContext&, const QString& previousValue, T * context), const char* icon)
+        : typeName(typeName)
+        , function()
+        , functionWithContext(TResourceSelectionFunctionWithContext(function))
+        , iconPath(icon)
+    {
+        next = GetFirst();
+        GetFirst() = this;
+    }
+};
+
+inline void RegisterModuleResourceSelectors(IResourceSelectorHost* editorResourceSelector)
+{
+    for (SStaticResourceSelectorEntry* current = SStaticResourceSelectorEntry::GetFirst(); current != 0; current = current->next)
+    {
+        editorResourceSelector->RegisterResourceSelector(current);
+    }
+}
diff --git a/Code/Editor/Include/ISourceControl.h b/Code/Editor/Include/ISourceControl.h
new file mode 100644
index 0000000000..48ec6ba8fe
--- /dev/null
+++ b/Code/Editor/Include/ISourceControl.h
@@ -0,0 +1,70 @@
+/*
+ * 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 <map>
+
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
+
+#include "IEditorClassFactory.h" 
+
+// Source control status of item.
+enum ESccFileAttributes
+{
+    SCC_FILE_ATTRIBUTE_INVALID      = 0x0000, // File is not found.
+    SCC_FILE_ATTRIBUTE_NORMAL       = 0x0001, // Normal file on disk.
+    SCC_FILE_ATTRIBUTE_READONLY     = 0x0002, // Read only files cannot be modified at all, either read only file not under source control or file in packfile.
+    SCC_FILE_ATTRIBUTE_INPAK        = 0x0004, // File is inside pack file.
+    SCC_FILE_ATTRIBUTE_MANAGED      = 0x0008, // File is managed under source control.
+    SCC_FILE_ATTRIBUTE_CHECKEDOUT   = 0x0010, // File is under source control and is checked out.
+    SCC_FILE_ATTRIBUTE_BYANOTHER    = 0x0020, // File is under source control and is checked out by another user.
+    SCC_FILE_ATTRIBUTE_FOLDER       = 0x0040, // Managed folder.
+    SCC_FILE_ATTRIBUTE_LOCKEDBYANOTHER = 0x0080, // File is under source control and is checked out and locked by another user.
+    SCC_FILE_ATTRIBUTE_NOTATHEAD    = 0x0100, // File is under source control and is not the latest version of the file
+    SCC_FILE_ATTRIBUTE_ADD          = 0x0200, // File is under source control and is marked for add
+    SCC_FILE_ATTRIBUTE_MOVED        = 0x0400, // File is under source control and is marked for move/add
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+// Description
+//    This interface provide access to the source control functionality.
+//////////////////////////////////////////////////////////////////////////
+struct ISourceControl
+    : public IUnknown
+{
+    DEFINE_UUID(0x1D391E8C, 0xA124, 0x46bb, 0x80, 0x8D, 0x9B, 0xCA, 0x15, 0x5B, 0xCA, 0xFD)
+
+    // Source Control State
+    enum ConnectivityState
+    {
+        Connected = 0,
+        BadConfiguration,
+        Disconnected_Retrying,
+        Disconnected,
+    };
+
+    using SourceControlState = AzToolsFramework::SourceControlState;
+
+    //function to enable/disable source control
+    virtual void SetSourceControlState(SourceControlState state) = 0;
+    virtual ConnectivityState GetConnectivityState() = 0;
+
+    // Show settings dialog
+    virtual void ShowSettings() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // IUnknown
+    //////////////////////////////////////////////////////////////////////////
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] REFIID riid, [[maybe_unused]] void** ppvObject) { return E_NOINTERFACE; };
+    virtual ULONG STDMETHODCALLTYPE AddRef() { return 0; };
+    virtual ULONG STDMETHODCALLTYPE Release() { return 0; };
+    //////////////////////////////////////////////////////////////////////////
+};
+
diff --git a/Code/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h b/Code/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h
new file mode 100644
index 0000000000..551bbdb136
--- /dev/null
+++ b/Code/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.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
+ *
+ */
+
+
+// Description : Calculate the reference frame for sub-object selections.
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
+#define CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
+#pragma once
+
+
+class ISubObjectSelectionReferenceFrameCalculator
+{
+public:
+    virtual void SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
diff --git a/Code/Editor/Include/ITextureDatabaseUpdater.h b/Code/Editor/Include/ITextureDatabaseUpdater.h
new file mode 100644
index 0000000000..235c94761d
--- /dev/null
+++ b/Code/Editor/Include/ITextureDatabaseUpdater.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : This file declares the interface used by the texture viewer
+//               and (implemented first implemented by the Texture Database Creator) to
+//               syncronize their threads. A thread interace could be useful there.
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
+#define CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
+#pragma once
+
+
+class CTextureDatabaseItem;
+
+struct ITextureDatabaseUpdater
+{
+public:
+    //////////////////////////////////////////////////////////////////////////
+    // Thread control
+    virtual void NotifyShutDown() = 0;
+    virtual void Lock() = 0;
+    virtual void Unlock() = 0;
+    virtual void WaitForThread() = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Data access
+    virtual CTextureDatabaseItem*   GetItem(const char* szAddItem) = 0;
+    //////////////////////////////////////////////////////////////////////////
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
diff --git a/Code/Editor/Include/ITransformManipulator.h b/Code/Editor/Include/ITransformManipulator.h
new file mode 100644
index 0000000000..3294980ed0
--- /dev/null
+++ b/Code/Editor/Include/ITransformManipulator.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_ITRANSFORMMANIPULATOR_H
+#define CRYINCLUDE_EDITOR_INCLUDE_ITRANSFORMMANIPULATOR_H
+#pragma once
+
+#include "IEditor.h"
+
+struct IDisplayViewport;
+struct HitContext;
+class CViewport;
+
+//////////////////////////////////////////////////////////////////////////
+// ITransformManipulator implementation.
+//////////////////////////////////////////////////////////////////////////
+struct ITransformManipulator
+{
+    virtual Matrix34 GetTransformation(RefCoordSys coordSys, IDisplayViewport* view = nullptr) const = 0;
+    virtual void SetTransformation(RefCoordSys coordSys, const Matrix34& tm) = 0;
+    virtual bool HitTestManipulator(HitContext& hc) = 0;
+    virtual bool MouseCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) = 0;
+    virtual void SetAlwaysUseLocal(bool on) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_ITRANSFORMMANIPULATOR_H
diff --git a/Code/Editor/Include/IViewPane.h b/Code/Editor/Include/IViewPane.h
new file mode 100644
index 0000000000..2b2e400c11
--- /dev/null
+++ b/Code/Editor/Include/IViewPane.h
@@ -0,0 +1,73 @@
+/*
+ * 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_INCLUDE_IVIEWPANE_H
+#define CRYINCLUDE_EDITOR_INCLUDE_IVIEWPANE_H
+#pragma once
+
+#include "IEditorClassFactory.h"
+
+#include <QSize>
+
+class QWidget;
+class QRect;
+
+struct IViewPaneClass
+    : public IClassDesc
+{
+    DEFINE_UUID(0x7E13EC7C, 0xF621, 0x4aeb, 0xB6, 0x42, 0x67, 0xD7, 0x8E, 0xD4, 0x68, 0xF8)
+
+    enum EDockingDirection
+    {
+        DOCK_TOP,
+        DOCK_LEFT,
+        DOCK_RIGHT,
+        DOCK_BOTTOM,
+        DOCK_FLOAT,
+    };
+
+    virtual ~IViewPaneClass() = default;
+
+    // Return text for view pane title.
+    virtual QString GetPaneTitle() = 0;
+
+    // Return the string resource ID for the title's text.
+    virtual unsigned int GetPaneTitleID() const = 0;
+
+    // Return preferable initial docking position for pane.
+    virtual EDockingDirection GetDockingDirection() = 0;
+
+    // Initial pane size.
+    virtual QRect GetPaneRect() = 0;
+
+    // Get Minimal view size
+    virtual QSize GetMinSize() { return QSize(0, 0); }
+
+    // Return true if only one pane at a time of time view class can be created.
+    virtual bool SinglePane() = 0;
+
+    // Return true if the view window wants to get ID_IDLE_UPDATE commands.
+    virtual bool WantIdleUpdate() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // IUnknown
+    //////////////////////////////////////////////////////////////////////////
+    HRESULT STDMETHODCALLTYPE QueryInterface(const IID& riid, void** ppvObj)
+    {
+        if (riid == __uuidof(IViewPaneClass))
+        {
+            *ppvObj = this;
+            return S_OK;
+        }
+        return E_NOINTERFACE;
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_IVIEWPANE_H
diff --git a/Code/Editor/Include/ObjectEvent.h b/Code/Editor/Include/ObjectEvent.h
new file mode 100644
index 0000000000..8604d146f7
--- /dev/null
+++ b/Code/Editor/Include/ObjectEvent.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_OBJECTEVENT_H
+#define CRYINCLUDE_EDITOR_INCLUDE_OBJECTEVENT_H
+#pragma once
+
+//! Standart objects types.
+enum ObjectType
+{
+    OBJTYPE_DUMMY           = 1 << 20,
+    OBJTYPE_AZENTITY        = 1 << 21,
+};
+
+//////////////////////////////////////////////////////////////////////////
+//! Events that objects may want to handle.
+//! Passed to OnEvent method of CBaseObject.
+enum ObjectEvent
+{
+    EVENT_INGAME    = 1,    //!< Signals that editor is switching into the game mode.
+    EVENT_OUTOFGAME,        //!< Signals that editor is switching out of the game mode.
+    EVENT_REFRESH,          //!< Signals that editor is refreshing level.
+    EVENT_DBLCLICK,         //!< Signals that object have been double clicked.
+    EVENT_KEEP_HEIGHT,  //!< Signals that object must preserve its height over changed terrain.
+    EVENT_RELOAD_ENTITY,//!< Signals that entities scripts must be reloaded.
+    EVENT_RELOAD_GEOM,  //!< Signals that all possible geometries should be reloaded.
+    EVENT_UNLOAD_GEOM,  //!< Signals that all possible geometries should be unloaded.
+    EVENT_MISSION_CHANGE,   //!< Signals that mission have been changed.
+    EVENT_ALIGN_TOGRID, //!< Object should align itself to the grid.
+
+    EVENT_PHYSICS_GETSTATE,//!< Signals that entities should accept their physical state from game.
+    EVENT_PHYSICS_RESETSTATE,//!< Signals that physics state must be reseted on objects.
+    EVENT_PHYSICS_APPLYSTATE,//!< Signals that the stored physics state must be applied to objects.
+
+    EVENT_FREE_GAME_DATA,//!< Object should free game data that its holding.
+    EVENT_CONFIG_SPEC_CHANGE,   //!< Called when config spec changed.
+    EVENT_HIDE_HELPER, //!< Signals that happens when Helper mode switches to be hidden.
+};
+
+#endif // CRYINCLUDE_EDITOR_INCLUDE_OBJECTEVENT_H
+
diff --git a/Code/Editor/Include/SandboxAPI.h b/Code/Editor/Include/SandboxAPI.h
new file mode 100644
index 0000000000..954c41f05e
--- /dev/null
+++ b/Code/Editor/Include/SandboxAPI.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
+ *
+ */
+
+
+// Description : Main header included by every file in Editor.
+
+
+#ifndef CRYINCLUDE_EDITOR_INCLUDE_SANDBOXAPI_H
+#define CRYINCLUDE_EDITOR_INCLUDE_SANDBOXAPI_H
+#pragma once
+
+#include <AzCore/PlatformDef.h>
+
+#if defined(SANDBOX_API) || defined(CRYEDIT_API)
+#error SANDBOX_API and CRYEDIT_API should only be defined in this header. Use SANDBOX_EXPORTS and SANDBOX_IMPROTS to control it.
+#endif
+
+#if defined(SANDBOX_IMPORTS) && defined(SANDBOX_EXPORTS)
+#error SANDBOX_EXPORTS and SANDBOX_IMPORTS can't be defined at the same time
+#endif
+
+#if defined(SANDBOX_EXPORTS)
+// Editor.exe case
+#define CRYEDIT_API AZ_DLL_EXPORT
+#define SANDBOX_API AZ_DLL_EXPORT
+#elif defined(SANDBOX_IMPORTS)
+// Sandbox plugins that rely on/extend Editor types.
+#define CRYEDIT_API AZ_DLL_IMPORT
+#define SANDBOX_API AZ_DLL_IMPORT
+#else
+// Standalone plugins that use Editor plugins.
+#define CRYEDIT_API
+#define SANDBOX_API
+#endif
+#endif // CRYINCLUDE_EDITOR_INCLUDE_SANDBOXAPI_H
diff --git a/Code/Sandbox/Editor/InfoBar.qrc b/Code/Editor/InfoBar.qrc
similarity index 100%
rename from Code/Sandbox/Editor/InfoBar.qrc
rename to Code/Editor/InfoBar.qrc
diff --git a/Code/Editor/KeyboardCustomizationSettings.cpp b/Code/Editor/KeyboardCustomizationSettings.cpp
new file mode 100644
index 0000000000..24b16df3c7
--- /dev/null
+++ b/Code/Editor/KeyboardCustomizationSettings.cpp
@@ -0,0 +1,385 @@
+/*
+ * 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 "KeyboardCustomizationSettings.h"
+
+// Qt
+#include <QMenu>
+#include <QMenuBar>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QSettings>
+
+
+QString RemoveAcceleratorAmpersands(const QString& original)
+{
+    static const QRegularExpression expression(QStringLiteral("&(.)"));
+    QString updated = original;
+    updated.replace(expression, QStringLiteral("\\1"));
+
+    return updated;
+}
+
+QVector<QAction*> GetAllActionsForMenu(const QMenu* menu)
+{
+    QList<QAction*> menuActions = menu->actions();
+    QVector<QAction*> actions;
+    actions.reserve(menuActions.size());
+    foreach(QAction * action, menuActions)
+    {
+        if (action->menu() != nullptr)
+        {
+            QVector<QAction*> subMenuActions = GetAllActionsForMenu(action->menu());
+            actions.reserve(actions.size() + subMenuActions.size());
+            actions += subMenuActions;
+        }
+        else if (!action->isSeparator())
+        {
+            actions.push_back(action);
+        }
+    }
+
+    return actions;
+}
+
+void ProcessAllActions(const QWidget* parent, const std::function<bool(QAction*)>& processor)
+{
+    QMenuBar* menuBar = parent->findChild<QMenuBar*>();
+    QList<QAction*> menuBarActions = menuBar->actions();
+
+    for(QAction* menuAction : menuBarActions)
+    {
+        processor(menuAction);
+        auto actions = GetAllActionsForMenu(menuAction->menu());
+        for(QAction* action : actions)
+        {
+            if (Q_UNLIKELY(processor(action)))
+            {
+                return;
+            }
+        }
+    }
+}
+
+QString GetName(const QAction* action)
+{
+    if (action->data().isValid())
+    {
+        return action->data().toString();
+    }
+    else
+    {
+        return action->objectName();
+    }
+}
+
+QVector<KeyboardCustomizationSettings*> KeyboardCustomizationSettings::m_instances;
+
+KeyboardCustomizationSettings::KeyboardCustomizationSettings(const QString& group, QWidget* parent)
+    : m_parent(parent)
+    , m_group(group)
+    , m_defaults(CreateSnapshot())
+    , m_shortcutsEnabled(true)
+{
+    m_instances.append(this);
+    Load();
+}
+
+KeyboardCustomizationSettings::~KeyboardCustomizationSettings()
+{
+    m_instances.remove(m_instances.indexOf(this));
+}
+
+void KeyboardCustomizationSettings::LoadDefaults()
+{
+    LoadFromSnapshot(m_defaults);
+}
+
+void KeyboardCustomizationSettings::Load()
+{
+    QSettings settings(QStringLiteral("O3DE"), QStringLiteral("O3DE"));
+    settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
+    settings.beginGroup(m_group);
+
+    QStringList groups = settings.childGroups();
+
+    ProcessAllActions(m_parent, [&](QAction* action)
+        {
+            auto groupName = GetName(action);
+            if (groups.contains(groupName))
+            {
+                settings.beginGroup(groupName);
+
+                auto sequence = QKeySequence::listFromString(settings.value("shortcuts").toString());
+                action->setShortcuts(sequence);
+
+                settings.endGroup();
+            }
+            return false;
+        });
+
+    settings.endGroup(); // m_group
+    settings.endGroup(); // Keyboard Shortcuts
+}
+
+void KeyboardCustomizationSettings::Load(const Snapshot& snapshot)
+{
+    LoadFromSnapshot(snapshot);
+}
+
+void KeyboardCustomizationSettings::LoadFromSnapshot(const Snapshot& snapshot)
+{
+    ProcessAllActions(m_parent, [&](QAction* action)
+        {
+            auto entry = snapshot.constFind(action);
+            if (entry != snapshot.constEnd())
+            {
+                const Shortcut& s = entry.value();
+                action->setText(s.text);
+                action->setShortcuts(s.keySequence);
+            }
+            return false;
+        });
+}
+
+void KeyboardCustomizationSettings::Save()
+{
+    QSettings settings(QStringLiteral("O3DE"), QStringLiteral("O3DE"));
+    settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
+    settings.beginGroup(m_group);
+
+    ProcessAllActions(m_parent, [&](QAction* action)
+        {
+            auto groupName = GetName(action);
+            settings.beginGroup(groupName);
+
+            settings.setValue("shortcuts", QKeySequence::listToString(action->shortcuts()));
+
+            settings.endGroup();
+            return false;
+        });
+
+    settings.endGroup(); // m_group
+    settings.endGroup(); // Keyboard Shortcuts
+}
+
+KeyboardCustomizationSettings::Snapshot KeyboardCustomizationSettings::CreateSnapshot()
+{
+    Snapshot result;
+    ProcessAllActions(m_parent, [&](QAction* action)
+        {
+            Shortcut s = { action->text(), action->shortcuts() };
+            result[action] = s;
+            return false;
+        });
+    return result;
+}
+
+void KeyboardCustomizationSettings::ExportToFile(QWidget* parent)
+{
+    QString fileName = QFileDialog::getSaveFileName(parent, QObject::tr("Export Keyboard Shortcuts"), QStringLiteral("o3de.keys"), QObject::tr("Keyboard Settings (*.keys)"));
+    if (fileName.isEmpty())
+    {
+        return;
+    }
+
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::WriteOnly))
+    {
+        QMessageBox::critical(parent, QObject::tr("Shortcut Export Error"), QObject::tr("Couldn't open \"%1\": %2").arg(fileName).arg(file.errorString()));
+        return;
+    }
+
+    QJsonObject store;
+    store.insert("version", "1.0");
+    store.insert("Content-Type", "application/x-o3de-sdk-keyboard-settings+json");
+    QJsonObject groups;
+
+    for (auto instance = m_instances.constBegin(); instance != m_instances.constEnd(); instance++)
+    {
+        groups.insert((*instance)->m_group, QJsonValue((*instance)->ExportGroup()));
+    }
+
+    store.insert("groups", groups);
+
+    QJsonDocument exported(store);
+    if (-1 == file.write(exported.toJson()))
+    {
+        QMessageBox::critical(parent, QObject::tr("Shortcut Export Error"), QObject::tr("Couldn't write settings to \"%1\": %2").arg(fileName).arg(file.errorString()));
+        return;
+    }
+
+    file.close();
+}
+
+QJsonObject KeyboardCustomizationSettings::ExportGroup()
+{
+    QJsonObject group;
+    group.insert("name", m_group);
+
+    ProcessAllActions(m_parent, [&](QAction* action)
+        {
+            QJsonObject entry;
+            entry.insert("label", RemoveAcceleratorAmpersands(action->text()));
+            entry.insert("shortcuts", QKeySequence::listToString(action->shortcuts()));
+            group.insert(GetName(action), QJsonValue(entry));
+            return false;
+        });
+
+    return group;
+}
+
+void KeyboardCustomizationSettings::ImportFromFile(QWidget* parent)
+{
+    QString fileName = QFileDialog::getOpenFileName(parent, QObject::tr("Export Keyboard Shortcuts"), QStringLiteral(""), QObject::tr("Keyboard Settings (*.keys)"));
+    if (fileName.isEmpty())
+    {
+        return;
+    }
+
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::ReadOnly))
+    {
+        QMessageBox::critical(parent, QObject::tr("Shortcut Import Error"), QObject::tr("Couldn't open \"%1\": %2").arg(fileName).arg(file.errorString()));
+        return;
+    }
+
+    QByteArray rawData = file.readAll();
+    QJsonDocument imported(QJsonDocument::fromJson(rawData));
+    QJsonObject store = imported.object();
+
+    if (store.value("Content-Type") != "application/x-o3de-sdk-keyboard-settings+json" || store.value("version") != "1.0")
+    {
+        QMessageBox::critical(parent, QObject::tr("Shortcut Import Error"), QObject::tr("\"%1\" doesn't appear to contain keyboard settings").arg(fileName));
+        return;
+    }
+
+    QJsonObject groups = store.value("groups").toObject();
+    if (QJsonObject() == groups)
+    {
+        QMessageBox::critical(parent, QObject::tr("Shortcut Import Error"), QObject::tr("\"%1\" contains no keyboard settings").arg(fileName));
+        return;
+    }
+
+    for (auto instance = m_instances.begin(); instance != m_instances.end(); instance++)
+    {
+        QJsonValue rawGroup = groups.value((*instance)->m_group);
+        if (!rawGroup.isUndefined())
+        {
+            QJsonObject group = rawGroup.toObject();
+            if (QJsonObject() != group && group.value("name").toString() == (*instance)->m_group)
+            {
+                (*instance)->ImportGroup(group);
+            }
+        }
+    }
+
+    file.close();
+}
+
+void KeyboardCustomizationSettings::ImportGroup(const QJsonObject& group)
+{
+    ProcessAllActions(m_parent, [&](QAction* action)
+        {
+            auto position = group.constFind(GetName(action));
+            if (position != group.constEnd())
+            {
+                QJsonObject entry = position.value().toObject();
+                if (QJsonObject() != entry)
+                {
+                    QString value = entry.value("shortcuts").toString();
+                    action->setShortcuts(QKeySequence::listFromString(value));
+                }
+                else
+                {
+                    action->setShortcuts({});
+                }
+            }
+            return false;
+        });
+}
+
+
+QAction* KeyboardCustomizationSettings::FindActionForShortcut(QKeySequence shortcut) const
+{
+    QAction* result {
+        nullptr
+    };
+    ProcessAllActions(m_parent, [&](QAction* action)
+        {
+            bool found { false };
+            if (action->shortcuts().contains(shortcut))
+            {
+                result = action;
+                found = true;
+            }
+            return found;
+        });
+
+    return result;
+}
+
+void KeyboardCustomizationSettings::ClearShortcutsAndAccelerators()
+{
+    ProcessAllActions(m_parent, [&](QAction* action)
+        {
+            action->setText(RemoveAcceleratorAmpersands(action->text()));
+            action->setShortcut({});
+            return false;
+        });
+}
+
+/** static */
+void KeyboardCustomizationSettings::EnableShortcutsGlobally(bool enable)
+{
+    for (auto it : m_instances)
+    {
+        it->EnableShortcuts(enable);
+    }
+}
+
+void KeyboardCustomizationSettings::EnableShortcuts(bool enabled)
+{
+    if (enabled != m_shortcutsEnabled)
+    {
+        m_shortcutsEnabled = enabled;
+        if (enabled)
+        {
+            LoadFromSnapshot(m_lastEnabledShortcuts);
+            CLogFile::WriteLine("Enable Accelerators");
+        }
+        else
+        {
+            m_lastEnabledShortcuts = CreateSnapshot();
+            ClearShortcutsAndAccelerators();
+            CLogFile::WriteLine("Disable Accelerators");
+        }
+    }
+}
+
+/** static */
+void KeyboardCustomizationSettings::LoadDefaultsGlobally()
+{
+    for (auto it : m_instances)
+    {
+        it->LoadDefaults();
+    }
+}
+
+/** static */
+void KeyboardCustomizationSettings::SaveGlobally()
+{
+    for (auto it : m_instances)
+    {
+        it->Save();
+    }
+}
diff --git a/Code/Editor/KeyboardCustomizationSettings.h b/Code/Editor/KeyboardCustomizationSettings.h
new file mode 100644
index 0000000000..1cc04e9f6a
--- /dev/null
+++ b/Code/Editor/KeyboardCustomizationSettings.h
@@ -0,0 +1,74 @@
+/*
+ * 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_KEYBOARD_CUSTOMIZATION_SETTINGS_H
+#define CRYINCLUDE_EDITOR_KEYBOARD_CUSTOMIZATION_SETTINGS_H
+#pragma once
+
+#include <QWidget>
+#include <QHash>
+#include <QVector>
+
+// TODO: Move to an utils class or at least namespace
+QString RemoveAcceleratorAmpersands(const QString& original);
+
+class SANDBOX_API KeyboardCustomizationSettings
+{
+public:
+
+    struct Shortcut
+    {
+        QString text;
+        QList<QKeySequence> keySequence;
+    };
+
+    using Snapshot = QHash<const QAction*, Shortcut>;
+
+    KeyboardCustomizationSettings(const QString& group, QWidget* parent);
+    virtual ~KeyboardCustomizationSettings();
+
+    // Iterates over all KeyboardCustomizationSettings instances and calls EnableShortcuts()
+    static void EnableShortcutsGlobally(bool);
+    static void LoadDefaultsGlobally();
+    static void SaveGlobally();
+
+    // Enables or disables shortcuts. Disabling shortcuts is used when in game mode.
+    void EnableShortcuts(bool);
+
+    void Load();
+    void Load(const Snapshot& snapshot);
+    void LoadDefaults();
+    void Save();
+
+    Snapshot CreateSnapshot();
+
+    QAction* FindActionForShortcut(QKeySequence) const;
+
+public:
+    static void ExportToFile(QWidget* parentWindow);
+    static void ImportFromFile(QWidget* parentWindow);
+
+private:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    const QWidget* m_parent;
+    const QString m_group;
+    const Snapshot m_defaults;
+    bool m_shortcutsEnabled;
+    Snapshot m_lastEnabledShortcuts; // just to avoid load/save IO from/to disk
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    void LoadFromSnapshot(const Snapshot& snapshot);
+
+    QJsonObject ExportGroup();
+    void ImportGroup(const QJsonObject& group);
+    void ClearShortcutsAndAccelerators();
+private:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    static QVector<KeyboardCustomizationSettings*> m_instances;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif //CRYINCLUDE_EDITOR_KEYBOARD_CUSTOMIZATION_SETTINGS_H
diff --git a/Code/Sandbox/Editor/Launcher/editor_launcher.rc b/Code/Editor/Launcher/editor_launcher.rc
similarity index 100%
rename from Code/Sandbox/Editor/Launcher/editor_launcher.rc
rename to Code/Editor/Launcher/editor_launcher.rc
diff --git a/Code/Editor/Launcher/resource.h b/Code/Editor/Launcher/resource.h
new file mode 100644
index 0000000000..672618c3cf
--- /dev/null
+++ b/Code/Editor/Launcher/resource.h
@@ -0,0 +1,8 @@
+/*
+ * 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
+ *
+ */
+
+#define IDI_ICON1                        2
diff --git a/Code/Editor/LayoutConfigDialog.cpp b/Code/Editor/LayoutConfigDialog.cpp
new file mode 100644
index 0000000000..b5d1abfdc2
--- /dev/null
+++ b/Code/Editor/LayoutConfigDialog.cpp
@@ -0,0 +1,117 @@
+/*
+ * 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 "LayoutConfigDialog.h"
+
+// AzQtComponents
+#include <AzQtComponents/Components/StyleManager.h>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_LayoutConfigDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+class LayoutConfigModel
+    : public QAbstractListModel
+{
+public:
+    LayoutConfigModel(QObject* parent = nullptr);
+
+    int rowCount(const QModelIndex& parent = {}) const override;
+    int columnCount(const QModelIndex& parent = {}) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+
+private:
+    static const int kNumLayouts = 9;
+};
+
+LayoutConfigModel::LayoutConfigModel(QObject* parent)
+    : QAbstractListModel(parent)
+{
+}
+
+int LayoutConfigModel::rowCount(const QModelIndex& parent) const
+{
+    return parent.isValid() ? 0 : kNumLayouts;
+}
+
+int LayoutConfigModel::columnCount(const QModelIndex& parent) const
+{
+    return parent.isValid() ? 0 : 1;
+}
+
+QVariant LayoutConfigModel::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid() || index.column() > 0 || index.row() >= kNumLayouts)
+    {
+        return {};
+    }
+
+    switch (role)
+    {
+    case Qt::SizeHintRole:
+        return QSize(38, 38);
+
+    case Qt::DecorationRole:
+        return QPixmap(QStringLiteral(":/layouts/layouts-%1.svg").arg(index.row()));
+    }
+
+    return {};
+}
+
+// CLayoutConfigDialog dialog
+
+CLayoutConfigDialog::CLayoutConfigDialog(QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_model(new LayoutConfigModel(this))
+    , ui(new Ui::CLayoutConfigDialog)
+{
+    m_layout = ET_Layout1;
+
+    ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setFixedSize(size());
+
+    ui->m_layouts->setModel(m_model);
+
+    AzQtComponents::StyleManager::setStyleSheet(ui->m_layouts, "style:LayoutConfigDialog.qss");
+
+    connect(ui->m_buttonBox, &QDialogButtonBox::accepted, this, &CLayoutConfigDialog::OnOK);
+    connect(ui->m_buttonBox, &QDialogButtonBox::rejected, this, &CLayoutConfigDialog::reject);
+}
+
+CLayoutConfigDialog::~CLayoutConfigDialog()
+{
+}
+
+void CLayoutConfigDialog::SetLayout(EViewLayout layout)
+{
+    m_layout = layout;
+    ui->m_layouts->setCurrentIndex(m_model->index(static_cast<int>(layout), 0));
+}
+
+// CLayoutConfigDialog message handlers
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutConfigDialog::OnOK()
+{
+    auto index = ui->m_layouts->currentIndex();
+    auto oldLayout = m_layout;
+
+    if (index.isValid())
+    {
+        m_layout = static_cast<EViewLayout>(index.row());
+    }
+
+    // If the layout has not been changed, the calling code
+    // is not supposed to do anything. So let's simply reject in that case.
+    done(m_layout == oldLayout ? QDialog::Rejected : QDialog::Accepted);
+}
+
+#include <moc_LayoutConfigDialog.cpp>
diff --git a/Code/Editor/LayoutConfigDialog.h b/Code/Editor/LayoutConfigDialog.h
new file mode 100644
index 0000000000..430b5a7484
--- /dev/null
+++ b/Code/Editor/LayoutConfigDialog.h
@@ -0,0 +1,49 @@
+/*
+ * 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_LAYOUTCONFIGDIALOG_H
+#define CRYINCLUDE_EDITOR_LAYOUTCONFIGDIALOG_H
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "LayoutWnd.h"
+
+#include <QDialog>
+#endif
+
+namespace Ui {
+    class CLayoutConfigDialog;
+}
+
+class LayoutConfigModel;
+
+// CLayoutConfigDialog dialog
+
+class CLayoutConfigDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CLayoutConfigDialog(QWidget* pParent = nullptr);   // standard constructor
+    virtual ~CLayoutConfigDialog();
+
+    void SetLayout(EViewLayout layout);
+    EViewLayout GetLayout() const { return m_layout; };
+
+    // Dialog Data
+protected:
+    virtual void OnOK();
+
+    LayoutConfigModel* m_model;
+    EViewLayout m_layout;
+    QScopedPointer<Ui::CLayoutConfigDialog> ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_LAYOUTCONFIGDIALOG_H
diff --git a/Code/Sandbox/Editor/LayoutConfigDialog.qrc b/Code/Editor/LayoutConfigDialog.qrc
similarity index 100%
rename from Code/Sandbox/Editor/LayoutConfigDialog.qrc
rename to Code/Editor/LayoutConfigDialog.qrc
diff --git a/Code/Sandbox/Editor/LayoutConfigDialog.ui b/Code/Editor/LayoutConfigDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/LayoutConfigDialog.ui
rename to Code/Editor/LayoutConfigDialog.ui
diff --git a/Code/Editor/LayoutWnd.cpp b/Code/Editor/LayoutWnd.cpp
new file mode 100644
index 0000000000..bd1f24dd92
--- /dev/null
+++ b/Code/Editor/LayoutWnd.cpp
@@ -0,0 +1,783 @@
+/*
+ * 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 "LayoutWnd.h"
+
+// Qt
+#include <QMessageBox>
+#include <QToolBar>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QTextDocumentFragment>
+
+#include <AzCore/Interface/Interface.h>
+#include <AzQtComponents/Components/Style.h>    // for AzQtComponents::Style
+
+// Editor
+#include "MainWindow.h"
+#include "ViewPane.h"
+#include "QtViewPaneManager.h"
+#include "ViewManager.h"
+
+#include <AzQtComponents/Components/Style.h>
+
+class CLayoutSplitterHandle
+    : public QSplitterHandle
+{
+public:
+    CLayoutSplitterHandle(Qt::Orientation orientation, CLayoutSplitter* parent)
+        : QSplitterHandle(orientation, parent)
+    {
+    }
+
+protected:
+    void paintEvent(QPaintEvent*) override
+    {
+        // draw nothing for flat look
+    }
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// CLayoutSplitter
+//////////////////////////////////////////////////////////////////////////
+CLayoutSplitter::CLayoutSplitter(QWidget* parent)
+    : QSplitter(parent)
+{
+}
+
+CLayoutSplitter::~CLayoutSplitter()
+{
+}
+
+QSplitterHandle* CLayoutSplitter::createHandle()
+{
+    return new CLayoutSplitterHandle(orientation(), this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutSplitter::resizeEvent(QResizeEvent* event)
+{
+    QSplitter::resizeEvent(event);
+
+    // only the top level splitter should trigger resetting the layout when being resized
+    if (qobject_cast<CLayoutSplitter*>(parentWidget()) == nullptr)
+    {
+        for (CLayoutSplitter* s : findChildren<CLayoutSplitter*>())
+        {
+            s->setSizes(QList<int>::fromVector(QVector<int>(s->count(), (s->orientation() == Qt::Horizontal ? s->width() : s->height()) / s->count())));
+        }
+        setSizes(QList<int>::fromVector(QVector<int>(count(), (orientation() == Qt::Horizontal ? width() : height()) / count())));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutSplitter::CreateLayoutView(int row, int col, int id)
+{
+    assert(row >= 0 && row < 3);
+    assert(col >= 0 && col < 3);
+    CLayoutViewPane* viewPane = new CLayoutViewPane(this);
+    viewPane->setWindowFlags(Qt::Widget);
+    insertWidget(orientation() == Qt::Horizontal ? col : row, viewPane);
+    viewPane->SetId(id);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CLayoutWnd
+//////////////////////////////////////////////////////////////////////////
+CLayoutWnd::CLayoutWnd(QSettings* settings, QWidget* parent)
+    : AzQtComponents::ToolBarArea(parent)
+    , m_settings(settings)
+{
+    m_bMaximized = false;
+    m_maximizedView = 0;
+    m_layout = (EViewLayout) - 1;
+
+    m_maximizedViewId = 0;
+    m_infoBarSize = QSize(0, 0);
+
+    connect(qApp, &QApplication::focusChanged, this, &CLayoutWnd::OnFocusChanged);
+
+    setContextMenuPolicy(Qt::NoContextMenu);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CLayoutWnd::~CLayoutWnd()
+{
+    delete m_splitWnd;
+    delete m_splitWnd2;
+    delete m_splitWnd3;
+
+    OnDestroy();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::UnbindViewports()
+{
+    // First unbind all views.
+    for (int i = 0; i < MAX_VIEWPORTS; i++)
+    {
+        CLayoutViewPane* pViewPane = GetViewPane(i);
+        if (pViewPane)
+        {
+            pViewPane->ReleaseViewport();
+        }
+    }
+
+    if (m_maximizedView)
+    {
+        m_maximizedView->ReleaseViewport();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::BindViewports()
+{
+    // First unbind all views.
+    UnbindViewports();
+
+    for (int i = 0; i < MAX_VIEWPORTS; i++)
+    {
+        CLayoutViewPane* pViewPane = GetViewPane(i);
+        if (pViewPane)
+        {
+            BindViewport(pViewPane, m_viewType[pViewPane->GetId()]);
+        }
+    }
+
+    FocusFirstLayoutViewPane(m_splitWnd);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::BindViewport(CLayoutViewPane* vp, const QString& viewClassName, QWidget* pViewport)
+{
+    assert(vp);
+    if (!pViewport)
+    {
+        vp->SetViewClass(viewClassName);
+    }
+    else
+    {
+        vp->AttachViewport(pViewport);
+    }
+    vp->setVisible(true);
+    m_viewType[vp->GetId()] = viewClassName;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::MaximizeViewport(int paneId)
+{
+    // Ignore with full screen layout.
+    if (m_layout == ET_Layout0 && m_bMaximized)
+    {
+        return;
+    }
+
+    QString viewClass = m_viewType[paneId];
+
+    const QRect rc = rect();
+    if (!m_bMaximized)
+    {
+        CLayoutViewPane* pViewPane = GetViewPane(paneId);
+        m_maximizedViewId = paneId;
+        m_bMaximized = true;
+
+        if (m_maximizedView)
+        {
+            if (m_splitWnd)
+            {
+                m_splitWnd->setVisible(false);
+            }
+
+            if (pViewPane)
+            {
+                MoveViewport(pViewPane, m_maximizedView, viewClass);
+            }
+            else
+            {
+                BindViewport(m_maximizedView, viewClass);
+            }
+            m_maximizedView->setFocus();
+
+            SetMainWidget(m_maximizedView);
+            m_maximizedView->setVisible(true);
+
+            MainWindow::instance()->SetActiveView(m_maximizedView);
+        }
+    }
+    else
+    {
+        CLayoutViewPane* pViewPane = GetViewPane(m_maximizedViewId);
+        m_bMaximized = false;
+        m_maximizedViewId = 0;
+
+        if (pViewPane && m_maximizedView)
+        {
+            MoveViewport(m_maximizedView, pViewPane, viewClass);
+        }
+
+        if (m_maximizedView)
+        {
+            m_maximizedView->setVisible(false);
+        }
+
+        if (m_splitWnd)
+        {
+            m_splitWnd->setVisible(true);
+            SetMainWidget(m_splitWnd);
+            FocusFirstLayoutViewPane(m_splitWnd);
+        }
+    }
+}
+
+QString CLayoutWnd::ViewportTypeToClassName(EViewportType viewType)
+{
+    QtViewPane* pane = QtViewPaneManager::instance()->GetViewportPane(viewType);
+    return pane ? pane->m_name : QString();
+}
+
+void CLayoutWnd::CreateLayoutView(CLayoutSplitter* wndSplitter, int row, int col, int id, EViewportType viewType)
+{
+    QString viewClassName = ViewportTypeToClassName(viewType);
+    wndSplitter->CreateLayoutView(row, col, id);
+    m_viewType[id] = viewClassName;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::CreateLayout(EViewLayout layout, bool bBindViewports, EViewportType defaultView)
+{
+    UnbindViewports();
+
+    m_layout = layout;
+    m_bMaximized = false;
+
+    if (m_splitWnd)
+    {
+        m_splitWnd->setVisible(false);
+        delete m_splitWnd;
+    }
+
+    delete m_splitWnd2;
+    delete m_splitWnd3;
+
+    if (m_maximizedView)
+    {
+        m_maximizedView->setVisible(false);
+    }
+
+    QRect rcView = rect();
+
+    // Ensure we delete our old view immediately so it can relinquish its backing ViewportContext
+    if (m_maximizedView)
+    {
+        delete m_maximizedView;
+    }
+
+    m_maximizedView = new CLayoutViewPane(this);
+    m_maximizedView->SetId(0);
+    m_maximizedView->setGeometry(rcView);
+    m_maximizedView->setVisible(false);
+    m_maximizedView->SetFullscren(true);
+
+    if (!CViewManager::IsMultiViewportEnabled())
+    {
+        m_viewType[0] = ViewportTypeToClassName(defaultView);
+        if (bBindViewports)
+        {
+            MaximizeViewport(0);
+        }
+    }
+    else
+    {
+        switch (layout)
+        {
+        case ET_Layout0:
+            m_viewType[0] = ViewportTypeToClassName(defaultView);
+            if (bBindViewports)
+            {
+                MaximizeViewport(0);
+            }
+            break;
+
+        case ET_Layout1:
+            m_splitWnd = new CLayoutSplitter(this);
+            m_splitWnd->setOrientation(Qt::Horizontal);
+    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
+            CreateLayoutView(m_splitWnd, 0, 0, 2, ET_ViewportXY);
+    #else
+            CreateLayoutView(m_splitWnd, 0, 0, 2, ET_ViewportCamera);
+    #endif
+            CreateLayoutView(m_splitWnd, 0, 1, 1, defaultView);
+            break;
+        case ET_Layout2:
+            m_splitWnd = new CLayoutSplitter(this);
+            m_splitWnd->setOrientation(Qt::Vertical);
+    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
+            CreateLayoutView(m_splitWnd, 0, 0, 2, ET_ViewportXY);
+    #else
+            CreateLayoutView(m_splitWnd, 0, 0, 2, ET_ViewportCamera);
+    #endif
+            CreateLayoutView(m_splitWnd, 1, 0, 1, defaultView);
+            break;
+
+        case ET_Layout3:
+            m_splitWnd = new CLayoutSplitter(this);
+            m_splitWnd->setOrientation(Qt::Horizontal);
+            CreateLayoutView(m_splitWnd, 0, 1, 1, defaultView);
+
+            m_splitWnd2 = new CLayoutSplitter;
+            m_splitWnd2->setOrientation(Qt::Vertical);
+            m_splitWnd->insertWidget(0, m_splitWnd2);
+    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
+            CreateLayoutView(m_splitWnd2, 1, 0, 3, ET_ViewportXZ);
+    #else
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
+            CreateLayoutView(m_splitWnd2, 1, 0, 3, ET_ViewportCamera);
+    #endif
+            break;
+
+        case ET_Layout4:
+            m_splitWnd = new CLayoutSplitter(this);
+            m_splitWnd->setOrientation(Qt::Horizontal);
+            CreateLayoutView(m_splitWnd, 0, 0, 1, defaultView);
+
+            m_splitWnd2 = new CLayoutSplitter;
+            m_splitWnd2->setOrientation(Qt::Vertical);
+            m_splitWnd->insertWidget(1, m_splitWnd2);
+    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
+            CreateLayoutView(m_splitWnd2, 1, 0, 3, ET_ViewportXZ);
+    #else
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
+            CreateLayoutView(m_splitWnd2, 1, 0, 3, ET_ViewportCamera);
+    #endif
+            break;
+
+        case ET_Layout5:
+            m_splitWnd = new CLayoutSplitter(this);
+            m_splitWnd->setOrientation(Qt::Vertical);
+            CreateLayoutView(m_splitWnd, 1, 0, 1, defaultView);
+
+            m_splitWnd2 = new CLayoutSplitter;
+            m_splitWnd2->setOrientation(Qt::Horizontal);
+            m_splitWnd->insertWidget(0, m_splitWnd2);
+    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
+            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportXZ);
+    #else
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
+            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportCamera);
+    #endif
+            break;
+
+        case ET_Layout6:
+            m_splitWnd = new CLayoutSplitter(this);
+            m_splitWnd->setOrientation(Qt::Vertical);
+            CreateLayoutView(m_splitWnd, 0, 0, 1, defaultView);
+
+            m_splitWnd2 = new CLayoutSplitter;
+            m_splitWnd->insertWidget(1, m_splitWnd2);
+    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
+            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportXZ);
+    #else
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
+            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportCamera);
+    #endif
+            break;
+
+        case ET_Layout7:
+            m_splitWnd = new CLayoutSplitter(this);
+            m_splitWnd->setOrientation(Qt::Horizontal);
+            m_splitWnd2 = new CLayoutSplitter;
+            m_splitWnd2->setOrientation(Qt::Vertical);
+            m_splitWnd3 = new CLayoutSplitter;
+            m_splitWnd3->setOrientation(Qt::Vertical);
+            m_splitWnd->addWidget(m_splitWnd2);
+            m_splitWnd->addWidget(m_splitWnd3);
+    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXZ);
+            CreateLayoutView(m_splitWnd3, 0, 1, 3, ET_ViewportYZ);
+            CreateLayoutView(m_splitWnd2, 1, 0, 4, ET_ViewportXY);
+    #else
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
+            CreateLayoutView(m_splitWnd3, 0, 1, 3, ET_ViewportCamera);
+            CreateLayoutView(m_splitWnd2, 1, 0, 4, ET_ViewportCamera);
+    #endif
+            CreateLayoutView(m_splitWnd3, 1, 1, 1, defaultView);
+            connect(m_splitWnd2, &QSplitter::splitterMoved, m_splitWnd3, &CLayoutSplitter::otherSplitterMoved);
+            connect(m_splitWnd3, &QSplitter::splitterMoved, m_splitWnd2, &CLayoutSplitter::otherSplitterMoved);
+            break;
+
+        case ET_Layout8:
+            m_splitWnd = new CLayoutSplitter(this);
+            m_splitWnd->setOrientation(Qt::Vertical);
+            CreateLayoutView(m_splitWnd, 1, 0, 1, defaultView);
+
+            m_splitWnd2 = new CLayoutSplitter;
+            m_splitWnd2->setOrientation(Qt::Horizontal);
+            m_splitWnd->insertWidget(0, m_splitWnd2);
+    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
+            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportXZ);
+            CreateLayoutView(m_splitWnd2, 0, 2, 4, ET_ViewportYZ);
+    #else
+            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
+            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportCamera);
+            CreateLayoutView(m_splitWnd2, 0, 2, 4, ET_ViewportCamera);
+    #endif
+            break;
+
+        default:
+            CLogFile::FormatLine("Trying to Create Unknown Layout %d", (int)layout);
+            QMessageBox::critical(this, QString(), tr("Trying to Create Unknown Layout"));
+            break;
+        }
+        ;
+    }
+    if (m_splitWnd)
+    {
+        m_splitWnd->setGeometry(rcView);
+        m_splitWnd->setVisible(true);
+        FocusFirstLayoutViewPane(m_splitWnd);
+        SetMainWidget(m_splitWnd);
+    }
+
+    if (bBindViewports && !m_bMaximized)
+    {
+        BindViewports();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::SaveConfig()
+{
+    QSettings settings;
+    settings.beginGroup(GetConfigGroupName());
+    settings.setValue("Layout", static_cast<int>(m_layout));
+    settings.setValue("Maximized", m_maximizedViewId);
+
+    QString str;
+    for (int i = 1; i < MAX_VIEWPORTS; i++)
+    {
+        str += QString::fromLatin1("%1,").arg(m_viewType[i]);
+    }
+    settings.setValue("Viewports", str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLayoutWnd::LoadConfig()
+{
+    QSettings settings;
+    settings.beginGroup(GetConfigGroupName());
+    int layout = settings.value("Layout", -1).toInt();
+    int maximizedView = settings.value("Maximized", 0).toInt();
+    if (layout < 0)
+    {
+        return false;
+    }
+
+    CreateLayout((EViewLayout)layout, false);
+
+    bool bRebindViewports = false;
+    if (m_splitWnd)
+    {
+        const QString str = settings.value("Viewports").toString();
+        int nIndex = 1;
+        for (auto resToken : str.split(","))
+        {
+            if (nIndex >= MAX_VIEWPORTS)
+            {
+                break;
+            }
+            bRebindViewports = true;
+            if (!resToken.isEmpty())
+            {
+                m_viewType[nIndex] = resToken;
+            }
+            nIndex++;
+        }
+        ;
+    }
+
+    BindViewports();
+
+    if (maximizedView || layout == ET_Layout0)
+    {
+        MaximizeViewport(maximizedView);
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CLayoutWnd::GetConfigGroupName()
+{
+    return "ViewportLayout";
+}
+
+unsigned int CLayoutWnd::GetViewPaneCount()
+{
+    // If there's a maximized viewport, then exactly 1 is visible.
+    if (m_bMaximized)
+    {
+        return 1;
+    }
+
+    unsigned int numPanes = 0;
+
+    // Otherwise, go searching through and count how many are visible.
+    for (QSplitter* splitter : { m_splitWnd, m_splitWnd2, m_splitWnd3 })
+    {
+        if (splitter)
+        {
+            for (int i = 0; i < splitter->count(); ++i)
+            {
+                if (qobject_cast<CLayoutViewPane*>(splitter->widget(i)))
+                {
+                    numPanes++;
+                }
+            }
+        }
+    }
+
+    return numPanes;
+}
+
+CLayoutViewPane* CLayoutWnd::GetViewPaneByIndex(unsigned int index)
+{
+    // If there's a maximized viewport, return it if index 0 is requested.
+    // (All other index values are invalid in this state)
+    if (m_bMaximized)
+    {
+        if (index == 0)
+        {
+            return m_maximizedView;
+        }
+        return nullptr;
+    }
+
+    unsigned int curIndex = 0;
+
+    // Otherwise, go searching through until we've found the proper number of panes
+    // and return the one at the correct index.
+    for (QSplitter* splitter : { m_splitWnd, m_splitWnd2, m_splitWnd3 })
+    {
+        if (splitter)
+        {
+            for (int i = 0; i < splitter->count(); ++i)
+            {
+                if (QWidget* widget = splitter->widget(i))
+                {
+                    if (CLayoutViewPane* pane = qobject_cast<CLayoutViewPane*>(widget))
+                    {
+                        if (curIndex == index)
+                        {
+                            return pane;
+                        }
+                        curIndex++;
+                    }
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CLayoutViewPane* CLayoutWnd::GetViewPane(int id)
+{
+    QList<QSplitter*> splitters({ m_splitWnd, m_splitWnd2, m_splitWnd3 });
+
+    for (QSplitter* splitter : splitters)
+    {
+        if (!splitter)
+        {
+            continue;
+        }
+
+        for (int i = 0; i < splitter->count(); ++i)
+        {
+            QWidget* widget = splitter->widget(i);
+            if (widget == nullptr)
+            {
+                continue;
+            }
+            if (CLayoutViewPane* pane = qobject_cast<CLayoutViewPane*>(widget))
+            {
+                if (pane && pane->GetId() == id)
+                {
+                    return pane;
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CLayoutViewPane* CLayoutWnd::FindViewByClass(const QString& viewClassName)
+{
+    if (m_viewType[0] == viewClassName)
+    {
+        return m_maximizedView;
+    }
+
+    // Starts from 1, 0 is the maximized view.
+    for (int i = 1; i < MAX_VIEWPORTS; i++)
+    {
+        if (m_viewType[i] == viewClassName)
+        {
+            return GetViewPane(i);
+        }
+    }
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLayoutWnd::CycleViewport(EViewportType from, EViewportType to)
+{
+    const QString viewClassName = ViewportTypeToClassName(from);
+    CLayoutViewPane* vp = FindViewByClass(viewClassName);
+    if (m_layout == ET_Layout0 && !vp)
+    {
+        if (m_maximizedView)
+        {
+            if (m_maximizedView->GetViewClass() == viewClassName)
+            {
+                vp = m_maximizedView;
+            }
+        }
+    }
+    if (vp)
+    {
+        BindViewport(vp, ViewportTypeToClassName(to));
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::ResetLayout()
+{
+    // reset the layout settings. Mfc doesn't have a mechanism to delete settings, that I can find, so we use Qt.
+    m_settings->beginGroup("Editor");
+    m_settings->remove(GetConfigGroupName());
+    m_settings->endGroup();
+
+    // restore the default layout
+    CreateLayout(ET_Layout0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::Cycle2DViewport()
+{
+    // Cycle between 3 2D viewports.
+    switch (m_layout)
+    {
+    case ET_Layout0:
+        if (CycleViewport(ET_ViewportCamera, ET_ViewportXY))
+        {
+            return;
+        }
+        if (CycleViewport(ET_ViewportXY, ET_ViewportXZ))
+        {
+            return;
+        }
+        if (CycleViewport(ET_ViewportXZ, ET_ViewportYZ))
+        {
+            return;
+        }
+        if (CycleViewport(ET_ViewportYZ, ET_ViewportCamera))
+        {
+            return;
+        }
+        break;
+
+    default:
+        if (CycleViewport(ET_ViewportXY, ET_ViewportXZ))
+        {
+            return;
+        }
+        if (CycleViewport(ET_ViewportXZ, ET_ViewportYZ))
+        {
+            return;
+        }
+        if (CycleViewport(ET_ViewportYZ, ET_ViewportXY))
+        {
+            return;
+        }
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutWnd::OnDestroy()
+{
+    if (m_maximizedView)
+    {
+        delete m_maximizedView;
+        m_maximizedView = 0;
+    }
+}
+
+void CLayoutWnd::FocusFirstLayoutViewPane(CLayoutSplitter* splitter)
+{
+    // When starting in multi-layout mode we focus the first CLayoutViewPane
+    // Note that splitter->widget(0) might be another splitter, not a CLayoutViewPane
+    if (splitter)
+    {
+        if (auto view = splitter->findChild<CLayoutViewPane*>())
+        {
+            view->setFocus();
+            MainWindow::instance()->SetActiveView(view);
+        }
+    }
+}
+
+void CLayoutWnd::MoveViewport(CLayoutViewPane* from, CLayoutViewPane* to, const QString& viewClassName)
+{
+    // First detach from old pane, allowing the viewport to be disconnected from the event bus
+    // This must be done before re-binding the viewport and connecting to the bus with a new id
+    auto viewport = from->GetViewport();
+    from->DetachViewport();
+    BindViewport(to, viewClassName, viewport);
+}
+
+static CLayoutViewPane* layoutViewPaneForChild(QObject* child)
+{
+    CLayoutViewPane* result = nullptr;
+
+    while (child)
+    {
+        result = qobject_cast<CLayoutViewPane*>(child);
+        if (result)
+        {
+            break;
+        }
+        child = child->parent();
+    }
+
+    return result;
+}
+
+void CLayoutWnd::OnFocusChanged(QWidget* /* oldWidget */, QWidget* newWidget)
+{
+    if (CLayoutViewPane* layoutViewPane = layoutViewPaneForChild(newWidget))
+    {
+        MainWindow::instance()->SetActiveView(layoutViewPane);
+    }
+}
+
+#include <moc_LayoutWnd.cpp>
diff --git a/Code/Editor/LayoutWnd.h b/Code/Editor/LayoutWnd.h
new file mode 100644
index 0000000000..234c70cc62
--- /dev/null
+++ b/Code/Editor/LayoutWnd.h
@@ -0,0 +1,163 @@
+/*
+ * 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_LAYOUTWND_H
+#define CRYINCLUDE_EDITOR_LAYOUTWND_H
+
+#pragma once
+// LayoutWnd.h : header file
+//
+
+#if !defined(Q_MOC_RUN)
+#include "Viewport.h"
+
+#include <QSplitter>
+#include <QPointer>
+#include <AzQtComponents/Components/ToolBarArea.h>
+#endif
+
+class CLayoutViewPane;
+class CViewport;
+
+class QSettings;
+
+/////////////////////////////////////////////////////////////////////////////
+// CLayoutWnd window
+
+enum EViewLayout
+{
+    ET_Layout0,
+    ET_Layout1,
+    ET_Layout2,
+    ET_Layout3,
+    ET_Layout4,
+    ET_Layout5,
+    ET_Layout6,
+    ET_Layout7,
+    ET_Layout8
+};
+
+#define MAX_VIEWPORTS 9
+
+/** Window used as splitter window in Layout.
+*/
+class CLayoutSplitter
+    : public QSplitter
+{
+    Q_OBJECT
+public:
+    CLayoutSplitter(QWidget* parent = nullptr);
+
+    // Implementation
+public:
+    virtual ~CLayoutSplitter();
+
+    void otherSplitterMoved(int pos, int index) { const QSignalBlocker sb(this);  QSplitter::moveSplitter(pos, index); }
+
+    // Generated message map functions
+protected:
+    void resizeEvent(QResizeEvent* event) override;
+
+    void CreateLayoutView(int row, int col, int id);
+
+    QSplitterHandle* createHandle() override;
+
+private:
+    friend class CLayoutWnd;
+};
+
+/** Main layout window.
+*/
+class CLayoutWnd
+    : public AzQtComponents::ToolBarArea
+{
+    // Construction
+    Q_OBJECT
+public:
+    CLayoutWnd(QSettings* settings, QWidget* parent = nullptr);
+
+    // Attributes
+public:
+    CLayoutViewPane* GetViewPane(int id);
+    CLayoutViewPane* GetViewPaneByIndex(unsigned int index);
+    unsigned int GetViewPaneCount();
+
+    //! Maximize viewport with specified type.
+    void MaximizeViewport(int paneId);
+
+    //! Create specific layout.
+    void CreateLayout(EViewLayout layout, bool bBindViewports = true, EViewportType defaultView = ET_ViewportCamera);
+    EViewLayout GetLayout() const { return m_layout; }
+
+    //! Save layout window configuration to registry.
+    void SaveConfig();
+    //! Load layout window configuration from registry.
+    bool LoadConfig();
+    //! Get the config group name in the registry.
+    static const char* GetConfigGroupName();
+
+    CLayoutViewPane* FindViewByClass(const QString& viewClassName);
+    void BindViewport(CLayoutViewPane* vp, const QString& viewClassName, QWidget* pViewport = NULL);
+    QString ViewportTypeToClassName(EViewportType viewType);
+
+    //! Switch 2D viewports.
+    void Cycle2DViewport();
+
+    using AzQtComponents::ToolBarArea::SetMainWidget;
+
+public slots:
+    void ResetLayout();
+
+public:
+    virtual ~CLayoutWnd();
+
+    // Generated message map functions
+protected:
+    void OnDestroy();
+
+    // Bind viewports to split panes.
+    void BindViewports();
+    void UnbindViewports();
+
+    void CreateLayoutView(CLayoutSplitter* wndSplitter, int row, int col, int id, EViewportType viewType);
+
+    bool CycleViewport(EViewportType from, EViewportType to);
+
+private slots:
+    void OnFocusChanged(QWidget* oldWidget, QWidget* newWidget);
+
+private:
+    void FocusFirstLayoutViewPane(CLayoutSplitter*);
+    void MoveViewport(CLayoutViewPane* from, CLayoutViewPane* to, const QString& viewClassName);
+    bool m_bMaximized;
+
+    //! What view type is current maximized.
+    EViewLayout m_layout;
+
+    // ViewPane id to viewport type
+    QString m_viewType[MAX_VIEWPORTS];
+
+    //! Primary split window.
+    QPointer<CLayoutSplitter> m_splitWnd;
+    //! Secondary split window.
+    QPointer<CLayoutSplitter> m_splitWnd2;
+    //! Tertiary split window.
+    QPointer<CLayoutSplitter> m_splitWnd3;
+
+    //! View pane for maximized layout.
+    QPointer<CLayoutViewPane> m_maximizedView;
+    // Id of maximized view pane.
+    int m_maximizedViewId;
+
+    QSize m_infoBarSize;
+    QSettings* m_settings;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+#endif // CRYINCLUDE_EDITOR_LAYOUTWND_H
diff --git a/Code/Editor/LegacyViewportCameraController.cpp b/Code/Editor/LegacyViewportCameraController.cpp
new file mode 100644
index 0000000000..0750db8d97
--- /dev/null
+++ b/Code/Editor/LegacyViewportCameraController.cpp
@@ -0,0 +1,537 @@
+/*
+ * 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 "LegacyViewportCameraController.h"
+
+#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
+#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
+#include <AzFramework/Viewport/ScreenGeometry.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
+#include <Atom/RPI.Public/ViewportContext.h>
+
+#include <IViewSystem.h>
+#include <ISystem.h>
+#include "CryCommon/MathConversion.h"
+#include "SandboxAPI.h"
+#include "Settings.h"
+
+namespace SandboxEditor
+{
+
+LegacyViewportCameraControllerInstance::LegacyViewportCameraControllerInstance(AzFramework::ViewportId viewportId, LegacyViewportCameraController* controller)
+    : AzFramework::MultiViewportControllerInstanceInterface<LegacyViewportCameraController>(viewportId, controller)
+{
+    OrbitCameraControlsBus::Handler::BusConnect(viewportId);
+}
+
+LegacyViewportCameraControllerInstance::~LegacyViewportCameraControllerInstance()
+{
+    OrbitCameraControlsBus::Handler::BusDisconnect();
+}
+
+bool LegacyViewportCameraControllerInstance::JustAltHeld() const
+{
+    return (m_modifiers ^ Qt::AltModifier) == 0;
+}
+
+bool LegacyViewportCameraControllerInstance::NoModifierHeld() const
+{
+    return !m_modifiers;
+}
+
+bool LegacyViewportCameraControllerInstance::AllowDolly() const
+{
+    return JustAltHeld();
+}
+
+bool LegacyViewportCameraControllerInstance::AllowOrbit() const
+{
+    return JustAltHeld();
+}
+
+bool LegacyViewportCameraControllerInstance::AllowPan() const
+{
+    // begin pan with alt (inverted movement) or no modifiers
+    return JustAltHeld() || NoModifierHeld();
+}
+
+bool LegacyViewportCameraControllerInstance::InvertPan() const
+{
+    return JustAltHeld();
+}
+
+void LegacyViewportCameraControllerInstance::SetOrbitDistance(float orbitDistance)
+{
+    m_orbitDistance = orbitDistance;
+}
+
+
+AZ::RPI::ViewportContextPtr LegacyViewportCameraControllerInstance::GetViewportContext()
+{
+    // This could be cached, if needed
+    auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
+    if (!viewportContextManager)
+    {
+        return {};
+    }
+    return viewportContextManager->GetViewportContextById(GetViewportId());
+}
+
+bool LegacyViewportCameraControllerInstance::HandleMouseMove(
+    const AzFramework::ScreenPoint& currentMousePos, const AzFramework::ScreenPoint& previousMousePos)
+{
+    if (previousMousePos == currentMousePos)
+    {
+        return false;
+    }
+
+    auto viewportContext = GetViewportContext();
+    if (!viewportContext)
+    {
+        return false;
+    }
+
+    float speedScale = gSettings.cameraMoveSpeed;
+
+    if (m_modifiers & Qt::Key_Control)
+    {
+        speedScale *= gSettings.cameraFastMoveSpeed;
+    }
+
+    if (m_inMoveMode || m_inOrbitMode || m_inRotateMode || m_inZoomMode)
+    {
+        m_totalMouseMoveDelta += (QPoint(currentMousePos.m_x, currentMousePos.m_y)-QPoint(previousMousePos.m_x, previousMousePos.m_y)).manhattanLength();
+    }
+
+    if ((m_inRotateMode && m_inMoveMode) || m_inZoomMode)
+    {
+        Matrix34 m = AZTransformToLYTransform(viewportContext->GetCameraTransform());
+
+        Vec3 ydir = m.GetColumn1().GetNormalized();
+        Vec3 pos = m.GetTranslation();
+
+        const float posDelta = 0.2f * (previousMousePos.m_y - currentMousePos.m_y) * speedScale;
+        pos = pos - ydir * posDelta;
+        m_orbitDistance = m_orbitDistance + posDelta;
+        m_orbitDistance = fabs(m_orbitDistance);
+
+        m.SetTranslation(pos);
+        viewportContext->SetCameraTransform(LYTransformToAZTransform(m));
+        return true;
+    }
+    else if (m_inRotateMode)
+    {
+        Ang3 angles(-currentMousePos.m_y + previousMousePos.m_y, 0, -currentMousePos.m_x + previousMousePos.m_x);
+        angles = angles * 0.002f * gSettings.cameraRotateSpeed;
+        if (gSettings.invertYRotation)
+        {
+            angles.x = -angles.x;
+        }
+        Matrix34 camtm = AZTransformToLYTransform(viewportContext->GetCameraTransform());
+        Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(camtm));
+        ypr.x += angles.z;
+        ypr.y += angles.x;
+
+        ypr.y = AZStd::clamp(ypr.y, -1.5f, 1.5f); // to keep rotation in reasonable range
+        ypr.z = 0;      // to have camera always upward
+
+        camtm = Matrix34(CCamera::CreateOrientationYPR(ypr), camtm.GetTranslation());
+        viewportContext->SetCameraTransform(LYTransformToAZTransform(camtm));
+        return true;
+    }
+    else if (m_inMoveMode)
+    {
+        // Slide.
+        Matrix34 m = AZTransformToLYTransform(viewportContext->GetCameraTransform());
+        Vec3 xdir = m.GetColumn0().GetNormalized();
+        Vec3 zdir = m.GetColumn2().GetNormalized();
+
+        if (InvertPan())
+        {
+            xdir = -xdir;
+            zdir = -zdir;
+        }
+
+        Vec3 pos = m.GetTranslation();
+        pos += 0.1f * xdir * (currentMousePos.m_x - previousMousePos.m_x) * speedScale + 0.1f * zdir * (previousMousePos.m_y - currentMousePos.m_y) * speedScale;
+        m.SetTranslation(pos);
+
+        AZ::Transform transform = viewportContext->GetCameraTransform();
+        transform.SetTranslation(LYVec3ToAZVec3(pos));
+        viewportContext->SetCameraTransform(transform);
+        return true;
+    }
+    else if (m_inOrbitMode)
+    {
+        Ang3 angles(-currentMousePos.m_y + previousMousePos.m_y, 0, -currentMousePos.m_x + previousMousePos.m_x);
+        angles = angles * 0.002f * gSettings.cameraRotateSpeed;
+
+        if (gSettings.invertPan)
+        {
+            angles.z = -angles.z;
+        }
+
+        Matrix34 m = AZTransformToLYTransform(viewportContext->GetCameraTransform());
+        Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(m));
+        ypr.x += angles.z;
+        ypr.y = AZStd::clamp(ypr.y, -1.5f, 1.5f); // to keep rotation in reasonable range
+        ypr.y += angles.x;
+
+        Matrix33 rotateTM = CCamera::CreateOrientationYPR(ypr);
+
+        Vec3 src = m.GetTranslation();
+        Vec3 trg(m_orbitTarget.GetX(), m_orbitTarget.GetY(), m_orbitTarget.GetZ());
+        float fCameraRadius = (trg - src).GetLength();
+
+        // Calc new source.
+        src = trg - rotateTM * Vec3(0, 1, 0) * fCameraRadius;
+        Matrix34 camTM = rotateTM;
+        camTM.SetTranslation(src);
+
+        viewportContext->SetCameraTransform(LYTransformToAZTransform(camTM));
+        return true;
+    }
+    return false;
+}
+
+bool LegacyViewportCameraControllerInstance::HandleMouseWheel(float zDelta)
+{
+    auto viewportContext = GetViewportContext();
+    if (!viewportContext)
+    {
+        return false;
+    }
+
+    Matrix34 m = AZTransformToLYTransform(viewportContext->GetCameraTransform());
+    const Vec3 ydir = m.GetColumn1().GetNormalized();
+
+    Vec3 pos = m.GetTranslation();
+
+    const float posDelta = 0.01f * zDelta * gSettings.wheelZoomSpeed;
+    pos += ydir * posDelta;
+    m_orbitDistance = m_orbitDistance - posDelta;
+    m_orbitDistance = fabs(m_orbitDistance);
+
+    m.SetTranslation(pos);
+    viewportContext->SetCameraTransform(LYTransformToAZTransform(m));
+    return true;
+}
+
+bool LegacyViewportCameraControllerInstance::IsKeyDown(Qt::Key key) const
+{
+    return m_pressedKeys.contains(key);
+}
+
+Qt::Key LegacyViewportCameraControllerInstance::GetKeyboardKey(const AzFramework::InputChannel& inputChannel)
+{
+    using Key = AzFramework::InputDeviceKeyboard::Key;
+    const auto& id = inputChannel.GetInputChannelId();
+    if (id == Key::AlphanumericW)
+    {
+        return Qt::Key_W;
+    }
+    else if (id == Key::AlphanumericA)
+    {
+        return Qt::Key_A;
+    }
+    else if (id == Key::AlphanumericS)
+    {
+        return Qt::Key_S;
+    }
+    else if (id == Key::AlphanumericD)
+    {
+        return Qt::Key_D;
+    }
+    else if (id == Key::AlphanumericQ)
+    {
+        return Qt::Key_Q;
+    }
+    else if (id == Key::AlphanumericE)
+    {
+        return Qt::Key_E;
+    }
+    else if (id == Key::NavigationArrowUp)
+    {
+        return Qt::Key_Up;
+    }
+    else if (id == Key::NavigationArrowUp)
+    {
+        return Qt::Key_Down;
+    }
+    else if (id == Key::NavigationArrowUp)
+    {
+        return Qt::Key_Left;
+    }
+    else if (id == Key::NavigationArrowUp)
+    {
+        return Qt::Key_Right;
+    }
+    return Qt::Key_unknown;
+}
+
+Qt::KeyboardModifier LegacyViewportCameraControllerInstance::GetKeyboardModifier(const AzFramework::InputChannel& inputChannel)
+{
+    using Key = AzFramework::InputDeviceKeyboard::Key;
+    const auto& id = inputChannel.GetInputChannelId();
+    if (id == Key::ModifierAltL || id == Key::ModifierAltR)
+    {
+        return Qt::KeyboardModifier::AltModifier;
+    }
+    if (id == Key::ModifierCtrlL || id == Key::ModifierCtrlR)
+    {
+        return Qt::KeyboardModifier::ControlModifier;
+    }
+    if (id == Key::ModifierShiftL || id == Key::ModifierShiftR)
+    {
+        return Qt::KeyboardModifier::ShiftModifier;
+    }
+    return Qt::KeyboardModifier::NoModifier;
+}
+
+bool LegacyViewportCameraControllerInstance::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
+{
+    using AzFramework::InputChannel;
+    using MouseButton = AzFramework::InputDeviceMouse::Button;
+    const auto& id = event.m_inputChannel.GetInputChannelId();
+    const auto& state = event.m_inputChannel.GetState();
+    bool shouldCaptureCursor = m_capturingCursor;
+    bool shouldConsumeEvent = false;
+
+    if (id == AzFramework::InputDeviceMouse::SystemCursorPosition)
+    {
+        bool result = false;
+        AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Event(
+            GetViewportId(),
+            [this, &result](AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequests* mouseRequests)
+            {
+                if (auto previousMousePosition = mouseRequests->PreviousViewportCursorScreenPosition();
+                    previousMousePosition.has_value())
+                {
+                    result = HandleMouseMove(mouseRequests->ViewportCursorScreenPosition(), previousMousePosition.value());
+                }
+            });
+        return result;
+    }
+    else if (id == MouseButton::Left)
+    {
+        if (state == InputChannel::State::Began)
+        {
+            if (AllowOrbit())
+            {
+                AzFramework::CameraState cameraState;
+                AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
+                    cameraState, event.m_viewportId,
+                    &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GetCameraState);
+
+                m_inOrbitMode = true;
+                m_orbitTarget = cameraState.m_position + cameraState.m_forward * m_orbitDistance;
+
+                shouldConsumeEvent = true;
+                shouldCaptureCursor = true;
+            }
+        }
+        else if (state == InputChannel::State::Ended)
+        {
+            m_inOrbitMode = false;
+            shouldCaptureCursor = false;
+        }
+    }
+    else if (id == MouseButton::Right)
+    {
+        if (state == InputChannel::State::Began)
+        {
+            if (AllowDolly())
+            {
+                m_inZoomMode = true;
+            }
+            else
+            {
+                m_inRotateMode = true;
+            }
+
+            shouldCaptureCursor = true;
+            // Record how much the cursor has been moved to see if we should own the mouse up event.
+            m_totalMouseMoveDelta = 0;
+        }
+        else if (state == InputChannel::State::Ended)
+        {
+            m_inZoomMode = false;
+            m_inRotateMode = false;
+            // If we've moved the cursor more than a couple pixels, we should eat this mouse up event to prevent the context menu controller from seeing it.
+            shouldConsumeEvent = m_totalMouseMoveDelta > 2;
+            shouldCaptureCursor = false;
+        }
+    }
+    else if (id == MouseButton::Middle)
+    {
+        if (state == InputChannel::State::Began)
+        {
+            if (AllowPan())
+            {
+                m_inMoveMode = true;
+                shouldConsumeEvent = true;
+                shouldCaptureCursor = true;
+            }
+        }
+        else if (state == InputChannel::State::Ended)
+        {
+            m_inMoveMode = false;
+            shouldCaptureCursor = false;
+        }
+    }
+    else if (auto modifier = GetKeyboardModifier(event.m_inputChannel); modifier != Qt::KeyboardModifier::NoModifier)
+    {
+        if (state == InputChannel::State::Ended)
+        {
+            m_modifiers &= ~modifier;
+        }
+        else
+        {
+            m_modifiers |= modifier;
+        }
+    }
+    else if (id == AzFramework::InputDeviceMouse::Movement::Z)
+    {
+        if (state == InputChannel::State::Began || state == InputChannel::State::Updated)
+        {
+            shouldConsumeEvent = HandleMouseWheel(event.m_inputChannel.GetValue());
+        }
+    }
+    else if (auto key = GetKeyboardKey(event.m_inputChannel); key != Qt::Key_unknown)
+    {
+        if (state == InputChannel::State::Ended)
+        {
+            m_pressedKeys.erase(key);
+        }
+        else
+        {
+            m_pressedKeys.insert(key);
+            shouldConsumeEvent = true;
+        }
+    }
+
+    UpdateCursorCapture(shouldCaptureCursor);
+
+    return shouldConsumeEvent;
+}
+
+void LegacyViewportCameraControllerInstance::UpdateCursorCapture(bool shouldCaptureCursor)
+{
+    if (m_capturingCursor != shouldCaptureCursor)
+    {
+        if (shouldCaptureCursor)
+        {
+            AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Event(
+                GetViewportId(),
+                &AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Events::BeginCursorCapture
+            );
+        }
+        else
+        {
+            AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Event(
+                GetViewportId(),
+                &AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Events::EndCursorCapture
+            );
+        }
+
+        m_capturingCursor = shouldCaptureCursor;
+    }
+}
+
+void LegacyViewportCameraControllerInstance::ResetInputChannels()
+{
+    m_modifiers = 0;
+    m_pressedKeys.clear();
+    UpdateCursorCapture(false);
+    m_inRotateMode = m_inMoveMode = m_inOrbitMode = m_inZoomMode = false;
+}
+
+void LegacyViewportCameraControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
+{
+    auto viewportContext = GetViewportContext();
+    if (!viewportContext)
+    {
+        return;
+    }
+
+    AZ::Transform transform = viewportContext->GetCameraTransform();
+    AZ::Vector3 xdir = transform.GetBasisX();
+    AZ::Vector3 ydir = transform.GetBasisY();
+    AZ::Vector3 zdir = transform.GetBasisZ();
+
+    AZ::Vector3 pos = transform.GetTranslation();
+
+    float speedScale = AZStd::GetMin(30.0f * event.m_deltaTime.count(), 20.0f);
+
+    // Use the global modifier keys instead of our keymap. It's more reliable.
+    const bool shiftPressed = m_modifiers & Qt::ShiftModifier;
+    const bool controlPressed = m_modifiers & Qt::ControlModifier;
+
+    speedScale *= gSettings.cameraMoveSpeed;
+    if (controlPressed)
+    {
+        return;
+    }
+
+    if (shiftPressed)
+    {
+        speedScale *= gSettings.cameraFastMoveSpeed;
+    }
+
+    bool cameraMoved = false;
+
+    if (IsKeyDown(Qt::Key_Up) || IsKeyDown(Qt::Key_W))
+    {
+        // move forward
+        cameraMoved = true;
+        pos = pos + (speedScale * m_moveSpeed * ydir);
+    }
+
+    if (IsKeyDown(Qt::Key_Down) || IsKeyDown(Qt::Key_S))
+    {
+        // move backward
+        cameraMoved = true;
+        pos = pos - (speedScale * m_moveSpeed * ydir);
+    }
+
+    if (IsKeyDown(Qt::Key_Left) || IsKeyDown(Qt::Key_A))
+    {
+        // move left
+        cameraMoved = true;
+        pos = pos - (speedScale * m_moveSpeed * xdir);
+    }
+
+    if (IsKeyDown(Qt::Key_Right) || IsKeyDown(Qt::Key_D))
+    {
+        // move right
+        cameraMoved = true;
+        pos = pos + (speedScale * m_moveSpeed * xdir);
+    }
+
+    if (IsKeyDown(Qt::Key_E))
+    {
+        // move Up
+        cameraMoved = true;
+        pos = pos + (speedScale * m_moveSpeed * zdir);
+    }
+
+    if (IsKeyDown(Qt::Key_Q))
+    {
+        // move down
+        cameraMoved = true;
+        pos = pos - (speedScale * m_moveSpeed * zdir);
+    }
+
+    if (cameraMoved)
+    {
+        transform.SetTranslation(pos);
+        viewportContext->SetCameraTransform(transform);
+    }
+}
+
+} //namespace SandboxEditor
diff --git a/Code/Editor/LegacyViewportCameraController.h b/Code/Editor/LegacyViewportCameraController.h
new file mode 100644
index 0000000000..d3ff439b16
--- /dev/null
+++ b/Code/Editor/LegacyViewportCameraController.h
@@ -0,0 +1,90 @@
+/*
+ * 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 <AzFramework/Viewport/ViewportId.h>
+#include <AzFramework/Viewport/MultiViewportController.h>
+#include <AzCore/Math/Vector3.h>
+
+#include <Atom/RPI.Public/Base.h>
+
+#include <QtCore/qnamespace.h>
+#include <QPoint>
+
+namespace AzFramework
+{
+    struct ScreenPoint;
+}
+
+namespace SandboxEditor
+{
+    class OrbitCameraControls
+    : 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::ViewportId;
+        //////////////////////////////////////////////////////////////////////////
+
+        virtual void SetOrbitDistance(float orbitDistance [[maybe_unused]]) {;}
+    };
+    using OrbitCameraControlsBus = AZ::EBus<OrbitCameraControls>;
+
+    class LegacyViewportCameraControllerInstance;
+    using LegacyViewportCameraController = AzFramework::MultiViewportController<LegacyViewportCameraControllerInstance>;
+
+    class LegacyViewportCameraControllerInstance final
+        : public AzFramework::MultiViewportControllerInstanceInterface<LegacyViewportCameraController>
+        , public OrbitCameraControlsBus::Handler
+    {
+    public:
+        LegacyViewportCameraControllerInstance(AzFramework::ViewportId viewport, LegacyViewportCameraController* controller);
+        ~LegacyViewportCameraControllerInstance();
+
+        bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
+        void ResetInputChannels() override;
+        void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
+
+        void SetOrbitDistance(float orbitDistance) override;
+
+    private:
+        bool JustAltHeld() const;
+        bool NoModifierHeld() const;
+        bool AllowDolly() const;
+        bool AllowOrbit() const;
+        bool AllowPan() const;
+        bool InvertPan() const;
+
+        static Qt::KeyboardModifier GetKeyboardModifier(const AzFramework::InputChannel& inputChannel);
+        static Qt::Key GetKeyboardKey(const AzFramework::InputChannel& inputChannel);
+
+        AZ::RPI::ViewportContextPtr GetViewportContext();
+
+        bool HandleMouseMove(const AzFramework::ScreenPoint& currentMousePos, const AzFramework::ScreenPoint& previousMousePos);
+        bool HandleMouseWheel(float zDelta);
+        bool IsKeyDown(Qt::Key key) const;
+        void UpdateCursorCapture(bool shouldCaptureCursor);
+
+        bool m_inRotateMode = false;
+        bool m_inMoveMode = false;
+        bool m_inOrbitMode = false;
+        bool m_inZoomMode = false;
+        int m_totalMouseMoveDelta = 0;
+        float m_orbitDistance = 10.f;
+        float m_moveSpeed = 1.f;
+        AZ::Vector3 m_orbitTarget = {};
+        unsigned int m_modifiers = {};
+        AZStd::unordered_set<Qt::Key> m_pressedKeys;
+        bool m_capturingCursor = false;
+    };
+
+} //namespace SandboxEditor
diff --git a/Code/Editor/LevelFileDialog.cpp b/Code/Editor/LevelFileDialog.cpp
new file mode 100644
index 0000000000..d7b964c4bd
--- /dev/null
+++ b/Code/Editor/LevelFileDialog.cpp
@@ -0,0 +1,544 @@
+/*
+ * 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 "LevelFileDialog.h"
+
+#include <AzFramework/API/ApplicationAPI.h>
+
+// Qt
+#include <QMessageBox>
+#include <QInputDialog>
+
+// Editor
+#include "LevelTreeModel.h"
+#include "CryEditDoc.h"
+#include "API/ToolsApplicationAPI.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_LevelFileDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+static const char lastLoadPathFilename[] = "lastLoadPath.preset";
+
+// Folder in which levels are stored
+static const char kLevelsFolder[] = "Levels";
+
+// List of folder names that are used to detect a level folder
+static const char* kLevelFolderNames[] =
+{
+    "Layers",
+    "Minimap",
+    "LevelData"
+};
+
+// List of files that are used to detect a level folder
+static const char* kLevelFileNames[] =
+{
+    "level.pak",
+    "filelist.xml",
+    "levelshadercache.pak",
+};
+
+CLevelFileDialog::CLevelFileDialog(bool openDialog, QWidget* parent)
+    : QDialog(parent)
+    , m_bOpenDialog(openDialog)
+    , ui(new Ui::LevelFileDialog())
+    , m_model(new LevelTreeModel(this))
+    , m_filterModel(new LevelTreeModelFilter(this))
+{
+    ui->setupUi(this);
+    ui->treeView->header()->close();
+    m_filterModel->setSourceModel(m_model);
+    ui->treeView->setModel(m_filterModel);
+    ui->treeView->installEventFilter(this);
+
+    connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged,
+        this, &CLevelFileDialog::OnTreeSelectionChanged);
+
+    connect(ui->treeView, &QTreeView::doubleClicked, this, [this]()
+        {
+            if (m_bOpenDialog && !IsValidLevelSelected())
+            {
+                return;
+            }
+
+            OnOK();
+        });
+
+    connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &CLevelFileDialog::OnFilterChanged);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &CLevelFileDialog::OnCancel);
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &CLevelFileDialog::OnOK);
+    connect(ui->newFolderButton, &QPushButton::clicked, this, &CLevelFileDialog::OnNewFolder);
+
+    if (m_bOpenDialog)
+    {
+        setWindowTitle(tr("Open Level"));
+        ui->newFolderButton->setVisible(false);
+        ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Open"));
+    }
+    else
+    {
+        setWindowTitle(tr("Save Level As "));
+        ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Save"));
+        ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+        // Make the name input the default active field for the save as dialog
+        // The filter input will still be the default active field for the open dialog
+        setTabOrder(ui->nameLineEdit, ui->filterLineEdit);
+
+        connect(ui->nameLineEdit, &QLineEdit::textChanged, this, &CLevelFileDialog::OnNameChanged);
+    }
+
+    // reject invalid file names (see CryStringUtils::IsValidFileName)
+    ui->nameLineEdit->setValidator(new QRegExpValidator(QRegExp("^[a-zA-Z0-9_\\-./]*$"), ui->nameLineEdit));
+
+    ReloadTree();
+    LoadLastUsedLevelPath();
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+}
+
+CLevelFileDialog::~CLevelFileDialog()
+{
+}
+
+QString CLevelFileDialog::GetFileName() const
+{
+    return m_fileName;
+}
+
+void CLevelFileDialog::OnCancel()
+{
+    close();
+}
+
+void CLevelFileDialog::OnOK()
+{
+    if (m_bOpenDialog)
+    {
+        // For Open button
+        if (!IsValidLevelSelected())
+        {
+            QMessageBox box(this);
+            box.setText(tr("Please enter a valid level name"));
+            box.setIcon(QMessageBox::Critical);
+            box.exec();
+            return;
+        }
+    }
+    else
+    {
+        QString errorMessage;
+        if (!ValidateSaveLevelPath(errorMessage))
+        {
+            QMessageBox::warning(this, tr("Error"), errorMessage);
+            return;
+        }
+
+        QString levelPath = GetLevelPath();
+        if (CFileUtil::PathExists(levelPath) && CheckLevelFolder(levelPath))
+        {
+            // there is already a level folder at that location, ask before for overwriting it
+            QMessageBox box(this);
+            box.setText(tr("Do you really want to overwrite '%1'?").arg(GetEnteredPath()));
+            box.setIcon(QMessageBox::Warning);
+            box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+            if (box.exec() != QMessageBox::Yes)
+            {
+                return;
+            }
+        }
+
+        m_fileName = levelPath + "/" + Path::GetFileName(levelPath) + EditorUtils::LevelFile::GetDefaultFileExtension();
+    }
+
+    SaveLastUsedLevelPath();
+    accept();
+}
+
+bool CLevelFileDialog::eventFilter(QObject* watched, QEvent* event)
+{
+    if (event->type() == QEvent::KeyPress) {
+        auto keyEvent = static_cast<QKeyEvent*>(event);
+        if (keyEvent->key() == Qt::Key_Return) {
+            OnOK();
+            return true;
+        }
+    }
+    return QDialog::eventFilter(watched, event);
+}
+
+QString CLevelFileDialog::NameForIndex(const QModelIndex& index) const
+{
+    QStringList tokens;
+    QModelIndex idx = index;
+
+    while (idx.isValid() && idx.parent().isValid())   // the root one doesn't count
+    {
+        tokens.push_front(idx.data(Qt::DisplayRole).toString());
+        idx = idx.parent();
+    }
+
+    QString text = tokens.join('/');
+    const bool isLevelFolder = index.data(LevelTreeModel::IsLevelFolderRole).toBool();
+    if (!isLevelFolder && !text.isEmpty())
+    {
+        text += "/";
+    }
+
+    return text;
+}
+
+bool CLevelFileDialog::IsValidLevelSelected()
+{
+    QString levelPath = GetLevelPath();
+    m_fileName = GetFileName(levelPath);
+
+    QString currentExtension = "." + Path::GetExt(m_fileName);
+
+    const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
+    const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+
+    bool isInvalidFileExtension = (currentExtension != defaultExtension && currentExtension != oldExtension);
+
+    if (!isInvalidFileExtension && CFileUtil::FileExists(m_fileName))
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+QString CLevelFileDialog::GetLevelPath() const
+{
+    const QString enteredPath = GetEnteredPath();
+    const QString levelPath = QString("%1/%2/%3").arg(Path::GetEditingGameDataFolder().c_str()).arg(kLevelsFolder).arg(enteredPath);
+    return levelPath;
+}
+
+QString CLevelFileDialog::GetEnteredPath() const
+{
+    QString enteredPath = ui->nameLineEdit->text();
+    enteredPath = enteredPath.trimmed();
+    enteredPath = Path::RemoveBackslash(enteredPath);
+
+    return enteredPath;
+}
+
+QString CLevelFileDialog::GetFileName(QString levelPath)
+{
+    QStringList levelFiles;
+    QString fileName;
+
+    if (CheckLevelFolder(levelPath, &levelFiles) && levelFiles.size() >= 1)
+    {
+        const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
+        const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+
+        // A level folder was entered. Prefer the .ly/.cry file with the
+        // folder name, otherwise pick the first one in the list
+        QString path = Path::GetFileName(levelPath);
+        QString needle = path + defaultExtension;
+        auto iter = std::find(levelFiles.begin(), levelFiles.end(), needle);
+
+        if (iter != levelFiles.end())
+        {
+            fileName = levelPath + "/" + *iter;
+        }
+        else
+        {
+            needle = path + oldExtension;
+            iter = std::find(levelFiles.begin(), levelFiles.end(), needle);
+            if (iter != levelFiles.end())
+            {
+                fileName = levelPath + "/" + *iter;
+            }
+            else
+            {
+                fileName = levelPath + "/" + levelFiles[0];
+            }
+        }
+    }
+    else
+    {
+        // Otherwise try to directly load the specified file (backward compatibility)
+        fileName = levelPath;
+    }
+
+    return fileName;
+}
+
+void CLevelFileDialog::OnTreeSelectionChanged()
+{
+    const QModelIndexList indexes = ui->treeView->selectionModel()->selectedIndexes();
+    if (!indexes.isEmpty())
+    {
+        ui->nameLineEdit->setText(NameForIndex(indexes.first()));
+    }
+}
+
+void CLevelFileDialog::OnNewFolder()
+{
+    const QModelIndexList indexes = ui->treeView->selectionModel()->selectedIndexes();
+
+    if (indexes.isEmpty())
+    {
+        QMessageBox box(this);
+        box.setText(tr("Please select a folder first"));
+        box.setIcon(QMessageBox::Critical);
+        box.exec();
+        return;
+    }
+
+    const QModelIndex index = indexes.first();
+    const bool isLevelFolder = index.data(LevelTreeModel::IsLevelFolderRole).toBool();
+
+    // Creating folders is not allowed in level folders
+    if (!isLevelFolder && index.isValid())
+    {
+        const QString parentFullPath = index.data(LevelTreeModel::FullPathRole).toString();
+        QInputDialog inputDlg(this);
+        inputDlg.setLabelText(tr("Please select a folder name"));
+
+        if (inputDlg.exec() == QDialog::Accepted && !inputDlg.textValue().isEmpty())
+        {
+            const QString newFolderName = inputDlg.textValue();
+            const QString newFolderPath = parentFullPath + "/" + newFolderName;
+
+            if (!CryStringUtils::IsValidFileName(newFolderName.toUtf8().data()))
+            {
+                QMessageBox box(this);
+                box.setText(tr("Please enter a single, valid folder name(standard English alphanumeric characters only)"));
+                box.setIcon(QMessageBox::Critical);
+                box.exec();
+                return;
+            }
+
+            if (CFileUtil::PathExists(newFolderPath))
+            {
+                QMessageBox box(this);
+                box.setText(tr("Folder already exists"));
+                box.setIcon(QMessageBox::Critical);
+                box.exec();
+                return;
+            }
+
+            // The trailing / is important, otherwise CreatePath doesn't work
+            if (!CFileUtil::CreatePath(newFolderPath + "/"))
+            {
+                QMessageBox box(this);
+                box.setText(tr("Could not create folder"));
+                box.setIcon(QMessageBox::Critical);
+                box.exec();
+                return;
+            }
+
+            m_model->AddItem(newFolderName, m_filterModel->mapToSource(index));
+            ui->treeView->expand(index);
+        }
+    }
+    else
+    {
+        QMessageBox box(this);
+        box.setText(tr("Please select a folder first"));
+        box.setIcon(QMessageBox::Critical);
+        box.exec();
+        return;
+    }
+}
+
+void CLevelFileDialog::OnFilterChanged()
+{
+    m_filterModel->setFilterText(ui->filterLineEdit->text().toLower());
+}
+
+void CLevelFileDialog::OnNameChanged()
+{
+    if (!m_bOpenDialog)
+    {
+        QString errorMessage;
+        ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ValidateSaveLevelPath(errorMessage));
+    }
+}
+
+void CLevelFileDialog::ReloadTree()
+{
+    m_model->ReloadTree(m_bOpenDialog);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Heuristic to detect a level folder, also returns all .cry/.ly files in it
+//////////////////////////////////////////////////////////////////////////
+bool CLevelFileDialog::CheckLevelFolder(const QString folder, QStringList* levelFiles)
+{
+    CFileEnum fileEnum;
+    QFileInfo fileData;
+    bool bIsLevelFolder = false;
+
+    for (bool bFoundFile = fileEnum.StartEnumeration(folder, "*", &fileData);
+         bFoundFile; bFoundFile = fileEnum.GetNextFile(&fileData))
+    {
+        const QString fileName = fileData.fileName();
+
+        if (!fileData.isDir())
+        {
+            QString ext = "." + Path::GetExt(fileName);
+
+            const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+
+            if (ext == defaultExtension)
+            {
+                bIsLevelFolder = true;
+
+                if (levelFiles)
+                {
+                    levelFiles->push_back(fileName);
+                }
+            }
+        }
+    }
+
+    return bIsLevelFolder;
+}
+
+bool CLevelFileDialog::ValidateSaveLevelPath(QString& errorMessage) const
+{
+    const QString enteredPath = GetEnteredPath();
+    const QString levelPath = GetLevelPath();
+
+    if (!CryStringUtils::IsValidFileName(Path::GetFileName(levelPath).toUtf8().data()))
+    {
+        errorMessage = tr("Please enter a valid level name (standard English alphanumeric characters only)");
+        return false;
+    }
+
+    //Verify that we are not using the temporary level name
+    const char* temporaryLevelName = GetIEditor()->GetDocument()->GetTemporaryLevelName();
+    if (QString::compare(Path::GetFileName(levelPath), temporaryLevelName) == 0)
+    {
+        errorMessage = tr("Please enter a level name that is different from the temporary name");
+        return false;
+    }
+
+    if (!ValidateLevelPath(enteredPath))
+    {
+        errorMessage = tr("Please enter a valid level location.\nYou cannot save levels inside levels.");
+        return false;
+    }
+
+    if (CFileUtil::FileExists(levelPath))
+    {
+        errorMessage = tr("A file with that name already exists");
+        return false;
+    }
+
+    if (CFileUtil::PathExists(levelPath) && !CheckLevelFolder(levelPath))
+    {
+        errorMessage = tr("Please enter a level name");
+        return false;
+    }
+
+    return true;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// Checks if a given path is a valid level path
+//////////////////////////////////////////////////////////////////////////
+bool CLevelFileDialog::ValidateLevelPath(const QString& levelPath) const
+{
+    if (levelPath.isEmpty() || Path::GetExt(levelPath) != "")
+    {
+        return false;
+    }
+
+    // Split path
+    QStringList splittedPath = levelPath.split(QRegularExpression(QStringLiteral(R"([\\/])")), Qt::SkipEmptyParts);
+
+    // This shouldn't happen, but be careful
+    if (splittedPath.empty())
+    {
+        return false;
+    }
+
+    // Make sure that no folder before the last in the name contains a level
+    if (splittedPath.size() > 1)
+    {
+        QString currentPath = (Path::GetEditingGameDataFolder() + "/" + kLevelsFolder).c_str();
+        for (size_t i = 0; i < splittedPath.size() - 1; ++i)
+        {
+            currentPath += "/" + splittedPath[i];
+
+            if (CFileUtil::FileExists(currentPath) || CheckLevelFolder(currentPath))
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+void CLevelFileDialog::SaveLastUsedLevelPath()
+{
+    const QString settingPath = QString(Path::GetUserSandboxFolder()) + lastLoadPathFilename;
+
+    XmlNodeRef lastUsedLevelPathNode = XmlHelpers::CreateXmlNode("lastusedlevelpath");
+    lastUsedLevelPathNode->setAttr("path", ui->nameLineEdit->text().toUtf8().data());
+    lastUsedLevelPathNode->saveToFile(settingPath.toUtf8().data());
+}
+
+void CLevelFileDialog::LoadLastUsedLevelPath()
+{
+    const QString settingPath = Path::GetUserSandboxFolder() + QString(lastLoadPathFilename);
+
+    XmlNodeRef lastUsedLevelPathNode = XmlHelpers::LoadXmlFromFile(settingPath.toUtf8().data());
+    if (lastUsedLevelPathNode == nullptr)
+    {
+        return;
+    }
+
+    QString lastLoadedFileName;
+    lastUsedLevelPathNode->getAttr("path", lastLoadedFileName);
+
+    if (m_filterModel->rowCount() < 1)
+    {
+        // Defensive, doesn't happen
+        return;
+    }
+
+    QModelIndex currentIndex = m_filterModel->index(0, 0); // Start with "Levels/" node
+    QStringList segments = Path::SplitIntoSegments(lastLoadedFileName);
+    for (auto it = segments.cbegin(), end = segments.cend(); it != end; ++it)
+    {
+        const int numChildren = m_filterModel->rowCount(currentIndex);
+        for (int i = 0; i < numChildren; ++i)
+        {
+            const QModelIndex subIndex = m_filterModel->index(i, 0, currentIndex);
+            if (*it == subIndex.data(Qt::DisplayRole).toString())
+            {
+                ui->treeView->expand(currentIndex);
+                currentIndex = subIndex;
+                break;
+            }
+        }
+    }
+
+    if (currentIndex.isValid())
+    {
+        ui->treeView->selectionModel()->select(currentIndex, QItemSelectionModel::Select);
+    }
+
+    ui->nameLineEdit->setText(lastLoadedFileName);
+}
+
+#include <moc_LevelFileDialog.cpp>
diff --git a/Code/Editor/LevelFileDialog.h b/Code/Editor/LevelFileDialog.h
new file mode 100644
index 0000000000..4db25e76e0
--- /dev/null
+++ b/Code/Editor/LevelFileDialog.h
@@ -0,0 +1,71 @@
+/*
+ * 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_LEVELFILEDIALOG_H
+#define CRYINCLUDE_EDITOR_LEVELFILEDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include <QScopedPointer>
+#endif
+
+namespace Ui {
+    class LevelFileDialog;
+}
+
+class LevelTreeModel;
+class LevelTreeModelFilter;
+
+class CLevelFileDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit CLevelFileDialog(bool openDialog, QWidget* parent = nullptr);
+    ~CLevelFileDialog();
+
+    QString GetFileName() const;
+
+    static bool CheckLevelFolder(const QString folder, QStringList* levelFiles = nullptr);
+
+protected Q_SLOTS:
+    void OnOK();
+    void OnCancel();
+    void OnTreeSelectionChanged();
+    void OnNewFolder();
+    void OnFilterChanged();
+    void OnNameChanged();
+protected:
+    void ReloadTree();
+    bool ValidateSaveLevelPath(QString& errorMessage) const;
+    bool ValidateLevelPath(const QString& folder) const;
+
+    void SaveLastUsedLevelPath();
+    void LoadLastUsedLevelPath();
+
+private:
+    bool eventFilter(QObject* watched, QEvent* event) override;
+
+    QString NameForIndex(const QModelIndex& index) const;
+
+    bool IsValidLevelSelected();
+    QString GetLevelPath() const;
+    QString GetEnteredPath() const;
+    QString GetFileName(QString levelPath);
+
+    QScopedPointer<Ui::LevelFileDialog> ui;
+    QString m_fileName;
+    QString m_filter;
+    const bool m_bOpenDialog;
+    bool m_initialized = false;
+    LevelTreeModel* const m_model;
+    LevelTreeModelFilter* const m_filterModel;
+};
+
+#endif // CRYINCLUDE_EDITOR_LEVELFILEDIALOG_H
diff --git a/Code/Sandbox/Editor/LevelFileDialog.qrc b/Code/Editor/LevelFileDialog.qrc
similarity index 100%
rename from Code/Sandbox/Editor/LevelFileDialog.qrc
rename to Code/Editor/LevelFileDialog.qrc
diff --git a/Code/Sandbox/Editor/LevelFileDialog.ui b/Code/Editor/LevelFileDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/LevelFileDialog.ui
rename to Code/Editor/LevelFileDialog.ui
diff --git a/Code/Editor/LevelIndependentFileMan.cpp b/Code/Editor/LevelIndependentFileMan.cpp
new file mode 100644
index 0000000000..005bf8638d
--- /dev/null
+++ b/Code/Editor/LevelIndependentFileMan.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "LevelIndependentFileMan.h"
+
+CLevelIndependentFileMan::CLevelIndependentFileMan()
+{
+}
+
+CLevelIndependentFileMan::~CLevelIndependentFileMan()
+{
+    assert(m_Modules.size() == 0);
+}
+
+bool CLevelIndependentFileMan::PromptChangedFiles()
+{
+    for (std::vector<ILevelIndependentFileModule*>::iterator it = m_Modules.begin(); it != m_Modules.end(); ++it)
+    {
+        if (!(*it)->PromptChanges())
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+void CLevelIndependentFileMan::RegisterModule(ILevelIndependentFileModule* pModule)
+{
+    stl::push_back_unique(m_Modules, pModule);
+}
+void CLevelIndependentFileMan::UnregisterModule(ILevelIndependentFileModule* pModule)
+{
+    stl::find_and_erase(m_Modules, pModule);
+}
diff --git a/Code/Editor/LevelIndependentFileMan.h b/Code/Editor/LevelIndependentFileMan.h
new file mode 100644
index 0000000000..2ce0539456
--- /dev/null
+++ b/Code/Editor/LevelIndependentFileMan.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_LEVELINDEPENDENTFILEMAN_H
+#define CRYINCLUDE_EDITOR_LEVELINDEPENDENTFILEMAN_H
+#pragma once
+
+
+struct ILevelIndependentFileModule
+{
+    // this function should prompt some message box if changed files need to be saved
+    // if return false, editor will not continue with current action (e.g close the editor)
+    virtual bool PromptChanges() = 0;
+};
+
+class CLevelIndependentFileMan
+{
+public:
+    CLevelIndependentFileMan();
+    ~CLevelIndependentFileMan();
+
+    bool PromptChangedFiles();
+
+    void RegisterModule(ILevelIndependentFileModule* pModule);
+    void UnregisterModule(ILevelIndependentFileModule* pModule);
+private:
+    std::vector<ILevelIndependentFileModule* > m_Modules;
+};
+
+#endif // CRYINCLUDE_EDITOR_LEVELINDEPENDENTFILEMAN_H
diff --git a/Code/Editor/LevelInfo.cpp b/Code/Editor/LevelInfo.cpp
new file mode 100644
index 0000000000..0cf627208d
--- /dev/null
+++ b/Code/Editor/LevelInfo.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "LevelInfo.h"
+
+// Qt
+#include <QMessageBox>
+
+// Editor
+#include "Util/fastlib.h"
+
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
+
+#include "QtUI/WaitCursor.h"            // for WaitCursor
+#include "Include/IErrorReport.h"
+#include "Include/IObjectManager.h"
+#include "Objects/BaseObject.h"
+#include "UsedResources.h"
+#include "ErrorReport.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+CLevelInfo::CLevelInfo()
+{
+    m_pReport = GetIEditor()->GetErrorReport();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLevelInfo::SaveLevelResources([[maybe_unused]] const QString& toPath)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLevelInfo::Validate()
+{
+    m_pReport->Clear();
+    m_pReport->SetImmediateMode(false);
+    m_pReport->SetShowErrors(true);
+
+    int nTotalErrors(0);
+    int nCurrentError(0);
+
+    // Here we are appending the current level load errors to the general errors.
+    // Actually we are inserting them before all others, but this is not important :-).
+    IErrorReport*   poLastLoadedLevelErrorReport = GetIEditor()->GetLastLoadedLevelErrorReport();
+    if (poLastLoadedLevelErrorReport)
+    {
+        nTotalErrors = poLastLoadedLevelErrorReport->GetErrorCount();
+        for (nCurrentError = 0; nCurrentError < nTotalErrors; ++nCurrentError)
+        {
+            m_pReport->ReportError(poLastLoadedLevelErrorReport->GetError(nCurrentError));
+        }
+    }
+
+    // Validate level.
+    ValidateObjects();
+
+    if (m_pReport->GetErrorCount() == 0)
+    {
+        QMessageBox::information(QApplication::activeWindow(), QString(), QObject::tr("No Errors Found"));
+    }
+    else
+    {
+        m_pReport->Display();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLevelInfo::ValidateObjects()
+{
+    WaitCursor cursor;
+
+    // Validate all objects
+    CBaseObjectsArray objects;
+    GetIEditor()->GetObjectManager()->GetObjects(objects);
+
+    int i;
+
+    CLogFile::WriteLine("Validating Objects...");
+    for (i = 0; i < objects.size(); i++)
+    {
+        CBaseObject* pObject = objects[i];
+
+        m_pReport->SetCurrentValidatorObject(pObject);
+
+        pObject->Validate(m_pReport);
+
+        m_pReport->SetCurrentValidatorObject(NULL);
+    }
+
+    CLogFile::WriteLine("Validating Duplicate Objects...");
+    //////////////////////////////////////////////////////////////////////////
+    // Find duplicate objects, Same objects with same transform.
+    // Use simple grid to speed up the check.
+    //////////////////////////////////////////////////////////////////////////
+    int gridSize = 256;
+
+    AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
+    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
+    float worldSize = terrainAabb.GetXExtent();
+
+    float fGridToWorld = worldSize / gridSize;
+
+    // Put all objects into parition grid.
+    std::vector<std::list<CBaseObject*> > grid;
+    grid.resize(gridSize * gridSize);
+    // Put objects to grid.
+    for (i = 0; i < objects.size(); i++)
+    {
+        CBaseObject* pObject = objects[i];
+        Vec3 pos = pObject->GetWorldPos();
+        int px = ftoi(pos.x / fGridToWorld);
+        int py = ftoi(pos.y / fGridToWorld);
+        if (px < 0)
+        {
+            px = 0;
+        }
+        if (py < 0)
+        {
+            py = 0;
+        }
+        if (px >= gridSize)
+        {
+            px = gridSize - 1;
+        }
+        if (py >= gridSize)
+        {
+            py = gridSize - 1;
+        }
+        grid[py * gridSize + px].push_back(pObject);
+    }
+
+    std::list<CBaseObject*>::iterator it1, it2;
+    // Check objects in grid.
+    for (i = 0; i < gridSize * gridSize; i++)
+    {
+        std::list<CBaseObject*>::iterator first = grid[i].begin();
+        std::list<CBaseObject*>::iterator last = grid[i].end();
+        for (it1 = first; it1 != last; ++it1)
+        {
+            for (it2 = first; it2 != it1; ++it2)
+            {
+                // Check if same object.
+                CBaseObject* p1 = *it1;
+                CBaseObject* p2 = *it2;
+                if (p1 != p2 && p1->GetClassDesc() == p2->GetClassDesc())
+                {
+                    // Same class.
+                    Quat q1 = p1->GetRotation();
+                    Quat q2 = p2->GetRotation();
+                    if (p1->GetWorldPos() == p2->GetWorldPos() && q1.w == q2.w && IsEquivalent(q1.v, q2.v, 0) && p1->GetScale() == p2->GetScale())
+                    {
+                        // Same transformation
+                        // Check if objects are really same.
+                        if (p1->IsSimilarObject(p2))
+                        {
+                            // Report duplicate objects.
+                            CErrorRecord err;
+                            err.error = QObject::tr("Found multiple objects in the same location (class %1): %2 and %3")
+                                .arg(p1->GetClassDesc()->ClassName(), p1->GetName(), p2->GetName());
+                            err.pObject = p1;
+                            err.severity = CErrorRecord::ESEVERITY_ERROR;
+                            m_pReport->ReportError(err);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Code/Editor/LevelInfo.h b/Code/Editor/LevelInfo.h
new file mode 100644
index 0000000000..ded5e7dd60
--- /dev/null
+++ b/Code/Editor/LevelInfo.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_LEVELINFO_H
+#define CRYINCLUDE_EDITOR_LEVELINFO_H
+#pragma once
+
+/*! CLevelInfo provides methods for getting information about current level.
+ */
+class CLevelInfo
+{
+public:
+    CLevelInfo();
+    void Validate();
+
+    void SaveLevelResources(const QString& toPath);
+
+private:
+    void ValidateObjects();
+
+    IErrorReport* m_pReport;
+};
+
+#endif // CRYINCLUDE_EDITOR_LEVELINFO_H
diff --git a/Code/Editor/LevelTreeModel.cpp b/Code/Editor/LevelTreeModel.cpp
new file mode 100644
index 0000000000..b8c8d450bf
--- /dev/null
+++ b/Code/Editor/LevelTreeModel.cpp
@@ -0,0 +1,170 @@
+/*
+ * 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 "LevelTreeModel.h"
+
+// Editor
+#include "LevelFileDialog.h"
+
+// Folder in which levels are stored
+static const char kLevelsFolder[] = "Levels";
+
+LevelTreeModelFilter::LevelTreeModelFilter(QObject* parent)
+    : QSortFilterProxyModel(parent)
+{
+}
+
+QVariant LevelTreeModelFilter::data(const QModelIndex& index, int role) const
+{
+    if (!sourceModel())
+    {
+        return QVariant();
+    }
+
+    return sourceModel()->data(mapToSource(index), role);
+}
+
+bool LevelTreeModelFilter::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
+{
+    if (m_filterText.isEmpty())
+    {
+        return true;
+    }
+
+    QModelIndex idx = sourceModel()->index(source_row, 0, source_parent);
+    if (!idx.isValid())
+    {
+        return false;
+    }
+
+    const QString text = idx.data(Qt::DisplayRole).toString();
+    if (text.contains(m_filterText, Qt::CaseInsensitive))
+    {
+        return true;
+    }
+
+    // Recurse into the children
+    const int count = sourceModel()->rowCount(idx);
+    for (int i = 0; i < count; ++i)
+    {
+        if (filterAcceptsRow(i, idx))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void LevelTreeModelFilter::setFilterText(const QString& text)
+{
+    QString lowerText = text.toLower();
+    if (m_filterText != lowerText)
+    {
+        m_filterText = lowerText;
+        invalidateFilter();
+    }
+}
+
+LevelTreeModel::LevelTreeModel(QObject* parent)
+    : QStandardItemModel(parent)
+{
+}
+
+LevelTreeModel::~LevelTreeModel()
+{
+}
+
+QVariant LevelTreeModel::data(const QModelIndex& index, int role) const
+{
+    if (role == Qt::DecorationRole)
+    {
+        const bool isLevelFolder = index.data(LevelTreeModel::IsLevelFolderRole).toBool();
+        if (isLevelFolder)
+        {
+            return QIcon(":/img/tree_view_level.png");
+        }
+        else
+        {
+            return QIcon(":/img/tree_view_folder.png");
+        }
+    }
+
+    return QStandardItemModel::data(index, role);
+}
+
+void LevelTreeModel::ReloadTree(bool recurseIfNoLevels)
+{
+    clear();
+
+    QString levelsFolder = QString("%1/%2").arg(Path::GetEditingGameDataFolder().c_str()).arg(kLevelsFolder);
+    QStandardItem* root = new QStandardItem(kLevelsFolder);
+    root->setData(levelsFolder, FullPathRole);
+    root->setEditable(false);
+    invisibleRootItem()->appendRow(root);
+    ReloadTree(root, recurseIfNoLevels);
+}
+
+void LevelTreeModel::ReloadTree(QStandardItem* root, bool recurseIfNoLevels)
+{
+    QStringList levelFiles;
+    const QString parentFullPath = root->data(FullPathRole).toString();
+    const bool isLevelFolder = CLevelFileDialog::CheckLevelFolder(parentFullPath, &levelFiles);
+    root->setData(isLevelFolder, IsLevelFolderRole);
+
+    // Recurse to sub folders if this is not a level folder
+    // Also recurse to sub folders if we detected a level folder
+    // but there are no level files in it in open mode
+    if (!isLevelFolder || (recurseIfNoLevels && levelFiles.empty()))
+    {
+        QDir currentDir(parentFullPath);
+        currentDir.setFilter(QDir::NoDot | QDir::NoDotDot | QDir::Dirs);
+        const QStringList subFolders = currentDir.entryList();
+        foreach (const QString &subFolder, subFolders)
+        {
+            auto child = new QStandardItem(subFolder);
+            child->setData(parentFullPath + "/" + subFolder, FullPathRole);
+            child->setEditable(false);
+            root->appendRow(child);
+            ReloadTree(child, recurseIfNoLevels);
+        }
+    }
+    else
+    {
+        // eTreeImage_Level
+        // Support for legacy folder structure: Multiple cry files in level folder
+        if (recurseIfNoLevels && levelFiles.size() > 1)
+        {
+            foreach (const QString &levelFile, levelFiles)
+            {
+                auto child = new QStandardItem(levelFile);
+                child->setData(root->data(FullPathRole).toString() + "/" + levelFile, FullPathRole);
+                child->setData(false, IsLevelFolderRole);
+                child->setEditable(false);
+                root->appendRow(child);
+            }
+        }
+    }
+}
+
+void LevelTreeModel::AddItem(const QString& name, const QModelIndex& parent)
+{
+    auto item = new QStandardItem(name);
+    item->setData(false, IsLevelFolderRole);
+    item->setEditable(false);
+    QStandardItem* parentItem = itemFromIndex(parent);
+    if (parentItem)
+    {
+        const QString parentPath = parent.data(FullPathRole).toString();
+        item->setData(parentPath + "/" + name, FullPathRole);
+        parentItem->appendRow(item);
+    }
+}
+
+#include <moc_LevelTreeModel.cpp>
diff --git a/Code/Editor/LevelTreeModel.h b/Code/Editor/LevelTreeModel.h
new file mode 100644
index 0000000000..0fd88ed50c
--- /dev/null
+++ b/Code/Editor/LevelTreeModel.h
@@ -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
+ *
+ */
+
+#ifndef CRYINCLUDE_EDITOR_LEVEL_ITEM_MODEL_H
+#define CRYINCLUDE_EDITOR_LEVEL_ITEM_MODEL_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
+#endif
+class QString;
+class QStandardItem;
+
+class LevelTreeModelFilter
+    : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    explicit LevelTreeModelFilter(QObject* parent = nullptr);
+    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
+    void setFilterText(const QString&);
+    QVariant data(const QModelIndex& index, int role) const override;
+private:
+    QString m_filterText;
+};
+
+class LevelTreeModel
+    : public QStandardItemModel
+{
+    Q_OBJECT
+public:
+    enum Role
+    {
+        FullPathRole = Qt::UserRole + 1,
+        IsLevelFolderRole
+    };
+
+    explicit LevelTreeModel(QObject* parent = nullptr);
+    ~LevelTreeModel();
+    void ReloadTree(bool recurseIfNoLevels);
+    void AddItem(const QString& name, const QModelIndex& parent); // Called when clicking "New folder"
+    QVariant data(const QModelIndex& index, int role) const override;
+private:
+    void ReloadTree(QStandardItem* root, bool recurseIfNoLevels);
+};
+
+#endif
diff --git a/Code/Editor/Lib/Tests/IEditorMock.h b/Code/Editor/Lib/Tests/IEditorMock.h
new file mode 100644
index 0000000000..54bec9f02a
--- /dev/null
+++ b/Code/Editor/Lib/Tests/IEditorMock.h
@@ -0,0 +1,192 @@
+/*
+ * 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 <AzTest/AzTest.h>
+#include <IEditor.h>
+#include <SFunctor.h>
+#include <RenderHelpers/AxisHelper.h>
+
+class CEditorMock
+    : public IEditor
+{
+public:
+    // GMock does not work with a variadic function
+    void ExecuteCommand(const char* sCommand, ...) override
+    {
+        va_list args;
+        va_start(args, sCommand);
+        ExecuteCommand(QString::asprintf(sCommand, args));
+        va_end(args);
+    }
+
+public:
+    MOCK_METHOD0(DeleteThis, void());
+    MOCK_METHOD0(GetSystem, ISystem*());
+    MOCK_METHOD0(GetClassFactory, IEditorClassFactory* ());
+    MOCK_METHOD0(GetCommandManager, CEditorCommandManager*());
+    MOCK_METHOD0(GetICommandManager, ICommandManager* ());
+    MOCK_METHOD1(ExecuteCommand, void(const QString& sCommand));
+    MOCK_METHOD1(SetDocument, void(CCryEditDoc* pDoc));
+    MOCK_CONST_METHOD0(GetDocument, CCryEditDoc* ());
+    MOCK_CONST_METHOD0(IsLevelLoaded, bool());
+    MOCK_METHOD1(SetModifiedFlag, void(bool));
+    MOCK_METHOD2(SetModifiedModule, void(EModifiedModule, bool));
+    MOCK_CONST_METHOD0(IsLevelExported, bool());
+    MOCK_METHOD1(SetLevelExported, bool(bool));
+    MOCK_METHOD0(IsModified, bool());
+    MOCK_METHOD0(SaveDocument, bool());
+    MOCK_METHOD1(WriteToConsole, void(const char* ));
+    MOCK_METHOD1(WriteToConsole, void(const QString& ));
+    MOCK_METHOD2(SetConsoleVar, void(const char* var, float ));
+    MOCK_METHOD1(GetConsoleVar, float(const char* var));
+    MOCK_METHOD1(ShowConsole, bool(bool show));
+    MOCK_METHOD0(GetMainStatusBar, IMainStatusBar*());
+    MOCK_METHOD1(SetStatusText, void(const QString& ));
+    MOCK_CONST_METHOD0(GetEditorMainWindow, QMainWindow* ());
+    MOCK_METHOD0(GetPrimaryCDFolder, QString());
+    MOCK_METHOD0(GetLevelName, QString());
+    MOCK_METHOD0(GetLevelFolder, QString());
+    MOCK_METHOD0(GetLevelDataFolder, QString());
+    MOCK_METHOD1(GetPrimaryCDFolder, QString(EEditorPathName));
+    MOCK_METHOD0(GetResolvedUserFolder, QString());
+    MOCK_METHOD4(ExecuteConsoleApp, bool(const QString&,QString&,bool,bool));
+    MOCK_METHOD0(SetDataModified, void());
+    MOCK_CONST_METHOD0(IsInitialized, bool());
+    MOCK_METHOD0(IsInGameMode, bool());
+    MOCK_METHOD0(IsInSimulationMode, bool());
+    MOCK_METHOD1(SetInGameMode, void(bool));
+    MOCK_METHOD0(IsInTestMode, bool());
+    MOCK_METHOD0(IsInPreviewMode, bool());
+    MOCK_METHOD0(IsInConsolewMode, bool());
+    MOCK_METHOD0(IsInLevelLoadTestMode, bool());
+    MOCK_METHOD0(IsInMatEditMode, bool());
+    MOCK_METHOD1(EnableUpdate, void(bool));
+    MOCK_METHOD1(EnableAcceleratos, void(bool));
+    MOCK_METHOD0(GetFileVersion, SFileVersion());
+    MOCK_METHOD0(GetProductVersion, SFileVersion());
+    MOCK_METHOD0(GetGameEngine , CGameEngine* ());
+    MOCK_METHOD0(GetDisplaySettings, CDisplaySettings*());
+    MOCK_METHOD0(GetGlobalGizmoParameters, const SGizmoParameters& ());
+    MOCK_METHOD7(NewObject, CBaseObject* (const char*, const char*, const char*, float, float, float, bool));
+    MOCK_METHOD1(DeleteObject, void(CBaseObject* obj));
+    MOCK_METHOD1(CloneObject, CBaseObject* (CBaseObject* ));
+    MOCK_METHOD0(GetSelection, CSelectionGroup* ());
+    MOCK_METHOD0(GetSelectedObject, CBaseObject* ());
+    MOCK_METHOD0(ClearSelection, int());
+    MOCK_METHOD1(SelectObject, void(CBaseObject*));
+    MOCK_METHOD1(LockSelection, void(bool));
+    MOCK_METHOD0(IsSelectionLocked, bool());
+    MOCK_METHOD0(GetObjectManager, struct IObjectManager* ());
+    MOCK_METHOD0(GetSettingsManager, CSettingsManager* ());
+    MOCK_METHOD1(GetDBItemManager, IDataBaseManager* (EDataBaseItemType));
+    MOCK_METHOD0(GetMaterialManagerLibrary, IBaseLibraryManager* ()); 
+    MOCK_METHOD0(GetIEditorMaterialManager, IEditorMaterialManager* ()); 
+    MOCK_METHOD0(GetIconManager, IIconManager* ());
+    MOCK_METHOD0(GetMusicManager, CMusicManager* ());
+    MOCK_METHOD2(GetTerrainElevation, float(float , float ));
+    MOCK_METHOD0(GetVegetationMap, class CVegetationMap* ());
+    MOCK_METHOD0(GetEditorQtApplication, Editor::EditorQtApplication* ());
+    MOCK_METHOD1(GetColorByName, const QColor& (const QString&));
+    MOCK_METHOD0(GetMovieSystem, struct IMovieSystem* ());
+    MOCK_METHOD0(GetPluginManager, class CPluginManager*());
+    MOCK_METHOD0(GetViewManager, class CViewManager* ());
+    MOCK_METHOD0(GetActiveView, class CViewport* ());
+    MOCK_METHOD1(SetActiveView, void(CViewport*));
+    MOCK_METHOD0(GetFileMonitor, struct IEditorFileMonitor* ());
+    MOCK_METHOD1(RegisterEventLoopHook, void(IEventLoopHook* ));
+    MOCK_METHOD1(UnregisterEventLoopHook, void(IEventLoopHook* ));
+    MOCK_CONST_METHOD0(CreateQMimeData, QMimeData* ());
+    MOCK_CONST_METHOD1(DestroyQMimeData, void(QMimeData*));
+    MOCK_METHOD0(GetLevelIndependentFileMan, class CLevelIndependentFileMan* ());
+    MOCK_METHOD2(UpdateViews, void(int , const AABB* ));
+    MOCK_METHOD0(ResetViews, void());
+    MOCK_METHOD0(ReloadTrackView, void());
+    MOCK_METHOD0(GetMarkerPosition, Vec3());
+    MOCK_METHOD1(SetMarkerPosition, void(const Vec3&));
+    MOCK_METHOD1(SetSelectedRegion, void(const AABB& box));
+    MOCK_METHOD1(GetSelectedRegion, void(AABB& box));
+    MOCK_METHOD1(SetOperationMode, void(EOperationMode ));
+    MOCK_METHOD0(GetOperationMode, EOperationMode());
+    MOCK_METHOD1(ShowTransformManipulator, ITransformManipulator* (bool));
+    MOCK_METHOD0(GetTransformManipulator, ITransformManipulator* ());
+    MOCK_METHOD1(SetAxisConstraints, void(AxisConstrains ));
+    MOCK_METHOD0(GetAxisConstrains, AxisConstrains());
+    MOCK_METHOD1(SetAxisVectorLock, void(bool));
+    MOCK_METHOD0(IsAxisVectorLocked, bool());
+    MOCK_METHOD1(SetTerrainAxisIgnoreObjects, void(bool));
+    MOCK_METHOD0(IsTerrainAxisIgnoreObjects, bool());
+    MOCK_METHOD1(SetReferenceCoordSys, void(RefCoordSys ));
+    MOCK_METHOD0(GetReferenceCoordSys, RefCoordSys());
+    MOCK_METHOD1(FindTemplate, XmlNodeRef(const QString& ));
+    MOCK_METHOD2(AddTemplate, void(const QString& , XmlNodeRef& ));
+    MOCK_METHOD2(OpenView, const QtViewPane* (QString , bool ));
+    MOCK_METHOD1(FindView, QWidget* (QString ));
+    MOCK_METHOD1(CloseView, bool(const char* ));
+    MOCK_METHOD1(SetViewFocus, bool(const char* ));
+    MOCK_METHOD1(CloseView, void(const GUID& ));
+    MOCK_METHOD1(OpenWinWidget, QWidget* (WinWidgetId ));
+    MOCK_CONST_METHOD0(GetWinWidgetManager, WinWidget::WinWidgetManager* ());
+    MOCK_METHOD2(SelectColor, bool(QColor &, QWidget *));
+    MOCK_METHOD0(GetUndoManager, class CUndoManager* ());
+    MOCK_METHOD0(BeginUndo, void());
+    MOCK_METHOD1(RestoreUndo, void(bool));
+    MOCK_METHOD1(AcceptUndo, void(const QString& ));
+    MOCK_METHOD0(CancelUndo, void());
+    MOCK_METHOD0(SuperBeginUndo, void());
+    MOCK_METHOD1(SuperAcceptUndo, void(const QString&));
+    MOCK_METHOD0(SuperCancelUndo, void());
+    MOCK_METHOD0(SuspendUndo, void());
+    MOCK_METHOD0(ResumeUndo, void());
+    MOCK_METHOD0(Undo, void());
+    MOCK_METHOD0(Redo, void());
+    MOCK_METHOD0(IsUndoRecording, bool());
+    MOCK_METHOD0(IsUndoSuspended, bool());
+    MOCK_METHOD1(RecordUndo, void(struct IUndoObject* ));
+    MOCK_METHOD1(FlushUndo, bool(bool isShowMessage));
+    MOCK_METHOD1(ClearLastUndoSteps, bool(int ));
+    MOCK_METHOD0(ClearRedoStack, bool());
+    MOCK_METHOD0(GetAnimation, CAnimationContext* ());
+    MOCK_METHOD0(GetSequenceManager, CTrackViewSequenceManager* ());
+    MOCK_METHOD0(GetSequenceManagerInterface, ITrackViewSequenceManager* ());
+    MOCK_METHOD0(GetToolBoxManager, CToolBoxManager* ());
+    MOCK_METHOD0(GetErrorReport, IErrorReport* ());
+    MOCK_METHOD0(GetLastLoadedLevelErrorReport, IErrorReport* ());
+    MOCK_METHOD0(StartLevelErrorReportRecording, void());
+    MOCK_METHOD0(CommitLevelErrorReport, void());
+    MOCK_METHOD0(GetFileUtil, IFileUtil* ());
+    MOCK_METHOD1(Notify, void(EEditorNotifyEvent));
+    MOCK_METHOD2(NotifyExcept, void(EEditorNotifyEvent , IEditorNotifyListener* ));
+    MOCK_METHOD1(RegisterNotifyListener, void(IEditorNotifyListener* ));
+    MOCK_METHOD1(UnregisterNotifyListener, void(IEditorNotifyListener* ));
+    MOCK_METHOD1(RegisterDocListener, void(IDocListener* ));
+    MOCK_METHOD1(UnregisterDocListener, void(IDocListener* ));
+    MOCK_METHOD0(GetSourceControl, ISourceControl* ());
+    MOCK_METHOD0(IsSourceControlAvailable, bool());
+    MOCK_METHOD0(IsSourceControlConnected, bool());
+    MOCK_METHOD0(GetUIEnumsDatabase, CUIEnumsDatabase* ());
+    MOCK_METHOD0(AddUIEnums, void());
+    MOCK_METHOD1(GetMemoryUsage, void(ICrySizer* ));
+    MOCK_METHOD0(ReduceMemory, void());
+    MOCK_METHOD0(GetExportManager, IExportManager* ());
+    MOCK_METHOD2(SetEditorConfigSpec, void(ESystemConfigSpec , ESystemConfigPlatform ));
+    MOCK_CONST_METHOD0(GetEditorConfigSpec, ESystemConfigSpec());
+    MOCK_CONST_METHOD0(GetEditorConfigPlatform, ESystemConfigPlatform());
+    MOCK_METHOD0(ReloadTemplates, void());
+    MOCK_METHOD0(GetResourceSelectorHost, IResourceSelectorHost* ());
+    MOCK_METHOD1(ShowStatusText, void(bool ));
+    MOCK_METHOD1(RegisterObjectContextMenuExtension, void(TContextMenuExtensionFunc ));
+    MOCK_METHOD0(GetEnv, SSystemGlobalEnvironment* ());
+    MOCK_METHOD0(GetImageUtil, IImageUtil* ());
+    MOCK_METHOD0(GetEditorSettings, SEditorSettings* ());
+    MOCK_METHOD0(GetLogFile, ILogFile* ());  
+    MOCK_METHOD0(UnloadPlugins, void());
+    MOCK_METHOD0(LoadPlugins, void());
+    MOCK_METHOD1(GetSearchPath, QString(EEditorPathName));
+    MOCK_METHOD0(GetEditorPanelUtils, IEditorPanelUtils* ());
+
+};
diff --git a/Code/Editor/Lib/Tests/test_ClickableLabel.cpp b/Code/Editor/Lib/Tests/test_ClickableLabel.cpp
new file mode 100644
index 0000000000..70ed985f0f
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_ClickableLabel.cpp
@@ -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
+ *
+ */
+
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <AzCore/UnitTest/TestTypes.h>
+#include <QtUI/ClickableLabel.h>
+
+#include <QApplication>
+
+using namespace AZ;
+using namespace ::testing;
+
+namespace UnitTest
+{
+    class TestingClickableLabel
+        : public testing::Test
+    {
+    public:
+        ClickableLabel m_clickableLabel;
+    };
+
+    TEST_F(TestingClickableLabel, CursorDoesNotUpdateWhileDisabled)
+    {
+        m_clickableLabel.setEnabled(false);
+
+        QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
+        QEnterEvent enterEvent{ QPointF(), QPointF(), QPointF() };
+        QApplication::sendEvent(&m_clickableLabel, &enterEvent);
+
+        const Qt::CursorShape cursorShape = QApplication::overrideCursor()->shape();
+        EXPECT_THAT(cursorShape, Ne(Qt::PointingHandCursor));
+        EXPECT_THAT(cursorShape, Eq(Qt::BlankCursor));
+    }
+
+    TEST_F(TestingClickableLabel, DoesNotRespondToDblClickWhileDisabled)
+    {
+        m_clickableLabel.setEnabled(false);
+
+        bool linkActivated = false;
+        QObject::connect(&m_clickableLabel, &QLabel::linkActivated, [&linkActivated]()
+        {
+            linkActivated = true;
+        });
+
+        QMouseEvent mouseEvent {
+            QEvent::MouseButtonDblClick, QPointF(),
+            Qt::LeftButton, Qt::LeftButton, Qt::NoModifier };
+        QApplication::sendEvent(&m_clickableLabel, &mouseEvent);
+
+        EXPECT_THAT(linkActivated, Eq(false));
+    }
+} // namespace UnitTest
diff --git a/Code/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp b/Code/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp
new file mode 100644
index 0000000000..d7f5caefd1
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp
@@ -0,0 +1,55 @@
+/*
+ * 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 <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <CryEditDoc.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+namespace CryEditDocPythonBindingsUnitTests
+{
+
+    class CryEditDocPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::CryEditDocFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(CryEditDocPythonBindingsFixture, CryEditDocEditorCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("save_level") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_CryEditPythonBindings.cpp b/Code/Editor/Lib/Tests/test_CryEditPythonBindings.cpp
new file mode 100644
index 0000000000..722d30ce86
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_CryEditPythonBindings.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <AzCore/Component/TickBus.h>
+#include <MainWindow.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+#include "CryEdit.h"
+
+namespace CryEditPythonBindingsUnitTests
+{
+
+    class CryEditPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::CryEditPythonHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(CryEditPythonBindingsFixture, CryEditCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("open_level") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("open_level_no_prompt") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("create_level") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("create_level_no_prompt") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_game_folder") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_current_level_name") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_current_level_path") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("load_all_plugins") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_current_view_position") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_current_view_rotation") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_current_view_position") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_current_view_rotation") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("export_to_engine") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_config_spec") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_config_platform") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_config_spec") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_result_to_success") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_result_to_failure") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("idle_enable") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("is_idle_enabled") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("idle_is_enabled") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("idle_wait") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("idle_wait_frames") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("start_process_detached") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("launch_lua_editor") != behaviorContext->m_methods.end());
+    }
+
+    TEST_F(CryEditPythonBindingsFixture, CryEditCheckoutDialogCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("enable_for_all") != behaviorContext->m_methods.end());
+    }
+
+    TEST_F(CryEditPythonBindingsFixture, CryEditPython_IdleWaitFramesWorks)
+    {
+        AZ::BehaviorContext* behaviorContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
+        ASSERT_TRUE(behaviorContext);
+
+        unsigned int numTicks = 0;
+        QEventLoop loop;
+        QTimer timer;
+        loop.connect(&timer, &QTimer::timeout, [&numTicks]()
+        {
+            AZ::TickBus::Broadcast(&AZ::TickEvents::OnTick, 0.01f, AZ::ScriptTimePoint(AZStd::chrono::system_clock().now()));
+            ++numTicks;
+        });
+        timer.start(100);
+
+        const unsigned int framesToWait = 5;
+        AZStd::array<AZ::BehaviorValueParameter, 1> args;
+        args[0].Set(&framesToWait);
+        behaviorContext->m_methods.find("idle_wait_frames")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
+        loop.disconnect(&timer);
+        timer.stop();
+        EXPECT_EQ(numTicks, framesToWait);
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp b/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
new file mode 100644
index 0000000000..74ac28cccd
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
@@ -0,0 +1,185 @@
+/*
+ * 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 <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <DisplaySettings.h>
+#include <DisplaySettingsPythonFuncs.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace DisplaySettingsPythonBindingsUnitTests
+{
+
+    class DisplaySettingsPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            m_app.RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsPythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(DisplaySettingsPythonBindingsFixture, DisplaySettingsEditorCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_misc_editor_settings") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_misc_editor_settings") != behaviorContext->m_methods.end());
+    }
+
+    class DisplaySettingsComponentFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            m_app.RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsComponent::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        auto itDisplaySettingsBus = behaviorContext->m_ebuses.find("DisplaySettingsBus");
+        if (itDisplaySettingsBus != behaviorContext->m_ebuses.end())
+        {
+            AZ::BehaviorEBus* behaviorBus = itDisplaySettingsBus->second;
+            EXPECT_TRUE(behaviorBus->m_events.find("GetSettingsState") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetSettingsState") != behaviorBus->m_events.end());
+        }
+    }
+
+    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ConvertToFlagsAllUnset)
+    {
+        AzToolsFramework::DisplaySettingsState state;
+        state.m_noCollision = false;
+        state.m_noLabels = false;
+        state.m_simulate = false;
+        state.m_hideTracks = false;
+        state.m_hideLinks = false;
+        state.m_hideHelpers = false;
+        state.m_showDimensionFigures = false;
+
+        AzToolsFramework::DisplaySettingsComponent component;
+        int result = component.ConvertToFlags(state);
+        int expected = 0x0;
+        EXPECT_EQ(result, expected);
+    }
+
+    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ConvertToFlagsAllSet)
+    {
+        AzToolsFramework::DisplaySettingsState state;
+        state.m_noCollision = true;
+        state.m_noLabels = true;
+        state.m_simulate = true;
+        state.m_hideTracks = true;
+        state.m_hideLinks = true;
+        state.m_hideHelpers = true;
+        state.m_showDimensionFigures = true;
+
+        AzToolsFramework::DisplaySettingsComponent component;
+        int result = component.ConvertToFlags(state);
+        int expected = SETTINGS_NOCOLLISION |
+            SETTINGS_NOLABELS |
+            SETTINGS_PHYSICS |
+            SETTINGS_HIDE_TRACKS |
+            SETTINGS_HIDE_LINKS |
+            SETTINGS_HIDE_HELPERS |
+            SETTINGS_SHOW_DIMENSIONFIGURES;
+        EXPECT_EQ(result, expected);
+    }
+
+    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ConvertToSettingsAllSet)
+    {
+        int flags = SETTINGS_NOCOLLISION |
+            SETTINGS_NOLABELS |
+            SETTINGS_PHYSICS |
+            SETTINGS_HIDE_TRACKS |
+            SETTINGS_HIDE_LINKS |
+            SETTINGS_HIDE_HELPERS |
+            SETTINGS_SHOW_DIMENSIONFIGURES;
+
+        AzToolsFramework::DisplaySettingsState expected;
+        expected.m_noCollision = true;
+        expected.m_noLabels = true;
+        expected.m_simulate = true;
+        expected.m_hideTracks = true;
+        expected.m_hideLinks = true;
+        expected.m_hideHelpers = true;
+        expected.m_showDimensionFigures = true;
+
+        AzToolsFramework::DisplaySettingsComponent component;
+        AzToolsFramework::DisplaySettingsState result = component.ConvertToSettings(flags);
+        EXPECT_EQ(result, expected);
+    }
+
+    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ConvertToSettingsAllUnset)
+    {
+        int flags = 0x0;
+
+        AzToolsFramework::DisplaySettingsState expected;
+        expected.m_noCollision = false;
+        expected.m_noLabels = false;
+        expected.m_simulate = false;
+        expected.m_hideTracks = false;
+        expected.m_hideLinks = false;
+        expected.m_hideHelpers = false;
+        expected.m_showDimensionFigures = false;
+
+        AzToolsFramework::DisplaySettingsComponent component;
+        AzToolsFramework::DisplaySettingsState result = component.ConvertToSettings(flags);
+        EXPECT_EQ(result, expected);
+    }
+
+    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsState_ToString)
+    {
+        AzToolsFramework::DisplaySettingsState state;
+        state.m_noCollision = false;
+        state.m_noLabels = true;
+        state.m_simulate = false;
+        state.m_hideTracks = true;
+        state.m_hideLinks = false;
+        state.m_hideHelpers = true;
+        state.m_showDimensionFigures = false;
+
+        AZStd::string result = state.ToString();
+
+        EXPECT_EQ(result, "(no_collision=False, no_labels=True, simulate=False, hide_tracks=True, hide_links=False, hide_helpers=True, show_dimension_figures=False)");
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp b/Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp
new file mode 100644
index 0000000000..b958b8c7f5
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <AzQtComponents/Utilities/QtPluginPaths.h>
+#include <PythonEditorFuncs.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/std/containers/array.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <Mocks/ICVarMock.h>
+#include <Mocks/ISystemMock.h>
+#include <Mocks/IConsoleMock.h>
+#include <Mocks/ILogMock.h>
+#include <Mocks/ITimerMock.h>
+#include <Mocks/IConsoleMock.h>
+#include "IEditorMock.h"
+
+namespace EditorPythonBindingsUnitTests
+{
+    using ::testing::NiceMock;
+    using ::testing::Return;
+    using ::testing::Invoke;
+    using ::testing::A;
+    using ::testing::_;
+
+    struct MockEditor final
+    {
+        ~MockEditor()
+        {
+            SetIEditor(nullptr);
+        }
+
+        template <typename T>
+        void PrepareSetCVar(int cvarType, AZStd::function<void(const T)> func)
+        {
+            m_cvarType = cvarType;
+            ON_CALL(m_cvarMock, GetType()).WillByDefault(Return(m_cvarType));
+            ON_CALL(m_cvarMock, Set(A<T>())).WillByDefault(Invoke(func));
+            ON_CALL(m_console, GetCVar(_)).WillByDefault(Return(&m_cvarMock));
+            ON_CALL(m_system, GetIConsole()).WillByDefault(Return(&m_console));
+            ON_CALL(m_editorMock, GetSystem()).WillByDefault(Return(&m_system));
+            SetIEditor(&m_editorMock);
+        }
+
+        void PrepareGetCVarString(const char* value)
+        {
+            ON_CALL(m_cvarMock, GetString()).WillByDefault(Return(value));
+            ON_CALL(m_console, GetCVar(_)).WillByDefault(Return(&m_cvarMock));
+            ON_CALL(m_system, GetIConsole()).WillByDefault(Return(&m_console));
+            ON_CALL(m_editorMock, GetSystem()).WillByDefault(Return(&m_system));
+            SetIEditor(&m_editorMock);
+        }
+
+        void PrepareGetIConsole()
+        {
+            ON_CALL(m_system, GetIConsole()).WillByDefault(Return(&m_console));
+            ON_CALL(m_editorMock, GetSystem()).WillByDefault(Return(&m_system));
+            SetIEditor(&m_editorMock);
+        }
+
+        int m_cvarType = CVAR_INT;
+        ::testing::NiceMock<CEditorMock> m_editorMock;
+        ::testing::NiceMock<ConsoleMock> m_console;
+        ::testing::NiceMock<SystemMock> m_system;
+        ::testing::NiceMock<CVarMock> m_cvarMock;
+    };
+
+    class EditorPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::PythonEditorFuncsHandler::CreateDescriptor());
+            // Disable saving global user settings to prevent failure due to detecting file updates
+            AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+
+        using TestEditorUtilityCommandFunc = AZStd::function<void(AZ::BehaviorContext* context)>;
+        void RunEditorUtilityCommandTest(TestEditorUtilityCommandFunc func)
+        {
+            AZ::BehaviorContext* behaviorContext = nullptr;
+            AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
+            ASSERT_TRUE(behaviorContext);
+            func(behaviorContext);
+        }
+    };
+
+    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_cvar") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_cvar_string") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_cvar_integer") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_cvar_float") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("run_console") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("enter_game_mode") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("is_in_game_mode") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("exit_game_mode") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("run_file") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("run_file_parameters") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("execute_command") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("message_box") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("message_box_yes_no") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("message_box_ok") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("edit_box") != behaviorContext->m_methods.end());
+
+        // Blocked by LY-101816
+        //EXPECT_TRUE(behaviorContext->m_methods.find("edit_box_check_data_type") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("open_file_box") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_axis_constraint") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_axis_constraint") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_pak_from_file") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("log") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("undo") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("redo") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("draw_label") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("combo_box") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("crash") != behaviorContext->m_methods.end());
+    }
+
+    TEST_F(EditorPythonBindingsFixture, EditorPythonBindingsComponent_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        auto itPythonEditorBus = behaviorContext->m_ebuses.find("PythonEditorBus");
+        if (itPythonEditorBus != behaviorContext->m_ebuses.end())
+        {
+            AZ::BehaviorEBus* behaviorBus = itPythonEditorBus->second;
+            EXPECT_TRUE(behaviorBus->m_events.find("GetCVar") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetCVar") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetCVarFromString") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetCVarFromInteger") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetCVarFromFloat") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("PyRunConsole") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("EnterGameMode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("IsInGameMode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("ExitGameMode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("EnterSimulationMode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("IsInSimulationMode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("ExitSimulationMode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("RunLua") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("RunFile") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("RunFileParameters") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("ExecuteCommand") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("MessageBoxOkCancel") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("MessageBoxYesNo") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("MessageBoxOk") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("EditBox") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("EditBoxCheckDataType") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("OpenFileBox") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetAxisConstraint") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetAxisConstraint") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetPakFromFile") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("Log") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("Undo") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("Redo") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("DrawLabel") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("ComboBox") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetHidemaskAll") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetHidemaskNone") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetHidemaskInvert") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetHidemask") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetHidemask") != behaviorBus->m_events.end());
+        }
+    }
+
+    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_set_cvar_integer)
+    {
+        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
+        {
+            int testInt = -1;
+            MockEditor mockEditor;
+            mockEditor.PrepareSetCVar<int>(CVAR_INT, [&testInt](const int value) { testInt = value; });
+
+            const char* testCvar = "test.cvar.int";
+            int intArg = 1;
+            AZStd::array<AZ::BehaviorValueParameter, 2> args;
+            args[0].Set(&testCvar);
+            args[1].Set(&intArg);
+
+            context->m_methods.find("set_cvar_integer")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
+            EXPECT_EQ(1, testInt);
+        });
+    }
+
+    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_set_cvar_float)
+    {
+        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
+        {
+            float testFloat = 0.0f;
+            MockEditor mockEditor;
+            mockEditor.PrepareSetCVar<float>(CVAR_FLOAT, [&testFloat](const float value) { testFloat = value; });
+
+            const char* testCvar = "test.cvar.float";
+            float input = 1.234f;
+            AZStd::array<AZ::BehaviorValueParameter, 2> args;
+            args[0].Set(&testCvar);
+            args[1].Set(&input);
+
+            context->m_methods.find("set_cvar_float")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
+            EXPECT_FLOAT_EQ(1.234f, testFloat);
+        });
+    }
+
+    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_set_cvar_string)
+    {
+        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
+        {
+            AZStd::string testString;
+            MockEditor mockEditor;
+            mockEditor.PrepareSetCVar<const char*>(CVAR_STRING, [&testString](const char* value) { testString = value; });
+
+            const char* testCvar = "test.cvar.string";
+            const char* input = "testvalue";
+            AZStd::array<AZ::BehaviorValueParameter, 2> args;
+            args[0].Set(&testCvar);
+            args[1].Set(&input);
+
+            context->m_methods.find("set_cvar_string")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
+            EXPECT_STREQ("testvalue", testString.c_str());
+        });
+    }
+
+    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_get_cvar)
+    {
+        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
+        {
+            MockEditor mockEditor;
+            mockEditor.PrepareGetCVarString("atestvalue");
+
+            const char* testCvar = "test.cvar.string";
+            AZStd::array<AZ::BehaviorValueParameter, 1> args;
+            args[0].Set(&testCvar);
+
+            const char* data;
+            AZ::BehaviorObject obj;
+            obj.m_typeId = azrtti_typeid<const char*>();
+            obj.m_address = &data;
+    
+            AZ::BehaviorValueParameter result;
+            result.Set(&obj);
+
+            context->m_methods.find("get_cvar")->second->Call(args.begin(), static_cast<unsigned int>(args.size()), &result);
+            EXPECT_STREQ("atestvalue", reinterpret_cast<const char*>(obj.m_address));
+        });
+    }
+
+    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_run_console)
+    {
+        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
+        {
+            AZStd::string data;
+            MockEditor mockEditor;
+            mockEditor.PrepareGetIConsole();
+            ON_CALL(mockEditor.m_console, ExecuteString(_,_,_)).WillByDefault(Invoke([&data](const char* command, const bool, const bool) { data = command; }));
+
+            const char* testCvar = "enable_feature game.sim";
+            AZStd::array<AZ::BehaviorValueParameter, 1> args;
+            args[0].Set(&testCvar);
+
+            context->m_methods.find("run_console")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
+            EXPECT_STREQ(testCvar, data.c_str());
+        });
+    }
+}
+
diff --git a/Code/Editor/Lib/Tests/test_EditorUtils.cpp b/Code/Editor/Lib/Tests/test_EditorUtils.cpp
new file mode 100644
index 0000000000..da9424eded
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_EditorUtils.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 "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+
+namespace EditorUtilsTest
+{
+    class WarningDetector
+        : public AZ::Debug::TraceMessageBus::Handler
+    {
+    public:
+        WarningDetector()
+        {
+            BusConnect();
+        }
+
+        ~WarningDetector()
+        {
+            BusDisconnect();
+        }
+
+        virtual bool OnWarning(const char* /*window*/, const char* /*message*/) override 
+        {
+            m_gotWarning = true;
+            return true;
+        }
+
+        bool m_gotWarning = false;
+    };
+
+
+    class TestWarningAbsorber
+        : public testing::Test
+    {
+    };
+
+    TEST_F(TestWarningAbsorber, Test)
+    {
+        WarningDetector detector;
+        EditorUtils::AzWarningAbsorber absorber("ignore this");
+
+        AZ_Warning("ignore this", false, "This warning should occur but be absorbed by the absorber");
+        ASSERT_FALSE(detector.m_gotWarning);
+
+        AZ_Warning("different window", false, "This warning should occur but be left alone by the absorber");
+        ASSERT_TRUE(detector.m_gotWarning);
+    }
+
+    TEST_F(TestWarningAbsorber, NullWindow)
+    {
+        WarningDetector detector;
+        EditorUtils::AzWarningAbsorber absorber("ignore this");
+
+        AZ_Warning(nullptr, false, "This warning should occur and not be absorbed by the absorber since the window name is nullptr");
+        ASSERT_TRUE(detector.m_gotWarning);
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_Main.cpp b/Code/Editor/Lib/Tests/test_Main.cpp
new file mode 100644
index 0000000000..60cd739b78
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_Main.cpp
@@ -0,0 +1,50 @@
+/*
+ * 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 <AzTest/AzTest.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <EditorEnvironment.h>
+
+#include <QApplication>
+
+class EditorLibTestEnvironment
+    : public AZ::Test::ITestEnvironment
+{
+public:
+    virtual ~EditorLibTestEnvironment() {}
+
+protected:
+    void SetupEnvironment() override
+    {
+        AZ::Environment::Create(nullptr);
+        AttachEditorAZEnvironment(AZ::Environment::GetInstance());
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
+    }
+
+    void TeardownEnvironment() override
+    {
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
+        DetachEditorAZEnvironment();
+        AZ::Environment::Destroy();
+    }
+};
+
+AZTEST_EXPORT int AZ_UNIT_TEST_HOOK_NAME(int argc, char** argv)
+{
+    ::testing::InitGoogleMock(&argc, argv);
+    // NOTE - this line makes this code different from AZ_UNIT_TEST_HOOK()
+    QApplication app(argc, argv);
+    // end
+    AZ::Test::ApplyGlobalParameters(&argc, argv);
+    AZ::Test::printUnusedParametersWarning(argc, argv);
+    AZ::Test::addTestEnvironments({new EditorLibTestEnvironment});
+    int result = RUN_ALL_TESTS();
+    return result;
+}
+
+IMPLEMENT_TEST_EXECUTABLE_MAIN()
diff --git a/Code/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp b/Code/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp
new file mode 100644
index 0000000000..1a2e7cc124
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_MainWindowPythonBindings.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 "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <MainWindow.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace MainWindowPythonBindingsUnitTests
+{
+
+    class MainWindowPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::MainWindowEditorFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(MainWindowPythonBindingsFixture, MainWindowEditorCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("open_pane") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("close_pane") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("is_pane_visible") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_pane_class_names") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("exit") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("exit_no_prompt") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
new file mode 100644
index 0000000000..3ffb96cd0a
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <Objects/ObjectManager.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace ObjectManagerPythonBindingsUnitTests
+{
+
+    class ObjectManagerPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::ObjectManagerFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(ObjectManagerPythonBindingsFixture, ObjectManagerEditorCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_all_objects") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_names_of_selected_objects") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("select_object") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("unselect_objects") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("select_objects") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_num_selected") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("clear_selection") != behaviorContext->m_methods.end());
+
+        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());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_position") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_position") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_rotation") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_rotation") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_scale") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_scale") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("rename_object") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
new file mode 100644
index 0000000000..3792b8ddec
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <TerrainHoleTool.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace TerrainFuncsUnitTests
+{
+
+    class TerrainHoleToolPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainHoleToolPythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(TerrainHoleToolPythonBindingsFixture, TerrainCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_brush_radius") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_brush_radius") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_make_hole") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_make_hole") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("paint_hole") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("paint_hole_direct") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("is_hole_at") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp
new file mode 100644
index 0000000000..063e88111e
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp
@@ -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
+ *
+ */
+
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <Terrain/PythonTerrainLayerFuncs.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace TerrainFuncsUnitTests
+{
+
+    class TerrainLayerPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainLayerPythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(TerrainLayerPythonBindingsFixture, TerrainCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_tile_count_x") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_tile_count_y") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_tile_resolution") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_tile_resolution") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_tile_count") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_color_at") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("import_megaterrain") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("export_megaterrain") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp
new file mode 100644
index 0000000000..6e3135ee2e
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <TerrainModifyTool.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace TerrainModifyPythonBindingsUnitTests
+{
+
+    class TerrainModifyPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainModifyPythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(TerrainModifyPythonBindingsFixture, TerrainModifyEditorCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_tool_flatten") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_tool_smooth") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_tool_riselower") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp
new file mode 100644
index 0000000000..1917553fb9
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_TerrainPainterPythonBindings.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 "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <TerrainTexturePainter.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace TerrainFuncsUnitTests
+{
+
+    class TerrainPainterPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainPainterPythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(TerrainPainterPythonBindingsFixture, TerrainCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_radius") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_radius") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_color_opacity") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_color_opacity") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_detail_intensity") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_detail_intensity") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_mask_by_layer_settings") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_mask_by_layer_settings") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_mask_layer_name") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_mask_layer_name") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_brush_color") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_brush_color") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_brush_color_brightness") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_brush_color_brightness") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("paint_layer") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_min_altitude") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_max_altitude") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_min_altitude") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_max_altitude") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_min_slope") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_max_slope") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_min_slope") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_max_slope") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_TerrainPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainPythonBindings.cpp
new file mode 100644
index 0000000000..a7411eb3d6
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_TerrainPythonBindings.cpp
@@ -0,0 +1,73 @@
+/*
+ * 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 <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <Terrain/PythonTerrainFuncs.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace TerrainFuncsUnitTests
+{
+
+    class TerrainPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainPythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(TerrainPythonBindingsFixture, TerrainCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_max_height") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_max_height") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("import_heightmap") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("export_heightmap") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_elevation") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_heightmap_elevation") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_elevation") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("flatten") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("reduce_range") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("smooth") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("slope_smooth") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("erase") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("resize") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("make_isle") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("normalize") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("invert") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("fetch") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("hold") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp
new file mode 100644
index 0000000000..b355d12ad1
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_TerrainTexturePythonBindings.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 "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <TerrainTexture.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace TerrainFuncsUnitTests
+{
+
+    class TerrainTexturePythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainTexturePythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(TerrainTexturePythonBindingsFixture, TerrainCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("open_layers") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("create_layer") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("delete_layer") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("move_layer") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_index") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_material") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_splatmap") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("import_layer_splatmaps") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("export_layer_splatmap") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_name") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
new file mode 100644
index 0000000000..2d9f815137
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
@@ -0,0 +1,141 @@
+/*
+ * 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 <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <TrackView/TrackViewPythonFuncs.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace TrackViewPythonBindingsUnitTests
+{
+
+    class TrackViewPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TrackViewFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(TrackViewPythonBindingsFixture, TrackViewEditorCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_recording") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("new_sequence") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("delete_sequence") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_current_sequence") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_num_sequences") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_sequence_name") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_sequence_time_range") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_sequence_time_range") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("play_sequence") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("stop_sequence") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_time") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("add_node") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("add_selected_entities") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("add_layer_node") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("delete_node") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("add_track") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("delete_track") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_num_nodes") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_node_name") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_num_track_keys") != behaviorContext->m_methods.end());
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_key_value") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_interpolated_value") != behaviorContext->m_methods.end());
+    }
+
+    class TrackViewComponentFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            m_app.RegisterComponentDescriptor(AzToolsFramework::TrackViewComponent::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(TrackViewComponentFixture, TrackViewComponent_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        auto itTrackViewBus = behaviorContext->m_ebuses.find("TrackViewBus");
+        if (itTrackViewBus != behaviorContext->m_ebuses.end())
+        {
+            AZ::BehaviorEBus* behaviorBus = itTrackViewBus->second;
+            EXPECT_TRUE(behaviorBus->m_events.find("AddNode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("AddTrack") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("AddLayerNode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("AddSelectedEntities") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("AddNode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("AddTrack") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("AddLayerNode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("AddSelectedEntities") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("DeleteNode") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("DeleteTrack") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("DeleteSequence") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetInterpolatedValue") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetKeyValue") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetNodeName") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetNumNodes") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetNumSequences") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetNumTrackKeys") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetSequenceName") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("GetSequenceTimeRange") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("NewSequence") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("PlaySequence") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetCurrentSequence") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetRecording") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetSequenceTimeRange") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("SetTime") != behaviorBus->m_events.end());
+            EXPECT_TRUE(behaviorBus->m_events.find("StopSequence") != behaviorBus->m_events.end());
+        }
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp b/Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
new file mode 100644
index 0000000000..d243718695
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
@@ -0,0 +1,66 @@
+/*
+ * 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 <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <ViewPane.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace ViewPaneFuncsUnitTests
+{
+
+    class ViewPanePythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::ViewPanePythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(ViewPanePythonBindingsFixture, ViewPaneCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_viewport_size") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_viewport_size") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("update_viewport") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("resize_viewport") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("bind_viewport") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_viewport_expansion_policy") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_viewport_expansion_policy") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_viewport_count") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_active_viewport") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_active_viewport") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("get_view_pane_layout") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("set_view_pane_layout") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp b/Code/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
new file mode 100644
index 0000000000..778cdad484
--- /dev/null
+++ b/Code/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+#include <AzTest/AzTest.h>
+#include <Util/EditorUtils.h>
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include <AzToolsFramework/Application/ToolsApplication.h>
+#include <ViewportTitleDlg.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+
+namespace ViewportTitleDlgFuncsUnitTests
+{
+
+    class ViewportTitleDlgPythonBindingsFixture
+        : public testing::Test
+    {
+    public:
+        AzToolsFramework::ToolsApplication m_app;
+
+        void SetUp() override
+        {
+            AzFramework::Application::Descriptor appDesc;
+            appDesc.m_enableDrilling = false;
+
+            m_app.Start(appDesc);
+            // 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_app.RegisterComponentDescriptor(AzToolsFramework::ViewportTitleDlgPythonFuncsHandler::CreateDescriptor());
+        }
+
+        void TearDown() override
+        {
+            m_app.Stop();
+        }
+    };
+
+    TEST_F(ViewportTitleDlgPythonBindingsFixture, ViewportTitleDlgCommands_ApiExists)
+    {
+        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
+        ASSERT_TRUE(behaviorContext);
+
+        EXPECT_TRUE(behaviorContext->m_methods.find("toggle_helpers") != behaviorContext->m_methods.end());
+        EXPECT_TRUE(behaviorContext->m_methods.find("is_helpers_shown") != behaviorContext->m_methods.end());
+    }
+}
diff --git a/Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp b/Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp
new file mode 100644
index 0000000000..813df7d0ce
--- /dev/null
+++ b/Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp
@@ -0,0 +1,505 @@
+/*
+ * 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 "SimpleTriangleRasterizer.h"
+
+#include <math.h>
+
+#if !defined FLT_MAX
+#define FLT_MAX 3.402823466e+38F
+#endif
+
+void CSimpleTriangleRasterizer::lambertHorizlineConservative(float fx1, float fx2, int yy,  IRasterizeSink* inpSink)
+{
+    int x1 = (int)floorf(fx1 + 0.25f), x2 = (int)floorf(fx2 + .75f);
+
+    if (x1 < m_iMinX)
+    {
+        x1 = m_iMinX;
+    }
+    if (x2 > m_iMaxX + 1)
+    {
+        x2 = m_iMaxX + 1;
+    }
+    if (x1 > m_iMaxX + 1)
+    {
+        x1 = m_iMaxX + 1;
+    }
+    if (x2 < m_iMinX)
+    {
+        x2 = m_iMinX;
+    }
+
+
+    inpSink->Line(fx1, fx2, x1, x2, yy);
+}
+
+void CSimpleTriangleRasterizer::lambertHorizlineSubpixelCorrect(float fx1, float fx2, int yy,  IRasterizeSink* inpSink)
+{
+    int x1 = (int)floorf(fx1 + 0.5f), x2 = (int)floorf(fx2 + 0.5f);
+    //  int x1=(int)floorf(fx1*1023.f/1024.f+1.f),x2=(int)floorf(fx2*1023.f/1024.f+1.f);
+
+    if (x1 < m_iMinX)
+    {
+        x1 = m_iMinX;
+    }
+    if (x2 > m_iMaxX)
+    {
+        x2 = m_iMaxX;
+    }
+    if (x1 > m_iMaxX)
+    {
+        x1 = m_iMaxX;
+    }
+    if (x2 < m_iMinX)
+    {
+        x2 = m_iMinX;
+    }
+
+    inpSink->Line(fx1, fx2, x1, x2, yy);
+}
+
+// optimizable
+void CSimpleTriangleRasterizer::CopyAndSortY(const float infX[3], const float infY[3], float outfX[3], float outfY[3])
+{
+    outfX[0] = infX[0];
+    outfY[0] = infY[0];
+    outfX[1] = infX[1];
+    outfY[1] = infY[1];
+    outfX[2] = infX[2];
+    outfY[2] = infY[2];
+
+    // Sort the coordinates, so that (x[1], y[1]) becomes the highest coord
+    float tmp;
+
+    if (outfY[0] > outfY[1])
+    {
+        if (outfY[1] > outfY[2])
+        {
+            tmp = outfY[0];
+            outfY[0] = outfY[1];
+            outfY[1] = tmp;
+            tmp = outfX[0];
+            outfX[0] = outfX[1];
+            outfX[1] = tmp;
+            tmp = outfY[1];
+            outfY[1] = outfY[2];
+            outfY[2] = tmp;
+            tmp = outfX[1];
+            outfX[1] = outfX[2];
+            outfX[2] = tmp;
+
+            if (outfY[0] > outfY[1])
+            {
+                tmp = outfY[0];
+                outfY[0] = outfY[1];
+                outfY[1] = tmp;
+                tmp = outfX[0];
+                outfX[0] = outfX[1];
+                outfX[1] = tmp;
+            }
+        }
+        else
+        {
+            tmp = outfY[0];
+            outfY[0] = outfY[1];
+            outfY[1] = tmp;
+            tmp = outfX[0];
+            outfX[0] = outfX[1];
+            outfX[1] = tmp;
+
+            if (outfY[1] > outfY[2])
+            {
+                tmp = outfY[1];
+                outfY[1] = outfY[2];
+                outfY[2] = tmp;
+                tmp = outfX[1];
+                outfX[1] = outfX[2];
+                outfX[2] = tmp;
+            }
+        }
+    }
+    else
+    {
+        if (outfY[1] > outfY[2])
+        {
+            tmp = outfY[1];
+            outfY[1] = outfY[2];
+            outfY[2] = tmp;
+            tmp = outfX[1];
+            outfX[1] = outfX[2];
+            outfX[2] = tmp;
+
+            if (outfY[0] > outfY[1])
+            {
+                tmp = outfY[0];
+                outfY[0] = outfY[1];
+                outfY[1] = tmp;
+                tmp = outfX[0];
+                outfX[0] = outfX[1];
+                outfX[1] = tmp;
+            }
+        }
+    }
+}
+
+void CSimpleTriangleRasterizer::CallbackFillRectConservative(float _x[3], float _y[3], IRasterizeSink* inpSink)
+{
+    inpSink->Triangle(m_iMinY);
+
+    float fMinX = (std::min)(_x[0], (std::min)(_x[1], _x[2]));
+    float fMaxX = (std::max)(_x[0], (std::max)(_x[1], _x[2]));
+    float fMinY = (std::min)(_y[0], (std::min)(_y[1], _y[2]));
+    float fMaxY = (std::max)(_y[0], (std::max)(_y[1], _y[2]));
+
+    int iMinX = (std::max)(m_iMinX, (int)floorf(fMinX));
+    int iMaxX = (std::min)(m_iMaxX + 1, (int)ceilf(fMaxX));
+    int iMinY = (std::max)(m_iMinY, (int)floorf(fMinY));
+    int iMaxY = (std::min)(m_iMaxY + 1, (int)ceilf(fMaxY));
+
+    for (int y = iMinY; y < iMaxY; y++)
+    {
+        inpSink->Line(fMinX, fMaxX, iMinX, iMaxX, y);
+    }
+}
+
+
+
+
+void CSimpleTriangleRasterizer::CallbackFillConservative(float _x[3], float _y[3], IRasterizeSink* inpSink)
+{
+    float x[3], y[3];
+
+    CopyAndSortY(_x, _y, x, y);
+
+    // Calculate interpolation steps
+    float fX1toX2step = 0.0f;
+    float fX1toX3step = 0.0f;
+    float fX2toX3step = 0.0f;
+    if (fabsf(y[1] - y[0]) > FLT_EPSILON)
+    {
+        fX1toX2step = (x[1] - x[0]) / (float)(y[1] - y[0]);
+    }
+    if (fabsf(y[2] - y[0]) > FLT_EPSILON)
+    {
+        fX1toX3step = (x[2] - x[0]) / (float)(y[2] - y[0]);
+    }
+    if (fabsf(y[2] - y[1]) > FLT_EPSILON)
+    {
+        fX2toX3step = (x[2] - x[1]) / (float)(y[2] - y[1]);
+    }
+
+    float fX1toX2 = x[0], fX1toX3 = x[0], fX2toX3 = x[1];
+    bool bFirstLine = true;
+    bool bTriangleCallDone = false;
+
+    // Go through the scanlines of the triangle
+    int yy = (int)floorf(y[0]);           // was floor
+
+    for (; yy <= (int)floorf(y[2]); yy++)
+    //  for(yy=m_iMinY; yy<=m_iMaxY; yy++)      // juhu
+    {
+        float fSubPixelYStart = 0.0f, fSubPixelYEnd = 1.0f;
+        float start, end;
+
+        // first line
+        if (bFirstLine)
+        {
+            fSubPixelYStart = y[0] - floorf(y[0]);
+            start = x[0];
+            end = x[0];
+            bFirstLine = false;
+        }
+        else
+        {
+            // top part without middle corner line
+            if (yy <= (int)floorf(y[1]))
+            {
+                start = (std::min)(fX1toX2, fX1toX3);
+                end = (std::max)(fX1toX2, fX1toX3);
+            }
+            else
+            {
+                start = (std::min)(fX2toX3, fX1toX3);
+                end = (std::max)(fX2toX3, fX1toX3);
+            }
+        }
+
+        // middle corner line
+        if (yy == (int)floorf(y[1]))
+        {
+            fSubPixelYEnd = y[1] - floorf(y[1]);
+
+            fX1toX3 += fX1toX3step * (fSubPixelYEnd - fSubPixelYStart);
+            start = (std::min)(start, fX1toX3);
+            end = (std::max)(end, fX1toX3);
+            start = (std::min)(start, x[1]);
+            end = (std::max)(end, x[1]);
+
+            fSubPixelYStart = fSubPixelYEnd;
+            fSubPixelYEnd = 1.0f;
+        }
+
+        // last line
+        if (yy == (int)floorf(y[2]))
+        {
+            start = (std::min)(start, x[2]);
+            end = (std::max)(end, x[2]);
+        }
+        else
+        {
+            // top part without middle corner line
+            if (yy < (int)floorf(y[1]))
+            {
+                fX1toX2 += fX1toX2step * (fSubPixelYEnd - fSubPixelYStart);
+                start = (std::min)(start, fX1toX2);
+                end = (std::max)(end, fX1toX2);
+            }
+            else
+            {
+                fX2toX3 += fX2toX3step * (fSubPixelYEnd - fSubPixelYStart);
+                start = (std::min)(start, fX2toX3);
+                end = (std::max)(end, fX2toX3);
+            }
+
+            fX1toX3 += fX1toX3step * (fSubPixelYEnd - fSubPixelYStart);
+            start = (std::min)(start, fX1toX3);
+            end = (std::max)(end, fX1toX3);
+        }
+
+        if (yy >= m_iMinY && yy <= m_iMaxY)
+        {
+            if (!bTriangleCallDone)
+            {
+                inpSink->Triangle(yy);
+                bTriangleCallDone = true;
+            }
+
+            lambertHorizlineConservative(start, end, yy, inpSink);
+        }
+    }
+}
+
+
+
+void CSimpleTriangleRasterizer::CallbackFillSubpixelCorrect(float _x[3], float _y[3], IRasterizeSink* inpSink)
+{
+    float x[3], y[3];
+
+    CopyAndSortY(_x, _y, x, y);
+
+    if (fabs(y[0] - floorf(y[0])) < FLT_EPSILON)
+    {
+        y[0] -= FLT_EPSILON;
+    }
+
+    // Calculate interpolation steps
+    float fX1toX2step = 0.0f;
+    float fX1toX3step = 0.0f;
+    float fX2toX3step = 0.0f;
+    if (fabsf(y[1] - y[0]) > FLT_EPSILON)
+    {
+        fX1toX2step = (x[1] - x[0]) / (y[1] - y[0]);
+    }
+    if (fabsf(y[2] - y[0]) > FLT_EPSILON)
+    {
+        fX1toX3step = (x[2] - x[0]) / (y[2] - y[0]);
+    }
+    if (fabsf(y[2] - y[1]) > FLT_EPSILON)
+    {
+        fX2toX3step = (x[2] - x[1]) / (y[2] - y[1]);
+    }
+
+    float fX1toX2 = x[0], fX1toX3 = x[0], fX2toX3 = x[1];
+    bool bFirstLine = true;
+    bool bTriangleCallDone = false;
+
+    y[0] -= 0.5f;
+    y[1] -= 0.5f;
+    y[2] -= 0.5f;
+    //  y[0]=y[0]*1023.f/1024.f+1.f;
+    //  y[1]=y[1]*1023.f/1024.f+1.f;
+    //  y[2]=y[2]*1023.f/1024.f+1.f;
+
+    for (int yy = (int)floorf(y[0]); yy <= (int)floorf(y[2]); yy++)
+    {
+        float fSubPixelYStart = 0.0f, fSubPixelYEnd = 1.0f;
+        float start, end;
+
+        // first line
+        if (bFirstLine)
+        {
+            fSubPixelYStart = y[0] - floorf(y[0]);
+            start = x[0];
+            end = x[0];
+            bFirstLine = false;
+        }
+        else
+        {
+            // top part without middle corner line
+            if (yy <= (int)floorf(y[1]))
+            {
+                start = (std::min)(fX1toX2, fX1toX3);
+                end = (std::max)(fX1toX2, fX1toX3);
+            }
+            else
+            {
+                start = (std::min)(fX2toX3, fX1toX3);
+                end = (std::max)(fX2toX3, fX1toX3);
+            }
+        }
+
+        // middle corner line
+        if (yy == (int)floorf(y[1]))
+        {
+            fSubPixelYEnd = y[1] - floorf(y[1]);
+
+            fX1toX3 += fX1toX3step * (fSubPixelYEnd - fSubPixelYStart);
+
+            fSubPixelYStart = fSubPixelYEnd;
+            fSubPixelYEnd = 1.0f;
+        }
+
+        // last line
+        if (yy != (int)floorf(y[2]))
+        {
+            // top part without middle corner line
+            if (yy < (int)floorf(y[1]))
+            {
+                fX1toX2 += fX1toX2step * (fSubPixelYEnd - fSubPixelYStart);
+            }
+            else
+            {
+                fX2toX3 += fX2toX3step * (fSubPixelYEnd - fSubPixelYStart);
+            }
+
+            fX1toX3 += fX1toX3step * (fSubPixelYEnd - fSubPixelYStart);
+        }
+
+        if (start != end)
+        {
+            if (yy >= m_iMinY && yy <= m_iMaxY)
+            {
+                if (!bTriangleCallDone)
+                {
+                    inpSink->Triangle(yy);
+                    bTriangleCallDone = true;
+                }
+
+                lambertHorizlineSubpixelCorrect(start, end, yy, inpSink);
+            }
+        }
+    }
+}
+
+
+
+
+// shrink triangle by n pixel, optimizable
+void CSimpleTriangleRasterizer::ShrinkTriangle(float inoutfX[3], float inoutfY[3], float infAmount)
+{
+    float fX[3] = { inoutfX[0], inoutfX[1], inoutfX[2] };
+    float fY[3] = { inoutfY[0], inoutfY[1], inoutfY[2] };
+
+    /*
+    // move edge to opposing vertex
+    float dx,dy,fLength;
+
+    for(int a=0;a<3;a++)
+    {
+        int b=a+1;if(b>=3)b=0;
+        int c=b+1;if(c>=3)c=0;
+
+        dx=fX[a]-(fX[b]+fX[c])*0.5f;
+        dy=fY[a]-(fY[b]+fY[c])*0.5f;
+        fLength=(float)sqrt(dx*dx+dy*dy);
+        if(fLength>1.0f)
+        {
+            dx/=fLength;dy/=fLength;
+            inoutfX[b]+=dx;inoutfY[b]+=dy;
+            inoutfX[c]+=dx;inoutfY[c]+=dy;
+        }
+    }
+    */
+
+    /*
+    // move vertex to opposing edge
+    float dx,dy,fLength;
+
+    for(int a=0;a<3;a++)
+    {
+        int b=a+1;if(b>=3)b=0;
+        int c=b+1;if(c>=3)c=0;
+
+        dx=fX[a]-(fX[b]+fX[c])*0.5f;
+        dy=fY[a]-(fY[b]+fY[c])*0.5f;
+        fLength=(float)sqrt(dx*dx+dy*dy);
+        if(fLength>1.0f)
+        {
+            dx/=fLength;dy/=fLength;
+            inoutfX[a]-=dx;inoutfY[a]-=dy;
+        }
+    }
+    */
+
+    // move vertex to get edges shifted perpendicular for 1 unit
+    for (int a = 0; a < 3; a++)
+    {
+        float dx1, dy1, dx2, dy2, fLength;
+
+        int b = a + 1;
+        if (b >= 3)
+        {
+            b = 0;
+        }
+        int c = b + 1;
+        if (c >= 3)
+        {
+            c = 0;
+        }
+
+        dx1 = fX[b] - fX[a];
+        dy1 = fY[b] - fY[a];
+        fLength = (float)sqrt(dx1 * dx1 + dy1 * dy1);
+        if (infAmount > 0)
+        {
+            if (fLength < infAmount)
+            {
+                continue;
+            }
+        }
+        if (fLength == 0.0f)
+        {
+            continue;
+        }
+        dx1 /= fLength;
+        dy1 /= fLength;
+
+        dx2 = fX[c] - fX[a];
+        dy2 = fY[c] - fY[a];
+        fLength = (float)sqrt(dx2 * dx2 + dy2 * dy2);
+        if (infAmount > 0)
+        {
+            if (fLength < infAmount)
+            {
+                continue;
+            }
+        }
+        if (fLength == 0.0f)
+        {
+            continue;
+        }
+        dx2 /= fLength;
+        dy2 /= fLength;
+
+        inoutfX[a] += (dx1 + dx2) * infAmount;
+        inoutfY[a] += (dy1 + dy2) * infAmount;
+    }
+}
diff --git a/Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.h b/Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.h
new file mode 100644
index 0000000000..6527cc2bd7
--- /dev/null
+++ b/Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.h
@@ -0,0 +1,180 @@
+/*
+ * 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_LIGHTMAPCOMPILER_SIMPLETRIANGLERASTERIZER_H
+#define CRYINCLUDE_EDITOR_LIGHTMAPCOMPILER_SIMPLETRIANGLERASTERIZER_H
+#pragma once
+
+class CSimpleTriangleRasterizer
+{
+public:
+
+    class IRasterizeSink
+    {
+    public:
+
+        //! is called once per triangel for the first possible visible line
+        //! /param iniStartY
+        virtual void Triangle([[maybe_unused]] const int iniStartY)
+        {
+        }
+
+        //! callback function
+        //! /param infXLeft included - not clipped against left and reight border
+        //! /param infXRight excluded - not clipped against left and reight border
+        //! /param iniXLeft included
+        //! /param iniXRight excluded
+        //! /param iniY
+        virtual void Line(const float infXLeft, const float infXRight,
+            const int iniXLeft, const int iniXRight, const int iniY) = 0;
+    };
+
+    typedef unsigned long DWORD;
+
+    // -----------------------------------------------------
+
+    //! implementation sink sample
+    class CDWORDFlatFill
+        : public IRasterizeSink
+    {
+    public:
+
+        //! constructor
+        CDWORDFlatFill(DWORD* inpBuffer, const DWORD indwPitchInPixels, DWORD indwValue)
+        {
+            m_dwValue = indwValue;
+            m_pBuffer = inpBuffer;
+            m_dwPitchInPixels = indwPitchInPixels;
+        }
+
+        virtual void Triangle(const int iniY)
+        {
+            m_pBufferLine = &m_pBuffer[iniY * m_dwPitchInPixels];
+        }
+
+        virtual void Line([[maybe_unused]] const float infXLeft, [[maybe_unused]] const float infXRight,
+            const int iniLeft, const int iniRight, [[maybe_unused]] const int iniY)
+        {
+            DWORD* mem = &m_pBufferLine[iniLeft];
+
+            for (int x = iniLeft; x < iniRight; x++)
+            {
+                *mem++ = m_dwValue;
+            }
+
+            m_pBufferLine += m_dwPitchInPixels;
+        }
+
+    private:
+        DWORD m_dwValue;                    //!< fill value
+        DWORD* m_pBufferLine;           //!< to get rid of the multiplication per line
+
+        DWORD m_dwPitchInPixels;    //!< in DWORDS, not in Bytes
+        DWORD* m_pBuffer;                   //!< pointer to the buffer
+    };
+
+    // -----------------------------------------------------
+
+    //! constructor
+    //! /param iniWidth excluded
+    //! /param iniHeight excluded
+    CSimpleTriangleRasterizer(const int iniWidth, const int iniHeight)
+    {
+        m_iMinX = 0;
+        m_iMinY = 0;
+        m_iMaxX = iniWidth - 1;
+        m_iMaxY = iniHeight - 1;
+    }
+    /*
+        //! constructor
+        //! /param iniMinX included
+        //! /param iniMinY included
+        //! /param iniMaxX included
+        //! /param iniMaxY included
+        CSimpleTriangleRasterizer( const int iniMinX, const int iniMinY, const int iniMaxX, const int iniMaxY )
+        {
+            m_iMinX=iniMinX;
+            m_iMinY=iniMinY;
+            m_iMaxX=iniMaxX;
+            m_iMaxY=iniMaxY;
+        }
+    */
+    //! simple triangle filler with clipping (optimizable), not subpixel correct
+    //! /param pBuffer pointer o the color buffer
+    //! /param indwWidth width of the color buffer
+    //! /param indwHeight height of the color buffer
+    //! /param x array of the x coordiantes of the three vertices
+    //! /param y array of the x coordiantes of the three vertices
+    //! /param indwValue value of the triangle
+    void DWORDFlatFill(DWORD* inpBuffer, const DWORD indwPitchInPixels, float x[3], float y[3], DWORD indwValue, bool inbConservative)
+    {
+        CDWORDFlatFill pix(inpBuffer, indwPitchInPixels, indwValue);
+
+        if (inbConservative)
+        {
+            CallbackFillConservative(x, y, &pix);
+        }
+        else
+        {
+            CallbackFillSubpixelCorrect(x, y, &pix);
+        }
+    }
+
+    // Rectangle around triangle - more stable - use for debugging purpose
+    void CallbackFillRectConservative(float x[3], float y[3], IRasterizeSink * inpSink);
+
+
+    //! subpixel correct triangle filler (conservative or not conservative)
+    //! \param pBuffer pointe to the DWORD
+    //! \param indwWidth width of the buffer pBuffer pointes to
+    //! \param indwHeight height of the buffer pBuffer pointes to
+    //! \param x array of the x coordiantes of the three vertices
+    //! \param y array of the x coordiantes of the three vertices
+    //! \param inpSink pointer to the sink interface (is called per triangle and per triangle line)
+    void CallbackFillConservative(float x[3], float y[3], IRasterizeSink * inpSink);
+
+    //! subpixel correct triangle filler (conservative or not conservative)
+    //! \param pBuffer pointe to the DWORD
+    //! \param indwWidth width of the buffer pBuffer pointes to
+    //! \param indwHeight height of the buffer pBuffer pointes to
+    //! \param x array of the x coordiantes of the three vertices
+    //! \param y array of the x coordiantes of the three vertices
+    //! \param inpSink pointer to the sink interface (is called per triangle and per triangle line)
+    void CallbackFillSubpixelCorrect(float x[3], float y[3], IRasterizeSink * inpSink);
+
+    //!
+    //! /param inoutfX
+    //! /param inoutfY
+    //! /param infAmount could be positive or negative
+    static void ShrinkTriangle(float inoutfX[3], float inoutfY[3], float infAmount);
+
+private:
+
+    // Clipping Rect;
+
+    int     m_iMinX;        //!< minimum x value included
+    int     m_iMinY;        //!< minimum y value included
+    int     m_iMaxX;        //!< maximum x value included
+    int     m_iMaxY;        //!< maximum x value included
+
+    void lambertHorizlineConservative(float fx1, float fx2, int y, IRasterizeSink* inpSink);
+    void lambertHorizlineSubpixelCorrect(float fx1, float fx2, int y, IRasterizeSink* inpSink);
+    void CopyAndSortY(const float infX[3], const float infY[3], float outfX[3], float outfY[3]);
+};
+
+
+// extension ideas:
+// * callback with coverage mask (possible non ordered sampling)
+// * z-buffer behaviour
+// * gouraud shading
+// * texture mapping with nearest/bicubic/bilinear filter
+// * further primitives: thick line, ellipse
+// * build a template version
+// *
+
+#endif // CRYINCLUDE_EDITOR_LIGHTMAPCOMPILER_SIMPLETRIANGLERASTERIZER_H
diff --git a/Code/Editor/LogFile.cpp b/Code/Editor/LogFile.cpp
new file mode 100644
index 0000000000..1f28272fc1
--- /dev/null
+++ b/Code/Editor/LogFile.cpp
@@ -0,0 +1,635 @@
+/*
+ * 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 : implementation of the CLogFile class.
+
+#include "EditorDefs.h"
+
+#include "LogFile.h"
+
+// Qt
+#include <QTextEdit>
+#include <QScrollBar>
+#include <QListWidget>
+#include <QGuiApplication>
+#include <QScreen>
+
+// Editor
+#include "CryEdit.h"                // for CCryEditApp
+#include "ProcessInfo.h"            // for ProcessMemInfo
+#include "Controls/ConsoleSCB.h"    // for CConsoleSCB
+
+
+#include <stdarg.h>
+
+#if !defined(AZ_PLATFORM_WINDOWS)
+#include <time.h>
+#include <QTime>
+#endif
+
+#if defined(AZ_PLATFORM_MAC)
+#include <mach/clock.h>
+#include <mach/mach.h>
+
+#include <Carbon/Carbon.h>
+#endif
+
+// Static member variables
+SANDBOX_API QListWidget* CLogFile::m_hWndListBox = nullptr;
+SANDBOX_API QTextEdit* CLogFile::m_hWndEditBox = nullptr;
+bool CLogFile::m_bShowMemUsage = false;
+bool CLogFile::m_bIsQuitting = false;
+
+//////////////////////////////////////////////////////////////////////////
+SANDBOX_API void Error(const char* format, ...)
+{
+    va_list ArgList;
+
+    va_start(ArgList, format);
+    ErrorV(format, ArgList);
+    va_end(ArgList);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+SANDBOX_API void ErrorV(const char* format, va_list argList)
+{
+    char        szBuffer[MAX_LOGBUFFER_SIZE];
+    azvsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, format, argList);
+
+    QString str = "####-ERROR-####: ";
+    str += szBuffer;
+
+    //CLogFile::WriteLine( str );
+    CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_ERROR, str.toUtf8().data());
+
+    if (!CCryEditApp::instance()->IsInTestMode() && !CCryEditApp::instance()->IsInExportMode() && !CCryEditApp::instance()->IsInLevelLoadTestMode())
+    {
+        if (gEnv && gEnv->pSystem)
+        {
+            gEnv->pSystem->ShowMessage(szBuffer, "Error", MB_OK | MB_ICONERROR | MB_APPLMODAL);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+SANDBOX_API void Warning(const char* format, ...)
+{
+    va_list ArgList;
+
+    va_start(ArgList, format);
+    WarningV(format, ArgList);
+    va_end(ArgList);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+SANDBOX_API void WarningV(const char* format, va_list argList)
+{
+    char        szBuffer[MAX_LOGBUFFER_SIZE];
+    azvsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, format, argList);
+
+    CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, szBuffer);
+
+    bool bNoUI = false;
+    ICVar* pCVar = gEnv->pConsole->GetCVar("sys_no_crash_dialog");
+    if (pCVar->GetIVal() != 0)
+    {
+        bNoUI = true;
+    }
+
+    if (!CCryEditApp::instance()->IsInTestMode() && !CCryEditApp::instance()->IsInExportMode() && !bNoUI)
+    {
+        if (gEnv && gEnv->pSystem)
+        {
+            gEnv->pSystem->ShowMessage(szBuffer, "Warning", MB_OK | MB_ICONWARNING | MB_APPLMODAL);
+        }
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+SANDBOX_API void Log(const char* format, ...)
+{
+    va_list ArgList;
+    va_start(ArgList, format);
+    LogV(format, ArgList);
+    va_end(ArgList);
+}
+
+//////////////////////////////////////////////////////////////////////////
+SANDBOX_API void LogV(const char* format, va_list argList)
+{
+    char        szBuffer[MAX_LOGBUFFER_SIZE];
+    azvsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, format, argList);
+    CLogFile::WriteLine(szBuffer);
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+const char* CLogFile::GetLogFileName()
+{
+    if (gEnv && gEnv->pLog)
+    {
+        // Return the path
+        return gEnv->pLog->GetFileName();
+    }
+    else
+    {
+        return "";
+    }
+}
+
+void CLogFile::AttachListBox(QListWidget* hWndListBox)
+{
+    m_hWndListBox = hWndListBox;
+}
+
+void CLogFile::AttachEditBox(QTextEdit* hWndEditBox)
+{
+    m_hWndEditBox = hWndEditBox;
+}
+
+void CLogFile::FormatLine(const char * format, ...)
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Write a line with printf style formatting
+    ////////////////////////////////////////////////////////////////////////
+
+    va_list ArgList;
+    va_start(ArgList, format);
+    FormatLineV(format, ArgList);
+    va_end(ArgList);
+}
+
+void CLogFile::FormatLineV(const char * format, va_list argList)
+{
+    char szBuffer[MAX_LOGBUFFER_SIZE];
+    azvsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, format, argList);
+    CryLog("%s", szBuffer);
+}
+
+
+void CLogFile::AboutSystem()
+{
+    char szBuffer[MAX_LOGBUFFER_SIZE];
+#if defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
+    //////////////////////////////////////////////////////////////////////
+    // Write the system informations to the log
+    //////////////////////////////////////////////////////////////////////
+
+    char szProfileBuffer[128];
+    char szLanguageBuffer[64];
+    //char szCPUModel[64];
+    MEMORYSTATUS MemoryStatus;
+#endif // defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    DEVMODE DisplayConfig;
+    OSVERSIONINFO OSVerInfo;
+    OSVerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+
+    //////////////////////////////////////////////////////////////////////
+    // Display editor and Windows version
+    //////////////////////////////////////////////////////////////////////
+
+    // Get system language
+    GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_SENGLANGUAGE,
+        szLanguageBuffer, sizeof(szLanguageBuffer));
+
+    // Format and send OS information line
+    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, "Current Language: %s ", szLanguageBuffer);
+    CryLog("%s", szBuffer);
+#else
+    QLocale locale;
+    CryLog("Current Language: %s (%s)", qPrintable(QLocale::languageToString(locale.language())), qPrintable(QLocale::countryToString(locale.country())));
+#endif
+
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    // Format and send OS version line
+    QString str = "Windows ";
+
+AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
+    GetVersionEx(&OSVerInfo);
+AZ_POP_DISABLE_WARNING
+
+    if (OSVerInfo.dwMajorVersion == 4)
+    {
+        if (OSVerInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
+        {
+            if (OSVerInfo.dwMinorVersion > 0)
+            {
+                // Windows 98
+                str += "98";
+            }
+            else
+            {
+                // Windows 95
+                str += "95";
+            }
+        }
+        else
+        {
+            // Windows NT
+            str += "NT";
+        }
+    }
+    else if (OSVerInfo.dwMajorVersion == 5)
+    {
+        if (OSVerInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
+        {
+            // Windows Millennium
+            str += "ME";
+        }
+        else
+        {
+            if (OSVerInfo.dwMinorVersion > 0)
+            {
+                // Windows XP
+                str += "XP";
+            }
+            else
+            {
+                // Windows 2000
+                str += "2000";
+            }
+        }
+    }
+    else if (OSVerInfo.dwMajorVersion == 6)
+    {
+        if (OSVerInfo.dwMinorVersion == 0)
+        {
+            // Windows Vista
+            str += "Vista";
+        }
+        else if (OSVerInfo.dwMinorVersion == 1)
+        {
+            // Windows 7
+            str += "7";
+        }
+        else if (OSVerInfo.dwMinorVersion == 2)
+        {
+            // Windows 8
+            str += "8";
+        }
+        else
+        {
+            // Windows unknown (newer than Win8)
+            str += "Version Unknown";
+        }
+    }
+    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, " %d.%d", OSVerInfo.dwMajorVersion, OSVerInfo.dwMinorVersion);
+    str += szBuffer;
+
+    //////////////////////////////////////////////////////////////////////
+    // Show Windows directory
+    //////////////////////////////////////////////////////////////////////
+
+    str += " (";
+    GetWindowsDirectory(szBuffer, sizeof(szBuffer));
+    str += szBuffer;
+    str += ")";
+    CryLog("%s", str.toUtf8().data());
+#elif defined(AZ_PLATFORM_LINUX)
+    // TODO: Add more detail about the current Linux Distro
+    CryLog("Linux");
+#elif AZ_TRAIT_OS_PLATFORM_APPLE
+    QString operatingSystemName;
+    if (QSysInfo::MacintoshVersion >= Q_MV_OSX(10, 12))
+    {
+        operatingSystemName = "macOS ";
+    }
+    else
+    {
+        operatingSystemName = "OS X ";
+    }
+
+    int majorVersion = 0;
+    int minorVersion = 0;
+    AZ_PUSH_DISABLE_WARNING(, "-Wdeprecated-declarations")
+    Gestalt(gestaltSystemVersionMajor, &majorVersion);
+    Gestalt(gestaltSystemVersionMinor, &minorVersion);
+    AZ_POP_DISABLE_WARNING
+
+    CryLog("%s - %d.%d", qPrintable(operatingSystemName), majorVersion, minorVersion);
+#else
+    CryLog("Unknown Operating System");
+#endif
+
+    //////////////////////////////////////////////////////////////////////
+    // Send system time & date
+    //////////////////////////////////////////////////////////////////////
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    str = "Local time is ";
+    azstrtime(szBuffer);
+    str += szBuffer;
+    str += " ";
+    azstrdate(szBuffer);
+    str += szBuffer;
+    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, ", system running for %d minutes", GetTickCount() / 60000);
+    str += szBuffer;
+    CryLog("%s", str.toUtf8().data());
+#else
+    struct timespec ts;
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    clock_serv_t cclock;
+    mach_timespec_t mts;
+    host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock);
+    clock_get_time(cclock, &mts);
+    mach_port_deallocate(mach_task_self(), cclock);
+    ts.tv_sec = mts.tv_sec;
+#else
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+#endif
+    CryLog("Local time is %s, system running for %ld minutes", qPrintable(QTime::currentTime().toString("hh:mm:ss")), ts.tv_sec / 60);
+#endif
+
+    //////////////////////////////////////////////////////////////////////
+    // Send system memory status
+    //////////////////////////////////////////////////////////////////////
+
+#if defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
+    GlobalMemoryStatus(&MemoryStatus);
+    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, "%zdMB phys. memory installed, %zdMB paging available",
+        MemoryStatus.dwTotalPhys / 1048576 + 1,
+        MemoryStatus.dwAvailPageFile / 1048576);
+    CryLog("%s", szBuffer);
+#elif defined(AZ_PLATFORM_LINUX)
+    //KDAB_TODO
+#else
+
+    SInt32 mb = 0, lmb = 0;
+    AZ_PUSH_DISABLE_WARNING(, "-Wdeprecated-declarations")
+    Gestalt(gestaltPhysicalRAMSizeInMegabytes, &mb);
+    Gestalt(gestaltLogicalRAMSize, &lmb);
+    AZ_POP_DISABLE_WARNING
+    CryLog("%dMB phys. memory installed, %dMB paging available", mb, lmb);
+#endif
+
+    //////////////////////////////////////////////////////////////////////
+    // Send display settings
+    //////////////////////////////////////////////////////////////////////
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &DisplayConfig);
+    GetPrivateProfileString("boot.description", "display.drv",
+        "(Unknown graphics card)", szProfileBuffer, sizeof(szProfileBuffer),
+        "system.ini");
+    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, "Current display mode is %dx%dx%d, %s",
+        DisplayConfig.dmPelsWidth, DisplayConfig.dmPelsHeight,
+        DisplayConfig.dmBitsPerPel, szProfileBuffer);
+    CryLog("%s", szBuffer);
+#else
+    auto screen = QGuiApplication::primaryScreen();
+    if (screen)
+    {
+        CryLog("Current display mode is %dx%dx%d, %s", screen->size().width(), screen->size().height(), screen->depth(), qPrintable(screen->name()));
+    }
+#endif
+
+    //////////////////////////////////////////////////////////////////////
+    // Send input device configuration
+    //////////////////////////////////////////////////////////////////////
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    str = "";
+    // Detect the keyboard type
+    switch (GetKeyboardType(0))
+    {
+    case 1:
+        str = "IBM PC/XT (83-key)";
+        break;
+    case 2:
+        str = "ICO (102-key)";
+        break;
+    case 3:
+        str = "IBM PC/AT (84-key)";
+        break;
+    case 4:
+        str = "IBM enhanced (101/102-key)";
+        break;
+    case 5:
+        str = "Nokia 1050";
+        break;
+    case 6:
+        str = "Nokia 9140";
+        break;
+    case 7:
+        str = "Japanese";
+        break;
+    default:
+        str = "Unknown";
+        break;
+    }
+
+    // Any mouse attached ?
+    if (!GetSystemMetrics(SM_MOUSEPRESENT))
+    {
+        CryLog("%s", (str + " keyboard and no mouse installed").toUtf8().data());
+    }
+    else
+    {
+        azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, " keyboard and %i+ button mouse installed",
+            GetSystemMetrics(SM_CMOUSEBUTTONS));
+        str += szBuffer;
+        CryLog("%s", str.toUtf8().data());
+    }
+
+    CryLog("--------------------------------------------------------------------------------");
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CLogFile::GetMemUsage()
+{
+    ProcessMemInfo mi;
+    CProcessInfo::QueryMemInfo(mi);
+    int MB = 1024 * 1024;
+
+    QString str;
+    str = QStringLiteral("Memory=%1Mb, Pagefile=%2Mb").arg(mi.WorkingSet / MB).arg(mi.PagefileUsage / MB);
+    //FormatLine( "PeakWorkingSet=%dMb, PeakPagefileUsage=%dMb",pc.PeakWorkingSetSize/MB,pc.PeakPagefileUsage/MB );
+    //FormatLine( "PagedPoolUsage=%d",pc.QuotaPagedPoolUsage/MB );
+    //FormatLine( "NonPagedPoolUsage=%d",pc.QuotaNonPagedPoolUsage/MB );
+
+    return str;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLogFile::WriteLine(const char* pszString)
+{
+    CryLog("%s", pszString);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLogFile::WriteString(const char* pszString)
+{
+    if (gEnv && gEnv->pLog)
+    {
+        gEnv->pLog->LogPlus(pszString);
+    }
+}
+
+static inline QString CopyAndRemoveColorCode(const char* sText)
+{
+    QByteArray ret = sText;      // alloc and copy
+
+    char* s, * d;
+
+    s = ret.data();
+    d = s;
+
+    // remove color code in place
+    while (*s != 0)
+    {
+        if (*s == '$' && *(s + 1) >= '0' && *(s + 1) <= '9')
+        {
+            s += 2;
+            continue;
+        }
+
+        *d++ = *s++;
+    }
+
+    ret.resize(d - ret.data());
+
+    return QString::fromLatin1(ret);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLogFile::OnWriteToConsole(const char* sText, bool bNewLine)
+{
+    if (!gEnv)
+    {
+        return;
+    }
+    //  if (GetIEditor()->IsInGameMode())
+    //  return;
+
+    // Skip any non character.
+    if (*sText != 0 && ((uint8) * sText) < 32)
+    {
+        sText++;
+    }
+
+    // If we have a listbox attached, also output the string to this listbox
+    if (m_hWndListBox)
+    {
+        QString str = CopyAndRemoveColorCode(sText);        // editor prinout doesn't support color coded log messages
+
+        if (m_bShowMemUsage)
+        {
+            str = QString("(") + GetMemUsage() + ")" + str;
+        }
+
+        // Add the string to the listbox
+        m_hWndListBox->addItem(str);
+
+        // Make sure the recently added string is visible
+        m_hWndListBox->scrollToItem(m_hWndListBox->item(m_hWndListBox->count() - 1));
+
+        if (m_hWndEditBox)
+        {
+            static int nCounter = 0;
+            if (nCounter++ > 500)
+            {
+                // Clean Edit box every 500 lines.
+                nCounter = 0;
+                m_hWndEditBox->clear();
+            }
+
+            // remember selection and the top row
+            int len = m_hWndEditBox->document()->toPlainText().length();
+            int top = 0;
+            int from = m_hWndEditBox->textCursor().selectionStart();
+            int to = from + m_hWndEditBox->textCursor().selectionEnd();
+            bool keepPos = false;
+
+            if (from != len || to != len)
+            {
+                keepPos = m_hWndEditBox->hasFocus();
+                if (keepPos)
+                {
+                    top = m_hWndEditBox->verticalScrollBar()->value();
+
+                }
+                QTextCursor cur = m_hWndEditBox->textCursor();
+                cur.setPosition(len);
+                m_hWndEditBox->setTextCursor(cur);
+            }
+            if (bNewLine)
+            {
+                //str = CString("\r\n") + str.TrimLeft();
+                //str = CString("\r\n") + str;
+                //str = CString("\r") + str;
+                str = QString("\r\n") + str;
+                str = str.trimmed();
+            }
+            m_hWndEditBox->textCursor().insertText(str);
+
+            // restore selection and the top line
+            if (keepPos)
+            {
+                QTextCursor cur = m_hWndEditBox->textCursor();
+                cur.setPosition(from);
+                cur.setPosition(to, QTextCursor::KeepAnchor);
+                m_hWndEditBox->setTextCursor(cur);
+                m_hWndEditBox->verticalScrollBar()->setValue(top);
+            }
+        }
+    }
+
+    if (CConsoleSCB::GetCreatedInstance())
+    {
+        QString sOutLine(sText);
+
+        if (gSettings.bShowTimeInConsole)
+        {
+            char sTime[128];
+            time_t ltime;
+            time(&ltime);
+            struct tm today;
+#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
+            localtime_s(&today, &ltime);
+#else
+            today = *localtime(&ltime);
+#endif
+            strftime(sTime, sizeof(sTime), "<%H:%M:%S> ", &today);
+            sOutLine = sTime;
+            sOutLine += sText;
+        }
+
+        CConsoleSCB::GetCreatedInstance()->AddToConsole(sOutLine, bNewLine);
+    }
+    else
+    {
+        // add to intermediate messages until an instance of CConsoleSCB exists
+        CConsoleSCB::AddToPendingLines(sText, bNewLine);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Look for exit messages while writing to the console
+    //////////////////////////////////////////////////////////////////////////
+    if (gEnv && gEnv->pSystem && !gEnv->pSystem->IsQuitting() && !m_bIsQuitting)
+    {
+        if (QCoreApplication::closingDown())
+        {
+            m_bIsQuitting = true;
+            CCryEditApp::instance()->ExitInstance();
+            m_bIsQuitting = false;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLogFile::OnWriteToFile([[maybe_unused]] const char* sText, [[maybe_unused]] bool bNewLine)
+{
+}
diff --git a/Code/Editor/LogFile.h b/Code/Editor/LogFile.h
new file mode 100644
index 0000000000..d1eed5bcbd
--- /dev/null
+++ b/Code/Editor/LogFile.h
@@ -0,0 +1,87 @@
+/*
+ * 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_LOGFILE_H
+#define CRYINCLUDE_EDITOR_LOGFILE_H
+
+#pragma once
+
+#include "ILog.h"
+#include <IConsole.h>
+#include <stdarg.h>
+
+#define MAX_LOGBUFFER_SIZE 16384
+
+class QTextEdit;
+class QListWidget;
+
+//struct IConsole;
+//struct ICVar;
+
+//////////////////////////////////////////////////////////////////////////
+// Global log functions.
+//////////////////////////////////////////////////////////////////////////
+
+// the 'v' versions are for when you've already done your unpack, so that we are not forced to truncate the buffer
+
+//! Displays error message.
+SANDBOX_API void Error(const char* format, ...);
+SANDBOX_API void ErrorV(const char* format, va_list argList);
+//! Log to console and file.
+SANDBOX_API void Log(const char* format, ...);
+SANDBOX_API void LogV(const char* format, va_list argList);
+//! Display Warning dialog.
+SANDBOX_API void Warning(const char* format, ...);
+SANDBOX_API void WarningV(const char* format, va_list argList);
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+/*!
+ *  CLogFile implements ILog interface.
+ */
+class SANDBOX_API CLogFile
+    : public ILogCallback
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    static const char* GetLogFileName();
+    static void AttachListBox(QListWidget* hWndListBox);
+    static void AttachEditBox(QTextEdit* hWndEditBox);
+
+    //! Write to log snapshot of current process memory usage.
+    static QString GetMemUsage();
+
+    static void WriteString(const char* pszString);
+    static void WriteString(const QString& string) { WriteString(string.toUtf8().data()); }
+    static void WriteLine(const char* pszLine);
+    static void WriteLine(const QString& string) { WriteLine(string.toUtf8().data()); }
+    static void FormatLine(const char* pszMessage, ...);
+    static void FormatLineV(const char* pszMessage, va_list argList);
+
+    //////////////////////////////////////////////////////////////////////////
+    // ILogCallback
+    //////////////////////////////////////////////////////////////////////////
+    virtual void OnWrite([[maybe_unused]] const char* sText, [[maybe_unused]] IMiniLog::ELogType type) override {};
+    virtual void OnWriteToConsole(const char* sText, bool bNewLine) override;
+    virtual void OnWriteToFile(const char* sText, bool bNewLine) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    // logs some useful information
+    // should be called after CryLog() is available
+    static void AboutSystem();
+
+private:
+    static void OpenFile();
+
+    // Attached control(s)
+    static QListWidget* m_hWndListBox;
+    static QTextEdit* m_hWndEditBox;
+    static bool m_bShowMemUsage;
+    static bool m_bIsQuitting;
+};
+
+#endif // CRYINCLUDE_EDITOR_LOGFILE_H
diff --git a/Code/Editor/LogFileImpl.cpp b/Code/Editor/LogFileImpl.cpp
new file mode 100644
index 0000000000..0d488c7ef1
--- /dev/null
+++ b/Code/Editor/LogFileImpl.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#include "EditorDefs.h"
+
+#include "LogFileImpl.h"
+
+// Interface which we expose via GetIEditor()
+#include "LogFile.h"
+
+const char* CLogFileImpl::GetLogFileName()
+{
+    return CLogFile::GetLogFileName();
+}
+
+QString CLogFileImpl::GetMemUsage()
+{
+    return CLogFile::GetMemUsage();
+}
+
+void CLogFileImpl::WriteString(const char* pszString)
+{
+    CLogFile::WriteString(pszString);
+}
+
+void CLogFileImpl::WriteLine(const char* pszLine)
+{
+    CLogFile::WriteLine(pszLine);
+}
+
+void CLogFileImpl::FormatLine(const char* pszMessage, ...)
+{
+    va_list ArgList;
+    va_start(ArgList, pszMessage);
+    CLogFile::FormatLineV(pszMessage, ArgList);
+    va_end(ArgList);
+}
+
+void CLogFileImpl::AboutSystem()
+{
+    CLogFile::AboutSystem();
+}
+
+void CLogFileImpl::Warning(const char* format, ...)
+{
+    va_list ArgList;
+    va_start(ArgList, format);
+    ::WarningV(format, ArgList);
+    va_end(ArgList);
+}
diff --git a/Code/Editor/LogFileImpl.h b/Code/Editor/LogFileImpl.h
new file mode 100644
index 0000000000..ab1b08d5d8
--- /dev/null
+++ b/Code/Editor/LogFileImpl.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#ifndef CRYINCLUDE_EDITOR_LOGFILEIMPL_H
+#define CRYINCLUDE_EDITOR_LOGFILEIMPL_H
+#pragma once
+
+#include <Include/ILogFile.h>
+
+class CLogFileImpl
+    : public ILogFile
+{
+public:
+    virtual const char* GetLogFileName() override;
+
+    //! Write to log spanpshot of current process memory usage.
+    virtual QString GetMemUsage() override;
+
+    virtual void WriteString(const char* pszString) override;
+    virtual void WriteLine(const char* pszLine) override;
+    virtual void FormatLine(const char* pszMessage, ...) override;
+
+    // logs some useful information
+    // should be called after CryLog() is available
+    virtual void AboutSystem() override;
+
+    virtual void Warning(const char* format, ...) override;
+};
+
+#endif // CRYINCLUDE_EDITOR_LOGFILEIMPL_H
diff --git a/Code/Editor/LogFile_mac.mm b/Code/Editor/LogFile_mac.mm
new file mode 100644
index 0000000000..1549a96124
--- /dev/null
+++ b/Code/Editor/LogFile_mac.mm
@@ -0,0 +1,68 @@
+/*
+ * 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 <Cocoa/Cocoa.h>
+
+#include <QString>
+
+QString operatingSystemVersionString()
+{
+    NSString* operatingSystemVersionString = [[NSProcessInfo processInfo] operatingSystemVersionString];
+    return QString::fromNSString(operatingSystemVersionString);
+}
+
+QString graphicsCardName()
+{
+    QString name;
+
+    // Get dictionary of all the PCI Devicces
+    CFMutableDictionaryRef matchDict = IOServiceMatching("IOPCIDevice");
+
+    // Create an iterator
+    io_iterator_t iterator;
+
+    if (IOServiceGetMatchingServices(kIOMasterPortDefault,matchDict,
+                                     &iterator) == kIOReturnSuccess)
+    {
+        // Iterator for devices found
+        io_registry_entry_t regEntry;
+
+        while ((regEntry = IOIteratorNext(iterator))) {
+            // Put this services object into a dictionary object.
+            CFMutableDictionaryRef serviceDictionary;
+            if (IORegistryEntryCreateCFProperties(regEntry,
+                                                  &serviceDictionary,
+                                                  kCFAllocatorDefault,
+                                                  kNilOptions) != kIOReturnSuccess)
+            {
+                // Service dictionary creation failed.
+                IOObjectRelease(regEntry);
+                continue;
+            }
+            const void *GPUModel = CFDictionaryGetValue(serviceDictionary, @"model");
+
+            if (GPUModel != nil) {
+                if (CFGetTypeID(GPUModel) == CFDataGetTypeID()) {
+                    // Create a string from the CFDataRef.
+                    NSString *modelName = [[NSString alloc] initWithData:
+                                           (NSData *)GPUModel encoding:NSASCIIStringEncoding];
+
+                    name = QString::fromNSString(modelName);
+                    [modelName release];
+                }
+            }
+            // Release the dictionary
+            CFRelease(serviceDictionary);
+            // Release the serviceObject
+            IOObjectRelease(regEntry);
+        }
+        // Release the iterator
+        IOObjectRelease(iterator);
+    }
+
+    return name;
+}
diff --git a/Code/Editor/LyViewPaneNames.h b/Code/Editor/LyViewPaneNames.h
new file mode 100644
index 0000000000..bc0238d06b
--- /dev/null
+++ b/Code/Editor/LyViewPaneNames.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+namespace LyViewPane
+{
+    static const char* const CategoryTools = "Tools";
+    static const char* const CategoryOther = "Other";
+    //----
+    static const char* const CategoryEditor = "Editor";
+    static const char* const CategoryViewport = "Viewport";
+
+
+    // Putting these names here so that when view panes are opened
+    // from other areas of Editor code, they still work when the name changes.
+    static const char* const SceneSettings = "Scene Settings (PREVIEW)";
+    static const char* const AssetBrowser = "Asset Browser";
+    static const char* const AssetEditor = "Asset Editor";
+    static const char* const EntityOutliner = "Entity Outliner";
+    static const char* const EntityInspector = "Entity Inspector";
+    static const char* const EntityInspectorPinned = "Pinned Entity Inspector";
+    static const char* const LevelInspector = "Level Inspector";
+    static const char* const ProjectSettingsTool = "Edit Platform Settings...";
+    static const char* const ErrorReport = "Error Report";
+    static const char* const Console = "Console";
+    static const char* const ConsoleMenuName = "&Console";
+    static const char* const ConsoleVariables = "Console Variables";
+    static const char* const TrackView = "Track View";
+    static const char* const ScriptCanvas = "Script Canvas";
+    static const char* const UiEditor = "UI Editor";
+
+    static const char* const EditorSettingsManager = "Editor Settings Manager";
+    static const char* const TerrainEditor = "Terrain Editor";
+    static const char* const TerrainTool = "Terrain Tool";
+    static const char* const TerrainTextureLayers = "Terrain Texture Layers";
+    static const char* const ParticleEditor = "Particle Editor";
+    static const char* const AudioControlsEditor = "Audio Controls Editor";
+    static const char* const SubstanceEditor = "Substance Editor";
+    static const char* const VegetationEditor = "Vegetation Editor";
+    static const char* const LandscapeCanvas = "Landscape Canvas";
+    static const char* const AnimationEditor = "EMotion FX Animation Editor (PREVIEW)";
+    static const char* const PhysXConfigurationEditor = "PhysX Configuration (PREVIEW)";
+
+    static const char* const SliceRelationships = "Slice Relationship View (PREVIEW)";
+
+    const int NO_BUILTIN_ACTION = -1;
+}
+
diff --git a/Code/Editor/MainStatusBar.cpp b/Code/Editor/MainStatusBar.cpp
new file mode 100644
index 0000000000..723345909f
--- /dev/null
+++ b/Code/Editor/MainStatusBar.cpp
@@ -0,0 +1,439 @@
+/*
+ * 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 "MainStatusBar.h"
+
+#include <AzCore/Utils/Utils.h>
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/CheckBox.h>
+#include <AzQtComponents/Components/Style.h>
+
+// Qt
+#include <QMenu>
+#include <QStyleOption>
+#include <QStylePainter>
+#include <QTimer>
+#include <QCheckBox>
+#include <QWidgetAction>
+
+// Editor
+#include "MainStatusBarItems.h"
+#include "CryLibrary.h"
+#include "ProcessInfo.h"
+
+
+const int iconTextSpacing = 3;
+const int marginSpacing = 2;
+const int spacerSpacing = 5;
+const int spacerColor = 0x6F6D6D;
+
+StatusBarItem::StatusBarItem(const QString& name, bool isClickable, MainStatusBar* parent, bool hasLeadingSpacer)
+    : QWidget(parent)
+    , m_isClickable(isClickable)
+    , m_hasLeadingSpacer(hasLeadingSpacer)
+{
+    setObjectName(name);
+}
+
+StatusBarItem::StatusBarItem(const QString& name, MainStatusBar* parent, bool hasLeadingSpacer)
+    : StatusBarItem(name, false, parent, hasLeadingSpacer)
+{}
+
+void StatusBarItem::SetText(const QString& text)
+{
+    if (text != m_text)
+    {
+        m_text = text;
+        updateGeometry();
+        update();
+    }
+}
+
+void StatusBarItem::SetIcon(const QPixmap& icon)
+{
+    QIcon origIcon = m_icon;
+
+    if (icon.isNull())
+    {
+        m_icon = icon;
+    }
+    else
+    {
+        // avoid generating new pixmaps if we don't need to.
+        if (icon.height() != 16)
+        {
+            m_icon = icon.scaledToHeight(16);
+        }
+        else
+        {
+            m_icon = icon;
+        }
+    }
+
+    if (icon.isNull() ^ origIcon.isNull())
+    {
+        updateGeometry();
+    }
+
+    // don't generate paintevents unless we absolutely have changed!
+    if (origIcon.cacheKey() != m_icon.cacheKey())
+    {
+        update();
+    }
+}
+
+void StatusBarItem::SetIcon(const QIcon& icon)
+{
+    QIcon origIcon = m_icon;
+
+    m_icon = icon;
+
+    if (icon.isNull() ^ origIcon.isNull())
+    {
+        updateGeometry();
+    }
+
+    // don't generate paintevents unless we absolutely have changed!
+    if (origIcon.cacheKey() != m_icon.cacheKey())
+    {
+        update();
+    }
+}
+
+void StatusBarItem::SetToolTip(const QString& tip)
+{
+    setToolTip(tip);
+}
+
+void StatusBarItem::mousePressEvent(QMouseEvent* e)
+{
+    if (m_isClickable && e->button() == Qt::LeftButton)
+    {
+        emit clicked();
+    }
+}
+
+QSize StatusBarItem::sizeHint() const
+{
+    QSize hint(4, 20);
+    if (!m_icon.isNull())
+    {
+        hint.rwidth() += 16;
+    }
+    if (!m_icon.isNull() && !CurrentText().isEmpty())
+    {
+        hint.rwidth() += iconTextSpacing; //spacing
+    }
+    auto fm = fontMetrics();
+    hint.rwidth() += fm.horizontalAdvance(CurrentText());
+
+    hint.rwidth() += 2 * marginSpacing;
+    hint.rheight() += 2 * marginSpacing;
+
+    hint.rwidth() += m_hasLeadingSpacer ? spacerSpacing : 0;
+
+    return hint;
+}
+
+QSize StatusBarItem::minimumSizeHint() const
+{
+    return sizeHint();
+}
+
+void StatusBarItem::paintEvent([[maybe_unused]] QPaintEvent* pe)
+{
+    QStylePainter painter(this);
+    QStyleOption opt;
+    opt.initFrom(this);
+    painter.drawPrimitive(QStyle::PE_Widget, opt);
+
+    auto rect = contentsRect();
+    rect.adjust(marginSpacing, marginSpacing, -marginSpacing, -marginSpacing);
+
+    QRect textRect = rect;
+    if (m_hasLeadingSpacer)
+    {
+        textRect.adjust(spacerSpacing, 0, 0, 0);
+
+    }
+    if (!CurrentText().isEmpty())
+    {
+        painter.drawItemText(textRect, Qt::AlignLeft | Qt::AlignVCenter, this->palette(), true, CurrentText(), QPalette::WindowText);
+    }
+
+    if (!m_icon.isNull())
+    {
+        auto textWidth = textRect.width();
+        if (textWidth > 0)
+        {
+            textWidth += iconTextSpacing; //margin
+        }
+        QRect iconRect = { textRect.left() + textWidth - textRect.height() - 1, textRect.top() + 2,  textRect.height() - 4, textRect.height() - 4 };
+        m_icon.paint(&painter, iconRect, Qt::AlignCenter);
+    }
+
+    if (m_hasLeadingSpacer)
+    {
+        QPen pen{ spacerColor };
+        painter.setPen(pen);
+        painter.drawLine(spacerSpacing / 2, 3, spacerSpacing / 2, rect.height() + 2);
+    }
+}
+
+QString StatusBarItem::CurrentText() const
+{
+    return m_text;
+}
+
+MainStatusBar* StatusBarItem::StatusBar() const
+{
+    return static_cast<MainStatusBar*>(parentWidget());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+MainStatusBar::MainStatusBar(QWidget* parent)
+    : QStatusBar(parent)
+{
+    addPermanentWidget(new GeneralStatusItem(QStringLiteral("status"), this), 50);
+
+    addPermanentWidget(new SourceControlItem(QStringLiteral("source_control"), this), 1);
+
+    addPermanentWidget(new StatusBarItem(QStringLiteral("connection"), true, this, true), 1);
+
+    addPermanentWidget(new StatusBarItem(QStringLiteral("game_info"), this, true), 1);
+
+    addPermanentWidget(new MemoryStatusItem(QStringLiteral("memory"), this), 1);
+}
+
+void MainStatusBar::Init()
+{
+    //called on mainwindow initialization
+    const int statusbarTimerUpdateInterval{
+        500
+    };                                             //in ms, so 2 FPS
+
+    AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
+    QString strGameInfo;
+    strGameInfo = tr("GameFolder: '%1'").arg(projectPath.c_str());
+    SetItem(QStringLiteral("game_info"), strGameInfo, tr("Game Info"), QPixmap());
+
+    //ask for updates for items regularly. This is basically what MFC does
+    auto timer = new QTimer(this);
+    timer->setInterval(statusbarTimerUpdateInterval);
+    connect(timer, &QTimer::timeout, this, &MainStatusBar::requestStatusUpdate);
+    timer->start();
+}
+
+void MainStatusBar::SetStatusText(const QString& text)
+{
+    SetItem(QStringLiteral("status"), text, QString(), QPixmap());
+}
+
+QWidget* MainStatusBar::SetItem(QString indicatorName, QString text, QString tip, const QPixmap& icon)
+{
+    auto item = findChild<StatusBarItem*>(indicatorName, Qt::FindDirectChildrenOnly);
+    assert(item);
+
+    item->SetText(text);
+    item->SetToolTip(tip);
+    item->SetIcon(icon);
+
+    return item;
+}
+
+QWidget* MainStatusBar::SetItem(QString indicatorName, QString text, QString tip, int iconId)
+{
+    static std::unordered_map<int, QPixmap> idImages {
+        {
+            IDI_BALL_DISABLED, QPixmap(QStringLiteral(":/statusbar/res/ball_disabled.ico")).scaledToHeight(16)
+        },
+        {
+            IDI_BALL_OFFLINE, QPixmap(QStringLiteral(":/statusbar/res/ball_offline.ico")).scaledToHeight(16)
+        },
+        {
+            IDI_BALL_ONLINE, QPixmap(QStringLiteral(":/statusbar/res/ball_online.ico")).scaledToHeight(16)
+        },
+        {
+            IDI_BALL_PENDING, QPixmap(QStringLiteral(":/statusbar/res/ball_pending.ico")).scaledToHeight(16)
+        }
+    };
+
+    auto search = idImages.find(iconId);
+
+    return SetItem(indicatorName, text, tip, search == idImages.end() ? QPixmap() : search->second);
+}
+
+
+QWidget* MainStatusBar::GetItem(QString indicatorName)
+{
+    return findChild<QWidget*>(indicatorName);
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+SourceControlItem::SourceControlItem(QString name, MainStatusBar* parent)
+    : StatusBarItem(name, true, parent)
+    , m_sourceControlAvailable(false)
+{
+    if (AzToolsFramework::SourceControlConnectionRequestBus::HasHandlers())
+    {
+        AzToolsFramework::SourceControlNotificationBus::Handler::BusConnect();
+        m_sourceControlAvailable = true;
+    }
+
+    InitMenu();
+    connect(this, &StatusBarItem::clicked, this, &SourceControlItem::UpdateAndShowMenu);
+}
+
+SourceControlItem::~SourceControlItem()
+{
+    AzToolsFramework::SourceControlNotificationBus::Handler::BusDisconnect();
+}
+
+void SourceControlItem::UpdateAndShowMenu()
+{
+    if (m_sourceControlAvailable)
+    {
+        UpdateMenuItems();
+        m_menu->popup(QCursor::pos());
+    }
+}
+
+void SourceControlItem::ConnectivityStateChanged(const AzToolsFramework::SourceControlState state)
+{
+    m_SourceControlState = state;
+    UpdateMenuItems();
+}
+
+void SourceControlItem::InitMenu()
+{
+    m_scIconOk = QIcon(":statusbar/res/source_control_connected.svg");
+    m_scIconError = QIcon(":statusbar/res/source_control_error_v2.svg");
+    m_scIconWarning = QIcon(":statusbar/res/source_control-warning_v2.svg");
+    m_scIconDisabled = QIcon(":statusbar/res/source_control-not_setup.svg");
+
+    if (m_sourceControlAvailable)
+    {
+        m_menu = std::make_unique<QMenu>();
+
+        m_settingsAction = m_menu->addAction(tr("Settings"));
+        m_checkBox = new QCheckBox(m_menu.get());
+        m_checkBox->setText(tr("Enable"));
+        AzQtComponents::CheckBox::applyToggleSwitchStyle(m_checkBox);
+        m_enableAction = new QWidgetAction(m_menu.get());
+        m_enableAction->setDefaultWidget(m_checkBox);
+        m_menu->addAction(m_settingsAction);
+        m_menu->addAction(m_enableAction);
+        AzQtComponents::Style::addClass(m_menu.get(), "SourceControlMenu");
+        m_enableAction->setCheckable(true);
+
+        m_enableAction->setEnabled(true);
+
+        {
+            using namespace AzToolsFramework;
+            m_SourceControlState = SourceControlState::Disabled;
+            SourceControlConnectionRequestBus::BroadcastResult(m_SourceControlState, &SourceControlConnectionRequestBus::Events::GetSourceControlState);
+            UpdateMenuItems();
+        }
+
+        connect(m_settingsAction, &QAction::triggered, this, [&]()
+        {
+            GetIEditor()->GetSourceControl()->ShowSettings();
+        });
+
+        connect(m_checkBox, &QCheckBox::stateChanged, this, [this](int state) {SetSourceControlEnabledState(state); });
+    }
+    else
+    {
+        SetIcon(m_scIconDisabled);
+        SetToolTip(tr("No source control provided"));
+    }
+    SetText("P4V");
+}
+
+void SourceControlItem::SetSourceControlEnabledState(bool state)
+{
+    using SCRequest = AzToolsFramework::SourceControlConnectionRequestBus;
+    SCRequest::Broadcast(&SCRequest::Events::EnableSourceControl, state);
+    m_menu->hide();
+}
+
+void SourceControlItem::UpdateMenuItems()
+{
+    QString toolTip;
+    bool disabled = false;
+    bool errorIcon = false;
+
+    switch (m_SourceControlState)
+    {
+    case AzToolsFramework::SourceControlState::Disabled:
+        toolTip = tr("Perforce disabled");
+        disabled = true;
+        errorIcon = true;
+        break;
+    case AzToolsFramework::SourceControlState::ConfigurationInvalid:
+        errorIcon = true;
+        toolTip = tr("Perforce configuration invalid");
+        break;
+    case AzToolsFramework::SourceControlState::Active:
+        toolTip = tr("Perforce connected");
+        break;
+    }
+
+    m_settingsAction->setEnabled(!disabled);
+    m_checkBox->setChecked(!disabled);
+    m_checkBox->setText(disabled ? tr("Status: Offline") : tr("Status: Online"));
+    SetIcon(errorIcon ? disabled ? m_scIconDisabled : m_scIconWarning : m_scIconOk);
+    SetToolTip(toolTip);
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+MemoryStatusItem::MemoryStatusItem(QString name, MainStatusBar* parent)
+    : StatusBarItem(name, parent)
+{
+    connect(parent, &MainStatusBar::requestStatusUpdate, this, &MemoryStatusItem::updateStatus);
+    SetToolTip(tr("Memory usage"));
+}
+
+MemoryStatusItem::~MemoryStatusItem()
+{
+}
+
+void MemoryStatusItem::updateStatus()
+{
+    ProcessMemInfo mi;
+    CProcessInfo::QueryMemInfo(mi);
+
+    uint64 nSizeMb = (uint64)(mi.WorkingSet / (1024 * 1024));
+
+    SetText(QString("%1 Mb").arg(nSizeMb));
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+GeneralStatusItem::GeneralStatusItem(QString name, MainStatusBar* parent)
+    : StatusBarItem(name, parent)
+{
+    connect(parent, SIGNAL(messageChanged(QString)), this, SLOT(update()));
+}
+
+QString GeneralStatusItem::CurrentText() const
+{
+    if (!StatusBar()->currentMessage().isEmpty())
+    {
+        return StatusBar()->currentMessage();
+    }
+
+    return StatusBarItem::CurrentText();
+}
+
+#include <moc_MainStatusBar.cpp>
+#include <moc_MainStatusBarItems.cpp>
diff --git a/Code/Editor/MainStatusBar.h b/Code/Editor/MainStatusBar.h
new file mode 100644
index 0000000000..f04c7ecfeb
--- /dev/null
+++ b/Code/Editor/MainStatusBar.h
@@ -0,0 +1,86 @@
+/*
+ * 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_MAINSTATUSBAR_H
+#define CRYINCLUDE_EDITOR_MAINSTATUSBAR_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "ISourceControl.h"
+#include <QStatusBar>
+#include <QWidget>
+#include <QIcon>
+#endif
+
+class MainStatusBar;
+class QLabel;
+class QString;
+class QPixmap;
+class QTimerEvent;
+class QMenu;
+class QAction;
+
+
+class StatusBarItem
+    : public QWidget
+{
+    Q_OBJECT
+    Q_PROPERTY(bool clickable MEMBER m_isClickable)
+
+public:
+    StatusBarItem(const QString& name, MainStatusBar* parent, bool hasLeadingSpacer = false);
+    StatusBarItem(const QString& name, bool isClickable, MainStatusBar* parent, bool hasLeadingSpacer = false);
+
+    void SetText(const QString& text);
+    void SetIcon(const QPixmap& icon);
+    void SetIcon(const QIcon& icon);
+    void SetToolTip(const QString& tip);
+
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
+
+signals:
+    void clicked();
+
+protected:
+    void mousePressEvent(QMouseEvent* me) override;
+    void paintEvent(QPaintEvent* pe) override;
+
+    virtual QString CurrentText() const;
+    MainStatusBar* StatusBar() const;
+
+private:
+    QIcon m_icon;
+    QString m_text;
+    bool m_isClickable;
+    bool m_hasLeadingSpacer;
+};
+
+class MainStatusBar
+    : public QStatusBar
+    , public IMainStatusBar
+{
+    Q_OBJECT
+public:
+    MainStatusBar(QWidget* parent = nullptr);
+
+    //implement IMainStatusBar interface
+    void SetStatusText(const QString& text) override;
+    QWidget* SetItem(QString indicatorName, QString text, QString tip, int iconId) override;
+    QWidget* GetItem(QString indicatorName) override;
+
+    QWidget* SetItem(QString indicatorName, QString text, QString tip, const QPixmap& icon) override;
+
+    void Init();
+
+signals:
+    void requestStatusUpdate();
+};
+
+
+#endif // CRYINCLUDE_EDITOR_MAINSTATUSBAR_H
diff --git a/Code/Editor/MainStatusBarItems.h b/Code/Editor/MainStatusBarItems.h
new file mode 100644
index 0000000000..91d7aac048
--- /dev/null
+++ b/Code/Editor/MainStatusBarItems.h
@@ -0,0 +1,72 @@
+/*
+ * 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 <MainStatusBar.h>
+#include <IRenderer.h>
+#include <QMutex>
+#include <QString>
+#include <QSet>
+
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
+
+class GeneralStatusItem
+    : public StatusBarItem
+{
+    Q_OBJECT
+public:
+    GeneralStatusItem(QString name, MainStatusBar* parent);
+
+protected:
+    QString CurrentText() const override;
+};
+
+
+class SourceControlItem
+    : public StatusBarItem
+    , private AzToolsFramework::SourceControlNotificationBus::Handler
+{
+    Q_OBJECT
+public:
+    SourceControlItem(QString name, MainStatusBar* parent);
+    ~SourceControlItem();
+
+    void ConnectivityStateChanged(const AzToolsFramework::SourceControlState state) override;
+
+private:
+    void InitMenu();
+    void UpdateMenuItems();
+    void SetSourceControlEnabledState(bool state);
+    void UpdateAndShowMenu();
+    
+private:
+    std::unique_ptr<QMenu> m_menu;
+    QAction* m_settingsAction;
+    QWidgetAction* m_enableAction;
+    QCheckBox* m_checkBox;
+
+    QIcon m_scIconOk;
+    QIcon m_scIconError;
+    QIcon m_scIconWarning;
+    QIcon m_scIconDisabled;
+    bool m_sourceControlAvailable;
+    AzToolsFramework::SourceControlState m_SourceControlState; 
+};
+
+
+class MemoryStatusItem
+    : public StatusBarItem
+{
+    Q_OBJECT
+public:
+    MemoryStatusItem(QString name, MainStatusBar* parent);
+    ~MemoryStatusItem();
+
+private:
+    void updateStatus();
+};
diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp
new file mode 100644
index 0000000000..261fab48d1
--- /dev/null
+++ b/Code/Editor/MainWindow.cpp
@@ -0,0 +1,1994 @@
+/*
+ * 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 "MainWindow.h"
+
+#include <algorithm>
+
+// AWs Native SDK
+AZ_PUSH_DISABLE_WARNING(4251 4355 4996, "-Wunknown-warning-option")
+#include <aws/core/auth/AWSCredentialsProvider.h>
+AZ_POP_DISABLE_WARNING
+
+// Qt
+#include <QMenuBar>
+#include <QDebug>
+#include <QMessageBox>
+#include <QInputDialog>
+#include <QHBoxLayout>
+#ifdef Q_OS_WIN
+#include <QAbstractEventDispatcher>
+#endif
+
+// AzCore
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Utils/Utils.h>
+
+// AzFramework
+#include <AzFramework/API/ApplicationAPI.h>
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
+#include <AzFramework/Network/SocketConnection.h>
+#include <AzFramework/Asset/AssetSystemComponent.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/Application/Ticker.h>
+#include <AzToolsFramework/API/EditorAnimationSystemRequestBus.h>
+#include <AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.h>
+#include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
+
+// AzQtComponents
+#include <AzQtComponents/Buses/ShortcutDispatch.h>
+#include <AzQtComponents/Components/DockMainWindow.h>
+#include <AzQtComponents/Components/Widgets/SpinBox.h>
+#include <AzQtComponents/Components/Style.h>
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+#include <AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h>
+
+// Editor
+#include "Resource.h"
+#include "Core/LevelEditorMenuHandler.h"
+#include "ShortcutDispatcher.h"
+#include "LayoutWnd.h"
+#include "AssetImporter/AssetImporterManager/AssetImporterManager.h"
+#include "AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h"
+#include "CryEdit.h"
+#include "Controls/ConsoleSCB.h"
+#include "ViewManager.h"
+#include "CryEditDoc.h"
+#include "ToolBox.h"
+#include "LevelIndependentFileMan.h"
+#include "GameEngine.h"
+#include "MainStatusBar.h"
+#include "ToolbarCustomizationDialog.h"
+#include "ToolbarManager.h"
+#include "Core/QtEditorApplication.h"
+#include "UndoDropDown.h"
+#include "CVarMenu.h"
+#include "EditorViewportSettings.h"
+
+#include "KeyboardCustomizationSettings.h"
+#include "CustomizeKeyboardDialog.h"
+#include "QtViewPaneManager.h"
+#include "ViewPane.h"
+#include "Include/IObjectManager.h"
+#include "Include/Command.h"
+#include "Commands/CommandManager.h"
+#include "SettingsManagerDialog.h"
+
+#include "TrackView/TrackViewDialog.h"
+#include "ErrorReportDialog.h"
+
+#include "Dialogs/PythonScriptsDialog.h"
+
+#include "AzAssetBrowser/AzAssetBrowserWindow.h"
+#include "AssetEditor/AssetEditorWindow.h"
+#include "ActionManager.h"
+
+using namespace AZ;
+using namespace AzQtComponents;
+using namespace AzToolsFramework;
+
+#define LAYOUTS_PATH "Editor\\Layouts\\"
+#define LAYOUTS_EXTENSION ".layout"
+#define LAYOUTS_WILDCARD "*.layout"
+#define DUMMY_LAYOUT_NAME "Dummy_Layout"
+
+static const char* g_openViewPaneEventName = "OpenViewPaneEvent"; //Sent when users open view panes;
+static const char* g_viewPaneAttributeName = "ViewPaneName"; //Name of the current view pane
+static const char* g_openLocationAttributeName = "OpenLocation"; //Indicates where the current view pane is opened from
+
+static const char* g_assetImporterName = "AssetImporter";
+
+class CEditorOpenViewCommand
+    : public _i_reference_target_t
+{
+    QString m_className;
+public:
+    CEditorOpenViewCommand(IEditor* pEditor, const QString& className)
+        : m_pEditor(pEditor)
+        , m_className(className)
+    {
+        assert(m_pEditor);
+    }
+    void Execute()
+    {
+        // Create browse mode for this category.
+        m_pEditor->OpenView(m_className);
+    }
+
+private:
+    IEditor* m_pEditor;
+};
+
+namespace
+{
+    // The purpose of this vector is just holding shared pointers, so CEditorOpenViewCommand dtors are called at exit
+    std::vector<_smart_ptr<CEditorOpenViewCommand> > s_openViewCmds;
+}
+
+class EngineConnectionListener
+    : public AzFramework::EngineConnectionEvents::Bus::Handler
+    , public AzFramework::AssetSystemInfoBus::Handler
+{
+public:
+    using EConnectionState = AzFramework::SocketConnection::EConnectionState;
+
+public:
+    EngineConnectionListener()
+        : m_state(EConnectionState::Disconnected)
+    {
+        AzFramework::EngineConnectionEvents::Bus::Handler::BusConnect();
+        AzFramework::AssetSystemInfoBus::Handler::BusConnect();
+
+        AzFramework::SocketConnection* engineConnection = AzFramework::SocketConnection::GetInstance();
+        if (engineConnection)
+        {
+            m_state = engineConnection->GetConnectionState();
+        }
+    }
+
+    ~EngineConnectionListener()
+    {
+        AzFramework::AssetSystemInfoBus::Handler::BusDisconnect();
+        AzFramework::EngineConnectionEvents::Bus::Handler::BusDisconnect();
+    }
+
+public:
+    virtual void Connected([[maybe_unused]] AzFramework::SocketConnection* connection)
+    {
+        m_state = EConnectionState::Connected;
+    }
+    virtual void Connecting([[maybe_unused]] AzFramework::SocketConnection* connection)
+    {
+        m_state = EConnectionState::Connecting;
+    }
+    virtual void Listening([[maybe_unused]] AzFramework::SocketConnection* connection)
+    {
+        m_state = EConnectionState::Listening;
+    }
+    virtual void Disconnecting([[maybe_unused]] AzFramework::SocketConnection* connection)
+    {
+        m_state = EConnectionState::Disconnecting;
+    }
+    virtual void Disconnected([[maybe_unused]] AzFramework::SocketConnection* connection)
+    {
+        m_state = EConnectionState::Disconnected;
+    }
+
+    virtual void AssetCompilationSuccess(const AZStd::string& assetPath) override
+    {
+        m_lastAssetProcessorTask = assetPath;
+    }
+
+    virtual void AssetCompilationFailed(const AZStd::string& assetPath) override
+    {
+        m_failedJobs.insert(assetPath);
+    }
+
+    virtual void CountOfAssetsInQueue(const int& count) override
+    {
+        m_pendingJobsCount = count;
+    }
+
+    int GetJobsCount() const
+    {
+        return m_pendingJobsCount;
+    }
+
+    AZStd::set<AZStd::string> FailedJobsList() const
+    {
+        return m_failedJobs;
+    }
+
+    AZStd::string LastAssetProcessorTask() const
+    {
+        return m_lastAssetProcessorTask;
+    }
+
+public:
+    EConnectionState GetState() const
+    {
+        return m_state;
+    }
+
+private:
+    EConnectionState m_state;
+    int m_pendingJobsCount = 0;
+    AZStd::set<AZStd::string> m_failedJobs;
+    AZStd::string m_lastAssetProcessorTask;
+};
+
+namespace
+{
+    void PyOpenViewPane(const char* viewClassName)
+    {
+        QtViewPaneManager::instance()->OpenPane(viewClassName);
+    }
+
+    void PyCloseViewPane(const char* viewClassName)
+    {
+        QtViewPaneManager::instance()->ClosePane(viewClassName);
+    }
+
+    bool PyIsViewPaneVisible(const char* viewClassName)
+    {
+        return QtViewPaneManager::instance()->IsVisible(viewClassName);
+    }
+
+    AZStd::vector<AZStd::string> PyGetViewPaneNames()
+    {
+        const QtViewPanes panes = QtViewPaneManager::instance()->GetRegisteredPanes();
+
+        AZStd::vector<AZStd::string> names;
+        names.reserve(panes.size());
+
+        AZStd::transform(panes.begin(), panes.end(), AZStd::back_inserter(names), [](const QtViewPane& pane)
+        {
+            return AZStd::string(pane.m_name.toUtf8().constData());
+        });
+
+        return names;
+    }
+
+    void PyExit()
+    {
+        // Adding a single-shot QTimer to PyExit delays the QApplication::closeAllWindows call until
+        // all the events in the event queue have been processed. Calling QApplication::closeAllWindows instead
+        // of MainWindow::close ensures the Metal render window is cleaned up on macOS.
+        QTimer::singleShot(0, qApp, &QApplication::closeAllWindows);
+    }
+
+    void PyExitNoPrompt()
+    {
+        // Set the level to "unmodified" so that it doesn't prompt to save on exit.
+        GetIEditor()->GetDocument()->SetModifiedFlag(false);
+        PyExit();
+    }
+
+    void PyReportTest(bool success, const AZStd::string& output)
+    {
+        CCryEditApp::instance()->PrintAlways(output);
+        if (!success)
+        {
+            gEnv->retCode = 0xF; // Special error code indicating a failure in tests
+        }
+        PyExitNoPrompt();
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// MainWindow
+/////////////////////////////////////////////////////////////////////////////
+MainWindow* MainWindow::m_instance = nullptr;
+
+MainWindow::MainWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , m_oldMainFrame(nullptr)
+    , m_viewPaneManager(QtViewPaneManager::instance())
+    , m_shortcutDispatcher(new ShortcutDispatcher(this))
+    , m_actionManager(new ActionManager(this, QtViewPaneManager::instance(), m_shortcutDispatcher))
+    , m_undoStateAdapter(new UndoStackStateAdapter(this))
+    , m_keyboardCustomization(nullptr)
+    , m_activeView(nullptr)
+    , m_settings("O3DE", "O3DE") 
+    , m_toolbarManager(new ToolbarManager(m_actionManager, this))
+    , m_assetImporterManager(new AssetImporterManager(this))
+    , m_levelEditorMenuHandler(new LevelEditorMenuHandler(this, m_viewPaneManager, m_settings))
+    , m_sourceControlNotifHandler(new AzToolsFramework::QtSourceControlNotificationHandler(this))
+    , m_viewPaneHost(nullptr)
+    , m_autoSaveTimer(nullptr)
+    , m_autoRemindTimer(nullptr)
+    , m_backgroundUpdateTimer(nullptr)
+    , m_connectionLostTimer(new QTimer(this))
+{
+    setObjectName("MainWindow"); // For IEditor::GetEditorMainWindow to work in plugins, where we can't link against MainWindow::instance()
+    m_instance = this;
+
+    //for new docking, create a DockMainWindow to host dock widgets so we can call QMainWindow::restoreState to restore docks without affecting our main toolbars.
+    m_viewPaneHost = new AzQtComponents::DockMainWindow();
+
+    m_viewPaneHost->setDockOptions(QMainWindow::GroupedDragging | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
+
+    m_connectionListener = AZStd::make_shared<EngineConnectionListener>();
+    QObject::connect(m_connectionLostTimer, &QTimer::timeout, this, &MainWindow::ShowConnectionDisconnectedDialog);
+
+    setStatusBar(new MainStatusBar(this));
+
+    setAttribute(Qt::WA_DeleteOnClose, true);
+
+    connect(m_viewPaneManager, &QtViewPaneManager::viewPaneCreated, this, &MainWindow::OnViewPaneCreated);
+    GetIEditor()->RegisterNotifyListener(this);
+
+    AssetImporterDragAndDropHandler* assetImporterDragAndDropHandler = new AssetImporterDragAndDropHandler(this, m_assetImporterManager);
+    connect(assetImporterDragAndDropHandler, &AssetImporterDragAndDropHandler::OpenAssetImporterManager, this, &MainWindow::OnOpenAssetImporterManager);
+
+    connect(m_levelEditorMenuHandler, &LevelEditorMenuHandler::ActivateAssetImporter, this, [this]() {
+        m_assetImporterManager->Exec();
+    });
+
+    setFocusPolicy(Qt::StrongFocus);
+
+    setAcceptDrops(true);
+
+    // special handling for escape key (outside ActionManager)
+    auto* escapeAction = new QAction(this);
+    escapeAction->setShortcut(QKeySequence(Qt::Key_Escape));
+    addAction(escapeAction);
+    connect(escapeAction, &QAction::triggered, this, &MainWindow::OnEscapeAction);
+
+    const QSize minSize(800, 600);
+    if (size().height() < minSize.height() || size().width() < minSize.width())
+    {
+        resize(size().expandedTo(minSize));
+    }
+}
+
+void MainWindow::SystemTick()
+{
+    AZ::ComponentApplication* componentApplication = nullptr;
+    EBUS_EVENT_RESULT(componentApplication, AZ::ComponentApplicationBus, GetApplication);
+    if (componentApplication)
+    {
+        componentApplication->TickSystem();
+    }
+}
+
+#ifdef Q_OS_WIN
+HWND MainWindow::GetNativeHandle()
+{
+    // if the parent widget is set, it's a window decoration wrapper
+    // we use that instead, to ensure we're in lock step the code in CryEdit.cpp when it calls
+    // InitGameSystem
+    if (parentWidget() != nullptr)
+    {
+        assert(qobject_cast<AzQtComponents::WindowDecorationWrapper*>(parentWidget()));
+        return QtUtil::getNativeHandle(parentWidget());
+    }
+
+    return QtUtil::getNativeHandle(this);
+}
+#endif // #ifdef Q_OS_WIN
+
+void MainWindow::OnOpenAssetImporterManager(const QStringList& dragAndDropFileList)
+{
+    m_assetImporterManager->Exec(dragAndDropFileList);
+}
+
+CLayoutWnd* MainWindow::GetLayout() const
+{
+    return m_pLayoutWnd;
+}
+
+CLayoutViewPane* MainWindow::GetActiveView() const
+{
+    return m_activeView;
+}
+
+QtViewport* MainWindow::GetActiveViewport() const
+{
+    return m_activeView ? qobject_cast<QtViewport*>(m_activeView->GetViewport()) : nullptr;
+}
+
+void MainWindow::SetActiveView(CLayoutViewPane* v)
+{
+    m_activeView = v;
+}
+
+MainWindow::~MainWindow()
+{
+    AzToolsFramework::SourceControlNotificationBus::Handler::BusDisconnect();
+
+    delete m_toolbarManager;
+    m_connectionListener.reset();
+    GetIEditor()->UnregisterNotifyListener(this);
+
+    // tear down the ActionOverride (clear the overrideWidget's parent)
+    ActionOverrideRequestBus::Event(
+        GetEntityContextId(), &ActionOverrideRequests::TeardownActionOverrideHandler);
+
+    m_instance = nullptr;
+}
+
+void MainWindow::InitCentralWidget()
+{
+    m_pLayoutWnd = new CLayoutWnd(&m_settings);
+
+    // Set the central widgets before calling CreateLayout to avoid reparenting everything later
+    setCentralWidget(m_viewPaneHost);
+    m_viewPaneHost->setCentralWidget(m_pLayoutWnd);
+
+    if (MainWindow::instance()->IsPreview())
+    {
+        m_pLayoutWnd->CreateLayout(ET_Layout0, true, ET_ViewportModel);
+    }
+    else
+    {
+        if (!m_pLayoutWnd->LoadConfig())
+        {
+            m_pLayoutWnd->CreateLayout(ET_Layout0);
+        }
+    }
+
+    // make sure the layout wnd knows to reset it's layout and settings
+    connect(m_viewPaneManager, &QtViewPaneManager::layoutReset, m_pLayoutWnd, &CLayoutWnd::ResetLayout);
+
+    EBUS_EVENT(AzToolsFramework::EditorEvents::Bus, NotifyCentralWidgetInitialized);
+}
+
+void MainWindow::Initialize()
+{
+    m_viewPaneManager->SetMainWindow(m_viewPaneHost, &m_settings, /*unused*/ QByteArray());
+
+    RegisterStdViewClasses();
+    InitCentralWidget();
+
+    InitActions();
+
+    // load toolbars ("shelves") and macros
+    GetIEditor()->GetToolBoxManager()->Load(m_actionManager);
+
+    InitToolActionHandlers();
+
+    // Initialize toolbars before we setup the menu so that any tools can be added to the toolbar as needed
+    InitToolBars();
+
+    m_levelEditorMenuHandler->Initialize();
+
+    InitStatusBar();
+
+    AzToolsFramework::SourceControlNotificationBus::Handler::BusConnect();
+    m_sourceControlNotifHandler->Init();
+
+    m_keyboardCustomization = new KeyboardCustomizationSettings(QStringLiteral("Main Window"), this);
+
+    if (!IsPreview())
+    {
+        RegisterOpenWndCommands();
+    }
+
+    ResetBackgroundUpdateTimer();
+
+    ICVar* pBackgroundUpdatePeriod = gEnv->pConsole->GetCVar("ed_backgroundUpdatePeriod");
+    if (pBackgroundUpdatePeriod)
+    {
+        pBackgroundUpdatePeriod->SetOnChangeCallback([](ICVar*) {
+            MainWindow::instance()->ResetBackgroundUpdateTimer();
+        });
+    }
+
+    // setup the ActionOverride (set overrideWidgets parent to be the MainWindow)
+    ActionOverrideRequestBus::Event(
+        GetEntityContextId(), &ActionOverrideRequests::SetupActionOverrideHandler, this);
+
+    AzToolsFramework::EditorEventsBus::Broadcast(&AzToolsFramework::EditorEvents::NotifyMainWindowInitialized, this);
+}
+
+void MainWindow::InitStatusBar()
+{
+    StatusBar()->Init();
+    connect(qobject_cast<StatusBarItem*>(StatusBar()->GetItem("connection")), &StatusBarItem::clicked, this, &MainWindow::OnConnectionStatusClicked);
+    connect(StatusBar(), &MainStatusBar::requestStatusUpdate, this, &MainWindow::OnUpdateConnectionStatus);
+}
+
+
+CMainFrame* MainWindow::GetOldMainFrame() const
+{
+    return m_oldMainFrame;
+}
+
+MainWindow* MainWindow::instance()
+{
+    return m_instance;
+}
+
+void MainWindow::closeEvent(QCloseEvent* event)
+{
+    gSettings.Save();
+
+    AzFramework::SystemCursorState currentCursorState;
+    bool isInGameMode = false;
+    if (GetIEditor()->IsInGameMode())
+    {
+        isInGameMode = true;
+        // Storecurrent state in case we need to restore Game Mode.
+        AzFramework::InputSystemCursorRequestBus::EventResult(currentCursorState, AzFramework::InputDeviceMouse::Id,
+            &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
+        // make sure the mouse is turned on before popping up any dialog boxes.
+        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+            AzFramework::SystemCursorState::UnconstrainedAndVisible);
+    }
+    if (GetIEditor()->GetDocument() && !GetIEditor()->GetDocument()->CanCloseFrame())
+    {
+        if (isInGameMode)
+        {
+            // make sure the mouse is turned back off if returning to the game.
+            AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+                &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+                currentCursorState);
+        }
+        event->ignore();
+        return;
+    }
+
+    KeyboardCustomizationSettings::EnableShortcutsGlobally(true);
+    SaveConfig();
+
+    // Some of the panes may ask for confirmation to save changes before closing.
+    if (!QtViewPaneManager::instance()->ClosePanesWithRollback(QVector<QString>()) ||
+        !GetIEditor() ||
+        !GetIEditor()->GetLevelIndependentFileMan()->PromptChangedFiles())
+    {
+        if (isInGameMode)
+        {
+            // make sure the mouse is turned back off if returning to the game.
+            AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+                &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+                currentCursorState);
+
+        }
+        event->ignore();
+        return;
+    }
+
+    Editor::EditorQtApplication::instance()->EnableOnIdle(false);
+
+    if (GetIEditor()->GetDocument())
+    {
+        GetIEditor()->GetDocument()->SetModifiedFlag(FALSE);
+        GetIEditor()->GetDocument()->SetModifiedModules(eModifiedNothing);
+    }
+    // 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(0, QEvent::DeferredDelete);
+
+    QMainWindow::closeEvent(event);
+}
+
+void MainWindow::SaveConfig()
+{
+    m_settings.setValue("mainWindowState", saveState());
+    QtViewPaneManager::instance()->SaveLayout();
+    if (m_pLayoutWnd)
+    {
+        m_pLayoutWnd->SaveConfig();
+    }
+    GetIEditor()->GetToolBoxManager()->Save();
+}
+
+void MainWindow::ShowKeyboardCustomization()
+{
+    CustomizeKeyboardDialog dialog(*m_keyboardCustomization, this);
+    dialog.exec();
+}
+
+void MainWindow::ExportKeyboardShortcuts()
+{
+    KeyboardCustomizationSettings::ExportToFile(this);
+}
+
+void MainWindow::ImportKeyboardShortcuts()
+{
+    KeyboardCustomizationSettings::ImportFromFile(this);
+    KeyboardCustomizationSettings::SaveGlobally();
+}
+
+void MainWindow::InitActions()
+{
+    auto am = m_actionManager;
+    auto cryEdit = CCryEditApp::instance();
+    cryEdit->RegisterActionHandlers();
+
+    am->AddAction(ID_TOOLBAR_SEPARATOR, QString());
+
+    am->AddAction(ID_TOOLBAR_WIDGET_UNDO, QString());
+    am->AddAction(ID_TOOLBAR_WIDGET_REDO, QString());
+    am->AddAction(ID_TOOLBAR_WIDGET_SNAP_ANGLE, QString());
+    am->AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, QString());
+    am->AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, QString());
+
+    // File actions
+    am->AddAction(ID_FILE_NEW, tr("New Level"))
+        .SetShortcut(tr("Ctrl+N"))
+        .Connect(&QAction::triggered, [cryEdit]()
+        {
+            cryEdit->OnCreateLevel();
+        })
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateNewLevel);
+    am->AddAction(ID_FILE_OPEN_LEVEL, tr("Open Level..."))
+        .SetShortcut(tr("Ctrl+O"))
+        .SetStatusTip(tr("Open an existing level"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateFileOpen);
+#ifdef ENABLE_SLICE_EDITOR
+    am->AddAction(ID_FILE_NEW_SLICE, tr("New Slice"))
+        .SetStatusTip(tr("Create a new slice"));
+    am->AddAction(ID_FILE_OPEN_SLICE, tr("Open Slice..."))
+        .SetStatusTip(tr("Open an existing slice"));
+#endif
+    am->AddAction(ID_FILE_SAVE_SELECTED_SLICE, tr("Save selected slice")).SetShortcut(tr("Alt+S"))
+        .SetStatusTip(tr("Save the selected slice to the first level root"));
+    am->AddAction(ID_FILE_SAVE_SLICE_TO_ROOT, tr("Save Slice to root")).SetShortcut(tr("Ctrl+Alt+S"))
+        .SetStatusTip(tr("Save the selected slice to the top level root"));
+    am->AddAction(ID_FILE_SAVE_LEVEL, tr("&Save"))
+        .SetShortcut(tr("Ctrl+S"))
+        .SetReserved()
+        .SetStatusTip(tr("Save the current level"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateDocumentReady);
+    am->AddAction(ID_FILE_SAVE_AS, tr("Save &As..."))
+        .SetShortcut(tr("Ctrl+Shift+S"))
+        .SetReserved()
+        .SetStatusTip(tr("Save the active document with a new name"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateDocumentReady);
+    am->AddAction(ID_FILE_SAVELEVELRESOURCES, tr("Save Level Resources..."))
+        .SetStatusTip(tr("Save Resources"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateDocumentReady);
+    am->AddAction(ID_IMPORT_ASSET, tr("Import &FBX..."));
+
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+    if (!usePrefabSystemForLevels)
+    {
+        am->AddAction(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE, tr("&Export to Engine"))
+            .SetShortcut(tr("Ctrl+E"))
+            .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateDocumentReady);
+    }
+
+    am->AddAction(ID_FILE_EXPORT_SELECTEDOBJECTS, tr("Export Selected &Objects"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
+    am->AddAction(ID_FILE_EXPORTOCCLUSIONMESH, tr("Export Occlusion Mesh"));
+    am->AddAction(ID_FILE_EDITLOGFILE, tr("Show Log File"));
+    am->AddAction(ID_FILE_RESAVESLICES, tr("Resave All Slices"));
+    am->AddAction(ID_FILE_PROJECT_MANAGER_SETTINGS, tr("Edit Project Settings..."));
+    am->AddAction(ID_FILE_PROJECT_MANAGER_NEW, tr("New Project..."));
+    am->AddAction(ID_FILE_PROJECT_MANAGER_OPEN, tr("Open Project..."));
+    am->AddAction(ID_GAME_PC_ENABLEVERYHIGHSPEC, tr("Very High")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_PC_ENABLEHIGHSPEC, tr("High")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_PC_ENABLEMEDIUMSPEC, tr("Medium")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_PC_ENABLELOWSPEC, tr("Low")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC, tr("Very High")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_OSXMETAL_ENABLEHIGHSPEC, tr("High")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC, tr("Medium")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_OSXMETAL_ENABLELOWSPEC, tr("Low")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_ANDROID_ENABLEVERYHIGHSPEC, tr("Very High")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_ANDROID_ENABLEHIGHSPEC, tr("High")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_ANDROID_ENABLEMEDIUMSPEC, tr("Medium")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_ANDROID_ENABLELOWSPEC, tr("Low")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_IOS_ENABLEVERYHIGHSPEC, tr("Very High")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_IOS_ENABLEHIGHSPEC, tr("High")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_IOS_ENABLEMEDIUMSPEC, tr("Medium")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+    am->AddAction(ID_GAME_IOS_ENABLELOWSPEC, tr("Low")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
+#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
+#if defined(TOOLS_SUPPORT_JASPER)
+#include AZ_RESTRICTED_FILE_EXPLICIT(MainWindow_cpp, jasper)
+#endif
+#if defined(TOOLS_SUPPORT_PROVO)
+#include AZ_RESTRICTED_FILE_EXPLICIT(MainWindow_cpp, provo)
+#endif
+#if defined(TOOLS_SUPPORT_SALEM)
+#include AZ_RESTRICTED_FILE_EXPLICIT(MainWindow_cpp, salem)
+#endif
+#endif
+    am->AddAction(ID_TOOLS_CUSTOMIZEKEYBOARD, tr("Customize &Keyboard..."))
+        .Connect(&QAction::triggered, this, &MainWindow::ShowKeyboardCustomization);
+    am->AddAction(ID_TOOLS_EXPORT_SHORTCUTS, tr("&Export Keyboard Settings..."))
+        .Connect(&QAction::triggered, this, &MainWindow::ExportKeyboardShortcuts);
+    am->AddAction(ID_TOOLS_IMPORT_SHORTCUTS, tr("&Import Keyboard Settings..."))
+        .Connect(&QAction::triggered, this, &MainWindow::ImportKeyboardShortcuts);
+    am->AddAction(ID_TOOLS_PREFERENCES, tr("Global Preferences..."));
+    am->AddAction(ID_GRAPHICS_SETTINGS, tr("&Graphics Settings..."));
+
+    for (int i = ID_FILE_MRU_FIRST; i <= ID_FILE_MRU_LAST; ++i)
+    {
+        am->AddAction(i, QString());
+    }
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    const QString appExitText = tr("&Quit");
+#else
+    const QString appExitText = tr("E&xit");
+#endif
+
+    am->AddAction(ID_APP_EXIT, appExitText)
+        .SetReserved();
+
+    // Edit actions
+    am->AddAction(ID_UNDO, tr("&Undo"))
+        .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);
+
+    am->AddAction(ID_EDIT_HOLD, tr("&Hold"))
+        .SetShortcut(tr("Ctrl+Alt+H"))
+        .SetToolTip(tr("&Hold (Ctrl+Alt+H)"))
+        .SetStatusTip(tr("Save the current state(Hold)"));
+    am->AddAction(ID_EDIT_FETCH, tr("&Fetch"))
+        .SetShortcut(tr("Ctrl+Alt+F"))
+        .SetToolTip(tr("&Fetch (Ctrl+Alt+F)"))
+        .SetStatusTip(tr("Restore saved state (Fetch)"));
+
+    // Modify actions
+    am->AddAction(ID_EDITMODE_MOVE, tr("Move"))
+        .SetIcon(Style::icon("Move"))
+        .SetApplyHoverEffect()
+        .SetShortcut(tr("1"))
+        .SetToolTip(tr("Move (1)"))
+        .SetCheckable(true)
+        .SetStatusTip(tr("Select and move selected object(s)"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeMove);
+    am->AddAction(ID_EDITMODE_ROTATE, tr("Rotate"))
+        .SetIcon(Style::icon("Translate"))
+        .SetApplyHoverEffect()
+        .SetShortcut(tr("2"))
+        .SetToolTip(tr("Rotate (2)"))
+        .SetCheckable(true)
+        .SetStatusTip(tr("Select and rotate selected object(s)"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeRotate);
+    am->AddAction(ID_EDITMODE_SCALE, tr("Scale"))
+        .SetIcon(Style::icon("Scale"))
+        .SetApplyHoverEffect()
+        .SetShortcut(tr("3"))
+        .SetToolTip(tr("Scale (3)"))
+        .SetCheckable(true)
+        .SetStatusTip(tr("Select and scale selected object(s)"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeScale);
+
+    am->AddAction(ID_SNAP_TO_GRID, tr("Snap to grid"))
+        .SetIcon(Style::icon("Grid"))
+        .SetApplyHoverEffect()
+        .SetShortcut(tr("G"))
+        .SetToolTip(tr("Snap to grid (G)"))
+        .SetStatusTip(tr("Toggles snap to grid"))
+        .SetCheckable(true)
+        .RegisterUpdateCallback([](QAction* action) {
+            Q_ASSERT(action->isCheckable());
+            action->setChecked(SandboxEditor::GridSnappingEnabled());
+        })
+        .Connect(&QAction::triggered, []() { SandboxEditor::SetGridSnapping(!SandboxEditor::GridSnappingEnabled()); });
+
+    am->AddAction(ID_SNAPANGLE, tr("Snap angle"))
+        .SetIcon(Style::icon("Angle"))
+        .SetApplyHoverEffect()
+        .SetStatusTip(tr("Snap angle"))
+        .SetCheckable(true)
+        .RegisterUpdateCallback([](QAction* action) {
+            Q_ASSERT(action->isCheckable());
+            action->setChecked(SandboxEditor::AngleSnappingEnabled());
+        })
+        .Connect(&QAction::triggered, []() { SandboxEditor::SetAngleSnapping(!SandboxEditor::AngleSnappingEnabled()); });
+
+    // Display actions
+    am->AddAction(ID_SWITCHCAMERA_DEFAULTCAMERA, tr("Default Camera")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSwitchToDefaultCamera);
+    am->AddAction(ID_SWITCHCAMERA_SEQUENCECAMERA, tr("Sequence Camera")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSwitchToSequenceCamera);
+    am->AddAction(ID_SWITCHCAMERA_SELECTEDCAMERA, tr("Selected Camera Object")).SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSwitchToSelectedCamera);
+    am->AddAction(ID_SWITCHCAMERA_NEXT, tr("Cycle Camera"))
+        .SetShortcut(tr("Ctrl+`"))
+        .SetToolTip(tr("Cycle Camera (Ctrl+`)"));
+    am->AddAction(ID_DISPLAY_GOTOPOSITION, tr("Go to Position..."));
+    am->AddAction(ID_MODIFY_GOTO_SELECTION, tr("Center on Selection"))
+        .SetShortcut(tr("Z"))
+        .SetToolTip(tr("Center on Selection (Z)"))
+        .Connect(&QAction::triggered, this, &MainWindow::OnGotoSelected);
+    am->AddAction(ID_GOTO_LOC1, tr("Location 1"))
+        .SetShortcut(tr("Shift+F1"))
+        .SetToolTip(tr("Location 1 (Shift+F1)"));
+    am->AddAction(ID_GOTO_LOC2, tr("Location 2"))
+        .SetShortcut(tr("Shift+F2"))
+        .SetToolTip(tr("Location 2 (Shift+F2)"));
+    am->AddAction(ID_GOTO_LOC3, tr("Location 3"))
+        .SetShortcut(tr("Shift+F3"))
+        .SetToolTip(tr("Location 3 (Shift+F3)"));
+    am->AddAction(ID_GOTO_LOC4, tr("Location 4"))
+        .SetShortcut(tr("Shift+F4"))
+        .SetToolTip(tr("Location 4 (Shift+F4)"));
+    am->AddAction(ID_GOTO_LOC5, tr("Location 5"))
+        .SetShortcut(tr("Shift+F5"))
+        .SetToolTip(tr("Location 5 (Shift+F5)"));
+    am->AddAction(ID_GOTO_LOC6, tr("Location 6"))
+        .SetShortcut(tr("Shift+F6"))
+        .SetToolTip(tr("Location 6 (Shift+F6)"));
+    am->AddAction(ID_GOTO_LOC7, tr("Location 7"))
+        .SetShortcut(tr("Shift+F7"))
+        .SetToolTip(tr("Location 7 (Shift+F7)"));
+    am->AddAction(ID_GOTO_LOC8, tr("Location 8"))
+        .SetShortcut(tr("Shift+F8"))
+        .SetToolTip(tr("Location 8 (Shift+F8)"));
+    am->AddAction(ID_GOTO_LOC9, tr("Location 9"))
+        .SetShortcut(tr("Shift+F9"))
+        .SetToolTip(tr("Location 9 (Shift+F9)"));
+    am->AddAction(ID_GOTO_LOC10, tr("Location 10"))
+        .SetShortcut(tr("Shift+F10"))
+        .SetToolTip(tr("Location 10 (Shift+F10)"));
+    am->AddAction(ID_GOTO_LOC11, tr("Location 11"))
+        .SetShortcut(tr("Shift+F11"))
+        .SetToolTip(tr("Location 11 (Shift+F11)"));
+    am->AddAction(ID_GOTO_LOC12, tr("Location 12"))
+        .SetShortcut(tr("Shift+F12"))
+        .SetToolTip(tr("Location 12 (Shift+F12)"));
+    am->AddAction(ID_TAG_LOC1, tr("Location 1"))
+        .SetShortcut(tr("Ctrl+F1"))
+        .SetToolTip(tr("Location 1 (Ctrl+F1)"));
+    am->AddAction(ID_TAG_LOC2, tr("Location 2"))
+        .SetShortcut(tr("Ctrl+F2"))
+        .SetToolTip(tr("Location 2 (Ctrl+F2)"));
+    am->AddAction(ID_TAG_LOC3, tr("Location 3"))
+        .SetShortcut(tr("Ctrl+F3"))
+        .SetToolTip(tr("Location 3 (Ctrl+F3)"));
+    am->AddAction(ID_TAG_LOC4, tr("Location 4"))
+        .SetShortcut(tr("Ctrl+F4"))
+        .SetToolTip(tr("Location 4 (Ctrl+F4)"));
+    am->AddAction(ID_TAG_LOC5, tr("Location 5"))
+        .SetShortcut(tr("Ctrl+F5"))
+        .SetToolTip(tr("Location 5 (Ctrl+F5)"));
+    am->AddAction(ID_TAG_LOC6, tr("Location 6"))
+        .SetShortcut(tr("Ctrl+F6"))
+        .SetToolTip(tr("Location 6 (Ctrl+F6)"));
+    am->AddAction(ID_TAG_LOC7, tr("Location 7"))
+        .SetShortcut(tr("Ctrl+F7"))
+        .SetToolTip(tr("Location 7 (Ctrl+F7)"));
+    am->AddAction(ID_TAG_LOC8, tr("Location 8"))
+        .SetShortcut(tr("Ctrl+F8"))
+        .SetToolTip(tr("Location 8 (Ctrl+F8)"));
+    am->AddAction(ID_TAG_LOC9, tr("Location 9"))
+        .SetShortcut(tr("Ctrl+F9"))
+        .SetToolTip(tr("Location 9 (Ctrl+F9)"));
+    am->AddAction(ID_TAG_LOC10, tr("Location 10"))
+        .SetShortcut(tr("Ctrl+F10"))
+        .SetToolTip(tr("Location 10 (Ctrl+F10)"));
+    am->AddAction(ID_TAG_LOC11, tr("Location 11"))
+        .SetShortcut(tr("Ctrl+F11"))
+        .SetToolTip(tr("Location 11 (Ctrl+F11)"));
+    am->AddAction(ID_TAG_LOC12, tr("Location 12"))
+        .SetShortcut(tr("Ctrl+F12"))
+        .SetToolTip(tr("Location 12 (Ctrl+F12)"));
+
+    if (CViewManager::IsMultiViewportEnabled())
+    {
+        am->AddAction(ID_VIEW_CONFIGURELAYOUT, tr("Configure Layout..."));
+    }
+#ifdef FEATURE_ORTHOGRAPHIC_VIEW
+    am->AddAction(ID_VIEW_CYCLE2DVIEWPORT, tr("Cycle Viewports"))
+        .SetShortcut(tr("Ctrl+Tab"))
+        .SetStatusTip(tr("Cycle 2D Viewport"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateNonGameMode);
+#endif
+    am->AddAction(ID_DISPLAY_SHOWHELPERS, tr("Show/Hide Helpers"))
+        .SetShortcut(tr("Shift+Space"))
+        .SetToolTip(tr("Show/Hide Helpers (Shift+Space)"));
+
+    // Audio actions
+    am->AddAction(ID_SOUND_STOPALLSOUNDS, tr("Stop All Sounds"))
+        .Connect(&QAction::triggered, this, &MainWindow::OnStopAllSounds);
+    am->AddAction(ID_AUDIO_REFRESH_AUDIO_SYSTEM, tr("Refresh Audio"))
+        .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem);
+
+    // Game actions
+    am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play &Game"))
+        .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg"))
+        .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)"))
+        .SetShortcut(tr("Ctrl+Shift+G"))
+        .SetStatusTip(tr("Activate the game input mode (maximized)"))
+        .SetIcon(Style::icon("Play"))
+        .SetApplyHoverEffect()
+        .SetCheckable(true);
+    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)
+        .SetStatusTip(tr("Move Player and Camera Separately"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnSyncPlayerUpdate);
+
+    // Physics actions
+    am->AddAction(ID_PHYSICS_GETPHYSICSSTATE, tr("Get Physics State"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
+    am->AddAction(ID_PHYSICS_RESETPHYSICSSTATE, tr("Reset Physics State"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
+    am->AddAction(ID_PHYSICS_SIMULATEOBJECTS, tr("Simulate Objects"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
+
+    // Tools actions
+    am->AddAction(ID_TOOLS_ENABLEFILECHANGEMONITORING, tr("Enable File Change Monitoring"));
+    am->AddAction(ID_CLEAR_REGISTRY, tr("Clear Registry Data"))
+        .SetStatusTip(tr("Clear Registry Data"));
+    am->AddAction(ID_VALIDATELEVEL, tr("&Check Level for Errors"))
+        .SetStatusTip(tr("Validate Level"));
+    am->AddAction(ID_TOOLS_VALIDATEOBJECTPOSITIONS, tr("Check Object Positions"));
+    QAction* saveLevelStatsAction =
+        am->AddAction(ID_TOOLS_LOGMEMORYUSAGE, tr("Save Level Statistics"))
+                .SetStatusTip(tr("Logs Editor memory usage."));
+    if( saveLevelStatsAction )
+    {
+        saveLevelStatsAction->setEnabled(false);
+    }
+    am->AddAction(ID_RESOURCES_REDUCEWORKINGSET, tr("Reduce Working Set"))
+        .SetStatusTip(tr("Reduce Physical RAM Working Set."));
+    am->AddAction(ID_TOOLS_UPDATEPROCEDURALVEGETATION, tr("Update Procedural Vegetation"));
+    am->AddAction(ID_TOOLS_CONFIGURETOOLS, tr("Configure ToolBox Macros..."));
+    am->AddAction(ID_TOOLS_SCRIPTHELP, tr("Script Help"));
+    am->AddAction(ID_TOOLS_LUA_EDITOR, tr("Lua Editor"));
+
+    // View actions
+    am->AddAction(ID_VIEW_OPENVIEWPANE, tr("Open View Pane"));
+    am->AddAction(ID_VIEW_CONSOLEWINDOW, tr(LyViewPane::ConsoleMenuName))
+        .SetShortcut(tr("^"))
+        .SetReserved()
+        .SetStatusTip(tr("Show or hide the console window"))
+        .SetCheckable(true)
+        .Connect(&QAction::triggered, this, &MainWindow::ToggleConsole);
+    am->AddAction(ID_OPEN_QUICK_ACCESS_BAR, tr("Show &Quick Access Bar"))
+        .SetShortcut(tr("Ctrl+Alt+Space"))
+        .SetToolTip(tr("Show &Quick Access Bar (Ctrl+Alt+Space)"));
+
+    // Disable layouts menu
+    if (CViewManager::IsMultiViewportEnabled())
+    {
+        am->AddAction(ID_VIEW_LAYOUTS, tr("Layouts"));
+
+        am->AddAction(ID_VIEW_SAVELAYOUT, tr("Save Layout..."))
+            .Connect(&QAction::triggered, this, &MainWindow::SaveLayout);
+        am->AddAction(ID_VIEW_LAYOUT_LOAD_DEFAULT, tr("Restore Default Layout"))
+            .Connect(&QAction::triggered, [this]() { m_viewPaneManager->RestoreDefaultLayout(true); });
+    }
+
+    am->AddAction(ID_SKINS_REFRESH, tr("Refresh Style"))
+        .SetToolTip(tr("Refreshes the editor stylesheet"))
+        .Connect(&QAction::triggered, this, &MainWindow::RefreshStyle);
+
+    // Help actions
+    am->AddAction(ID_DOCUMENTATION_TUTORIALS, tr("Tutorials"))
+        .SetReserved();
+
+    am->AddAction(ID_DOCUMENTATION_O3DE, tr("Open 3D Engine Documentation"))
+        .SetReserved();
+    am->AddAction(ID_DOCUMENTATION_GAMELIFT, tr("GameLift Documentation"))
+        .SetReserved();
+    am->AddAction(ID_DOCUMENTATION_RELEASENOTES, tr("Release Notes"))
+        .SetReserved();
+
+    am->AddAction(ID_DOCUMENTATION_GAMEDEVBLOG, tr("GameDev Blog"))
+        .SetReserved();
+    am->AddAction(ID_DOCUMENTATION_FORUMS, tr("Forums"))
+        .SetReserved();
+    am->AddAction(ID_DOCUMENTATION_AWSSUPPORT, tr("AWS Support"))
+        .SetReserved();
+
+    am->AddAction(ID_APP_ABOUT, tr("&About O3DE"))
+        .SetStatusTip(tr("Display program information, version number and copyright"))
+        .SetReserved();
+    am->AddAction(ID_APP_SHOW_WELCOME, tr("&Welcome"))
+        .SetStatusTip(tr("Show the Welcome to O3DE dialog box"))
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateShowWelcomeScreen);
+
+    // Editors Toolbar actions
+    am->AddAction(ID_OPEN_ASSET_BROWSER, tr("Asset browser"))
+        .SetToolTip(tr("Open Asset Browser"))
+        .SetApplyHoverEffect();
+
+    AZ::EBusReduceResult<bool, AZStd::logical_or<bool>> emfxEnabled(false);
+    using AnimationRequestBus = AzToolsFramework::EditorAnimationSystemRequestsBus;
+    using AnimationSystemType = AzToolsFramework::EditorAnimationSystemRequests::AnimationSystem;
+    AnimationRequestBus::BroadcastResult(emfxEnabled, &AnimationRequestBus::Events::IsSystemActive, AnimationSystemType::EMotionFX);
+    if (emfxEnabled.value)
+    {
+        QAction* action = am->AddAction(ID_OPEN_EMOTIONFX_EDITOR, tr("Animation Editor"))
+            .SetToolTip(tr("Open Animation Editor (PREVIEW)"))
+            .SetIcon(QIcon(":/EMotionFX/EMFX_icon_32x32.png"))
+            .SetApplyHoverEffect();
+        QObject::connect(action, &QAction::triggered, this, []() {
+            QtViewPaneManager::instance()->OpenPane(LyViewPane::AnimationEditor);
+        });
+    }
+
+    am->AddAction(ID_OPEN_AUDIO_CONTROLS_BROWSER, tr("Audio Controls Editor"))
+        .SetToolTip(tr("Open Audio Controls Editor"))
+        .SetIcon(Style::icon("Audio"))
+        .SetApplyHoverEffect();
+
+    am->AddAction(ID_OPEN_UICANVASEDITOR, tr(LyViewPane::UiEditor))
+        .SetToolTip(tr("Open UI Editor"))
+        .SetApplyHoverEffect();
+
+    // Edit Mode Toolbar Actions
+    am->AddAction(IDC_SELECTION_MASK, tr("Selected Object Types"));
+    am->AddAction(ID_REF_COORDS_SYS, tr("Reference coordinate system"))
+        .SetShortcut(tr("Ctrl+W"))
+        .SetToolTip(tr("Reference coordinate system (Ctrl+W)"))
+        .Connect(&QAction::triggered, this, &MainWindow::ToggleRefCoordSys);
+    am->AddAction(IDC_SELECTION, tr("Named Selections"));
+
+    // 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();
+}
+
+void MainWindow::InitToolActionHandlers()
+{
+    ActionManager* am = GetActionManager();
+    CToolBoxManager* tbm = GetIEditor()->GetToolBoxManager();
+    am->RegisterActionHandler(ID_APP_EXIT, [=]() { window()->close(); });
+
+    for (int id = ID_TOOL_FIRST; id <= ID_TOOL_LAST; ++id)
+    {
+        am->RegisterActionHandler(id, [tbm, id] {
+            tbm->ExecuteMacro(id - ID_TOOL_FIRST, true);
+        });
+    }
+
+    for (int id = ID_TOOL_SHELVE_FIRST; id <= ID_TOOL_SHELVE_LAST; ++id)
+    {
+        am->RegisterActionHandler(id, [tbm, id] {
+            tbm->ExecuteMacro(id - ID_TOOL_SHELVE_FIRST, false);
+        });
+    }
+
+    for (int id = CEditorCommandManager::CUSTOM_COMMAND_ID_FIRST; id <= CEditorCommandManager::CUSTOM_COMMAND_ID_LAST; ++id)
+    {
+        am->RegisterActionHandler(id, [id] {
+            GetIEditor()->GetCommandManager()->Execute(id);
+        });
+    }
+}
+
+void MainWindow::OnEscapeAction()
+{
+    if (!CCryEditApp::instance()->IsInAutotestMode())
+    {
+        if (GetIEditor()->IsInGameMode())
+        {
+            GetIEditor()->SetInGameMode(false);
+        }
+        else
+        {
+            AzToolsFramework::EditorEvents::Bus::Broadcast(
+                &AzToolsFramework::EditorEvents::OnEscape);
+        }
+    }
+}
+
+void MainWindow::InitToolBars()
+{
+    m_toolbarManager->LoadToolbars();
+    AdjustToolBarIconSize(static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(gSettings.gui.nToolbarIconSize));
+}
+
+QToolButton* MainWindow::CreateUndoRedoButton(int command)
+{
+    // We do either undo or redo below, sort that out here
+    UndoRedoDirection direction = UndoRedoDirection::Undo;
+    auto stateSignal = &UndoStackStateAdapter::UndoAvailable;
+    if (ID_REDO == command)
+    {
+        direction = UndoRedoDirection::Redo;
+        stateSignal = &UndoStackStateAdapter::RedoAvailable;
+    }
+
+    auto button = new UndoRedoToolButton(this);
+    button->setAutoRaise(true);
+    button->setPopupMode(QToolButton::MenuButtonPopup);
+    button->setDefaultAction(m_actionManager->GetAction(command));
+
+    QMenu* menu = new QMenu(button);
+    auto action = new QWidgetAction(button);
+    auto undoRedo = new CUndoDropDown(direction, button);
+    action->setDefaultWidget(undoRedo);
+    menu->addAction(action);
+    button->setMenu(menu);
+
+    connect(menu, &QMenu::aboutToShow, undoRedo, &CUndoDropDown::Prepare);
+    connect(undoRedo, &CUndoDropDown::accepted, menu, &QMenu::hide);
+    connect(m_undoStateAdapter, stateSignal, button, &UndoRedoToolButton::Update);
+
+    button->setEnabled(false);
+
+    return button;
+}
+
+QWidget* MainWindow::CreateSpacerRightWidget()
+{
+    QWidget* spacer = new QWidget(this);
+    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    spacer->setVisible(true);
+    return spacer;
+}
+
+UndoRedoToolButton::UndoRedoToolButton(QWidget* parent)
+    : QToolButton(parent)
+{
+}
+
+void UndoRedoToolButton::Update(int count)
+{
+    setEnabled(count > 0);
+}
+
+bool MainWindow::IsPreview() const
+{
+    return GetIEditor()->IsInPreviewMode();
+}
+
+MainStatusBar* MainWindow::StatusBar() const
+{
+    assert(statusBar()->inherits("MainStatusBar"));
+    return static_cast<MainStatusBar*>(statusBar());
+}
+
+KeyboardCustomizationSettings* MainWindow::GetShortcutManager() const
+{
+    return m_keyboardCustomization;
+}
+
+ActionManager* MainWindow::GetActionManager() const
+{
+    return m_actionManager;
+}
+
+void MainWindow::OpenViewPane(int paneId)
+{
+    OpenViewPane(QtViewPaneManager::instance()->GetPane(paneId));
+}
+
+void MainWindow::OpenViewPane(QtViewPane* pane)
+{
+    if (pane && pane->IsValid())
+    {
+        QtViewPaneManager::instance()->OpenPane(pane->m_name);
+    }
+    else
+    {
+        if (pane)
+        {
+            qWarning() << Q_FUNC_INFO << "Invalid pane" << pane->m_id << pane->m_category << pane->m_name;
+        }
+        else
+        {
+            qWarning() << Q_FUNC_INFO << "Invalid pane";
+        }
+    }
+}
+
+void MainWindow::AdjustToolBarIconSize(AzQtComponents::ToolBar::ToolBarIconSize size)
+{
+    const QList<QToolBar*> toolbars = findChildren<QToolBar*>();
+
+    // make sure to set this back, so that the general settings page matches up with what the size is too
+    if (gSettings.gui.nToolbarIconSize != static_cast<int>(size))
+    {
+        gSettings.gui.nToolbarIconSize = static_cast<int>(size);
+    }
+
+    for (auto toolbar : toolbars)
+    {
+        AzQtComponents::ToolBar::setToolBarIconSize(toolbar, size);
+    }
+}
+
+void MainWindow::OnGameModeChanged(bool inGameMode)
+{
+    menuBar()->setDisabled(inGameMode);
+    m_toolbarManager->SetEnabled(!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) };
+    for (auto action : actions)
+    {
+        action->blockSignals(true);
+    }
+
+    for (auto action : actions)
+    {
+        action->setChecked(inGameMode);
+    }
+
+    for (auto action : actions)
+    {
+        action->blockSignals(false);
+    }
+}
+
+void MainWindow::OnEditorNotifyEvent(EEditorNotifyEvent ev)
+{
+    switch (ev)
+    {
+    case eNotify_OnEndSceneOpen:
+    case eNotify_OnEndSceneSave:
+    {
+        auto cryEdit = CCryEditApp::instance();
+        if (cryEdit)
+        {
+            cryEdit->SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), GetIEditor()->GetGameEngine()->GetLevelName());
+        }
+    }
+    break;
+    case eNotify_OnCloseScene:
+    {
+        auto cryEdit = CCryEditApp::instance();
+        if (cryEdit)
+        {
+            cryEdit->SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), 0);
+        }
+    }
+    break;
+    case eNotify_OnRefCoordSysChange:
+        emit UpdateRefCoordSys();
+        break;
+    case eNotify_OnInvalidateControls:
+        InvalidateControls();
+        break;
+    case eNotify_OnBeginGameMode:
+        OnGameModeChanged(true);
+        break;
+    case eNotify_OnEndGameMode:
+        OnGameModeChanged(false);
+        break;
+    // Remove track view option to avoid starting in bad state
+    case eNotify_OnBeginSimulationMode:
+        if (m_actionManager->HasAction(ID_OPEN_TRACKVIEW))
+        {
+            QAction* tvAction = m_actionManager->GetAction(ID_OPEN_TRACKVIEW);
+            if (tvAction)
+            {
+                tvAction->setVisible(false);
+            }
+        }
+        break;
+    case eNotify_OnEndSimulationMode:
+        if (m_actionManager->HasAction(ID_OPEN_TRACKVIEW))
+        {
+            QAction* tvAction = m_actionManager->GetAction(ID_OPEN_TRACKVIEW);
+            if (tvAction)
+            {
+                tvAction->setVisible(true);
+            }
+        }
+        break;
+    }
+
+    switch (ev)
+    {
+    case eNotify_OnBeginSceneOpen:
+    case eNotify_OnBeginNewScene:
+    case eNotify_OnCloseScene:
+        ResetAutoSaveTimers();
+        break;
+    case eNotify_OnEndSceneOpen:
+    case eNotify_OnEndNewScene:
+        ResetAutoSaveTimers(true);
+        break;
+    }
+}
+
+void MainWindow::InvalidateControls()
+{
+    emit UpdateRefCoordSys();
+}
+
+void MainWindow::RegisterStdViewClasses()
+{
+    AzAssetBrowserWindow::createListenerForShowAssetEditorEvent(this);
+
+    CTrackViewDialog::RegisterViewClass();
+    CErrorReportDialog::RegisterViewClass();
+    CPythonScriptsDialog::RegisterViewClass();
+
+    AzToolsFramework::CScriptTermDialog::RegisterViewClass();
+    CConsoleSCB::RegisterViewClass();
+    ConsoleVariableEditor::RegisterViewClass();
+    CSettingsManagerDialog::RegisterViewClass();
+    AzAssetBrowserWindow::RegisterViewClass();
+    AssetEditorWindow::RegisterViewClass();
+
+    // Notify that views can now be registered
+    AzToolsFramework::EditorEvents::Bus::Broadcast(
+        &AzToolsFramework::EditorEvents::Bus::Events::NotifyRegisterViews);
+}
+
+void MainWindow::OnCustomizeToolbar()
+{
+    /* TODO_KDAB, rest of CMainFrm::OnCustomize() goes here*/
+    SaveConfig();
+}
+
+void MainWindow::RefreshStyle()
+{
+    GetIEditor()->Notify(eNotify_OnStyleChanged);
+}
+
+void MainWindow::ResetAutoSaveTimers(bool bForceInit)
+{
+    if (m_autoSaveTimer)
+    {
+        delete m_autoSaveTimer;
+    }
+    if (m_autoRemindTimer)
+    {
+        delete m_autoRemindTimer;
+    }
+    m_autoSaveTimer = 0;
+    m_autoRemindTimer = 0;
+
+    if (bForceInit)
+    {
+        if (gSettings.autoBackupTime > 0 && gSettings.autoBackupEnabled)
+        {
+            m_autoSaveTimer = new QTimer(this);
+            m_autoSaveTimer->start(gSettings.autoBackupTime * 1000 * 60);
+            connect(m_autoSaveTimer, &QTimer::timeout, this, [&]() {
+                if (gSettings.autoBackupEnabled)
+                {
+                    // Call autosave function of CryEditApp
+                    GetIEditor()->GetDocument()->SaveAutoBackup();
+                }
+            });
+        }
+        if (gSettings.autoRemindTime > 0)
+        {
+            m_autoRemindTimer = new QTimer(this);
+            m_autoRemindTimer->start(gSettings.autoRemindTime * 1000 * 60);
+            connect(m_autoRemindTimer, &QTimer::timeout, this, [&]() {
+                if (gSettings.autoRemindTime > 0)
+                {
+                    // Remind to save.
+                    CCryEditApp::instance()->SaveAutoRemind();
+                }
+            });
+        }
+    }
+
+}
+
+void MainWindow::ResetBackgroundUpdateTimer()
+{
+    if (m_backgroundUpdateTimer)
+    {
+        delete m_backgroundUpdateTimer;
+        m_backgroundUpdateTimer = 0;
+    }
+
+    ICVar* pBackgroundUpdatePeriod = gEnv->pConsole->GetCVar("ed_backgroundUpdatePeriod");
+    if (pBackgroundUpdatePeriod && pBackgroundUpdatePeriod->GetIVal() > 0)
+    {
+        m_backgroundUpdateTimer = new QTimer(this);
+        m_backgroundUpdateTimer->start(pBackgroundUpdatePeriod->GetIVal());
+        connect(m_backgroundUpdateTimer, &QTimer::timeout, this, [&]() {
+            // Make sure that visible editor window get low-fps updates while in the background
+
+            CCryEditApp* pApp = CCryEditApp::instance();
+            if (!isMinimized() && !pApp->IsWindowInForeground())
+            {
+                pApp->IdleProcessing(true);
+            }
+        });
+    }
+}
+
+void MainWindow::UpdateToolsMenu()
+{
+     m_levelEditorMenuHandler->UpdateMacrosMenu();
+}
+
+int MainWindow::ViewPaneVersion() const
+{
+    return m_levelEditorMenuHandler->GetViewPaneVersion();
+}
+
+void MainWindow::OnStopAllSounds()
+{
+    Audio::SAudioRequest oStopAllSoundsRequest;
+    Audio::SAudioManagerRequestData<Audio::eAMRT_STOP_ALL_SOUNDS>   oStopAllSoundsRequestData;
+    oStopAllSoundsRequest.pData = &oStopAllSoundsRequestData;
+
+    CryLogAlways("<Audio> Executed \"Stop All Sounds\" command.");
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, oStopAllSoundsRequest);
+}
+
+void MainWindow::OnRefreshAudioSystem()
+{
+    QString sLevelName = GetIEditor()->GetGameEngine()->GetLevelName();
+
+    if (QString::compare(sLevelName, "Untitled", Qt::CaseInsensitive) == 0)
+    {
+        // Rather pass NULL to indicate that no level is loaded!
+        sLevelName = QString();
+    }
+
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::RefreshAudioSystem, sLevelName.toUtf8().data());
+}
+
+void MainWindow::SaveLayout()
+{
+    const int MAX_LAYOUTS = ID_VIEW_LAYOUT_LAST - ID_VIEW_LAYOUT_FIRST + 1;
+
+    if (m_viewPaneManager->LayoutNames(true).count() >= MAX_LAYOUTS)
+    {
+        QMessageBox::critical(this, tr("Maximum number of layouts reached"), tr("Please delete a saved layout before creating another."));
+        return;
+    }
+
+    QString layoutName = QInputDialog::getText(this, tr("Layout Name"), QString()).toLower();
+    if (layoutName.isEmpty())
+    {
+        return;
+    }
+
+    if (m_viewPaneManager->HasLayout(layoutName))
+    {
+        QMessageBox box(this); // Not static so we can remove help button
+        box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+        box.setText(tr("Overwrite Layout?"));
+        box.setIcon(QMessageBox::Warning);
+        box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
+        box.setInformativeText(tr("The chosen layout name already exists. Do you want to overwrite it?"));
+        if (box.exec() != QMessageBox::Yes)
+        {
+            SaveLayout();
+            return;
+        }
+    }
+
+    m_viewPaneManager->SaveLayout(layoutName);
+}
+
+void MainWindow::ViewDeletePaneLayout(const QString& layoutName)
+{
+    if (layoutName.isEmpty())
+    {
+        return;
+    }
+
+    QMessageBox box(this); // Not static so we can remove help button
+    box.setText(tr("Delete Layout?"));
+    box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+    box.setIcon(QMessageBox::Warning);
+    box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    box.setInformativeText(tr("Are you sure you want to delete the layout '%1'?").arg(layoutName));
+    if (box.exec() == QMessageBox::Yes)
+    {
+        m_viewPaneManager->RemoveLayout(layoutName);
+    }
+}
+
+void MainWindow::ViewRenamePaneLayout(const QString& layoutName)
+{
+    if (layoutName.isEmpty())
+    {
+        return;
+    }
+
+    QString newLayoutName;
+    bool validName = false;
+    while (!validName)
+    {
+        newLayoutName = QInputDialog::getText(this, tr("Rename layout '%1'").arg(layoutName), QString());
+        if (newLayoutName.isEmpty())
+        {
+            return;
+        }
+
+        if (m_viewPaneManager->HasLayout(newLayoutName))
+        {
+            QMessageBox box(this); // Not static so we can remove help button
+            box.setText(tr("Layout name already exists"));
+            box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+            box.setIcon(QMessageBox::Warning);
+            box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
+            box.setInformativeText(tr("The layout name '%1' already exists, please choose a different name").arg(newLayoutName));
+            if (box.exec() == QMessageBox::No)
+            {
+                return;
+            }
+        }
+        else
+        {
+            validName = true;
+        }
+    }
+
+    m_viewPaneManager->RenameLayout(layoutName, newLayoutName);
+}
+
+void MainWindow::ViewLoadPaneLayout(const QString& layoutName)
+{
+    if (!layoutName.isEmpty())
+    {
+        m_viewPaneManager->RestoreLayout(layoutName);
+    }
+}
+
+void MainWindow::ViewSavePaneLayout(const QString& layoutName)
+{
+    if (layoutName.isEmpty())
+    {
+        return;
+    }
+
+    QMessageBox box(this); // Not static so we can remove help button
+    box.setText(tr("Overwrite Layout?"));
+    box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+    box.setIcon(QMessageBox::Warning);
+    box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    box.setInformativeText(tr("Do you want to overwrite the layout '%1' with the current one?").arg(layoutName));
+    if (box.exec() == QMessageBox::Yes)
+    {
+        m_viewPaneManager->SaveLayout(layoutName);
+    }
+}
+
+void MainWindow::OnUpdateConnectionStatus()
+{
+    auto* statusBar = StatusBar();
+
+    if (!m_connectionListener)
+    {
+        statusBar->SetItem("connection", tr("Disconnected"), tr("Disconnected"), IDI_BALL_DISABLED);
+        //TODO: disable clicking
+    }
+    else
+    {
+        using EConnectionState = EngineConnectionListener::EConnectionState;
+        int icon = IDI_BALL_OFFLINE;
+        QString tooltip, status;
+        switch (m_connectionListener->GetState())
+        {
+        case EConnectionState::Connecting:
+            // Checking whether we are not connected here instead of disconnect state because this function is called on a timer
+            // and therefore we may not receive the disconnect state.
+            if (m_connectedToAssetProcessor)
+            {
+                m_connectedToAssetProcessor = false;
+                m_showAPDisconnectDialog = true;
+            }
+            tooltip = tr("Connecting to Asset Processor");
+            icon = IDI_BALL_PENDING;
+            break;
+        case EConnectionState::Disconnecting:
+            tooltip = tr("Disconnecting from Asset Processor");
+            icon = IDI_BALL_PENDING;
+            break;
+        case EConnectionState::Listening:
+            if (m_connectedToAssetProcessor)
+            {
+                m_connectedToAssetProcessor = false;
+                m_showAPDisconnectDialog = true;
+            }
+            tooltip = tr("Listening for incoming connections");
+            icon = IDI_BALL_PENDING;
+            break;
+        case EConnectionState::Connected:
+            m_connectedToAssetProcessor = true;
+            tooltip = tr("Connected to Asset Processor");
+            icon = IDI_BALL_ONLINE;
+            break;
+        case EConnectionState::Disconnected:
+            icon = IDI_BALL_OFFLINE;
+            tooltip = tr("Disconnected from Asset Processor");
+            break;
+        }
+
+        if (m_connectedToAssetProcessor)
+        {
+            m_connectionLostTimer->stop();
+        }
+
+        tooltip += "\n Last Asset Processor Task: ";
+        tooltip += m_connectionListener->LastAssetProcessorTask().c_str();
+        tooltip += "\n";
+        AZStd::set<AZStd::string> failedJobs = m_connectionListener->FailedJobsList();
+        int failureCount = failedJobs.size();
+        if (failureCount)
+        {
+            tooltip += "\n Failed Jobs\n";
+            for (auto failedJob : failedJobs)
+            {
+                tooltip += failedJob.c_str();
+                tooltip += "\n";
+            }
+        }
+
+        status = tr("Pending Jobs : %1  Failed Jobs : %2").arg(m_connectionListener->GetJobsCount()).arg(failureCount);
+
+        statusBar->SetItem(QtUtil::ToQString("connection"), status, tooltip, icon);
+
+        if (m_showAPDisconnectDialog && m_connectionListener->GetState() != EConnectionState::Connected)
+        {
+            m_showAPDisconnectDialog = false;// Just show the dialog only once if connection is lost
+            m_connectionLostTimer->setSingleShot(true);
+            m_connectionLostTimer->start(15000);
+        }
+    }
+}
+
+void MainWindow::ShowConnectionDisconnectedDialog()
+{
+    // when REMOTE_ASSET_PROCESSOR is undef'd it means behave as if there is no such thing as the remote asset processor.
+#ifdef REMOTE_ASSET_PROCESSOR
+    if (gEnv && gEnv->pSystem)
+    {
+        QMessageBox messageBox(this);
+        messageBox.setWindowTitle(tr("Asset Processor has disconnected."));
+        messageBox.setText(
+            tr("Asset Processor is not connected. Please try (re)starting the Asset Processor or restarting the Editor.<br><br>"
+                "Data may be lost while the Asset Processor is not running!<br>"
+                "The status of the Asset Processor can be monitored from the editor in the bottom-right corner of the status bar.<br><br>"
+                "Would you like to start the asset processor?<br>"));
+        messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Ignore);
+        messageBox.setDefaultButton(QMessageBox::Yes);
+        messageBox.setIcon(QMessageBox::Critical);
+        if (messageBox.exec() == QMessageBox::Yes)
+        {
+            AzFramework::AssetSystem::LaunchAssetProcessor();
+        }
+    }
+    else
+    {
+        QMessageBox::critical(this, tr("Asset Processor has disconnected."),
+            tr("Asset Processor is not connected. Please try (re)starting the asset processor or restarting the Editor.<br><br>"
+                "Data may be lost while the asset processor is not running!<br>"
+                "The status of the asset processor can be monitored from the editor in the bottom-right corner of the status bar."));
+    }
+#endif
+}
+
+void MainWindow::OnConnectionStatusClicked()
+{
+    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystemRequestBus::Events::ShowAssetProcessor);
+}
+
+static bool paneLessThan(const QtViewPane& v1, const QtViewPane& v2)
+{
+    return v1.m_name.compare(v2.m_name, Qt::CaseInsensitive) < 0;
+}
+
+void MainWindow::RegisterOpenWndCommands()
+{
+    s_openViewCmds.clear();
+
+    auto panes = m_viewPaneManager->GetRegisteredPanes(/* viewPaneMenuOnly=*/ false);
+    std::sort(panes.begin(), panes.end(), paneLessThan);
+
+    for (auto viewPane : panes)
+    {
+        if (viewPane.m_category.isEmpty())
+        {
+            continue;
+        }
+
+        const QString className = viewPane.m_name;
+
+        // Make a open-view command for the class.
+        QString classNameLowered = viewPane.m_name.toLower();
+        classNameLowered.replace(' ', '_');
+        QString openCommandName = "open_";
+        openCommandName += classNameLowered;
+
+        CEditorOpenViewCommand* pCmd = new CEditorOpenViewCommand(GetIEditor(), viewPane.m_name);
+        s_openViewCmds.push_back(pCmd);
+
+        CCommand0::SUIInfo cmdUI;
+        cmdUI.caption = className.toUtf8().data();
+        cmdUI.tooltip = (QString("Open ") + className).toUtf8().data();
+        cmdUI.iconFilename = className.toUtf8().data();
+        GetIEditor()->GetCommandManager()->RegisterUICommand("editor", openCommandName.toUtf8().data(),
+            "", "", AZStd::bind(&CEditorOpenViewCommand::Execute, pCmd), cmdUI);
+        GetIEditor()->GetCommandManager()->GetUIInfo("editor", openCommandName.toUtf8().data(), cmdUI);
+    }
+}
+
+bool MainWindow::event(QEvent* event)
+{
+#ifdef Q_OS_MAC
+    if (event->type() == QEvent::HoverMove)
+    {
+        // this fixes a problem on macOS where the mouse cursor was not
+        // set when hovering over the splitter handles between dock widgets
+        // it might be fixed in future Qt versions
+        auto mouse = static_cast<QHoverEvent*>(event);
+        bool result = QMainWindow::event(event);
+        void setCocoaMouseCursor(QWidget*);
+        setCocoaMouseCursor(childAt(mouse->pos()));
+        return result;
+    }
+#endif
+    return QMainWindow::event(event);
+}
+
+void MainWindow::ToggleConsole()
+{
+    m_viewPaneManager->TogglePane(LyViewPane::Console);
+
+    QtViewPane* pane = m_viewPaneManager->GetPane(LyViewPane::Console);
+    if (!pane)
+    {
+        return;
+    }
+
+    // If we toggled the console on, we want to focus its input text field
+    if (pane->IsVisible())
+    {
+        CConsoleSCB* console = qobject_cast<CConsoleSCB*>(pane->Widget());
+        if (!console)
+        {
+            return;
+        }
+
+        console->SetInputFocus();
+    }
+}
+
+void MainWindow::OnViewPaneCreated(const QtViewPane* pane)
+{
+    QAction* action = nullptr;
+    int id = pane->m_id;
+
+    // Use built-in action id if available
+    if (pane->m_options.builtInActionId != -1)
+    {
+        id = pane->m_options.builtInActionId;
+    }
+
+    if (m_actionManager->HasAction(id))
+    {
+        action = m_actionManager->GetAction(id);
+        action->setChecked(true);
+
+        connect(pane->m_dockWidget->toggleViewAction(), &QAction::toggled,
+            action, &QAction::setChecked, Qt::UniqueConnection);
+    }
+}
+
+void MainWindow::ConnectivityStateChanged(const AzToolsFramework::SourceControlState state)
+{
+    bool connected = false;
+    ISourceControl* pSourceControl = GetIEditor() ? GetIEditor()->GetSourceControl() : nullptr;
+    if (pSourceControl)
+    {
+        pSourceControl->SetSourceControlState(state);
+        if (state == AzToolsFramework::SourceControlState::Active || state == AzToolsFramework::SourceControlState::ConfigurationInvalid)
+        {
+            connected = true;
+        }
+    }
+
+    gSettings.enableSourceControl = connected;
+    gSettings.SaveEnableSourceControlFlag(false);
+}
+
+void MainWindow::OnGotoSelected()
+{
+    AzToolsFramework::EditorRequestBus::Broadcast(&AzToolsFramework::EditorRequestBus::Events::GoToSelectedEntitiesInViewports);
+}
+
+void MainWindow::OnGotoSliceRoot()
+{
+    int numViews = GetIEditor()->GetViewManager()->GetViewCount();
+    for (int i = 0; i < numViews; ++i)
+    {
+        CViewport* viewport = GetIEditor()->GetViewManager()->GetView(i);
+        if (viewport)
+        {
+            viewport->CenterOnSliceInstance();
+        }
+    }
+}
+
+void MainWindow::ShowCustomizeToolbarDialog()
+{
+    if (m_toolbarCustomizationDialog)
+    {
+        return;
+    }
+
+    m_toolbarCustomizationDialog = new ToolbarCustomizationDialog(this);
+    m_toolbarCustomizationDialog->show();
+}
+
+QMenu* MainWindow::createPopupMenu()
+{
+    QMenu* menu = QMainWindow::createPopupMenu();
+    menu->addSeparator();
+    QAction* action = menu->addAction(QStringLiteral("Customize..."));
+    connect(action, &QAction::triggered, this, &MainWindow::ShowCustomizeToolbarDialog);
+    return menu;
+}
+
+ToolbarManager* MainWindow::GetToolbarManager() const
+{
+    return m_toolbarManager;
+}
+
+bool MainWindow::IsCustomizingToolbars() const
+{
+    return m_toolbarCustomizationDialog != nullptr;
+}
+
+QWidget* MainWindow::CreateToolbarWidget(int actionId)
+{
+    QWidgetAction* action = qobject_cast<QWidgetAction*>(m_actionManager->GetAction(actionId));
+    if (!action)
+    {
+        qWarning() << Q_FUNC_INFO << "No QWidgetAction for actionId = " << actionId;
+        return nullptr;
+    }
+
+    QWidget* w = nullptr;
+    switch (actionId)
+    {
+    case ID_TOOLBAR_WIDGET_UNDO:
+        w = CreateUndoRedoButton(ID_UNDO);
+        break;
+    case ID_TOOLBAR_WIDGET_REDO:
+        w = CreateUndoRedoButton(ID_REDO);
+        break;
+    case ID_TOOLBAR_WIDGET_SPACER_RIGHT:
+        w = CreateSpacerRightWidget();
+        break; 
+    default:
+        qWarning() << Q_FUNC_INFO << "Unknown id " << actionId;
+        return nullptr;
+    }
+
+    return w;
+}
+
+
+// don't want to eat escape as if it were a shortcut, as it would eat it for other windows that also care about escape
+// and are reading it as an event rather.
+void MainWindow::keyPressEvent(QKeyEvent* e)
+{
+    // We shouldn't need to do this, as there's already an escape key shortcut set on an action
+    // attached to the MainWindow. We need to explicitly trap the escape key here because when in
+    // Game Mode, all of the actions attached to the MainWindow are disabled.
+    if (e->key() == Qt::Key_Escape)
+    {
+       MainWindow::OnEscapeAction();
+       return;
+    }
+    return QMainWindow::keyPressEvent(e);
+}
+
+void MainWindow::dragEnterEvent(QDragEnterEvent *event)
+{
+    using namespace AzQtComponents;
+    DragAndDropContextBase context;
+    DragAndDropEventsBus::Event(DragAndDropContexts::EditorMainWindow, &DragAndDropEvents::DragEnter, event, context);
+}
+
+void MainWindow::dragMoveEvent(QDragMoveEvent* event)
+{
+    using namespace AzQtComponents;
+    DragAndDropContextBase context;
+    DragAndDropEventsBus::Event(DragAndDropContexts::EditorMainWindow, &DragAndDropEvents::DragMove, event, context);
+}
+
+void MainWindow::dragLeaveEvent(QDragLeaveEvent* event)
+{
+    using namespace AzQtComponents;
+    DragAndDropEventsBus::Event(DragAndDropContexts::EditorMainWindow, &DragAndDropEvents::DragLeave, event);
+}
+
+void MainWindow::dropEvent(QDropEvent *event)
+{
+    using namespace AzQtComponents;
+    DragAndDropContextBase context;
+    DragAndDropEventsBus::Event(DragAndDropContexts::EditorMainWindow, &DragAndDropEvents::Drop, event, context);
+}
+
+bool MainWindow::focusNextPrevChild(bool next)
+{
+    // Don't change the focus when we're in game mode or else the viewport could
+    // stop receiving input events
+    if (GetIEditor()->IsInGameMode())
+    {
+        return false;
+    }
+
+    return QMainWindow::focusNextPrevChild(next);
+}
+
+namespace AzToolsFramework
+{
+    void MainWindowEditorFuncsHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            // this will put these methods into the 'azlmbr.legacy.general' module
+            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
+            };
+            addLegacyGeneral(behaviorContext->Method("open_pane", PyOpenViewPane, nullptr, "Opens a view pane specified by the pane class name."));
+            addLegacyGeneral(behaviorContext->Method("close_pane", PyCloseViewPane, nullptr, "Closes a view pane specified by the pane class name."));
+            addLegacyGeneral(behaviorContext->Method("is_pane_visible", PyIsViewPaneVisible, nullptr, "Returns true if pane specified by the pane class name is visible."));
+            addLegacyGeneral(behaviorContext->Method("get_pane_class_names", PyGetViewPaneNames, nullptr, "Get all available class names for use with open_pane & close_pane."));
+            addLegacyGeneral(behaviorContext->Method("exit", PyExit, nullptr, "Exits the editor."));
+            addLegacyGeneral(behaviorContext->Method("exit_no_prompt", PyExitNoPrompt, nullptr, "Exits the editor without prompting to save first."));
+            addLegacyGeneral(behaviorContext->Method("report_test_result", PyReportTest, nullptr, "Report test information."));
+        }
+    }
+}
+
+#include <moc_MainWindow.cpp>
diff --git a/Code/Editor/MainWindow.h b/Code/Editor/MainWindow.h
new file mode 100644
index 0000000000..34b121537d
--- /dev/null
+++ b/Code/Editor/MainWindow.h
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/Component/Component.h>
+
+#include <QComboBox>
+#include <QMainWindow>
+#include <QScopedPointer>
+#include <QSettings>
+#include <QList>
+#include <QPointer>
+#include <QToolButton>
+#include <QTimer>
+
+#include "Include/SandboxAPI.h"
+#include <AzQtComponents/Components/ToolButtonComboBox.h>
+#include <AzQtComponents/Components/Widgets/ToolBar.h>
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
+
+#include "IEditor.h"
+#endif
+
+class AssetImporterManager;
+class LevelEditorMenuHandler;
+class CMainFrame;
+class UndoStackStateAdapter;
+class QComboBox;
+class KeyboardCustomizationSettings;
+class QToolButton;
+class MainStatusBar;
+class CLayoutWnd;
+struct QtViewPane;
+class CLayoutViewPane;
+class QtViewport;
+class QtViewPaneManager;
+class EngineConnectionListener;
+class ToolbarManager;
+class ToolbarCustomizationDialog;
+class QWidgetAction;
+class ActionManager;
+class ShortcutDispatcher;
+class CVarMenu;
+
+namespace AzQtComponents
+{
+    class DockMainWindow;
+}
+
+namespace AzToolsFramework
+{
+    class Ticker;
+}
+
+namespace AzToolsFramework
+{
+    class QtSourceControlNotificationHandler;
+}
+
+#define MAINFRM_LAYOUT_NORMAL "NormalLayout"
+#define MAINFRM_LAYOUT_PREVIEW "PreviewLayout"
+
+// Subclassing so we can add slots to our toolbar widgets
+// Using lambdas is crashy since the lamdba doesn't know when the widget is deleted.
+
+class UndoRedoToolButton
+    : public QToolButton
+{
+    Q_OBJECT
+public:
+    explicit UndoRedoToolButton(QWidget* parent);
+public Q_SLOTS:
+    void Update(int count);
+};
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+class SANDBOX_API MainWindow
+    : public QMainWindow
+    , public IEditorNotifyListener
+    , private AzToolsFramework::SourceControlNotificationBus::Handler
+{
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget* parent = nullptr);
+    ~MainWindow();
+
+#ifdef Q_OS_WIN
+    HWND GetNativeHandle();
+#endif // #ifdef Q_OS_WIN
+
+    ActionManager* GetActionManager() const;
+
+    void Initialize();
+
+    // Returns the old and original main frame which we're porting away from.
+    // ActionManager still needs it, to SendMessage() to it.
+    CMainFrame* GetOldMainFrame() const;
+
+    bool IsPreview() const;
+
+    // The singleton is just a hack for now, it should be removed once everything
+    // is ported to Qt.
+    static MainWindow* instance();
+
+    MainStatusBar* StatusBar() const;
+    CLayoutWnd* GetLayout() const;
+
+    KeyboardCustomizationSettings* GetShortcutManager() const;
+    ToolbarManager* GetToolbarManager() const;
+
+    void OpenViewPane(int paneId);
+    void OpenViewPane(QtViewPane* pane);
+
+    void SetActiveView(CLayoutViewPane* vp);
+
+    QMenu* createPopupMenu() override;
+    bool IsCustomizingToolbars() const;
+
+    /**
+     * Returns the active view layout (Perspective, Top, Bottom, or Left, etc).
+     * This particularly useful when in multi-layout mode, it represents the default viewport to use
+     * when needing to interact with one.
+     * When the user gives mouse focus to a viewport it becomes the active one, when unfocusing it
+     * however, it remains the active one, unless another viewport got focus.
+     */
+    CLayoutViewPane* GetActiveView() const;
+    QtViewport* GetActiveViewport() const;
+
+    void AdjustToolBarIconSize(AzQtComponents::ToolBar::ToolBarIconSize size);
+    void InvalidateControls();
+    void OnCustomizeToolbar();
+    void SaveConfig();
+    void RefreshStyle();
+
+    //! Reset timers used for auto saving.
+    void ResetAutoSaveTimers(bool bForceInit = false);
+    void ResetBackgroundUpdateTimer();
+
+    void UpdateToolsMenu();
+
+    int ViewPaneVersion() const;
+
+    LevelEditorMenuHandler* GetLevelEditorMenuHandler() { return m_levelEditorMenuHandler; }
+
+    bool event(QEvent* event) override;
+
+    void OnGotoSliceRoot();
+Q_SIGNALS:
+    void ToggleRefCoordSys();
+    void UpdateRefCoordSys();
+    void DeleteSelection();
+
+protected:
+    void OnEditorNotifyEvent(EEditorNotifyEvent ev) override;
+    void closeEvent(QCloseEvent* event) override;
+    void keyPressEvent(QKeyEvent* e) override;
+
+    void dragEnterEvent(QDragEnterEvent *event) override;
+    void dragMoveEvent(QDragMoveEvent* event) override;
+    void dragLeaveEvent(QDragLeaveEvent* event) override;
+    void dropEvent(QDropEvent *event) override;
+
+    bool focusNextPrevChild(bool next) override;
+
+private:
+    void OnGameModeChanged(bool inGameMode);
+    QWidget* CreateToolbarWidget(int id);
+    void ShowCustomizeToolbarDialog();
+    void OnGotoSelected();
+
+    void ToggleConsole();
+    void RegisterOpenWndCommands();
+    void InitCentralWidget();
+    void InitActions();
+    void InitToolActionHandlers();
+    void InitToolBars();
+    void InitStatusBar();
+    void OnViewPaneCreated(const QtViewPane* pane);
+
+    template <class TValue>
+    void ReadConfigValue(const QString& key, TValue& value)
+    {
+        value = m_settings.value(key, value).template value<TValue>();
+    }
+
+    // AzToolsFramework::SourceControlNotificationBus::Handler:
+    void ConnectivityStateChanged(const AzToolsFramework::SourceControlState state) override;
+
+    QWidget* CreateSpacerRightWidget();
+
+    QToolButton* CreateUndoRedoButton(int command);
+
+private Q_SLOTS:
+    void ShowKeyboardCustomization();
+    void ExportKeyboardShortcuts();
+    void ImportKeyboardShortcuts();
+    void OnStopAllSounds();
+    void OnRefreshAudioSystem();
+    void SaveLayout();
+    void ViewDeletePaneLayout(const QString& layoutName);
+    void ViewRenamePaneLayout(const QString& layoutName);
+    void ViewLoadPaneLayout(const QString& layoutName);
+    void ViewSavePaneLayout(const QString& layoutName);
+    void OnConnectionStatusClicked();
+    void OnUpdateConnectionStatus();
+    void ShowConnectionDisconnectedDialog();
+    void OnEscapeAction();
+
+    void OnOpenAssetImporterManager(const QStringList& list);
+
+private:
+    bool IsGemEnabled(const QString& uuid, const QString& version) const;
+
+    // Broadcast the SystemTick event
+    void SystemTick();
+
+    QStringList coordSysList() const;
+    void RegisterStdViewClasses();
+    CMainFrame* m_oldMainFrame;
+    QtViewPaneManager* m_viewPaneManager;
+    ShortcutDispatcher* m_shortcutDispatcher = nullptr;
+    ActionManager* m_actionManager = nullptr;
+    UndoStackStateAdapter* m_undoStateAdapter;
+
+    KeyboardCustomizationSettings* m_keyboardCustomization;
+    CLayoutViewPane* m_activeView;
+    QSettings m_settings;
+    ToolbarManager* const m_toolbarManager;
+
+    AssetImporterManager* m_assetImporterManager;
+    LevelEditorMenuHandler* m_levelEditorMenuHandler;
+
+    CLayoutWnd* m_pLayoutWnd;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    AZStd::shared_ptr<EngineConnectionListener> m_connectionListener;
+    QTimer* m_connectionLostTimer;
+
+    QPointer<ToolbarCustomizationDialog> m_toolbarCustomizationDialog;
+    QScopedPointer<AzToolsFramework::QtSourceControlNotificationHandler> m_sourceControlNotifHandler;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    static MainWindow* m_instance;
+
+    AzQtComponents::DockMainWindow* m_viewPaneHost;
+
+    QTimer* m_autoSaveTimer;
+    QTimer* m_autoRemindTimer;
+    QTimer* m_backgroundUpdateTimer;
+
+    bool m_connectedToAssetProcessor = false;
+    bool m_showAPDisconnectDialog = false;
+    bool m_selectedEntityHasRoot = false;
+
+    friend class ToolbarManager;
+    friend class WidgetAction;
+    friend class LevelEditorMenuHandler;
+};
+
+namespace AzToolsFramework
+{
+    //! A component to reflect scriptable commands for MainWindow
+    class MainWindowEditorFuncsHandler
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(MainWindowEditorFuncsHandler, "{C879102B-C767-4349-8F06-B69119CAC462}")
+
+        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+    };
+
+} // namespace AZ
diff --git a/Code/Sandbox/Editor/MainWindow.qrc b/Code/Editor/MainWindow.qrc
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow.qrc
rename to Code/Editor/MainWindow.qrc
diff --git a/Code/Sandbox/Editor/MainWindow/ObjSelection.png b/Code/Editor/MainWindow/ObjSelection.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/ObjSelection.png
rename to Code/Editor/MainWindow/ObjSelection.png
diff --git a/Code/Sandbox/Editor/MainWindow/display_info.png b/Code/Editor/MainWindow/display_info.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/display_info.png
rename to Code/Editor/MainWindow/display_info.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-00.png b/Code/Editor/MainWindow/edit_mode_toolbar-00.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-00.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-00.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-01.png b/Code/Editor/MainWindow/edit_mode_toolbar-01.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-01.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-01.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-02.png b/Code/Editor/MainWindow/edit_mode_toolbar-02.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-02.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-02.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-03.png b/Code/Editor/MainWindow/edit_mode_toolbar-03.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-03.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-03.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-05.png b/Code/Editor/MainWindow/edit_mode_toolbar-05.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-05.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-05.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-06.png b/Code/Editor/MainWindow/edit_mode_toolbar-06.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-06.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-06.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-07.png b/Code/Editor/MainWindow/edit_mode_toolbar-07.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-07.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-07.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-08.png b/Code/Editor/MainWindow/edit_mode_toolbar-08.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-08.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-08.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-09.png b/Code/Editor/MainWindow/edit_mode_toolbar-09.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-09.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-09.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-10.png b/Code/Editor/MainWindow/edit_mode_toolbar-10.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-10.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-10.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-11.png b/Code/Editor/MainWindow/edit_mode_toolbar-11.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-11.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-11.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-12.png b/Code/Editor/MainWindow/edit_mode_toolbar-12.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-12.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-12.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-13.png b/Code/Editor/MainWindow/edit_mode_toolbar-13.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-13.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-13.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-14.png b/Code/Editor/MainWindow/edit_mode_toolbar-14.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-14.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-14.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-15.png b/Code/Editor/MainWindow/edit_mode_toolbar-15.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-15.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-15.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-16.png b/Code/Editor/MainWindow/edit_mode_toolbar-16.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-16.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-16.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-17.png b/Code/Editor/MainWindow/edit_mode_toolbar-17.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-17.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-17.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-18.png b/Code/Editor/MainWindow/edit_mode_toolbar-18.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-18.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-18.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-19.png b/Code/Editor/MainWindow/edit_mode_toolbar-19.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-19.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-19.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-20.png b/Code/Editor/MainWindow/edit_mode_toolbar-20.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-20.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-20.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-22.png b/Code/Editor/MainWindow/edit_mode_toolbar-22.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-22.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-22.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-23.png b/Code/Editor/MainWindow/edit_mode_toolbar-23.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-23.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-23.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-24.png b/Code/Editor/MainWindow/edit_mode_toolbar-24.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-24.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-24.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-25.png b/Code/Editor/MainWindow/edit_mode_toolbar-25.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-25.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-25.png
diff --git a/Code/Sandbox/Editor/MainWindow/editwithbutton_dark.png b/Code/Editor/MainWindow/editwithbutton_dark.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/editwithbutton_dark.png
rename to Code/Editor/MainWindow/editwithbutton_dark.png
diff --git a/Code/Sandbox/Editor/MainWindow/editwithbutton_light.png b/Code/Editor/MainWindow/editwithbutton_light.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/editwithbutton_light.png
rename to Code/Editor/MainWindow/editwithbutton_light.png
diff --git a/Code/Sandbox/Editor/MainWindow/hide_helpers.png b/Code/Editor/MainWindow/hide_helpers.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/hide_helpers.png
rename to Code/Editor/MainWindow/hide_helpers.png
diff --git a/Code/Sandbox/Editor/MainWindow/maximize.png b/Code/Editor/MainWindow/maximize.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/maximize.png
rename to Code/Editor/MainWindow/maximize.png
diff --git a/Code/Sandbox/Editor/MainWindow/misc_toolbar-00.png b/Code/Editor/MainWindow/misc_toolbar-00.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/misc_toolbar-00.png
rename to Code/Editor/MainWindow/misc_toolbar-00.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-00.png b/Code/Editor/MainWindow/object_toolbar-00.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-00.png
rename to Code/Editor/MainWindow/object_toolbar-00.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-01.png b/Code/Editor/MainWindow/object_toolbar-01.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-01.png
rename to Code/Editor/MainWindow/object_toolbar-01.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-02.png b/Code/Editor/MainWindow/object_toolbar-02.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-02.png
rename to Code/Editor/MainWindow/object_toolbar-02.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-03.svg b/Code/Editor/MainWindow/object_toolbar-03.svg
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-03.svg
rename to Code/Editor/MainWindow/object_toolbar-03.svg
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-04.png b/Code/Editor/MainWindow/object_toolbar-04.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-04.png
rename to Code/Editor/MainWindow/object_toolbar-04.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-05.png b/Code/Editor/MainWindow/object_toolbar-05.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-05.png
rename to Code/Editor/MainWindow/object_toolbar-05.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-06.png b/Code/Editor/MainWindow/object_toolbar-06.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-06.png
rename to Code/Editor/MainWindow/object_toolbar-06.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-07.png b/Code/Editor/MainWindow/object_toolbar-07.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-07.png
rename to Code/Editor/MainWindow/object_toolbar-07.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-08.png b/Code/Editor/MainWindow/object_toolbar-08.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-08.png
rename to Code/Editor/MainWindow/object_toolbar-08.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-09.png b/Code/Editor/MainWindow/object_toolbar-09.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-09.png
rename to Code/Editor/MainWindow/object_toolbar-09.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-10.png b/Code/Editor/MainWindow/object_toolbar-10.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-10.png
rename to Code/Editor/MainWindow/object_toolbar-10.png
diff --git a/Code/Sandbox/Editor/MainWindow/proceduralmaterial_toolbar.png b/Code/Editor/MainWindow/proceduralmaterial_toolbar.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/proceduralmaterial_toolbar.png
rename to Code/Editor/MainWindow/proceduralmaterial_toolbar.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-00.png b/Code/Editor/MainWindow/standard_views_toolbar-00.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-00.png
rename to Code/Editor/MainWindow/standard_views_toolbar-00.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-01.png b/Code/Editor/MainWindow/standard_views_toolbar-01.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-01.png
rename to Code/Editor/MainWindow/standard_views_toolbar-01.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-02.png b/Code/Editor/MainWindow/standard_views_toolbar-02.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-02.png
rename to Code/Editor/MainWindow/standard_views_toolbar-02.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-03.png b/Code/Editor/MainWindow/standard_views_toolbar-03.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-03.png
rename to Code/Editor/MainWindow/standard_views_toolbar-03.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-04.png b/Code/Editor/MainWindow/standard_views_toolbar-04.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-04.png
rename to Code/Editor/MainWindow/standard_views_toolbar-04.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-05.png b/Code/Editor/MainWindow/standard_views_toolbar-05.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-05.png
rename to Code/Editor/MainWindow/standard_views_toolbar-05.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-06.png b/Code/Editor/MainWindow/standard_views_toolbar-06.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-06.png
rename to Code/Editor/MainWindow/standard_views_toolbar-06.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-07.png b/Code/Editor/MainWindow/standard_views_toolbar-07.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-07.png
rename to Code/Editor/MainWindow/standard_views_toolbar-07.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-08.png b/Code/Editor/MainWindow/standard_views_toolbar-08.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-08.png
rename to Code/Editor/MainWindow/standard_views_toolbar-08.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-09.png b/Code/Editor/MainWindow/standard_views_toolbar-09.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-09.png
rename to Code/Editor/MainWindow/standard_views_toolbar-09.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-10.png b/Code/Editor/MainWindow/standard_views_toolbar-10.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-10.png
rename to Code/Editor/MainWindow/standard_views_toolbar-10.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-11.png b/Code/Editor/MainWindow/standard_views_toolbar-11.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-11.png
rename to Code/Editor/MainWindow/standard_views_toolbar-11.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-12.png b/Code/Editor/MainWindow/standard_views_toolbar-12.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-12.png
rename to Code/Editor/MainWindow/standard_views_toolbar-12.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-13.png b/Code/Editor/MainWindow/standard_views_toolbar-13.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-13.png
rename to Code/Editor/MainWindow/standard_views_toolbar-13.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-14.png b/Code/Editor/MainWindow/standard_views_toolbar-14.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-14.png
rename to Code/Editor/MainWindow/standard_views_toolbar-14.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-15.png b/Code/Editor/MainWindow/standard_views_toolbar-15.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-15.png
rename to Code/Editor/MainWindow/standard_views_toolbar-15.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-16.png b/Code/Editor/MainWindow/standard_views_toolbar-16.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-16.png
rename to Code/Editor/MainWindow/standard_views_toolbar-16.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-17.png b/Code/Editor/MainWindow/standard_views_toolbar-17.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-17.png
rename to Code/Editor/MainWindow/standard_views_toolbar-17.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-18.png b/Code/Editor/MainWindow/standard_views_toolbar-18.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-18.png
rename to Code/Editor/MainWindow/standard_views_toolbar-18.png
diff --git a/Code/Editor/MainWindow_mac.mm b/Code/Editor/MainWindow_mac.mm
new file mode 100644
index 0000000000..81548c8d6a
--- /dev/null
+++ b/Code/Editor/MainWindow_mac.mm
@@ -0,0 +1,42 @@
+/*
+ * 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 <Cocoa/Cocoa.h>
+
+#include <QWidget>
+
+void setCocoaMouseCursor(QWidget* widget)
+{
+    if (widget == nullptr)
+    {
+        // no widget, default cursor
+        [[NSCursor arrowCursor] set];
+    }
+    else
+    {
+        // otherwhise activate the Cocoa mouse
+        // cursor matching the one set via Qt
+        switch (widget->cursor().shape())
+        {
+        case Qt::ArrowCursor:
+            [[NSCursor arrowCursor] set];
+            break;
+        case Qt::SizeHorCursor:
+        case Qt::SplitVCursor:
+            [[NSCursor resizeUpDownCursor] set];
+            break;
+        case Qt::SizeVerCursor:
+        case Qt::SplitHCursor:
+            [[NSCursor resizeLeftRightCursor] set];
+            break;
+        default:
+            // for all other cursors we do nothing
+            // since this is only to fix the splitter handle cursors for now
+            break;
+        }
+    }
+}
diff --git a/Code/Editor/NewLevelDialog.cpp b/Code/Editor/NewLevelDialog.cpp
new file mode 100644
index 0000000000..2607528d56
--- /dev/null
+++ b/Code/Editor/NewLevelDialog.cpp
@@ -0,0 +1,255 @@
+/*
+ * 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 "NewLevelDialog.h"
+
+// Qt
+#include <QtWidgets/QPushButton>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QTimer>
+#include <QToolButton>
+
+// Editor
+#include "NewTerrainDialog.h"  
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_NewLevelDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+// Folder in which levels are stored
+static const char kNewLevelDialog_LevelsFolder[] = "Levels";
+
+class LevelFolderValidator : public QValidator
+{
+public:
+    LevelFolderValidator(QObject* parent)
+        : QValidator(parent)
+    {
+        m_parentDialog = qobject_cast<CNewLevelDialog*>(parent);
+    }
+
+    QValidator::State validate([[maybe_unused]] QString& input, [[maybe_unused]] int& pos) const override
+    {
+        if (m_parentDialog->ValidateLevel())
+        {
+            return QValidator::Acceptable;
+        }
+
+        return QValidator::Intermediate;
+    }
+
+private:
+    CNewLevelDialog* m_parentDialog;
+};
+
+// CNewLevelDialog dialog
+
+CNewLevelDialog::CNewLevelDialog(QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_bUpdate(false)
+    , ui(new Ui::CNewLevelDialog)
+    , m_initialized(false)
+{
+    ui->setupUi(this);
+
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setWindowTitle(tr("New Level"));
+    setMaximumSize(QSize(320, 180));
+    adjustSize();
+
+    m_bIsResize = false;
+
+    
+    ui->TITLE->setText(tr("Assign a name and location to the new level."));
+    ui->STATIC1->setText(tr("Location:"));
+    ui->STATIC2->setText(tr("Name:"));
+
+    // Level name only supports ASCII characters
+    QRegExp rx("[_a-zA-Z0-9-]+");
+    QValidator* validator = new QRegExpValidator(rx, this);
+    ui->LEVEL->setValidator(validator);
+
+    validator = new LevelFolderValidator(this);
+    ui->LEVEL_FOLDERS->lineEdit()->setValidator(validator);
+    ui->LEVEL_FOLDERS->setErrorToolTip(
+        QString("The location must be a folder underneath the current project's %1 folder. (%2)")
+            .arg(kNewLevelDialog_LevelsFolder)
+            .arg(GetLevelsFolder()));
+
+    ui->LEVEL_FOLDERS->setClearButtonEnabled(true);
+    QToolButton* clearButton = AzQtComponents::LineEdit::getClearButton(ui->LEVEL_FOLDERS->lineEdit());
+    assert(clearButton);
+    connect(clearButton, &QToolButton::clicked, this, &CNewLevelDialog::OnClearButtonClicked);
+
+    connect(ui->LEVEL_FOLDERS->lineEdit(), &QLineEdit::textEdited, this, &CNewLevelDialog::OnLevelNameChange);
+    connect(ui->LEVEL_FOLDERS, &AzQtComponents::BrowseEdit::attachedButtonTriggered, this, &CNewLevelDialog::PopupAssetPicker);
+
+    connect(ui->LEVEL, &QLineEdit::textChanged, this, &CNewLevelDialog::OnLevelNameChange);
+
+    m_levelFolders = GetLevelsFolder();
+    m_level = "";
+    // First of all, keyboard focus is related to widget tab order, and the default tab order is based on the order in which 
+    // widgets are constructed. Therefore, creating more widgets changes the keyboard focus. That is why setFocus() is called last.
+    // Secondly, using singleShot() allows setFocus() slot of the QLineEdit instance to be invoked right after the event system
+    // is ready to do so. Therefore, it is better to use singleShot() than directly call setFocus().
+    QTimer::singleShot(0, ui->LEVEL, SLOT(OnStartup()));
+
+    ReloadLevelFolder();
+}
+
+CNewLevelDialog::~CNewLevelDialog()
+{
+}
+
+void CNewLevelDialog::OnStartup()
+{
+    UpdateData(false);
+    setFocus();
+}
+
+void CNewLevelDialog::UpdateData(bool fromUi)
+{
+    if (fromUi)
+    {
+        m_level = ui->LEVEL->text();
+        m_levelFolders = ui->LEVEL_FOLDERS->text();
+    }
+    else
+    {
+        ui->LEVEL->setText(m_level);
+        ui->LEVEL_FOLDERS->lineEdit()->setText(m_levelFolders);
+    }
+}
+
+// CNewLevelDialog message handlers
+
+void CNewLevelDialog::OnInitDialog()
+{
+    ReloadLevelFolder();
+
+    // Disable OK until some text is entered
+    if (QPushButton* button = ui->buttonBox->button(QDialogButtonBox::Ok))
+    {
+        button->setEnabled(false);
+    }
+
+    // Save data.
+    UpdateData(false);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CNewLevelDialog::ReloadLevelFolder()
+{
+    m_itemFolders.clear();
+    ui->LEVEL_FOLDERS->lineEdit()->clear();
+    ui->LEVEL_FOLDERS->setText(QString(kNewLevelDialog_LevelsFolder) + '/');
+}
+
+QString CNewLevelDialog::GetLevelsFolder() const
+{
+    QDir projectDir = QDir(Path::GetEditingGameDataFolder().c_str());
+    QDir projectLevelsDir = QDir(QStringLiteral("%1/%2").arg(projectDir.absolutePath()).arg(kNewLevelDialog_LevelsFolder));
+
+    return projectLevelsDir.absolutePath();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CNewLevelDialog::GetLevel() const
+{
+    QString output = m_level;
+
+    QDir projectLevelsDir = QDir(GetLevelsFolder());
+
+    if (!m_levelFolders.isEmpty())
+    {
+        output = m_levelFolders + "/" + m_level;
+    }
+
+    QString relativePath = projectLevelsDir.relativeFilePath(output);
+
+    return relativePath;
+}
+
+bool CNewLevelDialog::ValidateLevel()
+{
+    // Check that the selected folder is in or below the project/LEVELS folder.
+    QDir projectLevelsDir = QDir(GetLevelsFolder());
+
+    QString selectedFolder = ui->LEVEL_FOLDERS->text();
+    QString absolutePath = QDir::cleanPath(projectLevelsDir.absoluteFilePath(selectedFolder));
+    QString relativePath = projectLevelsDir.relativeFilePath(absolutePath);
+
+    // Prevent saving to a different drive.
+    if (projectLevelsDir.absolutePath()[0] != absolutePath[0])
+    {
+        return false;
+    }
+
+    if (relativePath.startsWith(".."))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+void CNewLevelDialog::OnLevelNameChange()
+{
+    UpdateData(true);
+
+    // QRegExpValidator means the string will always be valid as long as it's not empty:
+    const bool valid = !m_level.isEmpty() && ValidateLevel();
+
+    // Use the validity to dynamically change the Ok button's enabled state
+    if (QPushButton* button = ui->buttonBox->button(QDialogButtonBox::Ok))
+    {
+        button->setEnabled(valid);
+    }
+}
+
+void CNewLevelDialog::OnClearButtonClicked()
+{
+    ui->LEVEL_FOLDERS->lineEdit()->setText(GetLevelsFolder());
+    UpdateData(true);
+
+}
+
+void CNewLevelDialog::PopupAssetPicker()
+{
+    QString newPath = QFileDialog::getExistingDirectory(nullptr, QObject::tr("Choose Destination Folder"), GetLevelsFolder());
+
+    if (!newPath.isEmpty())
+    {
+        ui->LEVEL_FOLDERS->setText(newPath);
+        OnLevelNameChange();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CNewLevelDialog::IsResize(bool bIsResize)
+{
+    m_bIsResize = bIsResize;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CNewLevelDialog::showEvent(QShowEvent* event)
+{
+    if (!m_initialized)
+    {
+        OnInitDialog();
+        m_initialized = true;
+    }
+    QDialog::showEvent(event);
+}
+
+#include <moc_NewLevelDialog.cpp>
diff --git a/Code/Editor/NewLevelDialog.h b/Code/Editor/NewLevelDialog.h
new file mode 100644
index 0000000000..0c1330c36b
--- /dev/null
+++ b/Code/Editor/NewLevelDialog.h
@@ -0,0 +1,66 @@
+/*
+ * 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_EDITOR_NEWLEVELDIALOG_H
+#define CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
+
+#if !defined(Q_MOC_RUN)
+#include <QScopedPointer>
+
+#include <vector>
+
+#include <QAbstractButton>
+#include <QDialog>
+#endif
+
+namespace Ui {
+    class CNewLevelDialog;
+}
+
+class CNewLevelDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CNewLevelDialog(QWidget* pParent = nullptr);   // standard constructor
+    ~CNewLevelDialog();
+
+    QString GetLevel() const;
+    void IsResize(bool bIsResize);
+    bool ValidateLevel();
+
+protected:
+    void UpdateData(bool fromUi = true);
+    void OnInitDialog();
+
+    void ReloadLevelFolder();
+
+    void showEvent(QShowEvent* event);
+
+    QString GetLevelsFolder() const;
+
+protected slots:
+    void OnLevelNameChange();
+    void OnClearButtonClicked();
+    void PopupAssetPicker();
+    void OnStartup();
+
+public:
+    QString         m_level;
+    QString         m_levelFolders;
+    bool                m_bIsResize;
+    bool                m_bUpdate;
+
+    std::vector<QString>    m_itemFolders;
+
+    QScopedPointer<Ui::CNewLevelDialog> ui;
+    bool m_initialized;
+};
+#endif // CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
diff --git a/Code/Sandbox/Editor/NewLevelDialog.ui b/Code/Editor/NewLevelDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/NewLevelDialog.ui
rename to Code/Editor/NewLevelDialog.ui
diff --git a/Code/Editor/NewTerrainDialog.cpp b/Code/Editor/NewTerrainDialog.cpp
new file mode 100644
index 0000000000..39f94985f5
--- /dev/null
+++ b/Code/Editor/NewTerrainDialog.cpp
@@ -0,0 +1,167 @@
+/*
+ * 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
+ *
+ */
+// NewTerrainDialog.cpp : implementation file
+//
+
+#include "EditorDefs.h"
+
+#include "NewTerrainDialog.h"
+
+
+AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
+#include <ui_NewTerrainDialog.h>
+AZ_POP_DISABLE_WARNING
+
+
+
+CNewTerrainDialog::CNewTerrainDialog(QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_terrainResolutionIndex(0)
+    , m_terrainUnitsIndex(0)
+    , m_bUpdate(false)
+    , ui(new Ui::CNewTerrainDialog)
+    , m_initialized(false)
+{
+    ui->setupUi(this);
+
+    setWindowTitle(tr("Terrain options"));
+
+    // Default is 1024x1024, and m_terrainResolution holds an index to the combo box
+    m_terrainResolutionIndex = 3;
+
+    connect(ui->TERRAIN_RESOLUTION, SIGNAL(activated(int)), this, SLOT(OnComboBoxSelectionTerrainResolution()));
+    connect(ui->TERRAIN_UNITS, SIGNAL(activated(int)), this, SLOT(OnComboBoxSelectionTerrainUnits()));
+}
+
+
+CNewTerrainDialog::~CNewTerrainDialog()
+{
+}
+
+
+void CNewTerrainDialog::UpdateData(bool fromUi)
+{
+    if (fromUi)
+    {
+        m_terrainResolutionIndex = ui->TERRAIN_RESOLUTION->currentIndex();
+        m_terrainUnitsIndex = ui->TERRAIN_UNITS->currentIndex();
+    }
+    else
+    {
+        ui->TERRAIN_RESOLUTION->setCurrentIndex(m_terrainResolutionIndex);
+        ui->TERRAIN_UNITS->setCurrentIndex(m_terrainUnitsIndex);
+    }
+}
+
+
+void CNewTerrainDialog::OnInitDialog()
+{
+    // Initialize terrain values.
+    int resolution = Ui::START_TERRAIN_RESOLUTION;
+
+    // Fill terrain resolution combo box
+    for (int i = 0; i < 6; i++)
+    {
+        ui->TERRAIN_RESOLUTION->addItem(QString("%1x%1").arg(resolution));
+        resolution *= 2;
+    }
+
+    UpdateTerrainUnits();
+    UpdateTerrainInfo();
+
+    // Save data.
+    UpdateData(false);
+}
+
+
+void CNewTerrainDialog::UpdateTerrainUnits()
+{
+    uint32 terrainRes = GetTerrainResolution();
+    int size = terrainRes * GetTerrainUnits();
+    int maxUnit = IntegerLog2(Ui::MAXIMUM_TERRAIN_RESOLUTION / terrainRes);
+    int units = Ui::START_TERRAIN_UNITS;
+
+    ui->TERRAIN_UNITS->clear();
+    for (int i = 0; i <= maxUnit; i++)
+    {
+        ui->TERRAIN_UNITS->addItem(QString::number(units));
+        units *= 2;
+    }
+    if (size > Ui::MAXIMUM_TERRAIN_RESOLUTION)
+    {
+        m_terrainUnitsIndex = 0;
+    }
+    ui->TERRAIN_UNITS->setCurrentText(QString::number(m_terrainUnitsIndex));
+}
+
+
+void CNewTerrainDialog::UpdateTerrainInfo()
+{
+    int sizeX = GetTerrainResolution() * GetTerrainUnits();
+    int sizeY = GetTerrainResolution() * GetTerrainUnits();
+
+    QString str;
+    if (sizeX >= 1000)
+    {
+        str = tr("Terrain Size: %1 x %2 Kilometers").arg((float)sizeX / 1000.0f, 0, 'f', 3).arg((float)sizeY / 1000.0f, 0, 'f', 3);
+    }
+    else if (sizeX > 0)
+    {
+        str = tr("Terrain Size: %1 x %2 Meters").arg(sizeX).arg(sizeY);
+    }
+    else
+    {
+        str = tr("Level will have no terrain");
+    }
+
+    ui->TERRAIN_INFO->setText(str);
+}
+
+
+int CNewTerrainDialog::GetTerrainResolution() const
+{
+    // convert combo box index into resolution value
+    return Ui::START_TERRAIN_RESOLUTION * (1 << m_terrainResolutionIndex);
+}
+
+
+int CNewTerrainDialog::GetTerrainUnits() const
+{
+    // convert combo box index into units value
+    return Ui::START_TERRAIN_UNITS * (1 << m_terrainUnitsIndex);
+}
+
+
+void CNewTerrainDialog::OnComboBoxSelectionTerrainResolution()
+{
+    UpdateData();
+
+    UpdateTerrainUnits();
+
+    UpdateTerrainInfo();
+}
+
+
+void CNewTerrainDialog::OnComboBoxSelectionTerrainUnits()
+{
+    UpdateData();
+
+    UpdateTerrainInfo();
+}
+
+
+void CNewTerrainDialog::showEvent(QShowEvent* event)
+{
+    if (!m_initialized)
+    {
+        OnInitDialog();
+        m_initialized = true;
+    }
+    QDialog::showEvent(event);
+}
+
+#include <moc_NewTerrainDialog.cpp>
diff --git a/Code/Editor/NewTerrainDialog.h b/Code/Editor/NewTerrainDialog.h
new file mode 100644
index 0000000000..e92026e483
--- /dev/null
+++ b/Code/Editor/NewTerrainDialog.h
@@ -0,0 +1,70 @@
+/*
+ * 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_EDITOR_NEWTERRAINDIALOG_H
+#define CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
+
+#if !defined(Q_MOC_RUN)
+#include <QScopedPointer>
+
+#include <vector>
+
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class CNewTerrainDialog;
+
+    enum TerrainDialogConstants
+    {
+        START_TERRAIN_RESOLUTION_POWER_OF_TWO = 7,
+        START_TERRAIN_RESOLUTION = 1 << START_TERRAIN_RESOLUTION_POWER_OF_TWO,
+        MAXIMUM_TERRAIN_POWER_OF_TWO = 16,
+        MAXIMUM_TERRAIN_RESOLUTION = 1 << MAXIMUM_TERRAIN_POWER_OF_TWO,
+        POWER_OFFSET = (MAXIMUM_TERRAIN_POWER_OF_TWO - START_TERRAIN_RESOLUTION_POWER_OF_TWO),
+        START_TERRAIN_UNITS = 1
+    };
+}
+
+class CNewTerrainDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CNewTerrainDialog(QWidget* pParent = nullptr);   // standard constructor
+    ~CNewTerrainDialog();
+
+    int GetTerrainResolution() const;
+    int GetTerrainUnits() const;
+
+    void IsResize(bool bIsResize);
+
+
+protected:
+    void UpdateData(bool fromUi = true);
+    void OnInitDialog();
+
+    void UpdateTerrainUnits();
+    void UpdateTerrainInfo();
+
+    void showEvent(QShowEvent* event) override;
+
+protected slots:
+    void OnComboBoxSelectionTerrainResolution();
+    void OnComboBoxSelectionTerrainUnits();
+
+public:
+    int m_terrainResolutionIndex;
+    int m_terrainUnitsIndex;
+    bool m_bUpdate;
+
+    QScopedPointer<Ui::CNewTerrainDialog> ui;
+    bool m_initialized;
+};
+#endif // CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
diff --git a/Code/Sandbox/Editor/NewTerrainDialog.ui b/Code/Editor/NewTerrainDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/NewTerrainDialog.ui
rename to Code/Editor/NewTerrainDialog.ui
diff --git a/Code/Editor/Objects/AxisGizmo.cpp b/Code/Editor/Objects/AxisGizmo.cpp
new file mode 100644
index 0000000000..26ee2c7390
--- /dev/null
+++ b/Code/Editor/Objects/AxisGizmo.cpp
@@ -0,0 +1,366 @@
+/*
+ * 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 "AxisGizmo.h"
+
+// Editor
+#include "Viewport.h"
+#include "GizmoManager.h"
+#include "ViewManager.h"
+#include "Settings.h"
+#include "RenderHelpers/AxisHelper.h"
+#include "IObjectManager.h"
+
+//////////////////////////////////////////////////////////////////////////
+// CAxisGizmo implementation.
+//////////////////////////////////////////////////////////////////////////
+int CAxisGizmo::m_axisGizmoCount = 0;
+
+//////////////////////////////////////////////////////////////////////////
+CAxisGizmo::CAxisGizmo(CBaseObject* object)
+{
+    assert(object != 0);
+    m_object = object;
+    m_pAxisHelper.reset(new CAxisHelper);
+
+    // Set selectable flag.
+    SetFlags(EGIZMO_SELECTABLE | EGIZMO_TRANSFORM_MANIPULATOR);
+
+    m_axisGizmoCount++;
+    m_object->AddEventListener(this);
+
+    m_localTM.SetIdentity();
+    m_parentTM.SetIdentity();
+    m_matrix.SetIdentity();
+
+    m_bDragging = false;
+    m_bAlwaysUseLocal = false;
+    m_coordSysBackUp = COORDS_VIEW;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CAxisGizmo::CAxisGizmo()
+{
+    // Set selectable flag.
+    SetFlags(EGIZMO_SELECTABLE);
+    m_axisGizmoCount++;
+    m_pAxisHelper.reset(new CAxisHelper);
+    m_bDragging = false;
+    m_bAlwaysUseLocal = false;
+    m_coordSysBackUp = COORDS_VIEW;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CAxisGizmo::~CAxisGizmo()
+{
+    if (m_object)
+    {
+        m_object->RemoveEventListener(this);
+    }
+    m_axisGizmoCount--;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisGizmo::OnObjectEvent([[maybe_unused]] CBaseObject* object, int event)
+{
+    if (event == CBaseObject::ON_DELETE || event == CBaseObject::ON_UNSELECT)
+    {
+        // This gizmo must be deleted as well.
+        GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(this);
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisGizmo::Display(DisplayContext& dc)
+{
+    if (m_object)
+    {
+        const bool visible =
+                !m_object->IsHidden()
+            &&  !m_object->IsFrozen()
+            &&  m_object->IsSelected();
+
+        if (!visible)
+        {
+            // This gizmo must be deleted.
+            DeleteThis();
+            return;
+        }
+
+        if (m_object->IsSkipSelectionHelper())
+        {
+            return;
+        }
+    }
+
+    DrawAxis(dc);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisGizmo::SetWorldBounds(const AABB& bbox)
+{
+    m_bbox = bbox;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisGizmo::GetWorldBounds(AABB& bbox)
+{
+    if (m_object)
+    {
+        m_object->GetBoundBox(bbox);
+    }
+    else
+    {
+        bbox.min = Vec3(-1000000, -1000000, -1000000);
+        bbox.max = Vec3(1000000, 1000000, 1000000);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisGizmo::DrawAxis(DisplayContext& dc)
+{
+    m_pAxisHelper->SetHighlightAxis(m_highlightAxis);
+
+    Matrix34 tm = GetTransformation(m_bAlwaysUseLocal ? COORDS_LOCAL : GetIEditor()->GetReferenceCoordSys(), dc.view);
+    m_pAxisHelper->DrawAxis(tm, GetIEditor()->GetGlobalGizmoParameters(), dc);
+    if (m_object && m_object->CheckFlags(OBJFLAG_IS_PARTICLE))
+    {
+        AABB objectBox;
+        m_object->GetBoundBox(objectBox);
+
+        m_pAxisHelper->DrawDome(tm, GetIEditor()->GetGlobalGizmoParameters(), dc, objectBox);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const Matrix34& CAxisGizmo::GetMatrix() const
+{
+    if (m_object)
+    {
+        m_matrix.SetTranslation(m_object->GetWorldTM().GetTranslation());
+    }
+    return m_matrix;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CAxisGizmo::HitTest(HitContext& hc)
+{
+    Matrix34 tm = GetTransformation(m_bAlwaysUseLocal ? COORDS_LOCAL : GetIEditor()->GetReferenceCoordSys(), hc.view);
+
+    CAxisHelper axis;
+    bool bRes = m_pAxisHelper->HitTest(tm, GetIEditor()->GetGlobalGizmoParameters(), hc);
+    if (bRes)
+    {
+        hc.object = m_object;
+    }
+
+    m_highlightAxis = m_pAxisHelper->GetHighlightAxis();
+
+    return bRes;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CAxisGizmo::HitTestManipulator(HitContext& hc)
+{
+    return HitTest(hc);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisGizmo::SetTransformation(RefCoordSys coordSys, const Matrix34& tm)
+{
+    switch (coordSys)
+    {
+    case COORDS_WORLD:
+        SetMatrix(tm);
+        break;
+    case COORDS_LOCAL:
+        m_localTM = tm;
+        {
+            Matrix34 wtm;
+            wtm.SetIdentity();
+            wtm.SetTranslation(m_localTM.GetTranslation());
+            SetMatrix(wtm);
+            m_userTM = tm;
+        }
+        m_parentTM = m_localTM;
+        break;
+    case COORDS_PARENT:
+        m_parentTM = tm;
+        break;
+    case COORDS_USERDEFINED:
+        m_userTM = tm;
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+Matrix34 CAxisGizmo::GetTransformation(RefCoordSys coordSys, IDisplayViewport* view /*=nullptr*/) const
+{
+    if (m_object)
+    {
+        switch (coordSys)
+        {
+        case COORDS_VIEW:
+            if (view)
+            {
+                Matrix34 tm = view->GetViewTM();
+                tm.SetTranslation(m_object->GetWorldTM().GetTranslation());
+                return tm;
+            }
+            return GetMatrix();
+            break;
+        case COORDS_LOCAL:
+            return m_object->GetWorldTM();
+            break;
+        case COORDS_PARENT:
+            //return m_parentTM;
+            if (m_object->GetParent())
+            {
+                Matrix34 parentTM = m_object->GetParent()->GetWorldTM();
+                parentTM.SetTranslation(m_object->GetWorldTM().GetTranslation());
+                return parentTM;
+            }
+            else
+            {
+                return GetMatrix();
+            }
+            break;
+        case COORDS_WORLD:
+            return GetMatrix();
+            break;
+        case COORDS_USERDEFINED:
+        {
+            Matrix34 userTM;
+            userTM.SetIdentity();
+            userTM.SetTranslation(m_object->GetWorldTM().GetTranslation());
+            return userTM;
+        }
+        break;
+        }
+    }
+    else
+    {
+        switch (coordSys)
+        {
+        case COORDS_VIEW:
+            return GetMatrix();
+            break;
+        case COORDS_LOCAL:
+            return m_localTM;
+            break;
+        case COORDS_PARENT:
+            return m_parentTM;
+            break;
+        case COORDS_WORLD:
+            return GetMatrix();
+            break;
+        case COORDS_USERDEFINED:
+            return m_userTM;
+            break;
+        }
+    }
+    return GetMatrix();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point, [[maybe_unused]] int nFlags)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    if (event == eMouseLDown)
+    {
+        HitContext hc;
+        hc.view = view;
+        hc.b2DViewport = view->GetType() != ET_ViewportCamera;
+        hc.point2d = point;
+        view->ViewToWorldRay(point, hc.raySrc, hc.rayDir);
+        if (HitTest(hc))
+        {
+            if (event != eMouseLDown)
+            {
+                return false;
+            }
+
+            // On Left mouse down.
+
+            // Hit axis gizmo.
+            GetIEditor()->SetAxisConstraints((AxisConstrains)hc.axis);
+            view->SetAxisConstrain(hc.axis);
+
+            if (m_bAlwaysUseLocal)
+            {
+                m_coordSysBackUp = GetIEditor()->GetReferenceCoordSys();
+                GetIEditor()->SetReferenceCoordSys(COORDS_LOCAL);
+            }
+
+            view->SetConstructionMatrix(COORDS_LOCAL, GetTransformation(COORDS_LOCAL));
+            view->SetConstructionMatrix(COORDS_PARENT, GetTransformation(COORDS_PARENT));
+            view->SetConstructionMatrix(COORDS_USERDEFINED, GetTransformation(COORDS_USERDEFINED));
+
+            view->BeginUndo();
+            view->CaptureMouse();
+            m_bDragging = true;
+            m_cMouseDownPos = point;
+            m_initPos = GetTransformation(COORDS_WORLD).GetTranslation();
+
+            return true;
+        }
+    }
+    else if (event == eMouseMove)
+    {
+        if (m_bDragging)
+        {
+            return true;
+        }
+        else
+        {
+            // Hit test current transform manipulator, to highlight when mouse over.
+            HitContext hc;
+            hc.view = view;
+            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)
+                {
+                case 1:
+                    view->SetCurrentCursor(STD_CURSOR_MOVE);
+                    break;
+                case 2:
+                    view->SetCurrentCursor(STD_CURSOR_ROTATE);
+                    break;
+                case 3:
+                    view->SetCurrentCursor(STD_CURSOR_SCALE);
+                    break;
+                }
+                bHit = true;
+            }
+        }
+    }
+    else if (event == eMouseLUp)
+    {
+        if (m_bDragging)
+        {
+            view->AcceptUndo("Manipulator Drag");
+            view->ReleaseMouse();
+            m_bDragging = false;
+
+            if (m_bAlwaysUseLocal)
+            {
+                GetIEditor()->SetReferenceCoordSys(m_coordSysBackUp);
+            }
+        }
+    }
+
+    return false;
+}
diff --git a/Code/Editor/Objects/AxisGizmo.h b/Code/Editor/Objects/AxisGizmo.h
new file mode 100644
index 0000000000..cc31ca910e
--- /dev/null
+++ b/Code/Editor/Objects/AxisGizmo.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_AXISGIZMO_H
+#define CRYINCLUDE_EDITOR_OBJECTS_AXISGIZMO_H
+#pragma once
+
+#include "BaseObject.h"
+#include "Gizmo.h"
+#include "Include/ITransformManipulator.h"
+
+// forward declarations.
+struct DisplayContext;
+class CAxisHelper;
+
+/** Gizmo of Objects animation track.
+*/
+class SANDBOX_API CAxisGizmo
+    : public CGizmo
+    , public ITransformManipulator
+    , public CBaseObject::EventListener
+{
+public:
+    CAxisGizmo();
+    // Creates axis gizmo linked to an object.
+    CAxisGizmo(CBaseObject* object);
+    ~CAxisGizmo();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Ovverides from CGizmo
+    //////////////////////////////////////////////////////////////////////////
+    virtual void GetWorldBounds(AABB& bbox);
+    virtual void Display(DisplayContext& dc);
+    virtual bool HitTest(HitContext& hc);
+    virtual const Matrix34& GetMatrix() const;
+    //////////////////////////////////////////////////////////////////////////
+
+
+    //////////////////////////////////////////////////////////////////////////
+    // ITransformManipulator implementation.
+    //////////////////////////////////////////////////////////////////////////
+    virtual Matrix34 GetTransformation(RefCoordSys coordSys, IDisplayViewport* view = nullptr) const;
+    virtual void SetTransformation(RefCoordSys coordSys, const Matrix34& tm);
+    virtual bool HitTestManipulator(HitContext& hc);
+    virtual bool MouseCallback(CViewport* view, EMouseEvent event, QPoint& point, int nFlags);
+    virtual void SetAlwaysUseLocal(bool on)
+    { m_bAlwaysUseLocal = on; }
+    //////////////////////////////////////////////////////////////////////////
+
+
+    //////////////////////////////////////////////////////////////////////////
+    void SetWorldBounds(const AABB& bbox);
+
+    void DrawAxis(DisplayContext& dc);
+
+    static int GetGlobalAxisGizmoCount() { return m_axisGizmoCount; }
+
+    CBaseObjectPtr GetBaseObject() const override { return m_object; }
+
+private:
+    void OnObjectEvent(CBaseObject* object, int event) override;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    CBaseObjectPtr m_object;
+    AABB m_bbox;
+    std::unique_ptr<CAxisHelper> m_pAxisHelper;
+
+    bool m_bDragging;
+    QPoint m_cMouseDownPos;
+    Vec3 m_initPos;
+
+    int m_highlightAxis;
+
+    Matrix34 m_localTM;
+    Matrix34 m_parentTM;
+    Matrix34 m_userTM;
+
+    bool m_bAlwaysUseLocal;
+    RefCoordSys m_coordSysBackUp;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    static int m_axisGizmoCount;
+};
+#endif // CRYINCLUDE_EDITOR_OBJECTS_AXISGIZMO_H
diff --git a/Code/Editor/Objects/BaseObject.cpp b/Code/Editor/Objects/BaseObject.cpp
new file mode 100644
index 0000000000..f5a79759ea
--- /dev/null
+++ b/Code/Editor/Objects/BaseObject.cpp
@@ -0,0 +1,2914 @@
+/*
+ * 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 : CBaseObject implementation.
+
+
+#include "EditorDefs.h"
+
+#include "BaseObject.h"
+
+// Azframework
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>      // for AzFramework::Terrain::TerrainDataRequests
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>  // for ComponentEntityObjectRequestBus
+
+// Editor
+#include "Settings.h"
+#include "Viewport.h"
+#include "DisplaySettings.h"
+#include "Undo/Undo.h"
+#include "UsedResources.h"
+#include "GizmoManager.h"
+#include "Include/IIconManager.h"
+#include "Objects/SelectionGroup.h"
+#include "Objects/ObjectManager.h"
+#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"
+
+
+namespace {
+    QColor kLinkColorParent = QColor(0, 255, 255);
+    QColor kLinkColorChild = QColor(0, 0, 255);
+    QColor kLinkColorGray = QColor(128, 128, 128);
+}
+
+extern CObjectManager* g_pObjectManager;
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//! Undo object for CBaseObject.
+class CUndoBaseObject
+    : public IUndoObject
+{
+public:
+    CUndoBaseObject(CBaseObject* pObj, const char* undoDescription);
+
+protected:
+    virtual int GetSize() { return sizeof(*this);   }
+    virtual QString GetDescription() { return m_undoDescription; };
+    virtual QString GetObjectName();
+
+    virtual void Undo(bool bUndo);
+    virtual void Redo();
+
+protected:
+    QString m_undoDescription;
+    GUID m_guid;
+    XmlNodeRef m_undo;
+    XmlNodeRef m_redo;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//! Undo object for CBaseObject that only stores its transform, color, area and minSpec
+class CUndoBaseObjectMinimal
+    : public IUndoObject
+{
+public:
+    CUndoBaseObjectMinimal(CBaseObject* obj, const char* undoDescription, int flags);
+
+protected:
+    virtual int GetSize() { return sizeof(*this); }
+    virtual QString GetDescription() { return m_undoDescription; };
+    virtual QString GetObjectName();
+
+    virtual void Undo(bool bUndo);
+    virtual void Redo();
+
+private:
+    struct StateStruct
+    {
+        Vec3 pos;
+        Quat rotate;
+        Vec3 scale;
+        QColor color;
+        float area;
+        int minSpec;
+    };
+
+    void SetTransformsFromState(CBaseObject* pObject, const StateStruct& state, bool bUndo);
+
+    GUID m_guid;
+    QString m_undoDescription;
+    StateStruct m_undoState;
+    StateStruct m_redoState;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo object for attach/detach changes
+class CUndoAttachBaseObject
+    : public IUndoObject
+{
+public:
+    CUndoAttachBaseObject(CBaseObject* pAttachedObject, bool bKeepPos, bool bAttach)
+        : m_attachedObjectGUID(pAttachedObject->GetId())
+        , m_parentObjectGUID(pAttachedObject->GetParent()->GetId())
+        , m_bKeepPos(bKeepPos)
+        , m_bAttach(bAttach) {}
+
+    virtual void Undo([[maybe_unused]] bool bUndo) override
+    {
+        if (m_bAttach)
+        {
+            Detach();
+        }
+        else
+        {
+            Attach();
+        }
+    }
+
+    virtual void Redo() override
+    {
+        if (m_bAttach)
+        {
+            Attach();
+        }
+        else
+        {
+            Detach();
+        }
+    }
+
+private:
+    void Attach()
+    {
+        CObjectManager* pObjectManager = static_cast<CObjectManager*>(GetIEditor()->GetObjectManager());
+        CBaseObject* pObject = pObjectManager->FindObject(m_attachedObjectGUID);
+        CBaseObject* pParentObject = pObjectManager->FindObject(m_parentObjectGUID);
+
+        if (pObject && pParentObject)
+        {
+            pParentObject->AttachChild(pObject, m_bKeepPos);
+        }
+    }
+
+    void Detach()
+    {
+        CObjectManager* pObjectManager = static_cast<CObjectManager*>(GetIEditor()->GetObjectManager());
+        CBaseObject* pObject = pObjectManager->FindObject(m_attachedObjectGUID);
+
+        if (pObject)
+        {
+            pObject->DetachThis(m_bKeepPos);
+        }
+    }
+
+    virtual int GetSize() { return sizeof(CUndoAttachBaseObject); }
+    virtual QString GetDescription() { return "Attachment Changed"; }
+
+    GUID m_attachedObjectGUID;
+    GUID m_parentObjectGUID;
+    bool m_bKeepPos;
+    bool m_bAttach;
+};
+
+//////////////////////////////////////////////////////////////////////////
+CUndoBaseObject::CUndoBaseObject(CBaseObject* obj, const char* undoDescription)
+{
+    // Stores the current state of this object.
+    assert(obj != 0);
+    m_undoDescription = undoDescription;
+    m_guid = obj->GetId();
+
+    m_redo = 0;
+    m_undo = XmlHelpers::CreateXmlNode("Undo");
+    CObjectArchive ar(GetIEditor()->GetObjectManager(), m_undo, false);
+    ar.bUndo = true;
+    obj->Serialize(ar);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CUndoBaseObject::GetObjectName()
+{
+    if (CBaseObject* obj = GetIEditor()->GetObjectManager()->FindObject(m_guid))
+    {
+        return obj->GetName();
+    }
+    return QString();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoBaseObject::Undo(bool bUndo)
+{
+    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
+    if (!pObject)
+    {
+        return;
+    }
+
+    GetIEditor()->SuspendUndo();
+
+    if (bUndo)
+    {
+        m_redo = XmlHelpers::CreateXmlNode("Redo");
+        // Save current object state.
+        CObjectArchive ar(GetIEditor()->GetObjectManager(), m_redo, false);
+        ar.bUndo = true;
+        pObject->Serialize(ar);
+    }
+
+    // Undo object state.
+    CObjectArchive ar(GetIEditor()->GetObjectManager(), m_undo, true);
+    ar.bUndo = true;
+    pObject->Serialize(ar);
+
+    GetIEditor()->ResumeUndo();
+
+    using namespace AzToolsFramework;
+    ComponentEntityObjectRequestBus::Event(pObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoBaseObject::Redo()
+{
+    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
+    if (!pObject)
+    {
+        return;
+    }
+
+    GetIEditor()->SuspendUndo();
+
+    CObjectArchive ar(GetIEditor()->GetObjectManager(), m_redo, true);
+    ar.bUndo = true;
+
+    pObject->Serialize(ar);
+
+    GetIEditor()->ResumeUndo();
+
+    using namespace AzToolsFramework;
+    ComponentEntityObjectRequestBus::Event(pObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CUndoBaseObjectMinimal::CUndoBaseObjectMinimal(CBaseObject* pObj, const char* undoDescription, [[maybe_unused]] int flags)
+{
+    // Stores the current state of this object.
+    assert(pObj != nullptr);
+    m_undoDescription = undoDescription;
+    m_guid = pObj->GetId();
+
+    ZeroStruct(m_redoState);
+
+    m_undoState.pos = pObj->GetPos();
+    m_undoState.rotate = pObj->GetRotation();
+    m_undoState.scale = pObj->GetScale();
+    m_undoState.color = pObj->GetColor();
+    m_undoState.area = pObj->GetArea();
+    m_undoState.minSpec = pObj->GetMinSpec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CUndoBaseObjectMinimal::GetObjectName()
+{
+    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
+    if (!pObject)
+    {
+        return QString();
+    }
+
+    return pObject->GetName();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoBaseObjectMinimal::Undo(bool bUndo)
+{
+    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
+    if (!pObject || pObject->GetType() == OBJTYPE_DUMMY)
+    {
+        return;
+    }
+
+    if (bUndo)
+    {
+        m_redoState.pos = pObject->GetPos();
+        m_redoState.scale = pObject->GetScale();
+        m_redoState.rotate = pObject->GetRotation();
+        m_redoState.color = pObject->GetColor();
+        m_redoState.area = pObject->GetArea();
+        m_redoState.minSpec = pObject->GetMinSpec();
+    }
+
+    SetTransformsFromState(pObject, m_undoState, bUndo);
+
+    pObject->ChangeColor(m_undoState.color);
+    pObject->SetArea(m_undoState.area);
+    pObject->SetMinSpec(m_undoState.minSpec, false);
+
+    using namespace AzToolsFramework;
+    ComponentEntityObjectRequestBus::Event(pObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoBaseObjectMinimal::Redo()
+{
+    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
+    if (!pObject || pObject->GetType() == OBJTYPE_DUMMY)
+    {
+        return;
+    }
+
+    SetTransformsFromState(pObject, m_redoState, true);
+
+    pObject->ChangeColor(m_redoState.color);
+    pObject->SetArea(m_redoState.area);
+    pObject->SetMinSpec(m_redoState.minSpec, false);
+
+    using namespace AzToolsFramework;
+    ComponentEntityObjectRequestBus::Event(pObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoBaseObjectMinimal::SetTransformsFromState(CBaseObject* pObject, const StateStruct& state, bool bUndo)
+{
+    uint32 flags = eObjectUpdateFlags_Undo;
+    if (!bUndo)
+    {
+        flags |= eObjectUpdateFlags_UserInputUndo;
+    }
+
+    pObject->SetPos(state.pos, flags);
+    pObject->SetScale(state.scale, flags);
+    pObject->SetRotation(state.rotate, flags);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectCloneContext::AddClone(CBaseObject* pFromObject, CBaseObject* pToObject)
+{
+    m_objectsMap[pFromObject] = pToObject;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CObjectCloneContext::FindClone(CBaseObject* pFromObject)
+{
+    CBaseObject* pTarget = stl::find_in_map(m_objectsMap, pFromObject, (CBaseObject*) NULL);
+    return pTarget;
+}
+
+//////////////////////////////////////////////////////////////////////////
+GUID CObjectCloneContext::ResolveClonedID(REFGUID guid)
+{
+    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(guid);
+    CBaseObject* pClonedTarget = FindClone(pObject);
+    if (!pClonedTarget)
+    {
+        pClonedTarget = pObject; // If target not cloned, link to original target.
+    }
+    if (pClonedTarget)
+    {
+        return pClonedTarget->GetId();
+    }
+    return GUID_NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CBaseObject implementation.
+//////////////////////////////////////////////////////////////////////////
+CBaseObject::CBaseObject()
+    : m_pos(0, 0, 0)
+    , 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))
+    , m_worldTM(IDENTITY)
+    , m_lookat(nullptr)
+    , m_lookatSource(nullptr)
+    , m_flattenArea(0.f)
+    , m_classDesc(nullptr)
+    , m_numRefs(0)
+    , m_parent(nullptr)
+    , m_bInSelectionBox(false)
+    , m_pTransformDelegate(nullptr)
+    , 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);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IObjectManager* CBaseObject::GetObjectManager() const
+{
+    return g_pObjectManager;
+};
+
+
+void CBaseObject::SetClassDesc(CObjectClassDesc* classDesc)
+{
+    m_classDesc = classDesc;
+}
+
+//! Initialize Object.
+bool CBaseObject::Init([[maybe_unused]] IEditor* ie, CBaseObject* prev, [[maybe_unused]] const QString& file)
+{
+    SetFlags(m_flags & (~OBJFLAG_DELETED));
+
+    if (prev != 0)
+    {
+        SetUniqueName(prev->GetName());
+        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.
+        EnableUpdateCallbacks(false);
+        CopyVariableValues(prev);
+        EnableUpdateCallbacks(true);
+        OnSetValues();
+    }
+
+    m_nTextureIcon = m_classDesc->GetTextureIconId();
+    if (m_classDesc->RenderTextureOnTop())
+    {
+        SetFlags(OBJFLAG_SHOW_ICONONTOP);
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject::~CBaseObject()
+{
+    for (Childs::iterator c = m_childs.begin(); c != m_childs.end(); c++)
+    {
+        CBaseObject* child = *c;
+        child->m_parent = 0;
+    }
+    m_childs.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::Done()
+{
+    DetachThis();
+
+    // From children
+    DetachAll();
+
+    SetLookAt(0);
+    if (m_lookatSource)
+    {
+        m_lookatSource->SetLookAt(0);
+    }
+    SetFlags(m_flags | OBJFLAG_DELETED);
+
+    NotifyListeners(CBaseObject::ON_DELETE);
+    m_eventListeners.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetName(const QString& name)
+{
+    if (name == m_name)
+    {
+        return;
+    }
+
+    StoreUndo("Name");
+
+    // Notification is expensive and not required if this is during construction.
+    bool notify = (!m_name.isEmpty());
+
+    m_name = name;
+    GetObjectManager()->RegisterObjectName(name);
+    SetModified(false);
+
+    if (notify)
+    {
+        NotifyListeners(ON_RENAME);
+        static_cast<CObjectManager*>(GetIEditor()->GetObjectManager())->NotifyObjectListeners(this, ON_RENAME);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetUniqueName(const QString& name)
+{
+    SetName(GetObjectManager()->GenerateUniqueObjectName(name));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::GenerateUniqueName()
+{
+    if (m_classDesc)
+    {
+        SetUniqueName(m_classDesc->ClassName());
+    }
+    else
+    {
+        SetUniqueName("Object");
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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)
+{
+    const Vec3 currentPos = GetPos();
+
+    bool equal = false;
+    if (flags & eObjectUpdateFlags_MoveTool) // very sensitive in case of the move tool
+    {
+        equal = IsVectorsEqual(currentPos, pos, 0.0f);
+    }
+    else // less sensitive for others
+    {
+        equal = IsVectorsEqual(currentPos, pos);
+    }
+
+    if (equal)
+    {
+        return false;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Check if position is bad.
+    if (fabs(pos.x) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
+        fabs(pos.y) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
+        fabs(pos.z) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
+        !_finite(pos.x) || !_finite(pos.y) || !_finite(pos.z))
+    {
+        CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING,
+            "Object %s, SetPos called with invalid position: (%f,%f,%f)",
+            GetName().toUtf8().data(), pos.x, pos.y, pos.z);
+        return false;
+    }
+
+    OnBeforeAreaChange();
+
+    //////////////////////////////////////////////////////////////////////////
+    const bool bPositionDelegated = m_pTransformDelegate && m_pTransformDelegate->IsPositionDelegated();
+    if (m_pTransformDelegate && (flags & eObjectUpdateFlags_Animated) == 0)
+    {
+        m_pTransformDelegate->SetTransformDelegatePos(pos);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    if (!bPositionDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
+    {
+        StoreUndo("Position", true, flags);
+    }
+
+    float terrainElevation = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
+    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainElevation
+        , &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats
+        , pos.x, pos.y, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, nullptr);
+    m_height = pos.z - terrainElevation;
+
+    if (!bPositionDelegated)
+    {
+        m_pos = pos;
+    }
+
+    if (!(flags & eObjectUpdateFlags_DoNotInvalidate))
+    {
+        InvalidateTM(flags | eObjectUpdateFlags_PositionChanged);
+    }
+
+    SetModified(true);
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::SetRotation(const Quat& rotate, int flags)
+{
+    const Quat currentRotate = GetRotation();
+
+    if (currentRotate.w == rotate.w && currentRotate.v.x == rotate.v.x
+        && currentRotate.v.y == rotate.v.y && currentRotate.v.z == rotate.v.z)
+    {
+        return false;
+    }
+
+    if (flags & eObjectUpdateFlags_ScaleTool)
+    {
+        return false;
+    }
+
+    OnBeforeAreaChange();
+
+    const bool bRotationDelegated = m_pTransformDelegate && m_pTransformDelegate->IsRotationDelegated();
+    if (m_pTransformDelegate && (flags & eObjectUpdateFlags_Animated) == 0)
+    {
+        m_pTransformDelegate->SetTransformDelegateRotation(rotate);
+    }
+
+    if (!bRotationDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
+    {
+        StoreUndo("Rotate", true, flags);
+    }
+
+    if (!bRotationDelegated)
+    {
+        m_rotate = rotate;
+    }
+
+    if (m_bMatrixValid && !(flags & eObjectUpdateFlags_DoNotInvalidate))
+    {
+        InvalidateTM(flags | eObjectUpdateFlags_RotationChanged);
+    }
+
+    SetModified(true);
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::SetScale(const Vec3& scale, int flags)
+{
+    if (IsVectorsEqual(GetScale(), scale))
+    {
+        return false;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Check if scale is bad.
+    if (scale.x < 0.01f || scale.y < 0.01f || scale.z < 0.01f)
+    {
+        CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "Object %s, SetScale called with invalid scale: (%f,%f,%f)", GetName().toUtf8().data(), scale.x, scale.y, scale.z);
+        return false;
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    OnBeforeAreaChange();
+
+    const bool bScaleDelegated = m_pTransformDelegate && m_pTransformDelegate->IsScaleDelegated();
+    if (m_pTransformDelegate && (flags & eObjectUpdateFlags_Animated) == 0)
+    {
+        m_pTransformDelegate->SetTransformDelegateScale(scale);
+    }
+
+    if (!bScaleDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
+    {
+        StoreUndo("Scale", true, flags);
+    }
+
+    if (!bScaleDelegated)
+    {
+        m_scale = scale;
+    }
+
+    if (m_bMatrixValid && !(flags & eObjectUpdateFlags_DoNotInvalidate))
+    {
+        InvalidateTM(flags | eObjectUpdateFlags_ScaleChanged);
+    }
+
+    SetModified(true);
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const Vec3 CBaseObject::GetPos() const
+{
+    if (!m_pTransformDelegate)
+    {
+        return m_pos;
+    }
+
+    return m_pTransformDelegate->GetTransformDelegatePos(m_pos);
+}
+
+//////////////////////////////////////////////////////////////////////////
+const Quat CBaseObject::GetRotation() const
+{
+    if (!m_pTransformDelegate)
+    {
+        return m_rotate;
+    }
+
+    return m_pTransformDelegate->GetTransformDelegateRotation(m_rotate);
+}
+
+//////////////////////////////////////////////////////////////////////////
+const Vec3 CBaseObject::GetScale() const
+{
+    if (!m_pTransformDelegate)
+    {
+        return m_scale;
+    }
+
+    return m_pTransformDelegate->GetTransformDelegateScale(m_scale);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::ChangeColor(const QColor& color)
+{
+    if (color == m_color)
+    {
+        return;
+    }
+
+    StoreUndo("Color", true);
+
+    SetColor(color);
+    SetModified(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetColor(const QColor& color)
+{
+    m_color = color;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetArea(float area)
+{
+    if (m_flattenArea == area)
+    {
+        return;
+    }
+
+    StoreUndo("Area", true);
+
+    m_flattenArea = area;
+    SetModified(false);
+};
+
+//! Get bounding box of object in world coordinate space.
+void CBaseObject::GetBoundBox(AABB& box)
+{
+    if (!m_bWorldBoxValid)
+    {
+        GetLocalBounds(m_worldBounds);
+        if (!m_worldBounds.IsReset() && !m_worldBounds.IsEmpty())
+        {
+            m_worldBounds.SetTransformedAABB(GetWorldTM(), m_worldBounds);
+            m_bWorldBoxValid = true;
+        }
+    }
+    box = m_worldBounds;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::GetLocalBounds(AABB& box)
+{
+    box.min.Set(0, 0, 0);
+    box.max.Set(0, 0, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetModified(bool)
+{
+}
+
+void CBaseObject::DrawDefault(DisplayContext& dc, const QColor& labelColor)
+{
+    Vec3 wp = GetWorldPos();
+
+    bool bDisplaySelectionHelper = false;
+    if (!CanBeDrawn(dc, bDisplaySelectionHelper))
+    {
+        return;
+    }
+
+    // Draw link between parent and child.
+    if (dc.flags & DISPLAY_LINKS)
+    {
+        if (GetParent())
+        {
+            dc.DrawLine(GetParentAttachPointWorldTM().GetTranslation(), wp, IsFrozen() ? kLinkColorGray : kLinkColorParent, IsFrozen() ? kLinkColorGray : kLinkColorChild);
+        }
+        int nChildCount = GetChildCount();
+        for (int i = 0; i < nChildCount; ++i)
+        {
+            const CBaseObject* pChild = GetChild(i);
+            dc.DrawLine(pChild->GetParentAttachPointWorldTM().GetTranslation(), pChild->GetWorldPos(), pChild->IsFrozen() ? kLinkColorGray : kLinkColorParent, pChild->IsFrozen() ? kLinkColorGray : kLinkColorChild);
+        }
+    }
+
+    // Draw Bounding box
+    if (dc.flags & DISPLAY_BBOX)
+    {
+        AABB box;
+        GetBoundBox(box);
+        dc.SetColor(Vec3(1, 1, 1));
+        dc.DrawWireBox(box.min, box.max);
+    }
+
+    if (IsHighlighted())
+    {
+        DrawHighlight(dc);
+    }
+
+    if (IsSelected())
+    {
+        DrawArea(dc);
+
+        CSelectionGroup* pSelection = GetObjectManager()->GetSelection();
+
+        // If the number of selected object is over 2, the merged boundbox should be used to render the measurement axis.
+        if (!pSelection || (pSelection && pSelection->GetCount() == 1))
+        {
+            DrawDimensions(dc);
+        }
+    }
+
+    if (bDisplaySelectionHelper)
+    {
+        DrawSelectionHelper(dc, wp, labelColor, 1.0f);
+    }
+    else if (!(dc.flags & DISPLAY_HIDENAMES))
+    {
+        DrawLabel(dc, wp, labelColor);
+    }
+
+    SetDrawTextureIconProperties(dc, wp);
+    DrawTextureIcon(dc, wp);
+    DrawWarningIcons(dc, wp);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DrawDimensions(DisplayContext&, AABB*)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DrawSelectionHelper(DisplayContext& dc, const Vec3& pos, const QColor& labelColor, [[maybe_unused]] float alpha)
+{
+    DrawLabel(dc, pos, labelColor);
+
+    dc.SetColor(GetColor());
+    if (IsHighlighted() || IsSelected() || IsInSelectionBox())
+    {
+        dc.SetColor(dc.GetSelectedColor());
+    }
+
+    uint32 nPrevState = dc.GetState();
+    dc.DepthTestOff();
+    float r = dc.view->GetScreenScaleFactor(pos) * 0.006f;
+    dc.DrawWireBox(pos - Vec3(r, r, r), pos + Vec3(r, r, r));
+    dc.SetState(nPrevState);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetDrawTextureIconProperties(DisplayContext& dc, const Vec3& pos, float alpha, int texIconFlags)
+{
+    if (gSettings.viewports.bShowIcons || gSettings.viewports.bShowSizeBasedIcons)
+    {
+        if (IsHighlighted())
+        {
+            dc.SetColor(QColor(255, 120, 0), 0.8f * alpha);
+        }
+        else if (IsSelected())
+        {
+            dc.SetSelectedColor(alpha);
+        }
+        else if (IsFrozen())
+        {
+            dc.SetFreezeColor();
+        }
+        else
+        {
+            dc.SetColor(QColor(255, 255, 255), alpha);
+        }
+
+        m_vDrawIconPos = pos;
+
+        int nIconFlags = texIconFlags;
+        if (CheckFlags(OBJFLAG_SHOW_ICONONTOP))
+        {
+            Vec3 objectPos = GetWorldPos();
+
+            AABB box;
+            GetBoundBox(box);
+            m_vDrawIconPos.z = (m_vDrawIconPos.z - objectPos.z) + box.max.z;
+            nIconFlags |= DisplayContext::TEXICON_ALIGN_BOTTOM;
+        }
+        m_nIconFlags = nIconFlags;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DrawTextureIcon(DisplayContext& dc, [[maybe_unused]] const Vec3& pos, [[maybe_unused]] float alpha)
+{
+    if (m_nTextureIcon && (gSettings.viewports.bShowIcons || gSettings.viewports.bShowSizeBasedIcons))
+    {
+        dc.DrawTextureLabel(GetTextureIconDrawPos(), OBJECT_TEXTURE_ICON_SIZEX, OBJECT_TEXTURE_ICON_SIZEY, GetTextureIcon(), GetTextureIconFlags());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DrawWarningIcons(DisplayContext& dc, const Vec3& pos)
+{
+    // 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;
+        const int warningIconSizeY = OBJECT_TEXTURE_ICON_SIZEY / 2;
+
+        const int iconOffsetX = m_nTextureIcon ? (-OBJECT_TEXTURE_ICON_SIZEX / 2) : 0;
+        const int iconOffsetY = m_nTextureIcon ? (-OBJECT_TEXTURE_ICON_SIZEY / 2) : 0;
+
+        if (gSettings.viewports.bShowScaleWarnings)
+        {
+            const EScaleWarningLevel scaleWarningLevel = GetScaleWarningLevel();
+
+            if (scaleWarningLevel != eScaleWarningLevel_None)
+            {
+                dc.SetColor(QColor(255, scaleWarningLevel == eScaleWarningLevel_RescaledNonUniform ? 50 : 255, 50), 1.0f);
+                dc.DrawTextureLabel(GetTextureIconDrawPos(), warningIconSizeX, warningIconSizeY,
+                    GetIEditor()->GetIconManager()->GetIconTexture(eIcon_ScaleWarning), GetTextureIconFlags(),
+                    -warningIconSizeX / 2, iconOffsetX - (warningIconSizeY / 2));
+            }
+        }
+
+        if (gSettings.viewports.bShowRotationWarnings)
+        {
+            const ERotationWarningLevel rotationWarningLevel = GetRotationWarningLevel();
+            if (rotationWarningLevel != eRotationWarningLevel_None)
+            {
+                dc.SetColor(QColor(255, rotationWarningLevel == eRotationWarningLevel_RotatedNonRectangular ? 50 : 255, 50), 1.0f);
+                dc.DrawTextureLabel(GetTextureIconDrawPos(), warningIconSizeX, warningIconSizeY,
+                    GetIEditor()->GetIconManager()->GetIconTexture(eIcon_RotationWarning), GetTextureIconFlags(),
+                    warningIconSizeX / 2, iconOffsetY - (warningIconSizeY / 2));
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DrawLabel(DisplayContext& dc, const Vec3& pos, const QColor& lC, float alpha, float size)
+{
+    QColor labelColor = lC;
+
+    AABB box;
+    GetBoundBox(box);
+
+    //p.z = box.max.z + 0.2f;
+    if ((dc.flags & DISPLAY_2D) && labelColor == QColor(255, 255, 255))
+    {
+        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))
+    {
+        float range = maxDist / 2.0f;
+        Vec3 c(labelColor.redF(), labelColor.greenF(), labelColor.redF());
+        if (IsSelected())
+        {
+            c = Vec3(dc.GetSelectedColor().redF(), dc.GetSelectedColor().greenF(), dc.GetSelectedColor().blueF());
+        }
+
+        float col[4] = { c.x, c.y, c.z, 1 };
+        if (dc.flags & DISPLAY_SELECTION_HELPERS)
+        {
+            if (IsHighlighted())
+            {
+                c = Vec3(dc.GetSelectedColor().redF(), dc.GetSelectedColor().greenF(), dc.GetSelectedColor().blueF());
+            }
+            col[0] = c.x;
+            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());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DrawHighlight(DisplayContext& dc)
+{
+    if (!m_nTextureIcon)
+    {
+        AABB box;
+        GetLocalBounds(box);
+
+        dc.PushMatrix(GetWorldTM());
+        dc.DrawWireBox(box.min, box.max);
+        dc.SetLineWidth(1);
+        dc.PopMatrix();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DrawBudgetUsage(DisplayContext& dc, const QColor& color)
+{
+    AABB box;
+    GetLocalBounds(box);
+
+    dc.SetColor(color);
+
+    dc.PushMatrix(GetWorldTM());
+    dc.DrawWireBox(box.min, box.max);
+    dc.PopMatrix();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void    CBaseObject::DrawAxis([[maybe_unused]] DisplayContext& dc, [[maybe_unused]] const Vec3& pos, [[maybe_unused]] float size)
+{
+    /*
+    dc.renderer->EnableDepthTest(false);
+    Vec3 x(size,0,0);
+    Vec3 y(0,size,0);
+    Vec3 z(0,0,size);
+
+    bool bWorldSpace = false;
+    if (dc.flags & DISPLAY_WORLDSPACEAXIS)
+        bWorldSpace = true;
+
+    Matrix tm = GetWorldTM();
+    Vec3 org = tm.TransformPoint( pos );
+
+    if (!bWorldSpace)
+    {
+        tm.NoScale();
+        x = tm.TransformVector(x);
+        y = tm.TransformVector(y);
+        z = tm.TransformVector(z);
+    }
+
+    float fScreenScale = dc.view->GetScreenScaleFactor(org);
+    x = x * fScreenScale;
+    y = y * fScreenScale;
+    z = z * fScreenScale;
+
+    float col[4] = { 1,1,1,1 };
+    float hcol[4] = { 1,0,0,1 };
+    dc.renderer->DrawLabelEx( org+x,1.2f,col,true,true,"X" );
+    dc.renderer->DrawLabelEx( org+y,1.2f,col,true,true,"Y" );
+    dc.renderer->DrawLabelEx( org+z,1.2f,col,true,true,"Z" );
+
+    Vec3 colX(1,0,0),colY(0,1,0),colZ(0,0,1);
+    if (s_highlightAxis)
+    {
+        float col[4] = { 1,0,0,1 };
+        if (s_highlightAxis == 1)
+        {
+            colX.Set(1,1,0);
+            dc.renderer->DrawLabelEx( org+x,1.2f,col,true,true,"X" );
+        }
+        if (s_highlightAxis == 2)
+        {
+            colY.Set(1,1,0);
+            dc.renderer->DrawLabelEx( org+y,1.2f,col,true,true,"Y" );
+        }
+        if (s_highlightAxis == 3)
+        {
+            colZ.Set(1,1,0);
+            dc.renderer->DrawLabelEx( org+z,1.2f,col,true,true,"Z" );
+        }
+    }
+
+    x = x * 0.8f;
+    y = y * 0.8f;
+    z = z * 0.8f;
+    float fArrowScale = fScreenScale * 0.07f;
+    dc.SetColor( colX );
+    dc.DrawArrow( org,org+x,fArrowScale );
+    dc.SetColor( colY );
+    dc.DrawArrow( org,org+y,fArrowScale );
+    dc.SetColor( colZ );
+    dc.DrawArrow( org,org+z,fArrowScale );
+
+    //dc.DrawLine( org,org+x,colX,colX );
+    //dc.DrawLine( org,org+y,colY,colY );
+    //dc.DrawLine( org,org+z,colZ,colZ );
+
+    dc.renderer->EnableDepthTest(true);
+    ///dc.SetColor( 0,1,1,1 );
+    //dc.DrawLine( p,p+dc.view->m_constructionPlane.m_normal*10.0f );
+    */
+}
+
+void CBaseObject::DrawArea(DisplayContext& dc)
+{
+    float area = m_flattenArea;
+    if (area > 0)
+    {
+        dc.SetColor(QColor(5, 5, 255), 1.f); // make it different color from the AI sight radius
+        Vec3 wp = GetWorldPos();
+        float z = GetIEditor()->GetTerrainElevation(wp.x, wp.y);
+        if (fabs(wp.z - z) < 5)
+        {
+            dc.DrawTerrainCircle(wp, area, 0.2f);
+        }
+        else
+        {
+            dc.DrawCircle(wp, area);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::CanBeDrawn(const DisplayContext& dc, bool& outDisplaySelectionHelper) const
+{
+    bool bResult = true;
+    outDisplaySelectionHelper = false;
+
+    if (dc.flags & DISPLAY_SELECTION_HELPERS)
+    {
+        // Check if this object type is masked for selection.
+        if ((GetType() & gSettings.objectSelectMask) && !IsFrozen())
+        {
+            if (IsSkipSelectionHelper())
+            {
+                return bResult;
+            }
+            if (CanBeHightlighted())
+            {
+                outDisplaySelectionHelper = true;
+            }
+        }
+        else
+        {
+            // Object helpers should not be displayed when object is not for selection.
+            bResult = false;
+        }
+    }
+
+    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(AZ::Debug::ProfileCategory::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)
+    {
+        double angle = 1;
+        Quat rot = GetRotation();
+        rot.SetRotationXYZ(Ang3(0, 0, rot.GetRotZ() + DEG2RAD(flags > 0 ? angle * (-1) : angle)));
+        SetRotation(rot);
+    }
+    return MOUSECREATE_CONTINUE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::OnEvent(ObjectEvent event)
+{
+    switch (event)
+    {
+    case EVENT_KEEP_HEIGHT:
+    {
+        float h = m_height;
+        float newz = GetIEditor()->GetTerrainElevation(m_pos.x, m_pos.y) + m_height;
+        SetPos(Vec3(m_pos.x, m_pos.y, newz));
+        m_height = h;
+    }
+    break;
+    case EVENT_CONFIG_SPEC_CHANGE:
+        UpdateVisibility(!IsHidden());
+        break;
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetShared([[maybe_unused]] bool bShared)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetHidden(bool bHidden, uint64 hiddenID, bool bAnimated)
+{
+    if (CheckFlags(OBJFLAG_HIDDEN) != bHidden)
+    {
+        if (!bAnimated)
+        {
+            StoreUndo("Hide Object");
+        }
+
+        if (bHidden)
+        {
+            SetFlags(OBJFLAG_HIDDEN);
+        }
+        else
+        {
+            ClearFlags(OBJFLAG_HIDDEN);
+        }
+
+        m_hideOrder = hiddenID;
+        UpdateVisibility(!IsHidden());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetFrozen(bool bFrozen)
+{
+    if (CheckFlags(OBJFLAG_FROZEN) != bFrozen)
+    {
+        StoreUndo("Freeze Object");
+        if (bFrozen)
+        {
+            SetFlags(OBJFLAG_FROZEN);
+        }
+        else
+        {
+            ClearFlags(OBJFLAG_FROZEN);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetHighlight(bool bHighlight)
+{
+    if (bHighlight)
+    {
+        SetFlags(OBJFLAG_HIGHLIGHT);
+    }
+    else
+    {
+        ClearFlags(OBJFLAG_HIGHLIGHT);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetSelected(bool bSelect)
+{
+    if (bSelect)
+    {
+        SetFlags(OBJFLAG_SELECTED);
+        NotifyListeners(ON_SELECT);
+
+        //CLogFile::FormatLine( "Selected: %s, ID=%u",(const char*)m_name,m_id );
+    }
+    else
+    {
+        ClearFlags(OBJFLAG_SELECTED);
+        NotifyListeners(ON_UNSELECT);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::IsHiddenBySpec() const
+{
+    if (!gSettings.bApplyConfigSpecInEditor)
+    {
+        return false;
+    }
+
+    return (m_nMinSpec != 0 && gSettings.editorConfigSpec != 0 && m_nMinSpec > gSettings.editorConfigSpec);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//! Returns true if object hidden.
+bool CBaseObject::IsHidden() const
+{
+    return (CheckFlags(OBJFLAG_HIDDEN)) ||
+            (m_classDesc && (gSettings.objectHideMask & GetType()));
+}
+
+//////////////////////////////////////////////////////////////////////////
+//! Returns true if object frozen.
+bool CBaseObject::IsFrozen() const
+{
+    return CheckFlags(OBJFLAG_FROZEN);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::IsSelectable() const
+{
+    // Not selectable if frozen.
+    return IsFrozen() ? false : true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::Serialize(CObjectArchive& ar)
+{
+    XmlNodeRef xmlNode = ar.node;
+
+    ITransformDelegate* pTransformDelegate = m_pTransformDelegate;
+    m_pTransformDelegate = nullptr;
+
+    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;
+
+        QString name = m_name;
+        QString mtlName;
+
+        Vec3 pos = m_pos;
+        Vec3 scale = m_scale;
+        Quat quat = m_rotate;
+        Ang3 angles(0, 0, 0);
+        uint32 nMinSpec = m_nMinSpec;
+
+        QColor color = m_color;
+        float flattenArea = m_flattenArea;
+
+        GUID parentId = GUID_NULL;
+        GUID lookatId = GUID_NULL;
+
+        xmlNode->getAttr("Name", name);
+        xmlNode->getAttr("Pos", pos);
+        if (!xmlNode->getAttr("Rotate", quat))
+        {
+            // Backward compatibility.
+            if (xmlNode->getAttr("Angles", angles))
+            {
+                angles = DEG2RAD(angles);
+                //angles.z += gf_PI/2;
+                quat.SetRotationXYZ(angles);
+            }
+        }
+
+        xmlNode->getAttr("Scale", scale);
+        xmlNode->getAttr("ColorRGB", color);
+        xmlNode->getAttr("FlattenArea", flattenArea);
+        xmlNode->getAttr("Flags", flags);
+        xmlNode->getAttr("Parent", parentId);
+        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.
+        {
+            m_nMinSpec = nMinSpec;
+        }
+
+        bool bHidden = flags & OBJFLAG_HIDDEN;
+        bool bFrozen = flags & OBJFLAG_FROZEN;
+
+        m_flags = flags;
+        m_flags &= ~OBJFLAG_PERSISTMASK;
+        m_flags |= (oldFlags) & (~OBJFLAG_PERSISTMASK);
+        //SetFlags( flags & OBJFLAG_PERSISTMASK );
+        m_flags &= ~OBJFLAG_SHARED; // clear shared flag
+        m_flags &= ~OBJFLAG_DELETED; // clear deleted flag
+
+        if (ar.bUndo)
+        {
+            DetachThis(false);
+        }
+
+        if (name != m_name)
+        {
+            // This may change object id.
+            SetName(name);
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        // Check if position is bad.
+        if (fabs(pos.x) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
+            fabs(pos.y) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
+            fabs(pos.z) > AZ::Constants::MaxFloatBeforePrecisionLoss)
+        {
+            // File Not found.
+            CErrorRecord err;
+            err.error = QStringLiteral("Object %1 have invalid position (%2,%3,%4)").arg(GetName()).arg(pos.x).arg(pos.y).arg(pos.z);
+            err.pObject = this;
+            err.severity = CErrorRecord::ESEVERITY_WARNING;
+            GetIEditor()->GetErrorReport()->ReportError(err);
+        }
+        //////////////////////////////////////////////////////////////////////////
+
+        if (!ar.bUndo)
+        {
+            SetLocalTM(pos, quat, scale);
+        }
+        else
+        {
+            SetLocalTM(pos, quat, scale, eObjectUpdateFlags_Undo);
+        }
+
+        SetColor(color);
+        SetArea(flattenArea);
+        SetFrozen(bFrozen);
+        SetHidden(bHidden);
+
+        ar.SetResolveCallback(this, parentId, AZStd::bind(&CBaseObject::ResolveParent, this, AZStd::placeholders::_1 ));
+        ar.SetResolveCallback(this, lookatId, AZStd::bind(&CBaseObject::SetLookAt, this, AZStd::placeholders::_1));
+
+        InvalidateTM(0);
+        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
+    {
+        // Saving.
+
+        // This attributed only readed by ObjectManager.
+        xmlNode->setAttr("Type", GetTypeName().toUtf8().data());
+
+        xmlNode->setAttr("Id", m_guid);
+
+        xmlNode->setAttr("Name", GetName().toUtf8().data());
+        xmlNode->setAttr("HideOrder", m_hideOrder);
+
+        if (m_parent)
+        {
+            xmlNode->setAttr("Parent", m_parent->GetId());
+        }
+
+        if (m_lookat)
+        {
+            xmlNode->setAttr("LookAt", m_lookat->GetId());
+        }
+
+        if (!IsEquivalent(GetPos(), Vec3(0, 0, 0), 0))
+        {
+            xmlNode->setAttr("Pos", GetPos());
+        }
+
+        xmlNode->setAttr("FloorNumber", m_floorNumber);
+
+        xmlNode->setAttr("Rotate", m_rotate);
+
+        if (!IsEquivalent(GetScale(), Vec3(1, 1, 1), 0))
+        {
+            xmlNode->setAttr("Scale", GetScale());
+        }
+
+        xmlNode->setAttr("ColorRGB", GetColor());
+
+        if (GetArea() != 0)
+        {
+            xmlNode->setAttr("FlattenArea", GetArea());
+        }
+
+        int flags = m_flags & OBJFLAG_PERSISTMASK;
+        if (flags != 0)
+        {
+            xmlNode->setAttr("Flags", flags);
+        }
+
+        if (m_nMinSpec != 0)
+        {
+            xmlNode->setAttr("MinSpec", (uint32)m_nMinSpec);
+        }
+    }
+
+    // Serialize variables after default entity parameters.
+    CVarObject::Serialize(xmlNode, ar.bLoading);
+
+    m_pTransformDelegate = pTransformDelegate;
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CBaseObject::Export([[maybe_unused]] const QString& levelPath, XmlNodeRef& xmlNode)
+{
+    XmlNodeRef objNode = xmlNode->newChild("Object");
+
+    objNode->setAttr("Type", GetTypeName().toUtf8().data());
+    objNode->setAttr("Name", GetName().toUtf8().data());
+
+    Vec3 pos, scale;
+    Quat rotate;
+    if (m_parent)
+    {
+        // Export world coordinates.
+        AffineParts ap;
+        ap.SpectralDecompose(GetWorldTM());
+
+        pos = ap.pos;
+        rotate = ap.rot;
+        scale = ap.scale;
+    }
+    else
+    {
+        pos = m_pos;
+        rotate = m_rotate;
+        scale = m_scale;
+    }
+
+    if (!IsEquivalent(pos, Vec3(0, 0, 0), 0))
+    {
+        objNode->setAttr("Pos", pos);
+    }
+
+    if (!rotate.IsIdentity())
+    {
+        objNode->setAttr("Rotate", rotate);
+    }
+
+    if (!IsEquivalent(scale, Vec3(0, 0, 0), 0))
+    {
+        objNode->setAttr("Scale", scale);
+    }
+
+    if (m_nMinSpec != 0)
+    {
+        objNode->setAttr("MinSpec", (uint32)m_nMinSpec);
+    }
+
+    // Save variables.
+    CVarObject::Serialize(objNode, false);
+
+    return objNode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CBaseObject::FindObject(REFGUID id) const
+{
+    return GetObjectManager()->FindObject(id);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::StoreUndo(const char* UndoDescription, 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))
+    {
+        return;
+    }
+
+    if (CUndo::IsRecording())
+    {
+        if (minimal)
+        {
+            CUndo::Record(new CUndoBaseObjectMinimal(this, UndoDescription, flags));
+        }
+        else
+        {
+            CUndo::Record(new CUndoBaseObject(this, UndoDescription));
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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())
+    {
+        return className;
+    }
+
+    QString name;
+    name.append(className.mid(0, className.length() - subClassName.length()));
+    return name;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::IntersectRectBounds(const AABB& bbox)
+{
+    AABB aabb;
+    GetBoundBox(aabb);
+
+    return aabb.IsIntersectBox(bbox);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::IntersectRayBounds(const Ray& ray)
+{
+    Vec3 tmpPnt;
+    AABB aabb;
+    GetBoundBox(aabb);
+
+    return Intersect::Ray_AABB(ray, aabb, tmpPnt);
+}
+
+//////////////////////////////////////////////////////////////////////////
+namespace
+{
+    typedef std::pair<Vec2, Vec2> Edge2D;
+}
+bool IsIncludePointsInConvexHull(Edge2D* pEdgeArray0, int nEdgeArray0Size, Edge2D* pEdgeArray1, int nEdgeArray1Size)
+{
+    if (!pEdgeArray0 || !pEdgeArray1 || nEdgeArray0Size <= 0 || nEdgeArray1Size <= 0)
+    {
+        return false;
+    }
+
+    static const float kPointEdgeMaxInsideDistance(0.05f);
+
+    bool bInside(true);
+    for (int i = 0; i < nEdgeArray0Size; ++i)
+    {
+        const Vec2& v(pEdgeArray0[i].first);
+        bInside = true;
+        for (int k = 0; k < nEdgeArray1Size; ++k)
+        {
+            Vec2 v0 = pEdgeArray1[k].first;
+            Vec2 v1 = pEdgeArray1[k].second;
+            Vec3 direction(v1.x - v0.x, v1.y - v0.y, 0);
+            Vec3 up(0, 0, 1);
+            Vec3 z = up.Cross(direction);
+            Vec2 normal;
+            normal.x = z.x;
+            normal.y = z.y;
+            normal.Normalize();
+            float distance = -normal.Dot(v0);
+            if (normal.Dot(v) + distance > kPointEdgeMaxInsideDistance)
+            {
+                bInside = false;
+                break;
+            }
+        }
+        if (bInside)
+        {
+            break;
+        }
+    }
+    return bInside;
+}
+
+void ModifyConvexEdgeDirection(Edge2D* pEdgeArray, int nEdgeArraySize)
+{
+    if (!pEdgeArray || nEdgeArraySize < 2)
+    {
+        return;
+    }
+    Vec3 v0(pEdgeArray[0].first.x - pEdgeArray[0].second.x, pEdgeArray[0].first.y - pEdgeArray[0].second.y, 0);
+    Vec3 v1(pEdgeArray[1].second.x - pEdgeArray[1].first.x, pEdgeArray[1].second.y - pEdgeArray[1].first.y, 0);
+    Vec3 vCross = v0.Cross(v1);
+    if (vCross.z < 0)
+    {
+        for (int i = 0; i < nEdgeArraySize; ++i)
+        {
+            std::swap(pEdgeArray[i].first, pEdgeArray[i].second);
+        }
+    }
+}
+
+bool CBaseObject::HitTestRectBounds(HitContext& hc, const AABB& box)
+{
+    if (hc.bUseSelectionHelpers)
+    {
+        if (IsSkipSelectionHelper())
+        {
+            return false;
+        }
+    }
+
+    static const int kNumberOfBoundBoxPt(8);
+
+    // transform all 8 vertices into view space.
+    QPoint p[kNumberOfBoundBoxPt] =
+    {
+        hc.view->WorldToView(Vec3(box.min.x, box.min.y, box.min.z)),
+        hc.view->WorldToView(Vec3(box.min.x, box.max.y, box.min.z)),
+        hc.view->WorldToView(Vec3(box.max.x, box.min.y, box.min.z)),
+        hc.view->WorldToView(Vec3(box.max.x, box.max.y, box.min.z)),
+        hc.view->WorldToView(Vec3(box.min.x, box.min.y, box.max.z)),
+        hc.view->WorldToView(Vec3(box.min.x, box.max.y, box.max.z)),
+        hc.view->WorldToView(Vec3(box.max.x, box.min.y, box.max.z)),
+        hc.view->WorldToView(Vec3(box.max.x, box.max.y, box.max.z))
+    };
+
+    QRect objrc;
+    objrc.setLeft(10000);
+    objrc.setTop(10000);
+    objrc.setRight(-10000);
+    objrc.setBottom(-10000);
+
+    // find new min/max values
+    for (int i = 0; i < 8; i++)
+    {
+        objrc.setLeft(min(objrc.left(), p[i].x()));
+        objrc.setRight(max(objrc.right(), p[i].x()));
+        objrc.setTop(min(objrc.top(), p[i].y()));
+        objrc.setBottom(max(objrc.bottom(), p[i].y()));
+    }
+    if (objrc.isEmpty())
+    {
+        // Make objrc at least of size 1.
+        objrc.moveBottomRight(objrc.bottomRight() + QPoint(1, 1));
+    }
+
+    if (hc.rect.contains(objrc.topLeft()) &&
+        hc.rect.contains(objrc.bottomLeft()) &&
+        hc.rect.contains(objrc.topRight()) &&
+        hc.rect.contains(objrc.bottomRight()))
+    {
+        hc.object = this;
+        return true;
+    }
+
+    if (objrc.intersects(hc.rect))
+    {
+        AABB localAABB;
+        GetLocalBounds(localAABB);
+        CBaseObject* pOldObj = hc.object;
+        hc.object = this;
+        if (localAABB.IsEmpty())
+        {
+            return true;
+        }
+
+        const int kMaxSizeOfEdgeList0(4);
+        Edge2D edgelist0[kMaxSizeOfEdgeList0] = {
+            Edge2D(Vec2(hc.rect.left(), hc.rect.top()), Vec2(hc.rect.right(), hc.rect.top())),
+            Edge2D(Vec2(hc.rect.right(), hc.rect.top()), Vec2(hc.rect.right(), hc.rect.bottom())),
+            Edge2D(Vec2(hc.rect.right(), hc.rect.bottom()), Vec2(hc.rect.left(), hc.rect.bottom())),
+            Edge2D(Vec2(hc.rect.left(), hc.rect.bottom()), Vec2(hc.rect.left(), hc.rect.top()))
+        };
+
+        const int kMaxSizeOfEdgeList1(8);
+        Edge2D edgelist1[kMaxSizeOfEdgeList1];
+        int nEdgeList1Count(kMaxSizeOfEdgeList1);
+
+        const Matrix34& worldTM(GetWorldTM());
+        OBB obb = OBB::CreateOBBfromAABB(Matrix33(worldTM), localAABB);
+        Vec3 ax = obb.m33.GetColumn0() * obb.h.x;
+        Vec3 ay = obb.m33.GetColumn1() * obb.h.y;
+        Vec3 az = obb.m33.GetColumn2() * obb.h.z;
+        QPoint obb_p[kMaxSizeOfEdgeList1] =
+        {
+            hc.view->WorldToView(-ax - ay - az + worldTM.GetTranslation()),
+            hc.view->WorldToView(-ax - ay + az + worldTM.GetTranslation()),
+            hc.view->WorldToView(-ax + ay - az + worldTM.GetTranslation()),
+            hc.view->WorldToView(-ax + ay + az + worldTM.GetTranslation()),
+            hc.view->WorldToView(ax - ay - az + worldTM.GetTranslation()),
+            hc.view->WorldToView(ax - ay + az + worldTM.GetTranslation()),
+            hc.view->WorldToView(ax + ay - az + worldTM.GetTranslation()),
+            hc.view->WorldToView(ax + ay + az + worldTM.GetTranslation())
+        };
+
+        std::vector<Vec3> pointsForRegion1;
+        pointsForRegion1.reserve(kMaxSizeOfEdgeList1);
+        for (int i = 0; i < kMaxSizeOfEdgeList1; ++i)
+        {
+            pointsForRegion1.push_back(Vec3(obb_p[i].x(), obb_p[i].y(), 0));
+        }
+
+        std::vector<Vec3> convexHullForRegion1;
+        ConvexHull2D(convexHullForRegion1, pointsForRegion1);
+        nEdgeList1Count = convexHullForRegion1.size();
+        if (nEdgeList1Count < 3 || nEdgeList1Count > kMaxSizeOfEdgeList1)
+        {
+            return true;
+        }
+
+        for (int i = 0; i < nEdgeList1Count; ++i)
+        {
+            int iNextI = (i + 1) % nEdgeList1Count;
+            edgelist1[i] = Edge2D(Vec2(convexHullForRegion1[i].x, convexHullForRegion1[i].y), Vec2(convexHullForRegion1[iNextI].x, convexHullForRegion1[iNextI].y));
+        }
+
+        ModifyConvexEdgeDirection(edgelist0, kMaxSizeOfEdgeList0);
+        ModifyConvexEdgeDirection(edgelist1, nEdgeList1Count);
+
+        bool bInside = IsIncludePointsInConvexHull(edgelist0, kMaxSizeOfEdgeList0, edgelist1, nEdgeList1Count);
+        if (!bInside)
+        {
+            bInside = IsIncludePointsInConvexHull(edgelist1, nEdgeList1Count, edgelist0, kMaxSizeOfEdgeList0);
+        }
+        if (!bInside)
+        {
+            hc.object = pOldObj;
+            return false;
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::HitTestRect(HitContext& hc)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
+
+    AABB box;
+
+    if (hc.bUseSelectionHelpers)
+    {
+        if (IsSkipSelectionHelper())
+        {
+            return false;
+        }
+        box.min = GetWorldPos();
+        box.max = box.min;
+    }
+    else
+    {
+        // Retrieve world space bound box.
+        GetBoundBox(box);
+    }
+
+    bool bHit = HitTestRectBounds(hc, box);
+    m_bInSelectionBox = bHit;
+    if (bHit)
+    {
+        hc.object = this;
+    }
+    return bHit;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::HitHelperTest(HitContext& hc)
+{
+    return HitHelperAtTest(hc, GetWorldPos());
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::HitHelperAtTest(HitContext& hc, const Vec3& pos)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
+
+    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 *= OBJECT_TEXTURE_ICON_SCALE / fScreenScale;
+            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
+{
+    assert(i >= 0 && i < m_childs.size());
+    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::GetAllChildren(TBaseObjects& outAllChildren, CBaseObject* pObj) const
+{
+    const CBaseObject* pBaseObj = pObj ? pObj : this;
+
+    for (int i = 0, iChildCount(pBaseObj->GetChildCount()); i < iChildCount; ++i)
+    {
+        CBaseObject* pChild = pBaseObj->GetChild(i);
+        if (pChild == NULL)
+        {
+            continue;
+        }
+        outAllChildren.push_back(pChild);
+        GetAllChildren(outAllChildren, pChild);
+    }
+}
+
+void CBaseObject::GetAllChildren(DynArray< _smart_ptr<CBaseObject> >& outAllChildren, CBaseObject* pObj) const
+{
+    const CBaseObject* pBaseObj = pObj ? pObj : this;
+
+    for (int i = 0, iChildCount(pBaseObj->GetChildCount()); i < iChildCount; ++i)
+    {
+        CBaseObject* pChild = pBaseObj->GetChild(i);
+        if (pChild == NULL)
+        {
+            continue;
+        }
+        outAllChildren.push_back(pChild);
+        GetAllChildren(outAllChildren, pChild);
+    }
+}
+
+void CBaseObject::GetAllChildren(CSelectionGroup& outAllChildren, CBaseObject* pObj) const
+{
+    const CBaseObject* pBaseObj = pObj ? pObj : this;
+
+    for (int i = 0, iChildCount(pBaseObj->GetChildCount()); i < iChildCount; ++i)
+    {
+        CBaseObject* pChild = pBaseObj->GetChild(i);
+        if (pChild == NULL)
+        {
+            continue;
+        }
+        outAllChildren.AddObject(pChild);
+        GetAllChildren(outAllChildren, pChild);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::CloneChildren(CBaseObject* pFromObject)
+{
+    if (pFromObject == NULL)
+    {
+        return;
+    }
+
+    for (int i = 0, nChildCount(pFromObject->GetChildCount()); i < nChildCount; ++i)
+    {
+        CBaseObject* pFromChildObject = pFromObject->GetChild(i);
+
+        CBaseObject* pChildClone = GetObjectManager()->CloneObject(pFromChildObject);
+        if (pChildClone == NULL)
+        {
+            continue;
+        }
+
+        pChildClone->CloneChildren(pFromChildObject);
+        AddMember(pChildClone, false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos)
+{
+    Matrix34 childTM;
+    ITransformDelegate* pTransformDelegate;
+    ITransformDelegate* pChildTransformDelegate;
+
+    {
+        CScopedSuspendUndo suspendUndo;
+
+        assert(child);
+        if (!child || child == GetLookAt())
+        {
+            return;
+        }
+
+        static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(child, ON_PREATTACHED);
+        child->NotifyListeners(bKeepPos ? ON_PREATTACHEDKEEPXFORM : ON_PREATTACHED);
+
+        pTransformDelegate = m_pTransformDelegate;
+        pChildTransformDelegate = child->m_pTransformDelegate;
+        SetTransformDelegate(nullptr);
+        child->SetTransformDelegate(nullptr);
+
+        if (bKeepPos)
+        {
+            child->InvalidateTM(0);
+            childTM = child->GetWorldTM();
+        }
+
+        // If not already attached to this node.
+        if (child->m_parent == this)
+        {
+            return;
+        }
+
+        // Add to child list first to make sure node not get deleted while reattaching.
+        m_childs.push_back(child);
+        if (child->m_parent)
+        {
+            child->DetachThis(bKeepPos);    // Detach node if attached to other parent.
+        }
+        //////////////////////////////////////////////////////////////////////////
+        child->m_parent = this; // Assign this node as parent to child node.
+    }
+
+    {
+        CScopedSuspendUndo suspendUndo;
+
+        {
+            if (bKeepPos)
+            {
+                child->SetWorldTM(childTM);
+            }
+
+            child->InvalidateTM(0);
+        }
+
+        m_pTransformDelegate = pTransformDelegate;
+        child->m_pTransformDelegate = pChildTransformDelegate;
+
+        static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(child, ON_ATTACHED);
+        child->NotifyListeners(ON_ATTACHED);
+
+        NotifyListeners(ON_CHILDATTACHED);
+    }
+
+    if (CUndo::IsRecording())
+    {
+        CUndo::Record(new CUndoAttachBaseObject(child, bKeepPos, true));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DetachAll(bool bKeepPos)
+{
+    while (!m_childs.empty())
+    {
+        CBaseObject* child = *m_childs.begin();
+        child->DetachThis(bKeepPos);
+        NotifyListeners(ON_CHILDDETACHED);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::DetachThis(bool bKeepPos)
+{
+    if (m_parent)
+    {
+        if (CUndo::IsRecording())
+        {
+            CUndo::Record(new CUndoAttachBaseObject(this, bKeepPos, false));
+        }
+
+        Matrix34 worldTM;
+        ITransformDelegate* pTransformDelegate;
+
+        {
+            CScopedSuspendUndo suspendUndo;
+            static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(this, ON_PREDETACHED);
+            NotifyListeners(bKeepPos ? ON_PREDETACHEDKEEPXFORM : ON_PREDETACHED);
+
+            pTransformDelegate = m_pTransformDelegate;
+            SetTransformDelegate(nullptr);
+
+            if (bKeepPos)
+            {
+                ITransformDelegate* pParentTransformDelegate = m_parent->m_pTransformDelegate;
+                m_parent->SetTransformDelegate(nullptr);
+                worldTM = GetWorldTM();
+                m_parent->SetTransformDelegate(pParentTransformDelegate);
+            }
+        }
+
+        {
+            CScopedSuspendUndo suspendUndo;
+
+            // Copy parent to temp var, erasing child from parent may delete this node if child referenced only from parent.
+            CBaseObject* parent = m_parent;
+            m_parent = 0;
+            parent->RemoveChild(this);
+
+            if (bKeepPos)
+            {
+                // Keep old world space transformation.
+                SetWorldTM(worldTM);
+            }
+
+            SetTransformDelegate(pTransformDelegate);
+
+            static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(this, ON_DETACHED);
+            NotifyListeners(ON_DETACHED);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::RemoveChild(CBaseObject* node)
+{
+    Childs::iterator it = std::find(m_childs.begin(), m_childs.end(), node);
+    if (it != m_childs.end())
+    {
+        m_childs.erase(it);
+        NotifyListeners(ON_CHILDDETACHED);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::ResolveParent(CBaseObject* parent)
+{
+    // even though parent is same as m_parent, adding the member to the parent must be done.
+    if (parent)
+    {
+        parent->AddMember(this, false);
+    }
+    else
+    {
+        DetachThis(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::CalcLocalTM(Matrix34& tm) const
+{
+    tm.SetIdentity();
+
+    if (m_lookat)
+    {
+        Vec3 pos = GetPos();
+
+        if (m_parent)
+        {
+            // Get our world position.
+            pos = GetParentAttachPointWorldTM().TransformPoint(pos);
+        }
+
+        // Calculate local TM matrix differently.
+        Vec3 lookatPos = m_lookat->GetWorldPos();
+        if (lookatPos == pos) // if target at object pos
+        {
+            tm.SetTranslation(pos);
+        }
+        else
+        {
+            tm = Matrix34(Matrix33::CreateRotationVDir((lookatPos - pos).GetNormalized()), pos);
+        }
+        if (m_parent)
+        {
+            Matrix34 invParentTM = m_parent->GetWorldTM();
+            invParentTM.Invert();
+            tm = invParentTM * tm;
+        }
+    }
+    else
+    {
+        tm = Matrix34::Create(GetScale(), GetRotation(), GetPos());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const Matrix34& CBaseObject::GetWorldTM() const
+{
+    if (!m_bMatrixValid)
+    {
+        m_worldTM = GetLocalTM();
+        m_bMatrixValid = true;
+        m_bMatrixInWorldSpace = false;
+        m_bWorldBoxValid = false;
+    }
+    if (!m_bMatrixInWorldSpace)
+    {
+        CBaseObject* parent = GetParent();
+        if (parent)
+        {
+            m_worldTM = GetParentAttachPointWorldTM() * m_worldTM;
+        }
+        m_bMatrixInWorldSpace = true;
+        m_bWorldBoxValid = false;
+    }
+    return m_worldTM;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Matrix34 CBaseObject::GetParentAttachPointWorldTM() const
+{
+    CBaseObject* pParent = GetParent();
+    if (pParent)
+    {
+        return pParent->GetWorldTM();
+    }
+
+    return Matrix34(IDENTITY);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::IsParentAttachmentValid() const
+{
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::InvalidateTM([[maybe_unused]] int flags)
+{
+    bool bMatrixWasValid = m_bMatrixValid;
+
+    m_bMatrixInWorldSpace = false;
+    m_bMatrixValid = false;
+    m_bWorldBoxValid = false;
+
+    // If matrix was valid, invalidate all childs.
+    if (bMatrixWasValid)
+    {
+        if (m_lookatSource)
+        {
+            m_lookatSource->InvalidateTM(eObjectUpdateFlags_ParentChanged);
+        }
+
+        // Invalidate matrices off all child objects.
+        for (int i = 0; i < m_childs.size(); i++)
+        {
+            if (m_childs[i] != 0 && m_childs[i]->m_bMatrixValid)
+            {
+                m_childs[i]->InvalidateTM(eObjectUpdateFlags_ParentChanged);
+            }
+        }
+        NotifyListeners(ON_TRANSFORM);
+
+        // Notify parent that we were modified.
+        if (m_parent)
+        {
+            m_parent->OnChildModified();
+        }
+    }
+
+    if (m_pTransformDelegate)
+    {
+        m_pTransformDelegate->MatrixInvalidated();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetLocalTM(const Vec3& pos, const Quat& rotate, const Vec3& scale, int flags)
+{
+    const bool b1 = SetPos(pos, flags | eObjectUpdateFlags_DoNotInvalidate);
+    const bool b2 = SetRotation(rotate, flags | eObjectUpdateFlags_DoNotInvalidate);
+    const bool b3 = SetScale(scale, flags | eObjectUpdateFlags_DoNotInvalidate);
+
+    if (b1 || b2 || b3 || flags == eObjectUpdateFlags_Animated)
+    {
+        flags = (b1) ? (flags | eObjectUpdateFlags_PositionChanged) : (flags & (~eObjectUpdateFlags_PositionChanged));
+        flags = (b2) ? (flags | eObjectUpdateFlags_RotationChanged) : (flags & (~eObjectUpdateFlags_RotationChanged));
+        flags = (b3) ? (flags | eObjectUpdateFlags_ScaleChanged) : (flags & (~eObjectUpdateFlags_ScaleChanged));
+        InvalidateTM(flags);
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetLocalTM(const Matrix34& tm, int flags)
+{
+    if (m_lookat)
+    {
+        bool b1 = SetPos(tm.GetTranslation(), eObjectUpdateFlags_DoNotInvalidate);
+        flags = (b1) ? (flags | eObjectUpdateFlags_PositionChanged) : (flags & (~eObjectUpdateFlags_PositionChanged));
+        InvalidateTM(flags);
+    }
+    else
+    {
+        AffineParts affineParts;
+        affineParts.SpectralDecompose(tm);
+        SetLocalTM(affineParts.pos, affineParts.rot, affineParts.scale, flags);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetWorldPos(const Vec3& pos, int flags)
+{
+    if (GetParent())
+    {
+        Matrix34 invParentTM = GetParentAttachPointWorldTM();
+        invParentTM.Invert();
+        Vec3 posLocal = invParentTM * pos;
+        SetPos(posLocal, flags);
+    }
+    else
+    {
+        SetPos(pos, flags);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetWorldTM(const Matrix34& tm, int flags)
+{
+    if (GetParent())
+    {
+        Matrix34 invParentTM = GetParentAttachPointWorldTM();
+        invParentTM.Invert();
+        Matrix34 localTM = invParentTM * tm;
+        SetLocalTM(localTM, flags);
+    }
+    else
+    {
+        SetLocalTM(tm, flags);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::UpdateVisibility(bool bVisible)
+{
+    if (bVisible == CheckFlags(OBJFLAG_INVISIBLE))
+    {
+        if (IObjectManager* objectManager = GetObjectManager())
+        {
+            objectManager->InvalidateVisibleList();
+        }
+
+        if (!bVisible)
+        {
+            m_flags |= OBJFLAG_INVISIBLE;
+        }
+        else
+        {
+            m_flags &= ~OBJFLAG_INVISIBLE;
+        }
+
+        NotifyListeners(ON_VISIBILITY);
+
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::AddGizmo(CGizmo* gizmo)
+{
+    GetObjectManager()->GetGizmoManager()->AddGizmo(gizmo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::RemoveGizmo(CGizmo* gizmo)
+{
+    GetObjectManager()->GetGizmoManager()->RemoveGizmo(gizmo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetLookAt(CBaseObject* target)
+{
+    if (m_lookat == target)
+    {
+        return;
+    }
+
+    StoreUndo("Change LookAt");
+
+    if (m_lookat)
+    {
+        // Unbind current lookat.
+        m_lookat->m_lookatSource = nullptr;
+    }
+    m_lookat = target;
+    if (m_lookat)
+    {
+        m_lookat->m_lookatSource = this;
+    }
+
+    InvalidateTM(0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::IsLookAtTarget() const
+{
+    return m_lookatSource != 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::AddEventListener(EventListener* listener)
+{
+    if (find(m_eventListeners.begin(), m_eventListeners.end(), listener) == m_eventListeners.end())
+    {
+        m_eventListeners.push_back(listener);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::RemoveEventListener(EventListener* listener)
+{
+    std::vector<EventListener*>::iterator listenerFound = find(m_eventListeners.begin(), m_eventListeners.end(), listener);
+    if (listenerFound != m_eventListeners.end())
+    {
+        (*listenerFound) = nullptr;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool IsBaseObjectEventCallbackNULL(CBaseObject::EventListener* listener) { return listener == nullptr; }
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::NotifyListeners(EObjectListenerEvent event)
+{
+    for (auto it = m_eventListeners.begin(); it != m_eventListeners.end(); ++it)
+    {
+        // Call listener callback.
+        if (*it)
+        {
+            (*it)->OnObjectEvent(this, event);
+        }
+    }
+
+    m_eventListeners.erase(remove_if(m_eventListeners.begin(), m_eventListeners.end(), IsBaseObjectEventCallbackNULL), std::end(m_eventListeners));
+}
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::ConvertFromObject(CBaseObject* object)
+{
+    SetLocalTM(object->GetLocalTM());
+    SetName(object->GetName());
+    SetColor(object->GetColor());
+    m_flattenArea = object->m_flattenArea;
+    if (object->GetParent())
+    {
+        object->GetParent()->AttachChild(this);
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::IsPotentiallyVisible() const
+{
+    if (CheckFlags(OBJFLAG_HIDDEN))
+    {
+        return false;
+    }
+    if (gSettings.objectHideMask & GetType())
+    {
+        return false;
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//! Analyze errors for this object.
+void CBaseObject::Validate(IErrorReport* report)
+{
+    // Checks for invalid values in base object.
+
+    //////////////////////////////////////////////////////////////////////////
+    // Check if position is bad.
+    const Vec3 pos = GetPos();
+
+    if (fabs(pos.x) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
+        fabs(pos.y) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
+        fabs(pos.z) > AZ::Constants::MaxFloatBeforePrecisionLoss)
+    {
+        // File Not found.
+        CErrorRecord err;
+        err.error = QStringLiteral("Object %1 have invalid position (%2,%3,%4)").arg(GetName()).arg(pos.x).arg(pos.y).arg(pos.z);
+        err.pObject = this;
+        report->ReportError(err);
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    float minScale = 0.01f;
+    float maxScale = 1000.0f;
+    //////////////////////////////////////////////////////////////////////////
+    // Check if position is bad.
+    if (m_scale.x < minScale || m_scale.x > maxScale ||
+        m_scale.y < minScale || m_scale.y > maxScale ||
+        m_scale.z < minScale || m_scale.z > maxScale)
+    {
+        // File Not found.
+        CErrorRecord err;
+        err.error = QStringLiteral("Object %1 have invalid scale (%2,%3,%4)").arg(GetName()).arg(m_scale.x).arg(m_scale.y).arg(m_scale.z);
+        err.pObject = this;
+        report->ReportError(err);
+    }
+    //////////////////////////////////////////////////////////////////////////
+};
+
+//////////////////////////////////////////////////////////////////////////
+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)
+{
+    if (GetVarBlock())
+    {
+        GetVarBlock()->GatherUsedResources(resources);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBaseObject::IsSimilarObject(CBaseObject* pObject)
+{
+    if (pObject->GetClassDesc() == GetClassDesc() && pObject->metaObject() == metaObject())
+    {
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CBaseObject::SetMinSpec(uint32 nSpec, bool bSetChildren)
+{
+    m_nMinSpec = nSpec;
+    UpdateVisibility(!IsHidden());
+
+    // Set min spec for all childs.
+    if (bSetChildren)
+    {
+        for (int i = m_childs.size() - 1; i >= 0; --i)
+        {
+            m_childs[i]->SetMinSpec(nSpec, true);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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;
+    }
+
+    Matrix34A worldTM;
+    IStatObj* pStatObj = pRenderNode->GetEntityStatObj(0, 0, &worldTM);
+    if (!pStatObj)
+    {
+        return false;
+    }
+
+    // transform decal into object space
+    Matrix34A 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, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+EScaleWarningLevel CBaseObject::GetScaleWarningLevel() const
+{
+    EScaleWarningLevel scaleWarningLevel = eScaleWarningLevel_None;
+
+    const float kScaleThreshold = 0.001f;
+
+    if (fabs(m_scale.x - 1.0f) > kScaleThreshold
+        || fabs(m_scale.y - 1.0f) > kScaleThreshold
+        || fabs(m_scale.z - 1.0f) > kScaleThreshold)
+    {
+        if (fabs(m_scale.x - m_scale.y) < kScaleThreshold
+            && fabs(m_scale.y - m_scale.z) < kScaleThreshold)
+        {
+            scaleWarningLevel = eScaleWarningLevel_Rescaled;
+        }
+        else
+        {
+            scaleWarningLevel = eScaleWarningLevel_RescaledNonUniform;
+        }
+    }
+
+    return scaleWarningLevel;
+}
+
+//////////////////////////////////////////////////////////////////////////
+ERotationWarningLevel CBaseObject::GetRotationWarningLevel() const
+{
+    ERotationWarningLevel rotationWarningLevel = eRotationWarningLevel_None;
+
+    const float kRotationThreshold = 0.01f;
+
+    Ang3 eulerRotation = Ang3(GetRotation());
+
+    if (fabs(eulerRotation.x) > kRotationThreshold
+        || fabs(eulerRotation.y) > kRotationThreshold
+        || fabs(eulerRotation.z) > kRotationThreshold)
+    {
+        const float xRotationMod = fabs(fmod(eulerRotation.x, gf_PI / 2.0f));
+        const float yRotationMod = fabs(fmod(eulerRotation.y, gf_PI / 2.0f));
+        const float zRotationMod = fabs(fmod(eulerRotation.z, gf_PI / 2.0f));
+
+        if ((xRotationMod < kRotationThreshold || xRotationMod > (gf_PI / 2.0f - kRotationThreshold))
+            && (yRotationMod < kRotationThreshold || yRotationMod > (gf_PI / 2.0f - kRotationThreshold))
+            && (zRotationMod < kRotationThreshold || zRotationMod > (gf_PI / 2.0f - kRotationThreshold)))
+        {
+            rotationWarningLevel = eRotationWarningLevel_Rotated;
+        }
+        else
+        {
+            rotationWarningLevel = eRotationWarningLevel_RotatedNonRectangular;
+        }
+    }
+
+    return rotationWarningLevel;
+}
+
+bool CBaseObject::IsSkipSelectionHelper() const
+{
+    return false;
+}
+
+bool CBaseObject::CanBeHightlighted() const
+{
+    return true;
+}
+
+Matrix33 CBaseObject::GetWorldRotTM() const
+{
+    if (GetParent())
+    {
+        return GetParent()->GetWorldRotTM() * Matrix33(GetRotation());
+    }
+    return Matrix33(GetRotation());
+}
+
+Matrix33 CBaseObject::GetWorldScaleTM() const
+{
+    if (GetParent())
+    {
+        return GetParent()->GetWorldScaleTM() * Matrix33::CreateScale(GetScale());
+    }
+    return Matrix33::CreateScale(GetScale());
+}
+
+void CBaseObject::SetTransformDelegate(ITransformDelegate* pTransformDelegate)
+{
+    m_pTransformDelegate = pTransformDelegate;
+    InvalidateTM(0);
+}
+
+void CBaseObject::AddMember(CBaseObject* pMember, bool bKeepPos /*=true */)
+{
+    AttachChild(pMember, bKeepPos);
+}
+
+void CBaseObject::OnBeforeAreaChange()
+{
+    AABB aabb;
+    GetBoundBox(aabb);
+    GetIEditor()->GetGameEngine()->OnAreaModified(aabb);
+}
+
+#include <Objects/moc_BaseObject.cpp>
diff --git a/Code/Editor/Objects/BaseObject.h b/Code/Editor/Objects/BaseObject.h
new file mode 100644
index 0000000000..fc6392767e
--- /dev/null
+++ b/Code/Editor/Objects/BaseObject.h
@@ -0,0 +1,852 @@
+/*
+ * 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 : Definition of basic Editor object.
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_BASEOBJECT_H
+#define CRYINCLUDE_EDITOR_OBJECTS_BASEOBJECT_H
+#pragma once
+
+
+#if !defined(Q_MOC_RUN)
+#include "Include/HitContext.h"
+#include "ClassDesc.h"
+#include "DisplayContext.h"
+#include "ObjectLoader.h"
+#include "Util/Variable.h"
+
+#include "AzCore/Math/Guid.h"
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// forward declarations.
+class CUndoBaseObject;
+class CObjectManager;
+class CGizmo;
+class CObjectArchive;
+struct SSubObjSelectionModifyContext;
+struct SRayHitInfo;
+class ISubObjectSelectionReferenceFrameCalculator;
+class CPopupMenuItem;
+class QMenu;
+struct IRenderNode;
+struct IStatObj;
+
+//////////////////////////////////////////////////////////////////////////
+typedef _smart_ptr<CBaseObject> CBaseObjectPtr;
+typedef std::vector<CBaseObjectPtr> TBaseObjects;
+
+//////////////////////////////////////////////////////////////////////////
+/*!
+This class used for object references remapping during cloning operation.
+*/
+class CObjectCloneContext
+{
+public:
+    //! Add cloned object.
+    SANDBOX_API void AddClone(CBaseObject* pFromObject, CBaseObject* pToObject);
+
+    //! Find cloned object for given object.
+    SANDBOX_API CBaseObject* FindClone(CBaseObject* pFromObject);
+
+    // Find id of the cloned object.
+    GUID ResolveClonedID(REFGUID guid);
+
+private:
+    typedef std::map<CBaseObject*, CBaseObject*> ObjectsMap;
+    ObjectsMap m_objectsMap;
+};
+
+//////////////////////////////////////////////////////////////////////////
+enum EObjectChangedOpType
+{
+    eOCOT_Empty = 0,
+    eOCOT_Modify,
+    eOCOT_ModifyTransform,
+    eOCOT_ModifyTransformInLibOnly,
+    eOCOT_Add,
+    eOCOT_Delete,
+    eOCOT_Count
+};
+
+struct SObjectChangedContext
+{
+    GUID m_modifiedObjectGlobalId; //! The object id globaly unique and used in ObjectManager
+    EObjectChangedOpType m_operation; //! What was the operation on the modified object
+    Matrix34 m_localTM; //! If we are in modify transform case this is the local TM info
+
+    SObjectChangedContext(EObjectChangedOpType optype)
+        : m_modifiedObjectGlobalId(GUID_NULL)
+        , m_operation(optype) { m_localTM.SetIdentity(); }
+    SObjectChangedContext()
+        : m_modifiedObjectGlobalId(GUID_NULL)
+        , m_operation(eOCOT_Empty) { m_localTM.SetIdentity(); }
+};
+
+//////////////////////////////////////////////////////////////////////////
+enum ObjectFlags
+{
+    OBJFLAG_SELECTED    = 0x0001,   //!< Object is selected. (Do not set this flag explicitly).
+    OBJFLAG_HIDDEN      = 0x0002,   //!< Object is hidden.
+    OBJFLAG_FROZEN      = 0x0004,   //!< Object is frozen (Visible but cannot be selected)
+    OBJFLAG_FLATTEN     = 0x0008,   //!< Flatten area around object.
+    OBJFLAG_SHARED      = 0x0010,   //!< This object is shared between missions.
+
+    OBJFLAG_KEEP_HEIGHT = 0x0040,   //!< This object should try to preserve height when snapping to flat objects.
+
+    OBJFLAG_NO_HITTEST  = 0x0080,   //!< This object will be not a target of ray hit test for deep selection mode.
+    OBJFLAG_IS_PARTICLE = 0x0100,
+    // object is in editing mode.
+    OBJFLAG_EDITING     = 0x01000,
+    OBJFLAG_ATTACHING   = 0x02000,  //!< Object in attaching to group mode.
+    OBJFLAG_DELETED     = 0x04000,  //!< This object is deleted.
+    OBJFLAG_HIGHLIGHT   = 0x08000,  //!< Object is highlighted (When mouse over).
+    OBJFLAG_INVISIBLE       = 0x10000,  //!< This object is invisible.
+    OBJFLAG_SUBOBJ_EDITING = 0x20000,   //!< This object is in the sub object editing mode.
+
+    OBJFLAG_SHOW_ICONONTOP = 0x100000,  //!< Icon will be drawn on top of the object.
+    OBJFLAG_HIDE_HELPERS = 0x200000,    //!< Helpers will be hidden.
+    OBJFLAG_DONT_SAVE   = 0x400000, //!< Object will not be saved with editor xml data.
+
+    OBJFLAG_PERSISTMASK = OBJFLAG_HIDDEN | OBJFLAG_FROZEN | OBJFLAG_FLATTEN,
+};
+
+#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
+{
+    MOUSECREATE_CONTINUE = 0,   //!< Continue placing this object.
+    MOUSECREATE_ABORT,              //!< Abort creation of this object.
+    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
+{
+    eObjectUpdateFlags_UserInput                = 0x00001,
+    eObjectUpdateFlags_PositionChanged  = 0x00002,
+    eObjectUpdateFlags_RotationChanged  = 0x00004,
+    eObjectUpdateFlags_ScaleChanged         = 0x00008,
+    eObjectUpdateFlags_DoNotInvalidate  = 0x00100, // Do not cause InvalidateTM call.
+    eObjectUpdateFlags_ParentChanged        = 0x00200, // When parent transformation change.
+    eObjectUpdateFlags_Undo                         = 0x00400, // When doing undo operation.
+    eObjectUpdateFlags_RestoreUndo          = 0x00800, // When doing RestoreUndo operation (This is different from normal undo).
+    eObjectUpdateFlags_Animated                 = 0x01000, // When doing animation.
+    eObjectUpdateFlags_MoveTool                 = 0x02000, // Transformation changed by the move tool
+    eObjectUpdateFlags_ScaleTool                = 0x04000, // Transformation changed by the scale tool
+    eObjectUpdateFlags_UserInputUndo        = 0x20000, // Undo operation related to user input rather than actual Undo
+};
+
+#define OBJECT_TEXTURE_ICON_SIZEX 32
+#define OBJECT_TEXTURE_ICON_SIZEY 32
+#define OBJECT_TEXTURE_ICON_SCALE 10.0f
+
+enum EScaleWarningLevel
+{
+    eScaleWarningLevel_None,
+    eScaleWarningLevel_Rescaled,
+    eScaleWarningLevel_RescaledNonUniform,
+};
+
+enum ERotationWarningLevel
+{
+    eRotationWarningLevel_None = 0,
+    eRotationWarningLevel_Rotated,
+    eRotationWarningLevel_RotatedNonRectangular,
+};
+
+// Used for external control of object position without changing the object's real position (e.g. TrackView)
+class ITransformDelegate
+{
+public:
+    // Called when matrix got invalidatd
+    virtual void MatrixInvalidated() = 0;
+
+    // Returns current delegated transforms, base transform is passed for delegates
+    // that need it, e.g. for overriding only X
+    virtual Vec3 GetTransformDelegatePos(const Vec3& basePos) const = 0;
+    virtual Quat GetTransformDelegateRotation(const Quat& baseRotation) const = 0;
+    virtual Vec3 GetTransformDelegateScale(const Vec3& baseScale) const = 0;
+
+    // Sets the delegate transform.
+    virtual void SetTransformDelegatePos(const Vec3& position) = 0;
+    virtual void SetTransformDelegateRotation(const Quat& rotation) = 0;
+    virtual void SetTransformDelegateScale(const Vec3& scale) = 0;
+
+    // If those return true the base object uses its own transform instead
+    virtual bool IsPositionDelegated() const = 0;
+    virtual bool IsRotationDelegated() const = 0;
+    virtual bool IsScaleDelegated() const = 0;
+};
+
+/*!
+ *  CBaseObject is the base class for all objects which can be placed in map.
+ *  Every object belongs to class specified by ClassDesc.
+ *  Specific object classes must override this class, to provide specific functionality.
+ *  Objects are reference counted and only destroyed when last reference to object
+ *  is destroyed.
+ *
+ */
+class SANDBOX_API CBaseObject
+    : public CVarObject
+{
+    Q_OBJECT
+public:
+    //! Events sent by object to EventListeners
+    enum EObjectListenerEvent
+    {
+        ON_DELETE = 0,// Sent after object was deleted from object manager.
+        ON_ADD,       // Sent after object was added to object manager.
+        ON_SELECT,      // Sent when objects becomes selected.
+        ON_UNSELECT,    // Sent when objects unselected.
+        ON_TRANSFORM, // Sent when object transformed.
+        ON_VISIBILITY, // Sent when object visibility changes.
+        ON_RENAME,      // Sent when object changes name.
+        ON_CHILDATTACHED, // Sent when object gets a child attached.
+        ON_PREDELETE, // Sent before an object is processed to be deleted from the object manager.
+        ON_CHILDDETACHED, // Sent when the object gets a child detached.
+        ON_DETACHFROMPARENT, // Sent when the object detaches from a parent.
+        ON_PREATTACHED, // Sent when this object is about to get attached and is already in relative space
+        ON_PREATTACHEDKEEPXFORM, // Sent when this object is about to get attached and needs to stay in place
+        ON_ATTACHED, // Sent when this object got attached
+        ON_PREDETACHED, // Sent when this object is about to get detached and is already in relative space
+        ON_PREDETACHEDKEEPXFORM, // Sent when this object is about to get detached and needs to stay in place
+        ON_DETACHED, // Sent when this object got detached
+        ON_PREFAB_CHANGED, // Sent when prefab representation has been changed
+    };
+
+    //! This callback will be called if object is deleted.
+    struct EventListener
+    {
+        virtual void OnObjectEvent(CBaseObject*, int) = 0;
+    };
+
+    //! Childs structure.
+    typedef std::vector<_smart_ptr<CBaseObject> > Childs;
+
+    //! Retrieve class description of this object.
+    CObjectClassDesc*   GetClassDesc() const { return m_classDesc; };
+
+    static bool IsEnabled() { return true; }
+
+    /** 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();
+        }
+    };
+    //  const char* GetTypeName() const { return m_classDesc->ClassName(); };
+    QString GetTypeName() const;
+    virtual QString GetTypeDescription() const { return m_classDesc->ClassName(); };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Flags.
+    //////////////////////////////////////////////////////////////////////////
+    void SetFlags(int flags) { m_flags |= flags; };
+    void ClearFlags(int flags) { m_flags &= ~flags; };
+    bool CheckFlags(int flags) const { return (m_flags & flags) != 0; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // 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;
+    //! Check against min spec.
+    bool IsHiddenBySpec() const;
+    //! Returns true if object frozen.
+    virtual bool IsFrozen() const;
+    //! Returns true if object is shared between missions.
+    bool IsShared() const { return CheckFlags(OBJFLAG_SHARED); }
+
+    //! Returns true if object is selected.
+    virtual bool IsSelected() const { return CheckFlags(OBJFLAG_SELECTED); }
+    //! Returns true if object can be selected.
+    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);
+    //! 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 NULL; };
+    //! 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; }
+
+    // Tooltip is rendered in CObjectMode, when you hover the object
+    virtual QString GetTooltip() const { return QString(); }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Object Id.
+    //////////////////////////////////////////////////////////////////////////
+    //! Get unique object id.
+    //! Every object will have its own unique id assigned.
+    REFGUID GetId() const { return m_guid; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Name.
+    //////////////////////////////////////////////////////////////////////////
+    //! 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);
+    //! Set object name and make sure it is unique.
+    void SetUniqueName(const QString& name);
+    //! Generate unique object name based on a base name (e.g. class name)
+    virtual void GenerateUniqueName();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Geometry.
+    //////////////////////////////////////////////////////////////////////////
+    //! Set object position.
+    virtual bool SetPos(const Vec3& pos, int flags = 0);
+
+    //! Set object rotation angles.
+    virtual bool SetRotation(const Quat& rotate, int flags = 0);
+
+    //! Set object scale.
+    virtual bool SetScale(const Vec3& scale, int flags = 0);
+
+    //! Get object position.
+    const Vec3 GetPos() const;
+
+    //! Get object local rotation quaternion.
+    const Quat GetRotation() const;
+
+    //! 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; };
+
+    //! Assign display color to the object.
+    virtual void    ChangeColor(const QColor& color);
+    //! Get object color.
+    QColor GetColor() const { return m_color; };
+
+    // Set current transform delegate. Pass nullptr to unset.
+    virtual void SetTransformDelegate(ITransformDelegate* pTransformDelegate);
+    ITransformDelegate* GetTransformDelegate() const { return m_pTransformDelegate; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // 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(); }
+
+    //! Get child by index.
+    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);
+    //! Get all child objects
+    void GetAllChildren(TBaseObjects& outAllChildren, CBaseObject* pObj = NULL) const;
+    void GetAllChildren(DynArray< _smart_ptr<CBaseObject> >& outAllChildren, CBaseObject* pObj = NULL) const;
+    void GetAllChildren(CSelectionGroup& outAllChildren, CBaseObject* pObj = NULL) const;
+    //! 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);
+    //! Attach new child node when the object is not a sort of a group object like AttachChild()
+    //! but if the object is a group object, the group object should be set to all children objects recursively.
+    //! and if the object is a prefab object, the prefab object should be loaded from the prefabitem.
+    //! @param bKeepPos if true Child node will keep its world space position.
+    virtual void AddMember(CBaseObject* pMember, bool bKeepPos = true);
+    //! Detach all childs of this node.
+    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
+    //////////////////////////////////////////////////////////////////////////
+    //! Get objects' local transformation matrix.
+    Matrix34 GetLocalTM() const { Matrix34 tm; CalcLocalTM(tm); return tm; };
+
+    //! Get objects' world-space transformation matrix.
+    const Matrix34& GetWorldTM() const;
+
+    // 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);
+
+    //! Set object xform.
+    virtual void SetLocalTM(const Matrix34& tm, int flags = 0);
+
+    // Set object xform.
+    virtual void SetLocalTM(const Vec3& pos, const Quat& rotate, const Vec3& scale, int flags = 0);
+
+    //////////////////////////////////////////////////////////////////////////
+    // 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 NULL MouseCreateCallback method will be used instead.
+    virtual IMouseCreateCallback* GetMouseCreateCallback() { return 0; };
+
+    //! Draw object to specified viewport.
+    virtual void Display([[maybe_unused]] DisplayContext& disp) {}
+
+    //! Perform intersection testing of this object.
+    //! Return true if was hit.
+    virtual bool HitTest([[maybe_unused]] HitContext& hc) { return false; };
+
+    //! Perform intersection testing of this object with rectangle.
+    //! 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);
+
+    //! Get bounding box of object in local object space.
+    virtual void GetLocalBounds(AABB& box);
+
+    //! Called after some parameter been modified.
+    virtual void SetModified(bool boModifiedTransformOnly);
+
+    //! Called when visibility of this object changes.
+    //! Derived class may override this to respond to new visibility setting.
+    virtual void UpdateVisibility(bool bVisible);
+
+    //! Serialize object to/from xml.
+    //! @param xmlNode XML node to load/save serialized data to.
+    //! @param bLoading true if loading data from xml.
+    //! @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) {};
+
+    //! Export object to xml.
+    //! Return created object node in xml.
+    virtual XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode);
+
+    //! Handle events received by object.
+    //! 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.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetLookAt(CBaseObject* target);
+    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);
+
+    //! Add event listener callback.
+    void AddEventListener(EventListener* listener);
+    //! Remove event listener callback.
+    void RemoveEventListener(EventListener* listener);
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Analyze errors for this object.
+    virtual void Validate(IErrorReport* report);
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Gather resources of this object.
+    virtual void GatherUsedResources(CUsedResources& resources);
+
+    //////////////////////////////////////////////////////////////////////////
+    //! 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 CalculateSubObjectSelectionReferenceFrame([[maybe_unused]] ISubObjectSelectionReferenceFrameCalculator* pCalculator) { };
+    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 NULL; }
+
+    // Invalidates cached transformation matrix.
+    // nWhyFlags - Flags that indicate the reason for matrix invalidation.
+    virtual void InvalidateTM(int nWhyFlags);
+
+protected:
+    friend class CObjectManager;
+
+    //! Ctor is protected to restrict direct usage.
+    CBaseObject();
+    //! Dtor is protected to restrict direct usage.
+    virtual ~CBaseObject();
+
+    //! Initialize Object.
+    //! If previous object specified it must be of exactly same class as this object.
+    //! All data is copied from previous object.
+    //! 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.
+    */
+    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;
+
+    //! Called when object need to be converted from different object.
+    virtual bool ConvertFromObject(CBaseObject* object);
+
+    //! Called when local transformation matrix is calculated.
+    void CalcLocalTM(Matrix34& tm) const;
+
+    //! Called when child position changed.
+    virtual void OnChildModified() {};
+
+    //! Remove child from our childs list.
+    virtual void RemoveChild(CBaseObject* node);
+
+    //! Resolve parent from callback.
+    void ResolveParent(CBaseObject* object);
+    void SetColor(const QColor& color);
+
+    //! Draw default object items.
+    virtual void DrawDefault(DisplayContext& dc, const QColor& labelColor = QColor(255, 255, 255));
+    //! Draw object label.
+    void    DrawLabel(DisplayContext& dc, const Vec3& pos, const QColor& labelColor = QColor(255, 255, 255), float alpha = 1.0f, float size = 1.f);
+    //! Draw 3D Axis at object position.
+    void    DrawAxis(DisplayContext& dc, const Vec3& pos, float size);
+    //! Draw area around object.
+    void    DrawArea(DisplayContext& dc);
+    //! Draw selection helper.
+    void    DrawSelectionHelper(DisplayContext& dc, const Vec3& pos, const QColor& labelColor = QColor(255, 255, 255), float alpha = 1.0f);
+    //! Draw helper icon.
+    virtual void DrawTextureIcon(DisplayContext& dc, const Vec3& pos, float alpha = 1.0f);
+    //! Draw warning icons
+    virtual void DrawWarningIcons(DisplayContext& dc, const Vec3& pos);
+    //! Check if dimension's figures can be displayed before draw them.
+    virtual void DrawDimensions(DisplayContext& dc, AABB* pMergedBoundBox = NULL);
+
+    //! Draw highlight.
+    virtual void DrawHighlight(DisplayContext& dc);
+
+    //! 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);
+
+    // Do hit testing on specified bounding box.
+    // 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);
+
+    //! Notify all listeners about event.
+    void NotifyListeners(EObjectListenerEvent event);
+
+    //! 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; };
+
+    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; };
+
+    Matrix33 GetWorldRotTM() const;
+    Matrix33 GetWorldScaleTM() const;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //! World space object's position.
+    Vec3 m_pos;
+    //! Object's Rotation angles.
+    Quat m_rotate;
+    //! Object's scale value.
+    Vec3 m_scale;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+private:
+    friend class CUndoBaseObject;
+    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);
+
+    // From CObject, (not implemented)
+    virtual void Serialize([[maybe_unused]] CArchive& ar) {};
+
+    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; }
+
+    // Before translating, rotating or scaling, we ask our subclasses for whether
+    // they want us to notify CGameEngine of the upcoming change of our AABB.
+    virtual bool ShouldNotifyOfUpcomingAABBChanges() const { return false; }
+
+    // Notifies the CGameEngine about an upcoming change of our AABB.
+    void OnBeforeAreaChange();
+
+    //////////////////////////////////////////////////////////////////////////
+    // PRIVATE FIELDS
+    //////////////////////////////////////////////////////////////////////////
+private:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //Default ObjType
+    ObjectType m_objType;
+
+    //! 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.
+    int m_nTextureIcon;
+
+    //! Display color.
+    QColor m_color;
+
+    //! World transformation matrix of this object.
+    mutable Matrix34 m_worldTM;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Look At target entity.
+    _smart_ptr<CBaseObject> m_lookat;
+    //! If we are lookat target. this is pointer to source.
+    CBaseObject* m_lookatSource;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Area radius around object, where terrain is flatten and static objects removed.
+    float m_flattenArea;
+    //! Every object keeps for itself height above terrain.
+    float m_height;
+    //! Object's name.
+    QString m_name;
+    //! Class description for this object.
+    CObjectClassDesc*   m_classDesc;
+
+    //! Number of reference to this object.
+    //! When reference count reach zero, object will delete itself.
+    int m_numRefs;
+
+    int m_nIconFlags;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Child animation nodes.
+    Childs m_childs;
+    //! Pointer to parent node.
+    mutable CBaseObject* m_parent;
+
+    AABB m_worldBounds;
+
+    // The transform delegate
+    ITransformDelegate* m_pTransformDelegate;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Listeners.
+    std::vector<EventListener*> m_eventListeners;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Flags and bit masks.
+    //////////////////////////////////////////////////////////////////////////
+    mutable uint32 m_bMatrixInWorldSpace : 1;
+    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*)
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_BASEOBJECT_H
diff --git a/Code/Editor/Objects/ClassDesc.cpp b/Code/Editor/Objects/ClassDesc.cpp
new file mode 100644
index 0000000000..d68c1c9c2e
--- /dev/null
+++ b/Code/Editor/Objects/ClassDesc.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "ClassDesc.h"
+
+// Editor
+#include "IconManager.h"
+
+int CObjectClassDesc::GetTextureIconId()
+{
+    if (!m_nTextureIcon)
+    {
+        QString pTexName = GetTextureIcon();
+
+        if (!pTexName.isEmpty())
+        {
+            m_nTextureIcon = GetIEditor()->GetIconManager()->GetIconTexture(pTexName.toUtf8().data());
+        }
+    }
+
+    return m_nTextureIcon;
+}
diff --git a/Code/Editor/Objects/ClassDesc.h b/Code/Editor/Objects/ClassDesc.h
new file mode 100644
index 0000000000..65a3a16865
--- /dev/null
+++ b/Code/Editor/Objects/ClassDesc.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Class description of CBaseObject
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_CLASSDESC_H
+#define CRYINCLUDE_EDITOR_OBJECTS_CLASSDESC_H
+#pragma once
+
+#include "Plugin.h"
+#include "Include/ObjectEvent.h"
+#include <QString>
+
+class CXmlArchive;
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+//! Virtual base class description of CBaseObject.
+//! Override this class to create specific Class descriptions for every base object class.
+//! Type name is specified like this:
+//! Category\Type ex: "TagPoint\Respawn"
+class SANDBOX_API CObjectClassDesc
+    : public IClassDesc
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    CObjectClassDesc()
+    {
+        m_nTextureIcon = 0;
+    }
+
+    //! Release class description.
+    virtual ObjectType GetObjectType() = 0;
+    virtual QObject* CreateQObject() const { return nullptr; }
+    //! If this function return not empty string,object of this class must be created with file.
+    //! Return root path where to look for files this object supports.
+    //! Also wild card for files can be specified, ex: Objects\*.cgf
+    virtual QString GetFileSpec()
+    {
+        return "";
+    }
+
+    virtual ESystemClassID SystemClassID() { return ESYSTEM_CLASS_OBJECT; };
+    virtual void ShowAbout() {};
+    virtual bool CanExitNow() { return true; }
+    virtual void Serialize([[maybe_unused]] CXmlArchive& ar) {};
+    //! Ex. Object with creation order 200 will be created after any object with order 100.
+    virtual int GameCreationOrder() { return 100; };
+    virtual QString GetTextureIcon() { return QString(); };
+    int GetTextureIconId();
+    virtual bool RenderTextureOnTop() const { return false; }
+
+    virtual QString GetToolClassName() { return "EditTool.ObjectCreate"; }
+
+    QString MenuSuggestion() { return{}; }
+    QString Tooltip() { return{}; }
+    QString Description() { return{}; }
+
+private:
+    int m_nTextureIcon;
+};
+#endif // CRYINCLUDE_EDITOR_OBJECTS_CLASSDESC_H
diff --git a/Code/Editor/Objects/DisplayContext.cpp b/Code/Editor/Objects/DisplayContext.cpp
new file mode 100644
index 0000000000..576f04b15f
--- /dev/null
+++ b/Code/Editor/Objects/DisplayContext.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "DisplayContextShared.inl"
diff --git a/Code/Editor/Objects/DisplayContext.h b/Code/Editor/Objects/DisplayContext.h
new file mode 100644
index 0000000000..498b96c540
--- /dev/null
+++ b/Code/Editor/Objects/DisplayContext.h
@@ -0,0 +1,297 @@
+/*
+ * 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 : DisplayContext definition.
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_DISPLAYCONTEXT_H
+#define CRYINCLUDE_EDITOR_OBJECTS_DISPLAYCONTEXT_H
+#pragma once
+
+
+#include "SandboxAPI.h"
+#include <Cry_Color.h>
+#include <Cry_Geo.h>
+
+#include <QColor>
+
+#define DC_DEFAULT_DOTLINE_STEPS 10
+#define DC_UNIT_DEGREE 1
+
+// forward declarations.
+struct IDisplayViewport;
+struct IRenderer;
+struct IRenderAuxGeom;
+struct IIconManager;
+class CDisplaySettings;
+class CCamera;
+
+enum DisplayFlags
+{
+    DISPLAY_2D = 0x01,
+    DISPLAY_HIDENAMES = 0x02,
+    DISPLAY_BBOX = 0x04,
+    DISPLAY_TRACKS = 0x08,
+    DISPLAY_TRACKTICKS = 0x010,
+    DISPLAY_WORLDSPACEAXIS = 0x020, //!< Set if axis must be displayed in world space.
+    DISPLAY_LINKS = 0x040,
+    DISPLAY_DEGRADATED = 0x080, //!< Display Objects in degradated quality (When moving/modifying).
+    DISPLAY_SELECTION_HELPERS = 0x100,  //!< Display advanced selection helpers.
+};
+
+/*!
+ *  DisplayContex is a structure passed to BaseObject Display method.
+ *  It contains everything the object should know to display itself in a view.
+ *  All fields must be filled before passing that structure to Display call.
+ */
+struct SANDBOX_API DisplayContext
+{
+    enum ETextureIconFlags
+    {
+        TEXICON_ADDITIVE     = 0x0001,
+        TEXICON_ALIGN_BOTTOM = 0x0002,
+        TEXICON_ALIGN_TOP    = 0x0004,
+        TEXICON_ON_TOP       = 0x0008,
+    };
+
+    CDisplaySettings* settings;
+    IDisplayViewport* view;
+    IRenderer* renderer;
+    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
+    int flags;
+
+    //! Ctor.
+    DisplayContext();
+    // Helper methods.
+    void SetView(IDisplayViewport* pView);
+    IDisplayViewport* GetView() const { return view; }
+    void Flush2D();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Draw functions
+    //////////////////////////////////////////////////////////////////////////
+    //! Set current materialc color.
+    void SetColor(float r, float g, float b, float a = 1) { m_color4b = ColorB(int(r * 255.0f), int(g * 255.0f), int(b * 255.0f), int(a * 255.0f)); };
+    void SetColor(const Vec3& color, float a = 1) { m_color4b = ColorB(int(color.x * 255.0f), int(color.y * 255.0f), int(color.z * 255.0f), int(a * 255.0f)); };
+    void SetColor(const QColor& rgb, float a) { m_color4b = ColorB(rgb.red(), rgb.green(), rgb.blue(), int(a * 255.0f)); };
+    void SetColor(const QColor& color) { m_color4b = ColorB(color.red(), color.green(), color.blue(), color.alpha()); };
+    void SetColor(const ColorB& color) { m_color4b = color; };
+    void SetAlpha(float a = 1) { m_color4b.a = int(a * 255.0f); };
+    ColorB GetColor() const { return m_color4b; }
+
+    void SetSelectedColor(float fAlpha = 1);
+    void SetFreezeColor();
+
+    //! Get color to draw selectin of object.
+    QColor GetSelectedColor();
+    QColor GetFreezeColor();
+
+    // Draw 3D quad.
+    void DrawQuad(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4);
+    void DrawQuad(float width, float height);
+    void DrawQuadGradient(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4, ColorB firstColor, ColorB secondColor);
+    void DrawWireQuad(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4);
+    void DrawWireQuad(float width, float height);
+    // Draw 3D Triangle.
+    void DrawTri(const Vec3& p1, const Vec3& p2, const Vec3& p3);
+    void DrawTriangles(const AZStd::vector<Vec3>& vertices, const ColorB& color);
+    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);
+    // 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);
+    void DrawPoint(const Vec3& p, int nSize = 1);
+    void DrawLine(const Vec3& p1, const Vec3& p2);
+    void DrawLine(const Vec3& p1, const Vec3& p2, const ColorF& col1, const ColorF& col2);
+    void DrawLine(const Vec3& p1, const Vec3& p2, const QColor& rgb1, const QColor& rgb2);
+    void DrawLines(const AZStd::vector<Vec3>& vertices, const ColorF& color);
+    void DrawPolyLine(const Vec3* pnts, int numPoints, bool cycled = true);
+
+    // Vera, Confetti
+    void DrawDottedLine(const Vec3& p1, const Vec3& p2, const ColorF& col1, const ColorF& col2, const float numOfSteps = DC_DEFAULT_DOTLINE_STEPS);
+    void DrawWireQuad2d(const QPoint& p1, const QPoint& p2, float z);
+    void DrawLine2d(const QPoint& p1, const QPoint& p2, float z);
+    void DrawLine2dGradient(const QPoint& p1, const QPoint& p2, float z, ColorB firstColor, ColorB secondColor);
+    void DrawWireCircle2d(const QPoint& center, float radius, float z);
+
+    // Draw circle from lines on terrain, position is in world space.
+    void DrawTerrainCircle(const Vec3& worldPos, float radius, float height);
+    void DrawTerrainCircle(const Vec3& center, float radius, float angle1, float angle2, float height);
+
+    /// DrawArc
+    /// Draws an arc around the specified position from a given angle across the angular length given by sweepAngleDegrees
+    /// it orients the arc around the index of the given basis axis.
+    /// \param pos World space position on which to center the arc.
+    /// \param radius Radius that defines the size of the arc.
+    /// \param startAngleDegrees Angle in degrees measured clockwise from the basis axis to the starting point of the arc.
+    /// \param sweepAngleDegreees Angle in degrees measured clockwise from the startAngle parameter to ending point of the arc.
+    /// \param angularStepDegrees Defines the distance between vertices, a small value will result in a greater number of vertices.
+    /// \param referenceAxis Axis on which to align the arc (0 for X, 1 for Y, 2 for Z)
+    void DrawArc(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, int referenceAxis = 2);
+
+
+    /// DrawArc
+    /// Draws an arc around the specified position from a given angle across the angular length given by sweepAngleDegrees
+    /// oriented around the specified axis.
+    /// \param pos World space position on which to center the arc.
+    /// \param radius Radius that defines the size of the arc.
+    /// \param startAngleDegrees Angle in degrees measured clockwise from the basis axis to the starting point of the arc.
+    /// \param sweepAngleDegreees Angle in degrees measured clockwise from the startAngle parameter to ending point of the arc.
+    /// \param angularStepDegrees Defines the distance between vertices, a small value will result in a greater number of vertices.
+    /// \param fixedAxis Normal axis on which to align the arc.
+    void DrawArc(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const Vec3& fixedAxis);
+
+    //Vera, Confetti:
+    //Draw an arc and an arrow at the end of the arc
+    void DrawArcWithArrow(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const Vec3& fixedAxis);
+
+    // Draw circle.
+    void DrawCircle(const Vec3& pos, float radius, int nUnchangedAxis = 2 /*z axis*/);
+
+    void DrawHalfDottedCircle(const Vec3& pos, float radius, const Vec3& viewPos, int nUnchangedAxis = 2 /*z axis*/);
+
+    // Vera, Confetti :
+    // Draw a dotted circle.
+    void DrawDottedCircle(const Vec3& pos, float radius, const Vec3& nUnchangedAxis, int numberOfArrows = 0, float stepDegree = DC_UNIT_DEGREE);
+
+    // Draw cylinder.
+    void DrawCylinder(const Vec3& p1, const Vec3& p2, float radius, float height);
+
+    void DrawCone(const Vec3& pos, const Vec3& dir, float radius, float height, bool drawShaded = true);
+
+    /// DrawWireCylinder
+    /// \param center Center of cylinder.
+    /// \param axis Axis along which cylinder is tall.
+    /// \param radius Radius of cylinder.
+    /// \param height Total height of cylinder.
+    void DrawWireCylinder(const Vec3& center, const Vec3& axis, float radius, float height);
+
+    /// DrawSolidCylinder
+    /// \param center Center of cylinder.
+    /// \param axis Axis along which cylinder is tall.
+    /// \param radius Radius of cylinder.
+    /// \param height Total height of cylinder.
+    void DrawSolidCylinder(const Vec3& center, const Vec3& axis, float radius, float height, bool drawShaded = true);
+
+    /// DrawWireCapsule
+    /// \param pos Center of capsule.
+    /// \param axis Axis along which capsule is tall.
+    /// \param radius Radius of capsule.
+    /// \param heightStraightSection Height of capsule's straight section (does not include caps).
+    void DrawWireCapsule(const Vec3& center, const Vec3& axis, float radius, float heightStraightSection);
+
+    //! Draw rectangle on top of terrain.
+    //! Coordinates are in world space.
+    void DrawTerrainRect(float x1, float y1, float x2, float y2, float height);
+
+    void DrawTerrainLine (Vec3 worldPos1, Vec3 worldPos2);
+
+    void DrawWireSphere(const Vec3& pos, float radius);
+    void DrawWireSphere(const Vec3& pos, const Vec3 radius);
+
+    void DrawWireDisk(const Vec3& pos, const Vec3& dir, float radius);
+
+    void PushMatrix(const Matrix34& tm);
+    void PopMatrix();
+    const Matrix34& GetMatrix();
+
+    // Draw special 3D objects.
+    void DrawBall(const Vec3& pos, float radius, bool drawShaded = true);
+    void DrawDisk(const Vec3& pos, const Vec3& dir, float radius);
+
+    //! Draws 3d arrow.
+    void DrawArrow(const Vec3& src, const Vec3& trg, float fHeadScale = 1, bool b2SidedArrow = false);
+
+    // Draw texture label in 2d view coordinates.
+    // w,h in pixels.
+    void DrawTextureLabel(const Vec3& pos, int nWidth, int nHeight, int nTexId, int nTexIconFlags = 0, int srcOffsetX = 0, int scrOffsetY = 0, bool bDistanceScaleIcons = false, float fDistanceScale = 1.0f);
+
+    void RenderObject(int objectType, const Vec3& pos, float scale);
+    void RenderObject(int objectType, const Matrix34& tm);
+
+    void DrawTextLabel(const Vec3& pos, float size, const char* text, const bool bCenter = false, int srcOffsetX = 0, int scrOffsetY = 0);
+    void Draw2dTextLabel(float x, float y, float size, const char* text, bool bCenter = false);
+    void SetLineWidth(float width);
+
+    //! Is given bbox visible in this display context.
+    bool IsVisible(const AABB& bounds);
+
+    //! Gets current render state.
+    uint32 GetState() const;
+    //! Set a new render state.
+    //! \param returns previous render state.
+    uint32 SetState(uint32 state);
+    //! Set a new render state flags.
+    //! \param returns previous render state.
+    uint32 SetStateFlag(uint32 state);
+    //! Clear specified flags in render state.
+    //! \param returns previous render state.
+    uint32 ClearStateFlag(uint32 state);
+
+    void DepthTestOff();
+    void DepthTestOn();
+
+    void DepthWriteOff();
+    void DepthWriteOn();
+
+    void CullOff();
+    void CullOn();
+
+    // Enables drawing helper lines in front of usual geometry, adds a small z offset to all drawn lines.
+    bool SetDrawInFrontMode(bool bOn);
+
+    // Description:
+    //   Changes fill mode.
+    // Arguments:
+    //    nFillMode is one of the values from EAuxGeomPublicRenderflags_FillMode
+    int  SetFillMode(int nFillMode);
+
+    //! Convert position to world space.
+    Vec3 ToWorldSpacePosition(const Vec3& v) { return m_matrixStack[m_currentMatrix].TransformPoint(v); }
+
+    //! Convert direction to world space (translation is not considered)
+    Vec3 ToWorldSpaceVector(const Vec3& v) { return m_matrixStack[m_currentMatrix].TransformVector(v); }
+
+    float ToWorldSpaceMaxScale(float value);
+
+    float GetLineWidth() const              {   return m_thickness; }
+
+private:
+
+    void InternalDrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1);
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    ColorB m_color4b;
+    uint32 m_renderState;
+    float m_thickness;
+    float m_width;
+    float m_height;
+
+    int m_currentMatrix;
+    //! Matrix stack.
+    Matrix34 m_matrixStack[32];
+
+    struct STextureLabel
+    {
+        float x, y, z; // 2D position (z in world space).
+        float w, h;  // Width height.
+        int nTexId; // Texture id.
+        int flags;  // ETextureIconFlags
+        float color[4];
+    };
+    std::vector<STextureLabel> m_textureLabels;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_DISPLAYCONTEXT_H
diff --git a/Code/Editor/Objects/DisplayContextShared.inl b/Code/Editor/Objects/DisplayContextShared.inl
new file mode 100644
index 0000000000..e122f68be7
--- /dev/null
+++ b/Code/Editor/Objects/DisplayContextShared.inl
@@ -0,0 +1,1314 @@
+/*
+ * 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 <Cry_Geo.h>
+#include "DisplayContext.h"
+#include "IRenderAuxGeom.h"
+#include "IEditor.h"
+#include "Include/IIconManager.h"
+#include "Include/IDisplayViewport.h"
+
+#include <QDateTime>
+#include <QPoint>
+
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
+
+#define FREEZE_COLOR QColor(100, 100, 100)
+
+//////////////////////////////////////////////////////////////////////////
+DisplayContext::DisplayContext()
+{
+    view = 0;
+    renderer = 0;
+    flags = 0;
+    settings = 0;
+    pIconManager = 0;
+    m_renderState = 0;
+
+    m_currentMatrix = 0;
+    m_matrixStack[m_currentMatrix].SetIdentity();
+    pRenderAuxGeom = nullptr; // ToDo: Remove DisplayContext or update to work with Atom: LYN-3670
+    m_thickness = 0;
+
+    m_width = 0;
+    m_height = 0;
+
+    m_textureLabels.reserve(100);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::SetView(IDisplayViewport* pView)
+{
+    view = pView;
+    int width, height;
+    view->GetDimensions(&width, &height);
+    m_width = static_cast<float>(width);
+    m_height = static_cast<float>(height);
+    m_textureLabels.resize(0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::InternalDrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1)
+{
+    pRenderAuxGeom->DrawLine(v0, colV0, v1, colV1, m_thickness);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawPoint(const Vec3& p, int nSize)
+{
+    pRenderAuxGeom->DrawPoint(ToWorldSpacePosition(p), m_color4b, nSize);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawTri(const Vec3& p1, const Vec3& p2, const Vec3& p3)
+{
+    pRenderAuxGeom->DrawTriangle(ToWorldSpacePosition(p1), m_color4b, ToWorldSpacePosition(p2), m_color4b, ToWorldSpacePosition(p3), m_color4b);
+}
+
+void DisplayContext::DrawTriangles(const AZStd::vector<Vec3>& vertices, const ColorB& color)
+{
+    pRenderAuxGeom->DrawTriangles(vertices.begin(), vertices.size(), color);
+}
+
+void DisplayContext::DrawTrianglesIndexed(const AZStd::vector<Vec3>& vertices, const AZStd::vector<vtx_idx>& indices, const ColorB& color)
+{
+    pRenderAuxGeom->DrawTriangles(vertices.begin(), vertices.size(), indices.begin(), indices.size(), color);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawQuad(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4)
+{
+    Vec3 p[4] = { ToWorldSpacePosition(p1), ToWorldSpacePosition(p2), ToWorldSpacePosition(p3), ToWorldSpacePosition(p4) };
+    pRenderAuxGeom->DrawTriangle(p[0], m_color4b, p[1], m_color4b, p[2], m_color4b);
+    pRenderAuxGeom->DrawTriangle(p[2], m_color4b, p[3], m_color4b, p[0], m_color4b);
+}
+
+void DisplayContext::DrawQuad(float width, float height)
+{
+    pRenderAuxGeom->DrawQuad(width, height, m_matrixStack[m_currentMatrix], m_color4b);
+}
+
+void DisplayContext::DrawWireQuad(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4)
+{
+    Vec3 p[4] = { ToWorldSpacePosition(p1), ToWorldSpacePosition(p2), ToWorldSpacePosition(p3), ToWorldSpacePosition(p4) };
+    pRenderAuxGeom->DrawPolyline(p, 4, true, m_color4b);
+}
+
+void DisplayContext::DrawWireQuad(float width, float height)
+{
+    const float halfWidth = width * 0.5f;
+    const float halfHeight = height * 0.5f;
+
+    const Vec3 p[4] =
+    {
+        ToWorldSpacePosition(Vec3(-halfWidth, 0.0f,  halfHeight)),
+        ToWorldSpacePosition(Vec3( halfWidth, 0.0f,  halfHeight)),
+        ToWorldSpacePosition(Vec3( halfWidth, 0.0f, -halfHeight)),
+        ToWorldSpacePosition(Vec3(-halfWidth, 0.0f, -halfHeight)),
+    };
+    pRenderAuxGeom->DrawPolyline(p, 4, true, m_color4b);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawCylinder(const Vec3& p1, const Vec3& p2, float radius, float height)
+{
+    Vec3 p[2] = { ToWorldSpacePosition(p1), ToWorldSpacePosition(p2) };
+    Vec3 dir = p[1] - p[0];
+    pRenderAuxGeom->DrawCylinder(p[0], dir, radius, height, m_color4b);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawCone(const Vec3& pos, const Vec3& dir, float radius, float height, bool drawShaded /*= true*/)
+{
+    const Vec3 worldPos = ToWorldSpacePosition(pos);
+    const Vec3 worldDir = ToWorldSpaceVector(dir);
+    pRenderAuxGeom->DrawCone(worldPos, worldDir, radius, height, m_color4b, drawShaded);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawWireCylinder(const Vec3& center, const Vec3& axis, float radius, float height)
+{
+    if (radius > FLT_EPSILON && height > FLT_EPSILON && axis.GetLengthSquared() > FLT_EPSILON)
+    {
+        Vec3 axisNormalized = axis.GetNormalized();
+
+        // Draw circles at bottom & top of cylinder
+        Vec3 centerToTop = axisNormalized * height * 0.5f;
+        Vec3 circle1Center = center - centerToTop;
+        Vec3 circle2Center = center + centerToTop;
+        // DrawArc() takes local coordinates
+        DrawArc(circle1Center, radius, 0.0f, 360.0f, 22.5f, axisNormalized);
+        DrawArc(circle2Center, radius, 0.0f, 360.0f, 22.5f, axisNormalized);
+
+        // Draw 4 lines up side of cylinder
+        Vec3 rightDirNormalized, frontDirNormalized;
+        GetBasisVectors(axisNormalized, rightDirNormalized, frontDirNormalized);
+        Vec3 centerToRightEdge = rightDirNormalized * radius;
+        Vec3 centerToFrontEdge = frontDirNormalized * radius;
+        // InternalDrawLine() takes world coordinates
+        InternalDrawLine(ToWorldSpacePosition(circle1Center + centerToRightEdge), m_color4b,
+            ToWorldSpacePosition(circle2Center + centerToRightEdge), m_color4b);
+        InternalDrawLine(ToWorldSpacePosition(circle1Center - centerToRightEdge), m_color4b,
+            ToWorldSpacePosition(circle2Center - centerToRightEdge), m_color4b);
+        InternalDrawLine(ToWorldSpacePosition(circle1Center + centerToFrontEdge), m_color4b,
+            ToWorldSpacePosition(circle2Center + centerToFrontEdge), m_color4b);
+        InternalDrawLine(ToWorldSpacePosition(circle1Center - centerToFrontEdge), m_color4b,
+            ToWorldSpacePosition(circle2Center - centerToFrontEdge), m_color4b);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawSolidCylinder(const Vec3& center, const Vec3& axis, float radius, float height, bool drawShaded)
+{
+    if (radius > FLT_EPSILON && height > FLT_EPSILON && axis.GetLengthSquared() > FLT_EPSILON)
+    {
+        // transform everything to world space
+        Vec3 wsCenter = ToWorldSpacePosition(center);
+
+        // determine scale in dir direction, apply to height
+        Vec3 axisNormalized = axis.GetNormalized();
+        Vec3 wsAxis = ToWorldSpaceVector(axisNormalized);
+        float wsAxisLength = wsAxis.GetLength();
+        float wsHeight = height * wsAxisLength;
+
+        // determine scale in orthogonal direction, apply to radius
+        Vec3 radiusDirNormalized = axisNormalized.GetOrthogonal();
+        radiusDirNormalized.Normalize();
+        Vec3 wsRadiusDir = ToWorldSpaceVector(radiusDirNormalized);
+        float wsRadiusDirLen = wsRadiusDir.GetLength();
+        float wsRadius = radius * wsRadiusDirLen;
+
+        pRenderAuxGeom->DrawCylinder(wsCenter, wsAxis, wsRadius, wsHeight, m_color4b, drawShaded);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+void DisplayContext::DrawWireCapsule(const Vec3& center, const Vec3& axis, float radius, float heightStraightSection)
+{
+    if (radius > FLT_EPSILON && axis.GetLengthSquared() > FLT_EPSILON)
+    {
+        Vec3 axisNormalized = axis.GetNormalizedFast();
+
+        // Draw cylinder part (or just a circle around the middle)
+        if (heightStraightSection > FLT_EPSILON)
+        {
+            DrawWireCylinder(center, axis, radius, heightStraightSection);
+        }
+        else
+        {
+            DrawArc(center, radius, 0.0f, 360.0f, 22.5f, axisNormalized);
+        }
+
+        // Draw top cap as two criss-crossing 180deg arcs
+        Vec3 ortho1Normalized, ortho2Normalized;
+        GetBasisVectors(axisNormalized, ortho1Normalized, ortho2Normalized);
+        Vec3 centerToTopCircleCenter = axisNormalized * heightStraightSection * 0.5f;
+        DrawArc(center + centerToTopCircleCenter, radius,  90.0f, 180.0f, 22.5f, ortho1Normalized);
+        DrawArc(center + centerToTopCircleCenter, radius, 180.0f, 180.0f, 22.5f, ortho2Normalized);
+
+        // Draw bottom cap
+        DrawArc(center - centerToTopCircleCenter, radius, -90.0f, 180.0f, 22.5f, ortho1Normalized);
+        DrawArc(center - centerToTopCircleCenter, radius,   0.0f, 180.0f, 22.5f, ortho2Normalized);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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::DrawSolidBox(const Vec3& min, const Vec3& max)
+{
+    pRenderAuxGeom->DrawAABB(AABB(min, max), m_matrixStack[m_currentMatrix], true, m_color4b, eBBD_Faceted);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawSolidOBB(const Vec3& center, const Vec3& axisX, const Vec3& axisY, const Vec3& axisZ, const Vec3& halfExtents)
+{
+    OBB obb;
+    obb.m33 = Matrix33::CreateFromVectors(axisX, axisY, axisZ);
+    obb.c = Vec3(0, 0, 0);
+    obb.h = halfExtents;
+    pRenderAuxGeom->DrawOBB(obb, center, true, m_color4b, eBBD_Faceted);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawLine(const Vec3& p1, const Vec3& p2)
+{
+    InternalDrawLine(ToWorldSpacePosition(p1), m_color4b, ToWorldSpacePosition(p2), m_color4b);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawPolyLine(const Vec3* pnts, int numPoints, bool cycled)
+{
+    MAKE_SURE(numPoints >= 2, return );
+    MAKE_SURE(pnts != 0, return );
+
+    int numSegments = cycled ? numPoints : (numPoints - 1);
+    Vec3 p1 = ToWorldSpacePosition(pnts[0]);
+    Vec3 p2;
+    for (int i = 0; i < numSegments; i++)
+    {
+        int j = (i + 1) % numPoints;
+        p2 = ToWorldSpacePosition(pnts[j]);
+        InternalDrawLine(p1, m_color4b, p2, m_color4b);
+        p1 = p2;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawTerrainCircle(const Vec3& worldPos, float radius, float height)
+{
+    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+    // Draw circle with default radius.
+    Vec3 p0, p1;
+    p0.x = worldPos.x + radius * sin(0.0f);
+    p0.y = worldPos.y + radius * cos(0.0f);
+    const float defaultTerrainElevation = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
+    float terrainElevation = terrain ? terrain->GetHeightFromFloats(p0.x, p0.y) : defaultTerrainElevation;
+    p0.z = terrainElevation + height;
+
+    float step = 20.0f / 180 * gf_PI;
+    for (float angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        p1.x = worldPos.x + radius * sin(angle);
+        p1.y = worldPos.y + radius * cos(angle);
+        terrainElevation = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) : defaultTerrainElevation;
+        p1.z = terrainElevation + height;
+
+        InternalDrawLine(ToWorldSpacePosition(p0), m_color4b, ToWorldSpacePosition(p1), m_color4b);
+        p0 = p1;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawTerrainCircle(const Vec3& worldPos, float radius, float angle1, float angle2, float height)
+{
+    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+    // Draw circle with default radius.
+    Vec3 p0, p1;
+    p0.x = worldPos.x + radius * sin(angle1);
+    p0.y = worldPos.y + radius * cos(angle1);
+    float terrainElevation = terrain ? terrain->GetHeightFromFloats(p0.x, p0.y) : 0.0f;
+    p0.z = terrainElevation + height;
+
+    float step = 20.0f / 180 * gf_PI;
+    for (float angle = step + angle1; angle < angle2; angle += step)
+    {
+        p1.x = worldPos.x + radius * sin(angle);
+        p1.y = worldPos.y + radius * cos(angle);
+        terrainElevation = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) : 0.0f;
+        p1.z = terrainElevation + height;
+
+        InternalDrawLine(ToWorldSpacePosition(p0), m_color4b, ToWorldSpacePosition(p1), m_color4b);
+        p0 = p1;
+    }
+
+    p1.x = worldPos.x + radius * sin(angle2);
+    p1.y = worldPos.y + radius * cos(angle2);
+    terrainElevation = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) : 0.0f;
+    p1.z = terrainElevation + height;
+
+    InternalDrawLine(ToWorldSpacePosition(p0), m_color4b, ToWorldSpacePosition(p1), m_color4b);
+}
+
+
+void DisplayContext::DrawArc(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, int referenceAxis)
+{
+    // angularStepDegrees cannot be zero as it is used to divide sweepAngleDegrees
+    if (fabs(angularStepDegrees) < FLT_EPSILON)
+    {
+        return;
+    }
+
+    float startAngleRadians = DEG2RAD(startAngleDegrees);
+    float sweepAngleRadians = DEG2RAD(sweepAngleDegrees);
+
+    float angle = startAngleRadians;
+
+    const uint referenceAxis0 = referenceAxis % 3;
+    const uint referenceAxis1 = (referenceAxis + 1) % 3;
+    const uint referenceAxis2 = (referenceAxis + 2) % 3;
+
+    Vec3 p0;
+    p0[referenceAxis0] = pos[referenceAxis0];
+    p0[referenceAxis1] = pos[referenceAxis1] + radius * sin(angle);
+    p0[referenceAxis2] = pos[referenceAxis2] + radius * cos(angle);
+    p0 = ToWorldSpacePosition(p0);
+
+    float step = DEG2RAD(angularStepDegrees);
+    int numSteps = std::abs(static_cast<int>(std::ceil(sweepAngleRadians / step)));
+
+    Vec3 p1;
+    for (int i = 0; i < numSteps; ++i)
+    {
+        angle += std::min(step, sweepAngleRadians); // Don't go past sweepAngleRadians when stepping or the arc will be too long.
+        sweepAngleRadians -= step;
+
+        p1[referenceAxis0] = pos[referenceAxis0];
+        p1[referenceAxis1] = pos[referenceAxis1] + radius * sin(angle);
+        p1[referenceAxis2] = pos[referenceAxis2] + radius * cos(angle);
+        p1 = ToWorldSpacePosition(p1);
+
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+}
+
+void DisplayContext::DrawArc(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const Vec3& fixedAxis)
+{
+    // angularStepDegrees cannot be zero as it is used to divide sweepAngleDegrees
+    if (fabs(angularStepDegrees) < FLT_EPSILON)
+    {
+        return;
+    }
+
+    float startAngleRadians = DEG2RAD(startAngleDegrees);
+    float sweepAngleRadians = DEG2RAD(sweepAngleDegrees);
+
+    Vec3 a;
+    Vec3 b;
+    GetBasisVectors(fixedAxis, a, b);
+
+    float angle = startAngleRadians;
+
+    float cosAngle = cos(angle) * radius;
+    float sinAngle = sin(angle) * radius;
+
+    Vec3 p0;
+    p0.x = pos.x + cosAngle * a.x + sinAngle * b.x;
+    p0.y = pos.y + cosAngle * a.y + sinAngle * b.y;
+    p0.z = pos.z + cosAngle * a.z + sinAngle * b.z;
+    p0 = ToWorldSpacePosition(p0);
+
+    float step = DEG2RAD(angularStepDegrees);
+    int numSteps = std::abs(static_cast<int>(std::ceil(sweepAngleRadians / step)));
+
+    Vec3 p1;
+    for (int i = 0; i < numSteps; ++i)
+    {
+        angle += std::min(step, sweepAngleRadians); // Don't go past sweepAngleRadians when stepping or the arc will be too long.
+        sweepAngleRadians -= step;
+
+        float cosAngle2 = cos(angle) * radius;
+        float sinAngle2 = sin(angle) * radius;
+
+        p1.x = pos.x + cosAngle2 * a.x + sinAngle2 * b.x;
+        p1.y = pos.y + cosAngle2 * a.y + sinAngle2 * b.y;
+        p1.z = pos.z + cosAngle2 * a.z + sinAngle2 * b.z;
+        p1 = ToWorldSpacePosition(p1);
+
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+
+        p0 = p1;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Vera, Confetti
+void DisplayContext::DrawArcWithArrow(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const Vec3& fixedAxis)
+{
+    // angularStepDegrees cannot be zero as it is used to divide sweepAngleDegrees
+    // Grab the code from draw arc to get the final p0 and p1;
+    if (fabs(angularStepDegrees) < FLT_EPSILON)
+    {
+        return;
+    }
+
+    float startAngleRadians = DEG2RAD(startAngleDegrees);
+    float sweepAngleRadians = DEG2RAD(sweepAngleDegrees);
+
+    Vec3 a;
+    Vec3 b;
+    GetBasisVectors(fixedAxis, a, b);
+
+    float angle = startAngleRadians;
+
+    float cosAngle = cos(angle) * radius;
+    float sinAngle = sin(angle) * radius;
+
+    Vec3 p0;
+    p0.x = pos.x + cosAngle * a.x + sinAngle * b.x;
+    p0.y = pos.y + cosAngle * a.y + sinAngle * b.y;
+    p0.z = pos.z + cosAngle * a.z + sinAngle * b.z;
+    p0 = ToWorldSpacePosition(p0);
+
+    float step = DEG2RAD(angularStepDegrees);
+    int numSteps = std::abs(static_cast<int>(std::ceil(sweepAngleRadians / step)));
+
+    Vec3 p1;
+    for (int i = 0; i < numSteps; ++i)
+    {
+        angle += step;
+        float cosAngle2 = cos(angle) * radius;
+        float sinAngle2 = sin(angle) * radius;
+
+        p1.x = pos.x + cosAngle2 * a.x + sinAngle2 * b.x;
+        p1.y = pos.y + cosAngle2 * a.y + sinAngle2 * b.y;
+        p1.z = pos.z + cosAngle2 * a.z + sinAngle2 * b.z;
+        p1 = ToWorldSpacePosition(p1);
+
+        if (i + 1 >= numSteps) // For last step, draw an arrow
+        {
+            // p0 and p1 are global position. We could like to map it to local
+            Matrix34 inverseMat =  m_matrixStack[m_currentMatrix].GetInverted();
+            Vec3 localP0 = inverseMat.TransformPoint(p0);
+            Vec3 localP1 = inverseMat.TransformPoint(p1);
+            DrawArrow(localP0, localP1, m_thickness);
+        }
+        else
+        {
+            InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        }
+
+        p0 = p1;
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawCircle(const Vec3& pos, float radius, int nUnchangedAxis)
+{
+    // Draw circle with default radius.
+    Vec3 p0, p1;
+    p0[nUnchangedAxis] = pos[nUnchangedAxis];
+    p0[(nUnchangedAxis + 1) % 3] = pos[(nUnchangedAxis + 1) % 3] + radius * sin(0.0f);
+    p0[(nUnchangedAxis + 2) % 3] = pos[(nUnchangedAxis + 2) % 3] + radius * cos(0.0f);
+    p0 = ToWorldSpacePosition(p0);
+    const float step = 10.0f / 180.0f * gf_PI;
+    for (float angle = step; angle < 360.0f / 180.0f * gf_PI + step; angle += step)
+    {
+        p1[nUnchangedAxis] = pos[nUnchangedAxis];
+        p1[(nUnchangedAxis + 1) % 3] = pos[(nUnchangedAxis + 1) % 3] + radius * sin(angle);
+        p1[(nUnchangedAxis + 2) % 3] = pos[(nUnchangedAxis + 2) % 3] + radius * cos(angle);
+        p1 = ToWorldSpacePosition(p1);
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+}
+
+void DisplayContext::DrawHalfDottedCircle(const Vec3& pos, float radius, const Vec3& viewPos, int nUnchangedAxis)
+{
+    // Draw circle with default radius
+    Vec3 p0, p1;
+    p0[nUnchangedAxis] = pos[nUnchangedAxis];
+    p0[(nUnchangedAxis + 1) % 3] = pos[(nUnchangedAxis + 1) % 3] + radius * sin(0.0f);
+    p0[(nUnchangedAxis + 2) % 3] = pos[(nUnchangedAxis + 2) % 3] + radius * cos(0.0f);
+    p0 = ToWorldSpacePosition(p0);
+    const Vec3 worldPos = ToWorldSpacePosition(pos);
+    const Vec3 worldView = ToWorldSpacePosition(viewPos);
+    const float step = 10.0f / 180.0f * gf_PI;
+    size_t count = 0;
+    for (float angle = step; angle < 360.0f / 180.0f * gf_PI + step; angle += step)
+    {
+        p1[nUnchangedAxis] = pos[nUnchangedAxis];
+        p1[(nUnchangedAxis + 1) % 3] = pos[(nUnchangedAxis + 1) % 3] + radius * sin(angle);
+        p1[(nUnchangedAxis + 2) % 3] = pos[(nUnchangedAxis + 2) % 3] + radius * cos(angle);
+        p1 = ToWorldSpacePosition(p1);
+        // is circle edge facing away from us or not
+        const float dot = (p0 - worldPos).Dot(worldView - worldPos);
+        const bool facing = dot > 0.0f;
+        // if so skip every other line to produce a dotted effect
+        if (facing || count % 2 == 0)
+        {
+            InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        }
+        count++;
+        p0 = p1;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Vera, Confetti
+void DisplayContext::DrawDottedCircle(const Vec3& pos, float radius, const Vec3& nUnchangedAxis, int numberOfArrows /*=0*/, float stepDegree /*= 1*/)
+{
+    float startAngleRadians = 0;
+
+    Vec3 a;
+    Vec3 b;
+    GetBasisVectors(nUnchangedAxis, a, b);
+
+    float angle = startAngleRadians;
+
+    float cosAngle = cos(angle) * radius;
+    float sinAngle = sin(angle) * radius;
+
+    Vec3 p0;
+    p0.x = pos.x + cosAngle * a.x + sinAngle * b.x;
+    p0.y = pos.y + cosAngle * a.y + sinAngle * b.y;
+    p0.z = pos.z + cosAngle * a.z + sinAngle * b.z;
+    p0 = ToWorldSpacePosition(p0);
+
+    float step = DEG2RAD(stepDegree); // one degree each step
+    int numSteps = aznumeric_cast<int>(2.0f * gf_PI / step);
+
+    // Prepare for drawing arrow
+    float arrowStep = 0;
+    float arrowAngle = 0;
+    if (numberOfArrows > 0)
+    {
+        arrowStep = 2 * gf_PI / numberOfArrows;
+        arrowAngle = arrowStep;
+    }
+
+    Vec3 p1;
+    for (int i = 0; i < numSteps; ++i)
+    {
+        angle += step;
+        float cosAngle2 = cos(angle) * radius;
+        float sinAngle2 = sin(angle) * radius;
+
+        p1.x = pos.x + cosAngle2 * a.x + sinAngle2 * b.x;
+        p1.y = pos.y + cosAngle2 * a.y + sinAngle2 * b.y;
+        p1.z = pos.z + cosAngle2 * a.z + sinAngle2 * b.z;
+        p1 = ToWorldSpacePosition(p1);
+
+
+        if (arrowStep > 0) // If user want to draw arrow on circle
+        {
+            // if the arraw should be drawn between current angel and next angel
+            if (angle <= arrowAngle && angle + step * 2 > arrowAngle)
+            {
+                // Get local position from global position
+                Matrix34 inverseMat = m_matrixStack[m_currentMatrix].GetInverted();
+                Vec3 localP0 = inverseMat.TransformPoint(p0);
+                Vec3 localP1 = inverseMat.TransformPoint(p1);
+                DrawArrow(localP0, localP1, m_thickness);
+                arrowAngle += arrowStep;
+                if (arrowAngle > 2 * gf_PI) // if the next arrow angle is greater than 2PI. Stop adding arrow.
+                {
+                    arrowStep = 0;
+                }
+            }
+        }
+
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+
+        // Skip a step
+        angle += step;
+        cosAngle2 = cos(angle) * radius;
+        sinAngle2 = sin(angle) * radius;
+
+        p1.x = pos.x + cosAngle2 * a.x + sinAngle2 * b.x;
+        p1.y = pos.y + cosAngle2 * a.y + sinAngle2 * b.y;
+        p1.z = pos.z + cosAngle2 * a.z + sinAngle2 * b.z;
+        p1 = ToWorldSpacePosition(p1);
+
+        p0 = p1;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawWireCircle2d(const QPoint& center, float radius, float z)
+{
+    Vec3 p0, p1, pos;
+    pos.x = static_cast<float>(center.x());
+    pos.y = static_cast<float>(center.y());
+    pos.z = z;
+    p0.x = pos.x + radius * sin(0.0f);
+    p0.y = pos.y + radius * cos(0.0f);
+    p0.z = z;
+    float step = 10.0f / 180 * gf_PI;
+
+    int prevState = GetState();
+    //SetState( (prevState|e_Mode2D) & (~e_Mode3D) );
+    for (float angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        p1.x = pos.x + radius * sin(angle);
+        p1.y = pos.y + radius * cos(angle);
+        p1.z = z;
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+    SetState(prevState);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawWireSphere(const Vec3& pos, float radius)
+{
+    Vec3 p0, p1;
+    float step = 10.0f / 180 * gf_PI;
+    float angle;
+
+    // Z Axis
+    p0 = pos;
+    p1 = pos;
+    p0.x += radius * sin(0.0f);
+    p0.y += radius * cos(0.0f);
+    p0 = ToWorldSpacePosition(p0);
+    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        p1.x = pos.x + radius * sin(angle);
+        p1.y = pos.y + radius * cos(angle);
+        p1.z = pos.z;
+        p1 = ToWorldSpacePosition(p1);
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+
+    // X Axis
+    p0 = pos;
+    p1 = pos;
+    p0.y += radius * sin(0.0f);
+    p0.z += radius * cos(0.0f);
+    p0 = ToWorldSpacePosition(p0);
+    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        p1.x = pos.x;
+        p1.y = pos.y + radius * sin(angle);
+        p1.z = pos.z + radius * cos(angle);
+        p1 = ToWorldSpacePosition(p1);
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+
+    // Y Axis
+    p0 = pos;
+    p1 = pos;
+    p0.x += radius * sin(0.0f);
+    p0.z += radius * cos(0.0f);
+    p0 = ToWorldSpacePosition(p0);
+    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        p1.x = pos.x + radius * sin(angle);
+        p1.y = pos.y;
+        p1.z = pos.z + radius * cos(angle);
+        p1 = ToWorldSpacePosition(p1);
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawWireSphere(const Vec3& pos, const Vec3 radius)
+{
+    Vec3 p0, p1;
+    float step = 10.0f / 180 * gf_PI;
+    float angle;
+
+    // Z Axis
+    p0 = pos;
+    p1 = pos;
+    p0.x += radius.x * sin(0.0f);
+    p0.y += radius.y * cos(0.0f);
+    p0 = ToWorldSpacePosition(p0);
+    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        p1.x = pos.x + radius.x * sin(angle);
+        p1.y = pos.y + radius.y * cos(angle);
+        p1.z = pos.z;
+        p1 = ToWorldSpacePosition(p1);
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+
+    // X Axis
+    p0 = pos;
+    p1 = pos;
+    p0.y += radius.y * sin(0.0f);
+    p0.z += radius.z * cos(0.0f);
+    p0 = ToWorldSpacePosition(p0);
+    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        p1.x = pos.x;
+        p1.y = pos.y + radius.y * sin(angle);
+        p1.z = pos.z + radius.z * cos(angle);
+        p1 = ToWorldSpacePosition(p1);
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+
+    // Y Axis
+    p0 = pos;
+    p1 = pos;
+    p0.x += radius.x * sin(0.0f);
+    p0.z += radius.z * cos(0.0f);
+    p0 = ToWorldSpacePosition(p0);
+    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        p1.x = pos.x + radius.x * sin(angle);
+        p1.y = pos.y;
+        p1.z = pos.z + radius.z * cos(angle);
+        p1 = ToWorldSpacePosition(p1);
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        p0 = p1;
+    }
+}
+
+void DisplayContext::DrawWireDisk(const Vec3& pos, const Vec3& dir, float radius)
+{
+    // Draw circle
+    DrawArc(pos, radius, 0.0f, 360.0f, 11.25f, dir);
+
+    // Draw disk direction normal from center.
+    DrawLine(pos, pos + dir * radius * 0.2f);
+}
+
+void DisplayContext::DrawWireQuad2d(const QPoint& pmin, const QPoint& pmax, float z)
+{
+    int prevState = GetState();
+    SetState((prevState | e_Mode2D) & (~e_Mode3D));
+    float minX = static_cast<float>(pmin.x());
+    float minY = static_cast<float>(pmin.y());
+    float maxX = static_cast<float>(pmax.x());
+    float maxY = static_cast<float>(pmax.y());
+    InternalDrawLine(Vec3(minX, minY, z), m_color4b, Vec3(maxX, minY, z), m_color4b);
+    InternalDrawLine(Vec3(maxX, minY, z), m_color4b, Vec3(maxX, maxY, z), m_color4b);
+    InternalDrawLine(Vec3(maxX, maxY, z), m_color4b, Vec3(minX, maxY, z), m_color4b);
+    InternalDrawLine(Vec3(minX, maxY, z), m_color4b, Vec3(minX, minY, z), m_color4b);
+    SetState(prevState);
+}
+
+void DisplayContext::DrawLine2d(const QPoint& p1, const QPoint& p2, float z)
+{
+    int prevState = GetState();
+
+    SetState((prevState | e_Mode2D) & (~e_Mode3D));
+
+    // If we don't have correct information, we try to get it, but while we
+    // don't, we skip rendering this frame.
+    if (m_width == 0 || m_height == 0)
+    {
+        if (view)
+        {
+            // We tell the window to update itself, as it might be needed to
+            // get correct information.
+            view->Update();
+            int width, height;
+            view->GetDimensions(&width, &height);
+            m_width = static_cast<float>(width);
+            m_height = static_cast<float>(height);
+        }
+    }
+    else
+    {
+        InternalDrawLine(Vec3(p1.x() / m_width, p1.y() / m_height, z), m_color4b, Vec3(p2.x() / m_width, p2.y() / m_height, z), m_color4b);
+    }
+
+    SetState(prevState);
+}
+
+void DisplayContext::DrawLine2dGradient(const QPoint& p1, const QPoint& p2, float z, ColorB firstColor, ColorB secondColor)
+{
+    int prevState = GetState();
+
+    SetState((prevState | e_Mode2D) & (~e_Mode3D));
+    InternalDrawLine(Vec3(p1.x() / m_width, p1.y() / m_height, z), firstColor, Vec3(p2.x() / m_width, p2.y() / m_height, z), secondColor);
+    SetState(prevState);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawQuadGradient(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4, ColorB firstColor, ColorB secondColor)
+{
+    Vec3 p[4] = { ToWorldSpacePosition(p1), ToWorldSpacePosition(p2), ToWorldSpacePosition(p3), ToWorldSpacePosition(p4) };
+    pRenderAuxGeom->DrawTriangle(p[0], firstColor, p[1], firstColor, p[2], secondColor);
+    pRenderAuxGeom->DrawTriangle(p[2], secondColor, p[3], secondColor, p[0], firstColor);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QColor DisplayContext::GetSelectedColor()
+{
+    float t = aznumeric_cast<float>(QDateTime::currentMSecsSinceEpoch() / 1000);
+    float r1 = fabs(sin(t * 8.0f));
+    if (r1 > 255)
+    {
+        r1 = 255;
+    }
+    return QColor(255, 0, aznumeric_cast<int>(r1 * 255));
+    //          float r2 = cos(t*3);
+    //dc.renderer->SetMaterialColor( 1,0,r1,0.5f );
+}
+
+QColor DisplayContext::GetFreezeColor()
+{
+    return FREEZE_COLOR;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::SetSelectedColor(float fAlpha)
+{
+    SetColor(GetSelectedColor(), fAlpha);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::SetFreezeColor()
+{
+    SetColor(FREEZE_COLOR, 0.5f);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawLine(const Vec3& p1, const Vec3& p2, const ColorF& col1, const ColorF& col2)
+{
+    InternalDrawLine(ToWorldSpacePosition(p1), ColorB(col1), ToWorldSpacePosition(p2), ColorB(col2));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawLine(const Vec3& p1, const Vec3& p2, const QColor& rgb1, const QColor& rgb2)
+{
+    InternalDrawLine(ToWorldSpacePosition(p1), ColorB(rgb1.red(), rgb1.green(), rgb1.blue(), 255), ToWorldSpacePosition(p2), ColorB(rgb2.red(), rgb2.green(), rgb2.blue(), 255));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawLines(const AZStd::vector<Vec3>& points, const ColorF& color)
+{
+    pRenderAuxGeom->DrawLines(points.begin(), points.size(), color, m_thickness);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Vera, Confetti
+void DisplayContext::DrawDottedLine(const Vec3& p1, const Vec3& p2, [[maybe_unused]] const ColorF& col1, [[maybe_unused]] const ColorF& col2, const float numOfSteps)
+{
+    Vec3 direction =  Vec3(p2.x - p1.x, p2.y - p1.y, p2.z - p1.z);
+    //We only draw half of a step and leave the other half empty to make it a dotted line.
+    Vec3 halfstep = (direction / numOfSteps) * 0.5f;
+    Vec3 startPoint = p1;
+
+    for (int stepCount = 0; stepCount < numOfSteps; stepCount++)
+    {
+        InternalDrawLine(ToWorldSpacePosition(startPoint), m_color4b, ToWorldSpacePosition(startPoint + halfstep), m_color4b);
+        startPoint += 2 * halfstep; //skip a half step to make it dotted
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::PushMatrix(const Matrix34& tm)
+{
+    assert(m_currentMatrix < 31);
+    if (m_currentMatrix < 31)
+    {
+        m_currentMatrix++;
+        m_matrixStack[m_currentMatrix] = m_matrixStack[m_currentMatrix - 1] * tm;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::PopMatrix()
+{
+    assert(m_currentMatrix > 0);
+    if (m_currentMatrix > 0)
+    {
+        m_currentMatrix--;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const Matrix34& DisplayContext::GetMatrix()
+{
+    return m_matrixStack[m_currentMatrix];
+}
+
+float DisplayContext::ToWorldSpaceMaxScale(float value)
+{
+    // get the max scaled value in case the transform on the stack is scaled non-uniformly
+    const float transformedValueX = ToWorldSpaceVector(Vec3(value, 0.0f, 0.0f)).GetLength();
+    const float transformedValueY = ToWorldSpaceVector(Vec3(0.0f, value, 0.0f)).GetLength();
+    const float transformedValueZ = ToWorldSpaceVector(Vec3(0.0f, 0.0f, value)).GetLength();
+    return AZ::GetMax(transformedValueX, AZ::GetMax(transformedValueY, transformedValueZ));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawBall(const Vec3& pos, float radius, bool drawShaded)
+{
+    pRenderAuxGeom->DrawSphere(
+        ToWorldSpacePosition(pos), ToWorldSpaceMaxScale(radius), m_color4b, drawShaded);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawDisk(const Vec3& pos, const Vec3& dir, float radius)
+{
+    pRenderAuxGeom->DrawDisk(
+        ToWorldSpacePosition(pos), ToWorldSpaceVector(dir), ToWorldSpaceMaxScale(radius), m_color4b);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawArrow(const Vec3& src, const Vec3& trg, float fHeadScale, bool b2SidedArrow)
+{
+    float f2dScale = 1.0f;
+    float arrowLen = 0.4f * fHeadScale;
+    float arrowRadius = 0.1f * fHeadScale;
+    if (flags & DISPLAY_2D)
+    {
+        f2dScale = 1.2f * ToWorldSpaceVector(Vec3(1, 0, 0)).GetLength();
+    }
+    Vec3 dir = trg - src;
+    dir = ToWorldSpaceVector(dir.GetNormalized());
+    Vec3 p0 = ToWorldSpacePosition(src);
+    Vec3 p1 = ToWorldSpacePosition(trg);
+    if (!b2SidedArrow)
+    {
+        p1 = p1 - dir * arrowLen;
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        pRenderAuxGeom->DrawCone(p1, dir, arrowRadius * f2dScale, arrowLen * f2dScale, m_color4b);
+    }
+    else
+    {
+        p0 = p0 + dir * arrowLen;
+        p1 = p1 - dir * arrowLen;
+        InternalDrawLine(p0, m_color4b, p1, m_color4b);
+        pRenderAuxGeom->DrawCone(p0, -dir, arrowRadius * f2dScale, arrowLen * f2dScale, m_color4b);
+        pRenderAuxGeom->DrawCone(p1, dir, arrowRadius * f2dScale, arrowLen * f2dScale, m_color4b);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::RenderObject(int objectType, const Vec3& pos, float scale)
+{
+    Matrix34 tm;
+    tm.SetIdentity();
+
+    tm = Matrix33::CreateScale(Vec3(scale, scale, scale)) * tm;
+
+    tm.SetTranslation(pos);
+    RenderObject(objectType, tm);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::RenderObject(int, const Matrix34&)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawTerrainRect(float x1, float y1, float x2, float y2, float height)
+{
+    AzFramework::Terrain::TerrainDataRequests* terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+    if (terrain == nullptr)
+    {
+        return;
+    }
+
+    Vec3 p1, p2;
+    float x, y;
+
+    float step = MAX(y2 - y1, x2 - x1);
+    if (step < 0.1)
+    {
+        return;
+    }
+    step = step / 100.0f;
+    if (step > 10)
+    {
+        step /= 10;
+    }
+
+    for (y = y1; y < y2; y += step)
+    {
+        float ye = min(y + step, y2);
+
+        p1.x = x1;
+        p1.y = y;
+        p1.z = terrain->GetHeightFromFloats(p1.x, p1.y) + height;
+
+        p2.x = x1;
+        p2.y = ye;
+        p2.z = terrain->GetHeightFromFloats(p2.x, p2.y) + height;
+        DrawLine(p1, p2);
+
+        p1.x = x2;
+        p1.y = y;
+        p1.z = terrain->GetHeightFromFloats(p1.x, p1.y) + height;
+
+        p2.x = x2;
+        p2.y = ye;
+        p2.z = terrain->GetHeightFromFloats(p2.x, p2.y) + height;
+        DrawLine(p1, p2);
+    }
+    for (x = x1; x < x2; x += step)
+    {
+        float xe = min(x + step, x2);
+
+        p1.x = x;
+        p1.y = y1;
+        p1.z = terrain->GetHeightFromFloats(p1.x, p1.y) + height;
+
+        p2.x = xe;
+        p2.y = y1;
+        p2.z = terrain->GetHeightFromFloats(p2.x, p2.y) + height;
+        DrawLine(p1, p2);
+
+        p1.x = x;
+        p1.y = y2;
+        p1.z = terrain->GetHeightFromFloats(p1.x, p1.y) + height;
+
+        p2.x = xe;
+        p2.y = y2;
+        p2.z = terrain->GetHeightFromFloats(p2.x, p2.y) + height;
+        DrawLine(p1, p2);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawTerrainLine(Vec3 worldPos1, Vec3 worldPos2)
+{
+    worldPos1.z = worldPos2.z = 0;
+
+    int steps = static_cast<int>((worldPos2 - worldPos1).GetLength() / 4);
+    if (steps == 0)
+    {
+        steps = 1;
+    }
+
+    Vec3 step = (worldPos2 - worldPos1) / static_cast<float>(steps);
+
+    AzFramework::Terrain::TerrainDataRequests* terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+    AZ_Assert(terrain != nullptr, "If there's no terrain, %s shouldn't be called", __FUNCTION__);
+
+    Vec3 p1 = worldPos1;
+    p1.z = terrain->GetHeightFromFloats(worldPos1.x, worldPos1.y);
+    for (int i = 0; i < steps; ++i)
+    {
+        Vec3 p2 = p1 + step;
+        p2.z = 0.1f + terrain->GetHeightFromFloats(p2.x, p2.y);
+
+        DrawLine(p1, p2);
+
+        p1 = p2;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawTextLabel(const Vec3& pos, float size, const char* text, const bool bCenter, [[maybe_unused]] int srcOffsetX, [[maybe_unused]] int scrOffsetY)
+{
+    ColorF col(m_color4b.r * (1.0f / 255.0f), m_color4b.g * (1.0f / 255.0f), m_color4b.b * (1.0f / 255.0f), m_color4b.a * (1.0f / 255.0f));
+
+    float fCol[4] = { col.r, col.g, col.b, col.a };
+    if (flags & DISPLAY_2D)
+    {
+        //We need to pass Screen coordinates to Draw2dLabel Function
+        Vec3 screenPos = GetView()->GetScreenTM().TransformPoint(pos);
+        renderer->Draw2dLabel(screenPos.x, screenPos.y, size, fCol, bCenter, "%s", text);
+    }
+    else
+    {
+        renderer->DrawLabelEx(pos, size, fCol, true, true, text);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::Draw2dTextLabel(float x, float y, float size, const char* text, bool bCenter)
+{
+    float col[4] = { m_color4b.r * (1.0f / 255.0f), m_color4b.g * (1.0f / 255.0f), m_color4b.b * (1.0f / 255.0f), m_color4b.a * (1.0f / 255.0f) };
+    renderer->Draw2dLabel(x, y, size, col, bCenter, "%s", text);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::SetLineWidth(float width)
+{
+    m_thickness = width;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool DisplayContext::IsVisible(const AABB& bounds)
+{
+    if (flags & DISPLAY_2D)
+    {
+        if (box.IsIntersectBox(bounds))
+        {
+            return true;
+        }
+    }
+    else
+    {
+        return camera->IsAABBVisible_F(AABB(bounds.min, bounds.max));
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+uint32 DisplayContext::GetState() const
+{
+    return m_renderState;
+}
+
+//! Set a new render state flags.
+//! @param returns previous render state.
+uint32 DisplayContext::SetState(uint32 state)
+{
+    uint32 old = m_renderState;
+    m_renderState = state;
+    pRenderAuxGeom->SetRenderFlags(m_renderState);
+    return old;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DepthTestOff()
+{
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+    pRenderAuxGeom->SetRenderFlags((m_renderState | e_DepthTestOff) & (~e_DepthTestOn));
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DepthTestOn()
+{
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+    pRenderAuxGeom->SetRenderFlags((m_renderState | e_DepthTestOn) & (~e_DepthTestOff));
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DepthWriteOff()
+{
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+    pRenderAuxGeom->SetRenderFlags((m_renderState | e_DepthWriteOff) & (~e_DepthWriteOn));
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DepthWriteOn()
+{
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+    pRenderAuxGeom->SetRenderFlags((m_renderState | e_DepthWriteOn) & (~e_DepthWriteOff));
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::CullOff()
+{
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+    pRenderAuxGeom->SetRenderFlags((m_renderState | e_CullModeNone) & (~(e_CullModeBack | e_CullModeFront)));
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::CullOn()
+{
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+    pRenderAuxGeom->SetRenderFlags((m_renderState | e_CullModeBack) & (~(e_CullModeNone | e_CullModeFront)));
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool DisplayContext::SetDrawInFrontMode(bool bOn)
+{
+    int prevState = m_renderState;
+    SAuxGeomRenderFlags renderFlags = m_renderState;
+    renderFlags.SetDrawInFrontMode((bOn) ? e_DrawInFrontOn : e_DrawInFrontOff);
+    pRenderAuxGeom->SetRenderFlags(renderFlags);
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+    return (prevState & e_DrawInFrontOn) != 0;
+}
+
+int DisplayContext::SetFillMode(int nFillMode)
+{
+    int prevState = m_renderState;
+    SAuxGeomRenderFlags renderFlags = m_renderState;
+    renderFlags.SetFillMode((EAuxGeomPublicRenderflags_FillMode)nFillMode);
+    pRenderAuxGeom->SetRenderFlags(renderFlags);
+    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
+    return prevState;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::DrawTextureLabel(const Vec3& pos, int nWidth, int nHeight, int nTexId, int nTexIconFlags, int srcOffsetX, int srcOffsetY, bool bDistanceScaleIcons, float fDistanceScale)
+{
+    const float fLabelDepthPrecision = 0.05f;
+    Vec3 scrpos = view->WorldToView3D(pos);
+
+    float fWidth = (float)nWidth;
+    float fHeight = (float)nHeight;
+
+    if (bDistanceScaleIcons)
+    {
+        float fScreenScale = view->GetScreenScaleFactor(pos);
+
+        fWidth *= fDistanceScale / fScreenScale;
+        fHeight *= fDistanceScale / fScreenScale;
+    }
+
+    STextureLabel tl;
+    tl.x = scrpos.x + srcOffsetX;
+    tl.y = scrpos.y + srcOffsetY;
+    if (nTexIconFlags & TEXICON_ALIGN_BOTTOM)
+    {
+        tl.y -= fHeight / 2;
+    }
+    else if (nTexIconFlags & TEXICON_ALIGN_TOP)
+    {
+        tl.y += fHeight / 2;
+    }
+    tl.z = scrpos.z - (1.0f - scrpos.z) * fLabelDepthPrecision;
+    tl.w = fWidth;
+    tl.h = fHeight;
+    tl.nTexId = nTexId;
+    tl.flags = nTexIconFlags;
+    tl.color[0] = m_color4b.r * (1.0f / 255.0f);
+    tl.color[1] = m_color4b.g * (1.0f / 255.0f);
+    tl.color[2] = m_color4b.b * (1.0f / 255.0f);
+    tl.color[3] = m_color4b.a * (1.0f / 255.0f);
+
+    // Try to not overflood memory with labels.
+    if (m_textureLabels.size() < 100000)
+    {
+        m_textureLabels.push_back(tl);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DisplayContext::Flush2D()
+{
+#ifndef PHYSICS_EDITOR
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+#endif
+
+    if (m_textureLabels.empty())
+    {
+        return;
+    }
+
+    int rcw, rch;
+    view->GetDimensions(&rcw, &rch);
+
+    TransformationMatrices backupSceneMatrices;
+
+    renderer->Set2DMode(rcw, rch, backupSceneMatrices, 0.0f, 1.0f);
+
+    renderer->SetState(GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
+    //renderer->SetCullMode( R_CULL_NONE );
+
+    float uvs[4], uvt[4];
+    uvs[0] = 0;
+    uvt[0] = 1;
+    uvs[1] = 1;
+    uvt[1] = 1;
+    uvs[2] = 1;
+    uvt[2] = 0;
+    uvs[3] = 0;
+    uvt[3] = 0;
+
+    int nLabels = m_textureLabels.size();
+    for (int i = 0; i < nLabels; i++)
+    {
+        STextureLabel& t = m_textureLabels[i];
+        float w2 = t.w * 0.5f;
+        float h2 = t.h * 0.5f;
+        if (t.flags & TEXICON_ADDITIVE)
+        {
+            renderer->SetState(GS_BLSRC_ONE | GS_BLDST_ONE);
+        }
+        else if (t.flags & TEXICON_ON_TOP)
+        {
+            renderer->SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
+        }
+
+        renderer->DrawImageWithUV(t.x - w2, t.y + h2, t.z, t.w, -t.h, t.nTexId, uvs, uvt, t.color[0], t.color[1], t.color[2], t.color[3]);
+
+        if (t.flags & (TEXICON_ADDITIVE | TEXICON_ON_TOP)) // Restore state.
+        {
+            renderer->SetState(GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
+        }
+    }
+
+    renderer->Unset2DMode(backupSceneMatrices);
+
+    m_textureLabels.clear();
+}
diff --git a/Code/Editor/Objects/EntityObject.cpp b/Code/Editor/Objects/EntityObject.cpp
new file mode 100644
index 0000000000..6530947096
--- /dev/null
+++ b/Code/Editor/Objects/EntityObject.cpp
@@ -0,0 +1,2297 @@
+/*
+ * 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 : StaticObject implementation.
+
+
+#include "EditorDefs.h"
+
+#include "EntityObject.h"
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+
+// Editor
+#include "Settings.h"
+#include "Viewport.h"
+#include "LineGizmo.h"
+#include "Include/IObjectManager.h"
+#include "Objects/ObjectManager.h"
+#include "ViewManager.h"
+#include "AnimationContext.h"
+#include "HitContext.h"
+#include "Objects/SelectionGroup.h"
+
+#include <IEntityRenderState.h>
+#include <IStatObj.h>
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo Entity Link
+class CUndoEntityLink
+    : public IUndoObject
+{
+public:
+    CUndoEntityLink(CSelectionGroup* pSelection)
+    {
+        int nObjectSize = pSelection->GetCount();
+        m_Links.reserve(nObjectSize);
+        for (int i = 0; i < nObjectSize; ++i)
+        {
+            CBaseObject* pObj = pSelection->GetObject(i);
+            if (qobject_cast<CEntityObject*>(pObj))
+            {
+                SLink link;
+                link.entityID = pObj->GetId();
+                link.linkXmlNode = XmlHelpers::CreateXmlNode("undo");
+                ((CEntityObject*)pObj)->SaveLink(link.linkXmlNode);
+                m_Links.push_back(link);
+            }
+        }
+    }
+
+protected:
+    virtual void Release() { delete this; };
+    virtual int GetSize() { return sizeof(*this); }; // Return size of xml state.
+    virtual QString GetDescription() { return "Entity Link"; };
+    virtual QString GetObjectName(){ return ""; };
+
+    virtual void Undo([[maybe_unused]] bool bUndo)
+    {
+        for (int i = 0, iLinkSize(m_Links.size()); i < iLinkSize; ++i)
+        {
+            SLink& link = m_Links[i];
+            CBaseObject* pObj = GetIEditor()->GetObjectManager()->FindObject(link.entityID);
+            if (pObj == NULL)
+            {
+                continue;
+            }
+            if (!qobject_cast<CEntityObject*>(pObj))
+            {
+                continue;
+            }
+            CEntityObject* pEntity = (CEntityObject*)pObj;
+            if (link.linkXmlNode->getChildCount() == 0)
+            {
+                continue;
+            }
+            pEntity->LoadLink(link.linkXmlNode->getChild(0));
+        }
+    }
+    virtual void Redo(){}
+
+private:
+
+    struct SLink
+    {
+        GUID entityID;
+        XmlNodeRef linkXmlNode;
+    };
+
+    std::vector<SLink> m_Links;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo object for attach/detach changes
+class CUndoAttachEntity
+    : public IUndoObject
+{
+public:
+    CUndoAttachEntity(CEntityObject* pAttachedObject, bool bAttach)
+        : m_attachedEntityGUID(pAttachedObject->GetId())
+        , m_attachmentTarget(pAttachedObject->GetAttachTarget())
+        , m_attachmentType(pAttachedObject->GetAttachType())
+        , m_bAttach(bAttach)
+    {}
+
+    virtual void Undo([[maybe_unused]] bool bUndo) override
+    {
+        if (!m_bAttach)
+        {
+            SetAttachmentTypeAndTarget();
+        }
+    }
+
+    virtual void Redo() override
+    {
+        if (m_bAttach)
+        {
+            SetAttachmentTypeAndTarget();
+        }
+    }
+
+private:
+    void SetAttachmentTypeAndTarget()
+    {
+        CObjectManager* pObjectManager = static_cast<CObjectManager*>(GetIEditor()->GetObjectManager());
+        CEntityObject* pEntity = static_cast<CEntityObject*>(pObjectManager->FindObject(m_attachedEntityGUID));
+
+        if (pEntity)
+        {
+            pEntity->SetAttachType(m_attachmentType);
+            pEntity->SetAttachTarget(m_attachmentTarget.toUtf8().data());
+        }
+    }
+
+    virtual int GetSize() { return sizeof(CUndoAttachEntity); }
+    virtual QString GetDescription() { return "Attachment Changed"; }
+
+    GUID m_attachedEntityGUID;
+    CEntityObject::EAttachmentType m_attachmentType;
+    QString m_attachmentTarget;
+    bool m_bAttach;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// CBase implementation.
+//////////////////////////////////////////////////////////////////////////
+
+float CEntityObject::m_helperScale = 1;
+
+namespace
+{
+    CEntityObject* s_pPropertyPanelEntityObject = nullptr;
+
+    // Prevent OnPropertyChange to be executed when loading many properties at one time.
+    static bool s_ignorePropertiesUpdate = false;
+};
+
+//////////////////////////////////////////////////////////////////////////
+CEntityObject::CEntityObject()
+    : m_listeners(1)
+{
+    m_bLoadFailed = false;
+
+    m_visualObject = 0;
+
+    m_box.min.Set(0, 0, 0);
+    m_box.max.Set(0, 0, 0);
+
+    m_proximityRadius = 0;
+    m_innerRadius = 0;
+    m_outerRadius = 0;
+    m_boxSizeX = 1;
+    m_boxSizeY = 1;
+    m_boxSizeZ = 1;
+    m_bProjectInAllDirs = false;
+    m_bProjectorHasTexture = false;
+
+    m_bDisplayBBox = true;
+    m_bBBoxSelection = false;
+    m_bDisplaySolidBBox = false;
+    m_bDisplayAbsoluteRadius = false;
+    m_bIconOnTop = false;
+    m_bDisplayArrow = false;
+    m_entityId = 0;
+    m_bVisible = true;
+    m_bCalcPhysics = true;
+    m_bLight = false;
+    m_bAreaLight = false;
+    m_fAreaWidth = 1;
+    m_fAreaHeight = 1;
+    m_fAreaLightSize = 0.05f;
+    m_bBoxProjectedCM = false;
+    m_fBoxWidth = 1;
+    m_fBoxHeight = 1;
+    m_fBoxLength = 1;
+
+    m_bEnableReload = true;
+
+    m_lightColor = Vec3(1, 1, 1);
+
+    SetColor(QColor(255, 255, 0));
+
+    // Init Variables.
+    mv_castShadow = true;
+    mv_castShadowMinSpec = CONFIG_LOW_SPEC;
+    mv_outdoor          =   false;
+    mv_recvWind = false;
+    mv_renderNearest = false;
+    mv_noDecals = false;
+
+    mv_createdThroughPool = false;
+
+    mv_obstructionMultiplier = 1.f;
+    mv_obstructionMultiplier.SetLimits(0.f, 1.f, 0.01f);
+
+    mv_hiddenInGame = false;
+    mv_ratioLOD = 100;
+    mv_viewDistanceMultiplier = 1.0f;
+    mv_ratioLOD.SetLimits(0, 255);
+    mv_viewDistanceMultiplier.SetLimits(0.0f, IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX);
+
+    m_physicsState = 0;
+
+    m_attachmentType = eAT_Pivot;
+
+    // cache all the variable callbacks, must match order of enum defined in header
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnAreaHeightChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnAreaLightChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnAreaLightSizeChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnAreaWidthChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxHeightChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxLengthChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxProjectionChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxSizeXChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxSizeYChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxSizeZChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxWidthChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnColorChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnInnerRadiusChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnOuterRadiusChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnProjectInAllDirsChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnProjectorFOVChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnProjectorTextureChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnPropertyChange, this, AZStd::placeholders::_1));
+    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnRadiusChange, this, AZStd::placeholders::_1));
+}
+
+CEntityObject::~CEntityObject()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::InitVariables()
+{
+    mv_castShadowMinSpec.AddEnumItem("Never",          END_CONFIG_SPEC_ENUM);
+    mv_castShadowMinSpec.AddEnumItem("Low",                CONFIG_LOW_SPEC);
+    mv_castShadowMinSpec.AddEnumItem("Medium",     CONFIG_MEDIUM_SPEC);
+    mv_castShadowMinSpec.AddEnumItem("High",               CONFIG_HIGH_SPEC);
+    mv_castShadowMinSpec.AddEnumItem("VeryHigh",       CONFIG_VERYHIGH_SPEC);
+
+    mv_castShadow.SetFlags(mv_castShadow.GetFlags() | IVariable::UI_INVISIBLE);
+    mv_castShadowMinSpec->SetFlags(mv_castShadowMinSpec->GetFlags() | IVariable::UI_UNSORTED);
+
+    AddVariable(mv_outdoor, "OutdoorOnly", tr("Outdoor Only"));
+    AddVariable(mv_castShadow, "CastShadow", tr("Cast Shadow"));
+    AddVariable(mv_castShadowMinSpec, "CastShadowMinspec", tr("Cast Shadow MinSpec"));
+
+    AddVariable(mv_ratioLOD, "LodRatio");
+    AddVariable(mv_viewDistanceMultiplier, "ViewDistanceMultiplier");
+    AddVariable(mv_hiddenInGame, "HiddenInGame");
+    AddVariable(mv_recvWind, "RecvWind", tr("Receive Wind"));
+
+    // [artemk]: Add RenderNearest entity param because of animator request.
+    // This will cause that slot zero is rendered with ENTITY_SLOT_RENDER_NEAREST flag raised.
+    AddVariable(mv_renderNearest, "RenderNearest");
+    mv_renderNearest.SetDescription("Used to eliminate z-buffer artifacts when rendering from first person view");
+    AddVariable(mv_noDecals, "NoStaticDecals");
+
+    AddVariable(mv_createdThroughPool, "CreatedThroughPool", tr("Created Through Pool"));
+
+    AddVariable(mv_obstructionMultiplier, "ObstructionMultiplier", tr("Obstruction Multiplier"));
+}
+
+//////////////////////////////////////////////////////////////////////////&
+void CEntityObject::Done()
+{
+    DeleteEntity();
+
+    ReleaseEventTargets();
+    RemoveAllEntityLinks();
+
+    for (CListenerSet<IEntityObjectListener*>::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
+    {
+        notifier->OnDone();
+    }
+
+    CBaseObject::Done();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::FreeGameData()
+{
+    DeleteEntity();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CEntityObject::Init(IEditor* pEditor, CBaseObject* pPrev, const QString& file)
+{
+    CBaseObject::Init(pEditor, pPrev, file);
+
+    if (pPrev)
+    {
+        CEntityObject* pPreviousEntity = ( CEntityObject* )pPrev;
+
+        // Clone Properties.
+        if (pPreviousEntity->m_pProperties)
+        {
+            m_pProperties = CloneProperties(pPreviousEntity->m_pProperties);
+        }
+        if (pPreviousEntity->m_pProperties2)
+        {
+            m_pProperties2 = CloneProperties(pPreviousEntity->m_pProperties2);
+        }
+
+        mv_createdThroughPool = pPreviousEntity->mv_createdThroughPool;
+    }
+    else if (!file.isEmpty())
+    {
+        SetUniqueName(file);
+        m_entityClass = file;
+    }
+
+    ResetCallbacks();
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+/*static*/ CEntityObject* CEntityObject::FindFromEntityId(const AZ::EntityId& id)
+{
+    CEntityObject* retEntity = nullptr;
+    AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(retEntity, id, &AzToolsFramework::ComponentEntityEditorRequestBus::Events::GetSandboxObject);
+    return retEntity;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::SetTransformDelegate(ITransformDelegate* pTransformDelegate)
+{
+    CBaseObject::SetTransformDelegate(pTransformDelegate);
+
+    if (this == s_pPropertyPanelEntityObject)
+    {
+        return;
+    }
+
+    s_ignorePropertiesUpdate = true;
+    ForceVariableUpdate();
+    s_ignorePropertiesUpdate = false;
+    ResetCallbacks();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CEntityObject::IsSameClass(CBaseObject* obj)
+{
+    return (GetClassDesc() == obj->GetClassDesc());
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CEntityObject::ConvertFromObject(CBaseObject* object)
+{
+    CBaseObject::ConvertFromObject(object);
+
+    if (qobject_cast<CEntityObject*>(object))
+    {
+        CEntityObject* pObject = ( CEntityObject* )object;
+
+        mv_outdoor = pObject->mv_outdoor;
+        mv_castShadowMinSpec = pObject->mv_castShadowMinSpec;
+        mv_ratioLOD = pObject->mv_ratioLOD;
+        mv_viewDistanceMultiplier = pObject->mv_viewDistanceMultiplier;
+        mv_hiddenInGame = pObject->mv_hiddenInGame;
+        mv_recvWind = pObject->mv_recvWind;
+        mv_renderNearest = pObject->mv_renderNearest;
+        mv_noDecals = pObject->mv_noDecals;
+
+        mv_createdThroughPool = pObject->mv_createdThroughPool;
+
+        mv_obstructionMultiplier = pObject->mv_obstructionMultiplier;
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::GetLocalBounds(AABB& box)
+{
+    box = m_box;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CEntityObject::HitTest(HitContext& hc)
+{
+    if (!hc.b2DViewport)
+    {
+        // Test 3D viewport.
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    if ((m_bDisplayBBox && gSettings.viewports.bShowTriggerBounds) || hc.b2DViewport || (m_bDisplayBBox && m_bBBoxSelection))
+    {
+        float hitEpsilon = hc.view->GetScreenScaleFactor(GetWorldPos()) * 0.01f;
+        float hitDist;
+
+        float fScale = GetScale().x;
+        AABB boxScaled;
+        boxScaled.min = m_box.min * fScale;
+        boxScaled.max = m_box.max * fScale;
+
+        Matrix34 invertWTM = GetWorldTM();
+        invertWTM.Invert();
+
+        Vec3 xformedRaySrc = invertWTM.TransformPoint(hc.raySrc);
+        Vec3 xformedRayDir = invertWTM.TransformVector(hc.rayDir);
+        xformedRayDir.Normalize();
+
+        {
+            Vec3 intPnt;
+            if (m_bBBoxSelection)
+            {
+                // Check intersection with bbox.
+                if (Intersect::Ray_AABB(xformedRaySrc, xformedRayDir, boxScaled, intPnt))
+                {
+                    hc.dist = xformedRaySrc.GetDistance(intPnt);
+                    hc.object = this;
+                    return true;
+                }
+            }
+            else
+            {
+                // Check intersection with bbox edges.
+                if (Intersect::Ray_AABBEdge(xformedRaySrc, xformedRayDir, boxScaled, hitEpsilon, hitDist, intPnt))
+                {
+                    hc.dist = xformedRaySrc.GetDistance(intPnt);
+                    hc.object = this;
+                    return true;
+                }
+            }
+        }
+    }
+
+    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);
+    }
+
+    if (bResult)
+    {
+        hc.object = this;
+    }
+
+    return bResult;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CEntityObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    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)
+{
+    IVariable* pVar = pSubBlockVar ? pSubBlockVar->FindVariable(pVarName) : properties->FindVariable(pVarName);
+    return pVar;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::AdjustLightProperties(CVarBlockPtr& properties, const char* pSubBlock)
+{
+    IVariable* pSubBlockVar = pSubBlock ? properties->FindVariable(pSubBlock) : NULL;
+
+    if (IVariable* pRadius = FindVariableInSubBlock(properties, pSubBlockVar, "Radius"))
+    {
+        // The value of 0.01 was found through asking Crysis 2 designer
+        // team.
+        pRadius->SetLimits(0.01f, 100.0f, 0.0f, true, false);
+    }
+
+    if (IVariable* pBoxSizeX = FindVariableInSubBlock(properties, pSubBlockVar, "BoxSizeX"))
+    {
+        pBoxSizeX->SetLimits(0.01f, 100.0f, 0.0f, true, false);
+    }
+
+    if (IVariable* pBoxSizeY = FindVariableInSubBlock(properties, pSubBlockVar, "BoxSizeY"))
+    {
+        pBoxSizeY->SetLimits(0.01f, 100.0f, 0.0f, true, false);
+    }
+
+    if (IVariable* pBoxSizeZ = FindVariableInSubBlock(properties, pSubBlockVar, "BoxSizeZ"))
+    {
+        pBoxSizeZ->SetLimits(0.01f, 100.0f, 0.0f, true, false);
+    }
+
+    if (IVariable* pProjectorFov = FindVariableInSubBlock(properties, pSubBlockVar, "fProjectorFov"))
+    {
+        pProjectorFov->SetLimits(0.01f, 180.0f, 0.0f, true, true);
+    }
+
+    if (IVariable* pPlaneWidth = FindVariableInSubBlock(properties, pSubBlockVar, "fPlaneWidth"))
+    {
+        pPlaneWidth->SetLimits(0.01f, 10.0f, 0.0f, true, false);
+        pPlaneWidth->SetHumanName("SourceWidth");
+    }
+
+    if (IVariable* pPlaneHeight = FindVariableInSubBlock(properties, pSubBlockVar, "fPlaneHeight"))
+    {
+        pPlaneHeight->SetLimits(0.01f, 10.0f, 0.0f, true, false);
+        pPlaneHeight->SetHumanName("SourceDiameter");
+    }
+
+    // For backwards compatibility with old lights (avoids changing settings in Lua which will break loading compatibility).
+    // Todo: Change the Lua property names on the next big light refactor.
+    if (IVariable* pAreaLight = FindVariableInSubBlock(properties, pSubBlockVar, "bAreaLight"))
+    {
+        pAreaLight->SetHumanName("PlanarLight");
+    }
+
+    bool bCastShadowLegacy = false;  // Backward compatibility for existing shadow casting lights
+    if (IVariable* pCastShadowVarLegacy = FindVariableInSubBlock(properties, pSubBlockVar, "bCastShadow"))
+    {
+        pCastShadowVarLegacy->SetFlags(pCastShadowVarLegacy->GetFlags() | IVariable::UI_INVISIBLE);
+
+        if (pCastShadowVarLegacy->GetDisplayValue()[0] != '0')
+        {
+            bCastShadowLegacy = true;
+            pCastShadowVarLegacy->SetDisplayValue("0");
+        }
+    }
+
+    if (IVariable* pCastShadowVar = FindVariableInSubBlock(properties, pSubBlockVar, "nCastShadows"))
+    {
+        if (bCastShadowLegacy)
+        {
+            pCastShadowVar->SetDisplayValue("1");
+        }
+        pCastShadowVar->SetDataType(IVariable::DT_UIENUM);
+        pCastShadowVar->SetFlags(pCastShadowVar->GetFlags() | IVariable::UI_UNSORTED);
+    }
+
+    if (IVariable* pShadowMinRes = FindVariableInSubBlock(properties, pSubBlockVar, "nShadowMinResPercent"))
+    {
+        pShadowMinRes->SetDataType(IVariable::DT_UIENUM);
+        pShadowMinRes->SetFlags(pShadowMinRes->GetFlags() | IVariable::UI_UNSORTED);
+    }
+
+    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsLeft"))
+    {
+        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
+    }
+
+    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsRight"))
+    {
+        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
+    }
+
+    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsNear"))
+    {
+        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
+    }
+
+    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsFar"))
+    {
+        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
+    }
+
+    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsTop"))
+    {
+        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
+    }
+
+    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsBottom"))
+    {
+        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
+    }
+
+    if (IVariable* pSortPriority = FindVariableInSubBlock(properties, pSubBlockVar, "SortPriority"))
+    {
+        pSortPriority->SetLimits(0, 255, 1, true, true);
+    }
+
+    if (IVariable* pAttenFalloffMax = FindVariableInSubBlock(properties, pSubBlockVar, "fAttenuationFalloffMax"))
+    {
+        pAttenFalloffMax->SetLimits(0.0f, 1.0f, 1.0f / 255.0f, true, true);
+    }
+
+    if (IVariable* pVer = FindVariableInSubBlock(properties, pSubBlockVar, "_nVersion"))
+    {
+        int version = -1;
+        pVer->Get(version);
+        if (version == -1)
+        {
+            version++;
+            pVer->Set(version);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::SetName(const QString& name)
+{
+    if (name == GetName())
+    {
+        return;
+    }
+
+    const QString oldName = GetName();
+
+    CBaseObject::SetName(name);
+
+    CListenerSet<IEntityObjectListener*> listeners = m_listeners;
+    for (CListenerSet<IEntityObjectListener*>::Notifier notifier(listeners); notifier.IsValid(); notifier.Next())
+    {
+        notifier->OnNameChanged(name.toUtf8().data());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::SetSelected(bool bSelect)
+{
+    CBaseObject::SetSelected(bSelect);
+
+    if (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>
+struct IVariableType {};
+template <>
+struct IVariableType<bool>
+{
+    enum
+    {
+        value = IVariable::BOOL
+    };
+};
+template <>
+struct IVariableType<int>
+{
+    enum
+    {
+        value = IVariable::INT
+    };
+};
+template <>
+struct IVariableType<float>
+{
+    enum
+    {
+        value = IVariable::FLOAT
+    };
+};
+template <>
+struct IVariableType<QString>
+{
+    enum
+    {
+        value = IVariable::STRING
+    };
+};
+template <>
+struct IVariableType<Vec3>
+{
+    enum
+    {
+        value = IVariable::VECTOR
+    };
+};
+
+void CEntityObject::DrawExtraLightInfo(DisplayContext& dc)
+{
+    IObjectManager* objMan = GetIEditor()->GetObjectManager();
+
+    if (objMan)
+    {
+        if (objMan->IsLightClass(this) && GetProperties())
+        {
+            QString csText("");
+
+            if (GetEntityPropertyBool("bAmbient"))
+            {
+                csText += "A";
+            }
+
+            if (!GetEntityPropertyString("texture_Texture").isEmpty())
+            {
+                csText += "P";
+            }
+
+            int nLightType = GetEntityPropertyInteger("nCastShadows");
+            if (nLightType > 0)
+            {
+                csText += "S";
+            }
+
+            float fScale = GetIEditor()->GetViewManager()->GetView(ET_ViewportUnknown)->GetScreenScaleFactor(GetWorldPos());
+            Vec3 vDrawPos(GetWorldPos());
+            vDrawPos.z += fScale / 25;
+
+            ColorB col(255, 255, 255);
+            dc.SetColor(col);
+            dc.DrawTextLabel(vDrawPos, 1.3f, csText.toUtf8().data());
+        }
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::DrawProjectorPyramid(DisplayContext& dc, float dist)
+{
+    const int numPoints = 16; // per one arc
+    const int numArcs = 6;
+
+    if (m_projectorFOV < FLT_EPSILON)
+    {
+        return;
+    }
+
+    Vec3 points[numPoints * numArcs];
+    {
+        // generate 4 arcs on intersection of sphere with pyramid
+        const float fov = DEG2RAD(m_projectorFOV);
+
+        const Vec3 lightAxis(dist, 0.0f, 0.0f);
+        const float tanA = tan(fov * 0.5f);
+        const float fovProj = asinf(1.0f / sqrtf(2.0f + 1.0f / (tanA * tanA))) * 2.0f;
+
+        const float halfFov = 0.5f * fov;
+        const float halfFovProj = fovProj * 0.5f;
+        const float anglePerSegmentOfFovProj = 1.0f / (numPoints - 1) * fovProj;
+
+        const Quat yRot = Quat::CreateRotationY(halfFov);
+        Vec3* arcPoints = points;
+        for (int i = 0; i < numPoints; ++i)
+        {
+            float angle = i * anglePerSegmentOfFovProj - halfFovProj;
+            arcPoints[i] = lightAxis * Quat::CreateRotationZ(angle) * yRot;
+        }
+
+        const Quat zRot = Quat::CreateRotationZ(halfFov);
+        arcPoints += numPoints;
+        for (int i = 0; i < numPoints; ++i)
+        {
+            float angle = (numPoints - i - 1) * anglePerSegmentOfFovProj - halfFovProj;
+            arcPoints[i] = lightAxis * Quat::CreateRotationY(angle) * zRot;
+        }
+
+        const Quat nyRot = Quat::CreateRotationY(-halfFov);
+        arcPoints += numPoints;
+        for (int i = 0; i < numPoints; ++i)
+        {
+            float angle = (numPoints - i - 1) * anglePerSegmentOfFovProj - halfFovProj;
+            arcPoints[i] = lightAxis * Quat::CreateRotationZ(angle) * nyRot;
+        }
+
+        const Quat nzRot = Quat::CreateRotationZ(-halfFov);
+        arcPoints += numPoints;
+        for (int i = 0; i < numPoints; ++i)
+        {
+            float angle = i * anglePerSegmentOfFovProj - halfFovProj;
+            arcPoints[i] = lightAxis * Quat::CreateRotationY(angle) * nzRot;
+        }
+
+        // generate cross
+        arcPoints += numPoints;
+        const float anglePerSegmentOfFov = 1.0f / (numPoints - 1) * fov;
+        for (int i = 0; i < numPoints; ++i)
+        {
+            float angle = i * anglePerSegmentOfFov - halfFov;
+            arcPoints[i] = lightAxis * Quat::CreateRotationY(angle);
+        }
+
+        arcPoints += numPoints;
+        for (int i = 0; i < numPoints; ++i)
+        {
+            float angle = i * anglePerSegmentOfFov - halfFov;
+            arcPoints[i] = lightAxis * Quat::CreateRotationZ(angle);
+        }
+    }
+    // draw pyramid and sphere intersection
+    dc.DrawPolyLine(points, numPoints * 4, false);
+
+    // draw cross
+    dc.DrawPolyLine(points + numPoints * 4, numPoints, false);
+    dc.DrawPolyLine(points + numPoints * 5, numPoints, false);
+
+    Vec3 org(0.0f, 0.0f, 0.0f);
+    dc.DrawLine(org, points[numPoints * 0]);
+    dc.DrawLine(org, points[numPoints * 1]);
+    dc.DrawLine(org, points[numPoints * 2]);
+    dc.DrawLine(org, points[numPoints * 3]);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::DrawProjectorFrustum(DisplayContext& dc, Vec2 size, float dist)
+{
+    static const Vec3 org(0.0f, 0.0f, 0.0f);
+    const Vec3 corners[4] =
+    {
+        Vec3(dist, -size.x, -size.y),
+        Vec3(dist, size.x, -size.y),
+        Vec3(dist, -size.x, size.y),
+        Vec3(dist, size.x, size.y)
+    };
+
+    dc.DrawLine(org, corners[0]);
+    dc.DrawLine(org, corners[1]);
+    dc.DrawLine(org, corners[2]);
+    dc.DrawLine(org, corners[3]);
+
+    dc.DrawWireBox(Vec3(dist, -size.x, -size.y), Vec3(dist, size.x, size.y));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::Serialize(CObjectArchive& ar)
+{
+    CBaseObject::Serialize(ar);
+    XmlNodeRef xmlNode = ar.node;
+    if (ar.bLoading)
+    {
+        // Load
+        QString entityClass = m_entityClass;
+        m_bLoadFailed = false;
+
+        xmlNode->getAttr("EntityClass", entityClass);
+        m_physicsState = xmlNode->findChild("PhysicsState");
+
+        Vec3 angles;
+        // Backward compatibility, with FarCry levels.
+        if (xmlNode->getAttr("Angles", angles))
+        {
+            angles = DEG2RAD(angles);
+            angles.z += gf_PI / 2;
+            Quat quat;
+            quat.SetRotationXYZ(Ang3(angles));
+            SetRotation(quat);
+        }
+
+        // Load Event Targets.
+        ReleaseEventTargets();
+        XmlNodeRef eventTargets = xmlNode->findChild("EventTargets");
+        if (eventTargets)
+        {
+            for (int i = 0; i < eventTargets->getChildCount(); i++)
+            {
+                XmlNodeRef eventTarget = eventTargets->getChild(i);
+                CEntityEventTarget et;
+                et.target = 0;
+                GUID targetId = GUID_NULL;
+                eventTarget->getAttr("TargetId", targetId);
+                eventTarget->getAttr("Event", et.event);
+                eventTarget->getAttr("SourceEvent", et.sourceEvent);
+                m_eventTargets.push_back(et);
+                if (targetId != GUID_NULL)
+                {
+                    using namespace AZStd::placeholders;
+                    ar.SetResolveCallback(this, targetId, AZStd::bind(&CEntityObject::ResolveEventTarget, this, _1, _2), i);
+                }
+            }
+        }
+
+        XmlNodeRef propsNode = xmlNode->findChild("Properties");
+        XmlNodeRef props2Node = xmlNode->findChild("Properties2");
+
+        QString attachmentType;
+        xmlNode->getAttr("AttachmentType", attachmentType);
+
+        if (attachmentType == "GeomCacheNode")
+        {
+            m_attachmentType = eAT_GeomCacheNode;
+        }
+        else if (attachmentType == "CharacterBone")
+        {
+            m_attachmentType = eAT_CharacterBone;
+        }
+        else
+        {
+            m_attachmentType = eAT_Pivot;
+        }
+
+        xmlNode->getAttr("AttachmentTarget", m_attachmentTarget);
+
+        if (ar.bUndo)
+        {
+            RemoveAllEntityLinks();
+            PostLoad(ar);
+        }
+
+        if ((mv_castShadowMinSpec == CONFIG_LOW_SPEC) && !mv_castShadow) // backwards compatibility check
+        {
+            mv_castShadowMinSpec = END_CONFIG_SPEC_ENUM;
+            mv_castShadow = true;
+        }
+    }
+    else
+    {
+        if (m_attachmentType != eAT_Pivot)
+        {
+            if (m_attachmentType == eAT_GeomCacheNode)
+            {
+                xmlNode->setAttr("AttachmentType", "GeomCacheNode");
+            }
+            else if (m_attachmentType == eAT_CharacterBone)
+            {
+                xmlNode->setAttr("AttachmentType", "CharacterBone");
+            }
+
+            xmlNode->setAttr("AttachmentTarget", m_attachmentTarget.toUtf8().data());
+        }
+
+        // Saving.
+        if (!m_entityClass.isEmpty())
+        {
+            xmlNode->setAttr("EntityClass", m_entityClass.toUtf8().data());
+        }
+
+        if (m_physicsState)
+        {
+            xmlNode->addChild(m_physicsState);
+        }
+
+        //! Save properties.
+        if (m_pProperties)
+        {
+            XmlNodeRef propsNode = xmlNode->newChild("Properties");
+            m_pProperties->Serialize(propsNode, ar.bLoading);
+        }
+
+        //! Save properties.
+        if (m_pProperties2)
+        {
+            XmlNodeRef propsNode = xmlNode->newChild("Properties2");
+            m_pProperties2->Serialize(propsNode, ar.bLoading);
+        }
+
+        // Save Event Targets.
+        if (!m_eventTargets.empty())
+        {
+            XmlNodeRef eventTargets = xmlNode->newChild("EventTargets");
+            for (int i = 0; i < m_eventTargets.size(); i++)
+            {
+                CEntityEventTarget& et = m_eventTargets[i];
+                GUID targetId = GUID_NULL;
+                if (et.target != 0)
+                {
+                    targetId = et.target->GetId();
+                }
+
+                XmlNodeRef eventTarget = eventTargets->newChild("EventTarget");
+                eventTarget->setAttr("TargetId", targetId);
+                eventTarget->setAttr("Event", et.event.toUtf8().data());
+                eventTarget->setAttr("SourceEvent", et.sourceEvent.toUtf8().data());
+            }
+        }
+
+        // Save Entity Links.
+        SaveLink(xmlNode);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::PostLoad(CObjectArchive& ar)
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Load Links.
+    XmlNodeRef linksNode = ar.node->findChild("EntityLinks");
+    LoadLink(linksNode, &ar);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CEntityObject::Export([[maybe_unused]] const QString& levelPath, XmlNodeRef& xmlExportNode)
+{
+    if (m_bLoadFailed)
+    {
+        return 0;
+    }
+
+    // Do not export entity with bad id.
+    if (!m_entityId)
+    {
+        return XmlHelpers::CreateXmlNode("Temp");
+    }
+
+    // Export entities to entities.ini
+    XmlNodeRef objNode = xmlExportNode->newChild("Entity");
+
+    objNode->setAttr("Name", GetName().toUtf8().data());
+
+    Vec3 pos = GetPos(), scale = GetScale();
+    Quat rotate = GetRotation();
+
+    if (GetParent())
+    {
+        if (qobject_cast<CEntityObject*>(GetParent()))
+        {
+            // Store parent entity id.
+            CEntityObject* parentEntity = ( CEntityObject* )GetParent();
+            if (parentEntity)
+            {
+                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)
+                    {
+                        objNode->setAttr("AttachmentType", "CharacterBone");
+                    }
+
+                    objNode->setAttr("AttachmentTarget", m_attachmentTarget.toUtf8().data());
+                }
+            }
+        }
+        else
+        {
+            // Export world coordinates.
+            AffineParts ap;
+            ap.SpectralDecompose(GetWorldTM());
+            pos = ap.pos;
+            rotate = ap.rot;
+            scale = ap.scale;
+        }
+    }
+
+    if (!IsEquivalent(pos, Vec3(0, 0, 0), 0))
+    {
+        objNode->setAttr("Pos", pos);
+    }
+
+    if (!rotate.IsIdentity())
+    {
+        objNode->setAttr("Rotate", rotate);
+    }
+
+    if (!IsEquivalent(scale, Vec3(1, 1, 1), 0))
+    {
+        objNode->setAttr("Scale", scale);
+    }
+
+    objNode->setTag("Entity");
+    objNode->setAttr("EntityClass", m_entityClass.toUtf8().data());
+    objNode->setAttr("EntityId", m_entityId);
+
+    if (mv_ratioLOD != 100)
+    {
+        objNode->setAttr("LodRatio", ( int )mv_ratioLOD);
+    }
+
+    if (fabs(mv_viewDistanceMultiplier - 1.f) > FLT_EPSILON)
+    {
+        objNode->setAttr("ViewDistanceMultiplier", mv_viewDistanceMultiplier);
+    }
+
+    objNode->setAttr("CastShadowMinSpec", mv_castShadowMinSpec);
+
+    if (mv_recvWind)
+    {
+        objNode->setAttr("RecvWind", true);
+    }
+
+    if (mv_noDecals)
+    {
+        objNode->setAttr("NoDecals", true);
+    }
+
+    if (mv_outdoor)
+    {
+        objNode->setAttr("OutdoorOnly", true);
+    }
+
+    if (GetMinSpec() != 0)
+    {
+        objNode->setAttr("MinSpec", ( uint32 )GetMinSpec());
+    }
+
+    uint32 nMtlLayersMask = GetMaterialLayersMask();
+    if (nMtlLayersMask != 0)
+    {
+        objNode->setAttr("MatLayersMask", nMtlLayersMask);
+    }
+
+    if (mv_hiddenInGame)
+    {
+        objNode->setAttr("HiddenInGame", true);
+    }
+
+    if (mv_createdThroughPool)
+    {
+        objNode->setAttr("CreatedThroughPool", true);
+    }
+
+    if (mv_obstructionMultiplier != 1.f)
+    {
+        objNode->setAttr("ObstructionMultiplier", (float)mv_obstructionMultiplier);
+    }
+
+    if (m_physicsState)
+    {
+        objNode->addChild(m_physicsState);
+    }
+
+    // Export Event Targets.
+    if (!m_eventTargets.empty())
+    {
+        XmlNodeRef eventTargets = objNode->newChild("EventTargets");
+        for (int i = 0; i < m_eventTargets.size(); i++)
+        {
+            CEntityEventTarget& et = m_eventTargets[i];
+
+            int entityId = 0;
+            if (et.target)
+            {
+                if (qobject_cast<CEntityObject*>(et.target))
+                {
+                    entityId = (( CEntityObject* )et.target)->GetEntityId();
+                }
+            }
+
+            XmlNodeRef eventTarget = eventTargets->newChild("EventTarget");
+            eventTarget->setAttr("Target", entityId);
+            eventTarget->setAttr("Event", et.event.toUtf8().data());
+            eventTarget->setAttr("SourceEvent", et.sourceEvent.toUtf8().data());
+        }
+    }
+
+    // Save Entity Links.
+    if (!m_links.empty())
+    {
+        XmlNodeRef linksNode = objNode->newChild("EntityLinks");
+        for (int i = 0, num = m_links.size(); i < num; i++)
+        {
+            if (m_links[i].target)
+            {
+                XmlNodeRef linkNode = linksNode->newChild("Link");
+                linkNode->setAttr("TargetId", m_links[i].target->GetEntityId());
+                linkNode->setAttr("Name", m_links[i].name.toUtf8().data());
+            }
+        }
+    }
+
+    //! Export properties.
+    if (m_pProperties)
+    {
+        XmlNodeRef propsNode = objNode->newChild("Properties");
+        m_pProperties->Serialize(propsNode, false);
+    }
+    //! Export properties.
+    if (m_pProperties2)
+    {
+        XmlNodeRef propsNode = objNode->newChild("Properties2");
+        m_pProperties2->Serialize(propsNode, false);
+    }
+
+    return objNode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnEvent(ObjectEvent event)
+{
+    CBaseObject::OnEvent(event);
+
+    switch (event)
+    {
+    case EVENT_RELOAD_ENTITY:
+        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(this);
+        break;
+
+    case EVENT_RELOAD_GEOM:
+        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(this);
+        break;
+
+    case EVENT_FREE_GAME_DATA:
+        FreeGameData();
+        break;
+
+    case EVENT_CONFIG_SPEC_CHANGE:
+    {
+        IObjectManager* objMan = GetIEditor()->GetObjectManager();
+        if (objMan && objMan->IsLightClass(this))
+        {
+            OnPropertyChange(NULL);
+        }
+        break;
+    }
+    default:
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::UpdateVisibility(bool bVisible)
+{
+    CBaseObject::UpdateVisibility(bVisible);
+
+    bool bVisibleWithSpec = bVisible && !IsHiddenBySpec();
+    if (bVisibleWithSpec != m_bVisible)
+    {
+        m_bVisible = bVisibleWithSpec;
+    }
+
+    size_t const numChildren = GetChildCount();
+    for (size_t i = 0; i < numChildren; ++i)
+    {
+        CBaseObject* const pChildObject = GetChild(i);
+        pChildObject->SetHidden(!m_bVisible);
+
+        if (qobject_cast<CEntityObject*>(pChildObject))
+        {
+            pChildObject->UpdateVisibility(m_bVisible);
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+IVariable* CEntityObject::GetLightVariable(const char* name0) const
+{
+    if (m_pProperties2)
+    {
+        IVariable* pLightProperties = m_pProperties2->FindVariable("LightProperties_Base");
+
+        if (pLightProperties)
+        {
+            for (int i = 0; i < pLightProperties->GetNumVariables(); ++i)
+            {
+                IVariable* pChild = pLightProperties->GetVariable(i);
+
+                if (pChild == NULL)
+                {
+                    continue;
+                }
+
+                QString name(pChild->GetName());
+                if (name == name0)
+                {
+                    return pChild;
+                }
+            }
+        }
+    }
+
+    return m_pProperties ? m_pProperties->FindVariable(name0) : nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CEntityObject::GetLightAnimation() const
+{
+    IVariable* pStyleGroup = GetLightVariable("Style");
+    if (pStyleGroup)
+    {
+        for (int i = 0; i < pStyleGroup->GetNumVariables(); ++i)
+        {
+            IVariable* pChild = pStyleGroup->GetVariable(i);
+
+            if (pChild == NULL)
+            {
+                continue;
+            }
+
+            QString name(pChild->GetName());
+            if (name == "lightanimation_LightAnimation")
+            {
+                QString lightAnimationName;
+                pChild->Get(lightAnimationName);
+                return lightAnimationName;
+            }
+        }
+    }
+
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx)
+{
+    CBaseObject::PostClone(pFromObject, ctx);
+
+    CEntityObject* pFromEntity = ( CEntityObject* )pFromObject;
+    // Clone event targets.
+    if (!pFromEntity->m_eventTargets.empty())
+    {
+        int numTargets = pFromEntity->m_eventTargets.size();
+        for (int 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 = 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)
+{
+    // Find target id.
+    assert(index >= 0 && index < m_eventTargets.size());
+    if (object)
+    {
+        object->AddEventListener(this);
+    }
+    m_eventTargets[index].target = object;
+
+    // Make line gizmo.
+    if (!m_eventTargets[index].pLineGizmo && object)
+    {
+        CLineGizmo* pLineGizmo = new CLineGizmo;
+        pLineGizmo->SetObjects(this, object);
+        pLineGizmo->SetColor(Vec3(0.8f, 0.4f, 0.4f), Vec3(0.8f, 0.4f, 0.4f));
+        pLineGizmo->SetName(m_eventTargets[index].event.toUtf8().data());
+        AddGizmo(pLineGizmo);
+        m_eventTargets[index].pLineGizmo = pLineGizmo;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::RemoveAllEntityLinks()
+{
+    while (!m_links.empty())
+    {
+        RemoveEntityLink(m_links.size() - 1);
+    }
+    m_links.clear();
+    SetModified(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::ReleaseEventTargets()
+{
+    while (!m_eventTargets.empty())
+    {
+        RemoveEventTarget(m_eventTargets.size() - 1, false);
+    }
+    m_eventTargets.clear();
+    SetModified(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::LoadLink(XmlNodeRef xmlNode, CObjectArchive* pArchive)
+{
+    RemoveAllEntityLinks();
+
+    if (!xmlNode)
+    {
+        return;
+    }
+
+    QString name;
+    GUID targetId;
+
+    for (int i = 0; i < xmlNode->getChildCount(); i++)
+    {
+        XmlNodeRef linkNode = xmlNode->getChild(i);
+        linkNode->getAttr("Name", name);
+
+        if (linkNode->getAttr("TargetId", targetId))
+        {
+            int version = 0;
+            linkNode->getAttr("Version", version);
+
+            GUID newTargetId = pArchive ? pArchive->ResolveID(targetId) : targetId;
+
+            // Backwards compatibility with old bone attachment system
+            const char kOldBoneLinkPrefix = '@';
+            if (version == 0 && !name.isEmpty() && name[0] == kOldBoneLinkPrefix)
+            {
+                CBaseObject* pObject = FindObject(newTargetId);
+                if (qobject_cast<CEntityObject*>(pObject))
+                {
+                    CEntityObject* pTargetEntity = static_cast<CEntityObject*>(pObject);
+
+                    Quat relRot(IDENTITY);
+                    linkNode->getAttr("RelRot", relRot);
+                    Vec3 relPos(IDENTITY);
+                    linkNode->getAttr("RelPos", relPos);
+
+                    SetAttachType(eAT_CharacterBone);
+                    SetAttachTarget(name.mid(1).toUtf8().data());
+                    pTargetEntity->AttachChild(this);
+
+                    SetPos(relPos);
+                    SetRotation(relRot);
+                }
+            }
+            else
+            {
+                AddEntityLink(name, newTargetId);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::SaveLink(XmlNodeRef xmlNode)
+{
+    if (m_links.empty())
+    {
+        return;
+    }
+
+    XmlNodeRef linksNode = xmlNode->newChild("EntityLinks");
+    for (int i = 0, num = m_links.size(); i < num; i++)
+    {
+        XmlNodeRef linkNode = linksNode->newChild("Link");
+        linkNode->setAttr("TargetId", m_links[i].targetId);
+        linkNode->setAttr("Name", m_links[i].name.toUtf8().data());
+        linkNode->setAttr("Version", 1);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnObjectEvent(CBaseObject* target, int event)
+{
+    // When event target is deleted.
+    if (event == CBaseObject::ON_DELETE)
+    {
+        // Find this target in events list and remove.
+        int numTargets = m_eventTargets.size();
+        for (int i = 0; i < numTargets; i++)
+        {
+            if (m_eventTargets[i].target == target)
+            {
+                RemoveEventTarget(i);
+                numTargets = m_eventTargets.size();
+                i--;
+            }
+        }
+    }
+    else if (event == CBaseObject::ON_PREDELETE)
+    {
+        int numTargets = m_links.size();
+        for (int i = 0; i < numTargets; i++)
+        {
+            if (m_links[i].target == target)
+            {
+                RemoveEntityLink(i);
+                numTargets = m_eventTargets.size();
+                i--;
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CEntityObject::AddEventTarget(CBaseObject* target, const QString& event, const QString& sourceEvent, [[maybe_unused]] bool bUpdateScript)
+{
+    StoreUndo("Add EventTarget");
+    CEntityEventTarget et;
+    et.target = target;
+    et.event = event;
+    et.sourceEvent = sourceEvent;
+
+    // Assign event target.
+    if (et.target)
+    {
+        et.target->AddEventListener(this);
+    }
+
+    if (target)
+    {
+        // Make line gizmo.
+        CLineGizmo* pLineGizmo = new CLineGizmo;
+        pLineGizmo->SetObjects(this, target);
+        pLineGizmo->SetColor(Vec3(0.8f, 0.4f, 0.4f), Vec3(0.8f, 0.4f, 0.4f));
+        pLineGizmo->SetName(event.toUtf8().data());
+        AddGizmo(pLineGizmo);
+        et.pLineGizmo = pLineGizmo;
+    }
+
+    m_eventTargets.push_back(et);
+
+    SetModified(false);
+    return m_eventTargets.size() - 1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::RemoveEventTarget(int index, [[maybe_unused]] bool bUpdateScript)
+{
+    if (index >= 0 && index < m_eventTargets.size())
+    {
+        StoreUndo("Remove EventTarget");
+
+        if (m_eventTargets[index].pLineGizmo)
+        {
+            RemoveGizmo(m_eventTargets[index].pLineGizmo);
+        }
+
+        if (m_eventTargets[index].target)
+        {
+            m_eventTargets[index].target->RemoveEventListener(this);
+        }
+        m_eventTargets.erase(m_eventTargets.begin() + index);
+
+        SetModified(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CEntityObject::AddEntityLink(const QString& name, GUID targetEntityId)
+{
+    CEntityObject* target = 0;
+    if (targetEntityId != GUID_NULL)
+    {
+        CBaseObject* pObject = FindObject(targetEntityId);
+        if (qobject_cast<CEntityObject*>(pObject))
+        {
+            target = ( CEntityObject* )pObject;
+
+            // Legacy entities and AZ entities shouldn't be linked.
+            if (target->GetType() == OBJTYPE_AZENTITY || GetType() == OBJTYPE_AZENTITY)
+            {
+                return -1;
+            }
+        }
+    }
+
+    StoreUndo("Add EntityLink");
+
+    CLineGizmo* pLineGizmo = 0;
+
+    // Assign event target.
+    if (target)
+    {
+        target->AddEventListener(this);
+
+        // Make line gizmo.
+        pLineGizmo = new CLineGizmo;
+        pLineGizmo->SetObjects(this, target);
+        pLineGizmo->SetColor(Vec3(0.4f, 1.0f, 0.0f), Vec3(0.0f, 1.0f, 0.0f));
+        pLineGizmo->SetName(name.toUtf8().data());
+        AddGizmo(pLineGizmo);
+    }
+
+    CEntityLink lnk;
+    lnk.targetId = targetEntityId;
+    lnk.target = target;
+    lnk.name = name;
+    lnk.pLineGizmo = pLineGizmo;
+    m_links.push_back(lnk);
+
+    SetModified(false);
+
+    return m_links.size() - 1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CEntityObject::EntityLinkExists(const QString& name, GUID targetEntityId)
+{
+    for (int i = 0, num = m_links.size(); i < num; ++i)
+    {
+        if (m_links[i].targetId == targetEntityId && name.compare(m_links[i].name, Qt::CaseInsensitive) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::RemoveEntityLink(int index)
+{
+    if (index >= 0 && index < m_links.size())
+    {
+        CEntityLink& link = m_links[index];
+        StoreUndo("Remove EntityLink");
+
+        if (link.pLineGizmo)
+        {
+            RemoveGizmo(link.pLineGizmo);
+        }
+
+        if (link.target)
+        {
+            link.target->RemoveEventListener(this);
+            link.target->EntityUnlinked(link.name, GetId());
+        }
+        m_links.erase(m_links.begin() + index);
+
+        SetModified(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::RenameEntityLink(int index, const QString& newName)
+{
+    if (index >= 0 && index < m_links.size())
+    {
+        StoreUndo("Rename EntityLink");
+
+        if (m_links[index].pLineGizmo)
+        {
+            m_links[index].pLineGizmo->SetName(newName.toUtf8().data());
+        }
+
+        m_links[index].name = newName;
+
+        SetModified(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnRadiusChange(IVariable* var)
+{
+    var->Get(m_proximityRadius);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnInnerRadiusChange(IVariable* var)
+{
+    var->Get(m_innerRadius);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnOuterRadiusChange(IVariable* var)
+{
+    var->Get(m_outerRadius);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnBoxSizeXChange(IVariable* var)
+{
+    var->Get(m_boxSizeX);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnBoxSizeYChange(IVariable* var)
+{
+    var->Get(m_boxSizeY);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnBoxSizeZChange(IVariable* var)
+{
+    var->Get(m_boxSizeZ);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnProjectorFOVChange(IVariable* var)
+{
+    var->Get(m_projectorFOV);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnProjectInAllDirsChange(IVariable* var)
+{
+    int value;
+    var->Get(value);
+    m_bProjectInAllDirs = value;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnProjectorTextureChange(IVariable* var)
+{
+    QString texture;
+    var->Get(texture);
+    m_bProjectorHasTexture = !texture.isEmpty();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnAreaLightChange(IVariable* var)
+{
+    int value;
+    var->Get(value);
+    m_bAreaLight = value;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnAreaWidthChange(IVariable* var)
+{
+    var->Get(m_fAreaWidth);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnAreaHeightChange(IVariable* var)
+{
+    var->Get(m_fAreaHeight);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnAreaLightSizeChange(IVariable* var)
+{
+    var->Get(m_fAreaLightSize);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnColorChange(IVariable* var)
+{
+    var->Get(m_lightColor);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnBoxProjectionChange(IVariable* var)
+{
+    int value;
+    var->Get(value);
+    m_bBoxProjectedCM = value;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnBoxWidthChange(IVariable* var)
+{
+    var->Get(m_fBoxWidth);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnBoxHeightChange(IVariable* var)
+{
+    var->Get(m_fBoxHeight);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnBoxLengthChange(IVariable* var)
+{
+    var->Get(m_fBoxLength);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CVarBlock* CEntityObject::CloneProperties(CVarBlock* srcProperties)
+{
+    assert(srcProperties);
+    return srcProperties->Clone(true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnLoadFailed()
+{
+    m_bLoadFailed = true;
+
+    CErrorRecord err;
+    err.error = tr("Entity %1 Failed to Spawn (Script: %2)").arg(GetName(), m_entityClass);
+    err.pObject = this;
+    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)
+{
+    CBaseObject::Validate(report);
+
+    if (!m_entityClass.isEmpty())
+    {
+        CErrorRecord err;
+        err.error = tr("Entity %1 Failed to Spawn (Script: %2)").arg(GetName(), m_entityClass);
+        err.pObject = this;
+        report->ReportError(err);
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::GatherUsedResources(CUsedResources& resources)
+{
+    CBaseObject::GatherUsedResources(resources);
+    if (m_pProperties)
+    {
+        m_pProperties->GatherUsedResources(resources);
+    }
+    if (m_pProperties2)
+    {
+        m_pProperties2->GatherUsedResources(resources);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CEntityObject::IsSimilarObject(CBaseObject* pObject)
+{
+    if (pObject->GetClassDesc() == GetClassDesc() && pObject->metaObject() == metaObject())
+    {
+        CEntityObject* pEntity = ( CEntityObject* )pObject;
+        if (m_entityClass == pEntity->m_entityClass &&
+            m_proximityRadius == pEntity->m_proximityRadius &&
+            m_innerRadius == pEntity->m_innerRadius &&
+            m_outerRadius == pEntity->m_outerRadius)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::OnContextMenu(QMenu* pMenu)
+{
+    if (!pMenu->isEmpty())
+    {
+        pMenu->addSeparator();
+    }
+
+    // Events
+
+    CBaseObject::OnContextMenu(pMenu);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::PreInitLightProperty()
+{
+    if (!IsLight() || !m_pProperties)
+    {
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::UpdateLightProperty()
+{
+    if (!IsLight() || !m_pProperties)
+    {
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::ForceVariableUpdate()
+{
+    if (m_pProperties)
+    {
+        m_pProperties->OnSetValues();
+    }
+    if (m_pProperties2)
+    {
+        m_pProperties2->OnSetValues();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::ResetCallbacks()
+{
+    ClearCallbacks();
+
+    CVarBlock* pProperties = m_pProperties;
+    CVarBlock* pProperties2 = m_pProperties2;
+
+    if (pProperties)
+    {
+        m_callbacks.reserve(6);
+
+        //@FIXME Hack to display radii of properties.
+        // wires properties from param block, to this entity internal variables.
+        IVariable* var = 0;
+        var = pProperties->FindVariable("Radius", false);
+        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+        {
+            var->Get(m_proximityRadius);
+            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnRadiusChange]);
+        }
+        else
+        {
+            var = pProperties->FindVariable("radius", false);
+            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+            {
+                var->Get(m_proximityRadius);
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnRadiusChange]);
+            }
+        }
+
+        var = pProperties->FindVariable("InnerRadius", false);
+        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+        {
+            var->Get(m_innerRadius);
+            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnInnerRadiusChange]);
+        }
+        var = pProperties->FindVariable("OuterRadius", false);
+        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+        {
+            var->Get(m_outerRadius);
+            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnOuterRadiusChange]);
+        }
+
+        var = pProperties->FindVariable("BoxSizeX", false);
+        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+        {
+            var->Get(m_boxSizeX);
+            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxSizeXChange]);
+        }
+        var = pProperties->FindVariable("BoxSizeY", false);
+        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+        {
+            var->Get(m_boxSizeY);
+            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxSizeYChange]);
+        }
+        var = pProperties->FindVariable("BoxSizeZ", false);
+        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+        {
+            var->Get(m_boxSizeZ);
+            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxSizeZChange]);
+        }
+
+        var = pProperties->FindVariable("fAttenuationBulbSize");
+        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+        {
+            var->Get(m_fAreaLightSize);
+            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnAreaLightSizeChange]);
+        }
+
+        IVariable* pProjector = pProperties->FindVariable("Projector");
+        if (pProjector)
+        {
+            var = pProjector->FindVariable("fProjectorFov");
+            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+            {
+                var->Get(m_projectorFOV);
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnProjectorFOVChange]);
+            }
+            var = pProjector->FindVariable("bProjectInAllDirs");
+            if (var && var->GetType() == IVariable::BOOL)
+            {
+                int value;
+                var->Get(value);
+                m_bProjectInAllDirs = value;
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnProjectInAllDirsChange]);
+            }
+            var = pProjector->FindVariable("texture_Texture");
+            if (var && var->GetType() == IVariable::STRING)
+            {
+                QString projectorTexture;
+                var->Get(projectorTexture);
+                m_bProjectorHasTexture = !projectorTexture.isEmpty();
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnProjectorTextureChange]);
+            }
+        }
+
+        IVariable* pColorGroup = pProperties->FindVariable("Color", false);
+        if (pColorGroup)
+        {
+            const int nChildCount = pColorGroup->GetNumVariables();
+            for (int i = 0; i < nChildCount; ++i)
+            {
+                IVariable* pChild = pColorGroup->GetVariable(i);
+                if (!pChild)
+                {
+                    continue;
+                }
+
+                QString name(pChild->GetName());
+                if (name == "clrDiffuse")
+                {
+                    pChild->Get(m_lightColor);
+                    SetVariableCallback(pChild, &m_onSetCallbacksCache[VariableCallbackIndex::OnColorChange]);
+                    break;
+                }
+            }
+        }
+
+        IVariable* pType = pProperties->FindVariable("Shape");
+        if (pType)
+        {
+            var = pType->FindVariable("bAreaLight");
+            if (var && var->GetType() == IVariable::BOOL)
+            {
+                int value;
+                var->Get(value);
+                m_bAreaLight = value;
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnAreaLightChange]);
+            }
+            var = pType->FindVariable("fPlaneWidth");
+            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+            {
+                var->Get(m_fAreaWidth);
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnAreaWidthChange]);
+            }
+            var = pType->FindVariable("fPlaneHeight");
+            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+            {
+                var->Get(m_fAreaHeight);
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnAreaHeightChange]);
+            }
+        }
+
+        IVariable* pProjection = pProperties->FindVariable("Projection");
+        if (pProjection)
+        {
+            var = pProjection->FindVariable("bBoxProject");
+            if (var && var->GetType() == IVariable::BOOL)
+            {
+                int value;
+                var->Get(value);
+                m_bBoxProjectedCM = value;
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxProjectionChange]);
+            }
+            var = pProjection->FindVariable("fBoxWidth");
+            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+            {
+                var->Get(m_fBoxWidth);
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxWidthChange]);
+            }
+            var = pProjection->FindVariable("fBoxHeight");
+            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+            {
+                var->Get(m_fBoxHeight);
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxHeightChange]);
+            }
+            var = pProjection->FindVariable("fBoxLength");
+            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
+            {
+                var->Get(m_fBoxLength);
+                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxLengthChange]);
+            }
+        }
+
+        // Each property must have callback to our OnPropertyChange.
+        pProperties->AddOnSetCallback(&m_onSetCallbacksCache[VariableCallbackIndex::OnPropertyChange]);
+    }
+
+    if (pProperties2)
+    {
+        pProperties2->AddOnSetCallback(&m_onSetCallbacksCache[VariableCallbackIndex::OnPropertyChange]);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::SetVariableCallback(IVariable* pVar, IVariable::OnSetCallback* func)
+{
+    pVar->AddOnSetCallback(func);
+    m_callbacks.push_back(std::make_pair(pVar, func));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CEntityObject::ClearCallbacks()
+{
+    if (m_pProperties)
+    {
+        m_pProperties->RemoveOnSetCallback(&m_onSetCallbacksCache[VariableCallbackIndex::OnPropertyChange]);
+    }
+
+    if (m_pProperties2)
+    {
+        m_pProperties2->RemoveOnSetCallback(&m_onSetCallbacksCache[VariableCallbackIndex::OnPropertyChange]);
+    }
+
+    for (auto iter = m_callbacks.begin(); iter != m_callbacks.end(); ++iter)
+    {
+        iter->first->RemoveOnSetCallback(iter->second);
+    }
+
+    m_callbacks.clear();
+}
+
+void CEntityObject::StoreUndoEntityLink(CSelectionGroup* pGroup)
+{
+    if (!pGroup)
+    {
+        return;
+    }
+
+    if (CUndo::IsRecording())
+    {
+        CUndo::Record(new CUndoEntityLink(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
+{
+    CVarBlock* pProperties = GetProperties2();
+    IVariable* pVariable = NULL;
+    if (pProperties)
+    {
+        pVariable = pProperties->FindVariable(pName);
+    }
+
+    if (!pVariable)
+    {
+        pProperties = GetProperties();
+        if (pProperties)
+        {
+            pVariable = pProperties->FindVariable(pName);
+        }
+
+        if (!pVariable)
+        {
+            return defaultvalue;
+        }
+    }
+
+    if (pVariable->GetType() != IVariableType<T>::value)
+    {
+        return defaultvalue;
+    }
+
+    T value;
+    pVariable->Get(value);
+    return value;
+}
+
+template <typename T>
+void CEntityObject::SetEntityProperty(const char* pName, T value)
+{
+    CVarBlock* pProperties = GetProperties2();
+    IVariable* pVariable = NULL;
+    if (pProperties)
+    {
+        pVariable = pProperties->FindVariable(pName);
+    }
+
+    if (!pVariable)
+    {
+        pProperties = GetProperties();
+        if (pProperties)
+        {
+            pVariable = pProperties->FindVariable(pName);
+        }
+
+        if (!pVariable)
+        {
+            throw std::runtime_error((QString("\"") + pName + "\" is an invalid property.").toUtf8().data());
+        }
+    }
+
+    if (pVariable->GetType() != IVariableType<T>::value)
+    {
+        throw std::logic_error("Data type is invalid.");
+    }
+    pVariable->Set(value);
+}
+
+bool CEntityObject::GetEntityPropertyBool(const char* name) const
+{
+    return GetEntityProperty<bool>(name, false);
+}
+
+int CEntityObject::GetEntityPropertyInteger(const char* name) const
+{
+    return GetEntityProperty<int>(name, 0);
+}
+
+float CEntityObject::GetEntityPropertyFloat(const char* name) const
+{
+    return GetEntityProperty<float>(name, 0.0f);
+}
+
+QString CEntityObject::GetEntityPropertyString(const char* name) const
+{
+    return GetEntityProperty<QString>(name, "");
+}
+
+void CEntityObject::SetEntityPropertyBool(const char* name, bool value)
+{
+    SetEntityProperty<bool>(name, value);
+}
+
+void CEntityObject::SetEntityPropertyInteger(const char* name, int value)
+{
+    SetEntityProperty<int>(name, value);
+}
+
+void CEntityObject::SetEntityPropertyFloat(const char* name, float value)
+{
+    SetEntityProperty<float>(name, value);
+}
+
+void CEntityObject::SetEntityPropertyString(const char* name, const QString& value)
+{
+    SetEntityProperty<QString>(name, value);
+}
+
+#include <Objects/moc_EntityObject.cpp>
diff --git a/Code/Editor/Objects/EntityObject.h b/Code/Editor/Objects/EntityObject.h
new file mode 100644
index 0000000000..8df5ab75ee
--- /dev/null
+++ b/Code/Editor/Objects/EntityObject.h
@@ -0,0 +1,441 @@
+/*
+ * 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_OBJECTS_ENTITYOBJECT_H
+#define CRYINCLUDE_EDITOR_OBJECTS_ENTITYOBJECT_H
+#pragma once
+
+
+#if !defined(Q_MOC_RUN)
+#include "BaseObject.h"
+
+#include "IMovieSystem.h"
+#include "IEntityObjectListener.h"
+#include "Gizmo.h"
+#include "CryListenerSet.h"
+#include "StatObjBus.h"
+
+#include <QObject>
+#endif
+
+#define CLASS_LIGHT "Light"
+#define CLASS_DESTROYABLE_LIGHT "DestroyableLight"
+#define CLASS_RIGIDBODY_LIGHT "RigidBodyLight"
+#define CLASS_ENVIRONMENT_LIGHT "EnvironmentLight"
+
+class CEntityObject;
+class QMenu;
+
+/*!
+ *  CEntityEventTarget is an Entity event target and type.
+ */
+struct CEntityEventTarget
+{
+    CBaseObject* target; //! Target object.
+    _smart_ptr<CGizmo> pLineGizmo;
+    QString event;
+    QString sourceEvent;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Named link from entity to entity.
+//////////////////////////////////////////////////////////////////////////
+struct CEntityLink
+{
+    GUID targetId;   // Target entity id.
+    CEntityObject* target; // Target entity.
+    QString name;    // Name of the link.
+    _smart_ptr<CGizmo> pLineGizmo;
+};
+
+struct IPickEntitesOwner
+{
+    virtual void AddEntity(CBaseObject* pEntity) = 0;
+    virtual CBaseObject* GetEntity(int nIdx) = 0;
+    virtual int GetEntityCount() = 0;
+    virtual void RemoveEntity(int nIdx) = 0;
+};
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+/*!
+ *  CEntity is an static object on terrain.
+ *
+ */
+class CRYEDIT_API CEntityObject
+    : public CBaseObject
+    , public CBaseObject::EventListener
+{
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    Q_OBJECT
+public:
+    ~CEntityObject();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Overrides from CBaseObject.
+    //////////////////////////////////////////////////////////////////////////
+    //! Return type name of Entity.
+    QString GetTypeDescription() const { return GetEntityClass(); };
+
+    //////////////////////////////////////////////////////////////////////////
+    bool IsSameClass(CBaseObject* obj);
+
+    virtual bool Init(IEditor* ie, CBaseObject* prev, const QString& file);
+    virtual void InitVariables();
+    virtual void Done();
+
+    void DrawExtraLightInfo (DisplayContext& disp);
+
+    bool GetEntityPropertyBool(const char* name) const;
+    int GetEntityPropertyInteger(const char* name) const;
+    float GetEntityPropertyFloat(const char* name) const;
+    QString GetEntityPropertyString(const char* name) const;
+    void SetEntityPropertyBool(const char* name, bool value);
+    void SetEntityPropertyInteger(const char* name, int value);
+    void SetEntityPropertyFloat(const char* name, float value);
+    void SetEntityPropertyString(const char* name, const QString& value);
+
+    virtual int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags);
+    virtual void OnContextMenu(QMenu* menu);
+
+    void SetName(const QString& name);
+    void SetSelected(bool bSelect);
+
+    virtual void GetLocalBounds(AABB& box);
+
+    virtual bool HitTest(HitContext& hc);
+    virtual bool HitHelperTest(HitContext& hc);
+    virtual bool HitTestRect(HitContext& hc);
+    void UpdateVisibility(bool bVisible);
+    bool ConvertFromObject(CBaseObject* object);
+
+    virtual void Serialize(CObjectArchive& ar);
+    virtual void PostLoad(CObjectArchive& ar);
+
+    XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode);
+
+    //////////////////////////////////////////////////////////////////////////
+    void OnEvent(ObjectEvent event);
+
+    virtual void SetTransformDelegate(ITransformDelegate* pTransformDelegate) override;
+
+    // Set attach flags and target
+    enum EAttachmentType
+    {
+        eAT_Pivot,
+        eAT_GeomCacheNode,
+        eAT_CharacterBone,
+    };
+
+    void SetAttachType(const EAttachmentType attachmentType) { m_attachmentType = attachmentType; }
+    void SetAttachTarget(const char* target) { m_attachmentTarget = target; }
+    EAttachmentType GetAttachType() const { return m_attachmentType; }
+    QString GetAttachTarget() const { return m_attachmentTarget; }
+
+    virtual void SetHelperScale(float scale);
+    virtual float GetHelperScale();
+
+    virtual void GatherUsedResources(CUsedResources& resources);
+    virtual bool IsSimilarObject(CBaseObject* pObject);
+
+    virtual bool HasMeasurementAxis() const {   return false;   }
+
+    virtual bool IsIsolated() const { return false; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // END CBaseObject
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // CEntity interface.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void DeleteEntity() {}
+
+    QString GetEntityClass() const { return m_entityClass; };
+    int GetEntityId() const { return m_entityId; };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Return number of event targets of Script.
+    int     GetEventTargetCount() const { return m_eventTargets.size(); };
+    CEntityEventTarget& GetEventTarget(int index) { return m_eventTargets[index]; };
+    //! Add new event target, returns index of created event target.
+    //! Event targets are Always entities.
+    int AddEventTarget(CBaseObject* target, const QString& event, const QString& sourceEvent, bool bUpdateScript = true);
+    //! Remove existing event target by index.
+    void RemoveEventTarget(int index, bool bUpdateScript = true);
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Entity Links.
+    //////////////////////////////////////////////////////////////////////////
+    //! Return number of event targets of Script.
+    int     GetEntityLinkCount() const { return m_links.size(); };
+    CEntityLink& GetEntityLink(int index) { return m_links[index]; };
+    virtual int AddEntityLink(const QString& name, GUID targetEntityId);
+    virtual bool EntityLinkExists(const QString& name, GUID targetEntityId);
+    void RenameEntityLink(int index, const QString& newName);
+    void RemoveEntityLink(int index);
+    void RemoveAllEntityLinks();
+    virtual void EntityLinked([[maybe_unused]] const QString& name, [[maybe_unused]] GUID targetEntityId){}
+    virtual void EntityUnlinked([[maybe_unused]] const QString& name, [[maybe_unused]] GUID targetEntityId) {}
+    void LoadLink(XmlNodeRef xmlNode, CObjectArchive* pArchive = NULL);
+    void SaveLink(XmlNodeRef xmlNode);
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+
+    int GetCastShadowMinSpec() const { return mv_castShadowMinSpec; }
+
+    float GetRatioLod() const { return static_cast<float>(mv_ratioLOD); };
+    float GetViewDistanceMultiplier() const { return mv_viewDistanceMultiplier; }
+
+    CVarBlock* GetProperties() const { return m_pProperties; };
+    CVarBlock* GetProperties2() const { return m_pProperties2; };
+
+    bool IsLight()  const   {   return m_bLight;        }
+
+    void Validate(IErrorReport* report) override;
+
+    // Find CEntity from AZ::EntityId, which can also handle legacy game Ids stored as AZ::EntityIds
+    static CEntityObject* FindFromEntityId(const AZ::EntityId& id);
+
+    // Get the name of the light animation node assigned to this, if any.
+    QString GetLightAnimation() const;
+
+    IVariable* GetLightVariable(const char* name) const;
+
+    void PreInitLightProperty();
+    void UpdateLightProperty();
+
+    void EnableReload(bool bEnable)
+    {
+        m_bEnableReload = bEnable;
+    }
+
+    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.
+    virtual void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx);
+
+    //! Draw default object items.
+    void DrawProjectorPyramid(DisplayContext& dc, float dist);
+    void DrawProjectorFrustum(DisplayContext& dc, Vec2 size, float dist);
+
+    void OnLoadFailed();
+
+    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);
+    void ReleaseEventTargets();
+
+public:
+    CEntityObject();
+
+    static const GUID& GetClassID()
+    {
+        // {C80F8AEA-90EF-471f-82C7-D14FA80B9203}
+        static const GUID guid = {
+            0xc80f8aea, 0x90ef, 0x471f, { 0x82, 0xc7, 0xd1, 0x4f, 0xa8, 0xb, 0x92, 0x3 }
+        };
+        return guid;
+    }
+
+protected:
+    void DeleteThis() { delete this; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Radius callbacks.
+    //////////////////////////////////////////////////////////////////////////
+    void OnRadiusChange(IVariable* var);
+    void OnInnerRadiusChange(IVariable* var);
+    void OnOuterRadiusChange(IVariable* var);
+    void OnBoxSizeXChange(IVariable* var);
+    void OnBoxSizeYChange(IVariable* var);
+    void OnBoxSizeZChange(IVariable* var);
+    void OnProjectorFOVChange(IVariable* var);
+    void OnProjectorTextureChange(IVariable* var);
+    void OnProjectInAllDirsChange(IVariable* var);
+    //////////////////////////////////////////////////////////////////////////
+    // Area light callbacks.
+    //////////////////////////////////////////////////////////////////////////
+    void OnAreaLightChange(IVariable* var);
+    void OnAreaWidthChange(IVariable* var);
+    void OnAreaHeightChange(IVariable* var);
+    void OnAreaFOVChange(IVariable* var);
+    void OnAreaLightSizeChange(IVariable* var);
+    void OnColorChange(IVariable* var);
+    //////////////////////////////////////////////////////////////////////////
+    // Box projection callbacks.
+    //////////////////////////////////////////////////////////////////////////
+    void OnBoxProjectionChange(IVariable* var);
+    void OnBoxWidthChange(IVariable* var);
+    void OnBoxHeightChange(IVariable* var);
+    void OnBoxLengthChange(IVariable* var);
+    //////////////////////////////////////////////////////////////////////////
+
+    void FreeGameData();
+
+    void AdjustLightProperties(CVarBlockPtr& properties, const char* pSubBlock);
+    IVariable* FindVariableInSubBlock(CVarBlockPtr& properties, IVariable* pSubBlockVar, const char* pVarName);
+
+    unsigned int m_bLoadFailed : 1;
+    unsigned int m_bCalcPhysics : 1;
+    unsigned int m_bDisplayBBox : 1;
+    unsigned int m_bDisplaySolidBBox : 1;
+    unsigned int m_bDisplayAbsoluteRadius : 1;
+    unsigned int m_bDisplayArrow : 1;
+    unsigned int m_bIconOnTop : 1;
+    unsigned int m_bVisible : 1;
+    unsigned int m_bLight : 1;
+    unsigned int m_bAreaLight : 1;
+    unsigned int m_bProjectorHasTexture : 1;
+    unsigned int m_bProjectInAllDirs : 1;
+    unsigned int m_bBoxProjectedCM : 1;
+    unsigned int m_bBBoxSelection : 1;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Vec3  m_lightColor;
+
+    //! Entity class.
+    QString m_entityClass;
+    //! Id of spawned entity.
+    int m_entityId;
+
+    // Used for light entities
+    float m_projectorFOV;
+
+    IStatObj* m_visualObject;
+    AABB m_box;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Main entity parameters.
+    //////////////////////////////////////////////////////////////////////////
+    CVariable<bool> mv_outdoor;
+    CVariable<bool> mv_castShadow; // Legacy, required for backwards compatibility
+    CSmartVariableEnum<int> mv_castShadowMinSpec;
+    CVariable<int> mv_ratioLOD;
+    CVariable<float> mv_viewDistanceMultiplier;
+    CVariable<bool> mv_hiddenInGame; // Entity is hidden in game (on start).
+    CVariable<bool> mv_recvWind;
+    CVariable<bool> mv_renderNearest;
+    CVariable<bool> mv_noDecals;
+    CVariable<bool> mv_createdThroughPool;
+    CVariable<float> mv_obstructionMultiplier;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Temp variables (Not serializable) just to display radii from properties.
+    //////////////////////////////////////////////////////////////////////////
+    // Used for proximity entities.
+    float m_proximityRadius;
+    float m_innerRadius;
+    float m_outerRadius;
+    // Used for probes
+    float m_boxSizeX;
+    float m_boxSizeY;
+    float m_boxSizeZ;
+    // Used for area lights
+    float m_fAreaWidth;
+    float m_fAreaHeight;
+    float m_fAreaLightSize;
+    // Used for box projected cubemaps
+    float m_fBoxWidth;
+    float m_fBoxHeight;
+    float m_fBoxLength;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Event Targets.
+    //////////////////////////////////////////////////////////////////////////
+    //! Array of event targets of this Entity.
+    typedef std::vector<CEntityEventTarget> EventTargets;
+    EventTargets m_eventTargets;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Links
+    typedef std::vector<CEntityLink> Links;
+    Links m_links;
+
+    //! Entity properties variables.
+    CVarBlockPtr m_pProperties;
+
+    //! Per instance entity properties variables
+    CVarBlockPtr m_pProperties2;
+
+    // Physics state, as a string.
+    XmlNodeRef m_physicsState;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    static float m_helperScale;
+
+    EAttachmentType m_attachmentType;
+
+    bool m_bEnableReload;
+
+    QString m_attachmentTarget;
+
+private:
+    struct VariableCallbackIndex
+    {
+        enum : unsigned char
+        {
+            OnAreaHeightChange = 0,
+            OnAreaLightChange,
+            OnAreaLightSizeChange,
+            OnAreaWidthChange,
+            OnBoxHeightChange,
+            OnBoxLengthChange,
+            OnBoxProjectionChange,
+            OnBoxSizeXChange,
+            OnBoxSizeYChange,
+            OnBoxSizeZChange,
+            OnBoxWidthChange,
+            OnColorChange,
+            OnInnerRadiusChange,
+            OnOuterRadiusChange,
+            OnProjectInAllDirsChange,
+            OnProjectorFOVChange,
+            OnProjectorTextureChange,
+            OnPropertyChange,
+            OnRadiusChange,
+
+            // must be at the end
+            Count,
+        };
+    };
+
+    void ResetCallbacks();
+    void SetVariableCallback(IVariable* pVar, IVariable::OnSetCallback* func);
+    void ClearCallbacks();
+
+    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
+};
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_ENTITYOBJECT_H
diff --git a/Code/Editor/Objects/Gizmo.cpp b/Code/Editor/Objects/Gizmo.cpp
new file mode 100644
index 0000000000..f9b11c20be
--- /dev/null
+++ b/Code/Editor/Objects/Gizmo.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "Gizmo.h"
+
+//////////////////////////////////////////////////////////////////////////
+// CGizmo implementation.
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+CGizmo::CGizmo()
+{
+    m_bDelete = false;
+    m_matrix.SetIdentity();
+    m_flags = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CGizmo::~CGizmo()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGizmo::SetMatrix(const Matrix34& tm)
+{
+    m_matrix = tm;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGizmo::DeleteThis()
+{
+    m_bDelete = true;
+};
diff --git a/Code/Editor/Objects/Gizmo.h b/Code/Editor/Objects/Gizmo.h
new file mode 100644
index 0000000000..3e9058b77e
--- /dev/null
+++ b/Code/Editor/Objects/Gizmo.h
@@ -0,0 +1,79 @@
+/*
+ * 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 "BaseObject.h"
+
+// forward declarations.
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_GIZMO_H
+#define CRYINCLUDE_EDITOR_OBJECTS_GIZMO_H
+#pragma once
+struct DisplayContext;
+struct HitContext;
+
+enum EGizmoFlags
+{
+    EGIZMO_SELECTABLE = 0x0001, //! If set gizmo can be selected by clicking.
+    EGIZMO_HIDDEN = 0x0002,         //! If set gizmo hidden and should not be displayed.
+    EGIZMO_TRANSFORM_MANIPULATOR = 0x0004, //! This gizmo is a transform manipulator.
+};
+
+/** Any helper object that BaseObjects can use to display some usefull information like tracks.
+        Gizmo's life time should be controlled by thier owning BaseObjects.
+*/
+class SANDBOX_API CGizmo
+    : public CRefCountBase
+{
+public:
+    CGizmo();
+    virtual ~CGizmo();
+
+    virtual void SetName([[maybe_unused]] const char* sName) {};
+    virtual const char* GetName([[maybe_unused]] const char* sName) { return ""; };
+
+    //! Set gizmo object flags.
+    void SetFlags(uint32 flags) { m_flags = flags; }
+    //! Get gizmo object flags.
+    uint32 GetFlags() const { return m_flags; }
+
+    /** Get bounding box of Gizmo in world space.
+        @param bbox Returns bounding box.
+    */
+    virtual void GetWorldBounds(AABB& bbox) = 0;
+
+    /** Set transformation matrix of this gizmo.
+    */
+    virtual void SetMatrix(const Matrix34& tm);
+
+    /** Get transformation matrix of this gizmo.
+    */
+    virtual const Matrix34& GetMatrix() const { return m_matrix; }
+
+    /** Display Gizmo in the viewport.
+    */
+    virtual void Display(DisplayContext& dc) = 0;
+
+    /** Performs hit testing on gizmo object.
+    */
+    virtual bool HitTest([[maybe_unused]] HitContext& hc) { return false; };
+
+    //! Is this gizmo need to be deleted?.
+    bool IsDelete() const { return m_bDelete; }
+    //! Set this gizmo to be deleted.
+    void DeleteThis();
+
+    virtual CBaseObjectPtr GetBaseObject() const {  return NULL; }
+
+
+protected:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    mutable Matrix34 m_matrix;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    bool m_bDelete; // This gizmo is marked for deletion.
+    uint32 m_flags;
+};
+#endif // CRYINCLUDE_EDITOR_OBJECTS_GIZMO_H
diff --git a/Code/Editor/Objects/GizmoManager.cpp b/Code/Editor/Objects/GizmoManager.cpp
new file mode 100644
index 0000000000..662fadad74
--- /dev/null
+++ b/Code/Editor/Objects/GizmoManager.cpp
@@ -0,0 +1,131 @@
+/*
+ * 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 "GizmoManager.h"
+
+// Editor
+#include "Gizmo.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+void CGizmoManager::Display(DisplayContext& dc)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    AABB bbox;
+    std::vector<CGizmo*> todelete;
+    for (Gizmos::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        CGizmo* gizmo = *it;
+        if (gizmo->GetFlags() & EGIZMO_HIDDEN)
+        {
+            continue;
+        }
+
+        gizmo->GetWorldBounds(bbox);
+        if (dc.IsVisible(bbox))
+        {
+            gizmo->Display(dc);
+        }
+
+        if (gizmo->IsDelete())
+        {
+            todelete.push_back(gizmo);
+        }
+    }
+
+    // Delete gizmos that needs deletion.
+    for (int i = 0; i < todelete.size(); i++)
+    {
+        RemoveGizmo(todelete[i]);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGizmoManager::AddGizmo(CGizmo* gizmo)
+{
+    m_gizmos.insert(gizmo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGizmoManager::RemoveGizmo(CGizmo* gizmo)
+{
+    m_gizmos.erase(gizmo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CGizmoManager::GetGizmoCount() const
+{
+    return (int)m_gizmos.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CGizmo* CGizmoManager::GetGizmoByIndex(int nIndex) const
+{
+    int nCount = 0;
+    Gizmos::iterator ii = m_gizmos.begin();
+    for (; ii != m_gizmos.end(); ++ii)
+    {
+        if ((nCount++) == nIndex)
+        {
+            return *ii;
+        }
+    }
+    return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CGizmoManager::HitTest(HitContext& hc)
+{
+    float mindist = FLT_MAX;
+
+    HitContext ghc = hc;
+    bool bGizmoHit = false;
+
+    AABB bbox;
+    for (Gizmos::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        CGizmo* gizmo = *it;
+
+        if (gizmo->GetFlags() & EGIZMO_SELECTABLE)
+        {
+            if (gizmo->HitTest(ghc))
+            {
+                bGizmoHit = true;
+                if (ghc.dist < mindist)
+                {
+                    mindist = ghc.dist;
+                    hc = ghc;
+                }
+            }
+        }
+    }
+    return bGizmoHit;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CGizmoManager::DeleteAllTransformManipulators()
+{
+    std::vector<CGizmo*> todelete;
+    for (Gizmos::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        CGizmo* gizmo = *it;
+        if (gizmo->GetFlags() & EGIZMO_TRANSFORM_MANIPULATOR)
+        {
+            todelete.push_back(gizmo);
+        }
+    }
+
+    // Delete gizmos that needs deletion.
+    for (int i = 0; i < todelete.size(); i++)
+    {
+        RemoveGizmo(todelete[i]);
+    }
+}
diff --git a/Code/Editor/Objects/GizmoManager.h b/Code/Editor/Objects/GizmoManager.h
new file mode 100644
index 0000000000..8e7b3c6234
--- /dev/null
+++ b/Code/Editor/Objects/GizmoManager.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_GIZMOMANAGER_H
+#define CRYINCLUDE_EDITOR_OBJECTS_GIZMOMANAGER_H
+#pragma once
+
+
+#include "IGizmoManager.h"
+
+
+typedef _smart_ptr<CGizmo> CGizmoPtr;
+
+/** GizmoManager manages set of currently active Gizmo objects.
+*/
+class CGizmoManager
+    : public IGizmoManager
+{
+public:
+    void AddGizmo(CGizmo* gizmo);
+    void RemoveGizmo(CGizmo* gizmo);
+
+    int GetGizmoCount() const override;
+    CGizmo* GetGizmoByIndex(int nIndex) const override;
+
+    void Display(DisplayContext& dc);
+    bool HitTest(HitContext& hc);
+
+    void DeleteAllTransformManipulators();
+
+private:
+    typedef std::set<CGizmoPtr> Gizmos;
+    Gizmos m_gizmos;
+};
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_GIZMOMANAGER_H
diff --git a/Code/Editor/Objects/IEntityObjectListener.h b/Code/Editor/Objects/IEntityObjectListener.h
new file mode 100644
index 0000000000..06d8d18837
--- /dev/null
+++ b/Code/Editor/Objects/IEntityObjectListener.h
@@ -0,0 +1,19 @@
+/*
+ * 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
new file mode 100644
index 0000000000..ec8d3f9d7b
--- /dev/null
+++ b/Code/Editor/Objects/LineGizmo.cpp
@@ -0,0 +1,254 @@
+/*
+ * 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 "LineGizmo.h"
+
+// Editor
+#include "Include/IObjectManager.h"
+#include "DisplayContext.h"
+#include "DisplaySettings.h"
+#include "Objects/EntityObject.h"
+#include "GizmoManager.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+CLineGizmo::CLineGizmo()
+{
+    m_color[0] = ColorF(0, 1, 1, 1);
+    m_color[1] = ColorF(0, 1, 1, 1);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CLineGizmo::~CLineGizmo()
+{
+    if (m_object[0])
+    {
+        m_object[0]->RemoveEventListener(this);
+    }
+    if (m_object[1])
+    {
+        m_object[1]->RemoveEventListener(this);
+    }
+    m_object[0] = 0;
+    m_object[1] = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLineGizmo::SetObjects(CBaseObject* pObject1, CBaseObject* pObject2, const QString& boneName)
+{
+    assert(pObject1);
+    assert(pObject2);
+    m_object[0] = pObject1;
+    m_object[1] = pObject2;
+    m_boneName = boneName;
+
+    m_object[0]->AddEventListener(this);
+    m_object[1]->AddEventListener(this);
+    CalcBounds();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLineGizmo::OnObjectEvent([[maybe_unused]] CBaseObject* object, int event)
+{
+    if (event == CBaseObject::ON_TRANSFORM)
+    {
+        // One of objects transformed, recalc gizmo bounds.
+        CalcBounds();
+        return;
+    }
+    if (event == CBaseObject::ON_DELETE)
+    {
+        // This gizmo must be deleted as well if one of the objects is deleted.
+        GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(this);
+        return;
+    }
+    if (event == CBaseObject::ON_VISIBILITY)
+    {
+        // Check visibility of gizmo.
+        bool bVisible = !m_object[0]->CheckFlags(OBJFLAG_INVISIBLE) && !m_object[1]->CheckFlags(OBJFLAG_INVISIBLE);
+        if (bVisible)
+        {
+            SetFlags(GetFlags() & (~EGIZMO_HIDDEN));
+        }
+        else
+        {
+            SetFlags(GetFlags() | EGIZMO_HIDDEN);
+        }
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLineGizmo::Display(DisplayContext& dc)
+{
+    if (dc.flags & DISPLAY_LINKS)
+    {
+        dc.DrawLine(m_point[0], m_point[1], m_color[0], m_color[1]);
+
+        //if (!(dc.flags & DISPLAY_HIDENAMES))
+        {
+            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());
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLineGizmo::CalcBounds()
+{
+    m_bbox.Reset();
+
+    for (int i = 0; i < 2; i++)
+    {
+        bool IsObjectLight = false;
+        if (qobject_cast<CEntityObject*>(m_object[i]))
+        {
+            CEntityObject* entityobject = static_cast<CEntityObject*>(m_object[i].get());
+            if (entityobject->IsLight())
+            {
+                m_point[i] = entityobject->GetWorldPos();
+                IsObjectLight = true;
+            }
+        }
+        if (IsObjectLight == false)
+        {
+            AABB box;
+            m_object[i]->GetBoundBox(box);
+            m_point[i] = 0.5f * Vec3(box.max + box.min);
+        }
+        m_bbox.Add(m_point[i]);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLineGizmo::GetWorldBounds(AABB& bbox)
+{
+    bbox = m_bbox;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLineGizmo::SetColor(const Vec3& color1, const Vec3& color2, float alpha1, float alpha2)
+{
+    m_color[0] = ColorF(color1.x, color1.y, color1.z, alpha1);
+    m_color[1] = ColorF(color2.x, color2.y, color2.z, alpha2);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLineGizmo::SetName(const char* sName)
+{
+    m_name = sName;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLineGizmo::HitTest([[maybe_unused]] HitContext& hc)
+{
+    return 0;
+    /*
+    if (hc.distanceTollerance != 0)
+        return 0;
+
+    Vec3 org = m_object->GetWorldPos();
+
+    float fScreenScale = hc.view->GetScreenScaleFactor(org);
+    float size = gSettings.gizmo.axisGizmoSize * fScreenScale;
+
+    Vec3 x(size,0,0);
+    Vec3 y(0,size,0);
+    Vec3 z(0,0,size);
+
+    float hitDist = 0.01f * fScreenScale;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Calculate ray in local space of axis.
+    //////////////////////////////////////////////////////////////////////////
+    Matrix34 tm;
+    RefCoordSys refCoordSys = GetIEditor()->GetReferenceCoordSys();
+    if (refCoordSys == COORDS_LOCAL)
+    {
+        tm = m_object->GetWorldTM();
+        tm.NoScale();
+    }
+    else
+    {
+        tm.SetIdentity();
+        tm.SetTranslation( m_object->GetWorldPos() );
+    }
+    tm.Invert44();
+    Vec3 raySrc = tm.TransformPoint( hc.raySrc );
+    //CHANGED_BY_IVO
+    //Vec3 rayDir = tm.TransformVector( hc.rayDir );
+    Vec3 rayDir = GetTransposed44(tm) * ( hc.rayDir );
+    //////////////////////////////////////////////////////////////////////////
+
+    Vec3 pnt;
+    BBox box;
+    box.min = - Vec3(hitDist*2,hitDist*2,hitDist*2);
+    box.max = Vec3(size+hitDist*2,size+hitDist*2,size+hitDist*2);
+    if (!box.IsIntersectRay( raySrc,rayDir,pnt ))
+    {
+        m_highlightAxis = 0;
+        return false;
+    }
+
+
+    float axisdist[10];
+    Vec3 np[10];
+
+    Vec3 rayTrg = raySrc + rayDir*10000.0f;
+
+    size *= 0.3f;
+    Vec3 p1(size,size,0);
+    Vec3 p2(size,0,size);
+    Vec3 p3(0,size,size);
+
+    axisdist[AXIS_X] = RayToLineDistance( raySrc,rayTrg,Vec3(0,0,0),x,np[AXIS_X] );
+    axisdist[AXIS_Y] = RayToLineDistance( raySrc,rayTrg,Vec3(0,0,0),y,np[AXIS_Y] );
+    axisdist[AXIS_Z] = RayToLineDistance( raySrc,rayTrg,Vec3(0,0,0),z,np[AXIS_Z] );
+    axisdist[AXIS_XY] = RayToLineDistance( raySrc,rayTrg,p1,p1-x*0.3f,np[AXIS_XY] );
+    axisdist[AXIS_XZ] = RayToLineDistance( raySrc,rayTrg,p2,p2-x*0.3f,np[AXIS_XZ] );
+    axisdist[AXIS_YZ] = RayToLineDistance( raySrc,rayTrg,p3,p3-y*0.3f,np[AXIS_YZ] );
+
+    float mindist = hitDist;
+    int axis = 0;
+    for (int i = AXIS_X; i <= AXIS_XZ; i++)
+    {
+        if (axisdist[i] < mindist)
+        {
+            mindist = axisdist[i];
+            axis = i;
+        }
+    }
+
+    if (axis != 0)
+    {
+        hc.axis = axis;
+        hc.object = m_object;
+        hc.dist = GetDistance(raySrc,np[axis]);
+    }
+
+    m_highlightAxis = axis;
+
+    return axis != 0;
+    */
+}
diff --git a/Code/Editor/Objects/LineGizmo.h b/Code/Editor/Objects/LineGizmo.h
new file mode 100644
index 0000000000..1b03bdba31
--- /dev/null
+++ b/Code/Editor/Objects/LineGizmo.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_LINEGIZMO_H
+#define CRYINCLUDE_EDITOR_OBJECTS_LINEGIZMO_H
+#pragma once
+
+#include "BaseObject.h"
+#include "Gizmo.h"
+
+// forward declarations.
+struct DisplayContext;
+
+/** Gizmo of link line connecting two Objects.
+*/
+class CLineGizmo
+    : public CGizmo
+    , public CBaseObject::EventListener
+{
+public:
+    CLineGizmo();
+    ~CLineGizmo();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Ovverides from CGizmo
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetName(const char* sName);
+    virtual void GetWorldBounds(AABB& bbox);
+    virtual void Display(DisplayContext& dc);
+    virtual bool HitTest(HitContext& hc);
+
+    //////////////////////////////////////////////////////////////////////////
+    void SetObjects(CBaseObject* pObject1, CBaseObject* pObject2, const QString& boneName = "");
+    void SetColor(const Vec3& color1, const Vec3& color2, float alpha1 = 1.0f, float alpha2 = 1.0f);
+
+private:
+    void OnObjectEvent(CBaseObject* object, int event) override;
+    void CalcBounds();
+
+    CBaseObjectPtr m_object[2];
+    Vec3 m_point[2];
+    AABB m_bbox;
+    ColorF m_color[2];
+    QString m_name;
+    QString m_boneName;
+};
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_LINEGIZMO_H
+
diff --git a/Code/Editor/Objects/ObjectLoader.cpp b/Code/Editor/Objects/ObjectLoader.cpp
new file mode 100644
index 0000000000..972ab987a2
--- /dev/null
+++ b/Code/Editor/Objects/ObjectLoader.cpp
@@ -0,0 +1,427 @@
+/*
+ * 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 "ObjectLoader.h"
+
+// Editor
+#include "Util/PakFile.h"
+#include "WaitProgress.h"
+#include "Include/IObjectManager.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// CObjectArchive Implementation.
+//////////////////////////////////////////////////////////////////////////
+CObjectArchive::CObjectArchive(IObjectManager* objMan, XmlNodeRef xmlRoot, bool loading)
+{
+    m_objectManager = objMan;
+    bLoading = loading;
+    bUndo = false;
+    m_nFlags = 0;
+    node = xmlRoot;
+    m_pCurrentErrorReport = GetIEditor()->GetErrorReport();
+    m_pGeometryPak = NULL;
+    m_pCurrentObject = NULL;
+    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)
+    {
+        ResolveObjects();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectArchive::SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor1 func)
+{
+    if (objectId == GUID_NULL)
+    {
+        func(0);
+        return;
+    }
+
+    GUID guid(objectId);
+
+    CBaseObject* pObject = m_objectManager->FindObject(guid);
+    if (pObject && !(m_nFlags & eObjectLoader_MakeNewIDs))
+    {
+        // Object is already resolved. immediately call callback.
+        func(pObject);
+    }
+    else
+    {
+        Callback cb;
+        cb.fromObject = fromObject;
+        cb.func1 = func;
+        m_resolveCallbacks.insert(Callbacks::value_type(guid, cb));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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)
+{
+    return stl::find_in_map(m_IdRemap, id, id);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectArchive::ResolveObjects()
+{
+    int i;
+
+    if (!bLoading)
+    {
+        return;
+    }
+
+    {
+        CWaitProgress wait("Loading Objects", false);
+        if (m_bProgressBarEnabled)
+        {
+            wait.Start();
+        }
+
+        GetIEditor()->SuspendUndo();
+        //////////////////////////////////////////////////////////////////////////
+        // Serialize All Objects from XML.
+        //////////////////////////////////////////////////////////////////////////
+        int numObj = m_loadedObjects.size();
+        for (i = 0; i < numObj; i++)
+        {
+            if (m_bProgressBarEnabled)
+            {
+                wait.Step((i * 100) / numObj);
+            }
+
+            SLoadedObjectInfo& obj = m_loadedObjects[i];
+            m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
+            node = obj.xmlNode;
+
+            obj.pObject->Serialize(*this);
+
+            m_pCurrentErrorReport->SetCurrentValidatorObject(nullptr);
+
+            // Objects can be added to the list here (from Groups).
+            numObj = m_loadedObjects.size();
+        }
+        m_pCurrentErrorReport->SetCurrentValidatorObject(NULL);
+        //////////////////////////////////////////////////////////////////////////
+        GetIEditor()->ResumeUndo();
+    }
+
+    // Sort objects by sort order.
+    std::sort(m_loadedObjects.begin(), m_loadedObjects.end());
+
+    // Then rearrange to parent-first, if same sort order.
+    for (i = 0; i < m_loadedObjects.size(); i++)
+    {
+        if (m_loadedObjects[i].pObject->GetParent())
+        {
+            // Find later in array.
+            for (int j = i + 1; j < m_loadedObjects.size() && m_loadedObjects[j].nSortOrder == m_loadedObjects[i].nSortOrder; j++)
+            {
+                if (m_loadedObjects[j].pObject == m_loadedObjects[i].pObject->GetParent())
+                {
+                    // Swap the objects.
+                    std::swap(m_loadedObjects[i], m_loadedObjects[j]);
+                    i--;
+                    break;
+                }
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Resolve objects GUIDs
+    //////////////////////////////////////////////////////////////////////////
+    for (Callbacks::iterator it = m_resolveCallbacks.begin(); it != m_resolveCallbacks.end(); it++)
+    {
+        Callback& cb = it->second;
+        GUID objectId = ResolveID(it->first);
+        CBaseObject* object = m_objectManager->FindObject(objectId);
+        if (!object)
+        {
+            QString from;
+            if (cb.fromObject)
+            {
+                from = cb.fromObject->GetName();
+            }
+            // Cannot resolve this object id.
+            CErrorRecord err;
+            err.error = QObject::tr("Unresolved ObjectID: %1, Referenced from Object %1").arg(GuidUtil::ToString(objectId)).arg(from);
+            err.severity = CErrorRecord::ESEVERITY_ERROR;
+            err.flags = CErrorRecord::FLAG_OBJECTID;
+            err.pObject = cb.fromObject;
+            GetIEditor()->GetErrorReport()->ReportError(err);
+
+            //Warning( "Cannot resolve ObjectID: %s\r\nObject with this ID was not present in loaded file.\r\nFor instance Trigger referencing another object which is not loaded in Level.",GuidUtil::ToString(objectId) );
+            continue;
+        }
+        m_pCurrentErrorReport->SetCurrentValidatorObject(object);
+        // Call callback with this object.
+        if (cb.func1)
+        {
+            (cb.func1)(object);
+        }
+        if (cb.func2)
+        {
+            (cb.func2)(object, cb.userData);
+        }
+    }
+    m_resolveCallbacks.clear();
+    //////////////////////////////////////////////////////////////////////////
+
+    {
+        CWaitProgress wait("Creating Objects", false);
+        if (m_bProgressBarEnabled)
+        {
+            wait.Start();
+        }
+        //////////////////////////////////////////////////////////////////////////
+        // Serialize All Objects from XML.
+        //////////////////////////////////////////////////////////////////////////
+        int numObj = m_loadedObjects.size();
+        for (i = 0; i < numObj; i++)
+        {
+            if (m_bProgressBarEnabled)
+            {
+                wait.Step((i * 100) / numObj);
+            }
+
+            SLoadedObjectInfo& obj = m_loadedObjects[i];
+            m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
+
+            obj.pObject->CreateGameObject();
+
+            // unset the current validator object because the wait Step 
+            // might generate unrelated errors
+            m_pCurrentErrorReport->SetCurrentValidatorObject(nullptr);
+        }
+        m_pCurrentErrorReport->SetCurrentValidatorObject(NULL);
+        //////////////////////////////////////////////////////////////////////////
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Call PostLoad on all these objects.
+    //////////////////////////////////////////////////////////////////////////
+    {
+        int numObj = m_loadedObjects.size();
+        for (i = 0; i < numObj; i++)
+        {
+            SLoadedObjectInfo& obj = m_loadedObjects[i];
+            m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
+            node = obj.xmlNode;
+            obj.pObject->PostLoad(*this);
+        }
+    }
+
+    m_bNeedResolveObjects = false;
+    m_pCurrentErrorReport->SetCurrentValidatorObject(NULL);
+    m_sequenceIdRemap.clear();
+    m_pendingIds.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectArchive::SaveObject(CBaseObject* pObject)
+{
+    if (pObject->CheckFlags(OBJFLAG_DONT_SAVE))
+    {
+        return;
+    }
+
+    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");
+        XmlNodeRef prevRoot = node;
+        node = objNode;
+
+        pObject->Serialize(*this);
+        node = prevRoot;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CObjectArchive::LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject)
+{
+    XmlNodeRef prevNode = node;
+    node = objNode;
+    CBaseObject* pObject;
+    bool bMakeNewID = (m_nFlags & eObjectLoader_MakeNewIDs) ? true : false;
+
+    pObject = m_objectManager->NewObject(*this, pPrevObject, bMakeNewID);
+    if (pObject)
+    {
+        SLoadedObjectInfo obj;
+        obj.nSortOrder = pObject->GetClassDesc()->GameCreationOrder();
+        obj.pObject = pObject;
+        obj.newGuid = pObject->GetId();
+        obj.xmlNode = node;
+        m_loadedObjects.push_back(obj);
+        m_bNeedResolveObjects = true;
+    }
+    node = prevNode;
+    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, NULL);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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)
+{
+    if (bEnable)
+    {
+        m_nFlags |= eObjectLoader_MakeNewIDs;
+    }
+    else
+    {
+        m_nFlags &= ~(eObjectLoader_MakeNewIDs);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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) == NULL);
+    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
new file mode 100644
index 0000000000..3d2bfa9633
--- /dev/null
+++ b/Code/Editor/Objects/ObjectLoader.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
+#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
+#pragma once
+
+
+#include "Util/GuidUtil.h"
+#include "ErrorReport.h"
+
+class CPakFile;
+class CErrorRecord;
+struct IObjectManager;
+
+typedef std::map<GUID, GUID, guid_less_predicate> TGUIDRemap;
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+/** CObjectLoader used to load Bas Object and resolve ObjectId references while loading.
+*/
+class SANDBOX_API CObjectArchive
+{
+public:
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    XmlNodeRef node; //!< Current archive node.
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    bool bLoading;
+    bool bUndo;
+
+    CObjectArchive(IObjectManager* objMan, XmlNodeRef xmlRoot, bool loading);
+    ~CObjectArchive();
+
+    //! 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 = NULL);
+
+    //////////////////////////////////////////////////////////////////////////
+    int GetLoadedObjectsCount() { return 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
+    {
+        int nSortOrder;
+        _smart_ptr<CBaseObject> pObject;
+        XmlNodeRef xmlNode;
+        GUID newGuid;
+        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; };
+    };
+    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;
+    ObjectsSet m_savedObjects;
+
+    //typedef std::multimap<int,_smart_ptr<CBaseObject> > OrderedObjects;
+    //OrderedObjects m_orderedObjects;
+    std::vector<SLoadedObjectInfo> m_loadedObjects;
+
+    // Loaded objects IDs, used for remapping of GUIDs.
+    TGUIDRemap m_IdRemap;
+
+    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
new file mode 100644
index 0000000000..5b8b497f2f
--- /dev/null
+++ b/Code/Editor/Objects/ObjectManager.cpp
@@ -0,0 +1,3039 @@
+/*
+ * 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 "ObjectManager.h"
+
+// Qt
+#include <QMessageBox>
+
+// Editor
+#include "Settings.h"
+#include "DisplaySettings.h"
+#include "EntityObject.h"
+#include "Viewport.h"
+#include "GizmoManager.h"
+#include "AxisGizmo.h"
+#include "GameEngine.h"
+#include "WaitProgress.h"
+#include "Util/Image.h"
+#include "ObjectManagerLegacyUndo.h"
+#include "Include/HitContext.h"
+#include "EditMode/DeepSelection.h"
+#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
+
+#include <AzCore/Console/Console.h>
+
+AZ_CVAR_EXTERNED(bool, ed_visibility_logTiming);
+AZ_CVAR_EXTERNED(bool, ed_visibility_use);
+
+/*!
+ *  Class Description used for object templates.
+ *  This description filled from Xml template files.
+ */
+class CXMLObjectClassDesc
+    : public CObjectClassDesc
+{
+public:
+    CObjectClassDesc*   superType;
+    QString type;
+    QString category;
+    QString fileSpec;
+    GUID guid;
+
+public:
+    REFGUID ClassID()
+    {
+        return guid;
+    }
+    ObjectType GetObjectType() { return superType->GetObjectType(); };
+    QString ClassName() { return type; };
+    QString Category() { return category; };
+    QObject* CreateQObject() const override { return superType->CreateQObject(); }
+    QString GetTextureIcon() { return superType->GetTextureIcon(); };
+    QString GetFileSpec()
+    {
+        if (!fileSpec.isEmpty())
+        {
+            return fileSpec;
+        }
+        else
+        {
+            return superType->GetFileSpec();
+        }
+    };
+    virtual int GameCreationOrder() { return superType->GameCreationOrder(); };
+};
+
+void CBaseObjectsCache::AddObject(CBaseObject* object)
+{
+    m_objects.push_back(object);
+    if (object->GetType() == OBJTYPE_AZENTITY)
+    {
+        auto componentEntityObject = static_cast<CComponentEntityObject*>(object);
+        m_entityIds.push_back(componentEntityObject->GetAssociatedEntityId());
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// CObjectManager implementation.
+//////////////////////////////////////////////////////////////////////////
+CObjectManager* g_pObjectManager = 0;
+
+//////////////////////////////////////////////////////////////////////////
+CObjectManager::CObjectManager()
+    : m_lastHideMask(0)
+    , m_maxObjectViewDistRatio(0.00001f)
+    , m_currSelection(&m_defaultSelection)
+    , m_nLastSelCount(0)
+    , 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();
+
+    AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
+        AzToolsFramework::GetEntityContextId());
+}
+
+//////////////////////////////////////////////////////////////////////////
+CObjectManager::~CObjectManager()
+{
+    AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
+
+    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)
+{
+    // Suspend undo operations when initializing object.
+    GetIEditor()->SuspendUndo();
+
+    CBaseObjectPtr obj;
+    {
+        obj = qobject_cast<CBaseObject*>(cls->CreateQObject());
+        obj->SetClassDesc(cls);
+        obj->InitVariables();
+        obj->m_guid = AZ::Uuid::CreateRandom();    // generate uniq GUID for this object.
+
+        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(obj);
+        if (obj->Init(GetIEditor(), prev, file))
+        {
+            if ((newObjectName)&&(newObjectName[0]))
+            {
+                obj->SetName(newObjectName);
+            }
+            else
+            {
+                if (obj->GetName().isEmpty())
+                {
+                    obj->GenerateUniqueName();
+                }
+            }
+
+            // Create game object itself.
+            obj->CreateGameObject();
+
+            if (!AddObject(obj))
+            {
+                obj = 0;
+            }
+        }
+        else
+        {
+            obj = 0;
+        }
+        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(NULL);
+    }
+
+    GetIEditor()->ResumeUndo();
+
+    if (obj != 0 && GetIEditor()->IsUndoRecording())
+    {
+        // AZ entity creations are handled through the AZ undo system.
+        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();
+            }
+
+        }
+    }
+
+    return obj;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CObjectManager::NewObject(CObjectArchive& ar, CBaseObject* pUndoObject, bool bMakeNewId)
+{
+    XmlNodeRef objNode = ar.node;
+
+    // Load all objects from XML.
+    QString typeName;
+    GUID id = GUID_NULL;
+
+    if (!objNode->getAttr("Type", typeName))
+    {
+        return 0;
+    }
+
+    if (!objNode->getAttr("Id", id))
+    {
+        // Make new ID for object that doesn't have if.
+        id = AZ::Uuid::CreateRandom();
+    }
+
+    if (bMakeNewId)
+    {
+        // Make new guid for this object.
+        GUID newId = AZ::Uuid::CreateRandom();
+        ar.RemapID(id, newId);  // Mark this id remapped.
+        id = newId;
+    }
+
+    CBaseObjectPtr pObject;
+    if (pUndoObject)
+    {
+        // if undoing restore object pointer.
+        pObject = pUndoObject;
+    }
+    else
+    {
+        // New object creation.
+
+        // Suspend undo operations when initializing object.
+        CUndoSuspend undoSuspender;
+
+        QString entityClass;
+        if (objNode->getAttr("EntityClass", entityClass))
+        {
+            typeName = typeName + "::" + entityClass;
+        }
+
+        CObjectClassDesc* cls = FindClass(typeName);
+        if (!cls)
+        {
+            CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_ERROR, "RuntimeClass %s not registered", typeName.toUtf8().data());
+            return 0;
+        }
+
+        pObject = qobject_cast<CBaseObject*>(cls->CreateQObject());
+        assert(pObject);
+        pObject->SetClassDesc(cls);
+        pObject->m_guid = id;
+
+        pObject->InitVariables();
+
+        QString objName;
+        objNode->getAttr("Name", objName);
+        pObject->m_name = objName;
+
+        CBaseObject* obj = FindObject(pObject->GetId());
+        if (obj)
+        {
+            // If id is taken.
+            QString error;
+            error = QObject::tr("[Error] Object %1 already exists in the Object Manager and has been deleted as it is a duplicate of object %2").arg(pObject->m_name, obj->GetName());
+            CLogFile::WriteLine(error.toUtf8().data());
+
+            if (!GetIEditor()->IsInTestMode() && !GetIEditor()->IsInLevelLoadTestMode())
+            {
+                CErrorRecord errorRecord;
+                errorRecord.pObject = obj;
+                errorRecord.count = 1;
+                errorRecord.severity = CErrorRecord::ESEVERITY_ERROR;
+                errorRecord.error = error;
+                errorRecord.description = "Possible duplicate objects being loaded, potential fix is to remove duplicate objects from level files.";
+                GetIEditor()->GetErrorReport()->ReportError(errorRecord);
+            }
+
+            return 0;
+            //CoCreateGuid( &pObject->m_guid ); // generate uniq GUID for this object.
+        }
+    }
+
+    GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(pObject);
+    if (!pObject->Init(GetIEditor(), 0, ""))
+    {
+        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(NULL);
+        return 0;
+    }
+
+    if (!AddObject(pObject))
+    {
+        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(NULL);
+        return 0;
+    }
+
+    //pObject->Serialize( ar );
+
+    GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(NULL);
+
+    if (pObject != 0 && pUndoObject == 0)
+    {
+        // If new object with no undo, record it.
+        if (CUndo::IsRecording())
+        {
+            GetIEditor()->RecordUndo(new CUndoBaseObjectNew(pObject));
+        }
+    }
+
+    m_loadedObjects++;
+    if (m_pLoadProgress && m_totalObjectsToLoad > 0)
+    {
+        m_pLoadProgress->Step((m_loadedObjects * 100) / m_totalObjectsToLoad);
+    }
+
+    return pObject;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CObjectManager::NewObject(const QString& typeName, CBaseObject* prev, const QString& file, const char* newObjectName)
+{
+    // [9/22/2009 evgeny] If it is "Entity", figure out if a CEntity subclass is actually needed
+    QString fullName = typeName + "::" + file;
+    CObjectClassDesc* cls = FindClass(fullName);
+    if (!cls)
+    {
+        cls = FindClass(typeName);
+    }
+
+    if (!cls)
+    {
+        GetIEditor()->GetSystem()->GetILog()->Log("Warning: RuntimeClass %s (as well as %s) not registered", typeName.toUtf8().data(), fullName.toUtf8().data());
+        return 0;
+    }
+    CBaseObject* pObject = NewObject(cls, prev, file, newObjectName);
+    return pObject;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void    CObjectManager::DeleteObject(CBaseObject* obj)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    if (m_currEditObject == obj)
+    {
+        EndEditParams();
+    }
+
+    if (!obj)
+    {
+        return;
+    }
+
+    // If object already deleted.
+    if (obj->CheckFlags(OBJFLAG_DELETED))
+    {
+        return;
+    }
+
+    NotifyObjectListeners(obj, CBaseObject::ON_PREDELETE);
+    obj->NotifyListeners(CBaseObject::ON_PREDELETE);
+
+    // Must be after object DetachAll to support restoring Parent/Child relations.
+    // AZ entity deletions are handled through the AZ undo system.
+    if (CUndo::IsRecording() && obj->GetType() != OBJTYPE_AZENTITY)
+    {
+        // Store undo for all child objects.
+        for (int i = 0; i < obj->GetChildCount(); i++)
+        {
+            obj->GetChild(i)->StoreUndo("DeleteParent");
+        }
+        CUndo::Record(new CUndoBaseObjectDelete(obj));
+    }
+
+    AABB objAAB;
+    obj->GetBoundBox(objAAB);
+    GetIEditor()->GetGameEngine()->OnAreaModified(objAAB);
+
+    obj->Done();
+
+    NotifyObjectListeners(obj, CBaseObject::ON_DELETE);
+
+    RemoveObject(obj);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::DeleteSelection(CSelectionGroup* pSelection)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    if (pSelection == NULL)
+    {
+        return;
+    }
+
+    // if the object contains an entity which has link, the link information should be recorded for undo separately. p
+
+    if (CUndo::IsRecording())
+    {
+        for (int i = 0, iSize(pSelection->GetCount()); i < iSize; ++i)
+        {
+            CBaseObject* pObj = pSelection->GetObject(i);
+            if (!qobject_cast<CEntityObject*>(pObj))
+            {
+                continue;
+            }
+
+            CEntityObject* pEntity = (CEntityObject*)pObj;
+            if (pEntity->GetEntityLinkCount() <= 0)
+            {
+                continue;
+            }
+
+            CEntityObject::StoreUndoEntityLink(pSelection);
+            break;
+        }
+    }
+
+    AzToolsFramework::EntityIdList selectedComponentEntities;
+    for (int i = 0, iObjSize(pSelection->GetCount()); i < iObjSize; i++)
+    {
+        CBaseObject* object = pSelection->GetObject(i);
+
+        // AZ::Entity deletion is handled through AZ undo system (DeleteSelected bus call below).
+        if (object->GetType() != OBJTYPE_AZENTITY)
+        {
+            DeleteObject(object);
+        }
+        else
+        {
+            AZ::EntityId id;
+            EBUS_EVENT_ID_RESULT(id, object, AzToolsFramework::ComponentEntityObjectRequestBus, GetAssociatedEntityId);
+            if (id.IsValid())
+            {
+                selectedComponentEntities.push_back(id);
+            }
+        }
+    }
+
+    // Delete AZ (component) entities.
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
+    {
+        EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, DeleteEntities, selectedComponentEntities);
+    }
+    else
+    {
+        EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, DeleteEntitiesAndAllDescendants, selectedComponentEntities);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::DeleteAllObjects()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::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);
+
+    // Clear map. Need to do this before deleting objects in case someone tries to get object list during shutdown.
+    m_objects.clear();
+    m_objectsByName.clear();
+
+    for (i = 0; i < objectsHolder.size(); i++)
+    {
+        objectsHolder[i]->Done();
+    }
+
+    //! Delete object instances.
+    objectsHolder.clear();
+
+    // Clear name map.
+    m_nameNumbersMap.clear();
+
+    m_animatedAttachedEntities.clear();
+}
+
+CBaseObject* CObjectManager::CloneObject(CBaseObject* obj)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::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
+{
+    CBaseObject* result = stl::find_in_map(m_objects, guid, (CBaseObject*)0);
+    return result;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CObjectManager::FindObject(const QString& sName) const
+{
+    const AZ::Crc32 crc(sName.toUtf8().data(), sName.toUtf8().count(), true);
+
+    auto iter = m_objectsByName.find(crc);
+    if (iter != m_objectsByName.end())
+    {
+        return iter->second;
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::FindObjectsOfType(ObjectType type, std::vector<CBaseObject*>& result)
+{
+    result.clear();
+
+    CBaseObjectsArray objects;
+    GetObjects(objects);
+
+    for (size_t i = 0, n = objects.size(); i < n; ++i)
+    {
+        if (objects[i]->GetType() == type)
+        {
+            result.push_back(objects[i]);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::FindObjectsOfType(const QMetaObject* pClass, std::vector<CBaseObject*>& result)
+{
+    result.clear();
+
+    CBaseObjectsArray objects;
+    GetObjects(objects);
+
+    for (size_t i = 0, n = objects.size(); i < n; ++i)
+    {
+        CBaseObject* pObject = objects[i];
+        if (pObject->metaObject() == pClass)
+        {
+            result.push_back(pObject);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::FindObjectsInAABB(const AABB& aabb, std::vector<CBaseObject*>& result) const
+{
+    result.clear();
+
+    CBaseObjectsArray objects;
+    GetObjects(objects);
+
+    for (size_t i = 0, n = objects.size(); i < n; ++i)
+    {
+        CBaseObject* pObject = objects[i];
+        AABB aabbObj;
+        pObject->GetBoundBox(aabbObj);
+        if (aabb.IsIntersectBox(aabbObj))
+        {
+            result.push_back(pObject);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CObjectManager::AddObject(CBaseObject* obj)
+{
+    CBaseObjectPtr p = stl::find_in_map(m_objects, obj->GetId(), 0);
+    if (p)
+    {
+        CErrorRecord err;
+        err.error = QObject::tr("New Object %1 has Duplicate GUID %2, New Object Ignored").arg(obj->GetName()).arg(GuidUtil::ToString(obj->GetId()));
+        err.severity = CErrorRecord::ESEVERITY_ERROR;
+        err.pObject = obj;
+        err.flags = CErrorRecord::FLAG_OBJECTID;
+        GetIEditor()->GetErrorReport()->ReportError(err);
+
+        return false;
+    }
+    m_objects[obj->GetId()] = obj;
+
+    // Handle adding object to type-specific containers if needed
+    {
+        if (CEntityObject* entityObj = qobject_cast<CEntityObject*>(obj))
+        {
+            CEntityObject::EAttachmentType attachType = entityObj->GetAttachType();
+            if (attachType == CEntityObject::EAttachmentType::eAT_GeomCacheNode || attachType == CEntityObject::EAttachmentType::eAT_CharacterBone)
+            {
+                m_animatedAttachedEntities.insert(entityObj);
+            }
+        }
+    }
+
+    const AZ::Crc32 nameCrc(obj->GetName().toUtf8().data(), obj->GetName().toUtf8().count(), true);
+    m_objectsByName[nameCrc] = obj;
+
+    RegisterObjectName(obj->GetName());
+    InvalidateVisibleList();
+    NotifyObjectListeners(obj, CBaseObject::ON_ADD);
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::RemoveObject(CBaseObject* obj)
+{
+    assert(obj != 0);
+
+    InvalidateVisibleList();
+
+    // Handle removing object from type-specific containers if needed
+    {
+        if (CEntityObject* entityObj = qobject_cast<CEntityObject*>(obj))
+        {
+            m_animatedAttachedEntities.erase(entityObj);
+        }
+    }
+
+    // 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));
+
+    // Need to erase this last since it is a smart pointer and can end up deleting the object if it is the last reference to it being kept
+    m_objects.erase(obj->GetId());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::GetAllObjects(TBaseObjects& objects) const
+{
+    objects.clear();
+    objects.reserve(m_objects.size());
+    for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it)
+    {
+        objects.push_back(it->second);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::ChangeObjectId(REFGUID oldGuid, REFGUID newGuid)
+{
+    Objects::iterator it = m_objects.find(oldGuid);
+    if (it != m_objects.end())
+    {
+        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, 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;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CObjectManager::GetObjectCount() const
+{
+    return m_objects.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::GetObjects(CBaseObjectsArray& objects) const
+{
+    objects.clear();
+    objects.reserve(m_objects.size());
+    for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it)
+    {
+        objects.push_back(it->second);
+    }
+}
+
+void CObjectManager::GetObjects(DynArray<CBaseObject*>& objects) const
+{
+    CBaseObjectsArray objectArray;
+    GetObjects(objectArray);
+    objects.clear();
+    for (int i = 0, iCount(objectArray.size()); i < iCount; ++i)
+    {
+        objects.push_back(objectArray[i]);
+    }
+}
+
+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;
+        obj->OnEvent(event);
+    }
+
+    if (event == EVENT_RELOAD_ENTITY)
+    {
+        m_bInReloading = false;
+        GetIEditor()->Notify(eNotify_OnReloadTrackView);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::SendEvent(ObjectEvent event, const AABB& bounds)
+{
+    AABB box;
+    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
+    {
+        CBaseObject* obj = it->second;
+        obj->GetBoundBox(box);
+        if (bounds.IsIntersectBox(box))
+        {
+            obj->OnEvent(event);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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)
+{
+    assert(obj);
+    if (obj == NULL)
+    {
+        return false;
+    }
+
+    // Check if can be selected.
+    if (bUseMask && (!(obj->GetType() & gSettings.objectSelectMask)))
+    {
+        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).
+    // this check is to handle the case where an undo or redo action has occurred and
+    // the entity has been destroyed and recreated as part of the deserialization step.
+    // we want the internal state to stay consistent but do not want to notify other systems of the change.
+    if (AzToolsFramework::ComponentModeFramework::InComponentMode())
+    {
+        obj->SetSelected(true);
+    }
+    else
+    {
+        SetObjectSelected(obj, true);
+        GetIEditor()->Notify(eNotify_OnSelectionChange);
+    }
+
+    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).
+    // this check is to handle the case where an undo or redo action has occurred and
+    // the entity has been destroyed and recreated as part of the deserialization step.
+    // we want the internal state to stay consistent but do not want to notify other systems of the change.
+    if (AzToolsFramework::ComponentModeFramework::InComponentMode())
+    {
+        obj->SetSelected(false);
+    }
+    else
+    {
+        SetObjectSelected(obj, false);
+    }
+
+    m_currSelection->RemoveObject(obj);
+}
+
+CSelectionGroup* CObjectManager::GetSelection(const QString& name) const
+{
+    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)0);
+    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*)0);
+    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(0);
+
+    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 = 0;
+
+        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()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    // Make sure to unlock selection.
+    GetIEditor()->LockSelection(false);
+
+    int numSel = m_currSelection->GetCount();
+
+    // Handle Undo/Redo of Component Entities
+    bool isUndoRecording = GetIEditor()->IsUndoRecording();
+    if (isUndoRecording)
+    {
+        m_processingBulkSelect = true;
+        GetIEditor()->RecordUndo(new CUndoBaseObjectClearSelection(*m_currSelection));
+    }
+
+    // Handle legacy entities separately so the selection group can be cleared safely.
+    // This prevents every AzEntity from being removed one by one from a vector.
+    m_currSelection->RemoveAllExceptLegacySet();
+
+    // Kick off Deselect for Legacy Entities
+    for (CBaseObjectPtr legacyObject : m_currSelection->GetLegacyObjects())
+    {
+        if (isUndoRecording && legacyObject->IsSelected())
+        {
+            GetIEditor()->RecordUndo(new CUndoBaseObjectSelect(legacyObject));
+        }
+
+        SetObjectSelected(legacyObject, false);
+    }
+
+    // Legacy set is cleared
+    m_defaultSelection.RemoveAll();
+    m_currSelection = &m_defaultSelection;
+    m_bSelectionChanged = true;
+
+    // Unselect all component entities as one bulk operation instead of individually
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities,
+        AzToolsFramework::EntityIdList());
+
+    m_processingBulkSelect = false;
+
+    if (!m_bExiting)
+    {
+        GetIEditor()->Notify(eNotify_OnSelectionChange);
+    }
+
+    return numSel;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CObjectManager::InvertSelection()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::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(AZ::Debug::ProfileCategory::Editor);
+    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)0);
+    if (selection)
+    {
+        UnselectCurrent();
+        assert(selection != 0);
+        m_currSelection = selection;
+        SelectCurrent();
+    }
+}
+
+void CObjectManager::RemoveSelection(const QString& name)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    QString selName = name;
+    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)0);
+    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(AZ::Debug::ProfileCategory::Editor);
+    for (int i = 0; i < m_currSelection->GetCount(); i++)
+    {
+        CBaseObject* obj = m_currSelection->GetObject(i);
+        if (GetIEditor()->IsUndoRecording() && !obj->IsSelected())
+        {
+            GetIEditor()->RecordUndo(new CUndoBaseObjectSelect(obj));
+        }
+
+        SetObjectSelected(obj, true);
+    }
+}
+
+void CObjectManager::UnselectCurrent()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    // Make sure to unlock selection.
+    GetIEditor()->LockSelection(false);
+
+    // Unselect all component entities as one bulk operation instead of individually
+    AzToolsFramework::EntityIdList selectedEntities;
+    EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, SetSelectedEntities, selectedEntities);
+
+    for (int i = 0; i < m_currSelection->GetCount(); i++)
+    {
+        CBaseObject* obj = m_currSelection->GetObject(i);
+        if (GetIEditor()->IsUndoRecording() && obj->IsSelected())
+        {
+            GetIEditor()->RecordUndo(new CUndoBaseObjectSelect(obj));
+        }
+
+        SetObjectSelected(obj, false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::Display(DisplayContext& dc)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    int currentHideMask = GetIEditor()->GetDisplaySettings()->GetObjectHideMask();
+    if (m_lastHideMask != currentHideMask)
+    {
+        // a setting has changed which may cause the set of currently visible objects to change, so invalidate the serial number
+        // so that viewports and anyone else that needs to update settings knows it has to.
+        m_lastHideMask = currentHideMask;
+        ++m_visibilitySerialNumber;
+    }
+
+    // the object manager itself has a visibility list, so it also has to update its cache when the serial has changed
+    if (m_visibilitySerialNumber != m_lastComputedVisibility)
+    {
+        m_lastComputedVisibility = m_visibilitySerialNumber;
+        UpdateVisibilityList();
+    }
+
+    bool viewIsDirty = dc.settings->IsDisplayHelpers(); // displaying helpers require computing all the bound boxes and things anyway.
+
+    if (!viewIsDirty)
+    {
+        if (CBaseObjectsCache* cache = dc.view->GetVisibleObjectsCache())
+        {
+            // if the current rendering viewport has an out-of-date cache serial number, it needs to be refreshed too.
+            // views set their cache empty when they indicate they need to force a refresh.
+            if ((cache->GetObjectCount() == 0) || (cache->GetSerialNumber() != m_visibilitySerialNumber))
+            {
+                viewIsDirty = true;
+            }
+        }
+    }
+
+    if (viewIsDirty)
+    {
+        FindDisplayableObjects(dc, true);  // this also actually draws the helpers.
+
+        // Also broadcast for anyone else that needs to draw global debug to do so now
+        AzFramework::DebugDisplayEventBus::Broadcast(&AzFramework::DebugDisplayEvents::DrawGlobalDebugInfo);
+    }
+
+    if (m_gizmoManager)
+    {
+        m_gizmoManager->Display(dc);
+    }
+}
+
+void CObjectManager::ForceUpdateVisibleObjectCache(DisplayContext& dc)
+{
+    FindDisplayableObjects(dc, false);
+}
+
+void CObjectManager::FindDisplayableObjects(DisplayContext& dc, [[maybe_unused]] bool bDisplay)
+{
+    // if the new IVisibilitySystem is being used, do not run this logic
+    if (ed_visibility_use)
+    {
+        return;
+    }
+
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    auto start = std::chrono::steady_clock::now();
+    CBaseObjectsCache* pDispayedViewObjects = dc.view->GetVisibleObjectsCache();
+    if (!pDispayedViewObjects)
+    {
+        return;
+    }
+
+    pDispayedViewObjects->SetSerialNumber(m_visibilitySerialNumber); // update viewport to be latest serial number
+
+    const CCamera& camera = GetIEditor()->GetSystem()->GetViewCamera();
+    AABB bbox;
+    bbox.min.zero();
+    bbox.max.zero();
+
+    pDispayedViewObjects->ClearObjects();
+    pDispayedViewObjects->Reserve(m_visibleObjects.size());
+
+    if (dc.flags & DISPLAY_2D)
+    {
+        int numVis = m_visibleObjects.size();
+        for (int i = 0; i < numVis; i++)
+        {
+            CBaseObject* obj = m_visibleObjects[i];
+
+            obj->GetBoundBox(bbox);
+            if (dc.box.IsIntersectBox(bbox))
+            {
+                pDispayedViewObjects->AddObject(obj);
+            }
+        }
+    }
+    else
+    {
+        CSelectionGroup* pSelection = GetSelection();
+        if (pSelection && pSelection->GetCount() > 1)
+        {
+            AABB mergedAABB;
+            mergedAABB.Reset();
+            for (int i = 0, iCount(pSelection->GetCount()); i < iCount; ++i)
+            {
+                CBaseObject* pObj(pSelection->GetObject(i));
+                if (pObj == NULL)
+                {
+                    continue;
+                }
+                AABB aabb;
+                pObj->GetBoundBox(aabb);
+                mergedAABB.Add(aabb);
+            }
+
+            pSelection->GetObject(0)->CBaseObject::DrawDimensions(dc, &mergedAABB);
+        }
+
+        int numVis = m_visibleObjects.size();
+        for (int i = 0; i < numVis; i++)
+        {
+            CBaseObject* obj = m_visibleObjects[i];
+
+            if (obj && obj->IsInCameraView(camera))
+            {
+                // Check if object is too far.
+                float visRatio = obj->GetCameraVisRatio(camera);
+                if (visRatio > m_maxObjectViewDistRatio || (dc.flags & DISPLAY_SELECTION_HELPERS) || obj->IsSelected())
+                {
+                    pDispayedViewObjects->AddObject(obj);
+                }
+            }
+        }
+    }
+
+    if (ed_visibility_logTiming && !ed_visibility_use)
+    {
+        auto stop = std::chrono::steady_clock::now();
+        std::chrono::duration<double> diff = stop - start;
+        AZ_Printf("Visibility", "FindDisplayableObjects (old) - Duration: %f", diff);
+    }
+}
+
+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 = 0;
+    //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(AZ::Debug::ProfileCategory::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)
+    {
+        return false;
+    }
+
+    return true;
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::DeleteSelection()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    // Make sure to unlock selection.
+    GetIEditor()->LockSelection(false);
+
+    GUID bID = GUID_NULL;
+
+    int i;
+    CSelectionGroup objects;
+    for (i = 0; i < m_currSelection->GetCount(); i++)
+    {
+        // Check condition(s) if object could be deleted
+        if (!IsObjectDeletionAllowed(m_currSelection->GetObject(i)))
+        {
+            return;
+        }
+
+        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(AZ::Debug::ProfileCategory::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(HitContext& hitInfo)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    hitInfo.object = nullptr;
+    hitInfo.dist = FLT_MAX;
+    hitInfo.axis = 0;
+    hitInfo.manipulatorMode = 0;
+
+    HitContext hcOrg = hitInfo;
+    if (hcOrg.view)
+    {
+        hcOrg.view->GetPerpendicularAxis(0, &hcOrg.b2DViewport);
+    }
+    hcOrg.rayDir = hcOrg.rayDir.GetNormalized();
+
+    HitContext hc = hcOrg;
+
+    float mindist = FLT_MAX;
+
+    if (!hitInfo.bIgnoreAxis && !hc.bUseSelectionHelpers)
+    {
+        // Test gizmos.
+        if (m_gizmoManager->HitTest(hc))
+        {
+            if (hc.axis != 0)
+            {
+                hitInfo.object = hc.object;
+                hitInfo.gizmo = hc.gizmo;
+                hitInfo.axis = hc.axis;
+                hitInfo.manipulatorMode = hc.manipulatorMode;
+                hitInfo.dist = hc.dist;
+                return true;
+            }
+        }
+    }
+
+    if (hitInfo.bOnlyGizmo)
+    {
+        return false;
+    }
+
+    // Only HitTest objects, that where previously Displayed.
+    CBaseObjectsCache* pDispayedViewObjects = hitInfo.view->GetVisibleObjectsCache();
+
+    const bool iconsPrioritized = true; // Force icons to always be prioritized over other things you hit. Can change to be a configurable option in the future.
+
+    CBaseObject* selected = 0;
+    const char* name = nullptr;
+    bool iconHit = false;
+    int numVis = pDispayedViewObjects->GetObjectCount();
+    for (int i = 0; i < numVis; i++)
+    {
+        CBaseObject* obj = pDispayedViewObjects->GetObject(i);
+
+        if (obj == hitInfo.pExcludedObject)
+        {
+            continue;
+        }
+
+        if (HitTestObject(obj, hc))
+        {
+            if (m_selectCallback && !m_selectCallback->CanSelectObject(obj))
+            {
+                continue;
+            }
+
+            // Check if this object is nearest.
+            if (hc.axis != 0)
+            {
+                hitInfo.object = obj;
+                hitInfo.axis = hc.axis;
+                hitInfo.dist = hc.dist;
+                return true;
+            }
+
+            // When prioritizing icons, we don't allow non-icon hits to beat icon hits
+            if (iconsPrioritized && iconHit && !hc.iconHit)
+            {
+                continue;
+            }
+
+            if (hc.dist < mindist || (!iconHit && hc.iconHit))
+            {
+                if (hc.iconHit)
+                {
+                    iconHit = true;
+                }
+
+                mindist = hc.dist;
+                name = hc.name;
+                selected = obj;
+            }
+
+            // Clear the object pointer if an object was hit, not just if the collision
+            // was closer than any previous. Not all paths from HitTestObject set the object pointer and so you could get
+            // an object from a previous (rejected) result but with collision information about a closer hit.
+            hc.object = nullptr;
+            hc.iconHit = false;
+
+            // If use deep selection
+            if (hitInfo.pDeepSelection)
+            {
+                hitInfo.pDeepSelection->AddObject(hc.dist, obj);
+            }
+        }
+    }
+
+    if (selected)
+    {
+        hitInfo.object = selected;
+        hitInfo.dist = mindist;
+        hitInfo.name = name;
+        hitInfo.iconHit = iconHit;
+        return true;
+    }
+    return false;
+}
+void CObjectManager::FindObjectsInRect(CViewport* view, const QRect& rect, std::vector<GUID>& guids)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    if (rect.width() < 1 || rect.height() < 1)
+    {
+        return;
+    }
+
+    HitContext hc;
+    hc.view = view;
+    hc.b2DViewport = view->GetType() != ET_ViewportCamera;
+    hc.rect = rect;
+    hc.bUseSelectionHelpers = view->GetAdvancedSelectModeFlag();
+
+    guids.clear();
+
+    CBaseObjectsCache* pDispayedViewObjects = view->GetVisibleObjectsCache();
+
+    int numVis = pDispayedViewObjects->GetObjectCount();
+    for (int i = 0; i < numVis; ++i)
+    {
+        CBaseObject* pObj = pDispayedViewObjects->GetObject(i);
+
+        HitTestObjectAgainstRect(pObj, view, hc, guids);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    // Ignore too small rectangles.
+    if (rect.width() < 1 || rect.height() < 1)
+    {
+        return;
+    }
+
+    CUndo undo("Select Object(s)");
+
+    HitContext hc;
+    hc.view = view;
+    hc.b2DViewport = view->GetType() != ET_ViewportCamera;
+    hc.rect = rect;
+    hc.bUseSelectionHelpers = view->GetAdvancedSelectModeFlag();
+
+    bool isUndoRecording = GetIEditor()->IsUndoRecording();
+    if (isUndoRecording)
+    {
+        m_processingBulkSelect = true;
+    }
+
+    CBaseObjectsCache* displayedViewObjects = view->GetVisibleObjectsCache();
+    int numVis = displayedViewObjects->GetObjectCount();
+
+    // Tracking the previous selection allows proper undo/redo functionality of additional
+    // selections (CTRL + drag select)
+    AZStd::unordered_set<const CBaseObject*> previousSelection;
+
+    for (int i = 0; i < numVis; ++i)
+    {
+        CBaseObject* object = displayedViewObjects->GetObject(i);
+
+        if (object->IsSelected())
+        {
+            previousSelection.insert(object);
+        }
+        else
+        {
+            // This will update m_currSelection
+            SelectObjectInRect(object, view, hc, bSelect);
+
+            // Legacy undo/redo does not go through the Ebus system and must be done individually
+            if (isUndoRecording && object->GetType() != OBJTYPE_AZENTITY)
+            {
+                GetIEditor()->RecordUndo(new CUndoBaseObjectSelect(object, true));
+            }
+        }
+    }
+
+    if (isUndoRecording && m_currSelection)
+    {
+        // Component Entities can handle undo/redo in bulk due to Ebuses
+        GetIEditor()->RecordUndo(new CUndoBaseObjectBulkSelect(previousSelection, *m_currSelection));
+    }
+
+    m_processingBulkSelect = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+uint16 FindPossibleObjectNameNumber(std::set<uint16>& numberSet)
+{
+    const int LIMIT = 65535;
+    size_t nSetSize = numberSet.size();
+    for (uint16 i = 1; i < LIMIT; ++i)
+    {
+        uint16 candidateNumber = (i + nSetSize) % LIMIT;
+        if (numberSet.find(candidateNumber) == numberSet.end())
+        {
+            numberSet.insert(candidateNumber);
+            return candidateNumber;
+        }
+    }
+    return 0;
+}
+
+void CObjectManager::RegisterObjectName(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 iNameNumber = m_nameNumbersMap.find(typeName);
+    if (iNameNumber == m_nameNumbersMap.end())
+    {
+        std::set<uint16> numberSet;
+        numberSet.insert(num);
+        m_nameNumbersMap[typeName] = numberSet;
+    }
+    else
+    {
+        std::set<uint16>& numberSet = iNameNumber->second;
+        numberSet.insert(num);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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)
+    {
+        typeName.remove(0, subIndex + 2);
+    }
+
+    // Remove all numbers from the end of typename.
+    int len = typeName.length();
+    while (len > 0 && typeName[len - 1].isDigit())
+    {
+        len--;
+    }
+
+    typeName = typeName.left(len);
+
+    NameNumbersMap::iterator ii = m_nameNumbersMap.find(typeName);
+    uint16 lastNumber = 1;
+    if (ii != m_nameNumbersMap.end())
+    {
+        lastNumber = FindPossibleObjectNameNumber(ii->second);
+    }
+    else
+    {
+        std::set<uint16> numberSet;
+        numberSet.insert(lastNumber);
+        m_nameNumbersMap[typeName] = numberSet;
+    }
+
+    QString str = QStringLiteral("%1%2").arg(typeName).arg(lastNumber);
+
+    return str;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CObjectManager::EnableUniqObjectNames(bool bEnable)
+{
+    bool bPrev = m_bGenUniqObjectNames;
+    m_bGenUniqObjectNames = bEnable;
+    return bPrev;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CObjectClassDesc* CObjectManager::FindClass(const QString& className)
+{
+    IClassDesc* cls = CClassFactory::Instance()->FindClass(className.toUtf8().data());
+    if (cls != NULL && cls->SystemClassID() == ESYSTEM_CLASS_OBJECT)
+    {
+        return (CObjectClassDesc*)cls;
+    }
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+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(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)
+{
+    QString typeName = templ->getTag();
+    QString superTypeName;
+    if (!templ->getAttr("SuperType", superTypeName))
+    {
+        return;
+    }
+
+    CObjectClassDesc* superType = FindClass(superTypeName);
+    if (!superType)
+    {
+        return;
+    }
+
+    QString category, fileSpec, initialName;
+    templ->getAttr("Category", category);
+    templ->getAttr("File", fileSpec);
+    templ->getAttr("Name", initialName);
+
+    CXMLObjectClassDesc* classDesc = new CXMLObjectClassDesc;
+    classDesc->superType = superType;
+    classDesc->type = typeName;
+    classDesc->category = category;
+    classDesc->fileSpec = fileSpec;
+    classDesc->guid = AZ::Uuid::CreateRandom();
+
+    CClassFactory::Instance()->RegisterClass(classDesc);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::LoadClassTemplates(const QString& path)
+{
+    QString dir = Path::AddPathSlash(path);
+
+    IFileUtil::FileArray files;
+    CFileUtil::ScanDirectory(dir, "*.xml", files, false);
+
+    for (int k = 0; k < files.size(); k++)
+    {
+        // Construct the full filepath of the current file
+        XmlNodeRef node = XmlHelpers::LoadXmlFromFile((dir + files[k].filename).toUtf8().data());
+        if (node != 0 && node->isTag("ObjectTemplates"))
+        {
+            QString name;
+            for (int i = 0; i < node->getChildCount(); i++)
+            {
+                RegisterClassTemplate(node->getChild(i));
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::RegisterCVars()
+{
+    REGISTER_CVAR2("AxisHelperHitRadius",
+        &m_axisHelperHitRadius,
+        20,
+        VF_DEV_ONLY,
+        "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()
+{
+    if (m_isUpdateVisibilityList)
+    {
+        return;
+    }
+    ++m_visibilitySerialNumber;
+    m_visibleObjects.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::UpdateVisibilityList()
+{
+    m_isUpdateVisibilityList = true;
+    m_visibleObjects.clear();
+
+    bool isInIsolationMode = false;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+        isInIsolationMode, &AzToolsFramework::ToolsApplicationRequestBus::Events::IsEditorInIsolationMode);
+
+    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
+    {
+        CBaseObject* obj = it->second;
+        bool visible = obj->IsPotentiallyVisible();
+
+        // entities not isolated in Isolation Mode will be invisible
+        bool isObjectIsolated = obj->IsIsolated();
+        visible = visible && (!isInIsolationMode || isObjectIsolated);
+        obj->UpdateVisibility(visible);
+
+        // when the new viewport interaction model is enabled we always want to add objects
+        // in the view (frustum) to the visible objects list so we can draw feedback for
+        // entities being hidden in the viewport when selected in the  entity outliner
+        // (EditorVisibleEntityDataCache must be populated even if entities are 'hidden')
+        m_visibleObjects.push_back(obj);
+    }
+
+    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)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    // Only select/unselect once.
+    if ((pObject->IsSelected() && bSelect) || (!pObject->IsSelected() && !bSelect))
+    {
+        return;
+    }
+
+    // Store selection undo.
+    if (CUndo::IsRecording() && !m_processingBulkSelect)
+    {
+        CUndo::Record(new CUndoBaseObjectSelect(pObject));
+    }
+
+    pObject->SetSelected(bSelect);
+    m_bSelectionChanged = true;
+
+
+    if (bSelect && !GetIEditor()->GetTransformManipulator())
+    {
+        if (CAxisGizmo::GetGlobalAxisGizmoCount() < gSettings.gizmo.axisGizmoMaxCount)
+        {
+            // Create axis gizmo for this object.
+            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 = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CObjectManager::GatherUsedResources(CUsedResources& resources)
+{
+    CBaseObjectsArray objects;
+    GetIEditor()->GetObjectManager()->GetObjects(objects);
+
+    for (int i = 0; i < objects.size(); i++)
+    {
+        CBaseObject* pObject = objects[i];
+        pObject->GatherUsedResources(resources);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+IGizmoManager* CObjectManager::GetGizmoManager()
+{
+    return m_gizmoManager;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CObjectManager::IsLightClass(CBaseObject* pObject)
+{
+    if (qobject_cast<CEntityObject*>(pObject))
+    {
+        CEntityObject* pEntity = (CEntityObject*)pObject;
+        if (pEntity)
+        {
+            if (pEntity->GetEntityClass().compare(CLASS_LIGHT) == 0)
+            {
+                return TRUE;
+            }
+            if (pEntity->GetEntityClass().compare(CLASS_RIGIDBODY_LIGHT) == 0)
+            {
+                return TRUE;
+            }
+            if (pEntity->GetEntityClass().compare(CLASS_DESTROYABLE_LIGHT) == 0)
+            {
+                return TRUE;
+            }
+        }
+    }
+
+    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);
+        }
+    }
+}
+
+void CObjectManager::EnteredComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
+{
+    // hide current gizmo for entity (translate/rotate/scale)
+    IGizmoManager* gizmoManager = GetGizmoManager();
+    const size_t gizmoCount = static_cast<size_t>(gizmoManager->GetGizmoCount());
+    for (size_t i = 0; i < gizmoCount; ++i)
+    {
+        gizmoManager->RemoveGizmo(gizmoManager->GetGizmoByIndex(i));
+    }
+}
+
+void CObjectManager::LeftComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
+{
+    // show translate/rotate/scale gizmo again
+    if (IGizmoManager* gizmoManager = GetGizmoManager())
+    {
+        if (CBaseObject* selectedObject = GetIEditor()->GetSelectedObject())
+        {
+            gizmoManager->AddGizmo(new CAxisGizmo(selectedObject));
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+namespace
+{
+    AZStd::vector<AZStd::string> PyGetAllObjects()
+    {
+        IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
+        CBaseObjectsArray objects;
+        pObjMgr->GetObjects(objects);
+        int count = pObjMgr->GetObjectCount();
+        AZStd::vector<AZStd::string> result;
+        for (int i = 0; i < count; ++i)
+        {
+            result.push_back(objects[i]->GetName().toUtf8().data());
+        }
+
+        return result;
+    }
+
+    AZStd::vector<AZStd::string> PyGetNamesOfSelectedObjects()
+    {
+        CSelectionGroup* pSel = GetIEditor()->GetSelection();
+        AZStd::vector<AZStd::string> result;
+        const int selectionCount = pSel->GetCount();
+        result.reserve(selectionCount);
+
+        for (int i = 0; i < selectionCount; i++)
+        {
+            result.push_back(pSel->GetObject(i)->GetName().toUtf8().data());
+        }
+
+        return result;
+    }
+
+    void PySelectObject(const char* objName)
+    {
+        CUndo undo("Select Object");
+
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
+        if (pObject)
+        {
+            GetIEditor()->GetObjectManager()->SelectObject(pObject);
+        }
+    }
+
+    void PyUnselectObjects(const AZStd::vector<AZStd::string>& names)
+    {
+        CUndo undo("Unselect Objects");
+
+        std::vector<CBaseObject*> pBaseObjects;
+        for (int i = 0; i < names.size(); i++)
+        {
+            if (!GetIEditor()->GetObjectManager()->FindObject(names[i].c_str()))
+            {
+                throw std::logic_error((QString("\"") + names[i].c_str() + "\" is an invalid entity.").toUtf8().data());
+            }
+            pBaseObjects.push_back(GetIEditor()->GetObjectManager()->FindObject(names[i].c_str()));
+        }
+
+        for (int i = 0; i < pBaseObjects.size(); i++)
+        {
+            GetIEditor()->GetObjectManager()->UnselectObject(pBaseObjects[i]);
+        }
+    }
+
+    void PySelectObjects(const AZStd::vector<AZStd::string>& names)
+    {
+        CUndo undo("Select Objects");
+        CBaseObject* pObject;
+        for (size_t i = 0; i < names.size(); ++i)
+        {
+            pObject = GetIEditor()->GetObjectManager()->FindObject(names[i].c_str());
+            if (!pObject)
+            {
+                throw std::logic_error((QString("\"") + names[i].c_str() + "\" is an invalid entity.").toUtf8().data());
+            }
+            GetIEditor()->GetObjectManager()->SelectObject(pObject);
+        }
+    }
+
+    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");
+
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
+        if (pObject)
+        {
+            GetIEditor()->GetObjectManager()->DeleteObject(pObject);
+        }
+    }
+
+    int PyClearSelection()
+    {
+        CUndo undo("Clear Selection");
+        return GetIEditor()->GetObjectManager()->ClearSelection();
+    }
+
+    void PyDeleteSelected()
+    {
+        CUndo undo("Delete Selected Object");
+        GetIEditor()->GetObjectManager()->DeleteSelection();
+    }
+
+    int PyGetNumSelectedObjects()
+    {
+        if (CSelectionGroup* pGroup = GetIEditor()->GetObjectManager()->GetSelection())
+        {
+            return pGroup->GetCount();
+        }
+
+        return 0;
+    }
+
+    AZ::Vector3 PyGetSelectionCenter()
+    {
+        if (CSelectionGroup* pGroup = GetIEditor()->GetObjectManager()->GetSelection())
+        {
+            if (pGroup->GetCount() == 0)
+            {
+                throw std::runtime_error("Nothing selected");
+            }
+
+            const Vec3 center = pGroup->GetCenter();
+            return AZ::Vector3(center.x, center.y, center.z);
+        }
+
+        throw std::runtime_error("Nothing selected");
+    }
+
+    AZ::Aabb PyGetSelectionAABB()
+    {
+        if (CSelectionGroup* pGroup = GetIEditor()->GetObjectManager()->GetSelection())
+        {
+            if (pGroup->GetCount() == 0)
+            {
+                throw std::runtime_error("Nothing selected");
+            }
+
+            const AABB aabb = pGroup->GetBounds();
+            AZ::Aabb result;
+            result.Set(
+                AZ::Vector3(
+                    aabb.min.x,
+                    aabb.min.y,
+                    aabb.min.z
+                ),
+                AZ::Vector3(
+                    aabb.max.x,
+                    aabb.max.y,
+                    aabb.max.z
+                )
+            );
+            return result;
+        }
+
+        throw std::runtime_error("Nothing selected");
+    }
+
+    AZ::Vector3 PyGetObjectPosition(const char* pName)
+    {
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
+        if (!pObject)
+        {
+            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
+        }
+        Vec3 position = pObject->GetPos();
+        return AZ::Vector3(position.x, position.y, position.z);
+    }
+
+    AZ::Vector3 PyGetWorldObjectPosition(const char* pName)
+    {
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
+        if (!pObject)
+        {
+            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
+        }
+        Vec3 position = pObject->GetWorldPos();
+        return AZ::Vector3(position.x, position.y, position.z);
+    }
+
+    void PySetObjectPosition(const char* pName, float fValueX, float fValueY, float fValueZ)
+    {
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
+        if (!pObject)
+        {
+            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
+        }
+        CUndo undo("Set Object Base Position");
+        pObject->SetPos(Vec3(fValueX, fValueY, fValueZ));
+    }
+
+    AZ::Vector3 PyGetObjectRotation(const char* pName)
+    {
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
+        if (!pObject)
+        {
+            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
+        }
+        Ang3 ang = RAD2DEG(Ang3(pObject->GetRotation()));
+        return AZ::Vector3(ang.x, ang.y, ang.z);
+    }
+
+    void PySetObjectRotation(const char* pName, float fValueX, float fValueY, float fValueZ)
+    {
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
+        if (!pObject)
+        {
+            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
+        }
+        CUndo undo("Set Object Rotation");
+        pObject->SetRotation(Quat(DEG2RAD(Ang3(fValueX, fValueY, fValueZ))));
+    }
+
+    AZ::Vector3 PyGetObjectScale(const char* pName)
+    {
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
+        if (!pObject)
+        {
+            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
+        }
+        Vec3 scaleVec3 = pObject->GetScale();
+        return AZ::Vector3(scaleVec3.x, scaleVec3.y, scaleVec3.z);
+    }
+
+    void PySetObjectScale(const char* pName, float fValueX, float fValueY, float fValueZ)
+    {
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
+        if (!pObject)
+        {
+            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
+        }
+        CUndo undo("Set Object Scale");
+        pObject->SetScale(Vec3(fValueX, fValueY, fValueZ));
+    }
+
+    void PyRenameObject(const char* pOldName, const char* pNewName)
+    {
+        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pOldName);
+        if (!pObject)
+        {
+            throw std::runtime_error("Could not find object");
+        }
+
+        if (strcmp(pNewName, "") == 0 || GetIEditor()->GetObjectManager()->FindObject(pNewName))
+        {
+            throw std::runtime_error("Invalid object name.");
+        }
+
+        CUndo undo("Rename object");
+        pObject->SetName(pNewName);
+    }
+}
+
+namespace AzToolsFramework
+{
+    void ObjectManagerFuncsHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            // this will put these methods into the 'azlmbr.legacy.general' module
+            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
+            };
+            addLegacyGeneral(behaviorContext->Method("get_all_objects", PyGetAllObjects, nullptr, "Gets the list of names of all objects in the whole level."));
+            addLegacyGeneral(behaviorContext->Method("get_names_of_selected_objects", PyGetNamesOfSelectedObjects, nullptr, "Get the name from selected object/objects."));
+
+            addLegacyGeneral(behaviorContext->Method("select_object", PySelectObject, nullptr, "Selects a specified object."));
+            addLegacyGeneral(behaviorContext->Method("unselect_objects", PyUnselectObjects, nullptr, "Unselects a list of objects."));
+            addLegacyGeneral(behaviorContext->Method("select_objects", PySelectObjects, nullptr, "Selects a list of objects."));
+            addLegacyGeneral(behaviorContext->Method("get_num_selected", PyGetNumSelectedObjects, nullptr, "Returns the number of selected objects."));
+            addLegacyGeneral(behaviorContext->Method("clear_selection", PyClearSelection, nullptr, "Clears selection."));
+
+            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)."));
+
+            addLegacyGeneral(behaviorContext->Method("get_position", PyGetObjectPosition, nullptr, "Gets the position of an object."));
+            addLegacyGeneral(behaviorContext->Method("set_position", PySetObjectPosition, nullptr, "Sets the position of an object."));
+
+            addLegacyGeneral(behaviorContext->Method("get_rotation", PyGetObjectRotation, nullptr, "Gets the rotation of an object."));
+            addLegacyGeneral(behaviorContext->Method("set_rotation", PySetObjectRotation, nullptr, "Sets the rotation of an object."));
+
+            addLegacyGeneral(behaviorContext->Method("get_scale", PyGetObjectScale, nullptr, "Gets the scale of an object."));
+            addLegacyGeneral(behaviorContext->Method("set_scale", PySetObjectScale, nullptr, "Sets the scale of an object."));
+
+            addLegacyGeneral(behaviorContext->Method("rename_object", PyRenameObject, nullptr, "Renames object with oldObjectName to newObjectName."));
+
+
+        }
+    }
+}
+
+
diff --git a/Code/Editor/Objects/ObjectManager.h b/Code/Editor/Objects/ObjectManager.h
new file mode 100644
index 0000000000..a82741e532
--- /dev/null
+++ b/Code/Editor/Objects/ObjectManager.h
@@ -0,0 +1,468 @@
+/*
+ * 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 : ObjectManager definition.
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
+#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
+#pragma once
+
+#include "IObjectManager.h"
+#include "BaseObject.h"
+#include "SelectionGroup.h"
+#include "ObjectManagerEventBus.h"
+
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
+#include <AzCore/EBus/EBus.h>
+#include <Include/SandboxAPI.h>
+
+// forward declarations.
+class CGizmoManager;
+class CEntityObject;
+class CObjectArchive;
+class CObjectClassDesc;
+class CWaitProgress;
+
+enum class ImageRotationDegrees;
+
+//////////////////////////////////////////////////////////////////////////
+// Helper class to signal when we are exporting a level to game
+//////////////////////////////////////////////////////////////////////////
+class CObjectManagerLevelIsExporting
+{
+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);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Array of editor objects.
+//////////////////////////////////////////////////////////////////////////
+class CBaseObjectsCache
+{
+public:
+    int GetObjectCount() const { return m_objects.size(); }
+    CBaseObject* GetObject(int nIndex) const { return m_objects[nIndex]; }
+    void AddObject(CBaseObject* object);
+
+    void ClearObjects()
+    {
+        m_objects.clear();
+        m_entityIds.clear();
+    }
+
+    void Reserve(int nCount)
+    {
+        m_objects.reserve(nCount);
+        m_entityIds.reserve(nCount);
+    }
+
+    const AZStd::vector<AZ::EntityId>& GetEntityIdCache() const { return m_entityIds; }
+
+    /// Checksum is used as a dirty flag.
+    unsigned int GetSerialNumber() { return m_serialNumber; }
+    void SetSerialNumber(unsigned int serialNumber) { m_serialNumber = serialNumber; }
+private:
+    //! List of objects that was displayed at last frame.
+    std::vector<_smart_ptr<CBaseObject> > m_objects;
+    AZStd::vector<AZ::EntityId> m_entityIds;
+    unsigned int m_serialNumber = 0;
+};
+
+/*!
+ *  CObjectManager is a singleton object that
+ *  manages global set of objects in level.
+ */
+class CObjectManager
+    : public IObjectManager
+    , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
+{
+public:
+    //! Selection functor callback.
+    //! Callback function must return a boolean value.
+    //! Return true if selection should proceed, or false to abort object selection.
+    CObjectManager();
+    ~CObjectManager();
+
+    void RegisterObjectClasses();
+
+    CBaseObject* NewObject(CObjectClassDesc* cls, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr);
+    CBaseObject* NewObject(const QString& typeName, CBaseObject* prev = 0, const QString& file = "", const char* newEntityName = nullptr);
+
+    void    DeleteObject(CBaseObject* obj);
+    void    DeleteSelection(CSelectionGroup* pSelection);
+    void    DeleteAllObjects();
+    CBaseObject* CloneObject(CBaseObject* obj);
+
+    void BeginEditParams(CBaseObject* obj, int flags);
+    void EndEditParams(int flags = 0);
+    // Hides all transform manipulators.
+    void HideTransformManipulators();
+
+    //! Get number of objects manager by ObjectManager (not contain sub objects of groups).
+    int     GetObjectCount() const;
+
+    //! Get array of objects, managed by manager (not contain sub objects of groups).
+    //! @param layer if 0 get objects for all layers, or layer to get objects from.
+    void GetObjects(CBaseObjectsArray& objects) const;
+    void GetObjects(DynArray<CBaseObject*>& objects) const;
+
+    //! 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;
+
+    //! Update objects.
+    void    Update();
+
+    //! Display objects on display context.
+    void    Display(DisplayContext& dc);
+
+    //! 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);
+
+    //! 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);
+
+    //! Check intersection with an object.
+    //! @return true if hit, and fills hitInfo structure.
+    bool HitTestObject(CBaseObject* obj, HitContext& hc);
+
+    //! Send event to all objects.
+    //! Will cause OnEvent handler to be called on all objects.
+    void    SendEvent(ObjectEvent event);
+
+    //! Send event to all objects within given bounding box.
+    //! Will cause OnEvent handler to be called on objects within bounding box.
+    void    SendEvent(ObjectEvent event, const AABB& bounds);
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find object by ID.
+    CBaseObject* FindObject(REFGUID guid) const;
+    //////////////////////////////////////////////////////////////////////////
+    //! Find object by name.
+    CBaseObject* FindObject(const QString& sName) const;
+    //////////////////////////////////////////////////////////////////////////
+    //! Find objects of given type.
+    void FindObjectsOfType(const QMetaObject* pClass, std::vector<CBaseObject*>& result) override;
+    void FindObjectsOfType(ObjectType type, std::vector<CBaseObject*>& result) override;
+    //////////////////////////////////////////////////////////////////////////
+    //! Find objects which intersect with a given AABB.
+    virtual void FindObjectsInAABB(const AABB& aabb, std::vector<CBaseObject*>& result) const;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Operations on objects.
+    //////////////////////////////////////////////////////////////////////////
+    //! Makes object visible or invisible.
+    void HideObject(CBaseObject* obj, bool hide);
+    //! Shows the last hidden object based on hidden ID
+    void ShowLastHiddenObject();
+    //! Freeze object, making it unselectable.
+    void FreezeObject(CBaseObject* obj, bool freeze);
+    //! Unhide all hidden objects.
+    void UnhideAll();
+    //! Unfreeze all frozen objects.
+    void UnfreezeAll();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Object Selection.
+    //////////////////////////////////////////////////////////////////////////
+    bool    SelectObject(CBaseObject* obj, bool bUseMask = true);
+    void    UnselectObject(CBaseObject* obj);
+
+    //! Select objects within specified distance from given position.
+    //! Return number of selected objects.
+    int SelectObjects(const AABB& box, bool bUnselect = false);
+
+    virtual void SelectEntities(std::set<CEntityObject*>& s);
+
+    int MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, bool bIsCopy = false);
+
+    //! Selects/Unselects all objects within 2d rectangle in given viewport.
+    void SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect);
+    void FindObjectsInRect(CViewport* view, const QRect& rect, std::vector<GUID>& guids);
+
+    //! Clear default selection set.
+    //! @Return number of objects removed from selection.
+    int ClearSelection();
+
+    //! Deselect all current selected objects and selects object that were unselected.
+    //! @Return number of selected objects.
+    int InvertSelection();
+
+    //! Get current selection.
+    CSelectionGroup*    GetSelection() const { return m_currSelection; };
+    //! Get named selection.
+    CSelectionGroup*    GetSelection(const QString& name) const;
+    // Get selection group names
+    void GetNameSelectionStrings(QStringList& names);
+    //! Change name of current selection group.
+    //! And store it in list.
+    void    NameSelection(const QString& name);
+    //! Set one of name selections as current selection.
+    void    SetSelection(const QString& name);
+    void    RemoveSelection(const QString& name);
+
+    bool IsObjectDeletionAllowed(CBaseObject* pObject);
+
+    //! Delete all objects in selection group.
+    void DeleteSelection();
+
+    uint32  ForceID() const{return m_ForceID; }
+    void    ForceID(uint32 FID){m_ForceID = FID; }
+
+    //! Generates uniq name base on type name of object.
+    QString GenerateUniqueObjectName(const QString& typeName);
+    //! Register object name in object manager, needed for generating uniq names.
+    void RegisterObjectName(const QString& name);
+    //! 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);
+
+    //! Register XML template of runtime class.
+    void    RegisterClassTemplate(const XmlNodeRef& templ);
+    //! Load class templates for specified directory,
+    void    LoadClassTemplates(const QString& path);
+
+    //! Registers the ObjectManager's console variables.
+    void RegisterCVars();
+
+    //! Find object class by name.
+    CObjectClassDesc* FindClass(const QString& className);
+    void    GetClassCategories(QStringList& categories);
+    void    GetClassCategoryToolClassNamePairs(std::vector< std::pair<QString, QString> >& categoryToolClassNamePairs) override;
+    void    GetClassTypes(const QString& category, QStringList& types);
+
+    //! 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);
+    void    ExportEntities(XmlNodeRef& rootNode);
+
+    //! 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);
+
+    void SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading);
+
+    //! Load objects from object archive.
+    //! @param bSelect if set newly loaded object will be selected.
+    void LoadObjects(CObjectArchive& ar, bool bSelect);
+
+    //! 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);
+    bool IsDuplicateObjectName(const QString& newName) const
+    {
+        return FindObject(newName) ? true : false;
+    }
+    void ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const;
+    void ChangeObjectName(CBaseObject* obj, const QString& newName);
+
+    //! Convert object of one type to object of another type.
+    //! Original object is deleted.
+    bool ConvertToType(CBaseObject* pObject, const QString& typeName);
+
+    //! Set new selection callback.
+    //! @return previous selection callback.
+    IObjectSelectCallback* SetSelectCallback(IObjectSelectCallback* callback);
+
+    // Enables/Disables creating of game objects.
+    void SetCreateGameObject(bool enable) { m_createGameObjects = enable; };
+    //! Return true if objects loaded from xml should immidiatly create game objects associated with them.
+    bool IsCreateGameObjects() const { return m_createGameObjects; };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Get access to gizmo manager.
+    IGizmoManager* GetGizmoManager();
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Invalidate visibily settings of objects.
+    void InvalidateVisibleList();
+
+    //////////////////////////////////////////////////////////////////////////
+    // ObjectManager notification Callbacks.
+    //////////////////////////////////////////////////////////////////////////
+    void AddObjectEventListener(EventListener* listener);
+    void RemoveObjectEventListener(EventListener* listener);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Used to indicate starting and ending of objects loading.
+    //////////////////////////////////////////////////////////////////////////
+    void StartObjectsLoading(int numObjects);
+    void EndObjectsLoading();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Gathers all resources used by all objects.
+    void GatherUsedResources(CUsedResources& resources);
+
+    virtual bool IsLightClass(CBaseObject* pObject);
+
+    virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue);
+    virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue);
+
+    bool IsReloading() const { 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:
+    friend CObjectArchive;
+    friend class CBaseObject;
+    /** Creates and serialize object from xml node.
+    @param objectNode Xml node to serialize object info from.
+    @param pUndoObject Pointer to deleted object for undo.
+    */
+    CBaseObject* NewObject(CObjectArchive& archive, CBaseObject* pUndoObject, bool bMakeNewId);
+
+    //! Update visibility of all objects.
+    void UpdateVisibilityList();
+    //! Get array of all objects in manager.
+    void GetAllObjects(TBaseObjects& objects) const;
+
+    void UnselectCurrent();
+    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);
+
+    // EditorComponentModeNotificationBus
+    void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
+    void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
+
+private:
+    typedef std::map<GUID, CBaseObjectPtr, guid_less_predicate> Objects;
+    Objects m_objects;
+    typedef std::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;
+
+    // this number changes whenever visibility is invalidated.  Viewports can use it to keep track of whether they need to recompute object
+    // visibility.
+    unsigned int m_visibilitySerialNumber = 1;
+    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
+    bool m_processingBulkSelect = false;
+
+    //! 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;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Numbering for names.
+    //////////////////////////////////////////////////////////////////////////
+    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;
+
+    bool m_isUpdateVisibilityList;
+
+    uint64 m_currentHideCount;
+
+    bool m_bInReloading;
+    bool m_bSkipObjectUpdate;
+    bool m_bLevelExporting;
+
+    int m_axisHelperHitRadius = 20;
+};
+
+namespace AzToolsFramework
+{
+    //! A component to reflect scriptable commands for the Editor
+    class ObjectManagerFuncsHandler
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(ObjectManagerFuncsHandler, "{D79B69EE-A2CC-43C0-AA5C-47DCFCCBC955}")
+
+        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+    };
+
+} // namespace AzToolsFramework
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
diff --git a/Code/Editor/Objects/ObjectManagerEventBus.h b/Code/Editor/Objects/ObjectManagerEventBus.h
new file mode 100644
index 0000000000..eba6fbde93
--- /dev/null
+++ b/Code/Editor/Objects/ObjectManagerEventBus.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H
+#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+//////////////////////////////////////////////////////////////////////////
+// EBus to handle object manager events
+//////////////////////////////////////////////////////////////////////////
+namespace AZ
+{
+    class ObjectManagerEvents
+        : public AZ::EBusTraits
+    {
+    public:
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+
+        virtual ~ObjectManagerEvents() = default;
+
+        virtual void OnExportingStarting() {}
+        virtual void OnExportingFinished() {}
+    };
+
+    using ObjectManagerEventBus = AZ::EBus<ObjectManagerEvents>;
+}
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H
diff --git a/Code/Editor/Objects/ObjectManagerLegacyUndo.cpp b/Code/Editor/Objects/ObjectManagerLegacyUndo.cpp
new file mode 100644
index 0000000000..920bd74b04
--- /dev/null
+++ b/Code/Editor/Objects/ObjectManagerLegacyUndo.cpp
@@ -0,0 +1,277 @@
+/*
+ * 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 "ObjectManagerLegacyUndo.h"
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+
+// Editor
+#include "Include/IObjectManager.h"
+#include "Objects/BaseObject.h"
+#include "Objects/ObjectLoader.h"
+#include "Objects/SelectionGroup.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// CUndoBaseObjectNew implementation.
+//////////////////////////////////////////////////////////////////////////
+
+CUndoBaseObjectNew::CUndoBaseObjectNew(CBaseObject* object)
+{
+    m_object = object;
+}
+
+void CUndoBaseObjectNew::Undo(bool bUndo)
+{
+    if (bUndo)
+    {
+        m_redo = XmlHelpers::CreateXmlNode("Redo");
+        // Save current object state.
+        CObjectArchive ar(GetIEditor()->GetObjectManager(), m_redo, false);
+        ar.bUndo = true;
+        m_object->Serialize(ar);
+    }
+
+    // Delete this object.
+    GetIEditor()->DeleteObject(m_object);
+}
+
+void CUndoBaseObjectNew::Redo()
+{
+    if (!m_redo)
+    {
+        return;
+    }
+
+    IObjectManager* objectManager = GetIEditor()->GetObjectManager();
+    {
+        CObjectArchive ar(objectManager, m_redo, true);
+        ar.bUndo = true;
+        ar.MakeNewIds(false);
+        ar.LoadObject(m_redo, m_object);
+    }
+
+    objectManager->ClearSelection();
+    objectManager->SelectObject(m_object);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CUndoBaseObjectDelete implementation.
+//////////////////////////////////////////////////////////////////////////
+
+CUndoBaseObjectDelete::CUndoBaseObjectDelete(CBaseObject* object)
+{
+    AZ_Assert(object, "Object does not exist");
+    object->SetTransformDelegate(nullptr);
+    m_object = object;
+
+    // Save current object state.
+    m_undo = XmlHelpers::CreateXmlNode("Undo");
+    CObjectArchive ar(GetIEditor()->GetObjectManager(), m_undo, false);
+    ar.bUndo = true;
+    m_bSelected = m_object->IsSelected();
+    m_object->Serialize(ar);
+}
+
+void CUndoBaseObjectDelete::Undo([[maybe_unused]] bool bUndo)
+{
+    IObjectManager* objectManager = GetIEditor()->GetObjectManager();
+    {
+        CObjectArchive ar(objectManager, m_undo, true);
+        ar.bUndo = true;
+        ar.MakeNewIds(false);
+        ar.LoadObject(m_undo, m_object);
+        m_object->ClearFlags(OBJFLAG_SELECTED);
+    }
+
+    if (m_bSelected)
+    {
+        objectManager->ClearSelection();
+        objectManager->SelectObject(m_object);
+    }
+}
+
+void CUndoBaseObjectDelete::Redo()
+{
+    // Delete this object.
+    GetIEditor()->DeleteObject(m_object);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CUndoBaseObjectSelect implementation.
+//////////////////////////////////////////////////////////////////////////
+
+CUndoBaseObjectSelect::CUndoBaseObjectSelect(CBaseObject* object)
+{
+    AZ_Assert(object, "Object does not exist");
+    m_guid = object->GetId();
+    m_bUndoSelect = object->IsSelected();
+}
+
+CUndoBaseObjectSelect::CUndoBaseObjectSelect(CBaseObject* object, bool isSelect)
+{
+    AZ_Assert(object, "Object does not exist");
+    m_guid = object->GetId();
+    m_bUndoSelect = !isSelect;
+}
+
+QString CUndoBaseObjectSelect::GetObjectName()
+{
+    CBaseObject* object = GetIEditor()->GetObjectManager()->FindObject(m_guid);
+    if (!object)
+    {
+        return "";
+    }
+
+    return object->GetName();
+}
+
+void CUndoBaseObjectSelect::Undo(bool bUndo)
+{
+    CBaseObject* object = GetIEditor()->GetObjectManager()->FindObject(m_guid);
+    if (!object)
+    {
+        return;
+    }
+
+    if (bUndo)
+    {
+        m_bRedoSelect = object->IsSelected();
+    }
+
+    if (m_bUndoSelect)
+    {
+        GetIEditor()->GetObjectManager()->SelectObject(object);
+    }
+    else
+    {
+        GetIEditor()->GetObjectManager()->UnselectObject(object);
+    }
+}
+
+void CUndoBaseObjectSelect::Redo()
+{
+    if (CBaseObject* object = GetIEditor()->GetObjectManager()->FindObject(m_guid))
+    {
+        if (m_bRedoSelect)
+        {
+            GetIEditor()->GetObjectManager()->SelectObject(object);
+        }
+        else
+        {
+            GetIEditor()->GetObjectManager()->UnselectObject(object);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CUndoBaseObjectBulkSelect implementation.
+//////////////////////////////////////////////////////////////////////////
+
+CUndoBaseObjectBulkSelect::CUndoBaseObjectBulkSelect(const AZStd::unordered_set<const CBaseObject*>& previousSelection, const CSelectionGroup& selectionGroup)
+{
+    int numSelectedObjects = selectionGroup.GetCount();
+    m_entityIdList.reserve(numSelectedObjects);
+
+    // Populate list of entities to restore selection to 
+    for (int objectIndex = 0; objectIndex < numSelectedObjects; ++objectIndex)
+    {
+        CBaseObject* object = selectionGroup.GetObject(objectIndex);
+
+        // Don't track Undo/Redo for Legacy Objects or entities that were not selected in this step
+        if (object->GetType() != OBJTYPE_AZENTITY || previousSelection.find(object) != previousSelection.end())
+        {
+            continue;
+        }
+
+        AZ::EntityId id;
+        AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(
+            id, 
+            object, 
+            &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
+
+        m_entityIdList.push_back(id);
+    }
+}
+
+void CUndoBaseObjectBulkSelect::Undo(bool bUndo)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    if (!bUndo)
+    {
+        return;
+    }
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::MarkEntitiesDeselected,
+        m_entityIdList);
+}
+
+void CUndoBaseObjectBulkSelect::Redo()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::MarkEntitiesSelected,
+        m_entityIdList);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CUndoBaseObjectClearSelection implementation.
+//////////////////////////////////////////////////////////////////////////
+
+CUndoBaseObjectClearSelection::CUndoBaseObjectClearSelection(const CSelectionGroup& selectionGroup)
+{
+    int numSelectedObjects = selectionGroup.GetCount();
+    m_entityIdList.reserve(numSelectedObjects);
+
+    // Populate list of entities to restore selection to 
+    for (int objectIndex = 0; objectIndex < numSelectedObjects; ++objectIndex)
+    {
+        CBaseObject* object = selectionGroup.GetObject(objectIndex);
+
+        // Don't track Undo/Redo for Legacy Objects
+        if (object->GetType() != OBJTYPE_AZENTITY)
+        {
+            continue;
+        }
+
+        AZ::EntityId id;
+        AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(
+            id, 
+            object, 
+            &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
+
+        m_entityIdList.push_back(id);
+    }
+}
+
+void CUndoBaseObjectClearSelection::Undo(bool bUndo)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    if (!bUndo)
+    {
+        return;
+    }
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities,
+        m_entityIdList);
+}
+
+void CUndoBaseObjectClearSelection::Redo() 
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities,
+        AzToolsFramework::EntityIdList());
+}
diff --git a/Code/Editor/Objects/ObjectManagerLegacyUndo.h b/Code/Editor/Objects/ObjectManagerLegacyUndo.h
new file mode 100644
index 0000000000..d8259625ce
--- /dev/null
+++ b/Code/Editor/Objects/ObjectManagerLegacyUndo.h
@@ -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
+ *
+ */
+
+
+#pragma once
+
+#include "Undo/IUndoObject.h"
+
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+#include "Objects/BaseObject.h"
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo New Object
+class CUndoBaseObjectNew
+    : public IUndoObject
+{
+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(); };
+
+    virtual void Undo(bool bUndo) override;
+    virtual void Redo() override;
+
+private:
+    CBaseObjectPtr m_object;
+    TGUIDRemap m_remapping;
+    XmlNodeRef m_redo;
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo Delete Object
+class CUndoBaseObjectDelete
+    : public IUndoObject
+{
+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(); };
+
+    virtual void Undo(bool bUndo) override;
+    virtual void Redo() override;
+
+private:
+    CBaseObjectPtr m_object;
+    XmlNodeRef m_undo;
+    TGUIDRemap m_remapping;
+    bool m_bSelected;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo Select Object
+class CUndoBaseObjectSelect
+    : public IUndoObject
+{
+public:
+    CUndoBaseObjectSelect(CBaseObject* object);
+
+    /**
+    * 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 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; 
+
+    virtual void Undo(bool bUndo) override;
+    virtual void Redo() override;
+
+private:
+    GUID m_guid;
+    bool m_bUndoSelect;
+    bool m_bRedoSelect;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo Select for many Objects
+class CUndoBaseObjectBulkSelect
+    : public IUndoObject
+{
+public:
+    /**
+    * This Undo/Redo command is designed to improve performance of the standard CUndoBaseObjectSelect
+    * command by passing all Select/Deselect commands through the proper Ebuses in one bulk operation instead
+    * of individually.
+    *
+    * This only works with Component Entities. Legacy objects must still use the standard CUndoBaseObjectSelect.
+    *
+    * @param previousSelection the set of objects already selected. This is useful to ensure proper Undo/Redo
+    *        when a user makes a second rectangular selection by holding ctrl
+    * @param selectionGroup The items that will have their selection restored by either an Undo
+    *        or Redo step
+    */
+    CUndoBaseObjectBulkSelect(const AZStd::unordered_set<const CBaseObject*>& previousSelection, const CSelectionGroup& selectionGroup);
+
+protected:
+    int GetSize() override { return sizeof(*this); } // Return size of xml state.
+    QString GetDescription() override { return QObject::tr("Select Objects"); }
+
+    /*
+    * Deselects the objects
+    */
+    void Undo(bool bUndo) override;
+
+    /*
+    * Selects the objects
+    */
+    void Redo() override;
+
+private:
+    // The list of Entity Ids involved in the selection change
+    AzToolsFramework::EntityIdList m_entityIdList;
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo Clear Selection
+class CUndoBaseObjectClearSelection
+    : public IUndoObject
+{
+public:
+    /**
+    * This Undo/Redo command is designed to improve performance of the standard CUndoBaseObjectSelect
+    * command by passing all Select/Deselect commands through the proper Ebuses.
+    *
+    * This only works with Component Entities. Legacy objects must still use the standard CUndoBaseObjectSelect.
+    *
+    * @param selectionGroup The items that will have their selection restored by either an Undo
+    *        or Redo step
+    */
+    CUndoBaseObjectClearSelection(const CSelectionGroup& selectionGroup);
+
+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;
+
+    void Redo() override;
+
+private:
+    // The list of Entity Ids involved in the selection change
+    AzToolsFramework::EntityIdList m_entityIdList;
+};
diff --git a/Code/Editor/Objects/SelectionGroup.cpp b/Code/Editor/Objects/SelectionGroup.cpp
new file mode 100644
index 0000000000..97deca493f
--- /dev/null
+++ b/Code/Editor/Objects/SelectionGroup.cpp
@@ -0,0 +1,643 @@
+/*
+ * 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 : CSelectionGroup implementation.
+
+
+#include "EditorDefs.h"
+
+#include "SelectionGroup.h"
+
+// Editor
+#include "ViewManager.h"
+#include "Include/IObjectManager.h"
+
+#include <IStatObj.h>
+
+//////////////////////////////////////////////////////////////////////////
+CSelectionGroup::CSelectionGroup()
+    : m_ref(1)
+    , m_bVertexSnapped(false)
+{
+    m_LastestMoveSelectionFlag = eMS_None;
+    m_LastestMovedObjectRot.SetIdentity();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::AddObject(CBaseObject* obj)
+{
+    if (!IsContainObject(obj))
+    {
+        m_objects.push_back(obj);
+        m_objectsSet.insert(obj);
+        m_filtered.clear();
+
+        if (obj->GetType() != OBJTYPE_AZENTITY)
+        {
+            m_legacyObjectsSet.insert(obj);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::RemoveObject(CBaseObject* obj)
+{
+    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
+    {
+        if (*it == obj)
+        {
+            m_objects.erase(it);
+            m_objectsSet.erase(obj);
+            m_legacyObjectsSet.erase(obj);
+            m_filtered.clear();
+            break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::RemoveAll()
+{
+    m_objects.clear();
+    m_objectsSet.clear();
+    m_filtered.clear();
+    m_legacyObjectsSet.clear();
+}
+
+void CSelectionGroup::RemoveAllExceptLegacySet()
+{
+    m_objects.clear();
+    m_objectsSet.clear();
+    m_filtered.clear();
+}
+
+bool CSelectionGroup::IsContainObject(CBaseObject* obj)
+{
+    return (m_objectsSet.find(obj) != m_objectsSet.end());
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSelectionGroup::IsEmpty() const
+{
+    return m_objects.empty();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSelectionGroup::SameObjectType()
+{
+    if (IsEmpty())
+    {
+        return false;
+    }
+    CBaseObjectPtr pFirst = (*(m_objects.begin()));
+    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
+    {
+        if ((*it)->metaObject() != pFirst->metaObject())
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CSelectionGroup::GetCount() const
+{
+    return m_objects.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CSelectionGroup::GetObject(int index) const
+{
+    assert(index >= 0 && index < m_objects.size());
+    return m_objects[index];
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CSelectionGroup::GetObjectByGuid(REFGUID guid) const
+{
+    for (size_t i = 0, count(m_objects.size()); i < count; ++i)
+    {
+        if (m_objects[i]->GetId() == guid)
+        {
+            return m_objects[i];
+        }
+    }
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+std::set<CBaseObjectPtr>& CSelectionGroup::GetLegacyObjects()
+{
+    return m_legacyObjectsSet;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::Copy(const CSelectionGroup& from)
+{
+    m_name = from.m_name;
+    m_objects = from.m_objects;
+    m_objectsSet = from.m_objectsSet;
+    m_filtered = from.m_filtered;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3    CSelectionGroup::GetCenter() const
+{
+    Vec3 c(0, 0, 0);
+    for (int i = 0; i < GetCount(); i++)
+    {
+        c += GetObject(i)->GetWorldPos();
+    }
+    if (GetCount() > 0)
+    {
+        c /= GetCount();
+    }
+    return c;
+}
+
+//////////////////////////////////////////////////////////////////////////
+AABB CSelectionGroup::GetBounds() const
+{
+    AABB b;
+    AABB box;
+    box.Reset();
+    for (int i = 0; i < GetCount(); i++)
+    {
+        GetObject(i)->GetBoundBox(b);
+        box.Add(b.min);
+        box.Add(b.max);
+    }
+    return box;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::FilterParents()
+{
+    if (!m_filtered.empty())
+    {
+        return;
+    }
+
+    m_filtered.reserve(m_objects.size());
+    for (int i = 0; i < m_objects.size(); i++)
+    {
+        CBaseObject* obj = m_objects[i];
+        CBaseObject* parent = obj->GetParent();
+        bool bParentInSet = false;
+        while (parent)
+        {
+            if (m_objectsSet.find(parent) != m_objectsSet.end())
+            {
+                bParentInSet = true;
+                break;
+            }
+            parent = parent->GetParent();
+        }
+        if (!bParentInSet)
+        {
+            m_filtered.push_back(obj);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[maybe_unused]] int referenceCoordSys, const QPoint& point)
+{
+    // [MichaelS - 17/3/2005] Removed this code from the three edit functions (move,
+    // rotate and scale). This was causing a bug where the render node of objects
+    // was not being updated when objects were dragged away from their position
+    // and then back again, since movement is re-calculated from the initial position
+    // each mouse message (ie first the previous movement is undone and then the
+    // movement is applied). This meant that when moving back to the start position
+    // it appeared like no movement was applied, although it was still necessary to
+    // update the graphics resources. The object transform is explicitly reset
+    // below.
+
+    //if (offset.x == 0 && offset.y == 0 && offset.z == 0)
+    //  return;
+
+    m_bVertexSnapped = false;
+    FilterParents();
+    Vec3 newPos;
+
+    bool bValidFollowGeometryMode(true);
+    if (point.x() == -1 || point.y() == -1)
+    {
+        bValidFollowGeometryMode = false;
+    }
+
+    SRayHitInfo pickedInfo;
+
+    if (moveFlag == eMS_FollowGeometryPosNorm)
+    {
+        if (m_LastestMoveSelectionFlag != eMS_FollowGeometryPosNorm)
+        {
+            if (GetFilteredCount() > 0)
+            {
+                CBaseObject* pObj = GetFilteredObject(0);
+                m_LastestMovedObjectRot = pObj->GetRotation();
+            }
+        }
+    }
+
+    m_LastestMoveSelectionFlag = moveFlag;
+
+    for (int i = 0; i < GetFilteredCount(); i++)
+    {
+        CBaseObject* obj = GetFilteredObject(i);
+
+        if(obj->IsFrozen())
+        {
+            continue;
+        }
+
+        if (i == 0 && moveFlag == eMS_FollowGeometryPosNorm && bValidFollowGeometryMode)
+        {
+            Vec3 zaxis = m_LastestMovedObjectRot * Vec3(0, 0, 1);
+            zaxis.Normalize();
+            Quat nq;
+            nq.SetRotationV0V1(zaxis, pickedInfo.vHitNormal);
+            obj->SetPos(pickedInfo.vHitPos);
+            obj->SetRotation(nq * m_LastestMovedObjectRot);
+            continue;
+        }
+
+        Matrix34 wtm = obj->GetWorldTM();
+        Vec3 wp = wtm.GetTranslation();
+
+        newPos = wp + offset;
+        if (moveFlag == eMS_FollowTerrain)
+        {
+            // Make sure object keeps it height.
+            float height = wp.z - GetIEditor()->GetTerrainElevation(wp.x, wp.y);
+            newPos.z = GetIEditor()->GetTerrainElevation(newPos.x, newPos.y) + height;
+        }
+
+        obj->SetWorldPos(newPos, eObjectUpdateFlags_UserInput | eObjectUpdateFlags_PositionChanged | eObjectUpdateFlags_MoveTool);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::MoveTo(const Vec3& pos, EMoveSelectionFlag moveFlag, int referenceCoordSys, const QPoint& point)
+{
+    FilterParents();
+    if (GetFilteredCount() < 1)
+    {
+        return;
+    }
+
+    CBaseObject* refObj = GetFilteredObject(0);
+    CSelectionGroup::Move(pos - refObj->GetWorldTM().GetTranslation(), moveFlag, referenceCoordSys, point);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::Rotate(const Quat& qRot, int referenceCoordSys)
+{
+    Matrix34 rotateTM;
+    rotateTM.SetIdentity();
+    rotateTM = Matrix33(qRot) * rotateTM;
+
+    Rotate(rotateTM, referenceCoordSys);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::Rotate(const Ang3& angles, int referenceCoordSys)
+{
+    //if (angles.x == 0 && angles.y == 0 && angles.z == 0)
+    //  return;
+
+    // Rotate selection about selection center.
+    Vec3 center = GetCenter();
+
+    Matrix34 rotateTM = Matrix34::CreateRotationXYZ(DEG2RAD(angles));
+    Rotate(rotateTM, referenceCoordSys);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::Rotate(const Matrix34& rotateTM, int referenceCoordSys)
+{
+    // Rotate selection about selection center.
+    Vec3 center = GetCenter();
+
+    Matrix34 ToOrigin = Matrix34::CreateIdentity();
+    Matrix34 FromOrigin = Matrix34::CreateIdentity();
+
+    if (referenceCoordSys != COORDS_LOCAL)
+    {
+        ToOrigin.SetTranslation(-center);
+        FromOrigin.SetTranslation(center);
+
+        if (referenceCoordSys == COORDS_USERDEFINED)
+        {
+            Matrix34 userTM;
+            userTM.SetIdentity();
+            Matrix34 invUserTM = userTM.GetInvertedFast();
+
+            ToOrigin = invUserTM * ToOrigin;
+            FromOrigin = FromOrigin * userTM;
+        }
+    }
+
+    FilterParents();
+
+    for (int i = 0; i < GetFilteredCount(); i++)
+    {
+        CBaseObject* obj = GetFilteredObject(i);
+
+        Matrix34 objectTransform = obj->GetWorldTM();
+        if (referenceCoordSys != COORDS_LOCAL)
+        {
+            if (referenceCoordSys == COORDS_PARENT && obj->GetParent())
+            {
+                Matrix34 parentTM = obj->GetParent()->GetWorldTM();
+                parentTM.OrthonormalizeFast();
+                parentTM.SetTranslation(Vec3(0, 0, 0));
+                Matrix34 invParentTM = parentTM.GetInvertedFast();
+
+                objectTransform = FromOrigin * parentTM * rotateTM * invParentTM * ToOrigin * objectTransform;
+            }
+            else
+            {
+                objectTransform = FromOrigin * rotateTM * ToOrigin * objectTransform;
+            }
+        }
+        else
+        {
+            // Decompose the matrix and reconstruct it to ensure no scaling artifacts are introduced
+            AffineParts affineParts;
+            affineParts.SpectralDecompose(objectTransform);
+
+            Matrix33 rotationMatrix(affineParts.rot);
+            Matrix34 translationMatrix = Matrix34::CreateTranslationMat(affineParts.pos);
+            Matrix33 scaleMatrix = Matrix33::CreateScale(affineParts.scale);
+
+            objectTransform = translationMatrix * rotationMatrix * rotateTM * scaleMatrix;
+        }
+
+        obj->SetWorldTM(objectTransform, eObjectUpdateFlags_UserInput);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::Scale(const Vec3& scale, int referenceCoordSys)
+{
+    //if (scale.x == 1 && scale.y == 1 && scale.z == 1)
+    //  return;
+
+    Vec3 scl = scale;
+    if (scl.x == 0)
+    {
+        scl.x = 0.01f;
+    }
+    if (scl.y == 0)
+    {
+        scl.y = 0.01f;
+    }
+    if (scl.z == 0)
+    {
+        scl.z = 0.01f;
+    }
+
+    // Scale selection relative to selection center.
+    Vec3 center = GetCenter();
+
+    Matrix34 scaleTM;
+    scaleTM.SetIdentity();
+    scaleTM = Matrix33::CreateScale(Vec3(scl.x, scl.y, scl.z)) * scaleTM;
+
+    Matrix34 ToOrigin;
+    Matrix34 FromOrigin;
+
+    ToOrigin.SetIdentity();
+    FromOrigin.SetIdentity();
+
+    if (referenceCoordSys != COORDS_LOCAL)
+    {
+        ToOrigin.SetTranslation(-center);
+        FromOrigin.SetTranslation(center);
+    }
+
+    FilterParents();
+
+    for (int i = 0; i < GetFilteredCount(); i++)
+    {
+        CBaseObject* obj = GetFilteredObject(i);
+        Matrix34 m = obj->GetWorldTM();
+
+        if (referenceCoordSys != COORDS_LOCAL)
+        {
+            // Apply new scale
+            m = FromOrigin * scaleTM * ToOrigin * m;
+        }
+        else
+        {
+            // Apply new scale
+            m = m * scaleTM;
+        }
+
+        obj->SetWorldTM(m, eObjectUpdateFlags_UserInput | eObjectUpdateFlags_ScaleTool);
+        obj->InvalidateTM(eObjectUpdateFlags_UserInput | eObjectUpdateFlags_ScaleTool);
+    }
+}
+
+
+void CSelectionGroup::SetScale(const Vec3& scale, int referenceCoordSys)
+{
+    Vec3 relScale = scale;
+
+    if (GetCount() > 0 && GetObject(0))
+    {
+        Vec3 objScale = GetObject(0)->GetScale();
+        if (relScale == objScale && (objScale.x == 0.0f || objScale.y == 0.0f || objScale.z == 0.0f))
+        {
+            return;
+        }
+        relScale = relScale / objScale;
+    }
+
+    Scale(relScale, referenceCoordSys);
+}
+
+
+void CSelectionGroup::StartScaling()
+{
+    for (int i = 0; i < GetFilteredCount(); i++)
+    {
+        CBaseObject* obj = GetFilteredObject(i);
+        obj->StartScaling();
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::Align()
+{
+    for (int i = 0; i < GetFilteredCount(); ++i)
+    {
+        bool terrain = false;
+        CBaseObject* obj = GetFilteredObject(i);
+        Vec3 pos = obj->GetPos();
+        Quat rot = obj->GetRotation();
+        QPoint point = GetIEditor()->GetActiveView()->WorldToView(pos);
+        Vec3 normal = GetIEditor()->GetActiveView()->ViewToWorldNormal(point, false, true);
+        pos =   GetIEditor()->GetActiveView()->ViewToWorld(point, &terrain, false, false, true);
+        Vec3 zaxis = rot * Vec3(0, 0, 1);
+        normal.Normalize();
+        zaxis.Normalize();
+        Quat nq;
+        nq.SetRotationV0V1(zaxis, normal);
+        obj->SetRotation(nq * rot);
+        obj->SetPos(pos);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::Transform(const Vec3& offset, EMoveSelectionFlag moveFlag, const Ang3& angles, const Vec3& scale, int referenceCoordSys)
+{
+    if (offset != Vec3(0))
+    {
+        Move(offset, moveFlag, referenceCoordSys);
+    }
+
+    if (!(angles == Ang3(ZERO)))
+    {
+        Rotate(angles, referenceCoordSys);
+    }
+
+    if (scale != Vec3(0))
+    {
+        Scale(scale, referenceCoordSys);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::ResetTransformation()
+{
+    FilterParents();
+    Quat qIdentity;
+    qIdentity.SetIdentity();
+    Vec3 vScale(1.0f, 1.0f, 1.0f);
+
+    for (int i = 0, n = GetFilteredCount(); i < n; ++i)
+    {
+        CBaseObject* pObj = GetFilteredObject(i);
+        pObj->SetRotation(qIdentity);
+        pObj->SetScale(vScale);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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)
+{
+    for (int i = 0; i < m_objects.size(); i++)
+    {
+        CBaseObject* obj = m_objects[i];
+        obj->OnEvent(event);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+ULONG STDMETHODCALLTYPE CSelectionGroup::AddRef()
+{
+    return ++m_ref;
+};
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+ULONG STDMETHODCALLTYPE CSelectionGroup::Release()
+{
+    if ((--m_ref) == 0)
+    {
+        delete this;
+        return 0;
+    }
+    else
+    {
+        return m_ref;
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::IndicateSnappingVertex(DisplayContext& dc) const
+{
+    if (m_bVertexSnapped == false)
+    {
+        return;
+    }
+
+    dc.DepthTestOff();
+
+    ColorB green(0, 255, 0, 255);
+
+    dc.SetColor(green);
+    float fScale = dc.view->GetScreenScaleFactor(m_snapVertex) * 0.005f;
+    Vec3 sz(fScale, fScale, fScale);
+    dc.DrawWireBox(m_snapVertex - sz, m_snapVertex + sz);
+
+    dc.DepthTestOn();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectionGroup::FinishChanges()
+{
+    Objects selectedObjects(m_objects);
+    int iObjectSize(selectedObjects.size());
+    for (int i = 0; i < iObjectSize; ++i)
+    {
+        CBaseObject* pObject = selectedObjects[i];
+        if (pObject == NULL)
+        {
+            continue;
+        }
+    }
+}
diff --git a/Code/Editor/Objects/SelectionGroup.h b/Code/Editor/Objects/SelectionGroup.h
new file mode 100644
index 0000000000..818a49b84c
--- /dev/null
+++ b/Code/Editor/Objects/SelectionGroup.h
@@ -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
+ *
+ */
+
+
+// Description : CSelection group definition.
+
+
+#ifndef CRYINCLUDE_EDITOR_OBJECTS_SELECTIONGROUP_H
+#define CRYINCLUDE_EDITOR_OBJECTS_SELECTIONGROUP_H
+#pragma once
+
+
+class CBaseObject;
+
+#include "ObjectEvent.h"
+#include "Objects/BaseObject.h"
+
+/*!
+ *  CSelectionGroup is a named selection group of objects.
+ */
+class SANDBOX_API CSelectionGroup
+{
+public:
+    CSelectionGroup();
+
+    //! Set name of selection.
+    void SetName(const QString& name) { m_name = name; };
+    //! Get name of selection.
+    const QString& GetName() const { return m_name; };
+
+    //! Adds object into selection list.
+    void AddObject(CBaseObject* obj);
+    //! Remove object from selection list.
+    void RemoveObject(CBaseObject* obj);
+    //! Remove all objects from selection.
+    void RemoveAll();
+    //! Remove all objects from selection except for the LegacyObjects list
+    //! This is used in a performance improvement for deselecting legacy objects
+    void RemoveAllExceptLegacySet();
+    //! Check if object contained in selection list.
+    bool IsContainObject(CBaseObject* obj);
+    //! Return true if selection doesnt contain any object.
+    bool IsEmpty() const;
+    //! Check if all selected objects are of same type
+    bool SameObjectType();
+    //! Number of selected object.
+    int  GetCount() const;
+    //! Get object at given index.
+    CBaseObject* GetObject(int index) const;
+    //! Get object from a GUID
+    CBaseObject* GetObjectByGuid(REFGUID guid) const;
+    //! Get set of legacy objects
+    std::set<CBaseObjectPtr>& GetLegacyObjects();
+
+    //! Get mass center of selected objects.
+    Vec3    GetCenter() const;
+
+    //! Get Bounding box of selection.
+    AABB GetBounds() const;
+
+    void    Copy(const CSelectionGroup& from);
+
+    //! Remove from selection group all objects which have parent also in selection group.
+    //! And save resulting objects to saveTo selection.
+    void    FilterParents();
+    //! Get number of child filtered objects.
+    int GetFilteredCount() const { return m_filtered.size(); }
+    CBaseObject* GetFilteredObject(int i) const { return m_filtered[i]; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Operations on selection group.
+    //////////////////////////////////////////////////////////////////////////
+    enum EMoveSelectionFlag
+    {
+        eMS_None = 0x00,
+        eMS_FollowTerrain = 0x01,
+        eMS_FollowGeometryPosNorm = 0x02
+    };
+    //! Move objects in selection by offset.
+    void Move(const Vec3& offset, EMoveSelectionFlag moveFlag, int referenceCoordSys, const QPoint& point = QPoint(-1, -1));
+    //! Move objects in selection to specific position.
+    void MoveTo(const Vec3& pos, EMoveSelectionFlag moveFlag, int referenceCoordSys, const QPoint& point = QPoint(-1, -1));
+    //! Rotate objects in selection by given quaternion.
+    void Rotate(const Quat& qRot, int referenceCoordSys);
+    //! Rotate objects in selection by given angle.
+    void Rotate(const Ang3& angles, int referenceCoordSys);
+    //! Rotate objects in selection by given rotation matrix.
+    void Rotate(const Matrix34& matRot, int referenceCoordSys);
+    //! Transforms objects
+    void Transform(const Vec3& offset, EMoveSelectionFlag moveFlag, const Ang3& angles, const Vec3& scale, int referenceCoordSys);
+    //! 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
+    void Align();
+    //! 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);
+
+    ULONG STDMETHODCALLTYPE     AddRef();
+    ULONG STDMETHODCALLTYPE     Release();
+
+    void IndicateSnappingVertex(DisplayContext& dc) const;
+    void FinishChanges();
+private:
+    QString m_name;
+    typedef std::vector<TSmartPtr<CBaseObject> > Objects;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Objects m_objects;
+    // Objects set, for fast searches.
+    std::set<CBaseObject*> m_objectsSet;
+
+    // Legacy objects aren't deselected through Ebuses, so keeping a 
+    // separate set for them helps improve performance of deselection
+    std::set<CBaseObjectPtr> m_legacyObjectsSet;
+
+    //! Selection list with child objecs filtered out.
+    std::vector<CBaseObject*> m_filtered;
+
+    bool m_bVertexSnapped;
+    Vec3 m_snapVertex;
+
+    const static int SnappingVertexNumThreshold = 700;
+
+    EMoveSelectionFlag m_LastestMoveSelectionFlag;
+    Quat m_LastestMovedObjectRot;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+protected:
+    ULONG   m_ref;
+};
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_SELECTIONGROUP_H
diff --git a/Code/Editor/Objects/SubObjSelection.cpp b/Code/Editor/Objects/SubObjSelection.cpp
new file mode 100644
index 0000000000..a989daccc8
--- /dev/null
+++ b/Code/Editor/Objects/SubObjSelection.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "SubObjSelection.h"
+
+SSubObjSelOptions g_SubObjSelOptions;
+
+/*
+
+//////////////////////////////////////////////////////////////////////////
+bool CSubObjSelContext::IsEmpty() const
+{
+    if (GetCount() == 0)
+        return false;
+    for (int i = 0; i < GetCount(); i++)
+    {
+        CSubObjectSelection *pSel = GetSelection(i);
+        if (!pSel->IsEmpty())
+            return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSubObjSelContext::ModifySelection( SSubObjSelectionModifyContext &modCtx )
+{
+    for (int n = 0; n < GetCount(); n++)
+    {
+        CSubObjectSelection *pSel = GetSelection(n);
+        if (pSel->IsEmpty())
+            continue;
+        modCtx.pSubObjSelection = pSel;
+        pSel->pGeometry->SubObjSelectionModify( modCtx );
+    }
+    if (modCtx.type == SO_MODIFY_MOVE)
+    {
+        OnSelectionChange();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSubObjSelContext::AcceptModifySelection()
+{
+    for (int n = 0; n < GetCount(); n++)
+    {
+        CSubObjectSelection *pSel = GetSelection(n);
+        if (pSel->IsEmpty())
+            continue;
+        if (pSel->pGeometry)
+            pSel->pGeometry->Update();
+    }
+}
+
+*/
diff --git a/Code/Editor/Objects/SubObjSelection.h b/Code/Editor/Objects/SubObjSelection.h
new file mode 100644
index 0000000000..7db548bde6
--- /dev/null
+++ b/Code/Editor/Objects/SubObjSelection.h
@@ -0,0 +1,90 @@
+/*
+ * 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_OBJECTS_SUBOBJSELECTION_H
+#define CRYINCLUDE_EDITOR_OBJECTS_SUBOBJSELECTION_H
+#pragma once
+
+//////////////////////////////////////////////////////////////////////////
+// Sub Object element type.
+//////////////////////////////////////////////////////////////////////////
+enum ESubObjElementType
+{
+    SO_ELEM_NONE = 0,
+    SO_ELEM_VERTEX,
+    SO_ELEM_EDGE,
+    SO_ELEM_FACE,
+    SO_ELEM_POLYGON,
+    SO_ELEM_UV,
+};
+
+//////////////////////////////////////////////////////////////////////////
+enum ESubObjDisplayType
+{
+    SO_DISPLAY_WIREFRAME,
+    SO_DISPLAY_FLAT,
+    SO_DISPLAY_GEOMETRY,
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Options for sub-object selection.
+//////////////////////////////////////////////////////////////////////////
+struct SSubObjSelOptions
+{
+    bool bSelectByVertex;
+    bool bIgnoreBackfacing;
+    int nMatID;
+
+    bool bSoftSelection;
+    float fSoftSelFalloff;
+
+    // Display options.
+    bool bDisplayBackfacing;
+    bool bDisplayNormals;
+    float fNormalsLength;
+    ESubObjDisplayType displayType;
+
+    SSubObjSelOptions()
+    {
+        bSelectByVertex = false;
+        bIgnoreBackfacing = false;
+        bSoftSelection = false;
+        nMatID = 0;
+        fSoftSelFalloff = 1;
+
+        bDisplayBackfacing = true;
+        bDisplayNormals = false;
+        displayType = SO_DISPLAY_FLAT;
+        fNormalsLength = 0.4f;
+    }
+};
+
+extern SSubObjSelOptions g_SubObjSelOptions;
+
+
+//////////////////////////////////////////////////////////////////////////
+enum ESubObjSelectionModifyType
+{
+    SO_MODIFY_UNSELECT,
+    SO_MODIFY_MOVE,
+    SO_MODIFY_ROTATE,
+    SO_MODIFY_SCALE,
+};
+
+//////////////////////////////////////////////////////////////////////////
+// This structure is passed when user is dragging sub object selection.
+//////////////////////////////////////////////////////////////////////////
+struct SSubObjSelectionModifyContext
+{
+    CViewport* view;
+    ESubObjSelectionModifyType type;
+    Vec3 vValue;
+    Matrix34 worldRefFrame;
+};
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_SUBOBJSELECTION_H
diff --git a/Code/Editor/Objects/TrackGizmo.cpp b/Code/Editor/Objects/TrackGizmo.cpp
new file mode 100644
index 0000000000..006e94be6e
--- /dev/null
+++ b/Code/Editor/Objects/TrackGizmo.cpp
@@ -0,0 +1,257 @@
+/*
+ * 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 "TrackGizmo.h"
+
+// Editor
+#include "DisplayContext.h"
+#include "TrackView/TrackViewAnimNode.h"
+#include "AnimationContext.h"
+#include "Maestro/Types/AnimParamType.h"
+#include "Settings.h"
+#include "Viewport.h"
+
+
+#define TRACK_DRAW_Z_OFFSET (0.01f)
+
+//////////////////////////////////////////////////////////////////////////
+// CTrackGizmo implementation.
+//////////////////////////////////////////////////////////////////////////
+#define AXIS_SIZE 0.1f
+
+namespace {
+    int s_highlightAxis = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackGizmo::CTrackGizmo()
+{
+    m_pAnimNode = 0;
+
+    m_worldBbox.min = Vec3(-10000, -10000, -10000);
+    m_worldBbox.max = Vec3(10000, 10000, 10000);
+    m_keysSelected = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackGizmo::~CTrackGizmo()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackGizmo::SetMatrix(const Matrix34& tm)
+{
+    CGizmo::SetMatrix(tm);
+    m_worldBbox.min = Vec3(-10000, -10000, -10000);
+    m_worldBbox.max = Vec3(10000, 10000, 10000);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackGizmo::Display(DisplayContext& dc)
+{
+    if (!(dc.flags & DISPLAY_TRACKS))
+    {
+        return;
+    }
+
+    if (!m_pAnimNode)
+    {
+        return;
+    }
+
+    CAnimationContext* ac = GetIEditor()->GetAnimation();
+
+    // Should have animation sequence.
+    if (!ac->GetSequence())
+    {
+        return;
+    }
+
+    m_keysSelected = false;
+
+    // Must have non empty position track.
+    CTrackViewTrack* pTrack = m_pAnimNode->GetTrackForParameter(AnimParamType::Position);
+    if (!pTrack)
+    {
+        return;
+    }
+
+    int nkeys = pTrack->GetKeyCount();
+    if (nkeys < 2)
+    {
+        return;
+    }
+
+    Range range = ac->GetTimeRange();
+    //range.start = __min(range.end,track->GetKeyTime(0));
+    //range.end = __min(range.end,track->GetKeyTime(nkeys-1));
+    //float step = range.Length() / 100.0f;
+    //step = min(step,0.01f);
+    float step = 0.1f;
+
+    bool bTicks = (dc.flags & DISPLAY_TRACKTICKS) == DISPLAY_TRACKTICKS;
+
+    // Get Spline color.
+    ColorF splineCol(0.5f, 0.3f, 1, 1);
+    ColorF timeCol(0, 1, 0, 1);
+
+    m_worldBbox.Reset();
+
+    float zOffset = TRACK_DRAW_Z_OFFSET;
+    Vec3 p0(0, 0, 0), p1(0, 0, 0);
+    Vec3 tick(0, 0, 0.05f);
+    pTrack->GetValue(range.start, p0);
+    p0 = m_matrix * p0;
+    p0.z += zOffset;
+
+    // Update bounding box.
+    m_worldBbox.Add(p0);
+
+    for (float t = range.start + step; t < range.end; t += step)
+    {
+        p1 = Vec3(0, 0, 0);
+        pTrack->GetValue(t, p1);
+        p1 = m_matrix * p1;
+        p1.z += zOffset;
+
+        // Update bounding box.
+        m_worldBbox.Add(p1);
+
+        if (bTicks)
+        {
+            dc.DrawLine(p0 - tick, p0 + tick, timeCol, timeCol);
+        }
+        dc.DrawLine(p0, p1, splineCol, splineCol);
+        p0 = p1;
+    }
+
+    int nSubTracks = pTrack->GetChildCount();
+    if (nSubTracks > 0)
+    {
+        for (int i = 0; i < nSubTracks; i++)
+        {
+            DrawKeys(dc, pTrack, static_cast<CTrackViewTrack*>(pTrack->GetChild(i)));
+        }
+    }
+    else
+    {
+        DrawKeys(dc, pTrack, pTrack);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackGizmo::SetAnimNode(CTrackViewAnimNode* pNode)
+{
+    m_pAnimNode = pNode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackGizmo::GetWorldBounds(AABB& bbox)
+{
+    bbox = m_worldBbox;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackGizmo::DrawAxis(DisplayContext& dc, const Vec3& org)
+{
+    float size = AXIS_SIZE;
+
+    dc.DepthTestOff();
+
+    Vec3 x(size, 0, 0);
+    Vec3 y(0, size, 0);
+    Vec3 z(0, 0, size);
+
+    float fScreenScale = dc.view->GetScreenScaleFactor(org);
+    x = x * fScreenScale;
+    y = y * fScreenScale;
+    z = z * fScreenScale;
+
+    float col[4] = { 1, 1, 1, 1 };
+    float hcol[4] = { 1, 0, 0, 1 };
+    dc.renderer->DrawLabelEx(org + x, 1.2f, col, true, true, "X");
+    dc.renderer->DrawLabelEx(org + y, 1.2f, col, true, true, "Y");
+    dc.renderer->DrawLabelEx(org + z, 1.2f, col, true, true, "Z");
+
+    Vec3 colX(1, 0, 0), colY(0, 1, 0), colZ(0, 0, 1);
+    if (s_highlightAxis)
+    {
+        float col2[4] = { 1, 0, 0, 1 };
+        if (s_highlightAxis == 1)
+        {
+            colX(1, 1, 0);
+            dc.renderer->DrawLabelEx(org + x, 1.2f, col2, true, true, "X");
+        }
+        if (s_highlightAxis == 2)
+        {
+            colY(1, 1, 0);
+            dc.renderer->DrawLabelEx(org + y, 1.2f, col2, true, true, "Y");
+        }
+        if (s_highlightAxis == 3)
+        {
+            colZ(1, 1, 0);
+            dc.renderer->DrawLabelEx(org + z, 1.2f, col2, true, true, "Z");
+        }
+    }
+
+    x = x * 0.8f;
+    y = y * 0.8f;
+    z = z * 0.8f;
+    float fArrowScale = fScreenScale * 0.07f;
+    dc.SetColor(colX);
+    dc.DrawArrow(org, org + x, fArrowScale);
+    dc.SetColor(colY);
+    dc.DrawArrow(org, org + y, fArrowScale);
+    dc.SetColor(colZ);
+    dc.DrawArrow(org, org + z, fArrowScale);
+
+    dc.DepthTestOn();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackGizmo::HitTest([[maybe_unused]] HitContext& hc)
+{
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackGizmo::DrawKeys(DisplayContext& dc, CTrackViewTrack* pTrack, CTrackViewTrack* pKeysTrack)
+{
+    // Get Key color.
+    dc.SetColor(1, 0, 0, 1);
+
+    float zOffset = TRACK_DRAW_Z_OFFSET;
+
+    int nkeys = pKeysTrack->GetKeyCount();
+    for (int i = 0; i < nkeys; i++)
+    {
+        const CTrackViewKeyHandle& keyHandle = pKeysTrack->GetKey(i);
+
+        const float t = keyHandle.GetTime();
+        Vec3 p0(0, 0, 0);
+        pTrack->GetValue(t, p0);
+        p0 = m_matrix * p0;
+        p0.z += zOffset;
+
+        //float sz = 0.01f * dc.view->GetScreenScaleFactor(p0);
+        float sz2 = 0.005f * dc.view->GetScreenScaleFactor(p0);
+
+        // Draw quad.
+        //dc.DrawBall( p0,sz );
+        dc.DrawWireBox(p0 - Vec3(sz2, sz2, sz2), p0 + Vec3(sz2, sz2, sz2));
+
+        if (keyHandle.IsSelected())
+        {
+            m_keysSelected = true;
+            DrawAxis(dc, p0);
+            dc.SetColor(1, 0, 0, 1);
+        }
+    }
+}
diff --git a/Code/Editor/Objects/TrackGizmo.h b/Code/Editor/Objects/TrackGizmo.h
new file mode 100644
index 0000000000..f76f62d032
--- /dev/null
+++ b/Code/Editor/Objects/TrackGizmo.h
@@ -0,0 +1,50 @@
+/*
+ * 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_OBJECTS_TRACKGIZMO_H
+#define CRYINCLUDE_EDITOR_OBJECTS_TRACKGIZMO_H
+#pragma once
+
+
+#include "Gizmo.h"
+
+// forward declarations.
+struct DisplayContext;
+class CTrackViewAnimNode;
+class CTrackViewTrack;
+
+/** Gizmo of Objects animation track.
+*/
+class CTrackGizmo
+    : public CGizmo
+{
+public:
+    CTrackGizmo();
+    ~CTrackGizmo();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Overrides from CGizmo
+    //////////////////////////////////////////////////////////////////////////
+    virtual void GetWorldBounds(AABB& bbox);
+    virtual void Display(DisplayContext& dc);
+    virtual bool HitTest(HitContext& hc);
+    virtual void SetMatrix(const Matrix34& tm);
+
+    //////////////////////////////////////////////////////////////////////////
+    void SetAnimNode(CTrackViewAnimNode* pNode);
+    void DrawAxis(DisplayContext& dc, const Vec3& pos);
+
+    void DrawKeys(DisplayContext& dc, CTrackViewTrack* pTrack, CTrackViewTrack* pKeysTrack);
+
+private:
+    CTrackViewAnimNode* m_pAnimNode;
+    AABB m_worldBbox;
+    bool m_keysSelected;
+};
+
+#endif // CRYINCLUDE_EDITOR_OBJECTS_TRACKGIZMO_H
diff --git a/Code/Sandbox/Editor/PakManagerDlg.qrc b/Code/Editor/PakManagerDlg.qrc
similarity index 100%
rename from Code/Sandbox/Editor/PakManagerDlg.qrc
rename to Code/Editor/PakManagerDlg.qrc
diff --git a/Code/Sandbox/Editor/PakManagerDlg.ui b/Code/Editor/PakManagerDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/PakManagerDlg.ui
rename to Code/Editor/PakManagerDlg.ui
diff --git a/Code/Editor/Platform/Android/editor_android.cmake b/Code/Editor/Platform/Android/editor_android.cmake
new file mode 100644
index 0000000000..836f1ab4aa
--- /dev/null
+++ b/Code/Editor/Platform/Android/editor_android.cmake
@@ -0,0 +1,7 @@
+#
+# 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/Code/Editor/Platform/Android/editor_lib_android.cmake b/Code/Editor/Platform/Android/editor_lib_android.cmake
new file mode 100644
index 0000000000..836f1ab4aa
--- /dev/null
+++ b/Code/Editor/Platform/Android/editor_lib_android.cmake
@@ -0,0 +1,7 @@
+#
+# 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/Code/Editor/Platform/Common/Clang/editor_lib_clang.cmake b/Code/Editor/Platform/Common/Clang/editor_lib_clang.cmake
new file mode 100644
index 0000000000..098c83c0f5
--- /dev/null
+++ b/Code/Editor/Platform/Common/Clang/editor_lib_clang.cmake
@@ -0,0 +1,8 @@
+#
+# 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_COMPILE_OPTIONS PRIVATE -fexceptions)
diff --git a/Code/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake b/Code/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake
new file mode 100644
index 0000000000..23bca6f33d
--- /dev/null
+++ b/Code/Editor/Platform/Common/MSVC/editor_lib_msvc.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
+#
+#
+ly_add_source_properties(
+    SOURCES MainWindow.cpp CryEdit.cpp
+    PROPERTY COMPILE_OPTIONS
+    VALUES -bigobj
+)
diff --git a/Code/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp b/Code/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp
new file mode 100644
index 0000000000..95a1177a84
--- /dev/null
+++ b/Code/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp
@@ -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
+ *
+ */
+
+
+// Description : Send Mail.
+
+
+#include "EditorDefs.h"
+
+#include "Util/Mailer.h"
+
+bool CMailer::SendMail(const char* subject,
+    const char* messageBody,
+    const std::vector<const char*>& _recipients,
+    const std::vector<const char*>& _attachments,
+    bool bShowDialog)
+{
+    return true;
+}
diff --git a/Code/Editor/Platform/Linux/editor_core_files_linux.cmake b/Code/Editor/Platform/Linux/editor_core_files_linux.cmake
new file mode 100644
index 0000000000..7d7f211531
--- /dev/null
+++ b/Code/Editor/Platform/Linux/editor_core_files_linux.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
+#
+#
+
+set(FILES
+    
+)
diff --git a/Code/Editor/Platform/Linux/editor_lib_linux.cmake b/Code/Editor/Platform/Linux/editor_lib_linux.cmake
new file mode 100644
index 0000000000..836f1ab4aa
--- /dev/null
+++ b/Code/Editor/Platform/Linux/editor_lib_linux.cmake
@@ -0,0 +1,7 @@
+#
+# 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/Code/Editor/Platform/Linux/editor_linux.cmake b/Code/Editor/Platform/Linux/editor_linux.cmake
new file mode 100644
index 0000000000..836f1ab4aa
--- /dev/null
+++ b/Code/Editor/Platform/Linux/editor_linux.cmake
@@ -0,0 +1,7 @@
+#
+# 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/Code/Editor/Platform/Linux/platform_linux_files.cmake b/Code/Editor/Platform/Linux/platform_linux_files.cmake
new file mode 100644
index 0000000000..c84d157abe
--- /dev/null
+++ b/Code/Editor/Platform/Linux/platform_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
+    ../../Core/QtEditorApplication_linux.cpp
+    ../Common/Unimplemented/Util/Mailer_Unimplemented.cpp
+)
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128 _2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128 _2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128 _2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128 _2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256 _2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256 _2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256 _2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256 _2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/Contents.json b/Code/Editor/Platform/Mac/Images.xcassets/Contents.json
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/Contents.json
rename to Code/Editor/Platform/Mac/Images.xcassets/Contents.json
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/Contents.json b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/Contents.json
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/Contents.json
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/Contents.json
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128 _2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128 _2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128 _2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128 _2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256 _2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256 _2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256 _2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256 _2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512_2x.png
diff --git a/Code/Editor/Platform/Mac/editor_core_files_mac.cmake b/Code/Editor/Platform/Mac/editor_core_files_mac.cmake
new file mode 100644
index 0000000000..82459b1433
--- /dev/null
+++ b/Code/Editor/Platform/Mac/editor_core_files_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
+#
+#
+
+set(FILES
+    ../../QtUI/ColorButton_mac.mm
+)
diff --git a/Code/Editor/Platform/Mac/editor_lib_mac.cmake b/Code/Editor/Platform/Mac/editor_lib_mac.cmake
new file mode 100644
index 0000000000..1a20e11221
--- /dev/null
+++ b/Code/Editor/Platform/Mac/editor_lib_mac.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
+#
+#
+
+find_library(IOKIT_LIBRARY IOKit)
+
+set(LY_BUILD_DEPENDENCIES
+    PRIVATE
+        ${IOKIT_LIBRARY}
+)
diff --git a/Code/Editor/Platform/Mac/editor_mac.cmake b/Code/Editor/Platform/Mac/editor_mac.cmake
new file mode 100644
index 0000000000..33e7a7662d
--- /dev/null
+++ b/Code/Editor/Platform/Mac/editor_mac.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
+#
+#
+
+# Set resources directory for app icons
+target_sources(Editor PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Images.xcassets)
+set_target_properties(Editor PROPERTIES
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_LIST_DIR}/gui_info.plist
+    RESOURCE ${CMAKE_CURRENT_LIST_DIR}/Images.xcassets
+    XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME EditorAppIcon
+)
diff --git a/Code/Sandbox/Editor/Platform/Mac/gui_info.plist b/Code/Editor/Platform/Mac/gui_info.plist
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/gui_info.plist
rename to Code/Editor/Platform/Mac/gui_info.plist
diff --git a/Code/Editor/Platform/Mac/platform_mac_files.cmake b/Code/Editor/Platform/Mac/platform_mac_files.cmake
new file mode 100644
index 0000000000..55872c7b46
--- /dev/null
+++ b/Code/Editor/Platform/Mac/platform_mac_files.cmake
@@ -0,0 +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
+#
+#
+
+set(FILES
+    ../../Core/QtEditorApplication_mac.mm
+    ../../LogFile_mac.mm
+    ../../WindowObserver_mac.h
+    ../../WindowObserver_mac.mm
+    ../../MainWindow_mac.mm
+    ../../RenderViewport_mac.mm
+    ../Common/Unimplemented/Util/Mailer_Unimplemented.cpp
+)
diff --git a/Code/Editor/Platform/Windows/Util/Mailer_Windows.cpp b/Code/Editor/Platform/Windows/Util/Mailer_Windows.cpp
new file mode 100644
index 0000000000..c91bbfdf29
--- /dev/null
+++ b/Code/Editor/Platform/Windows/Util/Mailer_Windows.cpp
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Send Mail.
+
+
+#include "EditorDefs.h"
+
+#include "Util/Mailer.h"
+
+#include <mapi.h>
+
+
+bool CMailer::SendMail(const char* subject,
+    const char* messageBody,
+    const std::vector<const char*>& _recipients,
+    const std::vector<const char*>& _attachments,
+    bool bShowDialog)
+{
+    // Preserve directory, (Can be changed if attachment specified)
+    WCHAR dir[MAX_PATH];
+    GetCurrentDirectoryW(sizeof(dir), dir);
+
+    // Load MAPI dll
+    HMODULE hMAPILib = LoadLibraryA("MAPI32.DLL");
+    LPMAPISENDMAIL lpfnMAPISendMail = (LPMAPISENDMAIL) GetProcAddress(hMAPILib, "MAPISendMail");
+
+    int numRecipients  = (int)_recipients.size();
+
+    // Handle Attachments
+    MapiFileDesc* attachments = new MapiFileDesc[_attachments.size()];
+
+    int i = 0;
+    for (unsigned int k = 0; k < _attachments.size(); k++)
+    {
+        FILE* file = nullptr;
+        azfopen(&file, _attachments[k], "r");
+        if (!file)
+        {
+            continue;
+        }
+        fclose(file);
+
+        attachments[i].ulReserved   = 0;
+        attachments[i].flFlags      = 0;
+        attachments[i].nPosition    = (ULONG)-1;
+        attachments[i].lpszPathName = (char*)(const char*)_attachments[k];
+        attachments[i].lpszFileName = NULL;
+        attachments[i].lpFileType   = NULL;
+        i++;
+    }
+    int numAttachments = i;
+
+    // Handle Recipients
+    MapiRecipDesc* recipients = new MapiRecipDesc[numRecipients];
+
+    std::vector<string> addresses;
+    addresses.resize(numRecipients);
+    for (i = 0; i < numRecipients; i++)
+    {
+        addresses[i] = string("SMTP:") + _recipients[i];
+    }
+
+    for (i = 0; i < numRecipients; i++)
+    {
+        recipients[i].ulReserved   = 0;
+        recipients[i].ulRecipClass = MAPI_TO;
+        recipients[i].lpszName     = (char*)(const char*)_recipients[i];
+        recipients[i].lpszAddress  = (char*)addresses[i].c_str();
+        recipients[i].ulEIDSize    = 0;
+        recipients[i].lpEntryID    = NULL;
+    }
+
+    MapiMessage message;
+    memset(&message, 0, sizeof(message));
+    message.lpszSubject = (char*)(const char*)subject;
+    message.lpszNoteText = (char*)(const char*)messageBody;
+    message.lpszMessageType = NULL;
+
+    message.nRecipCount = numRecipients;
+    message.lpRecips = recipients;
+
+    message.nFileCount = numAttachments;
+    message.lpFiles = attachments;
+
+
+    //Next, the client calls the MAPISendMail function and stores the return status so it can detect whether the call succeeded. You should use a more sophisticated error reporting mechanism than the C library function printf.
+
+    FLAGS flags = bShowDialog ? MAPI_DIALOG : 0;
+    flags |= MAPI_LOGON_UI;
+    ULONG err = (*lpfnMAPISendMail)(0L,           // use implicit session.
+            0L,      // ulUIParam; 0 is always valid
+            &message, // the message being sent
+            flags,   // if user allowed to edit the message
+            0L);     // reserved; must be 0
+    delete [] attachments;
+    delete [] recipients;
+
+    FreeLibrary(hMAPILib);   // Free DLL module through handle
+
+    // Restore previous directory.
+    SetCurrentDirectoryW(dir);
+
+    if (err != SUCCESS_SUCCESS)
+    {
+        return false;
+    }
+
+    return true;
+}
+
diff --git a/Code/Editor/Platform/Windows/editor_core_files_windows.cmake b/Code/Editor/Platform/Windows/editor_core_files_windows.cmake
new file mode 100644
index 0000000000..7d7f211531
--- /dev/null
+++ b/Code/Editor/Platform/Windows/editor_core_files_windows.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
+#
+#
+
+set(FILES
+    
+)
diff --git a/Code/Editor/Platform/Windows/editor_lib_windows.cmake b/Code/Editor/Platform/Windows/editor_lib_windows.cmake
new file mode 100644
index 0000000000..1fe051b062
--- /dev/null
+++ b/Code/Editor/Platform/Windows/editor_lib_windows.cmake
@@ -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/Code/Editor/Platform/Windows/editor_windows.cmake b/Code/Editor/Platform/Windows/editor_windows.cmake
new file mode 100644
index 0000000000..1fe051b062
--- /dev/null
+++ b/Code/Editor/Platform/Windows/editor_windows.cmake
@@ -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/Code/Editor/Platform/Windows/platform_windows_files.cmake b/Code/Editor/Platform/Windows/platform_windows_files.cmake
new file mode 100644
index 0000000000..3c22bf237a
--- /dev/null
+++ b/Code/Editor/Platform/Windows/platform_windows_files.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
+#
+#
+
+set(FILES
+    Util/Mailer_Windows.cpp
+)
diff --git a/Code/Editor/Platform/iOS/editor_ios.cmake b/Code/Editor/Platform/iOS/editor_ios.cmake
new file mode 100644
index 0000000000..836f1ab4aa
--- /dev/null
+++ b/Code/Editor/Platform/iOS/editor_ios.cmake
@@ -0,0 +1,7 @@
+#
+# 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/Code/Editor/Platform/iOS/editor_lib_ios.cmake b/Code/Editor/Platform/iOS/editor_lib_ios.cmake
new file mode 100644
index 0000000000..836f1ab4aa
--- /dev/null
+++ b/Code/Editor/Platform/iOS/editor_lib_ios.cmake
@@ -0,0 +1,7 @@
+#
+# 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/Code/Editor/Plugin.cpp b/Code/Editor/Plugin.cpp
new file mode 100644
index 0000000000..ae2ccc5806
--- /dev/null
+++ b/Code/Editor/Plugin.cpp
@@ -0,0 +1,236 @@
+/*
+ * 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 "Plugin.h"
+
+// Editor
+#include "Include/IViewPane.h"
+
+
+CClassFactory* CClassFactory::s_pInstance = nullptr;
+CAutoRegisterClassHelper* CAutoRegisterClassHelper::s_pFirst = nullptr;
+CAutoRegisterClassHelper* CAutoRegisterClassHelper::s_pLast = nullptr;
+
+CClassFactory::CClassFactory()
+{
+    m_classes.reserve(100);
+    RegisterAutoTypes();
+}
+
+CClassFactory::~CClassFactory()
+{
+    for (int i = 0; i < m_classes.size(); i++)
+    {
+        m_classes[i]->Release();
+    }
+}
+
+void CClassFactory::RegisterAutoTypes()
+{
+    CAutoRegisterClassHelper* pClass = CAutoRegisterClassHelper::s_pFirst;
+
+    while (pClass)
+    {
+        RegisterClass(pClass->m_pClassDesc);
+        pClass = pClass->m_pNext;
+    }
+}
+
+CClassFactory* CClassFactory::Instance()
+{
+    if (!s_pInstance)
+    {
+        s_pInstance = new CClassFactory;
+    }
+
+    return s_pInstance;
+}
+
+void CClassFactory::RegisterClass(IClassDesc* pClassDesc)
+{
+    assert(pClassDesc);
+
+    auto findByGuid = m_guidToClass.find(pClassDesc->ClassID());
+
+    if (findByGuid != m_guidToClass.end())
+    {
+        // you may not re-use UUIDs!
+        // this can happen when someone makes a new plugin or downloads one
+        // where the author copied and pasted code.  This can also happen if two DLLs exist which are actually the same plugin
+        // either way, give info if you can:
+        char errorMessageBuffer[512] = { 0 };
+        AZ::Uuid newUUID(pClassDesc->ClassID());
+        char existingUUIDString[64] = { 0 };
+        newUUID.ToString(existingUUIDString, 64, true, true);
+
+        sprintf_s(errorMessageBuffer, 512,
+            "Error registering class '%s' -  UUID of that class already exists (%s), and belongs to class named '%s.'\n"
+            "You may not have duplicate class identifiers.\n"
+            "Check for duplicate plugins or copy and pasted code for plugins that duplicates UUIDs returned.",
+            pClassDesc->ClassName().toUtf8().data(),
+            existingUUIDString,
+            findByGuid->second->ClassName().toUtf8().data());
+
+        CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate UUID", MB_OK);
+        return;
+    }
+
+    auto findByName = m_nameToClass.find(pClassDesc->ClassName());
+    if (findByName != m_nameToClass.end())
+    {
+        // you may not re-use names, either!
+        char errorMessageBuffer[512] = { 0 };
+
+        AZ::Uuid newUUID(pClassDesc->ClassID());
+        char newUUIDString[64] = { 0 };
+        newUUID.ToString(newUUIDString, 64, true, true);
+
+        AZ::Uuid existingUUID(findByName->second->ClassID());
+        char existingUUIDString[64] = { 0 };
+        existingUUID.ToString(existingUUIDString, 64, true, true);
+
+        sprintf_s(errorMessageBuffer, 512,
+            "Error registering class '%s' - that name is already taken by a different class.\n"
+            "New class's UUID is %s\n"
+            "Existing class's UUID is %s\n"
+            "You may not have duplicate class names.\n"
+            "Check for duplicate plugins or copy and pasted code for plugins.",
+            pClassDesc->ClassName().toUtf8().constData(),
+            newUUIDString,
+            existingUUIDString);
+
+        CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate Class Name", MB_OK);
+        return;
+    }
+
+#if defined(DEBUG_CLASS_NAME_REGISTRATION)
+    m_debugClassNames.push_back(pClassDesc->ClassName());
+#endif // DEBUG_CLASS_NAME_REGISTRATION
+
+    m_classes.push_back(pClassDesc);
+    m_guidToClass[pClassDesc->ClassID()] = pClassDesc;
+    m_nameToClass[pClassDesc->ClassName()] = pClassDesc;
+}
+
+IClassDesc* CClassFactory::FindClass(const char* pClassName) const
+{
+    IClassDesc* pClassDesc = stl::find_in_map(m_nameToClass, pClassName, (IClassDesc*)nullptr);
+
+    if (pClassDesc)
+    {
+        return pClassDesc;
+    }
+
+    const char* pSubClassName = strstr(pClassName, "::");
+
+    if (!pSubClassName)
+    {
+        return NULL;
+    }
+
+    QString name = QString(pClassName).left(pSubClassName - pClassName);
+
+    return stl::find_in_map(m_nameToClass, name, (IClassDesc*)nullptr);
+}
+
+IClassDesc* CClassFactory::FindClass(const GUID& rClassID) const
+{
+    IClassDesc* pClassDesc = stl::find_in_map(m_guidToClass, rClassID, (IClassDesc*)nullptr);
+
+    return pClassDesc;
+}
+
+IViewPaneClass* CClassFactory::FindViewPaneClassByTitle(const char* pPaneTitle) const
+{
+    for (size_t i = 0; i < m_classes.size(); i++)
+    {
+        IViewPaneClass* viewPane = nullptr;
+        IClassDesc* desc = m_classes[i];
+        if (SUCCEEDED(desc->QueryInterface(__uuidof(IViewPaneClass), (void**)&viewPane)))
+        {
+            if (QString::compare(viewPane->GetPaneTitle(), pPaneTitle) == 0)
+            {
+                return viewPane;
+            }
+        }
+    }
+    return nullptr;
+}
+
+void CClassFactory::UnregisterClass(const char* pClassName)
+{
+    IClassDesc* pClassDesc = FindClass(pClassName);
+
+    if (pClassDesc == NULL)
+    {
+        return;
+    }
+
+#if defined(DEBUG_CLASS_NAME_REGISTRATION)
+    stl::find_and_erase(m_debugClassNames, pClassDesc->ClassName());
+#endif // DEBUG_CLASS_NAME_REGISTRATION
+
+    stl::find_and_erase(m_classes, pClassDesc);
+    stl::member_find_and_erase(m_guidToClass, pClassDesc->ClassID());
+    stl::member_find_and_erase(m_nameToClass, pClassDesc->ClassName());
+}
+
+void CClassFactory::UnregisterClass(const GUID& rClassID)
+{
+    IClassDesc* pClassDesc = FindClass(rClassID);
+
+    if (!pClassDesc)
+    {
+        return;
+    }
+
+#if defined(DEBUG_CLASS_NAME_REGISTRATION)
+    stl::find_and_erase(m_debugClassNames, pClassDesc->ClassName());
+#endif // DEBUG_CLASS_NAME_REGISTRATION
+
+    stl::find_and_erase(m_classes, pClassDesc);
+    stl::member_find_and_erase(m_guidToClass, pClassDesc->ClassID());
+    stl::member_find_and_erase(m_nameToClass, pClassDesc->ClassName());
+}
+
+bool ClassDescNameCompare(IClassDesc* pArg1, IClassDesc* pArg2)
+{
+    return (QString::compare(pArg1->ClassName(), pArg2->ClassName(), Qt::CaseInsensitive) < 0);
+}
+
+void CClassFactory::GetClassesBySystemID(ESystemClassID aSystemClassID, std::vector<IClassDesc*>& rOutClasses)
+{
+    rOutClasses.clear();
+
+    for (size_t i = 0; i < m_classes.size(); ++i)
+    {
+        if (m_classes[i]->SystemClassID() == aSystemClassID)
+        {
+            rOutClasses.push_back(m_classes[i]);
+        }
+    }
+
+    std::sort(rOutClasses.begin(), rOutClasses.end(), ClassDescNameCompare);
+}
+
+void CClassFactory::GetClassesByCategory(const char* pCategory, std::vector<IClassDesc*>& rOutClasses)
+{
+    rOutClasses.clear();
+
+    for (size_t i = 0; i < m_classes.size(); ++i)
+    {
+        if (!QString::compare(pCategory, m_classes[i]->Category(), Qt::CaseInsensitive))
+        {
+            rOutClasses.push_back(m_classes[i]);
+        }
+    }
+
+    std::sort(rOutClasses.begin(), rOutClasses.end(), ClassDescNameCompare);
+}
diff --git a/Code/Editor/Plugin.h b/Code/Editor/Plugin.h
new file mode 100644
index 0000000000..c5811d96de
--- /dev/null
+++ b/Code/Editor/Plugin.h
@@ -0,0 +1,142 @@
+/*
+ * 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_EDITOR_PLUGIN_H
+#define CRYINCLUDE_EDITOR_PLUGIN_H
+#include "Include/IEditorClassFactory.h"
+
+#include "Util/GuidUtil.h"
+
+//! Derive from this class to decrease the amount of work for creating a new class description
+//! Provides standard reference counter implementation for IUnknown
+class CRefCountClassDesc
+    : public IClassDesc
+{
+public:
+    virtual ~CRefCountClassDesc() { }
+    HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] const IID& riid, [[maybe_unused]] void** ppvObj)
+    {
+        return E_NOINTERFACE;
+    }
+
+    ULONG STDMETHODCALLTYPE AddRef()
+    {
+        ++m_nRefCount;
+        return m_nRefCount;
+    }
+
+    ULONG STDMETHODCALLTYPE Release()
+    {
+        int refs = m_nRefCount;
+
+        if (--m_nRefCount <= 0)
+        {
+            delete this;
+        }
+
+        return refs;
+    }
+
+private:
+    int m_nRefCount;
+};
+
+
+// Use this for debugging unregistration problems.
+//#define DEBUG_CLASS_NAME_REGISTRATION
+
+
+//! Class factory is a common repository of all registered plugin classes,
+//! Classes here can found by their class ID or all classes of given system class retrieved
+class CRYEDIT_API CClassFactory
+    : public IEditorClassFactory
+{
+public:
+    CClassFactory();
+    ~CClassFactory();
+
+    //! Access class factory singleton.
+    static CClassFactory* Instance();
+    //! Register a new class to the factory
+    void RegisterClass(IClassDesc* pClassDesc);
+    //! Find class in the factory by class name
+    IClassDesc* FindClass(const char* className) const;
+    //! Find class in the factory by class ID
+    IClassDesc* FindClass(const GUID& rClassID) const;
+    //! Find View Pane Class in the factory by pane title
+    IViewPaneClass* FindViewPaneClassByTitle(const char* pPaneTitle) const;
+    void UnregisterClass(const char* pClassName);
+    void UnregisterClass(const GUID& rClassID);
+    //! Get classes matching specific requirements ordered alphabetically by name.
+    void GetClassesBySystemID(ESystemClassID aSystemClassID, std::vector<IClassDesc*>& rOutClasses);
+    void GetClassesByCategory(const char* pCategory, std::vector<IClassDesc*>& rOutClasses);
+
+private:
+    void RegisterAutoTypes();
+
+    typedef std::map<QString, IClassDesc*> TNameMap;
+    typedef std::map<GUID, IClassDesc*, guid_less_predicate> TGuidMap;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    TNameMap m_nameToClass;
+    TGuidMap m_guidToClass;
+    std::vector<IClassDesc*> m_classes;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+#if defined(DEBUG_CLASS_NAME_REGISTRATION)
+    // This vector will mirror that of CClassFactory::m_classes.
+    // When a class description is destroyed without being unregistered first
+    // (i.e. from within plugins is a common scenario) you will get a crash
+    // in ~CClassFactory as it's Releasing m_classes.
+    // When you hit that crash, take the index and look into this vector at
+    // the class name.  That class did not unregister before it was released.
+    std::vector<string> m_debugClassNames;
+#endif // DEBUG_CLASS_NAME_REGISTRATION
+
+    static CClassFactory* s_pInstance;
+};
+
+//! Auto registration for classes
+class CAutoRegisterClassHelper
+{
+public:
+    CAutoRegisterClassHelper(IClassDesc* pClassDesc)
+    {
+        m_pClassDesc = pClassDesc;
+        m_pNext = 0;
+
+        if (!s_pLast)
+        {
+            s_pFirst = this;
+        }
+        else
+        {
+            s_pLast->m_pNext = this;
+        }
+
+        s_pLast = this;
+    }
+
+    IClassDesc* m_pClassDesc;
+    CAutoRegisterClassHelper* m_pNext;
+    static CAutoRegisterClassHelper* s_pFirst;
+    static CAutoRegisterClassHelper* s_pLast;
+};
+
+// Use this define to automatically register a new class description.
+#define REGISTER_CLASS_DESC(ClassDesc) \
+    CAutoRegisterClassHelper g_AutoRegHelper##ClassDesc(new ClassDesc);
+
+#define REGISTER_QT_CLASS_DESC(ClassDesc, name, category) \
+    CAutoRegisterClassHelper g_AutoRegHelper##ClassDesc(new CQtViewClass<ClassDesc>(name, category));
+
+#define REGISTER_QT_CLASS_DESC_SYSTEM_ID(ClassDesc, name, category, systemid) \
+    CAutoRegisterClassHelper g_AutoRegHelper##ClassDesc(new CQtViewClass<ClassDesc>(name, category, systemid));
+
+#endif // CRYINCLUDE_EDITOR_PLUGIN_H
diff --git a/Code/Editor/PluginManager.cpp b/Code/Editor/PluginManager.cpp
new file mode 100644
index 0000000000..de09d90b78
--- /dev/null
+++ b/Code/Editor/PluginManager.cpp
@@ -0,0 +1,362 @@
+/*
+ * 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 "PluginManager.h"
+
+// Qt
+#include <QLibrary>
+
+// Editor
+#include "Include/IPlugin.h"
+
+
+typedef IPlugin* (* TPfnCreatePluginInstance)(PLUGIN_INIT_PARAM* pInitParam);
+typedef void (* TPfnQueryPluginSettings)(SPluginSettings&);
+
+CPluginManager::CPluginManager()
+{
+    m_currentUUID = 0;
+}
+
+CPluginManager::~CPluginManager()
+{
+    ReleaseAllPlugins();
+    UnloadAllPlugins();
+}
+
+
+void CPluginManager::ReleaseAllPlugins()
+{
+    CLogFile::WriteLine("[Plugin Manager] Releasing all previous plugins");
+
+    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
+    {
+        if (it->pPlugin)
+        {
+            it->pPlugin->Release();
+            it->pPlugin = nullptr;
+        }
+    }
+
+    m_pluginEventMap.clear();
+    m_uuidPluginMap.clear();
+}
+
+void CPluginManager::UnloadAllPlugins()
+{
+    CLogFile::WriteLine("[Plugin Manager] Unloading all previous plugins");
+
+    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
+    {
+        if (it->pPlugin)
+        {
+            it->pPlugin->Release();
+            it->pPlugin = nullptr;
+        }
+
+        if (it->hLibrary)
+        {
+            it->hLibrary->unload();
+            delete it->hLibrary;
+        }
+    }
+
+    m_plugins.clear();
+    m_pluginEventMap.clear();
+    m_uuidPluginMap.clear();
+}
+
+
+namespace
+{
+    IPlugin* SafeCallFactory(
+        TPfnCreatePluginInstance pfnFactory,
+        PLUGIN_INIT_PARAM* pInitParam,
+        const char* szFilePath)
+    {
+        IPlugin* pIPlugin = pfnFactory(pInitParam);
+        if (!pIPlugin)
+        {
+            if (AZ::Debug::Trace::IsDebuggerPresent())
+            {
+                AZ::Debug::Trace::Break();
+            }
+            CLogFile::FormatLine("Can't initialize plugin '%s'! Possible binary version incompatibility. Please reinstall this plugin.", szFilePath);
+        }
+
+        return pIPlugin;
+    }
+}
+
+namespace
+{
+    struct SPlugin
+    {
+        QString m_path;
+        QString m_name;
+    };
+
+    // This does a topological sort on the plugin list. It will also remove plugins that have
+    // missing dependencies or there is a cycle in the dependency tree.
+    void SortPluginsByDependency(std::list<SPlugin>& plugins)
+    {
+        std::list<SPlugin> finalList;
+        std::set<QString, stl::less_stricmp<QString> > loadedPlugins;
+
+        while (!plugins.empty())
+        {
+            for (auto iter = plugins.begin(); iter != plugins.end(); )
+            {
+                finalList.push_back(*iter);
+                loadedPlugins.insert(iter->m_name);
+                iter = plugins.erase(iter);
+            }
+        }
+        plugins = finalList;
+    }
+}
+
+bool CPluginManager::LoadPlugins(const char* pPathWithMask)
+{
+    QString strPath = QtUtil::ToQString(PathUtil::GetPath(pPathWithMask));
+    QString strMask = QString::fromUtf8(PathUtil::GetFile(pPathWithMask));
+
+    CLogFile::WriteLine("[Plugin Manager] Loading plugins...");
+
+    if (!QFileInfo::exists(strPath))
+    {
+        CLogFile::FormatLine("[Plugin Manager] Cannot find plugin directory '%s'", strPath.toUtf8().data());
+        return false;
+    }
+
+    std::list<SPlugin> plugins;
+    {
+        // LY_EDITOR_PLUGINS is defined by the CMakeLists.txt. The editor plugins add themselves to a variable that
+        // the editor uses to pass it to the build. Once a plugin is deleted, it will stop being in such variable producing
+        // the editor to not load that plugin anymore, even if it is in the output folder.
+#if defined(LY_EDITOR_PLUGINS)
+        QDir qPath(strPath);
+        AZStd::vector<AZStd::string> tokens;
+        AZ::StringFunc::Tokenize(AZStd::string_view(LY_EDITOR_PLUGINS), tokens, ',');
+        for (const AZStd::string& token : tokens)
+        {
+            SPlugin plugin;
+            plugin.m_name = QString(token.c_str());
+            plugin.m_path = qPath.absoluteFilePath(plugin.m_name);
+            plugins.push_back(plugin);
+        }
+#endif
+    }
+    if (plugins.size() == 0)
+    {
+        CLogFile::FormatLine("[Plugin Manager] Cannot find any plugins in plugin directory '%s'", strPath.toUtf8().data());
+        return false;
+    }
+
+    // Sort plugins by dependency
+    SortPluginsByDependency(plugins);
+
+    for (auto iter = plugins.begin(); iter != plugins.end(); ++iter)
+    {
+        // Load the plugin's DLL
+        QLibrary *hPlugin = new QLibrary(iter->m_path);
+        hPlugin->setLoadHints(QLibrary::DeepBindHint);
+
+        AZStd::string pathUtf8(iter->m_path.toUtf8().constData());
+
+        if (!hPlugin->load())
+        {
+            AZStd::string errorMsg(hPlugin->errorString().toUtf8().constData());
+            CLogFile::FormatLine("[Plugin Manager] Can't load plugin DLL '%s' message '%s' !", pathUtf8.c_str(), errorMsg.c_str());
+            delete hPlugin;
+            continue;
+        }
+
+        // Open 3D Engine:
+        // Query the plugin settings, check for manual load...
+        TPfnQueryPluginSettings pfnQuerySettings = reinterpret_cast<TPfnQueryPluginSettings>(hPlugin->resolve("QueryPluginSettings"));
+
+        if (pfnQuerySettings != nullptr)
+        {
+            SPluginSettings settings {
+                0
+            };
+            pfnQuerySettings(settings);
+            if (!settings.autoLoad)
+            {
+                CLogFile::FormatLine("[Plugin Manager] Skipping plugin DLL '%s' because it is marked as non-autoLoad!", pathUtf8.c_str());
+                hPlugin->unload();
+                delete hPlugin;
+                continue;
+            }
+        }
+
+        // Query the factory pointer
+        TPfnCreatePluginInstance pfnFactory = reinterpret_cast<TPfnCreatePluginInstance>(hPlugin->resolve("CreatePluginInstance"));
+
+        if (!pfnFactory)
+        {
+            CLogFile::FormatLine("[Plugin Manager] Cannot query plugin DLL '%s' factory pointer (is it a Sandbox plugin?)", pathUtf8.c_str());
+            hPlugin->unload();
+            delete hPlugin;
+            continue;
+        }
+
+        IPlugin* pPlugin = NULL;
+        PLUGIN_INIT_PARAM sInitParam =
+        {
+            GetIEditor(),
+            SANDBOX_PLUGIN_SYSTEM_VERSION,
+            IPlugin::eError_None
+        };
+
+        // Create an instance of the plugin
+        pPlugin = SafeCallFactory(pfnFactory, &sInitParam, iter->m_path.toUtf8().data());
+        if (!pPlugin)
+        {
+            CLogFile::FormatLine("[Plugin Manager] Cannot initialize plugin '%s'! Possible binary version incompatibility. Please reinstall this plugin.", pathUtf8.c_str());
+            assert(pPlugin);
+            hPlugin->unload();
+            delete hPlugin;
+            continue;
+        }
+
+        if (!pPlugin)
+        {
+            if (sInitParam.outErrorCode == IPlugin::eError_VersionMismatch)
+            {
+                CLogFile::FormatLine("[Plugin Manager] Cannot create instance of plugin DLL '%s'! Version mismatch. Please update the plugin.", pathUtf8.c_str());
+            }
+            else
+            {
+                CLogFile::FormatLine("[Plugin Manager] Cannot create instance of plugin DLL '%s'! Error code %u.", pathUtf8.c_str(), sInitParam.outErrorCode);
+            }
+
+            hPlugin->unload();
+            delete hPlugin;
+
+            continue;
+        }
+
+        RegisterPlugin(hPlugin, pPlugin);
+
+        // Write log string about plugin
+        CLogFile::FormatLine("[Plugin Manager] Successfully loaded plugin '%s', version '%i' (GUID: %s)",
+            pPlugin->GetPluginName(), pPlugin->GetPluginVersion(), pPlugin->GetPluginGUID());
+    }
+
+    return true;
+}
+
+void CPluginManager::RegisterPlugin(QLibrary* dllHandle, IPlugin* pPlugin)
+{
+    SPluginEntry entry;
+
+    entry.hLibrary = dllHandle;
+    entry.pPlugin = pPlugin;
+    m_plugins.push_back(entry);
+    m_uuidPluginMap[m_currentUUID] = pPlugin;
+    ++m_currentUUID;
+}
+
+IPlugin* CPluginManager::GetPluginByGUID(const char* pGUID)
+{
+    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
+    {
+        const char* pPluginGuid = it->pPlugin->GetPluginGUID();
+
+        if (pPluginGuid && !strcmp(pPluginGuid, pGUID))
+        {
+            return it->pPlugin;
+        }
+    }
+
+    return NULL;
+}
+
+IPlugin* CPluginManager::GetPluginByUIID(uint8 iUserInterfaceID)
+{
+    TUIIDPluginIt it;
+
+    it = m_uuidPluginMap.find(iUserInterfaceID);
+
+    if (it == m_uuidPluginMap.end())
+    {
+        return NULL;
+    }
+
+    return (*it).second;
+}
+
+IUIEvent* CPluginManager::GetEventByIDAndPluginID(uint8 aPluginID, uint8 aEventID)
+{
+    // Return the event interface of a user interface element which is
+    // specified by its ID and the user interface ID of the plugin which
+    // created the UI element
+
+    IPlugin* pPlugin = NULL;
+    TEventHandlerIt eventIt;
+    TPluginEventIt pluginIt;
+
+    pPlugin = GetPluginByUIID(aPluginID);
+
+    if (!pPlugin)
+    {
+        return NULL;
+    }
+
+    pluginIt = m_pluginEventMap.find(pPlugin);
+
+    if (pluginIt == m_pluginEventMap.end())
+    {
+        return NULL;
+    }
+
+    eventIt = (*pluginIt).second.find(aEventID);
+
+    if (eventIt == (*pluginIt).second.end())
+    {
+        return NULL;
+    }
+
+    return (*eventIt).second;
+}
+
+bool CPluginManager::CanAllPluginsExitNow()
+{
+    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
+    {
+        if (it->pPlugin)
+        {
+            if (!it->pPlugin->CanExitNow())
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+void CPluginManager::AddHandlerForCmdID(IPlugin* pPlugin, uint8 aCmdID, IUIEvent* pEvent)
+{
+    m_pluginEventMap[pPlugin][aCmdID] = pEvent;
+}
+
+void CPluginManager::NotifyPlugins(EEditorNotifyEvent aEventId)
+{
+    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
+    {
+        if (it->pPlugin)
+        {
+            it->pPlugin->OnEditorNotify(aEventId);
+        }
+    }
+}
diff --git a/Code/Editor/PluginManager.h b/Code/Editor/PluginManager.h
new file mode 100644
index 0000000000..c4542bc742
--- /dev/null
+++ b/Code/Editor/PluginManager.h
@@ -0,0 +1,74 @@
+/*
+ * 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_EDITOR_PLUGINMANAGER_H
+#define CRYINCLUDE_EDITOR_PLUGINMANAGER_H
+
+class QLibrary;
+struct IPlugin;
+
+struct SPluginEntry
+{
+    QLibrary *hLibrary = nullptr;
+    IPlugin* pPlugin = nullptr;
+};
+
+typedef std::list<SPluginEntry> TPluginList;
+
+// Event IDs associated with event handlers
+typedef std::map<int, IUIEvent*> TEventHandlerMap;
+typedef TEventHandlerMap::iterator TEventHandlerIt;
+
+// Plugins associated with ID / handler maps
+typedef std::map<IPlugin*, TEventHandlerMap> TPluginEventMap;
+typedef TPluginEventMap::iterator TPluginEventIt;
+
+// UI IDs associated with plugin pointers. When a plugin UI element is
+// activated, the ID is used to determine which plugin should handle
+// the event
+typedef std::map<uint8, IPlugin*> TUIIDPluginMap;
+typedef TUIIDPluginMap::iterator TUIIDPluginIt;
+
+class SANDBOX_API CPluginManager
+{
+public:
+    CPluginManager();
+    virtual ~CPluginManager();
+
+    bool LoadPlugins(const char* pPathWithMask);
+
+    // release all plugins (ie, call Release() on them) - but don't drop their DLL
+    void ReleaseAllPlugins();
+
+    // actually drop their DLL.
+    void UnloadAllPlugins();
+
+    bool CanAllPluginsExitNow();
+    void AddHandlerForCmdID(IPlugin* pPlugin, uint8 aCmdID, IUIEvent* pEvent);
+    void NotifyPlugins(EEditorNotifyEvent aEventId);
+
+    IPlugin* GetPluginByGUID(const char* pGUID);
+    IPlugin* GetPluginByUIID(uint8 iUserInterfaceID);
+    IUIEvent* GetEventByIDAndPluginID(uint8 iPluginID, uint8 iEvtID);
+    void RegisterPlugin(QLibrary* dllHandle, IPlugin* pPlugin);
+    const TPluginList& GetPluginList() const
+    {
+        return m_plugins;
+    }
+
+protected:
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    TPluginList m_plugins;
+    TPluginEventMap m_pluginEventMap;
+    TUIIDPluginMap m_uuidPluginMap;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    int m_currentUUID;
+};
+#endif // CRYINCLUDE_EDITOR_PLUGINMANAGER_H
diff --git a/Code/Editor/Plugins/CMakeLists.txt b/Code/Editor/Plugins/CMakeLists.txt
new file mode 100644
index 0000000000..bfa52f0c0d
--- /dev/null
+++ b/Code/Editor/Plugins/CMakeLists.txt
@@ -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
+#
+#
+
+add_subdirectory(EditorCommon)
+add_subdirectory(ComponentEntityEditorPlugin)
+add_subdirectory(FFMPEGPlugin)
+add_subdirectory(ProjectSettingsTool)
+add_subdirectory(PerforcePlugin)
+add_subdirectory(EditorAssetImporter)
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt b/Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
new file mode 100644
index 0000000000..4744b4e174
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
@@ -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
+#
+#
+
+if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+ly_add_target(
+    NAME ComponentEntityEditorPlugin MODULE
+    NAMESPACE Legacy
+    OUTPUT_SUBDIRECTORY EditorPlugins
+    AUTOMOC
+    AUTOUIC
+    AUTORCC
+    FILES_CMAKE
+        componententityeditorplugin_files.cmake
+    COMPILE_DEFINITIONS
+        PRIVATE
+            PLUGIN_EXPORTS
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+    BUILD_DEPENDENCIES
+        PRIVATE
+            3rdParty::Qt::Core
+            AZ::AzCore
+            AZ::AzToolsFramework
+            Legacy::CryCommon
+            Legacy::EditorLib
+            AZ::AtomCore
+            Gem::Atom_RPI.Public
+            Gem::AtomToolsFramework.Static
+            Gem::LmbrCentral.Editor
+    RUNTIME_DEPENDENCIES
+        Gem::LmbrCentral.Editor
+)
+
+ly_add_dependencies(Editor ComponentEntityEditorPlugin)
+set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::ComponentEntityEditorPlugin>)
+
+################################################################################
+# Tests
+################################################################################
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+
+    ly_add_target(
+        NAME ComponentEntityEditorPlugin.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+        NAMESPACE Legacy
+        AUTOMOC
+        FILES_CMAKE
+            componententityeditorplugin_test_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                .
+        BUILD_DEPENDENCIES
+            PRIVATE
+                3rdParty::Qt::Core
+                3rdParty::Qt::Gui
+                3rdParty::Qt::Widgets
+                AZ::AzTest
+                AZ::AzToolsFramework
+                AZ::AzToolsFrameworkTestCommon
+                Legacy::CryCommon
+                Legacy::EditorLib
+                Gem::LmbrCentral.Editor
+        RUNTIME_DEPENDENCIES
+            Gem::LmbrCentral.Editor
+    )
+    ly_add_googletest(
+        NAME Legacy::ComponentEntityEditorPlugin.Tests
+    )
+endif()
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp
new file mode 100644
index 0000000000..e26b49af32
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp
@@ -0,0 +1,210 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+#include "ComponentEntityEditorPlugin.h"
+
+#include <LyViewPaneNames.h>
+#include "IResourceSelectorHost.h"
+
+#include "UI/QComponentEntityEditorMainWindow.h"
+#include "UI/QComponentEntityEditorOutlinerWindow.h"
+#include "UI/QComponentLevelEntityEditorMainWindow.h"
+#include "UI/ComponentPalette/ComponentPaletteSettings.h"
+#include "UI/ComponentPalette/ComponentPaletteWindow.h"
+
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Component/EntityUtils.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/containers/vector.h>
+
+#include <AzFramework/API/ApplicationAPI.h>
+
+#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx>
+
+#include "SandboxIntegration.h"
+#include "Objects/ComponentEntityObject.h"
+
+namespace ComponentEntityEditorPluginInternal
+{
+    void RegisterSandboxObjects()
+    {
+        GetIEditor()->GetClassFactory()->RegisterClass(new CTemplateObjectClassDesc<CComponentEntityObject>("ComponentEntity", "", "", OBJTYPE_AZENTITY, 201, "*.entity"));
+
+        AZ::SerializeContext* serializeContext = nullptr;
+        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ_Assert(serializeContext, "Serialization context not available");
+
+        if (serializeContext)
+        {
+            ComponentPaletteSettings::Reflect(serializeContext);
+        }
+    }
+
+    void UnregisterSandboxObjects()
+    {
+        GetIEditor()->GetClassFactory()->UnregisterClass("ComponentEntity");
+    }
+
+
+    void CheckComponentDeclarations()
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
+        if (!serializeContext)
+        {
+            return;
+        }
+
+        // Catch the common mistake of reflecting a Component to SerializeContext
+        // without declaring how it inherits from AZ::Component.
+
+        // Collect violators so we can list them all in one message, rather than raising N popups.
+        AZStd::vector<AZ::ComponentDescriptor*> componentsLackingBaseClass;
+
+        AZ::EBusAggregateResults<AZ::ComponentDescriptor*> allComponentDescriptors;
+        AZ::ComponentDescriptorBus::BroadcastResult(allComponentDescriptors, &AZ::ComponentDescriptorBus::Events::GetDescriptor);
+        for (AZ::ComponentDescriptor* componentDescriptor : allComponentDescriptors.values)
+        {
+            const AZ::TypeId& componentTypeId = componentDescriptor->GetUuid();
+            const AZ::TypeId& typeOfAZComponent = azrtti_typeid<AZ::Component>();
+
+            if (const AZ::SerializeContext::ClassData* serializeData = serializeContext->FindClassData(componentTypeId))
+            {
+                if (!AZ::EntityUtils::CheckIfClassIsDeprecated(serializeContext, componentTypeId)
+                    && !AZ::EntityUtils::CheckDeclaresSerializeBaseClass(serializeContext, typeOfAZComponent, componentTypeId))
+                {
+                    componentsLackingBaseClass.push_back(componentDescriptor);
+                }
+            }
+        }
+
+        AZStd::string message;
+
+        for (AZ::ComponentDescriptor* componentDescriptor : componentsLackingBaseClass)
+        {
+            message.append(AZStd::string::format("- %s %s\n",
+                componentDescriptor->GetName(),
+                componentDescriptor->GetUuid().ToString<AZStd::string>().c_str()));
+        }
+
+        if (!message.empty())
+        {
+            message.insert(0, "Programmer error:\nClasses deriving from AZ::Component are not declaring their base class to SerializeContext.\n"
+                              "This will cause unexpected behavior such as components shifting around, or duplicating themselves.\n"
+                              "Affected components:\n");
+            message.append("\nReflection code should look something like this:\n"
+                "serializeContext->Class<MyComponent, AZ::Component, ... (other base classes, if any) ...>()"
+                "\nMake sure the Reflect function is called for all base classes as well.");
+
+            // this happens during startup, and its a programmer error - so during startup, make it an error, so it shows as a pretty noisy
+            // popup box.  Its important that programmers fix this, before they submit their code, so that data corruption / data loss does 
+            // not occur.
+            AZ_Error("Serialize", false, message.c_str());
+        }
+    }
+} // end namespace ComponentEntityEditorPluginInternal
+
+ComponentEntityEditorPlugin::ComponentEntityEditorPlugin([[maybe_unused]] IEditor* editor)
+    : m_registered(false)
+{
+    m_appListener = new SandboxIntegrationManager();
+    m_appListener->Setup();
+
+    using namespace AzToolsFramework;
+
+    ViewPaneOptions inspectorOptions;
+    inspectorOptions.canHaveMultipleInstances = true;
+    inspectorOptions.preferedDockingArea = Qt::RightDockWidgetArea;
+    RegisterViewPane<QComponentEntityEditorInspectorWindow>(
+        LyViewPane::EntityInspector,
+        LyViewPane::CategoryTools,
+        inspectorOptions);
+
+    ViewPaneOptions pinnedInspectorOptions;
+    pinnedInspectorOptions.canHaveMultipleInstances = true;
+    pinnedInspectorOptions.preferedDockingArea = Qt::NoDockWidgetArea;
+    pinnedInspectorOptions.paneRect = QRect(50, 50, 400, 700);
+    pinnedInspectorOptions.showInMenu = false;
+    RegisterViewPane<QComponentEntityEditorInspectorWindow>(
+        LyViewPane::EntityInspectorPinned,
+        LyViewPane::CategoryTools,
+        pinnedInspectorOptions);
+
+    bool prefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    if (prefabSystemEnabled)
+    {
+        // Add the new Outliner to the Tools Menu
+
+        ViewPaneOptions outlinerOptions;
+        outlinerOptions.canHaveMultipleInstances = true;
+        outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
+
+        RegisterViewPane<QEntityOutlinerWindow>(
+            LyViewPane::EntityOutliner,
+            LyViewPane::CategoryTools,
+            outlinerOptions);
+    }
+    else
+    {
+        ViewPaneOptions levelInspectorOptions;
+        levelInspectorOptions.canHaveMultipleInstances = false;
+        levelInspectorOptions.preferedDockingArea = Qt::RightDockWidgetArea;
+        levelInspectorOptions.paneRect = QRect(50, 50, 400, 700);
+        RegisterViewPane<QComponentLevelEntityEditorInspectorWindow>(
+            LyViewPane::LevelInspector, LyViewPane::CategoryTools, levelInspectorOptions);
+
+        // Add the Legacy Outliner to the Tools Menu
+        ViewPaneOptions outlinerOptions;
+        outlinerOptions.canHaveMultipleInstances = true;
+        outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
+
+        // this pane was originally introduced with this name, so layout settings are all saved with that name, despite the preview label being removed.
+        outlinerOptions.saveKeyName = "Entity Outliner (PREVIEW)";
+
+        RegisterViewPane<QComponentEntityEditorOutlinerWindow>(
+            LyViewPane::EntityOutliner,
+            LyViewPane::CategoryTools,
+            outlinerOptions);
+
+        AzToolsFramework::ViewPaneOptions options;
+        options.preferedDockingArea = Qt::NoDockWidgetArea;
+        RegisterViewPane<SliceRelationshipWidget>(LyViewPane::SliceRelationships, LyViewPane::CategoryTools, options);
+    }
+
+    RegisterModuleResourceSelectors(GetIEditor()->GetResourceSelectorHost());
+
+    ComponentEntityEditorPluginInternal::RegisterSandboxObjects();
+
+    // Check for common mistakes in component declarations
+    ComponentEntityEditorPluginInternal::CheckComponentDeclarations();
+
+    m_registered = true;
+}
+
+void ComponentEntityEditorPlugin::Release()
+{
+    if (m_registered)
+    {
+        using namespace AzToolsFramework;
+
+        UnregisterViewPane(LyViewPane::EntityInspector);
+        UnregisterViewPane(LyViewPane::EntityOutliner);
+        UnregisterViewPane(LyViewPane::EntityInspectorPinned);
+
+        ComponentEntityEditorPluginInternal::UnregisterSandboxObjects();
+    }
+
+    m_appListener->Teardown();
+    delete m_appListener;
+
+    delete this;
+}
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.h
new file mode 100644
index 0000000000..27479ff9b3
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+#include <IEditor.h>
+#include <Include/IPlugin.h>
+
+//------------------------------------------------------------------
+class ComponentEntityEditorPlugin
+    : public IPlugin
+{
+public:
+    ComponentEntityEditorPlugin(IEditor* editor);
+    virtual ~ComponentEntityEditorPlugin() = default;
+
+    void Release() override;
+    void ShowAbout() override {}
+    const char* GetPluginGUID() override { return "{11B0041C-BC34-4827-A3E4-AB7458FFF678}"; }
+    DWORD GetPluginVersion() override { return 1; }
+    const char* GetPluginName() override { return "ComponentEntityEditor"; }
+    bool CanExitNow() override { return true; }
+    void OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId) override {}
+
+private:
+    bool m_registered;
+    class SandboxIntegrationManager* m_appListener;
+};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.mf b/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.mf
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.mf
rename to Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.mf
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
new file mode 100644
index 0000000000..a80ca3ace2
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/PlatformDef.h>
+
+/////////////////////////////////////////////////////////////////////////////
+// Engine
+/////////////////////////////////////////////////////////////////////////////
+#include <Cry_Math.h>
+#include <ISystem.h>
+#include <ISerialize.h>
+#include <CryName.h>
+#include <EditorDefs.h>
+#include <Resource.h>
+
+/////////////////////////////////////////////////////////////////////////////
+// STL
+/////////////////////////////////////////////////////////////////////////////
+#include <vector>
+#include <list>
+#include <map>
+#include <set>
+#include <algorithm>
+
+#ifdef CreateDirectory
+#undef CreateDirectory
+#endif
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
new file mode 100644
index 0000000000..e18909d9bc
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
@@ -0,0 +1,1044 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "ComponentEntityObject.h"
+
+
+#include "Settings.h"
+#include "IIconManager.h"
+#include "Include/IObjectManager.h"
+#include "Objects/SelectionGroup.h"
+
+#include <AzCore/Component/Entity.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/Serialization/Utils.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/Math/Transform.h>
+
+#include <AzFramework/Viewport/DisplayContextRequestBus.h>
+#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
+#include <AzToolsFramework/Commands/PreemptiveUndoCache.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorLockComponent.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h>
+#include <AzToolsFramework/ToolsComponents/SelectionComponent.h>
+#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
+#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
+#include <AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.h>
+#include <AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h>
+#include <AzToolsFramework/Undo/UndoCacheInterface.h>
+#include <LmbrCentral/Rendering/RenderNodeBus.h>
+#include <LmbrCentral/Rendering/MaterialOwnerBus.h>
+
+#include <IDisplayViewport.h>
+#include <MathConversion.h>
+#include <TrackView/TrackViewAnimNode.h>
+#include <ViewManager.h>
+#include <Viewport.h>
+
+/**
+ * Scalars for icon drawing behavior.
+ */
+static const int s_kIconSize              = 36;       /// Icon display size (in pixels)
+static const float s_kIconMaxWorldDist    = 200.f;    /// Icons are culled past this range
+static const float s_kIconMinScale        = 0.1f;     /// Minimum scale for icons in the distance
+static const float s_kIconMaxScale        = 1.0f;     /// Maximum scale for icons near the camera
+static const float s_kIconCloseDist       = 3.f;      /// Distance at which icons are at maximum scale
+static const float s_kIconFarDist         = 40.f;     /// Distance at which icons are at minimum scale
+
+CComponentEntityObject::CComponentEntityObject()
+    : m_hasIcon(false)
+    , m_entityIconVisible(false)
+    , m_iconOnlyHitTest(false)
+    , m_drawAccents(true)
+    , m_accentType(AzToolsFramework::EntityAccentType::None)
+    , m_isIsolated(false)
+    , m_iconTexture(nullptr)
+{
+}
+
+CComponentEntityObject::~CComponentEntityObject()
+{
+    DeleteEntity();
+}
+
+bool CComponentEntityObject::Init(IEditor* ie, CBaseObject* copyFrom, const QString& file)
+{
+    SetColor(RGB(0, 255, 0));
+    SetTextureIcon(GetClassDesc()->GetTextureIconId());
+
+    // Sandbox does not serialize this object with others in the layer.
+    SetFlags(OBJFLAG_DONT_SAVE);
+
+    const bool result = CEntityObject::Init(ie, copyFrom, file);
+
+    return result;
+}
+
+void CComponentEntityObject::UpdatePreemptiveUndoCache()
+{
+    using namespace AzToolsFramework;
+
+    auto undoCacheInterface = AZ::Interface<UndoSystem::UndoCacheInterface>::Get();
+    if (undoCacheInterface)
+    {
+        undoCacheInterface->UpdateCache(m_entityId);
+    }
+}
+
+void CComponentEntityObject::AssignEntity(AZ::Entity* entity, bool destroyOld)
+{
+    const AZ::EntityId newEntityId = entity ? entity->GetId() : AZ::EntityId();
+
+    if (m_entityId.IsValid())
+    {
+        AZ::TransformNotificationBus::Handler::BusDisconnect();
+        LmbrCentral::RenderBoundsNotificationBus::Handler::BusDisconnect();
+        AzToolsFramework::ComponentEntityEditorRequestBus::Handler::BusDisconnect();
+        AZ::EntityBus::Handler::BusDisconnect();
+        AzToolsFramework::ComponentEntityObjectRequestBus::Handler::BusDisconnect();
+        AzToolsFramework::EditorLockComponentNotificationBus::Handler::BusDisconnect();
+        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusDisconnect();
+        AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler::BusDisconnect();
+
+        if (destroyOld && m_entityId != newEntityId)
+        {
+            EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, DestroyEditorEntity, m_entityId);
+        }
+
+        m_entityId.SetInvalid();
+    }
+
+    if (entity)
+    {
+        m_entityId = entity->GetId();
+
+        // note: GetObjectManager() will always be valid during normal operation but
+        // will not exist when running unit tests
+        if (IObjectManager* objectManager = GetObjectManager())
+        {
+            // Use the entity id to generate a GUID for this CEO because we need it to stay consistent for systems
+            // that register by GUID such as undo/redo since our own undo/redo system constantly recreates CEOs
+            GUID entityBasedGUID;
+            entityBasedGUID.Data1 = 0;
+            entityBasedGUID.Data2 = 0;
+            entityBasedGUID.Data3 = 0;
+            static_assert(sizeof(m_entityId) >= sizeof(entityBasedGUID.Data4), "The data contained in entity Id should fit inside Data4, if not switch to some other method of conversion to GUID");
+            memcpy(&entityBasedGUID.Data4, &m_entityId, sizeof(entityBasedGUID.Data4));
+
+            objectManager->ChangeObjectId(GetId(), entityBasedGUID);
+
+            // Synchronize sandbox name to new entity's name.
+            {
+                EditorActionScope nameChange(m_nameReentryGuard);
+                SetName(QString(entity->GetName().c_str()));
+            }
+        }
+
+        EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, AddRequiredComponents, *entity);
+
+        AZ::TransformNotificationBus::Handler::BusConnect(m_entityId);
+        LmbrCentral::RenderBoundsNotificationBus::Handler::BusConnect(m_entityId);
+        AzToolsFramework::ComponentEntityEditorRequestBus::Handler::BusConnect(m_entityId);
+        AZ::EntityBus::Handler::BusConnect(m_entityId);
+        AzToolsFramework::ComponentEntityObjectRequestBus::Handler::BusConnect(this);
+        AzToolsFramework::EditorLockComponentNotificationBus::Handler::BusConnect(m_entityId);
+        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusConnect(m_entityId);
+        AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler::BusConnect(m_entityId);
+
+        // Synchronize transform to Sandbox.
+        AzToolsFramework::Components::TransformComponent* transformComponent =
+            entity->FindComponent<AzToolsFramework::Components::TransformComponent>();
+        if (transformComponent)
+        {
+            OnTransformChanged(transformComponent->GetLocalTM(), transformComponent->GetWorldTM());
+        }
+    }
+
+    RefreshVisibilityAndLock();
+}
+
+void CComponentEntityObject::RefreshVisibilityAndLock()
+{
+    using AzToolsFramework::EditorEntityInfoRequestBus;
+    using AzToolsFramework::EditorEntityLockComponentNotificationBus;
+    using AzToolsFramework::EditorEntityVisibilityNotificationBus;
+
+    // Lock state is tracked in 3 places:
+    // EditorLockComponent, EditorEntityModel, and ComponentEntityObject.
+    // Entities in layers have additional behavior in relation to lock state, if the layer is locked it supersedes the entity's lock state.
+    // The viewport controls for manipulating entities are disabled during lock state here in ComponentEntityObject using the OBJFLAG_FROZEN.
+    // In this case, the lock behavior should include the layer hierarchy as well, if the layer is locked this entity can't move.
+    // EditorEntityModel can report this information.
+    bool locked = false;
+    EditorEntityInfoRequestBus::EventResult(
+        locked, m_entityId, &EditorEntityInfoRequestBus::Events::IsLocked);
+
+    EditorEntityLockComponentNotificationBus::Event(
+        m_entityId, &EditorEntityLockComponentNotificationBus::Events::OnEntityLockChanged, locked);
+
+    // OBJFLAG_HIDDEN should match EditorVisibilityComponent's VisibilityFlag.
+    // Visibility state is similar to lock state in the number of areas it can be set / tracked. See the comment about the lock state above.
+    bool visibility = true;
+    EditorEntityInfoRequestBus::EventResult(
+        visibility, m_entityId, &EditorEntityInfoRequestBus::Events::IsVisible);
+
+    EditorEntityVisibilityNotificationBus::Event(
+        m_entityId, &EditorEntityVisibilityNotificationBus::Events::OnEntityVisibilityChanged, visibility);
+}
+
+void CComponentEntityObject::SetName(const QString& name)
+{
+    if (m_nameReentryGuard)
+    {
+        EditorActionScope nameChange(m_nameReentryGuard);
+
+        AZ::Entity* entity = nullptr;
+        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
+
+        if (entity)
+        {
+            entity->SetName(name.toUtf8().data());
+        }
+    }
+
+    CEntityObject::SetName(name);
+}
+
+void CComponentEntityObject::DeleteEntity()
+{
+    AssignEntity(nullptr);
+
+    CEntityObject::DeleteEntity();
+}
+
+float CComponentEntityObject::GetRadius()
+{
+    static const float s_defaultRadius = 0.5f;
+    return s_defaultRadius;
+}
+
+void CComponentEntityObject::SetSelected(bool bSelect)
+{
+    CEntityObject::SetSelected(bSelect);
+
+    if (m_selectionReentryGuard)
+    {
+        // Ignore event when received from the tools app, since the action is originating in Sandbox.
+        EditorActionScope selectionChange(m_selectionReentryGuard);
+
+        // Pass the action to the tools application.
+        if (bSelect)
+        {
+            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::MarkEntitySelected, m_entityId);
+        }
+        else
+        {
+            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::MarkEntityDeselected, m_entityId);
+        }
+    }
+
+    bool anySelected = false;
+    
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(anySelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
+
+    if (!anySelected)
+    {
+        GetIEditor()->Notify(eNotify_OnEntitiesDeselected);
+    }
+    else
+    {
+        GetIEditor()->Notify(eNotify_OnEntitiesSelected);
+    }
+}
+
+void CComponentEntityObject::SetHighlight(bool bHighlight)
+{
+    CEntityObject::SetHighlight(bHighlight);
+
+    if (m_entityId.IsValid())
+    {
+        EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, SetEntityHighlighted, m_entityId, 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)
+    {
+        EditorActionScope selectionChange(m_nameReentryGuard);
+
+        SetName(QString(name.c_str()));
+    }
+}
+
+void CComponentEntityObject::AttachChild(CBaseObject* child, bool /*bKeepPos*/)
+{
+    if (child->GetType() == OBJTYPE_AZENTITY)
+    {
+        CComponentEntityObject* childComponentEntity = static_cast<CComponentEntityObject*>(child);
+        AZ::EntityId childEntityId = childComponentEntity->GetAssociatedEntityId();
+        if (childEntityId.IsValid())
+        {
+            // The action is originating from Sandbox, so ignore the return event.
+            EditorActionScope parentChange(childComponentEntity->m_parentingReentryGuard);
+
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Editor Parent");
+                EBUS_EVENT_ID(childEntityId, AZ::TransformBus, SetParent, m_entityId);
+                undoBatch.MarkEntityDirty(childEntityId);
+            }
+
+            EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values);
+        }
+    }
+}
+
+void CComponentEntityObject::DetachAll(bool /*bKeepPos*/)
+{
+}
+
+void CComponentEntityObject::DetachThis(bool /*bKeepPos*/)
+{
+    if (m_parentingReentryGuard)
+    {
+        EditorActionScope parentChange(m_parentingReentryGuard);
+
+        if (m_entityId.IsValid())
+        {
+            AzToolsFramework::ScopedUndoBatch undoBatch("Editor Unparent");
+            EBUS_EVENT_ID(m_entityId, AZ::TransformBus, SetParent, AZ::EntityId());
+            undoBatch.MarkEntityDirty(m_entityId);
+        }
+
+        EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values);
+    }
+}
+
+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);
+}
+
+void CComponentEntityObject::SetFrozen(bool frozen)
+{
+    if (m_lockedReentryGuard)
+    {
+        EditorActionScope flagChange(m_lockedReentryGuard);
+        AzToolsFramework::SetEntityLockState(m_entityId, frozen);
+    }
+}
+
+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);
+}
+
+void CComponentEntityObject::OnEntityIconChanged(const AZ::Data::AssetId& entityIconAssetId)
+{
+    (void)entityIconAssetId;
+    SetupEntityIcon();
+}
+
+void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldParent, [[maybe_unused]] AZ::EntityId newParent)
+{
+}
+
+void CComponentEntityObject::OnRenderBoundsReset()
+{
+    CEntityObject::InvalidateTM(0);
+}
+
+void CComponentEntityObject::SetSandboxObjectAccent(AzToolsFramework::EntityAccentType accent)
+{
+    m_accentType = accent;
+    AzToolsFramework::EditorComponentSelectionNotificationsBus::Event(m_entityId,
+        &AzToolsFramework::EditorComponentSelectionNotificationsBus::Events::OnAccentTypeChanged, m_accentType);
+}
+
+void CComponentEntityObject::SetSandBoxObjectIsolated(bool isIsolated)
+{
+    m_isIsolated = isIsolated;
+    GetIEditor()->GetObjectManager()->InvalidateVisibleList();
+}
+
+bool CComponentEntityObject::IsSandBoxObjectIsolated()
+{
+    return m_isIsolated;
+}
+
+bool CComponentEntityObject::SetPos(const Vec3& pos, int flags)
+{
+    bool isAzEditorTransformLocked = false;
+    AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(isAzEditorTransformLocked, m_entityId,
+        &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
+
+    bool lockTransformOnUserInput = isAzEditorTransformLocked && (flags & eObjectUpdateFlags_UserInput);
+
+    if (IsLayer() || lockTransformOnUserInput)
+    {
+        return false;
+    }
+    if ((flags & eObjectUpdateFlags_MoveTool) || (flags & eObjectUpdateFlags_UserInput))
+    {
+        // If we have a parent also in the selection set, don't allow the move tool to manipulate our position.
+        if (IsNonLayerAncestorSelected())
+        {
+            return false;
+        }
+    }
+
+    return CEntityObject::SetPos(pos, flags);
+}
+
+bool CComponentEntityObject::SetRotation(const Quat& rotate, int flags)
+{
+    bool isAzEditorTransformLocked = false;
+    AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(isAzEditorTransformLocked, m_entityId,
+        &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
+
+    bool lockTransformOnUserInput = isAzEditorTransformLocked && (flags & eObjectUpdateFlags_UserInput);
+
+    if (IsLayer() || lockTransformOnUserInput)
+    {
+        return false;
+    }
+    if (flags & eObjectUpdateFlags_UserInput)
+    {
+        // If we have a parent also in the selection set, don't allow the rotate tool to manipulate our position.
+        if (IsNonLayerAncestorSelected())
+        {
+            return false;
+        }
+    }
+
+    return CEntityObject::SetRotation(rotate, flags);
+}
+
+bool CComponentEntityObject::SetScale(const Vec3& scale, int flags)
+{
+    bool isAzEditorTransformLocked = false;
+    AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(isAzEditorTransformLocked, m_entityId,
+        &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
+
+    bool lockTransformOnUserInput = isAzEditorTransformLocked && (flags & eObjectUpdateFlags_UserInput);
+
+    if (IsLayer() || lockTransformOnUserInput)
+    {
+        return false;
+    }
+    if ((flags & eObjectUpdateFlags_ScaleTool) || (flags & eObjectUpdateFlags_UserInput))
+    {
+        // If we have a parent also in the selection set, don't allow the scale tool to manipulate our position.
+        if (IsNonLayerAncestorSelected())
+        {
+            return false;
+        }
+    }
+
+    return CEntityObject::SetScale(scale, flags);
+}
+
+bool CComponentEntityObject::IsNonLayerAncestorSelected() const
+{
+    AZ::EntityId parentId;
+    AZ::TransformBus::EventResult(parentId, m_entityId, &AZ::TransformBus::Events::GetParentId);
+    while (parentId.IsValid())
+    {
+        CComponentEntityObject* parentObject = CComponentEntityObject::FindObjectForEntity(parentId);
+        if (parentObject && parentObject->IsSelected())
+        {
+            bool isLayerEntity = false;
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+                isLayerEntity,
+                parentObject->GetAssociatedEntityId(),
+                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+            if (!isLayerEntity)
+            {
+                return true;
+            }
+        }
+
+        AZ::EntityId currentParentId = parentId;
+        parentId.SetInvalid();
+        AZ::TransformBus::EventResult(parentId, currentParentId, &AZ::TransformBus::Events::GetParentId);
+    }
+
+    return false;
+}
+
+bool CComponentEntityObject::IsLayer() const
+{
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        m_entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+    return isLayerEntity;
+}
+
+bool CComponentEntityObject::IsAncestorIconDrawingAtSameLocation() const
+{
+    if (m_entityId.IsValid())
+    {
+        AZ::EntityId parentId;
+        AZ::TransformBus::EventResult(parentId, m_entityId, &AZ::TransformBus::Events::GetParentId);
+        if (!parentId.IsValid())
+        {
+            return false;
+        }
+
+        AZ::Vector3 worldTranslation;
+        AZ::TransformBus::EventResult(worldTranslation, m_entityId, &AZ::TransformBus::Events::GetWorldTranslation);
+
+        while (parentId.IsValid())
+        {
+            AZ::Vector3 parentTranslation;
+            AZ::TransformBus::EventResult(parentTranslation, parentId, &AZ::TransformBus::Events::GetWorldTranslation);
+
+            if (parentTranslation.GetDistanceSq(worldTranslation) < 0.01f)
+            {
+                CComponentEntityObject* parentObject = CComponentEntityObject::FindObjectForEntity(parentId);
+                if (parentObject && !parentObject->IsSelected() && parentObject->IsEntityIconVisible())
+                {
+                    // An ancestor in the same location that's not selected and has icon visible has been found
+                    return true;
+                }
+            }
+
+            AZ::EntityId currentParentId = parentId;
+            parentId.SetInvalid();
+            AZ::TransformBus::EventResult(parentId, currentParentId, &AZ::TransformBus::Events::GetParentId);
+        }
+    }
+    return false;
+}
+
+bool CComponentEntityObject::IsDescendantSelectedAtSameLocation() const
+{
+    if (m_entityId.IsValid())
+    {
+        if (GetObjectManager()->GetSelection() && GetObjectManager()->GetSelection()->GetCount() == 0)
+        {
+            return false;
+        }
+
+        AZ::Vector3 worldTranslation;
+        AZ::TransformBus::EventResult(worldTranslation, m_entityId, &AZ::TransformBus::Events::GetWorldTranslation);
+
+        // For each descendant, check if it's selected and if so if it's located at the same location as we are
+        AzToolsFramework::EntityIdList descendantIds;
+        AZ::TransformBus::EventResult(descendantIds, m_entityId, &AZ::TransformBus::Events::GetAllDescendants);
+        for (AZ::EntityId entityId : descendantIds)
+        {
+            CComponentEntityObject* descendantObject = CComponentEntityObject::FindObjectForEntity(entityId);
+            if (descendantObject && descendantObject->IsSelected())
+            {
+                // Check if this entity is at the exact location of us
+                AZ::Vector3 entityTranslation;
+                AZ::TransformBus::EventResult(entityTranslation, entityId, &AZ::TransformBus::Events::GetWorldTranslation);
+                if (entityTranslation.GetDistanceSq(worldTranslation) < 0.01f)
+                {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+void CComponentEntityObject::InvalidateTM(int nWhyFlags)
+{
+    CEntityObject::InvalidateTM(nWhyFlags);
+
+    if (m_transformReentryGuard)
+    {
+        EditorActionScope transformChange(m_transformReentryGuard);
+
+        if (m_entityId.IsValid())
+        {
+            Matrix34 worldTransform = GetWorldTM();
+            EBUS_EVENT_ID(m_entityId, AZ::TransformBus, SetWorldTM, LYTransformToAZTransform(worldTransform));
+        }
+    }
+}
+
+void CComponentEntityObject::OnTransformChanged([[maybe_unused]] const AZ::Transform& local, const AZ::Transform& world)
+{
+    if (m_transformReentryGuard) // Ignore if action originated from Sandbox.
+    {
+        EditorActionScope transformChange(m_transformReentryGuard);
+        Matrix34 worlTM = AZTransformToLYTransform(world);
+        SetLocalTM(worlTM, eObjectUpdateFlags_Animated);
+    }
+}
+
+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 = entityScreenPos.x();
+            const float screenPosY = 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(AZ::Debug::ProfileCategory::Entity);
+
+    if (m_iconOnlyHitTest)
+    {
+        return false;
+    }
+
+    if (m_entityId.IsValid())
+    {
+        // Pick against bounding box/geometry
+        AABB bounds(AABB::RESET);
+        GetBoundBox(bounds);
+        if (!bounds.IsReset())
+        {
+            Vec3 hitPos;
+            if (Intersect::Ray_AABB(Ray(hc.raySrc, hc.rayDir), bounds, hitPos))
+            {
+                bool rayIntersection = false;
+                bool preciseSelectionRequired = false;
+                float closestDistance = std::numeric_limits<float>::max();
+
+                const int viewportId = GetIEditor()->GetViewManager()->GetGameViewport()->GetViewportId();
+                AzToolsFramework::EditorComponentSelectionRequestsBus::EnumerateHandlersId(m_entityId,
+                    [&hc, &closestDistance, &rayIntersection, &preciseSelectionRequired, viewportId](
+                        AzToolsFramework::EditorComponentSelectionRequests* handler) -> bool
+                {
+                    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
+
+                    if (handler->SupportsEditorRayIntersect())
+                    {
+                        float distance = std::numeric_limits<float>::max();
+                        preciseSelectionRequired = true;
+                        const bool intersection = handler->EditorSelectionIntersectRayViewport(
+                            { viewportId }, LYVec3ToAZVec3(hc.raySrc), LYVec3ToAZVec3(hc.rayDir), distance);
+
+                        rayIntersection = rayIntersection || intersection;
+
+                        if (intersection && distance < closestDistance)
+                        {
+                            closestDistance = distance;
+                        }
+                    }
+
+                    return true; // iterate over all handlers
+                });
+
+                hc.object = this;
+
+                if (preciseSelectionRequired)
+                {
+                    hc.dist = closestDistance;
+                    return rayIntersection;
+                }
+
+                hc.dist = (hitPos - hc.raySrc).GetLength();
+                return true;
+
+            }
+
+            return false;
+        }
+    }
+
+    const Vec3 origin = GetWorldPos();
+    const float radius = GetRadius();
+
+    Vec3 w = origin - hc.raySrc;
+    Vec3 wcross = hc.rayDir.Cross(w);
+    const float d = wcross.GetLengthSquared();
+
+    if (d < square(radius) + hc.distanceTolerance &&
+        w.GetLengthSquared() > square(radius))
+    {
+        Vec3 i0;
+        hc.object = this;
+        if (Intersect::Ray_SphereFirst(Ray(hc.raySrc, hc.rayDir), ::Sphere(origin, radius), i0))
+        {
+            hc.dist = hc.raySrc.GetDistance(i0);
+            return true;
+        }
+        hc.dist = hc.raySrc.GetDistance(origin);
+        return true;
+    }
+
+    return false;
+}
+
+void CComponentEntityObject::GetBoundBox(AABB& box)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
+
+    box.Reset();
+
+    const AZ::EntityId entityId = m_entityId;
+    if (entityId.IsValid())
+    {
+        CViewport* gameViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+        const int viewportId =  gameViewport ? gameViewport->GetViewportId() : -1;
+
+        if (const AZ::Aabb bound =
+                AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, AzFramework::ViewportInfo{viewportId});
+            bound.IsValid())
+        {
+            box.Add(AZVec3ToLYVec3(bound.GetMin()));
+            box.Add(AZVec3ToLYVec3(bound.GetMax()));
+            return;
+        }
+    }
+
+    CBaseObject::GetBoundBox(box);
+}
+
+void CComponentEntityObject::GetLocalBounds(AABB& box)
+{
+    box.Reset();
+
+    float r = GetRadius();
+    box.min = -Vec3(r, r, r);
+    box.max = Vec3(r, r, r);
+}
+
+XmlNodeRef CComponentEntityObject::Export([[maybe_unused]] const QString& levelPath, [[maybe_unused]] XmlNodeRef& xmlNode)
+{
+    // All component entities are serialized out in a separate pass, so they can be
+    // loaded en-masse rather than individually. As such, we don't export them
+    // alongside Cry Entities.
+    return XmlNodeRef();
+}
+
+CComponentEntityObject* CComponentEntityObject::FindObjectForEntity(AZ::EntityId id)
+{
+    CEntityObject* object = nullptr;
+    EBUS_EVENT_ID_RESULT(object, id, AzToolsFramework::ComponentEntityEditorRequestBus, GetSandboxObject);
+
+    if (object && (object->GetType() == OBJTYPE_AZENTITY))
+    {
+        return static_cast<CComponentEntityObject*>(object);
+    }
+
+    return nullptr;
+}
+
+void CComponentEntityObject::Display(DisplayContext& dc)
+{
+    if (!(dc.flags & DISPLAY_2D))
+    {
+        m_entityIconVisible = false;
+    }
+
+    bool displaySelectionHelper = false;
+    if (!CanBeDrawn(dc, displaySelectionHelper))
+    {
+        return;
+    }
+
+    DrawDefault(dc);
+
+    bool showIcons = m_hasIcon;
+    if (showIcons)
+    {
+        SEditorSettings* editorSettings = GetIEditor()->GetEditorSettings();
+        if (!editorSettings->viewports.bShowIcons && !editorSettings->viewports.bShowSizeBasedIcons)
+        {
+            showIcons = false;
+        }
+    }
+
+    if (m_entityId.IsValid())
+    {
+        // Draw link to parent if this or the parent object are selected.
+        {
+            AZ::EntityId parentId;
+            EBUS_EVENT_ID_RESULT(parentId, m_entityId, AZ::TransformBus, GetParentId);
+            if (parentId.IsValid())
+            {
+                bool isParentVisible = false;
+                AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isParentVisible, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
+
+                CComponentEntityObject* parentObject = CComponentEntityObject::FindObjectForEntity(parentId);
+                if (isParentVisible && (IsSelected() || (parentObject && parentObject->IsSelected())))
+                {
+                    const QColor kLinkColorParent(0, 255, 255);
+                    const QColor kLinkColorChild(0, 0, 255);
+
+                    AZ::Vector3 parentTranslation;
+                    EBUS_EVENT_ID_RESULT(parentTranslation, parentId, AZ::TransformBus, GetWorldTranslation);
+                    dc.DrawLine(AZVec3ToLYVec3(parentTranslation), GetWorldTM().GetTranslation(), kLinkColorParent, kLinkColorChild);
+                }
+            }
+        }
+
+        // Don't draw icons if we have an ancestor in the same location that has an icon - makes sure
+        // ancestor icons draw on top and are able to be selected over children. Also check if a descendant
+        // is selected at the same location. In cases of entity hierarchies where numerous ancestors have
+        // no position offset, we need this so the ancestors don't draw over us when we're selected
+        if (showIcons)
+        {
+            if ((dc.flags & DISPLAY_2D) ||
+                IsSelected() ||
+                IsAncestorIconDrawingAtSameLocation() ||
+                IsDescendantSelectedAtSameLocation())
+            {
+                showIcons = false;
+            }
+        }
+
+        // Allow components to override in-editor visualization.
+        {
+            const AzFramework::DisplayContextRequestGuard displayContextGuard(dc);
+
+            AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
+            AzFramework::DebugDisplayRequestBus::Bind(
+                debugDisplayBus, AzFramework::g_defaultSceneEntityDebugDisplayId);
+            AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
+
+            AzFramework::DebugDisplayRequests* debugDisplay =
+                AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
+
+            AzFramework::EntityDebugDisplayEventBus::Event(
+                m_entityId, &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport,
+                AzFramework::ViewportInfo{ dc.GetView()->asCViewport()->GetViewportId() },
+                *debugDisplay);
+        }
+    }
+}
+
+void CComponentEntityObject::DrawDefault(DisplayContext& dc, const QColor& labelColor)
+{
+    CEntityObject::DrawDefault(dc, labelColor);
+
+    DrawAccent(dc);
+}
+
+IStatObj* CComponentEntityObject::GetIStatObj()
+{
+    return nullptr;
+}
+
+bool CComponentEntityObject::IsIsolated() const
+{
+    return m_isIsolated;
+}
+
+bool CComponentEntityObject::IsSelected() const
+{
+    return AzToolsFramework::IsSelected(m_entityId);
+}
+
+bool CComponentEntityObject::IsSelectable() const
+{
+    return AzToolsFramework::IsSelectableInViewport(m_entityId);
+}
+
+void CComponentEntityObject::SetWorldPos(const Vec3& pos, int flags)
+{
+    // Layers, by design, are not supposed to be moveable. Layers are intended to just be a grouping
+    // mechanism to allow teams to cleanly split their level into working zones, and a moveable position
+    // complicates that behavior more than it helps.
+    // Unfortunately component entity objects have a position under the hood, so prevent layers from moving here.
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        m_entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+
+    bool isAzEditorTransformLocked = false;
+    AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(isAzEditorTransformLocked, m_entityId,
+        &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
+
+    bool lockTransformOnUserInput = isAzEditorTransformLocked && (flags & eObjectUpdateFlags_UserInput);
+
+    if (isLayerEntity || lockTransformOnUserInput)
+    {
+        return;
+    }
+    CEntityObject::SetWorldPos(pos, flags);
+}
+
+void CComponentEntityObject::OnContextMenu(QMenu* /*pMenu*/)
+{
+    // Deliberately bypass the base class implementation (CEntityObject::OnContextMenu()).
+}
+
+void CComponentEntityObject::SetupEntityIcon()
+{
+    bool hideIconInViewport = false;
+    m_hasIcon = false;
+
+    AzToolsFramework::EditorEntityIconComponentRequestBus::EventResult(hideIconInViewport, m_entityId, &AzToolsFramework::EditorEntityIconComponentRequestBus::Events::IsEntityIconHiddenInViewport);
+
+    if (!hideIconInViewport)
+    {
+        AzToolsFramework::EditorEntityIconComponentRequestBus::EventResult(m_icon, m_entityId, &AzToolsFramework::EditorEntityIconComponentRequestBus::Events::GetEntityIconPath);
+
+        if (!m_icon.empty())
+        {
+            m_hasIcon = true;
+
+            // ToDo: Get from Atom?
+            // int textureId = GetIEditor()->GetIconManager()->GetIconTexture(m_icon.c_str());
+            m_iconTexture = nullptr;
+        }
+    }
+}
+
+void CComponentEntityObject::DrawAccent(DisplayContext& dc)
+{
+    if (!m_drawAccents)
+    {
+        return;
+    }
+
+    switch (m_accentType)
+    {
+        case AzToolsFramework::EntityAccentType::None:
+        {
+            if (dc.flags & DISPLAY_2D)
+            {
+                dc.SetColor(0.941f, 0.764f, 0.176f); // Yellow
+            }
+            else
+            {
+                return;
+            }
+            break;
+        }
+        case AzToolsFramework::EntityAccentType::Hover:
+        {
+            dc.SetColor(0, 1, 0); // Green
+            break;
+        }
+        case AzToolsFramework::EntityAccentType::Selected:
+        {
+            dc.SetColor(1, 0, 0); // Red
+            break;
+        }
+        case AzToolsFramework::EntityAccentType::ParentSelected:
+        {
+            dc.SetColor(1, 0.549f, 0); // Orange
+            break;
+        }
+        case AzToolsFramework::EntityAccentType::SliceSelected:
+        {
+            dc.SetColor(0.117f, 0.565f, 1); // Blue
+            break;
+        }
+        default:
+        {
+            dc.SetColor(1, 0.0784f, 0.576f); // Pink
+            break;
+        }
+    }
+
+    // if there are no explicit handlers, default to show the aabb when the mouse is over or the entity is selected.
+    // this will be the case with newly added entities without explicit handlers attached (no components).
+    if (!AzToolsFramework::EditorComponentSelectionRequestsBus::HasHandlers(m_entityId))
+    {
+        AABB box;
+        GetBoundBox(box);
+        dc.DrawWireBox(box.min, box.max);
+    }
+}
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
new file mode 100644
index 0000000000..644ac575c2
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
@@ -0,0 +1,257 @@
+/*
+ * 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_COMPONENTENTITYEDITORPLUGIN_COMPONENTENTITYOBJECT_H
+#define CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_COMPONENTENTITYOBJECT_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/Component/EntityBus.h>
+#include <AzFramework/Entity/EntityDebugDisplayBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorLockComponentBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+
+#include <QtViewPane.h>
+
+#include "../Editor/Objects/EntityObject.h"
+#include <LmbrCentral/Rendering/RenderBoundsBus.h>
+#endif
+
+class QMenu;
+
+/**
+* Sandbox representation of component entities (AZ::Entity).
+*/
+class CComponentEntityObject
+    : public CEntityObject
+    , private AzToolsFramework::EditorLockComponentNotificationBus::Handler
+    , private AzToolsFramework::EditorVisibilityNotificationBus::Handler
+    , private AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler
+    , private AZ::TransformNotificationBus::Handler
+    , private LmbrCentral::RenderBoundsNotificationBus::Handler
+    , private AzToolsFramework::ComponentEntityEditorRequestBus::Handler
+    , private AzToolsFramework::ComponentEntityObjectRequestBus::Handler
+    , private AZ::EntityBus::Handler
+{
+public:
+    CComponentEntityObject();
+    ~CComponentEntityObject();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Overrides from CEntityObject/CBaseObject.
+    //////////////////////////////////////////////////////////////////////////
+    bool Init(IEditor* ie, CBaseObject* prev, const QString& file) override;
+    void InitVariables() override {};
+    bool SetPos(const Vec3& pos, int flags = 0) override;
+    bool SetRotation(const Quat& rotate, int flags) override;
+    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;
+
+    void SetWorldPos(const Vec3& pos, int flags = 0) override;
+
+    // Always returns false as Component entity highlighting (accenting) is taken care of elsewhere
+    bool IsHighlighted() { return false; }
+    // Component entity highlighting (accenting) is taken care of elsewhere
+    void DrawHighlight(DisplayContext& /*dc*/) {};
+
+    // 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; }
+
+
+
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // AZ::EntityBus::Handler
+    void OnEntityNameChanged(const AZStd::string& name) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorLockComponentNotificationBus::Handler
+    void OnEntityLockChanged(bool locked) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorVisibilityNotificationBus::Handler
+    void OnEntityVisibilityChanged(bool flag) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler
+    void OnEntityIconChanged(const AZ::Data::AssetId& entityIconAssetId) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    //! AZ::TransformNotificationBus::Handler
+    void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
+    void OnParentChanged(AZ::EntityId oldParent, AZ::EntityId newParent) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    //! RenderBoundsNotificationBus
+    void OnRenderBoundsReset() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    //! ComponentEntityEditorRequestBus
+    CEntityObject* GetSandboxObject() override { return this; }
+    bool IsSandboxObjectHighlighted() override { return IsHighlighted(); }
+    void SetSandboxObjectAccent(AzToolsFramework::EntityAccentType accent) override;
+    void SetSandBoxObjectIsolated(bool isIsolated) override;
+    bool IsSandBoxObjectIsolated() override;
+    void RefreshVisibilityAndLock() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    //! ComponentEntityObjectRequestBus
+    AZ::EntityId GetAssociatedEntityId() override { return m_entityId; }
+    void UpdatePreemptiveUndoCache() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    void AssignEntity(AZ::Entity* entity, bool destroyOld = true);
+
+    bool IsEntityIconVisible() const { return m_entityIconVisible; }
+
+    static CComponentEntityObject* FindObjectForEntity(AZ::EntityId id);
+
+protected:
+    friend class CTemplateObjectClassDesc<CComponentEntityObject>;
+    friend class SandboxIntegrationManager;
+
+    static const GUID& GetClassID()
+    {
+        // {70650EB8-B1BD-4DC8-AC28-7CD767D7BB30}
+        static const GUID guid = {
+            0x70650EB8, 0xB1BD, 0x4DC8, { 0xac, 0x28, 0x7c, 0xd7, 0x67, 0xd7, 0xbb, 0x30 }
+        };
+        return guid;
+    }
+
+    float GetRadius();
+
+    void DeleteThis() { delete this; };
+
+    bool IsNonLayerAncestorSelected() const;
+    bool IsLayer() const;
+
+    bool IsAncestorIconDrawingAtSameLocation() const;
+
+    bool IsDescendantSelectedAtSameLocation() const;
+
+    void SetupEntityIcon();
+
+    void DrawAccent(DisplayContext& dc);
+
+    class EditorActionGuard
+    {
+    public:
+
+        EditorActionGuard()
+            : m_count(0) {}
+
+        void Enter()    { ++m_count; }
+        void Exit()     { --m_count; }
+
+        //! \return true if the guard passes.
+        operator bool() const {
+            return m_count <= 0;
+        }
+
+    private:
+
+        int m_count;
+    };
+
+    class EditorActionScope
+    {
+    public:
+
+        EditorActionScope(EditorActionGuard& guard)
+            : m_guard(guard)
+        {
+            m_guard.Enter();
+        }
+
+        ~EditorActionScope()
+        {
+            m_guard.Exit();
+        }
+
+    private:
+
+        EditorActionGuard& m_guard;
+    };
+
+    EditorActionGuard m_lockedReentryGuard;
+    EditorActionGuard m_nameReentryGuard;
+    EditorActionGuard m_selectionReentryGuard;
+    EditorActionGuard m_visibilityFlagReentryGuard;
+    EditorActionGuard m_transformReentryGuard;
+    EditorActionGuard m_parentingReentryGuard;
+
+    AzToolsFramework::EntityAccentType m_accentType;
+
+    //! Whether we have have a valid icon path in \ref m_icon
+    bool m_hasIcon;
+
+    //! Whether this component entity icon is visible
+    bool m_entityIconVisible;
+
+    //! Whether to only use this object's icon for hit tests. When enabled, we ignore hit tests
+    //! against the geometry of the object
+    bool m_iconOnlyHitTest;
+
+    //! Whether to draw accents for this object (accents include selection wireframe bounding boxes)
+    bool m_drawAccents;
+
+    //! Indicate if an entity is isolated when the editor is in Isolation Mode.
+    bool m_isIsolated;
+
+    //! EntityId that this editor object represents/is tied to
+    AZ::EntityId m_entityId;
+
+    //! Path to component entity icon for this object
+    AZStd::string m_icon;
+    ITexture* m_iconTexture;
+
+    //! Displays viewport icon for this entity.
+    //! \returns whether an icon is being displayed
+    bool DisplayEntityIcon(
+        DisplayContext& dc, AzFramework::DebugDisplayRequests& debugDisplay);
+};
+
+#endif // CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_COMPONENTENTITYOBJECT_H
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
new file mode 100644
index 0000000000..77d51194bd
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@@ -0,0 +1,2046 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "SandboxIntegration.h"
+
+#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>
+#include <AzCore/Slice/SliceComponent.h>
+#include <AzCore/std/functional.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/algorithm.h>
+#include <AzCore/std/numeric.h>
+#include <AzCore/Asset/AssetManager.h>
+#include <AzCore/Outcome/Outcome.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzFramework/API/ApplicationAPI.h>
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include <AzFramework/Entity/EntityContextBus.h>
+#include <AzFramework/Physics/Material.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzFramework/Visibility/BoundsBus.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+#include <AzToolsFramework/API/EditorEntityAPI.h>
+#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
+#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
+#include <AzToolsFramework/Commands/EntityStateCommand.h>
+#include <AzToolsFramework/Commands/SelectionCommand.h>
+#include <AzToolsFramework/Commands/SliceDetachEntityCommand.h>
+#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
+#include <AzToolsFramework/Slice/SliceRequestBus.h>
+#include <AzToolsFramework/Slice/SliceUtilities.h>
+#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
+#include <AzToolsFramework/ToolsComponents/EditorLayerComponent.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h>
+#include <AzToolsFramework/Undo/UndoSystem.h>
+#include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h>
+#include <AzToolsFramework/UI/Layer/AddToLayerMenu.h>
+#include <AzToolsFramework/UI/Prefab/PrefabIntegrationInterface.h>
+#include <AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
+#include <AzToolsFramework/UI/Layer/NameConflictWarning.hxx>
+#include <AzToolsFramework/ViewportSelection/EditorHelpers.h>
+#include <MathConversion.h>
+
+#include <Atom/RPI.Public/ViewportContext.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
+#include <AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h>
+
+
+#include "Objects/ComponentEntityObject.h"
+#include "ISourceControl.h"
+#include "UI/QComponentEntityEditorMainWindow.h"
+
+#include <LmbrCentral/Rendering/EditorLightComponentBus.h>
+#include <LmbrCentral/Scripting/TagComponentBus.h>
+#include <LmbrCentral/Scripting/EditorTagComponentBus.h>
+
+// Sandbox imports.
+#include <Editor/ActionManager.h>
+#include <Editor/CryEditDoc.h>
+#include <Editor/GameEngine.h>
+#include <Editor/DisplaySettings.h>
+#include <Editor/IconManager.h>
+#include <Editor/Settings.h>
+#include <Editor/StringDlg.h>
+#include <Editor/QtViewPaneManager.h>
+#include <Editor/EditorViewportSettings.h>
+#include <IResourceSelectorHost.h>
+#include "CryEdit.h"
+
+#include <QMenu>
+#include <QAction>
+#include <QWidgetAction>
+#include <QHBoxLayout>
+#include "MainWindow.h"
+
+#include "Include/IObjectManager.h"
+
+#include <AzCore/std/algorithm.h>
+
+#ifdef CreateDirectory
+#undef CreateDirectory
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// Gathers all selected entities, culling any that have an ancestor in the selection.
+void GetSelectedEntitiesSetWithFlattenedHierarchy(AzToolsFramework::EntityIdSet& out)
+{
+    AzToolsFramework::EntityIdList entities;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        entities,
+        &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    for (const AZ::EntityId& entityId : entities)
+    {
+        bool selectionIncludesTransformHeritage = false;
+        AZ::EntityId parent = entityId;
+        do
+        {
+            AZ::EntityId nextParentId;
+            AZ::TransformBus::EventResult(
+                /*result*/ nextParentId,
+                /*address*/ parent,
+                &AZ::TransformBus::Events::GetParentId);
+            parent = nextParentId;
+            if (!parent.IsValid())
+            {
+                break;
+            }
+            for (const AZ::EntityId& parentCheck : entities)
+            {
+                if (parentCheck == parent)
+                {
+                    selectionIncludesTransformHeritage = true;
+                    break;
+                }
+            }
+        } while (parent.IsValid() && !selectionIncludesTransformHeritage);
+
+        if (!selectionIncludesTransformHeritage)
+        {
+            out.insert(entityId);
+        }
+    }
+}
+
+SandboxIntegrationManager::SandboxIntegrationManager()
+    : m_inObjectPickMode(false)
+    , m_startedUndoRecordingNestingLevel(0)
+    , m_dc(nullptr)
+    , m_notificationWindowManager(new AzToolsFramework::SliceOverridesNotificationWindowManager())
+{
+    // Required to receive events from the Cry Engine undo system
+    GetIEditor()->GetUndoManager()->AddListener(this);
+
+    // Only create the PrefabIntegrationManager if prefabs are enabled
+    bool prefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+    if (prefabSystemEnabled)
+    {
+        m_prefabIntegrationManager = aznew AzToolsFramework::Prefab::PrefabIntegrationManager();
+    }
+}
+
+SandboxIntegrationManager::~SandboxIntegrationManager()
+{
+    GetIEditor()->GetUndoManager()->RemoveListener(this);
+
+    delete m_prefabIntegrationManager;
+    m_prefabIntegrationManager = nullptr;
+}
+
+void SandboxIntegrationManager::Setup()
+{
+    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
+    AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusConnect();
+    AzToolsFramework::EditorRequests::Bus::Handler::BusConnect();
+    AzToolsFramework::EditorWindowRequests::Bus::Handler::BusConnect();
+    AzToolsFramework::EditorContextMenuBus::Handler::BusConnect();
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
+    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
+
+    AzFramework::DisplayContextRequestBus::Handler::BusConnect();
+
+    MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_FILE_SAVE_SLICE_TO_ROOT, [this]() {
+        SaveSlice(false);
+    });
+    MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_FILE_SAVE_SELECTED_SLICE, [this]() {
+        SaveSlice(true);
+    });
+
+    // Keep a reference to the interface EditorEntityUiInterface.
+    // This is used to register layer entities to their UI handler when the layer component is activated.
+    m_editorEntityUiInterface = AZ::Interface<AzToolsFramework::EditorEntityUiInterface>::Get();
+
+    AZ_Assert((m_editorEntityUiInterface != nullptr),
+        "SandboxIntegrationManager requires a EditorEntityUiInterface instance to be present on Setup().");
+
+    bool prefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+    if (prefabSystemEnabled)
+    {
+        m_prefabIntegrationInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabIntegrationInterface>::Get();
+        AZ_Assert(
+            (m_prefabIntegrationInterface != nullptr),
+            "SandboxIntegrationManager requires a PrefabIntegrationInterface instance to be present on Setup().");
+    }
+
+    m_editorEntityAPI = AZ::Interface<AzToolsFramework::EditorEntityAPI>::Get();
+    AZ_Assert(m_editorEntityAPI, "SandboxIntegrationManager requires an EditorEntityAPI instance to be present on Setup().");
+
+    AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler::BusConnect();
+}
+
+void SandboxIntegrationManager::SaveSlice(const bool& QuickPushToFirstLevel)
+{
+    AzToolsFramework::EntityIdList selectedEntities;
+    GetSelectedEntities(selectedEntities);
+    if (selectedEntities.size() == 0)
+    {
+        m_notificationWindowManager->CreateNotificationWindow(AzToolsFramework::SliceOverridesNotificationWindow::EType::TypeError, "Nothing selected - Select a slice entity with overrides and try again");
+        return;
+    }
+
+    AzToolsFramework::EntityIdList relevantEntities;
+    AZ::u32 entitiesInSlices;
+    AZStd::vector<AZ::SliceComponent::SliceInstanceAddress> sliceInstances;
+    GetEntitiesInSlices(selectedEntities, entitiesInSlices, sliceInstances);
+    if (entitiesInSlices > 0)
+    {
+        // Gather the set of relevant entities from the selected entities and all descendants
+        AzToolsFramework::EntityIdSet relevantEntitiesSet;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(relevantEntitiesSet,
+            &AzToolsFramework::ToolsApplicationRequestBus::Events::GatherEntitiesAndAllDescendents, selectedEntities);
+
+        relevantEntities.reserve(relevantEntitiesSet.size());
+        for (AZ::EntityId& id : relevantEntitiesSet)
+        {
+            relevantEntities.push_back(id);
+        }
+    }
+
+    int numEntitiesToAdd = 0;
+    int numEntitiesToRemove = 0;
+    int numEntitiesToUpdate = 0;
+    if (AzToolsFramework::SliceUtilities::SaveSlice(relevantEntities, numEntitiesToAdd, numEntitiesToRemove, numEntitiesToUpdate, QuickPushToFirstLevel))
+    {
+        if (numEntitiesToAdd > 0 || numEntitiesToRemove > 0 || numEntitiesToUpdate > 0)
+        {
+            m_notificationWindowManager->CreateNotificationWindow(
+                AzToolsFramework::SliceOverridesNotificationWindow::EType::TypeSuccess,
+                QString("Save slice to parent - %1 saved successfully").arg(numEntitiesToUpdate + numEntitiesToAdd + numEntitiesToRemove));
+        }
+        else
+        {
+            m_notificationWindowManager->CreateNotificationWindow(
+                AzToolsFramework::SliceOverridesNotificationWindow::EType::TypeError,
+                "Selected has no overrides - Select a slice entity with overrides and try again");
+        }
+    }
+    else
+    {
+        m_notificationWindowManager->CreateNotificationWindow(
+            AzToolsFramework::SliceOverridesNotificationWindow::EType::TypeError,
+            "Save slice to parent - Failed");
+    }
+}
+
+// This event handler is queued on main thread.
+void SandboxIntegrationManager::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
+{
+    bool prefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    if (!prefabSystemEnabled)
+    {
+        AZ::SliceComponent* editorRootSlice = nullptr;
+        AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(
+            editorRootSlice, &AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::GetEditorRootSlice);
+        AZ_Assert(editorRootSlice, "Editor root slice missing!");
+
+        for (auto restoreItr = m_sliceAssetDeletionErrorRestoreInfos.begin(); restoreItr != m_sliceAssetDeletionErrorRestoreInfos.end();)
+        {
+            if (restoreItr->m_assetId == assetId)
+            {
+                for (const auto& entityRestore : restoreItr->m_entityRestoreInfos)
+                {
+                    const AZ::EntityId& entityId = entityRestore.first;
+                    const AZ::SliceComponent::EntityRestoreInfo& restoreInfo = entityRestore.second;
+
+                    AZ::Entity* entity = editorRootSlice->FindEntity(entityId);
+                    if (entity)
+                    {
+                        AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
+                            &AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::RestoreSliceEntity, entity, restoreInfo,
+                            AzToolsFramework::SliceEntityRestoreType::Detached);
+                    }
+                    else
+                    {
+                        AZ_Error(
+                            "DetachSliceEntity", entity, "Unable to find previous detached entity of Id %s. Cannot undo \"Detach\" action.",
+                            entityId.ToString().c_str());
+                    }
+                }
+
+                restoreItr = m_sliceAssetDeletionErrorRestoreInfos.erase(restoreItr);
+            }
+            else
+            {
+                restoreItr++;
+            }
+        }
+    }
+}
+
+// No mutex is used for now because the only 
+// operation writing to shared resource is queued on main thread.
+void SandboxIntegrationManager::OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& assetInfo)
+{
+    bool isPrefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    // Check to see if the removed slice asset has any instance in the level, then check if 
+    // those dangling instances are directly under the root slice (not sub-slices). If yes,
+    // detach them and save necessary information so they can be restored when their slice asset
+    // comes back.
+
+    if (!isPrefabSystemEnabled && assetInfo.m_assetType == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
+    {
+        AZ::SliceComponent* rootSlice = nullptr;
+        AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(rootSlice,
+            &AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::GetEditorRootSlice);
+        AZ_Assert(rootSlice, "Editor root slice missing!");
+
+        AZStd::vector<AZ::EntityId> entitiesToDetach;
+        const AZ::SliceComponent::SliceList& subSlices = rootSlice->GetSlices();
+        for (const AZ::SliceComponent::SliceReference& subSliceRef : subSlices)
+        {
+            if (subSliceRef.GetSliceAsset().GetId() == assetId)
+            {
+                for (const AZ::SliceComponent::SliceInstance& sliceInst : subSliceRef.GetInstances())
+                {
+                    const AZ::SliceComponent::InstantiatedContainer* instContainer = sliceInst.GetInstantiated();
+                    for (AZ::Entity* entity : instContainer->m_entities)
+                    {
+                        entitiesToDetach.emplace_back(entity->GetId());
+                    }
+                }
+            }
+        }
+
+        AZ_Error("Editor", false, "The slice asset %s is deleted from disk, to prevent further data corruption, all of its root level slice instances are detached. "
+            "Restoring the slice asset on disk will revert the detaching operation.", assetInfo.m_relativePath.c_str());
+
+        AZ::SystemTickBus::QueueFunction([this, assetId, entitiesToDetach]() {
+            AZStd::vector<AZStd::pair<AZ::EntityId, AZ::SliceComponent::EntityRestoreInfo>> restoreInfos;
+            bool detachSuccess = false;
+            AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+                detachSuccess, &AzToolsFramework::ToolsApplicationRequestBus::Events::DetachEntities, entitiesToDetach, restoreInfos);
+            if (detachSuccess)
+            {
+                m_sliceAssetDeletionErrorRestoreInfos.emplace_back(assetId, AZStd::move(restoreInfos));
+            }
+        });
+    }
+}
+
+void SandboxIntegrationManager::GetEntitiesInSlices(
+    const AzToolsFramework::EntityIdList& selectedEntities,
+    AZ::u32& entitiesInSlices,
+    AZStd::vector<AZ::SliceComponent::SliceInstanceAddress>& sliceInstances)
+{
+    // Identify all slice instances affected by the selected entity set.
+    entitiesInSlices = 0;
+    for (const AZ::EntityId& entityId : selectedEntities)
+    {
+        AZ::SliceComponent::SliceInstanceAddress sliceAddress;
+        AzFramework::SliceEntityRequestBus::EventResult(sliceAddress, entityId,
+            &AzFramework::SliceEntityRequestBus::Events::GetOwningSlice);
+
+        if (sliceAddress.IsValid())
+        {
+            ++entitiesInSlices;
+
+            if (sliceInstances.end() == AZStd::find(sliceInstances.begin(), sliceInstances.end(), sliceAddress))
+            {
+                sliceInstances.push_back(sliceAddress);
+            }
+        }
+    }
+}
+
+void SandboxIntegrationManager::Teardown()
+{
+    AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler::BusDisconnect();
+    AzFramework::DisplayContextRequestBus::Handler::BusDisconnect();
+    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorContextMenuBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorWindowRequests::Bus::Handler::BusDisconnect();
+    AzToolsFramework::EditorRequests::Bus::Handler::BusDisconnect();
+    AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusDisconnect();
+}
+
+void SandboxIntegrationManager::SetDC(DisplayContext* dc)
+{
+    m_dc = dc;
+}
+
+DisplayContext* SandboxIntegrationManager::GetDC()
+{
+    return m_dc;
+}
+
+void SandboxIntegrationManager::OnBeginUndo([[maybe_unused]] const char* label)
+{
+    AzToolsFramework::UndoSystem::URSequencePoint* currentBatch = nullptr;
+    EBUS_EVENT_RESULT(currentBatch, AzToolsFramework::ToolsApplicationRequests::Bus, GetCurrentUndoBatch);
+
+    AZ_Assert(currentBatch, "No undo batch is active.");
+
+    // Only generate a Sandbox placeholder for root-level undo batches.
+    if (nullptr == currentBatch->GetParent())
+    {
+        // start Cry Undo
+        if (!CUndo::IsRecording())
+        {
+            GetIEditor()->BeginUndo();
+            // flag that we started recording the undo batch
+            m_startedUndoRecordingNestingLevel = 1;
+        }
+
+    }
+    else
+    {
+        if (m_startedUndoRecordingNestingLevel)
+        {
+            // if we previously started recording the undo, increment the nesting level so we can
+            // detect when we need to accept the undo in OnEndUndo()
+            m_startedUndoRecordingNestingLevel++;
+        }
+    }
+}
+
+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));
+    }
+    if (m_startedUndoRecordingNestingLevel)
+    {
+        m_startedUndoRecordingNestingLevel--;
+        if (m_startedUndoRecordingNestingLevel == 0)
+        {
+            if (changed)
+            {
+                // only accept the undo batch that we initially started undo recording on
+                GetIEditor()->AcceptUndo(label);
+            }
+            else
+            {
+                GetIEditor()->CancelUndo();
+            }
+        }
+    }
+}
+
+void SandboxIntegrationManager::EntityParentChanged(
+    const AZ::EntityId entityId,
+    const AZ::EntityId newParentId,
+    const AZ::EntityId oldParentId)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+    if (m_unsavedEntities.find(entityId) != m_unsavedEntities.end())
+    {
+        // New layers need the level to be saved.
+        bool isEntityLayer = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            isEntityLayer,
+            entityId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+        if (isEntityLayer)
+        {
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+                entityId,
+                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLevelSaveDependency);
+        }
+        // Don't need to track any other unsaved changes, this is a new entity that hasn't been saved yet.
+        return;
+    }
+
+    // If an entity is moved to or from a layer, then that layer can only safely be saved when the other layer or level saves, to prevent
+    // accidental duplication of entities.
+    // This logic doesn't clear the dependency flag if an entity changes parents multiple times between saves, so if an entity visits many layers
+    // 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;
+        }
+
+        bool isOldAncestorLayer = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            isOldAncestorLayer,
+            oldAncestor,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+        if (isOldAncestorLayer)
+        {
+            oldLayer = oldAncestor;
+            break;
+        }
+
+        // Must pass in an invalid id, because if no parent then nothing will modify the id variable to be invalid and stop at the no-parent case
+        AZ::EntityId nextParentId;
+        AZ::TransformBus::EventResult(
+            /*result*/ nextParentId,
+            /*address*/ oldAncestor,
+            &AZ::TransformBus::Events::GetParentId);
+        oldAncestor = nextParentId;
+    } while (oldAncestor.IsValid());
+
+    AZ::EntityId newAncestors = newParentId;
+    AZ::EntityId newAncestor = newParentId;
+
+    bool isGoingToRootScene = false;
+    AZ::EntityId newLayer;
+    do
+    {
+        if (!newAncestor.IsValid())
+        {
+            isGoingToRootScene = true;
+            break;
+        }
+
+        bool isNewAncestorLayer = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            isNewAncestorLayer,
+            newAncestor,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+        if (isNewAncestorLayer)
+        {
+            newLayer = newAncestor;
+            break;
+        }
+        // The parent may not be connected to the bus yet, so start with an invalid entity ID
+        // to prevent an infinite loop.
+        AZ::EntityId ancestorParent;
+        AZ::TransformBus::EventResult(
+            /*result*/ ancestorParent,
+            /*address*/ newAncestor,
+            &AZ::TransformBus::Events::GetParentId);
+        newAncestor = ancestorParent;
+    } while (newAncestor.IsValid());
+
+    if (oldLayer.IsValid() && newLayer != oldLayer)
+    {
+        if (newLayer.IsValid())
+        {
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+                oldLayer,
+                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLayerSaveDependency,
+                newLayer);
+        }
+        else
+        {
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+                oldLayer,
+                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLevelSaveDependency);
+        }
+    }
+
+    if (newLayer.IsValid() && newLayer != oldLayer)
+    {
+        if (oldLayer.IsValid())
+        {
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+                newLayer,
+                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLayerSaveDependency,
+                oldLayer);
+        }
+        else
+        {
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+                newLayer,
+                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLevelSaveDependency);
+        }
+    }
+}
+
+void SandboxIntegrationManager::OnSaveLevel()
+{
+    m_unsavedEntities.clear();
+}
+
+int SandboxIntegrationManager::GetMenuPosition() const
+{
+    return aznumeric_cast<int>(AzToolsFramework::EditorContextMenuOrdering::TOP);
+}
+
+void SandboxIntegrationManager::PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags)
+{
+    if (!IsLevelDocumentOpen())
+    {
+        return;
+    }
+
+    if (flags & AzToolsFramework::EditorEvents::eECMF_USE_VIEWPORT_CENTER)
+    {
+        CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
+        int width = 0;
+        int height = 0;
+        // If there is no 3D Viewport active to aid in the positioning of context menu
+        // operations, we don't need to store anything but default values here. Any code
+        // using these numbers for placement should default to the origin when there's
+        // no 3D viewport to raycast into.
+        if (view)
+        {
+            view->GetDimensions(&width, &height);
+        }
+        m_contextMenuViewPoint.Set(width / 2, height / 2);
+    }
+    else
+    {
+        m_contextMenuViewPoint = point;
+    }
+
+    CGameEngine* gameEngine = GetIEditor()->GetGameEngine();
+    if (!gameEngine || !gameEngine->IsLevelLoaded())
+    {
+        return;
+    }
+
+    menu->setToolTipsVisible(true);
+
+    AzToolsFramework::EntityIdList selected;
+    GetSelectedOrHighlightedEntities(selected);
+
+    QAction* action = nullptr;
+
+    action = menu->addAction(QObject::tr("Create entity"));
+    QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_NewEntity(); });
+
+    if (selected.size() == 1)
+    {
+        action = menu->addAction(QObject::tr("Create child entity"));
+        QObject::connect(action, &QAction::triggered, action, [selected]
+        {
+            EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, CreateNewEntityAsChild, selected.front());
+        });
+    }
+
+    bool prefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    if (!prefabSystemEnabled)
+    {
+        menu->addSeparator();
+
+        action = menu->addAction(QObject::tr("Create layer"));
+        QObject::connect(action, &QAction::triggered, [this] { ContextMenu_NewLayer(); });
+
+        AzToolsFramework::EntityIdList entities;
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+            entities,
+            &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+        SetupLayerContextMenu(menu);
+        AzToolsFramework::EntityIdSet flattenedSelection = AzToolsFramework::GetCulledEntityHierarchy(entities);
+        AzToolsFramework::SetupAddToLayerMenu(menu, flattenedSelection, [this] { return ContextMenu_NewLayer(); });
+
+        SetupSliceContextMenu(menu);
+    }
+
+    action = menu->addAction(QObject::tr("Duplicate"));
+    QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_Duplicate(); });
+    if (selected.size() == 0)
+    {
+        action->setDisabled(true);
+    }
+
+    if (!prefabSystemEnabled)
+    {
+        action = menu->addAction(QObject::tr("Delete"));
+        QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_DeleteSelected(); });
+        if (selected.size() == 0)
+        {
+            action->setDisabled(true);
+        }
+    }
+
+    menu->addSeparator();
+
+    if (selected.size() > 0)
+    {
+        action = menu->addAction(QObject::tr("Open pinned Inspector"));
+        QObject::connect(action, &QAction::triggered, action, [this, selected]
+        {
+            AzToolsFramework::EntityIdSet pinnedEntities(selected.begin(), selected.end());
+            OpenPinnedInspector(pinnedEntities);
+        });
+        if (selected.size() > 0)
+        {
+            action = menu->addAction(QObject::tr("Find in Entity Outliner"));
+            QObject::connect(action, &QAction::triggered, [this, selected]
+            {
+                AzToolsFramework::EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::OnFocusInEntityOutliner, selected);
+            });
+        }
+        menu->addSeparator();
+    }
+}
+
+void SandboxIntegrationManager::OpenPinnedInspector(const AzToolsFramework::EntityIdSet& entities)
+{
+    QDockWidget* dockWidget = InstanceViewPane(LyViewPane::EntityInspectorPinned);
+    if (dockWidget)
+    {
+        QComponentEntityEditorInspectorWindow* editor = static_cast<QComponentEntityEditorInspectorWindow*>(dockWidget->widget());
+        if (editor && editor->GetPropertyEditor())
+        {
+            editor->GetPropertyEditor()->SetOverrideEntityIds(entities);
+
+            AZStd::string widgetTitle;
+            if (entities.size() == 1)
+            {
+                AZStd::string entityName;
+                AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationBus::Events::GetEntityName, *entities.begin());
+                widgetTitle = AZStd::string::format("%s Inspector", entityName.c_str());
+
+                QObject::connect(editor->GetPropertyEditor(), &AzToolsFramework::EntityPropertyEditor::SelectedEntityNameChanged, [dockWidget](const AZ::EntityId& /*entityId*/, const AZStd::string& name)
+                {
+                    AZStd::string newTitle = AZStd::string::format("%s Inspector", name.c_str());
+                    dockWidget->setWindowTitle(newTitle.c_str());
+                });
+            }
+            else
+            {
+                widgetTitle = AZStd::string::format("%zu Entities - Inspector", entities.size());
+            }
+
+            dockWidget->setWindowTitle(widgetTitle.c_str());
+        }
+    }
+}
+
+void SandboxIntegrationManager::ClosePinnedInspector(AzToolsFramework::EntityPropertyEditor* editor)
+{
+    QWidget* currentWidget = editor->parentWidget();
+    while (currentWidget)
+    {
+        QDockWidget* dockWidget = qobject_cast<QDockWidget*>(currentWidget);
+        if (dockWidget)
+        {
+            QtViewPaneManager::instance()->ClosePaneInstance(LyViewPane::EntityInspectorPinned, dockWidget);
+            return;
+        }
+        currentWidget = currentWidget->parentWidget();
+    }
+}
+
+void SandboxIntegrationManager::SetupLayerContextMenu(QMenu* menu)
+{
+    // First verify that the selection contains some layers.
+    AzToolsFramework::EntityIdList selectedEntities;
+    GetSelectedOrHighlightedEntities(selectedEntities);
+
+    // Nothing selected, no layer context menus to add.
+    if (selectedEntities.empty())
+    {
+        return;
+    }
+
+    AZStd::unordered_set<AZ::EntityId> layersInSelection;
+
+    for (AZ::EntityId entityId : selectedEntities)
+    {
+        bool isLayerEntity = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            isLayerEntity,
+            entityId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+        if (isLayerEntity)
+        {
+            layersInSelection.insert(entityId);
+        }
+    }
+
+    // No layers directly selected, do not add context, even if a selected entity
+    // is a child of a layer.
+    if (layersInSelection.empty())
+    {
+        return;
+    }
+
+    menu->addSeparator();
+
+    const int selectedLayerCount = layersInSelection.size();
+    QString saveTitle = QObject::tr("Save layer");
+    if(selectedLayerCount > 1)
+    {
+        saveTitle = QObject::tr("Save %0 layers").arg(selectedLayerCount);
+    }
+
+    QAction* saveLayerAction = menu->addAction(saveTitle);
+    saveLayerAction->setToolTip(QObject::tr("Save the selected layers."));
+    QObject::connect(saveLayerAction, &QAction::triggered, [this, layersInSelection] { ContextMenu_SaveLayers(layersInSelection); });
+
+    if (layersInSelection.size() == 1)
+    {
+        const AZ::EntityId& id = *layersInSelection.begin();
+        AZ::Outcome<AZStd::string, AZStd::string> layerFullFilePathResult = AZ::Failure(AZStd::string());
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            layerFullFilePathResult,
+            id,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GetLayerFullFilePath,
+            Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName()));
+
+        // Only add option to find the layer in the Asset Browser if the layer has been saved to disk
+        if (layerFullFilePathResult.IsSuccess())
+        {
+            AZStd::string fullFilePath = layerFullFilePathResult.GetValue();
+
+            QAction* findLayerAssetAction = menu->addAction(QObject::tr("Find layer in Asset Browser"));
+            findLayerAssetAction->setToolTip(QObject::tr("Selects this layer in the Asset Browser"));
+            QObject::connect(findLayerAssetAction, &QAction::triggered, [this, fullFilePath] {
+                QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetBrowser);
+
+                AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(
+                    &AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Events::ClearFilter);
+
+                AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(
+                    &AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Events::SelectFileAtPath,
+                    fullFilePath);
+            });
+        }
+    }
+}
+
+void SandboxIntegrationManager::SetupSliceContextMenu(QMenu* menu)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    AzToolsFramework::EntityIdList selectedEntities;
+    GetSelectedOrHighlightedEntities(selectedEntities);
+
+    menu->addSeparator();
+
+    if (!selectedEntities.empty())
+    {
+        bool anySelectedEntityFromExistingSlice = false;
+        bool layerInSelection = false;
+        for (AZ::EntityId entityId : selectedEntities)
+        {
+            if (!anySelectedEntityFromExistingSlice)
+            {
+                AZ::SliceComponent::SliceInstanceAddress sliceAddress(nullptr, nullptr);
+                AzFramework::SliceEntityRequestBus::EventResult(sliceAddress, entityId,
+                    &AzFramework::SliceEntityRequestBus::Events::GetOwningSlice);
+                if (sliceAddress.GetReference())
+                {
+                    anySelectedEntityFromExistingSlice = true;
+                }
+            }
+            if (!layerInSelection)
+            {
+                bool isLayerEntity = false;
+                AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+                    isLayerEntity,
+                    entityId,
+                    &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+                if (isLayerEntity)
+                {
+                    layerInSelection = true;
+                }
+            }
+            // Everything being searched for was found, so exit the loop.
+            if (layerInSelection && anySelectedEntityFromExistingSlice)
+            {
+                break;
+            }
+        }
+
+        // Layers can't be in slices.
+        if (!layerInSelection)
+        {
+            QAction* createAction = menu->addAction(QObject::tr("Create slice..."));
+            createAction->setToolTip(QObject::tr("Creates a slice out of the currently selected entities."));
+            if (anySelectedEntityFromExistingSlice)
+            {
+                QObject::connect(createAction, &QAction::triggered, createAction, [this, selectedEntities] { ContextMenu_MakeSlice(selectedEntities); });
+            }
+            else
+            {
+                QObject::connect(createAction, &QAction::triggered, createAction, [this, selectedEntities] { ContextMenu_InheritSlice(selectedEntities); });
+            }
+        }
+    }
+
+    QAction* instantiateAction = menu->addAction(QObject::tr("Instantiate slice..."));
+    instantiateAction->setToolTip(QObject::tr("Instantiates a pre-existing slice asset into the level"));
+    QObject::connect(instantiateAction, &QAction::triggered, instantiateAction, [this] { ContextMenu_InstantiateSlice(); });
+
+    AzToolsFramework::EditorEvents::Bus::Broadcast(&AzToolsFramework::EditorEvents::Bus::Events::PopulateEditorGlobalContextMenu_SliceSection, menu, AZ::Vector2::CreateZero(),
+        AzToolsFramework::EditorEvents::eECMF_HIDE_ENTITY_CREATION | AzToolsFramework::EditorEvents::eECMF_USE_VIEWPORT_CENTER);
+
+    if (selectedEntities.empty())
+    {
+        return;
+    }
+
+    AZ::u32 entitiesInSlices;
+    AZStd::vector<AZ::SliceComponent::SliceInstanceAddress> sliceInstances;
+    GetEntitiesInSlices(selectedEntities, entitiesInSlices, sliceInstances);
+    // Offer slice-related options if any selected entities belong to slice instances.
+    if (0 == entitiesInSlices)
+    {
+        return;
+    }
+
+    // Setup push and revert options (quick push and 'advanced' push UI).
+    SetupSliceContextMenu_Modify(menu, selectedEntities, entitiesInSlices);
+
+    menu->addSeparator();
+
+    // PopulateFindSliceMenu takes a callback to run when a slice is selected, which is called before the slice is selected in the asset browser.
+    // This is so the AssetBrowser can be opened first, which can only be done from a Sandbox module. PopulateFindSliceMenu exists in the AzToolsFramework
+    // module in SliceUtilities, so it can share logic with similar menus, like Quick Push.
+    // Similarly, it takes a callback for the SliceRelationshipView.
+    AzToolsFramework::SliceUtilities::PopulateSliceSubMenus(*menu, selectedEntities,
+        []
+    {
+        // This will open the AssetBrowser if it's not open, and do nothing if it's already opened.
+        QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetBrowser);
+    },
+        []
+    {
+        //open SliceRelationshipView if necessary, and populate it
+        QtViewPaneManager::instance()->OpenPane(LyViewPane::SliceRelationships);
+    });
+}
+
+void SandboxIntegrationManager::SetupSliceContextMenu_Modify(QMenu* menu, const AzToolsFramework::EntityIdList& selectedEntities, [[maybe_unused]] const AZ::u32 numEntitiesInSlices)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    using namespace AzToolsFramework;
+
+    // Gather the set of relevant entities from the selected entities and all descendants
+    AzToolsFramework::EntityIdSet relevantEntitiesSet;
+    EBUS_EVENT_RESULT(relevantEntitiesSet, AzToolsFramework::ToolsApplicationRequests::Bus, GatherEntitiesAndAllDescendents, selectedEntities);
+    AzToolsFramework::EntityIdList relevantEntities;
+    relevantEntities.reserve(relevantEntitiesSet.size());
+    for (AZ::EntityId& id : relevantEntitiesSet)
+    {
+        relevantEntities.push_back(id);
+    }
+
+    SliceUtilities::PopulateQuickPushMenu(*menu, relevantEntities);
+
+    SliceUtilities::PopulateDetachMenu(*menu, selectedEntities, relevantEntitiesSet);
+
+    bool canRevert = false;
+
+    for (AZ::EntityId id : relevantEntitiesSet)
+    {
+        bool entityHasOverrides = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(entityHasOverrides, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceEntityOverrides);
+        if (entityHasOverrides)
+        {
+            canRevert = true;
+            break;
+        }
+    }
+
+    QAction* revertAction = menu->addAction(QObject::tr("Revert overrides"));
+    revertAction->setToolTip(QObject::tr("Revert all slice entities and their children to their last saved state."));
+
+    QObject::connect(revertAction, &QAction::triggered, [this, relevantEntities]
+    {
+        ContextMenu_ResetToSliceDefaults(relevantEntities);
+    });
+
+    revertAction->setEnabled(canRevert);
+}
+
+void SandboxIntegrationManager::HandleObjectModeSelection(const AZ::Vector2& point, [[maybe_unused]] int flags, bool& handled)
+{
+    // Todo - Use a custom "edit tool". This will eliminate the need for this bus message entirely, which technically
+    // makes this feature less intrusive on Sandbox.
+    // UPDATE: This is now provided by EditorPickEntitySelection when the new Viewport Interaction Model changes are enabled.
+    if (m_inObjectPickMode)
+    {
+        CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
+        const QPoint viewPoint(point.GetX(), point.GetY());
+
+        HitContext hitInfo;
+        hitInfo.view = view;
+        if (view->HitTest(viewPoint, hitInfo))
+        {
+            if (hitInfo.object && (hitInfo.object->GetType() == OBJTYPE_AZENTITY))
+            {
+                CComponentEntityObject* entityObject = static_cast<CComponentEntityObject*>(hitInfo.object);
+                AzToolsFramework::EditorPickModeRequestBus::Broadcast(
+                    &AzToolsFramework::EditorPickModeRequests::PickModeSelectEntity, entityObject->GetAssociatedEntityId());
+            }
+        }
+
+        AzToolsFramework::EditorPickModeRequestBus::Broadcast(
+            &AzToolsFramework::EditorPickModeRequests::StopEntityPickMode);
+
+        handled = true;
+    }
+}
+
+void SandboxIntegrationManager::UpdateObjectModeCursor(AZ::u32& cursorId, AZStd::string& cursorStr)
+{
+    if (m_inObjectPickMode)
+    {
+        cursorId = static_cast<AZ::u64>(STD_CURSOR_HAND);
+        cursorStr = "Pick an entity...";
+    }
+}
+
+void SandboxIntegrationManager::OnEntityPickModeStarted()
+{
+    m_inObjectPickMode = true;
+
+    // Currently this object pick mode is activated only via PropertyEntityIdCtrl picker.
+    // When the picker button is clicked, we transfer focus to the viewport so the
+    // spacebar can still be used to activate selection helpers.
+    if (CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport())
+    {
+        view->SetFocus();
+    }
+}
+
+void SandboxIntegrationManager::OnEntityPickModeStopped()
+{
+    m_inObjectPickMode = false;
+}
+
+void SandboxIntegrationManager::CreateEditorRepresentation(AZ::Entity* entity)
+{
+    IEditor* editor = GetIEditor();
+
+    if (CComponentEntityObject* existingObject = CComponentEntityObject::FindObjectForEntity(entity->GetId()))
+    {
+        // Refresh sandbox object if one already exists for this AZ::EntityId.
+        existingObject->AssignEntity(entity, false);
+        return;
+    }
+
+    CBaseObjectPtr object = editor->NewObject("ComponentEntity", "", entity->GetName().c_str(), 0.f, 0.f, 0.f, false);
+
+    if (object)
+    {
+        static_cast<CComponentEntityObject*>(object.get())->AssignEntity(entity);
+
+        // If this object type was hidden by category, re-display it.
+        int hideMask = editor->GetDisplaySettings()->GetObjectHideMask();
+        hideMask = hideMask & ~(object->GetType());
+        editor->GetDisplaySettings()->SetObjectHideMask(hideMask);
+    }
+}
+
+bool SandboxIntegrationManager::DestroyEditorRepresentation(AZ::EntityId entityId, bool deleteAZEntity)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+    IEditor* editor = GetIEditor();
+    if (editor->GetObjectManager())
+    {
+        CEntityObject* object = nullptr;
+        EBUS_EVENT_ID_RESULT(object, entityId, AzToolsFramework::ComponentEntityEditorRequestBus, GetSandboxObject);
+
+        if (object && (object->GetType() == OBJTYPE_AZENTITY))
+        {
+            static_cast<CComponentEntityObject*>(object)->AssignEntity(nullptr, deleteAZEntity);
+            {
+                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "SandboxIntegrationManager::DestroyEditorRepresentation:ObjManagerDeleteObject");
+                editor->GetObjectManager()->DeleteObject(object);
+            }
+            return true;
+        }
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SandboxIntegrationManager::GoToSelectedOrHighlightedEntitiesInViewports()
+{
+    AzToolsFramework::EntityIdList entityIds;
+    GetSelectedOrHighlightedEntities(entityIds);
+    GoToEntitiesInViewports(entityIds);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SandboxIntegrationManager::GoToSelectedEntitiesInViewports()
+{
+    AzToolsFramework::EntityIdList entityIds;
+    GetSelectedEntities(entityIds);
+    GoToEntitiesInViewports(entityIds);
+}
+
+bool SandboxIntegrationManager::CanGoToSelectedEntitiesInViewports()
+{
+    AzToolsFramework::EntityIdList entityIds;
+    GetSelectedEntities(entityIds);
+
+    if (entityIds.size() == 0)
+    {
+        return false;
+    }
+
+    for (const AZ::EntityId& entityId : entityIds)
+    {
+        if (CanGoToEntityOrChildren(entityId))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool SandboxIntegrationManager::CanGoToEntityOrChildren(const AZ::EntityId& entityId) const
+{
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+    // If this entity is not a layer
+    if (!isLayerEntity)
+    {
+        // check if the entity exists to determine if we can go to it (e.g. system & internal entities are not visible in the viewport)
+        AZ::Entity* entity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, entityId);
+        return entity != nullptr;
+    }
+
+    AZStd::vector<AZ::EntityId> layerChildren;
+    AZ::TransformBus::EventResult(
+        /*result*/ layerChildren,
+        /*address*/ entityId,
+        &AZ::TransformBus::Events::GetChildren);
+
+    for (const AZ::EntityId& childId : layerChildren)
+    {
+        if (CanGoToEntityOrChildren(childId))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+AZ::Vector3 SandboxIntegrationManager::GetWorldPositionAtViewportCenter()
+{
+    if (GetIEditor() && GetIEditor()->GetViewManager())
+    {
+        CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
+        if (view)
+        {
+            int width, height;
+            view->GetDimensions(&width, &height);
+            return LYVec3ToAZVec3(view->ViewToWorld(QPoint(width / 2, height / 2)));
+        }
+    }
+
+    return AZ::Vector3::CreateZero();
+}
+
+int SandboxIntegrationManager::GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath)
+{
+    return GetIEditor()->GetIconManager()->GetIconTexture(entityIconPath.c_str());
+}
+
+void SandboxIntegrationManager::ClearRedoStack()
+{
+    // We have two separate undo systems that are assumed to be kept in sync,
+    // So here we tell the legacy Undo system to clear the redo stack and at the same time
+    // tell the new AZ undo system to clear redo stack ("slice" the stack)
+
+    // Clear legacy redo stack
+    GetIEditor()->ClearRedoStack();
+
+    // Clear AZ redo stack
+    AzToolsFramework::UndoSystem::UndoStack* undoStack = nullptr;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(undoStack, &AzToolsFramework::ToolsApplicationRequestBus::Events::GetUndoStack);
+    if (undoStack)
+    {
+        undoStack->Slice();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+void SandboxIntegrationManager::CloneSelection(bool& handled)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+    AzToolsFramework::EntityIdList entities;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        entities,
+        &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    AzToolsFramework::EntityIdSet duplicationSet = AzToolsFramework::GetCulledEntityHierarchy(entities);
+
+    if (!duplicationSet.empty())
+    {
+        bool prefabSystemEnabled = false;
+        AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+        if (prefabSystemEnabled)
+        {
+            m_editorEntityAPI->DuplicateSelected();
+            handled = true;
+        }
+        else
+        {
+            AZStd::unordered_set<AZ::EntityId> clonedEntities;
+            handled = AzToolsFramework::CloneInstantiatedEntities(duplicationSet, clonedEntities);
+            m_unsavedEntities.insert(clonedEntities.begin(), clonedEntities.end());
+        }
+    }
+    else
+    {
+        handled = false;
+    }
+}
+
+void SandboxIntegrationManager::DeleteSelectedEntities([[maybe_unused]] const bool includeDescendants)
+{
+    AzToolsFramework::EntityIdList selectedEntityIds;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+        selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::DeleteEntitiesAndAllDescendants, selectedEntityIds);
+}
+
+AZ::EntityId SandboxIntegrationManager::CreateNewEntity(AZ::EntityId parentId)
+{
+    AZ::Vector3 position = AZ::Vector3::CreateZero();
+
+    bool parentIsValid = parentId.IsValid();
+    if (parentIsValid)
+    {
+        // If a valid parent is a Layer, we should get our position from the viewport as all Layers are positioned at 0,0,0.
+        bool parentIsLayer = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            parentIsLayer,
+            parentId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+        parentIsValid = !parentIsLayer;
+    }
+    // If we have an invalid parent, base new entity's position on the viewport.
+    if (!parentIsValid)
+    {
+        position = GetWorldPositionAtViewportCenter();
+    }
+    return CreateNewEntityAtPosition(position, parentId);
+}
+
+AZ::EntityId SandboxIntegrationManager::CreateNewEntityAsChild(AZ::EntityId parentId)
+{
+    AZ_Assert(parentId.IsValid(), "Entity created as a child of an invalid parent entity.");
+    auto newEntityId = CreateNewEntity(parentId);
+
+    // Some modules need to know that this special action has taken place; broadcast an event.
+    ToolsApplicationEvents::Bus::Broadcast(&ToolsApplicationEvents::EntityCreatedAsChild, newEntityId, parentId);
+    return newEntityId;
+}
+
+AZ::EntityId SandboxIntegrationManager::CreateNewEntityAtPosition(const AZ::Vector3& pos, AZ::EntityId parentId)
+{
+    using namespace AzToolsFramework;
+
+    bool prefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    AZ::EntityId newEntityId;
+
+    if (!prefabSystemEnabled)
+    {
+        const AZStd::string name = AZStd::string::format("Entity%d", GetIEditor()->GetObjectManager()->GetObjectCount() + 1);
+        EditorEntityContextRequestBus::BroadcastResult(newEntityId, &EditorEntityContextRequests::CreateNewEditorEntity, name.c_str());
+
+        if (newEntityId.IsValid())
+        {
+            m_unsavedEntities.insert(newEntityId);
+
+            AZ::Transform transform = AZ::Transform::CreateIdentity();
+            transform.SetTranslation(pos);
+            if (parentId.IsValid())
+            {
+                AZ::TransformBus::Event(newEntityId, &AZ::TransformInterface::SetParent, parentId);
+                AZ::TransformBus::Event(newEntityId, &AZ::TransformInterface::SetLocalTM, transform);
+            }
+            else
+            {
+                AZ::TransformBus::Event(newEntityId, &AZ::TransformInterface::SetWorldTM, transform);
+            }
+
+            // Select the new entity (and deselect others).
+            AzToolsFramework::EntityIdList selection = {newEntityId};
+
+            ScopedUndoBatch undo("New Entity");
+            auto selectionCommand = AZStd::make_unique<AzToolsFramework::SelectionCommand>(selection, "");
+            selectionCommand->SetParent(undo.GetUndoBatch());
+            selectionCommand.release();
+
+            EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, SetSelectedEntities, selection);
+        }
+    }
+    else
+    {
+        newEntityId =  m_prefabIntegrationInterface->CreateNewEntityAtPosition(pos, parentId);
+    }
+    return newEntityId;
+}
+
+AzFramework::EntityContextId SandboxIntegrationManager::GetEntityContextId()
+{
+    AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+    AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetEditorEntityContextId);
+
+    return editorEntityContextId;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QWidget* SandboxIntegrationManager::GetAppMainWindow()
+{
+    return MainWindow::instance();
+}
+
+QWidget* SandboxIntegrationManager::GetMainWindow()
+{
+    return MainWindow::instance();
+}
+
+IEditor* SandboxIntegrationManager::GetEditor()
+{
+    return GetIEditor();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool SandboxIntegrationManager::GetUndoSliceOverrideSaveValue()
+{
+    return GetIEditor()->GetEditorSettings()->m_undoSliceOverrideSaveValue;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool SandboxIntegrationManager::GetShowCircularDependencyError()
+{
+    return GetIEditor()->GetEditorSettings()->m_showCircularDependencyError;
+}
+
+void SandboxIntegrationManager::SetShowCircularDependencyError(const bool& showCircularDependencyError)
+{
+    GetIEditor()->GetEditorSettings()->m_showCircularDependencyError = showCircularDependencyError;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SandboxIntegrationManager::LaunchLuaEditor(const char* files)
+{
+    CCryEditApp::instance()->OpenLUAEditor(files);
+}
+
+bool SandboxIntegrationManager::IsLevelDocumentOpen()
+{
+    return (GetIEditor() && GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady());
+}
+
+AZStd::string SandboxIntegrationManager::GetLevelName()
+{
+    return AZStd::string(GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().constData());
+}
+
+AZStd::string SandboxIntegrationManager::SelectResource(const AZStd::string& resourceType, const AZStd::string& previousValue)
+{
+    SResourceSelectorContext context;
+    context.parentWidget = GetMainWindow();
+    context.typeName = resourceType.c_str();
+
+    QString resource = GetEditor()->GetResourceSelectorHost()->SelectResource(context, previousValue.c_str());
+    return AZStd::string(resource.toUtf8().constData());
+}
+
+void SandboxIntegrationManager::OnContextReset()
+{
+    // Deselect everything.
+    EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, SetSelectedEntities, AzToolsFramework::EntityIdList());
+
+    std::vector<CBaseObject*> objects;
+    objects.reserve(128);
+    IObjectManager* objectManager = GetIEditor()->GetObjectManager();
+    objectManager->FindObjectsOfType(OBJTYPE_AZENTITY, objects);
+    for (CBaseObject* object : objects)
+    {
+        CComponentEntityObject* componentEntity = static_cast<CComponentEntityObject*>(object);
+        componentEntity->AssignEntity(nullptr, false);
+        objectManager->DeleteObject(componentEntity);
+    }
+}
+
+void SandboxIntegrationManager::OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/)
+{
+    // The instantiated slice isn't valid. Other systems will report this as an error.
+    // Bail out here, this is nothing to track in this case.
+    if (!sliceAddress.GetInstance())
+    {
+        return;
+    }
+
+    const AZ::SliceComponent::EntityIdToEntityIdMap& sliceInstanceEntityIdMap = sliceAddress.GetInstance()->GetEntityIdMap();
+
+    for (const auto& sliceInstantEntityIdPair : sliceInstanceEntityIdMap)
+    {
+        // The second in the pair is the local instance's entity ID.
+        m_unsavedEntities.insert(sliceInstantEntityIdPair.second);
+    }
+}
+
+void SandboxIntegrationManager::OnLayerComponentActivated(AZ::EntityId entityId)
+{
+    m_editorEntityUiInterface->RegisterEntity(entityId, m_layerUiOverrideHandler.GetHandlerId());
+}
+
+void SandboxIntegrationManager::OnLayerComponentDeactivated(AZ::EntityId entityId)
+{
+    m_editorEntityUiInterface->UnregisterEntity(entityId);
+}
+
+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)
+    {
+        const QPoint viewPoint(m_contextMenuViewPoint.GetX(), m_contextMenuViewPoint.GetY());
+        worldPosition = LYVec3ToAZVec3(view->SnapToGrid(view->ViewToWorld(viewPoint)));
+    }
+
+    CreateNewEntityAtPosition(worldPosition);
+}
+
+AZ::EntityId SandboxIntegrationManager::ContextMenu_NewLayer()
+{
+    const int objectCount = GetIEditor()->GetObjectManager()->GetObjectCount();
+    const AZStd::string name = AZStd::string::format("Layer%d", objectCount + 1);
+
+    // Make sure the color is created fully opaque.
+    static QColor newLayerDefaultColor = GetIEditor()->GetColorByName("NewLayerDefaultColor");
+    AZ::Color newLayerColor(
+        aznumeric_cast<float>(newLayerDefaultColor.redF()),
+        aznumeric_cast<float>(newLayerDefaultColor.greenF()),
+        aznumeric_cast<float>(newLayerDefaultColor.blueF()),
+        aznumeric_cast<float>(newLayerDefaultColor.alphaF()));
+
+    AZ::EntityId newEntityId = AzToolsFramework::Layers::EditorLayerComponent::CreateLayerEntity(
+        name, newLayerColor, AzToolsFramework::Layers::LayerProperties::SaveFormat::Xml);
+    if (!newEntityId.IsValid())
+    {
+        // CreateLayerEntity already handled reporting errors if it couldn't make a new layer.
+        return AZ::EntityId();
+    }
+    m_unsavedEntities.insert(newEntityId);
+
+    return newEntityId;
+}
+
+void SandboxIntegrationManager::ContextMenu_SaveLayers(const AZStd::unordered_set<AZ::EntityId>& layers)
+{
+    AZStd::unordered_map<AZStd::string, int> nameConflictMapping;
+    for (AZ::EntityId layerEntityId : layers)
+    {
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+            layerEntityId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::UpdateLayerNameConflictMapping,
+            nameConflictMapping);
+    }
+
+    if (!nameConflictMapping.empty())
+    {
+        AzToolsFramework::Layers::NameConflictWarning* nameConflictWarning = new AzToolsFramework::Layers::NameConflictWarning(GetMainWindow(), nameConflictMapping);
+        nameConflictWarning->exec();
+        return;
+    }
+
+    AZStd::unordered_set<AZ::EntityId> allLayersToSave(layers);
+    bool mustSaveLevel = false;
+    bool mustSaveOtherContent = false;
+
+    for (AZ::EntityId layerEntityId : layers)
+    {
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            mustSaveOtherContent,
+            layerEntityId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GatherSaveDependencies,
+            allLayersToSave,
+            mustSaveLevel);
+    }
+
+    if (mustSaveOtherContent)
+    {
+        QWidget* mainWindow = nullptr;
+        AzToolsFramework::EditorRequestBus::BroadcastResult(
+            mainWindow,
+            &AzToolsFramework::EditorRequestBus::Events::GetMainWindow);
+        QMessageBox saveAdditionalContentMessage(mainWindow);
+        saveAdditionalContentMessage.setWindowTitle(QObject::tr("Unsaved content"));
+        saveAdditionalContentMessage.setText(QObject::tr("You have moved entities to or from the layer(s) that you are trying to save."));
+        if (mustSaveLevel)
+        {
+            saveAdditionalContentMessage.setInformativeText(QObject::tr("The level and all layers will be saved."));
+
+        }
+        else
+        {
+            saveAdditionalContentMessage.setInformativeText(QObject::tr("All relevant layers will be saved."));
+        }
+        saveAdditionalContentMessage.setIcon(QMessageBox::Warning);
+        saveAdditionalContentMessage.setStandardButtons(QMessageBox::Save | QMessageBox::Cancel);
+        saveAdditionalContentMessage.setDefaultButton(QMessageBox::Save);
+        int saveAdditionalContentMessageResult = saveAdditionalContentMessage.exec();
+        switch (saveAdditionalContentMessageResult)
+        {
+        case QMessageBox::Cancel:
+            // The user chose to cancel this operation.
+            return;
+        case QMessageBox::Save:
+        default:
+            break;
+        }
+
+        if (mustSaveLevel)
+        {
+            // Saving the level causes all layers to save.
+            GetIEditor()->GetDocument()->Save();
+            return;
+        }
+    }
+
+    QString levelAbsoluteFolder = Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName());
+
+    // Not used here, but needed for the ebus event.
+    AZStd::vector<AZ::Entity*> layerEntities;
+    AZ::SliceComponent::SliceReferenceToInstancePtrs instancesInLayers;
+    for (AZ::EntityId layerEntityId : allLayersToSave)
+    {
+        AzToolsFramework::Layers::LayerResult layerSaveResult(AzToolsFramework::Layers::LayerResult::CreateSuccess());
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            layerSaveResult,
+            layerEntityId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::WriteLayerAndGetEntities,
+            levelAbsoluteFolder,
+            layerEntities,
+            instancesInLayers);
+
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
+            layerEntityId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::RestoreEditorData);
+        layerSaveResult.MessageResult();
+
+        m_unsavedEntities.erase(layerEntityId);
+    }
+
+    // Update the unsaved entities list so these entities are no longer tracked as unsaved.
+    for (const AZ::Entity* entity : layerEntities)
+    {
+        m_unsavedEntities.erase(entity->GetId());
+    }
+}
+
+void SandboxIntegrationManager::ContextMenu_MakeSlice(AzToolsFramework::EntityIdList entities)
+{
+    QChar bulletChar(0x2022);
+
+    QMessageBox createSliceBox(GetMainWindow());
+    createSliceBox.setWindowTitle(QObject::tr("Create Slice"));
+    createSliceBox.setText(QString(QObject::tr("Your selection contains slice instances. What kind of slice do you want to create?"))
+        + "\n\n" + QString(bulletChar) + " " + "Fresh slice that doesn't inherit existing slice references."
+        + "\n" + QString(bulletChar) + " " + "Nested slice that inherits existing slice references."
+        + "\n\n");
+    createSliceBox.setIcon(QMessageBox::Warning);
+    
+    QPushButton* freshSliceButton = createSliceBox.addButton(QObject::tr("Fresh Slice"), QMessageBox::ActionRole);
+    QPushButton* nestedSliceButton = createSliceBox.addButton(QObject::tr("Nested Slice"), QMessageBox::ActionRole);
+    createSliceBox.addButton(QMessageBox::Cancel);
+
+    createSliceBox.exec();
+
+    if (createSliceBox.clickedButton() == freshSliceButton)
+    {
+        MakeSliceFromEntities(entities, false, GetIEditor()->GetEditorSettings()->sliceSettings.dynamicByDefault);
+    }
+    else if (createSliceBox.clickedButton() == nestedSliceButton)
+    {
+        ContextMenu_InheritSlice(entities);
+    }
+}
+
+void SandboxIntegrationManager::ContextMenu_InheritSlice(AzToolsFramework::EntityIdList entities)
+{
+    MakeSliceFromEntities(entities, true, GetIEditor()->GetEditorSettings()->sliceSettings.dynamicByDefault);
+}
+void SandboxIntegrationManager::ContextMenu_InstantiateSlice()
+{
+    AssetSelectionModel selection = AssetSelectionModel::AssetTypeSelection("Slice");
+    BrowseForAssets(selection);
+
+    if (selection.IsValid())
+    {
+        auto product = azrtti_cast<const ProductAssetBrowserEntry*>(selection.GetResult());
+        AZ_Assert(product, "Incorrect entry type selected. Expected product.");
+     
+        InstantiateSliceFromAssetId(product->GetAssetId());
+    }
+}
+
+void SandboxIntegrationManager::InstantiateSliceFromAssetId(const AZ::Data::AssetId& assetId)
+{
+    AZ::Transform sliceWorldTransform = AZ::Transform::CreateIdentity();
+
+    CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
+    // If we don't have a viewport active to aid in placement, the slice
+    // will be instantiated at the origin.
+    if (view)
+    {
+        const QPoint viewPoint(m_contextMenuViewPoint.GetX(), m_contextMenuViewPoint.GetY());
+        sliceWorldTransform = AZ::Transform::CreateTranslation(LYVec3ToAZVec3(view->SnapToGrid(view->ViewToWorld(viewPoint))));
+    }
+
+    AzToolsFramework::SliceRequestBus::Broadcast(&AzToolsFramework::SliceRequests::InstantiateSliceFromAssetId, assetId, sliceWorldTransform);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Returns true if at least one non-layer entity was found.
+bool CollectEntityBoundingBoxesForZoom(const AZ::EntityId& entityId, AABB& selectionBounds)
+{
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+
+    if (isLayerEntity)
+    {
+        // If a layer is in the selection, zoom to its children and ignore the layer itself.
+        AZStd::vector<AZ::EntityId> layerChildren;
+        AZ::TransformBus::EventResult(
+            /*result*/ layerChildren,
+            /*address*/ entityId,
+            &AZ::TransformBus::Events::GetChildren);
+        bool childResults = false;
+        for (const AZ::EntityId& childId : layerChildren)
+        {
+            if (CollectEntityBoundingBoxesForZoom(childId, selectionBounds))
+            {
+                // At least one child is not a layer.
+                childResults = true;
+            }
+        }
+        return childResults;
+    }
+    else
+    {
+        AABB entityBoundingBox;
+        CEntityObject* componentEntityObject = nullptr;
+        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(
+            /*result*/ componentEntityObject,
+            /*address*/ entityId,
+            &AzToolsFramework::ComponentEntityEditorRequestBus::Events::GetSandboxObject);
+
+        if (componentEntityObject)
+        {
+            componentEntityObject->GetBoundBox(entityBoundingBox);
+            selectionBounds.Add(entityBoundingBox.min);
+            selectionBounds.Add(entityBoundingBox.max);
+        }
+        return true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SandboxIntegrationManager::GoToEntitiesInViewports(const AzToolsFramework::EntityIdList& entityIds)
+{
+    if (entityIds.empty())
+    {
+        return;
+    }
+
+    if (SandboxEditor::UsingNewCameraSystem())
+    {
+        const AZ::Aabb aabb = AZStd::accumulate(
+            AZStd::begin(entityIds), AZStd::end(entityIds), AZ::Aabb::CreateNull(), [](AZ::Aabb acc, const AZ::EntityId entityId) {
+                const AZ::Aabb aabb = AzFramework::CalculateEntityWorldBoundsUnion(AzToolsFramework::GetEntityById(entityId));
+                acc.AddAabb(aabb);
+                return acc;
+            });
+
+        float radius;
+        AZ::Vector3 center;
+        aabb.GetAsSphere(center, radius);
+
+        // minimum center size is 40cm
+        const float minSelectionRadius = 0.4f;
+        const float selectionSize = AZ::GetMax(minSelectionRadius, radius);
+
+        auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
+
+        const int viewCount = GetIEditor()->GetViewManager()->GetViewCount(); // legacy call
+        for (int viewIndex = 0; viewIndex < viewCount; ++viewIndex)
+        {
+            if (auto viewportContext = viewportContextManager->GetViewportContextById(viewIndex))
+            {
+                const AZ::Transform cameraTransform = viewportContext->GetCameraTransform();
+                const AZ::Vector3 forward = (center - cameraTransform.GetTranslation()).GetNormalized();
+
+                // move camera 25% further back than required
+                const float centerScale = 1.25f;
+                // compute new camera transform
+                const float fov = AzFramework::RetrieveFov(viewportContext->GetCameraProjectionMatrix());
+                const float fovScale = (1.0f / AZStd::tan(fov * 0.5f));
+                const float distanceToLookAt = selectionSize * fovScale * centerScale;
+                const AZ::Transform nextCameraTransform =
+                    AZ::Transform::CreateLookAt(aabb.GetCenter() - (forward * distanceToLookAt), aabb.GetCenter());
+
+                AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
+                    viewportContext->GetId(),
+                    &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, nextCameraTransform,
+                    distanceToLookAt);
+            }
+        }
+    }
+    else
+    {
+        AABB selectionBounds;
+        selectionBounds.Reset();
+        bool entitiesAvailableForGoTo = false;
+
+        for (const AZ::EntityId& entityId : entityIds)
+        {
+            if (CollectEntityBoundingBoxesForZoom(entityId, selectionBounds))
+            {
+                entitiesAvailableForGoTo = true;
+            }
+        }
+
+        if (entitiesAvailableForGoTo)
+        {
+            int numViews = GetIEditor()->GetViewManager()->GetViewCount();
+            for (int viewIndex = 0; viewIndex < numViews; ++viewIndex)
+            {
+                CViewport* viewport = GetIEditor()->GetViewManager()->GetView(viewIndex);
+                if (viewport)
+                {
+                    viewport->CenterOnAABB(selectionBounds);
+                }
+            }
+        }
+    }
+}
+
+void SandboxIntegrationManager::ContextMenu_SelectSlice()
+{
+    AzToolsFramework::EntityIdList selectedEntities;
+    GetSelectedOrHighlightedEntities(selectedEntities);
+
+    AzToolsFramework::EntityIdList newSelectedEntities;
+
+    for (const AZ::EntityId& entityId : selectedEntities)
+    {
+        AZ::SliceComponent::SliceInstanceAddress sliceAddress;
+        AzFramework::SliceEntityRequestBus::EventResult(sliceAddress, entityId,
+            &AzFramework::SliceEntityRequestBus::Events::GetOwningSlice);
+
+        if (sliceAddress.IsValid())
+        {
+            const AZ::SliceComponent::InstantiatedContainer* instantiated = sliceAddress.GetInstance()->GetInstantiated();
+
+            if (instantiated)
+            {
+                for (AZ::Entity* entityInSlice : instantiated->m_entities)
+                {
+                    newSelectedEntities.push_back(entityInSlice->GetId());
+                }
+            }
+        }
+    }
+
+    EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus,
+        SetSelectedEntities, newSelectedEntities);
+}
+
+void SandboxIntegrationManager::ContextMenu_PushEntitiesToSlice(AzToolsFramework::EntityIdList entities,
+    AZ::SliceComponent::EntityAncestorList ancestors,
+    AZ::Data::AssetId targetAncestorId,
+    bool affectEntireHierarchy)
+{
+    (void)ancestors;
+    (void)targetAncestorId;
+    (void)affectEntireHierarchy;
+
+    AZ::SerializeContext* serializeContext = NULL;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(serializeContext, "No serialize context");
+
+    AzToolsFramework::SliceUtilities::PushEntitiesModal(GetMainWindow(), entities, serializeContext);
+}
+
+void SandboxIntegrationManager::ContextMenu_Duplicate()
+{
+    bool handled = true;
+    AzToolsFramework::EditorRequestBus::Broadcast(&AzToolsFramework::EditorRequests::CloneSelection, handled);
+}
+
+void SandboxIntegrationManager::ContextMenu_DeleteSelected()
+{
+    DeleteSelectedEntities(true);
+}
+
+void SandboxIntegrationManager::ContextMenu_ResetToSliceDefaults(AzToolsFramework::EntityIdList entities)
+{
+    AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
+        &AzToolsFramework::SliceEditorEntityOwnershipServiceRequests::ResetEntitiesToSliceDefaults, entities);
+}
+
+void SandboxIntegrationManager::GetSelectedEntities(AzToolsFramework::EntityIdList& entities)
+{
+    EBUS_EVENT_RESULT(entities,
+        AzToolsFramework::ToolsApplicationRequests::Bus,
+        GetSelectedEntities);
+}
+
+void SandboxIntegrationManager::GetSelectedOrHighlightedEntities(AzToolsFramework::EntityIdList& entities)
+{
+    AzToolsFramework::EntityIdList selectedEntities;
+    AzToolsFramework::EntityIdList highlightedEntities;
+
+    EBUS_EVENT_RESULT(selectedEntities,
+        AzToolsFramework::ToolsApplicationRequests::Bus,
+        GetSelectedEntities);
+
+    EBUS_EVENT_RESULT(highlightedEntities,
+        AzToolsFramework::ToolsApplicationRequests::Bus,
+        GetHighlightedEntities);
+
+    entities = AZStd::move(selectedEntities);
+
+    for (AZ::EntityId highlightedId : highlightedEntities)
+    {
+        if (entities.end() == AZStd::find(entities.begin(), entities.end(), highlightedId))
+        {
+            entities.push_back(highlightedId);
+        }
+    }
+}
+
+AZStd::string SandboxIntegrationManager::GetComponentEditorIcon(const AZ::Uuid& componentType, AZ::Component* component)
+{
+    AZStd::string iconPath = GetComponentIconPath(componentType, AZ::Edit::Attributes::Icon, component);
+    return iconPath;
+}
+
+AZStd::string SandboxIntegrationManager::GetComponentIconPath(const AZ::Uuid& componentType,
+    AZ::Crc32 componentIconAttrib, AZ::Component* component)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    if (componentIconAttrib != AZ::Edit::Attributes::Icon
+        && componentIconAttrib != AZ::Edit::Attributes::ViewportIcon
+        && componentIconAttrib != AZ::Edit::Attributes::HideIcon)
+    {
+        AZ_Warning("SandboxIntegration", false, "Unrecognized component icon attribute!");
+    }
+
+    // return blank path if component shouldn't have icon at all
+    AZStd::string iconPath;
+
+    AZ::SerializeContext* serializeContext = nullptr;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(serializeContext, "No serialize context");
+
+    auto classData = serializeContext->FindClassData(componentType);
+    if (classData && classData->m_editData)
+    {
+        // check if component icon should be hidden
+        bool hideIcon = false;
+
+        auto editorElementData = classData->m_editData->FindElementData(AZ::Edit::ClassElements::EditorData);
+        if (editorElementData)
+        {
+            if (auto hideIconAttribute = editorElementData->FindAttribute(AZ::Edit::Attributes::HideIcon))
+            {
+                auto hideIconAttributeData = azdynamic_cast<const AZ::Edit::AttributeData<bool>*>(hideIconAttribute);
+                if (hideIconAttributeData)
+                {
+                    hideIcon = hideIconAttributeData->Get(nullptr);
+                }
+            }
+        }
+
+        if (!hideIcon)
+        {
+            // component should have icon. start with default
+            iconPath = GetDefaultComponentEditorIcon();
+
+            // check for specific icon
+            if (editorElementData)
+            {
+                if (auto iconAttribute = editorElementData->FindAttribute(componentIconAttrib))
+                {
+                    if (auto iconAttributeData = azdynamic_cast<const AZ::Edit::AttributeData<const char*>*>(iconAttribute))
+                    {
+                        AZStd::string iconAttributeValue = iconAttributeData->Get(component);
+                        if (!iconAttributeValue.empty())
+                        {
+                            iconPath = AZStd::move(iconAttributeValue);
+                        }
+                    }
+
+                    auto iconOverrideAttribute = editorElementData->FindAttribute(AZ::Edit::Attributes::DynamicIconOverride);
+
+                    // If it has an override and we're given an instance, then get any potential override from the instance here
+                    if (component &&
+                        (componentIconAttrib == AZ::Edit::Attributes::Icon || componentIconAttrib == AZ::Edit::Attributes::ViewportIcon) &&
+                        iconOverrideAttribute)
+                    {
+                        AZStd::string iconValue;
+                        AZ::AttributeReader iconReader(const_cast<AZ::Component*>(component), iconOverrideAttribute);
+                        iconReader.Read<AZStd::string>(iconValue);
+
+                        if (!iconValue.empty())
+                        {
+                            iconPath = AZStd::move(iconValue);
+                        }
+                    }
+                }
+            }
+            // If Qt doesn't know where the relative path is we have to use the more expensive full path
+            if (!QFile::exists(QString(iconPath.c_str())))
+            {
+                // use absolute path if possible
+                AZStd::string iconFullPath;
+                bool pathFound = false;
+                using AssetSysReqBus = AzToolsFramework::AssetSystemRequestBus;
+                AssetSysReqBus::BroadcastResult(
+                    pathFound, &AssetSysReqBus::Events::GetFullSourcePathFromRelativeProductPath,
+                    iconPath, iconFullPath);
+                if (pathFound)
+                {
+                    iconPath = AZStd::move(iconFullPath);
+                }
+            }
+        }
+    }
+
+    return iconPath;
+}
+
+void SandboxIntegrationManager::UndoStackFlushed()
+{
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::FlushUndo);
+}
+
+void SandboxIntegrationManager::MakeSliceFromEntities(const AzToolsFramework::EntityIdList& entities, bool inheritSlices, bool setAsDynamic)
+{
+    // expand the list of entities to include all transform descendant entities
+    AzToolsFramework::EntityIdSet entitiesAndDescendants;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(entitiesAndDescendants,
+        &AzToolsFramework::ToolsApplicationRequestBus::Events::GatherEntitiesAndAllDescendents, entities);
+
+    const AZStd::string slicesAssetsPath = "@devassets@/Slices";
+
+    if (!gEnv->pFileIO->Exists(slicesAssetsPath.c_str()))
+    {
+        gEnv->pFileIO->CreatePath(slicesAssetsPath.c_str());
+    }
+
+    char path[AZ_MAX_PATH_LEN] = { 0 };
+    gEnv->pFileIO->ResolvePath(slicesAssetsPath.c_str(), path, AZ_MAX_PATH_LEN);
+    AzToolsFramework::SliceUtilities::MakeNewSlice(entitiesAndDescendants, path, inheritSlices, setAsDynamic);
+}
+
+void SandboxIntegrationManager::RegisterViewPane(const char* name, const char* category, const AzToolsFramework::ViewPaneOptions& viewOptions, const WidgetCreationFunc& widgetCreationFunc)
+{
+    QtViewPaneManager::instance()->RegisterPane(name, category, widgetCreationFunc, viewOptions);
+}
+
+void SandboxIntegrationManager::RegisterCustomViewPane(const char* name, const char* category, const AzToolsFramework::ViewPaneOptions& viewOptions)
+{
+    QtViewPaneManager::instance()->RegisterPane(name, category, nullptr, viewOptions);
+}
+
+void SandboxIntegrationManager::UnregisterViewPane(const char* name)
+{
+    QtViewPaneManager::instance()->UnregisterPane(name);
+}
+
+QWidget* SandboxIntegrationManager::GetViewPaneWidget(const char* viewPaneName)
+{
+    return FindViewPane<QWidget>(viewPaneName);
+}
+
+void SandboxIntegrationManager::OpenViewPane(const char* paneName)
+{
+    const QtViewPane* pane = QtViewPaneManager::instance()->OpenPane(paneName);
+    if (pane)
+    {
+        pane->m_dockWidget->raise();
+        pane->m_dockWidget->activateWindow();
+    }
+}
+
+QDockWidget* SandboxIntegrationManager::InstanceViewPane(const char* paneName)
+{
+    return QtViewPaneManager::instance()->InstancePane(paneName);
+}
+
+void SandboxIntegrationManager::CloseViewPane(const char* paneName)
+{
+    QtViewPaneManager::instance()->ClosePane(paneName);
+}
+
+void SandboxIntegrationManager::BrowseForAssets(AssetSelectionModel& selection)
+{
+    AssetBrowserComponentRequestBus::Broadcast(&AssetBrowserComponentRequests::PickAssets, selection, GetMainWindow());
+}
+
+bool SandboxIntegrationManager::DisplayHelpersVisible()
+{
+    return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
+}
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
new file mode 100644
index 0000000000..a738edcb0e
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
@@ -0,0 +1,371 @@
+/*
+ * 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_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H
+#define CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H
+
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Slice/SliceBus.h>
+#include <AzCore/Slice/SliceComponent.h>
+#include <AzCore/Math/Uuid.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzFramework/Asset/AssetCatalogBus.h>
+#include <AzFramework/Entity/EntityDebugDisplayBus.h>
+#include <AzFramework/Viewport/DisplayContextRequestBus.h>
+#include <AzToolsFramework/API/EditorWindowRequestBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include <AzToolsFramework/UI/Layer/LayerUiHandler.h>
+#include <AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h>
+#include <AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx>
+#include <AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+
+// Sandbox imports.
+#include "../Editor/ViewManager.h"
+#include "../Editor/Viewport.h"
+#include "../Editor/Undo/IUndoManagerListener.h"
+#include "../Editor/Undo/IUndoObject.h"
+
+#include <QApplication>
+#include <QPointer>
+
+/**
+* Integration of ToolsApplication behavior and Cry undo/redo and selection systems
+* with respect to component entity operations.
+*
+* Undo/Redo
+* - CToolsApplicationUndoLink represents a component application undo operation within
+*   the Sandbox undo system. When an undo-able component operation is performed, we
+*   intercept ToolsApplicationEventBus::OnBeginUndo()/OnEndUndo() events, and in turn
+*   create and register a link instance.
+* - When the user attempts to undo/redo a CToolsApplicationUndoLink event in Sandbox,
+*   CToolsApplicationUndoLink::Undo()/Redo() is invoked, and the request is passed
+*   to the component application via ToolsApplicationRequestBus::OnUndoPressed/OnRedoPressed,
+*   where restoration of the previous entity snapshot is handled.
+*
+* AzToolsFramework::ToolsApplication Extensions
+* - Provides engine UI customizations, such as using the engine's built in asset browser
+*   when assigning asset references to component properties.
+* - Handles component edit-time display requests (using the editor's drawing context).
+* - Handles source control requests from AZ components or component-related UI.
+*/
+
+namespace AZ::Data
+{
+    class AssetInfo;
+}
+
+class CToolsApplicationUndoLink;
+
+class QMenu;
+class QWidget;
+class CComponentEntityObject;
+class CHyperGraph;
+
+namespace AzToolsFramework
+{
+    class EditorEntityAPI;
+    class EditorEntityUiInterface;
+
+    namespace AssetBrowser
+    {
+        class AssetSelectionModel;
+    }
+
+    namespace Prefab
+    {
+        class PrefabIntegrationInterface;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+class SandboxIntegrationManager
+    : private AzToolsFramework::ToolsApplicationEvents::Bus::Handler
+    , private AzToolsFramework::EditorRequests::Bus::Handler
+    , private AzToolsFramework::EditorPickModeNotificationBus::Handler
+    , private AzToolsFramework::EditorContextMenuBus::Handler
+    , private AzToolsFramework::EditorWindowRequests::Bus::Handler
+    , private AzFramework::AssetCatalogEventBus::Handler
+    , private AzFramework::DisplayContextRequestBus::Handler
+    , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
+    , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
+    , private IUndoManagerListener
+    , private AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler
+{
+public:
+
+    SandboxIntegrationManager();
+    ~SandboxIntegrationManager();
+
+    void Setup();
+    void Teardown();
+
+private:
+
+    //////////////////////////////////////////////////////////////////////////
+    // AssetCatalogEventBus::Handler
+    void OnCatalogAssetAdded(const AZ::Data::AssetId& assetId) override;
+    void OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& assetInfo) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::ToolsApplicationEvents::Bus::Handler overrides
+    void OnBeginUndo(const char* label) override;
+    void OnEndUndo(const char* label, bool changed) override;
+    void EntityParentChanged(
+        AZ::EntityId entityId,
+        AZ::EntityId newParentId,
+        AZ::EntityId oldParentId) override;
+    void OnSaveLevel() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorRequests::Bus::Handler overrides
+    void RegisterViewPane(const char* name, const char* category, const AzToolsFramework::ViewPaneOptions& viewOptions, const WidgetCreationFunc& widgetCreationFunc) override;
+    void RegisterCustomViewPane(const char* name, const char* category, const AzToolsFramework::ViewPaneOptions& viewOptions) override;
+    void UnregisterViewPane(const char* name) override;
+    QWidget* GetViewPaneWidget(const char* viewPaneName) override;
+    void OpenViewPane(const char* paneName) override;
+    QDockWidget* InstanceViewPane(const char* paneName) override;
+    void CloseViewPane(const char* paneName) override;
+    void BrowseForAssets(AzToolsFramework::AssetBrowser::AssetSelectionModel& selection) override;
+    void HandleObjectModeSelection(const AZ::Vector2& point, int flags, bool& handled) override;
+    void UpdateObjectModeCursor(AZ::u32& cursorId, AZStd::string& cursorStr) override;
+    void CreateEditorRepresentation(AZ::Entity* entity) override;
+    bool DestroyEditorRepresentation(AZ::EntityId entityId, bool deleteAZEntity) override;
+    void CloneSelection(bool& handled) override;
+    void DeleteSelectedEntities(bool includeDescendants) override;
+    AZ::EntityId CreateNewEntity(AZ::EntityId parentId = AZ::EntityId()) override;
+    AZ::EntityId CreateNewEntityAsChild(AZ::EntityId parentId) override;
+    AZ::EntityId CreateNewEntityAtPosition(const AZ::Vector3& /*pos*/, AZ::EntityId parentId = AZ::EntityId()) override;
+    AzFramework::EntityContextId GetEntityContextId() override;
+    QWidget* GetMainWindow() override;
+    IEditor* GetEditor() override;
+    bool GetUndoSliceOverrideSaveValue() override;
+    bool GetShowCircularDependencyError() override;
+    void SetShowCircularDependencyError(const bool& showCircularDependencyError) override;
+    void LaunchLuaEditor(const char* files) override;
+    bool IsLevelDocumentOpen() override;
+    AZStd::string GetLevelName() override;
+    AZStd::string SelectResource(const AZStd::string& resourceType, const AZStd::string& previousValue) override;
+    void OpenPinnedInspector(const AzToolsFramework::EntityIdSet& entities) override;
+    void ClosePinnedInspector(AzToolsFramework::EntityPropertyEditor* editor) override;
+    void GoToSelectedOrHighlightedEntitiesInViewports() override;
+    void GoToSelectedEntitiesInViewports() override;
+    bool CanGoToSelectedEntitiesInViewports() override;
+    AZ::Vector3 GetWorldPositionAtViewportCenter() override;
+    void InstantiateSliceFromAssetId(const AZ::Data::AssetId& assetId) override;
+    void ClearRedoStack() override;
+    int GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath) override;
+    bool DisplayHelpersVisible() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorWindowRequests::Bus::Handler
+    QWidget* GetAppMainWindow() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    // EditorPickModeNotificationBus
+    void OnEntityPickModeStarted() override;
+    void OnEntityPickModeStopped() override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorContextMenu::Bus::Handler overrides
+    void PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags) override;
+    int GetMenuPosition() const;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorEntityContextNotificationBus::Handler
+    void OnContextReset() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    /// AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
+    void OnSliceInstantiated(
+        const AZ::Data::AssetId& sliceAssetId,
+        AZ::SliceComponent::SliceInstanceAddress& sliceAddress,
+        const AzFramework::SliceInstantiationTicket& ticket) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    // AzFramework::DisplayContextRequestBus (and @deprecated EntityDebugDisplayRequestBus)
+    // AzFramework::DisplayContextRequestBus
+    void SetDC(DisplayContext* dc) override;
+    DisplayContext* GetDC() override;
+
+    // Context menu handlers.
+    void ContextMenu_NewEntity();
+    AZ::EntityId ContextMenu_NewLayer();
+    void ContextMenu_SaveLayers(const AZStd::unordered_set<AZ::EntityId>& layers);
+    void ContextMenu_MakeSlice(AzToolsFramework::EntityIdList entities);
+    void ContextMenu_InheritSlice(AzToolsFramework::EntityIdList entities);
+    void ContextMenu_InstantiateSlice();
+    void ContextMenu_SelectSlice();
+    void ContextMenu_PushEntitiesToSlice(AzToolsFramework::EntityIdList entities,
+        AZ::SliceComponent::EntityAncestorList ancestors,
+        AZ::Data::AssetId targetAncestorId,
+        bool affectEntireHierarchy);
+    void ContextMenu_Duplicate();
+    void ContextMenu_DeleteSelected();
+    void ContextMenu_ResetToSliceDefaults(AzToolsFramework::EntityIdList entities);
+
+    void MakeSliceFromEntities(const AzToolsFramework::EntityIdList& entities, bool inheritSlices, bool setAsDynamic);
+
+    void GetSelectedEntities(AzToolsFramework::EntityIdList& entities);
+    void GetSelectedOrHighlightedEntities(AzToolsFramework::EntityIdList& entities);
+
+    AZStd::string GetDefaultComponentViewportIcon() override
+    {
+        return m_defaultComponentViewportIconLocation;
+    }
+
+    AZStd::string GetDefaultComponentEditorIcon() override
+    {
+        return m_defaultComponentIconLocation;
+    }
+
+    AZStd::string GetDefaultEntityIcon() override
+    {
+        return m_defaultEntityIconLocation;
+    }
+
+    AZStd::string GetComponentEditorIcon(const AZ::Uuid& componentType, AZ::Component* component) override;
+    AZStd::string GetComponentIconPath(const AZ::Uuid& componentType, AZ::Crc32 componentIconAttrib, AZ::Component* component) override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // IUndoManagerListener
+    // Listens for Cry Undo System events.
+    void UndoStackFlushed() override;
+
+    // EditorLayerRequestBus...
+    void OnLayerComponentActivated(AZ::EntityId entityId) override;
+    void OnLayerComponentDeactivated(AZ::EntityId entityId) override;
+
+private:
+    // Right click context menu when a layer is included in the selection.
+    void SetupLayerContextMenu(QMenu* menu);
+    void SetupSliceContextMenu(QMenu* menu);
+    void SetupSliceContextMenu_Modify(QMenu* menu, const AzToolsFramework::EntityIdList& selectedEntities, const AZ::u32 numEntitiesInSlices);
+    void SaveSlice(const bool& QuickPushToFirstLevel);
+    void GetEntitiesInSlices(const AzToolsFramework::EntityIdList& selectedEntities, AZ::u32& entitiesInSlices, AZStd::vector<AZ::SliceComponent::SliceInstanceAddress>& sliceInstances);
+
+    void GoToEntitiesInViewports(const AzToolsFramework::EntityIdList& entityIds);
+
+    bool CanGoToEntityOrChildren(const AZ::EntityId& entityId) const;
+
+    // This struct exists to help handle the error case where slice assets are 
+    // accidentally deleted from disk but their instances are still in the editing level.
+    struct SliceAssetDeletionErrorInfo
+    {
+        SliceAssetDeletionErrorInfo() = default;
+
+        SliceAssetDeletionErrorInfo(AZ::Data::AssetId assetId, AZStd::vector<AZStd::pair<AZ::EntityId, AZ::SliceComponent::EntityRestoreInfo>>&& entityRestoreInfos) 
+            : m_assetId(assetId)
+            , m_entityRestoreInfos(AZStd::move(entityRestoreInfos))
+        { }
+
+        AZ::Data::AssetId m_assetId;
+        AZStd::vector<AZStd::pair<AZ::EntityId, AZ::SliceComponent::EntityRestoreInfo>> m_entityRestoreInfos;
+    };
+
+private:
+    AZ::Vector2 m_contextMenuViewPoint;
+    AZ::Vector3 m_sliceWorldPos;
+
+    int m_inObjectPickMode;
+    short m_startedUndoRecordingNestingLevel;   // used in OnBegin/EndUndo to ensure we only accept undo's we started recording
+
+    AzToolsFramework::SliceOverridesNotificationWindowManager* m_notificationWindowManager;
+
+    DisplayContext* m_dc;
+
+    AZStd::vector<SliceAssetDeletionErrorInfo> m_sliceAssetDeletionErrorRestoreInfos;
+
+    // Tracks new entities that have not yet been saved.
+    AZStd::unordered_set<AZ::EntityId> m_unsavedEntities;
+
+    const AZStd::string m_defaultComponentIconLocation = "Icons/Components/Component_Placeholder.svg";
+    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.png";
+    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.png";
+
+    bool m_debugDisplayBusImplementationActive = false;
+
+    AzToolsFramework::Prefab::PrefabIntegrationManager* m_prefabIntegrationManager = nullptr;
+
+    AzToolsFramework::EditorEntityUiInterface* m_editorEntityUiInterface = nullptr;
+    AzToolsFramework::Prefab::PrefabIntegrationInterface* m_prefabIntegrationInterface = nullptr;
+    AzToolsFramework::EditorEntityAPI* m_editorEntityAPI = nullptr;
+
+    // Overrides UI styling and behavior for Layer Entities
+    AzToolsFramework::LayerUiHandler m_layerUiOverrideHandler;
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CToolsApplicationUndoLink
+    : public IUndoObject
+{
+public:
+
+    CToolsApplicationUndoLink(const char* description)
+        : m_description(description)
+    {
+    }
+
+    int GetSize() override
+    {
+        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.
+
+        // Restore previous focus after applying the undo.
+        QPointer<QWidget> w = QApplication::focusWidget();
+
+        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::UndoPressed);
+
+        // Slice the redo stack if this wasn't due to explicit undo command
+        if (!bUndo)
+        {
+            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::FlushRedo);
+        }
+
+        if (!w.isNull())
+        {
+            w->setFocus(Qt::OtherFocusReason);
+        }
+    }
+
+    void Redo() override
+    {
+        // Restore previous focus after applying the undo.
+        QPointer<QWidget> w = QApplication::focusWidget();
+
+        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::RedoPressed);
+
+        if (!w.isNull())
+        {
+            w->setFocus(Qt::OtherFocusReason);
+        }
+    }
+
+    AZStd::string m_description;
+};
+
+#endif // CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Tests/ComponentEntityObjectStateTests.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Tests/ComponentEntityObjectStateTests.cpp
new file mode 100644
index 0000000000..c033d7f3d5
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Tests/ComponentEntityObjectStateTests.cpp
@@ -0,0 +1,265 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzTest/AzTest.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
+#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
+
+#include <Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h>
+
+using namespace AzToolsFramework;
+
+namespace UnitTest
+{
+    class ComponentEntityObjectVisibilityFixture
+        : public ToolsApplicationFixture
+        , private EditorEntityVisibilityNotificationBus::Router
+        , private EditorEntityInfoNotificationBus::Handler
+    {
+    public:
+        void SetUpEditorFixtureImpl() override
+        {
+            EditorEntityVisibilityNotificationBus::Router::BusRouterConnect();
+            EditorEntityInfoNotificationBus::Handler::BusConnect();
+        }
+
+        void TearDownEditorFixtureImpl() override
+        {
+            EditorEntityInfoNotificationBus::Handler::BusDisconnect();
+            EditorEntityVisibilityNotificationBus::Router::BusRouterDisconnect();
+        }
+
+        TestEditorActions m_editorActions;
+        AZ::EntityId m_layerId;
+
+    private:
+        // EditorEntityVisibilityNotificationBus ...
+        void OnEntityVisibilityChanged(bool /*visibility*/) override
+        {
+        }
+
+        // EditorEntityInfoNotificationBus ...
+        void OnEntityInfoUpdatedVisibility(AZ::EntityId /*entityId*/, bool /*visible*/) override
+        {
+        }
+    };
+
+    TEST_F(ComponentEntityObjectVisibilityFixture, ViewportComponentEntityObjectRespectsLayerVisibility)
+    {
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Given
+        AZ::Entity* entityA = nullptr;
+        const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
+        AZ::Entity* entityB = nullptr;
+        const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
+        AZ::Entity* entityC = nullptr;
+        const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
+
+        m_layerId = CreateEditorLayerEntity("Layer");
+
+        entityA->Deactivate();
+        entityB->Deactivate();
+        entityC->Deactivate();
+
+        CComponentEntityObject componentEntityObjectA;
+        componentEntityObjectA.AssignEntity(entityA);
+
+        CComponentEntityObject componentEntityObjectB;
+        componentEntityObjectB.AssignEntity(entityB);
+
+        CComponentEntityObject componentEntityObjectC;
+        componentEntityObjectC.AssignEntity(entityC);
+
+        entityC->Activate();
+        entityB->Activate();
+        entityA->Activate();
+
+        AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
+        AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
+        AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // When
+        SetEntityVisibility(a, false);
+        SetEntityVisibility(b, false);
+        SetEntityVisibility(c, false);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Then
+        EXPECT_TRUE(componentEntityObjectA.IsHidden());
+        EXPECT_TRUE(componentEntityObjectB.IsHidden());
+        EXPECT_TRUE(componentEntityObjectC.IsHidden());
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // When
+        SetEntityVisibility(a, true);
+        SetEntityVisibility(b, true);
+        SetEntityVisibility(c, true);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Then
+        EXPECT_FALSE(componentEntityObjectA.IsHidden());
+        EXPECT_FALSE(componentEntityObjectB.IsHidden());
+        EXPECT_FALSE(componentEntityObjectC.IsHidden());
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // When
+        SetEntityVisibility(m_layerId, false);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Then
+        EXPECT_TRUE(componentEntityObjectA.IsHidden());
+        EXPECT_TRUE(componentEntityObjectB.IsHidden());
+        EXPECT_TRUE(componentEntityObjectC.IsHidden());
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    }
+
+    TEST_F(ComponentEntityObjectVisibilityFixture, ComponentEntityObjectDoesNotOverrideVisibility)
+    {
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Given
+        AZ::Entity* entityA = nullptr;
+        const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
+        AZ::Entity* entityB = nullptr;
+        const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
+        AZ::Entity* entityC = nullptr;
+        const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
+
+        m_layerId = CreateEditorLayerEntity("Layer");
+
+        entityA->Deactivate();
+        entityB->Deactivate();
+        entityC->Deactivate();
+
+        CComponentEntityObject componentEntityObjectA;
+        componentEntityObjectA.AssignEntity(entityA);
+
+        CComponentEntityObject componentEntityObjectB;
+        componentEntityObjectB.AssignEntity(entityB);
+
+        CComponentEntityObject componentEntityObjectC;
+        componentEntityObjectC.AssignEntity(entityC);
+
+        entityC->Activate();
+        entityB->Activate();
+        entityA->Activate();
+
+        AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
+        AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
+        AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // When
+        SetEntityVisibility(m_layerId, false);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Then
+        EXPECT_TRUE(componentEntityObjectA.IsHidden());
+        EXPECT_TRUE(componentEntityObjectB.IsHidden());
+        EXPECT_TRUE(componentEntityObjectC.IsHidden());
+
+        EXPECT_TRUE(IsEntitySetToBeVisible(a));
+        EXPECT_FALSE(IsEntityVisible(a));
+
+        EXPECT_TRUE(IsEntitySetToBeVisible(a));
+        EXPECT_FALSE(IsEntityVisible(b));
+
+        EXPECT_TRUE(IsEntitySetToBeVisible(a));
+        EXPECT_FALSE(IsEntityVisible(c));
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    }
+
+    TEST_F(ComponentEntityObjectVisibilityFixture, ViewportComponentEntityObjectRespectsLayerLock)
+    {
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Given
+        AZ::Entity* entityA = nullptr;
+        const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
+        AZ::Entity* entityB = nullptr;
+        const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
+        AZ::Entity* entityC = nullptr;
+        const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
+
+        m_layerId = CreateEditorLayerEntity("Layer");
+
+        entityA->Deactivate();
+        entityB->Deactivate();
+        entityC->Deactivate();
+
+        CComponentEntityObject componentEntityObjectA;
+        componentEntityObjectA.AssignEntity(entityA);
+
+        CComponentEntityObject componentEntityObjectB;
+        componentEntityObjectB.AssignEntity(entityB);
+
+        CComponentEntityObject componentEntityObjectC;
+        componentEntityObjectC.AssignEntity(entityC);
+
+        entityC->Activate();
+        entityB->Activate();
+        entityA->Activate();
+
+        AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
+        AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
+        AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // When
+        SetEntityLockState(a, true);
+        SetEntityLockState(b, true);
+        SetEntityLockState(c, true);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Then
+        EXPECT_TRUE(componentEntityObjectA.IsFrozen());
+        EXPECT_TRUE(componentEntityObjectB.IsFrozen());
+        EXPECT_TRUE(componentEntityObjectC.IsFrozen());
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // When
+        SetEntityLockState(a, false);
+        SetEntityLockState(b, false);
+        SetEntityLockState(c, false);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Then
+        EXPECT_FALSE(componentEntityObjectA.IsFrozen());
+        EXPECT_FALSE(componentEntityObjectB.IsFrozen());
+        EXPECT_FALSE(componentEntityObjectC.IsFrozen());
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // When
+        SetEntityLockState(m_layerId, true);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Then
+        EXPECT_TRUE(componentEntityObjectA.IsFrozen());
+        EXPECT_TRUE(componentEntityObjectB.IsFrozen());
+        EXPECT_TRUE(componentEntityObjectC.IsFrozen());
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    }
+} // namespace UnitTest
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Tests/test_Main.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Tests/test_Main.cpp
new file mode 100644
index 0000000000..d44a1cb318
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Tests/test_Main.cpp
@@ -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
+ *
+ */
+
+#include "ComponentEntityEditorPlugin_precompiled.h"
+
+#include <AzTest/AzTest.h>
+#include <AzCore/Memory/SystemAllocator.h>
+
+#include <QApplication>
+
+using namespace AZ;
+
+// Handle asserts
+class ToolsFrameworkHook
+    : public AZ::Test::ITestEnvironment
+{
+public:
+    void SetupEnvironment() override
+    {
+        AllocatorInstance<SystemAllocator>::Create();
+    }
+
+    void TeardownEnvironment() override
+    {
+        AllocatorInstance<SystemAllocator>::Destroy();
+    }
+};
+
+AZTEST_EXPORT int AZ_UNIT_TEST_HOOK_NAME(int argc, char** argv)
+{
+    ::testing::InitGoogleMock(&argc, argv);
+    QApplication app(argc, argv);
+    AZ::Test::printUnusedParametersWarning(argc, argv);
+    AZ::Test::addTestEnvironments({ new ToolsFrameworkHook });
+    int result = RUN_ALL_TESTS();
+    return result;
+}
+
+IMPLEMENT_TEST_EXECUTABLE_MAIN();
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp
new file mode 100644
index 0000000000..2f22bb57cc
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp
@@ -0,0 +1,758 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "CryEdit.h"
+#include "AssetCatalogModel.h"
+#include "Objects/ComponentEntityObject.h"
+
+#include <ISourceControl.h>
+#include <IEditor.h>
+#include <qevent.h>
+#include <qmimedata.h>
+
+#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>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/Slice/SliceAsset.h>
+#include <AzCore/Asset/AssetManager.h>
+#include <AzCore/Asset/AssetManagerBus.h>
+#include <AzCore/Asset/AssetTypeInfoBus.h>
+
+#include <AzFramework/API/ApplicationAPI.h>
+
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h>
+#include <AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h>
+#include <AzToolsFramework/ToolsComponents/ScriptEditorComponent.h>
+#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
+#include <AzToolsFramework/Commands/EntityStateCommand.h>
+
+#include <QTimer>
+
+
+///////////////////////////////////////////////////////////////////////////////
+// AssetCatalogModelWorkerThread
+///////////////////////////////////////////////////////////////////////////////
+
+AssetCatalogModelWorkerThread::AssetCatalogModelWorkerThread(AssetCatalogModel* catalog, QThread* returnThread)
+    : m_catalog(catalog)
+    , m_returnThread(returnThread)
+{
+    connect(this, &QThread::started, this, &AssetCatalogModelWorkerThread::startJob);
+    connect(m_catalog, &AssetCatalogModel::LoadComplete, this, &AssetCatalogModelWorkerThread::ReturnToThread);
+}
+
+void AssetCatalogModelWorkerThread::ReturnToThread()
+{
+    quit();
+}
+
+void AssetCatalogModelWorkerThread::startJob()
+{
+    disconnect(this, &QThread::started, this, &AssetCatalogModelWorkerThread::startJob);
+    m_catalog->StartProcessingAssets();
+    QTimer::singleShot(0, m_catalog, &AssetCatalogModel::ProcessAssets);
+}
+
+void AssetCatalogModelWorkerThread::run()
+{
+    exec();
+
+    disconnect(m_catalog, &AssetCatalogModel::LoadComplete, this, &AssetCatalogModelWorkerThread::ReturnToThread);
+    m_catalog->moveToThread(m_returnThread);
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// AssetCatalogEntry
+///////////////////////////////////////////////////////////////////////////////
+bool AssetCatalogEntry::operator<(const QStandardItem& other) const
+{
+    //  Set directories as always less than files.
+    bool leftIsDir = data(FolderRole).toBool();
+    bool rightIsDir = other.data(FolderRole).toBool();
+
+    if (leftIsDir != rightIsDir)
+    {
+        return leftIsDir;
+    }
+
+    QVariant leftName = data(Qt::DisplayRole);
+    QVariant rightName = other.data(Qt::DisplayRole);
+
+    return leftName.toString().compare(rightName.toString(), Qt::CaseInsensitive) < 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// AssetCatalogModel
+///////////////////////////////////////////////////////////////////////////////
+AssetCatalogModel::AssetCatalogModel(QObject* parent)
+    : QStandardItemModel(parent)
+    , m_canProcessAssets(true)
+{
+    AZStd::string allExtensions;
+    AZStd::vector<AZ::Data::AssetType> assetTypes;
+    //  Discover all types that the Asset system recognizes.
+    //  Create a one-to-many map that associates extensions with AssetTypes.
+    EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, GetHandledAssetTypes, assetTypes);
+    for (auto type : assetTypes)
+    {
+        AZStd::vector<AZStd::string> extensions;
+        allExtensions.clear();
+        EBUS_EVENT_ID(type, AZ::AssetTypeInfoBus, GetAssetTypeExtensions, extensions);
+        for (int i = 0; i < extensions.size(); i++)
+        {
+            if (i > 0)
+            {
+                allExtensions += ";";
+            }
+            allExtensions += ".";   //  Adding dots to all extensions to be able to separate full extensions from substrings, i.e. "bin" and input"bin"dings.
+            allExtensions += extensions[i].c_str();
+        }
+        if (!allExtensions.empty())
+        {
+            auto existingEntry = m_extensionToAssetType.find(allExtensions);
+            if (existingEntry != m_extensionToAssetType.end())
+            {
+                existingEntry->second.push_back(type);
+            }
+            else
+            {
+                m_extensionToAssetType.insert(AZStd::make_pair(allExtensions, AZStd::vector<AZ::Uuid> {type}));
+            }
+        }
+    }
+
+    //  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.");
+
+    serializeContext->EnumerateDerived<AZ::Component>([this](const AZ::SerializeContext::ClassData* classData, const AZ::Uuid&) -> bool
+        {
+            if (classData->m_editData)
+            {
+                AZ::Data::AssetType assetType;
+                const AZ::Edit::ElementData* element = classData->m_editData->FindElementData(AZ::Edit::ClassElements::EditorData);
+                if (element)
+                {
+                    const AZ::Edit::Attribute* assetTypeAttribute = element->FindAttribute(AZ::Edit::Attributes::PrimaryAssetType);
+                    if (assetTypeAttribute)
+                    {
+                        auto* assetTypeData = azdynamic_cast<const AZ::Edit::AttributeData<AZ::Uuid>*>(assetTypeAttribute);
+                        if (assetTypeData)
+                        {
+                            assetType = assetTypeData->Get(nullptr);
+                            m_assetTypeToComponent[assetType] = classData->m_azRtti->GetTypeId();
+                        }
+                    }
+                    else
+                    {
+                        assetType = AZ::Data::AssetType::CreateNull();
+                    }
+
+                    if (!assetType.IsNull())
+                    {
+                        const AZ::Edit::Attribute* iconAttribute = element->FindAttribute(AZ_CRC("Icon"));
+                        if (iconAttribute)
+                        {
+                            auto* iconAttributeData = azdynamic_cast<const AZ::Edit::AttributeData<const char*>*>(iconAttribute);
+                            if (iconAttributeData)
+                            {
+                                QIcon icon(iconAttributeData->Get(nullptr));
+                                if (!icon.isNull())
+                                {
+                                    m_assetTypeToIcon[assetType] = icon;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return true;
+        });
+}
+AssetCatalogModel::~AssetCatalogModel()
+{
+    AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
+}
+
+AZ::Data::AssetType AssetCatalogModel::GetAssetType(QString filename) const
+{
+    AZ::Data::AssetType returnType = AZ::Uuid::CreateNull();
+
+    //  Compare file extensions with the map created from the asset database.
+    int dotIndex = filename.lastIndexOf('.');
+    if (dotIndex >= 0)
+    {
+        QString extension = filename.mid(dotIndex);
+        for (auto pair : m_extensionToAssetType)
+        {
+            QString qExtensions = pair.first.c_str();
+            if (qExtensions.indexOf(extension) >= 0)
+            {
+                if (pair.second.size() > 1)
+                {
+                    //  There are multiple types with this extension. Check each handler to see if they can handle this data type.
+                    AZStd::string azFilename = filename.toStdString().c_str();
+                    EBUS_EVENT(AzFramework::ApplicationRequests::Bus, MakePathAssetRootRelative, azFilename);
+                    AZ::Data::AssetId assetId;
+                    EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, azFilename.c_str(), AZ::Data::s_invalidAssetType, false);
+
+                    for (AZ::Uuid type : pair.second)
+                    {
+                        const AZ::Data::AssetHandler* handler = AZ::Data::AssetManager::Instance().GetHandler(type);
+                        if (handler && handler->CanHandleAsset(assetId))
+                        {
+                            returnType = type;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    returnType = pair.second[0];
+                    break;
+                }
+            }
+        }
+    }
+
+    return returnType;
+}
+
+QStandardItem* AssetCatalogModel::GetPath(QString& path, bool createIfNeeded, QStandardItem* parent)
+{
+    if (!parent)
+    {
+        parent = invisibleRootItem();
+    }
+    QString cleanPath = path.replace("\\", "/");
+    while (cleanPath.startsWith("/"))
+    {
+        cleanPath = cleanPath.mid(1);
+    }
+    while (cleanPath.endsWith("/"))
+    {
+        cleanPath.chop(1);
+    }
+
+    QString currentFolder;
+    QString restOfPath;
+
+    int slashIdx = cleanPath.indexOf('/', 1);
+    if (slashIdx < 0)
+    {
+        currentFolder = cleanPath;
+        restOfPath.clear();
+    }
+    else
+    {
+        currentFolder = cleanPath.left(slashIdx);
+        restOfPath = cleanPath.mid(slashIdx + 1);
+    }
+
+    if (currentFolder.isEmpty())
+    {
+        return parent;
+    }
+
+    for (int i = 0; i < parent->rowCount(); i++)
+    {
+        QString name = parent->child(i)->data(Qt::DisplayRole).toString();
+        bool isFolder = parent->child(i)->data(AssetCatalogEntry::FolderRole).toBool();
+
+        if (currentFolder == name && isFolder)
+        {
+            if (restOfPath.isEmpty())
+            {
+                return parent->child(i);
+            }
+            else
+            {
+                return GetPath(restOfPath, createIfNeeded, parent->child(i));
+            }
+        }
+    }
+
+    if (createIfNeeded)
+    {
+        QString fullpath = parent->data(AssetCatalogEntry::FilePathRole).toString();
+        fullpath += currentFolder + "/";
+        AssetCatalogEntry* folder = new AssetCatalogEntry();
+        folder->setData(currentFolder, Qt::DisplayRole);
+        folder->setData(fullpath, AssetCatalogEntry::FilePathRole);
+        folder->setData(true, AssetCatalogEntry::FolderRole);
+        folder->setData(true, AssetCatalogEntry::VisibilityRole);
+
+        parent->appendRow(folder);
+
+        if (restOfPath.isEmpty())
+        {
+            return folder;
+        }
+        else
+        {
+            return GetPath(restOfPath, createIfNeeded, folder);
+        }
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+AssetCatalogEntry* AssetCatalogModel::FindAsset(QString assetPath)
+{
+    QString path;
+    QString asset;
+
+    //  Separate file name and folder name.
+    int slashIdx = assetPath.lastIndexOf('/');
+    if (slashIdx < 0)
+    {
+        asset = assetPath;
+        path.clear();
+    }
+    else
+    {
+        path = assetPath.left(slashIdx);
+        asset = assetPath.mid(slashIdx + 1);
+    }
+
+    QStandardItem* folder = GetPath(path, false);
+
+    if (folder)
+    {
+        for (int i = 0; i < folder->rowCount(); i++)
+        {
+            QString name = folder->child(i)->data(Qt::DisplayRole).toString();
+            if (name == asset)
+            {
+                AssetCatalogEntry* entry = static_cast<AssetCatalogEntry*>(folder->child(i));
+                return entry;
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+AssetCatalogEntry* AssetCatalogModel::AddAsset(QString assetPath, AZ::Data::AssetId id)
+{
+    QString path;
+    QString asset;
+
+    //  Separate file name and folder name.
+    int slashIdx = assetPath.lastIndexOf('/');
+    if (slashIdx < 0)
+    {
+        asset = assetPath;
+        path.clear();
+    }
+    else
+    {
+        path = assetPath.left(slashIdx);
+        asset = assetPath.mid(slashIdx + 1);
+    }
+
+    QRegExp mipMapExtension("\\.dds\\.\\d+a?$");    // Files that end with ".dds.#", with an optional "a"
+    if (asset.contains(mipMapExtension))
+    {
+        //  Mip map files should be ignored by the file browser.
+        //  This is a temporary solution until texture streams are refactored.
+        return nullptr;
+    }
+
+    QStandardItem* folder = GetPath(path, true);
+
+    QString fullPath = folder->data(AssetCatalogEntry::FilePathRole).toString() + asset;
+    AZ::Data::AssetType assetType = GetAssetType(fullPath);
+    AZ::Uuid            classId = AZ::Uuid::CreateNull();
+    auto it = m_assetTypeToComponent.find(assetType);
+    if (it != m_assetTypeToComponent.end())
+    {
+        classId = it->second;
+    }
+
+    AssetCatalogEntry* entry = new AssetCatalogEntry();
+    entry->setData(asset, Qt::DisplayRole);
+    entry->setData(fullPath, AssetCatalogEntry::FilePathRole);
+    entry->setData(false, AssetCatalogEntry::FolderRole);
+    entry->setData(true, AssetCatalogEntry::VisibilityRole);
+
+    entry->m_assetId = id;
+    entry->m_assetType = assetType;
+    entry->m_classId = classId;
+
+    if (!assetType.IsNull())
+    {
+        auto iconIt = m_assetTypeToIcon.find(assetType);
+        if (iconIt == m_assetTypeToIcon.end())
+        {
+            //  The m_assetTypeToIcon map was seeded with icons for known asset types.
+            //  If we come across an asset type that is not associated with a component,
+            //  we'll get its icon from OS if we can. This will help users recognize files more easily.
+            QFileInfo fileInfo(m_rootPath + fullPath);
+            QIcon fileIcon = m_iconProvider.icon(fileInfo);
+            //  Now, make a deep copy for OS-provided icons. On Windows 10, there seems to be an issue with
+            //  icons' memory being reclaimed and crashing the Editor.
+            QSize size = fileIcon.actualSize(QSize(16, 16));
+            QIcon deepCopy = fileIcon.pixmap(size).copy(0, 0, size.width(), size.height());
+            
+            if (!fileIcon.isNull())
+            {
+                m_assetTypeToIcon[assetType] = deepCopy;
+            }
+        }
+    }
+
+    folder->appendRow(entry);
+
+    return entry;
+}
+
+AssetCatalogEntry* AssetCatalogModel::RemoveAsset(QString assetPath)
+{
+    AssetCatalogEntry* entry = FindAsset(assetPath);
+    if (entry)
+    {
+        QStandardItem* parent = entry->parent();
+        if (parent)
+        {
+            parent->removeRow(entry->row());
+            AssetCatalogEntry* folder = static_cast<AssetCatalogEntry*>(parent);
+            return folder;
+        }
+    }
+
+    return nullptr;
+}
+
+void AssetCatalogModel::LoadDatabase()
+{
+    clear();
+
+    AZStd::string assetRootFolder;
+    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+    {
+        settingsRegistry->Get(assetRootFolder, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheRootFolder);
+    }
+    m_rootPath = assetRootFolder.c_str();
+
+    auto startCB = []() {};
+
+    auto enumerateCB = [this](const AZ::Data::AssetId id, const AZ::Data::AssetInfo& assetInfo)
+        {
+            DatabaseEntry* entry = new DatabaseEntry(id, assetInfo.m_relativePath.c_str());
+            m_fileCache.push_back(entry);
+        };
+
+    auto endCB = [this]()
+        {
+            m_fileCacheCurrentIndex = 0;
+            Q_EMIT UpdateProgress(0);
+            Q_EMIT SetTotalProgress(m_fileCache.size());
+        };
+
+    EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, EnumerateAssets, startCB, enumerateCB, endCB);
+
+    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
+
+    m_canProcessAssets = true;
+}
+
+void AssetCatalogModel::ProcessAssets()
+{
+    if (m_fileCacheCurrentIndex >= m_fileCache.size())
+    {
+        sort(0);
+        m_fileCache.clear();
+        Q_EMIT LoadComplete();
+    }
+    else
+    {
+        for (int i = 0; m_canProcessAssets && i < ASSET_CATALOG_BATCH_SIZE && m_fileCacheCurrentIndex < m_fileCache.size(); i++, m_fileCacheCurrentIndex++)
+        {
+            AddAsset(m_fileCache[m_fileCacheCurrentIndex]->m_path, m_fileCache[m_fileCacheCurrentIndex]->m_id);
+        }
+        Q_EMIT UpdateProgress(m_fileCacheCurrentIndex);
+
+        if (m_canProcessAssets)
+        {
+            QTimer::singleShot(1, this, &AssetCatalogModel::ProcessAssets);
+        }
+    }
+}
+
+void AssetCatalogModel::StartProcessingAssets()
+{
+    m_canProcessAssets = true;
+}
+
+void AssetCatalogModel::StopProcessingAssets()
+{
+    m_canProcessAssets = false;
+}
+
+
+void AssetCatalogModel::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
+{
+    AZ::Data::AssetInfo assetInfo;
+    EBUS_EVENT_RESULT(assetInfo, AZ::Data::AssetCatalogRequestBus, GetAssetInfoById, assetId);
+
+    // note that this will get called twice, once with the real assetId and once with legacy assetId.
+    // we only want to add the real asset to the list, in which the assetId passed in is equal to the final assetId returned
+    // otherwise, you look up assetId (and its a legacy assetId) and the actual asset will be different.
+    if ((assetInfo.m_assetId.IsValid()) && (assetInfo.m_assetId == assetId))
+    {
+        AssetCatalogEntry* asset = AddAsset(assetInfo.m_relativePath.c_str(), assetInfo.m_assetId);
+        if (asset)
+        {
+            Q_EMIT itemChanged(asset);
+        }
+    }
+}
+
+void AssetCatalogModel::OnCatalogAssetRemoved(const AZ::Data::AssetId& /*assetId*/, const AZ::Data::AssetInfo& assetInfo)
+{
+    AssetCatalogEntry* asset = RemoveAsset(assetInfo.m_relativePath.c_str());
+    if (asset)
+    {
+        Q_EMIT itemChanged(asset);
+    }
+}
+
+QVariant AssetCatalogModel::data(const QModelIndex& index, int role) const
+{
+    QStandardItem* item = itemFromIndex(index);
+    if (item && role == Qt::DecorationRole)
+    {
+        AssetCatalogEntry* entry = static_cast<AssetCatalogEntry*>(item);
+        auto it = m_assetTypeToIcon.find(entry->m_assetType);
+        if (it != m_assetTypeToIcon.end())
+        {
+            return it->second;
+        }
+
+        bool isFolder = item->data(AssetCatalogEntry::FolderRole).toBool();
+        return isFolder ? m_iconProvider.icon(QFileIconProvider::Folder) : m_iconProvider.icon(QFileIconProvider::File);
+    }
+
+    return QStandardItemModel::data(index, role);
+}
+
+QMimeData* AssetCatalogModel::mimeData(const QModelIndexList& indexes) const
+{
+    AssetCatalogEntry* item = static_cast<AssetCatalogEntry*>(itemFromIndex(indexes[0]));
+    bool isFolder = item ? item->data(AssetCatalogEntry::FolderRole).toBool() : true;
+
+    if (isFolder)
+    {
+        return new QMimeData();
+    }
+
+    QString fullPath = item->data(AssetCatalogEntry::FilePathRole).toString();
+    QMimeData* mimeData = new QMimeData;
+
+    if (!item->m_assetType.IsNull() && item->m_assetId.IsValid())
+    {
+        //  This mime data is used to drag into PropertyAssetCtrl fields.
+        AzToolsFramework::EditorAssetMimeDataContainer mimeDataContainer;
+        mimeDataContainer.AddEditorAsset(item->m_assetId, item->m_assetType);
+        mimeDataContainer.AddToMimeData(mimeData);
+
+        // This mime data is used for spawning of entities with components and the adding of components through assets.
+        AzToolsFramework::ComponentAssetMimeDataContainer componentContainer;
+        componentContainer.AddComponentAsset(item->m_classId, item->m_assetId);
+        componentContainer.AddToMimeData(mimeData);
+    }
+    //  Also, add the filename, for untyped fields.
+    QList<QUrl> urls;
+    urls << QUrl::fromLocalFile(fullPath);
+    mimeData->setUrls(urls);
+
+    return mimeData;
+}
+
+QVariant AssetCatalogModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (role == Qt::DisplayRole && section == 0 && orientation == Qt::Horizontal)
+    {
+        return tr("Assets");
+    }
+
+    return QAbstractItemModel::headerData(section, orientation, role);
+}
+
+void AssetCatalogModel::SearchCriteriaChanged(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator)
+{
+    BuildFilter(criteriaList, filterOperator);
+    InvalidateFilter();
+}
+
+void AssetCatalogModel::BuildFilter(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator)
+{
+    ClearFilterRegExp();
+
+    if (criteriaList.size() > 0)
+    {
+        QString filter, tag, text;
+        for (int i = 0; i < criteriaList.size(); i++)
+        {
+            AzToolsFramework::SearchCriteriaButton::SplitTagAndText(criteriaList[i], tag, text);
+            if (tag.isEmpty())
+            {
+                tag = "null";
+            }
+
+            filter = m_filtersRegExp[tag.toStdString().c_str()].pattern();
+
+            if (filterOperator == AzToolsFramework::FilterOperatorType::Or)
+            {
+                if (filter.isEmpty())
+                {
+                    filter = text;
+                }
+                else
+                {
+                    filter += "|" + text;
+                }
+            }
+            else if (filterOperator == AzToolsFramework::FilterOperatorType::And)
+            {
+                filter += "(?=.*" + text + ")"; //  Using Lookaheads to produce an "and" effect.
+            }
+
+            SetFilterRegExp(tag.toStdString().c_str(), QRegExp(filter, Qt::CaseInsensitive));
+        }
+    }
+}
+
+void AssetCatalogModel::SetFilterRegExp(const AZStd::string& filterType, const QRegExp& regExp)
+{
+    m_filtersRegExp[filterType] = regExp;
+}
+
+void AssetCatalogModel::ClearFilterRegExp(const AZStd::string& filterType)
+{
+    if (filterType.empty())
+    {
+        for (auto& it : m_filtersRegExp)
+        {
+            it.second = QRegExp();
+        }
+    }
+    else
+    {
+        m_filtersRegExp[filterType] = QRegExp();
+    }
+}
+
+void AssetCatalogModel::InvalidateFilter()
+{
+    ApplyFilter(invisibleRootItem());
+}
+
+void AssetCatalogModel::ApplyFilter(QStandardItem* parent)
+{
+    //  Set the visibility as a breadth-first search of the tree.
+    //  This will allow us to also set our parents visible if we are visible
+    //  without a later search overriding us.
+    for (int i = 0; i < parent->rowCount(); i++)
+    {
+        QStandardItem* child = parent->child(i);
+        if (m_filtersRegExp["name"].isEmpty())
+        {
+            child->setData(true, AssetCatalogEntry::VisibilityRole);
+        }
+        else
+        {
+            QString assetname = child->data(Qt::DisplayRole).toString();
+            bool matchesFilter = assetname.contains(m_filtersRegExp["name"]);
+            child->setData(matchesFilter, AssetCatalogEntry::VisibilityRole);
+
+            if (matchesFilter)
+            {
+                //  Set all parents to visible.
+                QStandardItem* visiblityParent = parent;
+                bool isVisible = visiblityParent->data(AssetCatalogEntry::VisibilityRole).toBool();
+                while (!isVisible)    //  Checking isVisible gives us a short circuit for already visible folders.
+                {
+                    visiblityParent->setData(true, AssetCatalogEntry::VisibilityRole);
+                    visiblityParent = visiblityParent->parent();
+
+                    isVisible = visiblityParent ? visiblityParent->data(AssetCatalogEntry::VisibilityRole).toBool() : true;
+                }
+            }
+        }
+    }
+
+    //  Recurse through the children that are folders
+    for (int i = 0; i < parent->rowCount(); i++)
+    {
+        QStandardItem* child = parent->child(i);
+        bool isFolder = child->data(AssetCatalogEntry::FolderRole).toBool();
+        if (isFolder)
+        {
+            ApplyFilter(child);
+        }
+    }
+}
+
+QString AssetCatalogModel::FileName(const QModelIndex& index) const
+{
+    QStandardItem* item = itemFromIndex(index);
+    if (item)
+    {
+        return item->data(Qt::DisplayRole).toString();
+    }
+
+    return QString();
+}
+
+QString AssetCatalogModel::FilePath(const QModelIndex& index) const
+{
+    //  filePath contains the name of the file.
+    QStandardItem* item = itemFromIndex(index);
+    if (item)
+    {
+        QString fullPath = RootPath();
+        fullPath += item->data(AssetCatalogEntry::FilePathRole).toString();
+        return fullPath;
+    }
+
+    return QString();
+}
+
+AssetCatalogEntry* AssetCatalogModel::AssetData(const QModelIndex& index) const
+{
+    return static_cast<AssetCatalogEntry*>(itemFromIndex(index));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// End of context menu handling
+///////////////////////////////////////////////////////////////////////////////
+
+#include <UI/moc_AssetCatalogModel.cpp>
+
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.h
new file mode 100644
index 0000000000..74f779efcc
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.h
@@ -0,0 +1,153 @@
+/*
+ * 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 <QtGui/qstandarditemmodel.h>
+#include <QFileIconProvider>
+#include <QThread>
+#include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/std/containers/unordered_map.h>
+
+#include <AzFramework/Asset/AssetCatalogBus.h>
+#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+struct DatabaseEntry
+{
+public:
+    DatabaseEntry(AZ::Data::AssetId assetID, const char *assetPath)
+        : m_id(assetID)
+        , m_path(assetPath)
+    {}
+    AZ::Data::AssetId m_id;
+    QString m_path;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+class AssetCatalogEntry
+    : public QStandardItem
+{
+public:
+    //  This will be easier to store in the data, so that filters don't have to cast the item to get to it.
+    enum Roles
+    {
+        FileIconRole = Qt::DecorationRole,
+        FilePathRole = Qt::UserRole + 1,
+        VisibilityRole = Qt::UserRole + 2,
+        FolderRole = Qt::UserRole + 3
+    };
+
+    AssetCatalogEntry() {}
+    AZ_CLASS_ALLOCATOR(AssetCatalogEntry, AZ::SystemAllocator, 0);
+
+    bool operator<(const QStandardItem& other) const override;
+
+public:
+    AZ::Data::AssetId   m_assetId;      ///<  The unique ID of the asset in the asset database.
+    AZ::Data::AssetType m_assetType;    ///<  The type of the asset is used to validate on certain drop targets, like the PropertyAssetCtrl.
+    AZ::Uuid            m_classId;      ///<  If valid, the component that should be created when this asset is dragged onto creation-capable windows.
+};
+
+///////////////////////////////////////////////////////////////////////////////
+class AssetCatalogModel
+    : public QStandardItemModel
+    , public AzFramework::AssetCatalogEventBus::Handler
+{
+    Q_OBJECT
+
+public:
+    AZ_CLASS_ALLOCATOR(AssetCatalogModel, AZ::SystemAllocator, 0);
+
+    AssetCatalogModel(QObject* parent = 0);
+    ~AssetCatalogModel() override;
+
+    QString RootPath() const { return m_rootPath; }
+    void LoadDatabase();
+
+    QString FileName(const QModelIndex& index) const;
+    QString FilePath(const QModelIndex& index) const;
+    AssetCatalogEntry* AssetData(const QModelIndex& index) const;
+
+    //! Finds an asset. On success, returns a pointer to the item.
+    //! \retrun A valid pointer on success, nullptr on fail.
+    AssetCatalogEntry* FindAsset(QString assetPath);
+
+    //  QAbstractItemModel overrides
+    QVariant    data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    QMimeData* mimeData(const QModelIndexList& indexes) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+    // AzFramework::AssetCatalogEventBus::Handler
+    void OnCatalogAssetAdded(const AZ::Data::AssetId& assetId) override;
+    void OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& assetInfo) override;
+
+Q_SIGNALS:
+    void LoadComplete();
+    void SetTotalProgress(int value);
+    void UpdateProgress(int value);
+
+public Q_SLOTS:
+    void SearchCriteriaChanged(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator);
+    void ProcessAssets();
+    void StartProcessingAssets();
+    void StopProcessingAssets();
+
+protected:
+    //! Adds an asset and returns a pointer to that new asset.
+    AssetCatalogEntry* AddAsset(QString assetPath, AZ::Data::AssetId id);
+    //! Removes an asset. On success, returns a pointer to the parent item. On failure, returns nullptr.
+    AssetCatalogEntry* RemoveAsset(QString assetPath);
+
+    void BuildFilter(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator);
+    void InvalidateFilter();
+    void SetFilterRegExp(const AZStd::string& filterType, const QRegExp& regExp);
+    void ClearFilterRegExp(const AZStd::string& filterType = AZStd::string());
+
+    AZ::Data::AssetType GetAssetType(QString filename) const;
+    QStandardItem* GetPath(QString& path, bool createIfNeeded, QStandardItem* parent = nullptr);
+
+    void ApplyFilter(QStandardItem* parent);
+
+    AZStd::unordered_map<AZ::Data::AssetType, QIcon> m_assetTypeToIcon;
+    AZStd::unordered_map<AZ::Uuid, AZ::Uuid> m_assetTypeToComponent;
+    AZStd::unordered_map<AZStd::string, AZStd::vector<AZ::Uuid>> m_extensionToAssetType;
+
+    QFileIconProvider   m_iconProvider;
+    QString             m_rootPath;
+
+    AzToolsFramework::FilterByCategoryMap m_filtersRegExp;
+
+    static const int ASSET_CATALOG_BATCH_SIZE = 50;
+
+    AZStd::vector<DatabaseEntry*> m_fileCache;   //  scratch space to get the registry data out of the AssetDatabase in quick fashion.
+    int                          m_fileCacheCurrentIndex;
+    bool                         m_canProcessAssets;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+class AssetCatalogModelWorkerThread
+    : public QThread
+{
+    Q_OBJECT
+
+public:
+    AssetCatalogModelWorkerThread(AssetCatalogModel* catalog, QThread* returnThread);
+
+    void startJob();
+
+public Q_SLOTS:
+    void ReturnToThread();
+
+protected:
+    void run() override;
+    //  These are pointers that this object will not own.
+    QThread* m_returnThread;
+    AssetCatalogModel* m_catalog;
+
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp
new file mode 100644
index 0000000000..44f1a23b73
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "CategoriesList.h"
+
+ComponentCategoryList::ComponentCategoryList(QWidget* parent /*= nullptr*/) 
+    : QTreeWidget(parent)
+{
+}
+
+void ComponentCategoryList::Init()
+{
+    setColumnCount(1);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    setDragDropMode(QAbstractItemView::DragDropMode::DragOnly);
+    setDragEnabled(true);
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
+    setAllColumnsShowFocus(true);
+    setStyleSheet("QTreeWidget { selection-background-color: rgba(255,255,255,0.2); }");
+
+    QStringList headers;
+    headers << tr("Categories");
+    setHeaderLabels(headers);
+
+    const QString parentCategoryIconPath = QString("Icons/PropertyEditor/Browse_on.png");
+    const QString categoryIconPath = QString("Icons/PropertyEditor/Browse.png");
+
+    QTreeWidgetItem* allCategory = new QTreeWidgetItem(this);
+    allCategory->setText(0, "All");
+    allCategory->setIcon(0, QIcon(categoryIconPath));
+
+    // Need this briefly to collect the list of available categories.
+    ComponentDataModel dataModel(this);
+    for (const auto& cat : dataModel.GetCategories())
+    {
+        QString categoryString = QString(cat.c_str());
+        QStringList categories = categoryString.split('/', Qt::SkipEmptyParts);
+
+        QTreeWidgetItem* parent = nullptr;
+        QTreeWidgetItem* categoryWidget = nullptr;
+
+        for (const auto& categoryName : categories)
+        {
+            if (parent)
+            {
+                categoryWidget = new QTreeWidgetItem(parent);
+                categoryWidget->setIcon(0, QIcon(categoryIconPath));
+                
+                // Store the full category path in a user role because we'll need it to locate the actual category
+                categoryWidget->setData(0, Qt::UserRole, QVariant::fromValue(categoryString));
+            }
+            else
+            {
+                auto existingCategory = findItems(categoryName, Qt::MatchExactly);
+                if (existingCategory.empty())
+                {
+                    categoryWidget = new QTreeWidgetItem(this);
+                    categoryWidget->setIcon(0, QIcon(parentCategoryIconPath));
+                }
+                else
+                {
+                    categoryWidget = static_cast<QTreeWidgetItem*>(existingCategory.first());
+                    categoryWidget->setIcon(0, QIcon(parentCategoryIconPath));
+                }
+            }
+
+            parent = categoryWidget;
+
+            categoryWidget->setText(0, categoryName);
+        }
+    }
+
+    expandAll();
+
+    connect(this, &QTreeWidget::itemClicked, this, &ComponentCategoryList::OnItemClicked);
+}
+
+void ComponentCategoryList::OnItemClicked(QTreeWidgetItem* item, int /*column*/)
+{
+    QVariant userData = item->data(0, Qt::UserRole);
+    if (userData.isValid())
+    {
+        // Send in the full category path, not just the child category name
+        emit OnCategoryChange(userData.value<QString>().toStdString().c_str());
+    }
+    else
+    {
+        emit OnCategoryChange(item->text(0).toStdString().c_str());
+    }
+}
+
+#include <UI/ComponentPalette/moc_CategoriesList.cpp>
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.h
new file mode 100644
index 0000000000..5fa24f1fa9
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.h
@@ -0,0 +1,38 @@
+/*
+ * 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 "ComponentDataModel.h"
+#include <QTreeWidget>
+#endif
+
+//! ComponentCategoryList
+//! Provides a list of all reflected categories that users can select for quick
+//! filtering the filtered component list.
+class ComponentCategoryList : public QTreeWidget
+{
+    Q_OBJECT
+
+public:
+
+    AZ_CLASS_ALLOCATOR(ComponentCategoryList, AZ::SystemAllocator, 0);
+
+    explicit ComponentCategoryList(QWidget* parent = nullptr);
+
+    void Init();
+
+Q_SIGNALS:
+    void OnCategoryChange(const char* category);
+
+protected:
+
+    // Will emit OnCategoryChange signal
+    void OnItemClicked(QTreeWidgetItem* item, int column);
+
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.cpp
new file mode 100644
index 0000000000..6e0d6a5450
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.cpp
@@ -0,0 +1,548 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "ComponentDataModel.h"
+
+#include "Include/IObjectManager.h"
+#include "Objects/SelectionGroup.h"
+
+#include <AzCore/Component/Entity.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Component/Component.h>
+#include <AzCore/Serialization/EditContext.h>
+
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Commands/EntityStateCommand.h>
+#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
+#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+
+#include <Editor/IEditor.h>
+#include <Editor/Viewport.h>
+#include <Editor/ViewManager.h>
+#include <CryCommon/MathConversion.h>
+
+#include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
+
+#include <QMimeData>
+
+namespace
+{
+    // This is a helper function that given an object that derives from QAbstractItemModel, 
+    // it will request the model's "ClassDataRole" class data for an entry and use that 
+    // information to create a new entity with the selected components.
+    AZ::EntityId CreateEntityFromSelection(const QModelIndexList& selection, QAbstractItemModel* model)
+    {
+        AZ::Vector3 position = AZ::Vector3::CreateZero();
+        CViewport *view = GetIEditor()->GetViewManager()->GetGameViewport();
+        int width, height;
+        view->GetDimensions(&width, &height);
+        position = LYVec3ToAZVec3(view->ViewToWorld(QPoint(width / 2, height / 2)));
+
+        AZ::EntityId newEntityId;
+        EBUS_EVENT_RESULT(newEntityId, AzToolsFramework::EditorRequests::Bus, CreateNewEntityAtPosition, position, AZ::EntityId());
+        if (newEntityId.IsValid())
+        {
+            // Add all the selected components.
+            AZ::ComponentTypeList componentsToAdd;
+            for (auto index : selection)
+            {
+                // We only need to consider the first column, it's important that the data() function that 
+                // returns ComponentDataModel::ClassDataRole also does so for the first column.
+                if (index.column() != 0)
+                {
+                    continue;
+                }
+
+                QVariant classDataVariant = model->data(index, ComponentDataModel::ClassDataRole);
+                if (classDataVariant.isValid())
+                {
+                    const AZ::SerializeContext::ClassData* classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
+                    componentsToAdd.push_back(classData->m_typeId);
+                }
+            }
+
+            AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, AzToolsFramework::EntityIdList{ newEntityId }, componentsToAdd);
+
+            return newEntityId;
+        }
+
+        return AZ::EntityId();
+    }
+}
+
+namespace ComponentDataUtilities
+{
+    // This is a helper function to add the specified components to the selected entities, it relies on the provided
+    // QAbstractItemModel to determine the appropriate ClassData to use to create the components (given that some widgets
+    // may provide proxy models that alter the order).
+    void AddComponentsToSelectedEntities(const QModelIndexList& selectedComponents, QAbstractItemModel* model)
+    {
+        AzToolsFramework::EntityIdList selectedEntities;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        if (selectedEntities.empty())
+        {
+            return;
+        }
+
+        // Add all the selected components.
+        AZ::ComponentTypeList componentsToAdd;
+        for (auto index : selectedComponents)
+        {
+            // We only need to consider the first column, it's important that the data() function that 
+            // returns ComponentDataModel::ClassDataRole also does so for the first column.
+            if (index.column() != 0)
+            {
+                continue;
+            }
+
+            QVariant classDataVariant = model->data(index, ComponentDataModel::ClassDataRole);
+            if (classDataVariant.isValid())
+            {
+                const AZ::SerializeContext::ClassData* classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
+                componentsToAdd.push_back(classData->m_typeId);
+            }
+        }
+
+        AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, selectedEntities, componentsToAdd);
+    }
+}
+
+
+// ComponentDataModel
+//////////////////////////////////////////////////////////////////////////
+
+ComponentDataModel::ComponentDataModel(QObject* parent)
+    : QAbstractTableModel(parent)
+{
+    AZ::SerializeContext* serializeContext = nullptr;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(serializeContext, "Failed to acquire application serialize context.");
+
+    serializeContext->EnumerateDerived<AZ::Component>([this](const AZ::SerializeContext::ClassData* classData, const AZ::Uuid&) -> bool
+    {
+        bool allowed = false;
+        bool hidden = false;
+        AZStd::string category = "Miscellaneous";
+
+        if (classData->m_editData)
+        {
+            for (const AZ::Edit::ElementData& element : classData->m_editData->m_elements)
+            {
+                if (element.m_elementId == AZ::Edit::ClassElements::EditorData)
+                {
+                    AZStd::string iconPath;
+                    EBUS_EVENT_RESULT(iconPath, AzToolsFramework::EditorRequests::Bus, GetComponentEditorIcon, classData->m_typeId, nullptr);
+                    if (!iconPath.empty())
+                    {
+                        m_componentIcons[classData->m_typeId] = QIcon(iconPath.c_str());
+                    }
+
+                    for (const AZ::Edit::AttributePair& attribPair : element.m_attributes)
+                    {
+                        if (attribPair.first == AZ::Edit::Attributes::AppearsInAddComponentMenu)
+                        {
+                            if (auto data = azdynamic_cast<AZ::Edit::AttributeData<AZ::Crc32>*>(attribPair.second))
+                            {
+                                if (data->Get(nullptr) == AZ_CRC("Game"))
+                                {
+                                    allowed = true;
+                                }
+                            }
+                        }
+                        else if (attribPair.first == AZ::Edit::Attributes::AddableByUser)
+                        {
+                            // skip this component if user is not allowed to add it directly
+                            if (auto data = azdynamic_cast<AZ::Edit::AttributeData<bool>*>(attribPair.second))
+                            {
+                                if (!data->Get(nullptr))
+                                {
+                                    hidden = true;
+                                }
+                            }
+                        }
+                        else if (attribPair.first == AZ::Edit::Attributes::Category)
+                        {
+                            if (auto data = azdynamic_cast<AZ::Edit::AttributeData<const char*>*>(attribPair.second))
+                            {
+                                category = data->Get(nullptr);
+                            }
+                        }
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        if (allowed && !hidden)
+        {
+            m_componentList.push_back(classData);
+            m_componentMap[category].push_back(classData);
+            m_categories.insert(category);
+        }
+
+        return true;
+    });
+
+    // we'd like viewport events
+    AzQtComponents::DragAndDropEventsBus::Handler::BusConnect(AzQtComponents::DragAndDropContexts::EditorViewport);
+}
+
+ComponentDataModel::~ComponentDataModel()
+{
+    AzQtComponents::DragAndDropEventsBus::Handler::BusDisconnect();
+}
+
+Qt::ItemFlags ComponentDataModel::flags([[maybe_unused]] const QModelIndex &index) const
+{
+    return Qt::ItemFlags(
+        Qt::ItemIsEnabled |
+        Qt::ItemIsDragEnabled |
+        Qt::ItemIsDropEnabled |
+        Qt::ItemIsSelectable);
+}
+
+const AZ::SerializeContext::ClassData* ComponentDataModel::GetClassData(const QModelIndex& index) const
+{
+    int row = index.row();
+    if (row < 0 || row >= m_componentList.size())
+    {
+        return nullptr;
+    }
+
+    return m_componentList[row];
+}
+
+const char* ComponentDataModel::GetCategory(const AZ::SerializeContext::ClassData* classData)
+{
+    if (classData)
+    {
+        if (auto editorDataElement = classData->m_editData->FindElementData(AZ::Edit::ClassElements::EditorData))
+        {
+            if (auto categoryAttribute = editorDataElement->FindAttribute(AZ::Edit::Attributes::Category))
+            {
+                if (auto categoryData = azdynamic_cast<AZ::Edit::AttributeData<const char*>*>(categoryAttribute))
+                {
+                    const char* result = categoryData->Get(nullptr);
+                    if (result)
+                    {
+                        return result;
+                    }
+                }
+            }
+        }
+    }
+
+    return "";
+}
+
+
+QModelIndex ComponentDataModel::index(int row, int column, const QModelIndex &parent /*= QModelIndex()*/) const
+{
+    if (row >= rowCount(parent) || column >= columnCount(parent))
+    {
+        return QModelIndex();
+    }
+
+    return createIndex(row, column, (void*)(m_componentList[row]));
+}
+
+QModelIndex ComponentDataModel::parent([[maybe_unused]] const QModelIndex &child) const
+{
+    return QModelIndex();
+}
+
+int ComponentDataModel::rowCount([[maybe_unused]] const QModelIndex &parent /*= QModelIndex()*/) const
+{
+    return m_componentList.size();
+}
+
+int ComponentDataModel::columnCount([[maybe_unused]] const QModelIndex &parent /*= QModelIndex()*/) const
+{
+    return ColumnIndex::Count;
+}
+
+QVariant ComponentDataModel::data(const QModelIndex &index, int role /*= Qt::DisplayRole*/) const
+{
+    if (index.isValid())
+    {
+        const AZ::SerializeContext::ClassData* classData = m_componentList[index.row()];
+        if (!classData)
+        {
+            return QVariant();
+        }
+
+        switch (role)
+        {
+        case ClassDataRole:
+            if (index.column() == 0) // Only get data for one column
+            {
+                return QVariant::fromValue<void*>(reinterpret_cast<void*>(const_cast<AZ::SerializeContext::ClassData*>(classData)));
+            }
+            break;
+
+        case Qt::DisplayRole:
+        {
+            if (index.column() == ColumnIndex::Name)
+            {
+                return QVariant(classData->m_editData->m_name);
+            }
+            else
+                if (index.column() == ColumnIndex::Category)
+                {
+                    if (auto editorDataElement = classData->m_editData->FindElementData(AZ::Edit::ClassElements::EditorData))
+                    {
+                        if (auto categoryAttribute = editorDataElement->FindAttribute(AZ::Edit::Attributes::Category))
+                        {
+                            if (auto categoryData = azdynamic_cast<const AZ::Edit::AttributeData<const char*>*>(categoryAttribute))
+                            {
+                                return QVariant(categoryData->Get(nullptr));
+                            }
+                        }
+                    }
+                }
+
+        }
+        break;
+
+        case Qt::ToolTipRole:
+        {
+            return QVariant(classData->m_editData->m_description);
+        }
+
+        case Qt::DecorationRole:
+        {
+            if (index.column() == ColumnIndex::Icon)
+            {
+                auto iconIterator = m_componentIcons.find(classData->m_typeId);
+                if (iconIterator != m_componentIcons.end())
+                {
+                    return iconIterator->second;
+                }
+            }
+        }
+        break;
+
+        default:
+            break;
+        }
+    }
+
+    return QVariant();
+}
+
+QMimeData* ComponentDataModel::mimeData(const QModelIndexList& indices) const
+{
+    QModelIndexList list;
+
+    // Filter out columns we are not interested in.
+    for (const QModelIndex& index : indices)
+    {
+        if (index.column() == 0)
+        {
+            list.push_back(index);
+        }
+    }
+
+    AZStd::vector<const AZ::SerializeContext::ClassData*> sortedList;
+    for (QModelIndex index : list)
+    {
+        QVariant classDataVariant = index.data(ComponentDataModel::ClassDataRole);
+        if (classDataVariant.isValid())
+        {
+            const AZ::SerializeContext::ClassData* classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
+            sortedList.push_back(classData);
+        }
+    }
+
+    QMimeData* mimeData = nullptr;
+    if (!sortedList.empty())
+    {
+        mimeData = AzToolsFramework::ComponentTypeMimeData::Create(sortedList).release();
+    }
+
+    return mimeData;
+}
+
+bool ComponentDataModel::CanAcceptDragAndDropEvent(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) const
+{
+    using namespace AzToolsFramework;
+    using namespace AzQtComponents;
+
+    // if a listener with a higher priority already claimed this event, do not touch it.
+    if ((!event) || (event->isAccepted()) || (!event->mimeData()))
+    {
+        return false;
+    }
+
+    ViewportDragContext* contextVP = azrtti_cast<ViewportDragContext*>(&context);
+    if (!contextVP)
+    {
+        // not a viewport event.  This is for some other GUI such as the main window itself.
+        return false;
+    }
+
+    AZStd::vector<const AZ::SerializeContext::ClassData*> componentClassDataList;
+    return AzToolsFramework::ComponentTypeMimeData::Get(event->mimeData(), componentClassDataList);
+}
+
+void ComponentDataModel::DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context)
+{
+    if (CanAcceptDragAndDropEvent(event, context))
+    {
+        event->setDropAction(Qt::CopyAction);
+        event->setAccepted(true);
+        // opportunities to show special highlights, or ghosted entities or previews here.
+    }
+}
+
+void ComponentDataModel::DragMove(QDragMoveEvent* event, AzQtComponents::DragAndDropContextBase& context)
+{
+    if (CanAcceptDragAndDropEvent(event, context))
+    {
+        event->setDropAction(Qt::CopyAction);
+        event->setAccepted(true);
+        // opportunities to update special highlights, or ghosted entities or previews here.
+    }
+}
+
+void ComponentDataModel::DragLeave(QDragLeaveEvent* /*event*/)
+{
+    // opportunities to remove ghosted entities or previews here.
+}
+
+void ComponentDataModel::Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context)
+{
+    using namespace AzToolsFramework;
+    using namespace AzQtComponents;
+
+    // ALWAYS CHECK - you are not the only one connected to this bus, and someone else may have already
+    // handled the event or accepted the drop - it might not contain types relevant to you.
+    // you still get informed about the drop event in case you did some stuff in your gui and need to clean it up.
+    if (!CanAcceptDragAndDropEvent(event, context))
+    {
+        return;
+    }
+
+    // note that the above call already checks all the pointers such as event, or whether context is a VP context, mimetype, etc
+    ViewportDragContext* contextVP = azrtti_cast<ViewportDragContext*>(&context);
+
+    // we don't get given this action by Qt unless we already returned accepted from one of the other ones (such as drag move of drag enter)
+    event->setDropAction(Qt::CopyAction);
+    event->setAccepted(true);
+
+    AzToolsFramework::ScopedUndoBatch undo("Create entity from components");
+    const AZStd::string name = AZStd::string::format("Entity%d", GetIEditor()->GetObjectManager()->GetObjectCount());
+
+    AZ::Entity* newEntity = aznew AZ::Entity(name.c_str());
+    if (newEntity)
+    {
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequests::AddRequiredComponents, *newEntity);
+        auto* transformComponent = newEntity->FindComponent<AzToolsFramework::Components::TransformComponent>();
+        if (transformComponent)
+        {
+            transformComponent->SetWorldTM(AZ::Transform::CreateTranslation(contextVP->m_hitLocation));
+        }
+
+        // Add the entity to the editor context, which activates it and creates the sandbox object.
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequests::AddEditorEntity, newEntity);
+
+        // Prepare undo command last so it captures the final state of the entity.
+        AzToolsFramework::EntityCreateCommand* command = aznew AzToolsFramework::EntityCreateCommand(static_cast<AZ::u64>(newEntity->GetId()));
+        command->Capture(newEntity);
+        command->SetParent(undo.GetUndoBatch());
+
+        // Only need to add components to the new entity
+        AzToolsFramework::EntityIdList entities = { newEntity->GetId() };
+
+        AZStd::vector<const AZ::SerializeContext::ClassData*> componentClassDataList;
+        AzToolsFramework::ComponentTypeMimeData::Get(event->mimeData(), componentClassDataList);
+
+        AZ::ComponentTypeList componentsToAdd;
+        for (auto classData : componentClassDataList)
+        {
+            if (!classData)
+            {
+                continue;
+            }
+
+            componentsToAdd.push_back(classData->m_typeId);
+        }
+
+        AzToolsFramework::EntityCompositionRequests::AddComponentsOutcome addedComponentsResult = AZ::Failure(AZStd::string("Failed to call AddComponentsToEntities on EntityCompositionRequestBus"));
+        AzToolsFramework::EntityCompositionRequestBus::BroadcastResult(addedComponentsResult, &AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, entities, componentsToAdd);
+
+        ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::AddDirtyEntity, newEntity->GetId());
+        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, entities);
+    }
+}
+
+AZ::EntityId ComponentDataProxyModel::NewEntityFromSelection(const QModelIndexList& selection)
+{
+    return CreateEntityFromSelection(selection, this);
+}
+
+AZ::EntityId ComponentDataModel::NewEntityFromSelection(const QModelIndexList& selection)
+{
+    return CreateEntityFromSelection(selection, this);
+}
+
+bool ComponentDataProxyModel::filterAcceptsRow(int sourceRow, [[maybe_unused]] const QModelIndex &sourceParent) const
+{
+    if (m_selectedCategory.empty() && !filterRegExp().isValid())
+        return true;
+
+    ComponentDataModel* dataModel = static_cast<ComponentDataModel*>(sourceModel());
+    if (sourceRow < 0 || sourceRow >= dataModel->GetComponents().size())
+    {
+        return false;
+    }
+
+    const AZ::SerializeContext::ClassData* classData = dataModel->GetComponents()[sourceRow];
+    if (!classData)
+    {
+        return false;
+    }
+
+    // Get Category
+    if (!m_selectedCategory.empty())
+    {
+        AZStd::string currentCateogry = ComponentDataModel::GetCategory(classData);
+
+        if (AzFramework::StringFunc::Find(currentCateogry.c_str(), m_selectedCategory.c_str()))
+        {
+            return false;
+        }
+    }
+
+    if (filterRegExp().isValid())
+    {
+        QString componentName = QString::fromUtf8(classData->m_editData->m_name);
+        return componentName.contains(filterRegExp());
+    }
+
+    return true;
+}
+
+void ComponentDataProxyModel::SetSelectedCategory(const AZStd::string& category)
+{
+    m_selectedCategory = category;
+    invalidate();
+}
+
+void ComponentDataProxyModel::ClearSelectedCategory()
+{
+    m_selectedCategory.clear();
+    invalidate();
+}
+
+#include "UI/ComponentPalette/moc_ComponentDataModel.cpp"
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.h
new file mode 100644
index 0000000000..6c93f8c06c
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.h
@@ -0,0 +1,127 @@
+/*
+ * 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 <QAbstractTableModel>
+#include <QSortFilterProxyModel>
+
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/Serialization/SerializeContext.h>
+
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/std/containers/set.h>
+#include <AzCore/std/containers/vector.h>
+
+#include <AzQtComponents/Buses/DragAndDrop.h>
+#endif
+
+namespace ComponentDataUtilities
+{
+    // Given a list of selected components, use the provided model to get the components to add to any selected entities.
+    void AddComponentsToSelectedEntities(const QModelIndexList& selectedComponents, QAbstractItemModel* model);
+}
+
+class CViewport;
+
+//! ComponentDataModel
+//! Holds the data required to display components in a table, this includes component name, categories, icons.
+class ComponentDataModel 
+    : public QAbstractTableModel
+    , protected AzQtComponents::DragAndDropEventsBus::Handler // its okay if more than one of these is installed, the first one gets it.
+{
+    Q_OBJECT
+
+public:
+    AZ_CLASS_ALLOCATOR(ComponentDataModel, AZ::SystemAllocator, 0);
+
+    using ComponentClassList = AZStd::vector<const AZ::SerializeContext::ClassData*>;
+    using ComponentCategorySet = AZStd::set<AZStd::string>;
+    using ComponentClassMap = AZStd::unordered_map<AZStd::string, AZStd::vector<const AZ::SerializeContext::ClassData*>>;
+    using ComponentIconMap = AZStd::unordered_map<AZ::Uuid, QIcon>;
+
+    enum ColumnIndex
+    {
+        Icon,
+        Category,
+        Name,
+        Count
+    };
+
+    enum CustomRoles
+    {
+        ClassDataRole = Qt::UserRole + 1
+    };
+
+    ComponentDataModel(QObject* parent = nullptr);
+    ~ComponentDataModel() override;
+
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &child) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+
+    QMimeData* mimeData(const QModelIndexList& indexes) const override;
+
+    const AZ::SerializeContext::ClassData* GetClassData(const QModelIndex&) const;
+
+    AZ::EntityId NewEntityFromSelection(const QModelIndexList& selection);
+
+    static const char* GetCategory(const AZ::SerializeContext::ClassData* classData);
+
+    ComponentClassList& GetComponents() { return m_componentList; }
+    ComponentCategorySet& GetCategories() { return m_categories; }
+
+protected:
+    //////////////////////////////////////////////////////////////////////////
+    // AzQtComponents::DragAndDropEventsBus::Handler
+    //////////////////////////////////////////////////////////////////////////
+    void DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
+    void DragMove(QDragMoveEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
+    void DragLeave(QDragLeaveEvent* event) override;
+    void Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
+    bool CanAcceptDragAndDropEvent(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) const;
+
+    ComponentClassList m_componentList;
+    ComponentClassMap m_componentMap;
+    ComponentIconMap m_componentIcons;
+    ComponentCategorySet m_categories;
+};
+
+//! ComponentDataProxyModel
+//! FilterProxy for the ComponentDataModel is used along with the search criteria to filter the 
+//! list of components based on tags and/or selected category.
+class ComponentDataProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    AZ_CLASS_ALLOCATOR(ComponentDataProxyModel, AZ::SystemAllocator, 0);
+
+    ComponentDataProxyModel(QObject* parent = nullptr)
+        : QSortFilterProxyModel(parent)
+    {}
+
+    // Creates a new entity and adds the selected components to it.
+    // It is specialized here to ensure it uses the correct indices according to the sorted data.
+    AZ::EntityId NewEntityFromSelection(const QModelIndexList& selection);
+
+    // Filters rows according to the specifed tags and/or selected category
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+
+    // Set the category to filter by.
+    void SetSelectedCategory(const AZStd::string& category);
+    void ClearSelectedCategory();
+
+protected:
+
+    AZStd::string m_selectedCategory;
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteSettings.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteSettings.h
new file mode 100644
index 0000000000..30e7f93160
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteSettings.h
@@ -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
+ *
+ */
+
+#pragma once
+
+
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/UserSettings/UserSettings.h>
+
+//=============================================================================
+
+class ComponentPaletteSettings
+    : public AZ::UserSettings
+{
+public:
+    AZ_CLASS_ALLOCATOR(ComponentPaletteSettings, AZ::SystemAllocator, 0);
+    AZ_RTTI(ComponentPaletteSettings, "{BAC3BABA-6DF1-4EEE-AFF1-6A84AD1820A1}", AZ::UserSettings);
+
+    AZStd::vector<AZ::Uuid> m_favorites;
+
+    void SetFavorites(AZStd::vector<AZ::Uuid>&& componentIds)
+    {
+        m_favorites = AZStd::move(componentIds);
+    }
+
+    void RemoveFavorites(const AZStd::vector<AZ::Uuid>& componentIds)
+    {
+        for (const AZ::Uuid& componentId : componentIds)
+        {
+            auto favoriteIterator = AZStd::find(m_favorites.begin(), m_favorites.end(), componentId);
+            AZ_Assert(favoriteIterator != m_favorites.end(), "Component Palette Favorite not found.");
+
+            if (favoriteIterator != m_favorites.end())
+            {
+                m_favorites.erase(favoriteIterator);
+            }
+        }
+    }
+
+    static const char* GetSettingsFile()
+    {
+        static const char* settingsFile("@user@/editor/componentpalette.usersettings");
+        return settingsFile;
+    }
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serializeContext)
+        {
+            serializeContext->Class<ComponentPaletteSettings>()
+                ->Version(1)
+                ->Field("m_favorites", &ComponentPaletteSettings::m_favorites)
+                ;
+        }
+    }
+};
+
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.cpp
new file mode 100644
index 0000000000..a899a0f864
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.cpp
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "ComponentPaletteWindow.h"
+#include "ComponentDataModel.h"
+#include "FavoriteComponentList.h"
+#include "FilteredComponentList.h"
+#include "CategoriesList.h"
+
+#include <LyViewPaneNames.h>
+
+#include <AzCore/Component/Component.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+
+#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
+#include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/ViewPaneOptions.h>
+
+#include <QLabel>
+
+ComponentPaletteWindow::ComponentPaletteWindow(QWidget* parent)
+    : QMainWindow(parent)
+{
+    Init();
+}
+
+void ComponentPaletteWindow::Init()
+{
+    layout()->setSizeConstraint(QLayout::SetMinimumSize);
+
+    QVBoxLayout* layout = new QVBoxLayout();
+    layout->setSizeConstraint(QLayout::SetMinimumSize);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+
+    QHBoxLayout* gridLayout = new QHBoxLayout(NULL);
+    gridLayout->setSizeConstraint(QLayout::SetMaximumSize);
+    gridLayout->setContentsMargins(0, 0, 0, 0);
+    gridLayout->setSpacing(0);
+
+    m_filterWidget = new AzToolsFramework::SearchCriteriaWidget(this);
+    
+    QStringList tags;
+    tags << tr("name");
+    m_filterWidget->SetAcceptedTags(tags, tags[0]);
+    layout->addLayout(gridLayout, 1);
+
+    // Left Panel
+    QVBoxLayout* leftPaneLayout = new QVBoxLayout(this);
+
+    // Favorites
+    leftPaneLayout->addWidget(new QLabel(tr("Favorites")));
+    leftPaneLayout->addWidget(new QLabel(tr("Drag components here to add favorites.")));
+    FavoritesList* favorites = new FavoritesList();
+    favorites->Init();
+    leftPaneLayout->addWidget(favorites);
+
+    // Categories
+    m_categoryListWidget = new ComponentCategoryList();
+    m_categoryListWidget->Init();
+    leftPaneLayout->addWidget(m_categoryListWidget);
+    gridLayout->addLayout(leftPaneLayout);
+
+    // Right Panel
+    QVBoxLayout* rightPanelLayout = new QVBoxLayout(this);
+    gridLayout->addLayout(rightPanelLayout);
+
+    // Component list
+    m_componentListWidget = new FilteredComponentList(this);
+    m_componentListWidget->Init();
+
+    rightPanelLayout->addWidget(new QLabel(tr("Components")));
+    rightPanelLayout->addWidget(m_filterWidget, 0, Qt::AlignTop);
+    rightPanelLayout->addWidget(m_componentListWidget);
+
+    // The main window
+    QWidget* window = new QWidget();
+    window->setLayout(layout);
+    setCentralWidget(window);
+
+    connect(m_categoryListWidget, &ComponentCategoryList::OnCategoryChange, m_componentListWidget, &FilteredComponentList::SetCategory);
+    connect(m_filterWidget, &AzToolsFramework::SearchCriteriaWidget::SearchCriteriaChanged, m_componentListWidget, &FilteredComponentList::SearchCriteriaChanged);
+
+}
+
+void ComponentPaletteWindow::keyPressEvent(QKeyEvent* event)
+{
+    if (event->modifiers().testFlag(Qt::ControlModifier) && event->key() == Qt::Key_F)
+    {
+        m_filterWidget->SelectTextEntryBox();
+    }
+    else
+    {
+        QMainWindow::keyPressEvent(event);
+    }
+}
+
+void ComponentPaletteWindow::RegisterViewClass()
+{
+    using namespace AzToolsFramework;
+
+    ViewPaneOptions options;
+    options.canHaveMultipleInstances = true;
+    RegisterViewPane<ComponentPaletteWindow>("Component Palette", LyViewPane::CategoryOther, options);
+}
+
+#include <UI/ComponentPalette/moc_ComponentPaletteWindow.cpp>
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.h
new file mode 100644
index 0000000000..106732e843
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.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
+
+#if !defined(Q_MOC_RUN)
+#include <QMainWindow>
+#endif
+
+namespace AzToolsFramework
+{
+    class SearchCriteriaWidget;
+}
+
+class ComponentCategoryList;
+class FilteredComponentList;
+class ComponentDataModel;
+
+//! ComponentPaletteWindow
+//! Provides a window with controls related to the Component Entity system. It provides an intuitive and organized 
+//! set of controls to display, sort, filter components. It provides mechanisms for creating entities by dragging
+//! and dropping components into the viewport as well as from context menus.
+class ComponentPaletteWindow
+    : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+
+    explicit ComponentPaletteWindow(QWidget* parent = 0);
+
+    void Init();
+
+    static const GUID& GetClassID()
+    {
+        // {4236998F-1138-466D-9DF5-6533BFA1DFCA}
+        static const GUID guid =
+        {
+            0x4236998F, 0x1138, 0x466D, { 0x9D, 0xF5, 0x65, 0x33, 0xBF, 0xA1, 0xDF, 0xCA }
+        };
+        return guid;
+    }
+
+    static void RegisterViewClass();
+
+protected:
+    ComponentCategoryList* m_categoryListWidget;
+    FilteredComponentList* m_componentListWidget;
+    AzToolsFramework::SearchCriteriaWidget* m_filterWidget;
+
+    void keyPressEvent(QKeyEvent* event) override;
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.cpp
new file mode 100644
index 0000000000..b61f384a13
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.cpp
@@ -0,0 +1,393 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "FavoriteComponentList.h"
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+#include <Editor/CryEditDoc.h>
+#include <Editor/ViewManager.h>
+
+#include <QHeaderView>
+#include <QMimeData>
+
+// FavoritesList
+//////////////////////////////////////////////////////////////////////////
+
+FavoritesList::FavoritesList(QWidget* parent /*= nullptr*/) 
+    : FilteredComponentList(parent)
+{
+}
+
+FavoritesList::~FavoritesList()
+{
+    FavoriteComponentListRequestBus::Handler::BusDisconnect();
+}
+
+void FavoritesList::Init()
+{
+    FavoriteComponentListRequestBus::Handler::BusConnect();
+
+    FavoritesDataModel* favoritesDataModel = new FavoritesDataModel(this);
+    
+    setModel(favoritesDataModel);
+
+    horizontalHeader()->setSectionResizeMode(ComponentDataModel::ColumnIndex::Name, QHeaderView::Stretch);
+
+    setShowGrid(false);
+
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection);
+    setStyleSheet("QTableView { selection-background-color: rgba(255,255,255,0.2); }");
+    setGridStyle(Qt::PenStyle::NoPen);
+    verticalHeader()->hide();
+    horizontalHeader()->hide();
+    setSelectionBehavior(QAbstractItemView::SelectionBehavior::SelectRows);
+    setShowGrid(false);
+    setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+    setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+
+    setColumnWidth(ComponentDataModel::ColumnIndex::Icon, 32);
+    hideColumn(ComponentDataModel::ColumnIndex::Category);
+
+    setDragDropMode(QAbstractItemView::DragDrop);
+    setAcceptDrops(true);
+
+    horizontalHeader()->setSectionResizeMode(ComponentDataModel::ColumnIndex::Icon, QHeaderView::ResizeToContents);
+    setColumnWidth(ComponentDataModel::ColumnIndex::Icon, 32);
+
+    horizontalHeader()->setSectionResizeMode(ComponentDataModel::ColumnIndex::Category, QHeaderView::Stretch);
+    setColumnWidth(ComponentDataModel::ColumnIndex::Category, 90);
+
+    // Context menu
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(this, &QWidget::customContextMenuRequested, this, &FavoritesList::ShowContextMenu);
+}
+
+void FavoritesList::ShowContextMenu(const QPoint& pos)
+{
+    // Only show if a level is loaded
+    if (!GetIEditor() || GetIEditor()->IsInGameMode())
+    {
+        return;
+    }
+
+    if ( model()->rowCount() == 0)
+    {
+        return;
+    }
+
+    QMenu contextMenu(tr("Context menu"), this);
+
+    QAction actionNewEntity(tr("Make entity with selected favorites"), this);
+    QAction actionAddToSelection(this);
+    if (GetIEditor()->GetDocument()->IsDocumentReady())
+    {
+        QObject::connect(&actionNewEntity, &QAction::triggered, this, [&] { ContextMenu_NewEntity(); });
+        contextMenu.addAction(&actionNewEntity);
+
+        AzToolsFramework::EntityIdList selectedEntities;
+        EBUS_EVENT_RESULT(selectedEntities, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
+
+        if (!selectedEntities.empty())
+        {
+            QString addToSelection = selectedEntities.size() > 1 ? tr("Add to selected entities") : tr("Add to selected entity");
+            actionAddToSelection.setText(addToSelection);
+
+            QObject::connect(&actionAddToSelection, &QAction::triggered, this, [&] { ContextMenu_AddToSelectedEntities(); });
+            contextMenu.addAction(&actionAddToSelection);
+        }
+
+        contextMenu.addSeparator();
+    }
+
+    QAction action(tr("Remove"), this);
+    QObject::connect(&action, &QAction::triggered, this, [&] { ContextMenu_RemoveSelectedFavorites(); });
+    contextMenu.addAction(&action);
+
+    contextMenu.exec(mapToGlobal(pos));
+}
+
+void FavoritesList::ContextMenu_RemoveSelectedFavorites()
+{
+    FavoritesDataModel* dataModel = qobject_cast<FavoritesDataModel*>(model());
+    if (!selectedIndexes().empty())
+    {
+        dataModel->Remove(selectedIndexes());
+    }
+}
+
+void FavoritesList::rowsInserted([[maybe_unused]] const QModelIndex& parent, [[maybe_unused]] int start, [[maybe_unused]] int end)
+{
+    resizeRowToContents(0);
+}
+
+void FavoritesList::AddFavorites(const AZStd::vector<const AZ::SerializeContext::ClassData*>& classDataContainer)
+{
+    for (const AZ::SerializeContext::ClassData* classData : classDataContainer)
+    {
+        if (classData)
+        {
+            FavoritesDataModel* dataModel = qobject_cast<FavoritesDataModel*>(model());
+            dataModel->AddFavorite(classData);
+        }
+    }
+}
+
+void FavoritesList::dragEnterEvent(QDragEnterEvent* event)
+{
+    if (event->mimeData()->hasFormat(AzToolsFramework::ComponentTypeMimeData::GetMimeType()))
+    {
+        event->acceptProposedAction();
+    }
+}
+
+void FavoritesList::dragMoveEvent(QDragMoveEvent* event)
+{
+    if (event->source() == this)
+    {
+        event->ignore();
+    }
+    else
+    {
+        event->accept();
+    }
+}
+
+// FavoritesDataModel
+//////////////////////////////////////////////////////////////////////////
+
+int FavoritesDataModel::rowCount([[maybe_unused]] const QModelIndex &parent /*= QModelIndex()*/) const
+{
+    return m_favorites.size();
+}
+
+int FavoritesDataModel::columnCount([[maybe_unused]] const QModelIndex &parent /*= QModelIndex()*/) const
+{
+    return ColumnIndex::Count;
+}
+
+void FavoritesDataModel::SaveState()
+{
+    AZStd::vector<AZ::Uuid> favorites;
+    for (const AZ::SerializeContext::ClassData* classData : m_favorites)
+    {
+        favorites.push_back(classData->m_typeId);
+    }
+    m_settings->SetFavorites(AZStd::move(favorites));
+
+
+    // Write the settings to file...
+    AZ::SerializeContext* serializeContext = nullptr;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(serializeContext, "Serialize Context is null!");
+
+    char settingsPath[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetInstance()->ResolvePath(ComponentPaletteSettings::GetSettingsFile(), settingsPath, AZ_MAX_PATH_LEN);
+
+    bool result = m_provider.Save(settingsPath, serializeContext);
+    (void)result;
+    AZ_Warning("ComponentPaletteSettings", result, "Failed to Save the Component Palette Settings!");
+}
+
+void FavoritesDataModel::LoadState()
+{
+    // It is necessary to Load the settings file *before* you call UserSettings::CreateFind!
+    AZ::SerializeContext* serializeContext = nullptr;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(serializeContext, "Serialize Context is null!");
+
+    char settingsPath[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetInstance()->ResolvePath(ComponentPaletteSettings::GetSettingsFile(), settingsPath, AZ_MAX_PATH_LEN);
+
+    bool result = m_provider.Load(settingsPath, serializeContext);
+    (void)result;
+
+
+    // Create (if no file was found) or find the settings, this will populate the m_settings->m_favorites list.
+    m_settings = AZ::UserSettings::CreateFind<ComponentPaletteSettings>(AZ_CRC("ComponentPaletteSettings", 0x481d355b), m_providerId);
+
+    // Add favorites to the data model from loaded settings
+    for (const AZ::Uuid& favorite : m_settings->m_favorites)
+    {
+        const AZ::SerializeContext::ClassData* classData = serializeContext->FindClassData(favorite);
+        if (classData)
+        {
+            AddFavorite(classData, false);
+        }
+    }
+}
+
+void FavoritesDataModel::Remove(const QModelIndexList& indices)
+{
+    beginResetModel();
+
+    auto newFavorites = m_favorites;
+
+    // swap here
+    for (auto index : indices)
+    {
+        // we're only dealing with columns and they're the only thing with class data anyways
+        if (index.column() == 0)
+        {
+            QVariant classDataVariant = index.data(ComponentDataModel::ClassDataRole);
+            if (classDataVariant.isValid())
+            {
+                const AZ::SerializeContext::ClassData* classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
+                newFavorites.removeAll(classData);
+
+                AZ_TracePrintf("Debug", "Removing: %s\n", classData->m_editData->m_name);
+            }
+        }
+    }
+
+    m_favorites.swap(newFavorites);
+
+    endResetModel();
+
+    SaveState();
+}
+
+QModelIndex FavoritesDataModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (!hasIndex(row, column, parent))
+    {
+        return QModelIndex();
+    }
+
+    if (row >= rowCount(parent) || column >= columnCount(parent))
+    {
+        return QModelIndex();
+    }
+
+    return createIndex(row, column, (void*)(m_favorites[row]));
+}
+
+QVariant FavoritesDataModel::data(const QModelIndex &index, int role /*= Qt::DisplayRole*/) const
+{
+    if (!index.isValid())
+    {
+        return QVariant();
+    }
+
+    const AZ::SerializeContext::ClassData* classData = m_favorites[index.row()];
+    if (!classData)
+    {
+        return QVariant();
+    }
+
+    switch (role)
+    {
+    case Qt::DisplayRole:
+    {
+        if (index.column() == ComponentDataModel::ColumnIndex::Name)
+        {
+            if (m_favorites.empty())
+            {
+                return QVariant(tr("You have 0 favorites.\nDrag some components here."));
+            }
+
+            return QVariant(classData->m_editData->m_name);
+        }
+    }
+    break;
+
+    case Qt::DecorationRole:
+    {
+        if (index.column() == ColumnIndex::Icon)
+        {
+            const AZ::SerializeContext::ClassData* iconClassData = m_favorites[index.row()];
+            auto iconIterator = m_componentIcons.find(iconClassData->m_typeId);
+            if (iconIterator != m_componentIcons.end())
+            {
+                return iconIterator->second;
+            }
+
+            return QVariant();
+        }
+    }
+    break;
+
+    case ClassDataRole:
+        if (index.column() == 0) // Only get data for one column
+        {
+            return QVariant::fromValue<void*>(reinterpret_cast<void*>(const_cast<AZ::SerializeContext::ClassData*>(classData)));
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    return ComponentDataModel::data(index, role);
+    
+}
+
+void FavoritesDataModel::SetSavedStateKey([[maybe_unused]] AZ::u32 key)
+{
+}
+
+FavoritesDataModel::FavoritesDataModel(QWidget* parent /*= nullptr*/) 
+    : ComponentDataModel(parent)
+    , m_providerId(AZ_CRC("ComponentPaletteSettingsProviderId"))
+{
+    m_provider.Activate(m_providerId);
+    LoadState();
+}
+
+FavoritesDataModel::~FavoritesDataModel()
+{
+    m_provider.Deactivate();
+}
+
+void FavoritesDataModel::AddFavorite(const AZ::SerializeContext::ClassData* classData, bool updateSettings)
+{
+    beginResetModel();
+
+    if (m_favorites.indexOf(classData) < 0)
+    {
+        m_favorites.push_back(classData);
+    }
+
+    endResetModel();
+
+    if (updateSettings)
+    {
+        SaveState();
+    }
+}
+
+bool FavoritesDataModel::dropMimeData(const QMimeData *data, Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, [[maybe_unused]] const QModelIndex &parent)
+{
+    if (action == Qt::IgnoreAction)
+    {
+        return true;
+    }
+
+    if (data && data->hasFormat(AzToolsFramework::ComponentTypeMimeData::GetMimeType()))
+    {
+        AzToolsFramework::ComponentTypeMimeData::ClassDataContainer classDataContainer;
+        AzToolsFramework::ComponentTypeMimeData::Get(data, classDataContainer);
+
+        for (const AZ::SerializeContext::ClassData* classData : classDataContainer)
+        {
+            if (classData)
+            {
+                AddFavorite(classData);
+            }
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+#include <UI/ComponentPalette/moc_FavoriteComponentList.cpp>
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.h
new file mode 100644
index 0000000000..44d343d89c
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "ComponentDataModel.h"
+#include "FilteredComponentList.h"
+#include "ComponentPaletteSettings.h"
+
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/UserSettings/UserSettingsProvider.h>
+#include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
+#include <AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h>
+#endif
+
+//! FavoriteComponentListRequest
+//! Bus that provides a way for external features to record favorites
+class FavoriteComponentListRequest : public AZ::EBusTraits
+{
+public:
+    virtual void AddFavorites(const AZStd::vector<const AZ::SerializeContext::ClassData*>&) = 0;
+};
+
+using FavoriteComponentListRequestBus = AZ::EBus<FavoriteComponentListRequest>;
+
+
+//! FavoritesDataModel 
+//! Stores the list of component class data to display in the favorites control, offers persistence through user settings.
+class FavoritesDataModel 
+    : public ComponentDataModel
+{
+    Q_OBJECT
+
+public:
+
+    AZ_CLASS_ALLOCATOR(FavoritesDataModel, AZ::SystemAllocator, 0);
+
+    FavoritesDataModel(QWidget* parent = nullptr);
+    ~FavoritesDataModel() override;
+
+    //! Add a favorite component
+    //! \param classData The ClassData information for the component to store as favorite
+    //! \param updateSettings Optional parameter used to determine if the persistent settings need to be updated.
+    void AddFavorite(const AZ::SerializeContext::ClassData* classData, bool updateSettings = true);
+
+    //! Remove all the specified items from the table
+    //! \param indices List of indices to remove from favorites
+    void Remove(const QModelIndexList& indices);
+
+    //! Save the list of favorite components to user settings
+    void SaveState();
+    
+    //! Load the list of favorite components from user settings
+    void LoadState();
+
+protected:
+
+    void SetSavedStateKey(AZ::u32 key);
+
+    // Qt handlers
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
+
+    // List of component class data
+    QList<const AZ::SerializeContext::ClassData*> m_favorites;
+
+    // The Palette settings and provider information for saving out the Favorites list
+    AZStd::intrusive_ptr<ComponentPaletteSettings> m_settings;
+    AZ::UserSettingsProvider m_provider;
+    AZ::u32 m_providerId;
+};
+
+
+//! FavoritesList
+//! User customized list of favorite components, provides persistence.
+class FavoritesList 
+    : public FilteredComponentList
+    , FavoriteComponentListRequestBus::Handler
+{
+    Q_OBJECT
+
+public:
+
+    explicit FavoritesList(QWidget* parent = nullptr);
+    ~FavoritesList() override;
+
+    void Init() override;
+
+protected:
+
+    //////////////////////////////////////////////////////////////////////////
+    // FavoriteComponentListRequestBus
+    void AddFavorites(const AZStd::vector<const AZ::SerializeContext::ClassData*>& classDataContainer) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    void rowsInserted(const QModelIndex& parent, int start, int end);
+
+    // Context menu handlers
+    void ShowContextMenu(const QPoint&);
+    void ContextMenu_RemoveSelectedFavorites();
+
+    // Validate data being dragged in
+    void dragEnterEvent(QDragEnterEvent * event) override;
+    void dragMoveEvent(QDragMoveEvent* event) override;
+
+    //! Handler used when dropping PaletteItems into the Viewport.
+    static void DragDropHandler(CViewport* viewport, int ptx, int pty, void* custom);
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.cpp
new file mode 100644
index 0000000000..5bf84fd61b
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.cpp
@@ -0,0 +1,265 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "ComponentDataModel.h"
+#include "FavoriteComponentList.h"
+#include "FilteredComponentList.h"
+
+#include "CryCommon/MathConversion.h"
+#include "Editor/IEditor.h"
+#include "Editor/ViewManager.h"
+#include <Editor/CryEditDoc.h>
+
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+#include <QHeaderView>
+
+void FilteredComponentList::Init()
+{
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    setDragDropMode(QAbstractItemView::DragDropMode::DragOnly);
+    setDragEnabled(true);
+
+    setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection);
+    setStyleSheet("QTreeWidget { selection-background-color: rgba(255,255,255,0.2); }");
+    setGridStyle(Qt::PenStyle::NoPen);
+    verticalHeader()->hide();
+    horizontalHeader()->hide();
+    setSelectionBehavior(QAbstractItemView::SelectionBehavior::SelectRows);
+    setAcceptDrops(false);
+
+    m_componentDataModel = new ComponentDataModel(this);
+    ComponentDataProxyModel* componentDataProxyModel = new ComponentDataProxyModel(this);
+    componentDataProxyModel->setSourceModel(m_componentDataModel);
+    setModel(componentDataProxyModel);
+
+    QHeaderView* horizontalHeaderView = horizontalHeader();
+    horizontalHeaderView->setSectionResizeMode(ComponentDataModel::ColumnIndex::Icon, QHeaderView::ResizeToContents);
+    horizontalHeaderView->setSectionResizeMode(ComponentDataModel::ColumnIndex::Name, QHeaderView::Stretch);
+
+    setColumnWidth(ComponentDataModel::ColumnIndex::Icon, 32);
+    setShowGrid(false);
+
+    setColumnWidth(ComponentDataModel::ColumnIndex::Name, 90);
+    setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+
+    sortByColumn(ComponentDataModel::ColumnIndex::Name, Qt::AscendingOrder);
+    hideColumn(ComponentDataModel::ColumnIndex::Category);
+
+    connect(model(), &QAbstractItemModel::rowsInserted, this, &FilteredComponentList::rowsInserted);
+    connect(model(), &QAbstractItemModel::rowsRemoved, this, &FilteredComponentList::rowsAboutToBeRemoved);
+
+    connect(model(), SIGNAL(modelReset()), SLOT(modelReset()));
+
+
+    // Context menu
+    setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(this, &QWidget::customContextMenuRequested, this, &FilteredComponentList::ShowContextMenu);
+}
+
+void FilteredComponentList::ContextMenu_NewEntity()
+{
+    AZ::EntityId entityId;
+
+    auto proxyDataModel = qobject_cast<ComponentDataProxyModel*>(model());
+    if (proxyDataModel)
+    {
+        entityId = proxyDataModel->NewEntityFromSelection(selectedIndexes());
+    }
+    else
+    {
+        auto dataModel = qobject_cast<ComponentDataModel*>(model());
+        if (dataModel)
+        {
+            entityId = dataModel->NewEntityFromSelection(selectedIndexes());
+        }
+    }
+}
+
+
+void FilteredComponentList::ContextMenu_AddToFavorites()
+{
+    AZStd::vector<const AZ::SerializeContext::ClassData*> componentsToAdd;
+    for (auto index : selectedIndexes())
+    {
+        QVariant classDataVariant = index.data(ComponentDataModel::ClassDataRole);
+        if (classDataVariant.isValid())
+        {
+            auto classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
+            componentsToAdd.push_back(classData);
+        }
+    }
+
+    if (!componentsToAdd.empty())
+    {
+        EBUS_EVENT(FavoriteComponentListRequestBus, AddFavorites, componentsToAdd);
+    }
+}
+
+void FilteredComponentList::ContextMenu_AddToSelectedEntities()
+{
+    ComponentDataUtilities::AddComponentsToSelectedEntities(selectedIndexes(), model());
+}
+
+void FilteredComponentList::ShowContextMenu(const QPoint& pos)
+{
+    QMenu contextMenu(tr("Context menu"), this);
+
+    QAction actionNewEntity(tr("Create new entity with selected components"), this);
+    if (GetIEditor()->GetDocument()->IsDocumentReady())
+    {
+        QObject::connect(&actionNewEntity, &QAction::triggered, this, [this] { ContextMenu_NewEntity();  });
+        contextMenu.addAction(&actionNewEntity);
+    }
+
+    QAction actionAddFavorite(tr("Add to favorites"), this);
+    QObject::connect(&actionAddFavorite, &QAction::triggered, this, [this] { ContextMenu_AddToFavorites(); });
+    contextMenu.addAction(&actionAddFavorite);
+
+    QAction actionAddToSelection(this);
+    if (GetIEditor()->GetDocument()->IsDocumentReady())
+    {
+        AzToolsFramework::EntityIdList selectedEntities;
+        EBUS_EVENT_RESULT(selectedEntities, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
+
+        if (!selectedEntities.empty())
+        {
+            QString addToSelection = selectedEntities.size() > 1 ? tr("Add to selected entities") : tr("Add to selected entity");
+
+            actionAddToSelection.setText(addToSelection);
+            QObject::connect(&actionAddToSelection, &QAction::triggered, this, [this] { ContextMenu_AddToSelectedEntities(); });
+            contextMenu.addAction(&actionAddToSelection);
+        }
+    }
+    // TODO: Requires information panel implementation LMBR-28174
+    //QAction actionHelp(tr("Help"), this);
+    //QObject::connect(&actionHelp, &QAction::triggered, this, [&] {});
+    //contextMenu.addAction(&actionHelp);
+
+    contextMenu.exec(mapToGlobal(pos));
+}
+
+void FilteredComponentList::modelReset()
+{
+    // Ensure that the category column is hidden
+    hideColumn(ComponentDataModel::ColumnIndex::Category);
+}
+
+FilteredComponentList::FilteredComponentList(QWidget* parent /*= nullptr*/)
+    : QTableView(parent)
+{
+}
+
+FilteredComponentList::~FilteredComponentList()
+{
+}
+
+void FilteredComponentList::SearchCriteriaChanged(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator)
+{
+    setUpdatesEnabled(false);
+
+    auto dataModel = qobject_cast<ComponentDataProxyModel*>(model());
+    if (dataModel)
+    {
+        // Go through the list of items and show/hide as needed due to filter.
+        QString filter;
+        for (const auto& criteria : criteriaList)
+        {
+            QString tag, text;
+            AzToolsFramework::SearchCriteriaButton::SplitTagAndText(criteria, tag, text);
+            AppendFilter(filter, text, filterOperator);
+        }
+
+        dataModel->setFilterRegExp(QRegExp(filter, Qt::CaseSensitivity::CaseInsensitive));
+    }
+
+    setUpdatesEnabled(true);
+}
+
+void FilteredComponentList::SetCategory(const char* category)
+{
+    auto dataModel = qobject_cast<ComponentDataProxyModel*>(model());
+    if (dataModel)
+    {
+        if (!category || category[0] == 0 || azstricmp(category, "All") == 0)
+        {
+            dataModel->ClearSelectedCategory();
+        }
+        else
+        {
+            dataModel->SetSelectedCategory(category);
+        }
+    }
+
+    // Note: this ensures the category column remains hidden
+    hideColumn(ComponentDataModel::ColumnIndex::Category);
+}
+
+void FilteredComponentList::BuildFilter(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator)
+{
+    ClearFilterRegExp();
+
+    for (const auto& criteria : criteriaList)
+    {
+        QString tag, text;
+        AzToolsFramework::SearchCriteriaButton::SplitTagAndText(criteria, tag, text);
+        if (tag.isEmpty())
+        {
+            tag = "null";
+        }
+
+        QString filter = m_filtersRegExp[tag.toStdString().c_str()].pattern();
+
+        AppendFilter(filter, text, filterOperator);
+
+        SetFilterRegExp(tag.toStdString().c_str(), QRegExp(filter, Qt::CaseInsensitive));
+    }
+}
+
+void FilteredComponentList::AppendFilter(QString& filter, const QString& text, AzToolsFramework::FilterOperatorType filterOperator)
+{
+    if (filterOperator == AzToolsFramework::FilterOperatorType::Or)
+    {
+        if (filter.isEmpty())
+        {
+            filter = text;
+        }
+        else
+        {
+            filter += "|" + text;
+        }
+    }
+    else if (filterOperator == AzToolsFramework::FilterOperatorType::And)
+    {
+        //using lookaheads to produce an "and" effect.
+        filter += "(?=.*" + text + ")";
+    }
+}
+
+void FilteredComponentList::SetFilterRegExp(const AZStd::string& filterType, const QRegExp& regExp)
+{
+    m_filtersRegExp[filterType] = regExp;
+}
+
+void FilteredComponentList::ClearFilterRegExp(const AZStd::string& filterType /*= AZStd::string()*/)
+{
+    if (filterType.empty())
+    {
+        for (auto& it : m_filtersRegExp)
+        {
+            it.second = QRegExp();
+        }
+    }
+    else
+    {
+        m_filtersRegExp[filterType] = QRegExp();
+    }
+}
+
+#include <UI/ComponentPalette/moc_FilteredComponentList.cpp>
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.h
new file mode 100644
index 0000000000..a1fae7ceea
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QTableView>
+#include <QWidget>
+
+#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
+#include <AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx>
+#include <AzCore/Serialization/SerializeContext.h>
+#include "ComponentDataModel.h"
+#endif
+
+namespace AZ
+{
+    class SerializeContext;
+    class ClassData;
+}
+
+class ComponentDataModel;
+
+//! FilteredComponentList
+//! Provides a list of components that can be filtered according to search criteria provided and/or from
+//! a category selection control.
+class FilteredComponentList 
+    : public QTableView
+{
+    Q_OBJECT
+
+public:
+
+    explicit FilteredComponentList(QWidget* parent = nullptr);
+
+    ~FilteredComponentList() override;
+
+    virtual void Init();
+
+    void SearchCriteriaChanged(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator);
+
+    void SetCategory(const char* category);
+
+protected:
+
+    // Filtering support
+    void BuildFilter(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator);
+    void AppendFilter(QString& filter, const QString& text, AzToolsFramework::FilterOperatorType filterOperator);
+    void SetFilterRegExp(const AZStd::string& filterType, const QRegExp& regExp);
+    void ClearFilterRegExp(const AZStd::string& filterType = AZStd::string());
+
+    // Context menu handlers 
+    void ShowContextMenu(const QPoint&);
+    void ContextMenu_NewEntity();
+    void ContextMenu_AddToFavorites();
+    void ContextMenu_AddToSelectedEntities();
+
+    void modelReset();
+
+    AzToolsFramework::FilterByCategoryMap m_filtersRegExp;
+    ComponentDataModel* m_componentDataModel;
+
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.cpp
new file mode 100644
index 0000000000..a8f2090226
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.cpp
@@ -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
+ *
+ */
+
+#include "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "InformationPanel.h"
+
+// TODO: LMBR-28174
+
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.h
new file mode 100644
index 0000000000..294a43b39a
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.h
@@ -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
+ *
+ */
+
+#pragma once
+
+// TODO: LMBR-28174
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss
new file mode 100644
index 0000000000..624c89aad7
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss
@@ -0,0 +1,166 @@
+/*
+ * 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
+ *
+ */
+
+
+OutlinerWidget #m_display_options
+{
+    qproperty-icon: url(:/stylesheet/img/UI20/menu-centered.svg);
+    qproperty-iconSize: 16px 16px;
+    qproperty-flat: true;
+}
+
+OutlinerWidget QWidget[PulseHighlight="true"]
+{
+    background-color: #D9822E;
+}
+
+OutlinerWidget QTreeView
+{
+    selection-background-color: transparent;
+}
+
+OutlinerWidget QTreeView::branch:hover
+, OutlinerWidget QTreeView::item:hover
+{
+    background: rgba(255, 255, 255, 30);
+}
+
+OutlinerWidget QTreeView::branch:selected
+, OutlinerWidget QTreeView::item:selected
+, OutlinerWidget QTreeView::branch:selected:active
+, OutlinerWidget QTreeView::item:selected:active
+{
+    background: rgba(255, 255, 255, 45);
+}
+
+
+/* --- VISIBILITY AND LOCK --- */
+
+OutlinerCheckBox
+{
+    border: 0px solid transparent;
+    border-radius: 0px;
+    spacing: 0px;
+    padding: 0px;
+    line-height: 0px;
+    font-size: 0px;
+    margin: 0px;
+    background-color: none;
+    max-height: 20px;
+    max-width: 18px;
+}
+
+OutlinerCheckBox::indicator
+{
+    width: 16px;
+    height: 16px;
+    image-position:center;
+
+    border: 1px solid transparent;
+    image: none;
+    spacing: 0px;
+    padding: 0px;
+    line-height: 0px;
+    font-size: 0px;
+    margin: 0;
+}
+
+OutlinerCheckBox#VisibilityMixed::indicator:checked
+, OutlinerCheckBox#VisibilityMixed::indicator:unchecked
+, OutlinerCheckBox#VisibilityMixed::indicator:indeterminate
+, OutlinerCheckBox#VisibilityMixedHover::indicator:checked
+, OutlinerCheckBox#VisibilityMixedHover::indicator:unchecked
+, OutlinerCheckBox#VisibilityMixedHover::indicator:indeterminate
+, OutlinerCheckBox#LockMixed::indicator:checked
+, OutlinerCheckBox#LockMixed::indicator:unchecked
+, OutlinerCheckBox#LockMixed::indicator:indeterminate
+, OutlinerCheckBox#LockMixedHover::indicator:checked
+, OutlinerCheckBox#LockMixedHover::indicator:unchecked
+, OutlinerCheckBox#LockMixedHover::indicator:indeterminate
+{
+    background: rgba(0, 0, 0, 80);
+    border-radius: 5px;
+    padding-bottom: 1px;
+}
+
+
+/* --- VISIBILITY --- */
+
+OutlinerCheckBox#Visibility::indicator:checked
+, OutlinerCheckBox#VisibilityMixed::indicator:checked
+{
+    image: url(:/Outliner/visibility_default.svg);
+}
+
+OutlinerCheckBox#Visibility::indicator:unchecked
+, OutlinerCheckBox#VisibilityMixed::indicator:unchecked
+{
+    image: url(:/Outliner/visibility_on.svg);
+}
+
+OutlinerCheckBox#VisibilityLayerOverride::indicator:checked
+{
+    image: url(:/Outliner/visibility_default_transparent.svg);
+}
+
+OutlinerCheckBox#VisibilityLayerOverride::indicator:unchecked
+{
+    image: url(:/Outliner/visibility_on_transparent.svg);
+}
+
+OutlinerCheckBox#VisibilityHover::indicator:checked
+, OutlinerCheckBox#VisibilityMixedHover::indicator:checked
+, OutlinerCheckBox#VisibilityLayerOverrideHover::indicator:checked
+{
+    image: url(:/Outliner/visibility_default_hover.svg);
+}
+
+OutlinerCheckBox#VisibilityHover::indicator:unchecked
+, OutlinerCheckBox#VisibilityMixedHover::indicator:unchecked
+, OutlinerCheckBox#VisibilityLayerOverrideHover::indicator:unchecked
+{
+    image: url(:/Outliner/visibility_on_hover.svg);
+}
+
+
+/* --- LOCK --- */
+
+OutlinerCheckBox#Lock::indicator:checked
+, OutlinerCheckBox#LockMixed::indicator:checked
+{
+    image: url(:/Outliner/lock_on.svg);
+}
+
+OutlinerCheckBox#Lock::indicator:unchecked
+, OutlinerCheckBox#LockMixed::indicator:unchecked
+{
+    image: url(:/Outliner/lock_default.svg);
+}
+
+OutlinerCheckBox#LockLayerOverride::indicator:checked
+{
+    image: url(:/Outliner/lock_on_transparent.svg);
+}
+
+OutlinerCheckBox#LockLayerOverride::indicator:unchecked
+{
+    image: url(:/Outliner/lock_default_transparent.svg);
+}
+
+OutlinerCheckBox#LockHover::indicator:checked
+, OutlinerCheckBox#LockMixedHover::indicator:checked
+, OutlinerCheckBox#LockLayerOverrideHover::indicator:checked
+{
+    image: url(:/Outliner/lock_on_hover.svg);
+}
+
+OutlinerCheckBox#LockHover::indicator:unchecked
+, OutlinerCheckBox#LockMixedHover::indicator:unchecked
+, OutlinerCheckBox#LockLayerOverrideHover::indicator:unchecked
+{
+    image: url(:/Outliner/lock_default_hover.svg);
+}
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerCacheBus.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerCacheBus.h
new file mode 100644
index 0000000000..872db578ee
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerCacheBus.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <QModelIndex>
+
+#include <AzCore/Slice/SliceComponent.h>
+#include <AzCore/EBus/EBus.h>
+
+class OutlinerCacheRequests
+    : public AZ::EBusTraits
+{
+public:
+    /// Request selection of the item at the given cache index
+    virtual void SelectOutlinerCache( QModelIndex index ) = 0;
+
+    /// Request deselection of the item at the given cache index
+    virtual void DeselectOutlinerCache(QModelIndex index) = 0;
+};
+
+/// \ref EditorVisibilityRequests
+using OutlinerCacheRequestBus = AZ::EBus<OutlinerCacheRequests>;
+
+/**
+* Messages dispatched when an entity has sustained changes that require
+* it be redrawn in the outliner.
+*/
+class OutlinerCacheNotifications
+    : public AZ::EBusTraits
+{
+public:
+    /// The entity has changed in such a way that its outliner representation has changed and should be redrawn
+    /// invalidate now is true if the item needs to be redrawn immediately.
+    virtual void EntityCacheChanged(const AZ::EntityId& /*entityId*/) {}
+
+    /// The outliner cache item associated with the given entity has been selected
+    /// and is requesting that a notification be sent to the tree view.
+    /// These requests should be handled, considered, and either acted on or queued
+    virtual void EntityCacheSelectionRequest(const AZ::EntityId&  /*entityId*/) {}
+
+    /// The outliner cache item associated with the given entity has been deselected
+    /// and is requesting that the a notification be sent to the tree view.
+    /// These requests should be handled, considered, and either acted on or queued
+    virtual void EntityCacheDeselectionRequest(const AZ::EntityId&  /*entityId*/) {}
+};
+
+/// \ref EditorVisibilityNotifications
+using OutlinerCacheNotificationBus = AZ::EBus<OutlinerCacheNotifications>;
+
+class OutlinerModelNotifications
+    : public AZ::EBusTraits
+{
+public:
+
+    /// The outliner cache item associated with the given entity has been selected
+    /// and is requesting that a notification be sent to the tree view.
+    /// These requests should be handled, considered, and either acted on or queued
+    virtual void ModelEntitySelectionChanged(const AZStd::unordered_set<AZ::EntityId>& /*selectedEntityIdList*/, const AZStd::unordered_set<AZ::EntityId>& /*deselectedEntityIdList*/) {}
+    virtual void QueueScrollToNewContent(const AZ::EntityId& /*entityId*/) {}
+};
+
+/// \ref EditorVisibilityNotifications
+using OutlinerModelNotificationBus = AZ::EBus<OutlinerModelNotifications>;
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp
new file mode 100644
index 0000000000..c1af8d76d7
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp
@@ -0,0 +1,68 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "OutlinerDisplayOptionsMenu.h"
+
+#include <QIcon>
+
+
+namespace EntityOutliner
+{
+    DisplayOptionsMenu::DisplayOptionsMenu(QWidget* parent)
+        : QMenu(parent)
+    {
+        auto sortManually = addAction(QIcon(QStringLiteral(":/Outliner/sort_manually.svg")), tr("Sort: Manually"));
+        sortManually->setData(static_cast<int>(DisplaySortMode::Manually));
+        sortManually->setCheckable(true);
+
+        auto sortAtoZ = addAction(QIcon(QStringLiteral(":/Outliner/sort_a_to_z.svg")), tr("Sort: A to Z"));
+        sortAtoZ->setData(static_cast<int>(DisplaySortMode::AtoZ));
+        sortAtoZ->setCheckable(true);
+
+        auto sortZtoA = addAction(QIcon(QStringLiteral(":/Outliner/sort_z_to_a.svg")), tr("Sort: Z to A"));
+        sortZtoA->setData(static_cast<int>(DisplaySortMode::ZtoA));
+        sortZtoA->setCheckable(true);
+
+        addSeparator();
+
+        auto autoScroll = addAction(tr("Scroll to Selected"));
+        autoScroll->setCheckable(true);
+
+        auto autoExpand = addAction(tr("Expand Selected"));
+        autoExpand->setCheckable(true);
+
+        auto sortGroup = new QActionGroup(this);
+        sortGroup->addAction(sortManually);
+        sortGroup->addAction(sortAtoZ);
+        sortGroup->addAction(sortZtoA);
+
+        sortManually->setChecked(true);
+        autoScroll->setChecked(true);
+        autoExpand->setChecked(true);
+
+        connect(sortGroup, &QActionGroup::triggered, this, &DisplayOptionsMenu::OnSortModeSelected);
+        connect(autoScroll, &QAction::toggled, this, &DisplayOptionsMenu::OnAutoScrollToggle);
+        connect(autoExpand, &QAction::toggled, this, &DisplayOptionsMenu::OnAutoExpandToggle);
+    }
+
+    void DisplayOptionsMenu::OnSortModeSelected(QAction* action)
+    {
+        const auto sortMode = static_cast<DisplaySortMode>(action->data().toInt());
+        emit OnSortModeChanged(sortMode);
+    }
+
+    void DisplayOptionsMenu::OnAutoScrollToggle(bool checked)
+    {
+        emit OnOptionToggled(DisplayOption::AutoScroll, checked);
+    }
+
+    void DisplayOptionsMenu::OnAutoExpandToggle(bool checked)
+    {
+        emit OnOptionToggled(DisplayOption::AutoExpand, checked);
+    }
+}
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.h
new file mode 100644
index 0000000000..455e9f54f5
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.h
@@ -0,0 +1,55 @@
+/*
+ * 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 <QMenu>
+
+#endif
+
+class QAction;
+
+namespace Ui
+{
+    class OutlinerDisplayOptions;
+}
+
+namespace EntityOutliner
+{
+    enum class DisplaySortMode : unsigned char
+    {
+        Manually,
+        AtoZ,
+        ZtoA
+    };
+
+    enum class DisplayOption : unsigned char
+    {
+        AutoScroll,
+        AutoExpand
+    };
+
+    class DisplayOptionsMenu 
+        : public QMenu
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        DisplayOptionsMenu(QWidget* parent = nullptr);
+        ~DisplayOptionsMenu() = default;
+
+    signals:
+        void OnSortModeChanged(DisplaySortMode sortMode);
+        void OnOptionToggled(DisplayOption option, bool enabled);
+
+    private:
+        void OnSortModeSelected(QAction* action);
+
+        void OnAutoScrollToggle(bool checked);
+        void OnAutoExpandToggle(bool checked);
+    };
+}
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
new file mode 100644
index 0000000000..3f62acda62
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
@@ -0,0 +1,2689 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "OutlinerListModel.hxx"
+
+#include <QtCore/QMimeData>
+#include <QFontMetrics>
+#include <QtGui/QPainter>
+#include <QtWidgets/QStyleOption>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QMessageBox>
+#include <QGuiApplication>
+#include <QStyleOptionButton>
+#include <QTimer>
+#include <QBitmap>
+#include <QTextDocument>
+#include <QPainterPath>
+
+#include <AzCore/Asset/AssetManager.h>
+#include <AzCore/Asset/AssetManagerBus.h>
+#include <AzCore/Asset/AssetTypeInfoBus.h>
+#include <AzCore/Casting/numeric_cast.h>
+#include <AzCore/Component/Entity.h>
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/Debug/Profiler.h>
+#include <AzCore/IO/FileIO.h>
+#include <AzCore/Slice/SliceAsset.h>
+
+#include <AzFramework/StringFunc/StringFunc.h>
+
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
+#include <AzToolsFramework/Slice/SliceUtilities.h>
+#include <AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h>
+#include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
+#include <AzToolsFramework/ToolsComponents/EditorEntityIdContainer.h>
+#include <AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorLockComponentBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorOnlyEntityComponentBus.h>
+#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
+#include <AzToolsFramework/ToolsComponents/SelectionComponent.h>
+#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
+
+#include "OutlinerDisplayOptionsMenu.h"
+#include "OutlinerSortFilterProxyModel.hxx"
+#include "OutlinerTreeView.hxx"
+#include "Include/ICommandManager.h"
+#include "Include/IObjectManager.h"
+#include "OutlinerCacheBus.h"
+
+#include <Editor/CryEditDoc.h>
+#include <AzCore/Outcome/Outcome.h>
+
+////////////////////////////////////////////////////////////////////////////
+// OutlinerListModel
+////////////////////////////////////////////////////////////////////////////
+
+bool OutlinerListModel::s_paintingName = false;
+
+OutlinerListModel::OutlinerListModel(QObject* parent)
+    : QAbstractItemModel(parent)
+    , m_entitySelectQueue()
+    , m_entityExpandQueue()
+    , m_entityChangeQueue()
+    , m_entityChangeQueued(false)
+    , m_entityLayoutQueued(false)
+    , m_entityExpansionState()
+    , m_entityFilteredState()
+{
+}
+
+OutlinerListModel::~OutlinerListModel()
+{
+    AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
+    AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusDisconnect();
+    AzToolsFramework::EntityCompositionNotificationBus::Handler::BusDisconnect();
+    AZ::EntitySystemBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorEntityRuntimeActivationChangeNotificationBus::Handler::BusDisconnect();
+}
+
+void OutlinerListModel::Initialize()
+{
+    AzToolsFramework::EditorEntityRuntimeActivationChangeNotificationBus::Handler::BusConnect();
+    AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusConnect();
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
+    AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
+    AzToolsFramework::EntityCompositionNotificationBus::Handler::BusConnect();
+    AZ::EntitySystemBus::Handler::BusConnect();
+}
+
+int OutlinerListModel::rowCount(const QModelIndex& parent) const
+{
+    auto parentId = GetEntityFromIndex(parent);
+
+    AZStd::size_t childCount = 0;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(childCount, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildCount);
+    return (int)childCount;
+}
+
+int OutlinerListModel::columnCount(const QModelIndex& /*parent*/) const
+{
+    return ColumnCount;
+}
+
+QModelIndex OutlinerListModel::index(int row, int column, const QModelIndex& parent) const
+{
+    // sanity check
+    if (!hasIndex(row, column, parent) || (parent.isValid() && parent.column() != 0) || (row < 0 || row >= rowCount(parent)))
+    {
+        return QModelIndex();
+    }
+
+    auto parentId = GetEntityFromIndex(parent);
+
+    AZ::EntityId childId;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(childId, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChild, row);
+    return GetIndexFromEntity(childId, column);
+}
+
+QVariant OutlinerListModel::data(const QModelIndex& index, int role) const
+{
+    auto id = GetEntityFromIndex(index);
+    if (id.IsValid())
+    {
+        switch (index.column())
+        {
+        case ColumnName:
+            return dataForName(index, role);
+
+        case ColumnVisibilityToggle:
+            return dataForVisibility(index, role);
+
+        case ColumnLockToggle:
+            return dataForLock(index, role);
+
+        case ColumnSortIndex:
+            return dataForSortIndex(index, role);
+        }
+    }
+
+    return QVariant();
+}
+
+QMap<int, QVariant> OutlinerListModel::itemData(const QModelIndex &index) const
+{
+    QMap<int, QVariant> roles = QAbstractItemModel::itemData(index);
+    for (int i = Qt::UserRole; i < RoleCount; ++i)
+    {
+        QVariant variantData = data(index, i);
+        if (variantData.isValid())
+        {
+            roles.insert(i, variantData);
+        }
+    }
+
+    return roles;
+}
+
+QVariant OutlinerListModel::dataForAll(const QModelIndex& index, int role) const
+{
+    auto id = GetEntityFromIndex(index);
+
+    switch (role)
+    {
+    case EntityIdRole:
+        return (AZ::u64)id;
+
+    case SliceBackgroundRole:
+    {
+        bool isSliceRoot = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceRoot, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceRoot);
+        bool isSliceEntity = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceEntity, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceEntity);
+        bool isSubsliceRoot = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSubsliceRoot, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSubsliceRoot);
+        return (isSliceRoot || isSubsliceRoot) && isSliceEntity;
+    }
+
+    case SliceEntityOverrideRole:
+    {
+        bool entityHasOverrides = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(entityHasOverrides, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceAnyOverrides);
+        return entityHasOverrides;
+    }
+
+    case SelectedRole:
+    {
+        bool isSelected = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSelected, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSelected);
+        return isSelected;
+    }
+
+    case ChildSelectedRole:
+        return HasSelectedDescendant(id);
+
+    case PartiallyVisibleRole:
+        return !AreAllDescendantsSameVisibleState(id);
+
+    case PartiallyLockedRole:
+        return !AreAllDescendantsSameLockState(id);
+
+    case InLockedLayerRole:
+        return IsInLayerWithProperty(id, LayerProperty::Locked);
+
+    case InInvisibleLayerRole:
+        return IsInLayerWithProperty(id, LayerProperty::Invisible);
+
+    case ChildCountRole:
+    {
+        AZStd::size_t childCount = 0;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(childCount, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildCount);
+        return (int)childCount;
+    }
+
+    case ExpandedRole:
+        return IsExpanded(id);
+
+    case VisibilityRole:
+        return !IsFiltered(id);
+    }
+
+    return QVariant();
+}
+
+QVariant OutlinerListModel::dataForName(const QModelIndex& index, int role) const
+{
+    auto id = GetEntityFromIndex(index);
+
+    switch (role)
+    {
+    case Qt::DisplayRole:
+    case Qt::EditRole:
+    {
+        AZStd::string name;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(name, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetName);
+        QString label{ name.data() };
+        if (s_paintingName && !m_filterString.empty())
+        {
+            // highlight characters in filter
+            int highlightTextIndex = 0;
+            do
+            {
+                highlightTextIndex = label.lastIndexOf(QString(m_filterString.c_str()), highlightTextIndex - 1, Qt::CaseInsensitive);
+                if (highlightTextIndex >= 0)
+                {
+                    const QString BACKGROUND_COLOR{ "#707070" };
+                    label.insert(highlightTextIndex + m_filterString.length(), "</span>");
+                    label.insert(highlightTextIndex, "<span style=\"background-color: " + BACKGROUND_COLOR + "\">");
+                }
+            } while(highlightTextIndex > 0);
+        }
+        return label;
+    }
+
+    case Qt::ToolTipRole:
+    {
+        return GetEntityTooltip(id);
+    }
+
+    case EntityTypeRole:
+    {
+        bool isSliceRoot = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceRoot, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceRoot);
+        bool isSliceEntity = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceEntity, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceEntity);
+        bool isSubsliceRoot = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSubsliceRoot, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSubsliceRoot);
+
+        bool isLayerEntity = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            isLayerEntity,
+            id,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+
+        if (isLayerEntity)
+        {
+            return LayerType;
+        }
+        else if (isSliceEntity)
+        {
+            return (isSliceRoot | isSubsliceRoot) ? SliceHandleType : SliceEntityType;
+        }
+
+        // Guaranteed to return a valid type.
+        return EntityType;
+    }
+
+    case LayerColorRole:
+    {
+        QColor layerColor;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            layerColor,
+            id,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GetLayerColor);
+        return layerColor;
+    }
+
+    case Qt::ForegroundRole:
+    {
+        // We use the parent's palette because the GUI Application palette is returning the wrong colors
+        auto parentWidgetPtr = static_cast<QWidget*>(QObject::parent());
+        return QBrush(parentWidgetPtr->palette().color(QPalette::Text));
+    }
+
+    case Qt::DecorationRole:
+    {
+        return GetEntityIcon(id);
+    }
+    }
+
+    return dataForAll(index, role);
+}
+
+QVariant OutlinerListModel::GetEntityIcon(const AZ::EntityId& id) const
+{
+    AZ::Entity* entity = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
+
+    // build the icon name based on the entity type and state
+    QString iconName;
+
+    bool isSliceEntity = false;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceEntity, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceEntity);
+
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        id,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+
+
+    if (isLayerEntity)
+    {
+        // There is only one layer icon, it does not have multiple states like entities.
+        return QIcon(QPixmap(QString(":/Icons/layer_icon.svg")));
+    }
+    else if (isSliceEntity)
+    {
+        iconName = "Slice_Entity";
+
+        bool hasSliceEntityOverrides = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(hasSliceEntityOverrides, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceEntityPropertyOverridesInTopLevel);
+
+        if (hasSliceEntityOverrides)
+        {
+            iconName += "_Modified";
+        }
+    }
+    else
+    {
+        iconName = "Entity";
+    }
+
+    bool isEditorOnly = false;
+    AzToolsFramework::EditorOnlyEntityComponentRequestBus::EventResult(isEditorOnly, id, &AzToolsFramework::EditorOnlyEntityComponentRequests::IsEditorOnlyEntity);
+
+    const bool isInitiallyActive = entity ? entity->IsRuntimeActiveByDefault() : true;
+
+    if (isEditorOnly)
+    {
+        iconName += "_Editor_Only";
+    }
+    else if (!isInitiallyActive)
+    {
+        iconName += "_Not_Active";
+    }
+
+    QPixmap entityIcon = QPixmap(QString(":/Icons/%1.svg").arg(iconName));
+
+    // Draw a circle at the bottom right corner of the icon when the entity's children have overrides.
+    bool hasSliceChildrenOverrides = false;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(hasSliceChildrenOverrides, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceChildrenOverrides);
+
+    if (hasSliceChildrenOverrides && isSliceEntity)
+    {
+        QBitmap mask = entityIcon.mask();
+        QPainter maskPainter(&mask);
+        maskPainter.drawEllipse(entityIcon.width() - maskDiameter, entityIcon.height() - maskDiameter, maskDiameter, maskDiameter);
+        entityIcon.setMask(mask);
+
+        QPainter iconPainter(&entityIcon);
+        iconPainter.setPen(Qt::transparent);
+        iconPainter.setBrush(QBrush(circleIconColor));
+        iconPainter.drawEllipse(entityIcon.width() - circleIconDiameter, entityIcon.height() - circleIconDiameter, circleIconDiameter, circleIconDiameter);
+    }
+
+    return QIcon(entityIcon);
+}
+
+QVariant OutlinerListModel::GetEntityTooltip(const AZ::EntityId& id) const
+{
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        id,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+
+    if (isLayerEntity)
+    {
+        bool isLayerNameValid = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            isLayerNameValid,
+            id,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::IsLayerNameValid);
+        if (!isLayerNameValid)
+        {
+            return "Layer names at the same level of the hierarchy must be unique before you can save them.";
+        }
+
+        AZ::Outcome<AZStd::string, AZStd::string> layerFullNameResult(
+            AZ::Failure(AZStd::string("Unable to get the layer's file name with an extension.")));
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            layerFullNameResult,
+            id,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GetLayerFullFileName);
+        if (!layerFullNameResult.IsSuccess())
+        {
+            return layerFullNameResult.GetError().c_str();
+        }
+
+        QString layerTooltip = layerFullNameResult.GetValue().c_str();
+
+        bool hasUnsavedChanges = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            hasUnsavedChanges,
+            id,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasUnsavedChanges);
+        if (hasUnsavedChanges)
+        {
+            layerTooltip = QObject::tr("%1(Unsaved)").arg(layerTooltip);
+        }
+
+        QString levelAbsoluteFolder = Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName());
+        bool doesLayerFileExistOnDisk = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            doesLayerFileExistOnDisk,
+            id,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::DoesLayerFileExistOnDisk,
+            levelAbsoluteFolder);
+        if (doesLayerFileExistOnDisk)
+        {
+            layerTooltip = QObject::tr("Unsaved layer");
+        }
+
+        return layerTooltip;
+    }
+
+
+    AZStd::string sliceAssetName;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(sliceAssetName, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetSliceAssetName);
+
+    bool isEditorOnly = false;
+    AzToolsFramework::EditorOnlyEntityComponentRequestBus::EventResult(isEditorOnly, id, &AzToolsFramework::EditorOnlyEntityComponentRequests::IsEditorOnlyEntity);
+
+    QString tooltip = !sliceAssetName.empty() ? QString("Slice asset: %1").arg(sliceAssetName.data()) : QString("Slice asset: This entity is not part of a slice.");
+
+
+    bool hasCyclicDependency = false;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(hasCyclicDependency, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasCyclicDependency);
+    if (hasCyclicDependency)
+    {
+        tooltip = QObject::tr("Circular dependency detected. Cannot save instances of a slice inside of itself. Other valid overrides can be saved as normal.");
+    }
+    else
+    if (isEditorOnly)
+    {
+        tooltip = QString("(%1) %2").arg(tr("Editor-only"), tooltip);
+    }
+    else
+    {
+        AZ::Entity* entity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
+        if (!entity->IsRuntimeActiveByDefault())
+        {
+            tooltip = QString("(%1) %2").arg(tr("Not Active on Start"), tooltip);
+        }
+    }
+
+    return tooltip;
+}
+
+QVariant OutlinerListModel::dataForVisibility(const QModelIndex& index, int role) const
+{
+    auto id = GetEntityFromIndex(index);
+
+    switch (role)
+    {
+        case Qt::CheckStateRole:
+        {
+            return AzToolsFramework::IsEntitySetToBeVisible(id) ? Qt::Checked : Qt::Unchecked;
+        }
+        case Qt::ToolTipRole:
+        {
+            return QString("Show/Hide Entity");
+        }
+        case Qt::SizeHintRole:
+        {
+            return QSize(20, 20);
+        }
+    }
+
+    return dataForAll(index, role);
+}
+
+QVariant OutlinerListModel::dataForLock(const QModelIndex& index, int role) const
+{
+    auto id = GetEntityFromIndex(index);
+
+    switch (role)
+    {
+        case Qt::CheckStateRole:
+        {
+            bool isLocked = false;
+            // Lock state is tracked in 3 places:
+            // EditorLockComponent, EditorEntityModel, and ComponentEntityObject.
+            // In addition to that, entities that are in layers can have the layer's lock state override their own.
+            // Retrieving the lock state from the lock component is ideal for drawing the lock icon in the outliner because
+            // the outliner needs to show that specific entity's lock state, and not the actual final lock state including the layer behavior.
+            // The EditorLockComponent only knows about the specific entity's lock state and not the hierarchy.
+            AzToolsFramework::EditorLockComponentRequestBus::EventResult(
+                isLocked, id, &AzToolsFramework::EditorLockComponentRequests::GetLocked);
+
+            return isLocked ? Qt::Checked : Qt::Unchecked;
+        }
+        case Qt::ToolTipRole:
+        {
+            return QString("Lock/Unlock Entity (Locked means the entity cannot be moved in the viewport)");
+        }
+        case Qt::SizeHintRole:
+        {
+            return QSize(20, 20);
+        }
+    }
+
+    return dataForAll(index, role);
+}
+
+QVariant OutlinerListModel::dataForSortIndex(const QModelIndex& index, int role) const
+{
+    auto id = GetEntityFromIndex(index);
+
+    switch (role)
+    {
+    case Qt::DisplayRole:
+        AZ::u64 sortIndex = 0;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(sortIndex, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetIndexForSorting);
+        return sortIndex;
+    }
+
+    return dataForAll(index, role);
+}
+
+bool OutlinerListModel::setData(const QModelIndex& index, const QVariant& value, int role)
+{
+    switch (role)
+    {
+    case Qt::CheckStateRole:
+    {
+        if (value.canConvert<Qt::CheckState>())
+        {
+            const auto entityId = GetEntityFromIndex(index);
+            switch (index.column())
+            {
+                case ColumnVisibilityToggle:
+                    AzToolsFramework::ToggleEntityVisibility(entityId);
+                    break;
+
+                case ColumnLockToggle:
+                    AzToolsFramework::ToggleEntityLockState(entityId);
+                    break;
+            }
+        }
+    }
+    break;
+
+    case Qt::EditRole:
+    {
+        if (index.column() == ColumnName && !value.toString().isEmpty())
+        {
+            auto id = GetEntityFromIndex(index);
+            if (id.IsValid())
+            {
+                AZ::Entity* entity = nullptr;
+                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, id);
+
+                if (entity)
+                {
+                    AZStd::string oldName = entity->GetName();
+                    AZStd::string newName = value.toString().toUtf8().constData();
+
+                    if (oldName != newName)
+                    {
+                        AzToolsFramework::ScopedUndoBatch undo("Rename Entity");
+
+                        entity->SetName(newName);
+                        undo.MarkEntityDirty(entity->GetId());
+
+                        EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_EntireTree);
+                    }
+                }
+                else
+                {
+                    AZStd::string name;
+                    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(name, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetName);
+                    AZ_Assert(entity, "Outliner entry cannot locate entity with name: %s", name.c_str());
+                }
+            }
+        }
+    }
+    break;
+    }
+
+    return QAbstractItemModel::setData(index, value, role);
+}
+
+QModelIndex OutlinerListModel::parent(const QModelIndex& index) const
+{
+    // invalid indices have no parent
+    if (!index.isValid())
+    {
+        return QModelIndex();
+    }
+
+    auto id = GetEntityFromIndex(index);
+    if (id.IsValid())
+    {
+        AZ::EntityId parentId;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+        return GetIndexFromEntity(parentId, index.column());
+    }
+    return QModelIndex();
+}
+
+Qt::ItemFlags OutlinerListModel::flags(const QModelIndex& index) const
+{
+    Qt::ItemFlags itemFlags = QAbstractItemModel::flags(index);
+    switch (index.column())
+    {
+    case ColumnVisibilityToggle:
+    case ColumnLockToggle:
+        itemFlags |= Qt::ItemIsEnabled;
+        break;
+
+    case ColumnName:
+        itemFlags |= Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsEditable;
+        break;
+
+    default:
+        itemFlags |= Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
+        break;
+    }
+
+    return itemFlags;
+}
+
+Qt::DropActions OutlinerListModel::supportedDropActions() const
+{
+    return Qt::CopyAction;
+}
+
+Qt::DropActions OutlinerListModel::supportedDragActions() const
+{
+    return Qt::CopyAction;
+}
+
+
+bool OutlinerListModel::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
+{
+    if (data)
+    {
+        if (canDropMimeDataForEntityIds(data, action, row, column, parent))
+        {
+            return true;
+        }
+
+        if (CanDropMimeDataAssets(data, action, row, column, parent))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool OutlinerListModel::canDropMimeDataForEntityIds(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
+{
+    (void)action;
+    (void)column;
+    (void)row;
+
+    if (!data || !data->hasFormat(AzToolsFramework::EditorEntityIdContainer::GetMimeType()) || column > 0)
+    {
+        return false;
+    }
+
+    QByteArray arrayData = data->data(AzToolsFramework::EditorEntityIdContainer::GetMimeType());
+
+    AzToolsFramework::EditorEntityIdContainer entityIdListContainer;
+    if (!entityIdListContainer.FromBuffer(arrayData.constData(), arrayData.size()))
+    {
+        return false;
+    }
+
+    AZ::EntityId newParentId = GetEntityFromIndex(parent);
+    if (!CanReparentEntities(newParentId, entityIdListContainer.m_entityIds))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+// Expected behavior when dropping an entity in the outliner view model:
+//  DragEntity onto DropEntity, neither in each other's hierarchy:
+//      DropEntity becomes parent of DragEntity
+//  DragEntity onto DropEntity, DropEntity is DragEntity's parent:
+//      DragEntity sets its parent to DropEntity's parent.
+//  DragEntity onto DropEntity, DragEntity is DropEntity's parent:
+//      No change occurs.
+//  DragEntity onto DropEntity, DropEntity is DragEntity's grandfather (or deeper):
+//      DragEntity's parent becomes DropEntity.
+//  DragEntity onto DropEntity, DragEntity is DropEntity's grandfather (or deeper):
+//      No change occurs.
+//  DragEntity onto DragEntity
+//      No change occurs.
+//  DragEntity and DragEntityChild onto DropEntity:
+//      DragEntity behaves as define previously.
+//      DragEntityChild behaves as a second DragEntity, following normal drag rules.
+//      Example: DragEntity and DragEntityChild dropped onto DragEntity:
+//          DragEntity has no change occur.
+//          DragEntityChild follows the rule "DragEntity onto DropEntity, DropEntity is DragEntity's parent"
+bool OutlinerListModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
+{
+    if (action == Qt::IgnoreAction)
+    {
+        return true;
+    }
+
+    if (parent.isValid() && row == -1 && column == -1)
+    {
+        // Handle drop from the component palette window.
+        if (data->hasFormat(AzToolsFramework::ComponentTypeMimeData::GetMimeType()))
+        {
+            return dropMimeDataComponentPalette(data, action, row, column, parent);
+        }
+    }
+
+    if (data->hasFormat(AzToolsFramework::AssetBrowser::AssetBrowserEntry::GetMimeType()))
+    {
+        return DropMimeDataAssets(data, action, row, column, parent);
+    }
+
+    if (data->hasFormat(AzToolsFramework::EditorEntityIdContainer::GetMimeType()))
+    {
+        return dropMimeDataEntities(data, action, row, column, parent);
+    }
+
+    return QAbstractItemModel::dropMimeData(data, action, row, column, parent);
+}
+
+bool OutlinerListModel::dropMimeDataComponentPalette(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
+{
+    (void)action;
+    (void)row;
+    (void)column;
+
+    AZ::EntityId dropTargetId = GetEntityFromIndex(parent);
+    AzToolsFramework::EntityIdList entityIds{ dropTargetId };
+
+    AzToolsFramework::ComponentTypeMimeData::ClassDataContainer classDataContainer;
+    AzToolsFramework::ComponentTypeMimeData::Get(data, classDataContainer);
+
+    AZ::ComponentTypeList componentsToAdd;
+    for (const auto& classData : classDataContainer)
+    {
+        if (classData)
+        {
+            componentsToAdd.push_back(classData->m_typeId);
+        }
+    }
+
+    AzToolsFramework::EntityCompositionRequests::AddComponentsOutcome addedComponentsResult = AZ::Failure(AZStd::string("Failed to call AddComponentsToEntities on EntityCompositionRequestBus"));
+    AzToolsFramework::EntityCompositionRequestBus::BroadcastResult(addedComponentsResult, &AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, entityIds, componentsToAdd);
+
+    if (addedComponentsResult.IsSuccess())
+    {
+        AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(&AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay, AzToolsFramework::Refresh_EntireTree_NewContent);
+    }
+
+    return false;
+}
+
+
+void OutlinerListModel::DecodeAssetMimeData(const QMimeData* data, AZStd::vector<ComponentAssetPair>& componentAssetPairs, SliceAssetList& sliceAssets) const
+{
+    using namespace AzToolsFramework;
+
+    AZStd::vector<AssetBrowser::AssetBrowserEntry*> entries;
+    AssetBrowser::AssetBrowserEntry::FromMimeData(data, entries);
+
+    AZStd::vector<const AssetBrowser::ProductAssetBrowserEntry*> products;
+    products.reserve(entries.size());
+
+    // Look at all products and determine if they have an associated component.
+    // If so, store the componentType->assetId pair.
+    for (AssetBrowser::AssetBrowserEntry* entry : entries)
+    {
+        products.clear();
+        const AssetBrowser::ProductAssetBrowserEntry* browserEntry = azrtti_cast<const AssetBrowser::ProductAssetBrowserEntry*>(entry);
+        if (browserEntry)
+        {
+            products.push_back(browserEntry);
+        }
+        else
+        {
+            entry->GetChildren<AssetBrowser::ProductAssetBrowserEntry>(products);
+        }
+        for (const auto* product : products)
+        {
+            if (product->GetAssetType() == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
+            {
+                sliceAssets.push_back(product->GetAssetId());
+            }
+            else
+            {
+                bool canCreateComponent = false;
+                AZ::AssetTypeInfoBus::EventResult(canCreateComponent, product->GetAssetType(), &AZ::AssetTypeInfo::CanCreateComponent, product->GetAssetId());
+
+                AZ::TypeId componentType;
+                AZ::AssetTypeInfoBus::EventResult(componentType, product->GetAssetType(), &AZ::AssetTypeInfo::GetComponentTypeId);
+
+                if (canCreateComponent && !componentType.IsNull())
+                {
+                    componentAssetPairs.push_back(AZStd::make_pair(componentType, product->GetAssetId()));
+                }
+            }
+        }
+    }
+}
+
+bool OutlinerListModel::CanDropMimeDataAssets(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
+{
+    (void)action;
+    (void)column;
+    (void)row;
+    (void)parent;
+
+    using namespace AzToolsFramework;
+
+    if (data->hasFormat(AssetBrowser::AssetBrowserEntry::GetMimeType()))
+    {
+        ComponentAssetPairs componentAssetPairs;
+        SliceAssetList sliceAssets;
+        DecodeAssetMimeData(data, componentAssetPairs, sliceAssets);
+
+        return (!componentAssetPairs.empty() || !sliceAssets.empty());
+    }
+
+    return false;
+}
+
+bool OutlinerListModel::DropMimeDataAssets(const QMimeData* data, [[maybe_unused]] Qt::DropAction action, int row, [[maybe_unused]] int column, const QModelIndex& parent)
+{
+    using namespace AzToolsFramework;
+
+    ComponentAssetPairs componentAssetPairs;
+    SliceAssetList sliceAssets;
+    DecodeAssetMimeData(data, componentAssetPairs, sliceAssets);
+
+    ScopedUndoBatch undo("Create/Modify Entities for Asset Drop");
+
+    AZ::Vector3 viewportCenter = AZ::Vector3::CreateZero();
+    EditorRequestBus::BroadcastResult(viewportCenter, &EditorRequestBus::Events::GetWorldPositionAtViewportCenter);
+
+    AZ::EntityId assignParentId = GetEntityFromIndex(parent);
+
+    for (const AZ::Data::AssetId& sliceAssetId : sliceAssets)
+    {
+        // Queue a slice instantiation for each dragged slice.
+        AZ::Data::Asset<AZ::SliceAsset> sliceAsset =
+            AZ::Data::AssetManager::Instance().FindOrCreateAsset<AZ::SliceAsset>(sliceAssetId, AZ::Data::AssetLoadBehavior::Default);
+        if (sliceAsset)
+        {
+            //make sure dropped slices get put in the correct position
+            ToolsApplicationNotificationBus::Broadcast(
+                &ToolsApplicationNotificationBus::Events::SetEntityInstantiationPosition, assignParentId, GetEntityFromIndex(index(row, 0, parent)));
+
+            SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
+                &SliceEditorEntityOwnershipServiceRequestBus::Events::InstantiateEditorSlice,
+                sliceAsset, AZ::Transform::CreateTranslation(viewportCenter));
+
+        }
+    }
+
+    if (componentAssetPairs.empty())
+    {
+        return false;
+    }
+
+    QWidget* mainWindow = nullptr;
+    EditorRequests::Bus::BroadcastResult(mainWindow, &EditorRequests::GetMainWindow);
+
+    // Only resolve an existing if the drop was directly on it. Otherwise we'll create a new entity.
+    AZ::EntityId targetEntityId = (row < 0) ? GetEntityFromIndex(parent) : AZ::EntityId();
+    bool createdNewEntity = false;
+
+    // Shift modifier enables creating a child entity from the asset.
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
+    {
+        assignParentId = targetEntityId;
+        targetEntityId.SetInvalid();
+    }
+
+    if (!targetEntityId.IsValid())
+    {
+        // Only set the entity instantiation position if a new entity will be created. Otherwise, the next entity to be created will be given this position.
+        ToolsApplicationNotificationBus::Broadcast(
+            &ToolsApplicationNotificationBus::Events::SetEntityInstantiationPosition, assignParentId, GetEntityFromIndex(index(row, 0, parent)));
+
+        EditorRequests::Bus::BroadcastResult(targetEntityId, &EditorRequests::CreateNewEntity, assignParentId);
+        if (!targetEntityId.IsValid())
+        {
+            // Clear the entity instantiation position because this entity failed to be created.
+            // Otherwise, the next entity to be created will be given the wrong parent in the outliner.
+            ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::ClearEntityInstantiationPosition);
+            QMessageBox::warning(mainWindow, tr("Asset Drop Failed"), tr("A new entity could not be created for the specified asset."));
+            return false;
+        }
+
+        createdNewEntity = true;
+    }
+
+    AZ::Entity* targetEntity = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(targetEntity, &AZ::ComponentApplicationBus::Events::FindEntity, targetEntityId);
+    if (!targetEntity)
+    {
+        QMessageBox::warning(mainWindow, tr("Asset Drop Failed"), tr("Failed to locate target entity."));
+        return false;
+    }
+
+    // Batch-add all the components.
+    AZ::ComponentTypeList componentsToAdd;
+    componentsToAdd.reserve(componentAssetPairs.size());
+    for (const ComponentAssetPair& pair : componentAssetPairs)
+    {
+        const AZ::TypeId& componentType = pair.first;
+
+        componentsToAdd.push_back(componentType);
+    }
+
+    AZStd::vector<AZ::EntityId> entityIds = { targetEntityId };
+    EntityCompositionRequests::AddComponentsOutcome addComponentsOutcome = AZ::Failure(AZStd::string());
+    EntityCompositionRequestBus::BroadcastResult(addComponentsOutcome, &EntityCompositionRequests::AddComponentsToEntities, entityIds, componentsToAdd);
+
+    if (!addComponentsOutcome.IsSuccess())
+    {
+        QMessageBox::warning(mainWindow, tr("Asset Drop Failed"),
+            QStringLiteral("Components could not be added to the target entity \"%1\".\n\nDetails:\n%2.")
+            .arg(targetEntity->GetName().c_str())
+            .arg(addComponentsOutcome.GetError().c_str()));
+
+        if (createdNewEntity)
+        {
+            EditorEntityContextRequestBus::Broadcast(&EditorEntityContextRequests::DestroyEditorEntity, targetEntityId);
+        }
+
+        return false;
+    }
+
+    // Assign asset associated with each created component.
+    for (const ComponentAssetPair& pair : componentAssetPairs)
+    {
+        const AZ::TypeId& componentType = pair.first;
+        const AZ::Data::AssetId& assetId = pair.second;
+
+        // Name the entity after the first asset.
+        if (createdNewEntity && &pair == &componentAssetPairs.front())
+        {
+            AZStd::string assetPath;
+            EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetId);
+            if (!assetPath.empty())
+            {
+                AZStd::string entityName;
+                AzFramework::StringFunc::Path::GetFileName(assetPath.c_str(), entityName);
+                targetEntity->SetName(entityName);
+            }
+        }
+
+        AZ::Component* componentAdded = targetEntity->FindComponent(componentType);
+        if (componentAdded)
+        {
+            Components::EditorComponentBase* editorComponent = GetEditorComponent(componentAdded);
+            if (editorComponent)
+            {
+                editorComponent->SetPrimaryAsset(assetId);
+            }
+        }
+    }
+
+    if (createdNewEntity)
+    {
+        const AzToolsFramework::EntityIdList selection = { targetEntityId };
+        ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selection);
+    }
+
+    if (AzToolsFramework::IsSelected(targetEntityId))
+    {
+        ToolsApplicationEvents::Bus::Broadcast(&ToolsApplicationEvents::InvalidatePropertyDisplay, Refresh_EntireTree_NewContent);
+    }
+
+    return true;
+}
+
+bool OutlinerListModel::dropMimeDataEntities(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
+{
+    (void)action;
+    (void)column;
+
+    QByteArray arrayData = data->data(AzToolsFramework::EditorEntityIdContainer::GetMimeType());
+
+    AzToolsFramework::EditorEntityIdContainer entityIdListContainer;
+    if (!entityIdListContainer.FromBuffer(arrayData.constData(), arrayData.size()))
+    {
+        return false;
+    }
+
+    AZ::EntityId newParentId = GetEntityFromIndex(parent);
+    AZ::EntityId beforeEntityId = GetEntityFromIndex(index(row, 0, parent));
+    AzToolsFramework::EntityIdList topLevelEntityIds;
+    topLevelEntityIds.reserve(entityIdListContainer.m_entityIds.size());
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::FindTopLevelEntityIdsInactive, entityIdListContainer.m_entityIds, topLevelEntityIds);
+    if (!ReparentEntities(newParentId, topLevelEntityIds, beforeEntityId))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool OutlinerListModel::CanReparentEntities(const AZ::EntityId& newParentId, const AzToolsFramework::EntityIdList &selectedEntityIds) const
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    if (selectedEntityIds.empty())
+    {
+        return false;
+    }
+
+    // Ignore entities not owned by the editor context. It is assumed that all entities belong
+    // to the same context since multiple selection doesn't span across views.
+    for (const AZ::EntityId& entityId : selectedEntityIds)
+    {
+        bool isEditorEntity = false;
+        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, entityId);
+        if (!isEditorEntity)
+        {
+            return false;
+        }
+
+        bool isEntityEditable = true;
+        EBUS_EVENT_RESULT(isEntityEditable, AzToolsFramework::ToolsApplicationRequests::Bus, IsEntityEditable, entityId);
+        if (!isEntityEditable)
+        {
+            return false;
+        }
+
+        // when in a forced sort mode, reject reordering under the same parent
+        if (m_sortMode != EntityOutliner::DisplaySortMode::Manually)
+        {
+            AZ::EntityId currentParentId;
+            AZ::TransformBus::EventResult(currentParentId, entityId, &AZ::TransformBus::Events::GetParentId);
+            if (currentParentId == newParentId)
+            {
+                return false;
+            }
+        }
+
+        if (newParentId.IsValid())
+        {
+            bool isLayerEntity = false;
+            AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+                isLayerEntity,
+                entityId,
+                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+            // Layers can only have other layers as parents, or have no parent.
+            if (isLayerEntity)
+            {
+                bool newParentIsLayer = false;
+                AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+                    newParentIsLayer,
+                    newParentId,
+                    &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+                if (!newParentIsLayer)
+                {
+                    return false;
+                }
+            }
+        }
+    }
+
+    //Only check the entity pointer if the entity id is valid because
+    //we want to allow dragging items to unoccupied parts of the tree to un-parent them
+    if (newParentId.IsValid())
+    {
+        AZ::Entity* newParentEntity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(newParentEntity, &AZ::ComponentApplicationRequests::FindEntity, newParentId);
+        if (!newParentEntity)
+        {
+            return false;
+        }
+    }
+
+    //reject dragging on to yourself or your children
+    AZ::EntityId currParentId = newParentId;
+    while (currParentId.IsValid())
+    {
+        if (AZStd::find(selectedEntityIds.begin(), selectedEntityIds.end(), currParentId) != selectedEntityIds.end())
+        {
+            return false;
+        }
+
+        AZ::EntityId tempParentId;
+        AZ::TransformBus::EventResult(tempParentId, currParentId, &AZ::TransformBus::Events::GetParentId);
+        currParentId = tempParentId;
+    }
+
+    return true;
+}
+
+bool OutlinerListModel::ReparentEntities(const AZ::EntityId& newParentId, const AzToolsFramework::EntityIdList &selectedEntityIds, const AZ::EntityId& beforeEntityId)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    if (!CanReparentEntities(newParentId, selectedEntityIds))
+    {
+        return false;
+    }
+
+    m_isFilterDirty = true;
+
+    AzToolsFramework::ScopedUndoBatch undo("Reparent Entities");
+    //capture child entity order before re-parent operation, which will automatically add order info if not present
+    AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(newParentId);
+
+    // The new parent is dirty due to sort change(s)
+    undo.MarkEntityDirty(AzToolsFramework::GetEntityIdForSortInfo(newParentId));
+
+    AzToolsFramework::EntityIdList processedEntityIds;
+    {
+        AzToolsFramework::ScopedUndoBatch undo2("Reparent Entities");
+
+        for (AZ::EntityId entityId : selectedEntityIds)
+        {
+            AZ::EntityId oldParentId;
+            EBUS_EVENT_ID_RESULT(oldParentId, entityId, AZ::TransformBus, GetParentId);
+
+            if (oldParentId != newParentId
+                && AzToolsFramework::SliceUtilities::IsReparentNonTrivial(entityId, newParentId))
+            {
+                AzToolsFramework::SliceUtilities::ReparentNonTrivialSliceInstanceHierarchy(entityId, newParentId);
+            }
+            else
+            {
+                //  Guarding this to prevent the entity from being marked dirty when the parent doesn't change.
+                EBUS_EVENT_ID(entityId, AZ::TransformBus, SetParent, newParentId);
+            }
+
+            // The old parent is dirty due to sort change
+            undo2.MarkEntityDirty(AzToolsFramework::GetEntityIdForSortInfo(oldParentId));
+
+            // The reparented entity is dirty due to parent change
+            undo2.MarkEntityDirty(entityId);
+
+            processedEntityIds.push_back(entityId);
+
+            AzToolsFramework::ComponentEntityEditorRequestBus::Event(
+                entityId, &AzToolsFramework::ComponentEntityEditorRequestBus::Events::RefreshVisibilityAndLock);
+        }
+
+        GetIEditor()->GetObjectManager()->InvalidateVisibleList();
+    }
+
+    //search for the insertion entity in the order array
+    auto beforeEntityItr = AZStd::find(entityOrderArray.begin(), entityOrderArray.end(), beforeEntityId);
+
+    //replace order info matching selection with bad values rather than remove to preserve layout
+    for (auto& id : entityOrderArray)
+    {
+        if (AZStd::find(processedEntityIds.begin(), processedEntityIds.end(), id) != processedEntityIds.end())
+        {
+            id = AZ::EntityId();
+        }
+    }
+
+    if (newParentId.IsValid())
+    {
+        //if adding to a valid parent entity, insert at the found entity location or at the head of the container
+        auto insertItr = beforeEntityItr != entityOrderArray.end() ? beforeEntityItr : entityOrderArray.begin();
+        entityOrderArray.insert(insertItr, processedEntityIds.begin(), processedEntityIds.end());
+    }
+    else
+    {
+        //if adding to an invalid parent entity (the root), insert at the found entity location or at the tail of the container
+        auto insertItr = beforeEntityItr != entityOrderArray.end() ? beforeEntityItr : entityOrderArray.end();
+        entityOrderArray.insert(insertItr, processedEntityIds.begin(), processedEntityIds.end());
+    }
+
+    //remove placeholder entity ids
+    entityOrderArray.erase(AZStd::remove(entityOrderArray.begin(), entityOrderArray.end(), AZ::EntityId()), entityOrderArray.end());
+
+    //update order array
+    AzToolsFramework::SetEntityChildOrder(newParentId, entityOrderArray);
+
+    // reselect the entities to ensure they're visible if appropriate
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, processedEntityIds);
+
+    EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values);
+    return true;
+}
+
+QMimeData* OutlinerListModel::mimeData(const QModelIndexList& indexes) const
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    AZ::TypeId uuid1 = AZ::AzTypeInfo<AZ::Entity>::Uuid();
+    AZ::TypeId uuid2 = AZ::AzTypeInfo<AzToolsFramework::EditorEntityIdContainer>::Uuid();
+
+    AzToolsFramework::EditorEntityIdContainer entityIdList;
+    for (const QModelIndex& index : indexes)
+    {
+        if (index.column() == 0) // ignore all but one cell in row
+        {
+            AZ::EntityId entityId = GetEntityFromIndex(index);
+            if (entityId.IsValid())
+            {
+                entityIdList.m_entityIds.push_back(entityId);
+            }
+        }
+    }
+    if (entityIdList.m_entityIds.empty())
+    {
+        return nullptr;
+    }
+
+    AZStd::vector<char> encoded;
+    if (!entityIdList.ToBuffer(encoded))
+    {
+        return nullptr;
+    }
+
+    QMimeData* mimeDataPtr = new QMimeData();
+    QByteArray encodedData;
+    encodedData.resize((int)encoded.size());
+    memcpy(encodedData.data(), encoded.data(), encoded.size());
+
+    mimeDataPtr->setData(AzToolsFramework::EditorEntityIdContainer::GetMimeType(), encodedData);
+    return mimeDataPtr;
+}
+
+QStringList OutlinerListModel::mimeTypes() const
+{
+    QStringList list = QAbstractItemModel::mimeTypes();
+    list.append(AzToolsFramework::EditorEntityIdContainer::GetMimeType());
+    list.append(AzToolsFramework::ComponentTypeMimeData::GetMimeType());
+    list.append(AzToolsFramework::ComponentAssetMimeDataContainer::GetMimeType());
+    return list;
+}
+
+void OutlinerListModel::QueueEntityUpdate(AZ::EntityId entityId)
+{
+    if (m_layoutResetQueued)
+    {
+        return;
+    }
+    if (!m_entityChangeQueued)
+    {
+        m_entityChangeQueued = true;
+        QTimer::singleShot(0, this, &OutlinerListModel::ProcessEntityUpdates);
+    }
+    m_entityChangeQueue.insert(entityId);
+}
+
+void OutlinerListModel::QueueAncestorUpdate(AZ::EntityId entityId)
+{
+    //primarily needed for ancestors that reflect child state (selected, locked, hidden)
+    AZ::EntityId parentId;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+    for (AZ::EntityId currentId = parentId; currentId.IsValid(); currentId = parentId)
+    {
+        QueueEntityUpdate(currentId);
+        parentId.SetInvalid();
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, currentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+    }
+}
+
+void OutlinerListModel::QueueEntityToExpand(AZ::EntityId entityId, bool expand)
+{
+    m_entityExpansionState[entityId] = expand;
+    m_entityExpandQueue.insert(entityId);
+    QueueEntityUpdate(entityId);
+}
+
+// Helper struct for tracking a range of indices.
+struct ModelIndexRange
+{
+public:
+    QModelIndex m_start;
+    QModelIndex m_end;
+};
+
+
+void OutlinerListModel::ProcessEntityUpdates()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    m_entityChangeQueued = false;
+    if (m_layoutResetQueued)
+    {
+        return;
+    }
+
+    {
+        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:ExpandQueue");
+        for (auto entityId : m_entityExpandQueue)
+        {
+            emit ExpandEntity(entityId, IsExpanded(entityId));
+        };
+        m_entityExpandQueue.clear();
+    }
+
+    {
+        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:SelectQueue");
+        for (auto entityId : m_entitySelectQueue)
+        {
+            emit SelectEntity(entityId, AzToolsFramework::IsSelected(entityId));
+        };
+        m_entitySelectQueue.clear();
+    }
+
+    if (!m_entityChangeQueue.empty())
+    {
+        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:ChangeQueue");
+
+        // its faster to just do a bulk data change than to carefully pick out indices
+        // so we'll just merge all ranges into a single range rather than try to make gaps
+        QModelIndex firstChangeIndex;
+        QModelIndex lastChangeIndex;
+
+        for (auto entityId : m_entityChangeQueue)
+        {
+            auto myIndex = GetIndexFromEntity(entityId, ColumnName);
+            if ((!firstChangeIndex.isValid())||(firstChangeIndex.row() > myIndex.row()))
+            {
+                firstChangeIndex = myIndex;
+            }
+            
+            if ((!lastChangeIndex.isValid())||(lastChangeIndex.row() < myIndex.row()))
+            {
+                // expand it to be the last column:
+                lastChangeIndex = myIndex;
+            }
+        }
+
+        if (firstChangeIndex.isValid())
+        {
+            // expand to cover all visible columns:
+            lastChangeIndex = createIndex(lastChangeIndex.row(), VisibleColumnCount - 1, lastChangeIndex.internalPointer());
+            emit dataChanged(firstChangeIndex, lastChangeIndex);
+        }
+        
+        m_entityChangeQueue.clear();
+    }
+
+    {
+        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:LayoutChanged");
+        if (m_entityLayoutQueued)
+        {
+            emit layoutAboutToBeChanged();
+            emit layoutChanged();
+        }
+        m_entityLayoutQueued = false;
+    }
+
+    {
+        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:InvalidateFilter");
+        if (m_isFilterDirty)
+        {
+            InvalidateFilter();
+        }
+    }
+}
+
+void OutlinerListModel::OnEntityInfoResetBegin()
+{
+    emit EnableSelectionUpdates(false);
+    beginResetModel();
+}
+
+void OutlinerListModel::OnEntityInfoResetEnd()
+{
+    m_layoutResetQueued = true;
+    endResetModel();
+    QTimer::singleShot(0, this, &OutlinerListModel::ProcessEntityInfoResetEnd);
+}
+
+void OutlinerListModel::ProcessEntityInfoResetEnd()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    m_layoutResetQueued = false;
+    m_entityChangeQueued = false;
+    m_entityChangeQueue.clear();
+    QueueEntityUpdate(AZ::EntityId());
+    emit EnableSelectionUpdates(true);
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedAddChildBegin(AZ::EntityId parentId, AZ::EntityId childId)
+{
+    //add/remove operations trigger selection change signals which assert and break undo/redo operations in progress in inspector etc.
+    //so disallow selection updates until change is complete
+    emit EnableSelectionUpdates(false);
+    auto parentIndex = GetIndexFromEntity(parentId);
+    auto childIndex = GetIndexFromEntity(childId);
+    beginInsertRows(parentIndex, childIndex.row(), childIndex.row());
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedAddChildEnd(AZ::EntityId parentId, AZ::EntityId childId)
+{
+    (void)parentId;
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    endInsertRows();
+
+    //expand ancestors if a new descendant is already selected
+    if ((AzToolsFramework::IsSelected(childId) || HasSelectedDescendant(childId)) && !m_dropOperationInProgress)
+    {
+        ExpandAncestors(childId);
+    }
+
+    //restore selection and expansion state for previously registered entity ids (for the view/model only)
+    RestoreDescendantSelection(childId);
+    RestoreDescendantExpansion(childId);
+
+    //must refresh partial lock/visibility of parents
+    m_isFilterDirty = true;
+    QueueAncestorUpdate(childId);
+    emit EnableSelectionUpdates(true);
+}
+
+void OutlinerListModel::OnEntityRuntimeActivationChanged(AZ::EntityId entityId, bool activeOnStart)
+{
+    AZ_UNUSED(activeOnStart);
+    QueueEntityUpdate(entityId);
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedRemoveChildBegin(AZ::EntityId parentId, AZ::EntityId childId)
+{
+    //add/remove operations trigger selection change signals which assert and break undo/redo operations in progress in inspector etc.
+    //so disallow selection updates until change is complete
+    emit EnableSelectionUpdates(false);
+    auto parentIndex = GetIndexFromEntity(parentId);
+    auto childIndex = GetIndexFromEntity(childId);
+    beginResetModel();
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedRemoveChildEnd(AZ::EntityId parentId, AZ::EntityId childId)
+{
+    (void)childId;
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+    endResetModel();
+
+    //must refresh partial lock/visibility of parents
+    m_isFilterDirty = true;
+    QueueAncestorUpdate(parentId);
+    emit EnableSelectionUpdates(true);
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedOrderBegin(AZ::EntityId parentId, AZ::EntityId childId, AZ::u64 index)
+{
+    (void)parentId;
+    (void)childId;
+    (void)index;
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedOrderEnd(AZ::EntityId parentId, AZ::EntityId childId, AZ::u64 index)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    (void)index;
+    m_entityLayoutQueued = true;
+    QueueEntityUpdate(parentId);
+    QueueEntityUpdate(childId);
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedSelection(AZ::EntityId entityId, bool selected)
+{
+    //update all ancestors because they will show highlight if ancestor is selected
+    QueueAncestorUpdate(entityId);
+
+    //expand ancestors upon new selection
+    if (selected && m_autoExpandEnabled)
+    {
+        ExpandAncestors(entityId);
+    }
+
+    //notify observers
+    emit SelectEntity(entityId, selected);
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedLocked(AZ::EntityId entityId, bool /*locked*/)
+{
+    //update all ancestors because they will show partial state for descendants
+    QueueEntityUpdate(entityId);
+    QueueAncestorUpdate(entityId);
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedVisibility(AZ::EntityId entityId, bool /*visible*/)
+{
+    //update all ancestors because they will show partial state for descendants
+    QueueEntityUpdate(entityId);
+    QueueAncestorUpdate(entityId);
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedName(AZ::EntityId entityId, const AZStd::string& name)
+{
+    (void)name;
+    QueueEntityUpdate(entityId);
+
+    bool isSelected = false;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        isSelected, &AzToolsFramework::ToolsApplicationRequests::IsSelected, entityId);
+
+    if (isSelected)
+    {
+        // Ask the system to scroll to the entity in case it is off screen after the rename
+        OutlinerModelNotificationBus::Broadcast(&OutlinerModelNotifications::QueueScrollToNewContent, entityId);
+    }
+}
+
+void OutlinerListModel::OnEntityInfoUpdatedUnsavedChanges(AZ::EntityId entityId)
+{
+    QueueEntityUpdate(entityId);
+}
+
+void OutlinerListModel::OnEntityInfoUpdateSliceOwnership(AZ::EntityId entityId)
+{
+    QueueEntityUpdate(entityId);
+}
+
+QString OutlinerListModel::GetSliceAssetName(const AZ::EntityId& entityId) const
+{
+    AZStd::string sliceAssetName;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(sliceAssetName, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetSliceAssetName);
+    return QString(sliceAssetName.data());
+}
+
+QModelIndex OutlinerListModel::GetIndexFromEntity(const AZ::EntityId& entityId, int column) const
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+    if (entityId.IsValid())
+    {
+        AZ::EntityId parentId;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+
+        AZStd::size_t row = 0;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(row, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildIndex, entityId);
+        return createIndex(static_cast<int>(row), column, static_cast<AZ::u64>(entityId));
+    }
+
+    return QModelIndex();
+}
+
+AZ::EntityId OutlinerListModel::GetEntityFromIndex(const QModelIndex& index) const
+{
+    return index.isValid() ? AZ::EntityId(static_cast<AZ::u64>(index.internalId())) : AZ::EntityId();
+}
+
+void OutlinerListModel::SearchStringChanged(const AZStd::string& filter)
+{
+    m_isFilterDirty = true;
+    if (filter.size() > 0)
+    {
+        CacheSelectionIfAppropriate();
+    }
+
+    m_filterString = filter;
+    InvalidateFilter();
+
+    RestoreSelectionIfAppropriate();
+}
+
+void OutlinerListModel::SearchFilterChanged(const AZStd::vector<ComponentTypeValue>& componentFilters)
+{
+    m_isFilterDirty = true;
+    if (componentFilters.size() > 0)
+    {
+        CacheSelectionIfAppropriate();
+    }
+
+    m_componentFilters = AZStd::move(componentFilters);
+    InvalidateFilter();
+
+    RestoreSelectionIfAppropriate();
+}
+
+bool OutlinerListModel::ShouldOverrideUnfilteredSelection()
+{
+    AzToolsFramework::EntityIdList currentSelection;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(currentSelection, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    // If new selection is greater, then we need to override
+    if (currentSelection.size() > m_unfilteredSelectionEntityIds.size())
+    {
+        return true;
+    }
+
+    for (auto& entityId : currentSelection)
+    {
+        // If one element in the current selection doesn't exist in our unfiltered selection, we need to override with the new selection
+        auto it = AZStd::find(m_unfilteredSelectionEntityIds.begin(), m_unfilteredSelectionEntityIds.end(), entityId);
+        if (it == m_unfilteredSelectionEntityIds.end())
+        {
+            return true;
+        }
+    }
+
+    if (currentSelection.empty())
+    {
+        for (auto& entityId : m_unfilteredSelectionEntityIds)
+        {
+            // If any of the entities are visible, then the user must have forcibly cleared selection
+            if (!IsFiltered(entityId))
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+void OutlinerListModel::CacheSelectionIfAppropriate()
+{
+    if (ShouldOverrideUnfilteredSelection())
+    {
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(m_unfilteredSelectionEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+    }
+}
+
+void OutlinerListModel::RestoreSelectionIfAppropriate()
+{
+    if (m_unfilteredSelectionEntityIds.size() > 0)
+    {
+        // Store these in a temp list so it doesn't get cleared mid-loop by external logic
+        AzToolsFramework::EntityIdList tempList = m_unfilteredSelectionEntityIds;
+
+        for (auto& entityId : tempList)
+        {
+            if (!IsFiltered(entityId))
+            {
+                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::MarkEntitySelected, entityId);
+            }
+        }
+
+        m_unfilteredSelectionEntityIds = tempList;
+    }
+
+    if (m_unfilteredSelectionEntityIds.size() > 0 && m_componentFilters.size() == 0 && m_filterString.size() == 0)
+    {
+        m_unfilteredSelectionEntityIds.clear();
+    }
+}
+
+void OutlinerListModel::AfterEntitySelectionChanged(const AzToolsFramework::EntityIdList&, const AzToolsFramework::EntityIdList&)
+{
+    if (m_unfilteredSelectionEntityIds.size() > 0)
+    {
+        if (ShouldOverrideUnfilteredSelection())
+        {
+            m_unfilteredSelectionEntityIds.clear();
+        }
+    }
+}
+
+void OutlinerListModel::OnEntityExpanded(const AZ::EntityId& entityId)
+{
+    m_isFilterDirty = true;
+    m_entityExpansionState[entityId] = true;
+    QueueEntityUpdate(entityId);
+}
+
+void OutlinerListModel::OnEntityCollapsed(const AZ::EntityId& entityId)
+{
+    m_isFilterDirty = true;
+    m_entityExpansionState[entityId] = false;
+    QueueEntityUpdate(entityId);
+}
+
+void OutlinerListModel::InvalidateFilter()
+{
+    FilterEntity(AZ::EntityId());
+
+    // Emit data changed directly as it is immediately valid
+    auto modelIndex = GetIndexFromEntity(AZ::EntityId());
+    if (modelIndex.isValid())
+    {
+        emit dataChanged(modelIndex, modelIndex, { VisibilityRole });
+    }
+    m_isFilterDirty = false;
+}
+
+void OutlinerListModel::OnEditorEntityDuplicated(const AZ::EntityId& oldEntity, const AZ::EntityId& newEntity)
+{
+    AZStd::list_iterator<AZStd::pair<AZ::EntityId, bool>> expansionIter = m_entityExpansionState.find(oldEntity);
+    QueueEntityToExpand(newEntity, expansionIter != m_entityExpansionState.end() && expansionIter->second);
+}
+
+void OutlinerListModel::ExpandAncestors(const AZ::EntityId& entityId)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    //typically to reveal selected entities, expand all parent entities
+    if (entityId.IsValid())
+    {
+        AZ::EntityId parentId;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+        QueueEntityToExpand(parentId, true);
+        ExpandAncestors(parentId);
+    }
+}
+
+bool OutlinerListModel::IsExpanded(const AZ::EntityId& entityId) const
+{
+    auto expandedItr = m_entityExpansionState.find(entityId);
+    return expandedItr != m_entityExpansionState.end() && expandedItr->second;
+}
+
+void OutlinerListModel::RestoreDescendantExpansion(const AZ::EntityId& entityId)
+{
+    //re-expand/collapse entities in the model that may have been previously removed or rearranged, resulting in new model indices
+    if (entityId.IsValid())
+    {
+        QueueEntityToExpand(entityId, IsExpanded(entityId));
+
+        AzToolsFramework::EntityIdList children;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
+        for (auto childId : children)
+        {
+            RestoreDescendantExpansion(childId);
+        }
+    }
+}
+
+void OutlinerListModel::RestoreDescendantSelection(const AZ::EntityId& entityId)
+{
+    //re-select entities in the model that may have been previously removed or rearranged, resulting in new model indices
+    if (entityId.IsValid())
+    {
+        m_entitySelectQueue.insert(entityId);
+        QueueEntityUpdate(entityId);
+
+        AzToolsFramework::EntityIdList children;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
+        for (auto childId : children)
+        {
+            RestoreDescendantSelection(childId);
+        }
+    }
+}
+
+bool OutlinerListModel::FilterEntity(const AZ::EntityId& entityId)
+{
+    bool isFilterMatch = true;
+
+    if (m_filterString.size() > 0)
+    {
+        AZStd::string name;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(name, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetName);
+
+        if (AzFramework::StringFunc::Find(name.c_str(), m_filterString.c_str()) == AZStd::string::npos
+            && AZStd::to_string(static_cast<AZ::u64>(entityId)) != m_filterString)
+        {
+            isFilterMatch = false;
+        }
+        else
+        {
+            QueueEntityUpdate(entityId);
+        }
+    }
+
+    int numberOfGlobalFlags = 0;
+    // First check if any of the global flags are valid
+    if (isFilterMatch && m_componentFilters.size() > 0)
+    {
+        int globalFlags = 0;
+
+        for (ComponentTypeValue& componentType : m_componentFilters)
+        {
+            if (componentType.m_globalVal >= 0)
+            {
+                switch (componentType.m_globalVal)
+                {
+                case 0:
+                    globalFlags |= static_cast<int>(GlobalSearchCriteriaFlags::Unlocked);
+                    break;
+                case 1:
+                    globalFlags |= static_cast<int>(GlobalSearchCriteriaFlags::Locked);
+                    break;
+                case 2:
+                    globalFlags |= static_cast<int>(GlobalSearchCriteriaFlags::Visible);
+                    break;
+                case 3:
+                    globalFlags |= static_cast<int>(GlobalSearchCriteriaFlags::Hidden);
+                    break;
+                }
+                ++numberOfGlobalFlags;
+            }
+        }
+        if ((globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Unlocked)) && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Locked)))
+        {
+            globalFlags &= (static_cast<int>(GlobalSearchCriteriaFlags::Visible) | static_cast<int>(GlobalSearchCriteriaFlags::Hidden));
+        }
+        if ((globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Visible)) && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Hidden)))
+        {
+            globalFlags &= (static_cast<int>(GlobalSearchCriteriaFlags::Unlocked) | static_cast<int>(GlobalSearchCriteriaFlags::Locked));
+        }
+        if (globalFlags)
+        {
+            bool visibleFlag = false;
+            AzToolsFramework::EditorVisibilityRequestBus::EventResult(visibleFlag, entityId, &AzToolsFramework::EditorVisibilityRequests::GetVisibilityFlag);
+            if (visibleFlag && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Hidden)))
+            {
+                isFilterMatch = false;
+            }
+            if (!visibleFlag && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Visible)))
+            {
+                isFilterMatch = false;
+            }
+            bool isLocked = false;
+            AzToolsFramework::EditorLockComponentRequestBus::EventResult(isLocked, entityId, &AzToolsFramework::EditorLockComponentRequests::GetLocked);
+            if (isLocked && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Unlocked)))
+            {
+                isFilterMatch = false;
+            }
+            if (!isLocked && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Locked)))
+            {
+                isFilterMatch = false;
+            }
+        }
+    }
+
+    // If we matched the filter string and have any component filters, make sure we match those too
+    if (isFilterMatch && m_componentFilters.size() > numberOfGlobalFlags)
+    {
+        bool hasMatchingComponent = false;
+
+        for (ComponentTypeValue& componentType : m_componentFilters)
+        {
+            if (componentType.m_globalVal < 0)
+            {
+            if (AzToolsFramework::EntityHasComponentOfType(entityId, componentType.m_uuid, true, true))
+                {
+                    hasMatchingComponent = true;
+                    break;
+                }
+            }
+        }
+
+        isFilterMatch &= hasMatchingComponent;
+    }
+
+    AzToolsFramework::EntityIdList children;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
+    for (auto childId : children)
+    {
+        isFilterMatch |= FilterEntity(childId);
+    }
+
+    // If we now match the filter and we previously didn't and we're set in an expanded state
+    // we need to queue an expand again so that the treeview state matches our internal saved state
+    if (isFilterMatch && m_entityFilteredState[entityId] && IsExpanded(entityId))
+    {
+        QueueEntityToExpand(entityId, true);
+    }
+
+    m_entityFilteredState[entityId] = !isFilterMatch;
+
+    return isFilterMatch;
+}
+
+bool OutlinerListModel::IsFiltered(const AZ::EntityId& entityId) const
+{
+    auto hiddenItr = m_entityFilteredState.find(entityId);
+    return hiddenItr != m_entityFilteredState.end() && hiddenItr->second;
+}
+
+void OutlinerListModel::EnableAutoExpand(bool enable)
+{
+    m_autoExpandEnabled = enable;
+}
+
+void OutlinerListModel::SetDropOperationInProgress(bool inProgress)
+{
+    m_dropOperationInProgress = inProgress;
+}
+
+bool OutlinerListModel::HasSelectedDescendant(const AZ::EntityId& entityId) const
+{
+    //TODO result can be cached in mutable map and cleared when any descendant changes to avoid recursion in deep hierarchies
+    AzToolsFramework::EntityIdList children;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
+    for (auto childId : children)
+    {
+        bool isSelected = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSelected, childId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSelected);
+        if (isSelected || HasSelectedDescendant(childId))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool OutlinerListModel::AreAllDescendantsSameLockState(const AZ::EntityId& entityId) const
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    //TODO result can be cached in mutable map and cleared when any descendant changes to avoid recursion in deep hierarchies
+    bool isLocked = false;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isLocked, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsJustThisEntityLocked);
+
+    AzToolsFramework::EntityIdList children;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
+    for (auto childId : children)
+    {
+        bool isLockedChild = false;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isLockedChild, childId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsJustThisEntityLocked);
+        if (isLocked != isLockedChild || !AreAllDescendantsSameLockState(childId))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool OutlinerListModel::AreAllDescendantsSameVisibleState(const AZ::EntityId& entityId) const
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    //TODO result can be cached in mutable map and cleared when any descendant changes to avoid recursion in deep hierarchies
+
+    bool isVisible = AzToolsFramework::IsEntitySetToBeVisible(entityId);
+
+    AzToolsFramework::EntityIdList children;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
+    for (auto childId : children)
+    {
+        bool isVisibleChild = AzToolsFramework::IsEntitySetToBeVisible(childId);
+        if (isVisible != isVisibleChild || !AreAllDescendantsSameVisibleState(childId))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool OutlinerListModel::IsInLayerWithProperty(AZ::EntityId entityId, const LayerProperty& layerProperty) const
+{
+    while (entityId.IsValid())
+    {
+        AZ::EntityId parentId;
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+            parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+
+        bool isParentLayer = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            isParentLayer,
+            parentId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+
+        if (isParentLayer)
+        {
+            if (layerProperty == LayerProperty::Locked)
+            {
+                bool isParentLayerLocked = false;
+                AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+                    isParentLayerLocked, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsJustThisEntityLocked);
+                if (isParentLayerLocked)
+                {
+                    return true;
+                }
+                // If this layer wasn't locked, keep checking the hierarchy, a layer above this one may be locked.
+            }
+            else if (layerProperty == LayerProperty::Invisible)
+            {
+                bool isParentVisible = AzToolsFramework::IsEntitySetToBeVisible(parentId);
+                if (!isParentVisible)
+                {
+                    return true;
+                }
+                // If this layer was visible, keep checking the hierarchy, a layer above this one may be invisible.
+            }
+        }
+
+        entityId = parentId;
+    }
+    return false;
+}
+
+void OutlinerListModel::OnEntityInitialized(const AZ::EntityId& entityId)
+{
+    bool isEditorEntity = false;
+    AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, entityId);
+    if (!isEditorEntity)
+    {
+        return;
+    }
+
+    if (!m_beginStartPlayInEditor && (m_filterString.size() > 0 || m_componentFilters.size() > 0))
+    {
+        m_isFilterDirty = true;
+        emit ReapplyFilter();
+    }
+}
+
+void OutlinerListModel::OnEntityCompositionChanged(const AzToolsFramework::EntityIdList& /*entityIds*/)
+{
+    if (m_componentFilters.size() > 0)
+    {
+        m_isFilterDirty = true;
+        emit ReapplyFilter();
+    }
+}
+
+void OutlinerListModel::OnContextReset()
+{
+    if (m_filterString.size() > 0 || m_componentFilters.size() > 0)
+    {
+        m_isFilterDirty = true;
+        emit ResetFilter();
+    }
+}
+
+void OutlinerListModel::OnStartPlayInEditorBegin()
+{
+    m_beginStartPlayInEditor = true;
+}
+
+void OutlinerListModel::OnStartPlayInEditor()
+{
+    m_beginStartPlayInEditor = false;
+}
+
+////////////////////////////////////////////////////////////////////////////
+// OutlinerItemDelegate
+////////////////////////////////////////////////////////////////////////////
+OutlinerItemDelegate::OutlinerItemDelegate(QWidget* parent)
+    : QStyledItemDelegate(parent)
+    , m_visibilityCheckBoxes(parent, "Visibility", OutlinerListModel::PartiallyVisibleRole, OutlinerListModel::InInvisibleLayerRole)
+    , m_lockCheckBoxes(parent, "Lock", OutlinerListModel::PartiallyLockedRole, OutlinerListModel::InLockedLayerRole)
+{
+}
+
+void OutlinerItemDelegate::DrawLayerStripeAndBorder(QPainter* painter, int stripeX, int top, int bottom, QColor layerBorderColor, QColor layerColor) const
+{
+    if (!painter)
+    {
+        return;
+    }
+    painter->save();
+    painter->setRenderHint(QPainter::Antialiasing, false);
+    QPen layerPen;
+    layerPen.setWidthF(OutlinerListModel::GetLayerStripeWidth());
+    layerPen.setColor(layerBorderColor);
+    painter->setPen(layerPen);
+
+    QLine layerStripeLine(stripeX, top, stripeX, bottom);
+    painter->drawLine(layerStripeLine);
+
+    layerPen.setColor(layerColor);
+    // Draw the line a little taller so it connects to the top of the layer
+    layerStripeLine.translate(OutlinerListModel::GetLayerStripeWidth(), 0);
+    painter->setPen(layerPen);
+    painter->drawLine(layerStripeLine);
+
+    painter->restore();
+}
+
+void OutlinerItemDelegate::DrawLayerUI(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index,
+const AZ::EntityId& entityId, bool isSelected, bool isHovered) const
+{
+    if (!painter)
+    {
+        return;
+    }
+
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+    QColor layerColor;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        layerColor,
+        entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GetLayerColor);
+
+    const QTreeView* outlinerTreeView(qobject_cast<const QTreeView*>(option.widget));
+    int indentation = outlinerTreeView->indentation();
+
+    bool isFirstColumn = index.column() == OutlinerListModel::ColumnName;
+    bool hasVisibleChildren = index.data(OutlinerListModel::ExpandedRole).value<bool>() && index.model()->hasChildren(index);
+
+    if (isLayerEntity && isFirstColumn)
+    {
+        DrawLayerStripeAndBorder(
+            painter,
+            option.rect.left(),
+            option.rect.top(),
+            option.rect.bottom(),
+            m_outlinerConfig.layerBorderBottomColor,
+            layerColor);
+    }
+
+    bool isInLayer = false;
+
+    // Start by assuming this row is the last in a layer, because it's easier to check if it's not the last in the layer.
+    bool continueCheckingLastInLayer = true;
+    QModelIndex lastInLayerIndex(index);
+    int indentationIfLastInLayer = 0;
+
+    QModelIndex nameColumn = index.sibling(index.row(), OutlinerListModel::Column::ColumnName);
+    QModelIndex sibling = index.sibling(index.row() + 1, index.column());
+
+    // This row can't be the last in a layer if it has children and is expanded.
+    if (index.model()->hasChildren(nameColumn) && nameColumn.data(OutlinerListModel::ExpandedRole).value<bool>())
+    {
+        continueCheckingLastInLayer = false;
+        lastInLayerIndex = QModelIndex();
+    }
+    else if (sibling.isValid())
+    {
+        // If the entity is a layer and has a sibling, but did not have children it's the last entity in the layer.
+        continueCheckingLastInLayer = false;
+        if (!isLayerEntity)
+        {
+            // If this entity has a sibling in the next row and isn't a layer itself, then it can't be the last entity in a layer.
+            lastInLayerIndex = QModelIndex();
+        }
+    }
+
+    int ancestorIndentation = 0;
+    QModelIndex previousAncestor = index;
+
+    for (QModelIndex ancestorIndex = index.parent(); ancestorIndex.isValid(); ancestorIndex = ancestorIndex.parent())
+    {
+        ancestorIndentation -= indentation;
+        OutlinerListModel::EntryType ancestorEntryType =
+            OutlinerListModel::EntryType(ancestorIndex.data(OutlinerListModel::EntityTypeRole).value<int>());
+        if (ancestorEntryType == OutlinerListModel::LayerType && !isInLayer)
+        {
+            isInLayer = true;
+        }
+
+        if (continueCheckingLastInLayer && ancestorEntryType == OutlinerListModel::LayerType)
+        {
+            // If this ancestor is a layer, and our previous ancestor does not have a sibling, then the index is the last in the layer.
+            indentationIfLastInLayer = ancestorIndentation;
+            QModelIndex previousAncestorSibling = previousAncestor.sibling(previousAncestor.row() + 1, previousAncestor.column());
+            if (previousAncestorSibling.isValid())
+            {
+                lastInLayerIndex = QModelIndex();
+            }
+        }
+
+        if (isInLayer)
+        {
+            continueCheckingLastInLayer = false;
+        }
+
+        if (ancestorEntryType == OutlinerListModel::LayerType && isFirstColumn)
+        {
+            QColor ancestorLayerColor = ancestorIndex.data(OutlinerListModel::LayerColorRole).value<QColor>();
+            int stripeX = option.rect.left() + ancestorIndentation;
+            DrawLayerStripeAndBorder(
+                painter,
+                stripeX,
+                option.rect.top() - m_layerDividerLineHeight,
+                option.rect.bottom(),
+                m_outlinerConfig.layerBorderBottomColor,
+                ancestorLayerColor);
+        }
+
+        previousAncestor = ancestorIndex;
+    }
+    // If this entity is the last entity in a layer at the root of the outliner, but is not a root entity itself,
+    // then adjust the indentation one more time for that.
+    if (continueCheckingLastInLayer && index.parent().isValid())
+    {
+        indentationIfLastInLayer -= indentation;
+    }
+
+    const bool isLayerOrInLayer = isLayerEntity || isInLayer;
+
+    if (isLayerOrInLayer)
+    {
+        painter->save();
+        painter->setRenderHint(QPainter::Antialiasing, false);
+
+        QPainterPath layerBGPath;
+        QRect layerBGRect(option.rect);
+        if (isFirstColumn && isLayerEntity)
+        {
+            layerBGRect.setLeft(layerBGRect.left() + indentation + OutlinerListModel::GetLayerStripeWidth());
+        }
+        layerBGPath.addRect(layerBGRect);
+        QColor layerBG = isLayerEntity ? m_outlinerConfig.layerBGColor : m_outlinerConfig.layerChildBGColor;
+        if (isSelected)
+        {
+            layerBG = m_outlinerConfig.selectedLayerBGColor;
+        }
+        else if (isHovered)
+        {
+            layerBG = m_outlinerConfig.hoveredLayerBGColor;
+        }
+        painter->fillPath(layerBGPath, layerBG);
+
+        QPoint lineBottomLeft(option.rect.bottomLeft());
+        if (isLayerEntity)
+        {
+            QPoint lineTopLeft(option.rect.topLeft());
+
+            if (isFirstColumn)
+            {
+                lineTopLeft.setX(lineTopLeft.x() + OutlinerListModel::GetLayerStripeWidth());
+            }
+            QPen topLinePen(m_outlinerConfig.layerBorderTopColor, m_layerDividerLineHeight);
+            painter->setPen(topLinePen);
+            painter->drawLine(lineTopLeft, option.rect.topRight());
+        }
+        // Each layer entity has a line drawn on the bottom, and the last entity in the layer has the same line drawn.
+        if (isLayerEntity || lastInLayerIndex.isValid())
+        {
+            if (isFirstColumn)
+            {
+                lineBottomLeft.setX(lineBottomLeft.x() + indentationIfLastInLayer);
+                // Leave room for the 2 layer stripes on the first child to connect to the layer box.
+                if (hasVisibleChildren)
+                {
+                    lineBottomLeft.setX(lineBottomLeft.x() + OutlinerListModel::GetLayerStripeWidth());
+                }
+                else if (!isLayerEntity)
+                {
+                    // Ensure that the bottom line closes all containing layers.
+                    lineBottomLeft.setX(lineBottomLeft.x() + ancestorIndentation + indentation);
+                }
+            }
+            int dividerLineHeight = m_layerDividerLineHeight;
+            QPen bottomLinePen(m_outlinerConfig.layerBorderBottomColor, dividerLineHeight);
+            painter->setPen(bottomLinePen);
+            painter->drawLine(lineBottomLeft, option.rect.bottomRight());
+        }
+
+        painter->restore();
+    }
+}
+
+QString OutlinerItemDelegate::GetLayerInfoString(const AZ::EntityId& entityId) const
+{
+    QString result;
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+    if (!isLayerEntity)
+    {
+        return result;
+    }
+
+    bool hasUnsavedLayerChanges = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        hasUnsavedLayerChanges,
+        entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasUnsavedChanges);
+
+    if (hasUnsavedLayerChanges)
+    {
+        result = QObject::tr("*");
+    }
+
+    bool isLayerNameValid = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerNameValid,
+        entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::IsLayerNameValid);
+
+    if (!isLayerNameValid)
+    {
+        result = QObject::tr("<font color=\"red\">(!)</font> %1").arg(result);
+    }
+
+    return result;
+}
+
+int OutlinerItemDelegate::GetEntityNameVerticalOffset(const AZ::EntityId& entityId) const
+{
+    // Start with a slight offset so that the entity name better aligns to the middle of the row.
+    // The default vertical alignment ends up looking a little low on the row.
+    const int entityNameOffset = -1;
+    bool isLayerEntity = false;
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity,
+        entityId,
+        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+    if (!isLayerEntity)
+    {
+        return entityNameOffset;
+    }
+    // Layers draw a divider over the bottom of the row, so adjust the text rect to account for that.
+    return -m_layerDividerLineHeight + entityNameOffset;
+}
+
+OutlinerItemDelegate::CheckboxGroup::CheckboxGroup(QWidget* parent, AZStd::string prefix, const OutlinerListModel::Roles mixedRole, const OutlinerListModel::Roles layerRole)
+    : m_default(parent)
+    , m_mixed(parent)
+    , m_layerOverride(parent)
+    , m_defaultHover(parent)
+    , m_mixedHover(parent)
+    , m_layerOverrideHover(parent)
+    , m_mixedRole(mixedRole)
+    , m_layerRole(layerRole)
+{
+    m_default.setObjectName(prefix.data());
+    m_mixed.setObjectName((prefix + "Mixed").data());
+    m_layerOverride.setObjectName((prefix + "LayerOverride").data());
+
+    m_defaultHover.setObjectName((prefix + "Hover").data());
+    m_mixedHover.setObjectName((prefix + "MixedHover").data());
+    m_layerOverrideHover.setObjectName((prefix + "LayerOverrideHover").data());
+}
+
+OutlinerCheckBox* OutlinerItemDelegate::CheckboxGroup::SelectCheckboxToRender(const QModelIndex& index, bool isHovered)
+{
+    // LayerOverride
+    if (index.data(m_layerRole).value<bool>())
+    {
+        if (isHovered)
+        {
+            return &m_layerOverrideHover;
+        }
+        else
+        {
+            return &m_layerOverride;
+        }
+    }
+    // Mixed
+    else if (index.data(m_mixedRole).value<bool>())
+    {
+        if (isHovered)
+        {
+            return &m_mixedHover;
+        }
+        else
+        {
+            return &m_mixed;
+        }
+    }
+    //Default
+    if (isHovered)
+    {
+        return &m_defaultHover;
+    }
+    else
+    {
+        return &m_default;
+    }
+}
+
+void OutlinerItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    bool entityHasOverrides = false, childrenHaveOverrides = false, isSliceEntity = false, isLayerEntity = false;
+
+    AZ::EntityId entityId(index.data(OutlinerListModel::EntityIdRole).value<AZ::u64>());
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+        isSliceEntity, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceEntity);
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+        entityHasOverrides, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceEntityOverrides);
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+        childrenHaveOverrides, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceChildrenOverrides);
+    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+        isLayerEntity, entityId, &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+
+    const bool sliceHasOverrides = (entityHasOverrides || childrenHaveOverrides);
+
+    const bool isSelected = (option.state & QStyle::State_Selected);
+    const bool isHovered = (option.state & QStyle::State_MouseOver) && (option.state & QStyle::State_Enabled);
+    if (isSelected || isHovered)
+    {
+        bool selectedOrHoveredIsLayerEntity = false;
+        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
+            selectedOrHoveredIsLayerEntity,
+            entityId,
+            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
+
+        QRect selectionRect = option.rect;
+        if (selectedOrHoveredIsLayerEntity && index.column() == OutlinerListModel::ColumnName)
+        {
+            selectionRect.setLeft(selectionRect.left() + OutlinerTreeView::GetLayerSquareSize());
+        }
+
+        QPainterPath path;
+        path.addRect(option.rect);
+        if (isSelected)
+        {
+            painter->fillPath(path, m_outlinerConfig.outlinerSelectionColor);
+        }
+        else
+        {
+            painter->fillPath(path, m_outlinerConfig.outlinerHoverColor);
+        }
+    }
+
+    DrawLayerUI(painter, option, index, entityId, isSelected, isHovered);
+
+    QPalette checkboxPalette;
+    QColor transparentColor(0, 0, 0, 0);
+    checkboxPalette.setColor(QPalette::Window, transparentColor);
+
+    const bool isSliceRoot = index.data(OutlinerListModel::SliceBackgroundRole).value<bool>();
+    const int slicePillCornerRadius = 4;
+
+    // We're only using these check boxes as renderers so their actual state doesn't matter.
+    // We can set it right before we draw using information from the model data.
+    if (index.column() == OutlinerListModel::ColumnVisibilityToggle)
+    {
+        painter->save();
+        painter->translate(option.rect.topLeft());
+
+        OutlinerCheckBox* checkboxToRender = m_visibilityCheckBoxes.SelectCheckboxToRender(index, isHovered);
+        checkboxToRender->setChecked(index.data(Qt::CheckStateRole).value<Qt::CheckState>() == Qt::Checked);
+        checkboxToRender->setPalette(checkboxPalette);
+        checkboxToRender->render(painter);
+
+        painter->restore();
+        return;
+    }
+
+    if (index.column() == OutlinerListModel::ColumnLockToggle)
+    {
+        painter->save();
+        painter->translate(option.rect.topLeft());
+
+        OutlinerCheckBox* checkboxToRender = m_lockCheckBoxes.SelectCheckboxToRender(index, isHovered);
+        checkboxToRender->setChecked(index.data(Qt::CheckStateRole).value<Qt::CheckState>() == Qt::Checked);
+        checkboxToRender->setPalette(checkboxPalette);
+        checkboxToRender->render(painter);
+
+        painter->restore();
+        return;
+    }
+
+    QStyleOptionViewItem customOptions{ option };
+    if (customOptions.state & QStyle::State_HasFocus)
+    {
+        //  Do not draw the focus rectangle in this column.
+        customOptions.state ^= QStyle::State_HasFocus;
+    }
+
+    auto backgroundBoxRect = option.rect;
+
+    backgroundBoxRect.setX(backgroundBoxRect.x() + 0.5);
+    backgroundBoxRect.setY(backgroundBoxRect.y() + 2.5);
+    backgroundBoxRect.setWidth(backgroundBoxRect.width() - 1.0);
+    backgroundBoxRect.setHeight(backgroundBoxRect.height() - 1.0);
+
+    const qreal sliceBorderHeight = 0.8f;
+
+    // Draw this Slice Handle Accent if the item is not selected before the
+    // entry is drawn.
+    if (!isSelected)
+    {
+        if (isSliceRoot)
+        {
+            painter->save();
+            painter->setRenderHint(QPainter::Antialiasing);
+            QPainterPath path;
+            path.addRoundedRect(backgroundBoxRect, slicePillCornerRadius, slicePillCornerRadius);
+            QPen pen(m_outlinerConfig.sliceRootBorderColor, 1);
+            painter->setPen(pen);
+            painter->fillPath(path, m_outlinerConfig.sliceRootBackgroundColor);
+            painter->restore();
+        }
+
+        // Draw a dashed line around any visible, collapsed entry in the outliner that has
+        // children underneath it currently selected.
+        if (!index.data(OutlinerListModel::ExpandedRole).template value<bool>()
+            && index.data(OutlinerListModel::ChildSelectedRole).template value<bool>())
+        {
+            QPainterPath path;
+
+            if (isSliceRoot)
+            {
+                path.addRoundedRect(backgroundBoxRect, slicePillCornerRadius, slicePillCornerRadius);
+            }
+            else
+            {
+                auto newRect = option.rect;
+                newRect.setHeight(newRect.height() - 1.0);
+                path.addRect(newRect);
+            }
+
+            // Get the foreground color of the current object to draw our sub-object-selected box
+            auto targetColor = index.data(Qt::ForegroundRole).value<QBrush>().color();
+            if (isSliceEntity)
+            {
+                targetColor = (sliceHasOverrides ? m_outlinerConfig.sliceOverrideColor : m_outlinerConfig.sliceEntityColor);
+            }
+            QPen pen(targetColor, 1);
+
+            // Alter the dash pattern available for better visual appeal
+            QVector<qreal> dashes;
+            dashes << 8 << 2;
+            pen.setStyle(Qt::PenStyle::DashLine);
+            pen.setDashPattern(dashes);
+
+            painter->save();
+            painter->setRenderHint(QPainter::Antialiasing);
+            painter->setPen(pen);
+            painter->drawPath(path);
+            painter->restore();
+        }
+    }
+    else
+    {
+        //draw slice root background
+        if (isSliceRoot)
+        {
+            painter->save();
+            painter->setRenderHint(QPainter::Antialiasing);
+            QPainterPath path;
+            path.addRoundedRect(backgroundBoxRect, 4, 4);
+            QPen pen(m_outlinerConfig.selectedSliceRootBorderColor, sliceBorderHeight);
+            painter->setPen(pen);
+            painter->fillPath(path, m_outlinerConfig.selectedSliceRootBackgroundColor);
+            painter->drawPath(path);
+            painter->restore();
+        }
+    }
+
+    if (index.column() == OutlinerListModel::ColumnName)
+    {
+        OutlinerListModel::s_paintingName = true;
+        // standard painter can't handle rich text so we have to handle it
+        painter->save();
+        painter->setRenderHint(QPainter::Antialiasing);
+
+#if (QT_VERSION < QT_VERSION_CHECK(5, 11, 0))
+        QStyleOptionViewItemV4 optionV4{ customOptions };
+#else
+        QStyleOptionViewItem optionV4{ customOptions };
+#endif
+        initStyleOption(&optionV4, index);
+        optionV4.state &= ~(QStyle::State_HasFocus | QStyle::State_Selected);
+
+        // get the rich text and save for later
+
+        QString layerInfoString = GetLayerInfoString(entityId);
+
+        QRect textRect = optionV4.widget->style()->proxy()->subElementRect(QStyle::SE_ItemViewItemText, &optionV4);
+
+        QRegularExpression htmlMarkupRegex("<[^>]*>");
+
+        // Start with the raw rich text for the entity name.
+        QString entityNameRichText = optionV4.text;
+
+        // If there is any HTML markup in the entity name, don't elide.
+        if (!htmlMarkupRegex.match(entityNameRichText).hasMatch())
+        {
+            QFontMetrics fontMetrics(optionV4.font);
+            int textWidthAvailable = textRect.width();
+            // Qt uses "..." for elide, but there doesn't seem to be a way to retrieve this exact string from Qt.
+            // Subtract the elide string from the width available, so it can actually appear.
+            textWidthAvailable -= fontMetrics.horizontalAdvance(QObject::tr("..."));
+            if (!layerInfoString.isEmpty())
+            {
+                // The layer info string includes HTML markup, which can cause an issue computing the width.
+                // The markup on the layer text is light (just color for now, may include italic or bold later), so
+                // an approximate width is computed by taking the width of the non-HTML portion of the string and padding it a bit.
+                QString htmlStripped = layerInfoString;
+                htmlStripped.remove(htmlMarkupRegex);
+                const float layerInfoPadding = 1.2f;
+                textWidthAvailable -= fontMetrics.horizontalAdvance(htmlStripped) * layerInfoPadding;
+            }
+
+            entityNameRichText = fontMetrics.elidedText(optionV4.text, Qt::TextElideMode::ElideRight, textWidthAvailable);
+        }
+
+        if (!layerInfoString.isEmpty())
+        {
+            entityNameRichText = QObject::tr("%1%2").arg(entityNameRichText).arg(layerInfoString);
+        }
+
+        // delete the text from the item so we can use the standard painter to draw the icon
+        optionV4.text.clear();
+        optionV4.widget->style()->drawControl(QStyle::CE_ItemViewItem, &optionV4, painter);
+
+        // Now we setup a Text Document so it can draw the rich text
+        QTextDocument textDoc;
+        textDoc.setDefaultFont(optionV4.font);
+        textDoc.setDefaultStyleSheet("body {color: white}");
+        textDoc.setHtml("<body>" + entityNameRichText + "</body>");
+        int verticalOffset = GetEntityNameVerticalOffset(entityId);
+        painter->translate(textRect.topLeft() + QPoint(0, verticalOffset));
+        textDoc.setTextWidth(textRect.width());
+        textDoc.drawContents(painter, QRectF(0, 0, textRect.width(), textRect.height()));
+
+        painter->restore();
+        OutlinerListModel::s_paintingName = false;
+    }
+    else
+    {
+        QStyledItemDelegate::paint(painter, customOptions, index);
+    }
+}
+
+QSize OutlinerItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    // Get the height of a tall character...
+    // we do this only once per 'tick'
+    if (m_cachedBoundingRectOfTallCharacter.isNull())
+    {
+        m_cachedBoundingRectOfTallCharacter = option.fontMetrics.boundingRect("|");
+        // schedule it to be reset so that if font changes sometime soon, it updates.
+        auto resetFunction = [this]() 
+        { 
+            m_cachedBoundingRectOfTallCharacter = QRect(); 
+        };
+
+        QTimer::singleShot(0, resetFunction);
+    }
+  
+    // And add 8 to it gives the outliner roughly the visible spacing we're looking for.
+    QSize sh = QSize(0, m_cachedBoundingRectOfTallCharacter.height() + OutlinerListModel::s_OutlinerSpacing);
+
+    if (index.column() == OutlinerListModel::ColumnVisibilityToggle || index.column() == OutlinerListModel::ColumnLockToggle)
+    {
+        sh.setWidth(m_toggleColumnWidth);
+    }
+
+    return sh;
+}
+
+bool OutlinerItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index)
+{
+    if (event->type() == QEvent::MouseButtonPress &&
+        (index.column() == OutlinerListModel::Column::ColumnVisibilityToggle || index.column() == OutlinerListModel::Column::ColumnLockToggle))
+    {
+        // Do not propagate click to TreeView if the user clicks the visibility or lock toggles
+        // This prevents selection from changing if a toggle is clicked
+        return true;
+    }
+
+    return QStyledItemDelegate::editorEvent(event, model, option, index);
+}
+
+OutlinerCheckBox::OutlinerCheckBox(QWidget* parent)
+    : QCheckBox(parent)
+{
+    ensurePolished();
+    hide();
+}
+
+void OutlinerCheckBox::draw(QPainter* painter)
+{
+    QStyleOptionButton opt;
+    initStyleOption(&opt);
+    opt.rect.setWidth(m_toggleColumnWidth);
+    style()->drawControl(QStyle::CE_CheckBox, &opt, painter, this);
+}
+
+#include <UI/Outliner/moc_OutlinerListModel.cpp>
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.hxx b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.hxx
new file mode 100644
index 0000000000..09f3ea2c9b
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.hxx
@@ -0,0 +1,409 @@
+/*
+ * 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 OUTLINER_VIEW_MODEL_H
+#define OUTLINER_VIEW_MODEL_H
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/base.h>
+
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QStyledItemDelegate>
+#include <QtWidgets/QCheckBox>
+#include <QtCore/QRect>
+
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Component/EntityBus.h>
+#include <AzCore/Asset/AssetCommon.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
+#include "OutlinerSearchWidget.h"
+
+#include <AzToolsFramework/ToolsComponents/EditorLockComponentBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/API/EntityCompositionNotificationBus.h>
+#include <AzToolsFramework/Entity/EditorEntityRuntimeActivationBus.h>
+#endif
+
+#pragma once
+
+namespace EntityOutliner
+{
+    enum class DisplaySortMode : unsigned char;
+}
+
+//! Model for items in the OutlinerTreeView.
+//! Each item represents an Entity.
+//! Items are parented in the tree according to their transform hierarchy.
+class OutlinerListModel
+    : public QAbstractItemModel
+    , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
+    , private AzToolsFramework::EditorEntityInfoNotificationBus::Handler
+    , private AzToolsFramework::ToolsApplicationEvents::Bus::Handler
+    , private AzToolsFramework::EntityCompositionNotificationBus::Handler
+    , private AzToolsFramework::EditorEntityRuntimeActivationChangeNotificationBus::Handler
+    , private AZ::EntitySystemBus::Handler
+{
+    Q_OBJECT;
+
+public:
+    AZ_CLASS_ALLOCATOR(OutlinerListModel, AZ::SystemAllocator, 0);
+
+    //! Columns of data to display about each Entity.
+    enum Column
+    {
+        ColumnName,                 //!< Entity name
+        ColumnVisibilityToggle,     //!< Visibility Icons
+        ColumnLockToggle,           //!< Lock Icons
+        ColumnSortIndex,            //!< Index of sort order
+        ColumnCount                 //!< Total number of columns
+    };
+
+    // Note: the ColumnSortIndex column isn't shown, hence the -1 and the need for a separate counter.
+    // A wrong column count number causes refresh issues and hover mismatch on model update.
+    static const int VisibleColumnCount = ColumnCount - 1;
+
+    enum EntryType
+    {
+        EntityType,
+        SliceEntityType,
+        SliceHandleType,
+        LayerType
+    };
+
+    enum Roles
+    {
+        VisibilityRole = Qt::UserRole + 1,
+        SliceBackgroundRole,
+        SliceEntityOverrideRole,
+        EntityIdRole,
+        EntityTypeRole,
+        LayerColorRole,
+        SelectedRole,
+        ChildSelectedRole,
+        PartiallyVisibleRole,
+        PartiallyLockedRole,
+        InLockedLayerRole,
+        InInvisibleLayerRole,
+        ChildCountRole,
+        ExpandedRole,
+        RoleCount
+    };
+
+    enum EntityIcon
+    {
+        SliceHandleIcon,            // Icon used to decorate slice handles
+        BrokenSliceHandleIcon,      // Icon used to decorate broken slice handles
+        SliceEntityIcon,            // Icon used to decorate entities that are part of a slice instantiation
+        StandardEntityIcon          // Icon used to decorate entities that are not part of a slice instantiation
+    };
+
+    enum class GlobalSearchCriteriaFlags : int
+    {
+        Unlocked = 1 << static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::Unlocked),
+        Locked = 1 << static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::Locked),
+        Visible = 1 << static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::Visible),
+        Hidden = 1 << static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::Hidden)
+    };
+
+    struct ComponentTypeValue
+    {
+        AZ::Uuid m_uuid;
+        int m_globalVal;
+    };
+
+    // Spacing is appropriate and matches the outliner concept work from the UI team.
+    static const int s_OutlinerSpacing = 5;
+
+    static bool s_paintingName;
+
+    OutlinerListModel(QObject* parent = nullptr);
+    ~OutlinerListModel();
+
+    void Initialize();
+
+    // Qt overrides.
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex&) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
+    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex& index) const override;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
+    Qt::DropActions supportedDropActions() const override;
+    Qt::DropActions supportedDragActions() const override;
+    bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
+    bool canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const override;
+
+    QMimeData* mimeData(const QModelIndexList& indexes) const override;
+    QStringList mimeTypes() const override;
+
+    QString GetSliceAssetName(const AZ::EntityId& entityId) const;
+
+    QModelIndex GetIndexFromEntity(const AZ::EntityId& entityId, int column = 0) const;
+    AZ::EntityId GetEntityFromIndex(const QModelIndex& index) const;
+
+    bool FilterEntity(const AZ::EntityId& entityId);
+
+    void EnableAutoExpand(bool enable);
+
+    AZStd::string GetFilterString() const
+    {
+        return m_filterString;
+    }
+
+    static int GetLayerStripeWidth()
+    {
+        return 1;
+    }
+
+    void SetSortMode(EntityOutliner::DisplaySortMode sortMode) { m_sortMode = sortMode; }
+    void SetDropOperationInProgress(bool inProgress);
+Q_SIGNALS:
+    void ExpandEntity(const AZ::EntityId& entityId, bool expand);
+    void SelectEntity(const AZ::EntityId& entityId, bool select);
+    void EnableSelectionUpdates(bool enable);
+    void ResetFilter();
+    void ReapplyFilter();
+
+    public Q_SLOTS:
+    void SearchStringChanged(const AZStd::string& filter);
+    void SearchFilterChanged(const AZStd::vector<ComponentTypeValue>& componentFilters);
+    void OnEntityExpanded(const AZ::EntityId& entityId);
+    void OnEntityCollapsed(const AZ::EntityId& entityId);
+
+    // Buffer Processing Slots - These are called using single-shot events when the buffers begin to fill.
+    bool CanReparentEntities(const AZ::EntityId& newParentId, const AzToolsFramework::EntityIdList& selectedEntityIds) const;
+    bool ReparentEntities(const AZ::EntityId& newParentId, const AzToolsFramework::EntityIdList& selectedEntityIds, const AZ::EntityId& beforeEntityId = AZ::EntityId());
+
+    //! Use the current filter setting and re-evaluate the filter.
+    void InvalidateFilter();
+
+protected:
+
+    //! Editor entity context notification bus
+    void OnEditorEntityDuplicated(const AZ::EntityId& oldEntity, const AZ::EntityId& newEntity) override;
+    void OnContextReset() override;
+    void OnStartPlayInEditorBegin() override;
+    void OnStartPlayInEditor() override;
+
+    bool m_beginStartPlayInEditor = false;
+
+    void QueueEntityUpdate(AZ::EntityId entityId);
+    void QueueAncestorUpdate(AZ::EntityId entityId);
+    void QueueEntityToExpand(AZ::EntityId entityId, bool expand);
+    void ProcessEntityUpdates();
+    void ProcessEntityInfoResetEnd();
+    AZStd::unordered_set<AZ::EntityId> m_entitySelectQueue;
+    AZStd::unordered_set<AZ::EntityId> m_entityExpandQueue;
+    AZStd::unordered_set<AZ::EntityId> m_entityChangeQueue;
+    bool m_entityChangeQueued;
+    bool m_entityLayoutQueued;
+    bool m_dropOperationInProgress = false;
+
+    bool m_autoExpandEnabled = true;
+    bool m_layoutResetQueued = false;
+
+    AZStd::string m_filterString;
+    AZStd::vector<ComponentTypeValue> m_componentFilters;
+    bool m_isFilterDirty = true;
+
+    void OnEntityCompositionChanged(const AzToolsFramework::EntityIdList& entityIds) override;
+
+    void OnEntityInitialized(const AZ::EntityId& entityId) override;
+    void AfterEntitySelectionChanged(const AzToolsFramework::EntityIdList&, const AzToolsFramework::EntityIdList&) override;
+
+    //! AzToolsFramework::EditorEntityInfoNotificationBus::Handler
+    //! Get notifications when the EditorEntityInfo changes so we can update our model
+    void OnEntityInfoResetBegin() override;
+    void OnEntityInfoResetEnd() override;
+    void OnEntityInfoUpdatedAddChildBegin(AZ::EntityId parentId, AZ::EntityId childId) override;
+    void OnEntityInfoUpdatedAddChildEnd(AZ::EntityId parentId, AZ::EntityId childId) override;
+    void OnEntityInfoUpdatedRemoveChildBegin(AZ::EntityId parentId, AZ::EntityId childId) override;
+    void OnEntityInfoUpdatedRemoveChildEnd(AZ::EntityId parentId, AZ::EntityId childId) override;
+    void OnEntityInfoUpdatedOrderBegin(AZ::EntityId parentId, AZ::EntityId childId, AZ::u64 index) override;
+    void OnEntityInfoUpdatedOrderEnd(AZ::EntityId parentId, AZ::EntityId childId, AZ::u64 index) override;
+    void OnEntityInfoUpdatedSelection(AZ::EntityId entityId, bool selected) override;
+    void OnEntityInfoUpdatedLocked(AZ::EntityId entityId, bool locked) override;
+    void OnEntityInfoUpdatedVisibility(AZ::EntityId entityId, bool visible) override;
+    void OnEntityInfoUpdatedName(AZ::EntityId entityId, const AZStd::string& name) override;
+    void OnEntityInfoUpdateSliceOwnership(AZ::EntityId entityId) override;
+    void OnEntityInfoUpdatedUnsavedChanges(AZ::EntityId entityId) override;
+
+    // AzToolsFramework::EditorEntityRuntimeActivationChangeNotificationBus::Handler
+    void OnEntityRuntimeActivationChanged(AZ::EntityId entityId, bool activeOnStart) override;
+
+    // Drag/Drop of components from Component Palette.
+    bool dropMimeDataComponentPalette(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
+
+    // Drag/Drop of entities.
+    bool canDropMimeDataForEntityIds(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const;
+    bool dropMimeDataEntities(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
+
+    // Drag/Drop of assets from asset browser.
+    using ComponentAssetPair = AZStd::pair<AZ::TypeId, AZ::Data::AssetId>;
+    using ComponentAssetPairs = AZStd::vector<ComponentAssetPair>;
+    using SliceAssetList = AZStd::vector<AZ::Data::AssetId>;
+    void DecodeAssetMimeData(const QMimeData* data, ComponentAssetPairs& componentAssetPairs, SliceAssetList& sliceAssets) const;
+    bool DropMimeDataAssets(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
+    bool CanDropMimeDataAssets(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const;
+
+    QMap<int, QVariant> itemData(const QModelIndex &index) const;
+    QVariant dataForAll(const QModelIndex& index, int role) const;
+    QVariant dataForName(const QModelIndex& index, int role) const;
+    QVariant dataForVisibility(const QModelIndex& index, int role) const;
+    QVariant dataForLock(const QModelIndex& index, int role) const;
+    QVariant dataForSortIndex(const QModelIndex& index, int role) const;
+
+    //! Request a hierarchy expansion
+    void ExpandAncestors(const AZ::EntityId& entityId);
+    bool IsExpanded(const AZ::EntityId& entityId) const;
+    AZStd::unordered_map<AZ::EntityId, bool> m_entityExpansionState;
+
+    void RestoreDescendantExpansion(const AZ::EntityId& entityId);
+    void RestoreDescendantSelection(const AZ::EntityId& entityId);
+
+    bool IsFiltered(const AZ::EntityId& entityId) const;
+    AZStd::unordered_map<AZ::EntityId, bool> m_entityFilteredState;
+
+    bool HasSelectedDescendant(const AZ::EntityId& entityId) const;
+
+    bool AreAllDescendantsSameLockState(const AZ::EntityId& entityId) const;
+    bool AreAllDescendantsSameVisibleState(const AZ::EntityId& entityId) const;
+
+    enum LayerProperty
+    {
+        Locked,
+        Invisible
+    };
+    bool IsInLayerWithProperty(AZ::EntityId entityId, const LayerProperty& layerProperty) const;
+
+    // These are needed until we completely disassociated selection control from the outliner state to
+    // keep track of selection state before/during/after filtering and searching
+    AzToolsFramework::EntityIdList m_unfilteredSelectionEntityIds;
+    void CacheSelectionIfAppropriate();
+    void RestoreSelectionIfAppropriate();
+    bool ShouldOverrideUnfilteredSelection();
+
+    EntityOutliner::DisplaySortMode m_sortMode;
+
+private:
+    QVariant GetEntityIcon(const AZ::EntityId& id) const;
+    QVariant GetEntityTooltip(const AZ::EntityId& id) const;
+
+    const char* circleIconColor = "#ff7b00";
+    const int circleIconDiameter = 5;
+    const int maskDiameter = 8;
+};
+
+class OutlinerCheckBox : public QCheckBox
+{
+   Q_OBJECT
+
+public:
+    explicit OutlinerCheckBox(QWidget* parent = nullptr);
+
+    void draw(QPainter* painter);
+
+private:
+    const int m_toggleColumnWidth = 16;
+};
+
+/*!
+* OutlinerItemDelegate exists to render custom item-types.
+* Other item-types render in the default fashion.
+*/
+class OutlinerItemDelegate
+    : public QStyledItemDelegate
+{
+public:
+    AZ_CLASS_ALLOCATOR(OutlinerItemDelegate, AZ::SystemAllocator, 0);
+
+    OutlinerItemDelegate(QWidget* parent = nullptr);
+
+    // Qt overrides
+    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+
+protected:
+    bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index) override;
+
+private:
+    // The layer stripe is a continuous line from the layer's color box to the last entity in the layer.
+    // Two layer stripes are drawn, one in the color of the layer and other in the border box color.
+    void DrawLayerStripeAndBorder(QPainter* painter, int stripeX, int top, int bottom, QColor layerBorderColor, QColor layerColor) const;
+
+    // Draws all UI related to layers for the current row.
+    void DrawLayerUI(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, const AZ::EntityId& entityId,
+        bool isSelected, bool isHovered) const;
+
+    // Layers with unsaved changes, and layers with errors, have additional text added to their strings.
+    QString GetLayerInfoString(const AZ::EntityId& entityId) const;
+
+    // Entity names are offset vertically if they are in a layer, and generally to better line up with icons.
+    int GetEntityNameVerticalOffset(const AZ::EntityId& entityId) const;
+
+    struct CheckboxGroup
+    {
+        OutlinerCheckBox m_default;
+        OutlinerCheckBox m_mixed;
+        OutlinerCheckBox m_layerOverride;
+
+        OutlinerCheckBox m_defaultHover;
+        OutlinerCheckBox m_mixedHover;
+        OutlinerCheckBox m_layerOverrideHover;
+
+        CheckboxGroup(QWidget* parent, AZStd::string prefix, OutlinerListModel::Roles mixed, OutlinerListModel::Roles layer);
+        OutlinerCheckBox* SelectCheckboxToRender(const QModelIndex& index, bool isHovered);
+
+    private:
+        OutlinerListModel::Roles m_mixedRole;
+        OutlinerListModel::Roles m_layerRole;
+    };
+
+    // Mutability added because these are being used ONLY as renderers
+    // for custom check boxes. The decision of whether or not to draw
+    // them checked is tracked by the individual entities and items in
+    // the hierarchy cache.
+    mutable CheckboxGroup m_visibilityCheckBoxes;
+    mutable CheckboxGroup m_lockCheckBoxes;
+
+    const int m_layerDividerLineHeight = 1;
+    const int m_lastEntityInLayerDividerLineHeight = 1;
+    const int m_toggleColumnWidth = 16;
+
+    // this is a cache, and is hence mutable
+    mutable QRect m_cachedBoundingRectOfTallCharacter;
+
+    struct OutlinerListModelColorConfig
+    {
+        QColor outlinerSelectionColor = QColor(255, 255, 255, 45);
+        QColor outlinerHoverColor = QColor(255, 255, 255, 30);
+        QColor layerBGColor = "#2F2F2F";
+        QColor layerChildBGColor = "#333333";
+        QColor layerBorderTopColor = "#515151";
+        QColor layerBorderBottomColor = "#252525";
+        QColor selectedLayerBGColor = "#676767"; 
+        QColor hoveredLayerBGColor = "#4B4B4B";
+        QColor sliceRootBackgroundColor = "#1E252F";
+        QColor sliceRootBorderColor = "#1E252F";
+        QColor selectedSliceRootBackgroundColor = "#47487B";
+        QColor selectedSliceRootBorderColor = "#2F306D";
+        QColor sliceEntityColor = "#4285F4";
+        QColor sliceOverrideColor = "#FF7B00";
+        int visibilityColumnWidth = 20;
+        int lockColumnWidth = 20;
+    };
+
+    OutlinerListModelColorConfig m_outlinerConfig;
+};
+
+Q_DECLARE_METATYPE(AZ::ComponentTypeList); // allows type to be stored by QVariable
+
+#endif
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.cpp
new file mode 100644
index 0000000000..b76f0826b2
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.cpp
@@ -0,0 +1,228 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "OutlinerSearchWidget.h"
+
+#include <AzQtComponents/Components/FlowLayout.h>
+#include <AzQtComponents/Components/StyleManager.h>
+#include <QLabel>
+#include <QTreeView>
+#include <QTextDocument>
+#include <QPainter>
+#include <QToolButton>
+
+namespace AzQtComponents
+{
+    OutlinerIcons::OutlinerIcons()
+    {
+        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Unlocked)] = QIcon(QString(":Icons/unlocked.svg"));
+        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Locked)] = QIcon(QString(":Icons/locked.svg"));
+        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Visible)] = QIcon(QString(":Icons/visb.svg"));
+        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Hidden)] = QIcon(QString(":Icons/visb_hidden.svg"));
+        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Separator)] = QIcon();
+    }
+
+    OutlinerSearchTypeSelector::OutlinerSearchTypeSelector(QWidget* parent)
+        : SearchTypeSelector(parent)
+    {
+    }
+
+    bool OutlinerSearchTypeSelector::filterItemOut(const QModelIndex& sourceIndex, bool filteredByBase)
+    {
+        auto* currItem = m_model->itemFromIndex(sourceIndex);
+        if (currItem != nullptr)
+        {
+            int unfilteredIndex = getUnfilteredDataIndex(currItem);
+            if (unfilteredIndex >= 0 && unfilteredIndex < aznumeric_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter))
+            {
+                // never filter out the categories before FirstRealFilter (unlocked/locked, visible/hidden, etc.)
+                return false;
+            }
+        }
+        // no special case, return the result of the base filter
+        return filteredByBase;
+    }
+
+    void OutlinerSearchTypeSelector::initItem(QStandardItem* item, const SearchTypeFilter& filter, int unfilteredDataIndex)
+    {
+        SearchTypeSelector::initItem(item, filter, unfilteredDataIndex);
+        if (filter.displayName == "--------")
+        {
+            item->setCheckable(false);
+        }
+
+        if (unfilteredDataIndex >= 0 && unfilteredDataIndex < static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter))
+        {
+            item->setIcon(OutlinerIcons::GetInstance().GetIcon(unfilteredDataIndex));
+        }
+    }
+
+    int OutlinerSearchTypeSelector::GetNumFixedItems()
+    {
+        return static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter);
+    }
+
+    OutlinerCriteriaButton::OutlinerCriteriaButton(QString labelText, QWidget* parent, int index)
+        : FilterCriteriaButton(labelText, parent)
+    {
+        if (index >= 0 && index < static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter))
+        {
+            QLabel* icon = new QLabel(this);
+            icon->setStyleSheet(m_tagLabel->styleSheet() + "border: 0px; background-color: transparent;");
+            icon->setPixmap(OutlinerIcons::GetInstance().GetIcon(index).pixmap(10, 10));
+            m_frameLayout->insertWidget(0, icon);
+        }
+    }
+
+    OutlinerSearchWidget::OutlinerSearchWidget(QWidget* parent)
+        : FilteredSearchWidget(parent, true)
+    {
+        SetupOwnSelector(new OutlinerSearchTypeSelector(assetTypeSelectorButton()));
+
+        const SearchTypeFilterList globalMenu{
+            {"Global Settings", "Unlocked"},
+            {"Global Settings", "Locked"},
+            {"Global Settings", "Visible"},
+            {"Global Settings", "Hidden"},
+            {"Global Settings", "--------"}
+        };
+        int value = 0;
+        for (const SearchTypeFilter& filter : globalMenu)
+        {
+            AddTypeFilter(filter.category, filter.displayName, QVariant::fromValue<AZ::Uuid>(AZ::Uuid::Create()), value);
+            ++value;
+        }
+    }
+
+    OutlinerSearchWidget::~OutlinerSearchWidget()
+    {
+        delete m_delegate;
+        m_delegate = nullptr;
+
+        delete m_selector;
+        m_selector = nullptr;
+    }
+
+    void OutlinerSearchWidget::SetupPaintDelegates()
+    {
+        m_delegate = new OutlinerSearchItemDelegate(m_selector->GetTree());
+        m_selector->GetTree()->setItemDelegate(m_delegate);
+        m_delegate->SetSelector(m_selector);
+    }
+
+    FilterCriteriaButton* OutlinerSearchWidget::createCriteriaButton(const SearchTypeFilter& filter, int filterIndex)
+    {
+        return new OutlinerCriteriaButton(filter.displayName, this, filterIndex);
+    }
+
+    OutlinerSearchItemDelegate::OutlinerSearchItemDelegate(QWidget* parent) : QStyledItemDelegate(parent)
+    {
+    }
+
+    void OutlinerSearchItemDelegate::PaintRichText(QPainter* painter, QStyleOptionViewItem& opt, QString& text) const
+    {
+        int textDocDrawYOffset = 3;
+        QPoint paintertextDocRenderOffset = QPoint(-2, -1);
+
+        QTextDocument textDoc;
+        textDoc.setDefaultFont(opt.font);
+        opt.palette.color(QPalette::Text);
+        textDoc.setDefaultStyleSheet("body {color: " + opt.palette.color(QPalette::Text).name() + "}");
+        textDoc.setHtml("<body>" + text + "</body>");
+        QRect textRect = opt.widget->style()->proxy()->subElementRect(QStyle::SE_ItemViewItemText, &opt);
+        painter->translate(textRect.topLeft() - paintertextDocRenderOffset);
+        textDoc.setTextWidth(textRect.width());
+        textDoc.drawContents(painter, QRectF(0, textDocDrawYOffset, textRect.width(), textRect.height() + textDocDrawYOffset));
+    }
+
+    void OutlinerSearchItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
+                                           const QModelIndex& index) const
+    {
+        bool isGlobalOption = false;
+        painter->save();
+
+        QStyleOptionViewItem opt = option;
+        initStyleOption(&opt, index);
+
+        const QWidget* widget = option.widget;
+        QStyle* style = widget ? widget->style() : QApplication::style();
+        if (!opt.icon.isNull())
+        {
+            // Draw the icon if there is one.
+            QRect r = style->subElementRect(QStyle::SubElement::SE_ItemViewItemDecoration, &opt, widget);
+            r.setX(-r.width());
+
+            QIcon::Mode mode = QIcon::Normal;
+            QIcon::State state = QIcon::On;
+            opt.icon.paint(painter, r, opt.decorationAlignment, mode, state);
+
+            opt.icon = QIcon();
+            opt.decorationSize = QSize(0, 0);
+            isGlobalOption = true;
+        }
+
+        // Handle the separator
+        if (opt.text.contains("-------"))
+        {
+            // Draw this item as a solid line.
+            painter->setPen(QColor(FilteredSearchWidget::GetSeparatorColor()));
+            painter->drawLine(0, opt.rect.center().y() + 3, opt.rect.right(), opt.rect.center().y() + 4);
+        }
+        else
+        {
+            if (m_selector->GetFilterString().length() > 0 && !isGlobalOption && opt.features & QStyleOptionViewItem::ViewItemFeature::HasCheckIndicator)
+            {
+                // Create rich text menu text to show filterstring
+                QString label{ opt.text };
+                opt.text = "";
+
+                style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget);
+
+                int highlightTextIndex = 0;
+                do
+                {
+                    // Find filter term within the text.
+                    highlightTextIndex = label.lastIndexOf(m_selector->GetFilterString(), highlightTextIndex - 1, Qt::CaseInsensitive);
+                    if (highlightTextIndex >= 0)
+                    {
+                        // Insert background-color terminator at appropriate place to return to normal text.
+                        label.insert(highlightTextIndex + m_selector->GetFilterString().length(), "</span>");
+                        // Insert background-color command at appropriate place to highlight filter term.
+                        label.insert(highlightTextIndex, "<span style=\"background-color: " + FilteredSearchWidget::GetBackgroundColor() + "\">");
+                    }
+                } while (highlightTextIndex > 0);// Repeat in case there are multiple occurrences.
+                PaintRichText(painter, opt, label);  
+            }
+            else
+            {          
+                // There's no filter to apply, just draw it.
+                QString label = opt.text;
+                opt.text = "";
+                style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget);
+                PaintRichText(painter, opt, label);
+            }
+        }
+
+        painter->restore();
+    }
+
+    QSize OutlinerSearchItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
+    {
+        QStyleOptionViewItem opt = option;
+        initStyleOption(&opt, index);
+
+        if (opt.text.contains("-------"))
+        {
+            return QSize(0, 6);
+        }
+        return QStyledItemDelegate::sizeHint(option, index);
+    }
+
+}
+
+#include <UI/Outliner/moc_OutlinerSearchWidget.cpp>
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.h
new file mode 100644
index 0000000000..6b95068af5
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.h
@@ -0,0 +1,113 @@
+/*
+ * 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 <AzQtComponents/AzQtComponentsAPI.h>
+
+#include <AzQtComponents/Components/FilteredSearchWidget.h>
+
+#include <QStyledItemDelegate>
+#include <QStandardItem>
+#endif
+
+#if !defined(DEFINED_QMETATYPE_UUID)
+#define DEFINED_QMETATYPE_UUID
+
+Q_DECLARE_METATYPE(AZ::Uuid);
+#endif
+
+namespace Ui
+{
+    class OutlinerSearchWidget;
+}
+
+namespace AzQtComponents
+{
+    class OutlinerSearchItemDelegate;
+
+    class OutlinerSearchTypeSelector
+        : public SearchTypeSelector
+    {
+    public:
+        OutlinerSearchTypeSelector(QWidget* parent = nullptr);
+
+    protected:
+        // override the logic of accepting filter categories
+        bool filterItemOut(const QModelIndex& sourceIndex, bool filteredByBase) override;
+        void initItem(QStandardItem* item, const SearchTypeFilter& filter, int unfilteredDataIndex) override;
+        int GetNumFixedItems() override;
+    };
+
+    class OutlinerCriteriaButton
+        : public FilterCriteriaButton
+    {
+        Q_OBJECT
+
+    public:
+        explicit OutlinerCriteriaButton(QString labelText, QWidget* parent = nullptr, int index = -1);
+   };
+
+    class OutlinerSearchWidget
+        : public FilteredSearchWidget
+    {
+        Q_OBJECT
+    public:
+        explicit OutlinerSearchWidget(QWidget* parent = nullptr);
+        ~OutlinerSearchWidget() override;
+
+        FilterCriteriaButton* createCriteriaButton(const SearchTypeFilter& filter, int filterIndex) override;
+
+        enum class GlobalSearchCriteria : int
+        {
+            Unlocked,
+            Locked,
+            Visible,
+            Hidden,
+            Separator,
+            FirstRealFilter
+        };
+    protected:
+        void SetupPaintDelegates() override;
+    private:
+        OutlinerSearchItemDelegate* m_delegate = nullptr;
+    };
+
+    class OutlinerIcons
+    {
+    public:
+        static OutlinerIcons& GetInstance()
+        {
+            static OutlinerIcons instance;
+            return instance;
+        }
+        OutlinerIcons(OutlinerIcons const &) = delete;
+        void operator=(OutlinerIcons const &) = delete;
+
+        QIcon& GetIcon(int iconWanted) { return m_globalIcons[iconWanted]; }
+    private:
+        OutlinerIcons();
+
+        QIcon m_globalIcons[static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter)];
+    };
+
+    class OutlinerSearchItemDelegate : public QStyledItemDelegate
+    {
+    public:
+        explicit OutlinerSearchItemDelegate(QWidget* parent = nullptr);
+
+        void PaintRichText(QPainter* painter, QStyleOptionViewItem& opt, QString& text) const;
+        void SetSelector(SearchTypeSelector* selector) { m_selector = selector; }
+
+        // QStyleItemDelegate overrides.
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+
+    private:
+        SearchTypeSelector* m_selector = nullptr;
+    };
+}
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.cpp
new file mode 100644
index 0000000000..660ea137cf
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.cpp
@@ -0,0 +1,45 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "OutlinerSortFilterProxyModel.hxx"
+
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/Component/Entity.h>
+
+#include "OutlinerListModel.hxx"
+
+OutlinerSortFilterProxyModel::OutlinerSortFilterProxyModel(QObject* pParent)
+    : QSortFilterProxyModel(pParent)
+{
+}
+
+void OutlinerSortFilterProxyModel::UpdateFilter()
+{
+    invalidateFilter();
+}
+
+bool OutlinerSortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
+{
+    QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
+    QVariant visibilityData = sourceModel()->data(index, OutlinerListModel::VisibilityRole);
+    return visibilityData.isValid() ? visibilityData.toBool() : true;
+}
+
+bool OutlinerSortFilterProxyModel::lessThan(const QModelIndex& leftIndex, const QModelIndex& rightIndex) const
+{
+    return sourceModel()->data(leftIndex).toString() < sourceModel()->data(rightIndex).toString();
+}
+
+void OutlinerSortFilterProxyModel::sort(int /*column*/, Qt::SortOrder /*order*/)
+{
+    // override any attempts to change sort
+    QSortFilterProxyModel::sort(OutlinerListModel::ColumnSortIndex, Qt::SortOrder::AscendingOrder);
+}
+
+#include <UI/Outliner/moc_OutlinerSortFilterProxyModel.cpp>
+
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.hxx b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.hxx
new file mode 100644
index 0000000000..bf5d95bebe
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.hxx
@@ -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
+ *
+ */
+
+#ifndef OUTLINER_SORT_FILTER_PROXY_MODEL_H
+#define OUTLINER_SORT_FILTER_PROXY_MODEL_H
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/base.h>
+#include <QtCore/QSortFilterProxyModel>
+#include <AzCore/Memory/SystemAllocator.h>
+#endif
+
+#pragma once
+
+/*!
+    * Enables the Outliner to filter entries based on search string.
+    * Enables the Outliner to do custom sorting on entries.
+    */
+class OutlinerSortFilterProxyModel
+    : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    AZ_CLASS_ALLOCATOR(OutlinerSortFilterProxyModel, AZ::SystemAllocator, 0);
+
+    OutlinerSortFilterProxyModel(QObject* pParent = nullptr);
+
+    void UpdateFilter();
+
+    // Qt overrides
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
+    bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
+    void sort(int column, Qt::SortOrder order) override;
+
+private:
+    QString m_filterName;
+};
+
+#endif
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.cpp
new file mode 100644
index 0000000000..9df6f4eac0
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.cpp
@@ -0,0 +1,430 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#include "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "OutlinerTreeView.hxx"
+#include "OutlinerListModel.hxx"
+
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/std/sort.h>
+#include <AzCore/std/algorithm.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzQtComponents/Components/Style.h>
+
+#include <QDrag>
+#include <QPainter>
+#include <QHeaderView>
+
+OutlinerTreeView::OutlinerTreeView(QWidget* pParent)
+    : QTreeView(pParent)
+    , m_queuedMouseEvent(nullptr)
+    , m_draggingUnselectedItem(false)
+{
+    setUniformRowHeights(true);
+    setHeaderHidden(true);
+}
+
+OutlinerTreeView::~OutlinerTreeView()
+{
+    ClearQueuedMouseEvent();
+}
+
+void OutlinerTreeView::setAutoExpandDelay(int delay)
+{
+    m_expandOnlyDelay = delay;
+}
+
+void OutlinerTreeView::ClearQueuedMouseEvent()
+{
+    if (m_queuedMouseEvent)
+    {
+        delete m_queuedMouseEvent;
+        m_queuedMouseEvent = nullptr;
+    }
+}
+
+void OutlinerTreeView::mousePressEvent(QMouseEvent* event)
+{
+    //postponing normal mouse pressed logic until mouse is released or dragged
+    //this means selection occurs on mouse released now
+    //this is to support drag/drop of non-selected items
+    ClearQueuedMouseEvent();
+    m_queuedMouseEvent = new QMouseEvent(*event);
+}
+
+void OutlinerTreeView::mouseReleaseEvent(QMouseEvent* event)
+{
+    if (m_queuedMouseEvent && !m_draggingUnselectedItem)
+    {
+        // mouseMoveEvent will set the state to be DraggingState, which will make Qt ignore 
+        // mousePressEvent in QTreeViewPrivate::expandOrCollapseItemAtPos. So we manually 
+        // and temporarily set it to EditingState.
+        QAbstractItemView::State stateBefore = QAbstractItemView::state();
+        QAbstractItemView::setState(QAbstractItemView::State::EditingState);
+
+        //treat this as a mouse pressed event to process selection etc
+        processQueuedMousePressedEvent(m_queuedMouseEvent);
+
+        QAbstractItemView::setState(stateBefore);
+    }
+
+    ClearQueuedMouseEvent();
+    m_draggingUnselectedItem = false;
+
+    QTreeView::mouseReleaseEvent(event);
+}
+
+void OutlinerTreeView::mouseDoubleClickEvent(QMouseEvent* event)
+{
+    //cancel pending mouse press
+    ClearQueuedMouseEvent();
+    QTreeView::mouseDoubleClickEvent(event);
+}
+
+void OutlinerTreeView::mouseMoveEvent(QMouseEvent* event)
+{
+    // Store selection mode
+    QAbstractItemView::SelectionMode selectionModeBefore = selectionMode();
+
+    // Disable selection for the pending click so selection is maintained for dragging
+    setSelectionMode(QAbstractItemView::NoSelection);
+
+    // If a mouse event is queued, treat this as a mouse pressed event to process everything
+    // but selection, but use the position data from the mousePress message
+    if (m_queuedMouseEvent)
+    {
+        processQueuedMousePressedEvent(m_queuedMouseEvent);
+    }
+
+    // Process mouse movement as normal, potentially triggering drag and drop
+    QTreeView::mouseMoveEvent(event);
+
+    // Restore selection state
+    setSelectionMode(selectionModeBefore);
+}
+
+void OutlinerTreeView::focusInEvent(QFocusEvent* event)
+{
+    //cancel pending mouse press
+    ClearQueuedMouseEvent();
+    QTreeView::focusInEvent(event);
+}
+
+void OutlinerTreeView::focusOutEvent(QFocusEvent* event)
+{
+    //cancel pending mouse press
+    ClearQueuedMouseEvent();
+    QTreeView::focusOutEvent(event);
+}
+
+void OutlinerTreeView::startDrag(Qt::DropActions supportedActions)
+{
+    //if we are attempting to drag an unselected item then we must special case drag and drop logic
+    //QAbstractItemView::startDrag only supports selected items
+    if (m_queuedMouseEvent)
+    {
+        QModelIndex index = indexAt(m_queuedMouseEvent->pos());
+        if (!index.isValid() || index.column() != 0)
+        {
+            return;
+        }
+
+        if (!selectionModel()->isSelected(index))
+        {
+            startCustomDrag({ index }, supportedActions);
+            return;
+        }
+    }
+
+    if (!selectionModel()->selectedIndexes().empty())
+    {
+        startCustomDrag(selectionModel()->selectedIndexes(), supportedActions);
+        return;
+    }
+}
+
+void OutlinerTreeView::dragMoveEvent(QDragMoveEvent* event)
+{
+    if (m_expandOnlyDelay >= 0)
+    {
+        m_expandTimer.start(m_expandOnlyDelay, this);
+    }
+
+    QTreeView::dragMoveEvent(event);
+}
+
+void OutlinerTreeView::dropEvent(QDropEvent* event)
+{
+    emit ItemDropped();
+    QTreeView::dropEvent(event);
+
+    m_draggingUnselectedItem = false;
+}
+
+QColor OutlinerTreeView::GetHierarchyLineColor(bool isSliceEntity, bool isSelected) const
+{
+    if (isSliceEntity)
+    {
+        if (isSelected)
+        {
+            return m_colorConfig.hierarchyLinesSlicesSelected;
+        }
+        else
+        {
+            return m_colorConfig.hierarchyLinesSlices;
+        }
+    }
+    else
+    {
+        if (isSelected)
+        {
+            return m_colorConfig.hierarchyLinesNonSliceEntitiesSelected;
+        }
+        else
+        {
+            return m_colorConfig.hierarchyLinesNonSliceEntities;
+        }
+    }
+}
+
+void OutlinerTreeView::DrawLayerUI(QPainter* painter, const QRect& rect, const QModelIndex& index) const
+{
+    bool isSelected = selectionModel()->isSelected(index);
+
+    QColor layerBranchesBGColor = isSelected ? m_colorConfig.layerChildBGSelectionColor : m_colorConfig.layerChildBackgroundColor;
+
+    painter->save();
+    painter->setRenderHint(QPainter::RenderHint::Antialiasing, false);
+
+    bool hasLayerAncestor = false;
+    for (QModelIndex ancestorIndex = index.parent(); ancestorIndex.isValid(); ancestorIndex = ancestorIndex.parent())
+    {
+        auto ancestorType = OutlinerListModel::EntryType(ancestorIndex.data(OutlinerListModel::EntityTypeRole).value<int>());
+        if (ancestorType == OutlinerListModel::LayerType)
+        {
+            hasLayerAncestor = true;
+            break;
+        }
+    }
+
+    if (hasLayerAncestor)
+    {
+        QPainterPath layerBGPath;
+        QRect layerBGRect(rect);
+        layerBGRect.setLeft(layerBGRect.left() + indentation());
+        layerBGPath.addRect(layerBGRect);
+        painter->fillPath(layerBGPath, layerBranchesBGColor);
+    }
+
+    OutlinerListModel::EntryType indexEntryType = OutlinerListModel::EntryType(index.data(OutlinerListModel::EntityTypeRole).value<int>());
+    if (indexEntryType == OutlinerListModel::LayerType)
+    {
+        QColor layerColor = index.data(OutlinerListModel::LayerColorRole).value<QColor>();
+        QPainterPath layerIconPath;
+        const int layerSquareSize = GetLayerSquareSize();
+        QPoint layerBoxOffset(1 + OutlinerListModel::GetLayerStripeWidth()*2, (rect.height() - layerSquareSize) / 2);
+        QRect layerIconRect(rect.topRight() + layerBoxOffset, QSize(layerSquareSize, layerSquareSize));
+        layerIconPath.addRect(layerIconRect);
+        painter->fillPath(layerIconPath, layerColor);
+    }
+
+    painter->restore();
+}
+
+void OutlinerTreeView::drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const
+{
+    DrawLayerUI(painter, rect, index);
+
+    // Make sure the base class is called after the layer rect is drawn,
+    // so that the foldout arrow draws on top of the layer color.
+    QTreeView::drawBranches(painter, rect, index);
+
+    // No need to draw connecting lines if this has no parent.
+    if (!index.parent().isValid())
+    {
+        return;
+    }
+
+    QPen branchLinePen;
+    branchLinePen.setWidthF(m_branchLineWidth);
+
+    int lineBaseX = rect.right();
+    QModelIndex previousIndex = index;
+    for (QModelIndex ancestorIndex = index.parent(); ancestorIndex.isValid(); ancestorIndex = ancestorIndex.parent())
+    {
+        auto ancestorType = OutlinerListModel::EntryType(ancestorIndex.data(OutlinerListModel::EntityTypeRole).value<int>());
+        bool isSliceEntity = ancestorType == OutlinerListModel::SliceEntityType || ancestorType == OutlinerListModel::SliceHandleType;
+        bool isSelected = selectionModel()->isSelected(index);
+        branchLinePen.setColor(GetHierarchyLineColor(isSliceEntity, isSelected));
+
+        // Layers don't have connecting lines drawn.
+        if (ancestorType == OutlinerListModel::LayerType)
+        {
+            // Layers can only have other layers as parents, so once a layer is found in a hierarchy
+            // the line drawing can stop.
+            break;
+        }
+        painter->save();
+        painter->setRenderHint(QPainter::RenderHint::Antialiasing, false);
+        painter->setPen(branchLinePen);
+        int rectHalfHeight = rect.height() / 2;
+        if (previousIndex == index)
+        {
+            // draw a horizontal line from the parent branch to the item
+            // if the item has children offset the drawn line to compensate for drawn expander buttons
+            bool hasChildren = previousIndex.model()->index(0, 0, previousIndex).isValid();
+            int horizontalLineY = rect.top() + rectHalfHeight;
+            int horizontalLineLeft = rect.right() - indentation() * 1.5f;
+            int horizontalLineRight = hasChildren ? (lineBaseX - indentation()) : (lineBaseX - indentation() * 0.5f);
+            painter->drawLine(horizontalLineLeft, horizontalLineY, horizontalLineRight, horizontalLineY);
+        }
+
+        // draw a vertical line segment connecting parent to child and child to child
+        // if this is the last item, only draw half the line to terminate the segment
+        bool hasNext = previousIndex.sibling(previousIndex.row() + 1, previousIndex.column()).isValid();
+        if (hasNext || previousIndex == index)
+        {
+            int verticalLineX = lineBaseX - indentation() * 1.5f;
+            int verticalLineTop = rect.top();
+            int verticalLineBottom = hasNext ? rect.bottom() : rect.bottom() - rectHalfHeight;
+            painter->drawLine(verticalLineX, verticalLineTop, verticalLineX, verticalLineBottom);
+        }
+
+        painter->restore();
+
+        lineBaseX -= indentation();
+        previousIndex = ancestorIndex;
+    }
+}
+
+void OutlinerTreeView::timerEvent(QTimerEvent* event)
+{
+    if (event->timerId() == m_expandTimer.timerId())
+    {
+        //duplicates functionality from QTreeView, but won't collapse an already expanded item
+        QPoint pos = this->viewport()->mapFromGlobal(QCursor::pos());
+        if (state() == QAbstractItemView::DraggingState && this->rect().contains(pos))
+        {
+            QModelIndex index = indexAt(pos);
+            if (!isExpanded(index))
+            {
+                setExpanded(index, true);
+            }
+        }
+        m_expandTimer.stop();
+    }
+
+    QTreeView::timerEvent(event);
+}
+
+void OutlinerTreeView::processQueuedMousePressedEvent(QMouseEvent* event)
+{
+    //interpret the mouse event as a button press
+    QMouseEvent mousePressedEvent(
+        QEvent::MouseButtonPress,
+        event->localPos(),
+        event->windowPos(),
+        event->screenPos(),
+        event->button(),
+        event->buttons(),
+        event->modifiers(),
+        event->source());
+    QTreeView::mousePressEvent(&mousePressedEvent);
+}
+
+void OutlinerTreeView::startCustomDrag(const QModelIndexList& indexList, Qt::DropActions supportedActions)
+{
+    m_draggingUnselectedItem = true;
+
+    //sort by container entity depth and order in hierarchy for proper drag image and drop order
+    QModelIndexList indexListSorted = indexList;
+    AZStd::unordered_map<AZ::EntityId, AZStd::list<AZ::u64>> locations;
+    for (auto index : indexListSorted)
+    {
+        AZ::EntityId entityId(index.data(OutlinerListModel::EntityIdRole).value<AZ::u64>());
+        AzToolsFramework::GetEntityLocationInHierarchy(entityId, locations[entityId]);
+    }
+    AZStd::sort(indexListSorted.begin(), indexListSorted.end(), [&locations](const QModelIndex& index1, const QModelIndex& index2) {
+        AZ::EntityId e1(index1.data(OutlinerListModel::EntityIdRole).value<AZ::u64>());
+        AZ::EntityId e2(index2.data(OutlinerListModel::EntityIdRole).value<AZ::u64>());
+        const auto& locationsE1 = locations[e1];
+        const auto& locationsE2 = locations[e2];
+        return AZStd::lexicographical_compare(locationsE1.begin(), locationsE1.end(), locationsE2.begin(), locationsE2.end());
+    });
+
+    //get the data for the unselected item(s)
+    QMimeData* mimeData = model()->mimeData(indexListSorted);
+    if (mimeData)
+    {
+        //initiate drag/drop for the item
+        QDrag* drag = new QDrag(this);
+        drag->setPixmap(QPixmap::fromImage(createDragImage(indexListSorted)));
+        drag->setMimeData(mimeData);
+        Qt::DropAction defDropAction = Qt::IgnoreAction;
+        if (defaultDropAction() != Qt::IgnoreAction && (supportedActions & defaultDropAction()))
+        {
+            defDropAction = defaultDropAction();
+        }
+        else if (supportedActions & Qt::CopyAction && dragDropMode() != QAbstractItemView::InternalMove)
+        {
+            defDropAction = Qt::CopyAction;
+        }
+        drag->exec(supportedActions, defDropAction);
+    }
+}
+
+QImage OutlinerTreeView::createDragImage(const QModelIndexList& indexList)
+{
+    //generate a drag image of the item icon and text, normally done internally, and inaccessible 
+    QRect rect(0, 0, 0, 0);
+    for (auto index : indexList)
+    {
+        if (index.column() != 0)
+        {
+            continue;
+        }
+        QRect itemRect = visualRect(index);
+        rect.setHeight(rect.height() + itemRect.height());
+        rect.setWidth(AZStd::GetMax(rect.width(), itemRect.width()));
+    }
+
+    QImage dragImage(rect.size(), QImage::Format_ARGB32_Premultiplied);
+
+    QPainter dragPainter(&dragImage);
+    dragPainter.setCompositionMode(QPainter::CompositionMode_Source);
+    dragPainter.fillRect(dragImage.rect(), Qt::transparent);
+    dragPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    dragPainter.setOpacity(0.35f);
+    dragPainter.fillRect(rect, QColor("#222222"));
+    dragPainter.setOpacity(1.0f);
+
+    int imageY = 0;
+    for (auto index : indexList)
+    {
+        if (index.column() != 0)
+        {
+            continue;
+        }
+
+        QRect itemRect = visualRect(index);
+        dragPainter.drawPixmap(QPoint(0, imageY),
+            model()->data(index, Qt::DecorationRole).value<QIcon>().pixmap(QSize(16, 16)));
+        dragPainter.setPen(
+            model()->data(index, Qt::ForegroundRole).value<QBrush>().color());
+        dragPainter.setFont(
+            font());
+        dragPainter.drawText(QRect(20, imageY, rect.width() - 20, rect.height()),
+            model()->data(index, Qt::DisplayRole).value<QString>());
+        imageY += itemRect.height();
+    }
+
+    dragPainter.end();
+    return dragImage;
+}
+
+#include <UI/Outliner/moc_OutlinerTreeView.cpp>
+
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.hxx b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.hxx
new file mode 100644
index 0000000000..cf05001184
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.hxx
@@ -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
+ *
+ */
+
+#ifndef OUTLINER_TREE_VIEW_H
+#define OUTLINER_TREE_VIEW_H
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/base.h>
+#include <AzCore/Memory/SystemAllocator.h>
+
+#include <QBasicTimer>
+#include <QEvent>
+#include <QTreeView>
+#endif
+
+#pragma once
+class QFocusEvent;
+class QMouseEvent;
+class OutlinerTreeViewModel;
+
+//! This class largely exists to emit events for the OutlinerWidget to listen in on.
+//! The logic for these events is best off not happening within the tree itself,
+//! so it can be re-used in other interfaces.
+//! The OutlinerWidget's need for these events is largely based on the concept of
+//! delaying the Editor selection from updating with mouse interaction to
+//! allow for dragging and dropping of entities from the outliner into the property editor
+//! of other entities. If the selection updates instantly, this would never be possible.
+class OutlinerTreeView
+    : public QTreeView
+{
+    Q_OBJECT;
+public:
+    AZ_CLASS_ALLOCATOR(OutlinerTreeView, AZ::SystemAllocator, 0);
+
+    OutlinerTreeView(QWidget* pParent = NULL);
+    virtual ~OutlinerTreeView();
+
+    void setAutoExpandDelay(int delay);
+
+    static int GetLayerSquareSize() { return 20; }
+Q_SIGNALS:
+    void ItemDropped();
+
+protected:
+    // Qt overrides
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void focusInEvent(QFocusEvent* event) override;
+    void focusOutEvent(QFocusEvent* event) override;
+    void startDrag(Qt::DropActions supportedActions) override;
+    void dragMoveEvent(QDragMoveEvent* event) override;
+    void dropEvent(QDropEvent* event) override;
+
+    void drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const override;
+
+    void timerEvent(QTimerEvent* event) override;
+private:
+    void ClearQueuedMouseEvent();
+
+    void processQueuedMousePressedEvent(QMouseEvent* event);
+
+    void startCustomDrag(const QModelIndexList& indexList, Qt::DropActions supportedActions);
+
+    QImage createDragImage(const QModelIndexList& indexList);
+
+    void DrawLayerUI(QPainter* painter, const QRect& rect, const QModelIndex& index) const;
+
+    QMouseEvent* m_queuedMouseEvent;
+    bool m_draggingUnselectedItem; // This is set when an item is dragged outside its bounding box.
+
+    int m_expandOnlyDelay = -1;
+    QBasicTimer m_expandTimer;
+    
+    const int m_branchLineWidth = 1;
+
+    QColor GetHierarchyLineColor(bool isSliceEntity, bool isSelected) const;
+
+    struct OutlinerTreeViewColorConfig
+    {
+        QColor hierarchyLinesSlices = "#7B7B7B";
+        QColor hierarchyLinesSlicesSelected = "#7B7B7B";
+        QColor hierarchyLinesNonSliceEntities = "transparent";
+        QColor hierarchyLinesNonSliceEntitiesSelected = "transparent";
+
+        QColor layerChildBGSelectionColor = "#464747";
+        QColor layerChildBackgroundColor = "#333333";
+    };
+
+    OutlinerTreeViewColorConfig m_colorConfig;
+};
+
+#endif
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
new file mode 100644
index 0000000000..d69480b169
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
@@ -0,0 +1,1457 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "MainWindow.h"                     // for MainWindow
+
+#include "OutlinerListModel.hxx"
+#include "OutlinerSortFilterProxyModel.hxx"
+#include "OutlinerWidget.hxx"
+#include "OutlinerDisplayOptionsMenu.h"
+#include "Objects/SelectionGroup.h"
+
+#include <AzCore/Asset/AssetManagerBus.h>
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/Component/Entity.h>
+#include <AzCore/Component/EntityUtils.h>
+#include <AzCore/Debug/Profiler.h>
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/Utils.h>
+#include <AzCore/Settings//SettingsRegistryMergeUtils.h>
+#include <AzCore/Slice/SliceComponent.h>
+#include <AzCore/std/sort.h>
+
+#include <AzQtComponents/Utilities/QtViewPaneEffects.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/Commands/SelectionCommand.h>
+#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.hxx>
+
+#include <QGraphicsOpacityEffect>
+#include <QLabel>
+#include <QToolButton>
+#include <QMenu>
+#include <QDir>
+#include <QPainter>
+#include <QApplication>
+#include <QtCore/QPropertyAnimation>
+#include <QtCore/QTimer>
+#include <QHeaderView>
+#include <QInputDialog>
+
+#include <UI/Outliner/ui_OutlinerWidget.h>
+#include <AzQtComponents/Components/StyleManager.h>
+#include <AzQtComponents/Utilities/QtPluginPaths.h>
+
+namespace
+{
+    const int queuedChangeDelay = 16; // milliseconds
+
+    using EntityIdCompareFunc = AZStd::function<bool(AZ::EntityId, AZ::EntityId)>;
+
+    bool CompareEntitiesForSorting(AZ::EntityId leftEntityId, AZ::EntityId rightEntityId, EntityOutliner::DisplaySortMode sortMode)
+    {
+        AZ::Entity* leftEntity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(leftEntity, &AZ::ComponentApplicationBus::Events::FindEntity, leftEntityId);
+        AZ_Assert(leftEntity, "Could not find entity with id %d", leftEntityId);
+        if (!leftEntity)
+        {
+            return false;
+        }
+
+        AZ::Entity* rightEntity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(rightEntity, &AZ::ComponentApplicationBus::Events::FindEntity, rightEntityId);
+        AZ_Assert(rightEntity, "Could not find entity with id %d", rightEntityId);
+        if (!rightEntity)
+        {
+            return true;
+        }
+
+        const int compareResult = azstricmp(leftEntity->GetName().c_str(), rightEntity->GetName().c_str());
+        const bool isSame = (compareResult == 0);
+
+        if (sortMode == EntityOutliner::DisplaySortMode::AtoZ)
+        {
+            return (isSame ? 
+                leftEntityId < rightEntityId : 
+                compareResult < 0);
+        }
+        else
+        {
+            return (isSame ? 
+                leftEntityId > rightEntityId : 
+                compareResult > 0);
+        }
+    }
+
+    void SortEntityChildren(AZ::EntityId entityId, const EntityIdCompareFunc& comparer, AzToolsFramework::EntityOrderArray* newEntityOrder = nullptr)
+    {
+        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+        AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(entityId);
+        AZStd::sort(entityOrderArray.begin(), entityOrderArray.end(), comparer);
+        AzToolsFramework::SetEntityChildOrder(entityId, entityOrderArray);
+
+        if (newEntityOrder)
+        {
+            *newEntityOrder = AZStd::move(entityOrderArray);
+        }
+    }
+
+    void SortEntityChildrenRecursively(AZ::EntityId entityId, const EntityIdCompareFunc& comparer)
+    {
+        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+        AzToolsFramework::EntityOrderArray entityOrderArray;
+        SortEntityChildren(entityId, comparer, &entityOrderArray);
+
+        for (const AZ::EntityId& childId : entityOrderArray)
+        {
+            SortEntityChildrenRecursively(childId, comparer);
+        }
+    }
+}
+
+OutlinerWidget::OutlinerWidget(QWidget* pParent, Qt::WindowFlags flags)
+    : QWidget(pParent, flags)
+    , m_gui(nullptr)
+    , m_listModel(nullptr)
+    , m_proxyModel(nullptr)
+    , m_selectionContextId(0)
+    , m_selectedEntityIds()
+    , m_inObjectPickMode(false)
+    , m_scrollToNewContentQueued(false)
+    , m_scrollToEntityId()
+    , m_entitiesToSelect()
+    , m_entitiesToDeselect()
+    , m_selectionChangeQueued(false)
+    , m_selectionChangeInProgress(false)
+    , m_enableSelectionUpdates(true)
+    , m_scrollToSelectedEntity(true)
+    , m_expandSelectedEntity(true)
+    , m_focusInEntityOutliner(false)
+    , m_displayOptionsMenu(new EntityOutliner::DisplayOptionsMenu(this))
+    , m_entitiesToSort()
+    , m_sortMode(EntityOutliner::DisplaySortMode::Manually)
+    , m_sortContentQueued(false)
+    , m_dropOperationInProgress(false)
+{
+    m_gui = new Ui::OutlinerWidgetUI();
+    m_gui->setupUi(this);
+
+
+    AZ::IO::FixedMaxPath engineRootPath;
+    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+    {
+        settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+    }
+    QDir rootDir = QString::fromUtf8(engineRootPath.c_str(), aznumeric_cast<int>(engineRootPath.Native().size()));
+    const auto pathOnDisk = rootDir.absoluteFilePath(QStringLiteral("Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/"));
+    const auto qrcPath = QStringLiteral(":/EntityOutliner/");
+
+    // Setting the style sheet using both methods allows faster style iteration speed for
+    // developers. The style will be loaded from a Qt Resource file if Editor is installed, but
+    // developers with the file on disk will be able to modify the style and have it automatically
+    // reloaded.
+    AzQtComponents::StyleManager::addSearchPaths("EntityOutliner", pathOnDisk, qrcPath, engineRootPath);
+    AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral("EntityOutliner:EntityOutliner.qss"));
+
+    m_listModel = aznew OutlinerListModel(this);
+    m_listModel->SetSortMode(m_sortMode);
+
+    const int autoExpandDelayMilliseconds = 2500;
+    m_gui->m_objectTree->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    m_gui->m_objectTree->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);
+    m_gui->m_objectTree->setAutoExpandDelay(autoExpandDelayMilliseconds);
+    m_gui->m_objectTree->setDragEnabled(true);
+    m_gui->m_objectTree->setDropIndicatorShown(true);
+    m_gui->m_objectTree->setAcceptDrops(true);
+    m_gui->m_objectTree->setDragDropOverwriteMode(false);
+    m_gui->m_objectTree->setDragDropMode(QAbstractItemView::DragDrop);
+    m_gui->m_objectTree->setDefaultDropAction(Qt::CopyAction);
+    m_gui->m_objectTree->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_gui->m_objectTree->setAutoScrollMargin(20);
+
+    // custom item delegate
+    m_gui->m_objectTree->setItemDelegate(aznew OutlinerItemDelegate(m_gui->m_objectTree));
+
+    m_proxyModel = aznew OutlinerSortFilterProxyModel(this);
+    m_proxyModel->setSourceModel(m_listModel);
+    m_gui->m_objectTree->setModel(m_proxyModel);
+
+    // Link up signals for informing the model of tree changes using the proxy as an intermediary
+    connect(m_gui->m_objectTree, &QTreeView::clicked, this, &OutlinerWidget::OnTreeItemClicked);
+    connect(m_gui->m_objectTree, &QTreeView::expanded, this, &OutlinerWidget::OnTreeItemExpanded);
+    connect(m_gui->m_objectTree, &QTreeView::collapsed, this, &OutlinerWidget::OnTreeItemCollapsed);
+    connect(m_gui->m_objectTree, &OutlinerTreeView::ItemDropped, this, &OutlinerWidget::OnDropEvent);
+    connect(m_listModel, &OutlinerListModel::ExpandEntity, this, &OutlinerWidget::OnExpandEntity);
+    connect(m_listModel, &OutlinerListModel::SelectEntity, this, &OutlinerWidget::OnSelectEntity);
+    connect(m_listModel, &OutlinerListModel::EnableSelectionUpdates, this, &OutlinerWidget::OnEnableSelectionUpdates);
+    connect(m_listModel, &OutlinerListModel::ResetFilter, this, &OutlinerWidget::ClearFilter);
+    connect(m_listModel, &OutlinerListModel::ReapplyFilter, this, &OutlinerWidget::InvalidateFilter);
+
+    QToolButton* display_options = new QToolButton(this);
+    display_options->setObjectName(QStringLiteral("m_display_options"));
+    display_options->setPopupMode(QToolButton::InstantPopup);
+    display_options->setAutoRaise(true);
+
+    m_gui->m_searchWidget->AddWidgetToSearchWidget(display_options);
+
+    // Set the display options menu
+    display_options->setMenu(m_displayOptionsMenu);
+    connect(m_displayOptionsMenu, &EntityOutliner::DisplayOptionsMenu::OnSortModeChanged, this, &OutlinerWidget::OnSortModeChanged);
+    connect(m_displayOptionsMenu, &EntityOutliner::DisplayOptionsMenu::OnOptionToggled, this, &OutlinerWidget::OnDisplayOptionChanged);
+
+    // Sorting is performed in a very specific way by the proxy model.
+    // Disable sort indicator so user isn't confused by the fact
+    // that they can't actually change how sorting works.
+    m_gui->m_objectTree->hideColumn(OutlinerListModel::ColumnSortIndex);
+    m_gui->m_objectTree->setSortingEnabled(true);
+    m_gui->m_objectTree->header()->setSortIndicatorShown(false);
+    m_gui->m_objectTree->header()->setStretchLastSection(false);
+
+    // resize the icon columns so that the Visibility and Lock toggle icon columns stay right-justified
+    m_gui->m_objectTree->header()->setSectionResizeMode(OutlinerListModel::ColumnName, QHeaderView::Stretch);
+    m_gui->m_objectTree->header()->setSectionResizeMode(OutlinerListModel::ColumnVisibilityToggle, QHeaderView::ResizeToContents);
+    m_gui->m_objectTree->header()->resizeSection(OutlinerListModel::ColumnLockToggle, 24);
+
+    connect(m_gui->m_objectTree->selectionModel(),
+        &QItemSelectionModel::selectionChanged,
+        this,
+        &OutlinerWidget::OnSelectionChanged);
+
+    connect(m_gui->m_searchWidget, &AzQtComponents::FilteredSearchWidget::TextFilterChanged, this, &OutlinerWidget::OnSearchTextChanged);
+    connect(m_gui->m_searchWidget, &AzQtComponents::FilteredSearchWidget::TypeFilterChanged, this, &OutlinerWidget::OnFilterChanged);
+
+    AZ::SerializeContext* serializeContext = nullptr;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+
+    if (serializeContext)
+    {
+        AzToolsFramework::ComponentPaletteUtil::ComponentDataTable componentDataTable;
+        AzToolsFramework::ComponentPaletteUtil::ComponentIconTable componentIconTable;
+        AZStd::vector<AZ::ComponentServiceType> serviceFilter;
+
+        AzToolsFramework::ComponentPaletteUtil::BuildComponentTables(serializeContext, AzToolsFramework::AppearsInGameComponentMenu, serviceFilter, componentDataTable, componentIconTable);
+
+        for (const auto& categoryPair : componentDataTable)
+        {
+            const auto& componentMap = categoryPair.second;
+            for (const auto& componentPair : componentMap)
+            {
+                m_gui->m_searchWidget->AddTypeFilter(categoryPair.first, componentPair.first, QVariant::fromValue<AZ::Uuid>(componentPair.second->m_typeId));
+            }
+        }
+    }
+
+    SetupActions();
+
+    m_emptyIcon = QIcon();
+    m_clearIcon = QIcon(":/AssetBrowser/Resources/close.png");
+
+    m_listModel->Initialize();
+
+    AzToolsFramework::EditorPickModeNotificationBus::Handler::BusConnect(AzToolsFramework::GetEntityContextId());
+    EntityHighlightMessages::Bus::Handler::BusConnect();
+    OutlinerModelNotificationBus::Handler::BusConnect();
+    ToolsApplicationEvents::Bus::Handler::BusConnect();
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
+    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
+    AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
+            AzToolsFramework::GetEntityContextId());
+    AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
+}
+
+OutlinerWidget::~OutlinerWidget()
+{
+    AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorPickModeNotificationBus::Handler::BusDisconnect();
+    EntityHighlightMessages::Bus::Handler::BusDisconnect();
+    OutlinerModelNotificationBus::Handler::BusDisconnect();
+    ToolsApplicationEvents::Bus::Handler::BusDisconnect();
+    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
+
+    delete m_listModel;
+    delete m_gui;
+}
+
+// Users should be able to drag an entity in the outliner without selecting it.
+// This is useful to allow for dragging entities into AZ::EntityId fields in the component editor.
+// There are two obvious ways to allow for this:
+//  1-Update selection behavior in the outliner's tree view to not occur until mouse release.
+//  2-Revert outliner's selection to the Editor's selection on drag actions and focus loss.
+//      Also, copy outliner's tree view selection to the Editor's selection on mouse release.
+//  Currently, the first behavior is implemented.
+void OutlinerWidget::OnSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
+{
+    if (m_selectionChangeInProgress || !m_enableSelectionUpdates)
+    {
+        return;
+    }
+
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+    AzToolsFramework::EntityIdList newlySelected;
+    ExtractEntityIdsFromSelection(selected, newlySelected);
+
+    AzToolsFramework::EntityIdList newlyDeselected;
+    ExtractEntityIdsFromSelection(deselected, newlyDeselected);
+
+    AzToolsFramework::ScopedUndoBatch undo("Select Entity");
+
+    // initialize the selection command here to store the current selection before
+    // new entities are selected or deselected below
+    // (SelectionCommand calls GetSelectedEntities in the constructor)
+    auto selectionCommand =
+        AZStd::make_unique<AzToolsFramework::SelectionCommand>(AZStd::vector<AZ::EntityId>{}, "");
+
+    // Add the newly selected and deselected entities from the outliner to the appropriate selection buffer.
+    for (const AZ::EntityId& entityId : newlySelected)
+    {
+        m_entitiesSelectedByOutliner.insert(entityId);
+    }
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::MarkEntitiesSelected, newlySelected);
+
+    for (const AZ::EntityId& entityId : newlyDeselected)
+    {
+        m_entitiesDeselectedByOutliner.insert(entityId);
+    }
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::MarkEntitiesDeselected, newlyDeselected);
+
+    // call GetSelectedEntities again after all changes, and then update the selection
+    // command  so the 'after' state is valid and up to date
+    AzToolsFramework::EntityIdList selectedEntities;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        selectedEntities, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
+
+    selectionCommand->UpdateSelection(selectedEntities);
+
+    selectionCommand->SetParent(undo.GetUndoBatch());
+    selectionCommand.release();
+
+    m_entitiesDeselectedByOutliner.clear();
+    m_entitiesSelectedByOutliner.clear();
+}
+
+void OutlinerWidget::EntityHighlightRequested(AZ::EntityId entityId)
+{
+    if (!entityId.IsValid())
+    {
+        return;
+    }
+
+    // Pulse opacity and duration are hardcoded. It'd be great to sample this from designer-provided settings,
+    // such as the globally-applied stylesheet.
+    const float pulseOpacityStart = 0.5f;
+    const int pulseLengthMilliseconds = 500;
+
+    // Highlighting an entity in the outliner is accomplished by:
+    //  1. Make sure the entity's row is actually visible.
+    //      Accomplished with the handy "scrollTo" command.
+    //  2. Create a single colored widget
+    //      accomplished through setting the style sheet with a new background color.
+    //  3. Apply an graphics opacity effect to this widget, so it can be made transparent.
+    //  4. Creating a property animation to modify the opacity value over time, deleting the widget at 0 opacity.
+    //  5. Setting this QWidget as an "index widget" to overlay over the entity row to be highlighted.
+
+    const QModelIndex proxyIndex = GetIndexFromEntityId(entityId);
+    if (!proxyIndex.isValid())
+    {
+        return;
+    }
+
+    // Scrolling to the entity will make sure that it is visible.
+    // This will automatically open parents.
+    m_gui->m_objectTree->scrollTo(proxyIndex);
+
+    QWidget* testWidget = new QWidget(m_gui->m_objectTree);
+
+    testWidget->setProperty("PulseHighlight", true);
+
+    QGraphicsOpacityEffect* effect = new QGraphicsOpacityEffect(testWidget);
+    effect->setOpacity(pulseOpacityStart);
+    testWidget->setGraphicsEffect(effect);
+
+    QPropertyAnimation* anim = new QPropertyAnimation(testWidget);
+    anim->setTargetObject(effect);
+    anim->setPropertyName("opacity");
+    anim->setDuration(pulseLengthMilliseconds);
+    anim->setStartValue(effect->opacity());
+    anim->setEndValue(0);
+    anim->setEasingCurve(QEasingCurve::OutQuad);
+    anim->start(QAbstractAnimation::DeleteWhenStopped);
+
+    // Make sure to clean up the indexWidget when the anim is deleted
+    connect(anim, &QObject::destroyed, this, [this, entityId, testWidget]()
+    {
+        const QModelIndex proxyIndex = GetIndexFromEntityId(entityId);
+        if (proxyIndex.isValid())
+        {
+            QWidget* currentWidget = m_gui->m_objectTree->indexWidget(proxyIndex);
+            if (currentWidget == testWidget)
+            {
+                m_gui->m_objectTree->setIndexWidget(proxyIndex, nullptr);
+            }
+        }
+    });
+
+    m_gui->m_objectTree->setIndexWidget(proxyIndex, testWidget);
+}
+
+// Currently a "strong highlight" request is handled by replacing the current selection with the requested entity.
+void OutlinerWidget::EntityStrongHighlightRequested(AZ::EntityId entityId)
+{
+    // This can be sent from the Entity Inspector, and changing the selection can affect the state of that control
+    // so use singleShot with 0 to queue the response until any other events sent to the Entity Inspector have been processed
+    QTimer::singleShot(0, this, [entityId, this]() {
+        const QModelIndex proxyIndex = GetIndexFromEntityId(entityId);
+        if (!proxyIndex.isValid())
+        {
+            return;
+        }
+
+        // Scrolling to the entity will make sure that it is visible.
+        // This will automatically open parents.
+        m_gui->m_objectTree->scrollTo(proxyIndex);
+
+        // Not setting "ignoreSignal" because this will set both outliner and world selections.
+        m_gui->m_objectTree->selectionModel()->select(proxyIndex, QItemSelectionModel::ClearAndSelect);
+    });
+}
+
+void OutlinerWidget::QueueUpdateSelection()
+{
+    if (!m_selectionChangeQueued)
+    {
+        QTimer::singleShot(0, this, &OutlinerWidget::UpdateSelection);
+        m_selectionChangeQueued = true;
+    }
+}
+
+void OutlinerWidget::UpdateSelection()
+{
+    if (m_selectionChangeQueued)
+    {
+        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+        m_selectionChangeInProgress = true;
+
+        if (m_entitiesToDeselect.size() >= 1000)
+        {
+            // Calling Deselect for a large number of items is very slow,
+            // use a single ClearAndSelect call instead.
+            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "OutlinerWidget::ModelEntitySelectionChanged:ClearAndSelect");
+
+            AzToolsFramework::EntityIdList selectedEntities;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
+            // it is expected that BuildSelectionFrom Entities results in the actual row-and-column selection.
+            m_gui->m_objectTree->selectionModel()->select(
+                BuildSelectionFromEntities(selectedEntities), QItemSelectionModel::ClearAndSelect);
+        }
+        else
+        {
+            {
+                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "OutlinerWidget::ModelEntitySelectionChanged:Deselect");
+                m_gui->m_objectTree->selectionModel()->select(
+                    BuildSelectionFromEntities(m_entitiesToDeselect), QItemSelectionModel::Deselect);
+            }
+            {
+                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "OutlinerWidget::ModelEntitySelectionChanged:Select");
+                m_gui->m_objectTree->selectionModel()->select(
+                    BuildSelectionFromEntities(m_entitiesToSelect), QItemSelectionModel::Select);
+            }
+        }
+
+        // Scroll to selected entity when selecting from viewport
+        if (m_entitiesToSelect.size() > 0 && m_scrollToSelectedEntity)
+        {
+            QueueScrollToNewContent(*m_entitiesToSelect.begin());
+        }
+
+        m_gui->m_objectTree->update();
+        m_entitiesToSelect.clear();
+        m_entitiesToDeselect.clear();
+        m_selectionChangeQueued = false;
+        m_selectionChangeInProgress = false;
+    }
+}
+
+template <class EntityIdCollection>
+QItemSelection OutlinerWidget::BuildSelectionFromEntities(const EntityIdCollection& entityIds)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    QItemSelection selection;
+
+    for (const auto& entityId : entityIds)
+    {
+        const QModelIndex startOfRow = GetIndexFromEntityId(entityId);
+        
+        if (startOfRow.isValid())
+        {
+            // we select from start of row to end of row (ie, the last column), not just the first cell
+            const QModelIndex endOfRow = m_proxyModel->index(startOfRow.row(), m_proxyModel->columnCount() - 1, startOfRow.parent());
+            selection.select(startOfRow, endOfRow);
+        }
+    }
+
+    return selection;
+}
+
+void OutlinerWidget::contextMenuEvent(QContextMenuEvent* event)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    bool isDocumentOpen = false;
+    EBUS_EVENT_RESULT(isDocumentOpen, AzToolsFramework::EditorRequests::Bus, IsLevelDocumentOpen);
+    if (!isDocumentOpen)
+    {
+        return;
+    }
+
+    QMenu* contextMenu = new QMenu(this);
+
+    // Populate global context menu.
+
+    AzToolsFramework::EditorContextMenuBus::Broadcast(&AzToolsFramework::EditorContextMenuEvents::PopulateEditorGlobalContextMenu,
+        contextMenu,
+        AZ::Vector2::CreateZero(),
+        AzToolsFramework::EditorEvents::eECMF_HIDE_ENTITY_CREATION | AzToolsFramework::EditorEvents::eECMF_USE_VIEWPORT_CENTER);
+
+    PrepareSelection();
+
+    // Remove the "Find in Entity Outliner" option from the context menu
+    for (QAction* action : contextMenu->actions())
+    {
+        if (action->text() == "Find in Entity Outliner")
+        {
+            contextMenu->removeAction(action);
+            break;
+        }
+    }
+
+    //register rename menu action
+    if (!m_selectedEntityIds.empty())
+    {
+        contextMenu->addSeparator();
+
+        contextMenu->addAction(m_actionToRenameSelection);
+
+        if (m_selectedEntityIds.size() == 1)
+        {
+            AZ::EntityId entityId = m_selectedEntityIds[0];
+
+            AZ::EntityId parentId;
+            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+
+            AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(parentId);
+
+            if (entityOrderArray.size() > 1)
+            {
+                if (AZStd::find(entityOrderArray.begin(), entityOrderArray.end(), entityId) != entityOrderArray.end())
+                {
+                    if (entityOrderArray.front() != entityId)
+                    {
+                        contextMenu->addAction(m_actionToMoveEntityUp);
+                    }
+
+                    if (entityOrderArray.back() != entityId)
+                    {
+                        contextMenu->addAction(m_actionToMoveEntityDown);
+                    }
+                }
+            }
+        }
+
+        contextMenu->addSeparator();
+
+        bool canGoToEntitiesInViewport = true;
+        AzToolsFramework::EditorRequestBus::BroadcastResult(canGoToEntitiesInViewport, &AzToolsFramework::EditorRequestBus::Events::CanGoToSelectedEntitiesInViewports);
+        if (!canGoToEntitiesInViewport)
+        {
+            m_actionGoToEntitiesInViewport->setEnabled(false);
+            m_actionGoToEntitiesInViewport->setToolTip(QObject::tr("The selection contains no entities that exist in the viewport."));
+        }
+        else
+        {
+            m_actionGoToEntitiesInViewport->setEnabled(true);
+            m_actionGoToEntitiesInViewport->setToolTip(QObject::tr("Moves the viewports to the bounding box for the selection."));
+        }
+        contextMenu->addAction(m_actionGoToEntitiesInViewport);        
+    }
+
+    // Register actions related to slice root selection in Outlinear list.
+    {
+        contextMenu->addSeparator();
+
+        QMenu* selectSliceRootMenu = new QMenu(contextMenu);
+        contextMenu->addMenu(selectSliceRootMenu);
+
+        selectSliceRootMenu->setTitle(QObject::tr("Select slice root"));
+        selectSliceRootMenu->setToolTip(QObject::tr("Selects a slice root in the Outliner list."));
+
+        selectSliceRootMenu->addAction(m_actionToSelectTopSliceRoot);
+        selectSliceRootMenu->addAction(m_actionToSelectSliceRootAboveSelection);
+        selectSliceRootMenu->addAction(m_actionToSelectSliceRootBelowSelection);
+        selectSliceRootMenu->addAction(m_actionToSelectBottomSliceRoot);
+
+        {
+            bool entitySelected = !m_selectedEntityIds.empty();
+            m_actionToSelectSliceRootAboveSelection->setEnabled(entitySelected);
+            m_actionToSelectSliceRootBelowSelection->setEnabled(entitySelected);
+        }
+        
+        contextMenu->addSeparator();
+    }
+
+    contextMenu->exec(event->globalPos());
+    delete contextMenu;
+}
+
+QString OutlinerWidget::FindCommonSliceAssetName(const AZStd::vector<AZ::EntityId>& entityList) const
+{
+    if (entityList.size() > 0)
+    {
+        //  Check if all selected items are in the same slice
+        QString commonSliceName = m_listModel->GetSliceAssetName(entityList.front());
+        if (!commonSliceName.isEmpty())
+        {
+            bool hasCommonSliceName = true;
+            for (const AZ::EntityId& id : entityList)
+            {
+                QString sliceName = m_listModel->GetSliceAssetName(id);
+
+                if (sliceName != commonSliceName)
+                {
+                    hasCommonSliceName = false;
+                    break;
+                }
+            }
+
+            if (hasCommonSliceName)
+            {
+                return commonSliceName;
+            }
+        }
+    }
+
+    return QString();
+}
+
+AzFramework::EntityContextId OutlinerWidget::GetPickModeEntityContextId()
+{
+    AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+    EBUS_EVENT_RESULT(editorEntityContextId, AzToolsFramework::EditorRequests::Bus, GetEntityContextId);
+
+    return editorEntityContextId;
+}
+
+void OutlinerWidget::PrepareSelection()
+{
+    m_selectedEntityIds.clear();
+    EBUS_EVENT_RESULT(m_selectedEntityIds, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
+}
+
+void OutlinerWidget::DoCreateEntity()
+{
+    PrepareSelection();
+
+    if (m_selectedEntityIds.empty())
+    {
+        DoCreateEntityWithParent(AZ::EntityId());
+        return;
+    }
+
+    if (m_selectedEntityIds.size() == 1)
+    {
+        DoCreateEntityWithParent(m_selectedEntityIds.front());
+        return;
+    }
+}
+
+void OutlinerWidget::DoCreateEntityWithParent(const AZ::EntityId& parentId)
+{
+    PrepareSelection();
+
+    AZ::EntityId entityId;
+    EBUS_EVENT_RESULT(entityId, AzToolsFramework::EditorRequests::Bus, CreateNewEntity, parentId);
+}
+
+void OutlinerWidget::DoShowSlice()
+{
+    PrepareSelection();
+
+    if (!m_selectedEntityIds.empty())
+    {
+        QString commonSliceName = FindCommonSliceAssetName(m_selectedEntityIds);
+        if (!commonSliceName.isEmpty())
+        {
+            EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, ShowAssetInBrowser, commonSliceName.toStdString().c_str());
+        }
+    }
+}
+
+void OutlinerWidget::DoDuplicateSelection()
+{
+    PrepareSelection();
+
+    if (!m_selectedEntityIds.empty())
+    {
+        AzToolsFramework::ScopedUndoBatch undo("Duplicate Entity(s)");
+
+        bool handled = false;
+        EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, CloneSelection, handled);
+    }
+}
+
+void OutlinerWidget::DoDeleteSelection()
+{
+    PrepareSelection();
+
+    EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, DeleteSelectedEntities, false);
+
+    PrepareSelection();
+}
+
+void OutlinerWidget::DoDeleteSelectionAndDescendants()
+{
+    PrepareSelection();
+
+    EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, DeleteSelectedEntities, true);
+
+    PrepareSelection();
+}
+
+void OutlinerWidget::DoRenameSelection()
+{
+    PrepareSelection();
+
+    if (m_selectedEntityIds.size() == 1)
+    {
+        const QModelIndex proxyIndex = GetIndexFromEntityId(m_selectedEntityIds.front());
+        if (proxyIndex.isValid())
+        {
+            m_gui->m_objectTree->setCurrentIndex(proxyIndex);
+            m_gui->m_objectTree->QTreeView::edit(proxyIndex);
+        }
+    }
+    else
+    {
+        bool okPressed = false;
+        QString outputText = QInputDialog::getText(this, tr("Rename"), tr("Name:"), QLineEdit::Normal, tr(""), &okPressed);
+        if (okPressed && !outputText.isEmpty())
+        {
+            AZStd::string newName(outputText.toUtf8().constData());
+
+            AzToolsFramework::ScopedUndoBatch undo("Rename Entities");
+            bool entitiesRenamed = false;
+
+            for (AZ::EntityId entityId : m_selectedEntityIds)
+            {
+                AZ::Entity* entity = nullptr;
+                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, entityId);
+
+                if (entity)
+                {
+                    AZStd::string_view oldName = entity->GetName();
+
+                    if (oldName != newName)
+                    {
+                        entity->SetName(newName);
+                        undo.MarkEntityDirty(entity->GetId());
+                        entitiesRenamed = true;
+                    }
+                }
+            }
+
+            if (entitiesRenamed)
+            {
+                // In all other cases during a rename it triggers an entireTree refresh, so we're going to do the same here
+                AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(
+                    &AzToolsFramework::ToolsApplicationEvents::Bus::Events::InvalidatePropertyDisplay,
+                    AzToolsFramework::Refresh_EntireTree);
+            }
+        }
+    }
+}
+
+void OutlinerWidget::DoMoveEntityUp()
+{
+    PrepareSelection();
+
+    if (m_selectedEntityIds.size() != 1)
+    {
+        return;
+    }
+
+    AZ::EntityId entityId = m_selectedEntityIds[0];
+    AZ_Assert(entityId.IsValid(), "Invalid entity selected to move up");
+    if (!entityId.IsValid())
+    {
+        return;
+    }
+
+    AZ::EntityId parentId;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+
+    AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(parentId);
+
+    auto entityItr = AZStd::find(entityOrderArray.begin(), entityOrderArray.end(), entityId);
+    if (entityOrderArray.empty() || entityOrderArray.front() == entityId || entityItr == entityOrderArray.end())
+    {
+        return;
+    }
+
+    AzToolsFramework::ScopedUndoBatch undo("Move Entity Up");
+
+    // Parent is dirty due to sort change
+    undo.MarkEntityDirty(AzToolsFramework::GetEntityIdForSortInfo(parentId));
+
+    AZStd::swap(*entityItr, *(entityItr - 1));
+    AzToolsFramework::SetEntityChildOrder(parentId, entityOrderArray);
+}
+
+void OutlinerWidget::DoMoveEntityDown()
+{
+    PrepareSelection();
+
+    if (m_selectedEntityIds.size() != 1)
+    {
+        return;
+    }
+
+    AZ::EntityId entityId = m_selectedEntityIds[0];
+    AZ_Assert(entityId.IsValid(), "Invalid entity selected to move down");
+    if (!entityId.IsValid())
+    {
+        return;
+    }
+
+    AZ::EntityId parentId;
+    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+
+    AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(parentId);
+
+    auto entityItr = AZStd::find(entityOrderArray.begin(), entityOrderArray.end(), entityId);
+    if (entityOrderArray.empty() || entityOrderArray.back() == entityId || entityItr == entityOrderArray.end())
+    {
+        return;
+    }
+
+    AzToolsFramework::ScopedUndoBatch undo("Move Entity Down");
+
+    // Parent is dirty due to sort change
+    undo.MarkEntityDirty(AzToolsFramework::GetEntityIdForSortInfo(parentId));
+
+    AZStd::swap(*entityItr, *(entityItr + 1));
+    AzToolsFramework::SetEntityChildOrder(parentId, entityOrderArray);
+}
+
+void OutlinerWidget::GoToEntitiesInViewport()
+{
+    AzToolsFramework::EditorRequestBus::Broadcast(&AzToolsFramework::EditorRequestBus::Events::GoToSelectedEntitiesInViewports);
+}
+
+void OutlinerWidget::DoSelectSliceRootNextToSelection(bool isTraversalUpwards)
+{
+    const auto treeView = m_gui->m_objectTree;
+
+    QModelIndex currentIdx = treeView->currentIndex();
+    if (!currentIdx.isValid())
+    {
+        return;
+    }
+
+    AZ::EntityId currentEntityId;
+    bool currentIdxSelected = false;
+    currentEntityId = GetEntityIdFromIndex(currentIdx);
+
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+        currentIdxSelected, &AzToolsFramework::ToolsApplicationRequests::IsSelected, currentEntityId);
+
+    if (!currentIdxSelected)
+    {
+        return;
+    }
+
+    AZStd::function<QModelIndex(QModelIndex)> getNextIdxFunction =
+        AZStd::bind(isTraversalUpwards ? &QTreeView::indexAbove : &QTreeView::indexBelow, treeView, AZStd::placeholders::_1);
+    QModelIndex nextIdx = getNextIdxFunction(currentIdx);
+    bool foundSliceRoot = false;
+
+    while (nextIdx.isValid() && !foundSliceRoot)
+    {
+        currentIdx = nextIdx;
+        currentEntityId = GetEntityIdFromIndex(currentIdx);
+
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            foundSliceRoot, &AzToolsFramework::ToolsApplicationRequests::IsSliceRootEntity, currentEntityId);
+
+        nextIdx = getNextIdxFunction(currentIdx);
+    }
+
+    if (foundSliceRoot)
+    {
+        SetIndexAsCurrentAndSelected(currentIdx);
+    }
+}
+
+void OutlinerWidget::DoSelectSliceRootAboveSelection()
+{
+    DoSelectSliceRootNextToSelection(true);
+}
+
+
+void OutlinerWidget::DoSelectSliceRootBelowSelection()
+{
+    DoSelectSliceRootNextToSelection(false);
+}
+
+void OutlinerWidget::DoSelectEdgeSliceRoot(bool shouldSelectTopMostSlice)
+{
+    const auto treeView = m_gui->m_objectTree;
+    const auto itemModel = treeView->model();
+    if (itemModel->rowCount() == 0)
+    {
+        return;
+    }
+
+    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
+    {
+        currentIdx = itemModel->index(itemModel->rowCount() - 1, OutlinerListModel::ColumnName);
+        while (itemModel->rowCount(currentIdx) > 0 && treeView->isExpanded(currentIdx))
+        {
+            currentIdx = itemModel->index(itemModel->rowCount(currentIdx) - 1, OutlinerListModel::ColumnName, currentIdx);
+        }
+
+        getNextIdxFunction =
+            AZStd::bind(&QTreeView::indexAbove, treeView, AZStd::placeholders::_1);
+    }
+
+    QModelIndex nextIdx = currentIdx;
+    bool foundSliceRoot = false;
+    AZ::EntityId currentEntityId;
+    do
+    {
+        currentIdx = nextIdx;
+        currentEntityId = GetEntityIdFromIndex(currentIdx);
+
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            foundSliceRoot, &AzToolsFramework::ToolsApplicationRequests::IsSliceRootEntity, currentEntityId);
+        nextIdx = getNextIdxFunction(currentIdx);
+    } while (nextIdx.isValid() && !foundSliceRoot);
+
+    if (foundSliceRoot)
+    {
+        SetIndexAsCurrentAndSelected(currentIdx);
+    }
+}
+
+
+void OutlinerWidget::DoSelectTopSliceRoot()
+{
+    DoSelectEdgeSliceRoot(true);
+}
+
+void OutlinerWidget::DoSelectBottomSliceRoot()
+{
+    DoSelectEdgeSliceRoot(false);
+}
+
+void OutlinerWidget::SetIndexAsCurrentAndSelected(const QModelIndex& index)
+{
+    m_gui->m_objectTree->setCurrentIndex(index);
+
+    AZ::EntityId entityId = GetEntityIdFromIndex(index);
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, AzToolsFramework::EntityIdList{ entityId });
+}
+
+void OutlinerWidget::SetupActions()
+{
+    m_actionToShowSlice = new QAction(tr("Show Slice"), this);
+    m_actionToShowSlice->setShortcut(tr("Ctrl+Shift+F"));
+    m_actionToShowSlice->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToShowSlice, &QAction::triggered, this, &OutlinerWidget::DoShowSlice);
+    addAction(m_actionToShowSlice);
+
+    m_actionToCreateEntity = new QAction(tr("Create Entity"), this);
+    m_actionToCreateEntity->setShortcut(tr("Ctrl+Alt+N"));
+    m_actionToCreateEntity->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToCreateEntity, &QAction::triggered, this, &OutlinerWidget::DoCreateEntity);
+    addAction(m_actionToCreateEntity);
+
+    m_actionToDeleteSelection = new QAction(tr("Delete"), this);
+    m_actionToDeleteSelection->setShortcut(QKeySequence("Shift+Delete"));
+    m_actionToDeleteSelection->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToDeleteSelection, &QAction::triggered, this, &OutlinerWidget::DoDeleteSelection);
+    addAction(m_actionToDeleteSelection);
+
+    m_actionToDeleteSelectionAndDescendants = new QAction(tr("Delete Selection And Descendants"), this);
+    m_actionToDeleteSelectionAndDescendants->setShortcut(QKeySequence::Delete);
+    m_actionToDeleteSelectionAndDescendants->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToDeleteSelectionAndDescendants, &QAction::triggered, this, &OutlinerWidget::DoDeleteSelectionAndDescendants);
+    addAction(m_actionToDeleteSelectionAndDescendants);
+
+    m_actionToRenameSelection = new QAction(tr("Rename"), this);
+#ifdef AZ_PLATFORM_MAC
+    // "Alt+Return" translates to Option+Return on macOS
+    m_actionToRenameSelection->setShortcut(tr("Alt+Return"));
+#else
+    m_actionToRenameSelection->setShortcut(tr("F2"));
+#endif
+    m_actionToRenameSelection->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToRenameSelection, &QAction::triggered, this, &OutlinerWidget::DoRenameSelection);
+    addAction(m_actionToRenameSelection);
+
+    m_actionToMoveEntityUp = new QAction(tr("Move up"), this);
+    m_actionToMoveEntityUp->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToMoveEntityUp, &QAction::triggered, this, &OutlinerWidget::DoMoveEntityUp);
+    addAction(m_actionToMoveEntityUp);
+
+    m_actionToMoveEntityDown = new QAction(tr("Move down"), this);
+    m_actionToMoveEntityDown->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToMoveEntityDown, &QAction::triggered, this, &OutlinerWidget::DoMoveEntityDown);
+    addAction(m_actionToMoveEntityDown);
+
+    m_actionGoToEntitiesInViewport = new QAction(tr("Find in viewport"), this);
+    m_actionGoToEntitiesInViewport->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionGoToEntitiesInViewport, &QAction::triggered, this, &OutlinerWidget::GoToEntitiesInViewport);
+    addAction(m_actionGoToEntitiesInViewport);
+
+    m_actionToSelectSliceRootAboveSelection = new QAction(tr("Up"), this);
+    m_actionToSelectSliceRootAboveSelection->setToolTip(tr("Select the first slice root above the selection in the Outliner list."));
+    m_actionToSelectSliceRootAboveSelection->setShortcut(QKeySequence("Ctrl+Up"));
+    m_actionToSelectSliceRootAboveSelection->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToSelectSliceRootAboveSelection, &QAction::triggered, this, &OutlinerWidget::DoSelectSliceRootAboveSelection);
+    addAction(m_actionToSelectSliceRootAboveSelection);
+
+    m_actionToSelectSliceRootBelowSelection = new QAction(tr("Down"), this);
+    m_actionToSelectSliceRootBelowSelection->setToolTip(tr("Select the first slice root below the selection in the Outliner list."));
+    m_actionToSelectSliceRootBelowSelection->setShortcut(QKeySequence("Ctrl+Down"));
+    m_actionToSelectSliceRootBelowSelection->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToSelectSliceRootBelowSelection, &QAction::triggered, this, &OutlinerWidget::DoSelectSliceRootBelowSelection);
+    addAction(m_actionToSelectSliceRootBelowSelection);
+
+    m_actionToSelectTopSliceRoot = new QAction(tr("Top"), this);
+    m_actionToSelectTopSliceRoot->setToolTip(tr("Select the slice root at the top of the Outliner list."));
+    m_actionToSelectTopSliceRoot->setShortcut(QKeySequence("Ctrl+Home"));
+    m_actionToSelectTopSliceRoot->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToSelectTopSliceRoot, &QAction::triggered, this, &OutlinerWidget::DoSelectTopSliceRoot);
+    addAction(m_actionToSelectTopSliceRoot);
+
+    m_actionToSelectBottomSliceRoot = new QAction(tr("Bottom"), this);
+    m_actionToSelectBottomSliceRoot->setToolTip(tr("Select the slice root at the bottom of the Outliner list."));
+    m_actionToSelectBottomSliceRoot->setShortcut(QKeySequence("Ctrl+End"));
+    m_actionToSelectBottomSliceRoot->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_actionToSelectBottomSliceRoot, &QAction::triggered, this, &OutlinerWidget::DoSelectBottomSliceRoot);
+    addAction(m_actionToSelectBottomSliceRoot);
+}
+
+void OutlinerWidget::SelectSliceRoot()
+{
+   MainWindow::instance()->OnGotoSliceRoot();
+}
+
+void OutlinerWidget::OnEntityPickModeStarted()
+{
+    m_gui->m_objectTree->setDragEnabled(false);
+    m_gui->m_objectTree->setSelectionMode(QAbstractItemView::NoSelection);
+    m_gui->m_objectTree->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    m_inObjectPickMode = true;
+}
+
+void OutlinerWidget::OnEntityPickModeStopped()
+{
+    m_gui->m_objectTree->setDragEnabled(true);
+    m_gui->m_objectTree->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    m_gui->m_objectTree->setEditTriggers(QAbstractItemView::SelectedClicked | QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);
+    m_inObjectPickMode = false;
+}
+
+void OutlinerWidget::OnTreeItemClicked(const QModelIndex &index)
+{
+    if (m_inObjectPickMode)
+    {
+        const AZ::EntityId entityId = GetEntityIdFromIndex(index);
+        if (entityId.IsValid())
+        {
+            AzToolsFramework::EditorPickModeRequestBus::Broadcast(
+                &AzToolsFramework::EditorPickModeRequests::PickModeSelectEntity, entityId);
+        }
+
+        AzToolsFramework::EditorPickModeRequestBus::Broadcast(
+            &AzToolsFramework::EditorPickModeRequests::StopEntityPickMode);
+    }
+
+    switch (index.column())
+    {
+        case OutlinerListModel::ColumnVisibilityToggle:
+        case OutlinerListModel::ColumnLockToggle:
+            // Don't care passing an explicit check state as the model is just toggling on its own
+            m_gui->m_objectTree->model()->setData(index, Qt::CheckState(), Qt::CheckStateRole);
+            break;
+    }
+}
+
+void OutlinerWidget::OnTreeItemExpanded(const QModelIndex &index)
+{
+    m_listModel->OnEntityExpanded(GetEntityIdFromIndex(index));
+}
+
+void OutlinerWidget::OnTreeItemCollapsed(const QModelIndex &index)
+{
+    m_listModel->OnEntityCollapsed(GetEntityIdFromIndex(index));
+}
+
+void OutlinerWidget::OnExpandEntity(const AZ::EntityId& entityId, bool expand)
+{
+    m_gui->m_objectTree->setExpanded(GetIndexFromEntityId(entityId), expand);
+}
+
+void OutlinerWidget::OnSelectEntity(const AZ::EntityId& entityId, bool selected)
+{
+    if (selected)
+    {
+        if (m_entitiesSelectedByOutliner.find(entityId) == m_entitiesSelectedByOutliner.end())
+        {
+            m_entitiesToSelect.insert(entityId);
+            m_entitiesToDeselect.erase(entityId);
+        }
+    }
+    else
+    {
+        if (m_entitiesDeselectedByOutliner.find(entityId) == m_entitiesDeselectedByOutliner.end())
+        {
+            m_entitiesToSelect.erase(entityId);
+            m_entitiesToDeselect.insert(entityId);
+        }
+    }
+    QueueUpdateSelection();
+}
+
+void OutlinerWidget::OnEnableSelectionUpdates(bool enable)
+{
+    m_enableSelectionUpdates = enable;
+}
+
+void OutlinerWidget::OnDropEvent()
+{
+    m_dropOperationInProgress = true;
+    m_listModel->SetDropOperationInProgress(true);
+}
+
+void OutlinerWidget::OnEditorEntityCreated(const AZ::EntityId& entityId)
+{
+    QueueContentUpdateSort(entityId);
+    QueueScrollToNewContent(entityId);
+ 
+    // When a new entity is created we need to make sure to apply the filter
+    m_listModel->FilterEntity(entityId);
+}
+
+void OutlinerWidget::ScrollToNewContent()
+{
+    m_scrollToNewContentQueued = false;
+    
+    // Scroll to the parent entity when auto-expand is disabled and the user doesn't click on the "Find in Entity Outliner" option in the context menu
+    if (!m_expandSelectedEntity && !m_focusInEntityOutliner)
+    {
+        AZ::EntityId parentId = m_scrollToEntityId;
+        while (parentId.IsValid())
+        {
+            m_scrollToEntityId = parentId;
+            parentId.SetInvalid();
+            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, m_scrollToEntityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+        }
+    }
+
+    const QModelIndex proxyIndex = GetIndexFromEntityId(m_scrollToEntityId);
+    if (!proxyIndex.isValid())
+    {
+        QueueScrollToNewContent(m_scrollToEntityId);
+        return;
+    }
+
+    m_gui->m_objectTree->scrollTo(proxyIndex, QAbstractItemView::PositionAtTop);
+    m_focusInEntityOutliner = false;
+}
+
+void OutlinerWidget::QueueScrollToNewContent(const AZ::EntityId& entityId)
+{
+    if (m_dropOperationInProgress)
+    {
+        //don't scroll as the result of a drop operation, in order to stop new parent auto expanding. You can only drop in visible areas anyway. 
+        m_dropOperationInProgress = false;
+        m_listModel->SetDropOperationInProgress(false);
+        return;
+    }
+
+    if (entityId.IsValid())
+    {
+        m_scrollToEntityId = entityId;
+        if (!m_scrollToNewContentQueued)
+        {
+            m_scrollToNewContentQueued = true;
+            QTimer::singleShot(queuedChangeDelay, this, &OutlinerWidget::ScrollToNewContent);
+        }
+    }
+}
+
+AZ::EntityId OutlinerWidget::GetEntityIdFromIndex(const QModelIndex& index) const
+{
+    if (index.isValid())
+    {
+        const QModelIndex modelIndex = m_proxyModel->mapToSource(index);
+        if (modelIndex.isValid())
+        {
+            return m_listModel->GetEntityFromIndex(modelIndex);
+        }
+    }
+
+    return AZ::EntityId();
+}
+
+QModelIndex OutlinerWidget::GetIndexFromEntityId(const AZ::EntityId& entityId) const
+{
+    if (entityId.IsValid())
+    {
+        QModelIndex modelIndex = m_listModel->GetIndexFromEntity(entityId, 0);
+        if (modelIndex.isValid())
+        {
+            return m_proxyModel->mapFromSource(modelIndex);
+        }
+    }
+
+    return QModelIndex();
+}
+
+void OutlinerWidget::ExtractEntityIdsFromSelection(const QItemSelection& selection, AzToolsFramework::EntityIdList& entityIdList) const
+{
+    entityIdList.reserve(selection.indexes().count());
+    for (const auto& index : selection.indexes())
+    {
+        // Skip any column except the main name column...
+        if (index.column() == OutlinerListModel::ColumnName)
+        {
+            const AZ::EntityId entityId = GetEntityIdFromIndex(index);
+            if (entityId.IsValid())
+            {
+                entityIdList.push_back(entityId);
+            }
+        }
+    }
+}
+
+void OutlinerWidget::OnSearchTextChanged(const QString& activeTextFilter)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+    AZStd::string filterString = activeTextFilter.toUtf8().data();
+
+    m_listModel->SearchStringChanged(filterString);
+    m_proxyModel->UpdateFilter();
+}
+
+void OutlinerWidget::OnFilterChanged(const AzQtComponents::SearchTypeFilterList& activeTypeFilters)
+{
+    AZStd::vector<OutlinerListModel::ComponentTypeValue> componentFilters;
+    componentFilters.reserve(activeTypeFilters.count());
+
+    for (auto filter : activeTypeFilters)
+    {
+        OutlinerListModel::ComponentTypeValue value;
+        value.m_uuid = qvariant_cast<AZ::Uuid>(filter.metadata);
+        value.m_globalVal = filter.globalFilterValue;
+        componentFilters.push_back(value);
+    }
+
+    m_listModel->SearchFilterChanged(componentFilters);
+    m_proxyModel->UpdateFilter();
+}
+
+void OutlinerWidget::InvalidateFilter()
+{
+    m_listModel->InvalidateFilter();
+    m_proxyModel->UpdateFilter();
+}
+
+void OutlinerWidget::ClearFilter()
+{
+    m_gui->m_searchWidget->ClearTextFilter();
+    m_gui->m_searchWidget->ClearTypeFilter();
+}
+
+void OutlinerWidget::OnStartPlayInEditor()
+{
+    setEnabled(false);
+}
+
+void OutlinerWidget::OnStopPlayInEditor()
+{
+    setEnabled(true);
+}
+
+static void SetEntityOutlinerState(Ui::OutlinerWidgetUI* entityOutlinerUi, const bool on)
+{
+    AzQtComponents::SetWidgetInteractEnabled(entityOutlinerUi->m_objectTree, on);
+    AzQtComponents::SetWidgetInteractEnabled(entityOutlinerUi->m_searchWidget, on);
+}
+
+void OutlinerWidget::EnteredComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
+{
+    SetEntityOutlinerState(m_gui, false);
+    setEnabled(false);
+}
+
+void OutlinerWidget::LeftComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
+{
+    setEnabled(true);
+    SetEntityOutlinerState(m_gui, true);
+}
+
+void OutlinerWidget::OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/)
+{
+    const AZ::SliceComponent::SliceReference* reference = sliceAddress.GetReference();
+    const AZ::SliceComponent::SliceInstance* instance = sliceAddress.GetInstance();
+    if (reference && instance)
+    {
+        // guard against special case slices (e.g. default slice) that produce technically valid, but garbage, slice instances
+        const AZ::SliceComponent::SliceReference::SliceInstances& sliceInstances = reference->GetInstances();
+        if (sliceInstances.find(*instance) != sliceInstances.end())
+        {
+            for (const AZ::Entity* entity : instance->GetInstantiated()->m_entities)
+            {
+                QueueContentUpdateSort(entity->GetId());
+            }
+        }
+    }
+}
+
+void OutlinerWidget::OnEntityInfoUpdatedAddChildEnd(AZ::EntityId /*parentId*/, AZ::EntityId childId)
+{
+    QueueContentUpdateSort(childId);
+}
+
+void OutlinerWidget::OnEntityInfoUpdatedName(AZ::EntityId entityId, const AZStd::string& /*name*/)
+{
+    QueueContentUpdateSort(entityId);   
+}
+
+void OutlinerWidget::QueueContentUpdateSort(const AZ::EntityId& entityId)
+{
+    if (m_sortMode != EntityOutliner::DisplaySortMode::Manually && entityId.IsValid())
+    {
+        m_entitiesToSort.insert(entityId);
+        if (!m_sortContentQueued)
+        {
+            m_sortContentQueued = true;
+            QTimer::singleShot(queuedChangeDelay, this, &OutlinerWidget::SortContent);
+        }
+    }
+}
+
+void OutlinerWidget::SortContent()
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+
+    m_sortContentQueued = false;
+
+    // kick out early if we somehow managed to get here with manual sorting set
+    if (m_sortMode == EntityOutliner::DisplaySortMode::Manually)
+    {
+        m_entitiesToSort.clear();
+        return;
+    }
+
+    AzToolsFramework::EntityIdSet parentsToSort;
+    for (const AZ::EntityId& entityId : m_entitiesToSort)
+    {
+        AZ::EntityId parentId; 
+        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
+        parentsToSort.insert(parentId);
+    }
+    m_entitiesToSort.clear();
+
+    auto comparer = AZStd::bind(&CompareEntitiesForSorting, AZStd::placeholders::_1, AZStd::placeholders::_2, m_sortMode);
+    for (const AZ::EntityId& entityId : parentsToSort)
+    {
+        SortEntityChildren(entityId, comparer);
+    }
+}
+
+void OutlinerWidget::OnSortModeChanged(EntityOutliner::DisplaySortMode sortMode)
+{
+    if (m_sortMode == sortMode)
+    {
+        return;
+    }
+
+    if (sortMode != EntityOutliner::DisplaySortMode::Manually)
+    {
+        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+        auto comparer = AZStd::bind(&CompareEntitiesForSorting, AZStd::placeholders::_1, AZStd::placeholders::_2, sortMode);
+        SortEntityChildrenRecursively(AZ::EntityId(), comparer);
+    }
+
+    m_sortMode = sortMode;
+    m_listModel->SetSortMode(m_sortMode);
+}
+
+void OutlinerWidget::OnDisplayOptionChanged(EntityOutliner::DisplayOption displayOption, bool enable)
+{
+    switch (displayOption)
+    {
+        case EntityOutliner::DisplayOption::AutoScroll:
+            m_scrollToSelectedEntity = enable;
+            break;
+
+        case EntityOutliner::DisplayOption::AutoExpand:
+            m_expandSelectedEntity = enable;
+            m_listModel->EnableAutoExpand(enable);
+            break;
+
+        default:
+            AZ_Assert(false, "Unknown display option event received (%d)", static_cast<int>(displayOption));
+            break;
+    }
+}
+
+void OutlinerWidget::OnFocusInEntityOutliner(const AzToolsFramework::EntityIdList& entityIdList)
+{
+    m_focusInEntityOutliner = true;
+
+    QModelIndex firstSelectedEntityIndex = GetIndexFromEntityId(entityIdList.front());
+    for (const AZ::EntityId& entityId : entityIdList)
+    {
+        QModelIndex index = GetIndexFromEntityId(entityId);
+        firstSelectedEntityIndex = index < firstSelectedEntityIndex ? index : firstSelectedEntityIndex;
+    }
+
+    QueueScrollToNewContent(GetEntityIdFromIndex(firstSelectedEntityIndex));
+}
+
+#include <UI/Outliner/moc_OutlinerWidget.cpp>
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx
new file mode 100644
index 0000000000..75991424bb
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx
@@ -0,0 +1,210 @@
+/*
+ * 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 OUTLINER_VIEW_H
+#define OUTLINER_VIEW_H
+
+#if !defined(Q_MOC_RUN)
+#include "OutlinerCacheBus.h"
+
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/base.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
+#include <AzToolsFramework/ToolsMessaging/EntityHighlightBus.h>
+#include <AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx>
+#include "OutlinerSearchWidget.h"
+
+#include <QWidget>
+#include <QtGui/QIcon>
+#endif
+
+#pragma once
+
+class QAction;
+
+namespace Ui
+{
+    class OutlinerWidgetUI;
+}
+
+class QItemSelection;
+
+class OutlinerListModel;
+class OutlinerSortFilterProxyModel;
+
+namespace EntityOutliner
+{
+    class DisplayOptionsMenu;
+    enum class DisplaySortMode : unsigned char;
+    enum class DisplayOption : unsigned char;
+}
+
+class OutlinerWidget
+    : public QWidget
+    , private AzToolsFramework::EditorPickModeNotificationBus::Handler
+    , private AzToolsFramework::EntityHighlightMessages::Bus::Handler
+    , private OutlinerModelNotificationBus::Handler
+    , private AzToolsFramework::ToolsApplicationEvents::Bus::Handler
+    , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
+    , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
+    , private AzToolsFramework::EditorEntityInfoNotificationBus::Handler
+    , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
+{
+    Q_OBJECT;
+public:
+    AZ_CLASS_ALLOCATOR(OutlinerWidget, AZ::SystemAllocator, 0)
+
+    OutlinerWidget(QWidget* pParent = NULL, Qt::WindowFlags flags = Qt::WindowFlags());
+    virtual ~OutlinerWidget();
+
+private Q_SLOTS:
+    void OnSelectionChanged(const QItemSelection&, const QItemSelection&);
+
+    void OnSearchTextChanged(const QString& activeTextFilter);
+    void OnFilterChanged(const AzQtComponents::SearchTypeFilterList& activeTypeFilters);
+
+    void OnSortModeChanged(EntityOutliner::DisplaySortMode sortMode);
+    void OnDisplayOptionChanged(EntityOutliner::DisplayOption displayOption, bool enable);
+
+private:
+    void contextMenuEvent(QContextMenuEvent* event) override;
+
+    QString FindCommonSliceAssetName(const AZStd::vector<AZ::EntityId>& entityList) const;
+
+    AzFramework::EntityContextId GetPickModeEntityContextId();
+
+    // EntityHighlightMessages
+    virtual void EntityHighlightRequested(AZ::EntityId) override;
+    virtual void EntityStrongHighlightRequested(AZ::EntityId) override;
+
+    // EditorPickModeNotificationBus
+    void OnEntityPickModeStarted() override;
+    void OnEntityPickModeStopped() override;
+
+    // SliceEditorEntityOwnershipServiceNotificationBus
+    void OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/, const AzFramework::SliceInstantiationTicket& /*ticket*/) override;
+
+    // EditorEntityContextNotificationBus
+    void OnEditorEntityCreated(const AZ::EntityId& entityId) override;
+    void OnStartPlayInEditor() override;
+    void OnStopPlayInEditor() override;
+    void OnFocusInEntityOutliner(const AzToolsFramework::EntityIdList& entityIdList) override;
+
+    /// AzToolsFramework::EditorEntityInfoNotificationBus implementation
+    void OnEntityInfoUpdatedAddChildEnd(AZ::EntityId /*parentId*/, AZ::EntityId /*childId*/) override;
+    void OnEntityInfoUpdatedName(AZ::EntityId entityId, const AZStd::string& /*name*/) override;
+
+    // EditorComponentModeNotificationBus
+    void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
+    void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
+
+    // Build a selection object from the given entities. Entities already in the Widget's selection buffers are ignored.
+    template <class EntityIdCollection>
+    QItemSelection BuildSelectionFromEntities(const EntityIdCollection& entityIds);
+
+    Ui::OutlinerWidgetUI* m_gui;
+    OutlinerListModel* m_listModel;
+    OutlinerSortFilterProxyModel* m_proxyModel;
+    AZ::u64 m_selectionContextId;
+    AZStd::vector<AZ::EntityId> m_selectedEntityIds;
+
+    void PrepareSelection();
+    void DoCreateEntity();
+    void DoCreateEntityWithParent(const AZ::EntityId& parentId);
+    void DoShowSlice();
+    void DoDuplicateSelection();
+    void DoDeleteSelection();
+    void DoDeleteSelectionAndDescendants();
+    void DoRenameSelection();
+    void DoMoveEntityUp();
+    void DoMoveEntityDown();
+    void GoToEntitiesInViewport();
+
+    void DoSelectSliceRootAboveSelection();
+    void DoSelectSliceRootBelowSelection();
+    void DoSelectTopSliceRoot();
+    void DoSelectBottomSliceRoot();
+
+    void DoSelectSliceRootNextToSelection(bool above);
+    void DoSelectEdgeSliceRoot(bool top);
+
+    void SetIndexAsCurrentAndSelected(const QModelIndex& index);
+
+    void SetupActions();
+    void SelectSliceRoot();
+
+    QAction* m_actionToShowSlice;
+    QAction* m_actionToCreateEntity;
+    QAction* m_actionToDeleteSelection;
+    QAction* m_actionToDeleteSelectionAndDescendants;
+    QAction* m_actionToRenameSelection;
+    QAction* m_actionToReparentSelection;
+    QAction* m_actionToMoveEntityUp;
+    QAction* m_actionToMoveEntityDown;
+    QAction* m_actionGoToEntitiesInViewport;
+
+    QAction* m_actionToSelectSliceRootAboveSelection;
+    QAction* m_actionToSelectSliceRootBelowSelection;
+    QAction* m_actionToSelectTopSliceRoot;
+    QAction* m_actionToSelectBottomSliceRoot;
+
+    void OnTreeItemClicked(const QModelIndex &index);
+    void OnTreeItemExpanded(const QModelIndex &index);
+    void OnTreeItemCollapsed(const QModelIndex &index);
+    void OnExpandEntity(const AZ::EntityId& entityId, bool expand);
+    void OnSelectEntity(const AZ::EntityId& entityId, bool selected);
+    void OnEnableSelectionUpdates(bool enable);
+    void OnDropEvent();
+    bool m_inObjectPickMode;
+
+    void InvalidateFilter();
+    void ClearFilter();
+
+    AZ::EntityId GetEntityIdFromIndex(const QModelIndex& index) const;
+    QModelIndex GetIndexFromEntityId(const AZ::EntityId& entityId) const;
+    void ExtractEntityIdsFromSelection(const QItemSelection& selection, AzToolsFramework::EntityIdList& entityIdList) const;
+
+    // AzToolsFramework::OutlinerModelNotificationBus::Handler
+    // Receive notification from the outliner model that we should scroll
+    // to a given entity
+    void QueueScrollToNewContent(const AZ::EntityId& entityId) override;
+
+    void ScrollToNewContent();
+    bool m_scrollToNewContentQueued;
+    bool m_scrollToSelectedEntity;
+    bool m_dropOperationInProgress;
+    bool m_expandSelectedEntity;
+    bool m_focusInEntityOutliner;
+    AZ::EntityId m_scrollToEntityId;
+
+    void QueueUpdateSelection();
+    void UpdateSelection();
+    AzToolsFramework::EntityIdSet m_entitiesToSelect;
+    AzToolsFramework::EntityIdSet m_entitiesToDeselect;
+    AzToolsFramework::EntityIdSet m_entitiesSelectedByOutliner;
+    AzToolsFramework::EntityIdSet m_entitiesDeselectedByOutliner;
+    bool m_selectionChangeQueued;
+    bool m_selectionChangeInProgress;
+    bool m_enableSelectionUpdates;
+
+    QIcon m_emptyIcon;
+    QIcon m_clearIcon;
+
+    void QueueContentUpdateSort(const AZ::EntityId& entityId);
+    void SortContent();
+
+    EntityOutliner::DisplayOptionsMenu* m_displayOptionsMenu;
+    AzToolsFramework::EntityIdSet m_entitiesToSort;
+    EntityOutliner::DisplaySortMode m_sortMode;
+    bool m_sortContentQueued;
+};
+
+#endif
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.ui b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.ui
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.ui
rename to Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.ui
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/resources.qrc b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/resources.qrc
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/resources.qrc
rename to Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/resources.qrc
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.cpp
new file mode 100644
index 0000000000..ad9bf00e79
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.cpp
@@ -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
+ *
+ */
+
+#include "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "UI/QComponentEntityEditorMainWindow.h"
+
+#include <AzCore/Component/Entity.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
+#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
+
+#include <QVBoxLayout>
+
+QComponentEntityEditorInspectorWindow::QComponentEntityEditorInspectorWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , m_propertyEditor(nullptr)
+{
+    gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
+
+    Init();
+}
+
+QComponentEntityEditorInspectorWindow::~QComponentEntityEditorInspectorWindow()
+{
+    gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
+}
+
+void QComponentEntityEditorInspectorWindow::OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
+{
+}
+
+void QComponentEntityEditorInspectorWindow::Init()
+{
+    QVBoxLayout* layout = new QVBoxLayout();
+
+    m_propertyEditor = new AzToolsFramework::EntityPropertyEditor(nullptr);
+    layout->addWidget(m_propertyEditor);
+
+    QWidget* window = new QWidget();
+    window->setLayout(layout);
+    setCentralWidget(window);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// End of context menu handling
+///////////////////////////////////////////////////////////////////////////////
+
+#include <UI/moc_QComponentEntityEditorMainWindow.cpp>
+
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.h
new file mode 100644
index 0000000000..d5da6135f2
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.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
+
+#if !defined(Q_MOC_RUN)
+#include <QMainWindow>
+
+#include <AzCore/Serialization/SerializeContext.h>
+#endif
+
+class QObjectPropertyModel;
+class PropertyInfo;
+
+namespace AZ
+{
+    class Entity;
+}
+
+namespace AzToolsFramework
+{
+    class ReflectedPropertyEditor;
+    class EntityPropertyEditor;
+}
+
+// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
+class QComponentEntityEditorInspectorWindow
+    : public QMainWindow
+    , public ISystemEventListener
+{
+    Q_OBJECT
+
+public:
+    explicit QComponentEntityEditorInspectorWindow(QWidget* parent = 0);
+    ~QComponentEntityEditorInspectorWindow();
+
+    void Init();
+
+    // Used to receive events from widgets where SIGNALS aren't available or implemented yet.
+    // Required override.
+    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
+
+    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
+    // make sure you pick a unique GUID
+    static const GUID& GetClassID()
+    {
+        // {D7FEC1E3-8898-4D1F-8A9C-F8A161AF6746}
+        static const GUID guid =
+        {
+            0xD7FEC1E3, 0x8898, 0x4D1F, { 0x8a, 0x9c, 0xf8, 0xa1, 0x61, 0xaf, 0x67, 0x46 }
+        };
+        return guid;
+    }
+
+    AzToolsFramework::EntityPropertyEditor* GetPropertyEditor() { return m_propertyEditor; }
+
+private:
+
+    AzToolsFramework::EntityPropertyEditor* m_propertyEditor;
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.cpp
new file mode 100644
index 0000000000..c58ec25cc4
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.cpp
@@ -0,0 +1,86 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "CryEdit.h"
+#include "UI/QComponentEntityEditorOutlinerWindow.h"
+#include "UI/Outliner/OutlinerWidget.hxx"
+
+#include <AzCore/Component/Entity.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+
+#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx>
+
+#include <QVBoxLayout>
+
+QComponentEntityEditorOutlinerWindow::QComponentEntityEditorOutlinerWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , m_outlinerWidget(nullptr)
+{
+    gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
+
+    Init();
+}
+
+QComponentEntityEditorOutlinerWindow::~QComponentEntityEditorOutlinerWindow()
+{
+    gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
+}
+
+void QComponentEntityEditorOutlinerWindow::OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
+{
+}
+
+void QComponentEntityEditorOutlinerWindow::Init()
+{
+    QVBoxLayout* layout = new QVBoxLayout();
+
+    m_outlinerWidget = new OutlinerWidget(nullptr);
+    layout->addWidget(m_outlinerWidget);
+
+    QWidget* window = new QWidget();
+    window->setLayout(layout);
+    setCentralWidget(window);
+}
+
+QEntityOutlinerWindow::QEntityOutlinerWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , m_outlinerWidget(nullptr)
+{
+    gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
+
+    Init();
+}
+
+QEntityOutlinerWindow::~QEntityOutlinerWindow()
+{
+    gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
+}
+
+void QEntityOutlinerWindow::OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
+{
+}
+
+void QEntityOutlinerWindow::Init()
+{
+    QVBoxLayout* layout = new QVBoxLayout();
+
+    m_outlinerWidget = new AzToolsFramework::EntityOutlinerWidget(nullptr);
+    layout->addWidget(m_outlinerWidget);
+
+    QWidget* window = new QWidget();
+    window->setLayout(layout);
+    setCentralWidget(window);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// End of context menu handling
+///////////////////////////////////////////////////////////////////////////////
+
+#include <UI/moc_QComponentEntityEditorOutlinerWindow.cpp>
+
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.h
new file mode 100644
index 0000000000..5b33d2a4d7
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.h
@@ -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
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QMainWindow>
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#endif
+
+class QObjectPropertyModel;
+class PropertyInfo;
+
+namespace AZ
+{
+    class Entity;
+}
+
+namespace AzToolsFramework
+{
+    class EntityOutlinerWidget;
+}
+
+class OutlinerWidget;
+
+// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
+class QComponentEntityEditorOutlinerWindow
+    : public QMainWindow
+    , public ISystemEventListener
+{
+    Q_OBJECT
+
+public:
+    explicit QComponentEntityEditorOutlinerWindow(QWidget* parent = 0);
+    ~QComponentEntityEditorOutlinerWindow();
+
+    void Init();
+
+    // Used to receive events from widgets where SIGNALS aren't available or implemented yet.
+    // Required override.
+    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
+
+    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
+    // make sure you pick a unique GUID
+    static const GUID& GetClassID()
+    {
+        // {A2B58C0B-811A-4773-A057-A02D4BB9A293}
+        static const GUID guid =
+        {
+            0xA2B58C0B, 0x811A, 0x4773, { 0xa0, 0x57, 0xa0, 0x2d, 0x4b, 0xb9, 0xa2, 0x93 }
+        };
+        return guid;
+    }
+
+private:
+    OutlinerWidget* m_outlinerWidget;
+};
+
+// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
+class QEntityOutlinerWindow
+    : public QMainWindow
+    , public ISystemEventListener
+{
+    Q_OBJECT
+
+public:
+    explicit QEntityOutlinerWindow(QWidget* parent = 0);
+    ~QEntityOutlinerWindow();
+
+    void Init();
+
+    // Used to receive events from widgets where SIGNALS aren't available or implemented yet.
+    // Required override.
+    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
+
+    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
+    // make sure you pick a unique GUID
+    static const GUID& GetClassID()
+    {
+        // {CEE50D0E-46A8-4CB4-9C5F-DCD374A78032}
+        static const GUID guid =
+        {
+            0xcee50d0e, 0x46a8, 0x4cb4, { 0x9c, 0x5f, 0xdc, 0xd3, 0x74, 0xa7, 0x80, 0x32 }
+        };
+        return guid;
+    }
+
+private:
+    AzToolsFramework::EntityOutlinerWidget* m_outlinerWidget;
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.cpp
new file mode 100644
index 0000000000..471ca7dad3
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.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 "ComponentEntityEditorPlugin_precompiled.h"
+
+#include "UI/QComponentLevelEntityEditorMainWindow.h"
+
+#include <AzCore/Component/Entity.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
+#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+
+#include <QVBoxLayout>
+
+QComponentLevelEntityEditorInspectorWindow::QComponentLevelEntityEditorInspectorWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , m_propertyEditor(nullptr)
+{
+    GetIEditor()->RegisterNotifyListener(this);
+    AzToolsFramework::SliceMetadataEntityContextNotificationBus::Handler::BusConnect();
+
+    Init();
+}
+
+QComponentLevelEntityEditorInspectorWindow::~QComponentLevelEntityEditorInspectorWindow()
+{
+    AzToolsFramework::SliceMetadataEntityContextNotificationBus::Handler::BusDisconnect();
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+void QComponentLevelEntityEditorInspectorWindow::Init()
+{
+    QVBoxLayout* layout = new QVBoxLayout();
+
+    m_propertyEditor = new AzToolsFramework::EntityPropertyEditor(nullptr, Qt::WindowFlags(), true);
+    layout->addWidget(m_propertyEditor);
+
+    // On initialization, notify our property editor about the root metadata entity if it exists
+    RefreshPropertyEditor();
+
+    QWidget* window = new QWidget();
+    window->setLayout(layout);
+    setCentralWidget(window);
+}
+
+void QComponentLevelEntityEditorInspectorWindow::OnMetadataEntityAdded(AZ::EntityId entityId)
+{
+    AZ::EntityId rootSliceMetaDataEntity = GetRootMetaDataEntityId();
+    if (rootSliceMetaDataEntity == entityId)
+    {
+        AzToolsFramework::EntityIdSet entities;
+        entities.insert(rootSliceMetaDataEntity);
+        m_propertyEditor->SetOverrideEntityIds(entities);
+    }
+}
+
+void QComponentLevelEntityEditorInspectorWindow::RefreshPropertyEditor()
+{
+    AZ::EntityId rootSliceMetaDataEntity = GetRootMetaDataEntityId();
+    OnMetadataEntityAdded(rootSliceMetaDataEntity);
+}
+
+AZ::EntityId QComponentLevelEntityEditorInspectorWindow::GetRootMetaDataEntityId() const
+{
+    AZ::EntityId levelEntityId;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(levelEntityId, &AzToolsFramework::ToolsApplicationRequests::GetCurrentLevelEntityId);
+    return levelEntityId;
+}
+
+void QComponentLevelEntityEditorInspectorWindow::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+            // Refresh the Level Component Property Editor any time we start or end
+            // a level creation or load.
+            case eNotify_OnBeginLoad:
+            case eNotify_OnEndLoad:
+            case eNotify_OnBeginCreate:
+            case eNotify_OnEndCreate:
+                RefreshPropertyEditor();
+                break;
+            default:
+                break;
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// End of context menu handling
+///////////////////////////////////////////////////////////////////////////////
+
+#include <UI/moc_QComponentLevelEntityEditorMainWindow.cpp>
+
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.h
new file mode 100644
index 0000000000..20d59d190a
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.h
@@ -0,0 +1,71 @@
+/*
+ * 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 <QMainWindow>
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <Editor/IEditor.h>
+#include <AzToolsFramework/Slice/SliceMetadataEntityContextBus.h>
+#endif
+
+class QObjectPropertyModel;
+class PropertyInfo;
+
+namespace AZ
+{
+    class Entity;
+}
+
+namespace AzToolsFramework
+{
+    class ReflectedPropertyEditor;
+    class EntityPropertyEditor;
+}
+
+// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
+class QComponentLevelEntityEditorInspectorWindow
+    : public QMainWindow
+    , public AzToolsFramework::SliceMetadataEntityContextNotificationBus::Handler
+    , private IEditorNotifyListener
+{
+    Q_OBJECT
+
+public:
+    explicit QComponentLevelEntityEditorInspectorWindow(QWidget* parent = 0);
+    ~QComponentLevelEntityEditorInspectorWindow();
+
+    void Init();
+
+    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
+    // make sure you pick a unique GUID
+    static const GUID& GetClassID()
+    {
+        //{F539C646-7FC6-4AF4-BB58-F8A161AF6746}
+        static const GUID guid =
+        {
+            0xF539C646, 0x7FC6, 0x4AF4, { 0x8a, 0x9c, 0xf8, 0xa1, 0x61, 0xaf, 0x67, 0x46 }
+        };
+        return guid;
+    }
+
+    AzToolsFramework::EntityPropertyEditor* GetPropertyEditor() { return m_propertyEditor; }
+
+private:
+    void OnMetadataEntityAdded(AZ::EntityId /*entityId*/) override;
+
+    void RefreshPropertyEditor();
+
+    AZ::EntityId GetRootMetaDataEntityId() const;
+
+    //////////////////////////////////////////////////////////////////////////
+    // IEditorEventListener
+    void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+
+    AzToolsFramework::EntityPropertyEditor* m_propertyEditor;
+};
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake b/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake
new file mode 100644
index 0000000000..1f7c3c0388
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake
@@ -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(FILES
+    dllmain.cpp
+    ComponentEntityEditorPlugin.h
+    ComponentEntityEditorPlugin.cpp
+    SandboxIntegration.h
+    SandboxIntegration.cpp
+    ComponentEntityEditorPlugin_precompiled.h
+    UI/QComponentEntityEditorMainWindow.h
+    UI/QComponentEntityEditorMainWindow.cpp
+    UI/QComponentLevelEntityEditorMainWindow.h
+    UI/QComponentLevelEntityEditorMainWindow.cpp
+    UI/QComponentEntityEditorOutlinerWindow.h
+    UI/QComponentEntityEditorOutlinerWindow.cpp
+    UI/AssetCatalogModel.h
+    UI/AssetCatalogModel.cpp
+    UI/ComponentPalette/CategoriesList.h
+    UI/ComponentPalette/CategoriesList.cpp
+    UI/ComponentPalette/ComponentDataModel.h
+    UI/ComponentPalette/ComponentDataModel.cpp
+    UI/ComponentPalette/ComponentPaletteSettings.h
+    UI/ComponentPalette/ComponentPaletteWindow.h
+    UI/ComponentPalette/ComponentPaletteWindow.cpp
+    UI/ComponentPalette/FavoriteComponentList.h
+    UI/ComponentPalette/FavoriteComponentList.cpp
+    UI/ComponentPalette/FilteredComponentList.h
+    UI/ComponentPalette/FilteredComponentList.cpp
+    UI/ComponentPalette/InformationPanel.h
+    UI/ComponentPalette/InformationPanel.cpp
+    UI/Outliner/OutlinerDisplayOptionsMenu.h
+    UI/Outliner/OutlinerDisplayOptionsMenu.cpp
+    UI/Outliner/OutlinerTreeView.hxx
+    UI/Outliner/OutlinerTreeView.cpp
+    UI/Outliner/OutlinerWidget.hxx
+    UI/Outliner/OutlinerWidget.cpp
+    UI/Outliner/OutlinerCacheBus.h
+    UI/Outliner/OutlinerListModel.hxx
+    UI/Outliner/OutlinerListModel.cpp
+    UI/Outliner/OutlinerSearchWidget.h
+    UI/Outliner/OutlinerSearchWidget.cpp
+    UI/Outliner/OutlinerSortFilterProxyModel.hxx
+    UI/Outliner/OutlinerSortFilterProxyModel.cpp
+    UI/Outliner/OutlinerWidget.ui
+    UI/Outliner/resources.qrc
+    UI/Outliner/EntityOutliner.qss
+    Objects/ComponentEntityObject.h
+    Objects/ComponentEntityObject.cpp
+)
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_test_files.cmake b/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_test_files.cmake
new file mode 100644
index 0000000000..dd41f570b4
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_test_files.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(FILES
+    Tests/test_Main.cpp
+    Tests/ComponentEntityObjectStateTests.cpp
+    Objects/ComponentEntityObject.h
+    Objects/ComponentEntityObject.cpp
+)
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/dllmain.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/dllmain.cpp
new file mode 100644
index 0000000000..8e648bced8
--- /dev/null
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/dllmain.cpp
@@ -0,0 +1,50 @@
+/*
+ * 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 "ComponentEntityEditorPlugin_precompiled.h"
+
+// All plugins suffer from the following warning:
+//  warning C4273: 'GetIEditor' : inconsistent dll linkage
+// GetIEditor() is forward-declared using EDITOR_CORE_API, which without EDITOR_CORE set,
+// results in dllimport rather than dllexport. This define ensure it's consistently and
+// properly defined for export.
+#define EDITOR_CORE
+
+#include <platform.h>
+
+#include <IEditor.h>
+#include <Include/IPlugin.h>
+#include <Include/IEditorClassFactory.h>
+#include "ComponentEntityEditorPlugin.h"
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
+typedef HANDLE HINSTANCE;
+#define DLL_PROCESS_ATTACH 1
+#endif
+
+IEditor* g_pEditor = nullptr;
+
+//------------------------------------------------------------------
+PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
+{
+    g_pEditor = pInitParam->pIEditorInterface;
+    ISystem* pSystem = pInitParam->pIEditorInterface->GetSystem();
+    ModuleInitISystem(pSystem, "ComponentEntityEditorPlugin");
+    return new ComponentEntityEditorPlugin(g_pEditor);
+}
+
+//------------------------------------------------------------------
+HINSTANCE g_hInstance = 0;
+BOOL __stdcall DllMain(HINSTANCE hinstDLL, ULONG fdwReason, [[maybe_unused]] LPVOID lpvReserved)
+{
+    if (fdwReason == DLL_PROCESS_ATTACH)
+    {
+        g_hInstance = hinstDLL;
+    }
+
+    return TRUE;
+}
diff --git a/Code/Editor/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp b/Code/Editor/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp
new file mode 100644
index 0000000000..44bd87994c
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/AssetBrowserContextProvider.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 "EditorAssetImporter_precompiled.h"
+#include <AssetBrowserContextProvider.h>
+#include <AssetImporterPlugin.h>
+#include <QtCore/QMimeData>
+#include <QMenu>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
+#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h> // for ebus events
+#include <AzFramework/StringFunc/StringFunc.h>
+
+namespace AZ
+{
+    using namespace AzToolsFramework::AssetBrowser;
+
+    AssetBrowserContextProvider::AssetBrowserContextProvider()
+    {
+        BusConnect();
+    }
+
+    AssetBrowserContextProvider::~AssetBrowserContextProvider()
+    {
+        BusDisconnect();
+    }
+
+    bool AssetBrowserContextProvider::HandlesSource(const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry* entry) const
+    {
+        AZStd::unordered_set<AZStd::string> extensions;
+        EBUS_EVENT(AZ::SceneAPI::Events::AssetImportRequestBus, GetSupportedFileExtensions, extensions);
+        if (extensions.empty())
+        {
+            return false;
+        }
+
+        AZStd::string targetExtension = entry->GetExtension();
+
+        for (const AZStd::string& potentialExtension : extensions)
+        {
+            const char* extension = potentialExtension.c_str();
+
+            if (AzFramework::StringFunc::Equal(extension, targetExtension.c_str()))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void AssetBrowserContextProvider::AddSourceFileOpeners([[maybe_unused]] const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers)
+    {
+        using namespace AzToolsFramework;
+
+        if (const SourceAssetBrowserEntry* source = SourceAssetBrowserEntry::GetSourceByUuid(sourceUUID))
+        {
+            if (!HandlesSource(source))
+            {
+                return;
+            }
+        }
+        else
+        {
+            // its not something we can actually open if its not a source file at all
+            return;
+        }
+
+        openers.push_back({ "O3DE_FBX_Settings_Edit", "Edit Settings...", QIcon(), [](const char* fullSourceFileNameInCallback, const AZ::Uuid& /*sourceUUID*/)
+        {
+            AZStd::string sourceName(fullSourceFileNameInCallback); // because the below call absolutely requires a AZStd::string.
+            AssetImporterPlugin::GetInstance()->EditImportSettings(sourceName);
+        } });
+    }
+
+    AzToolsFramework::AssetBrowser::SourceFileDetails AssetBrowserContextProvider::GetSourceFileDetails(const char* fullSourceFileName)
+    {
+        AZStd::string extensionString;
+        if (AzFramework::StringFunc::Path::GetExtension(fullSourceFileName, extensionString, true))
+        {
+            // this does include the "." in the extension.
+            AZStd::unordered_set<AZStd::string> extensions;
+            EBUS_EVENT(AZ::SceneAPI::Events::AssetImportRequestBus, GetSupportedFileExtensions, extensions);
+            for (AZStd::string potentialExtension : extensions)
+            {
+                if (AzFramework::StringFunc::Equal(extensionString.c_str(), potentialExtension.c_str()))
+                {
+                    return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/FBX_16.png");
+                }
+            }
+        }
+
+        return AzToolsFramework::AssetBrowser::SourceFileDetails();
+    }
+}
diff --git a/Code/Editor/Plugins/EditorAssetImporter/AssetBrowserContextProvider.h b/Code/Editor/Plugins/EditorAssetImporter/AssetBrowserContextProvider.h
new file mode 100644
index 0000000000..8399da1f62
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/AssetBrowserContextProvider.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
+
+class QMimeData;
+
+namespace AzToolsFramework
+{
+    namespace AssetBrowser
+    {
+        class SourceAssetBrowserEntry;
+        class AssetBrowserEntry;
+    }
+}
+
+namespace AZ
+{
+    class AssetBrowserContextProvider
+        : public AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
+    {
+    public:
+        AssetBrowserContextProvider();
+        ~AssetBrowserContextProvider() override;
+     
+        /////////////////////////////////////////////////////////////////////////////////////////////////////
+        // AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
+        void AddSourceFileOpeners(const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers) override;
+        AzToolsFramework::AssetBrowser::SourceFileDetails GetSourceFileDetails(const char* fullSourceFileName) override;
+        /////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    protected:
+        bool HandlesSource(const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry* entry) const; // return true if we care about this kind of source file.
+    };
+}
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporter.qrc b/Code/Editor/Plugins/EditorAssetImporter/AssetImporter.qrc
similarity index 100%
rename from Code/Sandbox/Plugins/EditorAssetImporter/AssetImporter.qrc
rename to Code/Editor/Plugins/EditorAssetImporter/AssetImporter.qrc
diff --git a/Code/Editor/Plugins/EditorAssetImporter/AssetImporterDocument.cpp b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterDocument.cpp
new file mode 100644
index 0000000000..adf4105807
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterDocument.cpp
@@ -0,0 +1,113 @@
+/*
+ * 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 "EditorAssetImporter_precompiled.h"
+#include <AssetImporterDocument.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneCore/Export/MtlMaterialExporter.h>
+#include <Util/PathUtil.h>
+#include <GFxFramework/MaterialIO/IMaterial.h>
+#include <SceneAPI/SceneCore/Containers/Views/PairIterator.h>
+#include <SceneAPI/SceneCore/Containers/Views/FilterIterator.h>
+#include <SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h>
+#include <SceneAPI/SceneCore/DataTypes/Rules/IMaterialRule.h>
+#include <SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h>
+#include <SceneAPI/SceneCore/DataTypes/Groups/ISkeletonGroup.h>
+#include <SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h>
+#include <SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h>
+#include <SceneAPI/SceneCore/DataTypes/ManifestBase/ISceneNodeSelectionList.h>
+#include <SceneAPI/SceneCore/Events/SceneSerializationBus.h>
+#include <SceneAPI/SceneCore/Utilities/SceneGraphSelector.h>
+#include <SceneAPI/SceneCore/Utilities/FileUtilities.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <IEditor.h>
+#include <ISourceControl.h>
+#include <QFile>
+#include <QWidget>
+#include <QMessageBox>
+#include <QPushButton>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+
+#include <ActionOutput.h>
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
+
+AssetImporterDocument::AssetImporterDocument()
+{
+}
+
+bool AssetImporterDocument::LoadScene(const AZStd::string& sceneFullPath)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    namespace SceneEvents = AZ::SceneAPI::Events;
+    SceneEvents::SceneSerializationBus::BroadcastResult(m_scene, &SceneEvents::SceneSerializationBus::Events::LoadScene, sceneFullPath, AZ::Uuid::CreateNull());
+    return !!m_scene;
+}
+
+void AssetImporterDocument::SaveScene(AZStd::shared_ptr<AZ::ActionOutput>& output, AZ::SaveCompleteCallback onSaveComplete)
+{
+    if (!m_scene)
+    {
+        if (output)
+        {
+            output->AddError("No scene file was loaded.");
+        }
+
+        if (onSaveComplete)
+        {
+            onSaveComplete(false);
+        }
+
+        return;
+    }
+
+    m_saveRunner = AZStd::make_shared<AZ::AsyncSaveRunner>();
+
+    // Add a no-op saver to put the FBX into source control. The benefit of doing it this way
+    //  rather than invoking the SourceControlCommands bus directly is that we enable ourselves
+    //  to have a single callback point for fbx & the manifest.
+    auto fbxNoOpSaver = m_saveRunner->GenerateController();
+    fbxNoOpSaver->AddSaveOperation(m_scene->GetSourceFilename(), nullptr);
+
+    // Save the manifest
+    SaveManifest();
+
+    m_saveRunner->Run(output,
+        [this, onSaveComplete](bool success)
+        {
+            if (onSaveComplete)
+            {
+                onSaveComplete(success);
+            }
+
+            m_saveRunner = nullptr;
+    }, AZ::AsyncSaveRunner::ControllerOrder::Sequential);
+}
+
+void AssetImporterDocument::ClearScene()
+{
+    m_scene.reset();
+}
+
+void AssetImporterDocument::SaveManifest()
+{
+    // Create the save controller and add the save operation for the manifest job to it
+    AZStd::shared_ptr<AZ::SaveOperationController> saveController = m_saveRunner->GenerateController();
+
+    saveController->AddSaveOperation(m_scene->GetManifestFilename(),
+        [this](const AZStd::string& fullPath, const AZStd::shared_ptr<AZ::ActionOutput>& actionOutput) -> bool
+        {
+            AZ_UNUSED(actionOutput);
+            return m_scene->GetManifest().SaveToFile(fullPath.c_str());
+        });
+}
+
+AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& AssetImporterDocument::GetScene()
+{
+    return m_scene;
+}
diff --git a/Code/Editor/Plugins/EditorAssetImporter/AssetImporterDocument.h b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterDocument.h
new file mode 100644
index 0000000000..a35f3cd641
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterDocument.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
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Asset Importer Document hosts FBX back-end data storage and access,
+// loading and saving APIs.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#include <string>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/list.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/map.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <SaveUtilities/AsyncSaveRunner.h>
+
+class QWidget;
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace DataTypes
+        {
+            class ISceneNodeGroup;
+            class IMeshGroup;
+            class ISkeletonGroup;
+            class ISkinGroup;
+            class IAnimationGroup;
+            class IMaterialRule;
+            class IActorGroup;
+            class IEFXMotionGroup;
+        }
+    }
+}
+
+class AssetImporterDocument
+{
+public:
+    AssetImporterDocument();
+    virtual ~AssetImporterDocument() = default;
+
+    bool LoadScene(const AZStd::string& sceneFullPath);
+    void SaveScene(AZStd::shared_ptr<AZ::ActionOutput>& output, AZ::SaveCompleteCallback onSaveComplete);
+    void ClearScene();
+
+    AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& GetScene();
+    
+protected:
+    void SaveManifest();
+
+    AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene> m_scene;
+    AZStd::shared_ptr<AZ::AsyncSaveRunner> m_saveRunner;
+};
diff --git a/Code/Editor/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp
new file mode 100644
index 0000000000..260d8714a5
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp
@@ -0,0 +1,104 @@
+/*
+ * 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 "EditorAssetImporter_precompiled.h"
+#include <AssetImporterPlugin.h>
+#include <AssetImporterWindow.h>
+#include <QtViewPaneManager.h>
+#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <LyViewPaneNames.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+AssetImporterPlugin* AssetImporterPlugin::s_instance;
+
+AssetImporterPlugin::AssetImporterPlugin(IEditor* editor)
+    : m_editor(editor)
+    , m_toolName(LyViewPane::SceneSettings)
+    , m_assetBrowserContextProvider()
+    , m_sceneSerializationHandler()
+{
+    s_instance = this;
+
+    m_sceneUIModule = LoadSceneLibrary("SceneUI", true);
+
+    m_sceneSerializationHandler.Activate();
+    
+    AzToolsFramework::ViewPaneOptions opt;
+    opt.isPreview = true;
+    opt.showInMenu = false; // this view pane is used to display scene settings, but the user never opens it directly through the Tools menu
+    opt.saveKeyName = "Scene Settings (PREVIEW)"; // user settings for this pane were originally saved with PREVIEW, so ensure that's how they are loaded as well, even after the PREVIEW is removed from the name
+    AzToolsFramework::RegisterViewPane<AssetImporterWindow>(m_toolName.c_str(), LyViewPane::CategoryTools, opt);
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::CreateAndAddEntityFromComponentTags,
+        AZStd::vector<AZ::Crc32>({ AZ::SceneAPI::Events::AssetImportRequest::GetAssetImportRequestComponentTag() }), "AssetImportersEntity");
+}
+
+void AssetImporterPlugin::Release()
+{
+    AzToolsFramework::UnregisterViewPane(m_toolName.c_str());
+    m_sceneSerializationHandler.Deactivate();
+
+    auto uninit = m_sceneUIModule->GetFunction<AZ::UninitializeDynamicModuleFunction>(AZ::UninitializeDynamicModuleFunctionName);
+    if (uninit)
+    {
+        (*uninit)();
+    }
+    m_sceneUIModule.reset();
+}
+
+AZStd::unique_ptr<AZ::DynamicModuleHandle> AssetImporterPlugin::LoadSceneLibrary(const char* name, bool explicitInit)
+{
+    using ReflectFunc = void(*)(AZ::SerializeContext*);
+
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> module = AZ::DynamicModuleHandle::Create(name);
+    if (module)
+    {
+        module->Load(false);
+
+        if (explicitInit)
+        {
+            // Explicitly initialize all modules. Because we're loading them twice (link time, and now-time), we need to explicitly uninit them.
+            auto init = module->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
+            if (init)
+            {
+                (*init)(AZ::Environment::GetInstance());
+            }
+        }
+
+        ReflectFunc reflect = module->GetFunction<ReflectFunc>("Reflect");
+        if (reflect)
+        {
+            (*reflect)(nullptr);
+        }
+        return module;
+    }
+    else
+    {
+        AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to initialize library '%s'", name);
+        return nullptr;
+    }
+}
+
+void AssetImporterPlugin::EditImportSettings(const AZStd::string& sourceFilePath)
+{
+    const QtViewPane* assetImporterPane = GetIEditor()->OpenView(m_toolName.c_str());
+
+    if(!assetImporterPane)
+    {
+        return;
+    }
+
+    AssetImporterWindow* assetImporterWindow = qobject_cast<AssetImporterWindow*>(assetImporterPane->Widget());
+    if (!assetImporterWindow)
+    {
+        return;
+    }
+
+    assetImporterWindow->OpenFile(sourceFilePath);
+}
diff --git a/Code/Editor/Plugins/EditorAssetImporter/AssetImporterPlugin.h b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterPlugin.h
new file mode 100644
index 0000000000..8c59cc138b
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterPlugin.h
@@ -0,0 +1,95 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Asset Importer Sandbox Plugin
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#include <IEditor.h>
+#include <Include/IPlugin.h>
+#include <AzCore/Module/DynamicModuleHandle.h>
+#include <AssetBrowserContextProvider.h>
+#include <SceneSerializationHandler.h>
+
+class AssetImporterPlugin
+    : public IPlugin
+{
+    // Create plugin instance, only accessible to CreatePluginInstance
+    // If you need instance, use static GetInstance()
+    friend IPlugin* ::CreatePluginInstance(PLUGIN_INIT_PARAM* initParam);
+    AssetImporterPlugin(IEditor* editor);
+
+public:
+    // Get the singleton instance of the plugin
+    static AssetImporterPlugin* GetInstance()
+    {
+        return s_instance;
+    }
+
+    // Get the editor used to create this plugin
+    IEditor* GetIEditor()
+    {
+        return m_editor;
+    }
+
+    const string& GetToolName() const
+    {
+        return m_toolName;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////
+    // IPlugin implementation
+    void Release() override;
+    void ShowAbout() override
+    {
+    }
+    const char* GetPluginGUID() override
+    {
+        return "{0abf28f2-ef56-4ac9-a459-175abb40d649}";
+    }
+    DWORD GetPluginVersion() override
+    {
+        return 1;
+    }
+    const char* GetPluginName() override
+    {
+        return "QtAssetImporter";
+    }
+    bool CanExitNow() override
+    {
+        return true;
+    }
+    void OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId) override
+    {
+    }
+    /////////////////////////////////////////////////////////////////////////////
+
+    void EditImportSettings(const AZStd::string& sourceFilePath);
+
+private:
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> LoadSceneLibrary(const char* name, bool explicitInit);
+    
+    // Singleton instance
+    static AssetImporterPlugin* s_instance;
+
+    // Dependency DLL Handles
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> m_sceneUIModule;
+    
+    // The editor used to construct the plugin
+    IEditor* const m_editor;
+
+    // Tool name
+    string m_toolName;
+
+    // Context provider for the Asset Browser
+    AZ::AssetBrowserContextProvider m_assetBrowserContextProvider;
+    AZ::SceneSerializationHandler m_sceneSerializationHandler;
+};
diff --git a/Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.cpp b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.cpp
new file mode 100644
index 0000000000..b72516876b
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.cpp
@@ -0,0 +1,552 @@
+/*
+ * 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 "EditorAssetImporter_precompiled.h"
+#include <AssetImporterWindow.h>
+#include <ui_AssetImporterWindow.h>
+#include <AssetImporterPlugin.h>
+#include <ImporterRootDisplay.h>
+
+#include <QTimer>
+#include <QFile>
+#include <QFileDialog>
+#include <QCloseEvent>
+#include <QMessageBox>
+#include <QDesktopServices>
+#include <QUrl>
+#include <QDockWidget>
+#include <QLabel>
+
+class IXMLDOMDocumentPtr; // Needed for settings.h
+class CXTPDockingPaneLayout; // Needed for settings.h
+#include <Settings.h>
+
+#include <AzQtComponents/Components/StylesheetPreprocessor.h>
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/std/functional.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzCore/std/string/conversions.h>
+#include <Util/PathUtil.h>
+#include <ActionOutput.h>
+
+#include <SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h>
+#include <SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.h>
+#include <SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.h>
+#include <SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.h>
+#include <SceneAPI/SceneUI/SceneWidgets/ManifestWidget.h>
+#include <SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.h>
+#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+
+const char* AssetImporterWindow::s_documentationWebAddress = "http://docs.aws.amazon.com/lumberyard/latest/userguide/char-fbx-importer.html";
+const AZ::Uuid AssetImporterWindow::s_browseTag = AZ::Uuid::CreateString("{C240D2E1-BFD2-4FFA-BB5B-CC0FA389A5D3}");
+
+void MakeUserFriendlySourceAssetPath(QString& out, const QString& sourcePath)
+{
+    char devAssetsRoot[AZ_MAX_PATH_LEN] = { 0 };
+    if (!gEnv->pFileIO->ResolvePath("@devroot@", devAssetsRoot, AZ_MAX_PATH_LEN))
+    {
+        out = sourcePath;
+        return;
+    }
+
+    AZStd::replace(devAssetsRoot, devAssetsRoot + AZ_MAX_PATH_LEN- 1, AZ_WRONG_FILESYSTEM_SEPARATOR, AZ_CORRECT_FILESYSTEM_SEPARATOR);
+ 
+    // Find if the sourcePathArray is a sub directory of the devAssets folder 
+    // Keep reference to sourcePathArray long enough to use in PathView
+    QByteArray sourcePathArray = sourcePath.toUtf8();
+    AZ::IO::PathView sourcePathRootView(sourcePathArray.data());
+    AZ::IO::PathView devAssetsRootView(devAssetsRoot);
+    auto [sourcePathIter, devAssetsIter] = AZStd::mismatch(sourcePathRootView.begin(), sourcePathRootView.end(),
+        devAssetsRootView.begin(), devAssetsRootView.end());
+    // If the devAssets path iterator is not equal to the end, then there was a mismistch while comparing it
+    // against the source path indicating that the source path is not a sub-directory
+    if (devAssetsIter != devAssetsRootView.end())
+    {
+        out = sourcePath;
+        return;
+    }
+
+    int offset = aznumeric_cast<int>(strlen(devAssetsRoot));
+    if (sourcePath.at(offset) == AZ_CORRECT_FILESYSTEM_SEPARATOR)
+    {
+        ++offset;
+    }
+    out = sourcePath.right(sourcePath.length() - offset);
+
+}
+
+AssetImporterWindow::AssetImporterWindow()
+    : AssetImporterWindow(nullptr)
+{
+}
+
+AssetImporterWindow::AssetImporterWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , ui(new Ui::AssetImporterWindow)
+    , m_assetImporterDocument(new AssetImporterDocument())
+    , m_serializeContext(nullptr)
+    , m_rootDisplay(nullptr)
+    , m_overlay(nullptr)
+    , m_isClosed(false)
+    , m_processingOverlayIndex(AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex)
+{
+    Init();
+}
+
+AssetImporterWindow::~AssetImporterWindow()
+{
+    AZ_Assert(m_processingOverlayIndex == AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex, 
+        "Processing overlay (and potentially background thread) still active at destruction.");
+    AZ_Assert(!m_processingOverlay, "Processing overlay (and potentially background thread) still active at destruction.");
+}
+
+void AssetImporterWindow::OpenFile(const AZStd::string& filePath)
+{
+    if (m_processingOverlay)
+    {
+        QMessageBox::warning(this, "In progress", "Please wait for the previous task to complete before opening a new file.");
+        return;
+    }
+
+    if (!m_overlay->CanClose())
+    {
+        QMessageBox::warning(this, "In progress", "Unable to close one or more windows at this time.");
+        return;
+    }
+
+    // Make sure we are not browsing *over* a current editing operation
+    if (!IsAllowedToChangeSourceFile())
+    {
+        // Issue will already have been reported to the user.
+        return;
+    }
+
+    if (!m_overlay->PopAllLayers())
+    {
+        QMessageBox::warning(this, "In progress", "Unable to close one or more windows at this time.");
+        return;
+    }
+    
+    OpenFileInternal(filePath);
+}
+
+void AssetImporterWindow::closeEvent(QCloseEvent* ev)
+{
+    if (m_isClosed)
+    {
+        return;
+    }
+
+    if (m_processingOverlay)
+    {
+        AZ_Assert(m_processingOverlayIndex != AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex, 
+            "Processing overlay present, but not the index in the overlay for it.");
+        if (m_processingOverlay->HasProcessingCompleted())
+        {
+            if (m_overlay->PopLayer(m_processingOverlayIndex))
+            {
+                m_processingOverlayIndex = AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex;
+                m_processingOverlay.reset(nullptr);
+            }
+            else
+            {
+                QMessageBox::critical(this, "Processing In Progress", "Unable to close the result window at this time.", 
+                    QMessageBox::Ok, QMessageBox::Ok);
+                ev->ignore();
+                return;
+            }
+        }
+        else
+        {
+            QMessageBox::critical(this, "Processing In Progress", "Please wait until processing has completed to try again.", 
+                QMessageBox::Ok, QMessageBox::Ok);
+            ev->ignore();
+            return;
+        }
+    }
+
+    if (!m_overlay->CanClose())
+    {
+        QMessageBox::critical(this, "Unable to close", "Unable to close one or more windows at this time.",
+            QMessageBox::Ok, QMessageBox::Ok);
+        ev->ignore();
+        return;
+    }
+
+    if (!IsAllowedToChangeSourceFile())
+    {
+        ev->ignore();
+        return;
+    }
+
+    ev->accept();
+    m_isClosed = true;
+}
+
+void AssetImporterWindow::Init()
+{
+    // Serialization and reflection framework setup
+    EBUS_EVENT_RESULT(m_serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(m_serializeContext, "Serialization context not available");
+
+    // Load the style sheets
+    AzQtComponents::StylesheetPreprocessor styleSheetProcessor(nullptr);
+
+    AZStd::string mainWindowQSSPath = Path::GetEditingRootFolder() + "\\Editor\\Styles\\AssetImporterWindow.qss";
+    QFile mainWindowStyleSheetFile(mainWindowQSSPath.c_str());
+    if (mainWindowStyleSheetFile.open(QFile::ReadOnly))
+    {
+        setStyleSheet(styleSheetProcessor.ProcessStyleSheet(mainWindowStyleSheetFile.readAll()));
+    }
+
+    ui->setupUi(this);
+
+    if (!gSettings.enableSceneInspector)
+    {
+        ui->m_actionInspect->setVisible(false);
+    }
+    
+    ResetMenuAccess(WindowState::InitialNothingLoaded);
+
+    // Setup the overlay system, and set the root to be the root display. The root display has the browse,
+    //  the Import button & the cancel button, which are handled here by the window.
+    m_overlay.reset(aznew AZ::SceneAPI::UI::OverlayWidget(this));
+    m_rootDisplay.reset(aznew ImporterRootDisplay(m_serializeContext));
+    connect(m_rootDisplay.data(), &ImporterRootDisplay::UpdateClicked, this, &AssetImporterWindow::UpdateClicked);
+    
+    connect(m_overlay.data(), &AZ::SceneAPI::UI::OverlayWidget::LayerAdded, this, &AssetImporterWindow::OverlayLayerAdded);
+    connect(m_overlay.data(), &AZ::SceneAPI::UI::OverlayWidget::LayerRemoved, this, &AssetImporterWindow::OverlayLayerRemoved);
+
+    m_overlay->SetRoot(m_rootDisplay.data());
+    ui->m_mainArea->layout()->addWidget(m_overlay.data());
+
+    // Filling the initial browse prompt text to be programmatically set from available extensions
+    AZStd::unordered_set<AZStd::string> extensions;
+    EBUS_EVENT(AZ::SceneAPI::Events::AssetImportRequestBus, GetSupportedFileExtensions, extensions);
+    AZ_Assert(!extensions.empty(), "No file extensions defined for assets.");
+    if (!extensions.empty())
+    {
+        for (AZStd::string& extension : extensions)
+        {
+            extension = extension.substr(1);
+            AZStd::to_upper(extension.begin(), extension.end());
+        }
+
+        AZStd::string joinedExtensions;
+        AzFramework::StringFunc::Join(joinedExtensions, extensions.begin(), extensions.end(), " or ");
+
+        AZStd::string firstLineText = 
+            AZStd::string::format(
+                "%s files are available for use after placing them in any folder within your game project. "
+                "These files will automatically be processed and may be accessed via the Asset Browser. <a href=\"%s\">Learn more...</a>",
+                joinedExtensions.c_str(), s_documentationWebAddress);
+
+        ui->m_initialPromptFirstLine->setText(firstLineText.c_str());
+
+        AZStd::string secondLineText = 
+            AZStd::string::format("To adjust the %s settings, right-click the file in the Asset Browser and select \"Edit Settings\" from the context menu.", joinedExtensions.c_str());
+        ui->m_initialPromptSecondLine->setText(secondLineText.c_str());
+    }
+    else
+    {
+        AZStd::string firstLineText = 
+            AZStd::string::format(
+                "Files are available for use after placing them in any folder within your game project. "
+                "These files will automatically be processed and may be accessed via the Asset Browser. <a href=\"%s\">Learn more...</a>", s_documentationWebAddress);
+
+        ui->m_initialPromptFirstLine->setText(firstLineText.c_str());
+
+        AZStd::string secondLineText = "To adjust the settings, right-click the file in the Asset Browser and select \"Edit Settings\" from the context menu.";
+        ui->m_initialPromptSecondLine->setText(secondLineText.c_str());
+
+        // Hide the initial browse container so we can show the error (it will be shown again when the overlay pops)
+        ui->m_initialBrowseContainer->hide();
+
+        QMessageBox::critical(this, "No Extensions Detected",
+            "No importable file types were detected. This likely means an internal error has taken place which has broken the "
+            "registration of valid import types (e.g. FBX). This type of issue requires engineering support.");
+    }
+}
+
+void AssetImporterWindow::OpenFileInternal(const AZStd::string& filePath)
+{
+    using namespace AZ::SceneAPI::SceneUI;
+
+    auto asyncLoadHandler = AZStd::make_shared<AZ::SceneAPI::SceneUI::AsyncOperationProcessingHandler>(
+        s_browseTag,
+        [this, filePath]()
+        { 
+            m_assetImporterDocument->LoadScene(filePath); 
+        },
+        [this]()
+        {
+            HandleAssetLoadingCompleted(); 
+        }, this);
+
+    m_processingOverlay.reset(new ProcessingOverlayWidget(m_overlay.data(), ProcessingOverlayWidget::Layout::Loading, s_browseTag));
+    m_processingOverlay->SetAndStartProcessingHandler(asyncLoadHandler);
+    m_processingOverlay->SetAutoCloseOnSuccess(true);
+    connect(m_processingOverlay.data(), &AZ::SceneAPI::SceneUI::ProcessingOverlayWidget::Closing, this, &AssetImporterWindow::ClearProcessingOverlay);
+    m_processingOverlayIndex = m_processingOverlay->PushToOverlay();
+}
+
+bool AssetImporterWindow::IsAllowedToChangeSourceFile()
+{
+    if (!m_rootDisplay->HasUnsavedChanges())
+    {
+        return true;
+    }
+
+    QMessageBox messageBox(QMessageBox::Icon::NoIcon, "Unsaved changes", 
+        "You have unsaved changes. Do you want to discard those changes?",
+        QMessageBox::StandardButton::Discard | QMessageBox::StandardButton::Cancel, this);
+    messageBox.exec();
+    QMessageBox::StandardButton choice = static_cast<QMessageBox::StandardButton>(messageBox.result());
+    return choice == QMessageBox::StandardButton::Discard;
+}
+
+void AssetImporterWindow::UpdateClicked()
+{
+    using namespace AZ::SceneAPI::SceneUI;
+
+    // There are specific measures in place to block re-entry, applying asserts to be safe
+    if (m_processingOverlay)
+    {
+        AZ_Assert(!m_processingOverlay, "Attempted to update asset while processing is in progress.");
+        return;
+    }
+
+    m_processingOverlay.reset(new ProcessingOverlayWidget(m_overlay.data(), ProcessingOverlayWidget::Layout::Exporting, s_browseTag));
+    connect(m_processingOverlay.data(), &ProcessingOverlayWidget::Closing, this, &AssetImporterWindow::ClearProcessingOverlay);
+    m_processingOverlayIndex = m_processingOverlay->PushToOverlay();
+
+    // We need to block closing of the overlay until source control operations are complete
+    m_processingOverlay->BlockClosing();
+
+    m_processingOverlay->OnSetStatusMessage("Saving settings...");
+    bool isSourceControlActive = false;
+    {
+        using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
+        SCRequestBus::BroadcastResult(isSourceControlActive, &SCRequestBus::Events::IsActive);
+    }
+
+    AZStd::shared_ptr<AZ::ActionOutput> output = AZStd::make_shared<AZ::ActionOutput>();
+    m_assetImporterDocument->SaveScene(output,
+        [output, this, isSourceControlActive](bool wasSuccessful)
+        {
+            if (output->HasAnyWarnings())
+            {
+                AZ_TracePrintf(AZ::SceneAPI::Utilities::WarningWindow, "%s", output->BuildWarningMessage().c_str());
+            }
+            if (output->HasAnyErrors())
+            {
+                AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "%s", output->BuildErrorMessage().c_str());
+            }
+
+            if (wasSuccessful)
+            {
+                if (!isSourceControlActive)
+                {
+                    AZ_TracePrintf(AZ::SceneAPI::Utilities::SuccessWindow, "Saving complete");
+                }
+                else
+                {
+                    AZ_TracePrintf(AZ::SceneAPI::Utilities::SuccessWindow, "Saving & source control operations complete");
+                }
+
+                m_rootDisplay->HandleSaveWasSuccessful();
+
+                // Don't attach the job processor until all files are saved.
+                m_processingOverlay->SetAndStartProcessingHandler(AZStd::make_shared<ExportJobProcessingHandler>(s_browseTag, m_fullSourcePath));
+            }
+            else
+            {
+                // This kind of failure means that it's possible the jobs will never actually start,
+                //  so we act like the processing is complete to make it so the user won't be stuck
+                //  in the processing UI in that case.
+                m_processingOverlay->OnProcessingComplete();
+            }
+
+            // Blocking is only used for the period saving is happening. The ExportJobProcessingHandler will inform
+            // the overlay widget when the AP is done with processing, which will also block closing until done.
+            m_processingOverlay->UnblockClosing();
+        }
+    );
+}
+
+void AssetImporterWindow::OnSceneResetRequested()
+{
+    using namespace AZ::SceneAPI::Events;
+    using namespace AZ::SceneAPI::SceneUI;
+    using namespace AZ::SceneAPI::Utilities;
+
+    auto asyncLoadHandler = AZStd::make_shared<AZ::SceneAPI::SceneUI::AsyncOperationProcessingHandler>(
+        s_browseTag,
+        [this]()
+        {
+            m_assetImporterDocument->GetScene()->GetManifest().Clear();
+
+            AZ::SceneAPI::Events::ProcessingResultCombiner result;
+            EBUS_EVENT_RESULT(result, AssetImportRequestBus, UpdateManifest, *m_assetImporterDocument->GetScene(),
+                AssetImportRequest::ManifestAction::ConstructDefault, AssetImportRequest::RequestingApplication::Editor);
+
+            // Specifically using success, because ignore would be an invalid case.
+            // Whenever we do construct default, it should always be done
+            if (result.GetResult() == ProcessingResult::Success)
+            {
+                AZ_TracePrintf(SuccessWindow, "Successfully reset the manifest.");
+            }
+            else
+            {
+                m_assetImporterDocument->ClearScene();
+                AZ_TracePrintf(ErrorWindow, "Manifest reset returned in '%s'", 
+                    result.GetResult() == ProcessingResult::Failure ? "Failure" : "Ignored");
+            }
+        },
+        [this]()
+        {
+            m_rootDisplay->HandleSceneWasReset(m_assetImporterDocument->GetScene());
+        }, this);
+
+    m_processingOverlay.reset(new ProcessingOverlayWidget(m_overlay.data(), ProcessingOverlayWidget::Layout::Resetting, s_browseTag));
+    m_processingOverlay->SetAndStartProcessingHandler(asyncLoadHandler);
+    m_processingOverlay->SetAutoCloseOnSuccess(true);
+    connect(m_processingOverlay.data(), &ProcessingOverlayWidget::Closing, this, &AssetImporterWindow::ClearProcessingOverlay);
+    m_processingOverlayIndex = m_processingOverlay->PushToOverlay();
+}
+
+void AssetImporterWindow::ResetMenuAccess(WindowState state)
+{
+    if (state == WindowState::FileLoaded)
+    {
+        ui->m_actionResetSettings->setEnabled(true);
+        ui->m_actionInspect->setEnabled(true);
+    }
+    else
+    {
+        ui->m_actionResetSettings->setEnabled(false);
+        ui->m_actionInspect->setEnabled(false);
+    }
+}
+
+void AssetImporterWindow::OnOpenDocumentation()
+{
+    QDesktopServices::openUrl(QString(s_documentationWebAddress));
+}
+
+void AssetImporterWindow::OnInspect()
+{
+    AZ::SceneAPI::UI::OverlayWidgetButtonList buttons;
+    AZ::SceneAPI::UI::OverlayWidgetButton closeButton;
+    closeButton.m_text = "Close";
+    closeButton.m_triggersPop = true;
+    buttons.push_back(&closeButton);
+
+    QLabel* label = new QLabel("Please close the inspector to continue editing the settings.");
+    label->setWordWrap(true);
+    label->setAlignment(Qt::AlignCenter);
+
+    // make sure the inspector doesn't outlive the AssetImporterWindow, since we own the data it will be inspecting.
+    auto* theInspectWidget = aznew AZ::SceneAPI::UI::SceneGraphInspectWidget(*m_assetImporterDocument->GetScene());
+    QObject::connect(this, &QObject::destroyed, theInspectWidget, [theInspectWidget]() { theInspectWidget->window()->close(); } );
+    
+    m_overlay->PushLayer(label, theInspectWidget, "Scene Inspector", buttons);
+}
+
+void AssetImporterWindow::OverlayLayerAdded()
+{
+    setCursor(Qt::WaitCursor);
+    ResetMenuAccess(WindowState::OverlayShowing);
+}
+
+void AssetImporterWindow::OverlayLayerRemoved()
+{
+    if (m_isClosed && !m_overlay->IsAtRoot())
+    {
+        return;
+    }
+
+    setCursor(Qt::ArrowCursor);
+
+    // Reset menu access
+    if (m_assetImporterDocument->GetScene())
+    {
+        ResetMenuAccess(WindowState::FileLoaded);
+    }
+    else
+    {
+        ResetMenuAccess(WindowState::InitialNothingLoaded);
+        
+        ui->m_initialBrowseContainer->show();
+        m_rootDisplay->hide();
+    }
+}
+
+void AssetImporterWindow::SetTitle(const char* filePath)
+{
+    QWidget* dock = parentWidget();
+    while (dock)
+    {
+        QDockWidget* converted = qobject_cast<QDockWidget*>(dock);
+        if (converted)
+        {
+            AZStd::string extension;
+            if (AzFramework::StringFunc::Path::GetExtension(filePath, extension, false))
+            {
+                extension[0] = toupper(extension[0]);
+                for (size_t i = 1; i < extension.size(); ++i)
+                {
+                    extension[i] = tolower(extension[i]);
+                }
+            }
+            else
+            {
+                extension = "Scene";
+            }
+            AZStd::string fileName;
+            AzFramework::StringFunc::Path::GetFileName(filePath, fileName);
+            converted->setWindowTitle(QString("%1 Settings (PREVIEW) - %2").arg(extension.c_str(), fileName.c_str()));
+            break;
+        }
+        else
+        {
+            dock = dock->parentWidget();
+        }
+    }
+}
+
+void AssetImporterWindow::HandleAssetLoadingCompleted()
+{
+    if (!m_assetImporterDocument->GetScene())
+    {
+        AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to load scene.");
+        return;
+    }
+
+    m_fullSourcePath = m_assetImporterDocument->GetScene()->GetSourceFilename();
+    SetTitle(m_fullSourcePath.c_str());
+
+    QString userFriendlyFileName;
+    MakeUserFriendlySourceAssetPath(userFriendlyFileName, m_fullSourcePath.c_str());
+    m_rootDisplay->SetSceneDisplay(userFriendlyFileName, m_assetImporterDocument->GetScene());
+
+    // Once we've browsed to something successfully, we need to hide the initial browse button layer and
+    //  show the main area where all the actual work takes place
+    ui->m_initialBrowseContainer->hide();
+    m_rootDisplay->show();
+}
+
+void AssetImporterWindow::ClearProcessingOverlay()
+{
+    m_processingOverlayIndex = AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex;
+    m_processingOverlay.reset(nullptr);
+}
+
+#include <moc_AssetImporterWindow.cpp>
diff --git a/Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.h b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.h
new file mode 100644
index 0000000000..6d4d64ce80
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.h
@@ -0,0 +1,122 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Asset Importer Qt Interface
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#if !defined(Q_MOC_RUN)
+#include <QMainWindow>
+#include <AssetImporterDocument.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#endif
+
+namespace AZStd
+{
+    class thread;
+}
+
+namespace Ui
+{
+    class AssetImporterWindow;
+}
+
+namespace AZ
+{
+    class Module;
+
+    namespace SceneAPI
+    {
+        namespace UI
+        {
+            class OverlayWidget;
+        }
+        namespace SceneUI
+        {
+            class ProcessingOverlayWidget;
+        }
+    }
+}
+
+class ImporterRootDisplay;
+class QCloseEvent;
+class QMenu;
+class QAction;
+
+class AssetImporterWindow
+    : public QMainWindow
+{
+    Q_OBJECT
+public:
+    AssetImporterWindow();
+    explicit AssetImporterWindow(QWidget* parent);
+    ~AssetImporterWindow();
+
+    // This implementation is required for unregister/register on "RegisterQtViewPane"
+    static const GUID& GetClassID()
+    {
+        // {c50c09d6-5bfa-4d49-8542-e350656ed1bc}
+        static const GUID guid = {
+            0xc50c09d6, 0x5bfa, 0x4d49, { 0x85, 0x42, 0xe3, 0x50, 0x65, 0x6e, 0xd1, 0xbc }
+        };
+        return guid;
+    }
+    
+    void OpenFile(const AZStd::string& filePath);
+    
+    void closeEvent(QCloseEvent* ev);
+
+public slots:
+    void OnSceneResetRequested();
+    void OnOpenDocumentation();
+    void OnInspect();
+
+private:
+    void Init();
+    void OpenFileInternal(const AZStd::string& filePath);
+    bool IsAllowedToChangeSourceFile();
+    
+    enum class WindowState
+    {
+        InitialNothingLoaded,
+        FileLoaded,
+        OverlayShowing
+    };
+
+    void ResetMenuAccess(WindowState state);
+    void SetTitle(const char* filePath);
+    void HandleAssetLoadingCompleted();
+    void ClearProcessingOverlay();
+
+private slots:
+    void UpdateClicked();
+    
+    void OverlayLayerAdded();
+    void OverlayLayerRemoved();
+
+private:
+    static const AZ::Uuid s_browseTag;
+    static const char* s_documentationWebAddress;
+
+    QScopedPointer<Ui::AssetImporterWindow> ui;
+    QScopedPointer<AssetImporterDocument> m_assetImporterDocument;
+    QScopedPointer<AZ::SceneAPI::UI::OverlayWidget> m_overlay;
+
+    AZ::SerializeContext* m_serializeContext;
+    AZStd::string m_fullSourcePath;
+
+    QScopedPointer<ImporterRootDisplay> m_rootDisplay;
+    bool m_isClosed;
+
+    int m_processingOverlayIndex;
+    QSharedPointer<AZ::SceneAPI::SceneUI::ProcessingOverlayWidget> m_processingOverlay;
+};
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterWindow.ui b/Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.ui
similarity index 100%
rename from Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterWindow.ui
rename to Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.ui
diff --git a/Code/Editor/Plugins/EditorAssetImporter/CMakeLists.txt b/Code/Editor/Plugins/EditorAssetImporter/CMakeLists.txt
new file mode 100644
index 0000000000..c3db5f32ea
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/CMakeLists.txt
@@ -0,0 +1,42 @@
+#
+# 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 PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+ly_add_target(
+    NAME EditorAssetImporter MODULE
+    NAMESPACE Legacy
+    OUTPUT_SUBDIRECTORY EditorPlugins
+    AUTOMOC
+    AUTOUIC
+    FILES_CMAKE
+        editorassetimporter_files.cmake
+    COMPILE_DEFINITIONS
+        PRIVATE
+            PLUGIN_EXPORTS
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+    BUILD_DEPENDENCIES
+        PRIVATE
+            3rdParty::Qt::Core
+            3rdParty::Qt::Widgets
+            AZ::AzCore
+            AZ::AzToolsFramework
+            AZ::SceneCore
+            AZ::SceneUI
+            AZ::SceneData
+            AZ::GFxFramework
+            Legacy::CryCommon
+            Legacy::EditorLib
+            Legacy::EditorCommon
+)
+
+ly_add_dependencies(Editor EditorAssetImporter)
+set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::EditorAssetImporter>)
diff --git a/Code/Editor/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h b/Code/Editor/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h
new file mode 100644
index 0000000000..d01e8f3560
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#include <AzCore/PlatformDef.h>
+
+#include <platform.h>
diff --git a/Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.cpp b/Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.cpp
new file mode 100644
index 0000000000..0a821b1779
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.cpp
@@ -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
+ *
+ */
+
+#include "EditorAssetImporter_precompiled.h"
+#include <ImporterRootDisplay.h>
+#include <ui_ImporterRootDisplay.h>
+
+#include <IEditor.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h>
+#include <SceneAPI/SceneUI/SceneWidgets/ManifestWidget.h>
+#include <AzCore/Serialization/SerializeContext.h>
+
+ImporterRootDisplay::ImporterRootDisplay(AZ::SerializeContext* serializeContext, QWidget* parent)
+    : QWidget(parent)
+    , ui(new Ui::ImporterRootDisplay())
+    , m_manifestWidget(new AZ::SceneAPI::UI::ManifestWidget(serializeContext))
+    , m_hasUnsavedChanges(false)
+{
+    ui->setupUi(this);
+    ui->m_manifestWidgetAreaLayout->addWidget(m_manifestWidget.data());
+
+    ui->m_updateButton->setEnabled(false);
+    ui->m_updateButton->setProperty("class", "Primary");
+
+    connect(ui->m_updateButton, &QPushButton::clicked, this, &ImporterRootDisplay::UpdateClicked);
+
+    BusConnect();
+}
+
+ImporterRootDisplay::~ImporterRootDisplay()
+{
+    BusDisconnect();
+    delete ui;
+}
+
+AZ::SceneAPI::UI::ManifestWidget* ImporterRootDisplay::GetManifestWidget()
+{
+    return m_manifestWidget.data();
+}
+
+void ImporterRootDisplay::SetSceneDisplay(const QString& headerText, const AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& scene)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    if (!scene)
+    {
+        AZ_Assert(scene, "No scene provided to display.");
+        return;
+    }
+
+    ui->m_filePathText->setText(headerText);
+
+    HandleSceneWasReset(scene);
+
+    ui->m_updateButton->setEnabled(false);
+    m_hasUnsavedChanges = false;
+}
+
+void ImporterRootDisplay::HandleSceneWasReset(const AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& scene)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+    // Don't accept updates while the widget is being filled in.
+    BusDisconnect();
+    m_manifestWidget->BuildFromScene(scene);
+    BusConnect();
+}
+
+void ImporterRootDisplay::HandleSaveWasSuccessful()
+{
+    ui->m_updateButton->setEnabled(false);
+    m_hasUnsavedChanges = false;
+}
+
+bool ImporterRootDisplay::HasUnsavedChanges() const
+{
+    return m_hasUnsavedChanges;
+}
+
+void ImporterRootDisplay::ObjectUpdated(const AZ::SceneAPI::Containers::Scene& scene, const AZ::SceneAPI::DataTypes::IManifestObject* /*target*/, void* /*sender*/)
+{
+    if (m_manifestWidget)
+    {
+        if (&scene == m_manifestWidget->GetScene().get())
+        {
+            m_hasUnsavedChanges = true;
+            ui->m_updateButton->setEnabled(true);
+        }
+    }
+}
+
+#include <moc_ImporterRootDisplay.cpp>
diff --git a/Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.h b/Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.h
new file mode 100644
index 0000000000..8d9c25bc69
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.h
@@ -0,0 +1,80 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#if !defined(Q_MOC_RUN)
+#include <QWidget>
+#include <QScopedPointer>
+
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzCore/Memory/SystemAllocator.h>
+
+#include <SceneAPI/SceneCore/Events/ManifestMetaInfoBus.h>
+#include <SceneAPI/SceneUI/SceneUIConfiguration.h>
+#endif
+
+class QAction;
+class QMenu;
+
+namespace AZ
+{
+    class SerializeContext;
+
+    namespace SceneAPI
+    {
+        namespace Containers
+        {
+            class Scene;
+        }
+
+        namespace UI
+        {
+            class ManifestWidget;
+
+        }
+    }
+}
+
+namespace Ui
+{
+    class ImporterRootDisplay;
+}
+
+class ImporterRootDisplay 
+    : public QWidget
+    , public AZ::SceneAPI::Events::ManifestMetaInfoBus::Handler
+{
+    Q_OBJECT
+
+public:
+    AZ_CLASS_ALLOCATOR(ImporterRootDisplay, AZ::SystemAllocator, 0)
+
+    ImporterRootDisplay(AZ::SerializeContext* serializeContext, QWidget* parent = nullptr);
+
+    ~ImporterRootDisplay();
+
+    AZ::SceneAPI::UI::ManifestWidget* GetManifestWidget();
+
+    void SetSceneDisplay(const QString& headerText, const AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& scene);
+    void HandleSceneWasReset(const AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& scene);
+    void HandleSaveWasSuccessful();
+    bool HasUnsavedChanges() const;
+
+
+signals:
+    void UpdateClicked();
+
+private:
+    // ManifestMetaInfoBus
+    void ObjectUpdated(const AZ::SceneAPI::Containers::Scene& scene, const AZ::SceneAPI::DataTypes::IManifestObject* target, void* sender) override;
+
+    Ui::ImporterRootDisplay* ui;
+    QScopedPointer<AZ::SceneAPI::UI::ManifestWidget> m_manifestWidget;
+    bool m_hasUnsavedChanges;
+};
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/ImporterRootDisplay.ui b/Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.ui
similarity index 100%
rename from Code/Sandbox/Plugins/EditorAssetImporter/ImporterRootDisplay.ui
rename to Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.ui
diff --git a/Code/Editor/Plugins/EditorAssetImporter/Main.cpp b/Code/Editor/Plugins/EditorAssetImporter/Main.cpp
new file mode 100644
index 0000000000..70a1c74776
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/Main.cpp
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ */
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Asset Importer Sandbox Plugin Instance Creation
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#include "EditorAssetImporter_precompiled.h"
+#include "AssetImporterPlugin.h"
+
+
+#if defined(AZ_PLATFORM_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+#include <AzCore/Memory/SystemAllocator.h>
+
+PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
+{
+    IEditor* editor = pInitParam->pIEditorInterface;
+    SetIEditor(editor);
+    ISystem* system = pInitParam->pIEditorInterface->GetSystem();
+    ModuleInitISystem(system, "QtAssetImporter");
+    return new AssetImporterPlugin(editor);
+}
+
+
+#if !defined(AZ_MONOLITHIC_BUILD)
+
+#if defined(AZ_PLATFORM_WINDOWS)
+HINSTANCE g_hInstance = 0;
+BOOL __stdcall DllMain(HINSTANCE hinstDLL, ULONG fdwReason, [[maybe_unused]] LPVOID lpvReserved)
+{
+    if (fdwReason == DLL_PROCESS_ATTACH)
+    {
+        g_hInstance = hinstDLL;
+    }
+
+    return TRUE;
+}
+#endif
+
+#endif // !defined(AZ_MONOLITHIC_BUILD)
diff --git a/Code/Editor/Plugins/EditorAssetImporter/SceneSerializationHandler.cpp b/Code/Editor/Plugins/EditorAssetImporter/SceneSerializationHandler.cpp
new file mode 100644
index 0000000000..787da7fd3b
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/SceneSerializationHandler.cpp
@@ -0,0 +1,144 @@
+/*
+ * 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 "EditorAssetImporter_precompiled.h"
+#include <AzCore/IO/SystemFile.h>
+#include <AzCore/std/algorithm.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <SceneSerializationHandler.h>
+
+namespace AZ
+{
+    SceneSerializationHandler::~SceneSerializationHandler()
+    {
+        Deactivate();
+    }
+
+    void SceneSerializationHandler::Activate()
+    {
+        BusConnect();
+    }
+
+    void SceneSerializationHandler::Deactivate()
+    {
+        BusDisconnect();
+    }
+
+    AZStd::shared_ptr<SceneAPI::Containers::Scene> SceneSerializationHandler::LoadScene(
+        const AZStd::string& filePath, Uuid sceneSourceGuid)
+    {
+        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+        namespace Utilities = AZ::SceneAPI::Utilities;
+        using AZ::SceneAPI::Events::AssetImportRequest;
+
+        CleanSceneMap();
+
+        AZ_TraceContext("File", filePath);
+        if (!IsValidExtension(filePath))
+        {
+            return nullptr;
+        }
+
+        AZStd::string cleanPath = filePath;
+        if (AzFramework::StringFunc::Path::IsRelative(filePath.c_str()))
+        {
+            const char* absolutePath = nullptr;
+            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(absolutePath, 
+                &AzToolsFramework::AssetSystemRequestBus::Events::GetAbsoluteDevRootFolderPath);
+            AZ_Assert(absolutePath, "Unable to retrieve the dev folder path");
+            AzFramework::StringFunc::Path::Join(absolutePath, cleanPath.c_str(), cleanPath);
+        }
+        else
+        {
+            // Normalizing is not needed if the path is relative as Join(...) will also normalize.
+            AzFramework::StringFunc::Path::Normalize(cleanPath);
+        }
+
+        auto sceneIt = m_scenes.find(cleanPath);
+        if (sceneIt != m_scenes.end())
+        {
+            AZStd::shared_ptr<SceneAPI::Containers::Scene> scene = sceneIt->second.lock();
+            if (scene)
+            {
+                return scene;
+            }
+            // There's a small window in between which the scene was closed after searching for
+            //      it in the scene map. In this case continue and simply reload the scene.
+        }
+
+        if (!AZ::IO::SystemFile::Exists(cleanPath.c_str()))
+        {
+            AZ_TracePrintf(Utilities::ErrorWindow, "No file exists at given source path.");
+            return nullptr;
+        }
+
+        if (sceneSourceGuid.IsNull())
+        {
+            bool result = false;
+            AZ::Data::AssetInfo info;
+            AZStd::string watchFolder;
+            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(result, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, cleanPath.c_str(), info, watchFolder);
+            if (!result)
+            {
+                AZ_TracePrintf(Utilities::ErrorWindow, "Failed to retrieve file info needed to determine the uuid of the source file.");
+                return nullptr;
+            }
+            sceneSourceGuid = info.m_assetId.m_guid;
+        }
+
+        AZStd::shared_ptr<SceneAPI::Containers::Scene> scene = 
+            AssetImportRequest::LoadSceneFromVerifiedPath(cleanPath, sceneSourceGuid, AssetImportRequest::RequestingApplication::Editor);
+        if (!scene)
+        {
+            AZ_TracePrintf(Utilities::ErrorWindow, "Failed to load the requested scene.");
+            return nullptr;
+        }
+
+        m_scenes.emplace(AZStd::move(cleanPath), scene);
+        
+        return scene;
+    }
+
+    bool SceneSerializationHandler::IsValidExtension(const AZStd::string& filePath) const
+    {
+        namespace Utilities = AZ::SceneAPI::Utilities;
+
+        if (AZ::SceneAPI::Events::AssetImportRequest::IsManifestExtension(filePath.c_str()))
+        {
+            AZ_TracePrintf(Utilities::ErrorWindow, "Provided path contains the manifest path, not the path to the source file.");
+            return false;
+        }
+
+        if (!AZ::SceneAPI::Events::AssetImportRequest::IsSceneFileExtension(filePath.c_str()))
+        {
+            AZ_TracePrintf(Utilities::ErrorWindow, "Provided path doesn't contain an extension supported by the SceneAPI.");
+            return false;
+        }
+
+        return true;
+    }
+
+    void SceneSerializationHandler::CleanSceneMap()
+    {
+        for (auto it = m_scenes.begin(); it != m_scenes.end(); )
+        {
+            if (it->second.expired())
+            {
+                it = m_scenes.erase(it);
+            }
+            else
+            {
+                ++it;
+            }
+        }
+    }
+} // namespace AZ
diff --git a/Code/Editor/Plugins/EditorAssetImporter/SceneSerializationHandler.h b/Code/Editor/Plugins/EditorAssetImporter/SceneSerializationHandler.h
new file mode 100644
index 0000000000..40bfbbb3c4
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/SceneSerializationHandler.h
@@ -0,0 +1,36 @@
+/*
+ * 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_map.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/smart_ptr/weak_ptr.h>
+#include <AzCore/std/string/string.h>
+#include <SceneAPI/SceneCore/Events/SceneSerializationBus.h>
+
+namespace AZ
+{
+    class SceneSerializationHandler
+        : public SceneAPI::Events::SceneSerializationBus::Handler
+    {
+    public:
+        ~SceneSerializationHandler() override;
+
+        void Activate();
+        void Deactivate();
+
+        AZStd::shared_ptr<SceneAPI::Containers::Scene> LoadScene(
+            const AZStd::string& sceneFilePath, Uuid sceneSourceGuid) override;
+
+    private:
+        bool IsValidExtension(const AZStd::string& filePath) const;
+        void CleanSceneMap();
+
+        AZStd::unordered_map<AZStd::string, AZStd::weak_ptr<SceneAPI::Containers::Scene>> m_scenes;
+    };
+} // namespace AZ
diff --git a/Code/Editor/Plugins/EditorAssetImporter/editorassetimporter_files.cmake b/Code/Editor/Plugins/EditorAssetImporter/editorassetimporter_files.cmake
new file mode 100644
index 0000000000..ad6ec4ffc7
--- /dev/null
+++ b/Code/Editor/Plugins/EditorAssetImporter/editorassetimporter_files.cmake
@@ -0,0 +1,26 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    AssetImporterWindow.h
+    AssetImporterWindow.cpp
+    AssetImporterPlugin.h
+    AssetImporterPlugin.cpp
+    AssetImporterDocument.h
+    AssetImporterDocument.cpp
+    ImporterRootDisplay.h
+    ImporterRootDisplay.cpp
+    AssetBrowserContextProvider.h
+    AssetBrowserContextProvider.cpp
+    SceneSerializationHandler.h
+    SceneSerializationHandler.cpp
+    Main.cpp
+    EditorAssetImporter_precompiled.h
+    AssetImporter.qrc
+    AssetImporterWindow.ui
+    ImporterRootDisplay.ui
+)
diff --git a/Code/Editor/Plugins/EditorCommon/ActionOutput.cpp b/Code/Editor/Plugins/EditorCommon/ActionOutput.cpp
new file mode 100644
index 0000000000..81a1f82d4e
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/ActionOutput.cpp
@@ -0,0 +1,82 @@
+/*
+ * 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 "EditorCommon_precompiled.h"
+#include <ActionOutput.h>
+#include <QWidget>
+
+namespace AZ
+{
+    ActionOutput::ActionOutput()
+        : m_errorCount(0)
+        , m_warningCount(0)
+    {
+    }
+
+    void ActionOutput::AddError(const AZStd::string& error)
+    {
+        AddError(error, "");
+    }
+
+    void ActionOutput::AddError(const AZStd::string& error, const AZStd::string& details)
+    {
+        m_errorToDetails[error].push_back(details);
+        ++m_errorCount;
+    }
+
+    bool ActionOutput::HasAnyErrors() const
+    {
+        return m_errorCount > 0;
+    }
+
+    AZStd::string ActionOutput::BuildErrorMessage() const
+    {
+        return BuildMessage(m_errorToDetails);
+    }
+
+    void ActionOutput::AddWarning(const AZStd::string& warning)
+    {
+        AddWarning(warning, "");
+    }
+
+    void ActionOutput::AddWarning(const AZStd::string& warning, const AZStd::string& details)
+    {
+        m_warningToDetails[warning].push_back(details);
+        ++m_warningCount;
+    }
+
+    bool ActionOutput::HasAnyWarnings() const
+    {
+        return m_warningCount > 0;
+    }
+
+    AZStd::string ActionOutput::BuildWarningMessage() const
+    {
+        return BuildMessage(m_warningToDetails);
+    }
+
+    AZStd::string ActionOutput::BuildMessage(const IssueToDetails& issues) const
+    {
+        AZStd::string message;
+        for (const auto& it : issues)
+        {
+            message += it.first;
+            message += ":\n";
+            const DetailList& details = it.second;
+            for (size_t i = 0; i < details.size(); ++i)
+            {
+                message += "    ";
+                message += details[i];
+                message += "\n";
+            }
+
+            message += "\n";
+        }
+
+        return message;
+    }
+}
diff --git a/Code/Editor/Plugins/EditorCommon/ActionOutput.h b/Code/Editor/Plugins/EditorCommon/ActionOutput.h
new file mode 100644
index 0000000000..67ae9bb297
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/ActionOutput.h
@@ -0,0 +1,55 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/map.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <EditorCommonAPI.h>
+
+namespace AZ
+{
+    // Stores the error output from save actions. Pairs error messages with a "details" context. That way if you could
+    //  do something like:
+    //      output->AddError("Failed to save file", fileName);
+    //
+    //  Then if that error gets added a few times with different files, the final error message will be aggregated as
+    //  follows:
+    //     Failed to save file:
+    //          thing1.cdf
+    //          thing2.chr
+    class EDITOR_COMMON_API ActionOutput
+    {
+    public:
+        using DetailList = AZStd::vector<AZStd::string>;
+        using IssueToDetails = AZStd::map<AZStd::string, DetailList>;
+
+        ActionOutput();
+
+        void AddError(const AZStd::string& error);
+        void AddError(const AZStd::string& error, const AZStd::string& details);
+        bool HasAnyErrors() const;
+        AZStd::string BuildErrorMessage() const;
+
+        void AddWarning(const AZStd::string& error);
+        void AddWarning(const AZStd::string& error, const AZStd::string& details);
+        bool HasAnyWarnings() const;
+        AZStd::string BuildWarningMessage() const;
+
+    private:
+        AZStd::string BuildMessage(const IssueToDetails& issues) const;
+
+        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        IssueToDetails m_errorToDetails;
+        IssueToDetails m_warningToDetails;
+        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        int m_errorCount;
+        int m_warningCount;
+    };
+}
diff --git a/Code/Editor/Plugins/EditorCommon/AxisHelper.cpp b/Code/Editor/Plugins/EditorCommon/AxisHelper.cpp
new file mode 100644
index 0000000000..e54afc369d
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/AxisHelper.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorCommon_precompiled.h"
+#include "../../Editor/RenderHelpers/AxisHelperShared.inl"
diff --git a/Code/Editor/Plugins/EditorCommon/CMakeLists.txt b/Code/Editor/Plugins/EditorCommon/CMakeLists.txt
new file mode 100644
index 0000000000..96d9cce5b7
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/CMakeLists.txt
@@ -0,0 +1,49 @@
+#
+# 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 PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+# Header only target to prevent linkage against editor libraries when it is not needed. Eventually the targets that depend
+# on editor headers should cleanup dependencies and interact with the editor through buses or other mechanisms
+ly_add_target(
+    NAME EditorCommon.Headers HEADERONLY
+    NAMESPACE Legacy
+    FILES_CMAKE
+        editorcommon_files.cmake
+    INCLUDE_DIRECTORIES
+        INTERFACE
+            .
+)
+
+ly_add_target(
+    NAME EditorCommon SHARED
+    NAMESPACE Legacy
+    AUTOMOC
+    AUTORCC
+    FILES_CMAKE
+        editorcommon_files.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+    COMPILE_DEFINITIONS
+        PRIVATE
+            EDITOR_COMMON_EXPORTS
+        INTERFACE
+            EDITOR_COMMON_IMPORTS
+    BUILD_DEPENDENCIES
+        PRIVATE
+            3rdParty::zlib
+            3rdParty::Qt::Core
+            3rdParty::Qt::Widgets
+            Legacy::CryCommon
+            Legacy::EditorCore
+            AZ::AzCore
+            AZ::AzToolsFramework
+            AZ::AzQtComponents
+)
diff --git a/Code/Editor/Plugins/EditorCommon/Cry_LegacyPhysUtils.h b/Code/Editor/Plugins/EditorCommon/Cry_LegacyPhysUtils.h
new file mode 100644
index 0000000000..9309068974
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/Cry_LegacyPhysUtils.h
@@ -0,0 +1,699 @@
+/*
+ * 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
+ *
+ */
+
+// Copied utils functions from CryPhysics that are used by non-physics systems
+// This functions will be eventually removed, DO *NOT* use these functions
+// TO-DO: Re-implement users using new code
+// LY-109806
+
+#pragma once
+
+#include "Cry_Math.h"
+
+namespace LegacyCryPhysicsUtils
+{
+    namespace polynomial_tpl_IMPL
+    {
+        template<class ftype, int degree>
+        class polynomial_tpl
+        {
+        public:
+            explicit polynomial_tpl() { denom = (ftype)1; };
+            explicit polynomial_tpl(ftype op) { zero(); data[degree] = op; }
+            AZ_FORCE_INLINE polynomial_tpl& zero()
+            {
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[i] = 0;
+                }
+                denom = (ftype)1;
+                return *this;
+            }
+            polynomial_tpl(const polynomial_tpl<ftype, degree>& src) { *this = src; }
+            polynomial_tpl& operator=(const polynomial_tpl<ftype, degree>& src)
+            {
+                denom = src.denom;
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[i] = src.data[i];
+                }
+                return *this;
+            }
+            template<int degree1>
+            AZ_FORCE_INLINE polynomial_tpl& operator=(const polynomial_tpl<ftype, degree1>& src)
+            {
+                int i;
+                denom = src.denom;
+                for (i = 0; i <= min(degree, degree1); i++)
+                {
+                    data[i] = src.data[i];
+                }
+                for (; i < degree; i++)
+                {
+                    data[i] = 0;
+                }
+                return *this;
+            }
+            AZ_FORCE_INLINE polynomial_tpl& set(ftype* pdata)
+            {
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[degree - i] = pdata[i];
+                }
+                return *this;
+            }
+
+            AZ_FORCE_INLINE ftype& operator[](int idx) { return data[idx]; }
+
+            void calc_deriviative(polynomial_tpl<ftype, degree>& deriv, int curdegree = degree) const;
+
+            AZ_FORCE_INLINE polynomial_tpl& fixsign()
+            {
+                ftype sg = sgnnz(denom);
+                denom *= sg;
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[i] *= sg;
+                }
+                return *this;
+            }
+
+            int findroots(ftype start, ftype end, ftype* proots, int nIters = 20, int curdegree = degree, bool noDegreeCheck = false) const;
+            int nroots(ftype start, ftype end) const;
+
+            AZ_FORCE_INLINE ftype eval(ftype x) const
+            {
+                ftype res = 0;
+                for (int i = degree; i >= 0; i--)
+                {
+                    res = res * x + data[i];
+                }
+                return res;
+            }
+            AZ_FORCE_INLINE ftype eval(ftype x, int subdegree) const
+            {
+                ftype res = data[subdegree];
+                for (int i = subdegree - 1; i >= 0; i--)
+                {
+                    res = res * x + data[i];
+                }
+                return res;
+            }
+
+            AZ_FORCE_INLINE polynomial_tpl& operator+=(ftype op) { data[0] += op * denom; return *this; }
+            AZ_FORCE_INLINE polynomial_tpl& operator-=(ftype op) { data[0] -= op * denom; return *this; }
+            AZ_FORCE_INLINE polynomial_tpl operator*(ftype op) const
+            {
+                polynomial_tpl<ftype, degree> res;
+                res.denom = denom;
+                for (int i = 0; i <= degree; i++)
+                {
+                    res.data[i] = data[i] * op;
+                }
+                return res;
+            }
+            AZ_FORCE_INLINE polynomial_tpl& operator*=(ftype op)
+            {
+                for (int i = 0; i <= degree; i++)
+                {
+                    data[i] *= op;
+                }
+                return *this;
+            }
+            AZ_FORCE_INLINE polynomial_tpl operator/(ftype op) const
+            {
+                polynomial_tpl<ftype, degree> res = *this;
+                res.denom = denom * op;
+                return res;
+            }
+            AZ_FORCE_INLINE polynomial_tpl& operator/=(ftype op) { denom *= op;   return *this; }
+
+            AZ_FORCE_INLINE polynomial_tpl<ftype, degree * 2> sqr() const { return *this * *this; }
+
+            ftype denom;
+            ftype data[degree + 1];
+        };
+
+        template <class ftype>
+        struct tagPolyE
+        {
+            inline static ftype polye() { return (ftype)1E-10; }
+        };
+
+        template<>
+        inline float tagPolyE<float>::polye() { return 1e-6f; }
+
+        template <class ftype>
+        inline ftype polye() { return tagPolyE<ftype>::polye(); }
+
+        // Don't use this macro; use AZStd::max instead. This is only here to make the template const arguments below readable
+        // and because Visual Studio 2013 doesn't have a const_expr version of std::max
+        #define deprecated_degmax(degree1, degree2) (((degree1) > (degree2)) ? (degree1) : (degree2))
+
+        template<class ftype, int degree>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator+(const polynomial_tpl<ftype, degree>& pn, ftype op)
+        {
+            polynomial_tpl<ftype, degree> res = pn;
+            res.data[0] += op * res.denom;
+            return res;
+        }
+        template<class ftype, int degree>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator-(const polynomial_tpl<ftype, degree>& pn, ftype op)
+        {
+            polynomial_tpl<ftype, degree> res = pn;
+            res.data[0] -= op * res.denom;
+            return res;
+        }
+
+        template<class ftype, int degree>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator+(ftype op, const polynomial_tpl<ftype, degree>& pn)
+        {
+            polynomial_tpl<ftype, degree> res = pn;
+            res.data[0] += op * res.denom;
+            return res;
+        }
+        template<class ftype, int degree>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator-(ftype op, const polynomial_tpl<ftype, degree>& pn)
+        {
+            polynomial_tpl<ftype, degree> res = pn;
+            res.data[0] -= op * res.denom;
+            for (int i = 0; i <= degree; i++)
+            {
+                res.data[i] = -res.data[i];
+            }
+            return res;
+        }
+        template<class ftype, int degree>
+        polynomial_tpl<ftype, degree * 2> AZ_FORCE_INLINE psqr(const polynomial_tpl<ftype, degree>& op) { return op * op; }
+
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> operator+(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> res;
+            int i;
+            for (i = 0; i <= min(degree1, degree2); i++)
+            {
+                res.data[i] = op1.data[i] * op2.denom + op2.data[i] * op1.denom;
+            }
+            for (; i <= degree1; i++)
+            {
+                res.data[i] = op1.data[i] * op2.denom;
+            }
+            for (; i <= degree2; i++)
+            {
+                res.data[i] = op2.data[i] * op1.denom;
+            }
+            res.denom = op1.denom * op2.denom;
+            return res;
+        }
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> operator-(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> res;
+            int i;
+            for (i = 0; i <= min(degree1, degree2); i++)
+            {
+                res.data[i] = op1.data[i] * op2.denom - op2.data[i] * op1.denom;
+            }
+            for (; i <= degree1; i++)
+            {
+                res.data[i] = op1.data[i] * op2.denom;
+            }
+            for (; i <= degree2; i++)
+            {
+                res.data[i] = op2.data[i] * op1.denom;
+            }
+            res.denom = op1.denom * op2.denom;
+            return res;
+        }
+
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1>& operator+=(polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            for (int i = 0; i < min(degree1, degree2); i++)
+            {
+                op1.data[i] = op1.data[i] * op2.denom + op2.data[i] * op1.denom;
+            }
+            op1.denom *= op2.denom;
+            return op1;
+        }
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1>& operator-=(polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            for (int i = 0; i < min(degree1, degree2); i++)
+            {
+                op1.data[i] = op1.data[i] * op2.denom - op2.data[i] * op1.denom;
+            }
+            op1.denom *= op2.denom;
+            return op1;
+        }
+
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1 + degree2> operator*(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
+        {
+            polynomial_tpl<ftype, degree1 + degree2> res;
+            res.zero();
+            int j;
+            switch (degree1)
+            {
+            case 8:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[8 + j] += op1.data[8] * op2.data[j];
+                }
+            case 7:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[7 + j] += op1.data[7] * op2.data[j];
+                }
+            case 6:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[6 + j] += op1.data[6] * op2.data[j];
+                }
+            case 5:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[5 + j] += op1.data[5] * op2.data[j];
+                }
+            case 4:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[4 + j] += op1.data[4] * op2.data[j];
+                }
+            case 3:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[3 + j] += op1.data[3] * op2.data[j];
+                }
+            case 2:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[2 + j] += op1.data[2] * op2.data[j];
+                }
+            case 1:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[1 + j] += op1.data[1] * op2.data[j];
+                }
+            case 0:
+                for (j = 0; j <= degree2; j++)
+                {
+                    res.data[0 + j] += op1.data[0] * op2.data[j];
+                }
+            }
+            res.denom = op1.denom * op2.denom;
+            return res;
+        }
+
+
+        template <class ftype>
+        AZ_FORCE_INLINE void polynomial_divide(const polynomial_tpl<ftype, 8>& num, const polynomial_tpl<ftype, 8>& den, polynomial_tpl<ftype, 8>& quot,
+            polynomial_tpl<ftype, 8>& rem, int degree1, int degree2)
+        {
+            int i, j, k, l;
+            ftype maxel;
+            for (i = 0; i <= degree1; i++)
+            {
+                rem.data[i] = num.data[i];
+            }
+            for (i = 0; i <= degree1 - degree2; i++)
+            {
+                quot.data[i] = 0;
+            }
+            for (i = 1, maxel = fabs_tpl(num.data[0]); i <= degree1; i++)
+            {
+                maxel = max(maxel, num.data[i]);
+            }
+            for (maxel *= polye<ftype>(); degree1 >= 0 && fabs_tpl(num.data[degree1]) < maxel; degree1--)
+            {
+                ;
+            }
+            for (i = 1, maxel = fabs_tpl(den.data[0]); i <= degree2; i++)
+            {
+                maxel = max(maxel, den.data[i]);
+            }
+            for (maxel *= polye<ftype>(); degree2 >= 0 && fabs_tpl(den.data[degree2]) < maxel; degree2--)
+            {
+                ;
+            }
+            rem.denom = num.denom;
+            quot.denom = (ftype)1;
+            if (degree1 < 0 || degree2 < 0)
+            {
+                return;
+            }
+
+            for (k = degree1 - degree2, l = degree1; l >= degree2; l--, k--)
+            {
+                quot.data[k] = rem.data[l] * den.denom;
+                quot.denom *= den.data[degree2];
+                for (i = degree1 - degree2; i > k; i--)
+                {
+                    quot.data[i] *= den.data[degree2];
+                }
+                for (i = degree2 - 1, j = l - 1; i >= 0; i--, j--)
+                {
+                    rem.data[j] = rem.data[j] * den.data[degree2] - den.data[i] * rem.data[l];
+                }
+                for (; j >= 0; j--)
+                {
+                    rem.data[j] *= den.data[degree2];
+                }
+                rem.denom *= den.data[degree2];
+            }
+        }
+
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1 - degree2> operator/(const polynomial_tpl<ftype, degree1>& num, const polynomial_tpl<ftype, degree2>& den)
+        {
+            polynomial_tpl<ftype, degree1 - degree2> quot;
+            polynomial_tpl<ftype, degree1> rem;
+            polynomial_divide((polynomial_tpl<ftype, 8>&)num, (polynomial_tpl<ftype, 8>&)den, (polynomial_tpl<ftype, 8>&)quot,
+                (polynomial_tpl<ftype, 8>&)rem, degree1, degree2);
+            return quot;
+        }
+        template <class ftype, int degree1, int degree2>
+        AZ_FORCE_INLINE polynomial_tpl<ftype, degree2 - 1> operator%(const polynomial_tpl<ftype, degree1>& num, const polynomial_tpl<ftype, degree2>& den)
+        {
+            polynomial_tpl<ftype, degree1 - degree2> quot;
+            polynomial_tpl<ftype, degree1> rem;
+            polynomial_divide((polynomial_tpl<ftype, 8>&)num, (polynomial_tpl<ftype, 8>&)den, (polynomial_tpl<ftype, 8>&)quot,
+                (polynomial_tpl<ftype, 8>&)rem, degree1, degree2);
+            return (polynomial_tpl<ftype, degree2 - 1>&)rem;
+        }
+
+        template <class ftype, int degree>
+        AZ_FORCE_INLINE void polynomial_tpl<ftype, degree>::calc_deriviative(polynomial_tpl<ftype, degree>& deriv, int curdegree) const
+        {
+            for (int i = 0; i < curdegree; i++)
+            {
+                deriv.data[i] = data[i + 1] * (i + 1);
+            }
+            deriv.denom = denom;
+        }
+
+        template<typename to_t, typename from_t>
+        to_t* convert_type(from_t* input)
+        {
+            typedef union
+            {
+                to_t* to;
+                from_t* from;
+            } convert_union;
+            convert_union u;
+            u.from = input;
+            return u.to;
+        }
+
+        template <class ftype, int degree>
+        AZ_FORCE_INLINE int polynomial_tpl<ftype, degree>::nroots(ftype start, ftype end) const
+        {
+            polynomial_tpl<ftype, degree> f[degree + 1];
+            int i, j, sg_a, sg_b;
+            ftype val, prevval;
+
+            calc_deriviative(f[0]);
+            polynomial_divide(*convert_type<polynomial_tpl<ftype, 8> >(this), *convert_type< polynomial_tpl<ftype, 8> >(&f[0]), *convert_type<polynomial_tpl<ftype, 8> >(&f[degree]),
+                *convert_type<polynomial_tpl<ftype, 8> >(&f[1]), degree, degree - 1);
+            f[1].denom = -f[1].denom;
+            for (i = 2; i < degree; i++)
+            {
+                polynomial_divide(*convert_type<polynomial_tpl<ftype, 8> >(&f[i - 2]), *convert_type<polynomial_tpl<ftype, 8> >(&f[i - 1]), *convert_type<polynomial_tpl<ftype, 8> >(&f[degree]),
+                    *convert_type<polynomial_tpl<ftype, 8> >(&f[i]), degree + 1 - i, degree - i);
+                f[i].denom = -f[i].denom;
+                if (fabs_tpl(f[i].denom) > (ftype)1E10)
+                {
+                    for (j = 0; j <= degree - 1 - i; j++)
+                    {
+                        f[i].data[j] *= (ftype)1E-10;
+                    }
+                    f[i].denom *= (ftype)1E-10;
+                }
+            }
+
+            prevval = eval(start) * denom;
+            for (i = sg_a = 0; i < degree; i++, prevval = val)
+            {
+                val = f[i].eval(start, degree - 1 - i) * f[i].denom;
+                sg_a += isneg(val * prevval);
+            }
+
+            prevval = eval(end) * denom;
+            for (i = sg_b = 0; i < degree; i++, prevval = val)
+            {
+                val = f[i].eval(end, degree - 1 - i) * f[i].denom;
+                sg_b += isneg(val * prevval);
+            }
+
+            return fabs_tpl(sg_a - sg_b);
+        }
+
+        template<class ftype>
+        AZ_FORCE_INLINE ftype cubert_tpl(ftype x) { return fabs_tpl(x) > (ftype)1E-20 ? exp_tpl(log_tpl(fabs_tpl(x)) * (ftype)(1.0 / 3)) * sgnnz(x) : x; }
+        template<class ftype>
+        AZ_FORCE_INLINE ftype pow_tpl(ftype x, ftype pow) { return fabs_tpl(x) > (ftype)1E-20 ? exp_tpl(log_tpl(fabs_tpl(x)) * pow) * sgnnz(x) : x; }
+        template<class ftype>
+        AZ_FORCE_INLINE void swap(ftype* ptr, int i, int j) { ftype t = ptr[i]; ptr[i] = ptr[j]; ptr[j] = t; }
+
+        template <class ftype, int maxdegree>
+        int polynomial_tpl<ftype, maxdegree>::findroots(ftype start, ftype end, ftype* proots, [[maybe_unused]] int nIters, int degree, bool noDegreeCheck) const
+        {
+            AZ_UNUSED(nIters);
+            int i, j, nRoots = 0;
+            ftype maxel;
+            if (!noDegreeCheck)
+            {
+                for (i = 1, maxel = fabs_tpl(data[0]); i <= degree; i++)
+                {
+                    maxel = max(maxel, data[i]);
+                }
+                for (maxel *= polye<ftype>(); degree > 0 && fabs_tpl(data[degree]) <= maxel; degree--)
+                {
+                    ;
+                }
+            }
+
+            if constexpr (maxdegree >= 1)
+            {
+                if (degree == 1)
+                {
+                    proots[0] = data[0] / data[1];
+                    nRoots = 1;
+                }
+            }
+
+            if constexpr (maxdegree >= 2)
+            {
+                if (degree == 2)
+                {
+                    ftype a, b, c, d, bound[2], sg;
+
+                    a = data[2];
+                    b = data[1];
+                    c = data[0];
+                    d = aznumeric_cast<ftype>(sgnnz(a));
+                    a *= d;
+                    b *= d;
+                    c *= d;
+                    d = b * b - a * c * 4;
+                    bound[0] = start * a * 2 + b;
+                    bound[1] = end * a * 2 + b;
+                    sg = aznumeric_cast<ftype>((sgnnz(bound[0] * bound[1]) + 1) >> 1);
+                    bound[0] *= bound[0];
+                    bound[1] *= bound[1];
+                    bound[isneg(fabs_tpl(bound[1]) - fabs_tpl(bound[0]))] *= sg;
+
+                    if (isnonneg(d) & inrange(d, bound[0], bound[1]))
+                    {
+                        d = sqrt_tpl(d);
+                        a = (ftype)0.5 / a;
+                        proots[nRoots] = (-b - d) * a;
+                        nRoots += inrange(proots[nRoots], start, end);
+                        proots[nRoots] = (-b + d) * a;
+                        nRoots += inrange(proots[nRoots], start, end);
+                    }
+                }
+            }
+
+            if constexpr (maxdegree >= 3)
+            {
+                if (degree == 3)
+                {
+                    ftype t, a, b, c, a3, p, q, Q, Qr, Ar, Ai, phi;
+
+                    t = (ftype)1.0 / data[3];
+                    a = data[2] * t;
+                    b = data[1] * t;
+                    c = data[0] * t;
+                    a3 = a * (ftype)(1.0 / 3);
+                    p = b - a * a3;
+                    q = (a3 * b - c) * (ftype)0.5 - cube(a3);
+                    Q = cube(p * (ftype)(1.0 / 3)) + q * q;
+                    Qr = sqrt_tpl(fabs_tpl(Q));
+
+                    if (Q > 0)
+                    {
+                        proots[0] = cubert_tpl(q + Qr) + cubert_tpl(q - Qr) - a3;
+                        nRoots = 1;
+                    }
+                    else
+                    {
+                        phi = atan2_tpl(Qr, q) * (ftype)(1.0 / 3);
+                        t = pow_tpl(Qr * Qr + q * q, (ftype)(1.0 / 6));
+                        Ar = t * cos_tpl(phi);
+                        Ai = t * sin_tpl(phi);
+                        proots[0] = 2 * Ar - a3;
+                        proots[1] = aznumeric_cast<ftype>(-Ar + Ai * sqrt3 - a3);
+                        proots[2] = aznumeric_cast<ftype>(-Ar - Ai * sqrt3 - a3);
+                        i = idxmax3(proots);
+                        swap(proots, i, 2);
+                        i = isneg(proots[0] - proots[1]);
+                        swap(proots, i, 1);
+                        nRoots = 3;
+                    }
+                }
+            }
+
+            if constexpr (maxdegree >= 4)
+            {
+                if (degree == 4)
+                {
+                    ftype t, a3, a2, a1, a0, y, R, D, E, subroots[3];
+                    const ftype e = (ftype)1E-9;
+
+                    t = (ftype)1.0 / data[4];
+                    a3 = data[3] * t;
+                    a2 = data[2] * t;
+                    a1 = data[1] * t;
+                    a0 = data[0] * t;
+                    polynomial_tpl<ftype, 3> p3aux;
+                    ftype kp3aux[] = { 1, -a2, a1 * a3 - 4 * a0, 4 * a2 * a0 - a1 * a1 - a3 * a3 * a0 };
+                    p3aux.set(kp3aux);
+                    if (!p3aux.findroots((ftype)-1E20, (ftype)1E20, subroots))
+                    {
+                        return 0;
+                    }
+                    R = a3 * a3 * (ftype)0.25 - a2 + (y = subroots[0]);
+
+                    if (R > -e)
+                    {
+                        if (R < e)
+                        {
+                            D = E = a3 * a3 * (ftype)(3.0 / 4) - 2 * a2;
+                            t = y * y - 4 * a0;
+                            if (t < -e)
+                            {
+                                return 0;
+                            }
+                            t = 2 * sqrt_tpl(max((ftype)0, t));
+                        }
+                        else
+                        {
+                            R = sqrt_tpl(max((ftype)0, R));
+                            D = E = a3 * a3 * (ftype)(3.0 / 4) - R * R - 2 * a2;
+                            t = (4 * a3 * a2 - 8 * a1 - a3 * a3 * a3) / R * (ftype)0.25;
+                        }
+                        if (D + t > -e)
+                        {
+                            D = sqrt_tpl(max((ftype)0, D + t));
+                            proots[nRoots++] = a3 * (ftype)-0.25 + (R - D) * (ftype)0.5;
+                            proots[nRoots++] = a3 * (ftype)-0.25 + (R + D) * (ftype)0.5;
+                        }
+                        if (E - t > -e)
+                        {
+                            E = sqrt_tpl(max((ftype)0, E - t));
+                            proots[nRoots++] = a3 * (ftype)-0.25 - (R + E) * (ftype)0.5;
+                            proots[nRoots++] = a3 * (ftype)-0.25 - (R - E) * (ftype)0.5;
+                        }
+                        if (nRoots == 4)
+                        {
+                            i = idxmax3(proots);
+                            if (proots[3] < proots[i])
+                            {
+                                swap(proots, i, 3);
+                            }
+                            i = idxmax3(proots);
+                            swap(proots, i, 2);
+                            i = isneg(proots[0] - proots[1]);
+                            swap(proots, i, 1);
+                        }
+                    }
+                }
+            }
+
+            if constexpr (maxdegree > 4)
+            {
+                if (degree > 4)
+                {
+                    ftype roots[maxdegree + 1], prevroot, val, prevval[2], curval, bound[2], middle;
+                    polynomial_tpl<ftype, maxdegree> deriv;
+                    int nExtremes, iter, iBound;
+                    calc_deriviative(deriv);
+
+                    // find a subset of deriviative extremes between start and end
+                    for (nExtremes = deriv.findroots(start, end, roots + 1, nIters, degree - 1) + 1; nExtremes > 1 && roots[nExtremes - 1] > end; nExtremes--)
+                    {
+                        ;
+                    }
+                    for (i = 1; i < nExtremes && roots[i] < start; i++)
+                    {
+                        ;
+                    }
+                    roots[i - 1] = start;
+                    PREFAST_ASSUME(nExtremes < maxdegree + 1);
+                    roots[nExtremes++] = end;
+
+                    for (prevroot = start, prevval[0] = eval(start, degree), nRoots = 0; i < nExtremes; prevval[0] = val, prevroot = roots[i++])
+                    {
+                        val = eval(roots[i], degree);
+                        if (val * prevval[0] < 0)
+                        {
+                            // we have exactly one root between prevroot and roots[i]
+                            bound[0] = prevroot;
+                            bound[1] = roots[i];
+                            iter = 0;
+                            do
+                            {
+                                middle = (bound[0] + bound[1]) * (ftype)0.5;
+                                curval = eval(middle, degree);
+                                iBound = isneg(prevval[0] * curval);
+                                bound[iBound] = middle;
+                                prevval[iBound] = curval;
+                            } while (++iter < nIters);
+                            proots[nRoots++] = middle;
+                        }
+                    }
+                }
+            }
+
+            for (i = 0; i < nRoots && proots[i] < start; i++)
+            {
+                ;
+            }
+            for (; nRoots > i&& proots[nRoots - 1] > end; nRoots--)
+            {
+                ;
+            }
+            for (j = i; j < nRoots; j++)
+            {
+                proots[j - i] = proots[j];
+            }
+
+            return nRoots - i;
+        }
+    } // namespace polynomial_tpl_IMPL
+    template<class ftype, int degree>
+    using polynomial_tpl = polynomial_tpl_IMPL::polynomial_tpl<ftype, degree>;
+
+    typedef polynomial_tpl<real, 3> P3;
+    typedef polynomial_tpl<real, 2> P2;
+    typedef polynomial_tpl<real, 1> P1;
+    typedef polynomial_tpl<float, 3> P3f;
+    typedef polynomial_tpl<float, 2> P2f;
+    typedef polynomial_tpl<float, 1> P1f;
+} // namespace LegacyCryPhysicsUtils
diff --git a/Code/Editor/Plugins/EditorCommon/DeepFilterProxyModel.cpp b/Code/Editor/Plugins/EditorCommon/DeepFilterProxyModel.cpp
new file mode 100644
index 0000000000..ca281301dd
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DeepFilterProxyModel.cpp
@@ -0,0 +1,171 @@
+/*
+ * 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 "DeepFilterProxyModel.h"
+#include <QPalette>
+
+DeepFilterProxyModel::DeepFilterProxyModel(QObject* parent)
+    : QSortFilterProxyModel(parent)
+{
+}
+
+void DeepFilterProxyModel::setFilterString(const QString& filter)
+{
+    m_filter = filter;
+    m_filterParts = m_filter.split(' ', Qt::SkipEmptyParts);
+    m_acceptCache.clear();
+}
+
+void DeepFilterProxyModel::invalidate()
+{
+    QSortFilterProxyModel::invalidate();
+    m_acceptCache.clear();
+}
+
+QVariant DeepFilterProxyModel::data(const QModelIndex& index, int role) const
+{
+    if (role == Qt::ForegroundRole)
+    {
+        QModelIndex sourceIndex = mapToSource(index);
+        if (matchFilter(sourceIndex.row(), sourceIndex.parent()))
+        {
+            return QSortFilterProxyModel::data(index, role);
+        }
+        else
+        {
+            return QPalette().color(QPalette::Disabled, QPalette::Text);
+        }
+    }
+    else
+    {
+        return QSortFilterProxyModel::data(index, role);
+    }
+}
+
+
+void DeepFilterProxyModel::setFilterWildcard(const QString& pattern)
+{
+    m_acceptCache.clear();
+    QSortFilterProxyModel::setFilterWildcard(pattern);
+}
+
+bool DeepFilterProxyModel::matchFilter(int sourceRow, const QModelIndex& sourceParent) const
+{
+    int columnCount = sourceModel()->columnCount(sourceParent);
+    for (int i = 0; i < m_filterParts.size(); ++i)
+    {
+        bool atLeastOneContains = false;
+        for (int j = 0; j < columnCount; ++j)
+        {
+            QModelIndex index = sourceModel()->index(sourceRow, j, sourceParent);
+            QVariant data = sourceModel()->data(index, Qt::DisplayRole);
+            QString str(data.toString());
+            if (str.isEmpty())
+            {
+                if (m_filterParts.empty())
+                {
+                    atLeastOneContains = true;
+                }
+            }
+            else if (str.contains(m_filterParts[i], Qt::CaseInsensitive))
+            {
+                atLeastOneContains = true;
+            }
+        }
+        if (!atLeastOneContains)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool DeepFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
+{
+    if (matchFilter(sourceRow, sourceParent))
+    {
+        return true;
+    }
+
+    if (hasAcceptedChildrenCached(sourceRow, sourceParent))
+    {
+        return true;
+    }
+
+    return false;
+}
+
+bool DeepFilterProxyModel::hasAcceptedChildrenCached(int sourceRow, const QModelIndex& sourceParent) const
+{
+    std::pair<QModelIndex, int> indexId = std::make_pair(sourceParent, sourceRow);
+    TAcceptCache::iterator it = m_acceptCache.find(indexId);
+    if (it == m_acceptCache.end())
+    {
+        bool result = hasAcceptedChildren(sourceRow, sourceParent);
+        m_acceptCache[indexId] = result;
+        return result;
+    }
+    else
+    {
+        return it->second;
+    }
+}
+
+bool DeepFilterProxyModel::hasAcceptedChildren(int sourceRow, const QModelIndex& sourceParent) const
+{
+    QModelIndex item = sourceModel()->index(sourceRow, 0, sourceParent);
+    if (!item.isValid())
+    {
+        return false;
+    }
+
+    int childCount = item.model()->rowCount(item);
+    if (childCount == 0)
+    {
+        return false;
+    }
+
+    for (int i = 0; i < childCount; ++i)
+    {
+        if (filterAcceptsRow(i, item))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+QModelIndex DeepFilterProxyModel::findFirstMatchingIndex(const QModelIndex& root)
+{
+    int rowCount = this->rowCount(root);
+    for (int i = 0; i < rowCount; ++i)
+    {
+        QModelIndex index = this->index(i, 0, root);
+        if (!index.isValid())
+        {
+            continue;
+        }
+        QModelIndex sourceIndex = mapToSource(index);
+        if (!sourceIndex.isValid())
+        {
+            continue;
+        }
+        if (matchFilter(sourceIndex.row(), sourceIndex.parent()))
+        {
+            return index;
+        }
+
+        QModelIndex child = findFirstMatchingIndex(index);
+        if (child.isValid())
+        {
+            return child;
+        }
+    }
+    return QModelIndex();
+}
diff --git a/Code/Editor/Plugins/EditorCommon/DeepFilterProxyModel.h b/Code/Editor/Plugins/EditorCommon/DeepFilterProxyModel.h
new file mode 100644
index 0000000000..b795bf47d8
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DeepFilterProxyModel.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITORCOMMON_DEEPFILTERPROXYMODEL_H
+#define CRYINCLUDE_EDITORCOMMON_DEEPFILTERPROXYMODEL_H
+#pragma once
+
+#include <QSortFilterProxyModel>
+#include <QModelIndex>
+#include <QStringList>
+#include "EditorCommonAPI.h"
+
+class EDITOR_COMMON_API DeepFilterProxyModel
+    : public QSortFilterProxyModel
+{
+public:
+    DeepFilterProxyModel(QObject* parent);
+
+    void setFilterString(const QString& filter);
+    void invalidate();
+
+    QVariant data(const QModelIndex& index, int role) const override;
+
+    void setFilterWildcard(const QString& pattern);
+
+    bool matchFilter(int source_row, const QModelIndex& source_parent) const;
+    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
+    bool hasAcceptedChildrenCached(int source_row, const QModelIndex& source_parent) const;
+    bool hasAcceptedChildren(int source_row, const QModelIndex& source_parent) const;
+
+    QModelIndex findFirstMatchingIndex(const QModelIndex& root);
+
+private:
+    QString m_filter;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QStringList m_filterParts;
+    typedef std::map<std::pair<QModelIndex, int>, bool> TAcceptCache;
+    mutable TAcceptCache m_acceptCache;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif // CRYINCLUDE_EDITORCOMMON_DEEPFILTERPROXYMODEL_H
diff --git a/Code/Editor/Plugins/EditorCommon/DisplayContext.cpp b/Code/Editor/Plugins/EditorCommon/DisplayContext.cpp
new file mode 100644
index 0000000000..87d0b47d1b
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DisplayContext.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorCommon_precompiled.h"
+#include "../../Editor/Objects/DisplayContextShared.inl"
diff --git a/Code/Editor/Plugins/EditorCommon/DockTitleBarWidget.cpp b/Code/Editor/Plugins/EditorCommon/DockTitleBarWidget.cpp
new file mode 100644
index 0000000000..424cad7eb4
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DockTitleBarWidget.cpp
@@ -0,0 +1,232 @@
+/*
+ * 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 "DockTitleBarWidget.h"
+#include <QStyle>
+#include <QStyleOptionToolButton>
+#include <AzCore/Casting/numeric_cast.h>
+
+namespace DockTitleBarInterpolate
+{
+    static QColor Interpolate(const QColor& a, const QColor& b, float k)
+    {
+        float mk = 1.0f - k;
+        return QColor(aznumeric_cast<int>(a.red() * mk + b.red() * k),
+            aznumeric_cast<int>(a.green() * mk + b.green() * k),
+            aznumeric_cast<int>(a.blue() * mk + b.blue() * k),
+            aznumeric_cast<int>(a.alpha() * mk + b.alpha() * k));
+    }
+}
+
+class CDockWidgetTitleButton
+    : public QAbstractButton
+{
+public:
+    CDockWidgetTitleButton(QWidget* parent);
+
+    QSize sizeHint() const;
+    QSize minimumSizeHint() const { return sizeHint(); }
+
+protected:
+    void enterEvent(QEvent* ev);
+    void leaveEvent(QEvent* ev);
+    void paintEvent(QPaintEvent* ev);
+};
+
+class CTitleBarText
+    : public QWidget
+{
+public:
+
+    CTitleBarText(QWidget* parent, QDockWidget* dockWidget)
+        : QWidget(parent)
+        , m_dockWidget(dockWidget)
+    {
+        QFont font;
+        font.setBold(true);
+        setFont(font);
+    }
+
+    void paintEvent([[maybe_unused]] QPaintEvent* ev) override
+    {
+        QPainter p(this);
+        p.setRenderHint(QPainter::Antialiasing, true);
+        QRect r = rect().adjusted(2, 2, -3, -3);
+        p.translate(0.5f, 0.5f);
+        QColor color = DockTitleBarInterpolate::Interpolate(palette().color(QPalette::Window), palette().color(QPalette::Shadow), 0.2f);
+        p.setBrush(QBrush(color));
+        p.setPen(Qt::NoPen);
+        p.drawRoundedRect(r, 4, 4, Qt::AbsoluteSize);
+        p.setPen(QPen(palette().color(QPalette::WindowText)));
+        QTextOption textOption(Qt::AlignLeft | Qt::AlignVCenter);
+        textOption.setWrapMode(QTextOption::NoWrap);
+        p.drawText(r.adjusted(4, 0, 0, 0), m_dockWidget->windowTitle(), textOption);
+    }
+private:
+    QDockWidget* m_dockWidget;
+};
+
+
+// ---------------------------------------------------------------------------
+
+CDockWidgetTitleButton::CDockWidgetTitleButton(QWidget* parent)
+    : QAbstractButton(parent)
+{
+    setFocusPolicy(Qt::NoFocus);
+}
+
+QSize CDockWidgetTitleButton::sizeHint() const
+{
+    ensurePolished();
+
+    int size = 2 * style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin, 0, this);
+    if (!icon().isNull())
+    {
+        int iconSize = style()->pixelMetric(QStyle::PM_SmallIconSize, 0, this);
+        QSize sz = icon().actualSize(QSize(iconSize, iconSize));
+        size += qMax(sz.width(), sz.height());
+    }
+
+    return QSize(size, size);
+}
+
+void CDockWidgetTitleButton::enterEvent(QEvent* ev)
+{
+    if (isEnabled())
+    {
+        update();
+    }
+    QAbstractButton::enterEvent(ev);
+}
+
+void CDockWidgetTitleButton::leaveEvent(QEvent* ev)
+{
+    if (isEnabled())
+    {
+        update();
+    }
+    QAbstractButton::leaveEvent(ev);
+}
+
+void CDockWidgetTitleButton::paintEvent([[maybe_unused]] QPaintEvent* ev)
+{
+    QPainter painter(this);
+
+    QStyleOptionToolButton opt;
+    opt.state = QStyle::State_AutoRaise;
+    opt.init(this);
+    opt.state |= QStyle::State_AutoRaise;
+
+    if (isEnabled() && underMouse() && !isChecked() && !isDown())
+    {
+        opt.state |= QStyle::State_Raised;
+    }
+    if (isChecked())
+    {
+        opt.state |= QStyle::State_On;
+    }
+    if (isDown())
+    {
+        opt.state |= QStyle::State_Sunken;
+    }
+    if (opt.state & (QStyle::State_Raised | QStyle::State_Sunken))
+    {
+        style()->drawPrimitive(QStyle::PE_PanelButtonTool, &opt, &painter, this);
+    }
+
+    opt.icon = icon();
+    opt.subControls = QStyle::SubControls();
+    opt.activeSubControls = QStyle::SubControls();
+    opt.features = QStyleOptionToolButton::None;
+    opt.arrowType = Qt::NoArrow;
+    int size = style()->pixelMetric(QStyle::PM_SmallIconSize, 0, this);
+    opt.iconSize = QSize(size, size);
+    style()->drawComplexControl(QStyle::CC_ToolButton, &opt, &painter, this);
+}
+
+// ---------------------------------------------------------------------------
+
+CDockTitleBarWidget::CDockTitleBarWidget(QDockWidget* dockWidget)
+    : m_dockWidget(dockWidget)
+{
+    CTitleBarText* textWidget = new CTitleBarText(this, dockWidget);
+
+    m_layout = new QBoxLayout(QBoxLayout::LeftToRight);
+    m_layout->setContentsMargins(0, 0, 0, 0);
+    m_layout->setSpacing(0);
+    m_layout->addWidget(textWidget, 1);
+
+    QStyleOptionDockWidget opt;
+    opt.initFrom(dockWidget);
+    opt.closable = dockWidget->features() & QDockWidget::DockWidgetClosable;
+    opt.movable = dockWidget->features() & QDockWidget::DockWidgetMovable;
+    opt.floatable = dockWidget->features() & QDockWidget::DockWidgetFloatable;
+
+    m_buttonLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+    m_buttonLayout->setContentsMargins(0, 0, 0, 0);
+    m_buttonLayout->setSpacing(0);
+    m_layout->addLayout(m_buttonLayout, 0);
+
+    m_floatButton = new CDockWidgetTitleButton(dockWidget);
+    m_floatButton->setIcon(QIcon("Icons/float.png"));
+    m_floatButton->setVisible(opt.floatable);
+    m_floatButton->setToolTip("Toggle Floating");
+    connect(m_floatButton, SIGNAL(clicked()), SLOT(OnFloatButtonPressed()));
+    m_layout->addWidget(m_floatButton, 0);
+
+    m_closeButton = new CDockWidgetTitleButton(dockWidget);
+    // close.png is a standard icon that looks similar to one in Fusion theme but
+    // uses alpha so it can be used on dark theme as well.
+    // style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, dockWidget)
+    QIcon closeIcon("Icons/close.png");
+    m_closeButton->setIcon(closeIcon);
+    m_closeButton->setVisible(opt.closable);
+    m_closeButton->setToolTip("Close");
+    connect(m_closeButton, SIGNAL(clicked()), SLOT(OnCloseButtonPressed()));
+    m_layout->addWidget(m_closeButton, 0);
+
+    setLayout(m_layout);
+}
+
+void CDockTitleBarWidget::AddCustomButton(const QIcon& icon, const char* tooltip, int id)
+{
+    SCustomButton slot;
+    slot.button = new CDockWidgetTitleButton(m_dockWidget);
+    slot.button->setIcon(icon);
+    slot.button->setToolTip(tooltip);
+    connect(slot.button, SIGNAL(clicked()), SLOT(OnCustomButtonPressed()));
+    slot.id = id;
+    m_buttonLayout->addWidget(slot.button, 0);
+    m_customButtons.push_back(slot);
+}
+
+void CDockTitleBarWidget::OnFloatButtonPressed()
+{
+    m_dockWidget->setFloating(!m_dockWidget->isFloating());
+}
+
+void CDockTitleBarWidget::OnCloseButtonPressed()
+{
+    m_dockWidget->close();
+}
+
+void CDockTitleBarWidget::OnCustomButtonPressed()
+{
+    QObject* button = sender();
+    for (size_t i = 0; i < m_customButtons.size(); ++i)
+    {
+        if (button == m_customButtons[i].button)
+        {
+            SignalCustomButtonPressed(m_customButtons[i].id);
+            break;
+        }
+    }
+}
+
+
+#include <moc_DockTitleBarWidget.cpp>
diff --git a/Code/Editor/Plugins/EditorCommon/DockTitleBarWidget.h b/Code/Editor/Plugins/EditorCommon/DockTitleBarWidget.h
new file mode 100644
index 0000000000..c3a8b52f06
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DockTitleBarWidget.h
@@ -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
+ *
+ */
+
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "EditorCommonAPI.h"
+#include <QAbstractButton>
+#include <QWidget>
+#include <QPainter>
+#include <QDockWidget>
+#include <QBoxLayout>
+
+#include <vector>
+#endif
+
+class EDITOR_COMMON_API CDockTitleBarWidget
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    CDockTitleBarWidget(QDockWidget* dockWidget);
+
+    QSize sizeHint() const override
+    {
+        QFontMetrics fm(font());
+        return QSize(40, fm.height() + 8);
+    }
+
+    void AddCustomButton(const QIcon& icon, const char* tooltip, int id);
+signals:
+    void SignalCustomButtonPressed(int id);
+private slots:
+    void OnCloseButtonPressed();
+    void OnFloatButtonPressed();
+    void OnCustomButtonPressed();
+private:
+    QDockWidget* m_dockWidget;
+    QBoxLayout* m_layout;
+    QBoxLayout* m_buttonLayout;
+
+    QAbstractButton* m_floatButton;
+    QAbstractButton* m_closeButton;
+
+    struct SCustomButton
+    {
+        int id;
+        QAbstractButton* button;
+    };
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    std::vector<SCustomButton> m_customButtons;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
diff --git a/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp
new file mode 100644
index 0000000000..0d2d35bd04
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp
@@ -0,0 +1,191 @@
+/*
+ * 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 "EditorCommon_precompiled.h"
+#include "Ruler.h"
+
+#include <QPainter>
+#include <QPalette>
+#include <AzCore/Casting/numeric_cast.h>
+
+namespace DrawingPrimitives
+{
+    enum
+    {
+        RULER_MIN_PIXELS_PER_TICK = 3,
+    };
+
+    std::vector<STick> CalculateTicks(uint size, Range visibleRange, Range rulerRange, int* pRulerPrecision, Range* pScreenRulerRange)
+    {
+        std::vector<STick> ticks;
+
+        if (size == 0)
+        {
+            if (pRulerPrecision)
+            {
+                *pRulerPrecision = 0;
+            }
+
+            return ticks;
+        }
+
+        const float pixelsPerUnit = visibleRange.Length() > 0.0f ? (float)size / visibleRange.Length() : 1.0f;
+
+        const float startTime = rulerRange.start;
+        const float endTime = rulerRange.end;
+        const float totalDuration = endTime - startTime;
+
+        const float ticksMinPower = log10f(RULER_MIN_PIXELS_PER_TICK);
+        const float ticksPowerDelta = ticksMinPower - log10f(pixelsPerUnit);
+
+        const int digitsAfterPoint = max(-int(ceil(ticksPowerDelta)) - 1, 0);
+        if (pRulerPrecision)
+        {
+            *pRulerPrecision = digitsAfterPoint;
+        }
+
+        const float scaleStep = powf(10.0f, ceil(ticksPowerDelta));
+        const float scaleStepPixels = scaleStep * pixelsPerUnit;
+        const int numMarkers = int(totalDuration / scaleStep) + 1;
+
+        const float startTimeRound = int(startTime / scaleStep) * scaleStep;
+        const int startOffsetMod = int(startTime / scaleStep) % 10;
+        const int scaleOffsetPixels = aznumeric_cast<int>((startTime - startTimeRound) * pixelsPerUnit);
+
+        const int startX = aznumeric_cast<int>((rulerRange.start - visibleRange.start) * pixelsPerUnit);
+        const int endX = aznumeric_cast<int>(startX + (numMarkers - 1) * scaleStepPixels - scaleOffsetPixels);
+
+        if (pScreenRulerRange)
+        {
+            *pScreenRulerRange = Range(aznumeric_cast<float>(startX), aznumeric_cast<float>(endX));
+        }
+
+        const int startLoop = std::max((int)((scaleOffsetPixels - startX) / scaleStepPixels) - 1, 0);
+        const int endLoop = std::min((int)((size + scaleOffsetPixels - startX) / scaleStepPixels) + 1, numMarkers);
+
+        for (int i = startLoop; i < endLoop; ++i)
+        {
+            STick tick;
+
+            const int x = aznumeric_cast<int>(startX + i * scaleStepPixels - scaleOffsetPixels);
+            const float value = startTimeRound + i * scaleStep;
+
+            tick.m_bTenth = (startOffsetMod + i) % 10 != 0;
+            tick.m_position = x;
+            tick.m_value = value;
+
+            ticks.push_back(tick);
+        }
+
+        return ticks;
+    }
+
+    QColor Interpolate(const QColor& a, const QColor& b, float k)
+    {
+        float mk = 1.0f - k;
+        return QColor(aznumeric_cast<int>(a.red() * mk  + b.red() * k),
+            aznumeric_cast<int>(a.green() * mk + b.green() * k),
+            aznumeric_cast<int>(a.blue() * mk + b.blue() * k),
+            aznumeric_cast<int>(a.alpha() * mk + b.alpha() * k));
+    }
+
+    void DrawTicks(const std::vector<STick>& ticks, QPainter& painter, const QPalette& palette, const STickOptions& options)
+    {
+        QColor midDark = DrawingPrimitives::Interpolate(palette.color(QPalette::Dark), palette.color(QPalette::Button), 0.5f);
+        painter.setPen(QPen(midDark));
+
+        const int height = options.m_rect.height();
+        const int top = options.m_rect.top();
+
+        for (const STick& tick : ticks)
+        {
+            const int x = tick.m_position + options.m_rect.left();
+
+            if (tick.m_bTenth)
+            {
+                painter.drawLine(QPoint(x, top + height - options.m_markHeight / 2), QPoint(x, top + height));
+            }
+            else
+            {
+                painter.drawLine(QPoint(x, top + height - options.m_markHeight), QPoint(x, top + height));
+            }
+        }
+    }
+
+    void DrawTicks(QPainter& painter, const QPalette& palette, const SRulerOptions& options)
+    {
+        const std::vector<STick> ticks = CalculateTicks(options.m_rect.width(), options.m_visibleRange, options.m_rulerRange, nullptr, nullptr);
+        DrawTicks(ticks, painter, palette, options);
+    }
+
+    void DrawRuler(QPainter& painter, const QPalette& palette, const SRulerOptions& options, int* pRulerPrecision)
+    {
+        int rulerPrecision;
+        Range screenRulerRange;
+        const std::vector<STick> ticks = CalculateTicks(options.m_rect.width(), options.m_visibleRange, options.m_rulerRange, &rulerPrecision, &screenRulerRange);
+
+        if (pRulerPrecision)
+        {
+            *pRulerPrecision = rulerPrecision;
+        }
+
+        if (options.m_shadowSize > 0)
+        {
+            QRect shadowRect = QRect(options.m_rect.left(), options.m_rect.height(), options.m_rect.width(), options.m_shadowSize);
+            QLinearGradient upperGradient(shadowRect.left(), shadowRect.top(), shadowRect.left(), shadowRect.bottom());
+            upperGradient.setColorAt(0.0f, QColor(0, 0, 0, 128));
+            upperGradient.setColorAt(1.0f, QColor(0, 0, 0, 0));
+            QBrush upperBrush(upperGradient);
+            painter.fillRect(shadowRect, upperBrush);
+        }
+
+        painter.fillRect(options.m_rect, DrawingPrimitives::Interpolate(palette.color(QPalette::Button), palette.color(QPalette::Midlight), 0.25f));
+        if (options.m_drawBackgroundCallback)
+        {
+            options.m_drawBackgroundCallback();
+        }
+
+        QColor midDark = DrawingPrimitives::Interpolate(palette.color(QPalette::Dark), palette.color(QPalette::Button), 0.5f);
+        painter.setPen(QPen(midDark));
+
+        QFont font;
+        font.setPixelSize(10);
+        painter.setFont(font);
+
+
+        char format[16] = "";
+        sprintf_s(format, "%%.%df", rulerPrecision);
+
+        const int height = options.m_rect.height();
+        const int top = options.m_rect.top();
+
+        QString str;
+        for (const STick& tick : ticks)
+        {
+            const int x = tick.m_position + options.m_rect.left();
+            const float value = tick.m_value;
+
+            if (tick.m_bTenth)
+            {
+                painter.drawLine(QPoint(x, top + height - options.m_markHeight / 2), QPoint(x, top + height));
+            }
+            else
+            {
+                painter.drawLine(QPoint(x, top + height - options.m_markHeight), QPoint(x, top + height));
+                painter.setPen(palette.color(QPalette::Disabled, QPalette::Text));
+                str.asprintf(format, value);
+                painter.drawText(QPoint(x + 2, top + height - options.m_markHeight + 1), str);
+                painter.setPen(midDark);
+            }
+        }
+
+        painter.setPen(QPen(palette.color(QPalette::Dark)));
+        painter.drawLine(QPoint(aznumeric_cast<int>(options.m_rect.left() + screenRulerRange.start), 0), QPoint(aznumeric_cast<int>(options.m_rect.left() + screenRulerRange.start), options.m_rect.top() + height));
+        painter.drawLine(QPoint(aznumeric_cast<int>(options.m_rect.left() + screenRulerRange.end), 0), QPoint(aznumeric_cast<int>(options.m_rect.left() + screenRulerRange.end), options.m_rect.top() + height));
+    }
+}
diff --git a/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.h b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.h
new file mode 100644
index 0000000000..d3f9fbfd24
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.h
@@ -0,0 +1,51 @@
+/*
+ * 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 "Range.h"
+
+#include <functional>
+#include <vector>
+#include <QRect>
+
+class QPainter;
+class QPalette;
+
+namespace DrawingPrimitives
+{
+    struct SRulerOptions;
+    typedef std::function<void()> TDrawCallback;
+
+    struct SRulerOptions
+    {
+        QRect m_rect;
+        Range m_visibleRange;
+        Range m_rulerRange;
+        int m_textXOffset;
+        int m_textYOffset;
+        int m_markHeight;
+        int m_shadowSize;
+
+        TDrawCallback m_drawBackgroundCallback;
+    };
+
+    struct STick
+    {
+        bool m_bTenth;
+        int m_position;
+        float m_value;
+    };
+
+    typedef SRulerOptions STickOptions;
+
+    std::vector<STick> CalculateTicks(uint size, Range visibleRange, Range rulerRange, int* pRulerPrecision, Range* pScreenRulerRange);
+    void DrawTicks(const std::vector<STick>& ticks, QPainter& painter, const QPalette& palette, const STickOptions& options);
+    void DrawTicks(QPainter& painter, const QPalette& palette, const STickOptions& options);
+    void DrawRuler(QPainter& painter, const QPalette& palette, const SRulerOptions& options, int* pRulerPrecision);
+}
diff --git a/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp
new file mode 100644
index 0000000000..45f5dc7e96
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.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 "EditorCommon_precompiled.h"
+#include "TimeSlider.h"
+
+#include <QPainter>
+#include <QPalette>
+
+namespace DrawingPrimitives
+{
+    void DrawTimeSlider(QPainter& painter, const QPalette& palette, const STimeSliderOptions& options)
+    {
+        QString text = QString::number(options.m_time, 'f', options.m_precision + 1);
+
+        QFontMetrics fm(painter.font());
+        const int textWidth = fm.horizontalAdvance(text) + fm.height();
+        const int markerHeight = fm.height();
+
+        const int thumbX = options.m_position;
+        const bool fits = thumbX + textWidth < options.m_rect.right();
+
+        const QRect timeRect(fits ? thumbX : thumbX - textWidth, 3, textWidth, fm.height());
+        painter.fillRect(timeRect.adjusted(fits ? 0 : -1, 0, fits ? 1 : 0, 0), options.m_bHasFocus ? palette.highlight() : palette.shadow());
+        painter.setPen(palette.color(QPalette::HighlightedText));
+        painter.drawText(timeRect.adjusted(fits ? 0 : aznumeric_cast<int>(markerHeight * 0.2f), -1, fits ? aznumeric_cast<int>(-markerHeight * 0.2f) : 0, 0), text, QTextOption(fits ? Qt::AlignRight : Qt::AlignLeft));
+
+        painter.setPen(palette.color(QPalette::Text));
+        painter.drawLine(QPointF(thumbX, 0), QPointF(thumbX, options.m_rect.height()));
+        QPointF points[3] =
+        {
+            QPointF(thumbX,  markerHeight),
+            QPointF(thumbX - markerHeight * 0.66f, 0),
+            QPointF(thumbX + markerHeight * 0.66f, 0)
+        };
+
+        painter.setBrush(palette.base());
+        painter.setPen(palette.color(QPalette::Text));
+        painter.drawPolygon(points, 3);
+    }
+}
diff --git a/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.h b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.h
new file mode 100644
index 0000000000..d1570feca3
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#pragma once
+
+#include "Range.h"
+
+#include <QRect>
+
+class QPainter;
+class QPalette;
+
+namespace DrawingPrimitives
+{
+    struct STimeSliderOptions
+    {
+        QRect m_rect;
+        int m_precision;
+        int m_position;
+        float m_time;
+        bool m_bHasFocus;
+    };
+
+    void DrawTimeSlider(QPainter& painter, const QPalette& palette, const STimeSliderOptions& options);
+}
diff --git a/Code/Editor/Plugins/EditorCommon/EditorCommon.cpp b/Code/Editor/Plugins/EditorCommon/EditorCommon.cpp
new file mode 100644
index 0000000000..f8f29f0c23
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/EditorCommon.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#include "EditorCommon_precompiled.h"
+
+#include <platform.h>
+#include "EditorCommon.h"
+
+#include "EditorCommonAPI.h"
+
+CEditorCommonApp::CEditorCommonApp()
+{
+}
+
+
+void EDITOR_COMMON_API InitializeEditorCommon([[maybe_unused]] IEditor* editor)
+{
+}
+
+void EDITOR_COMMON_API UninitializeEditorCommon()
+{
+}
+
+void EDITOR_COMMON_API InitializeEditorCommonISystem(ISystem* pSystem)
+{
+    ModuleInitISystem(pSystem, "EditorCommon");
+}
+
+void EDITOR_COMMON_API UninitializeEditorCommonISystem(ISystem* pSystem)
+{
+    ModuleShutdownISystem(pSystem);
+}
diff --git a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.def b/Code/Editor/Plugins/EditorCommon/EditorCommon.def
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/EditorCommon.def
rename to Code/Editor/Plugins/EditorCommon/EditorCommon.def
diff --git a/Code/Editor/Plugins/EditorCommon/EditorCommon.h b/Code/Editor/Plugins/EditorCommon/EditorCommon.h
new file mode 100644
index 0000000000..4f8dfea668
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/EditorCommon.h
@@ -0,0 +1,17 @@
+/*
+ * 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_EDITORCOMMON_EDITORCOMMON_H
+#define CRYINCLUDE_EDITORCOMMON_EDITORCOMMON_H
+
+class CEditorCommonApp
+{
+public:
+    CEditorCommonApp();
+};
+
+#endif // CRYINCLUDE_EDITORCOMMON_EDITORCOMMON_H
diff --git a/Code/Editor/Plugins/EditorCommon/EditorCommon.rc b/Code/Editor/Plugins/EditorCommon/EditorCommon.rc
new file mode 100644
index 0000000000..77deebb598
Binary files /dev/null and b/Code/Editor/Plugins/EditorCommon/EditorCommon.rc differ
diff --git a/Code/Editor/Plugins/EditorCommon/EditorCommonAPI.h b/Code/Editor/Plugins/EditorCommon/EditorCommonAPI.h
new file mode 100644
index 0000000000..017a045419
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/EditorCommonAPI.h
@@ -0,0 +1,38 @@
+/*
+ * 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_EDITORCOMMON_EDITORCOMMONAPI_H
+#define CRYINCLUDE_EDITORCOMMON_EDITORCOMMONAPI_H
+
+#include <AzCore/PlatformDef.h>
+
+#if defined(EDITOR_COMMON_EXPORTS)
+
+#define EDITOR_COMMON_API AZ_DLL_EXPORT
+
+#elif defined(EDITOR_COMMON_IMPORTS)
+
+#define EDITOR_COMMON_API AZ_DLL_IMPORT
+
+#else
+
+#define EDITOR_COMMON_API
+
+#endif
+
+struct IEditor;
+struct ISystem;
+
+void EDITOR_COMMON_API InitializeEditorCommon(IEditor* editor);
+void EDITOR_COMMON_API UninitializeEditorCommon();
+
+void EDITOR_COMMON_API InitializeEditorCommonISystem(ISystem* pSystem);
+void EDITOR_COMMON_API UninitializeEditorCommonISystem(ISystem* pSystem);
+
+#endif // CRYINCLUDE_EDITORCOMMON_EDITORCOMMONAPI_H
diff --git a/Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h b/Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
new file mode 100644
index 0000000000..0fa561651c
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
@@ -0,0 +1,21 @@
+/*
+ * 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 VC_EXTRALEAN
+#define VC_EXTRALEAN
+#endif
+
+// These redicilous dependencies are needed just to be able to use
+// Sandbox gizmos drawing and hit-testing code =(
+
+#include "ISystem.h"
+#include "Include/EditorCoreAPI.h"
+#include "Util/EditorUtils.h"
+
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/auto.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/auto.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/auto.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/auto.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/break.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/break.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/break.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/break.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/fit_horizontal.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/fit_horizontal.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/fit_horizontal.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/fit_horizontal.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/fit_vertical.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/fit_vertical.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/fit_vertical.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/fit_vertical.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/linear_in.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/linear_in.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/linear_in.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/linear_in.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/linear_out.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/linear_out.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/linear_out.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/linear_out.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/step_in.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/step_in.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/step_in.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/step_in.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/step_out.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/step_out.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/step_out.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/step_out.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/unify.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/unify.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/unify.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/unify.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/zero_in.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/zero_in.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/zero_in.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/zero_in.png
diff --git a/Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/zero_out.png b/Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/zero_out.png
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/Icons/CurveEditor/zero_out.png
rename to Code/Editor/Plugins/EditorCommon/Icons/CurveEditor/zero_out.png
diff --git a/Code/Editor/Plugins/EditorCommon/QtViewPane.cpp b/Code/Editor/Plugins/EditorCommon/QtViewPane.cpp
new file mode 100644
index 0000000000..cbe849905a
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/QtViewPane.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorCommon_precompiled.h"
+#include "platform.h"
+
+#pragma warning(disable: 4266) // disabled warning from afk overrides
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
+#include <afxwin.h>
+#include <vector>
+
+#include "QtViewPane.h"
+
+#include "Include/IViewPane.h"
+#include "Util/RefCountBase.h"
+#include "QtWinMigrate/qwinwidget.h"
+
+#include <QWidget>
+#include <QEvent>
+#include <QApplication>
+#include <QCloseEvent>
+#include <QHBoxLayout>
+
+#include "QtUtil.h"
+
+// ugly dependencies:
+#pragma warning(push)
+#pragma warning(disable: 4244) // warning C4244: 'argument' : conversion from 'A' to 'B', possible loss of data
+#include "Functor.h"
+class CXmlArchive;
+#include <IRenderer.h>
+#include "Util/PathUtil.h"
+#pragma warning(pop)
+// ^^^
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+
diff --git a/Code/Editor/Plugins/EditorCommon/Resource.h b/Code/Editor/Plugins/EditorCommon/Resource.h
new file mode 100644
index 0000000000..97ea9a320e
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/Resource.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
+ *
+ */
+
+
+
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by EditorCommon.rc
+//
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+
+#define _APS_NEXT_RESOURCE_VALUE    1000
+#define _APS_NEXT_CONTROL_VALUE     1000
+#define _APS_NEXT_SYMED_VALUE       1000
+#define _APS_NEXT_COMMAND_VALUE     32771
+#endif
+#endif
diff --git a/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp b/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp
new file mode 100644
index 0000000000..72d4b43249
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp
@@ -0,0 +1,341 @@
+/*
+ * 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 "EditorCommon_precompiled.h"
+#include <SaveUtilities/AsyncSaveRunner.h>
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
+#include <AzCore/IO/SystemFile.h>
+#include <ActionOutput.h>
+
+namespace AZ
+{
+    /* -------------------------- *
+     * == Save Operation Cache == *
+     * -------------------------- */
+
+    SaveOperationController::SaveOperationCache::SaveOperationCache(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation, SaveOperationController& owner, bool isDelete)
+        : m_fullSavePath(fullPath)
+        , m_saveOperation(saveOperation)
+        , m_owner(owner)
+        , m_isDelete(isDelete)
+    {
+    }
+
+    void SaveOperationController::SaveOperationCache::Run(const AZStd::shared_ptr<ActionOutput>& actionOutput)
+    {
+        if (m_isDelete)
+        {
+            RunDelete(actionOutput);
+            return;
+        }
+        // Create the callback to pass to the SourceControlAPI
+        AzToolsFramework::SourceControlResponseCallback callback =
+        [this, actionOutput](bool success, const AzToolsFramework::SourceControlFileInfo& info)
+        {
+            if (success || !info.IsReadOnly())
+            {
+                if (m_saveOperation && !m_saveOperation(m_fullSavePath, actionOutput))
+                {
+                    success = false;
+
+                    if (actionOutput)
+                    {
+                        actionOutput->AddError("Failed to save entries/dependencies", m_fullSavePath);
+                    }
+                }
+            }
+
+            if (!success && actionOutput)
+            {
+                AZStd::string message;
+                AZStd::string details = m_fullSavePath;
+
+                // If there's no attempt to save any data it's assumed that this function was called to add an existing file to source control.
+                //      Rather than report this as an error, report it as a warning as no data was lost.
+                bool reportAsWarning = !m_saveOperation;
+                bool moreDetails = true;
+
+                // Be more specific with errors so as to give the user the best chance at fixing them
+                if (!info.HasFlag(AzToolsFramework::SCF_OpenByUser))
+                {
+                    if (info.HasFlag(AzToolsFramework::SCF_OutOfDate))
+                    {
+                        message = "The file being worked on doesn't contain the latest changes from source control";
+                        moreDetails = false;
+                    }
+                    else if (info.IsLockedByOther())
+                    {
+                        message = "The file is already exclusively opened by another user";
+                        details = info.m_StatusUser + " -> " + m_fullSavePath;
+                        moreDetails = false;
+                    }
+                    else if (info.m_status == AzToolsFramework::SourceControlStatus::SCS_ProviderIsDown)
+                    {
+                        message = "Failed to put entries/dependencies into source control as the provider is not available.\n";
+                    }
+                    else if (info.m_status == AzToolsFramework::SourceControlStatus::SCS_CertificateInvalid)
+                    {
+                        message = "Failed to put entries/dependencies into source control as the source control has an invalid certificate.\n";
+                    }
+                    else if (info.m_status == AzToolsFramework::SourceControlStatus::SCS_ProviderError)
+                    {
+                        message = "Failed to put entries/dependencies into source control as the provider reported an error.\n";
+                    }
+                    else if (!info.IsManaged())
+                    {
+                        message = "Failed to put entries/dependencies into source control as they are outside the current workspace mapping.\n";
+                        reportAsWarning = true;
+                    }
+                    else
+                    {
+                        message = "Make sure the disk is not full or the file is not write-protected or not currently in use.\n";
+                    }
+                }
+                else
+                {
+                    message = "File marked as 'Open By User' but still failed.\n";
+                }
+
+                if (moreDetails)
+                {
+                    message += "Please see the source control icon in the status bar for further details";
+                }
+
+                if (reportAsWarning)
+                {
+                    actionOutput->AddWarning(message, details);
+                    success = true;
+                }
+                else
+                {
+                    actionOutput->AddError(message, details);
+                }
+            }
+
+            m_owner.HandleOperationComplete(this, success);
+        };
+
+        using SCCommandBus = AzToolsFramework::SourceControlCommandBus;
+        SCCommandBus::Broadcast(&SCCommandBus::Events::RequestEdit, m_fullSavePath.c_str(), true, callback);
+    }
+
+    void SaveOperationController::SaveOperationCache::RunDelete(const AZStd::shared_ptr<ActionOutput>& actionOutput)
+    {
+        // Create the callback to pass to the SourceControlAPI
+        AzToolsFramework::SourceControlResponseCallback callback =
+            [this, actionOutput](bool success, const AzToolsFramework::SourceControlFileInfo& info)
+        {
+            if (success || !info.IsManaged())
+            {
+                success = true;
+                if (m_saveOperation && !m_saveOperation(m_fullSavePath, actionOutput))
+                {
+                    success = false;
+
+                    if (actionOutput)
+                    {
+                        actionOutput->AddError("Failed to delete entry", m_fullSavePath.c_str());
+                    }
+                }
+            }
+            else if (actionOutput)
+            {
+                // Be more specific with errors so as to give the user the best chance at fixing them
+                if (!info.HasFlag(AzToolsFramework::SCF_OpenByUser))
+                {
+                    if (info.HasFlag(AzToolsFramework::SourceControlFlags::SCF_OutOfDate))
+                    {
+                        actionOutput->AddError("Source Control Issue - You do not have latest changes from source control for file", m_fullSavePath);
+                    }
+                    else if (info.IsLockedByOther())
+                    {
+                        actionOutput->AddError("Source Control Issue - File exclusively opened by another user", info.m_StatusUser + " -> " + m_fullSavePath);
+                    }
+                    else if (info.m_status == AzToolsFramework::SourceControlStatus::SCS_ProviderIsDown
+                        || info.m_status == AzToolsFramework::SourceControlStatus::SCS_CertificateInvalid
+                        || info.m_status == AzToolsFramework::SourceControlStatus::SCS_ProviderError)
+                    {
+                        actionOutput->AddError("Source Control Issue - Failed to remove file from source control, check your connection to your source control service", m_fullSavePath.c_str());
+                    }
+                    else
+                    {
+                        actionOutput->AddError("Unknown Issue with source control.", m_fullSavePath);
+                    }
+                }
+                else
+                {
+                    actionOutput->AddError("Source Control Issue - File marked as 'Open By User' but still failed.", m_fullSavePath);
+                }
+            }
+
+            m_owner.HandleOperationComplete(this, success);
+        };
+
+        using SCCommandBus = AzToolsFramework::SourceControlCommandBus;
+        SCCommandBus::Broadcast(&SCCommandBus::Events::RequestDelete, m_fullSavePath.c_str(), callback);
+    }
+
+    /* ------------------------------- *
+     * == Save Operation Controller == *
+     * ------------------------------- */
+
+    SaveOperationController::SaveOperationController(AsyncSaveRunner& owner)
+        : m_owner(owner)
+        , m_completedCount(0)
+    {
+    }
+
+    void SaveOperationController::AddDeleteOperation(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation)
+    {
+        m_allSaveOperations.push_back(AZStd::make_shared<SaveOperationCache>(fullPath, saveOperation, *this, true));
+    }
+
+    void SaveOperationController::AddSaveOperation(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation)
+    {
+        m_allSaveOperations.push_back(AZStd::make_shared<SaveOperationCache>(fullPath, saveOperation, *this));
+    }
+
+    void SaveOperationController::SetOnCompleteCallback(SaveCompleteCallback onThisRunnerComplete)
+    {
+        m_onSaveComplete = onThisRunnerComplete;
+    }
+    void SaveOperationController::RunAll(const AZStd::shared_ptr<ActionOutput>& actionOutput)
+    {
+        m_completedCount = 0;
+
+        // If for some reason there are no save operations in this controller, then we need
+        //  to notify the runner and return so that this controller can be properly counted
+        //  as being completed.
+        if (m_allSaveOperations.empty())
+        {
+            m_owner.HandleRunnerFinished(this, true);
+            return;
+        }
+
+        for (AZStd::shared_ptr<SaveOperationCache>& saveOperation : m_allSaveOperations)
+        {
+            saveOperation->Run(actionOutput);
+        }
+    }
+
+    void SaveOperationController::HandleOperationComplete([[maybe_unused]] SaveOperationCache* saveOperation, bool success)
+    {
+        if (!success)
+        {
+            m_currentSaveResult = false;
+        }
+
+        AZ_Assert(AZStd::find_if(m_allSaveOperations.begin(), m_allSaveOperations.end(),
+            [saveOperation](const AZStd::shared_ptr<SaveOperationCache>& target) -> bool
+            {
+                return target.get() == saveOperation;
+            }) != m_allSaveOperations.end(), 
+            "Attempting to cleanup completed save operation failed. Operation not found. Target file was: '%s'", 
+            saveOperation->m_fullSavePath.c_str());
+        
+        m_completedCount++;
+        if (m_completedCount >= m_allSaveOperations.size())
+        {
+            if (m_onSaveComplete)
+            {
+                m_onSaveComplete(m_currentSaveResult);
+            }
+
+            m_owner.HandleRunnerFinished(this, m_currentSaveResult);
+        }
+    }
+
+    /* ----------------------- *
+     * == Async Save Runner == *
+     * ----------------------- */
+
+    AZStd::shared_ptr<SaveOperationController> AsyncSaveRunner::GenerateController()
+    {
+        AZStd::shared_ptr<SaveOperationController> saveEntryController = AZStd::make_shared<SaveOperationController>(*this);
+        m_allSaveControllers.push_back(saveEntryController);
+        return saveEntryController;
+    }
+
+    void AsyncSaveRunner::Run(const AZStd::shared_ptr<ActionOutput>& actionOutput, SaveCompleteCallback onSaveAllComplete, ControllerOrder order)
+    {
+        m_counter = 0;
+        m_order = order;
+        m_actionOutput = actionOutput;
+        m_onSaveAllComplete = onSaveAllComplete;
+
+        // If for some reason there are no save operations in this runner, then we need to run
+        //  the callback now and return so that the caller is properly notified.
+        if (m_allSaveControllers.empty())
+        {
+            if (m_onSaveAllComplete)
+            {
+                m_onSaveAllComplete(true);
+            }
+
+            return;
+        }
+
+        if (order == ControllerOrder::Random)
+        {
+            for (auto& saveOp : m_allSaveControllers)
+            {
+                saveOp->RunAll(actionOutput);
+            }
+        }
+        else if (order == ControllerOrder::Sequential)
+        {
+            m_allSaveControllers[0]->RunAll(actionOutput);
+        }
+        else
+        {
+            AZ_Assert(false, "Invalid ControllerOrder: %i", order);
+        }
+    }
+    void AsyncSaveRunner::HandleRunnerFinished([[maybe_unused]] SaveOperationController* runner, bool success)
+    {
+        if (!success)
+        {
+            m_allWereSuccessfull = false;
+        }
+
+        if (m_order == ControllerOrder::Random)
+        {
+            AZ_Assert(AZStd::find_if(m_allSaveControllers.begin(), m_allSaveControllers.end(),
+                [runner](const AZStd::shared_ptr<SaveOperationController>& target) -> bool 
+                { 
+                    return target.get() == runner; 
+                }) != m_allSaveControllers.end(), "Attempting to cleanup completed save runner failed");
+            
+            m_counter++;
+        }
+        else if (m_order == ControllerOrder::Sequential)
+        {
+            AZ_Assert(m_counter < m_allSaveControllers.size(), 
+                "Counter for save controllers has become invalid (%i vs. %i).", static_cast<int>(m_counter), m_allSaveControllers.size());
+            AZ_Assert(m_allSaveControllers[m_counter].get() == runner, "Completed incorrect save runner for index %i.", static_cast<int>(m_counter));
+
+            m_counter++;
+            if (m_counter < m_allSaveControllers.size())
+            {
+                m_allSaveControllers[m_counter]->RunAll(m_actionOutput);
+            }
+        }
+        else
+        {
+            AZ_Assert(false, "Invalid ControllerOrder: %i", m_order);
+        }
+
+        if (m_counter >= m_allSaveControllers.size())
+        {
+            m_actionOutput.reset();
+            if (m_onSaveAllComplete)
+            {
+                m_onSaveAllComplete(m_allWereSuccessfull);
+            }
+        }
+    }
+}
diff --git a/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.h b/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.h
new file mode 100644
index 0000000000..63dd91d8e6
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.h
@@ -0,0 +1,168 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/functional.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/std/containers/vector.h>
+#include <EditorCommonAPI.h>
+
+/*
+------------------
+AsyncSaveRunner:
+------------------
+== Overview ==
+This class is meant to be a container for 1-n save operations that need to work with async source control commands. The asynchronous aspect of the SourceControlBus becomes
+much more difficult when you have many operations because there is a management problem in knowing how soon until all commands have completed. This class will provide you
+with an easy to use interface for specifying the save operations, and providing a single callback to be called once all those operations have been completed.
+
+== Note ==
+This class accepts lambdas and operates asynchronously. While the callbacks will be called on the main thread, **YOU MUST GUARANTEE LIFETIME YOURSELF**
+
+== Usage ==
+To use this class, you need to guarantee the lifetime of the save runner. The best way to do that is to store it as a member variable in the class that runs the save. Storing
+it in a pointer type (or smart-pointer type) will help you control it's lifetime and memory.
+
+Once you have a guaranteed lifetime AsyncSaveRunner, you'll build SaveOperationController instances that will manage all of your individual save operations, and will
+run the source control pieces for you. This allows you to focus on specifying the pieces you care about.
+
+This is easiest to see why you would want that, would be a 'Save All' scenario.
+Lets imagine a save function that saves an item, which consists of saving a "header" file and an "entry" file:
+    void SaveItem(int index)
+    {
+        auto item = m_items[index];
+
+        auto controller = m_saveRunner->GenerateController();
+        controller->AddSaveOperation(m_headerSaver.getPath(), [item](const AZStd::string& fullPath, const AZStd::shared_ptr<ActionOutput>& actionOutput)->bool
+            {
+                return item->headerSaver.save();
+            }
+        );
+
+        controller->AddSaveOperation(m_entry.getPath(), [item](const AZStd::string& fullPath, const AZStd::shared_ptr<ActionOutput>& actionOutput)->bool
+            {
+                return item->entry.save();
+            }
+        );
+    }
+
+You can see that the AsyncSaveRunner was used to make a save operation controller, called 'controller' and that controller was filled out with save operations.
+If it was desired, you could even add a callback per controller to know when each controller is finished (in case you have to run a custom notification or something
+on the item).
+
+You could imagine SaveItem being called 1-n times, adding more and more SaveOperationController instances to the AsyncSaveRunner. Once the runner is all filled out
+you call run on it and pass it a callback. This callback will only be called once. This leaves our example to look like this:
+
+    void SaveAll(AZStd::shared_ptr<AZ::ActionOutput> output, AZ::SaveCompleteCallback onComplete)
+    {
+        m_saveRunner = AZStd::make_shared<AZ::AsyncSaveRunner>();
+        for(int index = 0; index < m_numItems; ++index)
+        {
+            Saveitem(index);
+        }
+
+        m_saveRunner->Run(output,
+            [this](bool success)
+            {
+                m_saveRunner = nullptr;
+
+                if(onComplete)
+                {
+                    onComplete(success);
+                }
+            }
+        );
+    }
+*/
+
+namespace AZ
+{
+    class ActionOutput;
+
+    using SaveCompleteCallback = AZStd::function<void(bool success)>;
+    using SynchronousSaveOperation = AZStd::function<bool(const AZStd::string& fullPath, const AZStd::shared_ptr<ActionOutput>& actionOutput)>;
+
+    class AsyncSaveRunner;
+
+    // Stores a cache of synchronous save operations, and runs them on completion of asynchronous source control operations.
+    class EDITOR_COMMON_API SaveOperationController
+    {
+    public:
+        explicit SaveOperationController(AsyncSaveRunner& owner);
+        void AddSaveOperation(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation);
+        void AddDeleteOperation(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation);
+        void SetOnCompleteCallback(SaveCompleteCallback onThisRunnerComplete);
+
+        void RunAll(const AZStd::shared_ptr<ActionOutput>& actionOutput);
+
+        // Caches all synchronous save operations and associated data. Controlled by a SaveOperationController.
+        class SaveOperationCache
+        {
+        public:
+            SaveOperationCache(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation, SaveOperationController& owner, bool isDelete = false);
+
+            void Run(const AZStd::shared_ptr<ActionOutput>& actionOutput);
+            void RunDelete(const AZStd::shared_ptr<ActionOutput>& actionOutput);
+            friend class SaveOperationController;
+
+        private:
+            AZStd::string m_fullSavePath;
+            SynchronousSaveOperation m_saveOperation;
+            SaveOperationController& m_owner;
+            bool m_isDelete;
+        };
+
+        void HandleOperationComplete(SaveOperationCache* saveOperation, bool success);
+
+        friend class SaveRunner;
+
+    private:
+        AsyncSaveRunner& m_owner;
+        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        AZStd::vector<AZStd::shared_ptr<SaveOperationCache>> m_allSaveOperations;
+        SaveCompleteCallback m_onSaveComplete;
+        AZStd::atomic<size_t> m_completedCount;
+        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        bool m_currentSaveResult = true;
+    };
+
+    // Builds, stores and executes SaveOperationController instances
+    class EDITOR_COMMON_API AsyncSaveRunner
+    {
+    public:
+        enum class ControllerOrder
+        {
+            // Random will run controllers at once and completion will happen randomly.
+            Random,
+            // Controllers are executed in order, waiting for one controller before starting
+            //      the next one. Controllers internally will still have their executions
+            //      complete in random order.
+            Sequential
+        };
+
+        AZStd::shared_ptr<SaveOperationController> GenerateController();
+        void Run(const AZStd::shared_ptr<ActionOutput>& actionOutput, SaveCompleteCallback onSaveAllComplete, ControllerOrder order);
+
+    private:
+        friend class SaveOperationController;
+        void HandleRunnerFinished(SaveOperationController* runner, bool success);
+
+        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        AZStd::vector<AZStd::shared_ptr<SaveOperationController>> m_allSaveControllers;
+        SaveCompleteCallback m_onSaveAllComplete;
+        AZStd::shared_ptr<ActionOutput> m_actionOutput;
+        // If controller order is random this keeps track of the number of completed tasks, if the order is sequential it
+        //      keeps track of the currently executing controller.
+        AZStd::atomic<size_t> m_counter;
+        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        ControllerOrder m_order;
+        bool m_allWereSuccessfull = true;
+    };
+}
diff --git a/Code/Editor/Plugins/EditorCommon/UiEditorDLLBus.h b/Code/Editor/Plugins/EditorCommon/UiEditorDLLBus.h
new file mode 100644
index 0000000000..dc47efc290
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/UiEditorDLLBus.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+#include <LyShine/UiBase.h>
+
+class UndoStack;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that the UI Editor needs to implement
+class UiEditorDLLInterface
+    : public AZ::EBusTraits
+{
+public: // member functions
+
+    virtual ~UiEditorDLLInterface(){}
+
+    //! Get the selected elements in the UiEditor
+    virtual LyShine::EntityArray GetSelectedElements() = 0;
+
+    //! Get the id of the active Canvas the UiEditor
+    virtual AZ::EntityId GetActiveCanvasId() = 0;
+
+    //! Get the active undo stack for the UI Editor
+    virtual UndoStack* GetActiveUndoStack() = 0;
+
+    //! Soft-switch to the given file.  Note that this should prompt for unsaved changes, etc.
+    virtual void OpenSourceCanvasFile(QString absolutePathToFile) = 0;
+
+public: // static member functions
+
+    static const char* GetUniqueName() { return "UiEditorDLLInterface"; }
+};
+
+typedef AZ::EBus<UiEditorDLLInterface> UiEditorDLLBus;
diff --git a/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidget.h b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidget.h
new file mode 100644
index 0000000000..9adce6eb5c
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidget.h
@@ -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
+ *
+ */
+
+
+#pragma once
+
+#include "EditorCommonAPI.h"
+#include "IEditor.h"
+
+
+#include <WinWidget/WinWidgetManager.h>
+#include <Core/QtEditorApplication.h>
+#include <QWidget>
+
+namespace WinWidget
+{
+    template<class TWidget>
+    bool RegisterWinWidget()
+    {
+        static QWidget* winWidget {nullptr}; // Must declare outside of lambda
+
+        WinWidget::WinWidgetManager::WinWidgetCreateCall createCall = []() -> QWidget*
+            {
+                if (!winWidget)
+                {
+                    winWidget = new QWidget(GetIEditor()->GetEditorMainWindow());
+                }
+                
+                // Ensure only one instance of each window type exists
+                QList<TWidget*> existingWidgets = winWidget->findChildren<TWidget*>();
+                if (existingWidgets.size() > 0) // Note that the list should contain 0 or 1 entries
+                { 
+                    if (existingWidgets.first()->isVisible())
+                    {
+                        return nullptr; // TWidget type already in use - continue using it and don't create another
+                    }
+                    delete existingWidgets.first(); // Closed TWidget - remove
+                }
+
+                TWidget* createWidget = new TWidget(winWidget);
+
+                createWidget->Display();
+                return winWidget;
+            };
+
+        return GetIEditor()->GetWinWidgetManager()->RegisterWinWidget(TWidget::GetWWId(), createCall);
+    }
+
+    template<class TWidget>
+    void UnregisterWinWidget()
+    {
+        GetIEditor()->GetWinWidgetManager()->UnregisterWinWidget(TWidget::GetWWId());
+    }
+}
diff --git a/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp
new file mode 100644
index 0000000000..aa1cc71040
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp
@@ -0,0 +1,70 @@
+/*
+ * 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 "EditorCommon_precompiled.h"
+#include <WinWidget/WinWidgetManager.h>
+
+namespace WinWidget
+{
+    WinWidgetManager::WinWidgetManager()
+        : m_createCalls(size_t(WinWidgetId::NUM_WIN_WIDGET_IDS) + 1)
+    {
+    }
+
+    size_t WinWidgetManager::GetIndexForId(WinWidgetId thisId) const
+    {
+        size_t thisIndex = static_cast<size_t>(thisId);
+        if (thisIndex >= m_createCalls.size())
+        {
+            return 0;
+        }
+        return thisIndex;
+    }
+
+    WinWidgetManager::WinWidgetCreateCall WinWidgetManager::GetCreateCall(WinWidgetId thisId) const
+    {
+        size_t thisIndex = GetIndexForId(thisId);
+        if (!thisIndex)
+        {
+            return nullptr;
+        }
+        return m_createCalls[thisIndex];
+    }
+
+    bool WinWidgetManager::RegisterWinWidget(WinWidgetId thisId, WinWidgetCreateCall createCall)
+    {
+        size_t thisIndex = GetIndexForId(thisId);
+        if (m_createCalls[thisIndex] != nullptr)
+        {
+            return false;
+        }
+        m_createCalls[thisIndex] = createCall;
+        return true;
+    }
+
+    bool WinWidgetManager::UnregisterWinWidget(WinWidgetId thisId)
+    {
+        size_t thisIndex = GetIndexForId(thisId);
+        if (m_createCalls[thisIndex] == nullptr)
+        {
+            return false;
+        }
+        m_createCalls[thisIndex] = nullptr;
+        return true;
+    }
+
+
+    QWidget* WinWidgetManager::OpenWinWidget(WinWidgetId createId) const
+    {
+        WinWidgetManager::WinWidgetCreateCall createCall = GetCreateCall(createId);
+        if (!createCall)
+        {
+            return nullptr;
+        }
+        return createCall();
+    }
+}
diff --git a/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.h b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.h
new file mode 100644
index 0000000000..ee46e99bbf
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.h
@@ -0,0 +1,38 @@
+/*
+ * 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 <WinWidgetId.h>
+#include "EditorCommonAPI.h"
+
+#include <vector>
+#include <functional>
+
+namespace WinWidget
+{
+    class EDITOR_COMMON_API WinWidgetManager
+    {
+    public:
+        using WinWidgetCreateCall = std::function<QWidget*()>;
+
+        WinWidgetManager();
+        ~WinWidgetManager() {}
+
+        bool RegisterWinWidget(WinWidgetId thisId, WinWidgetCreateCall createCall);
+        bool UnregisterWinWidget(WinWidgetId thisId);
+
+        QWidget* OpenWinWidget(WinWidgetId) const;
+    private:
+        WinWidgetCreateCall GetCreateCall(WinWidgetId thisId) const;
+        size_t GetIndexForId(WinWidgetId thisId) const;
+
+        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        std::vector<WinWidgetCreateCall> m_createCalls;
+        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    };
+}
diff --git a/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake b/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake
new file mode 100644
index 0000000000..5277f2456a
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/editorcommon_files.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
+#
+#
+
+set(FILES
+    EditorCommon.h
+    EditorCommon.cpp
+    EditorCommon.rc
+    EditorCommonAPI.h
+    EditorCommon_precompiled.h
+    ActionOutput.h
+    ActionOutput.cpp
+    UiEditorDLLBus.h
+    DockTitleBarWidget.cpp
+    DockTitleBarWidget.h
+    SaveUtilities/AsyncSaveRunner.h
+    SaveUtilities/AsyncSaveRunner.cpp
+    AxisHelper.cpp
+    DisplayContext.cpp
+    DeepFilterProxyModel.cpp
+    DeepFilterProxyModel.h
+    Resource.h
+    DrawingPrimitives/Ruler.cpp
+    DrawingPrimitives/Ruler.h
+    DrawingPrimitives/TimeSlider.cpp
+    DrawingPrimitives/TimeSlider.h
+    WinWidget/WinWidget.h
+    WinWidget/WinWidgetManager.h
+    WinWidget/WinWidgetManager.cpp
+)
diff --git a/Code/Sandbox/Plugins/EditorCommon/res/EditorCommon.rc2 b/Code/Editor/Plugins/EditorCommon/res/EditorCommon.rc2
similarity index 100%
rename from Code/Sandbox/Plugins/EditorCommon/res/EditorCommon.rc2
rename to Code/Editor/Plugins/EditorCommon/res/EditorCommon.rc2
diff --git a/Code/Editor/Plugins/EditorCommon/stdafx.cpp b/Code/Editor/Plugins/EditorCommon/stdafx.cpp
new file mode 100644
index 0000000000..23e4c68c56
--- /dev/null
+++ b/Code/Editor/Plugins/EditorCommon/stdafx.cpp
@@ -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
+ *
+ */
+
+
+// stdafx.cpp : source file that includes just the standard includes
+// EditorCommon.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "EditorCommon_precompiled.h"
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/CMakeLists.txt b/Code/Editor/Plugins/FFMPEGPlugin/CMakeLists.txt
new file mode 100644
index 0000000000..342151f24a
--- /dev/null
+++ b/Code/Editor/Plugins/FFMPEGPlugin/CMakeLists.txt
@@ -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
+#
+#
+
+if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+ly_add_target(
+    NAME FFMPEGPlugin MODULE
+    NAMESPACE Legacy
+    OUTPUT_SUBDIRECTORY EditorPlugins
+    FILES_CMAKE
+        ffmpegplugin_files.cmake
+    COMPILE_DEFINITIONS
+        PRIVATE
+            PLUGIN_EXPORTS
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+    BUILD_DEPENDENCIES
+        PRIVATE
+            AZ::AzCore
+            Legacy::CryCommon
+            Legacy::EditorLib
+)
+
+ly_add_dependencies(Editor FFMPEGPlugin)
+set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::FFMPEGPlugin>)
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp
new file mode 100644
index 0000000000..8ebbc8cc9b
--- /dev/null
+++ b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp
@@ -0,0 +1,140 @@
+/*
+ * 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 "FFMPEGPlugin_precompiled.h"
+#include "FFMPEGPlugin.h"
+#include "CryString.h"
+typedef CryStringT<char> string;
+#include "Include/ICommandManager.h"
+#include "Util/PathUtil.h"
+
+#include <QCoreApplication>
+#include <QSettings>
+#include <QProcess>
+
+namespace PluginInfo
+{
+    const char* kName = "FFMPEG Writer";
+    const char* kGUID = "{D2A3A44A-00FF-4341-90BA-89A473F44A65}";
+    const int kVersion = 1;
+}
+
+void CFFMPEGPlugin::Release()
+{
+    GetIEditor()->GetICommandManager()->UnregisterCommand(COMMAND_MODULE, COMMAND_NAME);
+    delete this;
+}
+
+void CFFMPEGPlugin::ShowAbout()
+{
+}
+
+const char* CFFMPEGPlugin::GetPluginGUID()
+{
+    return PluginInfo::kGUID;
+}
+
+DWORD CFFMPEGPlugin::GetPluginVersion()
+{
+    return PluginInfo::kVersion;
+}
+
+const char* CFFMPEGPlugin::GetPluginName()
+{
+    return PluginInfo::kName;
+}
+
+bool CFFMPEGPlugin::CanExitNow()
+{
+    return true;
+}
+
+static void Command_FFMPEGEncode(const char* input, const char* output, const char* codec, int bitRateinKb, int fps, const char* etc)
+{
+    QString ffmpegExectablePath = CFFMPEGPlugin::GetFFMPEGExectablePath();
+    QString ffmpegCmdLine = QStringLiteral("\"%1\" -r %2 -i \"%3\" -vcodec %4 -b %5k -r %6 %7 -strict experimental -y \"%8\"")
+        .arg(ffmpegExectablePath, QString::number(fps), input, codec, QString::number(bitRateinKb), QString::number(fps), etc, output);
+    GetIEditor()->GetSystem()->GetILog()->Log("Executing \"%s\" from FFMPEGPlugin...", ffmpegCmdLine.toUtf8().data());
+    QString outTxt;
+    GetIEditor()->ExecuteConsoleApp(ffmpegCmdLine, outTxt, true, true);
+    GetIEditor()->GetSystem()->GetILog()->Log("FFMPEG execution done.");
+}
+
+QString CFFMPEGPlugin::GetFFMPEGExectablePath()
+{
+    // the FFMPEG exe could be in a number of possible locations
+    // our preferred location is from the path in the registry @
+    // "Software\\Amazon\\Lumberyard\\Settings"
+    // in a value called "FFMPEG_PLUGIN"
+
+    // if its not there, try the current folder and a few others
+    // see what can be found!
+    QString ffmpegExectablePath;
+
+    QSettings settings("O3DE", "O3DE");
+    settings.beginGroup("Settings");
+    ffmpegExectablePath = settings.value("FFMPEG_PLUGIN").toString();
+
+    if (ffmpegExectablePath.isEmpty() || !QFile::exists(ffmpegExectablePath))
+    {
+        QString path = qApp->applicationDirPath();
+        QString checkPath;
+
+        const char* possibleLocations[] = {
+            "rc/ffmpeg",
+            "editorplugins/ffmpeg",
+            "../editor/plugins/ffmpeg",
+        };
+
+        for (int idx = 0; idx < 3; ++idx)
+        {
+#if defined(AZ_PLATFORM_WINDOWS)
+            checkPath = QStringLiteral("%1/%2.exe").arg(path, possibleLocations[idx]);
+#else
+            checkPath = QStringLiteral("%1/%2").arg(path, possibleLocations[idx]);
+#endif
+            if (QFile::exists(checkPath))
+            {
+                ffmpegExectablePath = checkPath;
+                break;
+            }
+        }
+
+        if (ffmpegExectablePath.isEmpty())
+        {
+#if defined(AZ_PLATFORM_WINDOWS)
+            ffmpegExectablePath = "ffmpeg.exe";
+#else
+            ffmpegExectablePath = "ffmpeg";
+#endif
+            // try the current folder if all else fails, this will also work if its in the PATH somehow.
+        }
+    }
+
+    return ffmpegExectablePath;
+}
+
+bool CFFMPEGPlugin::RuntimeTest()
+{
+    QString ffmpegExectablePath = CFFMPEGPlugin::GetFFMPEGExectablePath();
+    return QProcess::startDetached(QStringLiteral("\"%1\" -version").arg(ffmpegExectablePath), {});
+}
+
+void CFFMPEGPlugin::RegisterTheCommand()
+{
+    using namespace AZStd::placeholders;
+    CommandManagerHelper::RegisterCommand<const char*, const char*, const char*, int, int, const char*>(
+        GetIEditor()->GetICommandManager(),
+        COMMAND_MODULE, COMMAND_NAME, "Encodes a video using ffmpeg.",
+        "plugin.ffmpeg_encode 'input.avi' 'result.mov' 'libx264' 200 30",
+        AZStd::bind(Command_FFMPEGEncode, _1, _2, _3, _4, _5, _6));
+}
+
+void CFFMPEGPlugin::OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId)
+{
+}
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.h b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.h
new file mode 100644
index 0000000000..604b5f36a3
--- /dev/null
+++ b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#pragma once
+////////////////////////////////////////////////////////////////////////////
+// -------------------------------------------------------------------------
+//  File Name        : FFMPEGPlugin.h
+//  Author           : Jaewon Jung
+//  Time of creation : 8/10/2011   16:33
+//  Compilers        : VS2008
+//  Description      :
+// -------------------------------------------------------------------------
+////////////////////////////////////////////////////////////////////////////
+#ifndef CRYINCLUDE_FFMPEGPLUGIN_FFMPEGPLUGIN_H
+#define CRYINCLUDE_FFMPEGPLUGIN_FFMPEGPLUGIN_H
+#include <Include/IPlugin.h>
+
+#define COMMAND_MODULE "plugin"
+#define COMMAND_NAME "ffmpeg_encode"
+
+class CFFMPEGPlugin
+    : public IPlugin
+{
+public:
+    void Release();
+    void ShowAbout();
+    const char* GetPluginGUID();
+    DWORD GetPluginVersion();
+    const char* GetPluginName();
+    bool CanExitNow();
+    static QString GetFFMPEGExectablePath();
+    static bool RuntimeTest();
+    static void RegisterTheCommand();
+    void OnEditorNotify(EEditorNotifyEvent aEventId);
+};
+#endif // CRYINCLUDE_FFMPEGPLUGIN_FFMPEGPLUGIN_H
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.rc b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.rc
similarity index 100%
rename from Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.rc
rename to Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.rc
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
new file mode 100644
index 0000000000..3b015dd9a5
--- /dev/null
+++ b/Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#pragma once
+
+#include <AzCore/PlatformDef.h>
+
+#include "resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// CRY Stuff ////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+#include <platform.h>
+
+
+/////////////////////////////////////////////////////////////////////////////
+// STL
+/////////////////////////////////////////////////////////////////////////////
+#include <vector>
+#include <list>
+#include <map>
+#include <set>
+#include <algorithm>
+
+/////////////////////////////////////////////////////////////////////////////
+// CRY Stuff ////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+#include <ISystem.h>
+#include "Util/EditorUtils.h"
+#include "EditorCoreAPI.h"
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake b/Code/Editor/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake
new file mode 100644
index 0000000000..e6a3397606
--- /dev/null
+++ b/Code/Editor/Plugins/FFMPEGPlugin/ffmpegplugin_files.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
+#
+#
+
+set(FILES
+    FFMPEGPlugin.rc
+    main.cpp
+    FFMPEGPlugin_precompiled.h
+    FFMPEGPlugin.cpp
+    FFMPEGPlugin.h
+)
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/main.cpp b/Code/Editor/Plugins/FFMPEGPlugin/main.cpp
new file mode 100644
index 0000000000..b3b2d7149b
--- /dev/null
+++ b/Code/Editor/Plugins/FFMPEGPlugin/main.cpp
@@ -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
+ *
+ */
+
+
+#include "FFMPEGPlugin_precompiled.h"
+#include "FFMPEGPlugin.h"
+#include "Include/IEditorClassFactory.h"
+
+
+PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
+{
+    if (pInitParam->pluginVersion != SANDBOX_PLUGIN_SYSTEM_VERSION)
+    {
+        pInitParam->outErrorCode = IPlugin::eError_VersionMismatch;
+        return 0;
+    }
+
+    ModuleInitISystem(GetIEditor()->GetSystem(), "FFMPEGPlugin");
+    GetIEditor()->GetSystem()->GetILog()->Log("FFMPEG plugin: CreatePluginInstance");
+
+    // Make sure the ffmpeg command can be executed before registering the command
+    if (!CFFMPEGPlugin::RuntimeTest())
+    {
+        AZStd::string msg =
+            "FFMPEG plugin: Failed to execute FFmepg. Please run Setup Assistant, "
+            "go to the 'Optional software' section of the 'Install software' tab, "
+            "and make sure the FFmpeg executable is correctly configured.";
+        GetIEditor()->GetSystem()->GetILog()->Log(msg.c_str());
+    }
+    else
+    {
+        CFFMPEGPlugin::RegisterTheCommand();
+    }
+
+    return new CFFMPEGPlugin;
+}
diff --git a/Code/Editor/Plugins/FFMPEGPlugin/resource.h b/Code/Editor/Plugins/FFMPEGPlugin/resource.h
new file mode 100644
index 0000000000..1de830b499
--- /dev/null
+++ b/Code/Editor/Plugins/FFMPEGPlugin/resource.h
@@ -0,0 +1,21 @@
+/*
+ * 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
+ *
+ */
+
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by FFMPEGPlugin.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/Code/Editor/Plugins/PerforcePlugin/CMakeLists.txt b/Code/Editor/Plugins/PerforcePlugin/CMakeLists.txt
new file mode 100644
index 0000000000..15a1147166
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/CMakeLists.txt
@@ -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
+#
+#
+
+if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/Platform/${PAL_PLATFORM_NAME}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) # For PAL_TRAIT_BUILD_P4PLUGIN_SUPPORTED
+
+if(NOT PAL_TRAIT_BUILD_P4PLUGIN_SUPPORTED)
+    return()
+endif()
+
+ly_add_target(
+    NAME PerforcePlugin MODULE
+    NAMESPACE Legacy
+    OUTPUT_SUBDIRECTORY EditorPlugins
+    AUTOMOC
+    AUTOUIC
+    FILES_CMAKE
+        perforceplugin_files.cmake
+    COMPILE_DEFINITIONS
+        PRIVATE
+            PLUGIN_EXPORTS
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+    BUILD_DEPENDENCIES
+        PRIVATE
+            AZ::AzCore
+            Legacy::CryCommon
+            Legacy::EditorLib
+)
+
+ly_add_dependencies(Editor PerforcePlugin)
+set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::PerforcePlugin>)
diff --git a/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.cpp b/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.cpp
new file mode 100644
index 0000000000..bcf256d6c0
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.cpp
@@ -0,0 +1,297 @@
+/*
+ * 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 "PerforcePlugin_precompiled.h"
+#include "PerforcePlugin.h"
+#include "PasswordDlg.h"
+#include <ui_settings.h> // generated
+
+
+#include <AzQtComponents/Components/Widgets/CheckBox.h>
+#include <AzToolsFramework/UI/UICore/ProgressShield.hxx>
+
+#include <QTimer>
+#include <AzCore/std/bind/bind.h>
+
+namespace PerforceConnection
+{
+    const char* const PerforceUser = "P4USER";
+    const char* const PerforceServer = "P4PORT";
+    const char* const PerforceClient = "P4CLIENT";
+    const char* const PerforceCharset = "P4CHARSET";
+
+    using namespace AzToolsFramework;
+    PerforceConfigDialog::PerforceConfigDialog(QWidget* parent)
+        : QDialog(parent)
+    {
+        this->setWindowFlags(Qt::Dialog
+            | Qt::MSWindowsFixedSizeDialogHint
+            | Qt::WindowStaysOnTopHint);
+        m_ui = new Ui::P4SettingsDialog();
+        m_ui->setupUi(this);
+
+        {   
+            SourceControlState state = SourceControlState::Disabled;
+            SourceControlConnectionRequestBus::BroadcastResult(state, &SourceControlConnectionRequestBus::Events::GetSourceControlState);
+
+            bool onlineMode = state == SourceControlState::Disabled ? false : true;
+            AzQtComponents::CheckBox::applyToggleSwitchStyle(m_ui->workOnlineCheckbox);
+            m_ui->workOnlineCheckbox->setChecked(onlineMode);
+        }
+    }
+
+    void PerforceConfigDialog::RetrieveSettings()
+    {
+        m_retrievedSettings.insert_key(PerforceClient);
+        m_retrievedSettings.insert_key(PerforceUser);
+        m_retrievedSettings.insert_key(PerforceServer);
+        m_retrievedSettings.insert_key(PerforceCharset);
+
+        setEnabled(false);
+
+        int numSettingsToGet = m_retrievedSettings.size();
+
+        auto applySettingResultFunction = [this, &numSettingsToGet](AZStd::string setting, const SourceControlSettingInfo& info) -> void
+        {
+            m_retrievedSettings[setting] = info;
+            --numSettingsToGet;
+        };
+        
+        using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
+        for (const auto& kvp : m_retrievedSettings)
+        {
+            auto boundLocal = AZStd::bind<void>(applySettingResultFunction, kvp.first.c_str(), AZStd::placeholders::_1);
+            SCRequestBus::Broadcast(&SCRequestBus::Events::GetConnectionSetting, kvp.first.c_str(), boundLocal);
+        }
+
+        auto waitForAllSettings = [&numSettingsToGet](int&, int&)
+        {
+            return numSettingsToGet == 0;
+        };
+        // Wait for completion
+        ProgressShield::LegacyShowAndWait(this, tr("Getting settings"), waitForAllSettings);
+
+        // wrinkle in the plan - charset might have (SERVER)charset applied to it.  So ask for one more.
+        m_charsetKey = PerforceCharset;
+        if (m_retrievedSettings[PerforceServer].IsAvailable())
+        {
+            AZStd::string charsetNameWithServerAddress = AZStd::string::format("P4_%s_CHARSET", m_retrievedSettings[PerforceServer].m_value.c_str());
+            // ask for one more
+            numSettingsToGet = 1;
+            auto boundLocal = AZStd::bind<void>(applySettingResultFunction, charsetNameWithServerAddress.c_str(), AZStd::placeholders::_1);
+            SCRequestBus::Broadcast(&SCRequestBus::Events::GetConnectionSetting, charsetNameWithServerAddress.c_str(), boundLocal);
+            ProgressShield::LegacyShowAndWait(this, tr("Getting settings"), waitForAllSettings);
+
+            // did we get a value?
+            if (m_retrievedSettings[charsetNameWithServerAddress].IsAvailable())
+            {
+                m_charsetKey = charsetNameWithServerAddress;
+            }
+        }
+
+        // which CHARSET do we pick?  we prefer (servername) charset, but will fall back to just P4CHARSET
+        for (const auto& value : m_retrievedSettings)
+        {
+            const AZStd::string& settingName = value.first;
+            const SourceControlSettingInfo& info = value.second;
+            ApplyValueToControl(GetControlForSetting(settingName), info);
+        }
+
+        setEnabled(true);
+    }
+
+    QLineEdit* PerforceConfigDialog::GetControlForSetting(const AZStd::string& settingName) const
+    {
+        if (settingName == PerforceClient)
+        {
+            return m_ui->workspaceEdit;
+        }
+        else if (settingName == PerforceUser)
+        {
+            return m_ui->userEdit;
+        }
+        else if (settingName == PerforceServer)
+        {
+            return m_ui->serverEdit;
+        }
+        else if (settingName == m_charsetKey)
+        {
+            return m_ui->charsetEdit;
+        }
+        return nullptr;
+    }
+
+    PerforceConfigDialog::~PerforceConfigDialog()
+    {
+        delete m_ui;
+    }
+
+    void PerforceConfigDialog::ApplyValueToControl(QLineEdit* targetControl, const SourceControlSettingInfo& value)
+    {
+        if (targetControl)
+        {
+            if (value.IsAvailable())
+            {
+                targetControl->setText(QString::fromUtf8(value.m_value.c_str()));
+            }
+            else
+            {
+                targetControl->setText(QString(""));
+            }
+
+            if (value.IsSettable())
+            {
+                targetControl->setReadOnly(false);
+                targetControl->setEnabled(true);
+                targetControl->setToolTip("");
+            }
+            else
+            {
+                targetControl->setReadOnly(true);
+                targetControl->setEnabled(false);
+                QString toolTip;
+                QString ttDescStart("Cannot change this value - it is currently being overridden by");
+                if (value.m_status == SourceControlSettingStatus::Config)
+                {
+                    if (!value.m_context.empty())
+                    {
+                        toolTip = tr("%1 config file: %2.").arg(ttDescStart).arg(QString::fromUtf8(value.m_context.c_str()));
+                    }
+                    else
+                    {
+                        toolTip = tr("%1 a config file.").arg(ttDescStart);
+                    }
+                }
+                else
+                {
+                    toolTip = tr("%1 your system environment.  Please check your environment variables in your system's control panel").arg(ttDescStart);
+                }
+                targetControl->setToolTip(toolTip);
+            }
+        }
+    }
+
+    void PerforceConfigDialog::on_workOnlineCheckbox_toggled(bool newState)
+    {
+        m_ui->workspaceEdit->setEnabled(false);
+        m_ui->userEdit->setEnabled(false);
+        m_ui->serverEdit->setEnabled(false);
+        m_ui->charsetEdit->setEnabled(false);
+
+        if (newState)
+        {
+            // we only fetch settings if we are working online.
+            QTimer::singleShot(0, this, &PerforceConfigDialog::RetrieveSettings);
+        }
+        else
+        {
+            m_ui->workspaceEdit->setText(tr("(offline)"));
+            m_ui->userEdit->setText(tr("(offline)"));
+            m_ui->serverEdit->setText(tr("(offline)"));
+            m_ui->charsetEdit->setText(tr("(offline)"));
+        }
+    }
+
+    void PerforceConfigDialog::Apply()
+    {
+        bool onlineMode = m_ui->workOnlineCheckbox->isChecked();
+        {
+            using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
+            SCRequestBus::Broadcast(&SCRequestBus::Events::EnableSourceControl, onlineMode);
+        }
+
+        if (onlineMode)
+        {
+            // work online!
+            // apply all the settings.
+            // you may only apply some of the settings - the ones that are either 'set' or 'unset'
+            // only set values that are not already that value
+            // and charset is special in that you must set it as eitehr CHARSET or override the server.
+            ApplySetting(PerforceUser);
+            ApplySetting(PerforceServer);
+            ApplySetting(PerforceClient);
+            ApplySetting(m_charsetKey.c_str());
+        }
+    }
+
+    bool PerforceConfigDialog::ApplySetting(const char* key)
+    {
+        if (!m_retrievedSettings[key].IsSettable())
+        {
+            return false;
+        }
+
+        QLineEdit* source = GetControlForSetting(key);
+        if (!source)
+        {
+            return false;
+        }
+
+        AZStd::string newValue = source->text().toUtf8().data();
+        if (newValue.empty())
+        {
+            return false;
+        }
+
+        if (newValue == m_retrievedSettings[key].m_value)
+        {
+            return false;
+        }
+
+        // again, charset is special in that it can under certain circumstances take the form P4_SERVERNAME_CHARSET instead of just P4CHARSET
+
+        if (m_charsetKey == key)
+        {
+            // if its already P4CHARSET then we don't care.
+            if (m_charsetKey != PerforceCharset)
+            {
+                QLineEdit* hostSource = GetControlForSetting(PerforceServer);
+                if (!hostSource)
+                {
+                    return false;
+                }
+                m_charsetKey = AZStd::string::format("P4_%s_CHARSET", hostSource->text().toUtf8().data());
+                key = m_charsetKey.c_str();
+
+            }
+        }
+
+        bool succeeded = false;
+        bool complete = false;
+        auto respCallback = [&succeeded, &complete, newValue](const SourceControlSettingInfo& info)
+        {
+            succeeded = (info.m_value == newValue);
+            complete = true;
+        };
+
+        auto waitForDone = [&complete](int&, int&)
+        {
+            return complete;
+        };
+        
+        using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
+        SCRequestBus::Broadcast(&SCRequestBus::Events::SetConnectionSetting, key, newValue.c_str(), respCallback);
+        ProgressShield::LegacyShowAndWait(this, tr("Applying settings"), waitForDone);
+
+        return succeeded;
+    }
+
+    bool OpenPasswordDlg()
+    {
+        PerforceConfigDialog dialog;
+
+        if (dialog.exec() == QDialog::Accepted)
+        {
+            dialog.Apply();
+            return true;
+        }
+        return false;
+    }
+} // namespace PerforceConnection
+
+#include <moc_PasswordDlg.cpp>
diff --git a/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.h b/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.h
new file mode 100644
index 0000000000..478946577d
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.h
@@ -0,0 +1,55 @@
+/*
+ * 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>
+#include <QString>
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h> // for SouceControlSettingInfo
+#endif
+
+class QLineEdit;
+
+namespace Ui {
+    class P4SettingsDialog;
+} // namespace Ui
+
+namespace PerforceConnection
+{
+    class PerforceConfigDialog
+        : public QDialog
+    {
+        Q_OBJECT
+    public:
+        PerforceConfigDialog(QWidget* pParent = nullptr);
+        virtual ~PerforceConfigDialog();
+
+        bool GetWorkOffline() const;
+        void SetWorkOffline(bool value);
+
+    public Q_SLOTS:
+        void RetrieveSettings();
+        // auto-bound slots
+        void on_workOnlineCheckbox_toggled(bool newState);
+
+        void Apply();
+
+    private:
+        Ui::P4SettingsDialog* m_ui;
+
+        AZStd::unordered_map<AZStd::string, AzToolsFramework::SourceControlSettingInfo> m_retrievedSettings;
+        AZStd::string m_charsetKey;
+
+        void ApplyValueToControl(QLineEdit* targetControl, const AzToolsFramework::SourceControlSettingInfo& value);
+        bool ApplySetting(const char* key);
+        QLineEdit* GetControlForSetting(const AZStd::string& settingName) const;
+    };
+
+    bool OpenPasswordDlg();
+} // namespace PerforceConnection
diff --git a/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.cpp b/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.cpp
new file mode 100644
index 0000000000..e69cd23832
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.cpp
@@ -0,0 +1,73 @@
+/*
+ * 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 "PerforcePlugin_precompiled.h"
+#include "PerforcePlugin.h"
+#include "PerforceSourceControl.h"
+#include "Include/ISourceControl.h"
+#include "Include/IEditorClassFactory.h"
+
+extern CPerforceSourceControl* g_pPerforceControl;
+
+namespace PluginInfo
+{
+    const char* kName = "Perforce Client";
+    const char* kGUID = "{FD5F1023-8F02-4051-89FA-DF1F038863A2}";
+    const int kVersion = 1;
+}
+
+void CPerforcePlugin::Release()
+{
+    GetIEditor()->GetClassFactory()->UnregisterClass(g_pPerforceControl->ClassName().toUtf8().data());
+    delete this;
+}
+
+void CPerforcePlugin::ShowAbout()
+{
+}
+
+const char* CPerforcePlugin::GetPluginGUID()
+{
+    return PluginInfo::kGUID;
+}
+
+DWORD CPerforcePlugin::GetPluginVersion()
+{
+    return PluginInfo::kVersion;
+}
+
+const char* CPerforcePlugin::GetPluginName()
+{
+    return PluginInfo::kName;
+}
+
+bool CPerforcePlugin::CanExitNow()
+{
+    return true;
+}
+
+void CPerforcePlugin::Serialize([[maybe_unused]] FILE* hFile, [[maybe_unused]] bool bIsStoring)
+{
+}
+
+void CPerforcePlugin::ResetContent()
+{
+}
+
+bool CPerforcePlugin::CreateUIElements()
+{
+    return true;
+}
+
+void CPerforcePlugin::OnEditorNotify(EEditorNotifyEvent aEventId)
+{
+    if (eNotify_OnInit == aEventId)
+    {
+        g_pPerforceControl->Init();
+    }
+}
diff --git a/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.h b/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.h
new file mode 100644
index 0000000000..06fd2f0267
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_PERFORCEPLUGIN_PERFORCEPLUGIN_H
+#define CRYINCLUDE_PERFORCEPLUGIN_PERFORCEPLUGIN_H
+#pragma once
+
+
+#include <Include/IPlugin.h>
+
+class CPerforcePlugin
+    : public IPlugin
+{
+public:
+    void Release();
+    void ShowAbout();
+    const char* GetPluginGUID();
+    DWORD GetPluginVersion();
+    const char* GetPluginName();
+    bool CanExitNow();
+    void Serialize(FILE* hFile, bool bIsStoring);
+    void ResetContent();
+    bool CreateUIElements();
+    void OnEditorNotify(EEditorNotifyEvent aEventId);
+};
+
+#endif // CRYINCLUDE_PERFORCEPLUGIN_PERFORCEPLUGIN_H
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.qrc b/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.qrc
similarity index 100%
rename from Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.qrc
rename to Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.qrc
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.rc b/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.rc
similarity index 100%
rename from Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.rc
rename to Code/Editor/Plugins/PerforcePlugin/PerforcePlugin.rc
diff --git a/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h b/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
new file mode 100644
index 0000000000..a3e0bc2f81
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#include <AzCore/PlatformDef.h>
+
+#include "resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// CRY Stuff ////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+#include <platform.h>
+#include "Util/EditorUtils.h"
diff --git a/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.cpp b/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.cpp
new file mode 100644
index 0000000000..735fb06d2e
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.cpp
@@ -0,0 +1,90 @@
+/*
+ * 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 "PerforcePlugin_precompiled.h"
+#include "CryFile.h"
+#include "PerforceSourceControl.h"
+#include "PasswordDlg.h"
+
+#include <QSettings>
+#include <QDir>
+#include <QFile>
+#include <QProcess>
+#include <QApplication>
+#include <QTimer>
+
+#include <Util/PathUtil.h>
+#include <AzCore/base.h>
+
+namespace
+{
+    CryCriticalSection g_cPerforceValues;
+}
+
+////////////////////////////////////////////////////////////
+ULONG STDMETHODCALLTYPE CPerforceSourceControl::Release()
+{
+    if ((--m_ref) == 0)
+    {
+        g_cPerforceValues.Lock();
+        delete this;
+        g_cPerforceValues.Unlock();
+        return 0;
+    }
+    else
+    {
+        return m_ref;
+    }
+}
+
+void CPerforceSourceControl::Init()
+{
+    UpdateSourceControlState();
+}
+
+void CPerforceSourceControl::ShowSettings()
+{
+    if (PerforceConnection::OpenPasswordDlg())
+    {
+        UpdateSourceControlState();
+    }
+}
+
+void CPerforceSourceControl::SetSourceControlState(SourceControlState state)
+{
+    AUTO_LOCK(g_cPerforceValues);
+
+    switch (state)
+    {
+        case SourceControlState::Disabled:
+            m_connectionState = ConnectivityState::Disconnected;
+            break;
+
+        case SourceControlState::Active:
+            m_connectionState = ConnectivityState::Connected;
+            break;
+
+        case SourceControlState::ConfigurationInvalid:
+            m_connectionState = ConnectivityState::BadConfiguration;
+            break;
+
+        default:
+            break;
+    }
+}
+
+void CPerforceSourceControl::UpdateSourceControlState()
+{
+    using namespace AzToolsFramework;
+
+    SourceControlState state = SourceControlState::Disabled;
+    SourceControlConnectionRequestBus::BroadcastResult(state,
+        &SourceControlConnectionRequestBus::Events::GetSourceControlState);
+
+    SetSourceControlState(state);
+}
diff --git a/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.h b/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.h
new file mode 100644
index 0000000000..e0b9a63a0f
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.h
@@ -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
+ *
+ */
+
+
+#pragma once
+
+#include "IEditorClassFactory.h"
+#include "Include/IEditorClassFactory.h"
+
+#include "Include/ISourceControl.h"
+
+
+class CPerforceSourceControl
+    : public ISourceControl
+    , public IClassDesc
+{
+public:
+    // constructor
+    CPerforceSourceControl() = default;
+    virtual ~CPerforceSourceControl() = default;
+
+    void Init();
+
+    // ISourceControl
+    void SetSourceControlState(SourceControlState state) override;
+    ConnectivityState GetConnectivityState() override { return m_connectionState; };
+    void ShowSettings() override;
+
+    // from IClassDesc
+    virtual ESystemClassID SystemClassID() { return ESYSTEM_CLASS_SCM_PROVIDER; };
+    REFGUID ClassID()
+    {
+        // {3c209e66-0728-4d43-897d-168962d5c8b5}
+        static const GUID guid = {
+            0x3c209e66, 0x0728, 0x4d43, { 0x89, 0x7d, 0x16, 0x89, 0x62, 0xd5, 0xc8, 0xb5 }
+        };
+        return guid;
+    }
+    virtual QString ClassName() { return "Perforce source control"; };
+    virtual QString Category() { return "SourceControl"; };
+    virtual void ShowAbout() {};
+
+    // from IUnknown
+    HRESULT STDMETHODCALLTYPE QueryInterface(const IID& riid, void** ppvObj)
+    {
+        if (riid == __uuidof(ISourceControl) /* && m_pIntegrator*/)
+        {
+            *ppvObj = this;
+            return S_OK;
+        }
+        return E_NOINTERFACE;
+    }
+    ULONG STDMETHODCALLTYPE AddRef() { return ++m_ref; };
+    ULONG STDMETHODCALLTYPE Release();
+
+private:
+    void UpdateSourceControlState();
+
+    ULONG m_ref{ 0 };
+    ConnectivityState m_connectionState{ ConnectivityState::Disconnected };
+};
diff --git a/Code/Editor/Plugins/PerforcePlugin/Platform/Linux/PAL_linux.cmake b/Code/Editor/Plugins/PerforcePlugin/Platform/Linux/PAL_linux.cmake
new file mode 100644
index 0000000000..af3213209e
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/Platform/Linux/PAL_linux.cmake
@@ -0,0 +1,8 @@
+#
+# 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_BUILD_P4PLUGIN_SUPPORTED FALSE)
diff --git a/Code/Editor/Plugins/PerforcePlugin/Platform/Mac/PAL_mac.cmake b/Code/Editor/Plugins/PerforcePlugin/Platform/Mac/PAL_mac.cmake
new file mode 100644
index 0000000000..9156df0932
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/Platform/Mac/PAL_mac.cmake
@@ -0,0 +1,8 @@
+#
+# 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_BUILD_P4PLUGIN_SUPPORTED TRUE)
diff --git a/Code/Editor/Plugins/PerforcePlugin/Platform/Windows/PAL_windows.cmake b/Code/Editor/Plugins/PerforcePlugin/Platform/Windows/PAL_windows.cmake
new file mode 100644
index 0000000000..9156df0932
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/Platform/Windows/PAL_windows.cmake
@@ -0,0 +1,8 @@
+#
+# 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_BUILD_P4PLUGIN_SUPPORTED TRUE)
diff --git a/Code/Editor/Plugins/PerforcePlugin/main.cpp b/Code/Editor/Plugins/PerforcePlugin/main.cpp
new file mode 100644
index 0000000000..13861e60b1
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/main.cpp
@@ -0,0 +1,49 @@
+/*
+ * 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 "PerforcePlugin_precompiled.h"
+
+#include "PerforcePlugin.h"
+
+#include "Include/ISourceControl.h"
+#include "Include/IEditorClassFactory.h"
+#include "PerforceSourceControl.h"
+
+#include <AzCore/PlatformDef.h>
+
+CPerforceSourceControl* g_pPerforceControl = 0;
+
+
+PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
+{
+    if (pInitParam->pluginVersion != SANDBOX_PLUGIN_SYSTEM_VERSION)
+    {
+        pInitParam->outErrorCode = IPlugin::eError_VersionMismatch;
+        return 0;
+    }
+
+    ModuleInitISystem(GetIEditor()->GetSystem(), "PerforcePlugin");
+    g_pPerforceControl = new CPerforceSourceControl();
+    pInitParam->pIEditorInterface->GetClassFactory()->RegisterClass(g_pPerforceControl);
+    return new CPerforcePlugin();
+}
+
+#ifdef AZ_PLATFORM_WINDOWS
+HINSTANCE g_hInstance = 0;
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, ULONG fdwReason, [[maybe_unused]] LPVOID lpvReserved)
+{
+    if (fdwReason == DLL_PROCESS_ATTACH)
+    {
+        g_hInstance = hinstDLL;
+        //DisableThreadLibraryCalls(hInstance);
+    }
+
+    return(TRUE);
+}
+#endif
diff --git a/Code/Editor/Plugins/PerforcePlugin/perforceplugin_files.cmake b/Code/Editor/Plugins/PerforcePlugin/perforceplugin_files.cmake
new file mode 100644
index 0000000000..c584511e66
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/perforceplugin_files.cmake
@@ -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
+#
+#
+
+set(FILES
+    settings.ui
+    main.cpp
+    PasswordDlg.cpp
+    PasswordDlg.h
+    PerforcePlugin.cpp
+    PerforcePlugin.h
+    PerforcePlugin.qrc
+    PerforceSourceControl.cpp
+    PerforceSourceControl.h
+    resource.h
+    PerforcePlugin_precompiled.h
+)
diff --git a/Code/Editor/Plugins/PerforcePlugin/resource.h b/Code/Editor/Plugins/PerforcePlugin/resource.h
new file mode 100644
index 0000000000..1acf96abee
--- /dev/null
+++ b/Code/Editor/Plugins/PerforcePlugin/resource.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
+ *
+ */
+
+
+#define IDI_P4                          104
+#define IDI_P4_ERROR                    106
+#define IDC_ERROR                       1004
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        107
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1010
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/settings.ui b/Code/Editor/Plugins/PerforcePlugin/settings.ui
similarity index 100%
rename from Code/Sandbox/Plugins/PerforcePlugin/settings.ui
rename to Code/Editor/Plugins/PerforcePlugin/settings.ui
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/CMakeLists.txt b/Code/Editor/Plugins/ProjectSettingsTool/CMakeLists.txt
new file mode 100644
index 0000000000..0906487ad6
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/CMakeLists.txt
@@ -0,0 +1,38 @@
+#
+# 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 PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+ly_add_target(
+    NAME ProjectSettingsTool MODULE
+    NAMESPACE Legacy
+    OUTPUT_SUBDIRECTORY EditorPlugins
+    AUTOMOC
+    AUTOUIC
+    FILES_CMAKE
+        projectsettingstool_files.cmake
+    COMPILE_DEFINITIONS
+        PRIVATE
+            PLUGIN_EXPORTS
+            SANDBOX_IMPORTS
+            EDITOR_COMMON_IMPORTS
+    BUILD_DEPENDENCIES
+        PRIVATE
+            3rdParty::Qt::Core
+            3rdParty::Qt::Gui
+            3rdParty::Qt::Widgets
+            AZ::AzCore
+            AZ::AzToolsFramework
+            Legacy::CryCommon
+            Legacy::EditorLib
+            Legacy::EditorCommon
+)
+
+ly_add_dependencies(Editor ProjectSettingsTool)
+set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::ProjectSettingsTool>)
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp b/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp
new file mode 100644
index 0000000000..68df8aa5e6
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.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 "ProjectSettingsTool_precompiled.h"
+#include "DefaultImageValidator.h"
+
+#include "PropertyImagePreview.h"
+
+// Error for no default image set in overrides
+const static char* noDefaultImageError = "Default must be set if not all dpi overrides are set";
+
+namespace ProjectSettingsTool
+{
+    DefaultImageValidator::DefaultImageValidator(const FunctorValidator& validator)
+        : FunctorValidator(validator.Functor())
+    {
+    }
+
+    QValidator::State DefaultImageValidator::validate(QString& input, [[maybe_unused]] int& pos) const
+    {
+        return ValidateWithErrors(input).first;
+    }
+
+    FunctorValidator::ReturnType DefaultImageValidator::ValidateWithErrors(const QString& input) const
+    {
+        ReturnType result = m_functor(input);
+        if (result.first == QValidator::Acceptable)
+        {
+            if (input.isEmpty())
+            {
+                int numCustoms = 0;
+                // Check all specific overrides to see if any are set
+                for (const PropertyImagePreviewCtrl* preview : m_specificOverrides)
+                {
+                    if (!preview->GetValue().isEmpty())
+                    {
+                        ++numCustoms;
+                    }
+                }
+                if (numCustoms != 0 && numCustoms != m_specificOverrides.size())
+                {
+                    return FunctorValidator::ReturnType(QValidator::Intermediate, tr(noDefaultImageError));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    void DefaultImageValidator::AddOverride(PropertyImagePreviewCtrl* preview)
+    {
+        m_specificOverrides.push_back(preview);
+    }
+} // namespace ProjectSettingsTool
+#include <moc_DefaultImageValidator.cpp>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.h b/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.h
new file mode 100644
index 0000000000..e8e392f576
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "FunctorValidator.h"
+
+#include <AzCore/std/containers/list.h>
+#endif
+
+namespace ProjectSettingsTool
+{
+    // Forward Declaration
+    class PropertyImagePreviewCtrl;
+
+    class DefaultImageValidator
+        : public FunctorValidator
+    {
+        Q_OBJECT
+
+    public:
+        DefaultImageValidator(const FunctorValidator& validator);
+
+        QValidator::State validate(QString& input, int& pos) const override;
+        ReturnType ValidateWithErrors(const QString& input) const override;
+        // Adds a specific override to the list for this default override
+        void AddOverride(PropertyImagePreviewCtrl* preview);
+
+    protected:
+        AZStd::list<const PropertyImagePreviewCtrl*> m_specificOverrides;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.cpp b/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.cpp
new file mode 100644
index 0000000000..bd01589700
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "ProjectSettingsTool_precompiled.h"
+#include "FunctorValidator.h"
+
+namespace ProjectSettingsTool
+{
+    FunctorValidator::FunctorValidator(FunctorType functor)
+        : QValidator()
+        , m_functor(functor)
+    {
+    }
+
+    FunctorValidator::FunctorValidator()
+        : QValidator()
+        , m_functor(nullptr)
+    {
+    }
+
+    QValidator::State FunctorValidator::validate(QString& input, [[maybe_unused]] int& pos) const
+    {
+        return m_functor(input).first;
+    }
+
+    FunctorValidator::ReturnType FunctorValidator::ValidateWithErrors(const QString& input) const
+    {
+        return m_functor(input);
+    }
+
+    FunctorValidator::FunctorType FunctorValidator::Functor() const
+    {
+        return m_functor;
+    }
+} // namespace ProjectSettingsTool
+
+#include <moc_FunctorValidator.cpp>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.h b/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.h
new file mode 100644
index 0000000000..df77717c4c
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.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
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/utils.h>
+
+#include <QValidator>
+#endif
+
+
+namespace ProjectSettingsTool
+{
+    class FunctorValidator
+        : public QValidator
+    {
+        Q_OBJECT
+
+    public:
+        typedef AZStd::pair<QValidator::State, const QString> ReturnType;
+        typedef ReturnType(* FunctorType)(const QString&);
+
+        FunctorValidator(FunctorType functor);
+
+        // Validates using QValidates api
+        QValidator::State validate(QString& input, int& pos) const override;
+        // Validates and returns the result with an error string if one occurred
+        virtual ReturnType ValidateWithErrors(const QString& input) const;
+        // Returns the function used to validate
+        FunctorType Functor() const;
+
+    protected:
+        FunctorValidator();
+
+        // The function to use for validating
+        FunctorType m_functor;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/LastPathBus.h b/Code/Editor/Plugins/ProjectSettingsTool/LastPathBus.h
new file mode 100644
index 0000000000..2e3f370a92
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/LastPathBus.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/EBus/EBus.h>
+
+
+namespace ProjectSettingsTool
+{
+    class LastPathTraits
+        : public AZ::EBusTraits
+    {
+    public:
+        using Bus = AZ::EBus<LastPathTraits>;
+
+        // Bus Configuration
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+
+        virtual QString GetLastImagePath() = 0;
+        virtual void SetLastImagePath(const QString& path) = 0;
+    };
+
+    typedef AZ::EBus<LastPathTraits> LastPathBus;
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings.h b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings.h
new file mode 100644
index 0000000000..a6ab4f80db
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#include "PlatformSettings_Android.h"
+#include "PlatformSettings_Base.h"
+#include "PlatformSettings_Ios.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp
new file mode 100644
index 0000000000..146c2fc3d6
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp
@@ -0,0 +1,262 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "PlatformSettings_Android.h"
+
+#include "PlatformSettings_common.h"
+#include "Validators.h"
+
+namespace ProjectSettingsTool
+{
+    static const char* defaultImageTooltip = "Default image used if a specific DPI override is not given.";
+    static void* xmlFunctor = reinterpret_cast<void*>(&SelectXmlFromFileDialog);
+
+    void AndroidIcons::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            serialize->Class<AndroidIcons>()
+                ->Version(1)
+                ->Field("default", &AndroidIcons::m_default)
+                ->Field("mdpi", &AndroidIcons::m_mdpi)
+                ->Field("hdpi", &AndroidIcons::m_hdpi)
+                ->Field("xhdpi", &AndroidIcons::m_xhdpi)
+                ->Field("xxhdpi", &AndroidIcons::m_xxhdpi)
+                ->Field("xxxhdpi", &AndroidIcons::m_xxxhdpi)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<AndroidIcons>("Icons", "All icon overrides for android.")
+                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_default, "Default", defaultImageTooltip)
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidIconDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_mdpi, "Medium Dpi (48px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<48>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "mdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_hdpi, "High Dpi (72px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<72>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "hdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_xhdpi, "XHigh Dpi (96px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<96>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "xhdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_xxhdpi, "XXHigh Dpi (144px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<144>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "xxhdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_xxxhdpi, "XXXHigh Dpi (192px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<192>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "xxxhdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
+                ;
+            }
+        }
+    }
+
+    void AndroidLandscapeSplashscreens::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            serialize->Class<AndroidLandscapeSplashscreens>()
+                ->Version(1)
+                ->Field("default", &AndroidLandscapeSplashscreens::m_default)
+                ->Field("mdpi", &AndroidLandscapeSplashscreens::m_mdpi)
+                ->Field("hdpi", &AndroidLandscapeSplashscreens::m_hdpi)
+                ->Field("xhdpi", &AndroidLandscapeSplashscreens::m_xhdpi)
+                ->Field("xxhdpi", &AndroidLandscapeSplashscreens::m_xxhdpi)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<AndroidLandscapeSplashscreens>("Landscape", "All landscape splashscreen overrides for Android.")
+                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_default, "Default", defaultImageTooltip)
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidLandDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_mdpi, "Medium Dpi", "Suggested 1024 x 640 png.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidLandscape, "mdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidLandDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_hdpi, "High Dpi", "Suggested 1280 x 800 png.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidLandscape, "hdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidLandDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_xhdpi, "XHigh Dpi", "Suggested 1920 x 1200 png.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidLandscape, "xhdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidLandDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_xxhdpi, "XXHigh Dpi", "Suggested 2560 x 1600 png.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidLandscape, "xxhdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidLandDefault)
+                ;
+            }
+        }
+    }
+
+    void AndroidPortraitSplashscreens::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            serialize->Class<AndroidPortraitSplashscreens>()
+                ->Version(1)
+                ->Field("default", &AndroidPortraitSplashscreens::m_default)
+                ->Field("mdpi", &AndroidPortraitSplashscreens::m_mdpi)
+                ->Field("hdpi", &AndroidPortraitSplashscreens::m_hdpi)
+                ->Field("xhdpi", &AndroidPortraitSplashscreens::m_xhdpi)
+                ->Field("xxhdpi", &AndroidPortraitSplashscreens::m_xxhdpi)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<AndroidPortraitSplashscreens>("Portrait", "All portrait splashscreen overrides for Android.")
+                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_default, "Default", defaultImageTooltip)
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidPortDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_mdpi, "Medium Dpi", "Suggested 640 x 1024 png.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidPortrait, "mdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidPortDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_hdpi, "High Dpi", "Suggested 800 x 1280 png.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidPortrait, "hdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidPortDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_xhdpi, "XHigh Dpi", "Suggested 1200 x 1920 png.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidPortrait, "xhdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidPortDefault)
+                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_xxhdpi, "XXHigh Dpi", "Suggested 1600 x 2560 png.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidPortrait, "xxhdpi"))
+                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidPortDefault)
+                ;
+            }
+        }
+    }
+
+    void AndroidSplashscreens::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            AndroidLandscapeSplashscreens::Reflect(context);
+            AndroidPortraitSplashscreens::Reflect(context);
+
+            serialize->Class<AndroidSplashscreens>()
+                ->Version(1)
+                ->Field("land", &AndroidSplashscreens::m_landscapeSplashscreens)
+                ->Field("port", &AndroidSplashscreens::m_portraitSplashscreens)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<AndroidSplashscreens>("Splashscreens", "All splashscreen overrides for Android.")
+                    ->DataElement(0, &AndroidSplashscreens::m_landscapeSplashscreens)
+                    ->DataElement(0, &AndroidSplashscreens::m_portraitSplashscreens)
+                ;
+            }
+        }
+    }
+
+    void AndroidSettings::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            AndroidIcons::Reflect(context);
+            AndroidSplashscreens::Reflect(context);
+
+            serialize->Class<AndroidSettings>()
+                ->Version(1)
+                ->Field("package_name", &AndroidSettings::m_packageName)
+                ->Field("version_name", &AndroidSettings::m_versionName)
+                ->Field("version_number", &AndroidSettings::m_versionNumber)
+                ->Field("orientation", &AndroidSettings::m_orientation)
+                ->Field("app_public_key", &AndroidSettings::m_appPublicKey)
+                ->Field("app_obfuscator_salt", &AndroidSettings::m_appObfuscatorSalt)
+                ->Field("rc_pak_job", &AndroidSettings::m_rcPakJob)
+                ->Field("rc_obb_job", &AndroidSettings::m_rcObbJob)
+                ->Field("use_main_obb", &AndroidSettings::m_useMainObb)
+                ->Field("use_patch_obb", &AndroidSettings::m_usePatchObb)
+                ->Field("enable_key_screen_on", &AndroidSettings::m_enableKeyScreenOn)
+                ->Field("disable_immersive_mode", &AndroidSettings::m_disableImmersiveMode)
+                ->Field("icons", &AndroidSettings::m_icons)
+                ->Field("splash_screen", &AndroidSettings::m_splashscreens)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<AndroidSettings>("Android Settings", "All settings related to Android not already defined by base settings.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
+                    ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_packageName, "Package Name", "Android application package identifier. Used for generating the project specific Java activity class and in the AndroidManifest.xml. Must be in dot separated format.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PackageName))
+                        ->Attribute(Attributes::LinkOptional, true)
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidPackageName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosBundleIdentifer)
+                    ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_versionName, "Version Name", "Human readable version number. Used to set the \"android: versionName\" tag in the AndroidManifest.xml and ultimately what will be displayed in the App Store.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
+                        ->Attribute(Attributes::LinkOptional, true)
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidVersionName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosVersionName)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_versionNumber, "Version Number", "Internal application version number. Used to set the \"android:versionCode\" tag in the AndroidManifest.xml.")
+                        ->Attribute(AZ::Edit::Attributes::Min, 1)
+                        ->Attribute(AZ::Edit::Attributes::Max, Validators::maxAndroidVersion)
+                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &AndroidSettings::m_orientation, "Orientation", "Desired orientation of the Android application. Used to set the \"android:screenOrientation\" tag in the AndroidManifest.xml.")
+                        ->Attribute(AZ::Edit::Attributes::StringList, AZStd::vector<AZStd::string>
+                        {
+                            "landscape",
+                            "portrait",
+                            "reverseLandscape",
+                            "reversePortrait",
+                            "sensorLandscape",
+                            "sensorPortrait",
+                            "sensor",
+                            "fullSensor",
+                            "noSensor",
+                            "userLandscape",
+                            "userPortrait",
+                            "user",
+                            "fullUser",
+                            "locked",
+                            "behind",
+                            "unspecified"
+                        })
+                    ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_appPublicKey, "Public App Key", "The application license key provided by Google Play. Required for using APK expansion files or other Google Play Services.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PublicAppKeyOrEmpty))
+                        ->Attribute(Attributes::Obfuscated, true)
+                    ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_appObfuscatorSalt, "App Obfuscation Salt", "Application specific salt value for (un)obfuscation when using APK expansion files.")
+                        ->Attribute(Attributes::Obfuscated, true)
+                    ->DataElement(Handlers::FileSelect, &AndroidSettings::m_rcPakJob, "Rc Job PAK Override", "Path to the RC job XML file used to override the normal PAK files generation used in release builds. Path must be relative to <build dir>.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidXmlOrEmpty))
+                        ->Attribute(Attributes::SelectFunction, xmlFunctor)
+                    ->DataElement(Handlers::FileSelect, &AndroidSettings::m_rcObbJob, "Rc Job APK Override", "Path to the RC job XML file used to override the normal APK Expansion file(s) generation used in release builds. Path must be relative to <build dir>.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidXmlOrEmpty))
+                        ->Attribute(Attributes::SelectFunction, xmlFunctor)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_useMainObb, "Use Main APK", "Specify if the \"Main\" APK Expansion file should be used.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_usePatchObb, "Use Patch APK", "Specify if the \"Patch\" APK Expansion file should be used.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_enableKeyScreenOn, "Enable Screen Wake Lock", "Enabled or disable the screen wake lock (device won't go to sleep while the application is running).")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_disableImmersiveMode, "Disable Immersive Mode", "Disable hiding of top and bottom system bars.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_icons)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_splashscreens)
+                ;
+            }
+        }
+    }
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.h b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.h
new file mode 100644
index 0000000000..52776d3ce3
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.h
@@ -0,0 +1,142 @@
+/*
+ * 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/Serialization/EditContext.h>
+
+namespace ProjectSettingsTool
+{
+    class AndroidIcons
+    {
+    public:
+        AZ_TYPE_INFO(AndroidIcons, "{D807ABEA-9C79-4EDD-B418-9A823E812C9A}");
+        AZ_CLASS_ALLOCATOR(AndroidIcons, AZ::SystemAllocator, 0);
+
+        AndroidIcons()
+            : m_default("")
+            , m_mdpi("")
+            , m_hdpi("")
+            , m_xhdpi("")
+            , m_xxhdpi("")
+            , m_xxxhdpi("")
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::string m_default;
+        AZStd::string m_mdpi;
+        AZStd::string m_hdpi;
+        AZStd::string m_xhdpi;
+        AZStd::string m_xxhdpi;
+        AZStd::string m_xxxhdpi;
+    };
+
+    class AndroidLandscapeSplashscreens
+    {
+    public:
+        AZ_TYPE_INFO(AndroidLandscapeSplashscreens, "{37888881-5050-47B6-9EB4-A408FD27D397}");
+        AZ_CLASS_ALLOCATOR(AndroidIcons, AZ::SystemAllocator, 0);
+
+        AndroidLandscapeSplashscreens()
+            : m_default("")
+            , m_mdpi("")
+            , m_hdpi("")
+            , m_xhdpi("")
+            , m_xxhdpi("")
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::string m_default;
+        AZStd::string m_mdpi;
+        AZStd::string m_hdpi;
+        AZStd::string m_xhdpi;
+        AZStd::string m_xxhdpi;
+    };
+
+    class AndroidPortraitSplashscreens
+    {
+    public:
+        AZ_TYPE_INFO(AndroidPortraitSplashscreens, "{2AADA22F-B5A3-440C-A592-FB923BC66878}");
+        AZ_CLASS_ALLOCATOR(AndroidPortraitSplashscreens, AZ::SystemAllocator, 0);
+
+        AndroidPortraitSplashscreens()
+            : m_default("")
+            , m_mdpi("")
+            , m_hdpi("")
+            , m_xhdpi("")
+            , m_xxhdpi("")
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::string m_default;
+        AZStd::string m_mdpi;
+        AZStd::string m_hdpi;
+        AZStd::string m_xhdpi;
+        AZStd::string m_xxhdpi;
+    };
+
+    class AndroidSplashscreens
+    {
+    public:
+        AZ_TYPE_INFO(AndroidSplashscreens, "{95985732-F45B-436A-86BC-7AE5249FF520}");
+        AZ_CLASS_ALLOCATOR(AndroidSplashscreens, AZ::SystemAllocator, 0);
+
+        AndroidSplashscreens()
+            : m_landscapeSplashscreens()
+            , m_portraitSplashscreens()
+        {}
+
+        AndroidLandscapeSplashscreens m_landscapeSplashscreens;
+        AndroidPortraitSplashscreens m_portraitSplashscreens;
+
+        static void Reflect(AZ::ReflectContext* context);
+    };
+
+    class AndroidSettings
+    {
+    public:
+        AZ_TYPE_INFO(AndroidSettings, "{5D57D014-4939-4D86-B862-AF35BAC705DC}");
+        AZ_CLASS_ALLOCATOR(AndroidSettings, AZ::SystemAllocator, 0);
+
+        AndroidSettings()
+            : m_packageName("")
+            , m_versionName("")
+            , m_versionNumber(1)
+            , m_orientation("landscape")
+            , m_appPublicKey("")
+            , m_appObfuscatorSalt("")
+            , m_rcPakJob("")
+            , m_rcObbJob("")
+            , m_useMainObb(false)
+            , m_usePatchObb(false)
+            , m_enableKeyScreenOn(false)
+            , m_disableImmersiveMode(false)
+            , m_icons()
+            , m_splashscreens()
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::string m_packageName;
+        AZStd::string m_versionName;
+        int m_versionNumber;
+        AZStd::string m_orientation;
+        AZStd::string m_appPublicKey;
+        AZStd::string m_appObfuscatorSalt;
+        AZStd::string m_rcPakJob;
+        AZStd::string m_rcObbJob;
+        bool m_useMainObb;
+        bool m_usePatchObb;
+        bool m_enableKeyScreenOn;
+        bool m_disableImmersiveMode;
+        AndroidIcons m_icons;
+        AndroidSplashscreens m_splashscreens;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp
new file mode 100644
index 0000000000..724e47c87b
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.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 "ProjectSettingsTool_precompiled.h"
+#include "PlatformSettings_Base.h"
+
+#include "PlatformSettings_common.h"
+#include "Validators.h"
+
+namespace ProjectSettingsTool
+{
+    void BaseSettings::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            serialize->Class<BaseSettings>()
+                ->Version(2)
+                ->Field("project_name", &BaseSettings::m_projectName)
+                ->Field("product_name", &BaseSettings::m_productName)
+                ->Field("executable_name", &BaseSettings::m_executableName)
+                ->Field("project_path", &BaseSettings::m_projectPath)
+                ->Field("project_output_folder", &BaseSettings::m_projectOutputFolder)
+                ->Field("code_folder", &BaseSettings::m_codeFolder)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<BaseSettings>("Project Settings", "All core settings for the game project and package and deployment.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
+                    ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_projectName, "Project Name", "The name of the project.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProjectName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosBundleName)
+                    ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_productName, "Product Name", "The project's user facing name.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IsNotEmpty))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProductName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosDisplayName)
+                    ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_executableName, "Executable Name", "The project launcher's name.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::ExecutableName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosExecutableName)
+                    ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_projectPath, "Project Path", "The project root folder path .")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileNameOrEmpty))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProductName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::ExecutableName)
+                    ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_projectOutputFolder, "Output Folder", "The folder the packed project will be exported to.")
+                    ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_codeFolder, "Code Folder (legacy)", "A legacy setting specifing the folder for this project's code.")
+                ;
+            }
+        }
+    }
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.h b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.h
new file mode 100644
index 0000000000..b104721b71
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Serialization/EditContext.h>
+
+namespace ProjectSettingsTool
+{
+    class BaseSettings
+    {
+    public:
+        AZ_TYPE_INFO(BaseSettings, "{3202E013-46EC-4E97-989A-84934CA15C59}");
+        AZ_CLASS_ALLOCATOR(BaseSettings, AZ::SystemAllocator, 0);
+
+        BaseSettings()
+            : m_projectName("")
+            , m_productName("")
+            , m_executableName("")
+            , m_projectPath("")
+            , m_sysDllGame("")
+            , m_projectOutputFolder("")
+            , m_codeFolder("")
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::string m_projectName;
+        AZStd::string m_productName;
+        AZStd::string m_executableName;
+        AZStd::string m_projectPath;
+        AZStd::string m_sysDllGame;
+        AZStd::string m_projectOutputFolder;
+        AZStd::string m_codeFolder;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp
new file mode 100644
index 0000000000..d29376cfa7
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp
@@ -0,0 +1,313 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "PlatformSettings_Ios.h"
+
+#include "PlatformSettings_common.h"
+#include "Validators.h"
+
+namespace ProjectSettingsTool
+{
+    namespace Icons
+    {
+        static const char* appStore = "iOSAppStoreIcon1024x1024";
+        static const char* iphoneApp120 = "iPhoneAppIcon120x120";
+        static const char* iphoneApp180 = "iPhoneAppIcon180x180";
+        static const char* iphoneNotification40 = "iPhoneNotificationIcon40x40";
+        static const char* iphoneNotification60 = "iPhoneNotificationIcon60x60";
+        static const char* iphoneSettings58 = "iPhoneSettingsIcon58x58";
+        static const char* iphoneSettings87 = "iPhoneSettingsIcon87x87";
+        static const char* iphoneSpotlight80 = "iPhoneSpotlightIcon80x80";
+        static const char* iphoneSpotlight120 = "iPhoneSpotlightIcon120x120";
+        static const char* ipadApp76 = "iPadAppIcon76x76";
+        static const char* ipadApp152 = "iPadAppIcon152x152";
+        static const char* ipadProApp = "iPadProAppIcon167x167";
+        static const char* ipadNotification20 = "iPadNotificationIcon20x20";
+        static const char* ipadNotification40 = "iPadNotificationIcon40x40";
+        static const char* ipadSettings29 = "iPadSettingsIcon29x29";
+        static const char* ipadSettings58 = "iPadSettingsIcon58x58";
+        static const char* ipadSpotlight40 = "iPadSpotlightIcon40x40";
+        static const char* ipadSpotlight80 = "iPadSpotlightIcon80x80";
+    };
+
+    void IosIcons::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            serialize->Class<IosIcons>()
+                ->Version(1)
+                ->Field(Icons::appStore, &IosIcons::m_appStore)
+                ->Field(Icons::iphoneApp120, &IosIcons::m_iphoneApp120)
+                ->Field(Icons::iphoneApp180, &IosIcons::m_iphoneApp180)
+                ->Field(Icons::iphoneNotification40, &IosIcons::m_iphoneNotification40)
+                ->Field(Icons::iphoneNotification60, &IosIcons::m_iphoneNotification60)
+                ->Field(Icons::iphoneSettings58, &IosIcons::m_iphoneSettings58)
+                ->Field(Icons::iphoneSettings87, &IosIcons::m_iphoneSettings87)
+                ->Field(Icons::iphoneSpotlight80, &IosIcons::m_iphoneSpotlight80)
+                ->Field(Icons::iphoneSpotlight120, &IosIcons::m_iphoneSpotlight120)
+                ->Field(Icons::ipadApp76, &IosIcons::m_ipadApp76)
+                ->Field(Icons::ipadApp152, &IosIcons::m_ipadApp152)
+                ->Field(Icons::ipadProApp, &IosIcons::m_ipadProApp)
+                ->Field(Icons::ipadNotification20, &IosIcons::m_ipadNotification20)
+                ->Field(Icons::ipadNotification40, &IosIcons::m_ipadNotification40)
+                ->Field(Icons::ipadSettings29, &IosIcons::m_ipadSettings29)
+                ->Field(Icons::ipadSettings58, &IosIcons::m_ipadSettings58)
+                ->Field(Icons::ipadSpotlight40, &IosIcons::m_ipadSpotlight40)
+                ->Field(Icons::ipadSpotlight80, &IosIcons::m_ipadSpotlight80)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<IosIcons>("Icons", "All png icon overrides for iOS.")
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_appStore, "App Store (1024px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1024>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::appStore))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneApp120, "iPhone App (120px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<120>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneApp120))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneApp180, "iPhone App (180px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<180>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneApp180))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneNotification40, "iPhone Notification (40px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<40>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneNotification40))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneNotification60, "iPhone Notification (60px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<60>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneNotification60))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneSettings58, "iPhone Settings (58px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<58>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneSettings58))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneSettings87, "iPhone Settings (87px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<87>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneSettings87))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneSpotlight80, "iPhone Spotlight (80px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<80>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneSpotlight80))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneSpotlight120, "iPhone Spotlight (120px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<120>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneSpotlight120))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadApp76, "iPad App (76px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<76>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadApp76))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadApp152, "iPad App (152px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<152>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadApp152))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadProApp, "iPad Pro App (167px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<167>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadProApp))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadNotification20, "iPad Notification (20px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<20>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadNotification20))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadNotification40, "iPad Notification (40px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<40>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadNotification40))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadSettings29, "iPad Settings (29px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<29>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadSettings29))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadSettings58, "iPad Settings (58px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<58>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadSettings58))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadSpotlight40, "iPad Spotlight (40px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<40>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadSpotlight40))
+                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadSpotlight80, "iPad Spotlight (80px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<80>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadSpotlight80))
+                ;
+            }
+        }
+    }
+
+    namespace Launchscreens
+    {
+        static const char* iphone640x960 = "iPhoneLaunchImage640x960";
+        static const char* iphone640x1136 = "iPhoneLaunchImage640x1136";
+        static const char* iphone750x1334 = "iPhoneLaunchImage750x1334";
+        static const char* iphone1125x2436 = "iPhoneLaunchImage1125x2436";
+        static const char* iphone2436x1125 = "iPhoneLaunchImage2436x1125";
+        static const char* iphone1242x2208 = "iPhoneLaunchImage1242x2208";
+        static const char* iphone2208x1242 = "iPhoneLaunchImage2208x1242";
+        static const char* ipad768x1024 = "iPadLaunchImage768x1024";
+        static const char* ipad1024x768 = "iPadLaunchImage1024x768";
+        static const char* ipad1536x2048 = "iPadLaunchImage1536x2048";
+        static const char* ipad2048x1536 = "iPadLaunchImage2048x1536";
+    } // namespace Launchscreens
+
+    void IosLaunchscreens::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            serialize->Class<IosLaunchscreens>()
+                ->Version(1)
+                ->Field(Launchscreens::iphone640x960, &IosLaunchscreens::m_iphone640x960)
+                ->Field(Launchscreens::iphone640x1136, &IosLaunchscreens::m_iphone640x1136)
+                ->Field(Launchscreens::iphone750x1334, &IosLaunchscreens::m_iphone750x1334)
+                ->Field(Launchscreens::iphone1125x2436, &IosLaunchscreens::m_iphone1125x2436)
+                ->Field(Launchscreens::iphone2436x1125, &IosLaunchscreens::m_iphone2436x1125)
+                ->Field(Launchscreens::iphone1242x2208, &IosLaunchscreens::m_iphone1242x2208)
+                ->Field(Launchscreens::iphone2208x1242, &IosLaunchscreens::m_iphone2208x1242)
+                ->Field(Launchscreens::ipad768x1024, &IosLaunchscreens::m_ipad768x1024)
+                ->Field(Launchscreens::ipad1024x768, &IosLaunchscreens::m_ipad1024x768)
+                ->Field(Launchscreens::ipad1536x2048, &IosLaunchscreens::m_ipad1536x2048)
+                ->Field(Launchscreens::ipad2048x1536, &IosLaunchscreens::m_ipad2048x1536)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<IosLaunchscreens>("Launchscreens", "All png launchscreen overrides for iOS.")
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone640x960, "iPhone (640x960px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<640, 960>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone640x960))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone640x1136, "iPhone (640x1136px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<640, 1136>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone640x1136))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone750x1334, "iPhone (750x1334px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<750, 1334>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone750x1334))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone1125x2436, "iPhone (1125x2436px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1125, 2436>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone1125x2436))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone2436x1125, "iPhone (2436x1125px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<2436, 1125>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone2436x1125))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone1242x2208, "iPhone (1242x2208px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1242, 2208>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone1242x2208))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone2208x1242, "iPhone (2208x1242px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<2208, 1242>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone2208x1242))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_ipad768x1024, "iPad (768x1024px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<768, 1024>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::ipad768x1024))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_ipad1024x768, "iPad (1024x768px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1024, 768>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::ipad1024x768))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_ipad1536x2048, "iPad (1536x2048px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1536, 2048>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::ipad1536x2048))
+                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_ipad2048x1536, "iPad (2048x1536px)", "")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<2048, 1536>))
+                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::ipad2048x1536))
+                ;
+            }
+        }
+    }
+
+    void IosOrientations::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            serialize->Class<IosOrientations>()
+                ->Version(1)
+                ->Field("UIInterfaceOrientationLandscapeRight", &IosOrientations::m_landscapeRight)
+                ->Field("UIInterfaceOrientationLandscapeLeft", &IosOrientations::m_landscapeLeft)
+                ->Field("UIInterfaceOrientationPortrait", &IosOrientations::m_portraitBottom)
+                ->Field("UIInterfaceOrientationPortraitUpsideDown", &IosOrientations::m_portraitTop)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<IosOrientations>("Orientations", "All supported orientations for iOS.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosOrientations::m_landscapeRight, "Landscape (right home button)", "Enable landscape orientation with home button on right side of device.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosOrientations::m_landscapeLeft, "Landscape (left home button)", "Enable landscape orientation with home button on left side of device.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosOrientations::m_portraitBottom, "Portrait (bottom home button)", "Enable portrait orientation with home button on bottom of device.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosOrientations::m_portraitTop, "Portrait (top home button)", "Enable portrait orientation with home button on top of device.")
+                ;
+            }
+        }
+    }
+
+    void IosSettings::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serialize)
+        {
+            IosOrientations::Reflect(context);
+            IosIcons::Reflect(context);
+            IosLaunchscreens::Reflect(context);
+
+            serialize->Class<IosSettings>()
+                ->Version(1)
+                ->Field("CFBundleName", &IosSettings::m_bundleName)
+                ->Field("CFBundleDisplayName", &IosSettings::m_bundleDisplayName)
+                ->Field("CFBundleExecutable", &IosSettings::m_executableName)
+                ->Field("CFBundleIdentifier", &IosSettings::m_bundleIdentifier)
+                ->Field("CFBundleShortVersionString", &IosSettings::m_versionName)
+                ->Field("CFBundleVersion", &IosSettings::m_versionNumber)
+                ->Field("CFBundleDevelopmentRegion", &IosSettings::m_developmentRegion)
+                ->Field("UIRequiresFullScreen", &IosSettings::m_requiresFullscreen)
+                ->Field("UIStatusBarHidden", &IosSettings::m_hideStatusBar)
+                ->Field("UISupportedInterfaceOrientations", &IosSettings::m_iphoneOrientations)
+                ->Field("UISupportedInterfaceOrientations~ipad", &IosSettings::m_ipadOrientations)
+                ->Field("icons", &IosSettings::m_icons)
+                ->Field("launchscreens", &IosSettings::m_launchscreens)
+            ;
+
+            AZ::EditContext* editContext = serialize->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<IosSettings>("Ios Settings", "All settings iOS settings.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
+                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleName, "Bundle Name", "The name of the bundle.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosBundleName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::ProjectName)
+                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleDisplayName, "Display Name", "The user visible name of the bundle.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IsNotEmpty))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosDisplayName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::ProductName)
+                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_executableName, "Executable Name", "Name of the bundle's executable file.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosExecutableName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::ExecutableName)
+                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleIdentifier, "Bundle Identifier", "Uniquely identifies the bundle. Should be in reverse-DNS format.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PackageName))
+                        ->Attribute(Attributes::LinkOptional, true)
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosBundleIdentifer)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::AndroidPackageName)
+                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_versionName, "Version Name", "The release version number string for the app. Displayed in the app store.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
+                        ->Attribute(Attributes::LinkOptional, true)
+                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosVersionName)
+                        ->Attribute(Attributes::LinkedProperty, Identfiers::AndroidVersionName)
+                    ->DataElement(Handlers::QValidatedLineEdit, &IosSettings::m_versionNumber, "Version Number", "The build version number string for the bundle.")
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
+                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &IosSettings::m_developmentRegion, "Development Region", "The default language and region for the app.")
+                        ->Attribute(AZ::Edit::Attributes::StringList, AZStd::vector<AZStd::string>
+                        {
+                            "en_US",
+                            "en_CA",
+                            "fr_CA",
+                            "zh_CN",
+                            "fr_FR",
+                            "de_DE",
+                            "it_IT",
+                            "ja_JP",
+                            "ko_KR",
+                            "zh_TW",
+                            "en_GB"
+                        })
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_requiresFullscreen, "Requires Fullscreen", "Specifies whether the app is required to run in fullscreen mode.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_hideStatusBar, "Hide Status Bar", "Specifies whether the status bar is initially hidden when the app launches.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_iphoneOrientations, "iPhone Orientations", "Enable support for iPhone orientations.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_ipadOrientations, "iPad Orientations", "Enable support for iPad orientations.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_icons)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_launchscreens)
+                ;
+            }
+        }
+    }
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.h b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.h
new file mode 100644
index 0000000000..976ed3ec4f
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.h
@@ -0,0 +1,157 @@
+/*
+ * 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/Serialization/EditContext.h>
+
+namespace ProjectSettingsTool
+{
+    class IosIcons
+    {
+    public:
+        AZ_TYPE_INFO(IosIcons, "{A57F9F23-36F5-4425-B40A-56D60119E5C9}");
+        AZ_CLASS_ALLOCATOR(IosIcons, AZ::SystemAllocator, 0);
+
+        IosIcons()
+            : m_appStore("")
+            , m_iphoneApp120("")
+            , m_iphoneApp180("")
+            , m_iphoneNotification40("")
+            , m_iphoneNotification60("")
+            , m_iphoneSettings58("")
+            , m_iphoneSettings87("")
+            , m_iphoneSpotlight80("")
+            , m_iphoneSpotlight120("")
+            , m_ipadApp76("")
+            , m_ipadApp152("")
+            , m_ipadProApp("")
+            , m_ipadNotification20("")
+            , m_ipadNotification40("")
+            , m_ipadSettings29("")
+            , m_ipadSettings58("")
+            , m_ipadSpotlight40("")
+            , m_ipadSpotlight80("")
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::string m_appStore;
+        AZStd::string m_iphoneApp120;
+        AZStd::string m_iphoneApp180;
+        AZStd::string m_iphoneNotification40;
+        AZStd::string m_iphoneNotification60;
+        AZStd::string m_iphoneSettings58;
+        AZStd::string m_iphoneSettings87;
+        AZStd::string m_iphoneSpotlight80;
+        AZStd::string m_iphoneSpotlight120;
+        AZStd::string m_ipadApp76;
+        AZStd::string m_ipadApp152;
+        AZStd::string m_ipadProApp;
+        AZStd::string m_ipadNotification20;
+        AZStd::string m_ipadNotification40;
+        AZStd::string m_ipadSettings29;
+        AZStd::string m_ipadSettings58;
+        AZStd::string m_ipadSpotlight40;
+        AZStd::string m_ipadSpotlight80;
+    };
+
+    class IosLaunchscreens
+    {
+    public:
+        AZ_TYPE_INFO(IosLaunchscreens, "{1A34706F-9558-4081-9898-33758B026629}");
+        AZ_CLASS_ALLOCATOR(IosLaunchscreens, AZ::SystemAllocator, 0);
+
+        IosLaunchscreens()
+            : m_iphone640x960("")
+            , m_iphone640x1136("")
+            , m_iphone750x1334("")
+            , m_iphone1125x2436("")
+            , m_iphone2436x1125("")
+            , m_iphone1242x2208("")
+            , m_iphone2208x1242("")
+            , m_ipad768x1024("")
+            , m_ipad1024x768("")
+            , m_ipad1536x2048("")
+            , m_ipad2048x1536("")
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::string m_iphone640x960;
+        AZStd::string m_iphone640x1136;
+        AZStd::string m_iphone750x1334;
+        AZStd::string m_iphone1125x2436;
+        AZStd::string m_iphone2436x1125;
+        AZStd::string m_iphone1242x2208;
+        AZStd::string m_iphone2208x1242;
+        AZStd::string m_ipad768x1024;
+        AZStd::string m_ipad1024x768;
+        AZStd::string m_ipad1536x2048;
+        AZStd::string m_ipad2048x1536;
+    };
+
+    class IosOrientations
+    {
+    public:
+        AZ_TYPE_INFO(IosOrientations, "{A42CDF2E-CCE1-4D93-9D4E-2270CFC0F2ED}");
+        AZ_CLASS_ALLOCATOR(IosOrientations, AZ::SystemAllocator, 0);
+
+        IosOrientations()
+            : m_landscapeRight(false)
+            , m_landscapeLeft(false)
+            , m_portraitBottom(false)
+            , m_portraitTop(false)
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        bool m_landscapeRight;
+        bool m_landscapeLeft;
+        bool m_portraitBottom;
+        bool m_portraitTop;
+    };
+
+    class IosSettings
+    {
+    public:
+        AZ_TYPE_INFO(IosSettings, "{9EDF051E-0158-4ADE-92A3-B7AC230E0114}");
+        AZ_CLASS_ALLOCATOR(IosSettings, AZ::SystemAllocator, 0);
+
+        IosSettings()
+            : m_bundleName("")
+            , m_bundleDisplayName("")
+            , m_executableName("")
+            , m_bundleIdentifier("com.amazon.o3de.UnknownProject")
+            , m_versionName("1.0.0")
+            , m_versionNumber("1.0.0")
+            , m_developmentRegion("en_US")
+            , m_requiresFullscreen(false)
+            , m_hideStatusBar(false)
+            , m_iphoneOrientations()
+            , m_ipadOrientations()
+            , m_icons()
+            , m_launchscreens()
+        {}
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZStd::string m_bundleName;
+        AZStd::string m_bundleDisplayName;
+        AZStd::string m_executableName;
+        AZStd::string m_bundleIdentifier;
+        AZStd::string m_versionName;
+        AZStd::string m_versionNumber;
+        AZStd::string m_developmentRegion;
+        bool m_requiresFullscreen;
+        bool m_hideStatusBar;
+        IosOrientations m_iphoneOrientations;
+        IosOrientations m_ipadOrientations;
+        IosIcons m_icons;
+        IosLaunchscreens m_launchscreens;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_common.h b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_common.h
new file mode 100644
index 0000000000..6ac48d518f
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_common.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Math/Crc.h>
+
+#include "Utils.h"
+
+namespace ProjectSettingsTool
+{
+    namespace Attributes
+    {
+        static const AZ::Crc32 FuncValidator = AZ_CRC("FuncValidator");
+        static const AZ::Crc32 SelectFunction = AZ_CRC("SelectFunction");
+        static const AZ::Crc32 LinkOptional = AZ_CRC("LinkOptional");
+        static const AZ::Crc32 Obfuscated = AZ_CRC("ObfuscatedText");
+        // Used as a tooltip and for distinguising linked properties
+        static const AZ::Crc32 PropertyIdentfier = AZ_CRC("PropertyIdentfier");
+        static const AZ::Crc32 LinkedProperty = AZ_CRC("LinkedProperty");
+        static const AZ::Crc32 DefaultPath = AZ_CRC("DefaultPath");
+        static const AZ::Crc32 DefaultImagePreview = AZ_CRC("DefaultImagePreview");
+        static const AZ::Crc32 ObfuscatedText = AZ_CRC("ObfuscatedText");
+        static const AZ::Crc32 ClearButton = AZ_CRC("ClearButton");
+        static const AZ::Crc32 RemovableReadOnly = AZ_CRC("RemovableReadOnly");
+    } // namespace Attributes
+
+    namespace Handlers
+    {
+        static const AZ::Crc32 ImagePreview = AZ_CRC("ImagePreview");
+        static const AZ::Crc32 LinkedLineEdit = AZ_CRC("LinkedLineEdit");
+        static const AZ::Crc32 FileSelect = AZ_CRC("FileSelect");
+        static const AZ::Crc32 QValidatedLineEdit = AZ_CRC("QValLineEdit");
+        static const AZ::Crc32 QValidatedBrowseEdit = AZ_CRC("QValBrowseEdit");
+    } // namespace Handlers
+
+    namespace Identfiers
+    {
+        static const char* ProjectName = "Base - Project Name";
+        static const char* ProductName = "Base - Product Name";
+        static const char* ExecutableName = "Base - Executable Name";
+
+        static const char* AndroidPackageName = "Android - Package Name";
+        static const char* AndroidVersionName = "Android - Version Name";
+        static const char* AndroidIconDefault = "Android - Icon Default";
+        static const char* AndroidLandDefault = "Android - Land Default";
+        static const char* AndroidPortDefault = "Android - Port Default";
+
+        static const char* IosBundleName = "iOS - Bundle Name";
+        static const char* IosDisplayName = "iOS - Display Name";
+        static const char* IosExecutableName = "iOS - Executable Name";
+        static const char* IosBundleIdentifer = "iOS - Bundle Identifer";
+        static const char* IosVersionName = "iOS - Version Name";
+    } // namespace Identfiers
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Platforms.h b/Code/Editor/Plugins/ProjectSettingsTool/Platforms.h
new file mode 100644
index 0000000000..8516367657
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Platforms.h
@@ -0,0 +1,42 @@
+/*
+ * 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 ProjectSettingsTool
+{
+    enum class PlatformId
+    {
+        Base,
+        Android,
+        Ios,
+
+        NumPlatformIds
+    };
+
+    enum class PlatformDataType
+    {
+        ProjectJson,
+        Plist,
+
+        NumPlatformDataTypes
+    };
+
+    struct Platform
+    {
+        PlatformId m_id;
+        PlatformDataType m_type;
+    };
+
+    const Platform Platforms[static_cast<unsigned>(PlatformId::NumPlatformIds)]
+    {
+        Platform{ PlatformId::Base, PlatformDataType::ProjectJson },
+        Platform{ PlatformId::Android, PlatformDataType::ProjectJson },
+        Platform{ PlatformId::Ios, PlatformDataType::Plist }
+    };
+    
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.cpp
new file mode 100644
index 0000000000..fe8c643b89
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.cpp
@@ -0,0 +1,162 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "PlistDictionary.h"
+
+
+namespace ProjectSettingsTool
+{
+    using namespace AZ;
+    using XmlDocument = rapidxml::xml_document<char>;
+    using XmlNode = rapidxml::xml_node<char>;
+
+    PlistDictionary::PlistDictionary(XmlDocument* plist)
+        : m_document(plist)
+        , m_dict(plist->first_node("plist")->first_node("dict"))
+    {
+    }
+
+    XmlNode* PlistDictionary::MakeNode(const char* name, const char* value)
+    {
+        return m_document->allocate_node
+        (
+            rapidxml::node_element,
+            m_document->allocate_string(name),
+            m_document->allocate_string(value)
+        );
+    }
+
+    XmlNode* PlistDictionary::MakeNode()
+    {
+        return m_document->allocate_node(rapidxml::node_element);
+    }
+
+    XmlNode* PlistDictionary::GetPropertyKeyNode(const char* key)
+    {
+        XmlNode* keyNode = m_dict->first_node("key");
+        // Look for the key in pList's interesting structure
+        while (keyNode)
+        {
+            if (strcmp(keyNode->value(), key) == 0)
+            {
+                break;
+            }
+
+            keyNode = keyNode->next_sibling("key");
+        }
+
+        // Returns key if found otherwise nullptr
+        return keyNode;
+    }
+
+    XmlNode* PlistDictionary::GetPropertyValueNode(const char* key)
+    {
+        XmlNode* keyNode = GetPropertyKeyNode(key);
+
+        // Key found return data node
+        if (keyNode != nullptr)
+        {
+            return keyNode->next_sibling();
+        }
+        // Failed to find key return nullptr
+         return nullptr;
+    }
+
+    XmlNode* PlistDictionary::AddProperty(const char* key)
+    {
+        m_dict->append_node(MakeNode("key", key));
+        XmlNode* data = MakeNode();
+        m_dict->append_node(data);
+        return data;
+    }
+
+    void PlistDictionary::RemoveProperty(const char* key)
+    {
+        XmlNode* keyNode = GetPropertyKeyNode(key);
+
+        if (keyNode != nullptr)
+        {
+            XmlNode* dataNode = keyNode->next_sibling();
+
+            m_dict->remove_node(keyNode);
+            m_dict->remove_node(dataNode);
+        }
+    }
+
+    const char* PlistDictionary::GetPropertyValue(const char* key)
+    {
+        XmlNode* valueNode = GetPropertyValueNode(key);
+        return valueNode != nullptr ? GetPropertyValue(valueNode) : nullptr;
+    }
+
+    const char* PlistDictionary::GetPropertyValue(XmlNode* node)
+    {
+        return node->value_size() > 0 ? node->value() : nullptr;
+    }
+
+    const char* PlistDictionary::GetPropertyValueName(const char* key)
+    {
+        XmlNode* valueNode = GetPropertyValueNode(key);
+        return valueNode != nullptr ? GetPropertyValueName(valueNode) : nullptr;
+    }
+
+    const char* PlistDictionary::GetPropertyValueName(XmlNode* node)
+    {
+        return node->name_size() > 0 ? node->name() : nullptr;
+    }
+
+    XmlNode* PlistDictionary::SetPropertyValue(const char* key, const char* newValue)
+    {
+        XmlNode* dataNode = GetPropertyValueNode(key);
+        if (dataNode == nullptr)
+        {
+            dataNode = AddProperty(key);
+            SetPropertyValueName(dataNode, "string");
+        }
+        SetPropertyValue(dataNode, newValue);
+
+        return dataNode;
+    }
+
+    void PlistDictionary::SetPropertyValue(XmlNode* node, const char* newValue)
+    {
+        node->value(m_document->allocate_string(newValue));
+    }
+
+    XmlNode* PlistDictionary::SetPropertyValueName(const char* key, const char* newName)
+    {
+        XmlNode* dataNode = GetPropertyValueNode(key);
+        if (dataNode == nullptr)
+        {
+            dataNode = AddProperty(key);
+        }
+        SetPropertyValueName(dataNode, newName);
+
+        return dataNode;
+    }
+
+    void PlistDictionary::SetPropertyValueName(XmlNode* node, const char* newName)
+    {
+        node->name(m_document->allocate_string(newName));
+    }
+
+    bool PlistDictionary::ContainsValidDict(XmlDocument* plist)
+    {
+        XmlNode* node = plist->first_node("plist");
+        if (node != nullptr)
+        {
+            node = node->first_node("dict");
+            if (node != nullptr)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.h b/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.h
new file mode 100644
index 0000000000..4a41550b2a
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/XML/rapidxml.h>
+
+namespace ProjectSettingsTool
+{
+    // Wraps a plist dict node with a friendly api to allow lookups and other actions in it
+    class PlistDictionary
+    {
+    public:
+        // Constructs the dictionary wrapper
+        PlistDictionary(AZ::rapidxml::xml_document<char>* plist);
+
+        // Allocates a new node with given name and value
+        AZ::rapidxml::xml_node<char>* MakeNode(const char* name, const char* value);
+        AZ::rapidxml::xml_node<char>* MakeNode();
+
+        // Returns pointer to property data node
+        AZ::rapidxml::xml_node<char>* GetPropertyValueNode(const char* key);
+
+        // Creates a new property and returns pointer to its value node
+        AZ::rapidxml::xml_node<char>* AddProperty(const char* key);
+        // Removes property from dictionary
+        void RemoveProperty(const char* key);
+
+        // Returns pointer to property data value or nullptr if it is empty
+        const char* GetPropertyValue(const char* key);
+        const char* GetPropertyValue(AZ::rapidxml::xml_node<char>* node);
+
+        // Returns pointer to property data name or nullptr if it is empty
+        const char* GetPropertyValueName(const char* key);
+        const char* GetPropertyValueName(AZ::rapidxml::xml_node<char>* node);
+
+        // Changes value of property data and creates it if it doesn't exist
+        AZ::rapidxml::xml_node<char>* SetPropertyValue(const char* key, const char* newValue);
+        void SetPropertyValue(AZ::rapidxml::xml_node<char>* node, const char* newValue);
+
+        // Changes name of property data and creates it if it doesn't exist
+        AZ::rapidxml::xml_node<char>* SetPropertyValueName(const char* key, const char* newName);
+        void SetPropertyValueName(AZ::rapidxml::xml_node<char>* node, const char* newName);
+
+        // Checks to make sure a plist file has a valid dictionary
+        static bool ContainsValidDict(AZ::rapidxml::xml_document<char>* plist);
+
+    protected:
+        // Returns pointer to property key node
+        AZ::rapidxml::xml_node<char>* GetPropertyKeyNode(const char* key);
+
+
+        // pList dictionary is found in
+        AZ::rapidxml::xml_document<char>* m_document;
+        // The dictionary of properties
+        AZ::rapidxml::xml_node<char>* m_dict;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp
new file mode 100644
index 0000000000..15193b1aa4
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp
@@ -0,0 +1,324 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "ProjectSettingsContainer.h"
+
+#include <AzCore/JSON/prettywriter.h>
+#include <AzCore/JSON/stringbuffer.h>
+#include <AzCore/XML/rapidxml_print.h>
+
+#include <Util/FileUtil.h>
+
+namespace ProjectSettingsTool
+{
+    using namespace AZ;
+    using StringOutcome = Outcome<void, AZStd::string>;
+    using XmlDocument = rapidxml::xml_document<char>;
+    using XmlNode = rapidxml::xml_node<char>;
+
+    const int xmlFlags = rapidxml::parse_doctype_node | rapidxml::parse_declaration_node | rapidxml::parse_no_data_nodes;
+
+    SettingsError::SettingsError(const AZStd::string& error, const AZStd::string& reason)
+    {
+        m_error = error;
+        m_reason = reason;
+    }
+
+    StringOutcome WriteConfigFile(const AZStd::string& fileName, const AZStd::string& fileContents)
+    {
+        using AZ::IO::SystemFile;
+        const char* filePath = fileName.c_str();
+
+        // Attempt to make file writable or check it out in source control
+        if (CFileUtil::OverwriteFile(filePath))
+        {
+            if (!CFileUtil::CreateDirectory(fileName.substr(0, fileName.find_last_of('/')).data()))
+            {
+                return AZ::Failure(AZStd::string::format("Could not create the directory for file \"%s\".", filePath));
+            }
+
+            SystemFile settingsFile;
+            if (!settingsFile.Open(filePath, SystemFile::SF_OPEN_WRITE_ONLY | SystemFile::SF_OPEN_CREATE))
+            {
+                return AZ::Failure(AZStd::string::format("Failed to open settings file %s for write.", filePath));
+            }
+
+            if (settingsFile.Write(fileContents.c_str(), fileContents.size()) != fileContents.size())
+            {
+                return AZ::Failure(AZStd::string::format("Failed to write to file %s.", filePath));
+            }
+
+
+            settingsFile.Close();
+            return AZ::Success();
+        }
+
+        return AZ::Failure(AZStd::string::format("Could not check out or make file writable: \"%s\".", filePath));
+    }
+
+    StringOutcome ReadConfigFile(const AZStd::string& fileName, AZStd::string& fileContents)
+    {
+        using AZ::IO::SystemFile;
+        const char* filePath = fileName.c_str();
+
+        if (!SystemFile::Exists(filePath))
+        {
+            return AZ::Failure(AZStd::string::format("%s file doesn't exist.", filePath));
+        }
+
+        SystemFile settingsFile;
+        if (!settingsFile.Open(filePath, SystemFile::SF_OPEN_READ_ONLY))
+        {
+            return AZ::Failure(AZStd::string::format("Failed to open settings file %s.", filePath));
+        }
+
+        fileContents = AZStd::string(settingsFile.Length(), '\0');
+        settingsFile.Read(fileContents.size(), fileContents.data());
+
+        settingsFile.Close();
+        return AZ::Success();
+    }
+
+
+    ProjectSettingsContainer::ProjectSettingsContainer(const AZStd::string& projectJsonFileName, PlistInitVector& plistPaths)
+        : m_projectJson(JsonSettings{ projectJsonFileName, "", AZStd::make_unique<rapidjson::Document>() })
+    {
+        LoadProjectJsonData();
+
+        for (PlatformAndPath& plistInfo : plistPaths)
+        {
+            m_pListsMap.insert(AZStd::pair<PlatformId, PlistSettings>(
+                plistInfo.first,
+                PlistSettings{ plistInfo.second, "", AZStd::make_unique<XmlDocument>() }));
+
+            // We will have to find it then because unique_ptrs are not copy constructible
+            // And a move constructor would copy large strings
+            LoadPlist(m_pListsMap.find(plistInfo.first)->second);
+        }
+    }
+
+    ProjectSettingsContainer::~ProjectSettingsContainer()
+    {
+    }
+
+    ProjectSettingsContainer::PlistSettings* ProjectSettingsContainer::GetPlistSettingsForPlatform(const Platform& plat)
+    {
+        PlistSettings* result = nullptr;
+
+        if (plat.m_type == PlatformDataType::Plist)
+        {
+            auto iter = m_pListsMap.find(plat.m_id);
+
+            if (iter != m_pListsMap.end())
+            {
+                result = &iter->second;
+            }
+            else
+            {
+                AZ_Assert(false, "Failed to find pList for platform.");
+            }
+        }
+
+        return result;
+    }
+
+    bool ProjectSettingsContainer::IsPlistPlatform(const Platform& plat)
+    {
+        if (plat.m_type == PlatformDataType::Plist)
+        {
+            auto iter = m_pListsMap.find(plat.m_id);
+
+            if (iter != m_pListsMap.end())
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    AZ::Outcome<void, SettingsError> ProjectSettingsContainer::GetError()
+    {
+        if (!m_errors.empty())
+        {
+            SettingsError error = m_errors.front();
+            m_errors.pop();
+
+            return AZ::Failure(error);
+        }
+        return AZ::Success();
+    }
+
+    void ProjectSettingsContainer::SavePlatformData(const Platform& plat)
+    {
+        PlistSettings* plistSettings = GetPlistSettingsForPlatform(plat);
+        if (plistSettings != nullptr)
+        {
+            SavePlist(*plistSettings);
+        }
+        else
+        {
+            SaveProjectJsonData();
+        }
+    }
+
+    void ProjectSettingsContainer::SaveProjectJsonData()
+    {
+        // Needed to write a document out to a string
+        rapidjson::StringBuffer jsonDataBuffer;
+        // Use pretty writer so it can be read easier
+        rapidjson::PrettyWriter<rapidjson::StringBuffer> jsonDatawriter(jsonDataBuffer);
+
+        m_projectJson.m_document->Accept(jsonDatawriter);
+        const AZStd::string jsonDataString = jsonDataBuffer.GetString();
+
+        StringOutcome outcome = WriteConfigFile(m_projectJson.m_path, jsonDataString);
+
+        if (!outcome.IsSuccess())
+        {
+            m_errors.push(SettingsError("Failed to save project.json", outcome.GetError()));
+        }
+    }
+
+    void ProjectSettingsContainer::ReloadProjectJsonData()
+    {
+        m_projectJson.m_document.reset(new rapidjson::Document);
+        LoadProjectJsonData();
+    }
+
+    void ProjectSettingsContainer::SavePlistsData()
+    {
+        for (AZStd::pair<PlatformId, PlistSettings>& plist : m_pListsMap)
+        {
+            LoadPlist(plist.second);
+        }
+    }
+
+    void ProjectSettingsContainer::SavePlistData(const Platform& plat)
+    {
+        PlistSettings* settings = GetPlistSettingsForPlatform(plat);
+        if (settings != nullptr)
+        {
+            SavePlist(*settings);
+        }
+    }
+
+    void ProjectSettingsContainer::ReloadPlistData()
+    {
+        for (AZStd::pair<PlatformId, PlistSettings>& plist : m_pListsMap)
+        {
+            PlistSettings& plistSettings = plist.second;
+
+            plistSettings.m_document.reset(new XmlDocument());
+            LoadPlist(plistSettings);
+        }
+    }
+
+    rapidjson::Document& ProjectSettingsContainer::GetProjectJsonDocument()
+    {
+        return *m_projectJson.m_document.get();
+    }
+
+    AZ::Outcome<rapidjson::Value*, void> ProjectSettingsContainer::GetProjectJsonValue(const char* key)
+    {
+        // Try to find member
+        rapidjson::Document& settings = *m_projectJson.m_document;
+        rapidjson::Value::MemberIterator memberIterator = settings.FindMember(key);
+        if (memberIterator != settings.MemberEnd())
+        {
+            return AZ::Success(&memberIterator->value);
+        }
+        else
+        {
+            settings.AddMember(rapidjson::Value(key, settings.GetAllocator()),
+                rapidjson::Value(rapidjson::kNullType), settings.GetAllocator());
+            return AZ::Success(&settings.FindMember(key)->value);
+        }
+    }
+
+    AZStd::unique_ptr<PlistDictionary> ProjectSettingsContainer::GetPlistDictionary(const Platform& plat)
+    {
+        if (plat.m_type == PlatformDataType::Plist)
+        {
+            PlistSettings* settings = GetPlistSettingsForPlatform(plat);
+            if (settings != nullptr)
+            {
+
+                if (PlistDictionary::ContainsValidDict(settings->m_document.get()))
+                {
+                    return AZStd::make_unique<PlistDictionary>(settings->m_document.get());
+                }
+                else
+                {
+                    //TODO: Query user if they would like to remake a valid plist then do it
+                    AZStd::string platformName;
+                    switch (plat.m_id)
+                    {
+                    case PlatformId::Ios:
+                        platformName = "iOS";
+                        break;
+                    default:
+                        platformName = "unknown";
+                        break;
+                    }
+                    AZ_Assert(false, "%s pList is in invalid state.", platformName.c_str());
+                    return nullptr;
+                }
+            }
+        }
+        
+        AZ_Assert(false, "This platform does not use pLists to store data.");
+        return nullptr;
+    }
+
+    rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>& ProjectSettingsContainer::GetProjectJsonAllocator()
+    {
+        return m_projectJson.m_document->GetAllocator();
+    }
+
+    const char* ProjectSettingsContainer::GetFailedLoadingPlistText()
+    {   
+        return "Failed to load info.plist"; 
+    }
+
+    void ProjectSettingsContainer::LoadProjectJsonData()
+    {
+        StringOutcome outcome = ReadConfigFile(m_projectJson.m_path, m_projectJson.m_rawData);
+        if (!outcome.IsSuccess())
+        {
+            m_errors.push(SettingsError("Failed to load project.json", outcome.GetError()));
+        }
+
+        m_projectJson.m_document->Parse(m_projectJson.m_rawData.c_str());
+    }
+
+    // Loads info.plist for iOS from disk
+    void ProjectSettingsContainer::LoadPlist(PlistSettings& plistSettings)
+    {
+        StringOutcome outcome = ReadConfigFile(plistSettings.m_path, plistSettings.m_rawData);
+        if (!outcome.IsSuccess())
+        {
+            m_errors.push(SettingsError(GetFailedLoadingPlistText(), outcome.GetError()));
+        }
+
+        plistSettings.m_document->parse<xmlFlags>(plistSettings.m_rawData.data());
+    }
+
+    void ProjectSettingsContainer::SavePlist(PlistSettings& plistSettings)
+    {
+        // Needed to write a document out to a string
+        AZStd::string xmlDocString;
+        rapidxml::print(std::back_inserter(xmlDocString), *plistSettings.m_document);
+
+        StringOutcome outcome = WriteConfigFile(plistSettings.m_path, xmlDocString);
+
+        if (!outcome.IsSuccess())
+        {
+            m_errors.push(SettingsError("Failed to save info.pList", outcome.GetError()));
+        }
+    }
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h
new file mode 100644
index 0000000000..b994ab1d72
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h
@@ -0,0 +1,113 @@
+/*
+ * 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 "Platforms.h"
+#include "PlistDictionary.h"
+
+#include <AzCore/JSON/document.h>
+#include <AzCore/Outcome/Outcome.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzCore/std/string/string.h>
+
+#include <AzFramework/StringFunc/StringFunc.h>
+
+
+namespace ProjectSettingsTool
+{
+
+    struct SettingsError
+    {
+        SettingsError(const AZStd::string& error, const AZStd::string& reason);
+
+        // The error that occurred
+        AZStd::string m_error;
+        // The reason the error occurred
+        AZStd::string m_reason;
+    };
+
+    // Loads, saves, and provides access to all of the project settings files
+    class ProjectSettingsContainer
+    {
+    public:
+        typedef AZStd::pair<PlatformId, AZStd::string> PlatformAndPath;
+        typedef AZStd::vector<PlatformAndPath> PlistInitVector;
+
+        template<class DocType>
+        struct PlatformSettings
+        {
+            // File path to document
+            AZStd::string m_path;
+            // Raw string loaded from file
+            AZStd::string m_rawData;
+            // The document itself
+            AZStd::unique_ptr<DocType> m_document;
+
+        };
+
+        using JsonSettings = PlatformSettings<rapidjson::Document>;
+        using PlistSettings = PlatformSettings<AZ::rapidxml::xml_document<char>>;
+
+        // Constructs the main manager of a document
+        ProjectSettingsContainer(const AZStd::string& projectJsonFileName, PlistInitVector& plistPaths);
+
+        // Used to destroy valueDoesNotExist
+        ~ProjectSettingsContainer();
+
+        // Returns the PlistSettings for given platform
+        PlistSettings* GetPlistSettingsForPlatform(const Platform& plat);
+        // Returns true if PlistSettings are found for platform
+        bool IsPlistPlatform(const Platform& plat);
+
+        // Gets the earliest error not seen
+        AZ::Outcome<void, SettingsError> GetError();
+        // Save settings for given platform
+        void SavePlatformData(const Platform& plat);
+        // Saves project.json to disk
+        void SaveProjectJsonData();
+        // Reloads Project.json from disk
+        void ReloadProjectJsonData();
+        // Save all pLists back to disk
+        void SavePlistsData();
+        // Save platform's plist data back to disk
+        void SavePlistData(const Platform& plat);
+        // Reloads all plists from disk
+        void ReloadPlistData();
+        // Returns a reference to the project.json Document
+        rapidjson::Document& GetProjectJsonDocument();
+        // Gets reference to value in project.json
+        // returns null type if not found
+        AZ::Outcome<rapidjson::Value*, void> GetProjectJsonValue(const char* key);
+
+        AZStd::unique_ptr<PlistDictionary> GetPlistDictionary(const Platform& plat);
+
+        // Returns the allocator used by ProjectJson
+        rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>& GetProjectJsonAllocator();
+
+        static const char* GetFailedLoadingPlistText();
+
+
+    protected:
+        // Loads project.json from disk
+        void LoadProjectJsonData();
+        // Loads info.plist from filePath into given document
+        void LoadPlist(PlistSettings& plistSettings);
+        void SavePlist(PlistSettings& plistSettings);
+
+        // Errors that have occurred
+        AZStd::queue<SettingsError> m_errors;
+        // The project.json document
+        JsonSettings m_projectJson;
+        // A map to all of the loaded pLists
+        AZStd::unordered_map<PlatformId, PlistSettings> m_pListsMap;
+
+
+    private:
+        AZ_DISABLE_COPY_MOVE(ProjectSettingsContainer);
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp
new file mode 100644
index 0000000000..107d0829ba
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp
@@ -0,0 +1,919 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "ProjectSettingsSerialization.h"
+
+#include "PlatformSettings_common.h"
+
+#include <AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+
+// Needed to overwrite ios icons and launchscreens
+#include <Util/FileUtil.h>
+
+namespace ProjectSettingsTool
+{
+    using XmlNode = AZ::rapidxml::xml_node<char>;
+
+    const char* stringStr = "string";
+    const char* arrayStr = "array";
+    const char* trueStr = "true";
+    const char* noDocumentError = "No json or xml document to use for Project Settings Tool serialization.";
+
+    Serializer::Serializer(AzToolsFramework::InstanceDataNode* root)
+        : m_root(root)
+        , m_jsonDoc(nullptr)
+        , m_jsonRoot(nullptr)
+        , m_idString(AZ::SerializeTypeInfo<AZStd::string>::GetUuid())
+        , m_idInt(AZ::SerializeTypeInfo<int>::GetUuid())
+        , m_idBool(AZ::SerializeTypeInfo<bool>::GetUuid())
+    {}
+
+    Serializer::Serializer(AzToolsFramework::InstanceDataNode* root, rapidjson::Document* doc, rapidjson::Value* jsonRoot)
+        : Serializer(root)
+    {
+        SetDocumentRoot(doc);
+        if (jsonRoot != nullptr)
+        {
+            SetJsonRoot(jsonRoot);
+        }
+        else
+        {
+            SetJsonRoot(doc);
+        }
+    }
+
+    Serializer::Serializer(AzToolsFramework::InstanceDataNode* root, AZStd::unique_ptr<PlistDictionary> dict)
+        : Serializer(root)
+    {
+        SetDocumentRoot(AZStd::move(dict));
+    }
+
+    void Serializer::SetDocumentRoot(rapidjson::Document* doc)
+    {
+        m_jsonDoc = doc;
+    }
+
+    void Serializer::SetJsonRoot(rapidjson::Value* jsonRoot)
+    {
+        m_jsonRoot = jsonRoot;
+    }
+
+    void Serializer::SetDocumentRoot(AZStd::unique_ptr<PlistDictionary> dict)
+    {
+        m_plistDict = AZStd::move(dict);
+    }
+
+    bool Serializer::UiEqualToSettings() const
+    {
+        if (m_jsonRoot != nullptr)
+        {
+            return UiEqualToJson(m_jsonRoot);
+        }
+        else if (m_plistDict)
+        {
+            return UiEqualToPlist(m_root);
+        }
+        else
+        {
+            AZ_Assert(false, noDocumentError);
+            return false;
+        }
+    }
+
+    void Serializer::LoadFromSettings()
+    {
+        if (m_jsonRoot != nullptr)
+        {
+            LoadFromSettings(m_jsonRoot);
+        }
+        else if (m_plistDict)
+        {
+            LoadFromSettings(m_root);
+        }
+        else
+        {
+            AZ_Assert(false, noDocumentError);
+        }
+    }
+
+    void Serializer::SaveToSettings()
+    {
+        if (m_jsonRoot != nullptr)
+        {
+            SaveToSettings(m_jsonRoot);
+        }
+        else if (m_plistDict)
+        {
+            SaveToSettings(m_root);
+        }
+        else
+        {
+            AZ_Assert(false, noDocumentError);
+        }
+    }
+
+    bool Serializer::UiEqualToJson(rapidjson::Value* root) const
+    {
+        return UiEqualToJson(root, m_root);
+    }
+
+    void Serializer::LoadFromSettings(rapidjson::Value* root)
+    {
+        LoadFromSettings(root, m_root);
+    }
+
+    void Serializer::SaveToSettings(rapidjson::Value* root)
+    {
+        // This value needs to be an object to add members
+        if (!root->IsObject())
+        {
+            root->SetObject();
+        }
+        SaveToSettings(root, m_root);
+    }
+
+    bool Serializer::UiEqualToJson(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node) const
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                auto childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    bool noDocElement = true;
+                    rapidjson::Value::MemberIterator jsonMember;
+                    const char* propertyName = childMeta->m_name;
+
+                    // If there is a json object try to find the member
+                    if (root != nullptr)
+                    {
+                        jsonMember = root->FindMember(propertyName);
+
+                        if (jsonMember != root->MemberEnd())
+                        {
+                            noDocElement = false;
+                        }
+                    }
+
+                    AZ::Uuid type = childMeta->m_typeId;
+                    if (m_idString == type)
+                    {
+                        AZStd::string uiValue;
+                        childNode.Read(uiValue);
+
+                        if (!uiValue.empty() && !noDocElement)
+                        {
+                            if (jsonMember->value.IsString())
+                            {
+                                if (uiValue != jsonMember->value.GetString())
+                                {
+                                    return false;
+                                }
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                        else if (uiValue.empty() != noDocElement)
+                        {
+                            return false;
+                        }
+                    }
+                    else if (m_idInt == type)
+                    {
+                        int uiValue;
+                        childNode.Read(uiValue);
+
+                        if (!noDocElement)
+                        {
+                            if (jsonMember->value.IsInt())
+                            {
+                                if (uiValue != jsonMember->value.GetInt())
+                                {
+                                    return false;
+                                }
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                    else if (m_idBool == type)
+                    {
+                        bool uiValue;
+                        childNode.Read(uiValue);
+
+                        if (uiValue)
+                        {
+                            if (!noDocElement)
+                            {
+                                if (jsonMember->value.IsString())
+                                {
+                                    AZStd::string expectedJsonValue = trueStr;
+                                    if (expectedJsonValue != jsonMember->value.GetString())
+                                    {
+                                        return false;
+                                    }
+                                }
+                                else
+                                {
+                                    return false;
+                                }
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                        else if (!noDocElement)
+                        {
+                            return false;
+                        }
+                    }
+                    // Should be a class with members instead of base data type
+                    else
+                    {
+                        rapidjson::Value* jsonNode = nullptr;
+                        if (!noDocElement)
+                        {
+                            jsonNode = &jsonMember->value;
+                        }
+                        // Drill into class
+                        if (!UiEqualToJson(jsonNode, &childNode))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool Serializer::UiEqualToPlist(AzToolsFramework::InstanceDataNode* node) const
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                auto childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    bool noDocElement = true;
+                    const char* propertyName = childMeta->m_name;
+                    XmlNode* plistNode = m_plistDict->GetPropertyValueNode(propertyName);
+
+                    if (plistNode != nullptr)
+                    {
+                        noDocElement = false;
+                    }
+
+                    AZ::Uuid type = childMeta->m_typeId;
+                    if (m_idString == type)
+                    {
+                        AZStd::string uiValue;
+                        childNode.Read(uiValue);
+
+                        if (!uiValue.empty() && !noDocElement)
+                        {
+                            if (AZStd::string(plistNode->name()) == stringStr)
+                            {
+                                if (uiValue != plistNode->value())
+                                {
+                                    return false;
+                                }
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                        else if (uiValue.empty() != noDocElement)
+                        {
+                            return false;
+                        }
+                    }
+                    else if (m_idBool == type)
+                    {
+                        bool uiValue;
+                        childNode.Read(uiValue);
+
+                        if (uiValue)
+                        {
+                            if (!noDocElement)
+                            {
+                                if (AZStd::string(plistNode->name()) != trueStr)
+                                {
+                                    return false;
+                                }
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                        else if (!noDocElement)
+                        {
+                            return false;
+                        }
+                    }
+                    else if (AZStd::string(childNode.GetClassMetadata()->m_name) == "IosOrientations")
+                    {
+                        // Enter even if nullptr to make sure all values should be false
+                        if (plistNode == nullptr || AZStd::string(plistNode->name()) == arrayStr)
+                        {
+                            if (!UiEqualToPlistArray(plistNode, &childNode))
+                            {
+                                return false;
+                            }
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        if (!UiEqualToPlistImages(&childNode))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool Serializer::UiEqualToPlistArray(AZ::rapidxml::xml_node<char>* array, AzToolsFramework::InstanceDataNode* node) const
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                const AZ::SerializeContext::ClassElement* childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    AZ::Uuid type = childMeta->m_typeId;
+                    if (m_idBool == type)
+                    {
+                        const char* propertyName = childMeta->m_name;
+                        bool uiValue;
+                        childNode.Read(uiValue);
+
+                        bool found = false;
+                        if (array != nullptr)
+                        {
+                            for (XmlNode* plistNode = array->first_node(); plistNode != nullptr; plistNode = plistNode->next_sibling())
+                            {
+                                if (AZStd::string(plistNode->value()) == propertyName)
+                                {
+                                    if (!uiValue)
+                                    {
+                                        return false;
+                                    }
+                                    else
+                                    {
+                                        found = true;
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                        if (uiValue && !found)
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool Serializer::UiEqualToPlistImages(AzToolsFramework::InstanceDataNode* node) const
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                auto childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    AZ::Uuid type = childMeta->m_typeId;
+
+                    if (m_idString == type)
+                    {
+                        AZStd::string uiValue;
+                        childNode.Read(uiValue);
+
+                        if (!uiValue.empty())
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    void Serializer::LoadFromSettings(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node)
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                auto childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    const char* propertyName = childMeta->m_name;
+                    AZ::Uuid type = childMeta->m_typeId;
+
+                    if (root != nullptr)
+                    {
+                        rapidjson::Value::MemberIterator jsonMember = root->FindMember(propertyName);
+
+                        if (jsonMember != root->MemberEnd())
+                        {
+                            rapidjson::Value& jsonNode = jsonMember->value;
+
+                            if (m_idString == type)
+                            {
+                                if (jsonNode.IsString())
+                                {
+                                    AZStd::string jsonValue = jsonNode.GetString();
+                                    childNode.Write(jsonValue);
+                                }
+                            }
+                            else if (m_idInt == type)
+                            {
+                                if (jsonNode.IsInt())
+                                {
+                                    int jsonValue = jsonNode.GetInt();
+                                    childNode.Write(jsonValue);
+                                }
+                            }
+                            else if (m_idBool == type)
+                            {
+                                if (jsonNode.IsString())
+                                {
+                                    bool value = false;
+                                    AZStd::string jsonValue = jsonNode.GetString();
+
+                                    if (jsonValue == trueStr)
+                                    {
+                                        value = true;
+                                    }
+                                    childNode.Write(value);
+                                }
+                            }
+                            // Should be a class with members instead of base data type
+                            else
+                            {
+                                if (jsonNode.IsObject())
+                                {
+                                    // Drill into class
+                                    LoadFromSettings(&jsonNode, &childNode);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            SetDefaults(childNode, type);
+                        }
+                    }
+                    else
+                    {
+                        SetDefaults(childNode, type);
+                    }
+                }
+            }
+        }
+    }
+
+    void Serializer::SaveToSettings(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node)
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                auto childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    const char* propertyName = childMeta->m_name;
+                    rapidjson::Value::MemberIterator jsonMember = root->FindMember(propertyName);
+
+                    if (jsonMember == root->MemberEnd())
+                    {
+                        root->AddMember(rapidjson::Value(propertyName, m_jsonDoc->GetAllocator())
+                            , rapidjson::Value(rapidjson::Type::kNullType)
+                            , m_jsonDoc->GetAllocator());
+                        jsonMember = root->FindMember(propertyName);
+                    }
+                    rapidjson::Value& jsonNode = jsonMember->value;
+
+                    AZ::Uuid type = childMeta->m_typeId;
+                    if (m_idString == type)
+                    {
+                        AZStd::string uiValue;
+                        childNode.Read(uiValue);
+
+                        if (!uiValue.empty())
+                        {
+                            jsonNode.SetString(uiValue.data(), m_jsonDoc->GetAllocator());
+                        }
+                        else
+                        {
+                            root->RemoveMember(propertyName);
+                        }
+                    }
+                    else if (m_idInt == type)
+                    {
+                        int uiValue;
+                        childNode.Read(uiValue);
+                        jsonNode.SetInt(uiValue);
+                    }
+                    else if (m_idBool == type)
+                    {
+                        bool uiValue;
+                        childNode.Read(uiValue);
+
+                        if (uiValue)
+                        {
+                            jsonNode.SetString(trueStr, m_jsonDoc->GetAllocator());
+                        }
+                        else
+                        {
+                            root->RemoveMember(propertyName);
+                        }
+                    }
+                    // Should be a class with members instead of base data type
+                    else
+                    {
+                        // This value needs to be an object to add members
+                        if (!jsonNode.IsObject())
+                        {
+                            jsonNode.SetObject();
+                        }
+                        // Drill into class
+                        SaveToSettings(&jsonNode, &childNode);
+
+                        if (jsonNode.ObjectEmpty())
+                        {
+                            root->RemoveMember(propertyName);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    void Serializer::LoadFromSettings(AzToolsFramework::InstanceDataNode* node)
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                const AZ::SerializeContext::ClassElement* childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    const char* propertyName = childMeta->m_name;
+                    XmlNode* plistNode = m_plistDict->GetPropertyValueNode(propertyName);
+                    AZ::Uuid type = childMeta->m_typeId;
+
+                    if (plistNode != nullptr)
+                    {
+                        if (m_idString == type)
+                        {
+                            if (AZStd::string(plistNode->name()) == stringStr)
+                            {
+                                AZStd::string plistValue = plistNode->value();
+                                childNode.Write(plistValue);
+                            }
+                        }
+                        else if (m_idBool == type)
+                        {
+                            if (AZStd::string(plistNode->name()) == trueStr)
+                            {
+                                childNode.Write(true);
+                            }
+                        }
+                        else if (AZStd::string(childNode.GetClassMetadata()->m_name) == "IosOrientations")
+                        {
+                            // Make sure it seems like an array in plist as well
+                            if (AZStd::string(plistNode->name()) == arrayStr)
+                            {
+                                LoadOrientations(plistNode, &childNode);
+                            }
+                        }
+                        else
+                        {
+                            SetClassToDefaults(&childNode);
+                        }
+                    }
+                    else
+                    {
+                        SetDefaults(childNode, type);
+                    }
+                }
+            }
+        }
+    }
+
+    void Serializer::LoadOrientations(XmlNode* array, AzToolsFramework::InstanceDataNode* node)
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                const AZ::SerializeContext::ClassElement* childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    const char* propertyName = childMeta->m_name;
+
+                    bool found = false;
+                    if (array != nullptr)
+                    {
+                        for (XmlNode* plistNode = array->first_node(); plistNode != nullptr; plistNode = plistNode->next_sibling())
+                        {
+                            if (AZStd::string(plistNode->value()) == propertyName)
+                            {
+                                AZ::Uuid type = childMeta->m_typeId;
+
+                                if (m_idBool == type)
+                                {
+                                    if (AZStd::string(plistNode->name()) == stringStr)
+                                    {
+                                        childNode.Write(true);
+                                        found = true;
+                                    }
+                                }
+                                else
+                                {
+                                    AZ_Assert(false, "Unsupported type \"%s\" found in array.", childMeta->m_editData->m_name)
+                                }
+                                break;
+                            }
+                        }
+                    }
+                    if (!found)
+                    {
+                        childNode.Write(false);
+                    }
+                }
+            }
+        }
+    }
+
+    void Serializer::SetClassToDefaults(AzToolsFramework::InstanceDataNode* node)
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                auto childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    AZ::Uuid type = childMeta->m_typeId;
+
+                    SetDefaults(childNode, type);
+                }
+            }
+        }
+    }
+
+    void Serializer::SetDefaults(AzToolsFramework::InstanceDataNode& node, const AZ::Uuid& type)
+    {
+        if (m_idString == type)
+        {
+            node.Write(AZStd::string(""));
+            return;
+        }
+        else if (m_idBool == type)
+        {
+            node.Write(false);
+            return;
+        }
+        else if (m_idInt == type)
+        {
+            node.Write(0);
+            return;
+        }
+
+        if (AZStd::string(node.GetClassMetadata()->m_name) == "IosOrientations")
+        {
+            LoadOrientations(nullptr, &node);
+        }
+        else
+        {
+            SetClassToDefaults(&node);
+        }
+    }
+
+    void Serializer::SaveToSettings(AzToolsFramework::InstanceDataNode* node)
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                auto childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    const char* propertyName = childMeta->m_name;
+
+                    AZ::Uuid type = childMeta->m_typeId;
+
+                    if (m_idString == type)
+                    {
+                        AZStd::string uiValue;
+                        childNode.Read(uiValue);
+
+                        if (!uiValue.empty())
+                        {
+                            m_plistDict->SetPropertyValue(propertyName, uiValue.data());
+                        }
+                        else
+                        {
+                            m_plistDict->RemoveProperty(propertyName);
+                        }
+                    }
+                    else if (m_idBool == type)
+                    {
+                        bool uiValue;
+                        childNode.Read(uiValue);
+
+                        if (uiValue)
+                        {
+                            m_plistDict->SetPropertyValueName(propertyName, trueStr);
+                            m_plistDict->SetPropertyValue(propertyName, "");
+                        }
+                        else
+                        {
+                            m_plistDict->RemoveProperty(propertyName);
+                        }
+                    }
+                    else if (AZStd::string(childNode.GetClassMetadata()->m_name) == "IosOrientations")
+                    {
+                        XmlNode* plistNode = m_plistDict->GetPropertyValueNode(propertyName);
+                        if (plistNode == nullptr)
+                        {
+                            plistNode = m_plistDict->SetPropertyValueName(propertyName, arrayStr);
+                        }
+                        // Make sure the plist says this is an array type
+                        if (AZStd::string(plistNode->name()) == arrayStr)
+                        {
+                            if (!SaveOrientations(plistNode, &childNode))
+                            {
+                                m_plistDict->RemoveProperty(propertyName);
+                            }
+                        }
+                    }
+                    //Assume this is a class with image overrides
+                    else
+                    {
+                        OverwriteImages(&childNode);
+                    }
+                }
+            }
+        }
+    }
+
+    bool Serializer::SaveOrientations(XmlNode* array, AzToolsFramework::InstanceDataNode* node)
+    {
+        bool anyEnabled = false;
+
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                const AZ::SerializeContext::ClassElement* childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    AZ::Uuid type = childMeta->m_typeId;
+                    if (m_idBool == type)
+                    {
+                        const char* propertyName = childMeta->m_name;
+                        bool uiValue;
+                        childNode.Read(uiValue);
+
+                        if (uiValue)
+                        {
+                            anyEnabled = true;
+                        }
+
+                        bool found = false;
+                        for (XmlNode* plistNode = array->first_node(); plistNode != nullptr; plistNode = plistNode->next_sibling())
+                        {
+                            if (AZStd::string(plistNode->value()) == propertyName)
+                            {
+                                if (!uiValue)
+                                {
+                                    array->remove_node(plistNode);
+                                }
+                                else
+                                {
+                                    found = true;
+                                }
+                                break;
+                            }
+                        }
+                        if (uiValue && !found)
+                        {
+                            array->append_node(m_plistDict->MakeNode(stringStr, propertyName));
+                        }
+                    }
+                }
+            }
+        }
+
+        return anyEnabled;
+    }
+
+    void Serializer::OverwriteImages(AzToolsFramework::InstanceDataNode* node)
+    {
+        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
+        if (baseMeta)
+        {
+            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
+            {
+                auto childMeta = childNode.GetElementMetadata();
+                if (childMeta)
+                {
+                    AZ::Uuid type = childMeta->m_typeId;
+
+                    if (m_idString == type)
+                    {
+                        AZStd::string uiValue;
+                        childNode.Read(uiValue);
+
+                        if (!uiValue.empty())
+                        {
+                            AZ::Edit::ElementData* childEditMeta = childMeta->m_editData;
+
+                            if (childEditMeta != nullptr)
+                            {
+                                AZ::AttributeId handlerType = childEditMeta->m_elementId;
+
+                                // Special handling for iOS image overrides, the source images must be overwritten.
+                                if (handlerType == Handlers::ImagePreview)
+                                {
+                                    AZ::Edit::Attribute* defaultPathAttr = childEditMeta->FindAttribute(Attributes::DefaultPath);
+                                    if (defaultPathAttr != nullptr)
+                                    {
+                                        AzToolsFramework::PropertyAttributeReader reader(defaultPathAttr->GetContextData(), defaultPathAttr);
+                                        AZStd::string defaultPath;
+                                        if (reader.Read<AZStd::string>(defaultPath))
+                                        {
+                                            QString defaultPathQString = defaultPath.data();
+                                            CFileUtil::OverwriteFile(defaultPathQString);
+                                            CFileUtil::CopyFile(QString(uiValue.data()), defaultPathQString);
+                                            // Clear the property so this isn't overwritten again for no reason
+                                            childNode.Write(AZStd::string(""));
+                                        }
+                                    }
+                                    else
+                                    {
+                                        AZ_Assert(false, "Could not find default path for \"%s\". Cannot override image.", childMeta->m_name)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        AZ_Assert(false, "Unsupported type \"%s\" found in what should be image overrides.", childMeta->m_editData->m_name);
+                    }
+                }
+            }
+        }
+    }
+}   // ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.h b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.h
new file mode 100644
index 0000000000..91bb9ea902
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.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 "PlistDictionary.h"
+
+#include <AzCore/JSON/document.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+
+namespace AzToolsFramework
+{
+    class InstanceDataNode;
+}
+
+namespace ProjectSettingsTool
+{
+    class Serializer
+    {
+    public:
+        Serializer(AzToolsFramework::InstanceDataNode* root, rapidjson::Document* doc, rapidjson::Value* jsonRoot = nullptr);
+        Serializer(AzToolsFramework::InstanceDataNode* root, AZStd::unique_ptr<PlistDictionary> dict);
+        // Sets Json document
+        void SetDocumentRoot(rapidjson::Document* doc);
+        // Sets Json root
+        void SetJsonRoot(rapidjson::Value* jsonRoot);
+        // Sets pList dictionary
+        void SetDocumentRoot(AZStd::unique_ptr<PlistDictionary> dict);
+        // Returns true if all properties in ui are equal to settings
+        bool UiEqualToSettings() const;
+        // Loads properties into the ui from the settings
+        void LoadFromSettings();
+        // Saves properties from the ui to the settings
+        void SaveToSettings();
+        bool UiEqualToJson(rapidjson::Value* root) const;
+        void LoadFromSettings(rapidjson::Value* root);
+        void SaveToSettings(rapidjson::Value* root);
+
+
+    protected:
+        bool UiEqualToJson(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node) const;
+        bool UiEqualToPlist(AzToolsFramework::InstanceDataNode* node) const;
+        bool UiEqualToPlistArray(AZ::rapidxml::xml_node<char>* array, AzToolsFramework::InstanceDataNode* node) const;
+        bool UiEqualToPlistImages(AzToolsFramework::InstanceDataNode* node) const;
+        void LoadFromSettings(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node);
+        void LoadFromSettings(AzToolsFramework::InstanceDataNode* node);
+        void LoadOrientations(AZ::rapidxml::xml_node<char>* array, AzToolsFramework::InstanceDataNode* node);
+        void SetDefaults(AzToolsFramework::InstanceDataNode& node, const AZ::Uuid& type);
+        void SetClassToDefaults(AzToolsFramework::InstanceDataNode* node);
+        void SaveToSettings(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node);
+        void SaveToSettings(AzToolsFramework::InstanceDataNode* node);
+        bool SaveOrientations(AZ::rapidxml::xml_node<char>* array, AzToolsFramework::InstanceDataNode* node);
+        void OverwriteImages(AzToolsFramework::InstanceDataNode* node);
+
+        // The RPE root relative to the document's root
+        AzToolsFramework::InstanceDataNode* m_root;
+        // The Json document if using Json for this RPE
+        rapidjson::Document* m_jsonDoc;
+        // The root of the json for this serializer
+        rapidjson::Value* m_jsonRoot;
+        // The pList Dictionary wrapper if using a pList for this RPE
+        AZStd::unique_ptr<PlistDictionary> m_plistDict;
+
+    private:
+        Serializer(AzToolsFramework::InstanceDataNode* root);
+
+        // Uuid for AZStd::string
+        const AZ::Uuid m_idString;
+        // Uuid for int
+        const AZ::Uuid m_idInt;
+        // Uuid for bool
+        const AZ::Uuid m_idBool;
+    };
+}   // ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsTool.qrc b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool.qrc
similarity index 100%
rename from Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsTool.qrc
rename to Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool.qrc
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsToolWidget.ui b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWidget.ui
similarity index 100%
rename from Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsToolWidget.ui
rename to Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWidget.ui
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
new file mode 100644
index 0000000000..f1a2aafd1e
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
@@ -0,0 +1,700 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "ProjectSettingsToolWindow.h"
+#include "ui_ProjectSettingsToolWidget.h"
+
+#include "DefaultImageValidator.h"
+#include "PlatformSettings.h"
+#include "ProjectSettingsContainer.h"
+#include "ProjectSettingsValidator.h"
+#include "PropertyImagePreview.h"
+#include "PropertyFileSelect.h"
+#include "PropertyLinked.h"
+#include "Utils.h"
+#include "ValidationHandler.h"
+
+#include <AzCore/Component/ComponentApplicationBus.h>
+
+#include "AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h"
+#include <AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h>
+#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <Util/FileUtil.h>
+
+#include <QMessageBox>
+#include <QCloseEvent>
+#include <QScrollBar>
+#include <QTimer>
+
+// The object name in json for android
+const static char* androidSettings = "android_settings";
+static bool g_serializeRegistered = false;
+
+namespace ProjectSettingsTool
+{
+    using XmlNode = AZ::rapidxml::xml_node<char>;
+
+    ProjectSettingsToolWindow::ProjectSettingsToolWindow(QWidget* parent)
+        : QWidget(parent)
+        , LastPathBus::Handler()
+        , m_ui(new Ui::ProjectSettingsToolWidget())
+        , m_reconfigureProcess()
+        , m_devRoot(GetDevRoot())
+        , m_projectRoot(GetProjectRoot())
+        , m_projectName(GetProjectName())
+        , m_plistsInitVector(
+            PlatformEnabled(PlatformId::Ios) ?
+            ProjectSettingsContainer::PlistInitVector({
+                ProjectSettingsContainer::PlatformAndPath
+                { PlatformId::Ios, m_projectRoot + PlatformResourcesFolder(PlatformId::Ios) }
+                })
+            :
+                ProjectSettingsContainer::PlistInitVector())
+        , m_settingsContainer(AZStd::make_unique<ProjectSettingsContainer>(m_projectRoot + "/project.json", m_plistsInitVector))
+        , m_validator(AZStd::make_unique<Validator>())
+        , m_platformProperties()
+        , m_platformPropertyEditors()
+        , m_propertyHandlers()
+        , m_validationHandler(AZStd::make_unique<ValidationHandler>())
+        , m_linkHandler(nullptr)
+        // The default path to select images at
+        , m_lastImagesPath(QStringLiteral("%1Code%2/Resources")
+            .arg(m_projectRoot.c_str()
+            , m_projectName.c_str()))
+        , m_invalidState(false)
+    {
+        // Shows any and all errors that occurred during serialization with option to quit out on each one.
+        ShowAllErrorsThenExitIfInvalid();
+
+        if (!g_serializeRegistered)
+        {
+            ReflectPlatformClasses();
+            g_serializeRegistered = true;
+        }
+
+        InitializeUi();
+        RegisterHandlersAndBusses();
+        AddAllPlatformsToUi();
+        MakeSerializers();
+        if (m_invalidState)
+        {
+            // Exit for safety
+            return;
+        }
+
+        LoadPropertiesFromSettings();
+        m_linkHandler->LinkAllProperties();
+
+        // Hide the iOS tab if that platform is not enabled.
+        if (!PlatformEnabled(PlatformId::Ios))
+        {
+            m_ui->platformTabs->removeTab(m_ui->platformTabs->indexOf(m_ui->iosTab));
+        }
+    }
+
+    ProjectSettingsToolWindow::~ProjectSettingsToolWindow()
+    {
+        UnregisterHandlersAndBusses();
+    }
+
+    QString ProjectSettingsToolWindow::GetLastImagePath()
+    {
+        return m_lastImagesPath;
+    }
+
+    void ProjectSettingsToolWindow::SetLastImagePath(const QString& path)
+    {
+        m_lastImagesPath = path;
+    }
+
+    FunctorValidator* ProjectSettingsToolWindow::GetValidator(FunctorValidator::FunctorType functor)
+    {
+        return m_validator->GetQValidator(functor);
+    }
+
+    void ProjectSettingsToolWindow::TrackValidator(FunctorValidator* validator)
+    {
+        m_validator->TrackThisValidator(validator);
+    }
+
+    void ProjectSettingsToolWindow::ReflectPlatformClasses()
+    {
+        AZ::SerializeContext* context = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        BaseSettings::Reflect(context);
+        AndroidSettings::Reflect(context);
+        IosSettings::Reflect(context);
+    }
+
+    void ProjectSettingsToolWindow::RegisterHandlersAndBusses()
+    {
+        m_propertyHandlers.push_back(PropertyFuncValLineEditHandler::Register(m_validationHandler.get()));
+        m_propertyHandlers.push_back(PropertyFuncValBrowseEditHandler::Register(m_validationHandler.get()));
+        m_propertyHandlers.push_back(PropertyFileSelectHandler::Register(m_validationHandler.get()));
+        m_propertyHandlers.push_back(PropertyImagePreviewHandler::Register(m_validationHandler.get()));
+        m_linkHandler = PropertyLinkedHandler::Register(m_validationHandler.get());
+        m_propertyHandlers.push_back(m_linkHandler);
+        LastPathBus::Handler::BusConnect();
+        ValidatorBus::Handler::BusConnect();
+    }
+
+    void ProjectSettingsToolWindow::UnregisterHandlersAndBusses()
+    {
+        ValidatorBus::Handler::BusDisconnect();
+        LastPathBus::Handler::BusDisconnect();
+
+        for (AzToolsFramework::PropertyHandlerBase* handler : m_propertyHandlers)
+        {
+            AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::UnregisterPropertyType,
+                handler);
+            delete handler;
+        }
+    }
+
+    void ProjectSettingsToolWindow::MakeSerializerJson(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, rapidjson::Document* doc)
+    {
+        m_platformSerializers[static_cast<unsigned>(plat.m_id)] = AZStd::make_unique<Serializer>(hierarchy.GetRoot(), doc);
+    }
+
+    void ProjectSettingsToolWindow::MakeSerializerJsonNonRoot(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, rapidjson::Document* doc, rapidjson::Value* jsonRoot)
+    {
+        m_platformSerializers[static_cast<unsigned>(plat.m_id)] = AZStd::make_unique<Serializer>(hierarchy.GetRoot(), doc, jsonRoot);
+    }
+
+    void ProjectSettingsToolWindow::MakeSerializerPlist(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, PlistDictionary* dict)
+    {
+        m_platformSerializers[static_cast<unsigned>(plat.m_id)] = AZStd::make_unique<Serializer>(hierarchy.GetRoot(), AZStd::unique_ptr<PlistDictionary>(dict));
+    }
+
+    void ProjectSettingsToolWindow::closeEvent(QCloseEvent* event)
+    {
+        if (!m_invalidState)
+        {
+            // Check if ui is loaded
+            if (m_ui->saveButton != nullptr)
+            {
+                // Save button is used as an inverse bool to tell if configure is being run or settings are being saved
+                if (m_ui->saveButton->isEnabled())
+                {
+                    if (!UiEqualToSettings())
+                    {
+                        int result = QMessageBox::question
+                        (
+                            this,
+                            tr("Warning"),
+                            tr("There are currently unsaved changes. Are you sure you want to cancel?"),
+                            QMessageBox::Yes,
+                            QMessageBox::No
+                        );
+
+
+                        if (QMessageBox::Yes == result)
+                        {
+                            QWidget::closeEvent(event);
+                        }
+                        else
+                        {
+                            event->setAccepted(false);
+                        }
+                    }
+                    else
+                    {
+                        QWidget::closeEvent(event);
+                    }
+                }
+                else
+                {
+                    QMessageBox::information
+                    (
+                        this,
+                        tr("Info"),
+                        tr("Cannot close until settings have been reconfigured."),
+                        QMessageBox::Ok
+                    );
+
+                    event->setAccepted(false);
+                }
+            }
+            else
+            {
+                QWidget::closeEvent(event);
+            }
+        }
+        else
+        {
+            QWidget::closeEvent(event);
+        }
+    }
+
+    void ProjectSettingsToolWindow::ForceClose()
+    {
+        m_invalidState = true;
+        // Potentially called from the constructor, when the widget/window aren't properly set up, so delay this until after it's all setup
+        QTimer::singleShot(0, this, [this]() {window()->close();} );
+    }
+
+    bool ProjectSettingsToolWindow::IfErrorShowThenExit()
+    {
+        // Grabs the earliest unseen error popping it off the error queue
+        AZ::Outcome<void, SettingsError> error = m_settingsContainer->GetError();
+        if (!error.IsSuccess())
+        {
+            bool shouldAbort = error.GetError().m_error == m_settingsContainer->GetFailedLoadingPlistText();
+            QMessageBox::StandardButton result = QMessageBox::critical
+            (
+                this,
+                error.GetError().m_error.c_str(),
+                error.GetError().m_reason.c_str(),
+                shouldAbort ? QMessageBox::Abort : QMessageBox::StandardButtons(QMessageBox::Ok | QMessageBox::Abort),
+                shouldAbort ? QMessageBox::Abort : QMessageBox::Ok
+            );
+            if (result == QMessageBox::Abort)
+            {
+                ForceClose();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    void ProjectSettingsToolWindow::ShowAllErrorsThenExitIfInvalid()
+    {
+        while (IfErrorShowThenExit())
+        {
+            if (m_invalidState)
+            {
+                // Exit for safety
+                return;
+            }
+        }
+    }
+
+    void ProjectSettingsToolWindow::InitializeUi()
+    {
+        // setup
+        m_ui->setupUi(this);
+
+        AzQtComponents::TabWidget::applySecondaryStyle(m_ui->platformTabs, false);
+
+        ResizeTabs(m_ui->platformTabs->currentIndex());
+
+        m_ui->reconfigureLog->hide();
+
+        // connects
+        connect
+        (
+            &m_reconfigureProcess,
+            static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+            this,
+            [this]()
+            {
+                m_ui->saveButton->setEnabled(true);
+                m_ui->reloadButton->setEnabled(true);
+                m_ui->reconfigureLog->insertPlainText(tr("\n Reconfiguration Finished"));
+                QScrollBar* scrollbar = m_ui->reconfigureLog->verticalScrollBar();
+                scrollbar->setValue(scrollbar->maximum());
+            }
+        );
+
+        connect(&m_reconfigureProcess, &QProcess::readyReadStandardOutput, this,
+            [this]()
+            {
+                m_ui->reconfigureLog->insertPlainText(m_reconfigureProcess.readAllStandardOutput());
+                if (!m_ui->reconfigureLog->textCursor().hasSelection())
+                {
+                    QScrollBar* scrollbar = m_ui->reconfigureLog->verticalScrollBar();
+                    scrollbar->setValue(scrollbar->maximum());
+                }
+            });
+        connect(&m_reconfigureProcess, &QProcess::readyReadStandardError, this,
+            [this]()
+            {
+                m_ui->reconfigureLog->insertPlainText(m_reconfigureProcess.readAllStandardError());
+                if (!m_ui->reconfigureLog->textCursor().hasSelection())
+                {
+                    QScrollBar* scrollbar = m_ui->reconfigureLog->verticalScrollBar();
+                    scrollbar->setValue(scrollbar->maximum());
+                }
+            });
+
+        connect(m_ui->platformTabs, &QTabWidget::currentChanged,
+            this, &ProjectSettingsToolWindow::ResizeTabs);
+
+        connect(m_ui->saveButton, &QPushButton::clicked, this,
+            &ProjectSettingsToolWindow::SaveSettingsFromUi);
+        connect(m_ui->reloadButton, &QPushButton::clicked, this,
+            &ProjectSettingsToolWindow::ReloadUiFromSettings);
+    }
+
+    void ProjectSettingsToolWindow::ResizeTabs(int index)
+    {
+        for (int i = 0; i < m_ui->platformTabs->count(); i++)
+        {
+            if (i != index)
+            {
+                m_ui->platformTabs->widget(i)->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+            }
+        }
+
+        // resize for current tab
+        m_ui->platformTabs->widget(index)->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        m_ui->platformTabs->widget(index)->resize(m_ui->platformTabs->widget(index)->minimumSizeHint());
+        m_ui->platformTabs->widget(index)->adjustSize();
+    }
+
+    void ProjectSettingsToolWindow::AddAllPlatformsToUi()
+    {
+        for (int plat = 0; plat < static_cast<unsigned long long>(PlatformId::NumPlatformIds); ++plat)
+        {
+            AddPlatformToUi(Platforms[plat]);
+        }
+    }
+
+    void ProjectSettingsToolWindow::AddPlatformToUi(const Platform& plat)
+    {
+        AZ::SerializeContext* context = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        QWidget* parent = nullptr;
+        void* dataForPropertyEditor = nullptr;
+        AZ::TypeId dataTypeID;
+        switch (plat.m_id)
+        {
+        case PlatformId::Base:
+            parent = m_ui->baseSettingsGroupBox;
+            dataForPropertyEditor = &m_platformProperties.base;
+            dataTypeID = m_platformProperties.base.TYPEINFO_Uuid();
+            break;
+        case PlatformId::Android:
+            parent = m_ui->androidTab;
+            dataForPropertyEditor = &m_platformProperties.android;
+            dataTypeID = m_platformProperties.android.TYPEINFO_Uuid();
+            break;
+        case PlatformId::Ios:
+            parent = m_ui->iosTab;
+            dataForPropertyEditor = &m_platformProperties.ios;
+            dataTypeID = m_platformProperties.ios.TYPEINFO_Uuid();
+            break;
+        default:
+            AZ_Assert(false, "Cannot add unknown platform to ui.");
+        }
+
+        unsigned platIdValue = static_cast<unsigned>(plat.m_id);
+
+        m_platformPropertyEditors[platIdValue] = aznew AzToolsFramework::ReflectedPropertyEditor(parent);
+        parent->layout()->addWidget(m_platformPropertyEditors[platIdValue]);
+
+        m_platformPropertyEditors[platIdValue]->Setup(context, nullptr, false);
+        m_platformPropertyEditors[platIdValue]->AddInstance(dataForPropertyEditor, dataTypeID);
+        m_platformPropertyEditors[platIdValue]->setVisible(true);
+        m_platformPropertyEditors[platIdValue]->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        m_platformPropertyEditors[platIdValue]->SetHideRootProperties(false);
+        m_platformPropertyEditors[platIdValue]->SetDynamicEditDataProvider(nullptr);
+        m_platformPropertyEditors[platIdValue]->ExpandAll();
+        m_platformPropertyEditors[platIdValue]->InvalidateAll();
+    }
+
+    const char* GetPlatformKey(const Platform& plat)
+    {
+        switch (plat.m_id)
+        {
+        case PlatformId::Android:
+            return androidSettings;
+        default:
+            return "";
+        }
+    }
+
+    void ProjectSettingsToolWindow::MakeSerializers()
+    {
+        for (int plat = 0; plat < static_cast<unsigned long long>(PlatformId::NumPlatformIds); ++plat)
+        {
+            if (PlatformEnabled(static_cast<PlatformId>(plat)))
+            {
+                MakePlatformSerializer(Platforms[plat]);
+            }
+        }
+    }
+
+    void ProjectSettingsToolWindow::MakePlatformSerializer(const Platform& plat)
+    {
+        unsigned platIdValue = static_cast<unsigned>(plat.m_id);
+
+        switch (plat.m_id)
+        {
+        case PlatformId::Base:
+            m_platformPropertyEditors[platIdValue]->EnumerateInstances(AZStd::bind
+                (
+                    &ProjectSettingsToolWindow::MakeSerializerJson,
+                    this,
+                    plat,
+                    AZStd::placeholders::_1,
+                    &m_settingsContainer->GetProjectJsonDocument()
+                ));
+            break;
+        case PlatformId::Android:
+            m_platformPropertyEditors[platIdValue]->EnumerateInstances(AZStd::bind
+                (
+                    &ProjectSettingsToolWindow::MakeSerializerJsonNonRoot,
+                    this,
+                    plat,
+                    AZStd::placeholders::_1,
+                    &m_settingsContainer->GetProjectJsonDocument(),
+                    m_settingsContainer->GetProjectJsonValue(GetPlatformKey(plat)).GetValue()
+                ));
+            break;
+        case PlatformId::Ios:
+        {
+            PlistDictionary* dict = m_settingsContainer->GetPlistDictionary(plat).release();
+            if (dict == nullptr)
+            {
+                QMessageBox::critical
+                (
+                    this,
+                    "Critical",
+                    "Ios pList is invalid. Project Settings Tool must close.",
+                    QMessageBox::Abort
+                );
+                ForceClose();
+            }
+
+            m_platformPropertyEditors[platIdValue]->EnumerateInstances(AZStd::bind
+            (
+                &ProjectSettingsToolWindow::MakeSerializerPlist,
+                this,
+                plat,
+                AZStd::placeholders::_1,
+                // All arguments must be copy constructible so this must be released
+                dict
+            ));
+            break;
+        }
+        default:
+            AZ_Assert(false, "Cannot make serializer for unknown platform.");
+            break;
+        }
+    }
+
+    void ProjectSettingsToolWindow::LoadPropertiesFromSettings()
+    {
+        // Disable all fields links
+
+        for (int plat = 0; plat < static_cast<unsigned long long>(PlatformId::NumPlatformIds); ++plat)
+        {
+            if (PlatformEnabled(static_cast<PlatformId>(plat)))
+            {
+                LoadPropertiesFromPlatformSettings(Platforms[plat]);
+            }
+        }
+    }
+
+    void ProjectSettingsToolWindow::LoadPropertiesFromPlatformSettings(const Platform& plat)
+    {
+        unsigned platIdValue = static_cast<unsigned>(plat.m_id);
+        m_platformSerializers[platIdValue]->LoadFromSettings();
+        m_platformPropertyEditors[platIdValue]->InvalidateValues();
+    }
+
+    bool ProjectSettingsToolWindow::UiEqualToSettings()
+    {
+        for (int plat = 0; plat < static_cast<unsigned long long>(PlatformId::NumPlatformIds); ++plat)
+        {
+            if (PlatformEnabled(static_cast<PlatformId>(plat)))
+            {
+                if (!UiEqualToPlatformSettings(Platforms[plat]))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool ProjectSettingsToolWindow::UiEqualToPlatformSettings(const Platform& plat)
+    {
+        return m_platformSerializers[static_cast<unsigned>(plat.m_id)]->UiEqualToSettings();
+    }
+
+    bool ProjectSettingsToolWindow::ValidateAllProperties()
+    {
+        return m_validationHandler->AllValid();
+    }
+
+    void ProjectSettingsToolWindow::SaveSettingsFromUi()
+    {
+        bool anySaves = false;
+        const unsigned long long numPlatforms = static_cast<unsigned long long>(PlatformId::NumPlatformIds);
+        bool needToSavePlat[numPlatforms] = {false};
+
+        for (int plat = 0; plat < numPlatforms; ++plat)
+        {
+            if (PlatformEnabled(static_cast<PlatformId>(plat)))
+            {
+                const Platform& platform = Platforms[plat];
+                if (!UiEqualToPlatformSettings(platform))
+                {
+                    needToSavePlat[plat] = true;
+                    anySaves = true;
+                }
+            }
+        }
+
+        if (anySaves)
+        {
+            // Keeps queued button presses from getting in
+            if (m_ui->saveButton->isEnabled())
+            {
+                m_ui->saveButton->setEnabled(false);
+                m_ui->reloadButton->setEnabled(false);
+
+                if (ValidateAllProperties())
+                {
+                    bool projectJsonChanged = false;
+
+                    for (int plat = 0; plat < numPlatforms; ++plat)
+                    {
+                        const Platform& platform = Platforms[plat];
+
+                        if (needToSavePlat[plat])
+                        {
+                            m_platformSerializers[plat]->SaveToSettings();
+                            if (m_settingsContainer->IsPlistPlatform(platform))
+                            {
+                                m_settingsContainer->SavePlistData(platform);
+                            }
+                            else
+                            {
+                                projectJsonChanged = true;
+                            }
+                        }
+                    }
+                    if (projectJsonChanged)
+                    {
+                        m_settingsContainer->SaveProjectJsonData();
+                    }
+
+                    ShowAllErrorsThenExitIfInvalid();
+
+                    m_ui->reconfigureLog->setText("");
+                    int result = QMessageBox::question
+                        (
+                        this,
+                        tr("Reconfigure Project"),
+                        tr("For new settings to be applied the project must be reconfigured. Would you like run configure now?"),
+                        QMessageBox::Yes,
+                        QMessageBox::No
+                        );
+
+                    if (QMessageBox::Yes == result)
+                    {
+                        m_ui->reconfigureLog->show();
+                    #if defined(AZ_PLATFORM_WINDOWS)
+                        m_reconfigureProcess.start("cmd.exe", { QString("/C %1").arg("lmbr_waf.bat configure") });
+                    #elif defined(AZ_PLATFORM_MAC) || defined(AZ_PLATFORM_LINUX)
+                        m_reconfigureProcess.start("/bin/sh", { QString("%1").arg("lmbr_waf.sh configure") });
+                    #else
+                        #error "Needs to be implemented"
+                    #endif
+                    }
+                    else
+                    {
+                        m_ui->reloadButton->setEnabled(true);
+                        m_ui->saveButton->setEnabled(true);
+                    }
+                }
+                // Show a message box telling user settings failed to save
+                else
+                {
+                    QMessageBox::critical(this, tr("Failed To Save"), tr("Failed to save due to invalid settings."));
+                    m_ui->reloadButton->setEnabled(true);
+                    m_ui->saveButton->setEnabled(true);
+                }
+            }
+        }
+    }
+
+    void ProjectSettingsToolWindow::SaveSettingsFromPlatformUi(const Platform& plat)
+    {
+        m_platformSerializers[static_cast<unsigned>(plat.m_id)]->SaveToSettings();
+        m_settingsContainer->SavePlatformData(plat);
+        ShowAllErrorsThenExitIfInvalid();
+    }
+
+    void ProjectSettingsToolWindow::ReloadUiFromSettings()
+    {
+        if (!UiEqualToSettings())
+        {
+            int result = QMessageBox::warning
+                (
+                this,
+                tr("Reload Settings"),
+                tr("Are you sure you would like to reload settings from file? All changes will be lost."),
+                QMessageBox::Reset,
+                QMessageBox::Cancel);
+
+            if (result == QMessageBox::Reset)
+            {
+                m_settingsContainer->ReloadProjectJsonData();
+                m_settingsContainer->ReloadPlistData();
+                MakeSerializers();
+
+                // Disable links to avoid overwriting values while loading
+                m_linkHandler->DisableAllPropertyLinks();
+                LoadPropertiesFromSettings();
+
+                // Re-enable them then mirror
+                m_linkHandler->EnableAllPropertyLinks();
+                m_linkHandler->EnableOptionalLinksIfAllPropertiesEqual();
+                m_linkHandler->MirrorAllLinkedProperties();
+
+                // Mark any invalid fields loaded from file
+                ValidateAllProperties();
+            }
+        }
+    }
+
+    bool ProjectSettingsToolWindow::PlatformEnabled(PlatformId platformId)
+    {
+        // iOS can be disabled if the plist file is missing
+        if (platformId == PlatformId::Ios)
+        {
+            const AZStd::string filename = m_projectRoot + PlatformResourcesFolder(platformId);
+            return CFileUtil::FileExists(filename.c_str());
+        }
+
+        return true;
+    }
+
+    const char* ProjectSettingsToolWindow::PlatformResourcesFolder(PlatformId platformId)
+    {
+        if (platformId == PlatformId::Ios)
+        {
+            const AZStd::string firstfilename = m_projectRoot + "/Gem/Resources/Platform/iOS/Info.plist";
+            if (CFileUtil::FileExists(firstfilename.c_str()))
+            {
+                return "/Gem/Resources/Platform/iOS/Info.plist";
+            }
+            else
+            {
+                const AZStd::string filename = m_projectRoot + "/Gem/Resources/IOSLauncher/Info.plist";
+                if (CFileUtil::FileExists(filename.c_str()))
+                {
+                    return "/Gem/Resources/IOSLauncher/Info.plist";
+                }
+            }
+        }
+
+        return nullptr;
+    }
+
+#include <moc_ProjectSettingsToolWindow.cpp>
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h
new file mode 100644
index 0000000000..8979672f99
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h
@@ -0,0 +1,174 @@
+/*
+ * 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 "LastPathBus.h"
+#include "Platforms.h"
+#include "PlatformSettings.h"
+#include "ProjectSettingsContainer.h"
+#include "ProjectSettingsSerialization.h"
+#include "ValidatorBus.h"
+
+#include <QProcess>
+#include <QScopedPointer>
+#include <QWidget>
+#endif
+
+// Forward Declares
+namespace Ui
+{
+    class ProjectSettingsToolWidget;
+}
+
+namespace AzToolsFramework
+{
+    class InstanceDataHierarchy;
+    class PropertyHandlerBase;
+    class ReflectedPropertyEditor;
+}
+
+namespace ProjectSettingsTool
+{
+    //Forward Declares
+    class Validator;
+    class ValidationHandler;
+    class PropertyLinkedHandler;
+
+    struct Properties
+    {
+        BaseSettings base;
+        AndroidSettings android;
+        IosSettings ios;
+    };
+
+    // Main window for Project Settings tool
+    class ProjectSettingsToolWindow
+        : public QWidget
+        , public LastPathBus::Handler
+        , public ValidatorBus::Handler
+
+    {
+        Q_OBJECT
+    public:
+        static const GUID& GetClassID()
+        {
+            // {0DC1B7D9-B660-41C3-91F1-A643EE65AADF}
+            static const GUID guid = {
+                0x0dc1b7d9, 0xb660, 0x41c3, { 0x91, 0xf1, 0xa6, 0x43, 0xee, 0x65, 0xaa, 0xdf }
+            };
+            return guid;
+        }
+
+        ProjectSettingsToolWindow(QWidget* parent = nullptr);
+        ~ProjectSettingsToolWindow();
+
+        // Ebuses
+        QString GetLastImagePath() override;
+        void SetLastImagePath(const QString& path) override;
+
+        FunctorValidator* GetValidator(FunctorValidator::FunctorType) override;
+        void TrackValidator(FunctorValidator*) override;
+
+        static void ReflectPlatformClasses();
+
+    private:
+        AZ_DISABLE_COPY_MOVE(ProjectSettingsToolWindow);
+
+        void closeEvent(QCloseEvent* event) override;
+        // Close the window now because an error occurred
+        void ForceClose();
+
+        // Un/Registers and dis/connect handlers and buses
+        void RegisterHandlersAndBusses();
+        void UnregisterHandlersAndBusses();
+
+        void InitializeUi();
+
+        // Used to make the serializers for settings
+        void MakeSerializerJson(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, rapidjson::Document* doc);
+        void MakeSerializerJsonNonRoot(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, rapidjson::Document* doc, rapidjson::Value* jsonRoot);
+        void MakeSerializerPlist(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, PlistDictionary* dict);
+
+        // Shows an error dialog if an error has occurred while loading settings then exits if users chooses
+        // Returns true if there was an error
+        bool IfErrorShowThenExit();
+        // Loop through all errors then exit if the user chooses to abort or window is in invalid state
+        void ShowAllErrorsThenExitIfInvalid();
+
+        // Resizes TabWidget to size of current tab instead of largest tab
+        void ResizeTabs(int index);
+
+        // Add all platforms into the ui
+        void AddAllPlatformsToUi();
+        // Add given platform into the ui
+        void AddPlatformToUi(const Platform& plat);
+        // Makes all serializers
+        void MakeSerializers();
+        // Makes the serializer for specified platform
+        void MakePlatformSerializer(const Platform& plat);
+
+        // Replace values in ui with those read from settings
+        void LoadPropertiesFromSettings();
+        // Load properties for specified platform from file
+        void LoadPropertiesFromPlatformSettings(const Platform& plat);
+
+        // Checks if ui is the same as all settings
+        bool UiEqualToSettings();
+        // Checks if platform is the same as settings
+        bool UiEqualToPlatformSettings(const Platform& plat);
+
+        // Checks if all properties are valid, if any are not returns false, also sets warnings on those properties
+        bool ValidateAllProperties();
+
+        // Replace values in settings with those from ui and save to file
+        void SaveSettingsFromUi();
+        // Saves all properties for specified platform from to file
+        void SaveSettingsFromPlatformUi(const Platform& plat);
+
+        // Reload settings files and replace the values in ui with them
+        void ReloadUiFromSettings();
+
+        // returns true if the platform is enabled
+        bool PlatformEnabled(PlatformId platformId);
+
+        // returns the resource folder
+        const char* PlatformResourcesFolder(PlatformId platformId);
+
+        // The ui for the window
+        QScopedPointer<Ui::ProjectSettingsToolWidget> m_ui;
+
+        // The process used to reconfigure settings
+        QProcess m_reconfigureProcess;
+
+        AZStd::string m_devRoot;
+        AZStd::string m_projectRoot;
+        AZStd::string m_projectName;
+
+        // Used to initialize the settings container's pLists
+        ProjectSettingsContainer::PlistInitVector m_plistsInitVector;
+
+        // Container to manage settings files per platform
+        AZStd::unique_ptr<ProjectSettingsContainer> m_settingsContainer;
+        // Allows lookup and contains all allocated QValidators
+        AZStd::unique_ptr<Validator> m_validator;
+
+        Properties m_platformProperties;
+        AzToolsFramework::ReflectedPropertyEditor* m_platformPropertyEditors[static_cast<unsigned>(PlatformId::NumPlatformIds)];
+        AZStd::unique_ptr<Serializer> m_platformSerializers[static_cast<unsigned>(PlatformId::NumPlatformIds)];
+
+        // Pointers to all handlers to they can be unregistered and deleted
+        AZStd::vector<AzToolsFramework::PropertyHandlerBase*> m_propertyHandlers;
+        AZStd::unique_ptr<ValidationHandler> m_validationHandler;
+        PropertyLinkedHandler* m_linkHandler;
+
+        // Last path used when browsing for images in icons or splash
+        QString m_lastImagesPath;
+        bool m_invalidState;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
new file mode 100644
index 0000000000..49b28d9834
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
@@ -0,0 +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
+
+#include <AzCore/PlatformDef.h>
+
+/////////////////////////////////////////////////////////////////////////////
+// Engine
+/////////////////////////////////////////////////////////////////////////////
+#include <ISystem.h>
+#include <Cry_Math.h>
+
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp
new file mode 100644
index 0000000000..a38ae10faf
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.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 "ProjectSettingsTool_precompiled.h"
+#include "ProjectSettingsValidator.h"
+
+#include "Validators.h"
+
+namespace ProjectSettingsTool
+{
+    Validator::Validator()
+    {}
+
+    Validator::~Validator()
+    {
+        for (AZStd::pair<FunctorValidator::FunctorType, FunctorValidator*>& pair : m_validatorToQValidator)
+        {
+            delete pair.second;
+        }
+        for (FunctorValidator* qValidator : m_otherValidators)
+        {
+            delete qValidator;
+        }
+    }
+
+    FunctorValidator* Validator::GetQValidator(FunctorValidator::FunctorType validator)
+    {
+        if (validator != nullptr)
+        {
+            auto iter = m_validatorToQValidator.find(validator);
+
+            if (iter != m_validatorToQValidator.end())
+            {
+                return iter->second;
+            }
+            else
+            {
+                FunctorValidator* qValidator = new FunctorValidator(validator);
+                m_validatorToQValidator.insert(
+                    AZStd::pair<FunctorValidator::FunctorType, FunctorValidator*>(validator, qValidator));
+
+                return qValidator;
+            }
+        }
+        else
+        {
+            return nullptr;
+        }
+    }
+
+    void Validator::TrackThisValidator(FunctorValidator* validator)
+    {
+        m_otherValidators.push_back(validator);
+    }
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.h b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.h
new file mode 100644
index 0000000000..9dc65ef6fd
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.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 "FunctorValidator.h"
+
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/unordered_map.h>
+
+
+namespace ProjectSettingsTool
+{
+    class Validator
+    {
+    public:
+        typedef FunctorValidator::ReturnType ValidatorReturnType;
+        typedef FunctorValidator::FunctorType ValidatorType;
+
+        Validator();
+        ~Validator();
+
+        // Finds the QValidator for a given validator or makes one and returns it
+        FunctorValidator* GetQValidator(FunctorValidator::FunctorType validator);
+        // Tracks this QValidator and deletes it in the destructor
+        void TrackThisValidator(FunctorValidator* validator);
+
+    private:
+        typedef AZStd::unordered_map<FunctorValidator::FunctorType, FunctorValidator*> ValidatorToQValidatorType;
+        typedef AZStd::list<FunctorValidator*> QValidatorList;
+
+        AZ_DISABLE_COPY_MOVE(Validator);
+
+        // Maps validator functions to QValidators
+        ValidatorToQValidatorType m_validatorToQValidator;
+        // Tracks allocations of other QValidators so they don't leak
+        QValidatorList m_otherValidators;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp
new file mode 100644
index 0000000000..725ae718b6
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp
@@ -0,0 +1,109 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "PropertyFileSelect.h"
+
+#include "PlatformSettings_common.h"
+#include "ValidationHandler.h"
+
+#include <QLayout>
+#include <QPushButton>
+#include <QLineEdit>
+
+namespace ProjectSettingsTool
+{
+    PropertyFileSelectCtrl::PropertyFileSelectCtrl(QWidget* pParent)
+        : PropertyFuncValBrowseEditCtrl(pParent)
+        , m_selectFunctor(nullptr)
+    {
+        // Turn on clear button by default
+        browseEdit()->setClearButtonEnabled(true);
+
+        connect(browseEdit(), &AzQtComponents::BrowseEdit::attachedButtonTriggered, this, &PropertyFileSelectCtrl::SelectFile);
+    }
+
+    void PropertyFileSelectCtrl::SelectFile()
+    {
+        if (m_selectFunctor != nullptr)
+        {
+            QString path = m_selectFunctor(browseEdit()->text());
+            if (!path.isEmpty())
+            {
+                SetValueUser(path);
+            }
+        }
+        else
+        {
+            AZ_Assert(false, "No file select functor set.");
+        }
+    }
+
+    void PropertyFileSelectCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        if (attrib == Attributes::SelectFunction)
+        {
+            void* functor = nullptr;
+            if (attrValue->Read<void*>(functor))
+            {
+                // This is guaranteed type safe elsewhere so this is safe
+                m_selectFunctor = reinterpret_cast<FileSelectFuncType>(functor);
+            }
+        }
+        else
+        {
+            PropertyFuncValBrowseEditCtrl::ConsumeAttribute(attrib, attrValue, debugName);
+        }
+    }
+
+    //  Handler  ///////////////////////////////////////////////////////////////////
+
+    PropertyFileSelectHandler::PropertyFileSelectHandler(ValidationHandler* valHdlr)
+        : AzToolsFramework::PropertyHandler<AZStd::string, PropertyFileSelectCtrl>()
+        , m_validationHandler(valHdlr)
+    {}
+
+    AZ::u32 PropertyFileSelectHandler::GetHandlerName(void) const
+    {
+        return Handlers::FileSelect;
+    }
+
+    QWidget* PropertyFileSelectHandler::CreateGUI(QWidget* pParent)
+    {
+        PropertyFileSelectCtrl* ctrl = aznew PropertyFileSelectCtrl(pParent);
+        m_validationHandler->AddValidatorCtrl(ctrl);
+        return ctrl;
+    }
+
+    void PropertyFileSelectHandler::ConsumeAttribute(PropertyFileSelectCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        GUI->ConsumeAttribute(attrib, attrValue, debugName);
+    }
+
+    void PropertyFileSelectHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyFileSelectCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        instance = GUI->GetValue().toUtf8().data();
+    }
+
+    bool PropertyFileSelectHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyFileSelectCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        GUI->SetValue(instance.data());
+        GUI->ForceValidate();
+        return true;
+    }
+
+    PropertyFileSelectHandler* PropertyFileSelectHandler::Register(ValidationHandler* valHdlr)
+    {
+        PropertyFileSelectHandler* handler = aznew PropertyFileSelectHandler(valHdlr);
+        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
+            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
+            handler);
+        return handler;
+    }
+} // namespace ProjectSettingsTool
+
+#include <moc_PropertyFileSelect.cpp>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.h b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.h
new file mode 100644
index 0000000000..973526e951
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "PropertyFuncValBrowseEdit.h"
+#endif
+
+// Forward declare
+class QPushButton;
+
+namespace ProjectSettingsTool
+{
+    // Forward declare
+    class ValidationHandler;
+
+    class PropertyFileSelectCtrl
+        : public PropertyFuncValBrowseEditCtrl
+    {
+        Q_OBJECT
+
+    public:
+        typedef QString(* FileSelectFuncType)(const QString&);
+
+        PropertyFileSelectCtrl(QWidget* pParent = nullptr);
+
+        virtual void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+
+    protected:
+        void SelectFile();
+
+        QPushButton* m_selectButton;
+        FileSelectFuncType m_selectFunctor;
+    };
+
+    class PropertyFileSelectHandler
+        : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyFileSelectCtrl>
+    {
+        AZ_CLASS_ALLOCATOR(PropertyFileSelectHandler, AZ::SystemAllocator, 0);
+
+    public:
+        PropertyFileSelectHandler(ValidationHandler* valHdlr);
+
+        AZ::u32 GetHandlerName(void) const override;
+        // Need to unregister ourselves
+        bool AutoDelete() const override { return false; }
+
+        QWidget* CreateGUI(QWidget* pParent) override;
+        void ConsumeAttribute(PropertyFileSelectCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+        void WriteGUIValuesIntoProperty(size_t index, PropertyFileSelectCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+        bool ReadValuesIntoGUI(size_t index, PropertyFileSelectCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+        static PropertyFileSelectHandler* Register(ValidationHandler* valHdlr);
+
+    private:
+        ValidationHandler* m_validationHandler;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp
new file mode 100644
index 0000000000..635d7058f2
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp
@@ -0,0 +1,210 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "PropertyFuncValBrowseEdit.h"
+#include "PlatformSettings_common.h"
+#include "ValidationHandler.h"
+#include "ValidatorBus.h"
+
+#include <AzToolsFramework/UI/PropertyEditor/PropertyQTConstants.h>
+
+#include <QLineEdit>
+#include <QHBoxLayout>
+
+namespace ProjectSettingsTool
+{
+    PropertyFuncValBrowseEditCtrl::PropertyFuncValBrowseEditCtrl(QWidget* pParent)
+        : QWidget(pParent)
+        , m_validator(nullptr)
+    {
+        QHBoxLayout* layout = new QHBoxLayout(this);
+        m_browseEdit = new AzQtComponents::BrowseEdit(this);
+
+        layout->setSpacing(4);
+        layout->setContentsMargins(1, 0, 1, 0);
+        layout->addWidget(m_browseEdit);
+
+        browseEdit()->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+        browseEdit()->setMinimumWidth(AzToolsFramework::PropertyQTConstant_MinimumWidth);
+        browseEdit()->setFixedHeight(AzToolsFramework::PropertyQTConstant_DefaultHeight);
+
+        browseEdit()->setFocusPolicy(Qt::StrongFocus);
+
+        setLayout(layout);
+        setFocusProxy(browseEdit());
+        setFocusPolicy(browseEdit()->focusPolicy());
+
+        m_browseEdit->setClearButtonEnabled(true);
+        connect(m_browseEdit, &AzQtComponents::BrowseEdit::textChanged, this, &PropertyFuncValBrowseEditCtrl::ValueChangedByUser);
+        connect(m_browseEdit, &AzQtComponents::BrowseEdit::textChanged, this, &PropertyFuncValBrowseEditCtrl::ValidateAndShowErrors);
+        connect(m_browseEdit, &AzQtComponents::BrowseEdit::textChanged, this, [this]([[maybe_unused]] const QString& text)
+            {
+                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, this);
+            });
+    }
+
+    QString PropertyFuncValBrowseEditCtrl::GetValue() const
+    {
+        return m_browseEdit->text();
+    }
+
+    void PropertyFuncValBrowseEditCtrl::SetValue(const QString& value)
+    {
+        m_browseEdit->setText(value);
+    }
+
+    void PropertyFuncValBrowseEditCtrl::SetValueUser(const QString& value)
+    {
+        SetValue(value);
+
+        emit ValueChangedByUser();
+    }
+
+    FunctorValidator* PropertyFuncValBrowseEditCtrl::GetValidator()
+    {
+        return m_validator;
+    }
+
+    void PropertyFuncValBrowseEditCtrl::SetValidator(FunctorValidator* validator)
+    {
+        m_browseEdit->lineEdit()->setValidator(validator);
+        m_validator = validator;
+    }
+
+    void PropertyFuncValBrowseEditCtrl::SetValidator(FunctorValidator::FunctorType validator)
+    {
+        FunctorValidator* val = nullptr;
+        ValidatorBus::BroadcastResult(
+            val,
+            &ValidatorBus::Handler::GetValidator,
+            validator);
+
+        SetValidator(val);
+    }
+
+    bool PropertyFuncValBrowseEditCtrl::ValidateAndShowErrors()
+    {
+        if (m_validator)
+        {
+            FunctorValidator::ReturnType result = m_validator->ValidateWithErrors(m_browseEdit->text());
+            if (result.first == QValidator::Acceptable)
+            {
+                m_browseEdit->lineEdit()->setToolTip("");
+                return true;
+            }
+            else
+            {
+                m_browseEdit->lineEdit()->setToolTip(result.second);
+                m_browseEdit->lineEdit()->setReadOnly(false);
+                return false;
+            }
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    void PropertyFuncValBrowseEditCtrl::ForceValidate()
+    {
+        // Triggers update for errors
+        m_browseEdit->lineEdit()->textChanged(m_browseEdit->text());
+    }
+
+    void PropertyFuncValBrowseEditCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, [[maybe_unused]] const char* debugName)
+    {
+        if (attrib == Attributes::FuncValidator)
+        {
+            void* validator = nullptr;
+            if (attrValue->Read<void*>(validator))
+            {
+                if (validator != nullptr)
+                {
+                    SetValidator(reinterpret_cast<FunctorValidator::FunctorType>(validator));
+                }
+            }
+        }
+        else if (attrib == Attributes::ClearButton)
+        {
+            bool enable = false;
+            if (attrValue->Read<bool>(enable))
+            {
+                m_browseEdit->lineEdit()->setClearButtonEnabled(enable);
+            }
+        }
+        else if (attrib == Attributes::RemovableReadOnly)
+        {
+            bool readOnly = false;
+            if (attrValue->Read<bool>(readOnly))
+            {
+                m_browseEdit->lineEdit()->setReadOnly(readOnly);
+            }
+        }
+        else if (attrib == Attributes::ObfuscatedText)
+        {
+            bool obfus = false;
+            if (attrValue->Read<bool>(obfus) && obfus)
+            {
+                m_browseEdit->lineEdit()->setEchoMode(QLineEdit::Password);
+            }
+        }
+    }
+
+    AzQtComponents::BrowseEdit* PropertyFuncValBrowseEditCtrl::browseEdit()
+    {
+        return m_browseEdit;
+    }
+
+    //  Handler  ///////////////////////////////////////////////////////////////////
+
+    PropertyFuncValBrowseEditHandler::PropertyFuncValBrowseEditHandler(ValidationHandler* valHdlr)
+        : AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValBrowseEditCtrl>()
+        , m_validationHandler(valHdlr
+            )
+    {}
+
+    AZ::u32 PropertyFuncValBrowseEditHandler::GetHandlerName(void) const
+    {
+        return Handlers::QValidatedBrowseEdit;
+    }
+
+    QWidget* PropertyFuncValBrowseEditHandler::CreateGUI(QWidget* pParent)
+    {
+        PropertyFuncValBrowseEditCtrl* ctrl = aznew PropertyFuncValBrowseEditCtrl(pParent);
+        m_validationHandler->AddValidatorCtrl(ctrl);
+        return ctrl;
+    }
+
+    void PropertyFuncValBrowseEditHandler::ConsumeAttribute(PropertyFuncValBrowseEditCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        GUI->ConsumeAttribute(attrib, attrValue, debugName);
+    }
+
+    void PropertyFuncValBrowseEditHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyFuncValBrowseEditCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        instance = GUI->GetValue().toUtf8().data();
+    }
+
+    bool PropertyFuncValBrowseEditHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyFuncValBrowseEditCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        GUI->SetValue(instance.data());
+        GUI->ForceValidate();
+        return true;
+    }
+
+    PropertyFuncValBrowseEditHandler* PropertyFuncValBrowseEditHandler::Register(ValidationHandler* valHdlr)
+    {
+        PropertyFuncValBrowseEditHandler* handler = aznew PropertyFuncValBrowseEditHandler(valHdlr);
+        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
+            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
+            handler);
+        return handler;
+    }
+} // namespace ProjectSettingsTool
+
+#include <moc_PropertyFuncValBrowseEdit.cpp>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.h b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.h
new file mode 100644
index 0000000000..16f4a51a42
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "FunctorValidator.h"
+
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+
+#include <AzQtComponents/Components/Widgets/BrowseEdit.h>
+#endif
+
+namespace ProjectSettingsTool
+{
+    // Forward Declare
+    class ValidationHandler;
+
+    class PropertyFuncValBrowseEditCtrl
+        : public QWidget
+    {
+        Q_OBJECT
+
+    public:
+        AZ_CLASS_ALLOCATOR(PropertyFuncValBrowseEditCtrl, AZ::SystemAllocator, 0);
+
+        PropertyFuncValBrowseEditCtrl(QWidget* pParent = nullptr);
+
+        virtual QString GetValue() const;
+        // Sets value programmtically and triggers validation
+        virtual void SetValue(const QString& value);
+        // Sets value as if user set it
+        void SetValueUser(const QString& value);
+        // Returns pointer to the validator used
+        FunctorValidator* GetValidator();
+        // Sets the validator for the lineedit
+        void SetValidator(FunctorValidator* validator);
+        // Sets the validator for the linedit
+        void SetValidator(FunctorValidator::FunctorType validator);
+        // Returns false if invalid and returns shows error as tooltip
+        bool ValidateAndShowErrors();
+        // Forces the values to up validated and style updated
+        void ForceValidate();
+
+        // Returns a pointer to the BrowseEdit object.
+        AzQtComponents::BrowseEdit* browseEdit();
+
+        virtual void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName);
+
+    signals:
+        void ValueChangedByUser();
+
+    protected:
+        // Keeps track of the validator so no const_casts must be done
+        FunctorValidator* m_validator;
+
+        AzQtComponents::BrowseEdit* m_browseEdit = nullptr;
+    };
+
+    class PropertyFuncValBrowseEditHandler
+        : public AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValBrowseEditCtrl>
+    {
+        AZ_CLASS_ALLOCATOR(PropertyFuncValBrowseEditHandler, AZ::SystemAllocator, 0);
+
+    public:
+        PropertyFuncValBrowseEditHandler(ValidationHandler* valHdlr);
+
+        AZ::u32 GetHandlerName(void) const override;
+        // Need to unregister ourselves
+        bool AutoDelete() const override { return false; }
+
+        QWidget* CreateGUI(QWidget* pParent) override;
+        void ConsumeAttribute(PropertyFuncValBrowseEditCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+        void WriteGUIValuesIntoProperty(size_t index, PropertyFuncValBrowseEditCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+        bool ReadValuesIntoGUI(size_t index, PropertyFuncValBrowseEditCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+        static PropertyFuncValBrowseEditHandler* Register(ValidationHandler* valHdlr);
+
+    private:
+        ValidationHandler* m_validationHandler;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp
new file mode 100644
index 0000000000..dd0d8f69fb
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp
@@ -0,0 +1,185 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "PropertyFuncValLineEdit.h"
+
+#include "PlatformSettings_common.h"
+#include "ValidationHandler.h"
+#include "ValidatorBus.h"
+
+#include <QLineEdit>
+
+namespace ProjectSettingsTool
+{
+    PropertyFuncValLineEditCtrl::PropertyFuncValLineEditCtrl(QWidget* pParent)
+        : AzToolsFramework::PropertyStringLineEditCtrl(pParent)
+        , m_validator(nullptr)
+    {
+        connect(m_pLineEdit, &QLineEdit::textEdited, this, &PropertyFuncValLineEditCtrl::ValueChangedByUser);
+        connect(m_pLineEdit, &QLineEdit::textChanged, this, &PropertyFuncValLineEditCtrl::ValidateAndShowErrors);
+        connect(m_pLineEdit, &QLineEdit::textChanged, this, [this]([[maybe_unused]] const QString& text)
+            {
+                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, this);
+            });
+    }
+
+    QString PropertyFuncValLineEditCtrl::GetValue() const
+    {
+        return m_pLineEdit->text();
+    }
+
+    void PropertyFuncValLineEditCtrl::SetValue(const QString& value)
+    {
+        m_pLineEdit->setText(value);
+    }
+
+    void PropertyFuncValLineEditCtrl::SetValueUser(const QString& value)
+    {
+        SetValue(value);
+
+        emit ValueChangedByUser();
+    }
+
+    FunctorValidator* PropertyFuncValLineEditCtrl::GetValidator()
+    {
+        return m_validator;
+    }
+
+    void PropertyFuncValLineEditCtrl::SetValidator(FunctorValidator* validator)
+    {
+        m_pLineEdit->setValidator(validator);
+        m_validator = validator;
+    }
+
+    void PropertyFuncValLineEditCtrl::SetValidator(FunctorValidator::FunctorType validator)
+    {
+        FunctorValidator* val = nullptr;
+        ValidatorBus::BroadcastResult(
+            val,
+            &ValidatorBus::Handler::GetValidator,
+            validator);
+
+        SetValidator(val);
+    }
+
+    bool PropertyFuncValLineEditCtrl::ValidateAndShowErrors()
+    {
+        if (m_validator)
+        {
+            FunctorValidator::ReturnType result = m_validator->ValidateWithErrors(m_pLineEdit->text());
+            if (result.first == QValidator::Acceptable)
+            {
+                m_pLineEdit->setToolTip("");
+                return true;
+            }
+            else
+            {
+                m_pLineEdit->setToolTip(result.second);
+                m_pLineEdit->setReadOnly(false);
+                return false;
+            }
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    void PropertyFuncValLineEditCtrl::ForceValidate()
+    {
+        // Triggers update for errors
+        m_pLineEdit->textChanged(m_pLineEdit->text());
+    }
+
+    void PropertyFuncValLineEditCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, [[maybe_unused]] const char* debugName)
+    {
+        if (attrib == Attributes::FuncValidator)
+        {
+            void* validator = nullptr;
+            if (attrValue->Read<void*>(validator))
+            {
+                if (validator != nullptr)
+                {
+                    SetValidator(reinterpret_cast<FunctorValidator::FunctorType>(validator));
+                }
+            }
+        }
+        else if (attrib == Attributes::ClearButton)
+        {
+            bool enable = false;
+            if (attrValue->Read<bool>(enable))
+            {
+                m_pLineEdit->setClearButtonEnabled(enable);
+            }
+        }
+        else if (attrib == Attributes::RemovableReadOnly)
+        {
+            bool readOnly = false;
+            if (attrValue->Read<bool>(readOnly))
+            {
+                m_pLineEdit->setReadOnly(readOnly);
+            }
+        }
+        else if (attrib == Attributes::ObfuscatedText)
+        {
+            bool obfus = false;
+            if (attrValue->Read<bool>(obfus) && obfus)
+            {
+                m_pLineEdit->setEchoMode(QLineEdit::Password);
+            }
+        }
+    }
+
+    //  Handler  ///////////////////////////////////////////////////////////////////
+
+    PropertyFuncValLineEditHandler::PropertyFuncValLineEditHandler(ValidationHandler* valHdlr)
+        : AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValLineEditCtrl>()
+        , m_validationHandler(valHdlr
+            )
+    {}
+
+    AZ::u32 PropertyFuncValLineEditHandler::GetHandlerName(void) const
+    {
+        return Handlers::QValidatedLineEdit;
+    }
+
+    QWidget* PropertyFuncValLineEditHandler::CreateGUI(QWidget* pParent)
+    {
+        PropertyFuncValLineEditCtrl* ctrl = aznew PropertyFuncValLineEditCtrl(pParent);
+        m_validationHandler->AddValidatorCtrl(ctrl);
+        return ctrl;
+    }
+
+    void PropertyFuncValLineEditHandler::ConsumeAttribute(PropertyFuncValLineEditCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        GUI->ConsumeAttribute(attrib, attrValue, debugName);
+    }
+
+    void PropertyFuncValLineEditHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyFuncValLineEditCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        instance = GUI->GetValue().toUtf8().data();
+    }
+
+    bool PropertyFuncValLineEditHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyFuncValLineEditCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        GUI->SetValue(instance.data());
+        GUI->ForceValidate();
+        return true;
+    }
+
+    PropertyFuncValLineEditHandler* PropertyFuncValLineEditHandler::Register(ValidationHandler* valHdlr)
+    {
+        PropertyFuncValLineEditHandler* handler = aznew PropertyFuncValLineEditHandler(valHdlr);
+        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
+            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
+            handler);
+        return handler;
+    }
+} // namespace ProjectSettingsTool
+
+#include <moc_PropertyFuncValLineEdit.cpp>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.h b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.h
new file mode 100644
index 0000000000..91d7495aee
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "FunctorValidator.h"
+
+#include <AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.hxx>
+#endif
+
+namespace ProjectSettingsTool
+{
+    // Forward Declare
+    class ValidationHandler;
+
+    class PropertyFuncValLineEditCtrl
+        : public AzToolsFramework::PropertyStringLineEditCtrl
+    {
+        Q_OBJECT
+
+    public:
+        PropertyFuncValLineEditCtrl(QWidget* pParent = nullptr);
+
+        virtual QString GetValue() const;
+        // Sets value programmtically and triggers validation
+        virtual void SetValue(const QString& value);
+        // Sets value as if user set it
+        void SetValueUser(const QString& value);
+        // Returns pointer to the validator used
+        FunctorValidator* GetValidator();
+        // Sets the validator for the lineedit
+        void SetValidator(FunctorValidator* validator);
+        // Sets the validator for the linedit
+        void SetValidator(FunctorValidator::FunctorType validator);
+        // Returns false if invalid and returns shows error as tooltip
+        bool ValidateAndShowErrors();
+        // Forces the values to up validated and style updated
+        void ForceValidate();
+
+        virtual void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName);
+
+    signals:
+        void ValueChangedByUser();
+
+    protected:
+        // Keeps track of the validator so no const_casts must be done
+        FunctorValidator* m_validator;
+    };
+
+    class PropertyFuncValLineEditHandler
+        : public AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValLineEditCtrl>
+    {
+        AZ_CLASS_ALLOCATOR(PropertyFuncValLineEditHandler, AZ::SystemAllocator, 0);
+
+    public:
+        PropertyFuncValLineEditHandler(ValidationHandler* valHdlr);
+
+        AZ::u32 GetHandlerName(void) const override;
+        // Need to unregister ourselves
+        bool AutoDelete() const override { return false; }
+
+        QWidget* CreateGUI(QWidget* pParent) override;
+        void ConsumeAttribute(PropertyFuncValLineEditCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+        void WriteGUIValuesIntoProperty(size_t index, PropertyFuncValLineEditCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+        bool ReadValuesIntoGUI(size_t index, PropertyFuncValLineEditCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+        static PropertyFuncValLineEditHandler* Register(ValidationHandler* valHdlr);
+
+    private:
+        ValidationHandler* m_validationHandler;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp
new file mode 100644
index 0000000000..a47c8c3dc4
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp
@@ -0,0 +1,271 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "PropertyImagePreview.h"
+
+#include "DefaultImageValidator.h"
+#include "PlatformSettings_common.h"
+#include "Utils.h"
+#include "ValidationHandler.h"
+#include "ValidatorBus.h"
+
+#include <QBoxLayout>
+#include <QDir>
+#include <QLineEdit>
+
+namespace ProjectSettingsTool
+{
+    // Max width/length of preview in pixels
+    static const int maxPreviewDim = 96;
+
+    PropertyImagePreviewCtrl::PropertyImagePreviewCtrl(QWidget* parent)
+        : PropertyFuncValBrowseEditCtrl(parent)
+        , m_defaultImagePreview(nullptr)
+        , m_defaultPath("")
+    {
+        QLayout* myLayout = layout();
+        QBoxLayout* boxLayout = qobject_cast<QBoxLayout*>(myLayout);
+
+        m_preview = new QLabel(this);
+        m_preview->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        m_preview->setFixedSize(QSize(maxPreviewDim, maxPreviewDim));
+
+        if (boxLayout != nullptr)
+        {
+            boxLayout->insertWidget(0, m_preview);
+        }
+        else
+        {
+            AZ_Assert(false, "Expected QBoxLayout type not found in lineedit control.");
+            myLayout->addWidget(m_preview);
+        }
+
+        connect(this->m_browseEdit, &AzQtComponents::BrowseEdit::attachedButtonTriggered, this, [this]()
+        {
+            QString path = SelectImageFromFileDialog(browseEdit()->text());
+            if (!path.isEmpty())
+            {
+                SetValueUser(path);
+            }
+        });
+ 
+        connect(browseEdit(), &AzQtComponents::BrowseEdit::textChanged, this, &PropertyImagePreviewCtrl::LoadPreview);
+    }
+
+    void PropertyImagePreviewCtrl::SetValue(const QString& path)
+    {
+        browseEdit()->setText(path);
+
+        // Preview will not be shown if path is set to empty because it has not changed so call it here
+        LoadPreview();
+    }
+
+    const QString& PropertyImagePreviewCtrl::DefaultImagePath() const
+    {
+        return m_defaultPath;
+    }
+
+    void PropertyImagePreviewCtrl::SetDefaultImagePath(const QString& newPath)
+    {
+        m_defaultPath = newPath;
+    }
+
+    void PropertyImagePreviewCtrl::SetDefaultImagePreview(PropertyImagePreviewCtrl* imageSelect)
+    {
+        if (m_defaultImagePreview == nullptr)
+        {
+            m_defaultImagePreview = imageSelect;
+           connect(imageSelect, &PropertyFuncValBrowseEditCtrl::ValueChangedByUser, this, &PropertyImagePreviewCtrl::LoadPreview);
+        }
+        else
+        {
+            AZ_Assert(false, "Default image preview already set.");
+        }
+    }
+
+    PropertyImagePreviewCtrl* PropertyImagePreviewCtrl::DefaultImagePreview() const
+    {
+        return m_defaultImagePreview;
+    }
+
+    void PropertyImagePreviewCtrl::AddOverrideToValidator(PropertyImagePreviewCtrl* preview)
+    {
+        qobject_cast<DefaultImageValidator*>(m_validator)->AddOverride(preview);
+        connect(browseEdit(), &AzQtComponents::BrowseEdit::textChanged, this, &PropertyImagePreviewCtrl::ForceValidate);
+    }
+
+    void PropertyImagePreviewCtrl::LoadPreview()
+    {
+        QString currentPath = browseEdit()->text();
+        const QString* imagePath = nullptr;
+
+        if (!currentPath.isEmpty())
+        {
+            imagePath = &currentPath;
+        }
+        else
+        {
+            if (m_defaultImagePreview != nullptr)
+            {
+                currentPath = browseEdit()->text();
+            }
+            if (!currentPath.isEmpty())
+            {
+                imagePath = &currentPath;
+            }
+            else
+            {
+                imagePath = &m_defaultPath;
+            }
+        }
+
+        QDir dirPath(*imagePath);
+
+        // Keeps image from showing when no extension is given
+        if (!imagePath->isEmpty() && dirPath.isReadable())
+        {
+            // Image loaded from file
+            QImage originalImage;
+            // Scaled image
+            QImage processedImage;
+            // The image to be displayed
+            QImage* finalImage;
+            bool validImage = originalImage.load(*imagePath);
+
+            if (validImage)
+            {
+                //Scale down any images larger than 128 on either dimension
+                if (originalImage.height() > maxPreviewDim || originalImage.width() > maxPreviewDim)
+                {
+                    processedImage = originalImage.scaled(maxPreviewDim, maxPreviewDim,
+                        Qt::KeepAspectRatio, Qt::SmoothTransformation);
+                    finalImage = &processedImage;
+                }
+                else
+                {
+                    finalImage = &originalImage;
+                }
+
+                m_preview->setPixmap(QPixmap::fromImage(*finalImage));
+            }
+            // Failed to load image so set the preview to nothing
+            else
+            {
+                m_preview->setPixmap(QPixmap());
+            }
+        }
+        // Nothing valid set preview to nothing
+        else
+        {
+            m_preview->setPixmap(QPixmap());
+        }
+    }
+
+    void PropertyImagePreviewCtrl::UpgradeToDefaultValidator()
+    {
+        DefaultImageValidator* newValidator = new DefaultImageValidator(*m_validator);
+        SetValidator(newValidator);
+        // Track the memory allocated for this validator so its deleted
+        ValidatorBus::Broadcast(
+            &ValidatorBus::Handler::TrackValidator,
+            newValidator);
+    }
+
+    void PropertyImagePreviewCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        if (attrib == Attributes::DefaultPath)
+        {
+            AZStd::string path;
+            if (attrValue->Read<AZStd::string>(path))
+            {
+                m_defaultPath = path.data();
+            }
+        }
+        else 
+        {
+            PropertyFuncValBrowseEditCtrl::ConsumeAttribute(attrib, attrValue, debugName);
+        }
+    }
+
+    //  Handler  ///////////////////////////////////////////////////////////////////
+
+    PropertyImagePreviewHandler::PropertyImagePreviewHandler(ValidationHandler* valHdlr)
+        : AzToolsFramework::PropertyHandler<AZStd::string, PropertyImagePreviewCtrl>()
+        , m_validationHandler(valHdlr)
+    {}
+
+    AZ::u32 PropertyImagePreviewHandler::GetHandlerName(void) const
+    {
+        return Handlers::ImagePreview;
+    }
+
+    QWidget* PropertyImagePreviewHandler::CreateGUI(QWidget* pParent)
+    {
+        PropertyImagePreviewCtrl* ctrl = aznew PropertyImagePreviewCtrl(pParent);
+        m_validationHandler->AddValidatorCtrl(ctrl);
+        return ctrl;
+    }
+
+    void PropertyImagePreviewHandler::ConsumeAttribute(PropertyImagePreviewCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        //This means we are using this as a default image preview
+        if (attrib == Attributes::PropertyIdentfier)
+        {
+            AZStd::string ident;
+            if (attrValue->Read<AZStd::string>(ident))
+            {
+                GUI->UpgradeToDefaultValidator();
+                m_identToCtrl.insert(AZStd::pair<AZStd::string, PropertyImagePreviewCtrl*>(ident, GUI));
+            }
+        }
+        else if (attrib == Attributes::DefaultImagePreview)
+        {
+            AZStd::string ident;
+            if (attrValue->Read<AZStd::string>(ident))
+            {
+                auto defaultPreview = m_identToCtrl.find(ident);
+                if (defaultPreview != m_identToCtrl.end())
+                {
+                    defaultPreview->second->AddOverrideToValidator(GUI);
+                    GUI->SetDefaultImagePreview(defaultPreview->second);
+                }
+                else
+                {
+                    AZ_Assert(false, "Default image select \"%s\" not found.", ident.data());
+                }
+            }
+        }
+        else
+        {
+            GUI->ConsumeAttribute(attrib, attrValue, debugName);
+        }
+    }
+
+    void PropertyImagePreviewHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyImagePreviewCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        instance = GUI->GetValue().toUtf8().data();
+    }
+
+    bool PropertyImagePreviewHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyImagePreviewCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        GUI->SetValue(instance.data());
+        GUI->ForceValidate();
+        return true;
+    }
+
+    PropertyImagePreviewHandler* PropertyImagePreviewHandler::Register(ValidationHandler* valHdlr)
+    {
+        PropertyImagePreviewHandler* handler = aznew PropertyImagePreviewHandler(valHdlr);
+        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
+            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
+            handler);
+        return handler;
+    }
+} // namespace ProjectSettingsTool
+
+#include <moc_PropertyImagePreview.cpp>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.h b/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.h
new file mode 100644
index 0000000000..df61a423aa
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.h
@@ -0,0 +1,90 @@
+/*
+ * 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 "PropertyFileSelect.h"
+
+#include <AzCore/base.h>
+#include <AzCore/std/containers/unordered_map.h>
+#include <QLabel>
+#endif
+
+// Forward Declaration
+class QValidator;
+
+namespace ProjectSettingsTool
+{
+    // Forward Declaration
+    class ValidationHandler;
+
+    // Used to select a png image from a file dialog then display it
+    class PropertyImagePreviewCtrl
+        : public PropertyFuncValBrowseEditCtrl
+    {
+        Q_OBJECT
+
+    public:
+        PropertyImagePreviewCtrl(QWidget* parent = nullptr);
+
+        // Sets path for the image preview
+        void SetValue(const QString& path) override;
+        // Returns path for the default image preview
+        const QString& DefaultImagePath() const;
+        // Sets path for the default image preview
+        void SetDefaultImagePath(const QString& newPath);
+        // Sets the default image preview control to use for image previews
+        void SetDefaultImagePreview(PropertyImagePreviewCtrl* imageSelect);
+        // Returns current default image select control pointer
+        PropertyImagePreviewCtrl* DefaultImagePreview() const;
+        // Add a specific image override to the default image selects validator
+        void AddOverrideToValidator(PropertyImagePreviewCtrl* preview);
+        // Loads a preview of the image at the current path or default if path isEmpty
+        void LoadPreview();
+        // Upgrades the Validator to a DefaultImageValidator
+        void UpgradeToDefaultValidator();
+
+        virtual void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+
+    protected:
+        AZ_DISABLE_COPY_MOVE(PropertyImagePreviewCtrl);
+
+        void emitSelectClicked();
+
+        // Default image select to use
+        PropertyImagePreviewCtrl* m_defaultImagePreview;
+        // Full Path to default image preview
+        QString m_defaultPath;
+        // Displays the image preview
+        QLabel* m_preview;
+    };
+
+    class PropertyImagePreviewHandler
+        : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyImagePreviewCtrl>
+    {
+        AZ_CLASS_ALLOCATOR(PropertyImagePreviewHandler, AZ::SystemAllocator, 0);
+
+    public:
+        PropertyImagePreviewHandler(ValidationHandler* valHdlr);
+
+        AZ::u32 GetHandlerName(void) const override;
+        // Need to unregister ourselves
+        bool AutoDelete() const override { return false; }
+
+        QWidget* CreateGUI(QWidget* pParent) override;
+        void ConsumeAttribute(PropertyImagePreviewCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+        void WriteGUIValuesIntoProperty(size_t index, PropertyImagePreviewCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+        bool ReadValuesIntoGUI(size_t index, PropertyImagePreviewCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+        static PropertyImagePreviewHandler* Register(ValidationHandler* valHdlr);
+
+    private:
+        AZStd::unordered_map<AZStd::string, PropertyImagePreviewCtrl*> m_identToCtrl;
+        ValidationHandler* m_validationHandler;
+    };
+} // namespace ProjectSettingsTool
+
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.cpp
new file mode 100644
index 0000000000..ea13b00a8e
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.cpp
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "ProjectSettingsTool_precompiled.h"
+#include "PropertyLinked.h"
+
+#include "PlatformSettings_common.h"
+#include "ValidationHandler.h"
+
+#include <QLayout>
+#include <QPushButton>
+#include <QLineEdit>
+
+namespace ProjectSettingsTool
+{
+    PropertyLinkedCtrl::PropertyLinkedCtrl(QWidget* pParent)
+        : PropertyFuncValLineEditCtrl(pParent)
+        , m_linkButton(nullptr)
+        , m_linkedProperty(nullptr)
+        , m_linkEnabled(false)
+    {
+        connect(this, &PropertyFuncValLineEditCtrl::ValueChangedByUser, this, &PropertyLinkedCtrl::MirrorToLinkedProperty);
+    }
+
+    void PropertyLinkedCtrl::SetLinkedProperty(PropertyLinkedCtrl* property)
+    {
+        m_linkedProperty = property;
+        m_linkEnabled = true;
+    }
+
+    void PropertyLinkedCtrl::SetLinkTooltip(const QString& tip)
+    {
+        if (m_linkButton != nullptr)
+        {
+            m_linkButton->setToolTip("Linked to " + tip);
+        }
+    }
+
+    void PropertyLinkedCtrl::MakeLinkButton()
+    {
+        QLayout* myLayout = layout();
+        QIcon icon;
+        icon.addFile("://link.svg", QSize(), QIcon::Normal, QIcon::On);
+        icon.addFile("://broken_link.svg", QSize(), QIcon::Normal, QIcon::Off);
+
+        m_linkButton = new QPushButton(this);
+        m_linkButton->setIcon(icon);
+        m_linkButton->setCheckable(true);
+        m_linkButton->setFlat(true);
+        m_linkButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        m_linkButton->setFixedSize(QSize(16, 16));
+        m_linkButton->setContentsMargins(0, 0, 0, 0);
+        m_linkButton->setToolTip("Linked to...");
+        myLayout->addWidget(m_linkButton);
+
+        connect(m_linkButton, &QPushButton::clicked, this, &PropertyLinkedCtrl::MirrorLinkButtonState);
+    }
+
+    bool PropertyLinkedCtrl::LinkIsOptional()
+    {
+        return m_linkButton;
+    }
+
+    void PropertyLinkedCtrl::SetOptionalLink(bool linked)
+    {
+        m_linkButton->setChecked(linked);
+    }
+
+    void PropertyLinkedCtrl::MirrorToLinkedProperty()
+    {
+        if (m_linkEnabled && m_linkedProperty != nullptr)
+        {
+            m_linkedProperty->MirrorToLinkedPropertyRecursive(this, m_pLineEdit->text());
+        }
+    }
+
+    void PropertyLinkedCtrl::MirrorToLinkedPropertyRecursive(PropertyLinkedCtrl* caller, const QString& value)
+    {
+        if (caller != this)
+        {
+            if (m_linkButton == nullptr || m_linkButton->isChecked())
+            {
+                // Stop Property from mirroring again
+                m_linkEnabled = false;
+                m_pLineEdit->setText(value);
+                m_linkEnabled = true;
+            }
+            if (m_linkedProperty != nullptr)
+            {
+                m_linkedProperty->MirrorToLinkedPropertyRecursive(caller, value);
+            }
+        }
+    }
+
+    void PropertyLinkedCtrl::MirrorLinkButtonState(bool checked)
+    {
+        if (m_linkedProperty != nullptr)
+        {
+            m_linkedProperty->MirrorLinkButtonStateRecursive(this, checked);
+
+            // Mirror value of property linked was enabled on to all linked fields
+            if (checked)
+            {
+                MirrorToLinkedProperty();
+            }
+        }
+    }
+
+    void PropertyLinkedCtrl::MirrorLinkButtonStateRecursive(PropertyLinkedCtrl* caller, bool state)
+    {
+        if (caller != this)
+        {
+            if (m_linkButton != nullptr)
+            {
+                m_linkButton->setChecked(state);
+            }
+            if (m_linkedProperty != nullptr)
+            {
+                m_linkedProperty->MirrorLinkButtonStateRecursive(caller, state);
+            }
+        }
+    }
+
+    bool PropertyLinkedCtrl::AllLinkedPropertiesEqual()
+    {
+        if (m_linkedProperty != nullptr)
+        {
+            return m_linkedProperty->AllLinkedPropertiesEqual(this, m_pLineEdit->text());
+        }
+        // No linked property so must be equal
+        else
+        {
+            return true;
+        }
+    }
+
+    bool PropertyLinkedCtrl::AllLinkedPropertiesEqual(PropertyLinkedCtrl* caller, const QString& value)
+    {
+        if (caller != this)
+        {
+            // Not equal
+            if (m_pLineEdit->text() != value)
+            {
+                return false;
+            }
+            if (m_linkedProperty != nullptr)
+            {
+                return m_linkedProperty->AllLinkedPropertiesEqual(caller, value);
+            }
+            // All checked properties were equal
+            else
+            {
+                return true;
+            }
+        }
+        // All properties were equal
+        else
+        {
+            return true;
+        }
+    }
+
+    void PropertyLinkedCtrl::SetLinkEnabled(bool enabled)
+    {
+        m_linkEnabled = enabled;
+    }
+
+    void PropertyLinkedCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        if (attrib == Attributes::LinkOptional && m_linkButton == nullptr)
+        {
+            bool optional = false;
+            if (attrValue->Read<bool>(optional) && optional)
+            {
+                MakeLinkButton();
+            }
+        }
+        else
+        {
+            PropertyFuncValLineEditCtrl::ConsumeAttribute(attrib, attrValue, debugName);
+        }
+    }
+
+    //  Handler  ///////////////////////////////////////////////////////////////////
+
+    PropertyLinkedHandler::PropertyLinkedHandler(ValidationHandler* valHdlr)
+        : AzToolsFramework::PropertyHandler<AZStd::string, PropertyLinkedCtrl>()
+        , m_validationHandler(valHdlr)
+    {}
+
+    AZ::u32 PropertyLinkedHandler::GetHandlerName(void) const
+    {
+        return Handlers::LinkedLineEdit;
+    }
+
+    QWidget* PropertyLinkedHandler::CreateGUI(QWidget* pParent)
+    {
+        PropertyLinkedCtrl* ctrl = aznew PropertyLinkedCtrl(pParent);
+        m_validationHandler->AddValidatorCtrl(ctrl);
+        return ctrl;
+    }
+
+    void PropertyLinkedHandler::ConsumeAttribute(PropertyLinkedCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        if (attrib == Attributes::PropertyIdentfier)
+        {
+            AZStd::string ident;
+            if (attrValue->Read<AZStd::string>(ident))
+            {
+                m_identToCtrl.insert(AZStd::pair<AZStd::string, PropertyLinkedCtrl*>(ident, GUI));
+
+                auto result = m_ctrlToIdentAndLink.find(GUI);
+                if (result != m_ctrlToIdentAndLink.end())
+                {
+                    result->second.identifier = ident;
+                }
+                else
+                {
+                    m_ctrlToIdentAndLink.insert(AZStd::pair<PropertyLinkedCtrl*, IdentAndLink>(GUI, IdentAndLink{ ident, "" }));
+                    m_ctrlInitOrder.push_back(GUI);
+                }
+            }
+        }
+        else if (attrib == Attributes::LinkedProperty)
+        {
+            AZStd::string linked;
+            if (attrValue->Read<AZStd::string>(linked))
+            {
+                auto result = m_ctrlToIdentAndLink.find(GUI);
+                if (result != m_ctrlToIdentAndLink.end())
+                {
+                    result->second.linkedIdentifier = linked;
+                }
+                else
+                {
+                    m_ctrlToIdentAndLink.insert(AZStd::pair<PropertyLinkedCtrl*, IdentAndLink>(GUI, IdentAndLink{ "", linked }));
+                    m_ctrlInitOrder.push_back(GUI);
+                }
+
+                GUI->SetLinkTooltip(linked.data());
+            }
+        }
+        else
+        {
+            GUI->ConsumeAttribute(attrib, attrValue, debugName);
+        }
+    }
+
+    void PropertyLinkedHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyLinkedCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        instance = GUI->GetValue().toUtf8().data();
+    }
+
+    bool PropertyLinkedHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyLinkedCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
+    {
+        GUI->SetValue(instance.data());
+        GUI->ForceValidate();
+        return true;
+    }
+
+    PropertyLinkedHandler* PropertyLinkedHandler::Register(ValidationHandler* valHdlr)
+    {
+        PropertyLinkedHandler* handler = aznew PropertyLinkedHandler(valHdlr);
+        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
+            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
+            handler);
+        return handler;
+    }
+
+    void PropertyLinkedHandler::LinkAllProperties()
+    {
+        // Link all the properties
+        for (PropertyLinkedCtrl* ctrlPointer : m_ctrlInitOrder)
+        {
+            auto property = m_ctrlToIdentAndLink.find(ctrlPointer);
+            auto link = m_identToCtrl.find(property->second.linkedIdentifier);
+            if (link != m_identToCtrl.end())
+            {
+                property->first->SetLinkedProperty(link->second);
+                //Force mirror non-optional links.
+                property->first->MirrorToLinkedProperty();
+            }
+            else
+            {
+                AZ_Assert(false, "Property \"%s\" not found while linking to \"%s\".", property->second.linkedIdentifier.data(), property->second.identifier.data());
+            }
+        }
+        // Enable optional links if all properties in link chain are the same value
+        EnableOptionalLinksIfAllPropertiesEqual();
+    }
+
+    void PropertyLinkedHandler::EnableOptionalLinksIfAllPropertiesEqual()
+    {
+        // Enable optional links if all properties in link chain are the same value
+        for (const AZStd::pair<PropertyLinkedCtrl*, IdentAndLink>& property : m_ctrlToIdentAndLink)
+        {
+            if (property.first->LinkIsOptional())
+            {
+                property.first->SetOptionalLink(property.first->AllLinkedPropertiesEqual());
+            }
+        }
+    }
+
+    void PropertyLinkedHandler::MirrorAllLinkedProperties()
+    {
+        for (PropertyLinkedCtrl* ctrlPointer : m_ctrlInitOrder)
+        {
+            ctrlPointer->MirrorToLinkedProperty();
+        }
+    }
+
+    void PropertyLinkedHandler::DisableAllPropertyLinks()
+    {
+        for (PropertyLinkedCtrl* ctrlPointer : m_ctrlInitOrder)
+        {
+            ctrlPointer->SetLinkEnabled(false);
+        }
+    }
+
+    void PropertyLinkedHandler::EnableAllPropertyLinks()
+    {
+        for (PropertyLinkedCtrl* ctrlPointer : m_ctrlInitOrder)
+        {
+            ctrlPointer->SetLinkEnabled(true);
+        }
+    }
+} // namespace ProjectSettingsTool
+
+#include <moc_PropertyLinked.cpp>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.h b/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.h
new file mode 100644
index 0000000000..4ebd23dda2
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.h
@@ -0,0 +1,104 @@
+/*
+ * 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 "PropertyFuncValLineEdit.h"
+
+#include <AzCore/std/containers/unordered_map.h>
+#endif
+
+// Forward declares
+class QPushButton;
+
+namespace ProjectSettingsTool
+{
+    // Forward declare
+    class ValidationHandler;
+
+    class PropertyLinkedCtrl
+        : public PropertyFuncValLineEditCtrl
+    {
+        Q_OBJECT
+
+    public:
+        typedef QString(* FileSelectFuncType)(const QString&);
+
+        PropertyLinkedCtrl(QWidget* pParent = nullptr);
+
+        // Set property this will mirror its values to
+        void SetLinkedProperty(PropertyLinkedCtrl* property);
+        // Set the tooltip on the link button so the user can see what property this is linked to
+        void SetLinkTooltip(const QString& tip);
+        // Returns true if all linked properties are equal
+        bool AllLinkedPropertiesEqual();
+        // Returns true if links are optional on this
+        bool LinkIsOptional();
+        // Set the option link state to given bool
+        void SetOptionalLink(bool linked);
+        // Tries to mirror the value to all linked properties
+        void MirrorToLinkedProperty();
+        // Enabled/disables link regardless of type
+        void SetLinkEnabled(bool enabled);
+
+        void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+
+    protected:
+        void MakeLinkButton();
+        void MirrorToLinkedPropertyRecursive(PropertyLinkedCtrl* caller, const QString& value);
+        // Tries to mirror the link button state to all linked properties
+        void MirrorLinkButtonState(bool checked);
+        void MirrorLinkButtonStateRecursive(PropertyLinkedCtrl* caller, bool state);
+        // Returns true if all linked properties are equal
+        bool AllLinkedPropertiesEqual(PropertyLinkedCtrl* caller, const QString& value);
+
+        QPushButton* m_linkButton;
+        PropertyLinkedCtrl* m_linkedProperty;
+        bool m_linkEnabled;
+    };
+
+    class PropertyLinkedHandler
+        : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyLinkedCtrl>
+    {
+        AZ_CLASS_ALLOCATOR(PropertyLinkedHandler, AZ::SystemAllocator, 0);
+
+    public:
+        PropertyLinkedHandler(ValidationHandler* valHdlr);
+
+        AZ::u32 GetHandlerName(void) const override;
+        // Need to unregister ourselves
+        bool AutoDelete() const override { return false; }
+
+        QWidget* CreateGUI(QWidget* pParent) override;
+        void ConsumeAttribute(PropertyLinkedCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+        void WriteGUIValuesIntoProperty(size_t index, PropertyLinkedCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+        bool ReadValuesIntoGUI(size_t index, PropertyLinkedCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+        void LinkAllProperties();
+        void EnableOptionalLinksIfAllPropertiesEqual();
+        void MirrorAllLinkedProperties();
+        void DisableAllPropertyLinks();
+        void EnableAllPropertyLinks();
+        static PropertyLinkedHandler* Register(ValidationHandler* valHdlr);
+
+    private:
+        struct IdentAndLink
+        {
+            AZStd::string identifier;
+            AZStd::string linkedIdentifier;
+        };
+        // Map of identifiers to controls
+        AZStd::unordered_map<AZStd::string, PropertyLinkedCtrl*> m_identToCtrl;
+
+        // Map of controls to identifiers and their linked control's identifiers
+        AZStd::unordered_map<PropertyLinkedCtrl*, IdentAndLink> m_ctrlToIdentAndLink;
+        // Keeps track of the order ctrls were initialized
+        AZStd::vector<PropertyLinkedCtrl*> m_ctrlInitOrder;
+        // Tracks all validating properties
+        ValidationHandler* m_validationHandler;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Utils.cpp b/Code/Editor/Plugins/ProjectSettingsTool/Utils.cpp
new file mode 100644
index 0000000000..b8b92e5197
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Utils.cpp
@@ -0,0 +1,229 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "Utils.h"
+#include "LastPathBus.h"
+
+#include <AzCore/IO/SystemFile.h>
+#include <AzCore/std/algorithm.h>
+#include <AzCore/Utils/Utils.h>
+
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+
+#include <QFileDialog>
+
+
+namespace
+{
+    template<typename StringType>
+    void ToUnixPath(StringType& path)
+    {
+        AZStd::replace(path.begin(), path.end(), '\\', '/');
+    }
+
+    template<typename StringType>
+    StringType GetAbsoluteDevRoot()
+    {
+        const char* devRoot = nullptr;
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            devRoot,
+            &AzToolsFramework::AssetSystemRequestBus::Handler::GetAbsoluteDevRootFolderPath);
+
+        if (!devRoot)
+        {
+            return "";
+        }
+
+        StringType devRootString(devRoot);
+        ToUnixPath(devRootString);
+        return devRootString;
+    }
+
+    template<typename StringType>
+    StringType GetAbsoluteProjectRoot()
+    {
+        const char* projectRoot = nullptr;
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            projectRoot,
+            &AzToolsFramework::AssetSystemRequestBus::Handler::GetAbsoluteDevGameFolderPath);
+
+        if (!projectRoot)
+        {
+            return "";
+        }
+
+        StringType projectRootString(projectRoot);
+        ToUnixPath(projectRootString);
+        return projectRootString;
+    }
+
+    template<typename StringType>
+    StringType GetProjectName();
+
+    template<>
+    AZStd::string GetProjectName()
+    {
+        auto projectName = AZ::Utils::GetProjectName();
+        return AZStd::string{projectName.c_str()};
+    }
+
+    template<>
+    QString GetProjectName()
+    {
+        auto projectName = AZ::Utils::GetProjectName();
+        return QString::fromUtf8(projectName.c_str(), aznumeric_cast<int>(projectName.size()));
+    }
+}
+
+namespace ProjectSettingsTool
+{
+    void* ConvertFunctorToVoid(AZStd::pair<QValidator::State, const QString> (*func)(const QString&))
+    {
+        return reinterpret_cast<void*>(func);
+    }
+
+    AZStd::string GetDevRoot()
+    {
+        return GetAbsoluteDevRoot<AZStd::string>();
+    }
+    AZStd::string GetProjectRoot()
+    {
+        return GetAbsoluteProjectRoot<AZStd::string>();
+    }
+
+    AZStd::string GetProjectName()
+    {
+        return ::GetProjectName<AZStd::string>();
+    }
+
+    QString SelectXmlFromFileDialog(const QString& currentFile)
+    {
+        // The selected file must be relative to this path
+        QString defaultPath = GetAbsoluteDevRoot<QString>();
+        QString startPath;
+
+        // Choose the starting path for file dialog
+        if (currentFile != "")
+        {
+            if (currentFile.contains(defaultPath))
+            {
+                startPath = currentFile;
+            }
+            else
+            {
+                startPath = defaultPath + currentFile;
+            }
+        }
+        else
+        {
+            startPath = defaultPath;
+        }
+
+        QString pickedPath = QFileDialog::getOpenFileName(nullptr, QObject::tr("Select Override"),
+            startPath, QObject::tr("Extensible Markup Language file (*.xml)"));
+        ToUnixPath(pickedPath);
+
+        // Remove the default relative path
+        if (pickedPath.contains(defaultPath))
+        {
+            pickedPath = pickedPath.mid(defaultPath.length());
+        }
+
+        return pickedPath;
+    }
+
+    QString SelectImageFromFileDialog(const QString& currentFile)
+    {
+        QString defaultPath = QStringLiteral("%1Code%2/Resources/").arg(GetAbsoluteDevRoot<QString>(), ::GetProjectName<QString>());
+
+        QString startPath;
+
+        // Choose the starting path for file dialog
+        if (currentFile != "")
+        {
+            if (QDir::isAbsolutePath(currentFile))
+            {
+                startPath = currentFile;
+            }
+            else
+            {
+                startPath = defaultPath + currentFile;
+            }
+        }
+        else
+        {
+            LastPathBus::BroadcastResult(
+                startPath,
+                &LastPathBus::Handler::GetLastImagePath);
+        }
+
+        QString pickedPath = QFileDialog::getOpenFileName(nullptr, QObject::tr("Select Image"),
+            startPath, QObject::tr("Image file (*.png)"));
+        ToUnixPath(pickedPath);
+
+        if (!pickedPath.isEmpty())
+        {
+            LastPathBus::Broadcast(
+                &LastPathBus::Handler::SetLastImagePath,
+                pickedPath.left(pickedPath.lastIndexOf('/')));
+        }
+
+        // Remove the default relative path if it is used
+        if (pickedPath.contains(defaultPath))
+        {
+            pickedPath = pickedPath.mid(defaultPath.length());
+        }
+
+        return pickedPath;
+    }
+
+    AZStd::string GenDefaultImagePath(ImageGroup group, AZStd::string size)
+    {
+        AZStd::string root;
+        // Android
+        if (group <= ImageGroup::AndroidPortrait)
+        {
+            root = GetDevRoot() + "/Code/Tools/Android/ProjectBuilder/app_";
+        }
+        //Ios
+        else
+        {
+            using AZ::IO::SystemFile;
+            root = GetProjectRoot() + "/Gem/Resources/Platform/iOS/Images.xcassets/";
+            if (!SystemFile::Exists(root.c_str()))
+            {
+                root = GetProjectRoot() + "/Gem/Resources/IOSLauncher/Images.xcassets/";
+            }
+        }
+
+        AZStd::string groupStr;
+        switch (group)
+        {
+        case ImageGroup::AndroidIcons:
+            groupStr = "icon-";
+            break;
+        case ImageGroup::AndroidLandscape:
+            groupStr = "splash-land-";
+            break;
+        case ImageGroup::AndroidPortrait:
+            groupStr = "splash-port-";
+            break;
+        case ImageGroup::IosIcons:
+            groupStr = "AppIcon.appiconset/";
+            break;
+        case ImageGroup::IosLaunchScreens:
+            groupStr = "LaunchImage.launchimage/";
+            break;
+        default:
+            AZ_Assert(false, "Unknown ImageGroup.");
+            break;
+        }
+
+        return root + groupStr + size + ".png";
+    }
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Utils.h b/Code/Editor/Plugins/ProjectSettingsTool/Utils.h
new file mode 100644
index 0000000000..6101491711
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Utils.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/std/string/string.h>
+
+#include <QString>
+#include <QValidator>
+
+
+namespace ProjectSettingsTool
+{
+    void* ConvertFunctorToVoid(AZStd::pair<QValidator::State, const QString>(*func)(const QString&));
+    AZStd::string GetDevRoot();
+    AZStd::string GetProjectRoot();
+    AZStd::string GetProjectName();
+
+    // Open file dialogs for each file type and return the result
+    // CurrentFile is where the dialog opens
+    QString SelectXmlFromFileDialog(const QString& currentFile);
+    QString SelectImageFromFileDialog(const QString& currentFile);
+
+    enum class ImageGroup
+    {
+        AndroidIcons,
+        AndroidLandscape,
+        AndroidPortrait,
+        IosIcons,
+        IosLaunchScreens
+    };
+
+    AZStd::string GenDefaultImagePath(ImageGroup group, AZStd::string size);
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.cpp
new file mode 100644
index 0000000000..c873b58a0b
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.cpp
@@ -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
+ *
+ */
+
+#include "ProjectSettingsTool_precompiled.h"
+
+#include "ValidationHandler.h"
+
+#include "PropertyFuncValLineEdit.h"
+#include "PropertyFuncValBrowseEdit.h"
+
+namespace ProjectSettingsTool
+{
+    void ValidationHandler::AddValidatorCtrl(PropertyFuncValLineEditCtrl* ctrl)
+    {
+        m_validators.push_back(ctrl);
+    }
+
+    void ValidationHandler::AddValidatorCtrl(PropertyFuncValBrowseEditCtrl* ctrl)
+    {
+        m_browseEditValidators.push_back(ctrl);
+    }
+
+    bool ValidationHandler::AllValid()
+    {
+        for (PropertyFuncValLineEditCtrl* ctrl : m_validators)
+        {
+            if (!ctrl->ValidateAndShowErrors())
+            {
+                return false;
+            }
+        }
+
+        for (PropertyFuncValBrowseEditCtrl* ctrl : m_browseEditValidators)
+        {
+            if (!ctrl->ValidateAndShowErrors())
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.h b/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.h
new file mode 100644
index 0000000000..fb3407faee
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.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
+
+#include <AzCore/std/containers/vector.h>
+
+namespace ProjectSettingsTool
+{
+    // Forward Declare
+    class PropertyFuncValLineEditCtrl;
+    class PropertyFuncValBrowseEditCtrl;
+
+    class ValidationHandler
+    {
+    public:
+        void AddValidatorCtrl(PropertyFuncValLineEditCtrl* ctrl);
+        void AddValidatorCtrl(PropertyFuncValBrowseEditCtrl* ctrl);
+        bool AllValid();
+    private:
+        AZStd::vector<PropertyFuncValLineEditCtrl*> m_validators;
+        AZStd::vector<PropertyFuncValBrowseEditCtrl*> m_browseEditValidators;
+    };
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ValidatorBus.h b/Code/Editor/Plugins/ProjectSettingsTool/ValidatorBus.h
new file mode 100644
index 0000000000..634f9d21e1
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ValidatorBus.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include "FunctorValidator.h"
+
+#include <AzCore/EBus/EBus.h>
+
+namespace ProjectSettingsTool
+{
+    class ValidatorTraits
+        : public AZ::EBusTraits
+    {
+    public:
+        using Bus = AZ::EBus<ValidatorTraits>;
+
+        // Bus Configuration
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+
+        virtual FunctorValidator* GetValidator(FunctorValidator::FunctorType) = 0;
+        virtual void TrackValidator(FunctorValidator*) = 0;
+    };
+
+    typedef AZ::EBus<ValidatorTraits> ValidatorBus;
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp b/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
new file mode 100644
index 0000000000..8484a2937a
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
@@ -0,0 +1,222 @@
+/*
+ * 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 "ProjectSettingsTool_precompiled.h"
+#include "Validators.h"
+
+#include <QDir>
+#include <QMimeDatabase>
+#include <QRegularExpression>
+
+#define STANDARD_SUCCESS ProjectSettingsTool::FunctorValidator::ReturnType(QValidator::Acceptable, "");
+
+namespace 
+{
+    typedef ProjectSettingsTool::FunctorValidator::ReturnType RetType;
+
+    static const int noMaxLength = -1;
+    static const int maxIosVersionLength = 18;
+    static const int androidPublicAppKeyLength = 392;
+    static const char* xmlRelativePath = "Code/Tools/RC/Config/rc/";
+    static const char* xmlMimeType = "application/xml";
+    static const char* stringEmpty = "String is empty";
+
+    // Returns true if string is valid android package and apple bundle identifier
+    RetType RegularExpressionValidator(const QString& pattern, const QString& name, int maxLength = noMaxLength)
+    {
+        if (maxLength != noMaxLength && name.length() > maxLength)
+        {
+            return RetType(QValidator::Invalid, QObject::tr("Cannot be longer than %1 characters.")
+                    .arg(QString::number(maxLength)));
+        }
+        else if (name.isEmpty())
+        {
+            return RetType(QValidator::Intermediate, QObject::tr(stringEmpty));
+        }
+
+        QRegularExpression regex(pattern);
+
+        QRegularExpressionMatch match = regex.match(name, 0, QRegularExpression::PartialPreferCompleteMatch);
+
+        if (match.hasMatch())
+        {
+            if (match.capturedLength(0) == name.length())
+            {
+                return STANDARD_SUCCESS;
+            }
+            else
+            {
+                return RetType(QValidator::Intermediate, "Input incorrect.");
+            }
+        }
+        if (match.hasPartialMatch())
+        {
+            return RetType(QValidator::Intermediate, QObject::tr("Partially matches requirements."));
+        }
+        else
+        {
+            return RetType(QValidator::Invalid, QObject::tr("Fails to match requirements at all."));
+        }
+    }
+}
+
+namespace ProjectSettingsTool
+{
+    namespace Validators
+    {
+        namespace Internal
+        {
+            // Returns true if file is readable and the correct mime type
+            RetType FileReadableAndCorrectType(const QString& path, const QString& fileType)
+            {
+                QDir dirPath(path);
+
+                if (dirPath.isReadable())
+                {
+                    QMimeDatabase mimeDB;
+                    QMimeType mimeType = mimeDB.mimeTypeForFile(path);
+
+                    if (mimeType.name() == fileType)
+                    {
+                        return STANDARD_SUCCESS;
+                    }
+                    else
+                    {
+                        return RetType(QValidator::Intermediate, QObject::tr("File type should be %1, but is %2.")
+                                .arg(fileType).arg(mimeType.name()));
+                    }
+                }
+                else
+                {
+                    return RetType(QValidator::Intermediate, QObject::tr("File is not readable."));
+                }
+            }
+        } // namespace Internal
+
+
+        // Returns true if valid cross platform file or directory name
+        RetType FileName(const QString& name)
+        {
+            // There was a known issue on android with '.' used in directory names
+            // causing problems so it has been omitted from use
+            return RegularExpressionValidator("[\\w,-]+", name);
+        }
+
+        RetType FileNameOrEmpty(const QString& name)
+        {
+            if (IsNotEmpty(name).first == QValidator::Acceptable)
+            {
+                return FileName(name);
+            }
+            else
+            {
+                return STANDARD_SUCCESS;
+            }
+        }
+
+        // Returns true if string isn't empty
+        RetType IsNotEmpty(const QString& value)
+        {
+            if (!value.isEmpty())
+            {
+                return STANDARD_SUCCESS;
+            }
+            else
+            {
+                return RetType(QValidator::Intermediate, QObject::tr(stringEmpty));
+            }
+        }
+
+        // Returns true if string is valid as a boolean
+        RetType BoolString(const QString& value)
+        {
+            if (value == "true" || value == "false")
+            {
+                return STANDARD_SUCCESS;
+            }
+
+            return RetType(QValidator::Invalid, QObject::tr("Invalid bool string."));
+        }
+
+        // Returns true if string is valid android package and apple bundle identifier
+        RetType PackageName(const QString& name)
+        {
+            return RegularExpressionValidator("[a-zA-Z][A-Za-z0-9]*(\\.[a-zA-Z][A-Za-z0-9]*)+", name);
+        }
+
+        // Returns true if valid android version number
+        RetType VersionNumber(const QString& value)
+        {
+            // Error handling built in already
+            int ver = value.toInt();
+
+            if (0 >= ver)
+            {
+                return RetType(QValidator::Invalid, QObject::tr("Version must be greater than 0."));
+            }
+            else if (ver > maxAndroidVersion)
+            {
+                return RetType(QValidator::Invalid, QObject::tr("Version must be less than or equal to %1.")
+                        .arg(QString::number(maxAndroidVersion)));
+            }
+            else
+            {
+                return STANDARD_SUCCESS;
+            }
+        }
+
+        // Returns true if valid ios version number
+        RetType IOSVersionNumber(const QString& value)
+        {
+            return RegularExpressionValidator
+                       ("(0|[1-9][0-9]{0,8}|[1-2][0-1][0-9]{0,8})(\\.(0|[1-9][0-9]{0,8}|[1-2][0-1][0-9]{0,8})){0,2}",
+                       value,
+                       maxIosVersionLength);
+        }
+
+        // Returns true if Public App Key is valid length
+        RetType PublicAppKeyOrEmpty(const QString& value)
+        {
+            // If anyone knows that public app keys are not always 392 chars long
+            // then this MUST be changed
+            if (value.isEmpty() || value.length() == androidPublicAppKeyLength)
+            {
+                return STANDARD_SUCCESS;
+            }
+            else
+            {
+                return RetType(QValidator::Intermediate, QObject::tr("App key should be %1 characters long.")
+                        .arg(QString::number(androidPublicAppKeyLength)));
+            }
+        }
+        // Returns true if path is empty or a valid xml file relative to <build dir>
+        RetType ValidXmlOrEmpty(const QString& path)
+        {
+            if (IsNotEmpty(path).first == QValidator::Acceptable)
+            {
+                return Internal::FileReadableAndCorrectType(xmlRelativePath + path, xmlMimeType);
+            }
+            else
+            {
+                return STANDARD_SUCCESS;
+            }
+        }
+
+        // Returns true if path is empty or a valid png file
+        RetType ValidPngOrEmpty(const QString& path)
+        {
+            if (IsNotEmpty(path).first == QValidator::Acceptable)
+            {
+                return Internal::FileReadableAndCorrectType(path, pngMimeType);
+            }
+            else
+            {
+                return STANDARD_SUCCESS;
+            }
+        }
+    } // namespace Validators
+} // namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Validators.h b/Code/Editor/Plugins/ProjectSettingsTool/Validators.h
new file mode 100644
index 0000000000..887195b611
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Validators.h
@@ -0,0 +1,50 @@
+/*
+ * 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 "FunctorValidator.h"
+
+namespace ProjectSettingsTool
+{
+    namespace Validators
+    {
+        namespace Internal 
+        {
+            // Returns true if file is readable and the correct mime type
+            FunctorValidator::ReturnType FileReadableAndCorrectType(const QString& path, const QString& fileType);
+        }
+
+        static const int maxAndroidVersion = 2100000000;
+
+        // Returns true if valid cross platform file or directory name
+        FunctorValidator::ReturnType FileName(const QString& name);
+        // Returns true if valid cross platform file or directory name or empty
+        FunctorValidator::ReturnType FileNameOrEmpty(const QString& name);
+        // Returns true if string isn't empty
+        FunctorValidator::ReturnType IsNotEmpty(const QString& value);
+        // Returns true if string is valid as a boolean
+        FunctorValidator::ReturnType BoolString(const QString& value);
+        // Returns true if string is valid android package and apple bundle identifier
+        FunctorValidator::ReturnType PackageName(const QString& name);
+        // Returns true if valid android version number
+        FunctorValidator::ReturnType VersionNumber(const QString& value);
+        // Returns true if valid ios version number
+        FunctorValidator::ReturnType IOSVersionNumber(const QString& value);
+        // Returns true if Public App Key is valid length
+        FunctorValidator::ReturnType PublicAppKeyOrEmpty(const QString& value);
+        // Returns true if path is empty or a valid xml file relative to <build dir>
+        FunctorValidator::ReturnType ValidXmlOrEmpty(const QString& path);
+        // Returns true if path is empty or a valid png file
+        FunctorValidator::ReturnType ValidPngOrEmpty(const QString& path);
+        // Returns true if path is empty or valid png file with specified dimensions
+        template <int imageWidth, int imageHeight = imageWidth>
+        FunctorValidator::ReturnType PngImageSetSizeOrEmpty(const QString& path);
+    } // namespace Validators
+} // namespace ProjectSettingsTool
+
+#include "Validators_impl.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Validators_impl.h b/Code/Editor/Plugins/ProjectSettingsTool/Validators_impl.h
new file mode 100644
index 0000000000..3671e7bcc8
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Validators_impl.h
@@ -0,0 +1,51 @@
+/*
+ * 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 <QImage>
+
+namespace ProjectSettingsTool
+{
+    namespace Validators
+    {
+        static const char* pngMimeType = "image/png";
+
+        // Returns true if path is empty or valid png file with specified dimensions
+        template <int imageWidth, int imageHeight>
+        FunctorValidator::ReturnType PngImageSetSizeOrEmpty(const QString& path)
+        {
+            using RetType = FunctorValidator::ReturnType;
+
+            if (IsNotEmpty(path).first != QValidator::Acceptable)
+            {
+                return FunctorValidator::ReturnType(QValidator::Acceptable, "");
+            }
+            else
+            {
+                RetType correct = Internal::FileReadableAndCorrectType(path, pngMimeType);
+
+                if (correct.first)
+                {
+                    QImage image(path);
+
+                    if (imageWidth == image.width() && imageHeight == image.height())
+                    {
+                        return FunctorValidator::ReturnType(QValidator::Acceptable, "");
+                    }
+                    else
+                    {
+                        return RetType(QValidator::Intermediate, QObject::tr("Image is not %1x%2 pixels.")
+                                .arg(QString::number(imageWidth)).arg(QString::number(imageHeight)));
+                    }
+                }
+                else
+                {
+                    return correct;
+                }
+            }
+        }
+    } // namespace Validators
+} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/icons/broken_link.svg b/Code/Editor/Plugins/ProjectSettingsTool/icons/broken_link.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ProjectSettingsTool/icons/broken_link.svg
rename to Code/Editor/Plugins/ProjectSettingsTool/icons/broken_link.svg
diff --git a/Code/Sandbox/Editor/res/group_closed.png b/Code/Editor/Plugins/ProjectSettingsTool/icons/group_closed.png
similarity index 100%
rename from Code/Sandbox/Editor/res/group_closed.png
rename to Code/Editor/Plugins/ProjectSettingsTool/icons/group_closed.png
diff --git a/Code/Sandbox/Editor/res/group_open.png b/Code/Editor/Plugins/ProjectSettingsTool/icons/group_open.png
similarity index 100%
rename from Code/Sandbox/Editor/res/group_open.png
rename to Code/Editor/Plugins/ProjectSettingsTool/icons/group_open.png
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/icons/link.svg b/Code/Editor/Plugins/ProjectSettingsTool/icons/link.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ProjectSettingsTool/icons/link.svg
rename to Code/Editor/Plugins/ProjectSettingsTool/icons/link.svg
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/main.cpp b/Code/Editor/Plugins/ProjectSettingsTool/main.cpp
new file mode 100644
index 0000000000..a348f81f2b
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/main.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 "ProjectSettingsTool_precompiled.h"
+
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/ViewPaneOptions.h>
+
+#include <Include/IPlugin.h>
+
+#include "ProjectSettingsToolWindow.h"
+#include "../Editor/LyViewPaneNames.h"
+
+
+class ProjectSettingsToolPlugin
+    : public IPlugin
+{
+public:
+    ProjectSettingsToolPlugin([[maybe_unused]] IEditor* editor)
+    {
+        AzToolsFramework::ViewPaneOptions options;
+        options.showInMenu = false;
+        AzToolsFramework::RegisterViewPane<ProjectSettingsTool::ProjectSettingsToolWindow>(LyViewPane::ProjectSettingsTool, LyViewPane::ProjectSettingsTool, options);
+    }
+
+    void Release() override
+    {
+        AzToolsFramework::UnregisterViewPane(LyViewPane::ProjectSettingsTool);
+        delete this;
+    }
+
+    void ShowAbout() override {}
+
+    const char* GetPluginGUID() override { return "{C5B96A1A-036A-46F9-B7F0-5DF93494F988}"; }
+    DWORD GetPluginVersion() override { return 1; }
+    const char* GetPluginName() override { return "ProjectSettingsTool"; }
+    bool CanExitNow() override { return true; }
+    void OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId) override {}
+};
+
+PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
+{
+    ISystem* pSystem = pInitParam->pIEditorInterface->GetSystem();
+    ModuleInitISystem(pSystem, "ProjectSettingsTool");
+    // the above line initializes the gEnv global variable if necessary, and also makes GetIEditor() and other similar functions work correctly.
+
+    return new ProjectSettingsToolPlugin(GetIEditor());
+}
+
+#if defined(AZ_PLATFORM_WINDOWS)
+HINSTANCE g_hInstance = 0;
+BOOL __stdcall DllMain(HINSTANCE hinstDLL, ULONG fdwReason, [[maybe_unused]] LPVOID lpvReserved)
+{
+    if (fdwReason == DLL_PROCESS_ATTACH)
+    {
+        g_hInstance = hinstDLL;
+    }
+
+    return TRUE;
+}
+#endif
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake b/Code/Editor/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
new file mode 100644
index 0000000000..5d418e9926
--- /dev/null
+++ b/Code/Editor/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
@@ -0,0 +1,55 @@
+#
+# 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
+    main.cpp
+    ProjectSettingsTool_precompiled.h
+    DefaultImageValidator.cpp
+    DefaultImageValidator.h
+    FunctorValidator.cpp
+    FunctorValidator.h
+    LastPathBus.h
+    Platforms.h
+    PlatformSettings.h
+    PlatformSettings_Android.cpp
+    PlatformSettings_Android.h
+    PlatformSettings_Base.cpp
+    PlatformSettings_Base.h
+    PlatformSettings_common.h
+    PlatformSettings_Ios.cpp
+    PlatformSettings_Ios.h
+    PlistDictionary.cpp
+    PlistDictionary.h
+    ProjectSettingsContainer.cpp
+    ProjectSettingsContainer.h
+    ProjectSettingsSerialization.cpp
+    ProjectSettingsSerialization.h
+    ProjectSettingsTool.qrc
+    ProjectSettingsToolWidget.ui
+    ProjectSettingsToolWindow.cpp
+    ProjectSettingsToolWindow.h
+    ProjectSettingsValidator.cpp
+    ProjectSettingsValidator.h
+    PropertyFileSelect.cpp
+    PropertyFileSelect.h
+    PropertyFuncValBrowseEdit.cpp
+    PropertyFuncValBrowseEdit.h
+    PropertyFuncValLineEdit.cpp
+    PropertyFuncValLineEdit.h
+    PropertyImagePreview.cpp
+    PropertyImagePreview.h
+    PropertyLinked.cpp
+    PropertyLinked.h
+    Utils.cpp
+    Utils.h
+    ValidationHandler.cpp
+    ValidationHandler.h
+    ValidatorBus.h
+    Validators.cpp
+    Validators.h
+    Validators_impl.h
+)
diff --git a/Code/Sandbox/Plugins/QtMocRule.props b/Code/Editor/Plugins/QtMocRule.props
similarity index 100%
rename from Code/Sandbox/Plugins/QtMocRule.props
rename to Code/Editor/Plugins/QtMocRule.props
diff --git a/Code/Sandbox/Plugins/QtMocRule.targets b/Code/Editor/Plugins/QtMocRule.targets
similarity index 100%
rename from Code/Sandbox/Plugins/QtMocRule.targets
rename to Code/Editor/Plugins/QtMocRule.targets
diff --git a/Code/Sandbox/Plugins/QtMocRule.xml b/Code/Editor/Plugins/QtMocRule.xml
similarity index 100%
rename from Code/Sandbox/Plugins/QtMocRule.xml
rename to Code/Editor/Plugins/QtMocRule.xml
diff --git a/Code/Sandbox/Plugins/QtRccRule.props b/Code/Editor/Plugins/QtRccRule.props
similarity index 100%
rename from Code/Sandbox/Plugins/QtRccRule.props
rename to Code/Editor/Plugins/QtRccRule.props
diff --git a/Code/Sandbox/Plugins/QtRccRule.targets b/Code/Editor/Plugins/QtRccRule.targets
similarity index 100%
rename from Code/Sandbox/Plugins/QtRccRule.targets
rename to Code/Editor/Plugins/QtRccRule.targets
diff --git a/Code/Sandbox/Plugins/QtRccRule.xml b/Code/Editor/Plugins/QtRccRule.xml
similarity index 100%
rename from Code/Sandbox/Plugins/QtRccRule.xml
rename to Code/Editor/Plugins/QtRccRule.xml
diff --git a/Code/Sandbox/Plugins/QtUicRule.props b/Code/Editor/Plugins/QtUicRule.props
similarity index 100%
rename from Code/Sandbox/Plugins/QtUicRule.props
rename to Code/Editor/Plugins/QtUicRule.props
diff --git a/Code/Sandbox/Plugins/QtUicRule.targets b/Code/Editor/Plugins/QtUicRule.targets
similarity index 100%
rename from Code/Sandbox/Plugins/QtUicRule.targets
rename to Code/Editor/Plugins/QtUicRule.targets
diff --git a/Code/Sandbox/Plugins/QtUicRule.xml b/Code/Editor/Plugins/QtUicRule.xml
similarity index 100%
rename from Code/Sandbox/Plugins/QtUicRule.xml
rename to Code/Editor/Plugins/QtUicRule.xml
diff --git a/Code/Editor/PreferencesStdPages.cpp b/Code/Editor/PreferencesStdPages.cpp
new file mode 100644
index 0000000000..c2197c0857
--- /dev/null
+++ b/Code/Editor/PreferencesStdPages.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 "EditorDefs.h"
+
+#include "PreferencesStdPages.h"
+
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+
+// Editor
+#include "EditorPreferencesPageGeneral.h"
+#include "EditorPreferencesPageFiles.h"
+#include "EditorPreferencesPageViewportGeneral.h"
+#include "EditorPreferencesPageViewportGizmo.h"
+#include "EditorPreferencesPageViewportMovement.h"
+#include "EditorPreferencesPageViewportDebug.h"
+#include "EditorPreferencesPageExperimentalLighting.h"
+#include "EditorPreferencesPageAWS.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// Implementation of ClassDesc for standard Editor preferences.
+//////////////////////////////////////////////////////////////////////////
+
+CStdPreferencesClassDesc::CStdPreferencesClassDesc()
+    : m_refCount(0)
+{
+    m_pageCreators = {
+        [](){ return new CEditorPreferencesPage_General(); },
+        [](){ return new CEditorPreferencesPage_Files(); },
+        [](){ return new CEditorPreferencesPage_ViewportGeneral(); },
+        [](){ return new CEditorPreferencesPage_ViewportMovement(); },
+        [](){ return new CEditorPreferencesPage_ViewportGizmo(); },
+        [](){ return new CEditorPreferencesPage_ViewportDebug(); }
+    };
+
+    m_pageCreators.push_back([]() { return new CEditorPreferencesPage_ExperimentalLighting(); });
+
+    if (AzToolsFramework::IsComponentWithServiceRegistered(AZ_CRC_CE("AWSCoreEditorService")))
+    {
+        m_pageCreators.push_back([]() { return new CEditorPreferencesPage_AWS(); });
+    }
+}
+
+HRESULT CStdPreferencesClassDesc::QueryInterface(const IID& riid, void** ppvObj)
+{
+    if (riid == __uuidof(IPreferencesPageCreator))
+    {
+        *ppvObj = (IPreferencesPageCreator*)this;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+ULONG CStdPreferencesClassDesc::AddRef()
+{
+    m_refCount++;
+    return m_refCount;
+};
+
+//////////////////////////////////////////////////////////////////////////
+ULONG CStdPreferencesClassDesc::Release()
+{
+    ULONG refs = --m_refCount;
+    if (m_refCount <= 0)
+    {
+        delete this;
+    }
+    return refs;
+}
+
+//////////////////////////////////////////////////////////////////////////
+REFGUID CStdPreferencesClassDesc::ClassID()
+{
+    // {95FE3251-796C-4e3b-82F0-AD35F7FFA267}
+    static const GUID guid = {
+        0x95fe3251, 0x796c, 0x4e3b, { 0x82, 0xf0, 0xad, 0x35, 0xf7, 0xff, 0xa2, 0x67 }
+    };
+    return guid;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CStdPreferencesClassDesc::GetPagesCount()
+{
+    return m_pageCreators.size();
+}
+
+IPreferencesPage* CStdPreferencesClassDesc::CreateEditorPreferencesPage(int index)
+{
+    return (index >= m_pageCreators.size()) ? nullptr : m_pageCreators[index]();
+}
+
diff --git a/Code/Editor/PreferencesStdPages.h b/Code/Editor/PreferencesStdPages.h
new file mode 100644
index 0000000000..01a087e18c
--- /dev/null
+++ b/Code/Editor/PreferencesStdPages.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_PREFERENCESSTDPAGES_H
+#define CRYINCLUDE_EDITOR_PREFERENCESSTDPAGES_H
+#pragma once
+
+#include "Include/IPreferencesPage.h"
+#include <AzCore/std/functional.h>
+#include <AzCore/std/containers/vector.h>
+
+//////////////////////////////////////////////////////////////////////////
+class CStdPreferencesClassDesc
+    : public IPreferencesPageClassDesc
+    , public IPreferencesPageCreator
+{
+    ULONG m_refCount;
+    AZStd::vector< AZStd::function< IPreferencesPage*() > > m_pageCreators;
+public:
+    CStdPreferencesClassDesc();
+    virtual ~CStdPreferencesClassDesc() = default;
+
+    //////////////////////////////////////////////////////////////////////////
+    // IUnkown implementation.
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(const IID& riid, void** ppvObj);
+    virtual ULONG STDMETHODCALLTYPE AddRef();
+    virtual ULONG STDMETHODCALLTYPE Release();
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual REFGUID ClassID();
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual int GetPagesCount();
+    virtual IPreferencesPage* CreateEditorPreferencesPage(int index) override;
+};
+
+#endif // CRYINCLUDE_EDITOR_PREFERENCESSTDPAGES_H
+
diff --git a/Code/Editor/ProcessInfo.cpp b/Code/Editor/ProcessInfo.cpp
new file mode 100644
index 0000000000..f038e3af31
--- /dev/null
+++ b/Code/Editor/ProcessInfo.cpp
@@ -0,0 +1,101 @@
+/*
+ * 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 "ProcessInfo.h"
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+#include <mach/mach.h>
+#endif
+
+#if defined(AZ_PLATFORM_WINDOWS)
+#include "Psapi.h"
+void UnloadPSApi();
+
+typedef BOOL (WINAPI * GetProcessMemoryInfoProc)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD);
+
+static HMODULE                                  g_hPSAPI = 0;
+static GetProcessMemoryInfoProc g_pGetProcessMemoryInfo = 0;
+#endif // AZ_PLATFORM_WINDOWS
+
+CProcessInfo::CProcessInfo(void)
+{
+}
+
+CProcessInfo::~CProcessInfo(void)
+{
+#if defined(AZ_PLATFORM_WINDOWS)
+    UnloadPSApi();
+#endif
+}
+
+#if defined(AZ_PLATFORM_WINDOWS)
+void LoadPSApi()
+{
+    if (!g_hPSAPI)
+    {
+        g_hPSAPI = LoadLibraryA("psapi.dll");
+
+        if (g_hPSAPI)
+        {
+            g_pGetProcessMemoryInfo = (GetProcessMemoryInfoProc)GetProcAddress(g_hPSAPI, "GetProcessMemoryInfo");
+        }
+    }
+}
+
+void UnloadPSApi()
+{
+    if (g_hPSAPI)
+    {
+        FreeLibrary(g_hPSAPI);
+        g_hPSAPI = 0;
+        g_pGetProcessMemoryInfo = 0;
+    }
+}
+#endif
+
+void CProcessInfo::QueryMemInfo(ProcessMemInfo& meminfo)
+{
+    memset(&meminfo, 0, sizeof(ProcessMemInfo));
+#if defined(AZ_PLATFORM_WINDOWS)
+    LoadPSApi();
+
+    if (!g_pGetProcessMemoryInfo)
+    {
+        return;
+    }
+
+    PROCESS_MEMORY_COUNTERS pc;
+    HANDLE hProcess = GetCurrentProcess();
+    pc.cb = sizeof(pc);
+    g_pGetProcessMemoryInfo(hProcess, &pc, sizeof(pc));
+
+    meminfo.WorkingSet = pc.WorkingSetSize;
+    meminfo.PeakWorkingSet = pc.PeakWorkingSetSize;
+    meminfo.PagefileUsage = pc.PagefileUsage;
+    meminfo.PeakPagefileUsage = pc.PeakPagefileUsage;
+    meminfo.PageFaultCount = pc.PageFaultCount;
+#elif AZ_TRAIT_OS_PLATFORM_APPLE
+    task_basic_info basic_info;
+    mach_msg_type_number_t size = sizeof(basic_info);
+    kern_return_t kerr = task_info(mach_task_self(), TASK_BASIC_INFO, reinterpret_cast<task_info_t>(&basic_info), &size);
+    if (kerr == KERN_SUCCESS)
+    {
+        meminfo.WorkingSet = basic_info.resident_size;
+        meminfo.PagefileUsage = basic_info.virtual_size;
+    }
+    task_events_info events_info;
+    size = sizeof(events_info);
+    kerr = task_info(mach_task_self(), TASK_EVENTS_INFO, reinterpret_cast<task_info_t>(&events_info), &size);
+    if (kerr == KERN_SUCCESS)
+    {
+        meminfo.PageFaultCount = events_info.faults;
+    }
+#endif
+}
diff --git a/Code/Editor/ProcessInfo.h b/Code/Editor/ProcessInfo.h
new file mode 100644
index 0000000000..26a3a6c15c
--- /dev/null
+++ b/Code/Editor/ProcessInfo.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_PROCESSINFO_H
+#define CRYINCLUDE_EDITOR_PROCESSINFO_H
+
+#pragma once
+
+/** Stores information about memory usage of process, retrieved from CProcessInfo class.
+        All size values are in bytes.
+*/
+struct ProcessMemInfo
+{
+    int64 WorkingSet;
+    int64 PeakWorkingSet;
+    int64 PagefileUsage;
+    int64 PeakPagefileUsage;
+    int64 PageFaultCount;
+};
+
+/** Use this class to query information about current process.
+        Like memory usage, pagefile usage etc..
+*/
+class SANDBOX_API CProcessInfo
+{
+public:
+    CProcessInfo(void);
+    ~CProcessInfo(void);
+
+    /** Retrieve information about memory usage of current process.
+            @param meminfo Output parameter where information is saved.
+    */
+    static void QueryMemInfo(ProcessMemInfo& meminfo);
+};
+
+#endif // CRYINCLUDE_EDITOR_PROCESSINFO_H
diff --git a/Code/Editor/PythonEditorEventsBus.h b/Code/Editor/PythonEditorEventsBus.h
new file mode 100644
index 0000000000..d72487bf59
--- /dev/null
+++ b/Code/Editor/PythonEditorEventsBus.h
@@ -0,0 +1,168 @@
+#pragma once
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/std/any.h>
+
+namespace AzToolsFramework
+{
+    /**
+    * This bus can be used to send commands to the editor.
+    */
+    class EditorLayerPythonRequests
+        : public AZ::ComponentBus
+    {
+    public:
+
+        /*
+        * Gets a CVar value as a string.
+        */
+        virtual const char* GetCVar(const char* pName) = 0;
+
+        /*
+        * Sets a CVar value from any simple value.
+        */
+        virtual void SetCVar(const char* pName, const AZStd::any& value) = 0;
+
+        /*
+        * Sets a CVar value from a string.
+        */
+        virtual void SetCVarFromString(const char* pName, const char* pValue) = 0;
+
+        /*
+        * Sets a CVar value from an integer.
+        */
+        virtual void SetCVarFromInteger(const char* pName, int pValue) = 0;
+
+        /*
+        * Sets a CVar value from a float.
+        */
+        virtual void SetCVarFromFloat(const char* pName, float pValue) = 0;
+
+        /*
+        * Runs a console command.
+        */
+        virtual void PyRunConsole(const char* text) = 0;
+
+        /*
+        * Enters the editor game mode.
+        */
+        virtual void EnterGameMode() = 0;
+
+        /*
+        * Queries if it's in the game mode or not.
+        */
+        virtual bool IsInGameMode() = 0;
+
+        /*
+        * Exits the editor game mode.
+        */
+        virtual void ExitGameMode() = 0;
+
+        /*
+        * Enters the editor AI/Physics simulation mode.
+        */
+        virtual void EnterSimulationMode() = 0;
+
+        /*
+        * Queries if the editor is currently in the AI/Physics simulation mode or not.
+        */
+        virtual bool IsInSimulationMode() = 0;
+
+        /*
+        * Exits the editor AI/Physics simulation mode.
+        */
+        virtual void ExitSimulationMode() = 0;
+
+        /*
+        * Runs a script file. A relative path from the editor user folder or an absolute path should be given as an argument.
+        */
+        virtual void RunFile(const char* pFile) = 0;
+
+        /*
+        * Runs a script file with parameters. A relative path from the editor user folder or an absolute path should be given as an argument. The arguments should be separated by whitespace.
+        */
+        virtual void RunFileParameters(const char* pFile, const char* pArguments) = 0;
+
+        /*
+        * Executes a given string as an editor command.
+        */
+        virtual void ExecuteCommand(const char* cmdline) = 0;
+
+        /*
+        * Shows a confirmation message box with ok|cancel and shows a custom message.
+        */
+        virtual bool MessageBoxOkCancel(const char* pMessage) = 0;
+
+        /*
+        * Shows a confirmation message box with yes|no and shows a custom message.
+        */
+        virtual bool MessageBoxYesNo(const char* pMessage) = 0;
+
+        /*
+        * Shows a confirmation message box with only ok and shows a custom message.
+        */
+        virtual bool MessageBoxOk(const char* pMessage) = 0;
+
+        /*
+        * Shows an edit box and returns the value as string.
+        */
+        virtual AZStd::string EditBox(AZStd::string_view pTitle) = 0;
+
+        /*
+        * Shows an edit box and checks the custom value to use the return value with other functions correctly.
+        */
+        virtual AZStd::any EditBoxCheckDataType(const char* pTitle) = 0;
+
+        /*
+        * Shows an open file box and returns the selected file path and name.
+        */
+        virtual AZStd::string OpenFileBox() = 0;
+
+        /*
+        * Gets axis.
+        */
+        virtual const char* GetAxisConstraint() = 0;
+
+        /*
+        * Sets axis.
+        */
+        virtual void SetAxisConstraint(AZStd::string_view pConstrain) = 0;
+
+        /*
+        * Finds a pak file name for a given file.
+        */
+        virtual const char* GetPakFromFile(const char* filename) = 0;
+
+        /*
+        * Prints the message to the editor console window.
+        */
+        virtual void Log(const char* pMessage) = 0;
+
+        /*
+        * Undoes the last operation.
+        */
+        virtual void Undo() = 0;
+
+        /*
+        * Redoes the last undone operation.
+        */
+        virtual void Redo() = 0;
+
+        /*
+        * Shows a 2d label on the screen at the given position and given color.
+        */
+        virtual void DrawLabel(int x, int y, float size, float r, float g, float b, float a, const char* pLabel) = 0;
+
+        /*
+        * Shows a combo box listing each value passed in, returns string value selected by the user.
+        */
+        virtual AZStd::string ComboBox(AZStd::string title, AZStd::vector<AZStd::string> values, int selectedIdx = 0) = 0;
+    };
+    using EditorLayerPythonRequestBus = AZ::EBus<EditorLayerPythonRequests>;
+}
diff --git a/Code/Editor/PythonEditorFuncs.cpp b/Code/Editor/PythonEditorFuncs.cpp
new file mode 100644
index 0000000000..41ae614492
--- /dev/null
+++ b/Code/Editor/PythonEditorFuncs.cpp
@@ -0,0 +1,1196 @@
+/*
+ * 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 "PythonEditorFuncs.h"
+
+// Qt
+#include <QMessageBox>
+#include <QFileDialog>
+
+#include <AzCore/Utils/Utils.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+
+// Editor
+#include "CryEdit.h"
+#include "GameEngine.h"
+#include "ViewManager.h"
+#include "StringDlg.h"
+#include "GenericSelectItemDialog.h"
+#include "Objects/BaseObject.h"
+#include "Commands/CommandManager.h"
+
+
+namespace
+{
+    //////////////////////////////////////////////////////////////////////////
+    const char* PyGetCVar(const char* pName)
+    {
+        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
+        if (!pCVar)
+        {
+            Warning("PyGetCVar: Attempt to access non-existent CVar '%s'", pName ? pName : "(null)");
+            throw std::logic_error((QString("\"") + pName + "\" is an invalid cvar.").toUtf8().data());
+        }
+        return pCVar->GetString();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    const char* PyGetCVarAsString(const char* pName)
+    {
+        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
+        if (!pCVar)
+        {
+            AZ_Warning("editor", false, "PyGetCVar: Attempt to access non-existent CVar '%s'", pName ? pName : "(null)");
+            return "(missing)";
+        }
+        return pCVar->GetString();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // forward declarations
+    void PySetCVarFromInt(const char* pName, int pValue);
+    void PySetCVarFromFloat(const char* pName, float pValue);
+
+    //////////////////////////////////////////////////////////////////////////
+    void PySetCVarFromString(const char* pName, const char* pValue)
+    {
+        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
+        if (!pCVar)
+        {
+            AZ_Warning("editor", false, "Attempt to set non-existent string CVar '%s'", pName ? pName : "(null)");
+        }
+        else if (pCVar->GetType() == CVAR_INT)
+        {
+            PySetCVarFromInt(pName, std::stol(pValue));
+        }
+        else if (pCVar->GetType() == CVAR_FLOAT)
+        {
+            PySetCVarFromFloat(pName, std::stod(pValue));
+        }
+        else if (pCVar->GetType() != CVAR_STRING)
+        {
+            AZ_Warning("editor", false, "Type mismatch while assigning CVar '%s' as a string.", pName ? pName : "(null)");
+        }
+        else
+        {
+            pCVar->Set(pValue);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PySetCVarFromInt(const char* pName, int pValue)
+    {
+        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
+        if (!pCVar)
+        {
+            AZ_Warning("editor", false, "Attempt to set non-existent integer CVar '%s'", pName ? pName : "(null)");
+        }
+        else if (pCVar->GetType() == CVAR_FLOAT)
+        {
+            PySetCVarFromFloat(pName, float(pValue));
+        }
+        else if (pCVar->GetType() == CVAR_STRING)
+        {
+            auto stringValue = AZStd::to_string(pValue);
+            PySetCVarFromString(pName, stringValue.c_str());
+        }
+        else if (pCVar->GetType() != CVAR_INT)
+        {
+            AZ_Warning("editor", false, "Type mismatch while assigning CVar '%s' as an integer.", pName ? pName : "(null)");
+        }
+        else
+        {
+            pCVar->Set(pValue);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PySetCVarFromFloat(const char* pName, float pValue)
+    {
+        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
+        if (!pCVar)
+        {
+            AZ_Warning("editor", false, "Attempt to set non-existent float CVar '%s'", pName ? pName : "(null)");
+        }
+        else if (pCVar->GetType() == CVAR_INT)
+        {
+            PySetCVarFromInt(pName, static_cast<int>(pValue));
+        }
+        else if (pCVar->GetType() == CVAR_STRING)
+        {
+            auto stringValue = AZStd::to_string(pValue);
+            PySetCVarFromString(pName, stringValue.c_str());
+        }
+        else if (pCVar->GetType() != CVAR_FLOAT)
+        {
+            AZ_Warning("editor", false, "Type mismatch while assigning CVar '%s' as a float.", pName ? pName : "(null)");
+        }
+        else
+        {
+            pCVar->Set(pValue);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PySetCVarFromAny(const char* pName, const AZStd::any& value)
+    {
+        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
+        if (!pCVar)
+        {
+            AZ_Warning("editor", false, "Attempt to set non-existent float CVar '%s'", pName ? pName : "(null)");
+        }
+        else if (pCVar->GetType() == CVAR_INT)
+        {
+            PySetCVarFromInt(pName, AZStd::any_cast<AZ::s64>(value));
+        }
+        else if (pCVar->GetType() == CVAR_FLOAT)
+        {
+            PySetCVarFromFloat(pName, AZStd::any_cast<double>(value));
+        }
+        else if (pCVar->GetType() == CVAR_STRING)
+        {
+            PySetCVarFromString(pName, AZStd::any_cast<AZStd::string_view>(value).data());
+        }
+        else
+        {
+            AZ_Warning("editor", false, "Type mismatch while assigning CVar '%s' as a float.", pName ? pName : "(null)");
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PyEnterGameMode()
+    {
+        if (GetIEditor()->GetGameEngine())
+        {
+            GetIEditor()->GetGameEngine()->RequestSetGameMode(true);
+        }
+    }
+
+    void PyExitGameMode()
+    {
+        if (GetIEditor()->GetGameEngine())
+        {
+            GetIEditor()->GetGameEngine()->RequestSetGameMode(false);
+        }
+    }
+
+    bool PyIsInGameMode()
+    {
+        return GetIEditor()->IsInGameMode();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PyEnterSimulationMode()
+    {
+        if (!GetIEditor()->IsInSimulationMode())
+        {
+            CCryEditApp::instance()->OnSwitchPhysics();
+        }
+    }
+
+    void PyExitSimulationMode()
+    {
+        if (GetIEditor()->IsInSimulationMode())
+        {
+            CCryEditApp::instance()->OnSwitchPhysics();
+        }
+    }
+
+    bool PyIsInSimulationMode()
+    {
+        return GetIEditor()->IsInSimulationMode();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    QString PyNewObject(const char* typeName, const char* fileName, const char* name, float x, float y, float z)
+    {
+        CBaseObject* object = GetIEditor()->NewObject(typeName, fileName, name, x, y, z);
+        if (object)
+        {
+            return object->GetName();
+        }
+        else
+        {
+            return "";
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    QString PyNewObjectAtCursor(const char* typeName, const char* fileName, const char* name)
+    {
+        CUndo undo("Create new object");
+
+        Vec3 pos(0, 0, 0);
+
+        QPoint p = QCursor::pos();
+        CViewport* viewport = GetIEditor()->GetViewManager()->GetViewportAtPoint(p);
+        if (viewport)
+        {
+            viewport->ScreenToClient(p);
+            if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
+            {
+                pos = viewport->MapViewToCP(p);
+            }
+            else
+            {
+                // Snap to terrain.
+                bool hitTerrain;
+                pos = viewport->ViewToWorld(p, &hitTerrain);
+                if (hitTerrain)
+                {
+                    pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y) + 1.0f;
+                }
+                pos = viewport->SnapToGrid(pos);
+            }
+        }
+
+        return PyNewObject(typeName, fileName, name, pos.x, pos.y, pos.z);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PyRunConsole(const char* text)
+    {
+        GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(text);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    bool GetPythonScriptPath(const char* pFile, QString& path)
+    {
+        bool bRelativePath = true;
+        char drive[_MAX_DRIVE];
+        char fdir[_MAX_DIR];
+        char fname[_MAX_FNAME];
+        char fext[_MAX_EXT];
+        drive[0] = '\0';
+
+        _splitpath_s(pFile, drive, fdir, fname, fext);
+        if (strlen(drive) != 0)
+        {
+            bRelativePath = false;
+        }
+
+        if (bRelativePath)
+        {
+            // Try to open from user folder
+            QString userSandboxFolder = Path::GetResolvedUserSandboxFolder();
+            Path::ConvertBackSlashToSlash(userSandboxFolder);
+            path = userSandboxFolder + pFile;
+
+            // If not found try editor folder
+            if (!CFileUtil::FileExists(path))
+            {
+                AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
+                QDir engineDir = !engineRoot.empty() ? QDir(QString(engineRoot.c_str())) : QDir::current();
+
+                QString scriptFolder = engineDir.absoluteFilePath("Assets/Editor/Scripts/");
+                Path::ConvertBackSlashToSlash(scriptFolder);
+                path = scriptFolder + pFile;
+
+                if (!CFileUtil::FileExists(path))
+                {
+                    QString error = QString("Could not find '%1'\n in '%2'\n or '%3'\n").arg(pFile).arg(userSandboxFolder).arg(scriptFolder);
+                    AZ_Warning("python", false, error.toUtf8().data());
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            path = pFile;
+            if (!CFileUtil::FileExists(path))
+            {
+                QString error = QString("Could not find '") + pFile + "'\n";
+                AZ_Warning("python", false, error.toUtf8().data());
+                return false;
+            }
+        }
+
+        Path::ConvertBackSlashToSlash(path);
+        return true;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void GetPythonArgumentsVector(const char* pArguments, QStringList& inputArguments)
+    {
+        if (pArguments == NULL)
+        {
+            return;
+        }
+
+        inputArguments = QString(pArguments).split(" ", Qt::SkipEmptyParts);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PyRunFileWithParameters(const char* pFile, const char* pArguments)
+    {
+        QString path;
+        QStringList inputArguments;
+        GetPythonArgumentsVector(pArguments, inputArguments);
+        if (GetPythonScriptPath(pFile, path))
+        {
+            AZStd::vector<AZStd::string_view> argList;
+            argList.reserve(inputArguments.size() + 1);
+            QByteArray p = path.toUtf8();
+
+            QVector<QByteArray> argData;
+            argData.reserve(inputArguments.count());
+            for (auto iter = inputArguments.begin(); iter != inputArguments.end(); ++iter)
+            {
+                argData.push_back(iter->toLatin1());
+                argList.push_back(argData.last().data());
+            }
+            using namespace AzToolsFramework;
+            EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, p.data(), argList);
+        }
+    }
+
+    void PyRunFile(const char* pFile)
+    {
+        PyRunFileWithParameters(pFile, nullptr);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PyExecuteCommand(const char* cmdline)
+    {
+        GetIEditor()->GetCommandManager()->Execute(cmdline);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PyLog(const char* pMessage)
+    {
+        if (strcmp(pMessage, "") != 0)
+        {
+            CryLogAlways(pMessage);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    bool PyMessageBox(const char* pMessage)
+    {
+        return QMessageBox::information(QApplication::activeWindow(), QString(), pMessage, QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok;
+    }
+
+    bool PyMessageBoxYesNo(const char* pMessage)
+    {
+        return QMessageBox::question(QApplication::activeWindow(), QString(), pMessage) == QMessageBox::Yes;
+    }
+
+    bool PyMessageBoxOK(const char* pMessage)
+    {
+        return QMessageBox::information(QApplication::activeWindow(), QString(), pMessage) == QMessageBox::Ok;
+    }
+
+    AZStd::string PyEditBox(AZStd::string_view pTitle)
+    {
+        StringDlg stringDialog(pTitle.data());
+        if (stringDialog.exec() == QDialog::Accepted)
+        {
+            return stringDialog.GetString().toUtf8().constData();
+        }
+        return "";
+    }
+
+    AZStd::any PyEditBoxAndCheckProperty(const char* pTitle)
+    {
+        StringDlg stringDialog(pTitle);
+        stringDialog.SetString(QStringLiteral(""));
+        if (stringDialog.exec() == QDialog::Accepted)
+        {
+            const QString stringValue = stringDialog.GetString();
+
+            // detect data type
+            QString tempString = stringValue;
+            int countComa = 0;
+            int countOpenRoundBraket = 0;
+            int countCloseRoundBraket = 0;
+            int countDots = 0;
+
+            int posDots = 0;
+            int posComa = 0;
+            int posOpenRoundBraket = 0;
+            int posCloseRoundBraket = 0;
+
+            for (int i = 0; i < 3; i++)
+            {
+                if (tempString.indexOf(".", posDots) > -1)
+                {
+                    posDots = tempString.indexOf(".", posDots) + 1;
+                    countDots++;
+                }
+                if (tempString.indexOf(",", posComa) > -1)
+                {
+                    posComa = tempString.indexOf(",", posComa) + 1;
+                    countComa++;
+                }
+                if (tempString.indexOf("(", posOpenRoundBraket) > -1)
+                {
+                    posOpenRoundBraket = tempString.indexOf("(", posOpenRoundBraket) + 1;
+                    countOpenRoundBraket++;
+                }
+                if (tempString.indexOf(")", posCloseRoundBraket) > -1)
+                {
+                    posCloseRoundBraket = tempString.indexOf(")", posCloseRoundBraket) + 1;
+                    countCloseRoundBraket++;
+                }
+            }
+
+            if (countDots == 3 && countComa == 2 && countOpenRoundBraket == 1 && countCloseRoundBraket == 1)
+            {
+                // for example: (1.95, 2.75, 3.36)
+                QString valueRed = stringValue;
+                int iStart = valueRed.indexOf("(");
+                valueRed.remove(0, iStart + 1);
+                int iEnd = valueRed.indexOf(",");
+                valueRed.remove(iEnd, valueRed.length());
+                float fValueRed = valueRed.toFloat();
+
+                QString valueGreen = stringValue;
+                iStart = valueGreen.indexOf(",");
+                valueGreen.remove(0, iStart + 1);
+                iEnd = valueGreen.indexOf(",");
+                valueGreen.remove(iEnd, valueGreen.length());
+                float fValueGreen = valueGreen.toFloat();
+
+                QString valueBlue = stringValue;
+                valueBlue.remove(0, valueBlue.indexOf(",") + 1);
+                valueBlue.remove(0, valueBlue.indexOf(",") + 1);
+                valueBlue.remove(valueBlue.indexOf(")"), valueBlue.length());
+                float fValueBlue = valueBlue.toFloat();
+
+                return AZStd::make_any<AZ::Vector3>(fValueRed, fValueGreen, fValueBlue);
+            }
+            else if (countDots == 0 && countComa == 2 && countOpenRoundBraket == 1 && countCloseRoundBraket == 1)
+            {
+                // for example: (128, 32, 240)
+                const AZ::u8 lowColorValue { 0 };
+                const AZ::u8 highColorValue { 255 };
+                QString valueRed = stringValue;
+                int iStart = valueRed.indexOf("(");
+                valueRed.remove(0, iStart + 1);
+                int iEnd = valueRed.indexOf(",");
+                valueRed.remove(iEnd, valueRed.length());
+                AZ::u8 iValueRed = AZStd::clamp(aznumeric_cast<AZ::u8>(valueRed.toInt()), lowColorValue, highColorValue);
+
+                QString valueGreen = stringValue;
+                iStart = valueGreen.indexOf(",");
+                valueGreen.remove(0, iStart + 1);
+                iEnd = valueGreen.indexOf(",");
+                valueGreen.remove(iEnd, valueGreen.length());
+                AZ::u8 iValueGreen = AZStd::clamp(aznumeric_cast<AZ::u8>(valueGreen.toInt()), lowColorValue, highColorValue);
+
+                QString valueBlue = stringValue;
+                valueBlue.remove(0, valueBlue.indexOf(",") + 1);
+                valueBlue.remove(0, valueBlue.indexOf(",") + 1);
+                valueBlue.remove(valueBlue.indexOf(")"), valueBlue.length());
+                AZ::u8 iValueBlue = AZStd::clamp(aznumeric_cast<AZ::u8>(valueBlue.toInt()), lowColorValue, highColorValue);
+
+                return AZStd::make_any<AZ::Color>(iValueRed, iValueGreen, iValueBlue, highColorValue);
+            }
+            else if (countDots == 1 && countComa == 0 && countOpenRoundBraket == 0 && countCloseRoundBraket == 0)
+            {
+                // for example: 2.56
+                return AZStd::make_any<double>(stringValue.toDouble());
+            }
+            else if (countDots == 0 && countComa == 0 && countOpenRoundBraket == 0 && countCloseRoundBraket == 0)
+            {
+                if (stringValue == "False" || stringValue == "True")
+                {
+                    // for example: True
+                    return AZStd::make_any<bool>(stringValue == "True");
+                }
+                else
+                {
+                    const bool anyNotDigits = AZStd::any_of(stringValue.begin(), stringValue.end(), [](const QChar& ch) { return !ch.isDigit(); });
+
+                    // looks like a string value?
+                    if (stringValue.isEmpty() || anyNotDigits)
+                    {
+                        // for example: Hello
+                        return AZStd::make_any<AZStd::string>(stringValue.toUtf8().data());
+                    }
+                    else // then it looks like an integer
+                    {
+                        // for example: 456
+                        return AZStd::make_any<AZ::s64>(stringValue.toInt());
+                    }
+                }
+            }
+        }
+        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QObject::tr("Invalid Data"), QObject::tr("Invalid data type."));
+        return {};
+    }
+
+    AZStd::string PyOpenFileBox()
+    {
+        QString path = QFileDialog::getOpenFileName();
+        if (!path.isEmpty())
+        {
+            Path::ConvertBackSlashToSlash(path);
+        }
+        return path.toUtf8().constData();
+    }
+
+    AZStd::string PyComboBox(AZStd::string title, AZStd::vector<AZStd::string> values, int selectedIdx = 0)
+    {
+        AZStd::string result;
+
+        if (title.empty())
+        {
+            throw std::runtime_error("Incorrect title argument passed in. ");
+            return result;
+        }
+
+        if (values.size() == 0)
+        {
+            throw std::runtime_error("Empty value list passed in. ");
+            return result;
+        }
+
+        QStringList list;
+
+        for (const AZStd::string& str : values)
+        {
+            list.push_back(str.c_str());
+        }
+
+        CGenericSelectItemDialog pyDlg;
+        pyDlg.setWindowTitle(title.c_str());
+        pyDlg.SetMode(CGenericSelectItemDialog::eMODE_LIST);
+        pyDlg.SetItems(list);
+        pyDlg.PreSelectItem(list[selectedIdx]);
+
+        if (pyDlg.exec() == QDialog::Accepted)
+        {
+            result = pyDlg.GetSelectedItem().toUtf8().constData();
+        }
+
+        return result;
+    }
+
+    void PyCrash()
+    {
+        AZ_Crash();
+    }
+
+    static void PyDrawLabel(int x, int y, float size, float r, float g, float b, float a, const char* pLabel)
+    {
+        if (!pLabel)
+        {
+            throw std::logic_error("No label given.");
+            return;
+        }
+
+        if (!r || !g || !b || !a)
+        {
+            throw std::logic_error("Invalid color parameters given.");
+            return;
+        }
+
+        if (!x || !y || !size)
+        {
+            throw std::logic_error("Invalid position or size parameters given.");
+        }
+        else
+        {
+            // ToDo: Remove function or update to work with Atom? LYN-3672
+            // float color[] = {r, g, b, a};
+            // ???->Draw2dLabel(x, y, size, color, false, pLabel);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Constrain
+    //////////////////////////////////////////////////////////////////////////
+    const char* PyGetAxisConstraint()
+    {
+        AxisConstrains actualConstrain = GetIEditor()->GetAxisConstrains();
+        switch (actualConstrain)
+        {
+        case AXIS_X:
+            return "X";
+        case AXIS_Y:
+            return "Y";
+        case AXIS_Z:
+            return "Z";
+        case AXIS_XY:
+            return "XY";
+        case AXIS_XZ:
+            return "XZ";
+        case AXIS_YZ:
+            return "YZ";
+        case AXIS_XYZ:
+            return "XYZ";
+        case AXIS_TERRAIN:
+            return (GetIEditor()->IsTerrainAxisIgnoreObjects()) ? "TERRAIN" : "TERRAINSNAP";
+        default:
+            throw std::logic_error("Invalid axes.");
+        }
+    }
+
+    void PySetAxisConstraint(AZStd::string_view pConstrain)
+    {
+        if (pConstrain == "X")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_X);
+        }
+        else if (pConstrain == "Y")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_Y);
+        }
+        else if (pConstrain == "Z")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_Z);
+        }
+        else if (pConstrain == "XY")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_XY);
+        }
+        else if (pConstrain == "YZ")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_YZ);
+        }
+        else if (pConstrain == "XZ")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_XZ);
+        }
+        else if (pConstrain == "XYZ")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_XYZ);
+        }
+        else if (pConstrain == "TERRAIN")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_TERRAIN);
+            GetIEditor()->SetTerrainAxisIgnoreObjects(true);
+        }
+        else if (pConstrain == "TERRAINSNAP")
+        {
+            GetIEditor()->SetAxisConstraints(AXIS_TERRAIN);
+            GetIEditor()->SetTerrainAxisIgnoreObjects(false);
+        }
+        else
+        {
+            throw std::logic_error("Invalid axes.");
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    const char* PyGetPakFromFile(const char* filename)
+    {
+        auto pIPak = GetIEditor()->GetSystem()->GetIPak();
+        AZ::IO::HandleType fileHandle = pIPak->FOpen(filename, "rb");
+        if (fileHandle == AZ::IO::InvalidHandle)
+        {
+            throw std::logic_error("Invalid file name.");
+        }
+        const char* pArchPath = pIPak->GetFileArchivePath(fileHandle);
+        pIPak->FClose(fileHandle);
+        return pArchPath;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PyUndo()
+    {
+        GetIEditor()->Undo();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void PyRedo()
+    {
+        GetIEditor()->Redo();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Temporal, to be removed by LY-101149
+AZ::EntityId PyFindEditorEntity(const char* name)
+{
+    AZ::EntityId foundEntityId;
+
+    auto searchFunc = [name, &foundEntityId](AZ::Entity* e)
+    {
+        if (!foundEntityId.IsValid() && e->GetName() == name)
+        {
+            bool isEditorEntity = false;
+            AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, e->GetId());
+            if (isEditorEntity)
+            {
+                foundEntityId = e->GetId();
+            }
+        }
+    };
+
+    AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationRequests::EnumerateEntities, searchFunc);
+    return foundEntityId;
+}
+
+AZ::EntityId PyFindGameEntity(const char* name)
+{
+    AZ::EntityId foundEntityId;
+
+    auto searchFunc = [name, &foundEntityId](AZ::Entity* e)
+    {
+        if (!foundEntityId.IsValid() && e->GetName() == name)
+        {
+            bool isEditorEntity = true;
+            AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, e->GetId());
+            if (!isEditorEntity)
+            {
+                foundEntityId = e->GetId();
+            }
+        }
+    };
+
+    AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationRequests::EnumerateEntities, searchFunc);
+    return foundEntityId;
+}
+
+
+struct PyDumpBindings
+{
+    static AZ_INLINE bool IsBehaviorFlaggedForEditor(const AZ::AttributeArray& attributes)
+    {
+        // defaults to Launcher
+        AZ::Script::Attributes::ScopeFlags scopeType = AZ::Script::Attributes::ScopeFlags::Launcher;
+        AZ::Attribute* scopeAttribute = AZ::FindAttribute(AZ::Script::Attributes::Scope, attributes);
+        if (scopeAttribute)
+        {
+            AZ::AttributeReader scopeAttributeReader(nullptr, scopeAttribute);
+            scopeAttributeReader.Read<AZ::Script::Attributes::ScopeFlags>(scopeType);
+        }
+        return (scopeType == AZ::Script::Attributes::ScopeFlags::Automation || scopeType == AZ::Script::Attributes::ScopeFlags::Common);
+    }
+
+    static AZ_INLINE AZStd::string GetModuleName(const AZ::AttributeArray& attributes)
+    {
+        AZStd::string moduleName;
+        AZ::Attribute* moduleAttribute = AZ::FindAttribute(AZ::Script::Attributes::Module, attributes);
+        if (moduleAttribute)
+        {
+            AZ::AttributeReader scopeAttributeReader(nullptr, moduleAttribute);
+            scopeAttributeReader.Read<AZStd::string>(moduleName);
+        }
+        if (!moduleName.empty())
+        {
+            moduleName = "azlmbr." + moduleName;
+        }
+        else
+        {
+            moduleName = "azlmbr";
+        }
+
+        return moduleName;
+    }
+
+
+    static AZStd::string ParameterToString(const AZ::BehaviorMethod* method, size_t index)
+    {
+        const AZStd::string* argNameStr = method->GetArgumentName(index);
+        const char* argName = (argNameStr && !argNameStr->empty()) ? argNameStr->c_str() : nullptr;
+        if (argName)
+        {
+            return AZStd::string::format("%s %s", method->GetArgument(index)->m_name, argName);
+        }
+        else
+        {
+            return method->GetArgument(index)->m_name;
+        }
+    }
+
+    static AZStd::string MethodArgumentsToString(const AZ::BehaviorMethod* method)
+    {
+        AZStd::string ret;
+        AZStd::string argumentStr;
+        for (size_t i = 0; i < method->GetNumArguments(); ++i)
+        {
+            argumentStr = ParameterToString(method, i);
+            ret += argumentStr;
+            if (i < method->GetNumArguments() - 1)
+            {
+                ret += ", ";
+            }
+        }
+        return ret;
+    }
+
+    static AZStd::string MethodToString(const AZStd::string& methodName, const AZ::BehaviorMethod* method)
+    {
+        AZStd::string methodNameStrip = methodName.data() + methodName.rfind(':') + 1; // remove ClassName:: part as it is redundant
+        return AZStd::string::format("%s %s(%s)%s", method->GetResult()->m_name, methodNameStrip.c_str(), MethodArgumentsToString(method).c_str(), method->m_isConst ? " const" : "");
+    }
+
+    static AZStd::string GetExposedPythonClasses()
+    {
+        AZ::BehaviorContext* behaviorContext(nullptr);
+        AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationRequests::GetBehaviorContext);
+
+        AZStd::string output = "";
+        output += "// Classes\n\n";
+
+        for (auto elem : behaviorContext->m_classes)
+        {
+            AZ::BehaviorClass* cls = elem.second;
+
+            bool exposedToPython = IsBehaviorFlaggedForEditor(cls->m_attributes);
+            if (!exposedToPython)
+                continue;
+
+            output += AZStd::string::format("// Module: %s\n", GetModuleName(cls->m_attributes).c_str());
+            output += AZStd::string::format("class %s\n", cls->m_name.c_str());
+            output += "{\n";
+
+            if (cls->m_methods.size() > 0)
+            {
+                output += "    // Methods\n";
+                for (auto method_elem : cls->m_methods)
+                {
+                    output += AZStd::string::format("    %s;\n", MethodToString(method_elem.first, method_elem.second).c_str());
+                }
+            }
+            if (cls->m_properties.size() > 0)
+            {
+                output += "    // Properties\n";
+                for (auto property_elem : cls->m_properties)
+                {
+                    AZ::BehaviorProperty* bproperty = property_elem.second;
+                    output += AZStd::string::format("    %s %s;\n", bproperty->m_getter->GetResult()->m_name, bproperty->m_name.c_str());
+                }
+            }
+
+            output += "}\n";
+        }
+        output += "\n\n// Ebuses\n\n";
+        for (auto elem : behaviorContext->m_ebuses)
+        {
+            AZ::BehaviorEBus* ebus = elem.second;
+
+            bool exposedToPython = IsBehaviorFlaggedForEditor(ebus->m_attributes);
+            if (!exposedToPython)
+                continue;
+
+            output += AZStd::string::format("// Module: %s\n", GetModuleName(ebus->m_attributes).c_str());
+            output += AZStd::string::format("ebus %s\n", ebus->m_name.c_str());
+            output += "{\n";
+            for (auto event_elem : ebus->m_events)
+            {
+                auto method = event_elem.second.m_event ? event_elem.second.m_event : event_elem.second.m_broadcast;
+                if (method)
+                {
+                    const char* comment = event_elem.second.m_event ? "/* event */" : "/* broadcast */";
+                    output += AZStd::string::format("    %s %s\n", comment, MethodToString(event_elem.first, method).c_str());
+                }
+                else
+                {
+                    output += AZStd::string::format("    %s %s\n", "/* unknown */", event_elem.first.c_str());
+                }
+            }
+
+            if (ebus->m_createHandler)
+            {
+                AZ::BehaviorEBusHandler* handler = nullptr;
+                ebus->m_createHandler->InvokeResult(handler);
+                if (handler)
+                {
+                    const auto& notifications = handler->GetEvents();
+                    for (const auto& notification : notifications)
+                    {
+                        AZStd::string argsStr;
+                        const size_t paramCount = notification.m_parameters.size();
+                        for (size_t i = 0; i < notification.m_parameters.size(); ++i)
+                        {
+                            AZStd::string argName = notification.m_parameters[i].m_name;
+                            argsStr += argName;
+                            if (i != paramCount - 1)
+                            {
+                                argsStr += ", ";
+                            }
+                        }
+
+                        AZStd::string funcName = notification.m_name;
+                        output += AZStd::string::format("    /* notification */ %s(%s);\n", funcName.c_str(), argsStr.c_str());
+                    }
+                    ebus->m_destroyHandler->Invoke(handler);
+                }
+            }
+
+            output += "}\n";
+
+        }
+        AzFramework::StringFunc::Replace(output, "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>", "AZStd::string");
+        return output;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+namespace AzToolsFramework
+{
+    void PythonEditorComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->EBus<EditorLayerPythonRequestBus>("PythonEditorBus")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                ->Attribute(AZ::Script::Attributes::Module, "python_editor_funcs")
+                ->Event("GetCVar", &EditorLayerPythonRequestBus::Events::GetCVar)
+                ->Event("SetCVar", &EditorLayerPythonRequestBus::Events::SetCVar)
+                ->Event("SetCVarFromString", &EditorLayerPythonRequestBus::Events::SetCVarFromString)
+                ->Event("SetCVarFromInteger", &EditorLayerPythonRequestBus::Events::SetCVarFromInteger)
+                ->Event("SetCVarFromFloat", &EditorLayerPythonRequestBus::Events::SetCVarFromFloat)
+                ->Event("RunConsole", &EditorLayerPythonRequestBus::Events::PyRunConsole)
+                ->Event("EnterGameMode", &EditorLayerPythonRequestBus::Events::EnterGameMode)
+                ->Event("IsInGameMode", &EditorLayerPythonRequestBus::Events::IsInGameMode)
+                ->Event("ExitGameMode", &EditorLayerPythonRequestBus::Events::ExitGameMode)
+                ->Event("EnterSimulationMode", &EditorLayerPythonRequestBus::Events::EnterSimulationMode)
+                ->Event("IsInSimulationMode", &EditorLayerPythonRequestBus::Events::IsInSimulationMode)
+                ->Event("ExitSimulationMode", &EditorLayerPythonRequestBus::Events::ExitSimulationMode)
+                ->Event("RunFile", &EditorLayerPythonRequestBus::Events::RunFile)
+                ->Event("RunFileParameters", &EditorLayerPythonRequestBus::Events::RunFileParameters)
+                ->Event("ExecuteCommand", &EditorLayerPythonRequestBus::Events::ExecuteCommand)
+                ->Event("MessageBoxOkCancel", &EditorLayerPythonRequestBus::Events::MessageBoxOkCancel)
+                ->Event("MessageBoxYesNo", &EditorLayerPythonRequestBus::Events::MessageBoxYesNo)
+                ->Event("MessageBoxOk", &EditorLayerPythonRequestBus::Events::MessageBoxOk)
+                ->Event("EditBox", &EditorLayerPythonRequestBus::Events::EditBox)
+                ->Event("EditBoxCheckDataType", &EditorLayerPythonRequestBus::Events::EditBoxCheckDataType)
+                ->Event("OpenFileBox", &EditorLayerPythonRequestBus::Events::OpenFileBox)
+                ->Event("GetAxisConstraint", &EditorLayerPythonRequestBus::Events::GetAxisConstraint)
+                ->Event("SetAxisConstraint", &EditorLayerPythonRequestBus::Events::SetAxisConstraint)
+                ->Event("GetPakFromFile", &EditorLayerPythonRequestBus::Events::GetPakFromFile)
+                ->Event("Log", &EditorLayerPythonRequestBus::Events::Log)
+                ->Event("Undo", &EditorLayerPythonRequestBus::Events::Undo)
+                ->Event("Redo", &EditorLayerPythonRequestBus::Events::Redo)
+                ->Event("DrawLabel", &EditorLayerPythonRequestBus::Events::DrawLabel)
+                ->Event("ComboBox", &EditorLayerPythonRequestBus::Events::ComboBox)
+                ;
+        }
+    }
+
+    void PythonEditorComponent::Activate()
+    {
+        EditorLayerPythonRequestBus::Handler::BusConnect(GetEntityId());
+    }
+
+    void PythonEditorComponent::Deactivate()
+    {
+        EditorLayerPythonRequestBus::Handler::BusDisconnect();
+    }
+
+    const char* PythonEditorComponent::GetCVar(const char* pName)
+    {
+        return PyGetCVarAsString(pName);
+    }
+
+    void PythonEditorComponent::SetCVar(const char* pName, const AZStd::any& value)
+    {
+        return PySetCVarFromAny(pName, value);
+    }
+
+    void PythonEditorComponent::SetCVarFromString(const char* pName, const char* pValue)
+    {
+        return PySetCVarFromString(pName, pValue);
+    }
+
+    void PythonEditorComponent::SetCVarFromInteger(const char* pName, int pValue)
+    {
+        return PySetCVarFromInt(pName, pValue);
+    }
+
+    void PythonEditorComponent::SetCVarFromFloat(const char* pName, float pValue)
+    {
+        return PySetCVarFromFloat(pName, pValue);
+    }
+
+    void PythonEditorComponent::PyRunConsole(const char* text)
+    {
+        return ::PyRunConsole(text);
+    }
+
+    void PythonEditorComponent::EnterGameMode()
+    {
+        return PyEnterGameMode();
+    }
+
+    bool PythonEditorComponent::IsInGameMode()
+    {
+        return PyIsInGameMode();
+    }
+
+    void PythonEditorComponent::ExitGameMode()
+    {
+        return PyExitGameMode();
+    }
+
+    void PythonEditorComponent::EnterSimulationMode()
+    {
+        return PyEnterSimulationMode();
+    }
+
+    bool PythonEditorComponent::IsInSimulationMode()
+    {
+        return PyIsInSimulationMode();
+    }
+
+    void PythonEditorComponent::ExitSimulationMode()
+    {
+        return PyExitSimulationMode();
+    }
+
+    void PythonEditorComponent::RunFile(const char *pFile)
+    {
+        return PyRunFile(pFile);
+    }
+
+    void PythonEditorComponent::RunFileParameters(const char* pFile, const char* pArguments)
+    {
+        return PyRunFileWithParameters(pFile, pArguments);
+    }
+
+    void PythonEditorComponent::ExecuteCommand(const char* cmdline)
+    {
+        return PyExecuteCommand(cmdline);
+    }
+
+    bool PythonEditorComponent::MessageBoxOkCancel(const char* pMessage)
+    {
+        return PyMessageBox(pMessage);
+    }
+
+    bool PythonEditorComponent::MessageBoxYesNo(const char* pMessage)
+    {
+        return PyMessageBoxYesNo(pMessage);
+    }
+
+    bool PythonEditorComponent::MessageBoxOk(const char* pMessage)
+    {
+        return PyMessageBoxOK(pMessage);
+    }
+
+    AZStd::string PythonEditorComponent::EditBox(AZStd::string_view pTitle)
+    {
+        return PyEditBox(pTitle);
+    }
+
+    AZStd::any PythonEditorComponent::EditBoxCheckDataType(const char* pTitle)
+    {
+        return PyEditBoxAndCheckProperty(pTitle);
+    }
+
+    AZStd::string PythonEditorComponent::OpenFileBox()
+    {
+        return PyOpenFileBox();
+    }
+
+    const char* PythonEditorComponent::GetAxisConstraint()
+    {
+        return PyGetAxisConstraint();
+    }
+
+    void PythonEditorComponent::SetAxisConstraint(AZStd::string_view pConstrain)
+    {
+        return PySetAxisConstraint(pConstrain);
+    }
+
+    const char* PythonEditorComponent::GetPakFromFile(const char* filename)
+    {
+        return PyGetPakFromFile(filename);
+    }
+
+    void PythonEditorComponent::Log(const char* pMessage)
+    {
+        return PyLog(pMessage);
+    }
+
+    void PythonEditorComponent::Undo()
+    {
+        return PyUndo();
+    }
+
+    void PythonEditorComponent::Redo()
+    {
+        return PyRedo();
+    }
+
+    void PythonEditorComponent::DrawLabel(int x, int y, float size, float r, float g, float b, float a, const char* pLabel)
+    {
+        return PyDrawLabel(x, y, size, r, g, b, a, pLabel);
+    }
+
+    AZStd::string PythonEditorComponent::ComboBox(AZStd::string title, AZStd::vector<AZStd::string> values, int selectedIdx)
+    {
+        return PyComboBox(title, values, selectedIdx);
+    }
+}
+
+namespace AzToolsFramework
+{
+    void PythonEditorFuncsHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            // this will put these methods into the 'azlmbr.legacy.general' module
+            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/General")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
+            };
+            addLegacyGeneral(behaviorContext->Method("get_cvar", PyGetCVarAsString, nullptr, "Gets a CVar value as a string."));
+            addLegacyGeneral(behaviorContext->Method("set_cvar", PySetCVarFromAny, nullptr, "Sets a CVar value from any simple value."));
+            addLegacyGeneral(behaviorContext->Method("set_cvar_string", PySetCVarFromString, nullptr, "Sets a CVar value from a string."));
+            addLegacyGeneral(behaviorContext->Method("set_cvar_integer", PySetCVarFromInt, nullptr, "Sets a CVar value from an integer."));
+            addLegacyGeneral(behaviorContext->Method("set_cvar_float", PySetCVarFromFloat, nullptr, "Sets a CVar value from a float."));
+            addLegacyGeneral(behaviorContext->Method("run_console", PyRunConsole, nullptr, "Runs a console command."));
+
+            addLegacyGeneral(behaviorContext->Method("enter_game_mode", PyEnterGameMode, nullptr, "Enters the editor game mode."));
+            addLegacyGeneral(behaviorContext->Method("is_in_game_mode", PyIsInGameMode, nullptr, "Queries if it's in the game mode or not."));
+            addLegacyGeneral(behaviorContext->Method("exit_game_mode", PyExitGameMode, nullptr, "Exits the editor game mode."));
+
+            addLegacyGeneral(behaviorContext->Method("enter_simulation_mode", PyEnterSimulationMode, nullptr, "Enters the editor AI/Physics simulation mode."));
+            addLegacyGeneral(behaviorContext->Method("is_in_simulation_mode", PyIsInSimulationMode, nullptr, "Queries if the editor is currently in the AI/Physics simulation mode or not."));
+            addLegacyGeneral(behaviorContext->Method("exit_simulation_mode", PyExitSimulationMode, nullptr, "Exits the editor AI/Physics simulation mode."));
+            addLegacyGeneral(behaviorContext->Method("run_file", PyRunFile, nullptr, "Runs a script file. A relative path from the editor user folder or an absolute path should be given as an argument."));
+            addLegacyGeneral(behaviorContext->Method("run_file_parameters", PyRunFileWithParameters, nullptr, "Runs a script file with parameters. A relative path from the editor user folder or an absolute path should be given as an argument. The arguments should be separated by whitespace."));
+            addLegacyGeneral(behaviorContext->Method("execute_command", PyExecuteCommand, nullptr, "Executes a given string as an editor command."));
+
+            addLegacyGeneral(behaviorContext->Method("message_box", PyMessageBox, nullptr, "Shows a confirmation message box with ok|cancel and shows a custom message."));
+            addLegacyGeneral(behaviorContext->Method("message_box_yes_no", PyMessageBoxYesNo, nullptr, "Shows a confirmation message box with yes|no and shows a custom message."));
+            addLegacyGeneral(behaviorContext->Method("message_box_ok", PyMessageBoxOK, nullptr, "Shows a confirmation message box with only ok and shows a custom message."));
+            addLegacyGeneral(behaviorContext->Method("edit_box", PyEditBox, nullptr, "Shows an edit box and returns the value as string."));
+
+            addLegacyGeneral(behaviorContext->Method("edit_box_check_data_type", PyEditBoxAndCheckProperty, nullptr, "Shows an edit box and checks the custom value to use the return value with other functions correctly."));
+
+            addLegacyGeneral(behaviorContext->Method("open_file_box", PyOpenFileBox, nullptr, "Shows an open file box and returns the selected file path and name."));
+
+            addLegacyGeneral(behaviorContext->Method("get_axis_constraint", PyGetAxisConstraint, nullptr, "Gets axis."));
+            addLegacyGeneral(behaviorContext->Method("set_axis_constraint", PySetAxisConstraint, nullptr, "Sets axis."));
+
+            addLegacyGeneral(behaviorContext->Method("get_pak_from_file", PyGetPakFromFile, nullptr, "Finds a pak file name for a given file."));
+
+            addLegacyGeneral(behaviorContext->Method("log", PyLog, nullptr, "Prints the message to the editor console window."));
+
+            addLegacyGeneral(behaviorContext->Method("undo", PyUndo, nullptr, "Undoes the last operation."));
+            addLegacyGeneral(behaviorContext->Method("redo", PyRedo, nullptr, "Redoes the last undone operation."));
+
+            addLegacyGeneral(behaviorContext->Method("draw_label", PyDrawLabel, nullptr, "Shows a 2d label on the screen at the given position and given color."));
+            addLegacyGeneral(behaviorContext->Method("combo_box", PyComboBox, nullptr, "Shows a combo box listing each value passed in, returns string value selected by the user."));
+
+            addLegacyGeneral(behaviorContext->Method("crash", PyCrash, nullptr, "Crashes the application, useful for testing crash reporting and other automation tools."));
+
+            /////////////////////////////////////////////////////////////////////////
+            // Temporal, to be removed by LY-101149
+            addLegacyGeneral(behaviorContext->Method("find_editor_entity", PyFindEditorEntity, nullptr, "Retrieves a editor entity id by name"));
+            addLegacyGeneral(behaviorContext->Method("find_game_entity", PyFindGameEntity, nullptr, "Retrieves a game entity id by name"));
+            //////////////////////////////////////////////////////////////////////////
+            addLegacyGeneral(behaviorContext->Method("dump_exposed_classes", PyDumpBindings::GetExposedPythonClasses, nullptr, "Retrieves exposed classes"));
+        }
+    }
+}
diff --git a/Code/Editor/PythonEditorFuncs.h b/Code/Editor/PythonEditorFuncs.h
new file mode 100644
index 0000000000..1b3a7115b6
--- /dev/null
+++ b/Code/Editor/PythonEditorFuncs.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <Include/SandboxAPI.h>
+#include <AzCore/Component/Component.h>
+#include "PythonEditorEventsBus.h"
+
+namespace AzToolsFramework
+{
+    //! A component to reflect scriptable commands for the Editor
+    class PythonEditorFuncsHandler
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(PythonEditorFuncsHandler, "{0F470E7E-9741-4608-84B1-7E4735FDA526}")
+
+        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+    };
+
+    //! Component to access the PythonEditorFuncs
+    class PythonEditorComponent final
+        : public AZ::Component
+        , public EditorLayerPythonRequestBus::Handler
+    {
+    public:
+        AZ_COMPONENT(PythonEditorComponent, "{B06810A1-E3C0-4A63-8DDD-3A01C5299DD3}")
+
+        PythonEditorComponent() = default;
+        ~PythonEditorComponent() override = default;
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        // Component...
+        void Activate() override;
+        void Deactivate() override;
+
+        const char* GetCVar(const char* pName) override;
+
+        void SetCVar(const char* pName, const AZStd::any& value) override;
+
+        void SetCVarFromString(const char* pName, const char* pValue) override;
+
+        void SetCVarFromInteger(const char* pName, int pValue) override;
+
+        void SetCVarFromFloat(const char* pName, float pValue) override;
+
+        void PyRunConsole(const char* text) override;
+
+        void EnterGameMode() override;
+
+        bool IsInGameMode() override;
+
+        void ExitGameMode() override;
+
+        void EnterSimulationMode() override;
+
+        bool IsInSimulationMode() override;
+
+        void ExitSimulationMode() override;
+
+        void RunFile(const char* pFile) override;
+
+        void RunFileParameters(const char* pFile, const char* pArguments) override;
+
+        void ExecuteCommand(const char* cmdline) override;
+
+        bool MessageBoxOkCancel(const char* pMessage) override;
+
+        bool MessageBoxYesNo(const char* pMessage) override;
+
+        bool MessageBoxOk(const char* pMessage) override;
+
+        AZStd::string EditBox(AZStd::string_view pTitle) override;
+
+        AZStd::any EditBoxCheckDataType(const char* pTitle) override;
+
+        AZStd::string OpenFileBox() override;
+
+        const char* GetAxisConstraint() override;
+
+        void SetAxisConstraint(AZStd::string_view pConstrain) override;
+
+        const char* GetPakFromFile(const char* filename) override;
+
+        void Log(const char* pMessage) override;
+
+        void Undo() override;
+
+        void Redo() override;
+
+        void DrawLabel(int x, int y, float size, float r, float g, float b, float a, const char* pLabel) override;
+
+        AZStd::string ComboBox(AZStd::string title, AZStd::vector<AZStd::string> values, int selectedIdx = 0) override;
+    };
+
+} // namespace AzToolsFramework
diff --git a/Code/Editor/QtUI/ClickableLabel.cpp b/Code/Editor/QtUI/ClickableLabel.cpp
new file mode 100644
index 0000000000..2780f584c4
--- /dev/null
+++ b/Code/Editor/QtUI/ClickableLabel.cpp
@@ -0,0 +1,100 @@
+/*
+ * 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 "ClickableLabel.h"
+
+
+ClickableLabel::ClickableLabel(const QString& text, QWidget* parent)
+    : QLabel(parent)
+    , m_text(text)
+    , m_showDecoration(false)
+{
+    setTextFormat(Qt::RichText);
+    setTextInteractionFlags(Qt::TextBrowserInteraction);
+}
+
+ClickableLabel::ClickableLabel(QWidget* parent)
+    : QLabel(parent)
+    , m_showDecoration(false)
+{
+    setTextFormat(Qt::RichText);
+    setTextInteractionFlags(Qt::TextBrowserInteraction);
+}
+
+void ClickableLabel::showEvent([[maybe_unused]] QShowEvent* event)
+{
+    updateFormatting(false);
+}
+
+void ClickableLabel::enterEvent(QEvent* ev)
+{
+    if (!isEnabled())
+    {
+        return;
+    }
+
+    updateFormatting(true);
+    QApplication::setOverrideCursor(QCursor(Qt::PointingHandCursor));
+    QLabel::enterEvent(ev);
+}
+
+void ClickableLabel::leaveEvent(QEvent* ev)
+{
+    if (!isEnabled())
+    {
+        return;
+    }
+
+    updateFormatting(false);
+    QApplication::restoreOverrideCursor();
+    QLabel::leaveEvent(ev);
+}
+
+void ClickableLabel::setText(const QString& text)
+{
+    m_text = text;
+    QLabel::setText(text);
+    updateFormatting(false);
+}
+
+void ClickableLabel::setShowDecoration(bool b)
+{
+    m_showDecoration = b;
+    updateFormatting(false);
+}
+
+void ClickableLabel::updateFormatting(bool mouseOver)
+{
+    //FIXME: this should be done differently. Using a style sheet would be easiest.
+
+    QColor c = palette().color(QPalette::WindowText);
+    if (mouseOver || m_showDecoration)
+    {
+        QLabel::setText(QString(R"(<a href="dummy" style="color: %1";>%2</a>)").arg(c.name(), m_text));
+    }
+    else
+    {
+        QLabel::setText(m_text);
+    }
+}
+
+bool ClickableLabel::event(QEvent* e)
+{
+    if (isEnabled())
+    {
+        if (e->type() == QEvent::MouseButtonDblClick)
+        {
+            emit linkActivated(QString());
+            return true; //ignore
+        }
+    }
+
+    return QLabel::event(e);
+}
+
+#include <QtUI/moc_ClickableLabel.cpp>
diff --git a/Code/Editor/QtUI/ClickableLabel.h b/Code/Editor/QtUI/ClickableLabel.h
new file mode 100644
index 0000000000..a3e2edfeaa
--- /dev/null
+++ b/Code/Editor/QtUI/ClickableLabel.h
@@ -0,0 +1,38 @@
+/*
+ * 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_EDITORCOMMON_CLICKABLELABEL_H
+#define CRYINCLUDE_EDITORCOMMON_CLICKABLELABEL_H
+
+#if !defined(Q_MOC_RUN)
+#include <QLabel>
+#endif
+
+class SANDBOX_API ClickableLabel
+    : public QLabel
+{
+    Q_OBJECT
+public:
+    explicit ClickableLabel(const QString& text, QWidget* parent = nullptr);
+    explicit ClickableLabel(QWidget* parent = nullptr);
+    bool event(QEvent* e) override;
+
+    void setText(const QString& text);
+    void setShowDecoration(bool b);
+
+protected:
+    void showEvent(QShowEvent* event) override;
+    void enterEvent(QEvent* ev) override;
+    void leaveEvent(QEvent* ev) override;
+
+private:
+    void updateFormatting(bool mouseOver);
+    QString m_text;
+    bool m_showDecoration;
+};
+
+#endif
diff --git a/Code/Editor/QtUI/ColorButton.cpp b/Code/Editor/QtUI/ColorButton.cpp
new file mode 100644
index 0000000000..7d700fbbfe
--- /dev/null
+++ b/Code/Editor/QtUI/ColorButton.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 <AzCore/PlatformDef.h>
+#include <platform.h>
+
+#include "ColorButton.h"
+
+// Qt
+#include <QPainter>
+
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/ColorPicker.h>  // for AzQtComponents::ColorPicker
+#include <AzQtComponents/Utilities/Conversions.h>           // for AzQtComponents::toQColor
+
+
+ColorButton::ColorButton(QWidget* parent /* = nullptr */)
+    : QToolButton(parent)
+{
+    connect(this, &ColorButton::clicked, this, &ColorButton::OnClick);
+}
+
+void ColorButton::paintEvent([[maybe_unused]] QPaintEvent* event)
+{
+    QPainter painter(this);
+    painter.fillRect(rect(), m_color);
+    painter.setPen(Qt::black);
+    painter.drawRect(rect().adjusted(0, 0, -1, -1));
+}
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+void macRaiseWindowDelayed(QWidget* window);
+#endif
+
+void ColorButton::OnClick()
+{
+    const QColor color = AzQtComponents::toQColor(
+        AzQtComponents::ColorPicker::getColor(AzQtComponents::ColorPicker::Configuration::RGB,
+        AzQtComponents::fromQColor(m_color),
+        tr("Select Color")));
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    macRaiseWindowDelayed(window());
+#endif
+
+    if (color != m_color)
+    
+    {
+        m_color = color;
+        update();
+        emit ColorChanged(m_color);
+    }
+}
+
+#include <QtUI/moc_ColorButton.cpp>
diff --git a/Code/Editor/QtUI/ColorButton.h b/Code/Editor/QtUI/ColorButton.h
new file mode 100644
index 0000000000..8e445a4b64
--- /dev/null
+++ b/Code/Editor/QtUI/ColorButton.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#pragma once
+#ifndef CRYINCLUDE_EDITORCOMMON_COLORBUTTON_H
+#define CRYINCLUDE_EDITORCOMMON_COLORBUTTON_H
+
+#include <Include/EditorCoreAPI.h>
+
+#if !defined(Q_MOC_RUN)
+#include <QToolButton>
+#endif
+
+class QColor;
+class QPaintEvent;
+
+class EDITOR_CORE_API ColorButton
+    : public QToolButton
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QColor Color READ Color WRITE SetColor)
+
+public:
+    ColorButton(QWidget* parent = nullptr);
+    virtual ~ColorButton() {};
+
+    QColor Color() const { return m_color; }
+    void SetColor(const QColor& color)
+    {
+        m_color = color;
+        update();
+    }
+
+protected:
+    void paintEvent(QPaintEvent* event) override;
+
+private:
+    QColor m_color;
+
+signals:
+    void ColorChanged(const QColor& color);
+
+private slots:
+    void OnClick();
+};
+
+#endif // CRYINCLUDE_EDITORCOMMON_COLORBUTTON_H
diff --git a/Code/Editor/QtUI/ColorButton_mac.mm b/Code/Editor/QtUI/ColorButton_mac.mm
new file mode 100644
index 0000000000..963a3dac66
--- /dev/null
+++ b/Code/Editor/QtUI/ColorButton_mac.mm
@@ -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
+ *
+ */
+
+#import <Cocoa/Cocoa.h>
+
+#include <QTimer>
+#include <QVariant>
+#include <QWidget>
+
+// this makes sure the native widget of the window
+// has the same window level as it should have
+// the problem is that for some reason the window level is changed to 0
+// unfortunately not directly so we have to check repeated times
+void macRaiseWindowDelayed(QWidget* window)
+{
+    NSWindow* nativeWindow = [(NSView*)(window->winId()) window];
+    CGWindowLevel level = nativeWindow.level;
+    QTimer* t = new QTimer(window);
+    QObject::connect(t, &QTimer::timeout, t, [t,nativeWindow,level] {
+        if (nativeWindow.level != level)
+        {
+            // level was changed -> we can break as soon as we fixed it
+            t->setProperty("raiseCounter", 99);
+        }
+        if (nativeWindow.level == level && t->property("raiseCounter").toInt() >= 99)
+        {
+            // break condition met and correct level -> end this
+            t->deleteLater();
+        }
+        t->setProperty("raiseCounter", t->property("raiseCounter").toInt() + 1);
+        // try to set the right level
+        nativeWindow.level = level;
+    });
+    t->start(10);
+}
diff --git a/Code/Editor/QtUI/PixmapLabelPreview.cpp b/Code/Editor/QtUI/PixmapLabelPreview.cpp
new file mode 100644
index 0000000000..f5983bce2b
--- /dev/null
+++ b/Code/Editor/QtUI/PixmapLabelPreview.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 "EditorDefs.h"
+
+#include "PixmapLabelPreview.h"
+
+PixmapLabelPreview::PixmapLabelPreview(QWidget* parent)
+    : QLabel(parent)
+    , m_mode(Qt::IgnoreAspectRatio)
+{
+    this->setMinimumSize(10, 10);
+}
+
+void PixmapLabelPreview::setPixmap(const QPixmap& p)
+{
+    m_pixmap = p;
+    QLabel::setPixmap(transformPixmap(p));
+}
+
+int PixmapLabelPreview::heightForWidth(int width) const
+{
+    if (m_mode == Qt::KeepAspectRatio)
+    {
+        return width;
+    }
+
+    return ((qreal)m_pixmap.height() * width) / m_pixmap.width();
+}
+
+
+QSize PixmapLabelPreview::sizeHint() const
+{
+    int w = this->width();
+    return QSize(w, heightForWidth(w));
+}
+
+void PixmapLabelPreview::setAspectRatioMode(Qt::AspectRatioMode mode)
+{
+    m_mode = mode;
+}
+
+void PixmapLabelPreview::resizeEvent([[maybe_unused]] QResizeEvent* e)
+{
+    QLabel::setPixmap(transformPixmap(m_pixmap));
+}
+
+QPixmap PixmapLabelPreview::transformPixmap(QPixmap pix)
+{
+    return pix.scaled(this->size(), m_mode, Qt::SmoothTransformation);
+}
+
+#include <QtUI/moc_PixmapLabelPreview.cpp>
diff --git a/Code/Editor/QtUI/PixmapLabelPreview.h b/Code/Editor/QtUI/PixmapLabelPreview.h
new file mode 100644
index 0000000000..38206b70ff
--- /dev/null
+++ b/Code/Editor/QtUI/PixmapLabelPreview.h
@@ -0,0 +1,38 @@
+/*
+ * 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 PIXMAPLABELPREVIEW_H
+#define PIXMAPLABELPREVIEW_H
+
+#if !defined(Q_MOC_RUN)
+#include <QLabel>
+#include <QPixmap>
+#include <QResizeEvent>
+#endif
+
+class PixmapLabelPreview
+    : public QLabel
+{
+    Q_OBJECT
+public:
+    explicit PixmapLabelPreview(QWidget* parent = 0);
+    virtual int heightForWidth(int width) const;
+    virtual QSize sizeHint() const;
+
+public slots:
+    void setAspectRatioMode(Qt::AspectRatioMode);
+    void setPixmap(const QPixmap&);
+    void resizeEvent(QResizeEvent*);
+private:
+    QPixmap transformPixmap(QPixmap);
+
+    QPixmap m_pixmap;
+    Qt::AspectRatioMode m_mode;
+};
+
+#endif // PIXMAPLABELPREVIEW_H
diff --git a/Code/Editor/QtUI/QCollapsibleGroupBox.cpp b/Code/Editor/QtUI/QCollapsibleGroupBox.cpp
new file mode 100644
index 0000000000..6a9edacdbe
--- /dev/null
+++ b/Code/Editor/QtUI/QCollapsibleGroupBox.cpp
@@ -0,0 +1,92 @@
+/*
+ * 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 "QtUI/QCollapsibleGroupBox.h"
+
+
+QCollapsibleGroupBox::QCollapsibleGroupBox(QWidget* parent)
+    : QGroupBox(parent)
+    , m_collapsed(false)
+    , m_toggleButton(0)
+{
+    m_toggleButton = new QToolButton(this);
+    m_toggleButton->setFixedSize(16, 16);
+    m_toggleButton->setArrowType(Qt::DownArrow);
+    connect(m_toggleButton, &QToolButton::clicked, this, [&]()
+        {
+            setCollapsed(!m_collapsed);
+        });
+}
+
+QCollapsibleGroupBox::~QCollapsibleGroupBox()
+{
+}
+
+void QCollapsibleGroupBox::setCollapsed(bool v)
+{
+    if (v == m_collapsed)
+    {
+        return;
+    }
+
+    m_collapsed = v;
+    if (m_collapsed)
+    {
+        m_visibleState.clear();
+    }
+    Q_FOREACH(QObject * child, children())
+    {
+        QWidget* w = qobject_cast<QWidget*>(child);
+        if (w && w != m_toggleButton)
+        {
+            if (m_collapsed)
+            {
+                m_visibleState[w] = w->isVisible();
+                w->setHidden(true);
+            }
+            else
+            {
+                if (m_visibleState.contains(w))
+                {
+                    w->setVisible(m_visibleState[w]);
+                }
+                else
+                {
+                    w->setVisible(true);
+                }
+            }
+        }
+    }
+    m_toggleButton->setArrowType(v ? Qt::LeftArrow : Qt::DownArrow);
+    adaptSize(v);
+    Q_EMIT collapsed(v);
+}
+
+void QCollapsibleGroupBox::resizeEvent(QResizeEvent* event)
+{
+    if (m_toggleButton)
+    {
+        m_toggleButton->move(event->size().width() - m_toggleButton->width() - 1, 1);
+    }
+    QGroupBox::resizeEvent(event);
+}
+
+void QCollapsibleGroupBox::adaptSize(bool v)
+{
+    if (v)
+    {
+        m_expandedSize = maximumSize();
+        setMaximumHeight(fontMetrics().height() + 5); // shrinking to just let the groupbox title
+    }
+    else
+    {
+        setMaximumHeight(m_expandedSize.height());
+    }
+}
+
+#include <QtUI/moc_QCollapsibleGroupBox.cpp>
diff --git a/Code/Editor/QtUI/QCollapsibleGroupBox.h b/Code/Editor/QtUI/QCollapsibleGroupBox.h
new file mode 100644
index 0000000000..a1d31bc1b3
--- /dev/null
+++ b/Code/Editor/QtUI/QCollapsibleGroupBox.h
@@ -0,0 +1,45 @@
+/*
+ * 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_EDITORCOMMON_QCOLLAPSIBLEGROUPBOX_H
+#define CRYINCLUDE_EDITORCOMMON_QCOLLAPSIBLEGROUPBOX_H
+
+#if !defined(Q_MOC_RUN)
+#include <QGroupBox>
+#include <QToolButton>
+#include <QHash>
+#endif
+
+
+class QCollapsibleGroupBox
+    : public QGroupBox
+{
+    Q_OBJECT
+    Q_PROPERTY(bool collapsed READ collapsed WRITE setCollapsed NOTIFY collapsed)
+public:
+    QCollapsibleGroupBox(QWidget* parent);
+    ~QCollapsibleGroupBox();
+
+    bool collapsed() const { return m_collapsed; }
+
+public slots:
+    void setCollapsed(bool v);
+
+signals:
+    void collapsed(bool);
+
+protected:
+    void adaptSize(bool v);
+    void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
+
+    QSize m_expandedSize;
+    bool    m_collapsed;
+    QToolButton* m_toggleButton;
+    QHash<QWidget*, bool> m_visibleState;
+};
+
+#endif
diff --git a/Code/Editor/QtUI/WaitCursor.cpp b/Code/Editor/QtUI/WaitCursor.cpp
new file mode 100644
index 0000000000..6b7b395f15
--- /dev/null
+++ b/Code/Editor/QtUI/WaitCursor.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 "EditorDefs.h"
+
+#include "WaitCursor.h"
+
+// Qt
+#include <QApplication>
+
+
+WaitCursor::WaitCursor()
+{
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+}
+
+WaitCursor::~WaitCursor()
+{
+    QApplication::restoreOverrideCursor();
+}
diff --git a/Code/Editor/QtUI/WaitCursor.h b/Code/Editor/QtUI/WaitCursor.h
new file mode 100644
index 0000000000..7adad2dbb8
--- /dev/null
+++ b/Code/Editor/QtUI/WaitCursor.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
+ *
+ */
+
+
+#pragma once
+#ifndef CRYINCLUDE_EDITORCOMMON_WAITCURSOR_H
+#define CRYINCLUDE_EDITORCOMMON_WAITCURSOR_H
+
+class WaitCursor
+{
+public:
+    WaitCursor();
+    ~WaitCursor();
+};
+
+#endif
diff --git a/Code/Editor/QtUtil.h b/Code/Editor/QtUtil.h
new file mode 100644
index 0000000000..5ba8476ba3
--- /dev/null
+++ b/Code/Editor/QtUtil.h
@@ -0,0 +1,88 @@
+/*
+ * 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 <QString>
+#include <CryString.h>
+#include "UnicodeFunctions.h"
+
+#include <QApplication>
+#include <QDropEvent>
+#include <QWidget>
+
+#ifdef LoadCursor
+#undef LoadCursor
+#endif
+
+class QWaitCursor
+{
+public:
+    QWaitCursor()
+    {
+        QGuiApplication::setOverrideCursor(Qt::BusyCursor);
+    }
+    ~QWaitCursor()
+    {
+        QGuiApplication::restoreOverrideCursor();
+    }
+};
+
+namespace QtUtil
+{
+    // From QString to CryString
+    inline CryStringT<char> ToString(const QString& str)
+    {
+        return Unicode::Convert<CryStringT<char> >(str);
+    }
+
+    // From CryString to QString
+    inline QString ToQString(const CryStringT<char>& str)
+    {
+        return Unicode::Convert<QString>(str);
+    }
+
+    // From const char * to QString
+    inline QString ToQString(const char* str, size_t len = -1)
+    {
+        if (len == -1)
+        {
+            len = strlen(str);
+        }
+        return Unicode::Convert<QString>(str, str + len);
+    }
+
+    // Replacement for CString::trimRight()
+    inline QString trimRight(const QString& str)
+    {
+        // We prepend a char, so that the left doesn't get trimmed, then we remove it after trimming
+        return QString(QStringLiteral("A") + str).trimmed().remove(0, 1);
+    }
+
+    template<typename ... Args>
+    struct Select
+    {
+        template<typename C, typename R>
+        static auto OverloadOf(R(C::* pmf)(Args...))->decltype(pmf) {
+            return pmf;
+        }
+    };
+}
+
+namespace stl
+{
+    //! Case insensitive less key for QString
+    template <>
+    struct less_stricmp<QString>
+    {
+        bool operator()(const QString& left, const QString& right) const
+        {
+            return left.compare(right, Qt::CaseInsensitive) < 0;
+        }
+    };
+}
diff --git a/Code/Editor/QtUtilWin.h b/Code/Editor/QtUtilWin.h
new file mode 100644
index 0000000000..db1c897039
--- /dev/null
+++ b/Code/Editor/QtUtilWin.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <QRect>
+#include <QColor>
+#include <QPixmap>
+#include <QString>
+#include <QPointF>
+#include <QRectF>
+#include <QVector>
+#include <QWidget>
+#include <QWindow>
+#include <QApplication>
+
+#ifdef Q_OS_WIN
+# include <QtWinExtras/QtWin>
+# include <QtGui/qpa/qplatformnativeinterface.h>
+# include <objidl.h>
+AZ_PUSH_DISABLE_WARNING(4458, "-Wunknown-warning-option")
+# include <GdiPlus.h>
+AZ_POP_DISABLE_WARNING
+#endif // Q_OS_WIN
+
+#include "Util/EditorUtils.h"
+
+namespace QtUtil
+{
+
+#ifdef Q_OS_WIN
+    inline HWND getNativeHandle(QWidget* widget)
+    {
+        QWindow* window = widget->windowHandle();
+        QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
+        return static_cast<HWND>(nativeInterface->nativeResourceForWindow(QByteArrayLiteral("handle"), window));
+    }
+#endif // Q_OS_WIN
+
+    //! a helper class which captures the HWND of a given widget for the duration of its life cycle.
+    //! used mainly to set the parent of popup dialogs like file dialogs which are still MFC classes.
+    class QtMFCScopedHWNDCapture
+    {
+    public:
+        QtMFCScopedHWNDCapture(QWidget* source = nullptr)
+        {
+            if (!source)
+            {
+                source = qApp->activeWindow();
+            }
+
+            if (source)
+            {
+                m_widget = source;
+            }
+        }
+
+        ~QtMFCScopedHWNDCapture()
+        {
+            m_widget = nullptr;
+            m_attached = false;
+        }
+
+        // this is here so that it will also work for widgets that need parents if we upgrade the file dialog and other dialogs to be widget based
+        operator QWidget*()
+        {
+            return m_widget;
+        }
+
+    private:
+        bool m_attached = false;
+        QWidget* m_widget = nullptr;
+    };
+}
diff --git a/Code/Editor/QtViewPane.h b/Code/Editor/QtViewPane.h
new file mode 100644
index 0000000000..8367af3675
--- /dev/null
+++ b/Code/Editor/QtViewPane.h
@@ -0,0 +1,148 @@
+/*
+ * 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_EDITORCOMMON_QTVIEWPANE_H
+#define CRYINCLUDE_EDITORCOMMON_QTVIEWPANE_H
+#pragma once
+
+#include "IEditor.h"
+#include "Include/IEditorClassFactory.h"
+#include "Include/IViewPane.h"
+#include "Include/ObjectEvent.h"
+#include "Objects/ClassDesc.h"
+
+#include <QRect>
+#include <QWidget>
+
+namespace Serialization {
+    class IArchive;
+}
+using Serialization::IArchive;
+
+// ---------------------------------------------------------------------------
+
+template<class TObject>
+class CTemplateObjectClassDesc
+    : public CObjectClassDesc
+{
+public:
+    const char* m_className;
+    const char* m_category;
+    const char* m_textureIcon;
+    ObjectType m_objectType;
+    int m_order;
+    const char* m_fileSpec;
+    const char* m_toolClassName;
+
+    CTemplateObjectClassDesc(const char* className, const char* category, const char* textureIcon, ObjectType objectType, int order = 100, const char* fileSpec = "", const char* toolClassName = nullptr)
+        : m_className(className)
+        , m_category(category)
+        , m_textureIcon(textureIcon)
+        , m_objectType(objectType)
+        , m_order(order)
+        , m_fileSpec(fileSpec)
+        , m_toolClassName(toolClassName)
+    {
+    }
+
+    REFGUID ClassID() override
+    {
+        return TObject::GetClassID();
+    }
+
+    QString GetFileSpec() override
+    {
+        return m_fileSpec;
+    }
+
+    ESystemClassID SystemClassID() override
+    {
+        return ESYSTEM_CLASS_OBJECT;
+    };
+
+    ObjectType GetObjectType() override
+    {
+        return m_objectType;
+    }
+
+    QString ClassName() override
+    {
+        return m_className;
+    }
+
+    QString Category() override
+    {
+        return m_category;
+    }
+
+    QString GetTextureIcon() override
+    {
+        return m_textureIcon;
+    }
+
+    QObject* CreateQObject() const override
+    {
+        return new TObject;
+    }
+
+    int GameCreationOrder() override
+    {
+        return m_order;
+    };
+
+    bool IsEnabled() const override
+    {
+        return TObject::IsEnabled();
+    }
+
+    QString GetToolClassName() override
+    {
+        return m_toolClassName ? m_toolClassName : CObjectClassDesc::GetToolClassName();
+    }
+};
+
+template<class TWidget>
+class CQtViewClass
+    : public IViewPaneClass
+{
+public:
+    const char* m_name;
+    const char* m_category;
+    ESystemClassID m_classId;
+
+    CQtViewClass(const char* name, const char* category, ESystemClassID classId = ESYSTEM_CLASS_VIEWPANE)
+        : m_name(name)
+        , m_category(category)
+        , m_classId(classId)
+    {
+    }
+
+    virtual ESystemClassID SystemClassID() { return m_classId; };
+    static const GUID& GetClassID()
+    {
+        return TWidget::GetClassID();
+    }
+
+    virtual const GUID& ClassID()
+    {
+        return GetClassID();
+    }
+    virtual QString ClassName() { return m_name; };
+    virtual QString Category() { return m_category; };
+
+    QObject* CreateQObject() const override { return new TWidget(); };
+    QString GetPaneTitle() override { return m_name; };
+    unsigned int GetPaneTitleID() const override { return 0; };
+    EDockingDirection GetDockingDirection() override { return DOCK_FLOAT; };
+    QRect GetPaneRect() override { return {}; /* KDAB_TODO: ;m_sizeOptions.m_paneRect; */};
+    bool SinglePane() override { return false; };
+    bool WantIdleUpdate() override { return true; };
+    QSize GetMinSize() override { return {}; /*return m_sizeOptions.m_minSize;*/ }
+};
+
+#endif // CRYINCLUDE_EDITORCOMMON_QTVIEWPANE_H
diff --git a/Code/Editor/QtViewPaneManager.cpp b/Code/Editor/QtViewPaneManager.cpp
new file mode 100644
index 0000000000..35b2160a1f
--- /dev/null
+++ b/Code/Editor/QtViewPaneManager.cpp
@@ -0,0 +1,1597 @@
+/*
+ * 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 "QtViewPaneManager.h"
+#include "Controls/ConsoleSCB.h"
+#include <AzQtComponents/Components/FancyDocking.h>
+#include <AzQtComponents/Components/Titlebar.h>
+#include <AzQtComponents/Components/Widgets/Card.h>
+
+#include <QDockWidget>
+#include <QMainWindow>
+#include <QDataStream>
+#include <QDebug>
+#include <QCloseEvent>
+#include <QLayout>
+#include <QApplication>
+#include <QRect>
+#include <QDesktopWidget>
+#include <QMessageBox>
+#include <QRubberBand>
+#include <QCursor>
+#include <QTimer>
+#include <QGraphicsOpacityEffect>
+#include "MainWindow.h"
+
+#include <algorithm>
+#include <QScopedValueRollback>
+
+#include <AzFramework/API/ApplicationAPI.h>
+
+#include <AzAssetBrowser/AzAssetBrowserWindow.h>
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <AzQtComponents/Utilities/AutoSettingsGroup.h>
+#include <AzToolsFramework/UI/Docking/DockWidgetUtils.h>
+#include <AzToolsFramework/UI/PropertyEditor/ComponentEditor.hxx>
+#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <AzQtComponents/Buses/ShortcutDispatch.h>
+#include <AzQtComponents/Utilities/QtViewPaneEffects.h>
+#include <AzQtComponents/Components/StyleManager.h>
+
+#include <AzCore/UserSettings/UserSettingsComponent.h>
+
+#include "ShortcutDispatcher.h"
+
+struct ViewLayoutState
+{
+    QVector<QString> viewPanes;
+    QByteArray mainWindowState;
+    QMap<QString, QRect> fakeDockWidgetGeometries;
+};
+Q_DECLARE_METATYPE(ViewLayoutState)
+
+static QDataStream &operator<<(QDataStream & out, const ViewLayoutState&myObj)
+{
+    int placeHolderVersion = 1;
+    out << myObj.viewPanes << myObj.mainWindowState << placeHolderVersion << myObj.fakeDockWidgetGeometries;
+    return out;
+}
+
+static QDataStream& operator>>(QDataStream& in, ViewLayoutState& myObj)
+{
+    in >> myObj.viewPanes;
+    in >> myObj.mainWindowState;
+
+    int version = 0;
+    if (!in.atEnd())
+    {
+        in >> version;
+        in >> myObj.fakeDockWidgetGeometries;
+    }
+
+    return in;
+}
+
+// All settings keys for stored layouts are in the form "layouts/<name>"
+// When starting up, "layouts/last" is loaded
+static QLatin1String s_lastLayoutName = QLatin1String("last");
+
+static QString GetFancyViewPaneStateGroupName()
+{
+    return QString("%1/%2").arg("Editor").arg("fancyWindowLayouts");
+}
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+// this event filter class eats mouse events
+// it is used in the non dockable fake dock widget
+// to make sure its inner title bar cannot be dragged
+class MouseEatingEventFilter : public QObject
+{
+public:
+    MouseEatingEventFilter(QObject* parent)
+        : QObject(parent)
+    {
+    }
+
+protected:
+    bool eventFilter(QObject*, QEvent* event) override
+    {
+        switch (event->type())
+        {
+            case QEvent::MouseButtonPress:
+            case QEvent::MouseButtonRelease:
+            case QEvent::MouseButtonDblClick:
+            case QEvent::MouseMove:
+                return true;
+            default:
+                return false;
+        }
+    }
+};
+#endif
+
+Q_GLOBAL_STATIC(QtViewPaneManager, s_viewPaneManagerInstance)
+
+
+QWidget* QtViewPane::CreateWidget()
+{
+    QWidget* w = nullptr;
+
+    if (m_factoryFunc)
+    {
+        // Although all the factory lambdas do have a default nullptr argument, this information
+        // doesn't get retained when they are converted to std::function<QWidget*(QWidget*)>,
+        // thus we need to set the parent explicitly.
+        // At the same time, adding a default argument to the lambdas will allow for them to be
+        // called exactly as before in all other places where they are not converted, so we get
+        // to explicitly pass an argument only if strictly necessary.
+        w = m_factoryFunc(nullptr);
+    }
+    else
+    {
+        // If a view pane was registered using RegisterCustomViewPane, then instead of a factory function, we rely
+        // on ViewPaneCallbackBus::CreateViewPaneWidget to create the widget for us and then pass back the Qt windowId
+        // so that we can retrieve it.
+        AZ::u64 createdWidgetWinId;
+        AzToolsFramework::ViewPaneCallbackBus::EventResult(createdWidgetWinId, m_name.toUtf8().constData(), &AzToolsFramework::ViewPaneCallbacks::CreateViewPaneWidget);
+        w = QWidget::find(createdWidgetWinId);
+    }
+
+    return w;
+}
+
+bool QtViewPane::Close(QtViewPane::CloseModes closeModes)
+{
+    if (!IsConstructed())
+    {
+        return true;
+    }
+
+    return CloseInstance(m_dockWidget, closeModes);
+}
+
+bool QtViewPane::CloseInstance(QDockWidget* dockWidget, CloseModes closeModes)
+{
+    if (!dockWidget)
+    {
+        return false;
+    }
+
+    bool canClose = true;
+    bool destroy = closeModes & CloseMode::Destroy;
+
+    // Console is not deletable, so always hide it instead of destroying
+    if (!m_options.isDeletable)
+    {
+        destroy = false;
+    }
+
+    if (!(closeModes & CloseMode::Force))
+    {
+        QCloseEvent closeEvent;
+
+        // Prevent closing view pane if it has modal dialog open, as modal dialogs
+        // are often constructed on stack and will not finish properly when the view
+        // pane is destroyed.
+        QWidgetList topLevelWidgets = QApplication::topLevelWidgets();
+        const int numTopLevel = topLevelWidgets.size();
+        for (size_t i = 0; i < numTopLevel; ++i)
+        {
+            QWidget* widget = topLevelWidgets[i];
+            if (widget->isModal() && widget->isVisible())
+            {
+                widget->activateWindow();
+                return false;
+            }
+        }
+
+        // Check if embedded QWidget allows view pane to be closed.
+        QCoreApplication::sendEvent(dockWidget->widget(), &closeEvent);
+        // If widget accepted the close event, we delete the dockwidget, which will also delete the child widget in case it doesn't have Qt::WA_DeleteOnClose
+        if (!closeEvent.isAccepted())
+        {
+            // Widget doesn't want to close
+            canClose = false;
+        }
+    }
+
+    if (canClose)
+    {
+        if (destroy)
+        {
+            //important to set parent to null otherwise docking code will still find it while restoring since that happens before the delete.
+            dockWidget->setParent(nullptr);
+            dockWidget->deleteLater();
+
+            if (dockWidget == m_dockWidget)
+            {
+                //clear dockwidget pointer otherwise if we open this pane before the delete happens we'll think it's already there, then it gets deleted on us.
+                m_dockWidget.clear();
+            }
+        }
+        else
+        {
+            // If the dock widget is tabbed, then just remove it from the tab widget
+            AzQtComponents::DockTabWidget* tabWidget = AzQtComponents::DockTabWidget::ParentTabWidget(dockWidget);
+            if (tabWidget)
+            {
+                tabWidget->removeTab(dockWidget);
+            }
+            // Otherwise just hide the widget
+            else
+            {
+                dockWidget->hide();
+            }
+        }
+    }
+
+    return canClose;
+}
+
+static bool SkipTitleBarOverdraw(QtViewPane* pane)
+{
+    return !pane->m_options.isDockable;
+}
+
+DockWidget::DockWidget(QWidget* widget, QtViewPane* pane, QSettings* settings, QMainWindow* parent, AzQtComponents::FancyDocking* advancedDockManager)
+    : AzQtComponents::StyledDockWidget(pane->m_name, SkipTitleBarOverdraw(pane),
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+          pane->m_options.detachedWindow ? nullptr : parent)
+#else
+          parent)
+#endif
+    , m_settings(settings)
+    , m_mainWindow(parent)
+    , m_pane(pane)
+    , m_advancedDockManager(advancedDockManager)
+{
+    // keyboard shortcuts from any other context shouldn't trigger actions under this dock widget
+    AzQtComponents::MarkAsShortcutSearchBreak(this);
+
+    if (pane->m_options.isDeletable)
+    {
+        setAttribute(Qt::WA_DeleteOnClose);
+    }
+
+    QString objectNameForSave = pane->m_options.saveKeyName.length() > 0 ? pane->m_options.saveKeyName : pane->m_name;
+    setObjectName(objectNameForSave);
+
+    setWidget(widget);
+    setFocusPolicy(Qt::StrongFocus);
+
+    setAttribute(Qt::WA_Hover, true);
+    setMouseTracking(true);
+}
+
+bool DockWidget::event(QEvent* qtEvent)
+{
+    // this accounts for a difference in behavior where we want all floating windows to be always parented to the main window instead of to each other, so that
+    // they don't overlap in odd ways - for example, if you tear off a floating window from another floating window, under Qt's system its technically still a child of that window
+    // so that window can't ever be placed on top of it.  This is not what we want.  We want you to be able to then take that window and drag it into this new one.
+    // (Qt's original behavior is like that so if you double click on a floating widget it docks back into the parent which it came from - we don't use this functionality)
+    if (qtEvent->type() == QEvent::WindowActivate
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+        && !m_pane->m_options.detachedWindow
+#endif
+    )
+    {
+        reparentToMainWindowFix();
+    }
+
+    return AzQtComponents::StyledDockWidget::event(qtEvent);
+}
+
+void DockWidget::reparentToMainWindowFix()
+{
+    if (!isFloating() || !AzToolsFramework::DockWidgetUtils::isDockWidgetWindowGroup(parentWidget()))
+    {
+        return;
+    }
+
+    if (qApp->mouseButtons() & Qt::LeftButton)
+    {
+        // We're still dragging, lets try later
+        QTimer::singleShot(200, this, &DockWidget::reparentToMainWindowFix);
+        return;
+    }
+
+    // bump it up and to the left by the size of its frame, to account for the reparenting operation;
+    QPoint framePos = pos();
+    QPoint contentPos = mapToGlobal(QPoint(0, 0));
+    move(framePos.x() - (contentPos.x() - framePos.x()), framePos.y() - (contentPos.y() - framePos.y()));
+
+    // we have to dock this to the mainwindow, even if we're floating, so that the mainwindow knows about it.
+    // if the preferred area is valid, use that. Otherwise, arbitrarily toss it in the left.
+    // This is relevant because it will determine where the widget goes if the title bar is double clicked
+    // after it's been detached from a QDockWidgetGroupWindow
+    auto dockArea = (m_pane->m_options.preferedDockingArea != Qt::DockWidgetArea::NoDockWidgetArea) ? m_pane->m_options.preferedDockingArea : Qt::LeftDockWidgetArea;
+
+    setParent(m_mainWindow);
+    m_mainWindow->addDockWidget(dockArea, this);
+    setFloating(true);
+}
+
+QString DockWidget::PaneName() const
+{
+    return m_pane->m_name;
+}
+
+void DockWidget::RestoreState(bool forceDefault)
+{
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    if (m_pane->m_options.detachedWindow)
+    {
+        if (forceDefault)
+        {
+            window()->setGeometry(m_pane->m_options.paneRect);
+        }
+        else
+        {
+            QRect geometry = QtViewPaneManager::instance()->GetLayout().fakeDockWidgetGeometries[objectName()];
+            if (!geometry.isValid())
+            {
+                geometry = m_pane->m_options.paneRect;
+            }
+            window()->setGeometry(geometry);
+        }
+        return;
+    }
+#endif
+
+    // check if we can get the main window to do all the work for us first
+    // (which is also the proper way to do this)
+    if (!forceDefault)
+    {
+        // If the advanced docking is enabled, let it try to restore the dock widget
+        bool restored = false;
+        if (m_advancedDockManager)
+        {
+            restored = m_advancedDockManager->restoreDockWidget(this);
+        }
+        // Otherwise, let our main window do it directly
+        else
+        {
+            restored = m_mainWindow->restoreDockWidget(this);
+        }
+
+        if (restored)
+        {
+            AzToolsFramework::DockWidgetUtils::correctVisibility(this);
+            return;
+        }
+    }
+
+    // can't rely on the main window; fall back to our preferences
+    auto dockingArea = m_pane->m_options.preferedDockingArea;
+    auto paneRect = m_pane->m_options.paneRect;
+
+    // If we are floating and have multiple instances, try to calculate an appropriate rect from the most recently created, non-docked instance
+    // make sure the new location would be reasonable on screen - otherwise use default paneRect for new widget positioning
+    if (dockingArea == Qt::NoDockWidgetArea && m_pane->m_dockWidgetInstances.size() > 1)
+    {
+        static const int horizontalCascadeAmount = 20;
+        static const int verticalCascadeAmount = 20;
+        static const int lowerScreenEdgeBuffer = 50;
+
+        QRect screenRect = QApplication::primaryScreen()->geometry();
+        int screenHeight = screenRect.height();
+        int screenWidth = screenRect.width();
+
+        for (QList<DockWidget*>::reverse_iterator it = m_pane->m_dockWidgetInstances.rbegin(); it != m_pane->m_dockWidgetInstances.rend(); ++it)
+        {
+            DockWidget* dock = *it;
+
+            if (dock != this)
+            {
+                QMainWindow* mainWindow = qobject_cast<QMainWindow*>(dock->parentWidget());
+                if (mainWindow && mainWindow->parentWidget())
+                {
+                    QPoint windowLocation = mainWindow->parentWidget()->mapToGlobal(QPoint(0, 0));
+
+                    // Only nudge it to the right if we have room to do so
+                    if (windowLocation.x() + horizontalCascadeAmount < screenWidth - paneRect.width())
+                    {
+                        paneRect.moveLeft(windowLocation.x() + horizontalCascadeAmount);
+
+                        // Keep it from getting too low on the screen
+                        if (windowLocation.y() + verticalCascadeAmount < screenHeight - lowerScreenEdgeBuffer)
+                        {
+                            paneRect.moveTop(windowLocation.y() + verticalCascadeAmount);
+                        }
+                    }
+
+                    // We found an undocked window, just go ahead and break, if we couldn't adjust because of positioning,
+                    // it will be placed at the default location
+                    break;
+                }
+            }
+        }
+    }
+
+    // make sure we're sized properly before we dock
+    if (paneRect.isValid())
+    {
+        resize(paneRect.size());
+    }
+
+    // check if we should force floating
+    bool floatWidget = (dockingArea == Qt::NoDockWidgetArea);
+
+    // if we're floating, we need to move and resize again, because the act of docking may have moved us
+    if (floatWidget)
+    {
+        // in order for saving and restoring state to work properly in Qt,
+        // along with docking widgets within other floating widgets, the widget
+        // must be added at least once to the main window, with a VALID area,
+        // before we set it to floating.
+        auto arbitraryDockingArea = Qt::LeftDockWidgetArea;
+        m_mainWindow->addDockWidget(arbitraryDockingArea, this);
+
+        // If we are using the fancy docking, let it handle making the dock
+        // widget floating, or else the titlebar will be missing, since
+        // floating widgets are actually contained in a floating main
+        // window container
+        if (m_advancedDockManager)
+        {
+            m_advancedDockManager->makeDockWidgetFloating(this, paneRect);
+        }
+        // Otherwise, we can make the dock widget floating directly and move it
+        else
+        {
+            setFloating(true);
+
+            // Not using setGeometry() since it excludes the frame when positioning
+            if (paneRect.isValid())
+            {
+                resize(paneRect.size());
+                move(paneRect.topLeft());
+            }
+        }
+    }
+    else
+    {
+        m_mainWindow->addDockWidget(dockingArea, this);
+    }
+}
+
+QRect DockWidget::ProperGeometry() const
+{
+    QRect myGeom(pos(), size());
+
+    // we need this state in global coordinates, but if we're parented to one of those group dock windows, there is a problem, it will be local coords.
+    if (!isFloating())
+    {
+        if (parentWidget() && (strcmp(parentWidget()->metaObject()->className(), "QDockWidgetGroupWindow") == 0))
+        {
+            myGeom = QRect(parentWidget()->pos(), parentWidget()->size());
+        }
+    }
+
+    return myGeom;
+}
+
+QString DockWidget::settingsKey() const
+{
+    return settingsKey(m_pane->m_name);
+}
+
+QString DockWidget::settingsKey(const QString& paneName)
+{
+    return QStringLiteral("ViewPane-") + paneName;
+}
+
+// run generic function on all widgets considered for greying out/disabling
+template<typename Fn>
+void SetDefaultActionsEnabled(
+    const bool enabled, QtViewPanes& registeredPanes, const Fn& fn)
+{
+    for (QtViewPane& p : registeredPanes)
+    {
+        if (!p.m_dockWidgetInstances.empty())
+        {
+            for (auto& dockWidget : p.m_dockWidgetInstances)
+            {
+                const auto& paneName = dockWidget->PaneName();
+                // disable/fade all widgets other than those in the EntityInspector, EntityOutliner and Console
+                // note: The Console is not greyed out and the EntityInspector and EntityOutliner handle their
+                // own fading when entering/leaving ComponentMode
+                if (paneName != LyViewPane::EntityInspector &&
+                    paneName != LyViewPane::EntityInspectorPinned &&
+                    paneName != LyViewPane::Console &&
+                    paneName != LyViewPane::EntityOutliner)
+                {
+                    fn(dockWidget->widget(), enabled);
+                }
+            }
+        }
+    }
+}
+
+QtViewPaneManager::QtViewPaneManager(QObject* parent)
+    : QObject(parent)
+    , m_mainWindow(nullptr)
+    , m_settings(nullptr)
+    , m_restoreInProgress(false)
+    , m_advancedDockManager(nullptr)
+{
+    qRegisterMetaTypeStreamOperators<ViewLayoutState>("ViewLayoutState");
+    qRegisterMetaTypeStreamOperators<QVector<QString> >("QVector<QString>");
+
+    // view pane manager is interested when we enter/exit ComponentMode
+    m_componentModeNotifications.BusConnect(AzToolsFramework::GetEntityContextId());
+
+    m_componentModeNotifications.SetEnteredComponentModeFunc(
+        [this](const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
+    {
+        // gray out panels when entering ComponentMode
+        SetDefaultActionsEnabled(false, m_registeredPanes, [](QWidget* widget, bool on)
+        {
+            AzQtComponents::SetWidgetInteractEnabled(widget, on);
+        });
+    });
+
+    m_componentModeNotifications.SetLeftComponentModeFunc(
+        [this](const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
+    {
+        // enable panels again when leaving ComponentMode
+        SetDefaultActionsEnabled(true, m_registeredPanes, [](QWidget* widget, bool on)
+        {
+            AzQtComponents::SetWidgetInteractEnabled(widget, on);
+        });
+    });
+}
+
+QtViewPaneManager::~QtViewPaneManager()
+{
+    m_componentModeNotifications.BusDisconnect();
+}
+
+static bool lessThan(const QtViewPane& v1, const QtViewPane& v2)
+{
+    if (v1.IsViewportPane() && v2.IsViewportPane())
+    {
+        // Registration order (Top, Front, Left ...)
+        return v1.m_id < v2.m_id;
+    }
+    else if (!v1.IsViewportPane() && !v2.IsViewportPane())
+    {
+        // Sort by name
+        return v1.m_name.compare(v2.m_name, Qt::CaseInsensitive) < 0;
+    }
+    else
+    {
+        // viewports on top of non-viewports
+        return v1.IsViewportPane();
+    }
+}
+
+void QtViewPaneManager::RegisterPane(const QString& name, const QString& category, ViewPaneFactory factory, const AzToolsFramework::ViewPaneOptions& options)
+{
+    if (IsPaneRegistered(name))
+    {
+        return;
+    }
+
+    QtViewPane view = { NextAvailableId(), name, category, factory, nullptr, options };
+
+    // Sorted insert
+    auto it = std::upper_bound(m_registeredPanes.begin(), m_registeredPanes.end(), view, lessThan);
+    m_registeredPanes.insert(it, view);
+
+    emit registeredPanesChanged();
+}
+
+void QtViewPaneManager::UnregisterPane(const QString& name)
+{
+    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
+            [name](const QtViewPane& pane) { return name == pane.m_name; });
+
+    if (it != m_registeredPanes.end())
+    {
+        QtViewPane& pane = *it;
+
+        ClosePane(&pane);
+
+        m_knownIdsSet.removeOne(pane.m_id);
+        m_registeredPanes.erase(it);
+        emit registeredPanesChanged();
+    }
+}
+
+QtViewPaneManager* QtViewPaneManager::instance()
+{
+    return s_viewPaneManagerInstance();
+}
+
+bool QtViewPaneManager::exists()
+{
+    return s_viewPaneManagerInstance.exists();
+}
+
+void QtViewPaneManager::SetMainWindow(AzQtComponents::DockMainWindow* mainWindow, QSettings* settings, const QByteArray& lastMainWindowState)
+{
+    Q_ASSERT(mainWindow && !m_mainWindow && settings && !m_settings);
+    m_mainWindow = mainWindow;
+    m_settings = settings;
+    m_advancedDockManager = new AzQtComponents::FancyDocking(mainWindow);
+
+    m_defaultMainWindowState = mainWindow->saveState();
+    m_loadedMainWindowState = lastMainWindowState;
+}
+
+const QtViewPane* QtViewPaneManager::OpenPane(const QString& name, QtViewPane::OpenModes modes)
+{
+    QtViewPane* pane = GetPane(name);
+    if (!pane || !pane->IsValid())
+    {
+        qWarning() << Q_FUNC_INFO << "Could not find pane with name" << name;
+        return nullptr;
+    }
+
+    // this multi-pane code is a bit of an hack to support more than one view of the same class
+    // All views are single pane, except for one in Maglev Control plugin
+    // Save/Restore support of the duplicates will only be implemented if required.
+
+    const bool isMultiPane = modes & QtViewPane::OpenMode::MultiplePanes;
+
+    DockWidget* newDockWidget = pane->m_dockWidget;
+
+    if (!pane->IsVisible() || isMultiPane)
+    {
+        if (!pane->IsConstructed() || isMultiPane)
+        {
+            QWidget* w = pane->CreateWidget();
+            if (!w)
+            {
+                qWarning() << Q_FUNC_INFO << "Unable to create widget for pane with name" << name;
+                return nullptr;
+            }
+
+            w->setProperty("restored", (modes & QtViewPane::OpenMode::RestoreLayout) != 0);
+            newDockWidget = new DockWidget(w, pane, m_settings, m_mainWindow, m_advancedDockManager);
+            AzQtComponents::StyleManager::repolishStyleSheet(newDockWidget);
+
+            // track every new dock widget instance that we created
+            pane->m_dockWidgetInstances.push_back(newDockWidget);
+            connect(newDockWidget, &QObject::destroyed, this, [this, name, newDockWidget]() {
+                QtViewPane* pane = GetPane(name);
+                if (pane && pane->IsValid())
+                {
+                    pane->m_dockWidgetInstances.removeAll(newDockWidget);
+                }
+            });
+
+            // only set the single instance of the dock widget on the pane if this
+            // isn't a special multi-pane instance
+            if (!isMultiPane)
+            {
+                pane->m_dockWidget = newDockWidget;
+            }
+            else
+            {
+                m_advancedDockManager->disableAutoSaveLayout(newDockWidget);
+            }
+
+            newDockWidget->setVisible(true);
+
+            // If this pane isn't dockable, set the allowed areas to none on the
+            // dock widget so the fancy docking knows to prevent it from docking
+            if (!pane->m_options.isDockable)
+            {
+                newDockWidget->setAllowedAreas(Qt::NoDockWidgetArea);
+            }
+
+            // only emit this signal if we're not creating a non-saving instance of the view pane
+            if (!isMultiPane)
+            {
+                emit viewPaneCreated(pane);
+            }
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+            // handle showing fake dock widgets
+            if (pane->m_options.detachedWindow)
+            {
+                ShowFakeNonDockableDockWidget(newDockWidget, pane);
+            }
+#endif
+        }
+        else if (!AzQtComponents::DockTabWidget::IsTabbed(newDockWidget))
+        {
+            newDockWidget->setVisible(true);
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+            if (pane->m_options.detachedWindow)
+            {
+                newDockWidget->window()->show();
+            }
+#endif
+        }
+
+        if ((modes & QtViewPane::OpenMode::UseDefaultState) || isMultiPane)
+        {
+            const bool forceToDefault = true;
+            newDockWidget->RestoreState(forceToDefault);
+        }
+        else if (!AzQtComponents::DockTabWidget::IsTabbed(newDockWidget) && !(modes & QtViewPane::OpenMode::OnlyOpen))
+        {
+            newDockWidget->RestoreState();
+        }
+    }
+
+    // If the dock widget is off screen (e.g. second monitor was disconnected),
+    // restore its default state
+    if (QApplication::desktop()->screenNumber(newDockWidget) == -1)
+    {
+        const bool forceToDefault = true;
+        newDockWidget->RestoreState(forceToDefault);
+    }
+
+    // If the widget's window is minimized, show it.
+    QWidget* window = newDockWidget->window();
+    if (window->isMinimized())
+    {
+        window->setWindowState(window->windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+    }
+
+    if (pane->IsVisible())
+    {
+        if (!modes.testFlag(QtViewPane::OpenMode::RestoreLayout))
+        {
+            newDockWidget->setFocus();
+        }
+    }
+    else
+    {
+        // If the dock widget is tabbed, then set it as the active tab
+        AzQtComponents::DockTabWidget* tabWidget = AzQtComponents::DockTabWidget::ParentTabWidget(newDockWidget);
+        if (tabWidget)
+        {
+            int index = tabWidget->indexOf(newDockWidget);
+            tabWidget->setCurrentIndex(index);
+        }
+        // Otherwise just show the widget
+        else
+        {
+            newDockWidget->show();
+        }
+    }
+
+    // When a user opens a pane, if it is docked in a floating window, make sure
+    // it isn't hidden behind other floating windows or the Editor main window
+    if (modes.testFlag(QtViewPane::OpenMode::None))
+    {
+        QMainWindow* mainWindow = qobject_cast<QMainWindow*>(newDockWidget->parentWidget());
+        if (!mainWindow)
+        {
+            // If the parent of our dock widgets isn't a QMainWindow, then it
+            // might be tabbed, so try to find the tab container dock widget
+            // and then get the QMainWindow from that.
+            AzQtComponents::DockTabWidget* tabWidget = AzQtComponents::DockTabWidget::ParentTabWidget(newDockWidget);
+            if (tabWidget)
+            {
+                QDockWidget* tabDockContainer = qobject_cast<QDockWidget*>(tabWidget->parentWidget());
+                if (tabDockContainer)
+                {
+                    mainWindow = qobject_cast<QMainWindow*>(tabDockContainer->parentWidget());
+                }
+            }
+        }
+
+        if (mainWindow)
+        {
+            // If our pane is part of a floating window, then the parent of its
+            // QMainWindow will be another dock widget container that is floating.
+            // If this is the case, then raise it to the front so it won't be
+            // hidden behind other floating windows (or the Editor main window)
+            QDockWidget* parentDockWidget = qobject_cast<QDockWidget*>(mainWindow->parentWidget());
+            if (parentDockWidget && parentDockWidget->isFloating())
+            {
+                parentDockWidget->raise();
+            }
+        }
+    }
+
+    return pane;
+}
+
+QDockWidget* QtViewPaneManager::InstancePane(const QString& name)
+{
+    const QtViewPane* pane = OpenPane(name, QtViewPane::OpenMode::UseDefaultState | QtViewPane::OpenMode::MultiplePanes);
+    QDockWidget* newPaneWidget = nullptr;
+    if (pane != nullptr)
+    {
+        newPaneWidget = pane->m_dockWidgetInstances.last();
+    }
+
+    return newPaneWidget;
+}
+
+bool QtViewPaneManager::ClosePane(const QString& name, QtViewPane::CloseModes closeModes)
+{
+    if (QtViewPane* p = GetPane(name))
+    {
+        return ClosePane(p, closeModes);
+    }
+
+    return false;
+}
+
+bool QtViewPaneManager::ClosePaneInstance(const QString& name, QDockWidget* dockWidget, QtViewPane::CloseModes closeModes)
+{
+    if (QtViewPane* p = GetPane(name))
+    {
+        return p->CloseInstance(dockWidget, closeModes);
+    }
+
+    return false;
+}
+
+bool QtViewPaneManager::ClosePane(QtViewPane* pane, QtViewPane::CloseModes closeModes)
+{
+    if (pane)
+    {
+        // Don't allow a dock widget to be closed if it is being dragged for docking
+        if (m_advancedDockManager && m_advancedDockManager->IsDockWidgetBeingDragged(pane->m_dockWidget))
+        {
+            return false;
+        }
+
+        return pane->Close(closeModes | QtViewPane::CloseMode::Force);
+    }
+
+    return false;
+}
+
+bool QtViewPaneManager::CloseAllPanes()
+{
+    for (QtViewPane& p : m_registeredPanes)
+    {
+        if (!p.Close())
+        {
+            return false; // Abort closing
+        }
+    }
+    return true;
+}
+
+void QtViewPaneManager::CloseAllNonStandardPanes()
+{
+    for (QtViewPane& p : m_registeredPanes)
+    {
+        if (!p.m_options.isStandard)
+        {
+            p.Close(QtViewPane::CloseMode::Force);
+        }
+    }
+}
+
+void QtViewPaneManager::TogglePane(const QString& name)
+{
+    QtViewPane* pane = GetPane(name);
+    if (!pane)
+    {
+        Q_ASSERT(false);
+        return;
+    }
+
+    if (pane->IsVisible())
+    {
+        ClosePane(name);
+    }
+    else
+    {
+        OpenPane(name);
+    }
+}
+
+QWidget* QtViewPaneManager::CreateWidget(const QString& paneName)
+{
+    QtViewPane* pane = GetPane(paneName);
+    if (!pane)
+    {
+        qWarning() << Q_FUNC_INFO << "Couldn't find pane" << paneName << "; paneCount=" << m_registeredPanes.size();
+        return nullptr;
+    }
+
+    QWidget* w = pane->CreateWidget();
+    if (w)
+    {
+        w->setWindowTitle(paneName);
+        return w;
+    }
+
+    return nullptr;
+}
+
+void QtViewPaneManager::SaveLayout()
+{
+    SaveLayout(s_lastLayoutName);
+}
+
+void QtViewPaneManager::RestoreLayout(bool restoreDefaults)
+{
+    if (!restoreDefaults)
+    {
+        restoreDefaults = !RestoreLayout(s_lastLayoutName);
+    }
+
+    if (restoreDefaults)
+    {
+        // Nothing is saved in settings, restore default layout
+        RestoreDefaultLayout();
+    }
+}
+
+bool QtViewPaneManager::ClosePanesWithRollback(const QVector<QString>& panesToKeepOpen)
+{
+    QVector<QString> closedPanes;
+
+    // try to close all panes that aren't remaining open after relayout
+    bool rollback = false;
+    for (QtViewPane& p : m_registeredPanes)
+    {
+        // Only close the panes that aren't remaining open and are currently
+        // visible (which has to include a check if the pane is tabbed since
+        // it could be hidden if its not the active tab)
+        if (panesToKeepOpen.contains(p.m_name) || (!p.IsVisible() && !AzQtComponents::DockTabWidget::IsTabbed(p.m_dockWidget)))
+        {
+            continue;
+        }
+
+        // attempt to close this pane; if Close returns false, then the close event
+        // was intercepted and the pane doesn't want to close, so we should cancel the whole thing
+        // and rollback
+        if (!p.Close())
+        {
+            rollback = true;
+            break;
+        }
+
+        // keep track of the panes that we closed, so we can rollback later and reopen them
+        closedPanes.push_back(p.m_name);
+    }
+
+    // check if we cancelled and need to roll everything back
+    if (rollback)
+    {
+        for (const QString& paneName : closedPanes)
+        {
+            // append this to the end of the event loop with a zero length timer, so that
+            // all of the close/hide events above are entirely processed
+            QTimer::singleShot(0, this, [paneName, this]()
+                {
+                    OpenPane(paneName, QtViewPane::OpenMode::RestoreLayout);
+                });
+        }
+
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * Restore the default layout (also known as component entity layout)
+ */
+void QtViewPaneManager::RestoreDefaultLayout(bool resetSettings)
+{
+    // Get whether the prefab system is enabled
+    bool isPrefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    if (resetSettings)
+    {
+        // We're going to do something destructive (removing all of the viewpane settings). Better confirm with the user
+        auto buttonPressed = QMessageBox::warning(m_mainWindow, tr("Restore Default Layout"), tr("Are you sure you'd like to restore to the default layout? This will reset all of your view related settings."), QMessageBox::Cancel | QMessageBox::RestoreDefaults, QMessageBox::RestoreDefaults);
+        if (buttonPressed != QMessageBox::RestoreDefaults)
+        {
+            return;
+        }
+    }
+
+    // First, close all the open panes
+    if (!ClosePanesWithRollback(QVector<QString>()))
+    {
+        return;
+    }
+
+    // Disable updates while we restore the layout to avoid temporary glitches
+    // as the panes are moved around
+    m_mainWindow->setUpdatesEnabled(false);
+
+    AzToolsFramework::EntityIdList selectedEntityIds;
+
+    // Reset all of the settings, or windows opened outside of RestoreDefaultLayout won't be reset at all.
+    // Also ensure that this is done after CloseAllPanes, because settings will be saved in CloseAllPanes
+    if (resetSettings)
+    {
+        // Store off currently selected entities
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+        // Clear any selection
+        AzToolsFramework::EntityIdList noEntities;
+        AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, noEntities);
+
+        ViewLayoutState state;
+
+        state.viewPanes.push_back(LyViewPane::EntityOutliner);
+        state.viewPanes.push_back(LyViewPane::EntityInspector);
+        state.viewPanes.push_back(LyViewPane::AssetBrowser);
+        state.viewPanes.push_back(LyViewPane::Console);
+
+        if (!isPrefabSystemEnabled)
+        {
+            state.viewPanes.push_back(LyViewPane::LevelInspector);
+        }
+
+        state.mainWindowState = m_defaultMainWindowState;
+
+        {
+            AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
+            m_settings->setValue(s_lastLayoutName, QVariant::fromValue<ViewLayoutState>(state));
+        }
+
+        m_settings->sync();
+
+        // Let anything listening know to reset as well (*cough*CLayoutWnd*cough*)
+        emit layoutReset();
+
+        // Ensure that the main window knows it's new state
+        // otherwise when we load view panes that haven't been loaded,
+        // the main window will attempt to position them where they were last, not in their default spot
+        m_mainWindow->restoreState(m_defaultMainWindowState);
+    }
+
+    // Reset the default view panes to be opened. Used for restoring default layout and component entity layout.
+    const QtViewPane* entityOutlinerViewPane = OpenPane(LyViewPane::EntityOutliner, QtViewPane::OpenMode::UseDefaultState);
+    const QtViewPane* assetBrowserViewPane = OpenPane(LyViewPane::AssetBrowser, QtViewPane::OpenMode::UseDefaultState);
+    const QtViewPane* entityInspectorViewPane = OpenPane(LyViewPane::EntityInspector, QtViewPane::OpenMode::UseDefaultState);
+    const QtViewPane* consoleViewPane = OpenPane(LyViewPane::Console, QtViewPane::OpenMode::UseDefaultState);
+
+    const QtViewPane* levelInspectorPane = nullptr;
+    if (!isPrefabSystemEnabled)
+    {
+        levelInspectorPane = OpenPane(LyViewPane::LevelInspector, QtViewPane::OpenMode::UseDefaultState);
+    }
+
+    // This class does all kinds of behind the scenes magic to make docking / restore work, especially with groups
+    // so instead of doing our special default layout attach / docking right now, we want to make it happen
+    // after all of the other events have been processed.
+    QTimer::singleShot(0, [=]
+    {
+        // If we are using the new docking, set the right dock area to be absolute
+        // so that the inspector will be to the right of the viewport and console
+        m_advancedDockManager->setAbsoluteCornersForDockArea(m_mainWindow, Qt::RightDockWidgetArea);
+
+        // Retrieve the width of the screen that our main window is on so we can
+        // use it later for resizing our panes. The main window ends up being maximized
+        // when we restore the default layout, but even if we maximize the main window
+        // before doing anything else, its width won't update until after this has all
+        // been processed, so we need to resize the panes based on what the main window
+        // width WILL be after maximized
+        int screenWidth = QApplication::desktop()->screenGeometry(m_mainWindow).width();
+
+        // Add the console view pane first
+        m_mainWindow->addDockWidget(Qt::BottomDockWidgetArea, consoleViewPane->m_dockWidget);
+        consoleViewPane->m_dockWidget->setFloating(false);
+
+        if (entityInspectorViewPane)
+        {
+            m_mainWindow->addDockWidget(Qt::RightDockWidgetArea, entityInspectorViewPane->m_dockWidget);
+            entityInspectorViewPane->m_dockWidget->setFloating(false);
+
+            static const float tabWidgetWidthPercentage = 0.2f;
+            int newWidth = (float)screenWidth * tabWidgetWidthPercentage;
+
+            if (levelInspectorPane)
+            {
+                // Tab the entity inspector with the level Inspector so that when they are
+                // tabbed they will be given the default width, and move the entity inspector
+                // to be the first tab on the left and active
+                AzQtComponents::DockTabWidget* tabWidget = m_advancedDockManager->tabifyDockWidget(levelInspectorPane->m_dockWidget, entityInspectorViewPane->m_dockWidget, m_mainWindow);
+                if (tabWidget)
+                {
+                    tabWidget->moveTab(1, 0);
+                    tabWidget->setCurrentWidget(entityInspectorViewPane->m_dockWidget);
+
+                    QDockWidget* tabWidgetParent = qobject_cast<QDockWidget*>(tabWidget->parentWidget());
+                    m_mainWindow->resizeDocks({ tabWidgetParent }, { newWidth }, Qt::Horizontal);
+                }
+            }
+            else
+            {
+                m_mainWindow->resizeDocks({ entityInspectorViewPane->m_dockWidget }, { newWidth }, Qt::Horizontal);
+            }
+        }
+
+        if (assetBrowserViewPane && entityOutlinerViewPane)
+        {
+            m_mainWindow->addDockWidget(Qt::LeftDockWidgetArea, entityOutlinerViewPane->m_dockWidget);
+            entityOutlinerViewPane->m_dockWidget->setFloating(false);
+
+            m_mainWindow->addDockWidget(Qt::LeftDockWidgetArea, assetBrowserViewPane->m_dockWidget);
+            assetBrowserViewPane->m_dockWidget->setFloating(false);
+
+            m_advancedDockManager->splitDockWidget(m_mainWindow, entityOutlinerViewPane->m_dockWidget, assetBrowserViewPane->m_dockWidget, Qt::Vertical);
+
+            // Resize our entity outliner (and by proxy the asset browser split with it)
+            // so that they get an appropriate default width since the minimum sizes have
+            // been removed from these widgets
+            static const float entityOutlinerWidthPercentage = 0.15f;
+            int newWidth = (float)screenWidth * entityOutlinerWidthPercentage;
+            m_mainWindow->resizeDocks({ entityOutlinerViewPane->m_dockWidget }, { newWidth }, Qt::Horizontal);
+        }
+
+        // Re-enable updates now that we've finished restoring the layout
+        m_mainWindow->setUpdatesEnabled(true);
+
+        // Default layout should always be maximized
+        // (use window() because the MainWindow may be wrapped in another window
+        // like a WindowDecoratorWrapper or another QMainWindow for various layout reasons)
+        m_mainWindow->window()->showMaximized();
+
+        if (resetSettings)
+        {
+            // Restore selection
+            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
+        }
+    });
+}
+
+void QtViewPaneManager::SaveLayout(QString layoutName)
+{
+    if (!m_mainWindow || m_restoreInProgress)
+    {
+        return;
+    }
+
+    layoutName = layoutName.trimmed();
+
+    ViewLayoutState state;
+    foreach(const QtViewPane &pane, m_registeredPanes)
+    {
+        // Include all visible and tabbed panes in our layout, since tabbed panes
+        // won't be visible if they aren't the active tab, but still need to be
+        // retained in the layout
+        if (pane.IsVisible() || AzQtComponents::DockTabWidget::IsTabbed(pane.m_dockWidget))
+        {
+            state.viewPanes.push_back(pane.m_dockWidget->PaneName());
+        }
+    }
+
+    state.mainWindowState = m_advancedDockManager->saveState();
+
+    state.fakeDockWidgetGeometries = m_fakeDockWidgetGeometries;
+
+    SaveStateToLayout(state, layoutName);
+
+    AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequestBus::Events::Save);
+
+}
+
+void QtViewPaneManager::SaveStateToLayout(const ViewLayoutState& state, const QString& layoutName)
+{
+    const bool isNew = !HasLayout(layoutName);
+
+    {
+        AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
+        m_settings->setValue(layoutName, QVariant::fromValue<ViewLayoutState>(state));
+    }
+
+    m_settings->sync();
+
+    if (isNew)
+    {
+        emit savedLayoutsChanged();
+    }
+}
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+/*
+ * This methods creates a fake wrapper dock widget around the passed dock widget. The returned dock widget has
+ * no parent and can therefore be used for a contained QOpenGLWidget on macOS, since this doesn't work as expected
+ * when the QOpenGLWidget has the application's main window as (grand)parent.
+ * The return dock widget looks like a normal dock widget. It cannot be docked and no other dock widget can be
+ * docked into it.
+ */
+QDockWidget* QtViewPaneManager::ShowFakeNonDockableDockWidget(AzQtComponents::StyledDockWidget* dockWidget, QtViewPane* pane)
+{
+    dockWidget->customTitleBar()->setButtons({});
+    dockWidget->customTitleBar()->setContextMenuPolicy(Qt::NoContextMenu);
+    dockWidget->customTitleBar()->installEventFilter(new MouseEatingEventFilter(dockWidget));
+    auto fakeDockWidget = new AzQtComponents::StyledDockWidget(QString(), false, nullptr);
+    connect(dockWidget, &QObject::destroyed, fakeDockWidget, &QObject::deleteLater);
+    fakeDockWidget->setAllowedAreas(Qt::NoDockWidgetArea);
+    auto titleBar = fakeDockWidget->customTitleBar();
+    titleBar->setDragEnabled(true);
+    titleBar->setDrawSimple(true);
+    titleBar->setButtons({AzQtComponents::DockBarButton::MaximizeButton, AzQtComponents::DockBarButton::CloseButton});
+    fakeDockWidget->setWidget(dockWidget);
+    fakeDockWidget->show();
+    fakeDockWidget->setObjectName(dockWidget->objectName());
+
+    connect(fakeDockWidget, &AzQtComponents::StyledDockWidget::aboutToClose, this, [this, fakeDockWidget]() {
+        m_fakeDockWidgetGeometries[fakeDockWidget->objectName()] = fakeDockWidget->geometry();
+    });
+    if (pane->m_options.isDeletable)
+    {
+        fakeDockWidget->setAttribute(Qt::WA_DeleteOnClose);
+    }
+
+    return fakeDockWidget;
+}
+#endif
+
+void QtViewPaneManager::SerializeLayout(XmlNodeRef& parentNode) const
+{
+    ViewLayoutState state = GetLayout();
+
+    XmlNodeRef paneListNode = XmlHelpers::CreateXmlNode("ViewPanes");
+    parentNode->addChild(paneListNode);
+
+    for (const QString& paneName : state.viewPanes)
+    {
+        XmlNodeRef paneNode = XmlHelpers::CreateXmlNode("ViewPane");
+        paneNode->setContent(paneName.toUtf8().data());
+
+        paneListNode->addChild(paneNode);
+    }
+
+    XmlNodeRef windowStateNode = XmlHelpers::CreateXmlNode("WindowState");
+    windowStateNode->setContent(state.mainWindowState.toHex().data());
+
+    parentNode->addChild(windowStateNode);
+}
+
+bool QtViewPaneManager::DeserializeLayout(const XmlNodeRef& parentNode)
+{
+    ViewLayoutState state;
+
+    XmlNodeRef paneListNode = parentNode->findChild("ViewPanes");
+    if (!paneListNode)
+        return false;
+
+    for (int i = 0; i < paneListNode->getChildCount(); ++i)
+    {
+        XmlNodeRef paneNode = paneListNode->getChild(i);
+        state.viewPanes.push_back(QString(paneNode->getContent()));
+    }
+
+    XmlNodeRef windowStateNode = parentNode->findChild("WindowState");
+    if (!windowStateNode)
+        return false;
+
+    state.mainWindowState = QByteArray::fromHex(windowStateNode->getContent());
+
+    return RestoreLayout(state);
+}
+
+ViewLayoutState QtViewPaneManager::GetLayout() const
+{
+    ViewLayoutState state;
+
+    foreach(const QtViewPane &pane, m_registeredPanes)
+    {
+        // Include all visible and tabbed panes in our layout, since tabbed panes
+        // won't be visible if they aren't the active tab, but still need to be
+        // retained in the layout
+        if (pane.IsVisible() || AzQtComponents::DockTabWidget::IsTabbed(pane.m_dockWidget))
+        {
+            state.viewPanes.push_back(pane.m_dockWidget->PaneName());
+        }
+    }
+
+    state.mainWindowState = m_advancedDockManager->saveState();
+
+    state.fakeDockWidgetGeometries = m_fakeDockWidgetGeometries;
+
+    return state;
+}
+
+
+bool QtViewPaneManager::RestoreLayout(QString layoutName)
+{
+    if (m_restoreInProgress) // Against re-entrancy
+    {
+        return true;
+    }
+
+    QScopedValueRollback<bool> recursionGuard(m_restoreInProgress);
+    m_restoreInProgress = true;
+
+    layoutName = layoutName.trimmed();
+    if (layoutName.isEmpty())
+    {
+        return false;
+    }
+
+    ViewLayoutState state;
+    {
+        AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
+
+        if (!m_settings->contains(layoutName))
+        {
+            return false;
+        }
+
+        state = m_settings->value(layoutName).value<ViewLayoutState>();
+    }
+
+    // If we have the legacy UI disabled and are restoring the last user layout,
+    // if it doesn't contain the Entity Inspector and Outliner then we need to
+    // save their previous layout for them and switch them to the new default
+    // layout because they won't be able to do much without them
+    static const QString userLegacyLayout = "User Legacy Layout";
+    if (layoutName == s_lastLayoutName && !HasLayout(userLegacyLayout))
+    {
+        bool layoutHasEntityInspector = false;
+        bool layoutHasEntityOutliner = false;
+        for (const QString& paneName : state.viewPanes)
+        {
+            if (paneName == LyViewPane::EntityInspector)
+            {
+                layoutHasEntityInspector = true;
+            }
+            else if (paneName == LyViewPane::EntityOutliner)
+            {
+                layoutHasEntityOutliner = true;
+            }
+        }
+
+        if (!layoutHasEntityInspector || !layoutHasEntityOutliner)
+        {
+            SaveStateToLayout(state, userLegacyLayout);
+
+            QMessageBox box(AzToolsFramework::GetActiveWindow());
+            box.addButton(QMessageBox::Ok);
+            box.setWindowTitle(tr("Layout Saved"));
+            box.setText(tr("Your layout has been automatically updated for the new Component-Entity workflows. Your old layout has been saved as \"%1\" and can be restored from the View -> Layouts menu.").arg(userLegacyLayout));
+            box.exec();
+
+            return false;
+        }
+    }
+
+    if (!ClosePanesWithRollback(state.viewPanes))
+    {
+        return false;
+    }
+
+    // Store off currently selected entities
+    AzToolsFramework::EntityIdList selectedEntityIds;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    // Clear any selection
+    AzToolsFramework::EntityIdList noEntities;
+    AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, noEntities);
+
+    m_fakeDockWidgetGeometries = state.fakeDockWidgetGeometries;
+
+    for (const QString& paneName : state.viewPanes)
+    {
+        OpenPane(paneName, QtViewPane::OpenMode::OnlyOpen);
+    }
+
+    // must do this after opening all of the panes!
+    m_advancedDockManager->restoreState(state.mainWindowState);
+
+    AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
+
+    // In case of a crash it might happen that the QMainWindow state gets out of sync with the
+    // QtViewPaneManager state, which would result in we opening dock widgets that QMainWindow
+    // didn't know how to restore.
+    // Check if that happened and return false indicating the restore failed and giving caller
+    // a chance to restore the default layout.
+    if (AzToolsFramework::DockWidgetUtils::hasInvalidDockWidgets(m_mainWindow))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool QtViewPaneManager::RestoreLayout(const ViewLayoutState& state)
+{
+    m_fakeDockWidgetGeometries = state.fakeDockWidgetGeometries;
+
+    if (!ClosePanesWithRollback(state.viewPanes))
+    {
+        return false;
+    }
+
+    for (const QString& paneName : state.viewPanes)
+    {
+        OpenPane(paneName, QtViewPane::OpenMode::OnlyOpen);
+    }
+
+    // must do this after opening all of the panes!
+    m_advancedDockManager->restoreState(state.mainWindowState);
+
+    return true;
+}
+
+
+void QtViewPaneManager::RenameLayout(QString name, QString newName)
+{
+    name = name.trimmed();
+    newName = newName.trimmed();
+    if (name == newName || newName.isEmpty() || name.isEmpty())
+    {
+        return;
+    }
+
+    {
+        AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
+
+        m_settings->setValue(newName, m_settings->value(name));
+        m_settings->remove(name);
+    }
+
+    m_settings->sync();
+    emit savedLayoutsChanged();
+}
+
+void QtViewPaneManager::RemoveLayout(QString layoutName)
+{
+    layoutName = layoutName.trimmed();
+    if (layoutName.isEmpty())
+    {
+        return;
+    }
+
+    {
+        AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
+        m_settings->remove(layoutName.trimmed());
+    }
+
+    m_settings->sync();
+    emit savedLayoutsChanged();
+}
+
+bool QtViewPaneManager::HasLayout(const QString& name) const
+{
+    return LayoutNames().contains(name.trimmed(), Qt::CaseInsensitive);
+}
+
+QStringList QtViewPaneManager::LayoutNames(bool userLayoutsOnly) const
+{
+    QStringList layouts;
+
+    AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
+    layouts = m_settings->childKeys();
+
+    if (userLayoutsOnly)
+    {
+        layouts.removeOne(s_lastLayoutName); // "last" is internal
+    }
+    return layouts;
+}
+
+QtViewPanes QtViewPaneManager::GetRegisteredPanes(bool viewPaneMenuOnly) const
+{
+    if (!viewPaneMenuOnly)
+    {
+        return m_registeredPanes;
+    }
+
+    QtViewPanes panes;
+    panes.reserve(30); // approximate
+    std::copy_if(m_registeredPanes.cbegin(), m_registeredPanes.cend(), std::back_inserter(panes), [](QtViewPane pane)
+        {
+            return pane.m_options.showInMenu;
+        });
+
+    return panes;
+}
+
+QtViewPanes QtViewPaneManager::GetRegisteredMultiInstancePanes(bool viewPaneMenuOnly) const
+{
+    QtViewPanes panes;
+    panes.reserve(30); // approximate
+
+    if (viewPaneMenuOnly)
+    {
+        std::copy_if(m_registeredPanes.cbegin(), m_registeredPanes.cend(), std::back_inserter(panes), [](QtViewPane pane)
+            {
+                return pane.m_options.showInMenu && pane.m_options.canHaveMultipleInstances;
+            });
+    }
+    else
+    {
+        std::copy_if(m_registeredPanes.cbegin(), m_registeredPanes.cend(), std::back_inserter(panes), [](QtViewPane pane)
+            {
+                return pane.m_options.canHaveMultipleInstances;
+            });
+    }
+
+    return panes;
+}
+
+QtViewPanes QtViewPaneManager::GetRegisteredViewportPanes() const
+{
+    QtViewPanes viewportPanes;
+    viewportPanes.reserve(5); // approximate
+    std::copy_if(m_registeredPanes.cbegin(), m_registeredPanes.cend(), std::back_inserter(viewportPanes), [](QtViewPane pane)
+        {
+            return pane.IsViewportPane();
+        });
+
+    return viewportPanes;
+}
+
+int QtViewPaneManager::NextAvailableId()
+{
+    for (int candidate = ID_VIEW_OPENPANE_FIRST; candidate <= ID_VIEW_OPENPANE_LAST; ++candidate)
+    {
+        if (!m_knownIdsSet.contains(candidate))
+        {
+            m_knownIdsSet.push_back(candidate);
+            return candidate;
+        }
+    }
+
+    return -1;
+}
+
+QtViewPane* QtViewPaneManager::GetPane(int id)
+{
+    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
+            [id](const QtViewPane& pane) { return id == pane.m_id; });
+
+    return it == m_registeredPanes.end() ? nullptr : it;
+}
+
+QtViewPane* QtViewPaneManager::GetPane(const QString& name)
+{
+    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
+            [name](const QtViewPane& pane) { return name == pane.m_name; });
+
+    QtViewPane* foundPane = ((it == m_registeredPanes.end()) ? nullptr : it);
+
+    if (foundPane == nullptr)
+    {
+        // if we couldn't find the pane based on the name (which will be the title), look it up by saveKeyName next
+        it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
+            [name](const QtViewPane& pane) { return name == pane.m_options.saveKeyName; });
+
+        foundPane = ((it == m_registeredPanes.end()) ? nullptr : it);
+    }
+
+    return foundPane;
+}
+
+QtViewPane* QtViewPaneManager::GetViewportPane(int viewportType)
+{
+    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
+            [viewportType](const QtViewPane& pane) { return viewportType == pane.m_options.viewportType; });
+
+    return it == m_registeredPanes.end() ? nullptr : it;
+}
+
+QDockWidget* QtViewPaneManager::GetView(const QString& name)
+{
+    QtViewPane* pane = GetPane(name);
+    return pane ? pane->m_dockWidget : nullptr;
+}
+
+bool QtViewPaneManager::IsVisible(const QString& name)
+{
+    QtViewPane* view = GetPane(name);
+    return view && view->IsVisible();
+}
+
+bool QtViewPaneManager::IsPaneRegistered(const QString& name) const
+{
+    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
+        [name](const QtViewPane& pane) { return name == pane.m_name; });
+
+    return it != m_registeredPanes.end();
+}
+
+#include <moc_QtViewPaneManager.cpp>
diff --git a/Code/Editor/QtViewPaneManager.h b/Code/Editor/QtViewPaneManager.h
new file mode 100644
index 0000000000..aa382c41c0
--- /dev/null
+++ b/Code/Editor/QtViewPaneManager.h
@@ -0,0 +1,289 @@
+/*
+ * 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 "Include/EditorCoreAPI.h"
+#endif
+
+#if !defined(Q_MOC_RUN)
+#include "Include/EditorCoreAPI.h"
+#include <QtViewPane.h>
+#include "Resource.h"
+#include <AzToolsFramework/API/ViewPaneOptions.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzQtComponents/Components/DockTabWidget.h>
+#include <AzQtComponents/Components/StyledDockWidget.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
+
+#include <QObject>
+#include <QVector>
+#include <QPointer>
+#include <QSettings>
+#include <QAction>
+#include <QByteArray>
+#include <QList>
+
+#include <LyViewPaneNames.h>
+
+#include <AzCore/std/functional.h>
+#endif
+
+class QMainWindow;
+struct ViewLayoutState;
+
+namespace AzQtComponents
+{
+    class DockMainWindow;
+    class StyledDockWidget;
+    class FancyDocking;
+
+} // namespace AzQtComponents
+
+typedef AZStd::function<QWidget*(QWidget*)> ViewPaneFactory;
+
+class DockWidget
+    : public AzQtComponents::StyledDockWidget
+{
+    Q_OBJECT
+public:
+    explicit DockWidget(QWidget* widget, QtViewPane* pane, QSettings* settings, QMainWindow* parent, AzQtComponents::FancyDocking* advancedDockManager);
+
+    QString PaneName() const;
+    void RestoreState(bool forceDefault = false);
+
+    /**
+     * Gets the setting name for a given pane.
+     */
+    static QString settingsKey(const QString& paneName);
+
+protected:
+    bool event(QEvent* qtEvent) override;
+private:
+    void reparentToMainWindowFix();
+    QRect ProperGeometry() const;
+    QString settingsKey() const;
+    QSettings* const m_settings;
+    QMainWindow* const m_mainWindow;
+    QtViewPane* const m_pane;
+    AzQtComponents::FancyDocking* m_advancedDockManager;
+};
+
+struct QtViewPane
+{
+    enum class OpenMode
+    {
+        None                = 0x0,
+        UseDefaultState     = 0x1, // Use default geometry and docking position when opening
+        MultiplePanes       = 0x2,
+        RestoreLayout       = 0x4,
+        OnlyOpen            = 0x8,
+    };
+    Q_DECLARE_FLAGS(OpenModes, OpenMode)
+
+    enum class CloseMode
+    {
+        None                = 0x0,
+        Destroy             = 0x1, // Destroy window when closing it
+        Force               = 0x2 // Force the dialog to close instead of querying the view if we can close
+    };
+    Q_DECLARE_FLAGS(CloseModes, CloseMode)
+
+    int m_id; // between ID_VIEW_OPENPANE_FIRST and ID_VIEW_OPENPANE_LAST
+    QString m_name;
+    QString m_category;
+    ViewPaneFactory m_factoryFunc;
+    QPointer<DockWidget> m_dockWidget;
+    AzToolsFramework::ViewPaneOptions m_options;
+    QList<DockWidget*> m_dockWidgetInstances;
+
+    bool IsValid() const
+    {
+        return m_id >= ID_VIEW_OPENPANE_FIRST && m_id <= ID_VIEW_OPENPANE_LAST && !m_name.isEmpty();
+    }
+
+    bool IsVisible() const
+    {
+        return m_dockWidget && m_dockWidget->isVisible();
+    }
+
+    bool IsConstructed() const
+    {
+        return m_dockWidget != nullptr;
+    }
+
+    QWidget* Widget() const
+    {
+        return IsConstructed() ? m_dockWidget->widget() : nullptr;
+    }
+
+    bool IsViewportPane() const
+    {
+        return m_category == QLatin1String("Viewport") && m_options.viewportType != -1;
+    }
+
+    bool IsPreview() const
+    {
+        return m_options.isPreview;
+    }
+
+    QWidget* CreateWidget();
+    bool Close(CloseModes = CloseMode::Destroy);
+    bool CloseInstance(QDockWidget* dockWidget, CloseModes closeModes = CloseMode::Destroy);
+};
+
+typedef QVector<QtViewPane> QtViewPanes;
+
+class EDITOR_CORE_API QtViewPaneManager
+    : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QtViewPaneManager(QObject* parent = nullptr);
+    ~QtViewPaneManager();
+    void SetMainWindow(AzQtComponents::DockMainWindow*, QSettings* settings, const QByteArray& lastMainWindowState);
+    void RegisterPane(const QString &name, const QString &category, ViewPaneFactory, const AzToolsFramework::ViewPaneOptions& = {});
+    void UnregisterPane(const QString& name);
+    QtViewPane* GetPane(int id);
+    QtViewPane* GetPane(const QString& name);
+    QtViewPane* GetViewportPane(int viewportType);
+    QDockWidget* GetView(const QString& name);
+    bool IsVisible(const QString& name);
+    bool IsPaneRegistered(const QString& name) const;
+
+    /**
+     * Constructs and shows a view pane.
+     * The pane is a QDockWidget who's widget was created with QtViewPane::m_factoryFunc.
+     * If useDefaultState is true, the default docking area and geometry are used, not the last one.
+     *
+     * Returns the view on success, nullptr otherwise
+     */
+    const QtViewPane* OpenPane(const QString& name, QtViewPane::OpenModes = QtViewPane::OpenMode::None);
+    QDockWidget* InstancePane(const QString& name);
+    bool ClosePane(const QString& name, QtViewPane::CloseModes = QtViewPane::CloseMode::None);
+    bool ClosePaneInstance(const QString& name, QDockWidget* dockPanel, QtViewPane::CloseModes = QtViewPane::CloseMode::None);
+
+    /**
+     * If the pane is not visible, it will be opened and made visible.
+     * If the pane is visible, it will be closed.
+     */
+    void TogglePane(const QString& name);
+    bool CloseAllPanes();
+
+    /**
+     * Closes all non standard panes. Standard panes are for example rollup and console.
+     */
+    void CloseAllNonStandardPanes();
+
+    /**
+     * Creates and returns a widget by calling QtViewPane::m_factoryFunc() for the view pane with name paneName.
+     * This is similar to OpenPane(), except that there's no dock widget involved. The widget will be used in a
+     * CLayoutViewPane (the embedded viewports).
+     *
+     * Returns nullptr if the specified pane name is not registered.
+     */
+    QWidget* CreateWidget(const QString& paneName);
+
+    void RestoreLayout(bool restoreDefaults);
+    bool RestoreLayout(QString name);
+    void RestoreDefaultLayout(bool resetSettings = false);
+    void SaveLayout();
+    void SaveLayout(QString name);
+    void RenameLayout(QString name, QString newName);
+    void RemoveLayout(QString name);
+    bool HasLayout(const QString& name) const;
+    QStringList LayoutNames(bool userLayoutsOnly = true) const;
+
+    void SerializeLayout(XmlNodeRef& parentNode) const;
+    bool DeserializeLayout(const XmlNodeRef& parentNode);
+
+    static QtViewPaneManager* instance();
+    static bool exists();
+
+    /**
+     * Returns the known view panes (regardless of them being open or not).
+     * If viewPaneMenuOnly is true, only those appearing in "View->Open View Pane" will be show,
+     * meaning panes such as the rollup bar or console aren't returned.
+     */
+    QtViewPanes GetRegisteredPanes(bool viewPaneMenuOnly = true) const;
+    QtViewPanes GetRegisteredMultiInstancePanes(bool viewPaneMenuOnly = true) const;
+    QtViewPanes GetRegisteredViewportPanes() const; // only returns the Top/Bottom/Left etc. ones
+
+    //! Attempts to closes everything not in the input list. Returns false if any failed, and restores all previously opened windows if it does. Returns true otherwise
+    bool ClosePanesWithRollback(const QVector<QString>& panesToKeepOpen);
+
+signals:
+    void savedLayoutsChanged();
+    void layoutReset();
+    void viewPaneCreated(const QtViewPane* pane);
+    void registeredPanesChanged();
+
+private:
+    friend class DockWidget;
+    ViewLayoutState GetLayout() const;
+    bool RestoreLayout(const ViewLayoutState& state);
+    void SaveStateToLayout(const ViewLayoutState& state, const QString& layoutName);
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    QDockWidget* ShowFakeNonDockableDockWidget(AzQtComponents::StyledDockWidget* dockWidget, QtViewPane* pane);
+#endif
+
+    bool ClosePane(QtViewPane* pane, QtViewPane::CloseModes closeModes = QtViewPane::CloseMode::None);
+    int NextAvailableId();
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QtViewPanes m_registeredPanes;
+    QByteArray m_defaultMainWindowState;
+    QByteArray m_loadedMainWindowState;
+    QMainWindow* m_mainWindow;
+    QSettings* m_settings;
+    QList<int> m_knownIdsSet; // Semantically a set, but QList is faster for small collections than QSet
+    bool m_restoreInProgress;
+    QMap<QString, QRect> m_fakeDockWidgetGeometries;
+
+    QPointer<AzQtComponents::FancyDocking> m_advancedDockManager;
+
+    using EditorComponentModeNotificationBusImpl = AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBusImpl;
+    EditorComponentModeNotificationBusImpl m_componentModeNotifications; /**< Helper for EditorComponentModeNotificationBus so 
+                                                                           *  QtViewPaneManager does not need to inherit directly from it. */
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+template<class TWidget>
+bool RegisterQtViewPane([[maybe_unused]] IEditor* editor, const QString& name, const QString& category, const AzToolsFramework::ViewPaneOptions& options = {})
+{
+    QtViewPaneManager::instance()->RegisterPane(name, category, [](QWidget* parent = nullptr) { return new TWidget(parent); }, options);
+    return true;
+}
+
+template<class TWidget>
+bool RegisterQtViewPaneWithName([[maybe_unused]] IEditor* editor, const QString& name, const QString& category, const AzToolsFramework::ViewPaneOptions& options = {})
+{
+    QtViewPaneManager::instance()->RegisterPane(name, category, [name](QWidget* parent = nullptr) { return new TWidget(name, parent); }, options);
+    return true;
+}
+
+template<class TWidget>
+void UnregisterQtViewPane()
+{
+    // always close any views that the pane is responsible for before you remove it!
+    GetIEditor()->CloseView(CQtViewClass<TWidget>::GetClassID());
+    GetIEditor()->GetClassFactory()->UnregisterClass(CQtViewClass<TWidget>::GetClassID());
+}
+
+template<typename TWidget>
+TWidget* FindViewPane(const QString& name)
+{
+    QtViewPane* pane = QtViewPaneManager::exists() ? QtViewPaneManager::instance()->GetPane(name) : nullptr;
+    return pane ? qobject_cast<TWidget*>(pane->Widget()) : nullptr;
+}
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QtViewPane::OpenModes)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QtViewPane::CloseModes)
+
+
diff --git a/Code/Editor/QuickAccessBar.cpp b/Code/Editor/QuickAccessBar.cpp
new file mode 100644
index 0000000000..c9604d894f
--- /dev/null
+++ b/Code/Editor/QuickAccessBar.cpp
@@ -0,0 +1,187 @@
+/*
+ * 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 : A dialog bar for quickly accessing menu items and cvars
+
+
+#include "EditorDefs.h"
+
+#include "QuickAccessBar.h"
+
+// Qt
+#include <QCompleter>
+#include <QAction>
+#include <QMenuBar>
+#include <QStringListModel>
+
+// Editor
+#include "MainWindow.h"
+#include "ActionManager.h"
+#include "KeyboardCustomizationSettings.h"
+#include "CryEdit.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_QuickAccessBar.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+CQuickAccessBar::CQuickAccessBar(QWidget* pParent)
+    : QWidget(pParent, Qt::FramelessWindowHint|Qt::WindowStaysOnTopHint)
+    , m_lastViewPaneMapVersion(-1)
+    , m_completer(new QCompleter(this))
+    , m_model(new QStringListModel(this))
+    , m_ui(new Ui::QuickAccessBar)
+{
+    m_ui->setupUi(this);
+    m_ui->m_inputEdit->installEventFilter(this);
+    m_ui->m_inputEdit->setCompleter(m_completer);
+    m_completer->setModel(m_model);
+    m_completer->setCaseSensitivity(Qt::CaseInsensitive);
+    m_completer->setFilterMode(Qt::MatchContains);
+    setFocusProxy(m_ui->m_inputEdit);
+    OnInitDialog();
+
+    connect(m_ui->m_inputEdit, &QLineEdit::returnPressed, this, &CQuickAccessBar::OnOK);
+}
+
+CQuickAccessBar::~CQuickAccessBar()
+{
+
+}
+
+void CQuickAccessBar::OnInitDialog()
+{
+    // Make this window 50% alpha.
+    setWindowOpacity(0.5);
+
+    m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+
+    CollectMenuItems(MainWindow::instance()->menuBar());
+
+    AddMRUFileItems();
+
+    // Add console variables & commands.
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+    std::vector<const char*> cmds;
+    cmds.resize(console->GetNumVars());
+    size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
+    for (int i = 0; i < cmdCount; ++i)
+    {
+        m_model->setStringList(m_model->stringList() += cmds[i]);
+    }
+}
+
+void CQuickAccessBar::OnOK()
+{
+    QString menuCmd = m_ui->m_inputEdit->text();
+    if (!menuCmd.isEmpty())
+    {
+        auto actionItem = m_menuActionTable.find(menuCmd);
+        if (actionItem != m_menuActionTable.end())
+        {
+            actionItem->second->trigger();
+        }
+        else
+        {
+            GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(menuCmd.toUtf8().data());
+        }
+
+        m_ui->m_inputEdit->clear();
+    }
+
+    setVisible(false);
+}
+
+void CQuickAccessBar::OnCancel()
+{
+    setVisible(false);
+}
+
+bool CQuickAccessBar::eventFilter(QObject* object, QEvent* event)
+{
+    if (object == m_ui->m_inputEdit && event->type() == QEvent::FocusOut)
+    {
+        OnCancel();
+    }
+    return false;
+}
+
+void CQuickAccessBar::showEvent([[maybe_unused]] QShowEvent* event)
+{
+    const int viewPaneVersion = MainWindow::instance()->ViewPaneVersion();
+
+    if (viewPaneVersion != m_lastViewPaneMapVersion)
+    {
+        m_lastViewPaneMapVersion = viewPaneVersion;
+        m_model->setStringList(QStringList());
+        m_menuActionTable.clear();
+        CollectMenuItems(MainWindow::instance()->menuBar());
+    }
+
+    m_ui->m_inputEdit->setFocus();
+}
+
+void CQuickAccessBar::AddMRUFileItems()
+{
+    RecentFileList* pMRUList = CCryEditApp::instance()->GetRecentFileList();
+
+    // someone may set HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer\NoRecentDocsHistory to 1, thus pMRUList is a nullptr
+    if (!pMRUList)
+    {
+        return;
+    }
+
+    for (int i = 0; i < pMRUList->GetSize(); ++i)
+    {
+        QString mruText;
+        pMRUList->GetDisplayName(mruText, i, "");
+        if (mruText.isEmpty() || !(*pMRUList)[i].endsWith(m_levelExtension))
+        {
+            continue;
+        }
+        m_model->setStringList(m_model->stringList() += mruText);
+        m_menuActionTable[mruText] = MainWindow::instance()->GetActionManager()->GetAction(ID_FILE_MRU_FILE1 + i);
+    }
+
+    m_model->sort(0);
+}
+
+void CQuickAccessBar::CollectMenuItems(QMenuBar* menuBar)
+{
+    foreach (auto action,  menuBar->actions())
+    {
+        CollectMenuItems(action, QString());
+    }
+    m_model->sort(0);
+}
+
+void CQuickAccessBar::CollectMenuItems(QAction* action, const QString& path)
+{
+    const QString actionText = RemoveAcceleratorAmpersands(action->text());
+    const QString newPath = path.isEmpty() ? actionText : (path + "." + actionText);
+    if (action->menu())
+    {
+        foreach (auto subAction, action->menu()->actions())
+        {
+            CollectMenuItems(subAction, newPath);
+        }
+    }
+    else
+    {
+        const int id = action->data().toInt();
+        if (id == 0 || actionText.isEmpty())
+        {
+            return;
+        }
+
+        m_model->setStringList(m_model->stringList() += newPath);
+        m_menuActionTable[newPath] = action;
+    }
+}
+
+#include <moc_QuickAccessBar.cpp>
diff --git a/Code/Editor/QuickAccessBar.h b/Code/Editor/QuickAccessBar.h
new file mode 100644
index 0000000000..2011b166e6
--- /dev/null
+++ b/Code/Editor/QuickAccessBar.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : A dialog bar for quickly accessing menu items and cvars
+
+#ifndef CRYINCLUDE_EDITOR_QUICKACCESSBAR_H
+#define CRYINCLUDE_EDITOR_QUICKACCESSBAR_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QWidget>
+#endif
+
+class QAction;
+class QCompleter;
+class QMenuBar;
+class QStringListModel;
+
+namespace Ui
+{
+    class QuickAccessBar;
+}
+
+class CQuickAccessBar
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    CQuickAccessBar(QWidget* pParent = nullptr);
+    ~CQuickAccessBar();
+
+    bool eventFilter(QObject* object, QEvent* event) override;
+
+protected:
+    void showEvent(QShowEvent* event) override;
+
+    virtual void OnInitDialog();
+    virtual void OnOK();
+    virtual void OnCancel();
+
+    std::map<QString, QAction*> m_menuActionTable;
+    int m_lastViewPaneMapVersion;
+
+    void AddMRUFileItems();
+private:
+    void CollectMenuItems(QMenuBar* menuBar);
+    void CollectMenuItems(QAction* action, const QString& path);
+
+    QCompleter* m_completer;
+    QStringListModel* m_model;
+
+    QScopedPointer<Ui::QuickAccessBar> m_ui;
+    const char* m_levelExtension = nullptr;
+};
+
+#endif // CRYINCLUDE_EDITOR_QUICKACCESSBAR_H
diff --git a/Code/Sandbox/Editor/QuickAccessBar.ui b/Code/Editor/QuickAccessBar.ui
similarity index 100%
rename from Code/Sandbox/Editor/QuickAccessBar.ui
rename to Code/Editor/QuickAccessBar.ui
diff --git a/Code/Editor/RenderHelpers/AxisHelper.cpp b/Code/Editor/RenderHelpers/AxisHelper.cpp
new file mode 100644
index 0000000000..a10604d16b
--- /dev/null
+++ b/Code/Editor/RenderHelpers/AxisHelper.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "AxisHelperShared.inl"
diff --git a/Code/Editor/RenderHelpers/AxisHelper.h b/Code/Editor/RenderHelpers/AxisHelper.h
new file mode 100644
index 0000000000..5d07cb246e
--- /dev/null
+++ b/Code/Editor/RenderHelpers/AxisHelper.h
@@ -0,0 +1,84 @@
+/*
+ * 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_RENDERHELPERS_AXISHELPER_H
+#define CRYINCLUDE_EDITOR_RENDERHELPERS_AXISHELPER_H
+#pragma once
+
+#include "IEditor.h" // for AxisConstrains and RefCoordSys
+
+struct DisplayContext;
+struct HitContext;
+struct IDisplayViewport;
+
+//////////////////////////////////////////////////////////////////////////
+struct SGizmoParameters
+{
+    bool axisGizmoText;
+    bool enabled;
+    float axisGizmoScale;
+    AxisConstrains axisConstraint;
+    RefCoordSys referenceCoordSys;
+
+    SGizmoParameters()
+        : axisGizmoText(false)
+        , enabled(true)
+        , axisGizmoScale(1.0f)
+        , axisConstraint(AXIS_TERRAIN)
+        , referenceCoordSys(COORDS_LOCAL)
+    {
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Helper Axis object.
+//////////////////////////////////////////////////////////////////////////
+class CAxisHelper
+{
+public:
+    enum EHelperMode
+    {
+        MOVE_MODE    = 0x1,
+        SCALE_MODE   = 0x2,
+        ROTATE_MODE  = 0x4,
+        SELECT_MODE  = 0x8,
+        ROTATE_CIRCLE_MODE = 0x10,
+    };
+
+    CAxisHelper();
+
+    void SetMode(int nModeFlags);
+    void DrawAxis(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc);
+    void DrawDome(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc, AABB& objectBox);
+    bool HitTest(const Matrix34& worldTM, const SGizmoParameters& setup, HitContext& hc);
+
+    bool HitTestForRotationCircle(const Matrix34& worldTM, IDisplayViewport* view, const QPoint& pos, float fHitWidth, Vec3* pOutHitPos = NULL, Vec3* pOutHitNormal = NULL);
+
+    void SetHighlightAxis(int axis) { m_highlightAxis = axis; };
+    int  GetHighlightAxis() const { return m_highlightAxis; };
+
+private:
+    void Prepare(const Matrix34& worldTM, const SGizmoParameters& setup, IDisplayViewport* view);
+    float GetDistance2D(IDisplayViewport* view, const QPoint& p, const Vec3& wp);
+
+    int m_nModeFlags;
+    int m_highlightAxis;
+    int m_highlightMode;
+    int m_currentMode;
+    bool m_bHighlightRotationCircle;
+
+    float m_fScreenScale;
+    bool m_bNeedX;
+    bool m_bNeedY;
+    bool m_bNeedZ;
+    float m_size;
+    Matrix34 m_matrix;
+};
+
+#endif // CRYINCLUDE_EDITOR_RENDERHELPERS_AXISHELPER_H
+
diff --git a/Code/Editor/RenderHelpers/AxisHelperShared.inl b/Code/Editor/RenderHelpers/AxisHelperShared.inl
new file mode 100644
index 0000000000..e161534f7b
--- /dev/null
+++ b/Code/Editor/RenderHelpers/AxisHelperShared.inl
@@ -0,0 +1,848 @@
+/*
+ * 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 "AxisHelper.h"
+
+#include "Objects/DisplayContext.h"
+#include "Include/IDisplayViewport.h"
+#include "Include/HitContext.h"
+#include "Util/Math.h"
+#include "IObjectManager.h"
+#include <Cry_Geo.h>
+
+const float kPlaneScale = 0.3f;
+const float kBoldLine3D = 4.f;
+const float kBoldLine2D = 2.f;
+const float kSelectionBallScale = 0.05f;
+const float kRotateCircleRadiusScale = 0.2f;
+
+//////////////////////////////////////////////////////////////////////////
+CAxisHelper::CAxisHelper()
+    : m_matrix(IDENTITY)
+{
+    m_nModeFlags = MOVE_MODE;
+    m_currentMode = MOVE_MODE;
+    m_highlightMode = 1;
+    m_highlightAxis = 0;
+    m_bHighlightRotationCircle = false;
+
+    m_bNeedX = true;
+    m_bNeedY = true;
+    m_bNeedZ = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisHelper::SetMode(int nModeFlags)
+{
+    m_nModeFlags = nModeFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisHelper::Prepare(const Matrix34& worldTM, const SGizmoParameters& setup, IDisplayViewport* view)
+{
+    m_fScreenScale = view->GetScreenScaleFactor(worldTM.GetTranslation());
+    m_size = setup.axisGizmoScale * m_fScreenScale;
+
+    m_bNeedX = true;
+    m_bNeedY = true;
+    m_bNeedZ = true;
+
+    IDisplayViewport::EAxis axis = IDisplayViewport::AXIS_NONE;
+    bool b2D = false;
+
+    view->GetPerpendicularAxis(&axis, &b2D);
+    switch (axis)
+    {
+    case static_cast<IDisplayViewport::EAxis>(AXIS_X):
+        m_bNeedX = false;
+        break;
+    case static_cast<IDisplayViewport::EAxis>(AXIS_Y):
+        m_bNeedY = false;
+        break;
+    case static_cast<IDisplayViewport::EAxis>(AXIS_Z):
+        m_bNeedZ = false;
+        break;
+    }
+
+    m_matrix = worldTM;
+    RefCoordSys refCoordSys = setup.referenceCoordSys;
+    if (b2D && refCoordSys == COORDS_VIEW)
+    {
+        m_matrix = view->GetViewTM();
+        m_matrix.SetTranslation(worldTM.GetTranslation());
+    }
+    m_matrix.OrthonormalizeFast();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisHelper::DrawDome(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc, AABB& objectBox)
+{
+    Prepare(worldTM, setup, dc.view);
+    Vec3 x(m_size, 0, 0);
+    Vec3 y(0, m_size, 0);
+    Vec3 z(0, 0, m_size);
+
+
+    int prevRState = dc.GetState();
+
+    if (!(dc.flags & DISPLAY_2D))
+    {
+        dc.DepthTestOff();
+    }
+
+    dc.PushMatrix(m_matrix);
+    dc.SetDrawInFrontMode(true);
+
+    float radius = objectBox.GetRadius();
+    dc.DrawCircle(Vec3(0, 0, 0), radius);
+    dc.DrawCircle(Vec3(0, 0, 0), radius / 3.0f);
+
+    dc.DrawArc(Vec3(0, 0, 0), radius, 0.0f, 180.0f, 1, Vec3(0, -1, 0));
+    dc.DrawArc(Vec3(0, 0, 0), radius, 90.0f, 180.0f, 1, Vec3(1, 0, 0));
+
+
+    dc.PopMatrix();
+    if (!(dc.flags & DISPLAY_2D))
+    {
+        dc.DepthTestOn();
+    }
+
+    dc.SetState(prevRState);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CAxisHelper::DrawAxis(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc)
+{
+    Prepare(worldTM, setup, dc.view);
+
+    Vec3 x(m_size, 0, 0);
+    Vec3 y(0, m_size, 0);
+    Vec3 z(0, 0, m_size);
+
+    int prevRState = dc.GetState();
+
+    if (!(dc.flags & DISPLAY_2D))
+    {
+        dc.DepthTestOff();
+    }
+
+    dc.PushMatrix(m_matrix);
+    dc.SetDrawInFrontMode(true);
+
+    Vec3 colSelected(1, 1, 0);
+    Vec3 axisColor(1, 1, 1);
+    Vec3 disabledColor(0.75, 0.75, 0.75);
+
+    Matrix34 worldTMWithoutScale(worldTM);
+    worldTMWithoutScale.OrthonormalizeFast();
+    float textSize = 1.4f;
+
+    if (!(m_nModeFlags & ROTATE_CIRCLE_MODE))
+    {
+        dc.SetColor(setup.enabled ? axisColor : disabledColor);
+        if (m_bNeedX && setup.axisGizmoText)
+        {
+            dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(x), textSize, "x");
+        }
+        if (m_bNeedY && setup.axisGizmoText)
+        {
+            dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(y), textSize, "y");
+        }
+        if (m_bNeedZ && setup.axisGizmoText)
+        {
+            dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(z), textSize, "z");
+        }
+    }
+
+    int axis = setup.axisConstraint;
+    if (m_highlightAxis)
+    {
+        axis = m_highlightAxis;
+    }
+
+    float lineWidth = kBoldLine3D;
+    if (dc.flags & DISPLAY_2D)
+    {
+        lineWidth = kBoldLine2D;
+    }
+
+    float linew[3];
+    linew[0] = linew[1] = linew[2] = 0;
+    Vec3 colX, colY, colZ;
+    if (setup.enabled)
+    {
+        colX = Vec3(1, 0, 0);
+        colY = Vec3(0, 1, 0);
+        colZ = Vec3(0, 0, 1);
+    }
+    else
+    {
+        colX = colY = colZ = disabledColor;
+    }
+    Vec3 colXArrow = colX, colYArrow = colY, colZArrow = colZ;
+    if (!(m_nModeFlags & ROTATE_CIRCLE_MODE))
+    {
+        if (axis)
+        {
+            float col[4] = { 1, 0, 0, 1 };
+            if (axis == AXIS_X || axis == AXIS_XY || axis == AXIS_XZ || axis == AXIS_XYZ)
+            {
+                colX = colSelected;
+                dc.SetColor(colSelected);
+                if (m_bNeedX && setup.axisGizmoText)
+                {
+                    dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(x), textSize, "x");
+                }
+                linew[0] = lineWidth;
+            }
+            if (axis == AXIS_Y || axis == AXIS_XY || axis == AXIS_YZ || axis == AXIS_XYZ)
+            {
+                colY = colSelected;
+                dc.SetColor(colSelected);
+                if (m_bNeedY && setup.axisGizmoText)
+                {
+                    dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(y), textSize, "y");
+                }
+                linew[1] = lineWidth;
+            }
+            if (axis == AXIS_Z || axis == AXIS_XZ || axis == AXIS_YZ || axis == AXIS_XYZ)
+            {
+                colZ = colSelected;
+                dc.SetColor(colSelected);
+                if (m_bNeedZ && setup.axisGizmoText)
+                {
+                    dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(z), textSize, "z");
+                }
+                linew[2] = lineWidth;
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Calc sizes.
+    //////////////////////////////////////////////////////////////////////////
+    float headOfs[8];
+    float headScl[8];
+    headOfs[MOVE_MODE] = 0;
+    headScl[MOVE_MODE] = 0.07f * m_fScreenScale;
+    headOfs[ROTATE_MODE] = 0;
+    headScl[ROTATE_MODE] = 0.01f * m_fScreenScale;
+    headOfs[SCALE_MODE] = 0;
+    headScl[SCALE_MODE] = 0.01f * m_fScreenScale;
+    if (m_nModeFlags == (MOVE_MODE | ROTATE_MODE | SCALE_MODE))
+    {
+        headOfs[ROTATE_MODE] += 0.05f * m_fScreenScale;
+        headOfs[SCALE_MODE] += 0.1f * m_fScreenScale;
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    if (!(m_nModeFlags & ROTATE_CIRCLE_MODE))
+    {
+        if (m_bNeedX)
+        {
+            dc.SetColor(colX);
+            dc.SetLineWidth(linew[0]);
+            dc.DrawLine(Vec3(0, 0, 0), x + Vec3(headOfs[SCALE_MODE], 0, 0));
+        }
+        if (m_bNeedY)
+        {
+            dc.SetColor(colY);
+            dc.SetLineWidth(linew[1]);
+            dc.DrawLine(Vec3(0, 0, 0), y + Vec3(0, headOfs[SCALE_MODE], 0));
+        }
+        if (m_bNeedZ)
+        {
+            dc.SetColor(colZ);
+            dc.SetLineWidth(linew[2]);
+            dc.DrawLine(Vec3(0, 0, 0), z + Vec3(0, 0, headOfs[SCALE_MODE]));
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Draw Move Arrows.
+    //////////////////////////////////////////////////////////////////////////
+    if (m_nModeFlags & MOVE_MODE)
+    {
+        if (m_bNeedX)
+        {
+            if (m_highlightMode == 1)
+            {
+                dc.SetColor(colX);
+            }
+            else
+            {
+                dc.SetColor(colXArrow);
+            }
+            dc.DrawArrow(x - x * 0.1f, x, headScl[MOVE_MODE]);
+        }
+        if (m_bNeedY)
+        {
+            if (m_highlightMode == 1)
+            {
+                dc.SetColor(colY);
+            }
+            else
+            {
+                dc.SetColor(colYArrow);
+            }
+            dc.DrawArrow(y - y * 0.1f, y, headScl[MOVE_MODE]);
+        }
+        if (m_bNeedZ)
+        {
+            if (m_highlightMode == 1)
+            {
+                dc.SetColor(colZ);
+            }
+            else
+            {
+                dc.SetColor(colZArrow);
+            }
+            dc.DrawArrow(z - z * 0.1f, z, headScl[MOVE_MODE]);
+        }
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Draw Scale Boxes.
+    //////////////////////////////////////////////////////////////////////////
+    if (m_nModeFlags & SCALE_MODE)
+    {
+        dc.SetColor(QColor(128, 128, 0));
+        Vec3 boxsz = Vec3(headScl[SCALE_MODE], headScl[SCALE_MODE], headScl[SCALE_MODE]);
+        dc.DrawSolidBox(-boxsz, boxsz);
+        if (m_bNeedX)
+        {
+            if (m_highlightMode == 3)
+            {
+                dc.SetColor(colX);
+            }
+            else
+            {
+                dc.SetColor(colXArrow);
+            }
+            dc.DrawSolidBox(x + boxsz + Vec3(headOfs[SCALE_MODE], 0, 0), x - boxsz + Vec3(headOfs[SCALE_MODE], 0, 0));
+        }
+        if (m_bNeedY)
+        {
+            if (m_highlightMode == 3)
+            {
+                dc.SetColor(colY);
+            }
+            else
+            {
+                dc.SetColor(colYArrow);
+            }
+            dc.DrawSolidBox(y + boxsz + Vec3(0, headOfs[SCALE_MODE], 0), y - boxsz + Vec3(0, headOfs[SCALE_MODE], 0));
+        }
+        if (m_bNeedZ)
+        {
+            if (m_highlightMode == 3)
+            {
+                dc.SetColor(colZ);
+            }
+            else
+            {
+                dc.SetColor(colZArrow);
+            }
+            dc.DrawSolidBox(z + boxsz + Vec3(0, 0, headOfs[SCALE_MODE]), z - boxsz + Vec3(0, 0, headOfs[SCALE_MODE]));
+        }
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Draw Rotate Circle
+    //////////////////////////////////////////////////////////////////////////
+    if (m_nModeFlags & ROTATE_CIRCLE_MODE)
+    {
+        if (m_bHighlightRotationCircle)
+        {
+            dc.SetLineWidth(5);
+            dc.SetColor(colSelected);
+        }
+        else
+        {
+            dc.SetLineWidth(0);
+            dc.SetColor(axisColor);
+        }
+        dc.DrawCircle(Vec3(0, 0, 0), kRotateCircleRadiusScale * m_fScreenScale, 0);
+    }
+
+    dc.SetLineWidth(0);
+
+    // If only in move mode.
+    if (m_nModeFlags == MOVE_MODE)
+    {
+        //////////////////////////////////////////////////////////////////////////
+        // Draw axis planes.
+        //////////////////////////////////////////////////////////////////////////
+        Vec3 colXY[2];
+        Vec3 colXZ[2];
+        Vec3 colYZ[2];
+
+        if (setup.enabled)
+        {
+            colX = Vec3(1, 0, 0);
+            colY = Vec3(0, 1, 0);
+            colZ = Vec3(0, 0, 1);
+        }
+        else
+        {
+            colX = colY = colZ = disabledColor;
+        }
+        colXY[0] = colX;
+        colXY[1] = colY;
+        colXZ[0] = colX;
+        colXZ[1] = colZ;
+        colYZ[0] = colY;
+        colYZ[1] = colZ;
+
+        linew[0] = linew[1] = linew[2] = 0;
+        if (axis)
+        {
+            if (axis == AXIS_XY)
+            {
+                colXY[0] = colSelected;
+                colXY[1] = colSelected;
+                linew[0] = lineWidth;
+            }
+            else if (axis == AXIS_XZ)
+            {
+                colXZ[0] = colSelected;
+                colXZ[1] = colSelected;
+                linew[1] = lineWidth;
+            }
+            else if (axis == AXIS_YZ)
+            {
+                colYZ[0] = colSelected;
+                colYZ[1] = colSelected;
+                linew[2] = lineWidth;
+            }
+        }
+
+        if (!(dc.flags & DISPLAY_2D))
+        {
+            if (axis == AXIS_TERRAIN)
+            {
+                dc.SetColor(colSelected, 0.4f);
+            }
+            else
+            {
+                dc.SetColor(QColor(128, 32, 32), 0.4f);
+            }
+            Vec3 org = worldTM.GetTranslation();
+            dc.DrawBall(Vec3(0.0f),  m_size * kSelectionBallScale);
+        }
+
+        dc.SetColor(QColor(255, 255, 0), 0.5f);
+
+        float sz = m_size * kPlaneScale;
+        Vec3 p1(sz, sz, 0);
+        Vec3 p2(sz, 0, sz);
+        Vec3 p3(0, sz, sz);
+
+        float colAlpha = 1.0f;
+        x *= kPlaneScale;
+        y *= kPlaneScale;
+        z *= kPlaneScale;
+
+        // XY
+        if (m_bNeedX && m_bNeedY)
+        {
+            dc.SetLineWidth(linew[0]);
+            dc.SetColor(colXY[0], colAlpha);
+            dc.DrawLine(p1, p1 - x);
+            dc.SetColor(colXY[1], colAlpha);
+            dc.DrawLine(p1, p1 - y);
+        }
+
+        // XZ
+        if (m_bNeedX && m_bNeedZ)
+        {
+            dc.SetLineWidth(linew[1]);
+            dc.SetColor(colXZ[0], colAlpha);
+            dc.DrawLine(p2, p2 - x);
+            dc.SetColor(colXZ[1], colAlpha);
+            dc.DrawLine(p2, p2 - z);
+        }
+
+        // YZ
+        if (m_bNeedY && m_bNeedZ)
+        {
+            dc.SetLineWidth(linew[2]);
+            dc.SetColor(colYZ[0], colAlpha);
+            dc.DrawLine(p3, p3 - y);
+            dc.SetColor(colYZ[1], colAlpha);
+            dc.DrawLine(p3, p3 - z);
+        }
+
+        dc.SetLineWidth(0);
+
+        colAlpha = 0.25f;
+
+        if (axis == AXIS_XY && m_bNeedX && m_bNeedY)
+        {
+            dc.CullOff();
+            dc.SetColor(colSelected, colAlpha);
+            dc.DrawQuad(p1, p1 - x, p1 - x - y, p1 - y);
+            dc.CullOn();
+        }
+        else if (axis == AXIS_XZ && m_bNeedX && m_bNeedZ)
+        {
+            dc.CullOff();
+            dc.SetColor(colSelected, colAlpha);
+            dc.DrawQuad(p2, p2 - x, p2 - x - z, p2 - z);
+            dc.CullOn();
+        }
+        else if (axis == AXIS_YZ && m_bNeedY && m_bNeedZ)
+        {
+            dc.CullOff();
+            dc.SetColor(colSelected, colAlpha);
+            dc.DrawQuad(p3, p3 - y, p3 - y - z, p3 - z);
+            dc.CullOn();
+        }
+    }
+
+    dc.PopMatrix();
+    if (!(dc.flags & DISPLAY_2D))
+    {
+        dc.DepthTestOn();
+    }
+
+    dc.SetState(prevRState);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CAxisHelper::HitTestForRotationCircle(const Matrix34& worldTM, IDisplayViewport* view, const QPoint& pos, float fHitWidth, Vec3* pOutHitPos, Vec3* pOutHitNormal)
+{
+    Ray ray;
+    view->ViewToWorldRay(pos, ray.origin, ray.direction);
+
+    const float fCircleRadius = kRotateCircleRadiusScale * m_fScreenScale;
+
+    std::vector<Vec3> vList;
+    float step = 30.0f / 180 * gf_PI;
+    for (float angle = 0; angle < 360.0f / 180 * gf_PI + step; angle += step)
+    {
+        Vec3 p(0, fCircleRadius * sin(angle), fCircleRadius * cos(angle));
+        vList.push_back(worldTM.TransformPoint(p));
+    }
+
+    Vec3 vDir0 = (vList[0] - vList[1]).GetNormalized();
+    Vec3 vDir1 = (vList[2] - vList[1]).GetNormalized();
+    Vec3 vNormal = vDir1.Cross(vDir0).GetNormalized();
+
+    if (pOutHitNormal)
+    {
+        *pOutHitNormal = vNormal;
+    }
+
+    Vec3 vShortestHitPos;
+    float shortestDist = 3e11f;
+
+    for (int i = 0, iCount(vList.size()); i < iCount; ++i)
+    {
+        const Vec3& v0 = vList[i];
+        const Vec3& v1 = vList[(i + 1) % iCount];
+        Vec3 vRight = (v1 - v0).Cross(vNormal).GetNormalized() * m_fScreenScale * fHitWidth;
+
+        Vec3 p_v0 = v0 + vRight;
+        Vec3 p_v1 = v1 + vRight;
+        Vec3 p_v2 = v1 - vRight;
+        Vec3 p_v3 = v0 - vRight;
+
+        Vec3 hitPos;
+        if (Intersect::Ray_Triangle(ray, p_v0, p_v1, p_v2, hitPos) || Intersect::Ray_Triangle(ray, p_v0, p_v2, p_v3, hitPos) ||
+            Intersect::Ray_Triangle(ray, p_v0, p_v2, p_v1, hitPos) || Intersect::Ray_Triangle(ray, p_v0, p_v3, p_v2, hitPos))
+        {
+            Vec3 hitPosToEdge;
+            if (PointToLineDistance(v0, v1, hitPos, hitPosToEdge))
+            {
+                if (!pOutHitPos)
+                {
+                    return true;
+                }
+                float hitDistance = hitPosToEdge.GetDistance(hitPos);
+                if (hitDistance < shortestDist)
+                {
+                    vShortestHitPos = hitPosToEdge;
+                    shortestDist = hitDistance;
+                }
+            }
+        }
+    }
+
+    if (shortestDist < 3e10f)
+    {
+        if (pOutHitPos)
+        {
+            *pOutHitPos = vShortestHitPos;
+        }
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CAxisHelper::HitTest(const Matrix34& worldTM, const SGizmoParameters& setup, HitContext& hc)
+{
+    if (hc.distanceTolerance != 0)
+    {
+        return 0;
+    }
+
+    Prepare(worldTM, setup, hc.view);
+
+    m_bHighlightRotationCircle = false;
+    hc.manipulatorMode = 0;
+
+    if (m_nModeFlags == ROTATE_CIRCLE_MODE)
+    {
+        if (HitTestForRotationCircle(m_matrix, hc.view, hc.point2d, 0.05f))
+        {
+            m_bHighlightRotationCircle = true;
+            hc.manipulatorMode = 4;
+            return true;
+        }
+        return false;
+    }
+
+    Vec3 x(m_size, 0, 0);
+    Vec3 y(0, m_size, 0);
+    Vec3 z(0, 0, m_size);
+
+    Vec3 pos = m_matrix.GetTranslation();
+
+    Vec3 intPoint;
+    hc.view->ViewToWorldRay(hc.point2d, hc.raySrc, hc.rayDir);
+    Ray ray(hc.raySrc, hc.rayDir);
+    Sphere sphere(pos, m_size + 0.1f * m_fScreenScale);
+    if (!Intersect::Ray_SphereFirst(ray, sphere, intPoint))
+    {
+        m_highlightAxis = 0;
+        return false;
+    }
+
+    x = m_matrix.TransformVector(x);
+    y = m_matrix.TransformVector(y);
+    z = m_matrix.TransformVector(z);
+
+    float sz = m_size * kPlaneScale;
+    Vec3 p1(sz, sz, 0);
+    Vec3 p2(sz, 0, sz);
+    Vec3 p3(0, sz, sz);
+
+    p1 = m_matrix.TransformPoint(p1);
+    p2 = m_matrix.TransformPoint(p2);
+    p3 = m_matrix.TransformPoint(p3);
+
+    Vec3 planeX = x * kPlaneScale;
+    Vec3 planeY = y * kPlaneScale;
+    Vec3 planeZ = z * kPlaneScale;
+
+    int axis = 0;
+
+    Sphere testSphere(pos, m_size * kSelectionBallScale);
+    if (!hc.b2DViewport && m_nModeFlags == MOVE_MODE && Intersect::Ray_SphereFirst(ray, testSphere, intPoint))
+    {
+        axis = AXIS_TERRAIN;
+    }
+    else
+    {
+        // Start the closestAxis value at the maximum selection radius based on the user's settings
+        float closestAxis = aznumeric_cast<float>(GetIEditor()->GetObjectManager()->GetAxisHelperHitRadius());
+
+        float distanceToAxis = hc.view->GetDistanceToLine(pos, pos + x, hc.point2d);
+        if(distanceToAxis < closestAxis)
+        {
+            axis = AXIS_X;
+            closestAxis = distanceToAxis;
+        }
+        distanceToAxis = hc.view->GetDistanceToLine(pos, pos + y, hc.point2d);
+        if(distanceToAxis < closestAxis)
+        {
+            axis = AXIS_Y;
+            closestAxis = distanceToAxis;
+        }
+        distanceToAxis = hc.view->GetDistanceToLine(pos, pos + z, hc.point2d);
+        if(distanceToAxis < closestAxis)
+        {
+            axis = AXIS_Z;
+            closestAxis = distanceToAxis;
+        }
+        if (m_nModeFlags == MOVE_MODE)
+        {
+            // If only in move mode.
+            distanceToAxis = hc.view->GetDistanceToLine(p1, p1 - planeX, hc.point2d);
+            if(distanceToAxis < closestAxis)
+            {
+                axis = AXIS_XY;
+                closestAxis = distanceToAxis;
+            }
+            distanceToAxis = hc.view->GetDistanceToLine(p1, p1 - planeY, hc.point2d);
+            if(distanceToAxis < closestAxis)
+            {
+                axis = AXIS_XY;
+                closestAxis = distanceToAxis;
+            }
+            distanceToAxis = hc.view->GetDistanceToLine(p2, p2 - planeX, hc.point2d);
+            if(distanceToAxis < closestAxis)
+            {
+                axis = AXIS_XZ;
+                closestAxis = distanceToAxis;
+            }
+            distanceToAxis = hc.view->GetDistanceToLine(p2, p2 - planeZ, hc.point2d);
+            if(distanceToAxis < closestAxis)
+            {
+                axis = AXIS_XZ;
+                closestAxis = distanceToAxis;
+            }
+            distanceToAxis = hc.view->GetDistanceToLine(p3, p3 - planeY, hc.point2d);
+            if(distanceToAxis < closestAxis)
+            {
+                axis = AXIS_YZ;
+                closestAxis = distanceToAxis;
+            }
+            distanceToAxis = hc.view->GetDistanceToLine(p3, p3 - planeZ, hc.point2d);
+            if(distanceToAxis < closestAxis)
+            {
+                axis = AXIS_YZ;
+                closestAxis = distanceToAxis;
+            }
+            if (axis != 0)
+            {
+                hc.manipulatorMode = 1;
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Calc sizes.
+    //////////////////////////////////////////////////////////////////////////
+    float headOfs[8];
+    float headScl[8];
+    headOfs[MOVE_MODE] = 0;
+    headScl[MOVE_MODE] = 0.07f * m_fScreenScale;
+    headOfs[ROTATE_MODE] = 0;
+    headScl[ROTATE_MODE] = 0.01f * m_fScreenScale;
+    headOfs[SCALE_MODE] = 0;
+    headScl[SCALE_MODE] = 0.01f * m_fScreenScale;
+    if (m_nModeFlags == (MOVE_MODE | ROTATE_MODE | SCALE_MODE))
+    {
+        headOfs[ROTATE_MODE] += 0.05f * m_fScreenScale;
+        headOfs[SCALE_MODE] += 0.1f * m_fScreenScale;
+    }
+    //////////////////////////////////////////////////////////////////////////
+    if (axis == 0 && (m_nModeFlags & ROTATE_MODE))
+    {
+        Vec3 x2(m_size, 0, 0);
+        Vec3 y2(0, m_size, 0);
+        Vec3 z2(0, 0, m_size);
+        int hitr = 10;
+        if (m_bNeedX)
+        {
+            if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(x2 + Vec3(headOfs[ROTATE_MODE], 0, 0))) < hitr)
+            {
+                axis = AXIS_X;
+                hc.manipulatorMode = 2;
+            }
+        }
+        if (m_bNeedY)
+        {
+            if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(y2 + Vec3(0, headOfs[ROTATE_MODE], 0))) < hitr)
+            {
+                axis = AXIS_Y;
+                hc.manipulatorMode = 2;
+            }
+        }
+        if (m_bNeedZ)
+        {
+            if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(z2 + Vec3(0, 0, headOfs[ROTATE_MODE]))) < hitr)
+            {
+                axis = AXIS_Z;
+                hc.manipulatorMode = 2;
+            }
+        }
+    }
+    if (m_nModeFlags & SCALE_MODE)
+    {
+        Vec3 x2(m_size, 0, 0);
+        Vec3 y2(0, m_size, 0);
+        Vec3 z2(0, 0, m_size);
+        int hitr = 14;
+        if (GetDistance2D(hc.view, hc.point2d, m_matrix.GetTranslation()) < hitr + 2)
+        {
+            axis = AXIS_XYZ;
+            hc.manipulatorMode = 3;
+        }
+        if (axis == 0)
+        {
+            if (m_bNeedX)
+            {
+                if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(x2 + Vec3(headOfs[SCALE_MODE], 0, 0))) < hitr)
+                {
+                    axis = AXIS_X;
+                    hc.manipulatorMode = 3;
+                }
+            }
+            if (m_bNeedY)
+            {
+                if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(y2 + Vec3(0, headOfs[SCALE_MODE], 0))) < hitr)
+                {
+                    axis = AXIS_Y;
+                    hc.manipulatorMode = 3;
+                }
+            }
+            if (m_bNeedZ)
+            {
+                if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(z2 + Vec3(0, 0, headOfs[SCALE_MODE]))) < hitr)
+                {
+                    axis = AXIS_Z;
+                    hc.manipulatorMode = 3;
+                }
+            }
+        }
+    }
+
+    if (axis != 0)
+    {
+        if (hc.manipulatorMode == 0)
+        {
+            if (m_nModeFlags & MOVE_MODE)
+            {
+                hc.manipulatorMode = 1;
+            }
+            else if (m_nModeFlags & ROTATE_MODE)
+            {
+                hc.manipulatorMode = 2;
+            }
+            else if (m_nModeFlags & SCALE_MODE)
+            {
+                hc.manipulatorMode = 3;
+            }
+        }
+        hc.axis = axis;
+        hc.dist = 0;
+        m_highlightMode = hc.manipulatorMode;
+    }
+
+    m_highlightAxis = axis;
+
+    return axis != 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CAxisHelper::GetDistance2D(IDisplayViewport* view, const QPoint& p, const Vec3& wp)
+{
+    QPoint vp = view->WorldToView(wp);
+    float dx = static_cast<float>(p.x() - vp.x());
+    float dy = static_cast<float>(p.y() - vp.y());
+    return sqrtf(dx * dx + dy * dy);
+}
+
diff --git a/Code/Editor/RenderViewport.cpp b/Code/Editor/RenderViewport.cpp
new file mode 100644
index 0000000000..8d6bcf021b
--- /dev/null
+++ b/Code/Editor/RenderViewport.cpp
@@ -0,0 +1,4135 @@
+/*
+ * 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 : implementation filefov
+
+
+#include "EditorDefs.h"
+
+#include "RenderViewport.h"
+
+// Qt
+#include <QPainter>
+#include <QScopedValueRollback>
+#include <QCheckBox>
+#include <QMessageBox>
+#include <QTimer>
+
+// AzCore
+#include <AzCore/Console/Console.h>
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Math/Frustum.h>
+#include <AzCore/Math/VectorConversions.h>
+#include <AzCore/std/sort.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+
+// AzFramework
+#include <AzFramework/Components/CameraBus.h>
+#include <AzFramework/Viewport/DisplayContextRequestBus.h>
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
+#if defined(AZ_PLATFORM_WINDOWS)
+#   include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
+#endif // defined(AZ_PLATFORM_WINDOWS)
+#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>                   // for AzFramework::InputDeviceMouse
+
+// AzQtComponents
+#include <AzQtComponents/Utilities/QtWindowUtilities.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
+#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
+#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
+#include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+
+
+// CryCommon
+#include <CryCommon/HMDBus.h>
+
+// AzFramework
+#include <AzFramework/Render/IntersectorInterface.h>
+
+// Editor
+#include "Util/fastlib.h"
+#include "CryEditDoc.h"
+#include "GameEngine.h"
+#include "ViewManager.h"
+#include "Objects/DisplayContext.h"
+#include "DisplaySettings.h"
+#include "Include/IObjectManager.h"
+#include "Include/IDisplayViewport.h"
+#include "Objects/ObjectManager.h"
+#include "ProcessInfo.h"
+#include "IPostEffectGroup.h"
+#include "EditorPreferencesPageGeneral.h"
+
+#include "ViewPane.h"
+#include "CustomResolutionDlg.h"
+#include "AnimationContext.h"
+#include "Objects/SelectionGroup.h"
+#include "Core/QtEditorApplication.h"
+
+// ComponentEntityEditorPlugin
+#include <Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h>
+
+// LmbrCentral
+#include <LmbrCentral/Rendering/EditorCameraCorrectionBus.h>
+
+#include <QtGui/private/qhighdpiscaling_p.h>
+
+#include <IEntityRenderState.h>
+#include <IPhysics.h>
+#include <IStatObj.h>
+
+AZ_CVAR(
+    bool, ed_visibility_use, true, nullptr, AZ::ConsoleFunctorFlags::Null,
+    "Enable/disable using the new IVisibilitySystem for Entity visibility determination");
+
+CRenderViewport* CRenderViewport::m_pPrimaryViewport = nullptr;
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+void StopFixedCursorMode();
+void StartFixedCursorMode(QObject *viewport);
+#endif
+
+#define MAX_ORBIT_DISTANCE (2000.0f)
+#define RENDER_MESH_TEST_DISTANCE (0.2f)
+#define CURSOR_FONT_HEIGHT  8.0f
+#define FORWARD_DIRECTION Vec3(0, 1, 0)
+
+static const char TextCantCreateCameraNoLevel[] = "Cannot create camera when no level is loaded.";
+
+class EditorEntityNotifications
+    : public AzToolsFramework::EditorEntityContextNotificationBus::Handler
+    , public AzToolsFramework::EditorContextMenuBus::Handler
+{
+public:
+    EditorEntityNotifications(CRenderViewport& renderViewport)
+        : m_renderViewport(renderViewport)
+    {
+        AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
+        AzToolsFramework::EditorContextMenuBus::Handler::BusConnect();
+    }
+
+    ~EditorEntityNotifications() override
+    {
+        AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
+        AzToolsFramework::EditorContextMenuBus::Handler::BusDisconnect();
+    }
+
+    // AzToolsFramework::EditorEntityContextNotificationBus
+    void OnStartPlayInEditor() override
+    {
+        m_renderViewport.OnStartPlayInEditor();
+    }
+    void OnStopPlayInEditor() override
+    {
+        m_renderViewport.OnStopPlayInEditor();
+    }
+
+    // AzToolsFramework::EditorContextMenu::Bus
+    void PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags) override
+    {
+        m_renderViewport.PopulateEditorGlobalContextMenu(menu, point, flags);
+    }
+private:
+    CRenderViewport& m_renderViewport;
+};
+
+struct CRenderViewport::SScopedCurrentContext
+{
+    const CRenderViewport* m_viewport;
+    CRenderViewport::SPreviousContext m_previousContext;
+
+    explicit SScopedCurrentContext(const CRenderViewport* viewport)
+        : m_viewport(viewport)
+    {
+        m_previousContext = viewport->SetCurrentContext();
+
+        // During normal updates of RenderViewport the value of m_cameraSetForWidgetRenderingCount is expected to be 0.
+        // This is to guarantee no loss in performance by tracking unnecessary calls to SetCurrentContext/RestorePreviousContext.
+        // If some code makes additional calls to Pre/PostWidgetRendering then the assert will be triggered because
+        // m_cameraSetForWidgetRenderingCount will be greater than 0.
+        // There is a legitimate case where the counter can be greater than 0. This is when QtViewport is processing mouse callbacks.
+        // QtViewport::MouseCallback() is surrounded by Pre/PostWidgetRendering and the m_processingMouseCallbacksCounter
+        // tracks this specific case. If an update of a RenderViewport happens while processing the mouse callback,
+        // for example when showing a QMessageBox, then both counters must match.
+        AZ_Assert(viewport->m_cameraSetForWidgetRenderingCount == viewport->m_processingMouseCallbacksCounter,
+            "SScopedCurrentContext constructor was called while viewport widget context is active "
+            "- this is unnecessary");
+    }
+
+    ~SScopedCurrentContext()
+    {
+        m_viewport->RestorePreviousContext(m_previousContext);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// CRenderViewport
+//////////////////////////////////////////////////////////////////////////
+
+CRenderViewport::CRenderViewport(const QString& name, QWidget* parent)
+    : QtViewport(parent)
+    , m_Camera(GetIEditor()->GetSystem()->GetViewCamera())
+    , m_camFOV(gSettings.viewports.fDefaultFov)
+    , m_defaultViewName(name)
+{
+    // need this to be set in order to allow for language switching on Windows
+    setAttribute(Qt::WA_InputMethodEnabled);
+    LockCameraMovement(true);
+
+    CRenderViewport::SetViewTM(m_Camera.GetMatrix());
+    m_defaultViewTM.SetIdentity();
+
+    if (GetIEditor()->GetViewManager()->GetSelectedViewport() == nullptr)
+    {
+        GetIEditor()->GetViewManager()->SelectViewport(this);
+    }
+
+    GetIEditor()->RegisterNotifyListener(this);
+
+    m_displayContext.pIconManager = GetIEditor()->GetIconManager();
+    GetIEditor()->GetUndoManager()->AddListener(this);
+
+    m_PhysicalLocation.SetIdentity();
+
+    // The renderer requires something, so don't allow us to shrink to absolutely nothing
+    // This won't in fact stop the viewport from being shrunk, when it's the centralWidget for
+    // the MainWindow, but it will stop the viewport from getting resize events
+    // once it's smaller than that, which from the renderer's perspective works out
+    // to be the same thing.
+    setMinimumSize(50, 50);
+
+    OnCreate();
+
+    setFocusPolicy(Qt::StrongFocus);
+
+    Camera::EditorCameraRequestBus::Handler::BusConnect();
+    m_editorEntityNotifications = AZStd::make_unique<EditorEntityNotifications>(*this);
+
+    m_manipulatorManager = GetIEditor()->GetViewManager()->GetManipulatorManager();
+    if (!m_pPrimaryViewport)
+    {
+        m_pPrimaryViewport = this;
+    }
+
+    m_hwnd = renderOverlayHWND();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CRenderViewport::~CRenderViewport()
+{
+    AzFramework::WindowNotificationBus::Event(m_hwnd, &AzFramework::WindowNotificationBus::Handler::OnWindowClosed);
+
+    if (m_pPrimaryViewport == this)
+    {
+        m_pPrimaryViewport = nullptr;
+    }
+
+    AzFramework::WindowRequestBus::Handler::BusDisconnect();
+    DisconnectViewportInteractionRequestBus();
+    m_editorEntityNotifications.reset();
+    Camera::EditorCameraRequestBus::Handler::BusDisconnect();
+    OnDestroy();
+    GetIEditor()->GetUndoManager()->RemoveListener(this);
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CRenderViewport message handlers
+//////////////////////////////////////////////////////////////////////////
+int CRenderViewport::OnCreate()
+{
+    CreateRenderContext();
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::resizeEvent(QResizeEvent* event)
+{
+    PushDisableRendering();
+    QtViewport::resizeEvent(event);
+    PopDisableRendering();
+
+    const QRect rcWindow = rect().translated(mapToGlobal(QPoint()));
+
+    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_MOVE, rcWindow.left(), rcWindow.top());
+
+    m_rcClient = rect();
+    m_rcClient.setBottomRight(WidgetToViewport(m_rcClient.bottomRight()));
+
+    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, width(), height());
+
+    // We queue the window resize event because the render overlay may be hidden.
+    // If the render overlay is not visible, the native window that is backing it will
+    // also be hidden, and it will not resize until it becomes visible.
+    m_windowResizedEvent = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::paintEvent([[maybe_unused]] QPaintEvent* event)
+{
+    // Do not call CViewport::OnPaint() for painting messages
+    // FIXME: paintEvent() isn't the best place for such logic. Should listen to proper eNotify events and to the stuff there instead. (Repeats for other view port classes too).
+    CGameEngine* ge = GetIEditor()->GetGameEngine();
+    if ((ge && ge->IsLevelLoaded()) || (GetType() != ET_ViewportCamera))
+    {
+        setRenderOverlayVisible(true);
+        m_isOnPaint = true;
+        Update();
+        m_isOnPaint = false;
+    }
+    else
+    {
+        setRenderOverlayVisible(false);
+        QPainter painter(this); // device context for painting
+
+        // draw gradient background
+        const QRect rc = rect();
+        QLinearGradient gradient(rc.topLeft(), rc.bottomLeft());
+        gradient.setColorAt(0, QColor(80, 80, 80));
+        gradient.setColorAt(1, QColor(200, 200, 200));
+        painter.fillRect(rc, gradient);
+
+        // if we have some level loaded/loading/new
+        // we draw a text
+        if (!GetIEditor()->GetLevelFolder().isEmpty())
+        {
+            const int kFontSize = 200;
+            const char* kFontName = "Arial";
+            const QColor kTextColor(255, 255, 255);
+            const QColor kTextShadowColor(0, 0, 0);
+            const QFont font(kFontName, kFontSize / 10.0);
+            painter.setFont(font);
+
+            QString friendlyName = QFileInfo(GetIEditor()->GetLevelName()).fileName();
+            const QString strMsg = tr("Preparing level %1...").arg(friendlyName);
+
+            // draw text shadow
+            painter.setPen(kTextShadowColor);
+            painter.drawText(rc, Qt::AlignCenter, strMsg);
+            painter.setPen(kTextColor);
+            // offset rect for normal text
+            painter.drawText(rc.translated(-1, -1), Qt::AlignCenter, strMsg);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::mousePressEvent(QMouseEvent* event)
+{
+    // There's a bug caused by having a mix of MFC and Qt where if the render viewport
+    // had focus and then an MFC widget gets focus, Qt internally still thinks
+    // that the widget that had focus before (the render viewport) has it now.
+    // Because of this, Qt won't set the window that the viewport is in as the
+    // focused widget, and the render viewport won't get keyboard input.
+    // Forcing the window to activate should allow the window to take focus
+    // and then the call to setFocus() will give it focus.
+    // All so that the ::keyPressEvent() gets called.
+    ActivateWindowAndSetFocus();
+
+    GetIEditor()->GetViewManager()->SelectViewport(this);
+
+    QtViewport::mousePressEvent(event);
+}
+
+AzToolsFramework::ViewportInteraction::MousePick CRenderViewport::BuildMousePickInternal(const QPoint& point) const
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+
+    MousePick mousePick;
+    Vec3 from, dir;
+    ViewToWorldRay(point, from, dir);
+    mousePick.m_rayOrigin = LYVec3ToAZVec3(from);
+    mousePick.m_rayDirection = LYVec3ToAZVec3(dir);
+    mousePick.m_screenCoordinates = AzFramework::ScreenPoint(point.x(), point.y());
+    return mousePick;
+}
+
+AzToolsFramework::ViewportInteraction::MousePick CRenderViewport::BuildMousePick(const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+
+    PreWidgetRendering();
+    const MousePick mousePick = BuildMousePickInternal(point);
+    PostWidgetRendering();
+    return mousePick;
+}
+
+AzToolsFramework::ViewportInteraction::MouseInteraction CRenderViewport::BuildMouseInteractionInternal(
+    const AzToolsFramework::ViewportInteraction::MouseButtons buttons,
+    const AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
+    const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+
+    MouseInteraction mouse;
+    mouse.m_interactionId.m_cameraId = m_viewEntityId;
+    mouse.m_interactionId.m_viewportId = GetViewportId();
+    mouse.m_mouseButtons = buttons;
+    mouse.m_mousePick = mousePick;
+    mouse.m_keyboardModifiers = modifiers;
+    return mouse;
+}
+
+AzToolsFramework::ViewportInteraction::MouseInteraction CRenderViewport::BuildMouseInteraction(
+    const Qt::MouseButtons buttons, const Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+
+    return BuildMouseInteractionInternal(
+        BuildMouseButtons(buttons),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(WidgetToViewport(point)));
+}
+
+namespace RenderViewportUtil
+{
+    static bool JustAltHeld(const Qt::KeyboardModifiers modifiers)
+    {
+        return (modifiers & Qt::ShiftModifier) == 0
+            && (modifiers & Qt::ControlModifier) == 0
+            && (modifiers & Qt::AltModifier) != 0;
+    }
+
+    static bool NoModifiersHeld(const Qt::KeyboardModifiers modifiers)
+    {
+        return (modifiers & Qt::ShiftModifier) == 0
+            && (modifiers & Qt::ControlModifier) == 0
+            && (modifiers & Qt::AltModifier) == 0;
+    }
+
+    static bool AllowDolly(const Qt::KeyboardModifiers modifiers)
+    {
+        return JustAltHeld(modifiers);
+    }
+
+    static bool AllowOrbit(const Qt::KeyboardModifiers modifiers)
+    {
+        return JustAltHeld(modifiers);
+    }
+
+    static bool AllowPan(const Qt::KeyboardModifiers modifiers)
+    {
+        // begin pan with alt (inverted movement) or no modifiers
+        return JustAltHeld(modifiers) || NoModifiersHeld(modifiers);
+    }
+
+    static bool InvertPan(const Qt::KeyboardModifiers modifiers)
+    {
+        return JustAltHeld(modifiers);
+    }
+} // namespace RenderViewportUtil
+
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    if (!m_renderer)
+    {
+        return;
+    }
+
+    // Force the visible object cache to be updated - this is to ensure that
+    // selection will work properly even if helpers are not being displayed,
+    // in which case the cache is not updated every frame.
+    if (m_displayContext.settings && !m_displayContext.settings->IsDisplayHelpers())
+    {
+        GetIEditor()->GetObjectManager()->ForceUpdateVisibleObjectCache(m_displayContext);
+    }
+
+    const auto scaledPoint = WidgetToViewport(point);
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        MouseButtonsFromButton(MouseButton::Left),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    bool manipulatorInteraction = false;
+    EditorInteractionSystemViewportSelectionRequestBus::EventResult(
+        manipulatorInteraction, AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseManipulatorInteraction,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
+
+    if (!manipulatorInteraction)
+    {
+        if (RenderViewportUtil::AllowOrbit(modifiers))
+        {
+            m_bInOrbitMode = true;
+            m_orbitTarget =
+                GetViewTM().GetTranslation() + GetViewTM().TransformVector(FORWARD_DIRECTION) * m_orbitDistance;
+
+            // mouse buttons are treated as keys as well
+            if (m_pressedKeyState == KeyPressedState::AllUp)
+            {
+                m_pressedKeyState = KeyPressedState::PressedThisFrame;
+            }
+
+            m_mousePos = scaledPoint;
+            m_prevMousePos = scaledPoint;
+
+            HideCursor();
+            CaptureMouse();
+
+            // no further handling of left mouse button down
+            return;
+        }
+
+        EditorInteractionSystemViewportSelectionRequestBus::Event(
+            AzToolsFramework::GetEntityContextId(),
+            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
+            MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    // Convert point to position on terrain.
+    if (!m_renderer)
+    {
+        return;
+    }
+
+    // Update viewports after done with actions.
+    GetIEditor()->UpdateViews(eUpdateObjects);
+
+    const auto scaledPoint = WidgetToViewport(point);
+
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        MouseButtonsFromButton(MouseButton::Left),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    if (m_bInOrbitMode)
+    {
+        m_bInOrbitMode = false;
+
+        ReleaseMouse();
+        ShowCursor();
+    }
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    const auto scaledPoint = WidgetToViewport(point);
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        MouseButtonsFromButton(MouseButton::Left),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::DoubleClick));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    SetFocus();
+
+    const auto scaledPoint = WidgetToViewport(point);
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        MouseButtonsFromButton(MouseButton::Right),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
+
+    if (RenderViewportUtil::AllowDolly(modifiers))
+    {
+        m_bInZoomMode = true;
+    }
+    else
+    {
+        m_bInRotateMode = true;
+    }
+
+    // mouse buttons are treated as keys as well
+    if (m_pressedKeyState == KeyPressedState::AllUp)
+    {
+        m_pressedKeyState = KeyPressedState::PressedThisFrame;
+    }
+
+    m_mousePos = scaledPoint;
+    m_prevMousePos = m_mousePos;
+
+    HideCursor();
+
+    // we can't capture the mouse here, or it will stop the popup menu
+    // when the mouse is released.
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    const auto scaledPoint = WidgetToViewport(point);
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        MouseButtonsFromButton(MouseButton::Right),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
+
+    m_bInRotateMode = false;
+    m_bInZoomMode = false;
+
+    ReleaseMouse();
+
+    if (!m_bInMoveMode)
+    {
+        ShowCursor();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    const auto scaledPoint = WidgetToViewport(point);
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        MouseButtonsFromButton(MouseButton::Middle),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    if (RenderViewportUtil::AllowPan(modifiers))
+    {
+        m_bInMoveMode = true;
+
+        // mouse buttons are treated as keys as well
+        if (m_pressedKeyState == KeyPressedState::AllUp)
+        {
+            m_pressedKeyState = KeyPressedState::PressedThisFrame;
+        }
+
+        m_mousePos = scaledPoint;
+        m_prevMousePos = scaledPoint;
+
+        HideCursor();
+        CaptureMouse();
+    }
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    const auto scaledPoint = WidgetToViewport(point);
+    UpdateCurrentMousePos(scaledPoint);
+
+    const auto tryRestoreMouse = [this]
+    {
+        // if we are currently looking (rotateMode) or dollying (zoomMode)
+        // do not show the cursor on mouse up as rmb is still held
+        if (!m_bInZoomMode && !m_bInRotateMode)
+        {
+            ReleaseMouse();
+            ShowCursor();
+        }
+    };
+
+    if (m_bInMoveMode)
+    {
+        m_bInMoveMode = false;
+        tryRestoreMouse();
+    }
+
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        MouseButtonsFromButton(MouseButton::Middle),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
+}
+
+void CRenderViewport::OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    const auto scaledPoint = WidgetToViewport(point);
+
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        BuildMouseButtons(buttons),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
+        AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, MouseEvent::Move));
+}
+
+void CRenderViewport::InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons)
+{
+    // this is required, otherwise the user will see the context menu
+    OnMouseMove(Qt::NoModifier, buttons, QCursor::pos() + QPoint(deltaX, deltaY));
+    // we simply move the prev mouse position, so the change will be picked up
+    // by the next ProcessMouse call
+    m_prevMousePos -= QPoint(deltaX, deltaY);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::ProcessMouse()
+{
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    const auto point = WidgetToViewport(mapFromGlobal(QCursor::pos()));
+
+    if (point == m_prevMousePos)
+    {
+        return;
+    }
+
+    // specifically for the right mouse button click, which triggers rotate or zoom,
+    // we can't capture the mouse until the user has moved the mouse, otherwise the
+    // right click context menu won't popup
+    if (!m_mouseCaptured && (m_bInZoomMode || m_bInRotateMode))
+    {
+        if ((point - m_mousePos).manhattanLength() > QApplication::startDragDistance())
+        {
+            CaptureMouse();
+        }
+    }
+
+    float speedScale = GetCameraMoveSpeed();
+
+    if (CheckVirtualKey(Qt::Key_Control))
+    {
+        speedScale *= gSettings.cameraFastMoveSpeed;
+    }
+
+    if (m_PlayerControl)
+    {
+        if (m_bInRotateMode)
+        {
+            f32 MousedeltaX = (m_mousePos.x() - point.x());
+            f32 MousedeltaY = (m_mousePos.y() - point.y());
+            m_relCameraRotZ += MousedeltaX;
+
+            if (GetCameraInvertYRotation())
+            {
+                MousedeltaY = -MousedeltaY;
+            }
+            m_relCameraRotZ += MousedeltaX;
+            m_relCameraRotX += MousedeltaY;
+
+            ResetCursor();
+        }
+    }
+    else if ((m_bInRotateMode && m_bInMoveMode) || m_bInZoomMode)
+    {
+        // Zoom.
+        Matrix34 m = GetViewTM();
+
+        Vec3 ydir = m.GetColumn1().GetNormalized();
+        Vec3 pos = m.GetTranslation();
+
+        const float posDelta = 0.2f * (m_prevMousePos.y() - point.y()) * speedScale;
+        pos = pos - ydir * posDelta;
+        m_orbitDistance = m_orbitDistance + posDelta;
+        m_orbitDistance = fabs(m_orbitDistance);
+
+        m.SetTranslation(pos);
+        SetViewTM(m);
+
+        ResetCursor();
+    }
+    else if (m_bInRotateMode)
+    {
+        Ang3 angles(-point.y() + m_prevMousePos.y(), 0, -point.x() + m_prevMousePos.x());
+        angles = angles * 0.002f * GetCameraRotateSpeed();
+        if (GetCameraInvertYRotation())
+        {
+            angles.x = -angles.x;
+        }
+        Matrix34 camtm = GetViewTM();
+        Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(camtm));
+        ypr.x += angles.z;
+        ypr.y += angles.x;
+
+        ypr.y = CLAMP(ypr.y, -1.5f, 1.5f);        // to keep rotation in reasonable range
+        // In the recording mode of a custom camera, the z rotation is allowed.
+        if (GetCameraObject() == nullptr || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
+        {
+            ypr.z = 0;      // to have camera always upward
+        }
+
+        camtm = Matrix34(CCamera::CreateOrientationYPR(ypr), camtm.GetTranslation());
+        SetViewTM(camtm);
+
+        ResetCursor();
+    }
+    else if (m_bInMoveMode)
+    {
+        // Slide.
+        Matrix34 m = GetViewTM();
+        Vec3 xdir = m.GetColumn0().GetNormalized();
+        Vec3 zdir = m.GetColumn2().GetNormalized();
+
+        const auto modifiers = QGuiApplication::queryKeyboardModifiers();
+        if (RenderViewportUtil::InvertPan(modifiers))
+        {
+            xdir = -xdir;
+            zdir = -zdir;
+        }
+
+        Vec3 pos = m.GetTranslation();
+        pos += 0.1f * xdir * (point.x() - m_prevMousePos.x()) * speedScale + 0.1f * zdir * (m_prevMousePos.y() - point.y()) * speedScale;
+        m.SetTranslation(pos);
+        SetViewTM(m, true);
+
+        ResetCursor();
+    }
+    else if (m_bInOrbitMode)
+    {
+        Ang3 angles(-point.y() + m_prevMousePos.y(), 0, -point.x() + m_prevMousePos.x());
+        angles = angles * 0.002f * GetCameraRotateSpeed();
+
+        if (GetCameraInvertPan())
+        {
+            angles.z = -angles.z;
+        }
+
+        Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(GetViewTM()));
+        ypr.x += angles.z;
+        ypr.y = CLAMP(ypr.y, -1.5f, 1.5f);        // to keep rotation in reasonable range
+        ypr.y += angles.x;
+
+        Matrix33 rotateTM =  CCamera::CreateOrientationYPR(ypr);
+
+        Vec3 src = GetViewTM().GetTranslation();
+        Vec3 trg = m_orbitTarget;
+        float fCameraRadius = (trg - src).GetLength();
+
+        // Calc new source.
+        src = trg - rotateTM * Vec3(0, 1, 0) * fCameraRadius;
+        Matrix34 camTM = rotateTM;
+        camTM.SetTranslation(src);
+
+        SetViewTM(camTM);
+
+        ResetCursor();
+    }
+}
+
+void CRenderViewport::ResetCursor()
+{
+#ifdef AZ_PLATFORM_WINDOWS
+    if (!gSettings.stylusMode)
+    {
+        const QPoint point = mapToGlobal(ViewportToWidget(m_prevMousePos));
+        AzQtComponents::SetCursorPos(point);
+    }
+#endif
+
+    // Recalculate the prev mouse pos even if we just reset to it to avoid compounding floating point math issues with DPI scaling
+    m_prevMousePos = WidgetToViewport(mapFromGlobal(QCursor::pos()));
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool  CRenderViewport::event(QEvent* event)
+{
+    switch (event->type())
+    {
+    case QEvent::WindowActivate:
+        GetIEditor()->GetViewManager()->SelectViewport(this);
+        // also kill the keys; if we alt-tab back to the viewport, or come back from the debugger, it's done (and there's no guarantee we'll get the keyrelease event anyways)
+        m_keyDown.clear();
+        break;
+
+    case QEvent::Shortcut:
+        // a shortcut should immediately clear us, otherwise the release event never gets sent
+        m_keyDown.clear();
+        break;
+
+    case QEvent::ShortcutOverride:
+    {
+        // since we respond to the following things, let Qt know so that shortcuts don't override us
+        bool respondsToEvent = false;
+
+        auto keyEvent = static_cast<QKeyEvent*>(event);
+        bool manipulatorInteracting = false;
+        AzToolsFramework::ManipulatorManagerRequestBus::EventResult(
+            manipulatorInteracting,
+            AzToolsFramework::g_mainManipulatorManagerId,
+            &AzToolsFramework::ManipulatorManagerRequestBus::Events::Interacting);
+
+        // If a manipulator is active, stop all shortcuts from working, except for the escape key, which cancels in some cases
+        if ((keyEvent->key() != Qt::Key_Escape) &&  manipulatorInteracting)
+        {
+            respondsToEvent = true;
+        }
+        else
+        {
+            // In game mode we never want to be overridden by shortcuts
+            if (GetIEditor()->IsInGameMode() && GetType() == ET_ViewportCamera)
+            {
+                respondsToEvent = true;
+            }
+            else
+            {
+                if (!(keyEvent->modifiers() & Qt::ControlModifier))
+                {
+                    switch (keyEvent->key())
+                    {
+                    case Qt::Key_Up:
+                    case Qt::Key_W:
+                    case Qt::Key_Down:
+                    case Qt::Key_S:
+                    case Qt::Key_Left:
+                    case Qt::Key_A:
+                    case Qt::Key_Right:
+                    case Qt::Key_D:
+                        respondsToEvent = true;
+                        break;
+
+                    default:
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (respondsToEvent)
+        {
+            event->accept();
+            return true;
+        }
+
+        // because we're doing keyboard grabs, we need to detect
+        // when a shortcut matched so that we can track the buttons involved
+        // in the shortcut, since the key released event won't be generated in that case
+        ProcessKeyRelease(keyEvent);
+    }
+    break;
+    default:
+        // do nothing
+        break;
+    }
+
+    return QtViewport::event(event);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::ResetContent()
+{
+    QtViewport::ResetContent();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::UpdateContent(int flags)
+{
+    QtViewport::UpdateContent(flags);
+    if (flags & eUpdateObjects)
+    {
+        m_bUpdateViewport = true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::Update()
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    if (Editor::EditorQtApplication::instance()->isMovingOrResizing())
+    {
+        return;
+    }
+
+    if (!m_renderer || m_rcClient.isEmpty() || GetIEditor()->IsInMatEditMode())
+    {
+        return;
+    }
+
+    if (!isVisible())
+    {
+        return;
+    }
+
+    // Only send the resize event if the render overlay is visible. This is to make sure
+    // the native window has resized.
+    if (m_windowResizedEvent && isRenderOverlayVisible())
+    {
+        AzFramework::WindowNotificationBus::Event(renderOverlayHWND(), &AzFramework::WindowNotificationBus::Handler::OnWindowResized, m_rcClient.width(), m_rcClient.height());
+        m_windowResizedEvent = false;
+    }
+
+    // Don't wait for changes to update the focused viewport.
+    if (CheckRespondToInput())
+    {
+        m_bUpdateViewport = true;
+    }
+
+    // While Renderer doesn't support fast rendering of the scene to more then 1 viewport
+    // render only focused viewport if more then 1 are opened and always update is off.
+    if (!m_isOnPaint && m_viewManager->GetNumberOfGameViewports() > 1 && GetType() == ET_ViewportCamera)
+    {
+        if (m_pPrimaryViewport != this)
+        {
+            if (CheckRespondToInput()) // If this is the focused window, set primary viewport.
+            {
+                m_pPrimaryViewport = this;
+            }
+            else if (!m_bUpdateViewport) // Skip this viewport.
+            {
+                return;
+            }
+        }
+    }
+
+    if (CheckRespondToInput())
+    {
+        ProcessMouse();
+        ProcessKeys();
+    }
+
+    const bool isGameMode = GetIEditor()->IsInGameMode();
+    const bool isSimulationMode = GetIEditor()->GetGameEngine()->GetSimulationMode();
+
+    // Allow debug visualization in both 'game' (Ctrl-G) and 'simulation' (Ctrl-P) modes
+    if (isGameMode || isSimulationMode)
+    {
+        if (!IsRenderingDisabled())
+        {
+            // Disable rendering to avoid recursion into Update()
+            PushDisableRendering();
+
+            // draw debug visualizations
+            {
+                const AzFramework::DisplayContextRequestGuard displayContextGuard(m_displayContext);
+
+                const AZ::u32 prevState = m_displayContext.GetState();
+                m_displayContext.SetState(
+                    e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
+
+                AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
+                AzFramework::DebugDisplayRequestBus::Bind(
+                    debugDisplayBus, AzFramework::g_defaultSceneEntityDebugDisplayId);
+                AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
+
+                AzFramework::DebugDisplayRequests* debugDisplay =
+                    AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
+
+                AzFramework::EntityDebugDisplayEventBus::Broadcast(
+                    &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport,
+                    AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
+
+                m_displayContext.SetState(prevState);
+            }
+
+            QtViewport::Update();
+            PopDisableRendering();
+        }
+
+        // Game mode rendering is handled by CryAction
+        if (isGameMode)
+        {
+            return;
+        }
+    }
+
+    // Prevents rendering recursion due to recursive Paint messages.
+    if (IsRenderingDisabled())
+    {
+        return;
+    }
+
+    PushDisableRendering();
+
+    m_viewTM = m_Camera.GetMatrix(); // synchronize.
+
+    // Render
+    if (!m_bRenderContextCreated)
+    {
+        if (!CreateRenderContext())
+        {
+            return;
+        }
+    }
+
+    if (ed_visibility_use)
+    {
+        auto start = std::chrono::steady_clock::now();
+
+        m_entityVisibilityQuery.UpdateVisibility(GetCameraState());
+    }
+
+    {
+        SScopedCurrentContext context(this);
+
+        m_renderer->SetClearColor(Vec3(0.4f, 0.4f, 0.4f));
+
+        InitDisplayContext();
+
+        OnRender();
+
+        ProcessRenderLisneters(m_displayContext);
+
+        m_displayContext.Flush2D();
+
+        m_renderer->SwitchToNativeResolutionBackbuffer();
+
+        // 3D engine stats
+
+        CCamera CurCamera = gEnv->pSystem->GetViewCamera();
+        gEnv->pSystem->SetViewCamera(m_Camera);
+
+        // Post Render Callback
+        {
+            PostRenderers::iterator itr = m_postRenderers.begin();
+            PostRenderers::iterator end = m_postRenderers.end();
+            for (; itr != end; ++itr)
+            {
+                (*itr)->OnPostRender();
+            }
+        }
+
+        gEnv->pSystem->SetViewCamera(CurCamera);
+    }
+
+    QtViewport::Update();
+
+    PopDisableRendering();
+    m_bUpdateViewport = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::SetViewEntity(const AZ::EntityId& viewEntityId, bool lockCameraMovement)
+{
+    // if they've picked the same camera, then that means they want to toggle
+    if (viewEntityId.IsValid() && viewEntityId != m_viewEntityId)
+    {
+        LockCameraMovement(lockCameraMovement);
+        m_viewEntityId = viewEntityId;
+        AZStd::string entityName;
+        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, viewEntityId);
+        SetName(QString("Camera entity: %1").arg(entityName.c_str()));
+    }
+    else
+    {
+        SetDefaultCamera();
+    }
+
+    PostCameraSet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::ResetToViewSourceType(const ViewSourceType& viewSourceType)
+{
+    LockCameraMovement(true);
+    m_pCameraFOVVariable = nullptr;
+    m_viewEntityId.SetInvalid();
+    m_cameraObjectId = GUID_NULL;
+    m_viewSourceType = viewSourceType;
+    SetViewTM(GetViewTM());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::PostCameraSet()
+{
+    if (m_viewPane)
+    {
+        m_viewPane->OnFOVChanged(GetFOV());
+    }
+
+    GetIEditor()->Notify(eNotify_CameraChanged);
+    QScopedValueRollback<bool> rb(m_ignoreSetViewFromEntityPerspective, true);
+    Camera::EditorCameraNotificationBus::Broadcast(
+        &Camera::EditorCameraNotificationBus::Events::OnViewportViewEntityChanged, m_viewEntityId);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBaseObject* CRenderViewport::GetCameraObject() const
+{
+    CBaseObject* pCameraObject = nullptr;
+
+    if (m_viewSourceType == ViewSourceType::SequenceCamera)
+    {
+        m_cameraObjectId = GetViewManager()->GetCameraObjectId();
+    }
+    if (m_cameraObjectId != GUID_NULL)
+    {
+        // Find camera object from id.
+        pCameraObject = GetIEditor()->GetObjectManager()->FindObject(m_cameraObjectId);
+    }
+    else if (m_viewSourceType == ViewSourceType::CameraComponent || m_viewSourceType == ViewSourceType::AZ_Entity)
+    {
+        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(
+            pCameraObject, m_viewEntityId, &AzToolsFramework::ComponentEntityEditorRequests::GetSandboxObject);
+    }
+    return pCameraObject;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnBeginGameMode:
+    {
+        if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
+        {
+            m_preGameModeViewTM = GetViewTM();
+            // 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)
+                {
+                    m_previousContext = SetCurrentContext(deviceInfo->renderWidth, deviceInfo->renderHeight);
+                    if (m_renderer->GetIStereoRenderer())
+                    {
+                        m_renderer->GetIStereoRenderer()->OnResolutionChanged();
+                    }
+                    SetActiveWindow();
+                    SetFocus();
+                    SetSelected(true);
+                }
+            }
+            else
+            {
+                m_previousContext = SetCurrentContext();
+            }
+            SetCurrentCursor(STD_CURSOR_GAME);
+        }
+    }
+    break;
+
+    case eNotify_OnEndGameMode:
+        if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
+        {
+            SetCurrentCursor(STD_CURSOR_DEFAULT);
+            if (m_renderer->GetCurrentContextHWND() != renderOverlayHWND())
+            {
+                // if this warning triggers it means that someone else (ie, some other part of the code)
+                // called SetCurrentContext(...) on the renderer, probably did some rendering, but then either
+                // failed to set the context back when done, or set it back to the wrong one.
+                CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "RenderViewport render context was not correctly restored by someone else.");
+            }
+            RestorePreviousContext(m_previousContext);
+            m_bInRotateMode = false;
+            m_bInMoveMode = false;
+            m_bInOrbitMode = false;
+            m_bInZoomMode = false;
+
+            RestoreViewportAfterGameMode();
+        }
+        break;
+
+    case eNotify_OnCloseScene:
+        SetDefaultCamera();
+        break;
+
+    case eNotify_OnBeginNewScene:
+        PushDisableRendering();
+        break;
+
+    case eNotify_OnEndNewScene:
+        PopDisableRendering();
+
+        {
+            // Default this to the size of default terrain in case there is no listener on the buss
+            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromMinMaxValues(0, 0, 32, 1024, 1024, 32);
+            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
+            float sx = terrainAabb.GetXExtent();
+            float sy = terrainAabb.GetYExtent();
+
+            Matrix34 viewTM;
+            viewTM.SetIdentity();
+            // Initial camera will be at middle of the map at the height of 2
+            // meters above the terrain (default terrain height is 32)
+            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
+            SetViewTM(viewTM);
+        }
+        break;
+
+    case eNotify_OnBeginTerrainCreate:
+        PushDisableRendering();
+        break;
+
+    case eNotify_OnEndTerrainCreate:
+        PopDisableRendering();
+
+        {
+            // Default this to the size of default terrain in case there is no listener on the buss
+            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromMinMaxValues(0, 0, 32, 1024, 1024, 32);
+            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
+            float sx = terrainAabb.GetXExtent();
+            float sy = terrainAabb.GetYExtent();
+
+            Matrix34 viewTM;
+            viewTM.SetIdentity();
+            // Initial camera will be at middle of the map at the height of 2
+            // meters above the terrain (default terrain height is 32)
+            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
+            SetViewTM(viewTM);
+        }
+        break;
+
+    case eNotify_OnBeginLayerExport:
+    case eNotify_OnBeginSceneSave:
+        PushDisableRendering();
+        break;
+    case eNotify_OnEndLayerExport:
+    case eNotify_OnEndSceneSave:
+        PopDisableRendering();
+        break;
+
+    case eNotify_OnBeginLoad: // disables viewport input when starting to load an existing level
+    case eNotify_OnBeginCreate: // disables viewport input when starting to create a new level
+        m_freezeViewportInput = true;
+        break;
+
+    case eNotify_OnEndLoad: // enables viewport input when finished loading an existing level
+    case eNotify_OnEndCreate: // enables viewport input when finished creating a new level
+        m_freezeViewportInput = false;
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+namespace {
+    inline Vec3 NegY(const Vec3& v, float y)
+    {
+        return Vec3(v.x, y - v.y, v.z);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnRender()
+{
+    if (m_rcClient.isEmpty() || m_renderer->GetRenderType() == eRT_Null) // Null is crashing in CryEngine on macOS
+    {
+        // Even in null rendering, update the view camera.
+        // This is necessary so that automated editor tests using the null renderer to test systems like dynamic vegetation
+        // are still able to manipulate the current logical camera position, even if nothing is rendered.
+        GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
+        return;
+    }
+
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    float fNearZ = GetIEditor()->GetConsoleVar("cl_DefaultNearPlane");
+    float fFarZ = m_Camera.GetFarPlane();
+
+    CBaseObject* cameraObject = GetCameraObject();
+    if (cameraObject)
+    {
+        AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
+        if (m_viewEntityId.IsValid())
+        {
+            Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
+            Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
+            LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
+                lookThroughEntityCorrection, m_viewEntityId,
+                &LmbrCentral::EditorCameraCorrectionRequests::GetTransformCorrection);
+        }
+
+        m_viewTM = cameraObject->GetWorldTM() * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection);
+        m_viewTM.OrthonormalizeFast();
+
+        m_Camera.SetMatrix(m_viewTM);
+
+        int w = m_rcClient.width();
+        int h = m_rcClient.height();
+
+        m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
+    }
+    else if (m_viewEntityId.IsValid())
+    {
+        Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
+        Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
+        int w = m_rcClient.width();
+        int h = m_rcClient.height();
+
+        m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
+    }
+    else
+    {
+        // Normal camera.
+        m_cameraObjectId = GUID_NULL;
+        int w = m_rcClient.width();
+        int h = m_rcClient.height();
+
+        float fov = gSettings.viewports.fDefaultFov;
+
+        // match viewport fov to default / selected title menu fov
+        if (GetFOV() != fov)
+        {
+            if (m_viewPane)
+            {
+                m_viewPane->OnFOVChanged(fov);
+                SetFOV(fov);
+            }
+        }
+
+        // Just for editor: Aspect ratio fix when changing the viewport
+        if (!GetIEditor()->IsInGameMode())
+        {
+            float viewportAspectRatio = float( w ) / h;
+            float targetAspectRatio = GetAspectRatio();
+            if (targetAspectRatio > viewportAspectRatio)
+            {
+                // Correct for vertical FOV change.
+                float maxTargetHeight = float( w ) / targetAspectRatio;
+                fov = 2 * atanf((h * tan(fov / 2)) / maxTargetHeight);
+            }
+        }
+
+        m_Camera.SetFrustum(w, h, fov, fNearZ);
+    }
+
+    GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
+
+    CGameEngine* ge = GetIEditor()->GetGameEngine();
+
+    bool levelIsDisplayable = (ge && ge->IsLevelLoaded() && GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady());
+
+    //Handle scene render tasks such as gizmos and handles but only when not in VR
+    if (!m_renderer->IsStereoEnabled())
+    {
+        DisplayContext& displayContext = m_displayContext;
+
+        PreWidgetRendering();
+
+        RenderAll();
+
+        // Draw 2D helpers.
+        TransformationMatrices backupSceneMatrices;
+        m_renderer->Set2DMode(m_rcClient.right(), m_rcClient.bottom(), backupSceneMatrices);
+        displayContext.SetState(e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
+
+        // Display cursor string.
+        RenderCursorString();
+
+        if (gSettings.viewports.bShowSafeFrame)
+        {
+            UpdateSafeFrame();
+            RenderSafeFrame();
+        }
+
+        const AzFramework::DisplayContextRequestGuard displayContextGuard(displayContext);
+
+        AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
+        AzFramework::DebugDisplayRequestBus::Bind(
+            debugDisplayBus, AzFramework::g_defaultSceneEntityDebugDisplayId);
+        AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
+
+        AzFramework::DebugDisplayRequests* debugDisplay =
+            AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
+
+        AzFramework::ViewportDebugDisplayEventBus::Event(
+            AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport2d,
+            AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
+
+        m_renderer->Unset2DMode(backupSceneMatrices);
+
+        PostWidgetRendering();
+    }
+
+    if (levelIsDisplayable)
+    {
+        m_renderer->SetViewport(0, 0, m_renderer->GetWidth(), m_renderer->GetHeight(), m_nCurViewportID);
+    }
+    else
+    {
+        ColorF viewportBackgroundColor(pow(71.0f / 255.0f, 2.2f), pow(71.0f / 255.0f, 2.2f), pow(71.0f / 255.0f, 2.2f));
+        m_renderer->ClearTargetsLater(FRT_CLEAR_COLOR, viewportBackgroundColor);
+        DrawBackground();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderSelectionRectangle()
+{
+    if (m_selectedRect.isEmpty())
+    {
+        return;
+    }
+
+    Vec3 topLeft(m_selectedRect.left(), m_selectedRect.top(), 1);
+    Vec3 bottomRight(m_selectedRect.right() +1, m_selectedRect.bottom() + 1, 1);
+
+    m_displayContext.DepthTestOff();
+    m_displayContext.SetColor(1, 1, 1, 0.4f);
+    m_displayContext.DrawWireBox(topLeft, bottomRight);
+    m_displayContext.DepthTestOn();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::InitDisplayContext()
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    // Draw all objects.
+    DisplayContext& displayContext = m_displayContext;
+    displayContext.settings = GetIEditor()->GetDisplaySettings();
+    displayContext.view = this;
+    displayContext.renderer = m_renderer;
+    displayContext.box.min = Vec3(-100000.0f, -100000.0f, -100000.0f);
+    displayContext.box.max = Vec3(100000.0f, 100000.0f, 100000.0f);
+    displayContext.camera = &m_Camera;
+    displayContext.flags = 0;
+
+    if (!displayContext.settings->IsDisplayLabels() || !displayContext.settings->IsDisplayHelpers())
+    {
+        displayContext.flags |= DISPLAY_HIDENAMES;
+    }
+
+    if (displayContext.settings->IsDisplayLinks() && displayContext.settings->IsDisplayHelpers())
+    {
+        displayContext.flags |= DISPLAY_LINKS;
+    }
+
+    if (m_bDegradateQuality)
+    {
+        displayContext.flags |= DISPLAY_DEGRADATED;
+    }
+
+    if (displayContext.settings->GetRenderFlags() & RENDER_FLAG_BBOX)
+    {
+        displayContext.flags |= DISPLAY_BBOX;
+    }
+
+    if (displayContext.settings->IsDisplayTracks() && displayContext.settings->IsDisplayHelpers())
+    {
+        displayContext.flags |= DISPLAY_TRACKS;
+        displayContext.flags |= DISPLAY_TRACKTICKS;
+    }
+
+    if (GetIEditor()->GetReferenceCoordSys() == COORDS_WORLD)
+    {
+        displayContext.flags |= DISPLAY_WORLDSPACEAXIS;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::PopulateEditorGlobalContextMenu(QMenu* /*menu*/, const AZ::Vector2& /*point*/, int /*flags*/)
+{
+    m_bInMoveMode = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderAll()
+{
+    // Draw all objects.
+    DisplayContext& displayContext = m_displayContext;
+
+    m_renderer->ResetToDefault();
+
+    displayContext.SetState(e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
+    GetIEditor()->GetObjectManager()->Display(displayContext);
+
+    RenderSelectedRegion();
+
+    RenderSnapMarker();
+
+    if (gSettings.viewports.bShowGridGuide
+        && GetIEditor()->GetDisplaySettings()->IsDisplayHelpers())
+    {
+        RenderSnappingGrid();
+    }
+
+    if (displayContext.settings->GetDebugFlags() & DBG_MEMINFO)
+    {
+        ProcessMemInfo mi;
+        CProcessInfo::QueryMemInfo(mi);
+        int MB = 1024 * 1024;
+        QString str = QStringLiteral("WorkingSet=%1Mb, PageFile=%2Mb, PageFaults=%3").arg(mi.WorkingSet / MB).arg(mi.PagefileUsage / MB).arg(mi.PageFaultCount);
+        m_renderer->TextToScreenColor(1, 1, 1, 0, 0, 1, str.toUtf8().data());
+    }
+
+    {
+        const AzFramework::DisplayContextRequestGuard displayContextGuard(displayContext);
+
+        AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
+        AzFramework::DebugDisplayRequestBus::Bind(
+            debugDisplayBus, AzFramework::g_defaultSceneEntityDebugDisplayId);
+        AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
+
+        AzFramework::DebugDisplayRequests* debugDisplay =
+            AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
+
+        // allow the override of in-editor visualization
+        AzFramework::ViewportDebugDisplayEventBus::Event(
+            AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport,
+            AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
+
+        m_entityVisibilityQuery.DisplayVisibility(*debugDisplay);
+
+        if (m_manipulatorManager != nullptr)
+        {
+            using namespace AzToolsFramework::ViewportInteraction;
+
+            debugDisplay->DepthTestOff();
+            m_manipulatorManager->DrawManipulators(
+                *debugDisplay, GetCameraState(),
+                BuildMouseInteractionInternal(
+                    MouseButtons(TranslateMouseButtons(QGuiApplication::mouseButtons())),
+                    BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers()),
+                    BuildMousePickInternal(WidgetToViewport(mapFromGlobal(QCursor::pos())))));
+            debugDisplay->DepthTestOn();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::DrawAxis()
+{
+    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
+        "DrawAxis was called but viewport widget rendering was not set. PreWidgetRendering must be called before.");
+
+    DisplayContext& dc = m_displayContext;
+
+    // show axis only if draw helpers is activated
+    if (!dc.settings->IsDisplayHelpers())
+    {
+        return;
+    }
+
+    Vec3 colX(1, 0, 0), colY(0, 1, 0), colZ(0, 0, 1), colW(1, 1, 1);
+    Vec3 pos(50, 50, 0.1f); // Bottom-left corner
+
+    float wx, wy, wz;
+    m_renderer->UnProjectFromScreen(pos.x, pos.y, pos.z, &wx, &wy, &wz);
+    Vec3 posInWorld(wx, wy, wz);
+    float screenScale = GetScreenScaleFactor(posInWorld);
+    float length = 0.03f * screenScale;
+    float arrowSize = 0.02f * screenScale;
+    float textSize = 1.1f;
+
+    Vec3 x(length, 0, 0);
+    Vec3 y(0, length, 0);
+    Vec3 z(0, 0, length);
+
+    int prevRState = dc.GetState();
+    dc.DepthWriteOff();
+    dc.DepthTestOff();
+    dc.CullOff();
+    dc.SetLineWidth(1);
+
+    dc.SetColor(colX);
+    dc.DrawLine(posInWorld, posInWorld + x);
+    dc.DrawArrow(posInWorld + x * 0.9f, posInWorld + x, arrowSize);
+    dc.SetColor(colY);
+    dc.DrawLine(posInWorld, posInWorld + y);
+    dc.DrawArrow(posInWorld + y * 0.9f, posInWorld + y, arrowSize);
+    dc.SetColor(colZ);
+    dc.DrawLine(posInWorld, posInWorld + z);
+    dc.DrawArrow(posInWorld + z * 0.9f, posInWorld + z, arrowSize);
+
+    dc.SetColor(colW);
+    dc.DrawTextLabel(posInWorld + x, textSize, "x");
+    dc.DrawTextLabel(posInWorld + y, textSize, "y");
+    dc.DrawTextLabel(posInWorld + z, textSize, "z");
+
+    dc.DepthWriteOn();
+    dc.DepthTestOn();
+    dc.CullOn();
+    dc.SetState(prevRState);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::DrawBackground()
+{
+    DisplayContext& dc = m_displayContext;
+
+    if (!dc.settings->IsDisplayHelpers())            // show gradient bg only if draw helpers are activated
+    {
+        return;
+    }
+
+    int heightVP = m_renderer->GetHeight() - 1;
+    int widthVP = m_renderer->GetWidth() - 1;
+    Vec3 pos(0, 0, 0);
+
+    Vec3 x(widthVP, 0, 0);
+    Vec3 y(0, heightVP, 0);
+
+    float height = m_rcClient.height();
+
+    Vec3 src =  NegY(pos, height);
+    Vec3 trgx = NegY(pos + x, height);
+    Vec3 trgy = NegY(pos + y, height);
+
+    QColor topColor = palette().color(QPalette::Window);
+    QColor bottomColor = palette().color(QPalette::Disabled, QPalette::WindowText);
+
+    ColorB firstC(topColor.red(), topColor.green(), topColor.blue(), 255.0f);
+    ColorB secondC(bottomColor.red(), bottomColor.green(), bottomColor.blue(), 255.0f);
+
+    TransformationMatrices backupSceneMatrices;
+
+    m_renderer->Set2DMode(m_rcClient.right(), m_rcClient.bottom(), backupSceneMatrices);
+    m_displayContext.SetState(e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
+    dc.DrawQuadGradient(src, trgx, pos + x, pos, secondC, firstC);
+    m_renderer->Unset2DMode(backupSceneMatrices);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderCursorString()
+{
+    if (m_cursorStr.isEmpty())
+    {
+        return;
+    }
+
+    const auto point = WidgetToViewport(mapFromGlobal(QCursor::pos()));
+
+    // Display hit object name.
+    float col[4] = { 1, 1, 1, 1 };
+    m_renderer->Draw2dLabel(point.x() + 12, point.y() + 4, 1.2f, col, false, "%s", m_cursorStr.toUtf8().data());
+
+    if (!m_cursorSupplementaryStr.isEmpty())
+    {
+        float col2[4] = { 1, 1, 0, 1 };
+        m_renderer->Draw2dLabel(point.x() + 12, point.y() + 4 + CURSOR_FONT_HEIGHT * 1.2f, 1.2f, col2, false, "%s", m_cursorSupplementaryStr.toUtf8().data());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::UpdateSafeFrame()
+{
+    m_safeFrame = m_rcClient;
+
+    if (m_safeFrame.height() == 0)
+    {
+        return;
+    }
+
+    const bool allowSafeFrameBiggerThanViewport = false;
+
+    float safeFrameAspectRatio = float( m_safeFrame.width()) / m_safeFrame.height();
+    float targetAspectRatio = GetAspectRatio();
+    bool viewportIsWiderThanSafeFrame = (targetAspectRatio <= safeFrameAspectRatio);
+    if (viewportIsWiderThanSafeFrame || allowSafeFrameBiggerThanViewport)
+    {
+        float maxSafeFrameWidth = m_safeFrame.height() * targetAspectRatio;
+        float widthDifference = m_safeFrame.width() - maxSafeFrameWidth;
+
+        m_safeFrame.setLeft(m_safeFrame.left() + widthDifference * 0.5);
+        m_safeFrame.setRight(m_safeFrame.right() - widthDifference * 0.5);
+    }
+    else
+    {
+        float maxSafeFrameHeight = m_safeFrame.width() / targetAspectRatio;
+        float heightDifference = m_safeFrame.height() - maxSafeFrameHeight;
+
+        m_safeFrame.setTop(m_safeFrame.top() + heightDifference * 0.5);
+        m_safeFrame.setBottom(m_safeFrame.bottom() - heightDifference * 0.5);
+    }
+
+    m_safeFrame.adjust(0, 0, -1, -1); // <-- aesthetic improvement.
+
+    const float SAFE_ACTION_SCALE_FACTOR = 0.05f;
+    m_safeAction = m_safeFrame;
+    m_safeAction.adjust(m_safeFrame.width() * SAFE_ACTION_SCALE_FACTOR, m_safeFrame.height() * SAFE_ACTION_SCALE_FACTOR,
+        -m_safeFrame.width() * SAFE_ACTION_SCALE_FACTOR, -m_safeFrame.height() * SAFE_ACTION_SCALE_FACTOR);
+
+    const float SAFE_TITLE_SCALE_FACTOR = 0.1f;
+    m_safeTitle = m_safeFrame;
+    m_safeTitle.adjust(m_safeFrame.width() * SAFE_TITLE_SCALE_FACTOR, m_safeFrame.height() * SAFE_TITLE_SCALE_FACTOR,
+        -m_safeFrame.width() * SAFE_TITLE_SCALE_FACTOR, -m_safeFrame.height() * SAFE_TITLE_SCALE_FACTOR);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderSafeFrame()
+{
+    RenderSafeFrame(m_safeFrame, 0.75f, 0.75f, 0, 0.8f);
+    RenderSafeFrame(m_safeAction, 0, 0.85f, 0.80f, 0.8f);
+    RenderSafeFrame(m_safeTitle, 0.80f, 0.60f, 0, 0.8f);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderSafeFrame(const QRect& frame, float r, float g, float b, float a)
+{
+    m_displayContext.SetColor(r, g, b, a);
+
+    const int LINE_WIDTH = 2;
+    for (int i = 0; i < LINE_WIDTH; i++)
+    {
+        Vec3 topLeft(frame.left() + i, frame.top() + i, 0);
+        Vec3 bottomRight(frame.right() - i, frame.bottom() - i, 0);
+        m_displayContext.DrawWireBox(topLeft, bottomRight);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CRenderViewport::GetAspectRatio() const
+{
+    return gSettings.viewports.fDefaultAspectRatio;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderSnapMarker()
+{
+    if (!gSettings.snap.markerDisplay)
+    {
+        return;
+    }
+
+    QPoint point = QCursor::pos();
+    ScreenToClient(point);
+    Vec3 p = MapViewToCP(point);
+
+    DisplayContext& dc = m_displayContext;
+
+    float fScreenScaleFactor = GetScreenScaleFactor(p);
+
+    Vec3 x(1, 0, 0);
+    Vec3 y(0, 1, 0);
+    Vec3 z(0, 0, 1);
+    x = x * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
+    y = y * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
+    z = z * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
+
+    dc.SetColor(gSettings.snap.markerColor);
+    dc.DrawLine(p - x, p + x);
+    dc.DrawLine(p - y, p + y);
+    dc.DrawLine(p - z, p + z);
+
+    point = WorldToView(p);
+
+    int s = 8;
+    dc.DrawLine2d(point + QPoint(-s, -s), point + QPoint(s, -s), 0);
+    dc.DrawLine2d(point + QPoint(-s, s), point + QPoint(s, s), 0);
+    dc.DrawLine2d(point + QPoint(-s, -s), point + QPoint(-s, s), 0);
+    dc.DrawLine2d(point + QPoint(s, -s), point + QPoint(s, s), 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void OnMenuDisplayWireframe()
+{
+    ICVar* piVar(gEnv->pConsole->GetCVar("r_wireframe"));
+    int nRenderMode = piVar->GetIVal();
+    if (nRenderMode != R_WIREFRAME_MODE)
+    {
+        piVar->Set(R_WIREFRAME_MODE);
+    }
+    else
+    {
+        piVar->Set(R_SOLID_MODE);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void OnMenuTargetAspectRatio(float aspect)
+{
+    gSettings.viewports.fDefaultAspectRatio = aspect;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnMenuResolutionCustom()
+{
+    CCustomResolutionDlg resDlg(width(), height(), parentWidget());
+    if (resDlg.exec() == QDialog::Accepted)
+    {
+        ResizeView(resDlg.GetWidth(), resDlg.GetHeight());
+
+        const QString text = QString::fromLatin1("%1 x %2").arg(resDlg.GetWidth()).arg(resDlg.GetHeight());
+
+        QStringList customResPresets;
+        CViewportTitleDlg::LoadCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
+        CViewportTitleDlg::UpdateCustomPresets(text, customResPresets);
+        CViewportTitleDlg::SaveCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnMenuCreateCameraEntityFromCurrentView()
+{
+    Camera::EditorCameraSystemRequestBus::Broadcast(&Camera::EditorCameraSystemRequests::CreateCameraEntityFromViewport);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnMenuSelectCurrentCamera()
+{
+    CBaseObject* pCameraObject = GetCameraObject();
+
+    if (pCameraObject && !pCameraObject->IsSelected())
+    {
+        GetIEditor()->BeginUndo();
+        IObjectManager* pObjectManager = GetIEditor()->GetObjectManager();
+        pObjectManager->ClearSelection();
+        pObjectManager->SelectObject(pCameraObject);
+        GetIEditor()->AcceptUndo("Select Current Camera");
+    }
+}
+
+static AzFramework::CameraState CameraStateFromCCamera(
+    const CCamera& camera, const float fov, const float width, const float height)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    AzFramework::CameraState state;
+    state.m_forward = LYVec3ToAZVec3(camera.GetViewdir());
+    state.m_up = LYVec3ToAZVec3(camera.GetUp());
+    state.m_side = state.m_forward.Cross(state.m_up);
+    state.m_position = LYVec3ToAZVec3(camera.GetPosition());
+    state.m_fovOrZoom = fov;
+    state.m_nearClip = camera.GetNearPlane();
+    state.m_farClip = camera.GetFarPlane();
+    state.m_orthographic = false;
+    state.m_viewportSize = AZ::Vector2(width, height);
+
+    return state;
+}
+
+AzFramework::CameraState CRenderViewport::GetCameraState()
+{
+    return CameraStateFromCCamera(GetCamera(), GetFOV(), m_rcClient.width(), m_rcClient.height());
+}
+
+bool CRenderViewport::GridSnappingEnabled()
+{
+    return false;
+}
+
+float CRenderViewport::GridSize()
+{
+    return 0.0f;
+}
+
+bool CRenderViewport::ShowGrid()
+{
+    return false;
+}
+
+bool CRenderViewport::AngleSnappingEnabled()
+{
+    return false;
+}
+
+float CRenderViewport::AngleStep()
+{
+    return 0.0f;
+}
+
+AZ::Vector3 CRenderViewport::PickTerrain(const AzFramework::ScreenPoint& point)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    return LYVec3ToAZVec3(ViewToWorld(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), nullptr, true));
+}
+
+AZ::EntityId CRenderViewport::PickEntity(const AzFramework::ScreenPoint& point)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    PreWidgetRendering();
+
+    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();
+        }
+    }
+
+    PostWidgetRendering();
+
+    return entityId;
+}
+
+float CRenderViewport::TerrainHeight(const AZ::Vector2& position)
+{
+    return GetIEditor()->GetTerrainElevation(position.GetX(), position.GetY());
+}
+
+void CRenderViewport::FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    if (ed_visibility_use)
+    {
+        visibleEntitiesOut.assign(m_entityVisibilityQuery.Begin(), m_entityVisibilityQuery.End());
+    }
+    else
+    {
+        if (m_displayContext.GetView() == nullptr)
+        {
+            return;
+        }
+
+        const AZStd::vector<AZ::EntityId>& entityIdCache =
+            m_displayContext.GetView()->GetVisibleObjectsCache()->GetEntityIdCache();
+
+        visibleEntitiesOut.assign(entityIdCache.begin(), entityIdCache.end());
+    }
+}
+
+AzFramework::ScreenPoint CRenderViewport::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    PreWidgetRendering();
+    const AzFramework::ScreenPoint screenPosition =
+        AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(WorldToView(AZVec3ToLYVec3(worldPosition)));
+    PostWidgetRendering();
+
+    return screenPosition;
+}
+
+bool CRenderViewport::IsViewportInputFrozen()
+{
+    return m_freezeViewportInput;
+}
+
+void CRenderViewport::FreezeViewportInput(bool freeze)
+{
+    m_freezeViewportInput = freeze;
+}
+
+QWidget* CRenderViewport::GetWidgetForViewportContextMenu()
+{
+    return this;
+}
+
+void CRenderViewport::BeginWidgetContext()
+{
+    PreWidgetRendering();
+}
+
+void CRenderViewport::EndWidgetContext()
+{
+    PostWidgetRendering();
+}
+
+bool CRenderViewport::ShowingWorldSpace()
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    return BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers()).Shift();
+}
+
+void CRenderViewport::SetWindowTitle(const AZStd::string& title)
+{
+    // Do not support the WindowRequestBus changing the editor window title
+    AZ_UNUSED(title);
+}
+
+AzFramework::WindowSize CRenderViewport::GetClientAreaSize() const
+{
+    return AzFramework::WindowSize(m_rcClient.width(), m_rcClient.height());
+}
+
+
+void CRenderViewport::ResizeClientArea(AzFramework::WindowSize clientAreaSize)
+{
+    QWidget* window = this->window();
+    window->resize(aznumeric_cast<int>(clientAreaSize.m_width), aznumeric_cast<int>(clientAreaSize.m_height));
+}
+
+bool CRenderViewport::GetFullScreenState() const
+{
+    // CRenderViewport does not currently support full screen.
+    return false;
+}
+
+void CRenderViewport::SetFullScreenState([[maybe_unused]]bool fullScreenState)
+{
+    // CRenderViewport does not currently support full screen.
+}
+
+bool CRenderViewport::CanToggleFullScreenState() const
+{
+    // CRenderViewport does not currently support full screen.
+    return false;
+}
+
+void CRenderViewport::ToggleFullScreenState()
+{
+    // CRenderViewport does not currently support full screen.
+}
+
+void CRenderViewport::ConnectViewportInteractionRequestBus()
+{
+    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusConnect(GetViewportId());
+    AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
+    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
+    m_viewportUi.ConnectViewportUiBus(GetViewportId());
+
+    AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusConnect();
+}
+
+void CRenderViewport::DisconnectViewportInteractionRequestBus()
+{
+    AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusDisconnect();
+
+    m_viewportUi.DisconnectViewportUiBus();
+    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusDisconnect();
+    AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect();
+    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusDisconnect();
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void ToggleBool(bool* variable, bool* disableVariableIfOn)
+{
+    *variable = !*variable;
+    if (*variable && disableVariableIfOn)
+    {
+        *disableVariableIfOn = false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void ToggleInt(int* variable)
+{
+    *variable = !*variable;
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void AddCheckbox(QMenu* menu, const QString& text, bool* variable, bool* disableVariableIfOn = nullptr)
+{
+    QAction* action = menu->addAction(text);
+    QObject::connect(action, &QAction::triggered, action, [variable, disableVariableIfOn] { ToggleBool(variable, disableVariableIfOn);
+        });
+    action->setCheckable(true);
+    action->setChecked(*variable);
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void AddCheckbox(QMenu* menu, const QString& text, int* variable)
+{
+    QAction* action = menu->addAction(text);
+    QObject::connect(action, &QAction::triggered, action, [variable] { ToggleInt(variable);
+        });
+    action->setCheckable(true);
+    action->setChecked(*variable);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnTitleMenu(QMenu* menu)
+{
+    const int nWireframe = gEnv->pConsole->GetCVar("r_wireframe")->GetIVal();
+    QAction* action = menu->addAction(tr("Wireframe"));
+    connect(action, &QAction::triggered, action, OnMenuDisplayWireframe);
+    action->setCheckable(true);
+    action->setChecked(nWireframe == R_WIREFRAME_MODE);
+
+    const bool bDisplayLabels = GetIEditor()->GetDisplaySettings()->IsDisplayLabels();
+    action = menu->addAction(tr("Labels"));
+    connect(action, &QAction::triggered, this, [bDisplayLabels] {GetIEditor()->GetDisplaySettings()->DisplayLabels(!bDisplayLabels);
+        });
+    action->setCheckable(true);
+    action->setChecked(bDisplayLabels);
+
+    AddCheckbox(menu, tr("Show Safe Frame"), &gSettings.viewports.bShowSafeFrame);
+    AddCheckbox(menu, tr("Show Construction Plane"), &gSettings.snap.constructPlaneDisplay);
+    AddCheckbox(menu, tr("Show Trigger Bounds"), &gSettings.viewports.bShowTriggerBounds);
+    AddCheckbox(menu, tr("Show Icons"), &gSettings.viewports.bShowIcons, &gSettings.viewports.bShowSizeBasedIcons);
+    AddCheckbox(menu, tr("Show Size-based Icons"), &gSettings.viewports.bShowSizeBasedIcons, &gSettings.viewports.bShowIcons);
+    AddCheckbox(menu, tr("Show Helpers of Frozen Objects"), &gSettings.viewports.nShowFrozenHelpers);
+
+    if (!m_predefinedAspectRatios.IsEmpty())
+    {
+        QMenu* aspectRatiosMenu = menu->addMenu(tr("Target Aspect Ratio"));
+
+        for (size_t i = 0; i < m_predefinedAspectRatios.GetCount(); ++i)
+        {
+            const QString& aspectRatioString = m_predefinedAspectRatios.GetName(i);
+            QAction* aspectRatioAction = aspectRatiosMenu->addAction(aspectRatioString);
+            connect(aspectRatioAction, &QAction::triggered, this, [i, this] { OnMenuTargetAspectRatio(m_predefinedAspectRatios.GetValue(i));
+                });
+            aspectRatioAction->setCheckable(true);
+            aspectRatioAction->setChecked(m_predefinedAspectRatios.IsCurrent(i));
+        }
+    }
+
+    // Set ourself as the active viewport so the following actions create a camera from this view
+    GetIEditor()->GetViewManager()->SelectViewport(this);
+
+    CGameEngine* gameEngine = GetIEditor()->GetGameEngine();
+
+    if (Camera::EditorCameraSystemRequestBus::HasHandlers())
+    {
+        action = menu->addAction(tr("Create camera entity from current view"));
+        connect(action, &QAction::triggered, this, &CRenderViewport::OnMenuCreateCameraEntityFromCurrentView);
+
+        if (!gameEngine || !gameEngine->IsLevelLoaded())
+        {
+            action->setEnabled(false);
+            action->setToolTip(tr(TextCantCreateCameraNoLevel));
+            menu->setToolTipsVisible(true);
+        }
+    }
+
+    if (!gameEngine || !gameEngine->IsLevelLoaded())
+    {
+        action->setEnabled(false);
+        action->setToolTip(tr(TextCantCreateCameraNoLevel));
+        menu->setToolTipsVisible(true);
+    }
+
+    if (GetCameraObject())
+    {
+        action = menu->addAction(tr("Select Current Camera"));
+        connect(action, &QAction::triggered, this, &CRenderViewport::OnMenuSelectCurrentCamera);
+    }
+
+    // Add Cameras.
+    bool bHasCameras = AddCameraMenuItems(menu);
+    CRenderViewport* pFloatingViewport = nullptr;
+
+    if (GetIEditor()->GetViewManager()->GetViewCount() > 1)
+    {
+        for (int i = 0; i < GetIEditor()->GetViewManager()->GetViewCount(); ++i)
+        {
+            CViewport* vp = GetIEditor()->GetViewManager()->GetView(i);
+            if (!vp)
+            {
+                continue;
+            }
+
+            if (viewport_cast<CRenderViewport*>(vp) == nullptr)
+            {
+                continue;
+            }
+
+            if (vp->GetViewportId() == MAX_NUM_VIEWPORTS - 1)
+            {
+                menu->addSeparator();
+
+                QMenu* floatViewMenu = menu->addMenu(tr("Floating View"));
+
+                pFloatingViewport = (CRenderViewport*)vp;
+                pFloatingViewport->AddCameraMenuItems(floatViewMenu);
+
+                if (bHasCameras)
+                {
+                    floatViewMenu->addSeparator();
+                }
+
+                QMenu* resolutionMenu = floatViewMenu->addMenu(tr("Resolution"));
+
+                QStringList customResPresets;
+                CViewportTitleDlg::LoadCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
+                CViewportTitleDlg::AddResolutionMenus(resolutionMenu, [this](int width, int height) { ResizeView(width, height); }, customResPresets);
+                if (!resolutionMenu->actions().isEmpty())
+                {
+                    resolutionMenu->addSeparator();
+                }
+                QAction* customResolutionAction = resolutionMenu->addAction(tr("Custom..."));
+                connect(customResolutionAction, &QAction::triggered, this, &CRenderViewport::OnMenuResolutionCustom);
+                break;
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::AddCameraMenuItems(QMenu* menu)
+{
+    if (!menu->isEmpty())
+    {
+        menu->addSeparator();
+    }
+
+    AddCheckbox(menu, "Lock Camera Movement", &m_bLockCameraMovement);
+    menu->addSeparator();
+
+    // Camera Sub menu
+    QMenu* customCameraMenu = menu->addMenu(tr("Camera"));
+
+    QAction* action = customCameraMenu->addAction("Editor Camera");
+    action->setCheckable(true);
+    action->setChecked(m_viewSourceType == ViewSourceType::None);
+    connect(action, &QAction::triggered, this, &CRenderViewport::SetDefaultCamera);
+
+    AZ::EBusAggregateResults<AZ::EntityId> getCameraResults;
+    Camera::CameraBus::BroadcastResult(getCameraResults, &Camera::CameraRequests::GetCameras);
+
+    const int numCameras = getCameraResults.values.size();
+
+    // only enable if we're editing a sequence in Track View and have cameras in the level
+    bool enableSequenceCameraMenu = (GetIEditor()->GetAnimation()->GetSequence() && numCameras);
+
+    action = customCameraMenu->addAction(tr("Sequence Camera"));
+    action->setCheckable(true);
+    action->setChecked(m_viewSourceType == ViewSourceType::SequenceCamera);
+    action->setEnabled(enableSequenceCameraMenu);
+    connect(action, &QAction::triggered, this, &CRenderViewport::SetSequenceCamera);
+
+    QVector<QAction*> additionalCameras;
+    additionalCameras.reserve(getCameraResults.values.size());
+
+    for (const AZ::EntityId& entityId : getCameraResults.values)
+    {
+        AZStd::string entityName;
+        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, entityId);
+        action = new QAction(QString(entityName.c_str()), nullptr);
+        additionalCameras.append(action);
+        action->setCheckable(true);
+        action->setChecked(m_viewEntityId == entityId && m_viewSourceType == ViewSourceType::CameraComponent);
+        connect(action, &QAction::triggered, this, [this, entityId](bool isChecked)
+            {
+                if (isChecked)
+                {
+                    SetComponentCamera(entityId);
+                }
+                else
+                {
+                    SetDefaultCamera();
+                }
+            });
+    }
+
+    std::sort(additionalCameras.begin(), additionalCameras.end(), [] (QAction* a1, QAction* a2) {
+        return QString::compare(a1->text(), a2->text(), Qt::CaseInsensitive) < 0;
+    });
+
+    for (QAction* cameraAction : additionalCameras)
+    {
+        customCameraMenu->addAction(cameraAction);
+    }
+
+    action = customCameraMenu->addAction(tr("Look through entity"));
+    AzToolsFramework::EntityIdList selectedEntityList;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+    action->setCheckable(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
+    action->setEnabled(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
+    action->setChecked(m_viewSourceType == ViewSourceType::AZ_Entity);
+    connect(action, &QAction::triggered, this, [this](bool isChecked)
+        {
+            if (isChecked)
+            {
+                AzToolsFramework::EntityIdList selectedEntityList;
+                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+                if (selectedEntityList.size())
+                {
+                    SetEntityAsCamera(*selectedEntityList.begin());
+                }
+            }
+            else
+            {
+                SetDefaultCamera();
+            }
+        });
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::ResizeView(int width, int height)
+{
+    const QRect rView = rect().translated(mapToGlobal(QPoint()));
+    int deltaWidth = width - rView.width();
+    int deltaHeight = height - rView.height();
+
+    if (window()->isFullScreen())
+    {
+        setGeometry(rView.left(), rView.top(), rView.width() + deltaWidth, rView.height() + deltaHeight);
+    }
+    else
+    {
+        QWidget* window = this->window();
+        if (window->isMaximized())
+        {
+            window->showNormal();
+        }
+
+        const QSize deltaSize = QSize(width, height) - size();
+        window->move(0, 0);
+        window->resize(window->size() + deltaSize);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::ToggleCameraObject()
+{
+    if (m_viewSourceType == ViewSourceType::SequenceCamera)
+    {
+        ResetToViewSourceType(ViewSourceType::LegacyCamera);
+    }
+    else
+    {
+        ResetToViewSourceType(ViewSourceType::SequenceCamera);
+    }
+    PostCameraSet();
+    GetIEditor()->GetAnimation()->ForceAnimation();
+}
+
+void CRenderViewport::OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta, const QPoint& point)
+{
+    using namespace AzToolsFramework::ViewportInteraction;
+    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+
+    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    const auto scaledPoint = WidgetToViewport(point);
+    const auto mouseInteraction = BuildMouseInteractionInternal(
+        MouseButtonsFromButton(MouseButton::None),
+        BuildKeyboardModifiers(modifiers),
+        BuildMousePick(scaledPoint));
+
+    bool handled = false;
+    MouseInteractionResult result = MouseInteractionResult::None;
+    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::EventResult(
+        result, AzToolsFramework::GetEntityContextId(),
+        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
+        MouseInteractionEvent(mouseInteraction, zDelta));
+
+    handled = result != MouseInteractionResult::None;
+
+    if (!handled)
+    {
+        Matrix34 m = GetViewTM();
+        const Vec3 ydir = m.GetColumn1().GetNormalized();
+
+        Vec3 pos = m.GetTranslation();
+
+        const float posDelta = 0.01f * zDelta * gSettings.wheelZoomSpeed;
+        pos += ydir * posDelta;
+        m_orbitDistance = m_orbitDistance - posDelta;
+        m_orbitDistance = fabs(m_orbitDistance);
+
+        m.SetTranslation(pos);
+        SetViewTM(m, true);
+
+        QtViewport::OnMouseWheel(modifiers, zDelta, scaledPoint);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::SetCamera(const CCamera& camera)
+{
+    m_Camera = camera;
+    SetViewTM(m_Camera.GetMatrix());
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CRenderViewport::GetCameraMoveSpeed() const
+{
+    return gSettings.cameraMoveSpeed;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CRenderViewport::GetCameraRotateSpeed() const
+{
+    return gSettings.cameraRotateSpeed;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::GetCameraInvertYRotation() const
+{
+    return gSettings.invertYRotation;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CRenderViewport::GetCameraInvertPan() const
+{
+    return gSettings.invertPan;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CRenderViewport* CRenderViewport::GetPrimaryViewport()
+{
+    return m_pPrimaryViewport;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::focusOutEvent([[maybe_unused]] QFocusEvent* event)
+{
+    // if we lose focus, the keyboard map needs to be cleared immediately
+    if (!m_keyDown.isEmpty())
+    {
+        m_keyDown.clear();
+
+        releaseKeyboard();
+    }
+}
+
+void CRenderViewport::keyPressEvent(QKeyEvent* event)
+{
+    // Special case Escape key and bubble way up to the top level parent so that it can cancel us out of any active tool
+    // or clear the current selection
+    if (event->key() == Qt::Key_Escape)
+    {
+        QCoreApplication::sendEvent(GetIEditor()->GetEditorMainWindow(), event);
+    }
+
+    // NOTE: we keep track of keypresses and releases explicitly because the OS/Qt will insert a slight delay between sending
+    // keyevents when the key is held down. This is standard, but makes responding to key events for game style input silly
+    // because we want the movement to be butter smooth.
+    if (!event->isAutoRepeat())
+    {
+        if (m_keyDown.isEmpty())
+        {
+            grabKeyboard();
+        }
+
+        m_keyDown.insert(event->key());
+    }
+
+    QtViewport::keyPressEvent(event);
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    // In game mode on windows we need to forward raw text events to the input system.
+    if (GetIEditor()->IsInGameMode() && GetType() == ET_ViewportCamera)
+    {
+        // Get the QString as a '\0'-terminated array of unsigned shorts.
+        // The result remains valid until the string is modified.
+        const ushort* codeUnitsUTF16 = event->text().utf16();
+        while (ushort codeUnitUTF16 = *codeUnitsUTF16)
+        {
+            AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputCodeUnitUTF16Event, codeUnitUTF16);
+            ++codeUnitsUTF16;
+        }
+    }
+#endif // defined(AZ_PLATFORM_WINDOWS)
+}
+
+void CRenderViewport::ProcessKeyRelease(QKeyEvent* event)
+{
+    if (!event->isAutoRepeat())
+    {
+        if (m_keyDown.contains(event->key()))
+        {
+            m_keyDown.remove(event->key());
+
+            if (m_keyDown.isEmpty())
+            {
+                releaseKeyboard();
+            }
+        }
+    }
+}
+
+void CRenderViewport::keyReleaseEvent(QKeyEvent* event)
+{
+    ProcessKeyRelease(event);
+
+    QtViewport::keyReleaseEvent(event);
+}
+
+void CRenderViewport::SetViewTM(const Matrix34& viewTM, bool bMoveOnly)
+{
+    Matrix34 camMatrix = viewTM;
+
+    // If no collision flag set do not check for terrain elevation.
+    if (GetType() == ET_ViewportCamera)
+    {
+        if ((GetIEditor()->GetDisplaySettings()->GetSettings() & SETTINGS_NOCOLLISION) == 0)
+        {
+            Vec3 p = camMatrix.GetTranslation();
+            bool adjustCameraElevation = true;
+            auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+            if (terrain)
+            {
+                AZ::Aabb terrainAabb(terrain->GetTerrainAabb());
+
+                // Adjust the AABB to include all Z values.  Since the goal here is to snap the camera to the terrain height if
+                // it's below the terrain, we only want to verify the camera is within the XY bounds of the terrain to adjust the elevation.
+                terrainAabb.SetMin(AZ::Vector3(terrainAabb.GetMin().GetX(), terrainAabb.GetMin().GetY(), -AZ::Constants::FloatMax));
+                terrainAabb.SetMax(AZ::Vector3(terrainAabb.GetMax().GetX(), terrainAabb.GetMax().GetY(), AZ::Constants::FloatMax));
+
+                if (!terrainAabb.Contains(LYVec3ToAZVec3(p)))
+                {
+                    adjustCameraElevation = false;
+                }
+                else if (terrain->GetIsHoleFromFloats(p.x, p.y))
+                {
+                    adjustCameraElevation = false;
+                }
+            }
+
+            if (adjustCameraElevation)
+            {
+                float z = GetIEditor()->GetTerrainElevation(p.x, p.y);
+                if (p.z < z + 0.25)
+                {
+                    p.z = z + 0.25;
+                    camMatrix.SetTranslation(p);
+                }
+            }
+        }
+
+        // Also force this position on game.
+        if (GetIEditor()->GetGameEngine())
+        {
+            GetIEditor()->GetGameEngine()->SetPlayerViewMatrix(viewTM);
+        }
+    }
+
+    CBaseObject* cameraObject = GetCameraObject();
+    if (cameraObject)
+    {
+        // Ignore camera movement if locked.
+        if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
+        {
+            return;
+        }
+
+        AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
+        if (m_viewEntityId.IsValid())
+        {
+            LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
+                lookThroughEntityCorrection, m_viewEntityId,
+                &LmbrCentral::EditorCameraCorrectionRequests::GetInverseTransformCorrection);
+        }
+
+        if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
+        {
+            CUndo undo("Move Camera");
+            if (bMoveOnly)
+            {
+                // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
+                cameraObject->SetWorldPos(camMatrix.GetTranslation(), eObjectUpdateFlags_UserInput);
+            }
+            else
+            {
+                // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
+                cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection), eObjectUpdateFlags_UserInput);
+            }
+        }
+        else
+        {
+            if (bMoveOnly)
+            {
+                // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
+                cameraObject->SetWorldPos(camMatrix.GetTranslation());
+            }
+            else
+            {
+                // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
+                cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection));
+            }
+        }
+
+        using namespace AzToolsFramework;
+        ComponentEntityObjectRequestBus::Event(cameraObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
+    }
+    else if (m_viewEntityId.IsValid())
+    {
+        // Ignore camera movement if locked.
+        if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
+        {
+            return;
+        }
+
+        if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
+        {
+            CUndo undo("Move Camera");
+            if (bMoveOnly)
+            {
+                AZ::TransformBus::Event(
+                    m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
+                    LYVec3ToAZVec3(camMatrix.GetTranslation()));
+            }
+            else
+            {
+                AZ::TransformBus::Event(
+                    m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
+                    LYTransformToAZTransform(camMatrix));
+            }
+        }
+        else
+        {
+            if (bMoveOnly)
+            {
+                AZ::TransformBus::Event(
+                    m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
+                    LYVec3ToAZVec3(camMatrix.GetTranslation()));
+            }
+            else
+            {
+                AZ::TransformBus::Event(
+                    m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
+                    LYTransformToAZTransform(camMatrix));
+            }
+        }
+
+        AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+            &AzToolsFramework::PropertyEditorGUIMessages::RequestRefresh,
+            AzToolsFramework::PropertyModificationRefreshLevel::Refresh_AttributesAndValues);
+    }
+
+    if (m_pressedKeyState == KeyPressedState::PressedThisFrame)
+    {
+        m_pressedKeyState = KeyPressedState::PressedInPreviousFrame;
+    }
+
+    QtViewport::SetViewTM(camMatrix);
+
+    m_Camera.SetMatrix(camMatrix);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderSelectedRegion()
+{
+    AABB box;
+    GetIEditor()->GetSelectedRegion(box);
+    if (box.IsEmpty())
+    {
+        return;
+    }
+
+    float x1 = box.min.x;
+    float y1 = box.min.y;
+    float x2 = box.max.x;
+    float y2 = box.max.y;
+
+    DisplayContext& dc = m_displayContext;
+
+    float fMaxSide = MAX(y2 - y1, x2 - x1);
+    if (fMaxSide < 0.1f)
+    {
+        return;
+    }
+    float fStep = fMaxSide / 100.0f;
+
+    float fMinZ = 0;
+    float fMaxZ = 0;
+
+    // Draw yellow border lines.
+    dc.SetColor(1, 1, 0, 1);
+    float offset = 0.01f;
+    Vec3 p1, p2;
+
+    const float defaultTerrainHeight = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
+    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
+
+    for (float y = y1; y < y2; y += fStep)
+    {
+        p1.x = x1;
+        p1.y = y;
+        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
+
+        p2.x = x1;
+        p2.y = y + fStep;
+        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
+        dc.DrawLine(p1, p2);
+
+        p1.x = x2;
+        p1.y = y;
+        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
+
+        p2.x = x2;
+        p2.y = y + fStep;
+        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
+        dc.DrawLine(p1, p2);
+
+        fMinZ = min(fMinZ, min(p1.z, p2.z));
+        fMaxZ = max(fMaxZ, max(p1.z, p2.z));
+    }
+    for (float x = x1; x < x2; x += fStep)
+    {
+        p1.x = x;
+        p1.y = y1;
+        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
+
+        p2.x = x + fStep;
+        p2.y = y1;
+        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
+        dc.DrawLine(p1, p2);
+
+        p1.x = x;
+        p1.y = y2;
+        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
+
+        p2.x = x + fStep;
+        p2.y = y2;
+        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
+        dc.DrawLine(p1, p2);
+
+        fMinZ = min(fMinZ, min(p1.z, p2.z));
+        fMaxZ = max(fMaxZ, max(p1.z, p2.z));
+    }
+
+    {
+        // Draw a box area
+        float fBoxOver = fMaxSide / 5.0f;
+        float fBoxHeight = fBoxOver + fMaxZ - fMinZ;
+
+        ColorB boxColor(64, 64, 255, 128); // light blue
+        ColorB transparent(boxColor.r, boxColor.g, boxColor.b, 0);
+
+        Vec3 base[] = {
+            Vec3(x1, y1, fMinZ),
+            Vec3(x2, y1, fMinZ),
+            Vec3(x2, y2, fMinZ),
+            Vec3(x1, y2, fMinZ)
+        };
+
+
+        // Generate vertices
+        static AABB boxPrev(AABB::RESET);
+        static std::vector<Vec3> verts;
+        static std::vector<ColorB> colors;
+
+        if (!IsEquivalent(boxPrev, box))
+        {
+            verts.resize(0);
+            colors.resize(0);
+            for (int i = 0; i < 4; ++i)
+            {
+                Vec3& p = base[i];
+
+                verts.push_back(p);
+                verts.push_back(Vec3(p.x, p.y, p.z + fBoxHeight));
+                verts.push_back(Vec3(p.x, p.y, p.z + fBoxHeight + fBoxOver));
+
+                colors.push_back(boxColor);
+                colors.push_back(boxColor);
+                colors.push_back(transparent);
+            }
+            boxPrev = box;
+        }
+
+        // Generate indices
+        const int numInds = 4 * 12;
+        static vtx_idx inds[numInds];
+        static bool bNeedIndsInit = true;
+        if (bNeedIndsInit)
+        {
+            vtx_idx* pInds = &inds[0];
+
+            for (int i = 0; i < 4; ++i)
+            {
+                int over = 0;
+                if (i == 3)
+                {
+                    over = -12;
+                }
+
+                int ind = i * 3;
+                *pInds++ = ind;
+                *pInds++ = ind + 3 + over;
+                *pInds++ = ind + 1;
+
+                *pInds++ = ind + 1;
+                *pInds++ = ind + 3 + over;
+                *pInds++ = ind + 4 + over;
+
+                ind = i * 3 + 1;
+                *pInds++ = ind;
+                *pInds++ = ind + 3 + over;
+                *pInds++ = ind + 1;
+
+                *pInds++ = ind + 1;
+                *pInds++ = ind + 3 + over;
+                *pInds++ = ind + 4 + over;
+            }
+            bNeedIndsInit = false;
+        }
+
+        // Draw lines
+        for (int i = 0; i < 4; ++i)
+        {
+            Vec3& p = base[i];
+
+            dc.DrawLine(p, Vec3(p.x, p.y, p.z + fBoxHeight), ColorF(1, 1, 0, 1), ColorF(1, 1, 0, 1));
+            dc.DrawLine(Vec3(p.x, p.y, p.z + fBoxHeight), Vec3(p.x, p.y, p.z + fBoxHeight + fBoxOver), ColorF(1, 1, 0, 1), ColorF(1, 1, 0, 0));
+        }
+
+        // Draw volume
+        dc.DepthWriteOff();
+        dc.CullOff();
+        dc.pRenderAuxGeom->DrawTriangles(&verts[0], verts.size(), &inds[0], numInds, &colors[0]);
+        dc.CullOn();
+        dc.DepthWriteOn();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::ProcessKeys()
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    if (m_PlayerControl || GetIEditor()->IsInGameMode() || !CheckRespondToInput() || m_freezeViewportInput)
+    {
+        return;
+    }
+
+    //m_Camera.UpdateFrustum();
+    Matrix34 m = GetViewTM();
+    Vec3 ydir = m.GetColumn1().GetNormalized();
+    Vec3 xdir = m.GetColumn0().GetNormalized();
+    Vec3 zdir = m.GetColumn2().GetNormalized();
+
+    Vec3 pos = GetViewTM().GetTranslation();
+
+    float speedScale = AZStd::GetMin(
+        60.0f * GetIEditor()->GetSystem()->GetITimer()->GetFrameTime(), 20.0f);
+
+    speedScale *= GetCameraMoveSpeed();
+
+    // Use the global modifier keys instead of our keymap. It's more reliable.
+    const bool shiftPressed = QGuiApplication::queryKeyboardModifiers() & Qt::ShiftModifier;
+    const bool controlPressed = QGuiApplication::queryKeyboardModifiers() & Qt::ControlModifier;
+
+    if (shiftPressed)
+    {
+        speedScale *= gSettings.cameraFastMoveSpeed;
+    }
+
+    if (controlPressed)
+    {
+        return;
+    }
+
+    bool bIsPressedSome = false;
+
+    if (IsKeyDown(Qt::Key_Up) || IsKeyDown(Qt::Key_W))
+    {
+        // move forward
+        bIsPressedSome = true;
+        pos = pos + (speedScale * m_moveSpeed * ydir);
+    }
+
+    if (IsKeyDown(Qt::Key_Down) || IsKeyDown(Qt::Key_S))
+    {
+        // move backward
+        bIsPressedSome = true;
+        pos = pos - (speedScale * m_moveSpeed * ydir);
+    }
+
+    if (IsKeyDown(Qt::Key_Left) || IsKeyDown(Qt::Key_A))
+    {
+        // move left
+        bIsPressedSome = true;
+        pos = pos - (speedScale * m_moveSpeed * xdir);
+    }
+
+    if (IsKeyDown(Qt::Key_Right) || IsKeyDown(Qt::Key_D))
+    {
+        // move right
+        bIsPressedSome = true;
+        pos = pos + (speedScale * m_moveSpeed * xdir);
+    }
+
+    if (IsKeyDown(Qt::Key_E))
+    {
+        // move Up
+        bIsPressedSome = true;
+        pos = pos + (speedScale * m_moveSpeed * zdir);
+    }
+
+    if (IsKeyDown(Qt::Key_Q))
+    {
+        // move down
+        bIsPressedSome = true;
+        pos = pos - (speedScale * m_moveSpeed * zdir);
+    }
+
+    if (bIsPressedSome)
+    {
+        // Only change the keystate to pressed if it wasn't already marked in
+        // a previous frame. Otherwise, the undo/redo stack will be all off
+        // from what SetViewTM() does.
+        if (m_pressedKeyState == KeyPressedState::AllUp)
+        {
+            m_pressedKeyState = KeyPressedState::PressedThisFrame;
+        }
+
+        m.SetTranslation(pos);
+        SetViewTM(m, true);
+    }
+
+    bool mouseModifierKeysDown = ((QGuiApplication::mouseButtons() & (Qt::RightButton | Qt::MiddleButton)) != 0);
+
+    if (!bIsPressedSome && !mouseModifierKeysDown)
+    {
+        m_pressedKeyState = KeyPressedState::AllUp;
+    }
+}
+
+Vec3 CRenderViewport::WorldToView3D(const Vec3& wp, [[maybe_unused]] int nFlags) const
+{
+    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
+        "WorldToView3D was called but viewport widget rendering was not set. PreWidgetRendering must be called before.");
+
+    Vec3 out(0, 0, 0);
+    float x, y, z;
+
+    m_renderer->ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
+    if (_finite(x) && _finite(y) && _finite(z))
+    {
+        out.x = (x / 100) * m_rcClient.width();
+        out.y = (y / 100) * m_rcClient.height();
+        out.x /= QHighDpiScaling::factor(windowHandle()->screen());
+        out.y /= QHighDpiScaling::factor(windowHandle()->screen());
+        out.z = z;
+    }
+    return out;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint CRenderViewport::WorldToView(const Vec3& wp) const
+{
+    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
+        "WorldToView was called but viewport widget rendering was not set. PreWidgetRendering must be called before.");
+
+    QPoint p;
+    float x, y, z;
+
+    m_renderer->ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
+    if (_finite(x) || _finite(y))
+    {
+        p.rx() = (x / 100) * m_rcClient.width();
+        p.ry() = (y / 100) * m_rcClient.height();
+    }
+    else
+    {
+        QPoint(0, 0);
+    }
+
+    return p;
+}
+//////////////////////////////////////////////////////////////////////////
+QPoint CRenderViewport::WorldToViewParticleEditor(const Vec3& wp, int width, int height) const
+{
+    QPoint p;
+    float x, y, z;
+
+    m_renderer->ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
+    if (_finite(x) || _finite(y))
+    {
+        p.rx() = (x / 100) * width;
+        p.ry() = (y / 100) * height;
+    }
+    else
+    {
+        QPoint(0, 0);
+    }
+    return p;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 CRenderViewport::ViewToWorld(const QPoint& vp, bool* collideWithTerrain, bool onlyTerrain, bool bSkipVegetation, bool bTestRenderMesh, bool* collideWithObject) const
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    // Make sure we initialize the value if a pointer has been passed in
+    if (collideWithTerrain != nullptr)
+    {
+        *collideWithTerrain = false;
+    }
+
+    // Make sure we initialize the value if a pointer has been passed in
+    if (collideWithObject != nullptr)
+{
+        *collideWithObject = false;
+    }
+
+    if (!m_renderer)
+    {
+        return Vec3(0, 0, 0);
+    }
+
+    QRect rc = m_rcClient;
+
+    Vec3 pos0;
+    if (!m_Camera.Unproject(Vec3(vp.x(), rc.bottom() - vp.y(), 0), pos0))
+    {
+        return Vec3(0, 0, 0);
+    }
+    if (!IsVectorInValidRange(pos0))
+    {
+        pos0.Set(0, 0, 0);
+    }
+
+    Vec3 pos1;
+    if (!m_Camera.Unproject(Vec3(vp.x(), rc.bottom() - vp.y(), 1), pos1))
+    {
+        return Vec3(0, 0, 0);
+    }
+    if (!IsVectorInValidRange(pos1))
+    {
+        pos1.Set(1, 0, 0);
+    }
+
+    const float maxDistance = 10000.f;
+
+    Vec3 v = (pos1 - pos0);
+    v = v.GetNormalized();
+    v = v * maxDistance;
+
+    if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z))
+    {
+        return Vec3(0, 0, 0);
+    }
+
+    Vec3 colp = pos0 + 0.002f * v;
+
+    AZ_UNUSED(vp)
+    AZ_UNUSED(bTestRenderMesh)
+    AZ_UNUSED(bSkipVegetation)
+    AZ_UNUSED(bSkipVegetation)
+    AZStd::optional<AZStd::pair<float, AZ::Vector3>> hitDistancePosition;
+
+    if (!onlyTerrain && !GetIEditor()->IsTerrainAxisIgnoreObjects())
+    {
+        AzFramework::EntityContextId editorContextId;
+        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
+            editorContextId, &AzToolsFramework::EditorEntityContextRequests::GetEditorEntityContextId);
+
+        AzFramework::RenderGeometry::RayRequest ray;
+        ray.m_startWorldPosition = LYVec3ToAZVec3(pos0);
+        ray.m_endWorldPosition = LYVec3ToAZVec3(pos0 + v);
+        ray.m_onlyVisible = true;
+
+        AzFramework::RenderGeometry::RayResult result;
+        AzFramework::RenderGeometry::IntersectorBus::EventResult(result, editorContextId,
+            &AzFramework::RenderGeometry::IntersectorInterface::RayIntersect, ray);
+
+        if (result)
+        {
+            if (!hitDistancePosition || result.m_distance < hitDistancePosition->first)
+            {
+                hitDistancePosition = {result.m_distance, result.m_worldPosition};
+                if (collideWithObject)
+                {
+                    *collideWithObject = true;
+                }
+            }
+        }
+    }
+
+    if (hitDistancePosition)
+    {
+        colp = AZVec3ToLYVec3(hitDistancePosition->second);
+    }
+
+
+    return colp;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 CRenderViewport::ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh)
+{
+    AZ_UNUSED(vp)
+    AZ_UNUSED(bTestRenderMesh)
+
+    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
+        "ViewToWorldNormal was called but viewport widget rendering was not set. PreWidgetRendering must be called before.");
+
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    if (!m_renderer)
+    {
+        return Vec3(0, 0, 1);
+    }
+
+    QRect rc = m_rcClient;
+
+    Vec3 pos0, pos1;
+    float wx, wy, wz;
+    m_renderer->UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 0, &wx, &wy, &wz);
+    if (!_finite(wx) || !_finite(wy) || !_finite(wz))
+    {
+        return Vec3(0, 0, 1);
+    }
+    pos0(wx, wy, wz);
+    if (!IsVectorInValidRange(pos0))
+    {
+        pos0.Set(0, 0, 0);
+    }
+
+    m_renderer->UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 1, &wx, &wy, &wz);
+    if (!_finite(wx) || !_finite(wy) || !_finite(wz))
+    {
+        return Vec3(0, 0, 1);
+    }
+    pos1(wx, wy, wz);
+
+    Vec3 v = (pos1 - pos0);
+    if (!IsVectorInValidRange(pos1))
+    {
+        pos1.Set(1, 0, 0);
+    }
+
+    const float maxDistance = 2000.f;
+    v = v.GetNormalized();
+    v = v * maxDistance;
+
+    if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z))
+    {
+        return Vec3(0, 0, 1);
+    }
+
+    Vec3 colp(0, 0, 0);
+
+
+    AZStd::optional<AZStd::pair<float, AZ::Vector3>> hitDistanceNormal;
+
+    if (!onlyTerrain && !GetIEditor()->IsTerrainAxisIgnoreObjects())
+    {
+        AzFramework::EntityContextId editorContextId;
+        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
+            editorContextId, &AzToolsFramework::EditorEntityContextRequests::GetEditorEntityContextId);
+
+        AzFramework::RenderGeometry::RayRequest ray;
+        ray.m_startWorldPosition = LYVec3ToAZVec3(pos0);
+        ray.m_endWorldPosition = LYVec3ToAZVec3(pos0 + v);
+        ray.m_onlyVisible = true;
+
+        AzFramework::RenderGeometry::RayResult result;
+        AzFramework::RenderGeometry::IntersectorBus::EventResult(result, editorContextId,
+            &AzFramework::RenderGeometry::IntersectorInterface::RayIntersect, ray);
+
+        if (result)
+        {
+            if (!hitDistanceNormal || result.m_distance < hitDistanceNormal->first)
+            {
+                hitDistanceNormal = { result.m_distance, result.m_worldNormal };
+            }
+        }
+    }
+
+    return hitDistanceNormal ? AZVec3ToLYVec3(hitDistanceNormal->second) : Vec3(0, 0, 1);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const
+{
+    Matrix34A objMat, objMatInv;
+    Matrix33 objRot, objRotInv;
+
+    if (hit.pCollider->GetiForeignData() != PHYS_FOREIGN_ID_STATIC)
+    {
+        return false;
+    }
+
+    IRenderNode* pNode = (IRenderNode*) hit.pCollider->GetForeignData(PHYS_FOREIGN_ID_STATIC);
+    if (!pNode || !pNode->GetEntityStatObj())
+    {
+        return false;
+    }
+
+    IStatObj* pEntObject  = pNode->GetEntityStatObj(hit.partid, 0, &objMat, false);
+    if (!pEntObject || !pEntObject->GetRenderMesh())
+    {
+        return false;
+    }
+
+    objRot = Matrix33(objMat);
+    objRot.NoScale(); // No scale.
+    objRotInv = objRot;
+    objRotInv.Invert();
+
+    float fWorldScale = objMat.GetColumn(0).GetLength(); // GetScale
+    float fWorldScaleInv = 1.0f / fWorldScale;
+
+    // transform decal into object space
+    objMatInv = objMat;
+    objMatInv.Invert();
+
+    // put into normal object space hit direction of projection
+    Vec3 invhitn = -(hit.n);
+    Vec3 vOS_HitDir = objRotInv.TransformVector(invhitn).GetNormalized();
+
+    // put into position object space hit position
+    Vec3 vOS_HitPos = objMatInv.TransformPoint(hit.pt);
+    vOS_HitPos -= vOS_HitDir * RENDER_MESH_TEST_DISTANCE * fWorldScaleInv;
+
+    IRenderMesh* pRM = pEntObject->GetRenderMesh();
+
+    AABB aabbRNode;
+    pRM->GetBBox(aabbRNode.min, aabbRNode.max);
+    Vec3 vOut(0, 0, 0);
+    if (!Intersect::Ray_AABB(Ray(vOS_HitPos, vOS_HitDir), aabbRNode, vOut))
+    {
+        return false;
+    }
+
+    if (!pRM || !pRM->GetVerticesCount())
+    {
+        return false;
+    }
+
+    if (RayRenderMeshIntersection(pRM, vOS_HitPos, vOS_HitDir, outPos, outNormal))
+    {
+        outNormal = objRot.TransformVector(outNormal).GetNormalized();
+        outPos = objMat.TransformPoint(outPos);
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::RayRenderMeshIntersection(IRenderMesh*, const Vec3&, const Vec3&, Vec3&, Vec3&) const
+{
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const
+{
+    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
+        "ViewToWorldRay was called but SScopedCurrentContext was not set at a higher scope! This means the camera for this call is incorrect.");
+
+    if (!m_renderer)
+    {
+        return;
+    }
+
+    QRect rc = m_rcClient;
+
+    Vec3 pos0, pos1;
+    float wx, wy, wz;
+    m_renderer->UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 0, &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);
+    m_renderer->UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 1, &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);
+
+    Vec3 v = (pos1 - pos0);
+    v = v.GetNormalized();
+
+    raySrc = pos0;
+    rayDir = v;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CRenderViewport::GetScreenScaleFactor(const Vec3& worldPoint) const
+{
+    float dist = m_Camera.GetPosition().GetDistance(worldPoint);
+    if (dist < m_Camera.GetNearPlane())
+    {
+        dist = m_Camera.GetNearPlane();
+    }
+    return dist;
+}
+//////////////////////////////////////////////////////////////////////////
+float CRenderViewport::GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position)
+{
+    Vec3 camPos = camera.GetPosition();
+    float dist = camPos.GetDistance(object_position);
+    return dist;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnDestroy()
+{
+    DestroyRenderContext();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::CheckRespondToInput() const
+{
+    if (!Editor::EditorQtApplication::IsActive())
+    {
+        return false;
+    }
+
+    if (!hasFocus())
+    {
+        return false;
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::HitTest(const QPoint& point, HitContext& hitInfo)
+{
+    hitInfo.camera = &m_Camera;
+    hitInfo.pExcludedObject = GetCameraObject();
+    return QtViewport::HitTest(point, hitInfo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::IsBoundsVisible(const AABB& box) const
+{
+    // If at least part of bbox is visible then its visible.
+    return m_Camera.IsAABBVisible_F(AABB(box.min, box.max));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::CenterOnSelection()
+{
+    if (!GetIEditor()->GetSelection()->IsEmpty())
+    {
+        // Get selection bounds & center
+        CSelectionGroup* sel = GetIEditor()->GetSelection();
+        AABB selectionBounds = sel->GetBounds();
+        CenterOnAABB(selectionBounds);
+    }
+}
+
+void CRenderViewport::CenterOnAABB(const AABB& aabb)
+{
+    Vec3 selectionCenter = aabb.GetCenter();
+
+    // Minimum center size is 40cm
+    const float minSelectionRadius = 0.4f;
+    const float selectionSize = std::max(minSelectionRadius, aabb.GetRadius());
+
+    // Move camera 25% further back than required
+    const float centerScale = 1.25f;
+
+    // Decompose original transform matrix
+    const Matrix34& originalTM = GetViewTM();
+    AffineParts affineParts;
+    affineParts.SpectralDecompose(originalTM);
+
+    // Forward vector is y component of rotation matrix
+    Matrix33 rotationMatrix(affineParts.rot);
+    const Vec3 viewDirection = rotationMatrix.GetColumn1().GetNormalized();
+
+    // Compute adjustment required by FOV != 90 degrees
+    const float fov = GetFOV();
+    const float fovScale = (1.0f / tan(fov * 0.5f));
+
+    // Compute new transform matrix
+    const float distanceToTarget = selectionSize * fovScale * centerScale;
+    const Vec3 newPosition = selectionCenter - (viewDirection * distanceToTarget);
+    Matrix34 newTM = Matrix34(rotationMatrix, newPosition);
+
+    // Set new orbit distance
+    m_orbitDistance = distanceToTarget;
+    m_orbitDistance = fabs(m_orbitDistance);
+
+    SetViewTM(newTM);
+}
+
+void CRenderViewport::CenterOnSliceInstance()
+{
+    AzToolsFramework::EntityIdList selectedEntityList;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    AZ::SliceComponent::SliceInstanceAddress sliceAddress;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(sliceAddress,
+        &AzToolsFramework::ToolsApplicationRequestBus::Events::FindCommonSliceInstanceAddress, selectedEntityList);
+
+    if (!sliceAddress.IsValid())
+    {
+        return;
+    }
+
+    AZ::EntityId sliceRootEntityId;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(sliceRootEntityId,
+        &AzToolsFramework::ToolsApplicationRequestBus::Events::GetRootEntityIdOfSliceInstance, sliceAddress);
+
+    if (!sliceRootEntityId.IsValid())
+    {
+        return;
+    }
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList{sliceRootEntityId});
+
+    const AZ::SliceComponent::InstantiatedContainer* instantiatedContainer = sliceAddress.GetInstance()->GetInstantiated();
+
+    AABB aabb(Vec3(std::numeric_limits<float>::max()), Vec3(-std::numeric_limits<float>::max()));
+    for (AZ::Entity* entity : instantiatedContainer->m_entities)
+    {
+        CEntityObject* entityObject = nullptr;
+        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(entityObject, entity->GetId(),
+            &AzToolsFramework::ComponentEntityEditorRequestBus::Events::GetSandboxObject);
+        AABB box;
+        entityObject->GetBoundBox(box);
+        aabb.Add(box.min);
+        aabb.Add(box.max);
+    }
+    CenterOnAABB(aabb);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::SetFOV(float fov)
+{
+    if (m_pCameraFOVVariable)
+    {
+        m_pCameraFOVVariable->Set(fov);
+    }
+    else
+    {
+        m_camFOV = fov;
+    }
+
+    if (m_viewPane)
+    {
+        m_viewPane->OnFOVChanged(fov);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CRenderViewport::GetFOV() const
+{
+    if (m_viewSourceType == ViewSourceType::SequenceCamera)
+    {
+        CBaseObject* cameraObject = GetCameraObject();
+
+        AZ::EntityId cameraEntityId;
+        AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(cameraEntityId, cameraObject, &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
+        if (cameraEntityId.IsValid())
+        {
+            // component Camera
+            float fov = DEFAULT_FOV;
+            Camera::CameraRequestBus::EventResult(fov, cameraEntityId, &Camera::CameraComponentRequests::GetFov);
+            return AZ::DegToRad(fov);
+        }
+    }
+
+    if (m_pCameraFOVVariable)
+    {
+        float fov;
+        m_pCameraFOVVariable->Get(fov);
+        return fov;
+    }
+    else if (m_viewEntityId.IsValid())
+    {
+        float fov = AZ::RadToDeg(m_camFOV);
+        Camera::CameraRequestBus::EventResult(fov, m_viewEntityId, &Camera::CameraComponentRequests::GetFov);
+        return AZ::DegToRad(fov);
+    }
+
+    return m_camFOV;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::CreateRenderContext()
+{
+    // Create context.
+    if (m_renderer && !m_bRenderContextCreated)
+    {
+        m_bRenderContextCreated = true;
+
+        AzFramework::WindowRequestBus::Handler::BusConnect(renderOverlayHWND());
+        AzFramework::WindowSystemNotificationBus::Broadcast(&AzFramework::WindowSystemNotificationBus::Handler::OnWindowCreated, renderOverlayHWND());
+
+        WIN_HWND oldContext = m_renderer->GetCurrentContextHWND();
+        m_renderer->CreateContext(renderOverlayHWND());
+        m_renderer->SetCurrentContext(oldContext); // restore prior context
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::DestroyRenderContext()
+{
+    // Destroy render context.
+    if (m_renderer && m_bRenderContextCreated)
+    {
+        // Do not delete primary context.
+        if (m_hwnd != m_renderer->GetHWND())
+        {
+            m_renderer->DeleteContext(m_hwnd);
+        }
+        m_bRenderContextCreated = false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::SetDefaultCamera()
+{
+    if (IsDefaultCamera())
+    {
+        return;
+    }
+    ResetToViewSourceType(ViewSourceType::None);
+    GetViewManager()->SetCameraObjectId(m_cameraObjectId);
+    SetName(m_defaultViewName);
+    SetViewTM(m_defaultViewTM);
+    PostCameraSet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::IsDefaultCamera() const
+{
+    return m_viewSourceType == ViewSourceType::None;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::SetSequenceCamera()
+{
+    if (m_viewSourceType == ViewSourceType::SequenceCamera)
+    {
+        // Reset if we were checked before
+        SetDefaultCamera();
+    }
+    else
+    {
+        ResetToViewSourceType(ViewSourceType::SequenceCamera);
+
+        SetName(tr("Sequence Camera"));
+        SetViewTM(GetViewTM());
+
+        GetViewManager()->SetCameraObjectId(m_cameraObjectId);
+        PostCameraSet();
+
+        // ForceAnimation() so Track View will set the Camera params
+        // if a camera is animated in the sequences.
+        if (GetIEditor() && GetIEditor()->GetAnimation())
+        {
+            GetIEditor()->GetAnimation()->ForceAnimation();
+    }
+}
+}
+
+//////////////////////////////////////////////////////////////////////////
+void  CRenderViewport::SetComponentCamera(const AZ::EntityId& entityId)
+{
+    ResetToViewSourceType(ViewSourceType::CameraComponent);
+    SetViewEntity(entityId);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void  CRenderViewport::SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement)
+{
+    ResetToViewSourceType(ViewSourceType::AZ_Entity);
+    SetViewEntity(entityId, lockCameraMovement);
+}
+
+void CRenderViewport::SetFirstComponentCamera()
+{
+    AZ::EBusAggregateResults<AZ::EntityId> results;
+    Camera::CameraBus::BroadcastResult(results, &Camera::CameraRequests::GetCameras);
+    AZStd::sort_heap(results.values.begin(), results.values.end());
+    AZ::EntityId entityId;
+    if (results.values.size() > 0)
+    {
+        entityId = results.values[0];
+    }
+    SetComponentCamera(entityId);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::SetSelectedCamera()
+{
+    AZ::EBusAggregateResults<AZ::EntityId> cameraList;
+    Camera::CameraBus::BroadcastResult(cameraList, &Camera::CameraRequests::GetCameras);
+    if (cameraList.values.size() > 0)
+    {
+        AzToolsFramework::EntityIdList selectedEntityList;
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        for (const AZ::EntityId& entityId : selectedEntityList)
+        {
+            if (AZStd::find(cameraList.values.begin(), cameraList.values.end(), entityId) != cameraList.values.end())
+            {
+                SetComponentCamera(entityId);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::IsSelectedCamera() const
+{
+    CBaseObject* pCameraObject = GetCameraObject();
+    if (pCameraObject && pCameraObject == GetIEditor()->GetSelectedObject())
+    {
+        return true;
+    }
+
+    AzToolsFramework::EntityIdList selectedEntityList;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    if ((m_viewSourceType == ViewSourceType::CameraComponent  || m_viewSourceType == ViewSourceType::AZ_Entity)
+        && !selectedEntityList.empty()
+        && AZStd::find(selectedEntityList.begin(), selectedEntityList.end(), m_viewEntityId) != selectedEntityList.end())
+    {
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::CycleCamera()
+{
+    // None -> Sequence -> LegacyCamera -> ... LegacyCamera -> CameraComponent -> ... CameraComponent -> None
+    // AZ_Entity has been intentionally left out of the cycle for now.
+    switch (m_viewSourceType)
+    {
+    case CRenderViewport::ViewSourceType::None:
+    {
+        SetFirstComponentCamera();
+        break;
+    }
+    case CRenderViewport::ViewSourceType::SequenceCamera:
+    {
+        AZ_Error("CRenderViewport", false, "Legacy cameras no longer exist, unable to set sequence camera.");
+        break;
+    }
+    case CRenderViewport::ViewSourceType::LegacyCamera:
+    {
+        AZ_Warning("CRenderViewport", false, "Legacy cameras no longer exist, using first found component camera instead.");
+        SetFirstComponentCamera();
+        break;
+    }
+    case CRenderViewport::ViewSourceType::CameraComponent:
+    {
+        AZ::EBusAggregateResults<AZ::EntityId> results;
+        Camera::CameraBus::BroadcastResult(results, &Camera::CameraRequests::GetCameras);
+        AZStd::sort_heap(results.values.begin(), results.values.end());
+        auto&& currentCameraIterator = AZStd::find(results.values.begin(), results.values.end(), m_viewEntityId);
+        if (currentCameraIterator != results.values.end())
+        {
+            ++currentCameraIterator;
+            if (currentCameraIterator != results.values.end())
+            {
+                SetComponentCamera(*currentCameraIterator);
+                break;
+            }
+        }
+        SetDefaultCamera();
+        break;
+    }
+    case CRenderViewport::ViewSourceType::AZ_Entity:
+    {
+        // we may decide to have this iterate over just selected entities
+        SetDefaultCamera();
+        break;
+    }
+    default:
+    {
+        SetDefaultCamera();
+        break;
+    }
+    }
+}
+
+void CRenderViewport::SetViewFromEntityPerspective(const AZ::EntityId& entityId)
+{
+    SetViewAndMovementLockFromEntityPerspective(entityId, false);
+}
+
+void CRenderViewport::SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement)
+{
+    if (!m_ignoreSetViewFromEntityPerspective)
+    {
+        SetEntityAsCamera(entityId, lockCameraMovement);
+    }
+}
+
+bool CRenderViewport::GetActiveCameraPosition(AZ::Vector3& cameraPos)
+{
+    cameraPos = LYVec3ToAZVec3(m_viewTM.GetTranslation());
+    return true;
+}
+
+bool CRenderViewport::GetActiveCameraState(AzFramework::CameraState& cameraState)
+{
+    if (m_pPrimaryViewport == this)
+    {
+        if (GetIEditor()->IsInGameMode())
+        {
+            return false;
+        }
+        else
+        {
+            const auto& camera = GetCamera();
+            cameraState = CameraStateFromCCamera(camera, GetFOV(), m_rcClient.width(), m_rcClient.height());
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+void CRenderViewport::OnStartPlayInEditor()
+{
+    if (m_viewEntityId.IsValid())
+    {
+        m_viewEntityIdCachedForEditMode = m_viewEntityId;
+        AZ::EntityId runtimeEntityId;
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
+            &AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId,
+            m_viewEntityId, runtimeEntityId);
+
+        m_viewEntityId = runtimeEntityId;
+    }
+    // Force focus the render viewport, otherwise we don't receive keyPressEvents until the user first clicks a
+    // mouse button. See also CRenderViewport::mousePressEvent for a deatiled description of the underlying bug.
+    // We need to queue this up because we don't actually lose focus until sometime after this function returns.
+    QTimer::singleShot(0, this, &CRenderViewport::ActivateWindowAndSetFocus);
+}
+
+void CRenderViewport::OnStopPlayInEditor()
+{
+    if (m_viewEntityIdCachedForEditMode.IsValid())
+    {
+        m_viewEntityId = m_viewEntityIdCachedForEditMode;
+        m_viewEntityIdCachedForEditMode.SetInvalid();
+    }
+}
+
+void CRenderViewport::ActivateWindowAndSetFocus()
+{
+    window()->activateWindow();
+    setFocus();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderConstructionPlane()
+{
+    // noop
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RenderSnappingGrid()
+{
+    // noop
+}
+
+//////////////////////////////////////////////////////////////////////////
+CRenderViewport::SPreviousContext CRenderViewport::SetCurrentContext(int newWidth, int newHeight) const
+{
+    SPreviousContext x;
+    x.window = reinterpret_cast<HWND>(m_renderer->GetCurrentContextHWND());
+    x.mainViewport = m_renderer->IsCurrentContextMainVP();
+    x.width = m_renderer->GetCurrentContextViewportWidth();
+    x.height = m_renderer->GetCurrentContextViewportHeight();
+    x.rendererCamera = m_renderer->GetCamera();
+
+    const float scale = CLAMP(gEnv->pConsole->GetCVar("r_ResolutionScale")->GetFVal(), MIN_RESOLUTION_SCALE, MAX_RESOLUTION_SCALE);
+    const QSize newSize = WidgetToViewport(QSize(newWidth, newHeight)) * scale;
+
+    // No way to query the requested Qt scale here, so do it this way for now
+    float widthScale = aznumeric_cast<float>(newSize.width()) / aznumeric_cast<float>(newWidth);
+    float heightScale = aznumeric_cast<float>(newSize.height()) / aznumeric_cast<float>(newHeight);
+
+    m_renderer->SetCurrentContext(renderOverlayHWND());
+    m_renderer->ChangeViewport(0, 0, newWidth, newHeight, true, widthScale, heightScale);
+    m_renderer->SetCamera(m_Camera);
+
+    return x;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CRenderViewport::SPreviousContext CRenderViewport::SetCurrentContext() const
+{
+    const auto r = rect();
+    return SetCurrentContext(r.width(), r.height());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::RestorePreviousContext(const SPreviousContext& x) const
+{
+    if (x.window && x.window != m_renderer->GetCurrentContextHWND())
+    {
+        m_renderer->SetCurrentContext(x.window);
+        m_renderer->ChangeViewport(0, 0, x.width, x.height, x.mainViewport);
+        m_renderer->SetCamera(x.rendererCamera);
+    }
+}
+
+void CRenderViewport::PreWidgetRendering()
+{
+    // if we have not already set the render context for the viewport, do it now
+    // based on the current state of the renderer/viewport, record the previous
+    // context to restore afterwards
+    if (m_cameraSetForWidgetRenderingCount == 0)
+    {
+        m_preWidgetContext = SetCurrentContext();
+    }
+
+    // keep track of how many times we've attempted to update the context
+    m_cameraSetForWidgetRenderingCount++;
+}
+
+void CRenderViewport::PostWidgetRendering()
+{
+    if (m_cameraSetForWidgetRenderingCount > 0)
+    {
+        m_cameraSetForWidgetRenderingCount--;
+
+        // unwinding - when the viewport context is no longer required,
+        // restore the previous context when widget rendering first began
+        if (m_cameraSetForWidgetRenderingCount == 0)
+        {
+            RestorePreviousContext(m_preWidgetContext);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::OnCameraFOVVariableChanged([[maybe_unused]] IVariable* var)
+{
+    if (m_viewPane)
+    {
+        m_viewPane->OnFOVChanged(GetFOV());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::HideCursor()
+{
+    if (m_bCursorHidden || !gSettings.viewports.bHideMouseCursorWhenCaptured)
+    {
+        return;
+    }
+
+    qApp->setOverrideCursor(Qt::BlankCursor);
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    StartFixedCursorMode(this);
+#endif
+    m_bCursorHidden = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::ShowCursor()
+{
+    if (!m_bCursorHidden || !gSettings.viewports.bHideMouseCursorWhenCaptured)
+    {
+        return;
+    }
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    StopFixedCursorMode();
+#endif
+    qApp->restoreOverrideCursor();
+    m_bCursorHidden = false;
+}
+
+bool CRenderViewport::IsKeyDown(Qt::Key key) const
+{
+    return m_keyDown.contains(key);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::PushDisableRendering()
+{
+    assert(m_disableRenderingCount >= 0);
+    ++m_disableRenderingCount;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::PopDisableRendering()
+{
+    assert(m_disableRenderingCount >= 1);
+    --m_disableRenderingCount;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CRenderViewport::IsRenderingDisabled() const
+{
+    return m_disableRenderingCount > 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint CRenderViewport::WidgetToViewport(const QPoint &point) const
+{
+    return point * WidgetToViewportFactor();
+}
+
+QPoint CRenderViewport::ViewportToWidget(const QPoint &point) const
+{
+    return point / WidgetToViewportFactor();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QSize CRenderViewport::WidgetToViewport(const QSize &size) const
+{
+    return size * WidgetToViewportFactor();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::BeginUndoTransaction()
+{
+    PushDisableRendering();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CRenderViewport::EndUndoTransaction()
+{
+    PopDisableRendering();
+    Update();
+}
+
+void CRenderViewport::UpdateCurrentMousePos(const QPoint& newPosition)
+{
+    m_prevMousePos = m_mousePos;
+    m_mousePos = newPosition;
+}
+
+void CRenderViewport::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt)
+{
+    const auto scaledPoint = WidgetToViewport(pt);
+    QtViewport::BuildDragDropContext(context, scaledPoint);
+}
+
+void* CRenderViewport::GetSystemCursorConstraintWindow() const
+{
+    AzFramework::SystemCursorState systemCursorState = AzFramework::SystemCursorState::Unknown;
+
+    AzFramework::InputSystemCursorRequestBus::EventResult(
+        systemCursorState,
+        AzFramework::InputDeviceMouse::Id,
+        &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
+
+    const bool systemCursorConstrained =
+        (systemCursorState == AzFramework::SystemCursorState::ConstrainedAndHidden ||
+         systemCursorState == AzFramework::SystemCursorState::ConstrainedAndVisible);
+
+    return systemCursorConstrained ? renderOverlayHWND() : nullptr;
+}
+
+void CRenderViewport::RestoreViewportAfterGameMode()
+{
+    Matrix34 preGameModeViewTM = m_preGameModeViewTM;
+
+    QString text = QString("You are exiting Game Mode. Would you like to restore the camera in the viewport to where it was before you entered Game Mode?<br/><br/><small>This option can always be changed in the General Preferences tab of the Editor Settings, by toggling the \"%1\" option.</small><br/><br/>").arg(EditorPreferencesGeneralRestoreViewportCameraSettingName);
+    QString restoreOnExitGameModePopupDisabledRegKey("Editor/AutoHide/ViewportCameraRestoreOnExitGameMode");
+
+    // Read the popup disabled registry value
+    QSettings settings;
+    QVariant restoreOnExitGameModePopupDisabledRegValue = settings.value(restoreOnExitGameModePopupDisabledRegKey);
+
+    // Has the user previously disabled being asked about restoring the camera on exiting game mode?
+    if (restoreOnExitGameModePopupDisabledRegValue.isNull())
+    {
+        // No, ask them now
+        QMessageBox messageBox(QMessageBox::Question, "O3DE", text, QMessageBox::StandardButtons(QMessageBox::No | QMessageBox::Yes), this);
+        messageBox.setDefaultButton(QMessageBox::Yes);
+
+        QCheckBox* checkBox = new QCheckBox(QStringLiteral("Do not show this message again"));
+        messageBox.setCheckBox(checkBox);
+
+        // Unconstrain the system cursor and make it visible before we show the dialog box, otherwise the user can't see the cursor.
+        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+            AzFramework::SystemCursorState::UnconstrainedAndVisible);
+
+        int response = messageBox.exec();
+
+        if (checkBox->isChecked())
+        {
+            settings.setValue(restoreOnExitGameModePopupDisabledRegKey, response);
+        }
+
+        // Update the value only if the popup hasn't previously been disabled and the value has changed
+        bool newSetting = (response == QMessageBox::Yes);
+        if (newSetting != GetIEditor()->GetEditorSettings()->restoreViewportCamera)
+        {
+            GetIEditor()->GetEditorSettings()->restoreViewportCamera = newSetting;
+            GetIEditor()->GetEditorSettings()->Save();
+        }
+    }
+
+    bool restoreViewportCamera = GetIEditor()->GetEditorSettings()->restoreViewportCamera;
+    if (restoreViewportCamera)
+    {
+        SetViewTM(preGameModeViewTM);
+    }
+    else
+    {
+        SetViewTM(m_gameTM);
+    }
+}
+
+#include <moc_RenderViewport.cpp>
diff --git a/Code/Editor/RenderViewport.h b/Code/Editor/RenderViewport.h
new file mode 100644
index 0000000000..1764028dd6
--- /dev/null
+++ b/Code/Editor/RenderViewport.h
@@ -0,0 +1,647 @@
+/*
+ * 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_RENDERVIEWPORT_H
+#define CRYINCLUDE_EDITOR_RENDERVIEWPORT_H
+
+#pragma once
+// RenderViewport.h : header file
+//
+
+#if !defined(Q_MOC_RUN)
+#include <Cry_Camera.h>
+
+#include <QSet>
+
+#include "Viewport.h"
+#include "Objects/DisplayContext.h"
+#include "Undo/Undo.h"
+#include "Util/PredefinedAspectRatios.h"
+
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/std/optional.h>
+#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/API/EditorCameraBus.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <MathConversion.h>
+#endif
+
+#include <AzFramework/Windowing/WindowBus.h>
+#include <AzFramework/Visibility/EntityVisibilityQuery.h>
+
+// forward declarations.
+class CBaseObject;
+class QMenu;
+class QKeyEvent;
+class EditorEntityNotifications;
+struct ray_hit;
+struct IRenderMesh;
+struct IVariable;
+
+namespace AzToolsFramework
+{
+    class ManipulatorManager;
+}
+
+// CRenderViewport window
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+class SANDBOX_API CRenderViewport
+    : public QtViewport
+    , public IEditorNotifyListener
+    , public IUndoManagerListener
+    , public Camera::EditorCameraRequestBus::Handler
+    , public AzFramework::InputSystemCursorConstraintRequestBus::Handler
+    , public AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler
+    , public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler
+    , public AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler
+    , public AzFramework::WindowRequestBus::Handler
+{
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    Q_OBJECT
+public:
+    struct SResolution
+    {
+        SResolution()
+            : width(0)
+            , height(0)
+        {
+        }
+
+        SResolution(int w, int h)
+            : width(w)
+            , height(h)
+        {
+        }
+
+        int width;
+        int height;
+    };
+
+public:
+    CRenderViewport(const QString& name, QWidget* parent = nullptr);
+
+    static const GUID& GetClassID()
+    {
+        return QtViewport::GetClassID<CRenderViewport>();
+    }
+
+    /** Get type of this viewport.
+    */
+    virtual EViewportType GetType() const { return ET_ViewportCamera; }
+    virtual void SetType([[maybe_unused]] EViewportType type) { assert(type == ET_ViewportCamera); };
+
+    // Implementation
+public:
+    virtual ~CRenderViewport();
+
+    Q_INVOKABLE void InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons);
+
+public:
+    virtual void Update();
+
+    virtual void ResetContent();
+    virtual void UpdateContent(int flags);
+
+    void OnTitleMenu(QMenu* menu) override;
+
+    void SetCamera(const CCamera& camera);
+    const CCamera& GetCamera() const { return m_Camera; };
+    virtual void SetViewTM(const Matrix34& tm)
+    {
+        if (m_viewSourceType == ViewSourceType::None)
+        {
+            m_defaultViewTM = tm;
+        }
+        SetViewTM(tm, false);
+    }
+
+    //! Map world space position to viewport position.
+    virtual QPoint WorldToView(const Vec3& wp) const;
+    virtual QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const;
+    virtual Vec3 WorldToView3D(const Vec3& wp, int nFlags = 0) const;
+
+    //! Map viewport position to world space position.
+    virtual Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
+    virtual void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
+    virtual Vec3 ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
+    virtual float GetScreenScaleFactor(const Vec3& worldPoint) const;
+    virtual float GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position);
+    virtual float GetAspectRatio() const;
+    virtual bool HitTest(const QPoint& point, HitContext& hitInfo);
+    virtual bool IsBoundsVisible(const AABB& box) const;
+    virtual void CenterOnSelection();
+    virtual void CenterOnAABB(const AABB& aabb);
+    void CenterOnSliceInstance() override;
+
+    void focusOutEvent(QFocusEvent* event) override;
+    void keyPressEvent(QKeyEvent* event) override;
+    void keyReleaseEvent(QKeyEvent* event) override;
+
+    void SetFOV(float fov);
+    float GetFOV() const;
+
+    void SetDefaultCamera();
+    bool IsDefaultCamera() const;
+    void SetSequenceCamera();
+    bool IsSequenceCamera() const { return m_viewSourceType == ViewSourceType::SequenceCamera; }
+    void SetSelectedCamera();
+    bool IsSelectedCamera() const;
+    void SetComponentCamera(const AZ::EntityId& entityId);
+    void SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement = false);
+    void SetFirstComponentCamera();
+    void SetViewEntity(const AZ::EntityId& cameraEntityId, bool lockCameraMovement = false);
+    void PostCameraSet();
+    // This switches the active camera to the next one in the list of (default, all custom cams).
+    void CycleCamera();
+
+    // Camera::EditorCameraRequestBus
+    void SetViewFromEntityPerspective(const AZ::EntityId& entityId) override;
+    void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
+    AZ::EntityId GetCurrentViewEntityId() override { return m_viewEntityId; }
+    bool GetActiveCameraPosition(AZ::Vector3& cameraPos) override;
+    bool GetActiveCameraState(AzFramework::CameraState& cameraState) override;
+
+    // AzToolsFramework::EditorEntityContextNotificationBus (handler moved to cpp to resolve link issues in unity builds)
+    virtual void OnStartPlayInEditor();
+    virtual void OnStopPlayInEditor();
+
+    // AzToolsFramework::EditorContextMenu::Bus (handler moved to cpp to resolve link issues in unity builds)
+    // We use this to determine when the viewport context menu is being displayed so we can exit move mode
+    void PopulateEditorGlobalContextMenu(QMenu* /*menu*/, const AZ::Vector2& /*point*/, int /*flags*/);
+
+    // AzToolsFramework::ViewportInteractionRequestBus
+    AzFramework::CameraState GetCameraState() override;
+    bool GridSnappingEnabled() override;
+    float GridSize() override;
+    bool ShowGrid() override;
+    bool AngleSnappingEnabled() override;
+    float AngleStep() override;
+    AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override;
+    AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint&, float) override
+    {
+        return {};
+    }
+    AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportScreenToWorldRay(
+        const AzFramework::ScreenPoint&) override
+    {
+        return {};
+    }
+    float DeviceScalingFactor() override { return 1.0f; }
+
+    // AzToolsFramework::ViewportFreezeRequestBus
+    bool IsViewportInputFrozen() override;
+    void FreezeViewportInput(bool freeze) override;
+
+    // AzToolsFramework::MainEditorViewportInteractionRequestBus
+    AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) override;
+    AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override;
+    float TerrainHeight(const AZ::Vector2& position) override;
+    void FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut) override;
+    bool ShowingWorldSpace() override;
+    QWidget* GetWidgetForViewportContextMenu() override;
+    void BeginWidgetContext() override;
+    void EndWidgetContext() override;
+
+    // WindowRequestBus::Handler...
+    void SetWindowTitle(const AZStd::string& title) override;
+    AzFramework::WindowSize GetClientAreaSize() const override;
+    void ResizeClientArea(AzFramework::WindowSize) override;
+    bool GetFullScreenState() const override;
+    void SetFullScreenState(bool fullScreenState) override;
+    bool CanToggleFullScreenState() const override;
+    void ToggleFullScreenState() override;
+
+    void ConnectViewportInteractionRequestBus();
+    void DisconnectViewportInteractionRequestBus();
+
+    void ActivateWindowAndSetFocus();
+
+    void LockCameraMovement(bool bLock) { m_bLockCameraMovement = bLock; }
+    bool IsCameraMovementLocked() const { return m_bLockCameraMovement; }
+
+    void EnableCameraObjectMove(bool bMove) { m_bMoveCameraObject = bMove; }
+    bool IsCameraObjectMove() const { return m_bMoveCameraObject; }
+
+    void SetPlayerControl(uint32 i) { m_PlayerControl = i; };
+    uint32 GetPlayerControl() { return m_PlayerControl; };
+
+    const DisplayContext& GetDisplayContext() const { return m_displayContext; }
+    CBaseObject* GetCameraObject() const;
+
+    QPoint WidgetToViewport(const QPoint& point) const;
+    QPoint ViewportToWidget(const QPoint& point) const;
+    QSize WidgetToViewport(const QSize& size) const;
+
+    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+
+    void SetPlayerPos()
+    {
+        Matrix34 m = GetViewTM();
+        m.SetTranslation(m.GetTranslation() - m_PhysicalLocation.t);
+        SetViewTM(m);
+
+        m_AverageFrameTime = 0.14f;
+
+        m_PhysicalLocation.SetIdentity();
+
+        m_LocalEntityMat.SetIdentity();
+        m_PrevLocalEntityMat.SetIdentity();
+
+        m_absCameraHigh = 2.0f;
+        m_absCameraPos = Vec3(0, 3, 2);
+        m_absCameraPosVP = Vec3(0, -3, 1.5);
+
+        m_absCurrentSlope = 0.0f;
+
+        m_absLookDirectionXY = Vec2(0, 1);
+
+        m_LookAt = Vec3(ZERO);
+        m_LookAtRate = Vec3(ZERO);
+        m_vCamPos = Vec3(ZERO);
+        m_vCamPosRate = Vec3(ZERO);
+
+        m_relCameraRotX = 0;
+        m_relCameraRotZ = 0;
+
+        uint32 numSample6 = m_arrAnimatedCharacterPath.size();
+        for (uint32 i = 0; i < numSample6; i++)
+        {
+            m_arrAnimatedCharacterPath[i] = Vec3(ZERO);
+        }
+
+        numSample6 = m_arrSmoothEntityPath.size();
+        for (uint32 i = 0; i < numSample6; i++)
+        {
+            m_arrSmoothEntityPath[i] = Vec3(ZERO);
+        }
+
+        uint32 numSample7 = m_arrRunStrafeSmoothing.size();
+        for (uint32 i = 0; i < numSample7; i++)
+        {
+            m_arrRunStrafeSmoothing[i] = 0;
+        }
+
+        m_vWorldDesiredBodyDirection = Vec2(0, 1);
+        m_vWorldDesiredBodyDirectionSmooth = Vec2(0, 1);
+        m_vWorldDesiredBodyDirectionSmoothRate = Vec2(0, 1);
+
+        m_vWorldDesiredBodyDirection2 = Vec2(0, 1);
+
+        m_vWorldDesiredMoveDirection = Vec2(0, 1);
+        m_vWorldDesiredMoveDirectionSmooth = Vec2(0, 1);
+        m_vWorldDesiredMoveDirectionSmoothRate = Vec2(0, 1);
+        m_vLocalDesiredMoveDirection = Vec2(0, 1);
+        m_vLocalDesiredMoveDirectionSmooth = Vec2(0, 1);
+        m_vLocalDesiredMoveDirectionSmoothRate = Vec2(0, 1);
+
+        m_vWorldAimBodyDirection = Vec2(0, 1);
+
+        m_MoveSpeedMSec = 5.0f;
+        m_key_W = 0;
+        m_keyrcr_W = 0;
+        m_key_S = 0;
+        m_keyrcr_S = 0;
+        m_key_A = 0;
+        m_keyrcr_A = 0;
+        m_key_D = 0;
+        m_keyrcr_D = 0;
+        m_key_SPACE = 0;
+        m_keyrcr_SPACE = 0;
+        m_ControllMode = 0;
+
+        m_State = -1;
+        m_Stance = 1; //combat
+
+        m_udGround = 0.0f;
+        m_lrGround = 0.0f;
+        AABB aabb = AABB(Vec3(-40.0f, -40.0f, -0.25f), Vec3(+40.0f, +40.0f, +0.0f));
+        m_GroundOBB = OBB::CreateOBBfromAABB(Matrix33(IDENTITY), aabb);
+        m_GroundOBBPos = Vec3(0, 0, -0.01f);
+    };
+
+    static CRenderViewport* GetPrimaryViewport();
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    CCamera m_Camera;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+protected:
+    struct SScopedCurrentContext;
+
+    void SetViewTM(const Matrix34& tm, bool bMoveOnly);
+
+    virtual float GetCameraMoveSpeed() const;
+    virtual float GetCameraRotateSpeed() const;
+    virtual bool  GetCameraInvertYRotation() const;
+    virtual float GetCameraInvertPan() const;
+
+    // Called to render stuff.
+    virtual void OnRender();
+
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
+
+    //! Get currently active camera object.
+    void ToggleCameraObject();
+
+    void RenderConstructionPlane();
+    void RenderSnapMarker();
+    void RenderCursorString();
+    void RenderSnappingGrid();
+    void ProcessMouse();
+    void ProcessKeys();
+
+    void RenderAll();
+    void DrawAxis();
+    void DrawBackground();
+    void InitDisplayContext();
+    void ResetCursor();
+
+    struct SPreviousContext
+    {
+        CCamera rendererCamera;
+        HWND window;
+        int width;
+        int height;
+        bool mainViewport;
+    };
+
+    SPreviousContext m_preWidgetContext;
+
+    // Create an auto-sized render context that is sized based on the Editor's current
+    // viewport.
+    SPreviousContext SetCurrentContext() const;
+
+    SPreviousContext SetCurrentContext(int newWidth, int newHeight) const;
+    void RestorePreviousContext(const SPreviousContext& x) const;
+
+    void PreWidgetRendering() override;
+    void PostWidgetRendering() override;
+
+    // Update the safe frame, safe action, safe title, and borders rectangles based on
+    // viewport size and target aspect ratio.
+    void UpdateSafeFrame();
+
+    // Draw safe frame, safe action, safe title rectangles and borders.
+    void RenderSafeFrame();
+
+    // Draw one of the safe frame rectangles with the desired color.
+    void RenderSafeFrame(const QRect& frame, float r, float g, float b, float a);
+
+    // Draw the selection rectangle.
+    void RenderSelectionRectangle();
+
+    // Draw a selected region if it has been selected
+    void RenderSelectedRegion();
+
+    virtual bool CreateRenderContext();
+    virtual void DestroyRenderContext();
+
+    void OnMenuCommandChangeAspectRatio(unsigned int commandId);
+
+    bool AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const;
+    bool RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal) const;
+
+    bool AddCameraMenuItems(QMenu* menu);
+    void ResizeView(int width, int height);
+
+    void OnCameraFOVVariableChanged(IVariable* var);
+
+    void HideCursor();
+    void ShowCursor();
+
+    bool IsKeyDown(Qt::Key key) const;
+
+    enum class ViewSourceType
+    {
+        None,
+        SequenceCamera,
+        LegacyCamera,
+        CameraComponent,
+        AZ_Entity,
+        ViewSourceTypesCount,
+    };
+    void ResetToViewSourceType(const ViewSourceType& viewSourType);
+
+    //! Assigned renderer.
+    IRenderer*  m_renderer = nullptr;
+    bool m_bRenderContextCreated = false;
+    bool m_bInRotateMode = false;
+    bool m_bInMoveMode = false;
+    bool m_bInOrbitMode = false;
+    bool m_bInZoomMode = false;
+
+    QPoint m_mousePos = QPoint(0, 0);
+    QPoint m_prevMousePos = QPoint(0, 0);  // for tablets, you can't use SetCursorPos and need to remember the prior point and delta with that.
+
+
+    float m_moveSpeed = 1;
+
+    float m_orbitDistance = 10.0f;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Vec3 m_orbitTarget;
+
+    //-------------------------------------------
+    //---   player-control in CharEdit        ---
+    //-------------------------------------------
+    f32 m_MoveSpeedMSec;
+
+    uint32 m_key_W, m_keyrcr_W;
+    uint32 m_key_S, m_keyrcr_S;
+    uint32 m_key_A, m_keyrcr_A;
+    uint32 m_key_D, m_keyrcr_D;
+
+    uint32 m_key_SPACE, m_keyrcr_SPACE;
+    uint32 m_ControllMode;
+
+    int32 m_Stance;
+    int32 m_State;
+    f32 m_AverageFrameTime;
+
+    uint32 m_PlayerControl = 0;
+
+    f32 m_absCameraHigh;
+    Vec3 m_absCameraPos;
+    Vec3 m_absCameraPosVP;
+
+    f32  m_absCurrentSlope;  //in radiants
+
+    Vec2 m_absLookDirectionXY;
+
+    Vec3 m_LookAt;
+    Vec3 m_LookAtRate;
+    Vec3 m_vCamPos;
+    Vec3 m_vCamPosRate;
+    float m_camFOV;
+
+    f32 m_relCameraRotX;
+    f32 m_relCameraRotZ;
+
+    QuatTS m_PhysicalLocation;
+
+    Matrix34 m_AnimatedCharacterMat;
+
+    Matrix34 m_LocalEntityMat;  //this is used for data-driven animations where the character is running on the spot
+    Matrix34 m_PrevLocalEntityMat;
+
+    std::vector<Vec3> m_arrVerticesHF;
+    std::vector<vtx_idx> m_arrIndicesHF;
+
+    std::vector<Vec3> m_arrAnimatedCharacterPath;
+    std::vector<Vec3> m_arrSmoothEntityPath;
+    std::vector<f32> m_arrRunStrafeSmoothing;
+
+    Vec2 m_vWorldDesiredBodyDirection;
+    Vec2 m_vWorldDesiredBodyDirectionSmooth;
+    Vec2 m_vWorldDesiredBodyDirectionSmoothRate;
+
+    Vec2 m_vWorldDesiredBodyDirection2;
+
+
+    Vec2 m_vWorldDesiredMoveDirection;
+    Vec2 m_vWorldDesiredMoveDirectionSmooth;
+    Vec2 m_vWorldDesiredMoveDirectionSmoothRate;
+    Vec2 m_vLocalDesiredMoveDirection;
+    Vec2 m_vLocalDesiredMoveDirectionSmooth;
+    Vec2 m_vLocalDesiredMoveDirectionSmoothRate;
+    Vec2 m_vWorldAimBodyDirection;
+
+    f32 m_udGround;
+    f32 m_lrGround;
+    OBB m_GroundOBB;
+    Vec3 m_GroundOBBPos;
+
+    // Index of camera objects.
+    mutable GUID m_cameraObjectId = GUID_NULL;
+    mutable AZ::EntityId m_viewEntityId;
+    mutable ViewSourceType m_viewSourceType = ViewSourceType::None;
+    AZ::EntityId m_viewEntityIdCachedForEditMode;
+    Matrix34 m_preGameModeViewTM;
+    uint m_disableRenderingCount = 0;
+    bool m_bLockCameraMovement;
+    bool m_bUpdateViewport = false;
+    bool m_bMoveCameraObject = true;
+
+    enum class KeyPressedState
+    {
+        AllUp,
+        PressedThisFrame,
+        PressedInPreviousFrame,
+    };
+    KeyPressedState m_pressedKeyState = KeyPressedState::AllUp;
+
+    Matrix34 m_defaultViewTM;
+    const QString m_defaultViewName;
+
+    DisplayContext m_displayContext;
+
+
+    bool m_isOnPaint = false;
+    static CRenderViewport* m_pPrimaryViewport;
+
+    QRect m_safeFrame;
+    QRect m_safeAction;
+    QRect m_safeTitle;
+
+    CPredefinedAspectRatios m_predefinedAspectRatios;
+
+    IVariable* m_pCameraFOVVariable = nullptr;
+    bool m_bCursorHidden = false;
+
+    void OnMenuResolutionCustom();
+    void OnMenuCreateCameraEntityFromCurrentView();
+    void OnMenuSelectCurrentCamera();
+
+    int OnCreate();
+    void resizeEvent(QResizeEvent* event) override;
+    void paintEvent(QPaintEvent* event) override;
+    void mousePressEvent(QMouseEvent* event) override;
+    void OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+    void OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point) override;
+    void OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta, const QPoint& pt) override;
+
+    // From a series of input primitives, compose a complete mouse interaction.
+    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteractionInternal(
+        AzToolsFramework::ViewportInteraction::MouseButtons buttons,
+        AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
+        const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const;
+    // Given a point in the viewport, return the pick ray into the scene.
+    // note: The argument passed to parameter **point**, originating
+    // from a Qt event, must first be passed to WidgetToViewport before being
+    // passed to BuildMousePick.
+    AzToolsFramework::ViewportInteraction::MousePick BuildMousePick(const QPoint& point);
+
+    bool event(QEvent* event) override;
+    void OnDestroy();
+
+    bool CheckRespondToInput() const;
+
+    // AzFramework::InputSystemCursorConstraintRequestBus
+    void* GetSystemCursorConstraintWindow() const override;
+
+    void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) override;
+
+private:
+    void ProcessKeyRelease(QKeyEvent* event);
+    void PushDisableRendering();
+    void PopDisableRendering();
+    bool IsRenderingDisabled() const;
+    AzToolsFramework::ViewportInteraction::MousePick BuildMousePickInternal(
+        const QPoint& point) const;
+
+    void RestoreViewportAfterGameMode();
+
+    double WidgetToViewportFactor() const
+    {
+#if defined(AZ_PLATFORM_WINDOWS)
+        // Needed for high DPI mode on windows
+        return devicePixelRatioF();
+#else
+        return 1.0f;
+#endif
+    }
+
+    void BeginUndoTransaction() override;
+    void EndUndoTransaction() override;
+
+    void UpdateCurrentMousePos(const QPoint& newPosition);
+
+    AzFramework::EntityVisibilityQuery m_entityVisibilityQuery;
+
+    SPreviousContext m_previousContext;
+    QSet<int> m_keyDown;
+
+    bool m_freezeViewportInput = false;
+
+    size_t m_cameraSetForWidgetRenderingCount = 0; ///< How many calls to PreWidgetRendering happened before
+                                                   ///< subsequent calls to PostWidetRendering.
+    AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager;
+
+    // Used to prevent circular set camera events
+    bool m_ignoreSetViewFromEntityPerspective = false;
+    bool m_windowResizedEvent = false;
+
+    // Cache hwnd value for teardown to avoid infinite loops in retrieving it from destroyed widgets.
+    HWND m_hwnd;
+
+    AZStd::unique_ptr<EditorEntityNotifications> m_editorEntityNotifications;
+
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif // CRYINCLUDE_EDITOR_RENDERVIEWPORT_H
diff --git a/Code/Editor/RenderViewport_mac.mm b/Code/Editor/RenderViewport_mac.mm
new file mode 100644
index 0000000000..d078ad03dd
--- /dev/null
+++ b/Code/Editor/RenderViewport_mac.mm
@@ -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
+ *
+ */
+
+#include <QAbstractNativeEventFilter>
+#include <QApplication>
+
+#include <Carbon/Carbon.h>
+#include <Cocoa/Cocoa.h>
+
+class HiddenMouseNativeEventFilter : public QAbstractNativeEventFilter
+{
+public:
+    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override
+    {
+        assert(eventType == "mac_generic_NSEvent");
+        NSEvent *event = (NSEvent *)message;
+        switch ([event type])
+        {
+        case NSEventTypeRightMouseDragged:
+            sendFakeMouseMoveEvent([event deltaX], [event deltaY], Qt::RightButton);
+            return true;
+        case NSEventTypeOtherMouseDragged:
+            sendFakeMouseMoveEvent([event deltaX], [event deltaY], Qt::MiddleButton);
+            return true;
+        default:
+            return false;
+        }
+    }
+
+    void sendFakeMouseMoveEvent(int deltaX, int deltaY, Qt::MouseButtons buttons)
+    {
+        assert(m_target);
+        QMetaObject::invokeMethod(m_target, "InjectFakeMouseMove", Q_ARG(int, deltaX), Q_ARG(int, deltaY), Q_ARG(Qt::MouseButtons, buttons));
+    }
+
+    QObject *m_target = nullptr;
+};
+
+Q_GLOBAL_STATIC(HiddenMouseNativeEventFilter, eventFilter)
+
+void StopFixedCursorMode()
+{
+    qApp->removeNativeEventFilter(eventFilter());
+    eventFilter()->m_target = nullptr;
+    CGAssociateMouseAndMouseCursorPosition(true);
+}
+
+void StartFixedCursorMode(QObject* viewport)
+{
+    CGAssociateMouseAndMouseCursorPosition(false);
+    eventFilter()->m_target = viewport;
+    qApp->installNativeEventFilter(eventFilter());
+}
diff --git a/Code/Editor/Report.h b/Code/Editor/Report.h
new file mode 100644
index 0000000000..e2f13b38a0
--- /dev/null
+++ b/Code/Editor/Report.h
@@ -0,0 +1,182 @@
+/*
+ * 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 : Generic report class, which contains arbitrary report entries.
+
+#ifndef CRYINCLUDE_EDITOR_REPORT_H
+#define CRYINCLUDE_EDITOR_REPORT_H
+#pragma once
+
+
+class IReportField
+{
+public:
+    virtual ~IReportField() {}
+
+    virtual const char* GetDescription() const = 0;
+    virtual const char* GetText() const = 0;
+};
+
+template <typename T, typename G>
+class CReportField
+    : public IReportField
+{
+public:
+    typedef T Object;
+    typedef G TextGetter;
+
+    CReportField(Object& object, const char* description, TextGetter& getter);
+    virtual const char* GetDescription() const;
+    virtual const char* GetText() const;
+
+private:
+    TextGetter m_getter;
+    string m_text;
+    string m_description;
+};
+
+class IReportRecord
+{
+public:
+    virtual ~IReportRecord() {}
+    virtual int GetFieldCount() const = 0;
+    virtual const char* GetFieldDescription(int fieldIndex) const = 0;
+    virtual const char* GetFieldText(int fieldIndex) const = 0;
+};
+
+template <typename T>
+class CReportRecord
+    : public IReportRecord
+{
+public:
+    typedef T Object;
+
+    CReportRecord(Object& object);
+    virtual ~CReportRecord();
+    virtual int GetFieldCount() const;
+    virtual const char* GetFieldDescription(int fieldIndex) const;
+    virtual const char* GetFieldText(int fieldIndex) const;
+    template <typename G>
+    CReportField<Object, G>* AddField(const char* description, G& getter);
+
+private:
+    Object m_object;
+    typedef std::vector<IReportField*> FieldContainer;
+    FieldContainer m_fields;
+};
+
+class CReport
+{
+public:
+    ~CReport();
+    template <typename T>
+    CReportRecord<T>* AddRecord(T& object);
+    int GetRecordCount() const;
+    IReportRecord* GetRecord(int recordIndex);
+    void Clear();
+
+private:
+    typedef std::vector<IReportRecord*> RecordContainer;
+    RecordContainer m_records;
+};
+
+template <typename T, typename G>
+inline CReportField<T, G>::CReportField(Object& object, const char* description, TextGetter& getter)
+    :   m_getter(getter)
+    , m_description(description)
+{
+    m_text = m_getter(object);
+}
+
+template <typename T, typename G>
+inline const char* CReportField<T, G>::GetDescription() const
+{
+    return m_description.c_str();
+}
+
+template <typename T, typename G>
+inline const char* CReportField<T, G>::GetText() const
+{
+    return m_text.c_str();
+}
+
+template <typename T>
+inline CReportRecord<T>::CReportRecord(Object& object)
+    :   m_object(object)
+{
+}
+
+template <typename T>
+inline CReportRecord<T>::~CReportRecord()
+{
+    for (FieldContainer::iterator it = m_fields.begin(); it != m_fields.end(); ++it)
+    {
+        delete (*it);
+    }
+}
+
+template <typename T>
+inline int CReportRecord<T>::GetFieldCount() const
+{
+    return m_fields.size();
+}
+
+template <typename T>
+inline const char* CReportRecord<T>::GetFieldDescription(int fieldIndex) const
+{
+    return m_fields[fieldIndex]->GetDescription();
+}
+
+template <typename T>
+inline const char* CReportRecord<T>::GetFieldText(int fieldIndex) const
+{
+    return m_fields[fieldIndex]->GetText();
+}
+
+template <typename T>
+template <typename G>
+inline CReportField<T, G>* CReportRecord<T>::AddField(const char* description, G& getter)
+{
+    CReportField<Object, G>* field = new CReportField<Object, G>(m_object, description, getter);
+    m_fields.push_back(field);
+    return field;
+}
+
+inline CReport::~CReport()
+{
+    Clear();
+}
+
+template <typename T>
+inline CReportRecord<T>* CReport::AddRecord(T& object)
+{
+    CReportRecord<T>* record = new CReportRecord<T>(object);
+    m_records.push_back(record);
+    return record;
+}
+
+inline int CReport::GetRecordCount() const
+{
+    return m_records.size();
+}
+
+inline IReportRecord* CReport::GetRecord(int recordIndex)
+{
+    return m_records[recordIndex];
+}
+
+inline void CReport::Clear()
+{
+    for (RecordContainer::iterator it = m_records.begin(); it != m_records.end(); ++it)
+    {
+        delete (*it);
+    }
+    m_records.clear();
+}
+
+#endif // CRYINCLUDE_EDITOR_REPORT_H
diff --git a/Code/Editor/ResizeResolutionDialog.cpp b/Code/Editor/ResizeResolutionDialog.cpp
new file mode 100644
index 0000000000..97e1b35c28
--- /dev/null
+++ b/Code/Editor/ResizeResolutionDialog.cpp
@@ -0,0 +1,118 @@
+/*
+ * 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 "ResizeResolutionDialog.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_ResizeResolutionDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+class ResizeResolutionModel
+    : public QAbstractListModel
+{
+public:
+    ResizeResolutionModel(QObject* parent = nullptr);
+
+    int rowCount(const QModelIndex& parent = {}) const override;
+    int columnCount(const QModelIndex& parent = {}) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+
+    int SizeRow(uint32 dwSize) const;
+
+private:
+    static const int kNumSizes = 6;
+};
+
+ResizeResolutionModel::ResizeResolutionModel(QObject* parent)
+    : QAbstractListModel(parent)
+{
+}
+
+int ResizeResolutionModel::rowCount(const QModelIndex& parent) const
+{
+    return parent.isValid() ? 0 : kNumSizes;
+}
+
+int ResizeResolutionModel::columnCount(const QModelIndex& parent) const
+{
+    return parent.isValid() ? 0 : 1;
+}
+
+QVariant ResizeResolutionModel::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid() || index.column() > 0 || index.row() >= kNumSizes)
+    {
+        return {};
+    }
+
+    const int size = 64 * (1 << index.row());
+
+    switch (role)
+    {
+    case Qt::DisplayRole:
+        return QStringLiteral("%1x%2").arg(size).arg(size);
+
+    case Qt::UserRole:
+        return size;
+    }
+
+    return {};
+}
+
+int ResizeResolutionModel::SizeRow(uint32 dwSize) const
+{
+    // not a power of 2?
+    if (dwSize & (dwSize - 1))
+    {
+        return 0;
+    }
+
+    int row = 0;
+
+    for (auto i = dwSize / 64; i > 1; i >>= 1)
+    {
+        ++row;
+    }
+
+    return row;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CResizeResolutionDialog dialog
+
+
+CResizeResolutionDialog::CResizeResolutionDialog(QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_model(new ResizeResolutionModel(this))
+    , ui(new Ui::CResizeResolutionDialog)
+{
+    ui->setupUi(this);
+
+    ui->m_resolution->setModel(m_model);
+
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+}
+
+CResizeResolutionDialog::~CResizeResolutionDialog()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CResizeResolutionDialog::SetSize(uint32 dwSize)
+{
+    ui->m_resolution->setCurrentIndex(m_model->SizeRow(dwSize));
+}
+
+/////////////////////////////////////////////////////////////////////////////
+uint32 CResizeResolutionDialog::GetSize()
+{
+    return ui->m_resolution->itemData(ui->m_resolution->currentIndex()).toInt();
+}
diff --git a/Code/Editor/ResizeResolutionDialog.h b/Code/Editor/ResizeResolutionDialog.h
new file mode 100644
index 0000000000..0655bc0026
--- /dev/null
+++ b/Code/Editor/ResizeResolutionDialog.h
@@ -0,0 +1,45 @@
+/*
+ * 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_RESIZERESOLUTIONDIALOG_H
+#define CRYINCLUDE_EDITOR_RESIZERESOLUTIONDIALOG_H
+
+#pragma once
+// ResizeResolutionDialog.h : header file
+//
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui {
+    class CResizeResolutionDialog;
+}
+
+class ResizeResolutionModel;
+
+/////////////////////////////////////////////////////////////////////////////
+// CResizeResolutionDialog dialog
+
+class CResizeResolutionDialog
+    : public QDialog
+{
+    // Construction
+public:
+    CResizeResolutionDialog(QWidget* pParent = nullptr);   // standard constructor
+    ~CResizeResolutionDialog();
+
+    void SetSize(uint32 dwSize);
+    uint32 GetSize();
+
+private:
+    ResizeResolutionModel* m_model;
+    QScopedPointer<Ui::CResizeResolutionDialog> ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_RESIZERESOLUTIONDIALOG_H
diff --git a/Code/Sandbox/Editor/ResizeResolutionDialog.ui b/Code/Editor/ResizeResolutionDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/ResizeResolutionDialog.ui
rename to Code/Editor/ResizeResolutionDialog.ui
diff --git a/Code/Editor/Resource.h b/Code/Editor/Resource.h
new file mode 100644
index 0000000000..37a15e3179
--- /dev/null
+++ b/Code/Editor/Resource.h
@@ -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
+
+#define ID_FILE_NEW       0xE100
+#define ID_FILE_SAVE_AS   0xE104
+#define ID_FILE_MRU_FIRST 0xE110
+#define ID_FILE_MRU_FILE1 0xE110
+#define ID_FILE_MRU_LAST  0xE11F
+#define ID_EDIT_COPY      0xE122
+#define ID_EDIT_CUT       0xE123
+#define ID_EDIT_PASTE     0xE125
+#define ID_APP_ABOUT      0xE140
+#define ID_APP_EXIT       0xE141
+#define ID_APP_SHOW_WELCOME    0xE142
+#define IDD_TRACKVIEWDIALOG                        19
+#define IDD_DATABASE                               140
+#define IDR_DB_LIBRARY_ITEM_BAR                    141
+#define IDR_DB_MATERIAL_BAR                        142
+#define IDR_DB_ENTITY                              147
+#define IDD_DB_ENTITY                              149
+#define IDI_BALL_ONLINE                            315
+#define IDI_BALL_OFFLINE                           316
+#define IDI_BALL_PENDING                           395
+#define IDI_BALL_DISABLED                          396
+#define IDR_DB_PARTICLES_BAR                       410
+#define IDR_DB_LIBRARY_BAR                         455
+#define IDR_DB_STANDART                            456
+#define IDC_ZOOM_INTERNAL                          1052
+#define IDC_BRUSH_INTERNAL                         1053
+#define IDC_ARRBLCK                                1054
+#define IDC_ARRBLCKCROSS                           1055
+#define IDC_ARRWHITE                               1056
+#define IDC_COLOR_PICKER                           1057
+#define IDC_HIT_CURSOR                             1058
+#define IDC_ARROW_ADDKEY                           1059
+#define IDC_LEFTRIGHT                              1060
+#define IDC_POINTER_OBJHIT                         1061
+#define IDC_POINTER_LINK                           1062
+#define IDC_POINTER_LINKNOW                        1063
+#define IDC_POINTER_PLUS                           1064
+#define IDC_POINTER_OBJECT_ROTATE                  1065
+#define IDC_POINTER_OBJECT_SCALE                   1066
+#define IDC_POINTER_OBJECT_MOVE                    1067
+#define IDC_POINTER_MINUS                          1068
+#define IDC_POINTER_GET_HEIGHT                     1069
+#define IDC_POINTER_FLATTEN                        1070
+#define IDC_POINTER_SMOOTH                         1071
+#define IDC_POINTER_DRAG_ITEM                      1077
+#define IDC_CURSOR_HAND_DRAG                       1078
+#define IDC_CURSOR_HAND_FINGER                     1079
+#define IDC_ARROW_UP                               1080
+#define IDC_ARROW_DOWN                             1081
+#define IDC_ARROW_DOWNRIGHT                        1082
+#define IDC_ARROW_UPRIGHT                          1083
+#define IDC_NEW                                    1578
+#define IDC_POINTER_SO_SELECT                      1891
+#define IDC_HAND_INTERNAL                          1998
+#define IDC_POINTER_SO_SELECT_PLUS                 1999
+#define IDC_POINTER_SO_SELECT_MINUS                2000
+#define IDC_SELECTION                              2634
+#define IDC_SELECTION_MASK                         2637
+#define IDC_PLATFORM_PROVO                         2758
+#define IDC_PLATFORM_SALEM                         2759
+#define IDC_GROUPBOX_GLOBALTAGS                    2916
+#define IDC_GROUPBOX_FRAGMENTTAGS                  2917
+#define ID_RESOURCES_REDUCEWORKINGSET              32896
+#define ID_EDIT_HIDE                               32898
+#define ID_EDIT_UNHIDEALL                          32899
+#define ID_RELOAD_TERRAIN                          32902
+#define ID_VIEW_CONFIGURELAYOUT                    32906
+#define ID_TOOLS_LOGMEMORYUSAGE                    32908
+#define ID_TERRAIN_EXPORTBLOCK                     32909
+#define ID_TERRAIN_IMPORTBLOCK                     32910
+#define ID_TOOLS_CONFIGURETOOLS                    32911
+#define ID_TOOLS_TOOL1                             32913
+#define ID_TOOLS_CUSTOMIZEKEYBOARD                 32914
+#define ID_EXPORT_INDOORS                          32915
+#define ID_VIEW_CYCLE2DVIEWPORT                    32916
+#define ID_SNAPANGLE                               32917
+#define ID_PHYSICS_GETPHYSICSSTATE                 32937
+#define ID_PHYSICS_RESETPHYSICSSTATE               32938
+#define ID_GAME_SYNCPLAYER                         32941
+#define ID_FILE_SAVELEVELRESOURCES                 32942
+#define ID_VALIDATELEVEL                           32943
+#define ID_TERRAIN_RESIZE                          32944
+#define ID_TERRAIN_COLLISION                       32960
+#define ID_TOOL_FIRST                              32972
+#define ID_EDIT_UNFREEZE                           32973
+#define ID_EDIT_UNHIDE                             32974
+#define ID_TOOL_LAST                               33173
+#define ID_TOOL_SHELVE_FIRST                       33174
+#define ID_TOOL_SHELVE_LAST                        33375
+#define ID_EDIT_SELECTALL                          33376
+#define ID_WIREFRAME                               33410
+#define ID_FILE_GENERATETERRAINTEXTURE             33445
+#define ID_GENERATORS_TEXTURE                      33448
+#define ID_FILE_IMPORT                             33457
+#define ID_EDIT_HOLD                               33464
+#define ID_EDIT_FETCH                              33465
+#define ID_FILE_EXPORTTOGAMENOSURFACETEXTURE       33473
+#define ID_VIEW_SWITCHTOGAME                       33477
+#define ID_VIEW_SWITCHTOGAME_FULLSCREEN            33478
+#define ID_EDIT_DELETE                             33480
+#define ID_MOVE_OBJECT                             33481
+#define ID_RENAME_OBJ                              33483
+#define ID_FETCH                                   33496
+#define ID_EDITMODE_ROTATE                         33506
+#define ID_EDITMODE_SCALE                          33507
+#define ID_EDITMODE_MOVE                           33508
+#define ID_SELECTION_DELETE                        33512
+#define ID_EDIT_ESCAPE                             33513
+#define ID_UNDO                                    33524
+#define ID_EDIT_CLONE                              33525
+#define ID_GOTO_SELECTED                           33535
+#define ID_EDIT_LEVELDATA                          33542
+#define ID_FILE_EDITEDITORINI                      33543
+#define ID_FILE_EDITLOGFILE                        33544
+#define ID_PREFERENCES                             33546
+#define ID_REDO                                    33550
+#define ID_SWITCH_PHYSICS                          33555
+#define ID_REF_COORDS_SYS                          33556
+#define ID_TV_ADDKEY                               33557
+#define ID_TV_DELKEY                               33558
+#define ID_TV_MOVEKEY                              33559
+#define ID_TV_SLIDEKEY                             33560
+#define ID_TV_SCALEKEY                             33561
+#define ID_TV_ADD_SEQUENCE                         33563
+#define ID_TV_DEL_SEQUENCE                         33564
+#define ID_TV_EDIT_SEQUENCE                        33565
+#define ID_TV_RECORD                               33566
+#define ID_TV_PLAY                                 33567
+#define ID_TV_STOP                                 33568
+#define ID_TV_PAUSE                                33569
+#define ID_ADDNODE                                 33570
+#define ID_ADDSCENETRACK                           33573
+#define ID_FIND                                    33574
+#define ID_SNAP_TO_GRID                            33575
+#define ID_TAG_LOC1                                33576
+#define ID_TAG_LOC2                                33577
+#define ID_TAG_LOC3                                33578
+#define ID_TAG_LOC4                                33579
+#define ID_TAG_LOC5                                33580
+#define ID_TAG_LOC6                                33581
+#define ID_TAG_LOC7                                33582
+#define ID_TAG_LOC8                                33583
+#define ID_TAG_LOC9                                33584
+#define ID_TAG_LOC10                               33585
+#define ID_TAG_LOC11                               33586
+#define ID_TAG_LOC12                               33587
+#define ID_GOTO_LOC1                               33588
+#define ID_GOTO_LOC2                               33589
+#define ID_GOTO_LOC3                               33590
+#define ID_GOTO_LOC4                               33591
+#define ID_GOTO_LOC5                               33592
+#define ID_GOTO_LOC6                               33593
+#define ID_GOTO_LOC7                               33594
+#define ID_GOTO_LOC8                               33595
+#define ID_GOTO_LOC9                               33596
+#define ID_GOTO_LOC10                              33597
+#define ID_GOTO_LOC11                              33598
+#define ID_GOTO_LOC12                              33599
+#define ID_TV_JUMPEND                              33600
+#define ID_TV_JUMPSTART                            33601
+#define ID_TV_PREVKEY                              33602
+#define ID_TV_NEXTKEY                              33603
+#define ID_PLAY_LOOP                               33607
+#define ID_TERRAIN                                 33611
+#define ID_PANEL_VEG_EXPORT                        33672
+#define ID_PANEL_VEG_IMPORT                        33673
+#define ID_PANEL_VEG_DISTRIBUTE                    33674
+#define ID_PANEL_VEG_SCALE                         33675
+#define ID_PANEL_VEG_ADD                           33676
+#define ID_PANEL_VEG_REMOVE                        33677
+#define ID_PANEL_VEG_CLEAR                         33678
+#define ID_PANEL_VEG_CLONE                         33679
+#define ID_PANEL_VEG_REPLACE                       33681
+#define ID_PANEL_VEG_ADDCATEGORY                   33682
+#define ID_PANEL_VEG_RENAMECATEGORY                33683
+#define ID_PANEL_VEG_REMOVECATEGORY                33684
+#define ID_TOOLS_PREFERENCES                       33691
+#define ID_EDIT_INVERTSELECTION                    33692
+#define ID_TOOLTERRAINMODIFY_SMOOTH                33695
+#define ID_TERRAINMODIFY_SMOOTH                    33696
+#define ID_TERRAIN_PAINTLAYERS                     33698
+#define ID_SWITCHCAMERA_DEFAULTCAMERA              33700
+#define ID_SWITCHCAMERA_SEQUENCECAMERA             33701
+#define ID_SWITCHCAMERA_SELECTEDCAMERA             33702
+#define ID_TV_RECORD_AUTO                          33703
+#define ID_GRAPHICS_SETTINGS                       33705
+#define ID_VIEW_OPENVIEWPANE                       33709
+#define ID_VIEW_OPENPANE_FIRST          33712
+#define ID_VIEW_OPENPANE_LAST           33811
+#define ID_OPEN_EMOTIONFX_EDITOR                   39742
+#define ID_BRUSH_CSGSUBSTRUCT                      33837
+#define ID_MATERIAL_PICKTOOL                       33842
+#define ID_MODIFY_AIPOINT_PICKIMPASSLINK           33865
+#define ID_DISPLAY_SHOWHELPERS                     33871
+#define ID_FILE_EXPORTSELECTION                    33875
+#define ID_EDIT_PASTE_WITH_LINKS                   33893
+#define ID_FILE_EXPORT_TERRAINAREA                 33904
+#define ID_FILE_EXPORT_TERRAINAREAWITHOBJECTS      33910
+#define ID_FILE_EXPORT_SELECTEDOBJECTS             33911
+#define ID_TERRAIN_TIMEOFDAY                       33912
+#define ID_SPLINE_PREVIOUS_KEY                     33916
+#define ID_SPLINE_NEXT_KEY                         33917
+#define ID_SPLINE_FLATTEN_ALL                      33918
+#define ID_TANGENT_UNIFY                           33920
+#define ID_TANGENT_IN_ZERO                         33921
+#define ID_TANGENT_IN_STEP                         33923
+#define ID_TANGENT_OUT_ZERO                        33924
+#define ID_TANGENT_OUT_STEP                        33926
+#define ID_TANGENT_AUTO                            33927
+#define ID_TANGENT_IN_LINEAR                       33928
+#define ID_TANGENT_OUT_LINEAR                      33929
+#define ID_FREEZE_KEYS                             33930
+#define ID_SPLINE_FIT_X                            33931
+#define ID_SPLINE_FIT_Y                            33932
+#define ID_SPLINE_SNAP_GRID_X                      33933
+#define ID_SPLINE_SNAP_GRID_Y                      33934
+#define ID_FREEZE_TANGENTS                         33935
+#define ID_GAME_PC_ENABLELOWSPEC                   33960
+#define ID_GAME_PC_ENABLEMEDIUMSPEC                33961
+#define ID_GAME_PC_ENABLEHIGHSPEC                  33962
+#define ID_GAME_PC_ENABLEVERYHIGHSPEC              33963
+#define ID_PANEL_VEG_CREATE_SEL                    33990
+#define ID_TOOLS_UPDATEPROCEDURALVEGETATION        33999
+#define ID_DISPLAY_GOTOPOSITION                    34004
+#define ID_PHYSICS_SIMULATEOBJECTS                 34007
+#define ID_TERRAIN_TEXTURE_EXPORT                  34008
+#define ID_TV_SEQUENCE_NEW                         34049
+#define ID_TV_MODE_DOPESHEET                       34052
+#define ID_VIEW_LAYOUTS                            34053
+#define ID_TV_MODE_CURVEEDITOR                     34054
+#define ID_OPEN_TRACKVIEW                          34063
+#define ID_SWITCHCAMERA_NEXT                       34065
+#define ID_TV_SNAP_NONE                            34068
+#define ID_TV_SNAP_MAGNET                          34069
+#define ID_TV_SNAP_FRAME                           34070
+#define ID_TV_SNAP_TICK                            34071
+#define ID_TV_SNAP_FPS                             34072
+#define ID_VIEW_TICKINSECONDS                      34075
+#define ID_VIEW_TICKINFRAMES                       34076
+#define ID_OPEN_ASSET_BROWSER                      34077
+#define ID_SNAP_TO_GRID_RANGE_BEGIN     34087
+#define ID_SNAP_TO_GRID_RANGE_END       34106
+#define ID_TOOLS_EXPORT_SHORTCUTS       34138
+#define ID_TOOLS_IMPORT_SHORTCUTS       34139
+#define ID_TOOLS_VALIDATEOBJECTPOSITIONS 34143
+#define ID_TOOLS_BATCH_RENDER           34151
+#define ID_TOOLS_SCRIPTHELP             34152
+#define ID_TV_MODE_OPENCURVEEDITOR      34153
+#define ID_TOOLS_LUA_EDITOR             34154
+#define ID_OPEN_QUICK_ACCESS_BAR                   34177
+#define ID_TRACKVIEW_TOGGLE_DISABLE                34178
+#define ID_TRACKVIEW_TOGGLE_MUTE                   34179
+#define ID_TRACKVIEW_MUTE_ALL                      34180
+#define ID_TRACKVIEW_UNMUTE_ALL                    34181
+#define ID_TV_TOOLS_CUSTOMIZETRACKCOLORS           34182
+#define ID_TOOLS_ENABLEFILECHANGEMONITORING        34185
+#define ID_FILE_OPEN_LEVEL                         34196
+#define ID_FILE_SAVE_LEVEL                         34197
+#define ID_TV_SYNC_TO_BASE                         34199
+#define ID_TV_SYNC_FROM_BASE                       34200
+#ifdef ENABLE_SLICE_EDITOR
+#define ID_FILE_NEW_SLICE                          34201
+#define ID_FILE_OPEN_SLICE                         34202
+#endif
+#define ID_FILE_SAVE_SELECTED_SLICE                34203
+#define ID_FILE_SAVESETTINGS                       34204
+#define ID_FILE_SAVE_SLICE_TO_ROOT                 34205
+#define ID_SET_TIME_TO_KEY                         34206
+#define ID_TOGGLE_SCRUB_UNITS                      34207
+#define ID_TOGGLE_PREVIEW_UNITS                    34208
+#define ID_FILE_EXPORTOCCLUSIONMESH                34209
+#define ID_MANN_RELOAD_ANIMS                       34210
+#define ID_FILE_ANIMDBEDITOR                       34211
+#define ID_SNAP_TO_ANGLE_RANGE_BEGIN    34323
+#define ID_SNAP_TO_ANGLE_RANGE_END      34330
+#define ID_MODIFY_GOTO_SELECTION        34358
+#define ID_VIEW_LAYOUT_FIRST            34363
+#define ID_VIEW_LAYOUT_LAST             34377
+#define ID_VIEW_SAVELAYOUT                         34438
+#define ID_VIEW_LAYOUT_LOAD_DEFAULT                34439
+#define ID_GAME_OSXGL_ENABLESPEC                   34449
+#define ID_GAME_OSXMETAL_ENABLESPEC                34450
+#define ID_CLEAR_REGISTRY                          34470
+#define ID_SOUND_STOPALLSOUNDS                     34476
+#define ID_AUDIO_REFRESH_AUDIO_SYSTEM              34477
+#define ID_GAME_ANDROID_ENABLELOWSPEC              34490
+#define ID_GAME_ANDROID_ENABLEMEDIUMSPEC           34491
+#define ID_GAME_ANDROID_ENABLEHIGHSPEC             34492
+#define ID_GAME_ANDROID_ENABLEVERYHIGHSPEC         34493
+#define ID_GAME_IOS_ENABLELOWSPEC                  34494
+#define ID_GAME_IOS_ENABLEMEDIUMSPEC               34495
+#define ID_GAME_IOS_ENABLEHIGHSPEC                 34496
+#define ID_GAME_IOS_ENABLEVERYHIGHSPEC             34497
+#define ID_OPEN_AUDIO_CONTROLS_BROWSER              34580
+#define ID_CREATE_GLOBAL_FG_MODULE_FROM_SELECTION                   35076
+#define ID_CREATE_LEVEL_FG_MODULE_FROM_SELECTION                    35077
+#define ID_GRAPHVIEW_ADD_BLACK_BOX                                  35078
+#define ID_GRAPHVIEW_UNGROUP                                        35079
+#define ID_FILE_PROJECT_MANAGER_NEW                                 35080
+#define ID_FILE_PROJECT_MANAGER_OPEN                                35081
+#define ID_FILE_PROJECT_MANAGER_SETTINGS                            35082
+#define ID_TV_TRACKS_TOOLBAR_BASE                                   35083               // range between ID_TV_TRACKS_TOOLBAR_BASE to ID_TV_TRACKS_TOOLBAR_LAST reserved
+#define ID_TV_TRACKS_TOOLBAR_LAST                                   35183               // for up to 100 "Add Tracks..." dynamically added Track View Track buttons
+#define ID_OPEN_TERRAIN_EDITOR          36007
+#define ID_OPEN_UICANVASEDITOR          36010
+#define ID_TERRAIN_TIMEOFDAYBUTTON      36011
+#define ID_OPEN_TERRAINTEXTURE_EDITOR   36012
+#define ID_SKINS_REFRESH                36014
+#define ID_FILE_GENERATETERRAIN         36016
+#define ID_DOCUMENTATION_GETTINGSTARTEDGUIDE    36023
+#define ID_DOCUMENTATION_TUTORIALS              36024
+#define ID_DOCUMENTATION_GLOSSARY               36025
+#define ID_DOCUMENTATION_O3DE                   36026
+#define ID_DOCUMENTATION_GAMELIFT               36027
+#define ID_DOCUMENTATION_RELEASENOTES           36028
+#define ID_DOCUMENTATION_GAMEDEVBLOG            36029
+#define ID_DOCUMENTATION_TWITCHCHANNEL          36030
+#define ID_DOCUMENTATION_FORUMS                 36031
+#define ID_DOCUMENTATION_AWSSUPPORT             36032
+#define ID_DOCUMENTATION_FEEDBACK                    36043
+#define ID_OPEN_SUBSTANCE_EDITOR                     36060
+#define ID_IMPORT_ASSET                              36069
+#define ID_EDIT_PIVOT                                36203
+#define ID_EDIT_RESET                                36204
+#define ID_EDIT_RESET_LOCAL                          36205
+#define ID_EDIT_RESET_WORLD                          36206
+#define ID_EDIT_RESET_MANIPULATOR                    36207
+#define ID_GAME_PROVO_ENABLELOWSPEC                   34603
+#define ID_GAME_PROVO_ENABLEMEDIUMSPEC                34604
+#define ID_GAME_PROVO_ENABLEHIGHSPEC                  34605
+#define ID_GAME_OSXMETAL_ENABLELOWSPEC              34606
+#define ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC           34607
+#define ID_GAME_OSXMETAL_ENABLEHIGHSPEC             34608
+#define ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC         34609
+#define ID_GAME_SALEM_ENABLELOWSPEC                 34610
+#define ID_GAME_SALEM_ENABLEMEDIUMSPEC              34611
+#define ID_GAME_SALEM_ENABLEHIGHSPEC                34612
+#define ID_GAME_JASPER_ENABLELOWSPEC                34613
+#define ID_GAME_JASPER_ENABLEMEDIUMSPEC             34614
+#define ID_GAME_JASPER_ENABLEHIGHSPEC               34615
+#define ID_FILE_RESAVESLICES                        36210
+#define FIRST_QT_ACTION                      50000
+#define ID_VIEW_CONSOLEWINDOW                50001
+#define ID_TOOLBAR_SEPARATOR                 50002
+#define ID_TOOLBAR_WIDGET_FIRST              50003
+#define ID_TOOLBAR_WIDGET_UNDO               50003
+#define ID_TOOLBAR_WIDGET_REDO               50004
+#define ID_TOOLBAR_WIDGET_SNAP_ANGLE         50007
+#define ID_TOOLBAR_WIDGET_SNAP_GRID          50008
+#define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE   50011
+#define ID_TOOLBAR_WIDGET_DEBUG_MODE         50012
+#define ID_TOOLBAR_WIDGET_SPACER_RIGHT       50013
+#define ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL  50014
+#define ID_TOOLBAR_WIDGET_LAST               50020
+#define ID_VIEWPORTUI_VISIBLE                50040
diff --git a/Code/Editor/ResourceSelectorHost.cpp b/Code/Editor/ResourceSelectorHost.cpp
new file mode 100644
index 0000000000..06d6c484ad
--- /dev/null
+++ b/Code/Editor/ResourceSelectorHost.cpp
@@ -0,0 +1,166 @@
+/*
+ * 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 "ResourceSelectorHost.h"
+
+// Qt
+#include <QMessageBox>
+#include <QString>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/AssetBrowser/Search/Filter.h>
+#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
+
+
+class CResourceSelectorHost
+    : public IResourceSelectorHost
+{
+public:
+    CResourceSelectorHost()
+    {
+        RegisterModuleResourceSelectors(this);
+    }
+
+    QString SelectResource(const SResourceSelectorContext& context, const QString& previousValue) override
+    {
+        if (!context.typeName)
+        {
+            assert(false && "SResourceSelectorContext::typeName is not specified");
+            return QString();
+        }
+
+        TTypeMap::iterator it = m_typeMap.find(context.typeName);
+        if (it == m_typeMap.end())
+        {
+            QMessageBox::critical(QApplication::activeWindow(), QString(), QObject::tr("No Resource Selector is registered for resource type \"%1\"").arg(context.typeName));
+            return previousValue;
+        }
+
+        QString result = previousValue;
+        if (it->second->function)
+        {
+            result = it->second->function(context, previousValue);
+        }
+        else if (it->second->functionWithContext)
+        {
+            result = it->second->functionWithContext(context, previousValue, context.contextObject);
+        }
+
+        return result;
+    }
+
+    const char* ResourceIconPath(const char* typeName) const override
+    {
+        TTypeMap::const_iterator it = m_typeMap.find(typeName);
+        if (it != m_typeMap.end())
+        {
+            return it->second->iconPath;
+        }
+        return "";
+    }
+
+    void RegisterResourceSelector(const SStaticResourceSelectorEntry* entry) override
+    {
+        m_typeMap[entry->typeName] = entry;
+    }
+
+    void SetGlobalSelection(const char* resourceType, const char* value) override
+    {
+        if (!resourceType)
+        {
+            return;
+        }
+        if (!value)
+        {
+            return;
+        }
+        m_globallySelectedResources[resourceType] = value;
+    }
+
+    const char* GetGlobalSelection(const char* resourceType) const override
+    {
+        if (!resourceType)
+        {
+            return "";
+        }
+        auto it = m_globallySelectedResources.find(resourceType);
+        if (it != m_globallySelectedResources.end())
+        {
+            return it->second.c_str();
+        }
+        return "";
+    }
+
+private:
+    typedef std::map<string, const SStaticResourceSelectorEntry*, stl::less_stricmp<string> > TTypeMap;
+    TTypeMap m_typeMap;
+
+    std::map<string, string> m_globallySelectedResources;
+};
+
+// ---------------------------------------------------------------------------
+
+IResourceSelectorHost* CreateResourceSelectorHost()
+{
+    return new CResourceSelectorHost();
+}
+
+// ---------------------------------------------------------------------------
+
+QString SoundFileSelector([[maybe_unused]] const SResourceSelectorContext& x, const QString& previousValue)
+{
+    AssetSelectionModel selection = AssetSelectionModel::AssetTypeSelection("Audio");
+    AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
+    if (selection.IsValid())
+    {
+        return Path::FullPathToGamePath(QString(selection.GetResult()->GetFullPath().c_str()));
+    }
+    else
+    {
+        return Path::FullPathToGamePath(previousValue);
+    }
+}
+REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "")
+
+// ---------------------------------------------------------------------------
+QString ModelFileSelector([[maybe_unused]] const SResourceSelectorContext& x, const QString& previousValue)
+{
+    AssetSelectionModel selection = AssetSelectionModel::AssetGroupSelection("Geometry");
+    AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
+    if (selection.IsValid())
+    {
+        return Path::FullPathToGamePath(QString(selection.GetResult()->GetFullPath().c_str()));
+    }
+    else
+    {
+        return Path::FullPathToGamePath(previousValue);
+    }
+}
+REGISTER_RESOURCE_SELECTOR("Model", ModelFileSelector, "")
+
+// ---------------------------------------------------------------------------
+QString GeomCacheFileSelector([[maybe_unused]] const SResourceSelectorContext& x, const QString& previousValue)
+{
+    AssetSelectionModel selection = AssetSelectionModel::AssetTypeSelection("Geom Cache");
+    AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
+    if (selection.IsValid())
+    {
+        return Path::FullPathToGamePath(QString(selection.GetResult()->GetFullPath().c_str()));
+    }
+    else
+    {
+        return Path::FullPathToGamePath(previousValue);
+    }
+}
+
+REGISTER_RESOURCE_SELECTOR("GeomCache", GeomCacheFileSelector, "")
+
+
diff --git a/Code/Editor/ResourceSelectorHost.h b/Code/Editor/ResourceSelectorHost.h
new file mode 100644
index 0000000000..ab4eb15d22
--- /dev/null
+++ b/Code/Editor/ResourceSelectorHost.h
@@ -0,0 +1,17 @@
+/*
+ * 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_RESOURCESELECTORHOST_H
+#define CRYINCLUDE_EDITOR_RESOURCESELECTORHOST_H
+#pragma once
+
+#include "IResourceSelectorHost.h"
+
+IResourceSelectorHost* CreateResourceSelectorHost();
+
+#endif // CRYINCLUDE_EDITOR_RESOURCESELECTORHOST_H
diff --git a/Code/Editor/SelectEAXPresetDlg.cpp b/Code/Editor/SelectEAXPresetDlg.cpp
new file mode 100644
index 0000000000..93b8eac42b
--- /dev/null
+++ b/Code/Editor/SelectEAXPresetDlg.cpp
@@ -0,0 +1,66 @@
+/*
+ * 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 "SelectEAXPresetDlg.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_SelectEAXPresetDlg.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+CSelectEAXPresetDlg::CSelectEAXPresetDlg(QWidget* pParent)
+    : QDialog(pParent)
+    , m_ui(new Ui_CSelectEAXPresetDlg)
+{
+    m_ui->setupUi(this);
+}
+
+CSelectEAXPresetDlg::~CSelectEAXPresetDlg()
+{
+}
+
+void CSelectEAXPresetDlg::SetCurrPreset(const QString& sPreset)
+{
+    QAbstractListModel* model = Model();
+    if (!model)
+    {
+        return;
+    }
+
+    QModelIndexList indexes = model->match(QModelIndex(), Qt::DisplayRole, sPreset, 1, Qt::MatchExactly);
+
+    if (!indexes.isEmpty())
+    {
+        m_ui->listView->setCurrentIndex(indexes.at(0));
+    }
+}
+
+QString CSelectEAXPresetDlg::GetCurrPreset() const
+{
+    if (m_ui->listView->currentIndex().isValid())
+    {
+        return m_ui->listView->currentIndex().data().toString();
+    }
+    // EXCEPTION: OCX Property Pages should return FALSE
+    return QString();
+}
+
+
+void CSelectEAXPresetDlg::SetModel(QAbstractListModel* model)
+{
+    m_ui->listView->setModel(model);
+}
+
+QAbstractListModel* CSelectEAXPresetDlg::Model() const
+{
+    return static_cast<QAbstractListModel*>(m_ui->listView->model());
+}
+
+#include "moc_SelectEAXPresetDlg.cpp"
diff --git a/Code/Editor/SelectEAXPresetDlg.h b/Code/Editor/SelectEAXPresetDlg.h
new file mode 100644
index 0000000000..5443c03c27
--- /dev/null
+++ b/Code/Editor/SelectEAXPresetDlg.h
@@ -0,0 +1,42 @@
+/*
+ * 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
+
+// CSelectEAXPresetDlg dialog
+#ifndef CRYINCLUDE_EDITOR_SELECTEAXPRESETDLG_H
+#define CRYINCLUDE_EDITOR_SELECTEAXPRESETDLG_H
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+class QAbstractListModel;
+class Ui_CSelectEAXPresetDlg;
+
+class CSelectEAXPresetDlg
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CSelectEAXPresetDlg(QWidget* pParent = nullptr);   // standard constructor
+    ~CSelectEAXPresetDlg();
+
+    void SetCurrPreset(const QString& sPreset);
+    QString GetCurrPreset() const;
+
+protected:
+    void SetModel(QAbstractListModel* model);
+    QAbstractListModel* Model() const;
+
+private:
+    Ui_CSelectEAXPresetDlg* m_ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_SELECTEAXPRESETDLG_H
diff --git a/Code/Sandbox/Editor/SelectEAXPresetDlg.ui b/Code/Editor/SelectEAXPresetDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/SelectEAXPresetDlg.ui
rename to Code/Editor/SelectEAXPresetDlg.ui
diff --git a/Code/Editor/SelectLightAnimationDialog.cpp b/Code/Editor/SelectLightAnimationDialog.cpp
new file mode 100644
index 0000000000..210205f364
--- /dev/null
+++ b/Code/Editor/SelectLightAnimationDialog.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
+ *
+ */
+
+
+// Description : Used in a property item to select a light animation
+
+
+#include "EditorDefs.h"
+
+#include "SelectLightAnimationDialog.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>   // for AnimNodeType
+
+//////////////////////////////////////////////////////////////////////////
+CSelectLightAnimationDialog::CSelectLightAnimationDialog(QWidget* pParent)
+    :    CGenericSelectItemDialog(pParent)
+{
+    setWindowTitle(tr("Select Light Animation"));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectLightAnimationDialog::OnInitDialog()
+{
+    SetMode(eMODE_LIST);
+    CGenericSelectItemDialog::OnInitDialog();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSelectLightAnimationDialog::GetItems(std::vector<SItem>& outItems)
+{
+    IMovieSystem* pMovieSystem = GetIEditor()->GetMovieSystem();
+    for (int i = 0; i < pMovieSystem->GetNumSequences(); ++i)
+    {
+        IAnimSequence* pSequence = pMovieSystem->GetSequence(i);
+        if ((pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet) == 0)
+        {
+            continue;
+        }
+
+        for (int k = 0; k < pSequence->GetNodeCount(); ++k)
+        {
+            assert(pSequence->GetNode(k)->GetType() == AnimNodeType::Light);
+            if (pSequence->GetNode(k)->GetType() != AnimNodeType::Light)
+            {
+                continue;
+            }
+            SItem item;
+            item.name = pSequence->GetNode(k)->GetName();
+            outItems.push_back(item);
+        }
+        return;
+    }
+}
+
+#include <moc_SelectLightAnimationDialog.cpp>
diff --git a/Code/Editor/SelectLightAnimationDialog.h b/Code/Editor/SelectLightAnimationDialog.h
new file mode 100644
index 0000000000..5fd908dbf7
--- /dev/null
+++ b/Code/Editor/SelectLightAnimationDialog.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Used in a property item to select a light animation
+
+
+#ifndef CRYINCLUDE_EDITOR_SELECTLIGHTANIMATIONDIALOG_H
+#define CRYINCLUDE_EDITOR_SELECTLIGHTANIMATIONDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "GenericSelectItemDialog.h"
+#endif
+
+class CSelectLightAnimationDialog
+    : public CGenericSelectItemDialog
+{
+    Q_OBJECT
+
+public:
+    CSelectLightAnimationDialog(QWidget* pParent = nullptr);
+
+protected:
+    void OnInitDialog() override;
+
+    virtual void GetItems(std::vector<SItem>& outItems) override;
+};
+
+#endif // CRYINCLUDE_EDITOR_SELECTLIGHTANIMATIONDIALOG_H
diff --git a/Code/Editor/SelectSequenceDialog.cpp b/Code/Editor/SelectSequenceDialog.cpp
new file mode 100644
index 0000000000..627d9ad8e4
--- /dev/null
+++ b/Code/Editor/SelectSequenceDialog.cpp
@@ -0,0 +1,45 @@
+/*
+ * 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 "SelectSequenceDialog.h"
+
+// CSelectSequence dialog
+
+//////////////////////////////////////////////////////////////////////////
+CSelectSequenceDialog::CSelectSequenceDialog(QWidget* pParent)
+    :    CGenericSelectItemDialog(pParent)
+{
+    setWindowTitle(tr("Select Sequence"));
+}
+
+//////////////////////////////////////////////////////////////////////////
+/* virtual */ void
+CSelectSequenceDialog::OnInitDialog()
+{
+    SetMode(eMODE_LIST);
+    CGenericSelectItemDialog::OnInitDialog();
+}
+
+//////////////////////////////////////////////////////////////////////////
+/* virtual */ void
+CSelectSequenceDialog::GetItems(std::vector<SItem>& outItems)
+{
+    IMovieSystem* pMovieSys = GetIEditor()->GetMovieSystem();
+    for (int i = 0; i < pMovieSys->GetNumSequences(); ++i)
+    {
+        IAnimSequence* pSeq = pMovieSys->GetSequence(i);
+        SItem item;
+        string fullname = pSeq->GetName();
+        item.name = fullname.c_str();
+        outItems.push_back(item);
+    }
+}
+
+#include <moc_SelectSequenceDialog.cpp>
diff --git a/Code/Editor/SelectSequenceDialog.h b/Code/Editor/SelectSequenceDialog.h
new file mode 100644
index 0000000000..90cc948723
--- /dev/null
+++ b/Code/Editor/SelectSequenceDialog.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_SELECTSEQUENCEDIALOG_H
+#define CRYINCLUDE_EDITOR_SELECTSEQUENCEDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "GenericSelectItemDialog.h"
+#endif
+
+// CSelectSequence dialog
+
+class CSelectSequenceDialog
+    : public CGenericSelectItemDialog
+{
+    Q_OBJECT
+
+public:
+    CSelectSequenceDialog(QWidget* pParent = nullptr);   // standard constructor
+    virtual ~CSelectSequenceDialog() {}
+
+protected:
+    void OnInitDialog() override;
+
+    // Derived Dialogs should override this
+    virtual void GetItems(std::vector<SItem>& outItems);
+};
+
+#endif // CRYINCLUDE_EDITOR_SELECTSEQUENCEDIALOG_H
diff --git a/Code/Editor/Settings.cpp b/Code/Editor/Settings.cpp
new file mode 100644
index 0000000000..cdd44b5fff
--- /dev/null
+++ b/Code/Editor/Settings.cpp
@@ -0,0 +1,1205 @@
+/*
+ * 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 "Settings.h"
+
+// Qt
+#include <QGuiApplication>
+#include <QOperatingSystemVersion>
+#include <QScreen>
+
+// AzCore
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/StringFunc/StringFunc.h>
+#include <AzCore/Utils/Utils.h>
+#include <AzCore/Console/IConsole.h>
+
+// AzFramework
+#include <AzFramework/API/ApplicationAPI.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
+
+// Editor
+#include "CryEdit.h"
+#include "MainWindow.h"
+
+#pragma comment(lib, "Gdi32.lib")
+
+//////////////////////////////////////////////////////////////////////////
+// Global Instance of Editor settings.
+//////////////////////////////////////////////////////////////////////////
+SANDBOX_API SEditorSettings gSettings;
+
+Q_GLOBAL_STATIC(QSettings, s_editorSettings);
+
+const QString kDefaultColumnsForAssetBrowserList = "Filename,Path,LODs,Triangles,Submeshes,Filesize,Textures,Materials,Tags";
+const int EditorSettingsVersion = 2; // bump this up on every substantial settings change
+
+void KeepEditorActiveChanged(ICVar* keepEditorActive)
+{
+    const int iCVarKeepEditorActive = keepEditorActive->GetIVal();
+    CCryEditApp::instance()->KeepEditorActive(iCVarKeepEditorActive);
+}
+
+void ToolbarIconSizeChanged(ICVar* toolbarIconSize)
+{
+    MainWindow::instance()->AdjustToolBarIconSize(static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(toolbarIconSize->GetIVal()));
+}
+
+class SettingsGroup
+{
+public:
+    explicit SettingsGroup(const QString& group)
+        : m_group(group)
+    {
+        for (auto g : m_group.split('\\'))
+        {
+            s_editorSettings()->beginGroup(g);
+        }
+    }
+    ~SettingsGroup()
+    {
+        for (auto g : m_group.split('\\'))
+        {
+            s_editorSettings()->endGroup();
+        }
+    }
+
+private:
+    const QString m_group;
+};
+
+namespace
+{
+
+    class QtApplicationListener
+        : public AzToolsFramework::EditorEvents::Bus::Handler
+    {
+    public:
+        QtApplicationListener()
+        {
+            AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
+        }
+
+        void NotifyQtApplicationAvailable(QApplication* application) override
+        {
+            gSettings.viewports.nDragSquareSize = application->startDragDistance();
+            AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
+            delete this;
+        }
+    };
+
+}
+
+//////////////////////////////////////////////////////////////////////////
+SGizmoSettings::SGizmoSettings()
+{
+    axisGizmoSize = 0.2f;
+    axisGizmoText = true;
+    axisGizmoMaxCount = 50;
+    helpersScale = 1.f;
+    tagpointScaleMulti = 0.5f;
+    rulerSphereScale = 0.5f;
+    rulerSphereTrans = 0.5f;
+}
+//////////////////////////////////////////////////////////////////////////
+SEditorSettings::SEditorSettings()
+{
+    bSettingsManagerMode = false;
+
+    undoLevels = 50;
+    m_undoSliceOverrideSaveValue = false;
+    bShowDashboardAtStartup = true;
+    m_showCircularDependencyError = true;
+    bAutoloadLastLevelAtStartup = false;
+    bMuteAudio = false;
+    bEnableGameModeVR = false;
+
+
+    objectHideMask = 0;
+    objectSelectMask = 0xFFFFFFFF; // Initially all selectable.
+
+    autoBackupEnabled = false;
+    autoBackupTime = 10;
+    autoBackupMaxCount = 3;
+    autoRemindTime = 0;
+
+    bAutoSaveTagPoints = false;
+
+    bNavigationContinuousUpdate = false;
+    bNavigationShowAreas = true;
+    bNavigationDebugDisplay = false;
+    bVisualizeNavigationAccessibility = false;
+    navigationDebugAgentType = 0;
+
+    editorConfigSpec = CONFIG_VERYHIGH_SPEC;  //arbitrary choice, but lets assume that we want things to initially look as good as possible in the editor.
+
+    viewports.bAlwaysShowRadiuses = false;
+    viewports.bSync2DViews = false;
+    viewports.fDefaultAspectRatio = 800.0f / 600.0f;
+    viewports.fDefaultFov = DEG2RAD(60); // 60 degrees (to fit with current game)
+    viewports.bShowSafeFrame = false;
+    viewports.bHighlightSelectedGeometry = false;
+    viewports.bHighlightSelectedVegetation = true;
+    viewports.bHighlightMouseOverGeometry = true;
+    viewports.bShowMeshStatsOnMouseOver = false;
+    viewports.bDrawEntityLabels = false;
+    viewports.bShowTriggerBounds = false;
+    viewports.bShowIcons = true;
+    viewports.bDistanceScaleIcons = true;
+    viewports.bShowSizeBasedIcons = false;
+    viewports.nShowFrozenHelpers = true;
+    viewports.bFillSelectedShapes = false;
+    viewports.nTopMapTextureResolution = 512;
+    viewports.bTopMapSwapXY = false;
+    viewports.bShowGridGuide = true;
+    viewports.bHideMouseCursorWhenCaptured = true;
+    viewports.nDragSquareSize = 0; // We must initialize this after the Qt application object is available; see QtApplicationListener
+    viewports.bEnableContextMenu = true;
+    viewports.fWarningIconsDrawDistance = 50.0f;
+    viewports.bShowScaleWarnings = false;
+    viewports.bShowRotationWarnings = false;
+
+    cameraMoveSpeed = 1;
+    cameraRotateSpeed = 1;
+    cameraFastMoveSpeed = 2;
+    stylusMode = false;
+    restoreViewportCamera = true;
+    wheelZoomSpeed = 1;
+    invertYRotation = false;
+    invertPan = false;
+    fBrMultiplier = 2;
+    bPreviewGeometryWindow = true;
+    bBackupOnSave = true;
+    backupOnSaveMaxCount = 3;
+    bApplyConfigSpecInEditor = true;
+    useLowercasePaths = 0;
+    showErrorDialogOnLoad = 1;
+
+    consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
+    bShowTimeInConsole = false;
+
+    enableSceneInspector = false;
+
+    strStandardTempDirectory = "Temp";
+
+    // Init source safe params.
+    enableSourceControl = true;
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    textEditorForScript = "TextEdit";
+    textEditorForShaders = "TextEdit";
+    textEditorForBspaces = "TextEdit";
+    textureEditor = "Photoshop";
+#elif defined(AZ_PLATFORM_WINDOWS)
+    textEditorForScript = "notepad++.exe";
+    textEditorForShaders = "notepad++.exe";
+    textEditorForBspaces = "notepad++.exe";
+    textureEditor = "Photoshop.exe";
+#else
+    textEditorForScript = "";
+    textEditorForShaders = "";
+    textEditorForBspaces = "";
+    textureEditor = "";
+#endif
+    animEditor = "";
+
+    terrainTextureExport = "";
+
+    sTextureBrowserSettings.nCellSize = 128;
+
+    // Experimental features settings
+    sExperimentalFeaturesSettings.bTotalIlluminationEnabled = false;
+
+    //
+    // Asset Browser settings init
+    //
+    sAssetBrowserSettings.nThumbSize = 128;
+    sAssetBrowserSettings.bShowLoadedInLevel = false;
+    sAssetBrowserSettings.bShowUsedInLevel = false;
+    sAssetBrowserSettings.bAutoSaveFilterPreset = true;
+    sAssetBrowserSettings.bShowFavorites = false;
+    sAssetBrowserSettings.bHideLods = false;
+    sAssetBrowserSettings.bAutoChangeViewportSelection = false;
+    sAssetBrowserSettings.bAutoFilterFromViewportSelection = false;
+
+    smartOpenSettings.rect = QRect();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Initialize GUI settings.
+    //////////////////////////////////////////////////////////////////////////
+    gui.bWindowsVista = QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::Windows7);
+
+    gui.nToolbarIconSize = static_cast<int>(AzQtComponents::ToolBar::ToolBarIconSize::Default);
+
+    int lfHeight = 8;// -MulDiv(8, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72);
+    gui.nDefaultFontHieght = lfHeight;
+    gui.hSystemFont = QFont("Ms Shell Dlg 2", lfHeight, QFont::Normal);
+    gui.hSystemFontBold = QFont("Ms Shell Dlg 2", lfHeight, QFont::Bold);
+    gui.hSystemFontItalic = QFont("Ms Shell Dlg 2", lfHeight, QFont::Normal, true);
+
+    backgroundUpdatePeriod = 0;
+    g_TemporaryLevelName = nullptr;
+
+    sliceSettings.dynamicByDefault = false;
+}
+
+void SEditorSettings::Connect()
+{
+    new QtApplicationListener(); // Deletes itself when it's done.
+    AzToolsFramework::EditorSettingsAPIBus::Handler::BusConnect();
+}
+
+void SEditorSettings::Disconnect()
+{
+    AzToolsFramework::EditorSettingsAPIBus::Handler::BusDisconnect();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::SaveValue(const char* sSection, const char* sKey, int value)
+{
+    const SettingsGroup sg(sSection);
+    s_editorSettings()->setValue(sKey, value);
+
+    if (!bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::SaveValue(const char* sSection, const char* sKey, const QColor& value)
+{
+    const SettingsGroup sg(sSection);
+    s_editorSettings()->setValue(sKey, QVariant::fromValue<int>(RGB(value.red(), value.green(), value.blue())));
+
+    if (!bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::SaveValue(const char* sSection, const char* sKey, float value)
+{
+    const SettingsGroup sg(sSection);
+    s_editorSettings()->setValue(sKey, QString::number(value));
+
+    if (!bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::SaveValue(const char* sSection, const char* sKey, const QString& value)
+{
+    const SettingsGroup sg(sSection);
+    s_editorSettings()->setValue(sKey, value);
+
+    if (!bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::LoadValue(const char* sSection, const char* sKey, int& value)
+{
+    if (bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
+        }
+
+        SaveValue(sSection, sKey, value);
+    }
+    else
+    {
+        const SettingsGroup sg(sSection);
+        value = s_editorSettings()->value(sKey, value).toInt();
+
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::LoadValue(const char* sSection, const char* sKey, QColor& value)
+{
+    if (bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
+        }
+
+        SaveValue(sSection, sKey, value);
+    }
+    else
+    {
+        const SettingsGroup sg(sSection);
+        int defaultValue = RGB(value.red(), value.green(), value.blue());
+        int v = s_editorSettings()->value(sKey, QVariant::fromValue<int>(defaultValue)).toInt();
+        value = QColor(GetRValue(v), GetGValue(v), GetBValue(v));
+
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::LoadValue(const char* sSection, const char* sKey, float& value)
+{
+    if (bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
+        }
+
+        SaveValue(sSection, sKey, value);
+    }
+    else
+    {
+        const SettingsGroup sg(sSection);
+        const QString defaultVal = s_editorSettings()->value(sKey, QString::number(value)).toString();
+        value = defaultVal.toDouble();
+
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::LoadValue(const char* sSection, const char* sKey, bool& value)
+{
+    if (bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
+        }
+
+        SaveValue(sSection, sKey, value);
+    }
+    else
+    {
+        const SettingsGroup sg(sSection);
+        value = s_editorSettings()->value(sKey, value).toInt();
+
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::LoadValue(const char* sSection, const char* sKey, QString& value)
+{
+    if (bSettingsManagerMode)
+    {
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
+        }
+
+        SaveValue(sSection, sKey, value);
+    }
+    else
+    {
+        const SettingsGroup sg(sSection);
+        value = s_editorSettings()->value(sKey, value).toString();
+
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::LoadValue(const char* sSection, const char* sKey, ESystemConfigSpec& value)
+{
+    if (bSettingsManagerMode)
+    {
+        int valueCheck = 0;
+
+        if (GetIEditor()->GetSettingsManager())
+        {
+            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, valueCheck);
+        }
+
+        if (valueCheck >= CONFIG_AUTO_SPEC && valueCheck < END_CONFIG_SPEC_ENUM)
+        {
+            value = (ESystemConfigSpec)valueCheck;
+            SaveValue(sSection, sKey, value);
+        }
+    }
+    else
+    {
+        const SettingsGroup sg(sSection);
+        auto valuecheck = static_cast<ESystemConfigSpec>(s_editorSettings()->value(sKey, QVariant::fromValue<int>(value)).toInt());
+        if (valuecheck >= CONFIG_AUTO_SPEC && valuecheck < END_CONFIG_SPEC_ENUM)
+        {
+            value = valuecheck;
+
+            if (GetIEditor()->GetSettingsManager())
+            {
+                GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::Save()
+{
+    QString strStringPlaceholder;
+
+    // Save settings to registry.
+    SaveValue("Settings", "UndoLevels", undoLevels);
+    SaveValue("Settings", "UndoSliceOverrideSaveValue", m_undoSliceOverrideSaveValue);
+    SaveValue("Settings", "ShowWelcomeScreenAtStartup", bShowDashboardAtStartup);
+    SaveValue("Settings", "ShowCircularDependencyError", m_showCircularDependencyError);
+    SaveValue("Settings", "LoadLastLevelAtStartup", bAutoloadLastLevelAtStartup);
+    SaveValue("Settings", "MuteAudio", bMuteAudio);
+    SaveValue("Settings", "AutoBackup", autoBackupEnabled);
+    SaveValue("Settings", "AutoBackupTime", autoBackupTime);
+    SaveValue("Settings", "AutoBackupMaxCount", autoBackupMaxCount);
+    SaveValue("Settings", "AutoRemindTime", autoRemindTime);
+    SaveValue("Settings", "CameraMoveSpeed", cameraMoveSpeed);
+    SaveValue("Settings", "CameraRotateSpeed", cameraRotateSpeed);
+    SaveValue("Settings", "StylusMode", stylusMode);
+    SaveValue("Settings", "RestoreViewportCamera", restoreViewportCamera);
+    SaveValue("Settings", "WheelZoomSpeed", wheelZoomSpeed);
+    SaveValue("Settings", "InvertYRotation", invertYRotation);
+    SaveValue("Settings", "InvertPan", invertPan);
+    SaveValue("Settings", "BrMultiplier", fBrMultiplier);
+    SaveValue("Settings", "CameraFastMoveSpeed", cameraFastMoveSpeed);
+    SaveValue("Settings", "PreviewGeometryWindow", bPreviewGeometryWindow);
+    SaveValue("Settings", "AutoSaveTagPoints", bAutoSaveTagPoints);
+
+    SaveValue("Settings\\Navigation", "NavigationContinuousUpdate", bNavigationContinuousUpdate);
+    SaveValue("Settings\\Navigation", "NavigationShowAreas", bNavigationShowAreas);
+    SaveValue("Settings\\Navigation", "NavigationDebugDisplay", bNavigationDebugDisplay);
+    SaveValue("Settings\\Navigation", "NavigationDebugAgentType", navigationDebugAgentType);
+    SaveValue("Settings\\Navigation", "VisualizeNavigationAccessibility", bVisualizeNavigationAccessibility);
+
+    SaveValue("Settings", "BackupOnSave", bBackupOnSave);
+    SaveValue("Settings", "SaveBackupMaxCount", backupOnSaveMaxCount);
+    SaveValue("Settings", "ApplyConfigSpecInEditor", bApplyConfigSpecInEditor);
+
+    SaveValue("Settings", "editorConfigSpec", editorConfigSpec);
+
+    SaveValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
+
+    SaveValue("Settings", "ConsoleBackgroundColorThemeV2", (int)consoleBackgroundColorTheme);
+
+    SaveValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
+
+    SaveValue("Settings", "EnableSceneInspector", enableSceneInspector);
+    
+    //////////////////////////////////////////////////////////////////////////
+    // Viewport settings.
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings", "AlwaysShowRadiuses", viewports.bAlwaysShowRadiuses);
+    SaveValue("Settings", "Sync2DViews", viewports.bSync2DViews);
+    SaveValue("Settings", "DefaultFov", viewports.fDefaultFov);
+    SaveValue("Settings", "AspectRatio", viewports.fDefaultAspectRatio);
+    SaveValue("Settings", "ShowSafeFrame", viewports.bShowSafeFrame);
+    SaveValue("Settings", "HighlightSelectedGeometry", viewports.bHighlightSelectedGeometry);
+    SaveValue("Settings", "HighlightSelectedVegetation", viewports.bHighlightSelectedVegetation);
+    SaveValue("Settings", "HighlightMouseOverGeometry", viewports.bHighlightMouseOverGeometry);
+    SaveValue("Settings", "ShowMeshStatsOnMouseOver", viewports.bShowMeshStatsOnMouseOver);
+    SaveValue("Settings", "DrawEntityLabels", viewports.bDrawEntityLabels);
+    SaveValue("Settings", "ShowTriggerBounds", viewports.bShowTriggerBounds);
+    SaveValue("Settings", "ShowIcons", viewports.bShowIcons);
+    SaveValue("Settings", "ShowSizeBasedIcons", viewports.bShowSizeBasedIcons);
+    SaveValue("Settings", "ShowFrozenHelpers", viewports.nShowFrozenHelpers);
+    SaveValue("Settings", "FillSelectedShapes", viewports.bFillSelectedShapes);
+    SaveValue("Settings", "MapTextureResolution", viewports.nTopMapTextureResolution);
+    SaveValue("Settings", "MapSwapXY", viewports.bTopMapSwapXY);
+    SaveValue("Settings", "ShowGridGuide", viewports.bShowGridGuide);
+    SaveValue("Settings", "HideMouseCursorOnCapture", viewports.bHideMouseCursorWhenCaptured);
+    SaveValue("Settings", "DragSquareSize", viewports.nDragSquareSize);
+    SaveValue("Settings", "EnableContextMenu", viewports.bEnableContextMenu);
+    SaveValue("Settings", "ToolbarIconSizeV2", gui.nToolbarIconSize);
+    SaveValue("Settings", "WarningIconsDrawDistance", viewports.fWarningIconsDrawDistance);
+    SaveValue("Settings", "ShowScaleWarnings", viewports.bShowScaleWarnings);
+    SaveValue("Settings", "ShowRotationWarnings", viewports.bShowRotationWarnings);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Gizmos.
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings", "AxisGizmoSize", gizmo.axisGizmoSize);
+    SaveValue("Settings", "AxisGizmoText", gizmo.axisGizmoText);
+    SaveValue("Settings", "AxisGizmoMaxCount", gizmo.axisGizmoMaxCount);
+    SaveValue("Settings", "HelpersScale", gizmo.helpersScale);
+    SaveValue("Settings", "TagPointScaleMulti", gizmo.tagpointScaleMulti);
+    SaveValue("Settings", "RulerSphereScale", gizmo.rulerSphereScale);
+    SaveValue("Settings", "RulerSphereTrans", gizmo.rulerSphereTrans);
+    //////////////////////////////////////////////////////////////////////////
+
+    SaveValue("Settings", "TextEditorScript", textEditorForScript);
+    SaveValue("Settings", "TextEditorShaders", textEditorForShaders);
+    SaveValue("Settings", "TextEditorBSpaces", textEditorForBspaces);
+    SaveValue("Settings", "TextureEditor", textureEditor);
+    SaveValue("Settings", "AnimationEditor", animEditor);
+
+    SaveEnableSourceControlFlag(true);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Snapping Settings.
+    SaveValue("Settings\\Snap", "ConstructPlaneSize", snap.constructPlaneSize);
+    SaveValue("Settings\\Snap", "ConstructPlaneDisplay", snap.constructPlaneDisplay);
+    SaveValue("Settings\\Snap", "SnapMarkerDisplay", snap.markerDisplay);
+    SaveValue("Settings\\Snap", "SnapMarkerColor", snap.markerColor);
+    SaveValue("Settings\\Snap", "SnapMarkerSize", snap.markerSize);
+    SaveValue("Settings\\Snap", "GridUserDefined", snap.bGridUserDefined);
+    SaveValue("Settings\\Snap", "GridGetFromSelected", snap.bGridGetFromSelected);
+    //////////////////////////////////////////////////////////////////////////
+
+    SaveValue("Settings", "TerrainTextureExport", terrainTextureExport);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Texture browser settings
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings\\TextureBrowser", "Cell Size", sTextureBrowserSettings.nCellSize);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Experimental features settings
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings\\ExperimentalFeatures", "TotalIlluminationEnabled", sExperimentalFeaturesSettings.bTotalIlluminationEnabled);
+
+    ///////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings\\SelectObjectDialog", "Columns", selectObjectDialog.columns);
+    SaveValue("Settings\\SelectObjectDialog", "LastColumnSortDirection", selectObjectDialog.nLastColumnSortDirection);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Asset browser settings
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings\\AssetBrowser", "ThumbSize", sAssetBrowserSettings.nThumbSize);
+    SaveValue("Settings\\AssetBrowser", "ShowLoadedInLevel", sAssetBrowserSettings.bShowLoadedInLevel);
+    SaveValue("Settings\\AssetBrowser", "ShowUsedInLevel", sAssetBrowserSettings.bShowUsedInLevel);
+    SaveValue("Settings\\AssetBrowser", "FilenameSearch", sAssetBrowserSettings.sFilenameSearch);
+    SaveValue("Settings\\AssetBrowser", "PresetName", sAssetBrowserSettings.sPresetName);
+    SaveValue("Settings\\AssetBrowser", "ShowDatabases", sAssetBrowserSettings.sVisibleDatabaseNames);
+    SaveValue("Settings\\AssetBrowser", "ShowFavorites", sAssetBrowserSettings.bShowFavorites);
+    SaveValue("Settings\\AssetBrowser", "HideLods", sAssetBrowserSettings.bHideLods);
+    SaveValue("Settings\\AssetBrowser", "AutoSaveFilterPreset", sAssetBrowserSettings.bAutoSaveFilterPreset);
+    SaveValue("Settings\\AssetBrowser", "AutoChangeViewportSelection", sAssetBrowserSettings.bAutoChangeViewportSelection);
+    SaveValue("Settings\\AssetBrowser", "AutoFilterFromViewportSelection", sAssetBrowserSettings.bAutoFilterFromViewportSelection);
+    SaveValue("Settings\\AssetBrowser", "VisibleColumnNames", sAssetBrowserSettings.sVisibleColumnNames);
+    SaveValue("Settings\\AssetBrowser", "ColumnNames", sAssetBrowserSettings.sColumnNames);
+      
+    //////////////////////////////////////////////////////////////////////////
+    // Deep Selection Settings
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings", "DeepSelectionNearness", deepSelectionSettings.fRange);
+    SaveValue("Settings", "StickDuplicate", deepSelectionSettings.bStickDuplicate);
+
+
+    //////////////////////////////////////////////////////////////////////////
+    // Object Highlight Colors
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings\\ObjectColors", "groupHighlight", objectColorSettings.groupHighlight);
+    SaveValue("Settings\\ObjectColors", "entityHighlight", objectColorSettings.entityHighlight);
+    SaveValue("Settings\\ObjectColors", "BBoxAlpha", objectColorSettings.fBBoxAlpha);
+    SaveValue("Settings\\ObjectColors", "GeometryHighlightColor", objectColorSettings.geometryHighlightColor);
+    SaveValue("Settings\\ObjectColors", "SolidBrushGeometryHighlightColor", objectColorSettings.solidBrushGeometryColor);
+    SaveValue("Settings\\ObjectColors", "GeometryAlpha", objectColorSettings.fGeomAlpha);
+    SaveValue("Settings\\ObjectColors", "ChildGeometryAlpha", objectColorSettings.fChildGeomAlpha);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Smart file open settings
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings\\SmartFileOpen", "LastSearchTerm", smartOpenSettings.lastSearchTerm);
+    SaveValue("Settings\\SmartFileOpen", "DlgRect.Left", smartOpenSettings.rect.left());
+    SaveValue("Settings\\SmartFileOpen", "DlgRect.Top", smartOpenSettings.rect.top());
+    SaveValue("Settings\\SmartFileOpen", "DlgRect.Right", smartOpenSettings.rect.right());
+    SaveValue("Settings\\SmartFileOpen", "DlgRect.Bottom", smartOpenSettings.rect.bottom());
+
+    //////////////////////////////////////////////////////////////////////////
+    // Slice settings
+    //////////////////////////////////////////////////////////////////////////
+    SaveValue("Settings\\Slices", "DynamicByDefault", sliceSettings.dynamicByDefault);
+
+    /*
+    //////////////////////////////////////////////////////////////////////////
+    // Save paths.
+    //////////////////////////////////////////////////////////////////////////
+    for (int id = 0; id < EDITOR_PATH_LAST; id++)
+    {
+        for (int i = 0; i < searchPaths[id].size(); i++)
+        {
+            CString path = searchPaths[id][i];
+            CString key;
+            key.Format( "Paths","Path_%.2d_%.2d",id,i );
+            SaveValue( "Paths",key,path );
+        }
+    }
+    */
+
+    s_editorSettings()->sync();
+
+    // --- Settings Registry values
+
+    // Prefab System UI
+    AzFramework::ApplicationRequests::Bus::Broadcast(
+        &AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem);
+
+    SaveSettingsRegistryFile();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void SEditorSettings::Load()
+{
+    // Load from Settings Registry
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        prefabSystem, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
+    const int settingsVersion = s_editorSettings()->value(QStringLiteral("Settings/EditorSettingsVersion"), 0).toInt();
+
+    if (settingsVersion != EditorSettingsVersion)
+    {
+        s_editorSettings()->setValue(QStringLiteral("Settings/EditorSettingsVersion"), EditorSettingsVersion);
+        Save();
+        return;
+    }
+
+    QString     strPlaceholderString;
+    // Load settings from registry.
+    LoadValue("Settings", "UndoLevels", undoLevels);
+    LoadValue("Settings", "UndoSliceOverrideSaveValue", m_undoSliceOverrideSaveValue);  
+    LoadValue("Settings", "ShowWelcomeScreenAtStartup", bShowDashboardAtStartup);
+    LoadValue("Settings", "ShowCircularDependencyError", m_showCircularDependencyError);
+    LoadValue("Settings", "LoadLastLevelAtStartup", bAutoloadLastLevelAtStartup);
+    LoadValue("Settings", "MuteAudio", bMuteAudio);
+    LoadValue("Settings", "AutoBackup", autoBackupEnabled);
+    LoadValue("Settings", "AutoBackupTime", autoBackupTime);
+    LoadValue("Settings", "AutoBackupMaxCount", autoBackupMaxCount);
+    LoadValue("Settings", "AutoRemindTime", autoRemindTime);
+    LoadValue("Settings", "CameraMoveSpeed", cameraMoveSpeed);
+    LoadValue("Settings", "CameraRotateSpeed", cameraRotateSpeed);
+    LoadValue("Settings", "StylusMode", stylusMode);
+    LoadValue("Settings", "RestoreViewportCamera", restoreViewportCamera);
+    LoadValue("Settings", "WheelZoomSpeed", wheelZoomSpeed);
+    LoadValue("Settings", "InvertYRotation", invertYRotation);
+    LoadValue("Settings", "InvertPan", invertPan);
+    LoadValue("Settings", "BrMultiplier", fBrMultiplier);
+    LoadValue("Settings", "CameraFastMoveSpeed", cameraFastMoveSpeed);
+    LoadValue("Settings", "PreviewGeometryWindow", bPreviewGeometryWindow);
+    LoadValue("Settings", "AutoSaveTagPoints", bAutoSaveTagPoints);
+
+    LoadValue("Settings\\Navigation", "NavigationContinuousUpdate", bNavigationContinuousUpdate);
+    LoadValue("Settings\\Navigation", "NavigationShowAreas", bNavigationShowAreas);
+    LoadValue("Settings\\Navigation", "NavigationDebugDisplay", bNavigationDebugDisplay);
+    LoadValue("Settings\\Navigation", "NavigationDebugAgentType", navigationDebugAgentType);
+    LoadValue("Settings\\Navigation", "VisualizeNavigationAccessibility", bVisualizeNavigationAccessibility);
+
+    LoadValue("Settings", "BackupOnSave", bBackupOnSave);
+    LoadValue("Settings", "SaveBackupMaxCount", backupOnSaveMaxCount);
+    LoadValue("Settings", "ApplyConfigSpecInEditor", bApplyConfigSpecInEditor);
+    LoadValue("Settings", "editorConfigSpec", editorConfigSpec);
+
+
+    LoadValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
+
+    int consoleBackgroundColorThemeInt = (int)consoleBackgroundColorTheme;
+    LoadValue("Settings", "ConsoleBackgroundColorThemeV2", consoleBackgroundColorThemeInt);
+    consoleBackgroundColorTheme = static_cast<AzToolsFramework::ConsoleColorTheme>(consoleBackgroundColorThemeInt);
+    if (consoleBackgroundColorTheme != AzToolsFramework::ConsoleColorTheme::Dark && consoleBackgroundColorTheme != AzToolsFramework::ConsoleColorTheme::Light)
+    {
+        consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
+    }
+
+    LoadValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
+
+    LoadValue("Settings", "EnableSceneInspector", enableSceneInspector);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Viewport Settings.
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings", "AlwaysShowRadiuses", viewports.bAlwaysShowRadiuses);
+    LoadValue("Settings", "Sync2DViews", viewports.bSync2DViews);
+    LoadValue("Settings", "DefaultFov", viewports.fDefaultFov);
+    LoadValue("Settings", "AspectRatio", viewports.fDefaultAspectRatio);
+    LoadValue("Settings", "ShowSafeFrame", viewports.bShowSafeFrame);
+    LoadValue("Settings", "HighlightSelectedGeometry", viewports.bHighlightSelectedGeometry);
+    LoadValue("Settings", "HighlightSelectedVegetation", viewports.bHighlightSelectedVegetation);
+    LoadValue("Settings", "HighlightMouseOverGeometry", viewports.bHighlightMouseOverGeometry);
+    LoadValue("Settings", "ShowMeshStatsOnMouseOver", viewports.bShowMeshStatsOnMouseOver);
+    LoadValue("Settings", "DrawEntityLabels", viewports.bDrawEntityLabels);
+    LoadValue("Settings", "ShowTriggerBounds", viewports.bShowTriggerBounds);
+    LoadValue("Settings", "ShowIcons", viewports.bShowIcons);
+    LoadValue("Settings", "ShowSizeBasedIcons", viewports.bShowSizeBasedIcons);
+    LoadValue("Settings", "ShowFrozenHelpers", viewports.nShowFrozenHelpers);
+    LoadValue("Settings", "FillSelectedShapes", viewports.bFillSelectedShapes);
+    LoadValue("Settings", "MapTextureResolution", viewports.nTopMapTextureResolution);
+    LoadValue("Settings", "MapSwapXY", viewports.bTopMapSwapXY);
+    LoadValue("Settings", "ShowGridGuide", viewports.bShowGridGuide);
+    LoadValue("Settings", "HideMouseCursorOnCapture", viewports.bHideMouseCursorWhenCaptured);
+    LoadValue("Settings", "DragSquareSize", viewports.nDragSquareSize);
+    LoadValue("Settings", "EnableContextMenu", viewports.bEnableContextMenu);
+    LoadValue("Settings", "ToolbarIconSizeV2", gui.nToolbarIconSize);
+    LoadValue("Settings", "WarningIconsDrawDistance", viewports.fWarningIconsDrawDistance);
+    LoadValue("Settings", "ShowScaleWarnings", viewports.bShowScaleWarnings);
+    LoadValue("Settings", "ShowRotationWarnings", viewports.bShowRotationWarnings);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Gizmos.
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings", "AxisGizmoSize", gizmo.axisGizmoSize);
+    LoadValue("Settings", "AxisGizmoText", gizmo.axisGizmoText);
+    LoadValue("Settings", "AxisGizmoMaxCount", gizmo.axisGizmoMaxCount);
+    LoadValue("Settings", "HelpersScale", gizmo.helpersScale);
+    LoadValue("Settings", "TagPointScaleMulti", gizmo.tagpointScaleMulti);
+    LoadValue("Settings", "RulerSphereScale", gizmo.rulerSphereScale);
+    LoadValue("Settings", "RulerSphereTrans", gizmo.rulerSphereTrans);
+    //////////////////////////////////////////////////////////////////////////
+
+    LoadValue("Settings", "TextEditorScript", textEditorForScript);
+    LoadValue("Settings", "TextEditorShaders", textEditorForShaders);
+    LoadValue("Settings", "TextEditorBSpaces", textEditorForBspaces);
+    LoadValue("Settings", "TextureEditor", textureEditor);
+    LoadValue("Settings", "AnimationEditor", animEditor);
+
+    LoadEnableSourceControlFlag();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Snapping Settings.
+    LoadValue("Settings\\Snap", "ConstructPlaneSize", snap.constructPlaneSize);
+    LoadValue("Settings\\Snap", "ConstructPlaneDisplay", snap.constructPlaneDisplay);
+    LoadValue("Settings\\Snap", "SnapMarkerDisplay", snap.markerDisplay);
+    LoadValue("Settings\\Snap", "SnapMarkerColor", snap.markerColor);
+    LoadValue("Settings\\Snap", "SnapMarkerSize", snap.markerSize);
+    LoadValue("Settings\\Snap", "GridUserDefined", snap.bGridUserDefined);
+    LoadValue("Settings\\Snap", "GridGetFromSelected", snap.bGridGetFromSelected);
+    //////////////////////////////////////////////////////////////////////////
+
+    LoadValue("Settings", "TerrainTextureExport", terrainTextureExport);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Texture browser settings
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings\\TextureBrowser", "Cell Size", sTextureBrowserSettings.nCellSize);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Experimental features settings
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings\\ExperimentalFeatures", "TotalIlluminationEnabled", sExperimentalFeaturesSettings.bTotalIlluminationEnabled);
+
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings\\SelectObjectDialog", "Columns", selectObjectDialog.columns);
+    LoadValue("Settings\\SelectObjectDialog", "LastColumnSortDirection", selectObjectDialog.nLastColumnSortDirection);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Asset browser settings
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings\\AssetBrowser", "ThumbSize", sAssetBrowserSettings.nThumbSize);
+    LoadValue("Settings\\AssetBrowser", "ShowLoadedInLevel", sAssetBrowserSettings.bShowLoadedInLevel);
+    LoadValue("Settings\\AssetBrowser", "ShowUsedInLevel", sAssetBrowserSettings.bShowUsedInLevel);
+    LoadValue("Settings\\AssetBrowser", "FilenameSearch", sAssetBrowserSettings.sFilenameSearch);
+    LoadValue("Settings\\AssetBrowser", "PresetName", sAssetBrowserSettings.sPresetName);
+    LoadValue("Settings\\AssetBrowser", "ShowDatabases", sAssetBrowserSettings.sVisibleDatabaseNames);
+    LoadValue("Settings\\AssetBrowser", "ShowFavorites", sAssetBrowserSettings.bShowFavorites);
+    LoadValue("Settings\\AssetBrowser", "HideLods", sAssetBrowserSettings.bHideLods);
+    LoadValue("Settings\\AssetBrowser", "AutoSaveFilterPreset", sAssetBrowserSettings.bAutoSaveFilterPreset);
+    LoadValue("Settings\\AssetBrowser", "AutoChangeViewportSelection", sAssetBrowserSettings.bAutoChangeViewportSelection);
+    LoadValue("Settings\\AssetBrowser", "AutoFilterFromViewportSelection", sAssetBrowserSettings.bAutoFilterFromViewportSelection);
+    LoadValue("Settings\\AssetBrowser", "VisibleColumnNames", sAssetBrowserSettings.sVisibleColumnNames);
+    LoadValue("Settings\\AssetBrowser", "ColumnNames", sAssetBrowserSettings.sColumnNames);
+
+    if (sAssetBrowserSettings.sVisibleColumnNames == ""
+        || sAssetBrowserSettings.sColumnNames == "")
+    {
+        sAssetBrowserSettings.sColumnNames =
+            sAssetBrowserSettings.sVisibleColumnNames = kDefaultColumnsForAssetBrowserList;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Deep Selection Settings
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings", "DeepSelectionNearness", deepSelectionSettings.fRange);
+    LoadValue("Settings", "StickDuplicate", deepSelectionSettings.bStickDuplicate);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Object Highlight Colors
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings\\ObjectColors", "GroupHighlight", objectColorSettings.groupHighlight);
+    LoadValue("Settings\\ObjectColors", "EntityHighlight", objectColorSettings.entityHighlight);
+    LoadValue("Settings\\ObjectColors", "BBoxAlpha", objectColorSettings.fBBoxAlpha);
+    LoadValue("Settings\\ObjectColors", "GeometryHighlightColor", objectColorSettings.geometryHighlightColor);
+    LoadValue("Settings\\ObjectColors", "SolidBrushGeometryHighlightColor", objectColorSettings.solidBrushGeometryColor);
+    LoadValue("Settings\\ObjectColors", "GeometryAlpha", objectColorSettings.fGeomAlpha);
+    LoadValue("Settings\\ObjectColors", "ChildGeometryAlpha", objectColorSettings.fChildGeomAlpha);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Smart file open settings
+    //////////////////////////////////////////////////////////////////////////
+    int soRcLeft = 0;
+    int soRcRight = 0;
+    int soRcTop = 0;
+    int soRcBottom = 0;
+
+    LoadValue("Settings\\SmartFileOpen", "LastSearchTerm", smartOpenSettings.lastSearchTerm);
+    LoadValue("Settings\\SmartFileOpen", "DlgRect.Left", soRcLeft);
+    LoadValue("Settings\\SmartFileOpen", "DlgRect.Top", soRcTop);
+    LoadValue("Settings\\SmartFileOpen", "DlgRect.Right", soRcRight);
+    LoadValue("Settings\\SmartFileOpen", "DlgRect.Bottom", soRcBottom);
+
+    // check for bad values
+    QRect screenRc = QGuiApplication::primaryScreen()->availableGeometry();
+
+    if (screenRc.contains(QPoint(soRcLeft, soRcTop))
+        && screenRc.contains(QPoint(soRcRight, soRcBottom)))
+    {
+        smartOpenSettings.rect.setLeft(soRcLeft);
+        smartOpenSettings.rect.setTop(soRcTop);
+        smartOpenSettings.rect.setRight(soRcRight);
+        smartOpenSettings.rect.setBottom(soRcBottom);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Slice settings
+    //////////////////////////////////////////////////////////////////////////
+    LoadValue("Settings\\Slices", "DynamicByDefault", sliceSettings.dynamicByDefault);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Load paths.
+    //////////////////////////////////////////////////////////////////////////
+    for (int id = 0; id < EDITOR_PATH_LAST; id++)
+    {
+        if (id == EDITOR_PATH_UI_ICONS) // Skip UI icons path, not load it.
+        {
+            continue;
+        }
+        int i = 0;
+        searchPaths[id].clear();
+        while (true)
+        {
+            const QString key = QStringLiteral("Path_%1_%2").arg(id, 2, 10, QLatin1Char('.')).arg(i, 2, 10, QLatin1Char('.'));
+            QString path;
+            LoadValue("Paths", key.toUtf8().data(), path);
+            if (path.isEmpty())
+            {
+                break;
+            }
+            searchPaths[id].push_back(path);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZ_CVAR(bool, ed_previewGameInFullscreen_once, false, nullptr, AZ::ConsoleFunctorFlags::IsInvisible, "Preview the game (Ctrl+G, \"Play Game\", etc.) in fullscreen once");
+
+void SEditorSettings::PostInitApply()
+{
+    if (!gEnv || !gEnv->pConsole)
+    {
+        return;
+    }
+
+    // Create CVars.
+    REGISTER_CVAR2("ed_highlightGeometry", &viewports.bHighlightMouseOverGeometry, viewports.bHighlightMouseOverGeometry, 0, "Highlight geometry when mouse over it");
+    REGISTER_CVAR2("ed_showFrozenHelpers", &viewports.nShowFrozenHelpers, viewports.nShowFrozenHelpers, 0, "Show helpers of frozen objects");
+    REGISTER_CVAR2("ed_lowercasepaths", &useLowercasePaths, useLowercasePaths, 0, "generate paths in lowercase");
+    gEnv->pConsole->RegisterInt("fe_fbx_savetempfile", 0, 0, "When importing an FBX file into Facial Editor, this will save out a conversion FSQ to the Animations/temp folder for trouble shooting");
+
+    REGISTER_CVAR2_CB("ed_toolbarIconSize", &gui.nToolbarIconSize, gui.nToolbarIconSize, VF_NULL, "Override size of the toolbar icons 0-default, 16,32,...", ToolbarIconSizeChanged);
+
+    GetIEditor()->SetEditorConfigSpec(editorConfigSpec, GetISystem()->GetConfigPlatform());
+    REGISTER_CVAR2("ed_backgroundUpdatePeriod", &backgroundUpdatePeriod, backgroundUpdatePeriod, 0, "Delay between frame updates (ms) when window is out of focus but not minimized. 0 = disable background update");
+    REGISTER_CVAR2("ed_showErrorDialogOnLoad", &showErrorDialogOnLoad, showErrorDialogOnLoad, 0, "Show error dialog on level load");
+    REGISTER_CVAR2_CB("ed_keepEditorActive", &keepEditorActive, 0, VF_NULL, "Keep the editor active, even if no focus is set", KeepEditorActiveChanged);
+    REGISTER_CVAR2("g_TemporaryLevelName", &g_TemporaryLevelName, "temp_level", VF_NULL, "Temporary level named used for experimental levels.");
+
+    CCryEditApp::instance()->KeepEditorActive(keepEditorActive > 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// needs to be called after crysystem has been loaded
+void SEditorSettings::LoadDefaultGamePaths()
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Default paths.
+    //////////////////////////////////////////////////////////////////////////
+    if (searchPaths[EDITOR_PATH_OBJECTS].empty())
+    {
+        searchPaths[EDITOR_PATH_OBJECTS].push_back((Path::GetEditingGameDataFolder() + "/Objects").c_str());
+    }
+    if (searchPaths[EDITOR_PATH_TEXTURES].empty())
+    {
+        searchPaths[EDITOR_PATH_TEXTURES].push_back((Path::GetEditingGameDataFolder() + "/Textures").c_str());
+    }
+    if (searchPaths[EDITOR_PATH_SOUNDS].empty())
+    {
+        searchPaths[EDITOR_PATH_SOUNDS].push_back((Path::GetEditingGameDataFolder() + "/Sounds").c_str());
+    }
+    if (searchPaths[EDITOR_PATH_MATERIALS].empty())
+    {
+        searchPaths[EDITOR_PATH_MATERIALS].push_back((Path::GetEditingGameDataFolder() + "/Materials").c_str());
+    }
+
+    AZStd::string iconsPath;
+    AZ::StringFunc::Path::Join(Path::GetEditingRootFolder().c_str(), "Editor/UI/Icons", iconsPath);
+    searchPaths[EDITOR_PATH_UI_ICONS].push_back(iconsPath.c_str());
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool SEditorSettings::BrowseTerrainTexture(bool bIsSave)
+{
+    QString path;
+
+    if (!terrainTextureExport.isEmpty())
+    {
+        path = Path::GetPath(terrainTextureExport);
+    }
+    else
+    {
+        path = Path::GetEditingGameDataFolder().c_str();
+    }
+
+    if (bIsSave)
+    {
+        return CFileUtil::SelectSaveFile("Bitmap Image File (*.bmp)", "bmp", path, terrainTextureExport);
+    }
+    else
+    {
+        return CFileUtil::SelectFile("Bitmap Image File (*.bmp)", path, terrainTextureExport);
+    }
+}
+
+void EnableSourceControl(bool enable)
+{
+    // Source control component
+    using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
+    SCRequestBus::Broadcast(&SCRequestBus::Events::EnableSourceControl, enable);
+}
+
+void SEditorSettings::SaveEnableSourceControlFlag(bool triggerUpdate /*= false*/)
+{
+    // Track the original source control value
+    bool originalSourceControlFlag;
+    LoadValue("Settings", "EnableSourceControl", originalSourceControlFlag);
+
+    // Update only on change
+    if (originalSourceControlFlag != enableSourceControl)
+    {
+        SaveValue("Settings", "EnableSourceControl", enableSourceControl);
+
+        // If we are triggering any update for the source control flag, then set the control state
+        if (triggerUpdate)
+        {
+            EnableSourceControl(enableSourceControl);
+        }
+    }
+}
+
+void SEditorSettings::LoadEnableSourceControlFlag()
+{
+    constexpr AZStd::string_view enableSourceControlKey = "/Amazon/Settings/EnableSourceControl";
+    bool sourceControlEnabledInSettingsRegistry{};
+    if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr &&
+        registry->Get(sourceControlEnabledInSettingsRegistry, enableSourceControlKey))
+    {
+        // Have the SettingsRegistry able to disable the SourceControl Connection
+        // only if the "EnableSourceControl" key is found
+        if (!sourceControlEnabledInSettingsRegistry)
+        {
+            EnableSourceControl(false);
+            return;
+        }
+    }
+    // Use the QSettings "EnableSourceControl" value if the SettingsRegistry
+    // hasn't disabled the SourceControlAPI
+    LoadValue("Settings", "EnableSourceControl", enableSourceControl);
+    EnableSourceControl(enableSourceControl);
+}
+
+AZStd::vector<AZStd::string> SEditorSettings::BuildSettingsList()
+{
+    if (GetIEditor()->GetSettingsManager())
+    {
+        // Will need to save the settings at least once to populate the list
+        // This will not affect the level nor prompt dialogs
+        Save();
+        return GetIEditor()->GetSettingsManager()->BuildSettingsList();
+    }
+
+    return AZStd::vector<AZStd::string>();
+}
+
+void SEditorSettings::ConvertPath(const AZStd::string_view sourcePath, AZStd::string& category, AZStd::string& attribute)
+{
+    // This API accepts pipe-separated paths like "Category1|Category2|AttributeName"
+    // But the SettingsManager requires 2 arguments, a Category like "Category1\Category2" and an attribute "AttributeName"
+    // The reason for the difference is to have this API be consistent with the path syntax in Open 3D Engine Python APIs.
+
+    // Find the last pipe separator ("|") in the path
+    int lastSeparator = sourcePath.find_last_of("|");
+
+    // Everything before the last separator is the category (since only the category is hierarchical)
+    category = sourcePath.substr(0, lastSeparator);
+
+    // Everything after the last separator is the attribute
+    attribute = sourcePath.substr(lastSeparator + 1, sourcePath.length());
+
+    // Replace pipes with backspaces in the category
+    AZStd::replace(category.begin(), category.end(), '|', '\\');
+}
+
+AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::GetValue(const AZStd::string_view path)
+{
+    if (path.find("|") < 0)
+    {
+        return { AZStd::string("Invalid Path - could not find separator \"|\"") };
+    }
+
+    AZStd::string category, attribute;
+    ConvertPath(path, category, attribute);
+
+    QString result;
+    LoadValue(category.c_str(), attribute.c_str(), result);
+
+    AZStd::string actualResult = result.toUtf8().data();
+
+    return { AZStd::any(actualResult) };
+}
+
+AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::SetValue(const AZStd::string_view path, const AZStd::any& value)
+{
+    if (path.find("|") < 0)
+    {
+        return { AZStd::string("Invalid Path - could not find separator \"|\"") };
+    }
+
+    AZStd::string category, attribute;
+    ConvertPath(path, category, attribute);
+
+    if (value.type() == azrtti_typeid<bool>())
+    {
+        bool val = AZStd::any_cast<bool>(value);
+        SaveValue(category.c_str(), attribute.c_str(), val);
+    }
+    else if (value.type() == azrtti_typeid<double>())
+    {
+        SaveValue(category.c_str(), attribute.c_str(), aznumeric_cast<float>(AZStd::any_cast<double>(value)));
+    }
+    else if (value.type() == azrtti_typeid<AZ::s64>())
+    {
+        SaveValue(category.c_str(), attribute.c_str(), aznumeric_cast<int>(AZStd::any_cast<AZ::s64>(value)));
+    }
+    else if (value.type() == azrtti_typeid<AZStd::string>())
+    {
+        SaveValue(category.c_str(), attribute.c_str(), QString(AZStd::any_cast<AZStd::string>(value).c_str()));
+    }
+    else if (value.type() == azrtti_typeid<AZStd::string_view>())
+    {
+        SaveValue(category.c_str(), attribute.c_str(), QString(AZStd::any_cast<AZStd::string_view>(value).data()));
+    }
+    else
+    {
+        return { AZStd::string("Invalid Value Type - supported types: string, bool, int, float") };
+    }
+
+    // Reload the changes in the Settings object used in the Editor
+    Load();
+
+    return { value };
+}
+
+void SEditorSettings::SaveSettingsRegistryFile()
+{
+    auto registry = AZ::SettingsRegistry::Get();
+    if (registry == nullptr)
+    {
+        AZ_Warning("SEditorSettings", false, "Unable to access global settings registry. Editor Preferences cannot be saved");
+        return;
+    }
+
+    // Resolve path to editorpreferences.setreg
+    AZ::IO::FixedMaxPath editorPreferencesFilePath = AZ::Utils::GetProjectPath();
+    editorPreferencesFilePath /= "user/Registry/editorpreferences.setreg";
+
+    AZ::SettingsRegistryMergeUtils::DumperSettings dumperSettings;
+    dumperSettings.m_prettifyOutput = true;
+    dumperSettings.m_jsonPointerPrefix = "/Amazon/Preferences";
+
+    AZStd::string stringBuffer;
+    AZ::IO::ByteContainerStream stringStream(&stringBuffer);
+    if (!AZ::SettingsRegistryMergeUtils::DumpSettingsRegistryToStream(*registry, "/Amazon/Preferences", stringStream, dumperSettings))
+    {
+        AZ_Warning("SEditorSettings", false, R"(Unable to save changes to the Editor Preferences registry file at "%s"\n)",
+            editorPreferencesFilePath.c_str());
+        return;
+    }
+
+    bool saved{};
+    constexpr auto configurationMode = AZ::IO::SystemFile::SF_OPEN_CREATE
+        | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH
+        | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
+    if (AZ::IO::SystemFile outputFile; outputFile.Open(editorPreferencesFilePath.c_str(), configurationMode))
+    {
+        saved = outputFile.Write(stringBuffer.data(), stringBuffer.size()) == stringBuffer.size();
+    }
+
+    AZ_Warning("SEditorSettings", saved, R"(Unable to save Editor Preferences registry file to path "%s"\n)",
+        editorPreferencesFilePath.c_str());
+}
+
+bool SEditorSettings::SetSettingsRegistry_Bool(const char* key, bool value)
+{
+    if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr)
+    {
+        return registry->Set(key, value);
+    }
+
+    return false;
+}
+
+bool SEditorSettings::GetSettingsRegistry_Bool(const char* key, bool& value)
+{
+    if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr)
+    {
+        return registry->Get(value, key);
+    }
+
+    return false;
+}
+
+AzToolsFramework::ConsoleColorTheme SEditorSettings::GetConsoleColorTheme() const
+{
+    return consoleBackgroundColorTheme;
+}
diff --git a/Code/Editor/Settings.h b/Code/Editor/Settings.h
new file mode 100644
index 0000000000..cef77de6a7
--- /dev/null
+++ b/Code/Editor/Settings.h
@@ -0,0 +1,494 @@
+/*
+ * 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_EDITOR_SETTINGS_H
+#define CRYINCLUDE_EDITOR_SETTINGS_H
+#include "SettingsManager.h"
+
+#include <QColor>
+#include <QFont>
+#include <QRect>
+#include <QSettings>
+
+#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
+#include <AzCore/JSON/document.h>
+
+#include <AzQtComponents/Components/Widgets/ToolBar.h>
+
+struct SGizmoSettings
+{
+    float axisGizmoSize;
+    bool axisGizmoText;
+    int axisGizmoMaxCount;
+
+    float helpersScale;
+    float tagpointScaleMulti;
+
+    // Scale size and transparency for debug spheres when using Ruler tool
+    float rulerSphereScale;
+    float rulerSphereTrans;
+
+    SGizmoSettings();
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Settings for snapping in the viewports.
+//////////////////////////////////////////////////////////////////////////
+struct SSnapSettings
+{
+    SSnapSettings()
+    {
+        constructPlaneDisplay = false;
+        constructPlaneSize = 5;
+
+        markerDisplay = false;
+        markerColor = QColor(0, 200, 200);
+        markerSize = 1.0f;
+
+        bGridUserDefined = false;
+        bGridGetFromSelected = false;
+    }
+
+    // Display settings for construction plane.
+    bool  constructPlaneDisplay;
+    float constructPlaneSize;
+
+    // Display settings for snapping marker.
+    bool  markerDisplay;
+    QColor markerColor;
+    float markerSize;
+
+    bool bGridUserDefined;
+    bool bGridGetFromSelected;
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+// Settings for View of Tools
+//////////////////////////////////////////////////////////////////////////
+struct SToolViewSettings
+{
+    SToolViewSettings()
+    {
+    }
+
+    int nFrameRate;
+    QString codec;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Settings for deep selection.
+//////////////////////////////////////////////////////////////////////////
+struct SDeepSelectionSettings
+{
+    SDeepSelectionSettings()
+        : fRange(1.f)
+        , bStickDuplicate(false) {}
+
+    //! If there are other objects hit within this value, one of them needs
+    //! to be selected by user.
+    //! If this value is 0.f, then deep selection mode won't work.
+    float fRange;
+    bool bStickDuplicate;
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct SObjectColors
+{
+    SObjectColors()
+    {
+        groupHighlight = QColor(0, 255, 0);
+        entityHighlight = QColor(112, 117, 102);
+        fBBoxAlpha = 0.3f;
+        geometryHighlightColor = QColor(192, 0, 192);
+        solidBrushGeometryColor = QColor(192, 0, 192);
+        fGeomAlpha = 0.2f;
+        fChildGeomAlpha = 0.4f;
+    }
+
+    QColor groupHighlight;
+    QColor entityHighlight;
+    QColor geometryHighlightColor;
+    QColor solidBrushGeometryColor;
+
+    float fBBoxAlpha;
+    float fGeomAlpha;
+    float fChildGeomAlpha;
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct SViewportsSettings
+{
+    //! If enabled always show entity radiuse.
+    bool bAlwaysShowRadiuses;
+    //! True if 2D viewports will be synchronized with same view and origin.
+    bool bSync2DViews;
+    //! Camera FOV for perspective View.
+    float fDefaultFov;
+    //! Camera Aspect Ratio for perspective View.
+    float fDefaultAspectRatio;
+    //! Show safe frame.
+    bool bShowSafeFrame;
+    //! To highlight selected geometry.
+    bool bHighlightSelectedGeometry;
+    //! To highlight selected vegetation.
+    bool bHighlightSelectedVegetation;
+
+    //! To highlight selected geometry.
+    int bHighlightMouseOverGeometry;
+
+    //! Show triangle count on mouse over
+    bool bShowMeshStatsOnMouseOver;
+
+    //! If enabled will always display entity labels.
+    bool bDrawEntityLabels;
+    //! Show Trigger bounds.
+    bool bShowTriggerBounds;
+    //! Show Icons in viewport.
+    bool bShowIcons;
+    //! Scale icons with distance, so they aren't a fixed size no matter how far away you are
+    bool bDistanceScaleIcons;
+
+    //! Show Size-based Icons in viewport.
+    bool bShowSizeBasedIcons;
+
+    //! Show Helpers in viewport for frozen objects.
+    int nShowFrozenHelpers;
+    //! Fill Selected Shapes.
+    bool bFillSelectedShapes;
+
+    // Swap X/Y in map viewport.
+    bool bTopMapSwapXY;
+    // Texture resolution in the Top map viewport.
+    int nTopMapTextureResolution;
+
+    // Whether the grid guide (for move/rotate tool) will be shown or not.
+    bool bShowGridGuide;
+
+    // Whether the mouse cursor will be hidden when capturing the mouse.
+    bool bHideMouseCursorWhenCaptured;
+
+    // Size of square which the mouse must leave before a drag operation begins.
+    int nDragSquareSize;
+
+    // Enable context menu in the viewport
+    bool bEnableContextMenu;
+
+    //! Warning icons draw distance
+    float fWarningIconsDrawDistance;
+    //! Warnings for scale != 1
+    bool bShowScaleWarnings;
+    //! Warnings for rotation != 0
+    bool bShowRotationWarnings;
+};
+
+struct SSelectObjectDialogSettings
+{
+    QString columns;
+    int nLastColumnSortDirection;
+
+    SSelectObjectDialogSettings()
+        : nLastColumnSortDirection(0)
+    {
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct SGUI_Settings
+{
+    bool bWindowsVista;        // true when running on windows Vista
+    QFont hSystemFont;         // Default system GUI font.
+    QFont hSystemFontBold;     // Default system GUI bold font.
+    QFont hSystemFontItalic;   // Default system GUI italic font.
+    int nDefaultFontHieght;    // Default font height for 8 logical units.
+
+    int nToolbarIconSize;      // Override size of the toolbar icons
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct STextureBrowserSettings
+{
+    int nCellSize; // Stores the default texture maximum cell size for
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct SExperimentalFeaturesSettings
+{
+    bool bTotalIlluminationEnabled;
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct SSliceSettings
+{
+    bool dynamicByDefault;
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct SAssetBrowserSettings
+{
+    // stores the default thumb size
+    int nThumbSize;
+    // the current filename search filter in the search edit box
+    QString sFilenameSearch,
+    // the current filter preset name
+            sPresetName;
+    // current selected/checked/visible databases, db names separated by comma (,), Ex: "Textures,Models,Sounds"
+    QString sVisibleDatabaseNames;
+    // current visible columns in asset list
+    QString sVisibleColumnNames;
+    // current columns in asset list, in their actual order (including visible and hidden columns)
+    QString sColumnNames;
+    // check to show only the assets used in current level
+    bool bShowUsedInLevel,
+    // check to show only the assets loaded in the current level
+         bShowLoadedInLevel,
+    // check to filter only the favorite assets
+         bShowFavorites,
+    // hide LODs from thumbs view, for CGFs for example
+         bHideLods,
+    // true when the edited filter preset was changed, it will be saved automatically, without the user to push the "Save" button
+         bAutoSaveFilterPreset,
+    // true when we want sync between asset browser selection and viewport selection
+         bAutoChangeViewportSelection,
+    // true when we want sync between viewport selection and asset browser visible thumbs
+         bAutoFilterFromViewportSelection;
+};
+
+struct SSmartOpenDialogSettings
+{
+    QRect rect;
+    QString lastSearchTerm;
+};
+
+//////////////////////////////////////////////////////////////////////////
+/** Various editor settings.
+*/
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+struct SANDBOX_API SEditorSettings
+    : AzToolsFramework::EditorSettingsAPIBus::Handler
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    SEditorSettings();
+    ~SEditorSettings() = default;
+    void    Save();
+    void    Load();
+    void    LoadCloudSettings();
+
+    void Connect();
+    void Disconnect();
+
+    // EditorSettingsAPIBus...
+    AZStd::vector<AZStd::string> BuildSettingsList() override;
+    SettingOutcome GetValue(const AZStd::string_view path) override;
+    SettingOutcome SetValue(const AZStd::string_view path, const AZStd::any& value) override;
+    AzToolsFramework::ConsoleColorTheme GetConsoleColorTheme() const override;
+
+    void ConvertPath(const AZStd::string_view sourcePath, AZStd::string& category, AZStd::string& attribute);
+
+    // needs to be called after crysystem has been loaded
+    void    LoadDefaultGamePaths();
+
+    // need to expose updating of the source control enable/disable flag
+    // because its state is updateable through the main status bar
+    void SaveEnableSourceControlFlag(bool triggerUpdate = false);
+
+    void LoadEnableSourceControlFlag();
+
+    void PostInitApply();
+
+    bool BrowseTerrainTexture(bool bIsSave);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Variables.
+    //////////////////////////////////////////////////////////////////////////
+    int undoLevels;
+    bool m_undoSliceOverrideSaveValue;
+    bool bShowDashboardAtStartup;
+    bool m_showCircularDependencyError;
+    bool bAutoloadLastLevelAtStartup;
+    bool bMuteAudio;
+    bool bEnableGameModeVR;
+
+    //! Speed of camera movement.
+    float cameraMoveSpeed;
+    float cameraRotateSpeed;
+    float cameraFastMoveSpeed;
+    float wheelZoomSpeed;
+    bool invertYRotation;
+    bool invertPan;
+    bool stylusMode; // if stylus mode is enabled, no setCursorPos will be performed (WACOM tablets, etc)
+    bool restoreViewportCamera; // When true, restore the original editor viewport camera when exiting game mode
+
+    //! Hide mask for objects.
+    int objectHideMask;
+
+    //! Selection mask for objects.
+    int objectSelectMask;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Viewport settings.
+    //////////////////////////////////////////////////////////////////////////
+    SViewportsSettings viewports;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    SToolViewSettings toolViewSettings;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Files.
+    //////////////////////////////////////////////////////////////////////////
+
+    //! Before saving, make a backup into a subfolder
+    bool bBackupOnSave;
+    //! how many save backups to keep
+    int backupOnSaveMaxCount;
+
+    int useLowercasePaths;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Autobackup.
+    //////////////////////////////////////////////////////////////////////////
+    //! Save auto backup file every autoSaveTime minutes.
+    int autoBackupTime;
+    //! Keep only several last autobackups.
+    int autoBackupMaxCount;
+    //! When this variable set to true automatic file backup is enabled.
+    bool autoBackupEnabled;
+    //! After this amount of minutes message box with reminder to save will pop on.
+    int autoRemindTime;
+    //////////////////////////////////////////////////////////////////////////
+
+
+    //! If true preview windows is displayed when browsing geometries.
+    bool bPreviewGeometryWindow;
+
+    int showErrorDialogOnLoad;
+
+    //! Keeps the editor active even if no focus is set
+    int keepEditorActive;
+
+    SGizmoSettings gizmo;
+
+    // Settings of the snapping.
+    SSnapSettings snap;
+
+    //! Source Control Enabling.
+    bool enableSourceControl;
+
+    //! Text editor.
+    QString textEditorForScript;
+    QString textEditorForShaders;
+    QString textEditorForBspaces;
+
+    //! Asset editors
+    QString textureEditor;
+    QString animEditor;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Editor data search paths.
+    QStringList searchPaths[10]; // EDITOR_PATH_LAST
+
+    // This directory is related to the editor root.
+    QString strStandardTempDirectory;
+
+    SGUI_Settings gui;
+
+    bool              bApplyConfigSpecInEditor;
+
+    ESystemConfigSpec editorConfigSpec;
+
+    //! Terrain Texture Export/Import filename.
+    QString terrainTextureExport;
+
+    // Read only parameter.
+    // Refects the status of GetIEditor()->GetOperationMode
+    // To change current operation mode use GetIEditor()->SetOperationMode
+    // see EOperationMode
+    int operationMode;
+
+    // For the texture browser configurations.
+    STextureBrowserSettings sTextureBrowserSettings;
+
+    // Experimental features configurations.
+    SExperimentalFeaturesSettings sExperimentalFeaturesSettings;
+
+    // For the asset browser configurations.
+    SAssetBrowserSettings sAssetBrowserSettings;
+
+    SSelectObjectDialogSettings selectObjectDialog;
+
+    // For Terrain Texture Generation Multiplier.
+    float fBrMultiplier;
+
+    AzToolsFramework::ConsoleColorTheme consoleBackgroundColorTheme;
+
+    bool bShowTimeInConsole;
+
+    // Enable the option do get detailed information about the loaded scene data in the Scene Settings window.
+    bool enableSceneInspector;
+
+    // Deep Selection Mode Settings
+    SDeepSelectionSettings deepSelectionSettings;
+
+    // Object Highlight Settings
+    SObjectColors objectColorSettings;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    SSmartOpenDialogSettings smartOpenSettings;
+
+    bool bSettingsManagerMode;
+
+    bool bAutoSaveTagPoints;
+
+    bool bNavigationContinuousUpdate;
+    bool bNavigationShowAreas;
+    bool bNavigationDebugDisplay;
+    bool bVisualizeNavigationAccessibility;
+    int  navigationDebugAgentType;
+
+    int backgroundUpdatePeriod;
+    const char* g_TemporaryLevelName;
+
+    SSliceSettings sliceSettings;
+
+    bool prefabSystem = true;                  ///< Toggle to enable/disable the Prefab system for level entities.
+
+private:
+    void SaveValue(const char* sSection, const char* sKey, int value);
+    void SaveValue(const char* sSection, const char* sKey, const QColor& value);
+    void SaveValue(const char* sSection, const char* sKey, float value);
+    void SaveValue(const char* sSection, const char* sKey, const QString& value);
+
+    void LoadValue(const char* sSection, const char* sKey, int& value);
+    void LoadValue(const char* sSection, const char* sKey, QColor& value);
+    void LoadValue(const char* sSection, const char* sKey, float& value);
+    void LoadValue(const char* sSection, const char* sKey, bool& value);
+    void LoadValue(const char* sSection, const char* sKey, QString& value);
+    void LoadValue(const char* sSection, const char* sKey, ESystemConfigSpec& value);
+
+    void SaveCloudSettings();
+
+    void SaveSettingsRegistryFile();
+
+    //! Set a boolean setting value from the registry.
+    //! \param key[in] The key to set.
+    //! \param value[in] The new value for the setting.
+    //! \return Whether the value for the key was correctly set in the registry.
+    bool SetSettingsRegistry_Bool(const char* key, bool value);
+
+    //! Gets a boolean setting value from the registry.
+    //! \param key[in] The key to query.
+    //! \param value[out] The variable the queried value will be saved to, by reference.
+    //! \return Whether a value for the key was found in the registry.
+    bool GetSettingsRegistry_Bool(const char* key, bool& value);
+};
+
+//! Single instance of editor settings for fast access.
+SANDBOX_API extern SEditorSettings gSettings;
+
+#endif // CRYINCLUDE_EDITOR_SETTINGS_H
diff --git a/Code/Editor/SettingsManager.cpp b/Code/Editor/SettingsManager.cpp
new file mode 100644
index 0000000000..66b610aa2e
--- /dev/null
+++ b/Code/Editor/SettingsManager.cpp
@@ -0,0 +1,993 @@
+/*
+ * 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 "SettingsManager.h"
+
+// Qt
+#include <QDateTime>
+
+// Editor
+#include "Settings.h"
+#include "MainWindow.h"
+#include "ToolBox.h"
+#include "QtViewPaneManager.h"
+
+
+#define TOOLBOX_FILE "ToolBox.xml"
+#define TOOLBOX_NODE "ToolBox"
+
+CSettingsManager::CSettingsManager(EditorSettingsManagerType managerType)
+{
+    if (managerType < eSettingsManagerLast)
+    {
+        m_managerType = managerType;
+    }
+    else
+    {
+        managerType = eSettingsManagerMemoryStorage;
+    }
+
+    if (m_managerType == eSettingsManagerMemoryStorage)
+    {
+        m_pSettingsManagerMemoryNode = XmlHelpers::CreateXmlNode(EDITOR_SETTINGS_ROOT_NODE);
+    }
+
+    // Main frame layouts must be processed as first
+    AddToolName(QStringLiteral(MAINFRM_LAYOUT_NORMAL), QStringLiteral("Sandbox Layout"));
+    AddToolName(QStringLiteral(MAINFRM_LAYOUT_PREVIEW), QStringLiteral("Sandbox Preview Layout"));
+
+    CreateDefaultLayoutSettingsFile();
+
+    QDateTime theTime = QDateTime::currentDateTimeUtc();
+    SaveLogEventSetting("EditorStart", "time", theTime.toString(LOG_DATETIME_FORMAT));
+}
+
+CSettingsManager::~CSettingsManager()
+{
+}
+
+void CSettingsManager::SaveLayoutSettings(const QByteArray& layout, const QString& toolName)
+{
+    if (m_managerType == eSettingsManagerMemoryStorage)
+    {
+        XmlNodeRef rootLayoutNode = m_pSettingsManagerMemoryNode->findChild(EDITOR_LAYOUT_ROOT_NODE);
+        if (rootLayoutNode)
+        {
+            XmlNodeRef xmlDockingLayoutNode = rootLayoutNode->findChild(EDITOR_LAYOUT_NODE);
+
+            if (!xmlDockingLayoutNode)
+            {
+                return;
+            }
+
+            XmlNodeRef toolNode = xmlDockingLayoutNode->findChild(toolName.toUtf8().data());
+
+            if (toolNode)
+            {
+                xmlDockingLayoutNode->removeChild(toolNode);
+            }
+
+            toolNode = XmlHelpers::CreateXmlNode(toolName.toUtf8().data());
+            xmlDockingLayoutNode->addChild(toolNode);
+
+            XmlNodeRef windowStateNode = XmlHelpers::CreateXmlNode("WindowState");
+            toolNode->addChild(windowStateNode);
+
+            windowStateNode->setContent(layout.toHex().data());
+        }
+    }
+}
+
+bool CSettingsManager::CreateDefaultLayoutSettingsFile()
+{
+    XmlNodeRef pLayoutRootNode = XmlHelpers::CreateXmlNode(EDITOR_LAYOUT_ROOT_NODE);
+    XmlNodeRef pEditorLayoutNode = XmlHelpers::CreateXmlNode(EDITOR_LAYOUT_NODE);
+
+    pLayoutRootNode->addChild(pEditorLayoutNode);
+
+    if (m_pSettingsManagerMemoryNode->findChild(EDITOR_LAYOUT_ROOT_NODE))
+    {
+        m_pSettingsManagerMemoryNode->removeChild(m_pSettingsManagerMemoryNode->findChild(EDITOR_LAYOUT_ROOT_NODE));
+    }
+
+    m_pSettingsManagerMemoryNode->addChild(pLayoutRootNode);
+
+    return true;
+}
+
+AZStd::vector<AZStd::string> CSettingsManager::BuildSettingsList()
+{
+    XmlNodeRef root = NULL;
+
+    root = m_pSettingsManagerMemoryNode;
+
+    XmlNodeRef tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
+    if (!tmpNode)
+    {
+        root->addChild(root->createNode(EDITOR_SETTINGS_CONTENT_NODE));
+        tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
+
+        if (!tmpNode)
+        {
+            AZ_Warning("Settings Manager", false, "Failed to build the settings list - could not find the root xml node.");
+            return AZStd::vector<AZStd::string>();
+        }
+    }
+
+    AZStd::vector<AZStd::string> result;
+    BuildSettingsList_Helper(tmpNode, "", result);
+
+    return result;
+}
+
+void CSettingsManager::BuildSettingsList_Helper(const XmlNodeRef& node, const AZStd::string_view& pathToNode, AZStd::vector<AZStd::string>& result)
+{
+    for (int i = 0; i < node->getNumAttributes(); ++i)
+    {
+        const char* key = NULL;
+        const char* value = NULL;
+        node->getAttributeByIndex(i, &key, &value);
+        if (!pathToNode.empty())
+        {
+            result.push_back(AZStd::string(pathToNode));
+        }
+    }
+
+    if (node->getChildCount() > 0)
+    {
+        // Explore Children
+        int numChildren = node->getChildCount();
+        for (int i = 0; i < numChildren; ++i)
+        {
+            if (pathToNode.empty())
+            {
+                BuildSettingsList_Helper(
+                    node->getChild(i),
+                    node->getChild(i)->getTag(),
+                    result
+                );
+            }
+            else
+            {
+                BuildSettingsList_Helper(
+                    node->getChild(i),
+                    AZStd::string(pathToNode) + "|" + node->getChild(i)->getTag(),
+                    result
+                );
+            }
+            
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSettingsManager::SaveSetting(const QString& path, const QString& attr, const QString& val)
+{
+    QStringList strNodes;
+
+    QString fixedPath = path;
+
+    // Make sure it ends with "\" before extraction of tokens
+    QString slashChar = fixedPath.right(fixedPath.length() - 1);
+
+    if (slashChar != "\\")
+    {
+        fixedPath += "\\";
+    }
+
+    Path::GetDirectoryQueue(fixedPath, strNodes);
+
+    QString writeAttr = attr;
+
+    // Spaces in node names not allowed
+    writeAttr.replace(" ", "");
+
+    XmlNodeRef root = NULL;
+
+    root = m_pSettingsManagerMemoryNode;
+
+    XmlNodeRef tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
+    if (!tmpNode)
+    {
+        root->addChild(root->createNode(EDITOR_SETTINGS_CONTENT_NODE));
+        tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
+
+        if (!tmpNode)
+        {
+            return;
+        }
+    }
+
+    for (int i = 0; i < strNodes.size(); ++i)
+    {
+        if (!tmpNode->findChild(strNodes[i].toUtf8().data()))
+        {
+            tmpNode->addChild(tmpNode->createNode(strNodes[i].toUtf8().data()));
+            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
+        }
+        else
+        {
+            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
+        }
+    }
+
+    if (!tmpNode->findChild(writeAttr.toUtf8().data()))
+    {
+        tmpNode->addChild(tmpNode->createNode(writeAttr.toUtf8().data()));
+        tmpNode = tmpNode->findChild(writeAttr.toUtf8().data());
+    }
+    else
+    {
+        tmpNode = tmpNode->findChild(writeAttr.toUtf8().data());
+    }
+
+    if (!tmpNode)
+    {
+        return;
+    }
+
+    tmpNode->setAttr(EDITOR_SETTINGS_ATTRIB_NAME, val.toUtf8().data());
+}
+
+void CSettingsManager::SaveSetting(const QString& path, const QString& attr, bool bVal)
+{
+    SaveSetting(path, attr, QString ::number(bVal));
+}
+
+void CSettingsManager::SaveSetting(const QString& path, const QString& attr, float fVal)
+{
+    SaveSetting(path, attr, QString::number(fVal));
+}
+
+void CSettingsManager::SaveSetting(const QString& path, const QString& attr, int iVal)
+{
+    SaveSetting(path, attr, QString::number(iVal));
+}
+
+void CSettingsManager::SaveSetting(const QString& path, const QString& attr, QColor color)
+{
+    SaveSetting(path, attr, color.name());
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CSettingsManager::LoadSetting(const QString& path, const QString& attr, QString& val)
+{
+    // Make sure it ends with "\" before extraction of tokens
+    QString fixedPath = path;
+    QString slashChar = fixedPath.right(fixedPath.length() - 1);
+
+    if (slashChar != "\\")
+    {
+        fixedPath += "\\";
+    }
+
+    QStringList strNodes;
+    Path::GetDirectoryQueue(fixedPath, strNodes);
+    QString readAttr = attr;
+
+    // Spaces in node names not allowed
+    readAttr.replace(" ", "");
+
+    XmlNodeRef root = NULL;
+
+    root = m_pSettingsManagerMemoryNode;
+
+    XmlNodeRef tmpNode = NULL;
+
+    if (NeedSettingsNode(path))
+    {
+        tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
+    }
+    else
+    {
+        tmpNode = root;
+    }
+
+    if (!tmpNode)
+    {
+        return 0;
+    }
+
+    for (int i = 0; i < strNodes.size(); ++i)
+    {
+        if (tmpNode->findChild(strNodes[i].toUtf8().data()))
+        {
+            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    if (!tmpNode->findChild(readAttr.toUtf8().data()))
+    {
+        return 0;
+    }
+    else
+    {
+        tmpNode = tmpNode->findChild(readAttr.toUtf8().data());
+    }
+
+    if (tmpNode->haveAttr(EDITOR_SETTINGS_ATTRIB_NAME))
+    {
+        tmpNode->getAttr(EDITOR_SETTINGS_ATTRIB_NAME, val);
+    }
+
+    return tmpNode;
+}
+
+void CSettingsManager::LoadSetting(const QString& path, const QString& attr, bool& bVal)
+{
+    QString defaultVal = QString::number(bVal);
+    LoadSetting(path, attr, defaultVal);
+    bVal = defaultVal.toInt() != 0;
+}
+
+void CSettingsManager::LoadSetting(const QString& path, const QString& attr, int& iVal)
+{
+    QString defaultVal = QString::number(iVal);
+    LoadSetting(path, attr, defaultVal);
+    iVal = defaultVal.toInt();
+}
+
+void CSettingsManager::LoadSetting(const QString& path, const QString& attr, float& fVal)
+{
+    QString defaultVal = QString::number(fVal, 'g');
+    LoadSetting(path, attr, defaultVal);
+    fVal = defaultVal.toFloat();
+}
+
+void CSettingsManager::LoadSetting(const QString& path, const QString& attr, QColor &val)
+{
+    QString defaultVal = val.name();
+    LoadSetting(path, attr, defaultVal);
+    val = QColor(defaultVal);
+}
+
+void CSettingsManager::AddToolVersion(const QString& toolName, const QString& toolVersion)
+{
+    if (toolName.isEmpty())
+    {
+        return;
+    }
+
+    if (stl::find_in_map(m_toolNames, toolName, NULL) == "")
+    {
+        if (!toolVersion.isEmpty())
+        {
+            m_toolVersions[toolName] = toolVersion;
+        }
+        else
+        {
+            m_toolVersions[toolName] = "";
+        }
+    }
+};
+
+void CSettingsManager::AddToolName(const QString& toolName, const QString& humanReadableName)
+{
+    if (toolName == "")
+    {
+        return;
+    }
+
+    if (stl::find_in_map(m_toolNames, toolName, NULL) == "")
+    {
+        if (!humanReadableName.isEmpty())
+        {
+            m_toolNames[toolName] = humanReadableName;
+        }
+        else
+        {
+            m_toolNames[toolName] = toolName;
+        }
+    }
+};
+
+void CSettingsManager::AddSettingsNode(XmlNodeRef newNode)
+{
+    QString nodeStr = newNode->getTag();
+
+    XmlNodeRef oldNode = m_pSettingsManagerMemoryNode->findChild(nodeStr.toUtf8().data());
+
+    if (oldNode)
+    {
+        m_pSettingsManagerMemoryNode->removeChild(oldNode);
+    }
+
+    m_pSettingsManagerMemoryNode->addChild(newNode);
+}
+
+void CSettingsManager::ExportSettings(XmlNodeRef exportNode, QString fileName)
+{
+    exportNode->saveToFile(fileName.toUtf8().data());
+}
+
+void CSettingsManager::Export()
+{
+    // Feed in-memory node of CSettingsManager with global Sandbox settings
+    gSettings.Load();
+
+    if (m_ExportFilePath.isEmpty())
+    {
+        return;
+    }
+
+    // Update to the latest layout
+    UpdateLayoutNode();
+
+    // Save CVars
+    SerializeCVars(m_pSettingsManagerMemoryNode, false);
+
+    m_pSettingsManagerMemoryNode->saveToFile(m_ExportFilePath.toUtf8().data());
+
+    GetIEditor()->SetStatusText("Export Successful");
+}
+
+void CSettingsManager::UpdateLayoutNode()
+{
+    QtViewPaneManager::instance()->SaveLayout();
+
+    XmlNodeRef rootLayoutNode = m_pSettingsManagerMemoryNode->findChild(EDITOR_LAYOUT_ROOT_NODE);
+    if (!rootLayoutNode)
+    {
+        return;
+    }
+
+    XmlNodeRef xmlDockingLayoutNode = rootLayoutNode->findChild(EDITOR_LAYOUT_NODE);
+    if (!xmlDockingLayoutNode)
+    {
+        return;
+    }
+
+    xmlDockingLayoutNode->removeAllChilds();
+
+    // serialize layout for main window
+
+    XmlNodeRef xmlMainFrameLayoutNode = XmlHelpers::CreateXmlNode(MAINFRM_LAYOUT_NORMAL);
+    xmlDockingLayoutNode->addChild(xmlMainFrameLayoutNode);
+
+    QtViewPaneManager::instance()->SerializeLayout(xmlMainFrameLayoutNode);
+
+    // serialize layout for panes
+
+    TToolNamesMap::const_iterator tIt;
+    for (tIt = m_toolNames.begin(); tIt != m_toolNames.end(); ++tIt)
+    {
+        const QString& toolName = tIt->first;
+
+        QMainWindow* pane = FindViewPane<QMainWindow>(tIt->second);
+        if (pane)
+        {
+            SaveLayoutSettings(pane->saveState(), toolName);
+        }
+    }
+}
+
+void CSettingsManager::GetMatchingLayoutNames(TToolNamesMap& foundTools, XmlNodeRef& resultNode, QString file)
+{
+    // Need to populate in-memory node with available layouts.
+    UpdateLayoutNode();
+
+    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(file.toUtf8().data());
+
+    if (!root)
+    {
+        return;
+    }
+
+    root = root->findChild(EDITOR_LAYOUT_ROOT_NODE);
+
+    if (!root)
+    {
+        return;
+    }
+
+    root = root->findChild(EDITOR_LAYOUT_NODE);
+
+    if (!root)
+    {
+        return;
+    }
+
+    TToolNamesMap* toolNames = NULL;
+
+    if (!foundTools.empty())
+    {
+        toolNames = &foundTools;
+    }
+    else
+    {
+        toolNames = GetToolNames();
+    }
+
+    if (!toolNames)
+    {
+        return;
+    }
+
+    if (toolNames->empty())
+    {
+        return;
+    }
+
+    // toolIT->first is tool layout node name in XML file
+    TToolNamesMap::const_iterator toolIT = toolNames->begin();
+
+    for (; toolIT != toolNames->end(); ++toolIT)
+    {
+        if (root->findChild(toolIT->first.toUtf8().data()))
+        {
+            foundTools[toolIT->first] = toolIT->second;
+
+            if (resultNode)
+            {
+                resultNode->addChild(root->findChild(toolIT->first.toUtf8().data()));
+            }
+        }
+    }
+}
+
+void CSettingsManager::ImportSettings(QString file)
+{
+    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(file.toUtf8().data());
+
+    if (!root)
+    {
+        return;
+    }
+
+    XmlNodeRef importedSettingsContentNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
+
+    if (!importedSettingsContentNode)
+    {
+        return;
+    }
+
+    // Remove old settings node
+    XmlNodeRef oldSettingsContentNode = m_pSettingsManagerMemoryNode->findChild(EDITOR_SETTINGS_CONTENT_NODE);
+    m_pSettingsManagerMemoryNode->removeChild(oldSettingsContentNode);
+
+    // Add new, imported settings node
+    m_pSettingsManagerMemoryNode->addChild(importedSettingsContentNode);
+
+    // Force global settings to reload from memory node instead of registry
+    gSettings.bSettingsManagerMode = true;
+    gSettings.Load();
+    gSettings.bSettingsManagerMode = false;
+
+    // Dump ToolBox node on disk, replacing the old one
+    XmlNodeRef toolBoxNode =  root->findChild(TOOLBOX_NODE);
+    if (toolBoxNode)
+    {
+        toolBoxNode->saveToFile(TOOLBOX_FILE);
+    }
+
+    // Dump UserTools node on disk, replacing the old one
+    XmlNodeRef userToolsNode =  root->findChild(TOOLBOXMACROS_NODE);
+
+    if (userToolsNode)
+    {
+        QString macroFilePath;
+        GetIEditor()->GetToolBoxManager()->GetSaveFilePath(macroFilePath);
+        userToolsNode->saveToFile(macroFilePath.toUtf8().data());
+        GetIEditor()->GetToolBoxManager()->Load();
+    }
+
+    // Get and update CVars
+    SerializeCVars(root, true);
+
+    GetIEditor()->SetStatusText("Import Successful");
+}
+
+bool CSettingsManager::NeedSettingsNode(const QString& path)
+{
+    if ((path != EDITOR_LAYOUT_ROOT_NODE) && (path != TOOLBOX_NODE) && (path != TOOLBOXMACROS_NODE))
+    {
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+void CSettingsManager::SerializeCVars(XmlNodeRef& node, bool bLoad)
+{
+    int nNumberOfVariables(0);
+    int nCurrentVariable(0);
+    IConsole* piConsole(NULL);
+    ICVar* piVariable(NULL);
+    std::vector<char*>  cszVariableNames;
+
+    char* szKey(NULL);
+    char* szValue(NULL);
+    ICVar* piCVar(NULL);
+
+    piConsole = gEnv->pConsole;
+
+    if (!piConsole)
+    {
+        return;
+    }
+
+    if (bLoad)
+    {
+        XmlNodeRef readNode = NULL;
+        XmlNodeRef inputCVarsNode = node->findChild(CVARS_NODE);
+
+        if (!inputCVarsNode)
+        {
+            return;
+        }
+
+        // Remove Entities with ID`s from the list.
+        for (int childNo = 0; childNo < inputCVarsNode->getChildCount(); ++childNo)
+        {
+            readNode = inputCVarsNode->getChild(childNo);
+
+            for (int i = 0; i < readNode->getNumAttributes(); ++i)
+            {
+                readNode->getAttributeByIndex(i, (const char**)&szKey, (const char**)&szValue);
+                piCVar = piConsole->GetCVar(szKey);
+                if (!piCVar)
+                {
+                    continue;
+                }
+                piCVar->Set(szValue);
+            }
+        }
+    }
+    else
+    {
+        XmlNodeRef newCVarNode = NULL;
+        XmlNodeRef oldCVarsNode = node->findChild(CVARS_NODE);
+
+        if (oldCVarsNode)
+        {
+            node->removeChild(oldCVarsNode);
+        }
+
+        XmlNodeRef cvarsNode = XmlHelpers::CreateXmlNode(CVARS_NODE);
+
+        nNumberOfVariables = piConsole->GetNumVisibleVars();
+        cszVariableNames.resize(nNumberOfVariables, NULL);
+
+        if (piConsole->GetSortedVars((const char**)&cszVariableNames.front(), nNumberOfVariables, NULL) != nNumberOfVariables)
+        {
+            assert(false);
+            return;
+        }
+
+        for (nCurrentVariable = 0; nCurrentVariable < cszVariableNames.size(); ++nCurrentVariable)
+        {
+            if (_stricmp(cszVariableNames[nCurrentVariable], "_TestFormatMessage") == 0)
+            {
+                continue;
+            }
+
+            piVariable = piConsole->GetCVar(cszVariableNames[nCurrentVariable]);
+            if (!piVariable)
+            {
+                assert(false);
+                continue;
+            }
+
+            newCVarNode = XmlHelpers::CreateXmlNode(CVAR_NODE);
+            newCVarNode->setAttr(cszVariableNames[nCurrentVariable], piVariable->GetString());
+            cvarsNode->addChild(newCVarNode);
+        }
+
+        node->addChild(cvarsNode);
+    }
+}
+
+void CSettingsManager::ReadValueStr(XmlNodeRef& sourceNode, const QString& path, const QString& attr, QString& val)
+{
+    // Make sure the path has "\" at the end
+    QString fixedPath = path;
+
+    // Make sure it ends with "\" before extraction of tokens
+    QString slashChar = fixedPath.right(fixedPath.length() - 1);
+
+    if (slashChar != "\\")
+    {
+        fixedPath += "\\";
+    }
+
+    QStringList strNodes;
+    Path::GetDirectoryQueue(fixedPath, strNodes);
+    QString readAttr = attr;
+
+    // Spaces in node names not allowed
+    readAttr.replace(" ", "");
+
+    XmlNodeRef root = NULL;
+    XmlNodeRef tmpNode = NULL;
+
+    if (NeedSettingsNode(path))
+    {
+        tmpNode = sourceNode->findChild(EDITOR_SETTINGS_CONTENT_NODE);
+    }
+    else
+    {
+        tmpNode = sourceNode;
+    }
+
+    if (!tmpNode)
+    {
+        return;
+    }
+
+    for (int i = 0; i < strNodes.size(); ++i)
+    {
+        if (tmpNode->findChild(strNodes[i].toUtf8().data()))
+        {
+            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
+        }
+        else
+        {
+            return;
+        }
+    }
+
+    if (!tmpNode->findChild(readAttr.toUtf8().data()))
+    {
+        return;
+    }
+    else
+    {
+        tmpNode = tmpNode->findChild(readAttr.toUtf8().data());
+    }
+
+    if (tmpNode->haveAttr(EDITOR_SETTINGS_ATTRIB_NAME))
+    {
+        tmpNode->getAttr(EDITOR_SETTINGS_ATTRIB_NAME, val);
+    }
+
+    return;
+}
+
+void CSettingsManager::RegisterEvent(const SEventLog& event)
+{
+    if (event.m_eventName.isEmpty())
+    {
+        return;
+    }
+
+    QString eventName = event.m_eventName;
+
+    QString path(eventName);
+    path.replace(" ", "");
+    SaveLogEventSetting(path, EVENT_LOG_EVENT_NAME, event.m_eventName);
+    QString subPath = path + "\\" + EVENT_LOG_EVENT_NAME;
+
+    SaveLogEventSetting(subPath, EVENT_LOG_CALLER_VERSION, event.m_callerVersion);
+    SaveLogEventSetting(subPath, "state", event.m_eventState);
+
+    QDateTime theTime = QDateTime::currentDateTimeUtc();
+    SaveLogEventSetting(subPath, "time", theTime.toString(LOG_DATETIME_FORMAT));
+}
+
+void CSettingsManager::UnregisterEvent(const SEventLog& event)
+{
+    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(EDITOR_EVENT_LOG_FILE_PATH);
+
+    if (!root)
+    {
+        return;
+    }
+
+    QString eventName = event.m_eventName;
+
+    QString path(eventName);
+    path.replace(" ", "");
+    QString subPath = path + "\\" + EVENT_LOG_EVENT_NAME;
+
+    XmlNodeRef resNode = LoadLogEventSetting(subPath, EDITOR_EVENT_LOG_ATTRIB_NAME, eventName, root);
+    if (!resNode)
+    {
+        return;
+    }
+
+    root->removeChild(resNode->getParent());
+    root->saveToFile(EDITOR_EVENT_LOG_FILE_PATH);
+}
+
+bool CSettingsManager::IsEventSafe(const SEventLog& event)
+{
+    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(EDITOR_EVENT_LOG_FILE_PATH);
+
+    if (!root)
+    {
+        return TRUE;
+    }
+
+    QString eventName = event.m_eventName;
+
+    QString path(eventName);
+    path += "\\";
+    path += EVENT_LOG_EVENT_NAME;
+    path.replace(" ", "");
+    XmlNodeRef resNode = LoadLogEventSetting(path, EDITOR_EVENT_LOG_ATTRIB_NAME, eventName, root);
+
+    // Log entry not found, so it is safe to start
+    if (!resNode)
+    {
+        return TRUE;
+    }
+
+    XmlNodeRef callerVersion = resNode->findChild(EVENT_LOG_CALLER_VERSION);
+
+    if (callerVersion)
+    {
+        QString callerVersionStr;
+
+        if (callerVersion->haveAttr(EDITOR_EVENT_LOG_ATTRIB_NAME))
+        {
+            callerVersionStr = callerVersion->getAttr(EDITOR_EVENT_LOG_ATTRIB_NAME);
+        }
+
+        if (!callerVersionStr.isEmpty())
+        {
+            if (callerVersionStr != GetToolVersion(eventName))
+            {
+                return TRUE;
+            }
+        }
+
+        // The same version of tool/level found
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSettingsManager::SaveLogEventSetting(const QString& path, const QString& attr, const QString& val)
+{
+    QStringList strNodes;
+
+    QString fixedPath = path;
+
+    // Make sure it ends with "\" before extraction of tokens
+    QString slashChar = fixedPath.right(fixedPath.length() - 1);
+
+    if (slashChar != "\\")
+    {
+        fixedPath += "\\";
+    }
+
+    Path::GetDirectoryQueue(fixedPath, strNodes);
+
+    QString writeAttr = attr;
+
+    // Simple cleanup of node names - remove all characters except letters, digits,
+    // underscores, colons, periods, and hyphens.
+    // If this ever needs to be 100% compliant, the following rules would need to
+    // be added:
+    // - name must only *start* with a letter or underscore (not a digit, colon, period, or hyphen)
+    // - name must not start with "xml" in any case combination
+    const QRegularExpression xmlNodeCleanupRegex("[^a-zA-Z0-9_:.\\-]*");
+    writeAttr.remove(xmlNodeCleanupRegex);
+    for (auto& node : strNodes)
+    {
+        node.remove(xmlNodeCleanupRegex);
+    }
+
+    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(EDITOR_EVENT_LOG_FILE_PATH);
+
+    if (!root)
+    {
+        root = XmlHelpers::CreateXmlNode(EDITOR_EVENT_LOG_ROOT_NODE);
+        root->saveToFile(EDITOR_LAYOUT_FILE_PATH);
+    }
+
+    XmlNodeRef tmpNode = root;
+
+    for (int i = 0; i < strNodes.size(); ++i)
+    {
+        if (!tmpNode->findChild(strNodes[i].toUtf8().data()))
+        {
+            tmpNode->addChild(tmpNode->createNode(strNodes[i].toUtf8().data()));
+            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
+        }
+        else
+        {
+            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
+        }
+    }
+
+    if (!tmpNode->findChild(writeAttr.toUtf8().data()))
+    {
+        tmpNode->addChild(tmpNode->createNode(writeAttr.toUtf8().data()));
+        tmpNode = tmpNode->findChild(writeAttr.toUtf8().data());
+    }
+    else
+    {
+        tmpNode = tmpNode->findChild(writeAttr.toUtf8().data());
+    }
+
+    if (!tmpNode)
+    {
+        return;
+    }
+
+    tmpNode->setAttr(EDITOR_EVENT_LOG_ATTRIB_NAME, val.toUtf8().data());
+
+    root->saveToFile(EDITOR_EVENT_LOG_FILE_PATH);
+}
+
+XmlNodeRef CSettingsManager::LoadLogEventSetting(const QString& path, const QString& attr, [[maybe_unused]] QString& val, XmlNodeRef& root)
+{
+    // Make sure it ends with "\" before extraction of tokens
+    QString fixedPath = path;
+    QString slashChar = fixedPath.right(fixedPath.length() - 1);
+
+    if (slashChar != "\\")
+    {
+        fixedPath += "\\";
+    }
+
+    QStringList strNodes;
+    Path::GetDirectoryQueue(fixedPath, strNodes);
+    QString readAttr = attr;
+
+    // Spaces in node names not allowed
+    readAttr.replace(" ", "");
+
+    if (!root)
+    {
+        return 0;
+    }
+
+    XmlNodeRef tmpNode = NULL;
+    tmpNode = root;
+
+    if (!tmpNode)
+    {
+        return 0;
+    }
+
+    for (int i = 0; i < strNodes.size(); ++i)
+    {
+        if (tmpNode->findChild(strNodes[i].toUtf8().data()))
+        {
+            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    if (tmpNode->haveAttr(readAttr.toUtf8().data()))
+    {
+        return tmpNode;
+    }
+
+    return 0;
+}
+
+QString CSettingsManager::GenerateContentHash(XmlNodeRef& node, QString sourceName)
+{
+    QString hashStr("");
+
+    if (node->getChildCount() == 0)
+    {
+        return sourceName;
+    }
+
+    uint32 hash = CCrc32::ComputeLowercase(node->getXML(0));
+    hashStr = QString::number(hash);
+
+    return hashStr;
+}
diff --git a/Code/Editor/SettingsManager.h b/Code/Editor/SettingsManager.h
new file mode 100644
index 0000000000..93a00f0066
--- /dev/null
+++ b/Code/Editor/SettingsManager.h
@@ -0,0 +1,148 @@
+/*
+ * 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_SETTINGSMANAGER_H
+#define CRYINCLUDE_EDITOR_SETTINGSMANAGER_H
+#pragma once
+
+#include <QString>
+
+class QByteArray;
+
+#define EDITOR_LAYOUT_FILE_PATH "@user@/Editor/EditorLayout.xml"
+#define EDITOR_SETTINGS_FILE_PATH "@user@/Editor/EditorSettings.xml"
+#define EDITOR_LAYOUT_ROOT_NODE "EditorLayout"
+#define EDITOR_SETTINGS_ROOT_NODE "EditorSettings"
+#define EDITOR_SETTINGS_CONTENT_NODE "EditorSettingsContent"
+#define NEED_SETTINGS_VALID_LOOKUP_PATH "Settings"
+#define EDITOR_LAYOUT_NODE "DockingPaneLayouts"
+#define EDITOR_SETTINGS_ATTRIB_NAME "value"
+#define CVARS_NODE "CVars"
+#define CVAR_NODE "CVar"
+
+#define EDITOR_EVENT_LOG_FILE_PATH "@user@/Editor/EditorEventLog.xml"
+#define EDITOR_EVENT_LOG_ROOT_NODE "EventRecorder"
+#define EVENT_LOG_EVENT_NAME "eventName"
+#define EDITOR_EVENT_LOG_ATTRIB_NAME "value"
+#define EVENT_LOG_START "start"
+#define EVENT_LOG_END "end"
+
+#define LOG_DATETIME_FORMAT "MM/dd/yyyy HH:mm:ss"
+
+#define EVENT_LOG_CALLER_VERSION "callerVersion"
+
+enum EditorSettingsManagerType
+{
+    eSettingsManagerMemoryStorage = 0,
+    eSettingsManagerLast
+};
+
+enum EditorSettingsExportType
+{
+    eSettingsManagerExportSettings = 0,
+    eSettingsManagerExportLayout
+};
+
+typedef std::map<QString, QString> TToolNamesMap;
+
+struct SEventLog;
+
+struct SEventLog
+{
+    SEventLog(QString eventName, QString eventState, QString callerVersion = "")
+    {
+        m_eventName = eventName;
+        m_eventState = eventState;
+        m_callerVersion = callerVersion;
+    }
+
+    QString m_eventName;
+    QString m_callerVersion;
+    QString m_eventState;
+};
+
+class CSettingsManager
+{
+public:
+    // eMemoryStorage=0
+    CSettingsManager(EditorSettingsManagerType managerType);
+    ~CSettingsManager();
+
+    // Sandbox Editor events
+    void RegisterEvent(const SEventLog& event);
+    void UnregisterEvent(const SEventLog& event);
+    bool IsEventSafe(const SEventLog& event);
+    QString GenerateContentHash(XmlNodeRef& node, QString sourceName);
+
+    XmlNodeRef LoadLogEventSetting(const QString& path, const QString& attr, QString& val, XmlNodeRef& root);
+    void SaveLogEventSetting(const QString& path, const QString& attr, const QString& val);
+
+    bool CreateDefaultLayoutSettingsFile();
+
+    void SaveLayoutSettings(const QByteArray& layout, const QString& toolName);
+
+    AZStd::vector<AZStd::string> BuildSettingsList();
+    void BuildSettingsList_Helper(const XmlNodeRef& nodeList, const AZStd::string_view& previousPath, AZStd::vector<AZStd::string>& result);
+
+    void LoadSetting(const QString& path, const QString& attr, bool& val);
+    void LoadSetting(const QString& path, const QString& attr, int& iVal);
+    void LoadSetting(const QString& path, const QString& attr, float& fVal);
+    void LoadSetting(const QString& path, const QString& attr, QColor& color);
+    XmlNodeRef LoadSetting(const QString& path, const QString& attr, QString& val);
+
+    void SaveSetting(const QString& path, const QString& attr, bool val);
+    void SaveSetting(const QString& path, const QString& attr, float fVal);
+    void SaveSetting(const QString& path, const QString& attr, int iVal);
+    void SaveSetting(const QString& path, const QString& attr, QColor color);
+    void SaveSetting(const QString& path, const QString& attr, const QString& val);
+
+    void AddSettingsNode(XmlNodeRef newNode);
+
+    void AddToolVersion(const QString& toolName, const QString& toolVersion);
+    QString& GetToolVersion(const QString& sPaneClassName){ return m_toolVersions[sPaneClassName]; };
+
+    void AddToolName(const QString& toolName, const QString& humanReadableName = QString());
+    TToolNamesMap* GetToolNames() { return &m_toolNames; };
+
+    // Test if all tools can be safely opened
+    bool IsToolsOpenSafe();
+
+    void ClearToolNames(){ m_toolNames.clear(); m_toolVersions.clear(); };
+
+    void UpdateLayoutNode();
+
+    void ImportSettings(QString file);
+
+    void ExportSettings(XmlNodeRef exportNode, QString fileName);
+    void Export();
+
+    void GetMatchingLayoutNames(TToolNamesMap& foundTools, XmlNodeRef& resultNode, QString file);
+    bool NeedSettingsNode(const QString& path);
+
+    void SerializeCVars(XmlNodeRef& node, bool bLoad);
+
+    void ReadValueStr(XmlNodeRef& sourceNode, const QString& path, const QString& attr, QString& val);
+
+    void SetExportFileName(QString exportFilePath) { m_ExportFilePath = exportFilePath; };
+
+private:
+    // Save settings to memory or file
+    EditorSettingsManagerType m_managerType;
+
+    // Full path of exported file
+    QString m_ExportFilePath;
+
+    // Node created in memory to be used for exporting editor settings, console-set cvars and layout
+    XmlNodeRef m_pSettingsManagerMemoryNode;
+
+    // Registered Tool Names
+    TToolNamesMap m_toolNames;
+    TToolNamesMap m_toolVersions;
+};
+
+#endif // CRYINCLUDE_EDITOR_SETTINGSMANAGER_H
diff --git a/Code/Editor/SettingsManagerDialog.cpp b/Code/Editor/SettingsManagerDialog.cpp
new file mode 100644
index 0000000000..f1a8a9cfc7
--- /dev/null
+++ b/Code/Editor/SettingsManagerDialog.cpp
@@ -0,0 +1,268 @@
+/*
+ * 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 "SettingsManagerDialog.h"
+
+// Qt
+#include <QMessageBox>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ViewPaneOptions.h>
+
+// Editor
+#include "SettingsManager.h"
+#include "MainWindow.h"
+#include "QtViewPaneManager.h"
+#include "Util/AutoDirectoryRestoreFileDialog.h"    // for CAutoDirectoryRestoreFileDialog
+#include "LyViewPaneNames.h"                        // for LyViewPane::
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_SettingsManagerDialog.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+//////////////////////////////////////////////////////////////////////////
+CSettingsManagerDialog::CSettingsManagerDialog(QWidget* pParent)
+    : QDialog(pParent)
+    , ui(new Ui::SettingsManagerDialog)
+{
+    ui->setupUi(this);
+
+    ui->m_skipToolsChk->setChecked(false);
+    ui->m_importSettingsChk->setChecked(false);
+
+    connect(ui->m_exportBtn, &QAbstractButton::clicked, this, &CSettingsManagerDialog::OnExportBtnClick);
+    connect(ui->m_readBtn, &QAbstractButton::clicked, this, &CSettingsManagerDialog::OnReadBtnClick);
+    connect(ui->m_importBtn, &QAbstractButton::clicked, this, &CSettingsManagerDialog::OnImportBtnClick);
+    connect(ui->m_closeAllToolsBtn, &QAbstractButton::clicked, this, &CSettingsManagerDialog::OnCloseAllTools);
+}
+
+
+
+CSettingsManagerDialog::~CSettingsManagerDialog()
+{
+}
+
+const GUID& CSettingsManagerDialog::GetClassID()
+{
+    // {64E0B47F-FA9B-46a9-AEF4-BDAC021B5B2F}
+    static const GUID guid =
+    {
+        0x64e0b47f, 0xfa9b, 0x46a9, { 0xae, 0xf4, 0xbd, 0xac, 0x2, 0x1b, 0x5b, 0x2f }
+    };
+
+    return guid;
+}
+
+
+void CSettingsManagerDialog::RegisterViewClass()
+{
+    AzToolsFramework::ViewPaneOptions options;
+    options.paneRect = QRect(5, 100, 210, 505);
+    options.showInMenu = false;
+
+    AzToolsFramework::RegisterViewPane<CSettingsManagerDialog>(LyViewPane::EditorSettingsManager, LyViewPane::CategoryOther, options);
+}
+
+
+void CSettingsManagerDialog::OnReadBtnClick()
+{
+    char szFilters[] = "Editor Settings and Layout File (*.xml);;All files (*)";
+    CAutoDirectoryRestoreFileDialog importFileSelectionDialog(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, "xml", {}, szFilters, {}, {}, this);
+
+    if (importFileSelectionDialog.exec())
+    {
+        m_importFileStr = importFileSelectionDialog.selectedFiles().first();
+
+        ui->m_layoutListBox->clear();
+
+        TToolNamesMap toolNames;
+        XmlNodeRef dummyNode = NULL;
+
+        GetIEditor()->GetSettingsManager()->GetMatchingLayoutNames(toolNames, dummyNode, m_importFileStr);
+
+        if (!toolNames.empty())
+        {
+            TToolNamesMap::const_iterator tIt = toolNames.begin();
+
+            for (; tIt != toolNames.end(); ++tIt)
+            {
+                if (!tIt->second.isEmpty())
+                {
+                    ui->m_layoutListBox->addItem(tIt->second);
+                }
+                else
+                if (!tIt->first.isEmpty())
+                {
+                    ui->m_layoutListBox->addItem(tIt->first);
+                }
+            }
+        }
+
+        ui->m_layoutListBox->selectAll();
+    }
+}
+
+void CSettingsManagerDialog::OnExportBtnClick()
+{
+    char szFilters[] = "Editor Settings and Layout File (*.xml);;All files (*)";
+    CAutoDirectoryRestoreFileDialog exportFileSelectionDialog(QFileDialog::AcceptSave, QFileDialog::AnyFile, "xml", "ExportedEditor.xml", szFilters, {}, {}, this);
+
+    if (exportFileSelectionDialog.exec())
+    {
+        QString file = exportFileSelectionDialog.selectedFiles().first();
+        GetIEditor()->GetSettingsManager()->SetExportFileName(file);
+        QtViewPaneManager::instance()->ClosePane(LyViewPane::EditorSettingsManager);
+        GetIEditor()->GetSettingsManager()->Export();
+    }
+}
+
+void CSettingsManagerDialog::OnImportBtnClick()
+{
+    QString importFileStr = m_importFileStr;
+    bool bImportSettings = ui->m_importSettingsChk->isChecked();
+
+    QString ask = tr("This will close all opened Views. Make sure to save your projects and backup layout before continuing");
+
+    QStringList layouts;
+
+    for (auto& item : ui->m_layoutListBox->selectedItems())
+    {
+        layouts.append(item->text());
+    }
+
+    // Show warning window to the user in case he selects some layouts to import
+    if (!layouts.isEmpty())
+    {
+        if (QMessageBox::question(this, tr("Editor"), ask) != QMessageBox::Yes)
+        {
+            return;
+        }
+    }
+
+    // Import Settings
+    if (bImportSettings)
+    {
+        ImportSettings(importFileStr);
+    }
+
+    QtViewPaneManager::instance()->CloseAllNonStandardPanes();
+
+    // Import layout
+    if (!layouts.isEmpty())
+    {
+        ImportLayouts(importFileStr, layouts);
+    }
+}
+
+void CSettingsManagerDialog::ImportSettings(QString file)
+{
+    if (QFile::exists(file))
+    {
+        GetIEditor()->GetSettingsManager()->ImportSettings(file);
+    }
+}
+
+void CSettingsManagerDialog::ImportLayouts(QString file, const QStringList& layouts)
+{
+    auto viewPaneManager = QtViewPaneManager::instance();
+
+    if (!layouts.isEmpty())
+    {
+        TToolNamesMap& allToolNames = *GetIEditor()->GetSettingsManager()->GetToolNames();
+        if (allToolNames.empty())
+        {
+            return;
+        }
+
+        TToolNamesMap toolNames;
+
+        for (const QString& layoutStr : layouts)
+        {
+            auto it = std::find_if(allToolNames.begin(), allToolNames.end(),
+                            [&](const std::pair<QString, QString>& v)
+                            {
+                                return layoutStr == v.second;
+                            });
+
+            if (it == allToolNames.end())
+            {
+                continue;
+            }
+
+            toolNames.insert(*it);
+        }
+
+        // Remove previous tool node
+        XmlNodeRef layoutNode = XmlHelpers::CreateXmlNode(EDITOR_LAYOUT_NODE);
+
+        // Find in file and add selected tool node
+        GetIEditor()->GetSettingsManager()->GetMatchingLayoutNames(toolNames, layoutNode, file);
+
+        // restore main window layout
+
+        auto it = toolNames.find(QStringLiteral(MAINFRM_LAYOUT_NORMAL));
+        if (it == toolNames.end())
+        {
+            it = toolNames.find(QStringLiteral(MAINFRM_LAYOUT_PREVIEW));
+        }
+
+        if (it != toolNames.end())
+        {
+            const QString& className = it->first;
+
+            XmlNodeRef dockingLayoutNode = layoutNode->findChild(className.toUtf8().data());
+            if (dockingLayoutNode)
+            {
+                viewPaneManager->DeserializeLayout(dockingLayoutNode);
+            }
+        }
+
+        // restore tool panes layouts
+
+        for (it = toolNames.begin(); it != toolNames.end(); ++it)
+        {
+            const QString& className = it->first;
+            const QString& paneName = it->second;
+
+            if (className == QStringLiteral(MAINFRM_LAYOUT_NORMAL) || className == QStringLiteral(MAINFRM_LAYOUT_PREVIEW))
+            {
+                continue;
+            }
+
+            XmlNodeRef dockingLayoutNode = layoutNode->findChild(className.toUtf8().data());
+            if (!dockingLayoutNode)
+            {
+                continue;
+            }
+
+            auto toolPanel = FindViewPane<QMainWindow>(paneName);
+            if (!toolPanel)
+            {
+                continue;
+            }
+
+            XmlNodeRef windowStateNode = dockingLayoutNode->findChild("WindowState");
+            if (windowStateNode)
+            {
+                toolPanel->restoreState(QByteArray::fromHex(windowStateNode->getContent()));
+            }
+        }
+    }
+}
+
+void CSettingsManagerDialog::OnCloseAllTools()
+{
+    auto viewPaneManager = QtViewPaneManager::instance();
+
+    viewPaneManager->CloseAllNonStandardPanes();
+    viewPaneManager->SaveLayout();
+}
+
+#include <moc_SettingsManagerDialog.cpp>
diff --git a/Code/Editor/SettingsManagerDialog.h b/Code/Editor/SettingsManagerDialog.h
new file mode 100644
index 0000000000..3e04dbc7fd
--- /dev/null
+++ b/Code/Editor/SettingsManagerDialog.h
@@ -0,0 +1,55 @@
+/*
+ * 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_SETTINGSMANAGERDIALOG_H
+#define CRYINCLUDE_EDITOR_SETTINGSMANAGERDIALOG_H
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include <QScopedPointer>
+#endif
+
+
+class CSettingsManager;
+
+//////////////////////////////////////////////////////////////////////////
+// Settings Manager Dialog
+
+namespace Ui {
+    class SettingsManagerDialog;
+}
+
+class CSettingsManagerDialog
+    : public QDialog
+{
+    Q_OBJECT
+
+public:
+    CSettingsManagerDialog(QWidget* pParent = nullptr);
+    ~CSettingsManagerDialog();
+
+    static const GUID& GetClassID();
+    static void RegisterViewClass();
+
+protected:
+    void OnReadBtnClick();
+    void OnExportBtnClick();
+    void ImportSettings(QString file);
+    void ImportLayouts(QString file, const QStringList& layouts);
+    void OnImportBtnClick();
+    void OnCloseAllTools();
+
+private:
+    QString m_importFileStr;
+
+    QScopedPointer<Ui::SettingsManagerDialog> ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_SETTINGSMANAGERDIALOG_H
diff --git a/Code/Sandbox/Editor/SettingsManagerDialog.ui b/Code/Editor/SettingsManagerDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/SettingsManagerDialog.ui
rename to Code/Editor/SettingsManagerDialog.ui
diff --git a/Code/Editor/ShortcutDispatcher.cpp b/Code/Editor/ShortcutDispatcher.cpp
new file mode 100644
index 0000000000..519d7e8a79
--- /dev/null
+++ b/Code/Editor/ShortcutDispatcher.cpp
@@ -0,0 +1,509 @@
+/*
+ * 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 "ShortcutDispatcher.h"
+
+#include <assert.h>
+
+
+// Qt
+#include <QScopedValueRollback>
+#include <QAction>
+#include <QDockWidget>
+#include <QDebug>
+#include <QMainWindow>
+#include <QMenuBar>
+
+// AzQtComponents
+#include <AzQtComponents/Buses/ShortcutDispatch.h>
+
+// Editor
+#include "ActionManager.h"
+#include "QtViewPaneManager.h"
+
+const char* FOCUSED_VIEW_PANE_EVENT_NAME = "FocusedViewPaneEvent";    //Sent when view panes are focused
+const char* FOCUSED_VIEW_PANE_ATTRIBUTE_NAME = "FocusedViewPaneName"; //Name of the current focused view pane
+
+// Build sets _DEBUG when we're in debug mode; define SHOW_ACTION_INFO_IN_DEBUGGER so that when stepping through the debugger,
+// we can see what the actions are and what their keyboard shortcuts are
+#define SHOW_ACTION_INFO_IN_DEBUGGER _DEBUG
+
+static QPointer<QWidget> s_lastFocus;
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+class MacNativeShortcutFilter : public QObject
+{
+    /* mac's native toolbar doesn't generate shortcut events, it calls the action directly.
+     * It doesn't even honour shortcut contexts.
+     *
+     * To remedy this, we catch the QMetaCallEvent that triggers the menu item activation
+     * and suppress it if it was triggered via key combination, and send a QShortcutEvent.
+     *
+     * The tricky part is to find out if the menu item was triggered via mouse or shortcut.
+     * If the previous event was a ShortcutOverride then it means key press.
+     */
+
+public:
+    explicit MacNativeShortcutFilter(QObject* parent)
+        : QObject(parent)
+        , m_lastShortcutOverride(QEvent::KeyPress, 0, Qt::NoModifier) // dummy init
+    {
+        qApp->installEventFilter(this);
+    }
+
+    bool eventFilter(QObject* watched, QEvent* event) override
+    {
+
+        switch (event->type())
+        {
+            case QEvent::ShortcutOverride:
+            {
+                auto ke = static_cast<QKeyEvent*>(event);
+                m_lastEventWasShortcutOverride = true;
+                m_lastShortcutOverride = QKeyEvent(*ke);
+                break;
+            }
+            case QEvent::MetaCall:
+            {
+                if (m_lastEventWasShortcutOverride)
+                {
+                    m_lastEventWasShortcutOverride = false;
+                    const QMetaObject* mo = watched->metaObject();
+                    const bool isMenuItem = mo && qstrcmp(mo->className(), "QPlatformMenuItem") == 0;
+                    if (isMenuItem)
+                    {
+                        QWidget* focusWidget = ShortcutDispatcher::focusWidget();
+                        if (focusWidget)
+                        {
+                            QShortcutEvent se(QKeySequence(m_lastShortcutOverride.key() + m_lastShortcutOverride.modifiers()), /*ambiguous=*/false);
+                            se.setAccepted(false);
+                            QApplication::sendEvent(focusWidget, &se);
+                            return se.isAccepted();
+                        }
+                    }
+                }
+
+                break;
+            }
+            case QEvent::MouseButtonDblClick:
+            case QEvent::MouseButtonPress:
+            case QEvent::MouseButtonRelease:
+            case QEvent::KeyPress:
+            case QEvent::KeyRelease:
+                m_lastEventWasShortcutOverride = false;
+                break;
+            default:
+                break;
+        }
+
+        return false;
+    }
+
+    bool m_lastEventWasShortcutOverride = false;
+    QKeyEvent m_lastShortcutOverride;
+};
+#endif
+
+// Returns either a top-level or a dock widget (regardless of floating)
+// This way when docking a main window Qt::WindowShortcut still works
+QWidget* ShortcutDispatcher::FindParentScopeRoot(QWidget* widget)
+{
+    QWidget* w = widget;
+    // if the current scope root is a QDockWidget, we want to bubble out
+    // so we move to the parent immediately
+    if (qobject_cast<QDockWidget*>(w) != nullptr || qobject_cast<QMainWindow*>(w) != nullptr)
+    {
+        w = w->parentWidget();
+    }
+
+    QWidget* newScopeRoot = w;
+    while (newScopeRoot && newScopeRoot->parent() && !qobject_cast<QDockWidget*>(newScopeRoot) && !qobject_cast<QMainWindow*>(newScopeRoot))
+    {
+        newScopeRoot = newScopeRoot->parentWidget();
+    }
+
+    // This method should always return a parent scope root; if it can't find one
+    // it returns null
+    if (newScopeRoot == widget)
+    {
+        newScopeRoot = nullptr;
+
+        if (w != nullptr)
+        {
+            // we couldn't find a valid parent; broadcast a message to see if something else wants to tell us about one
+            AzQtComponents::ShortcutDispatchBus::EventResult(newScopeRoot, w, &AzQtComponents::ShortcutDispatchBus::Events::GetShortcutDispatchScopeRoot, w);
+        }
+    }
+
+    return newScopeRoot;
+}
+
+// Returns true if a widget is ancestor of another widget
+bool ShortcutDispatcher::IsAContainerForB(QWidget* a, QWidget* b)
+{
+    if (!a || !b)
+    {
+        return false;
+    }
+
+    while (b && (a != b))
+    {
+        b = b->parentWidget();
+    }
+
+    return (a == b);
+}
+
+// Returns the list of QActions which have this specific key shortcut
+// Only QActions under scopeRoot are considered.
+QList<QAction*> ShortcutDispatcher::FindCandidateActions(QObject* scopeRoot, const QKeySequence& sequence, QSet<QObject*>& previouslyVisited, bool checkVisibility)
+{
+    QList<QAction*> actions;
+    if (!scopeRoot)
+    {
+        return actions;
+    }
+
+    if (previouslyVisited.contains(scopeRoot))
+    {
+        return actions;
+    }
+    previouslyVisited.insert(scopeRoot);
+
+    QWidget* scopeRootWidget = qobject_cast<QWidget*>(scopeRoot);
+    if (scopeRootWidget && ((checkVisibility && !scopeRootWidget->isVisible()) || !scopeRootWidget->isEnabled()))
+    {
+        return actions;
+    }
+
+#ifdef SHOW_ACTION_INFO_IN_DEBUGGER
+    QString matchingAgainst = sequence.toString();
+    (void) matchingAgainst; // avoid an unused variable warning; want this for debugging
+#endif
+
+    // Don't just call scopeRoot->actions()! It doesn't always return the proper list, especially with the dock widgets
+    for (QAction* action : scopeRoot->findChildren<QAction*>(QString(), Qt::FindDirectChildrenOnly))   // Width first
+    {
+#ifdef SHOW_ACTION_INFO_IN_DEBUGGER
+        QString actionName = action->text();
+        (void)actionName; // avoid an unused variable warning; want this for debugging
+        QString shortcut = action->shortcut().toString();
+        (void)shortcut; // avoid an unused variable warning; want this for debugging
+#endif
+
+        if (action->shortcut() == sequence)
+        {
+            actions << action;
+        }
+    }
+
+    // also have to check the actions on the object directly, without looking at children
+    // specifically for the base Editor MainWindow
+    if (scopeRootWidget)
+    {
+        for (QAction* action : scopeRootWidget->actions())
+        {
+#ifdef SHOW_ACTION_INFO_IN_DEBUGGER
+            QString actionName = action->text();
+            (void)actionName; // avoid an unused variable warning; want this for debugging
+            QString shortcut = action->shortcut().toString();
+            (void)shortcut; // avoid an unused variable warning; want this for debugging
+#endif
+
+            if (action->shortcut() == sequence)
+            {
+                actions << action;
+            }
+        }
+    }
+
+    // Menubars have child widgets that have actions
+    // But menu bar child widgets (menu items) are only visible when they've been clicked on
+    // so we don't want to test visibility for child widgets of menubars
+    if (qobject_cast<QMenuBar*>(scopeRoot))
+    {
+        checkVisibility = false;
+    }
+
+    // check the dock's central widget and the main window's
+    // In some cases, they aren't in the scopeRoot's children, despite having the scopeRoot as their parent
+    QDockWidget* dockWidget = qobject_cast<QDockWidget*>(scopeRoot);
+    if (dockWidget)
+    {
+        actions << FindCandidateActions(dockWidget->widget(), sequence, previouslyVisited, checkVisibility);
+    }
+
+    QMainWindow* mainWindow = qobject_cast<QMainWindow*>(scopeRoot);
+    if (mainWindow)
+    {
+        actions << FindCandidateActions(mainWindow->centralWidget(), sequence, previouslyVisited, checkVisibility);
+    }
+
+    for (QWidget* child : scopeRoot->findChildren<QWidget*>(QString(), Qt::FindDirectChildrenOnly))
+    {
+        bool isMenu = (qobject_cast<QMenu*>(child) != nullptr);
+
+        if ((child->windowFlags() & Qt::Window) && !isMenu)
+        {
+            // When going down the hierarchy stop at window boundaries, to not accidentally trigger
+            // shortcuts from unfocused windows. Windows might be parented to this scope for purposes
+            // "centering within parent" or lifetime.
+            // Don't stop at menus though, as they are flagged as Qt::Window but are often the only thing that
+            // actions are attached to.
+            continue;
+        }
+
+        bool isDockWidget = (qobject_cast<QDockWidget*>(child) != nullptr);
+        if ((isDockWidget && !actions.isEmpty()) || IsShortcutSearchBreak(child))
+        {
+            // If we already found a candidate, don't go into dock widgets, they have lower priority
+            // since they are not focused.
+            // Also never go into viewpanes; viewpanes are their own separate shortcut context and they never take shortcuts from the main window
+            continue;
+        }
+
+        actions << FindCandidateActions(child, sequence, previouslyVisited, checkVisibility);
+    }
+
+    return actions;
+}
+
+bool ShortcutDispatcher::FindCandidateActionAndFire(QObject* focusWidget, QShortcutEvent* shortcutEvent, QList<QAction*>& candidates, QSet<QObject*>& previouslyVisited)
+{
+    candidates = FindCandidateActions(focusWidget, shortcutEvent->key(), previouslyVisited);
+    QSet<QAction*> candidateSet = QSet<QAction*>(candidates.begin(), candidates.end());
+    QAction* chosenAction = nullptr;
+    int numCandidates = candidateSet.size();
+    if (numCandidates == 1)
+    {
+        chosenAction = candidates.first();
+    }
+    else if (numCandidates > 1)
+    {
+        // If there are multiple candidates, choose the one that is parented to the ActionManager
+        // since there are cases where panes with their own menu shortcuts that are docked
+        // in the main window can be found in the same parent scope
+        for (QAction* action : candidateSet)
+        {
+            if (qobject_cast<ActionManager*>(action->parent()))
+            {
+                chosenAction = action;
+                break;
+            }
+        }
+    }
+    if (chosenAction)
+    {
+        if (chosenAction->isEnabled())
+        {
+            // has to be send, not post, or the dispatcher will get the event again and won't know that it was the one that queued it
+            bool isAmbiguous = false;
+            QShortcutEvent newEvent(shortcutEvent->key(), isAmbiguous);
+            QApplication::sendEvent(chosenAction, &newEvent);
+        }
+        shortcutEvent->accept();
+        return true;
+    }
+
+    return false;
+}
+
+ShortcutDispatcher::ShortcutDispatcher(QObject* parent)
+    : QObject(parent)
+    , m_currentlyHandlingShortcut(false)
+{
+    qApp->installEventFilter(this);
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    new MacNativeShortcutFilter(this);
+#endif
+}
+
+ShortcutDispatcher::~ShortcutDispatcher()
+{
+}
+
+bool ShortcutDispatcher::eventFilter(QObject* obj, QEvent* ev)
+{
+    switch (ev->type())
+    {
+    case QEvent::ShortcutOverride:
+        // QActions default "autoRepeat" to true, which is not an ideal user experience
+        // We globally disable that behavior here - in the unlikely event a shortcut needs to
+        // replicate it, its owner can instead implement a keyEvent handler
+        if (static_cast<QKeyEvent*>(ev)->isAutoRepeat())
+        {
+            ev->accept();
+            return true;
+        }
+        break;
+
+    case QEvent::Shortcut:
+        return shortcutFilter(obj, static_cast<QShortcutEvent*>(ev));
+        break;
+
+    case QEvent::MouseButtonPress:
+        if (!s_lastFocus || !IsAContainerForB(qobject_cast<QWidget*>(obj), s_lastFocus))
+        {
+            setNewFocus(obj);
+        }
+        break;
+
+    case QEvent::FocusIn:
+        setNewFocus(obj);
+        break;
+
+        // we don't really care about focus out, because something should always have the focus
+        // but I'm leaving this here, so that it's clear that this is intentional
+        //case QEvent::FocusOut:
+        //    break;
+    }
+
+    return false;
+}
+
+QWidget* ShortcutDispatcher::focusWidget()
+{
+    QWidget* focusWidget = s_lastFocus; // check the widget we tracked last
+    if (!focusWidget)
+    {
+        // we don't have anything, so fall back to using the focus object
+        focusWidget = qobject_cast<QWidget*>(qApp->focusObject()); // QApplication::focusWidget() doesn't always work
+    }
+
+    return focusWidget;
+}
+
+bool ShortcutDispatcher::shortcutFilter(QObject* obj, QShortcutEvent* shortcutEvent)
+{
+    if (m_currentlyHandlingShortcut)
+    {
+        return false;
+    }
+
+    QScopedValueRollback<bool> recursiveCheck(m_currentlyHandlingShortcut, true);
+
+    // prioritize m_actionOverrideObject if active
+    if (m_actionOverrideObject != nullptr)
+    {
+        QList<QAction*> childActions =
+            m_actionOverrideObject->findChildren<QAction*>(QString(), Qt::FindDirectChildrenOnly);
+
+        // attempt to find shortcut in override
+        const auto childActionIt = AZStd::find_if(
+            childActions.begin(), childActions.end(), [shortcutEvent](QAction* child)
+        {
+            return child->shortcut() == shortcutEvent->key();
+        });
+
+        // trigger shortcut
+        if (childActionIt != childActions.end())
+        {
+            // has to be send, not post, or the dispatcher will get the event again
+            // and won't know that it was the one that queued it
+            const bool isAmbiguous = false;
+            QShortcutEvent newEvent(shortcutEvent->key(), isAmbiguous);
+
+            QAction* action = *childActionIt;
+            QApplication::sendEvent(action, &newEvent);
+
+            shortcutEvent->accept();
+            return true;
+        }
+    }
+
+    QWidget* currentFocusWidget = focusWidget(); // check the widget we tracked last
+    if (!currentFocusWidget)
+    {
+        qWarning() << Q_FUNC_INFO << "No focus widget"; // Defensive. Doesn't happen.
+        return false;
+    }
+
+    // Shortcut is ambiguous, lets resolve ambiguity and give preference to QActions in the most inner scope
+
+    // Try below the focusWidget first:
+    QSet<QObject*> previouslyVisited;
+    QList<QAction*> candidates;
+    if (FindCandidateActionAndFire(currentFocusWidget, shortcutEvent, candidates, previouslyVisited))    {
+        return true;
+    }
+
+    // Now incrementally try bigger scopes. This handles complex cases several levels docking nesting
+
+    QWidget* correctedTopLevel = nullptr;
+    QWidget* p = currentFocusWidget;
+    correctedTopLevel = FindParentScopeRoot(p);
+    while (correctedTopLevel)
+    {
+        if (FindCandidateActionAndFire(correctedTopLevel, shortcutEvent, candidates, previouslyVisited))
+        {
+            return true;
+        }
+
+        p = correctedTopLevel;
+        correctedTopLevel = FindParentScopeRoot(p);
+    }
+
+
+    // Nothing else to do... shortcut is really ambiguous, or there's no actions, something for the developer to fix.
+    // Here's some debug info :
+
+    if (candidates.isEmpty())
+    {
+        qWarning() << Q_FUNC_INFO << "No candidate QActions found";
+    }
+    else
+    {
+        qWarning() << Q_FUNC_INFO << "Ambiguous shortcut:" << shortcutEvent->key() << "; focusWidget="
+            << qApp->focusWidget() << "Candidates=" << candidates << "; obj = " << obj
+            << "Focused top-level=" << currentFocusWidget;
+        for (auto ambiguousAction : candidates)
+        {
+            qWarning() << "action=" << ambiguousAction << "; action->parentWidget=" << ambiguousAction->parentWidget()
+                << "; associatedWidgets=" << ambiguousAction->associatedWidgets()
+                << "; shortcut=" << ambiguousAction->shortcut();
+        }
+    }
+
+    return false;
+}
+
+void ShortcutDispatcher::setNewFocus(QObject* obj)
+{
+    // Unless every widget has strong focus, mouse clicks don't change the current focus widget
+    // which is a little unintuitive, compared to how we expect focus to work, right now.
+    // So instead of putting strong focus on everything, we detect focus change and mouse clicks
+
+    QWidget* widget = qobject_cast<QWidget*>(obj);
+
+    // we only watch widgets
+    if (widget == nullptr)
+    {
+        return;
+    }
+
+    // track it for later
+    s_lastFocus = widget;
+}
+
+bool ShortcutDispatcher::IsShortcutSearchBreak(QWidget* widget)
+{
+    return widget->property(AzQtComponents::SHORTCUT_DISPATCHER_CONTEXT_BREAK_PROPERTY).toBool();
+}
+
+void ShortcutDispatcher::AttachOverride(QWidget* object)
+{
+    m_actionOverrideObject = object;
+}
+
+void ShortcutDispatcher::DetachOverride()
+{
+    m_actionOverrideObject = nullptr;
+}
+
+#include <moc_ShortcutDispatcher.cpp>
diff --git a/Code/Editor/ShortcutDispatcher.h b/Code/Editor/ShortcutDispatcher.h
new file mode 100644
index 0000000000..219e42ce43
--- /dev/null
+++ b/Code/Editor/ShortcutDispatcher.h
@@ -0,0 +1,128 @@
+/*
+ * 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 SHORTCUT_DISPATCHER_H
+#define SHORTCUT_DISPATCHER_H
+
+#if !defined(Q_MOC_RUN)
+#include <QObject>
+#endif
+
+template<typename T> class QSet;
+template<typename T> class QList;
+template<typename T> class QPointer;
+
+class QWidget;
+class QShortcutEvent;
+class QKeyEvent;
+
+/* This class provides a workaround against Qt's buggy implementation of shortcut contexts when using dock widgets.
+
+   There are several problems with Qt's implementation:
+
+   - Qt::WindowShortcut doesn't work well with floating docking widgets.
+     Qt gives a warning about ambiguous shortcut even though both actions are in different windows.
+   - A Qt::WindowShortcut in a docked widget will conflict when the widget is embedded (not floating).
+   - Qt::WidgetWithChildrenShortcut doesn't work well on menus since they can't have focus
+     Implement our own conflict resolution and shortcut dispatch.
+     Deliver to the action in the most inner scope, for our purposes a scope is either a window or a dockwidget (regardless of floating)
+
+     Beware that shortcut handling is complex and try not to change this class too much, as it's hard to test
+     and hard to verify all edge cases.
+*/
+
+
+/*
+  More documentation on Qt shortcuts
+  -------------------------------------------
+
+  Here's some more detailed info regarding shortcuts in Qt. Not specific Open 3D Engine but
+  useful as not explained in Qt docs much.
+
+  P.S.: The following text details the strategy used in an earlier Open 3D Engine version. Not sure which
+        shortcut context type it uses nowadays, but eitherway, the following text is educational,
+        and all the traps still exist in current Qt (5.11).
+
+     Some applications have a QMainWindow and also secondary main windows which can dock into the main QMainWindow.
+     All these main windows have menu bars containing actions with shortcuts.
+
+     So, which shortcut context should be used ?
+
+     - Qt::ApplicationShortcut
+       Obviously not, would create conflicting shortcuts and you only want local shortcuts anyway.
+
+     - Qt::WindowShortcut ?
+       This is supposed to only work if the shortcut's parent is in the focused window. However,
+       there a bug with floating dock widgets: doing a key sequence in the dock widget
+       triggers the main QMainWindow's shortcut.
+
+     - Qt::WidgetShortcut
+       docs say: "The shortcut is active when its parent widget has focus"
+       The QAction's parent is a QMenuBar, which doesn't get focus, so this is useless.
+
+     - Qt::WidgetWithChildrenShortcut ?
+       docs say: "The shortcut is active when its parent widget, or any of its children has focus"
+       The QAction's parent is a QMenuBar, which doesn't get focus or has any focused children. Useless.
+
+     - Qt::WidgetWithChildrenShortcut (Round2!)
+       Actually it's not the QAction's parent that counts but the associated widget! (Misleading docs)
+       So if you also add the action to the window, it works:
+       QAction *action = menu->addAction("Del");
+       myWindow->addAction(action); // success!
+
+       Are we happy ?
+       Not yet.
+
+       Qt::WidgetWithChildrenShortcut is working pretty well, but as soon as you dock your secondary QMainWindow into your main QMainWindow we get:
+       "QAction::eventFilter: Ambiguous shortcut overload: Ctrl+O". Some widget inside main window 2 is focused, but it's also a child of main window 1 further up the hierarchy, so both QActions would apply.
+
+       So now what we need is simply a global event filter, catch QEvent::Shortcut, check if shortcut->isAmbiguous(), and if yes dispatch the shortcut
+       manually (sendEvent), otherwise Qt would just bail out. To which QAction you send it to is up to you. I chose to imagine each dock widget was a scope and dispatch the shortcut to the most
+       inner scope that contains the focused widget.
+
+       If you've read this far you can now press 'Ctrl+Q' and hope it closes your editor ;)
+ */
+
+class ShortcutDispatcher
+    : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ShortcutDispatcher(QObject* parent = nullptr);
+    ~ShortcutDispatcher();
+    bool eventFilter(QObject* obj, QEvent* ev) override;
+
+    static QWidget* focusWidget();
+
+    /// Assign the widget responsible for getting first attempt
+    /// at every shortcut routed through the ShortcutDispatcher.
+    void AttachOverride(QWidget* object);
+    /// Detach the widget responsible for intercepting Actions
+    /// routed through the ShortcutDispatcher.
+    void DetachOverride();
+
+private:
+    bool shortcutFilter(QObject* obj, QShortcutEvent* ev);
+    void setNewFocus(QObject* obj);
+
+    QWidget* FindParentScopeRoot(QWidget* w);
+    bool IsAContainerForB(QWidget* a, QWidget* b);
+    QList<QAction*> FindCandidateActions(QObject* scopeRoot, const QKeySequence& sequence, QSet<QObject*>& previouslyVisited, bool checkVisibility = true);
+    bool FindCandidateActionAndFire(QObject* focusWidget, QShortcutEvent* shortcutEvent, QList<QAction*>& candidates, QSet<QObject*>& previouslyVisited);
+
+    static bool IsShortcutSearchBreak(QWidget* widget);
+
+    bool m_currentlyHandlingShortcut;
+
+    QString m_previousWidgetName;
+
+    QWidget* m_actionOverrideObject = nullptr; /**< (if set/not null) The widget responsible for getting first attempt
+                                                 *   at every shortcut routed through the ShortcutDispatcher. */
+};
+
+#endif
diff --git a/Code/Editor/StartupLogoDialog.cpp b/Code/Editor/StartupLogoDialog.cpp
new file mode 100644
index 0000000000..d26f174821
--- /dev/null
+++ b/Code/Editor/StartupLogoDialog.cpp
@@ -0,0 +1,92 @@
+/*
+ * 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 : implementation file
+
+
+#include "EditorDefs.h"
+
+#include "StartupLogoDialog.h"
+
+// Qt
+#include <QPainter>
+#include <QThread>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_StartupLogoDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CStartupLogoDialog dialog
+
+CStartupLogoDialog* CStartupLogoDialog::s_pLogoWindow = 0;
+
+CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent /*=NULL*/)
+    : QWidget(pParent, Qt::Dialog | Qt::FramelessWindowHint)
+    , m_ui(new Ui::StartupLogoDialog)
+{
+    m_ui->setupUi(this);
+ 
+    s_pLogoWindow = this;
+
+    m_backgroundImage = QPixmap(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg"));
+    setFixedSize(QSize(600, 300));
+
+    // Prepare background image
+    QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg"));
+    m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+
+    // Draw the Open 3D Engine logo from svg
+    m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/o3de_logo.svg"));
+
+    m_ui->m_TransparentConfidential->setObjectName("copyrightNotice");
+    m_ui->m_TransparentConfidential->setTextFormat(Qt::RichText);
+    m_ui->m_TransparentConfidential->setText(richTextCopyrightNotice);
+
+    setWindowTitle(tr("Starting Open 3D Engine Editor"));
+
+    setStyleSheet( "CStartupLogoDialog > QLabel { background: transparent; color: 'white' }\
+                    CStartupLogoDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; } ");
+
+    m_ui->m_TransparentVersion->setText(versionText);
+}
+
+CStartupLogoDialog::~CStartupLogoDialog()
+{
+    s_pLogoWindow = 0;
+}
+
+void CStartupLogoDialog::SetText(const char* text)
+{
+    if (s_pLogoWindow)
+    {
+        s_pLogoWindow->SetInfoText(text);
+    }
+}
+
+void CStartupLogoDialog::SetInfoText(const char* text)
+{
+    m_ui->m_TransparentText->setText(text);
+
+    if (QThread::currentThread() == thread())
+    {
+        m_ui->m_TransparentText->repaint();
+    }
+
+    qApp->processEvents(QEventLoop::ExcludeUserInputEvents);  // if you don't process events, repaint does not function correctly.
+}
+
+void CStartupLogoDialog::paintEvent(QPaintEvent*)
+{
+    QPainter painter(this);
+    painter.drawPixmap(rect(), m_backgroundImage);
+}
+
+#include <moc_StartupLogoDialog.cpp>
diff --git a/Code/Editor/StartupLogoDialog.h b/Code/Editor/StartupLogoDialog.h
new file mode 100644
index 0000000000..693c93ee63
--- /dev/null
+++ b/Code/Editor/StartupLogoDialog.h
@@ -0,0 +1,55 @@
+/*
+ * 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 <QWidget>
+#include <QString>
+#include <QPixmap>
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CStartupLogoDialog dialog
+
+namespace Ui
+{
+    class StartupLogoDialog;
+}
+
+class CStartupLogoDialog
+    : public QWidget
+    , public IInitializeUIInfo
+{
+    Q_OBJECT
+
+public:
+    CStartupLogoDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent = nullptr);   // standard constructor
+    ~CStartupLogoDialog();
+
+    void SetInfoText(const char* text) override;
+
+    // Static way to call SetInfoText on the single instance of CStartupLogoDialog
+    static void SetText(const char* text);
+
+    static CStartupLogoDialog* instance() { return s_pLogoWindow; }
+
+private:
+
+    void SetInfo(const char* text);
+    void paintEvent(QPaintEvent* event) override;
+
+    static CStartupLogoDialog*              s_pLogoWindow;
+
+    QScopedPointer<Ui::StartupLogoDialog>   m_ui;
+
+    QPixmap                                 m_backgroundImage;
+    const int                               m_enforcedWidth = 600;
+    const int                               m_enforcedHeight = 300;
+};
+
diff --git a/Code/Editor/StartupLogoDialog.qrc b/Code/Editor/StartupLogoDialog.qrc
new file mode 100644
index 0000000000..2493810ad8
--- /dev/null
+++ b/Code/Editor/StartupLogoDialog.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/StartupLogoDialog">
+        <file>o3de_logo.svg</file>
+        <file>splashscreen_background_gradient.jpg</file>
+    </qresource>
+</RCC>
diff --git a/Code/Editor/StartupLogoDialog.ui b/Code/Editor/StartupLogoDialog.ui
new file mode 100644
index 0000000000..60969f7f7f
--- /dev/null
+++ b/Code/Editor/StartupLogoDialog.ui
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>StartupLogoDialog</class>
+ <widget class="QWidget" name="StartupLogoDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>600</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>10</number>
+   </property>
+   <item row="0" column="1" rowspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>250</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_42">
+         <property name="leftMargin">
+          <number>1</number>
+         </property>
+         <property name="topMargin">
+          <number>28</number>
+         </property>
+         <property name="bottomMargin">
+          <number>24</number>
+         </property>
+         <item>
+          <widget class="QSvgWidget" name="m_logo" native="true">
+           <property name="minimumSize">
+            <size>
+             <width>175</width>
+             <height>66</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>175</width>
+             <height>66</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>10</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>O3DE Editor</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Developer Preview</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="m_TransparentVersion">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>290</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>290</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Version</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>10</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="m_TransparentText">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>290</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>290</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Starting Editor...</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>36</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="m_TransparentConfidential">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>240</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>240</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="baseSize">
+            <size>
+             <width>128</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Specified in the StartupLogoDialog constructor.</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>5</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QSvgWidget</class>
+   <extends>QWidget</extends>
+   <header>qsvgwidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Code/Editor/StartupTraceHandler.cpp b/Code/Editor/StartupTraceHandler.cpp
new file mode 100644
index 0000000000..03c2a4b0bd
--- /dev/null
+++ b/Code/Editor/StartupTraceHandler.cpp
@@ -0,0 +1,208 @@
+/*
+ * 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 "StartupTraceHandler.h"
+
+// Qt
+#include <QMessageBox>
+
+// AzCore
+#include <AzCore/Component/TickBus.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+// Editor
+#include "ErrorDialog.h"
+
+
+namespace SandboxEditor
+{
+    StartupTraceHandler::StartupTraceHandler()
+    {
+        ConnectToMessageBus();
+    }
+
+    StartupTraceHandler::~StartupTraceHandler()
+    {
+        EndCollectionAndShowCollectedErrors();
+        DisconnectFromMessageBus();
+    }
+
+    bool StartupTraceHandler::OnPreAssert(const char* fileName, int line, const char* func, const char* message)
+    {
+        // Asserts are more fatal than errors, and need to be displayed right away.
+        // After the assert occurs, nothing else may be functional enough to collect and display messages.
+
+        // Only use Cry message boxes if we aren't using native dialog boxes
+#ifndef USE_AZ_ASSERT
+        if (message == nullptr || message[0] == 0)
+        {
+            AZStd::string emptyText = AZStd::string::format("Assertion failed in %s %s:%i", func, fileName, line);
+            OnMessage(emptyText.c_str(), nullptr, MessageDisplayBehavior::AlwaysShow);
+        }
+        else
+        {
+            OnMessage(message, nullptr, MessageDisplayBehavior::AlwaysShow);
+        }
+#else
+        AZ_UNUSED(fileName);
+        AZ_UNUSED(line);
+        AZ_UNUSED(func);
+        AZ_UNUSED(message);
+#endif // !USE_AZ_ASSERT
+
+        // Return false so other listeners can handle this. The StartupTraceHandler won't report messages
+        // will probably crash before that occurs, because this is an assert.
+        return false;
+    }
+
+    bool StartupTraceHandler::OnException(const char* message)
+    {
+        // Exceptions are more fatal than errors, and need to be displayed right away.
+        // After the exception occurs, nothing else may be functional enough to collect and display messages.
+        OnMessage(message, nullptr, MessageDisplayBehavior::AlwaysShow);
+        // Return false so other listeners can handle this. The StartupTraceHandler won't report messages 
+        // until the next time the main thread updates the system tick bus function queue. The editor 
+        // will probably crash before that occurs, because this is an exception.
+        return false;
+    }
+
+    bool StartupTraceHandler::OnPreError(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* message)
+    {
+        // If a collection is not active, then show this error. Otherwise, collect it 
+        // and show it with other occurs that occured in the operation.
+        return OnMessage(message, &m_errors, MessageDisplayBehavior::ShowWhenNotCollecting);
+    }
+
+    bool StartupTraceHandler::OnPreWarning(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* message)
+    {
+        // Only track warnings if messages are being collected.
+        return OnMessage(message, &m_warnings, MessageDisplayBehavior::OnlyCollect);
+    }
+
+    bool StartupTraceHandler::OnMessage(
+        const char *message,
+        AZStd::list<QString>* messageList,
+        MessageDisplayBehavior messageDisplayBehavior)
+    {
+        if (m_isCollecting && messageList)
+        {
+            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
+            messageList->push_back(QString(message));
+            return true;
+        }
+
+        if ((!m_isCollecting && messageDisplayBehavior == MessageDisplayBehavior::ShowWhenNotCollecting) ||
+            messageDisplayBehavior == MessageDisplayBehavior::AlwaysShow)
+        {
+            ShowMessageBox(message);
+            return true;
+        }
+
+        return false;
+    }
+
+    void StartupTraceHandler::StartCollection()
+    {
+        ConnectToMessageBus();
+        if (m_isCollecting)
+        {
+            EndCollectionAndShowCollectedErrors();
+        }
+        m_isCollecting = true;
+    }
+
+    void StartupTraceHandler::EndCollectionAndShowCollectedErrors()
+    {
+        AZStd::list<QString> cachedWarnings;
+        AZStd::list<QString> cachedErrors;
+        {
+            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
+            m_isCollecting = false;
+            if (m_warnings.size() == 0 && m_errors.size() == 0)
+            {
+                return;
+            }
+            if (m_warnings.size() > 0)
+            {
+                cachedWarnings.splice(cachedWarnings.end(), m_warnings);
+            }
+            if (m_errors.size() > 0)
+            {
+                cachedErrors.splice(cachedErrors.end(), m_errors);
+            }
+        }
+        if (m_showWindow)
+        {
+            AZ::SystemTickBus::QueueFunction([cachedWarnings, cachedErrors]() 
+            {
+                // Parent to the main window, so that the error dialog doesn't
+                // show up as a separate window when alt-tabbing.
+                QWidget* mainWindow = nullptr;
+                AzToolsFramework::EditorRequests::Bus::BroadcastResult(
+                    mainWindow,
+                    &AzToolsFramework::EditorRequests::Bus::Events::GetMainWindow);
+
+                ErrorDialog* errorDialog = new ErrorDialog(mainWindow);
+                errorDialog->AddMessages(
+                    SandboxEditor::ErrorDialog::MessageType::Warning,
+                    cachedWarnings);
+                errorDialog->AddMessages(
+                    SandboxEditor::ErrorDialog::MessageType::Error,
+                    cachedErrors);
+
+                // Use open() instead of exec() here so that we still achieve the modal dialog functionality without
+                // blocking the event queue
+                errorDialog->setAttribute(Qt::WA_DeleteOnClose, true);
+                errorDialog->open();
+            });
+        }
+    }
+
+    void StartupTraceHandler::ShowMessageBox(const QString& message)
+    {
+        AZ::SystemTickBus::QueueFunction([this, message]()
+        {
+            // Parent to the main window, so that the error dialog doesn't
+            // show up as a separate window when alt-tabbing.
+            QWidget* mainWindow = nullptr;
+            AzToolsFramework::EditorRequests::Bus::BroadcastResult(
+                mainWindow,
+                &AzToolsFramework::EditorRequests::Bus::Events::GetMainWindow);
+
+            QMessageBox* msg = new QMessageBox(
+                QMessageBox::Critical, 
+                QObject::tr("Error"), 
+                message, 
+                QMessageBox::Ok,
+                mainWindow);
+            msg->setTextInteractionFlags(Qt::TextSelectableByMouse);
+
+            // Use open() instead of exec() here so that we still achieve the modal dialog functionality without
+            // blocking the event queue
+            msg->setAttribute(Qt::WA_DeleteOnClose, true);
+            msg->open();
+        });
+    }
+
+    void StartupTraceHandler::ConnectToMessageBus()
+    {
+        AZ::Debug::TraceMessageBus::Handler::BusConnect();
+    }
+
+    void StartupTraceHandler::DisconnectFromMessageBus()
+    {
+        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
+    }
+
+    bool StartupTraceHandler::IsConnectedToMessageBus() const
+    {
+        return AZ::Debug::TraceMessageBus::Handler::BusIsConnected();
+    }
+}
diff --git a/Code/Editor/StartupTraceHandler.h b/Code/Editor/StartupTraceHandler.h
new file mode 100644
index 0000000000..4591c683c5
--- /dev/null
+++ b/Code/Editor/StartupTraceHandler.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Debug/TraceMessageBus.h>
+
+namespace SandboxEditor
+{
+    /// Class to display errors during startup.
+    /// This is a system lifted from CryEdit.cpp and made thread safe.
+    /// It existed to handle errors that occur during editor startup, before
+    /// the regular error handler is loaded and available.
+    class StartupTraceHandler
+        : public AZ::Debug::TraceMessageBus::Handler
+    {
+    public:
+        StartupTraceHandler();
+        ~StartupTraceHandler();
+
+        //////////////////////////////////////////////////////////////////////
+        // AZ::Debug::TraceMessageBus::Handler overrides
+        //////////////////////////////////////////////////////////////////////
+        bool OnPreAssert(const char* fileName, int line, const char* func, const char* message) override;
+        bool OnException(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;
+        
+        //////////////////////////////////////////////////////////////////////
+        // Public interface
+        //////////////////////////////////////////////////////////////////////
+        //! Tells the trace handler to start collecting messages, instead of displaying them as they occur.
+        //! Connects to the message bus to make sure collection can occur.
+        void StartCollection();
+        //! Ends collection, and displays all collected messages in one dialog.
+        void EndCollectionAndShowCollectedErrors();
+        //! @return if any errors occured during level load.
+        bool HasAnyErrors() const { return m_errors.size() > 0; }
+
+        //! Connects the trace handler to the trace message bus.
+        void ConnectToMessageBus();
+        //! Disconnects the trace handler from the trace message bus.
+        void DisconnectFromMessageBus();
+
+        //! @return if the trace handler is connected to the message bus.
+        bool IsConnectedToMessageBus() const;
+
+        //! Sets whether to display the error window or not
+        void SetShowWindow(bool showWindow) { m_showWindow = showWindow; }
+
+    private:
+
+        /// The display behavior for messages.
+        /// Some, like warnings, are only showed in a shared message dialog.
+        /// Others, like Exceptions, are likely fatal and need to be displayed immediately. The program
+        /// state after a fatal error may not be recoverable, so these messages can't be collected
+        /// to be displayed later.
+        enum class MessageDisplayBehavior
+        {
+            AlwaysShow,             ///< Always show this message, when collecting or not collecting messages.
+            ShowWhenNotCollecting,  ///< Only show this message when collecting is not active, otherwise 
+                                    ///< the collection system will show this later.
+            OnlyCollect,            ///< Only collect this message, don't show it if not collecting.
+        };
+
+        // Returns whether or not the message was handled
+        bool OnMessage(
+            const char *message,
+            AZStd::list<QString>* messageList,
+            MessageDisplayBehavior messageDisplayBehavior);
+
+        void ShowMessageBox(const QString& message);
+
+        mutable AZStd::recursive_mutex m_mutex; ///< Messages can come in from multiple threads, so use a mutex to lock things when necessary.
+
+        AZStd::list<QString> m_errors; ///< The list of errors that occured while collecting.
+        AZStd::list<QString> m_warnings; ///< The list of warnings that occured while collecting.
+        bool m_isCollecting = false; ///< Tracks if the trace handler is collecting messages or displaying them as they occur.
+        bool m_showWindow = true; ///< Whether it should display the window
+
+        ///< The list of messages that occured on a thread that can't display a Qt popup.
+        ///< These are intended for 1 at a time popups.
+        AZStd::list<QString> m_mainThreadMessages;
+
+    };
+}
diff --git a/Code/Editor/StringDlg.cpp b/Code/Editor/StringDlg.cpp
new file mode 100644
index 0000000000..06af1837c9
--- /dev/null
+++ b/Code/Editor/StringDlg.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 "EditorDefs.h"
+
+#include "StringDlg.h"
+
+// Qt
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QVBoxLayout>
+
+
+/////////////////////////////////////////////////////////////////////////////
+// StringDlg dialog
+
+StringDlg::StringDlg(const QString &title, QWidget* pParent, bool bFileNameLimitation)
+    : QInputDialog(pParent)
+    , m_bFileNameLimitation(bFileNameLimitation)
+{
+    setWindowTitle(title);
+    setLabelText("");
+}
+
+void StringDlg::accept()
+{
+    if (m_bFileNameLimitation)
+    {
+        const QString text = textValue();
+        const QString reservedCharacters("<>:\"/\\|?*}");
+        foreach(auto reserv, reservedCharacters)
+        {
+            if (text.contains(reserv))
+            {
+                QMessageBox::warning(this, tr("Warning"), tr(" This string can't contain the following characters: %1").arg(reserv), QMessageBox::Ok);
+                return;
+            }
+        }
+    }
+    if (m_Check && !m_Check(textValue()))
+        return;
+
+    QInputDialog::accept();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+// CMultiLineStringDlg dialog
+StringGroupDlg::StringGroupDlg(const QString &title, QWidget *parent)
+    : QDialog(parent)
+{
+    if (!title.isEmpty())
+        setWindowTitle(title);
+
+    m_group = new QLineEdit(this);
+    m_string = new QLineEdit(this);
+
+    QFrame *horLine = new QFrame(this);
+    horLine->setFrameStyle(QFrame::HLine | QFrame::Plain);
+
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->addWidget(new QLabel(tr("Group"), this));
+    layout->addWidget(m_group);
+    layout->addWidget(new QLabel(tr("Name"), this));
+    layout->addWidget(m_string);
+    layout->addWidget(horLine);
+    layout->addWidget(buttonBox);
+}
+
+void StringGroupDlg::SetString(const QString &str)
+{
+    m_string->setText(str);
+}
+
+QString StringGroupDlg::GetString() const
+{
+    return m_string->text();
+}
+
+void StringGroupDlg::SetGroup(const QString &str)
+{
+    m_group->setText(str);
+}
+
+QString StringGroupDlg::GetGroup() const
+{
+    return m_group->text();
+}
diff --git a/Code/Editor/StringDlg.h b/Code/Editor/StringDlg.h
new file mode 100644
index 0000000000..4fb69e40a7
--- /dev/null
+++ b/Code/Editor/StringDlg.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_STRINGDLG_H
+#define CRYINCLUDE_EDITOR_STRINGDLG_H
+
+#pragma once
+
+#include <QInputDialog>
+#include <QMessageBox>
+
+/////////////////////////////////////////////////////////////////////////////
+// StringDlg Qt dialog
+
+// return false if error input
+typedef bool (StringDlgPredicate)(QString input);
+
+class StringDlg : public QInputDialog
+{
+public:
+    StringDlg(const QString &title, QWidget* pParent = NULL, bool bFileNameLimitation = false);
+
+    void SetCheckCallback(const std::function<StringDlgPredicate>& Check) {
+        m_Check = Check;
+    }
+    void SetString(const QString &str) {
+        setTextValue(str);
+    }
+    QString GetString() {
+        return textValue();
+    }
+
+protected:
+    virtual void accept();
+    bool m_bFileNameLimitation;
+    std::function<StringDlgPredicate> m_Check;
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+// StringGroupDlg Qt dialog
+class SANDBOX_API StringGroupDlg : public QDialog
+{
+    // Construction
+public:
+    StringGroupDlg(const QString &title = QString(), QWidget *parent = 0);
+
+    void SetString(const QString &str);
+    QString GetString() const;
+
+    void SetGroup(const QString &str);
+    QString GetGroup() const;
+
+protected:
+    QLineEdit *m_string;
+    QLineEdit *m_group;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_STRINGDLG_H
diff --git a/Code/Editor/Style/Editor.qss b/Code/Editor/Style/Editor.qss
new file mode 100644
index 0000000000..d917cce79b
--- /dev/null
+++ b/Code/Editor/Style/Editor.qss
@@ -0,0 +1,245 @@
+/*
+ * 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
+ *
+ */
+
+ActionWidget #LinkButton
+{
+    qproperty-flat: true;
+}
+
+AzAssetBrowserWindow #previewWidgetWrapper
+{
+    background-color: #323232;
+    border: 0 none;
+}
+
+AzAssetBrowserWindow QSplitter
+{
+    margin-top: 2px;
+}
+
+/* Component Palette Widget */
+AzToolsFramework--ComponentPaletteWidget
+{
+    border: 1px solid #4E4E4E;
+    background-color: #383A3B;
+}
+
+AzToolsFramework--ComponentPaletteWidget > QTreeView
+{
+    background-color: #222222;
+}
+
+AzToolsFramework--PropertyRowWidget[canBeReordered="true"]  QLabel#Name
+{
+    font-weight: bold;
+}
+
+/* Style for visualizing property values overridden from their prefab values */
+AzToolsFramework--PropertyRowWidget[IsOverridden=true] #Name QLabel,
+AzToolsFramework--ComponentEditorHeader #Title[IsOverridden="true"]
+{
+    font-weight: bold;
+    color: #F5A623;
+}
+
+/* Asset Editor */
+Ui--AssetEditorHeader
+{
+    margin: 0px;
+    padding: 0px;
+}
+
+Ui--AssetEditorHeader *
+{
+    height: 16px;
+    background-color: #272727;
+}
+
+Ui--AssetEditorHeader #Background
+{
+    margin: 0px;
+    padding: 2px 7px 3px 7px;
+    border: 1px solid transparent;
+    border-bottom: none;
+    background-image: none;
+    background-color: #272727;
+}
+
+Ui--AssetEditorHeader #Name
+{
+    height: 16px;
+    font: italic;
+    background-color: transparent;
+}
+
+Ui--AssetEditorHeader #Location
+{
+    height: 16px;
+    font: italic;
+    background-color: transparent;
+}
+
+#AssetEditorWidgetPropertyEditor AzToolsFramework--PropertyRowWidget[isTopLevel="true"]
+{
+    qproperty-appendDefaultLabelToName:1;
+}
+
+#AssetEditorWidgetPropertyEditor AzToolsFramework--PropertyRowWidget[isTopLevel="false"]
+{
+    qproperty-appendDefaultLabelToName:0;
+}
+
+#AssetEditorWidgetPropertyEditor AzToolsFramework--PropertyRowWidget[getLevel="1"][hasChildRows="true"]
+{
+    border-top: 1px solid rgba(255, 255, 255, 0.2);
+}
+
+/* Set the Script Canvas search highlight color */
+GraphCanvas--NodePaletteTreeView
+{
+    selection-background-color: rgba(255, 255, 255, 41);
+}
+
+AzQtComponents--TabWidget#ScriptCanvasTabs
+{
+    height: 32px;
+    margin: 0 2px;
+    max-height: 32px;
+}
+
+/* Save Slice Override Window */
+AzToolsFramework--SlicePushWidget QTreeView QLabel
+{
+    min-height: 14px;
+}
+
+AzToolsFramework--SlicePushWidget QWidget#WarningTopLine
+{
+    background-color: #F5A623
+}
+
+AzToolsFramework--SlicePushWidget QWidget#WarningBottomLine
+{
+    background-color: #646464
+}
+
+AzToolsFramework--SlicePushWidget QTreeWidget#WarningTreeWidget::item:pressed
+, AzToolsFramework--SlicePushWidget QTreeWidget#WarningTreeWidget::item:selected
+{
+    background-color: #2D2D2D;
+}
+
+/* Toolbar borders (Editor UI Window) */
+EditorWindow QToolBar
+{
+    border-bottom: 2px solid #111111;
+}
+
+DockWidgetTitleBar #DockWidgetContextMenu
+{
+    qproperty-icon: url(:/Cards/img/UI20/Cards/menu_ico.svg);
+    qproperty-iconSize: 24px 16px;
+    qproperty-flat: true;
+    margin: 0px;
+    max-width: 24px;
+    max-height: 16px;
+}
+
+#EMFX_Menu
+{
+    border-bottom-width: 2px;
+    border-bottom-color: #111111;
+    border-bottom-style: solid;
+}
+
+#EMFX_Menu QComboBox
+{
+    margin-right: 4px;
+    margin-bottom: 2px;
+}
+
+PanelTitleBar
+{
+    border-top: 1px solid #111111;
+}
+
+/* Asset Editor */
+
+#AssetEditorStatusBar
+{
+    border-top: 2px solid #111111;
+}
+
+/* Console and Python Console */
+
+ConsoleTextEdit,
+ConsoleTextEdit:hover,
+ConsoleTextEdit:focus,
+#SCRIPT_OUTPUT,
+#SCRIPT_OUTPUT:hover,
+#SCRIPT_OUTPUT:focus
+{
+    margin: 0;
+    margin-top: 6px;
+    background-color: #222222;
+    border-radius: 0px;
+    border-width: 0px;
+    border-color: #e9e9e9;
+    border-style: solid;
+}
+
+/* Welcome Screen styling */
+
+WelcomeScreenDialog QLabel
+{
+    font-size: 12px;
+    color: #FFFFFF;
+    line-height: 20px;
+    background-color: transparent;
+    margin: 0;
+}
+
+WelcomeScreenDialog QLabel#currentProjectLabel
+{
+    margin-top: 10px;
+}
+
+WelcomeScreenDialog QPushButton
+{
+    font-size: 14px;
+    line-height: 16px;
+}
+
+WelcomeScreenDialog QWidget#articleViewContainerRoot
+{
+    background: #444444;
+}
+
+WelcomeScreenDialog QWidget#levelViewFTUEContainer
+{
+    background: #282828;
+}
+
+QTableWidget#recentLevelTable::item {
+	background-color: rgb(64,64,64);
+	margin-bottom: 4px;
+	margin-top: 4px;
+}
+
+/* Particle Editor */
+
+#NumParticlesLabel
+{
+    margin-top: 6px;
+}
+
+#LibrarySearchIcon
+{
+    max-width: 16px;
+    max-height: 16px;
+    qproperty-iconSize: 16px 16px;
+}
diff --git a/Code/Editor/Style/EditorPreferencesDialog.qss b/Code/Editor/Style/EditorPreferencesDialog.qss
new file mode 100644
index 0000000000..c315629787
--- /dev/null
+++ b/Code/Editor/Style/EditorPreferencesDialog.qss
@@ -0,0 +1,61 @@
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+QWidget#EditorPreferencesDialog
+{
+    margin: 0px;
+    padding: -4px -5px -4px -5px;
+    background-color: #444444;
+    border-color: transparent;
+}
+
+QWidget#EditorPreferencesDialog QTreeWidget#pageTree
+{
+    font-size: 11px;
+    border: 1px solid #111111;
+    background-color: #333333;
+    margin: 0px;
+}
+
+QWidget#EditorPreferencesDialog QTreeWidget#pageTree::item
+{
+    margin-top: 3px;
+    margin-bottom: 2px;
+}
+
+QWidget#EditorPreferencesDialog AzToolsFramework--ReflectedPropertyEditor#propertyEditor
+{
+    background-color: #222222;
+    border: 1px solid #111111;
+    margin: 0px 2px 0px 5px
+}
+
+AzToolsFramework--PropertyRowWidget QLabel#Name
+{
+    color: #eeeeee;
+    padding: 0 0 0 5px;
+}
+
+AzToolsFramework--PropertyRowWidget[HasParent="false"] QLabel#Name
+{
+    font-weight: bold;
+    padding: 0 0 0 5;
+    color: white;
+}
+
+#EditorPreferencesDialog AzToolsFramework--PropertyRowWidget[isTopLevel="true"][hasChildRows="true"]
+{
+    border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+    padding: 4px 0 6px;
+    margin-bottom: 4px;
+}
+
+#EditorPreferencesDialog AzToolsFramework--PropertyRowWidget[isTopLevel="true"][hasChildRows="true"] QLabel#Name
+{
+    font-weight: bold;
+}
diff --git a/Code/Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json b/Code/Editor/Style/EditorStylesheetVariables_Dark.json
similarity index 100%
rename from Code/Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json
rename to Code/Editor/Style/EditorStylesheetVariables_Dark.json
diff --git a/Code/Editor/Style/GraphicsSettingsDialog.qss b/Code/Editor/Style/GraphicsSettingsDialog.qss
new file mode 100644
index 0000000000..3af8c4c05b
--- /dev/null
+++ b/Code/Editor/Style/GraphicsSettingsDialog.qss
@@ -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
+ *
+ */
+
+#GraphicsSettingsDialog QHeaderView::section
+{
+        background: #2D2D2D;
+}
+
+#GraphicsSettingsDialog QHeaderView::down-arrow
+{
+    width: 14px;
+    height: 14px;
+    image: url(:/Gallery/Delete.svg);
+}
+
+#GraphicsSettingsDialog QHeaderView::up-arrow
+{
+    width: 14px;
+    height: 14px;
+    image: url(:/Gallery/Delete.svg);
+}
diff --git a/Code/Editor/Style/LayoutConfigDialog.qss b/Code/Editor/Style/LayoutConfigDialog.qss
new file mode 100644
index 0000000000..20dbd2823c
--- /dev/null
+++ b/Code/Editor/Style/LayoutConfigDialog.qss
@@ -0,0 +1,9 @@
+#CLayoutConfigDialog QListView::item
+{
+    padding: 2px 4px;
+}
+
+#CLayoutConfigDialog QListView::item:selected
+{
+    background: #94D2FF;
+}
diff --git a/Code/Sandbox/Editor/Style/NewEditorStylesheet.qss b/Code/Editor/Style/NewEditorStylesheet.qss
similarity index 100%
rename from Code/Sandbox/Editor/Style/NewEditorStylesheet.qss
rename to Code/Editor/Style/NewEditorStylesheet.qss
diff --git a/Code/Sandbox/Editor/Style/resources.qrc b/Code/Editor/Style/resources.qrc
similarity index 100%
rename from Code/Sandbox/Editor/Style/resources.qrc
rename to Code/Editor/Style/resources.qrc
diff --git a/Code/Editor/SurfaceTypeValidator.cpp b/Code/Editor/SurfaceTypeValidator.cpp
new file mode 100644
index 0000000000..39c5f6ff7e
--- /dev/null
+++ b/Code/Editor/SurfaceTypeValidator.cpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "SurfaceTypeValidator.h"
+
+// Editor
+#include "Include/IObjectManager.h"
+#include "Objects/BaseObject.h"
+#include "ErrorReport.h"
+
+
+void CSurfaceTypeValidator::Validate()
+{
+}
+
diff --git a/Code/Editor/SurfaceTypeValidator.h b/Code/Editor/SurfaceTypeValidator.h
new file mode 100644
index 0000000000..340d1acf79
--- /dev/null
+++ b/Code/Editor/SurfaceTypeValidator.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_SURFACETYPEVALIDATOR_H
+#define CRYINCLUDE_EDITOR_SURFACETYPEVALIDATOR_H
+#pragma once
+
+
+
+class CSurfaceTypeValidator
+{
+public:
+    void Validate();
+
+private:
+};
+
+#endif // CRYINCLUDE_EDITOR_SURFACETYPEVALIDATOR_H
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-00.png b/Code/Editor/TimeOfDay/main-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-00.png
rename to Code/Editor/TimeOfDay/main-00.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-01.png b/Code/Editor/TimeOfDay/main-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-01.png
rename to Code/Editor/TimeOfDay/main-01.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-02.png b/Code/Editor/TimeOfDay/main-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-02.png
rename to Code/Editor/TimeOfDay/main-02.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-03.png b/Code/Editor/TimeOfDay/main-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-03.png
rename to Code/Editor/TimeOfDay/main-03.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-04.png b/Code/Editor/TimeOfDay/main-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-04.png
rename to Code/Editor/TimeOfDay/main-04.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-05.png b/Code/Editor/TimeOfDay/main-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-05.png
rename to Code/Editor/TimeOfDay/main-05.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-06.png b/Code/Editor/TimeOfDay/main-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-06.png
rename to Code/Editor/TimeOfDay/main-06.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-07.png b/Code/Editor/TimeOfDay/main-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-07.png
rename to Code/Editor/TimeOfDay/main-07.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-08.png b/Code/Editor/TimeOfDay/main-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-08.png
rename to Code/Editor/TimeOfDay/main-08.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-09.png b/Code/Editor/TimeOfDay/main-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-09.png
rename to Code/Editor/TimeOfDay/main-09.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-10.png b/Code/Editor/TimeOfDay/main-10.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-10.png
rename to Code/Editor/TimeOfDay/main-10.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-11.png b/Code/Editor/TimeOfDay/main-11.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-11.png
rename to Code/Editor/TimeOfDay/main-11.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-12.png b/Code/Editor/TimeOfDay/main-12.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-12.png
rename to Code/Editor/TimeOfDay/main-12.png
diff --git a/Code/Editor/ToolBox.cpp b/Code/Editor/ToolBox.cpp
new file mode 100644
index 0000000000..1dd22f678d
--- /dev/null
+++ b/Code/Editor/ToolBox.cpp
@@ -0,0 +1,582 @@
+/*
+ * 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 : ToolBox Macro System
+
+
+#include "EditorDefs.h"
+
+#include "ToolBox.h"
+
+#include <AzCore/Utils/Utils.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+// Editor
+#include "Settings.h"
+#include "ActionManager.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// CToolBoxCommand
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxCommand::Save(XmlNodeRef commandNode) const
+{
+    commandNode->setAttr("type", (int)m_type);
+    commandNode->setAttr("text", m_text.toUtf8().data());
+    commandNode->setAttr("bVariableToggle", m_bVariableToggle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxCommand::Load(XmlNodeRef commandNode)
+{
+    int type = 0;
+    commandNode->getAttr("type", type);
+    m_type = CToolBoxCommand::EType(type);
+    m_text = commandNode->getAttr("text");
+    commandNode->getAttr("bVariableToggle", m_bVariableToggle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxCommand::Execute() const
+{
+    if (m_type == CToolBoxCommand::eT_SCRIPT_COMMAND)
+    {
+        using namespace AzToolsFramework;
+        EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByString, m_text.toUtf8().data(), false);
+    }
+    else if (m_type == CToolBoxCommand::eT_CONSOLE_COMMAND)
+    {
+        if (m_bVariableToggle)
+        {
+            // Toggle the variable.
+            float val = GetIEditor()->GetConsoleVar(m_text.toUtf8().data());
+            bool bOn = val != 0;
+            GetIEditor()->SetConsoleVar(m_text.toUtf8().data(), (bOn) ? 0 : 1);
+        }
+        else
+        {
+            // does the command required an active Python interpreter?
+            if (m_text.contains("pyRunFile") && !AzToolsFramework::EditorPythonRunnerRequestBus::HasHandlers())
+            {
+                AZ_Warning("toolbar", false, "The command '%s' requires an embedded Python interpreter. "
+                                             "The gem named EditorPythonBindings offers this service. "
+                                             "Please enable this gem for the project.", m_text.toUtf8().data());
+                return;
+            }
+            GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(m_text.toUtf8().data());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CToolBoxMacro
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxMacro::Save(XmlNodeRef macroNode) const
+{
+    for (size_t i = 0; i < m_commands.size(); ++i)
+    {
+        XmlNodeRef commandNode = macroNode->newChild("command");
+        m_commands[i]->Save(commandNode);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxMacro::Load(XmlNodeRef macroNode)
+{
+    for (int i = 0; i < macroNode->getChildCount(); ++i)
+    {
+        XmlNodeRef commandNode = macroNode->getChild(i);
+        m_commands.push_back(new CToolBoxCommand);
+        m_commands[i]->Load(commandNode);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxMacro::AddCommand(CToolBoxCommand::EType type, const QString& command, bool bVariableToggle)
+{
+    CToolBoxCommand* pNewCommand = new CToolBoxCommand;
+    pNewCommand->m_type = type;
+    pNewCommand->m_text = command;
+    pNewCommand->m_bVariableToggle = bVariableToggle;
+    m_commands.push_back(pNewCommand);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxMacro::Clear()
+{
+    for (size_t i = 0; i < m_commands.size(); ++i)
+    {
+        delete m_commands[i];
+    }
+
+    m_commands.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+const CToolBoxCommand* CToolBoxMacro::GetCommandAt(int index) const
+{
+    assert(0 <= index && index < m_commands.size());
+
+    return m_commands[index];
+}
+
+//////////////////////////////////////////////////////////////////////////
+CToolBoxCommand* CToolBoxMacro::GetCommandAt(int index)
+{
+    assert(0 <= index && index < m_commands.size());
+
+    return m_commands[index];
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxMacro::SwapCommand(int index1, int index2)
+{
+    assert(0 <= index1 && index1 < m_commands.size());
+    assert(0 <= index2 && index2 < m_commands.size());
+    std::swap(m_commands[index1], m_commands[index2]);
+}
+
+void CToolBoxMacro::RemoveCommand(int index)
+{
+    assert(0 <= index && index < m_commands.size());
+
+    m_commands.erase(m_commands.begin() + index);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxMacro::Execute() const
+{
+    for (size_t i = 0; i < m_commands.size(); ++i)
+    {
+        m_commands[i]->Execute();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CToolBoxManager
+//////////////////////////////////////////////////////////////////////////
+int CToolBoxManager::GetMacroCount(bool bToolbox) const
+{
+    if (bToolbox)
+    {
+        return int(m_macros.size());
+    }
+    return int(m_shelveMacros.size());
+}
+
+//////////////////////////////////////////////////////////////////////////
+const CToolBoxMacro* CToolBoxManager::GetMacro(int iIndex, bool bToolbox) const
+{
+    if (bToolbox)
+    {
+        assert(0 <= iIndex && iIndex < m_macros.size());
+        return m_macros[iIndex];
+    }
+    else
+    {
+        assert(0 <= iIndex && iIndex < m_shelveMacros.size());
+        return m_shelveMacros[iIndex];
+    }
+    return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CToolBoxMacro* CToolBoxManager::GetMacro(int iIndex, bool bToolbox)
+{
+    if (bToolbox)
+    {
+        assert(0 <= iIndex && iIndex < m_macros.size());
+        return m_macros[iIndex];
+    }
+    else
+    {
+        assert(0 <= iIndex && iIndex < m_shelveMacros.size());
+        return m_shelveMacros[iIndex];
+    }
+    return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CToolBoxManager::GetMacroIndex(const QString& title, bool bToolbox) const
+{
+    if (bToolbox)
+    {
+        for (size_t i = 0; i < m_macros.size(); ++i)
+        {
+            if (QString::compare(m_macros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
+            {
+                return int(i);
+            }
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < m_shelveMacros.size(); ++i)
+        {
+            if (QString::compare(m_shelveMacros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
+            {
+                return int(i);
+            }
+        }
+    }
+
+    return -1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CToolBoxMacro* CToolBoxManager::NewMacro(const QString& title, bool bToolbox, int* newIdx)
+{
+    if (bToolbox)
+    {
+        const int macroCount = m_macros.size();
+        if (macroCount > ID_TOOL_LAST - ID_TOOL_FIRST + 1)
+        {
+            return NULL;
+        }
+
+        for (size_t i = 0; i < macroCount; ++i)
+        {
+            if (QString::compare(m_macros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
+            {
+                return NULL;
+            }
+        }
+
+        CToolBoxMacro* pNewTool = new CToolBoxMacro(title);
+        if (newIdx)
+        {
+            *newIdx = macroCount;
+        }
+        m_macros.push_back(pNewTool);
+        return pNewTool;
+    }
+    else
+    {
+        const int shelveMacroCount = m_shelveMacros.size();
+        if (shelveMacroCount > ID_TOOL_SHELVE_LAST - ID_TOOL_SHELVE_FIRST + 1)
+        {
+            return NULL;
+        }
+
+        CToolBoxMacro* pNewTool = new CToolBoxMacro(title);
+        if (newIdx)
+        {
+            *newIdx = shelveMacroCount;
+        }
+        m_shelveMacros.push_back(pNewTool);
+        return pNewTool;
+    }
+    return NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CToolBoxManager::SetMacroTitle(int index, const QString& title, bool bToolbox)
+{
+    if (bToolbox)
+    {
+        assert(0 <= index && index < m_macros.size());
+        for (size_t i = 0; i < m_macros.size(); ++i)
+        {
+            if (i == index)
+            {
+                continue;
+            }
+
+            if (QString::compare(m_macros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
+            {
+                return false;
+            }
+        }
+
+        m_macros[index]->SetTitle(title);
+    }
+    else
+    {
+        assert(0 <= index && index < m_shelveMacros.size());
+        for (size_t i = 0; i < m_shelveMacros.size(); ++i)
+        {
+            if (i == index)
+            {
+                continue;
+            }
+
+            if (QString::compare(m_shelveMacros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
+            {
+                return false;
+            }
+        }
+
+        m_shelveMacros[index]->SetTitle(title);
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxManager::Load(ActionManager* actionManager)
+{
+    Clear();
+
+    QString path;
+    GetSaveFilePath(path);
+    Load(path, nullptr, true, nullptr);
+
+    if (actionManager)
+    {
+        auto engineSourceAssetPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
+        LoadShelves((engineSourceAssetPath / "Editor" / "Scripts").c_str(),
+            (engineSourceAssetPath / "Editor" / "Scripts" / "Shelves").c_str(), actionManager);
+    }
+}
+
+void CToolBoxManager::LoadShelves(QString scriptPath, QString shelvesPath, ActionManager* actionManager)
+{
+    IFileUtil::FileArray files;
+    CFileUtil::ScanDirectory(shelvesPath, "*.xml", files);
+
+    const int shelfCount = files.size();
+    for (int idx = 0; idx < shelfCount; ++idx)
+    {
+        if (Path::GetExt(files[idx].filename) != "xml")
+        {
+            continue;
+        }
+
+        QString shelfName(PathUtil::GetFileName(files[idx].filename.toUtf8().data()));
+
+        AmazonToolbar toolbar(shelfName, shelfName);
+        Load(shelvesPath + QString("/") + files[idx].filename, &toolbar, false, actionManager);
+
+        m_toolbars.push_back(toolbar);
+    }
+}
+
+void CToolBoxManager::Load(QString xmlpath, AmazonToolbar* pToolbar, bool bToolbox, ActionManager* actionManager)
+{
+    XmlNodeRef toolBoxNode = XmlHelpers::LoadXmlFromFile(xmlpath.toUtf8().data());
+    if (toolBoxNode == NULL)
+    {
+        return;
+    }
+
+    if (!pToolbar)
+    {
+        GetIEditor()->GetSettingsManager()->AddSettingsNode(toolBoxNode);
+    }
+    else
+    {
+        const char* PRETTY_NAME_ATTR = "prettyName";
+        const char* SHOW_BY_DEFAULT_ATTR = "showByDefault";
+        const char* SHELF_NAME_ATTR = "shelfName";
+
+        QString shelfName = pToolbar->GetName();
+
+        if (toolBoxNode->haveAttr(SHELF_NAME_ATTR))
+        {
+            shelfName = toolBoxNode->getAttr(SHELF_NAME_ATTR);
+        }
+
+        QString prettyName = shelfName;
+
+        if (toolBoxNode->haveAttr(PRETTY_NAME_ATTR))
+        {
+            prettyName = toolBoxNode->getAttr(PRETTY_NAME_ATTR);
+        }
+
+        pToolbar->SetName(shelfName, prettyName);
+
+        if (toolBoxNode->haveAttr(SHOW_BY_DEFAULT_ATTR))
+        {
+            const char* showByDefaultAttrString = toolBoxNode->getAttr(SHOW_BY_DEFAULT_ATTR);
+
+            QString showByDefaultString = QString(showByDefaultAttrString);
+            showByDefaultString = showByDefaultString.trimmed();
+
+            bool hideByDefault = (QString::compare(showByDefaultString, "false", Qt::CaseInsensitive) == 0) || (QString::compare(showByDefaultString, "0") == 0);
+            pToolbar->SetShowByDefault(!hideByDefault);
+        }
+    }
+
+    AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
+    QDir engineDir = !engineRoot.empty() ? QDir(QString(engineRoot.c_str())) : QDir::current();
+
+    string enginePath = PathUtil::AddSlash(engineDir.absolutePath().toUtf8().data());
+
+    for (int i = 0; i < toolBoxNode->getChildCount(); ++i)
+    {
+        XmlNodeRef macroNode = toolBoxNode->getChild(i);
+        QString title = macroNode->getAttr("title");
+        QString shortcutName = macroNode->getAttr("shortcut");
+        QString iconPath = macroNode->getAttr("icon");
+
+        int idx = -1;
+        CToolBoxMacro* pMacro = NewMacro(title, bToolbox, &idx);
+        if (!pMacro || idx == -1)
+        {
+            continue;
+        }
+
+        pMacro->Load(macroNode);
+        pMacro->SetShortcutName(shortcutName);
+        pMacro->SetIconPath(iconPath.toUtf8().data());
+        pMacro->SetToolbarId(-1);
+
+        if (!pToolbar)
+        {
+            continue;
+        }
+
+        string shelfPath = PathUtil::GetParentDirectory(xmlpath.toUtf8().data());
+        string fullIconPath = enginePath + PathUtil::AddSlash(shelfPath.c_str());
+        fullIconPath.append(iconPath.toUtf8().data());
+
+        pMacro->SetIconPath(fullIconPath);
+
+        QString toolTip(macroNode->getAttr("tooltip"));
+        pMacro->action()->setToolTip(toolTip);
+
+        int actionId;
+
+        if (pMacro->GetCommandCount() == 0 || pMacro->GetCommandAt(0)->m_type == CToolBoxCommand::eT_INVALID_COMMAND)
+        {
+            actionId = ID_TOOLBAR_SEPARATOR;
+        }
+        else
+        {
+            actionId = bToolbox ? ID_TOOL_FIRST + idx : ID_TOOL_SHELVE_FIRST + idx;
+
+            // ActionManager uses a QSignalMapper internally. We need to disconnect any existing
+            // connections here otherwise the macro will be called more than once.
+            QObject::disconnect(pMacro->action(), &QAction::triggered, nullptr, nullptr);
+
+            actionManager->AddAction(actionId, pMacro->action());
+        }
+
+        pToolbar->AddAction(actionId);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxManager::Save() const
+{
+    XmlNodeRef toolBoxNode = XmlHelpers::CreateXmlNode(TOOLBOXMACROS_NODE);
+    for (size_t i = 0; i < m_macros.size(); ++i)
+    {
+        if (m_macros[i]->GetToolbarId() != -1)
+        {
+            continue;
+        }
+
+        XmlNodeRef macroNode = toolBoxNode->newChild("macro");
+        macroNode->setAttr("title", m_macros[i]->GetTitle().toUtf8().data());
+        macroNode->setAttr("shortcut", m_macros[i]->GetShortcutName().toString().toUtf8().data());
+        macroNode->setAttr("icon", m_macros[i]->GetIconPath().toUtf8().data());
+        m_macros[i]->Save(macroNode);
+    }
+    QString path;
+    GetSaveFilePath(path);
+    XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), toolBoxNode, path.toUtf8().data());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxManager::Clear()
+{
+    for (size_t i = 0; i < m_macros.size(); ++i)
+    {
+        delete m_macros[i];
+    }
+    m_macros.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxManager::ExecuteMacro(int iIndex, bool bToolbox) const
+{
+    if (iIndex >= 0 && iIndex < GetMacroCount(bToolbox) && GetMacro(iIndex, bToolbox))
+    {
+        GetMacro(iIndex, bToolbox)->Execute();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxManager::ExecuteMacro(const QString& name, bool bToolbox) const
+{
+    if (bToolbox)
+    {
+        // Find tool with this name.
+        for (size_t i = 0; i < m_macros.size(); ++i)
+        {
+            if (QString::compare(m_macros[i]->GetTitle(), name, Qt::CaseInsensitive) == 0)
+            {
+                ExecuteMacro(int(i), bToolbox);
+                break;
+            }
+        }
+    }
+    else
+    {
+        // Find tool with this name.
+        for (size_t i = 0; i < m_shelveMacros.size(); ++i)
+        {
+            if (QString::compare(m_shelveMacros[i]->GetTitle(), name, Qt::CaseInsensitive) == 0)
+            {
+                ExecuteMacro(int(i), bToolbox);
+                break;
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxManager::SwapMacro(int index1, int index2, bool bToolbox)
+{
+    assert(0 <= index1 && index1 < GetMacroCount(bToolbox));
+    assert(0 <= index2 && index2 < GetMacroCount(bToolbox));
+    if (bToolbox)
+    {
+        std::swap(m_macros[index1], m_macros[index2]);
+    }
+    else
+    {
+        std::swap(m_shelveMacros[index1], m_shelveMacros[index2]);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxManager::RemoveMacro(int index, bool bToolbox)
+{
+    assert(0 <= index && index < GetMacroCount(bToolbox));
+
+    if (bToolbox)
+    {
+        delete m_macros[index];
+        m_macros[index] = nullptr;
+        m_macros.erase(m_macros.begin() + index);
+    }
+    else
+    {
+        delete m_shelveMacros[index];
+        m_shelveMacros[index] = nullptr;
+        m_shelveMacros.erase(m_shelveMacros.begin() + index);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolBoxManager::GetSaveFilePath(QString& outPath) const
+{
+    outPath = Path::GetResolvedUserSandboxFolder();
+    outPath += "Macros.xml";
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+const std::vector<AmazonToolbar>& CToolBoxManager::GetToolbars() const
+{
+    return m_toolbars;
+}
diff --git a/Code/Editor/ToolBox.h b/Code/Editor/ToolBox.h
new file mode 100644
index 0000000000..84bf1d583c
--- /dev/null
+++ b/Code/Editor/ToolBox.h
@@ -0,0 +1,166 @@
+/*
+ * 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 : ToolBox Macro System
+
+
+#ifndef CRYINCLUDE_EDITOR_TOOLBOX_H
+#define CRYINCLUDE_EDITOR_TOOLBOX_H
+#pragma once
+
+#define TOOLBOXMACROS_NODE "toolboxmacros"
+#define INVALID_TOOLBAR_ID -1
+
+#include "ToolbarManager.h"
+
+class ActionManager;
+
+class CToolBoxManager;
+
+#include <QAction>
+
+/** Represents a single ToolBox command.
+*/
+class CToolBoxCommand
+{
+public:
+    enum EType
+    {
+        eT_INVALID_COMMAND = 0,
+        eT_SCRIPT_COMMAND,
+        eT_CONSOLE_COMMAND,
+    };
+
+    CToolBoxCommand()
+        : m_bVariableToggle(false)
+        , m_type(eT_INVALID_COMMAND)
+    {
+    }
+
+    void Save(XmlNodeRef commandNode) const;
+    void Load(XmlNodeRef commandNode);
+
+    void Execute() const;
+
+    QString m_text;
+
+    bool m_bVariableToggle;
+    EType m_type;
+};
+
+Q_DECLARE_METATYPE(CToolBoxCommand*)
+
+/** Represents a sequence of ToolBox commands.
+*/
+class CToolBoxMacro
+{
+    friend class CToolBoxManager;
+public:
+    CToolBoxMacro(const QString& title)
+        : m_action(title, 0)
+        , m_toolbarId(INVALID_TOOLBAR_ID)
+    {
+        QObject::connect(&m_action, &QAction::triggered, &m_action, [this]() { Execute(); });
+    }
+    ~CToolBoxMacro()
+    { Clear(); }
+
+    void Save(XmlNodeRef macroNode) const;
+    void Load(XmlNodeRef macroNode);
+
+    void AddCommand(CToolBoxCommand::EType type, const QString& command, bool bVariableToggle = false);
+    void Clear();
+    QString GetTitle() const
+    { return m_action.text(); }
+    void SetTitle(const QString& title) { m_action.setText(title); }
+    int GetCommandCount() const
+    { return int(m_commands.size()); }
+    const CToolBoxCommand* GetCommandAt(int index) const;
+    CToolBoxCommand* GetCommandAt(int index);
+    void SwapCommand(int index1, int index2);
+    void RemoveCommand(int index);
+
+    QAction* action() { return &m_action;  }
+
+    void Execute() const;
+
+    void SetShortcutName(const QKeySequence& name)
+    {   m_action.setShortcut(name);   }
+    QKeySequence GetShortcutName()  const
+    {   return m_action.shortcut();         }
+
+    void SetIconPath(const char* path)
+    {
+        m_iconPath = path;
+        m_action.setIcon(QPixmap(path));
+    }
+    const QString& GetIconPath() const
+    { return m_iconPath; }
+
+    void SetToolbarId(int nID)
+    { m_toolbarId = nID; }
+    int GetToolbarId()
+    { return m_toolbarId; }
+
+private:
+    std::vector<CToolBoxCommand*> m_commands;
+    QString m_iconPath;
+    QAction m_action;
+    int m_toolbarId;
+};
+
+Q_DECLARE_METATYPE(CToolBoxMacro*)
+
+/** Manages user defined macros.
+*/
+class CToolBoxManager
+{
+public:
+    ~CToolBoxManager()
+    { Clear(); }
+
+    // Save macros configuration to registry.
+    void Save() const;
+    // Load macros configuration from registry.
+    void Load(ActionManager* actionManager = nullptr);
+    void LoadShelves(QString scriptPath, QString shelvesPath, ActionManager* actionManager);
+
+    //! Get the number of managed macros.
+    int GetMacroCount(bool bToolbox) const;
+    //! Get a macro by index.
+    const CToolBoxMacro* GetMacro(int iIndex, bool bToolbox) const;
+    CToolBoxMacro* GetMacro(int iIndex, bool bToolbox);
+    //! Get the index of a macro from its title.
+    int GetMacroIndex(const QString& title, bool bToolbox) const;
+    //! Creates a new macro in the manager. If the title is duplicate, this returns NULL.
+    CToolBoxMacro* NewMacro(const QString& title, bool bToolbox, int* newIdx);
+    //! Try to change the title of a macro. If the title is duplicate, the change is aborted and this returns false.
+    bool SetMacroTitle(int index, const QString& title, bool bToolbox);
+    //! Delete all macros.
+    void Clear();
+
+    void SwapMacro(int index1, int index2, bool bToolbox);
+    void RemoveMacro(int index, bool bToolbox);
+
+    //! Execute the macro with specified id.
+    void ExecuteMacro(int iIndex, bool bToolbox) const;
+    void ExecuteMacro(const QString& name, bool bToolbox) const;
+
+    void GetSaveFilePath(QString& path) const;
+
+    const std::vector<AmazonToolbar>& GetToolbars() const;
+
+private:
+    void Load(QString xmlpath, AmazonToolbar* pToolbar, bool bToolbox, ActionManager* actionManager);
+
+    std::vector<CToolBoxMacro*> m_macros;
+    std::vector<CToolBoxMacro*> m_shelveMacros;
+    std::vector<AmazonToolbar> m_toolbars;
+};
+
+#endif // CRYINCLUDE_EDITOR_TOOLBOX_H
diff --git a/Code/Editor/ToolbarCustomizationDialog.cpp b/Code/Editor/ToolbarCustomizationDialog.cpp
new file mode 100644
index 0000000000..4eb948cb51
--- /dev/null
+++ b/Code/Editor/ToolbarCustomizationDialog.cpp
@@ -0,0 +1,375 @@
+/*
+ * 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 "ToolbarCustomizationDialog.h"
+
+// Qt
+#include <QMenuBar>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QDebug>
+
+// AzQtComponents
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+
+// Editor
+#include "MainWindow.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_ToolbarCustomizationDialog.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+using namespace AzQtComponents;
+
+enum ItemDataRole
+{
+    ToolbarRole = Qt::UserRole,
+    ToolbarNameRole
+};
+
+enum Tab
+{
+    TabToolbars,
+    TabCommands,
+    TabOptions,
+    TabKeyboard
+};
+
+ToolbarCustomizationDialog::ToolbarCustomizationDialog(MainWindow* mainWindow)
+    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, mainWindow))
+    , ui(new Ui::ToolbarCustomizationDialog())
+    , m_mainWindow(mainWindow)
+    , m_toolbarManager(mainWindow->GetToolbarManager())
+{
+    m_toolbarManager->SetIsEditingToolBars(true);
+    ui->setupUi(this);
+    setAcceptDrops(true);
+
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    connect(ui->closeButton, &QPushButton::clicked, this, &QWidget::close);
+    Setup();
+    setAttribute(Qt::WA_DeleteOnClose);
+    connect(ui->tabWidget, &QTabWidget::currentChanged, this, &ToolbarCustomizationDialog::OnTabChanged);
+    connect(ui->newButton, &QPushButton::clicked, this, [this] {
+        NewToolbar();
+    });
+    connect(ui->renameButton, &QPushButton::clicked, this, &ToolbarCustomizationDialog::RenameToolbar);
+    connect(ui->deleteButton, &QPushButton::clicked, this, &ToolbarCustomizationDialog::DeleteToolbar);
+    connect(ui->resetButton, &QPushButton::clicked, this, &ToolbarCustomizationDialog::ResetToolbar);
+
+    ui->commandsListWidget->setDragDropMode(QAbstractItemView::DragOnly);
+    ui->commandsListWidget->setDragEnabled(true);
+
+    // Hide the options and keyboard tabs. TODO: See what amazon wants to do with these. Most options don't make sense for Qt.
+    ui->tabWidget->removeTab(3);
+    ui->tabWidget->removeTab(2);
+}
+
+ToolbarCustomizationDialog::~ToolbarCustomizationDialog()
+{
+    m_toolbarManager->SetIsEditingToolBars(false);
+}
+
+void ToolbarCustomizationDialog::OnTabChanged(int index)
+{
+    switch (static_cast<Tab>(index))
+    {
+    case TabToolbars:
+        ui->toolbarsListWidget->setFocus(Qt::OtherFocusReason);
+        break;
+    case TabCommands:
+        ui->categoriesListWidget->setFocus(Qt::OtherFocusReason);
+        break;
+    case TabOptions:
+        break;
+    case TabKeyboard:
+        ui->keyboardCommandsListWidget->setFocus(Qt::OtherFocusReason);
+        break;
+    }
+}
+
+QList<QAction*> ToolbarCustomizationDialog::toplevelActions() const
+{
+    return m_mainWindow->menuBar()->actions();
+}
+
+void ToolbarCustomizationDialog::Setup()
+{
+    SetupCategoryCombo();
+    SetupCategoryListWidget();
+    SetupToolbarsListWidget();
+}
+
+void ToolbarCustomizationDialog::SetupCategoryCombo()
+{
+    ui->categoryCombo->clear();
+    for (QAction* action : toplevelActions())
+    {
+        ui->categoryCombo->addItem(action->text().remove(QLatin1Char('&')));
+    }
+
+    connect(ui->categoryCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        this, &ToolbarCustomizationDialog::FillKeyboardCommands, Qt::UniqueConnection);
+
+    FillKeyboardCommands();
+}
+
+void ToolbarCustomizationDialog::FillKeyboardCommands()
+{
+    ui->keyboardCommandsListWidget->clear();
+    int idx = ui->categoryCombo->currentIndex();
+
+    QList<QAction*> rootActions = toplevelActions();
+    if (idx < 0 || idx >= rootActions.size())
+    {
+        return;
+    }
+
+    QAction* action = rootActions.at(idx);
+
+    QMenu* menu = action->menu();
+    if (!menu)
+    {
+        return;
+    }
+
+    for (QAction* menuAction : menu->actions())
+    {
+        if (!menuAction->isSeparator())
+        {
+            ui->keyboardCommandsListWidget->addItem(menuAction->text().remove(QLatin1Char('&')));
+        }
+    }
+}
+
+void ToolbarCustomizationDialog::SetupCategoryListWidget()
+{
+    ui->categoriesListWidget->clear();
+    for (QAction* action : toplevelActions())
+    {
+        ui->categoriesListWidget->addItem(action->text().remove(QLatin1Char('&')));
+    }
+
+    QModelIndex firstRow = ui->categoriesListWidget->model()->index(0, 0);
+    ui->categoriesListWidget->selectionModel()->select(firstRow, QItemSelectionModel::Select);
+
+    FillCommandsListWidget();
+    connect(ui->categoriesListWidget->selectionModel(), &QItemSelectionModel::selectionChanged,
+        this, &ToolbarCustomizationDialog::FillCommandsListWidget);
+}
+
+void ToolbarCustomizationDialog::FillCommandsListWidget()
+{
+    ui->commandsListWidget->clear();
+    QModelIndexList indexes = ui->categoriesListWidget->selectionModel()->selectedIndexes();
+    QModelIndex index = indexes.isEmpty() ? QModelIndex() : indexes.first();
+    if (!index.isValid())
+    {
+        return;
+    }
+
+    const int row = index.row();
+    const QList<QAction*> rootActions = toplevelActions();
+    if (row < 0 || row >= rootActions.size())
+    {
+        return;
+    }
+
+    QMenu* menu = rootActions[row]->menu();
+    if (!menu)
+    {
+        return;
+    }
+
+    for (QAction* action : menu->actions())
+    {
+        if (!action->isSeparator() && !action->menu())
+        {
+            auto item = new QListWidgetItem(action->text().remove(QLatin1Char('&')));
+            auto icon = action->icon();
+            const int actionId = action->data().toInt();
+            item->setData(ActionRole, actionId);
+            if (!icon.isNull())
+            {
+                item->setIcon(QIcon(icon.pixmap(32).scaled(QSize(16, 16))));
+            }
+
+            ui->commandsListWidget->addItem(item);
+        }
+    }
+}
+
+void ToolbarCustomizationDialog::SetupToolbarsListWidget()
+{
+    ui->toolbarsListWidget->clear();
+    auto toolbars = m_toolbarManager->GetToolbars();
+    connect(ui->toolbarsListWidget, &QListWidget::itemChanged,
+        this, &ToolbarCustomizationDialog::ToggleToolbar, Qt::UniqueConnection);
+    connect(ui->toolbarsListWidget->selectionModel(), &QItemSelectionModel::selectionChanged,
+        this, &ToolbarCustomizationDialog::OnToolbarSelected, Qt::UniqueConnection);
+    for (const AmazonToolbar& at : toolbars)
+    {
+        AddToolbarItem(at);
+    }
+    OnToolbarSelected(); // initial button state
+}
+
+void ToolbarCustomizationDialog::OnToolbarSelected()
+{
+    auto indexes = ui->toolbarsListWidget->selectionModel()->selectedIndexes();
+    if (!indexes.isEmpty())
+    {
+        int row = indexes.at(0).row();
+        const bool isValid = row >= 0;
+        const bool isCustom = m_toolbarManager->IsCustomToolbar(row);
+        const bool isStandard = isValid && !isCustom;
+
+        ui->newButton->setEnabled(isValid);
+        ui->resetButton->setEnabled(isStandard);
+        ui->renameButton->setEnabled(isCustom);
+        ui->deleteButton->setEnabled(isCustom);
+    }
+    else
+    {
+        ui->resetButton->setEnabled(false);
+        ui->renameButton->setEnabled(false);
+        ui->deleteButton->setEnabled(false);
+    }
+}
+
+void ToolbarCustomizationDialog::AddToolbarItem(const AmazonToolbar& at, bool forceVisible)
+{
+    auto item = new QListWidgetItem();
+    item->setData(ToolbarRole, QVariant::fromValue<QToolBar*>(at.Toolbar()));
+    item->setData(ToolbarNameRole, at.GetName());
+    item->setText(at.Toolbar()->windowTitle());
+    item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren);
+    item->setCheckState((forceVisible || at.Toolbar()->isVisible()) ? Qt::Checked : Qt::Unchecked);
+    ui->toolbarsListWidget->addItem(item);
+}
+
+void ToolbarCustomizationDialog::ToggleToolbar(QListWidgetItem* item)
+{
+    auto toolbar = item->data(ToolbarRole).value<QToolBar*>();
+    toolbar->setVisible(item->checkState() == Qt::Checked);
+}
+
+void ToolbarCustomizationDialog::NewToolbar(const QString &initialName)
+{
+    QString name = QInputDialog::getText(this, tr("New Toolbar"), tr("Toolbar name:"), QLineEdit::Normal, initialName);
+    for (const AmazonToolbar &t : m_toolbarManager->GetToolbars()) {
+        if (name == t.GetTranslatedName()) {
+            QMessageBox::warning(this, tr("Warning"),
+                tr("A toolbar with this name already exists. Please choose a different name."),
+                QMessageBox::Ok);
+            NewToolbar(name);
+            return;
+        }
+    }
+    int index = m_toolbarManager->Add(name);
+    if (index != -1)
+    {
+        AddToolbarItem(m_toolbarManager->GetToolbar(index), /**forceVisible=*/ true); // toolbar is only visible in the next event loop, so check the checkbox anyway
+    }
+}
+
+void ToolbarCustomizationDialog::DeleteToolbar()
+{
+    QModelIndex selectedIndex = SelectedToolbarIndex();
+    if (!selectedIndex.isValid())
+    {
+        return;
+    }
+
+    QString name = selectedIndex.data(Qt::DisplayRole).toString();
+
+    if (QMessageBox::question(this, "Editor", QString("Are you sure you want to delete the '%1' toolbar?").arg(name)) == QMessageBox::Yes)
+    {
+        const int index = SelectedToolbarIndex().row();
+        if (m_toolbarManager->Delete(index))
+        {
+            ui->toolbarsListWidget->selectionModel()->clear();
+            delete ui->toolbarsListWidget->item(index);
+        }
+    }
+}
+
+void ToolbarCustomizationDialog::RenameToolbar()
+{
+    const int index = SelectedToolbarIndex().row();
+    if (QListWidgetItem* item = ui->toolbarsListWidget->item(index))
+    {
+        const QString currentName = item->data(Qt::DisplayRole).toString();
+        const QString newName = QInputDialog::getText(this, tr("Rename Toolbar"), tr("Toolbar name:"),
+                QLineEdit::Normal, currentName);
+        if (m_toolbarManager->Rename(SelectedToolbarIndex().row(), newName))
+        {
+            item->setData(Qt::DisplayRole, newName);
+        }
+    }
+}
+
+void ToolbarCustomizationDialog::ResetToolbar()
+{
+    QModelIndex selectedIndex = SelectedToolbarIndex();
+    if (!selectedIndex.isValid())
+    {
+        return;
+    }
+
+    QString displayName = selectedIndex.data(Qt::DisplayRole).toString();
+
+    if (QMessageBox::question(this, "Editor", QString("Are you sure you want to reset the changes made to the '%1' toolbar?").arg(displayName)) == QMessageBox::Yes)
+    {
+        QString toolbarName = selectedIndex.data(ToolbarNameRole).toString();
+        m_toolbarManager->RestoreToolbarDefaults(toolbarName);
+    }
+}
+
+QModelIndex ToolbarCustomizationDialog::SelectedToolbarIndex() const
+{
+    auto indexes = ui->toolbarsListWidget->selectionModel()->selectedIndexes();
+    return indexes.isEmpty() ? QModelIndex() : indexes.at(0);
+}
+
+void ToolbarCustomizationDialog::dragEnterEvent(QDragEnterEvent* ev)
+{
+    ev->accept();
+}
+
+void ToolbarCustomizationDialog::dragMoveEvent(QDragMoveEvent* ev)
+{
+    ev->accept();
+}
+
+void ToolbarCustomizationDialog::dropEvent(QDropEvent* ev)
+{
+    auto sourceWidget = qobject_cast<QWidget*>(ev->source());
+    EditableQToolBar* sourceToolbar = m_toolbarManager->ToolbarParent(sourceWidget);
+
+    if (!sourceToolbar || !sourceWidget)
+    {
+        // Doesn't happen
+        qWarning() << Q_FUNC_INFO << "Invalid source widget or toolbar" << sourceWidget << sourceToolbar;
+        return;
+    }
+
+    QAction* action = sourceToolbar->ActionForWidget(sourceWidget);
+    const int actionId = action ? action->data().toInt() : 0;
+    if (actionId <= 0)
+    {
+        // Doesn't happen
+        qWarning() << Q_FUNC_INFO << "Invalid action id" << actionId << sourceWidget;
+        return;
+    }
+
+    m_toolbarManager->DeleteAction(action, sourceToolbar);
+}
+
+#include <moc_ToolbarCustomizationDialog.cpp>
diff --git a/Code/Editor/ToolbarCustomizationDialog.h b/Code/Editor/ToolbarCustomizationDialog.h
new file mode 100644
index 0000000000..fd807efabe
--- /dev/null
+++ b/Code/Editor/ToolbarCustomizationDialog.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+#ifndef TOOLBAR_CUSTOMIZATION_DIALOG_H
+#define TOOLBAR_CUSTOMIZATION_DIALOG_H
+
+#if !defined(Q_MOC_RUN)
+#include "ToolbarManager.h"
+
+#include <QDialog>
+#include <QScopedPointer>
+#include <QList>
+#endif
+
+class ToolbarManager;
+class MainWindow;
+class QAction;
+class QListWidgetItem;
+class QModelIndex;
+class QDropEvent;
+
+namespace Ui {
+    class ToolbarCustomizationDialog;
+}
+
+class ToolbarCustomizationDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit ToolbarCustomizationDialog(MainWindow* parent = nullptr);
+    ~ToolbarCustomizationDialog();
+
+protected:
+    void dragMoveEvent(QDragMoveEvent* ev) override;
+    void dragEnterEvent(QDragEnterEvent* ev) override;
+    void dropEvent(QDropEvent* ev);
+
+private:
+    void OnTabChanged(int index);
+    QList<QAction*> toplevelActions() const;
+    void ToggleToolbar(QListWidgetItem*);
+    void Setup();
+    void SetupCategoryCombo();
+    void SetupCategoryListWidget();
+    void SetupToolbarsListWidget();
+    void FillKeyboardCommands();
+    void FillCommandsListWidget();
+    QModelIndex SelectedToolbarIndex() const;
+    void AddToolbarItem(const AmazonToolbar&, bool forceVisible = false);
+    void OnToolbarSelected();
+
+    void NewToolbar(const QString &initialName = QString());
+    void DeleteToolbar();
+    void RenameToolbar();
+    void ResetToolbar();
+
+    QScopedPointer<Ui::ToolbarCustomizationDialog> ui;
+    MainWindow* const m_mainWindow;
+    ToolbarManager* const m_toolbarManager;
+};
+
+#endif
diff --git a/Code/Sandbox/Editor/ToolbarCustomizationDialog.ui b/Code/Editor/ToolbarCustomizationDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/ToolbarCustomizationDialog.ui
rename to Code/Editor/ToolbarCustomizationDialog.ui
diff --git a/Code/Editor/ToolbarManager.cpp b/Code/Editor/ToolbarManager.cpp
new file mode 100644
index 0000000000..009410da16
--- /dev/null
+++ b/Code/Editor/ToolbarManager.cpp
@@ -0,0 +1,1401 @@
+/*
+ * 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 "ToolbarManager.h"
+
+// AzCore
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/Interface/Interface.h>
+
+// Qt
+#include <QDebug>
+#include <QDrag>
+#include <QMimeData>
+#include <QPainter>
+#include <QLayout>
+
+#include <QTextDocumentFragment>
+
+// Editor
+#include "MainWindow.h"
+#include "ToolBox.h"
+#include "PluginManager.h"
+#include "ActionManager.h"
+#include "Settings.h"
+
+
+static const char* SUBSTANCE_TOOLBAR_NAME = "Substance";
+static const QString TOOLBAR_SETTINGS_KEY("ToolbarSettings");
+
+
+// Save out the version of the toolbars with it
+// Only save a toolbar if it's not a standard or has some changes to it from the standard
+// On load, add any actions that are with a newer version to it
+// Check if a toolbar is the same as a default version on load
+
+const int TOOLBAR_IDENTIFIER = 0xFFFF; // must be an int, for compatibility
+
+enum AmazonToolbarVersions
+{
+    ORIGINAL_TOOLBAR_VERSION = 1,
+    TOOLBARS_WITH_PLAY_GAME = 2,
+    TOOLBARS_WITH_PERSISTENT_VISIBILITY = 3,
+    TOOLBARS_WITHOUT_CVAR_MODES = 5,
+
+    //TOOLBAR_VERSION = 1
+    TOOLBAR_VERSION = TOOLBARS_WITHOUT_CVAR_MODES
+};
+
+struct InternalAmazonToolbarList
+{
+    int version;
+    AmazonToolbar::List toolbars;
+};
+
+Q_DECLARE_METATYPE(AmazonToolbar)
+Q_DECLARE_METATYPE(AmazonToolbar::List)
+Q_DECLARE_METATYPE(InternalAmazonToolbarList)
+
+static bool ObjectIsSeparator(QObject* o)
+{
+    return o && o->metaObject()->className() == QStringLiteral("QToolBarSeparator");
+}
+
+static QDataStream& WriteToolbarDataStream(QDataStream& out, const AmazonToolbar& toolbar)
+{
+    out << toolbar.GetName();
+    out << toolbar.GetTranslatedName();
+    out << toolbar.ActionIds();
+    out << toolbar.IsShowByDefault();
+    out << toolbar.IsShowToggled();
+
+    return out;
+}
+
+static QDataStream& ReadToolbarDataStream(QDataStream& in, AmazonToolbar& toolbar, int version)
+{
+    QString name;
+    QString translatedName;
+    QVector<int> actionIds;
+
+    bool showByDefault = true;
+    bool showToggled = false;
+
+    in >> name;
+    in >> translatedName;
+
+    in >> actionIds;
+
+    if (version > 0)
+    {
+        in >> showByDefault;
+        toolbar.SetShowByDefault(showByDefault);
+    }
+
+    if (version >= TOOLBARS_WITH_PERSISTENT_VISIBILITY)
+    {
+        in >> showToggled;
+        toolbar.SetShowToggled(showToggled);
+    }
+
+    for (int actionId : actionIds)
+    {
+        toolbar.AddAction(actionId);
+    }
+
+    toolbar.SetName(name, translatedName);
+
+    return in;
+}
+
+static QDataStream& operator<<(QDataStream& out, const InternalAmazonToolbarList& list)
+{
+    out << TOOLBAR_IDENTIFIER;
+    out << list.version;
+    out << list.toolbars.size();
+    for (const AmazonToolbar& t : list.toolbars)
+    {
+        WriteToolbarDataStream(out, t);
+    }
+
+    return out;
+}
+
+static QDataStream& operator>>(QDataStream& in, InternalAmazonToolbarList& list)
+{
+    int identifier;
+
+    in >> identifier;
+
+    int size = 0;
+    if (identifier == TOOLBAR_IDENTIFIER)
+    {
+        in >> list.version;
+        in >> size;
+    }
+    else
+    {
+        // version 0; size is identifier
+        list.version = 0;
+        size = identifier;
+    }
+
+    size = std::min(size, 30); // protect against corrupt data
+    list.toolbars.reserve(size);
+    for (int i = 0; i < size; ++i)
+    {
+        AmazonToolbar t;
+        ReadToolbarDataStream(in, t, list.version);
+        list.toolbars.push_back(t);
+    }
+
+    return in;
+}
+
+class AmazonToolBarExpanderWatcher
+    : public QObject
+{
+public:
+    AmazonToolBarExpanderWatcher(QObject* parent = nullptr)
+        : QObject(parent)
+    {
+    }
+
+    bool eventFilter(QObject* obj, QEvent* event) override
+    {
+        switch (event->type())
+        {
+            case QEvent::MouseButtonPress:
+            case QEvent::MouseButtonRelease:
+            case QEvent::MouseButtonDblClick:
+            {
+                if (qobject_cast<QToolButton*>(obj))
+                {
+                    auto mouseEvent = static_cast<QMouseEvent*>(event);
+                    auto expansion = qobject_cast<QToolButton*>(obj);
+
+                    expansion->setPopupMode(QToolButton::InstantPopup);
+                    auto menu = new QMenu(expansion);
+
+                    auto toolbar = qobject_cast<QToolBar*>(expansion->parentWidget());
+
+                    for (auto toolbarAction : toolbar->actions())
+                    {
+                        auto actionWidget = toolbar->widgetForAction(toolbarAction);
+                        if (actionWidget && !actionWidget->isVisible())
+                        {
+                            QString plainText = QTextDocumentFragment::fromHtml(actionWidget->toolTip()).toPlainText();
+                            toolbarAction->setText(plainText);
+                            menu->addAction(toolbarAction);
+                        }
+                    }
+
+                    menu->exec(mouseEvent->globalPos());
+                    return true;
+                }
+
+                break;
+            }
+        }
+
+        return QObject::eventFilter(obj, event);
+    }
+};
+
+ToolbarManager::ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow)
+    : m_mainWindow(mainWindow)
+    , m_actionManager(actionManager)
+    , m_settings("O3DE", "O3DE")
+    , m_expanderWatcher(new AmazonToolBarExpanderWatcher())
+{
+    // Note that we don't actually save/load from AmazonToolbar::List
+    // The data saved for existing users had that name, and it can't be changed now without ignoring user's data.
+    // We need to know the version stored, so we need to save/load into a different structure (InternalAmazonToolbarList)
+    qRegisterMetaType<InternalAmazonToolbarList>("AmazonToolbar::List");
+    qRegisterMetaTypeStreamOperators<InternalAmazonToolbarList>("AmazonToolbar::List");
+}
+
+ToolbarManager::~ToolbarManager()
+{
+    SaveToolbars();
+
+    if (m_expanderWatcher)
+    {
+        delete m_expanderWatcher;
+    }
+}
+
+EditableQToolBar* ToolbarManager::ToolbarParent(QObject* o) const
+{
+    if (!o)
+    {
+        return nullptr;
+    }
+
+    if (auto t = qobject_cast<EditableQToolBar*>(o))
+    {
+        return t;
+    }
+
+    return ToolbarParent(o->parent());
+}
+
+void ToolbarManager::LoadToolbars()
+{
+    InitializeStandardToolbars();
+
+    m_settings.beginGroup(TOOLBAR_SETTINGS_KEY);
+    InternalAmazonToolbarList loadedToolbarList = m_settings.value("toolbars").value<InternalAmazonToolbarList>();
+    m_toolbars = loadedToolbarList.toolbars;
+    m_loadedVersion = loadedToolbarList.version;
+    qDebug() << "Loaded toolbars:" << m_toolbars.size();
+
+    // Load the defaults which were saved by the previous version
+    // If no defaults are found, the effect is to re-add all commands in the current standard toolbars which are no
+    // longer present in the edited version (i.e. result = the set union of edited and current default)
+    QMap<QString, AmazonToolbar> previousStandardToolbars;
+    if (m_loadedVersion < TOOLBAR_VERSION)
+    {
+        m_settings.beginGroup("Defaults");
+        QVariant defaultsValue = m_settings.value(QString::number(m_loadedVersion));
+        if (defaultsValue.isValid())
+        {
+            InternalAmazonToolbarList oldDefaults = defaultsValue.value<InternalAmazonToolbarList>();
+
+            for (AmazonToolbar& oldDefault : oldDefaults.toolbars)
+            {
+                previousStandardToolbars[oldDefault.GetName()] = oldDefault;
+            }
+        }
+        m_settings.endGroup();
+    }
+
+    m_settings.endGroup();
+
+    SanitizeToolbars(previousStandardToolbars);
+    InstantiateToolbars();
+}
+
+static bool operator==(const AmazonToolbar& t1, const AmazonToolbar& t2)
+{
+    return t1.GetName() == t2.GetName();
+}
+
+void ToolbarManager::SanitizeToolbars(const QMap<QString, AmazonToolbar>& oldStandard)
+{
+    // All standard toolbars must be present
+    auto stdToolbars = m_standardToolbars;
+
+    if (m_loadedVersion < TOOLBARS_WITHOUT_CVAR_MODES)
+    {
+        // Check if any standard toolbars have been deprecated and no longer exist
+        for (const auto& oldStandardToolbar : oldStandard)
+        {
+            if (!stdToolbars.contains(oldStandardToolbar.GetName()))
+            {
+                // Add an empty standard toolbar as placeholder for the deprecated standard
+                // toolbar so that it is kept around with only the user added actions or
+                // removed from the toolbar list if it does not contain any custom actions
+                stdToolbars.append(AmazonToolbar(oldStandardToolbar.GetName(), oldStandardToolbar.GetTranslatedName()));
+            }
+        }
+    }
+
+    // make a set of the loaded toolbars
+    QMap<QString, AmazonToolbar> toolbarSet;
+    for (const AmazonToolbar& toolbar : m_toolbars)
+    {
+        toolbarSet[toolbar.GetName()] = toolbar;
+    }
+
+    // the order is important because IsCustomToolbar() checks based on the order (which it shouldn't...)
+    // so we go through the loaded toolbars and make sure that our standard ones are all in there
+    // in the right order. We also remove them from the set, so that we know what's left later
+    AmazonToolbar::List newToolbars;
+    for (AmazonToolbar& stdToolbar : stdToolbars)
+    {
+        auto customToolbarReference = toolbarSet.find(stdToolbar.GetName());
+        if (customToolbarReference == toolbarSet.end())
+        {
+            // An untouched standard toolbar or a user-created one
+            newToolbars.push_back(stdToolbar);
+        }
+        else if (customToolbarReference.value().IsSame(stdToolbar))
+        {
+            // Edge case of previous versions where all toolbars were saved regardless of dirtiness
+            // If we're replacing the Toolbar and haven't changed whether or not it's hidden by default since
+            // last load, ensure we respect whether or not the user had previously toggled it
+            if (stdToolbar.IsShowByDefault() == customToolbarReference.value().IsShowByDefault())
+            {
+                stdToolbar.SetShowToggled(customToolbarReference.value().IsShowToggled());
+            }
+            newToolbars.push_back(stdToolbar);
+        }
+        else
+        {
+            AmazonToolbar& newToolbar = customToolbarReference.value();
+
+            // make sure to add any actions added since the last time the user saved this toolbar
+            if (oldStandard.contains(stdToolbar.GetName()))
+            {
+                QVector<int> newCommands = stdToolbar.ActionIds();
+                QVector<int> previous = oldStandard[stdToolbar.GetName()].ActionIds();
+                QVector<int> custom = newToolbar.ActionIds();
+
+                // If the new layout removed some, we want to remove those if present in the edited layout
+                for (int previousCommand : previous)
+                {
+                    if (!newCommands.contains(previousCommand))
+                    {
+                        custom.removeOne(previousCommand);
+                    }
+                }
+
+                // We only want commands that weren't in the old default version and which aren't already in the
+                // customized toolbar.
+                // We just append them here, but it might be possible to attempt to preserve the ordering...
+                for (int command : newCommands)
+                {
+                    if (!previous.contains(command) && !custom.contains(command))
+                    {
+                        custom.push_back(command);
+                    }
+                }
+
+                newToolbar.Clear();
+                for (int actionId : custom)
+                {
+                    newToolbar.AddAction(actionId);
+                }
+            }
+
+            newToolbars.push_back(newToolbar);
+
+            toolbarSet.remove(stdToolbar.GetName());
+        }
+    }
+
+    // go through and add in all of the left over toolbars, in the same order now
+    for (const AmazonToolbar& existingToolbar : m_toolbars)
+    {
+        if (!newToolbars.contains(existingToolbar.GetName()))
+        {
+            newToolbars.push_back(existingToolbar);
+        }
+    }
+
+    // it isn't an older version of the std toolbar, but it needs to have all of the actions
+    // that the newest one has, so add anything newer than what it was saved with
+    // WORKS FOR THIS, BUT WHAT ABOUT FOR PLUGIN CREATOR TOOLBARS? HOW DO THEY ADD NEW BUTTONS?
+
+    // keep the new list now
+    m_toolbars = newToolbars;
+
+    // TODO: Remove this once gems are able to control toolbars
+    bool removeSubstanceToolbar = true;
+
+    if (AZ::SettingsRegistryInterface* settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+    {
+        // Query the /Amazon/Gems/Substance key to determine if the substance gem is available
+        AZ::SettingsRegistryInterface::Type keyType = settingsRegistry->GetType(AZ::SettingsRegistryInterface::FixedValueString::format("%s/Gems/%s",
+            AZ::SettingsRegistryMergeUtils::OrganizationRootKey, SUBSTANCE_TOOLBAR_NAME));
+        removeSubstanceToolbar = keyType == AZ::SettingsRegistryInterface::Type::NoType;
+    }
+
+    // Remove toolbars with invalid names (corrupted)
+    m_toolbars.erase(std::remove_if(m_toolbars.begin(), m_toolbars.end(), [removeSubstanceToolbar](const AmazonToolbar& t)
+    {
+        return t.GetName().isEmpty() || (removeSubstanceToolbar && t.GetName() == SUBSTANCE_TOOLBAR_NAME);
+    }), m_toolbars.end());
+
+    if (m_loadedVersion < TOOLBARS_WITHOUT_CVAR_MODES)
+    {
+        // Remove any empty deprecated toolbars that haven't been customized, or
+        // rename and keep the toolbar if a custom action has been added
+        m_toolbars.erase(std::remove_if(m_toolbars.begin(), m_toolbars.end(), [](AmazonToolbar& toolbar)
+            {
+                const QString& toolbarName = toolbar.GetName();
+                if (toolbarName == "debugViewsToolbar"
+                    || toolbarName == "environmentModesToolbar"
+                    || toolbarName == "viewModesToolbar")
+                {
+                    if (toolbar.ActionIds().isEmpty())
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        QString newToolbarName = QString("%1 (Deprecated)").arg(toolbar.GetTranslatedName());
+                        toolbar.SetName(newToolbarName, newToolbarName);                        
+                    }
+                }
+                return false;
+            }), m_toolbars.end());
+    }
+}
+
+void ToolbarManager::SaveToolbar(EditableQToolBar* toolbar)
+{
+    for (AmazonToolbar& at : m_toolbars)
+    {
+        if (at.Toolbar() == toolbar)
+        {
+            at.Clear();
+            for (QAction* action : toolbar->actions())
+            {
+                const int actionId = action->data().toInt();
+                if (actionId >= 0)
+                {
+                    at.AddAction(actionId);
+                }
+                else
+                {
+                    qWarning() << Q_FUNC_INFO << "Invalid action id";
+                }
+            }
+
+            AmazonToolbar::UpdateAllowedAreas(toolbar);
+            SaveToolbars();
+            return;
+        }
+    }
+
+    qWarning() << Q_FUNC_INFO << "Couldn't find toolbar";
+}
+
+void ToolbarManager::SaveToolbars()
+{
+    // Determine if the user has manually shown or hidden any toolbars and flag that so we remember on startup
+    for (auto& toolbar : m_toolbars)
+    {
+        QToolBar* toolbarWidget = toolbar.Toolbar();
+        // If we're not explicitly hidden and we're not shown by default, or the converse, record that the user toggled our visibility
+        if (toolbarWidget && (!toolbarWidget->isHidden()) != toolbar.IsShowByDefault())
+        {
+            toolbar.SetShowToggled(true);
+        }
+        else
+        {
+            toolbar.SetShowToggled(false);
+        }
+    }
+
+    m_settings.beginGroup(TOOLBAR_SETTINGS_KEY);
+
+    QVector<AmazonToolbar> toBeSaved = m_toolbars;
+    // We only save toolbars that differ from their default or are user-created
+    toBeSaved.erase(std::remove_if(toBeSaved.begin(), toBeSaved.end(), [this](const AmazonToolbar& t) { return !IsDirty(t); }), toBeSaved.end());
+    InternalAmazonToolbarList savedToolbars = { TOOLBAR_VERSION, toBeSaved };
+    m_settings.setValue("toolbars", QVariant::fromValue<InternalAmazonToolbarList>(savedToolbars));
+    m_settings.endGroup();
+}
+
+void ToolbarManager::InitializeStandardToolbars()
+{
+    if (m_standardToolbars.isEmpty())
+    {
+        auto macroToolbars = GetIEditor()->GetToolBoxManager()->GetToolbars();
+
+        m_standardToolbars.reserve(5 + macroToolbars.size());
+        m_standardToolbars.push_back(GetEditModeToolbar());
+        m_standardToolbars.push_back(GetObjectToolbar());
+        m_standardToolbars.push_back(GetPlayConsoleToolbar());
+
+        IPlugin* pGamePlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{71CED8AB-54E2-4739-AA78-7590A5DC5AEB}");
+        IPlugin* pDescriptionEditorPlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{4B9B7074-2D58-4AFD-BBE1-BE469D48456A}");
+        if (pGamePlugin && pDescriptionEditorPlugin)
+        {
+            m_standardToolbars.push_back(GetMiscToolbar());
+        }
+
+        std::copy(std::begin(macroToolbars), std::end(macroToolbars), std::back_inserter(m_standardToolbars));
+
+        // Save that default state to future versions can reason about updating modified standard toolbars
+        m_settings.beginGroup(TOOLBAR_SETTINGS_KEY);
+        m_settings.beginGroup("Defaults");
+
+        InternalAmazonToolbarList savedToolbars = { TOOLBAR_VERSION, m_standardToolbars };
+        m_settings.setValue(QString::number(TOOLBAR_VERSION), QVariant::fromValue<InternalAmazonToolbarList>(savedToolbars));
+
+        m_settings.endGroup();
+        m_settings.endGroup();
+    }
+}
+
+void AmazonToolbar::UpdateAllowedAreas()
+{
+    UpdateAllowedAreas(m_toolbar);
+}
+
+void AmazonToolbar::UpdateAllowedAreas(QToolBar* toolbar)
+{
+    bool horizontalOnly = false;
+
+    for (QAction* action : toolbar->actions())
+    {
+        if (qobject_cast<QWidgetAction*>(action))
+        {
+            // if it's a widget action, we assume it won't fit in the vertical toolbars
+            horizontalOnly = true;
+            break;
+        }
+    }
+
+    if (horizontalOnly)
+    {
+        toolbar->setAllowedAreas(Qt::BottomToolBarArea | Qt::TopToolBarArea);
+    }
+    else
+    {
+        toolbar->setAllowedAreas(Qt::AllToolBarAreas);
+    }
+}
+
+bool ToolbarManager::IsDirty(const AmazonToolbar& toolbar) const
+{
+    const AmazonToolbar* defaultStandardToolbar = FindDefaultToolbar(toolbar.GetName());
+
+    // custom toolbars are always considered dirty
+    bool isDirty = true;
+
+    if (defaultStandardToolbar != nullptr)
+    {
+        isDirty = !defaultStandardToolbar->IsSame(toolbar);
+    }
+
+    return isDirty;
+}
+
+
+AmazonToolbar ToolbarManager::GetEditModeToolbar() const
+{
+    AmazonToolbar t = AmazonToolbar("EditMode", QObject::tr("Edit Mode Toolbar"));
+    t.SetMainToolbar(true);
+    return t;
+}
+
+AmazonToolbar ToolbarManager::GetObjectToolbar() const
+{
+    AmazonToolbar t = AmazonToolbar("Object", QObject::tr("Object Toolbar"));
+    t.SetMainToolbar(true);
+    t.AddAction(ID_GOTO_SELECTED, ORIGINAL_TOOLBAR_VERSION);
+
+    return t;
+}
+
+AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const
+{
+    AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Controls"));
+    t.SetMainToolbar(true);
+
+    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);
+    t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
+    t.AddAction(ID_SWITCH_PHYSICS, TOOLBARS_WITH_PLAY_GAME);    
+    return t;
+}
+
+AmazonToolbar ToolbarManager::GetEditorsToolbar() const
+{
+    AmazonToolbar t = AmazonToolbar("Editors", QObject::tr("Editors Toolbar"));
+
+    t.AddAction(ID_OPEN_AUDIO_CONTROLS_BROWSER, ORIGINAL_TOOLBAR_VERSION);
+
+    return t;
+}
+
+AmazonToolbar ToolbarManager::GetMiscToolbar() const
+{
+    AmazonToolbar t = AmazonToolbar("Misc", QObject::tr("Misc Toolbar"));
+    return t;
+}
+
+void ToolbarManager::AddButtonToEditToolbar(QAction* action)
+{
+    QString toolbarName = "EditMode";
+    const AmazonToolbar* toolbar = FindToolbar(toolbarName);
+
+    if (toolbar)
+    {
+        if (toolbar->Toolbar())
+        {
+            toolbar->Toolbar()->addAction(action);
+        }
+    }
+}
+
+const AmazonToolbar* ToolbarManager::FindDefaultToolbar(const QString& toolbarName) const
+{
+    for (const AmazonToolbar& toolbar : m_standardToolbars)
+    {
+        if (toolbar.GetName() == toolbarName)
+        {
+            return &toolbar;
+        }
+    }
+
+    return nullptr;
+}
+
+AmazonToolbar* ToolbarManager::FindToolbar(const QString& toolbarName)
+{
+    for (AmazonToolbar& toolbar : m_toolbars)
+    {
+        if (toolbar.GetName() == toolbarName)
+        {
+            return &toolbar;
+        }
+    }
+
+    return nullptr;
+}
+
+void ToolbarManager::RestoreToolbarDefaults(const QString& toolbarName)
+{
+    if (!IsCustomToolbar(toolbarName))
+    {
+        const AmazonToolbar* defaultToolbar = FindDefaultToolbar(toolbarName);
+        AmazonToolbar* existingToolbar = FindToolbar(toolbarName);
+        Q_ASSERT(existingToolbar != nullptr);
+
+        if (existingToolbar != nullptr)
+        {
+            const bool isInstantiated = existingToolbar->IsInstantiated();
+
+            if (isInstantiated)
+            {
+                // We have a QToolBar instance, updated it too
+                for (QAction* action : existingToolbar->Toolbar()->actions())
+                {
+                    existingToolbar->Toolbar()->removeAction(action);
+                }
+            }
+
+            Q_ASSERT(defaultToolbar != nullptr);
+            if (defaultToolbar != nullptr)
+            {
+                existingToolbar->CopyActions(*defaultToolbar);
+            }
+
+            if (isInstantiated)
+            {
+                existingToolbar->SetActionsOnInternalToolbar(m_actionManager);
+                existingToolbar->UpdateAllowedAreas();
+            }
+            SaveToolbars();
+        }
+    }
+    else
+    {
+        qWarning() << Q_FUNC_INFO << "Can only reset standard toolbars";
+    }
+}
+
+void ToolbarManager::SetEnabled(bool enabled)
+{
+    for (AmazonToolbar& amazonToolbar : m_toolbars)
+    {
+        QToolBar* toolbar = amazonToolbar.Toolbar();
+        if (toolbar)
+        {
+            toolbar->setEnabled(enabled);
+        }
+    }
+}
+
+void AmazonToolbar::SetActionsOnInternalToolbar(ActionManager* actionManager)
+{
+    for (auto actionData : m_actions)
+    {
+        int actionId = actionData.actionId;
+
+        if (actionId == ID_TOOLBAR_SEPARATOR)
+        {
+            QAction* action = m_toolbar->addSeparator();
+            action->setData(ID_TOOLBAR_SEPARATOR);
+        }
+        else
+        {
+            if (actionManager->HasAction(actionId))
+            {
+                m_toolbar->addAction(actionManager->GetAction(actionId));
+            }
+        }
+    }
+}
+
+void ToolbarManager::InstantiateToolbars()
+{
+    const int numToolbars = m_toolbars.size();
+    for (int i = 0; i < numToolbars; ++i)
+    {
+        InstantiateToolbar(i);
+        if (i == 2)
+        {
+            // Hack. Just copying how it was
+            m_mainWindow->addToolBarBreak();
+        }
+    }
+}
+
+void ToolbarManager::InstantiateToolbar(int index)
+{
+    AmazonToolbar& t = m_toolbars[index];
+    t.InstantiateToolbar(m_mainWindow, this); // Create the QToolbar
+}
+
+AmazonToolbar::List ToolbarManager::GetToolbars() const
+{
+    return m_toolbars;
+}
+
+AmazonToolbar ToolbarManager::GetToolbar(int index)
+{
+    if (index < 0 || index >= m_toolbars.size())
+    {
+        return AmazonToolbar();
+    }
+
+    return m_toolbars.at(index);
+}
+
+bool ToolbarManager::Delete(int index)
+{
+    if (!IsCustomToolbar(index))
+    {
+        qWarning() << Q_FUNC_INFO << "Won't try to delete invalid or standard toolbar" << index << m_toolbars.size();
+        return false;
+    }
+
+    AmazonToolbar t = m_toolbars.takeAt(index);
+    delete t.Toolbar();
+
+    SaveToolbars();
+
+    return true;
+}
+
+
+bool ToolbarManager::Rename(int index, const QString& newName)
+{
+    if (newName.isEmpty())
+    {
+        return false;
+    }
+
+    if (!IsCustomToolbar(index))
+    {
+        qWarning() << Q_FUNC_INFO << "Won't try to rename invalid or standard toolbar" << index << m_toolbars.size();
+        return false;
+    }
+
+    AmazonToolbar& t = m_toolbars[index];
+    if (t.GetName() == newName)
+    {
+        qWarning() << Q_FUNC_INFO << "Won't try to rename to the same name" << newName;
+        return false;
+    }
+    t.SetName(newName, newName); // No translation for custom bars
+    SaveToolbars();
+
+    return true;
+}
+
+int ToolbarManager::Add(const QString& name)
+{
+    if (name.isEmpty())
+    {
+        return -1;
+    }
+
+    AmazonToolbar t(name, name);
+    t.InstantiateToolbar(m_mainWindow, this);
+
+    MainWindow::instance()->AdjustToolBarIconSize(static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(gSettings.gui.nToolbarIconSize));
+
+    m_toolbars.push_back(t);
+    SaveToolbars();
+    return m_toolbars.size() - 1;
+}
+
+bool ToolbarManager::IsCustomToolbar(int index) const
+{
+    return IsCustomToolbar(m_toolbars[index].GetName());
+}
+
+bool ToolbarManager::IsCustomToolbar(const QString& toolbarName) const
+{
+    for (auto toolbar : m_standardToolbars)
+    {
+        if (toolbar.GetName() == toolbarName)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+ActionManager* ToolbarManager::GetActionManager() const
+{
+    return m_actionManager;
+}
+
+AmazonToolBarExpanderWatcher* ToolbarManager::GetExpanderWatcher() const
+{
+    return m_expanderWatcher;
+}
+
+bool ToolbarManager::DeleteAction(QAction* action, EditableQToolBar* toolbar)
+{
+    if (!action)
+    {
+        // Doesn't happen
+        qWarning() << Q_FUNC_INFO << "Null action!";
+        return false;
+    }
+
+    const int actionId = action->data().toInt();
+    if (actionId <= 0)
+    {
+        qWarning() << Q_FUNC_INFO << "Action has null id";
+        return false;
+    }
+
+    if (toolbar->actions().contains(action))
+    {
+        toolbar->removeAction(action);
+    }
+    else
+    {
+        qWarning() << Q_FUNC_INFO << "Couldnt find action to remove";
+        return false;
+    }
+
+    SaveToolbar(toolbar);
+    return true;
+}
+
+void ToolbarManager::SetIsEditingToolBars(bool is)
+{
+    m_isEditingToolBars = is;
+}
+
+bool ToolbarManager::IsEditingToolBars() const
+{
+    return m_isEditingToolBars;
+}
+
+void ToolbarManager::InsertAction(QAction* action, QWidget* beforeWidget, QAction* beforeAction, EditableQToolBar* toolbar)
+{
+    if (!action)
+    {
+        qWarning() << Q_FUNC_INFO << "Invalid action for id" << action;
+        return;
+    }
+
+    const int actionId = action->data().toInt();
+    if (actionId <= 0)
+    {
+        qWarning() << Q_FUNC_INFO << "Invalid action id";
+        return;
+    }
+
+    const int beforeActionId = beforeAction ? beforeAction->data().toInt() : -1;
+    const bool beforeIsSeparator = beforeActionId == ID_TOOLBAR_SEPARATOR;
+
+    if (beforeIsSeparator)
+    {
+        beforeAction = beforeWidget->actions().first();
+    }
+
+    if (beforeAction && !toolbar->actions().contains(beforeAction))
+    {
+        qWarning() << Q_FUNC_INFO << "Invalid before action" << beforeAction << beforeActionId << beforeWidget->actions();
+        return;
+    }
+
+    toolbar->insertAction(beforeAction, action);
+
+    SaveToolbar(toolbar);
+}
+
+class DnDIndicator
+    : public QWidget
+{
+public:
+    DnDIndicator(EditableQToolBar* parent)
+        : QWidget(parent)
+        , m_toolbar(parent)
+    {
+        setVisible(false);
+    }
+
+    void paintEvent([[maybe_unused]] QPaintEvent* ev) override
+    {
+        QPainter painter(this);
+        painter.fillRect(QRect(0, 0, width(), height()), QBrush(QColor(217, 130, 46)));
+    }
+
+    void setLastDragPos(QPoint lastDragPos)
+    {
+        if (lastDragPos != m_lastDragPos)
+        {
+            m_lastDragPos = lastDragPos;
+            if (lastDragPos.isNull())
+            {
+                m_dragSourceWidget = nullptr;
+                setVisible(false);
+            }
+            else
+            {
+                setVisible(true);
+                updatePosition();
+            }
+            update();
+        }
+    }
+
+    void setDragSourceWidget(QWidget* w)
+    {
+        m_dragSourceWidget = w;
+    }
+
+    void updatePosition()
+    {
+        QWidget* beforeWidget = m_toolbar->insertPositionForDrop(m_lastDragPos);
+        const auto widgets = m_toolbar->childWidgetsWithActions();
+        QWidget* lastWidget = widgets.isEmpty() ? nullptr : widgets.last();
+
+        if (beforeWidget && beforeWidget == m_dragSourceWidget)
+        {
+            // Nothing to do, user is dragging to the same place, don't indicate it as a possibility
+            setVisible(false);
+            return;
+        }
+
+        if (!beforeWidget && m_dragSourceWidget == lastWidget)
+        {
+            // Nothing to do. Don't show indicator. The widget is already at the end.
+            setVisible(false);
+            return;
+        }
+
+        int x = 0;
+        if (beforeWidget)
+        {
+            x = beforeWidget->pos().x();
+        }
+        else
+        {
+            if (lastWidget)
+            {
+                x = lastWidget->pos().x() + lastWidget->width();
+            }
+            else
+            {
+                x = style()->pixelMetric(QStyle::PM_ToolBarHandleExtent) + style()->pixelMetric(QStyle::PM_ToolBarItemSpacing);
+            }
+        }
+
+        const int w = 2;
+        const int y = 5;
+        const int h = m_toolbar->height() - (y * 2);
+        setGeometry(x, y, w, h);
+        raise();
+    }
+
+    QPoint lastDragPos() const
+    {
+        return m_lastDragPos;
+    }
+
+private:
+    QPoint m_lastDragPos;
+    QPointer<QWidget> m_dragSourceWidget = nullptr;
+    EditableQToolBar* const m_toolbar;
+};
+
+EditableQToolBar::EditableQToolBar(const QString& title, ToolbarManager* manager)
+    : QToolBar(title)
+    , m_toolbarManager(manager)
+    , m_actionManager(manager->GetActionManager())
+    , m_dndIndicator(new DnDIndicator(this))
+{
+    setAcceptDrops(true);
+
+    connect(this, &QToolBar::orientationChanged, this, [this](Qt::Orientation orientation)
+    {
+        for (const auto& widget : findChildren<QWidget*>())
+            layout()->setAlignment(widget, orientation == Qt::Horizontal ? Qt::AlignVCenter : Qt::AlignHCenter);
+    });
+}
+
+QWidget* EditableQToolBar::insertPositionForDrop(QPoint mousePos)
+{
+    // QToolBar::actionAt() is no good here, since it sometimes returns nullptr between widgets
+
+    const QList<QWidget*> widgets = childWidgetsWithActions();
+    // Find the closest button
+    QWidget* beforeWidget = nullptr;
+    for (auto w : widgets)
+    {
+        if (w && w->pos().x() + w->width() / 2 > mousePos.x())
+        {
+            beforeWidget = w;
+            break;
+        }
+    }
+
+    return beforeWidget;
+}
+
+void EditableQToolBar::childEvent(QChildEvent* ev)
+{
+    QObject* child = ev->child();
+    if (ev->type() == QEvent::ChildAdded && child->isWidgetType()) // we can't qobject_cast to QToolButton yet, since it's not fully constructed
+    {
+        child->installEventFilter(this);
+    }
+
+    QToolBar::childEvent(ev);
+}
+
+QList<QWidget*> EditableQToolBar::childWidgetsWithActions() const
+{
+    QList<QWidget*> widgets;
+    widgets.reserve(actions().size());
+    for (QAction* action : actions())
+    {
+        if (QWidget* w = widgetForAction(action))
+        {
+            if (w->actions().isEmpty() && ObjectIsSeparator(w))
+            {
+                // Hack around the fact that QToolBarSeparator doesn't have an action associated
+                w->addAction(action);
+                action->setData(ID_TOOLBAR_SEPARATOR);
+            }
+            widgets.push_back(w);
+        }
+    }
+
+    return widgets;
+}
+
+bool EditableQToolBar::eventFilter(QObject* obj, QEvent* ev)
+{
+    auto type = ev->type();
+    const bool isMouseEvent = type == QEvent::MouseButtonPress || type == QEvent::MouseButtonRelease ||
+        type == QEvent::MouseButtonDblClick || type == QEvent::MouseMove;
+
+    auto* sourceWidget = qobject_cast<QWidget*>(obj);
+    if (!m_toolbarManager->IsEditingToolBars() || !isMouseEvent || !sourceWidget)
+    {
+        return QToolBar::eventFilter(obj, ev);
+    }
+
+    QAction* sourceAction = ActionForWidget(sourceWidget);
+    if (!sourceAction)
+    {
+        qWarning() << Q_FUNC_INFO << "Source widget" << sourceWidget << "doesn't have actions";
+        return QToolBar::eventFilter(obj, ev);
+    }
+
+    if (ev->type() == QEvent::MouseButtonPress)
+    {
+        QAction* action = ActionForWidget(sourceWidget);
+        const int actionId = action ? action->data().toInt() : 0;
+        if (actionId <= 0)
+        {
+            // Doesn't happen
+            qWarning() << Q_FUNC_INFO << "Invalid action id for widget" << sourceWidget << action << actionId;
+            return false;
+        }
+
+        QDrag* drag = new QDrag(sourceWidget);
+
+        { // Nested scope so painter gets deleted before we enter nested event-loop of QDrag::exec().
+          // Otherwise QPainter dereferences invalid pointer because QWidget was deleted already
+            QPixmap iconPixmap(sourceWidget->size());
+            QPainter painter(&iconPixmap);
+            sourceWidget->render(&painter);
+            drag->setPixmap(iconPixmap);
+        }
+
+        QMimeData* mimeData = new QMimeData();
+        mimeData->setText(action->text());
+        drag->setMimeData(mimeData);
+
+        drag->exec();
+        m_dndIndicator->setLastDragPos(QPoint());
+        return true;
+    }
+    else if (ev->type() == QEvent::MouseButtonPress)
+    {
+        if (QWidget* w = qobject_cast<QWidget*>(obj))
+        {
+            qDebug() << w->actions();
+        }
+    }
+    else if (isMouseEvent)
+    {
+        return true;
+    }
+
+    return QToolBar::eventFilter(obj, ev);
+}
+
+QAction* EditableQToolBar::actionFromDrop(QDropEvent* ev) const
+{
+    if (ev->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist"))
+    {
+        // The drag originated in ToolbarCustomizationDialog's list view of commands, decode it
+        QByteArray encoded = ev->mimeData()->data("application/x-qabstractitemmodeldatalist");
+        QDataStream stream(&encoded, QIODevice::ReadOnly);
+
+        if (!stream.atEnd())
+        {
+            int row, col;
+            QMap<int,  QVariant> roleDataMap;
+            stream >> row >> col >> roleDataMap;
+            const int actionId = roleDataMap.value(ActionRole).toInt();
+            if (actionId > 0)
+            {
+                return m_actionManager->GetAction(actionId);
+            }
+        }
+    }
+    else if (auto w = qobject_cast<QWidget*>(ev->source()))
+    {
+        return ActionForWidget(w);
+    }
+
+    return nullptr;
+}
+
+QAction* EditableQToolBar::ActionForWidget(QWidget* w) const
+{
+    EditableQToolBar* toolbar = m_toolbarManager->ToolbarParent(w);
+    if (!toolbar)
+    {
+        qWarning() << Q_FUNC_INFO << "Couldn't find parent toolbar for widget" << w;
+        return nullptr;
+    }
+
+    // Does the reverse of QToolBar::widgetForAction()
+    // Useful because only QToolButtons have actions, separators and custom widgets
+    // return an empty actions list.
+
+    for (QAction* action : toolbar->actions())
+    {
+        if (w == toolbar->widgetForAction(action))
+        {
+            return action;
+        }
+    }
+
+    return nullptr;
+}
+
+void EditableQToolBar::dropEvent(QDropEvent* ev)
+{
+    auto srcWidget = qobject_cast<QWidget*>(ev->source());
+    QAction* action = actionFromDrop(ev);
+    if (!action || !srcWidget)
+    { // doesn't happen
+        qDebug() << Q_FUNC_INFO << "null action or widget" << action << srcWidget;
+        return;
+    }
+
+    const int actionId = action->data().toInt();
+    QWidget* beforeWidget = insertPositionForDrop(ev->pos());
+    QAction* beforeAction = beforeWidget ? ActionForWidget(beforeWidget) : nullptr;
+
+    if (beforeAction == action)
+    {// Same place, nothing to do
+        m_dndIndicator->setLastDragPos(QPoint());
+        return;
+    }
+
+    if (EditableQToolBar* sourceToolbar = m_toolbarManager->ToolbarParent(srcWidget)) // If we're dragging from a QToolBar (instead of the customization dialog)
+    {
+        if (!m_toolbarManager->DeleteAction(sourceToolbar->ActionForWidget(srcWidget), sourceToolbar))
+        {
+            qWarning() << Q_FUNC_INFO << "Failed to delete source widget" << srcWidget;
+            return;
+        }
+    }
+    m_toolbarManager->InsertAction(action, beforeWidget, beforeAction, this);
+    m_dndIndicator->setLastDragPos(QPoint());
+}
+
+void EditableQToolBar::dragEnterEvent(QDragEnterEvent* ev)
+{
+    dragMoveEvent(ev); // Same code to run
+}
+
+void EditableQToolBar::dragMoveEvent(QDragMoveEvent* ev)
+{
+    // FIXME: D&D into & within vertical toolbars is broken
+    if (!m_toolbarManager->IsEditingToolBars() || orientation() == Qt::Orientation::Vertical)
+    {
+        return;
+    }
+
+    // We support dragging from a QToolBar but also from ToolbarCustomizationDialog's list view of commands
+    auto sourceWidget = qobject_cast<QWidget*>(ev->source());
+    if (!sourceWidget)
+    {
+        qWarning() << Q_FUNC_INFO << "Ignoring drag, widget is null";
+        return;
+    }
+
+    const bool valid = ev->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist") || ActionForWidget(sourceWidget) != nullptr;
+    if (valid)
+    {
+        m_dndIndicator->setDragSourceWidget(sourceWidget);
+        m_dndIndicator->setLastDragPos(ev->pos());
+        ev->accept();
+        update();
+    }
+    else
+    {
+        qWarning() << Q_FUNC_INFO << "Ignoring drag. Widget=" << ev->source();
+        m_dndIndicator->setLastDragPos(QPoint());
+        ev->ignore();
+    }
+}
+
+void EditableQToolBar::dragLeaveEvent(QDragLeaveEvent* ev)
+{
+    if (!m_toolbarManager->IsEditingToolBars())
+    {
+        return;
+    }
+
+    if (!m_dndIndicator->lastDragPos().isNull())
+    {
+        m_dndIndicator->setLastDragPos(QPoint());
+        ev->accept();
+        update();
+    }
+    else
+    {
+        ev->ignore();
+    }
+}
+
+AmazonToolbar::AmazonToolbar(const QString& name, const QString& translatedName)
+    : m_name(name)
+    , m_translatedName(translatedName)
+{
+}
+
+const bool AmazonToolbar::IsSame(const AmazonToolbar& other) const
+{
+    if (m_actions.size() != other.m_actions.size())
+    {
+        return false;
+    }
+
+    if (m_showByDefault != other.m_showByDefault)
+    {
+        return false;
+    }
+
+    if (m_showToggled != other.m_showToggled)
+    {
+        return false;
+    }
+
+    bool actionListsSame = AZStd::equal(m_actions.cbegin(), m_actions.cend(), other.m_actions.cbegin());
+    if (!actionListsSame)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+void AmazonToolbar::InstantiateToolbar(QMainWindow* mainWindow, ToolbarManager* manager)
+{
+    Q_ASSERT(!m_toolbar);
+    m_toolbar = new EditableQToolBar(m_translatedName, manager);
+    m_toolbar->setObjectName(m_name);
+    if (IsMainToolbar())
+    {
+        AzQtComponents::ToolBar::addMainToolBarStyle(m_toolbar);
+    }
+    if (QToolButton* expansion = AzQtComponents::ToolBar::getToolBarExpansionButton(m_toolbar))
+    {
+        expansion->installEventFilter(manager->GetExpanderWatcher());
+    }
+    mainWindow->addToolBar(m_toolbar);
+
+    // Hide custom toolbars if they've been flagged that way.
+    // We now store whether or not the user has toggled away the default visibility
+    // and use that restore in lieu of QMainWindow's restoreState
+    // So hide if we're hidden by default XOR we've toggled the default visibility
+    if ((!m_showByDefault) ^ m_showToggled)
+    {
+#ifdef AZ_PLATFORM_MAC
+        // on macOS, initially hidden tool bars result in a white rectangle when
+        // attaching a previously detached toolbar LY-66320
+        m_toolbar->show();
+        QMetaObject::invokeMethod(m_toolbar, "hide", Qt::QueuedConnection);
+#else
+        m_toolbar->hide();
+#endif
+    }
+
+    ActionManager* actionManager = manager->GetActionManager();
+    actionManager->AddToolBar(m_toolbar);
+
+    SetActionsOnInternalToolbar(actionManager);
+
+    UpdateAllowedAreas();
+}
+
+void AmazonToolbar::AddAction(int actionId, int toolbarVersionAdded)
+{
+    m_actions.push_back({ actionId, toolbarVersionAdded });
+}
+
+void AmazonToolbar::Clear()
+{
+    m_actions.clear();
+}
+
+QVector<int> AmazonToolbar::ActionIds() const
+{
+    QVector<int> ret;
+    ret.reserve(m_actions.size());
+
+    for (auto actionData : m_actions)
+    {
+        ret.push_back(actionData.actionId);
+    }
+
+    return ret;
+}
+
+void AmazonToolbar::SetName(const QString& name, const QString& translatedName)
+{
+    m_name = name;
+    m_translatedName = translatedName;
+    if (m_toolbar)
+    {
+        m_toolbar->setWindowTitle(translatedName);
+    }
+}
+
+#include <moc_ToolbarManager.cpp>
diff --git a/Code/Editor/ToolbarManager.h b/Code/Editor/ToolbarManager.h
new file mode 100644
index 0000000000..0ab1085a7a
--- /dev/null
+++ b/Code/Editor/ToolbarManager.h
@@ -0,0 +1,194 @@
+/*
+ * 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 TOOLBAR_MANAGER_H
+#define TOOLBAR_MANAGER_H
+
+#if !defined(Q_MOC_RUN)
+#include <QString>
+#include <QVector>
+#include <QSettings>
+#include <QToolBar>
+#include <QSize>
+
+#include <functional>
+#endif
+
+class ActionManager;
+class QChildEvent;
+class QDragEnterEvent;
+class QDragMoveEvent;
+class QDragLeaveEvent;
+class QDropEvent;
+class ToolbarManager;
+class DnDIndicator;
+class MainWindow;
+
+enum StandardToolbar
+{
+    UndefinedToolbar = -1,
+    EditModeToolbar = 0,
+    ObjectToolbar,
+    EditorsToolbar,
+    SubstanceToolbar,
+    MiscToolbar
+};
+
+enum Role
+{
+    ActionRole = Qt::UserRole
+};
+
+// A QToolBar which DnD support
+class EditableQToolBar
+    : public QToolBar
+{
+    Q_OBJECT
+public:
+    explicit EditableQToolBar(const QString& title, ToolbarManager* manager);
+    QAction* ActionForWidget(QWidget* w) const;
+protected:
+    void childEvent(QChildEvent* ev) override;
+    void dragMoveEvent(QDragMoveEvent* ev) override;
+    void dragEnterEvent(QDragEnterEvent* ev) override;
+    void dragLeaveEvent(QDragLeaveEvent* ev) override;
+    void dropEvent(QDropEvent* ev) override;
+private:
+    QWidget* insertPositionForDrop(QPoint mousePos);
+    QList<QWidget*> childWidgetsWithActions() const;
+    QAction* actionFromDrop(QDropEvent* ev) const;
+    bool eventFilter(QObject* obj, QEvent* ev) override;
+    ToolbarManager* const m_toolbarManager;
+    ActionManager* const m_actionManager;
+    DnDIndicator* const m_dndIndicator;
+    friend class DnDIndicator;
+};
+
+class AmazonToolbar
+{
+public:
+    typedef QVector<AmazonToolbar> List;
+
+    AmazonToolbar(const QString& name = QString(), const QString& translatedName = QString());
+    AmazonToolbar(const AmazonToolbar&) = default;
+    AmazonToolbar& operator=(const AmazonToolbar&) = default;
+
+    void InstantiateToolbar(QMainWindow* mainWindow, ToolbarManager* manager);
+    bool IsInstantiated() const { return m_toolbar != nullptr; }
+
+    void SetName(const QString& name, const QString& translatedName);
+
+    const QString& GetName() const { return m_name; }
+    const QString& GetTranslatedName() const { return m_translatedName; }
+
+    void AddAction(int actionId, int toolbarVersionAdded = 0);
+
+    QToolBar* Toolbar() const { return m_toolbar; }
+
+    void Clear();
+    QVector<int> ActionIds() const;
+
+    void SetShowByDefault(bool value) { m_showByDefault = value; }
+    void SetShowToggled(bool value) { m_showToggled = value; }
+    void SetMainToolbar(bool value) { m_isMainToolbar = value; }
+    bool IsShowByDefault() const { return m_showByDefault; }
+    bool IsShowToggled() const { return m_showToggled; }
+    bool IsMainToolbar() const { return m_isMainToolbar; }
+
+    void CopyActions(const AmazonToolbar& other) { m_actions = other.m_actions; }
+    void SetActionsOnInternalToolbar(ActionManager* actionManager);
+
+    void UpdateAllowedAreas();
+    static void UpdateAllowedAreas(QToolBar* toolbar);
+
+    const bool IsSame(const AmazonToolbar& other) const;
+
+private:
+    QString m_name; // Not translated, for settings keys and such
+    QString m_translatedName;
+    QToolBar* m_toolbar = nullptr;
+
+    struct ActionData
+    {
+        int actionId;
+        int toolbarVersionAdded;
+
+        bool operator ==(const AmazonToolbar::ActionData& other) const
+        {
+            return actionId == other.actionId;
+        }
+    };
+
+    QVector<ActionData> m_actions;
+    bool m_showByDefault = true;
+    bool m_showToggled = false;
+    bool m_isMainToolbar = false;
+};
+
+class AmazonToolBarExpanderWatcher;
+
+class ToolbarManager
+{
+public:
+    explicit ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow);
+    ~ToolbarManager();
+
+    AmazonToolbar GetToolbar(int index);
+    AmazonToolbar::List GetToolbars() const;
+    void RestoreToolbarDefaults(const QString& toolbarName);
+    void SetEnabled(bool enabled);
+
+    bool Delete(int index);
+    bool Rename(int index, const QString& newName);
+    int Add(const QString& name);
+    void LoadToolbars();
+    bool IsCustomToolbar(int index) const;
+    bool IsCustomToolbar(const QString& name) const;
+    EditableQToolBar* ToolbarParent(QObject* o) const;
+    ActionManager* GetActionManager() const;
+    AmazonToolBarExpanderWatcher* GetExpanderWatcher() const;
+
+    void SetIsEditingToolBars(bool);
+    bool IsEditingToolBars() const;
+
+    bool DeleteAction(QAction* action, EditableQToolBar*);
+    void InsertAction(QAction* action, QWidget* beforeWidget, QAction* beforeAction, EditableQToolBar* toolbar);
+
+    AmazonToolbar GetEditModeToolbar() const;
+    AmazonToolbar GetObjectToolbar() const;
+    AmazonToolbar GetEditorsToolbar() const;
+    AmazonToolbar GetMiscToolbar() const;
+    AmazonToolbar GetPlayConsoleToolbar() const;
+
+    void AddButtonToEditToolbar(QAction* action);
+
+private:
+    Q_DISABLE_COPY(ToolbarManager);
+    void SaveToolbars();
+    void SaveToolbar(EditableQToolBar* toolbar);
+    void InstantiateToolbars();
+    void InstantiateToolbar(int index);
+    void SanitizeToolbars(const QMap<QString, AmazonToolbar>& previousStandardToolbars);
+    void InitializeStandardToolbars();
+    void UpdateAllowedAreas(QToolBar* toolbar);
+    bool IsDirty(const AmazonToolbar& toolbar) const;
+
+    const AmazonToolbar* FindDefaultToolbar(const QString& toolbarName) const;
+    AmazonToolbar* FindToolbar(const QString& toolbarName);
+
+    MainWindow* const m_mainWindow;
+    ActionManager* const m_actionManager;
+    QSettings m_settings;
+    AmazonToolbar::List m_toolbars;
+    AmazonToolBarExpanderWatcher* m_expanderWatcher;
+    int m_loadedVersion = 0;
+    bool m_isEditingToolBars = false;
+
+    AmazonToolbar::List m_standardToolbars;
+};
+
+#endif
diff --git a/Code/Editor/ToolsConfigPage.cpp b/Code/Editor/ToolsConfigPage.cpp
new file mode 100644
index 0000000000..cae3a99c73
--- /dev/null
+++ b/Code/Editor/ToolsConfigPage.cpp
@@ -0,0 +1,883 @@
+/*
+ * 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 "ToolsConfigPage.h"
+
+// Qt
+#include <QCompleter>
+#include <QMessageBox>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/TabWidget.h>
+
+// Editor
+#include "Settings.h"
+#include "MainWindow.h"
+#include "ToolBox.h"
+#include "KeyboardCustomizationSettings.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_ToolsConfigPage.h>
+#include <ui_IconListDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+namespace
+{
+    QColor COLOR_FOR_EDITOR_COMMAND = QColor(0, 255, 0);
+    QColor COLOR_FOR_CONSOLE_COMMAND = QColor(0, 0, 255);
+    QColor COLOR_FOR_TOGGLE_COMMAND = QColor(128, 0, 255);
+    QColor COLOR_FOR_INVALID_COMMAND = QColor(255, 0, 0);
+
+    UINT CONSOLE_CMD_DROP_LIST_HEIGHT           = 300;
+};
+
+class IconListModel
+    : public QAbstractListModel
+{
+public:
+    IconListModel(QObject* parent = nullptr)
+        : QAbstractListModel(parent)
+    {
+        IFileUtil::FileArray pngFiles;
+
+        // Search for the png files in Editor/UI/Icons folder
+        // and add them to the image list.
+        const int iconSize = 32;    // Currently, accepts the image of this size only.
+        if (gSettings.searchPaths[EDITOR_PATH_UI_ICONS].empty())
+        {
+            return;
+        }
+        const QString iconsDir = gSettings.searchPaths[EDITOR_PATH_UI_ICONS][0];
+        CFileUtil::ScanDirectory(iconsDir, "*.png", pngFiles);
+        m_iconImages.reserve(pngFiles.size());
+        m_iconFiles.reserve(pngFiles.size());
+        for (size_t i = 0; i < pngFiles.size(); ++i)
+        {
+            const QString path = Path::Make(iconsDir, pngFiles[i].filename);
+            QPixmap bm(path);
+            if (bm.isNull())
+            {
+                continue;
+            }
+            if (bm.width() == iconSize && bm.height() == iconSize)
+            {
+                QIcon icon(bm);
+                icon.addPixmap(bm, QIcon::Selected);
+                m_iconImages.push_back(icon);
+                m_iconFiles.push_back(path);
+            }
+        }
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        return parent.isValid() ? 0 : m_iconImages.count();
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (!index.isValid() || index.row() >= rowCount(index.parent()))
+        {
+            return QVariant();
+        }
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+            return m_iconFiles[index.row()];
+        case Qt::DecorationRole:
+            return m_iconImages[index.row()];
+        default:
+            return QVariant();
+        }
+    }
+
+private:
+    QVector<QIcon> m_iconImages;
+    QStringList m_iconFiles;
+};
+
+CIconListDialog::CIconListDialog(QWidget* pParent /* = NULL */)
+    : QDialog(pParent)
+    , m_ui(new Ui::IconListDialog)
+{
+    m_ui->setupUi(this);
+    m_ui->m_iconListCtrl->setModel(new IconListModel(this));
+}
+
+bool CIconListDialog::GetSelectedIconPath(QString& path) const
+{
+    if (!m_ui->m_iconListCtrl->currentIndex().isValid())
+    {
+        return false;
+    }
+    path = m_ui->m_iconListCtrl->currentIndex().data().toString();
+    return true;
+}
+
+class CommandModel
+    : public QAbstractListModel
+{
+public:
+    CommandModel(QObject* parent = nullptr)
+        : QAbstractListModel(parent)
+    {
+    }
+
+    void setMacroIndex(const QModelIndex& macroIndex)
+    {
+        if (m_macroIndex == macroIndex)
+        {
+            return;
+        }
+        beginResetModel();
+        m_macroIndex = macroIndex;
+        endResetModel();
+    }
+
+    bool addRow()
+    {
+        if (macro() == nullptr)
+        {
+            return false;
+        }
+        beginInsertRows(QModelIndex(), rowCount(), rowCount());
+        macro()->AddCommand(CToolBoxCommand::eT_INVALID_COMMAND, "nop");
+        endInsertRows();
+        return true;
+    }
+
+    bool moveRow(int row, bool up)
+    {
+        const int targetRow = up ? row - 1 : row + 1;
+        if (row < 0 || row >= rowCount() || targetRow < 0 || targetRow >= rowCount())
+        {
+            return false;
+        }
+        if (up)
+        {
+            beginMoveRows(QModelIndex(), row, row, QModelIndex(), row - 1);
+        }
+        else
+        {
+            beginMoveRows(QModelIndex(), row + 1, row + 1, QModelIndex(), row);
+        }
+        macro()->SwapCommand(row, targetRow);
+        endMoveRows();
+        return true;
+    }
+
+    bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override
+    {
+        if (row < 0 || row + count - 1 >= rowCount(parent))
+        {
+            return false;
+        }
+
+        beginRemoveRows(QModelIndex(), row, row + count - 1);
+        for (int r = row + count - 1; r >= row; --r)
+        {
+            macro()->RemoveCommand(r);
+        }
+        endRemoveRows();
+        return true;
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        return parent.isValid() || macro() == nullptr ? 0 : macro()->GetCommandCount();
+    }
+
+    bool setData(const QModelIndex& index, [[maybe_unused]] const QVariant& value, int role = Qt::EditRole) override
+    {
+        if (!index.isValid() || index.row() >= rowCount(index.parent()))
+        {
+            return false;
+        }
+
+        if (role != Qt::UserRole)
+        {
+            return false;
+        }
+
+        // this has already been set
+        emit dataChanged(index, index);
+        return true;
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (!index.isValid() || index.row() >= rowCount(index.parent()))
+        {
+            return QVariant();
+        }
+
+        auto command = macro()->GetCommandAt(index.row());
+        switch (role)
+        {
+        case Qt::DisplayRole:
+        case Qt::EditRole:
+            return command->m_text;
+        case Qt::ForegroundRole:
+            switch (command->m_type)
+            {
+            case CToolBoxCommand::eT_SCRIPT_COMMAND:
+                return QVariant::fromValue(COLOR_FOR_EDITOR_COMMAND);
+            case CToolBoxCommand::eT_CONSOLE_COMMAND:
+                return command->m_bVariableToggle ? QVariant::fromValue(COLOR_FOR_TOGGLE_COMMAND) : QVariant::fromValue(COLOR_FOR_CONSOLE_COMMAND);
+            default:
+                return QVariant::fromValue(COLOR_FOR_INVALID_COMMAND);
+            }
+        case Qt::UserRole:
+            return QVariant::fromValue(command);
+        default:
+            return QVariant();
+        }
+    }
+
+private:
+    CToolBoxMacro* macro() const
+    {
+        return m_macroIndex.data(Qt::UserRole).value<CToolBoxMacro*>();
+    }
+
+    QPersistentModelIndex m_macroIndex;
+};
+
+class MacroModel
+    : public QAbstractListModel
+{
+public:
+    MacroModel(QObject* parent = nullptr)
+        : QAbstractListModel(parent)
+        , m_hasEmptyRow(false)
+        , m_currentlyRemovingRows(false)
+    {
+    }
+
+    bool moveRow(int row, bool up)
+    {
+        if (m_hasEmptyRow)
+        {
+            return false;
+        }
+
+        const int targetRow = up ? row - 1 : row + 1;
+        if (row < 0 || row >= rowCount() || targetRow < 0 || targetRow >= rowCount())
+        {
+            return false;
+        }
+        if (up)
+        {
+            beginMoveRows(QModelIndex(), row, row, QModelIndex(), row - 1);
+        }
+        else
+        {
+            beginMoveRows(QModelIndex(), row + 1, row + 1, QModelIndex(), row);
+        }
+        GetIEditor()->GetToolBoxManager()->SwapMacro(row, targetRow, true);
+        endMoveRows();
+        return true;
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        return parent.isValid() ? 0 : (GetIEditor()->GetToolBoxManager()->GetMacroCount(true) + (m_hasEmptyRow ? 1 : 0));
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (!index.isValid() || index.row() >= rowCount(index.parent()))
+        {
+            return QVariant();
+        }
+
+        if (isEmptyRow(index))
+        {
+            switch (role)
+            {
+            case Qt::DisplayRole:
+            case Qt::EditRole:
+                return QString();
+            default:
+                return QVariant();
+            }
+        }
+
+        auto macro = GetIEditor()->GetToolBoxManager()->GetMacro(index.row(), true);
+
+        switch (role)
+        {
+        case Qt::DisplayRole:
+        case Qt::EditRole:
+            return macro->GetTitle();
+        case Qt::UserRole:
+            return QVariant::fromValue(macro);
+        default:
+            return QVariant();
+        }
+    }
+
+    bool setData(const QModelIndex& index, const QVariant& data, [[maybe_unused]] int role = Qt::EditRole) override
+    {
+        if (!index.isValid() || index.row() >= rowCount(index.parent()))
+        {
+            return false;
+        }
+
+        // Retrieve the dialog parent widget for this model so we can display
+        // error popups properly (if needed)
+        QWidget* parentWidget = qobject_cast<QWidget*>(parent());
+
+        // isNull and isValid in Qvariant/QString in this case cannot detect null input
+        // check null data input
+        if (data.toString().isEmpty())
+        {
+            if (!m_currentlyRemovingRows)
+            {
+                QMessageBox::critical(parentWidget, QString(), tr("Please enter a valid name!"));
+
+                // If this is a newly added empty row, then just delete it
+                // Otherwise if the user was renaming an existing row, the previous
+                // value will be restored
+                if (isEmptyRow(index))
+                {
+                    removeRow(index.row());
+                    assert(!m_hasEmptyRow);
+                }
+            }
+
+            return false;
+        }
+
+        if (isEmptyRow(index))
+        {
+            auto macro = GetIEditor()->GetToolBoxManager()->NewMacro(data.toString(), true, nullptr);
+            if (macro == nullptr)
+            {
+                QMessageBox::critical(parentWidget, QString(), tr("There is a macro of that name, already!"));
+
+                removeRow(index.row());
+                assert(!m_hasEmptyRow);
+                return false;
+            }
+
+            emit dataChanged(index, index);
+            m_hasEmptyRow = false;
+        }
+        else if (GetIEditor()->GetToolBoxManager()->SetMacroTitle(index.row(), data.toString(), true))
+        {
+            emit dataChanged(index, index);
+            return true;
+        }
+        else
+        {
+            QMessageBox::critical(parentWidget, QString(), tr("There is a macro of that name, already!"));
+        }
+
+        return false;
+    }
+
+    Qt::ItemFlags flags(const QModelIndex& index) const override
+    {
+        return QAbstractListModel::flags(index) | Qt::ItemIsEditable;
+    }
+
+    bool addRow()
+    {
+        if (m_hasEmptyRow)
+        {
+            return false;
+        }
+        beginInsertRows(QModelIndex(), rowCount(), rowCount());
+        m_hasEmptyRow = true;
+        endInsertRows();
+        return true;
+    }
+
+    bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override
+    {
+        if (row < 0 || row + count - 1 >= rowCount(parent))
+        {
+            return false;
+        }
+
+        m_currentlyRemovingRows = true;
+        beginRemoveRows(QModelIndex(), row, row + count - 1);
+
+        auto tools = GetIEditor()->GetToolBoxManager();
+        for (int r = row + count - 1; r >= row; --r)
+        {
+            if (r == rowCount() - 1 && m_hasEmptyRow)
+            {
+                m_hasEmptyRow = false;
+            }
+            else
+            {
+                tools->RemoveMacro(r, true);
+            }
+        }
+
+        endRemoveRows();
+        m_currentlyRemovingRows = false;
+        return true;
+    }
+
+private:
+    bool m_hasEmptyRow;
+    bool m_currentlyRemovingRows;
+
+    // Empty row is the last row in the list if the proper flag is set
+    bool isEmptyRow(const QModelIndex& index) const
+    {
+        return m_hasEmptyRow && index.row() == rowCount() - 1;
+    }
+};
+
+// CToolsConfigPage dialog
+
+ToolsConfigDialog::ToolsConfigDialog(QWidget* parent)
+    : QDialog(parent)
+{
+    setWindowTitle(tr("Configure ToolBox Macros"));
+    setLayout(new QVBoxLayout);
+    AzQtComponents::TabWidget* tabs = new AzQtComponents::TabWidget;
+    AzQtComponents::TabWidget::applySecondaryStyle(tabs, false);
+    layout()->addWidget(tabs);
+    CToolsConfigPage* page = new CToolsConfigPage;
+    tabs->addTab(page, page->windowTitle());
+    QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    layout()->addWidget(buttons);
+    connect(buttons, &QDialogButtonBox::accepted, page, &CToolsConfigPage::OnOK);
+    connect(buttons, &QDialogButtonBox::rejected, page, &CToolsConfigPage::OnCancel);
+    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
+}
+
+void ToolsConfigDialog::reject()
+{
+    // Revert to the original.
+    GetIEditor()->GetToolBoxManager()->Load();
+    QDialog::reject();
+}
+
+void ToolsConfigDialog::closeEvent(QCloseEvent* ev)
+{
+    reject();
+    QDialog::closeEvent(ev);
+}
+
+CToolsConfigPage::CToolsConfigPage(QWidget* parent)
+    : QWidget(parent)
+    , m_macroModel(new MacroModel(this))
+    , m_commandModel(new CommandModel(this))
+    , m_completionModel(new QStringListModel(this))
+    , m_ui(new Ui::ToolsConfigPage)
+{
+    m_ui->setupUi(this);
+
+    m_ui->m_macroCmd->setCompleter(new QCompleter(m_completionModel));
+
+    connect(m_ui->m_macroShortcutKey, &QKeySequenceEdit::keySequenceChanged, this, [&]([[maybe_unused]] const QKeySequence &keySequence) {
+        int numOfShortcuts = m_ui->m_macroShortcutKey->keySequence().count() - 1;
+        if (numOfShortcuts >= 1)
+        {
+            int value = m_ui->m_macroShortcutKey->keySequence()[numOfShortcuts];
+            QKeySequence shortcut(value);
+            m_ui->m_macroShortcutKey->setKeySequence(shortcut);
+        }
+        
+        if (m_ui->m_macroShortcutKey->keySequence().count() >= 1)
+        {
+            m_ui->m_assignShortcut->setEnabled(true);
+        }
+        else
+        {
+            m_ui->m_assignShortcut->setEnabled(false);
+        }
+    });
+
+    OnInitDialog();
+}
+
+CToolsConfigPage::~CToolsConfigPage()
+{
+}
+
+// CToolsConfigPage message handlers
+void CToolsConfigPage::OnInitDialog()
+{
+    m_ui->m_macroList->setModel(m_macroModel);
+    m_ui->m_commandList->setModel(m_commandModel);
+
+    connect(m_ui->m_assignCommand, &QPushButton::clicked, this, &CToolsConfigPage::OnAssignCommand);
+    connect(m_ui->m_assignShortcut, &QPushButton::clicked, this, &CToolsConfigPage::OnAssignMacroShortcut);
+    connect(m_ui->m_selectIcon, &QPushButton::clicked, this, &CToolsConfigPage::OnSelectMacroIcon);
+    connect(m_ui->m_clearIcon, &QPushButton::clicked, this, &CToolsConfigPage::OnClearMacroIcon);
+    connect(m_ui->m_console, &QRadioButton::clicked, this, &CToolsConfigPage::OnConsoleCmd);
+    connect(m_ui->m_script, &QRadioButton::clicked, this, &CToolsConfigPage::OnScriptCmd);
+
+    connect(m_ui->m_macroList->selectionModel(), &QItemSelectionModel::currentChanged, this, &CToolsConfigPage::OnSelchangeMacroList);
+    connect(m_ui->m_buttonMacroNew, &QToolButton::clicked, this, &CToolsConfigPage::OnNewMacroItem);
+    connect(m_ui->m_buttonMacroUp, &QToolButton::clicked, this, &CToolsConfigPage::OnMoveMacroItemUp);
+    connect(m_ui->m_buttonMacroDown, &QToolButton::clicked, this, &CToolsConfigPage::OnMoveMacroItemDown);
+    connect(m_ui->m_buttonMacroDelete, &QToolButton::clicked, this, &CToolsConfigPage::OnDeleteMacroItem);
+
+    connect(m_ui->m_commandList->selectionModel(), &QItemSelectionModel::currentChanged, this, &CToolsConfigPage::OnSelchangeCommandList);
+    connect(m_ui->m_buttonCommandNew, &QToolButton::clicked, this, &CToolsConfigPage::OnNewCommandItem);
+    connect(m_ui->m_buttonCommandUp, &QToolButton::clicked, this, &CToolsConfigPage::OnMoveCommandItemUp);
+    connect(m_ui->m_buttonCommandDown, &QToolButton::clicked, this, &CToolsConfigPage::OnMoveCommandItemDown);
+    connect(m_ui->m_buttonCommandDelete, &QToolButton::clicked, this, &CToolsConfigPage::OnDeleteCommandItem);
+
+    m_consoleOrScript = 1;  // To force the change in the next line
+    OnConsoleCmd();
+
+    // To ensure the proper disabling of controls
+    OnSelchangeMacroList();
+    OnSelchangeCommandList();
+}
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnOK()
+{
+    GetIEditor()->GetToolBoxManager()->Save();
+    MainWindow* pMainFrame = MainWindow::instance();
+
+    auto pShortcutMgr = pMainFrame->GetShortcutManager();
+    if (pShortcutMgr)
+    {
+        pShortcutMgr->Save();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnCancel()
+{
+    auto pShortcutMgr = MainWindow::instance()->GetShortcutManager();
+    if (pShortcutMgr)
+    {
+        pShortcutMgr->Load();
+    }
+
+    // Revert to the original.
+    GetIEditor()->GetToolBoxManager()->Load();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnSelchangeMacroList()
+{
+    /// Update the command list.
+    auto macro = m_ui->m_macroList->currentIndex().data(Qt::UserRole).value<CToolBoxMacro*>();
+    m_commandModel->setMacroIndex(m_ui->m_macroList->currentIndex());
+
+    if (m_ui->m_macroList->currentIndex().isValid())
+    {
+        // Update the shortcut.
+        auto pShortcutMgr = MainWindow::instance()->GetShortcutManager();
+        m_ui->m_macroShortcutKey->clear();
+        if (pShortcutMgr && macro)
+        {
+            m_ui->m_macroShortcutKey->setKeySequence(macro->GetShortcutName());
+        }
+
+        /// Update the icon.
+        const QPixmap icon(macro != nullptr ? macro->GetIconPath() : QString());
+        m_ui->m_macroIcon->setPixmap(icon);
+
+        m_ui->m_macroShortcutKey->setEnabled(true);
+        m_ui->m_selectIcon->setEnabled(true);
+        m_ui->m_clearIcon->setEnabled(true);
+    }
+    else
+    {
+        m_ui->m_macroShortcutKey->setEnabled(false);
+        m_ui->m_assignShortcut->setEnabled(false);
+        m_ui->m_selectIcon->setEnabled(false);
+        m_ui->m_clearIcon->setEnabled(false);
+    }
+
+    m_ui->m_commandList->selectionModel()->clear();
+    OnSelchangeCommandList();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnNewMacroItem()
+{
+    if (m_macroModel->addRow())
+    {
+        const QModelIndex index = m_macroModel->index(m_macroModel->rowCount() - 1, 0);
+        m_ui->m_macroList->setCurrentIndex(index);
+        m_ui->m_macroList->edit(index);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnSelchangeCommandList()
+{
+    auto commandIndex = m_ui->m_commandList->currentIndex();
+
+    if (!commandIndex.isValid())
+    {
+        m_ui->m_assignCommand->setEnabled(false);
+        m_ui->m_macroCmd->setEnabled(false);
+        m_ui->m_macroCmd->clear();
+        m_ui->m_toggleVar->setEnabled(false);
+        m_ui->m_toggleVar->setChecked(false);
+        m_ui->m_console->setEnabled(false);
+        m_ui->m_script->setEnabled(false);
+    }
+    else
+    {
+        m_ui->m_assignCommand->setEnabled(true);
+        m_ui->m_macroCmd->setEnabled(true);
+        m_ui->m_console->setEnabled(true);
+        m_ui->m_script->setEnabled(true);
+        CToolBoxCommand* pCommand = commandIndex.data(Qt::UserRole).value<CToolBoxCommand*>();
+        if (pCommand->m_type == CToolBoxCommand::eT_SCRIPT_COMMAND)
+        {
+            m_ui->m_macroCmd->setText(pCommand->m_text);
+            OnScriptCmd();
+        }
+        else if (pCommand->m_type == CToolBoxCommand::eT_CONSOLE_COMMAND)
+        {
+            m_ui->m_macroCmd->setText(pCommand->m_text);
+            OnConsoleCmd();
+            m_ui->m_toggleVar->setChecked(pCommand->m_bVariableToggle);
+            m_ui->m_toggleVar->setEnabled(true);
+        }
+        else
+        {
+            m_ui->m_macroCmd->clear();
+            OnConsoleCmd();
+            m_ui->m_toggleVar->setChecked(false);
+            m_ui->m_toggleVar->setEnabled(true);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnNewCommandItem()
+{
+    if (m_commandModel->addRow())
+    {
+        m_ui->m_commandList->setCurrentIndex(m_commandModel->index(m_commandModel->rowCount() - 1));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnAssignCommand()
+{
+    auto commandIndex = m_ui->m_commandList->currentIndex();
+    if (commandIndex.isValid())
+    {
+        CToolBoxCommand* pCommand = commandIndex.data(Qt::UserRole).value<CToolBoxCommand*>();
+        pCommand->m_type = m_consoleOrScript ? CToolBoxCommand::eT_SCRIPT_COMMAND
+            : CToolBoxCommand::eT_CONSOLE_COMMAND;
+        pCommand->m_text = m_ui->m_macroCmd->text();
+        if (pCommand->m_type == CToolBoxCommand::eT_CONSOLE_COMMAND)
+        {
+            pCommand->m_bVariableToggle = m_ui->m_toggleVar->isChecked();
+        }
+        else
+        {
+            pCommand->m_bVariableToggle = false;
+        }
+
+        m_commandModel->setData(commandIndex, QVariant::fromValue(pCommand), Qt::UserRole);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnAssignMacroShortcut()
+{
+    auto pShortcutMgr = MainWindow::instance()->GetShortcutManager();
+
+    if (pShortcutMgr  == NULL)
+    {
+        return;
+    }
+
+    auto macroIndex = m_ui->m_macroList->currentIndex();
+
+    if (!macroIndex.isValid())
+    {
+        return;
+    }
+
+    QKeySequence editorAccel = m_ui->m_macroShortcutKey->keySequence();
+    CToolBoxMacro* pMacro = macroIndex.data(Qt::UserRole).value<CToolBoxMacro*>();
+
+    QAction* action = pShortcutMgr->FindActionForShortcut(editorAccel);
+    bool bReassign = false;
+
+    if (action != nullptr)
+    {
+        if (!bReassign && QMessageBox::question(this, QString(), tr("This shortcut is currently assigned.\nDo you want to re - assign this shortcut ?")) != QMessageBox::Yes)
+        {
+            m_ui->m_macroShortcutKey->setKeySequence(pMacro->GetShortcutName());
+            return;
+        }
+        bReassign = true;
+        action->setShortcut(QKeySequence());
+    }
+
+    pMacro->SetShortcutName(m_ui->m_macroShortcutKey->keySequence());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnMoveMacroItemUp()
+{
+    auto macroIndex = m_ui->m_macroList->currentIndex();
+    m_macroModel->moveRow(macroIndex.row(), true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnMoveMacroItemDown()
+{
+    auto macroIndex = m_ui->m_macroList->currentIndex();
+    m_macroModel->moveRow(macroIndex.row(), false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnMoveCommandItemUp()
+{
+    auto commandIndex = m_ui->m_commandList->currentIndex();
+    m_commandModel->moveRow(commandIndex.row(), true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnMoveCommandItemDown()
+{
+    auto commandIndex = m_ui->m_commandList->currentIndex();
+    m_commandModel->moveRow(commandIndex.row(), false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnDeleteMacroItem()
+{
+    m_macroModel->removeRow(m_ui->m_macroList->currentIndex().row());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnDeleteCommandItem()
+{
+    m_commandModel->removeRow(m_ui->m_commandList->currentIndex().row());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnSelectMacroIcon()
+{
+    auto macroIndex = m_ui->m_macroList->currentIndex();
+    if (!macroIndex.isValid())
+    {
+        return;
+    }
+
+    CToolBoxMacro* pMacro = macroIndex.data(Qt::UserRole).value<CToolBoxMacro*>();
+
+    CIconListDialog iconListDlg;
+    if (iconListDlg.exec() == QDialog::Accepted)
+    {
+        QString iconPath;
+        if (iconListDlg.GetSelectedIconPath(iconPath))
+        {
+            const QPixmap pixmap(iconPath);
+            m_ui->m_macroIcon->setPixmap(pixmap);
+            pMacro->SetIconPath(iconPath.toUtf8().data());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnClearMacroIcon()
+{
+    auto macroIndex = m_ui->m_macroList->currentIndex();
+    if (!macroIndex.isValid())
+    {
+        return;
+    }
+
+    CToolBoxMacro* pMacro = macroIndex.data(Qt::UserRole).value<CToolBoxMacro*>();
+    m_ui->m_macroIcon->setPixmap(QPixmap());
+    pMacro->SetIconPath("");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::FillConsoleCmds()
+{
+    QStringList commands;
+    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
+    std::vector<const char*> cmds;
+    cmds.resize(console->GetNumVars());
+    size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
+    for (int i = 0; i < cmdCount; ++i)
+    {
+        commands.push_back(cmds[i]);
+    }
+    m_completionModel->setStringList(commands);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::FillScriptCmds()
+{
+    // Add module names to the auto-completion list.
+    QStringList commands;
+
+    using namespace AzToolsFramework;
+    EditorPythonConsoleInterface* editorPythonConsoleInterface = AZ::Interface<EditorPythonConsoleInterface>::Get();
+    if (editorPythonConsoleInterface)
+    {
+        EditorPythonConsoleInterface::GlobalFunctionCollection globalFunctionCollection;
+        editorPythonConsoleInterface->GetGlobalFunctionList(globalFunctionCollection);
+        commands.reserve(globalFunctionCollection.size());
+        for (const EditorPythonConsoleInterface::GlobalFunction& globalFunction : globalFunctionCollection)
+        {
+            const QString fullCmd = QString("%1.%2()").arg(globalFunction.m_moduleName.data()).arg(globalFunction.m_functionName.data());
+            commands.push_back(fullCmd);
+        }
+    }
+
+    m_completionModel->setStringList(commands);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnConsoleCmd()
+{
+    m_ui->m_console->setChecked(true);
+    if (m_consoleOrScript == 0)
+    {
+        return;
+    }
+
+    m_consoleOrScript = 0;
+    FillConsoleCmds();
+    m_ui->m_toggleVar->setEnabled(true);
+    m_ui->m_toggleVar->setChecked(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CToolsConfigPage::OnScriptCmd()
+{
+    m_ui->m_script->setChecked(true);
+    if (m_consoleOrScript == 1)
+    {
+        return;
+    }
+
+    m_consoleOrScript = 1;
+    FillScriptCmds();
+    m_ui->m_toggleVar->setEnabled(false);
+    m_ui->m_toggleVar->setChecked(false);
+}
+
+#include <moc_ToolsConfigPage.cpp>
diff --git a/Code/Editor/ToolsConfigPage.h b/Code/Editor/ToolsConfigPage.h
new file mode 100644
index 0000000000..cc8f7f4ccb
--- /dev/null
+++ b/Code/Editor/ToolsConfigPage.h
@@ -0,0 +1,111 @@
+/*
+ * 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_TOOLSCONFIGPAGE_H
+#define CRYINCLUDE_EDITOR_TOOLSCONFIGPAGE_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include <QStringListModel>
+#endif
+
+namespace Ui
+{
+    class IconListDialog;
+    class ToolsConfigPage;
+}
+
+class CommandModel;
+class MacroModel;
+
+class QStringListModel;
+
+class CIconListDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CIconListDialog(QWidget* pParent = nullptr);
+
+    bool GetSelectedIconPath(QString& path) const;
+
+protected:
+    void OnInitDialog();
+
+private:
+    QScopedPointer<Ui::IconListDialog> m_ui;
+};
+
+class ToolsConfigDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    ToolsConfigDialog(QWidget* parent = nullptr);
+
+private:
+    void reject() override;
+    void closeEvent(QCloseEvent* ev) override;
+};
+
+/** Tools configuration property page.
+*/
+class CToolsConfigPage
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    CToolsConfigPage(QWidget* parent = nullptr);
+    virtual ~CToolsConfigPage();
+
+    virtual void OnOK();
+    virtual void OnCancel();
+
+protected:
+    virtual void OnInitDialog();
+
+    void OnSelchangeMacroList();
+    void OnSelchangeCommandList();
+
+    void OnAssignCommand();
+    void OnAssignMacroShortcut();
+    void OnSelectMacroIcon();
+    void OnClearMacroIcon();
+
+    void OnConsoleCmd();
+    void OnScriptCmd();
+
+    void OnNewMacroItem();
+    void OnNewCommandItem();
+
+    void OnMoveMacroItemUp();
+    void OnMoveMacroItemDown();
+    void OnMoveCommandItemUp();
+    void OnMoveCommandItemDown();
+
+    void OnDeleteMacroItem();
+    void OnDeleteCommandItem();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Vars.
+    //////////////////////////////////////////////////////////////////////////
+    int m_consoleOrScript;  // 0 -> console commands, 1 -> script commands
+
+    void FillConsoleCmds();
+    void FillScriptCmds();
+
+private:
+    MacroModel* m_macroModel;
+    CommandModel* m_commandModel;
+    QStringListModel* m_completionModel;
+
+    QScopedPointer<Ui::ToolsConfigPage> m_ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_TOOLSCONFIGPAGE_H
diff --git a/Code/Sandbox/Editor/ToolsConfigPage.ui b/Code/Editor/ToolsConfigPage.ui
similarity index 100%
rename from Code/Sandbox/Editor/ToolsConfigPage.ui
rename to Code/Editor/ToolsConfigPage.ui
diff --git a/Code/Editor/TopRendererWnd.cpp b/Code/Editor/TopRendererWnd.cpp
new file mode 100644
index 0000000000..d9d5b02b2a
--- /dev/null
+++ b/Code/Editor/TopRendererWnd.cpp
@@ -0,0 +1,248 @@
+/*
+ * 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 "TopRendererWnd.h"
+// Editor
+#include "Settings.h"
+
+#include "DisplaySettings.h"
+#include "ViewManager.h"
+
+// Size of the surface texture
+#define SURFACE_TEXTURE_WIDTH 512
+
+#define MARKER_SIZE 6.0f
+#define MARKER_DIR_SIZE 10.0f
+#define SELECTION_RADIUS 30.0f
+
+#define GL_RGBA 0x1908
+#define GL_BGRA 0x80E1
+
+// Used to give each static object type a different color
+static uint32 sVegetationColors[16] =
+{
+    0xFFFF0000,
+    0xFF00FF00,
+    0xFF0000FF,
+    0xFFFFFFFF,
+    0xFFFF00FF,
+    0xFFFFFF00,
+    0xFF00FFFF,
+    0xFF7F00FF,
+    0xFF7FFF7F,
+    0xFFFF7F00,
+    0xFF00FF7F,
+    0xFF7F7F7F,
+    0xFFFF0000,
+    0xFF00FF00,
+    0xFF0000FF,
+    0xFFFFFFFF,
+};
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+QTopRendererWnd::QTopRendererWnd(QWidget* parent)
+    : Q2DViewport(parent)
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Set the window type member of the base class to the correct type and
+    // create the initial surface texture
+    ////////////////////////////////////////////////////////////////////////
+
+    if (gSettings.viewports.bTopMapSwapXY)
+    {
+        SetAxis(VPA_YX);
+    }
+    else
+    {
+        SetAxis(VPA_XY);
+    }
+
+    m_bShowHeightmap = false;
+    m_bShowStatObjects = false;
+    m_bLastShowHeightmapState = false;
+
+    ////////////////////////////////////////////////////////////////////////
+    // Surface texture
+    ////////////////////////////////////////////////////////////////////////
+
+    m_textureSize.setWidth(gSettings.viewports.nTopMapTextureResolution);
+    m_textureSize.setHeight(gSettings.viewports.nTopMapTextureResolution);
+
+    m_heightmapSize = QSize(1, 1);
+
+    m_terrainTextureId = 0;
+
+    m_vegetationTextureId = 0;
+    m_bFirstTerrainUpdate = true;
+    m_bShowWater = false;
+
+    m_bContentsUpdated = false;
+
+    m_gridAlpha = 0.3f;
+    m_colorGridText = QColor(255, 255, 255);
+    m_colorAxisText = QColor(255, 255, 255);
+    m_colorBackground = QColor(128, 128, 128);
+
+    //For this viewport 250 is a better max zoom. 
+    //Anything more than that and the viewport is too small to actually 
+    //paint a heightmap outside of a very high res 4K+ monitor.
+    m_maxZoom = 250.0f;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QTopRendererWnd::~QTopRendererWnd()
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Destroy the attached render and free the surface texture
+    ////////////////////////////////////////////////////////////////////////
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QTopRendererWnd::SetType(EViewportType type)
+{
+    m_viewType = type;
+    m_axis = VPA_YX;
+    SetAxis(m_axis);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QTopRendererWnd::ResetContent()
+{
+    Q2DViewport::ResetContent();
+
+    // Reset texture ids.
+    m_terrainTextureId = 0;
+    m_vegetationTextureId = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QTopRendererWnd::UpdateContent(int flags)
+{
+    if (gSettings.viewports.bTopMapSwapXY)
+    {
+        SetAxis(VPA_YX);
+    }
+    else
+    {
+        SetAxis(VPA_XY);
+    }
+
+    Q2DViewport::UpdateContent(flags);
+    if (!GetIEditor()->GetDocument())
+    {
+        return;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QTopRendererWnd::Draw([[maybe_unused]] DisplayContext& dc)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+    ////////////////////////////////////////////////////////////////////////
+    // Perform the rendering for this window
+    ////////////////////////////////////////////////////////////////////////
+    if (!m_bContentsUpdated)
+    {
+        UpdateContent(0xFFFFFFFF);
+    }
+
+    ////////////////////////////////////////////////////////////////////////
+    // Render the 2D map
+    ////////////////////////////////////////////////////////////////////////
+     // ToDo: Remove TopRendererWnd or update to work with Atom: LYN-3671
+    /*if (!m_terrainTextureId)
+    {
+        //GL_BGRA_EXT
+        if (m_terrainTexture.IsValid())
+        {
+            m_terrainTextureId = m_renderer->DownLoadToVideoMemory((unsigned char*)m_terrainTexture.GetData(), m_textureSize.width(), m_textureSize.height(), eTF_R8G8B8A8, eTF_R8G8B8A8, 0, 0, 0);
+        }
+    }
+
+    if (m_terrainTextureId && m_terrainTexture.IsValid())
+    {
+        m_renderer->UpdateTextureInVideoMemory(m_terrainTextureId, (unsigned char*)m_terrainTexture.GetData(), 0, 0, m_textureSize.width(), m_textureSize.height(), eTF_R8G8B8A8);
+    }
+
+    if (m_bShowStatObjects)
+    {
+        if (m_vegetationTexture.IsValid())
+        {
+            int w = m_vegetationTexture.GetWidth();
+            int h = m_vegetationTexture.GetHeight();
+            uint32* tex = m_vegetationTexture.GetData();
+            if (!m_vegetationTextureId)
+            {
+                m_vegetationTextureId = m_renderer->DownLoadToVideoMemory((unsigned char*)tex, w, h, eTF_R8G8B8A8, eTF_R8G8B8A8, 0, 0, FILTER_NONE);
+            }
+            else
+            {
+                int px = m_vegetationTexturePos.x();
+                int py = m_vegetationTexturePos.y();
+                m_renderer->UpdateTextureInVideoMemory(m_vegetationTextureId, (unsigned char*)tex, px, py, w, h, eTF_R8G8B8A8);
+            }
+            m_vegetationTexture.Release();
+        }
+    }
+
+
+    // Reset states
+    m_renderer->ResetToDefault();
+
+    dc.DepthTestOff();
+
+    Matrix34 tm = GetScreenTM();
+
+    if (m_axis == VPA_YX)
+    {
+        float s[4], t[4];
+
+        s[0] = 0;
+        t[0] = 0;
+        s[1] = 1;
+        t[1] = 0;
+        s[2] = 1;
+        t[2] = 1;
+        s[3] = 0;
+        t[3] = 1;
+        m_renderer->DrawImageWithUV(tm.m03, tm.m13, 0, tm.m01 * m_heightmapSize.width(), tm.m10 * m_heightmapSize.height(), m_terrainTextureId, s, t);
+    }
+    else
+    {
+        float s[4], t[4];
+        s[0] = 0;
+        t[0] = 0;
+        s[1] = 0;
+        t[1] = 1;
+        s[2] = 1;
+        t[2] = 1;
+        s[3] = 1;
+        t[3] = 0;
+        m_renderer->DrawImageWithUV(tm.m03, tm.m13, 0, tm.m00 * m_heightmapSize.width(), tm.m11 * m_heightmapSize.height(), m_terrainTextureId, s, t);
+    }
+
+    dc.DepthTestOn();
+
+    Q2DViewport::Draw(dc);*/
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3    QTopRendererWnd::ViewToWorld(const QPoint& vp, bool* collideWithTerrain, bool onlyTerrain, bool bSkipVegetation, bool bTestRenderMesh, bool* collideWithObject) const
+{
+    Vec3 wp = Q2DViewport::ViewToWorld(vp, collideWithTerrain, onlyTerrain, bSkipVegetation, bTestRenderMesh, collideWithObject);
+    wp.z = GetIEditor()->GetTerrainElevation(wp.x, wp.y);
+    return wp;
+}
+
+#include <moc_TopRendererWnd.cpp>
diff --git a/Code/Editor/TopRendererWnd.h b/Code/Editor/TopRendererWnd.h
new file mode 100644
index 0000000000..099d191bf5
--- /dev/null
+++ b/Code/Editor/TopRendererWnd.h
@@ -0,0 +1,87 @@
+/*
+ * 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_TOPRENDERERWND_H
+#define CRYINCLUDE_EDITOR_TOPRENDERERWND_H
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "Util/Image.h"
+#include "2DViewport.h"
+#endif
+
+class QMenu;
+
+// Predeclare because of friend declaration
+class QTopRendererWnd
+    : public Q2DViewport
+{
+    Q_OBJECT
+public:
+    QTopRendererWnd(QWidget* parent = nullptr);
+    virtual ~QTopRendererWnd();
+
+    static const GUID& GetClassID()
+    {
+        return QtViewport::GetClassID<QTopRendererWnd>();
+    }
+
+    /** Get type of this viewport.
+    */
+    virtual EViewportType GetType() const { return ET_ViewportMap; }
+    virtual void SetType(EViewportType type);
+
+    virtual void ResetContent();
+    virtual void UpdateContent(int flags);
+
+    //! Map viewport position to world space position.
+    virtual Vec3    ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
+
+    void SetShowWater(bool bShow) { m_bShowWater = bShow; }
+    bool GetShowWater() const { return m_bShowWater; };
+
+    void SetAutoScaleGreyRange(bool bAutoScale) { m_bAutoScaleGreyRange = bAutoScale; }
+    bool GetAutoScaleGreyRange() const { return m_bAutoScaleGreyRange; };
+
+protected:
+    // Draw everything.
+    virtual void Draw(DisplayContext& dc);
+
+private:
+    bool m_bContentsUpdated;
+
+    //CImage* m_pSurfaceTexture;
+    int m_terrainTextureId;
+
+    QSize m_textureSize;
+
+    // Size of heightmap in meters.
+    QSize m_heightmapSize;
+
+    CImageEx m_terrainTexture;
+
+    CImageEx m_vegetationTexture;
+    QPoint m_vegetationTexturePos;
+    QSize m_vegetationTextureSize;
+    int     m_vegetationTextureId;
+    bool m_bFirstTerrainUpdate;
+
+public:
+    // Display options.
+    bool m_bDisplayLabels;
+    bool m_bShowHeightmap;
+    bool m_bLastShowHeightmapState;
+    bool m_bShowStatObjects;
+    bool m_bShowWater;
+    bool m_bAutoScaleGreyRange;
+
+    friend class QTopRendererWnd;
+};
+
+#endif // CRYINCLUDE_EDITOR_TOPRENDERERWND_H
diff --git a/Code/Editor/TrackView/2DBezierKeyUIControls.cpp b/Code/Editor/TrackView/2DBezierKeyUIControls.cpp
new file mode 100644
index 0000000000..daabb17bea
--- /dev/null
+++ b/Code/Editor/TrackView/2DBezierKeyUIControls.cpp
@@ -0,0 +1,146 @@
+/*
+ * 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"
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"
+#include "Controls/ReflectedPropertyControl/ReflectedPropertyItem.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+class C2DBezierKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    C2DBezierKeyUIControls()
+    : m_skipOnUIChange(false)
+    {}
+
+    CSmartVariableArray mv_table;
+    CSmartVariable<float> mv_value;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_value, "Value");
+    }
+    bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return trackType == eAnimCurveType_BezierFloat;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 0; }
+
+    static const GUID& GetClassID()
+    {
+        // {DBD76F4B-8EFC-45b6-AFB8-56F171FA150A}
+        static const GUID guid =
+        {
+            0xdbd76f4b, 0x8efc, 0x45b6, { 0xaf, 0xb8, 0x56, 0xf1, 0x71, 0xfa, 0x15, 0xa }
+        };
+        return guid;
+    }
+
+    bool m_skipOnUIChange;
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool C2DBezierKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        float fMin = 0.0f;
+        float fMax = 0.0f;
+
+        const CTrackViewTrack* pTrack = keyHandle.GetTrack();
+        pTrack->GetKeyValueRange(fMin, fMax);
+
+        if (fMin != fMax)
+        {
+            float curMin, curMax, step;
+            bool  curMinHardLimit, curMaxHardLimit;
+
+            // need to call GetLimits to retrieve/maintain *HardLimit boolean values
+            mv_value.GetVar()->GetLimits(curMin, curMax, step, curMinHardLimit, curMaxHardLimit);
+
+            step = ReflectedPropertyItem::ComputeSliderStep(fMin, fMax);
+
+            mv_value.GetVar()->SetLimits(fMin, fMax, step, curMinHardLimit, curMaxHardLimit);
+        }
+        else
+        {
+            mv_value.GetVar()->ClearLimits();
+        }
+
+        EAnimCurveType trType = keyHandle.GetTrack()->GetCurveType();
+        if (trType == eAnimCurveType_BezierFloat)
+        {
+            I2DBezierKey bezierKey;
+            keyHandle.GetKey(&bezierKey);
+
+            m_skipOnUIChange = true;
+            SyncValue(mv_value, bezierKey.value.y, true);
+            m_skipOnUIChange = false;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void C2DBezierKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence || !selectedKeys.AreAllKeysOfSameType() || m_skipOnUIChange)
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+        EAnimCurveType trType = keyHandle.GetTrack()->GetCurveType();
+
+        if (trType == eAnimCurveType_BezierFloat)
+        {
+            I2DBezierKey bezierKey;
+            keyHandle.GetKey(&bezierKey);
+
+            SyncValue(mv_value, bezierKey.value.y, false, pVar);
+
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                keyHandle.SetKey(&bezierKey);
+            }
+            else
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
+                keyHandle.SetKey(&bezierKey);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(C2DBezierKeyUIControls, "TrackView.KeyUI.2DBezier", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/AssetBlendKeyUIControls.cpp b/Code/Editor/TrackView/AssetBlendKeyUIControls.cpp
new file mode 100644
index 0000000000..74bc7945a6
--- /dev/null
+++ b/Code/Editor/TrackView/AssetBlendKeyUIControls.cpp
@@ -0,0 +1,223 @@
+/*
+ * 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"
+
+
+// AzCore
+#include <AzCore/Asset/AssetManagerBus.h>
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+#include <CryCommon/Maestro/Types/AnimValueType.h>
+#include <CryCommon/Maestro/Bus/SequenceComponentBus.h>
+#include <CryCommon/Maestro/Types/AssetBlendKey.h>
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"
+#include "Controls/ReflectedPropertyControl/ReflectedPropertyItem.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+class CAssetBlendKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+
+    AZ::EntityId m_entityId;
+    AZ::ComponentId m_componentId;
+
+    CSmartVariableArray mv_table;
+    CSmartVariable<QString> mv_asset;
+    CSmartVariable<bool> mv_loop;
+    CSmartVariable<float> mv_startTime;
+    CSmartVariable<float> mv_endTime;
+    CSmartVariable<float> mv_timeScale;
+    CSmartVariable<float> mv_blendInTime;
+    CSmartVariable<float> mv_blendOutTime;
+
+    virtual void OnCreateVars()
+    {
+        // Init to an invalid id
+        AZ::Data::AssetId assetId;
+        assetId.SetInvalid();
+        mv_asset->SetUserData(assetId.m_subId);
+        mv_asset->SetDisplayValue(assetId.m_guid.ToString<AZStd::string>().c_str());
+
+        AddVariable(mv_table, "Key Properties");
+        // In the future, we may have different types of AssetBlends supported. Right now
+        // "motion" for the Simple Motion Component is the only instance.
+        AddVariable(mv_table, mv_asset, "Motion", IVariable::DT_MOTION);
+        AddVariable(mv_table, mv_loop, "Loop");
+        AddVariable(mv_table, mv_startTime, "Start Time");
+        AddVariable(mv_table, mv_endTime, "End Time");
+        AddVariable(mv_table, mv_timeScale, "Time Scale");
+        AddVariable(mv_table, mv_blendInTime, "Blend In Time");
+        AddVariable(mv_table, mv_blendOutTime, "Blend Out Time");
+        mv_timeScale->SetLimits(0.001f, 100.f);
+    }
+
+    bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
+    {
+        return valueType == AnimValueType::AssetBlend;
+    }
+
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {5DC82D28-6C50-4406-8993-06770C640F98}
+        static const GUID guid =
+        {
+            0x5DC82D28, 0x6C50, 0x4406, { 0x89, 0x93, 0x06, 0x77, 0x0C, 0x64, 0x0F, 0x98 }
+        };
+        return guid;
+    }
+
+protected:
+    void ResetStartEndLimits(float AssetBlendKeyDuration);
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CAssetBlendKeyUIControls::ResetStartEndLimits(float assetBlendKeyDuration)
+{
+    const float time_zero = .0f;
+    float step = ReflectedPropertyItem::ComputeSliderStep(time_zero, assetBlendKeyDuration);
+    mv_startTime.GetVar()->SetLimits(time_zero, assetBlendKeyDuration, step, true, true);
+    mv_endTime.GetVar()->SetLimits(time_zero, assetBlendKeyDuration, step, true, true);
+    mv_blendInTime.GetVar()->SetLimits(time_zero, assetBlendKeyDuration, step, true, true);
+    mv_blendOutTime.GetVar()->SetLimits(time_zero, assetBlendKeyDuration, step, true, true);
+}
+
+bool CAssetBlendKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+        if (keyHandle.GetTrack()->GetValueType() == AnimValueType::AssetBlend)
+        {
+            AZ::IAssetBlendKey assetBlendKey;
+            keyHandle.GetKey(&assetBlendKey);
+
+            // Find editor object who owns this node.
+            const CTrackViewTrack* pTrack = keyHandle.GetTrack();
+            if (pTrack && pTrack->GetAnimNode()->GetType() == AnimNodeType::Component)
+            {
+                m_componentId = pTrack->GetAnimNode()->GetComponentId();
+
+                // try to get the AZ::EntityId from the component node's parent
+                CTrackViewAnimNode* parentNode = static_cast<CTrackViewAnimNode*>(pTrack->GetAnimNode()->GetParentNode());
+                if (parentNode)
+                {
+                    m_entityId = parentNode->GetAzEntityId();
+                }
+            }
+
+            mv_asset->SetUserData(assetBlendKey.m_assetId.m_subId);
+            mv_asset->SetDisplayValue(assetBlendKey.m_assetId.m_guid.ToString<AZStd::string>().c_str());
+            mv_loop = assetBlendKey.m_bLoop;
+            mv_endTime = assetBlendKey.m_endTime;
+            mv_startTime = assetBlendKey.m_startTime;
+            mv_timeScale = assetBlendKey.m_speed;
+            mv_blendInTime = assetBlendKey.m_blendInTime;
+            mv_blendOutTime = assetBlendKey.m_blendOutTime;
+
+            bAssigned = true;
+        }
+    }
+
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CAssetBlendKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0, num = (int)selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+        CTrackViewTrack* pTrack = keyHandle.GetTrack();
+
+        if (keyHandle.GetTrack()->GetValueType() == AnimValueType::AssetBlend)
+        {
+            AZ::IAssetBlendKey assetBlendKey;
+            keyHandle.GetKey(&assetBlendKey);
+
+            if (mv_asset.GetVar() == pVar)
+            {
+                AZStd::string stringGuid = mv_asset->GetDisplayValue().toLatin1().data();
+                if (!stringGuid.empty())
+                {
+                    AZ::Uuid guid(stringGuid.c_str(), stringGuid.length());
+                    AZ::u32 subId = mv_asset->GetUserData().value<AZ::u32>();
+                    assetBlendKey.m_assetId = AZ::Data::AssetId(guid, subId);
+
+                    // Lookup Filename by assetId and get the filename part of the description
+                    AZStd::string assetPath;
+                    EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetBlendKey.m_assetId);
+
+                    assetBlendKey.m_description = "";
+                    if (!assetPath.empty())
+                    {
+                        AZStd::string filename;
+                        if (AzFramework::StringFunc::Path::GetFileName(assetPath.c_str(), filename))
+                        {
+                            assetBlendKey.m_description = filename;
+                        }
+                    }
+                }
+
+                // This call is required to make sure that the newly set animation is properly triggered.
+                pTrack->GetSequence()->Reset(false);
+            }
+
+            SyncValue(mv_loop, assetBlendKey.m_bLoop, false, pVar);
+            SyncValue(mv_startTime, assetBlendKey.m_startTime, false, pVar);
+            SyncValue(mv_endTime, assetBlendKey.m_endTime, false, pVar);
+            SyncValue(mv_timeScale, assetBlendKey.m_speed, false, pVar);
+            SyncValue(mv_blendInTime, assetBlendKey.m_blendInTime, false, pVar);
+            SyncValue(mv_blendOutTime, assetBlendKey.m_blendOutTime, false, pVar);
+
+            if (assetBlendKey.m_assetId.IsValid())
+            {
+                // Ask entity id this asset blend is bound to, to
+                // get the duration of this asset in an async way.
+                Maestro::SequenceComponentRequests::AnimatedFloatValue currValue = 0.0f;
+                Maestro::SequenceComponentRequestBus::Event(
+                    pSequence->GetSequenceComponentEntityId(),
+                    &Maestro::SequenceComponentRequestBus::Events::GetAssetDuration,
+                    currValue,
+                    m_entityId,
+                    m_componentId,
+                    assetBlendKey.m_assetId
+                );
+
+                assetBlendKey.m_duration = currValue.GetFloatValue();
+                ResetStartEndLimits(assetBlendKey.m_duration);
+            }
+
+            keyHandle.SetKey(&assetBlendKey);
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CAssetBlendKeyUIControls, "TrackView.KeyUI.AssetBlends", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/AtomOutputFrameCapture.cpp b/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
new file mode 100644
index 0000000000..d5ceeae9b2
--- /dev/null
+++ b/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
@@ -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
+ *
+ */
+
+#include "AtomOutputFrameCapture.h"
+
+#include <Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h>
+#include <Atom/RPI.Public/RenderPipeline.h>
+#include <Atom/RPI.Public/Scene.h>
+#include <Atom/RPI.Public/View.h>
+#include <Atom/RPI.Reflect/System/RenderPipelineDescriptor.h>
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/Math/MatrixUtils.h>
+#include <AzCore/Name/Name.h>
+#include <AzFramework/Entity/GameEntityContextBus.h>
+#include <AzFramework/Scene/Scene.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
+
+namespace TrackView
+{
+    void AtomOutputFrameCapture::CreatePipeline(
+        AZ::RPI::Scene& scene, const AZStd::string& pipelineName, const uint32_t width, const uint32_t height)
+    {
+        AZ::RPI::RenderPipelineDescriptor pipelineDesc;
+        pipelineDesc.m_mainViewTagName = "MainCamera"; // must be "MainCamera"
+        pipelineDesc.m_name = pipelineName;
+        pipelineDesc.m_rootPassTemplate = "MainPipelineRenderToTexture";
+        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
+        m_renderPipeline = AZ::RPI::RenderPipeline::CreateRenderPipeline(pipelineDesc);
+
+        if (auto renderToTexturePass = azrtti_cast<AZ::RPI::RenderToTexturePass*>(m_renderPipeline->GetRootPass().get()))
+        {
+            renderToTexturePass->ResizeOutput(width, height);
+        }
+
+        scene.AddRenderPipeline(m_renderPipeline);
+
+        // rendering pipeline has a tree structure
+        m_passHierarchy.push_back(pipelineName);
+        m_passHierarchy.push_back("CopyToSwapChain");
+
+        // retrieve View from the camera that's animating
+        AZ::Name viewName = AZ::Name("MainCamera");
+        m_view = AZ::RPI::View::CreateView(viewName, AZ::RPI::View::UsageCamera);
+        m_renderPipeline->SetDefaultView(m_view);
+    }
+
+    void AtomOutputFrameCapture::DestroyPipeline(AZ::RPI::Scene& scene)
+    {
+        scene.RemoveRenderPipeline(m_renderPipeline->GetId());
+        m_passHierarchy.clear();
+        m_renderPipeline.reset();
+        m_view.reset();
+    }
+
+    void AtomOutputFrameCapture::UpdateView(const AZ::Matrix3x4& cameraTransform, const AZ::Matrix4x4& cameraProjection)
+    {
+        m_view->SetCameraTransform(cameraTransform);
+        m_view->SetViewToClipMatrix(cameraProjection);
+    }
+
+    bool AtomOutputFrameCapture::BeginCapture(
+        const AZ::RPI::AttachmentReadback::CallbackFunction& attachmentReadbackCallback, CaptureFinishedCallback captureFinishedCallback)
+    {
+        AZ::Render::FrameCaptureNotificationBus::Handler::BusConnect();
+
+        m_captureFinishedCallback = AZStd::move(captureFinishedCallback);
+
+        // note: "Output" (slot name) maps to MainPipeline.pass CopyToSwapChain
+        bool startedCapture = false;
+        AZ::Render::FrameCaptureRequestBus::BroadcastResult(
+            startedCapture, &AZ::Render::FrameCaptureRequestBus::Events::CapturePassAttachmentWithCallback, m_passHierarchy,
+            AZStd::string("Output"), attachmentReadbackCallback);
+
+        return startedCapture;
+    }
+
+    void AtomOutputFrameCapture::OnCaptureFinished(
+        [[maybe_unused]] AZ::Render::FrameCaptureResult result, [[maybe_unused]] const AZStd::string& info)
+    {
+        m_captureFinishedCallback();
+        AZ::Render::FrameCaptureNotificationBus::Handler::BusDisconnect();
+    }
+
+    AZ::Matrix3x4 TransformFromEntityId(const AZ::EntityId entityId)
+    {
+        AZ::Transform cameraTransform = AZ::Transform::CreateIdentity();
+        AZ::TransformBus::EventResult(cameraTransform, entityId, &AZ::TransformBus::Events::GetWorldTM);
+        return AZ::Matrix3x4::CreateFromTransform(cameraTransform);
+    }
+
+    AZ::Matrix4x4 ProjectionFromCameraEntityId(const AZ::EntityId entityId, const float outputWidth, const float outputHeight)
+    {
+        float nearDist = 0.0f;
+        Camera::CameraRequestBus::EventResult(nearDist, entityId, &Camera::CameraRequestBus::Events::GetNearClipDistance);
+        float farDist = 0.0f;
+        Camera::CameraRequestBus::EventResult(farDist, entityId, &Camera::CameraRequestBus::Events::GetFarClipDistance);
+        float fovRad = 0.0f;
+        Camera::CameraRequestBus::EventResult(fovRad, entityId, &Camera::CameraRequestBus::Events::GetFovRadians);
+
+        const float aspectRatio = outputWidth / outputHeight;
+
+        AZ::Matrix4x4 viewToClipMatrix;
+        AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, fovRad, aspectRatio, nearDist, farDist, /*reverseDepth=*/true);
+        return viewToClipMatrix;
+    }
+
+    AZ::RPI::Scene* SceneFromGameEntityContext()
+    {
+        AzFramework::EntityContextId entityContextId;
+        AzFramework::GameEntityContextRequestBus::BroadcastResult(
+            entityContextId, &AzFramework::GameEntityContextRequestBus::Events::GetGameEntityContextId);
+
+        return AZ::RPI::Scene::GetSceneForEntityContextId(entityContextId);
+    }
+} // namespace TrackView
diff --git a/Code/Editor/TrackView/AtomOutputFrameCapture.h b/Code/Editor/TrackView/AtomOutputFrameCapture.h
new file mode 100644
index 0000000000..b34ddf1eb1
--- /dev/null
+++ b/Code/Editor/TrackView/AtomOutputFrameCapture.h
@@ -0,0 +1,69 @@
+/*
+ * 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/Feature/Utils/FrameCaptureBus.h>
+#include <AzFramework/Components/CameraBus.h>
+
+namespace TrackView
+{
+    //! Provides functionality to capture frames from the "MainCamera".
+    //! A new pipeline is created (and associated with the scene provided), a callback can be
+    //! provided to handle the attachment readback (what to do with the captured frame) and also
+    //! what to do after an individual capture fully completes (called in OnCaptureFinished).
+    class AtomOutputFrameCapture : private AZ::Render::FrameCaptureNotificationBus::Handler
+    {
+    public:
+        AtomOutputFrameCapture() = default;
+
+        using CaptureFinishedCallback = AZStd::function<void()>;
+
+        //! Create a new pipeline associated with a given scene.
+        //! @note "MainCamera" is the view that is captured.
+        void CreatePipeline(AZ::RPI::Scene& scene, const AZStd::string& pipelineName, uint32_t width, uint32_t height);
+        //! Removes the pipeline from the scene provided and then destroys it.
+        //! @note scene must be the same scene used to create the pipeline.
+        void DestroyPipeline(AZ::RPI::Scene& scene);
+
+        //! Request a capture to start.
+        //! @param attachmentReadbackCallback Handles the returned attachment (image data returned by the renderer).
+        //! @param captureFinishedCallback Logic to run once the capture has completed fully.
+        bool BeginCapture(
+            const AZ::RPI::AttachmentReadback::CallbackFunction& attachmentReadbackCallback,
+            CaptureFinishedCallback captureFinishedCallback);
+
+        //! Update the internal view that is associated with the created pipeline.
+        void UpdateView(const AZ::Matrix3x4& cameraTransform, const AZ::Matrix4x4& cameraProjection);
+
+    private:
+        AZ::RPI::RenderPipelinePtr m_renderPipeline; //!< The internal render pipeline.
+        AZ::RPI::ViewPtr m_view; //!< The view associated with the render pipeline.
+        AZStd::vector<AZStd::string> m_passHierarchy; //!< Pass hierarchy (includes pipelineName and CopyToSwapChain).
+        CaptureFinishedCallback m_captureFinishedCallback; //!< Stored callback called from OnCaptureFinished.
+
+        // FrameCaptureNotificationBus overrides ...
+        void OnCaptureFinished(AZ::Render::FrameCaptureResult result, const AZStd::string& info) override;
+    };
+
+    inline AZ::EntityId ActiveCameraEntityId()
+    {
+        AZ::EntityId activeCameraId;
+        Camera::CameraSystemRequestBus::BroadcastResult(activeCameraId, &Camera::CameraSystemRequests::GetActiveCamera);
+        return activeCameraId;
+    }
+
+    //! Returns the transform for the given EntityId.
+    AZ::Matrix3x4 TransformFromEntityId(AZ::EntityId entityId);
+
+    //! Returns the projection matrix for the given camera EntityId.
+    //! @note Must provide a valid camera entity.
+    AZ::Matrix4x4 ProjectionFromCameraEntityId(AZ::EntityId entityId, float outputWidth, float outputHeight);
+
+    //! Helper to return the GameEntityContext scene.
+    AZ::RPI::Scene* SceneFromGameEntityContext();
+} // namespace TrackView
diff --git a/Code/Editor/TrackView/CaptureKeyUIControls.cpp b/Code/Editor/TrackView/CaptureKeyUIControls.cpp
new file mode 100644
index 0000000000..d01e9f3260
--- /dev/null
+++ b/Code/Editor/TrackView/CaptureKeyUIControls.cpp
@@ -0,0 +1,146 @@
+/*
+ * 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"
+
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"
+
+//////////////////////////////////////////////////////////////////////////
+class CCaptureKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariable<float> mv_duration;
+    CSmartVariable<float> mv_timeStep;
+    CSmartVariable<QString> mv_prefix;
+    CSmartVariable<QString> mv_folder;
+    CSmartVariable<bool> mv_once;
+
+    virtual void OnCreateVars()
+    {
+        mv_duration.GetVar()->SetLimits(0, 100000.0f);
+        mv_timeStep.GetVar()->SetLimits(0.001f, 1.0f);
+
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_duration, "Duration");
+        AddVariable(mv_table, mv_timeStep, "Time Step");
+        AddVariable(mv_table, mv_prefix, "Output Prefix");
+        AddVariable(mv_table, mv_folder, "Output Folder");
+        AddVariable(mv_table, mv_once, "Just one frame?");
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::Capture;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {543197BF-5E43-4abc-8F07-B84078846E4C}
+        static const GUID guid =
+        {
+            0x543197bf, 0x5e43, 0x4abc, { 0x8f, 0x7, 0xb8, 0x40, 0x78, 0x84, 0x6e, 0x4c }
+        };
+        return guid;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CCaptureKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Capture)
+        {
+            ICaptureKey captureKey;
+            keyHandle.GetKey(&captureKey);
+
+            mv_duration = captureKey.duration;
+            mv_timeStep = captureKey.timeStep;
+            mv_prefix = captureKey.prefix.c_str();
+            mv_folder = captureKey.folder.c_str();
+            mv_once = captureKey.once;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CCaptureKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Capture)
+        {
+            ICaptureKey captureKey;
+            keyHandle.GetKey(&captureKey);
+
+            SyncValue(mv_duration, captureKey.duration, false, pVar);
+            SyncValue(mv_timeStep, captureKey.timeStep, false, pVar);
+
+            if (pVar == mv_folder.GetVar())
+            {
+                QString sFolder = mv_folder;
+                captureKey.folder = sFolder.toUtf8().data();
+            }
+            if (pVar == mv_prefix.GetVar())
+            {
+                QString sPrefix = mv_prefix;
+                captureKey.prefix = sPrefix.toUtf8().data();
+            }
+
+            SyncValue(mv_once, captureKey.once, false, pVar);
+
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+                isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                keyHandle.SetKey(&captureKey);
+            }
+            else
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
+                keyHandle.SetKey(&captureKey);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CCaptureKeyUIControls, "TrackView.KeyUI.Capture", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/CharacterKeyUIControls.cpp b/Code/Editor/TrackView/CharacterKeyUIControls.cpp
new file mode 100644
index 0000000000..d1e2a838ba
--- /dev/null
+++ b/Code/Editor/TrackView/CharacterKeyUIControls.cpp
@@ -0,0 +1,167 @@
+/*
+ * 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"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>   // for AnimNodeType
+#include <CryCommon/Maestro/Types/AnimValueType.h>  // for AnimValueType
+#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
+
+// Editor
+#include "Controls/ReflectedPropertyControl/ReflectedPropertyItem.h"    // for ReflectedPropertyItem
+#include "TrackViewKeyPropertiesDlg.h"  // for CTrackViewKeyUIControls
+
+
+//////////////////////////////////////////////////////////////////////////
+class CCharacterKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariable<QString> mv_animation;
+    CSmartVariable<bool> mv_loop;
+    CSmartVariable<bool> mv_blendGap;
+    CSmartVariable<bool> mv_inplace;
+    CSmartVariable<float> mv_startTime;
+    CSmartVariable<float> mv_endTime;
+    CSmartVariable<float> mv_timeScale;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_animation, "Animation", IVariable::DT_ANIMATION);
+        AddVariable(mv_table, mv_loop, "Loop");
+        AddVariable(mv_table, mv_blendGap, "Blend Gap");
+        AddVariable(mv_table, mv_inplace, "In Place");
+        AddVariable(mv_table, mv_startTime, "Start Time");
+        AddVariable(mv_table, mv_endTime, "End Time");
+        AddVariable(mv_table, mv_timeScale, "Time Scale");
+        mv_timeScale->SetLimits(0.001f, 100.f);
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::Animation || valueType == AnimValueType::CharacterAnim;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {EAA26453-6B74-4771-8FD1-14CDFF88E723}
+        static const GUID guid =
+        {
+            0xeaa26453, 0x6b74, 0x4771, { 0x8f, 0xd1, 0x14, 0xcd, 0xff, 0x88, 0xe7, 0x23 }
+        };
+        return guid;
+    }
+
+protected:
+    void ResetStartEndLimits(float characterKeyDuration);
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CCharacterKeyUIControls::ResetStartEndLimits(float characterKeyDuration)
+{
+    const float time_zero = .0f;
+    float step = ReflectedPropertyItem::ComputeSliderStep(time_zero, characterKeyDuration);
+
+    mv_startTime.GetVar()->SetLimits(time_zero, characterKeyDuration, step, true, true);
+    mv_endTime.GetVar()->SetLimits(time_zero, characterKeyDuration, step, true, true);
+}
+
+bool CCharacterKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Animation || keyHandle.GetTrack()->GetValueType() == AnimValueType::CharacterAnim)
+        {
+            ICharacterKey charKey;
+            keyHandle.GetKey(&charKey);
+
+            // Find editor object who owns this node.
+            const CTrackViewTrack* pTrack = keyHandle.GetTrack();
+            if (pTrack->GetAnimNode()->GetType() == AnimNodeType::Component)
+            {
+                // no legacy entity was returned and the track's animNode is a component - try to get the AZ::EntityId from the component node's parent
+                CTrackViewAnimNode* parentNode = static_cast<CTrackViewAnimNode*>(pTrack->GetAnimNode()->GetParentNode());
+                if (parentNode)
+                {
+                    AZ::EntityId azEntityId = parentNode->GetAzEntityId();
+                    if (azEntityId.IsValid())
+                    {
+                        static_assert(sizeof(AZ::EntityId) <= sizeof(AZ::u64), "Can't pack AZ::EntityId into a AZ::u64 in CCharacterKeyUIControls::OnKeySelectionChange.");
+                        mv_animation->SetUserData(static_cast<AZ::u64>(azEntityId));
+                    }
+                }
+            }
+
+            mv_animation = charKey.m_animation.c_str();
+            mv_loop = charKey.m_bLoop;
+            mv_blendGap = charKey.m_bBlendGap;
+            mv_inplace = charKey.m_bInPlace;
+            mv_endTime = charKey.m_endTime;
+            mv_startTime = charKey.m_startTime;
+            mv_timeScale = charKey.m_speed;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CCharacterKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0, num = (int)selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+        CTrackViewTrack* pTrack = keyHandle.GetTrack();
+        const CAnimParamType paramType = pTrack->GetParameterType();
+
+        if (paramType == AnimParamType::Animation || keyHandle.GetTrack()->GetValueType() == AnimValueType::CharacterAnim)
+        {
+            ICharacterKey charKey;
+            keyHandle.GetKey(&charKey);
+
+            if (mv_animation.GetVar() == pVar)
+            {
+                charKey.m_animation = ((QString)mv_animation).toUtf8().data();
+                // This call is required to make sure that the newly set animation is properly triggered.
+                pTrack->GetSequence()->Reset(false);
+            }
+            SyncValue(mv_loop, charKey.m_bLoop, false, pVar);
+            SyncValue(mv_blendGap, charKey.m_bBlendGap, false, pVar);
+            SyncValue(mv_inplace, charKey.m_bInPlace, false, pVar);
+            SyncValue(mv_startTime, charKey.m_startTime, false, pVar);
+            SyncValue(mv_endTime, charKey.m_endTime, false, pVar);
+            SyncValue(mv_timeScale, charKey.m_speed, false, pVar);
+            keyHandle.SetKey(&charKey);
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CCharacterKeyUIControls, "TrackView.KeyUI.Character", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/CommentKeyUIControls.cpp b/Code/Editor/TrackView/CommentKeyUIControls.cpp
new file mode 100644
index 0000000000..8864b60d78
--- /dev/null
+++ b/Code/Editor/TrackView/CommentKeyUIControls.cpp
@@ -0,0 +1,172 @@
+/*
+ * 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"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+class CCommentKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariable<QString> mv_comment;
+    CSmartVariable<float> mv_duration;
+    CSmartVariable<float> mv_size;
+    CSmartVariable<Vec3> mv_color;
+    CSmartVariableEnum<int> mv_align;
+    CSmartVariableEnum<QString> mv_font;
+
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_comment, "Comment");
+        AddVariable(mv_table, mv_duration, "Duration");
+
+        mv_size->SetLimits(1.f, 10.f);
+        AddVariable(mv_table, mv_size, "Size");
+
+        AddVariable(mv_table, mv_color, "Color", IVariable::DT_COLOR);
+
+        mv_align->SetEnumList(NULL);
+        mv_align->AddEnumItem("Left", ICommentKey::eTA_Left);
+        mv_align->AddEnumItem("Center", ICommentKey::eTA_Center);
+        mv_align->AddEnumItem("Right", ICommentKey::eTA_Right);
+        AddVariable(mv_table, mv_align, "Align");
+
+        mv_font->SetEnumList(NULL);
+        IFileUtil::FileArray fa;
+        CFileUtil::ScanDirectory((Path::GetEditingGameDataFolder() + "/Fonts/").c_str(), "*.xml", fa, true);
+        for (size_t i = 0; i < fa.size(); ++i)
+        {
+            string name = fa[i].filename.toUtf8().data();
+            PathUtil::RemoveExtension(name);
+            mv_font->AddEnumItem(name.c_str(), name.c_str());
+        }
+        AddVariable(mv_table, mv_font, "Font");
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::CommentText;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {FA250B8B-FC2A-43b1-AF7A-8C3B6672B49D}
+        static const GUID guid =
+        {
+            0xfa250b8b, 0xfc2a, 0x43b1, { 0xaf, 0x7a, 0x8c, 0x3b, 0x66, 0x72, 0xb4, 0x9d }
+        };
+        return guid;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CCommentKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::CommentText)
+        {
+            ICommentKey commentKey;
+            keyHandle.GetKey(&commentKey);
+
+            mv_comment = commentKey.m_strComment.c_str();
+            mv_duration = commentKey.m_duration;
+            mv_size = commentKey.m_size;
+            mv_font = commentKey.m_strFont.c_str();
+            mv_color = Vec3(commentKey.m_color.GetR(), commentKey.m_color.GetG(), commentKey.m_color.GetB());
+            mv_align = commentKey.m_align;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+//////////////////////////////////////////////////////////////////////////
+// Called when UI variable changes.
+void CCommentKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (size_t keyIndex = 0, num = selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::CommentText)
+        {
+            ICommentKey commentKey;
+            keyHandle.GetKey(&commentKey);
+
+            if (!pVar || pVar == mv_comment.GetVar())
+            {
+                commentKey.m_strComment = ((QString)mv_comment).toUtf8().data();
+            }
+
+            if (!pVar || pVar == mv_font.GetVar())
+            {
+                QString sFont = mv_font;
+                commentKey.m_strFont = sFont.toUtf8().data();
+            }
+
+            if (!pVar || pVar == mv_align.GetVar())
+            {
+                commentKey.m_align = (ICommentKey::ETextAlign)((int)mv_align);
+            }
+
+            SyncValue(mv_duration, commentKey.m_duration, false, pVar);
+            Vec3 color(commentKey.m_color.GetR(), commentKey.m_color.GetG(), commentKey.m_color.GetB());
+            SyncValue(mv_color, color, false, pVar);
+            commentKey.m_color.Set(color.x, color.y, color.z, commentKey.m_color.GetA());
+            SyncValue(mv_size, commentKey.m_size, false, pVar);
+
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                keyHandle.SetKey(&commentKey);
+            }
+            else
+            {
+                // Let the AZ Undo system manage the nodes on the sequence entity
+                AzToolsFramework::ScopedUndoBatch undoBatch("Change key");
+                keyHandle.SetKey(&commentKey);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CCommentKeyUIControls, "TrackView.KeyUI.Comment", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/CommentNodeAnimator.cpp b/Code/Editor/TrackView/CommentNodeAnimator.cpp
new file mode 100644
index 0000000000..0224006aef
--- /dev/null
+++ b/Code/Editor/TrackView/CommentNodeAnimator.cpp
@@ -0,0 +1,209 @@
+/*
+ * 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 "CommentNodeAnimator.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "Settings.h"
+
+
+CCommentNodeAnimator::CCommentNodeAnimator(CTrackViewAnimNode* pCommentNode)
+{
+    assert(pCommentNode);
+    m_pCommentNode = pCommentNode;
+}
+
+CCommentNodeAnimator::~CCommentNodeAnimator()
+{
+    m_pCommentNode = 0;
+}
+
+void CCommentNodeAnimator::Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac)
+{
+    if (pNode != m_pCommentNode || pNode->IsDisabled())
+    {
+        return;
+    }
+
+    CTrackViewTrackBundle tracks = pNode->GetAllTracks();
+
+    int trackCount = tracks.GetCount();
+    Vec2 pos(0, 0);
+    for (int i = 0; i < trackCount; ++i)
+    {
+        CTrackViewTrack* pTrack = tracks.GetTrack(i);
+
+        if (pTrack->IsMasked(ac.trackMask))
+        {
+            continue;
+        }
+
+        switch (pTrack->GetParameterType().GetType())
+        {
+        case AnimParamType::CommentText:
+        {
+            AnimateCommentTextTrack(pTrack, ac);
+        }
+        break;
+        case AnimParamType::PositionX:
+        {
+            pTrack->GetValue(ac.time, pos.x);
+        }
+        break;
+        case AnimParamType::PositionY:
+        {
+            pTrack->GetValue(ac.time, pos.y);
+        }
+        break;
+        }
+    }
+
+    // Position mapping from [0,100] to [-1,1]
+    pos = (pos - Vec2(50.0f, 50.0f)) / 50.0f;
+    m_commentContext.m_unitPos = pos;
+}
+
+void CCommentNodeAnimator::AnimateCommentTextTrack(CTrackViewTrack* pTrack, const SAnimContext& ac)
+{
+    if (pTrack->GetKeyCount() == 0)
+    {
+        return;
+    }
+
+    CTrackViewKeyHandle keyHandle = GetActiveKeyHandle(pTrack, ac.time);
+
+    if (keyHandle.IsValid())
+    {
+        ICommentKey commentKey;
+
+        keyHandle.GetKey(&commentKey);
+
+        if (commentKey.m_duration > 0 && ac.time < keyHandle.GetTime() + commentKey.m_duration)
+        {
+            m_commentContext.m_strComment = commentKey.m_strComment;
+            cry_strcpy(m_commentContext.m_strFont,  commentKey.m_strFont.c_str());
+            m_commentContext.m_color = commentKey.m_color;
+            m_commentContext.m_align = commentKey.m_align;
+            m_commentContext.m_size = commentKey.m_size;
+        }
+        else
+        {
+            m_commentContext.m_strComment.clear();
+        }
+    }
+    else
+    {
+        m_commentContext.m_strComment.clear();
+    }
+}
+
+CTrackViewKeyHandle CCommentNodeAnimator::GetActiveKeyHandle(CTrackViewTrack* pTrack, float fTime)
+{
+    const int nkeys = pTrack->GetKeyCount();
+
+    if (nkeys == 0)
+    {
+        return CTrackViewKeyHandle();
+    }
+
+    const CTrackViewKeyHandle& firstKeyHandle = pTrack->GetKey(0);
+
+    // Time is before first key.
+    if (firstKeyHandle.GetTime() > fTime)
+    {
+        return CTrackViewKeyHandle();
+    }
+
+    for (int i = 0; i < nkeys; i++)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        if (fTime >= keyHandle.GetTime())
+        {
+            if ((i == nkeys - 1) || (fTime < pTrack->GetKey(i + 1).GetTime()))
+            {
+                return keyHandle;
+            }
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+void CCommentNodeAnimator::Render(CTrackViewAnimNode* pNode, [[maybe_unused]] const SAnimContext& ac)
+{
+    if (!pNode->IsDisabled())
+    {
+        CCommentContext* cc = &m_commentContext;
+
+        if (!cc->m_strComment.empty())
+        {
+            Vec3 color(cc->m_color.GetR(), cc->m_color.GetG(), cc->m_color.GetB());
+            DrawText(cc->m_strFont, cc->m_size, cc->m_unitPos, color, cc->m_strComment.c_str(), cc->m_align);
+        }
+    }
+}
+
+Vec2 CCommentNodeAnimator::GetScreenPosFromNormalizedPos(const Vec2& unitPos)
+{
+    const CCamera& cam = gEnv->pSystem->GetViewCamera();
+    float width = (float)cam.GetViewSurfaceX();
+    int height = cam.GetViewSurfaceZ();
+    float fAspectRatio = gSettings.viewports.fDefaultAspectRatio;
+    float camWidth = height * fAspectRatio;
+
+    float x = 0.5f * width + 0.5f * camWidth * unitPos.x;
+    float y = 0.5f * height * (1.f - unitPos.y);
+
+    return Vec2(x, y);
+}
+
+void CCommentNodeAnimator::DrawText(const char* szFontName, float fSize, const Vec2& unitPos, const ColorF col, const char* szText, int align)
+{
+    IFFont* pFont = gEnv->pCryFont->GetFont(szFontName);
+    if (!pFont)
+    {
+        pFont = gEnv->pCryFont->GetFont("default");
+    }
+
+    if (pFont)
+    {
+        STextDrawContext ctx;
+        ctx.SetSizeIn800x600(false);
+        ctx.SetSize(Vec2(UIDRAW_TEXTSIZEFACTOR * fSize, UIDRAW_TEXTSIZEFACTOR * fSize));
+        ctx.SetCharWidthScale(0.5f);
+        ctx.SetProportional(false);
+        ctx.SetFlags(align);
+
+        // alignment
+        Vec2 pos = GetScreenPosFromNormalizedPos(unitPos);
+
+        if (align & eDrawText_Center)
+        {
+            pos.x -= pFont->GetTextSize(szText, true, ctx).x * 0.5f;
+        }
+        else if (align & eDrawText_Right)
+        {
+            pos.x -= pFont->GetTextSize(szText, true, ctx).x;
+        }
+
+        // Color
+        ctx.SetColor(col);
+
+        pFont->DrawString(pos.x, pos.y, szText, true, ctx);
+    }
+}
diff --git a/Code/Editor/TrackView/CommentNodeAnimator.h b/Code/Editor/TrackView/CommentNodeAnimator.h
new file mode 100644
index 0000000000..fe7a407e93
--- /dev/null
+++ b/Code/Editor/TrackView/CommentNodeAnimator.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Comment node animator class
+
+/*
+    CCommentContext stores information about comment track.
+    The Comment Track is activated only in the editor.
+*/
+
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_COMMENTNODEANIMATOR_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_COMMENTNODEANIMATOR_H
+#pragma once
+
+#include "TrackViewAnimNode.h"
+
+class CTrackViewTrack;
+
+struct CCommentContext
+{
+    CCommentContext()
+        : m_nLastActiveKeyIndex(-1)
+        , m_size(1.0f)
+        , m_align(0)
+        , m_color(0.f, 0.f, 0.f, 1.f)
+    {
+        sprintf_s(m_strFont, sizeof(m_strFont), "default");
+        m_unitPos = Vec2(0.f, 0.f);
+    }
+
+    int m_nLastActiveKeyIndex;
+
+    AZStd::string m_strComment;
+    char m_strFont[64];
+    Vec2 m_unitPos;
+    AZ::Color m_color;
+    float m_size;
+    int m_align;
+};
+
+class CCommentNodeAnimator
+    : public IAnimNodeAnimator
+{
+public:
+    CCommentNodeAnimator(CTrackViewAnimNode* pCommentNode);
+    virtual void Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac);
+    virtual void Render(CTrackViewAnimNode* pNode, const SAnimContext& ac);
+
+private:
+    virtual ~CCommentNodeAnimator();
+
+    void AnimateCommentTextTrack(CTrackViewTrack* pTrack, const SAnimContext& ac);
+    CTrackViewKeyHandle GetActiveKeyHandle(CTrackViewTrack* pTrack, float fTime);
+    Vec2 GetScreenPosFromNormalizedPos(const Vec2& unitPos);
+    void DrawText(const char* szFontName, float fSize, const Vec2& unitPos, const ColorF col, const char* szText, int align);
+
+    CTrackViewAnimNode* m_pCommentNode;
+    CCommentContext m_commentContext;
+};
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_COMMENTNODEANIMATOR_H
diff --git a/Code/Editor/TrackView/ConsoleKeyUIControls.cpp b/Code/Editor/TrackView/ConsoleKeyUIControls.cpp
new file mode 100644
index 0000000000..6f472bf733
--- /dev/null
+++ b/Code/Editor/TrackView/ConsoleKeyUIControls.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"  // for CTrackViewKeyUIControls
+
+
+//////////////////////////////////////////////////////////////////////////
+class CConsoleKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariable<QString> mv_command;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_command, "Command");
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::Console;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {3E9D2C57-BFB1-42f9-82AC-A393C1062634}
+        static const GUID guid =
+        {
+            0x3e9d2c57, 0xbfb1, 0x42f9, { 0x82, 0xac, 0xa3, 0x93, 0xc1, 0x6, 0x26, 0x34 }
+        };
+        return guid;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CConsoleKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Console)
+        {
+            IConsoleKey consoleKey;
+            keyHandle.GetKey(&consoleKey);
+
+            mv_command = ((QString)consoleKey.command.c_str()).toUtf8().data();
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CConsoleKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Console)
+        {
+            IConsoleKey consoleKey;
+            keyHandle.GetKey(&consoleKey);
+
+            if (pVar == mv_command.GetVar())
+            {
+                consoleKey.command = ((QString)mv_command).toUtf8().data();
+            }
+
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                keyHandle.SetKey(&consoleKey);
+            }
+            else
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
+                keyHandle.SetKey(&consoleKey);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CConsoleKeyUIControls, "TrackView.KeyUI.Console", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/DirectorNodeAnimator.cpp b/Code/Editor/TrackView/DirectorNodeAnimator.cpp
new file mode 100644
index 0000000000..dad6794e72
--- /dev/null
+++ b/Code/Editor/TrackView/DirectorNodeAnimator.cpp
@@ -0,0 +1,246 @@
+/*
+ * 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 "DirectorNodeAnimator.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
+
+// Editor
+#include "TrackView/TrackViewSequenceManager.h"     // for CTrackViewSequence
+
+
+////////////////////////////////////////////////////////////////////////////
+CDirectorNodeAnimator::CDirectorNodeAnimator(CTrackViewAnimNode* pDirectorNode)
+    : m_pDirectorNode(pDirectorNode)
+{
+    assert(m_pDirectorNode != nullptr);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CDirectorNodeAnimator::Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac)
+{
+    if (!pNode->IsActiveDirector())
+    {
+        // Don't animate if it's not the sequence track of the active director
+        return;
+    }
+
+    CTrackViewTrack* pSequenceTrack = pNode->GetTrackForParameter(AnimParamType::Sequence);
+    if (pSequenceTrack && !pSequenceTrack->IsDisabled())
+    {
+        std::vector<CTrackViewSequence*> inactiveSequences;
+        std::vector<CTrackViewSequence*> activeSequences;
+
+        // Construct sets of sequences that need to be bound/unbound at this point
+        const float time = ac.time;
+        const unsigned int numKeys = pSequenceTrack->GetKeyCount();
+        for (unsigned int i = 0; i < numKeys; ++i)
+        {
+            CTrackViewKeyHandle keyHandle = pSequenceTrack->GetKey(i);
+
+            ISequenceKey sequenceKey;
+            keyHandle.GetKey(&sequenceKey);
+
+            CTrackViewSequence* pSequence = GetSequenceFromSequenceKey(sequenceKey);
+
+            if (pSequence)
+            {
+                if (sequenceKey.time <= time)
+                {
+                    stl::push_back_unique(activeSequences, pSequence);
+                    stl::find_and_erase(inactiveSequences, pSequence);
+                }
+                else
+                {
+                    if (!stl::find(activeSequences, pSequence))
+                    {
+                        stl::push_back_unique(inactiveSequences, pSequence);
+                    }
+                }
+            }
+        }
+
+        // Unbind must occur before binding, because entities can be referenced in multiple sequences
+        for (auto iter = inactiveSequences.begin(); iter != inactiveSequences.end(); ++iter)
+        {
+            CTrackViewSequence* pSequence = *iter;
+            if (pSequence->IsBoundToEditorObjects())
+            {
+                // No notifications because unbinding would call ForceAnimation again
+                CTrackViewSequenceNoNotificationContext context(pSequence);
+                pSequence->UnBindFromEditorObjects();
+            }
+        }
+
+        // Now bind sequences
+        for (auto iter = activeSequences.begin(); iter != activeSequences.end(); ++iter)
+        {
+            CTrackViewSequence* pSequence = *iter;
+            if (!pSequence->IsBoundToEditorObjects())
+            {
+                // No notifications because binding would call ForceAnimation again
+                CTrackViewSequenceNoNotificationContext context(pSequence);
+                pSequence->BindToEditorObjects();
+
+                // Make sure the sequence is active, harmless to call if the sequences is already
+                // active. The sequence may not be active in the Editor if this key was just created.
+                pSequence->Activate();
+            }
+        }
+
+        // Animate sub sequences
+        ForEachActiveSequence(ac, pSequenceTrack, true,
+            [&](CTrackViewSequence* pSequence, const SAnimContext& newAnimContext)
+            {
+                pSequence->Animate(newAnimContext);
+            },
+            [&](CTrackViewSequence* pSequence, [[maybe_unused]] const SAnimContext& newAnimContext)
+            {
+                pSequence->Reset(false);
+            }
+            );
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CDirectorNodeAnimator::Render(CTrackViewAnimNode* pNode, const SAnimContext& ac)
+{
+    if (!pNode->IsActiveDirector())
+    {
+        // Don't animate if it's not the sequence track of the active director
+        return;
+    }
+
+    CTrackViewTrack* pSequenceTrack = pNode->GetTrackForParameter(AnimParamType::Sequence);
+    if (pSequenceTrack && !pSequenceTrack->IsDisabled())
+    {
+        // Render sub sequences
+        ForEachActiveSequence(ac, pSequenceTrack, false,
+            [&](CTrackViewSequence* pSequence, [[maybe_unused]] const SAnimContext& newAnimContext)
+            {
+                pSequence->Render(newAnimContext);
+            },
+            [&]([[maybe_unused]] CTrackViewSequence* pSequence, [[maybe_unused]] const SAnimContext& newAnimContext) {}
+            );
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CDirectorNodeAnimator::ForEachActiveSequence(const SAnimContext& ac, CTrackViewTrack* pSequenceTrack,
+    const bool bHandleOtherKeys, std::function<void(CTrackViewSequence*, const SAnimContext&)> animateFunction,
+    std::function<void(CTrackViewSequence*, const SAnimContext&)> resetFunction)
+{
+    const float time = ac.time;
+    const unsigned int numKeys = pSequenceTrack->GetKeyCount();
+
+    if (bHandleOtherKeys)
+    {
+        // Reset all non-active sequences first
+        for (unsigned int i = 0; i < numKeys; ++i)
+        {
+            CTrackViewKeyHandle keyHandle = pSequenceTrack->GetKey(i);
+
+            ISequenceKey sequenceKey;
+            keyHandle.GetKey(&sequenceKey);
+
+            CTrackViewSequence* pSequence = GetSequenceFromSequenceKey(sequenceKey);
+
+            if (pSequence)
+            {
+                SAnimContext newAnimContext = ac;
+                const float duration = sequenceKey.fDuration;
+                const float sequenceTime = ac.time - sequenceKey.time + sequenceKey.fStartTime;
+                const float sequenceDuration = duration + sequenceKey.fStartTime;
+
+                newAnimContext.time = std::min(sequenceTime, sequenceDuration);
+                const bool bInsideKeyRange = (sequenceTime >= 0.0f) && (sequenceTime <= sequenceDuration);
+
+                if (!bInsideKeyRange)
+                {
+                    if (ac.forcePlay && sequenceTime >= 0.0f && newAnimContext.time != pSequence->GetTime())
+                    {
+                        // If forcing animation force previous keys to their last playback position
+                        animateFunction(pSequence, newAnimContext);
+                    }
+
+                    resetFunction(pSequence, newAnimContext);
+                }
+            }
+        }
+    }
+
+    for (unsigned int i = 0; i < numKeys; ++i)
+    {
+        CTrackViewKeyHandle keyHandle = pSequenceTrack->GetKey(i);
+
+        ISequenceKey sequenceKey;
+        keyHandle.GetKey(&sequenceKey);
+
+        CTrackViewSequence* pSequence = GetSequenceFromSequenceKey(sequenceKey);
+
+        if (pSequence)
+        {
+            SAnimContext newAnimContext = ac;
+            const float duration = sequenceKey.fDuration;
+            const float sequenceTime = ac.time - sequenceKey.time + sequenceKey.fStartTime;
+            const float sequenceDuration = duration + sequenceKey.fStartTime;
+
+            newAnimContext.time = std::min(sequenceTime, sequenceDuration);
+            const bool bInsideKeyRange = (sequenceTime >= 0.0f) && (sequenceTime <= sequenceDuration);
+
+            if ((bInsideKeyRange && (newAnimContext.time != pSequence->GetTime() || ac.forcePlay)))
+            {
+                animateFunction(pSequence, newAnimContext);
+            }
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CDirectorNodeAnimator::UnBind([[maybe_unused]] CTrackViewAnimNode* pNode)
+{
+    const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+
+    const unsigned int numSequences = pSequenceManager->GetCount();
+    for (unsigned int sequenceIndex = 0; sequenceIndex < numSequences; ++sequenceIndex)
+    {
+        CTrackViewSequence* pSequence = pSequenceManager->GetSequenceByIndex(sequenceIndex);
+
+        if (pSequence->IsActiveSequence())
+        {
+            // Don't care about the active sequence
+            continue;
+        }
+
+        if (pSequence->IsBoundToEditorObjects())
+        {
+            pSequence->UnBindFromEditorObjects();
+        }
+    }
+}
+
+/*static*/ CTrackViewSequence* CDirectorNodeAnimator::GetSequenceFromSequenceKey(const ISequenceKey& sequenceKey)
+{
+    CTrackViewSequence* retSequence = nullptr;
+    const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+
+    if (sequenceManager)
+    {
+        if (sequenceKey.sequenceEntityId.IsValid())
+        {            
+            retSequence = sequenceManager->GetSequenceByEntityId(sequenceKey.sequenceEntityId);
+            AZ_Assert(retSequence, "Null sequence returned when a Sequence Component was expected.");
+        }
+    }
+
+    return retSequence;
+}
+
diff --git a/Code/Editor/TrackView/DirectorNodeAnimator.h b/Code/Editor/TrackView/DirectorNodeAnimator.h
new file mode 100644
index 0000000000..fba1a09bbd
--- /dev/null
+++ b/Code/Editor/TrackView/DirectorNodeAnimator.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_DIRECTORNODEANIMATOR_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_DIRECTORNODEANIMATOR_H
+#pragma once
+
+
+#include "TrackViewAnimNode.h"
+
+// This is used to bind/unbind sub sequences in director nodes
+// when the sequence time changes. A sequence only gets bound if it was already
+// referred in time before.
+class CDirectorNodeAnimator
+    : public IAnimNodeAnimator
+{
+public:
+    CDirectorNodeAnimator(CTrackViewAnimNode* pDirectorNode);
+
+    virtual void Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac) override;
+    virtual void Render(CTrackViewAnimNode* pNode, const SAnimContext& ac) override;
+    virtual void UnBind(CTrackViewAnimNode* pNode) override;
+
+    // Utility function to find a CTrackViewSequence* from an ISequenceKey
+    static CTrackViewSequence* GetSequenceFromSequenceKey(const ISequenceKey& sequenceKey);
+
+private:
+    void ForEachActiveSequence(const SAnimContext& ac, CTrackViewTrack* pSequenceTrack,
+        const bool bHandleOtherKeys, std::function<void(CTrackViewSequence*, const SAnimContext&)> animateFunction,
+        std::function<void(CTrackViewSequence*, const SAnimContext&)> resetFunction);
+
+    CTrackViewAnimNode* m_pDirectorNode;
+};
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_DIRECTORNODEANIMATOR_H
diff --git a/Code/Editor/TrackView/EditorTrackViewEventsBus.h b/Code/Editor/TrackView/EditorTrackViewEventsBus.h
new file mode 100644
index 0000000000..707d4e3dac
--- /dev/null
+++ b/Code/Editor/TrackView/EditorTrackViewEventsBus.h
@@ -0,0 +1,133 @@
+/*
+ * 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/any.h>
+
+namespace AzToolsFramework
+{
+    /**
+    * This bus can be used to send commands to the track view.
+    */
+    class EditorLayerTrackViewRequests
+        : public AZ::ComponentBus
+    {
+    public:
+
+        /**
+        * Gets the number of sequences.
+        */
+        virtual int GetNumSequences() = 0;
+
+        /**
+        * Creates a new sequence of the given type(0 = Object Entity Sequence(Legacy), 1 = Component Entity Sequence(PREVIEW)) with the given name.
+        */
+        virtual void NewSequence(const char* name, int sequenceType) = 0;
+
+        /**
+        * Plays the current sequence in TrackView.
+        */
+        virtual void PlaySequence() = 0;
+
+        /**
+        * Stops any sequence currently playing in TrackView.
+        */
+        virtual void StopSequence() = 0;
+
+        /**
+        * Sets the time of the sequence currently playing in TrackView.
+        */
+        virtual void SetSequenceTime(float time) = 0;
+
+        /**
+        * Adds an entity node(s) from viewport selection to the current sequence.
+        */
+        virtual void AddSelectedEntities() = 0;
+
+        /**
+        * Adds a layer node from the current layer to the current sequence.
+        */
+        virtual void AddLayerNode() = 0;
+
+        /**
+        * Adds a track of the given parameter ID to the node.
+        */
+        virtual void AddTrack(const char* paramName, const char* nodeName, const char* parentDirectorName) = 0;
+
+        /**
+        * Deletes a track of the given parameter ID (in the given index in case of a multi-track) from the node.
+        */
+        virtual void DeleteTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName) = 0;
+
+        /**
+        * Gets number of keys of the specified track.
+        */
+        virtual int GetNumTrackKeys(const char* paramName, int trackIndex, const char* nodeName, const char* parentDirectorName) = 0;
+
+        /**
+        * Activates/deactivates TrackView recording mode.
+        */
+        virtual void SetRecording(bool bRecording) = 0;
+
+        /**
+        * Deletes the specified sequence.
+        */
+        virtual void DeleteSequence(const char* name) = 0;
+
+        /**
+        * Sets the specified sequence as a current one in TrackView.
+        */
+        virtual void SetCurrentSequence(const char* name) = 0;
+
+        /**
+        * Gets the name of a sequence by its index.
+        */
+        virtual AZStd::string GetSequenceName(unsigned int index) = 0;
+
+        /**
+        * Gets the time range of a sequence as a pair.
+        */
+        virtual TRange<float> GetSequenceTimeRange(const char* name) = 0;
+
+        /**
+        * Adds a new node with the given type & name to the current sequence.
+        */
+        virtual void AddNode(const char* nodeTypeString, const char* nodeName) = 0;
+
+        /**
+        * Deletes the specified node from the current sequence.
+        */
+        virtual void DeleteNode(AZStd::string_view nodeName, AZStd::string_view parentDirectorName) = 0;
+
+        /**
+        * Gets the number of nodes.
+        */
+        virtual int GetNumNodes(AZStd::string_view parentDirectorName) = 0;
+
+        /**
+        * Gets the name of a sequence by its index.
+        */
+        virtual AZStd::string GetNodeName(int index, AZStd::string_view parentDirectorName) = 0;
+
+        /**
+        * Gets the value of the specified key.
+        */
+        virtual AZStd::any GetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName) = 0;
+
+        /**
+        * Gets the interpolated value of a track at the specified time.
+        */
+        virtual AZStd::any GetInterpolatedValue(const char* paramName, int trackIndex, float time, const char* nodeName, const char* parentDirectorName) = 0;
+
+        /**
+        * Sets the time range of a sequence.
+        */
+        virtual void SetSequenceTimeRange(const char* name, float start, float end) = 0;
+    };
+    using EditorLayerTrackViewRequestBus = AZ::EBus<EditorLayerTrackViewRequests>;
+}
diff --git a/Code/Editor/TrackView/EventKeyUIControls.cpp b/Code/Editor/TrackView/EventKeyUIControls.cpp
new file mode 100644
index 0000000000..8b95cd26de
--- /dev/null
+++ b/Code/Editor/TrackView/EventKeyUIControls.cpp
@@ -0,0 +1,152 @@
+/*
+ * 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 "TrackViewKeyPropertiesDlg.h"  // for CTrackViewKeyUIControls
+
+#include <CryCommon/Maestro/Types/AnimParamType.h>  // AnimParamType
+
+//////////////////////////////////////////////////////////////////////////
+class CEventKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariableArray mv_deprecated;
+
+    CSmartVariableEnum<QString> mv_animation;
+    CSmartVariableEnum<QString> mv_event;
+    CSmartVariable<QString> mv_value;
+    CSmartVariable<bool> mv_notrigger_in_scrubbing;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_event, "Event");
+        AddVariable(mv_table, mv_value, "Value");
+        AddVariable(mv_table, mv_notrigger_in_scrubbing, "No trigger in scrubbing");
+        AddVariable(mv_deprecated, "Deprecated");
+        AddVariable(mv_deprecated, mv_animation, "Animation");
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::Event;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {ED5A2023-EDE1-4a47-BBE6-7D7BA0E4001D}
+        static const GUID guid =
+        {
+            0xed5a2023, 0xede1, 0x4a47, { 0xbb, 0xe6, 0x7d, 0x7b, 0xa0, 0xe4, 0x0, 0x1d }
+        };
+        return guid;
+    }
+
+private:
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CEventKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Event)
+        {
+            mv_event.SetEnumList(NULL);
+            mv_animation.SetEnumList(NULL);
+
+            // Add <None> for empty, unset event
+            mv_event->AddEnumItem(QObject::tr("<None>"), "");
+            mv_animation->AddEnumItem(QObject::tr("<None>"), "");
+
+            IEventKey eventKey;
+            keyHandle.GetKey(&eventKey);
+
+            mv_event = eventKey.event.c_str();
+            mv_value = eventKey.eventValue.c_str();
+            mv_animation = eventKey.animation.c_str();
+            mv_notrigger_in_scrubbing = eventKey.bNoTriggerInScrubbing;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CEventKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Event)
+        {
+            IEventKey eventKey;
+            keyHandle.GetKey(&eventKey);
+
+            QByteArray event, value, animation;
+            event = static_cast<QString>(mv_event).toUtf8();
+            value = static_cast<QString>(mv_value).toUtf8();
+            animation = static_cast<QString>(mv_animation).toUtf8();
+
+            if (pVar == mv_event.GetVar())
+            {
+                eventKey.event = event.data();
+            }
+            if (pVar == mv_value.GetVar())
+            {
+                eventKey.eventValue = value.data();
+            }
+            if (pVar == mv_animation.GetVar())
+            {
+                eventKey.animation = animation.data();
+            }
+            SyncValue(mv_notrigger_in_scrubbing, eventKey.bNoTriggerInScrubbing, false, pVar);
+
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                keyHandle.SetKey(&eventKey);
+            }
+            else
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
+                keyHandle.SetKey(&eventKey);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CEventKeyUIControls, "TrackView.KeyUI.Event", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/GotoKeyUIControls.cpp b/Code/Editor/TrackView/GotoKeyUIControls.cpp
new file mode 100644
index 0000000000..3de90f19d8
--- /dev/null
+++ b/Code/Editor/TrackView/GotoKeyUIControls.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+class CGotoKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariable<float> mv_command;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_command, "Goto Time");
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        if (paramType == AnimParamType::Goto)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {3E9D2C57-BFB1-42f9-82AC-A393C1062634}
+        static const GUID guid =
+        {
+            0x9b79c8b6, 0xe332, 0x4b9b, { 0xb2, 0x63, 0xef, 0x7e, 0x82, 0x7, 0xa4, 0x47 }
+        };
+        return guid;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CGotoKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Goto)
+        {
+            IDiscreteFloatKey discreteFloatKey;
+            keyHandle.GetKey(&discreteFloatKey);
+
+            mv_command = discreteFloatKey.m_fValue;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+//////////////////////////////////////////////////////////////////////////
+// Called when UI variable changes.
+void CGotoKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Goto)
+        {
+            IDiscreteFloatKey discreteFloatKey;
+
+            keyHandle.GetKey(&discreteFloatKey);
+            SyncValue(mv_command, discreteFloatKey.m_fValue, false, pVar);
+
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                keyHandle.SetKey(&discreteFloatKey);
+            }
+            else
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
+                keyHandle.SetKey(&discreteFloatKey);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CGotoKeyUIControls, "TrackView.KeyUI.Goto", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp b/Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp
new file mode 100644
index 0000000000..251991f891
--- /dev/null
+++ b/Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp
@@ -0,0 +1,170 @@
+/*
+ * 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"
+
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"
+
+
+//-----------------------------------------------------------------------------
+//!
+class CScreenFaderKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+    CSmartVariableArray     mv_table;
+    CSmartVariable<float>   mv_fadeTime;
+    CSmartVariable<Vec3>    mv_fadeColor;
+    CSmartVariable<QString> mv_strTexture;
+    CSmartVariable<bool>    mv_bUseCurColor;
+    CSmartVariableEnum<int> mv_fadeType;
+    CSmartVariableEnum<int> mv_fadechangeType;
+
+public:
+    //-----------------------------------------------------------------------------
+    //!
+    virtual bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::ScreenFader;
+    }
+
+    //-----------------------------------------------------------------------------
+    //!
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+
+        mv_fadeType->SetEnumList(NULL);
+        mv_fadeType->AddEnumItem("FadeIn", IScreenFaderKey::eFT_FadeIn);
+        mv_fadeType->AddEnumItem("FadeOut", IScreenFaderKey::eFT_FadeOut);
+        AddVariable(mv_table, mv_fadeType, "Type");
+
+        mv_fadechangeType->SetEnumList(NULL);
+        mv_fadechangeType->AddEnumItem("Linear", IScreenFaderKey::eFCT_Linear);
+        mv_fadechangeType->AddEnumItem("Square", IScreenFaderKey::eFCT_Square);
+        mv_fadechangeType->AddEnumItem("Cubic Square", IScreenFaderKey::eFCT_CubicSquare);
+        mv_fadechangeType->AddEnumItem("Square Root", IScreenFaderKey::eFCT_SquareRoot);
+        mv_fadechangeType->AddEnumItem("Sin", IScreenFaderKey::eFCT_Sin);
+        AddVariable(mv_table, mv_fadechangeType, "ChangeType");
+
+        AddVariable(mv_table, mv_fadeColor, "Color", IVariable::DT_COLOR);
+
+        mv_fadeTime->SetLimits(0.f, 100.f);
+        AddVariable(mv_table, mv_fadeTime, "Duration");
+        AddVariable(mv_table, mv_strTexture, "Texture", IVariable::DT_TEXTURE);
+        AddVariable(mv_table, mv_bUseCurColor, "Use Current Color");
+    }
+
+    //-----------------------------------------------------------------------------
+    //!
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& keys);
+
+    //-----------------------------------------------------------------------------
+    //!
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& keys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {FBBC2407-C36B-45b2-9A54-0CF9CD3908FD}
+        static const GUID guid =
+        {
+            0xfbbc2407, 0xc36b, 0x45b2, { 0x9a, 0x54, 0xc, 0xf9, 0xcd, 0x39, 0x8, 0xfd }
+        };
+        return guid;
+    }
+};
+
+//-----------------------------------------------------------------------------
+bool CScreenFaderKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& keys)
+{
+    if (!keys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (keys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = keys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::ScreenFader)
+        {
+            IScreenFaderKey screenFaderKey;
+            keyHandle.GetKey(&screenFaderKey);
+
+            mv_fadeTime = screenFaderKey.m_fadeTime;
+            mv_fadeColor = Vec3(screenFaderKey.m_fadeColor.GetR(), screenFaderKey.m_fadeColor.GetG(), screenFaderKey.m_fadeColor.GetB());
+            mv_strTexture = screenFaderKey.m_strTexture.c_str();
+            mv_bUseCurColor = screenFaderKey.m_bUseCurColor;
+            mv_fadeType = (int)screenFaderKey.m_fadeType;
+            mv_fadechangeType = (int)screenFaderKey.m_fadeChangeType;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+//-----------------------------------------------------------------------------
+void CScreenFaderKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (size_t keyIndex = 0, num = selectedKeys.GetKeyCount(); keyIndex < num; ++keyIndex)
+    {
+        CTrackViewKeyHandle selectedKey = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = selectedKey.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::ScreenFader)
+        {
+            IScreenFaderKey screenFaderKey;
+            selectedKey.GetKey(&screenFaderKey);
+
+            SyncValue(mv_fadeTime, screenFaderKey.m_fadeTime, false, pVar);
+
+            SyncValue(mv_bUseCurColor, screenFaderKey.m_bUseCurColor, false, pVar);
+
+            if (pVar == mv_fadeTime.GetVar())
+            {
+                screenFaderKey.m_fadeTime = MAX((float)mv_fadeTime, 0.f);
+            }
+            else if (pVar == mv_strTexture.GetVar())
+            {
+                QString sTexture = mv_strTexture;
+                screenFaderKey.m_strTexture = sTexture.toUtf8().data();
+            }
+            else if (pVar == mv_fadeType.GetVar())
+            {
+                screenFaderKey.m_fadeType = IScreenFaderKey::EFadeType((int)mv_fadeType);
+            }
+            else if (pVar == mv_fadechangeType.GetVar())
+            {
+                screenFaderKey.m_fadeChangeType = IScreenFaderKey::EFadeChangeType((int)mv_fadechangeType);
+            }
+            else if (pVar == mv_fadeColor.GetVar())
+            {
+                Vec3 color = mv_fadeColor;
+                screenFaderKey.m_fadeColor = AZ::Color(color.x, color.y, color.z, screenFaderKey.m_fadeType == IScreenFaderKey::eFT_FadeIn ? 1.f : 0.f);
+            }
+
+            selectedKey.SetKey(&screenFaderKey);
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CScreenFaderKeyUIControls, "TrackView.KeyUI.ScreenFader", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/SelectKeyUIControls.cpp b/Code/Editor/TrackView/SelectKeyUIControls.cpp
new file mode 100644
index 0000000000..40956039f3
--- /dev/null
+++ b/Code/Editor/TrackView/SelectKeyUIControls.cpp
@@ -0,0 +1,272 @@
+/*
+ * 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 "TrackViewKeyPropertiesDlg.h"                          // for CTrackViewKeyUIControls
+
+#include <AzCore/Component/EntityBus.h>                         // for AZ::EntitySystemBus
+#include <AzFramework/Components/CameraBus.h>                   // for Camera::CameraNotificationBus
+#include <CryCommon/Maestro/Types/AnimValueType.h>              // for AnimValueType
+
+//////////////////////////////////////////////////////////////////////////
+class CSelectKeyUIControls
+    : public CTrackViewKeyUIControls
+    , protected Camera::CameraNotificationBus::Handler
+    , protected AZ::EntitySystemBus::Handler
+{
+public:
+    CSelectKeyUIControls() {}
+
+    ~CSelectKeyUIControls() override;
+
+    CSmartVariableArray mv_table;
+    CSmartVariableEnum<QString> mv_camera;
+    CSmartVariable<float> mv_BlendTime;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_camera, "Camera");
+        AddVariable(mv_table, mv_BlendTime, "Blend time");
+
+        Camera::CameraNotificationBus::Handler::BusConnect();
+        AZ::EntitySystemBus::Handler::BusConnect();
+    }
+    bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
+    {
+        return valueType == AnimValueType::Select;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {9018D0D1-24CC-45e5-9D3D-16D3F9E591B2}
+        static const GUID guid =
+        {
+            0x9018d0d1, 0x24cc, 0x45e5, { 0x9d, 0x3d, 0x16, 0xd3, 0xf9, 0xe5, 0x91, 0xb2 }
+        };
+        return guid;
+    }
+
+protected:
+    ////////////////////////////////////////////////////////////////////////
+    // CameraNotificationBus interface implementation
+    void OnCameraAdded(const AZ::EntityId& cameraId) override;
+    void OnCameraRemoved(const AZ::EntityId& cameraId) override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // AZ::EntitySystemBus::Handler
+    void OnEntityNameChanged(const AZ::EntityId& entityId, const AZStd::string& name) override;
+
+private:
+
+    void ResetCameraEntries();
+};
+
+CSelectKeyUIControls::~CSelectKeyUIControls()
+{
+    AZ::EntitySystemBus::Handler::BusDisconnect();
+    Camera::CameraNotificationBus::Handler::BusDisconnect();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSelectKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        AnimValueType valueType = keyHandle.GetTrack()->GetValueType();
+        if (valueType == AnimValueType::Select)
+        {
+            ResetCameraEntries();
+
+            // Get All cameras.
+            mv_camera.SetEnumList(NULL);
+
+            mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
+
+            // Find all Component Entity Cameras
+            AZ::EBusAggregateResults<AZ::EntityId> cameraComponentEntities;
+            Camera::CameraBus::BroadcastResult(cameraComponentEntities, &Camera::CameraRequests::GetCameras);
+
+            // add names of all found entities with Camera Components
+            for (int i = 0; i < cameraComponentEntities.values.size(); i++)
+            {
+                AZ::Entity* entity = nullptr;
+                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, cameraComponentEntities.values[i]);
+                if (entity)
+                {
+                    // For Camera Components the enum value is the stringified AZ::EntityId of the entity with the Camera Component
+                    QString entityIdString = QString::number(static_cast<AZ::u64>(entity->GetId()));
+                    mv_camera->AddEnumItem(entity->GetName().c_str(), entityIdString);
+                }
+            }            
+
+            ISelectKey selectKey;
+            keyHandle.GetKey(&selectKey);
+
+            mv_camera = QString::number(static_cast<AZ::u64>(selectKey.cameraAzEntityId));            
+
+            mv_BlendTime.GetVar()->SetLimits(0.0f, selectKey.fDuration > .0f ? selectKey.fDuration : 1.0f, 0.1f, true, false);
+            mv_BlendTime = selectKey.fBlendTime;
+
+            bAssigned = true;        
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CSelectKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        AnimValueType valueType = keyHandle.GetTrack()->GetValueType();
+        if (valueType == AnimValueType::Select)
+        {
+            ISelectKey selectKey;
+            keyHandle.GetKey(&selectKey);
+
+            if (pVar == mv_camera.GetVar())
+            {
+                QString entityIdString = mv_camera;
+                selectKey.cameraAzEntityId = AZ::EntityId(entityIdString.toULongLong());
+                selectKey.szSelection =  mv_camera.GetVar()->GetDisplayValue().toUtf8().data();
+            }
+
+            if (pVar == mv_BlendTime.GetVar())
+            {
+                if (mv_BlendTime < 0.0f)
+                {
+                    mv_BlendTime = 0.0f;
+                }
+
+                selectKey.fBlendTime = mv_BlendTime;
+            }
+
+            if (!selectKey.szSelection.empty())
+            {
+                IAnimSequence* pSequence = GetIEditor()->GetSystem()->GetIMovieSystem()->FindLegacySequenceByName(selectKey.szSelection.c_str());
+                if (pSequence)
+                {
+                    selectKey.fDuration = pSequence->GetTimeRange().Length();
+                }
+            }
+
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                keyHandle.SetKey(&selectKey);
+            }
+            else
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
+                keyHandle.SetKey(&selectKey);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+
+        }
+    }
+}
+
+void CSelectKeyUIControls::OnCameraAdded(const AZ::EntityId & cameraId)
+{
+    // Add a single camera component
+    AZ::Entity* entity = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, cameraId);
+    if (entity)
+    {
+        // For Camera Components the enum value is the stringified AZ::EntityId of the entity with the Camera Component
+        QString entityIdString = QString::number(static_cast<AZ::u64>(entity->GetId()));
+        mv_camera->AddEnumItem(entity->GetName().c_str(), entityIdString);
+    }
+}
+
+void CSelectKeyUIControls::OnCameraRemoved(const AZ::EntityId & cameraId)
+{
+    mv_camera->EnableUpdateCallbacks(false);
+
+    // We can't iterate or remove an item from the enum list, and Camera::CameraRequests::GetCameras
+    // still includes the deleted camera at this point. Reset the list anyway and filter out the
+    // deleted camera.
+    mv_camera->SetEnumList(NULL);
+    mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
+
+    AZ::EBusAggregateResults<AZ::EntityId> cameraComponentEntities;
+    Camera::CameraBus::BroadcastResult(cameraComponentEntities, &Camera::CameraRequests::GetCameras);
+    for (int i = 0; i < cameraComponentEntities.values.size(); i++)
+    {
+        if (cameraId == cameraComponentEntities.values[i])
+        {
+            continue;
+        }
+        OnCameraAdded(cameraComponentEntities.values[i]);
+    }
+
+    mv_camera->EnableUpdateCallbacks(true);
+}
+
+void CSelectKeyUIControls::OnEntityNameChanged(const AZ::EntityId & entityId, [[maybe_unused]] const AZStd::string & name)
+{
+    AZ::Entity* entity = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
+    if (entity == nullptr)
+    {
+        return;
+    }
+
+    AZ::Entity::ComponentArrayType cameraComponents = entity->FindComponents(EditorCameraComponentTypeId);
+    if (cameraComponents.size() == 0)
+    {
+        return;
+    }
+
+    mv_camera->EnableUpdateCallbacks(false);
+    ResetCameraEntries();
+    mv_camera->EnableUpdateCallbacks(true);
+}
+
+void CSelectKeyUIControls::ResetCameraEntries()
+{
+    mv_camera.SetEnumList(NULL);
+    mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
+
+    // Find all Component Entity Cameras
+    AZ::EBusAggregateResults<AZ::EntityId> cameraComponentEntities;
+    Camera::CameraBus::BroadcastResult(cameraComponentEntities, &Camera::CameraRequests::GetCameras);
+
+    // add names of all found entities with Camera Components
+    for (int i = 0; i < cameraComponentEntities.values.size(); i++)
+    {
+        OnCameraAdded(cameraComponentEntities.values[i]);
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CSelectKeyUIControls, "TrackView.KeyUI.Select", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp b/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
new file mode 100644
index 0000000000..e5a51051a2
--- /dev/null
+++ b/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
@@ -0,0 +1,1633 @@
+/*
+ * 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 : A dialog for batch-rendering sequences
+
+
+#include "EditorDefs.h"
+
+#include "SequenceBatchRenderDialog.h"
+
+#include <AzFramework/Windowing/WindowBus.h>
+
+// Qt
+#include <QAction>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QStringListModel>
+#include <QtConcurrent>
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+
+// Editor
+#include "MainWindow.h"
+#include "CustomResolutionDlg.h"
+#include "ViewPane.h"
+#include "GameEngine.h"
+#include "Include/ICommandManager.h"
+#include "CryEdit.h"
+#include "Viewport.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <TrackView/ui_SequenceBatchRenderDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+namespace
+{
+    const int g_useActiveViewportResolution = -1;   // reserved value to indicate the use of the active viewport resolution
+    int resolutions[][2] = {
+        { 1280, 720 }, { 1920, 1080 }, { 1998, 1080 }, { 2048, 858 }, { 2560, 1440 }, 
+        { g_useActiveViewportResolution, g_useActiveViewportResolution }    // active viewport res must be the last element of the resolution array
+    };
+
+    // cached current active viewport resolution
+    int activeViewportWidth;
+    int activeViewportHeight;
+
+    struct SFPSPair
+    {
+        int fps;
+        const char* fpsDesc;
+    } fpsOptions[] = {
+        {24, "Film(24)"}, {25, "PAL(25)"}, {30, "NTSC(30)"},
+        {48, "Show(48)"}, {50, "PAL Field(50)"}, {60, "NTSC Field(60)"}
+    };
+
+    // currently supported file extensions
+    const char* imageFormatExtensions[] = {"dds", "ppm"};
+
+    const char defaultPresetFilename[] = "defaultBatchRender.preset";
+
+    const char customResFormat[] = "Custom(%1 x %2)...";
+
+    const int kBatchRenderFileVersion = 2; // This version number should be incremented every time available options like the list of formats,
+    // the list of buffers change.
+
+    // get the actual render width to use (substitutes active viewport width if needed)
+    int getResWidth(int renderItemWidth)
+    {
+        return (renderItemWidth == g_useActiveViewportResolution) ? activeViewportWidth : renderItemWidth;
+    }
+    // get the actual render height to use (substitutes active viewport height if needed)
+    int getResHeight(int renderItemHeight)
+    {
+        return (renderItemHeight == g_useActiveViewportResolution) ? activeViewportHeight : renderItemHeight;
+    }
+}
+
+static void UpdateAtomOutputFrameCaptureView(TrackView::AtomOutputFrameCapture& atomOutputFrameCapture, const int width, const int height)
+{
+    const AZ::EntityId activeCameraEntityId = TrackView::ActiveCameraEntityId();
+    atomOutputFrameCapture.UpdateView(
+        TrackView::TransformFromEntityId(activeCameraEntityId),
+        TrackView::ProjectionFromCameraEntityId(activeCameraEntityId, width, height));
+}
+
+CSequenceBatchRenderDialog::CSequenceBatchRenderDialog(float fps, QWidget* pParent /* = nullptr */)
+    : QDialog(pParent)
+    , m_fpsForTimeToFrameConversion(fps)
+    , m_customResH(0)
+    , m_customResW(0)
+    , m_customFPS(0)
+    , m_bFFMPEGCommandAvailable(false)
+    , m_ui(new Ui::SequenceBatchRenderDialog)
+    , m_renderListModel(new QStringListModel(this))
+    , CV_TrackViewRenderOutputCapturing(0)
+    , m_prefixValidator(new CPrefixValidator(this))
+{
+    m_ui->setupUi(this);
+    setFixedSize(size());
+    m_ui->m_renderList->setModel(m_renderListModel);
+
+    OnInitDialog();
+
+    connect(&m_renderTimer, &QTimer::timeout, this, &CSequenceBatchRenderDialog::OnKickIdleTimout);
+    m_renderTimer.setInterval(0);
+    m_renderTimer.setSingleShot(true);
+
+    REGISTER_CVAR3("TrackViewRenderOutputCapturing", CV_TrackViewRenderOutputCapturing, 0, VF_NULL, "Set to 1 when Track View is actively capturing render output.");
+}
+
+CSequenceBatchRenderDialog::~CSequenceBatchRenderDialog()
+{
+}
+
+void CSequenceBatchRenderDialog::reject()
+{
+    if (m_renderContext.IsInRendering())
+    {
+        OnCancelRender();
+    }
+    else
+    {
+        QDialog::reject();
+    }
+}
+
+void CSequenceBatchRenderDialog::OnInitDialog()
+{
+    QAction* browseAction = m_ui->m_destinationEdit->addAction(style()->standardPixmap(QStyle::SP_DirOpenIcon), QLineEdit::TrailingPosition);
+    connect(browseAction, &QAction::triggered, this, [=]()
+    {
+        const QString dir = QFileDialog::getExistingDirectory(this);
+        if (!dir.isEmpty())
+        {
+            m_ui->m_destinationEdit->setText(dir);
+        }
+    });
+
+    void(QComboBox::* activated)(int) = &QComboBox::activated;
+    void(QSpinBox::* editingFinished)() = &QSpinBox::editingFinished;
+
+    connect(m_ui->BATCH_RENDER_ADD_SEQ, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnAddRenderItem);
+    connect(m_ui->BATCH_RENDER_REMOVE_SEQ, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnRemoveRenderItem);
+    connect(m_ui->BATCH_RENDER_CLEAR_SEQ, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnClearRenderItems);
+    connect(m_ui->m_updateBtn, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnUpdateRenderItem);
+    connect(m_ui->BATCH_RENDER_LOAD_PRESET, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnLoadPreset);
+    connect(m_ui->BATCH_RENDER_SAVE_PRESET, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnSavePreset);
+    connect(m_ui->BATCH_RENDER_LOAD_BATCH, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnLoadBatch);
+    connect(m_ui->BATCH_RENDER_SAVE_BATCH, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnSaveBatch);
+    connect(m_ui->m_pGoBtn, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnGo);
+    connect(m_ui->CANCEL, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnDone);
+    connect(m_ui->m_sequenceCombo, activated, this, &CSequenceBatchRenderDialog::OnSequenceSelected);
+    connect(m_ui->m_fpsCombo->lineEdit(), &QLineEdit::textEdited, this, &CSequenceBatchRenderDialog::OnFPSEditChange);
+    connect(m_ui->m_fpsCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &CSequenceBatchRenderDialog::OnFPSChange);
+    connect(m_ui->m_renderList->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CSequenceBatchRenderDialog::OnRenderItemSelChange);
+    connect(m_ui->m_resolutionCombo, activated, this, &CSequenceBatchRenderDialog::OnResolutionSelected);
+    connect(m_ui->m_startFrame, editingFinished, this, &CSequenceBatchRenderDialog::OnStartFrameChange);
+    connect(m_ui->m_endFrame, editingFinished, this, &CSequenceBatchRenderDialog::OnEndFrameChange);
+    connect(m_ui->m_imageFormatCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &CSequenceBatchRenderDialog::OnImageFormatChange);
+
+    const float bigEnoughNumber = 1000000.0f;
+    m_ui->m_startFrame->setRange(0.0f, bigEnoughNumber);
+
+    m_ui->m_endFrame->setRange(0.0f, bigEnoughNumber);
+
+    // Fill the sequence combo box.
+    bool activeSequenceWasSet = false;
+    for (int k = 0; k < GetIEditor()->GetMovieSystem()->GetNumSequences(); ++k)
+    {
+        IAnimSequence* pSequence = GetIEditor()->GetMovieSystem()->GetSequence(k);
+        m_ui->m_sequenceCombo->addItem(pSequence->GetName());
+        if (pSequence->IsActivated())
+        {
+            m_ui->m_sequenceCombo->setCurrentIndex(k);
+            activeSequenceWasSet = true;
+        }
+    }
+    if (!activeSequenceWasSet)
+    {
+        m_ui->m_sequenceCombo->setCurrentIndex(0);
+    }
+
+    m_ui->m_fpsCombo->setEditable(true);
+
+    // Fill the shot combos and the default frame range.
+    OnSequenceSelected();
+
+    // Fill the resolution combo box.
+    for (int i = 0; i < arraysize(resolutions); ++i)
+    {
+        if (resolutions[i][0] == g_useActiveViewportResolution  && resolutions[i][1] == g_useActiveViewportResolution)
+        {
+            m_ui->m_resolutionCombo->addItem(tr("Active View Resolution"));
+            stashActiveViewportResolution();    // render dialog is modal, so we can stash the viewport res on init
+        }
+        else
+        {
+            m_ui->m_resolutionCombo->addItem(tr("%1 x %2").arg(resolutions[i][0]).arg(resolutions[i][1]));
+        }
+    }
+    m_ui->m_resolutionCombo->addItem(tr("Custom..."));
+    m_ui->m_resolutionCombo->setCurrentIndex(0);
+
+    // Fill the FPS combo box.
+    for (int i = 0; i < AZStd::size(fpsOptions); ++i)
+    {
+        m_ui->m_fpsCombo->addItem(fpsOptions[i].fpsDesc);
+    }
+    m_ui->m_fpsCombo->setCurrentIndex(0);
+
+    // Fill the image format combo box.
+    for (int i = 0; i < AZStd::size(imageFormatExtensions); ++i)
+    {
+        m_ui->m_imageFormatCombo->addItem(imageFormatExtensions[i]);
+    }
+    m_ui->m_imageFormatCombo->setCurrentIndex(0);
+
+    m_ui->BATCH_RENDER_FILE_PREFIX->setText("Frame");
+    m_ui->BATCH_RENDER_FILE_PREFIX->setValidator(m_prefixValidator.data());
+
+    m_ui->m_progressStatusMsg->setText("Not running");
+
+    m_ui->BATCH_RENDER_REMOVE_SEQ->setEnabled(false);
+    m_ui->m_pGoBtn->setEnabled(false);
+    m_ui->m_pGoBtn->setIcon(QPixmap(":/Trackview/clapperboard_ready.png"));
+
+    m_ui->m_progressBar->setRange(0, 100);
+
+    m_ui->BATCH_RENDER_FRAME_IN_FPS->setText(tr("In %1 FPS").arg(static_cast<int>(m_fpsForTimeToFrameConversion)));
+
+    m_bFFMPEGCommandAvailable = GetIEditor()->GetICommandManager()->IsRegistered("plugin", "ffmpeg_encode");
+    m_ffmpegPluginStatusMsg = m_bFFMPEGCommandAvailable ?
+        QString("") :
+        tr("FFMPEG plug-in isn't found(creating a video isn't supported).");
+    m_ui->BATCH_RENDER_PRESS_ESC_TO_CANCEL->setText(m_ffmpegPluginStatusMsg);
+
+    // Disable the create video checkbox if the ffmpeg command is not available
+    if (!m_bFFMPEGCommandAvailable)
+    {
+        m_ui->m_createVideoCheckBox->setChecked(false);
+        m_ui->m_createVideoCheckBox->setEnabled(false);
+    }
+
+    // Load previously saved options, if any.
+    QString defaultPresetPath = Path::GetUserSandboxFolder();
+    defaultPresetPath += defaultPresetFilename;
+    if (CFileUtil::FileExists(defaultPresetPath))
+    {
+        LoadOutputOptions(defaultPresetPath);
+    }
+
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::OnRenderItemSelChange()
+{
+    // Enable/disable the 'remove'/'update' button properly.
+    bool bNoSelection = !m_ui->m_renderList->selectionModel()->hasSelection();
+    m_ui->BATCH_RENDER_REMOVE_SEQ->setEnabled(bNoSelection ? false : true);
+    
+    CheckForEnableUpdateButton();
+
+    if (bNoSelection)
+    {
+        return;
+    }
+
+    // Apply the settings of the selected one to the dialog.
+    const SRenderItem& item = m_renderItems[m_ui->m_renderList->currentIndex().row()];
+    // sequence
+    for (int i = 0; i < m_ui->m_sequenceCombo->count(); ++i)
+    {
+        const QString sequenceName = m_ui->m_sequenceCombo->itemText(i);
+        if (sequenceName == item.pSequence->GetName())
+        {
+            m_ui->m_sequenceCombo->setCurrentIndex(i);
+            OnSequenceSelected();
+            break;
+        }
+    }
+    // director
+    for (int i = 0; i < m_ui->m_shotCombo->count(); ++i)
+    {
+        const QString directorName = m_ui->m_shotCombo->itemText(i);
+        if (directorName == item.pDirectorNode->GetName())
+        {
+            m_ui->m_shotCombo->setCurrentIndex(i);
+            break;
+        }
+    }
+    // frame range
+    m_ui->m_startFrame->setValue(item.frameRange.start * m_fpsForTimeToFrameConversion);
+    m_ui->m_endFrame->setValue(item.frameRange.end * m_fpsForTimeToFrameConversion);
+    // folder
+    m_ui->m_destinationEdit->setText(item.folder);
+    // fps
+    bool bFound = false;
+    for (int i = 0; i < arraysize(fpsOptions); ++i)
+    {
+        if (item.fps == fpsOptions[i].fps)
+        {
+            m_ui->m_fpsCombo->setCurrentIndex(i);
+            bFound = true;
+            break;
+        }
+    }
+    if (bFound == false)
+    {
+        m_customFPS = item.fps;
+        m_ui->m_fpsCombo->setCurrentText(QString::number(item.fps));
+    }
+    // prefix
+    m_ui->BATCH_RENDER_FILE_PREFIX->setText(item.prefix);
+
+    m_ui->m_disableDebugInfoCheckBox->setChecked(item.disableDebugInfo);
+
+    // create_video
+    if (m_bFFMPEGCommandAvailable)
+    {
+        m_ui->m_createVideoCheckBox->setChecked(item.bCreateVideo);
+    }
+
+    // resolution
+    bFound = false;
+    for (int i = 0; i < arraysize(resolutions); ++i)
+    {
+        if (item.resW == resolutions[i][0] && item.resH == resolutions[i][1])
+        {
+            m_ui->m_resolutionCombo->setCurrentIndex(i);
+            bFound = true;
+            break;
+        }
+    }
+    if (bFound == false)
+    {
+        int indexOfCustomRes = arraysize(resolutions);
+        const QString resText = QString::fromLatin1(customResFormat).arg(item.resW).arg(item.resH);
+        m_customResW = item.resW;
+        m_customResH = item.resH;
+        m_ui->m_resolutionCombo->removeItem(indexOfCustomRes);
+        m_ui->m_resolutionCombo->addItem(resText);
+        m_ui->m_resolutionCombo->setCurrentIndex(indexOfCustomRes);
+    }
+    // cvars
+    QString cvarsText;
+    for (size_t i = 0; i < item.cvars.size(); ++i)
+    {
+        cvarsText += item.cvars[i];
+        cvarsText += "\r\n";
+    }
+    m_ui->m_cvarsEdit->setPlainText(cvarsText);    
+}
+
+void CSequenceBatchRenderDialog::CheckForEnableUpdateButton()
+{
+    bool enable = false;
+
+    // Enable the Update button if any ui elements are changed
+    // from the currently selected render item.
+    if (m_ui->m_renderList->selectionModel()->hasSelection())
+    {
+        SRenderItem item;
+        if (SetUpNewRenderItem(item))
+        {
+            int index = m_ui->m_renderList->currentIndex().row();
+            assert(index >= 0 && index < m_renderItems.size());
+            enable = !(m_renderItems[index] == item);
+        }
+    }
+
+    m_ui->m_updateBtn->setEnabled(enable);
+}
+
+void CSequenceBatchRenderDialog::OnAddRenderItem()
+{
+    // If there is no director node, it cannot be added.
+    if (m_ui->m_shotCombo->count() == 0)
+    {
+        QMessageBox::critical(this, tr("Cannot add"), tr("No director available!"));
+        return;
+    }
+
+    // Set up a new render item.
+    SRenderItem item;
+    if (SetUpNewRenderItem(item) == false)
+    {
+        return;
+    }
+
+    // Check a duplication before adding.
+    for (size_t i = 0; i < m_renderItems.size(); ++i)
+    {
+        if (m_renderItems[i] == item)
+        {
+            QMessageBox::critical(this, tr("Cannot add"), tr("The same item already exists"));
+            return;
+        }
+    }
+
+    AddItem(item);
+}
+
+void CSequenceBatchRenderDialog::OnRemoveRenderItem()
+{
+    int index = m_ui->m_renderList->currentIndex().row();
+    assert(index != CB_ERR);
+    m_ui->m_renderList->model()->removeRow(index);
+    m_renderItems.erase(m_renderItems.begin() + index);
+
+    if (m_renderItems.empty())
+    {
+        m_ui->BATCH_RENDER_REMOVE_SEQ->setEnabled(false);
+        m_ui->m_pGoBtn->setEnabled(false);
+    }
+    else
+    {
+        m_ui->m_renderList->setCurrentIndex(m_ui->m_renderList->model()->index(0, 0));
+        OnRenderItemSelChange();
+    }
+
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::OnClearRenderItems()
+{
+    m_ui->m_renderList->model()->removeRows(0, m_ui->m_renderList->model()->rowCount());
+    m_renderItems.clear();
+
+    m_ui->BATCH_RENDER_REMOVE_SEQ->setEnabled(false);
+    m_ui->m_pGoBtn->setEnabled(false);
+
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::OnUpdateRenderItem()
+{
+    int index = m_ui->m_renderList->currentIndex().row();
+    assert(index != -1);
+
+    // Set up a new render item.
+    SRenderItem item;
+    SetUpNewRenderItem(item);
+
+    // Check a duplication before updating.
+    for (size_t i = 0; i < m_renderItems.size(); ++i)
+    {
+        if (m_renderItems[i] == item)
+        {
+            QMessageBox::critical(this, tr("Cannot update"), tr("The same item already exists!"));
+            return;
+        }
+    }
+
+    // Update the item.
+    m_renderItems[index] = item;
+
+    // Update the list box, too.
+    m_ui->m_renderList->model()->setData(m_ui->m_renderList->model()->index(index, 0), GetCaptureItemString(item));
+
+    m_ui->m_updateBtn->setEnabled(false);
+}
+
+void CSequenceBatchRenderDialog::OnLoadPreset()
+{
+    QString loadPath;
+    if (CFileUtil::SelectFile("Preset Files (*.preset)", Path::GetUserSandboxFolder(), loadPath))
+    {
+        if (LoadOutputOptions(loadPath) == false)
+        {
+            QMessageBox::critical(this, tr("Cannot load"), tr("The file version is different!"));
+        }
+    }
+}
+
+void CSequenceBatchRenderDialog::OnSavePreset()
+{
+    QString savePath;
+    if (CFileUtil::SelectSaveFile("Preset Files (*.preset)", "preset", Path::GetUserSandboxFolder(), savePath))
+    {
+        SaveOutputOptions(savePath);
+    }
+}
+
+void CSequenceBatchRenderDialog::stashActiveViewportResolution()
+{   
+    // stash active resolution in global vars
+    activeViewportWidth = resolutions[0][0];
+    activeViewportHeight = resolutions[0][1];
+    CViewport* activeViewport = GetIEditor()->GetActiveView();
+    if (activeViewport)
+    {
+        activeViewport->GetDimensions(&activeViewportWidth, &activeViewportHeight);
+    }  
+}
+
+void CSequenceBatchRenderDialog::OnGo()
+{
+    if (m_renderContext.IsInRendering())
+    {
+        OnCancelRender();
+    }
+    else
+    {
+        // Start a new batch.
+        m_ui->m_pGoBtn->setText("Cancel");
+        m_ui->m_pGoBtn->setIcon(QPixmap(":/Trackview/clapperboard_cancel.png"));
+        // Inform the movie system that it soon will be in a batch-rendering mode.
+        GetIEditor()->GetMovieSystem()->EnableBatchRenderMode(true);
+
+        // Initialize the context.
+        InitializeContext();
+
+        // Trigger the first item.
+        OnMovieEvent(IMovieListener::eMovieEvent_Stopped, NULL);
+    }
+}
+
+void CSequenceBatchRenderDialog::OnMovieEvent(IMovieListener::EMovieEvent event, IAnimSequence* pSequence)
+{
+    if (event == IMovieListener::eMovieEvent_Stopped
+        || event == IMovieListener::eMovieEvent_Aborted)
+    {
+        // Finalize the current one, if any.
+        if (pSequence)
+        {
+            EnterCaptureState(CaptureState::End);
+            m_renderContext.endingSequence = pSequence;
+            m_renderContext.canceled = (event == IMovieListener::eMovieEvent_Aborted);
+        }
+        else
+        {
+            // This is odd, but this is the condition that starts the first item capturing
+            // when the user presses the start button.
+            if (m_renderItems.size() > 0)
+            {
+                // Setup and trigger the first time
+                m_renderContext.spentTime = 0.0f;
+                m_renderContext.currentItemIndex = 0;
+                CaptureItemStart();
+            }
+        }
+    }
+}
+
+void CSequenceBatchRenderDialog::OnDone()
+{
+    if (m_renderContext.IsInRendering())
+    {
+        OnCancelRender();
+    }
+    else
+    {
+        // Save options when closed.
+        QString defaultPresetPath = Path::GetUserSandboxFolder();
+        defaultPresetPath += defaultPresetFilename;
+        SaveOutputOptions(defaultPresetPath);
+
+        reject();
+    }
+}
+
+void CSequenceBatchRenderDialog::OnSequenceSelected()
+{
+    // Get the selected sequence.
+    const QString seqName = m_ui->m_sequenceCombo->currentText();
+    IAnimSequence* pSequence = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(seqName.toUtf8().data());
+
+    // Adjust the frame range.
+    float sFrame = pSequence->GetTimeRange().start * m_fpsForTimeToFrameConversion;
+    float eFrame = pSequence->GetTimeRange().end * m_fpsForTimeToFrameConversion;
+    m_ui->m_startFrame->setRange(0.0f, eFrame);
+    m_ui->m_endFrame->setRange(0.0f, eFrame);
+
+    // Set the default start/end frames properly.
+    m_ui->m_startFrame->setValue(sFrame);
+    m_ui->m_endFrame->setValue(eFrame);
+
+    m_ui->m_shotCombo->clear();
+    // Fill the shot combo box with the names of director nodes.
+    for (int i = 0; i < pSequence->GetNodeCount(); ++i)
+    {
+        if (pSequence->GetNode(i)->GetType() == AnimNodeType::Director)
+        {
+            m_ui->m_shotCombo->addItem(pSequence->GetNode(i)->GetName());
+        }
+    }
+    m_ui->m_shotCombo->setCurrentIndex(0);
+
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::OnFPSEditChange()
+{
+    const QString fpsText = m_ui->m_fpsCombo->currentText();
+    bool ok;
+    const int fps = fpsText.toInt(&ok);
+    bool bInvalidInput = !ok || fps <= 0;
+
+    if (bInvalidInput)
+    {
+        m_ui->m_fpsCombo->setCurrentIndex(0);
+    }
+    else
+    {
+        m_customFPS = fps;
+    }
+
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::OnFPSChange(int itemIndex)
+{
+    m_customFPS = fpsOptions[itemIndex].fps;
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::OnImageFormatChange()
+{
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::OnResolutionSelected()
+{
+    int indexOfCustomRes = arraysize(resolutions);
+    if (m_ui->m_resolutionCombo->currentIndex() == indexOfCustomRes)
+    {
+        int defaultW;
+        int defaultH;
+        const QString currentCustomResText = m_ui->m_resolutionCombo->currentText();
+        GetResolutionFromCustomResText(currentCustomResText.toStdString().c_str(), defaultW, defaultH);
+        
+        CCustomResolutionDlg resDlg(defaultW, defaultH, this);
+        if (resDlg.exec() == QDialog::Accepted)
+        {
+            const int maxRes = 8192;
+            m_customResW = min(resDlg.GetWidth(), maxRes);
+            m_customResH = min(resDlg.GetHeight(), maxRes);
+            const QString resText = QString(customResFormat).arg(m_customResW).arg(m_customResH);
+            m_ui->m_resolutionCombo->setItemText(indexOfCustomRes, resText);
+            m_ui->m_resolutionCombo->setCurrentIndex(indexOfCustomRes);
+        }
+        else
+        {
+            m_ui->m_resolutionCombo->setCurrentIndex(0);
+        }
+    }
+
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::SaveOutputOptions(const QString& pathname) const
+{
+    XmlNodeRef batchRenderOptionsNode = XmlHelpers::CreateXmlNode("batchrenderoptions");
+    batchRenderOptionsNode->setAttr("version", kBatchRenderFileVersion);
+
+    // Resolution
+    XmlNodeRef resolutionNode = batchRenderOptionsNode->newChild("resolution");
+    resolutionNode->setAttr("cursel", m_ui->m_resolutionCombo->currentIndex());
+    if (m_ui->m_resolutionCombo->currentIndex() == arraysize(resolutions))
+    {
+        const QString resText = m_ui->m_resolutionCombo->currentText();
+        resolutionNode->setContent(resText.toUtf8().data());
+    }
+
+    // FPS
+    XmlNodeRef fpsNode = batchRenderOptionsNode->newChild("fps");
+    fpsNode->setAttr("cursel", m_ui->m_fpsCombo->currentIndex());
+    const QString fpsText = m_ui->m_fpsCombo->currentText();
+    if (m_ui->m_fpsCombo->currentIndex() == -1 || m_ui->m_fpsCombo->findText(fpsText) == -1)
+    {
+        fpsNode->setContent(fpsText.toUtf8().data());
+    }
+
+    // Capture options (format, buffer, prefix, create_video)
+    XmlNodeRef imageNode = batchRenderOptionsNode->newChild("image");
+    imageNode->setAttr("format", m_ui->m_imageFormatCombo->currentIndex() % arraysize(imageFormatExtensions));
+    const QString prefix = m_ui->BATCH_RENDER_FILE_PREFIX->text();
+    imageNode->setAttr("prefix", prefix.toUtf8().data());
+    bool disableDebugInfo = m_ui->m_disableDebugInfoCheckBox->isChecked();
+    imageNode->setAttr("disabledebuginfo", disableDebugInfo);
+    bool bCreateVideoOn = m_ui->m_createVideoCheckBox->isChecked();
+    imageNode->setAttr("createvideo", bCreateVideoOn);
+
+    // Custom configs
+    XmlNodeRef cvarsNode = batchRenderOptionsNode->newChild("cvars");
+    const QStringList lines = m_ui->m_cvarsEdit->toPlainText().split(QStringLiteral("\n"));
+    for (const QString& line : lines)
+    {
+        cvarsNode->newChild("cvar")->setContent(line.toUtf8().data());
+    }
+
+    // Destination
+    XmlNodeRef destinationNode = batchRenderOptionsNode->newChild("destination");
+    const QString destinationText = m_ui->m_destinationEdit->text();
+    destinationNode->setContent(destinationText.toUtf8().data());
+
+    batchRenderOptionsNode->saveToFile(pathname.toUtf8().data());
+}
+
+bool CSequenceBatchRenderDialog::GetResolutionFromCustomResText(const char* customResText, int& retCustomWidth, int& retCustomHeight) const
+{
+    // initialize to first resolution preset as default if the sscanf below doesn't scan values successfully
+    retCustomWidth = resolutions[0][0];
+    retCustomHeight = resolutions[0][1];
+
+    bool    scanSuccess   = false;
+    int     scannedWidth  = retCustomWidth;      // initialize with default fall-back values - they'll be overwritten in the case of a succesful sscanf below.
+    int     scannedHeight = retCustomHeight;
+
+    QString strFormat = QString::fromLatin1(customResFormat).replace(QRegularExpression(QStringLiteral("%\\d")), QStringLiteral("%d"));
+    scanSuccess = (azsscanf(customResText, strFormat.toStdString().c_str(), &scannedWidth, &scannedHeight) == 2);
+    if (scanSuccess)
+    {
+        retCustomWidth = scannedWidth;
+        retCustomHeight = scannedHeight;
+    }
+    return scanSuccess;
+}
+
+bool CSequenceBatchRenderDialog::LoadOutputOptions(const QString& pathname)
+{
+    XmlNodeRef batchRenderOptionsNode = XmlHelpers::LoadXmlFromFile(pathname.toStdString().c_str());
+    if (batchRenderOptionsNode == NULL)
+    {
+        return true;
+    }
+    int version = 0;
+    batchRenderOptionsNode->getAttr("version", version);
+    if (version != kBatchRenderFileVersion)
+    {
+        return false;
+    }
+
+    // Resolution
+    XmlNodeRef resolutionNode = batchRenderOptionsNode->findChild("resolution");
+    if (resolutionNode)
+    {
+        int curSel = CB_ERR;
+        resolutionNode->getAttr("cursel", curSel);
+        if (curSel == arraysize(resolutions))
+        {
+            const QString customResText = resolutionNode->getContent();
+            m_ui->m_resolutionCombo->setItemText(curSel, customResText);
+            
+            GetResolutionFromCustomResText(customResText.toStdString().c_str(), m_customResW, m_customResH);
+        }
+        m_ui->m_resolutionCombo->setCurrentIndex(curSel);
+    }
+
+    // FPS
+    XmlNodeRef fpsNode = batchRenderOptionsNode->findChild("fps");
+    if (fpsNode)
+    {
+        int curSel = -1;
+        fpsNode->getAttr("cursel", curSel);
+        if (curSel == -1)
+        {
+            m_ui->m_fpsCombo->setCurrentIndex(-1);
+            m_ui->m_fpsCombo->setCurrentText(fpsNode->getContent());
+            m_customFPS = QString::fromLatin1(fpsNode->getContent()).toInt();
+        }
+        else
+        {
+            m_ui->m_fpsCombo->setCurrentIndex(curSel);
+        }
+    }
+
+    // Capture options (format, buffer, prefix, create_video)
+    XmlNodeRef imageNode = batchRenderOptionsNode->findChild("image");
+    if (imageNode)
+    {
+        int curSel = CB_ERR;
+        imageNode->getAttr("format", curSel);
+        m_ui->m_imageFormatCombo->setCurrentIndex(curSel);
+        curSel = CB_ERR;
+        m_ui->BATCH_RENDER_FILE_PREFIX->setText(imageNode->getAttr("prefix"));
+        bool disableDebugInfo = false;
+        imageNode->getAttr("disabledebuginfo", disableDebugInfo);
+        m_ui->m_disableDebugInfoCheckBox->setChecked(disableDebugInfo);
+        if (m_bFFMPEGCommandAvailable)
+        {
+            bool bCreateVideoOn = false;
+            imageNode->getAttr("createvideo", bCreateVideoOn);
+            m_ui->m_createVideoCheckBox->setChecked(bCreateVideoOn);
+        }
+    }
+
+    // Custom configs
+    XmlNodeRef cvarsNode = batchRenderOptionsNode->findChild("cvars");
+    if (cvarsNode)
+    {
+        QString cvarsText;
+        for (int i = 0; i < cvarsNode->getChildCount(); ++i)
+        {
+            cvarsText += cvarsNode->getChild(i)->getContent();
+            if (i < cvarsNode->getChildCount() - 1)
+            {
+                cvarsText += QStringLiteral("\r\n");
+            }
+        }
+        m_ui->m_cvarsEdit->setPlainText(cvarsText);
+    }
+
+    // Destination
+    XmlNodeRef destinationNode = batchRenderOptionsNode->findChild("destination");
+    if (destinationNode)
+    {
+        m_ui->m_destinationEdit->setText(destinationNode->getContent());
+    }
+
+    return true;
+}
+
+void CSequenceBatchRenderDialog::OnStartFrameChange()
+{
+    if (m_ui->m_startFrame->value() >= m_ui->m_endFrame->value())
+    {
+        m_ui->m_endFrame->setValue(m_ui->m_startFrame->value() + 1);
+    }
+
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::OnEndFrameChange()
+{
+    if (m_ui->m_startFrame->value() >= m_ui->m_endFrame->value())
+    {
+        m_ui->m_startFrame->setValue(m_ui->m_endFrame->value() - 1);
+    }
+
+    CheckForEnableUpdateButton();
+}
+
+void CSequenceBatchRenderDialog::InitializeContext()
+{
+    m_renderContext.currentItemIndex = 0;
+    m_renderContext.spentTime = 0;
+    m_renderContext.expectedTotalTime = 0;
+    for (size_t i = 0; i < m_renderItems.size(); ++i)
+    {
+        Range rng = m_renderItems[i].frameRange;
+        m_renderContext.expectedTotalTime += rng.end - rng.start;
+    }
+    m_renderContext.captureOptions.once = false;
+
+    m_ui->BATCH_RENDER_PRESS_ESC_TO_CANCEL->setText(tr("Press ESC to cancel"));
+}
+
+void CSequenceBatchRenderDialog::CaptureItemStart()
+{
+    // Disable most of the UI in group chunks.
+    // (Leave the start/cancel button and feedback elements).
+    m_ui->BATCH_RENDER_LIST_GROUP_BOX->setEnabled(false);
+    m_ui->BATCH_RENDER_INPUT_GROUP_BOX->setEnabled(false);
+    m_ui->BATCH_RENDER_OUTPUT_GROUP_BOX->setEnabled(false);
+
+    m_renderContext.canceled = false;
+
+    CV_TrackViewRenderOutputCapturing = 1;
+
+    SRenderItem renderItem = m_renderItems[m_renderContext.currentItemIndex];
+    IAnimSequence* nextSequence = renderItem.pSequence;
+    // Initialize the next one for the batch rendering.
+    // Set the active shot.
+    m_renderContext.pActiveDirectorBU = nextSequence->GetActiveDirector();
+    nextSequence->SetActiveDirector(renderItem.pDirectorNode);
+
+    // Back up flags and range of the sequence.
+    m_renderContext.flagBU = nextSequence->GetFlags();
+    m_renderContext.rangeBU = nextSequence->GetTimeRange();
+
+    // Change flags and range of the sequence so that it automatically starts
+    // once the game mode kicks in with the specified range.
+    nextSequence->SetFlags(m_renderContext.flagBU | IAnimSequence::eSeqFlags_PlayOnReset);
+
+    m_renderContext.captureOptions.timeStep = 1.0f / renderItem.fps;
+
+    Range newRange = renderItem.frameRange;
+    newRange.start -= m_renderContext.captureOptions.timeStep;
+    renderItem.pSequence->SetTimeRange(newRange);
+
+    // Set up the custom config cvars for this item.
+    for (size_t i = 0; i < renderItem.cvars.size(); ++i)
+    {
+        GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(renderItem.cvars[i].toUtf8().data());
+    }
+
+    // Set specific capture options for this item.
+    m_renderContext.captureOptions.prefix = renderItem.prefix.toUtf8().data();
+
+    Range rng = nextSequence->GetTimeRange();
+    m_renderContext.captureOptions.duration = rng.end - rng.start;
+    QString folder = renderItem.folder;
+    QString itemText = m_ui->m_renderList->model()->index(m_renderContext.currentItemIndex, 0).data().toString();
+    itemText.replace('/', '-'); // A full sequence name can have slash characters which aren't suitable for a file name.
+    folder += "/";
+    folder += itemText;
+
+    // If this is a relative path, prepend the @assets@ folder to match where the Renderer is going
+    // to dump the frame buffer image captures.
+    if (AzFramework::StringFunc::Path::IsRelative(folder.toUtf8().data()))
+    {
+        AZStd::string absolutePath;
+        AZStd::string assetsRoot = AZ::IO::FileIOBase::GetInstance()->GetAlias("@assets@");
+        AzFramework::StringFunc::Path::Join(assetsRoot.c_str(), folder.toUtf8().data(), absolutePath);
+        folder = absolutePath.c_str();
+    }
+
+    QString finalFolder = folder;
+    int i = 2;
+    while (QFileInfo::exists(finalFolder))
+    {
+        finalFolder = folder;
+        const QString suffix = QString::fromLatin1("_v%1").arg(i);
+        finalFolder += suffix;
+        ++i;
+    }
+
+    // create a new folder before writing any files
+    QDir().mkdir(finalFolder);
+
+    m_renderContext.captureOptions.folder = finalFolder.toUtf8().data();
+
+    // Change the resolution.
+    const int renderWidth = getResWidth(renderItem.resW);
+    const int renderHeight = getResHeight(renderItem.resH);
+    ICVar* pCVarCustomResWidth = gEnv->pConsole->GetCVar("r_CustomResWidth");
+    ICVar* pCVarCustomResHeight = gEnv->pConsole->GetCVar("r_CustomResHeight");
+    if (pCVarCustomResWidth && pCVarCustomResHeight)
+    {
+        // If available, use the custom resolution cvars.
+        m_renderContext.cvarCustomResWidthBU = pCVarCustomResWidth->GetIVal();
+        m_renderContext.cvarCustomResHeightBU = pCVarCustomResHeight->GetIVal();
+        pCVarCustomResWidth->Set(renderWidth);
+        pCVarCustomResHeight->Set(renderHeight);
+    }
+    else
+    {
+        // Otherwise, try to adjust the viewport resolution accordingly.
+        if (CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView())
+        {
+            viewPane->ResizeViewport(renderWidth, renderHeight);
+        }
+    }
+
+    // turn off debug info if requested
+    ICVar* cvarDebugInfo = gEnv->pConsole->GetCVar("r_DisplayInfo");
+    if (cvarDebugInfo)
+    {
+        // cache the current value to restore during OnCaptureItemEnd()
+        m_renderContext.cvarDisplayInfoBU = cvarDebugInfo->GetIVal();
+        if (renderItem.disableDebugInfo && cvarDebugInfo->GetIVal())
+        {
+            const int DISPLAY_INFO_OFF = 0;         
+            cvarDebugInfo->Set(DISPLAY_INFO_OFF);
+        }
+    }
+
+    // create a new atom pipeline to capture the frames of the current sequence
+    m_atomOutputFrameCapture.CreatePipeline(
+        *TrackView::SceneFromGameEntityContext(), "TrackViewSequencePipeline", renderItem.resW, renderItem.resH);
+    UpdateAtomOutputFrameCaptureView(m_atomOutputFrameCapture, renderItem.resW, renderItem.resH);
+
+    GetIEditor()->GetMovieSystem()->EnableFixedStepForCapture(m_renderContext.captureOptions.timeStep);
+
+    // The capturing doesn't actually start here. It just flags the warming-up and
+    // once it's done, then the capturing really begins.
+    // The warming-up is necessary to settle down some post-fxs after the resolution change.
+    EnterCaptureState(CaptureState::WarmingUpAfterResChange);
+
+    m_renderTimer.start();
+}
+
+void CSequenceBatchRenderDialog::OnUpdateWarmingUpAfterResChange()
+{
+    UpdateSpinnerProgressMessage("Warming up");
+
+    // Spend 30 frames warming up after frame buffer resolution change
+    if (m_renderContext.framesSpentInCurrentPhase++ >= 30)
+    {
+        // We will handle the idle tick manually now because calling Game Update directly.
+        SetEnableEditorIdleProcessing(false);
+
+        GetIEditor()->SetInGameMode(true);
+
+        EnterCaptureState(CaptureState::EnteringGameMode);
+    }
+}
+
+void CSequenceBatchRenderDialog::OnUpdateEnteringGameMode()
+{
+    UpdateSpinnerProgressMessage("Entering game mode");
+
+    GetIEditor()->GetGameEngine()->Update();
+
+    // Pause the movie player on the first frame
+    if (m_renderContext.framesSpentInCurrentPhase++ == 0)
+    {
+        GetIEditor()->GetMovieSystem()->Pause();
+    }
+    // Spend 30 frames warming up after changing to game mode.
+    else if (m_renderContext.framesSpentInCurrentPhase++ > 30)
+    {
+        EnterCaptureState(CaptureState::BeginPlayingSequence);
+    }
+}
+
+void CSequenceBatchRenderDialog::OnUpdateBeginPlayingSequence()
+{
+    UpdateSpinnerProgressMessage("Begin Playing Sequence");
+
+    SRenderItem renderItem = m_renderItems[m_renderContext.currentItemIndex];
+
+    GetIEditor()->GetMovieSystem()->AddMovieListener(renderItem.pSequence, this);
+
+    GetIEditor()->GetMovieSystem()->Resume();
+
+    // Set the time range for this render, back it up 1 frame so the capture will start
+    // exactly on the first frame.
+    Range newRange = renderItem.frameRange;
+    newRange.start -= m_renderContext.captureOptions.timeStep;
+    renderItem.pSequence->SetTimeRange(newRange);
+
+    // Start the sequence playing
+    GetIEditor()->GetMovieSystem()->SetPlayingTime(renderItem.pSequence, newRange.start);
+
+    EnterCaptureState(CaptureState::Capturing);
+}
+
+void CSequenceBatchRenderDialog::OnUpdateCapturing()
+{
+    // Make sure we are still in game mode if we are capturing, so we can never
+    // get soft locked if we somehow leave game mode without this module knowing about it.
+    if (!GetIEditor()->IsInGameMode())
+    {
+        m_renderContext.endingSequence = m_renderItems[m_renderContext.currentItemIndex].pSequence;
+        m_renderContext.canceled = true;
+        EnterCaptureState(CaptureState::End);
+        return;
+    }
+
+    // Progress bar
+    IAnimSequence* pCurSeq = m_renderItems[m_renderContext.currentItemIndex].pSequence;
+    Range rng = pCurSeq->GetTimeRange();
+    float elapsedTime = GetIEditor()->GetMovieSystem()->GetPlayingTime(pCurSeq) - rng.start;
+    int percentage
+        = int(100.0f * (m_renderContext.spentTime + elapsedTime) / m_renderContext.expectedTotalTime);
+    m_ui->m_progressBar->setValue(percentage);
+
+    // Progress message
+    const QString itemText = m_ui->m_renderList->model()->index(m_renderContext.currentItemIndex, 0).data().toString();
+    const QString msg = tr("Rendering '%1'...(%2%)").arg(itemText).arg(static_cast<int>(100.0f * elapsedTime / (rng.end - rng.start)));
+    UpdateSpinnerProgressMessage(msg.toLatin1().data());
+
+    m_renderContext.framesSpentInCurrentPhase++;
+}
+
+void CSequenceBatchRenderDialog::OnUpdateEnd(IAnimSequence* sequence)
+{
+    GetIEditor()->GetMovieSystem()->DisableFixedStepForCapture();
+
+    GetIEditor()->GetMovieSystem()->RemoveMovieListener(sequence, this);
+    GetIEditor()->SetInGameMode(false);
+    GetIEditor()->GetGameEngine()->Update();        // Update is needed because SetInGameMode() queues game mode, Update() executes it.
+
+    ICVar* pCVarCustomResWidth = gEnv->pConsole->GetCVar("r_CustomResWidth");
+    ICVar* pCVarCustomResHeight = gEnv->pConsole->GetCVar("r_CustomResHeight");
+    if (pCVarCustomResWidth && pCVarCustomResHeight)
+    {
+        // Restore the custom resolution cvars.
+        pCVarCustomResWidth->Set(m_renderContext.cvarCustomResWidthBU);
+        pCVarCustomResHeight->Set(m_renderContext.cvarCustomResHeightBU);
+    }
+
+    // Restore display debug info
+    ICVar* cvarDebugInfo = gEnv->pConsole->GetCVar("r_DisplayInfo");
+    if (cvarDebugInfo)
+    {
+        cvarDebugInfo->Set(m_renderContext.cvarDisplayInfoBU);
+    }
+
+    // Restore flags, range and the active director of the sequence.
+    sequence->SetFlags(m_renderContext.flagBU);
+    sequence->SetTimeRange(m_renderContext.rangeBU);
+    sequence->SetActiveDirector(m_renderContext.pActiveDirectorBU);
+
+    const auto imageFormat = m_ui->m_imageFormatCombo->currentText();
+    
+    SRenderItem renderItem = m_renderItems[m_renderContext.currentItemIndex];
+    if (m_bFFMPEGCommandAvailable && renderItem.bCreateVideo)
+    {
+        // Create a video using the ffmpeg plug-in from captured images.
+        m_renderContext.processingFFMPEG = true;
+       
+        AZStd::string outputFolder = m_renderContext.captureOptions.folder;
+        auto future = QtConcurrent::run(
+            [renderItem, outputFolder, imageFormat]
+        {
+            AZStd::string outputFile;
+            AzFramework::StringFunc::Path::Join(outputFolder.c_str(), renderItem.prefix.toUtf8().data(), outputFile);
+
+            QString inputFile = outputFile.c_str();
+            outputFile += ".mp4";
+
+            // Use a placeholder for the input file, will expand it with replace.
+            QString inputFileDefine = "__input_file__";
+
+            QString command = QStringLiteral("plugin.ffmpeg_encode '%1' '%2' '%3' %4 %5 '-vf crop=%6:%7:0:0'")
+                .arg(inputFileDefine).arg(outputFile.c_str()).arg("mpeg4")
+                .arg(10240).arg(renderItem.fps).arg(getResWidth(renderItem.resW)).arg(getResHeight(renderItem.resH));
+
+            // Create the input file string, leave the %06d unexpanded for the mpeg tool.
+            inputFile += "%06d.";
+            inputFile += imageFormat;
+
+            // Replace the input file
+            command = command.replace(inputFileDefine, inputFile);
+
+            // Run the command
+            GetIEditor()->ExecuteCommand(command);
+        });
+
+        // Use a watcher to set a flag when the mpeg processing is complete.
+        connect(&m_renderContext.processingFFMPEGWatcher, &QFutureWatcher<void>::finished, this, [this]()
+        {
+            m_renderContext.processingFFMPEG = false;
+        });
+        m_renderContext.processingFFMPEGWatcher.setFuture(future);
+
+        EnterCaptureState(CaptureState::FFMPEGProcessing);
+    }
+    else
+    {
+        EnterCaptureState(CaptureState::Finalize);
+    }
+}
+
+void CSequenceBatchRenderDialog::OnUpdateFFMPEGProcessing()
+{
+    UpdateSpinnerProgressMessage("FFMPEG processing");
+
+    if (!m_renderContext.processingFFMPEG)
+    {
+        EnterCaptureState(CaptureState::Finalize);
+    }
+}
+
+void CSequenceBatchRenderDialog::OnUpdateFinalize()
+{
+    SetEnableEditorIdleProcessing(true);
+    m_renderTimer.stop();
+
+    // Turn disabled UI elements back on
+    m_ui->BATCH_RENDER_LIST_GROUP_BOX->setEnabled(true);
+    m_ui->BATCH_RENDER_INPUT_GROUP_BOX->setEnabled(true);
+    m_ui->BATCH_RENDER_OUTPUT_GROUP_BOX->setEnabled(true);
+
+    m_renderContext.frameNumber = 0;
+    m_renderContext.capturingFrame = false;
+
+    m_atomOutputFrameCapture.DestroyPipeline(*TrackView::SceneFromGameEntityContext());
+
+    // Check to see if there is more items to process
+    bool done = m_renderContext.currentItemIndex == m_renderItems.size() - 1;
+    if (done)
+    {
+        // Update end the batch message
+        if (m_renderContext.canceled)
+        {
+            m_ui->m_progressBar->setValue(0);
+            m_ui->m_progressStatusMsg->setText(tr("Rendering canceled"));
+        }
+        else
+        {
+            m_ui->m_progressBar->setValue(100);
+            m_ui->m_progressStatusMsg->setText(tr("Rendering finished"));
+        }
+
+        m_ui->m_pGoBtn->setText(tr("Start"));
+        m_ui->m_pGoBtn->setIcon(QPixmap(":/Trackview/clapperboard_ready.png"));
+        GetIEditor()->GetMovieSystem()->EnableBatchRenderMode(false);
+        m_renderContext.currentItemIndex = -1;
+        m_ui->BATCH_RENDER_PRESS_ESC_TO_CANCEL->setText(m_ffmpegPluginStatusMsg);
+
+        CV_TrackViewRenderOutputCapturing = 0;
+
+        EnterCaptureState(CaptureState::Idle);
+    }
+    else
+    {
+        // Update the context.
+        m_renderContext.spentTime += m_renderContext.captureOptions.duration;
+        ++m_renderContext.currentItemIndex;
+
+        // Trigger the next item.
+        CaptureItemStart();
+    }
+}
+
+void CSequenceBatchRenderDialog::OnKickIdleTimout()
+{
+    OnKickIdle();
+    if (m_renderContext.IsInRendering())
+    {
+        m_renderTimer.start();
+    }
+    else
+    {
+        // All done with our custom OnKickIdle, restore editor idle.
+        SetEnableEditorIdleProcessing(true);
+    }
+}
+
+void CSequenceBatchRenderDialog::OnKickIdle()
+{    
+    if (m_renderContext.captureState == CaptureState::WarmingUpAfterResChange)
+    {
+        OnUpdateWarmingUpAfterResChange();
+    }
+    else if (m_renderContext.captureState == CaptureState::EnteringGameMode)
+    {
+        OnUpdateEnteringGameMode();
+    }
+    else if (m_renderContext.captureState == CaptureState::BeginPlayingSequence)
+    {
+        OnUpdateBeginPlayingSequence();
+    }
+    else if (m_renderContext.captureState == CaptureState::Capturing)
+    {
+        OnUpdateCapturing();
+    }    
+    else if (m_renderContext.captureState == CaptureState::End)
+    {
+        OnUpdateEnd(m_renderContext.endingSequence);
+        m_renderContext.endingSequence = nullptr;
+    }
+    else if (m_renderContext.captureState == CaptureState::FFMPEGProcessing)
+    {
+        OnUpdateFFMPEGProcessing();
+    }
+    else if (m_renderContext.captureState == CaptureState::Finalize)
+    {
+        OnUpdateFinalize();
+    }
+    else
+    {
+        if (!m_renderContext.IsInRendering())
+        {
+            CheckForEnableUpdateButton();
+        }
+    }
+
+    if (GetIEditor()->IsInGameMode())
+    {
+        // note: the internal state may change by calling GetGameEngine()->Update() so
+        // we must not cache this value
+        const auto capturing = [this]
+        {
+            return m_renderContext.captureState == CaptureState::Capturing
+                // this lags behind by one frame since we are capturing the back buffer,
+                // so don't bother enabling the capture on the first frame.
+                && m_renderContext.framesSpentInCurrentPhase != 0;
+        };
+
+        // if we're currently trying to capture and aren't waiting for a frame
+        // capture to complete, it's possible to start the next capture
+        const auto canBeginFrameCapture = [capturing, this]
+        {
+            return capturing() && !m_renderContext.capturingFrame;
+        };
+
+        if (canBeginFrameCapture())
+        {
+            // update the time so the frame number can be calculated in StartCapture()
+            IAnimSequence* sequence = m_renderItems[m_renderContext.currentItemIndex].pSequence;
+            m_renderContext.captureOptions.time = GetIEditor()->GetMovieSystem()->GetPlayingTime(sequence);
+
+            GetIEditor()->GetMovieSystem()->StartCapture(m_renderContext.captureOptions, ++m_renderContext.frameNumber);
+            GetIEditor()->GetMovieSystem()->ControlCapture();
+        }
+
+        // if we're not capturing or we're not currently waiting for the current frame to finish
+        // being captured, it's safe to move to the next step of the main update
+        if (!capturing() || !m_renderContext.capturingFrame)
+        {
+            const auto& renderItem = m_renderItems[m_renderContext.currentItemIndex];
+            // update the view given the current camera transform and projection
+            UpdateAtomOutputFrameCaptureView(m_atomOutputFrameCapture, renderItem.resW, renderItem.resH);
+            GetIEditor()->GetGameEngine()->Update(); // step update (original frame capture)
+        }
+
+        if (canBeginFrameCapture())
+        {
+            const AZStd::string fileName = AZStd::string::format("Frame_%06d", m_renderContext.frameNumber);
+
+            AZStd::string filePath;
+            AzFramework::StringFunc::Path::Join(
+                m_renderContext.captureOptions.folder.c_str(), fileName.c_str(), filePath, /*caseInsensitive=*/true,
+                /*normalize=*/false);
+
+            // track view callback after each frame is captured
+            const auto captureFinishedCallback = [this]() {
+                m_renderContext.capturingFrame = false;
+                GetIEditor()->GetMovieSystem()->EndCapture();
+                GetIEditor()->GetMovieSystem()->ControlCapture();
+            };
+
+            const auto imageFormatExtension = m_ui->m_imageFormatCombo->currentText();
+            // readback result callback (how the image should be captured)
+            // currently only .dds and .ppm
+            const auto readbackCallback = [filePath,
+                                           imageFormatExtension](const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult) {
+                const auto imageFormatExtensionUtf8 = imageFormatExtension.toUtf8();
+                const auto imageFormatExtensionCstr = imageFormatExtensionUtf8.constData();
+
+                const AZStd::string fileName = AZStd::string::format("%s.%s", filePath.c_str(), imageFormatExtensionCstr);
+                if (AZ::StringFunc::Equal(imageFormatExtensionCstr, "dds"))
+                {
+                    if (const AZ::Render::FrameCaptureOutputResult result = AZ::Render::DdsFrameCaptureOutput(fileName, readbackResult);
+                        result.m_errorMessage.has_value())
+                    {
+                        AZ_Printf("TrackView", "Dds frame capture failed: %s", result.m_errorMessage.value().c_str());
+                    }
+                }
+                else if (AZ::StringFunc::Equal(imageFormatExtensionCstr, "ppm"))
+                {
+                    if (const AZ::Render::FrameCaptureOutputResult result = AZ::Render::PpmFrameCaptureOutput(fileName, readbackResult);
+                        result.m_errorMessage.has_value())
+                    {
+                        AZ_Printf("TrackView", "Ppm frame capture failed: %s", result.m_errorMessage.value().c_str());
+                    }
+                }
+                else
+                {
+                    AZ_Printf("TrackView", "Image format .%s not supported", imageFormatExtensionCstr);
+                }
+            };
+
+            m_renderContext.capturingFrame = m_atomOutputFrameCapture.BeginCapture(readbackCallback, captureFinishedCallback);
+        }
+    }
+    else
+    {
+        // Post events, this will cause an Update tick.
+        qApp->sendPostedEvents();
+    }
+}
+
+void CSequenceBatchRenderDialog::OnCancelRender()
+{
+    if (m_renderContext.captureState == CaptureState::Capturing)
+    {
+        // In the capturing state, abort the sequence, OnMovieEvent with an abort will fire and cause
+        // the transition to CaptureState::End.
+        GetIEditor()->GetMovieSystem()->AbortSequence(m_renderItems[m_renderContext.currentItemIndex].pSequence);
+    }
+    else if (m_renderContext.captureState == CaptureState::EnteringGameMode)
+    {
+        // In the EnteringGameMode state, the movie sequences hasn't started yet, so we can't count on an
+        // OnMovieEvent event to end the capture early. So transition into the End state manually.
+        m_renderContext.endingSequence = m_renderItems[m_renderContext.currentItemIndex].pSequence;
+        m_renderContext.canceled = true;
+        EnterCaptureState(CaptureState::End);
+    }
+}
+
+void CSequenceBatchRenderDialog::OnLoadBatch()
+{
+    QString loadPath;
+    if (CFileUtil::SelectFile("Render Batch Files (*.batch)",
+            Path::GetUserSandboxFolder(), loadPath))
+    {
+        XmlNodeRef batchRenderListNode = XmlHelpers::LoadXmlFromFile(loadPath.toStdString().c_str());
+        if (batchRenderListNode == NULL)
+        {
+            return;
+        }
+        int version = 0;
+        batchRenderListNode->getAttr("version", version);
+        if (version != kBatchRenderFileVersion)
+        {
+            QMessageBox::critical(this, tr("Cannot load"), tr("The file version is different!"));
+            return;
+        }
+
+        OnClearRenderItems();
+
+        for (int i = 0; i < batchRenderListNode->getChildCount(); ++i)
+        {
+            // Get an item.
+            SRenderItem item;
+            XmlNodeRef itemNode = batchRenderListNode->getChild(i);
+
+            // sequence
+            const QString seqName = itemNode->getAttr("sequence");
+            item.pSequence = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(seqName.toUtf8().data());
+            if (item.pSequence == NULL)
+            {
+                QMessageBox::warning(this, tr("Sequence not found"), tr("A sequence of '%1' not found! This'll be skipped.").arg(seqName));
+                continue;
+            }
+
+            // director node
+            const QString directorName = itemNode->getAttr("director");
+            for (int k = 0; k < item.pSequence->GetNodeCount(); ++k)
+            {
+                IAnimNode* pNode = item.pSequence->GetNode(k);
+                if (pNode->GetType() == AnimNodeType::Director && directorName == pNode->GetName())
+                {
+                    item.pDirectorNode = pNode;
+                    break;
+                }
+            }
+            if (item.pDirectorNode == NULL)
+            {
+                QMessageBox::warning(this, tr("Director node not found"), tr("A director node of '%1' not found in the sequence of '%2'! This'll be skipped.").arg(directorName).arg(seqName));
+                continue;
+            }
+
+            // frame range
+            itemNode->getAttr("startframe", item.frameRange.start);
+            itemNode->getAttr("endframe", item.frameRange.end);
+
+            // resolution
+            itemNode->getAttr("width", item.resW);
+            itemNode->getAttr("height", item.resH);
+
+            // fps
+            itemNode->getAttr("fps", item.fps);
+
+            // prefix
+            item.prefix = itemNode->getAttr("prefix");
+
+            // create_video
+            itemNode->getAttr("createvideo", item.bCreateVideo);
+
+            // folder
+            item.folder = itemNode->getAttr("folder");
+
+            // cvars
+            for (int k = 0; k < itemNode->getChildCount(); ++k)
+            {
+                const QString cvar = itemNode->getChild(k)->getContent();
+                item.cvars.push_back(cvar);
+            }
+
+            AddItem(item);
+        }
+    }
+}
+
+void CSequenceBatchRenderDialog::OnSaveBatch()
+{
+    QString savePath;
+    if (CFileUtil::SelectSaveFile("Render Batch Files (*.batch)", "batch",
+            Path::GetUserSandboxFolder(), savePath))
+    {
+        XmlNodeRef batchRenderListNode = XmlHelpers::CreateXmlNode("batchrenderlist");
+        batchRenderListNode->setAttr("version", kBatchRenderFileVersion);
+
+        for (size_t i = 0; i < m_renderItems.size(); ++i)
+        {
+            const SRenderItem& item = m_renderItems[i];
+            XmlNodeRef itemNode = batchRenderListNode->newChild("item");
+
+            // sequence
+            itemNode->setAttr("sequence", item.pSequence->GetName());
+
+            // director node
+            itemNode->setAttr("director", item.pDirectorNode->GetName());
+
+            // frame range
+            itemNode->setAttr("startframe", item.frameRange.start);
+            itemNode->setAttr("endframe", item.frameRange.end);
+
+            // resolution
+            itemNode->setAttr("width", item.resW);
+            itemNode->setAttr("height", item.resH);
+
+            // fps
+            itemNode->setAttr("fps", item.fps);
+
+            // prefix
+            itemNode->setAttr("prefix", item.prefix.toUtf8().data());
+
+            // create_video
+            itemNode->setAttr("createvideo", item.bCreateVideo);
+
+            // folder
+            itemNode->setAttr("folder", item.folder.toUtf8().data());
+
+            // cvars
+            for (size_t k = 0; k < item.cvars.size(); ++k)
+            {
+                itemNode->newChild("cvar")->setContent(item.cvars[k].toUtf8().data());
+            }
+        }
+
+        XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), batchRenderListNode, savePath.toStdString().c_str());
+    }
+}
+
+bool CSequenceBatchRenderDialog::SetUpNewRenderItem(SRenderItem& item)
+{
+    const QString seqName = m_ui->m_sequenceCombo->currentText();
+    const QString shotName = m_ui->m_shotCombo->currentText();
+    // folder
+    item.folder = m_ui->m_destinationEdit->text();
+    if (item.folder.isEmpty())
+    {
+        QMessageBox::critical(this, tr("Cannot add"), tr("The output folder should be specified!"));
+        return false;
+    }
+    // sequence
+    item.pSequence = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(seqName.toUtf8().data());
+    assert(item.pSequence);
+    // director
+    for (int i = 0; i < item.pSequence->GetNodeCount(); ++i)
+    {
+        IAnimNode* pNode = item.pSequence->GetNode(i);
+        if (pNode->GetType() == AnimNodeType::Director && shotName == pNode->GetName())
+        {
+            item.pDirectorNode = pNode;
+            break;
+        }
+    }
+    if (item.pDirectorNode == NULL)
+    {
+        return false;
+    }
+    // frame range
+    item.frameRange = Range(m_ui->m_startFrame->value() / m_fpsForTimeToFrameConversion,
+            m_ui->m_endFrame->value() / m_fpsForTimeToFrameConversion);
+    // fps
+    if (m_ui->m_fpsCombo->currentIndex() == -1 || m_ui->m_fpsCombo->currentText() != fpsOptions[m_ui->m_fpsCombo->currentIndex()].fpsDesc)
+    {
+        item.fps = m_customFPS;
+    }
+    else
+    {
+        item.fps = fpsOptions[m_ui->m_fpsCombo->currentIndex()].fps;
+    }
+    // prefix
+    item.prefix = m_ui->BATCH_RENDER_FILE_PREFIX->text();
+    // disable debug info
+    item.disableDebugInfo = m_ui->m_disableDebugInfoCheckBox->isChecked();
+    // create_video
+    item.bCreateVideo = m_ui->m_createVideoCheckBox->isChecked();
+    // resolution
+    int curResSel = m_ui->m_resolutionCombo->currentIndex();
+    if (curResSel < arraysize(resolutions))
+    {
+        item.resW = resolutions[curResSel][0];
+        item.resH = resolutions[curResSel][1];
+    }
+    else
+    {
+        item.resW = m_customResW;
+        item.resH = m_customResH;
+    }
+    // cvars
+    const int kCVarNameMaxSize = 256;
+    char buf[kCVarNameMaxSize];
+    buf[kCVarNameMaxSize - 1] = 0;
+    const QStringList lines = m_ui->m_cvarsEdit->toPlainText().split('\n');
+    for (const QString& line : lines)
+    {
+        if (!line.isEmpty())
+        {
+            item.cvars.push_back(line);
+        }
+    }
+
+    return true;
+}
+
+void CSequenceBatchRenderDialog::AddItem(const SRenderItem& item)
+{
+    // Add the item.
+    m_renderItems.push_back(item);
+
+    // Add it to the list box, too.
+    m_renderListModel->setStringList(m_renderListModel->stringList() << GetCaptureItemString(item));
+
+    m_ui->m_pGoBtn->setEnabled(true);
+}
+
+QString CSequenceBatchRenderDialog::GetCaptureItemString(const SRenderItem& item) const
+{
+    return QString::fromLatin1("%1_%2_%3-%4(%5x%6,%7)%8").arg(item.pSequence->GetName())
+               .arg(item.pDirectorNode->GetName())
+               .arg(int(item.frameRange.start * m_fpsForTimeToFrameConversion))
+               .arg(int(item.frameRange.end * m_fpsForTimeToFrameConversion))
+               .arg(getResWidth(item.resW)).arg(getResHeight(item.resH)).arg(item.fps)
+               .arg(item.bCreateVideo ? "[v]" : "");
+}
+
+void CSequenceBatchRenderDialog::UpdateSpinnerProgressMessage(const char* description)
+{
+    static int count = 0;
+    const char* rotatingCursor[] = { "|", "/", "-", "\\" };
+    const QString msg = tr("%1 %2").arg(description).arg(rotatingCursor[(count++) % arraysize(rotatingCursor)]);
+    m_ui->m_progressStatusMsg->setText(msg);
+    GetIEditor()->Notify(eNotify_OnIdleUpdate);
+}
+
+void CSequenceBatchRenderDialog::EnterCaptureState(CaptureState captureState)
+{
+    m_renderContext.captureState = captureState;
+    m_renderContext.framesSpentInCurrentPhase = 0;
+}
+
+void CSequenceBatchRenderDialog::SetEnableEditorIdleProcessing(bool enabled)
+{
+    if (enabled && !m_editorIdleProcessingEnabled)
+    {
+        EditorIdleProcessingBus::Broadcast(&EditorIdleProcessing::EnableIdleProcessing);
+        m_editorIdleProcessingEnabled = true;
+    }
+
+    if (!enabled && m_editorIdleProcessingEnabled)
+    {
+        EditorIdleProcessingBus::Broadcast(&EditorIdleProcessing::DisableIdleProcessing);
+        m_editorIdleProcessingEnabled = false;
+    }
+}
+
diff --git a/Code/Editor/TrackView/SequenceBatchRenderDialog.h b/Code/Editor/TrackView/SequenceBatchRenderDialog.h
new file mode 100644
index 0000000000..4ad0e75b3c
--- /dev/null
+++ b/Code/Editor/TrackView/SequenceBatchRenderDialog.h
@@ -0,0 +1,226 @@
+/*
+ * 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 : A dialog for batch-rendering sequences
+
+#pragma once
+
+#include "AtomOutputFrameCapture.h"
+
+#include <AzFramework/StringFunc/StringFunc.h>
+
+#include <QDialog>
+#include <QTimer>
+#include <QFutureWatcher>
+#include <QValidator>
+
+class QStringListModel;
+
+namespace Ui
+{
+    class SequenceBatchRenderDialog;
+}
+
+class CSequenceBatchRenderDialog
+    : public QDialog
+    , public IMovieListener
+{
+public:
+    CSequenceBatchRenderDialog(float fps, QWidget* pParent = nullptr);
+    virtual ~CSequenceBatchRenderDialog();
+
+    void reject() override; // overriding so Qt doesn't cancel
+
+protected:
+    void OnInitDialog();
+
+    void OnAddRenderItem();
+    void OnRemoveRenderItem();
+    void OnClearRenderItems();
+    void OnUpdateRenderItem();
+    void OnLoadPreset();
+    void OnSavePreset();
+    void OnGo();
+    void OnDone();
+    void OnSequenceSelected();
+    void OnRenderItemSelChange();
+    void OnFPSEditChange();
+    void OnFPSChange(int itemIndex);
+    void OnImageFormatChange();
+    void OnResolutionSelected();
+    void OnStartFrameChange();
+    void OnEndFrameChange();
+    void OnLoadBatch();
+    void OnSaveBatch();
+    void OnKickIdle();
+    void OnCancelRender();
+
+    void SaveOutputOptions(const QString& pathname) const;
+    bool LoadOutputOptions(const QString& pathname);
+
+    QString m_ffmpegPluginStatusMsg;
+    bool m_bFFMPEGCommandAvailable;
+
+    float m_fpsForTimeToFrameConversion;    // FPS setting in TrackView
+    struct SRenderItem
+    {
+        IAnimSequence* pSequence;
+        IAnimNode* pDirectorNode;
+        Range frameRange;
+        int resW, resH;
+        int fps;
+        QString folder;
+        QString prefix;
+        QStringList cvars;
+        bool disableDebugInfo;
+        bool bCreateVideo;
+        SRenderItem()
+            : pSequence(NULL)
+            , pDirectorNode(NULL)
+            , disableDebugInfo(false)
+            , bCreateVideo(false) {}
+        bool operator==(const SRenderItem& item)
+        {
+            if (pSequence == item.pSequence
+                && pDirectorNode == item.pDirectorNode
+                && frameRange == item.frameRange
+                && resW == item.resW && resH == item.resH
+                && fps == item.fps
+                && folder == item.folder
+                && prefix == item.prefix
+                && cvars == item.cvars
+                && disableDebugInfo == item.disableDebugInfo
+                && bCreateVideo == item.bCreateVideo)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    };
+    std::vector<SRenderItem> m_renderItems;
+
+    // Capture States
+    enum class CaptureState
+    {
+        Idle,
+        WarmingUpAfterResChange,
+        EnteringGameMode,
+        BeginPlayingSequence,
+        Capturing,
+        End,
+        FFMPEGProcessing,
+        Finalize
+    };
+
+    struct SRenderContext
+    {
+        int currentItemIndex;
+        float expectedTotalTime;
+        float spentTime;
+        int flagBU;
+        Range rangeBU;
+        int cvarCustomResWidthBU, cvarCustomResHeightBU;
+        int cvarDisplayInfoBU;
+        int  framesSpentInCurrentPhase;
+        IAnimNode* pActiveDirectorBU;
+        ICaptureKey captureOptions;
+        bool processingFFMPEG;
+        // Signals when an mpeg is finished being processed.
+        QFutureWatcher<void> processingFFMPEGWatcher;
+        // True if the user canceled a render.
+        bool canceled;
+        // The sequence that triggered the CaptureState::Ending.
+        IAnimSequence* endingSequence;
+        // Current capture state.
+        CaptureState captureState;
+        // Is an individual frame currently being captured.
+        bool capturingFrame;
+        // Current frame being captured
+        int frameNumber;
+
+        bool IsInRendering() const
+        { return currentItemIndex >= 0; }
+
+        SRenderContext()
+            : currentItemIndex(-1)
+            , expectedTotalTime(0)
+            , spentTime(0)
+            , flagBU(0)
+            , pActiveDirectorBU(NULL)
+            , cvarCustomResWidthBU(0)
+            , cvarCustomResHeightBU(0)
+            , cvarDisplayInfoBU(0)
+            , framesSpentInCurrentPhase(0)
+            , processingFFMPEG(false)
+            , canceled(false)
+            , endingSequence(nullptr)
+            , captureState(CaptureState::Idle)
+            , capturingFrame(false)
+            , frameNumber(0) {}
+    };
+    SRenderContext m_renderContext;
+
+    // Custom validator to make sure the prefix is a valid part of a filename.
+    class CPrefixValidator : public QValidator
+    {
+    public:
+        CPrefixValidator(QObject* parent) : QValidator(parent) {}
+
+        QValidator::State validate(QString& input, [[maybe_unused]] int& pos) const override
+        {
+            bool valid = input.isEmpty() || AzFramework::StringFunc::Path::IsValid(input.toUtf8().data());
+            return valid ? QValidator::State::Acceptable : QValidator::State::Invalid;
+        }
+    };
+
+    // Custom values from resolution/FPS combo boxes
+    int m_customResW, m_customResH;
+    int m_customFPS;
+
+    void InitializeContext();
+    virtual void OnMovieEvent(IMovieListener::EMovieEvent event, IAnimSequence* pSequence);
+
+    void CaptureItemStart();
+
+    // Capture State Updates
+    void OnUpdateWarmingUpAfterResChange();
+    void OnUpdateEnteringGameMode();
+    void OnUpdateBeginPlayingSequence();
+    void OnUpdateCapturing();
+    void OnUpdateEnd(IAnimSequence* pSequence);
+    void OnUpdateFFMPEGProcessing();
+    void OnUpdateFinalize();
+
+    bool SetUpNewRenderItem(SRenderItem& item);
+    void AddItem(const SRenderItem& item);
+    QString GetCaptureItemString(const SRenderItem& item) const;
+
+protected slots:
+    void OnKickIdleTimout();
+
+    bool GetResolutionFromCustomResText(const char* customResText, int& retCustomWidth, int& retCustomHeight) const;
+
+private:
+    void CheckForEnableUpdateButton();
+    void stashActiveViewportResolution();
+    void UpdateSpinnerProgressMessage(const char* description);
+    void EnterCaptureState(CaptureState captureState);
+    void SetEnableEditorIdleProcessing(bool enabled);
+
+    QScopedPointer<Ui::SequenceBatchRenderDialog> m_ui;
+    QStringListModel* m_renderListModel;
+    QTimer m_renderTimer;
+    bool m_editorIdleProcessingEnabled;
+    int32 CV_TrackViewRenderOutputCapturing;
+    QScopedPointer<CPrefixValidator> m_prefixValidator;
+
+    TrackView::AtomOutputFrameCapture m_atomOutputFrameCapture;
+};
diff --git a/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.ui b/Code/Editor/TrackView/SequenceBatchRenderDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.ui
rename to Code/Editor/TrackView/SequenceBatchRenderDialog.ui
diff --git a/Code/Editor/TrackView/SequenceKeyUIControls.cpp b/Code/Editor/TrackView/SequenceKeyUIControls.cpp
new file mode 100644
index 0000000000..8eb3ed30b8
--- /dev/null
+++ b/Code/Editor/TrackView/SequenceKeyUIControls.cpp
@@ -0,0 +1,218 @@
+/*
+ * 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"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "TrackViewDialog.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+class CSequenceKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariableEnum<QString> mv_sequence;
+    CSmartVariable<bool> mv_overrideTimes;
+    CSmartVariable<float> mv_startTime;
+    CSmartVariable<float> mv_endTime;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_sequence, "Sequence");
+        AddVariable(mv_table, mv_overrideTimes, "Override Start/End Times");
+        AddVariable(mv_table, mv_startTime, "Start Time");
+        AddVariable(mv_table, mv_endTime, "End Time");
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::Sequence;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {68030C46-1402-45d1-91B3-8EC6F29C0FED}
+        static const GUID guid =
+        {
+            0x68030c46, 0x1402, 0x45d1, { 0x91, 0xb3, 0x8e, 0xc6, 0xf2, 0x9c, 0xf, 0xed }
+        };
+        return guid;
+    }
+
+private:
+    bool m_skipOnUIChange = false;
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CSequenceKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Sequence)
+        {
+            CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+            /////////////////////////////////////////////////////////////////////////////////
+            // fill sequence comboBox with available sequences
+            mv_sequence.SetEnumList(NULL);
+
+            // Insert '<None>' empty enum
+            mv_sequence->AddEnumItem(QObject::tr("<None>"), CTrackViewDialog::GetEntityIdAsString(AZ::EntityId(AZ::EntityId::InvalidEntityId)));
+
+            const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+            for (int i = 0; i < pSequenceManager->GetCount(); ++i)
+            {
+                CTrackViewSequence* pCurrentSequence = pSequenceManager->GetSequenceByIndex(i);
+                bool bNotMe = pCurrentSequence != pSequence;
+                bool bNotParent = !bNotMe || pCurrentSequence->IsAncestorOf(pSequence) == false;
+                if (bNotMe && bNotParent)
+                {
+                    string seqName = pCurrentSequence->GetName();
+
+                    QString ownerIdString = CTrackViewDialog::GetEntityIdAsString(pCurrentSequence->GetSequenceComponentEntityId());
+                    mv_sequence->AddEnumItem(seqName.c_str(), ownerIdString);
+                }
+            }
+
+            /////////////////////////////////////////////////////////////////////////////////
+            // fill Key Properties with selected key values
+            ISequenceKey sequenceKey;
+            keyHandle.GetKey(&sequenceKey);
+            
+            QString entityIdString = CTrackViewDialog::GetEntityIdAsString((sequenceKey.sequenceEntityId));
+            mv_sequence = entityIdString;            
+           
+            mv_overrideTimes = sequenceKey.bOverrideTimes;
+            if (!sequenceKey.bOverrideTimes)
+            {
+                IAnimSequence* pSequence2 = GetIEditor()->GetSystem()->GetIMovieSystem()->FindSequence(sequenceKey.sequenceEntityId);
+
+                if (pSequence2)
+                {
+                    sequenceKey.fStartTime = pSequence2->GetTimeRange().start;
+                    sequenceKey.fEndTime = pSequence2->GetTimeRange().end;
+                }
+                else
+                {
+                    sequenceKey.fStartTime = 0.0f;
+                    sequenceKey.fEndTime = 0.0f;
+                }
+            }
+
+            // Don't trigger an OnUIChange event, since this code is the one
+            // updating the start/end ui elements, not the user setting new values.
+            m_skipOnUIChange = true;
+            mv_startTime = sequenceKey.fStartTime;
+            mv_endTime = sequenceKey.fEndTime;
+            m_skipOnUIChange = false;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CSequenceKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence || !selectedKeys.AreAllKeysOfSameType() || m_skipOnUIChange)
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Sequence)
+        {
+            ISequenceKey sequenceKey;
+            keyHandle.GetKey(&sequenceKey);
+
+            AZ::EntityId seqOwnerId;
+            if (pVar == mv_sequence.GetVar())
+            {
+                QString entityIdString = mv_sequence;
+                seqOwnerId = AZ::EntityId(static_cast<AZ::u64>(entityIdString.toULongLong()));
+
+                sequenceKey.szSelection.clear();            // clear deprecated legacy data
+                sequenceKey.sequenceEntityId = seqOwnerId;
+            }
+
+            SyncValue(mv_overrideTimes, sequenceKey.bOverrideTimes, false, pVar);
+
+            IAnimSequence* pSequence = GetIEditor()->GetSystem()->GetIMovieSystem()->FindSequence(seqOwnerId);
+
+            if (!sequenceKey.bOverrideTimes)
+            {
+                if (pSequence)
+                {
+                    sequenceKey.fStartTime = pSequence->GetTimeRange().start;
+                    sequenceKey.fEndTime = pSequence->GetTimeRange().end;
+                }
+                else
+                {
+                    sequenceKey.fStartTime = 0.0f;
+                    sequenceKey.fEndTime = 0.0f;
+                }
+            }
+            else
+            {
+                SyncValue(mv_startTime, sequenceKey.fStartTime, false, pVar);
+                SyncValue(mv_endTime, sequenceKey.fEndTime, false, pVar);
+            }
+
+            sequenceKey.fDuration = sequenceKey.fEndTime - sequenceKey.fStartTime > 0 ? sequenceKey.fEndTime - sequenceKey.fStartTime : 0.0f;
+
+            IMovieSystem* pMovieSystem = GetIEditor()->GetSystem()->GetIMovieSystem();
+
+            if (pMovieSystem != NULL)
+            {
+                pMovieSystem->SetStartEndTime(pSequence, sequenceKey.fStartTime, sequenceKey.fEndTime);
+            }
+
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                keyHandle.SetKey(&sequenceKey);
+            }
+            else
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
+                keyHandle.SetKey(&sequenceKey);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CSequenceKeyUIControls, "TrackView.KeyUI.Sequence", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/SoundKeyUIControls.cpp b/Code/Editor/TrackView/SoundKeyUIControls.cpp
new file mode 100644
index 0000000000..4b1a04013b
--- /dev/null
+++ b/Code/Editor/TrackView/SoundKeyUIControls.cpp
@@ -0,0 +1,133 @@
+/*
+ * 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"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"  // for CTrackViewKeyUIControls
+
+
+//////////////////////////////////////////////////////////////////////////
+class CSoundKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariableArray mv_options;
+
+    CSmartVariable<QString> mv_startTrigger;
+    CSmartVariable<QString> mv_stopTrigger;
+    CSmartVariable<float> mv_duration;
+    CSmartVariable<Vec3> mv_customColor;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_startTrigger, "StartTrigger", IVariable::DT_AUDIO_TRIGGER);
+        AddVariable(mv_table, mv_stopTrigger, "StopTrigger", IVariable::DT_AUDIO_TRIGGER);
+        AddVariable(mv_table, mv_duration, "Duration");
+        AddVariable(mv_options, "Options");
+        AddVariable(mv_options, mv_customColor, "Custom Color", IVariable::DT_COLOR);
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::Sound;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {AB2226E5-D593-49d2-B7CB-989412CAAEDE}
+        static const GUID guid =
+        {
+            0xab2226e5, 0xd593, 0x49d2, { 0xb7, 0xcb, 0x98, 0x94, 0x12, 0xca, 0xae, 0xde }
+        };
+        return guid;
+    }
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CSoundKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Sound)
+        {
+            ISoundKey soundKey;
+            keyHandle.GetKey(&soundKey);
+
+            mv_startTrigger = soundKey.sStartTrigger.c_str();
+            mv_stopTrigger = soundKey.sStopTrigger.c_str();
+            mv_duration = soundKey.fDuration;
+            mv_customColor = soundKey.customColor;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CSoundKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::Sound)
+        {
+            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();
+            }
+
+            SyncValue(mv_duration, soundKey.fDuration, false, pVar);
+            SyncValue(mv_customColor, soundKey.customColor, false, pVar);
+
+            keyHandle.SetKey(&soundKey);
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CSoundKeyUIControls, "TrackView.KeyUI.Sound", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDialog.ui b/Code/Editor/TrackView/TVCustomizeTrackColorsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDialog.ui
rename to Code/Editor/TrackView/TVCustomizeTrackColorsDialog.ui
diff --git a/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
new file mode 100644
index 0000000000..f0e89e54f3
--- /dev/null
+++ b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
@@ -0,0 +1,402 @@
+/*
+ * 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 : A dialog for customizing track colors
+
+
+#include "EditorDefs.h"
+
+#include "TVCustomizeTrackColorsDlg.h"
+
+// Qt
+#include <QLabel>
+#include <QMessageBox>
+#include <QSettings>
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "TrackViewDialog.h"
+#include "QtUI/ColorButton.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <TrackView/ui_TVCustomizeTrackColorsDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+#define TRACKCOLOR_ENTRY_PREFIX ("TrackColor")
+#define TRACKCOLOR_FOR_OTHERS_ENTRY ("TrackColorForOthers")
+#define TRACKCOLOR_FOR_DISABLED_ENTRY ("TrackColorForDisabled")
+#define TRACKCOLOR_FOR_MUTED_ENTRY ("TrackColorForMuted")
+
+struct STrackEntry
+{
+    CAnimParamType paramType;
+    QString name;
+    QColor defaultColor;
+};
+
+namespace
+{
+    const STrackEntry g_trackEntries[] = {
+        // Color for tracks
+        { AnimParamType::FOV, "FOV", QColor(220, 220, 220) },
+        { AnimParamType::Position, "Pos", QColor(90, 150, 90) },
+        { AnimParamType::Rotation, "Rot", QColor(90, 150, 90) },
+        { AnimParamType::Scale, "Scale", QColor(90, 150, 90) },
+        { AnimParamType::Event, "Event", QColor(220, 220, 220) },
+        { AnimParamType::Visibility, "Visibility", QColor(220, 220, 220) },
+        { AnimParamType::Camera, "Camera", QColor(220, 220, 220) },
+        { AnimParamType::Sound, "Sound", QColor(220, 220, 220) },
+        { AnimParamType::Animation, "Animation", QColor(220, 220, 220) },
+        { AnimParamType::Sequence, "Sequence", QColor(220, 220, 220) },
+        { AnimParamType::Console, "Console", QColor(220, 220, 220) },
+        { AnimParamType::LookAt, "LookAt", QColor(220, 220, 220) },
+        { AnimParamType::TrackEvent, "TrackEvent", QColor(220, 220, 220) },
+        { AnimParamType::ShakeMultiplier, "ShakeMult", QColor(90, 150, 90) },
+        { AnimParamType::TransformNoise, "Noise", QColor(90, 150, 90) },
+        { AnimParamType::TimeWarp, "Timewarp", QColor(220, 220, 220) },
+        { AnimParamType::FixedTimeStep, "FixedTimeStep", QColor(220, 220, 220) },
+        { AnimParamType::DepthOfField, "DepthOfField", QColor(90, 150, 90) },
+        { AnimParamType::CommentText, "CommentText", QColor(220, 220, 220) },
+        { AnimParamType::ScreenFader, "ScreenFader", QColor(220, 220, 220) },
+        { AnimParamType::LightDiffuse, "LightDiffuseColor", QColor(90, 150, 90) },
+        { AnimParamType::LightRadius, "LightRadius", QColor(220, 220, 220) },
+        { AnimParamType::LightDiffuseMult, "LightDiffuseMult", QColor(220, 220, 220) },
+        { AnimParamType::LightHDRDynamic, "LightHDRDynamic", QColor(220, 220, 220) },
+        { AnimParamType::LightSpecularMult, "LightSpecularMult", QColor(220, 220, 220) },
+        { AnimParamType::LightSpecPercentage, "LightSpecularPercent", QColor(220, 220, 220) },
+        { AnimParamType::FocusDistance, "FocusDistance", QColor(220, 220, 220) },
+        { AnimParamType::FocusRange, "FocusRange", QColor(220, 220, 220) },
+        { AnimParamType::BlurAmount, "BlurAmount", QColor(220, 220, 220) },
+        { AnimParamType::PositionX, "PosX", QColor(220, 220, 220) },
+        { AnimParamType::PositionY, "PosY", QColor(220, 220, 220) },
+        { AnimParamType::PositionZ, "PosZ", QColor(220, 220, 220) },
+        { AnimParamType::RotationX, "RotX", QColor(220, 220, 220) },
+        { AnimParamType::RotationY, "RotY", QColor(220, 220, 220) },
+        { AnimParamType::RotationZ, "RotZ", QColor(220, 220, 220) },
+        { AnimParamType::ScaleX, "ScaleX", QColor(220, 220, 220) },
+        { AnimParamType::ScaleY, "ScaleY", QColor(220, 220, 220) },
+        { AnimParamType::ScaleZ, "ScaleZ", QColor(220, 220, 220) },
+        { AnimParamType::ShakeAmpAMult, "ShakeMultAmpA", QColor(220, 220, 220) },
+        { AnimParamType::ShakeAmpBMult, "ShakeMultAmpB", QColor(220, 220, 220) },
+        { AnimParamType::ShakeFreqAMult, "ShakeMultFreqA", QColor(220, 220, 220) },
+        { AnimParamType::ShakeFreqBMult, "ShakeMultFreqB", QColor(220, 220, 220) },
+        { AnimParamType::ColorR, "ColorR", QColor(220, 220, 220) },
+        { AnimParamType::ColorG, "ColorG", QColor(220, 220, 220) },
+        { AnimParamType::ColorB, "ColorB", QColor(220, 220, 220) },
+        { AnimParamType::MaterialOpacity, "MaterialOpacity", QColor(220, 220, 220) },
+        { AnimParamType::MaterialSmoothness, "MaterialGlossiness", QColor(220, 220, 220) },
+        { AnimParamType::MaterialEmissive, "MaterialEmission", QColor(220, 220, 220) },
+        { AnimParamType::MaterialEmissiveIntensity, "MaterialEmissionIntensity", QColor(220, 220, 220) },
+        { AnimParamType::NearZ, "NearZ", QColor(220, 220, 220) },
+
+        { AnimParamType::User, "", QColor(0, 0, 0) }, // An empty string means a separator row.
+
+        // Misc colors for special states of a track
+        { AnimParamType::User, "Others", QColor(220, 220, 220) },
+        { AnimParamType::User, "Disabled/Inactive", QColor(255, 224, 224) },
+        { AnimParamType::User, "Muted", QColor(255, 224, 224) },
+    };
+
+    const int kButtonsIdBase = 0x7fff;
+    const int kMaxRows = 20;
+    const int kColumnWidth = 300;
+    const int kRowHeight = 24;
+
+    const int kOthersEntryIndex = arraysize(g_trackEntries) - 3;
+    const int kDisabledEntryIndex = arraysize(g_trackEntries) - 2;
+    const int kMutedEntryIndex = arraysize(g_trackEntries) - 1;
+}
+
+std::map<CAnimParamType, QColor> CTVCustomizeTrackColorsDlg::s_trackColors;
+QColor CTVCustomizeTrackColorsDlg::s_colorForDisabled;
+QColor CTVCustomizeTrackColorsDlg::s_colorForMuted;
+QColor CTVCustomizeTrackColorsDlg::s_colorForOthers;
+
+CTVCustomizeTrackColorsDlg::CTVCustomizeTrackColorsDlg(QWidget* pParent)
+    : QDialog(pParent)
+    , m_aLabels(arraysize(g_trackEntries))
+    , m_colorButtons(arraysize(g_trackEntries))
+    , m_ui(new Ui::TVCustomizeTrackColorsDialog)
+{
+    OnInitDialog();
+}
+
+CTVCustomizeTrackColorsDlg::~CTVCustomizeTrackColorsDlg()
+{
+}
+
+void CTVCustomizeTrackColorsDlg::OnInitDialog()
+{
+    m_ui->setupUi(this);
+
+    connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &CTVCustomizeTrackColorsDlg::accept);
+    connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &CTVCustomizeTrackColorsDlg::reject);
+    connect(m_ui->buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked, this, &CTVCustomizeTrackColorsDlg::OnApply);
+    connect(m_ui->buttonResetAll, &QPushButton::clicked, this, &CTVCustomizeTrackColorsDlg::OnResetAll);
+    connect(m_ui->buttonExport, &QPushButton::clicked, this, &CTVCustomizeTrackColorsDlg::OnExport);
+    connect(m_ui->buttonImport, &QPushButton::clicked, this, &CTVCustomizeTrackColorsDlg::OnImport);
+
+
+    QRect labelRect(QPoint(30, 30), QPoint(150, 50));
+    QRect buttonRect(QPoint(180, 30), QPoint(280, 50));
+    // Create a label and a color button for each track.
+    int col = 0, i = 0;
+    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
+    {
+        const QString labelText = entry.name;
+
+        if(!labelText.isEmpty())
+        {
+            m_aLabels[i] = new QLabel(m_ui->frame);
+            m_aLabels[i]->setGeometry(labelRect);
+            m_aLabels[i]->setText(labelText);
+
+            m_colorButtons[i] = new ColorButton(m_ui->frame);
+            m_colorButtons[i]->setGeometry(buttonRect);
+
+            if(entry.paramType.GetType() == AnimParamType::User)
+            {
+                assert(kOthersEntryIndex <= i);
+                if (i == kOthersEntryIndex)
+                    {
+                    m_colorButtons[i]->SetColor(s_colorForOthers);
+                    }
+                else if(i == kDisabledEntryIndex)
+                    {
+                    m_colorButtons[i]->SetColor(s_colorForDisabled);
+                    }
+                else if(i == kMutedEntryIndex)
+                    {
+                    m_colorButtons[i]->SetColor(s_colorForMuted);
+                    }
+                }
+            else
+            {
+                m_colorButtons[i]->SetColor(s_trackColors[entry.paramType]);
+            }
+        }
+
+        if(i % kMaxRows == kMaxRows - 1)
+        {
+            ++col;
+            labelRect.moveTopLeft(QPoint(30+kColumnWidth*col, 30));
+            buttonRect.moveTopLeft(QPoint(180+kColumnWidth*col, 30));
+        }
+        else
+        {
+            labelRect.translate(0, kRowHeight);
+            buttonRect.translate(0, kRowHeight);
+        }
+        ++i;
+    });
+
+    // Resize this dialog to fit the contents.
+    const QSize size(60 + kColumnWidth * (col + 1), 100 + kMaxRows * kRowHeight);
+    m_ui->frame->setFixedSize(size);
+    setFixedSize(sizeHint());
+}
+
+void CTVCustomizeTrackColorsDlg::accept()
+{
+    OnApply();
+    QDialog::accept();
+}
+
+void CTVCustomizeTrackColorsDlg::OnApply()
+{
+    int i = 0;
+    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
+    {
+        if(entry.paramType.GetType() != AnimParamType::User)
+        {
+                s_trackColors[entry.paramType] = m_colorButtons[i]->Color();
+        }
+        ++i;
+    });
+
+    s_colorForOthers = m_colorButtons[kOthersEntryIndex]->Color();
+    s_colorForDisabled = m_colorButtons[kDisabledEntryIndex]->Color();
+    s_colorForMuted = m_colorButtons[kMutedEntryIndex]->Color();
+
+    CTrackViewDialog::GetCurrentInstance()->InvalidateDopeSheet();
+}
+
+void CTVCustomizeTrackColorsDlg::OnResetAll()
+{
+    int i = 0;
+    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
+    {
+        const QString labelText = entry.name;
+        if(!labelText.isEmpty())
+        {
+            m_colorButtons[i]->SetColor(entry.defaultColor);
+        }
+        ++i;
+    });
+}
+
+void CTVCustomizeTrackColorsDlg::SaveColors(const char* sectionName)
+{
+    QSettings settings;
+    for (auto g : QString(sectionName).split('\\'))
+    {
+        settings.beginGroup(g);
+    }
+    std::for_each(begin(s_trackColors), end(s_trackColors),
+    [&](const std::pair<CAnimParamType, QColor>& pair)
+    {
+        const QString trackColorEntry = QString::fromLatin1("%1%2").arg(TRACKCOLOR_ENTRY_PREFIX).arg(static_cast<int>(pair.first.GetType()));
+        settings.setValue(trackColorEntry, pair.second.rgb());
+    });
+
+    settings.setValue(TRACKCOLOR_FOR_OTHERS_ENTRY, s_colorForOthers.rgb());
+    settings.setValue(TRACKCOLOR_FOR_DISABLED_ENTRY, s_colorForDisabled.rgb());
+    settings.setValue(TRACKCOLOR_FOR_MUTED_ENTRY, s_colorForMuted.rgb());
+}
+
+void CTVCustomizeTrackColorsDlg::LoadColors(const char* sectionName)
+{
+    QSettings settings;
+    for (auto g : QString(sectionName).split('\\'))
+    {
+        settings.beginGroup(g);
+    }
+    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
+    {
+        if (entry.paramType.GetType() != AnimParamType::User)
+        {
+            s_trackColors[entry.paramType] = QColor::fromRgb(settings.value(QStringLiteral("%2%3").arg(TRACKCOLOR_ENTRY_PREFIX).arg(static_cast<int>(entry.paramType.GetType())), entry.defaultColor.rgb()).toInt());
+        }
+    });
+
+    s_colorForOthers = QColor::fromRgb(settings.value(TRACKCOLOR_FOR_OTHERS_ENTRY, g_trackEntries[kOthersEntryIndex].defaultColor.rgb()).toInt());
+    s_colorForDisabled = QColor::fromRgb(settings.value(TRACKCOLOR_FOR_DISABLED_ENTRY, g_trackEntries[kDisabledEntryIndex].defaultColor.rgb()).toInt());
+    s_colorForMuted = QColor::fromRgb(settings.value(TRACKCOLOR_FOR_MUTED_ENTRY, g_trackEntries[kMutedEntryIndex].defaultColor.rgb()).toInt());
+}
+
+void CTVCustomizeTrackColorsDlg::OnExport()
+{
+    QString savePath;
+    if (CFileUtil::SelectSaveFile("Custom Track Colors Files (*.ctc)", "ctc",
+            Path::GetUserSandboxFolder(), savePath))
+    {
+        Export(savePath);
+    }
+}
+
+void CTVCustomizeTrackColorsDlg::OnImport()
+{
+    QString loadPath;
+    if (CFileUtil::SelectFile("Custom Track Colors Files (*.ctc)",
+            Path::GetUserSandboxFolder(), loadPath))
+    {
+        if (Import(loadPath))
+        {
+            // since the user is explicitly pressing 'Import', we assume he or she wants to apply this import
+            // to see the result immediately, based on a customer feedback sample of one
+            OnApply();
+        }
+        else
+        {
+            QMessageBox::critical(this, tr("Cannot import"), tr("The file format is invalid!"));
+        }
+    }
+}
+
+void CTVCustomizeTrackColorsDlg::Export(const QString& fullPath) const
+{
+    XmlNodeRef customTrackColorsNode = XmlHelpers::CreateXmlNode("customtrackcolors");
+
+    int i = 0;
+    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
+    {
+        if(entry.paramType.GetType() != AnimParamType::User)
+        {
+            XmlNodeRef entryNode = customTrackColorsNode->newChild("entry");
+
+            // Serialization is const safe
+            CAnimParamType &paramType = const_cast<CAnimParamType&>( entry.paramType );
+            paramType.Serialize( entryNode, false );
+                entryNode->setAttr("color", m_colorButtons[i]->Color().rgb());
+        }
+        ++i;
+    });
+
+    XmlNodeRef othersNode = customTrackColorsNode->newChild("others");
+    othersNode->setAttr("color", m_colorButtons[kOthersEntryIndex]->Color().rgb());
+    XmlNodeRef disabledNode = customTrackColorsNode->newChild("disabled");
+    disabledNode->setAttr("color", m_colorButtons[kDisabledEntryIndex]->Color().rgb());
+    XmlNodeRef mutedNode = customTrackColorsNode->newChild("muted");
+    mutedNode->setAttr("color", m_colorButtons[kMutedEntryIndex]->Color().rgb());
+
+    XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), customTrackColorsNode, fullPath.toStdString().c_str());
+}
+
+bool CTVCustomizeTrackColorsDlg::Import(const QString& fullPath)
+{
+    XmlNodeRef customTrackColorsNode = XmlHelpers::LoadXmlFromFile(fullPath.toStdString().c_str());
+    if (customTrackColorsNode == NULL)
+    {
+        return false;
+    }
+
+    QColor color;
+    for (int i = 0; i < customTrackColorsNode->getChildCount(); ++i)
+    {
+        XmlNodeRef childNode = customTrackColorsNode->getChild(i);
+        if (QString(childNode->getTag()) != "entry")
+        {
+            continue;
+        }
+
+        CAnimParamType paramType;
+        paramType.Serialize(childNode, true);
+
+        // Get the entry index for this param type.
+        const STrackEntry* pEntry = std::find_if(g_trackEntries, g_trackEntries + arraysize(g_trackEntries),
+                [=](const STrackEntry& entry)
+        { 
+            return entry.paramType == paramType;
+        });
+        int entryIndex = pEntry - g_trackEntries;
+        if (entryIndex >= arraysize(g_trackEntries)) // If not found, skip this.
+        {
+            continue;
+        }
+        GetQColorFromXmlNode(color, childNode);
+        m_colorButtons[entryIndex]->SetColor(color);
+    }
+
+    XmlNodeRef othersNode = customTrackColorsNode->findChild("others");
+    if (othersNode)
+    {
+        GetQColorFromXmlNode(color, othersNode);
+        m_colorButtons[kOthersEntryIndex]->SetColor(color);
+    }
+
+    XmlNodeRef disabledNode = customTrackColorsNode->findChild("disabled");
+    if (disabledNode)
+    {
+        GetQColorFromXmlNode(color, disabledNode);
+        m_colorButtons[kDisabledEntryIndex]->SetColor(color);
+    }
+
+    XmlNodeRef mutedNode = customTrackColorsNode->findChild("muted");
+    if (mutedNode)
+    {
+        GetQColorFromXmlNode(color, mutedNode);
+        m_colorButtons[kMutedEntryIndex]->SetColor(color);
+    }
+
+    return true;
+}
+
+#include <TrackView/moc_TVCustomizeTrackColorsDlg.cpp>
diff --git a/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.h b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.h
new file mode 100644
index 0000000000..9d47069f36
--- /dev/null
+++ b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.h
@@ -0,0 +1,87 @@
+/*
+ * 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 : A dialog for customizing track colors
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TVCUSTOMIZETRACKCOLORSDLG_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TVCUSTOMIZETRACKCOLORSDLG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class TVCustomizeTrackColorsDialog;
+}
+
+class QLabel;
+class ColorButton;
+
+class CTVCustomizeTrackColorsDlg
+    : public QDialog
+{
+    Q_OBJECT
+    friend class CTrackViewDialog;
+public:
+    CTVCustomizeTrackColorsDlg(QWidget* pParent = nullptr);
+    virtual ~CTVCustomizeTrackColorsDlg();
+
+    static QColor GetTrackColor(CAnimParamType paramType)
+    {
+        auto itr = s_trackColors.find(paramType);
+        if (itr != end(s_trackColors))
+        {
+            return itr->second;
+        }
+        else
+        {
+            return s_colorForOthers;
+        }
+    }
+    static QColor GetColorForDisabledTracks()
+    { return s_colorForDisabled; }
+    static QColor GetColorForMutedTracks()
+    { return s_colorForMuted; }
+
+private:
+
+    inline void GetQColorFromXmlNode(QColor& colorOut, const XmlNodeRef& xmlNode) const
+    {
+        QRgb rgb = -1;
+        xmlNode->getAttr("color", rgb);
+        colorOut.setRgb(rgb);
+    };
+
+    virtual void OnInitDialog();
+    void OnApply();
+    void OnResetAll();
+    void OnExport();
+    void OnImport();
+    void accept() override;
+
+    void Export(const QString& fullPath) const;
+    bool Import(const QString& fullPath);
+
+    static void SaveColors(const char* sectionName);
+    static void LoadColors(const char* sectionName);
+
+    QVector<QLabel*> m_aLabels;
+    QVector<ColorButton*> m_colorButtons;
+
+    QScopedPointer<Ui::TVCustomizeTrackColorsDialog> m_ui;
+
+    static std::map<CAnimParamType, QColor> s_trackColors;
+    static QColor s_colorForDisabled;
+    static QColor s_colorForMuted;
+    static QColor s_colorForOthers;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TVCUSTOMIZETRACKCOLORSDLG_H
diff --git a/Code/Editor/TrackView/TVEventsDialog.cpp b/Code/Editor/TrackView/TVEventsDialog.cpp
new file mode 100644
index 0000000000..e551c4dacb
--- /dev/null
+++ b/Code/Editor/TrackView/TVEventsDialog.cpp
@@ -0,0 +1,391 @@
+/*
+ * 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 "TVEventsDialog.h"
+
+// Qt
+#include <QInputDialog>
+#include <QMessageBox>
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "AnimationContext.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <TrackView/ui_TVEventsDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+// CTVEventsDialog dialog
+
+namespace
+{
+    const int kCountSubItemIndex = 1;
+    const int kTimeSubItemIndex = 2;
+}
+
+class TVEventsModel
+    : public QAbstractTableModel
+{
+public:
+    TVEventsModel(QObject* parent = nullptr)
+        : QAbstractTableModel(parent)
+    {
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        if (parent.isValid())
+        {
+            return 0;
+        }
+        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+        assert(sequence);
+        return sequence->GetTrackEventsCount();
+    }
+
+    int columnCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        return parent.isValid() ? 0 : 3;
+    }
+
+    bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override
+    {
+        if (parent.isValid())
+        {
+            return false;
+        }
+
+        bool result = true;
+
+        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+        assert(sequence);
+
+        AzToolsFramework::ScopedUndoBatch undo("Remove Track Event");
+
+        for (int r = row; r < row + count; ++r)
+        {
+            const QString eventName = index(r, 0).data().toString();
+            beginRemoveRows(QModelIndex(), r, r);
+            result &= sequence->RemoveTrackEvent(eventName.toUtf8().data());
+            endRemoveRows();
+
+            undo.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+        }
+
+        return result;
+    }
+
+    bool addRow(const QString& name)
+    {
+        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+        assert(sequence);
+        const int index = rowCount();
+        beginInsertRows(QModelIndex(), index, index);
+        bool result = false;
+
+        AzToolsFramework::ScopedUndoBatch undo("Add Track Event");
+        result = sequence->AddTrackEvent(name.toUtf8().data());
+        undo.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+        endInsertRows();
+        if (!result)
+        {
+            beginRemoveRows(QModelIndex(), index, index);
+            endRemoveRows();
+        }
+        return result;
+    }
+
+    bool moveRow(const QModelIndex& index, bool up)
+    {
+        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+        assert(sequence);
+        if (!index.isValid() || (up && index.row() == 0) || (!up && index.row() == rowCount() - 1))
+        {
+            return false;
+        }
+
+        bool result = false;
+
+        AzToolsFramework::ScopedUndoBatch undo("Move Track Event");
+        if (up)
+        {
+            beginMoveRows(QModelIndex(), index.row(), index.row(), QModelIndex(), index.row() - 1);
+            result = sequence->MoveUpTrackEvent(index.sibling(index.row(), 0).data().toString().toUtf8().data());
+        }
+        else
+        {
+            beginMoveRows(QModelIndex(), index.row() + 1, index.row() + 1, QModelIndex(), index.row());
+            result = sequence->MoveDownTrackEvent(index.sibling(index.row(), 0).data().toString().toUtf8().data());
+        }
+        undo.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+        endMoveRows();
+
+        return result;
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+        assert(sequence);
+        if (role != Qt::DisplayRole)
+        {
+            return QVariant();
+        }
+
+        float timeFirstUsed;
+        int usageCount = GetNumberOfUsageAndFirstTimeUsed(sequence->GetTrackEvent(index.row()), timeFirstUsed);
+
+        switch (index.column())
+        {
+        case 0:
+            return QString::fromLatin1(sequence->GetTrackEvent(index.row()));
+        case 1:
+            return usageCount;
+        case 2:
+            return usageCount > 0 ? QString::number(timeFirstUsed, 'f', 3) : QString();
+        default:
+            return QVariant();
+        }
+    }
+
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override
+    {
+        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+        assert(sequence);
+        if (role != Qt::DisplayRole && role != Qt::EditRole)
+        {
+            return false;
+        }
+        if (index.column() != 0 || value.toString().isEmpty())
+        {
+            return false;
+        }
+
+        bool result = false;
+
+        const QString oldName = index.data().toString();
+        const QString newName = value.toString();
+
+        AzToolsFramework::ScopedUndoBatch undo("Set Track Event Data");
+        result = sequence->RenameTrackEvent(oldName.toUtf8().data(), newName.toUtf8().data());
+        undo.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+        emit dataChanged(index, index);
+        return result;
+    }
+
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override
+    {
+        if (role != Qt::DisplayRole || orientation != Qt::Horizontal)
+        {
+            return QVariant();
+        }
+
+        switch (section)
+        {
+        case 0:
+            return tr("Event");
+        case 1:
+            return tr("# of use");
+        case 2:
+            return tr("Time of first usage");
+        default:
+            return QVariant();
+        }
+    }
+
+    int GetNumberOfUsageAndFirstTimeUsed(const char* eventName, float& timeFirstUsed) const;
+};
+
+CTVEventsDialog::CTVEventsDialog(QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_ui(new Ui::TVEventsDialog)
+{
+    m_ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    OnInitDialog();
+
+    connect(m_ui->buttonAddEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonAddEvent);
+    connect(m_ui->buttonRemoveEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonRemoveEvent);
+    connect(m_ui->buttonRenameEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonRenameEvent);
+    connect(m_ui->buttonUpEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonUpEvent);
+    connect(m_ui->buttonDownEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonDownEvent);
+    connect(m_ui->m_List->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CTVEventsDialog::OnListItemChanged);
+}
+
+CTVEventsDialog::~CTVEventsDialog()
+{
+}
+
+// CTVEventsDialog message handlers
+
+void CTVEventsDialog::OnBnClickedButtonAddEvent()
+{
+    const QString add = QInputDialog::getText(this, tr("Track Event Name"), QString());
+    if (!add.isEmpty() && static_cast<TVEventsModel*>(m_ui->m_List->model())->addRow(add))
+    {
+        m_lastAddedEvent = add;
+        m_ui->m_List->setCurrentIndex(m_ui->m_List->model()->index(m_ui->m_List->model()->rowCount() - 1, 0));
+    }
+    m_ui->m_List->setFocus();
+}
+
+void CTVEventsDialog::OnBnClickedButtonRemoveEvent()
+{
+    QList<QPersistentModelIndex> indexes;
+    for (auto index : m_ui->m_List->selectionModel()->selectedRows())
+    {
+        indexes.push_back(index);
+    }
+
+    for (auto index : indexes)
+    {
+        if (QMessageBox::warning(this, tr("Remove Event"), tr("This removal might cause some link breakages in Flow Graph.\nStill continue?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
+        {
+            m_ui->m_List->model()->removeRow(index.row());
+        }
+    }
+    m_ui->m_List->setFocus();
+}
+
+void CTVEventsDialog::OnBnClickedButtonRenameEvent()
+{
+    const QModelIndex index = m_ui->m_List->currentIndex();
+
+    if (index.isValid())
+    {
+        const QString newName = QInputDialog::getText(this, tr("Track Event Name"), QString());
+        if (!newName.isEmpty())
+        {
+            m_ui->m_List->model()->setData(index.sibling(index.row(), 0), newName);
+        }
+    }
+    m_ui->m_List->setFocus();
+}
+
+void CTVEventsDialog::OnBnClickedButtonUpEvent()
+{
+    static_cast<TVEventsModel*>(m_ui->m_List->model())->moveRow(m_ui->m_List->currentIndex(), true);
+    UpdateButtons();
+    m_ui->m_List->setFocus();
+}
+
+void CTVEventsDialog::OnBnClickedButtonDownEvent()
+{
+    static_cast<TVEventsModel*>(m_ui->m_List->model())->moveRow(m_ui->m_List->currentIndex(), false);
+    UpdateButtons();
+    m_ui->m_List->setFocus();
+}
+
+void CTVEventsDialog::OnInitDialog()
+{
+    m_ui->m_List->setModel(new TVEventsModel(this));
+    m_ui->m_List->header()->resizeSections(QHeaderView::ResizeToContents);
+
+    assert(GetIEditor()->GetAnimation()->GetSequence());
+
+    UpdateButtons();
+}
+
+void CTVEventsDialog::OnListItemChanged()
+{
+    UpdateButtons();
+}
+
+void CTVEventsDialog::UpdateButtons()
+{
+    bool bRemove = false, bRename = false, bUp = false, bDown = false;
+
+    int nSelected = m_ui->m_List->selectionModel()->selectedRows().count();
+    if (nSelected > 1)
+    {
+        bRemove = true;
+        bRename = false;
+    }
+    else if (nSelected > 0)
+    {
+        bRemove = bRename = true;
+
+        const QModelIndex index = m_ui->m_List->selectionModel()->selectedRows().first();
+        if (index.row() > 0)
+        {
+            bUp = true;
+        }
+        if (index.row() < m_ui->m_List->model()->rowCount() - 1)
+        {
+            bDown = true;
+        }
+    }
+
+    m_ui->buttonRemoveEvent->setEnabled(bRemove);
+    m_ui->buttonRenameEvent->setEnabled(bRename);
+    m_ui->buttonUpEvent->setEnabled(bUp);
+    m_ui->buttonDownEvent->setEnabled(bDown);
+}
+
+const QString& CTVEventsDialog::GetLastAddedEvent()
+{
+    return m_lastAddedEvent;
+}
+
+int TVEventsModel::GetNumberOfUsageAndFirstTimeUsed(const char* eventName, float& timeFirstUsed) const
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    int usageCount = 0;
+    float firstTime = std::numeric_limits<float>::max();
+
+    CTrackViewAnimNodeBundle nodeBundle = sequence->GetAnimNodesByType(AnimNodeType::Event);
+    const unsigned int numNodes = nodeBundle.GetCount();
+
+    for (unsigned int currentNode = 0; currentNode < numNodes; ++currentNode)
+    {
+        CTrackViewAnimNode* pCurrentNode = nodeBundle.GetNode(currentNode);
+
+        CTrackViewTrackBundle tracks = pCurrentNode->GetTracksByParam(AnimParamType::TrackEvent);
+        const unsigned int numTracks = tracks.GetCount();
+
+        for (unsigned int currentTrack = 0; currentTrack < numTracks; ++currentTrack)
+        {
+            CTrackViewTrack* pTrack = tracks.GetTrack(currentTrack);
+
+            for (int currentKey = 0; currentKey < pTrack->GetKeyCount(); ++currentKey)
+            {
+                CTrackViewKeyHandle keyHandle = pTrack->GetKey(currentKey);
+
+                IEventKey key;
+                keyHandle.GetKey(&key);
+
+                if (strcmp(key.event.c_str(), eventName) == 0) // If it has a key with the specified event set
+                {
+                    ++usageCount;
+                    if (key.time < firstTime)
+                    {
+                        firstTime = key.time;
+                    }
+                }
+            }
+        }
+    }
+
+    if (usageCount > 0)
+    {
+        timeFirstUsed = firstTime;
+    }
+    return usageCount;
+}
+
+#include <TrackView/moc_TVEventsDialog.cpp>
diff --git a/Code/Editor/TrackView/TVEventsDialog.h b/Code/Editor/TrackView/TVEventsDialog.h
new file mode 100644
index 0000000000..6a27d1ef85
--- /dev/null
+++ b/Code/Editor/TrackView/TVEventsDialog.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TVEVENTSDIALOG_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TVEVENTSDIALOG_H
+#pragma once
+
+
+#if !defined(Q_MOC_RUN)
+#include <IMovieSystem.h>
+
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class TVEventsDialog;
+}
+
+// CTVEventsDialog dialog
+
+class CTVEventsDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CTVEventsDialog(QWidget* pParent = nullptr);   // standard constructor
+    virtual ~CTVEventsDialog();
+
+    void OnBnClickedButtonAddEvent();
+    void OnBnClickedButtonRemoveEvent();
+    void OnBnClickedButtonRenameEvent();
+    void OnBnClickedButtonUpEvent();
+    void OnBnClickedButtonDownEvent();
+    void OnListItemChanged();
+
+    const QString& GetLastAddedEvent();
+
+protected:
+    void OnInitDialog();
+
+    void UpdateButtons();
+
+private:
+    QScopedPointer<Ui::TVEventsDialog> m_ui;
+    QString m_lastAddedEvent;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TVEVENTSDIALOG_H
diff --git a/Code/Sandbox/Editor/TrackView/TVEventsDialog.ui b/Code/Editor/TrackView/TVEventsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVEventsDialog.ui
rename to Code/Editor/TrackView/TVEventsDialog.ui
diff --git a/Code/Editor/TrackView/TVSequenceProps.cpp b/Code/Editor/TrackView/TVSequenceProps.cpp
new file mode 100644
index 0000000000..f97a9453e0
--- /dev/null
+++ b/Code/Editor/TrackView/TVSequenceProps.cpp
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : implementation file
+
+
+#include "EditorDefs.h"
+
+#include "TVSequenceProps.h"
+
+// Qt
+#include <QMessageBox>
+
+// Editor
+#include "TrackViewSequence.h"
+#include "TrackViewSequenceManager.h"
+#include "AnimationContext.h"
+
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <TrackView/ui_TVSequenceProps.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+CTVSequenceProps::CTVSequenceProps(CTrackViewSequence* pSequence, float fps, QWidget* pParent)
+    : QDialog(pParent)
+    , m_FPS(fps)
+    , m_outOfRange(0)
+    , m_timeUnit(Seconds)
+    , ui(new Ui::CTVSequenceProps)
+{
+    ui->setupUi(this);
+    assert(pSequence);
+    m_pSequence = pSequence;
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &CTVSequenceProps::OnOK);
+    connect(ui->CUT_SCENE, &QCheckBox::toggled, this, &CTVSequenceProps::ToggleCutsceneOptions);
+    connect(ui->TO_SECONDS, &QRadioButton::toggled, this, &CTVSequenceProps::OnBnClickedToSeconds);
+    connect(ui->TO_FRAMES, &QRadioButton::toggled, this, &CTVSequenceProps::OnBnClickedToFrames);
+
+    OnInitDialog();
+}
+
+CTVSequenceProps::~CTVSequenceProps()
+{
+}
+
+// CTVSequenceProps message handlers
+BOOL CTVSequenceProps::OnInitDialog()
+{
+    ui->NAME->setText(m_pSequence->GetName());
+    int seqFlags = m_pSequence->GetFlags();
+
+    ui->ALWAYS_PLAY->setChecked((seqFlags & IAnimSequence::eSeqFlags_PlayOnReset));
+    ui->CUT_SCENE->setChecked((seqFlags & IAnimSequence::eSeqFlags_CutScene));
+    ui->DISABLEPLAYER->setChecked((seqFlags & IAnimSequence::eSeqFlags_NoPlayer));
+    ui->DISABLESOUNDS->setChecked((seqFlags & IAnimSequence::eSeqFlags_NoGameSounds));
+    ui->NOSEEK->setChecked((seqFlags & IAnimSequence::eSeqFlags_NoSeek));
+    ui->NOABORT->setChecked((seqFlags & IAnimSequence::eSeqFlags_NoAbort));
+    ui->EARLYMOVIEUPDATE->setChecked((seqFlags & IAnimSequence::eSeqFlags_EarlyMovieUpdate));
+
+    ToggleCutsceneOptions(ui->CUT_SCENE->isChecked());
+
+    ui->MOVE_SCALE_KEYS->setChecked(BST_UNCHECKED);
+
+    ui->START_TIME->setRange(0.0, (1e+5));
+    ui->END_TIME->setRange(0.0, (1e+5));
+
+    Range timeRange = m_pSequence->GetTimeRange();
+    float invFPS = 1.0f / m_FPS;
+
+    m_timeUnit = Seconds;
+    ui->START_TIME->setValue(timeRange.start);
+    ui->START_TIME->setSingleStep(invFPS);
+    ui->END_TIME->setValue(timeRange.end);
+    ui->END_TIME->setSingleStep(invFPS);
+
+
+    m_outOfRange = 0;
+    if (m_pSequence->GetFlags() & IAnimSequence::eSeqFlags_OutOfRangeConstant)
+    {
+        m_outOfRange = 1;
+        ui->ORT_CONSTANT->setChecked(true);
+    }
+    else if (m_pSequence->GetFlags() & IAnimSequence::eSeqFlags_OutOfRangeLoop)
+    {
+        m_outOfRange = 2;
+        ui->ORT_LOOP->setChecked(true);
+    }
+    else
+    {
+        ui->ORT_ONCE->setChecked(true);
+    }
+
+    return TRUE;  // return TRUE unless you set the focus to a control
+    // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void CTVSequenceProps::MoveScaleKeys()
+{
+    // Move/Rescale the sequence to a new time range.
+    Range timeRangeOld = m_pSequence->GetTimeRange();
+    Range timeRangeNew;
+    timeRangeNew.start = ui->START_TIME->value();
+    timeRangeNew.end = ui->END_TIME->value();
+
+    if (!(timeRangeNew == timeRangeOld))
+    {
+        m_pSequence->AdjustKeysToTimeRange(timeRangeNew);
+    }
+}
+
+void CTVSequenceProps::UpdateSequenceProps(const QString& name)
+{
+    if (ui->MOVE_SCALE_KEYS->isChecked())
+    {
+        MoveScaleKeys();
+    }
+
+    Range timeRange;
+    timeRange.start = ui->START_TIME->value();
+    timeRange.end = ui->END_TIME->value();
+
+    if (m_timeUnit == Frames)
+    {
+        float invFPS = 1.0f / m_FPS;
+        timeRange.start = ui->START_TIME->value() * invFPS;
+        timeRange.end = ui->END_TIME->value() * invFPS;
+    }
+
+    m_pSequence->SetTimeRange(timeRange);
+
+    CAnimationContext* ac = GetIEditor()->GetAnimation();
+    if (ac)
+    {
+        ac->UpdateTimeRange();
+    }
+
+    QString seqName = m_pSequence->GetName();
+    if (name != seqName)
+    {
+        // Rename sequence.
+        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+
+        sequenceManager->RenameNode(m_pSequence, name.toUtf8().data());
+    }
+
+    int seqFlags = m_pSequence->GetFlags();
+    seqFlags &= ~(IAnimSequence::eSeqFlags_OutOfRangeConstant | IAnimSequence::eSeqFlags_OutOfRangeLoop);
+
+    if (ui->ALWAYS_PLAY->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_PlayOnReset;
+    }
+    else
+    {
+        seqFlags &= ~IAnimSequence::eSeqFlags_PlayOnReset;
+    }
+
+    if (ui->CUT_SCENE->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_CutScene;
+    }
+    else
+    {
+        seqFlags &= ~IAnimSequence::eSeqFlags_CutScene;
+    }
+
+    if (ui->DISABLEPLAYER->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_NoPlayer;
+    }
+    else
+    {
+        seqFlags &= (~IAnimSequence::eSeqFlags_NoPlayer);
+    }
+
+    if (ui->ORT_CONSTANT->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_OutOfRangeConstant;
+    }
+    else if (ui->ORT_LOOP->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_OutOfRangeLoop;
+    }
+
+    if (ui->DISABLESOUNDS->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_NoGameSounds;
+    }
+    else
+    {
+        seqFlags &= (~IAnimSequence::eSeqFlags_NoGameSounds);
+    }
+
+    if (ui->NOSEEK->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_NoSeek;
+    }
+    else
+    {
+        seqFlags &= (~IAnimSequence::eSeqFlags_NoSeek);
+    }
+
+    if (ui->NOABORT->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_NoAbort;
+    }
+    else
+    {
+        seqFlags &= (~IAnimSequence::eSeqFlags_NoAbort);
+    }
+
+    if (ui->EARLYMOVIEUPDATE->isChecked())
+    {
+        seqFlags |= IAnimSequence::eSeqFlags_EarlyMovieUpdate;
+    }
+    else
+    {
+        seqFlags &= (~IAnimSequence::eSeqFlags_EarlyMovieUpdate);
+    }
+
+    if (static_cast<IAnimSequence::EAnimSequenceFlags>(seqFlags) != m_pSequence->GetFlags())
+    {
+        AzToolsFramework::ScopedUndoBatch undoBatch("Change TrackView Sequence Flags");
+        m_pSequence->SetFlags(static_cast<IAnimSequence::EAnimSequenceFlags>(seqFlags));
+        undoBatch.MarkEntityDirty(m_pSequence->GetSequenceComponentEntityId());
+    }
+}
+
+void CTVSequenceProps::OnOK()
+{
+    QString name = ui->NAME->text();
+    if (name.isEmpty())
+    {
+        QMessageBox::warning(this, "Sequence Properties", "A sequence name cannot be empty!");
+        return;
+    }
+    else if (name.contains('/'))
+    {
+        QMessageBox::warning(this, "Sequence Properties", "A sequence name cannot contain a '/' character!");
+        return;
+    }
+
+    if (m_pSequence != nullptr)
+    {
+        AzToolsFramework::ScopedUndoBatch undoBatch("Change TrackView Sequence Settings");
+        UpdateSequenceProps(name);
+        undoBatch.MarkEntityDirty(m_pSequence->GetSequenceComponentEntityId());
+    }
+
+    accept();
+}
+
+void CTVSequenceProps::ToggleCutsceneOptions(bool bActivated)
+{
+    if (bActivated == FALSE)
+    {
+        ui->NOABORT->setChecked(false);
+        ui->DISABLEPLAYER->setChecked(false);
+        ui->DISABLESOUNDS->setChecked(false);
+    }
+
+    ui->NOABORT->setEnabled(bActivated);
+    ui->DISABLEPLAYER->setEnabled(bActivated);
+    ui->DISABLESOUNDS->setEnabled(bActivated);
+}
+
+void CTVSequenceProps::OnBnClickedToFrames(bool v)
+{
+    if (!v)
+    {
+        return;
+    }
+
+    ui->START_TIME->setSingleStep(1.0f);
+    ui->END_TIME->setSingleStep(1.0f);
+
+    ui->START_TIME->setValue(std::round(ui->START_TIME->value() * static_cast<double>(m_FPS)));
+    ui->END_TIME->setValue(std::round(ui->END_TIME->value() * static_cast<double>(m_FPS)));
+
+    m_timeUnit = Frames;
+}
+
+
+void CTVSequenceProps::OnBnClickedToSeconds(bool v)
+{
+    if (!v)
+    {
+        return;
+    }
+
+    float fInvFPS = 1.0f / m_FPS;
+
+    ui->START_TIME->setSingleStep(fInvFPS);
+    ui->END_TIME->setSingleStep(fInvFPS);
+
+    ui->START_TIME->setValue(ui->START_TIME->value() * fInvFPS);
+    ui->END_TIME->setValue(ui->END_TIME->value() * fInvFPS);
+
+    m_timeUnit = Seconds;
+}
+
+#include <TrackView/moc_TVSequenceProps.cpp>
diff --git a/Code/Editor/TrackView/TVSequenceProps.h b/Code/Editor/TrackView/TVSequenceProps.h
new file mode 100644
index 0000000000..7ebf35a913
--- /dev/null
+++ b/Code/Editor/TrackView/TVSequenceProps.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TVSEQUENCEPROPS_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TVSEQUENCEPROPS_H
+#pragma once
+
+
+class CTrackViewSequence;
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include <QScopedPointer>
+#endif
+
+namespace Ui {
+    class CTVSequenceProps;
+}
+
+class CTVSequenceProps
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CTVSequenceProps(CTrackViewSequence* pSequence, float fps, QWidget* pParent = NULL);    // standard constructor
+    ~CTVSequenceProps();
+
+private:
+    enum SequenceTimeUnit
+    {
+        Seconds = 0,
+        Frames
+    };
+    CTrackViewSequence* m_pSequence;
+
+    virtual BOOL OnInitDialog();
+    virtual void OnOK();
+
+    void MoveScaleKeys();
+    float m_FPS;
+    int m_outOfRange;
+    SequenceTimeUnit m_timeUnit;
+
+    QScopedPointer<Ui::CTVSequenceProps>    ui;
+
+public slots:
+    void OnBnClickedToFrames(bool);
+    void OnBnClickedToSeconds(bool);
+
+private slots:
+    void ToggleCutsceneOptions(bool);
+    void UpdateSequenceProps(const QString& name);
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TVSEQUENCEPROPS_H
diff --git a/Code/Sandbox/Editor/TrackView/TVSequenceProps.ui b/Code/Editor/TrackView/TVSequenceProps.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVSequenceProps.ui
rename to Code/Editor/TrackView/TVSequenceProps.ui
diff --git a/Code/Editor/TrackView/TimeRangeKeyUIControls.cpp b/Code/Editor/TrackView/TimeRangeKeyUIControls.cpp
new file mode 100644
index 0000000000..3170edb9f0
--- /dev/null
+++ b/Code/Editor/TrackView/TimeRangeKeyUIControls.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 "EditorDefs.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"              // for CTrackViewKeyUIControls// Editor
+
+
+//////////////////////////////////////////////////////////////////////////
+class CTimeRangeKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariable<float> mv_startTime;
+    CSmartVariable<float> mv_endTime;
+    CSmartVariable<float> mv_timeScale;
+    CSmartVariable<bool> mv_bLoop;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_startTime, "Start Time");
+        AddVariable(mv_table, mv_endTime, "End Time");
+        AddVariable(mv_table, mv_timeScale, "Time Scale");
+        AddVariable(mv_table, mv_bLoop, "Loop");
+        mv_timeScale->SetLimits(0.001f, 100.f);
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::TimeRanges;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {E977A6F4-CEC1-4c67-8735-28721B3F6FEF}
+        static const GUID guid = {
+            0xe977a6f4, 0xcec1, 0x4c67, { 0x87, 0x35, 0x28, 0x72, 0x1b, 0x3f, 0x6f, 0xef }
+        };
+        return guid;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CTimeRangeKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::TimeRanges)
+        {
+            ICharacterKey timeRangeKey;
+            keyHandle.GetKey(&timeRangeKey);
+
+            mv_endTime = timeRangeKey.m_endTime;
+            mv_startTime = timeRangeKey.m_startTime;
+            mv_timeScale = timeRangeKey.m_speed;
+            mv_bLoop = timeRangeKey.m_bLoop;
+
+            bAssigned = true;
+        }
+    }
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CTimeRangeKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    for (unsigned int keyIndex = 0, num = (int)selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::TimeRanges)
+        {
+            ITimeRangeKey timeRangeKey;
+            keyHandle.GetKey(&timeRangeKey);
+
+            SyncValue(mv_startTime, timeRangeKey.m_startTime, false, pVar);
+            SyncValue(mv_endTime, timeRangeKey.m_endTime, false, pVar);
+            SyncValue(mv_timeScale, timeRangeKey.m_speed, false, pVar);
+            SyncValue(mv_bLoop, timeRangeKey.m_bLoop, false, pVar);
+
+            // Clamp values
+            if (!timeRangeKey.m_bLoop)
+            {
+                timeRangeKey.m_endTime = std::min(timeRangeKey.m_duration, timeRangeKey.m_endTime);
+            }
+            timeRangeKey.m_startTime = std::min(timeRangeKey.m_duration, timeRangeKey.m_startTime);
+            timeRangeKey.m_startTime = std::min(timeRangeKey.m_endTime, timeRangeKey.m_startTime);
+
+            keyHandle.SetKey(&timeRangeKey);
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CTimeRangeKeyUIControls, "TrackView.KeyUI.TimeRange", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/TrackEventKeyUIControls.cpp b/Code/Editor/TrackView/TrackEventKeyUIControls.cpp
new file mode 100644
index 0000000000..fc37dd1b1b
--- /dev/null
+++ b/Code/Editor/TrackView/TrackEventKeyUIControls.cpp
@@ -0,0 +1,238 @@
+/*
+ * 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"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "TrackViewKeyPropertiesDlg.h"
+#include "TVEventsDialog.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+class CTrackEventKeyUIControls
+    : public CTrackViewKeyUIControls
+{
+public:
+    CSmartVariableArray mv_table;
+    CSmartVariableEnum<QString> mv_event;
+    CSmartVariable<QString> mv_value;
+
+    virtual void OnCreateVars()
+    {
+        AddVariable(mv_table, "Key Properties");
+        AddVariable(mv_table, mv_event, "Track Event");
+        mv_event->SetFlags(mv_event->GetFlags() | IVariable::UI_UNSORTED);
+        AddVariable(mv_table, mv_value, "Value");
+    }
+    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+    {
+        return paramType == AnimParamType::TrackEvent;
+    }
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+
+    virtual unsigned int GetPriority() const { return 1; }
+
+    static const GUID& GetClassID()
+    {
+        // {F7D002EB-1FEA-46fa-B857-FC2B1B990B7F}
+        static const GUID guid =
+        {
+            0xf7d002eb, 0x1fea, 0x46fa, { 0xb8, 0x57, 0xfc, 0x2b, 0x1b, 0x99, 0xb, 0x7f }
+        };
+        return guid;
+    }
+
+private:
+    void OnEventEdit();
+    void BuildEventDropDown(QString& curEvent, const QString& addedEvent = "");
+
+    QString m_lastEvent;
+
+    static const char* GetAddEventString()
+    {
+        static const char* addEventString = "Add a new event...";
+
+        return addEventString;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackEventKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    if (!selectedKeys.AreAllKeysOfSameType())
+    {
+        return false;
+    }
+
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::TrackEvent)
+        {
+            IEventKey eventKey;
+            keyHandle.GetKey(&eventKey);
+
+            // Provide builder with current event value to ensure
+            // dropdown is displayed properly and value is updated if not found
+            QString event = eventKey.event.c_str();
+            BuildEventDropDown(event);
+
+            mv_event = event;
+            mv_value = eventKey.eventValue.c_str();
+
+            bAssigned = true;
+        }
+    }
+
+    m_lastEvent = mv_event;
+
+    return bAssigned;
+}
+
+// Called when UI variable changes.
+void CTrackEventKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
+    {
+        return;
+    }
+
+    if (mv_event == GetAddEventString())
+    {
+        mv_event = m_lastEvent;
+        OnEventEdit();
+        return;
+    }
+
+    if (mv_event == "___spacer___")
+    {
+        mv_event = m_lastEvent;
+        return;
+    }
+
+    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+
+        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
+        if (paramType == AnimParamType::TrackEvent)
+        {
+            IEventKey eventKey;
+            keyHandle.GetKey(&eventKey);
+
+            QByteArray event, value;
+            event = static_cast<QString>(mv_event).toUtf8();
+            value = static_cast<QString>(mv_value).toUtf8();
+
+            if (pVar == mv_event.GetVar())
+            {
+                eventKey.event = event.data();
+            }
+            if (pVar == mv_value.GetVar())
+            {
+                eventKey.eventValue = value.data();
+            }
+            eventKey.animation = "";
+            eventKey.duration = 0;
+
+            keyHandle.SetKey(&eventKey);
+        }
+    }
+
+    m_lastEvent = mv_event;
+}
+
+void CTrackEventKeyUIControls::OnEventEdit()
+{
+    // Create dialog
+    CTVEventsDialog dlg;
+    dlg.exec();
+
+    QString event = mv_event;
+    BuildEventDropDown(event, dlg.GetLastAddedEvent());
+
+    // The step below is necessary to make the event drop-down up-to-date.
+    mv_event.GetVar()->EnableNotifyWithoutValueChange(true);
+    mv_event = event;
+    mv_event.GetVar()->EnableNotifyWithoutValueChange(false);
+}
+
+void CTrackEventKeyUIControls::BuildEventDropDown(QString& curEvent, const QString& addedEvent)
+{
+    if (CAnimationContext* context = GetIEditor()->GetAnimation())
+    {
+        CTrackViewSequence* sequence = context->GetSequence();
+
+        if (sequence)
+        {
+            bool curEventExists = false;
+            bool addedEventExists = false;
+            mv_event.SetEnumList(NULL);
+            const int eventCount = sequence->GetTrackEventsCount();
+
+            // Need to check if event exists before adding all events
+            // This handles the case where the current event got deleted in the dialog but no new events were added
+            for (int i = 0; i < eventCount; ++i)
+            {
+                const char* trackEvent = sequence->GetTrackEvent(i);
+
+                if (curEvent == trackEvent)
+                {
+                    curEventExists = true;
+                }
+                if (addedEvent == trackEvent)
+                {
+                    addedEventExists = true;
+                }
+                if (curEventExists && addedEventExists)
+                {
+                    break;
+                }
+            }
+
+            if (!curEventExists)
+            {
+                if (addedEventExists)
+                {
+                    // Set added event if key not set
+                    curEvent = addedEvent;
+                }
+                else
+                {
+                    mv_event->AddEnumItem(QObject::tr("<None>"), "");
+                    curEvent = "";
+                }
+            }
+
+            // Add Events
+            for (int i = 0; i < eventCount; ++i)
+            {
+                const char* trackEvent = sequence->GetTrackEvent(i);
+
+                mv_event->AddEnumItem(trackEvent, trackEvent);
+            }
+
+            // Used as a spacer to make Add a new event... standout
+            mv_event->AddEnumItem(QObject::tr(""), "___spacer___");
+
+            // Add a new event... to open event editor when selected
+            mv_event->AddEnumItem(QObject::tr(GetAddEventString()), GetAddEventString());
+        }
+    }
+}
+
+REGISTER_QT_CLASS_DESC(CTrackEventKeyUIControls, "TrackView.KeyUI.TrackEvent", "TrackViewKeyUI");
diff --git a/Code/Editor/TrackView/TrackViewAnimNode.cpp b/Code/Editor/TrackView/TrackViewAnimNode.cpp
new file mode 100644
index 0000000000..67beaa2369
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewAnimNode.cpp
@@ -0,0 +1,2627 @@
+/*
+ * 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 "TrackViewAnimNode.h"
+
+// AzFramework
+#include <AzFramework/API/ApplicationAPI.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorDisabledCompositionBus.h>
+#include <AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.h>
+#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+
+// CryCommon
+#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+#include <CryCommon/Maestro/Types/AnimValueType.h>
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "AnimationContext.h"
+#include "Clipboard.h"
+#include "CommentNodeAnimator.h"
+#include "DirectorNodeAnimator.h"
+#include "RenderViewport.h"
+#include "ViewManager.h"
+#include "Include/IObjectManager.h"
+#include "Objects/GizmoManager.h"
+#include "Objects/SelectionGroup.h"
+#include "TrackView/TrackViewDialog.h"
+#include "TrackView/TrackViewSequence.h"
+#include "TrackView/TrackViewUndo.h"
+#include "TrackView/TrackViewNodeFactories.h"
+
+// static class data
+const AZ::Uuid CTrackViewAnimNode::s_nullUuid = AZ::Uuid::CreateNull();
+
+//////////////////////////////////////////////////////////////////////////
+static void CreateDefaultTracksForEntityNode(CTrackViewAnimNode* node, const AZStd::vector<AnimParamType>& tracks)
+{
+    AZ_Assert(node->GetType() == AnimNodeType::AzEntity, "Expected AzEntity node for creating default tracks");
+
+    // add a Transform Component anim node if needed, then go through and look for Position,
+    // Rotation and Scale default tracks and adds them by hard-coded Virtual Property name. This is not a scalable way to do this,
+    // but fits into the legacy Track View entity property system. This will all be re-written in a new TrackView for components in the future.
+    AZ::Entity* entity = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, node->GetAzEntityId());
+    if (entity)
+    {
+        AZ::Component* transformComponent = entity->FindComponent(AzToolsFramework::Components::TransformComponent::TYPEINFO_Uuid());
+        if (transformComponent)
+        {
+            // find a transform Component Node if it exists, otherwise create one.
+            CTrackViewAnimNode* transformComponentNode = nullptr;
+
+            for (int i = node->GetChildCount(); --i >= 0;)
+            {
+                if (node->GetChild(i)->GetNodeType() == eTVNT_AnimNode)
+                {
+                    CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(node->GetChild(i));
+                    AZ::ComponentId componentId = childAnimNode->GetComponentId();
+                    AZ::Uuid componentTypeId;
+                    AzFramework::ApplicationRequests::Bus::BroadcastResult(componentTypeId, &AzFramework::ApplicationRequests::Bus::Events::GetComponentTypeId, entity->GetId(), componentId);
+                    if (componentTypeId == AzToolsFramework::Components::TransformComponent::TYPEINFO_Uuid())
+                    {
+                        transformComponentNode = childAnimNode;
+                        break;
+                    }
+                }
+            }
+
+            if (!transformComponentNode)
+            {
+                // no existing Transform Component node found - create one.
+                transformComponentNode = node->AddComponent(transformComponent, false);
+            }
+
+            if (transformComponentNode)
+            {
+                for (size_t i = 0; i < tracks.size(); ++i)
+                {
+                    // This is not ideal - we hard-code the VirtualProperty names for "Position", "Rotation", 
+                    // and "Scale" here, which creates an implicitly name dependency, but these are unlikely to change.
+                    CAnimParamType paramType = tracks[i];
+                    CAnimParamType transformPropertyParamType;
+                    bool createTransformTrack = false;
+
+                    if (paramType.GetType() == AnimParamType::Position)
+                    {
+                        transformPropertyParamType = AZStd::string("Position");
+                        createTransformTrack = true;
+                    }
+                    else if (paramType.GetType() == AnimParamType::Rotation)
+                    {
+                        transformPropertyParamType = AZStd::string("Rotation");
+                        createTransformTrack = true;
+                    }
+                    else if (paramType.GetType() == AnimParamType::Scale)
+                    {
+                        transformPropertyParamType = AZStd::string("Scale");
+                        createTransformTrack = true;
+                    }
+
+                    if (createTransformTrack)
+                    {
+                        // this sets the type to one of AnimParamType::Position, AnimParamType::Rotation or AnimParamType::Scale
+                        // but maintains the name
+                        transformPropertyParamType = paramType.GetType();
+                        transformComponentNode->CreateTrack(transformPropertyParamType);
+                    }
+                }
+            } 
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNodeBundle::AppendAnimNode(CTrackViewAnimNode* node)
+{
+    stl::push_back_unique(m_animNodes, node);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNodeBundle::AppendAnimNodeBundle(const CTrackViewAnimNodeBundle& bundle)
+{
+    for (auto iter = bundle.m_animNodes.begin(); iter != bundle.m_animNodes.end(); ++iter)
+    {
+        AppendAnimNode(*iter);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNodeBundle::ExpandAll(bool bAlsoExpandParentNodes)
+{
+    std::set<CTrackViewNode*> nodesToExpand;
+    std::copy(m_animNodes.begin(), m_animNodes.end(), std::inserter(nodesToExpand, nodesToExpand.end()));
+
+    if (bAlsoExpandParentNodes)
+    {
+        for (auto iter = nodesToExpand.begin(); iter != nodesToExpand.end(); ++iter)
+        {
+            CTrackViewNode* node = *iter;
+
+            for (CTrackViewNode* pParent = node->GetParentNode(); pParent; pParent = pParent->GetParentNode())
+            {
+                nodesToExpand.insert(pParent);
+            }
+        }
+    }
+
+    for (auto iter = nodesToExpand.begin(); iter != nodesToExpand.end(); ++iter)
+    {
+        (*iter)->SetExpanded(true);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNodeBundle::CollapseAll()
+{
+    for (auto iter = m_animNodes.begin(); iter != m_animNodes.end(); ++iter)
+    {
+        (*iter)->SetExpanded(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const bool CTrackViewAnimNodeBundle::DoesContain(const CTrackViewNode* pTargetNode)
+{
+    return stl::find(m_animNodes, pTargetNode);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNodeBundle::Clear()
+{
+    m_animNodes.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode::CTrackViewAnimNode(IAnimSequence* pSequence, IAnimNode* animNode, CTrackViewNode* pParentNode)
+    : CTrackViewNode(pParentNode)
+    , m_animSequence(pSequence)
+    , m_animNode(animNode)
+    , m_pNodeAnimator(nullptr)
+    , m_trackGizmo(nullptr)
+{
+    if (animNode)
+    {
+        // Search for child nodes
+        const int nodeCount = pSequence->GetNodeCount();
+        for (int i = 0; i < nodeCount; ++i)
+        {
+            IAnimNode* node = pSequence->GetNode(i);
+            IAnimNode* pNodeParentNode = node->GetParent();
+
+            // If our node is the parent, then the current node is a child of it
+            if (animNode == pNodeParentNode)
+            {
+                CTrackViewAnimNodeFactory animNodeFactory;
+                CTrackViewAnimNode* pNewTVAnimNode = animNodeFactory.BuildAnimNode(pSequence, node, this);
+                m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNewTVAnimNode));
+            }
+        }
+
+        // Copy tracks from animNode
+        const int trackCount = animNode->GetTrackCount();
+        for (int i = 0; i < trackCount; ++i)
+        {
+            IAnimTrack* pTrack = animNode->GetTrackByIndex(i);
+
+            CTrackViewTrackFactory trackFactory;
+            CTrackViewTrack* pNewTVTrack = trackFactory.BuildTrack(pTrack, this, this);
+            m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNewTVTrack));
+        }
+
+        // Set owner to update entity CryMovie entity IDs and remove it again
+        SetNodeEntityId(GetNodeEntityId());
+    }
+
+    SortNodes();
+
+    switch (GetType())
+    {
+    case AnimNodeType::Comment:
+        m_pNodeAnimator.reset(new CCommentNodeAnimator(this));
+        break;
+    case AnimNodeType::Layer:
+        AZ_Assert(false, "Animated Cry Layers are unsupported");
+        return;
+    case AnimNodeType::Director:
+        m_pNodeAnimator.reset(new CDirectorNodeAnimator(this));
+        break;
+    }
+
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
+
+    if (IsBoundToAzEntity())
+    {
+        AZ::TransformNotificationBus::Handler::BusConnect(GetAzEntityId());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode::~CTrackViewAnimNode()
+{
+    if (m_trackGizmo.get())
+    {
+        GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_trackGizmo);
+        m_trackGizmo = nullptr;
+    }
+
+    UnRegisterEditorObjectListeners();
+
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
+
+    if (IsBoundToAzEntity())
+    {
+        AZ::EntityId entityId = GetAzEntityId();
+        AZ::TransformNotificationBus::Handler::BusDisconnect(entityId);
+        AZ::EntityBus::Handler::BusDisconnect(entityId);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::BindToEditorObjects()
+{
+    if (!IsActive())
+    {
+        return;
+    }
+
+    CTrackViewSequenceNotificationContext context(GetSequence());
+
+    CTrackViewAnimNode* director = GetDirector();
+    const bool bBelongsToActiveDirector = director ? director->IsActiveDirector() : true;
+
+    if (bBelongsToActiveDirector)
+    {
+        bool ownerChanged = false;
+        if (m_pNodeAnimator)
+        {
+            m_pNodeAnimator->Bind(this);
+        }
+
+        if (m_animNode)
+        {
+            m_animNode->SetNodeOwner(this);
+            ownerChanged = true;
+        }
+
+        if (const AZ::EntityId entityId = GetNodeEntityId();
+            entityId.IsValid())
+        {
+            RegisterEditorObjectListeners(entityId);
+            SetNodeEntityId(entityId);
+        }
+
+        if (ownerChanged)
+        {
+            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged);
+        }
+
+        for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+        {
+            CTrackViewNode* pChildNode = (*iter).get();
+            if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+            {
+                CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
+                pChildAnimNode->BindToEditorObjects();
+            }
+        }
+    }
+
+    UpdateTrackGizmo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::UnBindFromEditorObjects()
+{
+    CTrackViewSequenceNotificationContext context(GetSequence());
+
+    UnRegisterEditorObjectListeners();
+
+    if (m_animNode)
+    {
+        // 'Owner' is the TrackViewNode, as opposed to the EditorEntityNode (as 'owner' is used in animSequence, or the pEntity 
+        // returned from FindAnimNodeOwner() - confusing, isn't it?
+        m_animNode->SetNodeOwner(nullptr);
+    }
+
+    if (m_pNodeAnimator)
+    {
+        m_pNodeAnimator->UnBind(this);
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
+            pChildAnimNode->UnBindFromEditorObjects();
+        }
+    }
+
+    GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_trackGizmo);
+    m_trackGizmo = nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::IsBoundToEditorObjects() const
+{
+    if (m_animNode)
+    {
+        if (m_animNode->GetType() == AnimNodeType::AzEntity)
+        {
+            // check if bound to comoponent entity
+            return m_animNode->GetAzEntityId().IsValid();
+        }
+        else
+        {
+            // check if bound to legacy entity
+            return (m_animNode->GetNodeOwner() != NULL);
+        }
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SyncToConsole(SAnimContext& animContext)
+{
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
+            pChildAnimNode->SyncToConsole(animContext);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode* CTrackViewAnimNode::CreateSubNode(
+    const QString& originalName, const AnimNodeType animNodeType, const AZ::EntityId owner, AZ::Uuid componentTypeId,
+    AZ::ComponentId componentId)
+{
+    const bool isGroupNode = IsGroupNode();
+    AZ_Assert(isGroupNode, "Expected CreateSubNode to be called on a group capible node.");
+    if (!isGroupNode)
+    {
+        return nullptr;
+    }
+
+    const auto originalNameStr = originalName.toUtf8();
+
+    // Find the director or sequence.
+    CTrackViewAnimNode* director = (GetType() == AnimNodeType::Director) ? this : GetDirector();
+    director = director ? director : GetSequence();
+    AZ_Assert(director, "Expected a valid director or sequence to be found.");
+    if (!director)
+    {
+        return nullptr;
+    }
+
+    // If this is an AzEntity, make sure there is an associated entity id
+    if (animNodeType == AnimNodeType::AzEntity)
+    {
+        if (!owner.IsValid())
+        {
+            GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(
+                AZStd::string::format(
+                    "Failed to add '%s' to sequence '%s', could not find associated entity. "
+                    "Please try adding the entity associated with '%s'.",
+                    originalNameStr.constData(), director->GetName(), originalNameStr.constData()));
+
+            return nullptr;
+        }
+    }
+
+    QString name = originalName;
+
+    // Check if the node's director or sequence already contains a node with this name, unless it's a component, for which we allow duplicate names since
+    // Components are children of unique AZEntities in Track View. If a different Entity component with the same name exists, create a new unique name;
+    if (animNodeType != AnimNodeType::Component)
+    {
+        CTrackViewAnimNode* director2 = (GetType() == AnimNodeType::Director) ? this : GetDirector();
+        director2 = director2 ? director2 : GetSequence();
+
+        AZ_Assert(director2, "Expected a valid director or sequence to be found.");
+        if (!director2)
+        {
+            return nullptr;
+        }
+
+        bool alreadyExists = false;
+
+        // If this is a valid AzEntity, we may generate a unique name if a dupe name is found
+        // from a different entity.
+        if (owner.IsValid())
+        {
+            // Check for a duplicates
+            CTrackViewAnimNodeBundle azEntityNodesFound = director2->GetAnimNodesByType(AnimNodeType::AzEntity);
+            for (int x = 0; x < azEntityNodesFound.GetCount(); x++)
+            {
+                if (azEntityNodesFound.GetNode(x)->GetAzEntityId() == owner)
+                {
+                    alreadyExists = true;
+                    break;
+                }
+            }
+        }
+        else
+        {
+            // Search by name for other non AzEntity 
+            alreadyExists = director2->GetAnimNodesByName(name.toUtf8().data()).GetCount() > 0;
+        }
+
+        // Show an error if this node is a duplicate
+        if (alreadyExists)
+        {
+            GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(
+                AZStd::string::format("'%s' already exists in sequence '%s', skipping...",
+                    originalNameStr.constData(), director2->GetName()));
+
+            return nullptr;
+        }
+
+        // Ensure a unique name, disallowed duplicates are already resolved by here.
+        name = GetAvailableNodeNameStartingWith(name);
+    }
+
+    const auto nameStr = name.toUtf8();
+
+    // Create CryMovie and TrackView node
+    IAnimNode* newAnimNode = m_animSequence->CreateNode(animNodeType);
+    if (!newAnimNode)
+    {
+        GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(
+            AZStd::string::format("Failed to add '%s' to sequence '%s'.", nameStr.constData(), director->GetName()));
+        return nullptr;
+    }
+
+    newAnimNode->SetName(nameStr.constData());
+    newAnimNode->CreateDefaultTracks();
+    newAnimNode->SetParent(m_animNode.get());
+    newAnimNode->SetComponent(componentId, componentTypeId);
+
+    CTrackViewAnimNodeFactory animNodeFactory;
+    CTrackViewAnimNode* newNode = animNodeFactory.BuildAnimNode(m_animSequence, newAnimNode, this);
+
+    // Make sure that camera and entity nodes get created with an owner
+    AZ_Assert((animNodeType != AnimNodeType::Camera && animNodeType != AnimNodeType::Entity), "Entity node should have valid owner.");
+
+    newNode->SetNodeEntityId(owner);
+    newAnimNode->SetNodeOwner(newNode);
+
+    newNode->BindToEditorObjects();
+
+    AddNode(newNode);
+
+    // Add node to sequence, let AZ Undo take care of undo/redo
+    m_animSequence->AddNode(newNode->m_animNode.get());
+
+    return newNode;
+}
+
+// Helper function to remove a child node
+void CTrackViewAnimNode::RemoveChildNode(CTrackViewAnimNode* child)
+{
+    assert(child);
+    auto parent = static_cast<CTrackViewAnimNode*>(child->m_pParentNode);
+    assert(parent);
+
+    child->UnBindFromEditorObjects();
+
+    for (auto iter = parent->m_childNodes.begin(); iter != parent->m_childNodes.end(); ++iter)
+    {
+        std::unique_ptr<CTrackViewNode>& currentNode = *iter;
+
+        if (currentNode.get() == child)
+        {
+            parent->m_childNodes.erase(iter);
+            break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::RemoveSubNode(CTrackViewAnimNode* pSubNode)
+{
+    assert(CUndo::IsRecording());
+
+    const bool bIsGroupNode = IsGroupNode();
+    assert(bIsGroupNode);
+    if (!bIsGroupNode)
+    {
+        return;
+    }
+
+    // remove anim node children
+    for (int i = pSubNode->GetChildCount(); --i >= 0;)
+    {
+        CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(pSubNode->GetChild(i));
+        if (childAnimNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            RemoveSubNode(childAnimNode);
+        }
+    }
+
+    // Remove node from sequence entity, let AZ Undo take care of undo/redo
+    m_animSequence->RemoveNode(pSubNode->m_animNode.get(), /*removeChildRelationships=*/ false);
+    pSubNode->GetSequence()->OnNodeChanged(pSubNode, ITrackViewSequenceListener::eNodeChangeType_Removed);
+    RemoveChildNode(pSubNode);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrack* CTrackViewAnimNode::CreateTrack(const CAnimParamType& paramType)
+{
+    assert(CUndo::IsRecording());
+
+    if (GetTrackForParameter(paramType) && !(GetParamFlags(paramType) & IAnimNode::eSupportedParamFlags_MultipleTracks))
+    {
+        return nullptr;
+    }
+
+    // Create CryMovie track
+    IAnimTrack* pNewAnimTrack = m_animNode->CreateTrack(paramType);
+    if (!pNewAnimTrack)
+    {
+        return nullptr;
+    }
+
+    // Create Track View Track
+    CTrackViewTrackFactory trackFactory;
+    CTrackViewTrack* pNewTrack = trackFactory.BuildTrack(pNewAnimTrack, this, this);
+
+    AddNode(pNewTrack);
+
+    MarkAsModified();
+
+    const AnimParamType animParamType = paramType.GetType();
+    SetPosRotScaleTracksDefaultValues(
+        animParamType == AnimParamType::Position,
+        animParamType == AnimParamType::Rotation,
+        animParamType == AnimParamType::Scale
+    );
+
+    return pNewTrack;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::RemoveTrack(CTrackViewTrack* track)
+{
+    assert(CUndo::IsRecording());
+    assert(!track->IsSubTrack());
+
+    if (!track->IsSubTrack())
+    {
+        CTrackViewSequence* sequence = track->GetSequence();
+        if (nullptr != sequence)
+        {
+            AzToolsFramework::ScopedUndoBatch undoBatch("Remove Track");
+            CTrackViewAnimNode* parentNode = track->GetAnimNode();
+            std::unique_ptr<CTrackViewNode> foundTrack;
+
+            if (nullptr != parentNode)
+            {
+                for (auto iter = parentNode->m_childNodes.begin(); iter != parentNode->m_childNodes.end(); ++iter)
+                {
+                    std::unique_ptr<CTrackViewNode>& currentNode = *iter;
+                    if (currentNode.get() == track)
+                    {
+                        // Hang onto a reference until after OnNodeChanged is called.
+                        currentNode.swap(foundTrack);
+
+                        // Remove from parent node and sequence
+                        parentNode->m_childNodes.erase(iter);
+                        parentNode->m_animNode->RemoveTrack(track->GetAnimTrack());
+                        break;
+                    }
+                }
+
+                m_pParentNode->GetSequence()->OnNodeChanged(track, ITrackViewSequenceListener::eNodeChangeType_Removed);
+
+                // Release the track now that OnNodeChanged is complete.
+                if (nullptr != foundTrack.get())
+                {
+                    foundTrack.release();
+                }
+
+            }
+            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());            
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::SnapTimeToPrevKey(float& time) const
+{
+    const float startTime = time;
+    float closestTrackTime = std::numeric_limits<float>::min();
+    bool bFoundPrevKey = false;
+
+    for (size_t i = 0; i < m_childNodes.size(); ++i)
+    {
+        const CTrackViewNode* node = m_childNodes[i].get();
+
+        float closestNodeTime = startTime;
+        if (node->SnapTimeToPrevKey(closestNodeTime))
+        {
+            closestTrackTime = std::max(closestNodeTime, closestTrackTime);
+            bFoundPrevKey = true;
+        }
+    }
+
+    if (bFoundPrevKey)
+    {
+        time = closestTrackTime;
+    }
+
+    return bFoundPrevKey;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::SnapTimeToNextKey(float& time) const
+{
+    const float startTime = time;
+    float closestTrackTime = std::numeric_limits<float>::max();
+    bool bFoundNextKey = false;
+
+    for (size_t i = 0; i < m_childNodes.size(); ++i)
+    {
+        const CTrackViewNode* node = m_childNodes[i].get();
+
+        float closestNodeTime = startTime;
+        if (node->SnapTimeToNextKey(closestNodeTime))
+        {
+            closestTrackTime = std::min(closestNodeTime, closestTrackTime);
+            bFoundNextKey = true;
+        }
+    }
+
+    if (bFoundNextKey)
+    {
+        time = closestTrackTime;
+    }
+
+    return bFoundNextKey;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetExpanded(bool expanded)
+{
+    if (GetExpanded() != expanded)
+    {
+        CTrackViewSequence* sequence = GetSequence();
+        AZ_Assert(nullptr != sequence, "Every node should have a sequence.");
+        if (nullptr != sequence)
+        {
+            AZ_Assert(m_animNode, "Expected m_animNode to be valid.");
+            if (m_animNode)
+            {
+                m_animNode->SetExpanded(expanded);
+            }
+
+            if (expanded)
+            {
+                sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Expanded);
+            }
+            else
+            {
+                sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Collapsed);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::GetExpanded() const
+{
+    bool result = true;
+
+    AZ_Assert(m_animNode, "Expected m_animNode to be valid.");
+    if (m_animNode)
+    {
+        result = m_animNode->GetExpanded();
+    }
+
+    return result;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyBundle CTrackViewAnimNode::GetSelectedKeys()
+{
+    CTrackViewKeyBundle bundle;
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        bundle.AppendKeyBundle((*iter)->GetSelectedKeys());
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyBundle CTrackViewAnimNode::GetAllKeys()
+{
+    CTrackViewKeyBundle bundle;
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        bundle.AppendKeyBundle((*iter)->GetAllKeys());
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyBundle CTrackViewAnimNode::GetKeysInTimeRange(const float t0, const float t1)
+{
+    CTrackViewKeyBundle bundle;
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        bundle.AppendKeyBundle((*iter)->GetKeysInTimeRange(t0, t1));
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrackBundle CTrackViewAnimNode::GetAllTracks()
+{
+    return GetTracks(false, CAnimParamType());
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrackBundle CTrackViewAnimNode::GetSelectedTracks()
+{
+    return GetTracks(true, CAnimParamType());
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrackBundle CTrackViewAnimNode::GetTracksByParam(const CAnimParamType& paramType) const
+{
+    return GetTracks(false, paramType);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrackBundle CTrackViewAnimNode::GetTracks(const bool bOnlySelected, const CAnimParamType& paramType) const
+{
+    CTrackViewTrackBundle bundle;
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* node = (*iter).get();
+
+        if (node->GetNodeType() == eTVNT_Track)
+        {
+            CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(node);
+
+            if (paramType != AnimParamType::Invalid && pTrack->GetParameterType() != paramType)
+            {
+                continue;
+            }
+
+            if (!bOnlySelected || pTrack->IsSelected())
+            {
+                bundle.AppendTrack(pTrack);
+            }
+
+            const unsigned int subTrackCount = pTrack->GetChildCount();
+            for (unsigned int subTrackIndex = 0; subTrackIndex < subTrackCount; ++subTrackIndex)
+            {
+                CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(subTrackIndex));
+                if (!bOnlySelected || pSubTrack->IsSelected())
+                {
+                    bundle.AppendTrack(pSubTrack);
+                }
+            }
+        }
+        else if (node->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* animNode = static_cast<CTrackViewAnimNode*>(node);
+            bundle.AppendTrackBundle(animNode->GetTracks(bOnlySelected, paramType));
+        }
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+AnimNodeType CTrackViewAnimNode::GetType() const
+{
+    return m_animNode ? m_animNode->GetType() : AnimNodeType::Invalid;
+}
+
+//////////////////////////////////////////////////////////////////////////
+EAnimNodeFlags CTrackViewAnimNode::GetFlags() const
+{
+    return m_animNode ? (EAnimNodeFlags)m_animNode->GetFlags() : (EAnimNodeFlags)0;
+}
+
+bool CTrackViewAnimNode::AreFlagsSetOnNodeOrAnyParent(EAnimNodeFlags flagsToCheck) const
+{
+    return m_animNode ? m_animNode->AreFlagsSetOnNodeOrAnyParent(flagsToCheck) : false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetAsActiveDirector()
+{
+    if (GetType() == AnimNodeType::Director)
+    {
+        m_animSequence->SetActiveDirector(m_animNode.get());
+
+        GetSequence()->UnBindFromEditorObjects();
+        GetSequence()->BindToEditorObjects();
+
+        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_SetAsActiveDirector);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::IsActiveDirector() const
+{
+    return m_animNode == m_animSequence->GetActiveDirector();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::IsParamValid(const CAnimParamType& param) const
+{
+    return m_animNode ? m_animNode->IsParamValid(param) : false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrack* CTrackViewAnimNode::GetTrackForParameter(const CAnimParamType& paramType, uint32 index) const
+{
+    uint32 currentIndex = 0;
+
+    if (GetType() == AnimNodeType::AzEntity)
+    {
+        // For AzEntity, search for track on all child components - returns first track match found (note components searched in reverse)
+        for (int i = GetChildCount(); --i >= 0;)
+        {
+            if (GetChild(i)->GetNodeType() == eTVNT_AnimNode)
+            {
+                CTrackViewAnimNode* componentNode = static_cast<CTrackViewAnimNode*>(GetChild(i));
+                if (componentNode->GetType() == AnimNodeType::Component)
+                {
+                    if (CTrackViewTrack* track = componentNode->GetTrackForParameter(paramType, index))
+                    {
+                        return track;
+                    }
+                }
+            }
+        }
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* node = (*iter).get();
+
+        if (node->GetNodeType() == eTVNT_Track)
+        {
+            CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(node);
+
+            if (pTrack->GetParameterType() == paramType)
+            {
+                if (currentIndex == index)
+                {
+                    return pTrack;
+                }
+                else
+                {
+                    ++currentIndex;
+                }
+            }
+
+            if (pTrack->IsCompoundTrack())
+            {
+                unsigned int numChildTracks = pTrack->GetChildCount();
+                for (unsigned int i = 0; i < numChildTracks; ++i)
+                {
+                    CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(i));
+                    if (pChildTrack->GetParameterType() == paramType)
+                    {
+                        if (currentIndex == index)
+                        {
+                            return pChildTrack;
+                        }
+                        else
+                        {
+                            ++currentIndex;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::Render(const SAnimContext& ac)
+{
+    if (m_pNodeAnimator && IsActive())
+    {
+        m_pNodeAnimator->Render(this, ac);
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+            pChildAnimNode->Render(ac);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::Animate(const SAnimContext& animContext)
+{
+    if (m_pNodeAnimator && IsActive())
+    {
+        m_pNodeAnimator->Animate(this, animContext);
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+            pChildAnimNode->Animate(animContext);
+        }
+    }
+
+    UpdateTrackGizmo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::SetName(const char* pName)
+{
+    // Check if the node's director already contains a node with this name
+    CTrackViewAnimNode* director = GetDirector();
+    director = director ? director : GetSequence();
+
+    CTrackViewAnimNodeBundle nodes = director->GetAnimNodesByName(pName);
+    const uint numNodes = nodes.GetCount();
+    for (uint i = 0; i < numNodes; ++i)
+    {
+        if (nodes.GetNode(i) != this)
+        {
+            return false;
+        }
+    }
+
+    string oldName = GetName();
+    m_animNode->SetName(pName);
+
+    CTrackViewSequence* sequence = GetSequence();
+    AZ_Assert(sequence, "Nodes should never have a null sequence.");
+
+    sequence->OnNodeRenamed(this, oldName);
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::CanBeRenamed() const
+{
+    return (GetFlags() & eAnimNodeFlags_CanChangeName) != 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetNodeEntityId(const AZ::EntityId entityId)
+{
+    bool entityPointerChanged = (entityId != m_nodeEntityId);
+
+    m_nodeEntityId = entityId;
+
+    if (entityId.IsValid())
+    {
+        if (m_animNode->GetType() == AnimNodeType::AzEntity)
+        {
+            // We're connecting to a new AZ::Entity
+            AZ::EntityId sequenceComponentEntityId(m_animSequence->GetSequenceEntityId());
+
+            // Notify the SequenceComponent that we're binding an entity to the sequence
+            Maestro::EditorSequenceComponentRequestBus::Event(
+                sequenceComponentEntityId, &Maestro::EditorSequenceComponentRequestBus::Events::AddEntityToAnimate, entityId);
+
+            if (entityId != m_animNode->GetAzEntityId())
+            {
+                if (m_animNode->GetAzEntityId().IsValid())
+                {
+                    // disconnect from bus with previous entity ID before we reset it
+                    AZ::EntityBus::Handler::BusDisconnect(m_animNode->GetAzEntityId());
+                    AZ::TransformNotificationBus::Handler::BusDisconnect(m_animNode->GetAzEntityId());
+                }
+
+                m_animNode->SetAzEntityId(entityId);
+            }
+
+            // connect to EntityBus for OnEntityActivated() notifications to sync components on the entity
+            if (!AZ::EntityBus::Handler::BusIsConnectedId(m_animNode->GetAzEntityId()))
+            {
+                AZ::EntityBus::Handler::BusConnect(m_animNode->GetAzEntityId());
+            }
+
+            if (!AZ::TransformNotificationBus::Handler::BusIsConnectedId(m_animNode->GetAzEntityId()))
+            {
+                AZ::TransformNotificationBus::Handler::BusConnect(m_animNode->GetAzEntityId());
+            }
+        }
+
+        if (entityPointerChanged)
+        {
+            SetPosRotScaleTracksDefaultValues();
+        }
+
+        bool selected = AzToolsFramework::IsSelected(entityId);
+
+        OnSelectionChanged(selected);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZ::EntityId CTrackViewAnimNode::GetNodeEntityId(const bool bSearch)
+{
+    if (m_animNode)
+    {
+        if (m_nodeEntityId.IsValid())
+        {
+            return m_nodeEntityId;
+        }
+        else if (bSearch)
+        {
+            return GetAzEntityId();
+        }
+    }
+
+    return AZ::EntityId();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNodeBundle CTrackViewAnimNode::GetAllAnimNodes()
+{
+    CTrackViewAnimNodeBundle bundle;
+
+    if (GetNodeType() == eTVNT_AnimNode)
+    {
+        bundle.AppendAnimNode(this);
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+            bundle.AppendAnimNodeBundle(pChildAnimNode->GetAllAnimNodes());
+        }
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNodeBundle CTrackViewAnimNode::GetSelectedAnimNodes()
+{
+    CTrackViewAnimNodeBundle bundle;
+
+    if ((GetNodeType() == eTVNT_AnimNode || GetNodeType() == eTVNT_Sequence) && IsSelected())
+    {
+        bundle.AppendAnimNode(this);
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+            bundle.AppendAnimNodeBundle(pChildAnimNode->GetSelectedAnimNodes());
+        }
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNodeBundle CTrackViewAnimNode::GetAllOwnedNodes(const AZ::EntityId entityId)
+{
+    CTrackViewAnimNodeBundle bundle;
+
+    if (GetNodeType() == eTVNT_AnimNode && GetAzEntityId() == entityId)
+    {
+        bundle.AppendAnimNode(this);
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+            bundle.AppendAnimNodeBundle(pChildAnimNode->GetAllOwnedNodes(entityId));
+        }
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNodeBundle CTrackViewAnimNode::GetAnimNodesByType(AnimNodeType animNodeType)
+{
+    CTrackViewAnimNodeBundle bundle;
+
+    if (GetNodeType() == eTVNT_AnimNode && GetType() == animNodeType)
+    {
+        bundle.AppendAnimNode(this);
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+            bundle.AppendAnimNodeBundle(pChildAnimNode->GetAnimNodesByType(animNodeType));
+        }
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNodeBundle CTrackViewAnimNode::GetAnimNodesByName(const char* pName)
+{
+    CTrackViewAnimNodeBundle bundle;
+
+    QString nodeName = GetName();
+    if (GetNodeType() == eTVNT_AnimNode && QString::compare(pName, nodeName, Qt::CaseInsensitive) == 0)
+    {
+        bundle.AppendAnimNode(this);
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+            bundle.AppendAnimNodeBundle(pChildAnimNode->GetAnimNodesByName(pName));
+        }
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CTrackViewAnimNode::GetParamName(const CAnimParamType& paramType) const
+{
+    const char* pName = m_animNode->GetParamName(paramType);
+    return pName ? pName : "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::IsGroupNode() const
+{
+    AnimNodeType nodeType = GetType();
+
+    // AZEntities are really just containers for components, so considered a 'Group' node
+    return nodeType == AnimNodeType::Director || nodeType == AnimNodeType::Group || nodeType == AnimNodeType::AzEntity;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CTrackViewAnimNode::GetAvailableNodeNameStartingWith(const QString& name) const
+{
+    QString newName = name;
+    unsigned int index = 2;
+
+    while (const_cast<CTrackViewAnimNode*>(this)->GetAnimNodesByName(newName.toUtf8().data()).GetCount() > 0)
+    {
+        newName = QStringLiteral("%1%2").arg(name).arg(index);
+        ++index;
+    }
+
+    return newName;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNodeBundle CTrackViewAnimNode::AddSelectedEntities(const AZStd::vector<AnimParamType>& tracks)
+{
+    AZ_Assert(IsGroupNode(), "Expected to added selected entities to a group node.");
+
+    CTrackViewAnimNodeBundle addedNodes;
+
+    AzToolsFramework::EntityIdList entityIds;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    // Add selected nodes.
+    for (const AZ::EntityId& entityId : entityIds)
+    {
+        AZ::Entity* entity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
+
+        if (entity == nullptr)
+        {
+            continue;
+        }
+
+        // Check if object already assigned to some AnimNode.
+        if (CTrackViewAnimNode* existingNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(entityId))
+        {
+            // If it has the same director than the current node, reject it
+            if (existingNode->GetDirector() == GetDirector())
+            {
+                GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(AZStd::string::format(
+                    "'%s' was already added to '%s', skipping...", entity->GetName().c_str(), GetDirector()->GetName()));
+
+                continue;
+            }
+        }
+
+        if (CTrackViewAnimNode* animNode = CreateSubNode(entity->GetName().c_str(), AnimNodeType::AzEntity, entityId))
+        {
+            CUndo undo("Add Default Tracks");
+
+            CreateDefaultTracksForEntityNode(animNode, tracks);
+
+            addedNodes.AppendAnimNode(animNode);
+        }
+    }
+
+    return addedNodes;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::AddCurrentLayer()
+{
+    assert(IsGroupNode());
+
+    const QString name = "Main";
+
+    CreateSubNode(name, AnimNodeType::Entity);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetAsViewCamera()
+{
+    assert (GetType() == AnimNodeType::Camera);
+
+    if (GetType() == AnimNodeType::Camera)
+    {
+        AZ_Error("CTrackViewAnimNode", false, "Legacy cameras are no longer supported.  Unable to set view camera.");
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+unsigned int CTrackViewAnimNode::GetParamCount() const
+{
+    return m_animNode ? m_animNode->GetParamCount() : 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CAnimParamType CTrackViewAnimNode::GetParamType(unsigned int index) const
+{
+    unsigned int paramCount = GetParamCount();
+    if (!m_animNode || index >= paramCount)
+    {
+        return AnimParamType::Invalid;
+    }
+
+    return m_animNode->GetParamType(index);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IAnimNode::ESupportedParamFlags CTrackViewAnimNode::GetParamFlags(const CAnimParamType& paramType) const
+{
+    if (m_animNode)
+    {
+        return m_animNode->GetParamFlags(paramType);
+    }
+
+    return IAnimNode::ESupportedParamFlags(0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+AnimValueType CTrackViewAnimNode::GetParamValueType(const CAnimParamType& paramType) const
+{
+    if (m_animNode)
+    {
+        return m_animNode->GetParamValueType(paramType);
+    }
+
+    return AnimValueType::Unknown;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::UpdateDynamicParams()
+{
+    if (m_animNode)
+    {
+        m_animNode->UpdateDynamicParams();
+    }
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+            pChildAnimNode->UpdateDynamicParams();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks)
+{
+    XmlNodeRef childNode = xmlNode->createNode("Node");
+    childNode->setAttr("name", GetName());
+    childNode->setAttr("type", static_cast<int>(GetType()));
+
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        pChildNode->CopyKeysToClipboard(childNode, bOnlySelectedKeys, bOnlyFromSelectedTracks);
+    }
+
+    if (childNode->getChildCount() > 0)
+    {
+        xmlNode->addChild(childNode);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::CopyNodesToClipboard(const bool bOnlySelected, QWidget* context)
+{
+    XmlNodeRef animNodesRoot = XmlHelpers::CreateXmlNode("CopyAnimNodesRoot");
+
+    CopyNodesToClipboardRec(this, animNodesRoot, bOnlySelected);
+
+    CClipboard clipboard(context);
+    clipboard.Put(animNodesRoot, "Track view entity nodes");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::CopyNodesToClipboardRec(CTrackViewAnimNode* pCurrentAnimNode, XmlNodeRef& xmlNode, const bool bOnlySelected)
+{
+    if (pCurrentAnimNode->m_animNode && (!bOnlySelected || pCurrentAnimNode->IsSelected()))
+    {
+        XmlNodeRef childXmlNode = xmlNode->newChild("Node");
+        pCurrentAnimNode->m_animNode->Serialize(childXmlNode, false, true);
+    }
+
+    for (auto iter = pCurrentAnimNode->m_childNodes.begin(); iter != pCurrentAnimNode->m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+
+            // If selected and group node, force copying of children
+            const bool bSelectedAndGroupNode = pCurrentAnimNode->IsSelected() && pCurrentAnimNode->IsGroupNode();
+            CopyNodesToClipboardRec(pChildAnimNode, xmlNode, !bSelectedAndGroupNode && bOnlySelected);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::PasteTracksFrom(XmlNodeRef& xmlNodeWithTracks)
+{
+    assert(CUndo::IsRecording());
+
+    // we clear our own tracks first because calling SerializeAnims() will clear out m_animNode's tracks below
+    CTrackViewTrackBundle allTracksBundle = GetAllTracks();
+    for (int i = allTracksBundle.GetCount(); --i >= 0;)
+    {
+        RemoveTrack(allTracksBundle.GetTrack(i));
+    }
+
+    // serialize all the tracks from xmlNode - note this will first delete all existing tracks on m_animNode
+    m_animNode->SerializeAnims(xmlNodeWithTracks, true, true);
+
+    // create TrackView tracks
+    const int trackCount = m_animNode->GetTrackCount();
+    for (int i = 0; i < trackCount; ++i)
+    {
+        IAnimTrack* pTrack = m_animNode->GetTrackByIndex(i);
+
+        CTrackViewTrackFactory trackFactory;
+        CTrackViewTrack* newTrackNode = trackFactory.BuildTrack(pTrack, this, this);
+
+        AddNode(newTrackNode);
+
+        MarkAsModified();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::PasteNodesFromClipboard(QWidget* context)
+{
+    assert(CUndo::IsRecording());
+
+    CClipboard clipboard(context);
+    if (clipboard.IsEmpty())
+    {
+        return false;
+    }
+
+    XmlNodeRef animNodesRoot = clipboard.Get();
+    if (animNodesRoot == NULL || strcmp(animNodesRoot->getTag(), "CopyAnimNodesRoot") != 0)
+    {
+        return false;
+    }
+
+    const bool bLightAnimationSetActive = GetSequence()->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet;
+
+    AZStd::map<int, IAnimNode*> copiedIdToNodeMap;
+    const unsigned int numNodes = animNodesRoot->getChildCount();
+    for (int i = 0; i < numNodes; ++i)
+    {
+        XmlNodeRef xmlNode = animNodesRoot->getChild(i);
+
+        // skip non-light nodes in light animation sets
+        int type;
+        if (!xmlNode->getAttr("Type", type) || (bLightAnimationSetActive && (AnimNodeType)type != AnimNodeType::Light))
+        {
+            continue;
+        }
+
+        PasteNodeFromClipboard(copiedIdToNodeMap, xmlNode);
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::PasteNodeFromClipboard(AZStd::map<int, IAnimNode*>& copiedIdToNodeMap, XmlNodeRef xmlNode)
+{
+    QString name;
+
+    if (!xmlNode->getAttr("Name", name))
+    {
+        return;
+    }
+
+    // can only paste nodes into a groupNode (i.e. accepts children)
+    const bool bIsGroupNode = IsGroupNode();
+    assert(bIsGroupNode);
+    if (!bIsGroupNode)
+    {
+        return;
+    }
+
+    AnimNodeType nodeType;
+    GetIEditor()->GetMovieSystem()->SerializeNodeType(nodeType, xmlNode, /*bLoading=*/ true, IAnimSequence::kSequenceVersion, m_animSequence->GetFlags());
+    
+    if (nodeType == AnimNodeType::Component)
+    {
+        // When pasting Component Nodes, the parent Component Entity Node would have already added all its Components as part of its OnEntityActivated() sync.
+        // Here we need to go copy any Components Tracks as well. For pasting, Components matched by ComponentId, which assumes the pasted Track View Component Node
+        // refers to the copied Component Entity referenced in the level
+
+        // Find the pasted parent Component Entity Node
+        int parentId = 0;
+        xmlNode->getAttr("ParentNode", parentId);
+        if (copiedIdToNodeMap.find(parentId) != copiedIdToNodeMap.end())
+        {
+            CTrackViewAnimNode* componentEntityNode = FindNodeByAnimNode(copiedIdToNodeMap[parentId]);
+            if (componentEntityNode)
+            {
+                // Find the copied Component Id on the pasted Component Entity Node, if it exists
+                AZ::ComponentId componentId = AZ::InvalidComponentId;
+                xmlNode->getAttr("ComponentId", componentId);
+
+                for (int i = componentEntityNode->GetChildCount(); --i >= 0;)
+                {
+                    CTrackViewNode* childNode = componentEntityNode->GetChild(i);
+                    if (childNode->GetNodeType() == eTVNT_AnimNode)
+                    {
+                        CTrackViewAnimNode* componentNode = static_cast<CTrackViewAnimNode*>(childNode);
+
+                        if (componentNode->GetComponentId() == componentId)
+                        {
+                            componentNode->PasteTracksFrom(xmlNode);
+                            break;
+                        }
+                    }
+                }
+            }
+        }   
+    }
+    else
+    {
+        // Pasting a non-Component Node - create and add nodes to CryMovie and TrackView
+
+        // Check if the node's director or sequence already contains a node with this name
+        CTrackViewAnimNode* director = GetDirector();
+        director = director ? director : GetSequence();
+        if (director->GetAnimNodesByName(name.toUtf8().data()).GetCount() > 0)
+        {
+            return;
+        }
+
+        IAnimNode* newAnimNode = m_animSequence->CreateNode(xmlNode);
+        if (!newAnimNode)
+        {
+            return;
+        }
+
+        // add new node to mapping of copied Id's to pasted nodes
+        int id;
+        xmlNode->getAttr("Id", id);
+        copiedIdToNodeMap[id] = newAnimNode;
+
+        // search for the parent Node among the pasted nodes - if not found, parent to the group node doing the pasting
+        IAnimNode* parentAnimNode = m_animNode.get();
+        int parentId = 0;
+        if (xmlNode->getAttr("ParentNode", parentId))
+        {
+            if (copiedIdToNodeMap.find(parentId) != copiedIdToNodeMap.end())
+            {
+                parentAnimNode = copiedIdToNodeMap[parentId];
+            }
+        }
+        newAnimNode->SetParent(parentAnimNode);
+
+        // Find the TrackViewNode corresponding to the parentNode
+        CTrackViewAnimNode* parentNode = FindNodeByAnimNode(parentAnimNode);
+        if (!parentNode)
+        {
+            parentNode = this;
+        }
+
+        CTrackViewAnimNodeFactory animNodeFactory;
+        CTrackViewAnimNode* newNode = animNodeFactory.BuildAnimNode(m_animSequence, newAnimNode, parentNode);
+
+        parentNode->AddNode(newNode);
+
+        // Add node to sequence, let AZ Undo take care of undo/redo
+        m_animSequence->AddNode(newNode->m_animNode.get());
+    }
+
+    // Make sure there are no duplicate track Ids
+    AZStd::vector<unsigned int> usedTrackIds;
+
+    int nodeCount = m_animSequence->GetNodeCount();
+    for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+    {
+        IAnimNode* animNode = m_animSequence->GetNode(nodeIndex);
+        AZ_Assert(animNode, "Expected valid animNode");
+
+        int trackCount = animNode->GetTrackCount();
+        for (int trackIndex = 0; trackIndex < trackCount; trackIndex++)
+        {
+            IAnimTrack* track = animNode->GetTrackByIndex(trackIndex);
+            AZ_Assert(track, "Expected valid track");
+
+            // If the Track Id is already used, generate a new one
+            if (AZStd::find(usedTrackIds.begin(), usedTrackIds.end(), track->GetId()) != usedTrackIds.end())
+            {
+                track->SetId(m_animSequence->GetUniqueTrackIdAndGenerateNext());
+            }
+
+            usedTrackIds.push_back(track->GetId());
+
+            int subTrackCount = track->GetSubTrackCount();
+            for (int subTrackIndex = 0; subTrackIndex < subTrackCount; subTrackIndex++)
+            {
+                IAnimTrack* subTrack = track->GetSubTrack(subTrackIndex);
+                AZ_Assert(subTrack, "Expected valid subtrack.");
+
+                // If the Track Id is already used, generate a new one
+                if (AZStd::find(usedTrackIds.begin(), usedTrackIds.end(), subTrack->GetId()) != usedTrackIds.end())
+                {
+                    subTrack->SetId(m_animSequence->GetUniqueTrackIdAndGenerateNext());
+                }
+
+                usedTrackIds.push_back(subTrack->GetId());
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode* CTrackViewAnimNode::FindNodeByAnimNode(const IAnimNode* animNode)
+{
+    // Depth-first search for TrackViewAnimNode associated with the given animNode. Returns the first match found.
+    CTrackViewAnimNode* retNode = nullptr;
+
+    for (const std::unique_ptr<CTrackViewNode>& childNode : m_childNodes)
+    {
+        if (childNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(childNode.get());
+
+            // recurse to search children of group nodes
+            if (childNode->IsGroupNode())
+            {
+                retNode = childAnimNode->FindNodeByAnimNode(animNode);
+                if (retNode)
+                {
+                    break;
+                }
+            }
+
+            if (childAnimNode->GetAnimNode() == animNode)
+            {
+                retNode = childAnimNode;
+                break;
+            }
+        }
+    }
+    return retNode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::IsValidReparentingTo(CTrackViewAnimNode* pNewParent)
+{
+    if (pNewParent == GetParentNode() || !pNewParent->IsGroupNode() || pNewParent->GetType() == AnimNodeType::AzEntity)
+    {
+        return false;
+    }
+
+    // Check if the new parent already contains a node with this name
+    CTrackViewAnimNodeBundle foundNodes = pNewParent->GetAnimNodesByName(GetName());
+    if (foundNodes.GetCount() > 1 || (foundNodes.GetCount() == 1 && foundNodes.GetNode(0) != this))
+    {
+        return false;
+    }
+
+    // Check if another node already owns this entity in the new parent's tree
+    if (const AZ::EntityId owner = GetNodeEntityId();
+        owner.IsValid())
+    {
+        CTrackViewAnimNodeBundle ownedNodes = pNewParent->GetAllOwnedNodes(owner);
+        if (ownedNodes.GetCount() > 0 && ownedNodes.GetNode(0) != this)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void CTrackViewAnimNode::SetParentsInChildren(CTrackViewAnimNode* currentNode)
+{
+    const uint numChildren = currentNode->GetChildCount();
+
+    for (uint childIndex = 0; childIndex < numChildren; ++childIndex)
+    {
+        CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(currentNode->GetChild(childIndex));
+
+        if (childAnimNode->GetNodeType() != eTVNT_Track)
+        {
+            childAnimNode->m_animNode->SetParent(currentNode->m_animNode.get());
+
+            if (childAnimNode->GetChildCount() > 0 && childAnimNode->GetNodeType() != eTVNT_AnimNode)
+            {
+                SetParentsInChildren(childAnimNode);
+            }
+        }
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetNewParent(CTrackViewAnimNode* newParent)
+{
+    if (newParent == GetParentNode())
+    {
+        return;
+    }
+
+    assert(IsValidReparentingTo(newParent));
+
+    CTrackViewSequence* sequence = newParent->GetSequence();
+    AZ_Assert(sequence, "Expected valid sequence.");
+
+    AzToolsFramework::ScopedUndoBatch undoBatch("Set New Track View Anim Node Parent");
+
+    UnBindFromEditorObjects();
+
+    // Remove from the old parent's children and hang on to a ref.
+    std::unique_ptr<CTrackViewNode> storedTrackViewNode;
+    CTrackViewAnimNode* lastParent = static_cast<CTrackViewAnimNode*>(m_pParentNode);
+    if (nullptr != lastParent)
+    {
+        for (auto iter = lastParent->m_childNodes.begin(); iter != lastParent->m_childNodes.end(); ++iter)
+        {
+            std::unique_ptr<CTrackViewNode>& currentNode = *iter;
+
+            if (currentNode.get() == this)
+            {
+                currentNode.swap(storedTrackViewNode);
+                lastParent->m_childNodes.erase(iter);
+                break;
+            }
+        }
+    }
+    AZ_Assert(nullptr != storedTrackViewNode.get(), "Existing Parent of node not found");
+
+    sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Removed);
+
+    // Set new parent
+    m_pParentNode = newParent;
+    m_animNode->SetParent(newParent->m_animNode.get());
+    SetParentsInChildren(this);
+
+    // Add node to the new parent's children.
+    static_cast<CTrackViewAnimNode*>(m_pParentNode)->AddNode(storedTrackViewNode.release());
+
+    BindToEditorObjects();
+
+    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());    
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::CanBeEnabled() const
+{
+    bool canBeEnabled = true;
+    // If this node was disabled because the component was disabled,
+    // do not allow it to be re-enabled until that is resolved.
+    if (m_animNode)
+    {
+        canBeEnabled = !(m_animNode->GetFlags() & eAnimNodeFlags_DisabledForComponent);
+    }
+    return canBeEnabled;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetDisabled(bool disabled)
+{
+    {
+        CTrackViewSequence* sequence = GetSequence();
+        AZ_Assert(sequence, "Expected valid sequence.");
+        AZ_Assert(m_animNode, "Expected valid m_animNode.");
+
+        if (disabled)
+        {
+            m_animNode->SetFlags(m_animNode->GetFlags() | eAnimNodeFlags_Disabled);
+            sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Disabled);
+
+            // Call OnReset to disable the effects of the node.
+            m_animNode->OnReset();
+        }
+        else
+        {
+            m_animNode->SetFlags(m_animNode->GetFlags() & ~eAnimNodeFlags_Disabled);
+            sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Enabled);
+        }
+    }
+    MarkAsModified();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::IsDisabled() const
+{
+    return m_animNode ? m_animNode->GetFlags() & eAnimNodeFlags_Disabled : false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetPos(const Vec3& position)
+{
+    const float time = GetSequence()->GetTime();
+    CTrackViewTrack* track = GetTrackForParameter(AnimParamType::Position);
+
+    if (track)
+    {
+        if (!GetIEditor()->GetAnimation()->IsRecording())
+        {
+            // Offset all keys by move amount.
+            Vec3 offset = m_animNode->GetOffsetPosition(position);
+            
+            track->OffsetKeyPosition(offset);
+
+            GetSequence()->OnKeysChanged();
+        }
+        else if (AzToolsFramework::IsSelected(m_nodeEntityId))
+        {
+            CTrackViewSequence* sequence = GetSequence();
+
+            AZ_Assert(sequence, "Expected valid sequence");
+            if (sequence != nullptr)
+            {
+                const int flags = m_animNode->GetFlags();
+                // This is required because the entity movement system uses Undo to
+                // undo a previous move delta as the entity is dragged.
+                CUndo::Record(new CUndoComponentEntityTrackObject(track));
+
+                // Set the selected flag to enable record when unselected camera is moved through viewport
+                m_animNode->SetFlags(flags | eAnimNodeFlags_EntitySelected);
+                m_animNode->SetPos(sequence->GetTime(), position);
+                m_animNode->SetFlags(flags);
+                    
+                // We don't want to use ScopedUndoBatch here because we don't want a separate Undo operation
+                // generate for every frame as the user moves an entity.
+                AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
+                    &AzToolsFramework::ToolsApplicationRequests::Bus::Events::AddDirtyEntity, 
+                    sequence->GetSequenceComponentEntityId()
+                );                    
+
+                sequence->OnKeysChanged();
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetScale(const Vec3& scale)
+{
+    CTrackViewTrack* track = GetTrackForParameter(AnimParamType::Scale);
+
+    if (GetIEditor()->GetAnimation()->IsRecording() && AzToolsFramework::IsSelected(m_nodeEntityId) && track)
+    {
+        CTrackViewSequence* sequence = GetSequence();
+
+        AZ_Assert(sequence, "Expected valid sequence");
+        if (sequence != nullptr)
+        {
+            // This is required because the entity movement system uses Undo to
+            // undo a previous move delta as the entity is dragged.
+            CUndo::Record(new CUndoComponentEntityTrackObject(track));
+
+            m_animNode->SetScale(sequence->GetTime(), scale);
+
+            // We don't want to use ScopedUndoBatch here because we don't want a separate Undo operation
+            // generate for every frame as the user scales an entity.
+            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
+                &AzToolsFramework::ToolsApplicationRequests::Bus::Events::AddDirtyEntity,
+                sequence->GetSequenceComponentEntityId()
+            );
+            sequence->OnKeysChanged();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetRotation(const Quat& rotation)
+{
+    CTrackViewTrack* track = GetTrackForParameter(AnimParamType::Rotation);
+
+    if (GetIEditor()->GetAnimation()->IsRecording() && (AzToolsFramework::IsSelected(m_nodeEntityId)) && track)
+    {
+        CTrackViewSequence* sequence = GetSequence();
+
+        AZ_Assert(sequence, "Expected valid sequence");
+        if (sequence != nullptr)
+        {
+            const int flags = m_animNode->GetFlags();
+            // This is required because the entity movement system uses Undo to
+            // undo a previous move delta as the entity is dragged.
+            CUndo::Record(new CUndoComponentEntityTrackObject(track));
+
+            // Set the selected flag to enable record when unselected camera is moved through viewport
+            m_animNode->SetFlags(flags | eAnimNodeFlags_EntitySelected);
+            m_animNode->SetRotate(sequence->GetTime(), rotation);
+            m_animNode->SetFlags(flags);
+
+            // We don't want to use ScopedUndoBatch here because we don't want a separate Undo operation
+            // generate for every frame as the user rotates an entity.
+            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
+                &AzToolsFramework::ToolsApplicationRequests::Bus::Events::AddDirtyEntity,
+                sequence->GetSequenceComponentEntityId()
+            );
+
+            sequence->OnKeysChanged();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::IsActive()
+{
+    CTrackViewSequence* pSequence = GetSequence();
+    const bool bInActiveSequence = pSequence ? GetSequence()->IsBoundToEditorObjects() : false;
+
+    CTrackViewAnimNode* director = GetDirector();
+    const bool bMemberOfActiveDirector = director ? GetDirector()->IsActiveDirector() : true;
+
+    return bInActiveSequence && bMemberOfActiveDirector;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::OnSelectionChanged(const bool selected)
+{
+    if (m_animNode)
+    {
+        const AnimNodeType animNodeType = GetType();
+        AZ_Assert(animNodeType == AnimNodeType::AzEntity, "Expected AzEntity for selection changed");
+
+        const EAnimNodeFlags flags = (EAnimNodeFlags)m_animNode->GetFlags();
+        m_animNode->SetFlags(selected ? (flags | eAnimNodeFlags_EntitySelected) : (flags & ~eAnimNodeFlags_EntitySelected));
+    }
+}
+
+void CTrackViewAnimNode::OnSelected()
+{
+    OnSelectionChanged(true);
+}
+
+void CTrackViewAnimNode::OnDeselected()
+{
+    OnSelectionChanged(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetPosRotScaleTracksDefaultValues(bool positionAllowed, bool rotationAllowed, bool scaleAllowed)
+{
+    AZ::EntityId entityId;
+    bool entityIsBoundToEditorObjects = false;
+
+    if (m_animNode)
+    {
+        if (m_animNode->GetType() == AnimNodeType::Component)
+        {
+            // get entity from the parent Component Entity
+           CTrackViewNode* parentNode = GetParentNode();
+           if (parentNode && parentNode->GetNodeType() == eTVNT_AnimNode)
+           {
+               CTrackViewAnimNode* parentAnimNode = static_cast<CTrackViewAnimNode*>(parentNode);
+               if (parentAnimNode)
+               {
+                   entityId = parentAnimNode->GetNodeEntityId(false);
+                   entityIsBoundToEditorObjects = parentAnimNode->IsBoundToEditorObjects();
+               }
+           }
+        }
+        else
+        {
+            // not a component - get the entity on this node directly
+            entityId = GetNodeEntityId(false);
+            entityIsBoundToEditorObjects = IsBoundToEditorObjects();
+        }
+
+        if (entityId.IsValid() && entityIsBoundToEditorObjects)
+        {
+            const float time = GetSequence()->GetTime();
+            if (positionAllowed)
+            {
+                AZ::Vector3 position = AZ::Vector3::CreateZero();
+                AZ::TransformBus::EventResult(position, entityId, &AZ::TransformBus::Events::GetWorldTranslation);
+                m_animNode->SetPos(time, AZVec3ToLYVec3(position));
+            }
+            if (rotationAllowed)
+            {
+                AZ::Quaternion rotation = AZ::Quaternion::CreateIdentity();
+                AZ::TransformBus::EventResult(rotation, entityId, &AZ::TransformBus::Events::GetWorldRotationQuaternion);
+                m_animNode->SetRotate(time, AZQuaternionToLYQuaternion(rotation));
+            }
+            if (scaleAllowed)
+            {
+                float scale = 1.0f;
+                AZ::TransformBus::EventResult(scale, entityId, &AZ::TransformBus::Events::GetWorldUniformScale);
+                m_animNode->SetScale(time, Vec3(scale, scale, scale));
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::UpdateTrackGizmo()
+{
+    if (IsActive() && m_nodeEntityId.IsValid() && AzToolsFramework::IsEntityVisible(m_nodeEntityId))
+    {
+        if (!m_trackGizmo)
+        {
+            CTrackGizmo* pTrackGizmo = new CTrackGizmo;
+            pTrackGizmo->SetAnimNode(this);
+            m_trackGizmo = pTrackGizmo;
+            GetIEditor()->GetObjectManager()->GetGizmoManager()->AddGizmo(m_trackGizmo);
+        }
+    }
+    else
+    {
+        GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_trackGizmo);
+        m_trackGizmo = nullptr;
+    }
+
+    if (m_nodeEntityId.IsValid() && m_trackGizmo)
+    {
+        Matrix34 gizmoMatrix;
+        gizmoMatrix.SetIdentity();
+
+        if (GetType() == AnimNodeType::AzEntity)
+        {
+            // Key data are always relative to the parent (or world if there is no parent). So get the parent
+            // entity id if there is one.
+            AZ::EntityId parentId;
+            AZ::TransformBus::EventResult(parentId, GetAzEntityId(), &AZ::TransformBus::Events::GetParentId);
+            if (parentId.IsValid())
+            {
+                AZ::Transform azWorldTM = GetEntityWorldTM(parentId);
+                gizmoMatrix = AZTransformToLYTransform(azWorldTM);
+            }
+        }
+
+        m_trackGizmo->SetMatrix(gizmoMatrix);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::CheckTrackAnimated(const CAnimParamType& paramType) const
+{
+    if (!m_animNode)
+    {
+        return false;
+    }
+
+    CTrackViewTrack* pTrack = GetTrackForParameter(paramType);
+    return pTrack && pTrack->GetKeyCount() > 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::OnNodeVisibilityChanged([[maybe_unused]] IAnimNode* node, const bool bHidden)
+{
+    if (m_nodeEntityId.IsValid())
+    {
+        AzToolsFramework::SetEntityVisibility(m_nodeEntityId, !bHidden);
+
+        // Need to do this to force recreation of gizmos
+        const bool showSelected =
+            AzToolsFramework::IsEntityVisible(m_nodeEntityId) && AzToolsFramework::IsSelected(m_nodeEntityId);
+        if (showSelected)
+        {
+            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
+                &AzToolsFramework::ToolsApplicationRequests::Bus::Events::SetSelectedEntities,
+                AzToolsFramework::EntityIdList{m_nodeEntityId});
+        }
+
+        UpdateTrackGizmo();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::OnNodeReset([[maybe_unused]] IAnimNode* node)
+{
+}
+
+void CTrackViewAnimNode::SetComponent(AZ::ComponentId componentId, const AZ::Uuid& componentTypeId)
+{
+    if (m_animNode)
+    {
+        m_animNode->SetComponent(componentId, componentTypeId);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZ::ComponentId CTrackViewAnimNode::GetComponentId() const
+{
+    return m_animNode ? m_animNode->GetComponentId() : AZ::InvalidComponentId;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::MarkAsModified()
+{
+    GetSequence()->MarkAsModified();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewAnimNode::ContainsComponentWithId(AZ::ComponentId componentId) const
+{
+    bool retFound = false;
+
+    if (GetType() == AnimNodeType::AzEntity)
+    {
+        // search for a matching componentId on all children
+        for (int i = 0; i < GetChildCount(); i++)
+        {
+            CTrackViewNode* childNode = GetChild(i);
+            if (childNode->GetNodeType() == eTVNT_AnimNode)
+            {
+                if (static_cast<CTrackViewAnimNode*>(childNode)->GetComponentId() == componentId)
+                {
+                    retFound = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    return retFound;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::OnStartPlayInEditor()
+{
+    if (m_animSequence->GetSequenceEntityId().IsValid())
+    {
+        AZ::EntityId remappedId;
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId, m_animSequence->GetSequenceEntityId(), remappedId);
+            
+        if (remappedId.IsValid())
+        {
+            // stash and remap the AZ::EntityId of the SequenceComponent entity to restore it when we switch back to Edit mode
+            m_stashedAnimSequenceEditorAzEntityId = m_animSequence->GetSequenceEntityId();
+            m_animSequence->SetSequenceEntityId(remappedId);
+        }
+    }
+
+    if (m_animNode && m_animNode->GetAzEntityId().IsValid())
+    {
+        AZ::EntityId remappedId;
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId, m_animNode->GetAzEntityId(), remappedId);
+
+        if (remappedId.IsValid())
+        {
+            // stash the AZ::EntityId of the SequenceComponent entity to restore it when we switch back to Edit mode
+            m_stashedAnimNodeEditorAzEntityId = m_animNode->GetAzEntityId();
+            m_animNode->SetAzEntityId(remappedId);
+        }
+    }
+    
+    if (m_animNode)
+    {
+        m_animNode->OnStartPlayInEditor();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::OnStopPlayInEditor()
+{
+    // restore sequenceComponent entity Ids back to their original Editor Ids
+    if (m_animSequence && m_stashedAnimSequenceEditorAzEntityId.IsValid())
+    {
+        m_animSequence->SetSequenceEntityId(m_stashedAnimSequenceEditorAzEntityId);
+
+        // invalidate the stashed Id now that we've restored it
+        m_stashedAnimSequenceEditorAzEntityId.SetInvalid();
+    }
+
+    if (m_animNode && m_stashedAnimNodeEditorAzEntityId.IsValid())
+    {
+        m_animNode->SetAzEntityId(m_stashedAnimNodeEditorAzEntityId);
+
+        // invalidate the stashed Id now that we've restored it
+        m_stashedAnimNodeEditorAzEntityId.SetInvalid();
+    }
+
+    if (m_animNode)
+    {
+        m_animNode->OnStopPlayInEditor();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::OnEntityActivated(const AZ::EntityId& activatedEntityId)
+{
+    if (GetAzEntityId() != activatedEntityId)
+    {
+        // This can happen when we're exiting Game/Sim Mode and entity Id's are remapped. Do nothing in such a circumstance.
+        return;
+    }
+
+    CTrackViewDialog* dialog = CTrackViewDialog::GetCurrentInstance();
+    if ((dialog && dialog->IsDoingUndoOperation()) || GetAzEntityId() != activatedEntityId)
+    {
+        // Do not respond during Undo. We'll get called when we connect to the AZ::EntityBus in SetEntityNode(),
+        // which would result in adding component nodes twice during Undo.
+
+        // Also do not respond to entity activation notifications for entities not associated with this animNode,
+        // although this should never happen
+        return;
+    }
+
+    // Ensure the components on the Entity match the components on the Entity Node in Track View.
+    //
+    // Note this gets called as soon as we connect to AZ::EntityBus - so in effect SetNodeEntity() on an AZ::Entity results
+    // in all of it's component nodes being added.
+    //
+    // If the component exists in Track View but not in the entity, we remove it from Track View.
+
+    AZ::Entity* entity = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, activatedEntityId);
+
+    // check if all Track View components are (still) on the entity. If not, remove it from TrackView
+    for (int i = GetChildCount(); --i >= 0;)
+    {
+        if (GetChild(i)->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(GetChild(i));
+            if (childAnimNode->GetComponentId() != AZ::InvalidComponentId && !(entity->FindComponent(childAnimNode->GetComponentId())))
+            {
+                // Check to see if the component is still on the entity, but just disabled. Don't remove it in that case.
+                AZ::Entity::ComponentArrayType disabledComponents;
+                AzToolsFramework::EditorDisabledCompositionRequestBus::Event(
+                    entity->GetId(), &AzToolsFramework::EditorDisabledCompositionRequests::GetDisabledComponents, disabledComponents);
+
+                bool isDisabled = false;
+                for (auto disabledComponent : disabledComponents)
+                {
+                    if (disabledComponent->GetId() == childAnimNode->GetComponentId())
+                    {
+                        isDisabled = true;
+                        break;
+                    }
+                }
+
+                // Check to see if the component is still on the entity, but just pending. Don't remove it in that case.
+                AZ::Entity::ComponentArrayType pendingComponents;
+                AzToolsFramework::EditorPendingCompositionRequestBus::Event(
+                    entity->GetId(), &AzToolsFramework::EditorPendingCompositionRequests::GetPendingComponents, pendingComponents);
+
+                bool isPending = false;
+                for (auto pendingComponent : pendingComponents)
+                {
+                    if (pendingComponent->GetId() == childAnimNode->GetComponentId())
+                    {
+                        isPending = true;
+                        break;
+                    }
+                }
+
+                if (!isDisabled && !isPending)
+                {
+                    AzToolsFramework::ScopedUndoBatch undoBatch("Remove Track View Component Node");
+                    RemoveSubNode(childAnimNode);
+                    CTrackViewSequence* sequence = GetSequence();
+                    AZ_Assert(sequence != nullptr, "Sequence should not be null");
+                    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+                }
+                else
+                {
+                    // don't remove this node, but do disable it.
+                    if (childAnimNode->m_animNode)
+                    {
+                        int flags = childAnimNode->m_animNode->GetFlags();
+                        flags |= eAnimNodeFlags_DisabledForComponent;
+                        childAnimNode->m_animNode->SetFlags(flags);
+                        childAnimNode->SetDisabled(true);
+                    }
+                }
+            }
+            else
+            {
+                // re-enable the node if it was disabled because of a missing component
+                if (childAnimNode->m_animNode)
+                {
+                    int flags = childAnimNode->m_animNode->GetFlags();
+                    if (flags & eAnimNodeFlags_DisabledForComponent)
+                    {
+                        flags &= ~eAnimNodeFlags_DisabledForComponent;
+                        childAnimNode->m_animNode->SetFlags(flags);
+                        childAnimNode->SetDisabled(false);
+                    }
+                }
+            }
+        }
+    }
+
+    /////////////////////////////////////////////////////////////////////////
+    // check that all animatable components on the Entity are in Track View
+
+    AZStd::vector<AZ::ComponentId> animatableComponentIds;
+
+    // Get all components animated through the behavior context
+    Maestro::EditorSequenceComponentRequestBus::Event(GetSequence()->GetSequenceComponentEntityId(), &Maestro::EditorSequenceComponentRequestBus::Events::GetAnimatableComponents,
+                                                          animatableComponentIds, activatedEntityId);
+
+    for (const AZ::ComponentId& componentId : animatableComponentIds)
+    {
+        bool componentFound = false;
+        for (int i = GetChildCount(); --i >= 0;)
+        {
+            if (GetChild(i)->GetNodeType() == eTVNT_AnimNode)
+            {
+                CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(GetChild(i));
+                if (childAnimNode->GetComponentId() == componentId)
+                {
+                    componentFound = true;
+                    break;
+                }
+            }
+        }
+        if (!componentFound)
+        {
+            bool disabled = false;
+            const AZ::Component* component = entity->FindComponent(componentId);
+
+            // If not found in enabled components, check disabled and pending components
+            if (!component)
+            {
+                // Disable the node when it is created because the component is not enabled.
+                disabled = true;
+
+                // Check in disabled components
+                AZ::Entity::ComponentArrayType disabledComponents;
+                AzToolsFramework::EditorDisabledCompositionRequestBus::Event(entity->GetId(), &AzToolsFramework::EditorDisabledCompositionRequests::GetDisabledComponents, disabledComponents);
+
+                for (AZ::Component* currentComponent : disabledComponents)
+                {
+                    if (currentComponent->GetId() == componentId)
+                    {
+                        component = currentComponent;
+                        break;
+                    }
+                }
+
+                // Check in pending components
+                if (!component)
+                {
+                    AZ::Entity::ComponentArrayType pendingComponents;
+                    AzToolsFramework::EditorPendingCompositionRequestBus::Event(entity->GetId(), &AzToolsFramework::EditorPendingCompositionRequests::GetPendingComponents, pendingComponents);
+                    for (AZ::Component* currentComponent : pendingComponents)
+                    {
+                        if (currentComponent->GetId() == componentId)
+                        {
+                            component = currentComponent;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (component)
+            {
+                AddComponent(component, disabled);
+            }
+        }
+    }
+
+    // Refresh the sequence because things may have been enabled/disabled.
+    GetSequence()->ForceAnimation();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::OnEntityRemoved()
+{
+    // This is called by CTrackViewSequenceManager for both legacy and AZ Entities. When we deprecate legacy entities,
+    // we could (should) probably handle this via ComponentApplicationEventBus::Events::OnEntityRemoved
+
+    if (IsBoundToAzEntity())
+    {
+        AZ::EntityId entityId = GetAzEntityId();
+        AZ::TransformNotificationBus::Handler::BusDisconnect(entityId);
+        AZ::EntityBus::Handler::BusDisconnect(entityId);
+    }
+
+    m_nodeEntityId = AZ::EntityId(); // invalidate cached node entity id
+
+    // notify the change. This leads to Track View updating it's UI to account for the entity removal
+    GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode* CTrackViewAnimNode::AddComponent(const AZ::Component* component, bool disabled)
+{
+    CTrackViewAnimNode* retNewComponentNode = nullptr;
+    AZStd::string componentName;
+    AZ::Uuid      componentTypeId(AZ::Uuid::CreateNull());
+
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        componentTypeId, &AzFramework::ApplicationRequests::Bus::Events::GetComponentTypeId, GetAzEntityId(), component->GetId());
+
+    AzToolsFramework::EntityCompositionRequestBus::BroadcastResult(
+        componentName, &AzToolsFramework::EntityCompositionRequests::GetComponentName, component);
+
+    if (!componentName.empty() && !componentTypeId.IsNull())
+    {
+        CTrackViewSequence* sequence = GetSequence();
+        AZ_Assert(sequence, "Expected valid sequence.");
+
+        AzToolsFramework::ScopedUndoBatch undoBatch("Add TrackView Component");
+        retNewComponentNode = CreateSubNode(
+            componentName.c_str(), AnimNodeType::Component, AZ::EntityId(), componentTypeId, component->GetId());
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+    }
+    else
+    {
+        AZ_Warning("TrackView", false, "Could not determine component name or type for adding component - skipping...");
+    }
+
+    if (retNewComponentNode)
+    {
+        retNewComponentNode->SetDisabled(disabled);
+    }
+
+    return retNewComponentNode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::MatrixInvalidated()
+{
+    UpdateTrackGizmo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 CTrackViewAnimNode::GetTransformDelegatePos(const Vec3& basePos) const
+{
+    const Vec3 position = GetPos();
+
+    return Vec3(CheckTrackAnimated(AnimParamType::PositionX) ? position.x : basePos.x,
+        CheckTrackAnimated(AnimParamType::PositionY) ? position.y : basePos.y,
+        CheckTrackAnimated(AnimParamType::PositionZ) ? position.z : basePos.z);
+}
+
+//////////////////////////////////////////////////////////////////////////
+Quat CTrackViewAnimNode::GetTransformDelegateRotation(const Quat& baseRotation) const
+{
+    if (!CheckTrackAnimated(AnimParamType::Rotation))
+    {
+        return baseRotation;
+    }
+
+    // Pass the sequence time to get the rotation from the
+    // track data if it is present. We don't want to go all the way out
+    // to the current rotation in component transform because that would mean
+    // we are going from Quat to Euler and then back to Quat and that could lead
+    // to the data drifting away from the original value.
+    Quat nodeRotation = GetRotation(GetSequenceConst()->GetTime());
+
+    const Ang3 angBaseRotation(baseRotation);
+    const Ang3 angNodeRotation(nodeRotation);
+    return Quat(Ang3(CheckTrackAnimated(AnimParamType::RotationX) ? angNodeRotation.x : angBaseRotation.x,
+            CheckTrackAnimated(AnimParamType::RotationY) ? angNodeRotation.y : angBaseRotation.y,
+            CheckTrackAnimated(AnimParamType::RotationZ) ? angNodeRotation.z : angBaseRotation.z));
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 CTrackViewAnimNode::GetTransformDelegateScale(const Vec3& baseScale) const
+{
+    const Vec3 scale = GetScale();
+
+    return Vec3(CheckTrackAnimated(AnimParamType::ScaleX) ? scale.x : baseScale.x,
+        CheckTrackAnimated(AnimParamType::ScaleY) ? scale.y : baseScale.y,
+        CheckTrackAnimated(AnimParamType::ScaleZ) ? scale.z : baseScale.z);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetTransformDelegatePos(const Vec3& position)
+{
+    SetPos(position);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetTransformDelegateRotation(const Quat& rotation)
+{
+    SetRotation(rotation);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::SetTransformDelegateScale(const Vec3& scale)
+{
+    SetScale(scale);
+}
+
+bool CTrackViewAnimNode::IsTransformAnimParamTypeDelegated(const AnimParamType animParamType) const
+{
+    const bool delegated = (GetIEditor()->GetAnimation()->IsRecording() && AzToolsFramework::IsSelected(m_nodeEntityId) &&
+                             GetTrackForParameter(animParamType)) ||
+        CheckTrackAnimated(animParamType);
+    return delegated;
+}
+
+bool CTrackViewAnimNode::IsPositionDelegated() const
+{
+    return IsTransformAnimParamTypeDelegated(AnimParamType::Position);
+}
+
+bool CTrackViewAnimNode::IsRotationDelegated() const
+{
+    return IsTransformAnimParamTypeDelegated(AnimParamType::Rotation);
+}
+
+bool CTrackViewAnimNode::IsScaleDelegated() const
+{
+    return IsTransformAnimParamTypeDelegated(AnimParamType::Scale);
+}
+
+void CTrackViewAnimNode::OnEntityDestruction([[maybe_unused]] const AZ::EntityId& entityId)
+{
+    UnRegisterEditorObjectListeners();
+
+    SetNodeEntityId(AZ::EntityId());
+    UpdateTrackGizmo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZ::Transform CTrackViewAnimNode::GetEntityWorldTM(const AZ::EntityId entityId)
+{
+    AZ::Entity* entity = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
+
+    AZ::Transform worldTM = AZ::Transform::Identity();
+    if (entity != nullptr)
+    {
+        AZ::TransformInterface* transformInterface = entity->GetTransform();
+        if (transformInterface != nullptr)
+        {
+            worldTM = transformInterface->GetWorldTM();
+        }
+    }
+
+    return worldTM;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM)
+{
+    // Update the Position, Rotation and Scale tracks.
+    AZStd::vector<AnimParamType> animParamTypes{ AnimParamType::Position, AnimParamType::Rotation, AnimParamType::Scale };
+    for (AnimParamType animParamType : animParamTypes)
+    {
+        CTrackViewTrack* track = GetTrackForParameter(animParamType);
+        if (track != nullptr)
+        {
+            track->UpdateKeyDataAfterParentChanged(oldParentWorldTM, newParentWorldTM);
+        }
+    }
+
+    // Refresh after key data changed or parent changed.
+    CTrackViewSequence* sequence = GetSequence();
+    if (sequence != nullptr)
+    {
+        sequence->OnKeysChanged();
+    }
+}
+
+void CTrackViewAnimNode::OnTransformChanged(
+    [[maybe_unused]] const AZ::Transform& local, [[maybe_unused]] const AZ::Transform& world)
+{
+    UpdateTrackGizmo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewAnimNode::OnParentChanged(AZ::EntityId oldParent, AZ::EntityId newParent)
+{
+    // If the change is from no parent to parent, or the other way around,
+    // update the key data, because that action is like going from world space to
+    // relative to a new parent.
+    if (!oldParent.IsValid() || !newParent.IsValid())
+    {
+        // Get the world transforms, Identity if there was no parent
+        AZ::Transform oldParentWorldTM = GetEntityWorldTM(oldParent);
+        AZ::Transform newParentWorldTM = GetEntityWorldTM(newParent);
+
+        UpdateKeyDataAfterParentChanged(oldParentWorldTM, newParentWorldTM);
+    }
+
+    // Refresh after key data changed or parent changed.
+    CTrackViewSequence* sequence = GetSequence();
+    if (sequence != nullptr)
+    {
+        sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged);
+    }
+}
+
+void CTrackViewAnimNode::OnParentTransformWillChange(AZ::Transform oldTransform, AZ::Transform newTransform) 
+{ 
+    // Only used in circumstances where modified keys are required, but OnParentChanged 
+    // message will not be received for some reason, e.g. node being cloned in memory 
+    UpdateKeyDataAfterParentChanged(oldTransform, newTransform);
+
+    CTrackViewSequence* sequence = GetSequence();
+    if (sequence != nullptr)
+    {
+        sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged);
+    }
+}
+
+void CTrackViewAnimNode::RegisterEditorObjectListeners(const AZ::EntityId entityId)
+{
+    EntitySelectionEvents::Bus::Handler::BusConnect(entityId);
+}
+
+void CTrackViewAnimNode::UnRegisterEditorObjectListeners()
+{
+    EntitySelectionEvents::Bus::Handler::BusDisconnect();
+}
diff --git a/Code/Editor/TrackView/TrackViewAnimNode.h b/Code/Editor/TrackView/TrackViewAnimNode.h
new file mode 100644
index 0000000000..1dc6e786b2
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewAnimNode.h
@@ -0,0 +1,351 @@
+/*
+ * 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/map.h>
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/Component/EntityBus.h>
+#include <AzFramework/Entity/EntityContextBus.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzCore/Component/TransformBus.h>
+
+#include "TrackViewNode.h"
+#include "TrackViewTrack.h"
+#include "Objects/TrackGizmo.h"
+
+class CTrackViewAnimNode;
+class QWidget;
+
+// Represents a bundle of anim nodes
+class CTrackViewAnimNodeBundle
+{
+public:
+    unsigned int GetCount() const { return m_animNodes.size(); }
+    CTrackViewAnimNode* GetNode(const unsigned int index) { return m_animNodes[index]; }
+    const CTrackViewAnimNode* GetNode(const unsigned int index) const { return m_animNodes[index]; }
+
+    void Clear();
+    const bool DoesContain(const CTrackViewNode* pTargetNode);
+
+    void AppendAnimNode(CTrackViewAnimNode* pNode);
+    void AppendAnimNodeBundle(const CTrackViewAnimNodeBundle& bundle);
+
+    void ExpandAll(bool bAlsoExpandParentNodes = true);
+    void CollapseAll();
+
+private:
+    std::vector<CTrackViewAnimNode*> m_animNodes;
+};
+
+// Callback called by animation node when its animated.
+class IAnimNodeAnimator
+{
+public:
+    virtual ~IAnimNodeAnimator() {}
+
+    virtual void Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac) = 0;
+    virtual void Render([[maybe_unused]] CTrackViewAnimNode* pNode, [[maybe_unused]] const SAnimContext& ac) {}
+
+    // Called when binding/unbinding the owning node
+    virtual void Bind([[maybe_unused]] CTrackViewAnimNode* pNode) {}
+    virtual void UnBind([[maybe_unused]] CTrackViewAnimNode* pNode) {}
+};
+
+////////////////////////////////////////////////////////////////////////////
+//
+// This class represents a IAnimNode in TrackView and contains
+// the editor side code for changing it
+//
+// It does *not* have ownership of the IAnimNode, therefore deleting it
+// will not destroy the CryMovie track
+//
+////////////////////////////////////////////////////////////////////////////
+class CTrackViewAnimNode
+    : public CTrackViewNode
+    , public IAnimNodeOwner
+    , public ITransformDelegate
+    , public AzToolsFramework::EditorEntityContextNotificationBus::Handler
+    , public AZ::EntityBus::Handler
+    , private AZ::TransformNotificationBus::Handler
+    , private AzToolsFramework::EntitySelectionEvents::Bus::Handler
+{
+public:
+    CTrackViewAnimNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode);
+    ~CTrackViewAnimNode();
+
+    // Rendering
+    virtual void Render(const SAnimContext& ac);
+
+    // Playback
+    virtual void Animate(const SAnimContext& animContext);
+
+    // Binding/Unbinding
+    virtual void BindToEditorObjects();
+    virtual void UnBindFromEditorObjects();
+    virtual bool IsBoundToEditorObjects() const;
+
+    // Console sync
+    virtual void SyncToConsole(SAnimContext& animContext);
+
+    // CTrackViewAnimNode
+    virtual ETrackViewNodeType GetNodeType() const override { return eTVNT_AnimNode; }
+
+    // Create & remove sub anim nodes
+    virtual CTrackViewAnimNode* CreateSubNode(
+        const QString& name, const AnimNodeType animNodeType, AZ::EntityId entityId = AZ::EntityId(),
+        AZ::Uuid componentTypeId = AZ::Uuid::CreateNull(), AZ::ComponentId componenId=AZ::InvalidComponentId);
+    virtual void RemoveSubNode(CTrackViewAnimNode* pSubNode);
+
+    // Create & remove sub tracks
+    virtual CTrackViewTrack* CreateTrack(const CAnimParamType& paramType);
+    virtual void RemoveTrack(CTrackViewTrack* pTrack);
+
+    // Add selected entities from scene to group node
+    virtual CTrackViewAnimNodeBundle AddSelectedEntities(const AZStd::vector<AnimParamType>& tracks);
+
+    // Add current layer to group node
+    virtual void AddCurrentLayer();
+
+    // Director related
+    virtual void SetAsActiveDirector();
+    virtual bool IsActiveDirector() const;
+
+    // Checks if anim node is part of active sequence and of an active director
+    virtual bool IsActive();
+
+    // Set as view camera
+    virtual void SetAsViewCamera();
+
+    // Name setter/getter
+    virtual const char* GetName() const override { return m_animNode->GetName(); }
+    virtual bool SetName(const char* pName) override;
+    virtual bool CanBeRenamed() const override;
+
+    // Node owner setter/getter
+    virtual void SetNodeEntityId(AZ::EntityId entityId);
+    virtual AZ::EntityId GetNodeEntityId(const bool bSearch = true);
+
+    AZ::EntityId GetAzEntityId() const { return m_animNode ? m_animNode->GetAzEntityId() : AZ::EntityId(); }
+    bool IsBoundToAzEntity() const { return m_animNode ? m_animNode->GetAzEntityId().IsValid(): false; }
+
+    // Snap time value to prev/next key in sequence
+    virtual bool SnapTimeToPrevKey(float& time) const override;
+    virtual bool SnapTimeToNextKey(float& time) const override;
+
+    // Expanded state interface
+    void SetExpanded(bool expanded) override;
+    bool GetExpanded() const override;
+
+    // Node getters
+    CTrackViewAnimNodeBundle GetAllAnimNodes();
+    CTrackViewAnimNodeBundle GetSelectedAnimNodes();
+    CTrackViewAnimNodeBundle GetAllOwnedNodes(AZ::EntityId entityId);
+    CTrackViewAnimNodeBundle GetAnimNodesByType(AnimNodeType animNodeType);
+    CTrackViewAnimNodeBundle GetAnimNodesByName(const char* pName);
+
+    // Track getters
+    virtual CTrackViewTrackBundle GetAllTracks();
+    virtual CTrackViewTrackBundle GetSelectedTracks();
+    virtual CTrackViewTrackBundle GetTracksByParam(const CAnimParamType& paramType) const;
+
+    // Key getters
+    virtual CTrackViewKeyBundle GetAllKeys() override;
+    virtual CTrackViewKeyBundle GetSelectedKeys() override;
+    virtual CTrackViewKeyBundle GetKeysInTimeRange(const float t0, const float t1) override;
+
+    // Type getters
+    AnimNodeType GetType() const;
+
+    // Flags
+    EAnimNodeFlags GetFlags() const;
+    bool AreFlagsSetOnNodeOrAnyParent(EAnimNodeFlags flagsToCheck) const;
+
+    // Disabled state
+    virtual void SetDisabled(bool bDisabled) override;
+    virtual bool IsDisabled() const override;
+    bool CanBeEnabled() const override;
+
+    // Return track assigned to the specified parameter.
+    CTrackViewTrack* GetTrackForParameter(const CAnimParamType& paramType, uint32 index = 0) const;
+
+    // Rotation/Position & Scale
+    void SetPos(const Vec3& position);
+    Vec3 GetPos() const { return m_animNode->GetPos(); }
+    void SetScale(const Vec3& scale);
+    Vec3 GetScale() const { return m_animNode->GetScale(); }
+    void SetRotation(const Quat& rotation);
+    Quat GetRotation() const { return m_animNode->GetRotate(); }
+    Quat GetRotation(float time) const { return m_animNode != nullptr ? m_animNode->GetRotate(time) : Quat(0,0,0,0); }
+
+    // Param
+    unsigned int GetParamCount() const;
+    CAnimParamType GetParamType(unsigned int index) const;
+    const char* GetParamName(const CAnimParamType& paramType) const;
+    bool IsParamValid(const CAnimParamType& param) const;
+    IAnimNode::ESupportedParamFlags GetParamFlags(const CAnimParamType& paramType) const;
+    AnimValueType GetParamValueType(const CAnimParamType& paramType) const;
+    void UpdateDynamicParams();
+
+    // Parameter getters/setters
+    template <class Type>
+    bool SetParamValue(const float time, const CAnimParamType& param, const Type& value)
+    {
+        AZ_Assert(m_animNode, "Expected valid m_animNode");
+        return m_animNode->SetParamValue(time, param, value);
+    }
+
+    template <class Type>
+    bool GetParamValue(const float time, const CAnimParamType& param, Type& value)
+    {
+        AZ_Assert(m_animNode, "Expected valid m_animNode");
+        return m_animNode->GetParamValue(time, param, value);
+    }
+
+    // Check if it's a group node
+    virtual bool IsGroupNode() const override;
+
+    // Generate a new node name
+    virtual QString GetAvailableNodeNameStartingWith(const QString& name) const;
+
+    // Copy/Paste nodes
+    virtual void CopyNodesToClipboard(const bool bOnlySelected, QWidget* context);
+    virtual bool PasteNodesFromClipboard(QWidget* context);
+
+    // Set new parent
+    virtual void SetNewParent(CTrackViewAnimNode* pNewParent);
+
+    // Check if this node may be moved to new parent
+    virtual bool IsValidReparentingTo(CTrackViewAnimNode* pNewParent);
+
+    int GetDefaultKeyTangentFlags() const { return m_animNode ? m_animNode->GetDefaultKeyTangentFlags() : SPLINE_KEY_TANGENT_UNIFIED; }
+    
+    void SetComponent(AZ::ComponentId componentId, const AZ::Uuid& componentTypeId);
+
+    // returns the AZ::ComponentId of the component associated with this node if it is of type AnimNodeType::Component, InvalidComponentId otherwise
+    AZ::ComponentId GetComponentId() const;
+
+    // IAnimNodeOwner
+    void MarkAsModified() override;
+    // ~IAnimNodeOwner
+
+    // Compares all of the node's track values at the given time with the associated property value and 
+    //     sets a key at that time if they are different to match the latter
+    // Returns the number of keys set
+    int SetKeysForChangedTrackValues(float time) { return m_animNode->SetKeysForChangedTrackValues(time); }
+
+    // returns true if this node is associated with an AnimNodeType::AzEntity node and contains a component with the given id
+    bool ContainsComponentWithId(AZ::ComponentId componentId) const;
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorEntityContextNotificationBus implementation
+    void OnStartPlayInEditor() override;
+    void OnStopPlayInEditor() override;
+    //~AzToolsFramework::EditorEntityContextNotificationBus implementation
+
+    //////////////////////////////////////////////////////////////////////////
+    // AZ::EntityBus
+    void OnEntityActivated(const AZ::EntityId& entityId) override;
+    void OnEntityDestruction(const AZ::EntityId& entityId) override;
+    //~AZ::EntityBus 
+
+    //////////////////////////////////////////////////////////////////////////
+    //! AZ::TransformNotificationBus::Handler
+    void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
+    void OnParentChanged(AZ::EntityId oldParent, AZ::EntityId newParent) override;
+    void OnParentTransformWillChange(AZ::Transform oldTransform, AZ::Transform newTransform) override;
+    //////////////////////////////////////////////////////////////////////////
+
+    void OnEntityRemoved();
+
+    // Creates a sub-node for the given component. Returns a pointer to the created component sub-node
+    CTrackViewAnimNode* AddComponent(const AZ::Component* component, bool disabled);
+
+    // Depth-first search for TrackViewAnimNode associated with the given animNode. Returns the first match found or nullptr if not found
+    CTrackViewAnimNode* FindNodeByAnimNode(const IAnimNode* animNode);
+
+protected:
+    IAnimNode* GetAnimNode() { return m_animNode.get(); }
+
+private:
+    // Copy selected keys to XML representation for clipboard
+    virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) override;
+
+    void CopyNodesToClipboardRec(CTrackViewAnimNode* pCurrentAnimNode, XmlNodeRef& xmlNode, const bool bOnlySelected);
+
+    void PasteTracksFrom(XmlNodeRef& xmlNodeWithTracks);
+
+    bool HasObsoleteTrackRec(CTrackViewNode* pCurrentNode) const;
+    CTrackViewTrackBundle GetTracks(const bool bOnlySelected, const CAnimParamType& paramType) const;
+
+    void PasteNodeFromClipboard(AZStd::map<int, IAnimNode*>& copiedIdToNodeMap, XmlNodeRef xmlNode);
+
+    void SetPosRotScaleTracksDefaultValues(bool positionAllowed = true, bool rotationAllowed = true, bool scaleAllowed = true);
+
+    void UpdateTrackGizmo();
+
+    bool CheckTrackAnimated(const CAnimParamType& paramType) const;
+
+    // IAnimNodeOwner
+    void OnNodeVisibilityChanged(IAnimNode* pNode, const bool bHidden) override;
+    void OnNodeReset(IAnimNode* pNode) override;
+    // ~IAnimNodeOwner
+
+    // ITransformDelegate
+    void MatrixInvalidated() override;
+
+    Vec3 GetTransformDelegatePos(const Vec3& realPos) const override;
+    Quat GetTransformDelegateRotation(const Quat& realRotation) const override;
+    Vec3 GetTransformDelegateScale(const Vec3& realScale) const override;
+
+    void SetTransformDelegatePos(const Vec3& position) override;
+    void SetTransformDelegateRotation(const Quat& rotation) override;
+    void SetTransformDelegateScale(const Vec3& scale) override;
+
+    // If those return true the base object uses its own transform instead
+    bool IsPositionDelegated() const override;
+    bool IsRotationDelegated() const override;
+    bool IsScaleDelegated() const override;
+    // ~ITransformDelegate
+
+    // Helper for Is<Position/Rotation/Scale>Delegated to call internally
+    bool IsTransformAnimParamTypeDelegated(AnimParamType animParamType) const;
+
+    // EntitySelectionEvents
+    void OnSelected() override;
+    void OnDeselected() override;
+
+    void OnSelectionChanged(bool selected);
+
+    void UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM);
+
+    // Used to track Editor object listener registration
+    void RegisterEditorObjectListeners(AZ::EntityId entityId);
+    void UnRegisterEditorObjectListeners();
+
+    // Helper functions
+    static void RemoveChildNode(CTrackViewAnimNode* child);
+    static AZ::Transform GetEntityWorldTM(AZ::EntityId entityId);
+    static void SetParentsInChildren(CTrackViewAnimNode* currentNode);
+
+    IAnimSequence* m_animSequence;
+    AZStd::intrusive_ptr<IAnimNode> m_animNode;
+    AZ::EntityId m_nodeEntityId;
+    AZStd::unique_ptr<IAnimNodeAnimator> m_pNodeAnimator;
+    _smart_ptr<CGizmo> m_trackGizmo;
+
+    // used to stash the Editor sequence and node entity Ids when we switch to game mode from the editor
+    AZ::EntityId    m_stashedAnimNodeEditorAzEntityId;
+    AZ::EntityId    m_stashedAnimSequenceEditorAzEntityId;
+
+    // Used to track Editor object listener registration
+    AZ::EntityId m_entityIdListenerRegistered;
+
+    // used to return a const reference to a null Uuid
+    static const AZ::Uuid s_nullUuid;
+};
diff --git a/Code/Editor/TrackView/TrackViewCurveEditor.cpp b/Code/Editor/TrackView/TrackViewCurveEditor.cpp
new file mode 100644
index 0000000000..5aecfcbbae
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewCurveEditor.cpp
@@ -0,0 +1,425 @@
+/*
+ * 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 "TrackViewCurveEditor.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "TrackView/ui_TrackViewCurveEditor.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+#define IDC_TRACKVIEWGRAPH_CURVE 1
+#define IDC_TIMELINE             2
+
+#define IDC_HORIZON_SLIDER      3
+#define IDC_VERTICAL_SLIDER     4
+
+//! It's for mapping from a slider control range to a real zoom range, and vice versa.
+#define SLIDER_MULTIPLIER       100.f
+#define SLIDERRANGE_TO_ZOOM(SLIDERVALUE)    (float)SLIDERVALUE / SLIDER_MULTIPLIER
+#define ZOOMRANGE_TO_SLIDER(ZOOMVALUE)      (int)(ZOOMVALUE * SLIDER_MULTIPLIER)
+
+
+//////////////////////////////////////////////////////////////////////////
+TrackViewCurveEditorDialog::TrackViewCurveEditorDialog(QWidget* parent)
+    : QWidget(parent)
+{
+    m_widget = new CTrackViewCurveEditor(this);
+    QVBoxLayout* l = new QVBoxLayout;
+    l->setMargin(0);
+    l->addWidget(m_widget);
+    setLayout(l);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewCurveEditor::CTrackViewCurveEditor(QWidget* parent)
+    : QWidget(parent)
+    , m_ui(new Ui::TrackViewCurveEditor)
+{
+    m_ui->setupUi(this);
+    m_bLevelClosing = false;
+    m_bIgnoreSelfEvents = false;
+    GetIEditor()->RegisterNotifyListener(this);
+    GetIEditor()->GetAnimation()->AddListener(this);
+
+    m_timelineCtrl.SetTimeRange(Range(0, 1));
+    m_timelineCtrl.SetTicksTextScale(1.0f);
+
+    m_ui->m_wndSpline->SetTimelineCtrl(&m_timelineCtrl);
+
+    connect(&m_timelineCtrl, &TimelineWidget::change, this, &CTrackViewCurveEditor::OnTimelineChange);
+    connect(m_ui->m_wndSpline, &SplineWidget::change, this, &CTrackViewCurveEditor::OnSplineChange);
+    connect(m_ui->m_wndSpline, &SplineWidget::timeChange, this, &CTrackViewCurveEditor::OnSplineTimeMarkerChange);
+
+    connect(m_ui->buttonTangentAuto,      &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_AUTO); });
+    connect(m_ui->buttonTangentInZero,    &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_IN_ZERO); });
+    connect(m_ui->buttonTangentInStep,    &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_IN_STEP); });
+    connect(m_ui->buttonTangentInLinear,  &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_IN_LINEAR); });
+    connect(m_ui->buttonTangentOutZero,   &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_OUT_ZERO); });
+    connect(m_ui->buttonTangentOutStep,   &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_OUT_STEP); });
+    connect(m_ui->buttonTangentOutLinear, &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_OUT_LINEAR); });
+    connect(m_ui->buttonSplineFitX,       &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_SPLINE_FIT_X); });
+    connect(m_ui->buttonSplineFitY,       &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_SPLINE_FIT_Y); });
+    connect(m_ui->buttonSplineSnapGridX,  &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_SPLINE_SNAP_GRID_X); });
+    connect(m_ui->buttonSplineSnapGridY,  &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_SPLINE_SNAP_GRID_Y); });
+    connect(m_ui->buttonTangentUnify,     &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_UNIFY); });
+    connect(m_ui->buttonFreezeKeys,       &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_FREEZE_KEYS); });
+    connect(m_ui->buttonFreezeTangents,   &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_FREEZE_TANGENTS); });
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewCurveEditor::~CTrackViewCurveEditor()
+{
+    GetIEditor()->GetAnimation()->RemoveListener(this);
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+
+
+// CTrackViewGraph message handlers
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnSequenceChanged([[maybe_unused]] CTrackViewSequence* pSequence)
+{
+    UpdateSplines();
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    if (m_bIgnoreSelfEvents)
+    {
+        return;
+    }
+    switch (event)
+    {
+    case eNotify_OnCloseScene:
+        m_ui->m_wndSpline->RemoveAllSplines();
+        m_bLevelClosing = true;
+        break;
+    case eNotify_OnBeginNewScene:
+    case eNotify_OnBeginSceneOpen:
+        m_bLevelClosing = false;
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::UpdateSplines()
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!pSequence || m_bLevelClosing)
+    {
+        // No sequence selected, remove any splines.
+        if (nullptr != m_ui)
+        {
+            if (nullptr != m_ui->m_wndSpline)
+            {
+                m_ui->m_wndSpline->RemoveAllSplines();
+            }
+        }
+
+        return;
+    }
+
+    CTrackViewTrackBundle selectedTracks;
+    selectedTracks = pSequence->GetSelectedTracks();
+
+    std::set<CTrackViewTrack*> oldTracks;
+    for (auto iter = m_ui->m_wndSpline->GetTracks().begin(); iter != m_ui->m_wndSpline->GetTracks().end(); ++iter)
+    {
+        CTrackViewTrack* pTrack = *iter;
+        oldTracks.insert(pTrack);
+    }
+
+    std::set<CTrackViewTrack*> newTracks;
+    if (selectedTracks.AreAllOfSameType())
+    {
+        for (int i = 0; i < selectedTracks.GetCount(); i++)
+        {
+            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
+
+            if (pTrack->IsCompoundTrack())
+            {
+                unsigned int numChildTracks = pTrack->GetChildCount();
+                for (unsigned int ii = 0; ii < numChildTracks; ++ii)
+                {
+                    CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(ii));
+                    newTracks.insert(pChildTrack);
+                }
+            }
+            else
+            {
+                newTracks.insert(pTrack);
+            }
+        }
+    }
+
+    if (oldTracks == newTracks)
+    {
+        return;
+    }
+
+    m_ui->m_wndSpline->RemoveAllSplines();
+    for (auto iter = newTracks.begin(); iter != newTracks.end(); ++iter)
+    {
+        AddSpline(*iter);
+    }
+
+    UpdateTimeRange(pSequence);
+
+    // If it is a rotation track, adjust the default value range properly to accommodate some degree values.
+    if (selectedTracks.HasRotationTrack())
+    {
+        m_ui->m_wndSpline->SetDefaultValueRange(Range(-180.0f, 180.0f));
+    }
+    else
+    {
+        m_ui->m_wndSpline->SetDefaultValueRange(Range(-1.1f, 1.1f));
+    }
+
+    ResetSplineCtrlZoomLevel();
+
+    return;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::AddSpline(CTrackViewTrack* pTrack)
+{
+    if (!pTrack->GetSpline())
+    {
+        return;
+    }
+
+    const int subTrackIndex = pTrack->GetSubTrackIndex();
+
+    if (subTrackIndex >= 0)
+    {
+        QColor trackColor = QColor(255, 0, 0);
+        switch (subTrackIndex)
+        {
+        case 0:
+            trackColor = QColor(255, 0, 0);
+            break;
+        case 1:
+            trackColor = QColor(0, 255, 0);
+            break;
+        case 2:
+            trackColor = QColor(0, 0, 255);
+            break;
+        case 3:
+            trackColor = QColor(255, 255, 0);
+            break;
+        }
+
+        m_ui->m_wndSpline->AddSpline(pTrack->GetSpline(), pTrack, trackColor);
+    }
+    else
+    {
+        QColor    afColorArray[4];
+        afColorArray[0] = QColor(255, 0, 0);
+        afColorArray[1] = QColor(0, 255, 0);
+        afColorArray[2] = QColor(0, 0, 255);
+        afColorArray[3] = QColor(255, 0, 255); //Pink... so you know it's wrong if you see it.
+
+        m_ui->m_wndSpline->AddSpline(pTrack->GetSpline(), pTrack, afColorArray);
+    }
+}
+
+void CTrackViewCurveEditor::showEvent(QShowEvent* event)
+{
+    QWidget::showEvent(event);
+    OnSplineCmdUpdateUI();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnSplineChange()
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (pSequence)
+    {
+        pSequence->OnKeysChanged();
+    }
+
+    // In the end, focus this again in order to properly catch 'KeyDown' messages.
+    m_ui->m_wndSpline->setFocus();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnSplineCmd(UINT cmd)
+{
+    m_ui->m_wndSpline->OnUserCommand(cmd);
+    OnSplineCmdUpdateUI();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnSplineCmdUpdateUI()
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (m_bLevelClosing || !pSequence)
+    {
+        return;
+    }
+
+    m_ui->buttonSplineSnapGridX->setChecked(m_ui->m_wndSpline->IsSnapTime());
+    m_ui->buttonSplineSnapGridY->setChecked(m_ui->m_wndSpline->IsSnapValue());
+    m_ui->buttonTangentUnify->setChecked(m_ui->m_wndSpline->IsUnifiedKeyCurrentlySelected());
+    m_ui->buttonFreezeKeys->setChecked(m_ui->m_wndSpline->IsKeysFrozen());
+    m_ui->buttonFreezeTangents->setChecked(m_ui->m_wndSpline->IsTangentsFrozen());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnTimeChanged(float newTime)
+{
+    m_ui->m_wndSpline->SetTimeMarker(newTime);
+    m_ui->m_wndSpline->update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::SetEditLock(bool bLock)
+{
+    m_ui->m_wndSpline->SetEditLock(bLock);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnTimelineChange()
+{
+    float fTime = m_timelineCtrl.GetTimeMarker();
+    GetIEditor()->GetAnimation()->SetTime(fTime);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnSplineTimeMarkerChange()
+{
+    float fTime = m_ui->m_wndSpline->GetTimeMarker();
+    GetIEditor()->GetAnimation()->SetTime(fTime);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::SetFPS(float fps)
+{
+    m_timelineCtrl.SetFPS(fps);
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewCurveEditor::GetFPS() const
+{
+    return m_timelineCtrl.GetFPS();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::SetTickDisplayMode(ETVTickMode mode)
+{
+    if (mode == eTVTickMode_InFrames)
+    {
+        m_timelineCtrl.SetMarkerStyle(TimelineWidget::MARKER_STYLE_FRAMES);
+        m_ui->m_wndSpline->SetTooltipValueScale(GetFPS(), 1.0f);
+    }
+    else if (mode == eTVTickMode_InSeconds)
+    {
+        m_timelineCtrl.SetMarkerStyle(TimelineWidget::MARKER_STYLE_SECONDS);
+        m_ui->m_wndSpline->SetTooltipValueScale(1.0f, 1.0f);
+    }
+
+    m_timelineCtrl.update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::ResetSplineCtrlZoomLevel()
+{
+    m_ui->m_wndSpline->FitSplineToViewHeight();
+    m_ui->m_wndSpline->FitSplineToViewWidth();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnKeysChanged([[maybe_unused]] CTrackViewSequence* pSequence)
+{
+    m_ui->m_wndSpline->update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle)
+{
+    EAnimCurveType trType = addedKeyHandle.GetTrack()->GetCurveType();
+    if (trType == eAnimCurveType_BezierFloat)
+    {
+        // we query the added key's track to find the default tangent flags to use for newly created keys
+        const int tangentFlagsForNewKeys = addedKeyHandle.GetTrack()->GetAnimNode()->GetDefaultKeyTangentFlags();
+        I2DBezierKey bezierKey;
+        addedKeyHandle.GetKey(&bezierKey);
+
+        // clear any existing in and out tangent flags
+        bezierKey.flags &= ~SPLINE_KEY_TANGENT_ALL_MASK;
+
+        // set tangent flags to the default tangent flags used for the track's animNode and save them
+        bezierKey.flags |= tangentFlagsForNewKeys;
+        addedKeyHandle.SetKey(&bezierKey);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnKeySelectionChanged([[maybe_unused]] CTrackViewSequence* pSequence)
+{
+    if (isVisible())
+    {
+        m_ui->m_wndSpline->update();
+        m_ui->buttonTangentUnify->setChecked(m_ui->m_wndSpline->IsUnifiedKeyCurrentlySelected());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnNodeChanged([[maybe_unused]] CTrackViewNode* pNode, ENodeChangeType type)
+{
+    if (isVisible() && type == ITrackViewSequenceListener::eNodeChangeType_Removed)
+    {
+        UpdateSplines();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewCurveEditor::OnNodeSelectionChanged([[maybe_unused]] CTrackViewSequence* pSequence)
+{
+    if (isVisible())
+    {
+        UpdateSplines();
+    }
+}
+
+void CTrackViewCurveEditor::OnSequenceSettingsChanged(CTrackViewSequence* pSequence)
+{
+    if (isVisible())
+    {
+        UpdateTimeRange(pSequence);
+        m_timelineCtrl.update();
+        m_ui->m_wndSpline->update();
+    }
+}
+
+void CTrackViewCurveEditor::UpdateTimeRange(CTrackViewSequence* pSequence)
+{
+    Range timeRange =   pSequence->GetTimeRange();
+    m_ui->m_wndSpline->SetTimeRange(timeRange);
+    m_timelineCtrl.SetTimeRange(timeRange);
+    m_ui->m_wndSpline->SetValueRange(Range(-2000.0f, 2000.0f));
+}
+
+void CTrackViewCurveEditor::SetPlayCallback(const std::function<void()>& callback)
+{
+    m_ui->m_wndSpline->SetPlayCallback(callback);
+    m_timelineCtrl.SetPlayCallback(callback);
+}
+
+CTrackViewSplineCtrl& CTrackViewCurveEditor::GetSplineCtrl()
+{
+    return *m_ui->m_wndSpline;
+}
diff --git a/Code/Editor/TrackView/TrackViewCurveEditor.h b/Code/Editor/TrackView/TrackViewCurveEditor.h
new file mode 100644
index 0000000000..3d58b87be2
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewCurveEditor.h
@@ -0,0 +1,127 @@
+/*
+ * 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_TRACKVIEW_TRACKVIEWCURVEEDITOR_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWCURVEEDITOR_H
+#pragma once
+
+
+#include "TrackViewDopeSheetBase.h"
+#include "TrackViewSplineCtrl.h"
+#include "Controls/TimelineCtrl.h"
+#include "TrackViewTimeline.h"
+
+#include <QWidget>
+
+namespace Ui
+{
+    class TrackViewCurveEditor;
+}
+
+/** CTrackViewGraph dialog.
+        Placed at the same position as tracks dialog, and display spline graphs of track.
+*/
+class CTrackViewCurveEditor
+    : public QWidget
+    , public IAnimationContextListener
+    , public IEditorNotifyListener
+    , public ITrackViewSequenceListener
+{
+    friend class TrackViewCurveEditorDialog;
+public:
+    CTrackViewCurveEditor(QWidget* parent);
+    virtual ~CTrackViewCurveEditor();
+
+    void SetEditLock(bool bLock);
+
+    void SetFPS(float fps);
+    float GetFPS() const;
+    void SetTickDisplayMode(ETVTickMode mode);
+
+    CTrackViewSplineCtrl& GetSplineCtrl();
+    void ResetSplineCtrlZoomLevel();
+
+    void SetPlayCallback(const std::function<void()>& callback);
+
+    // IAnimationContextListener
+    virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence);
+    virtual void OnTimeChanged(float newTime);
+
+protected:
+    void showEvent(QShowEvent* event) override;
+
+private:
+
+    void OnSplineChange();
+    void OnSplineCmd(UINT cmd);
+    void OnSplineCmdUpdateUI();
+    void OnTimelineChange();
+    void OnSplineTimeMarkerChange();
+
+    // IEditorNotifyListener
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+
+    //ITrackViewSequenceListener
+    void OnKeysChanged(CTrackViewSequence* pSequence) override;
+    void OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle) override;
+    void OnKeySelectionChanged(CTrackViewSequence* pSequence) override;
+    void OnNodeChanged(CTrackViewNode* pNode, ENodeChangeType type) override;
+    void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override;
+    void OnSequenceSettingsChanged(CTrackViewSequence* pSequence) override;
+    //~ITrackViewSequenceListener
+
+    void UpdateSplines();
+    void UpdateTimeRange(CTrackViewSequence* pSequence);
+
+    void AddSpline(CTrackViewTrack* pTrack);
+
+    TrackView::CTrackViewTimelineWidget m_timelineCtrl;
+
+    bool m_bIgnoreSelfEvents;
+
+    bool m_bLevelClosing;
+
+    QScopedPointer<Ui::TrackViewCurveEditor> m_ui;
+};
+
+class TrackViewCurveEditorDialog
+    : public QWidget
+    , public ITrackViewSequenceListener
+    , public IAnimationContextListener
+{
+public:
+    TrackViewCurveEditorDialog(QWidget* parent);
+    virtual ~TrackViewCurveEditorDialog() {}
+
+    void SetPlayCallback(const std::function<void()>& callback) { m_widget->SetPlayCallback(callback); }
+
+    void SetEditLock(bool bLock) { m_widget->SetEditLock(bLock); }
+
+    CTrackViewSplineCtrl& GetSplineCtrl(){ return m_widget->GetSplineCtrl(); }
+
+    void SetFPS(float fps) { m_widget->SetFPS(fps); }
+    float GetFPS() const { return m_widget->GetFPS(); }
+    void SetTickDisplayMode(ETVTickMode mode) { m_widget->SetTickDisplayMode(mode); }
+
+    virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence) { m_widget->OnSequenceChanged(pNewSequence); }
+    virtual void OnTimeChanged(float newTime) { m_widget->OnTimeChanged(newTime); }
+
+    // ITrackViewSequenceListener delegation to m_widget
+    void OnKeysChanged(CTrackViewSequence* pSequence) override { m_widget->OnKeysChanged(pSequence); }
+    void OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle) override { m_widget->OnKeyAdded(addedKeyHandle); }
+    void OnKeySelectionChanged(CTrackViewSequence* pSequence) override { m_widget->OnKeySelectionChanged(pSequence); }
+    void OnNodeChanged(CTrackViewNode* pNode, ENodeChangeType type) override { m_widget->OnNodeChanged(pNode, type); }
+    void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override { m_widget->OnNodeSelectionChanged(pSequence); }
+    void OnSequenceSettingsChanged(CTrackViewSequence* pSequence) override { m_widget->OnSequenceSettingsChanged(pSequence); }
+    //~ITrackViewSequenceListener
+
+private:
+    CTrackViewCurveEditor* m_widget;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWCURVEEDITOR_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.ui b/Code/Editor/TrackView/TrackViewCurveEditor.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.ui
rename to Code/Editor/TrackView/TrackViewCurveEditor.ui
diff --git a/Code/Editor/TrackView/TrackViewDialog.cpp b/Code/Editor/TrackView/TrackViewDialog.cpp
new file mode 100644
index 0000000000..351ea12621
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewDialog.cpp
@@ -0,0 +1,2344 @@
+/*
+ * 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 : CTrackViewDialog Implementation file.
+
+
+#include "EditorDefs.h"
+
+#include "TrackViewDialog.h"
+
+// Qt
+#include <QFileDialog>
+#include <QSplitter>
+#include <QToolBar>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QAction>
+#include <QMessageBox>
+#include <QMenuBar>
+#include <QMenu>
+#include <QInputDialog>
+#include <QComboBox>
+#include <QSettings>
+#include <QToolButton>
+
+// AzFramework
+#include <AzToolsFramework/API/ViewPaneOptions.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/StyledDockWidget.h>
+
+// CryCommon
+#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+
+// Editor
+#include "Settings.h"
+#include "Util/fastlib.h"
+#include "Objects/SelectionGroup.h"
+#include "TVSequenceProps.h"
+#include "TrackViewFindDlg.h"
+#include "SequenceBatchRenderDialog.h"
+#include "TVCustomizeTrackColorsDlg.h"
+#include "PluginManager.h"
+#include "Util/3DConnexionDriver.h"
+#include "TrackViewNewSequenceDialog.h"
+#include "FBXExporterDialog.h"
+#include "CryEditDoc.h"
+#include "LyViewPaneNames.h"
+
+//////////////////////////////////////////////////////////////////////////
+inline namespace TrackViewInternal
+{
+    const char* s_kTrackViewLayoutSection = "TrackViewLayout";
+    const char* s_kTrackViewSection = "DockingPaneLayouts\\TrackView";
+    const char* s_kSplitterEntry = "Splitter";
+    const char* s_kVersionEntry = "TrackViewLayoutVersion";
+
+    const char* s_kTrackViewSettingsSection = "TrackView";
+    const char* s_kSnappingModeEntry = "SnappingMode";
+    const char* s_kFrameSnappingFPSEntry = "FrameSnappingFPS";
+    const char* s_kTickDisplayModeEntry = "TickDisplayMode";
+    const char* s_kDefaultTracksEntry = "DefaultTracks2";
+
+    const char* s_kRebarVersionEntry = "TrackViewReBarVersion";
+    const char* s_kRebarBandEntryPrefix = "ReBarBand";
+
+    const char* s_kNoSequenceComboBoxEntry = "--- No Sequence ---";
+
+    const int s_kMinimumFrameSnappingFPS = 1;
+    const int s_kMaximumFrameSnappingFPS = 120;
+
+    const int TRACKVIEW_LAYOUT_VERSION = 0x0001; // Bump this up on every substantial pane layout change
+    const int TRACKVIEW_REBAR_VERSION = 0x0002; // Bump this up on every substantial rebar change
+
+    CTrackViewSequence* GetSequenceByEntityIdOrName(const CTrackViewSequenceManager* pSequenceManager, const char* entityIdOrName)
+    {
+        // the "name" string will be an AZ::EntityId in string form if this was called from
+        // TrackView code. But for backward compatibility we also support a sequence name.
+        bool isNameAValidU64 = false;
+        QString entityIdString = entityIdOrName;
+        AZ::u64 nameAsU64 = entityIdString.toULongLong(&isNameAValidU64);
+
+        CTrackViewSequence* pSequence = nullptr;
+        if (isNameAValidU64)
+        {
+            // "name" string was a valid u64 represented as a string. Use as an entity Id to search for sequence.
+            pSequence = pSequenceManager->GetSequenceByEntityId(AZ::EntityId(nameAsU64));
+        }
+
+        if (!pSequence)
+        {
+            // name passed in could not find a sequence by using it as an EntityId. Use it as a
+            // sequence name for backward compatibility
+            pSequence = pSequenceManager->GetSequenceByName(entityIdOrName);
+        }
+
+        return pSequence;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::RegisterViewClass()
+{
+    AzToolsFramework::ViewPaneOptions opts;
+    opts.shortcut = QKeySequence(Qt::Key_T);
+    opts.isDisabledInSimMode = true;
+    opts.showOnToolsToolbar = true;
+    opts.toolbarIcon = ":/Menu/trackview_editor.svg";
+
+    AzToolsFramework::RegisterViewPane<CTrackViewDialog>(LyViewPane::TrackView, LyViewPane::CategoryTools, opts);
+    GetIEditor()->GetSettingsManager()->AddToolName(s_kTrackViewLayoutSection, LyViewPane::TrackView);
+}
+
+const GUID& CTrackViewDialog::GetClassID()
+{
+    static const GUID guid =
+    {
+        0xd21c9fe5, 0x22d3, 0x41e3, { 0xb8, 0x4b, 0xa3, 0x77, 0xaf, 0xa0, 0xa0, 0x5c }
+    };
+    return guid;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewDialog* CTrackViewDialog::s_pTrackViewDialog = NULL;
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewDialog::CTrackViewDialog(QWidget* pParent /*=NULL*/)
+    : QMainWindow(pParent)
+{
+    s_pTrackViewDialog = this;
+    m_bRecord = false;
+    m_bAutoRecord = false;
+    m_bPause = false;
+    m_bPlay = false;
+    m_fLastTime = -1.0f;
+    m_fAutoRecordStep = 0.5f;
+    m_bNeedReloadSequence = false;
+    m_bIgnoreUpdates = false;
+    m_bDoingUndoOperation = false;
+
+    m_findDlg = nullptr;
+
+    m_lazyInitDone = false;
+    m_bEditLock = false;
+
+    m_pNodeForTracksToolBar = NULL;
+
+    m_currentToolBarParamTypeId = 0;
+
+    // Default Tracks created for AZ Entities
+    m_defaultTracksForEntityNode.push_back(AnimParamType::Position);
+    m_defaultTracksForEntityNode.push_back(AnimParamType::Rotation);
+
+    OnInitDialog();
+    AddDialogListeners();
+
+    AZ::EntitySystemBus::Handler::BusConnect();
+    AzToolsFramework::ToolsApplicationNotificationBus::Handler::BusConnect();
+}
+
+CTrackViewDialog::~CTrackViewDialog()
+{
+    AzToolsFramework::ToolsApplicationNotificationBus::Handler::BusDisconnect();
+    AZ::EntitySystemBus::Handler::BusDisconnect();
+
+    SaveLayouts();
+    SaveMiscSettings();
+    SaveTrackColors();
+
+    if (m_findDlg)
+    {
+        m_findDlg->deleteLater();
+        m_findDlg = nullptr;
+    }
+    s_pTrackViewDialog = 0;
+
+    const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+    CTrackViewSequence* sequence = pSequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
+    RemoveSequenceListeners(sequence);
+    RemoveDialogListeners();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnAddEntityNodeMenu()
+{
+    // Toggle the selection
+    QAction* action = static_cast<QAction*>(sender());
+    if (action)
+    {
+        AnimParamType paramTime = static_cast<AnimParamType>(action->data().toInt());
+        auto it = AZStd::find(m_defaultTracksForEntityNode.begin(), m_defaultTracksForEntityNode.end(), paramTime);
+        if (it == m_defaultTracksForEntityNode.end())
+        {
+            m_defaultTracksForEntityNode.push_back(paramTime);
+        }
+        else
+        {
+            m_defaultTracksForEntityNode.erase(it);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+BOOL CTrackViewDialog::OnInitDialog()
+{
+    InitToolbar();
+    InitMenu();
+
+    QWidget* w = new QWidget();
+    QVBoxLayout* l = new QVBoxLayout;
+    l->setMargin(0);
+
+    m_wndSplitter = new QSplitter(w);
+    m_wndSplitter->setOrientation(Qt::Horizontal);
+
+    m_wndNodesCtrl = new CTrackViewNodesCtrl(this, this);
+    m_wndNodesCtrl->SetTrackViewDialog(this);
+
+    m_wndDopeSheet = new CTrackViewDopeSheetBase(this);
+    m_wndDopeSheet->SetTimeRange(0, 20);
+    m_wndDopeSheet->SetTimeScale(100, 0);
+
+    m_wndDopeSheet->SetNodesCtrl(m_wndNodesCtrl);
+    m_wndNodesCtrl->SetDopeSheet(m_wndDopeSheet);
+
+    m_wndSplitter->addWidget(m_wndNodesCtrl);
+    m_wndSplitter->addWidget(m_wndDopeSheet);
+    m_wndSplitter->setStretchFactor(0, 1);
+    m_wndSplitter->setStretchFactor(1, 10);
+    l->addWidget(m_wndSplitter);
+    w->setLayout(l);
+    setCentralWidget(w);
+
+    m_wndKeyProperties = new CTrackViewKeyPropertiesDlg(this);
+    QDockWidget* dw = new AzQtComponents::StyledDockWidget(this);
+    dw->setObjectName("m_wndKeyProperties");
+    dw->setWindowTitle("Key");
+    dw->setWidget(m_wndKeyProperties);
+    addDockWidget(Qt::RightDockWidgetArea, dw);
+    m_wndKeyProperties->PopulateVariables();
+    m_wndKeyProperties->SetKeysCtrl(m_wndDopeSheet);
+
+    m_wndCurveEditorDock = new AzQtComponents::StyledDockWidget(this);
+    m_wndCurveEditorDock->setObjectName("m_wndCurveEditorDock");
+    m_wndCurveEditorDock->setWindowTitle("Curve Editor");
+    m_wndCurveEditor = new TrackViewCurveEditorDialog(this);
+    m_wndCurveEditorDock->setWidget(m_wndCurveEditor);
+    addDockWidget(Qt::BottomDockWidgetArea, m_wndCurveEditorDock);
+    m_wndCurveEditor->SetPlayCallback([this] { OnPlay();
+        });
+
+    InitSequences();
+
+    m_lazyInitDone = false;
+
+    QTimer::singleShot(0, this, SLOT(ReadLayouts()));
+    //  ReadLayouts();
+    ReadMiscSettings();
+    ReadTrackColors();
+
+    QString cursorPosText = QString("0.000(%1fps)").arg(FloatToIntRet(m_wndCurveEditor->GetFPS()));
+    m_cursorPos->setText(cursorPosText);
+
+    return TRUE;  // return TRUE unless you set the focus to a control
+    // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::FillAddSelectedEntityMenu()
+{
+    QMenu* menu = qobject_cast<QMenu*>(sender());
+    menu->clear();
+
+    AZStd::vector<AnimParamType> allTracks = {
+        AnimParamType::Position,
+        AnimParamType::Rotation,
+        AnimParamType::Scale
+    };
+
+    AZStd::map<AnimParamType, QString> paramNames;
+    paramNames[AnimParamType::Position] = "Position";
+    paramNames[AnimParamType::Rotation] = "Rotation",
+    paramNames[AnimParamType::Scale] = "Scale";
+
+    for (AnimParamType track : allTracks)
+    {
+        auto it = AZStd::find(m_defaultTracksForEntityNode.begin(), m_defaultTracksForEntityNode.end(), track);
+        bool checked = (it != m_defaultTracksForEntityNode.end());
+
+        QAction* action = menu->addAction(paramNames[track]);
+        action->setCheckable(true);
+        action->setChecked(checked);
+        action->setData(static_cast<int>(track));
+        action->setEnabled(true);
+        connect(action, &QAction::triggered, this, &CTrackViewDialog::OnAddEntityNodeMenu);
+    }
+}
+
+void CTrackViewDialog::InitToolbar()
+{
+    m_mainToolBar = addToolBar("Sequence/Node Toolbar");
+    m_mainToolBar->setObjectName("m_mainToolBar");
+    m_mainToolBar->setFloatable(false);
+    m_mainToolBar->addWidget(new QLabel("Sequence/Node:"));
+    QAction* qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-00.png"), "Add Sequence");
+    qaction->setData(ID_TV_ADD_SEQUENCE);
+    m_actions[ID_TV_ADD_SEQUENCE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAddSequence);
+    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-01.png"), "Delete Sequence");
+    qaction->setData(ID_TV_DEL_SEQUENCE);
+    m_actions[ID_TV_DEL_SEQUENCE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnDelSequence);
+    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-02.png"), "Edit Sequence Properties");
+    qaction->setData(ID_TV_EDIT_SEQUENCE);
+    m_actions[ID_TV_EDIT_SEQUENCE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnEditSequence);
+    m_sequencesComboBox = new QComboBox(this);
+    m_sequencesComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+    m_sequencesComboBox->setToolTip("Select the sequence");
+    connect(m_sequencesComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnSequenceComboBox()));
+    m_mainToolBar->addWidget(m_sequencesComboBox);
+    m_mainToolBar->addSeparator();
+
+    QToolButton* toolButton = new QToolButton(m_mainToolBar);
+    toolButton->setPopupMode(QToolButton::MenuButtonPopup);
+    qaction = new QAction(QIcon(":/Trackview/main/tvmain-03.png"), "Add Selected Node", this);
+    qaction->setData(ID_ADDNODE);
+    m_actions[ID_ADDNODE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAddSelectedNode);
+    toolButton->setDefaultAction(qaction);
+    {
+        QMenu* buttonMenu = new QMenu(this);
+        toolButton->setMenu(buttonMenu);
+        connect(buttonMenu, &QMenu::aboutToShow, this, &CTrackViewDialog::FillAddSelectedEntityMenu);
+    }
+    m_mainToolBar->addWidget(toolButton);
+
+    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-04.png"), "Add Director Node");
+    qaction->setData(ID_ADDSCENETRACK);
+    m_actions[ID_ADDSCENETRACK] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAddDirectorNode);
+    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-05.png"), "Find");
+    qaction->setData(ID_FIND);
+    m_actions[ID_FIND] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnFindNode);
+    m_mainToolBar->addSeparator();
+    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-06.png"), "Toggle Disable");
+    qaction->setCheckable(true);
+    qaction->setData(ID_TRACKVIEW_TOGGLE_DISABLE);
+    m_actions[ID_TRACKVIEW_TOGGLE_DISABLE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnToggleDisable);
+    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-07.png"), "Toggle Mute");
+    qaction->setCheckable(true);
+    qaction->setData(ID_TRACKVIEW_TOGGLE_MUTE);
+    m_actions[ID_TRACKVIEW_TOGGLE_MUTE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnToggleMute);
+    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-08.png"), "Mute Selected Tracks");
+    qaction->setData(ID_TRACKVIEW_MUTE_ALL);
+    m_actions[ID_TRACKVIEW_MUTE_ALL] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnMuteAll);
+    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-09.png"), "Unmute Selected Tracks");
+    qaction->setData(ID_TRACKVIEW_UNMUTE_ALL);
+    m_actions[ID_TRACKVIEW_UNMUTE_ALL] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnUnmuteAll);
+
+    m_viewToolBar = addToolBar("View Toolbar");
+    m_viewToolBar->setObjectName("m_viewToolBar");
+    m_viewToolBar->setFloatable(false);
+    m_viewToolBar->addWidget(new QLabel("View:"));
+    qaction = m_viewToolBar->addAction(QIcon(":/Trackview/view/tvview-00.png"), "Track Editor");
+    qaction->setData(ID_TV_MODE_DOPESHEET);
+    qaction->setShortcut(QKeySequence("Ctrl+D"));
+    qaction->setCheckable(true);
+    qaction->setChecked(true);
+    m_actions[ID_TV_MODE_DOPESHEET] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnModeDopeSheet);
+    qaction = m_viewToolBar->addAction(QIcon(":/Trackview/view/tvview-01.png"), "Curve Editor");
+    qaction->setData(ID_TV_MODE_CURVEEDITOR);
+    qaction->setShortcut(QKeySequence("Ctrl+R"));
+    qaction->setCheckable(true);
+    m_actions[ID_TV_MODE_CURVEEDITOR] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnModeCurveEditor);
+    qaction = m_viewToolBar->addAction(QIcon(":/Trackview/view/tvview-02.png"), "Both");
+    qaction->setData(ID_TV_MODE_OPENCURVEEDITOR);
+    qaction->setShortcut(QKeySequence("Ctrl+B"));
+    m_actions[ID_TV_MODE_OPENCURVEEDITOR] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnOpenCurveEditor);
+
+    m_playToolBar = addToolBar("Play Toolbar");
+    m_playToolBar->setObjectName("m_playToolBar");
+    m_playToolBar->setFloatable(false);
+    m_playToolBar->addWidget(new QLabel("Play:"));
+    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-00.png"), "Go to start of sequence");
+    qaction->setData(ID_TV_JUMPSTART);
+    m_actions[ID_TV_JUMPSTART] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnGoToStart);
+
+    toolButton = new QToolButton(m_playToolBar);
+    toolButton->setPopupMode(QToolButton::MenuButtonPopup);
+    qaction = new QAction(QIcon(":/Trackview/play/tvplay-01.png"), "Play Animation", this);
+    qaction->setData(ID_TV_PLAY);
+    qaction->setCheckable(true);
+    m_actions[ID_TV_PLAY] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnPlay);
+    qaction->setShortcut(QKeySequence(Qt::Key_Space));
+    qaction->setShortcutContext(Qt::WindowShortcut);
+    toolButton->setDefaultAction(qaction);
+    {
+        QMenu* buttonMenu = new QMenu(this);
+        toolButton->setMenu(buttonMenu);
+        QActionGroup* ag = new QActionGroup(buttonMenu);
+        for (auto i : { .5, 1., 2., 4., 8. })
+        {
+            if (i == .5)
+            {
+                qaction = buttonMenu->addAction(" 2 ");
+            }
+            else if (i == 1.)
+            {
+                qaction = buttonMenu->addAction(" 1 ");
+            }
+            else
+            {
+                qaction = buttonMenu->addAction(QString("1/%1").arg((int)i));
+            }
+            qaction->setData(i);
+            connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnPlaySetScale);
+            qaction->setCheckable(true);
+            qaction->setChecked(i == 1.);
+            ag->addAction(qaction);
+        }
+    }
+    m_playToolBar->addWidget(toolButton);
+
+    toolButton = new QToolButton(m_playToolBar);
+    toolButton->setPopupMode(QToolButton::MenuButtonPopup);
+    qaction = new QAction(QIcon(":/Trackview/play/tvplay-02.png"), "Stop", this);
+    qaction->setData(ID_TV_STOP);
+    m_actions[ID_TV_STOP] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnStop);
+    toolButton->setDefaultAction(qaction);
+    {
+        QMenu* buttonMenu = new QMenu(this);
+        toolButton->setMenu(buttonMenu);
+        qaction = buttonMenu->addAction("Stop");
+        connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnStop);
+        toolButton->addAction(qaction);
+        qaction = buttonMenu->addAction("Stop with Hard Reset");
+        qaction->setData(true);
+        connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnStopHardReset);
+    }
+    m_playToolBar->addWidget(toolButton);
+
+    m_playToolBar->addSeparator();
+    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-03.png"), "Pause");
+    qaction->setData(ID_TV_PAUSE);
+    qaction->setCheckable(true);
+    m_actions[ID_TV_PAUSE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnPause);
+    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-04.png"), "Go to end of sequence");
+    qaction->setData(ID_TV_JUMPEND);
+    m_actions[ID_TV_JUMPEND] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnGoToEnd);
+
+    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-05.png"), "Start Animation Recording");
+    qaction->setData(ID_TV_RECORD);
+    qaction->setCheckable(true);
+    m_actions[ID_TV_RECORD] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnRecord);
+
+    toolButton = new QToolButton(m_playToolBar);
+    toolButton->setPopupMode(QToolButton::MenuButtonPopup);
+    qaction = new QAction(QIcon(":/Trackview/play/tvplay-06.png"), "Start Auto Recording", this);
+    toolButton->addAction(qaction);
+    toolButton->setDefaultAction(qaction);
+    qaction->setData(ID_TV_RECORD_AUTO);
+    qaction->setCheckable(true);
+    m_actions[ID_TV_RECORD_AUTO] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAutoRecord);
+    {
+        QMenu* buttonMenu = new QMenu(this);
+        toolButton->setMenu(buttonMenu);
+        QActionGroup* ag = new QActionGroup(buttonMenu);
+        for (auto i : { 1, 2, 5, 10, 25, 50, 100 })
+        {
+            if (i == 1)
+            {
+                qaction = buttonMenu->addAction(" 1 sec");
+            }
+            else
+            {
+                qaction = buttonMenu->addAction(QString("1/%1 sec").arg(i));
+            }
+            qaction->setData(i);
+            connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAutoRecordStep);
+            qaction->setCheckable(true);
+            qaction->setChecked(i == 1);
+            ag->addAction(qaction);
+        }
+    }
+    m_playToolBar->addWidget(toolButton);
+
+    m_playToolBar->addSeparator();
+    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-07.png"), "Loop");
+    qaction->setData(ID_PLAY_LOOP);
+    qaction->setCheckable(true);
+    m_actions[ID_PLAY_LOOP] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnLoop);
+    m_playToolBar->addSeparator();
+    m_cursorPos = new QLabel(this);
+    m_playToolBar->addWidget(m_cursorPos);
+    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-08.png"), "Frame Rate");
+    qaction->setData(ID_TV_SNAP_FPS);
+    qaction->setCheckable(true);
+    m_actions[ID_TV_SNAP_FPS] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapFPS);
+    m_activeCamStatic = new QLabel(this);
+    m_playToolBar->addWidget(m_activeCamStatic);
+    m_playToolBar->addSeparator();
+    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-09.png"), "Undo");
+    qaction->setData(ID_UNDO);
+    m_actions[ID_UNDO] = qaction;
+    connect(qaction, &QAction::triggered, this, []()
+    {
+        GetIEditor()->Undo();
+    });
+    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-10.png"), "Redo");
+    qaction->setData(ID_REDO);
+    m_actions[ID_REDO] = qaction;
+    connect(qaction, &QAction::triggered, this, []()
+    {
+        GetIEditor()->Redo();
+    });
+
+    addToolBarBreak(Qt::TopToolBarArea);
+
+    m_keysToolBar = addToolBar("Keys Toolbar");
+    m_keysToolBar->setObjectName("m_keysToolBar");
+    m_keysToolBar->setFloatable(false);
+    m_keysToolBar->addWidget(new QLabel("Keys:"));
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-00.png"), "Go to previous key");
+    qaction->setData(ID_TV_PREVKEY);
+    m_actions[ID_TV_PREVKEY] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnGoToPrevKey);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-01.png"), "Go to next key");
+    qaction->setData(ID_TV_NEXTKEY);
+    m_actions[ID_TV_NEXTKEY] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnGoToNextKey);
+    m_keysToolBar->addSeparator();
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-02.png"), "Move Keys");
+    qaction->setData(ID_TV_MOVEKEY);
+    m_actions[ID_TV_MOVEKEY] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnMoveKey);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-03.png"), "Slide Keys");
+    qaction->setData(ID_TV_SLIDEKEY);
+    m_actions[ID_TV_SLIDEKEY] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSlideKey);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-04.png"), "Scale Keys");
+    qaction->setData(ID_TV_SCALEKEY);
+    m_actions[ID_TV_SCALEKEY] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnScaleKey);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-05.png"), "Add Keys");
+    qaction->setData(ID_TV_ADDKEY);
+    m_actions[ID_TV_ADDKEY] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAddKey);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-06.png"), "Delete Keys");
+    qaction->setData(ID_TV_DELKEY);
+    m_actions[ID_TV_DELKEY] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnDelKey);
+    m_keysToolBar->addSeparator();
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-07.png"), "No Snapping");
+    qaction->setData(ID_TV_SNAP_NONE);
+    m_actions[ID_TV_SNAP_NONE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapNone);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-08.png"), "Magnet Snapping");
+    qaction->setData(ID_TV_SNAP_MAGNET);
+    m_actions[ID_TV_SNAP_MAGNET] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapMagnet);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-09.png"), "Frame Snapping");
+    qaction->setData(ID_TV_SNAP_FRAME);
+    m_actions[ID_TV_SNAP_FRAME] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapFrame);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-10.png"), "Tick Snapping");
+    qaction->setData(ID_TV_SNAP_TICK);
+    m_actions[ID_TV_SNAP_TICK] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapTick);
+    m_keysToolBar->addSeparator();
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-11.png"), "Sync Selected Entity Nodes to Base Position");
+    qaction->setData(ID_TV_SYNC_TO_BASE);
+    m_actions[ID_TV_SYNC_TO_BASE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSyncSelectedTracksToBase);
+    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-12.png"), "Sync Selected Entity Nodes from Base Position");
+    qaction->setData(ID_TV_SYNC_FROM_BASE);
+    m_actions[ID_TV_SYNC_FROM_BASE] = qaction;
+    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSyncSelectedTracksFromBase);
+    QActionGroup* ag = new QActionGroup(this);
+    ag->addAction(m_actions[ID_TV_ADDKEY]);
+    ag->addAction(m_actions[ID_TV_MOVEKEY]);
+    ag->addAction(m_actions[ID_TV_SLIDEKEY]);
+    ag->addAction(m_actions[ID_TV_SCALEKEY]);
+    for (QAction* qaction2 : ag->actions())
+    {
+        qaction2->setCheckable(true);
+    }
+    m_actions[ID_TV_MOVEKEY]->setChecked(true);
+    ag = new QActionGroup(this);
+    ag->addAction(m_actions[ID_TV_SNAP_NONE]);
+    ag->addAction(m_actions[ID_TV_SNAP_MAGNET]);
+    ag->addAction(m_actions[ID_TV_SNAP_FRAME]);
+    ag->addAction(m_actions[ID_TV_SNAP_TICK]);
+    for (QAction* qaction2 : ag->actions())
+    {
+        qaction2->setCheckable(true);
+    }
+    
+    m_actions[ID_TV_SNAP_NONE]->setChecked(true);
+
+    m_tracksToolBar = addToolBar("Tracks Toolbar");
+    m_tracksToolBar->setObjectName("m_tracksToolBar");
+    m_tracksToolBar->setFloatable(false);
+    ClearTracksToolBar();
+
+    m_bRecord = false;
+    m_bPause = false;
+    m_bPlay = false;
+}
+
+void CTrackViewDialog::InitMenu()
+{
+    QMenuBar* mb = this->menuBar();
+
+    QMenu* m = mb->addMenu("&Sequence");
+    QAction* a = m->addAction("New Sequence...");
+    a->setData(ID_TV_SEQUENCE_NEW);
+    m_actions[ID_TV_SEQUENCE_NEW] = a;
+    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnAddSequence);
+
+    m = mb->addMenu("&View");
+    m->addAction(m_actions[ID_TV_MODE_DOPESHEET]);
+    m->addAction(m_actions[ID_TV_MODE_CURVEEDITOR]);
+    m->addAction(m_actions[ID_TV_MODE_OPENCURVEEDITOR]);
+    m->addSeparator();
+    a = m->addAction("Tick in Seconds");
+    a->setData(ID_VIEW_TICKINSECONDS);
+    a->setCheckable(true);
+    m_actions[ID_VIEW_TICKINSECONDS] = a;
+    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnViewTickInSeconds);
+    a = m->addAction("Tick in Frames");
+    a->setData(ID_VIEW_TICKINFRAMES);
+    a->setCheckable(true);
+    m_actions[ID_VIEW_TICKINFRAMES] = a;
+    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnViewTickInFrames);
+
+    m = mb->addMenu("T&ools");
+    a = m->addAction("Render Output...");
+    a->setData(ID_TOOLS_BATCH_RENDER);
+    m_actions[ID_TOOLS_BATCH_RENDER] = a;
+    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnBatchRender);
+    a = m->addAction("Customize &Track Colors...");
+    a->setData(ID_TV_TOOLS_CUSTOMIZETRACKCOLORS);
+    m_actions[ID_TV_TOOLS_CUSTOMIZETRACKCOLORS] = a;
+    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnCustomizeTrackColors);
+}
+
+void CTrackViewDialog::UpdateActions()
+{
+    if (m_bIgnoreUpdates || m_actions.empty())
+    {
+        return;
+    }
+
+    if (GetIEditor()->GetAnimation()->IsRecordMode())
+    {
+        m_actions[ID_TV_RECORD]->setChecked(true);
+    }
+    else
+    {
+        m_actions[ID_TV_RECORD]->setChecked(false);
+    }
+    if (GetIEditor()->GetAnimation()->IsAutoRecording())
+    {
+        m_actions[ID_TV_RECORD_AUTO]->setChecked(true);
+    }
+    else
+    {
+        m_actions[ID_TV_RECORD_AUTO]->setChecked(false);
+    }
+    if (GetIEditor()->GetAnimation()->IsPlayMode())
+    {
+        m_actions[ID_TV_PLAY]->setChecked(true);
+    }
+    else
+    {
+        m_actions[ID_TV_PLAY]->setChecked(false);
+    }
+    if (GetIEditor()->GetAnimation()->IsPaused())
+    {
+        m_actions[ID_TV_PAUSE]->setChecked(true);
+    }
+    else
+    {
+        m_actions[ID_TV_PAUSE]->setChecked(false);
+    }
+    if (GetIEditor()->GetAnimation()->IsLoopMode())
+    {
+        m_actions[ID_PLAY_LOOP]->setChecked(true);
+    }
+    else
+    {
+        m_actions[ID_PLAY_LOOP]->setChecked(false);
+    }
+    if (m_wndDopeSheet->GetTickDisplayMode() == eTVTickMode_InSeconds)
+    {
+        m_actions[ID_VIEW_TICKINSECONDS]->setChecked(true);
+    }
+    else
+    {
+        m_actions[ID_VIEW_TICKINSECONDS]->setChecked(false);
+    }
+    if (m_wndDopeSheet->GetTickDisplayMode() == eTVTickMode_InFrames)
+    {
+        m_actions[ID_VIEW_TICKINFRAMES]->setChecked(true);
+    }
+    else
+    {
+        m_actions[ID_VIEW_TICKINFRAMES]->setChecked(false);
+    }
+
+    m_actions[ID_TV_DEL_SEQUENCE]->setEnabled(m_bEditLock ? false : true);
+
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        if (m_bEditLock)
+        {
+            m_actions[ID_TV_EDIT_SEQUENCE]->setEnabled(false);
+        }
+        else
+        {
+            m_actions[ID_TV_EDIT_SEQUENCE]->setEnabled(true);
+        }
+
+        CTrackViewAnimNodeBundle selectedNodes = sequence->GetSelectedAnimNodes();
+        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
+
+        const unsigned int selectedNodeCount = selectedNodes.GetCount();
+        const unsigned int selectedTrackCount = selectedTracks.GetCount();
+
+        bool updated_ID_TRACKVIEW_TOGGLE_DISABLE = false;
+        bool updated_ID_TRACKVIEW_TOGGLE_MUTE = false;
+        if (selectedNodeCount + selectedTrackCount == 1)
+        {
+            if (selectedNodeCount == 1)
+            {
+                const CTrackViewAnimNode* animNode = selectedNodes.GetNode(0);
+                // The root sequence node doesn't have an internal anim node and cannot be disabled.
+                m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setEnabled(animNode->GetNodeType() != eTVNT_Sequence);
+                m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setChecked(animNode->IsDisabled() ? true : false);
+                updated_ID_TRACKVIEW_TOGGLE_DISABLE = true;
+            }
+
+            if (selectedTrackCount == 1)
+            {
+                CTrackViewTrack* pTrack = selectedTracks.GetTrack(0);
+
+                m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setEnabled(true);
+                m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setChecked(pTrack->IsDisabled() ? true : false);
+                updated_ID_TRACKVIEW_TOGGLE_DISABLE = true;
+                m_actions[ID_TRACKVIEW_TOGGLE_MUTE]->setEnabled(true);
+                m_actions[ID_TRACKVIEW_TOGGLE_MUTE]->setChecked(pTrack->IsMuted() ? true : false);
+                updated_ID_TRACKVIEW_TOGGLE_MUTE = true;
+            }
+        }
+
+        bool allSelectedTracksUseMute = true;
+        for (int i = 0; i < selectedTrackCount; i++)
+        {
+            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
+            if (pTrack && !pTrack->UsesMute())
+            {
+                allSelectedTracksUseMute = false;
+                break;
+            }
+        }
+
+        if (!updated_ID_TRACKVIEW_TOGGLE_DISABLE)
+        {
+            m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setEnabled(false);
+        }
+        // disable toggle mute if don't have a single track selected or the all selected tracks does not use Mute
+        if (!updated_ID_TRACKVIEW_TOGGLE_MUTE || !allSelectedTracksUseMute)
+        {
+            m_actions[ID_TRACKVIEW_TOGGLE_MUTE]->setEnabled(false);
+        }
+
+        m_actions[ID_TRACKVIEW_MUTE_ALL]->setEnabled(true);
+        m_actions[ID_ADDSCENETRACK]->setEnabled(true);
+
+        bool areAnyEntitiesSelected = false;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
+
+        m_actions[ID_ADDNODE]->setEnabled(areAnyEntitiesSelected);
+    }
+    else
+    {
+        m_actions[ID_TV_DEL_SEQUENCE]->setEnabled(false);
+        m_actions[ID_TV_EDIT_SEQUENCE]->setEnabled(false);
+        m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setEnabled(false);
+        m_actions[ID_TRACKVIEW_TOGGLE_MUTE]->setEnabled(false);
+        m_actions[ID_TRACKVIEW_MUTE_ALL]->setEnabled(false);
+        m_actions[ID_ADDSCENETRACK]->setEnabled(false);
+        m_actions[ID_ADDNODE]->setEnabled(false);
+    }
+
+
+    m_actions[ID_TOOLS_BATCH_RENDER]->setEnabled(GetIEditor()->GetMovieSystem()->GetNumSequences() > 0 && !m_enteringGameOrSimModeLock);
+    m_actions[ID_TV_ADD_SEQUENCE]->setEnabled(GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady() && !m_enteringGameOrSimModeLock);
+    m_actions[ID_TV_SEQUENCE_NEW]->setEnabled(GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady() && !m_enteringGameOrSimModeLock);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::InitSequences()
+{
+    ReloadSequences();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::InvalidateSequence()
+{
+    m_bNeedReloadSequence = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::InvalidateDopeSheet()
+{
+    if (m_wndDopeSheet)
+    {
+        m_wndDopeSheet->update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::Update()
+{
+    if (m_bNeedReloadSequence || m_needReAddListeners)
+    {
+        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* sequence = pSequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
+
+        if (m_bNeedReloadSequence)
+        {
+            m_bNeedReloadSequence = false;
+            CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+            pAnimationContext->SetSequence(sequence, true, false);
+        }
+        if (m_needReAddListeners)
+        {
+            m_needReAddListeners = false;
+            AddSequenceListeners(sequence);
+        }
+    }
+
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    float fTime = pAnimationContext->GetTime();
+
+    if (fTime != m_fLastTime)
+    {
+        m_fLastTime = fTime;
+        SetCursorPosText(fTime);
+    }
+
+    // Display the name of the active camera in the static control, if any.
+    // The active camera node means two conditions:
+    // 1. Sequence camera is currently active.
+    // 2. The camera which owns this node has been set as the current camera by the director node.
+    bool bSequenceCamInUse = gEnv->pMovieSystem->GetCallback() == NULL ||
+        gEnv->pMovieSystem->GetCallback()->IsSequenceCamUsed();
+    AZ::EntityId camId = gEnv->pMovieSystem->GetCameraParams().cameraEntityId;
+    if (camId.IsValid() && bSequenceCamInUse)
+    {
+        AZ::Entity* entity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, camId);
+        if (entity)
+        {
+            m_activeCamStatic->setText(entity->GetName().c_str());
+        }
+        else
+        {
+            m_activeCamStatic->setText("Active Camera");
+        }
+    }
+    else
+    {
+        m_activeCamStatic->setText("Active Camera");
+    }
+
+    if (m_wndNodesCtrl)
+    {
+        m_wndNodesCtrl->Update();
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnGoToPrevKey()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
+
+    if (sequence)
+    {
+        float time = pAnimationContext->GetTime();
+
+        CTrackViewNode* pNode = sequence->GetFirstSelectedNode();
+        pNode = pNode ? pNode : sequence;
+
+        if (pNode->SnapTimeToPrevKey(time))
+        {
+            pAnimationContext->SetTime(time);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnGoToNextKey()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
+
+    if (sequence)
+    {
+        float time = pAnimationContext->GetTime();
+
+        CTrackViewNode* pNode = sequence->GetFirstSelectedNode();
+        pNode = pNode ? pNode : sequence;
+
+        if (pNode->SnapTimeToNextKey(time))
+        {
+            pAnimationContext->SetTime(time);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnAddKey()
+{
+    m_wndDopeSheet->SetMouseActionMode(eTVActionMode_AddKeys);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnDelKey()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
+
+    if (sequence)
+    {
+        CUndo undo("Delete Keys");
+        sequence->DeleteSelectedKeys();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnMoveKey()
+{
+    m_wndDopeSheet->SetMouseActionMode(eTVActionMode_MoveKey);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSlideKey()
+{
+    m_wndDopeSheet->SetMouseActionMode(eTVActionMode_SlideKey);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnScaleKey()
+{
+    m_wndDopeSheet->SetMouseActionMode(eTVActionMode_ScaleKey);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSyncSelectedTracksToBase()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        sequence->SyncSelectedTracksToBase();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSyncSelectedTracksFromBase()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        sequence->SyncSelectedTracksFromBase();
+    }
+}
+
+void CTrackViewDialog::OnExportFBXSequence()
+{
+    SaveCurrentSequenceToFBX();
+}
+
+void CTrackViewDialog::OnExportNodeKeysGlobalTime()
+{
+    CExportManager* pExportManager = static_cast<CExportManager*>(GetIEditor()->GetExportManager());
+
+    if (pExportManager)
+    {
+        pExportManager->SaveNodeKeysTimeToXML();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnAddSequence()
+{
+    CTVNewSequenceDialog dlg(this);
+
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        QString sequenceName = dlg.GetSequenceName();
+
+        if (sequenceName != s_kNoSequenceComboBoxEntry)
+        {
+            SequenceType sequenceType = dlg.GetSequenceType();
+
+            CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+            AZ_Assert(sequenceManager, "Expected valid sequenceManager.");
+
+            CTrackViewSequence* pSequence = sequenceManager->GetSequenceByName(sequenceName);
+            if (pSequence)
+            {
+                throw std::runtime_error("A sequence with this name already exists");
+            }
+
+            AzToolsFramework::ScopedUndoBatch undoBatch("Create TrackView Director Node");
+            sequenceManager->CreateSequence(sequenceName, sequenceType);
+            CTrackViewSequence* newSequence = sequenceManager->GetSequenceByName(sequenceName);
+            AZ_Assert(newSequence, "Creating new sequence failed.");
+            undoBatch.MarkEntityDirty(newSequence->GetSequenceComponentEntityId());
+
+            // make it the currently selected sequence
+            CAnimationContext* animationContext = GetIEditor()->GetAnimation();
+            animationContext->SetSequence(newSequence, true, false);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::ReloadSequences()
+{
+    if (!GetIEditor()->GetMovieSystem() || m_bIgnoreUpdates || m_bDoingUndoOperation)
+    {
+        return;
+    }
+
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
+    CTrackViewSequenceNoNotificationContext context(sequence);
+
+    if (sequence)
+    {
+        sequence->UnBindFromEditorObjects();
+    }
+
+    ClearTracksToolBar();
+
+    if (pAnimationContext->IsPlaying())
+    {
+        pAnimationContext->SetPlaying(false);
+    }
+
+    ReloadSequencesComboBox();
+
+    if (m_currentSequenceEntityId.IsValid())
+    {
+        CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        sequence = pSequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
+
+        const float prevTime = pAnimationContext->GetTime();
+        pAnimationContext->SetSequence(sequence, true, true);
+        pAnimationContext->SetTime(prevTime);
+    }
+    else
+    {
+        pAnimationContext->SetSequence(nullptr, true, false);
+        m_sequencesComboBox->setCurrentIndex(0);
+    }
+
+    if (sequence)
+    {
+        sequence->BindToEditorObjects();
+    }
+
+    pAnimationContext->ForceAnimation();
+
+    UpdateSequenceLockStatus();
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::ReloadSequencesComboBox()
+{
+    m_sequencesComboBox->blockSignals(true);
+    m_sequencesComboBox->clear();
+    m_sequencesComboBox->addItem(QString(s_kNoSequenceComboBoxEntry));
+
+    {
+        CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        const unsigned int numSequences = pSequenceManager->GetCount();
+
+        for (int k = 0; k < numSequences; ++k)
+        {
+            CTrackViewSequence* sequence = pSequenceManager->GetSequenceByIndex(k);
+            QString entityIdString = GetEntityIdAsString(sequence->GetSequenceComponentEntityId());
+            m_sequencesComboBox->addItem(sequence->GetName(), entityIdString);
+        }
+    }
+
+    if (!m_currentSequenceEntityId.IsValid())
+    {
+        m_sequencesComboBox->setCurrentIndex(0);
+    }
+    else
+    {
+        QString entityIdString = GetEntityIdAsString(m_currentSequenceEntityId);
+        m_sequencesComboBox->setCurrentIndex(m_sequencesComboBox->findData(entityIdString));
+    }
+    m_sequencesComboBox->blockSignals(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::UpdateSequenceLockStatus()
+{
+    if (m_bIgnoreUpdates)
+    {
+        return;
+    }
+
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!sequence)
+    {
+        SetEditLock(true);
+    }
+    else
+    {
+        SetEditLock(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::SetEditLock(bool bLock)
+{
+    m_bEditLock = bLock;
+
+    m_wndDopeSheet->SetEditLock(bLock);
+    m_wndNodesCtrl->SetEditLock(bLock);
+    m_wndNodesCtrl->update();
+
+    m_wndCurveEditor->SetEditLock(bLock);
+    m_wndCurveEditor->update();
+}
+
+void CTrackViewDialog::OnGameOrSimModeLock(bool lock)
+{
+    if (lock)
+    {
+        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
+
+        // Remove sequence listeners when switching modes to ensure they get removed
+        // They will fail to be removed if dialog is closed in sim mode
+        RemoveSequenceListeners(sequence);
+    }
+    else
+    {
+        // Mark to re-add listeners next frame after the mode switch
+        m_needReAddListeners = true;
+    }
+
+    SetEditLock(lock);
+    m_enteringGameOrSimModeLock = lock;
+    m_sequencesComboBox->setDisabled(lock);
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnDelSequence()
+{
+    if (m_sequencesComboBox->currentIndex() == 0)
+    {
+        return;
+    }
+
+    if (QMessageBox::question(this, LyViewPane::TrackView, "Delete current sequence?") == QMessageBox::Yes)
+    {
+        int sel = m_sequencesComboBox->currentIndex();
+        if (sel != -1)
+        {
+            QString entityIdString = m_sequencesComboBox->currentData().toString();
+            m_sequencesComboBox->removeItem(sel);
+            m_sequencesComboBox->setCurrentIndex(0);
+
+            OnSequenceComboBox();
+
+            if (!entityIdString.isEmpty())
+            {
+                AZ::EntityId entityId = AZ::EntityId(entityIdString.toULongLong());
+                if (entityId.IsValid())
+                {
+                    CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+                    CTrackViewSequence* pSequence = GetSequenceByEntityIdOrName(pSequenceManager, entityIdString.toUtf8().constData());
+                    if (pSequence)
+                    {
+                        pSequenceManager->DeleteSequence(pSequence);
+                    }
+                }
+            }
+
+            UpdateActions();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnEditSequence()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (sequence)
+    {
+        float fps = m_wndCurveEditor->GetFPS();
+        CTVSequenceProps dlg(sequence, fps, this);
+        if (dlg.exec() == QDialog::Accepted)
+        {
+            // Sequence updated.
+            ReloadSequences();
+        }
+        m_wndDopeSheet->update();
+        UpdateActions();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSequenceComboBox()
+{
+    int sel = m_sequencesComboBox->currentIndex();
+    if (sel == -1)
+    {
+        GetIEditor()->GetAnimation()->SetSequence(nullptr, false, false);
+        return;
+    }
+
+    // Display current sequence.
+    QString entityIdString = m_sequencesComboBox->currentData().toString();
+    const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+    CTrackViewSequence* sequence = GetSequenceByEntityIdOrName(sequenceManager, entityIdString.toUtf8().constData());
+    CAnimationContext* animationContext = GetIEditor()->GetAnimation();
+    if (sequence && animationContext)
+    {
+        const bool force = false;
+        const bool noNotify = false;
+        const bool user = true;
+        animationContext->SetSequence(sequence, force, noNotify, user);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSequenceChanged(CTrackViewSequence* sequence)
+{
+    if (m_bIgnoreUpdates)
+    {
+        return;
+    }
+
+    // Remove listeners from previous sequence
+    CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+    CTrackViewSequence* prevSequence = sequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
+    RemoveSequenceListeners(prevSequence);
+
+    if (sequence)
+    {
+        m_currentSequenceEntityId = sequence->GetSequenceComponentEntityId();
+
+        sequence->Reset(true);
+
+        UpdateDopeSheetTime(sequence);
+
+        m_sequencesComboBox->blockSignals(true);
+        QString entityIdString = GetEntityIdAsString(m_currentSequenceEntityId);
+        int sequenceIndex = m_sequencesComboBox->findData(entityIdString);
+        m_sequencesComboBox->setCurrentIndex(sequenceIndex);
+        m_sequencesComboBox->blockSignals(false);
+
+        sequence->ClearSelection();
+
+        AddSequenceListeners(sequence);
+    }
+    else
+    {
+        m_currentSequenceEntityId.SetInvalid();
+        m_sequencesComboBox->setCurrentIndex(0);
+        m_wndCurveEditor->GetSplineCtrl().SetEditLock(true);
+    }
+
+    m_wndNodesCtrl->OnSequenceChanged();
+    m_wndKeyProperties->OnSequenceChanged(sequence);
+
+    ClearTracksToolBar();
+
+    GetIEditor()->GetAnimation()->ForceAnimation();
+
+    m_wndNodesCtrl->update();
+    m_wndDopeSheet->update();
+
+    UpdateSequenceLockStatus();
+    UpdateTracksToolBar();
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnRecord()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    pAnimationContext->SetRecording(!pAnimationContext->IsRecording());
+    m_wndDopeSheet->update();
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnAutoRecord()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    pAnimationContext->SetAutoRecording(!pAnimationContext->IsRecording(), m_fAutoRecordStep);
+    m_wndDopeSheet->update();
+    UpdateActions();
+}
+
+void CTrackViewDialog::OnAutoRecordStep()
+{
+    QAction* action = static_cast<QAction*>(sender());
+    int factor = action->data().toInt();
+    m_fAutoRecordStep = 1.f / factor;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnGoToStart()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    const float startTime = pAnimationContext->GetMarkers().start;
+
+    pAnimationContext->SetTime(startTime);
+    pAnimationContext->SetPlaying(false);
+    pAnimationContext->SetRecording(false);
+
+    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
+    if (sequence)
+    {
+        // Reset sequence to the beginning.
+        sequence->Reset(true);
+    }
+
+    // notify explicit time changed and return to playback controls *after* the sequence is reset.
+    pAnimationContext->TimeChanged(startTime);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnGoToEnd()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    pAnimationContext->SetTime(pAnimationContext->GetMarkers().end);
+    pAnimationContext->SetPlaying(false);
+    pAnimationContext->SetRecording(false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnPlay()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    bool wasRecordMode = pAnimationContext->IsRecordMode();
+    if (!pAnimationContext->IsPlaying())
+    {
+        CTrackViewSequence* sequence = pAnimationContext->GetSequence();
+        if (sequence)
+        {
+            if (!pAnimationContext->IsAutoRecording())
+            {
+                if (wasRecordMode)
+                {
+                    pAnimationContext->SetRecording(false);
+                }
+            }
+            pAnimationContext->SetPlaying(true);
+        }
+    }
+    else
+    {
+        pAnimationContext->SetPlaying(false);
+    }
+    UpdateActions();
+}
+
+void CTrackViewDialog::OnPlaySetScale()
+{
+    QAction* action = static_cast<QAction*>(sender());
+    float v = action->data().toFloat();
+    if (v > 0.f)
+    {
+        GetIEditor()->GetAnimation()->SetTimeScale(1.f / v);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnStop()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+
+    if (pAnimationContext->IsPlaying())
+    {
+        pAnimationContext->SetPlaying(false);
+    }
+    else
+    {
+        OnGoToStart();
+    }
+    pAnimationContext->SetRecording(false);
+    UpdateActions();
+}
+
+void CTrackViewDialog::OnStopHardReset()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    pAnimationContext->SetTime(pAnimationContext->GetMarkers().start);
+    pAnimationContext->SetPlaying(false);
+    pAnimationContext->SetRecording(false);
+
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        sequence->ResetHard();
+    }
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnPause()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    if (pAnimationContext->IsPaused())
+    {
+        pAnimationContext->Resume();
+    }
+    else
+    {
+        pAnimationContext->Pause();
+    }
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnLoop()
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    pAnimationContext->SetLoopMode(!pAnimationContext->IsLoopMode());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnBeginNewScene:
+    case eNotify_OnBeginLoad:
+    case eNotify_OnBeginSceneSave:
+        m_bIgnoreUpdates = true;
+        break;
+    case eNotify_OnBeginGameMode:
+        OnGameOrSimModeLock(true);
+        m_bIgnoreUpdates = true;
+        break;
+    case eNotify_OnEndNewScene:
+    case eNotify_OnEndLoad:
+        m_bIgnoreUpdates = false;
+        ReloadSequences();
+        break;
+    case eNotify_OnEndSceneSave:
+        m_bIgnoreUpdates = false;
+        break;
+    case eNotify_OnEndGameMode:
+        m_bIgnoreUpdates = false;
+        OnGameOrSimModeLock(false);
+        break;
+    case eNotify_OnReloadTrackView:
+        if (!m_bIgnoreUpdates)
+        {
+            ReloadSequences();
+        }
+        break;
+    case eNotify_OnIdleUpdate:
+        if (!m_bIgnoreUpdates)
+        {
+            Update();
+        }
+        break;
+    case eNotify_OnBeginSimulationMode:
+        OnGameOrSimModeLock(true);
+        break;
+    case eNotify_OnEndSimulationMode:
+        OnGameOrSimModeLock(false);
+        break;
+    case eNotify_OnSelectionChange:
+        UpdateActions();
+        break;
+    case eNotify_OnQuit:
+        SaveLayouts();
+        SaveMiscSettings();
+        SaveTrackColors();
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnAddSelectedNode()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (sequence)
+    {
+        // Try to paste to a selected group node, otherwise to sequence
+        CTrackViewAnimNodeBundle selectedNodes = sequence->GetSelectedAnimNodes();
+        CTrackViewAnimNode* animNode = (selectedNodes.GetCount() == 1) ? selectedNodes.GetNode(0) : sequence;
+        animNode = (animNode->IsGroupNode() && animNode->GetType() != AnimNodeType::AzEntity) ? animNode : sequence;
+
+        AzToolsFramework::ScopedUndoBatch undoBatch("Add Entities to Track View");
+        CTrackViewAnimNodeBundle addedNodes = animNode->AddSelectedEntities(m_defaultTracksForEntityNode);
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+        if (addedNodes.GetCount() > 0)
+        {
+            // mark layer containing sequence as dirty
+            sequence->MarkAsModified();
+        }
+
+        int selectedEntitiesCount = 0;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
+
+        // check to make sure all nodes were added and notify user if they weren't
+        if (addedNodes.GetCount() != selectedEntitiesCount)
+        {
+            IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();
+
+            QMessageBox::information(this, tr("Track View Warning"), tr(movieSystem->GetUserNotificationMsgs().c_str()));
+
+            // clear the notification log now that we've consumed and presented them.
+            movieSystem->ClearUserNotificationMsgs();
+        }
+
+        UpdateActions();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnAddDirectorNode()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (sequence)
+    {
+        QString name = sequence->GetAvailableNodeNameStartingWith("Director");
+        AzToolsFramework::ScopedUndoBatch undoBatch("Create Track View Director Node");
+        sequence->CreateSubNode(name, AnimNodeType::Director);
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+        UpdateActions();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnFindNode()
+{
+    if (!m_findDlg)
+    {
+        m_findDlg = new CTrackViewFindDlg("Find Node in Track View", this);
+        m_findDlg->Init(this);
+        connect(m_findDlg, SIGNAL(finished(int)), m_wndNodesCtrl->findChild<QTreeView*>(), SLOT(setFocus()), Qt::QueuedConnection);
+    }
+    m_findDlg->FillData();
+    m_findDlg->show();
+    m_findDlg->raise();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::keyPressEvent(QKeyEvent* event)
+{
+    // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
+    if (event->key() == Qt::Key_Space && event->modifiers() == Qt::NoModifier)
+    {
+        event->accept();
+        GetIEditor()->GetAnimation()->TogglePlay();
+    }
+    return QMainWindow::keyPressEvent(event);
+}
+
+bool CTrackViewDialog::event(QEvent* e)
+{
+    if (e->type() == QEvent::ShortcutOverride)
+    {
+        // since we respond to the following things, let Qt know so that shortcuts don't override us
+        bool respondsToEvent = false;
+
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
+        if (keyEvent->key() == Qt::Key_Space && keyEvent->modifiers() == Qt::NoModifier)
+        {
+            respondsToEvent = true;
+        }
+
+        if (respondsToEvent)
+        {
+            e->accept();
+            return true;
+        }
+    }
+
+    return QMainWindow::event(e);
+}
+
+#if defined(AZ_PLATFORM_WINDOWS)
+bool CTrackViewDialog::nativeEvent(const QByteArray &eventType, void *message, [[maybe_unused]] long *result)
+{
+    /* On Windows, eventType is set to "windows_generic_MSG" for messages sent to toplevel windows, and "windows_dispatcher_MSG" for
+    system - wide messages such as messages from a registered hot key.In both cases, the message can be casted to a MSG pointer.
+    The result pointer is only used on Windows, and corresponds to the LRESULT pointer.*/
+
+    if (eventType == "windows_generic_MSG") {
+        MSG* pMsg = static_cast<MSG*>(message);
+        return processRawInput(pMsg);
+    }
+
+    return false;
+}
+
+bool CTrackViewDialog::processRawInput(MSG* pMsg)
+{
+    if (pMsg->message == WM_INPUT)
+    {
+        static C3DConnexionDriver* p3DConnexionDriver = 0;
+
+        if (!p3DConnexionDriver)
+        {
+            p3DConnexionDriver = (C3DConnexionDriver*)GetIEditor()->GetPluginManager()->GetPluginByGUID("{AD109901-9128-4ffd-8E67-137CB2B1C41B}");
+        }
+        if (p3DConnexionDriver)
+        {
+            S3DConnexionMessage msg;
+            if (p3DConnexionDriver->GetInputMessageData(pMsg->lParam, msg))
+            {
+                if (msg.bGotRotation)
+                {
+                    float fTime = GetIEditor()->GetAnimation()->GetTime();
+                    float fDelta2 = msg.vRotate[2] * 0.1f;
+                    fTime += fDelta2;
+
+                    GetIEditor()->GetAnimation()->SetTime(fTime);
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnModeDopeSheet()
+{
+    auto sizes = m_wndSplitter->sizes();
+    m_wndCurveEditorDock->setVisible(false);
+    m_wndCurveEditorDock->toggleViewAction()->setEnabled(false);
+    if (m_wndCurveEditorDock->widget() != m_wndCurveEditor)
+    {
+        m_wndCurveEditorDock->setWidget(m_wndCurveEditor);
+    }
+    m_wndDopeSheet->show();
+    m_wndSplitter->setSizes(sizes);
+    m_actions[ID_TV_MODE_DOPESHEET]->setChecked(true);
+    m_actions[ID_TV_MODE_CURVEEDITOR]->setChecked(false);
+    m_wndCurveEditor->OnSequenceChanged(GetIEditor()->GetAnimation()->GetSequence());
+    m_lastMode = ViewMode::TrackView;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnModeCurveEditor()
+{
+    auto sizes = m_wndSplitter->sizes();
+    m_wndCurveEditorDock->setVisible(false);
+    m_wndCurveEditorDock->toggleViewAction()->setEnabled(false);
+    if (m_wndCurveEditorDock->widget() == m_wndCurveEditor)
+    {
+        m_wndSplitter->insertWidget(1, m_wndCurveEditor);
+    }
+    m_wndDopeSheet->hide();
+    m_wndSplitter->setSizes(sizes);
+    m_actions[ID_TV_MODE_DOPESHEET]->setChecked(false);
+    m_actions[ID_TV_MODE_CURVEEDITOR]->setChecked(true);
+    m_wndCurveEditor->OnSequenceChanged(GetIEditor()->GetAnimation()->GetSequence());
+    m_lastMode = ViewMode::CurveEditor;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnOpenCurveEditor()
+{
+    OnModeDopeSheet();
+    m_wndCurveEditorDock->show();
+    m_wndCurveEditorDock->toggleViewAction()->setEnabled(true);
+    m_actions[ID_TV_MODE_DOPESHEET]->setChecked(true);
+    m_actions[ID_TV_MODE_CURVEEDITOR]->setChecked(true);
+    m_wndCurveEditor->OnSequenceChanged(GetIEditor()->GetAnimation()->GetSequence());
+    m_lastMode = ViewMode::Both;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSnapNone()
+{
+    m_wndDopeSheet->SetSnappingMode(eSnappingMode_SnapNone);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSnapMagnet()
+{
+    m_wndDopeSheet->SetSnappingMode(eSnappingMode_SnapMagnet);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSnapFrame()
+{
+    m_wndDopeSheet->SetSnappingMode(eSnappingMode_SnapFrame);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSnapTick()
+{
+    m_wndDopeSheet->SetSnappingMode(eSnappingMode_SnapTick);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSnapFPS()
+{
+    int fps = FloatToIntRet(m_wndCurveEditor->GetFPS());
+    bool ok = false;
+    fps = QInputDialog::getInt(this, tr("Frame rate for frame snapping"), QStringLiteral(""), fps, s_kMinimumFrameSnappingFPS, s_kMaximumFrameSnappingFPS, 1, &ok);
+    if (ok)
+    {
+        m_wndDopeSheet->SetSnapFPS(fps);
+        m_wndCurveEditor->SetFPS(fps);
+
+        SetCursorPosText(GetIEditor()->GetAnimation()->GetTime());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnViewTickInSeconds()
+{
+    m_wndDopeSheet->SetTickDisplayMode(eTVTickMode_InSeconds);
+    m_wndCurveEditor->SetTickDisplayMode(eTVTickMode_InSeconds);
+    SetCursorPosText(GetIEditor()->GetAnimation()->GetTime());
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnViewTickInFrames()
+{
+    m_wndDopeSheet->SetTickDisplayMode(eTVTickMode_InFrames);
+    m_wndCurveEditor->SetTickDisplayMode(eTVTickMode_InFrames);
+    SetCursorPosText(GetIEditor()->GetAnimation()->GetTime());
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::SaveMiscSettings() const
+{
+    QSettings settings;
+    settings.beginGroup(s_kTrackViewSettingsSection);
+    settings.setValue(s_kSnappingModeEntry, static_cast<int>(m_wndDopeSheet->GetSnappingMode()));
+    float fps = m_wndCurveEditor->GetFPS();
+    settings.setValue(s_kFrameSnappingFPSEntry, fps);
+    settings.setValue(s_kTickDisplayModeEntry, static_cast<int>(m_wndDopeSheet->GetTickDisplayMode()));
+    settings.setValue(s_kDefaultTracksEntry, QByteArray(reinterpret_cast<const char*>(m_defaultTracksForEntityNode.data()),
+        m_defaultTracksForEntityNode.size() * sizeof(AnimParamType)));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::ReadMiscSettings()
+{
+    QSettings settings;
+    settings.beginGroup(s_kTrackViewSettingsSection);
+    ESnappingMode snapMode = (ESnappingMode)(settings.value(s_kSnappingModeEntry, eSnappingMode_SnapNone).toInt());
+    m_wndDopeSheet->SetSnappingMode(snapMode);
+    if (snapMode == eSnappingMode_SnapNone)
+    {
+        m_actions[ID_TV_SNAP_NONE]->setChecked(true);
+    }
+    else if (snapMode == eSnappingMode_SnapMagnet)
+    {
+        m_actions[ID_TV_SNAP_MAGNET]->setChecked(true);
+    }
+    else if (snapMode == eSnappingMode_SnapTick)
+    {
+        m_actions[ID_TV_SNAP_TICK]->setChecked(true);
+    }
+    else if (snapMode == eSnappingMode_SnapFrame)
+    {
+        m_actions[ID_TV_SNAP_FRAME]->setChecked(true);
+    }
+
+    if (settings.contains(s_kFrameSnappingFPSEntry))
+    {
+        float fps = settings.value(s_kFrameSnappingFPSEntry).toDouble();
+        if (fps >= s_kMinimumFrameSnappingFPS && fps <= s_kMaximumFrameSnappingFPS)
+        {
+            m_wndDopeSheet->SetSnapFPS(FloatToIntRet(fps));
+            m_wndCurveEditor->SetFPS(fps);
+        }
+    }
+
+    ETVTickMode tickMode = (ETVTickMode)(settings.value(s_kTickDisplayModeEntry, eTVTickMode_InSeconds).toInt());
+    m_wndDopeSheet->SetTickDisplayMode(tickMode);
+    m_wndCurveEditor->SetTickDisplayMode(tickMode);
+
+    if (settings.contains(s_kDefaultTracksEntry))
+    {
+        const QByteArray ba = settings.value(s_kDefaultTracksEntry).toByteArray();
+        m_defaultTracksForEntityNode.clear();
+        for (int x = 0; x < ba.size() / sizeof(AnimParamType); x++)
+        {
+            AnimParamType track = ((AnimParamType*)(ba.data()))[x];
+            m_defaultTracksForEntityNode.push_back(track);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::SaveLayouts()
+{
+    QSettings settings("O3DE", "O3DE");
+    settings.beginGroup("TrackView");
+    QByteArray stateData = this->saveState();
+    settings.setValue("layout", stateData);
+    settings.setValue("lastViewMode", (int)m_lastMode);
+    QStringList sl;
+    foreach(int i, m_wndSplitter->sizes())
+    sl << QString::number(i);
+    settings.setValue("splitter", sl.join(","));
+    settings.endGroup();
+    settings.sync();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::ReadLayouts()
+{
+    QSettings settings("O3DE", "O3DE");
+    settings.beginGroup("TrackView");
+
+    setViewMode(static_cast<ViewMode>(settings.value("lastViewMode").toInt()));
+
+    if (settings.contains("layout"))
+    {
+        QByteArray layoutData = settings.value("layout").toByteArray();
+        if (!layoutData.isEmpty())
+        {
+            restoreState(layoutData);
+        }
+    }
+    if (settings.contains("splitter"))
+    {
+        const QStringList sl = settings.value("splitter").toString().split(",");
+        QList<int> szl;
+        szl.reserve(sl.size());
+        for (const QString& s : sl)
+        {
+            szl << s.toInt();
+        }
+        if (!sl.isEmpty())
+        {
+            m_wndSplitter->setSizes(szl);
+        }
+    }
+}
+
+void CTrackViewDialog::setViewMode(ViewMode mode)
+{
+    switch (mode)
+    {
+    case ViewMode::TrackView:
+        OnModeDopeSheet();
+        break;
+    case ViewMode::CurveEditor:
+        OnModeCurveEditor();
+        break;
+    case ViewMode::Both:
+        OnOpenCurveEditor();
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::SaveTrackColors() const
+{
+    CTVCustomizeTrackColorsDlg::SaveColors(s_kTrackViewSettingsSection);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::ReadTrackColors()
+{
+    CTVCustomizeTrackColorsDlg::LoadColors(s_kTrackViewSettingsSection);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::SetCursorPosText(float fTime)
+{
+    QString sText;
+    int fps = FloatToIntRet(m_wndCurveEditor->GetFPS());
+    int nMins = int ( fTime / 60.0f );
+    int nSecs = int (fTime - float ( nMins ) * 60.0f);
+    int nFrames = fps > 0 ? int(fTime * m_wndCurveEditor->GetFPS()) % fps : 0;
+
+    sText = QString("%1:%2:%3 (%4fps)").arg(nMins).arg(nSecs, 2, 10, QLatin1Char('0')).arg(nFrames, 2, 10, QLatin1Char('0')).arg(fps);
+    m_cursorPos->setText(sText);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnCustomizeTrackColors()
+{
+    CTVCustomizeTrackColorsDlg dlg(this);
+    dlg.exec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnBatchRender()
+{
+    CSequenceBatchRenderDialog dlg(m_wndCurveEditor->GetFPS(), this);
+    dlg.exec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::UpdateTracksToolBar()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        ClearTracksToolBar();
+
+        CTrackViewAnimNodeBundle selectedNodes = sequence->GetSelectedAnimNodes();
+
+        if (selectedNodes.GetCount() == 1)
+        {
+            CTrackViewAnimNode* pAnimNode = selectedNodes.GetNode(0);
+            SetNodeForTracksToolBar(pAnimNode);
+
+            const AnimNodeType nodeType = pAnimNode->GetType();
+            int paramCount = 0;
+            IAnimNode::AnimParamInfos animatableProperties;
+            CTrackViewNode* parentNode = pAnimNode->GetParentNode();
+
+            // all AZ::Entity entities are animated through components. Component nodes always have a parent - the containing AZ::Entity
+            if (nodeType == AnimNodeType::Component && parentNode)
+            {
+                // component node - query all the animatable tracks via an EBus request
+
+                // all AnimNodeType::Component are parented to AnimNodeType::AzEntityNodes - get the parent to get it's AZ::EntityId to use for the EBus request
+                if (parentNode->GetNodeType() == eTVNT_AnimNode)
+                {
+                    // this cast is safe because we check that the type is eTVNT_AnimNode
+                    const AZ::EntityId azEntityId = static_cast<CTrackViewAnimNode*>(parentNode)->GetAzEntityId();
+
+                    // query the animatable component properties from the Sequence Component
+                    Maestro::EditorSequenceComponentRequestBus::Event(const_cast<CTrackViewAnimNode*>(pAnimNode)->GetSequence()->GetSequenceComponentEntityId(),
+                        &Maestro::EditorSequenceComponentRequestBus::Events::GetAllAnimatablePropertiesForComponent,
+                        animatableProperties, azEntityId, pAnimNode->GetComponentId());
+
+                    paramCount = animatableProperties.size();
+                }
+            }
+            else
+            {
+                // legacy Entity
+                paramCount = pAnimNode->GetParamCount();
+            }
+
+            for (int i = 0; i < paramCount; ++i)
+            {
+                CAnimParamType paramType;
+                QString name;
+
+                // get the animatable param name
+                if (nodeType == AnimNodeType::Component)
+                {
+                    paramType = animatableProperties[i].paramType;
+
+                    // Skip over any hidden params
+                    if (animatableProperties[i].flags & IAnimNode::ESupportedParamFlags::eSupportedParamFlags_Hidden)
+                    {
+                        continue;
+                    }
+                }
+                else
+                {
+
+                    paramType = pAnimNode->GetParamType(i);
+
+                    if (paramType.GetType() == AnimParamType::Invalid)
+                    {
+                        continue;
+                    }
+                }
+
+                CTrackViewTrack* pTrack = pAnimNode->GetTrackForParameter(paramType);
+                if (pTrack && !(pAnimNode->GetParamFlags(paramType) & IAnimNode::eSupportedParamFlags_MultipleTracks))
+                {
+                    continue;
+                }
+
+                name = pAnimNode->GetParamName(paramType);
+
+                QString sToolTipText("Add " + name + " Track");
+                QIcon hIcon = m_wndNodesCtrl->GetIconForTrack(pTrack);
+                AddButtonToTracksToolBar(paramType, hIcon, sToolTipText);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::ClearTracksToolBar()
+{
+    m_tracksToolBar->clear();
+    m_tracksToolBar->addWidget(new QLabel("Tracks:"));
+
+    m_pNodeForTracksToolBar = NULL;
+    m_toolBarParamTypes.clear();
+    m_currentToolBarParamTypeId = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::AddButtonToTracksToolBar(const CAnimParamType& paramId, const QIcon& hIcon, const QString& title)
+{
+    const int paramTypeToolBarID = ID_TV_TRACKS_TOOLBAR_BASE + m_currentToolBarParamTypeId;
+    if (paramTypeToolBarID <= ID_TV_TRACKS_TOOLBAR_LAST)
+    {
+        m_toolBarParamTypes.push_back(paramId);
+        ++m_currentToolBarParamTypeId;
+
+        QAction* a = m_tracksToolBar->addAction(hIcon, title);
+        a->setData(paramTypeToolBarID);
+        connect(a, &QAction::triggered, this, &CTrackViewDialog::OnTracksToolBar);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnTracksToolBar()
+{
+    QAction* action = static_cast<QAction*>(sender());
+    int nID = action->data().toInt();
+    const unsigned int paramTypeToolBarID = nID - ID_TV_TRACKS_TOOLBAR_BASE;
+
+    if (paramTypeToolBarID < m_toolBarParamTypes.size())
+    {
+        if (m_pNodeForTracksToolBar && m_toolBarParamTypes[paramTypeToolBarID].GetType() != AnimParamType::Invalid)
+        {
+            CTrackViewSequence* sequence = m_pNodeForTracksToolBar->GetSequence();
+            AZ_Assert(sequence, "Expected valid sequence");
+
+            if (sequence)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track via Toolbar");
+                m_pNodeForTracksToolBar->CreateTrack(m_toolBarParamTypes[paramTypeToolBarID]);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+
+            UpdateTracksToolBar();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnToggleDisable()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        CTrackViewAnimNodeBundle selectedNodes = sequence->GetSelectedAnimNodes();
+        const unsigned int numSelectedNodes = selectedNodes.GetCount();
+        for (unsigned int i = 0; i < numSelectedNodes; ++i)
+        {
+            CTrackViewAnimNode* pNode = selectedNodes.GetNode(i);
+            pNode->SetDisabled(!pNode->IsDisabled());
+        }
+
+        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
+        const unsigned int numSelectedTracks = selectedTracks.GetCount();
+        for (unsigned int i = 0; i < numSelectedTracks; ++i)
+        {
+            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
+            pTrack->SetDisabled(!pTrack->IsDisabled());
+        }
+        UpdateActions();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnToggleMute()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
+        const unsigned int numSelectedTracks = selectedTracks.GetCount();
+        for (unsigned int i = 0; i < numSelectedTracks; ++i)
+        {
+            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
+            pTrack->SetMuted(!pTrack->IsMuted());
+        }
+        UpdateActions();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnMuteAll()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
+        const unsigned int numSelectedTracks = selectedTracks.GetCount();
+        for (unsigned int i = 0; i < numSelectedTracks; ++i)
+        {
+            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
+            pTrack->SetMuted(true);
+        }
+        UpdateActions();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnUnmuteAll()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
+        const unsigned int numSelectedTracks = selectedTracks.GetCount();
+        for (unsigned int i = 0; i < numSelectedTracks; ++i)
+        {
+            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
+            pTrack->SetMuted(false);
+        }
+        UpdateActions();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnNodeSelectionChanged(CTrackViewSequence* sequence)
+{
+    CTrackViewSequence* pCurrentSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (pCurrentSequence && pCurrentSequence == sequence)
+    {
+        UpdateTracksToolBar();
+        UpdateActions();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnNodeRenamed(CTrackViewNode* pNode, [[maybe_unused]] const char* pOldName)
+{
+    // React to sequence name changes
+    if (pNode->GetNodeType() == eTVNT_Sequence)
+    {
+        ReloadSequencesComboBox();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::UpdateDopeSheetTime(CTrackViewSequence* sequence)
+{
+    Range timeRange = sequence->GetTimeRange();
+    m_wndDopeSheet->SetTimeRange(timeRange.start, timeRange.end);
+    m_wndDopeSheet->SetStartMarker(timeRange.start);
+    m_wndDopeSheet->SetEndMarker(timeRange.end);
+    m_wndDopeSheet->SetTimeScale(m_wndDopeSheet->GetTimeScale(), 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnEntityDestruction(const AZ::EntityId& entityId)
+{
+    if (m_currentSequenceEntityId == entityId)
+    {
+        // The currently selected sequence is about to be deleted, make sure to clear the selection right now.
+        // Clearing it here will make sure it is clear in slice work flow edge cases.
+        GetIEditor()->GetAnimation()->SetSequence(nullptr, false, false);
+
+        // Refresh the records in m_wndNodesCtrl, the sequence will not be selected in Track View
+        // so the current sequence will be nullptr and the records will be cleared preventing
+        // dangling pointers.
+        m_wndNodesCtrl->OnSequenceChanged();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSequenceSettingsChanged(CTrackViewSequence* sequence)
+{
+    CTrackViewSequence* pCurrentSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (pCurrentSequence && pCurrentSequence == sequence)
+    {
+        UpdateDopeSheetTime(sequence);
+        m_wndNodesCtrl->update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSequenceAdded([[maybe_unused]] CTrackViewSequence* sequence)
+{
+    ReloadSequencesComboBox();
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::OnSequenceRemoved([[maybe_unused]] CTrackViewSequence* sequence)
+{
+    ReloadSequencesComboBox();
+    UpdateActions();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::AddSequenceListeners(CTrackViewSequence* sequence)
+{
+    if (sequence)
+    {
+        sequence->AddListener(this);
+        sequence->AddListener(m_wndNodesCtrl);
+        sequence->AddListener(m_wndKeyProperties);
+        sequence->AddListener(m_wndCurveEditor);
+        sequence->AddListener(m_wndDopeSheet);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::RemoveSequenceListeners(CTrackViewSequence* sequence)
+{
+    if (sequence)
+    {
+        sequence->RemoveListener(m_wndDopeSheet);
+        sequence->RemoveListener(m_wndCurveEditor);
+        sequence->RemoveListener(m_wndKeyProperties);
+        sequence->RemoveListener(m_wndNodesCtrl);
+        sequence->RemoveListener(this);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::AddDialogListeners()
+{
+    GetIEditor()->RegisterNotifyListener(this);
+    GetIEditor()->GetAnimation()->AddListener(this);
+    GetIEditor()->GetSequenceManager()->AddListener(this);
+    GetIEditor()->GetUndoManager()->AddListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::RemoveDialogListeners()
+{
+    GetIEditor()->GetUndoManager()->RemoveListener(this);
+    GetIEditor()->GetSequenceManager()->RemoveListener(this);
+    GetIEditor()->GetAnimation()->RemoveListener(this);
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::BeginUndoTransaction()
+{
+    m_bDoingUndoOperation = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDialog::EndUndoTransaction()
+{
+    m_bDoingUndoOperation = false;
+}
+
+void CTrackViewDialog::SaveCurrentSequenceToFBX()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    QString selectedSequenceFBXStr = QString(sequence->GetName()) + ".fbx";
+    CExportManager* pExportManager = static_cast<CExportManager*>(GetIEditor()->GetExportManager());
+    const char szFilters[] = "FBX Files (*.fbx)";
+
+    CFBXExporterDialog fpsDialog;
+
+    CTrackViewTrackBundle allTracks = sequence->GetAllTracks();
+
+    for (int trackID = 0; trackID < allTracks.GetCount(); ++trackID)
+    {
+        CTrackViewTrack* pCurrentTrack = allTracks.GetTrack(trackID);
+
+        if (!pCurrentTrack->GetParentNode()->IsSelected())
+        {
+            continue;
+        }
+    }
+
+    QString filename = QFileDialog::getSaveFileName(this, tr("Export Selected Nodes To FBX File"), selectedSequenceFBXStr, szFilters);
+    if (!filename.isEmpty())
+    {
+        pExportManager->SetBakedKeysSequenceExport(true);
+        pExportManager->Export(filename.toUtf8().data(), "", "", false, false, false, true);
+    }
+}
+
+void CTrackViewDialog::AfterEntitySelectionChanged(
+    [[maybe_unused]] const AzToolsFramework::EntityIdList& newlySelectedEntities,
+    [[maybe_unused]] const AzToolsFramework::EntityIdList& newlyDeselectedEntities)
+{
+    UpdateActions();
+}
+
+#include <TrackView/moc_TrackViewDialog.cpp>
diff --git a/Code/Editor/TrackView/TrackViewDialog.h b/Code/Editor/TrackView/TrackViewDialog.h
new file mode 100644
index 0000000000..67b8418a1e
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewDialog.h
@@ -0,0 +1,276 @@
+/*
+ * 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 : CTrackViewDialog Implementation file.
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDIALOG_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "IMovieSystem.h"
+
+#include "TrackViewNodes.h"
+#include "TrackViewDopeSheetBase.h"
+#include "TrackViewCurveEditor.h"
+#include "TrackViewKeyPropertiesDlg.h"
+#include "TrackViewSequence.h"
+#include "TrackViewSequenceManager.h"
+#include "AnimationContext.h"
+
+#include <AzCore/Component/EntityBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+#include <QMainWindow>
+#endif
+
+class QSplitter;
+class QComboBox;
+class QLabel;
+
+class CMovieCallback;
+class CTrackViewFindDlg;
+
+class CTrackViewDialog
+    : public QMainWindow
+    , public IAnimationContextListener
+    , public IEditorNotifyListener
+    , public ITrackViewSequenceListener
+    , public ITrackViewSequenceManagerListener
+    , public AZ::EntitySystemBus::Handler
+    , private AzToolsFramework::ToolsApplicationNotificationBus::Handler
+    , IUndoManagerListener
+{
+    Q_OBJECT
+public:
+    friend CMovieCallback;
+
+    CTrackViewDialog(QWidget* pParent = NULL);
+    ~CTrackViewDialog();
+
+    static void RegisterViewClass();
+    static const GUID& GetClassID();
+
+    static CTrackViewDialog* GetCurrentInstance() { return s_pTrackViewDialog; }
+
+    void InvalidateDopeSheet();
+    void Update();
+
+    void ReloadSequences();
+    void InvalidateSequence();
+
+    void UpdateSequenceLockStatus();
+
+    // IAnimationContextListener
+    virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence) override;
+
+    // ITrackViewSequenceListener
+    virtual void OnSequenceSettingsChanged(CTrackViewSequence* pSequence) override;
+
+    void UpdateDopeSheetTime(CTrackViewSequence* pSequence);
+
+    const CTrackViewDopeSheetBase& GetTrackViewDopeSheet() const { return *m_wndDopeSheet; }
+    const AZStd::vector<AnimParamType>& GetDefaultTracksForEntityNode() const { return m_defaultTracksForEntityNode; }
+
+    bool IsDoingUndoOperation() const { return m_bDoingUndoOperation; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // AZ::EntitySystemBus
+    void OnEntityDestruction(const AZ::EntityId& entityId) override;
+    //~AZ::EntitySystemBus
+
+public: // static functions
+
+    static QString GetEntityIdAsString(const AZ::EntityId& entityId) { return QString::number(static_cast<AZ::u64>(entityId)); }
+
+protected slots:
+    void OnGoToPrevKey();
+    void OnGoToNextKey();
+    void OnAddKey();
+    void OnDelKey();
+    void OnMoveKey();
+    void OnSlideKey();
+    void OnScaleKey();
+    void OnSyncSelectedTracksToBase();
+    void OnSyncSelectedTracksFromBase();
+    void OnAddSequence();
+    void OnExportFBXSequence();
+    void OnExportNodeKeysGlobalTime();
+    void OnDelSequence();
+    void OnEditSequence();
+    void OnSequenceComboBox();
+    void OnAddSelectedNode();
+    void OnAddDirectorNode();
+    void OnFindNode();
+
+    void OnRecord();
+    void OnAutoRecord();
+    void OnAutoRecordStep();
+    void OnGoToStart();
+    void OnGoToEnd();
+    void OnPlay();
+    void OnPlaySetScale();
+    void OnStop();
+    void OnStopHardReset();
+    void OnPause();
+    void OnLoop();
+
+    void OnSnapNone();
+    void OnSnapMagnet();
+    void OnSnapFrame();
+    void OnSnapTick();
+    void OnSnapFPS();
+
+    void OnCustomizeTrackColors();
+
+    void OnBatchRender();
+
+    void OnModeDopeSheet();
+    void OnModeCurveEditor();
+    void OnOpenCurveEditor();
+
+    void OnViewTickInSeconds();
+    void OnViewTickInFrames();
+
+    void OnTracksToolBar();
+    void OnToggleDisable();
+    void OnToggleMute();
+    void OnMuteAll();
+    void OnUnmuteAll();
+
+protected:
+    void keyPressEvent(QKeyEvent* event) override;
+#if defined(AZ_PLATFORM_WINDOWS)
+    bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+#endif
+    bool event(QEvent* event) override;
+
+private slots:
+    void ReadLayouts();
+    void FillAddSelectedEntityMenu();
+
+private:
+
+    enum class ViewMode
+    {
+        TrackView = 1,
+        CurveEditor = 2,
+        Both = 3
+    };
+
+    void setViewMode(ViewMode);
+    void UpdateActions();
+    void ReloadSequencesComboBox();
+
+    void UpdateTracksToolBar();
+    void ClearTracksToolBar();
+    void AddButtonToTracksToolBar(const CAnimParamType& paramId, const QIcon& hIcon, const QString& title);
+    void SetNodeForTracksToolBar(CTrackViewAnimNode* pNode) { m_pNodeForTracksToolBar = pNode; }
+
+    void SetEditLock(bool bLock);
+    void OnGameOrSimModeLock(bool lock);
+
+    void InitMenu();
+    void InitToolbar();
+    void InitSequences();
+    void OnAddEntityNodeMenu();
+
+    void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+    BOOL OnInitDialog();
+
+    void SaveLayouts();
+    void SaveMiscSettings() const;
+    void ReadMiscSettings();
+    void SaveTrackColors() const;
+    void ReadTrackColors();
+
+    void SetCursorPosText(float fTime);
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    bool processRawInput(MSG* pMsg);
+#endif
+
+    virtual void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override;
+    virtual void OnNodeRenamed(CTrackViewNode* pNode, const char* pOldName) override;
+
+    void OnSequenceAdded(CTrackViewSequence* pSequence) override;
+    void OnSequenceRemoved(CTrackViewSequence* pSequence) override;
+
+    void AddSequenceListeners(CTrackViewSequence* sequence);
+    void RemoveSequenceListeners(CTrackViewSequence* sequence);
+
+    void AddDialogListeners();
+    void RemoveDialogListeners();
+
+    virtual void BeginUndoTransaction();
+    virtual void EndUndoTransaction();
+    void SaveCurrentSequenceToFBX();
+    void SaveSequenceTimingToXML();
+
+    // ToolsApplicationNotificationBus ...
+    void AfterEntitySelectionChanged(
+        const AzToolsFramework::EntityIdList& newlySelectedEntities,
+        const AzToolsFramework::EntityIdList& newlyDeselectedEntities) override;
+
+    // Instance
+    static CTrackViewDialog* s_pTrackViewDialog;
+
+    // GUI
+    QSplitter* m_wndSplitter;
+    CTrackViewNodesCtrl*    m_wndNodesCtrl;
+    CTrackViewDopeSheetBase*    m_wndDopeSheet;
+    QDockWidget* m_wndCurveEditorDock;
+    TrackViewCurveEditorDialog* m_wndCurveEditor;
+    CTrackViewKeyPropertiesDlg* m_wndKeyProperties;
+    CTrackViewFindDlg* m_findDlg;
+    QToolBar* m_mainToolBar;
+    QToolBar* m_keysToolBar;
+    QToolBar* m_playToolBar;
+    QToolBar* m_viewToolBar;
+    QToolBar* m_tracksToolBar;
+    QComboBox* m_sequencesComboBox;
+
+    QLabel* m_cursorPos;
+    QLabel* m_activeCamStatic;
+
+    // CryMovie
+    CMovieCallback* m_pMovieCallback;
+
+    // Current sequence
+    AZ::EntityId m_currentSequenceEntityId;
+
+    // State
+    bool m_bRecord;
+    bool m_bAutoRecord;
+    bool m_bPlay;
+    bool m_bPause;
+    bool m_bNeedReloadSequence;
+    bool m_bIgnoreUpdates;
+    bool m_bDoingUndoOperation;
+    bool m_lazyInitDone;
+    bool m_bEditLock;
+    bool m_enteringGameOrSimModeLock = false;
+    bool m_needReAddListeners = false;
+
+    float m_fLastTime;
+    float m_fAutoRecordStep;
+
+    CTrackViewAnimNode* m_pNodeForTracksToolBar;
+
+    int m_currentToolBarParamTypeId;
+    std::vector<CAnimParamType> m_toolBarParamTypes;
+
+    // Default tracks menu
+    AZStd::vector<AnimParamType> m_defaultTracksForEntityNode;
+
+    QHash<int, QAction*> m_actions;
+    ViewMode m_lastMode = ViewMode::TrackView;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDIALOG_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDialog.qrc b/Code/Editor/TrackView/TrackViewDialog.qrc
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewDialog.qrc
rename to Code/Editor/TrackView/TrackViewDialog.qrc
diff --git a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
new file mode 100644
index 0000000000..aacab5c382
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
@@ -0,0 +1,3659 @@
+/*
+ * 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 "TrackViewDopeSheetBase.h"
+
+// Qt
+#include <QMenu>
+#include <QPainter>
+#include <QScrollBar>
+#include <QTimer>
+#include <QToolTip>
+
+// AzFramework
+#include <AzCore/std/sort.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/ColorPicker.h>
+#include <AzQtComponents/Utilities/Conversions.h>
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimValueType.h>
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+#include <CryCommon/Maestro/Types/AssetBlendKey.h>
+
+// Editor
+#include "Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h"
+#include "Clipboard.h"
+#include "Util/fastlib.h"
+#include "TrackView/TrackViewNodes.h"
+#include "TVCustomizeTrackColorsDlg.h"
+#include "TrackView/TrackViewKeyPropertiesDlg.h"
+
+
+#define EDIT_DISABLE_GRAY_COLOR QColor(128, 128, 128)
+#define KEY_TEXT_COLOR QColor(0, 0, 50)
+#define INACTIVE_TEXT_COLOR QColor(128, 128, 128)
+
+namespace
+{
+    const int kMarginForMagnetSnapping = 10;
+    const unsigned int kDefaultTrackHeight = 16;
+}
+
+enum ETVMouseMode
+{
+    eTVMouseMode_None = 0,
+    eTVMouseMode_Select = 1,
+    eTVMouseMode_Move,
+    eTVMouseMode_Clone,
+    eTVMouseMode_DragTime,
+    eTVMouseMode_DragStartMarker,
+    eTVMouseMode_DragEndMarker,
+    eTVMouseMode_Paste,
+    eTVMouseMode_SelectWithinTime,
+    eTVMouseMode_StartTimeAdjust,
+    eTVMouseMode_EndTimeAdjust
+};
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewDopeSheetBase::CTrackViewDopeSheetBase(QWidget* parent)
+    : QWidget(parent)
+{
+    m_bkgrBrush = palette().color(QPalette::Window);
+    m_bkgrBrushEmpty = QColor(190, 190, 190);
+    m_timeBkgBrush = QColor(0xE0, 0xE0, 0xE0);
+    m_timeHighlightBrush = QColor(0xFF, 0x0, 0x0);
+    m_selectedBrush = QColor(200, 200, 230);
+    m_visibilityBrush = QColor(120, 120, 255);
+    m_selectTrackBrush = QColor(100, 190, 255);
+
+    m_timeScale = 1.0f;
+    m_ticksStep = 10;
+
+    m_bZoomDrag = false;
+    m_bMoveDrag = false;
+
+    m_leftOffset = 30;
+    m_scrollOffset = QPoint(0, 0);
+    m_mouseMode = eTVMouseMode_None;
+    m_currentTime = 0.0f;
+    m_storedTime = m_currentTime;
+    m_rcSelect = QRect(0, 0, 0, 0);
+    m_rubberBand = 0;
+    m_scrollBar = new QScrollBar(Qt::Horizontal, this);
+    connect(m_scrollBar, &QScrollBar::valueChanged, this, &CTrackViewDopeSheetBase::OnHScroll);
+    m_keyTimeOffset = 0;
+    m_currCursor = QCursor(Qt::ArrowCursor);
+    m_mouseActionMode = eTVActionMode_MoveKey;
+
+    m_scrollMin = 0;
+    m_scrollMax = 1000;
+
+    m_descriptionFont = QFont(QStringLiteral("Verdana"), 7);
+
+    m_bCursorWasInKey = false;
+    m_bJustSelected = false;
+    m_snappingMode = eSnappingMode_SnapNone;
+    m_snapFrameTime = 0.033333f;
+    m_bMouseMovedAfterRButtonDown = false;
+    m_stashedRecordModeWhileTimeDragging = false;
+
+    m_tickDisplayMode = eTVTickMode_InSeconds;
+
+    m_bEditLock = false;
+
+    m_bFastRedraw = false;
+
+    m_pLastTrackSelectedOnSpot = NULL;
+
+    m_wndPropsOnSpot = nullptr;
+
+#ifdef DEBUG
+    m_redrawCount = 0;
+#endif
+    m_bKeysMoved = false;
+    ComputeFrameSteps(GetVisibleRange());
+
+    m_crsLeftRight = Qt::SizeHorCursor;
+
+    m_crsAddKey = CMFCUtils::LoadCursor(IDC_ARROW_ADDKEY);
+    m_crsCross = CMFCUtils::LoadCursor(IDC_POINTER_OBJHIT);
+    m_crsAdjustLR = CMFCUtils::LoadCursor(IDC_LEFTRIGHT);
+
+    setMouseTracking(true);
+    setFocusPolicy(Qt::StrongFocus);
+
+    m_colorUpdateTrack = nullptr;
+    m_colorUpdateKeyTime = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewDopeSheetBase::~CTrackViewDopeSheetBase()
+{
+    HideKeyPropertyCtrlOnSpot();
+    GetIEditor()->GetAnimation()->RemoveListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewDopeSheetBase::TimeToClient(float time) const
+{
+    int x = m_leftOffset - m_scrollOffset.x() + (time * m_timeScale);
+    return x;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Range CTrackViewDopeSheetBase::GetVisibleRange() const
+{
+    Range r;
+    r.start = (m_scrollOffset.x() - m_leftOffset) / m_timeScale;
+    r.end = r.start + (m_rcClient.width()) / m_timeScale;
+
+    Range extendedTimeRange(0.0f, m_timeRange.end);
+    r = extendedTimeRange & r;
+
+    return r;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Range CTrackViewDopeSheetBase::GetTimeRange(const QRect& rc) const
+{
+    Range r;
+    r.start = (rc.left() - m_leftOffset + m_scrollOffset.x()) / m_timeScale;
+    r.end = r.start + (rc.width()) / m_timeScale;
+
+    r.start = TickSnap(r.start);
+    r.end = TickSnap(r.end);
+
+    // Intersect range with global time range.
+    r = m_timeRange & r;
+
+    return r;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetTimeRange(float start, float end)
+{
+    if (m_timeMarked.start < start)
+    {
+        m_timeMarked.start = start;
+    }
+    if (m_timeMarked.end > end)
+    {
+        m_timeMarked.end = end;
+    }
+
+    m_timeRange.Set(start, end);
+
+    SetHorizontalExtent(-m_leftOffset, m_timeRange.end * m_timeScale - m_leftOffset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetTimeScale(float timeScale, float fAnchorTime)
+{
+    const double fOldOffset = -fAnchorTime * m_timeScale;
+    const double fOldScale = m_timeScale;
+
+    timeScale = std::max(timeScale, 0.001f);
+    timeScale = std::min(timeScale, 100000.0f);
+    m_timeScale = timeScale;
+
+    int steps = 0;
+    if (GetTickDisplayMode() == eTVTickMode_InSeconds)
+    {
+        m_ticksStep = 10;
+    }
+    else if (GetTickDisplayMode() == eTVTickMode_InFrames)
+    {
+        m_ticksStep = 1 / m_snapFrameTime;
+    }
+    else
+    {
+        assert(0);
+    }
+
+    double fPixelsPerTick;
+    do
+    {
+        fPixelsPerTick = (1.0 / m_ticksStep) * (double)m_timeScale;
+
+        if (fPixelsPerTick < 6.0)
+        {
+            m_ticksStep /= 2;
+        }
+
+        if (m_ticksStep <= 0)
+        {
+            m_ticksStep = 1;
+            break;
+        }
+        steps++;
+    }
+    while (fPixelsPerTick < 6.0 && steps < 100);
+
+    steps = 0;
+
+    do
+    {
+        fPixelsPerTick = (1.0 / m_ticksStep) * (double)m_timeScale;
+        if (fPixelsPerTick >= 12.0)
+        {
+            m_ticksStep *= 2;
+        }
+        if (m_ticksStep <= 0)
+        {
+            m_ticksStep = 1;
+            break;
+        }
+        steps++;
+    }
+    while (fPixelsPerTick >= 12.0 && steps < 100);
+
+    float fCurrentOffset = -fAnchorTime * m_timeScale;
+    m_scrollOffset.rx() += fOldOffset - fCurrentOffset;
+    m_scrollBar->setValue(m_scrollOffset.x());
+
+    update();
+
+    SetHorizontalExtent(-m_leftOffset, m_timeRange.end * m_timeScale);
+
+    ComputeFrameSteps(GetVisibleRange());
+
+    OnHScroll();
+}
+
+void CTrackViewDopeSheetBase::showEvent(QShowEvent* event)
+{
+    QWidget::showEvent(event);
+    GetIEditor()->GetAnimation()->AddListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+
+    m_rcClient = rect();
+
+    m_offscreenBitmap = QPixmap(m_rcClient.width(), m_rcClient.height());
+    m_offscreenBitmap.fill(Qt::transparent);
+
+    m_rcTimeline = rect();
+    m_rcTimeline.setHeight(kDefaultTrackHeight);
+    m_rcSummary = m_rcTimeline;
+    m_rcSummary.setTop(m_rcTimeline.bottom());
+    m_rcSummary.setBottom(m_rcSummary.top() + 8);
+
+    SetHorizontalExtent(m_scrollMin, m_scrollMax);
+
+    m_scrollBar->setGeometry(0, height() - m_scrollBar->sizeHint().height(), width(), m_scrollBar->sizeHint().height());
+
+    QToolTip::hideText();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::wheelEvent(QWheelEvent* event)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSequence)
+    {
+        event->ignore();
+        return;
+    }
+
+    float z = (event->angleDelta().y() > 0) ? (m_timeScale * 1.25f) : (m_timeScale * 0.8f);
+    // Use m_mouseOverPos to get the local position in the timeline view instead of
+    // event->pos() which seems to include the variable left panel of the view that
+    // lists the tracks.
+    float fAnchorTime = TimeFromPointUnsnapped(m_mouseOverPos);
+    SetTimeScale(z, fAnchorTime);
+
+    event->accept();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnHScroll()
+{
+    // Get the current position of scroll box.
+    int curpos = m_scrollBar->value();
+    m_scrollOffset.setX(curpos);
+    update();
+}
+
+int CTrackViewDopeSheetBase::GetScrollPos() const
+{
+    return m_scrollBar->value();
+}
+
+//////////////////////////////////////////////////////////////////////////
+double CTrackViewDopeSheetBase::GetTickTime() const
+{
+    if (GetTickDisplayMode() == eTVTickMode_InFrames)
+    {
+        return m_fFrameTickStep;
+    }
+    else
+    {
+        return 1.0f / m_ticksStep;
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewDopeSheetBase::TickSnap(float time) const
+{
+    double tickTime = GetTickTime();
+    double t = floor(((double)time / tickTime) + 0.5);
+    t *= tickTime;
+    return t;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewDopeSheetBase::TimeFromPoint(const QPoint& point) const
+{
+    int x = point.x() - m_leftOffset + m_scrollOffset.x();
+    double t = (double)x / m_timeScale;
+    return (float)TickSnap(t);
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewDopeSheetBase::TimeFromPointUnsnapped(const QPoint& point) const
+{
+    int x = point.x() - m_leftOffset + m_scrollOffset.x();
+    double t = (double)x / m_timeScale;
+    return t;
+}
+
+void CTrackViewDopeSheetBase::mousePressEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonDown(event->modifiers(), event->pos());
+        break;
+    case Qt::RightButton:
+        OnRButtonDown(event->modifiers(), event->pos());
+        break;
+    case Qt::MiddleButton:
+        OnMButtonDown(event->modifiers(), event->pos());
+        break;
+    default:
+        break;
+    }
+}
+
+void CTrackViewDopeSheetBase::mouseReleaseEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonUp(event->modifiers(), event->pos());
+        break;
+    case Qt::RightButton:
+        OnRButtonUp(event->modifiers(), event->pos());
+        break;
+    case Qt::MiddleButton:
+        OnMButtonUp(event->modifiers(), event->pos());
+        break;
+    default:
+        break;
+    }
+}
+
+void CTrackViewDopeSheetBase::mouseDoubleClickEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonDblClk(event->modifiers(), event->pos());
+        break;
+    default:
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    HideKeyPropertyCtrlOnSpot();
+
+    if (m_rcTimeline.contains(point))
+    {
+        m_mouseDownPos = point;
+
+        // Clicked inside timeline.
+        m_mouseMode = eTVMouseMode_DragTime;
+
+        // If mouse over selected key, change cursor to left-right arrows.
+        SetMouseCursor(m_crsLeftRight);
+
+        m_stashedRecordModeWhileTimeDragging = GetIEditor()->GetAnimation()->IsRecordMode();
+        GetIEditor()->GetAnimation()->SetRecording(false);  // disable recording while dragging time
+
+        SetCurrTime(TimeFromPoint(point));
+        return;
+    }
+
+    if (m_bEditLock)
+    {
+        m_mouseDownPos = point;
+        return;
+    }
+
+    if (m_mouseMode == eTVMouseMode_Paste)
+    {
+        m_mouseMode = eTVMouseMode_None;
+
+        CTrackViewAnimNode* animNode = GetAnimNodeFromPoint(m_mouseOverPos);
+        CTrackViewTrack* pTrack = GetTrackFromPoint(m_mouseOverPos);
+
+        if (animNode)
+        {
+            AzToolsFramework::ScopedUndoBatch undoBatch("Paste Keys");
+            sequence->DeselectAllKeys();
+            sequence->PasteKeysFromClipboard(animNode, pTrack, ComputeSnappedMoveOffset());
+            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+        }
+
+        SetMouseCursor(Qt::ArrowCursor);
+        OnCaptureChanged();
+        return;
+    }
+
+    m_mouseDownPos = point;
+
+    // The summary region is used for moving already selected keys.
+    if (m_rcSummary.contains(point))
+    {
+        CTrackViewKeyBundle selectedKeys = sequence->GetSelectedKeys();
+        if (selectedKeys.GetKeyCount() > 0)
+        {
+            // Move/Clone Key Undo Begin
+            GetIEditor()->BeginUndo();
+            StoreMementoForTracksWithSelectedKeys();
+
+            m_keyTimeOffset = 0;
+            m_mouseMode = eTVMouseMode_Move;
+            SetMouseCursor(m_crsLeftRight);
+            return;
+        }
+    }
+
+    bool bStart = false;
+    CTrackViewKeyHandle keyHandle = CheckCursorOnStartEndTimeAdjustBar(point, bStart);
+    if (keyHandle.IsValid())
+    {
+        return LButtonDownOnTimeAdjustBar(point, keyHandle, bStart);
+    }
+
+    keyHandle = FirstKeyFromPoint(point);
+    if (!keyHandle.IsValid())
+    {
+        keyHandle = DurationKeyFromPoint(point);
+    }
+
+    if (keyHandle.IsValid())
+    {
+        return LButtonDownOnKey(point, keyHandle, modifiers);
+    }
+
+    if (m_mouseActionMode == eTVActionMode_AddKeys)
+    {
+        AddKeys(point, modifiers & Qt::ShiftModifier);
+        return;
+    }
+
+    if (modifiers & Qt::ShiftModifier)
+    {
+        m_mouseMode = eTVMouseMode_SelectWithinTime;
+    }
+    else
+    {
+        m_mouseMode = eTVMouseMode_Select;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (!pSequence)
+    {
+        return;
+    }
+
+    if (m_mouseMode == eTVMouseMode_Select)
+    {
+        // Check if any key are selected.
+        m_rcSelect.translate(-m_scrollOffset);
+        SelectKeys(m_rcSelect, modifiers & Qt::ControlModifier);
+        m_rcSelect = QRect();
+        m_rubberBand->deleteLater();
+        m_rubberBand = 0;
+    }
+    else if (m_mouseMode == eTVMouseMode_SelectWithinTime)
+    {
+        m_rcSelect.translate(-m_scrollOffset);
+        SelectAllKeysWithinTimeFrame(m_rcSelect, modifiers & Qt::ControlModifier);
+        m_rcSelect = QRect();
+        m_rubberBand->deleteLater();
+        m_rubberBand = 0;
+    }
+    else if (m_mouseMode == eTVMouseMode_DragTime)
+    {
+        SetMouseCursor(Qt::ArrowCursor);
+        // Notify that time was explicitly set
+        GetIEditor()->GetAnimation()->TimeChanged(TimeFromPoint(point));
+        if (m_stashedRecordModeWhileTimeDragging)
+        {
+            GetIEditor()->GetAnimation()->SetRecording(true);   // re-enable recording that was disabled while dragging time
+            m_stashedRecordModeWhileTimeDragging = false;       // reset stashed value
+        }
+
+    }
+    else if (m_mouseMode == eTVMouseMode_Paste)
+    {
+        SetMouseCursor(Qt::ArrowCursor);
+    }
+
+    OnCaptureChanged();
+
+    m_keyTimeOffset = 0;
+    m_keyForTimeAdjust = CTrackViewKeyHandle();
+
+    AcceptUndo();
+
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence || m_rcTimeline.contains(point) || m_bEditLock)
+    {
+        return;
+    }
+
+    CTrackViewKeyHandle keyHandle = FirstKeyFromPoint(point);
+
+    if (!keyHandle.IsValid())
+    {
+        keyHandle = DurationKeyFromPoint(point);
+    }
+    else
+    {
+        CTrackViewTrack* pTrack = GetTrackFromPoint(point);
+        if (pTrack)
+        {
+            CTrackViewSequenceNotificationContext context(sequence);
+
+            AzToolsFramework::ScopedUndoBatch undoBatch("Select key");
+
+            const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
+
+            sequence->DeselectAllKeys();
+            keyHandle.Select(true);
+
+            const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
+
+            if (beforeKeyState != afterKeyState)
+            {
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+
+            m_keyTimeOffset = 0;
+
+            if (pTrack->GetValueType() == AnimValueType::RGB)
+            {
+                // bring up color picker
+                EditSelectedColorKey(pTrack);
+            }
+            else if (pTrack->GetValueType() != AnimValueType::Bool)
+            {
+                // Edit On Spot is blank (not useful) for boolean tracks so we disable dbl-clicking to bring it up for boolean tracks
+                const QPoint p = QCursor::pos();
+
+                bool bKeyChangeInSameTrack = m_pLastTrackSelectedOnSpot && pTrack == m_pLastTrackSelectedOnSpot;
+                m_pLastTrackSelectedOnSpot = pTrack;
+
+                ShowKeyPropertyCtrlOnSpot(p.x(), p.y(), sequence->GetSelectedKeys().GetKeyCount() > 1, bKeyChangeInSameTrack);
+            }
+        }
+
+        return;
+    }
+
+    const bool bTryAddKeysInGroup = modifiers & Qt::ShiftModifier;
+
+    AddKeys(point, bTryAddKeysInGroup);
+
+    m_mouseMode = eTVMouseMode_None;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    OnRButtonDown(modifiers, point);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    OnRButtonUp(modifiers, point);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSequence)
+    {
+        return;
+    }
+
+    HideKeyPropertyCtrlOnSpot();
+
+    m_bCursorWasInKey = false;
+    m_bMouseMovedAfterRButtonDown = false;
+
+    if (m_rcTimeline.contains(point))
+    {
+        // Clicked inside timeline.
+        // adjust markers.
+        int nMarkerStart = TimeToClient(m_timeMarked.start);
+        int nMarkerEnd = TimeToClient(m_timeMarked.end);
+        if ((abs(point.x() - nMarkerStart)) < (abs(point.x() - nMarkerEnd)))
+        {
+            SetStartMarker(TimeFromPoint(point));
+            m_mouseMode = eTVMouseMode_DragStartMarker;
+        }
+        else
+        {
+            SetEndMarker(TimeFromPoint(point));
+            m_mouseMode = eTVMouseMode_DragEndMarker;
+        }
+        return;
+    }
+
+    m_mouseDownPos = point;
+
+    if (modifiers & Qt::ShiftModifier)  // alternative zoom
+    {
+        m_bZoomDrag = true;
+        return;
+    }
+
+    CTrackViewKeyHandle keyHandle = FirstKeyFromPoint(point);
+    if (!keyHandle.IsValid())
+    {
+        keyHandle = DurationKeyFromPoint(point);
+    }
+
+    if (keyHandle.IsValid())
+    {
+        m_bCursorWasInKey = true;
+
+        CTrackViewNode* pNode = GetNodeFromPoint(point);
+        CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(pNode);
+
+        keyHandle.Select(true);
+        m_keyTimeOffset = 0;
+        update();
+
+        // Show a little pop-up menu for copy & delete.
+        QMenu menu;
+        CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
+        const bool bEnableEditOnSpot = ((pTrack && pTrack->GetValueType() != AnimValueType::Bool) &&
+                                        (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType()));
+
+        QAction* actionEditOnSpot = menu.addAction(tr("Edit On Spot"));
+        actionEditOnSpot->setEnabled(bEnableEditOnSpot);
+        menu.addSeparator();
+        QAction* actionCopy = menu.addAction(tr("Copy"));
+        menu.addSeparator();
+        QAction* actionDelete = menu.addAction(tr("Delete"));
+
+        const QPoint p = QCursor::pos();
+        QAction* action = menu.exec(p);
+        if (action == actionEditOnSpot)
+        {
+            bool bKeyChangeInSameTrack
+                = m_pLastTrackSelectedOnSpot
+                    && selectedKeys.GetKeyCount() == 1
+                    && selectedKeys.GetKey(0).GetTrack() == m_pLastTrackSelectedOnSpot;
+
+            if (selectedKeys.GetKeyCount() == 1)
+            {
+                m_pLastTrackSelectedOnSpot = selectedKeys.GetKey(0).GetTrack();
+            }
+            else
+            {
+                m_pLastTrackSelectedOnSpot = NULL;
+            }
+
+            ShowKeyPropertyCtrlOnSpot(p.x(), p.y(), selectedKeys.GetKeyCount() > 1, bKeyChangeInSameTrack);
+        }
+        else if (action == actionCopy)
+        {
+            pSequence->CopyKeysToClipboard(true, false);
+        }
+        else if (action == actionDelete)
+        {
+            CUndo undo("Delete Keys");
+            pSequence->DeleteSelectedKeys();
+        }
+    }
+    else
+    {
+        m_bMoveDrag = true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnRButtonUp([[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSequence)
+    {
+        return;
+    }
+
+    m_bZoomDrag = false;
+    m_bMoveDrag = false;
+
+    OnCaptureChanged();
+
+    m_mouseMode = eTVMouseMode_None;
+
+    if (!m_bCursorWasInKey)
+    {
+        const bool bHasCopiedKey = (GetKeysInClickboard() != NULL);
+
+        if (bHasCopiedKey && m_bMouseMovedAfterRButtonDown == false)    // Once moved, it means the user wanted to scroll, so no paste pop-up.
+        {
+            // Show a little pop-up menu for paste.
+            QMenu menu;
+            QAction* actionPaste = menu.addAction(tr("Paste"));
+
+            QAction* action = menu.exec(QCursor::pos());
+            if (action == actionPaste)
+            {
+                StartPasteKeys();
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::CancelDrag()
+{
+    AcceptUndo();
+    m_mouseMode = eTVMouseMode_None;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::mouseMoveEvent(QMouseEvent* event)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSequence)
+    {
+        return;
+    }
+
+    // To prevent the key moving while selecting
+    if (m_bJustSelected)
+    {
+        m_bJustSelected = false;
+        return;
+    }
+
+    // For some drags, make sure the left mouse button is still down.
+    // If you drag off the window, and press the right mouse button,
+    // and *then* release the left mouse button, QT will never tell us
+    // about the release event.
+    bool leftButtonPressed = event->buttons() & Qt::LeftButton;
+
+    m_bMouseMovedAfterRButtonDown = true;
+    m_mouseOverPos = event->pos();
+
+    if (m_bZoomDrag && (event->modifiers() & Qt::ShiftModifier))
+    {
+        float fAnchorTime = TimeFromPointUnsnapped(m_mouseDownPos);
+        SetTimeScale(m_timeScale * (1.0f + (event->pos().x() - m_mouseDownPos.x()) * 0.0025f), fAnchorTime);
+        m_mouseDownPos = event->pos();
+        return;
+    }
+    else
+    {
+        m_bZoomDrag = false;
+    }
+
+    if (m_bMoveDrag)
+    {
+        m_scrollOffset.setX(qBound(m_scrollMin, m_scrollOffset.x() + m_mouseDownPos.x() - event->pos().x(), m_scrollMax));
+        m_mouseDownPos = event->pos();
+        // Set the new position of the thumb (scroll box).
+        m_scrollBar->setValue(m_scrollOffset.x());
+        update();
+        SetMouseCursor(m_crsLeftRight);
+        return;
+    }
+
+    if (m_mouseMode == eTVMouseMode_Select
+        || m_mouseMode == eTVMouseMode_SelectWithinTime)
+    {
+        MouseMoveSelect(event->pos());
+    }
+    else if (m_mouseMode == eTVMouseMode_Move)
+    {
+        if (leftButtonPressed)
+        {
+            MouseMoveMove(event->pos(), event->modifiers());
+        }
+        else
+        {
+            CancelDrag();
+        }
+    }
+    else if (m_mouseMode == eTVMouseMode_Clone)
+    {
+        pSequence->CloneSelectedKeys();
+        m_mouseMode = eTVMouseMode_Move;
+    }
+    else if (m_mouseMode == eTVMouseMode_DragTime)
+    {
+        if (leftButtonPressed)
+        {
+            MouseMoveDragTime(event->pos(), event->modifiers());
+        }
+        else
+        {
+            CancelDrag();
+        }
+    }
+    else if (m_mouseMode == eTVMouseMode_DragStartMarker)
+    {
+        if (leftButtonPressed)
+        {
+            MouseMoveDragStartMarker(event->pos(), event->modifiers());
+        }
+        else
+        {
+            CancelDrag();
+        }
+    }
+    else if (m_mouseMode == eTVMouseMode_DragEndMarker)
+    {
+        if (leftButtonPressed)
+        {
+            MouseMoveDragEndMarker(event->pos(), event->modifiers());
+        }
+        else
+        {
+            CancelDrag();
+        }
+    }
+    else if (m_mouseMode == eTVMouseMode_Paste)
+    {
+        update();
+    }
+    else if (m_mouseMode == eTVMouseMode_StartTimeAdjust)
+    {
+        if (leftButtonPressed)
+        {
+            MouseMoveStartEndTimeAdjust(event->pos(), true);
+        }
+        else
+        {
+            CancelDrag();
+        }
+    }
+    else if (m_mouseMode == eTVMouseMode_EndTimeAdjust)
+    {
+        if (leftButtonPressed)
+        {
+            MouseMoveStartEndTimeAdjust(event->pos(), false);
+        }
+        else
+        {
+            CancelDrag();
+        }
+    }
+    else
+    {
+        //////////////////////////////////////////////////////////////////////////
+        if (m_mouseActionMode == eTVActionMode_AddKeys)
+        {
+            SetMouseCursor(m_crsAddKey);
+        }
+        else
+        {
+            MouseMoveOver(event->pos());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::paintEvent(QPaintEvent* event)
+{
+    QPainter painter(this);
+
+    {
+        // In case of the fast-redraw mode, just draw the saved bitmap.
+        // Otherwise, actually redraw all things.
+        // This mode is helpful when playing a sequence if the sequence has a lot of keys.
+        if (!m_bFastRedraw)
+        {
+            QLinearGradient gradient(rect().topLeft(), rect().bottomLeft());
+            gradient.setColorAt(0, QColor(250, 250, 250));
+            gradient.setColorAt(1, QColor(220, 220, 220));
+            painter.fillRect(rect(), gradient);
+
+            if (GetIEditor()->GetAnimation()->GetSequence())
+            {
+                if (m_bEditLock)
+                {
+                    painter.fillRect(event->rect(), EDIT_DISABLE_GRAY_COLOR);
+                }
+
+                DrawControl(&painter, event->rect());
+            }
+        }
+    }
+
+    if (GetIEditor()->GetAnimation()->GetSequence())
+    {
+        // Drawing the timeline is handled separately. In other words, it's not saved to the 'm_offscreenBitmap'.
+        // This is for the fast-redraw mode mentioned above.
+        DrawTimeline(&painter, event->rect());
+    }
+
+#ifdef DEBUG
+    painter.setFont(m_descriptionFont);
+    painter.setPen(QColor(255, 255, 255));
+    painter.setBrush(QColor(0, 0, 0));
+
+    const QString redrawCountStr = QString::fromLatin1("Redraw Count: %1").arg(m_redrawCount);
+    QRect redrawCountRect(0, 0, 150, 20);
+
+    QRect bounds;
+    painter.drawText(redrawCountRect, Qt::AlignLeft | Qt::TextSingleLine, redrawCountStr, &bounds);
+    painter.fillRect(bounds, Qt::black);
+    painter.drawText(redrawCountRect, Qt::AlignLeft | Qt::TextSingleLine, redrawCountStr);
+
+    ++m_redrawCount;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SelectAllKeysWithinTimeFrame(const QRect& rc, const bool bMultiSelection)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    AzToolsFramework::ScopedUndoBatch undoBatch("Select keys");
+
+    const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
+
+    if (!bMultiSelection)
+    {
+        sequence->DeselectAllKeys();
+    }
+
+    // put selection rectangle from client to track space.
+    QRect trackRect = rc;
+    trackRect.translate(m_scrollOffset);
+
+    Range selTime = GetTimeRange(trackRect);
+
+    CTrackViewTrackBundle tracks = sequence->GetAllTracks();
+
+    CTrackViewSequenceNotificationContext context(sequence);
+    for (int i = 0; i < tracks.GetCount(); ++i)
+    {
+        CTrackViewTrack* pTrack = tracks.GetTrack(i);
+
+        // Check which keys we intersect.
+        for (int j = 0; j < pTrack->GetKeyCount(); j++)
+        {
+            CTrackViewKeyHandle keyHandle = pTrack->GetKey(j);
+            const float time = keyHandle.GetTime();
+
+            if (selTime.IsInside(time))
+            {
+                keyHandle.Select(true);
+            }
+        }
+    }
+
+    const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
+
+    if (beforeKeyState != afterKeyState)
+    {
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetMouseCursor(const QCursor& cursor)
+{
+    m_currCursor = cursor;
+    setCursor(m_currCursor);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetCurrTime(float time)
+{
+    if (time < m_timeRange.start)
+    {
+        time = m_timeRange.start;
+    }
+    if (time > m_timeRange.end)
+    {
+        time = m_timeRange.end;
+    }
+
+    GetIEditor()->GetAnimation()->SetTime(time);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnTimeChanged(float newTime)
+{
+    int x1 = TimeToClient(m_currentTime);
+    int x2 = TimeToClient(newTime);
+
+    m_currentTime = newTime;
+
+    m_bFastRedraw = true;
+    const QRect rc(QPoint(x1 - 3, m_rcClient.top()), QPoint(x1 + 4, m_rcClient.bottom()));
+    update(rc);
+    const QRect rc1(QPoint(x2 - 3, m_rcClient.top()), QPoint(x2 + 4, m_rcClient.bottom()));
+    update(rc1);
+    m_bFastRedraw = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetStartMarker(float fTime)
+{
+    m_timeMarked.start = fTime;
+
+    if (m_timeMarked.start < m_timeRange.start)
+    {
+        m_timeMarked.start = m_timeRange.start;
+    }
+    if (m_timeMarked.start > m_timeRange.end)
+    {
+        m_timeMarked.start = m_timeRange.end;
+    }
+    if (m_timeMarked.start > m_timeMarked.end)
+    {
+        m_timeMarked.end = m_timeMarked.start;
+    }
+
+    GetIEditor()->GetAnimation()->SetMarkers(m_timeMarked);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetEndMarker(float fTime)
+{
+    m_timeMarked.end = fTime;
+    if (m_timeMarked.end < m_timeRange.start)
+    {
+        m_timeMarked.end = m_timeRange.start;
+    }
+    if (m_timeMarked.end > m_timeRange.end)
+    {
+        m_timeMarked.end = m_timeRange.end;
+    }
+    if (m_timeMarked.start > m_timeMarked.end)
+    {
+        m_timeMarked.start = m_timeMarked.end;
+    }
+    GetIEditor()->GetAnimation()->SetMarkers(m_timeMarked);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetMouseActionMode(ETVActionMode mode)
+{
+    m_mouseActionMode = mode;
+    if (mode == eTVActionMode_AddKeys)
+    {
+        setCursor(m_crsAddKey);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNode* CTrackViewDopeSheetBase::GetNodeFromPointRec(CTrackViewNode* pCurrentNode, const QPoint& point)
+{
+    QRect currentNodeRect = GetNodeRect(pCurrentNode);
+
+    if (currentNodeRect.top() > point.y())
+    {
+        return nullptr;
+    }
+
+    if (currentNodeRect.bottom() >= point.y())
+    {
+        return pCurrentNode;
+    }
+
+    if (pCurrentNode->GetExpanded())
+    {
+        unsigned int childCount = pCurrentNode->GetChildCount();
+        for (unsigned int i = 0; i < childCount; ++i)
+        {
+            CTrackViewNode* pFoundNode = GetNodeFromPointRec(pCurrentNode->GetChild(i), point);
+            if (pFoundNode)
+            {
+                return pFoundNode;
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNode* CTrackViewDopeSheetBase::GetNodeFromPoint(const QPoint& point)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    return GetNodeFromPointRec(pSequence, point);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode* CTrackViewDopeSheetBase::GetAnimNodeFromPoint(const QPoint& point)
+{
+    CTrackViewNode* pNode = GetNodeFromPoint(point);
+
+    if (pNode)
+    {
+        if (pNode->GetNodeType() == eTVNT_Track)
+        {
+            CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(pNode);
+            return static_cast<CTrackViewAnimNode*>(pTrack->GetAnimNode());
+        }
+        else if (pNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            return static_cast<CTrackViewAnimNode*>(pNode);
+        }
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrack* CTrackViewDopeSheetBase::GetTrackFromPoint(const QPoint& point)
+{
+    CTrackViewNode* pNode = GetNodeFromPoint(point);
+
+    if (pNode && pNode->GetNodeType() == eTVNT_Track)
+    {
+        return static_cast<CTrackViewTrack*>(pNode);
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetHorizontalExtent(int min, int max)
+{
+    m_scrollMin = min;
+    m_scrollMax = max;
+    m_scrollBar->setPageStep(m_rcClient.width() / 2);
+    m_scrollBar->setRange(min, max - m_scrollBar->pageStep() * 2 + m_leftOffset);
+};
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CTrackViewDopeSheetBase::GetKeysInClickboard()
+{
+    CClipboard clip(this);
+    if (clip.IsEmpty())
+    {
+        return NULL;
+    }
+
+    if (clip.GetTitle() != "Track view keys")
+    {
+        return NULL;
+    }
+
+    XmlNodeRef copyNode = clip.Get();
+    if (copyNode == NULL || strcmp(copyNode->getTag(), "CopyKeysNode"))
+    {
+        return NULL;
+    }
+
+    int nNumTracksToPaste = copyNode->getChildCount();
+    if (nNumTracksToPaste == 0)
+    {
+        return NULL;
+    }
+
+    return copyNode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::StartPasteKeys()
+{
+    m_clipboardKeys = GetKeysInClickboard();
+
+    if (m_clipboardKeys)
+    {
+        m_mouseMode = eTVMouseMode_Paste;
+        // If mouse over selected key, change cursor to left-right arrows.
+        SetMouseCursor(m_crsLeftRight);
+        m_mouseDownPos = m_mouseOverPos;
+    }
+}
+
+void CTrackViewDopeSheetBase::keyPressEvent(QKeyEvent* event)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
+    if (event->matches(QKeySequence::Delete))
+    {
+        CUndo undo("Delete Keys");
+        sequence->DeleteSelectedKeys();
+        return;
+    }
+
+    if (event->key() == Qt::Key_Up || event->key() == Qt::Key_Down || event->key() == Qt::Key_Right || event->key() == Qt::Key_Left)
+    {
+        CTrackViewKeyBundle keyBundle = sequence->GetSelectedKeys();
+        CTrackViewKeyHandle keyHandle = keyBundle.GetSingleSelectedKey();
+
+        if (keyHandle.IsValid())
+        {
+            switch (event->key())
+            {
+            case Qt::Key_Up:
+                keyHandle = keyHandle.GetAboveKey();
+                break;
+            case Qt::Key_Down:
+                keyHandle = keyHandle.GetBelowKey();
+                break;
+            case Qt::Key_Right:
+                keyHandle = keyHandle.GetNextKey();
+                break;
+            case Qt::Key_Left:
+                keyHandle = keyHandle.GetPrevKey();
+                break;
+            }
+
+            if (keyHandle.IsValid())
+            {
+                CTrackViewSequenceNotificationContext context(sequence);
+
+                const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
+
+                AzToolsFramework::ScopedUndoBatch undoBatch("Select Key");
+
+                sequence->DeselectAllKeys();
+                keyHandle.Select(true);
+
+                const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
+
+                if (beforeKeyState != afterKeyState)
+                {
+                    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+                }
+
+            }
+        }
+
+        return;
+    }
+
+    if (event->matches(QKeySequence::Copy))
+    {
+        sequence->CopyKeysToClipboard(true, false);
+    }
+    else if (event->matches(QKeySequence::Paste))
+    {
+        StartPasteKeys();
+    }
+    else if (event->matches(QKeySequence::Undo))
+    {
+        GetIEditor()->Undo();
+    }
+    else if (event->matches(QKeySequence::Redo))
+    {
+        GetIEditor()->Redo();
+    }
+    else
+    {
+        return QWidget::keyPressEvent(event);
+    }
+}
+
+bool CTrackViewDopeSheetBase::event(QEvent* e)
+{
+    if (e->type() == QEvent::ShortcutOverride)
+    {
+        // since we respond to the following things, let Qt know so that shortcuts don't override us
+        bool respondsToEvent = false;
+
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
+        switch (keyEvent->key())
+        {
+            case Qt::Key_Delete:
+            case Qt::Key_Up:
+            case Qt::Key_Down:
+            case Qt::Key_Left:
+            case Qt::Key_Right:
+                respondsToEvent = true;
+            break;
+
+            default:
+                respondsToEvent =
+                    keyEvent->matches(QKeySequence::Copy) ||
+                    keyEvent->matches(QKeySequence::Paste) ||
+                    keyEvent->matches(QKeySequence::Undo) ||
+                    keyEvent->matches(QKeySequence::Redo);
+            break;
+        }
+
+        if (respondsToEvent)
+        {
+            e->accept();
+            return true;
+        }
+    }
+
+    return QWidget::event(e);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::ShowKeyTooltip(CTrackViewKeyHandle& keyHandle, const QPoint& point)
+{
+    if (m_lastTooltipPos == point)
+    {
+        return;
+    }
+
+    m_lastTooltipPos = point;
+
+    const float time = keyHandle.GetTime();
+    const char* desc = keyHandle.GetDescription();
+
+    QString tipText;
+    if (GetTickDisplayMode() == eTVTickMode_InSeconds)
+    {
+        tipText = tr("%1, {%2}").arg(time, 0, 'f', 3).arg(desc);
+    }
+    else
+    {
+        tipText = tr("%1, {%2}").arg(ftoi(time / m_snapFrameTime)).arg(desc);
+    }
+
+    QToolTip::showText(point, tipText);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::OnCaptureChanged()
+{
+    AcceptUndo();
+
+    m_bZoomDrag = false;
+    m_bMoveDrag = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewDopeSheetBase::IsOkToAddKeyHere(const CTrackViewTrack* pTrack, float time) const
+{
+    const float timeEpsilon = 0.05f;
+
+    for (int i = 0; i < pTrack->GetKeyCount(); ++i)
+    {
+        const CTrackViewKeyConstHandle& keyHandle = pTrack->GetKey(i);
+
+        if (keyHandle.GetTime() == time)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::MouseMoveSelect(const QPoint& point)
+{
+    SetMouseCursor(Qt::ArrowCursor);
+    QRect rc(m_mouseDownPos, point);
+    rc = rc.normalized();
+    QRect rcClient = rect();
+    rc = rc.intersected(rcClient);
+
+    if (m_rubberBand == nullptr)
+    {
+        m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
+    }
+    m_rubberBand->show();
+    if (m_mouseMode == eTVMouseMode_SelectWithinTime)
+    {
+        rc.setTop(m_rcClient.top());
+        rc.setBottom(m_rcClient.bottom());
+    }
+
+    m_rcSelect = rc;
+    m_rubberBand->setGeometry(m_rcSelect);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::MouseMoveStartEndTimeAdjust(const QPoint& p, bool bStart)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    SetMouseCursor(m_crsAdjustLR);
+    const QPoint point(qBound(m_rcClient.left(), p.x(), m_rcClient.right()), p.y());
+
+    const QPoint ofs = point - m_mouseDownPos;
+
+    CTrackViewKeyHandle& keyHandle = m_keyForTimeAdjust;
+
+    // TODO: Refactor this Time Range Key stuff.
+    ICharacterKey characterKey;
+    AZ::IAssetBlendKey assetBlendKey;
+    ITimeRangeKey* timeRangeKey = nullptr;
+
+    if (keyHandle.GetTrack()->GetValueType() == AnimValueType::AssetBlend)
+    {
+        keyHandle.GetKey(&assetBlendKey);
+        timeRangeKey = &assetBlendKey;
+    }
+    else
+    {
+        // This will work for both character & time range keys because
+        // ICharacterKey is derived from ITimeRangeKey. Not the most beautiful code.
+        keyHandle.GetKey(&characterKey);
+        timeRangeKey = &characterKey;
+    }
+
+    float& timeToAdjust = bStart ? timeRangeKey->m_startTime : timeRangeKey->m_endTime;
+
+    // Undo the last offset.
+    timeToAdjust += -m_keyTimeOffset;
+
+    // Apply a new offset.
+    m_keyTimeOffset = (ofs.x() / m_timeScale) * timeRangeKey->m_speed;
+    timeToAdjust += m_keyTimeOffset;
+
+    // Check the validity.
+    if (bStart)
+    {
+        if (timeToAdjust < 0)
+        {
+            timeToAdjust = 0;
+        }
+        else if (timeToAdjust > timeRangeKey->GetValidEndTime())
+        {
+            timeToAdjust = timeRangeKey->GetValidEndTime();
+        }
+    }
+    else
+    {
+        float endTime = AZStd::min(timeRangeKey->GetValidEndTime(), timeRangeKey->m_duration);
+        if (timeToAdjust < timeRangeKey->m_startTime)
+        {
+            timeToAdjust = timeRangeKey->m_startTime;
+        }
+        else if (timeToAdjust > endTime)
+        {
+            timeToAdjust = endTime;
+        }
+    }
+
+    keyHandle.SetKey(timeRangeKey);
+
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::MouseMoveMove(const QPoint& p, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    CTrackViewSequenceNotificationContext context(pSequence);
+
+    SetMouseCursor(m_crsLeftRight);
+    const QPoint point(qBound(m_rcClient.left(), p.x(), m_rcClient.right()), p.y());
+
+    // Reset tracks to their initial state before starting the move
+    for (auto iter = m_trackMementos.begin(); iter != m_trackMementos.end(); ++iter)
+    {
+        CTrackViewTrack* pTrack = iter->first;
+
+        const TrackMemento& trackMemento = iter->second;
+        pTrack->RestoreFromMemento(trackMemento.m_memento);
+
+        const unsigned int numKeys = trackMemento.m_keySelectionStates.size();
+        for (unsigned int i = 0; i < numKeys; ++i)
+        {
+            pTrack->GetKey(i).Select(trackMemento.m_keySelectionStates[i]);
+        }
+    }
+
+    CTrackViewKeyHandle keyHandle = FirstKeyFromPoint(m_mouseDownPos);
+    if (!keyHandle.IsValid())
+    {
+        keyHandle = DurationKeyFromPoint(m_mouseDownPos);
+    }
+
+    float oldTime;
+    if (keyHandle.IsValid())
+    {
+        oldTime = keyHandle.GetTime();
+    }
+    else
+    {
+        oldTime = TimeFromPointUnsnapped(m_mouseDownPos);
+    }
+
+    QPoint ofs = point - m_mouseDownPos;
+    float timeOffset = ofs.x() / m_timeScale;
+    float newTime = oldTime + timeOffset;
+
+    // Snap it, if necessary.
+    ESnappingMode snappingMode = GetKeyModifiedSnappingMode();
+    if (snappingMode == eSnappingMode_SnapFrame)
+    {
+        snappingMode = m_snappingMode;
+    }
+
+    if (snappingMode == eSnappingMode_SnapMagnet)
+    {
+        newTime = MagnetSnap(newTime, GetAnimNodeFromPoint(m_mouseOverPos));
+    }
+
+    else if (snappingMode == eSnappingMode_SnapTick)
+    {
+        newTime = TickSnap(newTime);
+    }
+
+    else if (snappingMode == eSnappingMode_SnapFrame)
+    {
+        newTime = FrameSnap(newTime);
+    }
+
+    Range extendedTimeRange(0.0f, m_timeRange.end);
+    extendedTimeRange.ClipValue(newTime);
+
+    timeOffset = newTime - oldTime; // Re-compute the time offset using snapped & clipped 'newTime'.
+    if (timeOffset == 0.0f)
+    {
+        return;
+    }
+
+    m_bKeysMoved = true;
+
+    if (m_mouseActionMode == eTVActionMode_ScaleKey)
+    {
+        float tscale = 0.005f;
+        float tofs = ofs.x() * tscale;
+        tofs = pSequence->ClipTimeOffsetForScaling(1 + tofs) - 1;
+        // Offset all selected keys by this offset.
+        pSequence->ScaleSelectedKeys(1 + tofs);
+        m_keyTimeOffset = tofs;
+    }
+    else
+    {
+        // Offset all selected keys by this offset.
+        if (m_mouseActionMode == eTVActionMode_SlideKey)
+        {
+            timeOffset = pSequence->ClipTimeOffsetForSliding(timeOffset);
+            pSequence->SlideKeys(timeOffset);
+        }
+        else
+        {
+            timeOffset = pSequence->ClipTimeOffsetForOffsetting(timeOffset);
+            pSequence->OffsetSelectedKeys(timeOffset);
+        }
+
+        if (CheckVirtualKey(Qt::Key_Menu))
+        {
+            CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
+            CTrackViewKeyHandle selectedKey = selectedKeys.GetSingleSelectedKey();
+
+            if (selectedKey.IsValid())
+            {
+                GetIEditor()->GetAnimation()->SetTime(selectedKey.GetTime());
+            }
+        }
+        m_keyTimeOffset = timeOffset;
+    }
+
+    // The time of the selected keys has likely just changed. OnKeySelectionChanged() so the 
+    // UI elements of the key properties control will update.
+    pSequence->OnKeySelectionChanged();
+}
+
+void CTrackViewDopeSheetBase::MouseMoveDragTime(const QPoint& point, Qt::KeyboardModifiers modifiers)
+{
+    const QPoint p(qBound(m_rcClient.left(), point.x(), m_rcClient.right()),
+        qBound(m_rcClient.top(), point.y(), m_rcClient.bottom()));
+
+    float time = TimeFromPointUnsnapped(p);
+    m_timeRange.ClipValue(time);
+
+    bool bSnap = (modifiers & Qt::ControlModifier);
+    if (bSnap)
+    {
+        time = TickSnap(time);
+    }
+    SetCurrTime(time);
+}
+
+void CTrackViewDopeSheetBase::MouseMoveDragStartMarker(const QPoint& point, Qt::KeyboardModifiers modifiers)
+{
+    const QPoint p(qBound(m_rcClient.left(), point.x(), m_rcClient.right()),
+        qBound(m_rcClient.top(), point.y(), m_rcClient.bottom()));
+
+    bool bNoSnap = (modifiers & Qt::ControlModifier);
+    float time = TimeFromPointUnsnapped(p);
+    m_timeRange.ClipValue(time);
+    if (!bNoSnap)
+    {
+        time = TickSnap(time);
+    }
+    SetStartMarker(time);
+}
+
+void CTrackViewDopeSheetBase::MouseMoveDragEndMarker(const QPoint& point, Qt::KeyboardModifiers modifiers)
+{
+    const QPoint p(qBound(m_rcClient.left(), point.x(), m_rcClient.right()),
+        qBound(m_rcClient.top(), point.y(), m_rcClient.bottom()));
+
+    bool bNoSnap = (modifiers & Qt::ControlModifier);
+    float time = TimeFromPointUnsnapped(p);
+    m_timeRange.ClipValue(time);
+    if (!bNoSnap)
+    {
+        time = TickSnap(time);
+    }
+    SetEndMarker(time);
+}
+
+void CTrackViewDopeSheetBase::MouseMoveOver(const QPoint& point)
+{
+    // No mouse mode.
+    SetMouseCursor(Qt::ArrowCursor);
+
+    bool bStart = false;
+    CTrackViewKeyHandle keyHandle = CheckCursorOnStartEndTimeAdjustBar(point, bStart);
+    if (keyHandle.IsValid())
+    {
+        SetMouseCursor(m_crsAdjustLR);
+        return;
+    }
+
+    keyHandle = FirstKeyFromPoint(point);
+    if (!keyHandle.IsValid())
+    {
+        keyHandle = DurationKeyFromPoint(point);
+    }
+
+    if (keyHandle.IsValid())
+    {
+        CTrackViewTrack* pTrack = GetTrackFromPoint(point);
+
+        if (pTrack && keyHandle.IsSelected())
+        {
+            // If mouse over selected key, change cursor to left-right arrows.
+            SetMouseCursor(m_crsLeftRight);
+        }
+        else
+        {
+            SetMouseCursor(m_crsCross);
+        }
+
+        if (pTrack)
+        {
+            ShowKeyTooltip(keyHandle, mapToGlobal(point));
+        }
+    }
+    else
+    {
+        QToolTip::hideText();
+    }
+}
+
+float CTrackViewDopeSheetBase::MagnetSnap(float newTime, const CTrackViewAnimNode* pNode) const
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSequence)
+    {
+        return newTime;
+    }
+
+    CTrackViewKeyBundle keys = pSequence->GetKeysInTimeRange(newTime - kMarginForMagnetSnapping / m_timeScale,
+            newTime + kMarginForMagnetSnapping / m_timeScale);
+
+    if (keys.GetKeyCount() > 0)
+    {
+        // By default, just use the first key that belongs to the time range as a magnet.
+        newTime = keys.GetKey(0).GetTime();
+        // But if there is an in-range key in a sibling track, use it instead.
+        // Here a 'sibling' means a track that belongs to a same node.
+        for (int i = 0; i < keys.GetKeyCount(); ++i)
+        {
+            CTrackViewKeyHandle keyHandle = keys.GetKey(i);
+            if (keyHandle.GetTrack()->GetAnimNode() == pNode)
+            {
+                newTime = keyHandle.GetTime();
+                break;
+            }
+        }
+    }
+
+    return newTime;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewDopeSheetBase::FrameSnap(float time) const
+{
+    double t = floor((double)time / m_snapFrameTime + 0.5);
+    t = t * m_snapFrameTime;
+    return t;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::ShowKeyPropertyCtrlOnSpot(int x, int y, [[maybe_unused]] bool bMultipleKeysSelected, bool bKeyChangeInSameTrack)
+{
+    if (m_keyPropertiesDlg == NULL)
+    {
+        return;
+    }
+
+
+    if (m_wndPropsOnSpot == nullptr)
+    {
+        m_wndPropsOnSpot = new ReflectedPropertyControl(this);
+        m_wndPropsOnSpot->Setup(true, 150);
+        m_wndPropsOnSpot->setWindowFlags(Qt::CustomizeWindowHint | Qt::Popup | Qt::WindowStaysOnTopHint);
+        m_wndPropsOnSpot->SetStoreUndoByItems(false);
+        bKeyChangeInSameTrack = false;
+    }
+
+    if (bKeyChangeInSameTrack)
+    {
+        m_wndPropsOnSpot->ClearSelection();
+        m_wndPropsOnSpot->ReloadValues();
+    }
+    else
+    {
+        m_keyPropertiesDlg->PopulateVariables(m_wndPropsOnSpot);
+    }
+
+    m_wndPropsOnSpot->show();
+    m_wndPropsOnSpot->move(x, y);
+    m_wndPropsOnSpot->ExpandAll();
+    QTimer::singleShot(0, [this]() {
+        m_wndPropsOnSpot->resize(m_wndPropsOnSpot->sizeHint());
+    });
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::HideKeyPropertyCtrlOnSpot()
+{
+    if (m_wndPropsOnSpot)
+    {
+        m_wndPropsOnSpot->hide();
+        m_wndPropsOnSpot->ClearSelection();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetScrollOffset(int hpos)
+{
+    m_scrollBar->setValue(hpos);
+    m_scrollOffset.setX(hpos);
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::LButtonDownOnTimeAdjustBar([[maybe_unused]] const QPoint& point, CTrackViewKeyHandle& keyHandle, bool bStart)
+{
+    m_keyTimeOffset = 0;
+    m_keyForTimeAdjust = keyHandle;
+
+    GetIEditor()->BeginUndo();
+
+    if (bStart)
+    {
+        m_mouseMode = eTVMouseMode_StartTimeAdjust;
+    }
+    else
+    {
+        // TODO: Refactor this Time Range Key stuff.
+        ICharacterKey characterKey;
+        AZ::IAssetBlendKey assetBlendKey;
+        ITimeRangeKey* timeRangeKey = nullptr;
+
+        if (keyHandle.GetTrack()->GetValueType() == AnimValueType::AssetBlend)
+        {
+            keyHandle.GetKey(&assetBlendKey);
+            timeRangeKey = &assetBlendKey;
+        }
+        else
+        {
+            // This will work for both character & time range keys because
+            // ICharacterKey is derived from ITimeRangeKey. Not the most beautiful code.
+            keyHandle.GetKey(&characterKey);
+            timeRangeKey = &characterKey;
+        }
+
+        // In case of the end time, make it have a valid (not zero)
+        // end time, first.
+        if (timeRangeKey->m_endTime == 0)
+        {
+            timeRangeKey->m_endTime = timeRangeKey->m_duration;
+            keyHandle.SetKey(timeRangeKey);
+        }
+        m_mouseMode = eTVMouseMode_EndTimeAdjust;
+    }
+    SetMouseCursor(m_crsAdjustLR);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::LButtonDownOnKey([[maybe_unused]] const QPoint& point, CTrackViewKeyHandle& keyHandle, Qt::KeyboardModifiers modifiers)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    AZ_Assert(sequence, "Expected a valid sequence.");
+
+    if (!sequence)
+    {
+        return;
+    }
+
+    if (!keyHandle.IsSelected() && !(modifiers & Qt::ControlModifier))
+    {
+        CTrackViewSequenceNotificationContext context(sequence);
+        AzToolsFramework::ScopedUndoBatch undoBatch("Select keys");
+
+        const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
+
+        sequence->DeselectAllKeys();
+        m_bJustSelected = true;
+        m_keyTimeOffset = 0;
+        keyHandle.Select(true);
+
+        ChangeSequenceTrackSelection(sequence, keyHandle.GetTrack());
+
+        const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
+
+        if (beforeKeyState != afterKeyState)
+        {
+            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+        }
+    }
+    else
+    {
+        GetIEditor()->CancelUndo();
+    }
+
+    // Move/Clone Key Undo Begin
+    GetIEditor()->BeginUndo();
+    StoreMementoForTracksWithSelectedKeys();
+
+    if (modifiers & Qt::ShiftModifier)
+    {
+        m_mouseMode = eTVMouseMode_Clone;
+        SetMouseCursor(m_crsLeftRight);
+    }
+    else
+    {
+        m_mouseMode = eTVMouseMode_Move;
+        SetMouseCursor(m_crsLeftRight);
+    }
+
+    update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::ChangeSequenceTrackSelection(CTrackViewSequence* sequenceWithTrack, CTrackViewTrack* trackToSelect) const
+{
+    // Deselect all currently selected tracks that aren't the keyHandle's Track, then ensure the trackToSelect  is selected
+    CTrackViewTrackBundle prevSelectedTracks;
+
+    prevSelectedTracks = sequenceWithTrack->GetSelectedTracks();
+    for (int i = 0; i < prevSelectedTracks.GetCount(); i++)
+    {
+        CTrackViewTrack* prevSelectedTrack = prevSelectedTracks.GetTrack(i);
+        if (prevSelectedTrack != trackToSelect)
+        {
+            prevSelectedTrack->SetSelected(false);
+        }
+    }
+    trackToSelect->SetSelected(true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::ChangeSequenceTrackSelection(CTrackViewSequence* sequence, CTrackViewTrackBundle tracksToSelect, bool multiTrackSelection) const
+{
+    if (!multiTrackSelection)
+    {
+        // Deselect any tracks not in the tracksToSelect bundle
+        CTrackViewTrackBundle prevSelectedTracks;
+        prevSelectedTracks = sequence->GetSelectedTracks();
+
+        for (int i = prevSelectedTracks.GetCount(); --i >= 0; )
+        {
+            bool                deselectTrack = true;
+            CTrackViewTrack*    prevSelectedTrack = prevSelectedTracks.GetTrack(i);
+
+            for (int j = tracksToSelect.GetCount(); --j >= 0; )
+            {
+                CTrackViewTrack* selectTrackCandidate = tracksToSelect.GetTrack(j);
+                if (selectTrackCandidate == prevSelectedTrack)
+                {
+                    // selectTrackCandidate is already selected
+                    tracksToSelect.RemoveTrack(selectTrackCandidate);
+                    deselectTrack = false;
+                    break;
+                }
+            }
+            if (deselectTrack)
+            {
+                prevSelectedTrack->SetSelected(false);
+            }
+        }
+    }
+
+    // Add remaining tracks in tracksToSelect bundle to track selection
+    for (int j = tracksToSelect.GetCount(); --j >= 0; )
+    {
+        tracksToSelect.GetTrack(j)->SetSelected(true);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewDopeSheetBase::CreateColorKey(CTrackViewTrack* pTrack, float keyTime)
+{
+    bool keyCreated = false;
+    Vec3 vColor(0, 0, 0);
+    pTrack->GetValue(keyTime, vColor);
+
+    const AZ::Color defaultColor(clamp_tpl<AZ::u8>(FloatToIntRet(vColor.x), 0, 255),
+        clamp_tpl<AZ::u8>(FloatToIntRet(vColor.y), 0, 255),
+        clamp_tpl<AZ::u8>(FloatToIntRet(vColor.z), 0, 255),
+        255);
+    AzQtComponents::ColorPicker dlg(AzQtComponents::ColorPicker::Configuration::RGB, QString(), this);
+    dlg.setWindowTitle(tr("Select Color"));
+    dlg.setCurrentColor(defaultColor);
+    dlg.setSelectedColor(defaultColor);
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        const AZ::Color col = dlg.currentColor();
+        ColorF colArray(col.GetR8(), col.GetG8(), col.GetB8(), col.GetA8());
+
+        CTrackViewSequence* sequence = pTrack->GetSequence();
+        if (nullptr != sequence)
+        {
+            CTrackViewSequenceNotificationContext context(sequence);
+
+            AzToolsFramework::ScopedUndoBatch undoBatch("Set Key");
+            const unsigned int numChildNodes = pTrack->GetChildCount();
+            for (int i = 0; i < numChildNodes; ++i)
+            {
+                CTrackViewTrack* subTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(i));
+                if (IsOkToAddKeyHere(subTrack, keyTime))
+                {
+                    CTrackViewKeyHandle newKey = subTrack->CreateKey(keyTime);
+
+                    I2DBezierKey bezierKey;
+                    newKey.GetKey(&bezierKey);
+                    bezierKey.value = Vec2(keyTime, colArray[i]);
+                    newKey.SetKey(&bezierKey);
+
+                    keyCreated = true;
+                }
+            }
+            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+        }
+    }
+
+    return keyCreated;
+}
+
+void CTrackViewDopeSheetBase::OnCurrentColorChange(const AZ::Color& color)
+{
+    // This is while the color picker is up 
+    // so we want to update the property but not store an undo
+    UpdateColorKey(AzQtComponents::toQColor(color), false);
+}
+
+void CTrackViewDopeSheetBase::UpdateColorKey(const QColor& color, bool addToUndo)
+{
+    ColorF colArray(color.red(), color.green(), color.blue(), color.alpha());
+
+    CTrackViewSequence* sequence = m_colorUpdateTrack->GetSequence();
+    if (nullptr != sequence)
+    {
+        CTrackViewSequenceNotificationContext context(sequence);
+
+        if (addToUndo)
+        {
+            AzToolsFramework::ScopedUndoBatch undoBatch("Set Key");
+            UpdateColorKeyHelper(colArray);
+            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+        }
+        else
+        {
+            UpdateColorKeyHelper(colArray);
+        }
+
+        // We want this to take affect now
+        if (!addToUndo)
+        {
+            GetIEditor()->GetAnimation()->ForceAnimation();
+        }
+    }
+}
+
+void CTrackViewDopeSheetBase::UpdateColorKeyHelper(const ColorF& color)
+{
+    const unsigned int numChildNodes = m_colorUpdateTrack->GetChildCount();
+    for (int i = 0; i < numChildNodes; ++i)
+    {
+        CTrackViewTrack* subTrack = static_cast<CTrackViewTrack*>(m_colorUpdateTrack->GetChild(i));
+        CTrackViewKeyHandle subTrackKey = subTrack->GetKeyByTime(m_colorUpdateKeyTime);
+        I2DBezierKey bezierKey;
+        if (subTrackKey.IsValid())
+        {
+            subTrackKey.GetKey(&bezierKey);
+        }
+        else
+        {
+            // no valid key found at this time - create Key
+            subTrackKey = subTrack->CreateKey(m_colorUpdateKeyTime);
+            subTrackKey.GetKey(&bezierKey);
+        }
+
+        bezierKey.value.x = m_colorUpdateKeyTime;
+        bezierKey.value.y = color[i];
+        subTrackKey.SetKey(&bezierKey);
+    }
+}
+
+void CTrackViewDopeSheetBase::EditSelectedColorKey(CTrackViewTrack* pTrack)
+{
+    if (pTrack->IsCompoundTrack())
+    {
+        CTrackViewKeyBundle selectedKeyBundle = pTrack->GetSelectedKeys();
+        if (selectedKeyBundle.GetKeyCount())
+        {
+            m_colorUpdateTrack = pTrack;
+            // init with the first selected key color
+            m_colorUpdateKeyTime = selectedKeyBundle.GetKey(0).GetTime();
+
+            Vec3  color;
+            pTrack->GetValue(m_colorUpdateKeyTime, color);
+
+            const AZ::Color defaultColor(clamp_tpl<AZ::u8>(FloatToIntRet(color.x), 0, 255),
+                clamp_tpl<AZ::u8>(FloatToIntRet(color.y), 0, 255),
+                clamp_tpl<AZ::u8>(FloatToIntRet(color.z), 0, 255), 
+                255);
+
+            AzQtComponents::ColorPicker picker(AzQtComponents::ColorPicker::Configuration::RGB);
+            picker.setWindowTitle(tr("Select Color"));
+            picker.setCurrentColor(defaultColor);
+            picker.setSelectedColor(defaultColor);
+            QObject::connect(&picker, &AzQtComponents::ColorPicker::currentColorChanged, this, &CTrackViewDopeSheetBase::OnCurrentColorChange);
+    
+            if (picker.exec() == QDialog::Accepted)
+            {
+                const AZ::Color col = picker.currentColor();
+
+                // Moved bulk of method into helper to handle matching logic in QT callback and undo redo cases
+                UpdateColorKey(AzQtComponents::toQColor(col), true);
+            }
+            else
+            {
+                // We canceled out of the color picker, revert to color held before opening it
+                UpdateColorKey(AzQtComponents::toQColor(defaultColor), false);
+            }
+        }      
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::AcceptUndo()
+{
+    if (CUndo::IsRecording())
+    {
+        const QPoint mousePos = mapFromGlobal(QCursor::pos());
+
+        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+        if (m_mouseMode == eTVMouseMode_Paste)
+        {
+            GetIEditor()->CancelUndo();
+        }
+        else if (m_mouseMode == eTVMouseMode_Move || m_mouseMode == eTVMouseMode_Clone)
+        {
+            if (sequence && m_bKeysMoved)
+            {
+                GetIEditor()->CancelUndo();
+
+                // Keys Moved, mark the sequence dirty to get an AZ undo event.
+                AzToolsFramework::ScopedUndoBatch undoBatch("Move/Clone Keys");
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+            else
+            {
+                GetIEditor()->CancelUndo();
+            }
+        }
+        else if (m_mouseMode == eTVMouseMode_StartTimeAdjust || m_mouseMode == eTVMouseMode_EndTimeAdjust)
+        {
+            if (sequence)
+            {
+                GetIEditor()->CancelUndo();
+
+                AzToolsFramework::ScopedUndoBatch undoBatch("Adjust Start/End Time of an Animation Key");
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+            else
+            {
+                GetIEditor()->CancelUndo();
+            }
+        }
+    }
+
+    m_mouseMode = eTVMouseMode_None;
+    m_trackMementos.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewDopeSheetBase::ComputeSnappedMoveOffset()
+{
+    // Compute time offset
+    const QPoint currentMousePos(qBound(m_rcClient.left(), m_mouseOverPos.x(), m_rcClient.right()), m_mouseOverPos.y());
+
+    float time0 = TimeFromPointUnsnapped(m_mouseDownPos);
+    float time = TimeFromPointUnsnapped(currentMousePos);
+
+    if (GetKeyModifiedSnappingMode() == eSnappingMode_SnapTick)
+    {
+        time0 = TickSnap(time0);
+        time = TickSnap(time);
+    }
+
+    return time - time0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKeysInGroup)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    // Add keys here.
+    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
+
+    if (!pTrack)
+    {
+        return;
+    }
+
+    CTrackViewSequenceNotificationContext context(sequence);
+
+    CTrackViewAnimNode* pNode = pTrack->GetAnimNode();
+    float keyTime = TimeFromPoint(point);
+    bool inRange = m_timeRange.IsInside(keyTime);
+
+    if (pTrack && inRange)
+    {
+        bool keyCreated = false;
+        if (bTryAddKeysInGroup && pNode->GetParentNode())       // Add keys in group
+        {
+            CTrackViewTrackBundle tracksInGroup = pNode->GetTracksByParam(pTrack->GetParameterType());
+            for (int i = 0; i < (int)tracksInGroup.GetCount(); ++i)
+            {
+                CTrackViewTrack* pCurrTrack = tracksInGroup.GetTrack(i);
+
+                if (pCurrTrack->GetChildCount() == 0)   // A simple track
+                {
+                    if (IsOkToAddKeyHere(pCurrTrack, keyTime))
+                    {
+                        AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
+                        pCurrTrack->CreateKey(keyTime);
+                        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+                        keyCreated = true;
+                    }
+                }
+                else                                                                            // A compound track
+                {
+                    for (int k = 0; k < pCurrTrack->GetChildCount(); ++k)
+                    {
+                        CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pCurrTrack->GetChild(k));
+                        if (IsOkToAddKeyHere(pSubTrack, keyTime))
+                        {
+                            AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
+                            pSubTrack->CreateKey(keyTime);
+                            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+                            keyCreated = true;
+                        }
+                    }
+                }
+            }
+        }
+        else if (pTrack->GetChildCount() == 0)          // A simple track
+        {
+            if (IsOkToAddKeyHere(pTrack, keyTime))
+            {
+                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);
+            }
+            else
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
+                for (int i = 0; i < pTrack->GetChildCount(); ++i)
+                {
+                    CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(i));
+                    if (IsOkToAddKeyHere(pSubTrack, keyTime))
+                    {
+                        pSubTrack->CreateKey(keyTime);
+                        keyCreated = true;
+                    }
+                }
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawControl(QPainter* painter, const QRect& rcUpdate)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    DrawNodesRecursive(pSequence, painter, rcUpdate);
+
+    DrawSummary(painter, rcUpdate);
+
+    DrawSelectedKeyIndicators(painter);
+
+    if (m_mouseMode == eTVMouseMode_Paste)
+    {
+        // If in paste mode draw keys that are in clipboard
+        DrawClipboardKeys(painter, QRect());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawNodesRecursive(CTrackViewNode* pNode, QPainter* painter, const QRect& rcUpdate)
+{
+    const QRect rect = GetNodeRect(pNode);
+
+    if (!rect.isEmpty())
+    {
+        switch (pNode->GetNodeType())
+        {
+        case eTVNT_AnimNode:
+            DrawNodeTrack(static_cast<CTrackViewAnimNode*>(pNode), painter, rect);
+            break;
+        case eTVNT_Track:
+            DrawTrack(static_cast<CTrackViewTrack*>(pNode), painter, rect);
+            break;
+        }
+    }
+
+    if (pNode->GetExpanded())
+    {
+        unsigned int numChildren = pNode->GetChildCount();
+        for (unsigned int i = 0; i < numChildren; ++i)
+        {
+            DrawNodesRecursive(pNode->GetChild(i), painter, rcUpdate);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawTicks(QPainter* painter, const QRect& rc, Range& timeRange)
+{
+    // Draw time ticks every tick step seconds.
+    const QPen dkgray(QColor(90, 90, 90));
+    const QPen ltgray(QColor(120, 120, 120));
+
+    const QPen prevPen = painter->pen();
+    painter->setPen(dkgray);
+    Range VisRange = GetVisibleRange();
+    int nNumberTicks = 10;
+    if (GetTickDisplayMode() == eTVTickMode_InFrames)
+    {
+        nNumberTicks = 8;
+    }
+
+    double start = TickSnap(timeRange.start);
+    double step = 1.0 / m_ticksStep;
+
+    for (double t = 0.0f; t <= timeRange.end + step; t += step)
+    {
+        double st = TickSnap(t);
+        if (st > timeRange.end)
+        {
+            st = timeRange.end;
+        }
+        if (st < VisRange.start)
+        {
+            continue;
+        }
+        if (st > VisRange.end)
+        {
+            break;
+        }
+        int x = TimeToClient(st);
+        if (x < 0)
+        {
+            continue;
+        }
+
+        int k = RoundFloatToInt(st * m_ticksStep);
+        if (k % nNumberTicks == 0)
+        {
+            if (st >= start)
+            {
+                painter->setPen(Qt::black);
+            }
+            else
+            {
+                painter->setPen(dkgray);
+            }
+
+            painter->drawLine(x, rc.bottom() - 1, x, rc.bottom() - 5);
+            painter->setPen(dkgray);
+        }
+        else
+        {
+            if (st >= start)
+            {
+                painter->setPen(dkgray);
+            }
+            else
+            {
+                painter->setPen(ltgray);
+            }
+            painter->drawLine(x, rc.bottom() - 1, x, rc.bottom() - 3);
+        }
+    }
+    painter->setPen(prevPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawTrack(CTrackViewTrack* pTrack, QPainter* painter, const QRect& trackRect)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    const QPen prevPen = painter->pen();
+    painter->setPen(QColor(120, 120, 120));
+    painter->drawLine(trackRect.bottomLeft(), trackRect.bottomRight());
+    painter->setPen(prevPen);
+
+    QRect rcInner = trackRect;
+    rcInner.setLeft(max(trackRect.left(), m_leftOffset - m_scrollOffset.x()));
+    rcInner.setRight(min(trackRect.right(), (m_scrollMax + m_scrollMin) - m_scrollOffset.x() + m_leftOffset * 2));
+
+    bool bLightAnimationSetActive = pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet;
+    if (bLightAnimationSetActive && pTrack->GetKeyCount() > 0)
+    {
+        // In the case of the light animation set, the time of of the last key
+        // determines the end of the track.
+        float lastKeyTime = pTrack->GetKey(pTrack->GetKeyCount() - 1).GetTime();
+        rcInner.setRight(min(rcInner.right(), TimeToClient(lastKeyTime)));
+    }
+
+    QRect rcInnerDraw(QPoint(rcInner.left() - 6, rcInner.top()), QPoint(rcInner.right() + 6, rcInner.bottom()));
+    QColor trackColor = CTVCustomizeTrackColorsDlg::GetTrackColor(pTrack->GetParameterType());
+    if (pTrack->HasCustomColor())
+    {
+        ColorB customColor = pTrack->GetCustomColor();
+        trackColor = QColor(customColor.r, customColor.g, customColor.b);
+    }
+    // For the case of tracks belonging to an inactive director node,
+    // changes the track color to a custom one.
+    const QColor colorForDisabled = CTVCustomizeTrackColorsDlg::GetColorForDisabledTracks();
+    const QColor colorForMuted = CTVCustomizeTrackColorsDlg::GetColorForMutedTracks();
+
+    CTrackViewAnimNode* pDirectorNode = pTrack->GetDirector();
+    if (!pDirectorNode->IsActiveDirector())
+    {
+        trackColor = colorForDisabled;
+    }
+
+    // A disabled/muted track or any track in a disabled node also uses a custom color.
+    CTrackViewAnimNode* animNode = pTrack->GetAnimNode();
+    bool bTrackDisabled = pTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled;
+    bool bTrackMuted = pTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Muted;
+    bool bTrackInvalid = !pTrack->IsSubTrack() && !animNode->IsParamValid(pTrack->GetParameterType());
+    bool bTrackInDisabledNode = animNode->AreFlagsSetOnNodeOrAnyParent(eAnimNodeFlags_Disabled);
+    if (bTrackDisabled || bTrackInDisabledNode || bTrackInvalid)
+    {
+        trackColor = colorForDisabled;
+    }
+    else if (bTrackMuted)
+    {
+        trackColor = colorForMuted;
+    }
+    const QRect rc = rcInnerDraw.adjusted(0, 1, 0, 0);
+
+    const EAnimCurveType trackType = pTrack->GetCurveType();
+    if (trackType == eAnimCurveType_TCBFloat || trackType == eAnimCurveType_TCBQuat || trackType == eAnimCurveType_TCBVector)
+    {
+        trackColor = QColor(245, 80, 70);
+    }
+
+    if (pTrack->IsSelected())
+    {
+        QLinearGradient gradient(rc.topLeft(), rc.bottomLeft());
+        gradient.setColorAt(0, trackColor);
+        gradient.setColorAt(1, QColor(trackColor.red() / 2, trackColor.green() / 2, trackColor.blue() / 2));
+        painter->fillRect(rc, gradient);
+    }
+    else if (pTrack->GetValueType() == AnimValueType::RGB && pTrack->GetKeyCount() > 0)
+    {
+        DrawColorGradient(painter, rc, pTrack);
+    }
+    else
+    {
+        painter->fillRect(rc, trackColor);
+    }
+
+    // Left outside
+    QRect rcOutside = trackRect;
+    rcOutside.setRight(rcInnerDraw.left() - 1);
+    rcOutside.adjust(1, 1, -1, 0);
+
+    QLinearGradient gradient(rcOutside.topLeft(), rcOutside.bottomLeft());
+    gradient.setColorAt(0, QColor(210, 210, 210));
+    gradient.setColorAt(1, QColor(180, 180, 180));
+    painter->fillRect(rcOutside, gradient);
+
+    // Right outside.
+    rcOutside = trackRect;
+    rcOutside.setLeft(rcInnerDraw.right() + 1);
+    rcOutside.adjust(1, 1, -1, 0);
+
+    gradient = QLinearGradient(rcOutside.topLeft(), rcOutside.bottomLeft());
+    gradient.setColorAt(0, QColor(210, 210, 210));
+    gradient.setColorAt(1, QColor(180, 180, 180));
+    painter->fillRect(rcOutside, gradient);
+
+    // Get time range of update rectangle.
+    Range timeRange = GetTimeRange(trackRect);
+
+    // Draw tick marks in time range.
+    DrawTicks(painter, rcInner, timeRange);
+
+    // Draw special track features
+    AnimValueType trackValueType = pTrack->GetValueType();
+    CAnimParamType trackParamType = pTrack->GetParameterType();
+
+    if (trackValueType == AnimValueType::Bool)
+    {
+        // If this track is bool Track draw bars where track is true
+        DrawBoolTrack(timeRange, painter, pTrack, rc);
+    }
+    else if (trackValueType == AnimValueType::Select)
+    {
+        // If this track is Select Track draw bars to show where selection is active.
+        DrawSelectTrack(timeRange, painter, pTrack, rc);
+    }
+    else if (trackParamType == AnimParamType::Sequence)
+    {
+        // If this track is Sequence Track draw bars to show where sequence is active.
+        DrawSequenceTrack(timeRange, painter, pTrack, rc);
+    }
+    else if (trackParamType == AnimParamType::Goto)
+    {
+        // if this track is GoTo Track, draw an arrow to indicate jump position.
+        DrawGoToTrackArrow(pTrack, painter, rc);
+    }
+
+    // Draw keys in time range.
+    DrawKeys(pTrack, painter, rcInner, timeRange);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
+{
+    const QBrush prevBrush = painter->brush();
+    painter->setBrush(m_selectTrackBrush);
+
+    const int numKeys = pTrack->GetKeyCount();
+    for (int i = 0; i < numKeys; ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        ISelectKey selectKey;
+        keyHandle.GetKey(&selectKey);
+
+        if (!selectKey.szSelection.empty() || selectKey.cameraAzEntityId.IsValid())
+        {
+            float time = keyHandle.GetTime();
+            float nextTime = timeRange.end;
+            if (i < numKeys - 1)
+            {
+                nextTime = pTrack->GetKey(i + 1).GetTime();
+            }
+
+            time = clamp_tpl(time, timeRange.start, timeRange.end);
+            nextTime = clamp_tpl(nextTime, timeRange.start, timeRange.end);
+
+            int x0_2 = TimeToClient(time);
+
+            float fBlendTime = selectKey.fBlendTime;
+            int blendTimeEnd = 0;
+
+            if (fBlendTime > 0.0f && fBlendTime < (nextTime - time))
+            {
+                blendTimeEnd = TimeToClient(nextTime);
+                nextTime -= fBlendTime;
+            }
+
+            int x = TimeToClient(nextTime);
+
+            if (x != x0_2)
+            {
+                QLinearGradient gradient(x0_2, rc.top() + 1, x0_2, rc.bottom());
+                gradient.setColorAt(0, Qt::white);
+                gradient.setColorAt(1, QColor(100, 190, 255));
+                painter->fillRect(QRect(QPoint(x0_2, rc.top() + 1), QPoint(x, rc.bottom())), gradient);
+            }
+
+            if (fBlendTime > 0.0f)
+            {
+                QLinearGradient gradient(x, rc.top() + 1, x, rc.bottom());
+                gradient.setColorAt(0, Qt::white);
+                gradient.setColorAt(1, QColor(0, 115, 230));
+                painter->fillRect(QRect(QPoint(x, rc.top() + 1), QPoint(blendTimeEnd, rc.bottom())), gradient);
+            }
+        }
+    }
+    painter->setBrush(prevBrush);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
+{
+    int x0 = TimeToClient(timeRange.start);
+    float t0 = timeRange.start;
+    QRect trackRect;
+
+    const QBrush prevBrush = painter->brush();
+    painter->setBrush(m_visibilityBrush);
+
+    const int numKeys = pTrack->GetKeyCount();
+    for (int i = 0; i < numKeys; ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        const float time = keyHandle.GetTime();
+        if (time < timeRange.start)
+        {
+            continue;
+        }
+        if (time > timeRange.end)
+        {
+            break;
+        }
+
+        int x = TimeToClient(time);
+        bool val = false;
+        pTrack->GetValue(time - 0.001f, val);
+        if (val)
+        {
+            QLinearGradient gradient(x0, rc.top() + 4, x0, rc.bottom() - 4);
+            gradient.setColorAt(0, QColor(250, 250, 250));
+            gradient.setColorAt(1, QColor(0, 80, 255));
+            painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient);
+        }
+
+        t0 = time;
+        x0 = x;
+    }
+    int x = TimeToClient(timeRange.end);
+    bool val = false;
+    pTrack->GetValue(timeRange.end - 0.001f, val);
+    if (val)
+    {
+        QLinearGradient gradient(x0, rc.top() + 4, x0, rc.bottom() - 4);
+        gradient.setColorAt(0, QColor(250, 250, 250));
+        gradient.setColorAt(1, QColor(0, 80, 255));
+        painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient);
+    }
+    painter->setBrush(prevBrush);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawSequenceTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
+{
+    const QBrush prevBrush = painter->brush();
+    painter->setBrush(m_selectTrackBrush);
+
+    const int numKeys = pTrack->GetKeyCount();
+    for (int i = 0; i < numKeys - 1; ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        ISequenceKey sequenceKey;
+        keyHandle.GetKey(&sequenceKey);
+        if (sequenceKey.sequenceEntityId.IsValid())
+        {
+            float time = keyHandle.GetTime();
+            float nextTime = timeRange.end;
+            if (i < numKeys - 1)
+            {
+                nextTime = pTrack->GetKey(i + 1).GetTime();
+            }
+            time = clamp_tpl(time, timeRange.start, timeRange.end);
+            nextTime = clamp_tpl(nextTime, timeRange.start, timeRange.end);
+
+            int x0_2 = TimeToClient(time);
+            int x = TimeToClient(nextTime);
+
+            if (x != x0_2)
+            {
+                const QColor startColour(100, 190, 255);
+                const QColor endColour(250, 250, 250);
+                QLinearGradient gradient(x0_2, rc.top() + 1, x0_2, rc.bottom());
+                gradient.setColorAt(0, startColour);
+                gradient.setColorAt(1, endColour);
+                painter->fillRect(QRect(QPoint(x0_2, rc.top() + 1), QPoint(x, rc.bottom())), gradient);
+            }
+        }
+    }
+    painter->setBrush(prevBrush);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewDopeSheetBase::CompareKeyHandleByTime(const CTrackViewKeyHandle &a, const CTrackViewKeyHandle &b)
+{
+    return a.GetTime() < b.GetTime();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawKeys(CTrackViewTrack* pTrack, QPainter* painter, QRect& rect, [[maybe_unused]] Range& timeRange)
+{
+    int numKeys = pTrack->GetKeyCount();
+
+    const QFont prevFont = painter->font();
+    painter->setFont(m_descriptionFont);
+
+    painter->setPen(KEY_TEXT_COLOR);
+
+    int prevKeyPixel = -10000;
+    const int kDefaultWidthForDescription = 200;
+    const int kSmallMargin = 10;
+
+    AZStd::vector<CTrackViewKeyHandle> sortedKeys;
+    sortedKeys.reserve(numKeys);
+    for (int i = 0; i < numKeys; ++i)
+    {
+        sortedKeys.push_back(pTrack->GetKey(i));
+    }
+    AZStd::sort(sortedKeys.begin(), sortedKeys.end(), CompareKeyHandleByTime);
+
+    // Draw keys.
+    for (int i = 0; i < numKeys; ++i)
+    {
+        CTrackViewKeyHandle keyHandle = sortedKeys[i];
+
+        const float time = keyHandle.GetTime();
+        int x = TimeToClient(time);
+        if (x - kSmallMargin > rect.right())
+        {
+            continue;
+        }
+
+        int x1 = x + kDefaultWidthForDescription;
+        CTrackViewKeyHandle nextKey = keyHandle.GetNextKey();
+
+        int nextKeyIndex = i + 1;
+
+        // Skip over next keys that have the same time as the current key.
+        // If they have the same time it means they are keys from sub tracks
+        // in a compound track at the same time.
+        while (nextKeyIndex < numKeys && AZ::IsClose(sortedKeys[nextKeyIndex].GetTime(), time, AZ::Constants::FloatEpsilon))
+        {
+            nextKeyIndex++;
+        }
+
+        if (nextKeyIndex < numKeys)
+        {
+            CTrackViewKeyHandle nextKey2 = sortedKeys[nextKeyIndex];
+            x1 = TimeToClient(nextKey2.GetTime()) - kSmallMargin;
+        }
+
+        if (x1 > x + kSmallMargin)  // Enough space for description text or duration bar
+        {
+            // Get info about that key.
+            const char* pDescription = keyHandle.GetDescription();
+            const float duration = keyHandle.GetDuration();
+
+            int xlast = x;
+            if (duration > 0)
+            {
+                xlast = TimeToClient(time + duration);
+            }
+            if (xlast + kSmallMargin < rect.left())
+            {
+                continue;
+            }
+
+            if (duration > 0)
+            {
+                DrawKeyDuration(pTrack, painter, rect, i);
+            }
+
+            if (pDescription && pDescription[0] != 0)
+            {
+                char keydesc[1024];
+                bool bSelectedAndBeingMoved = m_mouseMode == eTVMouseMode_Move && keyHandle.IsSelected();
+                if (bSelectedAndBeingMoved)
+                {
+                    // Show its time or frame number additionally.
+                    if (GetTickDisplayMode() == eTVTickMode_InSeconds)
+                    {
+                        sprintf_s(keydesc, "%.3f, {", time);
+                    }
+                    else
+                    {
+                        sprintf_s(keydesc, "%d, {", ftoi(time / m_snapFrameTime));
+                    }
+                }
+                else
+                {
+                    cry_strcpy(keydesc, "{");
+                }
+                cry_strcat(keydesc, pDescription);
+                cry_strcat(keydesc, "}");
+                // Draw key description text.
+                // Find next key.
+                const QRect textRect(QPoint(x + 10, rect.top()), QPoint(x1, rect.bottom()));
+                painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, painter->fontMetrics().elidedText(keydesc, Qt::ElideRight, textRect.width()));
+            }
+        }
+
+        if (x < 0)
+        {
+            continue;
+        }
+
+        if (pTrack->GetChildCount() == 0 // At compound tracks, keys are all green.
+            && abs(x - prevKeyPixel) < 2)
+        {
+            // If multiple keys on the same time.
+            painter->drawPixmap(QPoint(x - 6, rect.top() + 2), QPixmap(":/Trackview/trackview_keys_02.png"));
+        }
+        else
+        {
+            if (keyHandle.IsSelected())
+            {
+                painter->drawPixmap(QPoint(x - 6, rect.top() + 2), QPixmap(":/Trackview/trackview_keys_01.png"));
+            }
+            else
+            {
+                painter->drawPixmap(QPoint(x - 6, rect.top() + 2), QPixmap(":/Trackview/trackview_keys_00.png"));
+            }
+        }
+
+        prevKeyPixel = x;
+    }
+    painter->setFont(prevFont);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawClipboardKeys(QPainter* painter, [[maybe_unused]] const QRect& rc)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    const float timeOffset = ComputeSnappedMoveOffset();
+
+    // Get node & track under cursor
+    CTrackViewAnimNode* animNode = GetAnimNodeFromPoint(m_mouseOverPos);
+    CTrackViewTrack* pTrack = GetTrackFromPoint(m_mouseOverPos);
+
+    auto matchedLocations = pSequence->GetMatchedPasteLocations(m_clipboardKeys, animNode, pTrack);
+
+    for (size_t i = 0; i < matchedLocations.size(); ++i)
+    {
+        auto& matchedLocation = matchedLocations[i];
+        CTrackViewTrack* pMatchedTrack = matchedLocation.first;
+        XmlNodeRef trackNode = matchedLocation.second;
+
+        if (pMatchedTrack->IsCompoundTrack())
+        {
+            // Both child counts should be the same, but make sure
+            const unsigned int numSubTrack = std::min(pMatchedTrack->GetChildCount(), (unsigned int)trackNode->getChildCount());
+
+            for (unsigned int subTrackIndex = 0; subTrackIndex < numSubTrack; ++subTrackIndex)
+            {
+                CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pMatchedTrack->GetChild(subTrackIndex));
+                XmlNodeRef subTrackNode = trackNode->getChild(subTrackIndex);
+                DrawTrackClipboardKeys(painter, pSubTrack, subTrackNode, timeOffset);
+
+                // Also draw to parent track. This is intentional
+                DrawTrackClipboardKeys(painter, pMatchedTrack, subTrackNode, timeOffset);
+            }
+        }
+        else
+        {
+            DrawTrackClipboardKeys(painter, pMatchedTrack, trackNode, timeOffset);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawTrackClipboardKeys(QPainter* painter, CTrackViewTrack* pTrack, XmlNodeRef trackNode, const float timeOffset)
+{
+    const QPen prevPen = painter->pen();
+    painter->setPen(Qt::green);
+
+    const QRect trackRect = GetNodeRect(pTrack);
+    const int numKeysToPaste = trackNode->getChildCount();
+
+    for (int i = 0; i < numKeysToPaste; ++i)
+    {
+        XmlNodeRef keyNode = trackNode->getChild(i);
+
+        float time;
+        if (keyNode->getAttr("time", time))
+        {
+            int x = TimeToClient(time + timeOffset);
+            painter->drawPixmap(QPoint(x - 6, trackRect.top() + 2), QPixmap(":/Trackview/trackview_keys_03.png"));
+            painter->drawLine(x, m_rcClient.top(), x, m_rcClient.bottom());
+        }
+    }
+
+    painter->setPen(prevPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewDopeSheetBase::FirstKeyFromPoint(const QPoint& point)
+{
+    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
+    if (!pTrack)
+    {
+        return CTrackViewKeyHandle();
+    }
+
+    float t1 = TimeFromPointUnsnapped(QPoint(point.x() - 4, point.y()));
+    float t2 = TimeFromPointUnsnapped(QPoint(point.x() + 4, point.y()));
+
+    int numKeys = pTrack->GetKeyCount();
+    for (int i = 0; i < numKeys; ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        float time = keyHandle.GetTime();
+        if (time >= t1 && time <= t2)
+        {
+            return keyHandle;
+        }
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewDopeSheetBase::DurationKeyFromPoint(const QPoint& point)
+{
+    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
+    if (!pTrack)
+    {
+        return CTrackViewKeyHandle();
+    }
+
+    float t = TimeFromPointUnsnapped(point);
+
+    int numKeys = pTrack->GetKeyCount();
+    // Iterate in a reverse order to prioritize later nodes.
+    for (int i = numKeys - 1; i >= 0; --i)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        const float time = keyHandle.GetTime();
+        const float duration = keyHandle.GetDuration();
+
+        if (t >= time && t <= time + duration)
+        {
+            return keyHandle;
+        }
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewDopeSheetBase::CheckCursorOnStartEndTimeAdjustBar(const QPoint& point, bool& bStart)
+{
+    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
+
+    if (!pTrack || (pTrack->GetParameterType() != AnimParamType::Animation &&
+                    pTrack->GetParameterType() != AnimParamType::TimeRanges && 
+                    pTrack->GetValueType() != AnimValueType::CharacterAnim &&
+                    pTrack->GetValueType() != AnimValueType::AssetBlend))
+    {
+        return CTrackViewKeyHandle();
+    }
+
+    int numKeys = pTrack->GetKeyCount();
+    for (int i = 0; i < numKeys; ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        if (!keyHandle.IsSelected())
+        {
+            continue;
+        }
+
+        const float time = keyHandle.GetTime();
+        const float duration = keyHandle.GetDuration();
+
+        if (duration == 0)
+        {
+            continue;
+        }
+
+        // TODO: Refactor this Time Range Key stuff.
+        ICharacterKey characterKey;
+        AZ::IAssetBlendKey assetBlendKey;
+        ITimeRangeKey* timeRangeKey = nullptr;
+
+        if (pTrack->GetValueType() == AnimValueType::AssetBlend)
+        {
+            keyHandle.GetKey(&assetBlendKey);
+            timeRangeKey = &assetBlendKey;
+        }
+        else
+        {
+            // This will work for both character & time range keys because
+            // ICharacterKey is derived from ITimeRangeKey. Not the most beautiful code.
+            keyHandle.GetKey(&characterKey);
+            timeRangeKey = &characterKey;
+        }
+
+        int stime = TimeToClient(time);
+        int etime = TimeToClient(time + AZStd::min(timeRangeKey->GetValidEndTime(), timeRangeKey->m_duration));
+
+        if (point.x() >= stime - 3 && point.x() <= stime)
+        {
+            bStart = true;
+            return keyHandle;
+        }
+        else if (point.x() >= etime && point.x() <= etime + 3)
+        {
+            bStart = false;
+            return keyHandle;
+        }
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewDopeSheetBase::NumKeysFromPoint(const QPoint& point)
+{
+    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
+    if (!pTrack)
+    {
+        return -1;
+    }
+
+    float t1 = TimeFromPointUnsnapped(QPoint(point.x() - 4, point.y()));
+    float t2 = TimeFromPointUnsnapped(QPoint(point.x() + 4, point.y()));
+
+    int count = 0;
+    int numKeys = pTrack->GetKeyCount();
+    for (int i = 0; i < numKeys; ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        const float time = keyHandle.GetTime();
+        if (time >= t1 && time <= t2)
+        {
+            ++count;
+        }
+    }
+    return count;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SelectKeys(const QRect& rc, const bool bMultiSelection)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    AZ_Assert(sequence != nullptr, "sequence should never be nullptr here");
+
+    if (!sequence)
+    {
+        return;
+    }
+
+    AzToolsFramework::ScopedUndoBatch undoBatch("Select Keys");
+
+    const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
+
+    CTrackViewSequenceNotificationContext context(sequence);
+    if (!bMultiSelection)
+    {
+        sequence->DeselectAllKeys();
+    }
+
+    // put selection rectangle from client to track space.
+    const QRect rci = rc.translated(m_scrollOffset);
+
+    Range selTime = GetTimeRange(rci);
+
+    CTrackViewTrackBundle tracks = sequence->GetAllTracks();
+
+    // note the tracks to select for the keyHandles selected
+    CTrackViewTrackBundle tracksToSelect;
+
+    for (int i = 0; i < tracks.GetCount(); ++i)
+    {
+        CTrackViewTrack* pTrack = tracks.GetTrack(i);
+
+        QRect trackRect = GetNodeRect(pTrack);
+        // Decrease item rectangle a bit.
+        trackRect.adjust(4, 4, -4, -4);
+        // Check if item rectangle intersects with selection rectangle in y axis.
+        if ((trackRect.top() >= rc.top() && trackRect.top() <= rc.bottom()) ||
+            (trackRect.bottom() >= rc.top() && trackRect.bottom() <= rc.bottom()) ||
+            (rc.top() >= trackRect.top() && rc.top() <= trackRect.bottom()) ||
+            (rc.bottom() >= trackRect.top() && rc.bottom() <= trackRect.bottom()))
+        {
+            // Check which keys we intersect.
+            for (int j = 0; j < pTrack->GetKeyCount(); j++)
+            {
+                CTrackViewKeyHandle keyHandle = pTrack->GetKey(j);
+
+                const float time = keyHandle.GetTime();
+                if (selTime.IsInside(time))
+                {
+                    keyHandle.Select(true);
+                    tracksToSelect.AppendTrack(pTrack);
+                }
+            }
+        }
+    }
+
+    ChangeSequenceTrackSelection(sequence, tracksToSelect, bMultiSelection);
+
+    const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
+
+    if (beforeKeyState != afterKeyState)
+    {
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetTickDisplayMode(ETVTickMode mode)
+{
+    m_tickDisplayMode = mode;
+    SetTimeScale(GetTimeScale(), 0); // for refresh
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::SetSnapFPS(UINT fps)
+{
+    m_snapFrameTime = (fps == 0) ? 0.033333f : (1.0f / float(fps));
+}
+
+//////////////////////////////////////////////////////////////////////////
+ESnappingMode CTrackViewDopeSheetBase::GetKeyModifiedSnappingMode()
+{
+    ESnappingMode snappingMode = m_snappingMode;
+
+    if (qApp->keyboardModifiers() & Qt::ControlModifier)
+    {
+        snappingMode = eSnappingMode_SnapNone;
+    }
+    else if (qApp->keyboardModifiers() & Qt::ShiftModifier)
+    {
+        snappingMode = eSnappingMode_SnapMagnet;
+    }
+    else if (qApp->keyboardModifiers() & Qt::AltModifier)
+    {
+        snappingMode = eSnappingMode_SnapFrame;
+    }
+
+    return snappingMode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawSelectedKeyIndicators(QPainter* painter)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    const QPen prevPen = painter->pen();
+    painter->setPen(Qt::green);
+
+    CTrackViewKeyBundle keys = pSequence->GetSelectedKeys();
+    for (int i = 0; i < keys.GetKeyCount(); ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = keys.GetKey(i);
+        int x = TimeToClient(keyHandle.GetTime());
+        painter->drawLine(x, m_rcClient.top(), x, m_rcClient.bottom());
+    }
+
+    painter->setPen(prevPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::ComputeFrameSteps(const Range& visRange)
+{
+    float fNbFrames = fabsf ((visRange.end - visRange.start) / m_snapFrameTime);
+    float afStepTable [4] = { 1.0f, 0.5f, 0.2f, 0.1f };
+    bool bDone = false;
+    float fFact = 1.0f;
+    unsigned int nStepIdx = 0;
+    for (unsigned int nAttempts = 0; nAttempts < 10 && !bDone; ++nAttempts)
+    {
+        bool bLess = true;
+        for (nStepIdx = 0; nStepIdx < 4; ++nStepIdx)
+        {
+            float fFactNbFrames = fNbFrames / (afStepTable[nStepIdx] * fFact);
+            if (fFactNbFrames >= 3 && fFactNbFrames <= 9)
+            {
+                bDone = true;
+                break;
+            }
+            else
+            {
+                bLess = (fFactNbFrames < 3);
+            }
+        }
+        if (!bDone)
+        {
+            fFact *= (bLess) ? 0.1f : 10.0f;
+        }
+    }
+
+    float nBIntermediateTicks = 5;
+    m_fFrameLabelStep = fFact * afStepTable[nStepIdx];
+
+    if (TimeToClient(m_fFrameLabelStep) - TimeToClient(0) > 1300)
+    {
+        nBIntermediateTicks = 10;
+    }
+
+    m_fFrameTickStep = m_fFrameLabelStep * double (m_snapFrameTime) / double(nBIntermediateTicks);
+}
+
+
+void CTrackViewDopeSheetBase::DrawTimeLineInFrames(QPainter* painter, const QRect& rc, [[maybe_unused]] const QColor& lineCol, const QColor& textCol, [[maybe_unused]] double step)
+{
+    float fFramesPerSec = 1.0f / m_snapFrameTime;
+    float fInvFrameLabelStep = 1.0f / m_fFrameLabelStep;
+    Range VisRange = GetVisibleRange();
+
+    const Range& timeRange = m_timeRange;
+
+    const QPen ltgray(QColor(90, 90, 90));
+    const QPen black(textCol);
+
+    for (double t = TickSnap(timeRange.start); t <= timeRange.end + m_fFrameTickStep; t += m_fFrameTickStep)
+    {
+        double st = t;
+        if (st > timeRange.end)
+        {
+            st = timeRange.end;
+        }
+        if (st < VisRange.start)
+        {
+            continue;
+        }
+        if (st > VisRange.end)
+        {
+            break;
+        }
+        if (st < m_timeRange.start || st > m_timeRange.end)
+        {
+            continue;
+        }
+        const int x = TimeToClient(st);
+
+        float fFrame = st * fFramesPerSec;
+        float fFrameScaled = fFrame * fInvFrameLabelStep;
+        if (fabsf(fFrameScaled - RoundFloatToInt(fFrameScaled)) < 0.001f)
+        {
+            painter->setPen(black);
+            painter->drawLine(x, rc.bottom() - 2, x, rc.bottom() - 14);
+            painter->drawText(x + 2, rc.top(), QString::number(fFrame));
+            painter->setPen(ltgray);
+        }
+        else
+        {
+            painter->drawLine(x, rc.bottom() - 2, x, rc.bottom() - 6);
+        }
+    }
+}
+
+
+void CTrackViewDopeSheetBase::DrawTimeLineInSeconds(QPainter* painter, const QRect& rc, [[maybe_unused]] const QColor& lineCol, const QColor& textCol, double step)
+{
+    Range VisRange = GetVisibleRange();
+    const Range& timeRange = m_timeRange;
+    int nNumberTicks = 10;
+
+    const QPen ltgray(QColor(90, 90, 90));
+    const QPen black(textCol);
+
+    for (double t = TickSnap(timeRange.start); t <= timeRange.end + step; t += step)
+    {
+        double st = TickSnap(t);
+        if (st > timeRange.end)
+        {
+            st = timeRange.end;
+        }
+        if (st < VisRange.start)
+        {
+            continue;
+        }
+        if (st > VisRange.end)
+        {
+            break;
+        }
+        if (st < m_timeRange.start || st > m_timeRange.end)
+        {
+            continue;
+        }
+        int x = TimeToClient(st);
+
+        int k = RoundFloatToInt(st * m_ticksStep);
+        if (k % nNumberTicks == 0)
+        {
+            painter->setPen(black);
+            painter->drawLine(x, rc.bottom() - 2, x, rc.bottom() - 14);
+            painter->drawText(x + 2, rc.top(), QString::number(st));
+            painter->setPen(ltgray);
+        }
+        else
+        {
+            painter->drawLine(x, rc.bottom() - 2, x, rc.bottom() - 6);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawTimeline(QPainter* painter, const QRect& rcUpdate)
+{
+    bool recording = GetIEditor()->GetAnimation()->IsRecording();
+
+    QColor lineCol(255, 0, 255);
+    const QColor textCol(Qt::black);
+    const QColor dkgrayCol(90, 90, 90);
+    const QColor ltgrayCol(150, 150, 150);
+
+    if (recording)
+    {
+        lineCol = Qt::red;
+    }
+
+    // Draw vertical line showing current time.
+    {
+        int x = TimeToClient(m_currentTime);
+        if (x > m_rcClient.left() && x < m_rcClient.right())
+        {
+            const QPen prevPen = painter->pen();
+            painter->setPen(lineCol);
+            painter->drawLine(x, 0, x, m_rcClient.bottom());
+            painter->setPen(prevPen);
+        }
+    }
+
+    const QRect rc = m_rcTimeline;
+    if (!rc.intersects(rcUpdate))
+    {
+        return;
+    }
+
+    QLinearGradient gradient(rc.topLeft(), rc.bottomLeft());
+    gradient.setColorAt(0, QColor(250, 250, 250));
+    gradient.setColorAt(1, QColor(180, 180, 180));
+    painter->fillRect(rc, gradient);
+
+    const QPen prevPen = painter->pen();
+    const QPen dkgray(dkgrayCol);
+    const QPen ltgray(ltgrayCol);
+    const QPen black(textCol);
+    const QPen redpen(lineCol);
+    // Draw time ticks every tick step seconds.
+
+    painter->setPen(dkgray);
+
+    double step = 1.0 / double(m_ticksStep);
+    if (GetTickDisplayMode() == eTVTickMode_InFrames)
+    {
+        DrawTimeLineInFrames(painter, rc, lineCol, textCol, step);
+    }
+    else if (GetTickDisplayMode() == eTVTickMode_InSeconds)
+    {
+        DrawTimeLineInSeconds(painter, rc, lineCol, textCol, step);
+    }
+    else
+    {
+        assert (0);
+    }
+
+    // Draw time markers.
+    int x;
+
+    x = TimeToClient(m_timeMarked.start);
+    painter->drawPixmap(QPoint(x, m_rcTimeline.bottom() - 9), QPixmap(":/Trackview/marker/bmp00016_01.png"));
+    x = TimeToClient(m_timeMarked.end);
+    painter->drawPixmap(QPoint(x - 7, m_rcTimeline.bottom() - 9), QPixmap(":/Trackview/marker/bmp00016_00.png"));
+
+    painter->setPen(redpen);
+    x = TimeToClient(m_currentTime);
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(QRect(QPoint(x - 3, rc.top()), QPoint(x + 3, rc.bottom())));
+
+    painter->setPen(redpen);
+    painter->drawLine(x, rc.top(), x, rc.bottom());
+
+    painter->setPen(prevPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawSummary(QPainter* painter, const QRect& rcUpdate)
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    const QColor lineCol = Qt::black;
+    const QColor fillCol(150, 100, 220);
+
+    const QRect rc = m_rcSummary;
+    if (!rc.intersects(rcUpdate))
+    {
+        return;
+    }
+
+    painter->fillRect(rc, fillCol);
+
+    const QPen prevPen = painter->pen();
+    painter->setPen(QPen(lineCol, 3));
+    Range timeRange = m_timeRange;
+
+    // Draw a short thick line at each place where there is a key in any tracks.
+    CTrackViewKeyBundle keys = pSequence->GetAllKeys();
+    for (int i = 0; i < keys.GetKeyCount(); ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = keys.GetKey(i);
+        int x = TimeToClient(keyHandle.GetTime());
+        painter->drawLine(x, rc.bottom() - 2, x, rc.top() + 2);
+    }
+
+    painter->setPen(prevPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawNodeTrack(CTrackViewAnimNode* animNode, QPainter* painter, const QRect& trackRect)
+{
+    const QFont prevFont = painter->font();
+    painter->setFont(m_descriptionFont);
+
+    CTrackViewAnimNode* pDirectorNode = animNode->GetDirector();
+
+    if (pDirectorNode->GetNodeType() != eTVNT_Sequence && !pDirectorNode->IsActiveDirector())
+    {
+        painter->setPen(INACTIVE_TEXT_COLOR);
+    }
+    else
+    {
+        painter->setPen(KEY_TEXT_COLOR);
+    }
+
+    const QRect textRect = trackRect.adjusted(4, 0, -4, 0);
+
+    QString sAnimNodeName = animNode->GetName();
+    const bool hasObsoleteTrack = animNode->HasObsoleteTrack();
+
+    if (hasObsoleteTrack)
+    {
+        painter->setPen(QColor(245, 80, 70));
+        sAnimNodeName += tr(": Some of the sub-tracks contains obsoleted TCB splines (marked in red), thus cannot be copied or pasted.");
+    }
+
+    painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, painter->fontMetrics().elidedText(sAnimNodeName, Qt::ElideRight, textRect.width()));
+
+    painter->setFont(prevFont);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawGoToTrackArrow(CTrackViewTrack* pTrack, QPainter* painter, const QRect& rc)
+{
+    int numKeys = pTrack->GetKeyCount();
+    const QColor colorLine(150, 150, 150);
+    const QColor colorHeader(50, 50, 50);
+    const int tickness = 2;
+    const int halfMargin = (rc.height() - tickness) / 2;
+
+    for (int i = 0; i < numKeys; ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+        IDiscreteFloatKey discreteFloatKey;
+        keyHandle.GetKey(&discreteFloatKey);
+
+        int arrowStart = TimeToClient(discreteFloatKey.time);
+        int arrowEnd = TimeToClient(discreteFloatKey.m_fValue);
+
+        if (discreteFloatKey.m_fValue < 0.f)
+        {
+            continue;
+        }
+
+        // draw arrow body line
+        if (arrowStart < arrowEnd)
+        {
+            painter->fillRect(QRect(QPoint(arrowStart, rc.top() + halfMargin), QPoint(arrowEnd, rc.bottom() - halfMargin)), colorLine);
+        }
+        else if (arrowStart > arrowEnd)
+        {
+            painter->fillRect(QRect(QPoint(arrowEnd, rc.top() + halfMargin), QPoint(arrowStart, rc.bottom() - halfMargin)), colorLine);
+        }
+
+        // draw arrow head
+        if (arrowStart != arrowEnd)
+        {
+            painter->fillRect(QRect(QPoint(arrowEnd, rc.top() + 2), QPoint(arrowEnd + 1, rc.bottom() - 2)), colorHeader);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawKeyDuration(CTrackViewTrack* pTrack, QPainter* painter, const QRect& rc, int keyIndex)
+{
+    const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(keyIndex);
+
+    const float time = keyHandle.GetTime();
+    const float duration = keyHandle.GetDuration();
+
+    int x = TimeToClient(time);
+
+    // Draw key duration.
+    float endt = min(time + duration, m_timeRange.end);
+    int x1 = TimeToClient(endt);
+    if (x1 < 0)
+    {
+        if (x > 0)
+        {
+            x1 = rc.right();
+        }
+    }
+    const QBrush prevBrush = painter->brush();
+    painter->setBrush(m_visibilityBrush);
+    QColor colorFrom(120, 120, 255);
+    if (pTrack->GetParameterType() == AnimParamType::Sound)    // If it is a sound key
+    {
+        ISoundKey soundKey;
+        keyHandle.GetKey(&soundKey);
+        colorFrom.setRgbF(soundKey.customColor.x, soundKey.customColor.y, soundKey.customColor.z);
+    }
+    QLinearGradient gradient(x, rc.top() + 3, x, rc.bottom() - 3);
+    gradient.setColorAt(0, colorFrom);
+    gradient.setColorAt(1, QColor(250, 250, 250));
+    const int width = x1 + 1 - x;
+    painter->fillRect(QRect(x, rc.top() + 3, width, rc.height() - 3), gradient);
+
+    painter->setBrush(prevBrush);
+    painter->drawLine(x1, rc.top(), x1, rc.bottom());
+
+    bool typeHasAnimBox = pTrack->GetParameterType() == AnimParamType::Animation ||
+        pTrack->GetParameterType() == AnimParamType::TimeRanges ||
+        pTrack->GetValueType() == AnimValueType::CharacterAnim ||
+        pTrack->GetValueType() == AnimValueType::AssetBlend;
+
+    // If it is a selected animation track, draw the whole animation box (in green)
+    // and two adjust bars (in red) for start/end time each, too.
+    if (keyHandle.IsSelected() && typeHasAnimBox)
+    {
+        // Draw the whole animation box.
+
+        // TODO: Refactor this Time Range Key stuff.
+        ICharacterKey characterKey;
+        AZ::IAssetBlendKey assetBlendKey;
+        ITimeRangeKey* timeRangeKey = nullptr;
+
+        if (pTrack->GetValueType() == AnimValueType::AssetBlend)
+        {
+            keyHandle.GetKey(&assetBlendKey);
+            timeRangeKey = &assetBlendKey;
+        }
+        else
+        {
+            // This will work for both character & time range keys because
+            // ICharacterKey is derived from ITimeRangeKey. Not the most beautiful code.
+            keyHandle.GetKey(&characterKey);
+            timeRangeKey = &characterKey;
+        }
+
+        int startX = TimeToClient(time - timeRangeKey->m_startTime / timeRangeKey->m_speed);
+        int endX = TimeToClient(time + (timeRangeKey->m_duration - timeRangeKey->m_startTime) / timeRangeKey->m_speed);
+        const QPen prevPen = painter->pen();
+        painter->setPen(Qt::green);
+        painter->drawLine(startX, rc.top(), endX, rc.top());
+        painter->drawLine(endX, rc.top(), endX, rc.bottom());
+        painter->drawLine(endX, rc.bottom(), startX, rc.bottom());
+        painter->drawLine(startX, rc.bottom(), startX, rc.top());
+
+        // Draw two adjust bars.
+        int durationX = TimeToClient(time + AZStd::min(timeRangeKey->GetValidEndTime(), timeRangeKey->m_duration));
+        painter->setPen(QPen(Qt::red, 3));
+        painter->drawLine(x - 2, rc.top(), x - 2, rc.bottom());
+        painter->drawLine(durationX + 2, rc.top(), durationX + 2, rc.bottom());
+        painter->setPen(prevPen);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::DrawColorGradient(QPainter* painter, const QRect& rc, const CTrackViewTrack* pTrack)
+{
+    const QPen pOldPen = painter->pen();
+    for (int x = rc.left(); x < rc.right(); ++x)
+    {
+        // This is really slow. Is there a better way?
+        Vec3 vColor(0, 0, 0);
+        pTrack->GetValue(TimeFromPointUnsnapped(QPoint(x, rc.top())), vColor);
+
+        painter->setPen(ColorLinearToGamma(vColor / 255.0f));
+        painter->drawLine(x, rc.top(), x, rc.bottom());
+    }
+    painter->setPen(pOldPen);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QRect CTrackViewDopeSheetBase::GetNodeRect(const CTrackViewNode* pNode) const
+{
+    CTrackViewNodesCtrl::CRecord* pRecord = m_pNodesCtrl->GetNodeRecord(pNode);
+
+    if (pRecord && pRecord->IsVisible())
+    {
+        QRect recordRect = pRecord->GetRect();
+        return QRect(0, recordRect.top(), m_rcClient.width(), recordRect.height());
+    }
+
+    return QRect();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewDopeSheetBase::StoreMementoForTracksWithSelectedKeys()
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
+
+    m_trackMementos.clear();
+
+    // Construct the set of tracks that have selected keys
+    std::set<CTrackViewTrack*> tracks;
+
+    const unsigned int numKeys = selectedKeys.GetKeyCount();
+    for (int keyIndex = 0; keyIndex < numKeys; ++keyIndex)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
+        tracks.insert(keyHandle.GetTrack());
+    }
+
+    // For each of those tracks store an undo object
+    for (auto iter = tracks.begin(); iter != tracks.end(); ++iter)
+    {
+        CTrackViewTrack* pTrack = *iter;
+
+        TrackMemento trackMemento;
+        trackMemento.m_memento = pTrack->GetMemento();
+
+        const unsigned int numKeys2 = pTrack->GetKeyCount();
+        for (unsigned int i = 0; i < numKeys2; ++i)
+        {
+            trackMemento.m_keySelectionStates.push_back(pTrack->GetKey(i).IsSelected());
+        }
+
+        m_trackMementos[pTrack] = trackMemento;
+    }
+}
diff --git a/Code/Editor/TrackView/TrackViewDopeSheetBase.h b/Code/Editor/TrackView/TrackViewDopeSheetBase.h
new file mode 100644
index 0000000000..3a5c414c45
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewDopeSheetBase.h
@@ -0,0 +1,352 @@
+/*
+ * 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_TRACKVIEW_TRACKVIEWDOPESHEETBASE_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDOPESHEETBASE_H
+#pragma once
+
+
+#include <IMovieSystem.h>
+#include "TrackViewNode.h"
+#include "TrackViewSequence.h"
+#include "AnimationContext.h"
+#include <QWidget>
+
+class CTVTrackPropsDialog;
+class CTrackViewNodesCtrl;
+class CTrackViewKeyPropertiesDlg;
+class CTrackViewNode;
+class CTrackViewTrack;
+class CTrackViewAnimNode;
+
+class QRubberBand;
+class QScrollBar;
+class ReflectedPropertyControl;
+
+namespace AZ
+{
+    class Color;
+}
+
+enum ETVActionMode
+{
+    eTVActionMode_MoveKey = 1,
+    eTVActionMode_AddKeys,
+    eTVActionMode_SlideKey,
+    eTVActionMode_ScaleKey,
+};
+
+enum ESnappingMode
+{
+    eSnappingMode_SnapNone = 0,
+    eSnappingMode_SnapTick,
+    eSnappingMode_SnapMagnet,
+    eSnappingMode_SnapFrame,
+};
+
+enum ETVTickMode
+{
+    eTVTickMode_InSeconds = 0,
+    eTVTickMode_InFrames,
+};
+
+/** TrackView DopeSheet interface
+*/
+class CTrackViewDopeSheetBase
+    : public QWidget
+    , public IAnimationContextListener
+    , public ITrackViewSequenceListener
+{
+public:
+    CTrackViewDopeSheetBase(QWidget* parent = 0);
+    virtual ~CTrackViewDopeSheetBase();
+
+    void SetNodesCtrl(CTrackViewNodesCtrl* pNodesCtrl) { m_pNodesCtrl = pNodesCtrl; }
+
+    void SetTimeScale(float timeScale, float fAnchorTime);
+    float GetTimeScale() { return m_timeScale; }
+
+    void SetScrollOffset(int hpos);
+
+    int GetScrollPos() const;
+
+    void SetTimeRange(float start, float end);
+    void SetStartMarker(float fTime);
+    void SetEndMarker(float fTime);
+
+    void SetMouseActionMode(ETVActionMode mode);
+
+    void SetKeyPropertiesDlg(CTrackViewKeyPropertiesDlg* dlg) { m_keyPropertiesDlg = dlg; }
+
+    void SetSnappingMode(ESnappingMode mode) { m_snappingMode = mode; }
+    ESnappingMode GetSnappingMode() const { return m_snappingMode; }
+    void SetSnapFPS(UINT fps);
+
+    ETVTickMode GetTickDisplayMode() const { return m_tickDisplayMode; }
+    void SetTickDisplayMode(ETVTickMode mode);
+
+    void SetEditLock(bool bLock) { m_bEditLock = bLock; }
+
+    // IAnimationContextListener
+    virtual void OnTimeChanged(float newTime) override;
+
+    float TickSnap(float time) const;
+
+protected:
+    void showEvent(QShowEvent* event) override;
+    void resizeEvent(QResizeEvent* event) override;
+    void wheelEvent(QWheelEvent* event) override;
+
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+
+private:
+    void OnHScroll();
+    void OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void paintEvent(QPaintEvent* event) override;
+    void keyPressEvent(QKeyEvent* event) override;
+    bool event(QEvent* event) override;
+    void OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
+    void OnCaptureChanged();
+
+private slots:
+    void OnCurrentColorChange(const AZ::Color& color);
+
+private:
+    void UpdateColorKey(const QColor& color, bool addToUndo);
+    void UpdateColorKeyHelper(const ColorF& color);
+    void AddKeys(const QPoint& point, const bool bTryAddKeysInGroup);
+
+    void ShowKeyPropertyCtrlOnSpot(int x, int y, bool bMultipleKeysSelected, bool bKeyChangeInSameTrack);
+    void HideKeyPropertyCtrlOnSpot();
+
+    // Utility functions to change the selected track(s) in the given track(s)
+    void ChangeSequenceTrackSelection(CTrackViewSequence* sequence, CTrackViewTrack* trackToSelect) const;
+    void ChangeSequenceTrackSelection(CTrackViewSequence* sequence, CTrackViewTrackBundle trackBundle, bool multiTrackSelection) const;
+
+    XmlNodeRef GetKeysInClickboard();
+    void StartPasteKeys();
+
+    CTrackViewKeyHandle FirstKeyFromPoint(const QPoint& point);
+    CTrackViewKeyHandle DurationKeyFromPoint(const QPoint& point);
+    CTrackViewKeyHandle CheckCursorOnStartEndTimeAdjustBar(const QPoint& point, bool& bStart);
+
+    void SelectKeys(const QRect& rc, const bool bMultiSelection);
+
+    int NumKeysFromPoint(const QPoint& point);
+
+    //! Select all keys within time frame defined by this client rectangle.
+    void SelectAllKeysWithinTimeFrame(const QRect& rc, const bool bMultiSelection);
+
+    //! Return time snapped to time step,
+    double GetTickTime() const;
+    float MagnetSnap(float time, const CTrackViewAnimNode* pNode) const;
+    float FrameSnap(float time) const;
+
+    //! Return move time offset snapped with current snap settings
+    float ComputeSnappedMoveOffset();
+
+    //! Returns visible time range.
+    Range GetVisibleRange() const;
+    Range GetTimeRange(const QRect& rc) const;
+
+    void SetHorizontalExtent(int min, int max);
+
+    void SetCurrTime(float time);
+
+    //! Return client position for given time.
+    int TimeToClient(float time) const;
+
+    float TimeFromPoint(const QPoint& point) const;
+    float TimeFromPointUnsnapped(const QPoint& point) const;
+
+    void SetLeftOffset(int ofs) { m_leftOffset = ofs; };
+
+    void SetMouseCursor(const QCursor& cursor);
+
+    void ShowKeyTooltip(CTrackViewKeyHandle& keyHandle, const QPoint& point);
+
+    bool IsOkToAddKeyHere(const CTrackViewTrack* pTrack, float time) const;
+
+    void MouseMoveSelect(const QPoint& point);
+    void MouseMoveMove(const QPoint& point, Qt::KeyboardModifiers modifiers);
+
+    void MouseMoveDragTime(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void MouseMoveOver(const QPoint& point);
+    void MouseMoveDragEndMarker(const QPoint& point, Qt::KeyboardModifiers modifiers);
+
+    void CancelDrag();
+
+    float SnapTime(Qt::KeyboardModifiers modifiers, const QPoint& p);
+
+    void MouseMoveDragStartMarker(const QPoint& point, Qt::KeyboardModifiers modifiers);
+    void MouseMoveStartEndTimeAdjust(const QPoint& point, bool bStart);
+
+    CTrackViewNode* GetNodeFromPointRec(CTrackViewNode* pCurrentNode, const QPoint& point);
+    CTrackViewNode* GetNodeFromPoint(const QPoint& point);
+    CTrackViewAnimNode* GetAnimNodeFromPoint(const QPoint& point);
+    CTrackViewTrack* GetTrackFromPoint(const QPoint& point);
+
+    void LButtonDownOnTimeAdjustBar(const QPoint& point, CTrackViewKeyHandle& keyHandle, bool bStart);
+    void LButtonDownOnKey(const QPoint& point, CTrackViewKeyHandle& keyHandle, Qt::KeyboardModifiers modifiers);
+
+    bool CreateColorKey(CTrackViewTrack* pTrack, float keyTime);
+    void EditSelectedColorKey(CTrackViewTrack* pTrack);
+
+    void AcceptUndo();
+
+    // Returns the snapping mode modified active keys
+    ESnappingMode GetKeyModifiedSnappingMode();
+
+    QRect GetNodeRect(const CTrackViewNode* pNode) const;
+
+    void StoreMementoForTracksWithSelectedKeys();
+
+    // Drawing methods.
+    void DrawControl(QPainter* pDC, const QRect& rcUpdate);
+    void DrawNodesRecursive(CTrackViewNode* pNode, QPainter* pDC, const QRect& rcUpdate);
+    void DrawTimeline(QPainter* pDC, const QRect& rcUpdate);
+    void DrawSummary(QPainter* pDC, const QRect& rcUpdate);
+    void DrawSelectedKeyIndicators(QPainter* pDC);
+    void DrawTicks(QPainter* pDC, const QRect& rc, Range& timeRange);
+    void DrawNodeTrack(CTrackViewAnimNode* pAnimNode, QPainter* pDC, const QRect& trackRect);
+    void DrawTrack(CTrackViewTrack* pTrack, QPainter* pDC, const QRect& trackRect);
+    void DrawKeys(CTrackViewTrack* pTrack, QPainter* pDC, QRect& rc, Range& timeRange);
+    void DrawSequenceTrack(const Range& timeRange, QPainter* pDC, CTrackViewTrack* pTrack, const QRect& rc);
+    void DrawBoolTrack(const Range& timeRange, QPainter* pDC, CTrackViewTrack* pTrack, const QRect& rc);
+    void DrawSelectTrack(const Range& timeRange, QPainter* pDC, CTrackViewTrack* pTrack, const QRect& rc);
+    void DrawKeyDuration(CTrackViewTrack* pTrack, QPainter* pDC, const QRect& rc, int keyIndex);
+    void DrawGoToTrackArrow(CTrackViewTrack* pTrack, QPainter* pDC, const QRect& rc);
+    void DrawColorGradient(QPainter* pDC, const QRect& rc, const CTrackViewTrack* pTrack);
+    void DrawClipboardKeys(QPainter* pDC, const QRect& rc);
+    void DrawTrackClipboardKeys(QPainter* pDC, CTrackViewTrack* pTrack, XmlNodeRef trackNode, const float timeOffset);
+
+    CTrackViewNodesCtrl* m_pNodesCtrl;
+    void ComputeFrameSteps(const Range& VisRange);
+    void DrawTimeLineInFrames(QPainter* dc, const QRect& rc, const QColor& lineCol, const QColor& textCol, double step);
+    void DrawTimeLineInSeconds(QPainter* dc, const QRect& rc, const QColor& lineCol, const QColor& textCol, double step);
+
+    static bool CompareKeyHandleByTime(const CTrackViewKeyHandle &a, const CTrackViewKeyHandle &b);
+
+    QBrush m_bkgrBrush;
+    QBrush m_bkgrBrushEmpty;
+    QBrush m_selectedBrush;
+    QBrush m_timeBkgBrush;
+    QBrush m_timeHighlightBrush;
+    QBrush m_visibilityBrush;
+    QBrush m_selectTrackBrush;
+
+    QCursor m_currCursor;
+    QCursor m_crsLeftRight;
+    QCursor m_crsAddKey;
+    QCursor m_crsCross;
+    QCursor m_crsAdjustLR;
+
+    QRect m_rcClient;
+    QPoint m_scrollOffset;
+    QRect m_rcSelect;
+    QRect m_rcTimeline;
+    QRect m_rcSummary;
+
+    QPoint m_lastTooltipPos;
+    QPoint m_mouseDownPos;
+    QPoint m_mouseOverPos;
+
+    QPixmap m_offscreenBitmap;
+
+    QRubberBand* m_rubberBand;
+    QScrollBar* m_scrollBar;
+
+    // Time
+    float m_timeScale;
+    float m_currentTime;
+    float m_storedTime;
+    Range m_timeRange;
+    Range m_timeMarked;
+
+    // This is how often to place ticks.
+    // value of 10 means place ticks every 10 second.
+    double m_ticksStep;
+
+    CTrackViewKeyPropertiesDlg* m_keyPropertiesDlg;
+    ReflectedPropertyControl* m_wndPropsOnSpot;
+    const CTrackViewTrack* m_pLastTrackSelectedOnSpot;
+
+    QFont m_descriptionFont;
+
+    // Mouse interaction state
+    int m_mouseMode;
+    int m_mouseActionMode;
+    bool m_bZoomDrag;
+    bool m_bMoveDrag;
+    bool m_bCursorWasInKey;
+    bool m_bJustSelected;
+    bool m_bMouseMovedAfterRButtonDown;
+    bool m_bKeysMoved;
+    bool m_stashedRecordModeWhileTimeDragging;
+
+    // Offset for keys while moving/pasting
+    float m_keyTimeOffset;
+
+    // If control is locked for editing
+    bool m_bEditLock;
+
+    // Fast redraw: Only redraw time slider. Everything else is buffered.
+    bool m_bFastRedraw;
+
+    // Scrolling
+    int m_leftOffset;
+    int m_scrollMin;
+    int m_scrollMax;
+
+    // Snapping
+    ESnappingMode m_snappingMode;
+    float m_snapFrameTime;
+
+    // Ticks in frames or seconds
+    ETVTickMode m_tickDisplayMode;
+    double m_fFrameTickStep;
+    double m_fFrameLabelStep;
+
+    // Key for time adjust
+    CTrackViewKeyHandle m_keyForTimeAdjust;
+
+    // Cached clipboard XML for eTVMouseMode_Paste
+    XmlNodeRef m_clipboardKeys;
+
+    // Store current track whose color is being updated
+    CTrackViewTrack* m_colorUpdateTrack;
+
+    // Store the key time of that track
+    float            m_colorUpdateKeyTime;
+
+    // Mementos of unchanged tracks for Move/Scale/Slide etc.
+    struct TrackMemento
+    {
+        CTrackViewTrackMemento m_memento;
+
+        // Also need to store key selection states,
+        // because RestoreMemento will destroy them
+        std::vector<bool> m_keySelectionStates;
+    };
+
+    std::unordered_map<CTrackViewTrack*, TrackMemento> m_trackMementos;
+
+#ifdef DEBUG
+    unsigned int m_redrawCount;
+#endif
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDOPESHEETBASE_H
diff --git a/Code/Editor/TrackView/TrackViewDoubleSpinBox.cpp b/Code/Editor/TrackView/TrackViewDoubleSpinBox.cpp
new file mode 100644
index 0000000000..c77348e4f6
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewDoubleSpinBox.cpp
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#include "EditorDefs.h"
+
+#include "TrackViewDoubleSpinBox.h"
+
+CTrackViewDoubleSpinBox::CTrackViewDoubleSpinBox(QWidget* parent) 
+    : AzQtComponents::DoubleSpinBox(parent)
+{
+}
+
+CTrackViewDoubleSpinBox::~CTrackViewDoubleSpinBox()
+{
+}
+
+void CTrackViewDoubleSpinBox::stepBy(int steps)
+{
+    AzQtComponents::DoubleSpinBox::stepBy(steps);
+    Q_EMIT stepByFinished();
+}
+
+#include <TrackView/moc_TrackViewDoubleSpinBox.cpp>
diff --git a/Code/Editor/TrackView/TrackViewDoubleSpinBox.h b/Code/Editor/TrackView/TrackViewDoubleSpinBox.h
new file mode 100644
index 0000000000..61e4faa765
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewDoubleSpinBox.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+#if !defined(Q_MOC_RUN)
+#include <AzQtComponents/Components/Widgets/SpinBox.h>
+#endif
+
+class CTrackViewDoubleSpinBox
+    : public AzQtComponents::DoubleSpinBox
+{
+    Q_OBJECT
+
+public:
+    CTrackViewDoubleSpinBox(QWidget* parent = nullptr);
+    ~CTrackViewDoubleSpinBox() override;
+
+protected:
+    virtual void stepBy(int steps) override;
+
+signals:
+    void stepByFinished();
+};
diff --git a/Code/Editor/TrackView/TrackViewEventNode.cpp b/Code/Editor/TrackView/TrackViewEventNode.cpp
new file mode 100644
index 0000000000..3646000551
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewEventNode.cpp
@@ -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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "TrackViewEventNode.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewEventNode::CTrackViewEventNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode)
+    : CTrackViewAnimNode(pSequence, pAnimNode, pParentNode)
+{
+    if (GetAnimNode() && GetAnimNode()->GetSequence())
+    {
+        GetAnimNode()->GetSequence()->AddTrackEventListener(this);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewEventNode::~CTrackViewEventNode()
+{
+    if (GetAnimNode() && GetAnimNode()->GetSequence())
+    {
+        GetAnimNode()->GetSequence()->RemoveTrackEventListener(this);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewEventNode::OnTrackEvent([[maybe_unused]] IAnimSequence* pSequence, int reason, const char* event, void* pUserData)
+{
+    ITrackEventListener::ETrackEventReason  eReason = static_cast<ITrackEventListener::ETrackEventReason>(reason);
+    switch (eReason)
+    {
+    case ITrackEventListener::eTrackEventReason_Renamed:
+        RenameTrackEvent(event, static_cast<const char*>(pUserData));
+        break;
+    case ITrackEventListener::eTrackEventReason_Removed:
+        RemoveTrackEvent(event);
+    default:
+        // do nothing for events we're not interested in
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewEventNode::RenameTrackEvent(const char* fromName, const char* toName)
+{
+    CTrackViewTrackBundle eventTracks = GetTracksByParam(AnimParamType::TrackEvent);
+    const uint numEventTracks = eventTracks.GetCount();
+
+    for (uint i = 0; i < numEventTracks; ++i)
+    {
+        CTrackViewTrack* eventTrack = eventTracks.GetTrack(i);
+        if (eventTrack)
+        {
+            // Go through all keys searching for match to the fromName and re-set these keys to use the toName
+            CTrackViewKeyBundle allKeys = eventTrack->GetAllKeys();
+            const uint numKeys = allKeys.GetKeyCount();
+            for (uint k = 0; k < numKeys; ++k)
+            {
+                CTrackViewKeyHandle keyHandle = allKeys.GetKey(k);
+                IEventKey eventKey;
+
+                keyHandle.GetKey(&eventKey);
+                if (strcmp(eventKey.event.c_str(), fromName) == 0)
+                {
+                    // we have a match - re-set the eventKey with the toName
+                    eventKey.event = toName;
+                    keyHandle.SetKey(&eventKey);
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewEventNode::RemoveTrackEvent(const char* removedEventName)
+{
+    // rename the removedEventName keys to the empty string, which represents an unset event key
+    RenameTrackEvent(removedEventName, "");
+}
diff --git a/Code/Editor/TrackView/TrackViewEventNode.h b/Code/Editor/TrackView/TrackViewEventNode.h
new file mode 100644
index 0000000000..5105021eba
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewEventNode.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWEVENTNODE_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWEVENTNODE_H
+#pragma once
+
+#include "IMovieSystem.h"
+#include "TrackViewAnimNode.h"
+
+////////////////////////////////////////////////////////////////////////////
+// This class represents an IAnimNode deditcated to firing Track Events
+////////////////////////////////////////////////////////////////////////////
+
+class CTrackViewEventNode
+    : public CTrackViewAnimNode
+    , public ITrackEventListener
+{
+public:
+    CTrackViewEventNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode);
+    virtual ~CTrackViewEventNode();
+
+    // overrides from ITrackEventListener
+    void OnTrackEvent(IAnimSequence* pSequence, int reason, const char* event, void* pUserData) override;
+
+protected:
+    // updates existing keys using fromName events, changes them to use the toName events instead
+    void RenameTrackEvent(const char* fromName, const char* toName);
+
+    // updates existing keys using removedEventName events to use the empty string (representing no event)
+    void RemoveTrackEvent(const char* removedEventName);
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWEVENTNODE_H
diff --git a/Code/Editor/TrackView/TrackViewFindDlg.cpp b/Code/Editor/TrackView/TrackViewFindDlg.cpp
new file mode 100644
index 0000000000..0a3c7c122c
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewFindDlg.cpp
@@ -0,0 +1,167 @@
+/*
+ * 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 "TrackViewFindDlg.h"
+
+// Editor
+#include "TrackViewSequenceManager.h"
+#include "AnimationContext.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <TrackView/ui_TrackViewFindDlg.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "Maestro/Types/AnimNodeType.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// CTrackViewFindDlg dialog
+
+
+CTrackViewFindDlg::CTrackViewFindDlg(const char* title, QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , ui(new Ui::TrackViewFindDlg)
+{
+    setWindowTitle(title);
+
+    m_tvDlg = 0;
+    m_numSeqs = 0;
+
+    ui->setupUi(this);
+    ui->LIST->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    connect(ui->OK, &QPushButton::clicked, this, &CTrackViewFindDlg::OnOK);
+    connect(ui->CANCEL, &QPushButton::clicked, this, &CTrackViewFindDlg::OnCancel);
+    connect(ui->FILTER, &QLineEdit::textEdited, this, &CTrackViewFindDlg::OnFilterChange);
+    connect(ui->LIST, &QListWidget::itemDoubleClicked, this, &CTrackViewFindDlg::OnItemDoubleClicked);
+
+    FillData();
+}
+
+CTrackViewFindDlg::~CTrackViewFindDlg()
+{
+}
+
+void CTrackViewFindDlg::FillData()
+{
+    m_numSeqs = 0;
+    m_objs.resize(0);
+    for (int k = 0; k < GetIEditor()->GetMovieSystem()->GetNumSequences(); ++k)
+    {
+        IAnimSequence* seq = GetIEditor()->GetMovieSystem()->GetSequence(k);
+        for (int i = 0; i < seq->GetNodeCount(); i++)
+        {
+            IAnimNode* pNode = seq->GetNode(i);
+            ObjName obj;
+            obj.m_objName = pNode->GetName();
+            obj.m_directorName = pNode->HasDirectorAsParent() ? pNode->HasDirectorAsParent()->GetName() : "";
+            string fullname = seq->GetName();
+            obj.m_seqName = fullname.c_str();
+            m_objs.push_back(obj);
+        }
+        m_numSeqs++;
+    }
+    FillList();
+}
+
+
+void CTrackViewFindDlg::Init(CTrackViewDialog* tvDlg)
+{
+    m_tvDlg = tvDlg;
+}
+
+void CTrackViewFindDlg::FillList()
+{
+    QString filter = ui->FILTER->text();
+    ui->LIST->clear();
+
+    for (int i = 0; i < m_objs.size(); i++)
+    {
+        ObjName pObj = m_objs[i];
+        if (filter.isEmpty() || pObj.m_objName.contains(filter, Qt::CaseInsensitive))
+        {
+            QString text = pObj.m_objName;
+            if (!pObj.m_directorName.isEmpty())
+            {
+                text += " (";
+                text += pObj.m_directorName;
+                text += ")";
+            }
+            if (m_numSeqs > 1)
+            {
+                text += " / ";
+                text += pObj.m_seqName;
+            }
+            ui->LIST->addItem(text);
+        }
+    }
+    ui->LIST->setCurrentRow(0);
+}
+
+void CTrackViewFindDlg::OnOK()
+{
+    ProcessSel();
+    accept();
+}
+
+void CTrackViewFindDlg::OnCancel()
+{
+    reject();
+}
+
+void CTrackViewFindDlg::OnFilterChange([[maybe_unused]] const QString& text)
+{
+    FillList();
+}
+
+void CTrackViewFindDlg::ProcessSel()
+{
+    QList<QListWidgetItem*> selection = ui->LIST->selectedItems();
+
+    if (selection.size() != 1)
+    {
+        return;
+    }
+    int index = ui->LIST->row(selection.first());
+
+    if (index >= 0 && m_tvDlg)
+    {
+        ObjName object = m_objs[index];
+
+        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* pSequence = pSequenceManager->GetSequenceByName(object.m_seqName);
+
+        if (pSequence)
+        {
+            CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+            pAnimationContext->SetSequence(pSequence, false, false);
+
+            CTrackViewAnimNode* pParentDirector = pSequence;
+            CTrackViewAnimNodeBundle foundDirectorNodes = pSequence->GetAnimNodesByName(object.m_directorName.toUtf8().data());
+            if (foundDirectorNodes.GetCount() > 0 && foundDirectorNodes.GetNode(0)->GetType() == AnimNodeType::Director)
+            {
+                pParentDirector = foundDirectorNodes.GetNode(0);
+            }
+
+            CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAnimNodesByName(object.m_objName.toUtf8().data());
+
+            const uint numNodes = foundNodes.GetCount();
+            for (uint i = 0; i < numNodes; ++i)
+            {
+                foundNodes.GetNode(i)->SetSelected(true);
+            }
+        }
+    }
+}
+
+void CTrackViewFindDlg::OnItemDoubleClicked()
+{
+    ProcessSel();
+}
+
+#include <TrackView/moc_TrackViewFindDlg.cpp>
diff --git a/Code/Editor/TrackView/TrackViewFindDlg.h b/Code/Editor/TrackView/TrackViewFindDlg.h
new file mode 100644
index 0000000000..91ffba80cf
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewFindDlg.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWFINDDLG_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWFINDDLG_H
+#pragma once
+
+// TrackViewFindDlg.h : header file
+//
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include <QScopedPointer>
+#endif
+
+class CTrackViewDialog;
+
+namespace Ui {
+    class TrackViewFindDlg;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CTrackViewFindDlg dialog
+class CTrackViewFindDlg
+    : public QDialog
+{
+    Q_OBJECT
+    // Construction
+public:
+    CTrackViewFindDlg(const char* title = NULL, QWidget* pParent = NULL);   // standard constructor
+    ~CTrackViewFindDlg();
+
+    //Functions
+    void FillData();
+    void FillList();
+    void Init(CTrackViewDialog* tvDlg);
+    void ProcessSel();
+
+protected slots:
+    void OnOK();
+    void OnCancel();
+    void OnFilterChange(const QString& text);
+    void OnItemDoubleClicked();
+
+protected:
+    struct ObjName
+    {
+        QString m_objName;
+        QString m_directorName;
+        QString m_seqName;
+    };
+
+    std::vector<ObjName> m_objs;
+    CTrackViewDialog* m_tvDlg;
+
+    int m_numSeqs;
+
+    QScopedPointer<Ui::TrackViewFindDlg> ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWFINDDLG_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.ui b/Code/Editor/TrackView/TrackViewFindDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewFindDlg.ui
rename to Code/Editor/TrackView/TrackViewFindDlg.ui
diff --git a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
new file mode 100644
index 0000000000..8c00883020
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
@@ -0,0 +1,408 @@
+/*
+ * 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 "TrackViewKeyPropertiesDlg.h"
+
+// Qt
+#include <QMessageBox>
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimValueType.h>
+
+// Editor
+#include "Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <TrackView/ui_TrackViewTrackPropsDlg.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyUIControls::OnInternalVariableChange(IVariable* var)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    AZ_Assert(sequence, "Expected valid sequence.");
+    if (sequence)
+    {
+        CTrackViewKeyBundle keys = sequence->GetSelectedKeys();
+        OnUIChange(var, keys);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyPropertiesDlg::CTrackViewKeyPropertiesDlg(QWidget* hParentWnd)
+    : QWidget(hParentWnd)
+    , m_pLastTrackSelected(nullptr)
+    , m_sequence(nullptr)
+{
+    QVBoxLayout* l = new QVBoxLayout();
+    l->setMargin(0);
+    m_wndTrackProps = new CTrackViewTrackPropsDlg(this);
+    l->addWidget(m_wndTrackProps);
+    m_wndProps = new ReflectedPropertyControl(this);
+    m_wndProps->Setup(true, 120);
+    m_wndProps->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+    l->addWidget(m_wndProps);
+
+    m_wndProps->SetStoreUndoByItems(false);
+
+    setLayout(l);
+
+    m_pVarBlock = new CVarBlock;
+
+    // Add key UI classes
+    std::vector<IClassDesc*> classes;
+    GetIEditor()->GetClassFactory()->GetClassesByCategory("TrackViewKeyUI", classes);  // BySystemID(ESYSTEM_CLASS_TRACKVIEW_KEYUI, classes);
+    for (IClassDesc* iclass : classes)
+    {
+        if (QObject* pObj = iclass->CreateQObject())
+        {
+            auto keyControl = qobject_cast<CTrackViewKeyUIControls*>(pObj);
+            Q_ASSERT(keyControl);
+            m_keyControls.push_back(keyControl);
+        }
+    }
+
+    // Sort key controls by descending priority
+    std::stable_sort(m_keyControls.begin(), m_keyControls.end(),
+        [](const _smart_ptr<CTrackViewKeyUIControls>& a, const _smart_ptr<CTrackViewKeyUIControls>& b)
+        {
+            return a->GetPriority() > b->GetPriority();
+        }
+        );
+
+    CreateAllVars();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyPropertiesDlg::OnVarChange(IVariable* pVar)
+{
+    // If it was a motion that just changed, we need to rebuild the controls
+    // so the min/max on the sliders update correctly.
+    if (m_sequence && pVar->GetDataType() == IVariable::DT_MOTION)
+    {
+        OnKeySelectionChanged(m_sequence);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyPropertiesDlg::CreateAllVars()
+{
+    for (int i = 0; i < (int)m_keyControls.size(); i++)
+    {
+        m_keyControls[i]->SetKeyPropertiesDlg(this);
+        m_keyControls[i]->OnCreateVars();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyPropertiesDlg::PopulateVariables()
+{
+    // Must first clear any selection in properties window.
+    m_wndProps->RemoveAllItems();
+    m_wndProps->AddVarBlock(m_pVarBlock);
+
+    m_wndProps->SetUpdateCallback(AZStd::bind(&CTrackViewKeyPropertiesDlg::OnVarChange, this, AZStd::placeholders::_1));
+    //m_wndProps->m_props.ExpandAll();
+
+
+    ReloadValues();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyPropertiesDlg::PopulateVariables(ReflectedPropertyControl* propCtrl)
+{
+    propCtrl->RemoveAllItems();
+    propCtrl->AddVarBlock(m_pVarBlock);
+
+    propCtrl->ReloadValues();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyPropertiesDlg::OnKeysChanged(CTrackViewSequence* pSequence)
+{
+    CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
+
+    if (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType())
+    {
+        CTrackViewTrack* pTrack = selectedKeys.GetKey(0).GetTrack();
+
+        CAnimParamType paramType = pTrack->GetParameterType();
+        EAnimCurveType trackType = pTrack->GetCurveType();
+        AnimValueType valueType = pTrack->GetValueType();
+
+        for (int i = 0; i < (int)m_keyControls.size(); i++)
+        {
+            if (m_keyControls[i]->SupportTrackType(paramType, trackType, valueType))
+            {
+                m_keyControls[i]->OnKeySelectionChange(selectedKeys);
+                break;
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyPropertiesDlg::OnKeySelectionChanged(CTrackViewSequence* sequence)
+{
+    m_sequence = sequence;
+
+    if (nullptr == sequence)
+    {
+        m_wndProps->ClearSelection();
+        m_pVarBlock->DeleteAllVariables();
+        m_wndProps->setEnabled(false);
+        m_wndTrackProps->setEnabled(false);
+        return;
+    }
+
+    CTrackViewKeyBundle selectedKeys = sequence->GetSelectedKeys();
+
+    m_wndTrackProps->OnKeySelectionChange(selectedKeys);
+
+    bool bSelectChangedInSameTrack
+        = m_pLastTrackSelected
+            && selectedKeys.GetKeyCount() == 1
+            && selectedKeys.GetKey(0).GetTrack() == m_pLastTrackSelected;
+
+    // Every Key in an Asset Blend track can have different min/max values on the float sliders
+    // because it's based on the duration of the motion that is set. So don't try to
+    // reuse the controls when the selection changes, otherwise the tooltips may be wrong.
+    bool reuseControls = bSelectChangedInSameTrack && m_pLastTrackSelected && (m_pLastTrackSelected->GetValueType() != AnimValueType::AssetBlend);
+
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        m_pLastTrackSelected = selectedKeys.GetKey(0).GetTrack();
+    }
+    else
+    {
+        m_pLastTrackSelected = nullptr;
+    }
+
+    if (reuseControls)
+    {
+        m_wndProps->ClearSelection();
+    }
+    else
+    {
+        m_pVarBlock->DeleteAllVariables();
+    }
+
+    m_wndProps->setEnabled(false);
+    m_wndTrackProps->setEnabled(false);
+    bool bAssigned = false;
+    if (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType())
+    {
+        CTrackViewTrack* pTrack = selectedKeys.GetKey(0).GetTrack();
+
+        CAnimParamType paramType = pTrack->GetParameterType();
+        EAnimCurveType trackType = pTrack->GetCurveType();
+        AnimValueType valueType = pTrack->GetValueType();
+
+        for (int i = 0; i < (int)m_keyControls.size(); i++)
+        {
+            if (m_keyControls[i]->SupportTrackType(paramType, trackType, valueType))
+            {
+                if (!reuseControls)
+                {
+                    AddVars(m_keyControls[i]);
+                }
+
+                if (m_keyControls[i]->OnKeySelectionChange(selectedKeys))
+                {
+                    bAssigned = true;
+                }
+
+                break;
+            }
+        }
+
+        m_wndProps->setEnabled(true);
+        m_wndTrackProps->setEnabled(true);
+    }
+    else
+    {
+        m_wndProps->setEnabled(false);
+        m_wndTrackProps->setEnabled(false);
+    }
+
+    if (reuseControls)
+    {
+        ReloadValues();
+    }
+    else
+    {
+        PopulateVariables();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyPropertiesDlg::AddVars(CTrackViewKeyUIControls* pUI)
+{
+    CVarBlock* pVB = pUI->GetVarBlock();
+    for (int i = 0, num = pVB->GetNumVariables(); i < num; i++)
+    {
+        IVariable* pVar = pVB->GetVariable(i);
+        m_pVarBlock->AddVariable(pVar);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyPropertiesDlg::ReloadValues()
+{
+    m_wndProps->ReloadValues();
+}
+
+void CTrackViewKeyPropertiesDlg::OnSequenceChanged(CTrackViewSequence* sequence)
+{
+    OnKeySelectionChanged(sequence);
+    m_wndTrackProps->OnSequenceChanged();
+}
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrackPropsDlg::CTrackViewTrackPropsDlg(QWidget* parent /* = 0 */)
+    : QWidget(parent)
+    , ui(new Ui::CTrackViewTrackPropsDlg)
+{
+    ui->setupUi(this);
+
+    // Use editingFinished and a custom signal stepByFinished (and not valueChanged)
+    // so the time will be updated when the user finishes editing the time field (hits enter)
+    // or if the arrow keys (or mouse click on the arrow buttons) in the spinner box are
+    // pressed. Don't just use valueChanged because we don't want intermediate values
+    // like 1 as the user is typing 10 to register as updates to the key values. Keys
+    // are identified by time, so the keys jumping around like that can stomp existing keys
+    // that happen to live at the intermediate values.
+    connect(ui->TIME, SIGNAL(editingFinished()), this, SLOT(OnUpdateTime()));
+    connect(ui->TIME, SIGNAL(stepByFinished()), this, SLOT(OnUpdateTime()));
+}
+
+CTrackViewTrackPropsDlg::~CTrackViewTrackPropsDlg()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrackPropsDlg::OnSequenceChanged()
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (pSequence)
+    {
+        Range range = pSequence->GetTimeRange();
+        ui->TIME->setRange(range.start, range.end);
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewTrackPropsDlg::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
+{
+    m_keyHandle = CTrackViewKeyHandle();
+
+    if (selectedKeys.GetKeyCount() == 1)
+    {
+        m_keyHandle = selectedKeys.GetKey(0);
+    }
+
+    if (m_keyHandle.IsValid())
+    {
+        // Block the callback, the values is already set in m_keyHandle.GetTime(), no need to
+        // reset it and create an undo even like the user was setting it via the UI.
+        ui->TIME->blockSignals(true);
+        ui->TIME->setValue(m_keyHandle.GetTime());
+        ui->TIME->blockSignals(false);
+        ui->PREVNEXT->setText(QString::number(m_keyHandle.GetIndex() + 1));
+
+        ui->PREVNEXT->setEnabled(true);
+        ui->TIME->setEnabled(true);
+    }
+    else
+    {
+        ui->PREVNEXT->setEnabled(FALSE);
+        ui->TIME->setEnabled(FALSE);
+    }
+    return true;
+}
+
+void CTrackViewTrackPropsDlg::OnUpdateTime()
+{
+    if (!m_keyHandle.IsValid())
+    {
+        return;
+    }
+
+    const float time = (float)ui->TIME->value();
+
+    // Check if the sequence is legacy
+    CTrackViewTrack* track = m_keyHandle.GetTrack();
+    if (nullptr != track)
+    {
+        CTrackViewSequence* sequence = track->GetSequence();
+        if (nullptr != sequence && !AZ::IsClose(m_keyHandle.GetTime(), time, AZ::Constants::FloatEpsilon))
+        {
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            if (isDuringUndo)
+            {
+                m_keyHandle.SetTime(time);
+            }
+            else
+            {
+                // Let the AZ Undo system manage the nodes on the sequence entity
+                AzToolsFramework::ScopedUndoBatch undoBatch("Change key time");
+
+                CTrackViewKeyHandle existingKey = track->GetKeyByTime(time);
+
+                // If there is an existing key at this time, remove it so the
+                // new key at this time is the only one here. Make sure it's actually a different
+                // key, because time can "change" but then be quantized (or snapped) to the same time by track->GetKeyByTime(time).
+                if (existingKey.IsValid() && (existingKey.GetIndex() != m_keyHandle.GetIndex()))
+                {
+                    // Save the old time before we set the new time so we
+                    // can reselect the m_keyHandle after the Delete.
+                    float currentTime = m_keyHandle.GetTime();
+
+                    // There is a bug in QT where editingFinished will get fired a second time if we show a QMessageBox
+                    // so work around it by blocking signal before we do it.
+                    ui->TIME->blockSignals(true);
+
+                    QString msgBody = "There is an existing key at the specified time. If you continue, the existing key will be removed.";
+                    if (QMessageBox::warning(this, "Overwrite Existing Key?", msgBody, QMessageBox::Cancel | QMessageBox::Yes) == QMessageBox::Cancel)
+                    {
+                        // Restore the old value and return.
+                        ui->TIME->setValue(currentTime);
+                        ui->TIME->blockSignals(false);
+                        return;
+                    }
+                    else
+                    {
+                        ui->TIME->blockSignals(false);
+                    }
+
+                    // Delete the key that is able to get replaced. This will
+                    // cause a sort and may cause m_keyHandle to become invalid.
+                    existingKey.Delete();
+
+                    // Reselect the key handle by time.
+                    m_keyHandle = track->GetKeyByTime(currentTime);
+                }
+
+                m_keyHandle.SetTime(time);
+
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+        }
+    }
+}
+
+#include <TrackView/moc_TrackViewKeyPropertiesDlg.cpp>
diff --git a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h
new file mode 100644
index 0000000000..57dc4e18cc
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h
@@ -0,0 +1,192 @@
+/*
+ * 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_TRACKVIEW_TRACKVIEWKEYPROPERTIESDLG_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWKEYPROPERTIESDLG_H
+#pragma once
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "TrackViewSequence.h"
+#include "TrackViewNode.h"
+#include "Plugin.h"
+#include "TrackViewDopeSheetBase.h"
+#include "QtViewPane.h"
+
+#include <QScopedPointer>
+#include <QDockWidget>
+#endif
+
+namespace Ui {
+    class CTrackViewTrackPropsDlg;
+    class CTrackViewKeyPropertiesDlg;
+}
+
+class ReflectedPropertyControl;
+class CTrackViewKeyPropertiesDlg;
+
+//////////////////////////////////////////////////////////////////////////
+class CTrackViewKeyUIControls
+    : public QObject
+    , public _i_reference_target_t
+{
+    Q_OBJECT
+public:
+    CTrackViewKeyUIControls()
+    {
+        m_pVarBlock = new CVarBlock;
+        m_onSetCallback = AZStd::bind(&CTrackViewKeyUIControls::OnInternalVariableChange, this, AZStd::placeholders::_1);
+    };
+
+    void SetKeyPropertiesDlg(CTrackViewKeyPropertiesDlg* pDlg) { m_pKeyPropertiesDlg = pDlg; }
+
+    // Return internal variable block.
+    CVarBlock* GetVarBlock() const { return m_pVarBlock; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Callbacks that must be implemented in derived class
+    //////////////////////////////////////////////////////////////////////////
+    // Returns true if specified animation track type is supported by this UI.
+    virtual bool SupportTrackType(const CAnimParamType& paramType, EAnimCurveType trackType, AnimValueType valueType) const = 0;
+
+    // Called when UI variable changes.
+    virtual void OnCreateVars() = 0;
+
+    // Called when user changes selected keys.
+    // Return true if control update UI values
+    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& keys) = 0;
+
+    // Called when UI variable changes.
+    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& keys) = 0;
+
+    // Get priority of key UI control, so that specializations can have precedence
+    virtual unsigned int GetPriority() const = 0;
+
+protected:
+    //////////////////////////////////////////////////////////////////////////
+    // Helper functions.
+    //////////////////////////////////////////////////////////////////////////
+    template <class T>
+    void SyncValue(CSmartVariable<T>& var, T& value, bool bCopyToUI, IVariable* pSrcVar = NULL)
+    {
+        if (bCopyToUI)
+        {
+            var = value;
+        }
+        else
+        {
+            if (!pSrcVar || pSrcVar == var.GetVar())
+            {
+                value = var;
+            }
+        }
+    }
+    void AddVariable(CVariableBase& varArray, CVariableBase& var, const char* varName, unsigned char dataType = IVariable::DT_SIMPLE)
+    {
+        if (varName)
+        {
+            var.SetName(varName);
+        }
+        var.SetDataType(dataType);
+        var.AddOnSetCallback(&m_onSetCallback);
+        varArray.AddVariable(&var);
+        m_registeredVariables.push_back(&var);
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void AddVariable(CVariableBase& var, const char* varName, unsigned char dataType = IVariable::DT_SIMPLE)
+    {
+        if (varName)
+        {
+            var.SetName(varName);
+        }
+        var.SetDataType(dataType);
+        var.AddOnSetCallback(&m_onSetCallback);
+        m_pVarBlock->AddVariable(&var);
+        m_registeredVariables.push_back(&var);
+    }
+    void OnInternalVariableChange(IVariable* pVar);
+
+protected:
+    _smart_ptr<CVarBlock> m_pVarBlock;
+    std::vector<_smart_ptr<IVariable> > m_registeredVariables;
+    CTrackViewKeyPropertiesDlg* m_pKeyPropertiesDlg;
+    IVariable::OnSetCallback m_onSetCallback;
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CTrackViewTrackPropsDlg
+    : public QWidget
+{
+    Q_OBJECT
+public:
+    CTrackViewTrackPropsDlg(QWidget* parent = 0);
+    ~CTrackViewTrackPropsDlg();
+
+    void OnSequenceChanged();
+    bool OnKeySelectionChange(CTrackViewKeyBundle& keys);
+    void ReloadKey();
+
+protected slots:
+    void OnUpdateTime();
+
+protected:
+    CTrackViewKeyHandle m_keyHandle;
+    QScopedPointer<Ui::CTrackViewTrackPropsDlg> ui;
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+class TrackViewKeys;
+class CTrackViewKeyPropertiesDlg
+    : public QWidget
+    , public ITrackViewSequenceListener
+{
+public:
+    CTrackViewKeyPropertiesDlg(QWidget* hParentWnd);
+
+    void SetKeysCtrl(CTrackViewDopeSheetBase* pKeysCtrl)
+    {
+        m_keysCtrl = pKeysCtrl;
+        if (m_keysCtrl)
+        {
+            m_keysCtrl->SetKeyPropertiesDlg(this);
+        }
+    }
+
+    void OnSequenceChanged(CTrackViewSequence* sequence);
+
+    void PopulateVariables();
+    void PopulateVariables(ReflectedPropertyControl* propCtrl);
+
+    // ITrackViewSequenceListener
+    virtual void OnKeysChanged(CTrackViewSequence* pSequence) override;
+    virtual void OnKeySelectionChanged(CTrackViewSequence* pSequence) override;
+
+protected:
+    //////////////////////////////////////////////////////////////////////////
+    void OnVarChange(IVariable* pVar);
+    void CreateAllVars();
+    void AddVars(CTrackViewKeyUIControls* pUI);
+    void ReloadValues();
+
+protected:
+    std::vector< _smart_ptr<CTrackViewKeyUIControls> > m_keyControls;
+
+    _smart_ptr<CVarBlock> m_pVarBlock;
+
+    ReflectedPropertyControl* m_wndProps;
+    CTrackViewTrackPropsDlg* m_wndTrackProps;
+
+    CTrackViewDopeSheetBase* m_keysCtrl;
+
+    CTrackViewTrack* m_pLastTrackSelected;
+    CTrackViewSequence* m_sequence;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWKEYPROPERTIESDLG_H
diff --git a/Code/Editor/TrackView/TrackViewNode.cpp b/Code/Editor/TrackView/TrackViewNode.cpp
new file mode 100644
index 0000000000..3d9bde7e65
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewNode.cpp
@@ -0,0 +1,713 @@
+/*
+ * 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 "TrackViewNode.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+
+// Editor
+#include "TrackView/TrackViewTrack.h"
+#include "TrackView/TrackViewSequence.h"
+
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyConstHandle::GetKey(IKey* pKey) const
+{
+    assert(m_bIsValid);
+
+    m_pTrack->GetKey(m_keyIndex, pKey);
+}
+
+////////////////////////////////////////////////////////////////////////////
+float CTrackViewKeyConstHandle::GetTime() const
+{
+    assert(m_bIsValid);
+
+    return m_pTrack->GetKeyTime(m_keyIndex);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyHandle::SetKey(IKey* pKey)
+{
+    assert(m_bIsValid);
+
+    m_pTrack->SetKey(m_keyIndex, pKey);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyHandle::GetKey(IKey* pKey) const
+{
+    assert(m_bIsValid);
+
+    m_pTrack->GetKey(m_keyIndex, pKey);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyHandle::Select(bool bSelect)
+{
+    assert(m_bIsValid);
+
+    m_pTrack->SelectKey(m_keyIndex, bSelect);
+}
+
+////////////////////////////////////////////////////////////////////////////
+bool CTrackViewKeyHandle::IsSelected() const
+{
+    assert(m_bIsValid);
+
+    return m_pTrack->IsKeySelected(m_keyIndex);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyHandle::SetTime(float time, bool notifyListeners)
+{
+    AZ_Assert(m_bIsValid, "Expected a valid key handle.");
+
+    // Flag the current key, because the key handle may become invalid
+    // after the time is set and it is potentially sorted into a different
+    // index.    
+    m_pTrack->SetSortMarkerKey(m_keyIndex, true);
+
+    // set the new time, this may cause a sort that reorders the keys, making
+    // m_keyIndex incorrect.
+    m_pTrack->SetKeyTime(m_keyIndex, time, notifyListeners);
+
+    // If the key at this index changed because of the key sort by time.
+    // We need to search through the keys now and find the marker.
+    if (!m_pTrack->IsSortMarkerKey(m_keyIndex))
+    {
+        CTrackViewKeyBundle allKeys = m_pTrack->GetAllKeys();
+        for (int x = 0; x < allKeys.GetKeyCount(); x++)
+        {
+            unsigned int curIndex = allKeys.GetKey(x).GetIndex();
+            if (m_pTrack->IsSortMarkerKey(curIndex))
+            {
+                m_keyIndex = curIndex;
+                break;
+            }
+        }
+    }
+
+    // clear the sort marker
+    m_pTrack->SetSortMarkerKey(m_keyIndex, false);
+}
+
+////////////////////////////////////////////////////////////////////////////
+float CTrackViewKeyHandle::GetTime() const
+{
+    assert(m_bIsValid);
+
+    return m_pTrack->GetKeyTime(m_keyIndex);
+}
+
+////////////////////////////////////////////////////////////////////////////
+float CTrackViewKeyHandle::GetDuration() const
+{
+    assert(m_bIsValid);
+
+    const char* desc = nullptr;
+    float duration = 0;
+    m_pTrack->m_pAnimTrack->GetKeyInfo(m_keyIndex, desc, duration);
+
+    return duration;
+}
+
+////////////////////////////////////////////////////////////////////////////
+const char* CTrackViewKeyHandle::GetDescription() const
+{
+    assert(m_bIsValid);
+
+    const char* desc = "";
+    float duration = 0;
+    m_pTrack->m_pAnimTrack->GetKeyInfo(m_keyIndex, desc, duration);
+
+    return desc;
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyHandle::Offset(float offset, bool notifyListeners)
+{
+    AZ_Assert(m_bIsValid, "Expected key handle to be in a valid state.");
+
+    float newTime = m_pTrack->GetKeyTime(m_keyIndex) + offset;
+    m_pTrack->SetKeyTime(m_keyIndex, newTime, notifyListeners);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyHandle::Delete()
+{
+    assert(m_bIsValid);
+
+    m_pTrack->RemoveKey(m_keyIndex);
+    m_bIsValid = false;
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewKeyHandle::Clone()
+{
+    assert(m_bIsValid);
+
+    unsigned int newKeyIndex = m_pTrack->CloneKey(m_keyIndex);
+    return CTrackViewKeyHandle(m_pTrack, newKeyIndex);
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewKeyHandle::GetNextKey()
+{
+    return m_pTrack->GetNextKey(GetTime());
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewKeyHandle::GetPrevKey()
+{
+    return m_pTrack->GetPrevKey(GetTime());
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewKeyHandle::GetAboveKey() const
+{
+    // Search for track above that has keys
+    for (CTrackViewNode* pCurrentNode = m_pTrack->GetAboveNode(); pCurrentNode; pCurrentNode = pCurrentNode->GetAboveNode())
+    {
+        if (pCurrentNode->GetNodeType() == eTVNT_Track)
+        {
+            CTrackViewTrack* pCurrentTrack = static_cast<CTrackViewTrack*>(pCurrentNode);
+            const unsigned int keyCount = pCurrentTrack->GetKeyCount();
+            if (keyCount > 0)
+            {
+                // Return key with nearest time to this key
+                return pCurrentTrack->GetNearestKeyByTime(GetTime());
+            }
+        }
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewKeyHandle::GetBelowKey() const
+{
+    // Search for track below that has keys
+    for (CTrackViewNode* pCurrentNode = m_pTrack->GetBelowNode(); pCurrentNode; pCurrentNode = pCurrentNode->GetBelowNode())
+    {
+        if (pCurrentNode->GetNodeType() == eTVNT_Track)
+        {
+            CTrackViewTrack* pCurrentTrack = static_cast<CTrackViewTrack*>(pCurrentNode);
+            const unsigned int keyCount = pCurrentTrack->GetKeyCount();
+            if (keyCount > 0)
+            {
+                // Return key with nearest time to this key
+                return pCurrentTrack->GetNearestKeyByTime(GetTime());
+            }
+        }
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+////////////////////////////////////////////////////////////////////////////
+bool CTrackViewKeyHandle::operator==(const CTrackViewKeyHandle& keyHandle) const
+{
+    return m_pTrack == keyHandle.m_pTrack && m_keyIndex == keyHandle.m_keyIndex;
+}
+
+////////////////////////////////////////////////////////////////////////////
+bool CTrackViewKeyHandle::operator!=(const CTrackViewKeyHandle& keyHandle) const
+{
+    return !(*this == keyHandle);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyBundle::AppendKey(const CTrackViewKeyHandle& keyHandle)
+{
+    // Check if newly added key has different type than existing ones
+    if (m_bAllOfSameType && m_keys.size() > 0)
+    {
+        const CTrackViewKeyHandle& lastKey = m_keys.back();
+
+        const CTrackViewTrack* pMyTrack = keyHandle.GetTrack();
+        const CTrackViewTrack* pOtherTrack = lastKey.GetTrack();
+
+        // Check if keys are from sub tracks, always compare types of parent track
+        if (pMyTrack->IsSubTrack())
+        {
+            pMyTrack = static_cast<const CTrackViewTrack*>(pMyTrack->GetParentNode());
+        }
+
+        if (pOtherTrack->IsSubTrack())
+        {
+            pOtherTrack = static_cast<const CTrackViewTrack*>(pOtherTrack->GetParentNode());
+        }
+
+        // Do comparison
+        if (pMyTrack->GetParameterType() != pOtherTrack->GetParameterType()
+            || pMyTrack->GetCurveType() != pOtherTrack->GetCurveType()
+            || pMyTrack->GetValueType() != pOtherTrack->GetValueType())
+        {
+            m_bAllOfSameType = false;
+        }
+    }
+
+    m_keys.push_back(keyHandle);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyBundle::AppendKeyBundle(const CTrackViewKeyBundle& bundle)
+{
+    for (auto iter = bundle.m_keys.begin(); iter != bundle.m_keys.end(); ++iter)
+    {
+        AppendKey(*iter);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewKeyBundle::SelectKeys(const bool bSelected)
+{
+    const unsigned int numKeys = GetKeyCount();
+
+    for (unsigned int i = 0; i < numKeys; ++i)
+    {
+        GetKey(i).Select(bSelected);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewKeyBundle::GetSingleSelectedKey()
+{
+    const unsigned int keyCount = GetKeyCount();
+
+    if (keyCount == 1)
+    {
+        return m_keys[0];
+    }
+    else if (keyCount > 1 && keyCount <= 4)
+    {
+        // All keys must have same time & same parent track
+        CTrackViewNode* pFirstParent = m_keys[0].GetTrack()->GetParentNode();
+        const float firstTime = m_keys[0].GetTime();
+
+        // Parent must be a track
+        if (pFirstParent->GetNodeType() != eTVNT_Track)
+        {
+            return CTrackViewKeyHandle();
+        }
+
+        // Check other keys for equality
+        for (unsigned int i = 0; i < keyCount; ++i)
+        {
+            if (m_keys[i].GetTrack()->GetParentNode() != pFirstParent || m_keys[i].GetTime() != firstTime)
+            {
+                return CTrackViewKeyHandle();
+            }
+        }
+
+        return static_cast<CTrackViewTrack*>(pFirstParent)->GetKeyByTime(firstTime);
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNode::CTrackViewNode(CTrackViewNode* pParent)
+    : m_pParentNode(pParent)
+    , m_bSelected(false)
+    , m_bHidden(false)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewNode::HasObsoleteTrack() const
+{
+    return HasObsoleteTrackRec(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewNode::HasObsoleteTrackRec(const CTrackViewNode* pCurrentNode) const
+{
+    if (pCurrentNode->GetNodeType() == eTVNT_Track)
+    {
+        const CTrackViewTrack* pTrack = static_cast<const CTrackViewTrack*>(pCurrentNode);
+
+        EAnimCurveType trackType = pTrack->GetCurveType();
+        if (trackType == eAnimCurveType_TCBFloat || trackType == eAnimCurveType_TCBQuat || trackType == eAnimCurveType_TCBVector)
+        {
+            return true;
+        }
+    }
+
+    for (unsigned int i = 0; i < pCurrentNode->GetChildCount(); ++i)
+    {
+        CTrackViewNode* pNode = pCurrentNode->GetChild(i);
+
+        if (HasObsoleteTrackRec(pNode))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNode::ClearSelection()
+{
+    CTrackViewSequenceNotificationContext context(GetSequence());
+
+    SetSelected(false);
+
+    const unsigned int numChilds = GetChildCount();
+    for (unsigned int childIndex = 0; childIndex < numChilds; ++childIndex)
+    {
+        GetChild(childIndex)->ClearSelection();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNode* CTrackViewNode::GetAboveNode() const
+{
+    CTrackViewNode* pParent = GetParentNode();
+    if (!pParent)
+    {
+        // The root does not have an above node
+        return nullptr;
+    }
+
+    CTrackViewNode* pPrevSibling = GetPrevSibling();
+    if (!pPrevSibling)
+    {
+        // First sibling -> parent is above node
+        return pParent;
+    }
+
+    // Find last node in sibling tree
+    CTrackViewNode* pCurrentNode = pPrevSibling;
+    while (pCurrentNode && pCurrentNode->GetChildCount() > 0 && pCurrentNode->GetExpanded())
+    {
+        pCurrentNode = pCurrentNode->GetChild(pCurrentNode->GetChildCount() - 1);
+    }
+
+    return pCurrentNode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNode* CTrackViewNode::GetBelowNode() const
+{
+    const unsigned int childCount = GetChildCount();
+    if (childCount > 0 && GetExpanded())
+    {
+        return GetChild(0);
+    }
+
+    CTrackViewNode* pParent = GetParentNode();
+    if (!pParent)
+    {
+        // Root without children
+        return nullptr;
+    }
+
+    // If there is a next sibling return it
+    CTrackViewNode* pNextSibling = GetNextSibling();
+    if (pNextSibling)
+    {
+        return pNextSibling;
+    }
+
+    // Otherwise we need to go up the tree and check
+    // the parent nodes for next siblings
+    CTrackViewNode* pCurrentNode = pParent;
+    while (pCurrentNode)
+    {
+        CTrackViewNode* pNextParentSibling = pCurrentNode->GetNextSibling();
+        if (pNextParentSibling)
+        {
+            return pNextParentSibling;
+        }
+
+        pCurrentNode = pCurrentNode->GetParentNode();
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNode* CTrackViewNode::GetPrevSibling() const
+{
+    CTrackViewNode* pParent = GetParentNode();
+    if (!pParent)
+    {
+        // The root does not have siblings
+        return nullptr;
+    }
+
+    // Search for prev sibling
+    unsigned int siblingCount = pParent->GetChildCount();
+    assert(siblingCount > 0);
+
+    for (unsigned int i = 1; i < siblingCount; ++i)
+    {
+        CTrackViewNode* pSibling = pParent->GetChild(i);
+        if (pSibling == this)
+        {
+            return pParent->GetChild(i - 1);
+        }
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNode* CTrackViewNode::GetNextSibling() const
+{
+    CTrackViewNode* pParent = GetParentNode();
+    if (!pParent)
+    {
+        // The root does not have siblings
+        return nullptr;
+    }
+
+    // Search for next sibling
+    unsigned int siblingCount = pParent->GetChildCount();
+    assert(siblingCount > 0);
+
+    for (unsigned int i = 0; i < siblingCount - 1; ++i)
+    {
+        CTrackViewNode* pSibling = pParent->GetChild(i);
+        if (pSibling == this)
+        {
+            return pParent->GetChild(i + 1);
+        }
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNode::SetSelected(bool bSelected)
+{
+    if (bSelected != m_bSelected)
+    {
+        m_bSelected = bSelected;
+
+        if (m_bSelected)
+        {
+            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Selected);
+        }
+        else
+        {
+            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Deselected);
+        }
+
+        GetSequence()->OnNodeSelectionChanged();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewSequence* CTrackViewNode::GetSequence()
+{
+    for (CTrackViewNode* pCurrentNode = this; pCurrentNode; pCurrentNode = pCurrentNode->GetParentNode())
+    {
+        if (pCurrentNode->GetNodeType() == eTVNT_Sequence)
+        {
+            return static_cast<CTrackViewSequence*>(pCurrentNode);
+        }
+    }
+
+    // Every node belongs to a sequence
+    assert(false);
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const CTrackViewSequence* CTrackViewNode::GetSequenceConst() const
+{
+    for (const CTrackViewNode* pCurrentNode = this; pCurrentNode; pCurrentNode = pCurrentNode->GetParentNode())
+    {
+        if (pCurrentNode->GetNodeType() == eTVNT_Sequence)
+        {
+            return static_cast<const CTrackViewSequence*>(pCurrentNode);
+        }
+    }
+
+    AZ_Assert(false, "Every node belongs to a sequence");
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNode::AddNode(CTrackViewNode* pNode)
+{
+    assert (pNode->GetNodeType() != eTVNT_Sequence);
+
+    m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNode));
+    SortNodes();
+
+    pNode->m_pParentNode = this;
+    GetSequence()->OnNodeChanged(pNode, ITrackViewSequenceListener::eNodeChangeType_Added);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNode::SortNodes()
+{
+    // Sort with operator<
+    std::stable_sort(m_childNodes.begin(), m_childNodes.end(),
+        [&](const std::unique_ptr<CTrackViewNode>& a, const std::unique_ptr<CTrackViewNode>& b) -> bool
+        {
+            const CTrackViewNode* pA = a.get();
+            const CTrackViewNode* pB = b.get();
+            return *pA < *pB;
+        }
+        );
+}
+
+namespace
+{
+    static int GetNodeOrder(AnimNodeType nodeType)
+    {
+        AZ_Assert(nodeType < AnimNodeType::Num, "Expected nodeType to be less than AnimNodeType::Num");
+
+        // note: this array gets over-allocated and is sparsely populated because the eAnimNodeType enums are not sequential in IMovieSystem.h
+        // I wonder if the original authors intended this? Not a big deal, just some trivial memory wastage.
+        static int nodeOrder[static_cast<int>(AnimNodeType::Num)];
+        nodeOrder[static_cast<int>(AnimNodeType::Invalid)] = 0;
+        nodeOrder[static_cast<int>(AnimNodeType::Director)] = 1;
+        nodeOrder[static_cast<int>(AnimNodeType::Alembic)] = 4;
+        nodeOrder[static_cast<int>(AnimNodeType::CVar)] = 6;
+        nodeOrder[static_cast<int>(AnimNodeType::ScriptVar)] = 7;
+        nodeOrder[static_cast<int>(AnimNodeType::Material)] = 8;
+        nodeOrder[static_cast<int>(AnimNodeType::Event)] = 9;
+        nodeOrder[static_cast<int>(AnimNodeType::Layer)] = 10;
+        nodeOrder[static_cast<int>(AnimNodeType::Comment)] = 11;
+        nodeOrder[static_cast<int>(AnimNodeType::RadialBlur)] = 12;
+        nodeOrder[static_cast<int>(AnimNodeType::ColorCorrection)] = 13;
+        nodeOrder[static_cast<int>(AnimNodeType::DepthOfField)] = 14;
+        nodeOrder[static_cast<int>(AnimNodeType::ScreenFader)] = 15;
+        nodeOrder[static_cast<int>(AnimNodeType::Light)] = 16;
+        nodeOrder[static_cast<int>(AnimNodeType::ShadowSetup)] = 17;
+        nodeOrder[static_cast<int>(AnimNodeType::Environment)] = 18;
+        nodeOrder[static_cast<int>(AnimNodeType::Group)] = 19;
+
+        return nodeOrder[static_cast<int>(nodeType)];
+    }
+}
+
+bool CTrackViewNode::operator<(const CTrackViewNode& otherNode) const
+{
+    // Order nodes before tracks
+    if (GetNodeType() < otherNode.GetNodeType())
+    {
+        return true;
+    }
+    else if (GetNodeType() > otherNode.GetNodeType())
+    {
+        return false;
+    }
+
+    // Same node type
+    switch (GetNodeType())
+    {
+    case eTVNT_AnimNode:
+    {
+        const CTrackViewAnimNode& thisAnimNode = static_cast<const CTrackViewAnimNode&>(*this);
+        const CTrackViewAnimNode& otherAnimNode = static_cast<const CTrackViewAnimNode&>(otherNode);
+
+        const int thisTypeOrder = GetNodeOrder(thisAnimNode.GetType());
+        const int otherTypeOrder = GetNodeOrder(otherAnimNode.GetType());
+
+        if (thisTypeOrder == otherTypeOrder)
+        {
+            // Same node type, sort by name
+            return azstricmp(thisAnimNode.GetName(), otherAnimNode.GetName()) < 0;
+        }
+
+        return thisTypeOrder < otherTypeOrder;
+    }
+    case eTVNT_Track:
+        const CTrackViewTrack& thisTrack = static_cast<const CTrackViewTrack&>(*this);
+        const CTrackViewTrack& otherTrack = static_cast<const CTrackViewTrack&>(otherNode);
+
+        if (thisTrack.GetParameterType() == otherTrack.GetParameterType())
+        {
+            // Same parameter type, sort by name
+            return azstricmp(thisTrack.GetName(), otherTrack.GetName()) < 0;
+        }
+
+        return thisTrack.GetParameterType() < otherTrack.GetParameterType();
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNode::SetHidden(bool bHidden)
+{
+    bool bWasHidden = m_bHidden;
+    m_bHidden = bHidden;
+
+    if (bHidden && !bWasHidden)
+    {
+        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Hidden);
+    }
+    else if (!bHidden && bWasHidden)
+    {
+        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Unhidden);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewNode::IsHidden() const
+{
+    return m_bHidden;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNode* CTrackViewNode::GetFirstSelectedNode()
+{
+    if (IsSelected())
+    {
+        return this;
+    }
+
+    const unsigned int numChilds = GetChildCount();
+    for (unsigned int childIndex = 0; childIndex < numChilds; ++childIndex)
+    {
+        CTrackViewNode* pSelectedNode = GetChild(childIndex)->GetFirstSelectedNode();
+        if (pSelectedNode)
+        {
+            return pSelectedNode;
+        }
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode* CTrackViewNode::GetDirector()
+{
+    for (CTrackViewNode* pCurrentNode = GetParentNode(); pCurrentNode; pCurrentNode = pCurrentNode->GetParentNode())
+    {
+        if (pCurrentNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pParentAnimNode = static_cast<CTrackViewAnimNode*>(pCurrentNode);
+
+            if (pParentAnimNode->GetType() == AnimNodeType::Director)
+            {
+                return pParentAnimNode;
+            }
+        }
+        else if (pCurrentNode->GetNodeType() == eTVNT_Sequence)
+        {
+            return static_cast<CTrackViewAnimNode*>(pCurrentNode);
+        }
+    }
+
+    return nullptr;
+}
diff --git a/Code/Editor/TrackView/TrackViewNode.h b/Code/Editor/TrackView/TrackViewNode.h
new file mode 100644
index 0000000000..046894c5b0
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewNode.h
@@ -0,0 +1,246 @@
+/*
+ * 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_TRACKVIEW_TRACKVIEWNODE_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODE_H
+#pragma once
+
+
+class CTrackViewTrack;
+class CTrackViewSequence;
+struct IKey;
+class CTrackViewAnimNode;
+
+
+class CTrackViewKeyConstHandle
+{
+public:
+    CTrackViewKeyConstHandle()
+        : m_bIsValid(false)
+        , m_keyIndex(0)
+        , m_pTrack(nullptr) {}
+
+    CTrackViewKeyConstHandle(const CTrackViewTrack* pTrack, unsigned int keyIndex)
+        : m_bIsValid(true)
+        , m_keyIndex(keyIndex)
+        , m_pTrack(pTrack) {}
+
+    void GetKey(IKey* pKey) const;
+    float GetTime() const;
+    const CTrackViewTrack* GetTrack() const { return m_pTrack; }
+
+private:
+    bool m_bIsValid;
+    unsigned int m_keyIndex;
+    const CTrackViewTrack* m_pTrack;
+};
+
+// Represents one CryMovie key
+class CTrackViewKeyHandle
+{
+public:
+    CTrackViewKeyHandle()
+        : m_bIsValid(false)
+        , m_keyIndex(0)
+        , m_pTrack(nullptr) {}
+
+    CTrackViewKeyHandle(CTrackViewTrack* pTrack, unsigned int keyIndex)
+        : m_bIsValid(true)
+        , m_keyIndex(keyIndex)
+        , m_pTrack(pTrack) {}
+
+    void SetKey(IKey* pKey);
+    void GetKey(IKey* pKey) const;
+
+    CTrackViewTrack* GetTrack() { return m_pTrack; }
+    const CTrackViewTrack* GetTrack() const { return m_pTrack; }
+
+    bool IsValid() const { return m_bIsValid; }
+    unsigned int GetIndex() const { return m_keyIndex; }
+
+    void Select(bool bSelect);
+    bool IsSelected() const;
+
+    void SetTime(float time, bool notifyListeners = true);
+    float GetTime() const;
+
+    float GetDuration() const;
+
+    const char* GetDescription() const;
+
+    void Offset(float offset, bool notifyListeners);
+
+    bool operator==(const CTrackViewKeyHandle& keyHandle) const;
+    bool operator!=(const CTrackViewKeyHandle& keyHandle) const;
+
+    // Deletes key. Note that handle will be invalid afterwards
+    void Delete();
+
+    CTrackViewKeyHandle Clone();
+
+    // Get next/prev/above/below key in expanded node tree
+    // Note: Key is assumed to be already visible
+    CTrackViewKeyHandle GetNextKey();
+    CTrackViewKeyHandle GetPrevKey();
+    CTrackViewKeyHandle GetAboveKey() const;
+    CTrackViewKeyHandle GetBelowKey() const;
+
+private:
+    bool m_bIsValid;
+    unsigned int m_keyIndex;
+    CTrackViewTrack* m_pTrack;
+};
+
+// Abstract base class that defines common
+// operations for key bundles and tracks
+class ITrackViewKeyBundle
+{
+public:
+    virtual bool AreAllKeysOfSameType() const = 0;
+
+    virtual unsigned int GetKeyCount() const = 0;
+    virtual CTrackViewKeyHandle GetKey(unsigned int index) = 0;
+
+    virtual void SelectKeys(const bool bSelected) = 0;
+};
+
+// Represents a bundle of keys
+class CTrackViewKeyBundle
+    : public ITrackViewKeyBundle
+{
+    friend class CTrackViewTrack;
+    friend class CTrackViewAnimNode;
+
+public:
+    CTrackViewKeyBundle()
+        : m_bAllOfSameType(true) {}
+
+    virtual bool AreAllKeysOfSameType() const override { return m_bAllOfSameType; }
+
+    virtual unsigned int GetKeyCount() const override { return m_keys.size(); }
+    virtual CTrackViewKeyHandle GetKey(unsigned int index) override { return m_keys[index]; }
+
+    virtual void SelectKeys(const bool bSelected) override;
+
+    CTrackViewKeyHandle GetSingleSelectedKey();
+
+private:
+    void AppendKey(const CTrackViewKeyHandle& keyHandle);
+    void AppendKeyBundle(const CTrackViewKeyBundle& bundle);
+
+    bool m_bAllOfSameType;
+    std::vector<CTrackViewKeyHandle> m_keys;
+};
+
+// Types of nodes that derive from CTrackViewNode
+enum ETrackViewNodeType
+{
+    eTVNT_Sequence,
+    eTVNT_AnimNode,
+    eTVNT_Track
+};
+
+////////////////////////////////////////////////////////////////////////////
+//
+// This is the base class for all sequences, nodes and tracks in TrackView,
+// which provides a interface for common operations
+//
+////////////////////////////////////////////////////////////////////////////
+class CTrackViewNode
+{
+public:
+    CTrackViewNode(CTrackViewNode* pParent);
+    virtual ~CTrackViewNode() {}
+
+    // Name
+    virtual const char* GetName() const = 0;
+    virtual bool SetName([[maybe_unused]] const char* pName) { return false; };
+    virtual bool CanBeRenamed() const { return false; }
+
+    // CryMovie node type
+    virtual ETrackViewNodeType GetNodeType() const = 0;
+
+    // Get the sequence of this node
+    CTrackViewSequence* GetSequence();
+    const CTrackViewSequence* GetSequenceConst() const;
+
+    // Get parent
+    CTrackViewNode* GetParentNode() const { return m_pParentNode; }
+
+    // Children
+    unsigned int GetChildCount() const { return m_childNodes.size(); }
+    CTrackViewNode* GetChild(unsigned int index) const { return m_childNodes[index].get(); }
+
+    // Snap time value to prev/next key in sequence
+    virtual bool SnapTimeToPrevKey(float& time) const = 0;
+    virtual bool SnapTimeToNextKey(float& time) const = 0;
+
+    // Selection state
+    virtual void SetSelected(bool bSelected);
+    virtual bool IsSelected() const { return m_bSelected; }
+
+    // Clear selection of this node and all sub nodes
+    void ClearSelection();
+
+    // Expanded state interface
+    virtual void SetExpanded(bool expanded) = 0;
+    virtual bool GetExpanded() const = 0;
+
+    // Disabled state
+    virtual bool CanBeEnabled() const { return true; }
+    virtual void SetDisabled([[maybe_unused]] bool bDisabled) {}
+    virtual bool IsDisabled() const { return false; }
+
+    // Hidden state
+    void SetHidden(bool bHidden);
+    bool IsHidden() const;
+
+    // Key getters
+    virtual CTrackViewKeyBundle GetSelectedKeys() = 0;
+    virtual CTrackViewKeyBundle GetAllKeys() = 0;
+    virtual CTrackViewKeyBundle GetKeysInTimeRange(const float t0, const float t1) = 0;
+
+    // Check if node itself is obsolete, or any child is an obsolete track
+    bool HasObsoleteTrack() const;
+
+    // Get above/below nodes in pCurrentNode node tree
+    CTrackViewNode* GetAboveNode() const;
+    CTrackViewNode* GetBelowNode() const;
+
+    // Get previous or next sibling of this node
+    CTrackViewNode* GetPrevSibling() const;
+    CTrackViewNode* GetNextSibling() const;
+
+    // Check if it's a group node
+    virtual bool IsGroupNode() const { return false; }
+
+    // Copy selected keys to XML representation for clipboard
+    virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) = 0;
+
+    // Sorting
+    bool operator<(const CTrackViewNode& pOtherNode) const;
+
+    // Get first selected node in tree
+    CTrackViewNode* GetFirstSelectedNode();
+
+    // Get director of this node
+    CTrackViewAnimNode* GetDirector();
+
+protected:
+    void AddNode(CTrackViewNode* pNode);
+    void SortNodes();
+
+    bool HasObsoleteTrackRec(const CTrackViewNode* pCurrentNode) const;
+
+    CTrackViewNode* m_pParentNode;
+    std::vector<std::unique_ptr<CTrackViewNode> > m_childNodes;
+
+    bool m_bSelected;
+    bool m_bHidden;
+};
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODE_H
diff --git a/Code/Editor/TrackView/TrackViewNodeFactories.cpp b/Code/Editor/TrackView/TrackViewNodeFactories.cpp
new file mode 100644
index 0000000000..7bdcb4b608
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewNodeFactories.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "TrackViewNodeFactories.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "TrackViewEventNode.h"
+
+
+CTrackViewAnimNode* CTrackViewAnimNodeFactory::BuildAnimNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode)
+{
+    CTrackViewAnimNode* retNode = nullptr;
+
+    if (pAnimNode->GetType() == AnimNodeType::Event)
+    {
+        retNode = new CTrackViewEventNode(pSequence, pAnimNode, pParentNode);
+    }
+    else
+    {
+        retNode = new CTrackViewAnimNode(pSequence, pAnimNode, pParentNode);
+    }
+
+    return retNode;
+}
+
+CTrackViewTrack* CTrackViewTrackFactory::BuildTrack(IAnimTrack* pTrack, CTrackViewAnimNode* pTrackAnimNode,
+    CTrackViewNode* pParentNode, bool bIsSubTrack, unsigned int subTrackIndex)
+{
+    return new CTrackViewTrack(pTrack, pTrackAnimNode, pParentNode, bIsSubTrack, subTrackIndex);
+}
diff --git a/Code/Editor/TrackView/TrackViewNodeFactories.h b/Code/Editor/TrackView/TrackViewNodeFactories.h
new file mode 100644
index 0000000000..832c30e6a1
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewNodeFactories.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODEFACTORIES_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODEFACTORIES_H
+#pragma once
+
+
+class CTrackViewTrack;
+class CTrackViewAnimNode;
+class CTrackViewNode;
+
+class CTrackViewAnimNodeFactory
+{
+public:
+    CTrackViewAnimNode* BuildAnimNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode);
+};
+
+class CTrackViewTrackFactory
+{
+public:
+    CTrackViewTrack* BuildTrack(IAnimTrack* pTrack, CTrackViewAnimNode* pTrackAnimNode,
+        CTrackViewNode* pParentNode, bool bIsSubTrack = false, unsigned int subTrackIndex = 0);
+};
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODEFACTORIES_H
diff --git a/Code/Editor/TrackView/TrackViewNodes.cpp b/Code/Editor/TrackView/TrackViewNodes.cpp
new file mode 100644
index 0000000000..54d852bc57
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewNodes.cpp
@@ -0,0 +1,2981 @@
+/*
+ * 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 : TrackView's tree control.
+
+
+#include "EditorDefs.h"
+
+#include "TrackViewNodes.h"
+
+// Qt
+#include <QAction>
+#include <QMenu>
+#include <QMimeData>
+#include <QCompleter>
+#include <QScrollBar>
+#include <QMessageBox>
+#include <QStyledItemDelegate>
+#include <QDropEvent>
+#include <QFileDialog>
+
+// AzToolsFramework
+#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/ColorPicker.h>
+
+// CryCommon
+#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
+#include <CryCommon/Maestro/Types/AnimValueType.h>
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+#include <CryCommon/Maestro/Types/SequenceType.h>
+
+// Editor
+#include "StringDlg.h"
+#include "TrackView/TVEventsDialog.h"
+#include "TrackView/TrackViewDialog.h"
+#include "Objects/SelectionGroup.h"
+#include "Objects/ObjectManager.h"
+#include "Util/AutoDirectoryRestoreFileDialog.h"
+#include "TrackViewFBXImportPreviewDialog.h"
+#include "AnimationContext.h"
+
+
+CTrackViewNodesCtrl::CRecord::CRecord(CTrackViewNode* pNode /*= nullptr*/)
+    : m_pNode(pNode)
+    , m_bVisible(false)
+{
+    if (pNode)
+    {
+        QVariant v;
+        v.setValue<CTrackViewNodePtr>(pNode);
+        setData(0, Qt::UserRole, v);
+    }
+}
+
+class CTrackViewNodesCtrlDelegate
+    : public QStyledItemDelegate
+{
+public:
+    CTrackViewNodesCtrlDelegate(QObject* parent = nullptr)
+        : QStyledItemDelegate(parent)
+    {}
+
+    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+    {
+        bool enabled = index.data(CTrackViewNodesCtrl::CRecord::EnableRole).toBool();
+        QStyleOptionViewItem opt = option;
+        if (!enabled)
+        {
+            opt.state &= ~QStyle::State_Enabled;
+        }
+        QStyledItemDelegate::paint(painter, opt, index);
+    }
+};
+
+
+class CTrackViewNodesTreeWidget
+    : public QTreeWidget
+{
+public:
+    CTrackViewNodesTreeWidget(QWidget* parent)
+        : QTreeWidget(parent)
+        , m_controller(nullptr)
+    {
+        setItemDelegate(new CTrackViewNodesCtrlDelegate(this));
+    }
+
+    void setController(CTrackViewNodesCtrl* p)
+    {
+        m_controller = p;
+    }
+
+protected:
+
+    // Allow both CopyActions and MoveActions to be valid drag and drop operations.
+    Qt::DropActions supportedDropActions() const override
+    {
+        return Qt::CopyAction | Qt::MoveAction;
+    }
+
+    void dragMoveEvent(QDragMoveEvent* event)
+    {
+        CTrackViewNodesCtrl::CRecord* record = (CTrackViewNodesCtrl::CRecord*) itemAt(event->pos());
+        if (!record)
+        {
+            return;
+        }
+        CTrackViewNode* pTargetNode = record->GetNode();
+
+        QTreeWidget::dragMoveEvent(event);
+        if (!event->isAccepted())
+        {
+            return;
+        }
+
+        if (pTargetNode && pTargetNode->IsGroupNode() /*&& !m_draggedNodes.DoesContain(pTargetNode)*/)
+        {
+            CTrackViewAnimNode* pDragTarget = static_cast<CTrackViewAnimNode*>(pTargetNode);
+            bool bAllValidReparenting = true;
+            QList<CTrackViewAnimNode*> nodes = draggedNodes(event);
+            Q_FOREACH(CTrackViewAnimNode * pDraggedNode, nodes)
+            {
+                if (!pDraggedNode->IsValidReparentingTo(pDragTarget))
+                {
+                    bAllValidReparenting = false;
+                    break;
+                }
+            }
+
+            if (!(bAllValidReparenting && !nodes.isEmpty()))
+            {
+                event->ignore();
+            }
+
+            return;
+        }
+    }
+
+    void dropEvent(QDropEvent* event)
+    {
+        CTrackViewNodesCtrl::CRecord* record = (CTrackViewNodesCtrl::CRecord*) itemAt(event->pos());
+        if (!record)
+        {
+            return;
+        }
+        CTrackViewNode* targetNode = record->GetNode();
+
+        if (targetNode && targetNode->IsGroupNode())
+        {
+            CTrackViewAnimNode* dragTarget = static_cast<CTrackViewAnimNode*>(targetNode);
+            bool allValidReparenting = true;
+            QList<CTrackViewAnimNode*> nodes = draggedNodes(event);
+            Q_FOREACH(CTrackViewAnimNode * draggedNode, nodes)
+            {
+                if (!draggedNode->IsValidReparentingTo(dragTarget))
+                {
+                    allValidReparenting = false;
+                    break;
+                }
+            }
+
+            if (allValidReparenting && !nodes.isEmpty())
+            {
+                // By default here the drop action is a CopyAction. That is what we want in case
+                // some other random control accepts this drop (and then does nothing with the data). 
+                // If that happens we will not receive any notifications. If the Action default was MoveAction,
+                // the dragged items in the tree would be deleted out from under us causing a crash.
+                // Since we are here, we know this drop is on the same control so we can
+                // switch it to a MoveAction right now. The node parents will be fixed up below.
+                event->setDropAction(Qt::MoveAction);
+
+                QTreeWidget::dropEvent(event);
+                if (!event->isAccepted())
+                {
+                    return;
+                }
+
+                if (nodes.size() > 0)
+                {
+                    // All nodes are from the same sequence
+                    CTrackViewSequence* sequence = nodes[0]->GetSequence();
+                    AZ_Assert(nullptr != sequence, "GetSequence() should never be null");
+
+                    AzToolsFramework::ScopedUndoBatch undoBatch("Drag and Drop Track View Nodes");
+                    Q_FOREACH(CTrackViewAnimNode * draggedNode, nodes)
+                    {
+                        draggedNode->SetNewParent(dragTarget);
+                        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+                    }
+                }
+            }
+        }
+    }
+
+    void keyPressEvent(QKeyEvent* event)
+    {
+        // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
+        switch (event->key())
+        {
+        case Qt::Key_Tab:
+            if (m_controller)
+            {
+                m_controller->ShowNextResult();
+                event->accept();
+            }
+            return;
+        default:
+            break;
+        }
+        QTreeWidget::keyPressEvent(event);
+    }
+
+    bool event(QEvent* e) override
+    {
+        if (e->type() == QEvent::ShortcutOverride)
+        {
+            // since we respond to the following things, let Qt know so that shortcuts don't override us
+            bool respondsToEvent = false;
+
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
+            if (keyEvent->key() == Qt::Key_Tab)
+            {
+                respondsToEvent = true;
+            }
+
+            if (respondsToEvent)
+            {
+                e->accept();
+                return true;
+            }
+        }
+
+        return QTreeWidget::event(e);
+    }
+
+
+    bool focusNextPrevChild([[maybe_unused]] bool next)
+    {
+        return false;   // so we get the tab key
+    }
+
+private:
+    QList<CTrackViewAnimNode*> draggedNodes(QDropEvent* event)
+    {
+        QByteArray encoded = event->mimeData()->data("application/x-qabstractitemmodeldatalist");
+        QDataStream stream(&encoded, QIODevice::ReadOnly);
+
+        QList<CTrackViewAnimNode*> nodes;
+        while (!stream.atEnd())
+        {
+            int row, col;
+            QMap<int, QVariant> roleDataMap;
+            stream >> row >> col >> roleDataMap;
+
+            QVariant v = roleDataMap[Qt::UserRole];
+            if (v.isValid())
+            {
+                CTrackViewNode* pNode = v.value<CTrackViewNodePtr>();
+                if (pNode && pNode->GetNodeType() == eTVNT_AnimNode)
+                {
+                    nodes << (CTrackViewAnimNode*)pNode;
+                }
+            }
+        }
+        return nodes;
+    }
+
+    CTrackViewNodesCtrl*    m_controller;
+};
+
+QDataStream& operator<<(QDataStream& out, const CTrackViewNodePtr& obj)
+{
+    out.writeRawData((const char*) &obj, sizeof(obj));
+    return out;
+}
+
+QDataStream& operator>>(QDataStream& in, CTrackViewNodePtr& obj)
+{
+    in.readRawData((char*) &obj, sizeof(obj));
+    return in;
+}
+
+
+
+enum EMenuItem
+{
+    eMI_SelectInViewport = 603,
+    eMI_CopyNodes = 605,
+    eMI_CopySelectedNodes = 602,
+    eMI_PasteNodes = 604,
+    eMI_RemoveSelected = 10,
+    eMI_CopyKeys = 599,
+    eMI_CopySelectedKeys = 600,
+    eMI_PasteKeys = 601,
+    eMI_AddTrackBase = 1000,
+    eMI_RemoveTrack = 299,
+    eMI_ExpandAll = 650,
+    eMI_CollapseAll = 659,
+    eMI_ExpandFolders = 660,
+    eMI_CollapseFolders = 661,
+    eMI_ExpandEntities = 651,
+    eMI_CollapseEntities = 652,
+    eMI_ExpandCameras = 653,
+    eMI_CollapseCameras = 654,
+    eMI_ExpandMaterials = 655,
+    eMI_CollapseMaterials = 656,
+    eMI_ExpandEvents = 657,
+    eMI_CollapseEvents = 658,
+    eMI_Rename = 11,
+    eMI_CreateFolder = 610,
+    eMI_AddSelectedEntities = 500,
+    eMI_AddDirectorNode = 501,
+    eMI_AddConsoleVariable = 502,
+    eMI_AddScriptVariable = 503,
+    eMI_AddMaterial = 504,
+    eMI_AddEvent = 505,
+    eMI_AddCurrentLayer = 506,
+    eMI_AddCommentNode = 507,
+    eMI_AddRadialBlur = 508,
+    eMI_AddColorCorrection = 509,
+    eMI_AddDOF = 510,
+    eMI_AddScreenfader = 511,
+    eMI_AddShadowSetup = 513,
+    eMI_AddEnvironment = 514,
+    eMI_EditEvents = 550,
+    eMI_SaveToFBX = 12,
+    eMI_ImportFromFBX = 14,
+    eMI_SetAsViewCamera = 13,
+    eMI_SetAsActiveDirector = 15,
+    eMI_Disable = 17,
+    eMI_Mute = 18,
+    eMI_CustomizeTrackColor = 19,
+    eMI_ClearCustomTrackColor = 20,
+    eMI_ShowHideBase = 100,
+    eMI_SelectSubmaterialBase = 2000,
+    eMI_SetAnimationLayerBase = 3000,
+};
+
+// The 'MI' represents a Menu Item.
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <TrackView/ui_TrackViewNodes.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNodesCtrl::CTrackViewNodesCtrl(QWidget* hParentWnd, CTrackViewDialog* parent /* = 0 */)
+    : QWidget(hParentWnd)
+    , m_bIgnoreNotifications(false)
+    , m_bNeedReload(false)
+    , m_bSelectionChanging(false)
+    , ui(new Ui::CTrackViewNodesCtrl)
+    , m_pTrackViewDialog(parent)
+{
+    ui->setupUi(this);
+    m_pDopeSheet = 0;
+    m_currentMatchIndex = 0;
+    m_matchCount = 0;
+
+    qRegisterMetaType<CTrackViewNodePtr>("CTrackViewNodePtr");
+    qRegisterMetaTypeStreamOperators<CTrackViewNodePtr>("CTrackViewNodePtr");
+
+    ui->treeWidget->hide();
+    ui->searchField->hide();
+    ui->searchCount->hide();
+    ui->searchField->installEventFilter(this);
+
+    ui->treeWidget->setController(this);
+    ui->treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(ui->treeWidget, &QTreeWidget::customContextMenuRequested, this, &CTrackViewNodesCtrl::OnNMRclick);
+    connect(ui->treeWidget, &QTreeWidget::itemExpanded, this, &CTrackViewNodesCtrl::OnItemExpanded);
+    connect(ui->treeWidget, &QTreeWidget::itemCollapsed, this, &CTrackViewNodesCtrl::OnItemExpanded);
+    connect(ui->treeWidget, &QTreeWidget::itemSelectionChanged, this, &CTrackViewNodesCtrl::OnSelectionChanged);
+    connect(ui->treeWidget, &QTreeWidget::itemDoubleClicked, this, &CTrackViewNodesCtrl::OnItemDblClick);
+
+    connect(ui->searchField, &QLineEdit::textChanged, this, &CTrackViewNodesCtrl::OnFilterChange);
+
+    // legacy node icons are enumerated and stored as png files on disk
+    for (int i = 0; i <= 29; i++)
+    {
+        QIcon icon(QString(":/nodes/tvnodes-%1.png").arg(i, 2, 10, QLatin1Char('0')));
+        if (!icon.isNull())
+        {
+            m_imageList[i] = icon;
+        }
+    }
+
+    m_bEditLock = false;
+
+    m_arrowCursor = Qt::ArrowCursor;
+    m_noIcon = Qt::ForbiddenCursor;
+
+    ///////////////////////////////////////////////////////////////
+    // Populate m_componentTypeToIconMap with all component icons
+    AZ::SerializeContext* serializeContext = nullptr;
+    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ_Assert(serializeContext, "Failed to acquire serialize context.");
+
+    serializeContext->EnumerateDerived<AZ::Component>([this](const AZ::SerializeContext::ClassData* classData, const AZ::Uuid&) -> bool
+    {
+        AZStd::string iconPath;
+        EBUS_EVENT_RESULT(iconPath, AzToolsFramework::EditorRequests::Bus, GetComponentEditorIcon, classData->m_typeId, nullptr);
+        if (!iconPath.empty())
+        {
+            m_componentTypeToIconMap[classData->m_typeId] = QIcon(iconPath.c_str());
+        }
+
+        return true; // continue enumerating
+    });
+    ///////////////////////////////////////////////////////////////
+
+
+    GetIEditor()->GetUndoManager()->AddListener(this);
+};
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNodesCtrl::~CTrackViewNodesCtrl()
+{
+    GetIEditor()->GetUndoManager()->RemoveListener(this);
+}
+
+bool CTrackViewNodesCtrl::eventFilter(QObject* o, QEvent* e)
+{
+    if (o == ui->searchField && e->type() == QEvent::KeyPress)
+    {
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
+        if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier)
+        {
+            ShowNextResult();
+            return true;
+        }
+    }
+    return QWidget::eventFilter(o, e);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnSequenceChanged()
+{
+    assert(m_pTrackViewDialog);
+
+    m_nodeToRecordMap.clear();
+    ui->treeWidget->clear();
+
+    FillAutoCompletionListForFilter();
+
+    Reload();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::SetDopeSheet(CTrackViewDopeSheetBase* pDopeSheet)
+{
+    m_pDopeSheet = pDopeSheet;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewNodesCtrl::GetIconIndexForTrack(const CTrackViewTrack* pTrack) const
+{
+    int nImage = 13; // Default
+
+    if (!pTrack)
+    {
+        return nImage;
+    }
+
+    CAnimParamType paramType = pTrack->GetParameterType();
+    AnimValueType valueType = pTrack->GetValueType();
+    AnimNodeType nodeType = pTrack->GetAnimNode()->GetType();
+
+    // If it's a track which belongs to the post-fx node,
+    // just use a default icon.
+    if (nodeType == AnimNodeType::RadialBlur
+        || nodeType == AnimNodeType::ColorCorrection
+        || nodeType == AnimNodeType::DepthOfField
+        || nodeType == AnimNodeType::ShadowSetup)
+    {
+        return nImage;
+    }
+
+    AnimParamType type = paramType.GetType();
+
+    if (type == AnimParamType::FOV)
+    {
+        nImage = 2;
+    }
+    else if (type == AnimParamType::Position)
+    {
+        nImage = 3;
+    }
+    else if (type == AnimParamType::Rotation)
+    {
+        nImage = 4;
+    }
+    else if (type == AnimParamType::Scale)
+    {
+        nImage = 5;
+    }
+    else if (type == AnimParamType::Event || type == AnimParamType::TrackEvent)
+    {
+        nImage = 6;
+    }
+    else if (type == AnimParamType::Visibility)
+    {
+        nImage = 7;
+    }
+    else if (type == AnimParamType::Camera)
+    {
+        nImage = 8;
+    }
+    else if (type == AnimParamType::Sound)
+    {
+        nImage = 9;
+    }
+    else if (type == AnimParamType::Animation || type == AnimParamType::TimeRanges || valueType == AnimValueType::CharacterAnim || valueType == AnimValueType::AssetBlend)
+    {
+        nImage = 10;
+    }
+    else if (type == AnimParamType::Sequence)
+    {
+        nImage = 11;
+    }
+    else if (type == AnimParamType::Float)
+    {
+        nImage = 13;
+    }
+    else if (type == AnimParamType::Capture)
+    {
+        nImage = 25;
+    }
+    else if (type == AnimParamType::Console)
+    {
+        nImage = 15;
+    }
+    else if (type == AnimParamType::LookAt)
+    {
+        nImage = 17;
+    }
+    else if (type == AnimParamType::TimeWarp)
+    {
+        nImage = 22;
+    }
+    else if (type == AnimParamType::CommentText)
+    {
+        nImage = 23;
+    }
+    else if (type == AnimParamType::ShakeMultiplier || type == AnimParamType::TransformNoise)
+    {
+        nImage = 28;
+    }
+
+    return nImage;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewNodesCtrl::GetIconIndexForNode(AnimNodeType type) const
+{
+    int nImage = 0;
+    if (type == AnimNodeType::AzEntity)
+    {
+        nImage = 29;
+    }
+    else if (type == AnimNodeType::Director)
+    {
+        nImage = 27;
+    }
+    else if (type == AnimNodeType::CVar)
+    {
+        nImage = 15;
+    }
+    else if (type == AnimNodeType::ScriptVar)
+    {
+        nImage = 14;
+    }
+    else if (type == AnimNodeType::Material)
+    {
+        nImage = 16;
+    }
+    else if (type == AnimNodeType::Event)
+    {
+        nImage = 6;
+    }
+    else if (type == AnimNodeType::Group)
+    {
+        nImage = 1;
+    }
+    else if (type == AnimNodeType::Layer)
+    {
+        nImage = 20;
+    }
+    else if (type == AnimNodeType::Comment)
+    {
+        nImage = 23;
+    }
+    else if (type == AnimNodeType::Light)
+    {
+        nImage = 18;
+    }
+    else if (type == AnimNodeType::ShadowSetup)
+    {
+        nImage = 24;
+    }
+
+    return nImage;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::AddAnimNodeRecord(CRecord* pParentRecord, CTrackViewAnimNode* animNode)
+{
+    CRecord* pNewRecord = new CRecord(animNode);
+
+    pNewRecord->setText(0, animNode->GetName());
+    UpdateAnimNodeRecord(pNewRecord, animNode);
+    pParentRecord->insertChild(GetInsertPosition(pParentRecord, animNode), pNewRecord);
+    FillNodesRec(pNewRecord, animNode);
+
+    return pNewRecord;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::AddTrackRecord(CRecord* pParentRecord, CTrackViewTrack* pTrack)
+{
+    CRecord* pNewTrackRecord = new CRecord(pTrack);
+    pNewTrackRecord->setSizeHint(0, QSize(30, 18));
+    pNewTrackRecord->setText(0, pTrack->GetName());
+    UpdateTrackRecord(pNewTrackRecord, pTrack);
+    pParentRecord->insertChild(GetInsertPosition(pParentRecord, pTrack), pNewTrackRecord);
+    FillNodesRec(pNewTrackRecord, pTrack);
+
+    return pNewTrackRecord;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewNodesCtrl::GetInsertPosition(CRecord* pParentRecord, CTrackViewNode* pNode)
+{
+    // Search for insert position
+    const int siblingCount = pParentRecord->childCount();
+    for (int i = 0; i < siblingCount; ++i)
+    {
+        CRecord* record = static_cast<CRecord*>(pParentRecord->child(i));
+        CTrackViewNode* pSiblingNode = record->GetNode();
+
+        if (*pNode < *pSiblingNode)
+        {
+            return i;
+        }
+    }
+
+    return siblingCount;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::AddNodeRecord(CRecord* record, CTrackViewNode* pNode)
+{
+    assert(m_nodeToRecordMap.find(pNode) == m_nodeToRecordMap.end());
+    if (m_nodeToRecordMap.find(pNode) != m_nodeToRecordMap.end())
+    {
+        // For safety. Shouldn't happen
+        return;
+    }
+
+    CRecord* pNewRecord = nullptr;
+
+    if (pNode->IsHidden())
+    {
+        return;
+    }
+
+    switch (pNode->GetNodeType())
+    {
+    case eTVNT_AnimNode:
+        pNewRecord = AddAnimNodeRecord(record, static_cast<CTrackViewAnimNode*>(pNode));
+        break;
+    case eTVNT_Track:
+        pNewRecord = AddTrackRecord(record, static_cast<CTrackViewTrack*>(pNode));
+        break;
+    }
+
+    if (pNewRecord)
+    {
+        if (!pNode->IsGroupNode() && pNode->GetChildCount() == 0)       // groups and compound tracks are draggable
+        {
+            pNewRecord->setFlags(pNewRecord->flags() & ~Qt::ItemIsDragEnabled);
+        }
+        if (!pNode->IsGroupNode())                                      // only groups can be dropped into
+        {
+            pNewRecord->setFlags(pNewRecord->flags() & ~Qt::ItemIsDropEnabled);
+        }
+        if (pNode->GetExpanded())
+        {
+            pNewRecord->setExpanded(true);
+        }
+
+        if (pNode->IsSelected())
+        {
+            m_bIgnoreNotifications = true;
+            SelectRow(pNode, false, false);
+            m_bIgnoreNotifications = false;
+        }
+
+        m_nodeToRecordMap[pNode] = pNewRecord;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::FillNodesRec(CRecord* record, CTrackViewNode* pCurrentNode)
+{
+    const unsigned int childCount = pCurrentNode->GetChildCount();
+
+    for (unsigned int childIndex = 0; childIndex < childCount; ++childIndex)
+    {
+        CTrackViewNode* pNode = pCurrentNode->GetChild(childIndex);
+
+        if (!pNode->IsHidden())
+        {
+            AddNodeRecord(record, pNode);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::UpdateNodeRecord(CRecord* record)
+{
+    CTrackViewNode* pNode = record->GetNode();
+
+    if (pNode)
+    {
+        switch (pNode->GetNodeType())
+        {
+        case eTVNT_AnimNode:
+            UpdateAnimNodeRecord(record, static_cast<CTrackViewAnimNode*>(pNode));
+            break;
+        case eTVNT_Track:
+            UpdateTrackRecord(record, static_cast<CTrackViewTrack*>(pNode));
+            break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::UpdateTrackRecord(CRecord* record, CTrackViewTrack* pTrack)
+{
+    int nImage = GetIconIndexForTrack(pTrack);
+    assert(m_imageList.contains(nImage));
+    record->setIcon(0, m_imageList[nImage]);
+
+    // Check if parameter is valid for non sub tracks
+    CTrackViewAnimNode* animNode = pTrack->GetAnimNode();
+    const bool isParamValid = pTrack->IsSubTrack() || animNode->IsParamValid(pTrack->GetParameterType());
+
+    // Check if disabled or muted
+    const bool bDisabledOrMuted = pTrack->IsDisabled() || pTrack->IsMuted();
+
+    // If track is not valid and disabled/muted color node in grey
+    record->setData(0, CRecord::EnableRole, !bDisabledOrMuted && isParamValid);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::UpdateAnimNodeRecord(CRecord* record, CTrackViewAnimNode* animNode)
+{
+    const QColor TextColorForMissingEntity(226, 52, 43);        // LY palette for 'Error/Failure'
+    const QColor TextColorForInvalidMaterial(226, 52, 43);      // LY palette for 'Error/Failure'
+    const QColor BackColorForActiveDirector(243, 81, 29);       // LY palette for 'Primary'
+    const QColor BackColorForInactiveDirector(22, 23, 27);      // LY palette for 'Background (In Focus)'
+    const QColor BackColorForGroupNodes(42, 84, 244);           // LY palette for 'Secondary'
+
+    QFont f = font();
+    f.setBold(true);
+    record->setFont(0, f);
+
+    AnimNodeType nodeType = animNode->GetType();
+    if (nodeType == AnimNodeType::Component)
+    {
+        // get the component icon from cached component icons
+        
+        AZ::Entity* azEntity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(azEntity, &AZ::ComponentApplicationBus::Events::FindEntity, 
+                                                        static_cast<CTrackViewAnimNode*>(animNode->GetParentNode())->GetAzEntityId());
+        if (azEntity)
+        {
+            const AZ::Component* component = azEntity->FindComponent(animNode->GetComponentId());
+            if (component)
+            {
+                auto findIter = m_componentTypeToIconMap.find(AzToolsFramework::GetUnderlyingComponentType(*component));
+                if (findIter != m_componentTypeToIconMap.end())
+                {
+                    record->setIcon(0, findIter->second);
+                }
+            }           
+        }     
+    }
+    else
+    {
+        // legacy node icons
+        int nNodeImage = GetIconIndexForNode(nodeType);
+        assert(m_imageList.contains(nNodeImage));
+
+        record->setIcon(0, m_imageList[nNodeImage]);
+    }
+    
+
+    const bool disabled = animNode->IsDisabled();
+    record->setData(0, CRecord::EnableRole, !disabled);
+
+    if (nodeType == AnimNodeType::Group)
+    {
+        record->setBackground(0, BackColorForGroupNodes);
+        record->setSizeHint(0, QSize(30, 20));
+    }
+    else if (nodeType == AnimNodeType::AzEntity)
+    {
+        AZ::Entity* entity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(
+            entity, &AZ::ComponentApplicationBus::Events::FindEntity, animNode->GetAzEntityId());
+
+        if (!entity)
+        {
+            // In case of a missing entity, color it red.
+            record->setForeground(0, TextColorForMissingEntity);
+        }
+    }
+    else if (nodeType == AnimNodeType::Material)
+    {
+        record->setForeground(0, TextColorForInvalidMaterial);
+    }
+
+    // Mark the active director and other directors properly.
+    if (animNode->IsActiveDirector())
+    {
+        record->setBackground(0, BackColorForActiveDirector);
+    }
+    else if (nodeType == AnimNodeType::Director)
+    {
+        record->setBackground(0, BackColorForInactiveDirector);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::Reload()
+{
+    ui->treeWidget->clear();
+    OnFillItems();
+}
+
+
+void CTrackViewNodesCtrl::OnFillItems()
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        CTrackViewSequenceNotificationContext context(sequence);
+
+        m_nodeToRecordMap.clear();
+
+        CRecord* pRootGroupRec = new CRecord(sequence);
+        pRootGroupRec->setText(0, sequence->GetName());
+        QFont f = font();
+        f.setBold(true);
+        pRootGroupRec->setData(0, Qt::FontRole, f);
+        pRootGroupRec->setSizeHint(0, QSize(width(), 24));
+
+        m_nodeToRecordMap[sequence] = pRootGroupRec;
+        ui->treeWidget->addTopLevelItem(pRootGroupRec);
+
+        FillNodesRec(pRootGroupRec, sequence);
+        pRootGroupRec->setExpanded(sequence->GetExpanded());
+
+        // Additional empty record like space for scrollbar in key control
+        CRecord* pGroupRec = new CRecord();
+        pGroupRec->setSizeHint(0, QSize(width(), 18));
+        ui->treeWidget->addTopLevelItem(pRootGroupRec);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnItemExpanded(QTreeWidgetItem* item)
+{
+    CRecord* record = (CRecord*) item;
+
+    if (record && record->GetNode())
+    {
+        bool currentlyExpanded = record->GetNode()->GetExpanded();
+        bool expanded = item->isExpanded();
+
+        if (expanded != currentlyExpanded)
+        {
+            bool isDuringUndo = false;
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+            // Don't record another undo event if this OnItemExpanded callback is fired because we are Undoing or Redoing.
+            if (isDuringUndo)
+            {
+                record->GetNode()->SetExpanded(expanded);
+            }
+            else
+            {
+                CTrackViewSequence* sequence = record->GetNode()->GetSequence();
+                AZ_Assert(nullptr != sequence, "Expected valid sequence");
+                AzToolsFramework::ScopedUndoBatch undoBatch("Set Node Expanded");
+                record->GetNode()->SetExpanded(expanded);
+                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+            }
+        }
+    }
+
+    UpdateDopeSheet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnSelectionChanged()
+{
+    // Need to avoid the second call to this, because GetSelectedRows is broken
+    // with multi selection
+    if (m_bSelectionChanging)
+    {
+        return;
+    }
+    m_bSelectionChanging = true;
+
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        CTrackViewSequenceNotificationContext context(sequence);
+        sequence->ClearSelection();
+
+        QList<QTreeWidgetItem*> items = ui->treeWidget->selectedItems();
+        int nCount = items.count();
+        for (int i = 0; i < nCount; i++)
+        {
+            CRecord* record = (CRecord*)items.at(i);
+
+            if (record && record->GetNode())
+            {
+                if (!record->GetNode()->IsSelected())
+                {
+                    record->GetNode()->SetSelected(true);
+                    ui->treeWidget->setCurrentItem(record);
+                }
+            }
+        }
+    }
+
+    m_bSelectionChanging = false;
+    UpdateDopeSheet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnNMRclick(QPoint point)
+{
+    CRecord* record = 0;
+    bool isOnAzEntity = false;
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    CTrackViewSequenceNotificationContext context(sequence);
+
+    // Find node under mouse.
+    // Select the item that is at the point myPoint.
+    record = static_cast<CRecord*>(ui->treeWidget->itemAt(point));
+
+    CTrackViewAnimNode* groupNode = nullptr;
+    CTrackViewNode* pNode = nullptr;
+    CTrackViewAnimNode* animNode = nullptr;
+    CTrackViewTrack* pTrack = nullptr;
+
+    if (record && record->GetNode())
+    {
+        pNode = record->GetNode();
+
+        if (pNode)
+        {
+            ETrackViewNodeType nodeType = pNode->GetNodeType();
+
+            if (nodeType == eTVNT_AnimNode)
+            {
+                animNode = static_cast<CTrackViewAnimNode*>(pNode);
+                isOnAzEntity = (animNode && animNode->GetType() == AnimNodeType::AzEntity);
+
+                if (animNode->GetType() == AnimNodeType::Director || animNode->GetType() == AnimNodeType::Group || isOnAzEntity)
+                {
+                    groupNode = animNode;
+                }
+            }
+            else if (nodeType == eTVNT_Sequence)
+            {
+                groupNode = sequence;
+            }
+            else if (nodeType == eTVNT_Track)
+            {
+                pTrack = static_cast<CTrackViewTrack*>(pNode);
+                animNode = pTrack->GetAnimNode();
+            }
+        }
+    }
+    else
+    {
+        pNode = sequence;
+        groupNode = sequence;
+        record = m_nodeToRecordMap[sequence];
+    }
+
+    int cmd = ShowPopupMenu(point, record);
+
+    float scrollPos = SaveVerticalScrollPos();
+
+    if (cmd == eMI_SaveToFBX)
+    {
+        CExportManager* pExportManager = static_cast<CExportManager*>(GetIEditor()->GetExportManager());
+
+        if (pExportManager)
+        {
+            CTrackViewSequence* sequence2 = GetIEditor()->GetAnimation()->GetSequence();
+            if (!sequence2)
+            {
+                return;
+            }
+
+            CTrackViewAnimNodeBundle selectedNodes = sequence2->GetSelectedAnimNodes();
+            const unsigned int numSelectedNodes = selectedNodes.GetCount();
+            if (numSelectedNodes == 0)
+            {
+                return;
+            }
+
+            QString file = QString(sequence2->GetName()) + QString(".fbx");
+            QString selectedSequenceFBXStr = QString(sequence2->GetName()) + ".fbx";
+
+            if (numSelectedNodes > 1)
+            {
+                file = selectedSequenceFBXStr;
+            }
+            else
+            {
+                file = QString(selectedNodes.GetNode(0)->GetName()) + QString(".fbx");
+            }
+
+            QString path = QFileDialog::getSaveFileName(this, tr("Export Selected Nodes To FBX File"), QString(), tr("FBX Files (*.fbx)"));
+
+            if (!path.isEmpty())
+            {
+                pExportManager->SetBakedKeysSequenceExport(false);
+                pExportManager->Export(path.toUtf8().data(), "", "", false, false, false, true);
+            }
+        }
+    }
+    else if (cmd == eMI_ImportFromFBX)
+    {
+        if (animNode)
+        {
+            ImportFromFBX();
+        }
+    }
+    else if (cmd == eMI_SetAsViewCamera)
+    {
+        if (animNode && animNode->GetType() == AnimNodeType::Camera)
+        {
+            animNode->SetAsViewCamera();
+        }
+    }
+    else if (cmd == eMI_RemoveSelected)
+    {
+        // If we are about to delete the sequence, cancel the notification
+        // context, otherwise it will notify on a stale sequence pointer.
+        if (sequence->IsSelected())
+        {
+            context.Cancel();
+        }
+
+        // Let the AZ Undo system manage the nodes on the sequence entity
+        AzToolsFramework::ScopedUndoBatch undoBatch("Delete Selected Nodes/Tracks");
+        auto id = sequence->GetSequenceComponentEntityId();
+        sequence->DeleteSelectedNodes();
+        undoBatch.MarkEntityDirty(id);
+    }
+
+    if (groupNode)
+    {
+        // Group operations applicable to AZEntities and Group Nodes
+        if (cmd == eMI_ExpandAll)
+        {
+            BeginUndoTransaction();
+            groupNode->GetAllAnimNodes().ExpandAll();
+            EndUndoTransaction();
+        }
+        else if (cmd == eMI_CollapseAll)
+        {
+            BeginUndoTransaction();
+            groupNode->GetAllAnimNodes().CollapseAll();
+            EndUndoTransaction();
+        }
+
+        if (!isOnAzEntity)
+        {
+            // Group operations not applicable to AZEntities
+            if (cmd == eMI_AddSelectedEntities)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Entities to Track View");
+                CTrackViewAnimNodeBundle addedNodes = groupNode->AddSelectedEntities(m_pTrackViewDialog->GetDefaultTracksForEntityNode());
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+
+                int selectedEntitiesCount = 0;
+                AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+                    selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
+
+                // check to make sure all nodes were added and notify user if they weren't
+                if (addedNodes.GetCount() != selectedEntitiesCount)
+                {
+                    IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();
+
+                    AZStd::string messages = movieSystem->GetUserNotificationMsgs();
+
+                    // Create a list of all lines
+                    AZStd::vector<AZStd::string> lines;
+                    AzFramework::StringFunc::Tokenize(messages.c_str(), lines, "\n");
+
+                    // Truncate very long messages. No information is lost because
+                    // all of these errors will have been logged to the console already.
+                    const int maxLines = 30;
+                    AZStd::string shortMessages;
+                    if (lines.size() > maxLines)
+                    {
+                        int numLines = 0;
+                        for (AZStd::string line : lines)
+                        {
+                            shortMessages += line + "\n";
+                            if (++numLines >= maxLines)
+                            {
+                                break;
+                            }
+                        }
+                        shortMessages += "Message truncated, please see console for a full list of warnings.\n";
+                    }
+                    else
+                    {
+                        shortMessages = messages;
+                    }
+
+                    QMessageBox::information(this, tr("Track View Warning"), tr(shortMessages.c_str()));
+
+                    // clear the notification log now that we've consumed and presented them.
+                    movieSystem->ClearUserNotificationMsgs();
+                }
+
+                groupNode->BindToEditorObjects();
+            }
+            else if (cmd == eMI_AddCurrentLayer)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Current Layer to Track View");
+                groupNode->AddCurrentLayer();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddScreenfader)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Screen Fader Node");
+                groupNode->CreateSubNode("ScreenFader", AnimNodeType::ScreenFader);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddCommentNode)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Comment Node");
+                QString commentNodeName = groupNode->GetAvailableNodeNameStartingWith("Comment");
+                groupNode->CreateSubNode(commentNodeName, AnimNodeType::Comment);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddRadialBlur)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Radial Blur Node");
+                groupNode->CreateSubNode("RadialBlur", AnimNodeType::RadialBlur);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddColorCorrection)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Color Correction Node");
+                groupNode->CreateSubNode("ColorCorrection", AnimNodeType::ColorCorrection);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddDOF)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Depth of Field Node");
+                groupNode->CreateSubNode("DepthOfField", AnimNodeType::DepthOfField);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddShadowSetup)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Shadow Setup Node");
+                groupNode->CreateSubNode("ShadowsSetup", AnimNodeType::ShadowSetup);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddEnvironment)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Environment Node");
+                groupNode->CreateSubNode("Environment", AnimNodeType::Environment);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddDirectorNode)
+            {
+                QString name = groupNode->GetAvailableNodeNameStartingWith("Director");
+                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Director Node");
+                groupNode->CreateSubNode(name, AnimNodeType::Director);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_AddConsoleVariable)
+            {
+                StringDlg dlg(tr("Console Variable Name"));
+                if (dlg.exec() == QDialog::Accepted && !dlg.GetString().isEmpty())
+                {
+                    QString name = groupNode->GetAvailableNodeNameStartingWith(dlg.GetString());
+                    AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Console (CVar) Node");
+                    groupNode->CreateSubNode(name, AnimNodeType::CVar);
+                    undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+                }
+            }
+            else if (cmd == eMI_AddScriptVariable)
+            {
+                StringDlg dlg(tr("Script Variable Name"));
+                if (dlg.exec() == QDialog::Accepted && !dlg.GetString().isEmpty())
+                {
+                    QString name = groupNode->GetAvailableNodeNameStartingWith(dlg.GetString());
+                    AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Script Variable Node");
+                    groupNode->CreateSubNode(name, AnimNodeType::ScriptVar);
+                    undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+                }
+            }
+            else if (cmd == eMI_AddMaterial)
+            {
+                StringDlg dlg(tr("Material Name"));
+                if (dlg.exec() == QDialog::Accepted && !dlg.GetString().isEmpty())
+                {
+                    if (groupNode->GetAnimNodesByName(dlg.GetString().toUtf8().data()).GetCount() == 0)
+                    {
+                        AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Material Node");
+                        groupNode->CreateSubNode(dlg.GetString(), AnimNodeType::Material);
+                        undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+                    }
+                }
+            }
+            else if (cmd == eMI_AddEvent)
+            {
+                StringDlg dlg(tr("Track Event Name"));
+                if (dlg.exec() == QDialog::Accepted && !dlg.GetString().isEmpty())
+                {
+                    AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Event Node");
+                    groupNode->CreateSubNode(dlg.GetString(), AnimNodeType::Event);
+                    undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+                }
+            }
+            else if (cmd == eMI_PasteNodes)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Paste Track View Nodes");
+                groupNode->PasteNodesFromClipboard(this);
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_CreateFolder)
+            {
+                CreateFolder(groupNode);
+            }
+            else if (cmd == eMI_ExpandFolders)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View folders");
+                groupNode->GetAnimNodesByType(AnimNodeType::Group).ExpandAll();
+                groupNode->GetAnimNodesByType(AnimNodeType::Director).ExpandAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_CollapseFolders)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View folders");
+                groupNode->GetAnimNodesByType(AnimNodeType::Group).CollapseAll();
+                groupNode->GetAnimNodesByType(AnimNodeType::Director).CollapseAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_ExpandEntities)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View entities");
+                groupNode->GetAnimNodesByType(AnimNodeType::AzEntity).ExpandAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_CollapseEntities)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View entities");
+                groupNode->GetAnimNodesByType(AnimNodeType::AzEntity).CollapseAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_ExpandCameras)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View cameras");
+                groupNode->GetAnimNodesByType(AnimNodeType::Camera).ExpandAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_CollapseCameras)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View cameras");
+                groupNode->GetAnimNodesByType(AnimNodeType::Camera).CollapseAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_ExpandMaterials)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View materials");
+                groupNode->GetAnimNodesByType(AnimNodeType::Material).ExpandAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_CollapseMaterials)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View materials");
+                groupNode->GetAnimNodesByType(AnimNodeType::Material).CollapseAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_ExpandEvents)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View events");
+                groupNode->GetAnimNodesByType(AnimNodeType::Event).ExpandAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+            else if (cmd == eMI_CollapseEvents)
+            {
+                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View events");
+                groupNode->GetAnimNodesByType(AnimNodeType::Event).CollapseAll();
+                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
+            }
+        }  
+    }
+
+    if (cmd == eMI_EditEvents)
+    {
+        EditEvents();
+    }
+    else if (cmd == eMI_Rename)
+    {
+        if (animNode || groupNode)
+        {
+            CTrackViewAnimNode* animNode2 = static_cast<CTrackViewAnimNode*>(pNode);
+            QString oldName = animNode2->GetName();
+
+            StringDlg dlg(tr("Rename Node"));
+            dlg.SetString(oldName);
+
+            // add check for duplicate entity names if this is bound to an Object node
+            if (animNode2->IsBoundToEditorObjects())
+            {
+                dlg.SetCheckCallback([this](QString newName) -> bool
+                {
+                    bool nameExists = false;
+                    const auto nameUtf8 = newName.toUtf8();
+                    const AZStd::string name(nameUtf8.constData(), nameUtf8.length());
+                    AZ::ComponentApplicationBus::Broadcast(
+                        &AZ::ComponentApplicationRequests::EnumerateEntities,
+                        [&name, nameExists] (const AZ::Entity* entity) mutable
+                    {
+                        const auto entityId = entity->GetId();
+
+                        bool editorEntity = false;
+                        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
+                            editorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, entityId);
+
+                        if (!editorEntity)
+                        {
+                            return;
+                        }
+
+                        AZStd::string entityName;
+                        AZ::ComponentApplicationBus::BroadcastResult(
+                            entityName, &AZ::ComponentApplicationBus::Events::GetEntityName, entityId);
+
+                        if (entityName == name)
+                        {
+                            nameExists = true;
+                        }
+                    });
+
+                    if (nameExists)
+                    {
+                        QMessageBox::warning(this, tr("Entity already exists"), QString(tr("Entity named '%1' already exists.\n\nPlease choose another unique name.")).arg(newName));
+                        return false;
+                    }
+                    // Max name length is 512 when creating a new sequence, match that here for rename.
+                    // It would be nice to make this a restriction at input but I didnt see a way to do that with StringDlg and this is
+                    // very unlikely to happen in normal usage.
+                    const int maxLenth = 512;
+                    if (newName.length() > maxLenth)
+                    {
+                        QMessageBox::warning(
+                            this,
+                            tr("New entity name is too long"), 
+                            QString(tr("New entity name is over the maximum of %1.\n\nPlease reduce the length.")).arg(maxLenth)
+                        );
+                        return false;
+                    }
+                    return true;
+                });
+            }
+
+            if (dlg.exec() == QDialog::Accepted)
+            {
+                const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+                QString name = dlg.GetString();
+                sequenceManager->RenameNode(animNode2, name.toUtf8().data());
+                UpdateNodeRecord(record);
+            }
+        }
+    }
+    else if (cmd == eMI_SetAsActiveDirector)
+    {
+        if (pNode && pNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* animNode2 = static_cast<CTrackViewAnimNode*>(pNode);
+            animNode2->SetAsActiveDirector();
+        }
+    }
+    else if (cmd >= eMI_AddTrackBase && cmd < eMI_AddTrackBase + 1000)
+    {
+        if (animNode)
+        {
+            UINT_PTR menuId = cmd - eMI_AddTrackBase;
+            
+            if (animNode->GetType() != AnimNodeType::AzEntity)
+            {
+                // add track
+                auto findIter = m_menuParamTypeMap.find(menuId);
+                if (findIter != m_menuParamTypeMap.end())
+                {
+                    AzToolsFramework::ScopedUndoBatch undoBatch("Add TrackView Track");
+                    animNode->CreateTrack(findIter->second);
+                    undoBatch.MarkEntityDirty(animNode->GetSequence()->GetSequenceComponentEntityId());
+                }
+            }                   
+        }
+    }
+    else if (cmd == eMI_RemoveTrack)
+    {
+        if (pTrack)
+        {
+            AzToolsFramework::ScopedUndoBatch undoBatch("Remove TrackView Track");
+            pTrack->GetAnimNode()->RemoveTrack(pTrack);
+            undoBatch.MarkEntityDirty(pTrack->GetSequence()->GetSequenceComponentEntityId());
+        }
+    }
+    else if (cmd >= eMI_ShowHideBase && cmd < eMI_ShowHideBase + 100)
+    {
+        if (animNode)
+        {
+            unsigned int childIndex = cmd - eMI_ShowHideBase;
+
+            if (childIndex < animNode->GetChildCount())
+            {
+                CTrackViewNode* pChild = animNode->GetChild(childIndex);
+                pChild->SetHidden(!pChild->IsHidden());
+            }
+        }
+    }
+    else if (cmd == eMI_CopyKeys)
+    {
+        sequence->CopyKeysToClipboard(false, true);
+    }
+    else if (cmd == eMI_CopySelectedKeys)
+    {
+        sequence->CopyKeysToClipboard(true, true);
+    }
+    else if (cmd == eMI_PasteKeys)
+    {
+        CUndo undo("Paste TrackView Keys");
+        sequence->PasteKeysFromClipboard(animNode, pTrack);
+    }
+    else if (cmd == eMI_CopyNodes)
+    {
+        if (animNode)
+        {
+            animNode->CopyNodesToClipboard(false, this);
+        }
+        else
+        {
+            sequence->CopyNodesToClipboard(false, this);
+        }
+    }
+    else if (cmd == eMI_CopySelectedNodes)
+    {
+        sequence->CopyNodesToClipboard(true, this);
+    }
+    else if (cmd == eMI_SelectInViewport)
+    {
+        CUndo undo("Select TrackView Nodes in Viewport");
+        sequence->SelectSelectedNodesInViewport();
+    }
+    else if (cmd >= eMI_SelectSubmaterialBase && cmd < eMI_SelectSubmaterialBase + 100)
+    {
+        if (animNode)
+        {
+            QString matName;
+            GetMatNameAndSubMtlIndexFromName(matName, animNode->GetName());
+            QString newMatName;
+            newMatName = tr("%1.[%2]").arg(matName).arg(cmd - eMI_SelectSubmaterialBase + 1);
+            CUndo undo("Rename TrackView node");
+            animNode->SetName(newMatName.toUtf8().data());
+            animNode->SetSelected(true);
+            UpdateNodeRecord(record);
+        }
+    }
+    else if (cmd >= eMI_SetAnimationLayerBase && cmd < eMI_SetAnimationLayerBase + 100)
+    {
+        if (pNode && pNode->GetNodeType() == eTVNT_Track)
+        {
+            CTrackViewTrack* pTrack2 = static_cast<CTrackViewTrack*>(pNode);
+            pTrack2->SetAnimationLayerIndex(cmd - eMI_SetAnimationLayerBase);
+        }
+    }
+    else if (cmd == eMI_Disable)
+    {
+        if (pNode)
+        {
+            CTrackViewSequence* sequence2 = pNode->GetSequence();
+            AZ_Assert(nullptr != sequence2, "Expected valid sequence");
+            AzToolsFramework::ScopedUndoBatch undoBatch("Node Set Disabled");
+            pNode->SetDisabled(!pNode->IsDisabled());
+            undoBatch.MarkEntityDirty(sequence2->GetSequenceComponentEntityId());
+        }
+    }
+    else if (cmd == eMI_Mute)
+    {
+        if (pTrack)
+        {
+            pTrack->SetMuted(!pTrack->IsMuted());
+        }
+    }
+    else if (cmd == eMI_CustomizeTrackColor)
+    {
+        CustomizeTrackColor(pTrack);
+    }
+    else if (cmd == eMI_ClearCustomTrackColor)
+    {
+        if (pTrack)
+        {
+            pTrack->ClearCustomColor();
+        }
+    }
+
+    if (cmd)
+    {
+        RestoreVerticalScrollPos(scrollPos);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnItemDblClick(QTreeWidgetItem* item, int)
+{
+    CRecord* record = (CRecord*)item;
+    if (record && record->GetNode())
+    {
+        CTrackViewNode* pNode = record->GetNode();
+
+        if (pNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* animNode = static_cast<CTrackViewAnimNode*>(pNode);
+
+            if (const AZ::EntityId entityId = animNode->GetAzEntityId();
+                entityId.IsValid())
+            {
+                CUndo undo("Select Object");
+                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+                    &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities,
+                    AzToolsFramework::EntityIdList{animNode->GetAzEntityId()});
+            }
+        }
+    }
+}
+
+CTrackViewTrack* CTrackViewNodesCtrl::GetTrackViewTrack(const Export::EntityAnimData* pAnimData, CTrackViewTrackBundle trackBundle, const QString& nodeName)
+{
+    for (unsigned int trackID = 0; trackID < trackBundle.GetCount(); ++trackID)
+    {
+        CTrackViewTrack* pTrack = trackBundle.GetTrack(trackID);
+        const QString bundleTrackName = pTrack->GetAnimNode()->GetName();
+
+        if (bundleTrackName.compare(nodeName, Qt::CaseInsensitive) != 0)
+        {
+            continue;
+        }
+
+        // Position, Rotation
+        if (pTrack->IsCompoundTrack())
+        {
+            for (unsigned int childTrackID = 0; childTrackID < pTrack->GetChildCount(); ++childTrackID)
+            {
+                CTrackViewTrack* childTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(childTrackID));
+                // Have to cast GetType to int since the enum it returns is not the same enum that pAnimData->dataType is
+                if (static_cast<int>(childTrack->GetParameterType().GetType()) == pAnimData->dataType)
+                {
+                    return childTrack;
+                }
+            }
+        }
+
+        // FOV
+        // Have to cast GetType to int since the enum it returns is not the same enum that pAnimData->dataType is
+        if (static_cast<int>(pTrack->GetParameterType().GetType()) == pAnimData->dataType)
+        {
+            return pTrack;
+        }
+    }
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::ImportFromFBX()
+{
+    CExportManager* pExportManager = static_cast<CExportManager*>(GetIEditor()->GetExportManager());
+
+    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::AnyFile, {}, {}, "FBX Files (*.fbx)", {}, {}, this);
+
+    if (dlg.exec())
+    {
+        bool bImportResult = pExportManager->ImportFromFile(dlg.selectedFiles().first().toStdString().c_str());
+
+        if (!bImportResult)
+        {
+            return;
+        }
+    }
+    else
+    {
+        return;
+    }
+
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (sequence)
+    {
+        AzToolsFramework::ScopedUndoBatch undoBatch("Replace Keys");
+        CTrackViewTrackBundle tracks = sequence->GetAllTracks();
+        const unsigned int numTracks = tracks.GetCount();
+
+        for (unsigned int trackID = 0; trackID < numTracks; ++trackID)
+        {
+            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+        }
+
+        CTrackViewTrackBundle trackBundle = sequence->GetAllTracks();
+
+        const Export::CData pData = pExportManager->GetData();
+        const int objectsCount = pData.GetObjectCount();
+
+        CTrackViewFBXImportPreviewDialog importSelectionDialog;
+
+        for (int objectID = 0; objectID < objectsCount; ++objectID)
+        {
+            importSelectionDialog.AddTreeItem(pData.GetObject(objectID)->name);
+        }
+
+        if (importSelectionDialog.exec() != QDialog::Accepted)
+        {
+            return;
+        }
+
+        // Remove all keys from the affected tracks
+        for (int objectID = 0; objectID < objectsCount; ++objectID)
+        {
+            Export::Object* pObject = pData.GetObject(objectID);
+
+            if (pObject)
+            {
+                // Clear only the selected tracks for which we have AnimNodes
+                if (!importSelectionDialog.IsObjectSelected(pObject->name))
+                {
+                    continue;
+                }
+                const char* updatedNodeName = pObject->name;
+                if (sequence->GetAnimNodesByName(updatedNodeName).GetCount() == 0)
+                {
+                    continue;
+                }
+
+                int animatonDataCount = pObject->GetEntityAnimationDataCount();
+                for (int animDataID = 0; animDataID < animatonDataCount; ++animDataID)
+                {
+                    const Export::EntityAnimData* pAnimData = pObject->GetEntityAnimationData(animDataID);
+
+                    CTrackViewTrack* pTrack = GetTrackViewTrack(pAnimData, trackBundle, (QString)updatedNodeName);
+
+                    if (pTrack)
+                    {
+                        CTrackViewKeyBundle keys = pTrack->GetAllKeys();
+
+                        for (int deleteKeyID = (int)keys.GetKeyCount() - 1; deleteKeyID >= 0; --deleteKeyID)
+                        {
+                            CTrackViewKeyHandle key = keys.GetKey(deleteKeyID);
+                            key.Delete();
+                        }
+                    }
+                }
+            }
+        }
+        // Add keys from FBX file
+        for (int objectID = 0; objectID < objectsCount; ++objectID)
+        {
+            const Export::Object* pObject = pData.GetObject(objectID);
+
+            if (pObject)
+            {
+                // only process selected nodes from file for which we have AnimNodes
+                if (!importSelectionDialog.IsObjectSelected(pObject->name))
+                {
+                    continue;
+                }
+                const char* updatedNodeName = pObject->name;
+                if (sequence->GetAnimNodesByName(updatedNodeName).GetCount() == 0)
+                {
+                    continue;
+                }
+
+                const int animatonDataCount = pObject->GetEntityAnimationDataCount();
+
+                // Add keys from the imported file to the selected tracks
+                for (int animDataID = 0; animDataID < animatonDataCount; ++animDataID)
+                {
+                    const Export::EntityAnimData* pAnimData = pObject->GetEntityAnimationData(animDataID);
+                    CTrackViewTrack* pTrack = GetTrackViewTrack(pAnimData, trackBundle, (QString)updatedNodeName);
+
+                    if (pTrack)
+                    {
+                        CTrackViewKeyHandle key = pTrack->CreateKey(pAnimData->keyTime);
+                        I2DBezierKey bezierKey;
+                        key.GetKey(&bezierKey);
+                        bezierKey.value = Vec2(pAnimData->keyTime, pAnimData->keyValue);
+                        key.SetKey(&bezierKey);
+                    }
+                }
+
+                // After all keys are added, we are able to add the left and right tangents to the imported keys
+                for (int animDataID = 0; animDataID < animatonDataCount; ++animDataID)
+                {
+                    const Export::EntityAnimData* pAnimData = pObject->GetEntityAnimationData(animDataID);
+
+                    CTrackViewTrack* pTrack = GetTrackViewTrack(pAnimData, trackBundle, (QString)updatedNodeName);
+
+                    if (pTrack)
+                    {
+                        CTrackViewKeyHandle key = pTrack->GetKeyByTime(pAnimData->keyTime);
+                        ISplineInterpolator* pSpline = pTrack->GetSpline();
+
+                        if (pSpline)
+                        {
+                            const int keyIndex = key.GetIndex();
+
+                            ISplineInterpolator::ValueType inTangent;
+                            ISplineInterpolator::ValueType outTangent;
+                            ZeroStruct(inTangent);
+                            ZeroStruct(outTangent);
+
+                            float currentKeyTime = 0.0f;
+                            pSpline->SetKeyFlags(keyIndex, SPLINE_KEY_TANGENT_BROKEN);
+
+                            if (keyIndex > 0)
+                            {
+                                currentKeyTime = key.GetTime() - key.GetPrevKey().GetTime();
+                                inTangent[0] = pAnimData->leftTangentWeight * currentKeyTime;
+                                inTangent[1] = inTangent[0] * pAnimData->leftTangent;
+                                pSpline->SetKeyInTangent(keyIndex, inTangent);
+                            }
+
+                            if (keyIndex < (pTrack->GetKeyCount() - 1))
+                            {
+                                CTrackViewKeyHandle nextKey = key.GetNextKey();
+                                if (nextKey.IsValid())
+                                {
+                                    currentKeyTime = nextKey.GetTime() - key.GetTime();
+                                    outTangent[0] = pAnimData->rightTangentWeight * currentKeyTime;
+                                    outTangent[1] = outTangent[0] * pAnimData->rightTangent;
+                                    pSpline->SetKeyOutTangent(keyIndex, outTangent);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::EditEvents()
+{
+    CTVEventsDialog dlg;
+    dlg.exec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::CreateFolder(CTrackViewAnimNode* groupNode)
+{
+    // Change Group of the node.
+    StringDlg dlg(tr("Enter Folder Name"));
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        QString name = dlg.GetString();
+        if (name.isEmpty())
+        {
+            return;
+        }
+
+        CUndo undo("Create folder");
+        if (!groupNode->CreateSubNode(name, AnimNodeType::Group))
+        {
+            QMessageBox::critical(this, QString(), tr("The name already exists. Use another."));
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+struct STrackMenuTreeNode
+{
+    QMenu menu;
+    CAnimParamType paramType;
+    std::map<QString, std::unique_ptr<STrackMenuTreeNode> > children;
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct SContextMenu
+{
+    QMenu main;
+    QMenu expandSub;
+    QMenu collapseSub;
+    QMenu setLayerSub;
+    STrackMenuTreeNode addTrackSub;
+    QMenu addComponentSub;
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::AddGroupNodeAddItems(SContextMenu& contextMenu, CTrackViewAnimNode* animNode)
+{
+    contextMenu.main.addAction("Create Folder")->setData(eMI_CreateFolder);
+
+    AzToolsFramework::EntityIdList entityIds;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+    if (!entityIds.empty())
+    {
+        const char* msg = entityIds.size() == 1 ? "Add Selected Entity" : "Add Selected Entities";
+        contextMenu.main.addAction(msg)->setData(eMI_AddSelectedEntities);
+    }
+
+    const bool bIsDirectorOrSequence = (animNode->GetType() == AnimNodeType::Director || animNode->GetNodeType() == eTVNT_Sequence);
+    CTrackViewAnimNode* pDirector = bIsDirectorOrSequence ? animNode : animNode->GetDirector();
+
+    if (pDirector->GetAnimNodesByType(AnimNodeType::RadialBlur).GetCount() == 0)
+    {
+        contextMenu.main.addAction("Add Radial Blur Node")->setData(eMI_AddRadialBlur);
+    }
+
+    if (pDirector->GetAnimNodesByType(AnimNodeType::ColorCorrection).GetCount() == 0)
+    {
+        contextMenu.main.addAction("Add Color Correction Node")->setData(eMI_AddColorCorrection);
+    }
+
+    if (pDirector->GetAnimNodesByType(AnimNodeType::DepthOfField).GetCount() == 0)
+    {
+        contextMenu.main.addAction("Add Depth of Field Node")->setData(eMI_AddDOF);
+    }
+
+    if (pDirector->GetAnimNodesByType(AnimNodeType::ScreenFader).GetCount() == 0)
+    {
+        contextMenu.main.addAction("Add Screen Fader")->setData(eMI_AddScreenfader);
+    }
+
+    if (pDirector->GetAnimNodesByType(AnimNodeType::ShadowSetup).GetCount() == 0)
+    {
+        contextMenu.main.addAction("Add Shadows Setup Node")->setData(eMI_AddShadowSetup);
+    }
+
+    if (pDirector->GetAnimNodesByType(AnimNodeType::Environment).GetCount() == 0)
+    {
+        contextMenu.main.addAction("Add Environment Node")->setData(eMI_AddEnvironment);
+    }
+
+    // A director node cannot have another director node as a child.
+    if (animNode->GetType() != AnimNodeType::Director)
+    {
+        contextMenu.main.addAction("Add Director(Scene) Node")->setData(eMI_AddDirectorNode);
+    }
+
+    contextMenu.main.addAction("Add Comment Node")->setData(eMI_AddCommentNode);
+    contextMenu.main.addAction("Add Console Variable Node")->setData(eMI_AddConsoleVariable);
+    contextMenu.main.addAction("Add Script Variable Node")->setData(eMI_AddScriptVariable);
+    contextMenu.main.addAction("Add Material Node")->setData(eMI_AddMaterial);
+    contextMenu.main.addAction("Add Event Node")->setData(eMI_AddEvent);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::AddMenuSeperatorConditional(QMenu& menu, bool& bAppended)
+{
+    if (bAppended)
+    {
+        menu.addSeparator();
+    }
+
+    bAppended = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewNodesCtrl::ShowPopupMenuSingleSelection(SContextMenu& contextMenu, CTrackViewSequence* sequence, CTrackViewNode* pNode)
+{
+    bool bAppended = false;
+    bool isOnComponentNode = false;
+    bool isOnAzEntityNode = false;
+
+    const bool bOnSequence = pNode->GetNodeType() == eTVNT_Sequence;
+    const bool bOnNode = pNode->GetNodeType() == eTVNT_AnimNode;
+    const bool bOnTrack = pNode->GetNodeType() == eTVNT_Track;
+    const bool bIsLightAnimationSet = sequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet;
+
+    // Get track & anim node pointers
+    CTrackViewTrack* pTrack = bOnTrack ? static_cast<CTrackViewTrack*>(pNode) : nullptr;
+    const bool bOnTrackNotSub = bOnTrack && !pTrack->IsSubTrack();
+
+    if (bOnNode)
+    {
+        AnimNodeType nodeType = static_cast<CTrackViewAnimNode*>(pNode)->GetType();
+        if (nodeType == AnimNodeType::Component)
+        {
+            isOnComponentNode = true;
+        }
+        else if (nodeType == AnimNodeType::AzEntity)
+        {
+            isOnAzEntityNode = true;
+        }
+    }
+
+    CTrackViewAnimNode* animNode = nullptr;
+    if (bOnSequence || bOnNode)
+    {
+        animNode = static_cast<CTrackViewAnimNode*>(pNode);
+    }
+    else if (bOnTrack)
+    {
+        animNode = pTrack->GetAnimNode();
+    }
+
+    bool isOnDirector = (animNode && animNode->GetType() == AnimNodeType::Director);
+    bool isOnAzEntity = (animNode && animNode->GetType() == AnimNodeType::AzEntity);
+    bool isOnSequence = (animNode && animNode->GetNodeType() == eTVNT_Sequence);
+
+    if (isOnSequence)
+    {
+        contextMenu.main.addAction("Select In Viewport")->setData(eMI_SelectInViewport);
+        contextMenu.main.addSeparator();
+    }
+
+    // Entity
+    if (bOnNode && !bIsLightAnimationSet && animNode->IsBoundToAzEntity())
+    {
+        AddMenuSeperatorConditional(contextMenu.main, bAppended);
+
+        contextMenu.main.addAction("Select In Viewport")->setData(eMI_SelectInViewport);
+
+        if (animNode->GetType() == AnimNodeType::Camera)
+        {
+            contextMenu.main.addAction("Set As View Camera")->setData(eMI_SetAsViewCamera);
+        }
+
+        bAppended = true;
+    }
+
+    {
+        bool bCopyPasteRenameAppended = false;
+
+        // Copy & paste nodes
+        if ((bOnNode || bOnSequence) && !isOnComponentNode)
+        {
+            AddMenuSeperatorConditional(contextMenu.main, bAppended);
+            contextMenu.main.addAction("Copy")->setData(eMI_CopyNodes);
+            bCopyPasteRenameAppended = true;
+        }
+
+        if (pNode->IsGroupNode() && !isOnAzEntity)
+        {
+            contextMenu.main.addAction("Paste")->setData(eMI_PasteNodes);
+            bCopyPasteRenameAppended = true;
+        }
+
+        if ((bOnNode || bOnSequence || bOnTrackNotSub) && !isOnComponentNode)
+        {
+            contextMenu.main.addAction("Delete")->setData(bOnTrackNotSub ? eMI_RemoveTrack : eMI_RemoveSelected);
+            bCopyPasteRenameAppended = true;
+        }
+
+        // Renaming
+        if (pNode->CanBeRenamed())
+        {
+            AddMenuSeperatorConditional(contextMenu.main, bAppended);
+            contextMenu.main.addAction("Rename")->setData(eMI_Rename);
+            bCopyPasteRenameAppended = true;
+        }
+
+        bAppended = bAppended || bCopyPasteRenameAppended;
+    }
+
+    if (bOnTrack)
+    {
+        // Copy & paste keys
+        AddMenuSeperatorConditional(contextMenu.main, bAppended);
+        contextMenu.main.addAction("Copy Keys")->setData(eMI_CopyKeys);
+        contextMenu.main.addAction("Copy Selected Keys")->setData(eMI_CopySelectedKeys);
+        contextMenu.main.addAction("Paste Keys")->setData(eMI_PasteKeys);
+        bAppended = true;
+    }
+
+    // Flags
+    {
+        bool bFlagAppended = false;
+
+        if (!bOnSequence)
+        {
+            AddMenuSeperatorConditional(contextMenu.main, bAppended);
+            QAction* a = contextMenu.main.addAction("Disabled");
+            a->setData(eMI_Disable);
+            a->setCheckable(true);
+            a->setChecked(pNode->IsDisabled());
+            // If the node is not currently allowed to be enabled, disable the check box.
+            if (pNode->IsDisabled() && !pNode->CanBeEnabled())
+            {
+                a->setEnabled(false);
+            }
+            bFlagAppended = true;
+        }
+
+        if (bOnTrack)
+        {
+            if (pTrack->GetParameterType() == AnimParamType::Sound)
+            {
+                AddMenuSeperatorConditional(contextMenu.main, bAppended);
+                bool bMuted = pTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Muted;
+                QAction* a = contextMenu.main.addAction("Muted");
+                a->setData(eMI_Mute);
+                a->setCheckable(true);
+                a->setChecked(bMuted);
+                bFlagAppended = true;
+            }
+        }
+
+        // In case that it's a director node instead of a normal group node,
+        if (bOnNode && animNode->GetType() == AnimNodeType::Director)
+        {
+            AddMenuSeperatorConditional(contextMenu.main, bAppended);
+            QAction* a = contextMenu.main.addAction("Active Director");
+            a->setData(eMI_SetAsActiveDirector);
+            a->setCheckable(true);
+            a->setChecked(animNode->IsActiveDirector());
+            bFlagAppended = true;
+        }
+
+        bAppended = bAppended || bFlagAppended;
+    }
+
+    // Expand / collapse
+    if (bOnSequence || pNode->IsGroupNode())
+    {
+        AddMenuSeperatorConditional(contextMenu.main, bAppended);
+
+        contextMenu.expandSub.addAction("Expand all")->setData(eMI_ExpandAll);
+        contextMenu.collapseSub.addAction("Collapse all")->setData(eMI_CollapseAll);
+        if (!isOnAzEntity)
+        {
+            contextMenu.expandSub.addAction("Expand Folders")->setData(eMI_ExpandFolders);
+            contextMenu.collapseSub.addAction("Collapse Folders")->setData(eMI_CollapseFolders);
+            contextMenu.expandSub.addAction("Expand Entities")->setData(eMI_ExpandEntities);
+            contextMenu.collapseSub.addAction("Collapse Entities")->setData(eMI_CollapseEntities);
+            contextMenu.expandSub.addAction("Expand Cameras")->setData(eMI_ExpandCameras);
+            contextMenu.collapseSub.addAction("Collapse Cameras")->setData(eMI_CollapseCameras);
+            contextMenu.expandSub.addAction("Expand Materials")->setData(eMI_ExpandMaterials);
+            contextMenu.collapseSub.addAction("Collapse Materials")->setData(eMI_CollapseMaterials);
+            contextMenu.expandSub.addAction("Expand Events")->setData(eMI_ExpandEvents);
+            contextMenu.collapseSub.addAction("Collapse Events")->setData(eMI_CollapseEvents);
+        }
+        contextMenu.expandSub.setTitle("Expand");
+        contextMenu.main.addMenu(&contextMenu.expandSub);
+        contextMenu.collapseSub.setTitle("Collapse");
+        contextMenu.main.addMenu(&contextMenu.collapseSub);
+
+        bAppended = true;
+    }
+
+    // Add/Remove
+    {
+        if (bOnSequence || (pNode->IsGroupNode() && !isOnAzEntity) )
+        {
+            AddMenuSeperatorConditional(contextMenu.main, bAppended);
+            AddGroupNodeAddItems(contextMenu, animNode);
+            bAppended = true;
+        }
+
+        if (bOnNode)
+        {
+            AddMenuSeperatorConditional(contextMenu.main, bAppended);
+
+            if (!isOnAzEntity)
+            {
+                // Create 'Add Tracks' submenu
+                m_menuParamTypeMap.clear();
+
+                if (FillAddTrackMenu(contextMenu.addTrackSub, animNode))
+                {
+                    // add script table properties
+                    unsigned int currentId = 0;
+                    CreateAddTrackMenuRec(contextMenu.main, "Add Track", animNode, contextMenu.addTrackSub, currentId);
+                }
+            }
+
+            bAppended = true;
+        }
+    }
+
+    bool isLegacySequence = (sequence && sequence->GetSequenceType() == SequenceType::Legacy);
+
+    if (isLegacySequence && bOnNode && !bIsLightAnimationSet && !isOnDirector && !isOnComponentNode && !isOnAzEntityNode)
+    {
+        AddMenuSeperatorConditional(contextMenu.main, bAppended);
+        contextMenu.main.addAction("Import FBX File...")->setData(eMI_ImportFromFBX);
+        contextMenu.main.addAction("Export FBX File...")->setData(eMI_SaveToFBX);
+        bAppended = true;
+    }
+
+    // Events
+    if (bOnSequence || pNode->IsGroupNode() && !bIsLightAnimationSet && !isOnAzEntity)
+    {
+        AddMenuSeperatorConditional(contextMenu.main, bAppended);
+        contextMenu.main.addAction("Edit Events...")->setData(eMI_EditEvents);
+        bAppended = true;
+    }
+
+    // Delete track menu
+    if (bOnTrackNotSub)
+    {
+        if (pTrack->GetParameterType() == AnimParamType::Animation || pTrack->GetParameterType() == AnimParamType::LookAt || pTrack->GetValueType() == AnimValueType::CharacterAnim)
+        {
+            // Add the set-animation-layer pop-up menu.
+            AddMenuSeperatorConditional(contextMenu.main, bAppended);
+            CreateSetAnimationLayerPopupMenu(contextMenu.setLayerSub, pTrack);
+            contextMenu.setLayerSub.setTitle("Set Animation Layer");
+            contextMenu.main.addMenu(&contextMenu.setLayerSub);
+            bAppended = true;
+        }
+    }
+
+    // Track color
+    if (bOnTrack)
+    {
+        AddMenuSeperatorConditional(contextMenu.main, bAppended);
+        contextMenu.main.addAction("Customize Track Color...")->setData(eMI_CustomizeTrackColor);
+        if (pTrack->HasCustomColor())
+        {
+            contextMenu.main.addAction("Clear Custom Track Color")->setData(eMI_ClearCustomTrackColor);
+        }
+        bAppended = true;
+    }
+
+    // Track hide/unhide flags
+    if (bOnNode && !pNode->IsGroupNode())
+    {
+        AddMenuSeperatorConditional(contextMenu.main, bAppended);
+        QString string = QString("%1 Tracks").arg(animNode->GetName());
+        contextMenu.main.addAction(string)->setEnabled(false);
+
+        bool bAppendedTrackFlag = false;
+
+        const unsigned int numChildren = animNode->GetChildCount();
+        for (unsigned int childIndex = 0; childIndex < numChildren; ++childIndex)
+        {
+            CTrackViewNode* pChild = animNode->GetChild(childIndex);
+            if (pChild->GetNodeType() == eTVNT_Track)
+            {
+                CTrackViewTrack* pTrack2 = static_cast<CTrackViewTrack*>(pChild);
+
+                if (pTrack2->IsSubTrack())
+                {
+                    continue;
+                }
+
+                QAction* a = contextMenu.main.addAction(QString("  %1").arg(pTrack2->GetName()));
+                a->setData(eMI_ShowHideBase + childIndex);
+                a->setCheckable(true);
+                a->setChecked(!pTrack2->IsHidden());
+                bAppendedTrackFlag = true;
+            }
+        }
+
+        bAppended = bAppendedTrackFlag || bAppended;
+    }
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewNodesCtrl::ShowPopupMenuMultiSelection(SContextMenu& contextMenu)
+{
+    QList<QTreeWidgetItem*> records = ui->treeWidget->selectedItems();
+
+    bool bNodeSelected = false;
+    for (int currentNode = 0; currentNode < records.size(); ++currentNode)
+    {
+        CRecord* pItemInfo = (CRecord*)records[currentNode];
+
+        if (pItemInfo->GetNode()->GetNodeType() == eTVNT_AnimNode)
+        {
+            bNodeSelected = true;
+        }
+    }
+
+    if (bNodeSelected)
+    {
+        contextMenu.main.addAction("Copy Selected Nodes")->setData(eMI_CopySelectedNodes);
+    }
+
+    contextMenu.main.addAction("Remove Selected Nodes/Tracks")->setData(eMI_RemoveSelected);
+
+    if (bNodeSelected)
+    {
+        contextMenu.main.addSeparator();
+        contextMenu.main.addAction("Select In Viewport")->setData(eMI_SelectInViewport);
+
+        // Importing FBX is currently only supported on legacy entities. Legacy
+        // sequences contain only legacy Cry entities and no AZ component entities.
+        CAnimationContext* context = GetIEditor()->GetAnimation();
+        AZ_Assert(context, "Expected valid GetIEditor()->GetAnimation()");
+        if (context)
+        {
+            CTrackViewSequence* sequence = context->GetSequence();
+            if (sequence && sequence->GetSequenceType() == SequenceType::Legacy)
+            {
+                contextMenu.main.addAction("Import From FBX File")->setData(eMI_ImportFromFBX);
+                contextMenu.main.addAction("Save To FBX File")->setData(eMI_SaveToFBX);
+            }
+        }
+    }
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewNodesCtrl::ShowPopupMenu([[maybe_unused]] QPoint point, const CRecord* record)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return 0;
+    }
+
+    SContextMenu contextMenu;
+
+    CTrackViewNode* pNode = record ? record->GetNode() : nullptr;
+    if (!pNode)
+    {
+        return 0;
+    }
+
+    if (ui->treeWidget->selectedItems().size() > 1)
+    {
+        ShowPopupMenuMultiSelection(contextMenu);
+    }
+    else if (pNode)
+    {
+        ShowPopupMenuSingleSelection(contextMenu, sequence, pNode);
+    }
+
+    if (m_bEditLock)
+    {
+        SetPopupMenuLock(&contextMenu.main);
+    }
+
+    QAction* action = contextMenu.main.exec(QCursor::pos());
+    int ret = action ? action->data().toInt() : 0;
+
+    return ret;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Add tracks that can be added to the given animation node to the
+// internal track menu tree data structure rooted at menuAddTrack
+bool CTrackViewNodesCtrl::FillAddTrackMenu(STrackMenuTreeNode& menuAddTrack, const CTrackViewAnimNode* animNode)
+{
+    bool bTracksToAdd = false;
+    const AnimNodeType nodeType = animNode->GetType();
+    int paramCount = 0;
+    IAnimNode::AnimParamInfos animatableProperties;
+    CTrackViewNode* parentNode = animNode->GetParentNode();
+   
+    // all AZ::Entity entities are animated through components. Component nodes always have a parent - the containing AZ::Entity
+    if (nodeType == AnimNodeType::Component && parentNode)
+    {
+        // component node - query all the animatable tracks via an EBus request
+
+        // all AnimNodeType::Component are parented to AnimNodeType::AzEntityNodes - get the parent to get it's AZ::EntityId to use for the EBus request
+        if (parentNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            // this cast is safe because we check that the type is eTVNT_AnimNode
+            const AZ::EntityId azEntityId = static_cast<CTrackViewAnimNode*>(parentNode)->GetAzEntityId();
+
+            // query the animatable component properties from the Sequence Component
+            Maestro::EditorSequenceComponentRequestBus::Event(const_cast<CTrackViewAnimNode*>(animNode)->GetSequence()->GetSequenceComponentEntityId(), 
+                                                                    &Maestro::EditorSequenceComponentRequestBus::Events::GetAllAnimatablePropertiesForComponent, 
+                                                                    animatableProperties, azEntityId, animNode->GetComponentId());
+
+            paramCount = animatableProperties.size();
+        }       
+    }
+    else
+    {
+        // legacy Entity
+        paramCount = animNode->GetParamCount(); 
+    }
+    
+    for (int i = 0; i < paramCount; ++i)
+    {
+        CAnimParamType paramType;
+        QString name;
+
+        // get the animatable param name
+        if (nodeType == AnimNodeType::Component)
+        {
+            // Skip over any hidden params
+            if (animatableProperties[i].flags & IAnimNode::ESupportedParamFlags::eSupportedParamFlags_Hidden)
+            {
+                continue;
+            }
+
+            paramType = animatableProperties[i].paramType;
+        }
+        else
+        {
+            // legacy node
+            paramType = animNode->GetParamType(i);
+            if (paramType == AnimParamType::Invalid)
+            {
+                continue;
+            }
+
+            IAnimNode::ESupportedParamFlags paramFlags = animNode->GetParamFlags(paramType);
+
+            CTrackViewTrack* pTrack = animNode->GetTrackForParameter(paramType);
+            if (pTrack && !(paramFlags & IAnimNode::eSupportedParamFlags_MultipleTracks))
+            {
+                continue;
+            }
+        }
+        name = animNode->GetParamName(paramType);
+        QStringList splittedName = name.split("/", Qt::SkipEmptyParts);
+
+        STrackMenuTreeNode* pCurrentNode = &menuAddTrack;
+        for (unsigned int j = 0; j < splittedName.size() - 1; ++j)
+        {
+            const QString& segment = splittedName[j];
+            auto findIter = pCurrentNode->children.find(segment);
+            if (findIter != pCurrentNode->children.end())
+            {
+                pCurrentNode = findIter->second.get();
+            }
+            else
+            {
+                STrackMenuTreeNode* pNewNode = new STrackMenuTreeNode;
+                pCurrentNode->children[segment] = std::unique_ptr<STrackMenuTreeNode>(pNewNode);
+                pCurrentNode = pNewNode;
+            }
+        }
+
+        // only add tracks to the that STrackMenuTreeNode tree that haven't already been added
+        CTrackViewTrackBundle matchedTracks = animNode->GetTracksByParam(paramType);
+        if (matchedTracks.GetCount() == 0)
+        {
+            STrackMenuTreeNode* pParamNode = new STrackMenuTreeNode;
+            pCurrentNode->children[splittedName.back()] = std::unique_ptr<STrackMenuTreeNode>(pParamNode);
+            pParamNode->paramType = paramType;
+
+            bTracksToAdd = true;
+        }  
+    }
+    
+    return bTracksToAdd;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+// FillAddTrackMenu fills the data structure for tracks to add (a STrackMenuTreeNode tree)
+// CreateAddTrackMenuRec actually creates the Qt submenu from this data structure
+//
+void CTrackViewNodesCtrl::CreateAddTrackMenuRec(QMenu& parent, const QString& name, CTrackViewAnimNode* animNode, struct STrackMenuTreeNode& node, unsigned int& currentId)
+{
+    if (node.paramType.GetType() == AnimParamType::Invalid)
+    {
+        node.menu.setTitle(name);
+        parent.addMenu(&node.menu);
+
+        for (auto iter = node.children.begin(); iter != node.children.end(); ++iter)
+        {
+            CreateAddTrackMenuRec(node.menu, iter->first, animNode, *iter->second.get(), currentId);
+        }
+    }
+    else
+    {
+        m_menuParamTypeMap[currentId] = node.paramType;
+        QVariant paramTypeMenuID;
+        paramTypeMenuID.setValue(eMI_AddTrackBase + currentId);
+        parent.addAction(name)->setData(paramTypeMenuID);
+        ++currentId;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::SetPopupMenuLock(QMenu* menu)
+{
+    if (!m_bEditLock || !menu)
+    {
+        return;
+    }
+
+    UINT count = menu->actions().size();
+    for (UINT i = 0; i < count; ++i)
+    {
+        QAction* a = menu->actions()[i];
+        QString menuString = a->text();
+
+        if (menuString != "Expand" && menuString != "Collapse")
+        {
+            a->setEnabled(false);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewNodesCtrl::SaveVerticalScrollPos() const
+{
+    int sbMin = ui->treeWidget->verticalScrollBar()->minimum();
+    int sbMax = ui->treeWidget->verticalScrollBar()->maximum();
+    return float(ui->treeWidget->verticalScrollBar()->value() - sbMin) / std::max(float(sbMax - sbMin), 1.0f);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::RestoreVerticalScrollPos(float fScrollPos)
+{
+    int sbMin = ui->treeWidget->verticalScrollBar()->minimum();
+    int sbMax = ui->treeWidget->verticalScrollBar()->maximum();
+    int newScrollPos = qRound(fScrollPos * (sbMax - sbMin)) + sbMin;
+    ui->treeWidget->verticalScrollBar()->setValue(newScrollPos);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::FillAutoCompletionListForFilter()
+{
+    QStringList strings;
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        ui->noitems->hide();
+        ui->treeWidget->show();
+        ui->searchField->show();
+        ui->searchCount->show();
+        CTrackViewAnimNodeBundle animNodes = sequence->GetAllAnimNodes();
+        const unsigned int animNodeCount = animNodes.GetCount();
+
+        for (unsigned int i = 0; i < animNodeCount; ++i)
+        {
+            strings << animNodes.GetNode(i)->GetName();
+        }
+    }
+    else
+    {
+        ui->noitems->show();
+        ui->treeWidget->hide();
+        ui->searchField->hide();
+        ui->searchCount->hide();
+    }
+
+    QCompleter* c = new QCompleter(strings, this);
+    c->setCaseSensitivity(Qt::CaseInsensitive);
+    c->setCompletionMode(QCompleter::InlineCompletion);
+    ui->searchField->setCompleter(c);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnFilterChange(const QString& text)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+    if (sequence)
+    {
+        m_currentMatchIndex = 0;    // Reset the match index
+        m_matchCount = 0;           // and the count.
+        if (!text.isEmpty())
+        {
+            QList<QTreeWidgetItem*> items = ui->treeWidget->findItems(text, Qt::MatchContains | Qt::MatchRecursive);
+
+            CTrackViewAnimNodeBundle animNodes = sequence->GetAllAnimNodes();
+
+            m_matchCount = items.size();                    // and the count.
+
+            if (!items.empty())
+            {
+                ui->treeWidget->selectionModel()->clear();
+                items.front()->setSelected(true);
+            }
+        }
+
+        QString matchCountText = QString("%1/%2").arg(m_matchCount == 0 ? 0 : 1).arg(m_matchCount); // One-based indexing
+        ui->searchCount->setText(matchCountText);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewNodesCtrl::GetMatNameAndSubMtlIndexFromName(QString& matName, const char* nodeName)
+{
+    if (const char* pCh = strstr(nodeName, ".["))
+    {
+        char matPath[MAX_PATH];
+        cry_strcpy(matPath, nodeName, (size_t)(pCh - nodeName));
+        matName = matPath;
+        pCh += 2;
+        if ((*pCh) != 0)
+        {
+            const int index = atoi(pCh) - 1;
+            return index;
+        }
+    }
+    else
+    {
+        matName = nodeName;
+    }
+
+    return -1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+void CTrackViewNodesCtrl::ShowNextResult()
+{
+    if (m_matchCount > 1)
+    {
+        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+
+        if (sequence && !ui->searchField->text().isEmpty())
+        {
+            QList<QTreeWidgetItem*> items = ui->treeWidget->findItems(ui->searchField->text(), Qt::MatchContains | Qt::MatchRecursive);
+
+            CTrackViewAnimNodeBundle animNodes = sequence->GetAllAnimNodes();
+
+            m_matchCount = items.size();                    // and the count.
+
+            if (!items.empty())
+            {
+                ++m_currentMatchIndex;
+                m_currentMatchIndex = m_currentMatchIndex % m_matchCount;
+                ui->treeWidget->selectionModel()->clear();
+                items[m_currentMatchIndex]->setSelected(true);
+            }
+
+            QString matchCountText = QString("%1/%2").arg(m_currentMatchIndex + 1).arg(m_matchCount); // One-based indexing
+            ui->searchCount->setText(matchCountText);
+        }
+    }
+}
+
+void CTrackViewNodesCtrl::Update()
+{
+    // Update the Track UI elements with the latest names of the Tracks.
+    // In some cases (save slice overrides) the Track names (param names)
+    // may not be available at the time of the Sequence activation because
+    // they come from the animated entities (which may not be active). So
+    // just update them once a frame to make sure they are the latest.
+    for (auto iter = m_nodeToRecordMap.begin(); iter != m_nodeToRecordMap.end(); ++iter)
+    {
+        const CTrackViewNode* node = iter->first;
+        CTrackViewNodesCtrl::CRecord* record = iter->second;
+        if (node && record)
+        {
+            if (node->GetNodeType() == eTVNT_Track)
+            {
+                const CTrackViewAnimNode* track = static_cast<const CTrackViewAnimNode*>(node);
+                if (track)
+                { 
+                    record->setText(0, track->GetName());
+                }
+            }            
+        }
+    }
+}
+
+void CTrackViewNodesCtrl::keyPressEvent(QKeyEvent* event)
+{
+    // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
+    switch (event->key())
+    {
+    case Qt::Key_Z:
+        if (event->modifiers() == Qt::ControlModifier)
+        {
+            GetIEditor()->Undo();
+            event->accept();
+        }
+        break;
+    default:
+        break;
+    }
+}
+
+bool CTrackViewNodesCtrl::event(QEvent* e)
+{
+    if (e->type() == QEvent::ShortcutOverride)
+    {
+        // since we respond to the following things, let Qt know so that shortcuts don't override us
+        bool respondsToEvent = false;
+
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
+        if (keyEvent->key() == Qt::Key_Z && keyEvent->modifiers() == Qt::ControlModifier)
+        {
+            respondsToEvent = true;
+        }
+
+        if (respondsToEvent)
+        {
+            e->accept();
+            return true;
+        }
+    }
+
+    return QWidget::event(e);
+}
+
+void CTrackViewNodesCtrl::CreateSetAnimationLayerPopupMenu(QMenu& menuSetLayer, CTrackViewTrack* pTrack) const
+{
+    // First collect layers already in use.
+    std::vector<int> layersInUse;
+
+    CTrackViewTrackBundle lookAtTracks = pTrack->GetAnimNode()->GetTracksByParam(AnimParamType::LookAt);
+    assert(lookAtTracks.GetCount() <= 1);
+
+    if (lookAtTracks.GetCount() > 0)
+    {
+        const int kDefaultLookIKLayer = 15;
+        int lookIKLayerIndex = lookAtTracks.GetTrack(0)->GetAnimationLayerIndex();
+
+        if (lookIKLayerIndex < 0) // Not set before, use the default instead.
+        {
+            lookIKLayerIndex = kDefaultLookIKLayer;
+        }
+
+        layersInUse.push_back(lookIKLayerIndex);
+    }
+
+    CTrackViewTrackBundle animationTracks = pTrack->GetAnimNode()->GetTracksByParam(AnimParamType::Animation);
+
+    const unsigned int numAnimationTracks = animationTracks.GetCount();
+    for (int i = 0; i < numAnimationTracks; ++i)
+    {
+        CTrackViewTrack* pAnimationTrack = animationTracks.GetTrack(i);
+        if (pAnimationTrack)
+        {
+            const int kAdditiveLayerOffset = 6;
+            int layerIndex = pAnimationTrack->GetAnimationLayerIndex();
+
+            if (layerIndex < 0) // Not set before, use the default instead.
+            {
+                layerIndex = i == 0 ? 0 : kAdditiveLayerOffset + i;
+            }
+
+            layersInUse.push_back(layerIndex);
+        }
+    }
+
+    // Add layer items.
+    for (int i = 0; i < 16; ++i)
+    {
+        QString layerText = QString("Layer #%1").arg(i);
+
+        QAction* a = menuSetLayer.addAction(layerText);
+        a->setData(eMI_SetAnimationLayerBase + i);
+        a->setCheckable(true);
+        a->setChecked(pTrack->GetAnimationLayerIndex() == i);
+        a->setEnabled(!stl::find(layersInUse, i));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::CustomizeTrackColor(CTrackViewTrack* pTrack)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    AZ::Color defaultColor;
+    if (pTrack->HasCustomColor())
+    {
+        ColorB customColor = pTrack->GetCustomColor();
+        defaultColor = AZ::Color(customColor.r, customColor.g, customColor.b, customColor.a);
+    }
+    const AZ::Color color = AzQtComponents::ColorPicker::getColor(AzQtComponents::ColorPicker::Configuration::RGB, defaultColor, tr("Select Color"));
+    if (color != defaultColor)
+    {
+        AzToolsFramework::ScopedUndoBatch undoBatch("Customize Track Color");
+
+        pTrack->SetCustomColor(ColorB(color.GetR8(), color.GetG8(), color.GetB8()));
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+        UpdateDopeSheet();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::ClearCustomTrackColor(CTrackViewTrack* pTrack)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!sequence)
+    {
+        return;
+    }
+
+    AzToolsFramework::ScopedUndoBatch undoBatch("Clear Custom Track Color");
+    
+    pTrack->ClearCustomColor();
+    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+
+    UpdateDopeSheet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::paintEvent(QPaintEvent* event)
+{
+    QWidget::paintEvent(event);
+    UpdateDopeSheet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::GetNodeRecord(const CTrackViewNode* pNode) const
+{
+    auto findIter = m_nodeToRecordMap.find(pNode);
+    if (findIter == m_nodeToRecordMap.end())
+    {
+        return nullptr;
+    }
+
+    assert (findIter->second->GetNode() == pNode);
+    return findIter->second;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::UpdateDopeSheet()
+{
+    UpdateRecordVisibility();
+
+    if (m_pDopeSheet)
+    {
+        m_pDopeSheet->update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Workaround: CXTPReportRecord::IsVisible is
+// unreliable after the last visible element
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::UpdateRecordVisibility()
+{
+    // Mark all records invisible
+    for (auto iter = m_nodeToRecordMap.begin(); iter != m_nodeToRecordMap.end(); ++iter)
+    {
+        iter->second->m_bVisible = ui->treeWidget->visualItemRect(iter->second).isValid();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnNodeChanged(CTrackViewNode* pNode, ITrackViewSequenceListener::ENodeChangeType type)
+{
+    if (pNode->GetSequence() != GetIEditor()->GetAnimation()->GetSequence())
+    {
+        return;
+    }
+
+    if (!m_bIgnoreNotifications)
+    {
+        CTrackViewNode* pParentNode = pNode->GetParentNode();
+
+        CRecord* pNodeRecord = GetNodeRecord(pNode);
+        CRecord* pParentNodeRecord = pParentNode ? GetNodeRecord(pParentNode) : nullptr;
+
+        float storedScrollPosition = SaveVerticalScrollPos();
+
+        switch (type)
+        {
+        case ITrackViewSequenceListener::eNodeChangeType_Added:
+        case ITrackViewSequenceListener::eNodeChangeType_Unhidden:
+            if (pParentNodeRecord)
+            {
+                AddNodeRecord(pParentNodeRecord, pNode);
+            }
+            break;
+        case ITrackViewSequenceListener::eNodeChangeType_Removed:
+        case ITrackViewSequenceListener::eNodeChangeType_Hidden:
+            if (pNodeRecord)
+            {
+                EraseNodeRecordRec(pNode);
+                delete pNodeRecord;
+            }
+            break;
+        case ITrackViewSequenceListener::eNodeChangeType_Expanded:
+            if (pNodeRecord)
+            {
+                pNodeRecord->setExpanded(true);
+            }
+            break;
+        case ITrackViewSequenceListener::eNodeChangeType_Collapsed:
+            if (pNodeRecord)
+            {
+                pNodeRecord->setExpanded(false);
+            }
+            break;
+        case ITrackViewSequenceListener::eNodeChangeType_Disabled:
+        case ITrackViewSequenceListener::eNodeChangeType_Enabled:
+        case ITrackViewSequenceListener::eNodeChangeType_Muted:
+        case ITrackViewSequenceListener::eNodeChangeType_Unmuted:
+        case ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged:
+            if (pNodeRecord)
+            {
+                UpdateNodeRecord(pNodeRecord);
+            }
+        }
+
+        switch (type)
+        {
+        case ITrackViewSequenceListener::eNodeChangeType_Added:
+        case ITrackViewSequenceListener::eNodeChangeType_Unhidden:
+        case ITrackViewSequenceListener::eNodeChangeType_Removed:
+        case ITrackViewSequenceListener::eNodeChangeType_Hidden:
+        case ITrackViewSequenceListener::eNodeChangeType_Expanded:
+        case ITrackViewSequenceListener::eNodeChangeType_Collapsed:
+            update();
+            RestoreVerticalScrollPos(storedScrollPosition);
+            break;
+        case eNodeChangeType_SetAsActiveDirector:
+            update();
+            break;
+        }
+    }
+    else
+    {
+        m_bNeedReload = true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnNodeRenamed(CTrackViewNode* pNode, [[maybe_unused]] const char* pOldName)
+{
+    if (!m_bIgnoreNotifications)
+    {
+        CRecord* pNodeRecord = GetNodeRecord(pNode);
+        pNodeRecord->setText(0, pNode->GetName());
+
+        update();
+    }
+    else
+    {
+        m_bNeedReload = true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::BeginUndoTransaction()
+{
+    m_bNeedReload = false;
+    m_bIgnoreNotifications = true;
+    m_storedScrollPosition = SaveVerticalScrollPos();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::EndUndoTransaction()
+{
+    m_bIgnoreNotifications = false;
+
+    if (m_bNeedReload)
+    {
+        Reload();
+        RestoreVerticalScrollPos(m_storedScrollPosition);
+        m_bNeedReload = false;
+    }
+
+    UpdateDopeSheet();
+}
+
+//////////////////////////////////////////////////////////////////////////
+QIcon CTrackViewNodesCtrl::GetIconForTrack(const CTrackViewTrack* pTrack)
+{
+    int r = GetIconIndexForTrack(pTrack);
+    return m_imageList.contains(r) ? m_imageList[r] : QIcon();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnKeysChanged(CTrackViewSequence* sequence)
+{
+    if (!m_bIgnoreNotifications && sequence && sequence == GetIEditor()->GetAnimation()->GetSequence())
+    {
+        UpdateDopeSheet();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnKeySelectionChanged(CTrackViewSequence* sequence)
+{
+    OnKeysChanged(sequence);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::OnNodeSelectionChanged(CTrackViewSequence* sequence)
+{
+    if (m_bSelectionChanging)
+    {
+        return;
+    }
+
+    if (!m_bIgnoreNotifications && sequence && sequence == GetIEditor()->GetAnimation()->GetSequence())
+    {
+        UpdateDopeSheet();
+
+        CTrackViewAnimNodeBundle animNodes = sequence->GetAllAnimNodes();
+        const uint numNodes = animNodes.GetCount();
+        for (uint i = 0; i < numNodes; ++i)
+        {
+            CTrackViewAnimNode* pNode = animNodes.GetNode(i);
+            if (pNode->IsSelected())
+            {
+                SelectRow(pNode, false, false);
+            }
+            else
+            {
+                DeselectRow(pNode);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::SelectRow(CTrackViewNode* pNode, const bool bEnsureVisible, const bool bDeselectOtherRows)
+{
+    std::unordered_map<const CTrackViewNode*, CRecord*>::const_iterator it = m_nodeToRecordMap.find(pNode);
+    if (it != m_nodeToRecordMap.end())
+    {
+        if (bDeselectOtherRows)
+        {
+            ui->treeWidget->selectionModel()->clear();
+        }
+        (*it).second->setSelected(true);
+        if (bEnsureVisible)
+        {
+            ui->treeWidget->scrollToItem((*it).second);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::DeselectRow(CTrackViewNode* pNode)
+{
+    std::unordered_map<const CTrackViewNode*, CRecord*>::const_iterator it = m_nodeToRecordMap.find(pNode);
+    if (it != m_nodeToRecordMap.end())
+    {
+        (*it).second->setSelected(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewNodesCtrl::EraseNodeRecordRec(CTrackViewNode* pNode)
+{
+    m_nodeToRecordMap.erase(pNode);
+
+    const unsigned int numChildren = pNode->GetChildCount();
+    for (unsigned int i = 0; i < numChildren; ++i)
+    {
+        EraseNodeRecordRec(pNode->GetChild(i));
+    }
+}
+
+#include <TrackView/moc_TrackViewNodes.cpp>
diff --git a/Code/Editor/TrackView/TrackViewNodes.h b/Code/Editor/TrackView/TrackViewNodes.h
new file mode 100644
index 0000000000..251aeeadcf
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewNodes.h
@@ -0,0 +1,224 @@
+/*
+ * 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 : TrackView's tree control.
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODES_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODES_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/Component/Entity.h>
+
+#include "TrackViewNode.h"
+#include "TrackViewSequence.h"
+#include "Undo/Undo.h"
+#include "Export/ExportManager.h"
+
+#include <IMovieSystem.h>
+#include <QMap>
+#include <QTreeWidgetItem>
+
+#include <QWidget>
+#endif
+
+// forward declarations.
+class CTrackViewNode;
+class CTrackViewAnimNode;
+class CTrackViewTrack;
+class CTrackViewSequence;
+class CTrackViewDopeSheetBase;
+class CTrackViewDialog;
+
+class QLineEdit;
+
+
+namespace Ui {
+    class CTrackViewNodesCtrl;
+}
+
+//////////////////////////////////////////////////////////////////////////
+class CTrackViewNodesCtrl
+    : public QWidget
+    , public ITrackViewSequenceListener
+    , public IUndoManagerListener
+{
+    Q_OBJECT
+public:
+    class CRecord
+        : public QTreeWidgetItem
+    {
+        friend class CTrackViewNodesCtrl;
+
+    public:
+        enum Roles
+        {
+            EnableRole = Qt::UserRole + 1
+        };
+
+        CRecord(CTrackViewNode* pNode = nullptr);
+        CTrackViewNode* GetNode() const { return m_pNode; }
+        bool IsGroup() const { return m_pNode->GetChildCount() != 0; }
+        const QString GetName() const { return m_pNode->GetName(); }
+
+        // Workaround: CXTPReportRecord::IsVisible is
+        // unreliable after the last visible element
+        bool IsVisible() const { return m_bVisible; }
+
+        QRect GetRect() const { return treeWidget()->visualItemRect(this);  }
+
+    private:
+        bool m_bVisible;
+        CTrackViewNode* m_pNode;
+    };
+
+    CTrackViewNodesCtrl(QWidget* hParentWnd, CTrackViewDialog* parent = 0);
+    ~CTrackViewNodesCtrl();
+
+    void SetTrackViewDialog(CTrackViewDialog* dlg) { m_pTrackViewDialog = dlg; }
+    void OnSequenceChanged();
+
+    void SetDopeSheet(CTrackViewDopeSheetBase* keysCtrl);
+
+    void SetEditLock(bool bLock) { m_bEditLock = bLock; }
+
+    float SaveVerticalScrollPos() const;
+    void RestoreVerticalScrollPos(float fScrollPos);
+
+    CRecord* GetNodeRecord(const CTrackViewNode* pNode) const;
+
+    virtual void Reload();
+    virtual void OnFillItems();
+
+    // ITrackViewSequenceListener
+    virtual void OnNodeChanged(CTrackViewNode* pNode, ITrackViewSequenceListener::ENodeChangeType type) override;
+    virtual void OnNodeRenamed(CTrackViewNode* pNode, const char* pOldName) override;
+    virtual void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override;
+    virtual void OnKeysChanged(CTrackViewSequence* pSequence) override;
+    virtual void OnKeySelectionChanged(CTrackViewSequence* pSequence) override;
+
+    // IUndoManagerListener
+    virtual void BeginUndoTransaction() override;
+    virtual void EndUndoTransaction() override;
+
+    // Helper for dialog
+    QIcon GetIconForTrack(const CTrackViewTrack* pTrack);
+    void ShowNextResult();
+
+    void Update();
+
+protected:
+    void paintEvent(QPaintEvent* event) override;
+    void keyPressEvent(QKeyEvent* event) override;
+    bool event(QEvent* event) override;
+    bool eventFilter(QObject* o, QEvent* e) override;
+
+private slots:
+    void OnNMRclick(QPoint pos);
+    void OnItemExpanded(QTreeWidgetItem*);
+    void OnSelectionChanged();
+    void OnItemDblClick(QTreeWidgetItem* item, int);
+    void OnFilterChange(const QString& text);
+
+private:
+    void CreateFolder(CTrackViewAnimNode* pGroupNode);
+    void EditEvents();
+
+    void ImportFromFBX();
+    CTrackViewTrack* GetTrackViewTrack(const Export::EntityAnimData* pAnimData, CTrackViewTrackBundle trackBundle, const QString& nodeName);
+
+    void AddMenuSeperatorConditional(QMenu& menu, bool& bAppended);
+    void AddGroupNodeAddItems(struct SContextMenu& contextMenu, CTrackViewAnimNode* pAnimNode);
+    int ShowPopupMenuSingleSelection(struct SContextMenu& contextMenu, CTrackViewSequence* pSequence, CTrackViewNode* pNode);
+    int ShowPopupMenuMultiSelection(struct SContextMenu& contextMenu);
+    int ShowPopupMenu(QPoint point, const CRecord* pItemInfo);
+
+    bool FillAddTrackMenu(struct STrackMenuTreeNode& menuAddTrack, const CTrackViewAnimNode* pAnimNode);
+    
+    void CreateAddTrackMenuRec(QMenu& parent, const QString& name, CTrackViewAnimNode* animNode, struct STrackMenuTreeNode& node, unsigned int& currentId);
+    
+    void SetPopupMenuLock(QMenu* menu);
+    void CreateSetAnimationLayerPopupMenu(QMenu& menuSetLayer, CTrackViewTrack* pTrack) const;
+
+    int GetIconIndexForTrack(const CTrackViewTrack* pTrack) const;
+    int GetIconIndexForNode(AnimNodeType type) const;
+
+    void AddNodeRecord(CRecord* pParentRecord, CTrackViewNode* pNode);
+    CRecord* AddTrackRecord(CRecord* pParentRecord, CTrackViewTrack* pTrack);
+    CRecord* AddAnimNodeRecord(CRecord* pParentRecord, CTrackViewAnimNode* pNode);
+
+    void FillNodesRec(CRecord* pRecord, CTrackViewNode* pCurrentNode);
+
+    void EraseNodeRecordRec(CTrackViewNode* pNode);
+
+    void UpdateNodeRecord(CRecord* pRecord);
+    void UpdateTrackRecord(CRecord* pRecord, CTrackViewTrack* pTrack);
+    void UpdateAnimNodeRecord(CRecord* pRecord, CTrackViewAnimNode* pAnimNode);
+
+    void FillAutoCompletionListForFilter();
+
+    // Utility function for handling material nodes
+    // It'll return -1 if the found material isn't a multi-material.
+    static int GetMatNameAndSubMtlIndexFromName(QString& matName, const char* nodeName);
+
+    void CustomizeTrackColor(CTrackViewTrack* pTrack);
+    void ClearCustomTrackColor(CTrackViewTrack* pTrack);
+
+    // For drawing dope sheet
+    void UpdateRecordVisibility();
+
+    void UpdateDopeSheet();
+
+    int GetInsertPosition(CRecord* pParentRecord, CTrackViewNode* pNode);
+
+    void SelectRow(CTrackViewNode* pNode, const bool bEnsureVisible, const bool bDeselectOtherRows);
+    void DeselectRow(CTrackViewNode* pNode);
+
+    CTrackViewDopeSheetBase* m_pDopeSheet;
+    CTrackViewDialog* m_pTrackViewDialog;
+
+    typedef std::vector<CRecord*> ItemInfos;
+    ItemInfos m_itemInfos;
+
+    bool m_bSelectionChanging;
+    bool m_bEditLock;
+
+    QCursor m_arrowCursor;
+    QCursor m_noIcon;
+
+    UINT m_currentMatchIndex;
+    UINT m_matchCount;
+
+    bool m_bIgnoreNotifications;
+    bool m_bNeedReload;
+    float m_storedScrollPosition;
+
+    // Drag and drop
+    CTrackViewAnimNodeBundle m_draggedNodes;
+    CTrackViewAnimNode* m_pDragTarget;
+
+    std::unordered_map<unsigned int, CAnimParamType> m_menuParamTypeMap;
+    std::unordered_map<const CTrackViewNode*, CRecord*> m_nodeToRecordMap;
+
+    QMap<int, QIcon> m_imageList;
+    QScopedPointer<Ui::CTrackViewNodesCtrl> ui;
+
+    //! Cached map of component icons.
+    //! Key: Component's RTTI type
+    //! Value: Icon for this component
+    AZStd::unordered_map<AZ::Uuid, QIcon> m_componentTypeToIconMap;
+};
+
+
+typedef CTrackViewNode* CTrackViewNodePtr;
+Q_DECLARE_METATYPE(CTrackViewNodePtr);
+QDataStream& operator<<(QDataStream& out, const CTrackViewNodePtr& obj);
+QDataStream& operator>>(QDataStream& in, CTrackViewNodePtr& obj);
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODES_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodes.ui b/Code/Editor/TrackView/TrackViewNodes.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewNodes.ui
rename to Code/Editor/TrackView/TrackViewNodes.ui
diff --git a/Code/Editor/TrackView/TrackViewPythonFuncs.cpp b/Code/Editor/TrackView/TrackViewPythonFuncs.cpp
new file mode 100644
index 0000000000..04c5a179ba
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewPythonFuncs.cpp
@@ -0,0 +1,706 @@
+/*
+ * 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 "TrackViewPythonFuncs.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+#include <CryCommon/Maestro/Types/AnimValueType.h>
+
+// Editor
+#include "AnimationContext.h"
+
+
+namespace
+{
+    CTrackViewSequence* GetSequenceByEntityIdOrName(const CTrackViewSequenceManager* pSequenceManager, const char* entityIdOrName)
+    {
+        // the "name" string will be an AZ::EntityId in string form if this was called from
+        // TrackView code. But for backward compatibility we also support a sequence name.
+        bool isNameAValidU64 = false;
+        QString entityIdString = entityIdOrName;
+        AZ::u64 nameAsU64 = entityIdString.toULongLong(&isNameAValidU64);
+
+        CTrackViewSequence* pSequence = nullptr;
+        if (isNameAValidU64)
+        {
+            // "name" string was a valid u64 represented as a string. Use as an entity Id to search for sequence.
+            pSequence = pSequenceManager->GetSequenceByEntityId(AZ::EntityId(nameAsU64));
+        }
+
+        if (!pSequence)
+        {
+            // name passed in could not find a sequence by using it as an EntityId. Use it as a
+            // sequence name for backward compatibility
+            pSequence = pSequenceManager->GetSequenceByName(entityIdOrName);
+        }
+
+        return pSequence;
+    }
+
+}
+
+namespace
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Misc
+    //////////////////////////////////////////////////////////////////////////
+    void PyTrackViewSetRecording(bool bRecording)
+    {
+        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+        if (pAnimationContext)
+        {
+            pAnimationContext->SetRecording(bRecording);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Sequences
+    //////////////////////////////////////////////////////////////////////////
+    void PyTrackViewNewSequence(const char* name, int sequenceType)
+    {
+        CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+
+        CTrackViewSequence* pSequence = pSequenceManager->GetSequenceByName(name);
+        if (pSequence)
+        {
+            throw std::runtime_error("A sequence with this name already exists");
+        }
+
+        CUndo undo("Create TrackView sequence");
+        pSequenceManager->CreateSequence(name, static_cast<SequenceType>(sequenceType));
+    }
+
+    void PyTrackViewDeleteSequence(const char* name)
+    {
+        CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* pSequence = GetSequenceByEntityIdOrName(pSequenceManager, name);
+        if (pSequence)
+        {
+            pSequenceManager->DeleteSequence(pSequence);
+            return;
+        }
+
+        throw std::runtime_error("Could not find sequence");
+    }
+
+    void PyTrackViewSetCurrentSequence(const char* name)
+    {
+        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* sequence = GetSequenceByEntityIdOrName(sequenceManager, name);
+        CAnimationContext* animationContext = GetIEditor()->GetAnimation();
+        bool force = false;
+        bool noNotify = false;
+        bool user = true;
+        animationContext->SetSequence(sequence, force, noNotify, user);
+    }
+
+    int PyTrackViewGetNumSequences()
+    {
+        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        AZ_TracePrintf("", "PyTrackViewGetNumSequences called")
+        return pSequenceManager->GetCount();
+    }
+
+    AZStd::string PyTrackViewGetSequenceName(unsigned int index)
+    {
+        if (index < PyTrackViewGetNumSequences())
+        {
+            const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+            return pSequenceManager->GetSequenceByIndex(index)->GetName();
+        }
+
+        throw std::runtime_error("Could not find sequence");
+    }
+
+    Range PyTrackViewGetSequenceTimeRange(const char* name)
+    {
+        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* pSequence = GetSequenceByEntityIdOrName(pSequenceManager, name);
+        if (!pSequence)
+        {
+            throw std::runtime_error("A sequence with this name doesn't exists");
+        }
+
+        return pSequence->GetTimeRange();
+    }
+
+    void PyTrackViewSetSequenceTimeRange(const char* name, float start, float end)
+    {
+        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* pSequence = GetSequenceByEntityIdOrName(pSequenceManager, name);
+        if (!pSequence)
+        {
+            throw std::runtime_error("A sequence with this name doesn't exists");
+        }
+
+        CUndo undo("Set sequence time range");
+        pSequence->SetTimeRange(Range(start, end));
+        pSequence->MarkAsModified();
+    }
+
+    void PyTrackViewPlaySequence()
+    {
+        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+        if (pAnimationContext->IsPlaying())
+        {
+            throw std::runtime_error("A sequence is already playing");
+        }
+
+        pAnimationContext->SetPlaying(true);
+    }
+
+    void PyTrackViewStopSequence()
+    {
+        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+        if (!pAnimationContext->IsPlaying())
+        {
+            throw std::runtime_error("No sequence is playing");
+        }
+
+        pAnimationContext->SetPlaying(false);
+    }
+
+    void PyTrackViewSetSequenceTime(float time)
+    {
+        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+        pAnimationContext->SetTime(time);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Nodes
+    //////////////////////////////////////////////////////////////////////////
+    void PyTrackViewAddNode(const char* nodeTypeString, const char* nodeName)
+    {
+        CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+        if (!pSequence)
+        {
+            throw std::runtime_error("No sequence is active");
+        }
+
+        const AnimNodeType nodeType = GetIEditor()->GetMovieSystem()->GetNodeTypeFromString(nodeTypeString);
+        if (nodeType == AnimNodeType::Invalid)
+        {
+            throw std::runtime_error("Invalid node type");
+        }
+
+        CUndo undo("Create anim node");
+        pSequence->CreateSubNode(nodeName, nodeType);
+    }
+
+    void PyTrackViewAddSelectedEntities()
+    {
+        CAnimationContext* animationContext = GetIEditor()->GetAnimation();
+        CTrackViewSequence* sequence = animationContext->GetSequence();
+        if (!sequence)
+        {
+            throw std::runtime_error("No sequence is active");
+        }
+
+        AZStd::vector<AnimParamType> tracks = {
+            AnimParamType::Position,
+            AnimParamType::Rotation
+        };
+
+        AzToolsFramework::ScopedUndoBatch undoBatch("Add entities to Track View");
+        sequence->AddSelectedEntities(tracks);
+        sequence->BindToEditorObjects();
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+    }
+
+    void PyTrackViewAddLayerNode()
+    {
+        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+        CTrackViewSequence* pSequence = pAnimationContext->GetSequence();
+        if (!pSequence)
+        {
+            throw std::runtime_error("No sequence is active");
+        }
+
+        CUndo undo("Add current layer to TrackView");
+        pSequence->AddCurrentLayer();
+    }
+
+    CTrackViewAnimNode* GetNodeFromName(const char* nodeName, const char* parentDirectorName)
+    {
+        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+        CTrackViewSequence* pSequence = pAnimationContext->GetSequence();
+        if (!pSequence)
+        {
+            throw std::runtime_error("No sequence is active");
+        }
+
+        CTrackViewAnimNode* pParentDirector = pSequence;
+        if (strlen(parentDirectorName) > 0)
+        {
+            CTrackViewAnimNodeBundle foundNodes = pSequence->GetAnimNodesByName(parentDirectorName);
+            if (foundNodes.GetCount() == 0 || foundNodes.GetNode(0)->GetType() != AnimNodeType::Director)
+            {
+                throw std::runtime_error("Director node not found");
+            }
+
+            pParentDirector = foundNodes.GetNode(0);
+        }
+
+        CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAnimNodesByName(nodeName);
+        return (foundNodes.GetCount() > 0) ? foundNodes.GetNode(0) : nullptr;
+    }
+
+    void PyTrackViewDeleteNode(AZStd::string_view nodeName, AZStd::string_view parentDirectorName)
+    {
+        CTrackViewAnimNode* pNode = GetNodeFromName(nodeName.data(), parentDirectorName.data());
+        if (pNode == nullptr)
+        {
+            throw std::runtime_error("Couldn't find node");
+        }
+
+        CTrackViewAnimNode* pParentNode = static_cast<CTrackViewAnimNode*>(pNode->GetParentNode());
+
+        CUndo undo("Delete TrackView Node");
+        pParentNode->RemoveSubNode(pNode);
+    }
+
+    void PyTrackViewAddTrack(const char* paramName, const char* nodeName, const char* parentDirectorName)
+    {
+        CTrackViewAnimNode* pNode = GetNodeFromName(nodeName, parentDirectorName);
+        if (!pNode)
+        {
+            throw std::runtime_error("Couldn't find node");
+        }
+
+        // Add tracks to menu, that can be added to animation node.
+        const int paramCount = pNode->GetParamCount();
+        for (int i = 0; i < paramCount; ++i)
+        {
+            CAnimParamType paramType = pNode->GetParamType(i);
+
+            if (paramType == AnimParamType::Invalid)
+            {
+                continue;
+            }
+
+            IAnimNode::ESupportedParamFlags paramFlags = pNode->GetParamFlags(paramType);
+
+            CTrackViewTrack* pTrack = pNode->GetTrackForParameter(paramType);
+            if (!pTrack || (paramFlags & IAnimNode::eSupportedParamFlags_MultipleTracks))
+            {
+                const char* name = pNode->GetParamName(paramType);
+                if (_stricmp(name, paramName) == 0)
+                {
+                    CUndo undo("Create track");
+                    if (!pNode->CreateTrack(paramType))
+                    {
+                        undo.Cancel();
+                        throw std::runtime_error("Could not create track");
+                    }
+
+                    pNode->SetSelected(true);
+                    return;
+                }
+            }
+        }
+
+        throw std::runtime_error("Could not create track");
+    }
+
+    void PyTrackViewDeleteTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName)
+    {
+        CTrackViewAnimNode* pNode = GetNodeFromName(nodeName, parentDirectorName);
+        if (!pNode)
+        {
+            throw std::runtime_error("Couldn't find node");
+        }
+
+        const CAnimParamType paramType = GetIEditor()->GetMovieSystem()->GetParamTypeFromString(paramName);
+        CTrackViewTrack* pTrack = pNode->GetTrackForParameter(paramType, index);
+        if (!pTrack)
+        {
+            throw std::runtime_error("Could not find track");
+        }
+
+        CUndo undo("Delete TrackView track");
+        pNode->RemoveTrack(pTrack);
+    }
+
+    int PyTrackViewGetNumNodes(AZStd::string_view parentDirectorName)
+    {
+        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+        CTrackViewSequence* pSequence = pAnimationContext->GetSequence();
+        if (!pSequence)
+        {
+            throw std::runtime_error("No sequence is active");
+        }
+
+        CTrackViewAnimNode* pParentDirector = pSequence;
+        if (!parentDirectorName.empty())
+        {
+            CTrackViewAnimNodeBundle foundNodes = pSequence->GetAnimNodesByName(parentDirectorName.data());
+            if (foundNodes.GetCount() == 0 || foundNodes.GetNode(0)->GetType() != AnimNodeType::Director)
+            {
+                throw std::runtime_error("Director node not found");
+            }
+
+            pParentDirector = foundNodes.GetNode(0);
+        }
+
+        CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAllAnimNodes();
+        return foundNodes.GetCount();
+    }
+
+    AZStd::string PyTrackViewGetNodeName(int index, AZStd::string_view parentDirectorName)
+    {
+        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+        CTrackViewSequence* pSequence = pAnimationContext->GetSequence();
+        if (!pSequence)
+        {
+            throw std::runtime_error("No sequence is active");
+        }
+
+        CTrackViewAnimNode* pParentDirector = pSequence;
+        if (!parentDirectorName.empty())
+        {
+            CTrackViewAnimNodeBundle foundNodes = pSequence->GetAnimNodesByName(parentDirectorName.data());
+            if (foundNodes.GetCount() == 0 || foundNodes.GetNode(0)->GetType() != AnimNodeType::Director)
+            {
+                throw std::runtime_error("Director node not found");
+            }
+
+            pParentDirector = foundNodes.GetNode(0);
+        }
+
+        CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAllAnimNodes();
+        if (index < 0 || index >= foundNodes.GetCount())
+        {
+            throw std::runtime_error("Invalid node index");
+        }
+
+        return foundNodes.GetNode(index)->GetName();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Tracks
+    //////////////////////////////////////////////////////////////////////////
+    CTrackViewTrack* GetTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName)
+    {
+        CTrackViewAnimNode* pNode = GetNodeFromName(nodeName, parentDirectorName);
+        if (!pNode)
+        {
+            throw std::runtime_error("Couldn't find node");
+        }
+
+        const CAnimParamType paramType = GetIEditor()->GetMovieSystem()->GetParamTypeFromString(paramName);
+        CTrackViewTrack* pTrack = pNode->GetTrackForParameter(paramType, index);
+        if (!pTrack)
+        {
+            throw std::runtime_error("Track doesn't exist");
+        }
+
+        return pTrack;
+    }
+
+    std::set<float> GetKeyTimeSet(CTrackViewTrack* pTrack)
+    {
+        std::set<float> keyTimeSet;
+        for (uint i = 0; i < pTrack->GetKeyCount(); ++i)
+        {
+            CTrackViewKeyHandle keyHandle = pTrack->GetKey(i);
+            keyTimeSet.insert(keyHandle.GetTime());
+        }
+
+        return keyTimeSet;
+    }
+
+    int PyTrackViewGetNumTrackKeys(const char* paramName, int trackIndex, const char* nodeName, const char* parentDirectorName)
+    {
+        CTrackViewTrack* pTrack = GetTrack(paramName, trackIndex, nodeName, parentDirectorName);
+        return (int)GetKeyTimeSet(pTrack).size();
+    }
+
+    AZStd::any PyTrackViewGetInterpolatedValue(const char* paramName, int trackIndex, float time, const char* nodeName, const char* parentDirectorName)
+    {
+        CTrackViewTrack* pTrack = GetTrack(paramName, trackIndex, nodeName, parentDirectorName);
+
+        switch (pTrack->GetValueType())
+        {
+        case AnimValueType::Float:
+        case AnimValueType::DiscreteFloat:
+        {
+            float value;
+            pTrack->GetValue(time, value);
+            return AZStd::make_any<float>(value);
+        }
+        break;
+        case AnimValueType::Bool:
+        {
+            bool value;
+            pTrack->GetValue(time, value);
+            return AZStd::make_any<bool>(value);
+        }
+        break;
+        case AnimValueType::Quat:
+        {
+            Quat value;
+            pTrack->GetValue(time, value);
+            Ang3 rotation(value);
+            return AZStd::make_any<AZ::Vector3>(rotation.x, rotation.y, rotation.z);
+        }
+        case AnimValueType::Vector:
+        {
+            Vec3 value;
+            pTrack->GetValue(time, value);
+            return AZStd::make_any<AZ::Vector3>(value.x, value.y, value.z);
+        }
+        break;
+        case AnimValueType::Vector4:
+        {
+            Vec4 value;
+            pTrack->GetValue(time, value);
+            return AZStd::make_any<AZ::Vector4>(value.x, value.y, value.z, value.w);
+        }
+        break;
+        case AnimValueType::RGB:
+        {
+            Vec3 value;
+            pTrack->GetValue(time, value);
+            return AZStd::make_any<AZ::Color>(value.x, value.y, value.z, 0.0f);
+        }
+        break;
+        default:
+            throw std::runtime_error("Unsupported key type");
+        }
+    }
+
+    AZStd::any PyTrackViewGetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName)
+    {
+        CTrackViewTrack* pTrack = GetTrack(paramName, trackIndex, nodeName, parentDirectorName);
+
+        std::set<float> keyTimeSet = GetKeyTimeSet(pTrack);
+        if (keyIndex < 0 || keyIndex >= keyTimeSet.size())
+        {
+            throw std::runtime_error("Invalid key index");
+        }
+
+        auto keyTimeIter = keyTimeSet.begin();
+        std::advance(keyTimeIter, keyIndex);
+        const float keyTime = *keyTimeIter;
+
+        return PyTrackViewGetInterpolatedValue(paramName, trackIndex, keyTime, nodeName, parentDirectorName);
+    }
+}
+
+
+namespace AzToolsFramework
+{
+    void TrackViewComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->EBus<EditorLayerTrackViewRequestBus>("EditorLayerTrackViewRequestBus")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                ->Attribute(AZ::Script::Attributes::Module, "track_view")
+                ->Event("AddNode", &EditorLayerTrackViewRequestBus::Events::AddNode)
+                ->Event("AddTrack", &EditorLayerTrackViewRequestBus::Events::AddTrack)
+                ->Event("AddLayerNode", &EditorLayerTrackViewRequestBus::Events::AddLayerNode)
+                ->Event("AddSelectedEntities", &EditorLayerTrackViewRequestBus::Events::AddSelectedEntities)
+                ->Event("DeleteNode", &EditorLayerTrackViewRequestBus::Events::DeleteNode)
+                ->Event("DeleteTrack", &EditorLayerTrackViewRequestBus::Events::DeleteTrack)
+                ->Event("DeleteSequence", &EditorLayerTrackViewRequestBus::Events::DeleteSequence)
+                ->Event("GetInterpolatedValue", &EditorLayerTrackViewRequestBus::Events::GetInterpolatedValue)
+                ->Event("GetKeyValue", &EditorLayerTrackViewRequestBus::Events::GetKeyValue)
+                ->Event("GetNodeName", &EditorLayerTrackViewRequestBus::Events::GetNodeName)
+                ->Event("GetNumNodes", &EditorLayerTrackViewRequestBus::Events::GetNumNodes)
+                ->Event("GetNumSequences", &EditorLayerTrackViewRequestBus::Events::GetNumSequences)
+                ->Event("GetNumTrackKeys", &EditorLayerTrackViewRequestBus::Events::GetNumTrackKeys)
+                ->Event("GetSequenceName", &EditorLayerTrackViewRequestBus::Events::GetSequenceName)
+                ->Event("GetSequenceTimeRange", &EditorLayerTrackViewRequestBus::Events::GetSequenceTimeRange)
+                ->Event("NewSequence", &EditorLayerTrackViewRequestBus::Events::NewSequence)
+                ->Event("PlaySequence", &EditorLayerTrackViewRequestBus::Events::PlaySequence)
+                ->Event("SetCurrentSequence", &EditorLayerTrackViewRequestBus::Events::SetCurrentSequence)
+                ->Event("SetRecording", &EditorLayerTrackViewRequestBus::Events::SetRecording)
+                ->Event("SetSequenceTimeRange", &EditorLayerTrackViewRequestBus::Events::SetSequenceTimeRange)
+                ->Event("SetTime", &EditorLayerTrackViewRequestBus::Events::SetSequenceTime)
+                ->Event("StopSequence", &EditorLayerTrackViewRequestBus::Events::StopSequence)
+                ;
+        }
+    }
+
+    void TrackViewComponent::Activate()
+    {
+        EditorLayerTrackViewRequestBus::Handler::BusConnect(GetEntityId());
+    }
+
+    void TrackViewComponent::Deactivate()
+    {
+        EditorLayerTrackViewRequestBus::Handler::BusDisconnect();
+    }
+
+    int TrackViewComponent::GetNumSequences()
+    {
+        return PyTrackViewGetNumSequences();
+    }
+
+    void TrackViewComponent::NewSequence(const char* name, int sequenceType)
+    {
+        return PyTrackViewNewSequence(name, sequenceType);
+    }
+
+    void TrackViewComponent::PlaySequence()
+    {
+        return PyTrackViewPlaySequence();
+    }
+
+    void TrackViewComponent::StopSequence()
+    {
+        return PyTrackViewStopSequence();
+    }
+
+    void TrackViewComponent::SetSequenceTime(float time)
+    {
+        return PyTrackViewSetSequenceTime(time);
+    }
+
+    void TrackViewComponent::AddSelectedEntities()
+    {
+        return PyTrackViewAddSelectedEntities();
+    }
+
+    void TrackViewComponent::AddLayerNode()
+    {
+        return PyTrackViewAddLayerNode();
+    }
+
+    void TrackViewComponent::AddTrack(const char* paramName, const char* nodeName, const char* parentDirectorName)
+    {
+        return PyTrackViewAddTrack(paramName, nodeName, parentDirectorName);
+    }
+
+    void TrackViewComponent::DeleteTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName)
+    {
+        return PyTrackViewDeleteTrack(paramName, index, nodeName, parentDirectorName);
+    }
+
+    int TrackViewComponent::GetNumTrackKeys(const char* paramName, int trackIndex, const char* nodeName, const char* parentDirectorName)
+    {
+        return PyTrackViewGetNumTrackKeys(paramName, trackIndex, nodeName, parentDirectorName);
+    }
+
+    void TrackViewComponent::SetRecording(bool bRecording)
+    {
+        return PyTrackViewSetRecording(bRecording);
+    }
+
+    void TrackViewComponent::DeleteSequence(const char* name)
+    {
+        return PyTrackViewDeleteSequence(name);
+    }
+
+    void TrackViewComponent::SetCurrentSequence(const char* name)
+    {
+        return PyTrackViewSetCurrentSequence(name);
+    }
+
+    AZStd::string TrackViewComponent::GetSequenceName(unsigned int index)
+    {
+        return PyTrackViewGetSequenceName(index);
+    }
+
+    Range TrackViewComponent::GetSequenceTimeRange(const char* name)
+    {
+        return PyTrackViewGetSequenceTimeRange(name);
+    }
+
+    void TrackViewComponent::AddNode(const char* nodeTypeString, const char* nodeName)
+    {
+        return PyTrackViewAddNode(nodeTypeString, nodeName);
+    }
+
+    void TrackViewComponent::DeleteNode(AZStd::string_view nodeName, AZStd::string_view parentDirectorName)
+    {
+        return PyTrackViewDeleteNode(nodeName, parentDirectorName);
+    }
+
+    int TrackViewComponent::GetNumNodes(AZStd::string_view parentDirectorName)
+    {
+        return PyTrackViewGetNumNodes(parentDirectorName);
+    }
+
+    AZStd::string TrackViewComponent::GetNodeName(int index, AZStd::string_view parentDirectorName)
+    {
+        return PyTrackViewGetNodeName(index, parentDirectorName);
+    }
+
+    AZStd::any TrackViewComponent::GetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName)
+    {
+        return PyTrackViewGetKeyValue(paramName, trackIndex, keyIndex, nodeName, parentDirectorName);
+    }
+
+    AZStd::any TrackViewComponent::GetInterpolatedValue(const char* paramName, int trackIndex, float time, const char* nodeName, const char* parentDirectorName)
+    {
+        return PyTrackViewGetInterpolatedValue(paramName, trackIndex, time, nodeName, parentDirectorName);
+    }
+
+    void TrackViewComponent::SetSequenceTimeRange(const char* name, float start, float end)
+    {
+        return PyTrackViewSetSequenceTimeRange(name, start, end);
+    }
+}
+
+namespace AzToolsFramework
+{
+    void TrackViewFuncsHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->Class<Range>("CryRange")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                ->Attribute(AZ::Script::Attributes::Module, "legacy.trackview")
+                ->Property("start", BehaviorValueProperty(&Range::start))
+                ->Property("end", BehaviorValueProperty(&Range::end))
+                ;
+
+            // this will put these methods into the 'azlmbr.legacy.trackview' module
+            auto addLegacyTrackview = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/TrackView")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.trackview");
+            };
+            addLegacyTrackview(behaviorContext->Method("set_recording", PyTrackViewSetRecording, nullptr, "Activates/deactivates TrackView recording mode."));
+
+            addLegacyTrackview(behaviorContext->Method("new_sequence", PyTrackViewNewSequence, nullptr, "Creates a new sequence of the given type (0=Object Entity Sequence (Legacy), 1=Component Entity Sequence (PREVIEW)) with the given name."));
+            addLegacyTrackview(behaviorContext->Method("delete_sequence", PyTrackViewDeleteSequence, nullptr, "Deletes the specified sequence."));
+            addLegacyTrackview(behaviorContext->Method("set_current_sequence", PyTrackViewSetCurrentSequence, nullptr, "Sets the specified sequence as a current one in TrackView."));
+            addLegacyTrackview(behaviorContext->Method("get_num_sequences", PyTrackViewGetNumSequences, nullptr, "Gets the number of sequences."));
+            addLegacyTrackview(behaviorContext->Method("get_sequence_name", PyTrackViewGetSequenceName, nullptr, "Gets the name of a sequence by its index."));
+
+            addLegacyTrackview(behaviorContext->Method("get_sequence_time_range", PyTrackViewGetSequenceTimeRange, nullptr, "Gets the time range of a sequence as a pair."));
+
+            addLegacyTrackview(behaviorContext->Method("set_sequence_time_range", PyTrackViewSetSequenceTimeRange, nullptr, "Sets the time range of a sequence."));
+            addLegacyTrackview(behaviorContext->Method("play_sequence", PyTrackViewPlaySequence, nullptr, "Plays the current sequence in TrackView."));
+            addLegacyTrackview(behaviorContext->Method("stop_sequence", PyTrackViewStopSequence, nullptr, "Stops any sequence currently playing in TrackView."));
+            addLegacyTrackview(behaviorContext->Method("set_time", PyTrackViewSetSequenceTime, nullptr, "Sets the time of the sequence currently playing in TrackView."));
+
+            addLegacyTrackview(behaviorContext->Method("add_node", PyTrackViewAddNode, nullptr, "Adds a new node with the given type & name to the current sequence."));
+            addLegacyTrackview(behaviorContext->Method("add_selected_entities", PyTrackViewAddSelectedEntities, nullptr, "Adds an entity node(s) from viewport selection to the current sequence."));
+            addLegacyTrackview(behaviorContext->Method("add_layer_node", PyTrackViewAddLayerNode, nullptr, "Adds a layer node from the current layer to the current sequence."));
+            addLegacyTrackview(behaviorContext->Method("delete_node", PyTrackViewDeleteNode, nullptr, "Deletes the specified node from the current sequence."));
+            addLegacyTrackview(behaviorContext->Method("add_track", PyTrackViewAddTrack, nullptr, "Adds a track of the given parameter ID to the node."));
+            addLegacyTrackview(behaviorContext->Method("delete_track", PyTrackViewDeleteTrack, nullptr, "Deletes a track of the given parameter ID (in the given index in case of a multi-track) from the node."));
+            addLegacyTrackview(behaviorContext->Method("get_num_nodes", PyTrackViewGetNumNodes, nullptr, "Gets the number of nodes."));
+            addLegacyTrackview(behaviorContext->Method("get_node_name", PyTrackViewGetNodeName, nullptr, "Gets the name of a sequence by its index."));
+
+            addLegacyTrackview(behaviorContext->Method("get_num_track_keys", PyTrackViewGetNumTrackKeys, nullptr, "Gets number of keys of the specified track."));
+
+            addLegacyTrackview(behaviorContext->Method("get_key_value", PyTrackViewGetKeyValue, nullptr, "Gets the value of the specified key."));
+            addLegacyTrackview(behaviorContext->Method("get_interpolated_value", PyTrackViewGetInterpolatedValue, nullptr, "Gets the interpolated value of a track at the specified time."));
+        }
+    }
+}
diff --git a/Code/Editor/TrackView/TrackViewPythonFuncs.h b/Code/Editor/TrackView/TrackViewPythonFuncs.h
new file mode 100644
index 0000000000..addae4c858
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewPythonFuncs.h
@@ -0,0 +1,97 @@
+/*
+ * 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 <Include/SandboxAPI.h>
+#include "EditorTrackViewEventsBus.h"
+
+namespace AzToolsFramework
+{
+    //! A legacy component to reflect scriptable commands for the Editor
+    class TrackViewFuncsHandler
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(TrackViewFuncsHandler, "{5315678D-2951-4CF6-A9DC-CE21CD23C9C9}")
+
+        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+    };
+
+    //! Component to access the TrackView
+    AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    class SANDBOX_API TrackViewComponent final
+        : public AZ::Component
+        , public EditorLayerTrackViewRequestBus::Handler
+    {
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+    public:
+        AZ_COMPONENT(TrackViewComponent, "{3CF943CC-6F10-4B19-88FC-CFB697558FFD}")
+
+        TrackViewComponent() = default;
+        ~TrackViewComponent() override = default;
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        // Component...
+        void Activate() override;
+        void Deactivate() override;
+
+        int GetNumSequences() override;
+
+        void NewSequence(const char* name, int sequenceType) override;
+
+        void PlaySequence() override;
+
+        void StopSequence() override;
+
+        void SetSequenceTime(float time) override;
+
+        void AddSelectedEntities() override;
+
+        void AddLayerNode() override;
+
+        void AddTrack(const char* paramName, const char* nodeName, const char* parentDirectorName) override;
+
+        void DeleteTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName) override;
+
+        int GetNumTrackKeys(const char* paramName, int trackIndex, const char* nodeName, const char* parentDirectorName) override;
+
+        void SetRecording(bool bRecording) override;
+
+        void DeleteSequence(const char* name) override;
+
+        void SetCurrentSequence(const char* name) override;
+
+        AZStd::string GetSequenceName(unsigned int index) override;
+
+        TRange<float> GetSequenceTimeRange(const char* name) override;
+
+        void AddNode(const char* nodeTypeString, const char* nodeName) override;
+
+        void DeleteNode(AZStd::string_view nodeName, AZStd::string_view parentDirectorName) override;
+
+        int GetNumNodes(AZStd::string_view parentDirectorName) override;
+
+        AZStd::string GetNodeName(int index, AZStd::string_view parentDirectorName) override;
+
+        AZStd::any GetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName) override;
+
+        AZStd::any GetInterpolatedValue(const char* paramName, int trackIndex, float time, const char* nodeName, const char* parentDirectorName) override;
+
+        void SetSequenceTimeRange(const char* name, float start, float end) override;
+
+    };
+
+} // namespace AzToolsFramework
diff --git a/Code/Editor/TrackView/TrackViewSequence.cpp b/Code/Editor/TrackView/TrackViewSequence.cpp
new file mode 100644
index 0000000000..35924bbe6a
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewSequence.cpp
@@ -0,0 +1,1584 @@
+/*
+ * 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 "TrackViewSequence.h"
+
+// Qt
+#include <QMessageBox>
+
+// AzCore
+#include <AzCore/std/sort.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimValueType.h>
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
+#include <CryCommon/MathConversion.h>
+
+// Editor
+#include "AnimationContext.h"
+#include "Clipboard.h"
+#include "TrackViewSequenceManager.h"
+#include "TrackViewNodeFactories.h"
+#include "Include/IObjectManager.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewSequence::CTrackViewSequence(IAnimSequence* pSequence)
+    : CTrackViewAnimNode(pSequence, nullptr, nullptr)
+    , m_pAnimSequence(pSequence)
+{
+    AZ_Assert(m_pAnimSequence, "Expected valid m_pAnimSequence");
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewSequence::CTrackViewSequence(AZStd::intrusive_ptr<IAnimSequence>& sequence)
+    : CTrackViewAnimNode(sequence.get(), nullptr, nullptr)
+    , m_pAnimSequence(sequence)
+{
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewSequence::~CTrackViewSequence()
+{
+    GetIEditor()->GetSequenceManager()->RemoveListener(this);
+    GetIEditor()->GetUndoManager()->RemoveListener(this);       // For safety. Should be done by OnRemoveSequence callback
+
+    // For safety, disconnect to any buses we may have been listening on for record mode
+    if (m_pAnimSequence)
+    {
+        // disconnect from all EBuses for notification of changes for all AZ::Entities in our sequence
+        for (int i = m_pAnimSequence->GetNodeCount(); --i >= 0;)
+        {
+            IAnimNode* animNode = m_pAnimSequence->GetNode(i);
+            if (animNode->GetType() == AnimNodeType::AzEntity)
+            {
+                Maestro::EditorSequenceComponentRequestBus::Event(m_pAnimSequence->GetSequenceEntityId(), &Maestro::EditorSequenceComponentRequestBus::Events::RemoveEntityToAnimate, animNode->GetAzEntityId());
+                ConnectToBusesForRecording(animNode->GetAzEntityId(), false);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::Load()
+{
+    m_childNodes.clear();
+
+    const int nodeCount = m_pAnimSequence->GetNodeCount();
+    for (int i = 0; i < nodeCount; ++i)
+    {
+        IAnimNode* node = m_pAnimSequence->GetNode(i);
+
+        // Only add top level nodes to sequence
+        if (!node->GetParent())
+        {
+            CTrackViewAnimNodeFactory animNodeFactory;
+            CTrackViewAnimNode* pNewTVAnimNode = animNodeFactory.BuildAnimNode(m_pAnimSequence.get(), node, this);
+            m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNewTVAnimNode));
+        }
+    }
+
+    SortNodes();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::BindToEditorObjects()
+{
+    m_bBoundToEditorObjects = true;
+    CTrackViewAnimNode::BindToEditorObjects();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::UnBindFromEditorObjects()
+{
+    m_bBoundToEditorObjects = false;
+    CTrackViewAnimNode::UnBindFromEditorObjects();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewSequence::IsBoundToEditorObjects() const
+{
+    return m_bBoundToEditorObjects;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewSequence::FindSingleSelectedKey()
+{
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSequence)
+    {
+        return CTrackViewKeyHandle();
+    }
+
+    CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
+
+    if (selectedKeys.GetKeyCount() != 1)
+    {
+        return CTrackViewKeyHandle();
+    }
+
+    return selectedKeys.GetKey(0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnEntityComponentPropertyChanged(AZ::ComponentId changedComponentId)
+{
+    const AZ::EntityId entityId = *AzToolsFramework::PropertyEditorEntityChangeNotificationBus::GetCurrentBusId();
+   
+    // find the component node for this changeComponentId if it exists
+    for (int i = m_pAnimSequence->GetNodeCount(); --i >= 0;)
+    {
+        IAnimNode* animNode = m_pAnimSequence->GetNode(i);
+        if (animNode && animNode->GetComponentId() == changedComponentId)
+        {
+            // we have a component animNode for this changedComponentId. Process the component change
+            RecordTrackChangesForNode(static_cast<CTrackViewAnimNode*>(animNode->GetNodeOwner()));
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrack* CTrackViewSequence::FindTrackById(unsigned int trackId)
+{
+    CTrackViewTrack* result = nullptr;
+    CTrackViewTrackBundle allTracks = GetAllTracks();
+    
+    int allTracksCount = allTracks.GetCount();
+    for (int trackIndex = 0; trackIndex < allTracksCount; trackIndex++)
+    {
+        CTrackViewTrack* track = allTracks.GetTrack(trackIndex);
+        AZ_Assert(track, "Expected valid track.");
+        if (track->GetId() == trackId)
+        {
+            result = track;
+            break;
+        }
+    }
+
+    return result;
+}
+
+//////////////////////////////////////////////////////////////////////////
+std::vector<bool> CTrackViewSequence::SaveKeyStates() const
+{
+    // const hack because GetAllKeys();
+    CTrackViewSequence* nonConstSequence = const_cast<CTrackViewSequence*>(this);
+    CTrackViewKeyBundle keys = nonConstSequence->GetAllKeys();
+    const unsigned int numkeys = keys.GetKeyCount();
+
+    std::vector<bool> selectionState;
+    selectionState.reserve(numkeys);
+
+    for (unsigned int i = 0; i < numkeys; ++i)
+    {
+        const CTrackViewKeyHandle& keyHandle = keys.GetKey(i);
+        selectionState.push_back(keyHandle.IsSelected());
+    }
+
+    return selectionState;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::RestoreKeyStates(const std::vector<bool>& keyStates)
+{
+    CTrackViewKeyBundle keys = GetAllKeys();
+    const unsigned int numkeys = keys.GetKeyCount();
+
+    if (keyStates.size() >= numkeys)
+    {
+        CTrackViewSequenceNotificationContext context(this);
+        for (unsigned int i = 0; i < numkeys; ++i)
+        {
+            CTrackViewKeyHandle keyHandle = keys.GetKey(i);
+            keyHandle.Select(keyStates[i]);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::ConnectToBusesForRecording(const AZ::EntityId& entityId, bool enableConnection)
+{
+    // we connect to PropertyEditorEntityChangeNotificationBus for all other changes
+    if (enableConnection)
+    {
+        AzToolsFramework::PropertyEditorEntityChangeNotificationBus::MultiHandler::BusConnect(entityId);
+    }
+    else
+    {
+        AzToolsFramework::PropertyEditorEntityChangeNotificationBus::MultiHandler::BusDisconnect(entityId);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewSequence::RecordTrackChangesForNode(CTrackViewAnimNode* componentNode)
+{
+    int retNumKeysSet = 0;
+
+    if (componentNode)
+    {
+        retNumKeysSet = componentNode->SetKeysForChangedTrackValues(GetIEditor()->GetAnimation()->GetTime());
+        if (retNumKeysSet)
+        {
+            OnKeysChanged();    // change notification for updating TrackView UI
+        }
+    }
+
+    return retNumKeysSet;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::SetRecording(bool enableRecording)
+{
+    if (m_pAnimSequence)
+    {
+        // connect (or disconnect) to EBuses for notification of changes for all AZ::Entities in our sequence
+        for (int i = m_pAnimSequence->GetNodeCount(); --i >= 0;)
+        {
+            IAnimNode* animNode = m_pAnimSequence->GetNode(i);
+            if (animNode->GetType() == AnimNodeType::AzEntity)
+            {
+                ConnectToBusesForRecording(animNode->GetAzEntityId(), enableRecording);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewSequence::IsAncestorOf(CTrackViewSequence* pSequence) const
+{
+    return m_pAnimSequence->IsAncestorOf(pSequence->m_pAnimSequence.get());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::BeginCutScene(const bool bResetFx) const
+{
+    IMovieUser* pMovieUser = GetIEditor()->GetMovieSystem()->GetUser();
+
+    if (pMovieUser)
+    {
+        pMovieUser->BeginCutScene(m_pAnimSequence.get(), m_pAnimSequence->GetCutSceneFlags(false), bResetFx);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::EndCutScene() const
+{
+    IMovieUser* pMovieUser = GetIEditor()->GetMovieSystem()->GetUser();
+
+    if (pMovieUser)
+    {
+        pMovieUser->EndCutScene(m_pAnimSequence.get(), m_pAnimSequence->GetCutSceneFlags(true));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::Render(const SAnimContext& animContext)
+{
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
+            pChildAnimNode->Render(animContext);
+        }
+    }
+
+    m_pAnimSequence->Render();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::Animate(const SAnimContext& animContext)
+{
+    if (!m_pAnimSequence->IsActivated())
+    {
+        return;
+    }
+
+    m_time = animContext.time;
+
+    m_pAnimSequence->Animate(animContext);
+
+    CTrackViewSequenceNoNotificationContext context(this);
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
+            pChildAnimNode->Animate(animContext);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::AddListener(ITrackViewSequenceListener* pListener)
+{
+    stl::push_back_unique(m_sequenceListeners, pListener);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::RemoveListener(ITrackViewSequenceListener* pListener)
+{
+    stl::find_and_erase(m_sequenceListeners, pListener);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnNodeSelectionChanged()
+{
+    if (m_bNoNotifications)
+    {
+        return;
+    }
+
+    if (m_bQueueNotifications)
+    {
+        m_bNodeSelectionChanged = true;
+    }
+    else
+    {
+        CTrackViewSequenceNoNotificationContext context(this);
+        for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
+        {
+            (*iter)->OnNodeSelectionChanged(this);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::ForceAnimation()
+{
+    if (m_bNoNotifications)
+    {
+        return;
+    }
+
+    if (m_bQueueNotifications)
+    {
+        m_bForceAnimation = true;
+    }
+    else
+    {
+        if (IsActive())
+        {
+            GetIEditor()->GetAnimation()->ForceAnimation();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnKeySelectionChanged()
+{
+    if (m_bNoNotifications)
+    {
+        return;
+    }
+
+    if (m_bQueueNotifications)
+    {
+        m_bKeySelectionChanged = true;
+    }
+    else
+    {
+        CTrackViewSequenceNoNotificationContext context(this);
+        for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
+        {
+            (*iter)->OnKeySelectionChanged(this);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnKeysChanged()
+{
+    if (m_bNoNotifications)
+    {
+        return;
+    }
+
+    if (m_bQueueNotifications)
+    {
+        m_bKeysChanged = true;
+    }
+    else
+    {
+        CTrackViewSequenceNoNotificationContext context(this);
+        for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
+        {
+            (*iter)->OnKeysChanged(this);
+        }
+
+        if (IsActive())
+        {
+            GetIEditor()->GetAnimation()->ForceAnimation();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle)
+{
+    if (m_bNoNotifications)
+    {
+        return;
+    }
+
+    CTrackViewSequenceNoNotificationContext context(this);
+    for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
+    {
+        (*iter)->OnKeyAdded(addedKeyHandle);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnNodeChanged(CTrackViewNode* node, ITrackViewSequenceListener::ENodeChangeType type)
+{
+    if (node && node->GetNodeType() == eTVNT_AnimNode)
+    {
+        // Deselect the node before deleting to give listeners a chance to update things like UI state.
+        if (type == ITrackViewSequenceListener::eNodeChangeType_Removed)
+        {
+            CTrackViewSequenceNotificationContext context(this);
+
+            // Make sure to deselect any keys
+            CTrackViewKeyBundle keys = node->GetAllKeys();
+            for (int key = 0; key < keys.GetKeyCount(); key++)
+            {
+                CTrackViewKeyHandle keyHandle = keys.GetKey(key);
+                if (keyHandle.IsSelected())
+                {
+                    keyHandle.Select(false);
+                    m_bKeySelectionChanged = true;
+                }
+            }
+
+            // Cancel notification if nothing changed.
+            if (!m_bKeySelectionChanged)
+            {
+                context.Cancel();
+            }
+            
+            // deselect the node
+            if (node->IsSelected())
+            {
+                node->SetSelected(false);
+            }
+        }
+
+        CTrackViewAnimNode* pAnimNode = static_cast<CTrackViewAnimNode*>(node);
+        if (pAnimNode->IsActive())
+        {
+            switch (type)
+            {
+            case ITrackViewSequenceListener::eNodeChangeType_Added:
+                {
+                    ForceAnimation();
+                    // if we're in record mode and this is an AzEntity node, add the node to the buses we listen to for notification of changes
+                    if (pAnimNode->GetType() == AnimNodeType::AzEntity && GetIEditor()->GetAnimation()->IsRecordMode())
+                    {
+                        ConnectToBusesForRecording(pAnimNode->GetAzEntityId(), true);
+                    }
+                }
+                break;
+            case ITrackViewSequenceListener::eNodeChangeType_Removed:
+                {
+                    ForceAnimation();
+                    // if we're in record mode and this is an AzEntity node, remove the node to the buses we listen to for notification of changes
+                    if (pAnimNode->GetType() == AnimNodeType::AzEntity && GetIEditor()->GetAnimation()->IsRecordMode())
+                    {
+                        ConnectToBusesForRecording(pAnimNode->GetAzEntityId(), false);
+                    }
+                }
+                break;
+            }
+        }
+
+        switch (type)
+        {
+        case ITrackViewSequenceListener::eNodeChangeType_Enabled:
+        // Fall through
+        case ITrackViewSequenceListener::eNodeChangeType_Hidden:
+        // Fall through
+        case ITrackViewSequenceListener::eNodeChangeType_SetAsActiveDirector:
+        // Fall through
+        case ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged:
+            ForceAnimation();
+            break;
+        }
+    }
+
+    // Mark Layer with Sequence Object as dirty for non-internal or non-UI changes
+    if (type != ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged && 
+        type != ITrackViewSequenceListener::eNodeChangeType_Selected &&
+        type != ITrackViewSequenceListener::eNodeChangeType_Deselected && 
+        type != ITrackViewSequenceListener::eNodeChangeType_Collapsed &&
+        type != ITrackViewSequenceListener::eNodeChangeType_Expanded)
+    {
+        MarkAsModified();
+    }
+
+    if (m_bNoNotifications)
+    {
+        return;
+    }
+
+    CTrackViewSequenceNoNotificationContext context(this);
+    for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
+    {
+        (*iter)->OnNodeChanged(node, type);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnNodeRenamed(CTrackViewNode* node, const char* pOldName)
+{
+    // Marks Layer with Sequence Object as dirty
+    MarkAsModified();
+
+    if (m_bNoNotifications)
+    {
+        return;
+    }
+
+    CTrackViewSequenceNoNotificationContext context(this);
+    for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
+    {
+        (*iter)->OnNodeRenamed(node, pOldName);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnSequenceSettingsChanged()
+{
+    MarkAsModified();
+
+    if (m_bNoNotifications)
+    {
+        return;
+    }
+
+    CTrackViewSequenceNoNotificationContext context(this);
+    for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
+    {
+        (*iter)->OnSequenceSettingsChanged(this);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::MarkAsModified()
+{
+    if (m_pAnimSequence)
+    {
+        Maestro::EditorSequenceComponentRequestBus::Event(
+            m_pAnimSequence->GetSequenceEntityId(), &Maestro::EditorSequenceComponentRequestBus::Events::MarkEntityAsDirty);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::QueueNotifications()
+{
+    m_bQueueNotifications = true;
+    ++m_selectionRecursionLevel;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::DequeueNotifications()
+{
+    AZ_Assert(m_selectionRecursionLevel > 0, "QueueNotifications should be called before DequeueNotifications()");
+    --m_selectionRecursionLevel;
+    if (m_selectionRecursionLevel == 0)
+    {
+        m_bQueueNotifications = false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::SubmitPendingNotifcations(bool force)
+{
+    if (force)
+    {
+        m_selectionRecursionLevel = 1;
+    }
+
+    assert(m_selectionRecursionLevel > 0);
+    if (m_selectionRecursionLevel > 0)
+    {
+        --m_selectionRecursionLevel;
+    }
+
+    if (m_selectionRecursionLevel == 0)
+    {
+        m_bQueueNotifications = false;
+
+        if (m_bNodeSelectionChanged)
+        {
+            OnNodeSelectionChanged();
+        }
+
+        if (m_bKeysChanged)
+        {
+            OnKeysChanged();
+        }
+
+        if (m_bKeySelectionChanged)
+        {
+            OnKeySelectionChanged();
+        }
+
+        if (m_bForceAnimation)
+        {
+            ForceAnimation();
+        }
+
+        m_bForceAnimation = false;
+        m_bKeysChanged = false;
+        m_bNodeSelectionChanged = false;
+        m_bKeySelectionChanged = false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnSequenceRemoved(CTrackViewSequence* removedSequence)
+{
+    if (removedSequence == this)
+    {
+        // submit any queued notifications before removing
+        if (m_bQueueNotifications)
+        {
+            SubmitPendingNotifcations(true);
+        }
+
+        // remove ourselves as listeners from the undo manager
+        GetIEditor()->GetUndoManager()->RemoveListener(this);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OnSequenceAdded(CTrackViewSequence* addedSequence)
+{
+    if (addedSequence == this)
+    {
+        GetIEditor()->GetUndoManager()->AddListener(this);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::DeleteSelectedNodes()
+{
+    if (IsSelected())
+    {
+        GetIEditor()->GetSequenceManager()->DeleteSequence(this);
+        return;
+    }
+
+    // Don't notify in the above IsSelected() case,
+    // because 'this' will become deleted and invalid.
+    CTrackViewSequenceNotificationContext context(this);
+
+    CTrackViewAnimNodeBundle selectedNodes = GetSelectedAnimNodes();
+    const unsigned int numSelectedNodes = selectedNodes.GetCount();
+
+    // Call RemoveEntityToAnimate on any nodes that are able to be removed right here. If we wait to do it inside
+    // of RemoveSubNode() it will fail because the EditorSequenceComponentRequestBus will be disconnected
+    // by the Deactivate / Activate of the sequence entity.
+    if (nullptr != m_pAnimSequence)
+    {
+        AZ::EntityId sequenceEntityId = m_pAnimSequence->GetSequenceEntityId();
+        if (sequenceEntityId.IsValid())
+        {
+            for (unsigned int i = 0; i < numSelectedNodes; ++i)
+            {
+                AZ::EntityId removedNodeId = selectedNodes.GetNode(i)->GetAzEntityId();
+                if (removedNodeId.IsValid())
+                {
+                    Maestro::EditorSequenceComponentRequestBus::Event(
+                        m_pAnimSequence->GetSequenceEntityId(), &Maestro::EditorSequenceComponentRequestBus::Events::RemoveEntityToAnimate,
+                        removedNodeId);
+                }
+            }
+        }
+    }
+
+    // Deactivate the sequence entity while we are potentially removing things from it. 
+    // We need to allow the full removal operation (node and children) to complete before 
+    // OnActivate happens on the Sequence again. If we don't deactivate the sequence entity
+    // OnActivate will get called by the entity system as components are removed.
+    // In some cases this will erroneously cause some components to be added 
+    // back to the sequence that were just deleted.
+    bool sequenceEntityWasActive = false;
+    AZ::Entity* sequenceEntity = nullptr;
+    if (GetSequenceComponentEntityId().IsValid())
+    {
+        AZ::ComponentApplicationBus::BroadcastResult(sequenceEntity, &AZ::ComponentApplicationBus::Events::FindEntity, GetSequenceComponentEntityId());
+        if (sequenceEntity != nullptr)
+        {
+            if (sequenceEntity->GetState() == AZ::Entity::State::Active)
+            {
+                sequenceEntityWasActive = true;
+                sequenceEntity->Deactivate();
+            }
+        }
+    }
+
+    CTrackViewTrackBundle selectedTracks = GetSelectedTracks();
+    const unsigned int numSelectedTracks = selectedTracks.GetCount();
+
+    for (int i = numSelectedTracks - 1; i >= 0; i--)
+    {
+        CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
+
+        // Ignore sub tracks
+        if (!pTrack->IsSubTrack())
+        {
+            pTrack->GetAnimNode()->RemoveTrack(pTrack);
+        }
+    }
+
+    // GetSelectedAnimNodes() will add parent nodes first and then children to the selected
+    // node bundle list. So iterating backwards here causes child nodes to be deleted first,
+    // and then parents. If parent nodes get deleted first, node->GetParentNode() will return
+    // a bad pointer if it happens to be one of the nodes that was deleted.
+    for (int i = numSelectedNodes - 1; i >= 0; i--)
+    {
+        CTrackViewAnimNode* node = selectedNodes.GetNode(i);
+        CTrackViewAnimNode* pParentNode = static_cast<CTrackViewAnimNode*>(node->GetParentNode());
+        pParentNode->RemoveSubNode(node);
+    }
+
+    if (sequenceEntityWasActive && sequenceEntity != nullptr)
+    {
+        sequenceEntity->Activate();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::SelectSelectedNodesInViewport()
+{
+    assert(CUndo::IsRecording());
+
+    CTrackViewAnimNodeBundle selectedNodes = GetSelectedAnimNodes();
+    const unsigned int numSelectedNodes = selectedNodes.GetCount();
+
+    AZStd::vector<AZ::EntityId> entitiesToBeSelected;
+    for (unsigned int i = 0; i < numSelectedNodes; ++i)
+    {
+        CTrackViewAnimNode* node = selectedNodes.GetNode(i);
+        ETrackViewNodeType nodeType = node->GetNodeType();
+
+        if (nodeType == eTVNT_Sequence)
+        {
+            CTrackViewSequence* seqNode = static_cast<CTrackViewSequence*>(node);
+            entitiesToBeSelected.push_back(seqNode->GetSequenceComponentEntityId());
+        }
+        else
+        {
+            // TrackView AnimNode
+            entitiesToBeSelected.push_back(node->GetAzEntityId());
+        }
+    }
+
+    // remove duplicate entities
+    AZStd::sort(entitiesToBeSelected.begin(), entitiesToBeSelected.end());
+    entitiesToBeSelected.erase(
+        AZStd::unique(entitiesToBeSelected.begin(), entitiesToBeSelected.end()), entitiesToBeSelected.end());
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, entitiesToBeSelected);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::SyncSelectedTracksToBase()
+{
+    CTrackViewAnimNodeBundle selectedNodes = GetSelectedAnimNodes();
+    bool bNothingWasSynced = true;
+
+    const unsigned int numSelectedNodes = selectedNodes.GetCount();
+    if (numSelectedNodes > 0)
+    {
+        CUndo undo("Sync selected entity nodes to base");
+
+        for (unsigned int i = 0; i < numSelectedNodes; ++i)
+        {
+            CTrackViewAnimNode* pAnimNode = selectedNodes.GetNode(i);
+            if (pAnimNode)
+            {
+                pAnimNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(pAnimNode->GetAzEntityId());
+
+                if (pAnimNode)
+                {
+                    const Vec3 position = pAnimNode->GetPos();
+                    const Quat rotation = pAnimNode->GetRotation();
+                    const Vec3 scale = pAnimNode->GetScale();
+
+                    AZ::Transform transform = AZ::Transform::CreateIdentity();
+                    transform.SetUniformScale(LYVec3ToAZVec3(scale).GetMaxElement());
+                    transform.SetRotation(LYQuaternionToAZQuaternion(rotation));
+                    transform.SetTranslation(LYVec3ToAZVec3(position));
+
+                    AZ::TransformBus::Event(
+                        pAnimNode->GetAzEntityId(), &AZ::TransformBus::Events::SetWorldTM, transform);
+
+                    bNothingWasSynced = false;
+                }
+            }
+        }
+
+        if (bNothingWasSynced)
+        {
+            undo.Cancel();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::SyncSelectedTracksFromBase()
+{
+    CTrackViewAnimNodeBundle selectedNodes = GetSelectedAnimNodes();
+    bool bNothingWasSynced = true;
+
+    const unsigned int numSelectedNodes = selectedNodes.GetCount();
+    if (numSelectedNodes > 0)
+    {
+        CUndo undo("Sync selected entity nodes from base");
+
+        for (unsigned int i = 0; i < numSelectedNodes; ++i)
+        {
+            CTrackViewAnimNode* pAnimNode = selectedNodes.GetNode(i);
+            pAnimNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(pAnimNode->GetAzEntityId());
+
+            if (pAnimNode)
+            {
+                AZ::Transform transform = AZ::Transform::CreateIdentity();
+                AZ::TransformBus::EventResult(transform, pAnimNode->GetAzEntityId(), &AZ::TransformBus::Events::GetWorldTM);
+
+                pAnimNode->SetPos(AZVec3ToLYVec3(transform.GetTranslation()));
+                pAnimNode->SetRotation(AZQuaternionToLYQuaternion(transform.GetRotation()));
+                pAnimNode->SetScale(AZVec3ToLYVec3(AZ::Vector3(transform.GetUniformScale())));
+
+                bNothingWasSynced = false;
+            }
+        }
+
+        if (bNothingWasSynced)
+        {
+            undo.Cancel();
+        }
+    }
+
+    if (IsActive())
+    {
+        GetIEditor()->GetAnimation()->ForceAnimation();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewSequence::SetName(const char* name)
+{
+    // Check if there is already a sequence with that name
+    const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+    if (pSequenceManager->GetSequenceByName(name))
+    {
+        return false;
+    }
+
+    const char* oldName = GetName();
+    if (0 != strcmp(name, oldName))
+    {
+        m_pAnimSequence->SetName(name);
+        MarkAsModified();
+
+        AzToolsFramework::ScopedUndoBatch undoBatch("Rename Sequence");
+        GetSequence()->OnNodeRenamed(this, oldName);
+        undoBatch.MarkEntityDirty(m_pAnimSequence->GetSequenceEntityId());
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::DeleteSelectedKeys()
+{
+    CTrackViewSequenceNotificationContext context(this);
+    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
+    for (int k = (int)selectedKeys.GetKeyCount() - 1; k >= 0; --k)
+    {
+        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
+        skey.Delete();
+    }
+
+    // The selected keys are deleted, so notify the selection was just changed.
+    OnKeySelectionChanged();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::CopyKeysToClipboard(const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks)
+{
+    XmlNodeRef copyNode = XmlHelpers::CreateXmlNode("CopyKeysNode");
+    CopyKeysToClipboard(copyNode, bOnlySelectedKeys, bOnlyFromSelectedTracks);
+
+    CClipboard clip(nullptr);
+    clip.Put(copyNode, "Track view keys");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks)
+{
+    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+    {
+        CTrackViewNode* pChildNode = (*iter).get();
+        pChildNode->CopyKeysToClipboard(xmlNode, bOnlySelectedKeys, bOnlyFromSelectedTracks);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::PasteKeysFromClipboard(CTrackViewAnimNode* pTargetNode, CTrackViewTrack* pTargetTrack, const float timeOffset)
+{
+    assert(CUndo::IsRecording());
+
+    CClipboard clipboard(nullptr);
+    XmlNodeRef clipboardContent = clipboard.Get();
+    if (clipboardContent)
+    {
+        std::vector<TMatchedTrackLocation> matchedLocations = GetMatchedPasteLocations(clipboardContent, pTargetNode, pTargetTrack);
+
+        for (auto iter = matchedLocations.begin(); iter != matchedLocations.end(); ++iter)
+        {
+            const TMatchedTrackLocation& location = *iter;
+            CTrackViewTrack* pTrack = location.first;
+            const XmlNodeRef& trackNode = location.second;
+            pTrack->PasteKeys(trackNode, timeOffset);
+        }
+
+        OnKeysChanged();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+std::vector<CTrackViewSequence::TMatchedTrackLocation>
+CTrackViewSequence::GetMatchedPasteLocations(XmlNodeRef clipboardContent, CTrackViewAnimNode* pTargetNode, CTrackViewTrack* pTargetTrack)
+{
+    std::vector<TMatchedTrackLocation> matchedLocations;
+
+    bool bPastingSingleNode = false;
+    XmlNodeRef singleNode;
+    bool bPastingSingleTrack = false;
+    XmlNodeRef singleTrack;
+
+    // Check if the XML tree only contains one node and if so if that node only contains one track
+    for (XmlNodeRef currentNode = clipboardContent; currentNode->getChildCount() > 0; currentNode = currentNode->getChild(0))
+    {
+        bool bAllChildsAreTracks = true;
+        const unsigned int numChilds = currentNode->getChildCount();
+        for (unsigned int i = 0; i < numChilds; ++i)
+        {
+            XmlNodeRef childNode = currentNode->getChild(i);
+            if (strcmp(currentNode->getChild(0)->getTag(), "Track") != 0)
+            {
+                bAllChildsAreTracks = false;
+                break;
+            }
+        }
+
+        if (bAllChildsAreTracks)
+        {
+            bPastingSingleNode = true;
+            singleNode = currentNode;
+
+            if (currentNode->getChildCount() == 1)
+            {
+                bPastingSingleTrack = true;
+                singleTrack = currentNode->getChild(0);
+            }
+        }
+        else if (currentNode->getChildCount() != 1)
+        {
+            break;
+        }
+    }
+
+    if (bPastingSingleTrack && pTargetNode && pTargetTrack)
+    {
+        // We have a target node & track, so try to match the value type
+        int valueType = 0;
+        if (singleTrack->getAttr("valueType", valueType))
+        {
+            if (pTargetTrack->GetValueType() == static_cast<AnimValueType>(valueType))
+            {
+                matchedLocations.push_back(TMatchedTrackLocation(pTargetTrack, singleTrack));
+                return matchedLocations;
+            }
+        }
+    }
+
+    if (bPastingSingleNode && pTargetNode)
+    {
+        // Set of tracks that were already matched
+        std::vector<CTrackViewTrack*> matchedTracks;
+
+        // We have a single node to paste and have been given a target node
+        // so try to match the tracks by param type
+        const unsigned int numTracks = singleNode->getChildCount();
+        for (unsigned int i = 0; i < numTracks; ++i)
+        {
+            XmlNodeRef trackNode = singleNode->getChild(i);
+
+            // Try to match the track
+            auto matchingTracks = GetMatchingTracks(pTargetNode, trackNode);
+            for (auto iter = matchingTracks.begin(); iter != matchingTracks.end(); ++iter)
+            {
+                CTrackViewTrack* pMatchedTrack = *iter;
+                // Pick the first track that was matched *and* was not already matched
+                if (!stl::find(matchedTracks, pMatchedTrack))
+                {
+                    stl::push_back_unique(matchedTracks, pMatchedTrack);
+                    matchedLocations.push_back(TMatchedTrackLocation(pMatchedTrack, trackNode));
+                    break;
+                }
+            }
+        }
+
+        // Return if matching succeeded
+        if (matchedLocations.size() > 0)
+        {
+            return matchedLocations;
+        }
+    }
+
+    if (!bPastingSingleNode)
+    {
+        // Ok, we're pasting keys from multiple nodes, haven't been given any target
+        // or matching the targets failed. Ignore given target pointers and start
+        // a recursive match at the sequence root.
+        GetMatchedPasteLocationsRec(matchedLocations, this, clipboardContent);
+    }
+
+    return matchedLocations;
+}
+
+//////////////////////////////////////////////////////////////////////////
+std::deque<CTrackViewTrack*> CTrackViewSequence::GetMatchingTracks(CTrackViewAnimNode* pAnimNode, XmlNodeRef trackNode)
+{
+    std::deque<CTrackViewTrack*> matchingTracks;
+
+    const string trackName = trackNode->getAttr("name");
+
+    CAnimParamType animParamType;
+    animParamType.LoadFromXml(trackNode);
+
+    int valueType;
+    if (!trackNode->getAttr("valueType", valueType))
+    {
+        return matchingTracks;
+    }
+
+    CTrackViewTrackBundle tracks = pAnimNode->GetTracksByParam(animParamType);
+    const unsigned int trackCount = tracks.GetCount();
+
+    if (trackCount > 0)
+    {
+        // Search for a track with the given name and value type
+        for (unsigned int i = 0; i < trackCount; ++i)
+        {
+            CTrackViewTrack* pTrack = tracks.GetTrack(i);
+
+            if (pTrack->GetValueType() == static_cast<AnimValueType>(valueType))
+            {
+                if (pTrack->GetName() == trackName)
+                {
+                    matchingTracks.push_back(pTrack);
+                }
+            }
+        }
+
+        // Then with lower precedence add the tracks that only match the value
+        for (unsigned int i = 0; i < trackCount; ++i)
+        {
+            CTrackViewTrack* pTrack = tracks.GetTrack(i);
+
+            if (pTrack->GetValueType() == static_cast<AnimValueType>(valueType))
+            {
+                stl::push_back_unique(matchingTracks, pTrack);
+            }
+        }
+    }
+
+    return matchingTracks;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::GetMatchedPasteLocationsRec(std::vector<TMatchedTrackLocation>& locations, CTrackViewNode* pCurrentNode, XmlNodeRef clipboardNode)
+{
+    if (pCurrentNode->GetNodeType() == eTVNT_Sequence)
+    {
+        if (strcmp(clipboardNode->getTag(), "CopyKeysNode") != 0)
+        {
+            return;
+        }
+    }
+
+    const unsigned int numChildNodes = clipboardNode->getChildCount();
+    for (unsigned int nodeIndex = 0; nodeIndex < numChildNodes; ++nodeIndex)
+    {
+        XmlNodeRef xmlChildNode = clipboardNode->getChild(nodeIndex);
+        const string tagName = xmlChildNode->getTag();
+
+        if (tagName == "Node")
+        {
+            const string nodeName = xmlChildNode->getAttr("name");
+
+            int nodeType = static_cast<int>(AnimNodeType::Invalid);
+            xmlChildNode->getAttr("type", nodeType);
+
+            const unsigned int childCount = pCurrentNode->GetChildCount();
+            for (unsigned int i = 0; i < childCount; ++i)
+            {
+                CTrackViewNode* pChildNode = pCurrentNode->GetChild(i);
+
+                if (pChildNode->GetNodeType() == eTVNT_AnimNode)
+                {
+                    CTrackViewAnimNode* pAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
+                    if (pAnimNode->GetName() == nodeName && pAnimNode->GetType() == static_cast<AnimNodeType>(nodeType))
+                    {
+                        GetMatchedPasteLocationsRec(locations, pChildNode, xmlChildNode);
+                    }
+                }
+            }
+        }
+        else if (tagName == "Track")
+        {
+            const string trackName = xmlChildNode->getAttr("name");
+
+            CAnimParamType trackParamType;
+            trackParamType.Serialize(xmlChildNode, true);
+
+            int trackParamValue = static_cast<int>(AnimValueType::Unknown);
+            xmlChildNode->getAttr("valueType", trackParamValue);
+
+            const unsigned int childCount = pCurrentNode->GetChildCount();
+            for (unsigned int i = 0; i < childCount; ++i)
+            {
+                CTrackViewNode* node = pCurrentNode->GetChild(i);
+
+                if (node->GetNodeType() == eTVNT_Track)
+                {
+                    CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(node);
+                    if (pTrack->GetName() == trackName && pTrack->GetParameterType() == trackParamType)
+                    {
+                        locations.push_back(TMatchedTrackLocation(pTrack, xmlChildNode));
+                    }
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::AdjustKeysToTimeRange(Range newTimeRange)
+{
+    // Set new time range
+    Range oldTimeRange = GetTimeRange();
+    float offset = newTimeRange.start - oldTimeRange.start;
+    // Calculate scale ratio.
+    float scale = newTimeRange.Length() / oldTimeRange.Length();
+    SetTimeRange(newTimeRange);
+
+    CTrackViewKeyBundle keyBundle = GetAllKeys();
+    const unsigned int numKeys = keyBundle.GetKeyCount();
+
+    // Do not notify listeners until all the times are set, otherwise the
+    // keys will be sorted and the indices inside the CTrackViewKeyHandle
+    // will become invalid.
+    bool notifyListeners = false;
+
+    for (unsigned int i = 0; i < numKeys; ++i)
+    {
+        CTrackViewKeyHandle keyHandle = keyBundle.GetKey(i);
+        float scaled = (keyHandle.GetTime() - oldTimeRange.start) * scale;
+        keyHandle.SetTime(offset + scaled + oldTimeRange.start, notifyListeners);
+    }
+
+    // notifyListeners was disabled in the above SetTime() calls so
+    // notify all the keys changes now.
+    OnKeysChanged();
+
+    MarkAsModified();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::SetTimeRange(Range timeRange)
+{
+    m_pAnimSequence->SetTimeRange(timeRange);
+    OnSequenceSettingsChanged();
+}
+
+//////////////////////////////////////////////////////////////////////////
+Range CTrackViewSequence::GetTimeRange() const
+{
+    return m_pAnimSequence->GetTimeRange();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::SetFlags(IAnimSequence::EAnimSequenceFlags flags)
+{
+    m_pAnimSequence->SetFlags(flags);
+    OnSequenceSettingsChanged();
+}
+
+//////////////////////////////////////////////////////////////////////////
+IAnimSequence::EAnimSequenceFlags CTrackViewSequence::GetFlags() const
+{
+    return (IAnimSequence::EAnimSequenceFlags)m_pAnimSequence->GetFlags();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::DeselectAllKeys()
+{
+    CTrackViewSequenceNotificationContext context(this);
+
+    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
+    for (int i = 0; i < selectedKeys.GetKeyCount(); ++i)
+    {
+        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(i);
+        keyHandle.Select(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::OffsetSelectedKeys(const float timeOffset)
+{
+    assert(CUndo::IsRecording());
+    CTrackViewSequenceNotificationContext context(this);
+
+    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
+
+    // Set notifyListeners to false and wait until all keys 
+    // have been updated, otherwise the indexes in CTrackViewKeyHandle
+    // may become invalid after sorted with a new time.
+    bool notifyListeners = false;
+
+    for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
+    {
+        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
+        skey.Offset(timeOffset, notifyListeners);
+    }
+
+    if (selectedKeys.GetKeyCount() > 0)
+    {
+        OnKeysChanged();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewSequence::ClipTimeOffsetForOffsetting(const float timeOffset)
+{
+    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
+
+    float newTimeOffset = timeOffset;
+    for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
+    {
+        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
+        const float keyTime = skey.GetTime();
+        float newKeyTime = keyTime + timeOffset;
+
+        Range extendedTimeRange(0.0f, GetTimeRange().end);
+        extendedTimeRange.ClipValue(newKeyTime);
+
+        float offset = newKeyTime - keyTime;
+        if (fabs(offset) < fabs(newTimeOffset))
+        {
+            newTimeOffset = offset;
+        }
+    }
+
+    return newTimeOffset;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewSequence::ClipTimeOffsetForScaling(float timeOffset)
+{
+    if (timeOffset <= 0)
+    {
+        return timeOffset;
+    }
+
+    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
+
+    float newTimeOffset = timeOffset;
+    for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
+    {
+        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
+        float keyTime = skey.GetTime();
+        float newKeyTime = keyTime * timeOffset;
+        GetTimeRange().ClipValue(newKeyTime);
+        float offset = newKeyTime / keyTime;
+        if (offset < newTimeOffset)
+        {
+            newTimeOffset = offset;
+        }
+    }
+
+    return newTimeOffset;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::ScaleSelectedKeys(const float timeOffset)
+{
+    assert(CUndo::IsRecording());
+    CTrackViewSequenceNotificationContext context(this);
+
+    if (timeOffset <= 0)
+    {
+        return;
+    }
+
+    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
+
+    const CTrackViewTrack* pTrack = nullptr;
+    for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
+    {
+        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
+        if (pTrack != skey.GetTrack())
+        {
+            pTrack = skey.GetTrack();
+        }
+
+        float keyt = skey.GetTime() * timeOffset;
+        skey.SetTime(keyt);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewSequence::ClipTimeOffsetForSliding(const float timeOffset)
+{
+    CTrackViewKeyBundle keys = GetSelectedKeys();
+
+    std::set<CTrackViewTrack*> tracks;
+    std::set<CTrackViewTrack*>::const_iterator pTrackIter;
+
+    Range timeRange = GetTimeRange();
+
+    // Get the first key in the timeline among selected and
+    // also gather tracks.
+    float time0 = timeRange.end;
+    for (int k = 0; k < (int)keys.GetKeyCount(); ++k)
+    {
+        CTrackViewKeyHandle skey = keys.GetKey(k);
+        tracks.insert(skey.GetTrack());
+        float keyTime = skey.GetTime();
+        if (keyTime < time0)
+        {
+            time0 = keyTime;
+        }
+    }
+
+    // If 'bAll' is true, slide all tracks.
+    // (Otherwise, slide only selected tracks.)
+    bool bAll = Qt::AltModifier & QApplication::queryKeyboardModifiers();
+    if (bAll)
+    {
+        keys = GetKeysInTimeRange(time0, timeRange.end);
+        // Gather tracks again.
+        tracks.clear();
+        for (int k = 0; k < (int)keys.GetKeyCount(); ++k)
+        {
+            CTrackViewKeyHandle skey = keys.GetKey(k);
+            tracks.insert(skey.GetTrack());
+        }
+    }
+
+    float newTimeOffset = timeOffset;
+    for (pTrackIter = tracks.begin(); pTrackIter != tracks.end(); ++pTrackIter)
+    {
+        CTrackViewTrack* pTrack = *pTrackIter;
+        for (int i = 0; i < pTrack->GetKeyCount(); ++i)
+        {
+            const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+            const float keyTime = keyHandle.GetTime();
+            if (keyTime >= time0)
+            {
+                float newKeyTime = keyTime + timeOffset;
+                timeRange.ClipValue(newKeyTime);
+                float offset = newKeyTime - keyTime;
+                if (fabs(offset) < fabs(newTimeOffset))
+                {
+                    newTimeOffset = offset;
+                }
+            }
+        }
+    }
+
+    return newTimeOffset;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::SlideKeys(float timeOffset)
+{
+    assert(CUndo::IsRecording());
+    CTrackViewSequenceNotificationContext context(this);
+
+    CTrackViewKeyBundle keys = GetSelectedKeys();
+
+    std::set<CTrackViewTrack*> tracks;
+    std::set<CTrackViewTrack*>::const_iterator pTrackIter;
+    Range timeRange = GetTimeRange();
+
+    // Get the first key in the timeline among selected and
+    // also gather tracks.
+    float time0 = timeRange.end;
+    for (int k = 0; k < (int)keys.GetKeyCount(); ++k)
+    {
+        CTrackViewKeyHandle skey = keys.GetKey(k);
+        tracks.insert(skey.GetTrack());
+        float keyTime = skey.GetTime();
+        if (keyTime < time0)
+        {
+            time0 = keyTime;
+        }
+    }
+
+    // If 'bAll' is true, slide all tracks.
+    // (Otherwise, slide only selected tracks.)
+    bool bAll = Qt::AltModifier & QApplication::queryKeyboardModifiers();
+    if (bAll)
+    {
+        keys = GetKeysInTimeRange(time0, timeRange.end);
+        // Gather tracks again.
+        tracks.clear();
+        for (int k = 0; k < (int)keys.GetKeyCount(); ++k)
+        {
+            CTrackViewKeyHandle skey = keys.GetKey(k);
+            tracks.insert(skey.GetTrack());
+        }
+    }
+
+    for (pTrackIter = tracks.begin(); pTrackIter != tracks.end(); ++pTrackIter)
+    {
+        CTrackViewTrack* pTrack = *pTrackIter;
+        pTrack->SlideKeys(time0, timeOffset);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::CloneSelectedKeys()
+{
+    assert(CUndo::IsRecording());
+    CTrackViewSequenceNotificationContext context(this);
+
+    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
+
+    const CTrackViewTrack* pTrack = nullptr;
+    // In case of multiple cloning, indices cannot be used as a solid pointer to the original.
+    // So use the time of keys as an identifier, instead.
+    std::vector<float> selectedKeyTimes;
+    for (size_t k = 0; k < selectedKeys.GetKeyCount(); ++k)
+    {
+        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
+        if (pTrack != skey.GetTrack())
+        {
+            pTrack = skey.GetTrack();
+        }
+
+        selectedKeyTimes.push_back(skey.GetTime());
+    }
+
+    // Now, do the actual cloning.
+    for (size_t k = 0; k < selectedKeyTimes.size(); ++k)
+    {
+        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
+        skey = skey.GetTrack()->GetKeyByTime(selectedKeyTimes[k]);
+
+        assert(skey.IsValid());
+        if (!skey.IsValid())
+        {
+            continue;
+        }
+
+        CTrackViewKeyHandle newKey = skey.Clone();
+
+        // Select new key.
+        newKey.Select(true);
+        // Deselect cloned key.
+        skey.Select(false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::BeginUndoTransaction()
+{
+    QueueNotifications();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::EndUndoTransaction()
+{
+    // if the sequence was added during a redo, it will add itself as an UndoManagerListener in the process and we'll
+    // get an EndUndoTransaction without a corresponding BeginUndoTransaction() call - only SubmitPendingNotifications()
+    // if we're queued
+    if (m_bQueueNotifications)
+    {
+        SubmitPendingNotifcations();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::BeginRestoreTransaction()
+{
+    QueueNotifications();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequence::EndRestoreTransaction()
+{
+    // if the sequence was added during a restore, it will add itself as an UndoManagerListener in the process and we'll
+    // get an EndUndoTransaction without a corresponding BeginUndoTransaction() call - only SubmitPendingNotifications()
+    // if we're queued
+    if (m_bQueueNotifications)
+    {
+        SubmitPendingNotifcations();
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewSequence::IsActiveSequence() const
+{
+    return GetIEditor()->GetAnimation()->GetSequence() == this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const float CTrackViewSequence::GetTime() const
+{
+    return m_time;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewSequence* CTrackViewSequence::LookUpSequenceByEntityId(const AZ::EntityId& sequenceId)
+{
+    CTrackViewSequence* sequence = nullptr;
+
+    IEditor* editor = nullptr;
+    EBUS_EVENT_RESULT(editor, AzToolsFramework::EditorRequests::Bus, GetEditor);
+    if (editor)
+    {
+        ITrackViewSequenceManager* sequenceManager = editor->GetSequenceManager();
+        if (sequenceManager)
+        {
+            sequence = sequenceManager->GetSequenceByEntityId(sequenceId);
+        }
+    }
+
+    return sequence;
+}
diff --git a/Code/Editor/TrackView/TrackViewSequence.h b/Code/Editor/TrackView/TrackViewSequence.h
new file mode 100644
index 0000000000..f28b22c2c1
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewSequence.h
@@ -0,0 +1,408 @@
+/*
+ * 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_TRACKVIEW_TRACKVIEWSEQUENCE_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCE_H
+#pragma once
+
+#include "IMovieSystem.h"
+
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+
+#include "TrackViewAnimNode.h"
+#include "Undo/Undo.h"
+
+struct ITrackViewSequenceListener
+{
+    // Called when sequence settings (time range, flags) have changed
+    virtual void OnSequenceSettingsChanged([[maybe_unused]] CTrackViewSequence* pSequence) {}
+
+    enum ENodeChangeType
+    {
+        eNodeChangeType_Added,
+        eNodeChangeType_Removed,
+        eNodeChangeType_Expanded,
+        eNodeChangeType_Collapsed,
+        eNodeChangeType_Hidden,
+        eNodeChangeType_Unhidden,
+        eNodeChangeType_Enabled,
+        eNodeChangeType_Disabled,
+        eNodeChangeType_Muted,
+        eNodeChangeType_Unmuted,
+        eNodeChangeType_Selected,
+        eNodeChangeType_Deselected,
+        eNodeChangeType_SetAsActiveDirector,
+        eNodeChangeType_NodeOwnerChanged
+    };
+
+    // Called when a node is changed
+    virtual void OnNodeChanged([[maybe_unused]] CTrackViewNode* pNode, [[maybe_unused]] ENodeChangeType type) {}
+
+    // Called when a node is added
+    virtual void OnNodeRenamed([[maybe_unused]] CTrackViewNode* pNode, [[maybe_unused]] const char* pOldName) {}
+
+    // Called when selection of nodes changed
+    virtual void OnNodeSelectionChanged([[maybe_unused]] CTrackViewSequence* pSequence) {}
+
+    // Called when selection of keys changed.
+    virtual void OnKeySelectionChanged([[maybe_unused]] CTrackViewSequence* pSequence) {}
+
+    // Called when keys in a track changed
+    virtual void OnKeysChanged([[maybe_unused]] CTrackViewSequence* pSequence) {}
+
+    // Called when a new key is added to a track
+    virtual void OnKeyAdded([[maybe_unused]] CTrackViewKeyHandle& addedKeyHandle) {}
+};
+
+struct ITrackViewSequenceManagerListener
+{
+    virtual void OnSequenceAdded([[maybe_unused]] CTrackViewSequence* pSequence) {}
+    virtual void OnSequenceRemoved([[maybe_unused]] CTrackViewSequence* pSequence) {}
+};
+
+////////////////////////////////////////////////////////////////////////////
+//
+// This class represents a IAnimSequence in TrackView and contains
+// the editor side code for changing it
+//
+////////////////////////////////////////////////////////////////////////////
+class CTrackViewSequence
+    : public CTrackViewAnimNode
+    , public IUndoManagerListener
+    , public ITrackViewSequence
+    , public ITrackViewSequenceManagerListener
+    , public AzToolsFramework::PropertyEditorEntityChangeNotificationBus::MultiHandler
+{
+    friend class CTrackViewSequenceManager;
+    friend class CTrackViewNode;
+    friend class CTrackViewAnimNode;
+    friend class CTrackViewTrack;
+    friend class CTrackViewSequenceNotificationContext;
+    friend class CTrackViewSequenceNoNotificationContext;
+
+    // Undo friends
+    friend class CUndoAnimNodeReparent;
+    friend class CUndoTrackObject;
+    friend class CUndoComponentEntityTrackObject;
+
+public:
+    CTrackViewSequence(IAnimSequence* pSequence);
+    CTrackViewSequence(AZStd::intrusive_ptr<IAnimSequence>& sequence);
+    ~CTrackViewSequence();
+
+    // Called after de-serialization of IAnimSequence
+    void Load() override;
+
+    // ITrackViewNode
+    virtual ETrackViewNodeType GetNodeType() const override { return eTVNT_Sequence; }
+
+    virtual const char* GetName() const override { return m_pAnimSequence->GetName(); }
+    virtual bool SetName(const char* pName) override;
+    virtual bool CanBeRenamed() const override { return true; }
+
+    // Binding/Unbinding
+    virtual void BindToEditorObjects() override;
+    virtual void UnBindFromEditorObjects() override;
+    virtual bool IsBoundToEditorObjects() const override;
+
+    // Time range
+    void SetTimeRange(Range timeRange);
+    Range GetTimeRange() const;
+
+    // Current time in sequence. Note that this can be different from the time
+    // of the animation context, if this sequence is used as a sub sequence
+    const float GetTime() const;
+
+    // CryMovie Flags
+    void SetFlags(IAnimSequence::EAnimSequenceFlags flags);
+    IAnimSequence::EAnimSequenceFlags GetFlags() const;
+
+    // Get sequence object in scene
+    AZ::EntityId     GetSequenceComponentEntityId() const { return m_pAnimSequence.get() ? m_pAnimSequence->GetSequenceEntityId() : AZ::EntityId(); }
+
+    // Check if this node belongs to a sequence
+    bool IsAncestorOf(CTrackViewSequence* pSequence) const;
+
+    // Get single selected key if only one key is selected
+    CTrackViewKeyHandle FindSingleSelectedKey();
+
+    // Get CryMovie sequence ID
+    uint32 GetCryMovieId() const { return m_pAnimSequence->GetId(); }
+
+    // Rendering
+    virtual void Render(const SAnimContext& animContext) override;
+
+    // Playback control
+    virtual void Animate(const SAnimContext& animContext) override;
+    void Resume() { m_pAnimSequence->Resume(); }
+    void Pause() { m_pAnimSequence->Pause(); }
+    void StillUpdate() { m_pAnimSequence->StillUpdate(); }
+
+    void OnLoop() { m_pAnimSequence->OnLoop(); }
+
+    // Active & deactivate
+    void Activate() { m_pAnimSequence->Activate(); }
+    void Deactivate() { m_pAnimSequence->Deactivate(); }
+    void PrecacheData(const float time) { m_pAnimSequence->PrecacheData(time); }
+
+    // Begin & end cut scene
+    void BeginCutScene(const bool bResetFx) const;
+    void EndCutScene() const;
+
+    // Reset
+    void Reset(const bool bSeekToStart) { m_pAnimSequence->Reset(bSeekToStart); }
+    void ResetHard() { m_pAnimSequence->ResetHard(); }
+
+    void TimeChanged(float newTime) { m_pAnimSequence->TimeChanged(newTime); }
+
+    // Check if it's a group node
+    virtual bool IsGroupNode() const override { return true; }
+
+    // Track Events (TODO: Undo?)
+    int GetTrackEventsCount() const      { return m_pAnimSequence->GetTrackEventsCount(); }
+    const char* GetTrackEvent(int index) { return m_pAnimSequence->GetTrackEvent(index); }
+    bool AddTrackEvent(const char* szEvent)                            { MarkAsModified(); return m_pAnimSequence->AddTrackEvent(szEvent); }
+    bool RemoveTrackEvent(const char* szEvent)                         { MarkAsModified(); return m_pAnimSequence->RemoveTrackEvent(szEvent); }
+    bool RenameTrackEvent(const char* szEvent, const char* szNewEvent) { MarkAsModified(); return m_pAnimSequence->RenameTrackEvent(szEvent, szNewEvent); }
+    bool MoveUpTrackEvent(const char* szEvent)                         { MarkAsModified(); return m_pAnimSequence->MoveUpTrackEvent(szEvent); }
+    bool MoveDownTrackEvent(const char* szEvent)                       { MarkAsModified(); return m_pAnimSequence->MoveDownTrackEvent(szEvent); }
+    void ClearTrackEvents()                                            { MarkAsModified(); m_pAnimSequence->ClearTrackEvents(); }
+
+    // Deletes all selected nodes (re-parents childs if group node gets deleted)
+    void DeleteSelectedNodes();
+
+    // Select selected nodes in viewport
+    void SelectSelectedNodesInViewport();
+
+    // Deletes all selected keys
+    void DeleteSelectedKeys();
+
+    // Sync from/to base
+    void SyncSelectedTracksToBase();
+    void SyncSelectedTracksFromBase();
+
+    // Listeners
+    void AddListener(ITrackViewSequenceListener* pListener);
+    void RemoveListener(ITrackViewSequenceListener* pListener);
+
+    // Checks if this is the active sequence in TV
+    bool IsActiveSequence() const;
+
+    // The root sequence node is always an active director
+    virtual bool IsActiveDirector() const override { return true; }
+
+    // Copy keys to clipboard (in XML form)
+    void CopyKeysToClipboard(const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks);
+
+    // Paste keys from clipboard. Tries to match the given data to the target track first,
+    // then the target anim node and finally the whole sequence. If it doesn't find any
+    // matching location, nothing will be pasted. Before pasting the given time offset is
+    // applied to the keys.
+    void PasteKeysFromClipboard(CTrackViewAnimNode* pTargetNode, CTrackViewTrack* pTargetTrack, const float timeOffset = 0.0f);
+
+    // Returns a vector of pairs that match the XML track nodes in the clipboard to the tracks in the sequence for pasting.
+    // It is used by PasteKeysFromClipboard directly and to preview the locations of the to be pasted keys.
+    typedef std::pair<CTrackViewTrack*, XmlNodeRef> TMatchedTrackLocation;
+    std::vector<TMatchedTrackLocation> GetMatchedPasteLocations(XmlNodeRef clipboardContent, CTrackViewAnimNode* pTargetNode, CTrackViewTrack* pTargetTrack);
+
+    // Adjust the time range
+    void AdjustKeysToTimeRange(Range newTimeRange);
+
+    // Clear all key selection
+    void DeselectAllKeys();
+
+    // Offset all key selection
+    void OffsetSelectedKeys(const float timeOffset);
+    // Scale all selected keys by this offset.
+    void ScaleSelectedKeys(const float timeOffset);
+    //! Push all the keys which come after the first key in time among selected ones by this offset.
+    void SlideKeys(const float timeOffset);
+    //! Clone all selected keys
+    void CloneSelectedKeys();
+
+    // Limit the time offset so as to keep all involved keys in range when offsetting.
+    float ClipTimeOffsetForOffsetting(const float timeOffset);
+    // Limit the time offset so as to keep all involved keys in range when scaling.
+    float ClipTimeOffsetForScaling(const float timeOffset);
+    // Limit the time offset so as to keep all involved keys in range when sliding.
+    float ClipTimeOffsetForSliding(const float timeOffset);
+
+    // Notifications
+    void OnSequenceSettingsChanged();
+    void OnKeySelectionChanged();
+    void OnKeysChanged();
+    void OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle);
+    void OnNodeSelectionChanged();
+    void OnNodeChanged(CTrackViewNode* pNode, ITrackViewSequenceListener::ENodeChangeType type);
+    void OnNodeRenamed(CTrackViewNode* pNode, const char* pOldName);
+
+    // IAnimNodeOwner
+    void MarkAsModified() override;
+    // ~IAnimNodeOwner
+
+    SequenceType GetSequenceType() const 
+    {
+        if (m_pAnimSequence.get())
+        {
+            return m_pAnimSequence->GetSequenceType();
+        }
+        else
+        {
+            return kSequenceTypeDefault;
+        }
+    }
+
+    void SetExpanded(bool expanded) override
+    {
+        if (m_pAnimSequence)
+        {
+            m_pAnimSequence->SetExpanded(expanded);
+        }
+    }
+
+    bool GetExpanded() const override
+    {
+        return m_pAnimSequence ? m_pAnimSequence->GetExpanded() : true;
+    }
+
+    // Called when the 'Record' button is pressed in the toolbar
+    void SetRecording(bool enableRecording);
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    // PropertyEditorEntityChangeNotificationBus handler
+    void OnEntityComponentPropertyChanged(AZ::ComponentId /*changedComponentId*/) override;
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    CTrackViewTrack* FindTrackById(unsigned int trackId);
+
+    std::vector<bool> SaveKeyStates() const;
+    void RestoreKeyStates(const std::vector<bool>& keyStates);
+
+    // Helper function to find a sequence by entity id
+    static CTrackViewSequence* LookUpSequenceByEntityId(const AZ::EntityId& sequenceId);
+
+private:
+    // These are used to avoid listener notification spam via CTrackViewSequenceNotificationContext.
+    // For recursion there is a counter that increases on QueueListenerNotifications
+    // and decreases on SubmitPendingListenerNotifcations
+    // Only when the counter reaches 0 again SubmitPendingListenerNotifcations
+    // will submit the notifications
+    void QueueNotifications();
+    // Used to cancel a previously queued notification.
+    void DequeueNotifications();
+    void SubmitPendingNotifcations(bool force = false);
+
+    /////////////////////////////////////////////////////////////////////////
+    // overrides for ITrackViewSequenceManagerListener
+    void OnSequenceRemoved(CTrackViewSequence* pSequence) override;
+    void OnSequenceAdded(CTrackViewSequence* pSequence) override;
+
+    // Called when an animation updates needs to be schedules
+    void ForceAnimation();
+
+    virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) override;
+
+    std::deque<CTrackViewTrack*> GetMatchingTracks(CTrackViewAnimNode* pAnimNode, XmlNodeRef trackNode);
+    void GetMatchedPasteLocationsRec(std::vector<TMatchedTrackLocation>& locations, CTrackViewNode* pCurrentNode, XmlNodeRef clipboardNode);
+
+    virtual void BeginUndoTransaction();
+    virtual void EndUndoTransaction();
+    virtual void BeginRestoreTransaction();
+    virtual void EndRestoreTransaction();
+
+    // For record mode on AZ::Entities - connect (or disconnect) to buses for notification of property changes
+    void ConnectToBusesForRecording(const AZ::EntityId& entityIdForBus, bool enableConnection);
+
+    // Searches for current property vs. Track values for the given node and sets a key for all values that differ.
+    // Returns the number of keys set
+    int RecordTrackChangesForNode(CTrackViewAnimNode* componentNode);
+
+    // Current time when animated
+    float m_time;
+
+    // Stores if sequence is bound
+    bool m_bBoundToEditorObjects = false;
+
+    AZStd::intrusive_ptr<IAnimSequence> m_pAnimSequence;
+    std::vector<ITrackViewSequenceListener*> m_sequenceListeners;
+
+    // Notification queuing
+    unsigned int m_selectionRecursionLevel = 0;
+    bool m_bNoNotifications = false;
+    bool m_bQueueNotifications = false;
+    bool m_bNodeSelectionChanged = false;
+    bool m_bForceAnimation = false;
+    bool m_bKeySelectionChanged = false;
+    bool m_bKeysChanged = false;
+};
+
+////////////////////////////////////////////////////////////////////////////
+class CTrackViewSequenceNotificationContext
+{
+public:
+    CTrackViewSequenceNotificationContext(CTrackViewSequence* pSequence)
+        : m_pSequence(pSequence)
+    {
+        if (m_pSequence)
+        {
+            m_pSequence->QueueNotifications();
+        }
+    }
+
+    ~CTrackViewSequenceNotificationContext()
+    {
+        if (m_pSequence)
+        {
+            m_pSequence->SubmitPendingNotifcations();
+        }
+    }
+
+    void Cancel()
+    {
+        if (m_pSequence)
+        {
+            m_pSequence->DequeueNotifications();
+        }        
+        m_pSequence = nullptr;
+    }
+
+private:
+    CTrackViewSequence* m_pSequence;
+};
+
+////////////////////////////////////////////////////////////////////////////
+class CTrackViewSequenceNoNotificationContext
+{
+public:
+    CTrackViewSequenceNoNotificationContext(CTrackViewSequence* pSequence)
+        : m_pSequence(pSequence)
+        , m_bNoNotificationsPreviously(false)
+    {
+        if (m_pSequence)
+        {
+            m_bNoNotificationsPreviously = m_pSequence->m_bNoNotifications;
+            m_pSequence->m_bNoNotifications = true;
+        }
+    }
+
+    ~CTrackViewSequenceNoNotificationContext()
+    {
+        if (m_pSequence)
+        {
+            m_pSequence->m_bNoNotifications = m_bNoNotificationsPreviously;
+        }
+    }
+
+private:
+    CTrackViewSequence* m_pSequence;
+
+    // Reentrance could happen if there are overlapping sub-sequences controlling
+    // the same camera.
+    bool m_bNoNotificationsPreviously;
+};
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCE_H
diff --git a/Code/Editor/TrackView/TrackViewSequenceManager.cpp b/Code/Editor/TrackView/TrackViewSequenceManager.cpp
new file mode 100644
index 0000000000..3906cd273f
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewSequenceManager.cpp
@@ -0,0 +1,507 @@
+/*
+ * 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 "TrackViewSequenceManager.h"
+
+// AzToolsFramework
+#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
+#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
+
+// CryCommon
+#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
+#include <CryCommon/Maestro/Types/SequenceType.h>
+
+// Editor
+#include "AnimationContext.h"
+#include "GameEngine.h"
+#include "Include/IObjectManager.h"
+#include "Objects/ObjectManager.h"
+
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewSequenceManager::CTrackViewSequenceManager()
+{
+    GetIEditor()->RegisterNotifyListener(this);
+
+    AZ::EntitySystemBus::Handler::BusConnect();
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewSequenceManager::~CTrackViewSequenceManager()
+{
+    AZ::EntitySystemBus::Handler::BusDisconnect();
+
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnBeginGameMode:
+        ResumeAllSequences();
+        break;
+    case eNotify_OnCloseScene:
+    // Fall through
+    case eNotify_OnBeginLoad:
+        m_bUnloadingLevel = true;
+        break;
+    case eNotify_OnEndNewScene:
+    // Fall through
+    case eNotify_OnEndSceneOpen:
+    // Fall through
+    case eNotify_OnEndLoad:
+    // Fall through
+    case eNotify_OnLayerImportEnd:
+        m_bUnloadingLevel = false;
+        SortSequences();
+        break;
+    }   
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewSequence* CTrackViewSequenceManager::GetSequenceByName(QString name) const
+{
+    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
+    {
+        CTrackViewSequence* sequence = (*iter).get();
+
+        if (sequence->GetName() == name)
+        {
+            return sequence;
+        }
+    }
+
+    return nullptr;
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewSequence* CTrackViewSequenceManager::GetSequenceByEntityId(const AZ::EntityId& entityId) const
+{
+    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
+    {
+        CTrackViewSequence* sequence = (*iter).get();
+
+        if (sequence->GetSequenceComponentEntityId() == entityId)
+        {
+            return sequence;
+        }
+    }
+
+    return nullptr;
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewSequence* CTrackViewSequenceManager::GetSequenceByAnimSequence(IAnimSequence* pAnimSequence) const
+{
+    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
+    {
+        CTrackViewSequence* sequence = (*iter).get();
+
+        if (sequence->m_pAnimSequence == pAnimSequence)
+        {
+            return sequence;
+        }
+    }
+
+    return nullptr;
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewSequence* CTrackViewSequenceManager::GetSequenceByIndex(unsigned int index) const
+{
+    if (index >= m_sequences.size())
+    {
+        return nullptr;
+    }
+
+    return m_sequences[index].get();
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::CreateSequence(QString name, [[maybe_unused]] SequenceType sequenceType)
+{
+    CGameEngine* pGameEngine = GetIEditor()->GetGameEngine();
+    if (!pGameEngine || !pGameEngine->IsLevelLoaded())
+    {
+        return;
+    }
+
+    CTrackViewSequence* pExistingSequence = GetSequenceByName(name);
+    if (pExistingSequence)
+    {
+        return;
+    }
+
+    AzToolsFramework::ScopedUndoBatch undoBatch("Create TrackView Sequence");
+
+    // create AZ::Entity at the current center of the viewport, but don't select it
+
+    // Store the current selection for selection restore after the sequence component is created
+    AzToolsFramework::EntityIdList selectedEntities;
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
+
+    AZ::EntityId newEntityId;   // initialized with InvalidEntityId
+    EBUS_EVENT_RESULT(newEntityId, AzToolsFramework::EditorRequests::Bus, CreateNewEntity, AZ::EntityId());
+    if (newEntityId.IsValid())
+    {
+        // set the entity name
+        AZ::Entity* entity = nullptr;
+        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, newEntityId);
+        if (entity)
+        {
+            entity->SetName(static_cast<const char*>(name.toUtf8().data()));
+        }
+
+        // add the SequenceComponent. The SequenceComponent's Init() method will call OnCreateSequenceObject() which will actually create
+        // the sequence and connect it
+        // #TODO LY-21846: Use "SequenceService" to find component, rather than specific component-type.
+        AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, AzToolsFramework::EntityIdList{ newEntityId }, AZ::ComponentTypeList{ "{C02DC0E2-D0F3-488B-B9EE-98E28077EC56}" });
+
+        // restore the Editor selection
+        AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::Bus::Events::SetSelectedEntities, selectedEntities);
+
+        undoBatch.MarkEntityDirty(newEntityId);        
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+IAnimSequence* CTrackViewSequenceManager::OnCreateSequenceObject(QString name, bool isLegacySequence, AZ::EntityId entityId)
+{
+    // Drop legacy sequences on the floor, they are no longer supported.
+    if (isLegacySequence)
+    {
+        GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(AZStd::string::format("Legacy Sequences are no longer supported. Skipping '%s'.", name.toUtf8().data()));
+        return nullptr;
+    }
+
+    IAnimSequence* sequence = GetIEditor()->GetMovieSystem()->CreateSequence(name.toUtf8().data(), /*bload =*/ false, /*id =*/ 0U, SequenceType::SequenceComponent, entityId);
+    AZ_Assert(sequence, "Failed to create sequence");
+    AddTrackViewSequence(new CTrackViewSequence(sequence));
+
+    return sequence;
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::OnSequenceActivated(const AZ::EntityId& entityId)
+{
+    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
+    if (pAnimationContext != nullptr)
+    {
+        pAnimationContext->OnSequenceActivated(entityId);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::OnCreateSequenceComponent(AZStd::intrusive_ptr<IAnimSequence>& sequence)
+{
+    // Fix up the internal pointers in the sequence to match the deserialized structure
+    sequence->InitPostLoad();
+
+    // Add the sequence to the movie system
+    GetIEditor()->GetMovieSystem()->AddSequence(sequence.get());
+
+    // Create the TrackView Sequence
+    CTrackViewSequence* newTrackViewSequence = new CTrackViewSequence(sequence);
+
+    AddTrackViewSequence(newTrackViewSequence);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::AddTrackViewSequence(CTrackViewSequence* sequenceToAdd)
+{
+    m_sequences.push_back(std::unique_ptr<CTrackViewSequence>(sequenceToAdd));
+    SortSequences();
+    OnSequenceAdded(sequenceToAdd);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::DeleteSequence(CTrackViewSequence* sequence)
+{
+    const int numSequences = m_sequences.size();
+    for (int sequenceIndex = 0; sequenceIndex < numSequences; ++sequenceIndex)
+    {
+        if (m_sequences[sequenceIndex].get() == sequence)
+        {
+            AzToolsFramework::ScopedUndoBatch undoBatch("Delete TrackView Sequence");
+
+            // delete Sequence Component (and entity if there's no other components left on the entity except for the Transform Component)
+            AZ::Entity* entity = nullptr;
+            AZ::EntityId entityId = sequence->m_pAnimSequence->GetSequenceEntityId();
+            AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
+            if (entity)
+            {
+                const AZ::Uuid editorSequenceComponentTypeId(EditorSequenceComponentTypeId);
+                AZ::Component* sequenceComponent = entity->FindComponent(editorSequenceComponentTypeId);
+                if (sequenceComponent)
+                {
+                    AZ::ComponentTypeList requiredComponents;
+                    AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(requiredComponents, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetRequiredComponentTypes);
+                    const int numComponentToDeleteEntity = requiredComponents.size() + 1;
+
+                    AZ::Entity::ComponentArrayType entityComponents = entity->GetComponents();
+                    if (entityComponents.size() == numComponentToDeleteEntity)
+                    {
+                        // if the entity only has required components + 1 (the found sequenceComponent), delete the Entity. No need to start undo here
+                        // AzToolsFramework::ToolsApplicationRequests::DeleteEntities will take care of that
+                        AzToolsFramework::EntityIdList entitiesToDelete;
+                        entitiesToDelete.push_back(entityId);
+
+                        AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::DeleteEntities, entitiesToDelete);
+                    }
+                    else
+                    {
+                        // just remove the sequence component from the entity
+                        CUndo undo("Delete TrackView Sequence");
+
+                        AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::RemoveComponents, AZ::Entity::ComponentArrayType{ sequenceComponent });
+                    }
+
+                    undoBatch.MarkEntityDirty(entityId);
+                }
+            }
+
+            // sequence was deleted, we can stop searching
+            break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::RenameNode(CTrackViewAnimNode* animNode, const char* newName) const
+{
+    AZ::EntityId entityId;
+    CTrackViewSequence* sequence = animNode->GetSequence();
+
+    AZ_Assert(sequence, "Nodes should never have a null sequence.");
+
+    if (animNode->IsBoundToEditorObjects())
+    {
+        if (animNode->GetNodeType() == eTVNT_Sequence)
+        {
+            CTrackViewSequence* sequenceNode = static_cast<CTrackViewSequence*>(animNode);
+            entityId = sequenceNode->GetSequenceComponentEntityId();
+        }
+        else if (animNode->GetNodeType() == eTVNT_AnimNode)
+        {
+            entityId = animNode->GetNodeEntityId();
+        }
+    }
+
+    if (entityId.IsValid())
+    {
+        AzToolsFramework::ScopedUndoBatch undoBatch("ModifyEntityName");
+        AZ::Entity* entity = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
+        entity->SetName(newName);
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+    }
+    else
+    {
+        AzToolsFramework::ScopedUndoBatch undoBatch("Rename TrackView Node");
+        animNode->SetName(newName);
+        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+    }
+}
+
+void CTrackViewSequenceManager::RemoveSequenceInternal(CTrackViewSequence* sequence)
+{
+    std::unique_ptr<CTrackViewSequence> storedTrackViewSequence;
+    
+    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
+    {
+        std::unique_ptr<CTrackViewSequence>& currentSequence = *iter;
+
+        if (currentSequence.get() == sequence)
+        {
+            // Hang onto this until we finish this function.
+            currentSequence.swap(storedTrackViewSequence);
+
+            // Remove from CryMovie and TrackView
+            m_sequences.erase(iter);
+            IMovieSystem* pMovieSystem = GetIEditor()->GetMovieSystem();
+            pMovieSystem->RemoveSequence(sequence->m_pAnimSequence.get());
+
+            break;
+        }
+    }
+
+    OnSequenceRemoved(sequence);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::OnDeleteSequenceEntity(const AZ::EntityId& entityId)
+{
+    CTrackViewSequence* sequence = GetSequenceByEntityId(entityId);
+    assert(sequence);
+
+    if (sequence)
+    {
+        const bool bUndoWasSuspended = GetIEditor()->IsUndoSuspended();
+        bool isDuringUndo = false;
+
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
+
+        if (bUndoWasSuspended)
+        {
+            GetIEditor()->ResumeUndo();
+        }
+
+        RemoveSequenceInternal(sequence);
+
+        if (bUndoWasSuspended)
+        {
+            GetIEditor()->SuspendUndo();
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::SortSequences()
+{
+    std::stable_sort(m_sequences.begin(), m_sequences.end(),
+        [](const std::unique_ptr<CTrackViewSequence>& a, const std::unique_ptr<CTrackViewSequence>& b) -> bool
+        {
+            QString aName = a.get()->GetName();
+            QString bName = b.get()->GetName();
+            return aName < bName;
+        });
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::ResumeAllSequences()
+{
+    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
+    {
+        CTrackViewSequence* sequence = (*iter).get();
+        if (sequence)
+        {
+            sequence->Resume();
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::OnSequenceAdded(CTrackViewSequence* sequence)
+{
+    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
+    {
+        (*iter)->OnSequenceAdded(sequence);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::OnSequenceRemoved(CTrackViewSequence* sequence)
+{
+    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
+    {
+        (*iter)->OnSequenceRemoved(sequence);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CTrackViewSequenceManager::OnDataBaseItemEvent([[maybe_unused]] IDataBaseItem* pItem, EDataBaseItemEvent event)
+{
+    if (event != EDataBaseItemEvent::EDB_ITEM_EVENT_ADD)
+    {
+        const uint numSequences = m_sequences.size();
+
+        for (uint i = 0; i < numSequences; ++i)
+        {
+            m_sequences[i]->UpdateDynamicParams();
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNodeBundle CTrackViewSequenceManager::GetAllRelatedAnimNodes(const AZ::EntityId entityId) const
+{
+    CTrackViewAnimNodeBundle nodeBundle;
+
+    const uint sequenceCount = GetCount();
+
+    for (uint sequenceIndex = 0; sequenceIndex < sequenceCount; ++sequenceIndex)
+    {
+        CTrackViewSequence* sequence = GetSequenceByIndex(sequenceIndex);
+        nodeBundle.AppendAnimNodeBundle(sequence->GetAllOwnedNodes(entityId));
+    }
+
+    return nodeBundle;
+}
+
+////////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode* CTrackViewSequenceManager::GetActiveAnimNode(const AZ::EntityId entityId) const
+{
+    CTrackViewAnimNodeBundle nodeBundle = GetAllRelatedAnimNodes(entityId);
+
+    const uint nodeCount = nodeBundle.GetCount();
+    for (uint nodeIndex = 0; nodeIndex < nodeCount; ++nodeIndex)
+    {
+        CTrackViewAnimNode* animNode = nodeBundle.GetNode(nodeIndex);
+        if (animNode->IsActive())
+        {
+            return animNode;
+        }
+    }
+
+    return nullptr;
+}
+
+void CTrackViewSequenceManager::OnEntityNameChanged(const AZ::EntityId& entityId, const AZStd::string& name)
+{
+    CTrackViewAnimNodeBundle bundle;
+
+    // entity or component entity sequence object
+    bundle = GetAllRelatedAnimNodes(entityId);
+
+    // GetAllRelatedAnimNodes only accounts for entities in the sequences, not the sequence entities themselves. We additionally check
+    // for sequence entities that have object as their entity object for renaming
+    const uint sequenceCount = GetCount();
+    for (uint sequenceIndex = 0; sequenceIndex < sequenceCount; ++sequenceIndex)
+    {
+        CTrackViewSequence* sequence = GetSequenceByIndex(sequenceIndex);
+        if (entityId == sequence->GetSequenceComponentEntityId())
+        {
+            bundle.AppendAnimNode(sequence);
+        }
+    }
+
+    const uint numAffectedNodes = bundle.GetCount();
+    for (uint i = 0; i < numAffectedNodes; ++i)
+    {
+        CTrackViewAnimNode* animNode = bundle.GetNode(i);
+        animNode->SetName(name.c_str());
+    }
+
+    if (numAffectedNodes > 0)
+    {
+        GetIEditor()->Notify(eNotify_OnReloadTrackView);
+    }
+}
+
+void CTrackViewSequenceManager::OnEntityDestruction(const AZ::EntityId& entityId)
+{
+    // we handle pre-delete instead of delete because GetAllRelatedAnimNodes() uses the ObjectManager to find node owners
+    CTrackViewAnimNodeBundle bundle = GetAllRelatedAnimNodes(entityId);
+
+    const uint numAffectedAnimNodes = bundle.GetCount();
+    for (uint i = 0; i < numAffectedAnimNodes; ++i)
+    {
+        CTrackViewAnimNode* animNode = bundle.GetNode(i);
+        animNode->OnEntityRemoved();
+    }
+
+    if (numAffectedAnimNodes > 0)
+    {
+        // Only reload track view if the object being deleted has related anim nodes.
+        GetIEditor()->Notify(eNotify_OnReloadTrackView);
+    }
+}
diff --git a/Code/Editor/TrackView/TrackViewSequenceManager.h b/Code/Editor/TrackView/TrackViewSequenceManager.h
new file mode 100644
index 0000000000..9c5618bae3
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewSequenceManager.h
@@ -0,0 +1,84 @@
+/*
+ * 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_TRACKVIEW_TRACKVIEWSEQUENCEMANAGER_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCEMANAGER_H
+#pragma once
+
+
+#include "TrackViewSequence.h"
+#include "IDataBaseManager.h"
+
+#include <AzCore/Component/EntityBus.h>
+
+class CTrackViewSequenceManager
+    : public IEditorNotifyListener
+    , public IDataBaseManagerListener
+    , public ITrackViewSequenceManager
+    , public AZ::EntitySystemBus::Handler
+{
+public:
+    CTrackViewSequenceManager();
+    ~CTrackViewSequenceManager();
+
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
+
+    unsigned int GetCount() const { return m_sequences.size(); }
+
+    void CreateSequence(QString name, SequenceType sequenceType);
+    void DeleteSequence(CTrackViewSequence* pSequence);
+
+    void RenameNode(CTrackViewAnimNode* pAnimNode, const char* newName) const;
+
+    CTrackViewSequence* GetSequenceByName(QString name) const override;
+    CTrackViewSequence* GetSequenceByEntityId(const AZ::EntityId& entityId) const override;
+    CTrackViewSequence* GetSequenceByIndex(unsigned int index) const;
+    CTrackViewSequence* GetSequenceByAnimSequence(IAnimSequence* pAnimSequence) const;
+
+    CTrackViewAnimNodeBundle GetAllRelatedAnimNodes(AZ::EntityId entityId) const;
+    CTrackViewAnimNode* GetActiveAnimNode(AZ::EntityId entityId) const;
+
+    void AddListener(ITrackViewSequenceManagerListener* pListener) { stl::push_back_unique(m_listeners, pListener); }
+    void RemoveListener(ITrackViewSequenceManagerListener* pListener) { stl::find_and_erase(m_listeners, pListener); }
+
+    //  ITrackViewSequenceManager Overrides
+    // Callback from SequenceObject
+    IAnimSequence* OnCreateSequenceObject(QString name, bool isLegacySequence = true, AZ::EntityId entityId = AZ::EntityId()) override;
+    void OnDeleteSequenceEntity(const AZ::EntityId& entityId) override;
+    void OnCreateSequenceComponent(AZStd::intrusive_ptr<IAnimSequence>& sequence) override;
+    void OnSequenceActivated(const AZ::EntityId& entityId) override;
+    //~ ITrackViewSequenceManager Overrides
+
+private:
+    void AddTrackViewSequence(CTrackViewSequence* sequenceToAdd);
+    void RemoveSequenceInternal(CTrackViewSequence* sequence);
+
+    void SortSequences();
+    void ResumeAllSequences();
+
+    void OnSequenceAdded(CTrackViewSequence* pSequence);
+    void OnSequenceRemoved(CTrackViewSequence* pSequence);
+
+    virtual void OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event);
+
+    // AZ::EntitySystemBus
+    void OnEntityNameChanged(const AZ::EntityId& entityId, const AZStd::string& name) override;
+    void OnEntityDestruction(const AZ::EntityId& entityId) override;
+
+    std::vector<ITrackViewSequenceManagerListener*> m_listeners;
+    std::vector<std::unique_ptr<CTrackViewSequence> > m_sequences;
+
+    // Set to hold sequences that existed when undo transaction began
+    std::set<CTrackViewSequence*> m_transactionSequences;
+
+    bool m_bUnloadingLevel;
+
+    // Used to handle object attach/detach
+    std::unordered_map<CTrackViewNode*, Matrix34> m_prevTransforms;
+};
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCEMANAGER_H
diff --git a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
new file mode 100644
index 0000000000..123d084c9b
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
@@ -0,0 +1,1081 @@
+/*
+ * 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 "TrackViewSplineCtrl.h"
+
+// Qt
+#include <QRubberBand>
+
+// Editor
+#include "AnimationContext.h"
+
+
+class CUndoTrackViewSplineCtrl
+    : public ISplineCtrlUndo
+{
+public:
+    CUndoTrackViewSplineCtrl(CTrackViewSplineCtrl* pCtrl, std::vector<ISplineInterpolator*>& splineContainer)
+    {
+        if (GetIEditor()->GetAnimation()->GetSequence())
+        {
+            m_sequenceEntityId = GetIEditor()->GetAnimation()->GetSequence()->GetSequenceComponentEntityId();
+        }
+
+        m_pCtrl = pCtrl;
+
+        // Loop over all affected splines
+        for (size_t splineIndex = 0; splineIndex < splineContainer.size(); ++splineIndex)
+        {
+            AddSpline(splineContainer[splineIndex]);
+        }
+
+        SerializeSplines(&CSplineEntry::m_undo, false);
+    }
+
+protected:
+    void AddSpline(ISplineInterpolator* pSpline)
+    {
+        // Find corresponding track and remember it
+        for (size_t trackIndex = 0; trackIndex < m_pCtrl->m_tracks.size(); ++trackIndex)
+        {
+            CTrackViewTrack* pTrack = m_pCtrl->m_tracks[trackIndex];
+            if (pTrack->GetSpline() == pSpline)
+            {
+                CSplineEntry entry;
+                entry.m_trackId = pTrack->GetId();
+                m_splineEntries.push_back(entry);
+            }
+        }
+    }
+
+    virtual int GetSize() { return sizeof(*this); }
+    virtual QString GetDescription() { return "UndoTrackViewSplineCtrl"; };
+
+    virtual void Undo(bool bUndo)
+    {
+        CTrackViewSplineCtrl* pCtrl = FindControl(m_pCtrl);
+        if (pCtrl)
+        {
+            pCtrl->SendNotifyEvent(SPLN_BEFORE_CHANGE);
+        }
+
+        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
+
+        AZ_Assert(sequence, "Expected valid sequence.");
+        if (!sequence)
+        {
+            return;
+        }
+
+        CTrackViewSequenceNotificationContext context(sequence);
+
+        if (bUndo)
+        {
+            // Save key selection states for redo if necessary
+            m_redoKeyStates = sequence->SaveKeyStates();
+            SerializeSplines(&CSplineEntry::m_redo, false);
+        }
+
+        SerializeSplines(&CSplineEntry::m_undo, true);
+
+        // Undo key selection state
+        sequence->RestoreKeyStates(m_undoKeyStates);
+
+        if (pCtrl && bUndo)
+        {
+            pCtrl->m_bKeyTimesDirty = true;
+            pCtrl->SendNotifyEvent(SPLN_CHANGE);
+            pCtrl->update();
+        }
+
+        if (bUndo)
+        {
+            sequence->OnKeySelectionChanged();
+        }
+    }
+
+    virtual void Redo()
+    {
+        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* sequence = pSequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
+        AZ_Assert(sequence, "Expected valid sequence.");
+        if (!sequence)
+        {
+            return;
+        }
+
+        CTrackViewSequenceNotificationContext context(sequence);
+
+        CTrackViewSplineCtrl* pCtrl = FindControl(m_pCtrl);
+
+        if (pCtrl)
+        {
+            pCtrl->SendNotifyEvent(SPLN_BEFORE_CHANGE);
+        }
+        SerializeSplines(&CSplineEntry::m_redo, true);
+
+        // Redo key selection state
+        sequence->RestoreKeyStates(m_redoKeyStates);
+
+        if (pCtrl)
+        {
+            pCtrl->m_bKeyTimesDirty = true;
+            pCtrl->SendNotifyEvent(SPLN_CHANGE);
+            pCtrl->update();
+        }
+
+        sequence->OnKeySelectionChanged();
+    }
+
+    virtual bool IsSelectionChanged() const
+    {
+        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
+        AZ_Assert(sequence, "Expected valid sequence.");
+        if (!sequence)
+        {
+            return false;
+        }
+
+        const std::vector<bool> currentKeyState = sequence->SaveKeyStates();
+        return m_undoKeyStates != currentKeyState;
+    }
+
+public:
+    typedef std::list<CTrackViewSplineCtrl*> CTrackViewSplineCtrls;
+
+    static CTrackViewSplineCtrl* FindControl(CTrackViewSplineCtrl* pCtrl)
+    {
+        if (!pCtrl)
+        {
+            return 0;
+        }
+
+        auto iter = std::find(s_activeCtrls.begin(), s_activeCtrls.end(), pCtrl);
+        if (iter == s_activeCtrls.end())
+        {
+            return 0;
+        }
+
+        return *iter;
+    }
+
+    static void RegisterControl(CTrackViewSplineCtrl* pCtrl)
+    {
+        if (!FindControl(pCtrl))
+        {
+            s_activeCtrls.push_back(pCtrl);
+        }
+    }
+
+    static void UnregisterControl(CTrackViewSplineCtrl* pCtrl)
+    {
+        if (FindControl(pCtrl))
+        {
+            s_activeCtrls.remove(pCtrl);
+        }
+    }
+
+    static CTrackViewSplineCtrls s_activeCtrls;
+
+private:
+    class CSplineEntry
+    {
+    public:
+        _smart_ptr<ISplineBackup> m_undo;
+        _smart_ptr<ISplineBackup> m_redo;
+        unsigned int m_trackId;
+    };
+
+    void SerializeSplines(_smart_ptr<ISplineBackup> CSplineEntry::* backup, bool bLoading)
+    {
+        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
+        CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
+        AZ_Assert(sequence, "Expected valid sequence");
+        if (!sequence)
+        {
+            return;
+        }
+
+        for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
+        {
+            CSplineEntry& entry = *it;
+            CTrackViewTrack* track = sequence->FindTrackById(entry.m_trackId);
+            if (track)
+            {
+                ISplineInterpolator* pSpline = track->GetSpline();
+
+                if (pSpline && bLoading)
+                {
+                    pSpline->Restore(entry.*backup);
+                }
+                else if (pSpline)
+                {
+                    (entry.*backup) = pSpline->Backup();
+                }
+            }
+        }
+    }
+
+    AZ::EntityId m_sequenceEntityId;
+    CTrackViewSplineCtrl* m_pCtrl;
+    std::vector<CSplineEntry> m_splineEntries;
+    std::vector<float> m_keyTimes;
+    std::vector<bool> m_undoKeyStates;
+    std::vector<bool> m_redoKeyStates;
+};
+
+CUndoTrackViewSplineCtrl::CTrackViewSplineCtrls CUndoTrackViewSplineCtrl::s_activeCtrls;
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewSplineCtrl::CTrackViewSplineCtrl(QWidget* parent)
+    : SplineWidget(parent)
+    , m_bKeysFreeze(false)
+    , m_bTangentsFreeze(false)
+    , m_stashedRecordModeWhenDraggingTime(false)
+{
+    CUndoTrackViewSplineCtrl::RegisterControl(this);
+}
+
+CTrackViewSplineCtrl::~CTrackViewSplineCtrl()
+{
+    CUndoTrackViewSplineCtrl::UnregisterControl(this);
+}
+
+bool CTrackViewSplineCtrl::GetTangentHandlePts(QPoint& inTangentPt, QPoint& pt, QPoint& outTangentPt,
+    int nSpline, int nKey, int nDimension)
+{
+    ISplineInterpolator* pSpline = m_splines[nSpline].pSpline;
+    CTrackViewTrack* pTrack = m_tracks[nSpline];
+
+    float time = pSpline->GetKeyTime(nKey);
+
+    ISplineInterpolator::ValueType value, tin, tout;
+    ISplineInterpolator::ZeroValue(value);
+    pSpline->GetKeyValue(nKey, value);
+    pSpline->GetKeyTangents(nKey, tin, tout);
+
+    const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(nKey);
+
+    if (pTrack->GetCurveType() == eAnimCurveType_TCBFloat)
+    {
+        ITcbKey tcbKey;
+        keyHandle.GetKey(&tcbKey);
+
+        Vec2 va, vb, vc;
+        va.x = time - 1.0f;
+        va.y = value[nDimension] - tin[nDimension];
+        vb.x = time;
+        vb.y = value[nDimension];
+        vc.x = time + 1.0f;
+        vc.y = value[nDimension] + tout[nDimension];
+        inTangentPt = WorldToClient(va);
+        pt = WorldToClient(vb);
+        outTangentPt = WorldToClient(vc);
+
+        Vec2 tinv, toutv;
+        float maxLength = float(outTangentPt.x() - pt.x());
+        tinv.x = float(inTangentPt.x() - pt.x());
+        tinv.y = float(inTangentPt.y() - pt.y());
+        toutv.x = float(outTangentPt.x() - pt.x());
+        toutv.y = float(outTangentPt.y() - pt.y());
+        tinv.Normalize();
+        toutv.Normalize();
+        tinv *= maxLength / (2 - tcbKey.easeto);
+        toutv *= maxLength / (2 - tcbKey.easefrom);
+
+        inTangentPt = pt + QPoint(int(tinv.x), int(tinv.y));
+        outTangentPt = pt + QPoint(int(toutv.x), int(toutv.y));
+    }
+    else
+    {
+        assert(pTrack->GetCurveType() == eAnimCurveType_BezierFloat);
+        assert(nDimension == 0);
+
+        I2DBezierKey bezierKey;
+        keyHandle.GetKey(&bezierKey);
+
+        Vec2 va, vb, vc;
+        va.x = time - tin[0];
+        va.y = value[0] - tin[1];
+        vb.x = time;
+        vb.y = value[0];
+        vc.x = time + tout[0];
+        vc.y = value[0] + tout[1];
+        inTangentPt = WorldToClient(va);
+        pt = WorldToClient(vb);
+        outTangentPt = WorldToClient(vc);
+    }
+
+    return true;
+}
+
+void CTrackViewSplineCtrl::ComputeIncomingTangentAndEaseTo(float& ds, float& easeTo, QPoint inTangentPt,
+    int nSpline, int nKey, int nDimension)
+{
+    ISplineInterpolator* pSpline = m_splines[nSpline].pSpline;
+    CTrackViewTrack* pTrack = m_tracks[nSpline];
+
+    float time = pSpline->GetKeyTime(nKey);
+
+    ISplineInterpolator::ValueType value, tin, tout;
+    ISplineInterpolator::ZeroValue(value);
+    pSpline->GetKeyValue(nKey, value);
+    pSpline->GetKeyTangents(nKey, tin, tout);
+
+    const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(nKey);
+
+    ITcbKey tcbKey;
+    keyHandle.GetKey(&tcbKey);
+
+    // Get the control point.
+    Vec2 tinv, vb;
+    vb.x = time;
+    vb.y = value[nDimension];
+    QPoint pt = WorldToClient(vb);
+
+    // Get the max length to compute the 'ease' value.
+    float maxLength = float(WorldToClient(Vec2(vb.x + 1, vb.y)).x() - pt.x());
+
+    QPoint tmp = inTangentPt - pt;
+    tinv.x = float(tmp.x());
+    tinv.y = float(tmp.y());
+
+    // Compute the 'easeTo'.
+    easeTo = 2.0f - maxLength / tinv.GetLength();
+
+    // Compute the 'ds'.
+    Vec2 va = ClientToWorld(inTangentPt);
+    if (time < va.x + 0.000001f)
+    {
+        if (value[nDimension] > va.y)
+        {
+            ds = 1000000.0f;
+        }
+        else
+        {
+            ds = -1000000.0f;
+        }
+    }
+    else
+    {
+        ds = (value[nDimension] - va.y) / (time - va.x);
+    }
+}
+
+void CTrackViewSplineCtrl::ComputeOutgoingTangentAndEaseFrom(float& dd, float& easeFrom, QPoint outTangentPt,
+    int nSpline, int nKey, int nDimension)
+{
+    ISplineInterpolator* pSpline = m_splines[nSpline].pSpline;
+    CTrackViewTrack* pTrack = m_tracks[nSpline];
+
+    float time = pSpline->GetKeyTime(nKey);
+
+    ISplineInterpolator::ValueType value, tin, tout;
+    ISplineInterpolator::ZeroValue(value);
+    pSpline->GetKeyValue(nKey, value);
+    pSpline->GetKeyTangents(nKey, tin, tout);
+
+    const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(nKey);
+
+    ITcbKey tcbKey;
+    keyHandle.GetKey(&tcbKey);
+
+    // Get the control point.
+    Vec2 toutv, vb;
+    vb.x = time;
+    vb.y = value[nDimension];
+    QPoint pt = WorldToClient(vb);
+
+    // Get the max length to comute the 'ease' value.
+    float maxLength = float(WorldToClient(Vec2(vb.x + 1, vb.y)).x() - pt.x());
+
+    QPoint tmp = outTangentPt - pt;
+    toutv.x = float(tmp.x());
+    toutv.y = float(tmp.y());
+
+    // Compute the 'easeFrom'.
+    easeFrom = 2.0f - maxLength / toutv.GetLength();
+
+    // Compute the 'dd'.
+    Vec2 vc = ClientToWorld(outTangentPt);
+    if (vc.x < time + 0.000001f)
+    {
+        if (value[nDimension] < vc.y)
+        {
+            dd = 1000000.0f;
+        }
+        else
+        {
+            dd = -1000000.0f;
+        }
+    }
+    else
+    {
+        dd = (vc.y - value[nDimension]) / (vc.x - time);
+    }
+}
+
+void CTrackViewSplineCtrl::AddSpline(ISplineInterpolator* pSpline, CTrackViewTrack* pTrack, const QColor& color)
+{
+    QColor colorArray[4];
+    colorArray[0] = colorArray[1] = colorArray[2] = colorArray[3] = color;
+    AddSpline(pSpline, pTrack, colorArray);
+}
+
+void CTrackViewSplineCtrl::AddSpline(ISplineInterpolator* pSpline, CTrackViewTrack* pTrack, QColor anColorArray[4])
+{
+    for (int i = 0; i < (int)m_splines.size(); i++)
+    {
+        if (m_splines[i].pSpline == pSpline)
+        {
+            return;
+        }
+    }
+    SSplineInfo si;
+
+    for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+    {
+        si.anColorArray[nCurrentDimension] = anColorArray[nCurrentDimension];
+    }
+
+    si.pSpline = pSpline;
+    si.pDetailSpline = NULL;
+    m_splines.push_back(si);
+    m_tracks.push_back(pTrack);
+    m_bKeyTimesDirty = true;
+    update();
+}
+
+void CTrackViewSplineCtrl::RemoveAllSplines()
+{
+    m_tracks.clear();
+    SplineWidget::RemoveAllSplines();
+}
+
+void CTrackViewSplineCtrl::MoveSelectedTangentHandleTo(const QPoint& point)
+{
+    assert(m_pHitSpline && m_nHitKeyIndex >= 0 && m_bHitIncomingHandle >= 0);
+
+    // Set the custom flag to the key.
+    int nRemoveFlags, nAddFlags;
+    if (m_bHitIncomingHandle)
+    {
+        nRemoveFlags = SPLINE_KEY_TANGENT_IN_MASK;
+        nAddFlags = SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_IN_SHIFT;
+    }
+    else
+    {
+        nRemoveFlags = SPLINE_KEY_TANGENT_OUT_MASK;
+        nAddFlags = SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_OUT_SHIFT;
+    }
+    int flags = m_pHitSpline->GetKeyFlags(m_nHitKeyIndex);
+    flags &= ~nRemoveFlags;
+    flags |= nAddFlags;
+    m_pHitSpline->SetKeyFlags(m_nHitKeyIndex, flags);
+
+    // Adjust the incoming or outgoing tangent.
+    int splineIndex;
+    for (splineIndex = 0; splineIndex < m_splines.size(); ++splineIndex)
+    {
+        if (m_pHitSpline == m_splines[splineIndex].pSpline)
+        {
+            break;
+        }
+    }
+    assert(splineIndex < m_splines.size());
+
+    CTrackViewTrack* pTrack = m_tracks[splineIndex];
+    CTrackViewKeyHandle keyHandle = pTrack->GetKey(m_nHitKeyIndex);
+
+    if (pTrack->GetCurveType() == eAnimCurveType_TCBFloat)
+    {
+        if (m_bHitIncomingHandle)
+        {
+            float ds, easeTo;
+            ComputeIncomingTangentAndEaseTo(ds, easeTo, point, splineIndex, m_nHitKeyIndex, m_nHitDimension);
+            // ease-to
+            ITcbKey key;
+            keyHandle.GetKey(&key);
+            key.easeto += easeTo;
+            if (key.easeto > 1)
+            {
+                key.easeto = 1.0f;
+            }
+            else if (key.easeto < 0)
+            {
+                key.easeto = 0;
+            }
+            keyHandle.SetKey(&key);
+            // tin
+            ISplineInterpolator::ValueType tin, tout;
+            m_pHitSpline->GetKeyTangents(m_nHitKeyIndex, tin, tout);
+            tin[m_nHitDimension] = ds;
+            m_pHitSpline->SetKeyInTangent(m_nHitKeyIndex, tin);
+        }
+        else
+        {
+            float dd, easeFrom;
+            ComputeOutgoingTangentAndEaseFrom(dd, easeFrom, point, splineIndex, m_nHitKeyIndex, m_nHitDimension);
+            // ease-from
+            ITcbKey key;
+            keyHandle.GetKey(&key);
+            key.easefrom += easeFrom;
+            if (key.easefrom > 1)
+            {
+                key.easefrom = 1.0f;
+            }
+            else if (key.easefrom < 0)
+            {
+                key.easefrom = 0;
+            }
+            keyHandle.SetKey(&key);
+            // tout
+            ISplineInterpolator::ValueType tin, tout;
+            m_pHitSpline->GetKeyTangents(m_nHitKeyIndex, tin, tout);
+            tout[m_nHitDimension] = dd;
+            m_pHitSpline->SetKeyOutTangent(m_nHitKeyIndex, tout);
+        }
+    }
+    else
+    {
+        assert(pTrack->GetCurveType() == eAnimCurveType_BezierFloat);
+        assert(m_nHitDimension == 0);
+
+        Vec2 tp = ClientToWorld(point);
+        if (m_bHitIncomingHandle)
+        {
+            // tin
+            ISplineInterpolator::ValueType value, tin, tout;
+            float time = m_pHitSpline->GetKeyTime(m_nHitKeyIndex);
+            m_pHitSpline->GetKeyValue(m_nHitKeyIndex, value);
+            m_pHitSpline->GetKeyTangents(m_nHitKeyIndex, tin, tout);
+            tin[0] = time - tp.x;
+            // Constrain the time range so that the time curve is always monotonically increasing.
+            if (tin[0] < 0)
+            {
+                tin[0] = 0;
+            }
+            else if (m_nHitKeyIndex > 0
+                     && tin[0] > (time - m_pHitSpline->GetKeyTime(m_nHitKeyIndex - 1)))
+            {
+                tin[0] = time - m_pHitSpline->GetKeyTime(m_nHitKeyIndex - 1);
+            }
+            tin[1] = value[0] - tp.y;
+            m_pHitSpline->SetKeyInTangent(m_nHitKeyIndex, tin);
+        }
+        else
+        {
+            // tout
+            ISplineInterpolator::ValueType value, tin, tout;
+            float time = m_pHitSpline->GetKeyTime(m_nHitKeyIndex);
+            m_pHitSpline->GetKeyValue(m_nHitKeyIndex, value);
+            m_pHitSpline->GetKeyTangents(m_nHitKeyIndex, tin, tout);
+            tout[0] = tp.x - time;
+            // Constrain the time range so that the time curve is always monotonically increasing.
+            if (tout[0] < 0)
+            {
+                tout[0] = 0;
+            }
+            else if (m_nHitKeyIndex < m_pHitSpline->GetKeyCount() - 1
+                     && tout[0] > (m_pHitSpline->GetKeyTime(m_nHitKeyIndex + 1) - time))
+            {
+                tout[0] = m_pHitSpline->GetKeyTime(m_nHitKeyIndex + 1) - time;
+            }
+            tout[1] = tp.y - value[0];
+            m_pHitSpline->SetKeyOutTangent(m_nHitKeyIndex, tout);
+        }
+    }
+
+    SendNotifyEvent(SPLN_CHANGE);
+    update();
+}
+
+void CTrackViewSplineCtrl::mouseMoveEvent(QMouseEvent* event)
+{
+    const QPoint point = event->pos();
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (!pSequence)
+    {
+        return;
+    }
+
+    CTrackViewSequenceNotificationContext context(pSequence);
+
+    QPoint cMousePosPrev = m_cMousePos;
+    m_cMousePos = point;
+
+    if (m_editMode == NothingMode)
+    {
+        switch (HitTest(point))
+        {
+        case HIT_SPLINE:
+            setCursor(CMFCUtils::LoadCursor(IDC_ARRWHITE));
+            break;
+        case HIT_KEY:
+        case HIT_TANGENT_HANDLE:
+            setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCK));
+            break;
+        default:
+            unsetCursor();
+            break;
+        }
+    }
+
+    if (m_editMode == SelectMode)
+    {
+        unsetCursor();
+        QRect rc(m_cMouseDownPos, point);
+        rc = rc.normalized().intersected(m_rcSpline);
+
+        m_rcSelect = rc;
+        m_rubberBand->setGeometry(m_rcSelect);
+        m_rubberBand->setVisible(true);
+    }
+
+    if (m_editMode == TimeMarkerMode)
+    {
+        unsetCursor();
+        SetTimeMarker(XOfsToTime(point.x()));
+        SendNotifyEvent(SPLN_TIME_CHANGE);
+    }
+
+    if (m_boLeftMouseButtonDown)
+    {
+        if (m_editMode == TrackingMode && point != m_cMouseDownPos)
+        {
+            m_startedDragging = true;
+            GetIEditor()->RestoreUndo();
+            m_pCurrentUndo = nullptr;
+            StoreUndo();
+
+            bool bAltClick = CheckVirtualKey(Qt::Key_Menu);
+            bool bShiftClick = CheckVirtualKey(Qt::Key_Shift);
+            bool bSpaceClick = CheckVirtualKey(Qt::Key_Space);
+
+            Vec2 v0 = ClientToWorld(m_cMouseDownPos);
+            Vec2 v1 = ClientToWorld(point);
+            if (m_hitCode == HIT_TANGENT_HANDLE)
+            {
+                if (!m_bTangentsFreeze)
+                {
+                    MoveSelectedTangentHandleTo(point);
+                }
+            }
+            else if (!m_bKeysFreeze)
+            {
+                if (bAltClick && bShiftClick)
+                {
+                    ValueScaleKeys(v0.y, v1.y);
+                }
+                else if (bAltClick)
+                {
+                    TimeScaleKeys(m_fTimeMarker, v0.x, v1.x);
+                }
+                else if (bShiftClick)
+                {
+                    // Constrains the move to the vertical direction.
+                    MoveSelectedKeys(Vec2(0, v1.y - v0.y), false);
+                }
+                else if (bSpaceClick)
+                {
+                    // Reset to the original position.
+                    MoveSelectedKeys(Vec2(0, 0), false);
+                }
+                else
+                {
+                    MoveSelectedKeys(v1 - v0, m_copyKeys);
+                }
+            }
+        }
+    }
+
+    if (m_editMode == TrackingMode && GetNumSelected() == 1)
+    {
+        float time = 0;
+        ISplineInterpolator::ValueType  afValue;
+        QString                         tipText;
+        bool                            boFoundTheSelectedKey(false);
+
+        for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
+        {
+            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+            CTrackViewTrack* pTrack = m_tracks[splineIndex];
+            for (int i = 0; i < pSpline->GetKeyCount(); i++)
+            {
+                const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
+
+                for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
+                {
+                    if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
+                    {
+                        time = pSpline->GetKeyTime(i);
+                        pSpline->GetKeyValue(i, afValue);
+                        if (pTrack->GetCurveType() == eAnimCurveType_TCBFloat)
+                        {
+                            ITcbKey key;
+                            keyHandle.GetKey(&key);
+                            tipText = QStringLiteral("t=%1  v=%2 / T=%3  C=%4  B=%5")
+                                .arg(time * m_fTooltipScaleX, 3, 'f').arg(afValue[nCurrentDimension] * m_fTooltipScaleY, 3, 'f', 2)
+                                .arg(key.tens, 3, 'f').arg(key.cont, 3, 'f').arg(key.bias, 3, 'f');
+                        }
+                        else
+                        {
+                            assert(pTrack->GetCurveType() == eAnimCurveType_BezierFloat);
+                            ISplineInterpolator::ValueType tin, tout;
+                            pSpline->GetKeyTangents(i, tin, tout);
+                            tipText = QStringLiteral("t=%1  v=%2 / tin=(%3,%4)  tout=(%5,%6)")
+                                .arg(time * m_fTooltipScaleX, 3, 'f').arg(afValue[0] * m_fTooltipScaleY, 3, 'f', 2)
+                                .arg(tin[0], 3, 'f').arg(tin[1], 3, 'f', 2).arg(tout[0], 3, 'f').arg(tout[1], 3, 'f', 2);
+                        }
+                        boFoundTheSelectedKey = true;
+                        break;
+                    }
+                }
+                if (boFoundTheSelectedKey)
+                {
+                    break;
+                }
+            }
+        }
+
+        if (point != m_lastToolTipPos)
+        {
+            m_lastToolTipPos = point;
+            m_tooltipText = tipText;
+            update();
+        }
+    }
+
+    switch (m_editMode)
+    {
+    case ScrollMode:
+    {
+        // Set the new scrolled coordinates
+        float ofsx = m_grid.origin.x - (point.x() - m_cMouseDownPos.x()) / m_grid.zoom.x;
+        float ofsy = m_grid.origin.y + (point.y() - m_cMouseDownPos.y()) / m_grid.zoom.y;
+        SetScrollOffset(Vec2(ofsx, ofsy));
+        m_cMouseDownPos = point;
+    }
+    break;
+
+    case ZoomMode:
+    {
+        float ofsx = (point.x() - m_cMouseDownPos.x()) * 0.01f;
+        float ofsy = (point.y() - m_cMouseDownPos.y()) * 0.01f;
+
+        Vec2 z = m_grid.zoom;
+        if (ofsx != 0)
+        {
+            z.x = max(z.x * (1.0f + ofsx), 0.001f);
+        }
+        if (ofsy != 0)
+        {
+            z.y = max(z.y * (1.0f + ofsy), 0.001f);
+        }
+        SetZoom(z, m_cMouseDownPos);
+        m_cMouseDownPos = point;
+    }
+    break;
+    }
+}
+
+void CTrackViewSplineCtrl::AdjustTCB(float d_tension, float d_continuity, float d_bias)
+{
+    CUndo undo("Modify Spline Keys TCB");
+    ConditionalStoreUndo();
+
+    SendNotifyEvent(SPLN_BEFORE_CHANGE);
+
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+        CTrackViewTrack* pTrack = m_tracks[splineIndex];
+
+        if (pTrack->GetCurveType() != eAnimCurveType_TCBFloat)
+        {
+            continue;
+        }
+
+        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
+        {
+            CTrackViewKeyHandle keyHandle = pTrack->GetKey(i);
+
+            // If the key is selected in any dimension...
+            for (
+                int nCurrentDimension = 0;
+                nCurrentDimension < pSpline->GetNumDimensions();
+                nCurrentDimension++
+                )
+            {
+                if (IsKeySelected(pSpline, i, nCurrentDimension))
+                {
+                    ITcbKey key;
+                    keyHandle.GetKey(&key);
+                    // tension
+                    key.tens += d_tension;
+                    if (key.tens > 1)
+                    {
+                        key.tens = 1.0f;
+                    }
+                    else if (key.tens < -1)
+                    {
+                        key.tens = -1.0f;
+                    }
+                    // continuity
+                    key.cont += d_continuity;
+                    if (key.cont > 1)
+                    {
+                        key.cont = 1.0f;
+                    }
+                    else if (key.cont < -1)
+                    {
+                        key.cont = -1.0f;
+                    }
+                    // bias
+                    key.bias += d_bias;
+                    if (key.bias > 1)
+                    {
+                        key.bias = 1.0f;
+                    }
+                    else if (key.bias < -1)
+                    {
+                        key.bias = -1.0f;
+                    }
+                    keyHandle.SetKey(&key);
+                    OnUserCommand(ID_TANGENT_AUTO);
+                    break;
+                }
+            }
+        }
+    }
+
+    SendNotifyEvent(SPLN_CHANGE);
+    update();
+}
+
+void CTrackViewSplineCtrl::OnUserCommand(UINT cmd)
+{
+    if (cmd == ID_TANGENT_UNIFY)
+    {
+        if (IsUnifiedKeyCurrentlySelected() == false)
+        {
+            ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_ALL_MASK, SPLINE_KEY_TANGENT_UNIFIED);
+        }
+        else
+        {
+            ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_ALL_MASK, SPLINE_KEY_TANGENT_BROKEN);
+        }
+    }
+    else if (cmd == ID_FREEZE_KEYS)
+    {
+        m_bKeysFreeze = !m_bKeysFreeze;
+    }
+    else if (cmd == ID_FREEZE_TANGENTS)
+    {
+        m_bTangentsFreeze = !m_bTangentsFreeze;
+    }
+    else
+    {
+        SplineWidget::OnUserCommand(cmd);
+    }
+}
+
+bool CTrackViewSplineCtrl::IsUnifiedKeyCurrentlySelected() const
+{
+    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
+    {
+        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
+
+        if (pSpline == NULL)
+        {
+            continue;
+        }
+
+        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
+        {
+            // If the key is selected in any dimension...
+            for (
+                int nCurrentDimension = 0;
+                nCurrentDimension < pSpline->GetNumDimensions();
+                nCurrentDimension++
+                )
+            {
+                if (IsKeySelected(pSpline, i, nCurrentDimension))
+                {
+                    int flags = pSpline->GetKeyFlags(i);
+                    if ((flags & SPLINE_KEY_TANGENT_ALL_MASK) != SPLINE_KEY_TANGENT_UNIFIED)
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+void CTrackViewSplineCtrl::ClearSelection()
+{
+    // In this case, we should deselect all keys, even ones in other tracks.
+    // So this overriding is necessary.
+    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (pSequence)
+    {
+        pSequence->DeselectAllKeys();
+    }
+}
+
+ISplineCtrlUndo* CTrackViewSplineCtrl::CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer)
+{
+    return new CUndoTrackViewSplineCtrl(this, splineContainer);
+}
+
+void CTrackViewSplineCtrl::mousePressEvent(QMouseEvent* event)
+{
+    if (GetIEditor()->GetAnimation()->GetSequence())
+    {
+        SplineWidget::mousePressEvent(event);
+        if (m_editMode == TimeMarkerMode)
+        {
+            // turn off recording when dragging time
+            m_stashedRecordModeWhenDraggingTime = GetIEditor()->GetAnimation()->IsRecordMode();
+            GetIEditor()->GetAnimation()->SetRecording(false);
+        }
+    }
+}
+
+void CTrackViewSplineCtrl::mouseReleaseEvent(QMouseEvent* event)
+{
+    if (GetIEditor()->GetAnimation()->GetSequence())
+    {
+        bool restoreRecordModeToTrue = (m_editMode == TimeMarkerMode && m_stashedRecordModeWhenDraggingTime);
+        
+        SplineWidget::mouseReleaseEvent(event);
+
+        if (restoreRecordModeToTrue)
+        {
+            // restore recording when dragging time
+            GetIEditor()->GetAnimation()->SetRecording(true);
+            m_stashedRecordModeWhenDraggingTime = false;    // reset stashed value
+        }
+    }
+}
+
+void CTrackViewSplineCtrl::mouseDoubleClickEvent(QMouseEvent* event)
+{
+    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        SplineWidget::mouseDoubleClickEvent(event);
+
+        if (m_hitCode == HIT_SPLINE)
+        {
+            // HIT_SPLINE results in an added key that gets selected.
+            // Use the selected keys to notify the sequence, key by key, of newly added keys
+            CTrackViewKeyBundle addedKeys = sequence->GetSelectedKeys();
+            for (int keyIdx = addedKeys.GetKeyCount(); --keyIdx >= 0; )
+            {
+                CTrackViewKeyHandle addedKey = addedKeys.GetKey(keyIdx);
+                sequence->OnKeyAdded(addedKey);
+            }
+        }
+    }
+}
+
+void CTrackViewSplineCtrl::keyPressEvent(QKeyEvent* event)
+{
+    auto sequence = GetIEditor()->GetAnimation()->GetSequence();
+    if (sequence)
+    {
+        // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
+        if (event->key() == Qt::Key_S && m_playCallback)
+        {
+            m_playCallback();
+        }
+        else if (event->matches(QKeySequence::Delete))
+        {
+            CUndo undo("Delete Keys");
+
+            SendNotifyEvent(SPLN_BEFORE_CHANGE);
+            sequence->DeleteSelectedKeys();
+            SendNotifyEvent(SPLN_CHANGE);
+            update();
+        }
+        else if (event->matches(QKeySequence::Undo))
+        {
+            GetIEditor()->Undo();
+        }
+        else if (event->matches(QKeySequence::Redo))
+        {
+            GetIEditor()->Redo();
+        }
+        else
+        {
+            SplineWidget::keyPressEvent(event);
+        }
+    }
+}
+
+bool CTrackViewSplineCtrl::event(QEvent* e)
+{
+    if (e->type() == QEvent::ShortcutOverride)
+    {
+        // since we respond to the following things, let Qt know so that shortcuts don't override us
+        bool respondsToEvent = false;
+
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
+        if (keyEvent->key() == Qt::Key_S)
+        {
+            respondsToEvent = true;
+        }
+        else
+        {
+            respondsToEvent = keyEvent->matches(QKeySequence::Delete) ||
+                keyEvent->matches(QKeySequence::Undo) ||
+                keyEvent->matches(QKeySequence::Redo);
+        }
+
+        if (respondsToEvent)
+        {
+            e->accept();
+            return true;
+        }
+    }
+
+    return SplineWidget::event(e);
+}
+
+void CTrackViewSplineCtrl::wheelEvent(QWheelEvent* event)
+{
+    if (GetIEditor()->GetAnimation()->GetSequence())
+    {
+        SplineWidget::wheelEvent(event);
+    }
+}
+
+void CTrackViewSplineCtrl::SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect)
+{
+    SplineWidget::SelectKey(pSpline, nKey, nDimension, bSelect);
+    GetIEditor()->GetAnimation()->GetSequence()->OnKeySelectionChanged();
+}
+
+void CTrackViewSplineCtrl::SelectRectangle(const QRect& rc, bool bSelect)
+{
+    SplineWidget::SelectRectangle(rc, bSelect);
+    GetIEditor()->GetAnimation()->GetSequence()->OnKeySelectionChanged();
+}
+
+void CTrackViewSplineCtrl::SetPlayCallback(const std::function<void()>& callback)
+{
+    m_playCallback = callback;
+}
diff --git a/Code/Editor/TrackView/TrackViewSplineCtrl.h b/Code/Editor/TrackView/TrackViewSplineCtrl.h
new file mode 100644
index 0000000000..eecab088b1
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewSplineCtrl.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSPLINECTRL_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSPLINECTRL_H
+#pragma once
+
+
+#include <IMovieSystem.h>
+#include "Controls/SplineCtrlEx.h"
+#include <functional>
+
+class CTrackViewTrack;
+
+/** A customized spline control for CTrackViewGraph.
+*/
+class CTrackViewSplineCtrl
+    : public SplineWidget
+{
+    friend class CUndoTrackViewSplineCtrl;
+public:
+    CTrackViewSplineCtrl(QWidget* parent);
+    virtual ~CTrackViewSplineCtrl();
+
+    virtual void ClearSelection();
+
+    void AddSpline(ISplineInterpolator* pSpline, CTrackViewTrack* pTrack, const QColor& color);
+    void AddSpline(ISplineInterpolator * pSpline, CTrackViewTrack * pTrack, QColor anColorArray[4]);
+
+    const std::vector<CTrackViewTrack*>& GetTracks() const { return m_tracks; }
+    void RemoveAllSplines();
+
+    void OnUserCommand(UINT cmd);
+    bool IsUnifiedKeyCurrentlySelected() const;
+    bool IsKeysFrozen() const { return m_bKeysFreeze; }
+    bool IsTangentsFrozen() const { return m_bTangentsFreeze; }
+
+    void SetPlayCallback(const std::function<void()>& callback);
+
+protected:
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+    void keyPressEvent(QKeyEvent* event) override;
+    bool event(QEvent* event) override;
+    void wheelEvent(QWheelEvent* event) override;
+
+private:
+    virtual void SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect) override;
+    virtual void SelectRectangle(const QRect& rc, bool bSelect) override;
+
+    std::vector<CTrackViewTrack*> m_tracks;
+
+    virtual bool GetTangentHandlePts(QPoint& inTangentPt, QPoint& pt, QPoint& outTangentPt,
+        int nSpline, int nKey, int nDimension) override;
+    void ComputeIncomingTangentAndEaseTo(float& ds, float& easeTo, QPoint inTangentPt,
+        int nSpline, int nKey, int nDimension);
+    void ComputeOutgoingTangentAndEaseFrom(float& dd, float& easeFrom, QPoint outTangentPt,
+        int nSpline, int nKey, int nDimension);
+    void AdjustTCB(float d_tension, float d_continuity, float d_bias);
+    void MoveSelectedTangentHandleTo(const QPoint& point);
+
+    virtual ISplineCtrlUndo* CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer);
+
+    bool m_bKeysFreeze;
+    bool m_bTangentsFreeze;
+    bool m_stashedRecordModeWhenDraggingTime;
+
+    std::function<void()> m_playCallback;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSPLINECTRL_H
diff --git a/Code/Editor/TrackView/TrackViewTimeline.cpp b/Code/Editor/TrackView/TrackViewTimeline.cpp
new file mode 100644
index 0000000000..56544786ab
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewTimeline.cpp
@@ -0,0 +1,36 @@
+/*
+ * 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 "TrackViewTimeline.h"
+
+// Editor
+#include "AnimationContext.h"
+
+namespace TrackView
+{
+    void CTrackViewTimelineWidget::mousePressEvent(QMouseEvent* event)
+    {
+        m_stashedRecordModeWhileTimeDragging = GetIEditor()->GetAnimation()->IsRecordMode();
+        GetIEditor()->GetAnimation()->SetRecording(false);  // disable recording while dragging time
+
+        TimelineWidget::mousePressEvent(event);
+    }
+
+    void CTrackViewTimelineWidget::mouseReleaseEvent(QMouseEvent* event)
+    {
+        TimelineWidget::mouseReleaseEvent(event);
+    
+        if (m_stashedRecordModeWhileTimeDragging)
+        {
+            GetIEditor()->GetAnimation()->SetRecording(true);   // restore recording
+            m_stashedRecordModeWhileTimeDragging = false;       // reset stash
+        }
+    }
+} // namespace TrackView
diff --git a/Code/Editor/TrackView/TrackViewTimeline.h b/Code/Editor/TrackView/TrackViewTimeline.h
new file mode 100644
index 0000000000..30e985996f
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewTimeline.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include "Controls/TimelineCtrl.h"
+
+namespace TrackView
+{
+    /** A customized timeline widget for CTrackViewGraph.
+    */
+    class CTrackViewTimelineWidget
+        : public TimelineWidget
+    {
+    public:
+
+        CTrackViewTimelineWidget(QWidget* parent = nullptr)
+            : TimelineWidget(parent)
+            , m_stashedRecordModeWhileTimeDragging(false) {};
+        virtual ~CTrackViewTimelineWidget() = default;
+
+    protected:
+        void mousePressEvent(QMouseEvent* event) override;
+        void mouseReleaseEvent(QMouseEvent* event) override;
+
+    private:
+        bool m_stashedRecordModeWhileTimeDragging;
+    };
+} // namespace TrackView
diff --git a/Code/Editor/TrackView/TrackViewTrack.cpp b/Code/Editor/TrackView/TrackViewTrack.cpp
new file mode 100644
index 0000000000..e95e64b840
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewTrack.cpp
@@ -0,0 +1,829 @@
+/*
+ * 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 "TrackViewTrack.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimParamType.h>
+
+// Editor
+#include "TrackViewSequence.h"
+#include "TrackViewNodeFactories.h"
+#include "TrackViewUndo.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrackBundle::AppendTrack(CTrackViewTrack* pTrack)
+{
+    // Check if newly added key has different type than existing ones
+    if (m_bAllOfSameType && m_tracks.size() > 0)
+    {
+        const CTrackViewTrack* pLastTrack = m_tracks.back();
+
+        if (pTrack->GetParameterType() != pLastTrack->GetParameterType()
+            || pTrack->GetCurveType() != pLastTrack->GetCurveType()
+            || pTrack->GetValueType() != pLastTrack->GetValueType())
+        {
+            m_bAllOfSameType = false;
+        }
+    }
+
+    stl::push_back_unique(m_tracks, pTrack);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrackBundle::AppendTrackBundle(const CTrackViewTrackBundle& bundle)
+{
+    for (auto iter = bundle.m_tracks.begin(); iter != bundle.m_tracks.end(); ++iter)
+    {
+        AppendTrack(*iter);
+    }
+}
+
+bool CTrackViewTrackBundle::RemoveTrack(CTrackViewTrack* trackToRemove)
+{
+    return stl::find_and_erase(m_tracks, trackToRemove);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrack::CTrackViewTrack(IAnimTrack* pTrack, CTrackViewAnimNode* pTrackAnimNode,
+    CTrackViewNode* pParentNode, bool bIsSubTrack, unsigned int subTrackIndex)
+    : CTrackViewNode(pParentNode)
+    , m_pAnimTrack(pTrack)
+    , m_pTrackAnimNode(pTrackAnimNode)
+    , m_bIsSubTrack(bIsSubTrack)
+    , m_subTrackIndex(subTrackIndex)
+{
+    // Search for child tracks
+    const unsigned int subTrackCount = m_pAnimTrack->GetSubTrackCount();
+    for (unsigned int subTrackI = 0; subTrackI < subTrackCount; ++subTrackI)
+    {
+        IAnimTrack* pSubTrack = m_pAnimTrack->GetSubTrack(subTrackI);
+
+        CTrackViewTrackFactory trackFactory;
+        CTrackViewTrack* pNewTVTrack = trackFactory.BuildTrack(pSubTrack, pTrackAnimNode, this, true, subTrackI);
+        m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNewTVTrack));
+    }
+
+    m_bIsCompoundTrack = subTrackCount > 0;
+
+    // Connect bus to listen for OnStart/StopPlayInEditor events
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
+}
+
+CTrackViewTrack::~CTrackViewTrack()
+{
+    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewAnimNode* CTrackViewTrack::GetAnimNode() const
+{
+    return m_pTrackAnimNode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewTrack::SnapTimeToPrevKey(float& time) const
+{
+    CTrackViewKeyHandle prevKey = const_cast<CTrackViewTrack*>(this)->GetPrevKey(time);
+
+    if (prevKey.IsValid())
+    {
+        time = prevKey.GetTime();
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewTrack::SnapTimeToNextKey(float& time) const
+{
+    CTrackViewKeyHandle prevKey = const_cast<CTrackViewTrack*>(this)->GetNextKey(time);
+
+    if (prevKey.IsValid())
+    {
+        time = prevKey.GetTime();
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SetExpanded(bool expanded)
+{
+    if (m_pAnimTrack)
+    {
+        CTrackViewSequence* sequence = GetSequence();
+        if (nullptr != sequence)
+        {
+            if (GetExpanded() != expanded)
+            {
+                m_pAnimTrack->SetExpanded(expanded);
+
+                if (expanded)
+                {
+                    sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Expanded);
+                }
+                else
+                {
+                    sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Collapsed);
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewTrack::GetExpanded() const
+{
+    return (m_pAnimTrack) ? m_pAnimTrack->GetExpanded() : false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewTrack::GetPrevKey(const float time)
+{
+    CTrackViewKeyHandle keyHandle;
+
+#ifdef max
+#undef max
+#endif
+
+    const float startTime = time;
+    float closestTime = -std::numeric_limits<float>::max();
+
+    const int numKeys = m_pAnimTrack->GetNumKeys();
+    for (int i = 0; i < numKeys; ++i)
+    {
+        const float keyTime = m_pAnimTrack->GetKeyTime(i);
+        if (keyTime < startTime && keyTime > closestTime)
+        {
+            keyHandle = CTrackViewKeyHandle(this, i);
+            closestTime = keyTime;
+        }
+    }
+
+    return keyHandle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewTrack::GetNextKey(const float time)
+{
+    CTrackViewKeyHandle keyHandle;
+
+    const float startTime = time;
+    float closestTime = std::numeric_limits<float>::max();
+
+    const int numKeys = m_pAnimTrack->GetNumKeys();
+    for (int i = 0; i < numKeys; ++i)
+    {
+        const float keyTime = m_pAnimTrack->GetKeyTime(i);
+        if (keyTime > startTime && keyTime < closestTime)
+        {
+            keyHandle = CTrackViewKeyHandle(this, i);
+            closestTime = keyTime;
+        }
+    }
+
+    return keyHandle;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyBundle CTrackViewTrack::GetSelectedKeys()
+{
+    CTrackViewKeyBundle bundle;
+
+    if (m_bIsCompoundTrack)
+    {
+        for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+        {
+            bundle.AppendKeyBundle((*iter)->GetSelectedKeys());
+        }
+    }
+    else
+    {
+        bundle = GetKeys(true, -std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyBundle CTrackViewTrack::GetAllKeys()
+{
+    CTrackViewKeyBundle bundle;
+
+    if (m_bIsCompoundTrack)
+    {
+        for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+        {
+            bundle.AppendKeyBundle((*iter)->GetAllKeys());
+        }
+    }
+    else
+    {
+        bundle = GetKeys(false, -std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyBundle CTrackViewTrack::GetKeysInTimeRange(const float t0, const float t1)
+{
+    CTrackViewKeyBundle bundle;
+
+    if (m_bIsCompoundTrack)
+    {
+        for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
+        {
+            bundle.AppendKeyBundle((*iter)->GetKeysInTimeRange(t0, t1));
+        }
+    }
+    else
+    {
+        bundle = GetKeys(false, t0, t1);
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyBundle CTrackViewTrack::GetKeys(const bool bOnlySelected, const float t0, const float t1)
+{
+    CTrackViewKeyBundle bundle;
+
+    const int keyCount = m_pAnimTrack->GetNumKeys();
+    for (int keyIndex = 0; keyIndex < keyCount; ++keyIndex)
+    {
+        const float keyTime = m_pAnimTrack->GetKeyTime(keyIndex);
+        const bool timeRangeOk = (t0 <= keyTime && keyTime <= t1);
+
+        if ((!bOnlySelected || IsKeySelected(keyIndex)) && timeRangeOk)
+        {
+            CTrackViewKeyHandle keyHandle(this, keyIndex);
+            bundle.AppendKey(keyHandle);
+        }
+    }
+
+    return bundle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewTrack::CreateKey(const float time)
+{
+    const int keyIndex = m_pAnimTrack->CreateKey(time);
+    GetSequence()->OnKeysChanged();
+    CTrackViewKeyHandle createdKeyHandle(this, keyIndex);
+    GetSequence()->OnKeyAdded(createdKeyHandle);
+
+    return createdKeyHandle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SlideKeys(const float time0, const float timeOffset)
+{
+    for (int i = 0; i < m_pAnimTrack->GetNumKeys(); ++i)
+    {
+        float keyTime = m_pAnimTrack->GetKeyTime(i);
+        if (keyTime >= time0)
+        {
+            m_pAnimTrack->SetKeyTime(i, keyTime + timeOffset);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::OffsetKeyPosition(const Vec3& offset)
+{
+    // Use the CUndoComponentEntityTrackObject here and not the AZ Undo system because
+    // the Editor movement system uses CUndo as part of its move function (canceling last frame of undo whilst dragging).
+    CUndo::Record(new CUndoComponentEntityTrackObject(this));
+    m_pAnimTrack->OffsetKeyPosition(offset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM)
+{
+    AZStd::unique_ptr<AzToolsFramework::ScopedUndoBatch> undoBatch;
+
+    if (!AzToolsFramework::UndoRedoOperationInProgress())
+    {
+        undoBatch = AZStd::make_unique<AzToolsFramework::ScopedUndoBatch>("Update Key Data After Parent Changed");
+    }
+
+    m_pAnimTrack->UpdateKeyDataAfterParentChanged(oldParentWorldTM, newParentWorldTM);
+
+    if (undoBatch.get())
+    {
+        undoBatch->MarkEntityDirty(GetSequence()->GetSequenceComponentEntityId());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewTrack::GetKey(unsigned int index)
+{
+    if (index < GetKeyCount())
+    {
+        return CTrackViewKeyHandle(this, index);
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyConstHandle CTrackViewTrack::GetKey(unsigned int index) const
+{
+    if (index < GetKeyCount())
+    {
+        return CTrackViewKeyConstHandle(this, index);
+    }
+
+    return CTrackViewKeyConstHandle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewTrack::GetKeyByTime(const float time)
+{
+    if (m_bIsCompoundTrack)
+    {
+        // Search key in sub tracks
+        unsigned int currentIndex = 0;
+
+        unsigned int childCount = GetChildCount();
+        for (unsigned int i = 0; i < childCount; ++i)
+        {
+            CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(GetChild(i));
+
+            int keyIndex = pChildTrack->m_pAnimTrack->FindKey(time);
+            if (keyIndex >= 0)
+            {
+                return CTrackViewKeyHandle(this, currentIndex + keyIndex);
+            }
+
+            currentIndex += pChildTrack->GetKeyCount();
+        }
+    }
+
+    int keyIndex = m_pAnimTrack->FindKey(time);
+
+    if (keyIndex < 0)
+    {
+        return CTrackViewKeyHandle();
+    }
+
+    return CTrackViewKeyHandle(this, keyIndex);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewTrack::GetNearestKeyByTime(const float time)
+{
+    int minDelta = std::numeric_limits<int>::max();
+
+    const unsigned int keyCount = GetKeyCount();
+    for (unsigned int i = 0; i < keyCount; ++i)
+    {
+        CTrackViewKeyHandle keyHandle = GetKey(i);
+
+        const int deltaT = abs((int)keyHandle.GetTime() - (int)time);
+
+        // If deltaT got larger since last key, then the last key
+        // was the key with minimum temporal distance to the given time
+        if (deltaT > minDelta)
+        {
+            return CTrackViewKeyHandle(this, i - 1);
+        }
+
+        minDelta = std::min(minDelta, deltaT);
+    }
+
+    // If we didn't return above and there are keys, then the
+    // last key needs to be the one with minimum distance
+    if (keyCount > 0)
+    {
+        return CTrackViewKeyHandle(this, keyCount - 1);
+    }
+
+    // No keys
+    return CTrackViewKeyHandle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::GetKeyValueRange(float& min, float& max) const
+{
+    m_pAnimTrack->GetKeyValueRange(min, max);
+}
+
+//////////////////////////////////////////////////////////////////////////
+ColorB CTrackViewTrack::GetCustomColor() const
+{
+    return m_pAnimTrack->GetCustomColor();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SetCustomColor(ColorB color)
+{
+    m_pAnimTrack->SetCustomColor(color);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewTrack::HasCustomColor() const
+{
+    return m_pAnimTrack->HasCustomColor();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::ClearCustomColor()
+{
+    m_pAnimTrack->ClearCustomColor();
+}
+
+//////////////////////////////////////////////////////////////////////////
+IAnimTrack::EAnimTrackFlags CTrackViewTrack::GetFlags() const
+{
+    return (IAnimTrack::EAnimTrackFlags)m_pAnimTrack->GetFlags();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrackMemento CTrackViewTrack::GetMemento() const
+{
+    CTrackViewTrackMemento memento;
+    memento.m_serializedTrackState = XmlHelpers::CreateXmlNode("TrackState");
+    m_pAnimTrack->Serialize(memento.m_serializedTrackState, false);
+    return memento;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::RestoreFromMemento(const CTrackViewTrackMemento& memento)
+{
+    // We're going to de-serialize, so this is const safe
+    XmlNodeRef& xmlNode = const_cast<XmlNodeRef&>(memento.m_serializedTrackState);
+    m_pAnimTrack->Serialize(xmlNode, true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CTrackViewTrack::GetName() const
+{
+    CTrackViewNode* pParentNode = GetParentNode();
+
+    if (pParentNode->GetNodeType() == eTVNT_Track)
+    {
+        CTrackViewTrack* pParentTrack = static_cast<CTrackViewTrack*>(pParentNode);
+        return pParentTrack->m_pAnimTrack->GetSubTrackName(m_subTrackIndex);
+    }
+
+    return GetAnimNode()->GetParamName(GetParameterType());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SetDisabled(bool bDisabled)
+{
+    if (bDisabled)
+    {
+        m_pAnimTrack->SetFlags(m_pAnimTrack->GetFlags() | IAnimTrack::eAnimTrackFlags_Disabled);
+        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Disabled);
+    }
+    else
+    {
+        m_pAnimTrack->SetFlags(m_pAnimTrack->GetFlags() & ~IAnimTrack::eAnimTrackFlags_Disabled);
+        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Enabled);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewTrack::IsDisabled() const
+{
+    return m_pAnimTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SetMuted(bool bMuted)
+{
+    if (UsesMute())
+    {
+        if (bMuted)
+        {
+            m_pAnimTrack->SetFlags(m_pAnimTrack->GetFlags() | IAnimTrack::eAnimTrackFlags_Muted);
+            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Muted);
+        }
+        else
+        {
+            m_pAnimTrack->SetFlags(m_pAnimTrack->GetFlags() & ~IAnimTrack::eAnimTrackFlags_Muted);
+            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Unmuted);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Returns whether the track is muted, or false if the track does not use muting
+bool CTrackViewTrack::IsMuted() const
+{
+    return m_pAnimTrack->UsesMute() ? (m_pAnimTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Muted) : false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SetKey(unsigned int keyIndex, IKey* pKey)
+{
+    m_pAnimTrack->SetKey(keyIndex, pKey);
+    m_pTrackAnimNode->GetSequence()->OnKeysChanged();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::GetKey(unsigned int keyIndex, IKey* pKey) const
+{
+    m_pAnimTrack->GetKey(keyIndex, pKey);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SelectKey(unsigned int keyIndex, bool bSelect)
+{
+    const bool bWasSelected = m_pAnimTrack->IsKeySelected(keyIndex);
+
+    m_pAnimTrack->SelectKey(keyIndex, bSelect);
+
+    if (bSelect != bWasSelected)
+    {
+        m_pTrackAnimNode->GetSequence()->OnKeySelectionChanged();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SetKeyTime(const int index, const float time, bool notifyListeners)
+{
+    const float bOldTime = m_pAnimTrack->GetKeyTime(index);
+
+    m_pAnimTrack->SetKeyTime(index, time);
+
+    if (notifyListeners && (bOldTime != time))
+    {
+        // The keys were just make invalid by the above SetKeyTime(), so sort them now
+        // to make sure they are ready to be used. Only do this when notifyListeners
+        // is set so client callers can batch up a bunch of SetKeyTime calls if desired.
+        m_pAnimTrack->SortKeys();
+
+        m_pTrackAnimNode->GetSequence()->OnKeysChanged();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CTrackViewTrack::GetKeyTime(const int index) const
+{
+    return m_pAnimTrack->GetKeyTime(index);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::RemoveKey(const int index)
+{
+    m_pAnimTrack->RemoveKey(index);
+    m_pTrackAnimNode->GetSequence()->OnKeysChanged();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewTrack::CloneKey(const int index)
+{
+    int newIndex = m_pAnimTrack->CloneKey(index);
+    m_pTrackAnimNode->GetSequence()->OnKeysChanged();
+    return newIndex;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SelectKeys(const bool bSelected)
+{
+    m_pTrackAnimNode->GetSequence()->QueueNotifications();
+
+    if (!m_bIsCompoundTrack)
+    {
+        unsigned int keyCount = GetKeyCount();
+        for (unsigned int i = 0; i < keyCount; ++i)
+        {
+            m_pAnimTrack->SelectKey(i, bSelected);
+            m_pTrackAnimNode->GetSequence()->OnKeySelectionChanged();
+        }
+    }
+    else
+    {
+        // Affect sub tracks
+        unsigned int childCount = GetChildCount();
+        for (unsigned int childIndex = 0; childIndex < childCount; ++childIndex)
+        {
+            CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(GetChild(childIndex));
+            pChildTrack->SelectKeys(bSelected);
+            m_pTrackAnimNode->GetSequence()->OnKeySelectionChanged();
+        }
+    }
+
+    m_pTrackAnimNode->GetSequence()->SubmitPendingNotifcations();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewTrack::IsKeySelected(unsigned int keyIndex) const
+{
+    if (m_pAnimTrack)
+    {
+        return m_pAnimTrack->IsKeySelected(keyIndex);
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SetSortMarkerKey(unsigned int keyIndex, bool enabled)
+{
+    if (m_pAnimTrack)
+    {
+        return m_pAnimTrack->SetSortMarkerKey(keyIndex, enabled);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CTrackViewTrack::IsSortMarkerKey(unsigned int keyIndex) const
+{
+    if (m_pAnimTrack)
+    {
+        return m_pAnimTrack->IsSortMarkerKey(keyIndex);
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewKeyHandle CTrackViewTrack::GetSubTrackKeyHandle(unsigned int index) const
+{
+    // Return handle to sub track key
+    unsigned int childCount = GetChildCount();
+    for (unsigned int childIndex = 0; childIndex < childCount; ++childIndex)
+    {
+        CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(GetChild(childIndex));
+
+        const unsigned int childKeyCount = pChildTrack->GetKeyCount();
+        if (index < childKeyCount)
+        {
+            return pChildTrack->GetKey(index);
+        }
+
+        index -= childKeyCount;
+    }
+
+    return CTrackViewKeyHandle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::SetAnimationLayerIndex(const int index)
+{
+    if (m_pAnimTrack)
+    {
+        m_pAnimTrack->SetAnimationLayerIndex(index);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewTrack::GetAnimationLayerIndex() const
+{
+    return m_pAnimTrack->GetAnimationLayerIndex();
+}
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::OnStartPlayInEditor()
+{
+    // remap any AZ::EntityId's used in tracks
+    if (m_pAnimTrack)
+    {
+        // OnStopPlayInEditor clears this as well, but we clear it here in case OnStartPlayInEditor() is called multiple times before OnStopPlayInEditor()
+        m_paramTypeToStashedEntityIdMap.clear();
+
+        CAnimParamType trackParamType = m_pAnimTrack->GetParameterType();
+        const AnimParamType paramType = trackParamType.GetType();
+        if (paramType == AnimParamType::Camera || paramType == AnimParamType::Sequence)
+        {
+            ISelectKey selectKey;
+            ISequenceKey sequenceKey;
+            IKey* key = nullptr;
+
+            for (int i = 0; i < m_pAnimTrack->GetNumKeys(); i++)
+            {
+                AZ::EntityId entityIdToRemap;
+
+                if (paramType == AnimParamType::Camera)
+                {
+                    m_pAnimTrack->GetKey(i, &selectKey);
+                    entityIdToRemap = selectKey.cameraAzEntityId;
+                    key = &selectKey;
+                }
+                else if (paramType == AnimParamType::Sequence)
+                {
+                    m_pAnimTrack->GetKey(i, &sequenceKey);
+                    entityIdToRemap = sequenceKey.sequenceEntityId;    
+                    key = &sequenceKey;
+                }
+
+                // stash the entity Id for restore in OnStopPlayInEditor
+                m_paramTypeToStashedEntityIdMap[trackParamType].push_back(entityIdToRemap);
+
+                if (entityIdToRemap.IsValid())
+                {
+                    AZ::EntityId remappedId;
+                    AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId, entityIdToRemap, remappedId);
+
+                    // remap
+                    if (paramType == AnimParamType::Camera)
+                    {
+                        selectKey.cameraAzEntityId = remappedId;
+                    }
+                    else if (paramType == AnimParamType::Sequence)
+                    {
+                        sequenceKey.sequenceEntityId = remappedId;
+                    }
+                    m_pAnimTrack->SetKey(i, key);
+                }                
+            }
+        }
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::OnStopPlayInEditor()
+{
+    // restore any AZ::EntityId's remapped in OnStartPlayInEditor
+    if (m_pAnimTrack && m_paramTypeToStashedEntityIdMap.size())
+    {
+        CAnimParamType trackParamType = m_pAnimTrack->GetParameterType();
+        const AnimParamType paramType = trackParamType.GetType();
+
+        if (paramType == AnimParamType::Camera || paramType == AnimParamType::Sequence)
+        {
+            for (int i = 0; i < m_pAnimTrack->GetNumKeys(); i++)
+            {
+                ISelectKey selectKey;
+                ISequenceKey sequenceKey;
+                IKey* key = nullptr;
+
+                // restore entityIds
+                if (paramType == AnimParamType::Camera)
+                {
+                    m_pAnimTrack->GetKey(i, &selectKey);
+                    selectKey.cameraAzEntityId = m_paramTypeToStashedEntityIdMap[trackParamType][i];
+                    key = &selectKey;
+                }
+                else if (paramType == AnimParamType::Sequence)
+                {
+                    m_pAnimTrack->GetKey(i, &sequenceKey);
+                    sequenceKey.sequenceEntityId = m_paramTypeToStashedEntityIdMap[trackParamType][i];
+                    key = &sequenceKey;
+                }
+                m_pAnimTrack->SetKey(i, key);
+            }
+        }
+        // clear the StashedEntityIdMap now that we've consumed it
+        m_paramTypeToStashedEntityIdMap.clear();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks)
+{
+    if (bOnlyFromSelectedTracks && !IsSelected())
+    {
+        return;
+    }
+
+    if (GetKeyCount() == 0)
+    {
+        return;
+    }
+
+    if (bOnlySelectedKeys)
+    {
+        CTrackViewKeyBundle keyBundle = GetSelectedKeys();
+        if (keyBundle.GetKeyCount() == 0)
+        {
+            return;
+        }
+    }
+
+    XmlNodeRef childNode = xmlNode->newChild("Track");
+    childNode->setAttr("name", GetName());
+    GetParameterType().SaveToXml(childNode);
+    childNode->setAttr("valueType", static_cast<int>(GetValueType()));
+
+    m_pAnimTrack->SerializeSelection(childNode, false, bOnlySelectedKeys);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewTrack::PasteKeys(XmlNodeRef xmlNode, const float timeOffset)
+{
+
+    CTrackViewSequence* sequence = GetSequence();
+    AZ_Assert(sequence, "Expected sequence not to be null.");
+
+    AzToolsFramework::ScopedUndoBatch undoBatch("Paste Keys");
+    m_pAnimTrack->SerializeSelection(xmlNode, true, true, timeOffset);
+    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
+}
diff --git a/Code/Editor/TrackView/TrackViewTrack.h b/Code/Editor/TrackView/TrackViewTrack.h
new file mode 100644
index 0000000000..d2045c2ccb
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewTrack.h
@@ -0,0 +1,237 @@
+/*
+ * 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_TRACKVIEW_TRACKVIEWTRACK_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWTRACK_H
+#pragma once
+
+#include "IMovieSystem.h"
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+
+#include "TrackViewNode.h"
+
+class CTrackViewAnimNode;
+enum class AnimValueType;
+
+// Represents a bundle of tracks
+class CTrackViewTrackBundle
+{
+public:
+    CTrackViewTrackBundle()
+        : m_bAllOfSameType(true)
+        , m_bHasRotationTrack(false) {}
+
+    unsigned int GetCount() const { return m_tracks.size(); }
+    CTrackViewTrack* GetTrack(const unsigned int index) { return m_tracks[index]; }
+    const CTrackViewTrack* GetTrack(const unsigned int index) const { return m_tracks[index]; }
+
+    void AppendTrack(CTrackViewTrack* pTrack);
+    void AppendTrackBundle(const CTrackViewTrackBundle& bundle);
+
+    bool RemoveTrack(CTrackViewTrack* pTrackToRemove);
+
+    bool IsOneTrack() const;
+    bool AreAllOfSameType() const { return m_bAllOfSameType; }
+    bool HasRotationTrack() const { return m_bHasRotationTrack; }
+
+private:
+    bool m_bAllOfSameType;
+    bool m_bHasRotationTrack;
+    std::vector<CTrackViewTrack*> m_tracks;
+};
+
+// Track Memento for Undo/Redo
+class CTrackViewTrackMemento
+{
+private:
+    friend class CTrackViewTrack;
+    XmlNodeRef m_serializedTrackState;
+};
+
+////////////////////////////////////////////////////////////////////////////
+//
+// This class represents a IAnimTrack in TrackView and contains
+// the editor side code for changing it
+//
+// It does *not* have ownership of the IAnimTrack, therefore deleting it
+// will not destroy the CryMovie track
+//
+////////////////////////////////////////////////////////////////////////////
+class CTrackViewTrack
+    : public CTrackViewNode
+    , public ITrackViewKeyBundle
+    , public AzToolsFramework::EditorEntityContextNotificationBus::Handler
+{
+    friend class CTrackViewKeyHandle;
+    friend class CTrackViewKeyConstHandle;
+    friend class CTrackViewKeyBundle;
+
+public:
+    CTrackViewTrack(IAnimTrack* pTrack, CTrackViewAnimNode* pTrackAnimNode, CTrackViewNode* pParentNode,
+        bool bIsSubTrack = false, unsigned int subTrackIndex = 0);
+    ~CTrackViewTrack();
+
+    CTrackViewAnimNode* GetAnimNode() const;
+
+    // Name getter
+    virtual const char* GetName() const;
+
+    // CTrackViewNode
+    virtual ETrackViewNodeType GetNodeType() const override { return eTVNT_Track; }
+
+    // Check for compound/sub track
+    bool IsCompoundTrack() const { return m_bIsCompoundTrack; }
+
+    // Sub track index
+    bool IsSubTrack() const { return m_bIsSubTrack; }
+    unsigned int GetSubTrackIndex() const { return m_subTrackIndex; }
+
+    // Snap time value to prev/next key in track
+    virtual bool SnapTimeToPrevKey(float& time) const override;
+    virtual bool SnapTimeToNextKey(float& time) const override;
+
+    // Expanded state interface
+    void SetExpanded(bool expanded) override;
+    bool GetExpanded() const override;
+
+    // Key getters
+    virtual unsigned int GetKeyCount() const override { return m_pAnimTrack->GetNumKeys(); }
+    virtual CTrackViewKeyHandle GetKey(unsigned int index) override;
+    virtual CTrackViewKeyConstHandle GetKey(unsigned int index) const;
+
+    virtual CTrackViewKeyHandle GetKeyByTime(const float time);
+    virtual CTrackViewKeyHandle GetNearestKeyByTime(const float time);
+
+    virtual CTrackViewKeyBundle GetSelectedKeys() override;
+    virtual CTrackViewKeyBundle GetAllKeys() override;
+    virtual CTrackViewKeyBundle GetKeysInTimeRange(const float t0, const float t1) override;
+
+    // Key modifications
+    virtual CTrackViewKeyHandle CreateKey(const float time);
+    virtual void SlideKeys(const float time0, const float timeOffset);
+    void OffsetKeyPosition(const Vec3& offset);
+    void UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM);
+
+    // Value getters
+    template <class Type>
+    void GetValue(const float time, Type& value, bool applyMultiplier) const
+    {
+        assert (m_pAnimTrack.get());
+        return m_pAnimTrack->GetValue(time, value, applyMultiplier);
+    }
+    template <class Type>
+    void GetValue(const float time, Type& value) const
+    {
+        assert(m_pAnimTrack.get());
+        return m_pAnimTrack->GetValue(time, value);
+    }
+
+    void GetKeyValueRange(float& min, float& max) const;
+
+    // Type getters
+    const CAnimParamType& GetParameterType() const { return m_pAnimTrack->GetParameterType(); }
+    AnimValueType GetValueType() const { return m_pAnimTrack->GetValueType(); }
+    EAnimCurveType GetCurveType() const { return m_pAnimTrack->GetCurveType(); }
+
+    // Mask
+    bool IsMasked(uint32 mask) const { return m_pAnimTrack->IsMasked(mask); }
+
+    // Flag getter
+    IAnimTrack::EAnimTrackFlags GetFlags() const;
+
+    // Spline getter
+    ISplineInterpolator* GetSpline() const { return m_pAnimTrack->GetSpline(); }
+
+    // Color
+    ColorB GetCustomColor() const;
+    void SetCustomColor(ColorB color);
+    bool HasCustomColor() const;
+    void ClearCustomColor();
+
+    // Memento
+    virtual CTrackViewTrackMemento GetMemento() const;
+    virtual void RestoreFromMemento(const CTrackViewTrackMemento& memento);
+
+    // Disabled state
+    virtual void SetDisabled(bool bDisabled) override;
+    virtual bool IsDisabled() const override;
+
+    // Muted state
+    void SetMuted(bool bMuted);
+    bool IsMuted() const;
+
+    // Returns if the contained AnimTrack responds to muting
+    bool UsesMute() const { return m_pAnimTrack.get() ? m_pAnimTrack->UsesMute() : false; }
+
+    // Key selection
+    virtual void SelectKeys(const bool bSelected) override;
+
+    // Paste from XML representation with time offset
+    void PasteKeys(XmlNodeRef xmlNode, const float timeOffset);
+
+    // Key types
+    virtual bool AreAllKeysOfSameType() const override { return true; }
+
+    // Animation layer index
+    void SetAnimationLayerIndex(const int index);
+    int GetAnimationLayerIndex() const;
+
+    //////////////////////////////////////////////////////////////////////////
+    // AzToolsFramework::EditorEntityContextNotificationBus implementation
+    void OnStartPlayInEditor() override;
+    void OnStopPlayInEditor() override;
+    //~AzToolsFramework::EditorEntityContextNotificationBus implementation
+
+    IAnimTrack* GetAnimTrack() const { return m_pAnimTrack.get(); }
+
+    unsigned int GetId() const
+    {
+        return m_pAnimTrack->GetId();
+    }
+
+    void SetId(unsigned int id)
+    {
+        m_pAnimTrack->SetId(id);
+    }
+
+private:
+    CTrackViewKeyHandle GetPrevKey(const float time);
+    CTrackViewKeyHandle GetNextKey(const float time);
+
+    // Those are called from CTrackViewKeyHandle
+    void SetKey(unsigned int keyIndex, IKey* pKey);
+    void GetKey(unsigned int keyIndex, IKey* pKey) const;
+
+    void SelectKey(unsigned int keyIndex, bool bSelect);
+    bool IsKeySelected(unsigned int keyIndex) const;
+
+    void SetSortMarkerKey(unsigned int keyIndex, bool enabled);
+    bool IsSortMarkerKey(unsigned int keyIndex) const;
+
+    void SetKeyTime(const int index, const float time, bool notifyListeners = true);
+    float GetKeyTime(const int index) const;
+
+    void RemoveKey(const int index);
+    int CloneKey(const int index);
+
+    CTrackViewKeyBundle GetKeys(bool bOnlySelected, float t0, float t1);
+    CTrackViewKeyHandle GetSubTrackKeyHandle(unsigned int index) const;
+
+    // Copy selected keys to XML representation for clipboard
+    virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) override;
+
+    bool m_bIsCompoundTrack;
+    bool m_bIsSubTrack;
+    unsigned int m_subTrackIndex;
+    AZStd::intrusive_ptr<IAnimTrack> m_pAnimTrack;
+    CTrackViewAnimNode* m_pTrackAnimNode;
+
+    // used to stash AZ Entity ID's stored in track keys when entering/exiting AI/Physic or Ctrl-G game modes
+    AZStd::unordered_map<CAnimParamType, AZStd::vector<AZ::EntityId>> m_paramTypeToStashedEntityIdMap;  
+};
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWTRACK_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTrackPropsDlg.ui b/Code/Editor/TrackView/TrackViewTrackPropsDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewTrackPropsDlg.ui
rename to Code/Editor/TrackView/TrackViewTrackPropsDlg.ui
diff --git a/Code/Editor/TrackView/TrackViewUndo.cpp b/Code/Editor/TrackView/TrackViewUndo.cpp
new file mode 100644
index 0000000000..5f1e39ff6a
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewUndo.cpp
@@ -0,0 +1,138 @@
+/*
+ * 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 "TrackViewUndo.h"
+
+// CryCommon
+#include <CryCommon/Maestro/Types/AnimNodeType.h>
+
+// Editor
+#include "TrackView/TrackViewAnimNode.h"
+#include "TrackView/TrackViewSequence.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+CUndoComponentEntityTrackObject::CUndoComponentEntityTrackObject(CTrackViewTrack* track)
+{
+    AZ_Assert(track, "Expected a valid track");
+    if (track)
+    {
+        m_trackName = track->GetName();
+        AZ_Assert(!m_trackName.empty(), "Expected a valid track name");
+
+        CTrackViewAnimNode* animNode = track->GetAnimNode();
+        AZ_Assert(animNode, "Expected a valid anim node");
+        if (animNode)
+        {
+            m_trackComponentId = animNode->GetComponentId();
+            AZ_Assert(m_trackComponentId != AZ::InvalidComponentId, "Expected a valid track component id");
+
+            CTrackViewSequence* sequence = track->GetSequence();
+            AZ_Assert(sequence, "Expected to find the sequence");
+            if (sequence)
+            {
+                m_sequenceId = sequence->GetSequenceComponentEntityId();
+                AZ_Assert(m_sequenceId.IsValid(), "Expected a valid sequence id");
+
+                AnimNodeType nodeType = animNode->GetType();
+                AZ_Assert(nodeType == AnimNodeType::Component, "Expected a this node to be a AnimNodeType::Component type");
+                if (nodeType == AnimNodeType::Component)
+                {
+                    CTrackViewAnimNode* parentAnimNode = static_cast<CTrackViewAnimNode*>(animNode->GetParentNode());
+                    AZ_Assert(parentAnimNode, "Expected a valid parent node");
+                    if (parentAnimNode)
+                    {
+                        m_entityId = parentAnimNode->GetAzEntityId();
+                        AZ_Assert(m_entityId.IsValid(), "Expected a valid sequence id");
+
+                        // Store undo info.
+                        m_undo = track->GetMemento();
+                    }
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewTrack* CUndoComponentEntityTrackObject::FindTrack(CTrackViewSequence* sequence)
+{
+    AZ_Assert(sequence, "Expected to find the sequence");
+
+    CTrackViewTrack* track = nullptr;
+    CTrackViewTrackBundle allTracks = sequence->GetAllTracks();
+    for (int trackIndex = 0; trackIndex < allTracks.GetCount(); trackIndex++)
+    {
+        CTrackViewTrack* curTrack = allTracks.GetTrack(trackIndex);
+        if (curTrack->GetAnimNode() && curTrack->GetAnimNode()->GetComponentId() == m_trackComponentId)
+        {
+            if (0 == azstricmp(curTrack->GetName(), m_trackName.c_str()))
+            {
+                CTrackViewAnimNode* parentAnimNode = static_cast<CTrackViewAnimNode*>(curTrack->GetAnimNode()->GetParentNode());
+                if (parentAnimNode && parentAnimNode->GetAzEntityId() == m_entityId)
+                {
+                    track = curTrack;
+                    break;
+                }
+            }
+        }
+    }
+    return track;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoComponentEntityTrackObject::Undo(bool bUndo)
+{
+    CTrackViewSequence* sequence = CTrackViewSequence::LookUpSequenceByEntityId(m_sequenceId);
+    AZ_Assert(sequence, "Expected to find the sequence");
+    if (sequence)
+    {
+        CTrackViewTrack* track = FindTrack(sequence);
+        AZ_Assert(track, "Expected to find track");
+        {
+            CTrackViewSequenceNoNotificationContext context(sequence);
+
+            if (bUndo)
+            {
+                m_redo = track->GetMemento();
+            }
+
+            // Undo track state.
+            track->RestoreFromMemento(m_undo);
+        }
+
+        if (bUndo)
+        {
+            sequence->OnKeysChanged();
+        }
+        else
+        {
+            sequence->ForceAnimation();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoComponentEntityTrackObject::Redo()
+{
+    CTrackViewSequence* sequence = CTrackViewSequence::LookUpSequenceByEntityId(m_sequenceId);
+    AZ_Assert(sequence, "Expected to find the sequence");
+    if (sequence)
+    {
+        CTrackViewTrack* track = FindTrack(sequence);
+        AZ_Assert(track, "Expected to find track");
+
+        // Redo track state.
+        track->RestoreFromMemento(m_redo);
+
+        sequence->OnKeysChanged();
+    }
+}
diff --git a/Code/Editor/TrackView/TrackViewUndo.h b/Code/Editor/TrackView/TrackViewUndo.h
new file mode 100644
index 0000000000..f94436962c
--- /dev/null
+++ b/Code/Editor/TrackView/TrackViewUndo.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
+#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
+#pragma once
+
+#include "TrackViewTrack.h"
+
+#include "Undo/IUndoObject.h"
+
+class CTrackViewSequence;
+
+/** Undo object stored when track is modified for component entity.
+* Stores ids, not raw pointers.
+*/
+class CUndoComponentEntityTrackObject
+    : public IUndoObject
+{
+public:
+    CUndoComponentEntityTrackObject(CTrackViewTrack* track);
+
+protected:
+    virtual int GetSize() override { return sizeof(*this); }
+    virtual QString GetDescription() override { return "Undo Component Entity Track Modify"; };
+
+    virtual void Undo(bool bUndo) override;
+    virtual void Redo() override;
+
+private:
+
+    // Helper function to get a pointer to the track based.
+    CTrackViewTrack* FindTrack(CTrackViewSequence* sequence);
+
+    // Internal state are id's used to uniquely identify
+    // a track. This does not store pointers to tracks because
+    // those can change when an AZ::Undo event happens and the entity
+    // is reloaded.
+    AZ::EntityId m_sequenceId;
+    AZ::EntityId m_entityId;
+    AZStd::string m_trackName;
+    AZ::ComponentId m_trackComponentId;
+
+    CTrackViewTrackMemento m_undo;
+    CTrackViewTrackMemento m_redo;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
diff --git a/Code/Sandbox/Editor/TrackView/bmp00016_00.png b/Code/Editor/TrackView/bmp00016_00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/bmp00016_00.png
rename to Code/Editor/TrackView/bmp00016_00.png
diff --git a/Code/Sandbox/Editor/TrackView/bmp00016_01.png b/Code/Editor/TrackView/bmp00016_01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/bmp00016_01.png
rename to Code/Editor/TrackView/bmp00016_01.png
diff --git a/Code/Sandbox/Editor/TrackView/clapperboard_cancel.png b/Code/Editor/TrackView/clapperboard_cancel.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/clapperboard_cancel.png
rename to Code/Editor/TrackView/clapperboard_cancel.png
diff --git a/Code/Sandbox/Editor/TrackView/clapperboard_ready.png b/Code/Editor/TrackView/clapperboard_ready.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/clapperboard_ready.png
rename to Code/Editor/TrackView/clapperboard_ready.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_00.png b/Code/Editor/TrackView/spline_edit_bar_00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_00.png
rename to Code/Editor/TrackView/spline_edit_bar_00.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_01.png b/Code/Editor/TrackView/spline_edit_bar_01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_01.png
rename to Code/Editor/TrackView/spline_edit_bar_01.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_02.png b/Code/Editor/TrackView/spline_edit_bar_02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_02.png
rename to Code/Editor/TrackView/spline_edit_bar_02.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_03.png b/Code/Editor/TrackView/spline_edit_bar_03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_03.png
rename to Code/Editor/TrackView/spline_edit_bar_03.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_04.png b/Code/Editor/TrackView/spline_edit_bar_04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_04.png
rename to Code/Editor/TrackView/spline_edit_bar_04.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_05.png b/Code/Editor/TrackView/spline_edit_bar_05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_05.png
rename to Code/Editor/TrackView/spline_edit_bar_05.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_06.png b/Code/Editor/TrackView/spline_edit_bar_06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_06.png
rename to Code/Editor/TrackView/spline_edit_bar_06.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_07.png b/Code/Editor/TrackView/spline_edit_bar_07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_07.png
rename to Code/Editor/TrackView/spline_edit_bar_07.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_08.png b/Code/Editor/TrackView/spline_edit_bar_08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_08.png
rename to Code/Editor/TrackView/spline_edit_bar_08.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_09.png b/Code/Editor/TrackView/spline_edit_bar_09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_09.png
rename to Code/Editor/TrackView/spline_edit_bar_09.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_10.png b/Code/Editor/TrackView/spline_edit_bar_10.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_10.png
rename to Code/Editor/TrackView/spline_edit_bar_10.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_11.png b/Code/Editor/TrackView/spline_edit_bar_11.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_11.png
rename to Code/Editor/TrackView/spline_edit_bar_11.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_12.png b/Code/Editor/TrackView/spline_edit_bar_12.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_12.png
rename to Code/Editor/TrackView/spline_edit_bar_12.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_13.png b/Code/Editor/TrackView/spline_edit_bar_13.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_13.png
rename to Code/Editor/TrackView/spline_edit_bar_13.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_14.png b/Code/Editor/TrackView/spline_edit_bar_14.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_14.png
rename to Code/Editor/TrackView/spline_edit_bar_14.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_15.png b/Code/Editor/TrackView/spline_edit_bar_15.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_15.png
rename to Code/Editor/TrackView/spline_edit_bar_15.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_16.png b/Code/Editor/TrackView/spline_edit_bar_16.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_16.png
rename to Code/Editor/TrackView/spline_edit_bar_16.png
diff --git a/Code/Sandbox/Editor/TrackView/trackview_keys_00.png b/Code/Editor/TrackView/trackview_keys_00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/trackview_keys_00.png
rename to Code/Editor/TrackView/trackview_keys_00.png
diff --git a/Code/Sandbox/Editor/TrackView/trackview_keys_01.png b/Code/Editor/TrackView/trackview_keys_01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/trackview_keys_01.png
rename to Code/Editor/TrackView/trackview_keys_01.png
diff --git a/Code/Sandbox/Editor/TrackView/trackview_keys_02.png b/Code/Editor/TrackView/trackview_keys_02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/trackview_keys_02.png
rename to Code/Editor/TrackView/trackview_keys_02.png
diff --git a/Code/Sandbox/Editor/TrackView/trackview_keys_03.png b/Code/Editor/TrackView/trackview_keys_03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/trackview_keys_03.png
rename to Code/Editor/TrackView/trackview_keys_03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-00.png b/Code/Editor/TrackView/tvkeys-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-00.png
rename to Code/Editor/TrackView/tvkeys-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-01.png b/Code/Editor/TrackView/tvkeys-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-01.png
rename to Code/Editor/TrackView/tvkeys-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-02.png b/Code/Editor/TrackView/tvkeys-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-02.png
rename to Code/Editor/TrackView/tvkeys-02.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-03.png b/Code/Editor/TrackView/tvkeys-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-03.png
rename to Code/Editor/TrackView/tvkeys-03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-04.png b/Code/Editor/TrackView/tvkeys-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-04.png
rename to Code/Editor/TrackView/tvkeys-04.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-05.png b/Code/Editor/TrackView/tvkeys-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-05.png
rename to Code/Editor/TrackView/tvkeys-05.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-06.png b/Code/Editor/TrackView/tvkeys-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-06.png
rename to Code/Editor/TrackView/tvkeys-06.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-07.png b/Code/Editor/TrackView/tvkeys-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-07.png
rename to Code/Editor/TrackView/tvkeys-07.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-08.png b/Code/Editor/TrackView/tvkeys-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-08.png
rename to Code/Editor/TrackView/tvkeys-08.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-09.png b/Code/Editor/TrackView/tvkeys-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-09.png
rename to Code/Editor/TrackView/tvkeys-09.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-10.png b/Code/Editor/TrackView/tvkeys-10.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-10.png
rename to Code/Editor/TrackView/tvkeys-10.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-11.png b/Code/Editor/TrackView/tvkeys-11.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-11.png
rename to Code/Editor/TrackView/tvkeys-11.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-12.png b/Code/Editor/TrackView/tvkeys-12.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-12.png
rename to Code/Editor/TrackView/tvkeys-12.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-00.png b/Code/Editor/TrackView/tvmain-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-00.png
rename to Code/Editor/TrackView/tvmain-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-01.png b/Code/Editor/TrackView/tvmain-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-01.png
rename to Code/Editor/TrackView/tvmain-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-02.png b/Code/Editor/TrackView/tvmain-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-02.png
rename to Code/Editor/TrackView/tvmain-02.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-03.png b/Code/Editor/TrackView/tvmain-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-03.png
rename to Code/Editor/TrackView/tvmain-03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-04.png b/Code/Editor/TrackView/tvmain-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-04.png
rename to Code/Editor/TrackView/tvmain-04.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-05.png b/Code/Editor/TrackView/tvmain-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-05.png
rename to Code/Editor/TrackView/tvmain-05.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-06.png b/Code/Editor/TrackView/tvmain-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-06.png
rename to Code/Editor/TrackView/tvmain-06.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-07.png b/Code/Editor/TrackView/tvmain-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-07.png
rename to Code/Editor/TrackView/tvmain-07.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-08.png b/Code/Editor/TrackView/tvmain-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-08.png
rename to Code/Editor/TrackView/tvmain-08.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-09.png b/Code/Editor/TrackView/tvmain-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-09.png
rename to Code/Editor/TrackView/tvmain-09.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-00.png b/Code/Editor/TrackView/tvnodes-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-00.png
rename to Code/Editor/TrackView/tvnodes-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-01.png b/Code/Editor/TrackView/tvnodes-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-01.png
rename to Code/Editor/TrackView/tvnodes-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-02.png b/Code/Editor/TrackView/tvnodes-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-02.png
rename to Code/Editor/TrackView/tvnodes-02.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-03.png b/Code/Editor/TrackView/tvnodes-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-03.png
rename to Code/Editor/TrackView/tvnodes-03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-04.png b/Code/Editor/TrackView/tvnodes-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-04.png
rename to Code/Editor/TrackView/tvnodes-04.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-05.png b/Code/Editor/TrackView/tvnodes-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-05.png
rename to Code/Editor/TrackView/tvnodes-05.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-06.png b/Code/Editor/TrackView/tvnodes-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-06.png
rename to Code/Editor/TrackView/tvnodes-06.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-07.png b/Code/Editor/TrackView/tvnodes-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-07.png
rename to Code/Editor/TrackView/tvnodes-07.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-08.png b/Code/Editor/TrackView/tvnodes-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-08.png
rename to Code/Editor/TrackView/tvnodes-08.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-09.png b/Code/Editor/TrackView/tvnodes-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-09.png
rename to Code/Editor/TrackView/tvnodes-09.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-10.png b/Code/Editor/TrackView/tvnodes-10.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-10.png
rename to Code/Editor/TrackView/tvnodes-10.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-11.png b/Code/Editor/TrackView/tvnodes-11.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-11.png
rename to Code/Editor/TrackView/tvnodes-11.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-12.png b/Code/Editor/TrackView/tvnodes-12.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-12.png
rename to Code/Editor/TrackView/tvnodes-12.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-13.png b/Code/Editor/TrackView/tvnodes-13.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-13.png
rename to Code/Editor/TrackView/tvnodes-13.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-14.png b/Code/Editor/TrackView/tvnodes-14.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-14.png
rename to Code/Editor/TrackView/tvnodes-14.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-15.png b/Code/Editor/TrackView/tvnodes-15.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-15.png
rename to Code/Editor/TrackView/tvnodes-15.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-16.png b/Code/Editor/TrackView/tvnodes-16.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-16.png
rename to Code/Editor/TrackView/tvnodes-16.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-17.png b/Code/Editor/TrackView/tvnodes-17.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-17.png
rename to Code/Editor/TrackView/tvnodes-17.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-18.png b/Code/Editor/TrackView/tvnodes-18.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-18.png
rename to Code/Editor/TrackView/tvnodes-18.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-19.png b/Code/Editor/TrackView/tvnodes-19.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-19.png
rename to Code/Editor/TrackView/tvnodes-19.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-20.png b/Code/Editor/TrackView/tvnodes-20.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-20.png
rename to Code/Editor/TrackView/tvnodes-20.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-21.png b/Code/Editor/TrackView/tvnodes-21.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-21.png
rename to Code/Editor/TrackView/tvnodes-21.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-22.png b/Code/Editor/TrackView/tvnodes-22.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-22.png
rename to Code/Editor/TrackView/tvnodes-22.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-23.png b/Code/Editor/TrackView/tvnodes-23.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-23.png
rename to Code/Editor/TrackView/tvnodes-23.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-24.png b/Code/Editor/TrackView/tvnodes-24.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-24.png
rename to Code/Editor/TrackView/tvnodes-24.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-25.png b/Code/Editor/TrackView/tvnodes-25.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-25.png
rename to Code/Editor/TrackView/tvnodes-25.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-26.png b/Code/Editor/TrackView/tvnodes-26.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-26.png
rename to Code/Editor/TrackView/tvnodes-26.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-27.png b/Code/Editor/TrackView/tvnodes-27.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-27.png
rename to Code/Editor/TrackView/tvnodes-27.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-28.png b/Code/Editor/TrackView/tvnodes-28.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-28.png
rename to Code/Editor/TrackView/tvnodes-28.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-29.png b/Code/Editor/TrackView/tvnodes-29.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-29.png
rename to Code/Editor/TrackView/tvnodes-29.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-00.png b/Code/Editor/TrackView/tvplay-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-00.png
rename to Code/Editor/TrackView/tvplay-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-01.png b/Code/Editor/TrackView/tvplay-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-01.png
rename to Code/Editor/TrackView/tvplay-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-02.png b/Code/Editor/TrackView/tvplay-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-02.png
rename to Code/Editor/TrackView/tvplay-02.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-03.png b/Code/Editor/TrackView/tvplay-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-03.png
rename to Code/Editor/TrackView/tvplay-03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-04.png b/Code/Editor/TrackView/tvplay-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-04.png
rename to Code/Editor/TrackView/tvplay-04.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-05.png b/Code/Editor/TrackView/tvplay-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-05.png
rename to Code/Editor/TrackView/tvplay-05.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-06.png b/Code/Editor/TrackView/tvplay-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-06.png
rename to Code/Editor/TrackView/tvplay-06.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-07.png b/Code/Editor/TrackView/tvplay-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-07.png
rename to Code/Editor/TrackView/tvplay-07.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-08.png b/Code/Editor/TrackView/tvplay-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-08.png
rename to Code/Editor/TrackView/tvplay-08.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-09.png b/Code/Editor/TrackView/tvplay-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-09.png
rename to Code/Editor/TrackView/tvplay-09.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-10.png b/Code/Editor/TrackView/tvplay-10.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-10.png
rename to Code/Editor/TrackView/tvplay-10.png
diff --git a/Code/Sandbox/Editor/TrackView/tvview-00.png b/Code/Editor/TrackView/tvview-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvview-00.png
rename to Code/Editor/TrackView/tvview-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvview-01.png b/Code/Editor/TrackView/tvview-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvview-01.png
rename to Code/Editor/TrackView/tvview-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvview-02.png b/Code/Editor/TrackView/tvview-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvview-02.png
rename to Code/Editor/TrackView/tvview-02.png
diff --git a/Code/Editor/TrackViewExportKeyTimeDlg.cpp b/Code/Editor/TrackViewExportKeyTimeDlg.cpp
new file mode 100644
index 0000000000..71e1aa0ae5
--- /dev/null
+++ b/Code/Editor/TrackViewExportKeyTimeDlg.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "TrackViewExportKeyTimeDlg.h"
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_TrackViewExportKeyTimeDlg.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewExportKeyTimeDlg::CTrackViewExportKeyTimeDlg(QWidget* parent)
+    : QDialog(parent)
+    , m_ui(new Ui::TrackViewExportKeyTimeDlg)
+{
+    m_ui->setupUi(this);
+    m_ui->m_animationTimeExport->setChecked(true);
+    m_ui->m_soundTimeExport->setChecked(true);
+}
+
+CTrackViewExportKeyTimeDlg::~CTrackViewExportKeyTimeDlg()
+{
+}
+
+bool CTrackViewExportKeyTimeDlg::IsAnimationExportChecked() const
+{
+    return m_ui->m_animationTimeExport->isChecked();
+}
+
+bool CTrackViewExportKeyTimeDlg::IsSoundExportChecked() const
+{
+    return m_ui->m_soundTimeExport->isChecked();
+}
+
+#include <moc_TrackViewExportKeyTimeDlg.cpp>
diff --git a/Code/Editor/TrackViewExportKeyTimeDlg.h b/Code/Editor/TrackViewExportKeyTimeDlg.h
new file mode 100644
index 0000000000..0bbb990fa3
--- /dev/null
+++ b/Code/Editor/TrackViewExportKeyTimeDlg.h
@@ -0,0 +1,36 @@
+/*
+ * 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_TRACKVIEWEXPORTKEYTIMEDLG_H
+#define CRYINCLUDE_EDITOR_TRACKVIEWEXPORTKEYTIMEDLG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class TrackViewExportKeyTimeDlg;
+}
+
+class CTrackViewExportKeyTimeDlg
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CTrackViewExportKeyTimeDlg(QWidget* parent = nullptr);
+    virtual ~CTrackViewExportKeyTimeDlg();
+
+    bool IsAnimationExportChecked() const;
+    bool IsSoundExportChecked() const;
+
+private:
+    QScopedPointer<Ui::TrackViewExportKeyTimeDlg> m_ui;
+};
+#endif // CRYINCLUDE_EDITOR_TRACKVIEWEXPORTKEYTIMEDLG_H
diff --git a/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.ui b/Code/Editor/TrackViewExportKeyTimeDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.ui
rename to Code/Editor/TrackViewExportKeyTimeDlg.ui
diff --git a/Code/Editor/TrackViewFBXImportPreviewDialog.cpp b/Code/Editor/TrackViewFBXImportPreviewDialog.cpp
new file mode 100644
index 0000000000..de9099dc08
--- /dev/null
+++ b/Code/Editor/TrackViewFBXImportPreviewDialog.cpp
@@ -0,0 +1,146 @@
+/*
+ * 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 "TrackViewFBXImportPreviewDialog.h"
+
+// Qt
+#include <QAbstractListModel>
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_TrackViewFBXImportPreviewDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+
+class FBXImportModel
+    : public QAbstractListModel
+{
+public:
+    FBXImportModel(CTrackViewFBXImportPreviewDialog::TItemsMap& map, QObject* parent = nullptr)
+        : QAbstractListModel(parent)
+        , m_map(map)
+    {
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        return parent.isValid() ? 0 : m_map.size();
+    }
+
+    Qt::ItemFlags flags(const QModelIndex& index) const override
+    {
+        return QAbstractListModel::flags(index) | Qt::ItemIsUserCheckable;
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (!index.isValid() || index.row() >= m_map.size())
+        {
+            return QVariant();
+        }
+        auto it = m_map.begin() + index.row();
+        switch (role)
+        {
+        case Qt::DisplayRole:
+            return it->name;
+        case Qt::CheckStateRole:
+            return it->checked ? Qt::Checked : Qt::Unchecked;
+        default:
+            return QVariant();
+        }
+    }
+
+    bool setData(const QModelIndex& index, const QVariant& data, int role = Qt::EditRole) override
+    {
+        if (!index.isValid() || index.row() >= m_map.size())
+        {
+            return false;
+        }
+        auto it = m_map.begin() + index.row();
+        switch (role)
+        {
+        case Qt::CheckStateRole:
+            it->checked = (data.toInt() == Qt::Checked);
+            emit dataChanged(index, index, QVector<int>(1, Qt::CheckStateRole));
+            return true;
+        default:
+            return false;
+        }
+    }
+
+    void setAllItemsChecked(bool checked)
+    {
+        if (m_map.empty())
+        {
+            return;
+        }
+        for (auto it : m_map)
+        {
+            it.checked = checked;
+        }
+        emit dataChanged(index(0, 0), index(m_map.size() - 1, 0), QVector<int>(1, Qt::CheckStateRole));
+    }
+
+private:
+    CTrackViewFBXImportPreviewDialog::TItemsMap& m_map;
+};
+
+//////////////////////////////////////////////////////////////////////////
+CTrackViewFBXImportPreviewDialog::CTrackViewFBXImportPreviewDialog(QWidget* parent)
+    : QDialog(parent)
+    , m_ui(new Ui::TrackViewFBXImportPreviewDialog)
+{
+    m_ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setFixedSize(size());
+    connect(m_ui->buttonSelectAll, &QPushButton::clicked, this, &CTrackViewFBXImportPreviewDialog::OnBnSelectAllClicked);
+    connect(m_ui->buttonUnselectAll, &QPushButton::clicked, this, &CTrackViewFBXImportPreviewDialog::OnBnUnselectAllClicked);
+}
+
+CTrackViewFBXImportPreviewDialog::~CTrackViewFBXImportPreviewDialog()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CTrackViewFBXImportPreviewDialog::exec()
+{
+    m_ui->m_tree->setModel(new FBXImportModel(m_fBXItemNames, this));
+    return QDialog::exec();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CTrackViewFBXImportPreviewDialog::AddTreeItem(const QString& objectName)
+{
+    m_fBXItemNames.push_back(Item { objectName, true });
+}
+
+bool CTrackViewFBXImportPreviewDialog::IsObjectSelected(const QString& objectName) const
+{
+    for (auto it : m_fBXItemNames)
+    {
+        if (it.name == objectName)
+        {
+            return it.checked;
+        }
+    }
+    return false;
+};
+
+void CTrackViewFBXImportPreviewDialog::OnBnSelectAllClicked()
+{
+    static_cast<FBXImportModel*>(m_ui->m_tree->model())->setAllItemsChecked(true);
+}
+
+void CTrackViewFBXImportPreviewDialog::OnBnUnselectAllClicked()
+{
+    static_cast<FBXImportModel*>(m_ui->m_tree->model())->setAllItemsChecked(false);
+}
+
+#include <moc_TrackViewFBXImportPreviewDialog.cpp>
diff --git a/Code/Editor/TrackViewFBXImportPreviewDialog.h b/Code/Editor/TrackViewFBXImportPreviewDialog.h
new file mode 100644
index 0000000000..4dc77a051a
--- /dev/null
+++ b/Code/Editor/TrackViewFBXImportPreviewDialog.h
@@ -0,0 +1,51 @@
+/*
+ * 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_TRACKVIEWFBXIMPORTPREVIEWDIALOG_H
+#define CRYINCLUDE_EDITOR_TRACKVIEWFBXIMPORTPREVIEWDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace Ui
+{
+    class TrackViewFBXImportPreviewDialog;
+}
+
+class CTrackViewFBXImportPreviewDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CTrackViewFBXImportPreviewDialog(QWidget* parent = nullptr);
+    virtual ~CTrackViewFBXImportPreviewDialog();
+
+    void AddTreeItem(const QString& objectName);
+    bool IsObjectSelected(const QString& objectName) const;
+
+    int exec() override;
+
+protected:
+    void OnBnSelectAllClicked();
+    void OnBnUnselectAllClicked();
+
+private:
+    friend class FBXImportModel;
+    struct Item
+    {
+        QString name;
+        bool checked;
+    };
+    typedef QVector<Item> TItemsMap;
+    TItemsMap m_fBXItemNames;
+    QScopedPointer<Ui::TrackViewFBXImportPreviewDialog> m_ui;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEWFBXIMPORTPREVIEWDIALOG_H
diff --git a/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.ui b/Code/Editor/TrackViewFBXImportPreviewDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.ui
rename to Code/Editor/TrackViewFBXImportPreviewDialog.ui
diff --git a/Code/Editor/TrackViewNewSequenceDialog.cpp b/Code/Editor/TrackViewNewSequenceDialog.cpp
new file mode 100644
index 0000000000..2b65af1e88
--- /dev/null
+++ b/Code/Editor/TrackViewNewSequenceDialog.cpp
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "TrackViewNewSequenceDialog.h"
+
+// Qt
+#include <QMessageBox>
+
+// CryCommon
+#include <CryCommon/Maestro/Types/SequenceType.h>
+
+// Editor
+#include "TrackView/TrackViewSequenceManager.h"
+
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <ui_TrackViewNewSequenceDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+namespace
+{
+    struct seqTypeComboPair
+    {
+        const char*    name;
+        SequenceType   type;
+    };
+}
+
+// TrackViewNewSequenceDialog dialog
+CTVNewSequenceDialog::CTVNewSequenceDialog(QWidget* parent)
+    : QDialog(parent)
+    , ui(new Ui::CTVNewSequenceDialog)
+    , m_inputFocusSet(false)
+{
+    ui->setupUi(this);
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &CTVNewSequenceDialog::OnOK);
+    connect(ui->NAME, &QLineEdit::returnPressed, this, &CTVNewSequenceDialog::OnOK);
+    setWindowTitle("Add New Sequence");
+
+    OnInitDialog();
+}
+
+CTVNewSequenceDialog::~CTVNewSequenceDialog()
+{
+}
+
+void CTVNewSequenceDialog::OnInitDialog()
+{
+}
+
+void CTVNewSequenceDialog::OnOK()
+{
+    m_sequenceType = SequenceType::SequenceComponent;
+
+    m_sequenceName = ui->NAME->text();
+
+    if (m_sequenceName.isEmpty())
+    {
+        QMessageBox::warning(this, "New Sequence", "A sequence name cannot be empty!");
+        return;
+    }
+    else if (m_sequenceName.contains('/'))
+    {
+        QMessageBox::warning(this, "New Sequence", "A sequence name cannot contain a '/' character!");
+        return;
+    }
+    else if (m_sequenceName == LIGHT_ANIMATION_SET_NAME)
+    {
+        QMessageBox::warning(this, "New Sequence", QString("The sequence name '%1' is reserved.\n\nPlease choose a different name.").arg(LIGHT_ANIMATION_SET_NAME));
+        return;
+    }
+
+    for (int k = 0; k < GetIEditor()->GetSequenceManager()->GetCount(); ++k)
+    {
+        CTrackViewSequence* pSequence = GetIEditor()->GetSequenceManager()->GetSequenceByIndex(k);
+        QString fullname = QtUtil::ToQString(pSequence->GetName());
+
+        if (fullname.compare(m_sequenceName, Qt::CaseInsensitive) == 0)
+        {
+            QMessageBox::warning(this, "New Sequence", "Sequence with this name already exists!");
+            return;
+        }
+    }
+
+    accept();
+}
+
+void CTVNewSequenceDialog::showEvent(QShowEvent* event)
+{
+    if (!m_inputFocusSet)
+    {
+        ui->NAME->setFocus();
+        m_inputFocusSet = true;
+    }
+
+    QDialog::showEvent(event);
+}
+
+#include <moc_TrackViewNewSequenceDialog.cpp>
diff --git a/Code/Editor/TrackViewNewSequenceDialog.h b/Code/Editor/TrackViewNewSequenceDialog.h
new file mode 100644
index 0000000000..5551f0b32f
--- /dev/null
+++ b/Code/Editor/TrackViewNewSequenceDialog.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_TRACKVIEWNEWSEQUENCEDIALOG_H
+#define CRYINCLUDE_EDITOR_TRACKVIEWNEWSEQUENCEDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QScopedPointer>
+#include <QDialog>
+#endif
+
+namespace Ui {
+    class CTVNewSequenceDialog;
+}
+
+
+class CTVNewSequenceDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CTVNewSequenceDialog(QWidget* pParent = 0);
+    virtual ~CTVNewSequenceDialog();
+
+    const QString& GetSequenceName() const { return m_sequenceName; };
+    SequenceType   GetSequenceType() const { return m_sequenceType; };
+
+    void showEvent(QShowEvent* event) override;
+
+protected:
+    virtual void OnOK();
+    void OnInitDialog();
+
+private:
+    QString        m_sequenceName;
+    SequenceType   m_sequenceType;
+    QScopedPointer<Ui::CTVNewSequenceDialog> ui;
+    bool           m_inputFocusSet;
+};
+
+#endif // CRYINCLUDE_EDITOR_TRACKVIEWNEWSEQUENCEDIALOG_H
diff --git a/Code/Sandbox/Editor/TrackViewNewSequenceDialog.ui b/Code/Editor/TrackViewNewSequenceDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewNewSequenceDialog.ui
rename to Code/Editor/TrackViewNewSequenceDialog.ui
diff --git a/Code/Sandbox/Editor/Translations/assetbrowser_en-us.ts b/Code/Editor/Translations/assetbrowser_en-us.ts
similarity index 100%
rename from Code/Sandbox/Editor/Translations/assetbrowser_en-us.ts
rename to Code/Editor/Translations/assetbrowser_en-us.ts
diff --git a/Code/Sandbox/Editor/Translations/editor_en-us.ts b/Code/Editor/Translations/editor_en-us.ts
similarity index 100%
rename from Code/Sandbox/Editor/Translations/editor_en-us.ts
rename to Code/Editor/Translations/editor_en-us.ts
diff --git a/Code/Sandbox/Editor/TrustInfo.manifest b/Code/Editor/TrustInfo.manifest
similarity index 100%
rename from Code/Sandbox/Editor/TrustInfo.manifest
rename to Code/Editor/TrustInfo.manifest
diff --git a/Code/Editor/UIEnumsDatabase.cpp b/Code/Editor/UIEnumsDatabase.cpp
new file mode 100644
index 0000000000..4df77e90fb
--- /dev/null
+++ b/Code/Editor/UIEnumsDatabase.cpp
@@ -0,0 +1,90 @@
+/*
+ * 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 "UIEnumsDatabase.h"
+
+//////////////////////////////////////////////////////////////////////////
+QString CUIEnumsDatabase_SEnum::NameToValue(const QString& name)
+{
+    int n = (int)strings.size();
+    for (int i = 0; i < n; i++)
+    {
+        if (name == strings[i])
+        {
+            return values[i];
+        }
+    }
+    return name;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CUIEnumsDatabase_SEnum::ValueToName(const QString& value)
+{
+    int n = (int)strings.size();
+    for (int i = 0; i < n; i++)
+    {
+        if (value == values[i])
+        {
+            return strings[i];
+        }
+    }
+    return value;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CUIEnumsDatabase::CUIEnumsDatabase()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CUIEnumsDatabase::~CUIEnumsDatabase()
+{
+    // Free enums.
+    for (Enums::iterator it = m_enums.begin(); it != m_enums.end(); ++it)
+    {
+        delete it->second;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUIEnumsDatabase::SetEnumStrings(const QString& enumName, const QStringList& sStringsArray)
+{
+    int nStringCount = sStringsArray.size();
+
+    CUIEnumsDatabase_SEnum* pEnum = stl::find_in_map(m_enums, enumName, 0);
+    if (!pEnum)
+    {
+        pEnum = new CUIEnumsDatabase_SEnum;
+        pEnum->m_name = enumName;
+        m_enums[enumName] = pEnum;
+    }
+    pEnum->strings.clear();
+    pEnum->values.clear();
+    for (int i = 0; i < nStringCount; i++)
+    {
+        QString str = sStringsArray[i];
+        QString value = str;
+        int pos = str.indexOf('=');
+        if (pos >= 0)
+        {
+            value = str.mid(pos + 1);
+            str = str.mid(0, pos);
+        }
+        pEnum->strings.push_back(str);
+        pEnum->values.push_back(value);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CUIEnumsDatabase_SEnum* CUIEnumsDatabase::FindEnum(const QString& enumName) const
+{
+    CUIEnumsDatabase_SEnum* pEnum = stl::find_in_map(m_enums, enumName, 0);
+    return pEnum;
+}
diff --git a/Code/Editor/UIEnumsDatabase.h b/Code/Editor/UIEnumsDatabase.h
new file mode 100644
index 0000000000..42c5457ed3
--- /dev/null
+++ b/Code/Editor/UIEnumsDatabase.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UIENUMSDATABASE_H
+#define CRYINCLUDE_EDITOR_UIENUMSDATABASE_H
+#pragma once
+
+#include "Include/EditorCoreAPI.h"
+
+struct EDITOR_CORE_API CUIEnumsDatabase_SEnum
+{
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    QString m_name;
+    QStringList strings; // Display Strings.
+    QStringList values;  // Corresponding Values.
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    QString NameToValue(const QString& name);
+    QString ValueToName(const QString& value);
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Stores string associates to the enumeration collections for UI.
+//////////////////////////////////////////////////////////////////////////
+class EDITOR_CORE_API CUIEnumsDatabase
+{
+public:
+    CUIEnumsDatabase();
+    ~CUIEnumsDatabase();
+
+    void SetEnumStrings(const QString& enumName, const QStringList& sStringsArray);
+    CUIEnumsDatabase_SEnum* FindEnum(const QString& enumName) const;
+
+private:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    typedef std::map<QString, CUIEnumsDatabase_SEnum*> Enums;
+    Enums m_enums;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif // CRYINCLUDE_EDITOR_UIENUMSDATABASE_H
diff --git a/Code/Editor/Undo/IUndoManagerListener.h b/Code/Editor/Undo/IUndoManagerListener.h
new file mode 100644
index 0000000000..6c797a5298
--- /dev/null
+++ b/Code/Editor/Undo/IUndoManagerListener.h
@@ -0,0 +1,21 @@
+/*
+ * 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_EDITORCORE_UNDO_IUNDOMANAGERLISTENER_H
+#define CRYINCLUDE_EDITORCORE_UNDO_IUNDOMANAGERLISTENER_H
+#pragma once
+
+struct IUndoManagerListener
+{
+    virtual void BeginUndoTransaction() {}
+    virtual void EndUndoTransaction() {}
+    virtual void BeginRestoreTransaction() {}
+    virtual void EndRestoreTransaction() {}
+    virtual void SignalNumUndoRedo([[maybe_unused]] const unsigned int& numUndo, [[maybe_unused]] const unsigned int& numRedo){}
+    virtual void UndoStackFlushed() {}
+};
+
+#endif // CRYINCLUDE_EDITORCORE_UNDO_IUNDOMANAGERLISTENER_H
diff --git a/Code/Editor/Undo/IUndoObject.h b/Code/Editor/Undo/IUndoObject.h
new file mode 100644
index 0000000000..90b42fba96
--- /dev/null
+++ b/Code/Editor/Undo/IUndoObject.h
@@ -0,0 +1,49 @@
+/*
+ * 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 : Interface for implementation of IUndo objects.
+
+
+#ifndef CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
+#define CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
+#pragma once
+
+#include <QString>
+
+//! IUndoObject is a interface of general Undo object.
+struct IUndoObject
+{
+    // Virtual destructor.
+    virtual ~IUndoObject() {};
+
+    //! Called to delete undo object.
+    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.
+    virtual void Undo(bool bUndo = true) = 0;
+
+    //! Redo undone changes on object.
+    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; }
+};
+
+#endif // CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
diff --git a/Code/Editor/Undo/Undo.cpp b/Code/Editor/Undo/Undo.cpp
new file mode 100644
index 0000000000..59be11c0df
--- /dev/null
+++ b/Code/Editor/Undo/Undo.cpp
@@ -0,0 +1,839 @@
+/*
+ * 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 "Undo.h"
+
+#include "Settings.h"
+#include "IUndoManagerListener.h"
+#include "Objects/ObjectManager.h"
+#include <Include/ILogFile.h>
+#include <list>
+
+#include <QString>
+#include "QtUtilWin.h"
+
+#define UNDOREDO_BUTTON_POPUP_TEXT_WIDTH 81
+#define UNDOREDO_MULTIPLE_OBJECTS_TEXT " (Multiple Objects)"
+
+
+//! CSuperUndo objects groups together a block of UndoStepto to allow them to be Undo by single operation.
+class CSuperUndoStep
+    : public CUndoStep
+{
+public:
+    //! Add new undo object to undo step.
+    void AddUndoStep(CUndoStep* step)
+    {
+        m_undoSteps.push_back(step);
+    }
+    virtual int GetSize() const
+    {
+        int size = 0;
+        for (int i = 0; i < m_undoSteps.size(); i++)
+        {
+            size += m_undoSteps[i]->GetSize();
+        }
+        return size;
+    }
+    virtual bool IsEmpty() const
+    {
+        return m_undoSteps.empty();
+    }
+    virtual void Undo(bool bUndo)
+    {
+        for (int i = m_undoSteps.size() - 1; i >= 0; i--)
+        {
+            m_undoSteps[i]->Undo(bUndo);
+        }
+    }
+    virtual void Redo()
+    {
+        for (int i = 0; i < m_undoSteps.size(); i++)
+        {
+            m_undoSteps[i]->Redo();
+        }
+    }
+
+    // to get memory statistics
+    void GetMemoryUsage(ICrySizer* pSizer)
+    {
+        for (int i = 0; i < m_undoSteps.size(); i++)
+        {
+            m_undoSteps[i]->GetMemoryUsage(pSizer);
+        }
+
+        pSizer->Add(*this);
+    }
+
+private:
+    //! Undo steps included in this step.
+    std::vector<CUndoStep*> m_undoSteps;
+};
+
+// Helper class for CUndoManager that monitors the Asset Manager and suspends undo recording while the Asset Manager
+// is processing asset loading events.  The events are processed non-deterministically, so they could accidentally get captured
+// within an undo recording block.
+class AssetManagerUndoInterruptor
+    : public AZ::Data::AssetManagerNotificationBus::Handler
+{
+public:
+    AssetManagerUndoInterruptor()
+    {
+        AZ::Data::AssetManagerNotificationBus::Handler::BusConnect();
+    }
+
+    ~AssetManagerUndoInterruptor() override
+    {
+        AZ::Data::AssetManagerNotificationBus::Handler::BusDisconnect();
+    }
+
+    void OnAssetEventsDispatchBegin() override
+    {
+        GetIEditor()->GetUndoManager()->Suspend();
+    }
+
+    void OnAssetEventsDispatchEnd() override
+    {
+        GetIEditor()->GetUndoManager()->Resume();
+    }
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+CUndoManager::CUndoManager()
+{
+    m_bRecording = false;
+    m_bSuperRecording = false;
+
+    m_currentUndo = 0;
+    m_superUndo = 0;
+    m_assetManagerUndoInterruptor = new AssetManagerUndoInterruptor();
+
+    m_suspendCount = 0;
+
+    m_bUndoing = false;
+    m_bRedoing = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CUndoManager::~CUndoManager()
+{
+
+    m_bRecording = false;
+    ClearRedoStack();
+    ClearUndoStack();
+
+    delete m_superUndo;
+    delete m_currentUndo;
+    delete m_assetManagerUndoInterruptor;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Begin()
+{
+    //CryLog( "<Undo> Begin SuspendCount=%d",m_suspendCount );
+    //if (m_bSuperRecording)
+    //CLogFile::FormatLine( "<Undo> Begin (Inside SuperSuper)" );
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    //  assert( m_bRecording == false );
+
+    if (m_bRecording)
+    {
+        //CLogFile::WriteLine( "<Undo> Begin (already recording)" );
+        // Not cancel, just combine.
+        return;
+    }
+
+    // Begin Creates a new undo object.
+    m_currentUndo = new CUndoStep;
+
+    m_bRecording = true;
+    //CLogFile::WriteLine( "<Undo> Begin OK" );
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Restore(bool bUndo)
+{
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    if (m_currentUndo)
+    {
+        BeginRestoreTransaction();
+        Suspend();
+        if (bUndo && m_currentUndo)
+        {
+            m_currentUndo->Undo(false); // Undo not by Undo command (no need to store Redo)
+        }
+        Resume();
+        if (m_currentUndo)
+        {
+            m_currentUndo->ClearObjects();
+        }
+        EndRestoreTransaction();
+    }
+    //CryLog( "Restore Undo" );
+}
+
+// This function is used below to decide if an operation should force a save or not. This currently
+// prevents selecting an entity, either from the outliner or both the old and new viewports.
+static bool ShouldPersist(const QString& name)
+{
+    return name != "Select Object(s)" && name != "Select Entity" && name != "Box Select Entities";
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Accept(const QString& name)
+{
+    //CryLog( "<Undo> Accept, Suspend Count=%d",m_suspendCount );
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    if (!m_bRecording)
+    {
+        //CLogFile::WriteLine( "<Undo> Accept (Not recording)" );
+        return;
+    }
+
+    if (!m_currentUndo->IsEmpty())
+    {
+        const bool persist = ShouldPersist(name);
+        if (persist)
+        {
+            GetIEditor()->SetModifiedFlag();
+        }
+
+        // If accepting new undo object, must clear all redo stack.
+        ClearRedoStack();
+
+        m_currentUndo->SetName(name);
+        if (m_bSuperRecording)
+        {
+            m_superUndo->AddUndoStep(m_currentUndo);
+        }
+        else
+        {
+            // Normal recording.
+            // Keep max undo steps.
+            while (m_undoStack.size() && (m_undoStack.size() >= GetIEditor()->GetEditorSettings()->undoLevels || GetDatabaseSize() > 100 * 1024 * 1024))
+            {
+                delete m_undoStack.front();
+                m_undoStack.pop_front();
+            }
+            m_undoStack.push_back(m_currentUndo);
+        }
+        //CLogFile::FormatLine( "Undo Object Accepted (Undo:%d,Redo:%d, Size=%dKb)",m_undoStack.size(),m_redoStack.size(),GetDatabaseSize()/1024 );
+
+        // If undo accepted, document modified.
+        if (persist)
+        {
+            GetIEditor()->SetModifiedFlag();
+        }
+
+        if (name.compare("Select Object(s)", Qt::CaseInsensitive) == 0)
+        {
+            GetIEditor()->SetModifiedModule(eModifiedBrushes);
+        }
+        else if (name.compare("Move Selection", Qt::CaseInsensitive) == 0)
+        {
+            GetIEditor()->SetModifiedModule(eModifiedBrushes);
+        }
+        else if (name.compare("SubObject Select", Qt::CaseInsensitive) == 0)
+        {
+            GetIEditor()->SetModifiedModule(eModifiedBrushes);
+        }
+        else if (name.compare("Manipulator Drag", Qt::CaseInsensitive) == 0)
+        {
+            GetIEditor()->SetModifiedModule(eModifiedBrushes);
+        }
+    }
+    else
+    {
+        // If no any object was recorded, Cancel undo operation.
+        Cancel();
+    }
+
+    m_bRecording = false;
+    m_currentUndo = 0;
+
+    SignalNumUndoRedoToListeners();
+
+    //CLogFile::WriteLine( "<Undo> Accept OK" );
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Cancel()
+{
+    //CryLog( "<Undo> Cancel" );
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    if (!m_bRecording)
+    {
+        return;
+    }
+
+    assert(m_currentUndo != 0);
+
+    m_bRecording = false;
+
+    if (!m_currentUndo->IsEmpty())
+    {
+        // Restore all objects to the state they was at Begin call and throws out all undo objects.
+        Restore(true);
+        //GetIEditor()->GetLogFile()->FormatLine( "Undo Object Canceled (Undo:%d,Redo:%d)",m_undoStack.size(),m_redoStack.size() );
+    }
+
+    delete m_currentUndo;
+    m_currentUndo = 0;
+    //CLogFile::WriteLine( "<Undo> Cancel OK" );
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Redo(int numSteps)
+{
+    GetIEditor()->Notify(eNotify_OnBeginUndoRedo);
+
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    if (m_bRecording || m_bSuperRecording)
+    {
+        GetIEditor()->GetLogFile()->FormatLine("Cannot Redo while Recording");
+        return;
+    }
+
+    m_bRedoing = true;
+    BeginUndoTransaction();
+    m_bRedoing = false;
+
+    if (!m_redoStack.empty())
+    {
+        Suspend();
+        while (numSteps-- > 0 && !m_redoStack.empty() && !m_bClearRedoStackQueued)
+        {
+            m_bRedoing = true;
+            CUndoStep* redo = m_redoStack.back();
+            redo->Redo();
+            m_redoStack.pop_back();
+            // Push undo object to redo stack.
+            m_undoStack.push_back(redo);
+            m_bRedoing = false;
+        }
+        Resume();
+    }
+    if (m_suspendCount == 0)
+    {
+        GetIEditor()->UpdateViews(eUpdateObjects);
+    }
+    GetIEditor()->GetLogFile()->FormatLine("Redo (Undo:%d,Redo:%d)", m_undoStack.size(), m_redoStack.size());
+    GetIEditor()->GetObjectManager()->InvalidateVisibleList();
+
+    m_bRedoing = true;
+    EndUndoTransaction();
+    SignalNumUndoRedoToListeners();
+    m_bRedoing = false;
+
+    GetIEditor()->Notify(eNotify_OnEndUndoRedo);
+
+    if (m_bClearRedoStackQueued)
+    {
+        ClearRedoStack();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Undo(int numSteps)
+{
+    GetIEditor()->Notify(eNotify_OnBeginUndoRedo);
+
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    if (m_bRecording || m_bSuperRecording)
+    {
+        GetIEditor()->GetLogFile()->FormatLine("Cannot Undo while Recording");
+        return;
+    }
+
+    m_bUndoing = true;
+    BeginUndoTransaction();
+    m_bUndoing = false;
+
+    if (!m_undoStack.empty())
+    {
+        Suspend();
+        while (numSteps-- > 0 && !m_undoStack.empty())
+        {
+            m_bUndoing = true;
+            CUndoStep* undo = m_undoStack.back();
+            undo->Undo(true);
+            m_undoStack.pop_back();
+            // Push undo object to redo stack.
+            m_redoStack.push_back(undo);
+            m_bUndoing = false;
+        }
+        Resume();
+    }
+    // Update viewports.
+    if (m_suspendCount == 0)
+    {
+        GetIEditor()->UpdateViews(eUpdateObjects);
+    }
+    GetIEditor()->GetLogFile()->FormatLine("Undo (Undo:%d,Redo:%d)", m_undoStack.size(), m_redoStack.size());
+    GetIEditor()->GetObjectManager()->InvalidateVisibleList();
+
+    m_bUndoing = true;
+    EndUndoTransaction();
+    SignalNumUndoRedoToListeners();
+    m_bUndoing = false;
+
+    GetIEditor()->Notify(eNotify_OnEndUndoRedo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::RecordUndo(IUndoObject* obj)
+{
+    //CryLog( "<Undo> RecordUndo Name=%s",obj->GetDescription() );
+
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        //CLogFile::WriteLine( "<Undo> RecordUndo (Undoing or Redoing)" );
+        obj->Release();
+        return;
+    }
+
+    if (m_bRecording && (m_suspendCount == 0))
+    {
+        assert(m_currentUndo != 0);
+        m_currentUndo->AddUndoObject(obj);
+        //CLogFile::FormatLine( "Undo Object Added: %s",obj->GetDescription() );
+    }
+    else
+    {
+        //CLogFile::WriteLine( "<Undo> RecordUndo (Not Recording)" );
+        // Ignore this object.
+        obj->Release();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::ClearRedoStack()
+{
+    if (m_bRedoing)
+    {
+        m_bClearRedoStackQueued = true;
+        return;
+    }
+    m_bClearRedoStackQueued = false;
+
+    for (std::list<CUndoStep*>::iterator it = m_redoStack.begin(); it != m_redoStack.end(); it++)
+    {
+        delete *it;
+    }
+    m_redoStack.clear();
+
+    SignalNumUndoRedoToListeners();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::ClearUndoStack()
+{
+    for (std::list<CUndoStep*>::iterator it = m_undoStack.begin(); it != m_undoStack.end(); it++)
+    {
+        delete *it;
+    }
+    m_undoStack.clear();
+
+    SignalNumUndoRedoToListeners();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::ClearUndoStack(int num)
+{
+    int i = num;
+    while (i > 0 && !m_undoStack.empty())
+    {
+        delete m_undoStack.front();
+        m_undoStack.pop_front();
+        i--;
+    }
+
+    SignalNumUndoRedoToListeners();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::ClearRedoStack(int num)
+{
+    int i = num;
+    while (i > 0 && !m_redoStack.empty())
+    {
+        delete m_redoStack.back();
+        m_redoStack.pop_back();
+        i--;
+    }
+
+    SignalNumUndoRedoToListeners();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CUndoManager::IsHaveRedo() const
+{
+    return !m_redoStack.empty();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CUndoManager::IsHaveUndo() const
+{
+    return !m_undoStack.empty();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Suspend()
+{
+    m_suspendCount++;
+    //CLogFile::FormatLine( "<Undo> Suspend %d",m_suspendCount );
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Resume()
+{
+    assert(m_suspendCount >= 0);
+    if (m_suspendCount > 0)
+    {
+        m_suspendCount--;
+    }
+    //CLogFile::FormatLine( "<Undo> Resume %d",m_suspendCount );
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::SuperBegin()
+{
+    //CLogFile::FormatLine( "<Undo> SuperBegin (SuspendCount%d)",m_suspendCount );
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    m_bSuperRecording = true;
+    m_superUndo = new CSuperUndoStep;
+    //CLogFile::WriteLine( "<Undo> SuperBegin OK" );
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::SuperAccept(const QString& name)
+{
+    //CLogFile::WriteLine( "<Undo> SupperAccept" );
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    if (!m_bSuperRecording)
+    {
+        return;
+    }
+
+    assert(m_superUndo != 0);
+
+    if (m_bRecording)
+    {
+        Accept(name);
+    }
+
+    if (!m_superUndo->IsEmpty())
+    {
+        m_superUndo->SetName(name);
+        // Keep max undo steps.
+        while (m_undoStack.size() && (m_undoStack.size() >= GetIEditor()->GetEditorSettings()->undoLevels || GetDatabaseSize() > 100 * 1024 * 1024))
+        {
+            delete m_undoStack.front();
+            m_undoStack.pop_front();
+        }
+        m_undoStack.push_back(m_superUndo);
+    }
+    else
+    {
+        // If no any object was recorded, Cancel undo operation.
+        SuperCancel();
+    }
+
+    //CLogFile::FormatLine( "Undo Object Accepted (Undo:%d,Redo:%d)",m_undoStack.size(),m_redoStack.size() );
+    m_bSuperRecording = false;
+    m_superUndo = 0;
+    //CLogFile::WriteLine( "<Undo> SupperAccept OK" );
+
+    SignalNumUndoRedoToListeners();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::SuperCancel()
+{
+    //CLogFile::WriteLine( "<Undo> SuperCancel" );
+    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
+    {
+        return;
+    }
+
+    if (!m_bSuperRecording)
+    {
+        return;
+    }
+
+    assert(m_superUndo != 0);
+
+    if (m_bRecording)
+    {
+        Cancel();
+    }
+
+    Suspend();
+    //! Undo all changes already made.
+    m_superUndo->Undo(false); // Undo not by Undo command (no need to store Redo)
+    Resume();
+
+    m_bSuperRecording = false;
+    delete m_superUndo;
+    m_superUndo = 0;
+    //CLogFile::WriteLine( "<Undo> SuperCancel OK" );
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+int CUndoManager::GetUndoStackLen() const
+{
+    return m_undoStack.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CUndoManager::GetRedoStackLen() const
+{
+    return m_redoStack.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+std::vector<QString> CUndoManager::GetUndoStackNames() const
+{
+    std::vector<QString> undos(m_undoStack.size());
+    int i = 0;
+    QString text;
+
+    for (auto it = m_undoStack.begin(); it != m_undoStack.end(); it++)
+    {
+        QString objNames = (*it)->GetObjectNames();
+        text = (*it)->GetName() + objNames;
+        if (text.length() > UNDOREDO_BUTTON_POPUP_TEXT_WIDTH)
+        {
+            undos[i++] = (*it)->GetName() + UNDOREDO_MULTIPLE_OBJECTS_TEXT;
+        }
+        else
+        {
+            undos[i++] = (*it)->GetName() + (objNames.isEmpty() ? "" : " (" + objNames + ")");
+        }
+    }
+
+    return undos;
+}
+
+//////////////////////////////////////////////////////////////////////////
+std::vector<QString> CUndoManager::GetRedoStackNames() const
+{
+    std::vector<QString> redos(m_redoStack.size());
+    int i = 0;
+    QString text;
+
+    for (auto it = m_redoStack.begin(); it != m_redoStack.end(); it++)
+    {
+        text = (*it)->GetName() + (*it)->GetObjectNames();
+        if (text.length() > UNDOREDO_BUTTON_POPUP_TEXT_WIDTH)
+        {
+            redos[i++] = (*it)->GetName() + UNDOREDO_MULTIPLE_OBJECTS_TEXT;
+        }
+        else
+        {
+            redos[i++] = (*it)->GetName() + " (" + (*it)->GetObjectNames() + ")";
+        }
+    }
+
+    return redos;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CUndoManager::GetDatabaseSize()
+{
+    int size = 0;
+    {
+        for (std::list<CUndoStep*>::iterator it = m_undoStack.begin(); it != m_undoStack.end(); it++)
+        {
+            size += (*it)->GetSize();
+        }
+    }
+    {
+        for (std::list<CUndoStep*>::iterator it = m_redoStack.begin(); it != m_redoStack.end(); it++)
+        {
+            size += (*it)->GetSize();
+        }
+    }
+    return size;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::Flush()
+{
+    m_bRecording = false;
+    ClearRedoStack();
+    ClearUndoStack();
+
+    delete m_superUndo;
+    delete m_currentUndo;
+    m_superUndo = 0;
+    m_currentUndo = 0;
+
+    SignalUndoFlushedToListeners();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CUndoStep* CUndoManager::GetNextUndo()
+{
+    if (!m_undoStack.empty())
+    {
+        return m_undoStack.back();
+    }
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CUndoStep* CUndoManager::GetNextRedo()
+{
+    if (!m_redoStack.empty())
+    {
+        return m_redoStack.back();
+    }
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CUndoManager::SetMaxUndoStep(int steps)
+{
+    GetIEditor()->GetEditorSettings()->undoLevels = steps;
+};
+
+//////////////////////////////////////////////////////////////////////////
+int CUndoManager::GetMaxUndoStep() const
+{
+    return GetIEditor()->GetEditorSettings()->undoLevels;
+}
+
+void CUndoManager::GetMemoryUsage(ICrySizer* pSizer)
+{
+    if (m_currentUndo)
+    {
+        m_currentUndo->GetMemoryUsage(pSizer);
+    }
+
+    if (m_superUndo)
+    {
+        m_superUndo->GetMemoryUsage(pSizer);
+    }
+
+    for (std::list<CUndoStep*>::const_iterator it = m_undoStack.begin(); it != m_undoStack.end(); it++)
+    {
+        (*it)->GetMemoryUsage(pSizer);
+    }
+
+    for (std::list<CUndoStep*>::const_iterator it = m_redoStack.begin(); it != m_redoStack.end(); it++)
+    {
+        (*it)->GetMemoryUsage(pSizer);
+    }
+
+    pSizer->Add(*this);
+}
+
+void CUndoManager::AddListener(IUndoManagerListener* pListener)
+{
+    stl::push_back_unique(m_listeners, pListener);
+}
+
+void CUndoManager::RemoveListener(IUndoManagerListener* pListener)
+{
+    stl::find_and_erase(m_listeners, pListener);
+}
+
+void CUndoManager::BeginUndoTransaction()
+{
+    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
+    {
+        (*iter)->BeginUndoTransaction();
+    }
+}
+
+void CUndoManager::EndUndoTransaction()
+{
+    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
+    {
+        (*iter)->EndUndoTransaction();
+    }
+}
+
+void CUndoManager::BeginRestoreTransaction()
+{
+    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
+    {
+        (*iter)->BeginRestoreTransaction();
+    }
+}
+
+void CUndoManager::EndRestoreTransaction()
+{
+    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
+    {
+        (*iter)->EndRestoreTransaction();
+    }
+}
+
+void CUndoManager::SignalNumUndoRedoToListeners()
+{
+    for (IUndoManagerListener* listener : m_listeners)
+    {
+        listener->SignalNumUndoRedo(m_undoStack.size(), m_redoStack.size());
+    }
+}
+
+void CUndoManager::SignalUndoFlushedToListeners()
+{
+    for (IUndoManagerListener* listener : m_listeners)
+    {
+        listener->UndoStackFlushed();
+    }
+}
+
+bool CUndoManager::IsUndoRecording() const
+{
+    return (m_bRecording || m_bSuperRecording) && m_suspendCount == 0;
+}
+
+bool CUndoManager::IsUndoSuspended() const
+{
+    return m_suspendCount != 0;
+}
diff --git a/Code/Editor/Undo/Undo.h b/Code/Editor/Undo/Undo.h
new file mode 100644
index 0000000000..c523035963
--- /dev/null
+++ b/Code/Editor/Undo/Undo.h
@@ -0,0 +1,292 @@
+/*
+ * 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_EDITORCORE_UNDO_UNDO_H
+#define CRYINCLUDE_EDITORCORE_UNDO_UNDO_H
+#pragma once
+
+#include "IUndoManagerListener.h"
+#include "CrySizer.h"                           // ICrySizer
+#include "IUndoObject.h"
+#include <AzCore/Asset/AssetManager.h>
+
+struct IUndoObject;
+class CSuperUndoStep;
+class AssetManagerUndoInterruptor;
+
+//! CUndo is a collection of IUndoObjects instances that forms single undo step.
+class CUndoStep
+{
+public:
+    CUndoStep() {};
+    virtual ~CUndoStep() { ClearObjects(); }
+
+    //! Set undo object name.
+    void SetName(const QString& name) { m_name = name; };
+    //! Get undo object name.
+    const QString& GetName() { return m_name; };
+
+    //! Add new undo object to undo step.
+    void AddUndoObject(IUndoObject* o)
+    {
+        m_undoObjects.push_back(o);
+    }
+    void ClearObjects()
+    {
+        int i;
+        // Release all undo objects.
+        std::vector<IUndoObject*> undoObjects = m_undoObjects;
+        m_undoObjects.clear();
+
+        for (i = 0; i < undoObjects.size(); i++)
+        {
+            undoObjects[i]->Release();
+        }
+    };
+    virtual int GetSize() const
+    {
+        int size = 0;
+        for (int i = 0; i < m_undoObjects.size(); i++)
+        {
+            size += m_undoObjects[i]->GetSize();
+        }
+        return size;
+    }
+    // Confetti: Get the size of m_undoObjects
+    virtual int GetCount() const
+    {
+        return m_undoObjects.size();
+    }
+    virtual bool IsEmpty() const { return m_undoObjects.empty(); };
+    virtual void Undo(bool bUndo)
+    {
+        for (int i = m_undoObjects.size() - 1; i >= 0; i--)
+        {
+            m_undoObjects[i]->Undo(bUndo);
+        }
+    }
+    virtual void Redo()
+    {
+        for (int i = 0; i < m_undoObjects.size(); i++)
+        {
+            m_undoObjects[i]->Redo();
+        }
+    }
+
+    // to get memory statistics
+    void GetMemoryUsage(ICrySizer* pSizer)
+    {
+        size_t nThisSize = sizeof(*this);
+
+        for (int i = 0; i < m_undoObjects.size(); i++)
+        {
+            nThisSize += m_undoObjects[i]->GetSize();
+        }
+
+        pSizer->Add(m_name);
+        pSizer->Add(this, nThisSize);
+    }
+
+    // get undo object at index i
+    IUndoObject* GetUndoObject(int i = 0)
+    {
+        if (i < m_undoObjects.size())
+        {
+            return m_undoObjects[i];
+        }
+        return nullptr;
+    }
+
+    const QString GetObjectNames()
+    {
+        QString objNamesStr("");
+        std::vector<QString> objNames;
+
+        bool bFirst = true;
+        for (int i = 0; i < m_undoObjects.size(); ++i)
+        {
+            if (!m_undoObjects[i])
+            {
+                continue;
+            }
+
+            if (m_undoObjects[i]->GetObjectName() == NULL)
+            {
+                continue;
+            }
+
+            if (stl::find(objNames, m_undoObjects[i]->GetObjectName()))
+            {
+                continue;
+            }
+
+            if (bFirst == false)
+            {
+                objNamesStr += ",";
+            }
+            else
+            {
+                bFirst = false;
+            }
+
+            objNamesStr += m_undoObjects[i]->GetObjectName();
+
+            objNames.push_back(m_undoObjects[i]->GetObjectName());
+        }
+
+        return objNamesStr;
+    };
+
+private: // ------------------------------------------------------
+
+    friend class CUndoManager;
+    QString m_name;
+    // Undo objects registered for this step.
+    std::vector<IUndoObject*> m_undoObjects;
+};
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+/*!
+ *  CUndoManager is keeping and operating on CUndo class instances.
+ */
+class EDITOR_CORE_API CUndoManager
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    CUndoManager();
+    ~CUndoManager();
+
+    //! Begin operation requiring undo.
+    //! Undo manager enters holding state.
+    void Begin();
+    //! Restore all undo objects registered since last Begin call.
+    //! @param bUndo if true all Undo object registered up to this point will be undone.
+    void Restore(bool bUndo);
+    //! Accept changes and registers an undo object with the undo manager.
+    //! This will allow the user to undo the operation.
+    void Accept(const QString& name);
+    //! Cancel changes and restore undo objects.
+    void Cancel();
+
+    //! Normally this is NOT needed but in special cases this can be useful.
+    //! This allows to group a set of Begin()/Accept() sequences to be undone in one operation.
+    void SuperBegin();
+    //! When a SuperBegin() used, this method is used to Accept.
+    //! This leaves the undo database in its modified state and registers the IUndoObjects with the undo system.
+    //! This will allow the user to undo the operation.
+    void SuperAccept(const QString& name);
+    //! Cancel changes and restore undo objects.
+    void SuperCancel();
+
+    //! Temporarily suspends recording of undo.
+    void Suspend();
+    //! Resume recording if was suspended.
+    void Resume();
+
+    // Undo last operation.
+    void Undo(int numSteps = 1);
+
+    // Undo a specific operation
+    void Reset(const QString& name);
+
+    //! Redo last undo.
+    void Redo(int numSteps = 1);
+
+    //! Check if undo information is recording now.
+    bool IsUndoRecording() const;
+
+    //////////////////////////////////////////////////////////////////////////
+    bool IsUndoSuspended() const;
+
+    //! Put new undo object, must be called between Begin and Accept/Cancel methods.
+    void RecordUndo(IUndoObject* obj);
+
+    bool IsHaveUndo() const;
+    bool IsHaveRedo() const;
+    
+    void SetMaxUndoStep(int steps);
+    int GetMaxUndoStep() const;
+
+    //! Returns length of undo stack.
+    int GetUndoStackLen() const;
+    //! Returns length of redo stack.
+    int GetRedoStackLen() const;
+
+    //! Retreves array of undo objects names.
+    std::vector<QString> GetUndoStackNames() const;
+    //! Retreves array of redo objects names.
+    std::vector<QString> GetRedoStackNames() const;
+
+    //! Get size of current Undo and redo database size.
+    int GetDatabaseSize();
+
+    //! Completly flush all Undo and redo buffers.
+    //! Must be done on level reloads or global Fetch operation.
+    void Flush();
+
+    //! Get Next Undo Item and Next Redo Item -- Vera, Confetti
+    CUndoStep* GetNextUndo();
+    CUndoStep* GetNextRedo();
+
+
+    void ClearRedoStack();
+    void ClearUndoStack();
+
+    void ClearUndoStack(int num);
+    void ClearRedoStack(int num);
+
+    // to get memory statistics
+    void GetMemoryUsage(ICrySizer* pSizer);
+
+    void AddListener(IUndoManagerListener* pListener);
+    void RemoveListener(IUndoManagerListener* pListener);
+
+    int GetSuspendCount() { return m_suspendCount; }
+
+private: // ---------------------------------------------------------------
+
+    void BeginUndoTransaction();
+    void EndUndoTransaction();
+    void BeginRestoreTransaction();
+    void EndRestoreTransaction();
+    void SignalNumUndoRedoToListeners();
+    void SignalUndoFlushedToListeners();
+
+    bool                                            m_bRecording;
+    bool                                            m_bSuperRecording;
+    int                                             m_suspendCount;
+
+    bool                                            m_bUndoing;
+    bool                                            m_bRedoing;
+
+    bool                                            m_bClearRedoStackQueued;
+
+    CUndoStep*                             m_currentUndo;
+    //! Undo step object created by SuperBegin.
+    CSuperUndoStep*                    m_superUndo;
+
+    AssetManagerUndoInterruptor* m_assetManagerUndoInterruptor;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    std::list<CUndoStep*>      m_undoStack;
+    std::list<CUndoStep*>      m_redoStack;
+
+    std::vector<IUndoManagerListener*> m_listeners;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+
+class CScopedSuspendUndo
+{
+public:
+    CScopedSuspendUndo() { GetIEditor()->SuspendUndo(); }
+    ~CScopedSuspendUndo() { GetIEditor()->ResumeUndo(); }
+};
+
+#endif // CRYINCLUDE_EDITORCORE_UNDO_UNDO_H
diff --git a/Code/Editor/Undo/UndoVariableChange.h b/Code/Editor/Undo/UndoVariableChange.h
new file mode 100644
index 0000000000..ae655369c1
--- /dev/null
+++ b/Code/Editor/Undo/UndoVariableChange.h
@@ -0,0 +1,118 @@
+/*
+ * 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_UNDO_UNDOVARIABLECHANGE_H
+#define CRYINCLUDE_EDITOR_UNDO_UNDOVARIABLECHANGE_H
+#pragma once
+
+#include "IUndoObject.h"
+
+#include "Util/Variable.h"
+
+class CAttributeItem;
+
+//////////////////////////////////////////////////////////////////////////
+//! Undo object for Variable in property control..
+class CUndoVariableChange
+    : public IUndoObject
+{
+public:
+    CUndoVariableChange(IVariable* var, const char* undoDescription, const char* editorObjfullname = 0)
+    {
+        // Stores the current state of this object.
+        assert(var != 0);
+        m_undoDescription = undoDescription;
+        m_var = var;
+        m_undo = m_var->Clone(false);
+        m_EditorObjFullName = editorObjfullname;
+    }
+
+protected:
+    virtual int GetSize()
+    {
+        int size = sizeof(*this);
+        //if (m_var)
+        //size += m_var->GetSize();
+        if (m_undo)
+        {
+            size += m_undo->GetSize();
+        }
+        if (m_redo)
+        {
+            size += m_redo->GetSize();
+        }
+        return size;
+    }
+
+    virtual QString GetDescription()
+    {
+        return m_undoDescription;
+    }
+
+    virtual void Undo(bool bUndo)
+    {
+        if (bUndo)
+        {
+            m_redo = m_var->Clone(false);
+        }
+        m_var->CopyValue(m_undo);
+    }
+
+    virtual void Redo()
+    {
+        if (m_redo)
+        {
+            m_var->CopyValue(m_redo);
+        }
+    }
+
+    virtual QString GetEditorObjectName()
+    {
+        return m_EditorObjFullName;
+    };
+
+    void SetEditorObjName(const char* fullname)
+    {
+        m_EditorObjFullName = fullname;
+    }
+
+private:
+    QString m_undoDescription;
+    QString m_EditorObjFullName;        // Add related editor object name so we can track undo by editor object
+    TSmartPtr<IVariable> m_undo;
+    TSmartPtr<IVariable> m_redo;
+    TSmartPtr<IVariable> m_var;
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+// Confetti Start
+// This undoobject class is responsible for recording varialeundo action reqiure QTUI reaction.
+// This class will store a CAttributeView. Editor plugin is responsible for deal with QTUI actions.
+class CUndoQTUIVariableChange
+    : public CUndoVariableChange
+{
+public:
+    CUndoQTUIVariableChange(IVariable* var, CAttributeItem* widget, const char* undoDescription, const char* editorObjfullname = 0)
+        : CUndoVariableChange(var, undoDescription, editorObjfullname)
+    {
+        // Stores the current state of this object.
+        m_uiWidget = widget;
+    }
+
+    CAttributeItem* getWidget() const
+    {
+        return m_uiWidget;
+    }
+
+private:
+    CAttributeItem* m_uiWidget;
+};
+// Confetti End
+////////////////////////////////////////////////////////////////////////
+
+
+#endif // CRYINCLUDE_EDITOR_UNDO_UNDO_H
diff --git a/Code/Editor/UndoConfigSpec.cpp b/Code/Editor/UndoConfigSpec.cpp
new file mode 100644
index 0000000000..a8d8f96026
--- /dev/null
+++ b/Code/Editor/UndoConfigSpec.cpp
@@ -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
+ *
+ */
+
+
+// Description : Undo for Python function (PySetConfigSpec)
+
+
+#include "EditorDefs.h"
+
+#include "UndoConfigSpec.h"
+
+CUndoConficSpec::CUndoConficSpec(const QString& pUndoDescription)
+{
+    m_undo = GetIEditor()->GetEditorConfigSpec();
+    m_undoDescription = pUndoDescription;
+}
+
+int CUndoConficSpec::GetSize()
+{
+    return sizeof(*this);
+}
+
+QString CUndoConficSpec::GetDescription()
+{
+    return m_undoDescription;
+}
+
+void CUndoConficSpec::Undo(bool bUndo)
+{
+    if (bUndo)
+    {
+        m_redo = GetIEditor()->GetEditorConfigSpec();
+    }
+    GetIEditor()->SetEditorConfigSpec((ESystemConfigSpec)m_undo, GetIEditor()->GetEditorConfigPlatform());
+}
+
+void CUndoConficSpec::Redo()
+{
+    GetIEditor()->SetEditorConfigSpec((ESystemConfigSpec)m_redo, GetIEditor()->GetEditorConfigPlatform());
+}
diff --git a/Code/Editor/UndoConfigSpec.h b/Code/Editor/UndoConfigSpec.h
new file mode 100644
index 0000000000..2f29721f19
--- /dev/null
+++ b/Code/Editor/UndoConfigSpec.h
@@ -0,0 +1,36 @@
+/*
+ * 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 : Undo for Python function (PySetConfigSpec)
+
+
+#ifndef CRYINCLUDE_EDITOR_UNDOCONFIGSPEC_H
+#define CRYINCLUDE_EDITOR_UNDOCONFIGSPEC_H
+#pragma once
+
+#include "Undo/IUndoObject.h"
+
+class CUndoConficSpec
+    : public IUndoObject
+{
+public:
+    CUndoConficSpec(const QString& pUndoDescription = "Set Config Spec");
+
+protected:
+    int GetSize();
+    QString GetDescription();
+    void Undo(bool bUndo);
+    void Redo();
+
+private:
+    int m_undo;
+    int m_redo;
+    QString m_undoDescription;
+};
+
+#endif // CRYINCLUDE_EDITOR_UNDOCONFIGSPEC_H
diff --git a/Code/Editor/UndoDropDown.cpp b/Code/Editor/UndoDropDown.cpp
new file mode 100644
index 0000000000..7f8457ce5d
--- /dev/null
+++ b/Code/Editor/UndoDropDown.cpp
@@ -0,0 +1,246 @@
+/*
+ * 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 "UndoDropDown.h"
+
+#include <vector>               // for std::vector
+#include <algorithm>            // for std::reverse
+
+// Qt
+#include <QVBoxLayout>
+#include <QListView>
+#include <QAbstractListModel>
+#include <QPushButton>
+
+// Editor
+#include "Undo/Undo.h"          // for CUndoManager
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Turns listener callbacks into signals
+
+UndoStackStateAdapter::UndoStackStateAdapter(QObject* parent /* = nullptr */)
+    : QObject(parent)
+{
+    GetIEditor()->GetUndoManager()->AddListener(this);
+}
+
+UndoStackStateAdapter::~UndoStackStateAdapter()
+{
+    GetIEditor()->GetUndoManager()->RemoveListener(this);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// The model that holds the list of undo/redo actions
+
+class UndoDropDownListModel
+    : public QAbstractListModel
+    , IUndoManagerListener
+{
+public:
+    UndoDropDownListModel(CUndoManager& manager, UndoRedoDirection direction, QObject* parent = nullptr)
+        : QAbstractListModel(parent)
+        , m_manager(manager)
+        , m_direction(direction)
+    {
+        m_stackNames = m_direction == UndoRedoDirection::Undo ? m_manager.GetUndoStackNames() : m_manager.GetRedoStackNames();
+        m_manager.AddListener(this);
+    }
+
+    virtual ~UndoDropDownListModel()
+    {
+        m_manager.RemoveListener(this);
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        if (parent.model() != this && parent != QModelIndex())
+        {
+            return 0;
+        }
+
+        return m_stackNames.size();
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (index.row() < 0 || index.row() >= rowCount() || role != Qt::DisplayRole)
+        {
+            return {};
+        }
+
+        return m_stackNames[index.row()];
+    }
+
+    void SignalNumUndoRedo(const unsigned int& numUndo, const unsigned int& numRedo)
+    {
+        std::vector<QString> fresh;
+        if (UndoRedoDirection::Undo == m_direction && m_stackNames.size() != numUndo)
+        {
+            fresh = m_manager.GetUndoStackNames();
+        }
+        else if (UndoRedoDirection::Redo == m_direction && m_stackNames.size() != numRedo)
+        {
+            fresh = m_manager.GetRedoStackNames();
+        }
+        else
+        {
+            return;
+        }
+
+        std::reverse(fresh.begin(), fresh.end());
+
+        if (fresh.size() < m_stackNames.size())
+        {
+            beginRemoveRows(createIndex(-1, -1), fresh.size(), m_stackNames.size() - 1);
+            m_stackNames = fresh;
+            endRemoveRows();
+        }
+        else
+        {
+            beginInsertRows(createIndex(-1, -1), m_stackNames.size(), fresh.size() - 1);
+            m_stackNames = fresh;
+            endInsertRows();
+        }
+    }
+
+private:
+    CUndoManager& m_manager;
+    UndoRedoDirection m_direction;
+    std::vector<QString> m_stackNames;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Custom selection model we use for the list of undo/redo actions
+
+void UndoStackItemSelectionModel::select(const QModelIndex& index, QItemSelectionModel::SelectionFlags command)
+{
+    if (!model())
+    {
+        return;
+    }
+
+    if (index.isValid())
+    {
+        QItemSelectionModel::select({ model()->index(0, 0, {}), index }, command);
+    }
+    clearCurrentIndex();
+}
+
+void UndoStackItemSelectionModel::select([[maybe_unused]] const QItemSelection& selection, QItemSelectionModel::SelectionFlags command)
+{
+    QPoint mouse = m_view->mapFromGlobal(QCursor::pos());
+    QModelIndex first = model()->index(0, 0, {});
+    QModelIndex last = model()->index(model()->rowCount() - 1, 0, {});
+    QModelIndex underMouse = m_view->indexAt(mouse);
+
+    if (underMouse.isValid())
+    {
+        last = underMouse;
+    }
+
+    QItemSelectionModel::select({ first, last }, command);
+    clearCurrentIndex();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CUndoDropDown dialog
+
+CUndoDropDown::CUndoDropDown(UndoRedoDirection direction, QWidget* pParent /* = nullptr */)
+    : QDialog(pParent)
+    , m_direction(direction)
+{
+    auto layout = new QVBoxLayout(this);
+    setLayout(layout);
+
+    // Model & view
+    m_model = new UndoDropDownListModel(*GetIEditor()->GetUndoManager(), direction, this);
+    m_view = new QListView(this);
+    m_view->setModel(m_model);
+    m_view->setSelectionModel(new UndoStackItemSelectionModel(m_view, m_model));
+    m_view->setSelectionMode(QAbstractItemView::ContiguousSelection);
+    layout->addWidget(m_view);
+
+    // The buttons along the bottom of the dropdown
+    auto buttonBox = new QHBoxLayout();
+
+    m_doButton = new QPushButton(this);
+    buttonBox->addWidget(m_doButton);
+
+    buttonBox->addStretch(1);
+
+    auto clearButton = new QPushButton(this);
+    clearButton->setText(tr("Clear"));
+
+    buttonBox->addWidget(clearButton);
+
+    layout->addLayout(buttonBox);
+
+    // Connections
+    connect(m_doButton, &QPushButton::clicked, this, &CUndoDropDown::OnUndoButton);
+    connect(clearButton, &QPushButton::clicked, this, &CUndoDropDown::OnUndoClear);
+
+    connect(m_view->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CUndoDropDown::SelectionChanged);
+
+    setMinimumWidth(450);
+}
+
+void CUndoDropDown::Prepare()
+{
+    m_view->selectionModel()->select(m_model->index(0, 0, {}), QItemSelectionModel::ClearAndSelect);
+    m_view->setFocus();
+    show();
+}
+
+void CUndoDropDown::OnUndoButton()
+{
+    int numSelected = m_view->selectionModel()->selectedIndexes().size();
+    if (m_direction == UndoRedoDirection::Undo)
+    {
+        GetIEditor()->GetUndoManager()->Undo(numSelected);
+    }
+    else
+    {
+        GetIEditor()->GetUndoManager()->Redo(numSelected);
+    }
+    accept();
+}
+
+void CUndoDropDown::OnUndoClear()
+{
+    if (m_direction == UndoRedoDirection::Undo)
+    {
+        GetIEditor()->GetUndoManager()->ClearUndoStack();
+    }
+    else
+    {
+        GetIEditor()->GetUndoManager()->ClearRedoStack();
+    }
+    accept();
+}
+
+void CUndoDropDown::SelectionChanged([[maybe_unused]] const QItemSelection& selected, [[maybe_unused]] const QItemSelection& deselected)
+{
+    QString label = QString("%1 %2 action%3")
+            .arg(m_direction == UndoRedoDirection::Undo ? tr("Undo") : tr("Redo"))
+            .arg(m_view->selectionModel()->selectedIndexes().size())
+            .arg(m_view->selectionModel()->selectedIndexes().size() > 1 ? "s" : "");
+    m_doButton->setText(label);
+}
+
+void CUndoDropDown::contextMenuEvent(QContextMenuEvent*)
+{
+    // Inhibit QDialog::contextMenuEvent() as this will trigger the "What's this" popup.
+    // That happens because we're a child of a QMenu, and menus have Qt::WA_CustomWhatsThis
+    // which make the popup show even if QWidget::whatsThis() text is empty.
+}
+
+#include <moc_UndoDropDown.cpp>
diff --git a/Code/Editor/UndoDropDown.h b/Code/Editor/UndoDropDown.h
new file mode 100644
index 0000000000..8c08a2be8a
--- /dev/null
+++ b/Code/Editor/UndoDropDown.h
@@ -0,0 +1,109 @@
+/*
+ * 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_UNDODROPDOWN_H
+#define CRYINCLUDE_EDITOR_UNDODROPDOWN_H
+
+#pragma once
+// UndoDropDown.h : header file
+//
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#include <QItemSelectionModel>
+#include "Undo/IUndoManagerListener.h"
+#endif
+
+class QAction;
+class QListView;
+class UndoDropDownListModel;
+class QAbstractItemView;
+class QContextMenuEvent;
+
+enum class UndoRedoDirection
+{
+    Undo,
+    Redo
+};
+
+/// Turns IUndoManagerListener callbacks into signals
+class UndoStackStateAdapter
+    : public QObject
+    , IUndoManagerListener
+{
+    Q_OBJECT
+
+public:
+    explicit UndoStackStateAdapter(QObject* parent = nullptr);
+
+    ~UndoStackStateAdapter();
+
+    void SignalNumUndoRedo(const unsigned int& numUndo, const unsigned int& numRedo)
+    {
+        emit UndoAvailable(numUndo);
+        emit RedoAvailable(numRedo);
+    }
+
+signals:
+    void UndoAvailable(quint32 count);
+    void RedoAvailable(quint32 count);
+};
+
+/// Enforces contiguous selections from the top element in the list view to any that is selected below
+class UndoStackItemSelectionModel
+    : public QItemSelectionModel
+{
+    Q_OBJECT
+public:
+    UndoStackItemSelectionModel(QAbstractItemView* view, QAbstractItemModel* model)
+        : QItemSelectionModel(model)
+        , m_view(view)
+    {}
+
+    virtual ~UndoStackItemSelectionModel() {}
+
+public slots:
+    void select(const QModelIndex& index, QItemSelectionModel::SelectionFlags command) override;
+    void select(const QItemSelection& selection, QItemSelectionModel::SelectionFlags command) override;
+
+private:
+    QAbstractItemView* m_view;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// CUndoDropDown dialog
+
+class CUndoDropDown
+    : public QDialog
+{
+    Q_OBJECT
+
+    // Construction
+public:
+    CUndoDropDown(UndoRedoDirection direction, QWidget* pParent = nullptr);   // standard constructor
+
+public slots:
+    // Prepare to be shown in the popup/dropdown
+    void Prepare();
+
+    // Implementation
+protected:
+    void OnUndoButton();
+    void OnUndoClear();
+    void contextMenuEvent(QContextMenuEvent*) override;
+
+    UndoRedoDirection m_direction;
+    UndoDropDownListModel* m_model;
+    QListView* m_view;
+    QPushButton* m_doButton;
+
+private slots:
+    void SelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
+};
+
+#endif // CRYINCLUDE_EDITOR_UNDODROPDOWN_H
diff --git a/Code/Editor/UndoViewPosition.cpp b/Code/Editor/UndoViewPosition.cpp
new file mode 100644
index 0000000000..972dbb467b
--- /dev/null
+++ b/Code/Editor/UndoViewPosition.cpp
@@ -0,0 +1,66 @@
+/*
+ * 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 : Undo for Python function (PySetCurrentViewPosition)
+
+
+#include "EditorDefs.h"
+
+#include "UndoViewPosition.h"
+
+// Editor
+#include "ViewManager.h"
+
+CUndoViewPosition::CUndoViewPosition(const QString& pUndoDescription)
+{
+    m_undoDescription = pUndoDescription;
+
+    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+    if (pRenderViewport)
+    {
+        Matrix34 tm = pRenderViewport->GetViewTM();
+        m_undo = tm.GetTranslation();
+    }
+}
+
+int CUndoViewPosition::GetSize()
+{
+    return sizeof(*this);
+}
+
+QString CUndoViewPosition::GetDescription()
+{
+    return m_undoDescription;
+}
+
+void CUndoViewPosition::Undo(bool bUndo)
+{
+    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+    if (pRenderViewport)
+    {
+        Matrix34 tm = pRenderViewport->GetViewTM();
+        if (bUndo)
+        {
+            m_redo = tm.GetTranslation();
+        }
+
+        tm.SetTranslation(m_undo);
+        pRenderViewport->SetViewTM(tm);
+    }
+}
+
+void CUndoViewPosition::Redo()
+{
+    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+    if (pRenderViewport)
+    {
+        Matrix34 tm = pRenderViewport->GetViewTM();
+        tm.SetTranslation(m_redo);
+        pRenderViewport->SetViewTM(tm);
+    }
+}
diff --git a/Code/Editor/UndoViewPosition.h b/Code/Editor/UndoViewPosition.h
new file mode 100644
index 0000000000..1d48ba4196
--- /dev/null
+++ b/Code/Editor/UndoViewPosition.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Undo for Python function (PySetCurrentViewPosition)
+
+#ifndef CRYINCLUDE_EDITOR_UNDOVIEWPOSITION_H
+#define CRYINCLUDE_EDITOR_UNDOVIEWPOSITION_H
+#pragma once
+
+#include "Undo/IUndoObject.h"
+
+class CUndoViewPosition
+    : public IUndoObject
+{
+public:
+    CUndoViewPosition(const QString& pUndoDescription = "Set Current View Position");
+
+protected:
+    int GetSize();
+    QString GetDescription();
+    void Undo(bool bUndo);
+    void Redo();
+
+private:
+    Vec3 m_undo;
+    Vec3 m_redo;
+    QString m_undoDescription;
+};
+
+#endif // CRYINCLUDE_EDITOR_UNDOVIEWPOSITION_H
diff --git a/Code/Editor/UndoViewRotation.cpp b/Code/Editor/UndoViewRotation.cpp
new file mode 100644
index 0000000000..7d470d0f04
--- /dev/null
+++ b/Code/Editor/UndoViewRotation.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
+ *
+ */
+
+
+// Description : Undo for Python function (PySetCurrentViewPosition)
+
+
+#include "EditorDefs.h"
+
+#include "UndoViewRotation.h"
+
+// Editor
+#include "ViewManager.h"
+
+CUndoViewRotation::CUndoViewRotation(const QString& pUndoDescription)
+{
+    m_undoDescription = pUndoDescription;
+    m_undo = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(GetIEditor()->GetSystem()->GetViewCamera().GetMatrix())));
+}
+
+int CUndoViewRotation::GetSize()
+{
+    return sizeof(*this);
+}
+
+QString CUndoViewRotation::GetDescription()
+{
+    return m_undoDescription;
+}
+
+void CUndoViewRotation::Undo(bool bUndo)
+{
+    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+    if (pRenderViewport)
+    {
+        if (bUndo)
+        {
+            m_redo = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(GetIEditor()->GetSystem()->GetViewCamera().GetMatrix())));
+        }
+
+        Matrix34 tm = pRenderViewport->GetViewTM();
+        tm.SetRotationXYZ(Ang3(DEG2RAD(m_undo.x), DEG2RAD(m_undo.y), DEG2RAD(m_undo.z)), tm.GetTranslation());
+        pRenderViewport->SetViewTM(tm);
+    }
+}
+
+void CUndoViewRotation::Redo()
+{
+    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
+    if (pRenderViewport)
+    {
+        Matrix34 tm = pRenderViewport->GetViewTM();
+        tm.SetRotationXYZ(Ang3(DEG2RAD(m_redo.x), DEG2RAD(m_redo.y), DEG2RAD(m_redo.z)), tm.GetTranslation());
+        pRenderViewport->SetViewTM(tm);
+    }
+}
diff --git a/Code/Editor/UndoViewRotation.h b/Code/Editor/UndoViewRotation.h
new file mode 100644
index 0000000000..242cb91ed6
--- /dev/null
+++ b/Code/Editor/UndoViewRotation.h
@@ -0,0 +1,36 @@
+/*
+ * 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 : Undo for Python function (PySetCurrentViewRotation)
+
+
+#ifndef CRYINCLUDE_EDITOR_UNDOVIEWROTATION_H
+#define CRYINCLUDE_EDITOR_UNDOVIEWROTATION_H
+#pragma once
+#include "Undo/IUndoObject.h"
+
+
+class CUndoViewRotation
+    : public IUndoObject
+{
+public:
+    CUndoViewRotation(const QString& pUndoDescription = "Set Current View Rotation");
+
+protected:
+    int GetSize();
+    QString GetDescription();
+    void Undo(bool bUndo);
+    void Redo();
+
+private:
+    Ang3 m_undo;
+    Ang3 m_redo;
+    QString m_undoDescription;
+};
+
+#endif // CRYINCLUDE_EDITOR_UNDOVIEWROTATION_H
diff --git a/Code/Editor/UsedResources.cpp b/Code/Editor/UsedResources.cpp
new file mode 100644
index 0000000000..b9ae63d8f1
--- /dev/null
+++ b/Code/Editor/UsedResources.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 "EditorDefs.h"
+
+#include "UsedResources.h"
+#include "ErrorReport.h"
+
+CUsedResources::CUsedResources()
+{
+}
+
+void CUsedResources::Add(const char* pResourceFileName)
+{
+    if (pResourceFileName && strcmp(pResourceFileName, ""))
+    {
+        files.insert(pResourceFileName);
+    }
+}
diff --git a/Code/Editor/UsedResources.h b/Code/Editor/UsedResources.h
new file mode 100644
index 0000000000..5bf174c4e1
--- /dev/null
+++ b/Code/Editor/UsedResources.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
+//! Class passed to resource gathering functions
+#ifndef CRYINCLUDE_EDITOR_USEDRESOURCES_H
+#define CRYINCLUDE_EDITOR_USEDRESOURCES_H
+
+#include "Include/EditorCoreAPI.h"
+
+class EDITOR_CORE_API CUsedResources
+{
+public:
+    typedef std::set<QString, stl::less_stricmp<QString> > TResourceFiles;
+
+    CUsedResources();
+    void Add(const char* pResourceFileName);
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    TResourceFiles files;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+#endif // CRYINCLUDE_EDITOR_USEDRESOURCES_H
diff --git a/Code/Editor/UserMessageDefines.h b/Code/Editor/UserMessageDefines.h
new file mode 100644
index 0000000000..1c2593c7b7
--- /dev/null
+++ b/Code/Editor/UserMessageDefines.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_USERMESSAGEDEFINES_H
+#define CRYINCLUDE_EDITOR_USERMESSAGEDEFINES_H
+#pragma once
+
+
+enum ESandboxUserMessages
+{
+    // InPlaceComboBox
+    WM_USER_ON_SELECTION_CANCEL = WM_USER + 1,
+    WM_USER_ON_SELECTION_OK,
+    WM_USER_ON_NEW_SELECTION,
+    WM_USER_ON_EDITCHANGE,
+    WM_USER_ON_OPENDROPDOWN,
+    WM_USER_ON_EDITKEYDOWN,
+    WM_USER_ON_EDITCLICK,
+    // ACListWnd
+    ENAC_UPDATE,
+    // EditWithButton
+    WM_USER_EDITWITHBUTTON_CLICKED,
+    // FillSliderCtrl
+    WMU_FS_CHANGED,
+    WMU_FS_LBUTTONDOWN,
+    WMU_FS_LBUTTONUP,
+    FLM_EDITTEXTCHANGED,
+    FLM_FILTERTEXTCHANGED,
+    // NumberCtrlEdit
+    WMU_LBUTTONDOWN,
+    WMU_LBUTTONUP,
+    WM_ONWINDOWFOCUSCHANGES,
+    // SelectObjectDialog
+    IDT_TIMER_0,
+    IDT_TIMER_1,
+    // LensFlareEditor
+    WM_FLAREEDITOR_UPDATETREECONTROL,
+    // EquipPackDialog
+    UM_EQUIPLIST_CHECKSTATECHANGE,
+    // MaterialSender/MatEditMainDlg
+    WM_MATEDITPICK,
+    // GridMapWindow
+    WM_USER_ON_DBL_CLICK,
+    // LMCompDialog
+    WM_UPDATE_LIGHTMAP_GENERATION_PROGRESS,
+    WM_UPDATE_LIGHTMAP_GENERATION_MEMUSAGE,
+    WM_UPDATE_LIGHTMAP_GENERATION_MEMUSAGE_STATIC,
+    WM_UPDATE_GLM_NAME_EDIT,
+    // Viewport
+    WM_VIEWPORT_ON_TITLE_CHANGE,
+    // VisualLogControls
+    UWM_BUTTON_CLICKED,
+};
+#endif // CRYINCLUDE_EDITOR_USERMESSAGEDEFINES_H
diff --git a/Code/Editor/Util/3DConnexionDriver.cpp b/Code/Editor/Util/3DConnexionDriver.cpp
new file mode 100644
index 0000000000..7b03ce36e0
--- /dev/null
+++ b/Code/Editor/Util/3DConnexionDriver.cpp
@@ -0,0 +1,176 @@
+/*
+ * 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 "3DConnexionDriver.h"
+
+#if defined(AZ_PLATFORM_WINDOWS)
+
+//////////////////////////////////////////////////////////////////////////
+C3DConnexionDriver::C3DConnexionDriver()
+{
+    m_pRawInputDeviceList = 0;
+    m_pRawInputDevices = 0;
+    m_nUsagePage1Usage8Devices = 0;
+    m_fMultiplier = 1.0f;
+
+    InitDevice();
+}
+
+//////////////////////////////////////////////////////////////////////////
+C3DConnexionDriver::~C3DConnexionDriver()
+{
+}
+
+bool C3DConnexionDriver::InitDevice()
+{
+    // Find the Raw Devices
+    UINT nDevices;
+    // Get Number of devices attached
+    if (GetRawInputDeviceList(NULL, &nDevices, sizeof(RAWINPUTDEVICELIST)) != 0)
+    {
+        return false;
+    }
+    // Create list large enough to hold all RAWINPUTDEVICE structs
+    if ((m_pRawInputDeviceList = (PRAWINPUTDEVICELIST)malloc(sizeof(RAWINPUTDEVICELIST) * nDevices)) == NULL)
+    {
+        return false;
+    }
+    // Now get the data on the attached devices
+    if (GetRawInputDeviceList(m_pRawInputDeviceList, &nDevices, sizeof(RAWINPUTDEVICELIST)) == -1)
+    {
+        return false;
+    }
+
+    m_pRawInputDevices = (PRAWINPUTDEVICE)malloc(nDevices * sizeof(RAWINPUTDEVICE));
+    m_nUsagePage1Usage8Devices = 0;
+
+    // Look through device list for RIM_TYPEHID devices with UsagePage == 1, Usage == 8
+    for (UINT i = 0; i < nDevices; i++)
+    {
+        //Doc says RIM_TYPEHID: Data comes from an HID that is not a keyboard or a mouse.
+        if (m_pRawInputDeviceList[i].dwType == RIM_TYPEHID)
+        {
+            UINT nchars = 300;
+            TCHAR deviceName[300];
+            if (GetRawInputDeviceInfo(m_pRawInputDeviceList[i].hDevice,
+                    RIDI_DEVICENAME, deviceName, &nchars) >= 0)
+            {
+                //_RPT3(_CRT_WARN, "Device[%d]: handle=0x%x name = %S\n", i, g_pRawInputDeviceList[i].hDevice, deviceName);
+            }
+
+            RID_DEVICE_INFO dinfo;
+            UINT sizeofdinfo = sizeof(dinfo);
+            dinfo.cbSize = sizeofdinfo;
+            if (GetRawInputDeviceInfo(m_pRawInputDeviceList[i].hDevice,
+                    RIDI_DEVICEINFO, &dinfo, &sizeofdinfo) >= 0)
+            {
+                if (dinfo.dwType == RIM_TYPEHID)
+                {
+                    RID_DEVICE_INFO_HID* phidInfo = &dinfo.hid;
+                    // Add this one to the list of interesting devices?
+                    // Actually only have to do this once to get input from all usage 1, usagePage 8 devices
+                    // This just keeps out the other usages.
+                    // You might want to put up a list for users to select amongst the different devices.
+                    // In particular, to assign separate functionality to the different devices.
+                    if (phidInfo->usUsagePage == 1 && phidInfo->usUsage == 8)
+                    {
+                        m_pRawInputDevices[m_nUsagePage1Usage8Devices].usUsagePage = phidInfo->usUsagePage;
+                        m_pRawInputDevices[m_nUsagePage1Usage8Devices].usUsage     = phidInfo->usUsage;
+                        m_pRawInputDevices[m_nUsagePage1Usage8Devices].dwFlags     = 0;
+                        m_pRawInputDevices[m_nUsagePage1Usage8Devices].hwndTarget  = NULL;
+                        m_nUsagePage1Usage8Devices++;
+                    }
+                }
+            }
+        }
+    }
+
+    // Register for input from the devices in the list
+    if (RegisterRawInputDevices(m_pRawInputDevices, m_nUsagePage1Usage8Devices, sizeof(RAWINPUTDEVICE)) == false)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool C3DConnexionDriver::GetInputMessageData(LPARAM lParam, S3DConnexionMessage& msg)
+{
+    ZeroStruct(msg);
+
+    RAWINPUTHEADER header;
+    UINT size = sizeof(header);
+    if (GetRawInputData((HRAWINPUT)lParam, RID_HEADER, &header,  &size, sizeof(RAWINPUTHEADER)) == -1)
+    {
+        return false;
+    }
+
+    // Set aside enough memory for the full event
+    char rawbuffer[128];
+    LPRAWINPUT event = (LPRAWINPUT)rawbuffer;
+    size = sizeof(rawbuffer);
+    if (GetRawInputData((HRAWINPUT)lParam, RID_INPUT, event, &size, sizeof(RAWINPUTHEADER)) == -1)
+    {
+        return false;
+    }
+    else
+    {
+        if (event->header.dwType == RIM_TYPEHID)
+        {
+            static BOOL bGotTranslation = FALSE,
+                        bGotRotation    = FALSE;
+            static int all6DOFs[6] = {0};
+            LPRAWHID pRawHid = &event->data.hid;
+
+            // Translation or Rotation packet?  They come in two different packets.
+            if (pRawHid->bRawData[0] == 1) // Translation vector
+            {
+                msg.raw_translation[0] = (pRawHid->bRawData[1] & 0x000000ff) | ((signed short)(pRawHid->bRawData[2] << 8) & 0xffffff00);
+                msg.raw_translation[1] = (pRawHid->bRawData[3] & 0x000000ff) | ((signed short)(pRawHid->bRawData[4] << 8) & 0xffffff00);
+                msg.raw_translation[2] = (pRawHid->bRawData[5] & 0x000000ff) | ((signed short)(pRawHid->bRawData[6] << 8) & 0xffffff00);
+                msg.vTranslate.x = msg.raw_translation[0] / 255.f * m_fMultiplier;
+                msg.vTranslate.y = msg.raw_translation[1] / 255.f * m_fMultiplier;
+                msg.vTranslate.z = msg.raw_translation[2] / 255.f * m_fMultiplier;
+                msg.bGotTranslation = true;
+            }
+            else if (pRawHid->bRawData[0] == 2) // Rotation vector
+            {
+                msg.raw_rotation[0] = (pRawHid->bRawData[1] & 0x000000ff) | ((signed short)(pRawHid->bRawData[2] << 8) & 0xffffff00);
+                msg.raw_rotation[1] = (pRawHid->bRawData[3] & 0x000000ff) | ((signed short)(pRawHid->bRawData[4] << 8) & 0xffffff00);
+                msg.raw_rotation[2] = (pRawHid->bRawData[5] & 0x000000ff) | ((signed short)(pRawHid->bRawData[6] << 8) & 0xffffff00);
+                msg.vRotate.x = msg.raw_rotation[0] / 255.f * m_fMultiplier;
+                msg.vRotate.y = msg.raw_rotation[1] / 255.f * m_fMultiplier;
+                msg.vRotate.z = msg.raw_rotation[2] / 255.f * m_fMultiplier;
+                msg.bGotRotation = true;
+            }
+            else if (pRawHid->bRawData[0] == 3) // Buttons (display most significant byte to least)
+            {
+                msg.buttons[0] = (unsigned char)pRawHid->bRawData[1];
+                msg.buttons[1] = (unsigned char)pRawHid->bRawData[2];
+                msg.buttons[2] = (unsigned char)pRawHid->bRawData[3];
+
+                CryLog("Button mask: %.2x %.2x %.2x\n", (unsigned char)pRawHid->bRawData[3], (unsigned char)pRawHid->bRawData[2], (unsigned char)pRawHid->bRawData[1]);
+
+                if (msg.buttons[0] == 1)
+                {
+                    m_fMultiplier /= 2.0f;
+                }
+                else if (msg.buttons[0] == 2)
+                {
+                    m_fMultiplier *= 2.0f;
+                }
+            }
+        }
+    }
+    return true;
+}
+
+#endif
diff --git a/Code/Editor/Util/3DConnexionDriver.h b/Code/Editor/Util/3DConnexionDriver.h
new file mode 100644
index 0000000000..a00d2af6aa
--- /dev/null
+++ b/Code/Editor/Util/3DConnexionDriver.h
@@ -0,0 +1,68 @@
+/*
+ * 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_3DCONNEXIONDRIVER_H
+#define CRYINCLUDE_EDITOR_UTIL_3DCONNEXIONDRIVER_H
+#pragma once
+#include "Include/IPlugin.h"
+
+struct S3DConnexionMessage
+{
+    bool bGotTranslation;
+    bool bGotRotation;
+
+    int raw_translation[3];
+    int raw_rotation[3];
+
+    Vec3 vTranslate;
+    Vec3 vRotate;
+
+    unsigned char buttons[3];
+
+    S3DConnexionMessage()
+        : bGotRotation(false)
+        , bGotTranslation(false)
+    {
+        raw_translation[0] = raw_translation[1] = raw_translation[2] = 0;
+        raw_rotation[0] = raw_rotation[1] = raw_rotation[2] = 0;
+        vTranslate.Set(0, 0, 0);
+        vRotate.Set(0, 0, 0);
+        buttons[0] = buttons[1] = buttons[2] = 0;
+    };
+};
+
+#if defined(AZ_PLATFORM_WINDOWS)
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+class SANDBOX_API C3DConnexionDriver
+    : public IPlugin
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    C3DConnexionDriver();
+    ~C3DConnexionDriver();
+
+    bool InitDevice();
+    bool GetInputMessageData(LPARAM lParam, S3DConnexionMessage& msg);
+
+    void Release() { delete this; };
+    void ShowAbout() {};
+    const char* GetPluginGUID() { return "{AD109901-9128-4ffd-8E67-137CB2B1C41B}"; };
+    DWORD GetPluginVersion() { return 1; };
+    const char* GetPluginName() { return "3DConnexionDriver"; };
+    bool CanExitNow() { return true; };
+    void OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId){}
+
+private:
+    class C3DConnexionDriverImpl* m_pImpl;
+    PRAWINPUTDEVICELIST m_pRawInputDeviceList;
+    PRAWINPUTDEVICE m_pRawInputDevices;
+    int m_nUsagePage1Usage8Devices;
+    float m_fMultiplier;
+};
+#endif
+#endif // CRYINCLUDE_EDITOR_UTIL_3DCONNEXIONDRIVER_H
diff --git a/Code/Editor/Util/AbstractGroupProxyModel.cpp b/Code/Editor/Util/AbstractGroupProxyModel.cpp
new file mode 100644
index 0000000000..fada7481e9
--- /dev/null
+++ b/Code/Editor/Util/AbstractGroupProxyModel.cpp
@@ -0,0 +1,396 @@
+/*
+ * 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 "AbstractGroupProxyModel.h"
+
+AbstractGroupProxyModel::AbstractGroupProxyModel(QObject* parent)
+    : QAbstractProxyModel(parent)
+{
+}
+
+AbstractGroupProxyModel::~AbstractGroupProxyModel()
+{
+}
+
+QVariant AbstractGroupProxyModel::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid())
+    {
+        return QVariant();
+    }
+
+    const GroupItem* group = reinterpret_cast<GroupItem*>(index.internalPointer());
+    if (index.row() >= group->subGroups.count())
+    {
+        return sourceModel()->data(mapToSource(index), role);
+    }
+    else if (role == Qt::DisplayRole && index.column() == 0 && !group->subGroups.at(index.row())->groupTitle.isEmpty())
+    {
+        return group->subGroups[index.row()]->groupTitle;
+    }
+    else if (group->subGroups.at(index.row())->groupSourceIndex.isValid())
+    {
+        return group->subGroups.at(index.row())->groupSourceIndex.data(role);
+    }
+    return QVariant();
+}
+
+int AbstractGroupProxyModel::rowCount(const QModelIndex& parent) const
+{
+    if (!sourceModel())
+    {
+        return 0;
+    }
+
+    // invalid parent - root item is used
+    if (!parent.isValid())
+    {
+        return m_rootItem.subGroups.count() + m_rootItem.sourceIndexes.count();
+    }
+    // this is the group the parent is in.
+    const GroupItem* group = reinterpret_cast<GroupItem*>(parent.internalPointer());
+    if (parent.row() < group->subGroups.count())
+    {
+        return group->subGroups[parent.row()]->subGroups.count() + group->subGroups[parent.row()]->sourceIndexes.count();
+    }
+    return 0;
+}
+
+int AbstractGroupProxyModel::columnCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent)
+    if (!sourceModel())
+    {
+        return 0;
+    }
+    return sourceModel()->columnCount(QModelIndex());
+}
+
+QModelIndex AbstractGroupProxyModel::index(int row, int column, const QModelIndex& parent) const
+{
+    if (row >= rowCount(parent) || column >= columnCount(parent))
+    {
+        return QModelIndex();
+    }
+    if (!parent.isValid())
+    {
+        return createIndex(row, column, const_cast<GroupItem*>(&m_rootItem));
+    }
+    const GroupItem* group = reinterpret_cast<GroupItem*>(parent.internalPointer());
+    GroupItem* newParent = group->subGroups[parent.row()];
+    return createIndex(row, column, newParent);
+}
+
+QVariant AbstractGroupProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    return sourceModel()->headerData(section, orientation, role);
+}
+
+QModelIndex AbstractGroupProxyModel::parent(const QModelIndex& index) const
+{
+    GroupItem* group = reinterpret_cast<GroupItem*>(index.internalPointer());
+    if (!group)
+    {
+        return QModelIndex();
+    }
+    const GroupItem* parentGroup = FindGroup(group);
+    if (!parentGroup)
+    {
+        return QModelIndex();
+    }
+    const int row = parentGroup->subGroups.indexOf(group);
+    return createIndex(row, 0, const_cast<GroupItem*>(parentGroup));
+}
+
+bool AbstractGroupProxyModel::hasChildren(const QModelIndex& parent) const
+{
+    if (!parent.isValid())
+    {
+        return true;
+    }
+    const GroupItem* group = reinterpret_cast<GroupItem*>(parent.internalPointer());
+    return parent.row() < group->subGroups.count();
+}
+
+Qt::ItemFlags AbstractGroupProxyModel::flags(const QModelIndex& index) const
+{
+    const QModelIndex sourceIndex = mapToSource(index);
+    if (!sourceIndex.isValid())
+    {
+        return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    }
+    return sourceModel()->flags(sourceIndex);
+}
+
+QModelIndex AbstractGroupProxyModel::mapToSource(const QModelIndex& proxyIndex) const
+{
+    GroupItem* group = reinterpret_cast<GroupItem*>(proxyIndex.internalPointer());
+    if (!group)
+    {
+        return QModelIndex();
+    }
+    const int i = proxyIndex.row() - group->subGroups.count();
+    if (i < 0)
+    {
+        return QModelIndex();
+    }
+    return group->sourceIndexes[i].sibling(group->sourceIndexes[i].row(), proxyIndex.column());
+}
+
+QModelIndex AbstractGroupProxyModel::mapFromSource(const QModelIndex& sourceIndex) const
+{
+    if (!sourceIndex.isValid())
+    {
+        return QModelIndex();
+    }
+    
+    GroupItem* group = FindIndex(sourceIndex.sibling(sourceIndex.row(), 0));
+    if (!group)
+    {
+        return QModelIndex();
+    }
+
+    if (group->groupSourceIndex == sourceIndex)
+    {
+        GroupItem* parentGroup = FindGroup(group);
+        return createIndex(parentGroup->subGroups.indexOf(group), sourceIndex.column(), parentGroup);
+    }
+    return createIndex(group->subGroups.count() + group->sourceIndexes.indexOf(sourceIndex.sibling(sourceIndex.row(), 0)),
+        sourceIndex.column(), const_cast<GroupItem*>(group));
+}
+
+AbstractGroupProxyModel::GroupItem* AbstractGroupProxyModel::FindIndex(const QModelIndex& index, GroupItem* group) const
+{
+    if (group == nullptr)
+    {
+        group = const_cast<GroupItem*>(&m_rootItem);
+    }
+
+    if (group->sourceIndexes.contains(index) || group->groupSourceIndex == index)
+    {
+        return group;
+    }
+    for (GroupItem* subGroup : group->subGroups)
+    {
+        GroupItem* g = FindIndex(index, subGroup);
+        if (g)
+        {
+            return g;
+        }
+    }
+    return nullptr;
+}
+
+AbstractGroupProxyModel::GroupItem* AbstractGroupProxyModel::FindGroup(GroupItem* group, GroupItem* parent) const
+{
+    if (parent == nullptr)
+    {
+        parent = const_cast<GroupItem*>(&m_rootItem);
+    }
+
+    if (parent->subGroups.contains(group))
+    {
+        return parent;
+    }
+    for (GroupItem* subGroup : parent->subGroups)
+    {
+        GroupItem* g = FindGroup(group, subGroup);
+        if (g)
+        {
+            return g;
+        }
+    }
+    return nullptr;
+}
+
+void AbstractGroupProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
+{
+    QAbstractProxyModel::setSourceModel(sourceModel);
+    connect(sourceModel, &QAbstractItemModel::rowsInserted, this, &AbstractGroupProxyModel::SourceRowsInserted);
+    connect(sourceModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &AbstractGroupProxyModel::SourceRowsAboutToBeRemoved);
+    connect(sourceModel, &QAbstractItemModel::dataChanged, this, &AbstractGroupProxyModel::SourceDataChanged);
+    connect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, this, &AbstractGroupProxyModel::slotSourceAboutToBeReset);
+    connect(sourceModel, &QAbstractItemModel::modelReset, this, &AbstractGroupProxyModel::slotSourceReset);
+    connect(sourceModel, &QAbstractItemModel::layoutAboutToBeChanged, this, &AbstractGroupProxyModel::slotSourceAboutToBeReset);
+    connect(sourceModel, &QAbstractItemModel::layoutChanged, this, &AbstractGroupProxyModel::slotSourceReset);
+    RebuildTree();
+}
+
+void AbstractGroupProxyModel::slotSourceAboutToBeReset()
+{
+    beginResetModel();
+    qDeleteAll(m_rootItem.subGroups);
+    m_rootItem.subGroups.clear();
+    m_rootItem.sourceIndexes.clear();
+}
+
+void AbstractGroupProxyModel::slotSourceReset()
+{
+    const int rowCount = sourceModel() ? sourceModel()->rowCount() : 0;
+    for (int row = 0; row < rowCount; ++row)
+    {
+        const QModelIndex sourceIndex = sourceModel()->index(row, 0);
+        GroupItem* group = CreateGroupIfNotExists(GroupForSourceIndex(sourceIndex));
+        if (IsGroupIndex(sourceIndex))
+        {
+            group->groupSourceIndex = sourceIndex;
+        }
+        else
+        {
+            group->sourceIndexes.push_back(sourceIndex);
+        }
+    }
+    endResetModel();
+}
+
+void AbstractGroupProxyModel::RebuildTree()
+{
+    beginResetModel();
+    {
+        QSignalBlocker blocker(this);
+        slotSourceAboutToBeReset();
+        slotSourceReset();
+    }
+    endResetModel();
+    Q_EMIT GroupUpdated();
+}
+
+int AbstractGroupProxyModel::subGroupCount() const
+{
+    return m_rootItem.subGroups.count();
+}
+
+void AbstractGroupProxyModel::SourceRowsInserted(const QModelIndex& p, int from, int to)
+{
+    if (p.isValid())
+    {
+        return;
+    }
+
+    for (int row = from; row <= to; ++row)
+    {
+        const QModelIndex sourceIndex = sourceModel()->index(row, 0);
+        GroupItem* group = CreateGroupIfNotExists(GroupForSourceIndex(sourceIndex));
+        if (IsGroupIndex(sourceIndex))
+        {
+            group->groupSourceIndex = sourceIndex;
+        }
+        else
+        {
+            const int modelRow = group->subGroups.count() + group->sourceIndexes.count();
+            beginInsertRows(parent(createIndex(0, 0, group)), modelRow, modelRow);
+            group->sourceIndexes.push_back(sourceIndex);
+            endInsertRows();
+        }
+    }
+    Q_EMIT GroupUpdated();
+}
+
+void AbstractGroupProxyModel::SourceRowsAboutToBeRemoved(const QModelIndex& p, int from, int to)
+{
+    if (p.isValid())
+    {
+        return;
+    }
+
+    for (int row = from; row <= to; ++row)
+    {
+        const QModelIndex sourceIndex = sourceModel()->index(row, 0);
+        GroupItem* group = const_cast<GroupItem*>(FindIndex(sourceIndex));
+        if (!group)
+        {
+            continue;
+        }
+        if (group->groupSourceIndex != sourceIndex)
+        {
+            const int modelRow = group->subGroups.count() + group->sourceIndexes.indexOf(sourceIndex);
+            beginRemoveRows(parent(createIndex(0, 0, group)), modelRow, modelRow);
+            group->sourceIndexes.remove(group->sourceIndexes.indexOf(sourceIndex));
+            endRemoveRows();
+        }
+        RemoveEmptyGroup(group);
+    }
+    Q_EMIT GroupUpdated();
+}
+
+void AbstractGroupProxyModel::SourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    if (topLeft.parent().isValid())
+    {
+        return;
+    }
+
+    for (int row = topLeft.row(); row <= bottomRight.row(); ++row)
+    {
+        const QModelIndex sourceIndex = sourceModel()->index(row, 0);
+        const GroupItem* currentGroup = FindIndex(sourceIndex);
+        GroupItem* newGroup = CreateGroupIfNotExists(GroupForSourceIndex(sourceIndex));
+        if (currentGroup != newGroup)
+        {
+            SourceRowsAboutToBeRemoved(QModelIndex(), row, row);
+            SourceRowsInserted(QModelIndex(), row, row);
+        }
+        else
+        {
+            emit dataChanged(mapFromSource(sourceIndex), mapFromSource(sourceIndex.sibling(row, columnCount() - 1)));
+        }
+    }
+    Q_EMIT GroupUpdated();
+}
+
+AbstractGroupProxyModel::GroupItem* AbstractGroupProxyModel::CreateGroupIfNotExists(QStringList group)
+{
+    GroupItem* currentGroup = &m_rootItem;
+
+    while (true)
+    {
+        if (group.isEmpty())
+        {
+            return currentGroup;
+        }
+        auto matchingSubGroup = std::find_if(currentGroup->subGroups.begin(), currentGroup->subGroups.end(),
+                [=](const GroupItem* g)
+                {
+                    return QString::compare(g->groupTitle, group.first(), Qt::CaseInsensitive) == 0;
+                }
+                );
+        if (matchingSubGroup == currentGroup->subGroups.end())
+        {
+            GroupItem* newGroup = new GroupItem;
+            newGroup->groupTitle = group.first();
+            beginInsertRows(parent(createIndex(0, 0, currentGroup)),
+                currentGroup->subGroups.size(), currentGroup->subGroups.size());
+            currentGroup->subGroups.push_back(newGroup);
+            endInsertRows();
+            currentGroup = currentGroup->subGroups[currentGroup->subGroups.size() - 1];
+        }
+        else
+        {
+            currentGroup = *matchingSubGroup;
+        }
+        group.pop_front();
+    }
+}
+
+void AbstractGroupProxyModel::RemoveEmptyGroup(GroupItem* group)
+{
+    if (!group->subGroups.isEmpty() || !group->sourceIndexes.isEmpty() || group == &m_rootItem
+        || (group->groupSourceIndex.isValid() && !IsGroupIndex(group->groupSourceIndex)))
+    {
+        return;
+    }
+    GroupItem* parentGroup = const_cast<GroupItem*>(FindGroup(group));
+    const int row = parentGroup->subGroups.indexOf(group);
+    beginRemoveRows(parent(createIndex(0, 0, parentGroup)), row, row);
+    delete parentGroup->subGroups.takeAt(row);
+    endRemoveRows();
+    RemoveEmptyGroup(parentGroup);
+}
+
+#include <Util/moc_AbstractGroupProxyModel.cpp>
diff --git a/Code/Editor/Util/AbstractGroupProxyModel.h b/Code/Editor/Util/AbstractGroupProxyModel.h
new file mode 100644
index 0000000000..ae690237d7
--- /dev/null
+++ b/Code/Editor/Util/AbstractGroupProxyModel.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
+ *
+ */
+#ifndef ABSTRACTGROUPPROXYMODEL_H
+#define ABSTRACTGROUPPROXYMODEL_H
+
+#if !defined(Q_MOC_RUN)
+#include <QAbstractProxyModel>
+#endif
+
+#if !defined(Q_MOC_RUN)
+#include <QPixmap>
+#endif
+
+class AbstractGroupProxyModel
+    : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    AbstractGroupProxyModel(QObject* parent = 0);
+    ~AbstractGroupProxyModel();
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex& index) const override;
+
+    bool hasChildren(const QModelIndex& parent = QModelIndex()) const override;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
+
+    QModelIndex mapToSource(const QModelIndex& proxyIndex) const override;
+    QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override;
+
+    void setSourceModel(QAbstractItemModel* sourceModel) override;
+
+signals:
+    void GroupUpdated();
+
+protected:
+    virtual QStringList GroupForSourceIndex(const QModelIndex& sourceIndex) const = 0;
+    virtual bool IsGroupIndex([[maybe_unused]] const QModelIndex& sourceIndex) const { return false; }
+
+    void slotSourceAboutToBeReset();
+    void slotSourceReset();
+
+    void RebuildTree();
+    int subGroupCount() const;
+
+private:
+    struct GroupItem
+    {
+        QPersistentModelIndex groupSourceIndex;
+        QString groupTitle;
+        QVector<GroupItem*> subGroups;
+        QVector<QPersistentModelIndex> sourceIndexes;
+
+        ~GroupItem()
+        {
+            qDeleteAll(subGroups);
+        }
+    };
+
+    GroupItem* FindIndex(const QModelIndex& index, GroupItem* group = 0) const;
+    GroupItem* FindGroup(GroupItem* group, GroupItem* parent = 0) const;
+
+    void SourceRowsInserted(const QModelIndex& parent, int from, int to);
+    void SourceRowsAboutToBeRemoved(const QModelIndex& parent, int from, int to);
+    void SourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+    GroupItem* CreateGroupIfNotExists(QStringList group);
+    void RemoveEmptyGroup(GroupItem* group);
+
+    GroupItem m_rootItem;
+};
+
+#endif // ABSTRACTGROUPPROXYMODEL_H
diff --git a/Code/Editor/Util/AbstractSortModel.cpp b/Code/Editor/Util/AbstractSortModel.cpp
new file mode 100644
index 0000000000..0222901a8b
--- /dev/null
+++ b/Code/Editor/Util/AbstractSortModel.cpp
@@ -0,0 +1,21 @@
+/*
+ * 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 "AbstractSortModel.h"
+
+AbstractSortModel::AbstractSortModel(QObject* parent)
+    : QAbstractTableModel(parent)
+{
+}
+
+bool AbstractSortModel::LessThan(const QModelIndex& lhs, const QModelIndex& rhs) const
+{
+    return lhs.data().toString() < rhs.data().toString();
+}
+
+#include <Util/moc_AbstractSortModel.cpp>
diff --git a/Code/Editor/Util/AbstractSortModel.h b/Code/Editor/Util/AbstractSortModel.h
new file mode 100644
index 0000000000..3ea8682bd6
--- /dev/null
+++ b/Code/Editor/Util/AbstractSortModel.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
+ *
+ */
+#ifndef ABSTRACTSORTMODEL_H
+#define ABSTRACTSORTMODEL_H
+
+#if !defined(Q_MOC_RUN)
+#include <QAbstractItemModel>
+#endif
+
+class AbstractSortModel
+    : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    AbstractSortModel(QObject* parent = nullptr);
+
+    virtual bool LessThan(const QModelIndex& lhs, const QModelIndex& rhs) const;
+};
+
+#endif // ABSTRACTSORTMODEL_H
diff --git a/Code/Editor/Util/AffineParts.cpp b/Code/Editor/Util/AffineParts.cpp
new file mode 100644
index 0000000000..ef68476446
--- /dev/null
+++ b/Code/Editor/Util/AffineParts.cpp
@@ -0,0 +1,856 @@
+/*
+ * 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"
+
+#pragma warning ( disable : 4244 )  // conversion from 'double' to 'float', possible loss of data.
+
+/**** Decompose.h - Basic declarations ****/
+typedef struct
+{
+    float x, y, z, w;
+} Quatern;                                  /* Quaternernion */
+enum QuaternPart
+{
+    X, Y, Z, W
+};
+typedef Quatern HVect; /* Homogeneous 3D vector */
+typedef float HMatrix[4][4]; /* Right-handed, for column vectors */
+typedef struct
+{
+    HVect t;  /* Translation components */
+    Quatern  q;  /* Essential rotation   */
+    Quatern  u;  /* Stretch rotation   */
+    HVect k;  /* Stretch factors    */
+    float f;  /* Sign of determinant    */
+} SAffineParts;
+
+
+float polar_decomp(HMatrix M, HMatrix Q, HMatrix S);
+HVect spect_decomp(HMatrix S, HMatrix U);
+Quatern snuggle(Quatern q, HVect* k);
+
+/******* Matrix Preliminaries *******/
+
+/** Fill out 3x3 matrix to 4x4 **/
+#define mat_pad(A) (A[W][X] = A[X][W] = A[W][Y] = A[Y][W] = A[W][Z] = A[Z][W] = 0, A[W][W] = 1)
+
+/** Copy nxn matrix A to C using "gets" for assignment **/
+#define mat_copy(C, gets, A, n) {int i, j; for (i = 0; i < n; i++) {for (j = 0; j < n; j++) {     \
+                                                                        C[i][j] gets (A[i][j]); } \
+                                 }                                                                \
+}
+
+/** Copy transpose of nxn matrix A to C using "gets" for assignment **/
+#define mat_tpose(AT, gets, A, n) {int i, j; for (i = 0; i < n; i++) {for (j = 0; j < n; j++) {      \
+                                                                          AT[i][j] gets (A[j][i]); } \
+                                   }                                                                 \
+}
+
+/** Assign nxn matrix C the element-wise combination of A and B using "op" **/
+#define mat_binop(C, gets, A, op, B, n) {int i, j; for (i = 0; i < n; i++) {for (j = 0; j < n; j++) {                  \
+                                                                                C[i][j] gets (A[i][j]) op (B[i][j]); } \
+                                         }                                                                             \
+}
+
+/** Multiply the upper left 3x3 parts of A and B to get AB **/
+static  void mat_mult(HMatrix A, HMatrix B, HMatrix AB)
+{
+    int i, j;
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            AB[i][j] = A[i][0] * B[0][j] + A[i][1] * B[1][j] + A[i][2] * B[2][j];
+        }
+    }
+}
+
+/** Return dot product of length 3 vectors va and vb **/
+static  float vdot(float* va, float* vb)
+{
+    return (va[0] * vb[0] + va[1] * vb[1] + va[2] * vb[2]);
+}
+
+/** Set v to cross product of length 3 vectors va and vb **/
+static  void vcross(float* va, float* vb, float* v)
+{
+    v[0] = va[1] * vb[2] - va[2] * vb[1];
+    v[1] = va[2] * vb[0] - va[0] * vb[2];
+    v[2] = va[0] * vb[1] - va[1] * vb[0];
+}
+
+/** Set MadjT to transpose of inverse of M times determinant of M **/
+static  void adjoint_transpose(HMatrix M, HMatrix MadjT)
+{
+    vcross(M[1], M[2], MadjT[0]);
+    vcross(M[2], M[0], MadjT[1]);
+    vcross(M[0], M[1], MadjT[2]);
+}
+
+/******* Quaternernion Preliminaries *******/
+
+/* Construct a (possibly non-unit) Quaternernion from real components. */
+static  Quatern Qt_(float x, float y, float z, float w)
+{
+    Quatern qq;
+    qq.x = x;
+    qq.y = y;
+    qq.z = z;
+    qq.w = w;
+    return (qq);
+}
+
+/* Return conjugate of Quaternernion. */
+static  Quatern Qt_Conj(Quatern q)
+{
+    Quatern qq;
+    qq.x = -q.x;
+    qq.y = -q.y;
+    qq.z = -q.z;
+    qq.w = q.w;
+    return (qq);
+}
+
+/* Return Quaternernion product qL * qR.  Note: order is important!
+ * To combine rotations, use the product Mul(qSecond, qFirst),
+ * which gives the effect of rotating by qFirst then qSecond. */
+static  Quatern Qt_Mul(Quatern qL, Quatern qR)
+{
+    Quatern qq;
+    qq.w = qL.w * qR.w - qL.x * qR.x - qL.y * qR.y - qL.z * qR.z;
+    qq.x = qL.w * qR.x + qL.x * qR.w + qL.y * qR.z - qL.z * qR.y;
+    qq.y = qL.w * qR.y + qL.y * qR.w + qL.z * qR.x - qL.x * qR.z;
+    qq.z = qL.w * qR.z + qL.z * qR.w + qL.x * qR.y - qL.y * qR.x;
+    return (qq);
+}
+
+/* Return product of Quaternernion q by scalar w. */
+static  Quatern Qt_Scale(Quatern q, float w)
+{
+    Quatern qq;
+    qq.w = q.w * w;
+    qq.x = q.x * w;
+    qq.y = q.y * w;
+    qq.z = q.z * w;
+    return (qq);
+}
+
+/* Construct a unit Quaternernion from rotation matrix.  Assumes matrix is
+ * used to multiply column vector on the left: vnew = mat vold.  Works
+ * correctly for right-handed coordinate system and right-handed rotations.
+ * Translation and perspective components ignored. */
+static  Quatern Qt_FromMatrix(HMatrix mat)
+{
+    /* This algorithm avoids near-zero divides by looking for a large component
+     * - first w, then x, y, or z.  When the trace is greater than zero,
+     * |w| is greater than 1/2, which is as small as a largest component can be.
+     * Otherwise, the largest diagonal entry corresponds to the largest of |x|,
+     * |y|, or |z|, one of which must be larger than |w|, and at least 1/2. */
+    Quatern qu = { 0.0f, 0.0f, 0.0f, 1.0f };
+    double tr, s;
+
+    tr = mat[X][X] + mat[Y][Y] + mat[Z][Z];
+    if (tr >= 0.0)
+    {
+        s = sqrt(tr + mat[W][W]);
+        qu.w = s * 0.5;
+        s = 0.5 / s;
+        qu.x = (mat[Z][Y] - mat[Y][Z]) * s;
+        qu.y = (mat[X][Z] - mat[Z][X]) * s;
+        qu.z = (mat[Y][X] - mat[X][Y]) * s;
+    }
+    else
+    {
+        int h = X;
+        if (mat[Y][Y] > mat[X][X])
+        {
+            h = Y;
+        }
+        if (mat[Z][Z] > mat[h][h])
+        {
+            h = Z;
+        }
+        switch (h)
+        {
+#define caseMacro(i, j, k, I, J, K)                              \
+case I:                                                          \
+    s = sqrt((mat[I][I] - (mat[J][J] + mat[K][K])) + mat[W][W]); \
+    qu.i = s * 0.5;                                              \
+    s = 0.5 / s;                                                 \
+    qu.j = (mat[I][J] + mat[J][I]) * s;                          \
+    qu.k = (mat[K][I] + mat[I][K]) * s;                          \
+    qu.w = (mat[K][J] - mat[J][K]) * s;                          \
+    break
+            caseMacro(x, y, z, X, Y, Z);
+            caseMacro(y, z, x, Y, Z, X);
+            caseMacro(z, x, y, Z, X, Y);
+        }
+    }
+    if (mat[W][W] != 1.0)
+    {
+        qu = Qt_Scale(qu, 1.0f / sqrt(mat[W][W]));
+    }
+    return (qu);
+}
+/******* Decomp Auxiliaries *******/
+
+static HMatrix mat_id = {
+    {1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, {0, 0, 0, 1}
+};
+
+/** Compute either the 1 or infinity norm of M, depending on tpose **/
+static  float mat_norm(HMatrix M, int tpose)
+{
+    int i;
+    float sum, max;
+    max = 0.0;
+    for (i = 0; i < 3; i++)
+    {
+        if (tpose)
+        {
+            sum = fabs(M[0][i]) + fabs(M[1][i]) + fabs(M[2][i]);
+        }
+        else
+        {
+            sum = fabs(M[i][0]) + fabs(M[i][1]) + fabs(M[i][2]);
+        }
+        if (max < sum)
+        {
+            max = sum;
+        }
+    }
+    return max;
+}
+
+static  float norm_inf(HMatrix M) {return mat_norm(M, 0); }
+static  float norm_one(HMatrix M) {return mat_norm(M, 1); }
+
+/** Return index of column of M containing maximum abs entry, or -1 if M=0 **/
+static  int find_max_col(HMatrix M)
+{
+    float abs, max;
+    int i, j, col;
+    max = 0.0;
+    col = -1;
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            abs = M[i][j];
+            if (abs < 0.0)
+            {
+                abs = -abs;
+            }
+            if (abs > max)
+            {
+                max = abs;
+                col = j;
+            }
+        }
+    }
+    return col;
+}
+
+/** Setup u for Household reflection to zero all v components but first **/
+static  void make_reflector(float* v, float* u)
+{
+    float s = sqrt(vdot(v, v));
+    u[0] = v[0];
+    u[1] = v[1];
+    u[2] = v[2] + ((v[2] < 0.0) ? -s : s);
+    s = sqrt(2.0 / vdot(u, u));
+    u[0] = u[0] * s;
+    u[1] = u[1] * s;
+    u[2] = u[2] * s;
+}
+
+/** Apply Householder reflection represented by u to column vectors of M **/
+static  void reflect_cols(HMatrix M, float* u)
+{
+    int i, j;
+    for (i = 0; i < 3; i++)
+    {
+        float s = u[0] * M[0][i] + u[1] * M[1][i] + u[2] * M[2][i];
+        for (j = 0; j < 3; j++)
+        {
+            M[j][i] -= u[j] * s;
+        }
+    }
+}
+/** Apply Householder reflection represented by u to row vectors of M **/
+static  void reflect_rows(HMatrix M, float* u)
+{
+    int i, j;
+    for (i = 0; i < 3; i++)
+    {
+        float s = vdot(u, M[i]);
+        for (j = 0; j < 3; j++)
+        {
+            M[i][j] -= u[j] * s;
+        }
+    }
+}
+
+/** Find orthogonal factor Q of rank 1 (or less) M **/
+static  void do_rank1(HMatrix M, HMatrix Q)
+{
+    float v1[3], v2[3], s;
+    int col;
+    mat_copy(Q, =, mat_id, 4);
+    /* If rank(M) is 1, we should find a non-zero column in M */
+    col = find_max_col(M);
+    if (col < 0)
+    {
+        return;        /* Rank is 0 */
+    }
+    v1[0] = M[0][col];
+    v1[1] = M[1][col];
+    v1[2] = M[2][col];
+    make_reflector(v1, v1);
+    reflect_cols(M, v1);
+    v2[0] = M[2][0];
+    v2[1] = M[2][1];
+    v2[2] = M[2][2];
+    make_reflector(v2, v2);
+    reflect_rows(M, v2);
+    s = M[2][2];
+    if (s < 0.0)
+    {
+        Q[2][2] = -1.0;
+    }
+    reflect_cols(Q, v1);
+    reflect_rows(Q, v2);
+}
+
+/** Find orthogonal factor Q of rank 2 (or less) M using adjoint transpose **/
+static  void do_rank2(HMatrix M, HMatrix MadjT, HMatrix Q)
+{
+    float v1[3], v2[3];
+    float w, x, y, z, c, s, d;
+    int col;
+    /* If rank(M) is 2, we should find a non-zero column in MadjT */
+    col = find_max_col(MadjT);
+    if (col < 0)
+    {
+        do_rank1(M, Q);
+        return;
+    }                                    /* Rank<2 */
+    v1[0] = MadjT[0][col];
+    v1[1] = MadjT[1][col];
+    v1[2] = MadjT[2][col];
+    make_reflector(v1, v1);
+    reflect_cols(M, v1);
+    vcross(M[0], M[1], v2);
+    make_reflector(v2, v2);
+    reflect_rows(M, v2);
+    w = M[0][0];
+    x = M[0][1];
+    y = M[1][0];
+    z = M[1][1];
+    if (w * z > x * y)
+    {
+        c = z + w;
+        s = y - x;
+        d = sqrt(c * c + s * s);
+        c = c / d;
+        s = s / d;
+        Q[0][0] = Q[1][1] = c;
+        Q[0][1] = -(Q[1][0] = s);
+    }
+    else
+    {
+        c = z - w;
+        s = y + x;
+        d = sqrt(c * c + s * s);
+        c = c / d;
+        s = s / d;
+        Q[0][0] = -(Q[1][1] = c);
+        Q[0][1] = Q[1][0] = s;
+    }
+    Q[0][2] = Q[2][0] = Q[1][2] = Q[2][1] = 0.0;
+    Q[2][2] = 1.0;
+    reflect_cols(Q, v1);
+    reflect_rows(Q, v2);
+}
+
+
+/******* Polar Decomposition *******/
+
+/* Polar Decomposition of 3x3 matrix in 4x4,
+ * M = QS.  See Nicholas Higham and Robert S. Schreiber,
+ * Fast Polar Decomposition of An Arbitrary Matrix,
+ * Technical Report 88-942, October 1988,
+ * Department of Computer Science, Cornell University.
+ */
+float polar_decomp(HMatrix M, HMatrix Q, HMatrix S)
+{
+#define TOL 1.0e-6
+    HMatrix Mk, MadjTk, Ek;
+    float det, M_one, M_inf, MadjT_one, MadjT_inf, E_one, gamma, g1, g2;
+    mat_tpose(Mk, =, M, 3);
+    M_one = norm_one(Mk);
+    M_inf = norm_inf(Mk);
+    do
+    {
+        adjoint_transpose(Mk, MadjTk);
+        det = vdot(Mk[0], MadjTk[0]);
+        if (det == 0.0)
+        {
+            do_rank2(Mk, MadjTk, Mk);
+            break;
+        }
+        MadjT_one = norm_one(MadjTk);
+        MadjT_inf = norm_inf(MadjTk);
+        gamma = sqrt(sqrt((MadjT_one * MadjT_inf) / (M_one * M_inf)) / fabs(det));
+        g1 = gamma * 0.5;
+        g2 = 0.5 / (gamma * det);
+        mat_copy(Ek, =, Mk, 3);
+        mat_binop(Mk, =, g1 * Mk, +, g2 * MadjTk, 3);
+        mat_copy(Ek, -=, Mk, 3);
+        E_one = norm_one(Ek);
+        M_one = norm_one(Mk);
+        M_inf = norm_inf(Mk);
+    } while (E_one > (M_one * TOL));
+    mat_tpose(Q, =, Mk, 3);
+    mat_pad(Q);
+    mat_mult(Mk, M, S);
+    mat_pad(S);
+    for (int i = 0; i < 3; i++)
+    {
+        for (int j = i; j < 3; j++)
+        {
+            S[i][j] = S[j][i] = 0.5 * (S[i][j] + S[j][i]);
+        }
+    }
+    return (det);
+}
+
+
+/******* Spectral Decomposition *******/
+
+/* Compute the spectral decomposition of symmetric positive semi-definite S.
+ * Returns rotation in U and scale factors in result, so that if K is a diagonal
+ * matrix of the scale factors, then S = U K (U transpose). Uses Jacobi method.
+ * See Gene H. Golub and Charles F. Van Loan. Matrix Computations. Hopkins 1983.
+ */
+HVect spect_decomp(HMatrix S, HMatrix U)
+{
+    HVect kv;
+    double Diag[3], OffD[3]; /* OffD is off-diag (by omitted index) */
+    double g, h, fabsh, fabsOffDi, t, theta, c, s, tau, ta, OffDq, a, b;
+    static char nxt[] = {Y, Z, X};
+    int sweep;
+    mat_copy(U, =, mat_id, 4);
+    Diag[X] = S[X][X];
+    Diag[Y] = S[Y][Y];
+    Diag[Z] = S[Z][Z];
+    OffD[X] = S[Y][Z];
+    OffD[Y] = S[Z][X];
+    OffD[Z] = S[X][Y];
+    for (sweep = 20; sweep > 0; sweep--)
+    {
+        float sm = fabs(OffD[X]) + fabs(OffD[Y]) + fabs(OffD[Z]);
+        if (sm == 0.0)
+        {
+            break;
+        }
+        for (int i = Z; i >= X; i--)
+        {
+            int p = nxt[i];
+            int q = nxt[p];
+            fabsOffDi = fabs(OffD[i]);
+            g = 100.0 * fabsOffDi;
+            if (fabsOffDi > AZ::Constants::FloatEpsilon)
+            {
+                h = Diag[q] - Diag[p];
+                fabsh = fabs(h);
+                if (fabsh + g == fabsh)
+                {
+                    t = OffD[i] / h;
+                }
+                else
+                {
+                    theta = 0.5 * h / OffD[i];
+                    t = 1.0 / (fabs(theta) + sqrt(theta * theta + 1.0));
+                    if (theta < 0.0)
+                    {
+                        t = -t;
+                    }
+                }
+                c = 1.0 / sqrt(t * t + 1.0);
+                s = t * c;
+                tau = s / (c + 1.0);
+                ta = t * OffD[i];
+                OffD[i] = 0.0;
+                Diag[p] -= ta;
+                Diag[q] += ta;
+                OffDq = OffD[q];
+                OffD[q] -= s * (OffD[p] + tau * OffD[q]);
+                OffD[p] += s * (OffDq   - tau * OffD[p]);
+                for (int j = Z; j >= X; j--)
+                {
+                    a = U[j][p];
+                    b = U[j][q];
+                    U[j][p] -= s * (b + tau * a);
+                    U[j][q] += s * (a - tau * b);
+                }
+            }
+        }
+    }
+    kv.x = Diag[X];
+    kv.y = Diag[Y];
+    kv.z = Diag[Z];
+    kv.w = 1.0;
+    return (kv);
+}
+
+/******* Spectral Axis Adjustment *******/
+
+/* Given a unit Quaternernion, q, and a scale vector, k, find a unit Quaternernion, p,
+ * which permutes the axes and turns freely in the plane of duplicate scale
+ * factors, such that q p has the largest possible w component, i.e. the
+ * smallest possible angle. Permutes k's components to go with q p instead of q.
+ * See Ken Shoemake and Tom Duff. Matrix Animation and Polar Decomposition.
+ * Proceedings of Graphics Interface 1992. Details on p. 262-263.
+ */
+Quatern snuggle(Quatern q, HVect* k)
+{
+#define SQRTHALF (0.7071067811865475244f)
+#define sgn(n, v)    ((n) ? -(v) : (v))
+#define swap(a, i, j) {a[3] = a[i]; a[i] = a[j]; a[j] = a[3]; }
+#define cycle(a, p)  if (p) {a[3] = a[0]; a[0] = a[1]; a[1] = a[2]; a[2] = a[3]; } \
+    else   {a[3] = a[2]; a[2] = a[1]; a[1] = a[0]; a[0] = a[3]; }
+    Quatern p = { 0.0f, 0.0f, 0.0f, 1.0f };
+    float ka[4];
+    int i, turn = -1;
+    ka[X] = k->x;
+    ka[Y] = k->y;
+    ka[Z] = k->z;
+    if (ka[X] == ka[Y])
+    {
+        if (ka[X] == ka[Z])
+        {
+            turn = W;
+        }
+        else
+        {
+            turn = Z;
+        }
+    }
+    else
+    {
+        if (ka[X] == ka[Z])
+        {
+            turn = Y;
+        }
+        else if (ka[Y] == ka[Z])
+        {
+            turn = X;
+        }
+    }
+    if (turn >= 0)
+    {
+        Quatern qtoz, qp;
+        unsigned neg[3], win;
+        double mag[3], t;
+        static Quatern qxtoz = {0, SQRTHALF, 0, SQRTHALF};
+        static Quatern qytoz = {SQRTHALF, 0, 0, SQRTHALF};
+        static Quatern qppmm = { 0.5, 0.5, -0.5, -0.5};
+        static Quatern qpppp = { 0.5, 0.5, 0.5, 0.5};
+        static Quatern qmpmm = {-0.5, 0.5, -0.5, -0.5};
+        static Quatern qpppm = { 0.5, 0.5, 0.5, -0.5};
+        static Quatern q0001 = { 0.0, 0.0, 0.0, 1.0};
+        static Quatern q1000 = { 1.0, 0.0, 0.0, 0.0};
+        switch (turn)
+        {
+        default:
+            return (Qt_Conj(q));
+        case X:
+            q = Qt_Mul(q, qtoz = qxtoz);
+            swap(ka, X, Z);
+            break;
+        case Y:
+            q = Qt_Mul(q, qtoz = qytoz);
+            swap(ka, Y, Z);
+            break;
+        case Z:
+            qtoz = q0001;
+            break;
+        }
+        q = Qt_Conj(q);
+        mag[0] = (double)q.z * q.z + (double)q.w * q.w - 0.5;
+        mag[1] = (double)q.x * q.z - (double)q.y * q.w;
+        mag[2] = (double)q.y * q.z + (double)q.x * q.w;
+        for (i = 0; i < 3; i++)
+        {
+            neg[i] = (mag[i] < 0.0);
+            if (neg[i])
+            {
+                mag[i] = -mag[i];
+            }
+        }
+        if (mag[0] > mag[1])
+        {
+            if (mag[0] > mag[2])
+            {
+                win = 0;
+            }
+            else
+            {
+                win = 2;
+            }
+        }
+        else
+        {
+            if (mag[1] > mag[2])
+            {
+                win = 1;
+            }
+            else
+            {
+                win = 2;
+            }
+        }
+        switch (win)
+        {
+        case 0:
+            if (neg[0])
+            {
+                p = q1000;
+            }
+            else
+            {
+                p = q0001;
+            } break;
+        case 1:
+            if (neg[1])
+            {
+                p = qppmm;
+            }
+            else
+            {
+                p = qpppp;
+            } cycle(ka, 0);
+            break;
+        case 2:
+            if (neg[2])
+            {
+                p = qmpmm;
+            }
+            else
+            {
+                p = qpppm;
+            } cycle(ka, 1);
+            break;
+        }
+        qp = Qt_Mul(q, p);
+        t = sqrt(mag[win] + 0.5);
+        p = Qt_Mul(p, Qt_(0.0, 0.0, -qp.z / t, qp.w / t));
+        p = Qt_Mul(qtoz, Qt_Conj(p));
+    }
+    else
+    {
+        float qa[4], pa[4];
+        unsigned lo, hi, neg[4], par = 0;
+        double all, big, two;
+        qa[0] = q.x;
+        qa[1] = q.y;
+        qa[2] = q.z;
+        qa[3] = q.w;
+        for (i = 0; i < 4; i++)
+        {
+            pa[i] = 0.0;
+            neg[i] = (qa[i] < 0.0);
+            if (neg[i])
+            {
+                qa[i] = -qa[i];
+            }
+            par ^= neg[i];
+        }
+        /* Find two largest components, indices in hi and lo */
+        if (qa[0] > qa[1])
+        {
+            lo = 0;
+        }
+        else
+        {
+            lo = 1;
+        }
+        if (qa[2] > qa[3])
+        {
+            hi = 2;
+        }
+        else
+        {
+            hi = 3;
+        }
+        if (qa[lo] > qa[hi])
+        {
+            if (qa[lo ^ 1] > qa[hi])
+            {
+                hi = lo;
+                lo ^= 1;
+            }
+            else
+            {
+                hi ^= lo;
+                lo ^= hi;
+                hi ^= lo;
+            }
+        }
+        else
+        {
+            if (qa[hi ^ 1] > qa[lo])
+            {
+                lo = hi ^ 1;
+            }
+        }
+        all = (qa[0] + qa[1] + qa[2] + qa[3]) * 0.5;
+        two = (qa[hi] + qa[lo]) * SQRTHALF;
+        big = qa[hi];
+        if (all > two)
+        {
+            if (all > big)/*all*/
+            {
+                {
+                    int ii;
+                    for (ii = 0; ii < 4; ii++)
+                    {
+                        pa[ii] = sgn(neg[ii], 0.5);
+                    }
+                }
+                cycle(ka, par)
+            }
+            else
+            { /*big*/
+                pa[hi] = sgn(neg[hi], 1.0);
+            }
+        }
+        else
+        {
+            if (two > big)/*two*/
+            {
+                pa[hi] = sgn(neg[hi], SQRTHALF);
+                pa[lo] = sgn(neg[lo], SQRTHALF);
+                if (lo > hi)
+                {
+                    hi ^= lo;
+                    lo ^= hi;
+                    hi ^= lo;
+                }
+                if (hi == W)
+                {
+                    hi = "\001\002\000"[lo];
+                    lo = 3 - hi - lo;
+                }
+                swap(ka, hi, lo)
+            }
+            else
+            { /*big*/
+                pa[hi] = sgn(neg[hi], 1.0);
+            }
+        }
+        p.x = -pa[0];
+        p.y = -pa[1];
+        p.z = -pa[2];
+        p.w = pa[3];
+    }
+    k->x = ka[X];
+    k->y = ka[Y];
+    k->z = ka[Z];
+    return (p);
+}
+
+
+/******* Decompose Affine Matrix *******/
+
+/* Decompose 4x4 affine matrix A as TFRUK(U transpose), where t contains the
+ * translation components, q contains the rotation R, u contains U, k contains
+ * scale factors, and f contains the sign of the determinant.
+ * Assumes A transforms column vectors in right-handed coordinates.
+ * See Ken Shoemake and Tom Duff. Matrix Animation and Polar Decomposition.
+ * Proceedings of Graphics Interface 1992.
+ */
+static  void decomp_affine(HMatrix A, SAffineParts* parts)
+{
+    HMatrix Q, S, U;
+    Quatern p;
+    float det;
+    parts->t = Qt_(A[X][W], A[Y][W], A[Z][W], 0);
+    det = polar_decomp(A, Q, S);
+    if (det < 0.0)
+    {
+        mat_copy(Q, =, -Q, 3);
+        parts->f = -1;
+    }
+    else
+    {
+        parts->f = 1;
+    }
+    parts->q = Qt_FromMatrix(Q);
+    parts->k = spect_decomp(S, U);
+    parts->u = Qt_FromMatrix(U);
+    p = snuggle(parts->u, &parts->k);
+    parts->u = Qt_Mul(parts->u, p);
+}
+
+static  void spectral_decomp_affine(HMatrix A, SAffineParts* parts)
+{
+    HMatrix Q, S, U;
+    float det;
+
+    parts->t = Qt_(A[X][W], A[Y][W], A[Z][W], 0);
+    det = polar_decomp(A, Q, S);
+    if (det < 0.0)
+    {
+        mat_copy(Q, =, -Q, 3);
+        parts->f = -1;
+    }
+    else
+    {
+        parts->f = 1;
+    }
+    parts->q = Qt_FromMatrix(Q);
+    parts->k = spect_decomp(S, U);
+    parts->u = Qt_FromMatrix(U);
+}
+
+// Decompose matrix to affine parts.
+void AffineParts::Decompose(const Matrix34& tm)
+{
+    SAffineParts parts;
+
+    Matrix44 tm44(tm);
+    HMatrix& H = *((HMatrix*)&tm44); // Treat HMatrix as a Matrix44.
+
+    decomp_affine(H, &parts);
+
+    rot = Quat(parts.q.w, parts.q.x, parts.q.y, parts.q.z);
+    rotScale = Quat(parts.u.w, parts.u.x, parts.u.y, parts.u.z);
+    pos = Vec3(parts.t.x, parts.t.y, parts.t.z);
+    scale = Vec3(parts.k.x, parts.k.y, parts.k.z);
+    fDet = parts.f;
+}
+
+// Spectral matrix decompostion to affine parts.
+void AffineParts::SpectralDecompose(const Matrix34& tm)
+{
+    SAffineParts parts;
+
+    Matrix44 tm44(tm);
+    HMatrix& H = *((HMatrix*)&tm44); // Treat HMatrix as a Matrix44.
+
+    spectral_decomp_affine(H, &parts);
+
+    rot = Quat(parts.q.w, parts.q.x, parts.q.y, parts.q.z);
+    rotScale = Quat(parts.u.w, parts.u.x, parts.u.y, parts.u.z);
+    pos = Vec3(parts.t.x, parts.t.y, parts.t.z);
+    scale = Vec3(parts.k.x, parts.k.y, parts.k.z);
+    fDet = parts.f;
+}
diff --git a/Code/Editor/Util/AffineParts.h b/Code/Editor/Util/AffineParts.h
new file mode 100644
index 0000000000..975befc175
--- /dev/null
+++ b/Code/Editor/Util/AffineParts.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_AFFINEPARTS_H
+#define CRYINCLUDE_EDITOR_UTIL_AFFINEPARTS_H
+#pragma once
+
+
+struct AffineParts
+{
+    Vec3 pos;               //!< Translation components
+    Quat rot;           //!< Essential rotation.
+    Quat rotScale;  //!< Stretch rotation.
+    Vec3 scale;         //!< Stretch factors.
+    float fDet;         //!< Sign of determinant.
+
+    /** Decompose matrix to its affnie parts.
+    */
+    void Decompose(const Matrix34& mat);
+
+    /** Decompose matrix to its affnie parts.
+            Assume there`s no stretch rotation.
+    */
+    void SpectralDecompose(const Matrix34& mat);
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_AFFINEPARTS_H
diff --git a/Code/Editor/Util/AutoDirectoryRestoreFileDialog.cpp b/Code/Editor/Util/AutoDirectoryRestoreFileDialog.cpp
new file mode 100644
index 0000000000..2d5be106d6
--- /dev/null
+++ b/Code/Editor/Util/AutoDirectoryRestoreFileDialog.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 "EditorDefs.h"
+
+#include "AutoDirectoryRestoreFileDialog.h"
+
+// Qt
+#include <QMessageBox>
+
+
+CAutoDirectoryRestoreFileDialog::CAutoDirectoryRestoreFileDialog(
+    QFileDialog::AcceptMode acceptMode,
+    QFileDialog::FileMode fileMode,
+    const QString& defaultSuffix,
+    const QString& directory /* = {} */,
+    const QString& filter /* = {} */,
+    QFileDialog::Options options /* = {} */,
+    const QString& caption /* = {} */,
+    QWidget* parent /* = nullptr */)
+    : QFileDialog(parent, caption, QString(""), filter)
+{
+    char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(directory.toUtf8().data(), resolvedPath, AZ_MAX_PATH_LEN);
+    setDirectory(QString::fromUtf8(resolvedPath));
+
+    setAcceptMode(acceptMode);
+    setDefaultSuffix(defaultSuffix);
+    setFileMode(fileMode);
+    setOptions(options);
+}
+
+int CAutoDirectoryRestoreFileDialog::exec()
+{
+    int result = -1;
+    while ((result = QFileDialog::exec()) == QDialog::Accepted)
+    {
+        bool problem = false;
+        foreach(const QString&fileName, selectedFiles())
+        {
+            QFileInfo info(fileName);
+            if (!CryStringUtils::IsValidFileName(info.fileName().toStdString().c_str()))
+            {
+                QMessageBox::warning(this, tr("Error"), tr("Please select a valid file name (standard English alphanumeric characters only)"));
+                problem = true;
+                break;
+            }
+        }
+
+        if (!problem)
+        {
+            return result;
+        }
+    }
+
+    return result;
+}
+
+#include <Util/moc_AutoDirectoryRestoreFileDialog.cpp>
diff --git a/Code/Editor/Util/AutoDirectoryRestoreFileDialog.h b/Code/Editor/Util/AutoDirectoryRestoreFileDialog.h
new file mode 100644
index 0000000000..60633774dd
--- /dev/null
+++ b/Code/Editor/Util/AutoDirectoryRestoreFileDialog.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_AUTODIRECTORYRESTOREFILEDIALOG_H
+#define CRYINCLUDE_EDITOR_UTIL_AUTODIRECTORYRESTOREFILEDIALOG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QFileDialog>
+#endif
+
+class CAutoDirectoryRestoreFileDialog
+    : public QFileDialog
+{
+    Q_OBJECT
+
+public:
+    explicit CAutoDirectoryRestoreFileDialog(
+        QFileDialog::AcceptMode acceptMode,
+        QFileDialog::FileMode fileMode = QFileDialog::AnyFile,
+        const QString& defaultSuffix = {},
+        const QString& directory = {},
+        const QString& filter = {},
+        QFileDialog::Options options = QFileDialog::Options(),
+        const QString& caption = {},
+        QWidget* parent = nullptr);
+    virtual ~CAutoDirectoryRestoreFileDialog() {}
+
+    int exec() override;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_AUTODIRECTORYRESTOREFILEDIALOG_H
diff --git a/Code/Editor/Util/AutoLogTime.cpp b/Code/Editor/Util/AutoLogTime.cpp
new file mode 100644
index 0000000000..17fbfb4999
--- /dev/null
+++ b/Code/Editor/Util/AutoLogTime.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 "EditorDefs.h"
+
+#include "AutoLogTime.h"
+
+CAutoLogTime::CAutoLogTime(const char* what)
+{
+    m_what = what;
+    CLogFile::FormatLine("---- Start: %s", m_what);
+    m_t0 = GetTickCount();
+}
+
+CAutoLogTime::~CAutoLogTime()
+{
+    m_t1 = GetTickCount();
+    CLogFile::FormatLine("---- End: %s (%d seconds)", m_what, (m_t1 - m_t0) / 1000);
+}
diff --git a/Code/Editor/Util/AutoLogTime.h b/Code/Editor/Util/AutoLogTime.h
new file mode 100644
index 0000000000..051e160185
--- /dev/null
+++ b/Code/Editor/Util/AutoLogTime.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_AUTOLOGTIME_H
+#define CRYINCLUDE_EDITOR_UTIL_AUTOLOGTIME_H
+#pragma once
+
+
+class CAutoLogTime
+{
+public:
+    CAutoLogTime(const char* what);
+    ~CAutoLogTime();
+private:
+    const char* m_what;
+    int m_t0, m_t1;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_AUTOLOGTIME_H
diff --git a/Code/Editor/Util/ColorUtils.cpp b/Code/Editor/Util/ColorUtils.cpp
new file mode 100644
index 0000000000..9aa4536cde
--- /dev/null
+++ b/Code/Editor/Util/ColorUtils.cpp
@@ -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
+ *
+ */
+
+
+#include "ColorUtils.h"
+
+// Qt
+#include <QColor>
+
+//////////////////////////////////////////////////////////////////////////
+QColor ColorLinearToGamma(ColorF col)
+{
+    float r = clamp_tpl(col.r, 0.0f, 1.0f);
+    float g = clamp_tpl(col.g, 0.0f, 1.0f);
+    float b = clamp_tpl(col.b, 0.0f, 1.0f);
+    float a = clamp_tpl(col.a, 0.0f, 1.0f);
+
+    r = (float)(r <= 0.0031308 ? (12.92 * r) : (1.055 * pow((double)r, 1.0 / 2.4) - 0.055));
+    g = (float)(g <= 0.0031308 ? (12.92 * g) : (1.055 * pow((double)g, 1.0 / 2.4) - 0.055));
+    b = (float)(b <= 0.0031308 ? (12.92 * b) : (1.055 * pow((double)b, 1.0 / 2.4) - 0.055));
+
+    return QColor(FtoI(r * 255.0f), FtoI(g * 255.0f), FtoI(b * 255.0f), FtoI(a * 255.0f));
+}
+
+//////////////////////////////////////////////////////////////////////////
+ColorF ColorGammaToLinear(const QColor& col)
+{
+    float r = (float)col.red() / 255.0f;
+    float g = (float)col.green() / 255.0f;
+    float b = (float)col.blue() / 255.0f;
+    float a = (float)col.alpha() / 255.0f;
+
+    return ColorF((float)(r <= 0.04045 ? (r / 12.92) : pow(((double)r + 0.055) / 1.055, 2.4)),
+        (float)(g <= 0.04045 ? (g / 12.92) : pow(((double)g + 0.055) / 1.055, 2.4)),
+        (float)(b <= 0.04045 ? (b / 12.92) : pow(((double)b + 0.055) / 1.055, 2.4)), a);
+}
+
+QColor ColorToQColor(uint32 color)
+{
+    return QColor::fromRgbF((float)GetRValue(color) / 255.0f,
+        (float)GetGValue(color) / 255.0f,
+        (float)GetBValue(color) / 255.0f);
+}
diff --git a/Code/Editor/Util/ColorUtils.h b/Code/Editor/Util/ColorUtils.h
new file mode 100644
index 0000000000..86383009a4
--- /dev/null
+++ b/Code/Editor/Util/ColorUtils.h
@@ -0,0 +1,21 @@
+/*
+ * 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 : Utility classes used by Editor.
+
+
+#pragma once
+
+#include <Cry_Color.h>
+
+class QColor;
+
+QColor ColorLinearToGamma(ColorF col);
+ColorF ColorGammaToLinear(const QColor& col);
+QColor ColorToQColor(uint32 color);
+
diff --git a/Code/Editor/Util/ColumnGroupHeaderView.cpp b/Code/Editor/Util/ColumnGroupHeaderView.cpp
new file mode 100644
index 0000000000..7b42646b59
--- /dev/null
+++ b/Code/Editor/Util/ColumnGroupHeaderView.cpp
@@ -0,0 +1,139 @@
+/*
+ * 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 "ColumnGroupHeaderView.h"
+
+// Qt
+#include <QPainter>
+
+// Editor
+#include "Util/ColumnGroupProxyModel.h"
+
+
+ColumnGroupHeaderView::ColumnGroupHeaderView(QWidget* parent)
+    : QHeaderView(Qt::Horizontal, parent)
+    , m_groupModel(nullptr)
+    , m_showGroups(false)
+{
+    setSectionsMovable(true);
+    setStretchLastSection(true);
+    setSortIndicatorShown(false);
+}
+
+void ColumnGroupHeaderView::setModel(QAbstractItemModel* model)
+{
+    QHeaderView::setModel(model);
+    m_groupModel = qobject_cast<ColumnGroupProxyModel*>(model);
+    if (m_groupModel)
+    {
+        connect(m_groupModel, SIGNAL(SortChanged()), this, SLOT(update()));
+    }
+}
+
+QSize ColumnGroupHeaderView::sizeHint() const
+{
+    QSize s = QHeaderView::sizeHint();
+    if (m_showGroups)
+    {
+        s.setHeight(s.height() + GroupViewHeight());
+    }
+    return s;
+}
+
+bool ColumnGroupHeaderView::IsGroupsShown() const
+{
+    return m_showGroups;
+}
+
+bool ColumnGroupHeaderView::event(QEvent* event)
+{
+    switch (event->type())
+    {
+    case QEvent::Paint:
+    {
+        if (!m_showGroups || !m_groupModel)
+        {
+            return true;
+        }
+
+        QPainter painter(this);
+        painter.fillRect(rect(), QColor(145, 145, 145));
+        int xOffset = 10;
+        int yOffset = 10;
+
+        auto groups = m_groupModel->Groups();
+
+        m_groups.clear();
+        foreach(int column, groups)
+        {
+            const int width = sectionSize(column);
+            const QRect r(xOffset, yOffset, width == 0 ? defaultSectionSize() : width, QHeaderView::sizeHint().height());
+            xOffset += r.width() + 10;
+            yOffset += 10;
+
+            if (column != groups.last())
+            {
+                painter.setPen(Qt::black);
+                painter.drawLine(r.bottomRight() + QPoint(-3, 0), r.bottomRight() + QPoint(-3, 3));
+                painter.drawLine(r.bottomRight() + QPoint(-3, 3), r.bottomRight() + QPoint(10, 3));
+            }
+            m_groups.push_back({ r, column });
+            paintSection(&painter, r, column);
+        }
+        break;
+    }
+    case QEvent::MouseButtonRelease:
+    {
+        auto mouseEvent = static_cast<QMouseEvent*>(event);
+        if (m_showGroups && m_groupModel)
+        {
+            foreach(const Group &group, m_groups)
+            {
+                if (group.rect.contains(mouseEvent->pos()))
+                {
+                    auto sortOrder = m_groupModel->SortOrder(group.col);
+                    m_groupModel->sort(group.col, (sortOrder == Qt::AscendingOrder) ?
+                        Qt::DescendingOrder : Qt::AscendingOrder);
+                }
+            }
+        }
+        break;
+    }
+
+    default:
+        return QHeaderView::event(event);
+        break;
+    }
+
+    return true;
+}
+
+void ColumnGroupHeaderView::ShowGroups(bool showGroups)
+{
+    m_showGroups = showGroups;
+    Q_EMIT geometriesChanged();
+}
+
+void ColumnGroupHeaderView::updateGeometries()
+{
+    setViewportMargins(0, m_showGroups ? GroupViewHeight() : 0, 0, 0);
+    QHeaderView::updateGeometries();
+}
+
+int ColumnGroupHeaderView::GroupViewHeight() const
+{
+    if (!m_groupModel)
+    {
+        return 0;
+    }
+    int groupCount = m_groupModel->Groups().size();
+    return QHeaderView::sizeHint().height() + qMax(0, groupCount - 1) * 10 + 20;
+}
+
+
+#include <Util/moc_ColumnGroupHeaderView.cpp>
diff --git a/Code/Editor/Util/ColumnGroupHeaderView.h b/Code/Editor/Util/ColumnGroupHeaderView.h
new file mode 100644
index 0000000000..995c93c696
--- /dev/null
+++ b/Code/Editor/Util/ColumnGroupHeaderView.h
@@ -0,0 +1,55 @@
+/*
+ * 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 COLUMNGROUPHEADERVIEW_H
+#define COLUMNGROUPHEADERVIEW_H
+
+#if !defined(Q_MOC_RUN)
+#include <QHeaderView>
+#include <QVector>
+#endif
+
+class ColumnGroupProxyModel;
+
+class ColumnGroupHeaderView
+    : public QHeaderView
+{
+    Q_OBJECT
+
+public:
+    ColumnGroupHeaderView(QWidget* parent = 0);
+
+    void setModel(QAbstractItemModel* model) override;
+
+    QSize sizeHint() const override;
+
+    bool IsGroupsShown() const;
+
+    bool event(QEvent* event) override;
+
+public slots:
+    void ShowGroups(bool showGroups);
+
+protected slots:
+    void updateGeometries() override;
+
+private:
+    int GroupViewHeight() const;
+
+private:
+    struct Group
+    {
+        QRect rect;
+        int col;
+    };
+
+    ColumnGroupProxyModel* m_groupModel;
+    bool m_showGroups;
+
+    QVector<Group> m_groups;
+};
+
+#endif // COLUMNGROUPHEADERVIEW_H
diff --git a/Code/Editor/Util/ColumnGroupItemDelegate.cpp b/Code/Editor/Util/ColumnGroupItemDelegate.cpp
new file mode 100644
index 0000000000..83212c4809
--- /dev/null
+++ b/Code/Editor/Util/ColumnGroupItemDelegate.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 "EditorDefs.h"
+
+#include "ColumnGroupItemDelegate.h"
+
+// Qt
+#include <QHeaderView>
+#include <QPainter>
+#include <QTreeView>
+
+
+
+ColumnGroupItemDelegate::ColumnGroupItemDelegate(QObject* parent)
+    : QStyledItemDelegate(parent)
+{
+}
+
+QSize ColumnGroupItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    // group title indexes have no own width, their text is drawn over all columns
+    if (index.model()->hasChildren(index) && index.column() == 0)
+    {
+        return QSize(32, QStyledItemDelegate::sizeHint(option, index).height());
+    }
+    return QStyledItemDelegate::sizeHint(option, index);
+}
+
+void ColumnGroupItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    if (index.model()->hasChildren(index))
+    {
+        painter->setClipping(false);
+        painter->setPen(option.palette.text().color());
+        if (option.state & QStyle::State_Selected)
+        {
+            painter->setPen(option.palette.highlightedText().color());
+        }
+        QRect textRect = option.rect;
+        textRect.setRight(qobject_cast<QWidget*>(parent())->width());
+        if (option.state & QStyle::State_Selected && index.column() == 0)
+        {
+            painter->fillRect(textRect, option.palette.highlight());
+        }
+        // there's just one text - somewhere in the model row, show it!
+        QString content;
+        const int columnCount = index.model()->columnCount(index.parent());
+        for (int column = 0; column < columnCount; ++column)
+        {
+            content += index.sibling(index.row(), column).data().toString();
+        }
+        int alignment = index.data(Qt::TextAlignmentRole).toInt();
+        if (index.column() == 0)
+        {
+            painter->drawText(textRect, (alignment == 0 ? Qt::AlignLeft | Qt::AlignVCenter : alignment) | Qt::ElideRight, content);
+        }
+
+        if (!index.parent().isValid() && index.row() > 0)
+        {
+            QTreeView* tv = qobject_cast<QTreeView*>(option.styleObject);
+            if (tv)
+            {
+                // draw a line in the same color as the table header for separation between groups
+                QStyleOptionHeader header;
+                header.rect = QRect(QPoint(1, textRect.top()), textRect.topRight() - QPoint(1,0));
+                tv->style()->drawControl(QStyle::CE_HeaderSection, &header, painter, tv->header());
+            }
+        }
+    }
+    else
+    {
+        QStyledItemDelegate::paint(painter, option, index);
+    }
+}
diff --git a/Code/Editor/Util/ColumnGroupItemDelegate.h b/Code/Editor/Util/ColumnGroupItemDelegate.h
new file mode 100644
index 0000000000..fd7da36aa3
--- /dev/null
+++ b/Code/Editor/Util/ColumnGroupItemDelegate.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
+ *
+ */
+#ifndef COLUMNGROUPITEMDELEGATE_H
+#define COLUMNGROUPITEMDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+class ColumnGroupItemDelegate
+    : public QStyledItemDelegate
+{
+public:
+    ColumnGroupItemDelegate(QObject* parent = 0);
+
+    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+
+    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+};
+
+#endif // COLUMNGROUPITEMDELEGATE_H
diff --git a/Code/Editor/Util/ColumnGroupProxyModel.cpp b/Code/Editor/Util/ColumnGroupProxyModel.cpp
new file mode 100644
index 0000000000..effc558483
--- /dev/null
+++ b/Code/Editor/Util/ColumnGroupProxyModel.cpp
@@ -0,0 +1,108 @@
+/*
+ * 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 "ColumnGroupProxyModel.h"
+
+// Editor
+#include "Util/ColumnSortProxyModel.h"
+#include "Util/AbstractSortModel.h"
+
+
+ColumnGroupProxyModel::ColumnGroupProxyModel(QObject* parent)
+    : AbstractGroupProxyModel(parent)
+    , m_sortModel(new ColumnSortProxyModel(this))
+    , m_freeSortColumn(-1)
+{
+    AbstractGroupProxyModel::setSourceModel(m_sortModel);
+    connect(m_sortModel, &ColumnSortProxyModel::SortChanged, this, &ColumnGroupProxyModel::SortChanged);
+}
+
+void ColumnGroupProxyModel::sort(int column, Qt::SortOrder order)
+{
+    if (m_freeSortColumn != -1)
+    {
+        m_sortModel->RemoveColumnWithoutSorting(m_freeSortColumn);
+        m_freeSortColumn = -1;
+    }
+    if (!m_groups.contains(column))
+    {
+        m_freeSortColumn = column;
+    }
+    m_sortModel->sort(column, order);
+}
+
+void ColumnGroupProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
+{
+    Q_ASSERT(qobject_cast<AbstractSortModel*>(sourceModel));
+    m_sortModel->setSourceModel(sourceModel);
+    RebuildTree();
+}
+
+void ColumnGroupProxyModel::AddGroup(int column)
+{
+    if (!m_groups.contains(column))
+    {
+        m_groups.push_back(column);
+        sort(column);
+        Q_EMIT GroupsChanged();
+    }
+}
+
+void ColumnGroupProxyModel::RemoveGroup(int column)
+{
+    if (m_groups.contains(column))
+    {
+        m_groups.remove(m_groups.indexOf(column));
+        m_sortModel->RemoveColumn(column);
+        Q_EMIT GroupsChanged();
+    }
+}
+
+void ColumnGroupProxyModel::SetGroups(const QVector<int>& columns)
+{
+    m_groups.clear();
+    foreach(int col, columns)
+    {
+        m_groups.push_back(col);
+        m_sortModel->AddColumnWithoutSorting(col);
+    }
+    m_sortModel->SortModel();
+    Q_EMIT GroupsChanged();
+}
+
+void ColumnGroupProxyModel::ClearGroups()
+{
+    m_groups.clear();
+    m_sortModel->ClearColumns();
+    Q_EMIT GroupsChanged();
+}
+
+QVector<int> ColumnGroupProxyModel::Groups() const
+{
+    return m_groups;
+}
+
+bool ColumnGroupProxyModel::IsColumnSorted(int col) const
+{
+    return m_sortModel->IsColumnSorted(col);
+}
+
+Qt::SortOrder ColumnGroupProxyModel::SortOrder(int col) const
+{
+    return m_sortModel->SortOrder(col);
+}
+
+QStringList ColumnGroupProxyModel::GroupForSourceIndex(const QModelIndex& sourceIndex) const
+{
+    QStringList group;
+    foreach(int column, m_groups)
+    group.push_back(QString::fromLatin1("%1: %2").arg(headerData(column, Qt::Horizontal).toString(), sourceIndex.sibling(sourceIndex.row(), column).data().toString()));
+    return group;
+}
+
+#include <Util/moc_ColumnGroupProxyModel.cpp>
diff --git a/Code/Editor/Util/ColumnGroupProxyModel.h b/Code/Editor/Util/ColumnGroupProxyModel.h
new file mode 100644
index 0000000000..4f3b95e16b
--- /dev/null
+++ b/Code/Editor/Util/ColumnGroupProxyModel.h
@@ -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
+ *
+ */
+#ifndef COLUMNGROUPPROXYMODEL_H
+#define COLUMNGROUPPROXYMODEL_H
+
+#if !defined(Q_MOC_RUN)
+#include "AbstractGroupProxyModel.h"
+
+#include <QVector>
+#endif
+
+class ColumnSortProxyModel;
+
+class ColumnGroupProxyModel
+    : public AbstractGroupProxyModel
+{
+    Q_OBJECT
+
+public:
+    ColumnGroupProxyModel(QObject* parent = nullptr);
+
+    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
+
+    void setSourceModel(QAbstractItemModel* sourceModel) override;
+
+    void AddGroup(int column);
+    void RemoveGroup(int column);
+    void SetGroups(const QVector<int>& columns);
+    void ClearGroups();
+    QVector<int> Groups() const;
+
+    bool IsColumnSorted(int col) const;
+    Qt::SortOrder SortOrder(int col) const;
+
+protected:
+    QStringList GroupForSourceIndex(const QModelIndex& sourceIndex) const override;
+
+signals:
+    void GroupsChanged();
+    void SortChanged();
+
+private:
+    ColumnSortProxyModel* m_sortModel;
+    QVector<int> m_groups;
+    int m_freeSortColumn;
+};
+
+#endif // COLUMNGROUPPROXYMODEL_H
diff --git a/Code/Editor/Util/ColumnGroupTreeView.cpp b/Code/Editor/Util/ColumnGroupTreeView.cpp
new file mode 100644
index 0000000000..7665f60c5e
--- /dev/null
+++ b/Code/Editor/Util/ColumnGroupTreeView.cpp
@@ -0,0 +1,163 @@
+/*
+ * 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 "ColumnGroupTreeView.h"
+
+// Editor
+#include "Util/ColumnGroupHeaderView.h"
+#include "Util/ColumnGroupProxyModel.h"
+#include "Util/ColumnGroupItemDelegate.h"
+
+
+ColumnGroupTreeView::ColumnGroupTreeView(QWidget* parent)
+    : QTreeView(parent)
+    , m_header(new ColumnGroupHeaderView)
+    , m_groupModel(new ColumnGroupProxyModel(this))
+{
+    setSortingEnabled(true);
+    setHeader(m_header);
+    setItemDelegate(new ColumnGroupItemDelegate(this));
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
+    setSelectionBehavior(QAbstractItemView::SelectRows);
+
+    QTreeView::setModel(m_groupModel);
+    connect(m_groupModel, &QAbstractItemModel::modelAboutToBeReset, this, &ColumnGroupTreeView::SaveOpenState);
+    connect(m_groupModel, &QAbstractItemModel::modelReset, this, &ColumnGroupTreeView::RestoreOpenState);
+    connect(m_groupModel, SIGNAL(GroupUpdated()), this, SLOT(SpanGroups()));
+    connect(m_groupModel, &ColumnGroupProxyModel::GroupsChanged, this, &ColumnGroupTreeView::expandAll);
+}
+
+void ColumnGroupTreeView::setModel(QAbstractItemModel* model)
+{
+    m_groupModel->setSourceModel(model);
+    if (model)
+    {
+        connect(model, &QAbstractItemModel::modelReset, this, &QTreeView::expandAll, Qt::QueuedConnection);
+    }
+}
+
+bool ColumnGroupTreeView::IsGroupsShown() const
+{
+    return m_header->IsGroupsShown();
+}
+
+void ColumnGroupTreeView::ShowGroups(bool showGroups)
+{
+    m_header->ShowGroups(showGroups);
+}
+
+QSet<QString> GetOpenNodes(QTreeView* tree, const QModelIndex& parent)
+{
+    int rows = tree->model()->rowCount(parent);
+    QSet<QString> results;
+
+    for (int row = 0; row < rows; ++row)
+    {
+        auto index = tree->model()->index(row, 0, parent);
+        if (tree->isExpanded(index))
+        {
+            results.insert(index.data().toString());
+        }
+        results.unite(GetOpenNodes(tree, index));
+    }
+    return results;
+}
+
+void ColumnGroupTreeView::SaveOpenState()
+{
+    m_openNodes = GetOpenNodes(this, QModelIndex());
+}
+
+void RestoreOpenNodes(QTreeView* tree, const QSet<QString> openNodes, const QModelIndex& parent)
+{
+    int rows = tree->model()->rowCount(parent);
+    QSet<QString> results;
+
+    for (int row = 0; row < rows; ++row)
+    {
+        auto index = tree->model()->index(row, 0, parent);
+        auto text = index.data().toString();
+        if (openNodes.contains(text))
+        {
+            tree->expand(index);
+        }
+        RestoreOpenNodes(tree, openNodes, index);
+    }
+}
+
+void ColumnGroupTreeView::RestoreOpenState()
+{
+    RestoreOpenNodes(this, m_openNodes, QModelIndex());
+}
+
+void ColumnGroupTreeView::Sort(int column, Qt::SortOrder order)
+{
+    m_groupModel->sort(column, order);
+    m_header->setSortIndicator(column, order);
+}
+
+void ColumnGroupTreeView::ToggleSortOrder(int column)
+{
+    auto sortOrder = m_groupModel->SortOrder(column) == Qt::AscendingOrder ? Qt::DescendingOrder : Qt::AscendingOrder;
+    m_groupModel->sort(column, sortOrder);
+}
+
+void ColumnGroupTreeView::AddGroup(int column)
+{
+    m_groupModel->AddGroup(column);
+}
+
+void ColumnGroupTreeView::RemoveGroup(int column)
+{
+    m_groupModel->RemoveGroup(column);
+}
+
+void ColumnGroupTreeView::SetGroups(const QVector<int>& columns)
+{
+    m_groupModel->SetGroups(columns);
+}
+
+void ColumnGroupTreeView::ClearGroups()
+{
+    m_groupModel->ClearGroups();
+}
+
+QVector<int> ColumnGroupTreeView::Groups() const
+{
+    return m_groupModel->Groups();
+}
+
+void ColumnGroupTreeView::SpanGroups(const QModelIndex& index)
+{
+    int childrenCount = m_groupModel->rowCount(index);
+    for (int row = 0; row < childrenCount; ++row)
+    {
+        auto childIndex = m_groupModel->index(row, 0, index);
+        bool hasChildren = m_groupModel->hasChildren(childIndex);
+        if (hasChildren)
+        {
+            setFirstColumnSpanned(row, index, true);
+            SpanGroups(childIndex);
+        }
+    }
+}
+
+QModelIndex ColumnGroupTreeView::mapToSource(const QModelIndex& proxyIndex) const
+{
+    auto sortProxy = qobject_cast<QAbstractProxyModel*>(m_groupModel->sourceModel());
+    return sortProxy->mapToSource(m_groupModel->mapToSource(proxyIndex));
+}
+
+QModelIndex ColumnGroupTreeView::mapFromSource(const QModelIndex& sourceModel) const
+{
+    auto sortProxy = qobject_cast<QAbstractProxyModel*>(m_groupModel->sourceModel());
+    return m_groupModel->mapFromSource(sortProxy->mapFromSource(sourceModel));
+}
+
+
+#include <Util/moc_ColumnGroupTreeView.cpp>
diff --git a/Code/Editor/Util/ColumnGroupTreeView.h b/Code/Editor/Util/ColumnGroupTreeView.h
new file mode 100644
index 0000000000..07f8f091d0
--- /dev/null
+++ b/Code/Editor/Util/ColumnGroupTreeView.h
@@ -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
+ *
+ */
+#ifndef COLUMNGROUPTREEVIEW_H
+#define COLUMNGROUPTREEVIEW_H
+
+#if !defined(Q_MOC_RUN)
+#include <QTreeView>
+#include <QPainter>
+#endif
+
+class ColumnGroupProxyModel;
+class ColumnGroupHeaderView;
+
+class ColumnGroupTreeView
+    : public QTreeView
+{
+    Q_OBJECT
+
+public:
+    ColumnGroupTreeView(QWidget* parent = 0);
+
+    void setModel(QAbstractItemModel* model) override;
+
+    bool IsGroupsShown() const;
+
+    QModelIndex mapToSource(const QModelIndex& proxyIndex) const;
+    QModelIndex mapFromSource(const QModelIndex& sourceModel) const;
+
+public slots:
+    void ShowGroups(bool showGroups);
+
+    void Sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
+    void ToggleSortOrder(int column);
+
+    void AddGroup(int column);
+    void RemoveGroup(int column);
+    void SetGroups(const QVector<int>& columns);
+    void ClearGroups();
+    QVector<int> Groups() const;
+
+protected:
+    void paintEvent(QPaintEvent* event)
+    {
+        if (model() && model()->rowCount() > 0)
+        {
+            QTreeView::paintEvent(event);
+        }
+        else
+        {
+            const QMargins margins(2, 2, 2, 2);
+            QPainter painter(viewport());
+            QString text(tr("There are no items to show."));
+            QRect textRect = painter.fontMetrics().boundingRect(text).marginsAdded(margins);
+            textRect.moveCenter(viewport()->rect().center());
+            textRect.moveTop(viewport()->rect().top());
+            painter.drawText(textRect, Qt::AlignCenter, text);
+        }
+    }
+
+private slots:
+    void SaveOpenState();
+    void RestoreOpenState();
+    void SpanGroups(const QModelIndex& index = QModelIndex());
+
+private:
+    ColumnGroupHeaderView* m_header;
+    ColumnGroupProxyModel* m_groupModel;
+    QSet<QString> m_openNodes;
+    bool m_showGroups;
+};
+
+#endif // COLUMNGROUPTREEVIEW_H
diff --git a/Code/Editor/Util/ColumnSortProxyModel.cpp b/Code/Editor/Util/ColumnSortProxyModel.cpp
new file mode 100644
index 0000000000..a5dc7c1ba7
--- /dev/null
+++ b/Code/Editor/Util/ColumnSortProxyModel.cpp
@@ -0,0 +1,283 @@
+/*
+ * 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 "ColumnSortProxyModel.h"
+
+// Editor
+#include "Util/AbstractSortModel.h"
+
+class ColumnSortProxyModelLessThan
+{
+public:
+    inline ColumnSortProxyModelLessThan(int column, const AbstractSortModel* source)
+        : sort_column(column)
+        , source_model(source) {}
+
+    inline bool operator()(int r1, int r2) const
+    {
+        QModelIndex i1 = source_model->index(r1, sort_column);
+        QModelIndex i2 = source_model->index(r2, sort_column);
+        return source_model->LessThan(i1, i2);
+    }
+
+private:
+    int sort_column;
+    const AbstractSortModel* source_model;
+};
+
+class ColumnSortProxyModelGreaterThan
+{
+public:
+    inline ColumnSortProxyModelGreaterThan(int column, const AbstractSortModel* source)
+        : sort_column(column)
+        , source_model(source) {}
+
+    inline bool operator()(int r1, int r2) const
+    {
+        QModelIndex i1 = source_model->index(r1, sort_column);
+        QModelIndex i2 = source_model->index(r2, sort_column);
+        return source_model->LessThan(i2, i1);
+    }
+
+private:
+    int sort_column;
+    const AbstractSortModel* source_model;
+};
+
+
+ColumnSortProxyModel::ColumnSortProxyModel(QObject* parent)
+    : QAbstractProxyModel(parent)
+{
+}
+
+ColumnSortProxyModel::~ColumnSortProxyModel()
+{
+}
+
+QVariant ColumnSortProxyModel::data(const QModelIndex& index, int role) const
+{
+    Q_ASSERT(index.isValid() && index.model() == this);
+    return sourceModel()->data(mapToSource(index), role);
+}
+
+QVariant ColumnSortProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    return sourceModel()->headerData(section, orientation, role);
+}
+
+int ColumnSortProxyModel::rowCount(const QModelIndex& index) const
+{
+    if (!sourceModel() || index.isValid())
+    {
+        return 0;
+    }
+    return sourceModel()->rowCount(index);
+}
+
+int ColumnSortProxyModel::columnCount(const QModelIndex& index) const
+{
+    if (!sourceModel() || index.isValid())
+    {
+        return 0;
+    }
+    return sourceModel()->columnCount(index);
+}
+
+QModelIndex ColumnSortProxyModel::index(int row, int column, const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+    Q_ASSERT(!parent.isValid());
+    return createIndex(row, column);
+}
+
+QModelIndex ColumnSortProxyModel::parent(const QModelIndex& index) const
+{
+    Q_UNUSED(index);
+    return QModelIndex();
+}
+
+QModelIndex ColumnSortProxyModel::mapFromSource(const QModelIndex& sourceIndex) const
+{
+    Q_ASSERT(!sourceIndex.isValid() || sourceIndex.model() == sourceModel());
+    if (!sourceIndex.isValid())
+    {
+        return QModelIndex();
+    }
+    int row = m_mappingToSource.indexOf(sourceIndex.row());
+    return createIndex(row, sourceIndex.column());
+}
+
+QModelIndex ColumnSortProxyModel::mapToSource(const QModelIndex& proxyIndex) const
+{
+    Q_ASSERT(!proxyIndex.isValid() || proxyIndex.model() == this);
+    if (!proxyIndex.isValid())
+    {
+        return QModelIndex();
+    }
+    int row = m_mappingToSource.at(proxyIndex.row());
+    return sourceModel()->index(row, proxyIndex.column());
+}
+
+void ColumnSortProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
+{
+    Q_ASSERT(qobject_cast<AbstractSortModel*>(sourceModel));
+    QAbstractProxyModel::setSourceModel(sourceModel);
+
+    connect(sourceModel, &QAbstractItemModel::rowsInserted, this, &ColumnSortProxyModel::SortModel);
+    connect(sourceModel, &QAbstractItemModel::rowsRemoved, this, &ColumnSortProxyModel::SortModel);
+    connect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, this, &ColumnSortProxyModel::beginResetModel);
+    connect(sourceModel, &QAbstractItemModel::modelReset, this, [=]()
+        {
+            { QSignalBlocker sb(this);
+              SortModel();
+            } endResetModel();
+        });
+    connect(sourceModel, &QAbstractItemModel::layoutChanged, this, &ColumnSortProxyModel::SortModel);
+    connect(sourceModel, &QAbstractItemModel::dataChanged, this, &ColumnSortProxyModel::SourceDataChanged);
+
+    SortModel();
+}
+
+void ColumnSortProxyModel::sort(int column, Qt::SortOrder order)
+{
+    int id = ColumnContains(column);
+    if (id == -1)
+    {
+        AddColumn(column, order);
+    }
+    else
+    {
+        if (m_columns.at(id).sortOrder != order)
+        {
+            m_columns[id].sortOrder = order;
+            SortModel();
+        }
+    }
+}
+
+void ColumnSortProxyModel::AddColumn(int column, Qt::SortOrder order)
+{
+    if (ColumnContains(column) == -1)
+    {
+        m_columns.push_front({ column, order });
+        SortModel();
+    }
+}
+
+void ColumnSortProxyModel::AddColumnWithoutSorting(int column, Qt::SortOrder order)
+{
+    if (ColumnContains(column) == -1)
+    {
+        m_columns.push_front({ column, order });
+    }
+}
+
+void ColumnSortProxyModel::RemoveColumn(int column)
+{
+    int id = ColumnContains(column);
+    if (id != -1)
+    {
+        m_columns.remove(id);
+        SortModel();
+    }
+}
+
+void ColumnSortProxyModel::RemoveColumnWithoutSorting(int column)
+{
+    int id = ColumnContains(column);
+    if (id != -1)
+    {
+        m_columns.remove(id);
+    }
+}
+
+void ColumnSortProxyModel::SetColumns(const QVector<int>& columns)
+{
+    m_columns.clear();
+    foreach(int col, columns)
+    {
+        m_columns.push_back({ col, Qt::AscendingOrder });
+    }
+    SortModel();
+}
+
+void ColumnSortProxyModel::ClearColumns()
+{
+    SortModel();
+}
+
+bool ColumnSortProxyModel::IsColumnSorted(int col) const
+{
+    int id = ColumnContains(col);
+    return (id != -1);
+}
+
+Qt::SortOrder ColumnSortProxyModel::SortOrder(int col) const
+{
+    int id = ColumnContains(col);
+    if (id != -1)
+    {
+        return m_columns.at(id).sortOrder;
+    }
+    return Qt::AscendingOrder;
+}
+
+void ColumnSortProxyModel::SortModel()
+{
+    emit layoutAboutToBeChanged();
+
+    int size = sourceModel() ? sourceModel()->rowCount() : 0;
+    m_mappingToSource.resize(size);
+    for (int i = 0; i < size; ++i)
+    {
+        m_mappingToSource[i] = i;
+    }
+
+    foreach(Column col, m_columns)
+    {
+        if (col.sortOrder == Qt::AscendingOrder)
+        {
+            ColumnSortProxyModelLessThan lt(col.column, qobject_cast<AbstractSortModel*>(sourceModel()));
+            std::stable_sort(m_mappingToSource.begin(), m_mappingToSource.end(), lt);
+        }
+        else
+        {
+            ColumnSortProxyModelGreaterThan gt(col.column, qobject_cast<AbstractSortModel*>(sourceModel()));
+            std::stable_sort(m_mappingToSource.begin(), m_mappingToSource.end(), gt);
+        }
+    }
+
+    emit layoutChanged();
+    emit SortChanged();
+}
+
+void ColumnSortProxyModel::SourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    for (int col = topLeft.column(); col <= bottomRight.column(); ++col)
+    {
+        if (ColumnContains(col) != -1)
+        {
+            SortModel();
+            return;
+        }
+    }
+}
+
+int ColumnSortProxyModel::ColumnContains(int col) const
+{
+    for (int i = 0; i < m_columns.count(); ++i)
+    {
+        if (m_columns.at(i).column == col)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+#include <Util/moc_ColumnSortProxyModel.cpp>
diff --git a/Code/Editor/Util/ColumnSortProxyModel.h b/Code/Editor/Util/ColumnSortProxyModel.h
new file mode 100644
index 0000000000..877b2500f1
--- /dev/null
+++ b/Code/Editor/Util/ColumnSortProxyModel.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
+ *
+ */
+#ifndef COLUMNSORTPROXYMODEL_H
+#define COLUMNSORTPROXYMODEL_H
+
+#if !defined(Q_MOC_RUN)
+#include <QAbstractProxyModel>
+
+#include <QVector>
+#endif
+
+class ColumnGroupProxyModel;
+
+/*!
+    \brief Proxy model used to sort on multiple columns
+
+    It's using a stable sort to sort on multiple columns.
+    Every time a value is changed (on one of the sorted columns), it will resort everything.
+    THis model does not work with tree models!
+*/
+
+class ColumnSortProxyModel
+    : public QAbstractProxyModel
+{
+    Q_OBJECT
+
+public:
+    ColumnSortProxyModel(QObject* parent = nullptr);
+    ~ColumnSortProxyModel();
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+    int rowCount(const QModelIndex& index = QModelIndex()) const override;
+    int columnCount(const QModelIndex& index = QModelIndex()) const override;
+
+    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex& index) const override;
+
+    QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override;
+    QModelIndex mapToSource(const QModelIndex& proxyIndex) const override;
+
+    void setSourceModel(QAbstractItemModel* sourceModel) override;
+
+    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
+
+    void AddColumn(int column, Qt::SortOrder order = Qt::AscendingOrder);
+    void RemoveColumn(int column);
+    void SetColumns(const QVector<int>& columns);
+    void ClearColumns();
+
+    bool IsColumnSorted(int col) const;
+    Qt::SortOrder SortOrder(int col) const;
+
+signals:
+    void SortChanged();
+
+private:
+    friend class ColumnGroupProxyModel;
+    void AddColumnWithoutSorting(int column, Qt::SortOrder order = Qt::AscendingOrder);
+    void RemoveColumnWithoutSorting(int column);
+
+private slots:
+    void SortModel();
+    void SourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+private:
+    struct Column
+    {
+        int column;
+        Qt::SortOrder sortOrder;
+    };
+    int ColumnContains(int col) const;
+
+    QVector<Column> m_columns;
+    QVector<int> m_mappingToSource;
+};
+
+#endif //COLUMNSORTPROXYMODEL_H
diff --git a/Code/Editor/Util/Contrib/NvFloatMath.inl b/Code/Editor/Util/Contrib/NvFloatMath.inl
new file mode 100644
index 0000000000..7088a36f02
--- /dev/null
+++ b/Code/Editor/Util/Contrib/NvFloatMath.inl
@@ -0,0 +1,455 @@
+/*
+ * 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
+ *
+ */
+/* BEGIN CONTENTS OF README.TXT -------------------------------------
+The ConvexDecomposition library was written by John W. Ratcliff mailto:jratcliffscarab@gmail.com
+
+What is Convex Decomposition?
+
+Convex Decomposition is when you take an arbitrarily complex triangle mesh and sub-divide it into
+a collection of discrete compound pieces (each represented as a convex hull) to approximate
+the original shape of the objet.
+
+This is required since few physics engines can treat aribtrary triangle mesh objects as dynamic
+objects.  Even those engines which can handle this use case incurr a huge performance and memory
+penalty to do so.
+
+By breaking a complex triangle mesh up into a discrete number of convex components you can greatly
+improve performance for dynamic simulations.
+
+--------------------------------------------------------------------------------
+
+This code is released under the MIT license.
+
+The code is functional but could use the following improvements:
+
+(1) The convex hull generator, originally written by Stan Melax, could use some major code cleanup.
+
+(2) The code to remove T-junctions appears to have a bug in it.  This code was working fine before,
+but I haven't had time to debug why it stopped working.
+
+(3) Island generation once the mesh has been split is currently disabled due to the fact that the
+Remove Tjunctions functionality has a bug in it.
+
+(4) The code to perform a raycast against a triangle mesh does not currently use any acceleration
+data structures.
+
+(5) When a split is performed, the surface that got split is not 'capped'.  This causes a problem
+if you use a high recursion depth on your convex decomposition.  It will cause the object to
+be modelled as if it had a hollow interior.  A lot of work was done to solve this problem, but
+it hasn't been integrated into this code drop yet.
+
+
+*/// ---------- END CONTENTS OF README.TXT ----------------------------
+
+
+// a set of routines that let you do common 3d math
+// operations without any vector, matrix, or quaternion
+// classes or templates.
+//
+// a vector (or point) is a 'NxF32 *' to 3 floating point numbers.
+// a matrix is a 'NxF32 *' to an array of 16 floating point numbers representing a 4x4 transformation matrix compatible with D3D or OGL
+// a quaternion is a 'NxF32 *' to 4 floats representing a quaternion x,y,z,w
+//
+//
+/*!
+**
+** Copyright (c) 2009 by John W. Ratcliff mailto:jratcliffscarab@gmail.com
+**
+** Portions of this source has been released with the PhysXViewer application, as well as
+** Rocket, CreateDynamics, ODF, and as a number of sample code snippets.
+**
+** If you find this code useful or you are feeling particularily generous I would
+** ask that you please go to http://www.amillionpixels.us and make a donation
+** to Troy DeMolay.
+**
+** DeMolay is a youth group for young men between the ages of 12 and 21.
+** It teaches strong moral principles, as well as leadership skills and
+** public speaking.  The donations page uses the 'pay for pixels' paradigm
+** where, in this case, a pixel is only a single penny.  Donations can be
+** made for as small as $4 or as high as a $100 block.  Each person who donates
+** will get a link to their own site as well as acknowledgement on the
+** donations blog located here http://www.amillionpixels.blogspot.com/
+**
+** If you wish to contact me you can use the following methods:
+**
+** Skype ID: jratcliff63367
+** Yahoo: jratcliff63367
+** AOL: jratcliff1961
+** email: jratcliffscarab@gmail.com
+**
+**
+** The MIT license:
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the Software is furnished
+** to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in all
+** copies or substantial portions of the Software.
+
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+** WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+#pragma warning(disable:4996)
+
+class TVec
+{
+public:
+    TVec(NxF64 _x, NxF64 _y, NxF64 _z) { x = _x; y = _y; z = _z; };
+    TVec(void) { };
+
+    NxF64 x;
+    NxF64 y;
+    NxF64 z;
+};
+
+
+class CTriangulator
+{
+public:
+    ///     Default constructor
+    CTriangulator();
+
+    ///     Default destructor
+    virtual ~CTriangulator();
+
+    ///     Returns the given point in the triangulator array
+    inline TVec get(const TU32 id) { return mPoints[id]; }
+
+    virtual void reset(void)
+    {
+        mInputPoints.clear();
+        mPoints.clear();
+        mIndices.clear();
+    }
+
+    virtual void addPoint(NxF64 x, NxF64 y, NxF64 z)
+    {
+        TVec v(x, y, z);
+        // update bounding box...
+        if (mInputPoints.empty())
+        {
+            mMin = v;
+            mMax = v;
+        }
+        else
+        {
+            if (x < mMin.x)
+            {
+                mMin.x = x;
+            }
+            if (y < mMin.y)
+            {
+                mMin.y = y;
+            }
+            if (z < mMin.z)
+            {
+                mMin.z = z;
+            }
+
+            if (x > mMax.x)
+            {
+                mMax.x = x;
+            }
+            if (y > mMax.y)
+            {
+                mMax.y = y;
+            }
+            if (z > mMax.z)
+            {
+                mMax.z = z;
+            }
+        }
+        mInputPoints.push_back(v);
+    }
+
+    // Triangulation happens in 2d.  We could inverse transform the polygon around the normal direction, or we just use the two most signficant axes
+    // Here we find the two longest axes and use them to triangulate.  Inverse transforming them would introduce more doubleing point error and isn't worth it.
+    virtual NxU32* triangulate(NxU32& tcount, NxF64 epsilon)
+    {
+        NxU32* ret = 0;
+        tcount = 0;
+        mEpsilon = epsilon;
+
+        if (!mInputPoints.empty())
+        {
+            mPoints.clear();
+
+            NxF64 dx = mMax.x - mMin.x; // locate the first, second and third longest edges and store them in i1, i2, i3
+            NxF64 dy = mMax.y - mMin.y;
+            NxF64 dz = mMax.z - mMin.z;
+
+            NxU32 i1, i2, i3;
+
+            if (dx > dy && dx > dz)
+            {
+                i1 = 0;
+                if (dy > dz)
+                {
+                    i2 = 1;
+                    i3 = 2;
+                }
+                else
+                {
+                    i2 = 2;
+                    i3 = 1;
+                }
+            }
+            else if (dy > dx && dy > dz)
+            {
+                i1 = 1;
+                if (dx > dz)
+                {
+                    i2 = 0;
+                    i3 = 2;
+                }
+                else
+                {
+                    i2 = 2;
+                    i3 = 0;
+                }
+            }
+            else
+            {
+                i1 = 2;
+                if (dx > dy)
+                {
+                    i2 = 0;
+                    i3 = 1;
+                }
+                else
+                {
+                    i2 = 1;
+                    i3 = 0;
+                }
+            }
+
+            NxU32 pcount = (NxU32)mInputPoints.size();
+            const NxF64* points = &mInputPoints[0].x;
+            for (NxU32 i = 0; i < pcount; i++)
+            {
+                TVec v(points[i1], points[i2], points[i3]);
+                mPoints.push_back(v);
+                points += 3;
+            }
+
+            mIndices.clear();
+            triangulate(mIndices);
+            tcount = (NxU32)mIndices.size() / 3;
+            if (tcount)
+            {
+                ret = &mIndices[0];
+            }
+        }
+        return ret;
+    }
+
+    virtual const NxF64* getPoint(NxU32 index)
+    {
+        return &mInputPoints[index].x;
+    }
+
+
+private:
+    NxF64                  mEpsilon;
+    TVec                   mMin;
+    TVec                   mMax;
+    TVecVector             mInputPoints;
+    TVecVector             mPoints;
+    TU32Vector             mIndices;
+
+    ///     Tests if a point is inside the given triangle
+    bool _insideTriangle(const TVec& A, const TVec& B, const TVec& C, const TVec& P);
+
+    ///     Returns the area of the contour
+    NxF64 _area();
+
+    bool _snip(NxI32 u, NxI32 v, NxI32 w, NxI32 n, NxI32* V);
+
+    ///     Processes the triangulation
+    void _process(TU32Vector& indices);
+    ///     Triangulates the contour
+    void triangulate(TU32Vector& indices);
+};
+
+///     Default constructor
+CTriangulator::CTriangulator(void)
+{
+}
+
+///     Default destructor
+CTriangulator::~CTriangulator()
+{
+}
+
+///     Triangulates the contour
+void CTriangulator::triangulate(TU32Vector& indices)
+{
+    _process(indices);
+}
+
+///     Processes the triangulation
+void CTriangulator::_process(TU32Vector& indices)
+{
+    const NxI32 n = (const NxI32)mPoints.size();
+    if (n < 3)
+    {
+        return;
+    }
+    NxI32* V = (NxI32*)MEMALLOC_MALLOC(sizeof(NxI32) * n);
+
+    bool flipped = false;
+
+    if (0.0f < _area())
+    {
+        for (NxI32 v = 0; v < n; v++)
+        {
+            V[v] = v;
+        }
+    }
+    else
+    {
+        flipped = true;
+        for (NxI32 v = 0; v < n; v++)
+        {
+            V[v] = (n - 1) - v;
+        }
+    }
+
+    NxI32 nv = n;
+    NxI32 count = 2 * nv;
+    for (NxI32 m = 0, v = nv - 1; nv > 2; )
+    {
+        if (0 >= (count--))
+        {
+            return;
+        }
+
+        NxI32 u = v;
+        if (nv <= u)
+        {
+            u = 0;
+        }
+        v = u + 1;
+        if (nv <= v)
+        {
+            v = 0;
+        }
+        NxI32 w = v + 1;
+        if (nv <= w)
+        {
+            w = 0;
+        }
+
+        if (_snip(u, v, w, nv, V))
+        {
+            NxI32 a, b, c, s, t;
+            a = V[u];
+            b = V[v];
+            c = V[w];
+            if (flipped)
+            {
+                indices.push_back(a);
+                indices.push_back(b);
+                indices.push_back(c);
+            }
+            else
+            {
+                indices.push_back(c);
+                indices.push_back(b);
+                indices.push_back(a);
+            }
+            m++;
+            for (s = v, t = v + 1; t < nv; s++, t++)
+            {
+                V[s] = V[t];
+            }
+            nv--;
+            count = 2 * nv;
+        }
+    }
+
+    MEMALLOC_FREE(V);
+}
+
+///     Returns the area of the contour
+NxF64 CTriangulator::_area()
+{
+    NxI32 n = (NxU32)mPoints.size();
+    NxF64 A = 0.0f;
+    for (NxI32 p = n - 1, q = 0; q < n; p = q++)
+    {
+        const TVec& pval = mPoints[p];
+        const TVec& qval = mPoints[q];
+        A += pval.x * qval.y - qval.x * pval.y;
+    }
+    A *= 0.5f;
+    return A;
+}
+
+bool CTriangulator::_snip(NxI32 u, NxI32 v, NxI32 w, NxI32 n, NxI32* V)
+{
+    NxI32 p;
+
+    const TVec& A = mPoints[V[u]];
+    const TVec& B = mPoints[V[v]];
+    const TVec& C = mPoints[V[w]];
+
+    if (mEpsilon > (((B.x - A.x) * (C.y - A.y)) - ((B.y - A.y) * (C.x - A.x))))
+    {
+        return false;
+    }
+
+    for (p = 0; p < n; p++)
+    {
+        if ((p == u) || (p == v) || (p == w))
+        {
+            continue;
+        }
+        const TVec& P = mPoints[V[p]];
+        if (_insideTriangle(A, B, C, P))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+///     Tests if a point is inside the given triangle
+bool CTriangulator::_insideTriangle(const TVec& A, const TVec& B, const TVec& C, const TVec& P)
+{
+    NxF64 ax, ay, bx, by, cx, cy, apx, apy, bpx, bpy, cpx, cpy;
+    NxF64 cCROSSap, bCROSScp, aCROSSbp;
+
+    ax = C.x - B.x;
+    ay = C.y - B.y;
+    bx = A.x - C.x;
+    by = A.y - C.y;
+    cx = B.x - A.x;
+    cy = B.y - A.y;
+    apx = P.x - A.x;
+    apy = P.y - A.y;
+    bpx = P.x - B.x;
+    bpy = P.y - B.y;
+    cpx = P.x - C.x;
+    cpy = P.y - C.y;
+
+    aCROSSbp = ax * bpy - ay * bpx;
+    cCROSSap = cx * apy - cy * apx;
+    bCROSScp = bx * cpy - by * cpx;
+
+    return ((aCROSSbp >= 0.0f) && (bCROSScp >= 0.0f) && (cCROSSap >= 0.0f));
+}
+
diff --git a/Code/Editor/Util/CryMemFile.h b/Code/Editor/Util/CryMemFile.h
new file mode 100644
index 0000000000..2df6e68c13
--- /dev/null
+++ b/Code/Editor/Util/CryMemFile.h
@@ -0,0 +1,73 @@
+/*
+ * 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_CRYMEMFILE_H
+#define CRYINCLUDE_EDITOR_UTIL_CRYMEMFILE_H
+#pragma once
+
+#include <QBuffer>
+
+// derived class to get correct memory allocation/deallocation with custom memory manager - and to avoid memory leaks from calling Detach()
+class CCryMemFile
+    : public QBuffer
+{
+public: // ---------------------------------------------------------------
+
+    CCryMemFile()
+        : QBuffer(&m_lpBuffer)
+    {
+        open(QIODevice::WriteOnly);
+    }
+    CCryMemFile(char* lpBuffer, int nBufferSize)
+        : QBuffer(&m_lpBuffer), m_lpBuffer(lpBuffer, nBufferSize)
+    {
+        open(QIODevice::WriteOnly);
+    }
+
+    virtual ~CCryMemFile()
+    {
+        close();        // call Close() to make sure the Free() is using my v-table
+    }
+
+    qulonglong GetPosition() const
+    {
+        return QBuffer::pos();
+    }
+
+    qulonglong GetLength() const
+    {
+        return QBuffer::size();
+    }
+
+    void Write(const void* lpBuf, unsigned int nCount)
+    {
+        QBuffer::write(reinterpret_cast<const char*>(lpBuf), nCount);
+    }
+
+    // only for temporary use
+    void* GetMemPtr() const
+    {
+        return const_cast<char*>(m_lpBuffer.data());
+    }
+
+    void Close()
+    {
+        QBuffer::close();
+    }
+
+    char* Detach()
+    {
+        assert(0);      // dangerous - most likely we cause memory leak - better use GetMemPtr
+        return 0;
+    }
+
+private:
+    QByteArray m_lpBuffer;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_CRYMEMFILE_H
diff --git a/Code/Editor/Util/DynamicArray2D.cpp b/Code/Editor/Util/DynamicArray2D.cpp
new file mode 100644
index 0000000000..63ee4755d7
--- /dev/null
+++ b/Code/Editor/Util/DynamicArray2D.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 "EditorDefs.h"
+
+#include "DynamicArray2D.h"
+
+// Editor
+#include "Util/fastlib.h"
+
+//////////////////////////////////////////////////////////////////////
+// Construction / destruction
+//////////////////////////////////////////////////////////////////////
+
+CDynamicArray2D::CDynamicArray2D(unsigned int iDimension1, unsigned int iDimension2)
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Declare a 2D array on the free store
+    ////////////////////////////////////////////////////////////////////////
+
+    unsigned int i;
+
+    // Save the position of the array dimensions
+    m_Dimension1 = iDimension1;
+    m_Dimension2 = iDimension2;
+
+    // First dimension
+    m_Array = new float* [m_Dimension1];
+    assert(m_Array);
+
+    // Second dimension
+    for (i = 0; i < m_Dimension1; ++i)
+    {
+        m_Array[i] = new float[m_Dimension2];
+
+        // Init all fields with 0
+        memset(&m_Array[i][0], 0, m_Dimension2 * sizeof(float));
+    }
+}
+
+CDynamicArray2D::~CDynamicArray2D()
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Remove the 2D array and all its sub arrays from the free store
+    ////////////////////////////////////////////////////////////////////////
+
+    unsigned int i;
+
+    for (i = 0; i < m_Dimension1; ++i)
+    {
+        delete [] m_Array[i];
+    }
+
+    delete [] m_Array;
+    m_Array = 0;
+}
+
+
+void CDynamicArray2D::GetMemoryUsage(ICrySizer* pSizer)
+{
+    pSizer->Add((char*)this, m_Dimension1 * m_Dimension2 * sizeof(float) + sizeof(*this));
+}
+
+void CDynamicArray2D::ScaleImage(CDynamicArray2D* pDestination)
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Scale an image stored (in an array class) to a new size
+    ////////////////////////////////////////////////////////////////////////
+
+    unsigned int i, j, iOldWidth;
+    int iXSrcFl, iXSrcCe, iYSrcFl, iYSrcCe;
+    float fXSrc, fYSrc;
+    float fHeight[4];
+    float fHeightWeight[4];
+    float fHeightBottom;
+    float fHeightTop;
+
+    assert(pDestination);
+    assert(pDestination->m_Dimension1 > 1);
+
+    // Width has to be zero based, not a count
+    iOldWidth = m_Dimension1 - 1;
+
+    // Loop trough each field of the new image and interpolate the value
+    // from the source heightmap
+    for (i = 0; i < pDestination->m_Dimension1; i++)
+    {
+        // Calculate the average source array position
+        fXSrc = i / (float) pDestination->m_Dimension1 * iOldWidth;
+        assert(fXSrc >= 0.0f && fXSrc <= iOldWidth);
+
+        // Precalculate floor and ceiling values. Use fast asm integer floor and
+        // fast asm float / integer conversion
+        iXSrcFl = ifloor(fXSrc);
+        iXSrcCe = FloatToIntRet((float) ceil(fXSrc));
+
+        // Distribution between left and right height values
+        fHeightWeight[0] = (float) iXSrcCe - fXSrc;
+        fHeightWeight[1] = fXSrc - (float) iXSrcFl;
+
+        // Avoid error when floor() and ceil() return the same value
+        if (fHeightWeight[0] == 0.0f && fHeightWeight[1] == 0.0f)
+        {
+            fHeightWeight[0] = 0.5f;
+            fHeightWeight[1] = 0.5f;
+        }
+
+        for (j = 0; j < pDestination->m_Dimension1; j++)
+        {
+            // Calculate the average source array position
+            fYSrc = j / (float) pDestination->m_Dimension1 * iOldWidth;
+            assert(fYSrc >= 0.0f && fYSrc <= iOldWidth);
+
+            // Precalculate floor and ceiling values. Use fast asm integer floor and
+            // fast asm float / integer conversion
+            iYSrcFl = ifloor(fYSrc);
+            iYSrcCe = FloatToIntRet((float) ceil(fYSrc));
+
+            // Get the four nearest height values
+            fHeight[0] = m_Array[iXSrcFl][iYSrcFl];
+            fHeight[1] = m_Array[iXSrcCe][iYSrcFl];
+            fHeight[2] = m_Array[iXSrcFl][iYSrcCe];
+            fHeight[3] = m_Array[iXSrcCe][iYSrcCe];
+
+            // Calculate how much weight each height value has
+
+            // Distribution between top and bottom height values
+            fHeightWeight[2] = (float) iYSrcCe - fYSrc;
+            fHeightWeight[3] = fYSrc - (float) iYSrcFl;
+
+            // Avoid error when floor() and ceil() return the same value
+            if (fHeightWeight[2] == 0.0f && fHeightWeight[3] == 0.0f)
+            {
+                fHeightWeight[2] = 0.5f;
+                fHeightWeight[3] = 0.5f;
+            }
+
+            // Interpolate between the four nearest height values
+
+            // Get the height for the given X position trough interpolation between
+            // the left and the right height
+            fHeightBottom = (fHeight[0] * fHeightWeight[0] + fHeight[1] * fHeightWeight[1]);
+            fHeightTop    = (fHeight[2] * fHeightWeight[0] + fHeight[3] * fHeightWeight[1]);
+
+            // Set the new value in the destination heightmap
+            pDestination->m_Array[i][j] = fHeightBottom * fHeightWeight[2] + fHeightTop * fHeightWeight[3];
+        }
+    }
+}
diff --git a/Code/Editor/Util/DynamicArray2D.h b/Code/Editor/Util/DynamicArray2D.h
new file mode 100644
index 0000000000..90d5767dae
--- /dev/null
+++ b/Code/Editor/Util/DynamicArray2D.h
@@ -0,0 +1,38 @@
+/*
+ * 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 : Interface of the class CDynamicArray.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_DYNAMICARRAY2D_H
+#define CRYINCLUDE_EDITOR_UTIL_DYNAMICARRAY2D_H
+#pragma once
+
+
+class CDynamicArray2D
+{
+public:
+    // constructor
+    CDynamicArray2D(unsigned int iDimension1, unsigned int iDimension2);
+    // destructor
+    virtual ~CDynamicArray2D();
+    //
+    void ScaleImage(CDynamicArray2D* pDestination);
+    //
+    void GetMemoryUsage(ICrySizer* pSizer);
+
+
+    float**                    m_Array;                     //
+
+private:
+
+    unsigned int            m_Dimension1;           //
+    unsigned int            m_Dimension2;           //
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_DYNAMICARRAY2D_H
diff --git a/Code/Editor/Util/EditorAutoLevelLoadTest.cpp b/Code/Editor/Util/EditorAutoLevelLoadTest.cpp
new file mode 100644
index 0000000000..e87dcc968e
--- /dev/null
+++ b/Code/Editor/Util/EditorAutoLevelLoadTest.cpp
@@ -0,0 +1,38 @@
+/*
+ * 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 "EditorAutoLevelLoadTest.h"
+
+CEditorAutoLevelLoadTest& CEditorAutoLevelLoadTest::Instance()
+{
+    static CEditorAutoLevelLoadTest levelLoadTest;
+    return levelLoadTest;
+}
+
+CEditorAutoLevelLoadTest::CEditorAutoLevelLoadTest()
+{
+    GetIEditor()->RegisterNotifyListener(this);
+}
+
+CEditorAutoLevelLoadTest::~CEditorAutoLevelLoadTest()
+{
+    GetIEditor()->UnregisterNotifyListener(this);
+}
+
+void CEditorAutoLevelLoadTest::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnEndSceneOpen:
+        CLogFile::WriteLine("[LevelLoadFinished]");
+        exit(0);
+        break;
+    }
+}
diff --git a/Code/Editor/Util/EditorAutoLevelLoadTest.h b/Code/Editor/Util/EditorAutoLevelLoadTest.h
new file mode 100644
index 0000000000..5908d96278
--- /dev/null
+++ b/Code/Editor/Util/EditorAutoLevelLoadTest.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_EDITORAUTOLEVELLOADTEST_H
+#define CRYINCLUDE_EDITOR_UTIL_EDITORAUTOLEVELLOADTEST_H
+#pragma once
+
+
+class CEditorAutoLevelLoadTest
+    : public IEditorNotifyListener
+{
+public:
+    static CEditorAutoLevelLoadTest& Instance();
+private:
+    CEditorAutoLevelLoadTest();
+    virtual ~CEditorAutoLevelLoadTest();
+
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_EDITORAUTOLEVELLOADTEST_H
diff --git a/Code/Editor/Util/EditorUtils.cpp b/Code/Editor/Util/EditorUtils.cpp
new file mode 100644
index 0000000000..408338a04b
--- /dev/null
+++ b/Code/Editor/Util/EditorUtils.cpp
@@ -0,0 +1,300 @@
+/*
+ * 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 "EditorUtils.h"
+
+#include "EditorToolsApplicationAPI.h"
+
+// Qt
+#include <QColor>
+#include <QMessageBox>
+
+
+#define GetAValue(rgba)      (LOBYTE((rgba)>>24)) // Microsoft does not provide this one so let's make our own.
+#define RGBA(r,g,b,a)          ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)|(((DWORD)(BYTE)(a))<<24)))
+
+//////////////////////////////////////////////////////////////////////////
+void HeapCheck::Check([[maybe_unused]] const char* file, [[maybe_unused]] int line)
+{
+    #ifdef _DEBUG
+
+#ifdef Q_OS_WIN
+    _ASSERTE(_CrtCheckMemory());
+#endif
+
+    /*
+   int heapstatus = _heapchk();
+   switch( heapstatus )
+   {
+   case _HEAPOK:
+      break;
+   case _HEAPEMPTY:
+      break;
+   case _HEAPBADBEGIN:
+            {
+                CString str;
+                str.Format( "Bad Start of Heap, at file %s line:%d",file,line );
+                MessageBox( NULL,str,"Heap Check",MB_OK );
+            }
+      break;
+   case _HEAPBADNODE:
+            {
+                CString str;
+                str.Format( "Bad Node in Heap, at file %s line:%d",file,line );
+                MessageBox( NULL,str,"Heap Check",MB_OK );
+            }
+      break;
+   }
+     */
+    #endif
+}
+
+#ifdef LoadCursor
+#undef LoadCursor
+#endif
+QCursor CMFCUtils::LoadCursor(unsigned int nIDResource, int hotX, int hotY)
+{
+    QString path;
+    switch (nIDResource)
+    {
+    case IDC_HAND_INTERNAL:
+        path = QStringLiteral("cursor1.cur");
+        break;
+    case IDC_ZOOM_INTERNAL:
+        path = QStringLiteral("cur00001.cur");
+        break;
+    case IDC_BRUSH_INTERNAL:
+        path = QStringLiteral("cur00002.cur");
+        break;
+    case IDC_ARRBLCK:
+        path = QStringLiteral("cur00003.cur");
+        break;
+    case IDC_ARRBLCKCROSS:
+        path = QStringLiteral("cur00004.cur");
+        break;
+    case IDC_ARRWHITE:
+        path = QStringLiteral("cur00005.cur");
+        break;
+    case IDC_COLOR_PICKER:
+        path = QStringLiteral("pick_cursor.cur");
+        break;
+    case IDC_HIT_CURSOR:
+        path = QStringLiteral("hit.cur");
+        break;
+    case IDC_ARROW_ADDKEY:
+        path = QStringLiteral("arr_addkey.cur");
+        break;
+    case IDC_LEFTRIGHT:
+        path = QStringLiteral("leftright.cur");
+        break;
+    case IDC_POINTER_OBJHIT:
+        path = QStringLiteral("pointerHit.cur");
+        break;
+    case IDC_POINTER_LINK:
+        path = QStringLiteral("pointer_link.cur");
+        break;
+    case IDC_POINTER_LINKNOW:
+        path = QStringLiteral("pointer_linknow.cur");
+        break;
+    case IDC_POINTER_OBJECT_ROTATE:
+        path = QStringLiteral("object_rotate.cur");
+        break;
+    case IDC_POINTER_OBJECT_SCALE:
+        path = QStringLiteral("object_scale.cur");
+        break;
+    case IDC_POINTER_OBJECT_MOVE:
+        path = QStringLiteral("object_move.cur");
+        break;
+    case IDC_POINTER_PLUS:
+        path = QStringLiteral("pointer_plus.cur");
+        break;
+    case IDC_POINTER_MINUS:
+        path = QStringLiteral("pointer_minus.cur");
+        break;
+    case IDC_POINTER_FLATTEN:
+        path = QStringLiteral("pointer_flatten.cur");
+        break;
+    case IDC_POINTER_SMOOTH:
+        path = QStringLiteral("pointer_smooth.cur");
+        break;
+    case IDC_POINTER_SO_SELECT:
+        path = QStringLiteral("pointer_so_select.cur");
+        break;
+    case IDC_POINTER_SO_SELECT_PLUS:
+        path = QStringLiteral("pointer_so_sel_plus.cur");
+        break;
+    case IDC_POINTER_SO_SELECT_MINUS:
+        path = QStringLiteral("pointer_.cur");
+        break;
+    case IDC_POINTER_DRAG_ITEM:
+        path = QStringLiteral("pointerDragItem.cur");
+        break;
+    case IDC_CURSOR_HAND_DRAG:
+        path = QStringLiteral("handDrag.cur");
+        break;
+    case IDC_CURSOR_HAND_FINGER:
+        path = QStringLiteral("cursor2.cur");
+        break;
+    case IDC_ARROW_UP:
+        path = QStringLiteral("arrow_up.cur");
+        break;
+    case IDC_ARROW_DOWN:
+        path = QStringLiteral("arrow_down.cur");
+        break;
+    case IDC_ARROW_DOWNRIGHT:
+        path = QStringLiteral("arrow_downright.cur");
+        break;
+    case IDC_ARROW_UPRIGHT:
+        path = QStringLiteral("arrow_upright.cur");
+        break;
+    case IDC_POINTER_GET_HEIGHT:
+        path = QStringLiteral("pointer_getheight.cur");
+        break;
+    default:
+        return QCursor();
+    }
+    path = QStringLiteral(":/cursors/res/") + path;
+    QPixmap pm(path);
+    if (!pm.isNull() && (hotX < 0 || hotY < 0))
+    {
+        QFile f(path);
+        f.open(QFile::ReadOnly);
+        QDataStream stream(&f);
+        stream.setByteOrder(QDataStream::LittleEndian);
+        f.read(10);
+        quint16 x;
+        stream >> x;
+        hotX = x;
+        stream >> x;
+        hotY = x;
+    }
+    return QCursor(pm, hotX, hotY);
+}
+
+//////////////////////////////////////////////////////////////////////////-
+QString TrimTrailingZeros(QString str)
+{
+    if (str.contains('.'))
+    {
+        for (int p = str.size() - 1; p >= 0; --p)
+        {
+            if (str.at(p) == '.')
+            {
+                return str.left(p);
+            }
+            else if (str.at(p) != '0')
+            {
+                return str.left(p + 1);
+            }
+        }
+        return QString("0");
+    }
+    return str;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// This function is supposed to format float in user-friendly way,
+// omitting the exponent notation.
+//
+// Why not using printf? Its formatting rules has following drawbacks:
+//  %g   - will use exponent for small numbers;
+//  %.Nf - doesn't allow to control total amount of significant numbers,
+//         which exposes limited precision during binary-to-decimal fraction
+//         conversion.
+//////////////////////////////////////////////////////////////////////////
+void FormatFloatForUI(QString& str, int significantDigits, double value)
+{
+    str = TrimTrailingZeros(QString::number(value, 'f', significantDigits));
+    return;
+}
+//////////////////////////////////////////////////////////////////////////-
+
+//////////////////////////////////////////////////////////////////////////
+QColor ColorLinearToGamma(ColorF col)
+{
+    float r = clamp_tpl(col.r, 0.0f, 1.0f);
+    float g = clamp_tpl(col.g, 0.0f, 1.0f);
+    float b = clamp_tpl(col.b, 0.0f, 1.0f);
+    float a = clamp_tpl(col.a, 0.0f, 1.0f);
+
+    r = (float)(r <= 0.0031308 ? (12.92 * r) : (1.055 * pow((double)r, 1.0 / 2.4) - 0.055));
+    g = (float)(g <= 0.0031308 ? (12.92 * g) : (1.055 * pow((double)g, 1.0 / 2.4) - 0.055));
+    b = (float)(b <= 0.0031308 ? (12.92 * b) : (1.055 * pow((double)b, 1.0 / 2.4) - 0.055));
+
+    return QColor(FtoI(r * 255.0f), FtoI(g * 255.0f), FtoI(b * 255.0f), FtoI(a * 255.0f));
+}
+
+//////////////////////////////////////////////////////////////////////////
+ColorF ColorGammaToLinear(const QColor& col)
+{
+    float r = (float)col.red() / 255.0f;
+    float g = (float)col.green() / 255.0f;
+    float b = (float)col.blue() / 255.0f;
+    float a = (float)col.alpha() / 255.0f;
+
+    return ColorF((float)(r <= 0.04045 ? (r / 12.92) : pow(((double)r + 0.055) / 1.055, 2.4)),
+        (float)(g <= 0.04045 ? (g / 12.92) : pow(((double)g + 0.055) / 1.055, 2.4)),
+        (float)(b <= 0.04045 ? (b / 12.92) : pow(((double)b + 0.055) / 1.055, 2.4)), a);
+}
+
+QColor ColorToQColor(uint32 color)
+{
+    return QColor::fromRgbF((float)GetRValue(color) / 255.0f,
+        (float)GetGValue(color) / 255.0f,
+        (float)GetBValue(color) / 255.0f);
+}
+
+namespace EditorUtils
+{
+    AZ_PUSH_DISABLE_WARNING(4273, "-Wunknown-warning-option")
+    AzWarningAbsorber::AzWarningAbsorber(const char* window)
+        : m_window(window)
+    AZ_POP_DISABLE_WARNING
+    { 
+        BusConnect();
+    }
+
+    AzWarningAbsorber::~AzWarningAbsorber()
+    {
+        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
+    }
+
+    bool AzWarningAbsorber::OnPreWarning(const char* window, const char*, int, const char*, const char*)
+    {
+        if ((window)&&(m_window == window))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    const char* LevelFile::GetOldCryFileExtension()
+    {
+        const char* oldCryExtension = nullptr;
+        EditorInternal::EditorToolsApplicationRequestBus::BroadcastResult(
+            oldCryExtension, &EditorInternal::EditorToolsApplicationRequests::GetOldCryLevelExtension);
+
+        AZ_Assert(oldCryExtension, "Cannot retrieve file extension");
+        return oldCryExtension;
+    }
+
+    const char* LevelFile::GetDefaultFileExtension()
+    {
+        const char* levelExtension = nullptr;
+        EditorInternal::EditorToolsApplicationRequestBus::BroadcastResult(
+            levelExtension, &EditorInternal::EditorToolsApplicationRequests::GetLevelExtension);
+
+        AZ_Assert(levelExtension, "Cannot retrieve file extension");
+        return levelExtension;
+    }
+
+} // namespace EditorUtils
+
diff --git a/Code/Editor/Util/EditorUtils.h b/Code/Editor/Util/EditorUtils.h
new file mode 100644
index 0000000000..b9110be17d
--- /dev/null
+++ b/Code/Editor/Util/EditorUtils.h
@@ -0,0 +1,704 @@
+/*
+ * 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 : Utility classes used by Editor.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_EDITORUTILS_H
+#define CRYINCLUDE_EDITOR_UTIL_EDITORUTILS_H
+#pragma once
+
+
+#include <IXml.h>
+#include "Util/FileUtil.h"
+#include <Cry_Color.h>
+
+//! Typedef for quaternion.
+//typedef CryQuat Quat;
+
+#include <QColor>
+#include <QDataStream>
+#include <QGuiApplication>
+#include <QSet>
+
+#include <Include/SandboxAPI.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+
+#ifdef LoadCursor
+#undef LoadCursor
+#endif
+
+#define LINE_EPS (0.00001f)
+
+template <typename T, size_t N>
+char (&ArraySizeHelper(T (&array)[N]))[N];
+#define arraysize(array) (sizeof(ArraySizeHelper(array)))
+
+/// Some preprocessor utils
+/// http://altdevblogaday.com/2011/07/12/abusing-the-c-preprocessor/
+#define JOIN(x, y)       JOIN2(x, y)
+#define JOIN2(x, y)  x##y
+
+#define LIST_0(x)
+#define LIST_1(x)       x##1
+#define LIST_2(x)       LIST_1(x), x##2
+#define LIST_3(x)       LIST_2(x), x##3
+#define LIST_4(x)       LIST_3(x), x##4
+#define LIST_5(x)       LIST_4(x), x##5
+#define LIST_6(x)       LIST_5(x), x##6
+#define LIST_7(x)       LIST_6(x), x##7
+#define LIST_8(x)       LIST_7(x), x##8
+
+#define LIST(cnt, x)     JOIN(LIST_, cnt)(x)
+
+//! Checks heap for errors.
+struct HeapCheck
+{
+    //! Runs consistency checks on the heap.
+    static void Check(const char* file, int line);
+};
+
+#ifdef _DEBUG
+#define HEAP_CHECK HeapCheck::Check(__FILE__, __LINE__);
+#else
+#define HEAP_CHECK
+#endif
+
+#define MAKE_SURE(x, action) { if (!(x)) { assert(0 && #x); action; } \
+}
+
+namespace EditorUtils
+{
+    // Class to create scoped variable value.
+    template<typename TType>
+    class TScopedVariableValue
+    {
+    public:
+        //Relevant for containers, should not be used manually.
+        TScopedVariableValue()
+            : m_pVariable(nullptr)
+        {
+        }
+
+        // Main constructor.
+        TScopedVariableValue(TType& tVariable, const TType& tConstructValue, const TType& tDestructValue)
+            : m_pVariable(&tVariable)
+            , m_tConstructValue(tConstructValue)
+            , m_tDestructValue(tDestructValue)
+        {
+            *m_pVariable = m_tConstructValue;
+        }
+
+        // Transfers ownership.
+        TScopedVariableValue(TScopedVariableValue& tInput)
+            : m_pVariable(tInput.m_pVariable)
+            , m_tConstructValue(tInput.m_tConstructValue)
+            , m_tDestructValue(tInput.m_tDestructValue)
+        {
+            // I'm not sure if anyone should use this but for now I'm adding one.
+            tInput.m_pVariable = nullptr;
+        }
+
+        // Move constructor: needed to use CreateScopedVariable, and transfers ownership.
+        TScopedVariableValue(TScopedVariableValue&& tInput)
+        {
+            std::move(m_pVariable, tInput.m_tVariable);
+            std::move(m_tConstructValue, tInput.m_tConstructValue);
+            std::move(m_tDestructValue, tInput.m_tDestructtValue);
+        }
+
+        // Applies the scoping exit, if the variable is valid.
+        virtual ~TScopedVariableValue()
+        {
+            if (m_pVariable)
+            {
+                *m_pVariable = m_tDestructValue;
+            }
+        }
+
+        // Transfers ownership, if not self assignment.
+        TScopedVariableValue& operator=(TScopedVariableValue& tInput)
+        {
+            // I'm not sure if this makes sense to exist... but for now I'm adding one.
+            if (this != &tInput)
+            {
+                m_pVariable = tInput.m_pVariable;
+                m_tConstructValue = tInput.m_tConstructValue;
+                m_tDestructValue = tInput.m_tDestructValue;
+                tInput.m_pVariable = nullptr;
+            }
+
+            return *this;
+        }
+
+    protected:
+        TType* m_pVariable;
+        TType m_tConstructValue;
+        TType m_tDestructValue;
+    };
+
+    // Helper function to create scoped variable.
+    // Ideal usage: auto tMyVariable=CreateScoped(tContainedVariable,tConstructValue,tDestructValue);
+    template<typename TType>
+    TScopedVariableValue<TType> CreateScopedVariableValue(TType& tVariable, const TType& tConstructValue, const TType& tDestructValue)
+    {
+        return TScopedVariableValue<TType>(tVariable, tConstructValue, tDestructValue);
+    }
+
+    class AzWarningAbsorber
+        : public AZ::Debug::TraceMessageBus::Handler
+    {
+    public:
+        SANDBOX_API AzWarningAbsorber(const char* window);
+        SANDBOX_API ~AzWarningAbsorber();
+
+        bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
+
+        AZStd::string m_window;
+    };
+
+    namespace LevelFile
+    {
+        //! Retrieve old cry level file extension (With prepending '.')
+        const char* GetOldCryFileExtension();
+        //! Retrieve default level file extension (With prepending '.')
+        const char* GetDefaultFileExtension();
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// XML Helper functions.
+//////////////////////////////////////////////////////////////////////////
+namespace XmlHelpers
+{
+    SANDBOX_API inline XmlNodeRef CreateXmlNode(const char* sTag)
+    {
+        return GetISystem()->CreateXmlNode(sTag);
+    }
+
+    inline bool SaveXmlNode(IFileUtil* pFileUtil, XmlNodeRef node, const char* filename)
+    {
+        if (!pFileUtil->OverwriteFile(filename))
+        {
+            return false;
+        }
+        return node->saveToFile(filename);
+    }
+
+    SANDBOX_API inline XmlNodeRef LoadXmlFromFile(const char* fileName)
+    {
+        return GetISystem()->LoadXmlFromFile(fileName);
+    }
+
+    SANDBOX_API inline XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool suppressWarnings = false)
+    {
+        return GetISystem()->LoadXmlFromBuffer(buffer, size, false, suppressWarnings);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////
+// Drag Drop helper functions
+//////////////////////////////////////////////////////////////////////////
+namespace EditorDragDropHelpers
+{
+    inline QString GetAnimationNameClipboardFormat()
+    {
+        return QStringLiteral("application/x-animation-browser-copy");
+    }
+
+    inline QString GetFragmentClipboardFormat()
+    {
+        return QStringLiteral("application/x-preview-fragment-properties");
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+/*!
+ * StdMap Wraps std::map to provide easier to use interface.
+ */
+template <class Key, class Value>
+struct StdMap
+{
+private:
+    typedef std::map<Key, Value> Map;
+    Map m;
+
+public:
+    typedef typename Map::iterator Iterator;
+    typedef typename Map::const_iterator ConstIterator;
+
+    void    Insert(const Key& key, const Value& value) { m[key] = value; }
+    int     GetCount() const { return m.size(); };
+    bool    IsEmpty() const { return m.empty(); };
+    void    Clear() { m.clear(); }
+    int     Erase(const Key& key) { return m.erase(key); };
+    Value& operator[](const Key& key) { return m[key]; };
+    bool Find(const Key& key, Value& value) const
+    {
+        ConstIterator it = m.find(key);
+        if (it == m.end())
+        {
+            return false;
+        }
+        value = it->second;
+        return true;
+    }
+    Iterator Find(const Key& key) { return m.find(key); }
+    ConstIterator Find(const Key& key) const { return m.find(key); }
+
+    bool FindKeyByValue(const Value& value, Key& key) const
+    {
+        for (ConstIterator it = m.begin(); it != m.end(); ++it)
+        {
+            if (it->second == value)
+            {
+                key = it->first;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    Iterator Begin() { return m.begin(); };
+    Iterator End() { return m.end(); };
+    ConstIterator Begin() const { return m.begin(); };
+    ConstIterator End() const { return m.end(); };
+
+    void    GetAsVector(std::vector<Value>& array) const
+    {
+        array.resize(m.size());
+        int i = 0;
+        for (ConstIterator it = m.begin(); it != m.end(); ++it)
+        {
+            array[i++] = it->second;
+        }
+    }
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Convert String representation of color to RGB integer value.
+//
+//////////////////////////////////////////////////////////////////////////
+inline QColor String2Color(const QString& val)
+{
+    unsigned int r = 0, g = 0, b = 0;
+    int res = 0;
+    res = azsscanf(val.toUtf8().data(), "R:%d,G:%d,B:%d", &r, &g, &b);
+    if (res != 3)
+    {
+        res = azsscanf(val.toUtf8().data(), "R:%d G:%d B:%d", &r, &g, &b);
+    }
+    if (res != 3)
+    {
+        res = azsscanf(val.toUtf8().data(), "%d,%d,%d", &r, &g, &b);
+    }
+    if (res != 3)
+    {
+        res = azsscanf(val.toUtf8().data(), "%d %d %d", &r, &g, &b);
+    }
+    if (res != 3)
+    {
+        azsscanf(val.toUtf8().data(), "%x", &r);
+        return r;
+    }
+
+    return QColor(r, g, b);
+}
+
+// Converts QColor to Vector.
+inline Vec3 Rgb2Vec(const QColor& color)
+{
+    return Vec3(aznumeric_cast<float>(color.redF()), aznumeric_cast<float>(color.greenF()), aznumeric_cast<float>(color.blueF()));
+}
+
+// Converts QColor to ColorF.
+inline ColorF Rgb2ColorF(const QColor& color)
+{
+    return ColorF(aznumeric_cast<float>(color.redF()), aznumeric_cast<float>(color.greenF()), aznumeric_cast<float>(color.blueF()), 1.0f);
+}
+
+// Converts QColor to Vector.
+inline QColor Vec2Rgb(const Vec3& color)
+{
+    return QColor(aznumeric_cast<int>(color.x * 255), aznumeric_cast<int>(color.y * 255), aznumeric_cast<int>(color.z * 255));
+}
+
+// Converts ColorF to QColor.
+inline QColor ColorF2Rgb(const ColorF& color)
+{
+    return QColor(aznumeric_cast<int>(color.r * 255), aznumeric_cast<int>(color.g * 255), aznumeric_cast<int>(color.b * 255));
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Tokenize string.
+//////////////////////////////////////////////////////////////////////////
+inline QString TokenizeString(const QString& s, LPCSTR pszTokens, int& iStart)
+{
+    assert(iStart >= 0);
+
+    QByteArray str = s.toUtf8();
+
+    if (pszTokens == NULL)
+    {
+        return str;
+    }
+
+    auto pszPlace = str.begin() + iStart;
+    auto pszEnd = str.end();
+    if (pszPlace < pszEnd)
+    {
+        int nIncluding = (int)strspn(pszPlace, pszTokens);
+        ;
+
+        if ((pszPlace + nIncluding) < pszEnd)
+        {
+            pszPlace += nIncluding;
+            int nExcluding = (int)strcspn(pszPlace, pszTokens);
+
+            int iFrom = iStart + nIncluding;
+            int nUntil = nExcluding;
+            iStart = iFrom + nUntil + 1;
+
+            return (str.mid(iFrom, nUntil));
+        }
+    }
+
+    // return empty string, done tokenizing
+    iStart = -1;
+    return "";
+}
+
+// This template function will join strings from a vector into a single string, using a separator char
+template<class T>
+inline void JoinStrings(const QList<T>& rStrings, QString& rDestStr, char aSeparator = ',')
+{
+    for (size_t i = 0, iCount = rStrings.size(); i < iCount; ++i)
+    {
+        rDestStr += rStrings[i];
+
+        if (i < iCount - 1)
+        {
+            rDestStr += aSeparator;
+        }
+    }
+}
+
+// This function will split a string containing separated strings, into a vector of strings
+// better version of TokenizeString
+inline void SplitString(const QString& rSrcStr, QStringList& rDestStrings, char aSeparator = ',')
+{
+    int crtPos = 0, lastPos = 0;
+
+    while (true)
+    {
+        crtPos = rSrcStr.indexOf(aSeparator, lastPos);
+
+        if (-1 == crtPos)
+        {
+            crtPos = rSrcStr.length();
+
+            if (crtPos != lastPos)
+            {
+                rDestStrings.push_back(rSrcStr.mid(lastPos, crtPos - lastPos));
+            }
+
+            break;
+        }
+        else
+        {
+            if (crtPos != lastPos)
+            {
+                rDestStrings.push_back(rSrcStr.mid(lastPos, crtPos - lastPos));
+            }
+        }
+
+        lastPos = crtPos + 1;
+    }
+}
+
+// Format unsigned number to string with 1000s separator
+inline QString FormatWithThousandsSeperator(const unsigned int number)
+{
+    QString string;
+
+    string = QString::number(number);
+
+    for (int p = string.length() - 3; p > 0; p -= 3)
+    {
+        string.insert(p, ',');
+    }
+
+    return string;
+}
+
+
+void FormatFloatForUI(QString& str, int significantDigits, double value);
+
+//////////////////////////////////////////////////////////////////////////
+// Simply sub string searching case insensitive.
+//////////////////////////////////////////////////////////////////////////
+inline const char* strstri(const char* pString, const char* pSubstring)
+{
+    int i, j, k;
+    for (i = 0; pString[i]; i++)
+    {
+        for (j = i, k = 0; tolower(pString[j]) == tolower(pSubstring[k]); j++, k++)
+        {
+            if (!pSubstring[k + 1])
+            {
+                return (pString + i);
+            }
+        }
+    }
+
+    return NULL;
+}
+
+
+inline bool CheckVirtualKey(Qt::MouseButton button)
+{
+    return (qApp->property("pressedMouseButtons").toInt() & button) != 0;
+}
+inline bool CheckVirtualKey(Qt::Key virtualKey)
+{
+    return qApp->property("pressedKeys").value<QSet<int>>().contains(virtualKey);
+}
+
+class QColor;
+QColor ColorLinearToGamma(ColorF col);
+ColorF ColorGammaToLinear(const QColor& col);
+
+QColor ColorToQColor(uint32 color);
+
+class QCursor;
+class QPixmap;
+
+template<typename T>
+class QVector;
+
+/*! Collection of Utility MFC functions.
+*/
+struct CMFCUtils
+{
+    static QCursor LoadCursor(unsigned int nIDResource, int hotX = -1, int hotY = -1);
+};
+
+#ifndef _AFX
+class CArchive : public QDataStream
+{
+public:
+    enum Mode
+    {
+        load,
+        store
+    };
+
+    CArchive(QIODevice* device, Mode mode)
+        : QDataStream(device)
+        , m_mode(mode)
+    {
+        setByteOrder(LittleEndian);
+    }
+
+    bool IsLoading() const
+    {
+        return m_mode == load;
+    }
+
+    bool IsStoring() const
+    {
+        return m_mode == store;
+    }
+
+    uint Read(void* buffer, uint size)
+    {
+        QDataStream::readRawData(reinterpret_cast<char*>(buffer), size);
+        return size;
+    }
+
+    uint Write(void* buffer, uint size)
+    {
+        // There is a bug in QT with writing files larger than 32MB. It separates
+        // the write into 32MB blocks, but doesn't write the last block correctly.
+        // To deal with this, we'll separate into blocks here so QT doesn't have to.
+        
+        // QT bug in qfileengine_win.cpp line 434. Block size is calculated once and always
+        // used as the amount of data to write, but for the last block, unless there is exactly
+        // block size left to write, the actual remaining amount needs to be written, not the
+        // whole block size. This will cause WriteFile() to either write garbage to the file or
+        // attempt to get into memory it doesn't have access to.
+
+        const uint blockSize = 1024 * 1024 * 32; // This is the size QT uses for blocks.
+        uint totalBytesLeftToWrite = size;
+        uint totalBytesWritten = 0;
+
+        while (totalBytesLeftToWrite > 0)
+        {
+            uint bytesToWrite = AZ::GetMin(blockSize, totalBytesLeftToWrite);
+            uint bytesWritten = QDataStream::writeRawData(reinterpret_cast<char*>(buffer) + totalBytesWritten, bytesToWrite);
+
+            totalBytesLeftToWrite -= bytesWritten;
+            totalBytesWritten += bytesWritten;
+
+            // If something goes wrong, stop.
+            if (bytesWritten != bytesToWrite)
+            {
+                break;
+            }
+
+        }
+        return totalBytesWritten;
+    }
+
+private:
+    Mode m_mode;
+};
+
+inline quint64 readStringLength(CArchive& ar, int& charSize)
+{
+    // This is legacy MFC converted code. It used to use AfxReadStringLength() which has a complicated
+    // decoding pattern.
+    // The basic algorithm is that it reads in an 8 bit int, and if the length is less than 2^8,
+    // then that's the length. Next it reads in a 16 bit int, and if the length is less than 2^16,
+    // then that's the length. It does the same thing for 32 bit values and finally for 64 bit values.
+    // The 16 bit length also indicates whether or not it's a UCS2 / wide-char Windows string, if it's
+    // 0xfffe, but that comes after the first byte marker indicating there's a 16 bit length value.
+    // So, if the first 3 bytes are: 0xFF, 0xFF, 0xFE, it's a 2 byte string being read in, and the real
+    // length follows those 3 bytes (which may still be an 8, 16, or 32 bit length).
+
+    // default to one byte strings
+    charSize = 1;
+
+    quint8 len8;
+    ar >> len8;
+    if (len8 < 0xff)
+    {
+        return len8;
+    }
+
+    quint16 len16;
+    ar >> len16;
+    if (len16 == 0xfffe)
+    {
+        charSize = 2;
+
+        ar >> len8;
+        if (len8 < 0xff)
+        {
+            return len8;
+        }
+
+        ar >> len16;
+    }
+
+    if (len16 < 0xffff)
+    {
+        return len16;
+    }
+
+    quint32 len32;
+    ar >> len32;
+
+    if (len32 < 0xffffffff)
+    {
+        return len32;
+    }
+
+    quint64 len64;
+    ar >> len64;
+
+    return len64;
+}
+
+inline CArchive& operator>>(CArchive& ar, QString& str)
+{
+    int charSize = 1;
+    auto length = readStringLength(ar, charSize);
+    QByteArray data = ar.device()->read(length * charSize);
+
+    if (charSize == 1)
+    {
+        str = QString::fromUtf8(data);
+    }
+    else
+    {
+        char* raw = data.data();
+
+        // check if it's short aligned; if it isn't, we need to copy to a temp buffer
+        if ((reinterpret_cast<uintptr_t>(raw) & 1) != 0)
+        {
+            ushort* shortAlignedData = new ushort[length];
+            memcpy(shortAlignedData, raw, length * 2);
+            str = QString::fromUtf16(shortAlignedData, aznumeric_cast<int>(length));
+            delete[] shortAlignedData;
+        }
+        else
+        {
+            str = QString::fromUtf16(reinterpret_cast<ushort*>(raw), aznumeric_cast<int>(length));
+        }
+    }
+    
+    return ar;
+}
+
+inline CArchive& operator<<(CArchive& ar, const QString& str)
+{
+    // This is written to mimic how MFC archiving worked, which was to
+    // write markers to indicate the size of the length - 
+    // so a length that will fit into 8 bits takes 8 bits.
+    // A length that requires more than 8 bits, puts an 8 bit marker (0xff)
+    // to indicate that the length is greater, then 16 bits for the length.
+    // If the length requires 32 bits, there's an 8 bit marker (0xff), a
+    // 16 bit marker (0xffff) and then the 32 bit length.
+    // Note that the legacy code could also encode to 16 bit Windows wide character
+    // streams; that isn't necessary though, given that Qt supports Utf-8 out of the
+    // box and is much less ambiguous on other platforms.
+
+    QByteArray data = str.toUtf8();
+    int length = data.length();
+
+    if (length < 255)
+    {
+        ar << static_cast<quint8>(length);
+    }
+    else if (length < 0xfffe) // 0xfffe instead of 0xffff because 0xfffe indicated Windows wide character strings, which we aren't bothering with anymore
+    {
+        ar << static_cast<quint8>(0xff);
+        ar << static_cast<quint16>(length);
+    }
+    else
+    {
+        ar << static_cast<quint8>(0xff);
+        ar << static_cast<quint16>(0xffff);
+        ar << static_cast<quint32>(length);
+    }
+   
+    ar.device()->write(data);
+
+    return ar;
+}
+
+#endif
+
+#endif // CRYINCLUDE_EDITOR_UTIL_EDITORUTILS_H
+
diff --git a/Code/Editor/Util/FileChangeMonitor.cpp b/Code/Editor/Util/FileChangeMonitor.cpp
new file mode 100644
index 0000000000..6c036eac5a
--- /dev/null
+++ b/Code/Editor/Util/FileChangeMonitor.cpp
@@ -0,0 +1,214 @@
+/*
+ * 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 "FileChangeMonitor.h"
+
+// Qt
+#include <QDateTime>
+#include <QTimer>
+
+
+CFileChangeMonitor* CFileChangeMonitor::s_pFileMonitorInstance = NULL;
+
+//////////////////////////////////////////////////////////////////////////
+CFileChangeMonitor::CFileChangeMonitor(QObject* parent)
+    : QObject(parent)
+{
+    ed_logFileChanges = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CFileChangeMonitor::~CFileChangeMonitor()
+{
+    for (TListeners::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        CFileChangeMonitorListener* pListener = *it;
+
+        if (pListener)
+        {
+            pListener->SetMonitor(NULL);
+        }
+    }
+
+    // Send to thread a kill event.
+    StopMonitor();
+}
+
+CFileChangeMonitor* CFileChangeMonitor::Instance()
+{
+    if (!s_pFileMonitorInstance)
+    {
+        s_pFileMonitorInstance = new CFileChangeMonitor();
+        s_pFileMonitorInstance->Initialize();
+    }
+
+    return s_pFileMonitorInstance;
+}
+
+void CFileChangeMonitor::DeleteInstance()
+{
+    SAFE_DELETE(s_pFileMonitorInstance);
+}
+
+void CFileChangeMonitor::Initialize()
+{
+    REGISTER_CVAR(ed_logFileChanges, 0, VF_NULL, "If its 1, then enable the logging of file monitor file changes");
+
+    m_watcher.reset(new QFileSystemWatcher);
+    connect(m_watcher.data(), &QFileSystemWatcher::fileChanged,
+            this, &CFileChangeMonitor::OnFileChange);
+    connect(m_watcher.data(), &QFileSystemWatcher::directoryChanged,
+            this, &CFileChangeMonitor::OnDirectoryChange);
+
+    AddIgnoreFileMask("*$tmp*");
+}
+
+bool CFileChangeMonitor::IsDirectory(const char* sFileName)
+{
+    QFileInfo finfo(sFileName);
+    return finfo.isDir();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileChangeMonitor::IsFile(const char* sFileName)
+{
+    QFileInfo finfo(sFileName);
+    return finfo.isFile();
+}
+
+void CFileChangeMonitor::AddIgnoreFileMask(const char* pMask)
+{
+    Log("Adding '%s' to ignore masks for changed files.", pMask);
+    m_ignoreMasks.append(QString::fromLatin1(pMask));
+}
+
+void CFileChangeMonitor::RemoveIgnoreFileMask(const char* pMask, int aAfterDelayMsec)
+{
+    QTimer::singleShot(aAfterDelayMsec, [=]() {
+        m_ignoreMasks.removeAll(QString::fromLatin1(pMask));
+    });
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileChangeMonitor::MonitorItem(const QString& sItem)
+{
+    QFileInfo finfo(sItem);
+
+    if (finfo.isDir())
+    {
+        QDir dir(sItem);
+        m_entries.insert(sItem, std::move(dir.entryInfoList(QDir::Files|QDir::Dirs|QDir::NoDotAndDotDot)));
+    }
+
+    return m_watcher->addPath(sItem);
+}
+
+void CFileChangeMonitor::StopMonitor()
+{
+    if (m_watcher)
+    {
+        disconnect(m_watcher.data(), &QFileSystemWatcher::fileChanged,
+                   this, &CFileChangeMonitor::OnFileChange);
+        disconnect(m_watcher.data(), &QFileSystemWatcher::directoryChanged,
+                   this, &CFileChangeMonitor::OnDirectoryChange);
+    }
+}
+
+void CFileChangeMonitor::SetEnabled(bool bEnable)
+{
+    m_watcher->blockSignals(!bEnable);
+}
+
+bool CFileChangeMonitor::IsEnabled()
+{
+    return !m_watcher->signalsBlocked();
+}
+
+void CFileChangeMonitor::Subscribe(CFileChangeMonitorListener* pListener)
+{
+    assert(pListener);
+    pListener->SetMonitor(this);
+    m_listeners.insert(pListener);
+}
+
+void CFileChangeMonitor::Unsubscribe(CFileChangeMonitorListener* pListener)
+{
+    assert(pListener);
+    m_listeners.erase(pListener);
+    pListener->SetMonitor(NULL);
+}
+
+void CFileChangeMonitor::OnDirectoryChange(const QString &path)
+{
+    QDir dir(path);
+
+    auto entries = dir.entryInfoList(QDir::Files|QDir::Dirs|QDir::NoDotAndDotDot);
+    const auto prev = m_entries.value(path);
+
+    for (const auto &fi : prev)
+    {
+        int eindex = entries.indexOf(fi);
+        if (eindex >= 0)
+        {
+            if (fi.lastModified() != entries.at(eindex).lastModified())
+            {
+                NotifyListeners(fi.canonicalFilePath(), SFileChangeInfo::eChangeType_Modified);
+            }
+        }
+        else
+        {
+            NotifyListeners(fi.canonicalFilePath(), SFileChangeInfo::eChangeType_Deleted);
+        }
+    }
+
+    for (const auto &fi : entries)
+    {
+        if (!prev.contains(fi))
+        {
+            NotifyListeners(fi.canonicalFilePath(), SFileChangeInfo::eChangeType_Created);
+        }
+    }
+
+    m_entries.insert(path, std::move(entries));
+
+    NotifyListeners(path, SFileChangeInfo::eChangeType_Modified);
+}
+
+void CFileChangeMonitor::OnFileChange(const QString &path)
+{
+    QFileInfo finfo(path);
+    NotifyListeners(path, finfo.exists() ? SFileChangeInfo::eChangeType_Modified : SFileChangeInfo::eChangeType_Deleted);
+}
+
+void CFileChangeMonitor::NotifyListeners(const QString &path, SFileChangeInfo::EChangeType changeType)
+{
+    for (const auto &glob : m_ignoreMasks)
+    {
+        QRegExp exp(glob, Qt::CaseInsensitive, QRegExp::Wildcard);
+        if (path.contains(exp))
+        {
+            return; // mask matches, ignore event
+        }
+    }
+
+    SFileChangeInfo change;
+    change.filename = path;
+    change.changeType = changeType;
+
+    for (auto it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        CFileChangeMonitorListener* pListener = *it;
+
+        if (pListener)
+        {
+            pListener->OnFileMonitorChange(change);
+        }
+    }
+}
diff --git a/Code/Editor/Util/FileChangeMonitor.h b/Code/Editor/Util/FileChangeMonitor.h
new file mode 100644
index 0000000000..81949f36c3
--- /dev/null
+++ b/Code/Editor/Util/FileChangeMonitor.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_FILECHANGEMONITOR_H
+#define CRYINCLUDE_EDITOR_UTIL_FILECHANGEMONITOR_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzCore/std/containers/set.h>
+
+#include <QFileInfoList>
+#include <QFileSystemWatcher>
+
+#include <QObject>
+#include <QQueue>
+#include <QScopedPointer>
+#endif
+
+class CFileChangeMonitorListener;
+
+struct SFileChangeInfo
+{
+    enum EChangeType
+    {
+        //! error or unknown change type
+        eChangeType_Unknown,
+        //! the file was created
+        eChangeType_Created,
+        //! the file was deleted
+        eChangeType_Deleted,
+        //! the file was modified (size changed,write)
+        eChangeType_Modified,
+        //! this is the old name of a renamed file
+        eChangeType_RenamedOldName,
+        //! this is the new name of a renamed file
+        eChangeType_RenamedNewName
+    };
+
+    SFileChangeInfo()
+        : changeType(eChangeType_Unknown)
+    {
+    }
+
+    bool operator==(const SFileChangeInfo& rhs) const
+    {
+        return changeType == rhs.changeType && filename == rhs.filename;
+    }
+
+    QString filename;
+    EChangeType changeType;
+};
+
+// Monitors directory for any changed files
+class CFileChangeMonitor : public QObject
+{
+public:
+    friend class CEditorFileMonitor;
+    typedef AZStd::set<CFileChangeMonitorListener*> TListeners;
+
+protected:
+    explicit CFileChangeMonitor(QObject* parent = nullptr);
+    ~CFileChangeMonitor();
+
+    void Initialize();
+    static void DeleteInstance();
+
+    static CFileChangeMonitor* s_pFileMonitorInstance;
+
+public:
+
+    static CFileChangeMonitor* Instance();
+
+    bool MonitorItem(const QString& sItem);
+    void StopMonitor();
+    void SetEnabled(bool bEnable);
+    bool IsEnabled();
+    //! get next modified file, this file will be delete from list after calling this function,
+    //! call it until HaveModifiedFiles return true or this function returns false
+    void Subscribe(CFileChangeMonitorListener* pListener);
+    void Unsubscribe(CFileChangeMonitorListener* pListener);
+    bool IsDirectory(const char* pFilename);
+    bool IsFile(const char* pFilename);
+    bool IsLoggingChanges() const
+    {
+        return ed_logFileChanges != 0;
+    }
+    void AddIgnoreFileMask(const char* pMask);
+    void RemoveIgnoreFileMask(const char* pMask, int aAfterDelayMsec = 1000);
+
+private:
+    void OnDirectoryChange(const QString &path);
+    void OnFileChange(const QString &path);
+    void NotifyListeners(const QString &path, SFileChangeInfo::EChangeType changeType);
+
+    int ed_logFileChanges;
+    QScopedPointer<QFileSystemWatcher> m_watcher;
+    TListeners m_listeners;
+    QQueue<SFileChangeInfo> m_changes;
+    QStringList m_ignoreMasks;
+    QHash<QString, QFileInfoList> m_entries;
+};
+
+// Used as base class (aka interface) to subscribe for file change events
+class CFileChangeMonitorListener
+{
+public:
+    CFileChangeMonitorListener()
+        : m_pMonitor(NULL)
+    {
+    }
+
+    virtual ~CFileChangeMonitorListener()
+    {
+        if (m_pMonitor)
+        {
+            m_pMonitor->Unsubscribe(this);
+        }
+    }
+
+    virtual void OnFileMonitorChange(const SFileChangeInfo& rChange) = 0;
+
+    void SetMonitor(CFileChangeMonitor* pMonitor)
+    {
+        m_pMonitor = pMonitor;
+    }
+
+private:
+    CFileChangeMonitor* m_pMonitor;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_FILECHANGEMONITOR_H
diff --git a/Code/Editor/Util/FileEnum.cpp b/Code/Editor/Util/FileEnum.cpp
new file mode 100644
index 0000000000..df554bf6ba
--- /dev/null
+++ b/Code/Editor/Util/FileEnum.cpp
@@ -0,0 +1,166 @@
+/*
+ * 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 "FileEnum.h"
+
+CFileEnum::CFileEnum()
+    : m_hEnumFile(0)
+{
+}
+
+CFileEnum::~CFileEnum()
+{
+    if (m_hEnumFile)
+    {
+        delete m_hEnumFile;
+        m_hEnumFile = 0;
+    }
+}
+
+bool CFileEnum::StartEnumeration(
+    const QString& szEnumPath,
+    const QString& szEnumPattern,
+    QFileInfo* pFile)
+{
+    //////////////////////////////////////////////////////////////////////
+    // Take path and search pattern as separate arguments
+    //////////////////////////////////////////////////////////////////////
+
+    // Build enumeration path
+    QString szPath = szEnumPath;
+
+    if (!szPath.endsWith('\\') && !szPath.endsWith('/'))
+    {
+        szPath += QDir::separator();
+    }
+
+    szPath += szEnumPattern;
+
+    return StartEnumeration(szPath, pFile);
+}
+
+bool CFileEnum::StartEnumeration(const QString& szEnumPathAndPattern, QFileInfo* pFile)
+{
+    // End any previous enumeration
+    if (m_hEnumFile)
+    {
+        delete m_hEnumFile;
+        m_hEnumFile = 0;
+    }
+
+    QStringList parts = szEnumPathAndPattern.split(QRegularExpression(R"([\\/])"));
+    QString pattern = parts.takeLast();
+    QString path = parts.join(QDir::separator());
+
+    // Start the enumeration
+    m_hEnumFile = new QDirIterator(path, QStringList(pattern));
+    if (!m_hEnumFile->hasNext())
+    {
+        // No files found
+        delete m_hEnumFile;
+        m_hEnumFile = 0;
+
+        return false;
+    }
+
+    m_hEnumFile->next();
+    *pFile = m_hEnumFile->fileInfo();
+
+    return true;
+}
+
+bool CFileEnum::GetNextFile(QFileInfo* pFile)
+{
+    // Fill file strcuture
+    if (!m_hEnumFile->hasNext())
+    {
+        // No more files left
+        delete m_hEnumFile;
+        m_hEnumFile = 0;
+
+        return false;
+    }
+
+    m_hEnumFile->next();
+    *pFile = m_hEnumFile->fileInfo();
+
+    // At least one file left
+    return true;
+}
+
+inline bool ScanDirectoryRecursive(
+    const QString& root,
+    const QString& path,
+    const QString& file,
+    QStringList& files,
+    bool bRecursive)
+{
+    bool bFoundAny = false;
+
+    QDirIterator hFile(root + path, QStringList(file));
+
+    if (hFile.hasNext())
+    {
+
+        // Find the rest of the files.
+        do
+        {
+            hFile.next();
+            QFileInfo foundFile = hFile.fileInfo();
+
+            bFoundAny = true;
+            files.push_back(path + foundFile.fileName());
+        }   while (hFile.hasNext());
+    }
+
+    if (bRecursive)
+    {
+        QDirIterator hFile2(root + path, QStringList("*.*"));
+
+        if (hFile2.hasNext())
+        {
+            // Find directories.
+            do
+            {
+                hFile2.next();
+                QFileInfo foundFile = hFile2.fileInfo();
+
+                if (foundFile.isDir())
+                {
+                    // If recursive.
+                    if (!foundFile.fileName().startsWith('.'))
+                    {
+                        if (ScanDirectoryRecursive(
+                                root,
+                                path + foundFile.fileName() + QDir::separator(),
+                                file,
+                                files,
+                                bRecursive))
+                        {
+                            bFoundAny = true;
+                        }
+                    }
+                }
+            }   while (hFile2.hasNext());
+        }
+    }
+
+    return bFoundAny;
+}
+
+bool CFileEnum::ScanDirectory(
+    const QString& path,
+    const QString& file,
+    QStringList& files,
+    bool bRecursive,
+    bool /* bSkipPaks - unused, left for backwards API compatibility */)
+{
+    return ScanDirectoryRecursive(path, "", file, files, bRecursive);
+}
diff --git a/Code/Editor/Util/FileEnum.h b/Code/Editor/Util/FileEnum.h
new file mode 100644
index 0000000000..a9cad4da79
--- /dev/null
+++ b/Code/Editor/Util/FileEnum.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_FILEENUM_H
+#define CRYINCLUDE_EDITOR_UTIL_FILEENUM_H
+#pragma once
+
+#include <QDirIterator>
+
+class QFileInfo;
+class QString;
+class QStringList;
+
+class CFileEnum
+{
+public:
+    CFileEnum();
+    virtual ~CFileEnum();
+    bool GetNextFile(QFileInfo* pFile);
+    bool StartEnumeration(const QString& szEnumPathAndPattern, QFileInfo* pFile);
+    bool StartEnumeration(const QString& szEnumPath, const QString& szEnumPattern, QFileInfo* pFile);
+    static bool ScanDirectory(
+        const QString& path,
+        const QString& file,
+        QStringList& files,
+        bool bRecursive = true,
+        bool bSkipPaks = false);
+
+protected:
+    QDirIterator* m_hEnumFile;
+};
+#endif // CRYINCLUDE_EDITOR_UTIL_FILEENUM_H
diff --git a/Code/Editor/Util/FileUtil.cpp b/Code/Editor/Util/FileUtil.cpp
new file mode 100644
index 0000000000..5d4e7a5bfc
--- /dev/null
+++ b/Code/Editor/Util/FileUtil.cpp
@@ -0,0 +1,2371 @@
+/*
+ * 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 "FileUtil.h"
+
+// Qt
+#include <QMenu>
+#include <QMessageBox>
+#include <QApplication>
+#include <QClipboard>
+#include <QDesktopServices>
+#include <QProcess>
+#include <QThread>
+
+// AzCore
+#include <AzCore/Component/TickBus.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+
+// AzFramework
+#include <AzFramework/API/ApplicationAPI.h>
+
+// AzQtComponents
+#include <AzQtComponents/Utilities/DesktopUtilities.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <AzToolsFramework/UI/UICore/ProgressShield.hxx>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+#include <AzToolsFramework/Thumbnails/SourceControlThumbnailBus.h>
+
+// Editor
+#include "Settings.h"
+#include "MainWindow.h"
+#include "CheckOutDialog.h"
+#include "ISourceControl.h"
+#include "Dialogs/Generic/UserOptions.h"
+#include "IAssetItem.h"
+#include "IAssetItemDatabase.h"
+#include "Include/IObjectManager.h"
+#include "UsedResources.h"
+#include "Objects/BaseObject.h"
+#include "StringHelpers.h"
+#include "AutoDirectoryRestoreFileDialog.h"
+
+#if defined(AZ_PLATFORM_WINDOWS)
+#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 };
+
+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)
+{
+    CCryFile cryfile;
+    if (cryfile.Open(file.toUtf8().data(), "rb"))
+    {
+        // Check if in pack.
+        if (cryfile.IsInPak())
+        {
+            const char* sPakName = cryfile.GetPakPath();
+
+            if (bMsgBoxAskForExtraction)
+            {
+                // Cannot edit file in pack, suggest to extract it for editing.
+                if (QMessageBox::critical(QApplication::activeWindow(), QString(), QObject::tr("File %1 is inside a PAK file %2\r\nDo you want it to be extracted for editing ?").arg(file, sPakName), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
+                {
+                    return false;
+                }
+            }
+
+            if (pDestinationFilename)
+            {
+                file = pDestinationFilename;
+            }
+
+            CFileUtil::CreatePath(Path::GetPath(file));
+
+            // Extract it from Pak file.
+            QFile diskFile(file);
+
+            if (diskFile.open(QFile::WriteOnly))
+            {
+                // Copy data from packed file to disk file.
+                char* data = new char[cryfile.GetLength()];
+                cryfile.ReadRaw(data, cryfile.GetLength());
+                diskFile.write(data, cryfile.GetLength());
+                delete []data;
+            }
+            else
+            {
+                Warning("Failed to create file %s on disk", file.toUtf8().data());
+            }
+        }
+        else
+        {
+            file = cryfile.GetAdjustedFilename();
+        }
+
+        return true;
+    }
+
+    return false;
+}
+//////////////////////////////////////////////////////////////////////////
+void CFileUtil::EditTextFile(const char* txtFile, int line, IFileUtil::ETextFileType fileType)
+{
+    QString file = txtFile;
+
+    QString fullPathName =  Path::GamePathToFullPath(file);
+    ExtractFile(fullPathName);
+    QString cmd(fullPathName);
+#if defined (AZ_PLATFORM_WINDOWS)
+    cmd.replace('/', '\\');
+    if (line != 0)
+    {
+        cmd = QStringLiteral("%1/%2/0").arg(cmd).arg(line);
+    }
+#endif
+
+    QString TextEditor = gSettings.textEditorForScript;
+    if (fileType == IFileUtil::FILE_TYPE_SHADER)
+    {
+        TextEditor = gSettings.textEditorForShaders;
+    }
+    else if (fileType == IFileUtil::FILE_TYPE_BSPACE)
+    {
+        TextEditor = gSettings.textEditorForBspaces;
+    }
+
+    // attempt to open it with the text editor from the preferences.
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    // 'open' already detaches, so dont use startDetach, otherwise we can't see the exit code
+    if (QProcess::execute(QStringLiteral("open"), { QStringLiteral("-a"), TextEditor, fullPathName }) != 0)
+#else
+    if (!QProcess::startDetached(TextEditor, { cmd }))
+#endif
+    {
+        // allow the user to opt for notepad, but also tell them about the preferences panel
+
+        if (QMessageBox::question(QApplication::activeWindow(), QString(), QObject::tr("Can't open the file. You can specify a text editor in the Preferences dialog.  Do you want to open the file in the default platform editor?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
+        {
+            QDesktopServices::openUrl(QUrl::fromLocalFile(fullPathName));
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CFileUtil::EditTextureFile(const char* textureFile, [[maybe_unused]] bool bUseGameFolder)
+{
+    using namespace AzToolsFramework;
+    using namespace AzToolsFramework::AssetSystem;
+
+    AZStd::string fullTexturePath;
+    bool fullTexturePathFound = false;
+    AZStd::string relativePath = textureFile;
+
+    // First check if we have been given an empty path
+    QString warningTitle = QObject::tr("Cannot open file!");
+    if (relativePath.empty())
+    {
+        QString messageString = QObject::tr("Texture path is empty. You need to assign a texture first.");
+        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), warningTitle, messageString);
+        return;
+    }
+
+    AssetSystemRequestBus::BroadcastResult(fullTexturePathFound, &AssetSystemRequest::GetFullSourcePathFromRelativeProductPath, relativePath, fullTexturePath);
+    if (!fullTexturePathFound)
+    {
+        QString messageString = QObject::tr("Failed to find absolute path to %1 - could not open texture editor.").arg(textureFile);
+        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), warningTitle, messageString);
+        return;
+    }
+
+    bool failedToLaunch = true;
+    QByteArray textureEditorPath = gSettings.textureEditor.toUtf8();
+
+    // Give the user a warning if they don't have a texture editor configured
+    if (textureEditorPath.isEmpty())
+    {
+        QString messageString = QObject::tr("No texture editor has been configured.\nYou need to configure one by going to Edit > Editor Settings > Global Preferences in the menu bar and then configure the 'External Editors > Texture Editor'.");
+        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), warningTitle, messageString);
+        return;
+    }
+
+#if defined(AZ_PLATFORM_WINDOWS)
+    // Use the Win32 API calls to open the right editor; the OS knows how to do this even better than
+    // Qt does.
+    QString fullTexturePathFixedForWindows = QString(fullTexturePath.data()).replace('/', '\\');
+    QByteArray fullTexturePathFixedForWindowsUtf8 = fullTexturePathFixedForWindows.toUtf8();
+    HINSTANCE hInst = ShellExecute(NULL, "open", textureEditorPath.data(), fullTexturePathFixedForWindowsUtf8.data(), NULL, SW_SHOWNORMAL);
+    failedToLaunch = ((DWORD_PTR)hInst <= 32);
+#elif defined(AZ_PLATFORM_MAC)
+    failedToLaunch = QProcess::execute(QString("/usr/bin/open"), {"-a", gSettings.textureEditor, QString(fullTexturePath.data()) }) != 0;
+#else
+    failedToLaunch = !QProcess::startDetached(gSettings.textureEditor, { QString(fullTexturePath.data()) });
+#endif
+
+    if (failedToLaunch)
+    {
+        //failed
+        QString messageString = QObject::tr("Failed to open %1 with texture editor %2.").arg(fullTexturePath.data()).arg(textureEditorPath.data());
+        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), warningTitle, messageString);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::EditMayaFile(const char* filepath, const bool bExtractFromPak, const bool bUseGameFolder)
+{
+    QString dosFilepath = QtUtil::ToQString(PathUtil::ToDosPath(filepath));
+    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());
+    }
+
+    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)
+{
+    if (ExtractDccFilenameFromAssetDatabase(assetFilename, dccFilename))
+    {
+        return true;
+    }
+
+    if (ExtractDccFilenameUsingNamingConventions(assetFilename, dccFilename))
+    {
+        return true;
+    }
+
+    GetIEditor()->GetEnv()->pLog->LogError("Failed to find psd file for texture: '%s'", assetFilename.toUtf8().data());
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::ExtractDccFilenameFromAssetDatabase(const QString& assetFilename, QString& dccFilename)
+{
+    IAssetItemDatabase* pCurrentDatabaseInterface = NULL;
+    std::vector<IClassDesc*> assetDatabasePlugins;
+    IEditorClassFactory* pClassFactory = GetIEditor()->GetClassFactory();
+    pClassFactory->GetClassesByCategory("Asset Item DB", assetDatabasePlugins);
+
+    for (size_t i = 0; i < assetDatabasePlugins.size(); ++i)
+    {
+        if (assetDatabasePlugins[i]->QueryInterface(__uuidof(IAssetItemDatabase), (void**)&pCurrentDatabaseInterface) == S_OK)
+        {
+            if (!pCurrentDatabaseInterface)
+            {
+                continue;
+            }
+
+            QString assetDatabaseDccFilename;
+            IAssetItem* pAssetItem = pCurrentDatabaseInterface->GetAsset(assetFilename.toUtf8().data());
+            if (pAssetItem)
+            {
+                if ((pAssetItem->GetFlags() & IAssetItem::eFlag_Cached))
+                {
+                    QVariant v = pAssetItem->GetAssetFieldValue("dccfilename");
+                    assetDatabaseDccFilename = v.toString();
+                    if (!v.isNull())
+                    {
+                        dccFilename = assetDatabaseDccFilename;
+                        dccFilename = Path::GetRelativePath(dccFilename, false);
+
+                        uint32 attr = CFileUtil::GetAttributes(dccFilename.toUtf8().data());
+
+                        if (CFileUtil::FileExists(dccFilename))
+                        {
+                            return true;
+                        }
+                        else if (GetIEditor()->IsSourceControlAvailable() && (attr & SCC_FILE_ATTRIBUTE_MANAGED))
+                        {
+                            return CFileUtil::GetLatestFromSourceControl(dccFilename.toUtf8().data());
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::ExtractDccFilenameUsingNamingConventions(const QString& assetFilename, QString& dccFilename)
+{
+    //else to try find it by naming conventions
+    QString tempStr = assetFilename;
+    int foundSplit = -1;
+    if ((foundSplit = tempStr.lastIndexOf('.')) > 0)
+    {
+        QString first = tempStr.mid(0, foundSplit);
+        tempStr = first + ".psd";
+    }
+    if (CFileUtil::FileExists(tempStr))
+    {
+        dccFilename = tempStr;
+        return true;
+    }
+
+    //else try to find it by replacing post fix _<description> with .psd
+    tempStr = assetFilename;
+    foundSplit = -1;
+    if ((foundSplit = tempStr.lastIndexOf('_')) > 0)
+    {
+        QString first = tempStr.mid(0, foundSplit);
+        tempStr = first + ".psd";
+    }
+    if (CFileUtil::FileExists(tempStr))
+    {
+        dccFilename = tempStr;
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CFileUtil::FormatFilterString(QString& filter)
+{
+    const int numPipeChars = std::count(filter.begin(), filter.end(), '|');
+    if (numPipeChars == 1)
+    {
+        filter = QStringLiteral("%1||").arg(filter);
+    }
+    else if (numPipeChars > 1)
+    {
+        assert(numPipeChars % 2 != 0);
+        if (!filter.contains("||"))
+        {
+            filter = QStringLiteral("%1||").arg(filter);
+        }
+    }
+    else if (!filter.isEmpty())
+    {
+        filter = QStringLiteral("%1|%2||").arg(filter, filter);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::SelectFile(const QString& fileSpec, const QString& searchFolder, QString& fullFileName)
+{
+    QtUtil::QtMFCScopedHWNDCapture cap;
+    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, {}, searchFolder, fileSpec, {}, {}, cap);
+
+    if (dlg.exec())
+    {
+        fullFileName = dlg.selectedFiles().first();
+        return true;
+        /*
+        if (!fileName.IsEmpty())
+        {
+            relativeFileName = Path::GetRelativePath( fileName );
+            if (!relativeFileName.IsEmpty())
+            {
+                return true;
+            }
+            else
+            {
+                Warning( "You must select files from %s folder",(const char*)GetIEditor()->GetPrimaryCDFolder(); );
+            }
+        }
+        */
+    }
+
+    //  CSelectFileDlg cDialog;
+    //  bool res = cDialog.SelectFileName( &fileName,&relativeFileName,fileSpec,searchFolder );
+    return false;
+}
+
+bool CFileUtil::SelectFiles(const QString& fileSpec, const QString& searchFolder, QStringList& files)
+{
+    QtUtil::QtMFCScopedHWNDCapture cap;
+    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::ExistingFiles, {}, searchFolder, fileSpec, {}, {}, cap);
+
+    if (dlg.exec())
+    {
+        const QStringList selected = dlg.selectedFiles();
+        foreach(const QString&file, selected)
+        {
+            files.push_back(file);
+        }
+    }
+
+    if (!files.empty())
+    {
+        return true;
+    }
+
+    return false;
+}
+
+bool CFileUtil::SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName)
+{
+    QtUtil::QtMFCScopedHWNDCapture cap;
+    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptSave, {}, defaulExtension, startFolder, fileFilter, {}, {}, cap);
+
+    if (dlg.exec())
+    {
+        fileName = dlg.selectedFiles().first();
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Get directory contents.
+//////////////////////////////////////////////////////////////////////////
+inline bool ScanDirectoryFiles(const QString& root, const QString& path, const QString& fileSpec, IFileUtil::FileArray& files, bool bSkipPaks)
+{
+    bool anyFound = false;
+    QString dir = Path::AddPathSlash(root + path);
+
+    QString findFilter = Path::Make(dir, fileSpec);
+    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
+
+    // Add all directories.
+
+    AZ::IO::ArchiveFileIterator fhandle = pIPak->FindFirst(findFilter.toUtf8().data());
+    if (fhandle)
+    {
+        do
+        {
+            // Skip back folders.
+            if (fhandle.m_filename.front() == '.')
+            {
+                continue;
+            }
+            if ((fhandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory) // skip sub directories.
+            {
+                continue;
+            }
+
+            if (bSkipPaks && (fhandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Archive) == AZ::IO::FileDesc::Attribute::Archive)
+            {
+                continue;
+            }
+
+            anyFound = true;
+
+            IFileUtil::FileDesc file;
+            file.filename = path + fhandle.m_filename.data();
+            file.attrib = static_cast<unsigned int>(fhandle.m_fileDesc.nAttrib);
+            file.size = fhandle.m_fileDesc.nSize;
+            file.time_access = fhandle.m_fileDesc.tAccess;
+            file.time_create = fhandle.m_fileDesc.tCreate;
+            file.time_write = fhandle.m_fileDesc.tWrite;
+
+            files.push_back(file);
+        } while (fhandle = pIPak->FindNext(fhandle));
+        pIPak->FindClose(fhandle);
+    }
+
+    /*
+    CFileFind finder;
+    BOOL bWorking = finder.FindFile( Path::Make(dir,fileSpec) );
+    while (bWorking)
+    {
+        bWorking = finder.FindNextFile();
+
+        if (finder.IsDots())
+            continue;
+
+        if (!finder.IsDirectory())
+        {
+            anyFound = true;
+
+            IFileUtil::FileDesc fd;
+            fd.filename = dir + finder.GetFileName();
+            fd.nFileSize = finder.GetLength();
+
+            finder.GetCreationTime( &fd.ftCreationTime );
+            finder.GetLastAccessTime( &fd.ftLastAccessTime );
+            finder.GetLastWriteTime( &fd.ftLastWriteTime );
+
+            fd.dwFileAttributes = 0;
+            if (finder.IsArchived())
+                fd.dwFileAttributes |= FILE_ATTRIBUTE_ARCHIVE;
+            if (finder.IsCompressed())
+                fd.dwFileAttributes |= FILE_ATTRIBUTE_COMPRESSED;
+            if (finder.IsNormal())
+                fd.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+            if (finder.IsHidden())
+                fd.dwFileAttributes = FILE_ATTRIBUTE_HIDDEN;
+            if (finder.IsReadOnly())
+                fd.dwFileAttributes = FILE_ATTRIBUTE_READONLY;
+            if (finder.IsSystem())
+                fd.dwFileAttributes = FILE_ATTRIBUTE_SYSTEM;
+            if (finder.IsTemporary())
+                fd.dwFileAttributes = FILE_ATTRIBUTE_TEMPORARY;
+
+            files.push_back(fd);
+        }
+    }
+    */
+
+    return anyFound;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Get directory contents.
+//////////////////////////////////////////////////////////////////////////
+inline int ScanDirectoryRecursive(const QString& root, const QString& path, const QString& fileSpec, IFileUtil::FileArray& files, bool recursive, bool addDirAlso,
+    IFileUtil::ScanDirectoryUpdateCallBack updateCB, bool bSkipPaks)
+{
+    bool anyFound = false;
+    QString dir = Path::AddPathSlash(root + path);
+
+    if (updateCB)
+    {
+        QString msg = QObject::tr("Scanning %1...").arg(dir);
+        if (updateCB(msg) == false)
+        {
+            return -1;
+        }
+    }
+
+    if (ScanDirectoryFiles(root, Path::AddPathSlash(path), fileSpec, files, bSkipPaks))
+    {
+        anyFound = true;
+    }
+
+    if (recursive)
+    {
+        /*
+        CFileFind finder;
+        BOOL bWorking = finder.FindFile( Path::Make(dir,"*.*") );
+        while (bWorking)
+        {
+            bWorking = finder.FindNextFile();
+
+            if (finder.IsDots())
+                continue;
+
+            if (finder.IsDirectory())
+            {
+                // Scan directory.
+                if (ScanDirectoryRecursive( root,Path::AddBackslash(path+finder.GetFileName()),fileSpec,files,recursive ))
+                    anyFound = true;
+            }
+        }
+        */
+
+        auto pIPak = GetIEditor()->GetSystem()->GetIPak();
+
+        // Add all directories.
+
+        AZ::IO::ArchiveFileIterator fhandle = pIPak->FindFirst(Path::Make(dir, "*").toUtf8().data());
+        if (fhandle)
+        {
+            do
+            {
+                // Skip back folders.
+                if (fhandle.m_filename.front() == '.')
+                {
+                    continue;
+                }
+
+                if ((fhandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) != AZ::IO::FileDesc::Attribute::Subdirectory) // skip not directories.
+                {
+                    continue;
+                }
+
+                if (bSkipPaks && (fhandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Archive) == AZ::IO::FileDesc::Attribute::Archive)
+                {
+                    continue;
+                }
+
+                if (addDirAlso)
+                {
+                    IFileUtil::FileDesc Dir;
+                    Dir.filename = path + QString::fromUtf8(fhandle.m_filename.data(), aznumeric_cast<int>(fhandle.m_filename.size()));
+                    Dir.attrib = static_cast<unsigned int>(fhandle.m_fileDesc.nAttrib);
+                    Dir.size = fhandle.m_fileDesc.nSize;
+                    Dir.time_access = fhandle.m_fileDesc.tAccess;
+                    Dir.time_create = fhandle.m_fileDesc.tCreate;
+                    Dir.time_write = fhandle.m_fileDesc.tWrite;
+                    files.push_back(Dir);
+                }
+
+                // Scan directory.
+                int result = ScanDirectoryRecursive(root, Path::AddPathSlash(path + fhandle.m_filename.data()), fileSpec, files, recursive, addDirAlso, updateCB, bSkipPaks);
+                if (result == -1)
+                // Cancel the scan immediately.
+                {
+                    pIPak->FindClose(fhandle);
+                    return -1;
+                }
+                else if (result == 1)
+                {
+                    anyFound = true;
+                }
+            } while (fhandle = pIPak->FindNext(fhandle));
+            pIPak->FindClose(fhandle);
+        }
+    }
+
+    return anyFound ? 1 : 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::ScanDirectory(const QString& path, const QString& file, IFileUtil::FileArray& files, bool recursive,
+    bool addDirAlso, IFileUtil::ScanDirectoryUpdateCallBack updateCB, bool bSkipPaks)
+{
+    QString fileSpec = Path::GetFile(file);
+    QString localPath = Path::GetPath(file);
+    return ScanDirectoryRecursive(Path::AddPathSlash(path), localPath, fileSpec, files, recursive, addDirAlso, updateCB, bSkipPaks) > 0;
+}
+
+void CFileUtil::ShowInExplorer([[maybe_unused]] const QString& path)
+{
+    AZStd::string assetRoot;
+    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+    {
+        settingsRegistry->Get(assetRoot, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheRootFolder);
+    }
+
+    auto fullpath = QString::fromUtf8(assetRoot.c_str(), aznumeric_cast<int>(assetRoot.size()));
+    AzQtComponents::ShowFileOnDesktop(fullpath);
+}
+
+/*
+bool CFileUtil::ScanDirectory( const QString &startDirectory,const QString &searchPath,const QString &fileSpec,FileArray &files, bool recursive=true )
+{
+    return ScanDirectoryRecursive(startDirectory,SearchPath,file,files,recursive );
+}
+*/
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::OverwriteFile(const QString& filename)
+{
+    AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
+    AZ_Assert(fileIO, "FileIO is not initialized.");
+
+    QString adjFileName = Path::GamePathToFullPath(filename);
+
+    AZStd::string filePath = adjFileName.toUtf8().data();
+    if (!fileIO->IsReadOnly(filePath.c_str()))
+    {
+        // if its already writable, we can just RequestEdit async and return immediately
+        // RequestEdit will mark it for "add" if it needs to be added.
+        using namespace AzToolsFramework;
+        SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestEdit, filePath.c_str(), true, [](bool, const SourceControlFileInfo&) {});
+        return true;
+    }
+
+    // Otherwise, show the checkout dialog
+    if (!CCheckOutDialog::IsForAll())
+    {
+        QtUtil::QtMFCScopedHWNDCapture cap;
+        CCheckOutDialog dlg(adjFileName, cap);
+        dlg.exec();
+    }
+
+    bool opSuccess = false;
+    switch (CCheckOutDialog::LastResult())
+    {
+    case CCheckOutDialog::CANCEL:
+        break;
+    case CCheckOutDialog::CHECKOUT:
+        opSuccess = CheckoutFile(filePath.c_str());
+        break;
+    case CCheckOutDialog::OVERWRITE:
+        opSuccess = AZ::IO::SystemFile::SetWritable(filePath.c_str(), true);
+        break;
+    default:
+        AZ_Assert(false, "Unsupported result returned from CCheckoutDialog");
+    }
+
+    return opSuccess;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void BlockAndWait(const bool& opComplete, QWidget* parent, const char* message)
+{
+    bool useProgressShield = false;
+    bool isGUIThread = false;
+    if (QApplication::instance()->thread() == QThread::currentThread())
+    {
+        isGUIThread = true;
+        if (!parent)
+        {
+            parent = QApplication::activeWindow() ? QApplication::activeWindow() : MainWindow::instance();
+        }
+
+        useProgressShield = parent ? true : false;
+    }
+
+    if (useProgressShield)
+    {
+        // ProgressShield will internally pump the Qt Event Pump and the AZ::TickBus.
+        AzToolsFramework::ProgressShield::LegacyShowAndWait(parent, parent->tr(message),
+            [&opComplete](int& current, int& max)
+            {
+                current = 0;
+                max = 0;
+                return opComplete;
+            },
+            500);
+    }
+    else
+    {
+        // either we are not on the main thread or we are not using the progress shield.
+        while (!opComplete)
+        {
+            // we can ONLY interact with the application event loop or the AZ::TickBus from the GUI thread.
+            if (isGUIThread)
+            {
+                // note that 16ms below is not the amount of time to wait, its the maximum time that
+                // processEvents is allowed to keep processing them if they just keep being emitted.
+                // adding a maximum time here means that we get an opportunity to pump the TickBus 
+                // periodically even during a flood of events.
+                QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 16);
+                AZ::TickBus::ExecuteQueuedEvents();
+            }
+            
+            // if we are not the main thread then the above will be done by the main thread, and we can just wait for it to happen.
+            // its fairly important we don't sleep for really long because this legacy code is often invoked in a blocking loop
+            // for many items, and in the worst case, any time we spend sleeping here will be added to each item.
+            AZStd::this_thread::yield();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::CheckoutFile(const char* filename, QWidget* parentWindow)
+{
+    using namespace AzToolsFramework;
+
+    bool scOpSuccess = false;
+    bool scOpComplete = false;
+    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestEdit, filename, true,
+        [&scOpSuccess, &scOpComplete, filename](bool success, const SourceControlFileInfo& /*info*/)
+        {
+            scOpSuccess = success;
+            scOpComplete = true;
+            Thumbnailer::SourceControlThumbnailRequestBus::Broadcast(&Thumbnailer::SourceControlThumbnailRequests::FileStatusChanged, filename);
+        }
+    );
+
+    BlockAndWait(scOpComplete, parentWindow, "Checking out for edit...");
+    return scOpSuccess;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::RevertFile(const char* filename, QWidget* parentWindow)
+{
+    using namespace AzToolsFramework;
+
+    bool scOpSuccess = false;
+    bool scOpComplete = false;
+    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestRevert, filename,
+        [&scOpSuccess, &scOpComplete, filename](bool success, const SourceControlFileInfo& /*info*/)
+        {
+            scOpSuccess = success;
+            scOpComplete = true;
+            Thumbnailer::SourceControlThumbnailRequestBus::Broadcast(&Thumbnailer::SourceControlThumbnailRequests::FileStatusChanged, filename);
+        }
+    );
+
+    BlockAndWait(scOpComplete, parentWindow, "Discarding Changes...");
+    return scOpSuccess;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow)
+{
+    using namespace AzToolsFramework;
+
+    bool scOpSuccess = false;
+    bool scOpComplete = false;
+    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestRename, sourceFile, targetFile,
+        [&scOpSuccess, &scOpComplete](bool success, const SourceControlFileInfo& /*info*/)
+        {
+            scOpSuccess = success;
+            scOpComplete = true;
+        }
+    );
+
+    BlockAndWait(scOpComplete, parentWindow, "Renaming file...");
+    return scOpSuccess;
+}
+
+bool  override;
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::DeleteFromSourceControl(const char* filename, QWidget* parentWindow)
+{
+    using namespace AzToolsFramework;
+
+    bool scOpSuccess = false;
+    bool scOpComplete = false;
+    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestDelete, filename,
+        [&scOpSuccess, &scOpComplete, filename](bool success, const SourceControlFileInfo& /*info*/)
+        {
+            scOpSuccess = success;
+            scOpComplete = true;
+            Thumbnailer::SourceControlThumbnailRequestBus::Broadcast(&Thumbnailer::SourceControlThumbnailRequests::FileStatusChanged, filename);
+        }
+    );
+
+    BlockAndWait(scOpComplete, parentWindow, "Marking for deletion...");
+    return scOpSuccess;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::GetLatestFromSourceControl(const char* filename, QWidget* parentWindow)
+{
+    using namespace AzToolsFramework;
+
+    bool scOpSuccess = false;
+    bool scOpComplete = false;
+    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestLatest, filename,
+        [&scOpSuccess, &scOpComplete, filename](bool success, const SourceControlFileInfo& /*info*/)
+        {
+            scOpSuccess = success;
+            scOpComplete = true;
+            Thumbnailer::SourceControlThumbnailRequestBus::Broadcast(&Thumbnailer::SourceControlThumbnailRequests::FileStatusChanged, filename);
+        }
+    );
+
+    BlockAndWait(scOpComplete, parentWindow, "Requesting latest verison of file...");
+    return scOpSuccess;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow)
+{
+    using namespace AzToolsFramework;
+
+    bool scOpSuccess = false;
+    bool scOpComplete = false;
+    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::GetFileInfo, filename,
+        [&fileInfo, &scOpSuccess, &scOpComplete](bool success, const SourceControlFileInfo& info)
+        {
+            fileInfo = info;
+            scOpSuccess = success;
+            scOpComplete = true;
+        }
+    );
+
+    BlockAndWait(scOpComplete, parentWindow, "Getting file status...");
+    return scOpSuccess;
+}
+
+// Create new directory, check if directory already exist.
+static bool CheckAndCreateDirectory(const QString& path)
+{
+    // QFileInfo does not handle mixed separators (/ and \) gracefully, so cleaning up path
+    const QString cleanPath = QDir::cleanPath(path).replace('\\', '/');
+    QFileInfo fileInfo(cleanPath);
+    if (fileInfo.isDir())
+    {
+        return true;
+    }
+    else if (!fileInfo.exists())
+    {
+        return QDir().mkpath(cleanPath);
+    }
+    return false;
+}
+
+static bool MoveFileReplaceExisting(const QString& existingFileName, const QString& newFileName)
+{
+    bool moveSuccessful = false;
+
+    // Delete the new file if it already exists
+    QFile newFile(newFileName);
+    if (newFile.exists())
+    {
+        newFile.setPermissions(newFile.permissions() | QFile::ReadOther | QFile::WriteOther);
+        newFile.remove();
+    }
+
+    // Rename the existing file if it exists
+    QFile existingFile(existingFileName);
+    if (existingFile.exists())
+    {
+        existingFile.setPermissions(existingFile.permissions() | QFile::ReadOther | QFile::WriteOther);
+        moveSuccessful = existingFile.rename(newFileName);
+    }
+
+    return moveSuccessful;
+}
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::CreateDirectory(const char* directory)
+{
+    QString path = directory;
+    if (GetIEditor()->GetConsoleVar("ed_lowercasepaths"))
+    {
+        path = path.toLower();
+    }
+
+    return CheckAndCreateDirectory(path);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CFileUtil::BackupFile(const char* filename)
+{
+    // Make a backup of previous file.
+    bool makeBackup = true;
+
+    QString bakFilename = Path::ReplaceExtension(filename, "bak");
+
+    // Check if backup needed.
+    QFile bak(filename);
+    if (bak.open(QFile::ReadOnly))
+    {
+        if (bak.size() <= 0)
+        {
+            makeBackup = false;
+        }
+    }
+    else
+    {
+        makeBackup = false;
+    }
+    bak.close();
+
+    if (makeBackup)
+    {
+        QString bakFilename2 = Path::ReplaceExtension(bakFilename, "bak2");
+        MoveFileReplaceExisting(bakFilename, bakFilename2);
+        MoveFileReplaceExisting(filename, bakFilename);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CFileUtil::BackupFileDated(const char* filename, bool bUseBackupSubDirectory /*=false*/)
+{
+    bool makeBackup = true;
+    {
+        // Check if backup needed.
+        QFile bak(filename);
+        if (bak.open(QFile::ReadOnly))
+        {
+            if (bak.size() <= 0)
+            {
+                makeBackup = false;
+            }
+        }
+        else
+        {
+            makeBackup = false;
+        }
+    }
+
+    if (makeBackup)
+    {
+        // Generate new filename
+        time_t ltime;
+        time(&ltime);
+        tm today;
+#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
+        localtime_s(&today, &ltime);
+#else
+        today = *localtime(&ltime);
+#endif
+
+        char sTemp[128];
+        strftime(sTemp, sizeof(sTemp), ".%Y%m%d.%H%M%S.", &today);
+        QString bakFilename = Path::RemoveExtension(filename) + sTemp + Path::GetExt(filename);
+
+        if (bUseBackupSubDirectory)
+        {
+            QString sBackupPath = Path::ToUnixPath(Path::GetPath(filename)) + QString("/backups");
+            CFileUtil::CreateDirectory(sBackupPath.toUtf8().data());
+            bakFilename = sBackupPath + QString("/") + Path::GetFile(bakFilename);
+        }
+
+        // Do the backup
+        MoveFileReplaceExisting(filename, bakFilename);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::Deltree(const char* szFolder, [[maybe_unused]] bool bRecurse)
+{
+    return QDir(szFolder).removeRecursively();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool   CFileUtil::Exists(const QString& strPath, bool boDirectory, IFileUtil::FileDesc* pDesc)
+{
+    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
+    bool                        boIsDirectory(false);
+
+    AZ::IO::ArchiveFileIterator nFindHandle = pIPak->FindFirst(strPath.toUtf8().data());
+    // If it found nothing, no matter if it is a file or directory, it was not found.
+    if (!nFindHandle)
+    {
+        return false;
+    }
+    pIPak->FindClose(nFindHandle);
+
+    if ((nFindHandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
+    {
+        boIsDirectory = true;
+    }
+    else if (pDesc)
+    {
+        pDesc->filename = strPath;
+        pDesc->attrib = static_cast<unsigned int>(nFindHandle.m_fileDesc.nAttrib);
+        pDesc->size = nFindHandle.m_fileDesc.nSize;
+        pDesc->time_access = nFindHandle.m_fileDesc.tAccess;
+        pDesc->time_create = nFindHandle.m_fileDesc.tCreate;
+        pDesc->time_write = nFindHandle.m_fileDesc.tWrite;
+    }
+
+    // If we are seeking directories...
+    if (boDirectory)
+    {
+        // The return value will tell us if the found element is a directory.
+        return boIsDirectory;
+    }
+    else
+    {
+        // If we are not seeking directories...
+        // We return true if the found element is not a directory.
+        return !boIsDirectory;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::FileExists(const QString& strFilePath, IFileUtil::FileDesc* pDesc)
+{
+    return Exists(strFilePath, false, pDesc);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::PathExists(const QString& strPath)
+{
+    return Exists(strPath, true);
+}
+
+bool CFileUtil::GetDiskFileSize(const char* pFilePath, uint64& rOutSize)
+{
+    const QFileInfo fi(pFilePath);
+    rOutSize = fi.size();
+    return fi.exists();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool   CFileUtil::IsFileExclusivelyAccessable(const QString& strFilePath)
+{
+    // this was simply trying to open the file before, so keep it like that
+    QFile f(strFilePath);
+    return f.open(QFile::ReadOnly);
+}
+//////////////////////////////////////////////////////////////////////////
+bool   CFileUtil::CreatePath(const QString& strPath)
+{
+#if defined(AZ_PLATFORM_MAC)
+    bool pathCreated = true;
+
+    QString cleanPath = QDir::cleanPath(strPath);
+    QDir path(cleanPath);
+    if (!path.exists())
+    {
+        pathCreated = path.mkpath(cleanPath);
+    }
+
+    return pathCreated;
+#else
+    QString                                 strDriveLetter;
+    QString                                 strDirectory;
+    QString                                 strFilename;
+    QString                                 strExtension;
+    QString                                 strCurrentDirectoryPath;
+    QStringList        cstrDirectoryQueue;
+    size_t                                  nCurrentPathQueue(0);
+    size_t                                  nTotalPathQueueElements(0);
+    BOOL                                        bnLastDirectoryWasCreated(FALSE);
+
+    if (PathExists(strPath))
+    {
+        return true;
+    }
+
+    Path::SplitPath(strPath, strDriveLetter, strDirectory, strFilename, strExtension);
+    Path::GetDirectoryQueue(strDirectory, cstrDirectoryQueue);
+
+    if (!strDriveLetter.isEmpty())
+    {
+        strCurrentDirectoryPath = strDriveLetter;
+        strCurrentDirectoryPath += "\\";
+    }
+
+
+    nTotalPathQueueElements = cstrDirectoryQueue.size();
+    for (nCurrentPathQueue = 0; nCurrentPathQueue < nTotalPathQueueElements; ++nCurrentPathQueue)
+    {
+        strCurrentDirectoryPath += cstrDirectoryQueue[nCurrentPathQueue];
+        strCurrentDirectoryPath += "\\";
+        // The value which will go out of this loop is the result of the attempt to create the
+        // last directory, only.
+
+        strCurrentDirectoryPath = Path::CaselessPaths(strCurrentDirectoryPath);
+        bnLastDirectoryWasCreated = QDir().mkpath(strCurrentDirectoryPath);
+    }
+
+    if (!bnLastDirectoryWasCreated)
+    {
+        if (!QDir(strCurrentDirectoryPath).exists())
+        {
+            return false;
+        }
+    }
+
+    return true;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool   CFileUtil::DeleteFile(const QString& strPath)
+{
+    QFile(strPath).setPermissions(QFile::ReadOther | QFile::WriteOther);
+    return QFile::remove(strPath);
+}
+//////////////////////////////////////////////////////////////////////////
+bool CFileUtil::RemoveDirectory(const QString& strPath)
+{
+    return Deltree(strPath.toUtf8().data(), true);
+}
+
+void CFileUtil::ForEach(const QString& path, std::function<void(const QString&)> predicate, bool recurse)
+{
+    bool trailingSlash = path.endsWith('/') || path.endsWith('\\');
+    const QString dirName = trailingSlash ? path.left(path.length() - 1) : path;
+    QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags;
+
+    if (recurse)
+    {
+        flags = QDirIterator::Subdirectories;
+    }
+
+    QDirIterator dirIterator(path, QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot, flags);
+    while (dirIterator.hasNext())
+    {
+        dirIterator.next();
+        QString filePath = Path::ToUnixPath(dirIterator.filePath());
+        predicate(filePath);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+IFileUtil::ECopyTreeResult CFileUtil::CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse, bool boConfirmOverwrite, const char* const ignoreFilesAndFolders)
+{
+    static CUserOptions             oFileOptions;
+    static CUserOptions             oDirectoryOptions;
+
+    CUserOptions::CUserOptionsReferenceCountHelper  oFileOptionsHelper(oFileOptions);
+    CUserOptions::CUserOptionsReferenceCountHelper  oDirectoryOptionsHelper(oDirectoryOptions);
+
+    IFileUtil::ECopyTreeResult                      eCopyResult(IFileUtil::ETREECOPYOK);
+
+    QStringList            cFiles;
+    QStringList            cDirectories;
+
+    size_t                                      nCurrent(0);
+    size_t                                      nTotal(0);
+
+    // For this function to work properly, it has to first process all files in the directory AND JUST AFTER IT
+    // work on the sub-folders...this is NOT OBVIOUS, but imagine the case where you have a hierarchy of folders,
+    // all with the same names and all with the same files names inside. If you would make a depth-first search
+    // you could end up with the files from the deepest folder in ALL your folders.
+
+    std::vector<string> ignoredPatterns;
+    StringHelpers::Split(ignoreFilesAndFolders, "|", false, ignoredPatterns);
+
+    QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags;
+
+    if (boRecurse)
+    {
+        flags = QDirIterator::Subdirectories;
+    }
+
+    QDir sourceDir(strSourceDirectory);
+    QDir targetDir(strTargetDirectory);
+
+    QDirIterator dirIterator(strSourceDirectory, {"*.*"}, QDir::Files, flags);
+
+    if (!dirIterator.hasNext())
+    {
+        return IFileUtil::ETREECOPYOK;
+    }
+
+    while (dirIterator.hasNext())
+    {
+        const QString filePath = dirIterator.next();
+        const QString fileName = QFileInfo(filePath).fileName();
+
+        bool ignored = false;
+        for (const string& ignoredFile : ignoredPatterns)
+        {
+            if (StringHelpers::CompareIgnoreCase(fileName.toStdString().c_str(), ignoredFile.c_str()) == 0)
+            {
+                ignored = true;
+                break;
+            }
+        }
+        if (ignored)
+        {
+            continue;
+        }
+
+        QFileInfo fileInfo(filePath);
+        if (fileInfo.isDir())
+        {
+            if (boRecurse)
+            {
+                cDirectories.push_back(fileName);
+            }
+        }
+        else
+        {
+            cFiles.push_back(fileName);
+        }
+    }
+
+    // First we copy all files (maybe not all, depending on the user options...)
+    nTotal = cFiles.size();
+    for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
+    {
+        BOOL        bnLastFileWasCopied(FALSE);
+
+
+        if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
+        {
+            return eCopyResult;
+        }
+
+        QString sourceName = sourceDir.absoluteFilePath(cFiles[nCurrent]);
+        QString targetName = targetDir.absoluteFilePath(cFiles[nCurrent]);
+
+        if (boConfirmOverwrite)
+        {
+            if (QFileInfo::exists(targetName))
+            {
+                // If the directory already exists...
+                // we must warn our user about the possible actions.
+                int             nUserOption(0);
+
+                if (boConfirmOverwrite)
+                {
+                    // If the option is not valid to all folder, we must ask anyway again the user option.
+                    if (!oFileOptions.IsOptionToAll())
+                    {
+                        const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
+                            QObject::tr("Confirm file overwrite?"),
+                            QObject::tr("There is already a file named \"%1\" in the target folder. Do you want to move this file anyway replacing the old one?")
+                                .arg(cFiles[nCurrent]),
+                            QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+
+                        switch (ret) {
+                        case QMessageBox::YesToAll: /* fall-through */
+                        case QMessageBox::Yes:    nUserOption = IDYES; break;
+                        case QMessageBox::No:     nUserOption = IDNO; break;
+                        case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
+                        }
+
+                        oFileOptions.SetOption(nUserOption, ret == QMessageBox::YesToAll);
+                    }
+                    else
+                    {
+                        nUserOption = oFileOptions.GetOption();
+                    }
+                }
+
+                switch (nUserOption)
+                {
+                case IDYES:
+                {
+                    // Actually, we need to do nothing in this case.
+                }
+                break;
+
+                case IDNO:
+                {
+                    eCopyResult = IFileUtil::ETREECOPYUSERDIDNTCOPYSOMEITEMS;
+                    continue;
+                }
+                break;
+
+                // This IS ALWAYS for all... so it's easy to deal with.
+                case IDCANCEL:
+                {
+                    return IFileUtil::ETREECOPYUSERCANCELED;
+                }
+                break;
+                }
+            }
+        }
+
+        bnLastFileWasCopied = QFile::copy(sourceName, targetName);
+        if (!bnLastFileWasCopied)
+        {
+            eCopyResult = IFileUtil::ETREECOPYFAIL;
+        }
+    }
+
+    // Now we can recurse into the directories, if needed.
+    nTotal = cDirectories.size();
+    for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
+    {
+        if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
+        {
+            return eCopyResult;
+        }
+
+        BOOL        bnLastDirectoryWasCreated(FALSE);
+
+        QString sourceName = sourceDir.absoluteFilePath(cDirectories[nCurrent]);
+        QString targetName = targetDir.absoluteFilePath(cDirectories[nCurrent]);
+
+        bnLastDirectoryWasCreated = QDir().mkpath(targetName);
+
+        if (!bnLastDirectoryWasCreated)
+        {
+            if (!QDir(targetName).exists())
+            {
+                return IFileUtil::ETREECOPYFAIL;
+            }
+            else
+            {
+                // If the directory already exists...
+                // we must warn our user about the possible actions.
+                int             nUserOption(0);
+
+                if (boConfirmOverwrite)
+                {
+                    // If the option is not valid to all folder, we must ask anyway again the user option.
+                    if (!oDirectoryOptions.IsOptionToAll())
+                    {
+                        const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
+                            QObject::tr("Confirm directory overwrite?"),
+                            QObject::tr("There is already a folder named \"%1\" in the target folder. Do you want to move this folder anyway?")
+                                .arg(cDirectories[nCurrent]),
+                            QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+
+                        switch (ret) {
+                            case QMessageBox::YesToAll: /* fall-through */
+                            case QMessageBox::Yes:    nUserOption = IDYES; break;
+                            case QMessageBox::No:     nUserOption = IDNO; break;
+                            case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
+                        }
+
+                        oDirectoryOptions.SetOption(nUserOption, ret == QMessageBox::YesToAll);
+                    }
+                    else
+                    {
+                        nUserOption = oDirectoryOptions.GetOption();
+                    }
+                }
+
+                switch (nUserOption)
+                {
+                case IDYES:
+                {
+                    // Actually, we need to do nothing in this case.
+                }
+                break;
+
+                case IDNO:
+                {
+                    // If no, we just need to go to the next item.
+                    eCopyResult = IFileUtil::ETREECOPYUSERDIDNTCOPYSOMEITEMS;
+                    continue;
+                }
+                break;
+
+                // This IS ALWAYS for all... so it's easy to deal with.
+                case IDCANCEL:
+                {
+                    return IFileUtil::ETREECOPYUSERCANCELED;
+                }
+                break;
+                }
+            }
+        }
+
+        eCopyResult = CopyTree(sourceName, targetName, boRecurse, boConfirmOverwrite, ignoreFilesAndFolders);
+    }
+
+    return eCopyResult;
+}
+//////////////////////////////////////////////////////////////////////////
+IFileUtil::ECopyTreeResult   CFileUtil::CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite, ProgressRoutine pfnProgress, bool* pbCancel)
+{
+    CUserOptions                            oFileOptions;
+    IFileUtil::ECopyTreeResult                      eCopyResult(IFileUtil::ETREECOPYOK);
+
+    BOOL                                            bnLastFileWasCopied(FALSE);
+    QString                                     name(strSourceFile);
+    QString                                     strQueryFilename;
+    QString                                     strFullStargetName;
+
+    QString strTargetName(strTargetFile);
+    if (GetIEditor()->GetConsoleVar("ed_lowercasepaths"))
+    {
+        strTargetName = strTargetName.toLower();
+    }
+
+    QString strDriveLetter, strDirectory, strFilename, strExtension;
+    Path::SplitPath(strTargetName, strDriveLetter, strDirectory, strFilename, strExtension);
+    strFullStargetName = strDriveLetter;
+    strFullStargetName += strDirectory;
+
+    if (strFilename.isEmpty())
+    {
+        strFullStargetName += Path::GetFileName(strSourceFile);
+        strFullStargetName += ".";
+        strFullStargetName += Path::GetExt(strSourceFile);
+    }
+    else
+    {
+        strFullStargetName += strFilename;
+        strFullStargetName += strExtension;
+    }
+
+
+    if (boConfirmOverwrite)
+    {
+        if (QFileInfo::exists(strFullStargetName))
+        {
+            strQueryFilename = strFilename;
+            if (strFilename.isEmpty())
+            {
+                strQueryFilename = Path::GetFileName(strSourceFile);
+                strQueryFilename += ".";
+                strQueryFilename += Path::GetExt(strSourceFile);
+            }
+            else
+            {
+                strQueryFilename += strExtension;
+            }
+
+            // If the directory already exists...
+            // we must warn our user about the possible actions.
+            int             nUserOption(0);
+
+            if (boConfirmOverwrite)
+            {
+                // If the option is not valid to all folder, we must ask anyway again the user option.
+                if (!oFileOptions.IsOptionToAll())
+                {
+                    const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
+                        QObject::tr("Confirm file overwrite?"),
+                        QObject::tr("There is already a file named \"%1\" in the target folder. Do you want to move this file anyway replacing the old one?")
+                            .arg(strQueryFilename),
+                        QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+
+                    switch (ret) {
+                    case QMessageBox::Yes:    nUserOption = IDYES; break;
+                    case QMessageBox::No:     nUserOption = IDNO; break;
+                    case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
+                    }
+
+                    oFileOptions.SetOption(nUserOption, false);
+                }
+                else
+                {
+                    nUserOption = oFileOptions.GetOption();
+                }
+            }
+
+            switch (nUserOption)
+            {
+            case IDYES:
+            {
+                // Actually, we need to do nothing in this case.
+            }
+            break;
+
+            case IDNO:
+            {
+                return eCopyResult = IFileUtil::ETREECOPYUSERCANCELED;
+            }
+            break;
+
+            // This IS ALWAYS for all... so it's easy to deal with.
+            case IDCANCEL:
+            {
+                return IFileUtil::ETREECOPYUSERCANCELED;
+            }
+            break;
+            }
+        }
+    }
+
+    bnLastFileWasCopied = false;
+
+    QFile source(name);
+    if (source.open(QFile::ReadOnly))
+    {
+        QFile out(strFullStargetName);
+        if (out.open(QFile::ReadWrite))
+        {
+            bnLastFileWasCopied = true;
+            char block[4096];
+            qint64 totalRead = 0;
+            while (!source.atEnd())
+            {
+                qint64 in = source.read(block, sizeof(block));
+                if (in <= 0)
+                {
+                    break;
+                }
+                totalRead += in;
+                if (in != out.write(block, in))
+                {
+                    bnLastFileWasCopied = false;
+                    break;
+                }
+                if (pbCancel && *pbCancel == true)
+                {
+                    bnLastFileWasCopied = false;
+                    break;
+                }
+                if (pfnProgress)
+                {
+                    pfnProgress(source.size(), totalRead, 0, 0, 0, 0, 0, 0, 0);
+                }
+            }
+            if (totalRead != source.size())
+            {
+                bnLastFileWasCopied = false;
+            }
+        }
+    }
+
+    if (!bnLastFileWasCopied)
+    {
+        eCopyResult = IFileUtil::ETREECOPYFAIL;
+    }
+
+    return eCopyResult;
+}
+//////////////////////////////////////////////////////////////////////////
+IFileUtil::ECopyTreeResult   CFileUtil::MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse, bool boConfirmOverwrite)
+{
+    static CUserOptions             oFileOptions;
+    static CUserOptions             oDirectoryOptions;
+
+    CUserOptions::CUserOptionsReferenceCountHelper  oFileOptionsHelper(oFileOptions);
+    CUserOptions::CUserOptionsReferenceCountHelper  oDirectoryOptionsHelper(oDirectoryOptions);
+
+    IFileUtil::ECopyTreeResult                  eCopyResult(IFileUtil::ETREECOPYOK);
+
+    QStringList            cFiles;
+    QStringList            cDirectories;
+
+    size_t                                      nCurrent(0);
+    size_t                                      nTotal(0);
+
+    // For this function to work properly, it has to first process all files in the directory AND JUST AFTER IT
+    // work on the sub-folders...this is NOT OBVIOUS, but imagine the case where you have a hierarchy of folders,
+    // all with the same names and all with the same files names inside. If you would make a depth-first search
+    // you could end up with the files from the deepest folder in ALL your folders.
+
+    QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags;
+
+    if (boRecurse)
+    {
+        flags = QDirIterator::Subdirectories;
+    }
+
+    QDirIterator dirIterator(strSourceDirectory, {"*.*"}, QDir::Files, flags);
+
+    if (!dirIterator.hasNext())
+    {
+        return IFileUtil::ETREECOPYOK;
+    }
+
+    QDir sourceDir(strSourceDirectory);
+    QDir targetDir(strTargetDirectory);
+
+    while (dirIterator.hasNext())
+    {
+        const QString filePath = dirIterator.next();
+        const QString fileName = QFileInfo(filePath).fileName();
+
+        QFileInfo fileInfo(filePath);
+        if (fileInfo.isDir())
+        {
+            if (boRecurse)
+            {
+                cDirectories.push_back(fileName);
+            }
+        }
+        else
+        {
+            cFiles.push_back(fileName);
+        }
+    }
+
+    // First we copy all files (maybe not all, depending on the user options...)
+    nTotal = cFiles.size();
+    for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
+    {
+        if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
+        {
+            return eCopyResult;
+        }
+
+        BOOL        bnLastFileWasCopied(FALSE);
+        QString sourceName(sourceDir.absoluteFilePath(cFiles[nCurrent]));
+        QString targetName(targetDir.absoluteFilePath(cFiles[nCurrent]));
+
+        if (boConfirmOverwrite)
+        {
+            if (QFileInfo::exists(targetName))
+            {
+                // If the directory already exists...
+                // we must warn our user about the possible actions.
+                int             nUserOption(0);
+
+                if (boConfirmOverwrite)
+                {
+                    // If the option is not valid to all folder, we must ask anyway again the user option.
+                    if (!oFileOptions.IsOptionToAll())
+                    {
+                        const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
+                            QObject::tr("Confirm file overwrite?"),
+                            QObject::tr("There is already a file named \"%1\" in the target folder. Do you want to move this file anyway replacing the old one?")
+                                .arg(cFiles[nCurrent]),
+                            QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+
+                        switch (ret) {
+                        case QMessageBox::YesToAll: /* fall-through */
+                        case QMessageBox::Yes:    nUserOption = IDYES; break;
+                        case QMessageBox::No:     nUserOption = IDNO; break;
+                        case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
+                        }
+
+                        oFileOptions.SetOption(nUserOption, ret == QMessageBox::YesToAll);
+                    }
+                    else
+                    {
+                        nUserOption = oFileOptions.GetOption();
+                    }
+                }
+
+                switch (nUserOption)
+                {
+                case IDYES:
+                {
+                    // Actually, we need to do nothing in this case.
+                }
+                break;
+
+                case IDNO:
+                {
+                    eCopyResult = IFileUtil::ETREECOPYUSERDIDNTCOPYSOMEITEMS;
+                    continue;
+                }
+                break;
+
+                // This IS ALWAYS for all... so it's easy to deal with.
+                case IDCANCEL:
+                {
+                    return IFileUtil::ETREECOPYUSERCANCELED;
+                }
+                break;
+                }
+            }
+        }
+        bnLastFileWasCopied = MoveFileReplaceExisting(sourceName, targetName);
+
+        if (!bnLastFileWasCopied)
+        {
+            eCopyResult = IFileUtil::ETREECOPYFAIL;
+        }
+    }
+
+    // Now we can recurse into the directories, if needed.
+    nTotal = cDirectories.size();
+    for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
+    {
+        BOOL        bnLastDirectoryWasCreated(FALSE);
+
+        if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
+        {
+            return eCopyResult;
+        }
+
+        QString sourceName(sourceDir.absoluteFilePath(cDirectories[nCurrent]));
+        QString targetName(targetDir.absoluteFilePath(cDirectories[nCurrent]));
+
+        bnLastDirectoryWasCreated = QDir().mkdir(targetName);
+
+        if (!bnLastDirectoryWasCreated)
+        {
+            if (!QDir(targetName).exists())
+            {
+                return IFileUtil::ETREECOPYFAIL;
+            }
+            else
+            {
+                // If the directory already exists...
+                // we must warn our user about the possible actions.
+                int             nUserOption(0);
+
+                if (boConfirmOverwrite)
+                {
+                    // If the option is not valid to all folder, we must ask anyway again the user option.
+                    if (!oDirectoryOptions.IsOptionToAll())
+                    {
+                        const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
+                            QObject::tr("Confirm directory overwrite?"),
+                            QObject::tr("There is already a folder named \"%1\" in the target folder. Do you want to move this folder anyway?")
+                                .arg(cDirectories[nCurrent]),
+                            QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+
+                        switch (ret) {
+                        case QMessageBox::YesToAll: /* fall-through */
+                        case QMessageBox::Yes:    nUserOption = IDYES; break;
+                        case QMessageBox::No:     nUserOption = IDNO; break;
+                        case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
+                        }
+
+                        oDirectoryOptions.SetOption(nUserOption, ret == QMessageBox::YesToAll);
+                    }
+                    else
+                    {
+                        nUserOption = oDirectoryOptions.GetOption();
+                    }
+                }
+
+                switch (nUserOption)
+                {
+                case IDYES:
+                {
+                    // Actually, we need to do nothing in this case.
+                }
+                break;
+
+                case IDNO:
+                {
+                    // If no, we just need to go to the next item.
+                    eCopyResult = IFileUtil::ETREECOPYUSERDIDNTCOPYSOMEITEMS;
+                    continue;
+                }
+                break;
+
+                // This IS ALWAYS for all... so it's easy to deal with.
+                case IDCANCEL:
+                {
+                    return IFileUtil::ETREECOPYUSERCANCELED;
+                }
+                break;
+                }
+            }
+        }
+
+        eCopyResult = MoveTree(sourceName, targetName, boRecurse, boConfirmOverwrite);
+    }
+
+    CFileUtil::RemoveDirectory(strSourceDirectory);
+
+    return eCopyResult;
+}
+
+QString CFileUtil::PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent)
+{
+    QStringList extraItemsFront;
+    return PopupQMenu(filename, fullGamePath, parent, nullptr, extraItemsFront);
+}
+
+QString CFileUtil::PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent, [[maybe_unused]] bool* pIsSelected, const QStringList& extraItemsFront)
+{
+    QStringList extraItemsBack;
+    return PopupQMenu(filename, fullGamePath, parent, nullptr, extraItemsFront, extraItemsBack);
+}
+
+QString CFileUtil::PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent, bool* pIsSelected, const QStringList& extraItemsFront, const QStringList& extraItemsBack)
+{
+    QMenu menu;
+
+    foreach(QString text, extraItemsFront)
+    {
+        if (!text.isEmpty())
+        {
+            menu.addAction(text);
+        }
+    }
+    if (extraItemsFront.count())
+    {
+        menu.addSeparator();
+    }
+
+    PopulateQMenu(parent, &menu, filename, fullGamePath, pIsSelected);
+    if (extraItemsBack.count())
+    {
+        menu.addSeparator();
+    }
+    foreach(QString text, extraItemsBack)
+    {
+        if (!text.isEmpty())
+        {
+            menu.addAction(text);
+        }
+    }
+
+    QAction* result = menu.exec(QCursor::pos());
+    return result ? result->text() : QString();
+}
+
+void CFileUtil::PopulateQMenu(QWidget* caller, QMenu* menu, const QString& filename, const QString& fullGamePath)
+{
+    PopulateQMenu(caller, menu, filename, fullGamePath, nullptr);
+}
+
+void CFileUtil::PopulateQMenu(QWidget* caller, QMenu* menu, const QString& filename, const QString& fullGamePath, bool* isSelected)
+{
+    QString fullPath;
+
+    if (isSelected)
+    {
+        *isSelected = false;
+    }
+
+    if (!filename.isEmpty())
+    {
+        QString path = Path::MakeGamePath(fullGamePath);
+        path = Path::AddSlash(path) + filename;
+        fullPath = Path::GamePathToFullPath(path);
+    }
+    else
+    {
+        fullPath = fullGamePath;
+    }
+
+    uint32 nFileAttr = CFileUtil::GetAttributes(fullPath.toUtf8().data());
+
+    QAction* action;
+
+    // NOTE: isSelected being passed in implies that the menu filled from this call must have exec() called on it, and not show.
+    if (isSelected)
+    {
+        action = new QAction(QObject::tr("Select"), nullptr);
+        QObject::connect(action, &QAction::triggered, action, [isSelected]() { *isSelected = true; });
+        if (menu->isEmpty())
+        {
+            menu->addAction(action);
+        }
+        else
+        {
+            menu->insertAction(menu->actions()[0], action);
+        }
+    }
+
+    action = menu->addAction(AzQtComponents::fileBrowserActionName(), [=]()
+    {
+        if (nFileAttr & SCC_FILE_ATTRIBUTE_INPAK)
+        {
+            QString path = QDir::toNativeSeparators(Path::GetPath(fullPath));
+            QDesktopServices::openUrl(QUrl::fromLocalFile(path));
+        }
+        else
+        {
+            AzQtComponents::ShowFileOnDesktop(fullPath);
+        }
+    });
+    action->setDisabled(nFileAttr & SCC_FILE_ATTRIBUTE_INPAK);
+
+    action = menu->addAction(QObject::tr("Copy Name To Clipboard"), [=]()
+    {
+        if (filename.isEmpty())
+        {
+            QFileInfo fi(fullGamePath);
+            QString file = fi.completeBaseName();
+            QApplication::clipboard()->setText(file);
+        }
+        else
+        {
+            QApplication::clipboard()->setText(filename);
+        }
+    });
+
+    action = menu->addAction(QObject::tr("Copy Path To Clipboard"), [fullPath]() { QApplication::clipboard()->setText(fullPath); });
+
+    if (!filename.isEmpty() && GetIEditor()->IsSourceControlAvailable() && nFileAttr != SCC_FILE_ATTRIBUTE_INVALID)
+    {
+        bool isEnableSC = nFileAttr & SCC_FILE_ATTRIBUTE_MANAGED;
+        bool isInPak = nFileAttr & SCC_FILE_ATTRIBUTE_INPAK;
+        menu->addSeparator();
+        if (isInPak && !isEnableSC)
+        {
+            menu->addAction(QObject::tr("File In Pak (Read Only)"));
+            menu->setDisabled(true);
+        }
+        else
+        {
+            action = menu->addAction(QObject::tr("Check Out"), [fullPath, caller]()
+            {
+                if (!CheckoutFile(fullPath.toUtf8().data(), caller))
+                {
+                    QMessageBox::warning(caller, QObject::tr("Error"),
+                        QObject::tr("Source Control Check Out Failed.\r\nCheck if Source Control Provider is correctly setup and working directory is correct."));
+                }
+            });
+            action->setEnabled(isEnableSC && !isInPak && (nFileAttr & SCC_FILE_ATTRIBUTE_READONLY));
+
+            action = menu->addAction(QObject::tr("Undo Check Out"), [fullPath, caller]()
+            {
+                if (!RevertFile(fullPath.toUtf8().data(), caller))
+                {
+                    QMessageBox::warning(caller, QObject::tr("Error"),
+                        QObject::tr("Source Control Undo Check Out Failed.\r\nCheck if Source Control Provider is correctly setup and working directory is correct."));
+                }
+            });
+            action->setEnabled(isEnableSC && !isInPak && (nFileAttr & SCC_FILE_ATTRIBUTE_CHECKEDOUT));
+
+            action = menu->addAction(QObject::tr("Get Latest Version"), [fullPath, caller]()
+            {
+                if (GetIEditor()->IsSourceControlAvailable())
+                {
+                    if (!CFileUtil::GetLatestFromSourceControl(fullPath.toUtf8().data(), caller))
+                    {
+                        QMessageBox::warning(caller, QObject::tr("Error"),
+                            QObject::tr("Source Control failed to get latest version of file.\r\nCheck if Source Control Provider is setup correctly."
+                            "\r\n\r\nAdditionally, this operation will fail on files that have local changes\r\nthat are not currently checked out, in order to prevent data loss."
+                            "\r\nIn this case, please reconcile offline work directly from Source Control Provider."));
+                    }
+                }
+            });
+            action->setEnabled(isEnableSC);
+
+            action = menu->addAction(QObject::tr("Add To Source Control"), [fullPath, caller]()
+            {
+                if (!CheckoutFile(fullPath.toUtf8().data(), caller))
+                {
+                    QMessageBox::warning(caller, QObject::tr("Error"),
+                        QObject::tr("Source Control Add Failed.\r\nCheck if Source Control Provider is correctly setup and working directory is correct."));
+                }
+            });
+            action->setDisabled(isEnableSC);
+        }
+    }
+}
+
+void CFileUtil::GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase, bool bMakeUnixPath)
+{
+    rOutFilenames.clear();
+    CBaseObjectsArray objArr;
+    CUsedResources usedRes;
+
+    GetIEditor()->GetObjectManager()->GetObjects(objArr);
+
+    for (size_t i = 0, iCount = objArr.size(); i < iCount; ++i)
+    {
+        CBaseObject* pObj = objArr[i];
+
+        usedRes.files.clear();
+        pObj->GatherUsedResources(usedRes);
+
+        for (CUsedResources::TResourceFiles::iterator iter = usedRes.files.begin(); iter != usedRes.files.end(); ++iter)
+        {
+            QString tmpStr = (*iter);
+
+            if (bMakeLowerCase)
+            {
+                tmpStr = tmpStr.toLower();
+            }
+
+            if (bMakeUnixPath)
+            {
+                tmpStr = Path::ToUnixPath(tmpStr);
+            }
+
+            rOutFilenames.insert(tmpStr);
+        }
+    }
+}
+
+uint32 CFileUtil::GetAttributes(const char* filename, bool bUseSourceControl /*= true*/)
+{
+    using namespace AzToolsFramework;
+
+    bool scOpSuccess = false;
+    SourceControlFileInfo fileInfo;
+
+    if (bUseSourceControl)
+    {
+        using SCRequest = SourceControlConnectionRequestBus;
+
+        SourceControlState state = SourceControlState::Disabled;
+        SCRequest::BroadcastResult(state, &SCRequest::Events::GetSourceControlState);
+
+        if (state == SourceControlState::ConfigurationInvalid)
+        {
+            return SCC_FILE_ATTRIBUTE_INVALID;
+        }
+
+        if (state == SourceControlState::Active)
+        {
+            using SCCommand = SourceControlCommandBus;
+
+            bool scOpComplete = false;
+            SCCommand::Broadcast(&SCCommand::Events::GetFileInfo, filename,
+                [&fileInfo, &scOpSuccess, &scOpComplete](bool success, const SourceControlFileInfo& info)
+                {
+                    fileInfo = info;
+                    scOpSuccess = success;
+                    scOpComplete = true;
+                }
+            );
+
+            BlockAndWait(scOpComplete, nullptr, "Getting file status...");
+
+            // we intended to use source control, but the operation failed.
+            // do not fall through to checking as if bUseSourceControl was false
+            if (!scOpSuccess)
+            {
+                return SCC_FILE_ATTRIBUTE_INVALID;
+            }
+        }
+    }
+
+    CCryFile file;
+    bool isCryFile = file.Open(filename, "rb");
+
+    // Using source control and our fstat succeeded.
+    // Translate SourceControlStatus to (legacy) ESccFileAttributes
+    if (scOpSuccess)
+    {
+        uint32 sccFileAttr = AZ::IO::SystemFile::Exists(filename) ? SCC_FILE_ATTRIBUTE_NORMAL : SCC_FILE_ATTRIBUTE_INVALID;
+
+        if (fileInfo.HasFlag(SourceControlFlags::SCF_Tracked))
+        {
+            sccFileAttr |= SCC_FILE_ATTRIBUTE_MANAGED;
+        }
+
+        if (fileInfo.HasFlag(SourceControlFlags::SCF_OpenByUser))
+        {
+            sccFileAttr |= SCC_FILE_ATTRIBUTE_MANAGED | SCC_FILE_ATTRIBUTE_CHECKEDOUT;
+        }
+
+        if ((sccFileAttr & SCC_FILE_ATTRIBUTE_MANAGED) == SCC_FILE_ATTRIBUTE_MANAGED)
+        {
+            if (fileInfo.HasFlag(SourceControlFlags::SCF_OutOfDate))
+            {
+                sccFileAttr |= SCC_FILE_ATTRIBUTE_NOTATHEAD;
+            }
+
+            if (fileInfo.HasFlag(SourceControlFlags::SCF_OtherOpen))
+            {
+                sccFileAttr |= SCC_FILE_ATTRIBUTE_CHECKEDOUT | SCC_FILE_ATTRIBUTE_BYANOTHER;
+            }
+
+            if (fileInfo.HasFlag(SourceControlFlags::SCF_PendingAdd))
+            {
+                sccFileAttr |= SCC_FILE_ATTRIBUTE_ADD;
+            }
+        }
+
+        if (fileInfo.IsReadOnly())
+        {
+            sccFileAttr |= SCC_FILE_ATTRIBUTE_READONLY;
+        }
+
+        if (file.IsInPak())
+        {
+            sccFileAttr |= SCC_FILE_ATTRIBUTE_READONLY | SCC_FILE_ATTRIBUTE_INPAK;
+        }
+
+        return sccFileAttr;
+    }
+
+    // We've asked not to use source control OR we disabled source control
+    if (!isCryFile)
+    {
+        return SCC_FILE_ATTRIBUTE_INVALID;
+    }
+
+    if (file.IsInPak())
+    {
+        return SCC_FILE_ATTRIBUTE_READONLY | SCC_FILE_ATTRIBUTE_INPAK;
+    }
+
+    DWORD dwAttrib = ::GetFileAttributes(file.GetAdjustedFilename());
+    if (dwAttrib == INVALID_FILE_ATTRIBUTES)
+    {
+        return SCC_FILE_ATTRIBUTE_INVALID;
+    }
+
+    if (dwAttrib & FILE_ATTRIBUTE_READONLY)
+    {
+        return SCC_FILE_ATTRIBUTE_NORMAL | SCC_FILE_ATTRIBUTE_READONLY;
+    }
+
+    return SCC_FILE_ATTRIBUTE_NORMAL;
+}
+
+bool CFileUtil::CompareFiles(const QString& strFilePath1, const QString& strFilePath2)
+{
+    // Get the size of both files.  If either fails we say they are different (most likely one doesn't exist)
+    uint64 size1 = 0;
+    uint64 size2 = 0;
+    if (!GetDiskFileSize(strFilePath1.toUtf8().data(), size1) || !GetDiskFileSize(strFilePath2.toUtf8().data(), size2))
+    {
+        return false;
+    }
+
+    // If the files are different sizes return false
+    if (size1 != size2)
+    {
+        return false;
+    }
+
+    // Sizes are the same, we need to compare the bytes.  Try to open both files for read.
+    CCryFile file1, file2;
+    if (!file1.Open(strFilePath1.toUtf8().data(), "rb") || !file2.Open(strFilePath2.toUtf8().data(), "rb"))
+    {
+        return false;
+    }
+
+    const uint64 bufSize = 4096;
+
+    char buf1[bufSize], buf2[bufSize];
+
+    for (uint64 i = 0; i < size1; i += bufSize)
+    {
+        size_t amtRead1 = file1.ReadRaw(buf1, bufSize);
+        size_t amtRead2 = file2.ReadRaw(buf2, bufSize);
+
+        // Not a match if we didn't read the same amount from each file
+        if (amtRead1 != amtRead2)
+        {
+            return false;
+        }
+
+        // Not a match if we didn't read the amount of data we expected
+        if (amtRead1 != bufSize && i + amtRead1 != size1)
+        {
+            return false;
+        }
+
+        // Not a match if the buffers aren't the same
+        if (memcmp(buf1, buf2, amtRead1) != 0)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool CFileUtil::SortAscendingFileNames(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
+{
+    return desc1.filename.compare(desc2.filename) == -1 ? true : false;
+}
+
+bool CFileUtil::SortDescendingFileNames(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
+{
+    return desc1.filename.compare(desc2.filename) == 1 ? true : false;
+}
+
+bool CFileUtil::SortAscendingDates(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
+{
+    return desc1.time_write < desc2.time_write;
+}
+
+bool CFileUtil::SortDescendingDates(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
+{
+    return desc1.time_write > desc2.time_write;
+}
+
+bool CFileUtil::SortAscendingSizes(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
+{
+    return desc1.size > desc2.size;
+}
+
+bool CFileUtil::SortDescendingSizes(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
+{
+    return desc1.size < desc2.size;
+}
+
+
+bool CFileUtil::IsAbsPath(const QString& filepath)
+{
+    return (!filepath.isEmpty() && ((filepath[1] == ':' && (filepath[2] == '\\' || filepath[2] == '/')
+                          || (filepath[0] == '\\' || filepath[0] == '/'))));
+}
+
+CTempFileHelper::CTempFileHelper(const char* pFileName)
+{
+    char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(pFileName, resolvedPath, AZ_MAX_PATH_LEN);
+    m_fileName = QString::fromUtf8(resolvedPath);
+
+    // the official pattern for temp files in the editor is /$tmp[0-9]*_"
+    // so we'll follow this pattern to make sure its ignored by asset processor.
+    // the _h_ is added to be unique (helper) in case someone else is also making temp files.
+    Path::ReplaceFilename(m_fileName, "$tmp_h_" + Path::GetFileName(QString::fromUtf8(pFileName)), m_tempFileName);
+    CFileUtil::DeleteFile(m_tempFileName);
+}
+
+CTempFileHelper::~CTempFileHelper()
+{
+    CFileUtil::DeleteFile(m_tempFileName);
+}
+
+bool CTempFileHelper::UpdateFile(bool bBackup)
+{
+    // First, check if the files are actually different
+    if (!CFileUtil::CompareFiles(m_tempFileName, m_fileName))
+    {
+        // If the file changed, make sure the destination file is writable
+        if (!CFileUtil::OverwriteFile(m_fileName))
+        {
+            CFileUtil::DeleteFile(m_tempFileName);
+            return false;
+        }
+
+        // Back up the current file if requested
+        if (bBackup)
+        {
+            CFileUtil::BackupFile(m_fileName.toUtf8().data());
+        }
+
+        // Move the temp file over the top of the destination file
+        return MoveFileReplaceExisting(m_tempFileName, m_fileName);
+    }
+    // If the files are the same, just delete the temp file and return.
+    else
+    {
+        CFileUtil::DeleteFile(m_tempFileName);
+        return true;
+    }
+}
+
diff --git a/Code/Editor/Util/FileUtil.h b/Code/Editor/Util/FileUtil.h
new file mode 100644
index 0000000000..7513bd723e
--- /dev/null
+++ b/Code/Editor/Util/FileUtil.h
@@ -0,0 +1,208 @@
+/*
+ * 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 "CryThread.h"
+#include "StringUtils.h"
+#include "../Include/SandboxAPI.h"
+#include <QString>
+#include <QFileInfo>
+#include "../Include/IFileUtil.h"
+
+class QStringList;
+class QMenu;
+
+class SANDBOX_API CFileUtil
+{
+public:
+    static bool ScanDirectory(const QString& path, const QString& fileSpec, IFileUtil::FileArray& files,
+        bool recursive = true, bool addDirAlso = false, IFileUtil::ScanDirectoryUpdateCallBack updateCB = nullptr, bool bSkipPaks = false);
+
+    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);
+
+    //! Reformat filter string for (MFC) CFileDialog style file filtering
+    static void FormatFilterString(QString& filter);
+
+    //! Open file selection dialog.
+    static bool SelectFile(const QString& fileSpec, const QString& searchFolder, QString& fullFileName);
+    //! Open file selection dialog.
+    static bool SelectFiles(const QString& fileSpec, const QString& searchFolder, QStringList& files);
+
+    //! Display OpenFile dialog and allow to select multiple files.
+    //! @return true if selected, false if canceled.
+    //! @outputFile Inputs and Outputs filename.
+    /*
+    static bool SelectSingleFile(IFileUtil::ECustomFileType fileType, QString& outputFile, const QString& filter = "", const QString& initialDir = "");
+    static bool SelectSingleFile(IFileUtil::ECustomFileType fileType, char* outputFile, int outputSize, const char* filter = "", const char* initialDir = "");
+    static bool SelectSingleFile(IFileUtil::ECustomFileType fileType, QString& outputFile, const QString& filter = {}, const QString& initialDir = {});
+    */
+    static bool SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName);
+
+    //! Attempt to make a file writable
+    static bool OverwriteFile(const QString& filename);
+
+    //! Checks out the file from source control API.  Blocks until completed
+    static bool CheckoutFile(const char* filename, QWidget* parentWindow = nullptr);
+
+    //! Discard changes to a file from source control API.  Blocks until completed
+    static bool RevertFile(const char* filename, QWidget* parentWindow = nullptr);
+
+    //! Renames (moves) a file through the source control API.  Blocks until completed
+    static bool RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow = nullptr);
+
+    //! Deletes a file using source control API.  Blocks until completed.
+    static bool DeleteFromSourceControl(const char* filename, QWidget* parentWindow = nullptr);
+
+    //! Attempts to get the latest version of a file from source control.  Blocks until completed
+    static bool GetLatestFromSourceControl(const char* filename, QWidget* parentWindow = nullptr);
+
+    //! Gather information about a file using the source control API.  Blocks until completed
+    static bool GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow = nullptr);
+
+    //! Creates this directory if it doesn't exist. Returns false if the director doesn't exist and couldn't be created.
+    static bool CreateDirectory(const char* dir);
+
+    //! Makes a backup file.
+    static void BackupFile(const char* filename);
+
+    //! Makes a backup file, marked with a datestamp, e.g. myfile.20071014.093320.xml
+    //! If bUseBackupSubDirectory is true, moves backup file into a relative subdirectory "backups"
+    static void BackupFileDated(const char* filename, bool bUseBackupSubDirectory = false);
+
+    // ! Added deltree as a copy from the function found in Crypak.
+    static bool Deltree(const char* szFolder, bool bRecurse);
+
+    // Checks if a file or directory exist.
+    // We are using 3 functions here in order to make the names more instructive for the programmers.
+    // Those functions only work for OS files and directories.
+    static bool   Exists(const QString& strPath, bool boDirectory, IFileUtil::FileDesc* pDesc = nullptr);
+    static bool   FileExists(const QString& strFilePath, IFileUtil::FileDesc* pDesc = nullptr);
+    static bool   PathExists(const QString& strPath);
+    static bool   GetDiskFileSize(const char* pFilePath, uint64& rOutSize);
+
+    // This function should be used only with physical files.
+    static bool   IsFileExclusivelyAccessable(const QString& strFilePath);
+
+    // Creates the entire path, if needed.
+    static bool   CreatePath(const QString& strPath);
+
+    // Attempts to delete a file (if read only it will set its attributes to normal first).
+    static bool   DeleteFile(const QString& strPath);
+
+    // Attempts to remove a directory (if read only it will set its attributes to normal first).
+    static bool     RemoveDirectory(const QString& strPath);
+
+    // Calls predicate() with each entry in the directory
+    static void     ForEach(const QString& path, std::function<void(const QString&)> predicate, bool recurse = true);
+
+    //! Copies all the elements from the source directory to the target directory.
+    //! It doesn't copy the source folder to the target folder, only it's contents.
+    //! THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
+    //! The ignore list can either take a single string of a file name or folder name or it can take PIPE separated names ("something|somethingelse")
+    //! It is not a pattern match, merely a file or folder name match.
+    static IFileUtil::ECopyTreeResult   CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false, const char* const ignoreFilesAndFolders = nullptr);
+
+    //////////////////////////////////////////////////////////////////////////
+    // @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
+    // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
+    static IFileUtil::ECopyTreeResult   CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = nullptr, bool* pbCancel = nullptr);
+
+
+    // As we don't have a FileUtil interface here, we have to duplicate some code :-( in order to keep
+    // function calls clean.
+    // Moves all the elements from the source directory to the target directory.
+    // It doesn't move the source folder to the target folder, only it's contents.
+    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
+    static IFileUtil::ECopyTreeResult   MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false);
+
+    // Show Popup Menu with file commands include Source Control commands
+    // filename: a name of file without path
+    // fullGamePath: a game path to folder like "/Game/Objects" without filename
+    // wnd: pointer to window class, can be nullptr
+    // isSelected: output value indicated if Select menu item was chosen, if pointer is 0 - no Select menu item.
+    // pItems: you can specify additional menu items and get the result of selection using this parameter.
+    // return false if source control operation failed
+    static QString PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent);
+    static QString PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent, bool* pIsSelected, const QStringList& extraItemsFront);
+    static QString PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent, bool* pIsSelected, const QStringList& extraItemsFront, const QStringList& extraItemsBack);
+
+    static void PopulateQMenu(QWidget* caller, QMenu* menu, const QString& filename, const QString& fullGamePath);
+
+    static void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false);
+
+    // Get file attributes include source control attributes if available
+    static uint32 GetAttributes(const char* filename, bool bUseSourceControl = true);
+
+    // Returns true if the files have the same content, false otherwise
+    static bool CompareFiles(const QString& strFilePath1, const QString& strFilePath2);
+
+    // Sort Columns( Ascending/Descending )
+    static bool SortAscendingFileNames(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
+    static bool SortDescendingFileNames(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
+    static bool SortAscendingDates(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
+    static bool SortDescendingDates(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
+    static bool SortAscendingSizes(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
+    static bool SortDescendingSizes(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
+
+    // Return true is the filepath is a absolute path
+    static bool IsAbsPath(const QString& filepath);
+
+private:
+    // True means to use the custom file dialog, false means to use the smart file open dialog.
+    static bool s_singleFileDlgPref[IFileUtil::EFILE_TYPE_LAST];
+    static bool s_multiFileDlgPref[IFileUtil::EFILE_TYPE_LAST];
+
+    // Keep this variant of this method private! pIsSelected is captured in a lambda, and so requires menu use exec() and never use show()
+    static void PopulateQMenu(QWidget* caller, QMenu* menu, const QString& filename, const QString& fullGamePath, bool* pIsSelected);
+
+    static bool ExtractDccFilenameFromAssetDatabase(const QString& assetFilename, QString& dccFilename);
+    static bool ExtractDccFilenameUsingNamingConventions(const QString& assetFilename, QString& dccFilename);
+};
+
+class CAutoRestorePrimaryCDRoot
+{
+public:
+    ~CAutoRestorePrimaryCDRoot();
+};
+
+//
+// A helper for creating a temp file to write to, then copying that over the destination
+// file only if it changes (to avoid requiring the user to check out source controlled
+// file unnecessarily)
+//
+class SANDBOX_API CTempFileHelper
+{
+public:
+    CTempFileHelper(const char* pFileName);
+    ~CTempFileHelper();
+
+    // Gets the path to the temp file that should be written to
+    const QString& GetTempFilePath() { return m_tempFileName; }
+
+    // After the temp file has been written and closed, this should be called to update
+    // the destination file.
+    // If bBackup is true CFileUtil::BackupFile will be called if the file has changed.
+    bool UpdateFile(bool bBackup);
+
+private:
+    QString m_fileName;
+    QString m_tempFileName;
+};
diff --git a/Code/Editor/Util/FileUtil_impl.cpp b/Code/Editor/Util/FileUtil_impl.cpp
new file mode 100644
index 0000000000..f9ce37212a
--- /dev/null
+++ b/Code/Editor/Util/FileUtil_impl.cpp
@@ -0,0 +1,187 @@
+/*
+ * 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 "FileUtil_impl.h"
+
+bool CFileUtil_impl::ScanDirectory(const QString& path, const QString& fileSpec, FileArray& files, bool recursive, bool addDirAlso, ScanDirectoryUpdateCallBack updateCB, bool bSkipPaks)
+{
+    return CFileUtil::ScanDirectory(path, fileSpec, files, recursive, addDirAlso, updateCB, bSkipPaks);
+}
+
+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);
+}
+
+bool CFileUtil_impl::CalculateDccFilename(const QString& assetFilename, QString& dccFilename)
+{
+    return CFileUtil::CalculateDccFilename(assetFilename, dccFilename);
+}
+
+void CFileUtil_impl::FormatFilterString(QString& filter)
+{
+    CFileUtil::FormatFilterString(filter);
+}
+
+bool CFileUtil_impl::SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName)
+{
+    return CFileUtil::SelectSaveFile(fileFilter, defaulExtension, startFolder, fileName);
+}
+
+bool CFileUtil_impl::OverwriteFile(const QString& filename)
+{
+    return CFileUtil::OverwriteFile(filename);
+}
+
+bool CFileUtil_impl::CheckoutFile(const char* filename, QWidget* parentWindow)
+{
+    return CFileUtil::CheckoutFile(filename, parentWindow);
+}
+
+bool CFileUtil_impl::RevertFile(const char* filename, QWidget* parentWindow)
+{
+    return CFileUtil::RevertFile(filename, parentWindow);
+}
+
+bool CFileUtil_impl::RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow)
+{
+    return CFileUtil::RenameFile(sourceFile, targetFile, parentWindow);
+}
+
+bool CFileUtil_impl::DeleteFromSourceControl(const char* filename, QWidget* parentWindow)
+{
+    return CFileUtil::DeleteFromSourceControl(filename, parentWindow);
+}
+
+bool CFileUtil_impl::GetLatestFromSourceControl(const char* filename, QWidget* parentWindow)
+{
+    return CFileUtil::GetLatestFromSourceControl(filename, parentWindow);
+}
+
+bool CFileUtil_impl::GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow)
+{
+    return CFileUtil::GetFileInfoFromSourceControl(filename, fileInfo, parentWindow);
+}
+
+void CFileUtil_impl::CreateDirectory(const char* dir)
+{
+    CFileUtil::CreateDirectory(dir);
+}
+
+void CFileUtil_impl::BackupFile(const char* filename)
+{
+    CFileUtil::BackupFile(filename);
+}
+
+void CFileUtil_impl::BackupFileDated(const char* filename, bool bUseBackupSubDirectory)
+{
+    CFileUtil::BackupFileDated(filename, bUseBackupSubDirectory);
+}
+
+bool CFileUtil_impl::Deltree(const char* szFolder, bool bRecurse)
+{
+    return CFileUtil::Deltree(szFolder, bRecurse);
+}
+
+bool CFileUtil_impl::Exists(const QString& strPath, bool boDirectory, FileDesc* pDesc)
+{
+    return CFileUtil::Exists(strPath, boDirectory, pDesc);
+}
+
+bool CFileUtil_impl::FileExists(const QString& strFilePath, FileDesc* pDesc)
+{
+    return CFileUtil::FileExists(strFilePath, pDesc);
+}
+
+bool CFileUtil_impl::PathExists(const QString& strPath)
+{
+    return CFileUtil::PathExists(strPath);
+}
+
+bool CFileUtil_impl::GetDiskFileSize(const char* pFilePath, uint64& rOutSize)
+{
+    return CFileUtil::GetDiskFileSize(pFilePath, rOutSize);
+}
+
+bool CFileUtil_impl::IsFileExclusivelyAccessable(const QString& strFilePath)
+{
+    return CFileUtil::IsFileExclusivelyAccessable(strFilePath);
+}
+
+bool CFileUtil_impl::CreatePath(const QString& strPath)
+{
+    return CFileUtil::CreatePath(strPath);
+}
+
+bool CFileUtil_impl::DeleteFile(const QString& strPath)
+{
+    return CFileUtil::DeleteFile(strPath);
+}
+
+bool CFileUtil_impl::RemoveDirectory(const QString& strPath)
+{
+    return CFileUtil::RemoveDirectory(strPath);
+}
+
+IFileUtil::ECopyTreeResult CFileUtil_impl::CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse, bool boConfirmOverwrite)
+{
+    return CFileUtil::CopyTree(strSourceDirectory, strTargetDirectory, boRecurse, boConfirmOverwrite);
+}
+
+IFileUtil::ECopyTreeResult CFileUtil_impl::CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite, ProgressRoutine pfnProgress, bool* pbCancel)
+{
+    return CFileUtil::CopyFile(strSourceFile, strTargetFile, boConfirmOverwrite, pfnProgress, pbCancel);
+}
+
+IFileUtil::ECopyTreeResult CFileUtil_impl::MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse, bool boConfirmOverwrite)
+{
+    return CFileUtil::MoveTree(strSourceDirectory, strTargetDirectory, boRecurse, boConfirmOverwrite);
+}
+
+void CFileUtil_impl::GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase, bool bMakeUnixPath)
+{
+    CFileUtil::GatherAssetFilenamesFromLevel(rOutFilenames, bMakeLowerCase, bMakeUnixPath);
+}
+
+uint32 CFileUtil_impl::GetAttributes(const char* filename, bool bUseSourceControl)
+{
+    return CFileUtil::GetAttributes(filename, bUseSourceControl);
+}
+
+bool CFileUtil_impl::CompareFiles(const QString& strFilePath1, const QString& strFilePath2)
+{
+    return CFileUtil::CompareFiles(strFilePath1, strFilePath2);
+}
+
+QString CFileUtil_impl::GetPath(const QString& path)
+{
+    return Path::GetPath(path);
+}
+
+
diff --git a/Code/Editor/Util/FileUtil_impl.h b/Code/Editor/Util/FileUtil_impl.h
new file mode 100644
index 0000000000..6a1e50f374
--- /dev/null
+++ b/Code/Editor/Util/FileUtil_impl.h
@@ -0,0 +1,133 @@
+/*
+ * 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 "Include/IFileUtil.h"
+
+#ifdef DeleteFile
+#undef DeleteFile
+#endif
+
+#ifdef CreateDirectory
+#undef CreateDirectory
+#endif
+
+#ifdef RemoveDirectory
+#undef RemoveDirectory
+#endif
+
+#ifdef CopyFile
+#undef CopyFile
+#endif
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+class SANDBOX_API CFileUtil_impl
+    : public IFileUtil
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    bool ScanDirectory(const QString& path, const QString& fileSpec, FileArray& files, bool recursive = true, bool addDirAlso = false, ScanDirectoryUpdateCallBack updateCB = nullptr, bool bSkipPaks = false) override;
+
+    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
+    bool CalculateDccFilename(const QString& assetFilename, QString& dccFilename) override;
+
+    //! Reformat filter string for (MFC) CFileDialog style file filtering
+    void FormatFilterString(QString& filter) override;
+
+    bool SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName) override;
+
+    //! Attempt to make a file writable
+    bool OverwriteFile(const QString& filename) override;
+
+    //! Checks out the file from source control API.  Blocks until completed
+    bool CheckoutFile(const char* filename, QWidget* parentWindow = nullptr) override;
+
+    //! Discard changes to a file from source control API.  Blocks until completed
+    bool RevertFile(const char* filename, QWidget* parentWindow = nullptr) override;
+
+    //! Renames (moves) a file through the source control API.  Blocks until completed
+    bool RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow = nullptr) override;
+
+    //! Deletes a file using source control API.  Blocks until completed.
+    bool DeleteFromSourceControl(const char* filename, QWidget* parentWindow = nullptr) override;
+
+    //! Attempts to get the latest version of a file from source control.  Blocks until completed
+    bool GetLatestFromSourceControl(const char* filename, QWidget* parentWindow = nullptr) override;
+
+    //! Gather information about a file using the source control API.  Blocks until completed
+    bool GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow = nullptr) override;
+
+    //! Creates this directory.
+    void CreateDirectory(const char* dir) override;
+
+    //! Makes a backup file.
+    void BackupFile(const char* filename) override;
+
+    //! Makes a backup file, marked with a datestamp, e.g. myfile.20071014.093320.xml
+    //! If bUseBackupSubDirectory is true, moves backup file into a relative subdirectory "backups"
+    void BackupFileDated(const char* filename, bool bUseBackupSubDirectory = false) override;
+
+    // ! Added deltree as a copy from the function found in Crypak.
+    bool Deltree(const char* szFolder, bool bRecurse) override;
+
+    // Checks if a file or directory exist.
+    // We are using 3 functions here in order to make the names more instructive for the programmers.
+    // Those functions only work for OS files and directories.
+    bool Exists(const QString& strPath, bool boDirectory, FileDesc* pDesc = nullptr) override;
+    bool FileExists(const QString& strFilePath, FileDesc* pDesc = nullptr) override;
+    bool PathExists(const QString& strPath) override;
+    bool GetDiskFileSize(const char* pFilePath, uint64& rOutSize) override;
+
+    // This function should be used only with physical files.
+    bool IsFileExclusivelyAccessable(const QString& strFilePath) override;
+
+    // Creates the entire path, if needed.
+    bool CreatePath(const QString& strPath) override;
+
+    // Attempts to delete a file (if read only it will set its attributes to normal first).
+    bool DeleteFile(const QString& strPath) override;
+
+    // Attempts to remove a directory (if read only it will set its attributes to normal first).
+    bool RemoveDirectory(const QString& strPath) override;
+
+    // Copies all the elements from the source directory to the target directory.
+    // It doesn't copy the source folder to the target folder, only it's contents.
+    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
+    ECopyTreeResult CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) override;
+
+    //////////////////////////////////////////////////////////////////////////
+    // @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
+    // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
+    ECopyTreeResult CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = NULL, bool* pbCancel = NULL) override;
+
+    // As we don't have a FileUtil interface here, we have to duplicate some code :-( in order to keep
+    // function calls clean.
+    // Moves all the elements from the source directory to the target directory.
+    // It doesn't move the source folder to the target folder, only it's contents.
+    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
+    ECopyTreeResult MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) override;
+
+    void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false) override;
+
+    // Get file attributes include source control attributes if available
+    uint32 GetAttributes(const char* filename, bool bUseSourceControl = true) override;
+
+    // Returns true if the files have the same content, false otherwise
+    bool CompareFiles(const QString& strFilePath1, const QString& strFilePath2) override;
+
+    // Extract path from full specified file path.
+    QString GetPath(const QString& path) override;
+};
+
diff --git a/Code/Editor/Util/GdiUtil.cpp b/Code/Editor/Util/GdiUtil.cpp
new file mode 100644
index 0000000000..a9d9208dba
--- /dev/null
+++ b/Code/Editor/Util/GdiUtil.cpp
@@ -0,0 +1,219 @@
+/*
+ * 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 "GdiUtil.h"
+
+// Qt
+#include <QPainter>
+#include <QMessageBox>
+
+bool ComputeThumbsLayoutInfo(float aContainerWidth, float aThumbWidth, float aMargin, UINT aThumbCount, UINT& rThumbsPerRow, float& rNewMargin)
+{
+    rThumbsPerRow = 0;
+    rNewMargin = 0;
+
+    if (aThumbWidth <= 0 || aMargin <= 0 || (aThumbWidth + aMargin * 2) <= 0)
+    {
+        return false;
+    }
+
+    if (aContainerWidth <= 0)
+    {
+        return true;
+    }
+
+    rThumbsPerRow = (int) aContainerWidth / (aThumbWidth + aMargin * 2);
+
+    if ((aThumbWidth + aMargin * 2) * aThumbCount < aContainerWidth)
+    {
+        rNewMargin = aMargin;
+    }
+    else
+    {
+        if (rThumbsPerRow > 0)
+        {
+            rNewMargin = (aContainerWidth - rThumbsPerRow * aThumbWidth);
+
+            if (rNewMargin > 0)
+            {
+                rNewMargin = (float)rNewMargin / rThumbsPerRow / 2.0f;
+            }
+        }
+    }
+
+    return true;
+}
+
+QColor ScaleColor(const QColor& c, float aScale)
+{
+    QColor aColor = c;
+    if (!aColor.isValid())
+    {
+        // help out scaling, by starting at very low black
+        aColor = QColor(1, 1, 1);
+    }
+
+    int r = aColor.red();
+    int g = aColor.green();
+    int b = aColor.blue();
+
+    r *= aScale;
+    g *= aScale;
+    b *= aScale;
+
+    return QColor(CLAMP(r, 0, 255), CLAMP(g, 0, 255), CLAMP(b, 0, 255));
+}
+
+CAlphaBitmap::CAlphaBitmap()
+{
+    m_width = m_height = 0;
+}
+
+CAlphaBitmap::~CAlphaBitmap()
+{
+    Free();
+}
+
+bool CAlphaBitmap::Create(void* pData, UINT aWidth, UINT aHeight, bool bVerticalFlip, bool bPremultiplyAlpha)
+{
+    if (!aWidth || !aHeight)
+    {
+        return false;
+    }
+
+    m_bmp = QImage(aWidth, aHeight, QImage::Format_RGBA8888);
+    if (m_bmp.isNull())
+    {
+        return false;
+    }
+
+    std::vector<UINT> vBuffer;
+
+    if (pData)
+    {
+        // copy over the raw 32bpp data
+        bVerticalFlip = !bVerticalFlip; // in Qt, the flip is not required. Still, keep the API behaving the same
+        if (bVerticalFlip)
+        {
+            UINT nBufLen = aWidth * aHeight;
+            vBuffer.resize(nBufLen);
+
+            if (IsBadReadPtr(pData, nBufLen * 4))
+            {
+                //TODO: remove after testing alot the browser, it doesnt happen anymore
+                QMessageBox::critical(QApplication::activeWindow(), QString(), QObject::tr("Bad image data ptr!"));
+                Free();
+                return false;
+            }
+
+            assert(!vBuffer.empty());
+
+            if (vBuffer.empty())
+            {
+                Free();
+                return false;
+            }
+
+            UINT scanlineSize = aWidth * 4;
+
+            for (UINT i = 0, iCount = aHeight; i < iCount; ++i)
+            {
+                // top scanline position
+                UINT* pTopScanPos = (UINT*)&vBuffer[0] + i * aWidth;
+                // bottom scanline position
+                UINT* pBottomScanPos = (UINT*)pData + (aHeight - i - 1) * aWidth;
+
+                // save a scanline from top
+                memcpy(pTopScanPos, pBottomScanPos, scanlineSize);
+            }
+
+            pData = &vBuffer[0];
+        }
+
+        // premultiply alpha, AlphaBlend GDI expects it
+        if (bPremultiplyAlpha)
+        {
+            for (UINT y = 0; y < aHeight; ++y)
+            {
+                BYTE* pPixel = (BYTE*) pData + aWidth * 4 * y;
+
+                for (UINT x = 0; x < aWidth; ++x)
+                {
+                    pPixel[0] = ((int)pPixel[0] * pPixel[3] + 127) >> 8;
+                    pPixel[1] = ((int)pPixel[1] * pPixel[3] + 127) >> 8;
+                    pPixel[2] = ((int)pPixel[2] * pPixel[3] + 127) >> 8;
+                    pPixel += 4;
+                }
+            }
+        }
+
+        memcpy(m_bmp.bits(), pData, aWidth * aHeight * 4);
+
+        if (m_bmp.isNull())
+        {
+            return false;
+        }
+    }
+    else
+    {
+        m_bmp.fill(Qt::transparent);
+    }
+
+    // we dont need this screen DC anymore
+    m_width = aWidth;
+    m_height = aHeight;
+
+    return true;
+}
+
+QImage& CAlphaBitmap::GetBitmap()
+{
+    return m_bmp;
+}
+
+void CAlphaBitmap::Free()
+{
+
+}
+
+UINT CAlphaBitmap::GetWidth()
+{
+    return m_width;
+}
+
+UINT CAlphaBitmap::GetHeight()
+{
+    return m_height;
+}
+
+void CheckerboardFillRect(QPainter* pGraphics, const QRect& rRect, int checkDiameter, const QColor& aColor1, const QColor& aColor2)
+{
+    pGraphics->save();
+    pGraphics->setClipRect(rRect);
+    // Create a checkerboard background for easier readability
+    pGraphics->fillRect(rRect, aColor1);
+    QBrush lightBrush(aColor2);
+
+    // QRect bottom/right methods are short one unit for legacy reasons. Compute bottomr/right of the rectange ourselves to get the full size.
+    const int rectRight = rRect.x() + rRect.width();
+    const int rectBottom = rRect.y() + rRect.height();
+
+    for (int i = rRect.left(); i < rectRight; i += checkDiameter)
+    {
+        for (int j = rRect.top(); j < rectBottom; j += checkDiameter)
+        {
+            if ((i / checkDiameter) % 2 ^ (j / checkDiameter) % 2)
+            {
+                pGraphics->fillRect(QRect(i, j, checkDiameter, checkDiameter), lightBrush);
+            }
+        }
+    }
+    pGraphics->restore();
+}
diff --git a/Code/Editor/Util/GdiUtil.h b/Code/Editor/Util/GdiUtil.h
new file mode 100644
index 0000000000..89f107f9a8
--- /dev/null
+++ b/Code/Editor/Util/GdiUtil.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
+ *
+ */
+
+
+// Description : Utilitarian classes for double buffer GDI rendering and 32bit bitmaps
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_GDIUTIL_H
+#define CRYINCLUDE_EDITOR_UTIL_GDIUTIL_H
+#pragma once
+
+//! function used to compute thumbs per row and spacing, used in asset browser and other tools where thumb layout is needed and maybe GDI canvas used
+//! \param aContainerWidth the thumbs' container width
+//! \param aThumbWidth the thumb image width
+//! \param aMargin the thumb default minimum horizontal margin
+//! \param aThumbCount the thumb count
+//! \param rThumbsPerRow returned thumb count per single row
+//! \param rNewMargin returned new computed margin between thumbs
+//! \note The margin between thumbs will grow/shrink dynamically to keep up with the thumb count per row
+bool ComputeThumbsLayoutInfo(float aContainerWidth, float aThumbWidth, float aMargin, UINT aThumbCount, UINT& rThumbsPerRow, float& rNewMargin);
+
+QColor ScaleColor(const QColor& coor, float aScale);
+
+//! This class loads alpha-channel bitmaps and holds a DC for use with AlphaBlend function
+class CRYEDIT_API CAlphaBitmap
+{
+public:
+
+    CAlphaBitmap();
+    ~CAlphaBitmap();
+
+    //! creates the bitmap from raw 32bpp data
+    //! \param pData the 32bpp raw image data, RGBA, can be NULL and it would create just an empty bitmap
+    //! \param aWidth the bitmap width
+    //! \param aHeight the bitmap height
+    bool            Create(void* pData, UINT aWidth, UINT aHeight, bool bVerticalFlip = false, bool bPremultiplyAlpha = false);
+    //! \return the actual bitmap
+    QImage&    GetBitmap();
+    //! free the bitmap and DC
+    void            Free();
+    //! \return bitmap width
+    UINT            GetWidth();
+    //! \return bitmap height
+    UINT            GetHeight();
+
+protected:
+
+    QImage m_bmp;
+    UINT        m_width, m_height;
+};
+
+//! Fill a rectangle with a checkerboard pattern.
+//! \param pGraphics The Graphics object used for drawing
+//! \param rRect The rectangle to be filled
+//! \param checkDiameter the diameter of the check squares
+//! \param aColor1 the color that starts in the top left corner check square
+//! \param aColor2 the second color used for check squares
+void CheckerboardFillRect(QPainter* pGraphics, const QRect& rRect, int checkDiameter, const QColor& aColor1, const QColor& aColor2);
+#endif // CRYINCLUDE_EDITOR_UTIL_GDIUTIL_H
diff --git a/Code/Editor/Util/GeometryUtil.cpp b/Code/Editor/Util/GeometryUtil.cpp
new file mode 100644
index 0000000000..21ef4adc98
--- /dev/null
+++ b/Code/Editor/Util/GeometryUtil.cpp
@@ -0,0 +1,315 @@
+/*
+ * 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 "GeometryUtil.h"
+
+#if 0
+struct SPointSorter
+{
+    SPointSorter(const Vec3& pt)
+        : pt(pt) {}
+    bool operator()(const Vec3& lhs, const Vec3& rhs)
+    {
+        float isLeft = IsLeft(pt, lhs, rhs);
+        if (isLeft > 0.0f)
+        {
+            return true;
+        }
+        else if (isLeft < 0.0f)
+        {
+            return false;
+        }
+        else
+        {
+            return (lhs - pt).GetLengthSquared2D() < (rhs - pt).GetLengthSquared2D();
+        }
+    }
+    const Vec3 pt;
+};
+
+//===================================================================
+// ConvexHull2D
+// Implements Graham's scan
+//===================================================================
+void ConvexHull2DGraham(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn)
+{
+    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_AI);
+    const unsigned nPtsIn = ptsIn.size();
+    if (nPtsIn < 3)
+    {
+        ptsOut = ptsIn;
+        return;
+    }
+    unsigned iBotRight = 0;
+    for (unsigned iPt = 1; iPt < nPtsIn; ++iPt)
+    {
+        if (ptsIn[iPt].y < ptsIn[iBotRight].y)
+        {
+            iBotRight = iPt;
+        }
+        else if (ptsIn[iPt].y == ptsIn[iBotRight].y && ptsIn[iPt].x < ptsIn[iBotRight].x)
+        {
+            iBotRight = iPt;
+        }
+    }
+
+    static std::vector<Vec3> ptsSorted; // avoid memory allocation
+    ptsSorted.assign(ptsIn.begin(), ptsIn.end());
+
+    std::swap(ptsSorted[0], ptsSorted[iBotRight]);
+    {
+        FRAME_PROFILER("SORT Graham", gEnv->pSystem, PROFILE_AI)
+        std::sort(ptsSorted.begin() + 1, ptsSorted.end(), SPointSorter(ptsSorted[0]));
+    }
+    ptsSorted.erase(std::unique(ptsSorted.begin(), ptsSorted.end(), ptEqual), ptsSorted.end());
+
+    const unsigned nPtsSorted = ptsSorted.size();
+    if (nPtsSorted < 3)
+    {
+        ptsOut = ptsSorted;
+        return;
+    }
+
+    ptsOut.resize(0);
+    ptsOut.push_back(ptsSorted[0]);
+    ptsOut.push_back(ptsSorted[1]);
+    unsigned int i = 2;
+    while (i < nPtsSorted)
+    {
+        if (ptsOut.size() <= 1)
+        {
+            AIWarning("Badness in ConvexHull2D");
+            AILogComment("i = %d ptsIn = ", i);
+            for (unsigned j = 0; j < ptsIn.size(); ++j)
+            {
+                AILogComment("%6.3f, %6.3f, %6.3f", ptsIn[j].x, ptsIn[j].y, ptsIn[j].z);
+            }
+            AILogComment("ptsSorted = ");
+            for (unsigned j = 0; j < ptsSorted.size(); ++j)
+            {
+                AILogComment("%6.3f, %6.3f, %6.3f", ptsSorted[j].x, ptsSorted[j].y, ptsSorted[j].z);
+            }
+            ptsOut.resize(0);
+            return;
+        }
+        const Vec3& pt1 = ptsOut[ptsOut.size() - 1];
+        const Vec3& pt2 = ptsOut[ptsOut.size() - 2];
+        const Vec3& p = ptsSorted[i];
+        float isLeft = IsLeft(pt2, pt1, p);
+        if (isLeft > 0.0f)
+        {
+            ptsOut.push_back(p);
+            ++i;
+        }
+        else if (isLeft < 0.0f)
+        {
+            ptsOut.pop_back();
+        }
+        else
+        {
+            ptsOut.pop_back();
+            ptsOut.push_back(p);
+            ++i;
+        }
+    }
+}
+#endif
+
+//===================================================================
+// IsLeft: tests if a point is Left|On|Right of an infinite line.
+//    Input:  three points P0, P1, and P2
+//    Return: >0 for P2 left of the line through P0 and P1
+//            =0 for P2 on the line
+//            <0 for P2 right of the line
+//===================================================================
+inline float IsLeft(Vec3 P0, Vec3 P1, const Vec3& P2)
+{
+    bool swap = false;
+    if (P0.x < P1.x)
+    {
+        swap = true;
+    }
+    else if (P0.x == P1.x && P0.y < P1.y)
+    {
+        swap = true;
+    }
+
+    if (swap)
+    {
+        std::swap(P0, P1);
+    }
+
+    float res = (P1.x - P0.x) * (P2.y - P0.y) - (P2.x - P0.x) * (P1.y - P0.y);
+    const float tol = 0.0000f;
+    if (res > tol || res < -tol)
+    {
+        return swap ? -res : res;
+    }
+    else
+    {
+        return 0.0f;
+    }
+}
+
+inline bool ptEqual(const Vec3& lhs, const Vec3& rhs)
+{
+    const float tol = 0.01f;
+    return (fabs(lhs.x - rhs.x) < tol) && (fabs(lhs.y - rhs.y) < tol);
+}
+
+inline float IsLeftAndrew(const Vec3& p0, const Vec3& p1, const Vec3& p2)
+{
+    return (p1.x - p0.x) * (p2.y - p0.y) - (p2.x - p0.x) * (p1.y - p0.y);
+}
+
+inline bool PointSorterAndrew(const Vec3& lhs, const Vec3& rhs)
+{
+    if (lhs.x < rhs.x)
+    {
+        return true;
+    }
+    if (lhs.x > rhs.x)
+    {
+        return false;
+    }
+    return lhs.y < rhs.y;
+}
+
+//===================================================================
+// ConvexHull2D
+// Implements Andrew's algorithm
+//
+// Copyright 2001, softSurfer (www.softsurfer.com)
+// This code may be freely used and modified for any purpose
+// providing that this copyright notice is included with it.
+// SoftSurfer makes no warranty for this code, and cannot be held
+// liable for any real or imagined damage resulting from its use.
+// Users of this code must verify correctness for their application.
+//===================================================================
+SANDBOX_API void ConvexHull2DAndrew(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn)
+{
+    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_AI);
+    const int n = (int)ptsIn.size();
+    if (n < 3)
+    {
+        ptsOut = ptsIn;
+        return;
+    }
+
+    std::vector<Vec3> P = ptsIn;
+    {
+        FRAME_PROFILER("SORT Andrew", gEnv->pSystem, PROFILE_AI)
+        std::sort(P.begin(), P.end(), PointSorterAndrew);
+    }
+
+    // the output array ptsOut[] will be used as the stack
+    int i;
+
+    ptsOut.clear();
+    ptsOut.reserve(P.size());
+
+    // Get the indices of points with min x-coord and min|max y-coord
+    int minmin = 0, minmax;
+    float xmin = P[0].x;
+    for (i = 1; i < n; i++)
+    {
+        if (P[i].x != xmin)
+        {
+            break;
+        }
+    }
+
+    minmax = i - 1;
+    if (minmax == n - 1)
+    {
+        // degenerate case: all x-coords == xmin
+        ptsOut.push_back(P[minmin]);
+        if (P[minmax].y != P[minmin].y) // a nontrivial segment
+        {
+            ptsOut.push_back(P[minmax]);
+        }
+        ptsOut.push_back(P[minmin]);           // add polygon endpoint
+        return;
+    }
+
+    // Get the indices of points with max x-coord and min|max y-coord
+    int maxmin, maxmax = n - 1;
+    float xmax = P[n - 1].x;
+    for (i = n - 2; i >= 0; i--)
+    {
+        if (P[i].x != xmax)
+        {
+            break;
+        }
+    }
+    maxmin = i + 1;
+
+    // Compute the lower hull on the stack H
+    ptsOut.push_back(P[minmin]);      // push minmin point onto stack
+    i = minmax;
+    while (++i <= maxmin)
+    {
+        // the lower line joins P[minmin] with P[maxmin]
+        if (IsLeftAndrew(P[minmin], P[maxmin], P[i]) >= 0 && i < maxmin)
+        {
+            continue;          // ignore P[i] above or on the lower line
+        }
+        while ((int)ptsOut.size() > 1) // there are at least 2 points on the stack
+        {
+            // test if P[i] is left of the line at the stack top
+            if (IsLeftAndrew(ptsOut[ptsOut.size() - 2], ptsOut.back(), P[i]) > 0)
+            {
+                break;         // P[i] is a new hull vertex
+            }
+            else
+            {
+                ptsOut.pop_back(); // pop top point off stack
+            }
+        }
+        ptsOut.push_back(P[i]);       // push P[i] onto stack
+    }
+
+    // Next, compute the upper hull on the stack H above the bottom hull
+    if (maxmax != maxmin)      // if distinct xmax points
+    {
+        ptsOut.push_back(P[maxmax]);  // push maxmax point onto stack
+    }
+    int bot = (int)ptsOut.size() - 1;                 // the bottom point of the upper hull stack
+    i = maxmin;
+    while (--i >= minmax)
+    {
+        // the upper line joins P[maxmax] with P[minmax]
+        if (IsLeftAndrew(P[maxmax], P[minmax], P[i]) >= 0 && i > minmax)
+        {
+            continue;          // ignore P[i] below or on the upper line
+        }
+        while ((int)ptsOut.size() > bot + 1)    // at least 2 points on the upper stack
+        {
+            // test if P[i] is left of the line at the stack top
+            if (IsLeftAndrew(ptsOut[ptsOut.size() - 2], ptsOut.back(), P[i]) > 0)
+            {
+                break;         // P[i] is a new hull vertex
+            }
+            else
+            {
+                ptsOut.pop_back();         // pop top po2int off stack
+            }
+        }
+        ptsOut.push_back(P[i]);       // push P[i] onto stack
+    }
+    if (minmax != minmin)
+    {
+        ptsOut.push_back(P[minmin]);  // push joining endpoint onto stack
+    }
+    if (!ptsOut.empty() && ptEqual(ptsOut.front(), ptsOut.back()))
+    {
+        ptsOut.pop_back();
+    }
+}
diff --git a/Code/Editor/Util/GeometryUtil.h b/Code/Editor/Util/GeometryUtil.h
new file mode 100644
index 0000000000..a680243ab4
--- /dev/null
+++ b/Code/Editor/Util/GeometryUtil.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Geometry utilities
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_GEOMETRYUTIL_H
+#define CRYINCLUDE_EDITOR_UTIL_GEOMETRYUTIL_H
+#pragma once
+void ConvexHull2DGraham(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn);
+//! Generates 2D convex hull from ptsIn using Andrew's algorithm.
+SANDBOX_API void ConvexHull2DAndrew(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn);
+
+//! Generates 2D convex hull from ptsIn
+inline void ConvexHull2D(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn)
+{
+    // [Mikko] Note: The convex hull calculation is bound by the sorting.
+    // The sort in Andrew's seems to be about 3-4x faster than Graham's--using Andrew's for now.
+    ConvexHull2DAndrew(ptsOut, ptsIn);
+}
+#endif // CRYINCLUDE_EDITOR_UTIL_GEOMETRYUTIL_H
diff --git a/Code/Editor/Util/GuidUtil.cpp b/Code/Editor/Util/GuidUtil.cpp
new file mode 100644
index 0000000000..2b3237125d
--- /dev/null
+++ b/Code/Editor/Util/GuidUtil.cpp
@@ -0,0 +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
+ *
+ */
+
+
+#include "EditorDefs.h"
+
+#include "GuidUtil.h"
+
+//////////////////////////////////////////////////////////////////////////
+const GUID GuidUtil::NullGuid = {
+    0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }
+};
diff --git a/Code/Editor/Util/GuidUtil.h b/Code/Editor/Util/GuidUtil.h
new file mode 100644
index 0000000000..e88dfe1854
--- /dev/null
+++ b/Code/Editor/Util/GuidUtil.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
+ *
+ */
+
+
+// Description : Utility functions to work with GUIDs.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_GUIDUTIL_H
+#define CRYINCLUDE_EDITOR_UTIL_GUIDUTIL_H
+#pragma once
+
+#include "AzCore/Math/Uuid.h"
+
+struct GuidUtil
+{
+    //! Convert GUID to string in the valid format.
+    //! The valid format for a GUID is {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} where X is a hex digit.
+    static const char* ToString(REFGUID guid);
+    //! Convert from guid string in valid format to GUID class.
+    static GUID FromString(const char* guidString);
+    static bool IsEmpty(REFGUID guid);
+
+    static const GUID NullGuid;
+};
+
+/** Used to compare GUID keys.
+*/
+struct guid_less_predicate
+{
+    bool operator()(REFGUID guid1, REFGUID guid2) const
+    {
+        return memcmp(&guid1, &guid2, sizeof(GUID)) < 0;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+inline bool GuidUtil::IsEmpty(REFGUID guid)
+{
+    return guid == NullGuid;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline const char* GuidUtil::ToString(REFGUID guid)
+{
+    static char guidString[64];
+    sprintf_s(guidString, "{%.8X-%.4X-%.4X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X}", guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1],
+        guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
+    return guidString;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline GUID GuidUtil::FromString(const char* guidString)
+{
+    GUID guid;
+    unsigned int d[8];
+    memset(&d, 0, sizeof(guid));
+    guid.Data1 = 0;
+    guid.Data2 = 0;
+    guid.Data3 = 0;
+    azsscanf(guidString, "{%8" SCNx32 "-%4hX-%4hX-%2X%2X-%2X%2X%2X%2X%2X%2X}",
+        &guid.Data1, &guid.Data2, &guid.Data3, &d[0], &d[1], &d[2], &d[3], &d[4], &d[5], &d[6], &d[7]);
+    guid.Data4[0] = d[0];
+    guid.Data4[1] = d[1];
+    guid.Data4[2] = d[2];
+    guid.Data4[3] = d[3];
+    guid.Data4[4] = d[4];
+    guid.Data4[5] = d[5];
+    guid.Data4[6] = d[6];
+    guid.Data4[7] = d[7];
+
+    return guid;
+}
+
+#endif // CRYINCLUDE_EDITOR_UTIL_GUIDUTIL_H
diff --git a/Code/Editor/Util/IObservable.h b/Code/Editor/Util/IObservable.h
new file mode 100644
index 0000000000..9ce69a6151
--- /dev/null
+++ b/Code/Editor/Util/IObservable.h
@@ -0,0 +1,19 @@
+/*
+ * 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 : Handy macro when working with observers in interfaces
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_IOBSERVABLE_H
+#define CRYINCLUDE_EDITOR_UTIL_IOBSERVABLE_H
+#pragma once
+#define DEFINE_OBSERVABLE_PURE_METHODS(observerClassName)               \
+    virtual bool RegisterObserver(observerClassName * pObserver) = 0;   \
+    virtual bool UnregisterObserver(observerClassName * pObserver) = 0; \
+    virtual void UnregisterAllObservers() = 0;
+#endif // CRYINCLUDE_EDITOR_UTIL_IOBSERVABLE_H
diff --git a/Code/Editor/Util/IXmlHistoryManager.h b/Code/Editor/Util/IXmlHistoryManager.h
new file mode 100644
index 0000000000..3e22d8fa09
--- /dev/null
+++ b/Code/Editor/Util/IXmlHistoryManager.h
@@ -0,0 +1,72 @@
+/*
+ * 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_IXMLHISTORYMANAGER_H
+#define CRYINCLUDE_EDITOR_UTIL_IXMLHISTORYMANAGER_H
+#pragma once
+
+
+// Helper class to handle Redo/Undo on set of Xml nodes
+struct IXmlUndoEventHandler
+{
+    virtual bool SaveToXml(XmlNodeRef& xmlNode) = 0;
+    virtual bool LoadFromXml(const XmlNodeRef& xmlNode) = 0;
+    virtual bool ReloadFromXml(const XmlNodeRef& xmlNode) = 0;
+};
+
+struct IXmlHistoryEventListener
+{
+    enum EHistoryEventType
+    {
+        eHET_HistoryDeleted,
+        eHET_HistoryCleared,
+        eHET_HistorySaved,
+
+        eHET_VersionChanged,
+        eHET_VersionAdded,
+
+        eHET_HistoryInvalidate,
+
+        eHET_HistoryGroupChanged,
+        eHET_HistoryGroupAdded,
+        eHET_HistoryGroupRemoved,
+    };
+    virtual void OnEvent(EHistoryEventType event, void* pData = NULL) = 0;
+};
+
+struct IXmlHistoryView
+{
+    virtual bool LoadXml(int typeId, const XmlNodeRef& xmlNode, IXmlUndoEventHandler*& pUndoEventHandler, uint32 userindex) = 0;
+    virtual void UnloadXml(int typeId) = 0;
+};
+
+struct IXmlHistoryManager
+{
+    // Undo/Redo
+    virtual bool Undo() = 0;
+    virtual bool Redo() = 0;
+    virtual bool Goto(int historyNum) = 0;
+    virtual void RecordUndo(IXmlUndoEventHandler* pEventHandler, const char* desc) = 0;
+    virtual void UndoEventHandlerDestroyed(IXmlUndoEventHandler* pEventHandler, uint32 typeId = 0, bool destoryForever = false) = 0;
+    virtual void RestoreUndoEventHandler(IXmlUndoEventHandler* pEventHandler, uint32 typeId) = 0;
+
+    virtual void RegisterEventListener(IXmlHistoryEventListener* pEventListener) = 0;
+    virtual void UnregisterEventListener(IXmlHistoryEventListener* pEventListener) = 0;
+
+    // History
+    virtual void ClearHistory(bool flagAsSaved = false) = 0;
+    virtual int GetVersionCount() const = 0;
+    virtual const string& GetVersionDesc(int number) const = 0;
+    virtual int GetCurrentVersionNumber() const = 0;
+
+    // Views
+    virtual void RegisterView(IXmlHistoryView* pView) = 0;
+    virtual void UnregisterView(IXmlHistoryView* pView) = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_IXMLHISTORYMANAGER_H
diff --git a/Code/Editor/Util/Image.cpp b/Code/Editor/Util/Image.cpp
new file mode 100644
index 0000000000..7767fb70d7
--- /dev/null
+++ b/Code/Editor/Util/Image.cpp
@@ -0,0 +1,104 @@
+/*
+ * 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 : Image implementation,
+
+
+#include "EditorDefs.h"
+
+#include "Image.h"
+
+
+bool CImageEx::ConvertToFloatImage(CFloatImage& dstImage)
+{
+    uint32 pixelMask;
+    float intToFloat;
+
+    switch (GetFormat())
+    {
+    case eTF_Unknown:
+    case eTF_R8G8B8A8:
+        pixelMask = std::numeric_limits<uint8>::max();
+        intToFloat = static_cast<float>(pixelMask);
+        break;
+    case eTF_R16G16:
+        pixelMask = std::numeric_limits<uint16>::max();
+        intToFloat = static_cast<float>(pixelMask);
+        break;
+    default:
+        return false;
+        break;
+    }
+
+    dstImage.Allocate(GetWidth(), GetHeight());
+
+    uint32* srcPixel = GetData();
+    float* dstPixel = dstImage.GetData();
+
+    for (int pixel = 0; pixel < (GetHeight() * GetWidth()); pixel++)
+    {
+        dstPixel[pixel] = clamp_tpl(static_cast<float>(srcPixel[pixel] & pixelMask) / intToFloat, 0.0f, 1.0f);
+    }
+
+    return true;
+}
+
+void CImageEx::SwapRedAndBlue()
+{
+    if (!IsValid())
+    {
+        return;
+    }
+    // Set the loop pointers
+    uint32* pPixData = GetData();
+    uint32* pPixDataEnd = pPixData + GetWidth() * GetHeight();
+    // Switch R and B
+    while (pPixData != pPixDataEnd)
+    {
+        // Extract the bits, shift them, put them back and advance to the next pixel
+        *pPixData = (*pPixData & 0xFF000000) | ((*pPixData & 0x00FF0000) >> 16) | (*pPixData & 0x0000FF00) | ((*pPixData & 0x000000FF) << 16);
+        ++pPixData;
+    }
+}
+
+void CImageEx::ReverseUpDown()
+{
+    if (!IsValid())
+    {
+        return;
+    }
+
+    uint32* pPixData = GetData();
+    uint32* pReversePix = new uint32[GetWidth() * GetHeight()];
+
+    for (int i = GetHeight() - 1, i2 = 0; i >= 0; i--, i2++)
+    {
+        for (int k = 0; k < GetWidth(); k++)
+        {
+            pReversePix[i2 * GetWidth() + k] = pPixData[i * GetWidth() + k];
+        }
+    }
+
+    Attach(pReversePix, GetWidth(), GetHeight());
+}
+
+void CImageEx::FillAlpha(unsigned char value)
+{
+    if (!IsValid())
+    {
+        return;
+    }
+    // Set the loop pointers
+    uint32* pPixData = GetData();
+    uint32* pPixDataEnd = pPixData + GetWidth() * GetHeight();
+    while (pPixData != pPixDataEnd)
+    {
+        *pPixData = (*pPixData & 0x00FFFFFF) | (value << 24);
+        ++pPixData;
+    }
+}
diff --git a/Code/Editor/Util/Image.h b/Code/Editor/Util/Image.h
new file mode 100644
index 0000000000..d23eefac9d
--- /dev/null
+++ b/Code/Editor/Util/Image.h
@@ -0,0 +1,500 @@
+/*
+ * 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 : Generic image class
+
+
+#include <ITexture.h>
+#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGE_H
+#define CRYINCLUDE_EDITOR_UTIL_IMAGE_H
+#pragma once
+#include "MemoryBlock.h"
+
+
+#include "Util/XmlArchive.h"
+
+enum class ImageRotationDegrees
+{
+    Rotate0,
+    Rotate90,
+    Rotate180,
+    Rotate270
+};
+
+/*!
+ *  Templated image class.
+ */
+
+template <class T>
+class TImage
+{
+public:
+    TImage()
+        : m_data(0)
+        , m_width(0)
+        , m_height(0)
+        , m_bHasAlphaChannel(false)
+        , m_bIsLimitedHDR(false)
+        , m_bIsCubemap(false)
+        , m_bIsSRGB(true)
+        , m_nNumberOfMipmaps(1)
+        , m_format(eTF_Unknown)
+        , m_strDccFilename("")
+    {
+    }
+    virtual ~TImage() {}
+
+    T&  ValueAt(int x, int y) { return m_data[x + y * m_width]; }
+    const T& ValueAt(int x, int y) const { return m_data[x + y * m_width]; }
+
+    const T& ValueAtSafe(int x, int y) const
+    {
+        static T zero = 0;
+        if (0 <= x && x < m_width && 0 <= y && y < m_height)
+        {
+            return m_data[x + y * m_width];
+        }
+        return zero;
+    }
+
+    T*  GetData() const { return m_data; }
+    int GetWidth() const { return m_width; }
+    int GetHeight() const { return m_height; }
+
+    bool                    HasAlphaChannel() const { return m_bHasAlphaChannel; }
+    bool                    IsLimitedHDR() const { return m_bIsLimitedHDR; }
+    bool                    IsCubemap() const { return m_bIsCubemap; }
+    unsigned int  GetNumberOfMipMaps() const { return m_nNumberOfMipmaps; }
+
+    // Returns:
+    //  size in bytes
+    int GetSize() const { return m_width * m_height * sizeof(T); }
+
+    bool IsValid() const { return m_data != 0; }
+
+    void Attach(T* data, int width, int height)
+    {
+        assert(data);
+        m_memory = new CMemoryBlock();
+        m_memory->Attach(data, width * height * sizeof(T));
+        m_data = data;
+        m_width = width;
+        m_height = height;
+        m_strDccFilename = "";
+    }
+    void Attach(const TImage<T>& img)
+    {
+        assert(img.IsValid());
+        m_memory = img.m_memory;
+        m_data = (T*)m_memory->GetBuffer();
+        m_width = img.m_width;
+        m_height = img.m_height;
+        m_strDccFilename = img.m_strDccFilename;
+    }
+    void Detach()
+    {
+        m_memory = 0;
+        m_data = 0;
+        m_width = 0;
+        m_height = 0;
+        m_strDccFilename = "";
+    }
+
+    bool Allocate(int width, int height)
+    {
+        if (width < 1)
+        {
+            width = 1;
+        }
+        if (height < 1)
+        {
+            height = 1;
+        }
+
+        if (m_data && (m_width == width && m_height == height))
+        {
+            return true;
+        }
+
+        // New memory block.
+        m_memory = new CMemoryBlock();
+        m_memory->Allocate(width * height * sizeof(T)); // +width for crash safety.
+        m_data = (T*)m_memory->GetBuffer();
+        m_width = width;
+        m_height = height;
+        if (!m_data)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    void Release()
+    {
+        m_memory = 0;
+        m_data = 0;
+        m_width = 0;
+        m_height = 0;
+        m_strDccFilename = "";
+    }
+
+    // Copy operator.
+    void Copy(const TImage<T>& img)
+    {
+        if (!img.IsValid())
+        {
+            return;
+        }
+        if (m_width != img.GetWidth() || m_height != img.GetHeight())
+        {
+            Allocate(img.GetWidth(), img.GetHeight());
+        }
+        *m_memory = *img.m_memory;
+        m_data = (T*)m_memory->GetBuffer();
+        m_strDccFilename = img.m_strDccFilename;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void Clear()
+    {
+        Fill(0);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void Fill(unsigned char c)
+    {
+        if (IsValid())
+        {
+            memset(GetData(), c, GetSize());
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void GetSubImage(int x1, int y1, int width, int height, TImage<T>& img) const
+    {
+        int size = width * height;
+        img.Allocate(width, height);
+        for (int y = 0; y < height; y++)
+        {
+            for (int x = 0; x < width; x++)
+            {
+                img.ValueAt(x, y) = ValueAtSafe(x1 + x, y1 + y);
+            }
+        }
+    }
+    void SetSubImage(int x1, int y1, const TImage<T>& subImage, float heightOffset, float fClamp)
+    {
+        int width = subImage.GetWidth();
+        int height = subImage.GetHeight();
+        FitSubRect(x1, y1, width, height);
+
+        if (width <= 0 || height <= 0)
+        {
+            return;
+        }
+
+        if (fClamp < 0.0f)
+        {
+            for (int y = 0; y < height; y++)
+            {
+                for (int x = 0; x < width; x++)
+                {
+                    ValueAt(x1 + x, y1 + y) = subImage.ValueAt(x, y) + heightOffset;
+                }
+            }
+        }
+        else
+        {
+            T TClamp = fClamp;
+            for (int y = 0; y < height; y++)
+            {
+                for (int x = 0; x < width; x++)
+                {
+                    ValueAt(x1 + x, y1 + y) = clamp_tpl(f32(subImage.ValueAt(x, y) + heightOffset), 0.0f, f32(TClamp));
+                }
+            }
+        }
+    }
+
+    void SetSubImage(int x1, int y1, const TImage<T>& subImage)
+    {
+        int width = subImage.GetWidth();
+        int height = subImage.GetHeight();
+        FitSubRect(x1, y1, width, height);
+        if (width <= 0 || height <= 0)
+        {
+            return;
+        }
+
+        for (int y = 0; y < height; y++)
+        {
+            for (int x = 0; x < width; x++)
+            {
+                ValueAt(x1 + x, y1 + y) = subImage.ValueAt(x, y);
+            }
+        }
+    }
+
+    void FitSubRect(int& x1, int& y1, int& width, int& height)
+    {
+        if (x1 < 0)
+        {
+            width = width + x1;
+            x1 = 0;
+        }
+        if (y1 < 0)
+        {
+            height = height + y1;
+            y1 = 0;
+        }
+        if (x1 + width > m_width)
+        {
+            width = m_width - x1;
+        }
+        if (y1 + height > m_height)
+        {
+            height = m_height - y1;
+        }
+    }
+
+    //! Compress image to memory block.
+    void Compress(CMemoryBlock& mem) const
+    {
+        assert(IsValid());
+        m_memory->Compress(mem);
+    }
+
+    //! Uncompress image from memory block.
+    bool Uncompress(const CMemoryBlock& mem)
+    {
+        assert(IsValid());
+        // New memory block.
+        _smart_ptr<CMemoryBlock> temp = new CMemoryBlock();
+        mem.Uncompress(*temp);
+        bool bValid = (GetSize() == m_memory->GetSize())
+            || ((GetSize() + m_width * sizeof(T)) == m_memory->GetSize());
+        if (bValid)
+        {
+            m_memory = temp;
+            m_data = (T*)m_memory->GetBuffer();
+        }
+        return bValid;
+        //assert( GetSize() == m_memory.GetSize() );
+    }
+
+    void SetHasAlphaChannel(bool bHasAlphaChannel) { m_bHasAlphaChannel = bHasAlphaChannel; }
+    void SetIsLimitedHDR(bool bIsLimitedHDR) { m_bIsLimitedHDR = bIsLimitedHDR; }
+    void SetIsCubemap(bool bIsCubemap) { m_bIsCubemap = bIsCubemap; }
+    void SetNumberOfMipMaps(unsigned int nNumberOfMips) { m_nNumberOfMipmaps = nNumberOfMips; }
+
+    void Serialize(CXmlArchive& ar);
+
+    void SetFormatDescription(const QString& str) { m_formatDescription = str; };
+    const QString& GetFormatDescription() const { return m_formatDescription; };
+
+    void SetFormat(ETEX_Format format) { m_format = format; }
+    ETEX_Format GetFormat() const { return m_format; }
+
+    void SetSRGB(bool bEnable) { m_bIsSRGB = bEnable; }
+    bool GetSRGB() const { return m_bIsSRGB; }
+
+    void SetDccFilename(const QString& str) { m_strDccFilename = str; };
+    const QString& GetDccFilename() const { return m_strDccFilename; }
+
+    // RotateOrt() - orthonormal image rotation
+    void RotateOrt(const TImage<T>& img, ImageRotationDegrees degrees)
+    {
+        if (!img.IsValid())
+        {
+            return;
+        }
+
+        int width;
+        int height;
+
+        if (degrees == ImageRotationDegrees::Rotate90 || degrees == ImageRotationDegrees::Rotate270)
+        {
+            width = img.GetHeight();
+            height = img.GetWidth();
+        }
+        else
+        {
+            width = img.GetWidth();
+            height = img.GetHeight();
+        }
+
+        if (m_width != width || m_height != height)
+        {
+            Allocate(width, height);
+        }
+
+        for (int y = 0; y < m_height; y++)
+        {
+            for (int x = 0; x < m_width; x++)
+            {
+                if (degrees == ImageRotationDegrees::Rotate90)
+                {
+                    ValueAt(x, y) = img.ValueAt(m_height - y - 1, x);
+                }
+                else if (degrees == ImageRotationDegrees::Rotate180)
+                {
+                    ValueAt(x, y) = img.ValueAt(m_width - x - 1, m_height - y - 1);
+                }
+                else if (degrees == ImageRotationDegrees::Rotate270)
+                {
+                    ValueAt(x, y) = img.ValueAt(y, m_width - x - 1);
+                }
+                else
+                {
+                    ValueAt(x, y) = img.ValueAt(x, y);
+                }
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void ScaleToFit(const TImage<T>& img)
+    {
+        uint32 x, y, u, v;
+        T* destRow, *dest, *src, *sourceRow;
+
+        if (!img.IsValid())
+        {
+            return;
+        }
+
+        const uint32 srcW = img.GetWidth();
+        const uint32 srcH = img.GetHeight();
+
+        const uint32 trgW = GetWidth();
+        const uint32 trgH = GetHeight();
+
+        const uint32 xratio = trgW > 0 ? (srcW << 16) / trgW : 1;
+        const uint32 yratio = trgH > 0 ? (srcH << 16) / trgH : 1;
+
+        src = img.GetData();
+        destRow = GetData();
+
+        v = 0;
+        for (y = 0; y < trgH; y++)
+        {
+            u = 0;
+            sourceRow = src + (v >> 16) * srcW;
+            dest = destRow;
+            for (x = 0; x < trgW; x++)
+            {
+                *dest++ = sourceRow[u >> 16];
+                u += xratio;
+            }
+            v += yratio;
+            destRow += trgW;
+        }
+    }
+
+
+private:
+    // Restrict use of copy constructor.
+    TImage(const TImage<T>& img);
+    TImage<T>& operator=(const TImage<T>& img);
+
+
+    //! Memory holding image data.
+    _smart_ptr<CMemoryBlock> m_memory;
+
+    T*  m_data;
+    int m_width;
+    int m_height;
+    bool m_bHasAlphaChannel;
+    bool m_bIsLimitedHDR;
+    bool m_bIsCubemap;
+    bool m_bIsSRGB;
+    unsigned int m_nNumberOfMipmaps;
+    QString m_formatDescription;
+    QString m_strDccFilename;
+    ETEX_Format m_format;
+};
+
+template <class T>
+void    TImage<T>::Serialize(CXmlArchive& ar)
+{
+    if (ar.bLoading)
+    {
+        // Loading
+        ar.root->getAttr("ImageWidth", m_width);
+        ar.root->getAttr("ImageHeight", m_height);
+        ar.root->getAttr("Mipmaps", m_nNumberOfMipmaps);
+        ar.root->getAttr("IsCubemap", m_bIsCubemap);
+        bool bIsSRGB;
+        if (ar.root->getAttr("IsSRGB", bIsSRGB))
+        {
+            m_bIsSRGB = bIsSRGB;
+        }
+        ar.root->getAttr("dccFilename", m_strDccFilename);
+        int format;
+        if (ar.root->getAttr("format", format))
+        {
+            m_format = (ETEX_Format)format;
+        }
+        else
+        {
+            m_format = eTF_Unknown;
+        }
+        Allocate(m_width, m_height);
+        void* pData = 0;
+        int nDataSize = 0;
+        bool bHaveBlock = ar.pNamedData->GetDataBlock(ar.root->getTag(), pData, nDataSize);
+        if (bHaveBlock && nDataSize == GetSize())
+        {
+            m_data = (T*)pData;
+        }
+    }
+    else
+    {
+        // Saving.
+        ar.root->setAttr("ImageWidth", m_width);
+        ar.root->setAttr("ImageHeight", m_height);
+        ar.root->setAttr("Mipmaps", m_nNumberOfMipmaps);
+        ar.root->setAttr("IsCubemap", m_bIsCubemap);
+        ar.root->setAttr("IsSRGB", m_bIsSRGB);
+        ar.root->setAttr("format", (int)m_format);
+        ar.root->setAttr("dccFilename", m_strDccFilename);
+
+        ar.pNamedData->AddDataBlock(ar.root->getTag(), (void*)m_data, GetSize());
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Define types of most commonly used images.
+//////////////////////////////////////////////////////////////////////////
+typedef TImage<float> CFloatImage;
+typedef TImage<unsigned char> CByteImage;
+typedef TImage<unsigned short> CWordImage;
+
+//////////////////////////////////////////////////////////////////////////
+class CImageEx
+    : public TImage < unsigned int >
+{
+public:
+    CImageEx()
+        : TImage() { m_bGetHistogramEqualization = false; };
+
+    EDITOR_CORE_API bool ConvertToFloatImage(CFloatImage& dstImage);
+
+    EDITOR_CORE_API void SwapRedAndBlue();
+    EDITOR_CORE_API void ReverseUpDown();
+    EDITOR_CORE_API void FillAlpha(unsigned char value = 0xff);
+
+    // request histogram equalization for HDRs
+    void SetHistogramEqualization(bool bHistogramEqualization) { m_bGetHistogramEqualization = bHistogramEqualization; }
+    bool GetHistogramEqualization() { return m_bGetHistogramEqualization; }
+
+private:
+    bool m_bGetHistogramEqualization;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_IMAGE_H
diff --git a/Code/Editor/Util/ImageASC.cpp b/Code/Editor/Util/ImageASC.cpp
new file mode 100644
index 0000000000..1b4c185703
--- /dev/null
+++ b/Code/Editor/Util/ImageASC.cpp
@@ -0,0 +1,190 @@
+/*
+ * 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 "ImageASC.h"
+
+// Editor
+#include "Util/Image.h"
+
+//---------------------------------------------------------------------------
+
+bool CImageASC::Save(const QString& fileName, const CFloatImage& image)
+{
+    // There are two types of ARCGrid file formats - binary (ADF) and ASCII (ASC).
+    // See here:  https://en.wikipedia.org/wiki/Esri_grid
+
+    uint32 width = image.GetWidth();
+    uint32 height = image.GetHeight();
+    float* pixels = image.GetData();
+
+    string fileHeader;
+    fileHeader.Format(
+        // Number of columns and rows in the data
+        "ncols %d\n"
+        "nrows %d\n"
+
+        // The coordinates of the bottom-left corner.
+        // These numbers represent coordinates on a globe, so this choice of values is arbitrary.
+        "xllcorner 0.0\n"
+        "yllcorner 0.0\n"
+
+        // The size of each grid square.
+        // The problem is that cellsize represents the size of a square on a grid being projected onto a globe.
+        // This number can be used to convert size to degrees, based on where on the globe it appears.
+        // We don't have a real-world location associated with our data, so this size choice is arbitrary.
+        "cellsize 0.0003\n"
+
+        // The value used for missing data.  Since we shouldn't have any missing data, we'll choose a value that can't appear below.
+        "nodata_value -1\n"
+        , width, height);
+
+    FILE* file = nullptr;
+    azfopen(&file, fileName.toUtf8().data(), "wt");
+    if (!file)
+    {
+        return false;
+    }
+
+    // First print the file header
+    fprintf(file, fileHeader.c_str());
+
+    // Then print all the pixels.
+    for (int y = 0; y < height; y++)
+    {
+        for (int x = 0; x < width; x++)
+        {
+            fprintf(file, "%.7f ", pixels[x + y * width]);
+        }
+        fprintf(file, "\n");
+    }
+
+    fclose(file);
+    return true;
+}
+
+//---------------------------------------------------------------------------
+
+bool CImageASC::Load(const QString& fileName, CFloatImage& image)
+{
+    FILE* file = nullptr;
+    azfopen(&file, fileName.toUtf8().data(), "rt");
+    if (!file)
+    {
+        return false;
+    }
+
+    const char seps[] = " \r\n\t";
+    char* token;
+
+    int32 width = 0;
+    int32 height = 0;
+    float nodataValue = 0.0f;
+
+    bool validData = true;
+
+    // Read the file into memory
+
+    fseek(file, 0, SEEK_END);
+    int fileSize = ftell(file);
+    fseek(file, 0, SEEK_SET);
+
+    char* str = new char[fileSize];
+    fread(str, fileSize, 1, file);
+
+    // Break all of the values in the file apart into tokens.
+
+    char* nextToken = nullptr;
+    token = azstrtok(str, 0, seps, &nextToken);
+
+    // ncols = grid width
+    validData = validData && (azstricmp(token, "ncols") == 0);
+    token = azstrtok(NULL, 0, seps, &nextToken);
+    width = atoi(token);
+
+    // nrows = grid height
+    token = azstrtok(NULL, 0, seps, &nextToken);
+    validData = validData && (azstricmp(token, "nrows") == 0);
+    token = azstrtok(NULL, 0, seps, &nextToken);
+    height = atoi(token);
+
+    // xllcorner = leftmost coordinate.  (Skip, we don't care about it)
+    token = azstrtok(NULL, 0, seps, &nextToken);
+    validData = validData && (azstricmp(token, "xllcorner") == 0);
+    token = azstrtok(NULL, 0, seps, &nextToken);
+
+    // yllcorner = bottommost coordinate.  (Skip, we don't care about it)
+    token = azstrtok(NULL, 0, seps, &nextToken);
+    validData = validData && (azstricmp(token, "yllcorner") == 0);
+    token = azstrtok(NULL, 0, seps, &nextToken);
+
+    // cellsize = size of each grid cell.  (Skip, we don't care about it)
+    token = azstrtok(NULL, 0, seps, &nextToken);
+    validData = validData && (azstricmp(token, "cellsize") == 0);
+    token = azstrtok(NULL, 0, seps, &nextToken);
+
+    // nodata_value = the value used for missing data.  We'll replace these with 0 height.
+    token = azstrtok(NULL, 0, seps, &nextToken);
+    validData = validData && (azstricmp(token, "nodata_value") == 0);
+    token = azstrtok(NULL, 0, seps, &nextToken);
+    nodataValue = atof(token);
+
+    if (!validData)
+    {
+        // Bad file. not supported asc.
+        delete[]str;
+        fclose(file);
+        return false;
+    }
+
+    image.Allocate(width, height);
+
+    // Read in the pixel data
+
+    float* p = image.GetData();
+    int size = width * height;
+    int i = 0;
+    float pixelValue;
+    float maxPixel = 0.0f;
+    while (token != NULL && i < size)
+    {
+        token = azstrtok(NULL, 0, seps, &nextToken);
+        if (token != NULL)
+        {
+            // Negative heights aren't supported, clamp to 0.
+            pixelValue = max(0.0, atof(token));
+
+            // If this is a location we specifically don't have data for, set it to 0.
+            if (pixelValue == nodataValue)
+            {
+                pixelValue = 0.0f;
+            }
+
+            *p++ = pixelValue;
+            maxPixel = max(maxPixel, pixelValue);
+            i++;
+        }
+    }
+
+    if (maxPixel > 0.0f)
+    {
+        // Scale our range down to 0 - 1
+        float* pp = image.GetData();
+        for (i = 0; i < size; i++)
+        {
+            pp[i] = clamp_tpl(pp[i] / maxPixel, 0.0f, 1.0f);
+        }
+    }
+
+    delete[]str;
+
+    fclose(file);
+
+    return true;
+}
+
diff --git a/Code/Editor/Util/ImageASC.h b/Code/Editor/Util/ImageASC.h
new file mode 100644
index 0000000000..6c28e1b9f8
--- /dev/null
+++ b/Code/Editor/Util/ImageASC.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
+ *
+ */
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEASC_H
+#define CRYINCLUDE_EDITOR_UTIL_IMAGEASC_H
+#pragma once
+
+#include "Util/Image.h"
+
+class SANDBOX_API CImageASC
+{
+public:
+    bool Load(const QString& fileName, CFloatImage& outImage);
+    bool Save(const QString& fileName, const CFloatImage& image);
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEASC_H
diff --git a/Code/Editor/Util/ImageBT.cpp b/Code/Editor/Util/ImageBT.cpp
new file mode 100644
index 0000000000..a351a5c2f1
--- /dev/null
+++ b/Code/Editor/Util/ImageBT.cpp
@@ -0,0 +1,206 @@
+/*
+ * 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 "ImageBT.h"
+
+//---------------------------------------------------------------------------
+// Load and save the VTP Binary Terrain (BT) format, documented here:
+// http://vterrain.org/Implementation/Formats/BT.html
+
+// This structure represents a binary layout in the file.  To direct load & save it, we need to remove all structure memory padding
+#pragma pack(push,1)
+struct BtHeader
+{
+    char headerTag[7];                  // Should be "binterr"
+    char headerTagVersion[3];           // Should be "1.3"
+    int32 columns;                      // # of columns in the heightfield
+    int32 rows;                         // # of rows in the heightfield
+    int16 bytesPerPoint;                // bytes per height value, either 2 for signed ints or 4 for floats
+    int16 isFloatingPointData;          // 1 if height values are floats, 0 for 16-bit signed ints
+    int16 horizUnits;                   // 0 if degrees, 1 if meters, 2 if international feet, 3 if US survey feet
+    int16 utmZone;                      // UTM projection zone 1 to 60 or -1 to -60 (see https://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system )
+    int16 datum;                        // Datum value (6001 to 6094), see http://www.epsg.org/
+    double leftExtent;                  // left coordinate projection of the file
+    double rightExtent;                 // right coordinate projection of the file
+    double bottomExtent;                // bottom coordinate projection of the file
+    double topExtent;                   // top coordinate projection of the file
+    int16 externalProjection;           // 1 if projection is in an external .prj file, 0 if it's contained in the header
+    float scale;                        // vertical units in meters.  0.0 should be treated as 1.0
+    char unused[190];
+};
+#pragma pack(pop)
+
+bool CImageBT::Save(const QString& fileName, const CFloatImage& image)
+{
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+
+    float *pixels = image.GetData();
+
+    // Create a header with reasonable default values.
+    BtHeader header =
+    {
+        {'b', 'i', 'n', 't', 'e', 'r', 'r'},
+        {'1', '.', '3' },
+        width,
+        height,
+        sizeof(float),          // we'll use floats to make sure we can capture the full potential range of heightfield values
+        1,                      // use floats
+        1,                      // units are meters
+        0,                      // no UTM projection zone
+        6326,                   // WGS84 Datum value.  Recommended by VTP as the default if you don't care about Datum values.
+        0.0,                    // set the left extent to 0?
+        double(width),                  // set the right extent to the width? (assumes 1 m per pixel)
+        double(height),                 // set the bottom extent to the height? (assumes 1 m per pixel)
+        0.0,                    // set the top extent to 0?
+        0,                      // no external prj file
+        1.0f
+    };
+
+    memset(header.unused, 0, sizeof(header.unused));
+
+    FILE* file = nullptr;
+    azfopen(&file, fileName.toUtf8().data(), "wb");
+    if (!file)
+    {
+        return false;
+    }
+
+    fwrite(&header, sizeof(header), 1, file);
+    for (int32 y = 0; y < height; y++)
+    {
+        for (int32 x = 0; x < width; x++)
+        {
+            float heightmapValue = pixels[(y * width) + x];
+            fwrite(&heightmapValue, sizeof(float), 1, file);
+        }
+    }
+
+    fclose(file);
+    return true;
+}
+
+//---------------------------------------------------------------------------
+
+bool CImageBT::Load(const QString& fileName, CFloatImage& image)
+{
+    FILE* file = nullptr;
+    azfopen(&file, fileName.toUtf8().data(), "rb");
+    if (!file)
+    {
+        return false;
+    }
+
+    // Get the file size
+
+    fseek(file, 0, SEEK_END);
+    int fileSize = ftell(file);
+    fseek(file, 0, SEEK_SET);
+
+    // Our file needs to be at least as big as the BT file header.
+    if (fileSize < sizeof(BtHeader))
+    {
+        return false;
+    }
+
+    // Get the BT header data
+    BtHeader header;
+    memset(&header, 0, sizeof(BtHeader)); // C4701 potentially uninitialized local variable 'header' used
+    bool validData = true;
+    validData = validData && (fread(&header, sizeof(BtHeader), 1, file) != 0);
+
+    // Do some quick error-checking on the header to make sure it meets our expectations
+
+    // Does the header have the right header tag? (binterr1.0 - binterr1.3)
+    validData = validData && (memcmp(header.headerTag, "binterr", sizeof(header.headerTag)) == 0);
+    validData = validData && (header.headerTagVersion[0] == '1') && (header.headerTagVersion[1] == '.') && (header.headerTagVersion[2] >= '0') && (header.headerTagVersion[2] <= '3');
+
+    // Will the grid fit into a reasonable image size?
+    validData = validData && (header.columns >= 0) && (header.columns < 65536);
+    validData = validData && (header.rows >= 0) && (header.rows < 65536);
+
+    // Do we either have 32-bit floats or 16-bit ints?
+    validData = validData && (((header.isFloatingPointData == 1) && (header.bytesPerPoint == 4)) || ((header.isFloatingPointData == 0) && (header.bytesPerPoint == 2)));
+
+    // Is the remaining data exactly the size needed to fill our image?
+    validData = validData && ((fileSize - sizeof(BtHeader)) == (header.columns * header.rows * header.bytesPerPoint));
+
+    if (!validData)
+    {
+        fclose(file);
+        return false;
+    }
+
+    if (header.scale == 0.0f)
+    {
+        header.scale = 1.0f;
+    }
+
+    // The BT format defines the data as stored in column-first order, from bottom to top.  
+    // However, some BT files store the data in row-first order, from top to bottom.
+    // There isn't anything that clearly specifies which type of file it is.  If you load it the wrong way, 
+    // the data will look like a bunch of wavy stripes.
+    // The only difference I've found in test files is datum values above 8000, which appears to be an invalid value for datum
+    // (it should be 6001-6904 according to the BT definition)
+    const int invalidDatumValueDenotingColumnFirstData = 8000;
+    bool isColumnFirstData = (header.datum >= invalidDatumValueDenotingColumnFirstData) ? true : false;
+    float height = 0.0f;
+    int imageWidth, imageHeight;
+
+    if (isColumnFirstData)
+    {
+        imageWidth = header.rows;
+        imageHeight = header.columns;
+    }
+    else
+    {
+        imageWidth = header.columns;
+        imageHeight = header.rows;
+    }
+
+
+    image.Allocate(imageWidth, imageHeight);
+    float* p = image.GetData();
+    float maxPixel = 0.0f;
+
+    // Read in the pixel data
+    for (int32 y = 0; y < imageHeight; y++)
+    {
+        for (int32 x = 0; x < imageWidth; x++)
+        {
+            if (header.isFloatingPointData)
+            {
+                fread(&height, sizeof(float), 1, file);
+            }
+            else
+            {
+                int16 intHeight = 0;
+                fread(&intHeight, sizeof(int16), 1, file);
+                height = static_cast<float>(intHeight);
+            }
+            // Scale based on what our header defines, and clamp the values to positive range, negatives not supported
+            p[(y * imageWidth) + x] = max((height * header.scale), 0.0f);
+            maxPixel = max(maxPixel, p[(y * imageWidth) + x]);
+        }
+    }
+
+    // Scale our range down to 0 - 1
+    if (maxPixel > 0.0f)
+    {
+        p = image.GetData();
+        for (int32 i = 0; i < (imageWidth * imageHeight); i++)
+        {
+            p[i] = clamp_tpl(p[i] / maxPixel, 0.0f, 1.0f);
+        }
+    }
+
+    fclose(file);
+    return true;
+}
+
diff --git a/Code/Editor/Util/ImageBT.h b/Code/Editor/Util/ImageBT.h
new file mode 100644
index 0000000000..89eea7c029
--- /dev/null
+++ b/Code/Editor/Util/ImageBT.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
+ *
+ */
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEBT_H
+#define CRYINCLUDE_EDITOR_UTIL_IMAGEBT_H
+#pragma once
+
+#include "Util/Image.h"
+
+class SANDBOX_API CImageBT
+{
+public:
+    bool Load(const QString& fileName, CFloatImage& outImage);
+    bool Save(const QString& fileName, const CFloatImage& image);
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEBT_H
diff --git a/Code/Editor/Util/ImageGif.cpp b/Code/Editor/Util/ImageGif.cpp
new file mode 100644
index 0000000000..2fff41e4c8
--- /dev/null
+++ b/Code/Editor/Util/ImageGif.cpp
@@ -0,0 +1,506 @@
+/*
+ * 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 "ImageGif.h"
+
+// Editor
+#include "Util/Image.h"
+
+//---------------------------------------------------------------------------
+
+#define NEXTBYTE      (*ptr++)
+#define IMAGESEP      0x2c
+#define GRAPHIC_EXT   0xf9
+#define PLAINTEXT_EXT 0x01
+#define APPLICATION_EXT 0xff
+#define COMMENT_EXT   0xfe
+#define START_EXTENSION 0x21
+#define INTERLACEMASK 0x40
+#define COLORMAPMASK  0x80
+#define CHK(x) x
+
+#pragma pack(push,1)
+struct SGIFRGBcolor
+{
+    uint8 red, green, blue;
+};
+struct SGIFRGBPixel
+{
+    uint8 red, green, blue, alpha;
+};
+#pragma pack(pop)
+
+static int BitOffset = 0,       /* Bit Offset of next code */
+           XC = 0, YC = 0, /* Output X and Y coords of current pixel */
+           Pass = 0,    /* Used by output routine if interlaced pic */
+           OutCount = 0, /* Decompressor output 'stack count' */
+           RWidth, RHeight, /* screen dimensions */
+           Width, Height, /* image dimensions */
+           LeftOfs, TopOfs, /* image offset */
+           BitsPerPixel, /* Bits per pixel, read from GIF header */
+           BytesPerScanline, /* bytes per scanline in output raster */
+           ColorMapSize, /* number of colors */
+           Background,  /* background color */
+           CodeSize,    /* Code size, read from GIF header */
+           InitCodeSize, /* Starting code size, used during Clear */
+           Code,    /* Value returned by ReadCode */
+           MaxCode,     /* limiting value for current code size */
+           ClearCode,   /* GIF clear code */
+           EOFCode,     /* GIF end-of-information code */
+           CurCode, OldCode, InCode, /* Decompressor variables */
+           FirstFree,   /* First free code, generated per GIF spec */
+           FreeCode,    /* Decompressor, next free slot in hash table*/
+           FinChar,     /* Decompressor variable */
+           BitMask,     /* AND mask for data size */
+           ReadMask;    /* Code AND mask for current code size */
+
+static bool Interlace, HasColormap;
+
+static SGIFRGBPixel* Image;     /* The result array */
+static SGIFRGBcolor* Palette;       /* The palette that is used */
+static uint8* IndexImage;
+
+static uint8* Raster;           /* The raster data stream, unblocked */
+
+static uint8 used[256];
+static int  numused;
+
+const char* id87 = "GIF87a";
+const char* id89 = "GIF89a";
+
+static int   log2 (int);
+
+/* Fetch the next code from the raster data stream.  The codes can be
+ * any length from 3 to 12 bits, packed into 8-bit bytes, so we have to
+ * maintain our location in the Raster array as a BIT Offset.  We compute
+ * the uint8 Offset into the raster array by dividing this by 8, pick up
+ * three bytes, compute the bit Offset into our 24-bit chunk, shift to
+ * bring the desired code to the bottom, then mask it off and return it.
+ */
+inline int ReadCode (void)
+{
+    int RawCode, ByteOffset;
+
+    ByteOffset = BitOffset / 8;
+    RawCode    = Raster[ByteOffset] + (0x100 * Raster[ByteOffset + 1]);
+
+    if (CodeSize >= 8)
+    {
+        RawCode += (0x10000 * Raster[ByteOffset + 2]);
+    }
+
+    RawCode  >>= (BitOffset % 8);
+    BitOffset += CodeSize;
+
+    return RawCode & ReadMask;
+}
+
+inline void AddToPixel (uint8 Index)
+{
+    if (YC < Height)
+    {
+        SGIFRGBPixel* p = Image + YC * BytesPerScanline + XC;
+        p->red = Palette[Index].red;
+        p->green = Palette[Index].green;
+        p->blue = Palette[Index].blue;
+        p->alpha = 0;
+        IndexImage[YC * BytesPerScanline + XC] = Index;
+    }
+
+    if (!used[Index])
+    {
+        used[Index] = 1;
+        numused++;
+    }
+
+    /* Update the X-coordinate, and if it overflows, update the Y-coordinate */
+
+    if (++XC == Width)
+    {
+        /* If a non-interlaced picture, just increment YC to the next scan line.
+         * If it's interlaced, deal with the interlace as described in the GIF
+         * spec.  Put the decoded scan line out to the screen if we haven't gone
+         * past the bottom of it
+         */
+
+        XC = 0;
+        if (!Interlace)
+        {
+            YC++;
+        }
+        else
+        {
+            switch (Pass)
+            {
+            case 0:
+                YC += 8;
+                if (YC >= Height)
+                {
+                    Pass++;
+                    YC = 4;
+                }
+                break;
+            case 1:
+                YC += 8;
+                if (YC >= Height)
+                {
+                    Pass++;
+                    YC = 2;
+                }
+                break;
+            case 2:
+                YC += 4;
+                if (YC >= Height)
+                {
+                    Pass++;
+                    YC = 1;
+                }
+                break;
+            case 3:
+                YC += 2;
+                break;
+            default:
+                break;
+            }
+        }
+    }
+}
+
+bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
+{
+    bool ret = false;
+
+    std::vector<uint8> data;
+    CCryFile file;
+    if (!file.Open(fileName.toUtf8().data(), "rb"))
+    {
+        CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
+        return false;
+    }
+    long filesize = file.GetLength();
+
+    data.resize(filesize);
+    uint8* ptr = &data[0];
+
+    file.ReadRaw(ptr, filesize);
+
+    /* Detect if this is a GIF file */
+    if (strncmp ((char*)ptr, "GIF87a", 6) && strncmp ((char*)ptr, "GIF89a", 6))
+    {
+        CLogFile::FormatLine("Bad GIF file format %s", fileName.toUtf8().data());
+        return false;
+    }
+
+    int                numcols;
+    unsigned  char ch, ch1;
+    uint8* ptr1;
+    int   i;
+    short transparency = -1;
+
+    TImage<uint8> outImageIndex;
+
+    /* The hash table used by the decompressor */
+    int* Prefix;
+    int* Suffix;
+
+    /* An output array used by the decompressor */
+    int* OutCode;
+
+    CHK (Prefix = new int [4096]);
+    CHK (Suffix = new int [4096]);
+    CHK (OutCode = new int [1025]);
+
+    BitOffset = 0;
+    XC = YC = 0;
+    Pass = 0;
+    OutCount = 0;
+
+    Palette = NULL;
+    CHK (Raster = new uint8 [filesize]);
+
+    if (strncmp((char*) ptr, id87, 6))
+    {
+        if (strncmp((char*) ptr, id89, 6))
+        {
+            CLogFile::FormatLine("Bad GIF file format %s",fileName.toUtf8().data());
+            goto cleanup;
+        }
+    }
+
+    ptr += 6;
+
+    /* Get variables from the GIF screen descriptor */
+
+    ch           = NEXTBYTE;
+    RWidth       = ch + 0x100 * NEXTBYTE;     /* screen dimensions... not used. */
+    ch           = NEXTBYTE;
+    RHeight      = ch + 0x100 * NEXTBYTE;
+
+    ch           = NEXTBYTE;
+    HasColormap  = ((ch & COLORMAPMASK) ? true : false);
+
+    BitsPerPixel = (ch & 7) + 1;
+    numcols      = ColorMapSize = 1 << BitsPerPixel;
+    BitMask      = ColorMapSize - 1;
+
+    Background   = NEXTBYTE;            /* background color... not used. */
+
+    if (NEXTBYTE)           /* supposed to be NULL */
+    {
+        CLogFile::FormatLine("Bad GIF file format %s", fileName.toUtf8().data());
+        goto cleanup;
+    }
+
+    /* Read in global colormap. */
+    SGIFRGBcolor mspPal[1024];
+
+    if (HasColormap)
+    {
+        for (i = 0; i < ColorMapSize; i++)
+        {
+            mspPal[i].red = NEXTBYTE;
+            mspPal[i].green = NEXTBYTE;
+            mspPal[i].blue = NEXTBYTE;
+            used[i]  = 0;
+        }
+        Palette = mspPal;
+
+        numused = 0;
+    }     /* else no colormap in GIF file */
+
+    /* look for image separator */
+
+    for (ch = NEXTBYTE; ch != IMAGESEP; ch = NEXTBYTE)
+    {
+        i = ch;
+        if (ch != START_EXTENSION)
+        {
+            CLogFile::FormatLine("Bad GIF file format %s", fileName.toUtf8().data());
+            goto cleanup;
+        }
+
+        /* handle image extensions */
+        switch (ch = NEXTBYTE)
+        {
+        case GRAPHIC_EXT:
+            ch = NEXTBYTE;
+            if (ptr[0] & 0x1)
+            {
+                transparency = ptr[3];       /* transparent color index */
+            }
+            ptr += ch;
+            break;
+        case PLAINTEXT_EXT:
+            break;
+        case APPLICATION_EXT:
+            break;
+        case COMMENT_EXT:
+            break;
+        default:
+        {
+            CLogFile::FormatLine("Invalid GIF89 extension %s", fileName.toUtf8().data());
+            goto cleanup;
+        }
+        }
+
+        ch = NEXTBYTE;
+        while (ch)
+        {
+            ptr += ch;
+            ch = NEXTBYTE;
+        }
+    }
+
+    //if (transparency >= 0)
+    //mfSet_transparency(transparency);
+
+    /* Now read in values from the image descriptor */
+
+    ch        = NEXTBYTE;
+    LeftOfs   = ch + 0x100 * NEXTBYTE;
+    ch        = NEXTBYTE;
+    TopOfs    = ch + 0x100 * NEXTBYTE;
+    ch        = NEXTBYTE;
+    Width     = ch + 0x100 * NEXTBYTE;
+    ch        = NEXTBYTE;
+    Height    = ch + 0x100 * NEXTBYTE;
+    Interlace = ((NEXTBYTE & INTERLACEMASK) ? true : false);
+
+    // Set the dimensions which will also allocate the image data
+    // buffer.
+    outImage.Allocate(Width, Height);
+    //mfSet_dimensions (Width, Height);
+    Image = (SGIFRGBPixel*)outImage.GetData();
+    outImageIndex.Allocate(Width, Height);
+    IndexImage = outImageIndex.GetData();
+
+    /* Note that I ignore the possible existence of a local color map.
+    * I'm told there aren't many files around that use them, and the spec
+    * says it's defined for future use.  This could lead to an error
+    * reading some files.
+    */
+
+    /* Start reading the raster data. First we get the intial code size
+    * and compute decompressor constant values, based on this code size.
+    */
+
+    CodeSize  = NEXTBYTE;
+    ClearCode = (1 << CodeSize);
+    EOFCode   = ClearCode + 1;
+    FreeCode  = FirstFree = ClearCode + 2;
+
+    /* The GIF spec has it that the code size is the code size used to
+    * compute the above values is the code size given in the file, but the
+    * code size used in compression/decompression is the code size given in
+    * the file plus one. (thus the ++).
+    */
+
+    CodeSize++;
+    InitCodeSize = CodeSize;
+    MaxCode      = (1 << CodeSize);
+    ReadMask     = MaxCode - 1;
+
+    /* Read the raster data.  Here we just transpose it from the GIF array
+    * to the Raster array, turning it from a series of blocks into one long
+    * data stream, which makes life much easier for ReadCode().
+    */
+
+    ptr1 = Raster;
+    do
+    {
+        ch = ch1 = NEXTBYTE;
+        while (ch--)
+        {
+            *ptr1++ = NEXTBYTE;
+        }
+        if ((ptr1 - Raster) > filesize)
+        {
+            CLogFile::FormatLine("Corrupted GIF file (unblock) %s", fileName.toUtf8().data());
+            goto cleanup;
+        }
+    }
+    while (ch1);
+
+    BytesPerScanline    = Width;
+
+
+    /* Decompress the file, continuing until you see the GIF EOF code.
+    * One obvious enhancement is to add checking for corrupt files here.
+    */
+
+    Code = ReadCode ();
+    while (Code != EOFCode)
+    {
+        /* Clear code sets everything back to its initial value, then reads the
+        * immediately subsequent code as uncompressed data.
+        */
+
+        if (Code == ClearCode)
+        {
+            CodeSize = InitCodeSize;
+            MaxCode  = (1 << CodeSize);
+            ReadMask = MaxCode - 1;
+            FreeCode = FirstFree;
+            CurCode  = OldCode = Code = ReadCode();
+            FinChar  = CurCode & BitMask;
+            AddToPixel (FinChar);
+        }
+        else
+        {
+            /* If not a clear code, then must be data: save same as CurCode and InCode */
+            CurCode = InCode = Code;
+
+            /* If greater or equal to FreeCode, not in the hash table yet;
+            * repeat the last character decoded
+            */
+
+            if (CurCode >= FreeCode)
+            {
+                CurCode = OldCode;
+                OutCode[OutCount++] = FinChar;
+            }
+
+            /* Unless this code is raw data, pursue the chain pointed to by CurCode
+            * through the hash table to its end; each code in the chain puts its
+            * associated output code on the output queue.
+            */
+
+            while (CurCode > BitMask)
+            {
+                if (OutCount > 1024)
+                {
+                    CLogFile::FormatLine("Corrupted GIF file (OutCount) %s", fileName.toUtf8().data());
+                    goto cleanup;
+                }
+                OutCode[OutCount++] = Suffix[CurCode];
+                CurCode = Prefix[CurCode];
+            }
+
+            /* The last code in the chain is treated as raw data. */
+
+            FinChar             = CurCode & BitMask;
+            OutCode[OutCount++] = FinChar;
+
+            /* Now we put the data out to the Output routine.
+            * It's been stacked LIFO, so deal with it that way...
+            */
+
+            for (i = OutCount - 1; i >= 0; i--)
+            {
+                AddToPixel (OutCode[i]);
+            }
+            OutCount = 0;
+
+            /* Build the hash table on-the-fly. No table is stored in the file. */
+
+            Prefix[FreeCode] = OldCode;
+            Suffix[FreeCode] = FinChar;
+            OldCode          = InCode;
+
+            /* Point to the next slot in the table.  If we exceed the current
+            * MaxCode value, increment the code size unless it's already 12.  If it
+            * is, do nothing: the next code decompressed better be CLEAR
+            */
+
+            FreeCode++;
+            if (FreeCode >= MaxCode)
+            {
+                if (CodeSize < 12)
+                {
+                    CodeSize++;
+                    MaxCode *= 2;
+                    ReadMask = (1 << CodeSize) - 1;
+                }
+            }
+        }
+        Code = ReadCode ();
+    }
+
+    ret = true;
+
+cleanup:
+    if (Raster)
+    {
+        CHK (delete [] Raster);
+    }
+    if (Prefix)
+    {
+        CHK (delete [] Prefix);
+    }
+    if (Suffix)
+    {
+        CHK (delete [] Suffix);
+    }
+    if (OutCode)
+    {
+        CHK (delete [] OutCode);
+    }
+    return ret;
+}
diff --git a/Code/Editor/Util/ImageGif.h b/Code/Editor/Util/ImageGif.h
new file mode 100644
index 0000000000..3a0e9a7780
--- /dev/null
+++ b/Code/Editor/Util/ImageGif.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEGIF_H
+#define CRYINCLUDE_EDITOR_UTIL_IMAGEGIF_H
+#pragma once
+
+class CImageEx;
+
+class CImageGif
+{
+public:
+    bool Load(const QString& fileName, CImageEx& outImage);
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEGIF_H
diff --git a/Code/Editor/Util/ImageHistogram.cpp b/Code/Editor/Util/ImageHistogram.cpp
new file mode 100644
index 0000000000..267a697ba9
--- /dev/null
+++ b/Code/Editor/Util/ImageHistogram.cpp
@@ -0,0 +1,223 @@
+/*
+ * 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 "ImageHistogram.h"
+
+CImageHistogram::CImageHistogram()
+    : m_imageFormat(eImageFormat_32BPP_RGBA)
+{
+    ClearHistogram();
+}
+
+CImageHistogram::~CImageHistogram()
+{
+}
+
+void CImageHistogram::ComputeHistogram(BYTE* pImageData, UINT aWidth, UINT aHeight, EImageFormat aFormat)
+{
+    ClearHistogram();
+    UINT r, g, b, a;
+    int lumIndex = 0;
+    UINT pixelCount = aWidth * aHeight;
+
+    m_imageFormat = aFormat;
+
+    while (pixelCount--)
+    {
+        r = g = b = a = 0;
+
+        switch (aFormat)
+        {
+        case eImageFormat_32BPP_RGBA:
+        {
+            r = *pImageData;
+            g = *(pImageData + 1);
+            b = *(pImageData + 2);
+            a = *(pImageData + 3);
+            pImageData += 4;
+            break;
+        }
+
+        case eImageFormat_32BPP_BGRA:
+        {
+            b = *pImageData;
+            g = *(pImageData + 1);
+            r = *(pImageData + 2);
+            a = *(pImageData + 3);
+            pImageData += 4;
+            break;
+        }
+
+        case eImageFormat_32BPP_ARGB:
+        {
+            a = *(pImageData);
+            r = *(pImageData + 1);
+            g = *(pImageData + 2);
+            b = *(pImageData + 3);
+            pImageData += 4;
+            break;
+        }
+
+        case eImageFormat_32BPP_ABGR:
+        {
+            a = *(pImageData);
+            b = *(pImageData + 1);
+            g = *(pImageData + 2);
+            r = *(pImageData + 3);
+            pImageData += 4;
+            break;
+        }
+
+        case eImageFormat_24BPP_RGB:
+        {
+            r = *pImageData;
+            g = *(pImageData + 1);
+            b = *(pImageData + 2);
+            pImageData += 3;
+            break;
+        }
+
+        case eImageFormat_24BPP_BGR:
+        {
+            r = *pImageData;
+            g = *(pImageData + 1);
+            b = *(pImageData + 2);
+            pImageData += 3;
+            break;
+        }
+
+        case eImageFormat_8BPP:
+        {
+            r = *pImageData;
+            ++pImageData;
+            break;
+        }
+        }
+
+        ++m_count[0][r];
+        ++m_count[1][g];
+        ++m_count[2][b];
+        ++m_count[3][a];
+
+        lumIndex = (r + b + g) / 3;
+        lumIndex = CLAMP(lumIndex, 0, kNumColorLevels - 1);
+        ++m_lumCount[lumIndex];
+
+        if (m_maxCount[0] < m_count[0][r])
+        {
+            m_maxCount[0] = m_count[0][r];
+        }
+
+        if (m_maxCount[1] < m_count[1][g])
+        {
+            m_maxCount[1] = m_count[1][g];
+        }
+
+        if (m_maxCount[2] < m_count[2][b])
+        {
+            m_maxCount[2] = m_count[2][b];
+        }
+
+        if (m_maxCount[3] < m_count[3][a])
+        {
+            m_maxCount[3] = m_count[3][a];
+        }
+
+        if (m_maxLumCount < m_lumCount[lumIndex])
+        {
+            m_maxLumCount = m_lumCount[lumIndex];
+        }
+    }
+
+    ComputeStatisticsForChannel(0);
+    ComputeStatisticsForChannel(1);
+    ComputeStatisticsForChannel(2);
+    ComputeStatisticsForChannel(3);
+
+    m_meanAvg = (m_mean[0] + m_mean[1] + m_mean[2]) / 3;
+    m_stdDevAvg = (m_stdDev[0] + m_stdDev[1] + m_stdDev[2]) / 3;
+    m_medianAvg = (m_median[0] + m_median[1] + m_median[2]) / 3;
+}
+
+void CImageHistogram::ClearHistogram()
+{
+    const int kSize = kNumColorLevels * sizeof(UINT);
+
+    memset(m_count[0], 0, kSize);
+    memset(m_count[1], 0, kSize);
+    memset(m_count[2], 0, kSize);
+    memset(m_count[3], 0, kSize);
+    memset(m_lumCount, 0, kSize);
+    m_maxCount[0] = 0;
+    m_maxCount[1] = 0;
+    m_maxCount[2] = 0;
+    m_maxCount[3] = 0;
+    m_maxLumCount = 0;
+    memset(m_mean, 0, kNumChannels * sizeof(float));
+    memset(m_stdDev, 0, kNumChannels * sizeof(float));
+    memset(m_median, 0, kNumChannels * sizeof(float));
+    m_meanAvg = m_stdDevAvg = m_medianAvg = 0;
+}
+
+void CImageHistogram::CopyComputedDataFrom(CImageHistogram* histogram)
+{
+    const int kSize = kNumColorLevels * sizeof(UINT);
+
+    memcpy(m_count[0], histogram->m_count[0], kSize);
+    memcpy(m_count[1], histogram->m_count[1], kSize);
+    memcpy(m_count[2], histogram->m_count[2], kSize);
+    memcpy(m_count[3], histogram->m_count[3], kSize);
+    memcpy(m_lumCount, histogram->m_lumCount, kSize);
+    memcpy(m_maxCount, histogram->m_maxCount, kNumChannels * sizeof(UINT));
+    memcpy(m_mean, histogram->m_mean, kNumChannels * sizeof(float));
+    memcpy(m_stdDev, histogram->m_stdDev, kNumChannels * sizeof(float));
+    memcpy(m_median, histogram->m_median, kNumChannels * sizeof(float));
+    m_maxLumCount = histogram->m_maxLumCount;
+    m_meanAvg = histogram->m_meanAvg;
+    m_stdDevAvg = histogram->m_stdDevAvg;
+    m_medianAvg = histogram->m_medianAvg;
+    m_imageFormat = histogram->m_imageFormat;
+}
+
+void CImageHistogram::ComputeStatisticsForChannel(int aIndex)
+{
+    int hits = 0;
+    int total = 0;
+
+    //
+    // mean
+    // std deviation
+    //
+    for (size_t i = 0; i < kNumColorLevels; ++i)
+    {
+        hits = m_count[aIndex][i];
+        m_mean[aIndex] += i * hits;
+        m_stdDev[aIndex] += i * i * hits;
+        total += hits;
+    }
+
+    total = (total ? total : 1);
+    m_mean[aIndex] = (float)m_mean[aIndex] / total;
+    m_stdDev[aIndex] = m_stdDev[aIndex] / total - m_mean[aIndex] * m_mean[aIndex];
+    m_stdDev[aIndex] = m_stdDev[aIndex] <= 0 ? 0 : sqrtf(m_stdDev[aIndex]);
+
+    int halfTotal = total / 2;
+    int median = 0, v = 0;
+
+    // find median value
+    for (; median < kNumColorLevels; ++median)
+    {
+        v += m_count[aIndex][median];
+
+        if (v >= halfTotal)
+        {
+            break;
+        }
+    }
+
+    m_median[aIndex] = median;
+}
diff --git a/Code/Editor/Util/ImageHistogram.h b/Code/Editor/Util/ImageHistogram.h
new file mode 100644
index 0000000000..3166f951ab
--- /dev/null
+++ b/Code/Editor/Util/ImageHistogram.h
@@ -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
+ *
+ */
+#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEHISTOGRAM_H
+#define CRYINCLUDE_EDITOR_UTIL_IMAGEHISTOGRAM_H
+#pragma once
+
+#include "Include/EditorCoreAPI.h"
+
+class EDITOR_CORE_API CImageHistogram
+{
+public:
+    static const int kNumChannels = 4;
+    static const int kNumColorLevels = 256;
+
+    enum EImageFormat
+    {
+        eImageFormat_8BPP,
+        eImageFormat_24BPP_RGB,
+        eImageFormat_24BPP_BGR,
+        eImageFormat_32BPP_RGBA,
+        eImageFormat_32BPP_BGRA,
+        eImageFormat_32BPP_ARGB,
+        eImageFormat_32BPP_ABGR
+    };
+
+    CImageHistogram();
+    virtual ~CImageHistogram();
+
+    // Description:
+    //  Compute the histogram of an image
+    // Arguments:
+    //  pImageData - the image data
+    //  aWidth - the width of the image in pixels
+    //  aHeight - the height of the image in pixels
+    //  aBitsPerPixel - the number of bits per pixel, currently supported: 8 (monochrome), 24 (RGB) and 32 (RGBA)
+    void ComputeHistogram(BYTE* pImageData, unsigned int aWidth, unsigned int aHeight, EImageFormat aFormat = eImageFormat_32BPP_RGBA);
+    void ClearHistogram();
+    void CopyComputedDataFrom(CImageHistogram* histogram);
+
+protected:
+    void ComputeStatisticsForChannel(int aIndex);
+
+public:
+    unsigned int    m_count[kNumChannels][kNumColorLevels];
+    unsigned int    m_lumCount[kNumColorLevels];
+    unsigned int    m_maxCount[kNumChannels];
+    unsigned int    m_maxLumCount;
+    float           m_mean[kNumChannels], m_stdDev[kNumChannels], m_median[kNumChannels];
+    float           m_meanAvg, m_stdDevAvg, m_medianAvg;
+    EImageFormat    m_imageFormat;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEHISTOGRAM_H
diff --git a/Code/Editor/Util/ImagePainter.cpp b/Code/Editor/Util/ImagePainter.cpp
new file mode 100644
index 0000000000..43e67723df
--- /dev/null
+++ b/Code/Editor/Util/ImagePainter.cpp
@@ -0,0 +1,349 @@
+/*
+ * 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 "ImagePainter.h"
+
+// Editor
+#include "Terrain/Heightmap.h"
+#include "Terrain/Layer.h"
+
+SEditorPaintBrush::SEditorPaintBrush(CHeightmap& rHeightmap, CLayer& rLayer,
+    const bool bMaskByLayerSettings, const uint32 dwLayerIdMask, const bool bFlood)
+    : bBlended(true)
+    , m_rHeightmap(rHeightmap)
+    , m_rLayer(rLayer)
+    , m_cFilterColor(1, 1, 1)
+    , m_dwLayerIdMask(dwLayerIdMask)
+    , m_bFlood(bFlood)
+{
+    if (bMaskByLayerSettings)
+    {
+        m_fMinAltitude = m_rLayer.GetLayerStart();
+        m_fMaxAltitude = m_rLayer.GetLayerEnd();
+        m_fMinSlope = tan(m_rLayer.GetLayerMinSlopeAngle() / 90.1f * g_PI / 2.0f);    // 0..90 -> 0..~1/0
+        m_fMaxSlope = tan(m_rLayer.GetLayerMaxSlopeAngle() / 90.1f * g_PI / 2.0f);    // 0..90 -> 0..~1/0
+    }
+    else
+    {
+        m_fMinAltitude = -FLT_MAX;
+        m_fMaxAltitude = FLT_MAX;
+        m_fMinSlope = 0;
+        m_fMaxSlope = FLT_MAX;
+    }
+}
+
+float SEditorPaintBrush::GetMask(const float fX, const float fY) const
+{
+    // Our expectation is that fX and fY are values of [0, 1) (i.e. includes 0, excludes 1).  
+    // We're mapping this back to an int range where the width & height are generally powers of 2.  So for example, we're mapping to 0 - 1023.  
+    // To preserve maximum precision in our floats, and for ease of understanding, we're going to expect that our floats actually represent 
+    // the 0 - 1024 range (i.e. 1 is 1024, not 1023), so that way each increment of a float is 1/1024 instead of 1/1023.  This means that a value 
+    // of 1 that's passed in is off the right edge of our range and technically invalid, so we'll just clamp if that happens.
+    int iX = AZStd::clamp(static_cast<uint64>(fX * m_rHeightmap.GetWidth()), static_cast<uint64>(0), static_cast<uint64>(m_rHeightmap.GetWidth() - 1));
+    int iY = AZStd::clamp(static_cast<uint64>(fY * m_rHeightmap.GetHeight()), static_cast<uint64>(0), static_cast<uint64>(m_rHeightmap.GetHeight() - 1));
+
+    float fAltitude = m_rHeightmap.GetZInterpolated(fX * m_rHeightmap.GetWidth(), fY * m_rHeightmap.GetHeight());
+
+    // Check if altitude is within brush min/max altitude
+    if (fAltitude < m_fMinAltitude || fAltitude > m_fMaxAltitude)
+    {
+        return 0;
+    }
+
+    float fSlope = m_rHeightmap.GetAccurateSlope(fX * m_rHeightmap.GetWidth(), fY * m_rHeightmap.GetHeight());
+
+    // Check if slope is within brush min/max slope
+    if (fSlope < m_fMinSlope || fSlope > m_fMaxSlope)
+    {
+        return 0;
+    }
+
+    //  Soft slope test
+    //  float fSlopeAplha = 1.f;
+    //  fSlopeAplha *= CLAMP((m_fMaxSlope-fSlope)*4 + 0.25f,0,1);
+    //  fSlopeAplha *= CLAMP((fSlope-m_fMinSlope)*4 + 0.25f,0,1);
+
+    if (m_dwLayerIdMask != 0xffffffff)
+    {
+        LayerWeight weight = m_rHeightmap.GetLayerWeightAt(iX, iY);
+
+        if ((weight.PrimaryId() & CLayer::e_undefined) != m_dwLayerIdMask)
+        {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CImagePainter::PaintBrush(const float fpx, const float fpy, TImage<LayerWeight>& image, const SEditorPaintBrush& brush)
+{
+    float fX = fpx * image.GetWidth(), fY = fpy * image.GetHeight();
+
+    // By using 1/width and 1/height as our scale, this means we're expecting to generate values of [0, 1).
+    // i.e. we're expecting to generate 0/width to (width-1)/width, and 0/height to (height-1)/height.
+    // This aligns with the expectations of how GetMask() will use these values.
+    const float fScaleX = 1.0f / image.GetWidth();
+    const float fScaleY = 1.0f / image.GetHeight();
+
+    ////////////////////////////////////////////////////////////////////////
+    // Draw an attenuated spot on the map
+    ////////////////////////////////////////////////////////////////////////
+    float fMaxDist, fAttenuation, fYSquared;
+    float fHardness = brush.hardness;
+
+    unsigned int pos;
+
+    LayerWeight* sourceData = image.GetData();
+
+    // Calculate the maximum distance
+    fMaxDist = brush.fRadius * image.GetWidth();
+
+    assert(image.GetWidth() == image.GetHeight());
+
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+
+    int iMinX = (int)floor(fX - fMaxDist), iMinY = (int)floor(fY - fMaxDist);
+    int iMaxX = (int)ceil(fX + fMaxDist), iMaxY = (int)ceil(fY + fMaxDist);
+
+    for (int iPosY = iMinY; iPosY <= iMaxY; iPosY++)
+    {
+        // Skip invalid locations
+        if (iPosY < 0 || iPosY > height - 1)
+        {
+            continue;
+        }
+
+        float fy = (float)iPosY - fY;
+
+        // Precalculate
+        fYSquared = (float)(fy * fy);
+
+        for (int iPosX = iMinX; iPosX <= iMaxX; iPosX++)
+        {
+            float fx = (float)iPosX - fX;
+
+            // Skip invalid locations
+            if (iPosX < 0 || iPosX > width - 1)
+            {
+                continue;
+            }
+
+            // Only circle.
+            float dist = sqrtf(fYSquared + fx * fx);
+            if (!brush.m_bFlood && dist > fMaxDist)
+            {
+                continue;
+            }
+
+            float fMask = brush.GetMask(iPosX * fScaleX, iPosY * fScaleY);
+
+            if (fMask < 0.5f)
+            {
+                continue;
+            }
+
+
+            // Calculate the array index
+            pos = iPosX + iPosY * width;
+
+            // Calculate attenuation factor
+            fAttenuation = brush.m_bFlood ? 1.0f : 1.0f - __min(1.0f, dist / fMaxDist);
+
+            float h = static_cast<float>(sourceData[pos].GetWeight(brush.color) / 255.0f);
+            float dh = 1.0f - h;
+            float fh = clamp_tpl((fAttenuation) * dh * fHardness + h, 0.0f, 1.0f);
+
+            // A non-zero distance between our weight sample and the center point of the brush
+            // can cause fAttenuation to be ~0.999, so if h (the current weight) is 254, any
+            // value less than 1 * dh will give us a value between 254 and 255.
+            // As we convert from 0-1 back to 0-255 number ranges, it's important to round
+            // instead of truncating so that we don't have to have an exact distance of 0
+            // to reach a value of 255.  
+            uint8 weight = static_cast<uint8>(clamp_tpl(round(fh * 255.0f), 0.0f, 255.0f));
+
+            sourceData[pos].SetWeight(brush.color, weight);
+        }
+    }
+}
+
+
+void CImagePainter::PaintBrushWithPattern(const float fpx, const float fpy, CImageEx& outImageBGR,
+    const uint32 dwOffsetX, const uint32 dwOffsetY, const float fScaleX, const float fScaleY,
+    const SEditorPaintBrush& brush, const CImageEx& imgPattern)
+{
+    float fX = fpx * fScaleX, fY = fpy * fScaleY;
+
+    ////////////////////////////////////////////////////////////////////////
+    // Draw an attenuated spot on the map
+    ////////////////////////////////////////////////////////////////////////
+    float fMaxDist, fAttenuation, fYSquared;
+    float fHardness = brush.hardness;
+
+    unsigned int pos;
+
+    uint32* srcBGR = outImageBGR.GetData();
+    uint32* pat = imgPattern.GetData();
+
+    int value = brush.color;
+
+    // Calculate the maximum distance
+    fMaxDist = brush.fRadius;
+
+    int width = outImageBGR.GetWidth();
+    int height = outImageBGR.GetHeight();
+
+    int patwidth = imgPattern.GetWidth();
+    int patheight = imgPattern.GetHeight();
+
+    int iMinX = (int)floor(fX - fMaxDist), iMinY = (int)floor(fY - fMaxDist);
+    int iMaxX = (int)ceil(fX + fMaxDist), iMaxY = (int)ceil(fY + fMaxDist);
+
+    bool bSRGB = imgPattern.GetSRGB();
+
+    for (int iPosY = iMinY; iPosY < iMaxY; iPosY++)
+    {
+        // Skip invalid locations
+        if (iPosY - dwOffsetY < 0 || iPosY - dwOffsetY > height - 1)
+        {
+            continue;
+        }
+
+        float fy = (float)iPosY - fY;
+
+        // Precalculate
+        fYSquared = (float)(fy * fy);
+
+        int32 iPatY = ((uint32)iPosY) % patheight;
+        assert(iPatY >= 0 && iPatY < patheight);
+
+        for (int iPosX = iMinX; iPosX < iMaxX; iPosX++)
+        {
+            float fx = (float)iPosX - fX;
+
+            // Skip invalid locations
+            if (iPosX - dwOffsetX < 0 || iPosX - dwOffsetX > width - 1)
+            {
+                continue;
+            }
+
+            // Only circle.
+            float dist = sqrtf(fYSquared + fx * fx);
+
+            if (!brush.m_bFlood && dist > fMaxDist)
+            {
+                continue;
+            }
+
+            // Calculate the array index
+            pos = (iPosX - dwOffsetX) + (iPosY - dwOffsetY) * width;
+
+            // Calculate attenuation factor
+            fAttenuation = brush.m_bFlood ? 1.0f : 1.0f - __min(1.0f, dist / fMaxDist);
+            assert(fAttenuation >= 0.0f && fAttenuation <= 1.0f);
+
+            // Note that GetMask expects a range of [0, 1), so it's correct to divide by
+            // fScaleX and fScaleY instead of (fScaleX-1) and (fScaleY-1).
+            float fMask = brush.GetMask(iPosX / fScaleX, iPosY / fScaleY);
+
+            uint32 cDstPixBGR = srcBGR[pos];
+
+            int32 iPatX = ((uint32)iPosX) % patwidth;
+            assert(iPatX >= 0 && iPatX < patwidth);
+
+            uint32 cSrcPix = pat[iPatX + iPatY * patwidth];
+
+            float s = fAttenuation * fHardness * fMask;
+            assert(s >= 0.0f && s <= 1.0f);
+            if (fcmp(s, 0))
+            {
+                // If the blend would be entirely biased to the pixel in outImage then don't modify anything
+                // (The logic below is susceptible to floating point inaccuracy and would change the pixel
+                // even though it is not supposed to)
+                continue;
+            }
+
+            const float fRecip255 = 1.0f / 255.0f;
+
+            // Convert Src to Linear Space (Src is pattern texture, can be in linear or gamma space)
+            ColorF cSrc = ColorF(GetRValue(cSrcPix), GetGValue(cSrcPix), GetBValue(cSrcPix)) * fRecip255;
+            if (bSRGB)
+            {
+                cSrc.srgb2rgb();
+            }
+
+            ColorF cMtl = brush.m_cFilterColor;
+            cMtl.srgb2rgb();
+
+            cSrc *= cMtl;
+            cSrc.clamp(0.0f, 1.0f);
+
+            // Convert Dst to Linear Space ( Dst is always in gamma space ), and load from BGR -> RGB
+            ColorF cDst = ColorF(GetBValue(cDstPixBGR), GetGValue(cDstPixBGR), GetRValue(cDstPixBGR)) * fRecip255;
+            cDst.srgb2rgb();
+
+            // Linear space blend
+            ColorF cOut = cSrc * s + cDst * (1.0f - s);
+
+            // Convert final result to gamma space and put back in [0..255] range
+            cOut.rgb2srgb();
+            cOut *= 255.0f;
+
+            // Save the blended result as BGR
+            // It's important to round as we go from float back to int.  If we just truncate,
+            // we'll end up with consistently darker colors.
+            srcBGR[pos] = RGB(round(cOut.b), round(cOut.g), round(cOut.r));
+        }
+    }
+}
+
+
+void CImagePainter::FillWithPattern(CImageEx& outImage, const uint32 dwOffsetX, const uint32 dwOffsetY,
+    const CImageEx& imgPattern)
+{
+    unsigned int pos;
+
+    uint32* src = outImage.GetData();
+    uint32* pat = imgPattern.GetData();
+
+    int width = outImage.GetWidth();
+    int height = outImage.GetHeight();
+
+    int patwidth = imgPattern.GetWidth();
+    int patheight = imgPattern.GetHeight();
+
+    if (patheight == 0 || patwidth == 0)
+    {
+        return;
+    }
+
+    for (int iPosY = 0; iPosY < height; iPosY++)
+    {
+        int32 iPatY = ((uint32)iPosY + dwOffsetY) % patheight;
+        assert(iPatY >= 0 && iPatY < patheight);
+
+        for (int iPosX = 0; iPosX < width; iPosX++)
+        {
+            // Calculate the array index
+            pos = iPosX + iPosY * width;
+
+            int32 iPatX = ((uint32)iPosX + dwOffsetX) % patwidth;
+            assert(iPatX >= 0 && iPatX < patwidth);
+
+            uint32 cSrc = pat[iPatX + iPatY * patwidth];
+
+            src[pos] = cSrc;
+        }
+    }
+}
+
diff --git a/Code/Editor/Util/ImagePainter.h b/Code/Editor/Util/ImagePainter.h
new file mode 100644
index 0000000000..a07d3329f5
--- /dev/null
+++ b/Code/Editor/Util/ImagePainter.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEPAINTER_H
+#define CRYINCLUDE_EDITOR_UTIL_IMAGEPAINTER_H
+#pragma once
+
+#include "Util/Image.h"
+
+struct LayerWeight;
+
+// Brush structure used for painting.
+struct SANDBOX_API SEditorPaintBrush
+{
+    // constructor
+    SEditorPaintBrush(class CHeightmap& rHeightmap, class CLayer& rLayer,
+                const bool bMaskByLayerSettings, const uint32 dwLayerIdMask, const bool bFlood);
+
+    CHeightmap&            m_rHeightmap;        // for mask support
+    unsigned char           color;                  // Painting color
+    float                           fRadius;                // outer radius (0..1 for the whole terrain size)
+    float                           hardness;               // 0-1 hardness of brush
+    bool                            bBlended;               // true=shades of the value are stores, false=the value is either stored or not
+    bool                            m_bFlood;                   // true=fills square area without attenuation, false=fills circle area with attenuation
+    uint32                      m_dwLayerIdMask;// reference Value for the mask, 0xffffffff if not used
+    CLayer&                    m_rLayer;                // layer we paint with
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    ColorF                      m_cFilterColor; // (1,1,1) if not used, multiplied with brightness
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    // Arguments:
+    //   fX - 0..1 in the whole terrain
+    //   fY - 0..1 in the whole terrain
+    // Return:
+    //   0=paint there 0% .. 1=paint there 100%
+    float GetMask(const float fX, const float fY) const;
+
+protected: // --------------------------------------------------------------------------
+
+    float                           m_fMinSlope;                // in m per m
+    float                           m_fMaxSlope;                // in m per me
+    float                           m_fMinAltitude;         // in m
+    float                           m_fMaxAltitude;         // in m
+};
+
+// Contains image painting functions.
+class CImagePainter
+{
+public:
+
+    // Paint spot on image at position px,py with specified paint brush parameters (to a layer)
+    // Arguments:
+    //   fpx - 0..1 in the whole terrain (used for the mask)
+    //   fpy - 0..1 in the whole terrain (used for the mask)
+    SANDBOX_API void PaintBrush(const float fpx, const float fpy, TImage<LayerWeight>& image, const SEditorPaintBrush& brush);
+
+    // Paint spot with pattern (to an RGB image)
+    // real spot is drawn to (fpx-dwOffsetX,fpy-dwOffsetY) - to get the pattern working we need this info split up like this
+    // Arguments:
+    //   fpx - 0..1 in the whole terrain (used for the mask)
+    //   fpy - 0..1 in the whole terrain (used for the mask)
+    void PaintBrushWithPattern(const float fpx, const float fpy, CImageEx& outImage, const uint32 dwOffsetX, const uint32 dwOffsetY,
+        const float fScaleX, const float fScaleY, const SEditorPaintBrush& brush, const CImageEx& imgPattern);
+
+    //
+    void FillWithPattern(CImageEx& outImage, const uint32 dwOffsetX, const uint32 dwOffsetY, const CImageEx& imgPattern);
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEPAINTER_H
diff --git a/Code/Editor/Util/ImageTIF.cpp b/Code/Editor/Util/ImageTIF.cpp
new file mode 100644
index 0000000000..2e1dbe9bec
--- /dev/null
+++ b/Code/Editor/Util/ImageTIF.cpp
@@ -0,0 +1,497 @@
+/*
+ * 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 "ImageTIF.h"
+
+/// libTiff
+#include <tiffio.h>  // TIFF library
+
+// Function prototypes
+static tsize_t libtiffDummyReadProc (thandle_t fd, tdata_t buf, tsize_t size);
+static tsize_t libtiffDummyWriteProc (thandle_t fd, tdata_t buf, tsize_t size);
+static toff_t libtiffDummySizeProc(thandle_t fd);
+static toff_t libtiffDummySeekProc (thandle_t fd, toff_t off, int i);
+//static int libtiffDummyCloseProc (thandle_t fd);
+
+// Structure used to pass state to our in-memory TIFF file callbacks
+struct MemImage
+{
+    uint8 *buffer;
+    uint32 offset;
+    uint32 size;
+};
+
+
+/////////////////// Callbacks to libtiff
+
+static int libtiffDummyMapFileProc(thandle_t, tdata_t*, toff_t*)
+{
+    return 0;
+}
+
+static void libtiffDummyUnmapFileProc(thandle_t, tdata_t, toff_t)
+{
+}
+
+static toff_t libtiffDummySizeProc(thandle_t fd)
+{
+    MemImage *memImage = static_cast<MemImage *>(fd);
+    return memImage->size;
+}
+
+static tsize_t
+libtiffDummyReadProc (thandle_t fd, tdata_t buf, tsize_t size)
+{
+    MemImage *memImage = static_cast<MemImage *>(fd);
+    tsize_t nBytesLeft = memImage->size - memImage->offset;
+
+    if (size > nBytesLeft)
+    {
+        size = nBytesLeft;
+    }
+
+    memcpy(buf, &memImage->buffer[memImage->offset], size);
+
+    memImage->offset += size;
+
+    // Return the amount of data read
+    return size;
+}
+
+static tsize_t
+libtiffDummyWriteProc ([[maybe_unused]] thandle_t fd, [[maybe_unused]] tdata_t buf, tsize_t size)
+{
+    return (size);
+}
+
+static toff_t
+libtiffDummySeekProc (thandle_t fd, toff_t off, int i)
+{
+    MemImage *memImage = static_cast<MemImage *>(fd);
+    switch (i)
+    {
+    case SEEK_SET:
+        memImage->offset = off;
+        break;
+
+    case SEEK_CUR:
+        memImage->offset += off;
+        break;
+
+    case SEEK_END:
+        memImage->offset = memImage->size - off;
+        break;
+
+    default:
+        memImage->offset = off;
+        break;
+    }
+
+    // This appears to return the location that it went to
+    return memImage->offset;
+}
+
+static int
+libtiffDummyCloseProc ([[maybe_unused]] thandle_t fd)
+{
+    // Return a zero meaning all is well
+    return 0;
+}
+
+bool CImageTIF::Load(const QString& fileName, CImageEx& outImage)
+{
+    CCryFile file;
+    if (!file.Open(fileName.toUtf8().data(), "rb"))
+    {
+        CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
+        return false;
+    }
+
+    MemImage memImage;
+
+    std::vector<uint8> data;
+
+    memImage.size = file.GetLength();
+
+    data.resize(memImage.size);
+    memImage.buffer = &data[0];
+    memImage.offset = 0;
+
+    file.ReadRaw(memImage.buffer, memImage.size);
+
+
+    // Open the dummy document (which actually only exists in memory)
+    TIFF* tif = TIFFClientOpen (fileName.toUtf8().data(), "rm", (thandle_t)&memImage, libtiffDummyReadProc,
+            libtiffDummyWriteProc, libtiffDummySeekProc,
+            libtiffDummyCloseProc, libtiffDummySizeProc, libtiffDummyMapFileProc, libtiffDummyUnmapFileProc);
+
+    //  TIFF* tif = TIFFOpen(fileName,"r");
+
+    bool bRet = false;
+
+    if (tif)
+    {
+        uint32 dwWidth, dwHeight;
+        size_t npixels;
+        uint32* raster;
+        char* dccfilename = NULL;
+
+        TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &dwWidth);
+        TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &dwHeight);
+        TIFFGetField(tif, TIFFTAG_IMAGEDESCRIPTION, &dccfilename);
+
+        npixels = dwWidth * dwHeight;
+
+        raster = (uint32*)_TIFFmalloc((tsize_t)(npixels * sizeof(uint32)));
+
+        if (raster)
+        {
+            if (TIFFReadRGBAImage(tif, dwWidth, dwHeight, raster, 0))
+            {
+                if (outImage.Allocate(dwWidth, dwHeight))
+                {
+                    char* dest = (char*)outImage.GetData();
+                    uint32 dwPitch = dwWidth * 4;
+
+                    for (uint32 dwY = 0; dwY < dwHeight; ++dwY)
+                    {
+                        char* src2 = (char*)&raster[(dwHeight - 1 - dwY) * dwWidth];
+                        char* dest2 = &dest[dwPitch * dwY];
+
+                        memcpy(dest2, src2, dwWidth * 4);
+                    }
+
+                    if (dccfilename)
+                    {
+                        outImage.SetDccFilename(dccfilename);
+                    }
+
+                    bRet = true;
+                }
+            }
+
+            _TIFFfree(raster);
+        }
+
+        TIFFClose(tif);
+    }
+
+    if (!bRet)
+    {
+        outImage.Detach();
+    }
+
+    return bRet;
+}
+
+bool CImageTIF::Load(const QString& fileName, CFloatImage& outImage)
+{
+    // Defined in GeoTIFF format - http://web.archive.org/web/20160403164508/http://www.remotesensing.org/geotiff/spec/geotiffhome.html
+    // Used to get the X, Y, Z scales from a GeoTIFF file
+    static const int GEOTIFF_MODELPIXELSCALE_TAG = 33550;
+
+    
+    CCryFile file;
+    if (!file.Open(fileName.toUtf8().data(), "rb"))
+    {
+        CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
+        return false;
+    }
+
+    MemImage memImage;
+
+    std::vector<uint8> data;
+
+    memImage.size = file.GetLength();
+
+    data.resize(memImage.size);
+    memImage.buffer = &data[0];
+    memImage.offset = 0;
+
+    file.ReadRaw(memImage.buffer, memImage.size);
+
+
+    // Open the dummy document (which actually only exists in memory)
+    TIFF* tif = TIFFClientOpen(fileName.toUtf8().data(), "rm", (thandle_t)&memImage, libtiffDummyReadProc,
+        libtiffDummyWriteProc, libtiffDummySeekProc,
+        libtiffDummyCloseProc, libtiffDummySizeProc, libtiffDummyMapFileProc, libtiffDummyUnmapFileProc);
+
+    //  TIFF* tif = TIFFOpen(fileName,"r");
+
+    bool bRet = false;
+
+    if (tif)
+    {
+        uint32 width = 0, height = 0;
+        uint16 spp = 0, bpp = 0, format = 0;
+        char* dccfilename = NULL;
+
+        TIFFGetField(tif, TIFFTAG_IMAGEDESCRIPTION, &dccfilename);
+
+        TIFFGetFieldDefaulted(tif, TIFFTAG_IMAGEWIDTH, &width);
+        TIFFGetFieldDefaulted(tif, TIFFTAG_IMAGELENGTH, &height);
+
+        TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bpp);     // how many bits each color component is.  typically 8-bit, but could be 16-bit.
+        TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &spp);   // how many color components per pixel?  1=greyscale, 3=RGB, 4=RGBA
+        TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &format);   // format of the pixel data - int, uint, float.  
+
+        // There are two types of 32-bit floating point TIF semantics.  Paint programs tend to use values in the 0.0 - 1.0 range.
+        // GeoTIFF files use values where 1.0 = 1 meter by default, but also have an optional ZScale parameter to provide additional
+        // scaling control.
+
+        // By default, we'll assume this is a regular TIFF that we want to leave in the 0.0 - 1.0 range.
+        float pixelValueScale = 1.0f;
+
+        // Check to see if it's a GeoTIFF, and if so, whether or not it has the ZScale parameter.
+        uint32 tagCount = 0;
+        double *pixelScales = NULL;
+        if (TIFFGetField(tif, GEOTIFF_MODELPIXELSCALE_TAG, &tagCount, &pixelScales) == 1)
+        {
+            // if there's an xyz scale, and the Z scale isn't 0, let's use it.
+            if ((tagCount == 3) && (pixelScales != NULL) && (pixelScales[2] != 0.0f))
+            {
+                pixelValueScale = static_cast<float>(pixelScales[2]);
+            }
+        }
+
+        uint32 linesize = TIFFScanlineSize(tif);
+        uint8* linebuf = static_cast<uint8*>(_TIFFmalloc(linesize));
+
+        // We assume that a scanline has all of the samples in it.  Validate the assumption.
+        assert(linesize == (width * (bpp / 8) * spp));
+
+        // Aliases for linebuf to make it easier to pull different types out of the scanline.
+        uint16* linebufUint16 = reinterpret_cast<uint16*>(linebuf);
+        uint32* linebufUint32 = reinterpret_cast<uint32*>(linebuf);
+        float* linebufFloat = reinterpret_cast<float*>(linebuf);
+
+        if (linebuf)
+        {
+            if (outImage.Allocate(width, height))
+            {
+                float* dest = outImage.GetData();
+                bRet = true;
+
+                float maxPixelValue = 0.0f;
+
+                for (uint32 y = 0; y < height; y++)
+                {
+                    TIFFReadScanline(tif, linebuf, y);
+
+                    // For each pixel, we either scale or clamp the values to a 16-bit range.  It is asymmetric behaviour, but based
+                    // on assumptions about the input data:
+                    // 8-bit values are scaled up because 8-bit textures used as heightmaps are usually scaled-down 16-bit values.
+                    // 32-bit values may or may not need to scale down, depending on the intended authoring range.  Our assumption
+                    // is that they were most likely authored with the intent of 1:1 value translations.
+
+                    for (uint32 x = 0; x < width; x++)
+                    {
+                        switch (bpp)
+                        {
+                            case 8:
+                                // Scale 0-255 to 0.0 - 1.0
+                                dest[(y * width) + x] = static_cast<float>(linebuf[x * spp]) / static_cast<float>(std::numeric_limits<uint8>::max());
+                                break;
+                            case 16:
+                                // Scale 0-65535 to 0.0 - 1.0
+                                dest[(y * width) + x] = static_cast<float>(linebufUint16[x * spp]) / static_cast<float>(std::numeric_limits<uint16>::max());
+                                break;
+                            case 32:
+                                // 32-bit values could be ints or floats.
+
+                                if (format == SAMPLEFORMAT_INT)
+                                {
+                                    // Scale 0-max int32 to 0.0 - 1.0
+                                    dest[(y * width) + x] = clamp_tpl(static_cast<float>(linebufUint32[x * spp]) / static_cast<float>(std::numeric_limits<int32>::max()), 0.0f, 1.0f);
+                                }
+                                else if (format == SAMPLEFORMAT_UINT)
+                                {
+                                    // Scale 0-max uint32 to 0.0 - 1.0
+                                    dest[(y * width) + x] = clamp_tpl(static_cast<float>(linebufUint32[x * spp]) / static_cast<float>(std::numeric_limits<uint32>::max()), 0.0f, 1.0f);
+                                }
+                                else if (format == SAMPLEFORMAT_IEEEFP)
+                                {
+                                    dest[(y * width) + x] = linebufFloat[x * spp] * pixelValueScale;
+                                }
+                                else
+                                {
+                                    // Unknown / unsupported format.
+                                    bRet = false;
+                                }
+                                break;
+                            default:
+                                // Unknown / unsupported format.
+                                bRet = false;
+                                break;
+                        }
+
+                        maxPixelValue = max(maxPixelValue, dest[(y * width) + x]);
+                    }
+                }
+
+                if (dccfilename)
+                {
+                    outImage.SetDccFilename(dccfilename);
+                }
+
+                // If this is a GeoTIFF using 32-bit floats, we will end up outside the 0.0 - 1.0 range.  Let's scale it back down to 0.0 - 1.0.
+                if (maxPixelValue > 1.0f)
+                {
+                    for (uint32 y = 0; y < height; y++)
+                    {
+                        for (uint32 x = 0; x < width; x++)
+                        {
+                            dest[(y * width) + x] = dest[(y * width) + x] / maxPixelValue;
+                        }
+                    }
+                }
+            }
+
+            _TIFFfree(linebuf);
+        }
+
+        TIFFClose(tif);
+    }
+
+    if (!bRet)
+    {
+        outImage.Detach();
+    }
+
+    return bRet;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageTIF::SaveRAW(const QString& fileName, const void* pData, int width, int height, int bytesPerChannel, int numChannels, bool bFloat, const char* preset)
+{
+    if (bFloat && (bytesPerChannel != 2 && bytesPerChannel != 4))
+    {
+        bFloat = false;
+    }
+
+    bool bRet = false;
+
+    CFileUtil::OverwriteFile(fileName);
+    TIFF* tif = TIFFOpen(fileName.toUtf8().data(), "wb");
+    if (tif)
+    {
+        TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
+        TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
+        TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, numChannels);
+        TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bytesPerChannel * 8);
+        TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+        TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
+        TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
+        TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, (numChannels == 1) ? PHOTOMETRIC_MINISBLACK : PHOTOMETRIC_RGB);
+        TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+        if (bFloat)
+        {
+            TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP);
+        }
+
+        if (preset && preset[0])
+        {
+            string tiffphotoshopdata, valueheader;
+            string presetkeyvalue = string("/preset=") + string(preset);
+
+            valueheader.push_back('\x1C');
+            valueheader.push_back('\x02');
+            valueheader.push_back('\x28');
+            valueheader.push_back((presetkeyvalue.size() >> 8) & 0xFF);
+            valueheader.push_back((presetkeyvalue.size()) & 0xFF);
+            valueheader.append(presetkeyvalue);
+
+            tiffphotoshopdata.push_back('8');
+            tiffphotoshopdata.push_back('B');
+            tiffphotoshopdata.push_back('I');
+            tiffphotoshopdata.push_back('M');
+            tiffphotoshopdata.push_back('\x04');
+            tiffphotoshopdata.push_back('\x04');
+            tiffphotoshopdata.push_back('\x00');
+            tiffphotoshopdata.push_back('\x00');
+
+            tiffphotoshopdata.push_back((valueheader.size() >> 24) & 0xFF);
+            tiffphotoshopdata.push_back((valueheader.size() >> 16) & 0xFF);
+            tiffphotoshopdata.push_back((valueheader.size() >> 8) & 0xFF);
+            tiffphotoshopdata.push_back((valueheader.size()) & 0xFF);
+            tiffphotoshopdata.append(valueheader);
+
+            TIFFSetField(tif, TIFFTAG_PHOTOSHOP, tiffphotoshopdata.size(), tiffphotoshopdata.c_str());
+        }
+
+        size_t pitch = width * bytesPerChannel * numChannels;
+        char* raster = (char*) _TIFFmalloc((tsize_t)(pitch * height));
+        memcpy(raster, pData, pitch * height);
+
+        bRet = true;
+        for (int h = 0; h < height; ++h)
+        {
+            size_t offset = h * pitch;
+            int err = TIFFWriteScanline(tif, raster + offset, h, 0);
+            if (err < 0)
+            {
+                bRet = false;
+                break;
+            }
+        }
+        _TIFFfree(raster);
+        TIFFClose(tif);
+    }
+    return bRet;
+}
+
+const char* CImageTIF::GetPreset(const QString& fileName)
+{
+    std::vector<uint8> data;
+    CCryFile file;
+    if (!file.Open(fileName.toUtf8().data(), "rb"))
+    {
+        CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
+        return NULL;
+    }
+
+    MemImage memImage;
+
+    memImage.size = file.GetLength();
+
+    data.resize(memImage.size);
+    memImage.buffer = &data[0];
+    memImage.offset = 0;
+
+    file.ReadRaw(memImage.buffer, memImage.size);
+
+    TIFF* tif = TIFFClientOpen (fileName.toUtf8().data(), "rm", (thandle_t)&memImage, libtiffDummyReadProc,
+            libtiffDummyWriteProc, libtiffDummySeekProc,
+            libtiffDummyCloseProc, libtiffDummySizeProc, libtiffDummyMapFileProc, libtiffDummyUnmapFileProc);
+
+    string strReturn;
+    char* preset = NULL;
+    int size;
+    if (tif)
+    {
+        TIFFGetField(tif, TIFFTAG_PHOTOSHOP, &size, &preset);
+        for (int i = 0; i < size; ++i)
+        {
+            if (!strncmp((preset + i), "preset", 6))
+            {
+                char* presetoffset = preset + i;
+                strReturn = presetoffset;
+                if (strReturn.find('/') != -1)
+                {
+                    strReturn = strReturn.substr(0, strReturn.find('/'));
+                }
+
+                break;
+            }
+        }
+        TIFFClose(tif);
+    }
+    return strReturn.c_str();
+}
diff --git a/Code/Editor/Util/ImageTIF.h b/Code/Editor/Util/ImageTIF.h
new file mode 100644
index 0000000000..91d1f23437
--- /dev/null
+++ b/Code/Editor/Util/ImageTIF.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGETIF_H
+#define CRYINCLUDE_EDITOR_UTIL_IMAGETIF_H
+#pragma once
+
+#include "Util/Image.h"
+
+class SANDBOX_API CImageTIF
+{
+public:
+    bool Load(const QString& fileName, CImageEx& outImage);
+    bool Load(const QString& fileName, CFloatImage& outImage);
+    bool SaveRAW(const QString& fileName, const void* pData, int width, int height, int bytesPerChannel, int numChannels, bool bFloat, const char* preset);
+    static const char* GetPreset(const QString& fileName);
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_IMAGETIF_H
diff --git a/Code/Editor/Util/ImageUtil.cpp b/Code/Editor/Util/ImageUtil.cpp
new file mode 100644
index 0000000000..c6380fd653
--- /dev/null
+++ b/Code/Editor/Util/ImageUtil.cpp
@@ -0,0 +1,525 @@
+/*
+ * 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 : Image utilities implementation.
+
+
+#include "EditorDefs.h"
+
+#include "ImageUtil.h"
+
+// Editor
+#include "Util/ImageGif.h"
+#include "Util/ImageTIF.h"
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::Save(const QString& strFileName, CImageEx& inImage)
+{
+    QImage imgBitmap;
+
+    ImageToQImage(inImage, imgBitmap);
+
+    // Explicitly set the pixels per meter in our images to a consistent default.
+    // The normal default is 96 pixels per inch, or 3780 pixels per meter.
+    // However, the Windows scaling display setting can cause these numbers to vary
+    // on different machines, producing output files that have slightly different
+    // headers from machine to machine, which often isn't desirable.
+    const int defaultPixelsPerMeter = 3780;
+    imgBitmap.setDotsPerMeterX(defaultPixelsPerMeter);
+    imgBitmap.setDotsPerMeterY(defaultPixelsPerMeter);
+    
+    return imgBitmap.save(strFileName);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::SaveBitmap(const QString& szFileName, CImageEx& inImage)
+{
+    return Save(szFileName, inImage);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::SaveJPEG(const QString& strFileName, CImageEx& inImage)
+{
+    return Save(strFileName, inImage);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::Load(const QString& fileName, CImageEx& image)
+{
+    QImage imgBitmap(fileName);
+
+    if (imgBitmap.isNull())
+    {
+        CLogFile::FormatLine("Invalid file:  %s", fileName.toUtf8().data());
+        return false;
+    }
+
+    return QImageToImage(imgBitmap, image);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::LoadJPEG(const QString& strFileName, CImageEx& outImage)
+{
+    return CImageUtil::Load(strFileName, outImage);
+}
+
+//===========================================================================
+bool CImageUtil::LoadBmp(const QString& fileName, CImageEx& image)
+{
+    return CImageUtil::Load(fileName, image);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::SavePGM(const QString& fileName, const CImageEx& image)
+{
+    // There are two types of PGM ("Portable Grey Map") files - "raw" (binary) and "plain" (ASCII).  This function supports the "plain PGM"  format.
+    // See http://netpbm.sourceforge.net/doc/pgm.html or https://en.wikipedia.org/wiki/Netpbm_format for the definition.
+
+    uint32 width = image.GetWidth();
+    uint32 height = image.GetHeight();
+    uint32* pixels = image.GetData();
+
+    // Create the file header.
+    string fileHeader;
+    fileHeader.Format(
+        // P2 = PGM header for ASCII output.  (P5 is PGM header for binary output)
+        "P2\n"
+        // width and height of the image
+        "%d %d\n"
+        // The maximum grey value in the file.  (i.e. the max value for any given pixel below)
+        "65535\n"
+        , width, height);
+
+    FILE* file = nullptr;
+    azfopen(&file, fileName.toUtf8().data(), "wt");
+    if (!file)
+    {
+        return false;
+    }
+
+    // First print the file header
+    fprintf(file, fileHeader.c_str());
+
+    // Then print all the pixels.
+    for (int32 y = 0; y < height; y++)
+    {
+        for (int32 x = 0; x < width; x++)
+        {
+            fprintf(file, "%d ", pixels[x + (y * width)]);
+        }
+        fprintf(file, "\n");
+    }
+
+    fclose(file);
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::LoadPGM(const QString& fileName, CImageEx& image)
+{
+    FILE* file = nullptr;
+    azfopen(&file, fileName.toUtf8().data(), "rt");
+    if (!file)
+    {
+        return false;
+    }
+
+    const char seps[] = " \n\t\r";
+    char* token;
+
+
+    int32 width = 0;
+    int32 height = 0;
+    int32 numColors = 1;
+
+
+    fseek(file, 0, SEEK_END);
+    int fileSize = ftell(file);
+    fseek(file, 0, SEEK_SET);
+
+    char* str = new char[fileSize];
+    fread(str, fileSize, 1, file);
+
+    char* nextToken = nullptr;
+    token = azstrtok(str, 0, seps, &nextToken);
+
+    while (token != NULL && token[0] == '#')
+    {
+        if (token != NULL && token[0] == '#')
+        {
+            azstrtok(NULL, 0, "\n", &nextToken);
+        }
+        token = azstrtok(NULL, 0, seps, &nextToken);
+    }
+    if (azstricmp(token, "P2") != 0)
+    {
+        // Bad file. not supported pgm.
+        delete[]str;
+        fclose(file);
+        return false;
+    }
+
+    do
+    {
+        token = azstrtok(NULL, 0, seps, &nextToken);
+        if (token != NULL && token[0] == '#')
+        {
+            azstrtok(NULL, 0, "\n", &nextToken);
+        }
+    } while (token != NULL && token[0] == '#');
+    width = atoi(token);
+
+    do
+    {
+        token = azstrtok(NULL, 0, seps, &nextToken);
+        if (token != NULL && token[0] == '#')
+        {
+            azstrtok(NULL, 0, "\n", &nextToken);
+        }
+    } while (token != NULL && token[0] == '#');
+    height = atoi(token);
+
+    do
+    {
+        token = azstrtok(NULL, 0, seps, &nextToken);
+        if (token != NULL && token[0] == '#')
+        {
+            azstrtok(NULL, 0, "\n", &nextToken);
+        }
+    } while (token != NULL && token[0] == '#');
+    numColors = atoi(token);
+
+    image.Allocate(width, height);
+
+    uint32* p = image.GetData();
+    int size = width * height;
+    int i = 0;
+    while (token != NULL && i < size)
+    {
+        do
+        {
+            token = azstrtok(NULL, 0, seps, &nextToken);
+        } while (token != NULL && token[0] == '#');
+        *p++ = atoi(token);
+        i++;
+    }
+
+    delete[]str;
+
+    fclose(file);
+
+    // If we have 16-bit greyscale values that we're storing into 32-bit pixels, denote it with an appropriate texture type.
+    if (numColors > 255)
+    {
+        image.SetFormat(eTF_R16G16);
+    }
+
+    return true;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss)
+{
+    char drive[_MAX_DRIVE];
+    char dir[_MAX_DIR];
+    char fname[_MAX_FNAME];
+    char ext[_MAX_EXT];
+
+    if (pQualityLoss)
+    {
+        *pQualityLoss = false;
+    }
+
+    _splitpath_s(fileName.toUtf8().data(), drive, dir, fname, ext);
+
+    // Only DDS has explicit sRGB flag - we'll assume by default all formats are stored in gamma space
+    image.SetSRGB(true);
+
+    if (azstricmp(ext, ".bmp") == 0)
+    {
+        return LoadBmp(fileName, image);
+    }
+    else if (azstricmp(ext, ".tif") == 0)
+    {
+        return CImageTIF().Load(fileName, image);
+    }
+    else if (azstricmp(ext, ".jpg") == 0)
+    {
+        if (pQualityLoss)
+        {
+            *pQualityLoss = true;     // we assume JPG has quality loss
+        }
+        return LoadJPEG(fileName, image);
+    }
+    else if (azstricmp(ext, ".gif") == 0)
+    {
+        return CImageGif().Load(fileName, image);
+    }
+    else if (azstricmp(ext, ".pgm") == 0)
+    {
+        return LoadPGM(fileName, image);
+    }
+    else if (azstricmp(ext, ".png") == 0)
+    {
+        return CImageUtil::Load(fileName, image);
+    }
+    else
+    {
+        return CImageUtil::Load(fileName, image);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CImageUtil::SaveImage(const QString& fileName, CImageEx& image)
+{
+    char drive[_MAX_DRIVE];
+    char dir[_MAX_DIR];
+    char fname[_MAX_FNAME];
+    char ext[_MAX_EXT];
+
+    // Remove the read-only attribute so the file can be overwritten.
+    QFile(fileName).setPermissions(QFile::ReadUser | QFile::WriteUser);
+
+    _splitpath_s(fileName.toUtf8().data(), drive, dir, fname, ext);
+    if (azstricmp(ext, ".bmp") == 0)
+    {
+        return SaveBitmap(fileName, image);
+    }
+    else if (azstricmp(ext, ".jpg") == 0)
+    {
+        return SaveJPEG(fileName, image);
+    }
+    else if (azstricmp(ext, ".pgm") == 0)
+    {
+        return SavePGM(fileName, image);
+    }
+    else
+    {
+        return Save(fileName, image);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageUtil::ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage)
+{
+    trgImage.ScaleToFit(srcImage);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageUtil::DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode)
+{
+    uint32* pSrcData = srcImage.GetData();
+    int nSrcWidth = srcImage.GetWidth();
+    int nSrcHeight = srcImage.GetHeight();
+    int nTrgWidth = srcImage.GetWidth() >> 1;
+    int nTrgHeight = srcImage.GetHeight() >> 1;
+
+    // reallocate target
+    trgImage.Release();
+    trgImage.Allocate(nTrgWidth, nTrgHeight);
+    uint32* pDstData = trgImage.GetData();
+
+    // values in this filter are the log2 of the actual multiplicative values .. see DXCFILTER_BLUR3X3 for the used 3x3 filter
+    static int filter[3][3] =
+    {
+        {0, 1, 0},
+        {1, 2, 1},
+        {0, 1, 0}
+    };
+
+    for (int i = 0; i < nTrgHeight; i++)
+    {
+        for (int j = 0; j < nTrgWidth; j++)
+        {
+            // filter3x3
+            int x = j << 1;
+            int y = i << 1;
+
+            int r, g, b, a;
+            r = b = g = a = 0;
+            uint32 col;
+
+            if (eAddressingMode == IImageUtil::WRAP) // TODO: this condition could be compile-time static by making it a template arg
+            {
+                for (int ii = 0; ii < 3; ii++)
+                {
+                    for (int jj = 0; jj < 3; jj++)
+                    {
+                        col = pSrcData[((y + nSrcHeight + ii - 1) % nSrcHeight) * nSrcWidth + ((x + nSrcWidth + jj - 1) % nSrcWidth)];
+
+                        r += (col        & 0xff) << filter[ii][jj];
+                        g += ((col >> 8)  & 0xff) << filter[ii][jj];
+                        b += ((col >> 16) & 0xff) << filter[ii][jj];
+                        a += ((col >> 24) & 0xff) << filter[ii][jj];
+                    }
+                }
+            }
+            else
+            {
+                assert(eAddressingMode == IImageUtil::CLAMP);
+                for (int ii = 0; ii < 3; ii++)
+                {
+                    for (int jj = 0; jj < 3; jj++)
+                    {
+                        int x1 = clamp_tpl<int>((x + jj), 0, nSrcWidth - 1);
+                        int y1 = clamp_tpl<int>((y + ii), 0, nSrcHeight - 1);
+                        col = pSrcData[ y1 * nSrcWidth + x1];
+
+                        r += (col        & 0xff) << filter[ii][jj];
+                        g += ((col >> 8)  & 0xff) << filter[ii][jj];
+                        b += ((col >> 16) & 0xff) << filter[ii][jj];
+                        a += ((col >> 24) & 0xff) << filter[ii][jj];
+                    }
+                }
+            }
+
+            // the sum of the multiplicative values here is 16 so we shift by 4 bits
+            r >>= 4;
+            g >>= 4;
+            b >>= 4;
+            a >>= 4;
+
+            uint32 res = r + (g << 8) + (b << 16) + (a << 24);
+
+            *pDstData++ = res;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageUtil::ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage)
+{
+    trgImage.ScaleToFit(srcImage);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageUtil::ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage)
+{
+    uint32 x, y, u, v;
+    unsigned int* destRow, * dest, * src, * sourceRow;
+
+    uint32 srcW = srcImage.GetWidth();
+    uint32 srcH = srcImage.GetHeight();
+
+    uint32 trgHalfW = trgImage.GetWidth() / 2;
+    uint32 trgH = trgImage.GetHeight();
+
+    uint32 xratio = trgHalfW > 0 ? (srcW << 16) / trgHalfW : 1;
+    uint32 yratio = trgH > 0 ? (srcH << 16) / trgH : 1;
+
+    src = srcImage.GetData();
+    destRow = trgImage.GetData();
+
+    v = 0;
+    for (y = 0; y < trgH; y++)
+    {
+        u = 0;
+        sourceRow = src + (v >> 16) * srcW;
+        dest = destRow;
+        for (x = 0; x < trgHalfW; x++)
+        {
+            *(dest + trgHalfW) = sourceRow[u >> 16];
+            *dest++ = sourceRow[u >> 16];
+            u += xratio;
+        }
+        v += yratio;
+        destRow += trgHalfW * 2;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CImageUtil::SmoothImage(CByteImage& image, int numSteps)
+{
+    assert(numSteps > 0);
+    uint8* buf = image.GetData();
+    int w = image.GetWidth();
+    int h = image.GetHeight();
+
+    for (int steps = 0; steps < numSteps; steps++)
+    {
+        // Smooth the image.
+        for (int y = 1; y < h - 1; y++)
+        {
+            // Precalculate for better speed
+            uint8* ptr = &buf[y * w + 1];
+
+            for (int x = 1; x < w - 1; x++)
+            {
+                // Smooth it out
+                *ptr =
+                    (
+                        (uint32)ptr[1] +
+                        ptr[w] +
+                        ptr[-1] +
+                        ptr[-w] +
+                        ptr[w + 1] +
+                        ptr[w - 1] +
+                        ptr[-w + 1] +
+                        ptr[-w - 1]
+                    ) >> 3;
+
+                // Next pixel
+                ptr++;
+            }
+        }
+    }
+}
+
+unsigned char CImageUtil::GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image)
+{
+    //  assert(image.IsValid());        if(!image.IsValid())return(0);      // this shouldn't be
+
+    DWORD x = (DWORD)(iniX256) >> 8;
+    DWORD y = (DWORD)(iniY256) >> 8;
+
+    if (x >= image.GetWidth() - 1 || y >= image.GetHeight() - 1)
+    {
+        return image.ValueAt(x, y);                                                          // border is not filtered, 255 to get in range 0..1
+    }
+    DWORD rx = (DWORD)(iniX256) & 0xff;       // fractional aprt
+    DWORD ry = (DWORD)(iniY256) & 0xff;       // fractional aprt
+
+    DWORD top = (DWORD)image.ValueAt((int)x, (int)y) * (256 - rx)                      // left top
+        + (DWORD)image.ValueAt((int)x + 1, (int)y) * rx;                                            // right top
+
+    DWORD bottom = (DWORD)image.ValueAt((int)x, (int)y + 1) * (256 - rx)              // left bottom
+        + (DWORD)image.ValueAt((int)x + 1, (int)y + 1) * rx;                                        // right bottom
+
+    return (unsigned char)((top * (256 - ry) + bottom * ry) >> 16);
+}
+
+bool CImageUtil::QImageToImage(const QImage& bitmap, CImageEx& image)
+{
+
+    QImage convertedBitmap;
+    const QImage *srcBitmap = &bitmap;
+    
+    if (bitmap.format() != QImage::Format_RGBA8888)
+    {
+        convertedBitmap = bitmap.convertToFormat(QImage::Format_RGBA8888);
+        srcBitmap = &convertedBitmap;
+    }
+
+    if (image.Allocate(srcBitmap->width(), srcBitmap->height()) == false)
+    {
+        return false;
+    }
+
+    AZStd::copy(srcBitmap->bits(), srcBitmap->bits() + (srcBitmap->width() * srcBitmap->height() * sizeof(uint32)), reinterpret_cast<uint8*>(image.GetData()));
+
+    return true;
+}
+
+bool CImageUtil::ImageToQImage(const CImageEx& image, QImage& bitmapObj)
+{
+    bitmapObj = QImage(image.GetWidth(), image.GetHeight(), QImage::Format_RGBA8888);
+    AZStd::copy(image.GetData(), image.GetData() + image.GetWidth() * image.GetHeight(), reinterpret_cast<uint32*>(bitmapObj.bits()));
+
+    return true;
+}
diff --git a/Code/Editor/Util/ImageUtil.h b/Code/Editor/Util/ImageUtil.h
new file mode 100644
index 0000000000..6fa8519d3f
--- /dev/null
+++ b/Code/Editor/Util/ImageUtil.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Image utilities.
+
+
+#pragma once
+
+#include <Include/IImageUtil.h>
+
+/*!
+ *  Utility Class to manipulate images.
+ */
+class SANDBOX_API CImageUtil
+{
+public:
+    //////////////////////////////////////////////////////////////////////////
+    // Image loading.
+    //////////////////////////////////////////////////////////////////////////
+    //! Load image, detect image type by file extension.
+    // Arguments:
+    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
+    static bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0);
+    //! Save image, detect image type by file extension.
+    static bool SaveImage(const QString& fileName, CImageEx& image);
+
+    // General image fucntions
+    static bool LoadJPEG(const QString& strFileName, CImageEx& image);
+    static bool SaveJPEG(const QString& strFileName, CImageEx& image);
+
+    static bool SaveBitmap(const QString& szFileName, CImageEx& image);
+    static bool LoadBmp(const QString& file, CImageEx& image);
+
+    //! Save image in PGM format.
+    static bool SavePGM(const QString& fileName, const CImageEx& image);
+    //! Load image in PGM format.
+    static bool LoadPGM(const QString& fileName, CImageEx& image);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Image scaling.
+    //////////////////////////////////////////////////////////////////////////
+    //! Scale source image to fit size of target image.
+    static void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage);
+    //! Scale source image to fit size of target image.
+    static void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage);
+    //! Scale source image to fit twice side by side in target image.
+    static void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage);
+    //! Scale source image twice down image with filering
+
+    static void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode = IImageUtil::WRAP);
+
+    //! Smooth image.
+    static void SmoothImage(CByteImage& image, int numSteps);
+
+    //////////////////////////////////////////////////////////////////////////
+    // filtered lookup
+    //////////////////////////////////////////////////////////////////////////
+
+    //! behaviour outside of the texture is not defined
+    //! \param iniX in fix point 24.8
+    //! \param iniY in fix point 24.8
+    //! \return 0..255
+    static unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image);
+
+    static bool QImageToImage(const QImage& bitmap, CImageEx& image);
+    static bool ImageToQImage(const CImageEx& image, QImage& bitmapObj);
+
+private:
+    static bool Load(const QString& fileName, CImageEx& image);
+    static bool Save(const QString& strFileName, CImageEx& inImage);
+};
+
diff --git a/Code/Editor/Util/ImageUtil_impl.cpp b/Code/Editor/Util/ImageUtil_impl.cpp
new file mode 100644
index 0000000000..0612f6defe
--- /dev/null
+++ b/Code/Editor/Util/ImageUtil_impl.cpp
@@ -0,0 +1,82 @@
+/*
+ * 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 "ImageUtil_impl.h"
+
+// Editor
+#include "Util/ImageUtil.h"
+
+bool CImageUtil_impl::LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss)
+{
+    return CImageUtil::LoadImage(fileName, image, pQualityLoss);
+}
+
+bool CImageUtil_impl::SaveImage(const QString& fileName, CImageEx& image)
+{
+    return CImageUtil::SaveImage(fileName, image);
+}
+
+bool CImageUtil_impl::LoadJPEG(const QString& strFileName, CImageEx& image)
+{
+    return CImageUtil::LoadJPEG(strFileName, image);
+}
+
+bool CImageUtil_impl::SaveJPEG(const QString& strFileName, CImageEx& image)
+{
+    return CImageUtil::SaveJPEG(strFileName, image);
+}
+
+bool CImageUtil_impl::SaveBitmap(const QString& szFileName, CImageEx& image)
+{
+    return CImageUtil::SaveBitmap(szFileName, image);
+}
+
+bool CImageUtil_impl::LoadBmp(const QString& file, CImageEx& image)
+{
+    return CImageUtil::LoadBmp(file, image);
+}
+
+bool CImageUtil_impl::SavePGM(const QString& fileName, const CImageEx& image)
+{
+    return CImageUtil::SavePGM(fileName, image);
+}
+
+bool CImageUtil_impl::LoadPGM(const QString& fileName, CImageEx& image)
+{
+    return CImageUtil::LoadPGM(fileName, image);
+}
+
+void CImageUtil_impl::ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage)
+{
+    CImageUtil::ScaleToFit(srcImage, trgImage);
+}
+
+void CImageUtil_impl::ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage)
+{
+    CImageUtil::ScaleToFit(srcImage, trgImage);
+}
+
+void CImageUtil_impl::ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage)
+{
+    CImageUtil::ScaleToDoubleFit(srcImage, trgImage);
+}
+
+void CImageUtil_impl::DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode)
+{
+    CImageUtil::DownScaleSquareTextureTwice(srcImage, trgImage, eAddressingMode);
+}
+
+void CImageUtil_impl::SmoothImage(CByteImage& image, int numSteps)
+{
+    CImageUtil::SmoothImage(image, numSteps);
+}
+
+unsigned char CImageUtil_impl::GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image)
+{
+    return CImageUtil::GetBilinearFilteredAt(iniX256, iniY256, image);
+}
diff --git a/Code/Editor/Util/ImageUtil_impl.h b/Code/Editor/Util/ImageUtil_impl.h
new file mode 100644
index 0000000000..7e3f7c4f13
--- /dev/null
+++ b/Code/Editor/Util/ImageUtil_impl.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#ifndef CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H
+#define CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H
+#pragma once
+
+#include "Include/IImageUtil.h"
+
+class CImageUtil_impl
+    : public IImageUtil
+{
+public:
+    CImageUtil_impl(){}
+    ~CImageUtil_impl(){}
+
+    //! Load image, detect image type by file extension.
+    // Arguments:
+    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
+    virtual bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0) override;
+
+    //! Save image, detect image type by file extension.
+    virtual bool SaveImage(const QString& fileName, CImageEx& image) override;
+
+    // General image fucntions
+    virtual bool LoadJPEG(const QString& strFileName, CImageEx& image) override;
+
+    virtual bool SaveJPEG(const QString& strFileName, CImageEx& image) override;
+
+    virtual bool SaveBitmap(const QString& szFileName, CImageEx& image) override;
+
+    virtual bool LoadBmp(const QString& file, CImageEx& image) override;
+
+    virtual bool SavePGM(const QString& fileName, const CImageEx& image) override;
+
+    virtual bool LoadPGM(const QString& fileName, CImageEx& image) override;
+
+    //! Scale source image to fit size of target image.
+    virtual void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage) override;
+
+    //! Scale source image to fit size of target image.
+    virtual void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage) override;
+
+    //! Scale source image to fit twice side by side in target image.
+    virtual void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage) override;
+
+    //! Scale source image twice down image with filtering
+    enum _EAddrMode
+    {
+        WRAP, CLAMP
+    };
+    virtual void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage,
+        IImageUtil::_EAddrMode eAddressingMode = IImageUtil::WRAP) override;
+
+    //! Smooth image.
+    virtual void SmoothImage(CByteImage& image, int numSteps) override;
+
+    //! behavior outside of the texture is not defined
+    //! \param iniX in fix point 24.8
+    //! \param iniY in fix point 24.8
+    //! \return 0..255
+    virtual unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image) override;
+};
+#endif // CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H
diff --git a/Code/Editor/Util/IndexedFiles.cpp b/Code/Editor/Util/IndexedFiles.cpp
new file mode 100644
index 0000000000..ea50cf6423
--- /dev/null
+++ b/Code/Editor/Util/IndexedFiles.cpp
@@ -0,0 +1,201 @@
+/*
+ * 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 : Tagged files database for 'SmartFileOpen' dialog
+
+#include "EditorDefs.h"
+
+#include "IndexedFiles.h"
+
+volatile TIntAtomic CIndexedFiles::s_bIndexingDone;
+CIndexedFiles* CIndexedFiles::s_pIndexedFiles = NULL;
+
+bool CIndexedFiles::m_startedFileIndexing = false;
+
+void CIndexedFiles::Initialize(const QString& path, IFileUtil::ScanDirectoryUpdateCallBack updateCB)
+{
+    m_files.clear();
+    m_pathToIndex.clear();
+    m_tags.clear();
+    m_rootPath = path;
+
+    bool anyFiles = CFileUtil::ScanDirectory(path, "*.*", m_files, true, true, updateCB);
+
+    if (anyFiles == false)
+    {
+        m_files.clear();
+        return;
+    }
+
+    if (updateCB)
+    {
+        updateCB("Parsing & tagging...");
+    }
+
+    for (int i = 0; i < m_files.size(); ++i)
+    {
+        m_pathToIndex[m_files[i].filename] = i;
+    }
+
+    PrepareTagTable();
+
+    InvokeUpdateCallbacks();
+}
+
+void CIndexedFiles::AddFile(const IFileUtil::FileDesc& path)
+{
+    assert(m_pathToIndex.find(path.filename) == m_pathToIndex.end());
+    m_files.push_back(path);
+    m_pathToIndex[path.filename] = m_files.size() - 1;
+    QStringList tags;
+    GetTags(tags, path.filename);
+    for (int k = 0; k < tags.size(); ++k)
+    {
+        m_tags[tags[k]].insert(m_files.size() - 1);
+    }
+}
+
+void CIndexedFiles::RemoveFile(const QString& path)
+{
+    if (m_pathToIndex.find(path) == m_pathToIndex.end())
+    {
+        return;
+    }
+    std::map<QString, int>::iterator itr = m_pathToIndex.find(path);
+    int index = itr->second;
+    m_pathToIndex.erase(itr);
+    m_files.erase(m_files.begin() + index);
+    QStringList tags;
+    GetTags(tags, path);
+    for (int k = 0; k < tags.size(); ++k)
+    {
+        m_tags[tags[k]].erase(index);
+    }
+}
+
+void CIndexedFiles::Refresh(const QString& path, bool recursive)
+{
+    IFileUtil::FileArray files;
+    bool anyFiles = CFileUtil::ScanDirectory(m_rootPath, Path::Make(path, "*.*"), files, recursive, recursive ? true : false);
+
+    if (anyFiles == false)
+    {
+        return;
+    }
+
+    for (int i = 0; i < files.size(); ++i)
+    {
+        if (m_pathToIndex.find(files[i].filename) == m_pathToIndex.end())
+        {
+            AddFile(files[i]);
+        }
+    }
+
+    InvokeUpdateCallbacks();
+}
+
+void CIndexedFiles::GetFilesWithTags(IFileUtil::FileArray& files, const QStringList& tags) const
+{
+    files.clear();
+    if (tags.empty())
+    {
+        return;
+    }
+    int_set candidates;
+    TagTable::const_iterator i;
+    // Gets candidate files from the first tag.
+    for (i = m_tags.begin(); i != m_tags.end(); ++i)
+    {
+        if (i->first.startsWith(tags[0]))
+        {
+            candidates.insert(i->second.begin(), i->second.end());
+        }
+    }
+    // Reduces the candidates further using additional tags, if any.
+    for (int k = 1; k < tags.size(); ++k)
+    {
+        // Gathers the filter set.
+        int_set filter;
+        for (i = m_tags.begin(); i != m_tags.end(); ++i)
+        {
+            if (i->first.startsWith(tags[k]))
+            {
+                filter.insert(i->second.begin(), i->second.end());
+            }
+        }
+
+        // Filters the candidates using it.
+        for (int_set::iterator m = candidates.begin(); m != candidates.end(); )
+        {
+            if (filter.find(*m) == filter.end())
+            {
+                int_set::iterator target = m;
+                ++m;
+                candidates.erase(target);
+            }
+            else
+            {
+                ++m;
+            }
+        }
+    }
+    // Outputs the result.
+    files.reserve(candidates.size());
+    for (int_set::const_iterator m = candidates.begin(); m != candidates.end(); ++m)
+    {
+        files.push_back(m_files[*m]);
+    }
+}
+
+void CIndexedFiles::GetTags(QStringList& tags, const QString& path) const
+{
+    tags = path.split(QRegularExpression(QStringLiteral(R"([\\/.])")), Qt::SkipEmptyParts);
+}
+
+void CIndexedFiles::GetTagsOfPrefix(QStringList& tags, const QString& prefix) const
+{
+    tags.clear();
+    TagTable::const_iterator i;
+    for (i = m_tags.begin(); i != m_tags.end(); ++i)
+    {
+        if (i->first.startsWith(prefix))
+        {
+            tags.push_back(i->first);
+        }
+    }
+}
+
+void CIndexedFiles::PrepareTagTable()
+{
+    QStringList tags;
+    for (int i = 0; i < m_files.size(); ++i)
+    {
+        GetTags(tags, m_files[i].filename);
+        for (int k = 0; k < tags.size(); ++k)
+        {
+            m_tags[tags[k]].insert(i);
+        }
+    }
+}
+
+void CIndexedFiles::AddUpdateCallback(std::function<void()> updateCallback)
+{
+    CryAutoLock<CryMutex> lock(m_updateCallbackMutex);
+
+    m_updateCallbacks.push_back(updateCallback);
+}
+
+void CIndexedFiles::InvokeUpdateCallbacks()
+{
+    CryAutoLock<CryMutex> lock(m_updateCallbackMutex);
+
+    for (auto updateCallback : m_updateCallbacks)
+    {
+        updateCallback();
+    }
+}
diff --git a/Code/Editor/Util/IndexedFiles.h b/Code/Editor/Util/IndexedFiles.h
new file mode 100644
index 0000000000..a0328b0837
--- /dev/null
+++ b/Code/Editor/Util/IndexedFiles.h
@@ -0,0 +1,175 @@
+/*
+ * 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 : Tagged files database for 'SmartFileOpen' dialog
+//
+// Notice      : Refer  SmartFileOpenDialog h
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_INDEXEDFILES_H
+#define CRYINCLUDE_EDITOR_UTIL_INDEXEDFILES_H
+#pragma once
+
+
+#include "FileUtil.h"
+#include <functional>
+
+class CIndexedFiles
+{
+    friend class CFileIndexingThread;
+public:
+    static CIndexedFiles& GetDB()
+    {
+        if (!s_pIndexedFiles)
+        {
+            assert(!"CIndexedFiles not created! Make sure you use CIndexedFiles::GetDB() after CIndexedFiles::StartFileIndexing() is called.");
+        }
+        assert(s_pIndexedFiles);
+        return *s_pIndexedFiles;
+    }
+
+    static bool HasFileIndexingDone()
+    { return s_bIndexingDone > 0; }
+
+    static void Create()
+    {
+        assert(!s_pIndexedFiles);
+        s_pIndexedFiles = new CIndexedFiles;
+    }
+
+    static void Destroy()
+    {
+        SAFE_DELETE(s_pIndexedFiles);
+    }
+
+    static void StartFileIndexing()
+    {
+        assert(s_bIndexingDone == 0);
+        assert(s_pIndexedFiles);
+
+        if (!s_pIndexedFiles)
+        {
+            return;
+        }
+
+        GetFileIndexingThread().Start(-1, "FileIndexing");
+        m_startedFileIndexing = true;
+    }
+
+    static void AbortFileIndexing()
+    {
+        if (!m_startedFileIndexing)
+        {
+            return;
+        }
+
+        if (HasFileIndexingDone() == false)
+        {
+            GetFileIndexingThread().Abort();
+        }
+        m_startedFileIndexing = false;
+    }
+
+    static void RegisterCallback(std::function<void()> callback)
+    {
+        assert(s_pIndexedFiles);
+        if (!s_pIndexedFiles)
+        {
+            return;
+        }
+
+        s_pIndexedFiles->AddUpdateCallback(callback);
+    }
+
+public:
+    void Initialize(const QString& path, IFileUtil::ScanDirectoryUpdateCallBack updateCB = NULL);
+
+    // Adds a new file to the database.
+    void AddFile(const IFileUtil::FileDesc& path);
+    // Removes a no-longer-existing file from the database.
+    void RemoveFile(const QString& path);
+    // Refreshes this database for the subdirectory.
+    void Refresh(const QString& path, bool recursive = true);
+
+    void GetFilesWithTags(IFileUtil::FileArray& files, const QStringList& tags) const;
+
+    //! This method returns all the tags which start with a given prefix.
+    //! It is useful for the tag auto-completion.
+    void GetTagsOfPrefix(QStringList& tags, const QString& prefix) const;
+
+    uint32 GetTotalCount() const
+    { return (uint32)m_files.size(); }
+
+private:
+    static bool m_startedFileIndexing;
+
+    std::vector <std::function<void()> > m_updateCallbacks;
+    IFileUtil::FileArray m_files;
+    std::map<QString, int> m_pathToIndex;
+    typedef std::set<int, std::less<int> > int_set;
+    typedef std::map<QString, int_set, std::less<QString> > TagTable;
+    TagTable m_tags;
+    QString m_rootPath;
+
+    void GetTags(QStringList& tags, const QString& path) const;
+    void PrepareTagTable();
+
+    CryMutex m_updateCallbackMutex;
+
+    void AddUpdateCallback(std::function<void()> updateCallback);
+    void InvokeUpdateCallbacks();
+
+    // A done flag for the background file indexing
+    static volatile TIntAtomic s_bIndexingDone;
+    // A thread for the background file indexing
+    class CFileIndexingThread
+        : public CryThread<CFileIndexingThread>
+    {
+    public:
+        virtual void Run()
+        {
+            CIndexedFiles::GetDB().Initialize("@assets@", CallBack);
+            CryInterlockedAdd(CIndexedFiles::s_bIndexingDone.Addr(), 1);
+        }
+
+        CFileIndexingThread()
+            : m_abort(false) {}
+
+        void Abort()
+        {
+            m_abort = true;
+            WaitForThread();
+        }
+
+        virtual ~CFileIndexingThread()
+        {
+            Abort();
+        }
+    private:
+        bool m_abort;
+        static bool CallBack([[maybe_unused]] const QString& msg)
+        {
+            if (CIndexedFiles::GetFileIndexingThread().m_abort)
+            {
+                return false;
+            }
+            return true;
+        }
+    };
+
+    static CFileIndexingThread& GetFileIndexingThread()
+    {
+        static CFileIndexingThread s_fileIndexingThread;
+
+        return s_fileIndexingThread;
+    }
+
+    // A global database for tagged files
+    static CIndexedFiles* s_pIndexedFiles;
+};
+#endif // CRYINCLUDE_EDITOR_UTIL_INDEXEDFILES_H
diff --git a/Code/Editor/Util/KDTree.cpp b/Code/Editor/Util/KDTree.cpp
new file mode 100644
index 0000000000..138176f152
--- /dev/null
+++ b/Code/Editor/Util/KDTree.cpp
@@ -0,0 +1,571 @@
+/*
+ * 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] = NULL;
+        pChildren[1] = NULL;
+        pVertexIndices = NULL;
+    }
+    ~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] == NULL && pChildren[1] == NULL;
+    }
+    KDTreeNode* GetChild(uint32 nIndex) const
+    {
+        if (nIndex > 1)
+        {
+            return NULL;
+        }
+        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(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 == NULL)
+        {
+            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 == NULL)
+        {
+            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 = NULL;
+}
+
+CKDTree::~CKDTree()
+{
+    if (m_pRootNode)
+    {
+        delete m_pRootNode;
+    }
+}
+
+bool CKDTree::Build(IStatObj* pStatObj)
+{
+    if (pStatObj == NULL)
+    {
+        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(m_StatObjectList.size()); i < iStatObjSize; ++i)
+    {
+        IIndexedMesh* pMesh = m_StatObjectList[i].pStatObj->GetIndexedMesh(true);
+        if (pMesh == NULL)
+        {
+            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 == NULL)
+    {
+        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() && nObjIndex >= 0);
+
+            const SStatObj* pStatObjInfo = &(m_StatObjectList[nObjIndex]);
+
+            IIndexedMesh* pMesh = m_StatObjectList[nObjIndex].pStatObj->GetIndexedMesh();
+            if (pMesh == NULL)
+            {
+                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
new file mode 100644
index 0000000000..9a24d89560
--- /dev/null
+++ b/Code/Editor/Util/KDTree.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
+ *
+ */
+
+
+#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;
+        _smart_ptr<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/Mailer.h b/Code/Editor/Util/Mailer.h
new file mode 100644
index 0000000000..7a3bc1682a
--- /dev/null
+++ b/Code/Editor/Util/Mailer.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_MAILER_H
+#define CRYINCLUDE_EDITOR_UTIL_MAILER_H
+#pragma once
+
+
+//////////////////////////////////////////////////////////////////////////
+class CMailer
+{
+public:
+    static bool SendMail(const char* _subject,                // E-Mail Subject
+        const char* _messageBody,         // Message Text
+        const std::vector<const char*>& _recipients,  // All Recipients' Addresses
+        const std::vector<const char*>& _attachments, // All File Attachments
+        bool bShowDialog);   // Whether to allow editing by user
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_MAILER_H
diff --git a/Code/Editor/Util/Math.h b/Code/Editor/Util/Math.h
new file mode 100644
index 0000000000..4f900b80ed
--- /dev/null
+++ b/Code/Editor/Util/Math.h
@@ -0,0 +1,330 @@
+/*
+ * 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 : Various math and geometry related functions.
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_MATH_H
+#define CRYINCLUDE_EDITOR_UTIL_MATH_H
+#pragma once
+
+
+//! Half PI
+#define PI_HALF (3.1415926535897932384626433832795f / 2.0f)
+
+//! Epsilon for vector comparasion.
+#define FLOAT_EPSILON 0.000001f
+
+//////////////////////////////////////////////////////////////////////////
+/** Compare two vectors if they are equal.
+*/
+inline bool IsVectorsEqual(const Vec3& v1, const Vec3& v2, const float aEpsilon = FLOAT_EPSILON)
+{
+    return (fabs(v2.x - v1.x) < aEpsilon && fabs(v2.y - v1.y) < aEpsilon && fabs(v2.z - v1.z) < aEpsilon);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Math utilities.
+//////////////////////////////////////////////////////////////////////////
+inline float PointToLineDistance2D(const Vec3& p1, const Vec3& p2, const Vec3& p3)
+{
+    float dx = p2.x - p1.x;
+    float dy = p2.y - p1.y;
+    if (dx + dy == 0)
+    {
+        return (float)sqrt((p3.x - p1.x) * (p3.x - p1.x) + (p3.y - p1.y) * (p3.y - p1.y));
+    }
+    float u = ((p3.x - p1.x) * dx + (p3.y - p1.y) * dy) / (dx * dx + dy * dy);
+    if (u < 0)
+    {
+        return (float)sqrt((p3.x - p1.x) * (p3.x - p1.x) + (p3.y - p1.y) * (p3.y - p1.y));
+    }
+    else if (u > 1)
+    {
+        return (float)sqrt((p3.x - p2.x) * (p3.x - p2.x) + (p3.y - p2.y) * (p3.y - p2.y));
+    }
+    else
+    {
+        float x = p1.x + u * dx;
+        float y = p1.y + u * dy;
+        return (float)sqrt((p3.x - x) * (p3.x - x) + (p3.y - y) * (p3.y - y));
+    }
+}
+
+inline float PointToLineDistance(const Vec3& p1, const Vec3& p2, const Vec3& p3)
+{
+    Vec3 d = p2 - p1;
+    float u = d.Dot(p3 - p1) / (d).GetLengthSquared();
+    if (u < 0)
+    {
+        return (p3 - p1).GetLength();
+    }
+    else if (u > 1)
+    {
+        return (p3 - p2).GetLength();
+    }
+    else
+    {
+        Vec3 p = p1 + u * d;
+        return (p3 - p).GetLength();
+    }
+}
+
+/** Calculate distance between point and line.
+    @param p1 Source line point.
+    @param p2 Target line point.
+    @param p3 Point to find intersecion with.
+    @param intersectPoint Intersection point on the line.
+    @return Distance between point and line.
+*/
+inline float PointToLineDistance(const Vec3& p1, const Vec3& p2, const Vec3& p3, Vec3& intersectPoint)
+{
+    Vec3 d = p2 - p1;
+    float fLength2 = d.GetLengthSquared();
+
+    if (fLength2 < 0.00001f)
+    {
+        // p1-p2 is degenerated to a point
+        intersectPoint = p1;
+        return (p3 - p1).GetLength();
+    }
+
+    float u = d.Dot(p3 - p1) / fLength2;
+    if (u < 0)
+    {
+        intersectPoint = p1;
+        return (p3 - p1).GetLength();
+    }
+    else if (u > 1)
+    {
+        intersectPoint = p2;
+        return (p3 - p2).GetLength();
+    }
+    else
+    {
+        Vec3 p = p1 + u * d;
+        intersectPoint = p;
+        return (p3 - p).GetLength();
+    }
+}
+
+/**
+    Function: LineLineIntersect( const Vec3 &p1, const Vec3 &p2, const Vec3 &p3, const Vec3 &p4, Vec3 &pa, Vec3 &pb, float &mua, float &mub )
+    paulbourke.net/
+    Copyright Paul Bourke or a third party contributor where indicated.  This source code may be freely used provided credits are given to the author.
+
+    Calculate the line segment PaPb that is the shortest route between
+    two lines P1P2 and P3P4. Calculate also the values of mua and mub where
+      Pa = P1 + mua (P2 - P1)
+      Pb = P3 + mub (P4 - P3)
+
+    @param p1 Source point of first line.
+    @param p2 Target point of first line.
+    @param p3 Source point of second line.
+    @param p4 Target point of second line.
+    @return FALSE if no solution exists.
+*/
+inline bool LineLineIntersect(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4,
+    Vec3& pa, Vec3& pb, float& mua, float& mub)
+{
+    Vec3 p13, p43, p21;
+    float d1343, d4321, d1321, d4343, d2121;
+    float numer, denom;
+
+    p13.x = p1.x - p3.x;
+    p13.y = p1.y - p3.y;
+    p13.z = p1.z - p3.z;
+    p43.x = p4.x - p3.x;
+    p43.y = p4.y - p3.y;
+    p43.z = p4.z - p3.z;
+    if (fabs(p43.x)  < LINE_EPS && fabs(p43.y)  < LINE_EPS && fabs(p43.z)  < LINE_EPS)
+    {
+        return false;
+    }
+    p21.x = p2.x - p1.x;
+    p21.y = p2.y - p1.y;
+    p21.z = p2.z - p1.z;
+    if (fabs(p21.x)  < LINE_EPS && fabs(p21.y)  < LINE_EPS && fabs(p21.z)  < LINE_EPS)
+    {
+        return false;
+    }
+
+    d1343 = p13.x * p43.x + p13.y * p43.y + p13.z * p43.z;
+    d4321 = p43.x * p21.x + p43.y * p21.y + p43.z * p21.z;
+    d1321 = p13.x * p21.x + p13.y * p21.y + p13.z * p21.z;
+    d4343 = p43.x * p43.x + p43.y * p43.y + p43.z * p43.z;
+    d2121 = p21.x * p21.x + p21.y * p21.y + p21.z * p21.z;
+
+    denom = d2121 * d4343 - d4321 * d4321;
+    if (fabs(denom) < LINE_EPS)
+    {
+        return false;
+    }
+    numer = d1343 * d4321 - d1321 * d4343;
+
+    mua = numer / denom;
+    mub = (d1343 + d4321 * (mua)) / d4343;
+
+    pa.x = p1.x + mua * p21.x;
+    pa.y = p1.y + mua * p21.y;
+    pa.z = p1.z + mua * p21.z;
+    pb.x = p3.x + mub * p43.x;
+    pb.y = p3.y + mub * p43.y;
+    pb.z = p3.z + mub * p43.z;
+
+    return true;
+}
+
+/*!
+        Calculates shortest distance between ray and a arbitary line segment.
+        @param raySrc Source point of ray.
+        @param rayTrg Target point of ray.
+        @param p1 First point of line segment.
+        @param p2 Second point of line segment.
+        @param intersectPoint This parameter returns nearest point on line segment to ray.
+        @return distance fro ray to line segment.
+*/
+inline float RayToLineDistance(const Vec3& raySrc, const Vec3& rayTrg, const Vec3& p1, const Vec3& p2, Vec3& nearestPoint)
+{
+    Vec3 intPnt;
+    Vec3 rayLineP1 = raySrc;
+    Vec3 rayLineP2 = rayTrg;
+    Vec3 pa, pb;
+    float ua, ub;
+
+    if (!LineLineIntersect(p1, p2, rayLineP1, rayLineP2, pa, pb, ua, ub))
+    {
+        return FLT_MAX;
+    }
+
+    float d = 0;
+    if (ua < 0)
+    {
+        d = PointToLineDistance(rayLineP1, rayLineP2, p1, intPnt);
+    }
+    else if (ua > 1)
+    {
+        d = PointToLineDistance(rayLineP1, rayLineP2, p2, intPnt);
+    }
+    else
+    {
+        intPnt = rayLineP1 + ub * (rayLineP2 - rayLineP1);
+        d = (pb - pa).GetLength();
+    }
+    nearestPoint = intPnt;
+    return d;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline Matrix34 MatrixFromVector(const Vec3& dir, const Vec3& up = Vec3(0, 0, 1.0f), float rollAngle = 0)
+{
+    // LookAt transform.
+    Vec3 xAxis, yAxis, zAxis;
+    Vec3 upVector = up;
+
+    if (dir.IsZero())
+    {
+        Matrix33 tm;
+        tm.SetIdentity();
+        return tm;
+    }
+
+    yAxis = dir.GetNormalized();
+
+    if (yAxis.x == 0 && yAxis.y == 0)
+    {
+        upVector.Set(-yAxis.z, 0, 0);
+    }
+
+    xAxis = upVector.Cross(yAxis).GetNormalized();
+    zAxis = xAxis.Cross(yAxis).GetNormalized();
+
+    Matrix33 tm;
+    tm.SetFromVectors(xAxis, yAxis, zAxis);
+
+    if (rollAngle != 0)
+    {
+        Matrix33 RollMtx;
+        RollMtx.SetRotationY(rollAngle);
+
+        // Matrix multiply.
+        tm = RollMtx * tm;
+    }
+
+    return tm;
+}
+
+//TODO: could we include this function in the core engine math Intersect namespace ?
+namespace Intersect
+{
+    //! handy function for Ray AABB intersection, the Ray object is created inside
+    inline uint8 Ray_AABB(const Vec3& rRayStart, const Vec3& rRayDir, const AABB& rBox, Vec3& rOutPt)
+    {
+        return Ray_AABB(Ray(rRayStart, rRayDir), rBox, rOutPt);
+    }
+
+    //! Check if ray intersect edge of bounding box.
+    //! @param epsilonDist if distance between ray and egde is less then this epsilon then edge was intersected.
+    //! @param dist Distance between ray and edge.
+    //! @param intPnt intersection point.
+    inline bool Ray_AABBEdge(const Vec3& raySrc, const Vec3& rayDir, const AABB& aabb, float epsilonDist, float& dist, Vec3& intPnt)
+    {
+        // Check 6 group lines.
+        Vec3 rayTrg = raySrc + rayDir * 10000.0f;
+        Vec3 pnt[12];
+
+        float d[12];
+
+        // Near
+        d[0] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.max.z), Vec3(aabb.max.x, aabb.min.y, aabb.max.z), pnt[0]);
+        d[1] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.max.y, aabb.max.z), Vec3(aabb.max.x, aabb.max.y, aabb.max.z), pnt[1]);
+        d[2] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.max.z), Vec3(aabb.min.x, aabb.max.y, aabb.max.z), pnt[2]);
+        d[3] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.max.x, aabb.min.y, aabb.max.z), Vec3(aabb.max.x, aabb.max.y, aabb.max.z), pnt[3]);
+
+        // Far
+        d[4] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.min.z), Vec3(aabb.max.x, aabb.min.y, aabb.min.z), pnt[4]);
+        d[5] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.max.y, aabb.min.z), Vec3(aabb.max.x, aabb.max.y, aabb.min.z), pnt[5]);
+        d[6] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.min.z), Vec3(aabb.min.x, aabb.max.y, aabb.min.z), pnt[6]);
+        d[7] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.max.x, aabb.min.y, aabb.min.z), Vec3(aabb.max.x, aabb.max.y, aabb.min.z), pnt[7]);
+
+        // Sides.
+        d[8] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.min.z), Vec3(aabb.min.x, aabb.min.y, aabb.max.z), pnt[8]);
+        d[9] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.max.x, aabb.min.y, aabb.min.z), Vec3(aabb.max.x, aabb.min.y, aabb.max.z), pnt[9]);
+        d[10] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.max.y, aabb.min.z), Vec3(aabb.min.x, aabb.max.y, aabb.max.z), pnt[10]);
+        d[11] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.max.x, aabb.max.y, aabb.min.z), Vec3(aabb.max.x, aabb.max.y, aabb.max.z), pnt[11]);
+
+        dist = FLT_MAX;
+        for (int i = 0; i < 12; i++)
+        {
+            if (d[i] < dist)
+            {
+                dist = d[i];
+                intPnt = pnt[i];
+            }
+        }
+        if (dist < epsilonDist)
+        {
+            return true;
+        }
+        return false;
+    }
+};
+
+inline int gcd(int a, int b)
+{
+    int c = a % b;
+    while (c != 0)
+    {
+        a = b;
+        b = c;
+        c = a % b;
+    }
+    return b;
+}
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_MATH_H
diff --git a/Code/Editor/Util/MemoryBlock.cpp b/Code/Editor/Util/MemoryBlock.cpp
new file mode 100644
index 0000000000..d60e7fde59
--- /dev/null
+++ b/Code/Editor/Util/MemoryBlock.cpp
@@ -0,0 +1,203 @@
+/*
+ * 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 "MemoryBlock.h"
+#include "Include/ILogFile.h"
+#include <zlib.h>
+
+#include <QMessageBox>
+#include <QApplication>
+
+//////////////////////////////////////////////////////////////////////////
+CMemoryBlock::CMemoryBlock()
+    : m_buffer(0)
+    , m_size(0)
+    , m_uncompressedSize(0)
+    , m_owns(false)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CMemoryBlock::CMemoryBlock(const CMemoryBlock& mem)
+{
+    *this = mem;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CMemoryBlock::~CMemoryBlock()
+{
+    Free();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CMemoryBlock& CMemoryBlock::operator=(const CMemoryBlock& mem)
+{
+    if (mem.GetSize() > 0)
+    {
+        // Do not reallocate.
+        if (mem.GetSize() > GetSize())
+        {
+            if (!Allocate(mem.GetSize()))
+            {
+                return *this;
+            }
+        }
+        Copy(mem.GetBuffer(), mem.GetSize());
+    }
+    else
+    {
+        m_buffer = 0;
+        m_size = 0;
+        m_owns = false;
+    }
+    m_uncompressedSize = mem.m_uncompressedSize;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CMemoryBlock::Allocate(int size, int uncompressedSize)
+{
+    assert(size > 0);
+    if (m_buffer)
+    {
+        m_buffer = realloc(m_buffer, size);
+    }
+    else
+    {
+        m_buffer = malloc(size);
+    }
+    if (!m_buffer)
+    {
+        QString str;
+        str = QStringLiteral("CMemoryBlock::Allocate failed to allocate %1Mb of Memory").arg(size / (1024 * 1024));
+        CryLogAlways(str.toUtf8().data());
+
+        QMessageBox::critical(QApplication::activeWindow(), QString(), str + QString("\r\nSandbox will try to reduce its working memory set to free memory for this allocation."));
+        GetIEditor()->ReduceMemory();
+        if (m_buffer)
+        {
+            m_buffer = realloc(m_buffer, size);
+        }
+        else
+        {
+            m_buffer = malloc(size);
+        }
+        if (!m_buffer)
+        {
+            GetIEditor()->GetLogFile()->Warning("Reducing working memory set failed, Sandbox must quit");
+        }
+        else
+        {
+            GetIEditor()->GetLogFile()->Warning("Reducing working memory set succeeded\r\nSandbox may become unstable, it is advised to save the level and restart editor.");
+        }
+    }
+
+    m_owns = true;
+    m_size = size;
+    m_uncompressedSize = uncompressedSize;
+    // Check if allocation failed.
+    if (m_buffer == 0)
+    {
+        return false;
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CMemoryBlock::Free()
+{
+    if (m_buffer && m_owns)
+    {
+        free(m_buffer);
+    }
+    m_buffer = 0;
+    m_owns = false;
+    m_size = 0;
+    m_uncompressedSize = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CMemoryBlock::Copy(void* src, int size)
+{
+    assert(size <= m_size);
+    memcpy(m_buffer, src, size);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CMemoryBlock::Attach(void* buffer, int size, int uncompressedSize)
+{
+    Free();
+    m_owns = false;
+    m_buffer = buffer;
+    m_size = size;
+    m_uncompressedSize = uncompressedSize;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CMemoryBlock::Detach()
+{
+    Free();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CMemoryBlock::Compress(CMemoryBlock& toBlock) const
+{
+    // Cannot compress to itself.
+    assert(this != &toBlock);
+    unsigned long destSize = m_size * 2 + 128;
+    CMemoryBlock temp;
+    temp.Allocate(destSize);
+
+    compress((unsigned char*)temp.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), m_size);
+
+    toBlock.Allocate(destSize);
+    toBlock.Copy(temp.GetBuffer(), destSize);
+    toBlock.m_uncompressedSize = GetSize();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CMemoryBlock::Uncompress(CMemoryBlock& toBlock) const
+{
+    assert(this != &toBlock);
+    toBlock.Allocate(m_uncompressedSize);
+    toBlock.m_uncompressedSize = 0;
+    unsigned long destSize = m_uncompressedSize;
+#if !defined(NDEBUG)
+    int result =
+#endif
+        uncompress((unsigned char*)toBlock.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), GetSize());
+    assert(result == Z_OK);
+    assert(destSize == m_uncompressedSize);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CMemoryBlock::Serialize(CArchive& ar)
+{
+    if (ar.IsLoading())
+    {
+        int size;
+        // Loading.
+        ar >> size;
+        if (size != m_size)
+        {
+            Allocate(size);
+        }
+        m_size = size;
+        ar >> m_uncompressedSize;
+        ar.Read(m_buffer, m_size);
+    }
+    else
+    {
+        // Saving.
+        ar << m_size;
+        ar << m_uncompressedSize;
+        ar.Write(m_buffer, m_size);
+    }
+}
diff --git a/Code/Editor/Util/MemoryBlock.h b/Code/Editor/Util/MemoryBlock.h
new file mode 100644
index 0000000000..ecdc522557
--- /dev/null
+++ b/Code/Editor/Util/MemoryBlock.h
@@ -0,0 +1,81 @@
+/*
+ * 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 : Memory block helper used with ZLib
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_MEMORYBLOCK_H
+#define CRYINCLUDE_EDITOR_UTIL_MEMORYBLOCK_H
+#pragma once
+#include "RefCountBase.h"
+
+#include "Include/EditorCoreAPI.h"
+struct IEditor;
+class CArchive;
+
+class EDITOR_CORE_API CMemoryBlock
+    : public CRefCountBase
+{
+public:
+    CMemoryBlock();
+    CMemoryBlock(const CMemoryBlock& mem);
+    ~CMemoryBlock();
+
+    CMemoryBlock& operator=(const CMemoryBlock& mem);
+
+    //! Allocate or reallocate memory for this block.
+    //! @param size Amount of memory in bytes to allocate.
+    //! @return true if the allocation succeeded.
+    bool Allocate(int size, int uncompressedSize = 0);
+
+    //! Frees memory allocated in this block (if owned).
+    //! Just clears internal references (if unowned).
+    void Free();
+
+    //! Attach memory buffer to this block.
+    //! Ownership is not transferred; this buffer will not be deleted by CMemoryBlock
+    void Attach(void* buffer, int size, int uncompressedSize = 0);
+
+    //! Detach memory buffer that was previously attached.
+    //! Note: Implemented as Free()
+    void Detach();
+
+    //! Returns amount of allocated memory in this block.
+    int GetSize() const { return m_size; }
+
+    //! Returns amount of allocated memory in this block.
+    int GetUncompressedSize() const { return m_uncompressedSize; }
+
+    void* GetBuffer() const { return m_buffer; };
+
+    //! Copy memory range to memory block.
+    void Copy(void* src, int size);
+
+    //! Compress this memory block to specified memory block.
+    //! @param toBlock target memory block where compressed result will be stored.
+    void Compress(CMemoryBlock& toBlock) const;
+
+    //! Uncompress this memory block to specified memory block.
+    //! @param toBlock target memory block where compressed result will be stored.
+    void Uncompress(CMemoryBlock& toBlock) const;
+
+    //! Serialize memory block to archive.
+    void Serialize(CArchive& ar);
+
+    //! Is MemoryBlock is empty.
+    bool IsEmpty() const { return m_buffer == 0; }
+
+private:
+    void* m_buffer;
+    int m_size;
+    //! If not 0, memory block is compressed.
+    int m_uncompressedSize;
+    //! True if memory block owns its memory.
+    bool m_owns;
+};
+#endif // CRYINCLUDE_EDITOR_UTIL_MEMORYBLOCK_H
diff --git a/Code/Editor/Util/ModalWindowDismisser.cpp b/Code/Editor/Util/ModalWindowDismisser.cpp
new file mode 100644
index 0000000000..1d380f5901
--- /dev/null
+++ b/Code/Editor/Util/ModalWindowDismisser.cpp
@@ -0,0 +1,73 @@
+/*
+ * 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 : Utility for dismissing every modal windows
+
+#include "EditorDefs.h"
+
+#include "ModalWindowDismisser.h"
+
+// Qt
+#include <QDialog>
+#include <QTimer>
+
+ModalWindowDismisser::ModalWindowDismisser()
+{
+    qApp->installEventFilter(this);
+}
+
+ModalWindowDismisser::~ModalWindowDismisser()
+{
+    if (qApp)
+    {
+        qApp->removeEventFilter(this);
+    }
+}
+
+void ModalWindowDismisser::DismissWindows()
+{
+    for (QDialog* dialog : m_windows)
+    {
+        dialog->close();
+    }
+    m_windows.clear();
+    m_dissmiss = false;
+}
+
+bool ModalWindowDismisser::eventFilter(QObject* object, QEvent* event)
+{
+    if (QDialog* dialog = qobject_cast<QDialog*>(object))
+    {
+        if (dialog->isModal())
+        {
+            if (event->type() == QEvent::Show)
+            {
+                auto it = AZStd::find(m_windows.begin(), m_windows.end(), dialog);
+                if (it == m_windows.end())
+                {
+                    m_windows.push_back(dialog);
+                }
+                if (!m_dissmiss)
+                {
+                    // Closing the window at the same moment is opened leads to crashes and is unstable,
+                    // so do it after a long 1 ms
+                    QTimer::singleShot(1, this, &ModalWindowDismisser::DismissWindows);
+                    m_dissmiss = true;
+                }
+            }
+            else if (event->type() == QEvent::Close)
+            {
+                auto it = AZStd::find(m_windows.begin(), m_windows.end(), dialog);
+                if (it != m_windows.end())
+                {
+                    m_windows.erase(it);
+                }
+            }
+        }
+    }
+    return false;
+}
diff --git a/Code/Editor/Util/ModalWindowDismisser.h b/Code/Editor/Util/ModalWindowDismisser.h
new file mode 100644
index 0000000000..1c497bc7f8
--- /dev/null
+++ b/Code/Editor/Util/ModalWindowDismisser.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
+ *
+ */
+
+// Description : Utility for dismissing every modal windows
+#pragma once
+
+#include <QObject>
+
+class QDialog;
+
+class ModalWindowDismisser
+    : public QObject
+{
+public:
+    ModalWindowDismisser();
+    ~ModalWindowDismisser();
+
+private:
+    void DismissWindows();
+    bool eventFilter(QObject* object, QEvent* event) override;
+
+    std::vector<QDialog*> m_windows;
+    bool m_dissmiss = false;
+};
diff --git a/Code/Editor/Util/NamedData.cpp b/Code/Editor/Util/NamedData.cpp
new file mode 100644
index 0000000000..c36bac6c27
--- /dev/null
+++ b/Code/Editor/Util/NamedData.cpp
@@ -0,0 +1,367 @@
+/*
+ * 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 : Collection of Named data blocks.
+
+
+#include "EditorDefs.h"
+
+#include "NamedData.h"
+
+// Editor
+#include "Util/CryMemFile.h"    // for CryMemFile
+#include "Util/PakFile.h"       // for CPakFile
+
+
+//////////////////////////////////////////////////////////////////////////
+CNamedData::CNamedData()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CNamedData::~CNamedData()
+{
+    Clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CNamedData::AddDataBlock(const QString& blockName, void*   pData, int nSize, bool bCompress)
+{
+    assert(pData);
+    assert(nSize > 0);
+
+    DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
+    if (pBlock)
+    {
+        delete pBlock;
+    }
+
+    pBlock = new DataBlock();
+
+    pBlock->bFastCompression = !bCompress;
+
+    bCompress = false;
+
+    if (bCompress)
+    {
+        pBlock->bCompressed = true;
+        CMemoryBlock temp;
+        temp.Attach(pData, nSize);
+        temp.Compress(pBlock->compressedData);
+    }
+    else
+    {
+        pBlock->bCompressed = false;
+        pBlock->data.Allocate(nSize);
+        pBlock->data.Copy(pData, nSize);
+    }
+    m_blocks[blockName] = pBlock;
+}
+
+void CNamedData::AddDataBlock(const QString& blockName, CMemoryBlock& mem)
+{
+    DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
+    if (pBlock)
+    {
+        delete pBlock;
+    }
+    pBlock = new DataBlock();
+
+    pBlock->bFastCompression = false;
+
+    if (mem.GetUncompressedSize() != 0)
+    {
+        // This is compressed block.
+        pBlock->bCompressed = true;
+        pBlock->compressedData = mem;
+    }
+    else
+    {
+        pBlock->bCompressed = false;
+        pBlock->data = mem;
+    }
+    m_blocks[blockName] = pBlock;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CNamedData::Clear()
+{
+    for (TBlocks::iterator it = m_blocks.begin(); it != m_blocks.end(); ++it)
+    {
+        delete it->second;
+    }
+    m_blocks.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CNamedData::GetDataBlock(const QString& blockName, void*& pData, int& nSize)
+{
+    pData = 0;
+    nSize = 0;
+
+    bool bUncompressed = false;
+    CMemoryBlock* mem = GetDataBlock(blockName, bUncompressed);
+    if (mem)
+    {
+        pData = mem->GetBuffer();
+        nSize = mem->GetSize();
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CMemoryBlock* CNamedData::GetDataBlock(const QString& blockName, bool& bCompressed)
+{
+    DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
+    if (!pBlock)
+    {
+        return 0;
+    }
+
+    if (bCompressed)
+    {
+        // Return compressed data.
+        if (!pBlock->compressedData.IsEmpty())
+        {
+            return &pBlock->compressedData;
+        }
+    }
+    else
+    {
+        // Return normal data.
+        if (!pBlock->data.IsEmpty())
+        {
+            return &pBlock->data;
+        }
+        else
+        {
+            // Uncompress compressed block.
+            if (!pBlock->compressedData.IsEmpty())
+            {
+                pBlock->compressedData.Uncompress(pBlock->data);
+                return &pBlock->data;
+            }
+        }
+    }
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CNamedData::Serialize(CArchive& ar)
+{
+    if (ar.IsStoring())
+    {
+        int iSize = m_blocks.size();
+        ar << iSize;
+
+        for (TBlocks::iterator it = m_blocks.begin(); it != m_blocks.end(); it++)
+        {
+            QString key = it->first;
+            DataBlock* pBlock = it->second;
+
+            unsigned int nOriginalSize;
+            unsigned int nSizeFlags;
+            unsigned int flags = 0;
+
+            if (pBlock->bCompressed)
+            {
+                nOriginalSize = pBlock->compressedData.GetUncompressedSize();
+                // Compressed data.
+                unsigned long destSize = pBlock->compressedData.GetSize();
+                void* dest = pBlock->compressedData.GetBuffer();
+                nSizeFlags = destSize | (1 << 31);
+
+                ar << key;
+                ar << nSizeFlags; // Current size of data + 1 bit for compressed flag.
+                ar << nOriginalSize;    // Size of uncompressed data.
+                ar << flags;    // Some additional flags.
+                ar.Write(dest, destSize);
+            }
+            else
+            {
+                nOriginalSize = pBlock->data.GetSize();
+                void* dest = pBlock->data.GetBuffer();
+
+                nSizeFlags = nOriginalSize;
+                ar << key;
+                ar << nSizeFlags;
+                ar << nOriginalSize;    // Size of uncompressed data.
+                ar << flags;    // Some additional flags.
+                ar.Write(dest, nOriginalSize);
+            }
+        }
+    }
+    else
+    {
+        Clear();
+
+        int iSize;
+        ar >> iSize;
+
+        for (int i = 0; i < iSize && ar.status() == QDataStream::Ok; i++)
+        {
+            QString key;
+            unsigned int nSizeFlags = 0;
+            unsigned int nSize = 0;
+            unsigned int nOriginalSize = 0;
+            unsigned int flags = 0;
+            bool bCompressed = false;
+
+            DataBlock* pBlock = new DataBlock();
+
+            ar >> key;
+            ar >> nSizeFlags;
+            ar >> nOriginalSize;
+            ar >> flags;
+
+            nSize = nSizeFlags & (~(1 << 31));
+            bCompressed = (nSizeFlags & (1 << 31)) != 0;
+
+            if (nSize)
+            {
+                if (bCompressed)
+                {
+                    pBlock->compressedData.Allocate(nSize, nOriginalSize);
+                    void* pSrcData = pBlock->compressedData.GetBuffer();
+                    // Read compressed data.
+                    ar.Read(pSrcData, nSize);
+                }
+                else
+                {
+                    pBlock->data.Allocate(nSize);
+                    void* pSrcData = pBlock->data.GetBuffer();
+
+                    // Read uncompressed data.
+                    ar.Read(pSrcData, nSize);
+                }
+            }
+            m_blocks[key] = pBlock;
+        }
+    }
+
+    return ar.status() == QDataStream::Ok;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CNamedData::Save(CPakFile& pakFile)
+{
+    for (TBlocks::iterator it = m_blocks.begin(); it != m_blocks.end(); it++)
+    {
+        QString key = it->first;
+        DataBlock* pBlock = it->second;
+        if (!pBlock->bCompressed)
+        {
+            QString filename = key + ".editor_data";
+            pakFile.UpdateFile(filename.toUtf8().data(), pBlock->data, true, pBlock->bFastCompression ? AZ::IO::INestedArchive::LEVEL_FASTEST : AZ::IO::INestedArchive::LEVEL_BETTER);
+        }
+        else
+        {
+            int nOriginalSize = pBlock->compressedData.GetUncompressedSize();
+            CCryMemFile memFile;
+            // Write uncompressed data size.
+            memFile.Write(&nOriginalSize, sizeof(nOriginalSize));
+            // Write compressed data.
+            memFile.Write(pBlock->compressedData.GetBuffer(), pBlock->compressedData.GetSize());
+            pakFile.UpdateFile((key + ".editor_datac").toUtf8().data(), memFile, false);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CNamedData::Load(const QString& levelPath, [[maybe_unused]] CPakFile& pakFile)
+{
+    int i;
+    IFileUtil::FileArray files;
+    CFileUtil::ScanDirectory(levelPath, "*.editor_data", files, false);
+    for (i = 0; i < files.size(); i++)
+    {
+        QString filename = files[i].filename;
+        CCryFile cfile;
+        if (cfile.Open(Path::Make(levelPath, filename).toUtf8().data(), "rb"))
+        {
+            int fileSize = cfile.GetLength();
+            if (fileSize > 0)
+            {
+                QString key = Path::GetFileName(filename);
+                // Read data block.
+                DataBlock* pBlock = new DataBlock();
+                pBlock->data.Allocate(fileSize);
+                cfile.ReadRaw(pBlock->data.GetBuffer(), fileSize);
+                m_blocks[key] = pBlock;
+            }
+        }
+    }
+    files.clear();
+    // Scan compressed data.
+    CFileUtil::ScanDirectory(levelPath, "*.editor_datac", files, false);
+    for (i = 0; i < files.size(); i++)
+    {
+        QString filename = files[i].filename;
+        CCryFile cfile;
+        if (cfile.Open(Path::Make(levelPath, filename).toUtf8().data(), "rb"))
+        {
+            int fileSize = cfile.GetLength();
+            if (fileSize > 0)
+            {
+                // Read uncompressed data size.
+                int nOriginalSize = 0;
+                cfile.ReadType(&nOriginalSize);
+                // Read uncompressed data.
+                int nDataSize = fileSize - sizeof(nOriginalSize);
+
+                QString key = Path::GetFileName(filename);
+                // Read data block.
+                DataBlock* pBlock = new DataBlock();
+                pBlock->compressedData.Allocate(nDataSize, nOriginalSize);
+                cfile.ReadRaw(pBlock->compressedData.GetBuffer(), nDataSize);
+                m_blocks[key] = pBlock;
+            }
+        }
+    }
+
+    return true;
+}
+
+void CNamedData::SaveToFiles(const QString& rootPath)
+{
+    for (TBlocks::iterator it = m_blocks.begin(); it != m_blocks.end(); it++)
+    {
+        QString key = it->first;
+        DataBlock* pBlock = it->second;
+        QString filename = rootPath + key;
+
+        if (pBlock->bCompressed)
+        {
+            filename += ".editor_datac";
+
+            CCryFile file(filename.toUtf8().data(), "wb");
+
+            int nOriginalSize = pBlock->compressedData.GetUncompressedSize();
+            file.Write(&nOriginalSize, sizeof(nOriginalSize));
+            file.Write(pBlock->compressedData.GetBuffer(), pBlock->compressedData.GetSize());
+        }
+        else
+        {
+            filename += ".editor_data";
+            CCryFile file(filename.toUtf8().data(), "wb");
+            file.Write(pBlock->data.GetBuffer(), pBlock->data.GetSize());
+        }
+    }
+}
+
+void CNamedData::LoadFromFiles(const QString& rootPath)
+{
+    // TODO: Unify code paths in a nicer way!
+    CPakFile dummyPak;
+    Load(rootPath, dummyPak);
+}
+
+CNamedData::DataBlock::DataBlock()
+{
+}
diff --git a/Code/Editor/Util/NamedData.h b/Code/Editor/Util/NamedData.h
new file mode 100644
index 0000000000..11daec4e95
--- /dev/null
+++ b/Code/Editor/Util/NamedData.h
@@ -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
+ *
+ */
+
+
+// Description : Collection of Named data blocks
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_NAMEDDATA_H
+#define CRYINCLUDE_EDITOR_UTIL_NAMEDDATA_H
+#pragma once
+#include "MemoryBlock.h"
+#include "QtUtil.h"
+
+class CPakFile;
+
+class CNamedData
+{
+public:
+    CNamedData();
+    virtual ~CNamedData();
+    void AddDataBlock(const QString& blockName, void*   pData, int nSize, bool bCompress = true);
+    void AddDataBlock(const QString& blockName, CMemoryBlock& block);
+    //! Returns uncompressed block data.
+    bool GetDataBlock(const QString& blockName, void*& pData, int& nSize);
+    //! Returns raw data block in original form (Compressed or Uncompressed).
+    CMemoryBlock* GetDataBlock(const QString& blockName, bool& bCompressed);
+
+    void Clear();
+
+public:
+    virtual bool Serialize(CArchive& ar);
+
+    //! Save named data to pak file.
+    void Save(CPakFile& pakFile);
+    //! Load named data from pak file.
+    bool Load(const QString& levelPath, CPakFile& pakFile);
+
+    void SaveToFiles(const QString& rootPath);
+    void LoadFromFiles(const QString& rootPath);
+
+private:
+    struct DataBlock
+    {
+        DataBlock();
+        QString blockName;
+        CMemoryBlock data;
+        CMemoryBlock compressedData;
+        //! This block is compressed.
+        bool bCompressed;
+        bool bFastCompression;
+    };
+    typedef std::map<QString, DataBlock*, stl::less_stricmp<QString> > TBlocks;
+    TBlocks m_blocks;
+};
+#endif // CRYINCLUDE_EDITOR_UTIL_NAMEDDATA_H
diff --git a/Code/Editor/Util/Observable.h b/Code/Editor/Util/Observable.h
new file mode 100644
index 0000000000..9cdb4d1e20
--- /dev/null
+++ b/Code/Editor/Util/Observable.h
@@ -0,0 +1,102 @@
+/*
+ * 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 : This file declares templates to be used when a class can
+//               have a list of observers to feed
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_OBSERVABLE_H
+#define CRYINCLUDE_EDITOR_UTIL_OBSERVABLE_H
+#pragma once
+
+#include <vector>
+
+//! Observable template class, holds a list of observers which can be called at once using the helper defines
+template<class T>
+class CObservable
+{
+public:
+    // Description:
+    //      Register a new observer for the class, will check if not already added
+    // Return:
+    //      true - if the observer was successfully added to the list
+    //      false - if the observer is already in the list
+    bool RegisterObserver(T* pObserver)
+    {
+        if (m_observers.end() != std::find(m_observers.begin(), m_observers.end(), pObserver))
+        {
+            return false;
+        }
+
+        m_observers.push_back(pObserver);
+
+        return true;
+    }
+
+    // Description:
+    //      Unregister an observer from the list
+    // Return:
+    //      true - if the observer was successfuly removed
+    //      false - if the observer is not in the list
+    bool UnregisterObserver(T* pObserver)
+    {
+        typename std::vector<T*>::iterator iter;
+
+        if (m_observers.end() == (iter = std::find(m_observers.begin(), m_observers.end(), pObserver)))
+        {
+            return false;
+        }
+
+        m_observers.erase(iter);
+
+        return true;
+    }
+
+    // Description:
+    //      Uregister all the observers
+    void UnregisterAllObservers()
+    {
+        m_observers.clear();
+    }
+
+protected:
+    std::vector<T*> m_observers;
+};
+
+//
+// Helper defines to ease the process of calling the methods of all observers in the list
+//
+
+// Description:
+//      Call the method of the observers, this must be used inside the subject class
+// Example: CALL_OBSERVERS_METHOD(OnStuffHappened(120, "NO!"))
+#define CALL_OBSERVERS_METHOD(methodCall)                                                                                \
+    { for (size_t iObs = 0, iObsCount = m_observers.size(); iObs < iObsCount; ++iObs) { m_observers[iObs]->methodCall; } \
+    }
+
+// Description:
+//      Call the method of the observers, this can be used outside the subject class
+// Example: CALL_OBSERVERS_METHOD_OF(pSomeObservableSubject, OnStuffHappened(120, "NO!"))
+#define CALL_OBSERVERS_METHOD_OF(pObservable, methodCall)                                                                                          \
+    { for (size_t iObs = 0, iObsCount = pObservable->m_observers.size(); iObs < iObsCount; ++iObs) { pObservable->m_observers[iObs]->methodCall; } \
+    }
+
+// Description:
+//      Call the method of the observers, this can be called using a custom vector of observers
+// Example: CALL_SPECIFIED_OBSERVERS_LIST_METHOD(vMyPreciousSpecialObservers, OnStuffHappened(120, "NO!"))
+#define CALL_SPECIFIED_OBSERVERS_LIST_METHOD(vObservers, methodCall)                                                   \
+    { for (size_t iObs = 0, iObsCount = vObservers.size(); iObs < iObsCount; ++iObs) { vObservers[iObs]->methodCall; } \
+    }
+
+// Description:
+//      Implement the observable methods when the user class is inheriting from a virtual interface using the observable methods
+#define IMPLEMENT_OBSERVABLE_METHODS(observerClassName)                                                                                       \
+    virtual bool RegisterObserver(observerClassName * pObserver) { return CObservable<observerClassName>::RegisterObserver(pObserver); };     \
+    virtual bool UnregisterObserver(observerClassName * pObserver) { return CObservable<observerClassName>::UnregisterObserver(pObserver); }; \
+    virtual void UnregisterAllObservers() { CObservable<observerClassName>::UnregisterAllObservers(); };
+#endif // CRYINCLUDE_EDITOR_UTIL_OBSERVABLE_H
diff --git a/Code/Editor/Util/PakFile.cpp b/Code/Editor/Util/PakFile.cpp
new file mode 100644
index 0000000000..5f26f25149
--- /dev/null
+++ b/Code/Editor/Util/PakFile.cpp
@@ -0,0 +1,162 @@
+/*
+ * 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 "PakFile.h"
+
+// AzFramework
+#include <AzFramework/Archive/INestedArchive.h>
+#include <AzFramework/Archive/IArchive.h>
+
+// Editor
+#include "Util/CryMemFile.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+CPakFile::CPakFile()
+    : m_pArchive(NULL)
+    , m_pCryPak(NULL)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CPakFile::CPakFile(AZ::IO::IArchive* pCryPak)
+    : m_pArchive(NULL)
+    , m_pCryPak(pCryPak)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CPakFile::~CPakFile()
+{
+    Close();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CPakFile::CPakFile(const char* filename)
+{
+    m_pArchive = NULL;
+    Open(filename);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CPakFile::Close()
+{
+    m_pArchive = NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CPakFile::Open(const char* filename, bool bAbsolutePath)
+{
+    if (m_pArchive)
+    {
+        Close();
+    }
+
+    auto pCryPak = m_pCryPak ? m_pCryPak : GetIEditor()->GetSystem()->GetIPak();
+    if (pCryPak == NULL)
+    {
+        return false;
+    }
+
+    if (bAbsolutePath)
+    {
+        m_pArchive = pCryPak->OpenArchive(filename, nullptr, AZ::IO::INestedArchive::FLAGS_ABSOLUTE_PATHS);
+    }
+    else
+    {
+        m_pArchive = pCryPak->OpenArchive(filename);
+    }
+    if (m_pArchive)
+    {
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CPakFile::OpenForRead(const char* filename)
+{
+    if (m_pArchive)
+    {
+        Close();
+    }
+    auto pCryPak = m_pCryPak ? m_pCryPak : GetIEditor()->GetSystem()->GetIPak();
+    if (pCryPak == NULL)
+    {
+        return false;
+    }
+    m_pArchive = pCryPak->OpenArchive(filename, nullptr, AZ::IO::INestedArchive::FLAGS_OPTIMIZED_READ_ONLY | AZ::IO::INestedArchive::FLAGS_ABSOLUTE_PATHS);
+    if (m_pArchive)
+    {
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CPakFile::UpdateFile(const char* filename, CCryMemFile& file, bool bCompress)
+{
+    if (m_pArchive)
+    {
+        int nSize = file.GetLength();
+
+        UpdateFile(filename, file.GetMemPtr(), nSize, bCompress);
+        file.Close();
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CPakFile::UpdateFile(const char* filename, CMemoryBlock& mem, bool bCompress, int nCompressLevel)
+{
+    if (m_pArchive)
+    {
+        return UpdateFile(filename, mem.GetBuffer(), mem.GetSize(), bCompress, nCompressLevel);
+    }
+    return false;
+}
+
+/////////////////////////////////////////////////////////////////////////
+bool CPakFile::UpdateFile(const char* filename, void* pBuffer, int nSize, bool bCompress, int nCompressLevel)
+{
+    if (m_pArchive)
+    {
+        if (bCompress)
+        {
+            return 0 == m_pArchive->UpdateFile(filename, pBuffer, nSize, AZ::IO::INestedArchive::METHOD_DEFLATE, nCompressLevel);
+        }
+        else
+        {
+            return 0 == m_pArchive->UpdateFile(filename, pBuffer, nSize);
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CPakFile::RemoveFile(const char* filename)
+{
+    if (m_pArchive)
+    {
+        return m_pArchive->RemoveFile(filename);
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CPakFile::RemoveDir(const char* directory)
+{
+    if (m_pArchive)
+    {
+        return m_pArchive->RemoveDir(directory);
+    }
+    return false;
+}
diff --git a/Code/Editor/Util/PakFile.h b/Code/Editor/Util/PakFile.h
new file mode 100644
index 0000000000..14575b25f4
--- /dev/null
+++ b/Code/Editor/Util/PakFile.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_PAKFILE_H
+#define CRYINCLUDE_EDITOR_UTIL_PAKFILE_H
+#pragma once
+
+
+#include <AzFramework/Archive/INestedArchive.h>
+
+class CCryMemFile;
+
+// forward references.
+namespace AZ::IO
+{
+    struct IArchive;
+}
+/*! CPakFile Wraps game implementation of INestedArchive.
+        Used for storing multiple files into zip archive file.
+*/
+class SANDBOX_API CPakFile
+{
+public:
+    CPakFile();
+    CPakFile(AZ::IO::IArchive* pCryPak);
+    ~CPakFile();
+    //! Opens archive for writing.
+    explicit CPakFile(const char* filename);
+    //! Opens archive for writing.
+    bool Open(const char* filename, bool bAbsolutePath = true);
+    //! Opens archive for reading only.
+    bool OpenForRead(const char* filename);
+
+    void Close();
+    //! Adds or update file in archive.
+    bool UpdateFile(const char* filename, CCryMemFile& file, bool bCompress = true);
+    //! Adds or update file in archive.
+    bool UpdateFile(const char* filename, CMemoryBlock& mem, bool bCompress = true, int nCompressLevel = AZ::IO::INestedArchive::LEVEL_BETTER);
+    //! Adds or update file in archive.
+    bool UpdateFile(const char* filename, void* pBuffer, int nSize, bool bCompress = true, int nCompressLevel = AZ::IO::INestedArchive::LEVEL_BETTER);
+    //! Remove file from archive.
+    bool RemoveFile(const char* filename);
+    //! Remove dir from archive.
+    bool RemoveDir(const char* directory);
+
+    //! Return archive of this pak file wrapper.
+    AZ::IO::INestedArchive* GetArchive() { return m_pArchive.get(); };
+private:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    AZStd::intrusive_ptr<AZ::IO::INestedArchive> m_pArchive;
+    AZ::IO::IArchive* m_pCryPak;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_PAKFILE_H
diff --git a/Code/Editor/Util/PathUtil.cpp b/Code/Editor/Util/PathUtil.cpp
new file mode 100644
index 0000000000..c99f93d323
--- /dev/null
+++ b/Code/Editor/Util/PathUtil.cpp
@@ -0,0 +1,560 @@
+/*
+ * 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 "PathUtil.h"
+
+#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h> // for ebus events
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzFramework/API/ApplicationAPI.h>
+
+#include <QRegularExpression>
+
+namespace
+{
+    string g_currentModName; // folder name only!
+}
+
+namespace Path
+{
+    //////////////////////////////////////////////////////////////////////////
+    void SplitPath(const QString& rstrFullPathFilename, QString& rstrDriveLetter, QString& rstrDirectory, QString& rstrFilename, QString& rstrExtension)
+    {
+        string          strFullPathString(rstrFullPathFilename.toUtf8().data());
+        string          strDriveLetter;
+        string          strDirectory;
+        string          strFilename;
+        string          strExtension;
+
+        char*           szPath((char*)strFullPathString.c_str());
+        char*           pchLastPosition(szPath);
+        char*           pchCurrentPosition(szPath);
+        char*           pchAuxPosition(szPath);
+
+        // Directory named filenames containing ":" are invalid, so we can assume if there is a :
+        // it will be the drive name.
+        pchCurrentPosition = strchr(pchLastPosition, ':');
+        if (pchCurrentPosition == NULL)
+        {
+            rstrDriveLetter = "";
+        }
+        else
+        {
+            strDriveLetter.assign(pchLastPosition, pchCurrentPosition + 1);
+            pchLastPosition = pchCurrentPosition + 1;
+        }
+
+        pchCurrentPosition = strrchr(pchLastPosition, '\\');
+        pchAuxPosition = strrchr(pchLastPosition, '/');
+        if ((pchCurrentPosition == NULL) && (pchAuxPosition == NULL))
+        {
+            rstrDirectory = "";
+        }
+        else
+        {
+            // Since NULL is < valid pointer, so this will work.
+            if (pchAuxPosition > pchCurrentPosition)
+            {
+                pchCurrentPosition = pchAuxPosition;
+            }
+            strDirectory.assign(pchLastPosition, pchCurrentPosition + 1);
+            pchLastPosition = pchCurrentPosition + 1;
+        }
+
+        pchCurrentPosition = strrchr(pchLastPosition, '.');
+        if (pchCurrentPosition == NULL)
+        {
+            rstrExtension = "";
+            strFilename.assign(pchLastPosition);
+        }
+        else
+        {
+            strExtension.assign(pchCurrentPosition);
+            strFilename.assign(pchLastPosition, pchCurrentPosition);
+        }
+
+        rstrDriveLetter = strDriveLetter;
+        rstrDirectory = strDirectory;
+        rstrFilename = strFilename;
+        rstrExtension = strExtension;
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void GetDirectoryQueue(const QString& rstrSourceDirectory, QStringList& rcstrDirectoryTree)
+    {
+        string                      strCurrentDirectoryName;
+        string                      strSourceDirectory(rstrSourceDirectory.toUtf8().data());
+        const char*             szSourceDirectory(strSourceDirectory.c_str());
+        const char*             pchCurrentPosition(szSourceDirectory);
+        const char*             pchLastPosition(szSourceDirectory);
+
+        rcstrDirectoryTree.clear();
+
+        if (strSourceDirectory.empty())
+        {
+            return;
+        }
+
+        // It removes as many slashes the path has in its start...
+        // MAYBE and just maybe we should consider paths starting with
+        // more than 2 slashes invalid paths...
+        while ((*pchLastPosition == '\\') || (*pchLastPosition == '/'))
+        {
+            ++pchLastPosition;
+            ++pchCurrentPosition;
+        }
+
+        do
+        {
+            pchCurrentPosition = strpbrk(pchLastPosition, "\\/");
+            if (pchCurrentPosition == NULL)
+            {
+                break;
+            }
+            strCurrentDirectoryName.assign(pchLastPosition, pchCurrentPosition);
+            pchLastPosition = pchCurrentPosition + 1;
+            // Again, here we are skipping as many consecutive slashes.
+            while ((*pchLastPosition == '\\') || (*pchLastPosition == '/'))
+            {
+                ++pchLastPosition;
+            }
+
+
+            rcstrDirectoryTree.push_back(strCurrentDirectoryName.c_str());
+        } while (true);
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void ConvertSlashToBackSlash(QString& rstrStringToConvert)
+    {
+        rstrStringToConvert.replace('/', '\\');
+        rstrStringToConvert = CaselessPaths(rstrStringToConvert);
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void ConvertBackSlashToSlash(QString& rstrStringToConvert)
+    {
+        rstrStringToConvert.replace('\\', '/');
+        rstrStringToConvert = CaselessPaths(rstrStringToConvert);
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void SurroundWithQuotes(QString& rstrSurroundString)
+    {
+        QString strSurroundString(rstrSurroundString);
+
+        if (!strSurroundString.isEmpty())
+        {
+            if (strSurroundString[0] != '\"')
+            {
+                strSurroundString.insert(0, "\"");
+            }
+            if (strSurroundString[strSurroundString.size() - 1] != '\"')
+            {
+                strSurroundString.insert(strSurroundString.size(), "\"");
+            }
+        }
+        else
+        {
+            strSurroundString.insert(0, "\"");
+            strSurroundString.insert(strSurroundString.size(), "\"");
+        }
+        rstrSurroundString = strSurroundString;
+    }
+    //////////////////////////////////////////////////////////////////////////
+    QString GetExecutableFullPath()
+    {
+        return QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
+    }
+    //////////////////////////////////////////////////////////////////////////
+    QString GetWindowsTempDirectory()
+    {
+        return QDir::tempPath();
+    }
+    //////////////////////////////////////////////////////////////////////////
+    QString GetEngineRootPath()
+    {
+        const char* engineRoot;
+        EBUS_EVENT_RESULT(engineRoot, AzFramework::ApplicationRequests::Bus, GetEngineRoot);
+        return QString(engineRoot);
+    }
+    
+    //////////////////////////////////////////////////////////////////////////
+    QString& ReplaceFilename(const QString& strFilepath, const QString& strFilename, QString& strOutputFilename, bool bCallCaselessPath)
+    {
+        QString strDriveLetter;
+        QString strDirectory;
+        QString strOriginalFilename;
+        QString strExtension;
+
+        SplitPath(strFilepath, strDriveLetter, strDirectory, strOriginalFilename, strExtension);
+
+        strOutputFilename = strDriveLetter;
+        strOutputFilename += strDirectory;
+        strOutputFilename += strFilename;
+        strOutputFilename += strExtension;
+
+        if (bCallCaselessPath)
+        {
+            strOutputFilename = CaselessPaths(strOutputFilename);
+        }
+        return strOutputFilename;
+    }
+
+    bool IsFolder(const char* pPath)
+    {
+        DWORD attrs = GetFileAttributes(pPath);
+
+        if (attrs == FILE_ATTRIBUTE_DIRECTORY)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    QString GetUserSandboxFolder()
+    {
+        return QString::fromUtf8("@user@/Sandbox/");
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    QString GetResolvedUserSandboxFolder()
+    {
+        char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
+        gEnv->pFileIO->ResolvePath(GetUserSandboxFolder().toUtf8().data(), resolvedPath, AZ_MAX_PATH_LEN);
+        return QString::fromLatin1(resolvedPath);
+    }
+
+    // internal function, you should use GetEditingGameDataFolder instead.
+    AZStd::string GetGameAssetsFolder()
+    {
+        const char* resultValue = nullptr;
+        EBUS_EVENT_RESULT(resultValue, AzToolsFramework::AssetSystemRequestBus, GetAbsoluteDevGameFolderPath);
+        if (!resultValue)
+        {
+            if ((gEnv) && (gEnv->pFileIO))
+            {
+                resultValue = gEnv->pFileIO->GetAlias("@devassets@");
+            }
+        }
+
+        if (!resultValue)
+        {
+            resultValue = ".";
+        }
+
+        return resultValue;
+    }
+
+    /// Get the data folder
+    AZStd::string GetEditingGameDataFolder()
+    {
+        // query the editor root.  The bus exists in case we want tools to be able to override this.
+
+
+        if (g_currentModName.empty())
+        {
+            return GetGameAssetsFolder();
+        }
+        AZStd::string str(GetGameAssetsFolder());
+        str += "Mods\\";
+        str += g_currentModName;
+        return str;
+    }
+
+    //! Get the root folder (in source control or other writable assets) where you should save root data.
+    AZStd::string GetEditingRootFolder()
+    {
+        const char* resultValue = nullptr;
+        EBUS_EVENT_RESULT(resultValue, AzToolsFramework::AssetSystemRequestBus, GetAbsoluteDevRootFolderPath);
+
+        if (!resultValue)
+        {
+            if ((gEnv) && (gEnv->pFileIO))
+            {
+                resultValue = gEnv->pFileIO->GetAlias("@devassets@");
+            }
+        }
+        if (!resultValue)
+        {
+            resultValue = ".";
+        }
+        return resultValue;
+    }
+
+
+    AZStd::string MakeModPathFromGamePath(const char* relGamePath)
+    {
+        return GetEditingGameDataFolder() + "\\" + relGamePath;
+    }
+
+    QString FullPathToLevelPath(const QString& path)
+    {
+        if (path.isEmpty())
+        {
+            return "";
+        }
+
+        QString relGamePath;
+
+        if (!QFileInfo(path).isRelative())
+        {
+            relGamePath = GetRelativePath(path);
+        }
+        else
+        {
+            relGamePath = path;
+        }
+
+        QString levelpath = GetIEditor()->GetLevelFolder();
+        QString str = levelpath;
+        str.replace('/', '\\');
+        levelpath = CaselessPaths(str);
+
+        // Create relative path
+        QString relLevelPath = QDir(levelpath).relativeFilePath(relGamePath);
+        if (relLevelPath.isEmpty())
+        {
+            assert(0);
+            return path;
+        }
+
+        relLevelPath.remove(QRegularExpression(QStringLiteral(R"(^[\\/.]*)")));
+        return relLevelPath;
+    }
+
+    QString Make(const QString& path, const QString& file)
+    {
+        if (gEnv->pCryPak->IsAbsPath(file.toUtf8().data()))
+        {
+            return file;
+        }
+        return CaselessPaths(AddPathSlash(path) + file);
+    }
+
+    QString GetRelativePath(const QString& fullPath, bool bRelativeToGameFolder /*= false*/)
+    {
+        if (fullPath.isEmpty())
+        {
+            return "";
+        }
+
+        bool relPathfound = false;
+        AZStd::string relativePath;
+        AZStd::string fullAssetPath(fullPath.toUtf8().data());
+        EBUS_EVENT_RESULT(relPathfound, AzToolsFramework::AssetSystemRequestBus, GetRelativeProductPathFromFullSourceOrProductPath, fullAssetPath, relativePath);
+
+        if (relPathfound)
+        {
+            // do not normalize this path, it will already be an appropriate asset ID.
+            return CaselessPaths(relativePath.c_str());
+        }
+
+        char rootpath[_MAX_PATH] = { 0 };
+        azstrcpy(rootpath, _MAX_PATH, Path::GetEditingRootFolder().c_str());
+
+        if (bRelativeToGameFolder)
+        {
+            azstrcpy(rootpath, _MAX_PATH, Path::GetEditingGameDataFolder().c_str());
+        }
+
+        QString rootPathNormalized(rootpath);
+        QString srcPathNormalized(fullPath);
+
+#if defined(AZ_PLATFORM_WINDOWS)
+        // avoid confusing PathRelativePathTo
+        rootPathNormalized.replace('/', '\\');
+        srcPathNormalized.replace('/', '\\');
+#endif
+
+        // Create relative path
+        char resolvedSrcPath[AZ_MAX_PATH_LEN] = { 0 };
+        AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(srcPathNormalized.toUtf8().data(), resolvedSrcPath, AZ_MAX_PATH_LEN);
+        QByteArray path = QDir(rootPathNormalized).relativeFilePath(resolvedSrcPath).toUtf8();
+        if (path.isEmpty())
+        {
+            return fullPath;
+        }
+
+        // The following code is required because the windows PathRelativePathTo function will always return "./SomePath" instead of just "SomePath"
+        // Only remove single dot (.) and slash parts of a path, never the double dot (..)
+        const char* pBuffer = path.data();
+        bool bHasDot = false;
+        while (*pBuffer && pBuffer != path.end())
+        {
+            switch (*pBuffer)
+            {
+            case '.':
+                if (bHasDot)
+                {
+                    // Found a double dot, rewind and stop removing
+                    pBuffer--;
+                    break;
+                }
+            // Fall through intended
+            case '/':
+            case '\\':
+                bHasDot = (*pBuffer == '.');
+                pBuffer++;
+                continue;
+            }
+            break;
+        }
+
+        QString relPath = pBuffer;
+        return CaselessPaths(relPath);
+    }
+
+    QString GamePathToFullPath(const QString& path)
+    {
+        using namespace AzToolsFramework;
+        AZ_Warning("GamePathToFullPath", path.size() <= AZ_MAX_PATH_LEN, "Path exceeds maximum path length of %d", AZ_MAX_PATH_LEN);
+        if ((gEnv) && (gEnv->pFileIO) && gEnv->pCryPak && path.size() <= AZ_MAX_PATH_LEN)
+        {
+            // first, adjust the file name for mods:
+            bool fullPathfound = false;
+            AZStd::string assetFullPath;
+            AZStd::string adjustedFilePath = path.toUtf8().data();
+            AssetSystemRequestBus::BroadcastResult(fullPathfound, &AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath, adjustedFilePath, assetFullPath);
+            if (fullPathfound)
+            {
+                //if the bus message succeeds than normalize and lowercase the path
+                AzFramework::StringFunc::Path::Normalize(assetFullPath);
+                return assetFullPath.c_str();
+            }
+            // if the bus message didn't succeed, 'guess' the source assets:
+            else
+            {
+                // Not all systems have been converted to use local paths. Some editor files save XML files directly, and a full or correctly aliased path is already passed in.
+                // If the path passed in exists already, then return the resolved filepath
+                if (AZ::IO::FileIOBase::GetDirectInstance()->Exists(adjustedFilePath.c_str()))
+                {
+                    char resolvedPath[AZ_MAX_PATH_LEN + PathUtil::maxAliasLength] = { 0 };
+                    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(adjustedFilePath.c_str(), resolvedPath, AZ_MAX_PATH_LEN + PathUtil::maxAliasLength);
+                    return QString::fromUtf8(resolvedPath);
+                }
+                // if we get here it means that the Asset Processor does not know about this file.  most of the time we should never get here
+                // the rest of this code just does a bunch of heuristic guesses in case of missing files or if the user has hand-edited
+                // the asset cache by moving files in via some other means or external process.
+                if (adjustedFilePath[0] != '@')
+                {
+                    const char* prefix = (adjustedFilePath[0] == '/' || adjustedFilePath[0] == '\\') ? "@devassets@" : "@devassets@/";
+                    adjustedFilePath = prefix + adjustedFilePath;
+                }
+
+                char szAdjustedFile[AZ_MAX_PATH_LEN + PathUtil::maxAliasLength] = { 0 };
+                gEnv->pFileIO->ResolvePath(adjustedFilePath.c_str(), szAdjustedFile, AZ_ARRAY_SIZE(szAdjustedFile));
+
+                if ((azstrnicmp(szAdjustedFile, "@devassets@", 11) == 0) && ((szAdjustedFile[11] == '/') || (szAdjustedFile[11] == '\\')))
+                {
+                    if (!gEnv->pCryPak->IsFileExist(szAdjustedFile))
+                    {
+                        AZStd::string newName(szAdjustedFile);
+                        AzFramework::StringFunc::Replace(newName, "@devassets@", "@devroot@/engine", false);
+                        
+                        if (gEnv->pCryPak->IsFileExist(newName.c_str()))
+                        {
+                            azstrcpy(szAdjustedFile, AZ_ARRAY_SIZE(szAdjustedFile), newName.c_str());
+                        }
+                        else
+                        {
+                            // getting tricky here, try @devroot@ alone, in case its 'editor'
+                            AzFramework::StringFunc::Replace(newName, "@devassets@", "@devroot@", false);
+                            if (gEnv->pCryPak->IsFileExist(szAdjustedFile))
+                            {
+                                azstrcpy(szAdjustedFile, AZ_ARRAY_SIZE(szAdjustedFile), newName.c_str());
+                            }
+                            // give up, best guess is just @devassets@
+                        }
+                    }
+                }
+
+                // we should very rarely actually get to this point in the code.
+
+                // szAdjustedFile may contain an alias at this point. (@assets@/blah.whatever)
+                // there is a case in which the loose asset exists only within a pak file for some reason
+                // this is not recommended but it is possible.in that case, we want to return the original szAdjustedFile
+                // without touching it or resolving it so that crypak can open it successfully.
+                char adjustedPath[AZ_MAX_PATH_LEN + PathUtil::maxAliasLength] = { 0 };
+                if (gEnv->pFileIO->ResolvePath(szAdjustedFile, adjustedPath, AZ_MAX_PATH_LEN + PathUtil::maxAliasLength)) // resolve to full path
+                {
+                    if ((gEnv->pCryPak->IsFileExist(adjustedPath)) || (!gEnv->pCryPak->IsFileExist(szAdjustedFile)))
+                    {
+                        // note that if we get here, then EITHER
+                        // the file exists as a loose asset in the actual adjusted path
+                        // OR the file does not exist in the original passed-in aliased name (like '@assets@/whatever')
+                        // in which case we may as well just resolve the path to a full path and return it.
+                        assetFullPath = adjustedPath;
+                        AzFramework::StringFunc::Path::Normalize(assetFullPath);
+                        azstrcpy(szAdjustedFile, AZ_MAX_PATH_LEN + PathUtil::maxAliasLength, assetFullPath.c_str());
+                    }
+                    // if the above case succeeded then it means that the file does NOT exist loose
+                    // but DOES exist in a pak, in which case we leave szAdjustedFile with the alias on the front of it, meaning
+                    // fopens via crypak will actually succeed.
+                }
+                return szAdjustedFile;
+            }
+        }
+        else
+        {
+            return "";
+        }
+    }
+
+    QString ToUnixPath(const QString& strPath, bool bCallCaselessPath)
+    {
+        QString str = strPath;
+        str.replace('\\', '/');
+        return bCallCaselessPath ? CaselessPaths(str) : str;
+    }
+
+    QString RemoveBackslash(QString path)
+    {
+        if (path.isEmpty())
+        {
+            return path;
+        }
+
+        int iLenMinus1 = path.length() - 1;
+        QChar cLastChar = path[iLenMinus1];
+
+        if (cLastChar == '\\' || cLastChar == '/')
+        {
+            return CaselessPaths(path.mid(0, iLenMinus1));
+        }
+
+        return CaselessPaths(path);
+    }
+
+    QString SubDirectoryCaseInsensitive(const QString& path, const QStringList& parts)
+    {
+        if (parts.isEmpty())
+        {
+            return path;
+        }
+
+        QStringList modifiedParts = parts;
+        auto currentPart = modifiedParts.takeFirst();
+
+        // case insensitive iterator
+        QDirIterator it(path);
+        while (it.hasNext())
+        {
+            it.next();
+            // the current part already exists, use it, case doesn't matter
+            auto actualName = it.fileName();
+            if (QString::compare(actualName, currentPart, Qt::CaseInsensitive) == 0)
+            {
+                return SubDirectoryCaseInsensitive(QDir(path).absoluteFilePath(actualName), modifiedParts);
+            }
+        }
+        // the current path doesn't exist yet, so just create the complete path in one rush
+        return QDir(path).absoluteFilePath(parts.join('/'));
+    }
+}
+
diff --git a/Code/Editor/Util/PathUtil.h b/Code/Editor/Util/PathUtil.h
new file mode 100644
index 0000000000..14c71e88fb
--- /dev/null
+++ b/Code/Editor/Util/PathUtil.h
@@ -0,0 +1,471 @@
+/*
+ * 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 : Utility functions to simplify working with paths.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_PATHUTIL_H
+#define CRYINCLUDE_EDITOR_UTIL_PATHUTIL_H
+#pragma once
+
+#include <CryPath.h>
+#if defined(AZ_PLATFORM_WINDOWS)
+#include <shlwapi.h>
+#endif
+#include <Include/EditorCoreAPI.h>
+
+#include <AzCore/IO/SystemFile.h> // for max path
+#include <AzCore/std/string/string.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+
+#include <QRegularExpression>
+#include <QDir>
+
+class QString;
+class QStringList;
+
+namespace Path
+{
+    //! creates an absolute path from a relative game path, used for saving game files.
+    //! Example: Libs/Some/tokens.xml to c:/game/engine/GameName/Mods/ModName/Libs/Some/tokens.xml
+    //! If you're not working on a mod, it will return it with the game folder prepended.
+    //! This is the function you should use at all times to convert an asset ID to a full writable editor path.
+    EDITOR_CORE_API AZStd::string MakeModPathFromGamePath(const char* input);
+
+    //! Get the data folder where assets should be saved.
+    //! if we're working on a mod, will return the mod's root (absolute path, with no slash at the end)
+    //! if not, will return the default game root (absolute path, with no slash at the end)
+    //! always returns a full path
+    EDITOR_CORE_API AZStd::string GetEditingGameDataFolder();
+
+    //! Get the root folder (in source control or other writable assets) where you should save root data.
+    EDITOR_CORE_API AZStd::string GetEditingRootFolder();
+
+    //! Set the current mod NAME for editing purposes.  After doing this the above functions will take this into account
+    //! name only, please!
+    EDITOR_CORE_API void SetModName(const char* input);
+
+
+    //! converts path to lowercase given the cvar for ed_lowercasepaths
+    inline QString CaselessPaths(const QString& strPath)
+    {
+        ICVar* pCvar = gEnv->pConsole->GetCVar("ed_lowercasepaths");
+        if (pCvar)
+        {
+            int uselowercase = pCvar->GetIVal();
+            if (uselowercase)
+            {
+                QString str = strPath;
+                str = str.toLower();
+                return str;
+            }
+        }
+        return strPath;
+    }
+
+    //! Split full file name to path and filename
+    //! @param filepath [IN] Full file name inclusing path.
+    //! @param path [OUT] Extracted file path.
+    //! @param file [OUT] Extracted file (with extension).
+    inline void Split(const QString& filepath, QString& path, QString& file)
+    {
+        char path_buffer[_MAX_PATH];
+        char drive[_MAX_DRIVE];
+        char dir[_MAX_DIR];
+        char fname[_MAX_FNAME];
+        char ext[_MAX_EXT];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath.toUtf8().data(), drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), fname, AZ_ARRAY_SIZE(fname), ext, AZ_ARRAY_SIZE(ext));
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
+        path = path_buffer;
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), 0, 0, fname, ext);
+#else
+        _splitpath(filepath.toUtf8().data(), drive, dir, fname, ext);
+        _makepath(path_buffer, drive, dir, 0, 0);
+        path = path_buffer;
+        _makepath(path_buffer, 0, 0, fname, ext);
+#endif
+        file = path_buffer;
+    }
+    inline void Split(const string& filepath, string& path, string& file)
+    {
+        char path_buffer[_MAX_PATH];
+        char drive[_MAX_DRIVE];
+        char dir[_MAX_DIR];
+        char fname[_MAX_FNAME];
+        char ext[_MAX_EXT];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath, drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), 0, 0, 0, 0);
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
+        path = path_buffer;
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), 0, 0, fname, ext);
+#else
+        _splitpath(filepath, drive, dir, fname, ext);
+        _makepath(path_buffer, drive, dir, 0, 0);
+        path = path_buffer;
+        _makepath(path_buffer, 0, 0, fname, ext);
+#endif
+        file = path_buffer;
+    }
+
+    //! Split full file name to path and filename
+    //! @param filepath [IN] Full file name inclusing path.
+    //! @param path [OUT] Extracted file path.
+    //! @param filename [OUT] Extracted file (without extension).
+    //! @param ext [OUT] Extracted files extension.
+    inline void Split(const QString& filepath, QString& path, QString& filename, QString& fext)
+    {
+        char path_buffer[_MAX_PATH];
+        char drive[_MAX_DRIVE];
+        char dir[_MAX_DIR];
+        char fname[_MAX_FNAME];
+        char ext[_MAX_EXT];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath.toUtf8().data(), drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), fname, AZ_ARRAY_SIZE(fname), ext, AZ_ARRAY_SIZE(ext));
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
+#else
+        _splitpath(filepath.toUtf8().data(), drive, dir, fname, ext);
+        _makepath(path_buffer, drive, dir, 0, 0);
+#endif
+        path = path_buffer;
+        filename = fname;
+        fext = ext;
+    }
+    inline void Split(const string& filepath, string& path, string& filename, string& fext)
+    {
+        char path_buffer[_MAX_PATH];
+        char drive[_MAX_DRIVE];
+        char dir[_MAX_DIR];
+        char fname[_MAX_FNAME];
+        char ext[_MAX_EXT];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath, drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), fname, AZ_ARRAY_SIZE(fname), ext, AZ_ARRAY_SIZE(ext));
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
+#else
+        _splitpath(filepath, drive, dir, fname, ext);
+        _makepath(path_buffer, drive, dir, 0, 0);
+#endif
+        path = path_buffer;
+        filename = fname;
+        fext = ext;
+    }
+
+    //! Split path into segments
+    //! @param filepath [IN] path
+    inline QStringList SplitIntoSegments(const QString& path)
+    {
+        return path.split(QRegularExpression(QStringLiteral(R"([\\/])")), Qt::SkipEmptyParts);
+    }
+
+    //! Extract extension from full specified file path.
+    inline QString GetExt(const QString& filepath)
+    {
+        char ext[_MAX_EXT];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath.toUtf8().data(), 0, 0, 0, 0, 0, 0, ext, AZ_ARRAY_SIZE(ext));
+#else
+        _splitpath(filepath.toUtf8().data(), 0, 0, 0, ext);
+#endif
+        if (ext[0] == '.')
+        {
+            return ext + 1;
+        }
+
+        return ext;
+    }
+
+    //! Extract path from full specified file path.
+    inline QString GetPath(const QString& filepath)
+    {
+        char path_buffer[_MAX_PATH];
+        char drive[_MAX_DRIVE];
+        char dir[_MAX_DIR];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath.toUtf8().data(), drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), 0, 0, 0, 0);
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
+#else
+        _splitpath(filepath.toUtf8().data(), drive, dir, 0, 0);
+        _makepath(path_buffer, drive, dir, 0, 0);
+#endif
+        return CaselessPaths(path_buffer);
+    }
+
+    //! Extract file name with extension from full specified file path.
+    inline QString GetFile(const QString& filepath)
+    {
+        char path_buffer[_MAX_PATH];
+        char fname[_MAX_FNAME];
+        char ext[_MAX_EXT];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath.toUtf8().data(), 0, 0, 0, 0, fname, AZ_ARRAY_SIZE(fname), ext, AZ_ARRAY_SIZE(ext));
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), 0, 0, fname, ext);
+#else
+        _splitpath(filepath.toUtf8().data(), 0, 0, fname, ext);
+        _makepath(path_buffer, 0, 0, fname, ext);
+#endif
+        return CaselessPaths(path_buffer);
+    }
+
+    //! Extract file name without extension from full specified file path.
+    inline QString GetFileName(const QString& filepath)
+    {
+        char fname[_MAX_FNAME];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath.toUtf8().data(), 0, 0, 0, 0, fname, AZ_ARRAY_SIZE(fname), 0, 0);
+#else
+        _splitpath(filepath.toUtf8().data(), 0, 0, fname, 0);
+#endif
+        return fname;
+    }
+
+    inline bool EndsWithSlash(QString path)
+    {
+        return (path.endsWith(QStringLiteral("\\")) || path.endsWith(QStringLiteral("/")));
+    }
+    
+    template<size_t size>
+    inline bool EndsWithSlash(CryStackStringT<char, size>* path)
+    {
+        if ((!path) || (path->empty()))
+        {
+            return false;
+        }
+        
+        if (
+            ((*path)[path->size() - 1] != '\\') ||
+            ((*path)[path->size() - 1] != '/') 
+            )
+        {
+            return true;
+        }
+        
+        return false;
+    }
+
+    //! add a backslash if needed
+    inline QString AddBackslash(QString path)
+    {
+        if (path.isEmpty() || EndsWithSlash(path))
+        {
+            return path;
+        }
+
+        return CaselessPaths(path + "\\");
+    }
+
+    //! add a slash if needed
+    inline QString AddSlash(const QString& path)
+    {
+        if (path.isEmpty() || EndsWithSlash(path))
+        {
+            return path;
+        }
+
+        return CaselessPaths(path + "/");
+    }
+
+    template<size_t size>
+    inline void AddBackslash(CryStackStringT<char, size>* path)
+    {
+        if (path->empty())
+        {
+            return;
+        }
+        if (!EndsWithSlash(path))
+        {
+            (*path) += '\\';
+        }
+    }
+
+    template<size_t size>
+    inline void AddSlash(CryStackStringT<char, size>* path)
+    {
+        if (path->empty())
+        {
+            return;
+        }
+        if (!EndsWithSlash(path))
+        {
+            (*path) += '/';
+        }
+    }
+
+    inline QString AddPathSlash(const QString& path)
+    {
+#if defined(AZ_PLATFORM_WINDOWS)
+        return AddBackslash(path);
+#else
+        return AddSlash(path);
+#endif
+    }
+
+    //! Replace extension for given file.
+    inline QString ReplaceExtension(const QString& filepath, const QString& ext)
+    {
+        AZStd::string newPath = filepath.toUtf8().data();
+        AzFramework::StringFunc::Path::ReplaceExtension(newPath, ext.toUtf8().data());
+        QString returnString(newPath.c_str());
+        return CaselessPaths(returnString);
+    }
+
+    //! Replace extension for given file.
+    inline QString RemoveExtension(const QString& filepath)
+    {
+        char path_buffer[_MAX_PATH];
+        char drive[_MAX_DRIVE];
+        char dir[_MAX_DIR];
+        char fname[_MAX_FNAME];
+#ifdef AZ_COMPILER_MSVC
+        _splitpath_s(filepath.toUtf8().data(), drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), fname, AZ_ARRAY_SIZE(fname), 0, 0);
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, fname, 0);
+#else
+        _splitpath(filepath.toUtf8().data(), drive, dir, fname, 0);
+        _makepath(path_buffer, drive, dir, fname, 0);
+#endif
+        return path_buffer;
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline QString Make(const QString& dir, const QString& filename, const QString& ext)
+    {
+        char path_buffer[_MAX_PATH];
+#ifdef AZ_COMPILER_MSVC
+        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), NULL, dir.toUtf8().data(), filename.toUtf8().data(), ext.toUtf8().data());
+#else
+        _makepath(path_buffer, NULL, dir.toUtf8().data(), filename.toUtf8().data(), ext.toUtf8().data());
+#endif
+        return CaselessPaths(path_buffer);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    EDITOR_CORE_API QString GetRelativePath(const QString& fullPath, bool bRelativeToGameFolder = false);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Description:
+    // given the assetID of a produced asset, constructs the full path to the SOURCE ASSET that was used to produce it.
+    // Ex. Objects/box.dds will be converted to C:\Test\Game\Objects\box.tif (or bmp or whatever)
+    EDITOR_CORE_API QString GamePathToFullPath(const QString& path);
+
+    //////////////////////////////////////////////////////////////////////////
+    inline QString FullPathToGamePath(const QString& path)
+    {
+        return CaselessPaths(GetRelativePath(path, true));
+    }
+    inline string FullPathToGamePath(const char* path)
+    {
+        return CaselessPaths(GetRelativePath(path, true)).toUtf8().data();
+    }
+
+    QString FullPathToLevelPath(const QString& path);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Description:
+    // Turn any path into an asset ID.
+
+    inline QString MakeGamePath(const QString& path)
+    {
+        QString fullpath = Path::GamePathToFullPath(path);
+
+        // if its in a mod, we still want the 'asset id' of it.
+        QString dataFolder = Path::AddPathSlash(QString(Path::GetEditingGameDataFolder().c_str()));
+        if (fullpath.length() > dataFolder.length() && QString::compare(fullpath, dataFolder, Qt::CaseInsensitive) == 0)
+        {
+            fullpath = fullpath.right(fullpath.length() - dataFolder.length());
+            fullpath.replace('\\', '/'); // Slashes use for game files.
+            return fullpath;
+        }
+
+        fullpath = GetRelativePath(path, true);
+        if (fullpath.isEmpty())
+        {
+            fullpath = path;
+        }
+        fullpath.replace('\\', '/'); // Slashes use for game files.
+        return CaselessPaths(fullpath);
+    }
+
+
+    inline QString GetAudioLocalizationFolder(bool returnAbsolutePath)
+    {
+        // Omit the trailing slash!
+        QString sLocalizationFolder(QString(PathUtil::GetLocalizationFolder()).left(static_cast<int>(PathUtil::GetLocalizationFolder().size()) - 1));
+
+        if (!sLocalizationFolder.isEmpty())
+        {
+            sLocalizationFolder = returnAbsolutePath ? (QString(Path::GetEditingGameDataFolder().c_str()) + "/" + sLocalizationFolder + "/dialog/") : sLocalizationFolder + "/dialog/";
+        }
+        else
+        {
+            gEnv->pSystem->Warning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, VALIDATOR_FLAG_AUDIO, 0, "The localization folder is not set! Please make sure it is by checking the setting of cvar \"sys_localization_folder\"!");
+        }
+
+        return sLocalizationFolder;
+    }
+
+    //! Returns the aliased path to the user Sandbox folder
+    EDITOR_CORE_API QString GetUserSandboxFolder();
+
+    //! Returns the resolved, non-aliased path to the user Sandbox folder
+    EDITOR_CORE_API QString GetResolvedUserSandboxFolder();
+
+    //! Convert a path to the uniform form.
+    EDITOR_CORE_API QString ToUnixPath(const QString& strPath, bool bCallCaselessPath = true);
+
+    //! Makes a fully specified file path from path and file name.
+    EDITOR_CORE_API QString Make(const QString& path, const QString& file);
+
+    // This had to be created because _splitpath is too dumb about console drives.
+    EDITOR_CORE_API void SplitPath(const QString& rstrFullPathFilename, QString& rstrDriveLetter, QString& rstrDirectory, QString& rstrFilename, QString& rstrExtension);
+
+    // Requires a path from Splithpath: no drive letter and backslash at the end.
+    EDITOR_CORE_API void GetDirectoryQueue(const QString& rstrSourceDirectory, QStringList& rcstrDirectoryTree);
+
+    // Converts all slashes to backslashes so MS things won't complain.
+    EDITOR_CORE_API void ConvertSlashToBackSlash(QString& rstrStringToConvert);
+
+    // Converts backslashes into forward slashes.
+    EDITOR_CORE_API void ConvertBackSlashToSlash(QString& rstrStringToConvert);
+
+    // Surrounds a string with quotes if necessary. This is useful for calling other programs.
+    EDITOR_CORE_API void SurroundWithQuotes(QString& rstrSurroundString);
+
+    // Gets the temporary directory path (which may not exist).
+    EDITOR_CORE_API QString GetWindowsTempDirectory();
+
+    // This function returns the full path used to run the editor.
+    EDITOR_CORE_API QString GetExecutableFullPath();
+
+    // This function returns the engine's root path
+    EDITOR_CORE_API QString GetEngineRootPath();
+
+    // This function replaces the filename from a path, keeping extension and directory/drive path.
+    // WARNING: do not use the same variable in the last parameter and in any of the others.
+    EDITOR_CORE_API QString& ReplaceFilename(const QString& strFilepath, const QString& strFilename, QString& strOutputFilename, bool bCallCaselessPath = true);
+
+    //! \return true if the given path is a folder and not a file
+    EDITOR_CORE_API bool IsFolder(const char* pPath);
+
+    EDITOR_CORE_API void ConvertSlashToBackSlash(QString& str);
+    EDITOR_CORE_API void ConvertBackSlashToSlash(QString& str);
+    EDITOR_CORE_API QString RemoveBackslash(QString path);
+
+    /*
+     * Returns the complete path of the subdirectories in parts inside of path. If
+     * one of the parts already exists but in different upper and lower case, the resulting
+     * path will contain that one. Note that the directory is not created!
+     */
+    EDITOR_CORE_API QString SubDirectoryCaseInsensitive(const QString& path, const QStringList& parts);
+};
+
+inline QString operator /(const QString& first, const QString& second)
+{
+    return Path::Make(first, second);
+}
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_PATHUTIL_H
diff --git a/Code/Editor/Util/PredefinedAspectRatios.cpp b/Code/Editor/Util/PredefinedAspectRatios.cpp
new file mode 100644
index 0000000000..76879fa42b
--- /dev/null
+++ b/Code/Editor/Util/PredefinedAspectRatios.cpp
@@ -0,0 +1,117 @@
+/*
+ * 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 "PredefinedAspectRatios.h"
+
+// Editor
+#include "Settings.h"
+
+CPredefinedAspectRatios::CPredefinedAspectRatios()
+{
+    m_aspectRatios.reserve(10);
+
+    AddAspectRatio(5, 4);
+    AddAspectRatio(4, 3);
+    AddAspectRatio(3, 2);
+    AddAspectRatio(16, 10);
+    AddAspectRatio(16, 9);
+    AddAspectRatio(1.85f, 1);
+    AddAspectRatio(2.39f, 1);
+}
+
+CPredefinedAspectRatios::~CPredefinedAspectRatios()
+{
+}
+
+void CPredefinedAspectRatios::AddAspectRatio(float x, int y)
+{
+    if (y == 0)
+    {
+        return;
+    }
+
+    SAspectRatio aspectRatio;
+    aspectRatio.name = QStringLiteral("%1:%2").arg(x, 0, 'f', 2).arg(y);
+    aspectRatio.value = x / y;
+
+    m_aspectRatios.push_back(aspectRatio);
+}
+
+void CPredefinedAspectRatios::AddAspectRatio(int x, int y)
+{
+    if (y == 0)
+    {
+        return;
+    }
+
+    SAspectRatio aspectRatio;
+    aspectRatio.name = QStringLiteral("%1:%2").arg(x).arg(y);
+    aspectRatio.value = float( x ) / y;
+
+    m_aspectRatios.push_back(aspectRatio);
+}
+
+
+float CPredefinedAspectRatios::GetCurrentValue() const
+{
+    return gSettings.viewports.fDefaultAspectRatio;
+}
+
+bool CPredefinedAspectRatios::IsEmpty() const
+{
+    return m_aspectRatios.empty();
+}
+
+size_t CPredefinedAspectRatios::GetCount() const
+{
+    return m_aspectRatios.size();
+}
+
+
+const QString& CPredefinedAspectRatios::GetName(size_t aspectRatioId) const
+{
+    bool validAspectRatioId = (aspectRatioId < GetCount());
+    assert(validAspectRatioId);
+    if (!validAspectRatioId)
+    {
+        static QString dummyAspectRatioName("1:1");
+        return dummyAspectRatioName;
+    }
+
+    const SAspectRatio& aspectRatio = m_aspectRatios[ aspectRatioId ];
+
+    return aspectRatio.name;
+}
+
+float CPredefinedAspectRatios::GetValue(size_t aspectRatioId) const
+{
+    bool validAspectRatioId = (aspectRatioId < GetCount());
+    assert(validAspectRatioId);
+    if (!validAspectRatioId)
+    {
+        return 1;
+    }
+
+    const SAspectRatio& aspectRatio = m_aspectRatios[ aspectRatioId ];
+
+    return aspectRatio.value;
+}
+
+bool CPredefinedAspectRatios::IsCurrent(size_t aspectRatioId) const
+{
+    float selectedValue = GetValue(aspectRatioId);
+    float currentValue = GetCurrentValue();
+
+    const float THRESHOLD = 0.01f;
+
+    bool valuesCloseEnough = (fabs(selectedValue - currentValue) <= THRESHOLD);
+
+    return valuesCloseEnough;
+}
diff --git a/Code/Editor/Util/PredefinedAspectRatios.h b/Code/Editor/Util/PredefinedAspectRatios.h
new file mode 100644
index 0000000000..c65cdf6f5a
--- /dev/null
+++ b/Code/Editor/Util/PredefinedAspectRatios.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_PREDEFINEDASPECTRATIOS_H
+#define CRYINCLUDE_EDITOR_UTIL_PREDEFINEDASPECTRATIOS_H
+#pragma once
+
+
+#include <vector>
+
+class CPredefinedAspectRatios
+{
+public:
+    CPredefinedAspectRatios();
+    virtual ~CPredefinedAspectRatios();
+
+    void AddAspectRatio(float x, int y);
+    void AddAspectRatio(int x, int y);
+
+    float GetCurrentValue() const;
+
+    bool IsEmpty() const;
+    size_t GetCount() const;
+
+    const QString& GetName(size_t aspectRatioId) const;
+    float GetValue(size_t aspectRatioId) const;
+    bool IsCurrent(size_t aspectRatioId) const;
+
+private:
+    struct SAspectRatio
+    {
+        QString name;
+        float value;
+    };
+    std::vector< SAspectRatio > m_aspectRatios;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_PREDEFINEDASPECTRATIOS_H
diff --git a/Code/Editor/Util/RefCountBase.h b/Code/Editor/Util/RefCountBase.h
new file mode 100644
index 0000000000..d375b45a0b
--- /dev/null
+++ b/Code/Editor/Util/RefCountBase.h
@@ -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
+ *
+ */
+
+
+// Description : Reference counted base object.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_REFCOUNTBASE_H
+#define CRYINCLUDE_EDITOR_UTIL_REFCOUNTBASE_H
+#pragma once
+
+#include <Include/EditorCoreAPI.h>
+
+//! Derive from this class to get reference counting in your class.
+class EDITOR_CORE_API CRefCountBase
+{
+public:
+    CRefCountBase() {}
+
+    //! Add a new reference to this object.
+    int AddRef()
+    {
+        m_nRefCount++;
+        return m_nRefCount;
+    }
+
+    //! Release reference to this object.
+    //! When the reference count reaches zero, the object is deleted.
+    int Release()
+    {
+        int refs = --m_nRefCount;
+        if (m_nRefCount == 0)
+        {
+            delete this;
+        }
+        else if (m_nRefCount < 0)
+        {
+            CryFatalError("Negative ref count");
+        }
+        return refs;
+    }
+
+protected:
+    virtual ~CRefCountBase() {}
+
+private:
+    int m_nRefCount = 0;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_REFCOUNTBASE_H
diff --git a/Code/Editor/Util/StringHelpers.cpp b/Code/Editor/Util/StringHelpers.cpp
new file mode 100644
index 0000000000..8b8ca62609
--- /dev/null
+++ b/Code/Editor/Util/StringHelpers.cpp
@@ -0,0 +1,1058 @@
+/*
+ * 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 <platform.h>
+#include "StringHelpers.h"
+#include "Util.h"
+#include "StringUtils.h" // From CryCommon
+#include "UnicodeFunctions.h"
+#include <cctype>
+#include <algorithm>
+
+#if defined(AZ_PLATFORM_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>   // WideCharToMultibyte(), CP_UTF8, etc.
+#endif
+
+#include <AzCore/Casting/numeric_cast.h>
+
+static inline char ToLower(const char c)
+{
+    return tolower(c);
+}
+
+static inline wchar_t ToLower(const wchar_t c)
+{
+    return towlower(c);
+}
+
+
+static inline char ToUpper(const char c)
+{
+    return toupper(c);
+}
+
+static inline wchar_t ToUpper(const wchar_t c)
+{
+    return towupper(c);
+}
+
+
+static inline int Vscprintf(const char* format, va_list argList)
+{
+#if defined(AZ_PLATFORM_WINDOWS)
+    return _vscprintf(format, argList);
+#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
+    int retval;
+    va_list argcopy;
+    va_copy(argcopy, argList);
+    retval = azvsnprintf(NULL, 0, format, argcopy);
+    va_end(argcopy);
+    return retval;
+#else
+    #error Not supported!
+#endif
+}
+
+static inline int Vscprintf(const wchar_t* format, va_list argList)
+{
+#if defined(AZ_PLATFORM_WINDOWS)
+    return _vscwprintf(format, argList);
+#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
+    int retval;
+    va_list argcopy;
+    va_copy(argcopy, argList);
+    retval = azvsnwprintf(NULL, 0, format, argcopy);
+    va_end(argcopy);
+    return retval;
+#else
+    #error Not supported!
+#endif
+}
+
+
+static inline int Vsnprintf_s(char* str, size_t sizeInBytes, [[maybe_unused]] size_t count, const char* format, va_list argList)
+{
+    return azvsnprintf(str, sizeInBytes, format, argList);
+}
+
+static inline int Vsnprintf_s(wchar_t* str, size_t sizeInBytes, [[maybe_unused]] size_t count, const wchar_t* format, va_list argList)
+{
+    return azvsnwprintf(str, sizeInBytes, format, argList);
+}
+
+
+int StringHelpers::Compare(const string& str0, const string& str1)
+{
+    const size_t minLength = Util::getMin(str0.length(), str1.length());
+    const int result = std::memcmp(str0.c_str(), str1.c_str(), minLength);
+    if (result)
+    {
+        return result;
+    }
+    else
+    {
+        return (str0.length() == str1.length())
+               ? 0
+               : ((str0.length() < str1.length()) ? -1 : +1);
+    }
+}
+
+int StringHelpers::Compare(const wstring& str0, const wstring& str1)
+{
+    const size_t minLength = Util::getMin(str0.length(), str1.length());
+    for (size_t i = 0; i < minLength; ++i)
+    {
+        const wchar_t c0 = str0[i];
+        const wchar_t c1 = str1[i];
+        if (c0 != c1)
+        {
+            return (c0 < c1) ? -1 : 1;
+        }
+    }
+
+    return (str0.length() == str1.length())
+           ? 0
+           : ((str0.length() < str1.length()) ? -1 : +1);
+}
+
+
+int StringHelpers::CompareIgnoreCase(const string& str0, const string& str1)
+{
+    const size_t minLength = Util::getMin(str0.length(), str1.length());
+    const int result = azmemicmp(str0.c_str(), str1.c_str(), minLength);
+    if (result)
+    {
+        return result;
+    }
+    else
+    {
+        return (str0.length() == str1.length())
+               ? 0
+               : ((str0.length() < str1.length()) ? -1 : +1);
+    }
+}
+
+int StringHelpers::CompareIgnoreCase(const wstring& str0, const wstring& str1)
+{
+    const size_t minLength = Util::getMin(str0.length(), str1.length());
+    for (size_t i = 0; i < minLength; ++i)
+    {
+        const wchar_t c0 = towlower(str0[i]);
+        const wchar_t c1 = towlower(str1[i]);
+        if (c0 != c1)
+        {
+            return (c0 < c1) ? -1 : 1;
+        }
+    }
+
+    return (str0.length() == str1.length())
+           ? 0
+           : ((str0.length() < str1.length()) ? -1 : +1);
+}
+
+
+bool StringHelpers::Equals(const string& str0, const string& str1)
+{
+    if (str0.length() != str1.length())
+    {
+        return false;
+    }
+    return std::memcmp(str0.c_str(), str1.c_str(), str1.length()) == 0;
+}
+
+bool StringHelpers::Equals(const wstring& str0, const wstring& str1)
+{
+    if (str0.length() != str1.length())
+    {
+        return false;
+    }
+    return std::memcmp(str0.c_str(), str1.c_str(), str1.length() * sizeof(wstring::value_type)) == 0;
+}
+
+
+bool StringHelpers::EqualsIgnoreCase(const string& str0, const string& str1)
+{
+    if (str0.length() != str1.length())
+    {
+        return false;
+    }
+    return azmemicmp(str0.c_str(), str1.c_str(), str1.length()) == 0;
+}
+
+bool StringHelpers::EqualsIgnoreCase(const wstring& str0, const wstring& str1)
+{
+    const size_t str1Length = str1.length();
+    if (str0.length() != str1Length)
+    {
+        return false;
+    }
+    for (size_t i = 0; i < str1Length; ++i)
+    {
+        if (towlower(str0[i]) != towlower(str1[i]))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+
+bool StringHelpers::StartsWith(const string& str, const string& pattern)
+{
+    if (str.length() < pattern.length())
+    {
+        return false;
+    }
+    return std::memcmp(str.c_str(), pattern.c_str(), pattern.length()) == 0;
+}
+
+bool StringHelpers::StartsWith(const wstring& str, const wstring& pattern)
+{
+    if (str.length() < pattern.length())
+    {
+        return false;
+    }
+    return std::memcmp(str.c_str(), pattern.c_str(), pattern.length() * sizeof(wstring::value_type)) == 0;
+}
+
+
+bool StringHelpers::StartsWithIgnoreCase(const string& str, const string& pattern)
+{
+    if (str.length() < pattern.length())
+    {
+        return false;
+    }
+    return azmemicmp(str.c_str(), pattern.c_str(), pattern.length()) == 0;
+}
+
+bool StringHelpers::StartsWithIgnoreCase(const wstring& str, const wstring& pattern)
+{
+    const size_t patternLength = pattern.length();
+    if (str.length() < patternLength)
+    {
+        return false;
+    }
+    for (size_t i = 0; i < patternLength; ++i)
+    {
+        if (towlower(str[i]) != towlower(pattern[i]))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+
+bool StringHelpers::EndsWith(const string& str, const string& pattern)
+{
+    if (str.length() < pattern.length())
+    {
+        return false;
+    }
+    return std::memcmp(str.c_str() + str.length() - pattern.length(), pattern.c_str(), pattern.length()) == 0;
+}
+
+bool StringHelpers::EndsWith(const wstring& str, const wstring& pattern)
+{
+    if (str.length() < pattern.length())
+    {
+        return false;
+    }
+    return std::memcmp(str.c_str() + str.length() - pattern.length(), pattern.c_str(), pattern.length() * sizeof(wstring::value_type)) == 0;
+}
+
+
+bool StringHelpers::EndsWithIgnoreCase(const string& str, const string& pattern)
+{
+    if (str.length() < pattern.length())
+    {
+        return false;
+    }
+    return azmemicmp(str.c_str() + str.length() - pattern.length(), pattern.c_str(), pattern.length()) == 0;
+}
+
+bool StringHelpers::EndsWithIgnoreCase(const wstring& str, const wstring& pattern)
+{
+    const size_t patternLength = pattern.length();
+    if (str.length() < patternLength)
+    {
+        return false;
+    }
+    for (size_t i = str.length() - patternLength, j = 0; i < patternLength; ++i, ++j)
+    {
+        if (towlower(str[i]) != towlower(pattern[j]))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+
+bool StringHelpers::Contains(const string& str, const string& pattern)
+{
+    const size_t patternLength = pattern.length();
+    if (str.length() < patternLength)
+    {
+        return false;
+    }
+    const size_t n = str.length() - patternLength + 1;
+    for (size_t i = 0; i < n; ++i)
+    {
+        if (std::memcmp(str.c_str() + i, pattern.c_str(), patternLength) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool StringHelpers::Contains(const wstring& str, const wstring& pattern)
+{
+    const size_t patternLength = pattern.length();
+    if (str.length() < patternLength)
+    {
+        return false;
+    }
+    const size_t n = str.length() - patternLength + 1;
+    for (size_t i = 0; i < n; ++i)
+    {
+        if (std::memcmp(str.c_str() + i, pattern.c_str(), patternLength * sizeof(wstring::value_type)) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+
+bool StringHelpers::ContainsIgnoreCase(const string& str, const string& pattern)
+{
+    const size_t patternLength = pattern.length();
+    if (str.length() < patternLength)
+    {
+        return false;
+    }
+    const size_t n = str.length() - patternLength + 1;
+    for (size_t i = 0; i < n; ++i)
+    {
+        if (azmemicmp(str.c_str() + i, pattern.c_str(), patternLength) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool StringHelpers::ContainsIgnoreCase(const wstring& str, const wstring& pattern)
+{
+    const size_t patternLength = pattern.length();
+    if (patternLength == 0)
+    {
+        return true;
+    }
+    if (str.length() < patternLength)
+    {
+        return false;
+    }
+
+    const wstring::value_type firstPatternLetter = towlower(pattern[0]);
+    const size_t n = str.length() - patternLength + 1;
+    for (size_t i = 0; i < n; ++i)
+    {
+        bool match = true;
+        for (size_t j = 0; j < patternLength; ++j)
+        {
+            if (towlower(str[i + j]) != towlower(pattern[j]))
+            {
+                match = false;
+                break;
+            }
+        }
+        if (match)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool StringHelpers::MatchesWildcards(const string& str, const string& wildcards)
+{
+    using namespace CryStringUtils_Internal;
+    return MatchesWildcards_Tpl<SCharComparatorCaseSensitive>(str.c_str(), wildcards.c_str());
+}
+
+bool StringHelpers::MatchesWildcards(const wstring& str, const wstring& wildcards)
+{
+    using namespace CryStringUtils_Internal;
+    return MatchesWildcards_Tpl<SCharComparatorCaseSensitive>(str.c_str(), wildcards.c_str());
+}
+
+bool StringHelpers::MatchesWildcardsIgnoreCase(const string& str, const string& wildcards)
+{
+    using namespace CryStringUtils_Internal;
+    return MatchesWildcards_Tpl<SCharComparatorCaseInsensitive>(str.c_str(), wildcards.c_str());
+}
+
+bool StringHelpers::MatchesWildcardsIgnoreCase(const wstring& str, const wstring& wildcards)
+{
+    using namespace CryStringUtils_Internal;
+    return MatchesWildcards_Tpl<SCharComparatorCaseInsensitive>(str.c_str(), wildcards.c_str());
+}
+
+
+template <class TS>
+static inline bool MatchesWildcardsIgnoreCaseExt_Tpl(const TS& str, const TS& wildcards, std::vector<TS>& wildcardMatches)
+{
+    const typename TS::value_type* savedStrBegin = 0;
+    const typename TS::value_type* savedStrEnd = 0;
+    const typename TS::value_type* savedWild = 0;
+    size_t savedWildCount = 0;
+
+    const typename TS::value_type* pStr = str.c_str();
+    const typename TS::value_type* pWild = wildcards.c_str();
+    size_t wildCount = 0;
+
+    while ((*pStr) && (*pWild != '*'))
+    {
+        if (*pWild == '?')
+        {
+            wildcardMatches.push_back(TS(pStr, pStr + 1));
+            ++wildCount;
+        }
+        else if (ToLower(*pWild) != ToLower(*pStr))
+        {
+            wildcardMatches.resize(wildcardMatches.size() - wildCount);
+            return false;
+        }
+        ++pWild;
+        ++pStr;
+    }
+
+    while (*pStr)
+    {
+        if (*pWild == '*')
+        {
+            if (!pWild[1])
+            {
+                wildcardMatches.push_back(TS(pStr));
+                return true;
+            }
+            savedWild = pWild++;
+            savedStrBegin = pStr;
+            savedStrEnd = pStr;
+            savedWildCount = wildCount;
+            wildcardMatches.push_back(TS(savedStrBegin, savedStrEnd));
+            ++wildCount;
+        }
+        else if (*pWild == '?')
+        {
+            wildcardMatches.push_back(TS(pStr, pStr + 1));
+            ++wildCount;
+            ++pWild;
+            ++pStr;
+        }
+        else if (ToLower(*pWild) == ToLower(*pStr))
+        {
+            ++pWild;
+            ++pStr;
+        }
+        else
+        {
+            wildcardMatches.resize(wildcardMatches.size() - (wildCount - savedWildCount));
+            wildCount = savedWildCount;
+            ++savedStrEnd;
+            pWild = savedWild + 1;
+            pStr = savedStrEnd;
+            wildcardMatches.push_back(TS(savedStrBegin, savedStrEnd));
+            ++wildCount;
+        }
+    }
+
+    while (*pWild == '*')
+    {
+        ++pWild;
+        wildcardMatches.push_back(TS());
+        ++wildCount;
+    }
+
+    if (*pWild)
+    {
+        wildcardMatches.resize(wildcardMatches.size() - wildCount);
+        return false;
+    }
+
+    return true;
+}
+
+bool StringHelpers::MatchesWildcardsIgnoreCaseExt(const string& str, const string& wildcards, std::vector<string>& wildcardMatches)
+{
+    return MatchesWildcardsIgnoreCaseExt_Tpl(str, wildcards, wildcardMatches);
+}
+
+bool StringHelpers::MatchesWildcardsIgnoreCaseExt(const wstring& str, const wstring& wildcards, std::vector<wstring>& wildcardMatches)
+{
+    return MatchesWildcardsIgnoreCaseExt_Tpl(str, wildcards, wildcardMatches);
+}
+
+
+string StringHelpers::TrimLeft(const string& s)
+{
+    const size_t first = s.find_first_not_of(" \r\t");
+    return (first == s.npos) ? string() : s.substr(first);
+}
+
+wstring StringHelpers::TrimLeft(const wstring& s)
+{
+    const size_t first = s.find_first_not_of(L" \r\t");
+    return (first == s.npos) ? wstring() : s.substr(first);
+}
+
+
+string StringHelpers::TrimRight(const string& s)
+{
+    const size_t last = s.find_last_not_of(" \r\t");
+    return (last == s.npos) ? s : s.substr(0, last + 1);
+}
+
+wstring StringHelpers::TrimRight(const wstring& s)
+{
+    const size_t last = s.find_last_not_of(L" \r\t");
+    return (last == s.npos) ? s : s.substr(0, last + 1);
+}
+
+
+string StringHelpers::Trim(const string& s)
+{
+    return TrimLeft(TrimRight(s));
+}
+
+wstring StringHelpers::Trim(const wstring& s)
+{
+    return TrimLeft(TrimRight(s));
+}
+
+
+template <class TS>
+static inline TS RemoveDuplicateSpaces_Tpl(const TS& s)
+{
+    TS res;
+    bool spaceFound = false;
+
+    for (size_t i = 0, n = s.length(); i < n; ++i)
+    {
+        if ((s[i] == ' ') || (s[i] == '\r') || (s[i] == '\t'))
+        {
+            spaceFound = true;
+        }
+        else
+        {
+            if (spaceFound)
+            {
+                res += ' ';
+                spaceFound = false;
+            }
+            res += s[i];
+        }
+    }
+
+    if (spaceFound)
+    {
+        res += ' ';
+    }
+    return res;
+}
+
+string StringHelpers::RemoveDuplicateSpaces(const string& s)
+{
+    return RemoveDuplicateSpaces_Tpl(s);
+}
+
+wstring StringHelpers::RemoveDuplicateSpaces(const wstring& s)
+{
+    return RemoveDuplicateSpaces_Tpl(s);
+}
+
+
+template <class TS>
+static inline TS MakeLowerCase_Tpl(const TS& s)
+{
+    TS copy;
+    copy.reserve(s.length());
+    for (typename TS::const_iterator it = s.begin(), end = s.end(); it != end; ++it)
+    {
+        copy.append(1, ToLower(*it));
+    }
+    return copy;
+}
+
+string StringHelpers::MakeLowerCase(const string& s)
+{
+    return MakeLowerCase_Tpl(s);
+}
+
+wstring StringHelpers::MakeLowerCase(const wstring& s)
+{
+    return MakeLowerCase_Tpl(s);
+}
+
+
+template <class TS>
+static inline TS MakeUpperCase_Tpl(const TS& s)
+{
+    TS copy;
+    copy.reserve(s.length());
+    for (typename TS::const_iterator it = s.begin(), end = s.end(); it != end; ++it)
+    {
+        copy.append(1, ToUpper(*it));
+    }
+    return copy;
+}
+
+string StringHelpers::MakeUpperCase(const string& s)
+{
+    return MakeUpperCase_Tpl(s);
+}
+
+wstring StringHelpers::MakeUpperCase(const wstring& s)
+{
+    return MakeUpperCase_Tpl(s);
+}
+
+
+template <class TS>
+static inline TS Replace_Tpl(const TS& s, const typename TS::value_type oldChar, const typename TS::value_type newChar)
+{
+    TS copy;
+    copy.reserve(s.length());
+    for (typename TS::const_iterator it = s.begin(), end = s.end(); it != end; ++it)
+    {
+        const typename TS::value_type c = (*it);
+        copy.append(1, ((c == oldChar) ? newChar : c));
+    }
+    return copy;
+}
+
+string StringHelpers::Replace(const string& s, char oldChar, char newChar)
+{
+    return Replace_Tpl(s, oldChar, newChar);
+}
+
+wstring StringHelpers::Replace(const wstring& s, wchar_t oldChar, wchar_t newChar)
+{
+    return Replace_Tpl(s, oldChar, newChar);
+}
+
+
+void StringHelpers::ConvertStringByRef(string& out, const string& in)
+{
+    out = in;
+}
+
+void StringHelpers::ConvertStringByRef(wstring& out, const string& in)
+{
+    Unicode::Convert(out, in);
+}
+
+void StringHelpers::ConvertStringByRef(string& out, const wstring& in)
+{
+    Unicode::Convert(out, in);
+}
+
+void StringHelpers::ConvertStringByRef(wstring& out, const wstring& in)
+{
+    out = in;
+}
+
+
+template <class TS>
+static inline void Split_Tpl(const TS& str, const TS& separator, bool bReturnEmptyPartsToo, std::vector<TS>& outParts)
+{
+    if (str.empty())
+    {
+        return;
+    }
+
+    if (separator.empty())
+    {
+        for (size_t i = 0; i < str.length(); ++i)
+        {
+            outParts.push_back(str.substr(i, 1));
+        }
+        return;
+    }
+
+    size_t partStart = 0;
+
+    for (;; )
+    {
+        const size_t pos = str.find(separator, partStart);
+        if (pos == TS::npos)
+        {
+            break;
+        }
+        if (bReturnEmptyPartsToo || (pos > partStart))
+        {
+            outParts.push_back(str.substr(partStart, pos - partStart));
+        }
+        partStart = pos + separator.length();
+    }
+
+    if (bReturnEmptyPartsToo || (partStart < str.length()))
+    {
+        outParts.push_back(str.substr(partStart, str.length() - partStart));
+    }
+}
+
+
+template <class TS>
+static inline void SplitByAnyOf_Tpl(const TS& str, const TS& separators, bool bReturnEmptyPartsToo, std::vector<TS>& outParts)
+{
+    if (str.empty())
+    {
+        return;
+    }
+
+    if (separators.empty())
+    {
+        for (size_t i = 0; i < str.length(); ++i)
+        {
+            outParts.push_back(str.substr(i, 1));
+        }
+        return;
+    }
+
+    size_t partStart = 0;
+
+    for (;; )
+    {
+        const size_t pos = str.find_first_of(separators, partStart);
+        if (pos == TS::npos)
+        {
+            break;
+        }
+        if (bReturnEmptyPartsToo || (pos > partStart))
+        {
+            outParts.push_back(str.substr(partStart, pos - partStart));
+        }
+        partStart = pos + 1;
+    }
+
+    if (bReturnEmptyPartsToo || (partStart < str.length()))
+    {
+        outParts.push_back(str.substr(partStart, str.length() - partStart));
+    }
+}
+
+
+
+void StringHelpers::Split(const string& str, const string& separator, bool bReturnEmptyPartsToo, std::vector<string>& outParts)
+{
+    Split_Tpl(str, separator, bReturnEmptyPartsToo, outParts);
+}
+
+void StringHelpers::Split(const wstring& str, const wstring& separator, bool bReturnEmptyPartsToo, std::vector<wstring>& outParts)
+{
+    Split_Tpl(str, separator, bReturnEmptyPartsToo, outParts);
+}
+
+
+void StringHelpers::SplitByAnyOf(const string& str, const string& separators, bool bReturnEmptyPartsToo, std::vector<string>& outParts)
+{
+    SplitByAnyOf_Tpl(str, separators, bReturnEmptyPartsToo, outParts);
+}
+
+void StringHelpers::SplitByAnyOf(const wstring& str, const wstring& separators, bool bReturnEmptyPartsToo, std::vector<wstring>& outParts)
+{
+    SplitByAnyOf_Tpl(str, separators, bReturnEmptyPartsToo, outParts);
+}
+
+
+template <class TS>
+static inline TS FormatVA_Tpl(const typename TS::value_type* const format, va_list parg)
+{
+    if ((format == 0) || (format[0] == 0))
+    {
+        return TS();
+    }
+
+    std::vector<typename TS::value_type> bf;
+    size_t capacity = 0;
+
+    size_t wantedCapacity = Vscprintf(format, parg);
+    wantedCapacity += 2;  // '+ 2' to prevent uncertainty when Vsnprintf_s() returns 'size - 1'
+
+    for (;; )
+    {
+        if (wantedCapacity > capacity)
+        {
+            capacity = wantedCapacity;
+            bf.resize(capacity + 1);
+        }
+
+        const int countWritten = Vsnprintf_s(&bf[0], capacity + 1, _TRUNCATE, format, parg);
+
+        if ((countWritten >= 0) && (capacity > (size_t)countWritten + 1))
+        {
+            bf[countWritten] = 0;
+            return TS(&bf[0]);
+        }
+
+        wantedCapacity = capacity * 2;
+    }
+}
+
+string StringHelpers::FormatVA(const char* const format, va_list parg)
+{
+    return FormatVA_Tpl<string>(format, parg);
+}
+
+wstring StringHelpers::FormatVA(const wchar_t* const format, va_list parg)
+{
+    return FormatVA_Tpl<wstring>(format, parg);
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+template <class TC>
+static inline void SafeCopy_Tpl(TC* const pDstBuffer, const size_t dstBufferSizeInBytes, const TC* const pSrc)
+{
+    if (dstBufferSizeInBytes >= sizeof(TC))
+    {
+        const size_t n = dstBufferSizeInBytes / sizeof(TC) - 1;
+        size_t i;
+        for (i = 0; i < n && pSrc[i]; ++i)
+        {
+            pDstBuffer[i] = pSrc[i];
+        }
+        pDstBuffer[i] = 0;
+    }
+}
+
+template <class TC>
+static inline void SafeCopyPadZeros_Tpl(TC* const pDstBuffer, const size_t dstBufferSizeInBytes, const TC* const pSrc)
+{
+    if (dstBufferSizeInBytes > 0)
+    {
+        const size_t n = (dstBufferSizeInBytes < sizeof(TC)) ? 0 : dstBufferSizeInBytes / sizeof(TC) - 1;
+        size_t i;
+        for (i = 0; i < n && pSrc[i]; ++i)
+        {
+            pDstBuffer[i] = pSrc[i];
+        }
+        memset(&pDstBuffer[i], 0, dstBufferSizeInBytes - i * sizeof(TC));
+    }
+}
+
+
+void StringHelpers::SafeCopy(char* const pDstBuffer, const size_t dstBufferSizeInBytes, const char* const pSrc)
+{
+    SafeCopy_Tpl<char>(pDstBuffer, dstBufferSizeInBytes, pSrc);
+}
+
+void StringHelpers::SafeCopy(wchar_t* const pDstBuffer, const size_t dstBufferSizeInBytes, const wchar_t* const pSrc)
+{
+    SafeCopy_Tpl<wchar_t>(pDstBuffer, dstBufferSizeInBytes, pSrc);
+}
+
+
+void StringHelpers::SafeCopyPadZeros(char* const pDstBuffer, const size_t dstBufferSizeInBytes, const char* const pSrc)
+{
+    SafeCopyPadZeros_Tpl<char>(pDstBuffer, dstBufferSizeInBytes, pSrc);
+}
+
+void StringHelpers::SafeCopyPadZeros(wchar_t* const pDstBuffer, const size_t dstBufferSizeInBytes, const wchar_t* const pSrc)
+{
+    SafeCopyPadZeros_Tpl<wchar_t>(pDstBuffer, dstBufferSizeInBytes, pSrc);
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+bool StringHelpers::Utf16ContainsAsciiOnly(const wchar_t* wstr)
+{
+    while (*wstr)
+    {
+        if (*wstr > 127 || *wstr < 0)
+        {
+            return false;
+        }
+        ++wstr;
+    }
+    return true;
+}
+
+
+string StringHelpers::ConvertAsciiUtf16ToAscii(const wchar_t* wstr)
+{
+    const size_t len = wcslen(wstr);
+
+    string result;
+    result.reserve(len);
+
+    for (size_t i = 0; i < len; ++i)
+    {
+        result.push_back(wstr[i] & 0x7F);
+    }
+
+    return result;
+}
+
+
+wstring StringHelpers::ConvertAsciiToUtf16(const char* str)
+{
+    const size_t len = strlen(str);
+
+    wstring result;
+    result.reserve(len);
+
+    for (size_t i = 0; i < len; ++i)
+    {
+        result.push_back(str[i] & 0x7F);
+    }
+
+    return result;
+}
+
+#if defined(AZ_PLATFORM_WINDOWS)
+static string ConvertUtf16ToMultibyte(const wchar_t* wstr, uint codePage, char badChar)
+{
+    if (wstr[0] == 0)
+    {
+        return string();
+    }
+
+    const int len = aznumeric_caster(wcslen(wstr));
+
+    // Request needed buffer size, in bytes
+    int neededByteCount = WideCharToMultiByte(
+            codePage,
+            0,
+            wstr,
+            len,
+            0,
+            0,
+            ((badChar && codePage != CP_UTF8) ? &badChar : NULL),
+            NULL);
+    if (neededByteCount <= 0)
+    {
+        return string();
+    }
+    ++neededByteCount; // extra space for terminating zero
+
+    std::vector<char> buffer(neededByteCount);
+
+    const int byteCount = WideCharToMultiByte(
+            codePage,
+            0,
+            wstr,
+            len,
+            &buffer[0], // output buffer
+            neededByteCount - 1, // size of the output buffer in bytes
+            ((badChar && codePage != CP_UTF8) ? &badChar : NULL),
+            NULL);
+    if (byteCount != neededByteCount - 1)
+    {
+        return string();
+    }
+
+    buffer[byteCount] = 0;
+
+    return string(&buffer[0]);
+}
+
+
+static wstring ConvertMultibyteToUtf16(const char* str, uint codePage)
+{
+    if (str[0] == 0)
+    {
+        return wstring();
+    }
+
+    const int len = aznumeric_caster(strlen(str));
+
+    // Request needed buffer size, in characters
+    int neededCharCount = MultiByteToWideChar(
+            codePage,
+            0,
+            str,
+            len,
+            0,
+            0);
+    if (neededCharCount <= 0)
+    {
+        return wstring();
+    }
+    ++neededCharCount; // extra space for terminating zero
+
+    std::vector<wchar_t> wbuffer(neededCharCount);
+
+    const int charCount = MultiByteToWideChar(
+            codePage,
+            0,
+            str,
+            len,
+            &wbuffer[0], // output buffer
+            neededCharCount - 1); // size of the output buffer in characters
+    if (charCount != neededCharCount - 1)
+    {
+        return wstring();
+    }
+
+    wbuffer[charCount] = 0;
+
+    return wstring(&wbuffer[0]);
+}
+
+
+wstring StringHelpers::ConvertUtf8ToUtf16(const char* str)
+{
+    return ConvertMultibyteToUtf16(str, CP_UTF8);
+}
+
+
+string StringHelpers::ConvertUtf16ToUtf8(const wchar_t* wstr)
+{
+    return ConvertUtf16ToMultibyte(wstr, CP_UTF8, 0);
+}
+
+
+wstring StringHelpers::ConvertAnsiToUtf16(const char* str)
+{
+    return ConvertMultibyteToUtf16(str, CP_ACP);
+}
+
+
+string StringHelpers::ConvertUtf16ToAnsi(const wchar_t* wstr, char badChar)
+{
+    return ConvertUtf16ToMultibyte(wstr, CP_ACP, badChar);
+}
+#endif  //AZ_PLATFORM_WINDOWS
+
+string StringHelpers::ConvertAnsiToAscii(const char* str, char badChar)
+{
+    const size_t len = strlen(str);
+
+    string result;
+    result.reserve(len);
+
+    for (size_t i = 0; i < len; ++i)
+    {
+        char c = str[i];
+        if (c < 0 || c > 127)
+        {
+            c = badChar;
+        }
+        result.push_back(c);
+    }
+
+    return result;
+}
+
+// eof
diff --git a/Code/Editor/Util/StringHelpers.h b/Code/Editor/Util/StringHelpers.h
new file mode 100644
index 0000000000..a5706ff195
--- /dev/null
+++ b/Code/Editor/Util/StringHelpers.h
@@ -0,0 +1,219 @@
+/*
+ * 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_CRYCOMMONTOOLS_STRINGHELPERS_H
+#define CRYINCLUDE_CRYCOMMONTOOLS_STRINGHELPERS_H
+#pragma once
+
+#include <CryString.h>
+
+namespace StringHelpers
+{
+    // compares two strings to see if they are the same or different, case sensitive
+    // returns 0 if the strings are the same, a -1 if the first string is bigger, or a 1 if the second string is bigger
+    int Compare(const string& str0, const string& str1);
+    int Compare(const wstring& str0, const wstring& str1);
+
+    // compares two strings to see if they are the same or different, case is ignored
+    // returns 0 if the strings are the same, a -1 if the first string is bigger, or a 1 if the second string is bigger
+    int CompareIgnoreCase(const string& str0, const string& str1);
+    int CompareIgnoreCase(const wstring& str0, const wstring& str1);
+
+    // compares two strings to see if they are the same, case senstive
+    // returns true if they are the same or false if they are different
+    bool Equals(const string& str0, const string& str1);
+    bool Equals(const wstring& str0, const wstring& str1);
+
+    // compares two strings to see if they are the same, case is ignored
+    // returns true if they are the same or false if they are different
+    bool EqualsIgnoreCase(const string& str0, const string& str1);
+    bool EqualsIgnoreCase(const wstring& str0, const wstring& str1);
+
+    // checks to see if a string starts with a specified string, case sensitive
+    // returns true if the string does start with a specified string or false if it does not
+    bool StartsWith(const string& str, const string& pattern);
+    bool StartsWith(const wstring& str, const wstring& pattern);
+
+    // checks to see if a string starts with a specified string, case is ignored
+    // returns true if the string does start with a specified string or false if it does not
+    bool StartsWithIgnoreCase(const string& str, const string& pattern);
+    bool StartsWithIgnoreCase(const wstring& str, const wstring& pattern);
+
+    // checks to see if a string ends with a specified string, case sensitive
+    // returns true if the string does end with a specified string or false if it does not
+    bool EndsWith(const string& str, const string& pattern);
+    bool EndsWith(const wstring& str, const wstring& pattern);
+
+    // checks to see if a string ends with a specified string, case is ignored
+    // returns true if the string does end with a specified string or false if it does not
+    bool EndsWithIgnoreCase(const string& str, const string& pattern);
+    bool EndsWithIgnoreCase(const wstring& str, const wstring& pattern);
+
+    // checks to see if a string contains a specified string, case sensitive
+    // returns true if the string does contain the specified string or false if it does not
+    bool Contains(const string& str, const string& pattern);
+    bool Contains(const wstring& str, const wstring& pattern);
+
+    // checks to see if a string contains a specified string, case is ignored
+    // returns true if the string does contain the specified string or false if it does not
+    bool ContainsIgnoreCase(const string& str, const string& pattern);
+    bool ContainsIgnoreCase(const wstring& str, const wstring& pattern);
+
+    // checks to see if a string contains a wildcard string pattern, case sensitive
+    // returns true if the string does match the wildcard string pattern or false if it does not
+    bool MatchesWildcards(const string& str, const string& wildcards);
+    bool MatchesWildcards(const wstring& str, const wstring& wildcards);
+
+    // checks to see if a string contains a wildcard string pattern, case is ignored
+    // returns true if the string does match the wildcard string pattern or false if it does not
+    bool MatchesWildcardsIgnoreCase(const string& str, const string& wildcards);
+    bool MatchesWildcardsIgnoreCase(const wstring& str, const wstring& wildcards);
+
+    bool MatchesWildcardsIgnoreCaseExt(const string& str, const string& wildcards, std::vector<string>& wildcardMatches);
+    bool MatchesWildcardsIgnoreCaseExt(const wstring& str, const wstring& wildcards, std::vector<wstring>& wildcardMatches);
+
+    string TrimLeft(const string& s);
+    wstring TrimLeft(const wstring& s);
+
+    string TrimRight(const string& s);
+    wstring TrimRight(const wstring& s);
+
+    string Trim(const string& s);
+    wstring Trim(const wstring& s);
+
+    string RemoveDuplicateSpaces(const string& s);
+    wstring RemoveDuplicateSpaces(const wstring& s);
+
+    // converts a string with upper case characters to be all lower case
+    // returns the string in all lower case
+    string MakeLowerCase(const string& s);
+    wstring MakeLowerCase(const wstring& s);
+
+    // converts a string with lower case characters to be all upper case
+    // returns the string in all upper case
+    string MakeUpperCase(const string& s);
+    wstring MakeUpperCase(const wstring& s);
+
+    // replace a specified character in a string with a specified replacement character
+    // returns string with specified character replaced
+    string Replace(const string& s, char oldChar, char newChar);
+    wstring Replace(const wstring& s, wchar_t oldChar, wchar_t newChar);
+
+    void ConvertStringByRef(string& out, const string& in);
+    void ConvertStringByRef(wstring& out, const string& in);
+    void ConvertStringByRef(string& out, const wstring& in);
+    void ConvertStringByRef(wstring& out, const wstring& in);
+
+    template <typename O, typename I>
+    O ConvertString(const I& in)
+    {
+        O out;
+        ConvertStringByRef(out, in);
+        return out;
+    }
+    
+    void Split(const string& str, const string& separator, bool bReturnEmptyPartsToo, std::vector<string>& outParts);
+    void Split(const wstring& str, const wstring& separator, bool bReturnEmptyPartsToo, std::vector<wstring>& outParts);
+
+    void SplitByAnyOf(const string& str, const string& separators, bool bReturnEmptyPartsToo, std::vector<string>& outParts);
+    void SplitByAnyOf(const wstring& str, const wstring& separators, bool bReturnEmptyPartsToo, std::vector<wstring>& outParts);
+
+    string FormatVA(const char* const format, va_list parg);
+    wstring FormatVA(const wchar_t* const format, va_list parg);
+
+    inline string Format(const char* const format, ...)
+    {
+        if ((format == 0) || (format[0] == 0))
+        {
+            return string();
+        }
+        va_list parg;
+        va_start(parg, format);
+        const string result = FormatVA(format, parg);
+        va_end(parg);
+        return result;
+    }
+
+    inline wstring Format(const wchar_t* const format, ...)
+    {
+        if ((format == 0) || (format[0] == 0))
+        {
+            return wstring();
+        }
+        va_list parg;
+        va_start(parg, format);
+        const wstring result = FormatVA(format, parg);
+        va_end(parg);
+        return result;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    void SafeCopy(char* const pDstBuffer, const size_t dstBufferSizeInBytes, const char* const pSrc);
+    void SafeCopy(wchar_t* const pDstBuffer, const size_t dstBufferSizeInBytes, const wchar_t* const pSrc);
+
+    void SafeCopyPadZeros(char* const pDstBuffer, const size_t dstBufferSizeInBytes, const char* const pSrc);
+    void SafeCopyPadZeros(wchar_t* const pDstBuffer, const size_t dstBufferSizeInBytes, const wchar_t* const pSrc);
+
+    //////////////////////////////////////////////////////////////////////////
+
+    // ASCII
+    // ANSI (system default Windows ANSI code page)
+    // UTF-8
+    // UTF-16
+
+    // ASCII -> UTF-16
+
+    bool Utf16ContainsAsciiOnly(const wchar_t* wstr);
+    string ConvertAsciiUtf16ToAscii(const wchar_t* wstr);
+    wstring ConvertAsciiToUtf16(const char* str);
+
+    // UTF-8 <-> UTF-16
+#if defined(AZ_PLATFORM_WINDOWS)
+    wstring ConvertUtf8ToUtf16(const char* str);
+    string ConvertUtf16ToUtf8(const wchar_t* wstr);
+
+    inline string ConvertUtfToUtf8(const char* str)
+    {
+        return string(str);
+    }
+
+    inline string ConvertUtfToUtf8(const wchar_t* wstr)
+    {
+        return ConvertUtf16ToUtf8(wstr);
+    }
+
+    inline wstring ConvertUtfToUtf16(const char* str)
+    {
+        return ConvertUtf8ToUtf16(str);
+    }
+
+    inline wstring ConvertUtfToUtf16(const wchar_t* wstr)
+    {
+        return wstring(wstr);
+    }
+
+    // ANSI <-> UTF-8, UTF-16
+
+    wstring ConvertAnsiToUtf16(const char* str);
+    string ConvertUtf16ToAnsi(const wchar_t* wstr, char badChar);
+
+    inline string ConvertAnsiToUtf8(const char* str)
+    {
+        return ConvertUtf16ToUtf8(ConvertAnsiToUtf16(str).c_str());
+    }
+    inline string ConvertUtf8ToAnsi(const char* str, char badChar)
+    {
+        return ConvertUtf16ToAnsi(ConvertUtf8ToUtf16(str).c_str(), badChar);
+    }
+#endif
+
+    // ANSI -> ASCII
+    string ConvertAnsiToAscii(const char* str, char badChar);
+}
+#endif // CRYINCLUDE_CRYCOMMONTOOLS_STRINGHELPERS_H
diff --git a/Code/Editor/Util/StringNoCasePredicate.h b/Code/Editor/Util/StringNoCasePredicate.h
new file mode 100644
index 0000000000..f1b9fb1a67
--- /dev/null
+++ b/Code/Editor/Util/StringNoCasePredicate.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Utility class to help in STL algorithms on containers with
+//               CStrings when intending to use case insensitive searches or sorting for
+//               example.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_STRINGNOCASEPREDICATE_H
+#define CRYINCLUDE_EDITOR_UTIL_STRINGNOCASEPREDICATE_H
+#pragma once
+
+/*
+Utility class to help in STL algorithms on containers with CStrings
+when intending to use case insensitive searches or sorting for example.
+
+e.g.
+std::vector< CString > v;
+...
+std::sort( v.begin(), v.end(), CStringNoCasePredicate::LessThan() );
+std::find_if( v.begin(), v.end(), CStringNoCasePredicate::Equal( stringImLookingFor ) );
+*/
+class CStringNoCasePredicate
+{
+public:
+    //////////////////////////////////////////////////////////////////////////
+    struct Equal
+    {
+        Equal(const QString& referenceString)
+            : m_referenceString(referenceString)
+        {
+        }
+
+        bool operator() (const QString& arg) const
+        {
+            return (m_referenceString.compare(arg, Qt::CaseInsensitive) == 0);
+        }
+
+    private:
+        const QString& m_referenceString;
+    };
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    struct LessThan
+    {
+        bool operator() (const QString& arg1, const QString& arg2) const
+        {
+            return (arg1.CompareNoCase(arg2) < 0);
+        }
+    };
+    //////////////////////////////////////////////////////////////////////////
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_STRINGNOCASEPREDICATE_H
diff --git a/Code/Editor/Util/TRefCountBase.h b/Code/Editor/Util/TRefCountBase.h
new file mode 100644
index 0000000000..376863b9d9
--- /dev/null
+++ b/Code/Editor/Util/TRefCountBase.h
@@ -0,0 +1,55 @@
+/*
+ * 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 : Reference counted base object.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_TREFCOUNTBASE_H
+#define CRYINCLUDE_EDITOR_UTIL_TREFCOUNTBASE_H
+#pragma once
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+//////////////////////////////////////////////////////////////////////////
+//! Derive from this class to get reference counting for your class.
+//////////////////////////////////////////////////////////////////////////
+template <class ParentClass>
+class CRYEDIT_API TRefCountBase
+    : public ParentClass
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    TRefCountBase() { m_nRefCount = 0; };
+
+    //! Add new refrence to this object.
+    unsigned long AddRef()
+    {
+        m_nRefCount++;
+        return m_nRefCount;
+    };
+
+    //! Release refrence to this object.
+    //! when reference count reaches zero, object is deleted.
+    unsigned long Release()
+    {
+        int refs = --m_nRefCount;
+        if (m_nRefCount <= 0)
+        {
+            delete this;
+        }
+        return refs;
+    }
+
+protected:
+    virtual ~TRefCountBase() {};
+
+private:
+    int m_nRefCount;
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_TREFCOUNTBASE_H
diff --git a/Code/Editor/Util/Triangulate.cpp b/Code/Editor/Util/Triangulate.cpp
new file mode 100644
index 0000000000..92d72683e2
--- /dev/null
+++ b/Code/Editor/Util/Triangulate.cpp
@@ -0,0 +1,68 @@
+/*
+ * 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 "Triangulate.h"
+
+// this file is essentially a wrapper for a portion of the MIT-licenced
+// ConvexDecomposition library by John W. Ratcliff mailto:jratcliffscarab@gmail.com.
+// it contains no code from that library, it just provides it with the required types, then includes the
+// portion we need.
+
+static const float TRIANGULATION_EPSILON = 0.0000000001f;
+
+#define MEMALLOC_MALLOC malloc
+#define MEMALLOC_FREE free
+
+namespace TriInternal
+{
+    class TVec;
+    typedef double NxF64;
+    typedef float NxF32;
+    typedef unsigned char NxU8;
+    typedef unsigned int NxU32;
+    typedef int NxI32;
+    typedef unsigned int TU32;
+
+    typedef std::vector< TVec >  TVecVector;
+    typedef std::vector< NxU32 >  TU32Vector;
+    #include "Contrib/NvFloatMath.inl"
+}
+
+#undef MEMALLOC_MALLOC
+#undef MEMALLOC_FREE
+
+namespace Triangulator
+{
+    // given the contour of a triangle, triangulate it, and return the result
+    // as a set of triangles
+    // return false if you fail to triangulate it.
+    bool Triangulate(const VectorOfVectors& contour, VectorOfVectors& result)
+    {
+        TriInternal::CTriangulator tri;
+        for (auto pt : contour)
+        {
+            tri.addPoint(pt.x, pt.y, pt.z);
+        }
+        TriInternal::NxU32 tricount = 0;
+        TriInternal::NxU32* indices = tri.triangulate(tricount, TRIANGULATION_EPSILON);
+        if (!indices)
+        {
+            return false;
+        }
+
+        for (TriInternal::NxU32 currentIdx = 0; currentIdx < tricount * 3; ++currentIdx)
+        {
+            TriInternal::NxU32 indexValue = *indices++;
+            result.push_back(contour[indexValue]);
+        }
+
+        return result.size() > 2;
+    }
+}
diff --git a/Code/Editor/Util/Triangulate.h b/Code/Editor/Util/Triangulate.h
new file mode 100644
index 0000000000..32a6222c74
--- /dev/null
+++ b/Code/Editor/Util/Triangulate.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_TRIANGULATE_H
+#define CRYINCLUDE_EDITOR_UTIL_TRIANGULATE_H
+#pragma once
+
+#include <vector>
+#include "Cry_Vector3.h"
+
+// you pass in a vector of vec3 (the contour of a shape) and it outputs a vector of vec3 (being the triangles)
+
+namespace Triangulator
+{
+    typedef std::vector< Vec3 > VectorOfVectors;
+    bool Triangulate(const VectorOfVectors& contour, VectorOfVectors& result);
+};
+
+
+#endif
diff --git a/Code/Editor/Util/UIEnumerations.cpp b/Code/Editor/Util/UIEnumerations.cpp
new file mode 100644
index 0000000000..e6af405372
--- /dev/null
+++ b/Code/Editor/Util/UIEnumerations.cpp
@@ -0,0 +1,74 @@
+/*
+ * 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 : This file implements the container for the assotiaon of
+//               enumeration name to enumeration values
+
+
+#include "EditorDefs.h"
+
+#include "UIEnumerations.h"
+
+//////////////////////////////////////////////////////////////////////////
+CUIEnumerations& CUIEnumerations::GetUIEnumerationsInstance()
+{
+    static CUIEnumerations  oGeneralProxy;
+    return oGeneralProxy;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CUIEnumerations::TDValuesContainer& CUIEnumerations::GetStandardNameContainer()
+{
+    static TDValuesContainer    cValuesContainer;
+    static bool                             boInit(false);
+
+    if (!boInit)
+    {
+        boInit = true;
+
+        XmlNodeRef                          oRootNode;
+        XmlNodeRef                          oEnumaration;
+        XmlNodeRef                          oEnumerationItem;
+
+        int                                         nNumberOfEnumarations(0);
+        int                                         nCurrentEnumaration(0);
+
+        int                                         nNumberOfEnumerationItems(0);
+        int                                         nCurrentEnumarationItem(0);
+
+        oRootNode = GetISystem()->GetXmlUtils()->LoadXmlFromFile("Editor\\PropertyEnumerations.xml");
+        nNumberOfEnumarations = oRootNode ? oRootNode->getChildCount() : 0;
+
+        for (nCurrentEnumaration = 0; nCurrentEnumaration < nNumberOfEnumarations; ++nCurrentEnumaration)
+        {
+            TDValues    cValues;
+            oEnumaration = oRootNode->getChild(nCurrentEnumaration);
+
+            nNumberOfEnumerationItems = oEnumaration->getChildCount();
+            for (nCurrentEnumarationItem = 0; nCurrentEnumarationItem < nNumberOfEnumerationItems; ++nCurrentEnumarationItem)
+            {
+                oEnumerationItem = oEnumaration->getChild(nCurrentEnumarationItem);
+
+                const char* szKey(NULL);
+                const char* szValue(NULL);
+                oEnumerationItem->getAttributeByIndex(0, &szKey, &szValue);
+
+                cValues.push_back(szValue);
+            }
+
+            const char* szKey(NULL);
+            const char* szValue(NULL);
+            oEnumaration->getAttributeByIndex(0, &szKey, &szValue);
+
+            cValuesContainer.insert(TDValuesContainer::value_type(szValue, cValues));
+        }
+    }
+
+    return cValuesContainer;
+}
+//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Util/UIEnumerations.h b/Code/Editor/Util/UIEnumerations.h
new file mode 100644
index 0000000000..18505e4232
--- /dev/null
+++ b/Code/Editor/Util/UIEnumerations.h
@@ -0,0 +1,36 @@
+/*
+ * 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 : This file declares the container for the assotiaon of
+//               enumeration name to enumeration values
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_UIENUMERATIONS_H
+#define CRYINCLUDE_EDITOR_UTIL_UIENUMERATIONS_H
+#pragma once
+
+
+class CUIEnumerations
+{
+public:
+    // For XML standard values.
+    typedef QStringList                    TDValues;
+    typedef std::map<QString, TDValues>      TDValuesContainer;
+protected:
+private:
+
+public:
+    static CUIEnumerations& GetUIEnumerationsInstance();
+
+    TDValuesContainer&      GetStandardNameContainer();
+protected:
+private:
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_UIENUMERATIONS_H
diff --git a/Code/Editor/Util/UndoUtil.cpp b/Code/Editor/Util/UndoUtil.cpp
new file mode 100644
index 0000000000..03d9184f9d
--- /dev/null
+++ b/Code/Editor/Util/UndoUtil.cpp
@@ -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
+ *
+ */
+#include "EditorDefs.h"
+
+#include "UndoUtil.h"
+#include "Include/EditorCoreAPI.h"
+
+CUndo::CUndo(const char* description)
+    : m_bCancelled(false)
+{
+    if (!IsRecording())
+    {
+        GetIEditor()->BeginUndo();
+        azstrncpy(m_description, scDescSize, description, scDescSize);
+        m_description[scDescSize - 1] = '\0';
+        m_bStartedRecord = true;
+    }
+    else
+    {
+        m_bStartedRecord = false;
+    }
+};
+
+CUndo::~CUndo()
+{
+    if (m_bStartedRecord)
+    {
+        if (m_bCancelled)
+        {
+            GetIEditor()->CancelUndo();
+        }
+        else
+        {
+            GetIEditor()->AcceptUndo(m_description);
+        }
+    }
+};
+
+bool CUndo::IsRecording()
+{
+    if (IEditor* editor = GetIEditor())
+    {
+        return editor->IsUndoRecording();
+    }
+
+    return false;
+}
+
+bool CUndo::IsSuspended()
+{
+    if (IEditor* editor = GetIEditor())
+    {
+        return editor->IsUndoSuspended();
+    }
+
+    return false;
+}
+
+void CUndo::Record(IUndoObject* undo)
+{
+    if (IEditor* editor = GetIEditor())
+    {
+        editor->RecordUndo(undo);
+    }
+}
+
+CUndoSuspend::CUndoSuspend()
+{
+    if (IEditor* editor = GetIEditor())
+    {
+        editor->SuspendUndo();
+    }
+};
+
+CUndoSuspend::~CUndoSuspend()
+{
+    if (IEditor* editor = GetIEditor())
+    {
+        editor->ResumeUndo();
+    }
+};
diff --git a/Code/Editor/Util/UndoUtil.h b/Code/Editor/Util/UndoUtil.h
new file mode 100644
index 0000000000..61144298c0
--- /dev/null
+++ b/Code/Editor/Util/UndoUtil.h
@@ -0,0 +1,49 @@
+/*
+ * 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_CORE_UTIL_UNDO_UTIL_H
+#define CRYINCLUDE_EDITOR_CORE_UTIL_UNDO_UTIL_H
+#pragma once
+
+#include "Include/EditorCoreAPI.h"
+
+struct IUndoObject;
+class EDITOR_CORE_API CUndo
+{
+public:
+    CUndo(const char* description);
+
+    ~CUndo();
+
+    void Cancel() { m_bCancelled = true; }
+
+    //! Check if undo is recording.
+    static bool IsRecording();
+
+    //! Check if undo is suspended.
+    static bool IsSuspended();
+
+    //! Record specified object.
+    static void Record(IUndoObject* undo);
+
+private:
+    static const uint32 scDescSize = 256;
+    char m_description[scDescSize];
+    bool m_bCancelled;
+    bool m_bStartedRecord;
+};
+
+//! CUndoSuspend is a utility undo class
+//! Define instance of this class in block of code where you want to suspend undo operations
+class EDITOR_CORE_API CUndoSuspend
+{
+public:
+    CUndoSuspend();
+
+    ~CUndoSuspend();
+};
+
+#endif // CRYINCLUDE_EDITOR_CORE_UTIL_UNDO_UTIL_H
diff --git a/Code/Editor/Util/Util.h b/Code/Editor/Util/Util.h
new file mode 100644
index 0000000000..83c612de0a
--- /dev/null
+++ b/Code/Editor/Util/Util.h
@@ -0,0 +1,197 @@
+/*
+ * 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_CRYCOMMONTOOLS_UTIL_H
+#define CRYINCLUDE_CRYCOMMONTOOLS_UTIL_H
+#pragma once
+
+
+#include <cstring>  // memset()
+
+#ifndef BIT
+#define BIT(x) (1 << (x))
+#endif
+
+
+union IntOrPtr
+{
+    int m_int;
+    unsigned int m_uint;
+    void* m_pVoid;
+    char* m_pChar;
+
+    void setZero()
+    {
+        memset(this, 0, sizeof(*this));
+    }
+
+    bool operator==(const IntOrPtr& a) const
+    {
+        return memcmp(this, &a, sizeof(*this)) == 0;
+    }
+
+    bool operator!=(const IntOrPtr& a) const
+    {
+        return memcmp(this, &a, sizeof(*this)) != 0;
+    }
+};
+
+
+namespace Util
+{
+    // note: names 'getMin' and 'getMax' (instead of usual 'min' and 'max') are
+    // used to avoid conflicts with global and/or user's #define of 'min' and 'max'
+
+    template<class T>
+    inline const T& getMin(const T& a, const T& b)
+    {
+        return (a < b) ? a : b;
+    }
+
+    template<class T>
+    inline const T& getMax(const T& a, const T& b)
+    {
+        return (a < b) ? b : a;
+    }
+
+    template<class T>
+    inline const T& getMin(const T& a, const T& b, const T& c)
+    {
+        return (a < b)
+               ? ((a < c) ? a : c)
+               : ((b < c) ? b : c);
+    }
+
+    template<class T>
+    inline const T& getMax(const T& a, const T& b, const T& c)
+    {
+        return (a < b)
+               ? ((b < c) ? c : b)
+               : ((a < c) ? c : a);
+    }
+
+
+    template<class T>
+    inline const T& getClamped(const T& a, const T& a_min, const T& a_max)
+    {
+        if (a < a_min)
+        {
+            return a_min;
+        }
+        if (a_max < a)
+        {
+            return a_max;
+        }
+        return a;
+    }
+
+    // note: name 'clampMinMax' (instead of usual 'clamp') is used
+    // to avoid conflicts with global and/or user's #define of 'clamp'
+    template<class T>
+    inline void clampMinMax(T& a, const T& a_min, const T& a_max)
+    {
+        if (a < a_min)
+        {
+            a = a_min;
+        }
+        else if (a_max < a)
+        {
+            a = a_max;
+        }
+    }
+
+    template<class T>
+    inline void clampMin(T& a, const T& a_min)
+    {
+        if (a < a_min)
+        {
+            a = a_min;
+        }
+    }
+
+    template<class T>
+    inline void clampMax(T& a, const T& a_max)
+    {
+        if (a_max < a)
+        {
+            a = a_max;
+        }
+    }
+
+
+    template <class TInteger>
+    inline bool isPowerOfTwo(TInteger x)
+    {
+        return (x & (x - 1)) == 0;
+    }
+
+
+    template <class TInteger>
+    inline TInteger getCeiledPowerOfTwo(TInteger x)
+    {
+        x = x - 1;
+
+#pragma warning(push)
+#pragma warning(disable : 4293)
+        if (sizeof(TInteger) > 0)
+        {
+            x |= x >> 1;
+        }
+        if (sizeof(TInteger) > 0)
+        {
+            x |= x >> 2;
+        }
+        if (sizeof(TInteger) > 0)
+        {
+            x |= x >> 4;
+        }
+        if (sizeof(TInteger) > 1)
+        {
+            x |= x >> 8;
+        }
+        if (sizeof(TInteger) > 2)
+        {
+            x |= x >> 16;
+        }
+        if (sizeof(TInteger) > 4)
+        {
+            x |= x >> 32;
+        }
+#pragma warning(pop)
+
+        return x + 1;
+    }
+
+
+    template <class TInteger>
+    inline TInteger getFlooredPowerOfTwo(TInteger x)
+    {
+        if (!isPowerOfTwo(x))
+        {
+            x = getCeiledPowerOfTwo(x) >> 1;
+        }
+
+        return x;
+    }
+
+
+    template <class T>
+    inline T square(T x)
+    {
+        return x * x;
+    }
+
+
+    template <class T>
+    inline T cube(T x)
+    {
+        return x * x * x;
+    }
+} // namespace Util
+
+#endif // CRYINCLUDE_CRYCOMMONTOOLS_UTIL_H
diff --git a/Code/Editor/Util/Variable.cpp b/Code/Editor/Util/Variable.cpp
new file mode 100644
index 0000000000..3041977df4
--- /dev/null
+++ b/Code/Editor/Util/Variable.cpp
@@ -0,0 +1,543 @@
+/*
+ * 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 "Variable.h"
+#include "UIEnumsDatabase.h"
+
+#include "UsedResources.h"              // for CUsedResources
+
+//////////////////////////////////////////////////////////////////////////
+CVarBlock* CVarBlock::Clone(bool bRecursive) const
+{
+    CVarBlock* vb = new CVarBlock;
+    for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+    {
+        IVariable* var = *it;
+        vb->AddVariable(var->Clone(bRecursive));
+    }
+    return vb;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::CopyValues(const CVarBlock* fromVarBlock)
+{
+    // Copy all variables.
+    int numSrc = fromVarBlock->GetNumVariables();
+    int numTrg = GetNumVariables();
+    for (int i = 0; i < numSrc && i < numTrg; i++)
+    {
+        GetVariable(i)->CopyValue(fromVarBlock->GetVariable(i));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::CopyValuesByName(CVarBlock* fromVarBlock)
+{
+    // Copy values using saving and loading to/from xml.
+    XmlNodeRef node = XmlHelpers::CreateXmlNode("Temp");
+    fromVarBlock->Serialize(node, false);
+    Serialize(node, true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::OnSetValues()
+{
+    for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+    {
+        IVariable* var = *it;
+        var->OnSetValue(true);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::SetRecreateSplines()
+{
+    for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+    {
+        IVariable* var = *it;
+        var->SetFlagRecursive(IVariable::UI_CREATE_SPLINE);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::AddVariable(IVariable* var)
+{
+    //assert( !strstr(var->GetName(), " ") ); // spaces not allowed because of serialization
+    m_vars.push_back(var);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::AddVariable(IVariable* pVar, const char* varName, unsigned char dataType)
+{
+    if (varName)
+    {
+        pVar->SetName(varName);
+    }
+    pVar->SetDataType(dataType);
+    AddVariable(pVar);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::AddVariable(CVariableBase& var, const char* varName, unsigned char dataType)
+{
+    if (varName)
+    {
+        var.SetName(varName);
+    }
+    var.SetDataType(dataType);
+    AddVariable(&var);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CVarBlock::DeleteVariable(IVariable* var, bool bRecursive)
+{
+    bool found = stl::find_and_erase(m_vars, var);
+
+    if (!found && bRecursive)
+    {
+        for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            if ((*it)->DeleteVariable(var, bRecursive))
+            {
+                return true;
+            }
+        }
+    }
+
+    return found;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CVarBlock::IsContainsVariable(IVariable* pVar, bool bRecursive) const
+{
+    for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+    {
+        if (*it == pVar)
+        {
+            return true;
+        }
+    }
+
+    // If not found search childs.
+    if (bRecursive)
+    {
+        // Search all top level variables.
+        for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            if ((*it)->IsContainsVariable(pVar))
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+namespace
+{
+    IVariable* FindVariable(const char* name, bool bRecursive, bool bHumanName, const std::vector<IVariablePtr>& vars)
+    {
+        // Search all top level variables.
+        for (std::vector<IVariablePtr>::const_iterator it = vars.begin(); it != vars.end(); ++it)
+        {
+            IVariable* var = *it;
+            if (bHumanName && QString::compare(var->GetHumanName(), name, Qt::CaseInsensitive) == 0)
+            {
+                return var;
+            }
+            else if (!bHumanName && QString::compare(var->GetName(), name) == 0)
+            {
+                return var;
+            }
+        }
+
+        // If not found search childs.
+        if (bRecursive)
+        {
+            // Search all top level variables.
+            for (std::vector<IVariablePtr>::const_iterator it = vars.begin(); it != vars.end(); ++it)
+            {
+                IVariable* var = *it;
+                IVariable* found = var->FindVariable(name, bRecursive, bHumanName);
+                if (found)
+                {
+                    return found;
+                }
+            }
+        }
+
+        return nullptr;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+IVariable* CVarBlock::FindVariable(const char* name, bool bRecursive, bool bHumanName) const
+{
+    return ::FindVariable(name, bRecursive, bHumanName, m_vars);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IVariable* CVariableArray::FindVariable(const char* name, bool bRecursive, bool bHumanName) const
+{
+    return ::FindVariable(name, bRecursive, bHumanName, m_vars);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::Serialize(XmlNodeRef vbNode, bool load)
+{
+    if (load)
+    {
+        // Loading.
+        QString name;
+        for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            IVariable* var = *it;
+            if (var->GetNumVariables())
+            {
+                XmlNodeRef child = vbNode->findChild(var->GetName().toUtf8().data());
+                if (child)
+                {
+                    var->Serialize(child, load);
+                }
+            }
+            else
+            {
+                var->Serialize(vbNode, load);
+            }
+        }
+    }
+    else
+    {
+        // Saving.
+        for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            IVariable* var = *it;
+            if (var->GetNumVariables())
+            {
+                XmlNodeRef child = vbNode->newChild(var->GetName().toUtf8().data());
+                var->Serialize(child, load);
+            }
+            else
+            {
+                var->Serialize(vbNode, load);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::ReserveNumVariables(int numVars)
+{
+    m_vars.reserve(numVars);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::WireVar(IVariable* src, IVariable* trg, bool bWire)
+{
+    if (bWire)
+    {
+        src->Wire(trg);
+    }
+    else
+    {
+        src->Unwire(trg);
+    }
+    int numSrcVars = src->GetNumVariables();
+    if (numSrcVars > 0)
+    {
+        int numTrgVars = trg->GetNumVariables();
+        for (int i = 0; i < numSrcVars && i < numTrgVars; i++)
+        {
+            WireVar(src->GetVariable(i), trg->GetVariable(i), bWire);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::Wire(CVarBlock* toVarBlock)
+{
+    Variables::iterator tit = toVarBlock->m_vars.begin();
+    Variables::iterator sit = m_vars.begin();
+    for (; sit != m_vars.end() && tit != toVarBlock->m_vars.end(); ++sit, ++tit)
+    {
+        IVariable* src = *sit;
+        IVariable* trg = *tit;
+        WireVar(src, trg, true);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::Unwire(CVarBlock* toVarBlock)
+{
+    Variables::iterator tit = toVarBlock->m_vars.begin();
+    Variables::iterator sit = m_vars.begin();
+    for (; sit != m_vars.end() && tit != toVarBlock->m_vars.end(); ++sit, ++tit)
+    {
+        IVariable* src = *sit;
+        IVariable* trg = *tit;
+        WireVar(src, trg, false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::AddOnSetCallback(IVariable::OnSetCallback* func)
+{
+    for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+    {
+        IVariable* var = *it;
+        SetCallbackToVar(func, var, true);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::RemoveOnSetCallback(IVariable::OnSetCallback* func)
+{
+    for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+    {
+        IVariable* var = *it;
+        SetCallbackToVar(func, var, false);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::SetCallbackToVar(IVariable::OnSetCallback* func, IVariable* pVar, bool bAdd)
+{
+    if (bAdd)
+    {
+        pVar->AddOnSetCallback(func);
+    }
+    else
+    {
+        pVar->RemoveOnSetCallback(func);
+    }
+    int numVars = pVar->GetNumVariables();
+    if (numVars > 0)
+    {
+        for (int i = 0; i < numVars; i++)
+        {
+            SetCallbackToVar(func, pVar->GetVariable(i), bAdd);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::GatherUsedResources(CUsedResources& resources)
+{
+    for (int i = 0; i < GetNumVariables(); i++)
+    {
+        IVariable* pVar = GetVariable(i);
+        GatherUsedResourcesInVar(pVar, resources);
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::EnableUpdateCallbacks(bool boEnable)
+{
+    for (int i = 0; i < GetNumVariables(); i++)
+    {
+        IVariable* pVar = GetVariable(i);
+        pVar->EnableUpdateCallbacks(boEnable);
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::GatherUsedResourcesInVar(IVariable* pVar, CUsedResources& resources)
+{
+    int type = pVar->GetDataType();
+    if (type == IVariable::DT_FILE || type == IVariable::DT_OBJECT || type == IVariable::DT_TEXTURE)
+    {
+        // this is file.
+        QString filename;
+        pVar->Get(filename);
+        if (!filename.isEmpty())
+        {
+            resources.Add(filename.toUtf8().data());
+        }
+    }
+
+    for (int i = 0; i < pVar->GetNumVariables(); i++)
+    {
+        GatherUsedResourcesInVar(pVar->GetVariable(i), resources);
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+inline bool CompareNames(const IVariable* pVar1, const IVariable* pVar2)
+{
+    return (QString::compare(pVar1->GetHumanName(), pVar2->GetHumanName(), Qt::CaseInsensitive) < 0);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CVarBlock::Sort()
+{
+    std::sort(m_vars.begin(), m_vars.end(), CompareNames);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CVarObject::CVarObject()
+{}
+
+//////////////////////////////////////////////////////////////////////////
+CVarObject::~CVarObject()
+{}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::AddVariable(CVariableBase& var, const QString& varName, VarOnSetCallback* cb, unsigned char dataType)
+{
+    if (!m_vars)
+    {
+        m_vars = new CVarBlock;
+    }
+    var.AddRef(); // Variables are local and must not be released by CVarBlock.
+    var.SetName(varName);
+    var.SetDataType(dataType);
+    if (cb)
+    {
+        var.AddOnSetCallback(cb);
+    }
+    m_vars->AddVariable(&var);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::AddVariable(CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb, unsigned char dataType)
+{
+    if (!m_vars)
+    {
+        m_vars = new CVarBlock;
+    }
+    var.AddRef(); // Variables are local and must not be released by CVarBlock.
+    var.SetName(varName);
+    var.SetHumanName(varHumanName);
+    var.SetDataType(dataType);
+    if (cb)
+    {
+        var.AddOnSetCallback(cb);
+    }
+    m_vars->AddVariable(&var);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::AddVariable(CVariableArray& table, CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb, unsigned char dataType)
+{
+    if (!m_vars)
+    {
+        m_vars = new CVarBlock;
+    }
+    var.AddRef(); // Variables are local and must not be released by CVarBlock.
+    var.SetName(varName);
+    var.SetHumanName(varHumanName);
+    var.SetDataType(dataType);
+    if (cb)
+    {
+        var.AddOnSetCallback(cb);
+    }
+    table.AddVariable(&var);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::RemoveVariable(IVariable* var)
+{
+    if (m_vars != NULL)
+    {
+        m_vars->DeleteVariable(var);
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::EnableUpdateCallbacks(bool boEnable)
+{
+    if (m_vars != NULL)
+    {
+        m_vars->EnableUpdateCallbacks(boEnable);
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::OnSetValues()
+{
+    if (m_vars != NULL)
+    {
+        m_vars->OnSetValues();
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::ReserveNumVariables(int numVars)
+{
+    if (m_vars != NULL)
+    {
+        m_vars->ReserveNumVariables(numVars);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::CopyVariableValues(CVarObject* sourceObject)
+{
+    // Check if compatible types.
+    assert(metaObject() == sourceObject->metaObject());
+    if (m_vars != NULL && sourceObject->m_vars != NULL)
+    {
+        m_vars->CopyValues(sourceObject->m_vars);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CVarObject::Serialize(XmlNodeRef node, bool load)
+{
+    if (m_vars)
+    {
+        m_vars->Serialize(node, load);
+    }
+}
+
+
+CVarGlobalEnumList::CVarGlobalEnumList(CUIEnumsDatabase_SEnum* pEnum)
+    : m_pEnum(pEnum)
+{
+}
+
+CVarGlobalEnumList::CVarGlobalEnumList(const QString& enumName)
+{
+    m_pEnum = GetIEditor()->GetUIEnumsDatabase()->FindEnum(enumName);
+}
+
+//! Get the name of specified value in enumeration.
+QString CVarGlobalEnumList::GetItemName(uint index)
+{
+    if (!m_pEnum || index >= m_pEnum->strings.size())
+    {
+        return QString();
+    }
+    return m_pEnum->strings[index];
+}
+
+QString CVarGlobalEnumList::NameToValue(const QString& name)
+{
+    if (m_pEnum)
+    {
+        return m_pEnum->NameToValue(name);
+    }
+    else
+    {
+        return name;
+    }
+}
+
+QString CVarGlobalEnumList::ValueToName(const QString& value)
+{
+    if (m_pEnum)
+    {
+        return m_pEnum->ValueToName(value);
+    }
+    else
+    {
+        return value;
+    }
+}
+
diff --git a/Code/Editor/Util/Variable.h b/Code/Editor/Util/Variable.h
new file mode 100644
index 0000000000..402934a166
--- /dev/null
+++ b/Code/Editor/Util/Variable.h
@@ -0,0 +1,1892 @@
+/*
+ * 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_VARIABLE_H
+#define CRYINCLUDE_EDITOR_UTIL_VARIABLE_H
+#pragma once
+
+
+#include "RefCountBase.h"
+
+#include "Include/EditorCoreAPI.h"
+
+#include <QObject>
+AZ_PUSH_DISABLE_WARNING(4458, "-Wunknown-warning-option")
+#include <QtUtilWin.h>
+AZ_POP_DISABLE_WARNING
+#include <QVariant>
+
+inline const char* to_c_str(const char* str) { return str; }
+#define MAX_VAR_STRING_LENGTH 4096
+
+struct IVarEnumList;
+struct ISplineInterpolator;
+class CUsedResources;
+struct IVariable;
+
+namespace
+{
+    template<typename T>
+    T nextNiceNumberBelow(T number);
+
+    template<typename T>
+    T nextNiceNumberAbove(T number)
+    {
+        if (number == 0)
+        {
+            return 0;
+        }
+        if (number < 0)
+        {
+            return -nextNiceNumberBelow(-number);
+        }
+
+        // number = 8000
+        auto l = log10(number);   // 3.90
+        AZ::s64 i = aznumeric_cast<AZ::s64>(l); // 3
+        int f = aznumeric_cast<int>(pow(10, l - i));   // 10^0.9 = 8
+        f = f < 2 ? 2 : f < 5 ? 5 : 10; // f -> 10
+        return aznumeric_cast<T>(pow(10, i) * f);
+    }
+
+    template<typename T>
+    T nextNiceNumberBelow(T number)
+    {
+        if (number == 0)
+        {
+            return 0;
+        }
+        if (number < 0)
+        {
+            return -nextNiceNumberAbove(-number);
+        }
+
+        // number = 8000
+        auto l = log10(number);   // 3.90
+        AZ::s64 i = aznumeric_cast<AZ::s64>(l); // 3
+        int f = aznumeric_cast<int>(pow(10, l - i));   // 10^0.9 = 8
+        f = f > 5 ? 5 : f > 2 ? 2 : 1;  // f -> 5
+        return aznumeric_cast<T>(pow(10, i) * f);
+    }
+}
+
+/** IVariableContainer
+ *  Interface for all classes that hold child variables
+ */
+struct IVariableContainer
+    : public CRefCountBase
+{
+    //! Add child variable
+    virtual void AddVariable(IVariable* var) = 0;
+
+    //! Delete specific variable
+    virtual bool DeleteVariable(IVariable* var, bool recursive = false) = 0;
+
+    //! Delete all variables
+    virtual void DeleteAllVariables() = 0;
+
+    //! Gets number of variables
+    virtual int GetNumVariables() const = 0;
+
+    //! Get variable at index
+    virtual IVariable* GetVariable(int index) const = 0;
+
+    //! Returns true if var block contains specified variable.
+    virtual bool IsContainsVariable(IVariable* pVar, bool bRecursive = false) const = 0;
+
+    //! Find variable by name.
+    virtual IVariable* FindVariable(const char* name, bool bRecursive = false, bool bHumanName = false) const = 0;
+
+    //! Return true if variable block is empty (Does not have any vars).
+    virtual bool IsEmpty() const = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+/** IVariable is the variant variable interface.
+ */
+struct IVariable
+    : public IVariableContainer
+{
+    /** Type of data stored in variable.
+    */
+    enum EType
+    {
+        UNKNOWN,            //!< Unknown parameter type.
+        INT,                //!< Integer property.
+        BOOL,               //!< Boolean property.
+        FLOAT,              //!< Float property.
+        VECTOR2,            //!< Vector property.
+        VECTOR,             //!< Vector property.
+        VECTOR4,            //!< Vector property.
+        QUAT,               //!< Quaternion property.
+        STRING,             //!< String property.
+        ARRAY,              //!< Array of parameters.
+        FLOW_CUSTOM_DATA,   //!< FLow graph custom data
+        DOUBLE              //!< Double property.
+    };
+
+    //! Type of data hold by variable.
+    enum EDataType
+    {
+        DT_SIMPLE = 0, //!< Standard param type.
+        DT_BOOLEAN,
+        DT_PERCENT,     //!< Percent data type, (Same as simple but value is from 0-1 and UI will be from 0-100).
+        DT_COLOR,
+        DT_ANGLE,
+        DT_FILE,
+        DT_TEXTURE,
+        DT_ANIMATION,
+        DT_OBJECT,
+        DT_SHADER,
+        DT_LOCAL_STRING,
+        DT_EQUIP,
+        DT_REVERBPRESET,
+        DT_DEPRECATED0, // formerly DT_MATERIAL
+        DT_MATERIALLOOKUP,
+        DT_EXTARRAY,    // Extendable Array
+        DT_SEQUENCE,    // Movie Sequence (DEPRECATED, use DT_SEQUENCE_ID, instead.)
+        DT_MISSIONOBJ,  // Mission Objective
+        DT_USERITEMCB,  // Use a callback GetItemsCallback in user data of variable
+        DT_UIENUM,          // Edit as enum, uses CUIEnumsDatabase to lookup the enum to value pairs and combobox in GUI.
+        DT_SEQUENCE_ID, // Movie Sequence
+        DT_LIGHT_ANIMATION, // Light Animation Node in the global Light Animation Set
+        DT_PARTICLE_EFFECT,
+        DT_GEOM_CACHE, // Geometry cache
+        DT_DEPRECATED, // formerly DT_FLARE
+        DT_AUDIO_TRIGGER,
+        DT_AUDIO_SWITCH,
+        DT_AUDIO_SWITCH_STATE,
+        DT_AUDIO_RTPC,
+        DT_AUDIO_ENVIRONMENT,
+        DT_AUDIO_PRELOAD_REQUEST,
+        DT_UI_ELEMENT,
+        DT_COLORA,      // DT_COLOR with alpha channel
+        DT_MOTION,      // Motion animation asset
+        DT_CURVE = BIT(7),  // Combined with other types
+    };
+
+    // Flags that can used with variables.
+    enum EFlags
+    {
+        // User interface related flags.
+        UI_DISABLED          = BIT(0),  //!< This variable will be disabled in UI.
+        UI_BOLD              = BIT(1),  //!< Variable name in properties will be bold.
+        UI_SHOW_CHILDREN     = BIT(2),  //!< Display children in parent field.
+        UI_USE_GLOBAL_ENUMS  = BIT(3),  //!< Use CUIEnumsDatabase to fetch enums for this variable name.
+        UI_INVISIBLE         = BIT(4),  //!< This variable will not be displayed in the UI
+        UI_ROLLUP2           = BIT(5),  //!< Prefer right roll-up bar for extended property control.
+        UI_COLLAPSED         = BIT(6),  //!< Category collapsed by default.
+        UI_UNSORTED          = BIT(7),  //!< Do not sort list-box alphabetically.
+        UI_EXPLICIT_STEP     = BIT(8),  //!< Use the step size set in the variable for the UI directly.
+        UI_NOT_DISPLAY_VALUE = BIT(9),  //!< The UI will display an empty string where it would normally draw the variable value.
+        UI_HIGHLIGHT_EDITED  = BIT(10), //!< Edited (non-default value) properties show highlight color.
+        UI_AUTO_EXPAND       = BIT(11), //!< Category expanded by default. to auto-expand child in ReflectedPropertyCtrl.
+        UI_CREATE_SPLINE     = BIT(12), //!< To indicate the spline need to be re-created. This is usually because the data was changed directly through the data address
+    };
+
+    typedef AZStd::function<void(IVariable*)> OnSetCallback;
+    using OnSetEnumCallback = OnSetCallback;
+
+    // Store IGetCustomItems into IVariable's UserData and set datatype to
+    // DT_USERITEMCB
+    // RefCounting is NOT handled by IVariable!
+    struct IGetCustomItems
+        : public CRefCountBase
+    {
+        struct SItem
+        {
+            SItem() {}
+            SItem(const QString& name, const QString& desc = QString())
+                : name(name)
+                , desc(desc) {}
+            SItem(const char* name, const char* desc = "")
+                : name(name)
+                , desc(desc) {}
+            QString name;
+            QString desc;
+        };
+        virtual bool GetItems (IVariable* /* pVar */, std::vector<SItem>& /* items */, QString& /* outDialogTitle */) = 0;
+        virtual bool UseTree() = 0;
+        virtual const char* GetTreeSeparator() = 0;
+    };
+
+    //! Get name of parameter.
+    virtual QString GetName() const = 0;
+    //! Set name of parameter.
+    virtual void SetName(const QString& name) = 0;
+
+    //! Get human readable name of parameter (Normally same as name).
+    virtual QString GetHumanName() const = 0;
+    //! Set human readable name of parameter (name without prefix).
+    virtual void SetHumanName(const QString& name) = 0;
+
+    //! Get variable description.
+    virtual QString GetDescription() const = 0;
+    //! Set variable description.
+    virtual void SetDescription(const char* desc) = 0;
+    //! Set variable description.
+    virtual void SetDescription(const QString& desc) = 0;
+
+    //! Get parameter type.
+    virtual EType   GetType() const = 0;
+    //! Get size of parameter.
+    virtual int GetSize() const = 0;
+
+    //! Type of data stored in this variable.
+    virtual unsigned char   GetDataType() const = 0;
+    virtual void SetDataType(unsigned char dataType) = 0;
+
+    virtual void SetUserData(const QVariant &data) = 0;
+    virtual QVariant GetUserData() const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Flags
+    //////////////////////////////////////////////////////////////////////////
+    //! Set variable flags, (Limited to 16 flags).
+    virtual void SetFlags(int flags) = 0;
+    virtual int  GetFlags() const = 0;
+    virtual void SetFlagRecursive(EFlags flag) = 0;
+
+    /////////////////////////////////////////////////////////////////////////////
+    // Set methods.
+    /////////////////////////////////////////////////////////////////////////////
+    virtual void Set(int value) = 0;
+    virtual void Set(bool value) = 0;
+    virtual void Set(float value) = 0;
+    virtual void Set(double value) = 0;
+    virtual void Set(const Vec2& value) = 0;
+    virtual void Set(const Vec3& value) = 0;
+    virtual void Set(const Vec4& value) = 0;
+    virtual void Set(const Ang3& value) = 0;
+    virtual void Set(const Quat& value) = 0;
+    virtual void Set(const QString& value) = 0;
+    virtual void Set(const char* value) = 0;
+    virtual void SetDisplayValue(const QString& value) = 0;
+
+    // Called when value updated by any means (including internally).
+    virtual void OnSetValue(bool bRecursive) = 0;
+
+    /////////////////////////////////////////////////////////////////////////////
+    // Get methods.
+    /////////////////////////////////////////////////////////////////////////////
+    virtual void Get(int& value) const  = 0;
+    virtual void Get(bool& value) const  = 0;
+    virtual void Get(float& value) const  = 0;
+    virtual void Get(double& value) const = 0;
+    virtual void Get(Vec2& value) const  = 0;
+    virtual void Get(Vec3& value) const  = 0;
+    virtual void Get(Vec4& value) const  = 0;
+    virtual void Get(Ang3& value) const  = 0;
+    virtual void Get(Quat& value) const  = 0;
+    virtual void Get(QString& value) const = 0;
+    virtual QString GetDisplayValue() const = 0;
+    virtual bool HasDefaultValue() const = 0;
+
+    //! reset value to default value
+    virtual void ResetToDefault() = 0;
+
+    //! Return cloned value of variable.
+    virtual IVariable* Clone(bool bRecursive) const = 0;
+
+    //! Copy variable value from specified variable.
+    //! This method executed always recursively on all sub hierarchy of variables,
+    //! In Array vars, will never create new variables, only copy values of corresponding childs.
+    //! @param fromVar Source variable to copy value from.
+    virtual void CopyValue(IVariable* fromVar) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Value Limits.
+    //////////////////////////////////////////////////////////////////////////
+    //! Set value limits.
+    virtual void SetLimits([[maybe_unused]] float fMin, [[maybe_unused]] float fMax, [[maybe_unused]] float fStep = 0.f, [[maybe_unused]] bool bHardMin = true, [[maybe_unused]] bool bHardMax = true) {}
+    //! Get value limits.
+    virtual void GetLimits([[maybe_unused]] float& fMin, [[maybe_unused]] float& fMax, [[maybe_unused]] float& fStep, [[maybe_unused]] bool& bHardMin, [[maybe_unused]] bool& bHardMax) {}
+    void GetLimits(float& fMin, float& fMax)
+    {
+        float f;
+        bool b;
+        GetLimits(fMin, fMax, f, b, b);
+    }
+    virtual bool HasCustomLimits() { return false; }
+
+    virtual void EnableNotifyWithoutValueChange([[maybe_unused]] bool bFlag){}
+
+
+    //////////////////////////////////////////////////////////////////////////
+    // Wire/Unwire variables.
+    //////////////////////////////////////////////////////////////////////////
+    //! Wire variable, wired variable will be changed when this var changes.
+    virtual void Wire(IVariable* targetVar) = 0;
+    //! Unwire variable.
+    virtual void Unwire(IVariable* targetVar) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Assign on set callback.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void AddOnSetCallback(OnSetCallback* func) = 0;
+    virtual void RemoveOnSetCallback(OnSetCallback* func) = 0;
+    virtual void ClearOnSetCallbacks() {}
+
+    //////////////////////////////////////////////////////////////////////////
+    // Assign callback triggered when enums change.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void AddOnSetEnumCallback(OnSetEnumCallback* func) = 0;
+    virtual void RemoveOnSetEnumCallback(OnSetCallback* func) = 0;
+    virtual void ClearOnSetEnumCallbacks() {}
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Retrieve pointer to selection list used by variable.
+    virtual IVarEnumList* GetEnumList() const { return 0; }
+    virtual ISplineInterpolator* GetSpline() { return 0; }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Serialize variable to XML.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void Serialize(XmlNodeRef node, bool load) = 0;
+
+    // From CObject, (not implemented)
+    virtual void Serialize([[maybe_unused]] CArchive& ar) {}
+
+    //////////////////////////////////////////////////////////////////////////
+    // Disables the update callbacks for certain operations in order to avoid
+    // too many function calls when not needed.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void EnableUpdateCallbacks(bool boEnable) = 0;
+
+    // Setup to true to force save Undo in case the value the same.
+    virtual void SetForceModified([[maybe_unused]] bool bForceModified) {}
+};
+
+// Smart pointer to this parameter.
+typedef _smart_ptr<IVariable> IVariablePtr;
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+/**
+ **************************************************************************************
+ * CVariableBase implements IVariable interface and provide default implementation
+ * for basic IVariable functionality (Name, Flags, etc...)
+ * CVariableBase cannot be instantiated directly and should be used as the base class for
+ * actual Variant implementation classes.
+ ***************************************************************************************
+ */
+class EDITOR_CORE_API CVariableBase
+    : public IVariable
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    virtual ~CVariableBase() {}
+
+    void SetName(const QString& name) { m_name = name; };
+    //! Get name of parameter.
+    QString GetName() const { return m_name; };
+
+    QString GetHumanName() const
+    {
+        if (!m_humanName.isEmpty())
+        {
+            return m_humanName;
+        }
+        return m_name;
+    }
+    void SetHumanName(const QString& name) { m_humanName = name; }
+
+    void SetDescription(const char* desc) { m_description = desc; };
+    void SetDescription(const QString& desc) { m_description = desc; };
+
+    //! Get name of parameter.
+    QString GetDescription() const { return m_description; };
+
+    EType   GetType() const { return IVariable::UNKNOWN; };
+    int GetSize() const { return sizeof(*this); };
+
+    unsigned char   GetDataType() const { return m_dataType; };
+    void SetDataType(unsigned char dataType) { m_dataType = dataType; }
+
+    void SetFlags(int flags) { m_flags = flags; }
+    int  GetFlags() const { return m_flags; }
+    void  SetFlagRecursive(EFlags flag) { m_flags |= flag; }
+
+    void SetUserData(const QVariant &data){ m_userData = data; };
+    QVariant GetUserData() const { return m_userData; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set methods.
+    //////////////////////////////////////////////////////////////////////////
+    void Set([[maybe_unused]] int value)                   { assert(0); }
+    void Set([[maybe_unused]] bool value)                  { assert(0); }
+    void Set([[maybe_unused]] float value)                 { assert(0); }
+    void Set([[maybe_unused]] double value)                { assert(0); }
+    void Set([[maybe_unused]] const Vec2& value)           { assert(0); }
+    void Set([[maybe_unused]] const Vec3& value)           { assert(0); }
+    void Set([[maybe_unused]] const Vec4& value)           { assert(0); }
+    void Set([[maybe_unused]] const Ang3& value)           { assert(0); }
+    void Set([[maybe_unused]] const Quat& value)           { assert(0); }
+    void Set([[maybe_unused]] const QString& value)        { assert(0); }
+    void Set([[maybe_unused]] const char* value)            { assert(0); }
+    void SetDisplayValue(const QString& value)    { Set(value); }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Get methods.
+    //////////////////////////////////////////////////////////////////////////
+    void Get([[maybe_unused]] int& value) const        { assert(0); }
+    void Get([[maybe_unused]] bool& value) const       { assert(0); }
+    void Get([[maybe_unused]] float& value) const      { assert(0); }
+    void Get([[maybe_unused]] double& value) const     { assert(0); }
+    void Get([[maybe_unused]] Vec2& value) const       { assert(0); }
+    void Get([[maybe_unused]] Vec3& value) const       { assert(0); }
+    void Get([[maybe_unused]] Vec4& value) const       { assert(0); }
+    void Get([[maybe_unused]] Ang3& value) const       { assert(0); }
+    void Get([[maybe_unused]] Quat& value) const       { assert(0); }
+    void Get([[maybe_unused]] QString& value) const    { assert(0); }
+    QString GetDisplayValue() const     { QString val; Get(val); return val; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // IVariableContainer functions
+    //////////////////////////////////////////////////////////////////////////
+    virtual void AddVariable([[maybe_unused]] IVariable* var) { assert(0); }
+
+    virtual bool DeleteVariable([[maybe_unused]] IVariable* var, [[maybe_unused]] bool recursive = false) { return false; }
+    virtual void DeleteAllVariables() {}
+
+    virtual int GetNumVariables() const { return 0; }
+    virtual IVariable* GetVariable([[maybe_unused]] int index) const { return nullptr; }
+
+    virtual bool IsContainsVariable([[maybe_unused]] IVariable* pVar, [[maybe_unused]] bool bRecursive = false) const { return false; }
+
+    virtual IVariable* FindVariable([[maybe_unused]] const char* name, [[maybe_unused]] bool bRecursive = false, [[maybe_unused]] bool bHumanName = false) const { return nullptr; }
+
+    virtual bool IsEmpty() const { return true; }
+
+    //////////////////////////////////////////////////////////////////////////
+    void Wire(IVariable* var)
+    {
+        m_wiredVars.push_back(var);
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void Unwire(IVariable* var)
+    {
+        if (!var)
+        {
+            // Unwire all.
+            m_wiredVars.clear();
+        }
+        else
+        {
+            stl::find_and_erase(m_wiredVars, var);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void AddOnSetCallback(OnSetCallback* func)
+    {
+        if (!stl::find(m_onSetFuncs, func))
+        {
+            m_onSetFuncs.push_back(func);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void RemoveOnSetCallback(OnSetCallback* func)
+    {
+        stl::find_and_erase(m_onSetFuncs, func);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void ClearOnSetCallbacks()
+    {
+        m_onSetFuncs.clear();
+    }
+
+    void AddOnSetEnumCallback(OnSetEnumCallback* func) override
+    {
+        if (!stl::find(m_onSetEnumFuncs, func))
+        {
+            m_onSetEnumFuncs.push_back(func);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void RemoveOnSetEnumCallback(OnSetCallback* func)
+    {
+        stl::find_and_erase(m_onSetEnumFuncs, func);
+    }
+
+    void ClearOnSetEnumCallbacks() override
+    {
+        m_onSetEnumFuncs.clear();
+    }
+
+
+    virtual void OnSetValue([[maybe_unused]] bool bRecursive)
+    {
+        // If have wired variables or OnSet callback, process them.
+        // Send value to wired variable.
+        for (CVariableBase::WiredList::iterator it = m_wiredVars.begin(); it != m_wiredVars.end(); ++it)
+        {
+            if (m_bForceModified)
+            {
+                (*it)->SetForceModified(true);
+            }
+
+            // Copy value to wired vars.
+            (*it)->CopyValue(this);
+        }
+
+        if (!m_boUpdateCallbacksEnabled)
+        {
+            return;
+        }
+
+        // Call on set callback.
+        for (auto it = m_onSetFuncs.begin(); it != m_onSetFuncs.end(); ++it)
+        {
+            // Call on set callback.
+            (*it)->operator()(this);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void Serialize(XmlNodeRef node, bool load)
+    {
+        if (load)
+        {
+            if (node->haveAttr(m_name.toUtf8().data()))
+            {
+                Set(node->getAttr(m_name.toUtf8().data()));
+            }
+        }
+        else
+        {
+            // Saving.
+            QString str;
+            Get(str);
+            node->setAttr(m_name.toUtf8().data(), str.toUtf8().data());
+        }
+    }
+
+    virtual void EnableUpdateCallbacks(bool boEnable){m_boUpdateCallbacksEnabled = boEnable; };
+    virtual void SetForceModified(bool bForceModified) { m_bForceModified = bForceModified; }
+protected:
+    // Constructor.
+    CVariableBase()
+        : m_dataType(DT_SIMPLE)
+        , m_flags(0)
+        , m_boUpdateCallbacksEnabled(true)
+        , m_bForceModified(false)
+    {
+    }
+
+    // Copy constructor.
+    CVariableBase(const CVariableBase& var)
+    {
+        m_name = var.m_name;
+        m_humanName = var.m_humanName;
+        m_description = var.m_description;
+        m_flags = var.m_flags;
+        m_dataType = var.m_dataType;
+        m_userData = var.m_userData;
+        m_boUpdateCallbacksEnabled = true;
+        m_bForceModified = var.m_bForceModified;
+        // Never copy callback function or wired variables they are private to specific variable,
+    }
+
+    // Not allow.
+    CVariableBase& operator=([[maybe_unused]] const CVariableBase& var)
+    {
+        return *this;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Variables.
+    //////////////////////////////////////////////////////////////////////////
+    typedef std::vector<OnSetCallback*> OnSetCallbackList;
+    typedef std::vector<IVariablePtr> WiredList;
+    using OnSetEnumCallbackList = std::vector<OnSetEnumCallback*>;
+
+    QString m_name;
+    QString m_humanName;
+    QString m_description;
+
+    //! Optional userdata pointer
+    QVariant m_userData;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //! Extended data (Extended data is never copied, it's always private to this variable).
+    WiredList m_wiredVars;
+    OnSetCallbackList m_onSetFuncs;
+    OnSetEnumCallbackList m_onSetEnumFuncs;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    uint16 m_flags;
+    //! Limited to 8 flags.
+    unsigned char m_dataType;
+
+    bool m_boUpdateCallbacksEnabled;
+
+    bool m_bForceModified;
+};
+
+/**
+ **************************************************************************************
+ * CVariableArray implements variable of type array of IVariables.
+ ***************************************************************************************
+ */
+class EDITOR_CORE_API CVariableArray
+    : public CVariableBase
+{
+public:
+    CVariableArray(){}
+
+    //! Get name of parameter.
+    virtual EType   GetType() const { return IVariable::ARRAY; };
+    virtual int     GetSize() const { return sizeof(CVariableArray); };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set methods.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void Set(const QString& value)
+    {
+        if (m_strValue != value)
+        {
+            m_strValue = value;
+            OnSetValue(false);
+        }
+    }
+    void OnSetValue(bool bRecursive)
+    {
+        CVariableBase::OnSetValue(bRecursive);
+        if (bRecursive)
+        {
+            for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+            {
+                (*it)->OnSetValue(true);
+            }
+        }
+    }
+    void SetFlagRecursive(EFlags flag)
+    {
+        CVariableBase::SetFlagRecursive(flag);
+        for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            (*it)->SetFlagRecursive(flag);
+        }
+    }
+    //////////////////////////////////////////////////////////////////////////
+    // Get methods.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void Get(QString& value) const { value = m_strValue; }
+
+    virtual bool HasDefaultValue() const
+    {
+        for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            if (!(*it)->HasDefaultValue())
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    virtual void ResetToDefault()
+    {
+        for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            (*it)->ResetToDefault();
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    IVariable* Clone(bool bRecursive) const
+    {
+        CVariableArray* var = new CVariableArray(*this);
+
+        // m_vars was shallow-duplicated, clone elements.
+        for (int i = 0; i < m_vars.size(); i++)
+        {
+            var->m_vars[i] = m_vars[i]->Clone(bRecursive);
+        }
+        return var;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void CopyValue(IVariable* fromVar)
+    {
+        assert(fromVar);
+        if (fromVar->GetType() != IVariable::ARRAY)
+        {
+            return;
+        }
+        int numSrc = fromVar->GetNumVariables();
+        int numTrg = static_cast<int>(m_vars.size());
+        for (int i = 0; i < numSrc && i < numTrg; i++)
+        {
+            // Copy Every child variable.
+            m_vars[i]->CopyValue(fromVar->GetVariable(i));
+        }
+        QString strValue;
+        fromVar->Get(strValue);
+        Set(strValue);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual int GetNumVariables() const { return static_cast<int>(m_vars.size()); }
+
+    virtual IVariable* GetVariable(int index) const
+    {
+        assert(index >= 0 && index < (int)m_vars.size());
+        return m_vars[index];
+    }
+
+    virtual void AddVariable(IVariable* var)
+    {
+        m_vars.push_back(var);
+    }
+
+    virtual bool DeleteVariable(IVariable* var, bool recursive /*=false*/)
+    {
+        bool found = stl::find_and_erase(m_vars, var);
+        if (!found && recursive)
+        {
+            for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+            {
+                if ((*it)->DeleteVariable(var, recursive))
+                {
+                    return true;
+                }
+            }
+        }
+        return found;
+    }
+
+    virtual void DeleteAllVariables()
+    {
+        m_vars.clear();
+    }
+
+    virtual bool IsContainsVariable(IVariable* pVar, bool bRecursive) const
+    {
+        for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            if (*it == pVar)
+            {
+                return true;
+            }
+        }
+
+        // If not found search childs.
+        if (bRecursive)
+        {
+            // Search all top level variables.
+            for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+            {
+                if ((*it)->IsContainsVariable(pVar))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    virtual IVariable* FindVariable(const char* name, bool bRecursive, bool bHumanName) const;
+
+    virtual bool IsEmpty() const
+    {
+        return m_vars.empty();
+    }
+
+    void Serialize(XmlNodeRef node, bool load)
+    {
+        if (load)
+        {
+            // Loading.
+            QString name;
+            for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+            {
+                IVariable* var = *it;
+                if (var->GetNumVariables())
+                {
+                    XmlNodeRef child = node->findChild(var->GetName().toUtf8().data());
+                    if (child)
+                    {
+                        var->Serialize(child, load);
+                    }
+                }
+                else
+                {
+                    var->Serialize(node, load);
+                }
+            }
+        }
+        else
+        {
+            // Saving.
+            for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+            {
+                IVariable* var = *it;
+                if (var->GetNumVariables())
+                {
+                    XmlNodeRef child = node->newChild(var->GetName().toUtf8().data());
+                    var->Serialize(child, load);
+                }
+                else
+                {
+                    var->Serialize(node, load);
+                }
+            }
+        }
+    }
+
+protected:
+    typedef std::vector<IVariablePtr> Variables;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Variables m_vars;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //! Any string value displayed in properties.
+    QString m_strValue;
+};
+
+/** var_type namespace includes type definitions needed for CVariable implementaton.
+ */
+namespace var_type
+{
+    //////////////////////////////////////////////////////////////////////////
+    template <int TypeID, bool IsStandart, bool IsInteger, bool IsSigned, bool SupportsRange>
+    struct type_traits_base
+    {
+        static int type() { return TypeID; };
+        //! Return true if standard C++ type.
+        static bool is_standart() { return IsStandart; };
+        static bool is_integer() { return IsInteger; };
+        static bool is_signed() { return IsSigned; };
+        static bool supports_range() { return SupportsRange; };
+    };
+
+    template <class Type>
+    struct type_traits
+        : public type_traits_base<IVariable::UNKNOWN, false, false, false, false> {};
+
+    // Types specialization.
+    template<>
+    struct type_traits<int>
+        : public type_traits_base<IVariable::INT, true, true, true, true> {};
+    template<>
+    struct type_traits<bool>
+        : public type_traits_base<IVariable::BOOL, true, true, false, true> {};
+    template<>
+    struct type_traits<float>
+        : public type_traits_base<IVariable::FLOAT, true, false, false, true> {};
+    template<>
+    struct type_traits<double>
+        : public type_traits_base<IVariable::DOUBLE, true, false, false, true>{};
+    template<>
+    struct type_traits<Vec2>
+        : public type_traits_base<IVariable::VECTOR2, false, false, false, false> {};
+    template<>
+    struct type_traits<Vec3>
+        : public type_traits_base<IVariable::VECTOR, false, false, false, false> {};
+    template<>
+    struct type_traits<Vec4>
+        : public type_traits_base<IVariable::VECTOR4, false, false, false, false> {};
+    template<>
+    struct type_traits<Quat>
+        : public type_traits_base<IVariable::QUAT, false, false, false, false> {};
+    template<>
+    struct type_traits<QString>
+        : public type_traits_base<IVariable::STRING, false, false, false, false> {};
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // General one type to another type convertor class.
+    //////////////////////////////////////////////////////////////////////////
+    struct type_convertor
+    {
+        template <class From, class To>
+        void operator()([[maybe_unused]] const From& from, [[maybe_unused]] To& to) const { assert(0); }
+
+        void operator()(const int& from, int& to) const { to = from; }
+        void operator()(const int& from, bool& to) const { to = from != 0; }
+        void operator()(const int& from, float& to) const { to = (float)from; }
+        //////////////////////////////////////////////////////////////////////////
+        void operator()(const bool& from, int& to) const { to = from; }
+        void operator()(const bool& from, bool& to) const { to = from; }
+        void operator()(const bool& from, float& to) const { to = from; }
+        //////////////////////////////////////////////////////////////////////////
+        void operator()(const float& from, int& to) const { to = (int)from; }
+        void operator()(const float& from, bool& to) const { to = from != 0; }
+        void operator()(const float& from, float& to) const { to = from; }
+
+        void operator()(const double& from, int& to) const { to = (int)from; }
+        void operator()(const double& from, bool& to) const { to = from != 0; }
+        void operator()(const double& from, float& to) const { to = aznumeric_cast<float>(from); }
+
+        void operator()(const Vec2& from, Vec2& to) const { to = from; }
+        void operator()(const Vec3& from, Vec3& to) const { to = from; }
+        void operator()(const Vec4& from, Vec4& to) const { to = from; }
+        void operator()(const Quat& from, Quat& to) const { to = from; }
+        void operator()(const QString& from, QString& to) const { to = from; }
+
+        void operator()(bool value, QString& to) const { to = QString::number((value) ? (int)1 : (int)0); }
+        void operator()(int value, QString& to) const { to = QString::number(value); }
+        void operator()(float value, QString& to) const { to = QString::number(value); };
+        void operator()(double value, QString& to) const { to = QString::number(value); };
+        void operator()(const Vec2& value, QString& to) const { to = QString::fromLatin1("%1,%2").arg(value.x).arg(value.y); }
+        void operator()(const Vec3& value, QString& to) const { to = QString::fromLatin1("%1,%2,%3").arg(value.x).arg(value.y).arg(value.z); }
+        void operator()(const Vec4& value, QString& to) const { to = QString::fromLatin1("%1,%2,%3,%4").arg(value.x).arg(value.y).arg(value.z).arg(value.w); }
+        void operator()(const Ang3& value, QString& to) const { to = QString::fromLatin1("%1,%2,%3").arg(value.x).arg(value.y).arg(value.z); }
+        void operator()(const Quat& value, QString& to) const { to = QString::fromLatin1("%1,%2,%3,%4").arg(value.w).arg(value.v.x).arg(value.v.y).arg(value.v.z); }
+
+        void operator()(const QString& from, int& value) const { value = from.toInt(); }
+        void operator()(const QString& from, bool& value) const { value = from.toInt() != 0; }
+        void operator()(const QString& from, float& value) const { value = from.toFloat(); }
+        void operator()(const QString& from, Vec2& value) const
+        {
+            QStringList parts = from.split(QStringLiteral(","));
+            while (parts.size() < 2)
+            {
+                parts.push_back(QString());
+            }
+            value.x = parts[0].toFloat();
+            value.y = parts[1].toFloat();
+        };
+        void operator()(const QString& from, Vec3& value) const
+        {
+            QStringList parts = from.split(QStringLiteral(","));
+            while (parts.size() < 3)
+            {
+                parts.push_back(QString());
+            }
+            value.x = parts[0].toFloat();
+            value.y = parts[1].toFloat();
+            value.z = parts[2].toFloat();
+        };
+        void operator()(const QString& from, Vec4& value) const
+        {
+            QStringList parts = from.split(QStringLiteral(","));
+            while (parts.size() < 4)
+            {
+                parts.push_back(QString());
+            }
+            value.x = parts[0].toFloat();
+            value.y = parts[1].toFloat();
+            value.z = parts[2].toFloat();
+            value.w = parts[3].toFloat();
+        };
+        void operator()(const QString& from, Ang3& value) const
+        {
+            QStringList parts = from.split(QStringLiteral(","));
+            while (parts.size() < 3)
+            {
+                parts.push_back(QString());
+            }
+            value.x = parts[0].toFloat();
+            value.y = parts[1].toFloat();
+            value.z = parts[2].toFloat();
+        };
+        void operator()(const QString& from, Quat& value) const
+        {
+            QStringList parts = from.split(QStringLiteral(","));
+            while (parts.size() < 4)
+            {
+                parts.push_back(QString());
+            }
+            value.w = parts[0].toFloat();
+            value.v.x = parts[1].toFloat();
+            value.v.y = parts[2].toFloat();
+            value.v.z = parts[3].toFloat();
+        };
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Custom comparison functions for different variable type's values,.
+    //////////////////////////////////////////////////////////////////////////
+    template <class Type>
+    inline bool compare(const Type& arg1, const Type& arg2)
+    {
+        return arg1 == arg2;
+    };
+    inline bool compare(const Vec2& v1, const Vec2& v2)
+    {
+        return v1.x == v2.x && v1.y == v2.y;
+    }
+    inline bool compare(const Vec3& v1, const Vec3& v2)
+    {
+        return v1.x == v2.x && v1.y == v2.y && v1.z == v2.z;
+    }
+    inline bool compare(const Vec4& v1, const Vec4& v2)
+    {
+        return v1.x == v2.x && v1.y == v2.y && v1.z == v2.z && v1.w == v2.w;
+    }
+    inline bool compare(const Ang3& v1, const Ang3& v2)
+    {
+        return v1.x == v2.x && v1.y == v2.y && v1.z == v2.z;
+    }
+    inline bool compare(const Quat& q1, const Quat& q2)
+    {
+        return q1.v.x == q2.v.x && q1.v.y == q2.v.y && q1.v.z == q2.v.z && q1.w == q2.w;
+    }
+    inline bool compare(const char* s1, const char* s2)
+    {
+        return strcmp(s1, s2) == 0;
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Custom Initialization functions for different variable type's values,.
+    //////////////////////////////////////////////////////////////////////////
+    template <class Type>
+    inline void init(Type& val)
+    {
+        val = 0;
+    };
+    inline void init(Vec2& val)   {   val.x = 0; val.y = 0;   };
+    inline void init(Vec3& val)   {   val.x = 0; val.y = 0; val.z = 0; };
+    inline void init(Vec4& val)   {   val.x = 0; val.y = 0; val.z = 0; val.w = 0;  };
+    inline void init(Ang3& val)   {   val.x = 0; val.y = 0; val.z = 0; };
+    inline void init(Quat& val)
+    {
+        val.v.x = 0;
+        val.v.y = 0;
+        val.v.z = 0;
+        val.w = 0;
+    };
+    inline void init(const char*& val)
+    {
+        val = "";
+    };
+    inline void init([[maybe_unused]] QString& val)
+    {
+        // self initializing.
+    }
+    //////////////////////////////////////////////////////////////////////////
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Void variable does not contain any value.
+//////////////////////////////////////////////////////////////////////////
+class CVariableVoid
+    : public CVariableBase
+{
+public:
+    CVariableVoid(){};
+    virtual EType GetType() const { return IVariable::UNKNOWN; };
+    virtual IVariable* Clone([[maybe_unused]] bool bRecursive) const { return new CVariableVoid(*this); }
+    virtual void CopyValue([[maybe_unused]] IVariable* fromVar) {};
+    virtual bool HasDefaultValue() const { return true; }
+    virtual void ResetToDefault() {};
+protected:
+    CVariableVoid(const CVariableVoid& v)
+        : CVariableBase(v) {};
+};
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+class CVariable
+    : public CVariableBase
+{
+    typedef CVariable<T> Self;
+public:
+    // Constructor.
+    CVariable()
+        : m_valueMin(0.0f)
+        , m_valueMax(100.0f)
+        , m_valueStep(0.0f)
+        , m_bHardMin(false)
+        , m_bHardMax(false)
+        , m_customLimits(false)
+    {
+        // Initialize value to zero or empty string.
+        var_type::init(m_valueDef);
+    }
+
+    explicit CVariable(const T& set)
+        : CVariable()
+    {
+        var_type::init(m_valueDef);   // Update F32NAN values in Debud mode
+        SetValue(set);
+    }
+
+    //! Get name of parameter.
+    virtual EType   GetType() const { return (EType)var_type::type_traits<T>::type(); };
+    virtual int     GetSize() const { return sizeof(T); };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set methods.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void Set(int value)                           { SetValue(value); }
+    virtual void Set(bool value)                      { SetValue(value); }
+    virtual void Set(float value)                     { SetValue(value); }
+    virtual void Set(double value)                { SetValue(value); }
+    virtual void Set(const Vec2& value)           { SetValue(value); }
+    virtual void Set(const Vec3& value)           { SetValue(value); }
+    virtual void Set(const Vec4& value)           { SetValue(value); }
+    virtual void Set(const Ang3& value)           { SetValue(value); }
+    virtual void Set(const Quat& value)           { SetValue(value); }
+    virtual void Set(const QString& value)    { SetValue(value); }
+    virtual void Set(const char* value)      { SetValue(QString(value)); }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Get methods.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void Get(int& value) const                        { GetValue(value); }
+    virtual void Get(bool& value) const                   { GetValue(value); }
+    virtual void Get(float& value) const                  { GetValue(value); }
+    virtual void Get(double& value) const                  { GetValue(value); }
+    virtual void Get(Vec2& value) const                   { GetValue(value); }
+    virtual void Get(Vec3& value) const                   { GetValue(value); }
+    virtual void Get(Vec4& value) const                   { GetValue(value); }
+    virtual void Get(Quat& value) const                   { GetValue(value); }
+    virtual void Get(QString& value) const                { GetValue(value); }
+    virtual bool HasDefaultValue() const
+    {
+        T defval;
+        var_type::init(defval);
+        return m_valueDef == defval;
+    }
+
+    virtual void ResetToDefault()
+    {
+        T defval;
+        var_type::init(defval);
+        SetValue(defval);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Limits.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetLimits(float fMin, float fMax, float fStep = 0.f, bool bHardMin = true, bool bHardMax = true)
+    {
+        m_valueMin = fMin;
+        m_valueMax = fMax;
+        m_valueStep = fStep;
+        m_bHardMin = bHardMin;
+        m_bHardMax = bHardMax;
+
+        // Flag to determine when this variable has custom limits set
+        m_customLimits = true;
+    }
+
+    virtual void GetLimits(float& fMin, float& fMax, float& fStep, bool& bHardMin, bool& bHardMax)
+    {
+        if (!m_customLimits && var_type::type_traits<T>::supports_range())
+        {
+            float value;
+            GetValue(value);
+            if (value > m_valueMax && !m_bHardMax)
+            {
+                SetLimits(m_valueMin, nextNiceNumberAbove(value), 0.0, false, false);
+            }
+            if (value < m_valueMin && !m_bHardMin)
+            {
+                SetLimits(nextNiceNumberBelow(value), m_valueMax, 0.0, false, false);
+            }
+        }
+
+        fMin = m_valueMin;
+        fMax = m_valueMax;
+        fStep = m_valueStep;
+        bHardMin = m_bHardMin;
+        bHardMax = m_bHardMax;
+    }
+    void ClearLimits()
+    {
+        SetLimits(0.0f, 0.0f, 0.0f, false, false);
+        m_customLimits = false;
+    }
+
+    virtual bool HasCustomLimits()
+    {
+        return m_customLimits;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Access operators.
+    //////////////////////////////////////////////////////////////////////////
+
+    //! Cast to held type.
+    operator T const& () const {
+        return m_valueDef;
+    }
+
+    //! Assign operator for variable.
+    void operator=(const T& value) { SetValue(value); }
+
+    //////////////////////////////////////////////////////////////////////////
+    IVariable* Clone([[maybe_unused]] bool bRecursive) const
+    {
+        Self* var = new Self(*this);
+        return var;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void CopyValue(IVariable* fromVar)
+    {
+        assert(fromVar);
+        T val;
+        fromVar->Get(val);
+        SetValue(val);
+    }
+
+protected:
+
+    //////////////////////////////////////////////////////////////////////////
+    template <class P>
+    void SetValue(const P& value)
+    {
+        T newValue = T();
+        //var_type::type_convertor<P,T> convertor;
+        var_type::type_convertor convertor;
+        convertor(value, newValue);
+
+        // compare old and new values.
+        if (m_bForceModified || !var_type::compare(m_valueDef, newValue))
+        {
+            m_valueDef = newValue;
+            m_bForceModified = false;
+            OnSetValue(false);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    template <class P>
+    void GetValue(P& value) const
+    {
+        var_type::type_convertor convertor;
+        convertor(m_valueDef, value);
+    }
+
+protected:
+    T m_valueDef;
+    bool m_customLimits;
+    bool m_bResolving;
+    unsigned char m_bHardMin : 1;
+    unsigned char m_bHardMax : 1;
+    // Min/Max value.
+    float m_valueMin, m_valueMax, m_valueStep;
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+/**
+**************************************************************************************
+* CVariableArray implements variable of type array of IVariables.
+***************************************************************************************
+*/
+template <class T>
+class TVariableArray
+    : public CVariable<T>
+{
+    typedef TVariableArray<T> Self;
+public:
+    using CVariable<T>::GetType;
+    TVariableArray()
+        : CVariable<T>() {};
+    // Copy Constructor.
+    TVariableArray(const Self& var)
+        : CVariable<T>(var)
+    {}
+
+    //! Get name of parameter.
+    virtual int     GetSize() const { return sizeof(Self); };
+
+    virtual bool HasDefaultValue() const
+    {
+        for (Vars::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            if (!(*it)->HasDefaultValue())
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    virtual void ResetToDefault()
+    {
+        for (Vars::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            (*it)->ResetToDefault();
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    IVariable* Clone(bool bRecursive) const
+    {
+        Self* var = new Self(*this);
+        for (Vars::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+        {
+            var->m_vars.push_back((*it)->Clone(bRecursive));
+        }
+        return var;
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void CopyValue(IVariable* fromVar)
+    {
+        assert(fromVar);
+        if (fromVar->GetType() != GetType())
+        {
+            return;
+        }
+        CVariable<T>::CopyValue(fromVar);
+        int numSrc = fromVar->GetNumVariables();
+        int numTrg = m_vars.size();
+        for (int i = 0; i < numSrc && i < numTrg; i++)
+        {
+            // Copy Every child variable.
+            m_vars[i]->CopyValue(fromVar->GetVariable(i));
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    int GetNumVariables() const { return m_vars.size(); }
+    IVariable* GetVariable(int index) const
+    {
+        assert(index >= 0 && index < (int)m_vars.size());
+        return m_vars[index];
+    }
+    void AddVariable(IVariable* var) { m_vars.push_back(var); }
+    void DeleteAllVariables() { m_vars.clear(); }
+
+    //////////////////////////////////////////////////////////////////////////
+    void Serialize(XmlNodeRef node, bool load)
+    {
+        CVariable<T>::Serialize(node, load);
+        if (load)
+        {
+            // Loading.
+            QString name;
+            for (Vars::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+            {
+                IVariable* var = *it;
+                if (var->GetNumVariables())
+                {
+                    XmlNodeRef child = node->findChild(var->GetName().toUtf8().data());
+                    if (child)
+                    {
+                        var->Serialize(child, load);
+                    }
+                }
+                else
+                {
+                    var->Serialize(node, load);
+                }
+            }
+        }
+        else
+        {
+            // Saving.
+            for (Vars::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
+            {
+                IVariable* var = *it;
+                if (var->GetNumVariables())
+                {
+                    XmlNodeRef child = node->newChild(var->GetName().toUtf8().data());
+                    var->Serialize(child, load);
+                }
+                else
+                {
+                    var->Serialize(node, load);
+                }
+            }
+        }
+    }
+
+protected:
+    typedef std::vector<IVariablePtr> Vars;
+    Vars m_vars;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//! Selection list shown in combo box, for enumerated variable.
+struct IVarEnumList
+    : public CRefCountBase
+{
+    //! Get the name of specified value in enumeration, or NULL if out of range.
+    virtual QString GetItemName(uint index) = 0;
+};
+typedef _smart_ptr<IVarEnumList> IVarEnumListPtr;
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING;
+//! Selection list shown in combo box, for enumerated variable.
+template <class T>
+class CVarEnumListBase
+    : public IVarEnumList
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    CVarEnumListBase(){}
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual T NameToValue(const QString& name) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual QString ValueToName(T const& value) = 0;
+
+    //! Add new item to the selection.
+    virtual void AddItem(const QString& name, const T& value) = 0;
+
+    template <class TVal>
+    static bool IsValueEqual(const TVal& v1, const TVal& v2)
+    {
+        return v1 == v2;
+    }
+    static bool IsValueEqual(const QString& v1, const QString& v2)
+    {
+        // Case insensitive compare.
+        return QString::compare(v1, v2, Qt::CaseInsensitive) == 0;
+    }
+
+protected:
+    virtual ~CVarEnumListBase() {};
+    friend class _smart_ptr<CVarEnumListBase<T> >;
+};
+
+struct CUIEnumsDatabase_SEnum;
+
+//////////////////////////////////////////////////////////////////////////
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+class EDITOR_CORE_API CVarGlobalEnumList
+    : public CVarEnumListBase<QString>
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    CVarGlobalEnumList(CUIEnumsDatabase_SEnum* pEnum);
+    CVarGlobalEnumList(const QString& enumName);
+
+    //! Get the name of specified value in enumeration.
+    virtual QString GetItemName(uint index);
+
+    virtual QString NameToValue(const QString& name);
+    virtual QString ValueToName(const QString& value);
+
+    //! Don't add anything to a global enum database
+    virtual void AddItem([[maybe_unused]] const QString& name, [[maybe_unused]] const QString& value) {}
+
+private:
+    CUIEnumsDatabase_SEnum* m_pEnum;
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//! Selection list shown in combo box, for enumerated variable.
+template <class T>
+class CVarEnumList
+    : public CVarEnumListBase<T>
+{
+public:
+    using CVarEnumListBase<T>::IsValueEqual;
+    CVarEnumList(){}
+    struct Item
+    {
+        QString name;
+        T value;
+    };
+    QString GetItemName(uint index)
+    {
+        if (index >= m_items.size())
+        {
+            return NULL;
+        }
+        return m_items[index].name;
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    T NameToValue(const QString& name)
+    {
+        for (int i = 0; i < m_items.size(); i++)
+        {
+            if (name == m_items[i].name)
+            {
+                return m_items[i].value;
+            }
+        }
+        return T();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    QString ValueToName(T const& value)
+    {
+        for (int i = 0; i < m_items.size(); i++)
+        {
+            if (CVarEnumListBase<T>::IsValueEqual(value, m_items[i].value))
+            {
+                return m_items[i].name;
+            }
+        }
+        return "";
+    }
+
+    //! Add new item to the selection.
+    void AddItem(const QString& name, const T& value)
+    {
+        Item item;
+        item.name = name;
+        item.value = value;
+        m_items.push_back(item);
+    };
+
+protected:
+    ~CVarEnumList() {};
+
+private:
+    std::vector<Item> m_items;
+};
+
+//////////////////////////////////////////////////////////////////////////////////
+// CVariableEnum is the same as CVariable but it display enumerated values in UI
+//////////////////////////////////////////////////////////////////////////////////
+template <class T>
+class CVariableEnum
+    : public CVariable<T>
+{
+public:
+    using CVariable<T>::SetValue;
+    using CVariable<T>::GetFlags;
+    using CVariable<T>::OnSetValue;
+    using CVariable<T>::Set;
+    using CVariable<T>::m_valueDef;
+    using CVariable<T>::m_onSetEnumFuncs;
+    //////////////////////////////////////////////////////////////////////////
+    CVariableEnum(){}
+
+    //! Assign operator for variable.
+    void operator=(const T& value) { CVariable<T>::SetValue(value); }
+
+    //! Add new item to the enumeration.
+    void AddEnumItem(const char* name, const T& value)
+    {
+        AddEnumItem(QString(name), value);
+    };
+    //! Add new item to the enumeration.
+    void AddEnumItem(const QString& name, const T& value)
+    {
+        if (GetFlags() & IVariable::UI_USE_GLOBAL_ENUMS)  // don't think adding makes sense
+        {
+            return;
+        }
+        if (!m_enum)
+        {
+            m_enum = new CVarEnumList<T>();
+        }
+        m_enum->AddItem(name, value);
+        OnEnumsChanged();
+    };
+    void SetEnumList(CVarEnumListBase<T>* enumList)
+    {
+        m_enum = enumList;
+        OnSetValue(false);
+        OnEnumsChanged();
+    }
+    IVarEnumList* GetEnumList() const
+    {
+        return m_enum;
+    }
+    //////////////////////////////////////////////////////////////////////////
+    IVariable* Clone([[maybe_unused]] bool bRecursive) const
+    {
+        CVariableEnum<T>* var = new CVariableEnum<T>(*this);
+        return var;
+    }
+
+    virtual QString GetDisplayValue() const
+    {
+        if (m_enum)
+        {
+            return m_enum->ValueToName(m_valueDef);
+        }
+        else
+        {
+            return CVariable<T>::GetDisplayValue();
+        }
+    }
+
+    virtual void SetDisplayValue(const QString& value)
+    {
+        if (m_enum)
+        {
+            Set(m_enum->NameToValue(value));
+        }
+        else
+        {
+            Set(value);
+        }
+    }
+
+protected:
+    void OnEnumsChanged()
+    {
+        // Call on set callback.
+        for (auto it = m_onSetEnumFuncs.begin(); it != m_onSetEnumFuncs.end(); ++it)
+        {
+            // Call on set callback.
+            (*it)->operator()(this);
+        }
+    }
+
+    // Copy Constructor.
+    CVariableEnum(const CVariableEnum<T>& var)
+        : CVariable<T>(var)
+    {
+        m_enum = var.m_enum;
+    }
+private:
+    _smart_ptr<CVarEnumListBase<T> > m_enum;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Smart pointers to variables.
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+template <class T, class TVar>
+struct CSmartVariableBase
+{
+    typedef TVar VarType;
+
+    CSmartVariableBase() { pVar = new VarType(); }
+
+    operator T const& () const {
+        VarType* pV = pVar;
+        return *pV;
+    }
+    //void operator=( const T& value ) { VarType *pV = pVar; *pV = value; }
+
+    // Compare with pointer to variable.
+    bool operator==(IVariable* pV) { return pVar == pV; }
+    bool operator!=(IVariable* pV) { return pVar != pV; }
+
+    operator VarType&() {
+        VarType* pV = pVar;
+        return *pV;
+    }                                                        // Cast to CVariableBase&
+    VarType& operator*() const { return *pVar; }
+    VarType* operator->(void) const { return pVar; }
+
+    VarType* GetVar() const { return pVar; };
+
+protected:
+    _smart_ptr<VarType> pVar;
+};
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+struct CSmartVariable
+    : public CSmartVariableBase<T, CVariable<T> >
+{
+    using CSmartVariableBase<T, CVariable<T> >::pVar;
+    void operator=(const T& value) { CVariable<T>* pV = pVar; *pV = value; }
+};
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+struct CSmartVariableArrayT
+    : public CSmartVariableBase<T, TVariableArray<T> >
+{
+    using CSmartVariableBase<T, TVariableArray<T> >::pVar;
+    void operator=(const T& value) { TVariableArray<T>* pV = pVar; *pV = value; }
+};
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+struct CSmartVariableEnum
+    : public CSmartVariableBase<T, CVariableEnum<T> >
+{
+    using CSmartVariableBase<T, CVariableEnum<T> >::pVar;
+    CSmartVariableEnum(){}
+    void operator=(const T& value) { CVariableEnum<T>* pV = pVar; *pV = value; }
+    void AddEnumItem(const QString& name, const T& value)
+    {
+        pVar->AddEnumItem(name, value);
+    };
+    void SetEnumList(CVarEnumListBase<T>* enumList)
+    {
+        pVar->EnableUpdateCallbacks(false);
+        pVar->SetEnumList(enumList);
+        pVar->EnableUpdateCallbacks(true);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct CSmartVariableArray
+{
+    typedef CVariableArray VarType;
+
+    CSmartVariableArray() { pVar = new VarType(); }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Access operators.
+    //////////////////////////////////////////////////////////////////////////
+    operator VarType&() {
+        VarType* pV = pVar;
+        return *pV;
+    }
+
+    VarType& operator*() const { return *pVar; }
+    VarType* operator->(void) const { return pVar; }
+
+    VarType* GetVar() const { return pVar; };
+
+private:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    _smart_ptr<VarType> pVar;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+//////////////////////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+class EDITOR_CORE_API CVarBlock
+    : public IVariableContainer
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    // Dtor.
+    virtual ~CVarBlock() {}
+    //! Add variable to block.
+    virtual void AddVariable(IVariable* var);
+    //! Remove variable from block
+    virtual bool DeleteVariable(IVariable* var, bool bRecursive = false);
+
+    void AddVariable(IVariable* pVar, const char* varName, unsigned char dataType = IVariable::DT_SIMPLE);
+    // This used from smart variable pointer.
+    void AddVariable(CVariableBase& var, const char* varName, unsigned char dataType = IVariable::DT_SIMPLE);
+
+    //! Returns number of variables in block.
+    virtual int GetNumVariables() const { return static_cast<int>(m_vars.size()); }
+
+    //! Get pointer to stored variable by index.
+    virtual IVariable* GetVariable(int index) const
+    {
+        assert(index >= 0 && index < m_vars.size());
+        return m_vars[index];
+    }
+
+    // Clear all vars from VarBlock.
+    virtual void DeleteAllVariables() { m_vars.clear(); };
+
+    //! Return true if variable block is empty (Does not have any vars).
+    virtual bool IsEmpty() const { return m_vars.empty(); }
+
+    // Returns true if var block contains specified variable.
+    virtual bool IsContainsVariable(IVariable* pVar, bool bRecursive = true) const;
+
+    //! Find variable by name.
+    virtual IVariable* FindVariable(const char* name, bool bRecursive = true, bool bHumanName = false) const;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Clone var block.
+    CVarBlock* Clone(bool bRecursive) const;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Copy variable values from specified var block.
+    //! Do not create new variables, only copy values of existing ones.
+    //! Should only be used to copy identical var blocks (eg. not Array type var copied to String type var)
+    //! @param fromVarBlock Source variable block that contain copied values, must be identical to this var block.
+    void CopyValues(const CVarBlock* fromVarBlock);
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Copy variable values from specified var block.
+    //! Do not create new variables, only copy values of existing ones.
+    //! Can be used to copy slightly different var blocks, matching performed by variable name.
+    //! @param fromVarBlock Source variable block that contain copied values.
+    void CopyValuesByName(CVarBlock* fromVarBlock);
+
+    void OnSetValues();
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Set UI_CREATE_SPLINE flags for all the varialbes in this Var Block.
+    //! This is because when the data was changed for a spline variable, the spline need to be recreated to reflect the change.
+    //! Set the flag to notify the spline variable.
+    void SetRecreateSplines();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Wire/Unwire other variable blocks.
+    //////////////////////////////////////////////////////////////////////////
+    //! Wire to other variable block.
+    //! Only equivalent VarBlocks can be wired (same number of variables with same type).
+    //! Recursive wiring of array variables is supported.
+    void Wire(CVarBlock* toVarBlock);
+    //! Unwire var block.
+    void Unwire(CVarBlock* varBlock);
+
+    //! Add this callback to every variable in block (recursively).
+    void AddOnSetCallback(IVariable::OnSetCallback* func);
+    //! Remove this callback from every variable in block (recursively).
+    void RemoveOnSetCallback(IVariable::OnSetCallback* func);
+
+    //////////////////////////////////////////////////////////////////////////
+    void Serialize(XmlNodeRef vbNode, bool load);
+
+    void ReserveNumVariables(int numVars);
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Gather resources in this variable block.
+    virtual void GatherUsedResources(CUsedResources& resources);
+
+    void EnableUpdateCallbacks(bool boEnable);
+    IVariable* FindChildVar(const char* name, IVariable* pParentVar) const;
+
+    void Sort();
+
+protected:
+    void SetCallbackToVar(IVariable::OnSetCallback* func, IVariable* pVar, bool bAdd);
+    void WireVar(IVariable* src, IVariable* trg, bool bWire);
+    void GatherUsedResourcesInVar(IVariable* pVar, CUsedResources& resources);
+
+    typedef std::vector<IVariablePtr> Variables;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Variables m_vars;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+typedef _smart_ptr<CVarBlock> CVarBlockPtr;
+
+//////////////////////////////////////////////////////////////////////////
+class EDITOR_CORE_API CVarObject
+    : public QObject
+    , public CRefCountBase
+{
+public:
+    typedef IVariable::OnSetCallback VarOnSetCallback;
+
+    CVarObject();
+    ~CVarObject();
+
+    void Serialize(XmlNodeRef node, bool load);
+    CVarBlock* GetVarBlock() const { return m_vars; };
+
+    void AddVariable(CVariableBase& var, const QString& varName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
+    void AddVariable(CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
+    void AddVariable(CVariableArray& table, CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
+    void ReserveNumVariables(int numVars);
+    void RemoveVariable(IVariable* var);
+
+    void EnableUpdateCallbacks(bool boEnable);
+    void OnSetValues();
+protected:
+    //! Copy values of variables from other VarObject.
+    //! Source object must be of same type.
+    void CopyVariableValues(CVarObject* sourceObject);
+
+private:
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    CVarBlockPtr m_vars;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+Q_DECLARE_METATYPE(IVariable *);
+
+#endif // CRYINCLUDE_EDITOR_UTIL_VARIABLE_H
diff --git a/Code/Editor/Util/VariablePropertyType.cpp b/Code/Editor/Util/VariablePropertyType.cpp
new file mode 100644
index 0000000000..568725d01b
--- /dev/null
+++ b/Code/Editor/Util/VariablePropertyType.cpp
@@ -0,0 +1,330 @@
+/*
+ * 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 "VariablePropertyType.h"
+
+#include "Variable.h"
+#include "UIEnumsDatabase.h"
+#include "IEditor.h"
+
+namespace Prop
+{
+    struct
+    {
+        int dataType;
+        const char* name;
+        PropertyType type;
+        int image;
+    } static s_propertyTypeNames[] =
+    {
+        { IVariable::DT_SIMPLE, "Bool", ePropertyBool, 2 },
+        { IVariable::DT_SIMPLE, "Int", ePropertyInt, 0 },
+        { IVariable::DT_SIMPLE, "Float", ePropertyFloat, 0 },
+        { IVariable::DT_SIMPLE, "Vector", ePropertyVector2, 10 },
+        { IVariable::DT_SIMPLE, "Vector", ePropertyVector, 10 },
+        { IVariable::DT_SIMPLE, "Vector", ePropertyVector4, 10 },
+        { IVariable::DT_SIMPLE, "String", ePropertyString, 3 },
+        { IVariable::DT_PERCENT, "Float", ePropertyInt, 13 },
+        { IVariable::DT_BOOLEAN, "Boolean", ePropertyBool, 2 },
+        { IVariable::DT_COLOR, "Color", ePropertyColor, 1 },
+        { IVariable::DT_COLORA, "ColorA", ePropertyColor, 1 },
+        { IVariable::DT_CURVE | IVariable::DT_PERCENT, "FloatCurve", ePropertyFloatCurve, 13 },
+        { IVariable::DT_CURVE | IVariable::DT_COLOR, "ColorCurve", ePropertyColorCurve, 1 },
+        { IVariable::DT_ANGLE, "Angle", ePropertyAngle, 0 },
+        { IVariable::DT_FILE, "File", ePropertyFile, 7 },
+        { IVariable::DT_TEXTURE, "Texture", ePropertyTexture, 4 },
+        { IVariable::DT_ANIMATION, "Animation", ePropertyAnimation, -1 },
+        { IVariable::DT_MOTION, "Motion", ePropertyMotion, -1 },
+        { IVariable::DT_OBJECT, "Model", ePropertyModel, 5 },
+        { IVariable::DT_SIMPLE, "Selection", ePropertySelection, -1 },
+        { IVariable::DT_SIMPLE, "List", ePropertyList, -1 },
+        { IVariable::DT_SHADER, "Shader", ePropertyShader, 9 },
+        { IVariable::DT_DEPRECATED0, "DEPRECATED", ePropertyDeprecated2, -1 },
+        { IVariable::DT_EQUIP, "Equip", ePropertyEquip, 11 },
+        { IVariable::DT_REVERBPRESET, "ReverbPreset", ePropertyReverbPreset, 11 },
+        { IVariable::DT_LOCAL_STRING, "LocalString", ePropertyLocalString, 3 },
+        { IVariable::DT_SEQUENCE, "Sequence", ePropertySequence, -1 },
+        { IVariable::DT_MISSIONOBJ, "Mission Objective", ePropertyMissionObj, -1 },
+        { IVariable::DT_USERITEMCB, "User", ePropertyUser, -1 },
+        { IVariable::DT_SEQUENCE_ID, "SequenceId", ePropertySequenceId, -1 },
+        { IVariable::DT_LIGHT_ANIMATION, "LightAnimation", ePropertyLightAnimation, -1 },
+        { IVariable::DT_PARTICLE_EFFECT, "ParticleEffect", ePropertyParticleName, 3 },
+        { IVariable::DT_GEOM_CACHE, "Geometry Cache", ePropertyGeomCache, 5 },
+        { IVariable::DT_AUDIO_TRIGGER, "Audio Trigger", ePropertyAudioTrigger, 6 },
+        { IVariable::DT_AUDIO_SWITCH, "Audio Switch", ePropertyAudioSwitch, 6 },
+        { IVariable::DT_AUDIO_SWITCH_STATE, "Audio Switch", ePropertyAudioSwitchState, 6 },
+        { IVariable::DT_AUDIO_RTPC, "Audio Realtime Parameter Control", ePropertyAudioRTPC, 6 },
+        { IVariable::DT_AUDIO_ENVIRONMENT, "Audio Environment", ePropertyAudioEnvironment, 6 },
+        { IVariable::DT_AUDIO_PRELOAD_REQUEST, "Audio Preload Request", ePropertyAudioPreloadRequest, 6 },
+        { IVariable::DT_SIMPLE, "Custom", ePropertyFlowCustomData, -1 },
+        { IVariable::DT_UI_ELEMENT, "UiElement", ePropertyUiElement, -1 }
+    };
+
+    static const int NumPropertyTypes = sizeof(s_propertyTypeNames) / sizeof(s_propertyTypeNames[0]);
+
+    Description::Description()
+        : m_type(ePropertyInvalid)
+        , m_numImages(-1)
+        , m_enumList(NULL)
+        , m_rangeMin(0)
+        , m_rangeMax(100)
+        , m_step(0)
+        , m_bHardMin(false)
+        , m_bHardMax(false)
+        , m_valueMultiplier(1)
+        , m_pEnumDBItem(NULL)
+    {
+    }
+
+    Description::Description(IVariable* pVar)
+        : m_type(ePropertyInvalid)
+        , m_numImages(-1)
+        , m_enumList(NULL)
+        , m_rangeMin(0)
+        , m_rangeMax(100)
+        , m_step(0)
+        , m_bHardMin(false)
+        , m_bHardMax(false)
+        , m_valueMultiplier(1)
+        , m_pEnumDBItem(NULL)
+    {
+        if (!pVar)
+        {
+            return;
+        }
+
+        const int type = (int)pVar->GetDataType();
+
+        if (type != IVariable::DT_SIMPLE)
+        {
+            m_type = GetType(type);
+            m_numImages = GetNumImages(pVar);
+        }
+
+        m_name = pVar->GetHumanName();
+        m_enumList = pVar->GetEnumList();
+
+        if (m_enumList != NULL)
+        {
+            m_type = ePropertySelection;
+        }
+
+        if (m_type == ePropertyInvalid)
+        {
+            switch (pVar->GetType())
+            {
+            case IVariable::INT:
+                m_type = ePropertyInt;
+                break;
+            case IVariable::BOOL:
+                m_type = ePropertyBool;
+                break;
+            case IVariable::FLOAT:
+                m_type = ePropertyFloat;
+                break;
+            case IVariable::VECTOR2:
+                m_type = ePropertyVector2;
+                break;
+            case IVariable::VECTOR4:
+                m_type = ePropertyVector4;
+                break;
+            case IVariable::VECTOR:
+                m_type = ePropertyVector;
+                break;
+            case IVariable::STRING:
+                m_type = ePropertyString;
+                break;
+            case IVariable::FLOW_CUSTOM_DATA:
+                m_type = ePropertyFlowCustomData;
+                break;
+            default:
+                break;
+            }
+
+            m_numImages = Prop::GetNumImages(m_type);
+        }
+
+        // Get variable limits.
+        pVar->GetLimits(m_rangeMin, m_rangeMax, m_step, m_bHardMin, m_bHardMax);
+
+        // Check if value is percents.
+        if (type == IVariable::DT_PERCENT)
+        {
+            // Scale all values by 100.
+            m_valueMultiplier = 100;
+        }
+        else if (type == IVariable::DT_ANGLE)
+        {
+            // Scale radians to degrees.
+            m_valueMultiplier = RAD2DEG(1);
+            m_rangeMin = max(-360.0f, m_rangeMin);
+            m_rangeMax = min(360.0f, m_rangeMax);
+        }
+        else if (type == IVariable::DT_UIENUM)
+        {
+            m_pEnumDBItem = GetIEditor()->GetUIEnumsDatabase()->FindEnum(m_name);
+        }
+
+
+        const bool useExplicitStep = (pVar->GetFlags() & IVariable::UI_EXPLICIT_STEP);
+        if (!useExplicitStep)
+        {
+            // Limit step size to 1000.
+            int nPrec = max(3 - int(log(m_rangeMax - m_rangeMin) / log(10.f)), 0);
+            m_step = max(m_step, powf(10.f, -nPrec));
+        }
+    }
+
+    const char* GetName(int dataType)
+    {
+        for (int i = 0; i < NumPropertyTypes; i++)
+        {
+            if (dataType == s_propertyTypeNames[i].type)
+            {
+                return s_propertyTypeNames[i].name;
+            }
+        }
+
+        return "";
+    }
+
+    PropertyType GetType(int dataType)
+    {
+        for (int i = 0; i < NumPropertyTypes; i++)
+        {
+            if (dataType == s_propertyTypeNames[i].dataType)
+            {
+                return s_propertyTypeNames[i].type;
+            }
+        }
+
+        return ePropertyInvalid;
+    }
+
+    PropertyType GetType(const IVariable* var)
+    {
+        assert(var);
+        if (!var)
+        {
+            return ePropertyInvalid;
+        }
+
+        const int dataType = (int)var->GetDataType();
+
+        for (int i = 0; i < NumPropertyTypes; i++)
+        {
+            if (dataType == s_propertyTypeNames[i].dataType)
+            {
+                return s_propertyTypeNames[i].type;
+            }
+        }
+
+        return ePropertyInvalid;
+    }
+
+    PropertyType GetType(const char* type)
+    {
+        assert(type);
+        if (!type)
+        {
+            return ePropertyInvalid;
+        }
+
+        for (int i = 0; i < NumPropertyTypes; i++)
+        {
+            if (azstricmp(type, s_propertyTypeNames[i].name) == 0)
+            {
+                return s_propertyTypeNames[i].type;
+            }
+        }
+
+        return ePropertyInvalid;
+    }
+
+    // look up image by property type
+    int GetNumImages(int propertyType)
+    {
+        for (int i = 0; i < NumPropertyTypes; i++)
+        {
+            if (propertyType == s_propertyTypeNames[i].type)
+            {
+                return s_propertyTypeNames[i].image;
+            }
+        }
+
+        return -1;
+    }
+
+    // look up image by data type
+    int GetNumImages(const IVariable* var)
+    {
+        assert(var);
+        if (!var)
+        {
+            return -1;
+        }
+
+        const int dataType = (int)var->GetDataType();
+
+        for (int i = 0; i < NumPropertyTypes; i++)
+        {
+            if (dataType == s_propertyTypeNames[i].dataType)
+            {
+                return s_propertyTypeNames[i].image;
+            }
+        }
+
+        return -1;
+    }
+
+    int GetNumImages(const char* type)
+    {
+        assert(type);
+        if (!type)
+        {
+            return -1;
+        }
+
+        for (int i = 0; i < NumPropertyTypes; i++)
+        {
+            if (azstricmp(type, s_propertyTypeNames[i].name) == 0)
+            {
+                return s_propertyTypeNames[i].image;
+            }
+        }
+
+        return -1;
+    }
+
+    const char* GetPropertyTypeToResourceType(PropertyType type)
+    {
+        // The strings below are names used together with
+        // REGISTER_RESOURCE_SELECTOR. See IResourceSelector.h.
+        switch (type)
+        {
+        case ePropertyModel:
+            return "Model";
+        case ePropertyGeomCache:
+            return "GeomCache";
+        case ePropertyAudioTrigger:
+            return "AudioTrigger";
+        case ePropertyAudioSwitch:
+            return "AudioSwitch";
+        case ePropertyAudioSwitchState:
+            return "AudioSwitchState";
+        case ePropertyAudioRTPC:
+            return "AudioRTPC";
+        case ePropertyAudioEnvironment:
+            return "AudioEnvironment";
+        case ePropertyAudioPreloadRequest:
+            return "AudioPreloadRequest";
+        default:
+            return 0;
+        }
+    }
+}
diff --git a/Code/Editor/Util/VariablePropertyType.h b/Code/Editor/Util/VariablePropertyType.h
new file mode 100644
index 0000000000..7c1608ab06
--- /dev/null
+++ b/Code/Editor/Util/VariablePropertyType.h
@@ -0,0 +1,97 @@
+/*
+ * 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
+ *
+ */
+//! All possible property types.
+#ifndef CRYINCLUDE_EDITOR_UTIL_PROPERTYDEFINITION_H
+#define CRYINCLUDE_EDITOR_UTIL_PROPERTYDEFINITION_H
+#pragma once
+
+#include "Include/EditorCoreAPI.h"
+#include "Variable.h"
+
+enum PropertyType
+{
+    ePropertyInvalid = 0,
+    ePropertyTable = 1,
+    ePropertyBool = 2,
+    ePropertyInt,
+    ePropertyFloat,
+    ePropertyVector2,
+    ePropertyVector,
+    ePropertyVector4,
+    ePropertyString,
+    ePropertyColor,
+    ePropertyAngle,
+    ePropertyFloatCurve,
+    ePropertyColorCurve,
+    ePropertyFile,
+    ePropertyTexture,
+    ePropertyAnimation,
+    ePropertyModel,
+    ePropertySelection,
+    ePropertyList,
+    ePropertyShader,
+    ePropertyDeprecated2, // formerly ePropertyMaterial
+    ePropertyEquip,
+    ePropertyReverbPreset,
+    ePropertyLocalString,
+    ePropertyDeprecated0, // formerly ePropertyCustomAction
+    ePropertyGameToken,
+    ePropertySequence,
+    ePropertyMissionObj,
+    ePropertyUser,
+    ePropertySequenceId,
+    ePropertyLightAnimation,
+    ePropertyDeprecated1, // formerly ePropertyFlare
+    ePropertyParticleName,
+    ePropertyGeomCache,
+    ePropertyAudioTrigger,
+    ePropertyAudioSwitch,
+    ePropertyAudioSwitchState,
+    ePropertyAudioRTPC,
+    ePropertyAudioEnvironment,
+    ePropertyAudioPreloadRequest,
+    ePropertyFlowCustomData,
+    ePropertyUiElement,
+    ePropertyMotion
+};
+
+namespace Prop
+{
+    struct EDITOR_CORE_API Description
+    {
+        Description();
+        Description(IVariable* pVar);
+
+        PropertyType m_type;
+        int m_numImages;
+        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        IVarEnumListPtr m_enumList;
+        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        float m_rangeMin;
+        float m_rangeMax;
+        float m_step;
+        bool m_bHardMin;
+        bool m_bHardMax;
+        QString m_name;
+        float m_valueMultiplier;
+        CUIEnumsDatabase_SEnum* m_pEnumDBItem;
+    };
+
+    EDITOR_CORE_API const char* GetName(int dataType);
+
+    EDITOR_CORE_API PropertyType GetType(int dataType);
+    EDITOR_CORE_API PropertyType GetType(const IVariable* var);
+    EDITOR_CORE_API PropertyType GetType(const char* type);
+
+    EDITOR_CORE_API int GetNumImages(int dataType);
+    EDITOR_CORE_API int GetNumImages(const IVariable* var);
+    EDITOR_CORE_API int GetNumImages(const char* type);
+
+    EDITOR_CORE_API const char* GetPropertyTypeToResourceType(PropertyType type);
+}
+
+#endif // CRYINCLUDE_EDITOR_UTIL_PROPERTYDEFINITION_H
diff --git a/Code/Editor/Util/XmlArchive.cpp b/Code/Editor/Util/XmlArchive.cpp
new file mode 100644
index 0000000000..3447ff1e27
--- /dev/null
+++ b/Code/Editor/Util/XmlArchive.cpp
@@ -0,0 +1,144 @@
+/*
+ * 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 "XmlArchive.h"
+
+// Editor
+#include "PakFile.h"
+
+//////////////////////////////////////////////////////////////////////////
+// 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)
+{
+    _smart_ptr<IXmlStringData> pXmlStrData = root->getXMLData(5000000);
+
+    // Save xml file.
+    QString xmlFilename = "Level.editor_xml";
+    pakFile.UpdateFile(xmlFilename.toUtf8().data(), (void*)pXmlStrData->GetString(), pXmlStrData->GetStringLength());
+
+    if (pakFile.GetArchive())
+    {
+        CLogFile::FormatLine("Saving pak file %s", (const char*)pakFile.GetArchive()->GetFullPath());
+    }
+
+    pNamedData->Save(pakFile);
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlArchive::LoadFromPak(const QString& levelPath, CPakFile& pakFile)
+{
+    QString xmlFilename = QDir(levelPath).absoluteFilePath("Level.editor_xml");
+    root = XmlHelpers::LoadXmlFromFile(xmlFilename.toUtf8().data());
+    if (!root)
+    {
+        return false;
+    }
+
+    return pNamedData->Load(levelPath, pakFile);
+}
diff --git a/Code/Editor/Util/XmlArchive.h b/Code/Editor/Util/XmlArchive.h
new file mode 100644
index 0000000000..26707a78fa
--- /dev/null
+++ b/Code/Editor/Util/XmlArchive.h
@@ -0,0 +1,72 @@
+/*
+ * 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 : Stores XML in MFC archive.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_XMLARCHIVE_H
+#define CRYINCLUDE_EDITOR_UTIL_XMLARCHIVE_H
+#pragma once
+
+
+#include "NamedData.h"
+#include "EditorUtils.h"
+
+class CPakFile;
+/*!
+ *  CXmlArcive used to stores XML in MFC archive.
+ */
+class CXmlArchive
+{
+public:
+    XmlNodeRef  root;
+    CNamedData* pNamedData;
+    bool                bLoading;
+    bool                bOwnNamedData;
+
+    CXmlArchive()
+    {
+        bLoading = false;
+        bOwnNamedData = true;
+        pNamedData = new CNamedData;
+    };
+    explicit CXmlArchive(const QString& xmlRoot)
+    {
+        bLoading = false;
+        bOwnNamedData = true;
+        pNamedData = new CNamedData;
+        root = XmlHelpers::CreateXmlNode(xmlRoot.toUtf8().data());
+    };
+    ~CXmlArchive()
+    {
+        if (bOwnNamedData)
+        {
+            delete pNamedData;
+        }
+    };
+    CXmlArchive(const CXmlArchive& ar) { *this = ar; }
+    CXmlArchive& operator=(const CXmlArchive& ar)
+    {
+        root = ar.root;
+        pNamedData = ar.pNamedData;
+        bLoading = ar.bLoading;
+        bOwnNamedData = false;
+        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);
+    bool LoadFromPak(const QString& levelPath, CPakFile& pakFile);
+};
+
+
+#endif // CRYINCLUDE_EDITOR_UTIL_XMLARCHIVE_H
diff --git a/Code/Editor/Util/XmlHistoryManager.cpp b/Code/Editor/Util/XmlHistoryManager.cpp
new file mode 100644
index 0000000000..1a71015e4d
--- /dev/null
+++ b/Code/Editor/Util/XmlHistoryManager.cpp
@@ -0,0 +1,874 @@
+/*
+ * 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 "XmlHistoryManager.h"
+
+////////////////////////////////////////////////////////////////////////////
+SXmlHistory::SXmlHistory(CXmlHistoryManager* pManager, const XmlNodeRef& xmlBaseVersion, uint32 typeId)
+    : m_pManager(pManager)
+    , m_typeId(typeId)
+    , m_DeletedVersion(-1)
+    , m_SavedVersion(-1)
+{
+    int newVersionNumber = m_pManager->GetCurrentVersionNumber() + (m_pManager->IsPreparedForNextVersion() ? 1 : 0);
+    m_xmlVersionList[ newVersionNumber ] = xmlBaseVersion;
+}
+
+////////////////////////////////////////////////////////////////////////////
+void SXmlHistory::AddToHistory(const XmlNodeRef& newXmlVersion)
+{
+    int newVersionNumber = m_pManager->IncrementVersion(this);
+    m_xmlVersionList[ newVersionNumber ] = newXmlVersion;
+}
+
+////////////////////////////////////////////////////////////////////////////
+const XmlNodeRef& SXmlHistory::Undo(bool* bVersionExist)
+{
+    m_pManager->Undo();
+    return GetCurrentVersion(bVersionExist);
+}
+
+////////////////////////////////////////////////////////////////////////////
+const XmlNodeRef& SXmlHistory::Redo()
+{
+    m_pManager->Redo();
+    return GetCurrentVersion();
+}
+
+////////////////////////////////////////////////////////////////////////////
+const XmlNodeRef& SXmlHistory::GetCurrentVersion(bool* bVersionExist, int* iVersionNumber) const
+{
+    int currentVersion = m_pManager->GetCurrentVersionNumber();
+
+    TXmlVersionMap::const_iterator it = m_xmlVersionList.begin();
+    TXmlVersionMap::const_iterator previt = m_xmlVersionList.begin();
+    while (it != m_xmlVersionList.end())
+    {
+        if (it->first > currentVersion)
+        {
+            break;
+        }
+        previt = it;
+        ++it;
+    }
+
+    if (bVersionExist)
+    {
+        *bVersionExist = currentVersion >= m_xmlVersionList.begin()->first;
+    }
+    if (iVersionNumber)
+    {
+        *iVersionNumber = previt->first;
+    }
+
+    return previt->second;
+}
+
+////////////////////////////////////////////////////////////////////////////
+bool SXmlHistory::IsModified() const
+{
+    int currVersion;
+    GetCurrentVersion(NULL, &currVersion);
+    return m_SavedVersion != currVersion;
+}
+
+////////////////////////////////////////////////////////////////////////////
+void SXmlHistory::FlagAsDeleted()
+{
+    assert(m_pManager->IsPreparedForNextVersion());
+    m_DeletedVersion = m_pManager->GetCurrentVersionNumber() + 1;
+    m_SavedVersion = -1;
+}
+
+////////////////////////////////////////////////////////////////////////////
+void SXmlHistory::FlagAsSaved()
+{
+    if (Exist())
+    {
+        int currVersion;
+        GetCurrentVersion(NULL, &currVersion);
+        m_SavedVersion = currVersion;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+bool SXmlHistory::Exist() const
+{
+    //  int currentVersion = m_pManager->GetCurrentVersionNumber();
+    //  bool deleted = m_DeletedVersion != -1 && currentVersion >= m_DeletedVersion;
+    //  bool exist = currentVersion >= m_xmlVersionList.begin()->first;
+    //  return !deleted && exist;
+    int currentVersion = m_pManager->GetCurrentVersionNumber();
+    return currentVersion >= m_xmlVersionList.begin()->first && (m_DeletedVersion == -1 || currentVersion < m_DeletedVersion);
+}
+
+////////////////////////////////////////////////////////////////////////////
+void SXmlHistory::ClearRedo()
+{
+    int currentVersion = m_pManager->GetCurrentVersionNumber();
+    if (m_DeletedVersion > currentVersion + (m_pManager->IsPreparedForNextVersion() ? 1 : 0))
+    {
+        m_DeletedVersion = -1;
+    }
+    TXmlVersionMap::iterator it = m_xmlVersionList.begin();
+    for (; it != m_xmlVersionList.end(); ++it)
+    {
+        if (it->first > currentVersion)
+        {
+            break;
+        }
+    }
+    if (it != m_xmlVersionList.end())
+    {
+        ++it;
+        while (it != m_xmlVersionList.end())
+        {
+            m_xmlVersionList.erase(it++);
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+void SXmlHistory::ClearHistory(bool flagAsSaved)
+{
+    bool wasModified = !flagAsSaved && IsModified();
+    m_DeletedVersion = Exist() ? -1 : 0;
+    ClearRedo();
+    XmlNodeRef latest = m_xmlVersionList.rbegin()->second;
+    m_xmlVersionList.clear();
+    m_xmlVersionList[ 0 ] = latest;
+    m_SavedVersion = wasModified ? -1 : 0;
+}
+
+////////////////////////////////////////////////////////////////////////////
+SXmlHistoryGroup::SXmlHistoryGroup(CXmlHistoryManager* pManager, uint32 typeId)
+    : m_pManager(pManager)
+    , m_typeId(typeId)
+{
+}
+
+////////////////////////////////////////////////////////////////////////////
+SXmlHistory* SXmlHistoryGroup::GetHistory(int index) const
+{
+    THistoryList::const_iterator it = m_List.begin();
+    while (index > 0 && it != m_List.end())
+    {
+        ++it;
+        if ((*it)->Exist())
+        {
+            --index;
+        }
+    }
+    return it != m_List.end() ? *it : NULL;
+}
+
+////////////////////////////////////////////////////////////////////////////
+int SXmlHistoryGroup::GetHistoryCount() const
+{
+    int count = 0;
+    for (THistoryList::const_iterator it = m_List.begin(); it != m_List.end(); ++it)
+    {
+        if ((*it)->Exist())
+        {
+            count++;
+        }
+    }
+    return count;
+}
+
+////////////////////////////////////////////////////////////////////////////
+SXmlHistory* SXmlHistoryGroup::GetHistoryByTypeId(uint32 typeId, int index /*= 0*/) const
+{
+    for (int i = 0; i < GetHistoryCount(); ++i)
+    {
+        SXmlHistory* pHistory = GetHistory(i);
+        if (pHistory->GetTypeId() == typeId)
+        {
+            index--;
+        }
+        if (index == -1)
+        {
+            return pHistory;
+        }
+    }
+    return NULL;
+}
+
+////////////////////////////////////////////////////////////////////////////
+int SXmlHistoryGroup::GetHistoryCountByTypeId(uint32 typeId) const
+{
+    int res = 0;
+    for (int i = 0; i < GetHistoryCount(); ++i)
+    {
+        if (GetHistory(i)->GetTypeId() == typeId)
+        {
+            res++;
+        }
+    }
+    return res;
+}
+
+////////////////////////////////////////////////////////////////////////////
+int SXmlHistoryGroup::CreateXmlHistory(uint32 typeId, const XmlNodeRef& xmlBaseVersion)
+{
+    if (m_pManager)
+    {
+        m_List.push_back(m_pManager->CreateXmlHistory(typeId, xmlBaseVersion));
+        return m_List.size() - 1;
+    }
+    return -1;
+}
+
+////////////////////////////////////////////////////////////////////////////
+int SXmlHistoryGroup::GetHistoryIndex(const SXmlHistory* pHistory) const
+{
+    int index = 0;
+    for (THistoryList::const_iterator it = m_List.begin(); it != m_List.end(); ++it)
+    {
+        if (*it == pHistory)
+        {
+            return index;
+        }
+        index++;
+    }
+    return -1;
+}
+
+////////////////////////////////////////////////////////////////////////////
+CXmlHistoryManager::CXmlHistoryManager()
+    : m_CurrentVersion(0)
+    , m_LatestVersion(0)
+    , m_pExclusiveListener(NULL)
+    , m_RecordNextVersion(false)
+    , m_pExActiveGroup(NULL)
+    , m_bIsActiveGroupEx(false)
+{
+    m_pNullGroup = new SXmlHistoryGroup(this, (uint32) - 1);
+}
+
+CXmlHistoryManager::~CXmlHistoryManager()
+{
+    delete m_pNullGroup;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+bool CXmlHistoryManager::Undo()
+{
+    if (m_CurrentVersion > 0)
+    {
+        int prevVersion = m_CurrentVersion;
+        const SXmlHistoryGroup* pPrevCurrGroup = GetActiveGroup();
+        m_CurrentVersion--;
+        ReloadCurrentVersion(pPrevCurrGroup, prevVersion);
+        return true;
+    }
+    return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+bool CXmlHistoryManager::Redo()
+{
+    if (m_CurrentVersion < m_LatestVersion)
+    {
+        int prevVersion = m_CurrentVersion;
+        const SXmlHistoryGroup* pPrevCurrGroup = GetActiveGroup();
+        m_CurrentVersion++;
+        ReloadCurrentVersion(pPrevCurrGroup, prevVersion);
+        return true;
+    }
+    return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+bool CXmlHistoryManager::Goto(int historyNum)
+{
+    if (historyNum >= 0 && historyNum <= m_LatestVersion)
+    {
+        int prevVersion = m_CurrentVersion;
+        const SXmlHistoryGroup* pPrevCurrGroup = GetActiveGroup();
+        m_CurrentVersion = historyNum;
+        ReloadCurrentVersion(pPrevCurrGroup, prevVersion);
+        return true;
+    }
+    return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RecordUndo(IXmlUndoEventHandler* pEventHandler, const char* desc)
+{
+    ClearRedo();
+    SXmlHistory* pChangedXml = m_UndoEventHandlerMap[ pEventHandler ].CurrentData;
+    assert(pChangedXml);
+
+    XmlNodeRef newData = gEnv->pSystem->CreateXmlNode();
+#if !defined(NDEBUG)
+    bool bRes =
+#endif
+        pEventHandler->SaveToXml(newData);
+    assert(bRes);
+
+    TXmlHistotyGroupPtrList activeGroups = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
+
+    pChangedXml->AddToHistory(newData);
+    m_UndoEventHandlerMap[ pEventHandler ].HistoryData[ m_CurrentVersion ] = pChangedXml;
+    m_HistoryInfoMap[ m_CurrentVersion ].HistoryDescription = desc;
+    m_HistoryInfoMap[ m_CurrentVersion ].IsNullUndo = false;
+    m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups = activeGroups;
+    m_HistoryInfoMap[ m_CurrentVersion ].HistoryInvalidated = false;
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_VersionAdded);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::UndoEventHandlerDestroyed(IXmlUndoEventHandler* pEventHandler, uint32 typeId /*= 0*/, bool destoryForever /*= false*/)
+{
+    if (destoryForever)
+    {
+        UnregisterUndoEventHandler(pEventHandler);
+    }
+    else
+    {
+        m_InvalidHandlerMap[typeId] = pEventHandler;
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RestoreUndoEventHandler(IXmlUndoEventHandler* pEventHandler, uint32 typeId)
+{
+    TInvalidUndoEventListener::iterator it = m_InvalidHandlerMap.find(typeId);
+    if (it != m_InvalidHandlerMap.end())
+    {
+        IXmlUndoEventHandler* pLastHandler = it->second;
+        TUndoEventHandlerMap::iterator lastit = m_UndoEventHandlerMap.find(pLastHandler);
+        if (lastit != m_UndoEventHandlerMap.end())
+        {
+            m_UndoEventHandlerMap[pEventHandler] = lastit->second;
+            m_UndoEventHandlerMap.erase(lastit);
+        }
+        m_InvalidHandlerMap.erase(it);
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RegisterEventListener(IXmlHistoryEventListener* pEventListener)
+{
+    stl::push_back_unique(m_EventListener, pEventListener);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::UnregisterEventListener(IXmlHistoryEventListener* pEventListener)
+{
+    m_EventListener.remove(pEventListener);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::PrepareForNextVersion()
+{
+    assert(!m_RecordNextVersion);
+    m_RecordNextVersion = true;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RecordNextVersion(SXmlHistory* pHistory, XmlNodeRef newData, const char* undoDesc /*= NULL*/)
+{
+    assert(m_RecordNextVersion);
+    RegisterUndoEventHandler(this, pHistory);
+    m_newHistoryData = newData;
+    RecordUndo(this, undoDesc ? undoDesc : "<UNDEFINED>");
+    m_RecordNextVersion = false;
+    m_HistoryInfoMap[ m_CurrentVersion ].HistoryInvalidated = true;
+    UnregisterUndoEventHandler(this);
+    SetActiveGroupInt(GetActiveGroup());
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryInvalidate);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+bool CXmlHistoryManager::SaveToXml(XmlNodeRef& xmlNode)
+{
+    assert(m_newHistoryData);
+    xmlNode = m_newHistoryData;
+    return true;
+}
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::ClearHistory(bool flagAsSaved)
+{
+    TXmlHistotyGroupPtrList activeGropus = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
+    for (TXmlHistoryList::iterator it = m_XmlHistoryList.begin(); it != m_XmlHistoryList.end(); ++it)
+    {
+        it->ClearHistory(flagAsSaved);
+    }
+
+    SetActiveGroup(NULL);
+
+    m_CurrentVersion = 0;
+    m_LatestVersion = 0;
+
+    m_UndoEventHandlerMap.clear();
+    m_HistoryInfoMap.clear();
+
+    m_HistoryInfoMap[ 0 ].HistoryDescription = "New History";
+    m_HistoryInfoMap[ 0 ].ActiveGroups = activeGropus;
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryCleared);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+const string& CXmlHistoryManager::GetVersionDesc(int number) const
+{
+    THistoryInfoMap::const_iterator it = m_HistoryInfoMap.find(number);
+    if (it != m_HistoryInfoMap.end())
+    {
+        return it->second.HistoryDescription;
+    }
+
+    static string undef("UNDEFINED");
+    return undef;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RegisterView(IXmlHistoryView* pView)
+{
+    stl::push_back_unique(m_Views, pView);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::UnregisterView(IXmlHistoryView* pView)
+{
+    m_Views.remove(pView);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+SXmlHistoryGroup* CXmlHistoryManager::CreateXmlGroup(uint32 typeId)
+{
+    m_Groups.push_back(SXmlHistoryGroup(this, typeId));
+    return &(*m_Groups.rbegin());
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::AddXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc /*= NULL*/)
+{
+    RecordUndoInternal(undoDesc ? undoDesc : "New XML Group added");
+    m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups.push_back(pGroup);
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupAdded, (void*)pGroup);
+}
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc /*= NULL*/)
+{
+    bool unload = m_HistoryInfoMap[ m_CurrentVersion ].CurrGroup == pGroup;
+    RecordUndoInternal(undoDesc ? undoDesc : "XML Group deleted");
+    TXmlHistotyGroupPtrList& list = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
+    stl::find_and_erase(list, pGroup);
+    if (unload)
+    {
+        SetActiveGroupInt(NULL);
+    }
+    m_HistoryInfoMap[ m_CurrentVersion ].CurrGroup = m_pNullGroup;
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupRemoved, (void*)pGroup);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::SetActiveGroup(const SXmlHistoryGroup* pGroup, const char* displayName /*= NULL*/, const TGroupIndexMap& groupIndex /*= TGroupIndexMap()*/, bool setExternal /*= false*/)
+{
+    TGroupIndexMap userIndex;
+    const SXmlHistoryGroup* pActiveGroup = GetActiveGroup(userIndex);
+    if (pGroup != pActiveGroup || userIndex != groupIndex || setExternal)
+    {
+        const bool isEx = m_CurrentVersion != m_LatestVersion || setExternal;
+        m_pExActiveGroup = const_cast<SXmlHistoryGroup*>(pGroup);
+        m_ExCurrentIndex = groupIndex;
+        m_bIsActiveGroupEx = true;
+        SetActiveGroupInt(pGroup, displayName, !isEx, groupIndex);
+        m_bIsActiveGroupEx = isEx;
+    }
+}
+
+void CXmlHistoryManager::SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const char* displayName /*= NULL*/, bool bRecordNullUndo /*= false*/, const TGroupIndexMap& groupIndex /*= TGroupIndexMap()*/)
+{
+    UnloadInt();
+
+    TEventHandlerList eventHandler;
+    string undoDesc;
+
+    if (pGroup)
+    {
+        for (TViews::iterator it = m_Views.begin(); it != m_Views.end(); ++it)
+        {
+            IXmlHistoryView* pView = *it;
+
+            std::map<uint32, int> userIndexCount;
+
+            for (SXmlHistoryGroup::THistoryList::const_iterator history = pGroup->m_List.begin(); history != pGroup->m_List.end(); ++history)
+            {
+                std::map<uint32, int>::iterator it2 = userIndexCount.find((*history)->GetTypeId());
+                if (it2 == userIndexCount.end())
+                {
+                    userIndexCount[ (*history)->GetTypeId() ] = 0;
+                }
+                uint32 userindex = userIndexCount[ (*history)->GetTypeId() ];
+                IXmlUndoEventHandler* pEventHandler = NULL;
+                TGroupIndexMap::const_iterator indexIter = groupIndex.find((*history)->GetTypeId());
+                if (indexIter == groupIndex.end() || indexIter->second == userindex)
+                {
+                    if ((*history)->Exist())
+                    {
+                        if (pView->LoadXml((*history)->GetTypeId(), (*history)->GetCurrentVersion(), pEventHandler, userindex))
+                        {
+                            if (pEventHandler)
+                            {
+                                m_UndoHandlerViewMap[ pEventHandler ] = pView;
+                                RegisterUndoEventHandler(pEventHandler, *history);
+                                eventHandler.push_back(pEventHandler);
+                            }
+                        }
+                    }
+                }
+                if ((*history)->Exist())
+                {
+                    userIndexCount[ (*history)->GetTypeId() ]++;
+                }
+            }
+        }
+        undoDesc.Format("Changed View to \"%s\"", displayName ? displayName : "UNDEFINED");
+    }
+    else
+    {
+        undoDesc = "Unloaded Views";
+        for (TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.begin(); it != m_UndoEventHandlerMap.end(); ++it)
+        {
+            eventHandler.push_back(it->first);
+        }
+        pGroup = m_pNullGroup;
+    }
+
+    if (bRecordNullUndo)
+    {
+        RecordNullUndo(eventHandler, undoDesc.c_str());
+        m_HistoryInfoMap[ m_CurrentVersion ].CurrGroup = pGroup;
+        m_HistoryInfoMap[ m_CurrentVersion ].CurrUserIndex = groupIndex;
+    }
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupChanged);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+const SXmlHistoryGroup* CXmlHistoryManager::GetActiveGroup() const
+{
+    TGroupIndexMap userIndex;
+    return GetActiveGroup(userIndex);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+const SXmlHistoryGroup* CXmlHistoryManager::GetActiveGroup(TGroupIndexMap& currUserIndex /*out*/) const
+{
+    if (m_bIsActiveGroupEx)
+    {
+        currUserIndex = m_ExCurrentIndex;
+        return m_pExActiveGroup;
+    }
+
+    int currVersion = m_CurrentVersion;
+    do
+    {
+        THistoryInfoMap::const_iterator it = m_HistoryInfoMap.find(currVersion);
+        if (it != m_HistoryInfoMap.end())
+        {
+            const SXmlHistoryGroup* pGroup = it->second.CurrGroup;
+            if (it != m_HistoryInfoMap.end() && pGroup)
+            {
+                currUserIndex = it->second.CurrUserIndex;
+                return pGroup == m_pNullGroup ? NULL : pGroup;
+            }
+        }
+        currVersion--;
+    } while (currVersion >= 0);
+    return NULL;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+SXmlHistory* CXmlHistoryManager::CreateXmlHistory(uint32 typeId, const XmlNodeRef& xmlBaseVersion)
+{
+    m_XmlHistoryList.push_back(SXmlHistory(this, xmlBaseVersion, typeId));
+    return &(*m_XmlHistoryList.rbegin());
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::DeleteXmlHistory(const SXmlHistory* pXmlHistry)
+{
+    for (TXmlHistoryList::iterator it = m_XmlHistoryList.begin(); it != m_XmlHistoryList.end(); ++it)
+    {
+        if (&(*it) == pXmlHistry)
+        {
+            m_XmlHistoryList.erase(it);
+            return;
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::UnloadInt()
+{
+    for (TViews::iterator it = m_Views.begin(); it != m_Views.end(); ++it)
+    {
+        IXmlHistoryView* pView = *it;
+        pView->UnloadXml(-1);
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+namespace
+{
+    template< class T >
+    void ClearAfterVersion(T& container, int version)
+    {
+        auto foundit = container.end();
+        do
+        {
+            auto it = container.find(version);
+            if (it != container.end())
+            {
+                foundit = it;
+                break;
+            }
+            version--;
+        } while (version >= 0);
+        if (foundit != container.end())
+        {
+            for (auto it = ++foundit; it != container.end(); )
+            {
+                container.erase(it++);
+            }
+        }
+    }
+}
+
+void CXmlHistoryManager::ClearRedo()
+{
+    ClearAfterVersion(m_HistoryInfoMap, m_CurrentVersion);
+    for (TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.begin(); it != m_UndoEventHandlerMap.end(); ++it)
+    {
+        ClearAfterVersion(it->second.HistoryData, m_CurrentVersion);
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::DeleteAll()
+{
+    ClearHistory();
+    m_Groups.clear();
+    m_UndoEventHandlerMap.clear();
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryDeleted);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::FlagHistoryAsSaved()
+{
+    for (TXmlHistoryList::iterator it = m_XmlHistoryList.begin(); it != m_XmlHistoryList.end(); ++it)
+    {
+        it->FlagAsSaved();
+    }
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistorySaved);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RecordNullUndo(const TEventHandlerList& eventHandler, const char* desc, bool isNull /*= true*/)
+{
+    TXmlHistotyGroupPtrList activeGroups = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
+
+    // if current version is already null undo, overwrite it instead of create a new version
+    if (m_HistoryInfoMap[ m_CurrentVersion ].IsNullUndo && isNull)
+    {
+        assert(m_CurrentVersion);
+        m_CurrentVersion--;
+    }
+
+    ClearRedo();
+    IncrementVersion();
+
+    for (TEventHandlerList::const_iterator it = eventHandler.begin(); it != eventHandler.end(); ++it)
+    {
+        SXmlHistory* pChangedXml = m_UndoEventHandlerMap[ *it ].CurrentData;
+        m_UndoEventHandlerMap[ *it ].HistoryData[ m_CurrentVersion ] = pChangedXml;
+    }
+    m_HistoryInfoMap[ m_CurrentVersion ].HistoryDescription = desc;
+    m_HistoryInfoMap[ m_CurrentVersion ].IsNullUndo = isNull;
+    m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups = activeGroups;
+    m_HistoryInfoMap[ m_CurrentVersion ].HistoryInvalidated = false;
+    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_VersionAdded);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::ReloadCurrentVersion(const SXmlHistoryGroup* pPrevGroup, int prevVersion)
+{
+    m_bIsActiveGroupEx = false;
+    const SXmlHistoryGroup* pActiveGroup = GetActiveGroup();
+
+    bool bInvalidated = false;
+    int start = min(prevVersion, m_CurrentVersion);
+    int end = max(prevVersion, m_CurrentVersion);
+    for (int i = start; i <= end; ++i)
+    {
+        if (m_HistoryInfoMap[i].HistoryInvalidated)
+        {
+            bInvalidated = true;
+            break;
+        }
+    }
+
+    if (!bInvalidated && pPrevGroup == pActiveGroup)
+    {
+        for (TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.begin(); it != m_UndoEventHandlerMap.end(); ++it)
+        {
+            IXmlUndoEventHandler* pEventHandler = it->first;
+            if (!IsEventHandlerValid(pEventHandler))
+            {
+                assert(false);
+                continue;
+            }
+            SXmlHistory* pXmlHistory = GetLatestHistory(m_UndoEventHandlerMap[ pEventHandler ]);  /*m_UndoEventHandlerMap[ pEventHandler ].HistoryData[ m_CurrentVersion ];*/
+            if (pXmlHistory)
+            {
+                if (pXmlHistory->Exist())
+                {
+                    pEventHandler->ReloadFromXml(pXmlHistory->GetCurrentVersion());
+                }
+            }
+        }
+        NotifyUndoEventListener(IXmlHistoryEventListener::eHET_VersionChanged);
+    }
+    else
+    {
+        SetActiveGroupInt(pActiveGroup);
+    }
+
+    if (bInvalidated)
+    {
+        NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryInvalidate);
+    }
+
+    TXmlHistotyGroupPtrList oldActiveGroups = m_HistoryInfoMap[ prevVersion ].ActiveGroups;
+    TXmlHistotyGroupPtrList newActiveGroups = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
+
+    RemoveListFromList(newActiveGroups, oldActiveGroups);
+    RemoveListFromList(oldActiveGroups, m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups);
+
+    for (TXmlHistotyGroupPtrList::iterator it = newActiveGroups.begin(); it != newActiveGroups.end(); ++it)
+    {
+        NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupAdded, (void*) *it);
+    }
+
+    for (TXmlHistotyGroupPtrList::iterator it = oldActiveGroups.begin(); it != oldActiveGroups.end(); ++it)
+    {
+        NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupRemoved, (void*) *it);
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RemoveListFromList(TXmlHistotyGroupPtrList& list, const TXmlHistotyGroupPtrList& removeList)
+{
+    for (TXmlHistotyGroupPtrList::const_iterator rit = removeList.begin(); rit != removeList.end(); ++rit)
+    {
+        for (TXmlHistotyGroupPtrList::iterator it = list.begin(); it != list.end(); ++it)
+        {
+            if (*it == *rit)
+            {
+                list.erase(it);
+                break;
+            }
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+SXmlHistory* CXmlHistoryManager::GetLatestHistory(SUndoEventHandlerData& eventHandlerData)
+{
+    int currVersion = m_CurrentVersion;
+    do
+    {
+        THistoryVersionMap::iterator it = eventHandlerData.HistoryData.find(currVersion);
+        if (it != eventHandlerData.HistoryData.end())
+        {
+            return it->second;
+        }
+        currVersion--;
+    } while (currVersion >= 0);
+    return NULL;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::NotifyUndoEventListener(IXmlHistoryEventListener::EHistoryEventType event, void* pData)
+{
+    if (m_pExclusiveListener)
+    {
+        m_pExclusiveListener->OnEvent(event, pData);
+    }
+    else
+    {
+        for (TEventListener::iterator it = m_EventListener.begin(); it != m_EventListener.end(); ++it)
+        {
+            (*it)->OnEvent(event, pData);
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+int CXmlHistoryManager::IncrementVersion([[maybe_unused]] SXmlHistory* pXmlHistry)
+{
+    for (TXmlHistoryList::iterator it = m_XmlHistoryList.begin(); it != m_XmlHistoryList.end(); ++it)
+    {
+        it->ClearRedo();
+    }
+    return IncrementVersion();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+int CXmlHistoryManager::IncrementVersion()
+{
+    m_CurrentVersion++;
+    m_LatestVersion = m_CurrentVersion;
+    return m_CurrentVersion;
+}
+
+////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RegisterUndoEventHandler(IXmlUndoEventHandler* pEventHandler, SXmlHistory* pXmlData)
+{
+    m_UndoEventHandlerMap[ pEventHandler ].CurrentData = pXmlData;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::UnregisterUndoEventHandler(IXmlUndoEventHandler* pEventHandler)
+{
+    TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.find(pEventHandler);
+    if (it != m_UndoEventHandlerMap.end())
+    {
+        m_UndoEventHandlerMap.erase(it);
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+void CXmlHistoryManager::RecordUndoInternal(const char* desc)
+{
+    TEventHandlerList eventHandler;
+    for (TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.begin(); it != m_UndoEventHandlerMap.end(); ++it)
+    {
+        eventHandler.push_back(it->first);
+    }
+    RecordNullUndo(eventHandler, desc, false);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+bool CXmlHistoryManager::IsEventHandlerValid(IXmlUndoEventHandler* pEventHandler)
+{
+    for (TInvalidUndoEventListener::iterator it = m_InvalidHandlerMap.begin(); it != m_InvalidHandlerMap.end(); ++it)
+    {
+        if (it->second == pEventHandler)
+        {
+            return false;
+        }
+    }
+    return true;
+}
diff --git a/Code/Editor/Util/XmlHistoryManager.h b/Code/Editor/Util/XmlHistoryManager.h
new file mode 100644
index 0000000000..4983100ee1
--- /dev/null
+++ b/Code/Editor/Util/XmlHistoryManager.h
@@ -0,0 +1,217 @@
+/*
+ * 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_XMLHISTORYMANAGER_H
+#define CRYINCLUDE_EDITOR_UTIL_XMLHISTORYMANAGER_H
+#pragma once
+
+
+#include "IXmlHistoryManager.h"
+
+class CXmlHistoryManager;
+
+struct SXmlHistory
+{
+public:
+    SXmlHistory(CXmlHistoryManager* pManager, const XmlNodeRef& xmlBaseVersion, uint32 typeId);
+
+    void AddToHistory(const XmlNodeRef& newXmlVersion);
+
+    const XmlNodeRef& Undo(bool* bVersionExist = NULL);
+    const XmlNodeRef& Redo();
+    const XmlNodeRef& GetCurrentVersion(bool* bVersionExist = NULL, int* iVersionNumber = NULL) const;
+    bool IsModified() const;
+    uint32 GetTypeId() const {return m_typeId; }
+    void FlagAsDeleted();
+    void FlagAsSaved();
+    bool Exist() const;
+
+private:
+    friend class CXmlHistoryManager;
+
+    void ClearRedo();
+    void ClearHistory(bool flagAsSaved);
+
+private:
+    CXmlHistoryManager* m_pManager;
+    uint32 m_typeId;
+    int m_DeletedVersion;
+    int m_SavedVersion;
+
+    typedef std::map< int, XmlNodeRef > TXmlVersionMap;
+    TXmlVersionMap m_xmlVersionList;
+};
+
+
+struct SXmlHistoryGroup
+{
+    SXmlHistoryGroup(CXmlHistoryManager* pManager, uint32 typeId);
+
+    SXmlHistory* GetHistory(int index) const;
+    int GetHistoryCount() const;
+
+    SXmlHistory* GetHistoryByTypeId(uint32 typeId, int index = 0) const;
+    int GetHistoryCountByTypeId(uint32 typeId) const;
+
+    int CreateXmlHistory(uint32 typeId, const XmlNodeRef& xmlBaseVersion);
+    uint32 GetTypeId() const {return m_typeId; }
+
+    int GetHistoryIndex(const SXmlHistory* pHistory) const;
+
+private:
+    friend class CXmlHistoryManager;
+    CXmlHistoryManager* m_pManager;
+    uint32 m_typeId;
+
+    typedef std::list< SXmlHistory* > THistoryList;
+    THistoryList m_List;
+};
+
+typedef std::map<uint32, int> TGroupIndexMap;
+
+
+class CXmlHistoryManager
+    : public IXmlHistoryManager
+    , public IXmlUndoEventHandler
+{
+public:
+    CXmlHistoryManager();
+    ~CXmlHistoryManager();
+
+    // Undo/Redo
+    bool Undo();
+    bool Redo();
+    bool Goto(int historyNum);
+    void RecordUndo(IXmlUndoEventHandler* pEventHandler, const char* desc);
+    void UndoEventHandlerDestroyed(IXmlUndoEventHandler* pEventHandler, uint32 typeId = 0, bool destoryForever = false);
+    void RestoreUndoEventHandler(IXmlUndoEventHandler* pEventHandler, uint32 typeId);
+
+    void PrepareForNextVersion();
+    void RecordNextVersion(SXmlHistory* pHistory, XmlNodeRef newData, const char* undoDesc = NULL);
+    bool IsPreparedForNextVersion() const {return m_RecordNextVersion; }
+
+    void RegisterEventListener(IXmlHistoryEventListener* pEventListener);
+    void UnregisterEventListener(IXmlHistoryEventListener* pEventListener);
+    void SetExclusiveListener(IXmlHistoryEventListener* pEventListener) { m_pExclusiveListener = pEventListener; }
+
+    // History
+    void ClearHistory(bool flagAsSaved = false);
+    int GetVersionCount() const { return m_LatestVersion; }
+    const string& GetVersionDesc(int number) const;
+    int GetCurrentVersionNumber() const { return m_CurrentVersion; }
+
+    // Views
+    void RegisterView(IXmlHistoryView* pView);
+    void UnregisterView(IXmlHistoryView* pView);
+
+    // Xml History Groups
+    SXmlHistoryGroup* CreateXmlGroup(uint32 typeId);
+    void SetActiveGroup(const SXmlHistoryGroup* pGroup, const char* displayName = NULL, const TGroupIndexMap& groupIndex = TGroupIndexMap(), bool setExternal = false);
+    const SXmlHistoryGroup* GetActiveGroup() const;
+    const SXmlHistoryGroup* GetActiveGroup(TGroupIndexMap& currUserIndex /*out*/) const;
+    void AddXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc = NULL);
+    void RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc = NULL);
+
+    void DeleteAll();
+
+    void FlagHistoryAsSaved();
+
+    virtual bool SaveToXml(XmlNodeRef& xmlNode);
+    virtual bool LoadFromXml([[maybe_unused]] const XmlNodeRef& xmlNode) { return false; };
+    virtual bool ReloadFromXml([[maybe_unused]] const XmlNodeRef& xmlNode) { return false; };
+
+private:
+    typedef std::list< SXmlHistory > TXmlHistoryList;
+    TXmlHistoryList m_XmlHistoryList;
+    int m_CurrentVersion;
+    int m_LatestVersion;
+    SXmlHistoryGroup* m_pNullGroup; // hack for unload view ...
+    XmlNodeRef m_newHistoryData;
+    bool m_RecordNextVersion;
+    bool m_bIsActiveGroupEx;
+    SXmlHistoryGroup* m_pExActiveGroup;
+    TGroupIndexMap m_ExCurrentIndex;
+
+    typedef std::list< SXmlHistoryGroup > TXmlHistotyGroupList;
+    TXmlHistotyGroupList m_Groups;
+
+    // event listener
+    typedef std::list< IXmlHistoryEventListener* > TEventListener;
+    TEventListener m_EventListener;
+    IXmlHistoryEventListener* m_pExclusiveListener;
+
+    // views
+    typedef std::list< IXmlHistoryView* > TViews;
+    TViews m_Views;
+
+    typedef std::list< const SXmlHistoryGroup* > TXmlHistotyGroupPtrList;
+    // history
+    struct SHistoryInfo
+    {
+        SHistoryInfo()
+            : IsNullUndo(false)
+            , CurrGroup(NULL)
+            , HistoryInvalidated(false) {}
+
+        const SXmlHistoryGroup* CurrGroup;
+        TGroupIndexMap CurrUserIndex;
+        string HistoryDescription;
+        bool IsNullUndo;
+        bool HistoryInvalidated;
+        TXmlHistotyGroupPtrList ActiveGroups;
+    };
+    typedef std::map< int, SHistoryInfo > THistoryInfoMap;
+    THistoryInfoMap m_HistoryInfoMap;
+
+    // undo event handler
+    typedef std::map< int, SXmlHistory* > THistoryVersionMap;
+    struct SUndoEventHandlerData
+    {
+        SUndoEventHandlerData()
+            : CurrentData(NULL) {}
+
+        SXmlHistory* CurrentData;
+        THistoryVersionMap HistoryData;
+    };
+    typedef std::map< IXmlUndoEventHandler*, SUndoEventHandlerData > TUndoEventHandlerMap;
+    TUndoEventHandlerMap m_UndoEventHandlerMap;
+
+    typedef std::map< IXmlUndoEventHandler*, IXmlHistoryView* > TUndoHandlerViewMap;
+    TUndoHandlerViewMap m_UndoHandlerViewMap;
+
+    typedef std::map< uint32, IXmlUndoEventHandler* > TInvalidUndoEventListener;
+    TInvalidUndoEventListener m_InvalidHandlerMap;
+
+private:
+    friend struct SXmlHistory;
+    friend struct SXmlHistoryGroup;
+
+    int IncrementVersion(SXmlHistory* pXmlHistry);
+    int IncrementVersion();
+    SXmlHistory* CreateXmlHistory(uint32 typeId, const XmlNodeRef& xmlBaseVersion);
+    void DeleteXmlHistory(const SXmlHistory* pXmlHistry);
+
+    void RegisterUndoEventHandler(IXmlUndoEventHandler* pEventHandler, SXmlHistory* pXmlData);
+    void UnregisterUndoEventHandler(IXmlUndoEventHandler* pEventHandler);
+    typedef std::list< IXmlUndoEventHandler* > TEventHandlerList;
+    void RecordNullUndo(const TEventHandlerList& eventHandler, const char* desc, bool isNull = true);
+    void ReloadCurrentVersion(const SXmlHistoryGroup* pPrevGroup, int prevVersion);
+    SXmlHistory* GetLatestHistory(SUndoEventHandlerData& eventHandlerData);
+    void NotifyUndoEventListener(IXmlHistoryEventListener::EHistoryEventType event, void* pData = NULL);
+
+    void SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const char* displayName = NULL, bool bRecordNullUndo = false, const TGroupIndexMap& groupIndex = TGroupIndexMap());
+    void UnloadInt();
+    void ClearRedo();
+
+    void RecordUndoInternal(const char* desc);
+    void RemoveListFromList(TXmlHistotyGroupPtrList& list, const TXmlHistotyGroupPtrList& removeList);
+
+    bool IsEventHandlerValid(IXmlUndoEventHandler* pEventHandler);
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_XMLHISTORYMANAGER_H
diff --git a/Code/Editor/Util/XmlTemplate.cpp b/Code/Editor/Util/XmlTemplate.cpp
new file mode 100644
index 0000000000..fa5269ea1a
--- /dev/null
+++ b/Code/Editor/Util/XmlTemplate.cpp
@@ -0,0 +1,223 @@
+/*
+ * 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 : CXmlTemplate implementation.
+
+#include "EditorDefs.h"
+
+#include "XmlTemplate.h"
+
+//////////////////////////////////////////////////////////////////////////
+// CXmlTemplate implementation
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTemplate::GetValues(XmlNodeRef& node, const XmlNodeRef& fromNode)
+{
+    assert(node != 0 && fromNode != 0);
+
+    if (!node)
+    {
+        gEnv->pLog->LogError("CXmlTemplate::GetValues invalid node. Possible problems with Editor folder.");
+        return;
+    }
+
+    for (int i = 0; i < node->getChildCount(); i++)
+    {
+        XmlNodeRef prop = node->getChild(i);
+
+        if (prop->getChildCount() == 0)
+        {
+            QString value;
+            if (fromNode->getAttr(prop->getTag(), value))
+            {
+                prop->setAttr("Value", value.toUtf8().data());
+            }
+        }
+        else
+        {
+            // Have childs.
+            XmlNodeRef fromNodeChild = fromNode->findChild(prop->getTag());
+            if (fromNodeChild)
+            {
+                CXmlTemplate::GetValues(prop, fromNodeChild);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTemplate::SetValues(const XmlNodeRef& node, XmlNodeRef& toNode)
+{
+    assert(node != 0 && toNode != 0);
+
+    toNode->removeAllAttributes();
+    toNode->removeAllChilds();
+
+    assert(node);
+    if (!node)
+    {
+        gEnv->pLog->LogError("CXmlTemplate::SetValues invalid node. Possible problems with Editor folder.");
+        return;
+    }
+
+    for (int i = 0; i < node->getChildCount(); i++)
+    {
+        XmlNodeRef prop = node->getChild(i);
+        if (prop)
+        {
+            if (prop->getChildCount() > 0)
+            {
+                XmlNodeRef childToNode = toNode->newChild(prop->getTag());
+                if (childToNode)
+                {
+                    CXmlTemplate::SetValues(prop, childToNode);
+                }
+            }
+            else
+            {
+                QString value;
+                prop->getAttr("Value", value);
+                toNode->setAttr(prop->getTag(), value.toUtf8().data());
+            }
+        }
+        else
+        {
+            assert(!"NULL returned from node->GetChild()");
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlTemplate::SetValues(const XmlNodeRef& node, XmlNodeRef& toNode, const XmlNodeRef& modifiedNode)
+{
+    assert(node != 0 && toNode != 0 && modifiedNode != 0);
+
+    for (int i = 0; i < node->getChildCount(); i++)
+    {
+        XmlNodeRef prop = node->getChild(i);
+        if (prop)
+        {
+            if (prop->getChildCount() > 0)
+            {
+                XmlNodeRef childToNode = toNode->findChild(prop->getTag());
+                if (childToNode)
+                {
+                    if (CXmlTemplate::SetValues(prop, childToNode, modifiedNode))
+                    {
+                        return true;
+                    }
+                }
+            }
+            else if (prop == modifiedNode)
+            {
+                QString value;
+                prop->getAttr("Value", value);
+                toNode->setAttr(prop->getTag(), value.toUtf8().data());
+                return true;
+            }
+        }
+        else
+        {
+            assert(!"NULL returned from node->GetChild()");
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTemplate::AddParam(XmlNodeRef& templ, const char* sName, bool value)
+{
+    XmlNodeRef param = templ->newChild(sName);
+    param->setAttr("type", "Bool");
+    param->setAttr("value", value);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTemplate::AddParam(XmlNodeRef& templ, const char* sName, int value, int min, int max)
+{
+    XmlNodeRef param = templ->newChild(sName);
+    param->setAttr("type", "Int");
+    param->setAttr("value", value);
+    param->setAttr("min", min);
+    param->setAttr("max", max);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTemplate::AddParam(XmlNodeRef& templ, const char* sName, float value, float min, float max)
+{
+    XmlNodeRef param = templ->newChild(sName);
+    param->setAttr("type", "Float");
+    param->setAttr("value", value);
+    param->setAttr("min", min);
+    param->setAttr("max", max);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTemplate::AddParam(XmlNodeRef& templ, const char* sName, const char* sValue)
+{
+    XmlNodeRef param = templ->newChild(sName);
+    param->setAttr("type", "String");
+    param->setAttr("value", sValue);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+//
+// CXmlTemplateRegistry implementation
+//
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+CXmlTemplateRegistry::CXmlTemplateRegistry()
+{}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTemplateRegistry::LoadTemplates(const QString& path)
+{
+    m_templates.Clear();
+
+    QString dir = Path::AddPathSlash(path);
+
+    IFileUtil::FileArray files;
+    CFileUtil::ScanDirectory(dir, "*.xml", files, false);
+
+    for (int k = 0; k < files.size(); k++)
+    {
+        XmlNodeRef child;
+        // Construct the full filepath of the current file
+        XmlNodeRef node = XmlHelpers::LoadXmlFromFile((dir + files[k].filename).toUtf8().data());
+        if (node != 0 && node->isTag("Templates"))
+        {
+            QString name;
+            for (int i = 0; i < node->getChildCount(); i++)
+            {
+                child = node->getChild(i);
+                AddTemplate(child->getTag(), child);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTemplateRegistry::AddTemplate(const QString& name, XmlNodeRef& tmpl)
+{
+    m_templates[name] = tmpl;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CXmlTemplateRegistry::FindTemplate(const QString& name)
+{
+    XmlNodeRef node;
+    if (m_templates.Find(name, node))
+    {
+        return node;
+    }
+    return 0;
+}
diff --git a/Code/Editor/Util/XmlTemplate.h b/Code/Editor/Util/XmlTemplate.h
new file mode 100644
index 0000000000..061a9d9ead
--- /dev/null
+++ b/Code/Editor/Util/XmlTemplate.h
@@ -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
+ *
+ */
+
+
+// Description : CXmlTemplate declaration.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_XMLTEMPLATE_H
+#define CRYINCLUDE_EDITOR_UTIL_XMLTEMPLATE_H
+#pragma once
+
+
+/*!
+ *  CXmlTemplate is XML base template of parameters.
+ *
+ */
+class CXmlTemplate
+{
+public:
+    //! Scans properties of XML template,
+    //! for each property try to find corresponding attribute in specified XML node, and copy
+    //! value to Value attribute of template.
+    static void GetValues(XmlNodeRef& templateNode, const XmlNodeRef& fromNode);
+
+    //! Scans properties of XML template, fetch Value attribute of each and put as Attribute in
+    //! specified XML node.
+    static void SetValues(const XmlNodeRef& templateNode, XmlNodeRef& toNode);
+    static bool SetValues(const XmlNodeRef& templateNode, XmlNodeRef& toNode, const XmlNodeRef& modifiedNode);
+
+    //! Add parameter to template.
+    static void AddParam(XmlNodeRef& templ, const char* paramName, bool value);
+    static void AddParam(XmlNodeRef& templ, const char* paramName, int value, int min = 0, int max = 10000);
+    static void AddParam(XmlNodeRef& templ, const char* paramName, float value, float min = -10000, float max = 10000);
+    static void AddParam(XmlNodeRef& templ, const char* paramName, const char* sValue);
+};
+
+/*!
+ *  CXmlTemplateRegistry is a collection of all registred templates.
+ */
+class CXmlTemplateRegistry
+{
+public:
+    CXmlTemplateRegistry();
+
+    void LoadTemplates(const QString& path);
+    void AddTemplate(const QString& name, XmlNodeRef& tmpl);
+
+    XmlNodeRef FindTemplate(const QString& name);
+
+private:
+    StdMap<QString, XmlNodeRef> m_templates;
+};
+
+#endif // CRYINCLUDE_EDITOR_UTIL_XMLTEMPLATE_H
diff --git a/Code/Editor/Util/bitarray.h b/Code/Editor/Util/bitarray.h
new file mode 100644
index 0000000000..73628d6dd9
--- /dev/null
+++ b/Code/Editor/Util/bitarray.h
@@ -0,0 +1,334 @@
+/*
+ * 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 : Array of m_bits.
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_BITARRAY_H
+#define CRYINCLUDE_EDITOR_UTIL_BITARRAY_H
+#pragma once
+
+
+//////////////////////////////////////////////////////////////////////////
+//
+// CBitArray is similar to std::vector but faster to clear.
+//
+//////////////////////////////////////////////////////////////////////////
+class CBitArray
+{
+public:
+    struct BitReference
+    {
+        uint32* p;
+        uint32 mask;
+        BitReference(uint32* __x, uint32 __y)
+            : p(__x)
+            , mask(__y) {}
+
+
+    public:
+        BitReference()
+            : p(0)
+            , mask(0) {}
+
+        operator bool() const {
+            return !(!(*p & mask));
+        }
+        BitReference& operator=(bool __x)
+        {
+            if (__x)
+            {
+                * p |= mask;
+            }
+            else
+            {
+                * p &= ~mask;
+            }
+            return *this;
+        }
+        BitReference& operator=(const BitReference& __x) { return *this = bool(__x);  }
+        bool operator==(const BitReference& __x) const { return bool(*this) == bool(__x); }
+        bool operator<(const BitReference& __x) const { return !bool(*this) && bool(__x);   }
+        BitReference& operator |= (bool __x)
+        {
+            if (__x)
+            {
+                * p |= mask;
+            }
+            return *this;
+        }
+        BitReference& operator &= (bool __x)
+        {
+            if (!__x)
+            {
+                * p &= ~mask;
+            }
+            return *this;
+        }
+        void flip() {* p ^= mask; }
+    };
+
+    CBitArray() { m_base = NULL; m_bits = NULL; m_size = 0; m_numBits = 0; };
+    CBitArray(int numBits)    { resize(numBits); };
+    ~CBitArray()
+    {
+        if (m_base)
+        {
+            free(m_base);
+        }
+    };
+
+    void    resize(int c)
+    {
+        m_numBits = c;
+        int newSize = ((c + 63) & (~63)) >> 5;
+        if (newSize > m_size)
+        {
+            Alloc(newSize);
+        }
+    }
+    int size() const { return m_numBits; };
+    bool empty() const { return m_numBits == 0; };
+
+    //////////////////////////////////////////////////////////////////////////
+    void set()
+    {
+        memset(m_bits, 0xFFFFFFFF, m_size * sizeof(uint32));  // Set all bits.
+    }
+    //////////////////////////////////////////////////////////////////////////
+    void set(int numBits)
+    {
+        int num = (numBits >> 3) + 1;
+        if (num > (m_size * sizeof(uint32)))
+        {
+            num = m_size * sizeof(uint32);
+        }
+        memset(m_bits, 0xFFFFFFFF, num);    // Reset num bits.
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void clear()
+    {
+        memset(m_bits, 0, m_size * sizeof(uint32));   // Reset all bits.
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void    clear(int numBits)
+    {
+        int num = (numBits >> 3) + 1;
+        if (num > (m_size * sizeof(uint32)))
+        {
+            num = m_size * sizeof(uint32);
+        }
+        memset(m_bits, 0, num); // Reset num bits.
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Check if all bits are 0.
+    bool is_zero() const
+    {
+        for (int i = 0; i < m_size; i++)
+        {
+            if (m_bits[i] != 0)
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // Count number of set bits.
+    int count_bits()    const
+    {
+        int c = 0;
+        for (int i = 0; i < m_size; i++)
+        {
+            uint32 v = m_bits[i];
+            for (int j = 0; j < 32; j++)
+            {
+                if (v & (1 << (j & 0x1F)))
+                {
+                    c++;                        // if bit set increase bit count.
+                }
+            }
+        }
+        return c;
+    }
+
+    BitReference operator[](int pos) { return BitReference(&m_bits[index(pos)], shift(pos)); }
+    const BitReference operator[](int pos) const { return BitReference(&m_bits[index(pos)], shift(pos)); }
+
+    //////////////////////////////////////////////////////////////////////////
+    void swap(CBitArray& bitarr)
+    {
+        std::swap(m_base, bitarr.m_base);
+        std::swap(m_bits, bitarr.m_bits);
+        std::swap(m_size, bitarr.m_size);
+    }
+
+    CBitArray&  operator =(const CBitArray& b)
+    {
+        if (m_size != b.m_size)
+        {
+            Alloc(b.m_size);
+        }
+        memcpy(m_bits, b.m_bits, m_size * sizeof(uint32));
+        return *this;
+    }
+
+    bool    checkByte(int pos) const {    return reinterpret_cast<char*>(m_bits)[pos] != 0; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Compresses this bit array into the specified one.
+    // Uses run length encoding compression.
+    void    compress(CBitArray& b) const
+    {
+        int i, countz, compsize, bsize;
+        char* out;
+        char* in;
+
+        bsize = m_size * 4;
+        compsize = 0;
+        in = (char*)m_bits;
+        for (i = 0; i < bsize; i++)
+        {
+            compsize++;
+            if (in[i] == 0)
+            {
+                countz = 1;
+                while (++i < bsize)
+                {
+                    if (in[i] == 0 && countz != 255)
+                    {
+                        countz++;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+                i--;
+                compsize++;
+            }
+        }
+        b.resize((compsize + 1) << 3);
+        out = (char*)b.m_bits;
+        in = (char*)m_bits;
+        *out++ = bsize;
+        for (i = 0; i < bsize; i++)
+        {
+            *out++ = in[i];
+            if (in[i] == 0)
+            {
+                countz = 1;
+                while (++i < bsize)
+                {
+                    if (in[i] == 0 && countz != 255)
+                    {
+                        countz++;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+                i--;
+                *out++ = countz;
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Decompress specified bit array in to this one.
+    // Uses run length encoding compression.
+    void    decompress(CBitArray& b)
+    {
+        int raw, decompressed, c;
+        char* out, * in;
+
+        in = (char*)m_bits;
+        out = (char*)b.m_bits;
+        decompressed = 0;
+        raw = *in++;
+        while (decompressed < raw)
+        {
+            if (*in != 0)
+            {
+                *out++ = *in++;
+                decompressed++;
+            }
+            else
+            {
+                in++;
+                c = *in++;
+                decompressed += c;
+                while (c)
+                {
+                    *out++ = 0;
+                    c--;
+                }
+                ;
+            }
+        }
+        m_numBits = decompressed;
+    }
+
+    void    CopyFromMem(const char* src, int size)
+    {
+        Alloc(size);
+        memcpy(m_bits, src, size);
+    }
+    int     CopyToMem(char* trg)
+    {
+        memcpy(trg, m_bits, m_size);
+        return m_size;
+    }
+
+private:
+    void* m_base;
+    uint32* m_bits;
+    int     m_size;
+    int     m_numBits;
+
+    void    Alloc(int s)
+    {
+        if (m_base)
+        {
+            free(m_base);
+        }
+        m_size = s;
+        m_base = (char*)malloc(m_size * sizeof(uint32) + 32);
+        m_bits = (uint32*)(((UINT_PTR)m_base + 31) & (~31));    // align by 32.
+        memset(m_bits, 0, m_size * sizeof(uint32));   // Reset all bits.
+    }
+    uint32  shift(int pos) const
+    {
+        return (1 << (pos & 0x1F));
+    }
+    uint32  index(int pos) const
+    {
+        return pos >> 5;
+    }
+
+    friend  int concatBitarray(CBitArray& b1, CBitArray& b2, CBitArray& test, CBitArray& res);
+};
+
+inline  int concatBitarray(CBitArray& b1, CBitArray& b2, CBitArray& test, CBitArray& res)
+{
+    unsigned int b, any;
+    any = 0;
+    for (int i = 0; i < b1.size(); i++)
+    {
+        b = b1.m_bits[i] & b2.m_bits[i];
+        any |= (b & (~test.m_bits[i])); // test if any different from test(i) bit set.
+        res.m_bits[i] = b;
+    }
+    return any;
+}
+
+#endif // CRYINCLUDE_EDITOR_UTIL_BITARRAY_H
diff --git a/Code/Editor/Util/fastlib.h b/Code/Editor/Util/fastlib.h
new file mode 100644
index 0000000000..832982d879
--- /dev/null
+++ b/Code/Editor/Util/fastlib.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_FASTLIB_H
+#define CRYINCLUDE_EDITOR_UTIL_FASTLIB_H
+#pragma once
+
+__forceinline int RoundFloatToInt(float fValue)
+{
+    return (int)(fValue + 0.5f);
+}
+
+__forceinline int __stdcall FloatToIntRet(float fValue)
+{
+    return (int)(fValue + 0.5f);
+}
+
+__forceinline int ftoi(float fValue)
+{
+    return (int)(fValue);
+}
+
+__forceinline unsigned int __stdcall ifloor(float fValue)
+{
+    return ftoi(floor(fValue));
+}
+
+#endif // CRYINCLUDE_EDITOR_UTIL_FASTLIB_H
diff --git a/Code/Editor/Util/smartptr.h b/Code/Editor/Util/smartptr.h
new file mode 100644
index 0000000000..6f3ed6fe31
--- /dev/null
+++ b/Code/Editor/Util/smartptr.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_EDITOR_UTIL_SMARTPTR_H
+#define CRYINCLUDE_EDITOR_UTIL_SMARTPTR_H
+#pragma once
+
+#include <CryCommon/smartptr.h>
+
+#define TSmartPtr _smart_ptr
+
+/** Use this to define smart pointers of classes.
+        For example:
+        class CNode : public CRefCountBase {};
+        SMARTPTRTypeYPEDEF( CNode );
+        {
+            CNodePtr node; // Smart pointer.
+        }
+*/
+
+#define SMARTPTR_TYPEDEF(Class) typedef TSmartPtr<Class> Class##Ptr
+
+#endif // CRYINCLUDE_EDITOR_UTIL_SMARTPTR_H
diff --git a/Code/Editor/ViewManager.cpp b/Code/Editor/ViewManager.cpp
new file mode 100644
index 0000000000..5ce7f5490e
--- /dev/null
+++ b/Code/Editor/ViewManager.cpp
@@ -0,0 +1,300 @@
+/*
+ * 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 : implementation of the CViewManager class.
+
+
+#include "EditorDefs.h"
+
+#include "ViewManager.h"
+
+// AzCore
+#include <AzCore/std/smart_ptr/make_shared.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
+
+// Editor
+#include "Settings.h"
+#include "MainWindow.h"
+#include "LayoutWnd.h"
+#include "2DViewport.h"
+#include "TopRendererWnd.h"
+#include "RenderViewport.h"
+#include "EditorViewportWidget.h"
+#include "CryEditDoc.h"
+
+#include <AzCore/Console/IConsole.h>
+
+AZ_CVAR(bool, ed_useAtomNativeViewport, true, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Atom-native Editor viewport (experimental, not yet stable");
+
+bool CViewManager::IsMultiViewportEnabled()
+{
+    // Enable multi-viewport for legacy renderer, or if we're using the new fully Atom-native viewport
+    return ed_useAtomNativeViewport;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+CViewManager::CViewManager()
+{
+    m_zoomFactor = 1;
+
+    m_origin2D(0, 0, 0);
+    m_zoom2D = 1.0f;
+
+    m_cameraObjectId = GUID_NULL;
+
+    m_updateRegion.min = Vec3(-100000, -100000, -100000);
+    m_updateRegion.max = Vec3(100000, 100000, 100000);
+
+    m_pSelectedView = NULL;
+
+    m_nGameViewports = 0;
+    m_bGameViewportsUpdated = false;
+
+    QtViewOptions viewportOptions;
+    viewportOptions.paneRect = QRect(0, 0, 400, 400);
+    viewportOptions.canHaveMultipleInstances = true;
+
+    viewportOptions.viewportType = ET_ViewportXY;
+    RegisterQtViewPane<C2DViewport_XY>(GetIEditor(), "Top", LyViewPane::CategoryViewport, viewportOptions);
+
+    viewportOptions.viewportType = ET_ViewportXZ;
+    RegisterQtViewPane<C2DViewport_XZ>(GetIEditor(), "Front", LyViewPane::CategoryViewport, viewportOptions);
+
+    viewportOptions.viewportType = ET_ViewportYZ;
+    RegisterQtViewPane<C2DViewport_YZ>(GetIEditor(), "Left", LyViewPane::CategoryViewport, viewportOptions);
+
+    viewportOptions.viewportType = ET_ViewportCamera;
+    if (ed_useAtomNativeViewport)
+    {
+        RegisterQtViewPaneWithName<EditorViewportWidget>(GetIEditor(), "Perspective", LyViewPane::CategoryViewport, viewportOptions);
+    }
+    else
+    {
+        RegisterQtViewPaneWithName<CRenderViewport>(GetIEditor(), "Perspective", LyViewPane::CategoryViewport, viewportOptions);
+    }
+
+    viewportOptions.viewportType = ET_ViewportMap;
+    RegisterQtViewPane<QTopRendererWnd>(GetIEditor(), "Map", LyViewPane::CategoryViewport, viewportOptions);
+
+    GetIEditor()->RegisterNotifyListener(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CViewManager::~CViewManager()
+{
+    GetIEditor()->UnregisterNotifyListener(this);
+
+    m_viewports.clear();
+}
+
+void CViewManager::ReleaseView(CViewport* pViewport)
+{
+    pViewport->DestroyWindow();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::RegisterViewport(CViewport* pViewport)
+{
+    pViewport->SetViewManager(this);
+    m_viewports.push_back(pViewport);
+
+    // the type of added viewport can be changed later
+    m_bGameViewportsUpdated = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::UnregisterViewport(CViewport* pViewport)
+{
+    if (m_pSelectedView == pViewport)
+    {
+        m_pSelectedView = NULL;
+    }
+    stl::find_and_erase(m_viewports, pViewport);
+    m_bGameViewportsUpdated = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CViewport* CViewManager::GetViewport(EViewportType type) const
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Returns the first view which has a render window of a specific
+    // type attached
+    ////////////////////////////////////////////////////////////////////////
+    for (int i = 0; i < m_viewports.size(); i++)
+    {
+        if (m_viewports[i]->GetType() == type)
+        {
+            return m_viewports[i];
+        }
+    }
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CViewport* CViewManager::GetViewport(const QString& name) const
+{
+    for (int i = 0; i < m_viewports.size(); i++)
+    {
+        if (QString::compare(m_viewports[i]->GetName(), name, Qt::CaseInsensitive) == 0)
+        {
+            return m_viewports[i];
+        }
+    }
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::SetZoomFactor(float zoom)
+{
+    m_zoomFactor = zoom;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::UpdateViews(int flags)
+{
+    // Update each attached view,
+    for (int i = 0; i < m_viewports.size(); i++)
+    {
+        m_viewports[i]->UpdateContent(flags);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::ResetViews()
+{
+    // Reset each attached view,
+    for (int i = 0; i < m_viewports.size(); i++)
+    {
+m_viewports[i]->ResetContent();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::IdleUpdate()
+{
+    // Update each attached view,
+    for (int i = 0; i < m_viewports.size(); i++)
+    {
+        if (m_viewports[i]->GetType() != ET_ViewportCamera || (GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady()))
+        {
+            m_viewports[i]->Update();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void    CViewManager::SetAxisConstrain(int axis)
+{
+    for (int i = 0; i < m_viewports.size(); i++)
+    {
+        m_viewports[i]->SetAxisConstrain(axis);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CLayoutWnd* CViewManager::GetLayout() const
+{
+    return MainWindow::instance()->GetLayout();
+}
+
+void CViewManager::SetZoom2D(float zoom)
+{
+    m_zoom2D = zoom;
+    if (m_zoom2D > 460.0f)
+    {
+        m_zoom2D = 460.0f;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::Cycle2DViewport()
+{
+    GetLayout()->Cycle2DViewport();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CViewport* CViewManager::GetViewportAtPoint(const QPoint& point) const
+{
+    QWidget* widget = QApplication::widgetAt(point);
+    return qobject_cast<QtViewport*>(widget);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::SelectViewport(CViewport* pViewport)
+{
+    // Audio: Handle viewport change for listeners
+
+    if (m_pSelectedView != NULL && m_pSelectedView != pViewport)
+    {
+        m_pSelectedView->SetSelected(false);
+
+    }
+
+    m_pSelectedView = pViewport;
+
+    if (m_pSelectedView != NULL)
+    {
+        m_pSelectedView->SetSelected(true);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CViewport* CViewManager::GetGameViewport() const
+{
+    if (CRenderViewport::GetPrimaryViewport())
+    {
+        return CRenderViewport::GetPrimaryViewport();
+    }
+
+    return GetViewport(ET_ViewportCamera);;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CViewManager::GetNumberOfGameViewports()
+{
+    if (m_bGameViewportsUpdated)
+    {
+        return m_nGameViewports;
+    }
+
+    m_nGameViewports = 0;
+    for (int i = 0; i < m_viewports.size(); ++i)
+    {
+        if (m_viewports[i]->GetType() == ET_ViewportCamera)
+        {
+            ++m_nGameViewports;
+        }
+    }
+    m_bGameViewportsUpdated = true;
+
+    return m_nGameViewports;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CViewManager::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnIdleUpdate:
+        IdleUpdate();
+        break;
+    case eNotify_OnUpdateViewports:
+        UpdateViews();
+        break;
+    }
+}
+
+AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> CViewManager::GetManipulatorManager()
+{
+    return m_manipulatorManager;
+}
diff --git a/Code/Editor/ViewManager.h b/Code/Editor/ViewManager.h
new file mode 100644
index 0000000000..e0369809ec
--- /dev/null
+++ b/Code/Editor/ViewManager.h
@@ -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
+ *
+ */
+
+
+// Description : interface for the CViewManager class.
+
+
+#ifndef CRYINCLUDE_EDITOR_VIEWMANAGER_H
+#define CRYINCLUDE_EDITOR_VIEWMANAGER_H
+
+#pragma once
+
+#include "Cry_Geo.h"
+#include "Viewport.h"
+#include "Include/IViewPane.h"
+#include "QtViewPaneManager.h"
+// forward declaration.
+class CLayoutWnd;
+class CViewport;
+
+namespace AzToolsFramework
+{
+    class ManipulatorManager;
+}
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+/** Manages set of viewports.
+*/
+class SANDBOX_API CViewManager
+    : public IEditorNotifyListener
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    static bool IsMultiViewportEnabled();
+
+    void ReleaseView(CViewport* pViewport);
+
+    CViewport* GetViewport(EViewportType type) const;
+    CViewport* GetViewport(const QString& name) const;
+
+    //! Find viewport at Screen point.
+    CViewport* GetViewportAtPoint(const QPoint& point) const;
+
+    void SelectViewport(CViewport* pViewport);
+    CViewport* GetSelectedViewport() const { return m_pSelectedView; }
+
+    void    SetAxisConstrain(int axis);
+
+    void    SetZoomFactor(float zoom);
+    float   GetZoomFactor() const { return m_zoomFactor; }
+
+    //! Reset all views.
+    void    ResetViews();
+    //! Update all views.
+    void    UpdateViews(int flags = 0xFFFFFFFF);
+
+    void SetUpdateRegion(const AABB& updateRegion) { m_updateRegion = updateRegion; };
+    const AABB& GetUpdateRegion() { return m_updateRegion; };
+
+    /** Get 2D viewports origin.
+    */
+    Vec3 GetOrigin2D() const { return m_origin2D; }
+
+    /** Assign 2D viewports origin.
+    */
+    void SetOrigin2D(const Vec3& org) { m_origin2D = org; };
+
+    /** Assign zoom factor for 2d viewports.
+    */
+    void SetZoom2D(float zoom);
+
+    /** Get zoom factor of 2d viewports.
+    */
+    float GetZoom2D() const { return m_zoom2D; };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Get currently active camera object id.
+    REFGUID GetCameraObjectId() const { return m_cameraObjectId; };
+    //! Sets currently active camera object id.
+    void SetCameraObjectId(REFGUID cameraObjectId) { m_cameraObjectId = cameraObjectId; };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Get number of currently existing viewports.
+    virtual int GetViewCount() { return m_viewports.size(); };
+    //! Get viewport by index.
+    //! @param index 0 <= index < GetViewportCount()
+    virtual CViewport* GetView(int index) { return m_viewports[index]; }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Get current layout window.
+    //! @return Pointer to the layout window, can be NULL.
+    virtual CLayoutWnd* GetLayout() const;
+
+    //! Cycle between different 2D viewports type on same view pane.
+    virtual void Cycle2DViewport();
+
+    //////////////////////////////////////////////////////////////////////////
+    // Retrieve main game viewport, where the full game is rendered in 3D.
+    CViewport* GetGameViewport() const;
+
+    //! Get number of Game Viewports
+    int GetNumberOfGameViewports();
+
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
+
+    AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> GetManipulatorManager();
+
+private:
+    friend class CEditorImpl;
+    friend class QtViewport;
+
+    void IdleUpdate();
+    void RegisterViewport(CViewport* vp);
+    void UnregisterViewport(CViewport* vp);
+
+private:
+    CViewManager();
+    ~CViewManager();
+    //////////////////////////////////////////////////////////////////////////
+    //FIELDS.
+    float   m_zoomFactor;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    AABB m_updateRegion;
+
+    //! Origin of 2d viewports.
+    Vec3 m_origin2D;
+    //! Zoom of 2d viewports.
+    float m_zoom2D;
+
+    //! Id of camera object.
+    GUID m_cameraObjectId;
+
+    int m_nGameViewports;
+    bool m_bGameViewportsUpdated;
+
+    //! Array of currently existing viewports.
+    std::vector<CViewport*> m_viewports;
+
+    CViewport* m_pSelectedView;
+
+    AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+};
+
+#endif // CRYINCLUDE_EDITOR_VIEWMANAGER_H
diff --git a/Code/Editor/ViewPane.cpp b/Code/Editor/ViewPane.cpp
new file mode 100644
index 0000000000..d4ff77acad
--- /dev/null
+++ b/Code/Editor/ViewPane.cpp
@@ -0,0 +1,835 @@
+/*
+ * 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 : implementation file
+
+
+#include "EditorDefs.h"
+
+#include "ViewPane.h"
+
+// Qt
+#include <QDebug>
+#include <QLabel>
+#include <QLayout>
+#include <QMouseEvent>
+#include <QScrollArea>
+#include <QToolBar>
+
+// AzCore
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzQtComponents/Components/Style.h>
+
+// AzFramework
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzCore/Interface/Interface.h>
+
+// Editor
+#include "ViewManager.h"
+#include "Settings.h"
+#include "LayoutWnd.h"
+#include "Viewport.h"
+#include "LayoutConfigDialog.h"
+#include "TopRendererWnd.h"
+#include "UserMessageDefines.h"
+#include "MainWindow.h"
+#include "QtViewPaneManager.h"
+#include "EditorViewportWidget.h"
+
+//////////////////////////////////////////////////////////////////////////
+// ViewportTitleExpanderWatcher
+//////////////////////////////////////////////////////////////////////////
+class ViewportTitleExpanderWatcher
+    : public QObject
+{
+public:
+    ViewportTitleExpanderWatcher(QObject* parent = nullptr, CViewportTitleDlg* viewportDlg = nullptr)
+        : QObject(parent)
+        , m_viewportDlg(viewportDlg)
+    {
+    }
+
+    bool eventFilter(QObject* obj, QEvent* event) override
+    {
+        if (m_viewportDlg)
+        {
+            switch (event->type())
+            {
+                case QEvent::MouseButtonPress:
+                case QEvent::MouseButtonRelease:
+                case QEvent::MouseButtonDblClick:
+                {
+                    if (qobject_cast<QToolButton*>(obj))
+                    {
+                        auto mouseEvent = static_cast<QMouseEvent*>(event);
+                        auto expansion = qobject_cast<QToolButton*>(obj);
+
+                        expansion->setPopupMode(QToolButton::InstantPopup);
+                        auto menu = new QMenu(expansion);
+
+                        auto toolbar = qobject_cast<QToolBar*>(expansion->parentWidget());
+
+                        auto toolWidgets = toolbar->findChildren<QWidget*>();
+
+                        if (toolWidgets.count() > 0)
+                        {
+                            for (auto toolWidget : toolWidgets)
+                            {
+                                if (AzQtComponents::Style::hasClass(toolWidget, "expanderMenu_hide"))
+                                {
+                                    continue;
+                                }
+
+                                // Handle labels with submenus
+                                if (auto toolLabel = qobject_cast<QLabel*>(toolWidget))
+                                {
+                                    if (!toolLabel->isVisible())
+                                    {
+                                        // Manually turn the custom context menus into submenus
+                                        if (toolLabel->objectName() == "m_fovStaticCtrl")
+                                        {
+                                            QAction* newAction = menu->addMenu(m_viewportDlg->GetFovMenu());
+                                            newAction->setText(QString("FOV: %1").arg(toolLabel->text()));
+                                        }
+                                        else if (toolLabel->objectName() == "m_ratioStaticCtrl")
+                                        {
+                                            QAction* newAction = menu->addMenu(m_viewportDlg->GetAspectMenu());
+                                            newAction->setText(QString("Ratio: %1").arg(toolLabel->text()));
+                                        }
+                                        else if (toolLabel->objectName() == "m_sizeStaticCtrl")
+                                        {
+                                            QAction* newAction = menu->addMenu(m_viewportDlg->GetResolutionMenu());
+                                            newAction->setText(QString("%1").arg(toolLabel->text()));
+                                        }
+                                        else
+                                        {
+                                            // Don't add actions for other Labels
+                                            continue;
+                                        }
+                                    }
+                                }
+
+                                // Handle ToolButtons
+                                if (auto toolButton = qobject_cast<QToolButton*>(toolWidget))
+                                {
+                                    if (!toolButton->isVisible() && !toolButton->text().isEmpty())
+                                    {
+                                        QAction* action = new QAction(toolButton->text(), menu);
+
+                                        action->setEnabled(toolButton->isEnabled());
+                                        action->setCheckable(toolButton->isCheckable());
+                                        action->setChecked(toolButton->isChecked());
+
+                                        connect(action, &QAction::triggered, toolButton, &QToolButton::clicked);
+
+                                        menu->addAction(action);
+                                    }
+                                }
+                            }
+                        }
+
+                        menu->exec(mouseEvent->globalPos());
+                        return true;
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        return QObject::eventFilter(obj, event);
+    }
+
+private:
+    CViewportTitleDlg* m_viewportDlg = nullptr;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// CLayoutViewPane
+//////////////////////////////////////////////////////////////////////////
+CLayoutViewPane::CLayoutViewPane(QWidget* parent)
+    : AzQtComponents::ToolBarArea(parent)
+    , m_viewportTitleDlg(this)
+    , m_expanderWatcher(new ViewportTitleExpanderWatcher(this, &m_viewportTitleDlg))
+{
+    m_viewport = 0;
+    m_active = 0;
+    m_nBorder = VIEW_BORDER;
+
+    m_bFullscreen = false;
+    m_viewportTitleDlg.SetViewPane(this);
+
+    // Set up an optional scrollable area for our viewport.  We'll use this for times that we want a fixed-size
+    // viewport independent of main window size.
+    m_viewportScrollArea = new QScrollArea(this);
+    m_viewportScrollArea->setContentsMargins(QMargins());
+    m_viewportScrollArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    QWidget* viewportContainer = m_viewportTitleDlg.findChild<QWidget*>(QStringLiteral("ViewportTitleDlgContainer"));
+    QToolBar* toolbar = CreateToolBarFromWidget(viewportContainer,
+                                                Qt::TopToolBarArea,
+                                                QStringLiteral("Viewport Settings"));
+    toolbar->setMovable(false);
+    toolbar->installEventFilter(&m_viewportTitleDlg);
+    toolbar->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(toolbar, &QWidget::customContextMenuRequested, &m_viewportTitleDlg, &QWidget::customContextMenuRequested);
+
+    setContextMenuPolicy(Qt::NoContextMenu);
+
+    if (QToolButton* expansion = AzQtComponents::ToolBar::getToolBarExpansionButton(toolbar))
+    {
+        expansion->installEventFilter(m_expanderWatcher);
+    }
+
+    m_id = -1;
+}
+
+CLayoutViewPane::~CLayoutViewPane() 
+{ 
+    if (m_viewportScrollArea)
+    {
+        // We only ever add m_viewport into our scroll area, which we manage separately,
+        // so make sure to take it back before deleting m_scrollArea.  Otherwise it will
+        // try and get deleted as a part of deleting m_scrollArea.
+        m_viewportScrollArea->takeWidget();
+        delete m_viewportScrollArea;
+    }
+    OnDestroy(); 
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::SetViewClass(const QString& sClass)
+{
+    if (m_viewport && m_viewPaneClass == sClass)
+    {
+        return;
+    }
+    m_viewPaneClass = sClass;
+
+    ReleaseViewport();
+
+    QWidget* newPane = QtViewPaneManager::instance()->CreateWidget(sClass);
+    if (newPane)
+    {
+        newPane->setProperty("IsViewportWidget", true);
+        connect(newPane, &QWidget::windowTitleChanged, &m_viewportTitleDlg, &CViewportTitleDlg::SetTitle, Qt::UniqueConnection);
+        AttachViewport(newPane);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString CLayoutViewPane::GetViewClass() const
+{
+    return m_viewPaneClass;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::OnDestroy()
+{
+    ReleaseViewport();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::SwapViewports(CLayoutViewPane* pView)
+{
+    QWidget* pViewport = pView->GetViewport();
+    QWidget* pViewportOld = m_viewport;
+
+    std::swap(m_viewPaneClass, pView->m_viewPaneClass);
+
+    AttachViewport(pViewport);
+    pView->AttachViewport(pViewportOld);
+}
+
+void CLayoutViewPane::SetViewportExpansionPolicy(ViewportExpansionPolicy policy)
+{
+    m_viewportPolicy = policy;
+
+    switch (policy)
+    {
+        // If the requested policy is "FixedSize", wrap our viewport area in a scrollable
+        // region so that we can always make the viewport a guaranteed fixed size regardless of the
+        // main window size.  The scrollable area will auto-resize with the main window, but the
+        // viewport won't.
+        case ViewportExpansionPolicy::FixedSize:
+            {
+                QWidget* scrollViewport = m_viewportScrollArea->viewport();
+                m_viewportScrollArea->setWidget(m_viewport);
+                m_viewport->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+                // For some reason, the QScrollArea is adding a margin all around our viewable area,
+                // so we'll shrink our viewport by an appropriate offset (twice the margin thickness) 
+                // so that it continues to fit without requiring scroll bars after switching size policies.
+                m_viewport->resize(m_viewport->width() - (scrollViewport->x() * 2), m_viewport->height() - (scrollViewport->y() * 2));
+                SetMainWidget(m_viewportScrollArea);
+                update();
+
+            }
+            break;
+        // If the requested policy is "AutoExpand", just put the viewport area directly in the ViewPane.
+        // It will auto-resize with the main window, but requests to change the viewport size might not 
+        // result in the exact size being requested, depending on main window size and layout.
+        case ViewportExpansionPolicy::AutoExpand:
+            {
+                m_viewport->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                SetMainWidget(m_viewport);
+                update();
+            }
+            break;
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::AttachViewport(QWidget* pViewport)
+{
+    if (pViewport == m_viewport)
+    {
+        return;
+    }
+
+    DisconnectRenderViewportInteractionRequestBus();
+    m_viewport = pViewport;
+    if (pViewport)
+    {
+        SetViewportExpansionPolicy(ViewportExpansionPolicy::AutoExpand);
+
+        if (QtViewport* vp = qobject_cast<QtViewport*>(pViewport))
+        {
+            vp->SetViewportId(GetId());
+            vp->SetViewPane(this);
+            if (CRenderViewport* renderViewport = viewport_cast<CRenderViewport*>(vp))
+            {
+                renderViewport->ConnectViewportInteractionRequestBus();
+            }
+            if (EditorViewportWidget* renderViewport = viewport_cast<EditorViewportWidget*>(vp))
+            {
+                renderViewport->ConnectViewportInteractionRequestBus();
+            }
+        }
+
+        m_viewport->setVisible(true);
+
+        setWindowTitle(m_viewPaneClass);
+        m_viewportTitleDlg.SetTitle(pViewport->windowTitle());
+
+        if (QtViewport* vp = qobject_cast<QtViewport*>(pViewport))
+        {
+            OnFOVChanged(vp->GetFOV());
+        }
+        else
+        {
+            OnFOVChanged(gSettings.viewports.fDefaultFov);
+        }
+
+        m_viewportTitleDlg.OnViewportSizeChanged(pViewport->width(), pViewport->height());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::DetachViewport()
+{
+    DisconnectRenderViewportInteractionRequestBus();
+    OnFOVChanged(gSettings.viewports.fDefaultFov);
+    m_viewport = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::ReleaseViewport()
+{
+    if (m_viewport)
+    {
+        DisconnectRenderViewportInteractionRequestBus();
+        m_viewport->deleteLater();
+        m_viewport = 0;
+    }
+}
+
+void CLayoutViewPane::DisconnectRenderViewportInteractionRequestBus()
+{
+    if (QtViewport* vp = qobject_cast<QtViewport*>(m_viewport))
+    {
+        if (CRenderViewport* renderViewport = viewport_cast<CRenderViewport*>(vp))
+        {
+            renderViewport->DisconnectViewportInteractionRequestBus();
+        }
+        if (EditorViewportWidget* renderViewport = viewport_cast<EditorViewportWidget*>(vp))
+        {
+            renderViewport->DisconnectViewportInteractionRequestBus();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::ResizeViewport(int width, int height)
+{
+    if (!m_viewport)
+    {
+        return;
+    }
+
+    // Get our MainWidget, which will either be the viewport or a scrollable area around the
+    // viewport, depending on which expansion policy we've chosen.
+    QWidget* mainWidget = GetMainWidget();
+    if (!mainWidget)
+    {
+        mainWidget = m_viewport;
+    }
+
+    // If our main widget is a scroll area, specifically get the size of the viewable area within the scroll area.
+    // This way, even if we currently have scroll bars visible, we'll try to resize our main window and scroll area
+    // to make the entire viewport visible.
+    QSize mainWidgetSize = mainWidget->size();
+    if (QScrollArea* scrollArea = qobject_cast<QScrollArea*>(mainWidget))
+    {
+        mainWidgetSize = scrollArea->viewport()->size();
+    }
+
+    // Make sure our requestedSize stays within "legal" bounds.
+    const QSize requestedSize = QSize(AZ::GetClamp(width, MIN_VIEWPORT_RES, MAX_VIEWPORT_RES), 
+                                      AZ::GetClamp(height, MIN_VIEWPORT_RES, MAX_VIEWPORT_RES));
+
+    // The delta between our current and requested size is going to be used to try and resize the main window
+    // (either growing or shrinking) by the exact same amount so that the new viewport size is still completely
+    // visible without needing to adjust any other widget sizes.  
+    // Note that we're specifically taking the delta from the main widget, not the viewport.
+    // In the "AutoResize" case, this will still directly take the delta from our viewport, but in the
+    // "FixedSize" case we need to take the delta from the scroll area's viewable area size, since that's actually 
+    // the one we need to grow/shrink proportional to.
+    const QSize deltaSize = requestedSize - mainWidgetSize;
+
+    // Do nothing if the new size is the same as the old size.
+    if (deltaSize == QSize(0, 0))
+    {
+        return;
+    }
+
+    MainWindow* mainWindow = MainWindow::instance();
+
+    // We need to adjust the main window size to make it larger/smaller as appropriate
+    // to fit the newly-resized viewport, so start by making sure it isn't maximized.
+    if (mainWindow->isMaximized())
+    {
+        mainWindow->showNormal();
+    }
+
+    // Resize our main window by the amount that we want our viewport to change.
+    // This is intended to grow our viewport by the same amount.  However, this logic is a 
+    // little flawed and should get revisited at some point:
+    // 1) It's possible that the mainWindow won't actually change to the requested size, if the requested
+    // size is larger than the current display resolution (Qt::SetGeometry will fire a second resize event
+    // that shrinks the mainWindow back to the display resolution and will emit a warning in debug builds),
+    // or smaller than the minimum size allowed by the various widgets in the window.
+    // 2) If LayoutWnd contains multiple viewports, the delta change of the main window will affect the delta
+    // size of LayoutWnd, which is then divided proportionately among the multiple viewports, so the 1:1 size
+    // assumption in the logic below isn't correct in the multi-viewport case.
+    // 3) Sometimes Qt will just change this by 1 pixel (either smaller or bigger) with a second subsequent
+    // resize event for no apparent reason.
+    // 4) The layout of the docked windows *around* the viewport widget can affect how it grows and shrinks,
+    // so even if you try to change the size of the layout widget, it might auto-resize afterwards to fill any
+    // gaps between it and other widgets (console window, entity inspector, etc).
+    mainWindow->move(0, 0);
+    mainWindow->resize(mainWindow->size() + deltaSize);
+
+    // We can avoid the problems above by using the "FixedSize" policy.  If we've chosen this policy, we'll make
+    // the viewport a scrollable region that's exactly the resolution requested here.  This is useful for screenshots
+    // in automation testing among other things, since this way we can guarantee the resolution of the screenshot matches
+    // the resolution of any golden images we're comparing against.
+    if (m_viewportPolicy == ViewportExpansionPolicy::FixedSize)
+    {
+        m_viewport->resize(requestedSize);
+        update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::SetAspectRatio(unsigned int x, unsigned int y)
+{
+    if (x == 0 || y == 0)
+    {
+        return;
+    }
+
+    const QRect viewportRect = m_viewport->rect();
+
+    // Round height to nearest multiple of y aspect, then scale width according to ratio
+    const unsigned int height = ((viewportRect.height() + y - 1) / y) * y;
+    const unsigned int width = height / y * x;
+
+    ResizeViewport(width, height);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::SetViewportFOV(float fov)
+{
+    if (CRenderViewport* pRenderViewport = qobject_cast<CRenderViewport*>(m_viewport))
+    {
+        pRenderViewport->SetFOV(DEG2RAD(fov));
+
+        // if viewport camera is active, make selected fov new default
+        if (pRenderViewport->GetViewManager()->GetCameraObjectId() == GUID_NULL)
+        {
+            gSettings.viewports.fDefaultFov = DEG2RAD(fov);
+        }
+    }
+    if (EditorViewportWidget* pRenderViewport = qobject_cast<EditorViewportWidget*>(m_viewport))
+    {
+        pRenderViewport->SetFOV(DEG2RAD(fov));
+
+        // if viewport camera is active, make selected fov new default
+        if (pRenderViewport->GetViewManager()->GetCameraObjectId() == GUID_NULL)
+        {
+            gSettings.viewports.fDefaultFov = DEG2RAD(fov);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::ToggleMaximize()
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Switch in and out of fullscreen mode for a edit view
+    ////////////////////////////////////////////////////////////////////////
+    CLayoutWnd* wnd = GetIEditor()->GetViewManager()->GetLayout();
+    if (wnd)
+    {
+        wnd->MaximizeViewport(GetId());
+    }
+    setFocus();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::OnMenuLayoutConfig()
+{
+    if (GetIEditor()->IsInGameMode())
+    {
+        // you may not change your viewports while game mode is running.
+        CryLog("You may not change viewport configuration while in game mode.");
+        return;
+    }
+
+    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+    if (layout)
+    {
+        CLayoutConfigDialog dlg;
+        dlg.SetLayout(layout->GetLayout());
+        if (dlg.exec() == QDialog::Accepted)
+        {
+            // Will kill this Pane. so must be last line in this function.
+            layout->CreateLayout(dlg.GetLayout());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::OnMenuViewSelected(const QString& paneName)
+{
+    if (GetIEditor()->IsInGameMode())
+    {
+        CryLog("You may not change viewport configuration while in game mode.");
+        // you may not change your viewports while game mode is running.
+        return;
+    }
+
+    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+    if (layout)
+    {
+        layout->BindViewport(this, paneName);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::OnMenuMaximized()
+{
+    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+    if (m_viewport && layout)
+    {
+        layout->MaximizeViewport(GetId());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::ShowTitleMenu()
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Process clicks on the view buttons and the menu button
+    ////////////////////////////////////////////////////////////////////////
+    // Only continue when we have a viewport.
+
+    // Create pop up menu.
+    QMenu root(this);
+    if (QtViewport* vp = qobject_cast<QtViewport*>(m_viewport))
+    {
+        vp->OnTitleMenu(&root);
+    }
+
+    if (!root.isEmpty())
+    {
+        root.addSeparator();
+    }
+
+    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+    QAction* action = root.addAction(tr("Maximized"));
+    if (layout)
+    {
+        connect(action, &QAction::triggered, layout, &CLayoutWnd::MaximizeViewport);
+    }
+    action->setChecked(IsFullscreen());
+
+    action = root.addAction(tr("Configure Layout..."));
+    if (!CViewManager::IsMultiViewportEnabled())
+    {
+        action->setDisabled(true);
+    }
+
+    // NOTE: this must be a QueuedConnection, so that it executes after the menu is deleted.
+    // Changing the layout can cause the current "this" pointer to be deleted
+    // and since we've made the "this" pointer the menu's parent,
+    // it gets deleted when the "this" pointer is deleted. Since it's not a heap object,
+    // that causes a crash. Using a QueuedConnection forces the layout config to happen
+    // after the QMenu is cleaned up on the stack.
+    connect(action, &QAction::triggered, this, &CLayoutViewPane::OnMenuLayoutConfig, Qt::QueuedConnection);
+
+#ifdef FEATURE_ORTHOGRAPHIC_VIEW
+    QMenu* viewsMenu = root.addMenu(tr("Viewport Type"));
+    
+    QtViewPanes viewports = QtViewPaneManager::instance()->GetRegisteredViewportPanes();
+
+    for (auto it = viewports.cbegin(), end = viewports.cend(); it != end; ++it)
+    {
+        const QtViewPane& pane = *it;
+        action = viewsMenu->addAction(pane.m_name);
+        action->setCheckable(true);
+        action->setChecked(m_viewPaneClass == pane.m_name);
+        connect(action, &QAction::triggered, [pane, this] { OnMenuViewSelected(pane.m_name); });
+    }
+#endif
+    root.exec(QCursor::pos());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::mouseDoubleClickEvent(QMouseEvent* event)
+{
+    if (event->button() == Qt::LeftButton)
+    {
+        ToggleMaximize();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::focusInEvent([[maybe_unused]] QFocusEvent* event)
+{
+    // Forward SetFocus call to child viewport.
+    if (m_viewport)
+    {
+        m_viewport->setFocus();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::SetFullscren(bool f)
+{
+    m_bFullscreen = f;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::SetFocusToViewport()
+{
+    if (m_viewport)
+    {
+        m_viewport->window()->activateWindow();
+        m_viewport->setFocus();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLayoutViewPane::OnFOVChanged(float fov)
+{
+    m_viewportTitleDlg.OnViewportFOVChanged(fov);
+}
+
+//////////////////////////////////////////////////////////////////////////
+namespace
+{
+    AZ::Vector2 PyGetViewPortSize()
+    {
+        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
+        if (viewPane && viewPane->GetViewport())
+        {
+            const QRect rcViewport = viewPane->GetViewport()->rect();
+            return AZ::Vector2(rcViewport.width(), rcViewport.height());
+        }
+        else
+        {
+            return AZ::Vector2();
+        }
+    }
+
+    void PySetViewPortSize(int width, int height)
+    {
+        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
+        if (viewPane)
+        {
+            viewPane->ResizeViewport(width, height);
+        }
+    }
+
+    static void PyUpdateViewPort()
+    {
+        GetIEditor()->UpdateViews(eRedrawViewports);
+    }
+
+    void PyResizeViewport(int width, int height)
+    {
+        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
+
+        if (viewPane)
+        {
+            viewPane->ResizeViewport(width, height);
+        }
+    }
+
+    void PyBindViewport(const char* viewportName)
+    {
+        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
+        if (viewPane)
+        {
+            GetIEditor()->GetViewManager()->GetLayout()->BindViewport(viewPane, viewportName);
+        }
+    }
+
+    void PySetViewportExpansionPolicy(const char* policy)
+    {
+        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
+        if (viewPane)
+        {
+            if (AzFramework::StringFunc::Equal(policy, "AutoExpand"))
+            {
+                viewPane->SetViewportExpansionPolicy(CLayoutViewPane::ViewportExpansionPolicy::AutoExpand);
+            }
+            else if (AzFramework::StringFunc::Equal(policy, "FixedSize"))
+            {
+                viewPane->SetViewportExpansionPolicy(CLayoutViewPane::ViewportExpansionPolicy::FixedSize);
+            }
+        }
+    }
+
+    const char* PyGetViewportExpansionPolicy()
+    {
+        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
+        if (viewPane)
+        {
+            switch (viewPane->GetViewportExpansionPolicy())
+            {
+                case CLayoutViewPane::ViewportExpansionPolicy::AutoExpand: return "AutoExpand";
+                case CLayoutViewPane::ViewportExpansionPolicy::FixedSize: return "FixedSize";
+            }
+        }
+
+        return "";
+    }
+
+    unsigned int PyGetViewportCount()
+    {
+        CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+        return layout ? layout->GetViewPaneCount() : 0;
+    }
+
+    unsigned int PyGetActiveViewport()
+    {
+        CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+        if (layout)
+        {
+            CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
+
+            for (unsigned int index = 0; index < layout->GetViewPaneCount(); index++)
+            {
+                if (viewPane == layout->GetViewPaneByIndex(index))
+                {
+                    return index;
+                }
+            }
+        }
+
+        AZ_Error("Main", false, "No active viewport found.");
+        return 0;
+    }
+
+    void PySetActiveViewport(unsigned int viewportIndex)
+    {
+        bool success = false;
+        CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+        if (layout)
+        {
+            CLayoutViewPane* viewPane = layout->GetViewPaneByIndex(viewportIndex);
+            if (viewPane)
+            {
+                viewPane->SetFocusToViewport();
+                MainWindow::instance()->SetActiveView(viewPane);
+                success = true;
+            }
+        }
+        AZ_Error("Main", success, "Active viewport was not set successfully.");
+    }
+
+    unsigned int PyGetViewPaneLayout()
+    {
+        CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+        return layout ? layout->GetLayout() : ET_Layout0;
+    }
+
+    void PySetViewPaneLayout(unsigned int layoutId)
+    {
+        if ((layoutId >= ET_Layout0) && (layoutId <= ET_Layout8))
+        {
+            CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
+            if (layout)
+            {
+                layout->CreateLayout(static_cast<EViewLayout>(layoutId));
+            }
+        }
+        else
+        {
+            AZ_Error("Main", false, "Invalid layout (%u), only values from %u to %u are valid.", layoutId, ET_Layout0, ET_Layout8);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+namespace AzToolsFramework
+{
+    void ViewPanePythonFuncsHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            // this will put these methods into the 'azlmbr.legacy.general' module
+            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
+            };
+            addLegacyGeneral(behaviorContext->Method("get_viewport_size", PyGetViewPortSize, nullptr, "Get the width and height of the active viewport."));
+            addLegacyGeneral(behaviorContext->Method("set_viewport_size", PySetViewPortSize, nullptr, "Set the width and height of the active viewport."));
+            addLegacyGeneral(behaviorContext->Method("update_viewport", PyUpdateViewPort, nullptr, "Update all visible SDK viewports."));
+            addLegacyGeneral(behaviorContext->Method("resize_viewport", PyResizeViewport, nullptr, "Resizes the viewport resolution to a given width & height."));
+            addLegacyGeneral(behaviorContext->Method("bind_viewport", PyBindViewport, nullptr, "Binds the viewport to a specific view like 'Top', 'Front', 'Perspective'."));
+            addLegacyGeneral(behaviorContext->Method("get_viewport_expansion_policy", PyGetViewportExpansionPolicy, nullptr, "Returns whether viewports are auto-resized with the main window ('AutoExpand') or if they remain a fixed size ('FixedSize')."));
+            addLegacyGeneral(behaviorContext->Method("set_viewport_expansion_policy", PySetViewportExpansionPolicy, nullptr, "Sets whether viewports are auto-resized with the main window ('AutoExpand') or if they remain a fixed size ('FixedSize')."));
+            addLegacyGeneral(behaviorContext->Method("get_viewport_count", PyGetViewportCount, nullptr, "Get the total number of viewports."));
+            addLegacyGeneral(behaviorContext->Method("get_active_viewport", PyGetActiveViewport, nullptr, "Get the active viewport index."));
+            addLegacyGeneral(behaviorContext->Method("set_active_viewport", PySetActiveViewport, nullptr, "Set the active viewport by index."));
+            addLegacyGeneral(behaviorContext->Method("get_view_pane_layout", PyGetViewPaneLayout, nullptr, "Get the active view pane layout."));
+            addLegacyGeneral(behaviorContext->Method("set_view_pane_layout", PySetViewPaneLayout, nullptr, "Set the active view pane layout."));
+        }
+    }
+}
+
+#include <moc_ViewPane.cpp>
diff --git a/Code/Editor/ViewPane.h b/Code/Editor/ViewPane.h
new file mode 100644
index 0000000000..4bdd56c22a
--- /dev/null
+++ b/Code/Editor/ViewPane.h
@@ -0,0 +1,149 @@
+/*
+ * 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_VIEWPANE_H
+#define CRYINCLUDE_EDITOR_VIEWPANE_H
+
+#pragma once
+// ViewPane.h : header file
+//
+
+#if !defined(Q_MOC_RUN)
+#include "ViewportTitleDlg.h"
+
+#include <AzQtComponents/Components/ToolBarArea.h>
+#include <AzCore/Component/Component.h>
+#include <Include/SandboxAPI.h>
+#endif
+
+class CViewport;
+class QToolBar;
+class QScrollArea;
+class ViewportTitleExpanderWatcher;
+
+/////////////////////////////////////////////////////////////////////////////
+// CViewPane view
+
+class CLayoutViewPane
+    : public AzQtComponents::ToolBarArea
+{
+    Q_OBJECT
+public:
+    CLayoutViewPane(QWidget* parent = nullptr);
+    virtual ~CLayoutViewPane();
+
+    // Operations
+public:
+    // Set get this pane id.
+    void SetId(int id) { m_id = id; }
+    int GetId() { return m_id; }
+
+    void SetViewClass(const QString& sClass);
+    QString GetViewClass() const;
+
+    //! Assign viewport to this pane.
+    void SwapViewports(CLayoutViewPane* pView);
+
+    void AttachViewport(QWidget* pViewport);
+    //! Detach viewport from this pane.
+    void DetachViewport();
+    // Releases and destroy attached viewport.
+    void ReleaseViewport();
+
+    void SetFullscren(bool f);
+    bool IsFullscreen() const { return m_bFullscreen; }
+
+    QWidget* GetViewport() { return m_viewport; }
+
+    //////////////////////////////////////////////////////////////////////////
+    bool IsActiveView() const { return m_active; }
+
+    void ShowTitleMenu();
+    void ToggleMaximize();
+
+    void SetFocusToViewport();
+
+    void ResizeViewport(int width, int height);
+    void SetAspectRatio(unsigned int x, unsigned int y);
+    void SetViewportFOV(float fov);
+    void OnFOVChanged(float fov);
+
+    enum class ViewportExpansionPolicy
+    {
+        AutoExpand,
+        FixedSize
+    };
+
+    ViewportExpansionPolicy GetViewportExpansionPolicy() { return m_viewportPolicy; }
+
+    //! Determine whether the viewport will be a fixed-size (scrollable if necessary) 
+    //! independent of the main window size, or auto-expanding based directly on the main window size.
+    void SetViewportExpansionPolicy(ViewportExpansionPolicy policy);
+
+protected:
+    void OnMenuLayoutConfig();
+    void OnMenuViewSelected(const QString& paneName);
+    void OnMenuMaximized();
+
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+    void OnDestroy();
+    void focusInEvent(QFocusEvent* event) override;
+
+    void DisconnectRenderViewportInteractionRequestBus();
+
+private:
+    static constexpr int MIN_VIEWPORT_RES = 64;
+    static constexpr int MAX_VIEWPORT_RES = 8192;
+    static constexpr int MAX_CLASSVIEWS = 100;
+    static constexpr int VIEW_BORDER = 0;
+
+    enum TitleMenuCommonCommands
+    {
+        ID_MAXIMIZED = 50000,
+        ID_LAYOUT_CONFIG,
+
+        FIRST_ID_CLASSVIEW,
+        LAST_ID_CLASSVIEW = FIRST_ID_CLASSVIEW + MAX_CLASSVIEWS - 1
+    };
+
+    QString m_viewPaneClass;
+    bool m_bFullscreen;
+    CViewportTitleDlg m_viewportTitleDlg;
+
+    int m_id;
+    int m_nBorder;
+    int m_titleHeight;
+
+    QWidget* m_viewport;
+    QScrollArea* m_viewportScrollArea = nullptr;
+    ViewportExpansionPolicy m_viewportPolicy = ViewportExpansionPolicy::AutoExpand;
+    ViewportTitleExpanderWatcher* m_expanderWatcher;
+    bool m_active;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+namespace AzToolsFramework
+{
+    //! A component to reflect scriptable commands for the Editor
+    class ViewPanePythonFuncsHandler
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(ViewPanePythonFuncsHandler, "{25C99C8F-4440-4656-ABC4-32134F496CC1}")
+
+        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+    };
+
+} // namespace AzToolsFramework
+
+#endif // CRYINCLUDE_EDITOR_VIEWPANE_H
diff --git a/Code/Editor/Viewport.cpp b/Code/Editor/Viewport.cpp
new file mode 100644
index 0000000000..15af52484d
--- /dev/null
+++ b/Code/Editor/Viewport.cpp
@@ -0,0 +1,1525 @@
+/*
+ * 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 "Viewport.h"
+
+// Qt
+#include <QPainter>
+
+// AzQtComponents
+#include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
+
+#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+
+// Editor
+#include "ViewManager.h"
+#include "Include/ITransformManipulator.h"
+#include "Include/HitContext.h"
+#include "Objects/ObjectManager.h"
+#include "Util/3DConnexionDriver.h"
+#include "PluginManager.h"
+#include "Include/IRenderListener.h"
+#include "GameEngine.h"
+#include "Settings.h"
+
+
+#ifdef LoadCursor
+#undef LoadCursor
+#endif
+
+//////////////////////////////////////////////////////////////////////
+// Viewport drag and drop support
+//////////////////////////////////////////////////////////////////////
+
+void QtViewport::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt)
+{
+    context.m_hitLocation = AZ::Vector3::CreateZero();
+
+    PreWidgetRendering(); // required so that the current render cam is set.
+
+    Vec3 pos = Vec3(ZERO);
+    HitContext hit;
+    if (HitTest(pt, hit))
+    {
+        pos = hit.raySrc + hit.rayDir * hit.dist;
+        pos = SnapToGrid(pos);
+    }
+    else
+    {
+        bool hitTerrain;
+        pos = ViewToWorld(pt, &hitTerrain);
+        if (hitTerrain)
+        {
+            pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y);
+        }
+        pos = SnapToGrid(pos);
+    }
+    context.m_hitLocation = AZ::Vector3(pos.x, pos.y, pos.z);
+
+    PostWidgetRendering();
+}
+
+
+void QtViewport::dragEnterEvent(QDragEnterEvent* event)
+{
+    if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
+    {
+        return;
+    }
+
+    // first use the legacy pathway, which assumes its always okay as long as any callback is installed
+    if (m_dropCallback)
+    {
+        event->setDropAction(Qt::CopyAction);
+        event->setAccepted(true);
+    }
+    else
+    {
+        // new bus-based way of doing it (install a listener!)
+        using namespace AzQtComponents;
+        ViewportDragContext context;
+        BuildDragDropContext(context, event->pos());
+        DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragEnter, event, context);
+    }
+}
+
+void QtViewport::dragMoveEvent(QDragMoveEvent* event)
+{
+    if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
+    {
+        return;
+    }
+
+    // first use the legacy pathway, which assumes its always okay as long as any callback is installed
+    if (m_dropCallback)
+    {
+        event->setDropAction(Qt::CopyAction);
+        event->setAccepted(true);
+    }
+    else
+    {
+        // new bus-based way of doing it (install a listener!)
+        using namespace AzQtComponents;
+        ViewportDragContext context;
+        BuildDragDropContext(context, event->pos());
+        DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragMove, event, context);
+    }
+}
+
+void QtViewport::dropEvent(QDropEvent* event)
+{
+    using namespace AzQtComponents;
+    if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
+    {
+        return;
+    }
+
+    // first use the legacy pathway, which assumes its always okay as long as any callback is installed
+    if (m_dropCallback)
+    {
+        m_dropCallback(this, event->pos().x(), event->pos().y(), m_dropCallbackCustom);
+        event->setAccepted(true);
+    }
+    else
+    {
+        // new bus-based way of doing it (install a listener!)
+        ViewportDragContext context;
+        BuildDragDropContext(context, event->pos());
+        DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::Drop, event, context);
+    }
+}
+
+void QtViewport::dragLeaveEvent(QDragLeaveEvent* event)
+{
+    using namespace AzQtComponents;
+    DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragLeave, event);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+float CViewport::GetFOV() const
+{
+    return gSettings.viewports.fDefaultFov;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+bool QtViewport::m_bDegradateQuality = false;
+
+QtViewport::QtViewport(QWidget* parent)
+    : QWidget(parent)
+    , m_renderOverlay(this)
+{
+    m_cViewMenu.addMenu(tr("&View Options"))->addAction(tr("&Fullscreen"));
+    //connect(action, &QAction::triggered, );
+    m_selectionTolerance = 0;
+    m_fGridZoom = 1.0f;
+
+    m_nLastUpdateFrame = 0;
+    m_nLastMouseMoveFrame = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Init standard cursors.
+    //////////////////////////////////////////////////////////////////////////
+    m_hCurrCursor = QCursor();
+    m_hCursor[STD_CURSOR_DEFAULT] = QCursor(Qt::ArrowCursor);
+    m_hCursor[STD_CURSOR_HIT] = CMFCUtils::LoadCursor(IDC_POINTER_OBJHIT);
+    m_hCursor[STD_CURSOR_MOVE] = CMFCUtils::LoadCursor(IDC_POINTER_OBJECT_MOVE);
+    m_hCursor[STD_CURSOR_ROTATE] = CMFCUtils::LoadCursor(IDC_POINTER_OBJECT_ROTATE);
+    m_hCursor[STD_CURSOR_SCALE] = CMFCUtils::LoadCursor(IDC_POINTER_OBJECT_SCALE);
+    m_hCursor[STD_CURSOR_SEL_PLUS] = CMFCUtils::LoadCursor(IDC_POINTER_PLUS);
+    m_hCursor[STD_CURSOR_SEL_MINUS] = CMFCUtils::LoadCursor(IDC_POINTER_MINUS);
+    m_hCursor[STD_CURSOR_SUBOBJ_SEL] = CMFCUtils::LoadCursor(IDC_POINTER_SO_SELECT);
+    m_hCursor[STD_CURSOR_SUBOBJ_SEL_PLUS] = CMFCUtils::LoadCursor(IDC_POINTER_SO_SELECT_PLUS);
+    m_hCursor[STD_CURSOR_SUBOBJ_SEL_MINUS] = CMFCUtils::LoadCursor(IDC_POINTER_SO_SELECT_MINUS);
+
+    m_activeAxis = AXIS_TERRAIN;
+
+    for (int i = 0; i < LAST_COORD_SYSTEM; i++)
+    {
+        m_constructionMatrix[i].SetIdentity();
+    }
+    m_viewTM.SetIdentity();
+    m_screenTM.SetIdentity();
+
+    m_pMouseOverObject = 0;
+
+    m_bAdvancedSelectMode = false;
+
+    m_pVisibleObjectsCache = new CBaseObjectsCache;
+
+    m_constructionPlane.SetPlane(Vec3_OneZ, Vec3_Zero);
+    m_constructionPlaneAxisX = Vec3_Zero;
+    m_constructionPlaneAxisY = Vec3_Zero;
+
+    GetIEditor()->GetViewManager()->RegisterViewport(this);
+
+    m_nCurViewportID = MAX_NUM_VIEWPORTS - 1;
+    m_dropCallback = nullptr; // Leroy@Conffx
+
+    setMouseTracking(true);
+    setFocusPolicy(Qt::StrongFocus);
+
+    // Create drop target to handle Qt drop events.
+    setAcceptDrops(true);
+
+    m_renderOverlay.setVisible(true);
+    m_renderOverlay.setUpdatesEnabled(false);
+    m_renderOverlay.setMouseTracking(true);
+    m_renderOverlay.setObjectName("renderOverlay");
+    m_renderOverlay.winId(); // Force the render overlay to create a backing native window
+
+    m_viewportUi.InitializeViewportUi(this, &m_renderOverlay);
+
+    setAcceptDrops(true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+QtViewport::~QtViewport()
+{
+    delete m_pVisibleObjectsCache;
+
+    GetIEditor()->GetViewManager()->UnregisterViewport(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::ScreenToClient(QPoint& pPoint) const
+{
+    pPoint = mapFromGlobal(pPoint);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::GetDimensions(int* pWidth, int* pHeight) const
+{
+    if (pWidth)
+    {
+        *pWidth = width();
+    }
+    if (pHeight)
+    {
+        *pHeight = height();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::RegisterRenderListener(IRenderListener*    piListener)
+{
+#ifdef _DEBUG
+    size_t nCount(0);
+    size_t nTotal(0);
+
+    nTotal = m_cRenderListeners.size();
+    for (nCount = 0; nCount < nTotal; ++nCount)
+    {
+        if (m_cRenderListeners[nCount] == piListener)
+        {
+            assert(!"Registered the same RenderListener multiple times.");
+            break;
+        }
+    }
+#endif //_DEBUG
+    m_cRenderListeners.push_back(piListener);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool QtViewport::UnregisterRenderListener(IRenderListener*  piListener)
+{
+    size_t nCount(0);
+    size_t nTotal(0);
+
+    nTotal = m_cRenderListeners.size();
+    for (nCount = 0; nCount < nTotal; ++nCount)
+    {
+        if (m_cRenderListeners[nCount] == piListener)
+        {
+            m_cRenderListeners.erase(m_cRenderListeners.begin() + nCount);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool QtViewport::IsRenderListenerRegistered(IRenderListener*    piListener)
+{
+    size_t nCount(0);
+    size_t nTotal(0);
+
+    nTotal = m_cRenderListeners.size();
+    for (nCount = 0; nCount < nTotal; ++nCount)
+    {
+        if (m_cRenderListeners[nCount] == piListener)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::AddPostRenderer(IPostRenderer* pPostRenderer)
+{
+    stl::push_back_unique(m_postRenderers, pPostRenderer);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool QtViewport::RemovePostRenderer(IPostRenderer* pPostRenderer)
+{
+    PostRenderers::iterator itr = m_postRenderers.begin();
+    PostRenderers::iterator end = m_postRenderers.end();
+    for (; itr != end; ++itr)
+    {
+        if (*itr == pPostRenderer)
+        {
+            break;
+        }
+    }
+
+    if (itr != end)
+    {
+        m_postRenderers.erase(itr);
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::OnMouseWheel([[maybe_unused]] Qt::KeyboardModifiers modifiers, short zDelta, [[maybe_unused]] const QPoint& pt)
+{
+    if (zDelta != 0)
+    {
+        float z = GetZoomFactor() + (zDelta / 120.0f) * 0.5f;
+
+        SetZoomFactor(z);
+        GetIEditor()->GetViewManager()->SetZoomFactor(z);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+QString QtViewport::GetName() const
+{
+    return windowTitle();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::SetName(const QString& name)
+{
+    setWindowTitle(name);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+    m_renderOverlay.setGeometry(rect());
+    Update();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::leaveEvent(QEvent* event)
+{
+    QWidget::leaveEvent(event);
+    MouseCallback(eMouseLeave, QPoint(), Qt::KeyboardModifiers(), Qt::MouseButtons());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::paintEvent([[maybe_unused]] QPaintEvent* event)
+{
+    QPainter painter(this);
+
+    // Fill the entire client area
+    painter.fillRect(rect(), QColor(0xf0, 0xf0, 0xf0));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::OnActivate()
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Make this edit window the current one
+    ////////////////////////////////////////////////////////////////////////
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::OnDeactivate()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::ResetContent()
+{
+    m_pMouseOverObject = 0;
+
+    // Need to clear visual object cache.
+    // Right after loading new level, some code(e.g. OnMouseMove) access invalid
+    // previous level object before cache updated.
+    GetVisibleObjectsCache()->ClearObjects();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::UpdateContent(int flags)
+{
+    if (flags & eRedrawViewports)
+    {
+        update();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::Update()
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+    m_viewportUi.Update();
+
+    m_bAdvancedSelectMode = false;
+    bool bSpaceClick = false;
+    {
+        bSpaceClick = CheckVirtualKey(Qt::Key_Space) & !CheckVirtualKey(Qt::Key_Shift) /*& !CheckVirtualKey(Qt::Key_Control)*/;
+    }
+    if (bSpaceClick && hasFocus())
+    {
+        m_bAdvancedSelectMode = true;
+    }
+
+    m_nLastUpdateFrame++;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QPoint QtViewport::WorldToView(const Vec3& wp) const
+{
+    return QPoint(wp.x, wp.y);
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 QtViewport::WorldToView3D(const Vec3& wp, [[maybe_unused]] int nFlags) const
+{
+    QPoint p = WorldToView(wp);
+    Vec3 out;
+    out.x = p.x();
+    out.y = p.y();
+    out.z = wp.z;
+    return out;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3    QtViewport::ViewToWorld(const QPoint& vp, bool* pCollideWithTerrain, [[maybe_unused]] bool onlyTerrain, [[maybe_unused]] bool bSkipVegetation, [[maybe_unused]] bool bTestRenderMesh, [[maybe_unused]] bool* collideWithObject) const
+{
+    Vec3 wp;
+    wp.x = vp.x();
+    wp.y = vp.y();
+    wp.z = 0;
+    if (pCollideWithTerrain)
+    {
+        *pCollideWithTerrain = true;
+    }
+    return wp;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3    QtViewport::ViewToWorldNormal([[maybe_unused]] const QPoint& vp, [[maybe_unused]] bool onlyTerrain, [[maybe_unused]] bool bTestRenderMesh)
+{
+    return Vec3(0, 0, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void    QtViewport::ViewToWorldRay([[maybe_unused]] const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const
+{
+    raySrc(0, 0, 0);
+    rayDir(0, 0, -1);
+}
+
+void QtViewport::mousePressEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonDown(event->modifiers(), event->pos());
+        break;
+    case Qt::MiddleButton:
+        OnMButtonDown(event->modifiers(), event->pos());
+        break;
+    case Qt::RightButton:
+        OnRButtonDown(event->modifiers(), event->pos());
+        break;
+    }
+}
+
+void QtViewport::mouseReleaseEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonUp(event->modifiers(), event->pos());
+        break;
+    case Qt::MiddleButton:
+        OnMButtonUp(event->modifiers(), event->pos());
+        break;
+    case Qt::RightButton:
+        OnRButtonUp(event->modifiers(), event->pos());
+        break;
+    }
+
+    // For MFC compatibility, send a spurious move event after a button release.
+    // CryDesigner depends on this behaviour
+    mouseMoveEvent(event);
+}
+
+void QtViewport::mouseDoubleClickEvent(QMouseEvent* event)
+{
+    switch (event->button())
+    {
+    case Qt::LeftButton:
+        OnLButtonDblClk(event->modifiers(), event->pos());
+        break;
+    case Qt::MiddleButton:
+        OnMButtonDblClk(event->modifiers(), event->pos());
+        break;
+    case Qt::RightButton:
+        OnRButtonDblClk(event->modifiers(), event->pos());
+        break;
+    }
+}
+
+void QtViewport::mouseMoveEvent(QMouseEvent* event)
+{
+    OnMouseMove(event->modifiers(), event->buttons(), event->pos());
+    OnSetCursor();
+}
+
+void QtViewport::wheelEvent(QWheelEvent* event)
+{
+    OnMouseWheel(event->modifiers(), event->angleDelta().y(), event->position().toPoint());
+    event->accept();
+}
+
+void QtViewport::keyPressEvent(QKeyEvent* event)
+{
+    int nativeKey = event->nativeVirtualKey();
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    // nativeVirtualKey is always zero on macOS, therefore we
+    // need to manually set the nativeKey based on the Qt key
+    switch (event->key())
+    {
+        case Qt::Key_Control:
+            nativeKey = VK_CONTROL;
+            break;
+        case Qt::Key_Alt:
+            nativeKey = VK_MENU;
+            break;
+        case Qt::Key_QuoteLeft:
+            nativeKey = VK_OEM_3;
+            break;
+        case Qt::Key_BracketLeft:
+            nativeKey = VK_OEM_4;
+            break;
+        case Qt::Key_BracketRight:
+            nativeKey = VK_OEM_6;
+            break;
+        case Qt::Key_Comma:
+            nativeKey = VK_OEM_COMMA;
+            break;
+        case Qt::Key_Period:
+            nativeKey = VK_OEM_PERIOD;
+            break;
+        case Qt::Key_Escape:
+            nativeKey = VK_ESCAPE;
+            break;
+    }
+#endif
+    OnKeyDown(nativeKey, 1, event->nativeModifiers());
+}
+
+void QtViewport::keyReleaseEvent(QKeyEvent* event)
+{
+    int nativeKey = event->nativeVirtualKey();
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    // nativeVirtualKey is always zero on macOS, therefore we
+    // need to manually set the nativeKey based on the Qt key
+    switch (event->key())
+    {
+        case Qt::Key_Control:
+            nativeKey = VK_CONTROL;
+            break;
+        case Qt::Key_Alt:
+            nativeKey = VK_MENU;
+            break;
+        case Qt::Key_QuoteLeft:
+            nativeKey = VK_OEM_3;
+            break;
+        case Qt::Key_BracketLeft:
+            nativeKey = VK_OEM_4;
+            break;
+        case Qt::Key_BracketRight:
+            nativeKey = VK_OEM_6;
+            break;
+        case Qt::Key_Comma:
+            nativeKey = VK_OEM_COMMA;
+            break;
+        case Qt::Key_Period:
+            nativeKey = VK_OEM_PERIOD;
+            break;
+        case Qt::Key_Escape:
+            nativeKey = VK_ESCAPE;
+            break;
+    }
+#endif
+    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()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::ResetSelectionRegion()
+{
+    AABB box(Vec3(0, 0, 0), Vec3(0, 0, 0));
+    GetIEditor()->SetSelectedRegion(box);
+    m_selectedRect = QRect();
+}
+
+void QtViewport::SetSelectionRectangle(const QRect& rect)
+{
+    m_selectedRect = rect.normalized();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect)
+{
+    Vec3 org;
+    AABB box;
+    box.Reset();
+
+    //adjust QRect bottom and right corner once before extracting bottom/right coordinates
+    const QRect correctedRect = rect.adjusted(0, 0, 1, 1);
+    Vec3 p1 = ViewToWorld(correctedRect.topLeft());
+    Vec3 p2 = ViewToWorld(correctedRect.bottomRight());
+    org = p1;
+    // Calculate selection volume.
+    if (!bNormalizeRect)
+    {
+        box.Add(p1);
+        box.Add(p2);
+    }
+    else
+    {
+        const QRect rc = correctedRect.normalized();
+        box.Add(ViewToWorld(rc.topLeft()));
+        box.Add(ViewToWorld(rc.topRight()));
+        box.Add(ViewToWorld(rc.bottomLeft()));
+        box.Add(ViewToWorld(rc.bottomRight()));
+    }
+
+    box.min.z = -10000;
+    box.max.z = 10000;
+    GetIEditor()->SetSelectedRegion(box);
+
+    // Show marker position in the status bar
+    float w = box.max.x - box.min.x;
+    float h = box.max.y - box.min.y;
+    char szNewStatusText[512];
+    sprintf_s(szNewStatusText, "X:%g Y:%g Z:%g  W:%g H:%g", org.x, org.y, org.z, w, h);
+    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)
+{
+    setCursor(hCursor);
+    m_cursorStr = cursorString;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::SetCurrentCursor(EStdCursor stdCursor, const QString& cursorString)
+{
+    QCursor hCursor = m_hCursor[stdCursor];
+    setCursor(hCursor);
+    m_cursorStr = cursorString;
+}
+
+void QtViewport::SetSupplementaryCursorStr(const QString& str)
+{
+    m_cursorSupplementaryStr = str;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::SetCurrentCursor(EStdCursor stdCursor)
+{
+    QCursor hCursor = m_hCursor[stdCursor];
+    setCursor(hCursor);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::SetCursorString(const QString& cursorString)
+{
+    m_cursorStr = cursorString;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::ResetCursor()
+{
+    SetCurrentCursor(STD_CURSOR_DEFAULT, QString());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::SetConstructionOrigin(const Vec3& worldPos)
+{
+    Matrix34 tm;
+    tm.SetIdentity();
+    tm.SetTranslation(worldPos);
+    SetConstructionMatrix(COORDS_LOCAL, tm);
+    SetConstructionMatrix(COORDS_PARENT, tm);
+    SetConstructionMatrix(COORDS_USERDEFINED, tm);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::SetConstructionMatrix(RefCoordSys coordSys, const Matrix34& xform)
+{
+    m_constructionMatrix[coordSys] = xform;
+    m_constructionMatrix[coordSys].OrthonormalizeFast(); // Remove scale component from matrix.
+    if (coordSys == COORDS_LOCAL)
+    {
+        m_constructionMatrix[COORDS_VIEW].SetTranslation(xform.GetTranslation());
+        m_constructionMatrix[COORDS_WORLD].SetTranslation(xform.GetTranslation());
+        m_constructionMatrix[COORDS_USERDEFINED].SetIdentity();
+        m_constructionMatrix[COORDS_USERDEFINED].SetTranslation(xform.GetTranslation());
+        m_constructionMatrix[COORDS_PARENT] = xform;
+    }
+    MakeConstructionPlane(GetAxisConstrain());
+}
+
+//////////////////////////////////////////////////////////////////////////
+const Matrix34& QtViewport::GetConstructionMatrix(RefCoordSys coordSys)
+{
+    if (coordSys == COORDS_VIEW)
+    {
+        return m_constructionMatrix[COORDS_WORLD];
+    }
+    return m_constructionMatrix[coordSys];
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::AssignConstructionPlane(const Vec3& p1, const Vec3& p2, const Vec3& p3)
+{
+    m_constructionPlane.SetPlane(p1, p2, p3);
+    m_constructionPlaneAxisX = p3 - p1;
+    m_constructionPlaneAxisY = p2 - p1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+HWND QtViewport::renderOverlayHWND() const
+{
+    return reinterpret_cast<HWND>(m_renderOverlay.winId());
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::setRenderOverlayVisible(bool visible)
+{
+    m_renderOverlay.setVisible(visible);
+}
+
+bool QtViewport::isRenderOverlayVisible() const
+{
+    return m_renderOverlay.isVisible();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::MakeConstructionPlane(int axis)
+{
+    QPoint cursorPos;
+    if (m_mouseCaptured)
+    {
+        cursorPos = m_cMouseDownPos;
+    }
+    else
+    {
+        cursorPos = QCursor::pos();
+        ScreenToClient(cursorPos);
+    }
+
+    Vec3 raySrc(Vec3_Zero), rayDir(Vec3_OneX);
+    ViewToWorldRay(cursorPos, raySrc, rayDir);
+
+    int coordSys = GetIEditor()->GetReferenceCoordSys();
+
+    Vec3 xAxis(Vec3_OneX);
+    Vec3 yAxis(Vec3_OneY);
+    Vec3 zAxis(Vec3_OneZ);
+
+    xAxis = m_constructionMatrix[coordSys].TransformVector(xAxis);
+    yAxis = m_constructionMatrix[coordSys].TransformVector(yAxis);
+    zAxis = m_constructionMatrix[coordSys].TransformVector(zAxis);
+
+    Vec3 pos = m_constructionMatrix[coordSys].GetTranslation();
+
+    if (axis == AXIS_X)
+    {
+        // X direction.
+        Vec3 n;
+        float d1 = fabs(rayDir.Dot(yAxis));
+        float d2 = fabs(rayDir.Dot(zAxis));
+        if (d1 > d2)
+        {
+            n = yAxis;
+        }
+        else
+        {
+            n = zAxis;
+        }
+        if (rayDir.Dot(n) < 0)
+        {
+            n = -n;                    // face construction plane to the ray.
+        }
+        //Vec3 n = Vec3(0,0,1);
+        Vec3 v1 = n.Cross(xAxis);
+        Vec3 v2 = n.Cross(v1);
+        AssignConstructionPlane(pos, pos + v2, pos + v1);
+    }
+    else if (axis == AXIS_Y)
+    {
+        // Y direction.
+        Vec3 n;
+        float d1 = fabs(rayDir.Dot(xAxis));
+        float d2 = fabs(rayDir.Dot(zAxis));
+        if (d1 > d2)
+        {
+            n = xAxis;
+        }
+        else
+        {
+            n = zAxis;
+        }
+        if (rayDir.Dot(n) < 0)
+        {
+            n = -n;                    // face construction plane to the ray.
+        }
+        Vec3 v1 = n.Cross(yAxis);
+        Vec3 v2 = n.Cross(v1);
+        AssignConstructionPlane(pos, pos + v2, pos + v1);
+    }
+    else if (axis == AXIS_Z)
+    {
+        // Z direction.
+        Vec3 n;
+        float d1 = fabs(rayDir.Dot(xAxis));
+        float d2 = fabs(rayDir.Dot(yAxis));
+        if (d1 > d2)
+        {
+            n = xAxis;
+        }
+        else
+        {
+            n = yAxis;
+        }
+        if (rayDir.Dot(n) < 0)
+        {
+            n = -n;                    // face construction plane to the ray.
+        }
+        Vec3 v1 = n.Cross(zAxis);
+        Vec3 v2 = n.Cross(v1);
+        AssignConstructionPlane(pos, pos + v2, pos + v1);
+    }
+    else if (axis == AXIS_XY)
+    {
+        AssignConstructionPlane(pos, pos + yAxis, pos + xAxis);
+    }
+    else if (axis == AXIS_XZ)
+    {
+        AssignConstructionPlane(pos, pos + zAxis, pos + xAxis);
+    }
+    else if (axis == AXIS_YZ)
+    {
+        AssignConstructionPlane(pos, pos + zAxis, pos + yAxis);
+    }
+    else
+    {
+        AssignConstructionPlane(pos, pos + yAxis, pos + xAxis);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 QtViewport::MapViewToCP(const QPoint& point, int axis)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+
+    if (axis == AXIS_TERRAIN)
+    {
+        return SnapToGrid(ViewToWorld(point));
+    }
+
+    MakeConstructionPlane(axis);
+
+    Vec3 raySrc(Vec3_Zero), rayDir(Vec3_OneX);
+    ViewToWorldRay(point, raySrc, rayDir);
+    
+    Vec3 v;
+
+    Ray ray(raySrc, rayDir);
+    if (!Intersect::Ray_Plane(ray, m_constructionPlane, v))
+    {
+        Plane inversePlane = m_constructionPlane;
+        inversePlane.n = -inversePlane.n;
+        inversePlane.d = -inversePlane.d;
+        if (!Intersect::Ray_Plane(ray, inversePlane, v))
+        {
+            v = Vec3_Zero;
+        }
+    }
+
+    // Snap value to grid.
+    v = SnapToGrid(v);
+
+    return v;
+}
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 QtViewport::GetCPVector(const Vec3& p1, const Vec3& p2, int axis)
+{
+    Vec3 v = p2 - p1;
+
+    int coordSys = GetIEditor()->GetReferenceCoordSys();
+
+    Vec3 xAxis(Vec3_OneX);
+    Vec3 yAxis(Vec3_OneY);
+    Vec3 zAxis(Vec3_OneZ);
+
+    // In local coordinate system transform axises by construction matrix.
+    xAxis = m_constructionMatrix[coordSys].TransformVector(xAxis);
+    yAxis = m_constructionMatrix[coordSys].TransformVector(yAxis);
+    zAxis = m_constructionMatrix[coordSys].TransformVector(zAxis);
+
+    if (axis == AXIS_X || axis == AXIS_Y || axis == AXIS_Z)
+    {
+        // Project vector v on transformed axis x,y or z.
+        Vec3 axisVector;
+        if (axis == AXIS_X)
+        {
+            axisVector = xAxis;
+        }
+        if (axis == AXIS_Y)
+        {
+            axisVector = yAxis;
+        }
+        if (axis == AXIS_Z)
+        {
+            axisVector = zAxis;
+        }
+
+        // Project vector on construction plane into the one of axises.
+        v = v.Dot(axisVector) * axisVector;
+    }
+    else if (axis == AXIS_XY)
+    {
+        // Project vector v on transformed plane x/y.
+        Vec3 planeNormal = xAxis.Cross(yAxis);
+        Vec3 projV = v.Dot(planeNormal) * planeNormal;
+        v = v - projV;
+    }
+    else if (axis == AXIS_XZ)
+    {
+        // Project vector v on transformed plane x/y.
+        Vec3 planeNormal = xAxis.Cross(zAxis);
+        Vec3 projV = v.Dot(planeNormal) * planeNormal;
+        v = v - projV;
+    }
+    else if (axis == AXIS_YZ)
+    {
+        // Project vector v on transformed plane x/y.
+        Vec3 planeNormal = yAxis.Cross(zAxis);
+        Vec3 projV = v.Dot(planeNormal) * planeNormal;
+        v = v - projV;
+    }
+    else if (axis == AXIS_TERRAIN)
+    {
+        v.z = 0;
+    }
+    return v;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::SetAxisConstrain(int axis)
+{
+    m_activeAxis = axis;
+};
+
+AzToolsFramework::ViewportInteraction::MouseInteraction QtViewport::BuildMouseInteraction(
+    [[maybe_unused]] Qt::MouseButtons buttons, [[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
+{
+    // Implemented by sub-class
+    return AzToolsFramework::ViewportInteraction::MouseInteraction();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
+{
+    Vec3 raySrc(0, 0, 0), rayDir(1, 0, 0);
+    ViewToWorldRay(point, hitInfo.raySrc, hitInfo.rayDir);
+    hitInfo.view = this;
+    hitInfo.point2d = point;
+    if (m_bAdvancedSelectMode)
+    {
+        hitInfo.bUseSelectionHelpers = true;
+    }
+
+    const int viewportId = GetViewportId();
+
+    AzToolsFramework::EntityIdList visibleEntityIds;
+    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Event(
+        viewportId,
+        &AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequests::FindVisibleEntities,
+        visibleEntityIds);
+
+    // Look through all visible entities to find the closest one to the specified mouse point
+    using namespace AzToolsFramework::ViewportInteraction;
+    AZ::EntityId entityIdUnderCursor;
+    float closestDistance = std::numeric_limits<float>::max();
+    MouseInteraction mouseInteraction = BuildMouseInteraction(QGuiApplication::mouseButtons(),
+        QGuiApplication::queryKeyboardModifiers(),
+        point);
+    for (auto entityId : visibleEntityIds)
+    {
+        using AzFramework::ViewportInfo;
+        // Check if components provide an aabb
+        if (const AZ::Aabb aabb = AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, ViewportInfo{ viewportId });
+            aabb.IsValid())
+        {
+            // Coarse grain check
+            if (AzToolsFramework::AabbIntersectMouseRay(mouseInteraction, aabb))
+            {
+                // If success, pick against specific component
+                if (AzToolsFramework::PickEntity(
+                    entityId, mouseInteraction,
+                    closestDistance, viewportId))
+                {
+                    entityIdUnderCursor = entityId;
+                }
+            }
+        }
+    }
+
+    // If we hit a valid Entity, then store the distance in the HitContext
+    // so that the caller can use this for calculations
+    if (entityIdUnderCursor.IsValid())
+    {
+        hitInfo.dist = closestDistance;
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::SetZoomFactor(float fZoomFactor)
+{
+    m_fZoomFactor = fZoomFactor;
+    if (gSettings.viewports.bSync2DViews && GetType() != ET_ViewportCamera && GetType() != ET_ViewportModel)
+    {
+        GetViewManager()->SetZoom2D(fZoomFactor);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+float QtViewport::GetZoomFactor() const
+{
+    if (gSettings.viewports.bSync2DViews && GetType() != ET_ViewportCamera && GetType() != ET_ViewportModel)
+    {
+        m_fZoomFactor = GetViewManager()->GetZoom2D();
+    }
+    return m_fZoomFactor;
+};
+
+//////////////////////////////////////////////////////////////////////////
+Vec3 QtViewport::SnapToGrid(const Vec3& vec)
+{
+    return vec;
+}
+
+float QtViewport::GetGridStep() const
+{
+    return 0.0f;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::BeginUndo()
+{
+    DegradateQuality(true);
+    GetIEditor()->BeginUndo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::AcceptUndo(const QString& undoDescription)
+{
+    DegradateQuality(false);
+    GetIEditor()->AcceptUndo(undoDescription);
+    GetIEditor()->UpdateViews(eUpdateObjects);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::CancelUndo()
+{
+    DegradateQuality(false);
+    GetIEditor()->CancelUndo();
+    GetIEditor()->UpdateViews(eUpdateObjects);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::RestoreUndo()
+{
+    GetIEditor()->RestoreUndo();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool QtViewport::IsUndoRecording() const
+{
+    return GetIEditor()->IsUndoRecording();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::DegradateQuality(bool bEnable)
+{
+    m_bDegradateQuality = bEnable;
+}
+
+//////////////////////////////////////////////////////////////////////////
+QSize QtViewport::GetIdealSize() const
+{
+    return QSize(0, 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool QtViewport::IsBoundsVisible([[maybe_unused]] const AABB& box) const
+{
+    // Always visible in standard implementation.
+    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
+{
+    QPoint p1 = WorldToView(lineP1);
+    QPoint p2 = WorldToView(lineP2);
+
+    return PointToLineDistance2D(
+        Vec3(p1.x(), p1.y(), 0), 
+        Vec3(p2.x(), p2.y(), 0), 
+        Vec3(point.x(), point.y(), 0));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::GetPerpendicularAxis(EAxis* pAxis, bool* pIs2D) const
+{
+    EViewportType vpType = GetType();
+    switch (vpType)
+    {
+    case ET_ViewportXY:
+        if (pIs2D)
+        {
+            *pIs2D = true;
+        }
+        if (pAxis)
+        {
+            *pAxis = AXIS_Z;
+        }
+        break;
+    case ET_ViewportXZ:
+        if (pIs2D)
+        {
+            *pIs2D = true;
+        }
+        if (pAxis)
+        {
+            *pAxis = AXIS_Y;
+        }
+        break;
+    case ET_ViewportYZ:
+        if (pIs2D)
+        {
+            *pIs2D = true;
+        }
+        if (pAxis)
+        {
+            *pAxis = AXIS_X;
+        }
+        break;
+    case ET_ViewportMap:
+    case ET_ViewportZ:
+        if (pIs2D)
+        {
+            *pIs2D = true;
+        }
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool QtViewport::GetAdvancedSelectModeFlag()
+{
+    return m_bAdvancedSelectMode;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool QtViewport::MouseCallback(EMouseEvent event, const QPoint& point, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::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;
+    }
+
+    // RAII wrapper for Pre / PostWidgetRendering calls.
+    // It also tracks the times a mouse callback potentially created a new viewport context.
+    struct ScopedProcessingMouseCallback
+    {
+        explicit ScopedProcessingMouseCallback(QtViewport* viewport)
+            : m_viewport(viewport)
+        {
+            m_viewport->m_processingMouseCallbacksCounter++;
+            m_viewport->PreWidgetRendering();
+        }
+
+        ~ScopedProcessingMouseCallback()
+        {
+            m_viewport->PostWidgetRendering();
+            m_viewport->m_processingMouseCallbacksCounter--;
+        }
+
+        QtViewport* m_viewport;
+    };
+
+    ScopedProcessingMouseCallback scopedProcessingMouseCallback(this);
+
+    //////////////////////////////////////////////////////////////////////////
+    // 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)
+{
+    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
+
+
+    size_t nCount(0);
+    size_t nTotal(0);
+
+    nTotal = m_cRenderListeners.size();
+    for (nCount = 0; nCount < nTotal; ++nCount)
+    {
+        m_cRenderListeners[nCount]->Render(rstDisplayContext);
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+#if defined(AZ_PLATFORM_WINDOWS)
+void QtViewport::OnRawInput([[maybe_unused]] UINT wParam, HRAWINPUT lParam)
+{
+    static C3DConnexionDriver* p3DConnexionDriver = 0;
+
+    if (GetType() == ET_ViewportCamera)
+    {
+        if (!p3DConnexionDriver)
+        {
+            p3DConnexionDriver = (C3DConnexionDriver*)GetIEditor()->GetPluginManager()->GetPluginByGUID("{AD109901-9128-4ffd-8E67-137CB2B1C41B}");
+        }
+        if (p3DConnexionDriver)
+        {
+            S3DConnexionMessage msg;
+            if (p3DConnexionDriver->GetInputMessageData((LPARAM)lParam, msg))
+            {
+                if (msg.bGotTranslation || msg.bGotRotation)
+                {
+                    static int all6DOFs[6] = { 0 };
+                    if (msg.bGotTranslation)
+                    {
+                        all6DOFs[0] = msg.raw_translation[0];
+                        all6DOFs[1] = msg.raw_translation[1];
+                        all6DOFs[2] = msg.raw_translation[2];
+                    }
+                    if (msg.bGotRotation)
+                    {
+                        all6DOFs[3] = msg.raw_rotation[0];
+                        all6DOFs[4] = msg.raw_rotation[1];
+                        all6DOFs[5] = msg.raw_rotation[2];
+                    }
+
+                    Matrix34 viewTM = GetViewTM();
+
+                    // Scale axis according to CVars
+                    ICVar* sys_scale3DMouseTranslation = gEnv->pConsole->GetCVar("sys_scale3DMouseTranslation");
+                    ICVar* sys_Scale3DMouseYPR = gEnv->pConsole->GetCVar("sys_Scale3DMouseYPR");
+                    float fScaleYPR = sys_Scale3DMouseYPR->GetFVal();
+
+                    float s = 0.01f * gSettings.cameraMoveSpeed;
+                    Vec3 t = Vec3(s * all6DOFs[0], -s * all6DOFs[1], -s * all6DOFs[2] * 0.5f);
+                    t *= sys_scale3DMouseTranslation->GetFVal();
+
+                    float as = 0.001f * gSettings.cameraMoveSpeed;
+                    Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(viewTM));
+                    ypr.x += -all6DOFs[5] * as * fScaleYPR;
+                    ypr.y = 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 = viewTM * Matrix34::CreateTranslationMat(t);
+
+                    SetViewTM(viewTM);
+                }
+            }
+        }
+    }
+}
+#endif
+//////////////////////////////////////////////////////////////////////////
+float QtViewport::GetFOV() const
+{
+    return gSettings.viewports.fDefaultFov;
+}
+//////////////////////////////////////////////////////////////////////////
+void QtViewport::setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir)
+{
+    m_vp = vp;
+    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
new file mode 100644
index 0000000000..a7f03edc3f
--- /dev/null
+++ b/Code/Editor/Viewport.h
@@ -0,0 +1,636 @@
+/*
+ * 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 : interface for the CViewport class.
+
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzToolsFramework/Viewport/ViewportTypes.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
+#include <Cry_Color.h>
+#include "IPostRenderer.h"
+#include "Include/IDisplayViewport.h"
+#include "Include/SandboxAPI.h"
+
+#include <QMenu>
+#include <QPointer>
+
+#if defined(Q_OS_WIN)
+#include <QtWinExtras/qwinfunctions.h>
+#endif
+
+#include <AzCore/Math/Uuid.h>
+#include <IEditor.h>
+#endif
+
+namespace AzQtComponents
+{
+    class ViewportDragContext;
+}
+
+// forward declarations.
+class CBaseObject;
+struct DisplayContext;
+class CCryEditDoc;
+class CLayoutViewPane;
+class CViewManager;
+class CBaseObjectsCache;
+struct HitContext;
+struct IRenderListener;
+class CImageEx;
+class QMenu;
+struct IDataBaseItem;
+
+/** Type of viewport.
+*/
+enum EViewportType
+{
+    ET_ViewportUnknown = 0,
+    ET_ViewportXY,
+    ET_ViewportXZ,
+    ET_ViewportYZ,
+    ET_ViewportCamera,
+    ET_ViewportMap,
+    ET_ViewportModel,
+    ET_ViewportZ, //!< Z Only viewport.
+    ET_ViewportUI,
+
+    ET_ViewportLast,
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Standart cursors viewport can display.
+//////////////////////////////////////////////////////////////////////////
+enum EStdCursor
+{
+    STD_CURSOR_DEFAULT,
+    STD_CURSOR_HIT,
+    STD_CURSOR_MOVE,
+    STD_CURSOR_ROTATE,
+    STD_CURSOR_SCALE,
+    STD_CURSOR_SEL_PLUS,
+    STD_CURSOR_SEL_MINUS,
+    STD_CURSOR_SUBOBJ_SEL,
+    STD_CURSOR_SUBOBJ_SEL_PLUS,
+    STD_CURSOR_SUBOBJ_SEL_MINUS,
+    STD_CURSOR_HAND,
+
+    STD_CURSOR_GAME,
+
+    STD_CURSOR_LAST,
+};
+
+AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+class SANDBOX_API CViewport
+    : public IDisplayViewport
+{
+AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
+public:
+    typedef void(* DropCallback)(CViewport* viewport, int ptx, int pty, void* custom);
+
+    virtual ~CViewport() {}
+
+    virtual void SetActiveWindow() = 0;
+
+    // Changed my view manager.
+    void SetViewManager(CViewManager* viewMgr) { m_viewManager = viewMgr; };
+
+    //! Access to view manager.
+    CViewManager* GetViewManager() const { return m_viewManager; };
+
+    virtual void RegisterRenderListener(IRenderListener*    piListener) = 0;
+    virtual bool UnregisterRenderListener(IRenderListener*  piListener) = 0;
+    virtual bool IsRenderListenerRegistered(IRenderListener*    piListener) = 0;
+
+    virtual void AddPostRenderer(IPostRenderer* pPostRenderer) = 0;
+    virtual bool RemovePostRenderer(IPostRenderer* pPostRenderer) = 0;
+
+    virtual BOOL DestroyWindow() { return FALSE; }
+
+    /** Get type of this viewport.
+    */
+    virtual EViewportType GetType() const { return ET_ViewportUnknown; }
+    /** Must be overriden in derived classes.
+    */
+    virtual void SetType(EViewportType type) = 0;
+
+    /** Get name of viewport
+    */
+    virtual QString GetName() const = 0;
+
+    virtual void SetSelected([[maybe_unused]] bool const bSelect){}
+
+    //! Resets current selection region.
+    virtual void ResetSelectionRegion() = 0;
+    //! Set 2D selection rectangle.
+    virtual void SetSelectionRectangle(const QRect& rect) = 0;
+    inline void SetSelectionRectangle(const QPoint& startMousePosition, const QPoint& currentMousePosition)
+    {
+        // QRect's bottom/right are width - 1, height - 1, so when specifying the right position
+        // directly in a QRect, we need to offset it by -1.
+        SetSelectionRectangle(QRect(startMousePosition, currentMousePosition - QPoint(1, 1)));
+    }
+    //! Return 2D selection rectangle.
+    virtual QRect GetSelectionRectangle() const = 0;
+    //! Called when dragging selection rectangle.
+    virtual void OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect = false) = 0;
+    void OnDragSelectRectangle(const QPoint& startMousePosition, const QPoint& currentMousePosition, bool bNormalizeRect = false)
+    {
+        // QRect's bottom/right are width - 1, height - 1, so when specifying the right position
+        // directly in a QRect, we need to offset it by -1.
+        OnDragSelectRectangle(QRect(startMousePosition, currentMousePosition - QPoint(1, 1)), bNormalizeRect);
+    }
+
+    virtual void ResetContent() = 0;
+    virtual void UpdateContent(int flags) = 0;
+
+    virtual void SetAxisConstrain(int axis) = 0;
+    int GetAxisConstrain() const { return GetIEditor()->GetAxisConstrains(); };
+
+    virtual Vec3 SnapToGrid(const Vec3& vec) = 0;
+
+    //! Get selection procision tolerance.
+    virtual float GetSelectionTolerance() const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // View matrix.
+    //////////////////////////////////////////////////////////////////////////
+    //! Set current view matrix,
+    //! This is a matrix that transforms from world to view space.
+    virtual void SetViewTM(const Matrix34& tm) { m_viewTM = tm; };
+
+    //! Get current view matrix.
+    //! This is a matrix that transforms from world space to view space.
+    virtual const Matrix34& GetViewTM() const { return m_viewTM; };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Get current screen matrix.
+    //! Screen matrix transform from World space to Screen space.
+    virtual const Matrix34& GetScreenTM() const
+    {
+        return m_screenTM;
+    }
+
+    virtual Vec3 MapViewToCP(const QPoint& point) = 0;
+
+    //! Map viewport position to world space position.
+    virtual Vec3        ViewToWorld(const QPoint& vp, bool* pCollideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const = 0;
+    //! Convert point on screen to world ray.
+    virtual void        ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const = 0;
+    //! Get normal for viewport position
+    virtual Vec3        ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) = 0;
+
+    virtual Vec3 GetCPVector(const Vec3& p1, const Vec3& p2, int axis) = 0;
+    virtual Vec3 GetCPVector(const Vec3& p1, const Vec3& p2) { return GetCPVector(p1, p2, GetAxisConstrain()); }
+
+    //! Performs hit testing of 2d point in view to find which object hit.
+    virtual bool HitTest(const QPoint& point, HitContext& hitInfo) = 0;
+
+    virtual void MakeConstructionPlane(int axis) = 0;
+
+    // Access to the member m_bAdvancedSelectMode so interested modules can know its value.
+    virtual bool GetAdvancedSelectModeFlag() = 0;
+
+    virtual void ToggleCameraObject() {}
+    virtual bool IsSequenceCamera() const { return false;  }
+
+    //! Center viewport on selection.
+    virtual void CenterOnSelection() = 0;
+    virtual void CenterOnAABB(const AABB& aabb) = 0;
+
+    virtual void CenterOnSliceInstance() = 0;
+
+    /** Set ID of this viewport
+    */
+    virtual void SetViewportId(int id) { m_nCurViewportID = id; };
+
+    /** Get ID of this viewport
+    */
+    virtual int GetViewportId() const { return m_nCurViewportID; };
+
+    // Store final Game Matrix ready for editor
+    void SetGameTM(const Matrix34& tm) { m_gameTM = tm; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Drag and drop support on viewports.
+    // To be overrided in derived classes.
+    //////////////////////////////////////////////////////////////////////////
+    virtual bool CanDrop([[maybe_unused]] const QPoint& point, [[maybe_unused]] IDataBaseItem* pItem) { return false; };
+    virtual void Drop([[maybe_unused]] const QPoint& point, [[maybe_unused]] IDataBaseItem* pItem) {};
+    virtual void SetGlobalDropCallback(DropCallback dropCallback, void* dropCallbackCustom)
+    {
+        m_dropCallback = dropCallback;
+        m_dropCallbackCustom = dropCallbackCustom;
+    }
+
+    virtual void SetConstructionMatrix(RefCoordSys coordSys, const Matrix34& xform) = 0;
+
+    virtual void BeginUndo() = 0;
+    virtual void AcceptUndo(const QString& undoDescription) = 0;
+    virtual void CancelUndo() = 0;
+    virtual void RestoreUndo() = 0;
+    virtual bool IsUndoRecording() const = 0;
+
+    virtual void CaptureMouse() {};
+    virtual void SetCapture() { CaptureMouse(); }
+    virtual void ReleaseMouse() {};
+
+    virtual void ResetCursor() = 0;
+    virtual void SetCursor(const QCursor& cursor) = 0;
+
+    virtual void SetCurrentCursor(EStdCursor stdCursor) = 0;
+    virtual void SetCurrentCursor(EStdCursor stdCursor, const QString& str) = 0;
+    virtual void SetSupplementaryCursorStr(const QString& str) = 0;
+    virtual void SetCursorString(const QString& str) = 0;
+
+    virtual void SetFocus() = 0;
+    virtual void Invalidate(BOOL bErase = 1) = 0;
+
+    // Is overridden by RenderViewport
+    virtual void SetFOV([[maybe_unused]] float fov) {}
+    virtual float GetFOV() const;
+
+    virtual QObject* qobject() { return nullptr; }
+    virtual QWidget* widget() { return nullptr; }
+
+    virtual void OnTitleMenu([[maybe_unused]] QMenu* menu) {}
+
+    void SetViewPane(CLayoutViewPane* viewPane) { m_viewPane = viewPane; }
+
+    //Child classes can override these to provide extra logic that wraps
+    //widget rendering. Needed by the RenderViewport to handle raycasts 
+    //from screen-space to world-space. 
+    virtual void PreWidgetRendering() {}
+    virtual void PostWidgetRendering() {}
+
+    virtual CViewport *asCViewport() { return this; }
+
+protected:
+    CLayoutViewPane* m_viewPane = nullptr;
+    CViewManager* m_viewManager;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    // Viewport matrix.
+    Matrix34 m_viewTM;
+    // Screen Matrix
+    Matrix34 m_screenTM;
+    int m_nCurViewportID;
+    // Final game view matrix before drpping back to editor
+    Matrix34 m_gameTM;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    // Custom drop callback (Leroy@Conffx)
+    DropCallback m_dropCallback;
+    void* m_dropCallbackCustom;
+};
+
+template<typename T>
+typename std::enable_if<std::is_base_of<QObject, typename std::remove_cv<typename std::remove_pointer<T>::type>::type>::value, T>::type
+viewport_cast(CViewport* viewport)
+{
+    if (viewport == nullptr)
+    {
+        return nullptr;
+    }
+    if (QObject* obj = viewport->qobject())
+    {
+        return qobject_cast<T>(obj);
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+/** Base class for all Editor Viewports.
+*/
+class SANDBOX_API QtViewport
+    : public QWidget
+    , public CViewport
+{
+    Q_OBJECT
+public:
+    QObject* qobject() override { return this; }
+    QWidget* widget() override { return this; }
+
+    template<typename T>
+    static const GUID& GetClassID()
+    {
+        static GUID guid = [] {
+            return AZ::Uuid::CreateRandom();
+        } ();
+        return guid;
+    }
+
+    QtViewport(QWidget* parent = nullptr);
+    virtual ~QtViewport();
+
+    void SetActiveWindow() override { activateWindow(); }
+
+    //! Called while window is idle.
+    virtual void Update();
+
+    /** Set name of this viewport.
+    */
+    void SetName(const QString& name);
+
+    /** Get name of viewport
+    */
+    QString GetName() const;
+
+    virtual void SetFocus() { setFocus(); }
+    virtual void Invalidate([[maybe_unused]] BOOL bErase = 1) { update(); }
+
+    // Is overridden by RenderViewport
+    virtual void SetFOV([[maybe_unused]] float fov) {}
+    virtual float GetFOV() const;
+
+    // Must be overridden in derived classes.
+    // Returns:
+    //   e.g. 4.0/3.0
+    virtual float GetAspectRatio() const = 0;
+    virtual void GetDimensions(int* pWidth, int* pHeight) const;
+    virtual void ScreenToClient(QPoint& pPoint) const override;
+
+    virtual void ResetContent();
+    virtual void UpdateContent(int flags);
+
+    //! Set current zoom factor for this viewport.
+    virtual void SetZoomFactor(float fZoomFactor);
+
+    //! Get current zoom factor for this viewport.
+    virtual float GetZoomFactor() const;
+
+    virtual void OnActivate();
+    virtual void OnDeactivate();
+
+    //! Map world space position to viewport position.
+    virtual QPoint   WorldToView(const Vec3& wp) const override;
+
+    //! Map world space position to 3D viewport position.
+    virtual Vec3    WorldToView3D(const Vec3& wp, int nFlags = 0) const;
+
+    //! Map viewport position to world space position.
+    virtual Vec3 ViewToWorld(const QPoint& vp, bool* pCollideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
+    //! Convert point on screen to world ray.
+    virtual void        ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
+    //! Get normal for viewport position
+    virtual Vec3        ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
+
+    //! Map view point to world space using current construction plane.
+    Vec3 MapViewToCP(const QPoint& point) override { return MapViewToCP(point, GetAxisConstrain()); }
+    virtual Vec3 MapViewToCP(const QPoint& point, int axis);
+
+    //! This method return a vector (p2-p1) in world space alligned to construction plane and restriction axises.
+    //! p1 and p2 must be given in world space and lie on construction plane.
+    virtual Vec3 GetCPVector(const Vec3& p1, const Vec3& p2, int axis);
+
+    //! Snap any given 3D world position to grid lines if snap is enabled.
+    Vec3 SnapToGrid(const Vec3& vec) override;
+    virtual float GetGridStep() const;
+
+    //! 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.
+    virtual float GetScreenScaleFactor([[maybe_unused]] const Vec3& worldPoint) const { return 1; };
+
+    void SetAxisConstrain(int axis);
+
+    /// Take raw input and create a final mouse interaction.
+    /// @attention Do not map **point** from widget to viewport explicitly,
+    /// this is handled internally by BuildMouseInteraction - just pass directly.
+    virtual AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Selection.
+    //////////////////////////////////////////////////////////////////////////
+    //! Resets current selection region.
+    virtual void ResetSelectionRegion();
+    //! Set 2D selection rectangle.
+    void SetSelectionRectangle(const QRect& rect) override;
+
+    //! Return 2D selection rectangle.
+    QRect GetSelectionRectangle() const override { return m_selectedRect; };
+    //! Called when dragging selection rectangle.
+    void OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect = false) override;
+    //! Get selection procision tolerance.
+    float GetSelectionTolerance() const { return m_selectionTolerance; }
+    //! Center viewport on selection.
+    void CenterOnSelection() override {}
+    void CenterOnAABB([[maybe_unused]] const AABB& aabb) override {}
+
+    virtual void CenterOnSliceInstance() {}
+
+    //! Performs hit testing of 2d point in view to find which object hit.
+    bool HitTest(const QPoint& point, HitContext& hitInfo) 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;
+
+    // Access to the member m_bAdvancedSelectMode so interested modules can know its value.
+    bool GetAdvancedSelectModeFlag();
+
+    virtual void GetPerpendicularAxis(EAxis* pAxis, bool* pIs2D) const;
+    virtual const ::Plane* GetConstructionPlane() const { return &m_constructionPlane; }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Set construction plane from given position construction matrix refrence coord system and axis settings.
+    //////////////////////////////////////////////////////////////////////////
+    void MakeConstructionPlane(int axis) override;
+    virtual void SetConstructionMatrix(RefCoordSys coordSys, const Matrix34& xform);
+    virtual const Matrix34& GetConstructionMatrix(RefCoordSys coordSys);
+    // Set simple construction plane origin.
+    void SetConstructionOrigin(const Vec3& worldPos);
+    //////////////////////////////////////////////////////////////////////////
+
+    void DegradateQuality(bool bEnable);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Undo for viewpot operations.
+    void BeginUndo();
+    void AcceptUndo(const QString& undoDescription);
+    void CancelUndo();
+    void RestoreUndo();
+    bool IsUndoRecording() const;
+    //////////////////////////////////////////////////////////////////////////
+
+    //! Get prefered original size for this viewport.
+    //! if 0, then no preference.
+    virtual QSize GetIdealSize() const;
+
+    //! Check if world space bounding box is visible in this view.
+    virtual bool IsBoundsVisible(const AABB& box) const;
+
+    //////////////////////////////////////////////////////////////////////////
+
+    void SetCursor(const QCursor& cursor)
+    {
+        setCursor(cursor);
+    }
+
+    // Set`s current cursor string.
+    void SetCurrentCursor(const QCursor& hCursor, const QString& cursorString);
+    virtual void SetCurrentCursor(EStdCursor stdCursor, const QString& cursorString);
+    void SetCurrentCursor(EStdCursor stdCursor);
+    virtual void SetCursorString(const QString& cursorString);
+    void ResetCursor();
+    void SetSupplementaryCursorStr(const QString& str);
+
+    //////////////////////////////////////////////////////////////////////////
+    // Return visble objects cache.
+    CBaseObjectsCache* GetVisibleObjectsCache() { return m_pVisibleObjectsCache; };
+
+    void RegisterRenderListener(IRenderListener*    piListener);
+    bool UnregisterRenderListener(IRenderListener*  piListener);
+    bool IsRenderListenerRegistered(IRenderListener*    piListener);
+
+    void AddPostRenderer(IPostRenderer* pPostRenderer);
+    bool RemovePostRenderer(IPostRenderer* pPostRenderer);
+
+    void CaptureMouse() override { m_mouseCaptured = true;  QWidget::grabMouse(); }
+    void ReleaseMouse() override { m_mouseCaptured = false;  QWidget::releaseMouse(); }
+
+    virtual void setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir);
+    virtual void setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir);
+    QPoint m_vp;
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    Vec3 m_raySrc;
+    Vec3 m_rayDir;
+
+    // Greater than 0 while running MouseCallback() function. It needs to be a counter
+    // because of recursive calls to MouseCallback(). It's used to make an exception
+    // during the SScopedCurrentContext count check of m_cameraSetForWidgetRenderingCount.
+    int m_processingMouseCallbacksCounter = 0;
+
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+protected:
+    friend class CViewManager;
+    bool IsVectorInValidRange(const Vec3& v) const { return fabs(v.x) < 1e+8 && fabs(v.y) < 1e+8 && fabs(v.z) < 1e+8; }
+    void AssignConstructionPlane(const Vec3& p1, const Vec3& p2, const Vec3& p3);
+    HWND renderOverlayHWND() const;
+    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;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void wheelEvent(QWheelEvent* event) override;
+    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);
+#if defined(AZ_PLATFORM_WINDOWS)
+    void OnRawInput(UINT wParam, HRAWINPUT lParam);
+#endif
+    void OnSetCursor();
+
+    virtual void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt);
+    void dragEnterEvent(QDragEnterEvent* event) override;
+    void dragMoveEvent(QDragMoveEvent* event) override;
+    void dragLeaveEvent(QDragLeaveEvent* event) override;
+    void dropEvent(QDropEvent* event) override;
+
+    //Child classes can override these to provide extra logic that wraps
+    //widget rendering. Needed by the RenderViewport to handle raycasts
+    //from screen-space to world-space.
+    virtual void PreWidgetRendering() {}
+    virtual void PostWidgetRendering() {}
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    AzToolsFramework::ViewportUi::ViewportUiManager m_viewportUi;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    float m_selectionTolerance;
+    QMenu m_cViewMenu;
+
+    mutable float m_fZoomFactor;
+
+    QPoint m_cMouseDownPos;
+
+    //! Current selected rectangle.
+    QRect m_selectedRect;
+
+    int m_activeAxis;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    //! Current construction plane.
+    ::Plane m_constructionPlane;
+    Vec3 m_constructionPlaneAxisX;
+    Vec3 m_constructionPlaneAxisY;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+    // When true selection helpers will be shown and hit tested against.
+    bool m_bAdvancedSelectMode;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Standard cursors.
+    //////////////////////////////////////////////////////////////////////////
+    QCursor m_hCursor[STD_CURSOR_LAST];
+    QCursor m_hCurrCursor;
+
+    //! Mouse is over this object.
+    CBaseObject* m_pMouseOverObject;
+    QString m_cursorStr;
+    QString m_cursorSupplementaryStr;
+
+    static bool m_bDegradateQuality;
+
+    // Grid size modifier due to zoom.
+    float m_fGridZoom;
+
+    int m_nLastUpdateFrame;
+    int m_nLastMouseMoveFrame;
+
+    CBaseObjectsCache* m_pVisibleObjectsCache;
+
+    QRect m_rcClient;
+
+    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+    // Same construction matrix is shared by all viewports.
+    Matrix34 m_constructionMatrix[LAST_COORD_SYSTEM];
+
+    std::vector<IRenderListener*>           m_cRenderListeners;
+
+    typedef std::vector<_smart_ptr<IPostRenderer> > PostRenderers;
+    PostRenderers   m_postRenderers;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+protected:
+    bool m_mouseCaptured = false;
+
+private:
+    QWidget m_renderOverlay;
+};
diff --git a/Code/Editor/ViewportManipulatorController.cpp b/Code/Editor/ViewportManipulatorController.cpp
new file mode 100644
index 0000000000..c7d2885cb2
--- /dev/null
+++ b/Code/Editor/ViewportManipulatorController.cpp
@@ -0,0 +1,243 @@
+/*
+ * 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 "ViewportManipulatorController.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/Viewport/ScreenGeometry.h>
+#include <AzCore/Script/ScriptTimePoint.h>
+
+#include <QApplication>
+
+static const auto ManipulatorPriority = AzFramework::ViewportControllerPriority::Highest;
+static const auto InteractionPriority = AzFramework::ViewportControllerPriority::High;
+
+namespace SandboxEditor
+{
+    ViewportManipulatorControllerInstance::ViewportManipulatorControllerInstance(
+        AzFramework::ViewportId viewport, ViewportManipulatorController* controller)
+        : AzFramework::MultiViewportControllerInstanceInterface<ViewportManipulatorController>(viewport, controller)
+    {
+    }
+
+    AzToolsFramework::ViewportInteraction::MouseButton ViewportManipulatorControllerInstance::GetMouseButton(
+        const AzFramework::InputChannel& inputChannel)
+    {
+        using AzToolsFramework::ViewportInteraction::MouseButton;
+        using InputButton = AzFramework::InputDeviceMouse::Button;
+        const auto& id = inputChannel.GetInputChannelId();
+        if (id == InputButton::Left)
+        {
+            return MouseButton::Left;
+        }
+        if (id == InputButton::Middle)
+        {
+            return MouseButton::Middle;
+        }
+        if (id == InputButton::Right)
+        {
+            return MouseButton::Right;
+        }
+        return MouseButton::None;
+    }
+
+    bool ViewportManipulatorControllerInstance::IsMouseMove(const AzFramework::InputChannel& inputChannel)
+    {
+        return inputChannel.GetInputChannelId() == AzFramework::InputDeviceMouse::SystemCursorPosition;
+    }
+
+    AzToolsFramework::ViewportInteraction::KeyboardModifier ViewportManipulatorControllerInstance::GetKeyboardModifier(
+        const AzFramework::InputChannel& inputChannel)
+    {
+        using AzToolsFramework::ViewportInteraction::KeyboardModifier;
+        using Key = AzFramework::InputDeviceKeyboard::Key;
+        const auto& id = inputChannel.GetInputChannelId();
+        if (id == Key::ModifierAltL || id == Key::ModifierAltR)
+        {
+            return KeyboardModifier::Alt;
+        }
+        if (id == Key::ModifierCtrlL || id == Key::ModifierCtrlR)
+        {
+            return KeyboardModifier::Ctrl;
+        }
+        if (id == Key::ModifierShiftL || id == Key::ModifierShiftR)
+        {
+            return KeyboardModifier::Shift;
+        }
+        return KeyboardModifier::None;
+    }
+
+    bool ViewportManipulatorControllerInstance::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
+    {
+        // We only care about manipulator and viewport interaction events
+        if (event.m_priority != ManipulatorPriority && event.m_priority != InteractionPriority)
+        {
+            return false;
+        }
+
+        using InteractionBus = AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
+        using namespace AzToolsFramework::ViewportInteraction;
+        using AzFramework::InputChannel;
+
+        bool interactionHandled = false;
+        float wheelDelta = 0.0f;
+        AZStd::optional<MouseButton> overrideButton;
+        AZStd::optional<MouseEvent> eventType;
+
+        // Because we receive events multiple times at separate priorities for manipulator events and
+        // viewport interaction events, we want to avoid updating our "last tick state" until we're on our last event,
+        // which currently is the low priority Interaction processor.
+        const bool finishedProcessingEvents = event.m_priority == InteractionPriority;
+
+        const auto state = event.m_inputChannel.GetState();
+        if (IsMouseMove(event.m_inputChannel))
+        {
+            // Cache the ray trace results when doing manipulator interaction checks, no need to recalculate after
+            if (event.m_priority == ManipulatorPriority)
+            {
+                AzFramework::ScreenPoint screenPosition = AzFramework::ScreenPoint(0, 0);
+                ViewportMouseCursorRequestBus::EventResult(
+                    screenPosition, GetViewportId(), &ViewportMouseCursorRequestBus::Events::ViewportCursorScreenPosition);
+
+                m_mouseInteraction.m_mousePick.m_screenCoordinates = screenPosition;
+                AZStd::optional<ProjectedViewportRay> ray;
+                ViewportInteractionRequestBus::EventResult(
+                    ray, GetViewportId(), &ViewportInteractionRequestBus::Events::ViewportScreenToWorldRay, screenPosition);
+
+                if (ray.has_value())
+                {
+                    m_mouseInteraction.m_mousePick.m_rayOrigin = ray.value().origin;
+                    m_mouseInteraction.m_mousePick.m_rayDirection = ray.value().direction;
+                }
+            }
+            eventType = MouseEvent::Move;
+        }
+        else if (auto mouseButton = GetMouseButton(event.m_inputChannel); mouseButton != MouseButton::None)
+        {
+            const AZ::u32 mouseButtonValue = static_cast<AZ::u32>(mouseButton);
+            overrideButton = mouseButton;
+            if (state == InputChannel::State::Began)
+            {
+                m_mouseInteraction.m_mouseButtons.m_mouseButtons |= mouseButtonValue;
+                if (IsDoubleClick(mouseButton))
+                {
+                    // Only remove the double click flag once we're done processing both Manipulator and Interaction events
+                    if (event.m_priority == InteractionPriority)
+                    {
+                        m_pendingDoubleClicks.erase(mouseButton);
+                    }
+                    eventType = MouseEvent::DoubleClick;
+                }
+                else
+                {
+                    // 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;
+                    }
+                    eventType = MouseEvent::Down;
+                }
+            }
+            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.
+                if (m_mouseInteraction.m_mouseButtons.m_mouseButtons & mouseButtonValue)
+                {
+                    // Erase the button from our state if we're done processing events.
+                    if (event.m_priority == InteractionPriority)
+                    {
+                        m_mouseInteraction.m_mouseButtons.m_mouseButtons &= ~mouseButtonValue;
+                    }
+                    eventType = MouseEvent::Up;
+                }
+            }
+        }
+        else if (auto keyboardModifier = GetKeyboardModifier(event.m_inputChannel); keyboardModifier != KeyboardModifier::None)
+        {
+            if (state == InputChannel::State::Began || state == InputChannel::State::Updated)
+            {
+                m_mouseInteraction.m_keyboardModifiers.m_keyModifiers |= static_cast<AZ::u32>(keyboardModifier);
+            }
+            else if (state == InputChannel::State::Ended)
+            {
+                m_mouseInteraction.m_keyboardModifiers.m_keyModifiers &= ~static_cast<AZ::u32>(keyboardModifier);
+            }
+        }
+        else if (event.m_inputChannel.GetInputChannelId() == AzFramework::InputDeviceMouse::Movement::Z)
+        {
+            if (state == InputChannel::State::Began || state == InputChannel::State::Updated)
+            {
+                eventType = MouseEvent::Wheel;
+                wheelDelta = event.m_inputChannel.GetValue();
+            }
+        }
+
+        if (eventType)
+        {
+            MouseInteraction mouseInteraction = m_mouseInteraction;
+            if (overrideButton)
+            {
+                mouseInteraction.m_mouseButtons.m_mouseButtons = static_cast<AZ::u32>(overrideButton.value());
+            }
+
+            mouseInteraction.m_interactionId.m_viewportId = GetViewportId();
+
+            // Depending on priority, we dispatch to either the manipulator or viewport interaction event
+            const auto& targetInteractionEvent = event.m_priority == ManipulatorPriority
+                ? &InteractionBus::Events::InternalHandleMouseManipulatorInteraction
+                : &InteractionBus::Events::InternalHandleMouseViewportInteraction;
+
+            const auto mouseInteractionEvent = [mouseInteraction, event = eventType.value(), wheelDelta] {
+                switch (event)
+                {
+                case MouseEvent::Up:
+                case MouseEvent::Down:
+                case MouseEvent::Move:
+                case MouseEvent::DoubleClick:
+                    return MouseInteractionEvent(AZStd::move(mouseInteraction), event);
+                case MouseEvent::Wheel:
+                    return MouseInteractionEvent(AZStd::move(mouseInteraction), wheelDelta);
+                }
+
+                AZ_Assert(false, "Unhandled MouseEvent");
+                return MouseInteractionEvent(MouseInteraction{}, MouseEvent::Up);
+            }();
+
+            InteractionBus::EventResult(
+                interactionHandled, AzToolsFramework::GetEntityContextId(), targetInteractionEvent, mouseInteractionEvent);
+        }
+
+        return interactionHandled;
+    }
+
+    void ViewportManipulatorControllerInstance::ResetInputChannels()
+    {
+        m_pendingDoubleClicks.clear();
+        m_mouseInteraction = AzToolsFramework::ViewportInteraction::MouseInteraction();
+    }
+
+    void ViewportManipulatorControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
+    {
+        m_curTime = event.m_time;
+    }
+
+    bool ViewportManipulatorControllerInstance::IsDoubleClick(AzToolsFramework::ViewportInteraction::MouseButton button) const
+    {
+        auto clickIt = m_pendingDoubleClicks.find(button);
+        if (clickIt == m_pendingDoubleClicks.end())
+        {
+            return false;
+        }
+        const double doubleClickThresholdMilliseconds = qApp->doubleClickInterval();
+        return (m_curTime.GetMilliseconds() - clickIt->second.GetMilliseconds()) < doubleClickThresholdMilliseconds;
+    }
+} //namespace SandboxEditor
diff --git a/Code/Editor/ViewportManipulatorController.h b/Code/Editor/ViewportManipulatorController.h
new file mode 100644
index 0000000000..90f048295c
--- /dev/null
+++ b/Code/Editor/ViewportManipulatorController.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzFramework/Viewport/ViewportId.h>
+#include <AzFramework/Viewport/MultiViewportController.h>
+#include <AzFramework/Input/Events/InputChannelEventListener.h>
+#include <AzToolsFramework/Viewport/ViewportTypes.h>
+
+namespace SandboxEditor
+{
+    class ViewportManipulatorControllerInstance;
+    using ViewportManipulatorController = AzFramework::MultiViewportController<ViewportManipulatorControllerInstance, AzFramework::ViewportControllerPriority::DispatchToAllPriorities>;
+
+    class ViewportManipulatorControllerInstance final
+        : public AzFramework::MultiViewportControllerInstanceInterface<ViewportManipulatorController>
+    {
+    public:
+        explicit ViewportManipulatorControllerInstance(AzFramework::ViewportId viewport, ViewportManipulatorController* controller);
+
+        bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
+        void ResetInputChannels() override;
+        void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
+
+    private:
+        bool IsDoubleClick(AzToolsFramework::ViewportInteraction::MouseButton) const;
+
+        static AzToolsFramework::ViewportInteraction::MouseButton GetMouseButton(const AzFramework::InputChannel& inputChannel);
+        static bool IsMouseMove(const AzFramework::InputChannel& inputChannel);
+        static AzToolsFramework::ViewportInteraction::KeyboardModifier GetKeyboardModifier(const AzFramework::InputChannel& inputChannel);
+
+        AzToolsFramework::ViewportInteraction::MouseInteraction m_mouseInteraction;
+        AZStd::unordered_map<AzToolsFramework::ViewportInteraction::MouseButton, AZ::ScriptTimePoint> m_pendingDoubleClicks;
+        AZ::ScriptTimePoint m_curTime;
+    };
+} //namespace SandboxEditor
diff --git a/Code/Editor/ViewportTitleDlg.cpp b/Code/Editor/ViewportTitleDlg.cpp
new file mode 100644
index 0000000000..3090cf8e63
--- /dev/null
+++ b/Code/Editor/ViewportTitleDlg.cpp
@@ -0,0 +1,1021 @@
+/*
+ * 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 : CViewportTitleDlg implementation file
+
+#if !defined(Q_MOC_RUN)
+#include "EditorDefs.h"
+
+#include "ViewportTitleDlg.h"
+
+// Qt
+#include <QInputDialog>
+
+#include <AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h>
+
+// CryCommon
+#include <CryCommon/SFunctor.h>
+
+// Editor
+#include "Settings.h"
+#include "ViewPane.h"
+#include "DisplaySettings.h"
+#include "CustomResolutionDlg.h"
+#include "CustomAspectRatioDlg.h"
+#include "Include/IObjectManager.h"
+#include "UsedResources.h"
+#include "Objects/SelectionGroup.h"
+#include "UsedResources.h"
+#include "Include/IObjectManager.h"
+#include "ActionManager.h"
+#include "MainWindow.h"
+#include "GameEngine.h"
+#include "MathConversion.h"
+#include "EditorViewportSettings.h"
+
+#include <AzCore/std/algorithm.h>
+#include <AzCore/Casting/numeric_cast.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_ViewportTitleDlg.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#endif //!defined(Q_MOC_RUN)
+
+// CViewportTitleDlg dialog
+
+inline namespace Helpers
+{
+    void ToggleHelpers()
+    {
+        const bool newValue = !GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
+        GetIEditor()->GetDisplaySettings()->DisplayHelpers(newValue);
+        GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
+
+        if (newValue == false)
+        {
+            GetIEditor()->GetObjectManager()->SendEvent(EVENT_HIDE_HELPER);
+        }
+        AzToolsFramework::ViewportInteraction::ViewportSettingsNotificationBus::Broadcast(
+            &AzToolsFramework::ViewportInteraction::ViewportSettingNotifications::OnDrawHelpersChanged, newValue);
+    }
+
+    bool IsHelpersShown()
+    {
+        return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
+    }
+}
+
+namespace
+{
+    class CViewportTitleDlgDisplayInfoHelper
+        : public QObject
+        , public AZ::AtomBridge::AtomViewportInfoDisplayNotificationBus::Handler
+    {
+        Q_OBJECT
+
+    public:
+        CViewportTitleDlgDisplayInfoHelper(CViewportTitleDlg* parent)
+            : QObject(parent)
+        {
+            AZ::AtomBridge::AtomViewportInfoDisplayNotificationBus::Handler::BusConnect();
+        }
+
+    signals:
+        void ViewportInfoStatusUpdated(int newIndex);
+
+    private:
+        void OnViewportInfoDisplayStateChanged(AZ::AtomBridge::ViewportInfoDisplayState state)
+        {
+            emit ViewportInfoStatusUpdated(static_cast<int>(state));
+        }
+    };
+} //end anonymous namespace
+
+CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
+    : QWidget(pParent)
+    , m_ui(new Ui::ViewportTitleDlg)
+{
+    auto container = new QWidget(this);
+    m_ui->setupUi(container);
+    auto layout = new QVBoxLayout(this);
+    layout->setMargin(0);
+    layout->addWidget(container);
+    container->setObjectName("ViewportTitleDlgContainer");
+
+    m_prevMoveSpeed = 0;
+
+    m_pViewPane = nullptr;
+    GetIEditor()->RegisterNotifyListener(this);
+    GetISystem()->GetISystemEventDispatcher()->RegisterListener(this);
+
+    LoadCustomPresets("FOVPresets", "FOVPreset", m_customFOVPresets);
+    LoadCustomPresets("AspectRatioPresets", "AspectRatioPreset", m_customAspectRatioPresets);
+    LoadCustomPresets("ResPresets", "ResPreset", m_customResPresets);
+
+    // audio request setup
+    m_oMuteAudioRequest.pData = &m_oMuteAudioRequestData;
+    m_oUnmuteAudioRequest.pData = &m_oUnmuteAudioRequestData;
+
+    SetupCameraDropdownMenu();
+    SetupResolutionDropdownMenu();
+    SetupViewportInformationMenu();
+    SetupHelpersButton();
+    SetupOverflowMenu();
+
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, gSettings.bMuteAudio ? m_oMuteAudioRequest : m_oUnmuteAudioRequest);
+
+    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);
+}
+
+void CViewportTitleDlg::SetupCameraDropdownMenu()
+{
+    // Setup the camera dropdown menu
+    QMenu* cameraMenu = new QMenu(this);
+    cameraMenu->addMenu(GetFovMenu());
+    m_ui->m_cameraMenu->setMenu(cameraMenu);
+    m_ui->m_cameraMenu->setPopupMode(QToolButton::InstantPopup);
+    QAction* gotoPositionAction = new QAction("Go to position", cameraMenu);
+    connect(gotoPositionAction, &QAction::triggered, this, &CViewportTitleDlg::OnBnClickedGotoPosition);
+    cameraMenu->addAction(gotoPositionAction);
+    cameraMenu->addSeparator();
+
+    auto cameraSpeedActionWidget = new QWidgetAction(cameraMenu);
+    auto cameraSpeedContainer = new QWidget(cameraMenu);
+    auto cameraSpeedLabel = new QLabel(tr("Camera Speed"), cameraMenu);
+    m_cameraSpeed = new QComboBox(cameraMenu);
+    m_cameraSpeed->setEditable(true);
+    m_cameraSpeed->setValidator(new QDoubleValidator(m_minSpeed, m_maxSpeed, m_numDecimals, m_cameraSpeed));
+    m_cameraSpeed->installEventFilter(this);
+
+    QHBoxLayout* cameraSpeedLayout = new QHBoxLayout;
+    cameraSpeedLayout->addWidget(cameraSpeedLabel);
+    cameraSpeedLayout->addWidget(m_cameraSpeed);
+    cameraSpeedContainer->setLayout(cameraSpeedLayout);
+    cameraSpeedActionWidget->setDefaultWidget(cameraSpeedContainer);
+
+    // Save off the move speed here since setting up the combo box can cause it to update values in the background.
+    const float cameraMoveSpeed = SandboxEditor::UsingNewCameraSystem() ? SandboxEditor::CameraTranslateSpeed() : gSettings.cameraMoveSpeed;
+
+    // Populate the presets in the ComboBox
+    for (float presetValue : m_speedPresetValues)
+    {
+        m_cameraSpeed->addItem(QString().setNum(presetValue, 'f', m_numDecimals), presetValue);
+    }
+
+    auto comboBoxTextChanged = static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged);
+
+    SetSpeedComboBox(cameraMoveSpeed);
+    m_cameraSpeed->setInsertPolicy(QComboBox::InsertAtBottom);
+    m_cameraSpeed->setDuplicatesEnabled(false);
+    connect(m_cameraSpeed, comboBoxTextChanged, this, &CViewportTitleDlg::OnUpdateMoveSpeedText);
+    connect(m_cameraSpeed->lineEdit(), &QLineEdit::returnPressed, this, &CViewportTitleDlg::OnSpeedComboBoxEnter);
+
+    cameraMenu->addAction(cameraSpeedActionWidget);
+}
+
+void CViewportTitleDlg::SetupResolutionDropdownMenu()
+{
+    // Setup the resolution dropdown menu
+    QMenu* resolutionMenu = new QMenu(this);
+    resolutionMenu->addMenu(GetAspectMenu());
+    resolutionMenu->addMenu(GetResolutionMenu());
+    m_ui->m_resolutionMenu->setMenu(resolutionMenu);
+    m_ui->m_resolutionMenu->setPopupMode(QToolButton::InstantPopup);
+}
+
+void CViewportTitleDlg::SetupViewportInformationMenu()
+{
+    // Setup the debug information button
+    m_ui->m_debugInformationMenu->setMenu(GetViewportInformationMenu());
+    connect(m_ui->m_debugInformationMenu, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleDisplayInfo);
+    m_ui->m_debugInformationMenu->setPopupMode(QToolButton::MenuButtonPopup);
+
+}
+
+void CViewportTitleDlg::SetupHelpersButton()
+{
+    connect(m_ui->m_helpers, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleHelpers);
+    m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
+}
+
+void CViewportTitleDlg::SetupOverflowMenu()
+{
+    // Setup the overflow menu
+    QMenu* overFlowMenu = new QMenu(this);
+
+    m_audioMuteAction = new QAction("Mute Audio", overFlowMenu);
+    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);
+    connect(m_enableGridSnappingAction, &QAction::triggered, this, &CViewportTitleDlg::OnGridSnappingToggled);
+    m_enableGridSnappingAction->setCheckable(true);
+    overFlowMenu->addAction(m_enableGridSnappingAction);
+
+    m_gridSizeActionWidget = new QWidgetAction(overFlowMenu);
+    m_gridSpinBox = new AzQtComponents::DoubleSpinBox();
+    m_gridSpinBox->setValue(SandboxEditor::GridSnappingSize());
+    m_gridSpinBox->setMinimum(1e-2f);
+    m_gridSpinBox->setToolTip(tr("Grid size"));
+
+    QObject::connect(
+        m_gridSpinBox, QOverload<double>::of(&AzQtComponents::DoubleSpinBox::valueChanged), this, &CViewportTitleDlg::OnGridSpinBoxChanged);
+
+    m_gridSizeActionWidget->setDefaultWidget(m_gridSpinBox);
+    overFlowMenu->addAction(m_gridSizeActionWidget);
+
+    overFlowMenu->addSeparator();
+
+    m_enableAngleSnappingAction = new QAction("Enable Angle Snapping", overFlowMenu);
+    connect(m_enableAngleSnappingAction, &QAction::triggered, this, &CViewportTitleDlg::OnAngleSnappingToggled);
+    m_enableAngleSnappingAction->setCheckable(true);
+    overFlowMenu->addAction(m_enableAngleSnappingAction);
+
+    m_angleSizeActionWidget = new QWidgetAction(overFlowMenu);
+    m_angleSpinBox = new AzQtComponents::DoubleSpinBox();
+    m_angleSpinBox->setValue(SandboxEditor::AngleSnappingSize());
+    m_angleSpinBox->setMinimum(1e-2f);
+    m_angleSpinBox->setToolTip(tr("Angle Snapping"));
+
+    QObject::connect(
+        m_angleSpinBox, QOverload<double>::of(&AzQtComponents::DoubleSpinBox::valueChanged), this,
+        &CViewportTitleDlg::OnAngleSpinBoxChanged);
+
+    m_angleSizeActionWidget->setDefaultWidget(m_angleSpinBox);
+    overFlowMenu->addAction(m_angleSizeActionWidget);
+
+    m_ui->m_overflowBtn->setMenu(overFlowMenu);
+    m_ui->m_overflowBtn->setPopupMode(QToolButton::InstantPopup);
+    connect(overFlowMenu, &QMenu::aboutToShow, this, &CViewportTitleDlg::UpdateOverFlowMenuState);
+
+    UpdateMuteActionText();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::SetViewPane(CLayoutViewPane* pViewPane)
+{
+    if (m_pViewPane)
+        m_pViewPane->disconnect(this);
+    m_pViewPane = pViewPane;
+    if (m_pViewPane)
+        connect(this, &QWidget::customContextMenuRequested, m_pViewPane, &CLayoutViewPane::ShowTitleMenu);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnInitDialog()
+{
+    m_ui->m_titleBtn->setText(m_title);
+
+    // Add a child parented to us that listens for r_displayInfo changes.
+    auto displayInfoHelper = new CViewportTitleDlgDisplayInfoHelper(this);
+    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 = metrics.boundingRect("-9999.99").width() * m_fieldWidthMultiplier;
+
+    m_cameraSpeed->setFixedWidth(width);
+
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::SetTitle(const QString& title)
+{
+    m_title = title;
+    m_ui->m_titleBtn->setText(m_title);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnMaximize()
+{
+    if (m_pViewPane)
+    {
+        m_pViewPane->ToggleMaximize();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnToggleHelpers()
+{
+    Helpers::ToggleHelpers();
+    m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
+}
+
+void CViewportTitleDlg::SetNoViewportInfo()
+{
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::NoInfo);
+}
+
+void CViewportTitleDlg::SetNormalViewportInfo()
+{
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::NormalInfo);
+}
+
+void CViewportTitleDlg::SetFullViewportInfo()
+{
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::FullInfo);
+}
+
+void CViewportTitleDlg::SetCompactViewportInfo()
+{
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::CompactInfo);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::UpdateDisplayInfo()
+{
+    if (m_viewportInformationMenu == nullptr)
+    {
+        // Nothing to update, just return;
+        return;
+    }
+
+    AZ::AtomBridge::ViewportInfoDisplayState state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::BroadcastResult(
+        state,
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState
+    );
+
+    m_noInformationAction->setChecked(false);
+    m_normalInformationAction->setChecked(false);
+    m_fullInformationAction->setChecked(false);
+    m_compactInformationAction->setChecked(false);
+
+    switch (state)
+    {
+        case AZ::AtomBridge::ViewportInfoDisplayState::NormalInfo:
+            {
+                m_normalInformationAction->setChecked(true);
+                break;
+            }
+        case AZ::AtomBridge::ViewportInfoDisplayState::FullInfo:
+            {
+                m_fullInformationAction->setChecked(true);
+                break;
+            }
+        case AZ::AtomBridge::ViewportInfoDisplayState::CompactInfo:
+            {
+                m_compactInformationAction->setChecked(true);
+                break;
+            }
+        case AZ::AtomBridge::ViewportInfoDisplayState::NoInfo:
+        default:
+            {
+                m_noInformationAction->setChecked(true);
+                break;
+            }
+    }
+
+    m_ui->m_debugInformationMenu->setChecked(state != AZ::AtomBridge::ViewportInfoDisplayState::NoInfo);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnToggleDisplayInfo()
+{
+    AZ::AtomBridge::ViewportInfoDisplayState state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::BroadcastResult(
+        state, &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState);
+    state = aznumeric_cast<AZ::AtomBridge::ViewportInfoDisplayState>(
+        (aznumeric_cast<int>(state) + 1) % aznumeric_cast<int>(AZ::AtomBridge::ViewportInfoDisplayState::Invalid));
+    // SetDisplayState will fire OnViewportInfoDisplayStateChanged and notify us, no need to call UpdateDisplayInfo.
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, state);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::AddFOVMenus(QMenu* menu, std::function<void(float)> callback, const QStringList& customPresets)
+{
+    static const float fovs[] = {
+        10.0f,
+        20.0f,
+        40.0f,
+        55.0f,
+        60.0f,
+        70.0f,
+        80.0f,
+        90.0f
+    };
+
+    static const size_t fovCount = sizeof(fovs) / sizeof(fovs[0]);
+
+    for (size_t i = 0; i < fovCount; ++i)
+    {
+        const float fov = fovs[i];
+        QAction* action = menu->addAction(QString::number(fov));
+        connect(action, &QAction::triggered, action, [fov, callback](){ callback(fov); });
+    }
+
+    menu->addSeparator();
+
+    if (!customPresets.empty())
+    {
+        for (size_t i = 0; i < customPresets.size(); ++i)
+        {
+            if (customPresets[i].isEmpty())
+            {
+                break;
+            }
+
+            float fov = gSettings.viewports.fDefaultFov;
+            bool ok;
+            float f = customPresets[i].toDouble(&ok);
+            if (ok)
+            {
+                fov = std::max(1.0f, f);
+                fov = std::min(120.0f, f);
+                QAction* action = menu->addAction(customPresets[i]);
+                connect(action, &QAction::triggered, action, [fov, callback](){ callback(fov); });
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnMenuFOVCustom()
+{
+    bool ok;
+    int fov = QInputDialog::getInt(this, tr("Custom FOV"), QString(), 60, 1, 120, 1, &ok);
+
+    if (ok)
+    {
+        m_pViewPane->SetViewportFOV(fov);
+
+        // Update the custom presets.
+        const QString text = QString::number(fov);
+        UpdateCustomPresets(text, m_customFOVPresets);
+        SaveCustomPresets("FOVPresets", "FOVPreset", m_customFOVPresets);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::CreateFOVMenu()
+{
+    if (!m_fovMenu)
+    {
+        m_fovMenu = new QMenu("FOV", this);
+    }
+
+    m_fovMenu->clear();
+
+    AddFOVMenus(m_fovMenu, [this](float f) { m_pViewPane->SetViewportFOV(f); }, m_customFOVPresets);
+    if (!m_fovMenu->isEmpty())
+    {
+        m_fovMenu->addSeparator();
+    }
+
+    QAction* action = m_fovMenu->addAction(tr("Custom..."));
+    connect(action, &QAction::triggered, this, &CViewportTitleDlg::OnMenuFOVCustom);
+}
+
+QMenu* const CViewportTitleDlg::GetFovMenu()
+{
+    CreateFOVMenu();
+    return m_fovMenu;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::AddAspectRatioMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets)
+{
+    static const std::pair<unsigned int, unsigned int> ratios[] = {
+        std::pair<unsigned int, unsigned int>(16, 9),
+        std::pair<unsigned int, unsigned int>(16, 10),
+        std::pair<unsigned int, unsigned int>(4, 3),
+        std::pair<unsigned int, unsigned int>(5, 4)
+    };
+
+    static const size_t ratioCount = sizeof(ratios) / sizeof(ratios[0]);
+
+    for (size_t i = 0; i < ratioCount; ++i)
+    {
+        int width = ratios[i].first;
+        int height = ratios[i].second;
+        QAction* action = menu->addAction(QString("%1:%2").arg(width).arg(height));
+        connect(action, &QAction::triggered, action, [width, height, callback]() {callback(width, height); });
+    }
+
+    menu->addSeparator();
+
+    for (size_t i = 0; i < customPresets.size(); ++i)
+    {
+        if (customPresets[i].isEmpty())
+        {
+            break;
+        }
+
+        static QRegularExpression regex(QStringLiteral("^(\\d+):(\\d+)$"));
+        QRegularExpressionMatch matches = regex.match(customPresets[i]);
+        if (matches.hasMatch())
+        {
+            bool ok;
+            unsigned int width = matches.captured(1).toInt(&ok);
+            Q_ASSERT(ok);
+            unsigned int height = matches.captured(2).toInt(&ok);
+            Q_ASSERT(ok);
+            QAction* action = menu->addAction(customPresets[i]);
+            connect(action, &QAction::triggered, action, [width, height, callback]() {callback(width, height); });
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnMenuAspectRatioCustom()
+{
+    const QRect viewportRect = m_pViewPane->GetViewport()->rect();
+    const unsigned int width = viewportRect.width();
+    const unsigned int height = viewportRect.height();
+
+    int whGCD = gcd(width, height);
+    CCustomAspectRatioDlg aspectRatioInputDialog(width / whGCD, height / whGCD, this);
+
+    if (aspectRatioInputDialog.exec() == QDialog::Accepted)
+    {
+        const unsigned int aspectX = aspectRatioInputDialog.GetX();
+        const unsigned int aspectY = aspectRatioInputDialog.GetY();
+
+        m_pViewPane->SetAspectRatio(aspectX, aspectY);
+
+        // Update the custom presets.
+        UpdateCustomPresets(QString::fromLatin1("%1:%2").arg(aspectX).arg(aspectY), m_customAspectRatioPresets);
+        SaveCustomPresets("AspectRatioPresets", "AspectRatioPreset", m_customAspectRatioPresets);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::CreateAspectMenu()
+{
+    if (m_aspectMenu == nullptr)
+    {
+        m_aspectMenu = new QMenu("Aspect Ratio");
+    }
+
+    m_aspectMenu->clear();
+
+    AddAspectRatioMenus(m_aspectMenu, [this](int width, int height) {m_pViewPane->SetAspectRatio(width, height); }, m_customAspectRatioPresets);
+    if (!m_aspectMenu->isEmpty())
+    {
+        m_aspectMenu->addSeparator();
+    }
+
+    QAction* customAction = m_aspectMenu->addAction(tr("Custom..."));
+    connect(customAction, &QAction::triggered, this, &CViewportTitleDlg::OnMenuAspectRatioCustom);
+}
+
+QMenu* const CViewportTitleDlg::GetAspectMenu()
+{
+    CreateAspectMenu();
+    return m_aspectMenu;
+}
+
+QMenu* const CViewportTitleDlg::GetViewportInformationMenu()
+{
+    CreateViewportInformationMenu();
+    return m_viewportInformationMenu;
+}
+
+void CViewportTitleDlg::CreateViewportInformationMenu()
+{
+    if (m_viewportInformationMenu == nullptr)
+    {
+        m_viewportInformationMenu = new QMenu("Viewport Information");
+
+        m_noInformationAction = new QAction(tr("None"), m_viewportInformationMenu);
+        m_noInformationAction->setCheckable(true);
+        connect(m_noInformationAction, &QAction::triggered, this, &CViewportTitleDlg::SetNoViewportInfo);
+        m_viewportInformationMenu->addAction(m_noInformationAction);
+
+        m_normalInformationAction = new QAction(tr("Normal"), m_viewportInformationMenu);
+        m_normalInformationAction->setCheckable(true);
+        connect(m_normalInformationAction, &QAction::triggered, this, &CViewportTitleDlg::SetNormalViewportInfo);
+        m_viewportInformationMenu->addAction(m_normalInformationAction);
+
+        m_fullInformationAction = new QAction(tr("Full"), m_viewportInformationMenu);
+        m_fullInformationAction->setCheckable(true);
+        connect(m_fullInformationAction, &QAction::triggered, this, &CViewportTitleDlg::SetFullViewportInfo);
+        m_viewportInformationMenu->addAction(m_fullInformationAction);
+
+        m_compactInformationAction = new QAction(tr("Compact"), m_viewportInformationMenu);
+        m_compactInformationAction->setCheckable(true);
+        connect(m_compactInformationAction, &QAction::triggered, this, &CViewportTitleDlg::SetCompactViewportInfo);
+        m_viewportInformationMenu->addAction(m_compactInformationAction);
+
+        UpdateDisplayInfo();
+    }
+}
+
+void CViewportTitleDlg::AddResolutionMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets)
+{
+    static const CRenderViewport::SResolution resolutions[] = {
+        CRenderViewport::SResolution(1280, 720),
+        CRenderViewport::SResolution(1920, 1080),
+        CRenderViewport::SResolution(2560, 1440),
+        CRenderViewport::SResolution(2048, 858),
+        CRenderViewport::SResolution(1998, 1080),
+        CRenderViewport::SResolution(3840, 2160)
+    };
+
+    static const size_t resolutionCount = sizeof(resolutions) / sizeof(resolutions[0]);
+
+    for (size_t i = 0; i < resolutionCount; ++i)
+    {
+        const int width = resolutions[i].width;
+        const int height = resolutions[i].height;
+        const QString text = QString::fromLatin1("%1 x %2").arg(width).arg(height);
+        QAction* action = menu->addAction(text);
+        connect(action, &QAction::triggered, action, [width, height, callback](){ callback(width, height); });
+    }
+
+    menu->addSeparator();
+
+    for (size_t i = 0; i < customPresets.size(); ++i)
+    {
+        if (customPresets[i].isEmpty())
+        {
+            break;
+        }
+
+        static QRegularExpression regex(QStringLiteral("^(\\d+) x (\\d+)$"));
+        QRegularExpressionMatch matches = regex.match(customPresets[i]);
+        if (matches.hasMatch())
+        {
+            bool ok;
+            int width = matches.captured(1).toInt(&ok);
+            Q_ASSERT(ok);
+            int height = matches.captured(2).toInt(&ok);
+            Q_ASSERT(ok);
+            QAction* action = menu->addAction(customPresets[i]);
+            connect(action, &QAction::triggered, action, [width, height, callback](){ callback(width, height); });
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnMenuResolutionCustom()
+{
+    const QRect rectViewport = m_pViewPane->GetViewport()->rect();
+    CCustomResolutionDlg resDlg(rectViewport.width(), rectViewport.height(), parentWidget());
+    if (resDlg.exec() == QDialog::Accepted)
+    {
+        m_pViewPane->ResizeViewport(resDlg.GetWidth(), resDlg.GetHeight());
+        // Update the custom presets.
+        const QString text = QString::fromLatin1("%1 x %2").arg(resDlg.GetWidth()).arg(resDlg.GetHeight());
+        UpdateCustomPresets(text, m_customResPresets);
+        SaveCustomPresets("ResPresets", "ResPreset", m_customResPresets);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::CreateResolutionMenu()
+{
+    if (!m_resolutionMenu)
+    {
+        m_resolutionMenu = new QMenu("Resolution");
+    }
+
+    m_resolutionMenu->clear();
+
+    AddResolutionMenus(m_resolutionMenu, [this](int width, int height) { m_pViewPane->ResizeViewport(width, height); }, m_customResPresets);
+    if (!m_resolutionMenu->isEmpty())
+    {
+        m_resolutionMenu->addSeparator();
+    }
+
+    QAction* action = m_resolutionMenu->addAction(tr("Custom..."));
+    connect(action, &QAction::triggered, this, &CViewportTitleDlg::OnMenuResolutionCustom);
+}
+
+QMenu* const CViewportTitleDlg::GetResolutionMenu()
+{
+    CreateResolutionMenu();
+    return m_resolutionMenu;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnViewportSizeChanged(int width, int height)
+{
+    m_resolutionMenu->setTitle(QString::fromLatin1("Resolution:  %1 x %2").arg(width).arg(height));
+
+    if (width != 0 && height != 0)
+    {
+        // Calculate greatest common divider of width & height
+        int whGCD = gcd(width, height);
+
+        m_aspectMenu->setTitle(QString::fromLatin1("Ratio:  %1:%2").arg(width / whGCD).arg(height / whGCD));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnViewportFOVChanged(float fov)
+{
+    const float degFOV = RAD2DEG(fov);
+    if (m_fovMenu)
+    {
+        m_fovMenu->setTitle(QString::fromLatin1("FOV:  %1%2").arg(qRound(degFOV)).arg(QString(QByteArray::fromPercentEncoding("%C2%B0"))));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnDisplayRenderUpdate:
+        m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
+        break;
+    case eNotify_OnBeginGameMode:
+    case eNotify_OnEndGameMode:
+        UpdateMuteActionText();
+        break;
+    }
+}
+
+void CViewportTitleDlg::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam)
+{
+    if (event == ESYSTEM_EVENT_RESIZE)
+    {
+        if (m_pViewPane)
+        {
+            const int eventWidth = static_cast<int>(wparam);
+            const int eventHeight = static_cast<int>(lparam);
+            const QWidget* viewport = m_pViewPane->GetViewport();
+
+            // This should eventually be converted to an EBus to make it easy to connect to the correct viewport 
+            // sending the event.  But for now, just detect that we've gotten width/height values that match our 
+            // associated viewport
+            if (viewport && (eventWidth == viewport->width()) && (eventHeight == viewport->height()))
+            {
+                OnViewportSizeChanged(eventWidth, eventHeight);
+            }
+        }
+    }
+}
+
+void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets)
+{
+    QSettings settings("O3DE", "O3DE"); // Temporary solution until we have the global Settings class.
+    settings.beginGroup(section);
+    outCustompresets = settings.value(keyName).toStringList();
+    settings.endGroup();
+}
+
+void CViewportTitleDlg::SaveCustomPresets(const QString& section, const QString& keyName, const QStringList& custompresets)
+{
+    QSettings settings("O3DE", "O3DE"); // Temporary solution until we have the global Settings class.
+    settings.beginGroup(section);
+    settings.setValue(keyName, custompresets);
+    settings.endGroup();
+}
+
+void CViewportTitleDlg::UpdateCustomPresets(const QString& text, QStringList& custompresets)
+{
+    custompresets.removeAll(text);
+    custompresets.push_front(text);
+    if (custompresets.size() > MAX_NUM_CUSTOM_PRESETS)
+    {
+        custompresets.erase(custompresets.begin() + MAX_NUM_CUSTOM_PRESETS, custompresets.end()); // QList doesn't have resize()
+    }
+}
+
+bool CViewportTitleDlg::eventFilter(QObject* object, QEvent* event)
+{
+    if (object == m_cameraSpeed)
+    {
+        if (event->type() == QEvent::FocusIn)
+        {
+            QTimer::singleShot(
+                0, this,
+                [this]
+                {
+                    m_cameraSpeed->lineEdit()->selectAll();
+                });
+        }
+
+        return m_cameraSpeed->eventFilter(object, event);
+    }
+
+    bool consumeEvent = false;
+
+    // These events are forwarded from the toolbar that took ownership of our widgets
+    if (event->type() == QEvent::MouseButtonDblClick)
+    {
+        QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+        if (mouseEvent->button() == Qt::LeftButton)
+        {
+            OnMaximize();
+            consumeEvent = true;
+        }
+    }
+    else if (event->type() == QEvent::FocusIn)
+    {
+        parentWidget()->setFocus();
+    }
+
+    return QWidget::eventFilter(object, event) || consumeEvent;
+}
+
+void CViewportTitleDlg::OnBnClickedGotoPosition()
+{
+    emit ActionTriggered(ID_DISPLAY_GOTOPOSITION);
+}
+
+void CViewportTitleDlg::OnBnClickedMuteAudio()
+{
+    gSettings.bMuteAudio = !gSettings.bMuteAudio;
+
+    Audio::AudioSystemRequestBus::Broadcast(
+        &Audio::AudioSystemRequestBus::Events::PushRequest, gSettings.bMuteAudio ? m_oMuteAudioRequest : m_oUnmuteAudioRequest);
+
+    UpdateMuteActionText();
+}
+
+void CViewportTitleDlg::UpdateMuteActionText()
+{
+    m_audioMuteAction->setText(gSettings.bMuteAudio ? tr("Un-mute Audio") : tr("Mute Audio"));
+}
+
+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)
+    {
+        fVal = int_round(fVal / fStep) * fStep;
+    }
+    return fVal;
+}
+
+void CViewportTitleDlg::SetSpeedComboBox(double value)
+{
+    value = AZStd::clamp(Round(value, m_speedStep), m_minSpeed, m_maxSpeed);
+
+    int index = m_cameraSpeed->findData(value);
+    if (index != -1)
+    {
+        m_cameraSpeed->setCurrentIndex(index);
+    }
+    else
+    {
+        m_cameraSpeed->lineEdit()->setText(QString().setNum(value, 'f', m_numDecimals));
+    }
+}
+
+void CViewportTitleDlg::OnSpeedComboBoxEnter()
+{
+    m_cameraSpeed->clearFocus();
+}
+
+void CViewportTitleDlg::OnUpdateMoveSpeedText(const QString& text)
+{
+    if (SandboxEditor::UsingNewCameraSystem())
+    {
+        SandboxEditor::SetCameraTranslateSpeed(aznumeric_cast<float>(Round(text.toDouble(), m_speedStep)));
+    }
+    else
+    {
+        gSettings.cameraMoveSpeed = aznumeric_cast<float>(Round(text.toDouble(), m_speedStep));
+    }
+}
+
+void CViewportTitleDlg::CheckForCameraSpeedUpdate()
+{
+    if (const float currentCameraMoveSpeed =
+            SandboxEditor::UsingNewCameraSystem() ? SandboxEditor::CameraTranslateSpeed() : gSettings.cameraMoveSpeed;
+        currentCameraMoveSpeed != m_prevMoveSpeed && !m_cameraSpeed->lineEdit()->hasFocus())
+    {
+        m_prevMoveSpeed = currentCameraMoveSpeed;
+        SetSpeedComboBox(currentCameraMoveSpeed);
+    }
+}
+
+void CViewportTitleDlg::OnGridSnappingToggled()
+{
+    m_gridSizeActionWidget->setEnabled(m_enableGridSnappingAction->isChecked());
+    MainWindow::instance()->GetActionManager()->GetAction(ID_SNAP_TO_GRID)->trigger();
+}
+
+void CViewportTitleDlg::OnAngleSnappingToggled()
+{
+    m_angleSizeActionWidget->setEnabled(m_enableAngleSnappingAction->isChecked());
+    MainWindow::instance()->GetActionManager()->GetAction(ID_SNAPANGLE)->trigger();
+}
+
+void CViewportTitleDlg::OnGridSpinBoxChanged(double value)
+{
+    SandboxEditor::SetGridSnappingSize(value);
+}
+
+void CViewportTitleDlg::OnAngleSpinBoxChanged(double value)
+{
+    SandboxEditor::SetAngleSnappingSize(value);
+}
+
+void CViewportTitleDlg::UpdateOverFlowMenuState()
+{
+    bool gridSnappingActive = MainWindow::instance()->GetActionManager()->GetAction(ID_SNAP_TO_GRID)->isChecked();
+    {
+        QSignalBlocker signalBlocker(m_enableGridSnappingAction);
+        m_enableGridSnappingAction->setChecked(gridSnappingActive);
+    }
+    m_gridSizeActionWidget->setEnabled(gridSnappingActive);
+
+    bool angleSnappingActive = MainWindow::instance()->GetActionManager()->GetAction(ID_SNAPANGLE)->isChecked();
+    {
+        QSignalBlocker signalBlocker(m_enableAngleSnappingAction);
+        m_enableAngleSnappingAction->setChecked(angleSnappingActive);
+    }
+    m_angleSizeActionWidget->setEnabled(angleSnappingActive);
+}
+
+namespace
+{
+    void PyToggleHelpers()
+    {
+        GetIEditor()->GetDisplaySettings()->DisplayHelpers(!GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
+        GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
+
+        if (GetIEditor()->GetDisplaySettings()->IsDisplayHelpers() == false)
+        {
+            GetIEditor()->GetObjectManager()->SendEvent(EVENT_HIDE_HELPER);
+        }
+    }
+
+    bool PyIsHelpersShown()
+    {
+        return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
+    }
+}
+
+namespace AzToolsFramework
+{
+    void ViewportTitleDlgPythonFuncsHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            // this will put these methods into the 'azlmbr.legacy.general' module
+            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            {
+                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
+                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
+            };
+            addLegacyGeneral(behaviorContext->Method("toggle_helpers", PyToggleHelpers, nullptr, "Toggles the display of helpers."));
+            addLegacyGeneral(behaviorContext->Method("is_helpers_shown", PyIsHelpersShown, nullptr, "Gets the display state of helpers."));
+        }
+    }
+}
+
+#include "ViewportTitleDlg.moc"
+#include <moc_ViewportTitleDlg.cpp>
diff --git a/Code/Editor/ViewportTitleDlg.h b/Code/Editor/ViewportTitleDlg.h
new file mode 100644
index 0000000000..04219098f5
--- /dev/null
+++ b/Code/Editor/ViewportTitleDlg.h
@@ -0,0 +1,209 @@
+/*
+ * 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_VIEWPORTTITLEDLG_H
+#define CRYINCLUDE_EDITOR_VIEWPORTTITLEDLG_H
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "RenderViewport.h"
+#include <AzCore/Component/Component.h>
+
+#include <IAudioSystem.h>
+
+#include <functional>
+#include <QSharedPointer>
+#include <QWidgetAction>
+#include <QComboBox>
+
+#include <AzQtComponents/Components/Widgets/SpinBox.h>
+
+#include <HMDBus.h>
+#endif
+
+// CViewportTitleDlg dialog
+class CLayoutViewPane;
+class CPopupMenuItem;
+
+class QAbstractButton;
+class QMenu;
+
+struct ICVar;
+
+namespace Ui
+{
+    class ViewportTitleDlg;
+}
+
+//////////////////////////////////////////////////////////////////////////
+class CViewportTitleDlg
+    : public QWidget
+    , public IEditorNotifyListener
+    , public ISystemEventListener
+    , public AZ::VR::VREventBus::Handler
+{
+    Q_OBJECT
+public:
+    CViewportTitleDlg(QWidget* pParent = nullptr);   // standard constructor
+    virtual ~CViewportTitleDlg();
+
+    void SetViewPane(CLayoutViewPane* pViewPane);
+    void SetTitle(const QString& title);
+    void OnViewportSizeChanged(int width, int height);
+    void OnViewportFOVChanged(float fov);
+
+    static void AddFOVMenus(QMenu* menu, std::function<void(float)> callback, const QStringList& customPresets);
+    static void AddAspectRatioMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets);
+    static void AddResolutionMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets);
+
+    static void LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets);
+    static void SaveCustomPresets(const QString& section, const QString& keyName, const QStringList& custompresets);
+    static void UpdateCustomPresets(const QString& text, QStringList& custompresets);
+
+    bool eventFilter(QObject* object, QEvent* event) override;
+
+    void SetSpeedComboBox(double value);
+
+    QMenu* const GetFovMenu();
+    QMenu* const GetAspectMenu();
+    QMenu* const GetResolutionMenu();
+
+Q_SIGNALS:
+    void ActionTriggered(int command);
+
+protected:
+    virtual void OnInitDialog();
+
+    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
+    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
+
+    void OnMaximize();
+    void OnToggleHelpers();
+    void UpdateDisplayInfo();
+
+    //////////////////////////////////////////////////////////////////////////
+    /// VR Event Bus Implementation
+    //////////////////////////////////////////////////////////////////////////
+    void OnHMDInitialized() override;
+    void OnHMDShutdown() override;
+    //////////////////////////////////////////////////////////////////////////
+
+    void SetupCameraDropdownMenu();
+    void SetupResolutionDropdownMenu();
+    void SetupViewportInformationMenu();
+    void SetupOverflowMenu();
+    void SetupHelpersButton();
+
+    QString m_title;
+
+    CLayoutViewPane* m_pViewPane;
+
+    static const int MAX_NUM_CUSTOM_PRESETS = 10;
+    QStringList m_customResPresets;
+    QStringList m_customFOVPresets;
+    QStringList m_customAspectRatioPresets;
+
+    float m_prevMoveSpeed;
+
+    // Speed combobox/lineEdit settings
+    double m_minSpeed = 0.01;
+    double m_maxSpeed = 100.0;
+    double m_speedStep = 0.001;
+    int m_numDecimals = 3;
+
+    // Speed presets
+    float m_speedPresetValues[4] = { 0.01f, 0.1f, 1.0f, 10.0f };
+
+    double m_fieldWidthMultiplier = 1.8;
+
+
+    void OnMenuFOVCustom();
+
+    void CreateFOVMenu();
+
+    void OnMenuAspectRatioCustom();
+    void CreateAspectMenu();
+
+    void OnMenuResolutionCustom();
+    void CreateResolutionMenu();
+
+    void CreateViewportInformationMenu();
+    QMenu* const GetViewportInformationMenu();
+    void SetNoViewportInfo();
+    void SetNormalViewportInfo();
+    void SetFullViewportInfo();
+    void SetCompactViewportInfo();
+
+    void OnBnClickedGotoPosition();
+    void OnBnClickedMuteAudio();
+    void OnBnClickedEnableVR();
+
+    void UpdateMuteActionText();
+
+    void OnToggleDisplayInfo();
+
+    void OnSpeedComboBoxEnter();
+    void OnUpdateMoveSpeedText(const QString&);
+
+    void CheckForCameraSpeedUpdate();
+
+    void OnGridSnappingToggled();
+    void OnAngleSnappingToggled();
+
+    void OnGridSpinBoxChanged(double value);
+    void OnAngleSpinBoxChanged(double value);
+
+    void UpdateOverFlowMenuState();
+
+    QMenu* m_fovMenu = nullptr;
+    QMenu* m_aspectMenu = nullptr;
+    QMenu* m_resolutionMenu = nullptr;
+    QMenu* m_viewportInformationMenu = nullptr;
+    QAction* m_noInformationAction = nullptr;
+    QAction* m_normalInformationAction = nullptr;
+    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;
+    AzQtComponents::DoubleSpinBox* m_gridSpinBox = nullptr;
+    AzQtComponents::DoubleSpinBox* m_angleSpinBox = nullptr;
+    QWidgetAction* m_gridSizeActionWidget = nullptr;
+    QWidgetAction* m_angleSizeActionWidget = nullptr;
+
+    Audio::SAudioRequest m_oMuteAudioRequest;
+    Audio::SAudioManagerRequestData<Audio::eAMRT_MUTE_ALL> m_oMuteAudioRequestData;
+    Audio::SAudioRequest m_oUnmuteAudioRequest;
+    Audio::SAudioManagerRequestData<Audio::eAMRT_UNMUTE_ALL> m_oUnmuteAudioRequestData;
+
+
+    QScopedPointer<Ui::ViewportTitleDlg> m_ui;
+};
+
+namespace AzToolsFramework
+{
+    //! A component to reflect scriptable commands for the Editor
+    class ViewportTitleDlgPythonFuncsHandler
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(ViewportTitleDlgPythonFuncsHandler, "{2D686C2D-04F0-4C96-B432-0702E774062E}")
+
+        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component ...
+        void Activate() override {}
+        void Deactivate() override {}
+    };
+
+} // namespace AzToolsFramework
+
+
+#endif // CRYINCLUDE_EDITOR_VIEWPORTTITLEDLG_H
diff --git a/Code/Editor/ViewportTitleDlg.ui b/Code/Editor/ViewportTitleDlg.ui
new file mode 100644
index 0000000000..f0679dd2a1
--- /dev/null
+++ b/Code/Editor/ViewportTitleDlg.ui
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ViewportTitleDlg</class>
+ <widget class="QWidget" name="ViewportTitleDlg">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>648</width>
+    <height>29</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>29</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>29</height>
+   </size>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0,0,0,0,0,0,0">
+   <property name="leftMargin">
+    <number>10</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="m_titleBtn">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="contextMenuPolicy">
+      <enum>Qt::NoContextMenu</enum>
+     </property>
+     <property name="text">
+      <string>Static</string>
+     </property>
+     <property name="indent">
+      <number>11</number>
+     </property>
+    </widget>
+   </item>
+   <item>
+     <widget class="QToolButton" name="m_cameraMenu">
+       <property name="icon">
+         <iconset>
+           <normaloff>:/Menu/camera.svg</normaloff>:/Menu/camera.svg
+         </iconset>
+       </property>
+       <property name="toolTip">
+         <string>Camera settings</string>
+       </property>
+     </widget>
+   </item>   
+   <item>
+     <widget class="QToolButton" name="m_debugInformationMenu">
+       <property name="toolTip">
+         <string>Debug information</string>
+       </property>
+       <property name="icon">
+         <iconset>
+           <normaloff>:/Menu/debug.svg</normaloff>:/Menu/debug.svg
+         </iconset>
+       </property>
+       <property name="checkable">
+         <bool>true</bool>
+       </property>
+     </widget>
+   </item>   
+   <item>
+     <widget class="QToolButton" name="m_helpers">
+       <property name="toolTip">
+         <string>Toggle viewport helpers</string>
+       </property>
+       <property name="icon">
+         <iconset>
+           <normaloff>:/Menu/helpers.svg</normaloff>:/Menu/helpers.svg
+         </iconset>
+       </property>
+       <property name="checkable">
+         <bool>true</bool>
+       </property>
+     </widget>
+   </item>   
+   <item>
+     <widget class="QToolButton" name="m_resolutionMenu">
+       <property name="toolTip">
+         <string>Viewport resolution</string>
+       </property>
+       <property name="icon">
+         <iconset>
+           <normaloff>:/Menu/resolution.svg</normaloff>:/Menu/resolution.svg
+         </iconset>
+       </property>
+     </widget>
+   </item>
+   <item>
+     <widget class="QToolButton" name="m_overflowBtn">
+       <property name="toolTip">
+         <string>Other settings</string>
+       </property>
+       <property name="icon">
+         <iconset>
+           <normaloff>:/Menu/menu.svg</normaloff>:/Menu/menu.svg
+         </iconset>
+       </property>
+     </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AzQtComponents::ButtonDivider</class>
+   <extends>QWidget</extends>
+   <header>AzQtComponents/Components/ButtonDivider.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+  <resources>
+    <include location="../../Framework/AzQtComponents/AzQtComponents/Images/resources.qrc"/>
+  </resources>
+  <connections/>
+</ui>
diff --git a/Code/Editor/WaitProgress.cpp b/Code/Editor/WaitProgress.cpp
new file mode 100644
index 0000000000..bca0de3eac
--- /dev/null
+++ b/Code/Editor/WaitProgress.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 "EditorDefs.h"
+
+#include "WaitProgress.h"
+
+#include "MainWindow.h"         // for MainWindow
+#include "CryEdit.h"            // for EditorIdleProcessingBus
+#include "MainStatusBar.h"      // for MainStatusBar
+
+#include <QProgressBar>
+
+bool CWaitProgress::m_bInProgressNow = false;
+
+CWaitProgress::CWaitProgress(const QString& lpszText, bool bStart)
+    : m_strText(lpszText)
+    , m_bStarted(false)
+    , m_progressBar(nullptr)
+{
+    m_bIgnore = false;
+
+    if (bStart)
+    {
+        Start();
+    }
+}
+
+CWaitProgress::~CWaitProgress()
+{
+    if (m_bStarted)
+    {
+        Stop();
+    }
+}
+
+void CWaitProgress::Start()
+{
+    if (m_bStarted)
+    {
+        Stop();
+    }
+
+    if (m_bInProgressNow)
+    {
+        // Do not affect previously started progress bar.
+        m_bIgnore = true;
+        m_bStarted = false;
+        return;
+    }
+
+    // display text in the status bar
+    GetIEditor()->SetStatusText(m_strText);
+
+    // switch on wait cursor
+    qApp->setOverrideCursor(Qt::BusyCursor);
+
+    m_bStarted = true;
+    m_percent = 0;
+
+    // because Idle Processing was constantly adding new events that made the event loop in Step() spin forever...
+    EditorIdleProcessingBus::Broadcast(&EditorIdleProcessing::DisableIdleProcessing); 
+}
+
+void CWaitProgress::Stop()
+{
+    if (!m_bStarted)
+    {
+        return;
+    }
+
+    delete m_progressBar;
+    m_progressBar = nullptr;
+
+    // switch off wait cursor
+    qApp->restoreOverrideCursor();
+    m_bInProgressNow = false;
+    m_bStarted = false;
+
+    EditorIdleProcessingBus::Broadcast(&EditorIdleProcessing::EnableIdleProcessing);
+}
+
+bool CWaitProgress::Step(int nPercentage)
+{
+    if (m_bIgnore)
+    {
+        return true;
+    }
+
+    if (!m_bStarted)
+    {
+        Start();
+    }
+
+    if (m_percent == nPercentage)
+    {
+        return true;
+    }
+
+    m_percent = nPercentage;
+
+    if (nPercentage >= 0)
+    {
+        if (nPercentage > 100)
+        {
+            nPercentage = 100;
+        }
+
+        // create or update a progress control in the status bar
+        if (!m_progressBar)
+        {
+            CreateProgressControl();
+        }
+
+        if (m_progressBar)
+        {
+            m_progressBar->setValue(nPercentage);
+        }
+    }
+
+    // Use the oportunity to process windows messages here.
+    static const AZ::u64 TIMEOUT_MS = 1;
+    qApp->processEvents(QEventLoop::AllEvents, TIMEOUT_MS);
+
+    return true;
+}
+
+void CWaitProgress::SetText(const QString& lpszText)
+{
+    if (m_bIgnore)
+    {
+        return;
+    }
+
+    m_strText = lpszText;
+    GetIEditor()->SetStatusText(m_strText);
+}
+
+void CWaitProgress::CreateProgressControl()
+{
+    assert(m_progressBar == nullptr);
+
+    MainStatusBar* statusBar = MainWindow::instance()->StatusBar();
+    m_progressBar = new QProgressBar();
+    m_progressBar->setRange(0, 100);
+    statusBar->insertWidget(1, m_progressBar, 250);
+
+    m_bInProgressNow = true;
+}
diff --git a/Code/Editor/WaitProgress.h b/Code/Editor/WaitProgress.h
new file mode 100644
index 0000000000..241d8657ed
--- /dev/null
+++ b/Code/Editor/WaitProgress.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
+////////////////////////////////////////////////////////////////////////////
+//  Description: CWaitProgress class adds information about lengthy process
+//      Usage:
+//
+//      CWaitProgress wait;
+//      wait.SetText("Long");
+//      wait.SetProgress(35); // 35 percent.
+//
+////////////////////////////////////////////////////////////////////////////
+#ifndef CRYINCLUDE_EDITOR_WAITPROGRESS_H
+#define CRYINCLUDE_EDITOR_WAITPROGRESS_H
+
+class QProgressBar;
+
+#include <QString>
+
+class CWaitProgress
+{
+public:
+    CWaitProgress(const QString& lpszText, bool bStart = true);
+    ~CWaitProgress();
+
+    void Start();
+    void Stop();
+    //! @return true to continue, false to abort lengthy operation.
+    bool Step(int nPercentage = -1);
+    void SetText(const QString& lpszText);
+
+protected:
+    void CreateProgressControl();
+
+    QString m_strText;
+    bool m_bStarted;
+    bool m_bIgnore;
+    int m_percent;
+    QProgressBar* m_progressBar;
+    static bool m_bInProgressNow;
+};
+#endif // CRYINCLUDE_EDITOR_WAITPROGRESS_H
diff --git a/Code/Editor/WelcomeScreen/DefaultProjectImage.png b/Code/Editor/WelcomeScreen/DefaultProjectImage.png
new file mode 100644
index 0000000000..82234dbf6b
--- /dev/null
+++ b/Code/Editor/WelcomeScreen/DefaultProjectImage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1cf8339fb51f82a68d2ab475c0476960e75a79d96d239c5b7cd272fbe4990ffe
+size 2770
diff --git a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
new file mode 100644
index 0000000000..f9560aef55
--- /dev/null
+++ b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
@@ -0,0 +1,354 @@
+/*
+ * 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 "WelcomeScreenDialog.h"
+
+// Qt
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QToolTip>
+#include <QMenu>
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QScreen>
+#include <QDesktopWidget>
+#include <QTimer>
+#include <QDateTime>
+
+#include <AzCore/Utils/Utils.h>
+
+// AzFramework
+#include <AzFramework/API/ApplicationAPI.h>
+
+// AzToolsFramework
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+
+// AzQtComponents
+#include <AzQtComponents/Components/Widgets/CheckBox.h>
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+
+// Editor
+#include "Settings.h"
+#include "MainWindow.h"
+#include "CryEdit.h"
+#include "LevelFileDialog.h"
+
+// NewsShared
+#include <NewsShared/ResourceManagement/ResourceManifest.h>     // for News::ResourceManifest
+#include <NewsShared/Qt/ArticleViewContainer.h>                 // for News::ArticleViewContainer
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include <WelcomeScreen/ui_WelcomeScreenDialog.h>
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+using namespace AzQtComponents;
+
+#define WMSEVENTNAME "WMSEvent"
+#define WMSEVENTOPERATION "operation"
+
+static int GetSmallestScreenHeight()
+{
+    int smallestHeight = -1;
+    for (QScreen* screen : QApplication::screens())
+    {
+        int screenHeight = screen->availableGeometry().height();
+        if ((smallestHeight < 0) || (smallestHeight > screenHeight))
+        {
+            smallestHeight = screenHeight;
+        }
+    }
+
+    return smallestHeight;
+}
+
+WelcomeScreenDialog::WelcomeScreenDialog(QWidget* pParent)
+    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, pParent), Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint | Qt::WindowTitleHint)
+    , ui(new Ui::WelcomeScreenDialog)
+    , m_pRecentList(nullptr)
+{
+    ui->setupUi(this);
+
+    // Set the project preview image
+    QString projectPreviewPath = QDir(AZ::Utils::GetProjectPath().c_str()).filePath("preview.png");
+    QFileInfo projectPreviewPathInfo(projectPreviewPath);
+    if (!projectPreviewPathInfo.exists() || !projectPreviewPathInfo.isFile())
+    {
+        projectPreviewPath = ":/WelcomeScreenDialog/DefaultProjectImage.png";
+    }
+    ui->activeProjectIcon->setPixmap(
+        QPixmap(projectPreviewPath).scaled(
+            ui->activeProjectIcon->size(),
+            Qt::KeepAspectRatioByExpanding,
+            Qt::SmoothTransformation
+        )
+    );
+
+    ui->recentLevelTable->setColumnCount(3);
+    ui->recentLevelTable->setMouseTracking(true);
+    ui->recentLevelTable->setContextMenuPolicy(Qt::CustomContextMenu);
+    ui->recentLevelTable->horizontalHeader()->hide();
+    ui->recentLevelTable->verticalHeader()->hide();
+    ui->recentLevelTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    ui->recentLevelTable->setSelectionMode(QAbstractItemView::SingleSelection);
+    ui->recentLevelTable->setIconSize(QSize(20, 20));
+    installEventFilter(this);
+
+    auto projectName = AZ::Utils::GetProjectName();
+    ui->currentProjectName->setText(projectName.c_str());
+
+    ui->newLevelButton->setDefault(true);
+
+    // Hide these buttons until the new functionality is added
+    ui->gridButton->hide();
+    ui->objectListButton->hide();
+    ui->switchProjectButton->hide();
+
+    connect(ui->recentLevelTable, &QWidget::customContextMenuRequested, this, &WelcomeScreenDialog::OnShowContextMenu);
+
+    connect(ui->recentLevelTable, &QTableWidget::entered, this, &WelcomeScreenDialog::OnShowToolTip);
+    connect(ui->recentLevelTable, &QTableWidget::clicked, this, &WelcomeScreenDialog::OnRecentLevelTableItemClicked);
+
+    connect(ui->newLevelButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnNewLevelBtnClicked);
+    connect(ui->levelFileLabel, &QLabel::linkActivated, this, &WelcomeScreenDialog::OnNewLevelLabelClicked);
+    connect(ui->openLevelButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnOpenLevelBtnClicked);
+
+    // Adjust the height, if need be
+    // Do it in the constructor so that the WindowDecoratorWrapper handles it correctly
+    int smallestHeight = GetSmallestScreenHeight();
+    if (smallestHeight < geometry().height())
+    {
+        const int SOME_PADDING_IN_PIXELS = 90;
+        int difference = geometry().height() - (smallestHeight - SOME_PADDING_IN_PIXELS);
+
+        QRect newGeometry = geometry().adjusted(0, difference / 2, 0, -difference / 2);
+        setMinimumSize(minimumSize().width(), newGeometry.height());
+        resize(newGeometry.size());
+    }
+
+    m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
+}
+
+
+WelcomeScreenDialog::~WelcomeScreenDialog()
+{
+    delete ui;
+}
+
+void WelcomeScreenDialog::done(int result)
+{
+    QDialog::done(result);
+}
+
+const QString& WelcomeScreenDialog::GetLevelPath()
+{
+    return m_levelPath;
+}
+
+bool WelcomeScreenDialog::eventFilter(QObject *watched, QEvent *event)
+{
+    if (event->type() == QEvent::Show)
+    {
+        ui->recentLevelTable->horizontalHeader()->resizeSection(0, ui->nameLabel->width());
+        ui->recentLevelTable->horizontalHeader()->resizeSection(1, ui->modifiedLabel->width());
+        ui->recentLevelTable->horizontalHeader()->resizeSection(2, ui->typeLabel->width());
+    }
+
+    return QDialog::eventFilter(watched, event);
+}
+
+void WelcomeScreenDialog::SetRecentFileList(RecentFileList* pList)
+{
+    if (!pList)
+    {
+        return;
+    }
+
+    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);
+    gamePath = Path::ToUnixPath(gamePath.toLower());
+    gamePath = Path::AddSlash(gamePath);
+
+    QString sCurDir = (Path::GetEditingGameDataFolder() + QDir::separator().toLatin1()).c_str();
+    int nCurDir = sCurDir.length();
+
+    int recentListSize = pList->GetSize();
+    int currentRow = 0;
+    ui->recentLevelTable->setRowCount(recentListSize);
+     for (int i = 0; i < recentListSize; ++i)
+    {
+        const QString& recentFile = pList->m_arrNames[i];
+        if (recentFile.endsWith(m_levelExtension))
+        {
+            if (CFileUtil::Exists(recentFile, false))
+            {
+                QString sCurEntryDir = recentFile.left(nCurDir);
+                if (sCurEntryDir.compare(sCurDir, Qt::CaseInsensitive) == 0)
+                {
+                    QString fullPath = recentFile;
+                    const QString name = Path::GetFile(fullPath);
+
+                    Path::ConvertSlashToBackSlash(fullPath);
+                    fullPath = Path::ToUnixPath(fullPath.toLower());
+                    fullPath = Path::AddSlash(fullPath);
+
+                    if (fullPath.contains(gamePath))
+                    {
+                        if (gSettings.prefabSystem)
+                        {
+                            QIcon icon;
+                            icon.addFile(QString::fromUtf8(":/Level/level.svg"), QSize(), QIcon::Normal, QIcon::Off);
+                            ui->recentLevelTable->setItem(currentRow, 0, new QTableWidgetItem(icon, name));
+                        }
+                        else
+                        {
+                            ui->recentLevelTable->setItem(currentRow, 0, new QTableWidgetItem(name));
+                        }
+                        QFileInfo file(recentFile);
+                        QDateTime dateTime = file.lastModified();
+                        QString date = QLocale::system().toString(dateTime.date(), QLocale::ShortFormat) + " " +
+                            QLocale::system().toString(dateTime.time(), QLocale::LongFormat);
+                        ui->recentLevelTable->setItem(currentRow, 1, new QTableWidgetItem(date));
+                        ui->recentLevelTable->setItem(currentRow++, 2, new QTableWidgetItem(tr("Level")));
+                        m_levels.push_back(std::make_pair(name, recentFile));
+                    }
+                }
+            }
+        }
+    }
+    ui->recentLevelTable->setRowCount(currentRow);
+    ui->recentLevelTable->setMinimumHeight(currentRow * ui->recentLevelTable->verticalHeader()->defaultSectionSize());
+    ui->recentLevelTable->setMaximumHeight(currentRow * ui->recentLevelTable->verticalHeader()->defaultSectionSize());
+    ui->levelFileLabel->setVisible(currentRow ? false : true);
+
+    ui->recentLevelTable->setCurrentIndex(QModelIndex());
+}
+
+
+void WelcomeScreenDialog::RemoveLevelEntry(int index)
+{
+    TNamePathPair levelPath = m_levels[index];
+
+    ui->recentLevelTable->removeRow(index);
+    m_levels.erase(m_levels.begin() + index);
+
+
+    if (!m_pRecentList)
+    {
+        return;
+    }
+
+    for (int i = 0; i < m_pRecentList->GetSize(); ++i)
+    {
+        QString fullPath = m_pRecentList->m_arrNames[i];
+        QString fullPath2 = levelPath.second;
+
+        // path from recent list
+        Path::ConvertSlashToBackSlash(fullPath);
+        fullPath = Path::ToUnixPath(fullPath.toLower());
+        fullPath = Path::AddPathSlash(fullPath);
+
+        // path from our dashboard list
+        Path::ConvertSlashToBackSlash(fullPath2);
+        fullPath2 = Path::ToUnixPath(fullPath2.toLower());
+        fullPath2 = Path::AddPathSlash(fullPath2);
+
+        if (fullPath == fullPath2)
+        {
+            m_pRecentList->Remove(index);
+            break;
+        }
+    }
+
+    m_pRecentList->WriteList();
+}
+
+
+void WelcomeScreenDialog::OnShowToolTip(const QModelIndex& index)
+{
+    const QString& fullPath = m_levels[index.row()].second;
+
+    QToolTip::showText(QCursor::pos(), QString("Open level: %1").arg(fullPath));
+}
+
+
+void WelcomeScreenDialog::OnShowContextMenu(const QPoint& pos)
+{
+    QModelIndex index = ui->recentLevelTable->indexAt(pos);
+    if (index.isValid())
+    {
+        QString level = ui->recentLevelTable->itemAt(pos)->text();
+
+        QPoint globalPos = ui->recentLevelTable->viewport()->mapToGlobal(pos);
+
+        QMenu contextMenu;
+        contextMenu.addAction(QString("Remove " + level + " from recent list"));
+        QAction* selectedItem = contextMenu.exec(globalPos);
+        if (selectedItem)
+        {
+            RemoveLevelEntry(index.row());
+        }
+    }
+}
+
+void WelcomeScreenDialog::OnNewLevelBtnClicked([[maybe_unused]] bool checked)
+{
+    m_levelPath = "new";
+    accept();
+}
+
+void WelcomeScreenDialog::OnNewLevelLabelClicked([[maybe_unused]] const QString& path)
+{
+    OnNewLevelBtnClicked(true);
+}
+
+void WelcomeScreenDialog::OnOpenLevelBtnClicked([[maybe_unused]] bool checked)
+{
+    CLevelFileDialog dlg(true, this);
+
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        m_levelPath = dlg.GetFileName();
+        accept();
+    }
+}
+
+void WelcomeScreenDialog::OnRecentLevelTableItemClicked(const QModelIndex& modelIndex)
+{
+    int index = modelIndex.row();
+
+    if (index >= 0 && index < m_levels.size())
+    {
+        m_levelPath = m_levels[index].second;
+        accept();
+    }
+}
+
+void WelcomeScreenDialog::OnCloseBtnClicked([[maybe_unused]] bool checked)
+{
+    accept();
+}
+
+void WelcomeScreenDialog::previewAreaScrolled()
+{
+    //this should only be reported once per session
+    if (m_messageScrollReported)
+    {
+        return;
+    }
+    m_messageScrollReported = true;
+}
+
+#include <WelcomeScreen/moc_WelcomeScreenDialog.cpp>
diff --git a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.h b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.h
new file mode 100644
index 0000000000..4338a8250f
--- /dev/null
+++ b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.h
@@ -0,0 +1,71 @@
+/*
+ * 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>
+#include "NewsShared/LogType.h"
+#include "NewsShared/ErrorCodes.h"
+#endif
+
+namespace News {
+    class ResourceManifest;
+    class ArticleViewContainer;
+}
+
+namespace Ui {
+    class WelcomeScreenDialog;
+}
+
+class QStringListModel;
+class RecentFileList;
+
+class WelcomeScreenDialog
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    WelcomeScreenDialog(QWidget* pParent = nullptr);
+    ~WelcomeScreenDialog();
+
+    const QString& GetLevelPath();
+    void SetRecentFileList(RecentFileList* pList);
+
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
+public Q_SLOTS:
+    void done(int result) override;
+
+private:
+    typedef std::pair<QString, QString> TNamePathPair;
+    typedef std::vector<TNamePathPair> TNameFullPathArray;
+
+    Ui::WelcomeScreenDialog* ui;
+
+    QString m_levelPath;
+    TNameFullPathArray m_levels;
+    RecentFileList* m_pRecentList;
+    const char* m_levelExtension = nullptr;
+    bool m_messageScrollReported = false;
+
+    void RemoveLevelEntry(int index);
+
+    void OnShowToolTip(const QModelIndex& index);
+    void OnShowContextMenu(const QPoint& point);
+    void OnNewLevelBtnClicked(bool checked);
+    void OnNewLevelLabelClicked(const QString& checked);
+    void OnOpenLevelBtnClicked(bool checked);
+    void OnRecentLevelTableItemClicked(const QModelIndex& index);
+    void OnCloseBtnClicked(bool checked);
+
+    void SyncFail(News::ErrorCode error);
+    void SyncSuccess();
+
+private Q_SLOTS:
+    void previewAreaScrolled();
+};
+
diff --git a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.qrc b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.qrc
new file mode 100644
index 0000000000..131fde4e2b
--- /dev/null
+++ b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.qrc
@@ -0,0 +1,5 @@
+<RCC>
+  <qresource prefix="WelcomeScreenDialog">
+    <file>DefaultProjectImage.png</file>
+  </qresource>
+</RCC>
diff --git a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.ui b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.ui
new file mode 100644
index 0000000000..c8f5a4d67c
--- /dev/null
+++ b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.ui
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WelcomeScreenDialog</class>
+ <widget class="QWidget" name="WelcomeScreenDialog">
+  <property name="enabled">
+   <bool>true</bool>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>945</width>
+    <height>639</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>945</width>
+    <height>639</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>945</width>
+    <height>639</height>
+   </size>
+  </property>
+  <property name="focusPolicy">
+   <enum>Qt::TabFocus</enum>
+  </property>
+  <property name="windowTitle">
+   <string>Welcome to O3DE</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="bodyContainer">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QWidget" name="articleViewContainerRoot" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>183</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>183</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <layout class="QVBoxLayout" name="newsContainerLayout">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>10</number>
+        </property>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="leftMargin">
+           <number>15</number>
+          </property>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_2">
+            <property name="spacing">
+             <number>10</number>
+            </property>
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="currentProjectLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Active project</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="activeProjectIcon">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>126</width>
+                <height>167</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>126</width>
+                <height>167</height>
+               </size>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignHCenter | Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="currentProjectName">
+              <property name="text">
+               <string>MyGame</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="leftMargin">
+           <number>15</number>
+          </property>
+          <property name="rightMargin">
+           <number>15</number>
+          </property>
+          <item>
+           <widget class="QPushButton" name="switchProjectButton">
+            <property name="text">
+             <string>Switch project...</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QWidget" name="levelViewFTUEContainer" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>762</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>762</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_12">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="leftMargin">
+         <number>20</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>20</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item alignment="Qt::AlignTop">
+         <widget class="QWidget" name="levelViewContainer" native="true">
+          <layout class="QVBoxLayout" name="verticalLayout_3">
+           <property name="spacing">
+            <number>0</number>
+           </property>
+           <property name="leftMargin">
+            <number>16</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>16</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="openALevelLabel">
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>48</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>48</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Recent Files</string>
+             </property>
+             <property name="indent">
+              <number>-1</number>
+             </property>
+             <property name="fontStyle" stdset="0">
+              <string>sectionTitle</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QWidget" name="levelViewListContainer" native="true">
+             <layout class="QVBoxLayout" name="levelViewListContainer_layout">
+              <property name="spacing">
+               <number>0</number>
+              </property>
+              <property name="leftMargin">
+               <number>16</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>0</number>
+              </property>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QWidget" name="horizontalWidget" native="true">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <layout class="QHBoxLayout" name="levelControlContainer">
+              <property name="spacing">
+               <number>0</number>
+              </property>
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QPushButton" name="newLevelButton">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>156</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>156</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>Create new...</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::Fixed</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>24</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QPushButton" name="openLevelButton">
+                <property name="minimumSize">
+                 <size>
+                  <width>156</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>156</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>Open...</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_2">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QToolButton" name="objectListButton">
+                <property name="text">
+                 <string>...</string>
+                </property>
+                <property name="icon">
+                 <iconset resource="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc">
+                  <normaloff>:/stylesheet/img/UI20/toolbar/Object_list.svg</normaloff>:/stylesheet/img/UI20/toolbar/Object_list.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QToolButton" name="gridButton">
+                <property name="text">
+                 <string>...</string>
+                </property>
+                <property name="icon">
+                 <iconset resource="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc">
+                  <normaloff>:/stylesheet/img/UI20/toolbar/Grid.svg</normaloff>:/stylesheet/img/UI20/toolbar/Grid.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="2,2,1">
+             <property name="leftMargin">
+              <number>6</number>
+             </property>
+             <item>
+              <widget class="QLabel" name="nameLabel">
+               <property name="text">
+                <string>Name</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="modifiedLabel">
+               <property name="text">
+                <string>Last modified</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="typeLabel">
+               <property name="text">
+                <string>Type</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0,0">
+          <property name="leftMargin">
+           <number>16</number>
+          </property>
+          <property name="topMargin">
+           <number>16</number>
+          </property>
+          <property name="rightMargin">
+           <number>16</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="levelFileLabel">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>No level file created yet for this project. &lt;a href=&quot;#&quot;&gt;Create one&lt;/a&gt; now.</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::RichText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QTableWidget" name="recentLevelTable">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="styleSheet">
+             <string notr="true"/>
+            </property>
+            <property name="horizontalScrollBarPolicy">
+             <enum>Qt::ScrollBarAlwaysOff</enum>
+            </property>
+            <property name="columnCount">
+             <number>3</number>
+            </property>
+            <attribute name="horizontalHeaderVisible">
+             <bool>false</bool>
+            </attribute>
+            <attribute name="horizontalHeaderStretchLastSection">
+             <bool>false</bool>
+            </attribute>
+            <attribute name="verticalHeaderVisible">
+             <bool>false</bool>
+            </attribute>
+            <attribute name="verticalHeaderMinimumSectionSize">
+             <number>1</number>
+            </attribute>
+            <attribute name="verticalHeaderDefaultSectionSize">
+             <number>48</number>
+            </attribute>
+            <attribute name="verticalHeaderHighlightSections">
+             <bool>false</bool>
+            </attribute>
+            <attribute name="verticalHeaderStretchLastSection">
+             <bool>false</bool>
+            </attribute>
+            <column/>
+            <column/>
+            <column/>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="Line" name="line_4">
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>1</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">color: &quot;black&quot;</string>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <property name="lineWidth">
+           <number>0</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="WelcomeScreenDialog.qrc"/>
+  <include location="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Code/Editor/WinWidgetId.h b/Code/Editor/WinWidgetId.h
new file mode 100644
index 0000000000..5c9d147a7f
--- /dev/null
+++ b/Code/Editor/WinWidgetId.h
@@ -0,0 +1,19 @@
+/*
+ * 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
+
+enum class WinWidgetId
+{
+    NONE = 0,
+    ACTIVE_DEPLOYMENT,
+    PROFILE_SELECTOR,
+    ADD_PROFILE,
+    INITIALIZE_PROJECT,
+    // ALL VALIDS ABOVE HERE
+    NUM_WIN_WIDGET_IDS
+};
diff --git a/Code/Editor/WindowObserver_mac.h b/Code/Editor/WindowObserver_mac.h
new file mode 100644
index 0000000000..e72ecec45b
--- /dev/null
+++ b/Code/Editor/WindowObserver_mac.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 <objc/objc.h>
+#include <QObject>
+
+class QWindow;
+
+namespace Editor
+{
+    class WindowObserver
+        : public QObject
+    {
+        Q_OBJECT
+    public:
+        explicit WindowObserver(QWindow* window, QObject* parent);
+
+        virtual ~WindowObserver();
+
+    public slots:
+        void setWindowIsMoving(bool isMoving);
+        void setWindowIsResizing(bool isResizing);
+
+    signals:
+        void windowIsMovingOrResizingChanged(bool isMovingOrResizing);
+
+    private:
+        bool m_windowIsMoving;
+        bool m_windowIsResizing;
+
+        id m_windowObserver;
+    };
+} // namespace editor
diff --git a/Code/Editor/WindowObserver_mac.mm b/Code/Editor/WindowObserver_mac.mm
new file mode 100644
index 0000000000..daeaaa2ec6
--- /dev/null
+++ b/Code/Editor/WindowObserver_mac.mm
@@ -0,0 +1,172 @@
+/*
+ * 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 "WindowObserver_mac.h"
+
+#include <AppKit/AppKit.h>
+
+#include <QApplication>
+#include <QtGui/qpa/qplatformnativeinterface.h>
+
+
+@interface NSWindowObserver : NSObject
+{
+    Editor::WindowObserver* m_observer;
+    NSWindow* m_window;
+}
+@end
+
+@implementation NSWindowObserver
+
+- (id)initWithWindow:(NSWindow*)window :(Editor::WindowObserver*)observer
+{
+    if ((self = [super init])) {
+        m_observer = observer;
+        m_window = window;
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(onWindowWillMove)
+                                                     name:NSWindowWillMoveNotification
+                                                   object:m_window];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(onWindowDidMove)
+                                                     name:NSWindowDidMoveNotification
+                                                   object:m_window];
+
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(onWindowWillStartLiveResize)
+                                                     name:NSWindowWillStartLiveResizeNotification
+                                                   object:m_window];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(onWindowDidLiveResize)
+                                                     name:NSWindowDidEndLiveResizeNotification
+                                                   object:m_window];
+
+    }
+    return self;
+}
+
+-(void) dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [super dealloc];
+}
+
+- (void)onWindowWillMove
+{
+    m_observer->setWindowIsMoving(true);
+    // This notification only indicates that the window is likely to move because the used clicked
+    // the title bar. If the user releases the mouse without moving the title bar we won't receive
+    // a NSWindowDidMoveNotification, so we add an additional observer to check the state of the
+    // mouse. Note that we don't care whether the window moved or not, we just want to be able to
+    // disable rendering when it is likely
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onWindowDidUpdate:)
+                                                 name:NSWindowDidUpdateNotification
+                                               object:m_window];
+}
+
+- (void)onWindowDidMove
+{
+    m_observer->setWindowIsMoving(false);
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:NSWindowDidUpdateNotification
+                                                  object:m_window];
+}
+
+- (void)onWindowDidUpdate:(NSNotification*)notification
+{
+    static const unsigned long leftMouseButton = 1;  // a value of 1 << 0 corresponds to the left mouse button
+
+    if (([NSEvent pressedMouseButtons] & leftMouseButton) == 0)
+    {
+        m_observer->setWindowIsMoving(false);
+        [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                        name:NSWindowDidUpdateNotification
+                                                      object:m_window];
+    }
+}
+
+- (void)onWindowWillStartLiveResize
+{
+    m_observer->setWindowIsResizing(true);
+}
+
+- (void)onWindowDidLiveResize
+{
+    m_observer->setWindowIsResizing(false);
+}
+
+@end
+
+namespace Editor
+{
+    WindowObserver::WindowObserver(QWindow* window, QObject* parent)
+        : QObject(parent)
+        , m_windowIsMoving(false)
+        , m_windowIsResizing(false)
+        , m_windowObserver(nullptr)
+    {
+        if (!window)
+        {
+            return;
+        }
+
+        QPlatformNativeInterface* nativeInterface = QApplication::platformNativeInterface();
+        NSWindow* nsWindow = static_cast<NSWindow*>(nativeInterface->nativeResourceForWindow("nswindow", window));
+        if (nsWindow == nullptr)
+        {
+            return;
+        }
+
+        m_windowObserver = [[NSWindowObserver alloc] initWithWindow:nsWindow:this];
+    }
+
+    WindowObserver::~WindowObserver()
+    {
+        if (m_windowObserver != nil)
+        {
+            [m_windowObserver release];
+            m_windowObserver = nil;
+        }
+    }
+
+    void WindowObserver::setWindowIsMoving(bool isMoving)
+    {
+        if (isMoving == m_windowIsMoving)
+        {
+            return;
+        }
+
+        const bool wasMovingOrResizing = m_windowIsMoving || m_windowIsResizing;
+        m_windowIsMoving = isMoving;
+        const bool isMovingOrResizing = m_windowIsMoving || m_windowIsResizing;
+
+        if (isMovingOrResizing != wasMovingOrResizing)
+        {
+            emit windowIsMovingOrResizingChanged(isMovingOrResizing);
+        }
+    }
+
+    void WindowObserver::setWindowIsResizing(bool isResizing)
+    {
+        if (isResizing == m_windowIsResizing)
+        {
+            return;
+        }
+
+        const bool wasMovingOrResizing = m_windowIsMoving || m_windowIsResizing;
+        m_windowIsResizing = isResizing;
+        const bool isMovingOrResizing = m_windowIsMoving || m_windowIsResizing;
+
+        if (isMovingOrResizing != wasMovingOrResizing)
+        {
+            emit windowIsMovingOrResizingChanged(isMovingOrResizing);
+        }
+    }
+}
+
+#include <moc_WindowObserver_mac.cpp>
diff --git a/Code/Editor/WipFeatureManager.cpp b/Code/Editor/WipFeatureManager.cpp
new file mode 100644
index 0000000000..9cd737c258
--- /dev/null
+++ b/Code/Editor/WipFeatureManager.cpp
@@ -0,0 +1,453 @@
+/*
+ * 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 "WipFeatureManager.h"
+
+#ifdef USE_WIP_FEATURES_MANAGER
+#include "WipFeaturesDlg.h"
+
+#if defined(AZ_PLATFORM_WINDOWS)
+const char* CWipFeatureManager::kWipFeaturesFilename = "@user@\\Editor\\UI\\WipFeatures.xml";
+#else
+const char* CWipFeatureManager::kWipFeaturesFilename = "@user@/Editor/UI/WipFeatures.xml";
+#endif
+CWipFeatureManager* CWipFeatureManager::s_pInstance = NULL;
+
+static void WipFeatureVarChange(ICVar* pVar)
+{
+    QString strParams = pVar->GetString();
+    QStringList params;
+
+    SplitString(strParams, params, ' ');
+
+    if (strParams == "edit")
+    {
+        static CWipFeaturesDlg dlg;
+
+        dlg.show();
+
+        return;
+    }
+
+    if (params.size() >= 2)
+    {
+        QString featName = params[0].trimmed();
+        QString attr = params[1].trimmed();
+
+        if (featName.isEmpty())
+        {
+            return;
+        }
+
+        int id = featName.toInt();
+
+        // if all features
+        if (featName == "*")
+        {
+            if (attr == "enable")
+            {
+                CWipFeatureManager::Instance()->EnableAllFeatures(true);
+            }
+            else
+            if (attr == "disable")
+            {
+                CWipFeatureManager::Instance()->EnableAllFeatures(false);
+            }
+            else
+            if (attr == "hide")
+            {
+                CWipFeatureManager::Instance()->ShowAllFeatures(false);
+            }
+            else
+            if (attr == "show")
+            {
+                CWipFeatureManager::Instance()->ShowAllFeatures(true);
+            }
+            else
+            if (attr == "safemode")
+            {
+                CWipFeatureManager::Instance()->SetAllFeaturesSafeMode(true);
+            }
+            else
+            if (attr == "fullmode")
+            {
+                CWipFeatureManager::Instance()->SetAllFeaturesSafeMode(false);
+            }
+            else
+            {
+                CWipFeatureManager::Instance()->SetAllFeaturesParams(attr.toUtf8().data());
+            }
+
+            return;
+        }
+
+        if (attr == "enable")
+        {
+            CWipFeatureManager::Instance()->EnableFeature(id, true);
+        }
+        else
+        if (attr == "disable")
+        {
+            CWipFeatureManager::Instance()->EnableFeature(id, false);
+        }
+        else
+        if (attr == "hide")
+        {
+            CWipFeatureManager::Instance()->ShowFeature(id, false);
+        }
+        else
+        if (attr == "show")
+        {
+            CWipFeatureManager::Instance()->ShowFeature(id, true);
+        }
+        else
+        if (attr == "safemode")
+        {
+            CWipFeatureManager::Instance()->SetFeatureSafeMode(id, true);
+        }
+        else
+        if (attr == "fullmode")
+        {
+            CWipFeatureManager::Instance()->SetFeatureSafeMode(id, false);
+        }
+        else
+        {
+            CWipFeatureManager::Instance()->SetFeatureParams(id, attr.toUtf8().data());
+        }
+    }
+}
+
+CWipFeatureManager::CWipFeatureManager()
+{
+    m_bEnabled = true;
+}
+
+CWipFeatureManager::~CWipFeatureManager()
+{
+}
+
+bool CWipFeatureManager::Init(bool bLoadXml)
+{
+    if (!gEnv)
+    {
+        return false;
+    }
+
+    IConsole* pConsole = gEnv->pConsole;
+
+    if (!pConsole)
+    {
+        return false;
+    }
+
+    REGISTER_CVAR2_CB("e_wipfeature", (const char**)&CWipFeatureManager::Instance()->m_consoleCmdParams, "", VF_ALWAYSONCHANGE | VF_CHEAT, "wipfeature <featureName> enable|disable|hide|show|safemode|fullmode", WipFeatureVarChange);
+
+    if (bLoadXml)
+    {
+        CWipFeatureManager::Instance()->Load();
+    }
+
+    return true;
+}
+
+void CWipFeatureManager::Shutdown()
+{
+    CWipFeatureManager::Instance()->Save();
+    delete s_pInstance;
+    s_pInstance = NULL;
+}
+
+bool CWipFeatureManager::Load(const char* pFilename, bool bClearExisting)
+{
+    if (!GetISystem())
+    {
+        return false;
+    }
+
+    XmlNodeRef root = GetISystem()->LoadXmlFromFile(pFilename);
+
+    if (!root)
+    {
+        return false;
+    }
+
+    if (bClearExisting)
+    {
+        m_features.clear();
+    }
+
+    Log("Loading WIP features file: '%s'...", pFilename);
+
+    for (size_t i = 0, iCount = root->getChildCount(); i < iCount; ++i)
+    {
+        SWipFeatureInfo wf;
+        XmlNodeRef node = root->getChild(i);
+        XmlString str;
+
+        node->getAttr("id", wf.m_id);
+        node->getAttr("displayName", str);
+        wf.m_displayName = str;
+        node->getAttr("visible", wf.m_bVisible);
+        node->getAttr("enabled", wf.m_bEnabled);
+        node->getAttr("safeMode", wf.m_bSafeMode);
+        node->getAttr("params", str);
+        wf.m_params = str;
+        wf.m_bLoadedFromXml = true;
+
+        TWipFeatures::iterator iter = m_features.find(wf.m_id);
+
+        if (iter == m_features.end())
+        {
+            m_features[wf.m_id] = wf;
+        }
+        else
+        {
+            m_features[wf.m_id].m_bVisible = wf.m_bVisible;
+            m_features[wf.m_id].m_bEnabled = wf.m_bEnabled;
+            m_features[wf.m_id].m_bSafeMode = wf.m_bSafeMode;
+            m_features[wf.m_id].m_params = wf.m_params;
+        }
+    }
+
+    Log("Loaded %d WIP features.", m_features.size());
+
+    return true;
+}
+
+bool CWipFeatureManager::Save(const char* pFilename)
+{
+    if (!gEnv)
+    {
+        return false;
+    }
+
+    if (!GetISystem())
+    {
+        return false;
+    }
+
+    ISystem* pISystem = GetISystem();
+
+    XmlNodeRef root = pISystem->CreateXmlNode("features");
+
+    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
+    {
+        SWipFeatureInfo& wf = iter->second;
+        XmlNodeRef node = root->createNode("feature");
+
+        node->setAttr("id", wf.m_id);
+        node->setAttr("displayName", wf.m_displayName.c_str());
+        node->setAttr("visible", wf.m_bVisible);
+        node->setAttr("enabled", wf.m_bEnabled);
+        node->setAttr("safeMode", wf.m_bSafeMode);
+        node->setAttr("params", wf.m_params.c_str());
+
+        root->addChild(node);
+    }
+
+    root->saveToFile(pFilename);
+
+    return true;
+}
+
+int CWipFeatureManager::RegisterFeature(const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams, bool bSaveToXml)
+{
+    int aMaxId = -1;
+
+    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
+    {
+        if (iter->first > aMaxId)
+        {
+            aMaxId = iter->first;
+        }
+    }
+
+    ++aMaxId;
+    SetFeature(aMaxId, pDisplayName, bVisible, bEnabled, bSafeMode, pParams, bSaveToXml);
+
+    return aMaxId;
+}
+
+void CWipFeatureManager::SetFeature(int aFeatureId, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams, bool bSaveToXml)
+{
+    m_features[aFeatureId].m_id = aFeatureId;
+    m_features[aFeatureId].m_displayName = pDisplayName;
+    m_features[aFeatureId].m_bVisible = bVisible;
+    m_features[aFeatureId].m_bEnabled = bEnabled;
+    m_features[aFeatureId].m_bSafeMode = bSafeMode;
+    m_features[aFeatureId].m_bSaveToXml = bSaveToXml;
+    m_features[aFeatureId].m_params = pParams;
+
+    if (m_features[aFeatureId].m_pfnUpdateFeature)
+    {
+        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, &bVisible, &bEnabled, &bSafeMode, pParams);
+    }
+}
+
+void CWipFeatureManager::SetDefaultFeatureStates(int aFeatureId, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams)
+{
+    TWipFeatures::iterator iter = m_features.find(aFeatureId);
+
+    // set feature if not existing
+    if (iter == m_features.end() || (iter != m_features.end() && !iter->second.m_bLoadedFromXml))
+    {
+        m_features[aFeatureId].m_id = aFeatureId;
+        m_features[aFeatureId].m_displayName = pDisplayName;
+        m_features[aFeatureId].m_bVisible = bVisible;
+        m_features[aFeatureId].m_bEnabled = bEnabled;
+        m_features[aFeatureId].m_bSafeMode = bSafeMode;
+        m_features[aFeatureId].m_params = pParams;
+    }
+    else
+    if (iter != m_features.end() && iter->second.m_bLoadedFromXml)
+    {
+        m_features[aFeatureId].m_id = aFeatureId;
+        m_features[aFeatureId].m_displayName = pDisplayName;
+    }
+
+    if (m_features[aFeatureId].m_pfnUpdateFeature)
+    {
+        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, &bVisible, &bEnabled, &bSafeMode, pParams);
+    }
+}
+
+bool CWipFeatureManager::IsFeatureVisible(int aFeatureId)
+{
+    return m_features[aFeatureId].m_bVisible || !m_bEnabled;
+}
+
+bool CWipFeatureManager::IsFeatureEnabled(int aFeatureId)
+{
+    return m_features[aFeatureId].m_bEnabled || !m_bEnabled;
+}
+
+bool CWipFeatureManager::IsFeatureInSafeMode(int aFeatureId)
+{
+    if (!m_bEnabled)
+    {
+        return false;
+    }
+
+    return m_features[aFeatureId].m_bSafeMode;
+}
+
+const char* CWipFeatureManager::GetFeatureParams(int aFeatureId)
+{
+    return m_features[aFeatureId].m_params.c_str();
+}
+
+void CWipFeatureManager::ShowFeature(int aFeatureId, bool bShow)
+{
+    m_features[aFeatureId].m_bVisible = bShow;
+
+    if (m_features[aFeatureId].m_pfnUpdateFeature)
+    {
+        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, &bShow, NULL, NULL, NULL);
+    }
+}
+
+void CWipFeatureManager::EnableFeature(int aFeatureId, bool bEnable)
+{
+    m_features[aFeatureId].m_bEnabled = bEnable;
+
+    if (m_features[aFeatureId].m_pfnUpdateFeature)
+    {
+        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, &bEnable, NULL, NULL);
+    }
+}
+
+void CWipFeatureManager::SetFeatureSafeMode(int aFeatureId, bool bSafeMode)
+{
+    m_features[aFeatureId].m_bSafeMode = bSafeMode;
+
+    if (m_features[aFeatureId].m_pfnUpdateFeature)
+    {
+        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, NULL, &bSafeMode, NULL);
+    }
+}
+
+void CWipFeatureManager::SetFeatureParams(int aFeatureId, const char* pParams)
+{
+    m_features[aFeatureId].m_params = pParams;
+
+    if (m_features[aFeatureId].m_pfnUpdateFeature)
+    {
+        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, NULL, NULL, pParams);
+    }
+}
+
+void CWipFeatureManager::ShowAllFeatures(bool bShow)
+{
+    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
+    {
+        iter->second.m_bVisible = bShow;
+
+        if (iter->second.m_pfnUpdateFeature)
+        {
+            iter->second.m_pfnUpdateFeature(iter->first, &bShow, NULL, NULL, NULL);
+        }
+    }
+}
+
+void CWipFeatureManager::EnableAllFeatures(bool bEnable)
+{
+    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
+    {
+        iter->second.m_bEnabled = bEnable;
+
+        if (iter->second.m_pfnUpdateFeature)
+        {
+            iter->second.m_pfnUpdateFeature(iter->first, NULL, &bEnable, NULL, NULL);
+        }
+    }
+}
+
+void CWipFeatureManager::SetAllFeaturesSafeMode(bool bSafeMode)
+{
+    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
+    {
+        iter->second.m_bSafeMode = bSafeMode;
+
+        if (iter->second.m_pfnUpdateFeature)
+        {
+            iter->second.m_pfnUpdateFeature(iter->first, NULL, NULL, &bSafeMode, NULL);
+        }
+    }
+}
+
+void CWipFeatureManager::SetAllFeaturesParams(const char* pParams)
+{
+    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
+    {
+        iter->second.m_params = pParams;
+
+        if (iter->second.m_pfnUpdateFeature)
+        {
+            iter->second.m_pfnUpdateFeature(iter->first, NULL, NULL, NULL, pParams);
+        }
+    }
+}
+
+void CWipFeatureManager::EnableManager(bool bEnable)
+{
+    m_bEnabled = bEnable;
+}
+
+void CWipFeatureManager::SetFeatureUpdateCallback(int aFeatureId, TWipFeatureUpdateCallback pfnUpdate)
+{
+    m_features[aFeatureId].m_pfnUpdateFeature = pfnUpdate;
+}
+
+std::map<int, CWipFeatureManager::SWipFeatureInfo>&  CWipFeatureManager::GetFeatures()
+{
+    return m_features;
+}
+
+#endif
diff --git a/Code/Editor/WipFeatureManager.h b/Code/Editor/WipFeatureManager.h
new file mode 100644
index 0000000000..b6e43dcd88
--- /dev/null
+++ b/Code/Editor/WipFeatureManager.h
@@ -0,0 +1,158 @@
+/*
+ * 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_WIPFEATUREMANAGER_H
+#define CRYINCLUDE_EDITOR_WIPFEATUREMANAGER_H
+#pragma once
+
+/*
+    This class is used to control work in progress features at runtime, so QA can test even if the end user will not see those features
+    You can use the console command: e_wipfeature <numeric featureId> enable|disable|hide|show|safemode|fullmode
+    ******************************************************************************************************************************************
+    *** GOOD TO KNOW: "e_wipfeature edit" console command will display the WIP dialog and you can control the features from there
+    ******************************************************************************************************************************************
+*/
+
+// undef this define to spot all wip feature usages within the editor at compile time
+#define USE_WIP_FEATURES_MANAGER
+
+#ifdef USE_WIP_FEATURES_MANAGER
+
+// use this to register new wip features, usage from inside functions
+// @param id is the numeric unique id of the feature, its good to have all feature ids in an enum in one file
+// @param bVisible is the feature visible by default
+// @param bEnabled is the feature enabled (usually visual enable like non-grayed) by default
+// @param bSafeMode is the feature operating in some sort of safe mode (the safe mode behavior defined by the feature itself)
+// @param pTWipFeatureUpdateCallback callback of type TWipFeatureUpdateCallback for when a feature state (visible,enabled and so on) was modified
+#define REGISTER_WIP_FEATURE(id, bVisible, bEnabled, bSafeMode, pTWipFeatureUpdateCallback) \
+    static CWipFeatureManager::CWipFeatureRegisterer s_wipFeatureRegisterer_##id(id, ""#id, bVisible, bEnabled, bSafeMode, pTWipFeatureUpdateCallback);
+
+#define IS_WIP_FEATURE_VISIBLE(id) CWipFeatureManager::Instance()->IsFeatureVisible(id)
+#define IS_WIP_FEATURE_ENABLED(id) CWipFeatureManager::Instance()->IsFeatureEnabled(id)
+#define IS_WIP_FEATURE_SAFEMODE(id) CWipFeatureManager::Instance()->IsFeatureInSafeMode(id)
+
+// The feature manager singleton itself
+class CWipFeatureManager
+{
+public:
+
+    static const char* kWipFeaturesFilename;
+
+    // Used to register a callback function to update the state of features whitin the editor
+    // pbVisible, pbEnabled, pbSafeMode, pParams - if the pointer is NULL, then that attribute was not changed
+    typedef void (* TWipFeatureUpdateCallback)(int aFeatureId, const bool* const pbVisible, const bool* const pbEnabled, const bool* const pbSafeMode, const char* pParams);
+
+    // wip feature registerer auto create object, used for static auto feature creation with the REGISTER_WIP_FEATURE macro
+    class CWipFeatureRegisterer
+    {
+    public:
+
+        CWipFeatureRegisterer(int id, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, TWipFeatureUpdateCallback pTWipFeatureUpdateCallback)
+        {
+            CWipFeatureManager::Instance()->SetFeatureUpdateCallback(id, pTWipFeatureUpdateCallback);
+            CWipFeatureManager::Instance()->SetDefaultFeatureStates(id, pDisplayName, bVisible, bEnabled, bSafeMode);
+        }
+    };
+
+    struct SWipFeatureInfo
+    {
+        SWipFeatureInfo()
+            : m_id(0)
+            , m_displayName("")
+            , m_bVisible(true)
+            , m_bEnabled(true)
+            , m_bSafeMode(false)
+            , m_pfnUpdateFeature(NULL)
+            , m_bLoadedFromXml(false)
+        {}
+
+        int         m_id;
+        string  m_displayName, m_params;
+        bool        m_bVisible, m_bEnabled, m_bSafeMode,
+        // if true, this feature will be saved into the xml file when Save(...) will be called
+                    m_bSaveToXml, m_bLoadedFromXml;
+        TWipFeatureUpdateCallback   m_pfnUpdateFeature;
+    };
+
+    typedef std::map<int, SWipFeatureInfo> TWipFeatures;
+
+private:
+
+    CWipFeatureManager();
+    ~CWipFeatureManager();
+
+    static CWipFeatureManager* s_pInstance;
+
+public:
+
+    static CWipFeatureManager* Instance()
+    {
+        if (!s_pInstance)
+        {
+            s_pInstance = new CWipFeatureManager();
+            assert(s_pInstance);
+        }
+
+        return s_pInstance;
+    }
+
+    static bool Init(bool bLoadXml = true);
+    static void Shutdown();
+
+    bool Load(const char* pFilename = kWipFeaturesFilename, bool bClearExisting = true);
+    bool Save(const char* pFilename = kWipFeaturesFilename);
+
+    // Register a new feature
+    // @return a new feature ID
+    int     RegisterFeature(const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams = "", bool bSaveToXml = true);
+    // Set an existing feature
+    void    SetFeature(int aFeatureId, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams = "", bool bSaveToXml = true);
+    // Create a new feature, but it will take into account the existing feature info from the loaded XML file, with persistent settings, if any
+    void    SetDefaultFeatureStates(int aFeatureId, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams = "");
+    bool    IsFeatureVisible(int aFeatureId);
+    bool    IsFeatureEnabled(int aFeatureId);
+    bool    IsFeatureInSafeMode(int aFeatureId);
+    const char* GetFeatureParams(int aFeatureId);
+
+    void ShowFeature(int aFeatureId, bool bShow = true);
+    void EnableFeature(int aFeatureId, bool bEnable = true);
+    void SetFeatureSafeMode(int aFeatureId, bool bSafeMode);
+    void SetFeatureParams(int aFeatureId, const char* pParams);
+
+    void ShowAllFeatures(bool bShow = true);
+    void EnableAllFeatures(bool bEnable = true);
+    void SetAllFeaturesSafeMode(bool bSafeMode);
+    void SetAllFeaturesParams(const char* pParams);
+
+    // if manager is disabled, then all queries about feature enable/visible/fullmode states will return true always
+    void EnableManager(bool bEnable = true);
+
+    void SetFeatureUpdateCallback(int aFeatureId, TWipFeatureUpdateCallback pfnUpdate);
+    TWipFeatures&   GetFeatures();
+
+private:
+
+    static const int kMaxWipCmdSize = 200;
+
+    TWipFeatures    m_features;
+    char                    m_consoleCmdParams[kMaxWipCmdSize];
+    bool                    m_bEnabled;
+};
+
+#else
+
+//
+// no WIP feature manager in production build
+//
+#define REGISTER_WIP_FEATURE
+#define IS_WIP_FEATURE_VISIBLE(id) true
+#define IS_WIP_FEATURE_ENABLED(id) true
+#define IS_WIP_FEATURE_SAFEMODE(id) true
+
+#endif //USE_WIP_FEATURES_MANAGER
+#endif // CRYINCLUDE_EDITOR_WIPFEATUREMANAGER_H
diff --git a/Code/Editor/WipFeaturesDlg.cpp b/Code/Editor/WipFeaturesDlg.cpp
new file mode 100644
index 0000000000..a50282ecfe
--- /dev/null
+++ b/Code/Editor/WipFeaturesDlg.cpp
@@ -0,0 +1,238 @@
+/*
+ * 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 "WipFeatureManager.h"
+
+#include "WipFeaturesDlg.h"
+
+// Qt
+#include <QDialog>
+
+AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#include "ui_WipFeaturesDlg.h"
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+#ifdef USE_WIP_FEATURES_MANAGER
+
+// CWipFeaturesDlg dialog
+
+class WipFeaturesModel
+    : public QAbstractTableModel
+{
+public:
+    WipFeaturesModel(QObject* parent = nullptr)
+        : QAbstractTableModel(parent)
+    {
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        return parent.isValid() ? 0 : CWipFeatureManager::Instance()->GetFeatures().size();
+    }
+
+    int columnCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        return parent.isValid() ? 0 : 5;
+    }
+
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override
+    {
+        if (orientation != Qt::Horizontal || section >= columnCount())
+        {
+            return QVariant();
+        }
+
+
+        switch (role)
+        {
+        case Qt::TextAlignmentRole:
+            return section == 0 ? Qt::AlignLeft : Qt::AlignCenter;
+        case Qt::DisplayRole:
+            switch (section)
+            {
+            case 0:
+                return tr("Name");
+            case 1:
+                return tr("Id");
+            case 2:
+                return tr("Visible");
+            case 3:
+                return tr("Enabled");
+            case 4:
+                return tr("SafeMode");
+            default:
+                return QVariant();
+            }
+        default:
+            return QVariant();
+        }
+    }
+
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override
+    {
+        if (!index.isValid() || index.column() >= columnCount(index.parent()) || index.row() >= rowCount(index.parent()))
+        {
+            return false;
+        }
+
+        if (role != Qt::EditRole || !value.canConvert<bool>())
+        {
+            return false;
+        }
+
+        auto it = CWipFeatureManager::Instance()->GetFeatures().begin();
+        std::advance(it, index.row());
+
+        auto id = it->first;
+
+        switch (index.column())
+        {
+        case 2:
+            CWipFeatureManager::Instance()->ShowFeature(id, value.toBool());
+            break;
+        case 3:
+            CWipFeatureManager::Instance()->EnableFeature(id, value.toBool());
+            break;
+        case 4:
+            CWipFeatureManager::Instance()->SetFeatureSafeMode(id, value.toBool());
+            break;
+        default:
+            return false;
+        }
+
+        emit dataChanged(index, index);
+        return true;
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
+    {
+        if (!index.isValid() || index.column() >= columnCount(index.parent()) || index.row() >= rowCount(index.parent()))
+        {
+            return QVariant();
+        }
+
+        if (role == Qt::TextAlignmentRole)
+        {
+            return headerData(index.column(), Qt::Horizontal, role);
+        }
+
+        if (role != Qt::DisplayRole)
+        {
+            return QVariant();
+        }
+
+        auto it = CWipFeatureManager::Instance()->GetFeatures().begin();
+        std::advance(it, index.row());
+
+        auto feature = it->second;
+
+        switch (index.column())
+        {
+        case 0:
+            return QString(feature.m_displayName.c_str());
+        case 1:
+            return feature.m_id;
+        case 2:
+            return feature.m_bVisible ? tr("X") : QString();
+        case 3:
+            return feature.m_bEnabled ? tr("X") : QString();
+        case 4:
+            return feature.m_bSafeMode ? tr("X") : QString();
+        default:
+            return QVariant();
+        }
+    }
+};
+
+CWipFeaturesDlg::CWipFeaturesDlg(QWidget* pParent /*=NULL*/)
+    : QDialog(pParent)
+    , m_ui(new Ui::WipFeaturesDlg)
+{
+    m_ui->setupUi(this);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setFixedSize(size());
+
+    OnInitDialog();
+
+    connect(m_ui->buttonShow, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonShow);
+    connect(m_ui->buttonHide, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonHide);
+    connect(m_ui->buttonEnable, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonEnable);
+    connect(m_ui->buttonDisable, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonDisable);
+    connect(m_ui->buttonSafeMode, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonSafemode);
+    connect(m_ui->buttonNormalMode, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonNormalmode);
+}
+
+CWipFeaturesDlg::~CWipFeaturesDlg()
+{
+}
+
+// CWipFeaturesDlg message handlers
+
+void CWipFeaturesDlg::OnInitDialog()
+{
+    m_ui->m_lstFeatures->setModel(new WipFeaturesModel(this));
+    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(0, 300);
+    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(1, 70);
+    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(2, 70);
+    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(3, 70);
+    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(4, 70);
+}
+
+void CWipFeaturesDlg::OnBnClickedButtonShow()
+{
+    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
+    {
+        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 2), true);
+    }
+}
+
+void CWipFeaturesDlg::OnBnClickedButtonHide()
+{
+    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
+    {
+        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 2), false);
+    }
+}
+
+void CWipFeaturesDlg::OnBnClickedButtonEnable()
+{
+    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
+    {
+        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 3), true);
+    }
+}
+
+void CWipFeaturesDlg::OnBnClickedButtonDisable()
+{
+    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
+    {
+        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 3), false);
+    }
+}
+
+void CWipFeaturesDlg::OnBnClickedButtonSafemode()
+{
+    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
+    {
+        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 4), true);
+    }
+}
+
+void CWipFeaturesDlg::OnBnClickedButtonNormalmode()
+{
+    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
+    {
+        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 4), false);
+    }
+}
+
+#include <moc_WipFeaturesDlg.cpp>
+
+#endif // USE_WIP_FEATURES_MANAGER
diff --git a/Code/Editor/WipFeaturesDlg.h b/Code/Editor/WipFeaturesDlg.h
new file mode 100644
index 0000000000..d352875ecc
--- /dev/null
+++ b/Code/Editor/WipFeaturesDlg.h
@@ -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
+ *
+ */
+
+
+#pragma once
+#ifndef CRYINCLUDE_EDITOR_WIPFEATURESDLG_H
+#define CRYINCLUDE_EDITOR_WIPFEATURESDLG_H
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+#ifdef USE_WIP_FEATURES_MANAGER
+
+// CWipFeaturesDlg dialog
+
+namespace Ui
+{
+    class WipFeaturesDlg;
+}
+
+class CWipFeaturesDlg
+    : public QDialog
+{
+    Q_OBJECT
+public:
+    CWipFeaturesDlg(QWidget* pParent = NULL);   // standard constructor
+    virtual ~CWipFeaturesDlg();
+
+private:
+    void OnInitDialog();
+    void OnBnClickedButtonShow();
+    void OnBnClickedButtonHide();
+    void OnBnClickedButtonEnable();
+    void OnBnClickedButtonDisable();
+    void OnBnClickedButtonSafemode();
+    void OnBnClickedButtonNormalmode();
+
+private:
+    QScopedPointer<Ui::WipFeaturesDlg> m_ui;
+};
+
+#else
+
+class CWipFeaturesDlg
+    : public QDialog
+{
+    Q_OBJECT
+};
+
+#endif // USE_WIP_FEATURES_MANAGER
+
+#endif // CRYINCLUDE_EDITOR_WIPFEATURESDLG_H
diff --git a/Code/Sandbox/Editor/WipFeaturesDlg.qrc b/Code/Editor/WipFeaturesDlg.qrc
similarity index 100%
rename from Code/Sandbox/Editor/WipFeaturesDlg.qrc
rename to Code/Editor/WipFeaturesDlg.qrc
diff --git a/Code/Sandbox/Editor/WipFeaturesDlg.ui b/Code/Editor/WipFeaturesDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/WipFeaturesDlg.ui
rename to Code/Editor/WipFeaturesDlg.ui
diff --git a/Code/Sandbox/Editor/arhitype_tree_00.png b/Code/Editor/arhitype_tree_00.png
similarity index 100%
rename from Code/Sandbox/Editor/arhitype_tree_00.png
rename to Code/Editor/arhitype_tree_00.png
diff --git a/Code/Sandbox/Editor/arhitype_tree_01.png b/Code/Editor/arhitype_tree_01.png
similarity index 100%
rename from Code/Sandbox/Editor/arhitype_tree_01.png
rename to Code/Editor/arhitype_tree_01.png
diff --git a/Code/Sandbox/Editor/arhitype_tree_02.png b/Code/Editor/arhitype_tree_02.png
similarity index 100%
rename from Code/Sandbox/Editor/arhitype_tree_02.png
rename to Code/Editor/arhitype_tree_02.png
diff --git a/Code/Sandbox/Editor/arhitype_tree_03.png b/Code/Editor/arhitype_tree_03.png
similarity index 100%
rename from Code/Sandbox/Editor/arhitype_tree_03.png
rename to Code/Editor/arhitype_tree_03.png
diff --git a/Code/Sandbox/Editor/bmp00005_00.png b/Code/Editor/bmp00005_00.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_00.png
rename to Code/Editor/bmp00005_00.png
diff --git a/Code/Sandbox/Editor/bmp00005_01.png b/Code/Editor/bmp00005_01.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_01.png
rename to Code/Editor/bmp00005_01.png
diff --git a/Code/Sandbox/Editor/bmp00005_02.png b/Code/Editor/bmp00005_02.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_02.png
rename to Code/Editor/bmp00005_02.png
diff --git a/Code/Sandbox/Editor/bmp00005_03.png b/Code/Editor/bmp00005_03.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_03.png
rename to Code/Editor/bmp00005_03.png
diff --git a/Code/Sandbox/Editor/bmp00005_04.png b/Code/Editor/bmp00005_04.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_04.png
rename to Code/Editor/bmp00005_04.png
diff --git a/Code/Sandbox/Editor/bmp00005_05.png b/Code/Editor/bmp00005_05.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_05.png
rename to Code/Editor/bmp00005_05.png
diff --git a/Code/Sandbox/Editor/bmp00005_06.png b/Code/Editor/bmp00005_06.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_06.png
rename to Code/Editor/bmp00005_06.png
diff --git a/Code/Sandbox/Editor/bmp00005_07.png b/Code/Editor/bmp00005_07.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_07.png
rename to Code/Editor/bmp00005_07.png
diff --git a/Code/Sandbox/Editor/bmp00005_08.png b/Code/Editor/bmp00005_08.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_08.png
rename to Code/Editor/bmp00005_08.png
diff --git a/Code/Sandbox/Editor/bmp00005_09.png b/Code/Editor/bmp00005_09.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_09.png
rename to Code/Editor/bmp00005_09.png
diff --git a/Code/Sandbox/Editor/bmp00006_00.png b/Code/Editor/bmp00006_00.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_00.png
rename to Code/Editor/bmp00006_00.png
diff --git a/Code/Sandbox/Editor/bmp00006_01.png b/Code/Editor/bmp00006_01.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_01.png
rename to Code/Editor/bmp00006_01.png
diff --git a/Code/Sandbox/Editor/bmp00006_02.png b/Code/Editor/bmp00006_02.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_02.png
rename to Code/Editor/bmp00006_02.png
diff --git a/Code/Sandbox/Editor/bmp00006_03.png b/Code/Editor/bmp00006_03.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_03.png
rename to Code/Editor/bmp00006_03.png
diff --git a/Code/Sandbox/Editor/bmp00006_04.png b/Code/Editor/bmp00006_04.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_04.png
rename to Code/Editor/bmp00006_04.png
diff --git a/Code/Sandbox/Editor/bmp00006_05.png b/Code/Editor/bmp00006_05.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_05.png
rename to Code/Editor/bmp00006_05.png
diff --git a/Code/Sandbox/Editor/bmp00006_06.png b/Code/Editor/bmp00006_06.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_06.png
rename to Code/Editor/bmp00006_06.png
diff --git a/Code/Sandbox/Editor/bmp00006_07.png b/Code/Editor/bmp00006_07.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_07.png
rename to Code/Editor/bmp00006_07.png
diff --git a/Code/Editor/editor_core_files.cmake b/Code/Editor/editor_core_files.cmake
new file mode 100644
index 0000000000..3719e2f498
--- /dev/null
+++ b/Code/Editor/editor_core_files.cmake
@@ -0,0 +1,79 @@
+#
+# 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
+    BaseLibrary.h
+    BaseLibraryItem.h
+    UsedResources.h
+    UIEnumsDatabase.h
+    Include/EditorCoreAPI.cpp
+    Include/IErrorReport.h
+    Include/IBaseLibraryManager.h
+    Include/IFileUtil.h
+    Include/EditorCoreAPI.h
+    Include/IEditorMaterial.h
+    Include/IEditorMaterialManager.h
+    Include/IImageUtil.h
+    Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
+    Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
+    Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
+    Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
+    Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
+    Controls/ReflectedPropertyControl/ReflectedVar.cpp
+    Controls/ReflectedPropertyControl/ReflectedVar.h
+    Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
+    Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
+    Controls/QBitmapPreviewDialog.cpp
+    Controls/QBitmapPreviewDialog.h
+    Controls/QBitmapPreviewDialog.ui
+    Controls/QBitmapPreviewDialogImp.cpp
+    Controls/QBitmapPreviewDialogImp.h
+    Controls/QToolTipWidget.h
+    Controls/QToolTipWidget.cpp
+    BaseLibraryItem.cpp
+    BaseLibrary.cpp
+    UsedResources.cpp
+    UIEnumsDatabase.cpp
+    LyViewPaneNames.h
+    QtViewPaneManager.cpp
+    QtViewPaneManager.h
+    ErrorRecorder.cpp
+    ErrorRecorder.h
+    ErrorDialog.cpp
+    ErrorDialog.h
+    ErrorDialog.ui
+    Clipboard.cpp
+    Util/MemoryBlock.cpp
+    Util/Variable.cpp
+    Util/UndoUtil.cpp
+    Util/VariablePropertyType.cpp
+    Clipboard.h
+    Util/MemoryBlock.h
+    Util/Variable.h
+    Util/UndoUtil.h
+    Util/VariablePropertyType.h
+    Util/RefCountBase.h
+    Util/PathUtil.h
+    Util/PathUtil.cpp
+    Util/ImageHistogram.cpp
+    Util/Image.cpp
+    Util/ImageHistogram.h
+    Util/Image.h
+    Util/ColorUtils.cpp
+    Util/ColorUtils.h
+    Undo/Undo.cpp
+    Undo/IUndoManagerListener.h
+    Undo/IUndoObject.h
+    Undo/Undo.h
+    Undo/UndoVariableChange.h
+    WinWidgetId.h
+    QtUI/ColorButton.cpp
+    QtUI/ColorButton.h
+    QtUtil.h
+    QtUtilWin.h
+    QtViewPane.h
+)
diff --git a/Code/Editor/editor_core_test_files.cmake b/Code/Editor/editor_core_test_files.cmake
new file mode 100644
index 0000000000..1f13168fe9
--- /dev/null
+++ b/Code/Editor/editor_core_test_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
+    Core/Tests/test_Main.cpp
+    Core/Tests/test_Archive.cpp
+    Core/Tests/test_PathUtil.cpp
+)
diff --git a/Code/Editor/editor_darwin_files.cmake b/Code/Editor/editor_darwin_files.cmake
new file mode 100644
index 0000000000..6901f0e298
--- /dev/null
+++ b/Code/Editor/editor_darwin_files.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
+#
+#
+
+set(FILES
+    gui_info.plist
+)
diff --git a/Code/Editor/editor_files.cmake b/Code/Editor/editor_files.cmake
new file mode 100644
index 0000000000..18df7dccf0
--- /dev/null
+++ b/Code/Editor/editor_files.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(FILES
+    main.cpp
+    Style/Editor.qss
+    Style/resources.qrc
+    EditorCryEdit.rc
+)
diff --git a/Code/Editor/editor_headers_files.cmake b/Code/Editor/editor_headers_files.cmake
new file mode 100644
index 0000000000..ea5912045e
--- /dev/null
+++ b/Code/Editor/editor_headers_files.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(FILES
+)
diff --git a/Code/Editor/editor_lib_files.cmake b/Code/Editor/editor_lib_files.cmake
new file mode 100644
index 0000000000..562623dab2
--- /dev/null
+++ b/Code/Editor/editor_lib_files.cmake
@@ -0,0 +1,841 @@
+#
+# 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
+    Translations/editor_en-us.ts
+    Translations/assetbrowser_en-us.ts
+    DPIAware.xml
+    res/AVI_Recorder.bmp
+    res/ConsoleToolbar.bmp
+    res/CryEdit.ico
+    res/CryEdit.rc2
+    res/CryEditDoc.ico
+    res/Cursor_2.cur
+    res/Mouse.cur
+    res/Preferences.bmp
+    res/Toolbar.bmp
+    res/TreeView.bmp
+    res/VisualLog_PlayerButtons.bmp
+    res/ab_toolbar.bmp
+    res/about_dark.bmp
+    res/anim.bmp
+    res/animatio.bmp
+    res/animations_tree_soundevent.bmp
+    res/animflag_inside_pak.bmp
+    res/animflag_on_disk.bmp
+    res/animtree.bmp
+    res/arhitype_tree.bmp
+    res/arr_addkey.cur
+    res/arrow.cur
+    res/arrow_down.cur
+    res/arrow_down_black.ico
+    res/arrow_downright.cur
+    res/arrow_up.cur
+    res/arrow_up_black.ico
+    res/arrow_upright.cur
+    res/arrowcop.cur
+    res/assetIsDraggable.ico
+    res/avi_reco.bmp
+    res/ball_disabled.ico
+    res/ball_offline.ico
+    res/ball_online.ico
+    res/ball_pending.ico
+    res/bitmap5.bmp
+    res/bitmap6.bmp
+    res/bmp00001.bmp
+    res/bmp00002.bmp
+    res/bmp00003.bmp
+    res/bmp00005.bmp
+    res/bmp00006.bmp
+    res/bmp00007.bmp
+    res/bmp00008.bmp
+    res/bmp00009.bmp
+    res/bmp00010.bmp
+    res/bmp00011.bmp
+    res/bmp00012.bmp
+    res/bmp00013.bmp
+    res/bmp00014.bmp
+    res/bmp00015.bmp
+    res/bmp00016.bmp
+    res/bmp00017.bmp
+    res/bmp00019.bmp
+    res/bmp00020.bmp
+    res/bmp00024.bmp
+    res/bmp00025.bmp
+    res/bmp00026.bmp
+    res/bmp00027.bmp
+    res/bmp00028.bmp
+    res/bmp00029.bmp
+    res/bmp00030.bmp
+    res/bmp00031.bmp
+    res/brush24bpp.bmp
+    res/ce_animations_toolbar.bmp
+    res/character_parts_bar.bmp
+    res/charedit.bmp
+    res/clapperboard_cancel.bmp
+    res/clapperboard_ready.bmp
+    res/clone.ico
+    res/cur00001.cur
+    res/cur00002.cur
+    res/cur00003.cur
+    res/cur00004.cur
+    res/cur00005.cur
+    res/cursor1.cur
+    res/cursor2.cur
+    res/db_gametoken.bmp
+    res/db_library_bar.bmp
+    res/db_library_item_bar.bmp
+    res/db_music.bmp
+    res/db_music_logic.bmp
+    res/db_standart.bmp
+    res/down_arr.ico
+    res/down_arrow.ico
+    res/dynamichelp.bmp
+    res/edit_mod.bmp
+    res/editwithbutton.bmp
+    res/editwithbutton_dark.bmp
+    res/entitybar.bmp
+    res/error_report.bmp
+    res/expand1.ico
+    res/expand2.ico
+    res/faceit_playbar.bmp
+    res/faceit_slidersbar.bmp
+    res/faceit_spline_bar.bmp
+    res/facejoystickbar.bmp
+    res/facesequence_bar.bmp
+    res/facialsequence_bar.bmp
+    res/feedback.ico
+    res/file_browse.ico
+    res/filesimage.bmp
+    res/filestatus.bmp
+    res/folder.ico
+    res/fopen_back.ico
+    res/fopen_up.ico
+    res/grid.ico
+    res/handDrag.cur
+    res/hit.cur
+    res/ico00001.ico
+    res/ico00002.ico
+    res/icon1.ico
+    res/icon_delete.ico
+    res/icon_export.ico
+    res/icon_import.ico
+    res/icon_new.ico
+    res/icon_pause.ico
+    res/icon_play.ico
+    res/icon_question.bmp
+    res/icon_question.ico
+    res/idb_.bmp
+    res/layouts.bmp
+    res/lc_connecting.ico
+    res/lc_running.ico
+    res/leftright.cur
+    res/litebulb.bmp
+    res/lock_sel.bmp
+    res/locksele.bmp
+    res/logo.bmp
+    res/mainfram.bmp
+    res/mann_tagdef_toolbar.bmp
+    res/mann_tagdef_tree.bmp
+    res/material.bmp
+    res/material_browser.bmp
+    res/materialbar.bmp
+    res/maximize.ico
+    res/minus.ico
+    res/model_viewport_dock.bmp
+    res/model_viewport_fullscreen.bmp
+    res/musictree.bmp
+    res/nodrop.cur
+    res/object_move.cur
+    res/object_rotate.cur
+    res/object_scale.cur
+    res/objectsbrowser.bmp
+    res/panel_ve.bmp
+    res/panel_veg.bmp
+    res/particles_tree.bmp
+    res/particlesbar.bmp
+    res/pick.bmp
+    res/pick_cursor.cur
+    res/plus.ico
+    res/pointerDragItem.cur
+    res/pointerHit.cur
+    res/pointer_.cur
+    res/pointer_flatten.cur
+    res/pointer_getheight.cur
+    res/pointer_link.cur
+    res/pointer_linknow.cur
+    res/pointer_minus.cur
+    res/pointer_plus.cur
+    res/pointer_smooth.cur
+    res/pointer_so_sel_plus.cur
+    res/pointer_so_select.cur
+    res/proceduralmaterial_toolbar.bmp
+    res/progslider_end.bmp
+    res/progslider_marker.bmp
+    res/progslider_start.bmp
+    res/progslider_thumb.bmp
+    res/progslider_track.bmp
+    res/properties.bmp
+    res/psd.ico
+    res/rename.ico
+    res/replace.ico
+    res/ribbon_system_button.png
+    res/sandbox_dark.bmp
+    res/sb_welcome_dark.bmp
+    res/selectobj.bmp
+    res/seq_1_colour_keys.bmp
+    res/seq_2_colour_keys.bmp
+    res/seq_3_colour_keys.bmp
+    res/seq_4_colour_keys.bmp
+    res/seq_5_colour_keys.bmp
+    res/seq_6_colour_keys.bmp
+    res/seq_7_colour_keys.bmp
+    res/sequencer_keys.bmp
+    res/sequencer_nodes.bmp
+    res/soundfiles.bmp
+    res/soundmood.bmp
+    res/soundpre.bmp
+    res/spline_edit_bar.bmp
+    res/splineextrabar.bmp
+    res/status_mem_low1.ico
+    res/status_mem_low2.ico
+    res/status_mem_ok.ico
+    res/stdviews.bmp
+    res/subobjseltype.bmp
+    res/sw_mapbar.bmp
+    res/sw_toolbar.bmp
+    res/tiff.ico
+    res/toolbar1.bmp
+    res/toolbar2.bmp
+    res/toolbox.bmp
+    res/trackvie.bmp
+    res/trackview.bmp
+    res/trackview_key.bmp
+    res/trackview_keys.bmp
+    res/trackview_nodes.bmp
+    res/trackview_play.bmp
+    res/trackview_view.bmp
+    res/tree_vie.bmp
+    res/uieditor_main.bmp
+    res/up_arrow.ico
+    res/veed_tree.bmp
+    res/vegetati.bmp
+    res/vegtree.bmp
+    res/video_record.ico
+    res/warning16x16.ico
+    res/water.bmp
+    res/work_in_progress_icon.ico
+    res/MannFileManagerImageList.bmp
+    res/infobar/CameraCollision-default.svg
+    res/infobar/GotoLocation-default.svg
+    res/infobar/LockScale-default.svg
+    res/infobar/LockSelection-default.svg
+    res/infobar/Mute-default.svg
+    res/infobar/NoPlayerSync-default.svg
+    res/infobar/NoPlayerSync-selected.svg
+    res/infobar/Pause-default.svg
+    res/infobar/PausePlay-default.svg
+    res/infobar/PhysicsCol-default.svg
+    res/infobar/VR-default.svg
+    res/infobar/XYZ-default.svg
+    Plugin.cpp
+    Plugin.h
+    PluginManager.cpp
+    PluginManager.h
+    IEditor.h
+    IEditorImpl.cpp
+    IEditorImpl.h
+    CryEditPy.cpp
+    CryEdit.cpp
+    CryEdit.h
+    CVarMenu.cpp
+    CVarMenu.h
+    EditorToolsApplication.cpp
+    EditorToolsApplication.h
+    EditorToolsApplicationAPI.h
+    Core/EditorMetricsPlainTextNameRegistration.cpp
+    Core/EditorMetricsPlainTextNameRegistration.h
+    MainWindow.cpp
+    MainWindow.h
+    MainWindow.qrc
+    Core/QtEditorApplication.cpp
+    Core/QtEditorApplication.h
+    Core/LevelEditorMenuHandler.cpp
+    Core/LevelEditorMenuHandler.h
+    StartupTraceHandler.cpp
+    StartupTraceHandler.h
+    LevelTreeModel.cpp
+    LevelTreeModel.h
+    Include/Command.h
+    Include/HitContext.h
+    Include/IAnimationCompressionManager.h
+    Include/IAssetItem.h
+    Include/IAssetItemDatabase.h
+    Include/ICommandManager.h
+    Include/IConsoleConnectivity.h
+    Include/IDataBaseItem.h
+    Include/IDataBaseLibrary.h
+    Include/IDataBaseManager.h
+    Include/IDisplayViewport.h
+    Include/IEditorClassFactory.h
+    Include/IEventLoopHook.h
+    Include/IExportManager.h
+    Include/IGizmoManager.h
+    Include/IIconManager.h
+    Include/ILogFile.h
+    Include/IKeyTimeSet.h
+    Include/IObjectManager.h
+    Include/IPlugin.h
+    Include/IPreferencesPage.h
+    Include/IRenderListener.h
+    Include/IResourceSelectorHost.h
+    Include/ISourceControl.h
+    Include/ISubObjectSelectionReferenceFrameCalculator.h
+    Include/ITextureDatabaseUpdater.h
+    Include/ITransformManipulator.h
+    Include/IViewPane.h
+    Include/ObjectEvent.h
+    Util/AffineParts.cpp
+    Objects/BaseObject.cpp
+    Objects/BaseObject.h
+    Animation/AnimationBipedBoneNames.cpp
+    Animation/AnimationBipedBoneNames.h
+    AnimationContext.cpp
+    AnimationContext.h
+    AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
+    AzAssetBrowser/AzAssetBrowserRequestHandler.h
+    AzAssetBrowser/AzAssetBrowserWindow.cpp
+    AzAssetBrowser/AzAssetBrowserWindow.h
+    AzAssetBrowser/AzAssetBrowserWindow.ui
+    AssetDatabase/AssetDatabaseLocationListener.h
+    AssetDatabase/AssetDatabaseLocationListener.cpp
+    AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
+    AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
+    AssetImporter/AssetImporterManager/AssetImporterManager.cpp
+    AssetImporter/AssetImporterManager/AssetImporterManager.h
+    AssetImporter/UI/FilesAlreadyExistDialog.cpp
+    AssetImporter/UI/FilesAlreadyExistDialog.h
+    AssetImporter/UI/FilesAlreadyExistDialog.ui
+    AssetImporter/UI/ProcessingAssetsDialog.cpp
+    AssetImporter/UI/ProcessingAssetsDialog.h
+    AssetImporter/UI/ProcessingAssetsDialog.ui
+    AssetImporter/UI/SelectDestinationDialog.cpp
+    AssetImporter/UI/SelectDestinationDialog.h
+    AssetImporter/UI/SelectDestinationDialog.ui
+    AssetEditor/AssetEditorRequestsHandler.cpp
+    AssetEditor/AssetEditorRequestsHandler.h
+    AssetEditor/AssetEditorWindow.cpp
+    AssetEditor/AssetEditorWindow.h
+    AssetEditor/AssetEditorWindow.ui
+    Commands/CommandManager.cpp
+    Commands/CommandManager.h
+    Controls/BitmapToolTip.cpp
+    Controls/BitmapToolTip.h
+    Controls/ColorGradientCtrl.cpp
+    Controls/ColorGradientCtrl.h
+    Controls/ConsoleSCB.cpp
+    Controls/ConsoleSCB.h
+    Controls/ConsoleSCB.ui
+    Controls/ConsoleSCB.qrc
+    Controls/FolderTreeCtrl.cpp
+    Controls/FolderTreeCtrl.h
+    Controls/HotTrackingTreeCtrl.cpp
+    Controls/HotTrackingTreeCtrl.h
+    Controls/ImageHistogramCtrl.cpp
+    Controls/ImageHistogramCtrl.h
+    Controls/ImageListCtrl.cpp
+    Controls/ImageListCtrl.h
+    Controls/MultiMonHelper.cpp
+    Controls/MultiMonHelper.h
+    Controls/NumberCtrl.cpp
+    Controls/NumberCtrl.h
+    Controls/NumberCtrl.h
+    Controls/SplineCtrl.cpp
+    Controls/SplineCtrl.h
+    Controls/SplineCtrlEx.cpp
+    Controls/SplineCtrlEx.h
+    Controls/TextEditorCtrl.cpp
+    Controls/TextEditorCtrl.h
+    Controls/TimelineCtrl.cpp
+    Controls/TimelineCtrl.h
+    Controls/WndGridHelper.h
+    Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
+    Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
+    Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
+    Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
+    Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
+    Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
+    Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
+    Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
+    Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
+    Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
+    Controls/ReflectedPropertyControl/PropertyCtrl.cpp
+    Controls/ReflectedPropertyControl/PropertyCtrl.h
+    Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
+    Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
+    MainStatusBar.cpp
+    MainStatusBar.h
+    MainStatusBarItems.h
+    CrtDebug.cpp
+    CryEdit.rc
+    CryEditDoc.cpp
+    CryEditDoc.h
+    EditorDefs.h
+    GameEngine.cpp
+    GameEngine.h
+    Include/SandboxAPI.h
+    LogFile.cpp
+    LogFile.h
+    Resource.h
+    UserMessageDefines.h
+    ActionManager.cpp
+    ActionManager.h
+    ShortcutDispatcher.cpp
+    ShortcutDispatcher.h
+    BaseLibraryManager.cpp
+    BaseLibraryItem.h
+    BaseLibraryManager.h
+    CheckOutDialog.cpp
+    CheckOutDialog.h
+    CheckOutDialog.ui
+    ConsoleDialog.cpp
+    ConsoleDialog.h
+    CustomAspectRatioDlg.cpp
+    CustomAspectRatioDlg.ui
+    CustomAspectRatioDlg.h
+    CustomResolutionDlg.cpp
+    CustomResolutionDlg.ui
+    CustomResolutionDlg.h
+    ErrorReportDialog.ui
+    ErrorReportDialog.cpp
+    ErrorReportDialog.h
+    GenericSelectItemDialog.ui
+    GenericSelectItemDialog.cpp
+    GenericSelectItemDialog.h
+    GotoPositionDlg.cpp
+    GotoPositionDlg.h
+    GotoPositionDlg.ui
+    LayoutConfigDialog.cpp
+    LayoutConfigDialog.h
+    LayoutConfigDialog.ui
+    LayoutConfigDialog.qrc
+    LevelFileDialog.cpp
+    LevelFileDialog.qrc
+    LevelFileDialog.h
+    LevelFileDialog.ui
+    QuickAccessBar.cpp
+    QuickAccessBar.h
+    QuickAccessBar.ui
+    ResizeResolutionDialog.cpp
+    ResizeResolutionDialog.h
+    ResizeResolutionDialog.ui
+    SelectEAXPresetDlg.cpp
+    SelectEAXPresetDlg.h
+    SelectEAXPresetDlg.ui
+    SelectLightAnimationDialog.cpp
+    SelectLightAnimationDialog.h
+    SelectSequenceDialog.cpp
+    SelectSequenceDialog.h
+    StartupLogoDialog.cpp
+    StartupLogoDialog.h
+    StartupLogoDialog.ui
+    StartupLogoDialog.qrc
+    StringDlg.cpp
+    StringDlg.h
+    ToolbarCustomizationDialog.ui
+    ToolbarCustomizationDialog.cpp
+    ToolbarCustomizationDialog.h
+    ToolbarManager.h
+    ToolbarManager.cpp
+    ToolsConfigPage.cpp
+    ToolsConfigPage.h
+    ToolsConfigPage.ui
+    IconListDialog.ui
+    UndoDropDown.cpp
+    UndoDropDown.h
+    DimensionsDialog.cpp
+    DimensionsDialog.h
+    DimensionsDialog.ui
+    NewLevelDialog.cpp
+    NewLevelDialog.h
+    NewLevelDialog.ui
+    Dialogs/PythonScriptsDialog.cpp
+    Dialogs/PythonScriptsDialog.h
+    Dialogs/PythonScriptsDialog.ui
+    Dialogs/Generic/UserOptions.cpp
+    Dialogs/Generic/UserOptions.h
+    EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
+    EditMode/SubObjectSelectionReferenceFrameCalculator.h
+    Export/ExportManager.cpp
+    Export/ExportManager.h
+    Export/OBJExporter.cpp
+    Export/OBJExporter.h
+    Export/OCMExporter.cpp
+    Export/OCMExporter.h
+    EditorFileMonitor.cpp
+    EditorFileMonitor.h
+    Include/IEditorFileMonitor.h
+    GameExporter.cpp
+    GameResourcesExporter.cpp
+    GameExporter.h
+    GameResourcesExporter.h
+    Geometry/TriMesh.cpp
+    Geometry/TriMesh.h
+    AboutDialog.h
+    AboutDialog.ui
+    DocMultiArchive.h
+    EditMode/DeepSelection.h
+    FBXExporterDialog.h
+    FileTypeUtils.h
+    GridUtils.h
+    IObservable.h
+    IPostRenderer.h
+    LightmapCompiler/SimpleTriangleRasterizer.h
+    ToolBox.h
+    TrackViewNewSequenceDialog.h
+    UndoConfigSpec.h
+    UndoViewPosition.h
+    UndoViewRotation.h
+    Util/GeometryUtil.h
+    Util/IXmlHistoryManager.h
+    Util/KDTree.h
+    Util/XmlHistoryManager.h
+    WipFeaturesDlg.h
+    WipFeaturesDlg.ui
+    WipFeaturesDlg.qrc
+    LevelIndependentFileMan.cpp
+    LevelIndependentFileMan.h
+    LogFileImpl.cpp
+    LogFileImpl.h
+    Objects/ClassDesc.cpp
+    Objects/ClassDesc.h
+    Objects/IEntityObjectListener.h
+    Objects/SelectionGroup.cpp
+    Objects/SelectionGroup.h
+    Objects/SubObjSelection.cpp
+    Objects/SubObjSelection.h
+    Objects/ObjectLoader.cpp
+    Objects/ObjectLoader.h
+    Objects/ObjectManager.cpp
+    Objects/ObjectManager.h
+    Objects/ObjectManagerLegacyUndo.cpp
+    Objects/ObjectManagerLegacyUndo.h
+    Objects/DisplayContext.cpp
+    Objects/DisplayContext.h
+    Objects/EntityObject.cpp
+    Objects/EntityObject.h
+    Objects/AxisGizmo.cpp
+    Objects/Gizmo.cpp
+    Objects/GizmoManager.cpp
+    Objects/LineGizmo.cpp
+    Objects/TrackGizmo.cpp
+    Objects/AxisGizmo.h
+    Objects/Gizmo.h
+    Objects/GizmoManager.h
+    Objects/LineGizmo.h
+    Objects/TrackGizmo.h
+    PythonEditorFuncs.cpp
+    PythonEditorFuncs.h
+    QtUI/QCollapsibleGroupBox.h
+    QtUI/QCollapsibleGroupBox.cpp
+    QtUI/ClickableLabel.h
+    QtUI/ClickableLabel.cpp
+    QtUI/PixmapLabelPreview.h
+    QtUI/PixmapLabelPreview.cpp
+    QtUI/WaitCursor.h
+    QtUI/WaitCursor.cpp
+    RenderHelpers/AxisHelper.cpp
+    RenderHelpers/AxisHelper.h
+    CustomizeKeyboardDialog.h
+    CustomizeKeyboardDialog.cpp
+    CustomizeKeyboardDialog.ui
+    KeyboardCustomizationSettings.h
+    KeyboardCustomizationSettings.cpp
+    Settings.cpp
+    SettingsManager.cpp
+    SettingsManagerDialog.cpp
+    PreferencesStdPages.h
+    PreferencesStdPages.cpp
+    EditorPreferencesPageGeneral.h
+    EditorPreferencesPageGeneral.cpp
+    EditorPreferencesPageFiles.h
+    EditorPreferencesPageFiles.cpp
+    EditorPreferencesPageViewportGeneral.h
+    EditorPreferencesPageViewportGeneral.cpp
+    EditorPreferencesPageViewportGizmo.h
+    EditorPreferencesPageViewportGizmo.cpp
+    EditorPreferencesPageViewportMovement.h
+    EditorPreferencesPageViewportMovement.cpp
+    EditorPreferencesPageViewportDebug.h
+    EditorPreferencesPageViewportDebug.cpp
+    EditorPreferencesPageExperimentalLighting.h
+    EditorPreferencesPageExperimentalLighting.cpp
+    EditorPreferencesPageAWS.h
+    EditorPreferencesPageAWS.cpp
+    EditorPreferencesDialog.h
+    EditorPreferencesDialog.cpp
+    EditorPreferencesDialog.ui
+    EditorPreferencesTreeWidgetItem.h
+    EditorPreferencesTreeWidgetItem.cpp
+    EditorPreferencesTreeWidgetItemDelegate.h
+    EditorPreferencesTreeWidgetItemDelegate.cpp
+    Settings.h
+    SettingsManager.h
+    SettingsManagerDialog.h
+    SettingsManagerDialog.ui
+    GraphicsSettingsDialog.h
+    GraphicsSettingsDialog.cpp
+    graphicssettingsdialog.ui
+    AboutDialog.cpp
+    ErrorReportTableModel.h
+    ErrorReportTableModel.cpp
+    EditMode/DeepSelection.cpp
+    FBXExporterDialog.cpp
+    FBXExporterDialog.ui
+    FileTypeUtils.cpp
+    LightmapCompiler/SimpleTriangleRasterizer.cpp
+    ResourceSelectorHost.cpp
+    ResourceSelectorHost.h
+    ToolBox.cpp
+    TrackViewNewSequenceDialog.cpp
+    TrackViewNewSequenceDialog.ui
+    UndoConfigSpec.cpp
+    UndoViewPosition.cpp
+    UndoViewRotation.cpp
+    WipFeatureManager.cpp
+    WipFeatureManager.h
+    WipFeaturesDlg.cpp
+    Dialogs/ErrorsDlg.cpp
+    Dialogs/ErrorsDlg.h
+    Dialogs/ErrorsDlg.ui
+    DisplaySettings.cpp
+    DisplaySettings.h
+    DisplaySettingsPythonFuncs.h
+    DisplaySettingsPythonFuncs.cpp
+    ErrorReport.cpp
+    ErrorReport.h
+    IconManager.cpp
+    IconManager.h
+    LevelInfo.cpp
+    LevelInfo.h
+    ProcessInfo.cpp
+    ProcessInfo.h
+    Report.h
+    SurfaceTypeValidator.cpp
+    SurfaceTypeValidator.h
+    TrackView/AtomOutputFrameCapture.cpp
+    TrackView/AtomOutputFrameCapture.h
+    TrackView/TrackViewDialog.qrc
+    TrackView/TrackViewDialog.cpp
+    TrackView/TrackViewDialog.h
+    TrackView/TrackViewDopeSheetBase.cpp
+    TrackView/TrackViewDopeSheetBase.h
+    TrackView/TrackViewDoubleSpinBox.cpp
+    TrackView/TrackViewDoubleSpinBox.h
+    TrackView/TrackViewPythonFuncs.h
+    TrackView/TrackViewPythonFuncs.cpp
+    TrackView/TrackViewSequenceManager.cpp
+    TrackView/TrackViewSequenceManager.h
+    TrackView/TrackViewUndo.cpp
+    TrackView/TrackViewUndo.h
+    TrackView/CommentNodeAnimator.cpp
+    TrackView/DirectorNodeAnimator.cpp
+    TrackView/CommentNodeAnimator.h
+    TrackView/DirectorNodeAnimator.h
+    TrackViewExportKeyTimeDlg.cpp
+    TrackViewExportKeyTimeDlg.ui
+    TrackView/SequenceBatchRenderDialog.cpp
+    TrackView/TrackViewCurveEditor.cpp
+    TrackView/TrackViewFindDlg.cpp
+    TrackView/TrackViewKeyPropertiesDlg.cpp
+    TrackView/TrackViewNodes.cpp
+    TrackView/TrackViewNodes.ui
+    TrackView/TrackViewSplineCtrl.cpp
+    TrackView/TrackViewTimeline.cpp
+    TrackView/TVCustomizeTrackColorsDialog.ui
+    TrackViewFBXImportPreviewDialog.cpp
+    TrackViewFBXImportPreviewDialog.ui
+    TrackViewExportKeyTimeDlg.h
+    TrackView/SequenceBatchRenderDialog.h
+    TrackView/SequenceBatchRenderDialog.ui
+    TrackView/TrackViewCurveEditor.h
+    TrackView/TrackViewCurveEditor.ui
+    TrackView/TrackViewFindDlg.h
+    TrackView/TrackViewFindDlg.ui
+    TrackView/TrackViewKeyPropertiesDlg.h
+    TrackView/TrackViewNodes.h
+    TrackView/TrackViewSplineCtrl.h
+    TrackView/TrackViewTimeline.h
+    TrackView/TVCustomizeTrackColorsDlg.cpp
+    TrackView/TVCustomizeTrackColorsDlg.h
+    TrackViewFBXImportPreviewDialog.h
+    TrackView/2DBezierKeyUIControls.cpp
+    TrackView/AssetBlendKeyUIControls.cpp
+    TrackView/CaptureKeyUIControls.cpp
+    TrackView/CharacterKeyUIControls.cpp
+    TrackView/ConsoleKeyUIControls.cpp
+    TrackView/EventKeyUIControls.cpp
+    TrackView/GotoKeyUIControls.cpp
+    TrackView/SelectKeyUIControls.cpp
+    TrackView/SequenceKeyUIControls.cpp
+    TrackView/SoundKeyUIControls.cpp
+    TrackView/TrackEventKeyUIControls.cpp
+    TrackView/TrackViewTrackPropsDlg.ui
+    TrackView/TVEventsDialog.cpp
+    TrackView/TVEventsDialog.ui
+    TrackView/TVSequenceProps.cpp
+    TrackView/CommentKeyUIControls.cpp
+    TrackView/ScreenFaderKeyUIControls.cpp
+    TrackView/TimeRangeKeyUIControls.cpp
+    TrackView/TVEventsDialog.h
+    TrackView/TVSequenceProps.h
+    TrackView/TVSequenceProps.ui
+    TrackView/TrackViewAnimNode.cpp
+    TrackView/TrackViewTrack.cpp
+    TrackView/TrackViewNode.cpp
+    TrackView/TrackViewSequence.cpp
+    TrackView/TrackViewNodeFactories.cpp
+    TrackView/TrackViewEventNode.cpp
+    TrackView/TrackViewAnimNode.h
+    TrackView/TrackViewTrack.h
+    TrackView/TrackViewNode.h
+    TrackView/TrackViewSequence.h
+    TrackView/TrackViewNodeFactories.h
+    TrackView/TrackViewEventNode.h
+    ConfigGroup.cpp
+    ConfigGroup.h
+    Util/AffineParts.h
+    Util/AutoLogTime.cpp
+    Util/AutoLogTime.h
+    Util/AutoDirectoryRestoreFileDialog.h
+    Util/AutoDirectoryRestoreFileDialog.cpp
+    Util/CryMemFile.h
+    Util/DynamicArray2D.cpp
+    Util/DynamicArray2D.h
+    Util/EditorAutoLevelLoadTest.cpp
+    Util/EditorAutoLevelLoadTest.h
+    Util/EditorUtils.cpp
+    Util/EditorUtils.h
+    Util/FileEnum.cpp
+    Util/FileEnum.h
+    Util/FileUtil.cpp
+    Util/FileUtil.h
+    Util/GdiUtil.cpp
+    Util/GdiUtil.h
+    Util/GeometryUtil.cpp
+    Util/GuidUtil.cpp
+    Util/GuidUtil.h
+    Util/IObservable.h
+    Util/IndexedFiles.cpp
+    Util/IndexedFiles.h
+    Util/KDTree.cpp
+    Util/Mailer.h
+    Util/NamedData.cpp
+    Util/NamedData.h
+    Util/Observable.h
+    Util/PakFile.cpp
+    Util/PakFile.h
+    Util/PredefinedAspectRatios.cpp
+    Util/PredefinedAspectRatios.h
+    Util/StringHelpers.cpp
+    Util/StringHelpers.h
+    Util/StringNoCasePredicate.h
+    Util/TRefCountBase.h
+    Util/Triangulate.cpp
+    Util/Triangulate.h
+    Util/Util.h
+    Util/XmlArchive.cpp
+    Util/XmlArchive.h
+    Util/XmlHistoryManager.cpp
+    Util/XmlTemplate.cpp
+    Util/XmlTemplate.h
+    Util/bitarray.h
+    Util/fastlib.h
+    Util/smartptr.h
+    WaitProgress.cpp
+    WaitProgress.h
+    Util/FileUtil_impl.h
+    Util/FileUtil_impl.cpp
+    Util/ImageUtil_impl.h
+    Util/ImageUtil_impl.cpp
+    Util/ColumnSortProxyModel.h
+    Util/ColumnSortProxyModel.cpp
+    Util/AbstractGroupProxyModel.h
+    Util/AbstractGroupProxyModel.cpp
+    Util/AbstractSortModel.h
+    Util/AbstractSortModel.cpp
+    Util/ColumnGroupProxyModel.h
+    Util/ColumnGroupProxyModel.cpp
+    Util/ColumnGroupHeaderView.h
+    Util/ColumnGroupHeaderView.cpp
+    Util/ColumnGroupItemDelegate.h
+    Util/ColumnGroupItemDelegate.cpp
+    Util/ColumnGroupTreeView.h
+    Util/ColumnGroupTreeView.cpp
+    Util/ModalWindowDismisser.h
+    Util/ModalWindowDismisser.cpp
+    Util/3DConnexionDriver.cpp
+    Util/3DConnexionDriver.h
+    Util/FileChangeMonitor.cpp
+    Util/FileChangeMonitor.h
+    Util/ImageUtil.cpp
+    Util/ImageUtil.h
+    Util/ImageASC.cpp
+    Util/ImageASC.h
+    Util/ImageBT.cpp
+    Util/ImageBT.h
+    Util/ImageGif.cpp
+    Util/ImageGif.h
+    Util/ImageTIF.cpp
+    Util/ImageTIF.h
+    Util/Math.h
+    Util/UIEnumerations.cpp
+    Util/UIEnumerations.h
+    WelcomeScreen/WelcomeScreenDialog.h
+    WelcomeScreen/WelcomeScreenDialog.cpp
+    WelcomeScreen/WelcomeScreenDialog.ui
+    WelcomeScreen/WelcomeScreenDialog.qrc
+    2DViewport.cpp
+    2DViewport.h
+    LayoutWnd.cpp
+    LayoutWnd.h
+    EditorViewportWidget.cpp
+    EditorViewportWidget.h
+    EditorViewportSettings.cpp
+    EditorViewportSettings.h
+    EditorViewportCamera.cpp
+    EditorViewportCamera.h
+    ViewportManipulatorController.cpp
+    ViewportManipulatorController.h
+    LegacyViewportCameraController.cpp
+    LegacyViewportCameraController.h
+    RenderViewport.cpp
+    RenderViewport.h
+    TopRendererWnd.cpp
+    TopRendererWnd.h
+    ViewManager.cpp
+    ViewManager.h
+    ViewPane.cpp
+    ViewPane.h
+    Viewport.cpp
+    Viewport.h
+    ViewportTitleDlg.cpp
+    ViewportTitleDlg.ui
+    ViewportTitleDlg.h
+    EditorEnvironment.cpp
+    EditorEnvironment.h
+    IEditorPanelUtils.h
+    EditorPanelUtils.h
+    EditorPanelUtils.cpp
+)
+
+
+set(SKIP_UNITY_BUILD_INCLUSION_FILES
+    TrackView/TrackViewPythonFuncs.cpp
+    Core/LevelEditorMenuHandler.cpp
+    Util/AffineParts.cpp
+)
diff --git a/Code/Editor/editor_lib_terrain_files.cmake b/Code/Editor/editor_lib_terrain_files.cmake
new file mode 100644
index 0000000000..7a48957af0
--- /dev/null
+++ b/Code/Editor/editor_lib_terrain_files.cmake
@@ -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
+#
+#
+
+set(FILES
+    TerrainPainterPanel.cpp
+    TerrainPainterPanel.h
+    TerrainPainterPanel.ui
+    NewTerrainDialog.cpp
+    NewTerrainDialog.h
+    NewTerrainDialog.ui
+    TerrainTextureExport.cpp
+    TerrainTextureExport.h
+    TerrainTextureExport.ui
+    Terrain/Clouds.cpp
+    Terrain/GenerationParam.cpp
+    Terrain/GenerationParam.ui
+    Terrain/Heightmap.cpp
+    Terrain/Layer.cpp
+    Terrain/Noise.cpp
+    Terrain/PythonTerrainFuncs.cpp
+    Terrain/PythonTerrainLayerFuncs.cpp
+    Terrain/RGBLayer.cpp
+    Terrain/SurfaceType.cpp
+    Terrain/TerrainConverter.cpp
+    Terrain/TerrainGrid.cpp
+    Terrain/TerrainLayerTexGen.cpp
+    Terrain/TerrainLightGen.cpp
+    Terrain/TerrainManager.cpp
+    Terrain/TerrainTexGen.cpp
+    Terrain/TextureCompression.cpp
+    Terrain/MacroTextureExporter.cpp
+    Terrain/Clouds.h
+    Terrain/GenerationParam.h
+    Terrain/Heightmap.h
+    Terrain/Layer.h
+    Terrain/LayerWeight.h
+    Terrain/Noise.h
+    Terrain/RGBLayer.h
+    Terrain/SurfaceType.h
+    Terrain/TerrainConverter.h
+    Terrain/TerrainGrid.h
+    Terrain/TerrainLayerTexGen.h
+    Terrain/TerrainLightGen.h
+    Terrain/TerrainManager.h
+    Terrain/TerrainTexGen.h
+    Terrain/LayerWeight.cpp
+    Terrain/TextureCompression.h
+    Terrain/MacroTextureExporter.h
+    TerrainDialog.cpp
+    TerrainDialog.h
+    TerrainDialog.ui
+    TerrainTexture.cpp
+    TerrainTexture.h
+    TerrainTexture.ui
+    Terrain/SkyAccessibility/HeightmapAccessibility.h
+    Terrain/SkyAccessibility/HorizonTracker.h
+    TerrainHolePanel.cpp
+    TerrainHoleTool.cpp
+    TerrainHolePanel.h
+    TerrainHolePanel.ui
+    TerrainHoleTool.h
+    TerrainMiniMapTool.cpp
+    TerrainMiniMapTool.h
+    TerrainMiniMapPanel.ui
+    TerrainModifyPanel.cpp
+    TerrainModifyPanel.h
+    TerrainModifyPanel.ui
+    TerrainModifyTool.cpp
+    TerrainModifyTool.h
+    TerrainMoveTool.cpp
+    TerrainMoveToolPanel.cpp
+    TerrainMoveTool.h
+    TerrainMoveToolPanel.h
+    TerrainMoveToolPanel.ui
+    TerrainTexturePainter.cpp
+    TerrainTexturePainter.h
+    Util/ImagePainter.cpp
+    Util/ImagePainter.h
+)
diff --git a/Code/Editor/editor_lib_test_files.cmake b/Code/Editor/editor_lib_test_files.cmake
new file mode 100644
index 0000000000..919ebfbbb7
--- /dev/null
+++ b/Code/Editor/editor_lib_test_files.cmake
@@ -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
+#
+#
+
+set(FILES
+    Lib/Tests/IEditorMock.h
+    Lib/Tests/test_ClickableLabel.cpp
+    Lib/Tests/test_CryEditPythonBindings.cpp
+    Lib/Tests/test_CryEditDocPythonBindings.cpp
+    Lib/Tests/test_EditorPythonBindings.cpp
+    Lib/Tests/test_EditorUtils.cpp
+    Lib/Tests/test_Main.cpp
+    Lib/Tests/test_MainWindowPythonBindings.cpp
+    Lib/Tests/test_ObjectManagerPythonBindings.cpp
+    Lib/Tests/test_TrackViewPythonBindings.cpp
+    Lib/Tests/test_ViewPanePythonBindings.cpp
+    Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
+    Lib/Tests/test_DisplaySettingsPythonBindings.cpp
+    DisplaySettingsPythonFuncs.cpp
+    DisplaySettingsPythonFuncs.h
+)
diff --git a/Code/Editor/editor_lib_test_terrain_files.cmake b/Code/Editor/editor_lib_test_terrain_files.cmake
new file mode 100644
index 0000000000..4f7a74f29a
--- /dev/null
+++ b/Code/Editor/editor_lib_test_terrain_files.cmake
@@ -0,0 +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
+#
+#
+
+set(FILES
+    Lib/Tests/test_TerrainModifyPythonBindings.cpp
+    Lib/Tests/test_TerrainPythonBindings.cpp
+    Lib/Tests/test_TerrainLayerPythonBindings.cpp
+    Lib/Tests/test_TerrainPainterPythonBindings.cpp
+    Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
+    Lib/Tests/test_TerrainTexturePythonBindings.cpp
+    Terrain/Tests/test_Terrain.cpp
+)
diff --git a/Code/Editor/editor_win_files.cmake b/Code/Editor/editor_win_files.cmake
new file mode 100644
index 0000000000..2754f933ef
--- /dev/null
+++ b/Code/Editor/editor_win_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
+    Resource.h
+    EditorCryEdit.rc
+    res/lyeditor.ico
+)
diff --git a/Code/Sandbox/Editor/graphicssettingsdialog.ui b/Code/Editor/graphicssettingsdialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/graphicssettingsdialog.ui
rename to Code/Editor/graphicssettingsdialog.ui
diff --git a/Code/Editor/main.cpp b/Code/Editor/main.cpp
new file mode 100644
index 0000000000..aee1239de1
--- /dev/null
+++ b/Code/Editor/main.cpp
@@ -0,0 +1,38 @@
+/*
+ * 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/Module/DynamicModuleHandle.h>
+#include <AzFramework/ProjectManager/ProjectManager.h>
+
+int main(int argc, char* argv[])
+{
+    // Verify a project path can be found, launch the project manager and shut down otherwise
+    if (AzFramework::ProjectManager::CheckProjectPathProvided(argc, argv) == AzFramework::ProjectManager::ProjectPathCheckResult::ProjectManagerLaunched)
+    {
+        return 2;
+    }
+    using CryEditMain = int (*)(int, char*[]);
+    constexpr const char CryEditMainName[] = "CryEditMain";
+
+    AZ::Environment::Attach(AZ::Environment::GetInstance());
+    AZ::AllocatorInstance<AZ::OSAllocator>::Create();
+
+    auto handle = AZ::DynamicModuleHandle::Create("EditorLib");
+    [[maybe_unused]] const bool loaded = handle->Load(true);
+    AZ_Assert(loaded, "EditorLib could not be loaded");
+
+    int ret = 1;
+    if (auto fn = handle->GetFunction<CryEditMain>(CryEditMainName); fn != nullptr)
+    {
+        ret = AZStd::invoke(fn, argc, argv);
+    }
+
+    handle = {};
+    AZ::AllocatorInstance<AZ::OSAllocator>::Destroy();
+    AZ::Environment::Detach();
+    return ret;
+}
diff --git a/Code/Sandbox/Editor/o3de_logo.svg b/Code/Editor/o3de_logo.svg
similarity index 100%
rename from Code/Sandbox/Editor/o3de_logo.svg
rename to Code/Editor/o3de_logo.svg
diff --git a/Code/Sandbox/Editor/particles_tree_00.png b/Code/Editor/particles_tree_00.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_00.png
rename to Code/Editor/particles_tree_00.png
diff --git a/Code/Sandbox/Editor/particles_tree_01.png b/Code/Editor/particles_tree_01.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_01.png
rename to Code/Editor/particles_tree_01.png
diff --git a/Code/Sandbox/Editor/particles_tree_02.png b/Code/Editor/particles_tree_02.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_02.png
rename to Code/Editor/particles_tree_02.png
diff --git a/Code/Sandbox/Editor/particles_tree_03.png b/Code/Editor/particles_tree_03.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_03.png
rename to Code/Editor/particles_tree_03.png
diff --git a/Code/Sandbox/Editor/particles_tree_04.png b/Code/Editor/particles_tree_04.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_04.png
rename to Code/Editor/particles_tree_04.png
diff --git a/Code/Sandbox/Editor/particles_tree_05.png b/Code/Editor/particles_tree_05.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_05.png
rename to Code/Editor/particles_tree_05.png
diff --git a/Code/Sandbox/Editor/particles_tree_06.png b/Code/Editor/particles_tree_06.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_06.png
rename to Code/Editor/particles_tree_06.png
diff --git a/Code/Sandbox/Editor/particles_tree_07.png b/Code/Editor/particles_tree_07.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_07.png
rename to Code/Editor/particles_tree_07.png
diff --git a/Code/Sandbox/Editor/res/4WAY01.CUR b/Code/Editor/res/4WAY01.CUR
similarity index 100%
rename from Code/Sandbox/Editor/res/4WAY01.CUR
rename to Code/Editor/res/4WAY01.CUR
diff --git a/Code/Sandbox/Editor/res/AVI_Recorder.bmp b/Code/Editor/res/AVI_Recorder.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/AVI_Recorder.bmp
rename to Code/Editor/res/AVI_Recorder.bmp
diff --git a/Code/Sandbox/Editor/res/AWS_preferences_icon.svg b/Code/Editor/res/AWS_preferences_icon.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/AWS_preferences_icon.svg
rename to Code/Editor/res/AWS_preferences_icon.svg
diff --git a/Code/Sandbox/Editor/res/Camera.svg b/Code/Editor/res/Camera.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Camera.svg
rename to Code/Editor/res/Camera.svg
diff --git a/Code/Sandbox/Editor/res/ConsoleToolbar.bmp b/Code/Editor/res/ConsoleToolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/ConsoleToolbar.bmp
rename to Code/Editor/res/ConsoleToolbar.bmp
diff --git a/Code/Sandbox/Editor/res/CryEdit.ico b/Code/Editor/res/CryEdit.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/CryEdit.ico
rename to Code/Editor/res/CryEdit.ico
diff --git a/Code/Sandbox/Editor/res/CryEdit.rc2 b/Code/Editor/res/CryEdit.rc2
similarity index 100%
rename from Code/Sandbox/Editor/res/CryEdit.rc2
rename to Code/Editor/res/CryEdit.rc2
diff --git a/Code/Sandbox/Editor/res/CryEditDoc.ico b/Code/Editor/res/CryEditDoc.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/CryEditDoc.ico
rename to Code/Editor/res/CryEditDoc.ico
diff --git a/Code/Sandbox/Editor/res/Cursor_2.cur b/Code/Editor/res/Cursor_2.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/Cursor_2.cur
rename to Code/Editor/res/Cursor_2.cur
diff --git a/Code/Sandbox/Editor/res/Debug.svg b/Code/Editor/res/Debug.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Debug.svg
rename to Code/Editor/res/Debug.svg
diff --git a/Code/Sandbox/Editor/res/Default_closed.svg b/Code/Editor/res/Default_closed.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Default_closed.svg
rename to Code/Editor/res/Default_closed.svg
diff --git a/Code/Sandbox/Editor/res/Default_open.svg b/Code/Editor/res/Default_open.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Default_open.svg
rename to Code/Editor/res/Default_open.svg
diff --git a/Code/Sandbox/Editor/res/Entity.svg b/Code/Editor/res/Entity.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Entity.svg
rename to Code/Editor/res/Entity.svg
diff --git a/Code/Sandbox/Editor/res/Entity_Editor_Only.svg b/Code/Editor/res/Entity_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Entity_Editor_Only.svg
rename to Code/Editor/res/Entity_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Entity_Not_Active.svg b/Code/Editor/res/Entity_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Entity_Not_Active.svg
rename to Code/Editor/res/Entity_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Experimental.svg b/Code/Editor/res/Experimental.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Experimental.svg
rename to Code/Editor/res/Experimental.svg
diff --git a/Code/Sandbox/Editor/res/Eye.svg b/Code/Editor/res/Eye.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye.svg
rename to Code/Editor/res/Eye.svg
diff --git a/Code/Sandbox/Editor/res/Eye_Open.tif b/Code/Editor/res/Eye_Open.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Open.tif
rename to Code/Editor/res/Eye_Open.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Open_Hidden.tif b/Code/Editor/res/Eye_Open_Hidden.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Open_Hidden.tif
rename to Code/Editor/res/Eye_Open_Hidden.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Open_Hover.tif b/Code/Editor/res/Eye_Open_Hover.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Open_Hover.tif
rename to Code/Editor/res/Eye_Open_Hover.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Partial_Open.tif b/Code/Editor/res/Eye_Partial_Open.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Partial_Open.tif
rename to Code/Editor/res/Eye_Partial_Open.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Partial_Slash.tif b/Code/Editor/res/Eye_Partial_Slash.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Partial_Slash.tif
rename to Code/Editor/res/Eye_Partial_Slash.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Slash.tif b/Code/Editor/res/Eye_Slash.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Slash.tif
rename to Code/Editor/res/Eye_Slash.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Slash_Hidden.tif b/Code/Editor/res/Eye_Slash_Hidden.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Slash_Hidden.tif
rename to Code/Editor/res/Eye_Slash_Hidden.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Slash_Hover.tif b/Code/Editor/res/Eye_Slash_Hover.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Slash_Hover.tif
rename to Code/Editor/res/Eye_Slash_Hover.tif
diff --git a/Code/Sandbox/Editor/res/Files.svg b/Code/Editor/res/Files.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Files.svg
rename to Code/Editor/res/Files.svg
diff --git a/Code/Sandbox/Editor/res/Gizmos.svg b/Code/Editor/res/Gizmos.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Gizmos.svg
rename to Code/Editor/res/Gizmos.svg
diff --git a/Code/Sandbox/Editor/res/Global.svg b/Code/Editor/res/Global.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Global.svg
rename to Code/Editor/res/Global.svg
diff --git a/Code/Sandbox/Editor/res/MannFileManagerImageList.bmp b/Code/Editor/res/MannFileManagerImageList.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/MannFileManagerImageList.bmp
rename to Code/Editor/res/MannFileManagerImageList.bmp
diff --git a/Code/Sandbox/Editor/res/Motion.svg b/Code/Editor/res/Motion.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Motion.svg
rename to Code/Editor/res/Motion.svg
diff --git a/Code/Sandbox/Editor/res/Mouse.cur b/Code/Editor/res/Mouse.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/Mouse.cur
rename to Code/Editor/res/Mouse.cur
diff --git a/Code/Sandbox/Editor/res/Padlock.svg b/Code/Editor/res/Padlock.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock.svg
rename to Code/Editor/res/Padlock.svg
diff --git a/Code/Sandbox/Editor/res/Padlock_Disabled.tif b/Code/Editor/res/Padlock_Disabled.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Disabled.tif
rename to Code/Editor/res/Padlock_Disabled.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Disabled_Hover.tif b/Code/Editor/res/Padlock_Disabled_Hover.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Disabled_Hover.tif
rename to Code/Editor/res/Padlock_Disabled_Hover.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Enabled.tif b/Code/Editor/res/Padlock_Enabled.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Enabled.tif
rename to Code/Editor/res/Padlock_Enabled.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Enabled_Hover.tif b/Code/Editor/res/Padlock_Enabled_Hover.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Enabled_Hover.tif
rename to Code/Editor/res/Padlock_Enabled_Hover.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Partial_Disabled.tif b/Code/Editor/res/Padlock_Partial_Disabled.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Partial_Disabled.tif
rename to Code/Editor/res/Padlock_Partial_Disabled.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Partial_Enabled.tif b/Code/Editor/res/Padlock_Partial_Enabled.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Partial_Enabled.tif
rename to Code/Editor/res/Padlock_Partial_Enabled.tif
diff --git a/Code/Sandbox/Editor/res/Preferences.bmp b/Code/Editor/res/Preferences.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences.bmp
rename to Code/Editor/res/Preferences.bmp
diff --git a/Code/Sandbox/Editor/res/Preferences_00.png b/Code/Editor/res/Preferences_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences_00.png
rename to Code/Editor/res/Preferences_00.png
diff --git a/Code/Sandbox/Editor/res/Preferences_01.png b/Code/Editor/res/Preferences_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences_01.png
rename to Code/Editor/res/Preferences_01.png
diff --git a/Code/Sandbox/Editor/res/Preferences_02.png b/Code/Editor/res/Preferences_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences_02.png
rename to Code/Editor/res/Preferences_02.png
diff --git a/Code/Sandbox/Editor/res/Preferences_03.png b/Code/Editor/res/Preferences_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences_03.png
rename to Code/Editor/res/Preferences_03.png
diff --git a/Code/Sandbox/Editor/res/Slice_Entity.svg b/Code/Editor/res/Slice_Entity.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity.svg
rename to Code/Editor/res/Slice_Entity.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Editor_Only.svg b/Code/Editor/res/Slice_Entity_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Editor_Only.svg
rename to Code/Editor/res/Slice_Entity_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified.svg b/Code/Editor/res/Slice_Entity_Modified.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified.svg
rename to Code/Editor/res/Slice_Entity_Modified.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Editor_Only.svg b/Code/Editor/res/Slice_Entity_Modified_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Editor_Only.svg
rename to Code/Editor/res/Slice_Entity_Modified_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Editor_Only_Unsavable.svg b/Code/Editor/res/Slice_Entity_Modified_Editor_Only_Unsavable.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Editor_Only_Unsavable.svg
rename to Code/Editor/res/Slice_Entity_Modified_Editor_Only_Unsavable.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Not_Active.svg b/Code/Editor/res/Slice_Entity_Modified_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Not_Active.svg
rename to Code/Editor/res/Slice_Entity_Modified_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Not_Active_Unsavable.svg b/Code/Editor/res/Slice_Entity_Modified_Not_Active_Unsavable.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Not_Active_Unsavable.svg
rename to Code/Editor/res/Slice_Entity_Modified_Not_Active_Unsavable.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Unsavable.svg b/Code/Editor/res/Slice_Entity_Modified_Unsavable.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Unsavable.svg
rename to Code/Editor/res/Slice_Entity_Modified_Unsavable.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Not_Active.svg b/Code/Editor/res/Slice_Entity_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Not_Active.svg
rename to Code/Editor/res/Slice_Entity_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle.svg b/Code/Editor/res/Slice_Handle.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle.svg
rename to Code/Editor/res/Slice_Handle.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Editor_Only.svg b/Code/Editor/res/Slice_Handle_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Editor_Only.svg
rename to Code/Editor/res/Slice_Handle_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Modified.svg b/Code/Editor/res/Slice_Handle_Modified.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Modified.svg
rename to Code/Editor/res/Slice_Handle_Modified.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Modified_Editor_Only.svg b/Code/Editor/res/Slice_Handle_Modified_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Modified_Editor_Only.svg
rename to Code/Editor/res/Slice_Handle_Modified_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Modified_Not_Active.svg b/Code/Editor/res/Slice_Handle_Modified_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Modified_Not_Active.svg
rename to Code/Editor/res/Slice_Handle_Modified_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Not_Active.svg b/Code/Editor/res/Slice_Handle_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Not_Active.svg
rename to Code/Editor/res/Slice_Handle_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Toolbar.bmp b/Code/Editor/res/Toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/Toolbar.bmp
rename to Code/Editor/res/Toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/TreeView.bmp b/Code/Editor/res/TreeView.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/TreeView.bmp
rename to Code/Editor/res/TreeView.bmp
diff --git a/Code/Sandbox/Editor/res/Viewport.svg b/Code/Editor/res/Viewport.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Viewport.svg
rename to Code/Editor/res/Viewport.svg
diff --git a/Code/Sandbox/Editor/res/VisualLog_PlayerButtons.bmp b/Code/Editor/res/VisualLog_PlayerButtons.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/VisualLog_PlayerButtons.bmp
rename to Code/Editor/res/VisualLog_PlayerButtons.bmp
diff --git a/Code/Sandbox/Editor/res/ab_toolbar.bmp b/Code/Editor/res/ab_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/ab_toolbar.bmp
rename to Code/Editor/res/ab_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/about_dark.bmp b/Code/Editor/res/about_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/about_dark.bmp
rename to Code/Editor/res/about_dark.bmp
diff --git a/Code/Sandbox/Editor/res/add.png b/Code/Editor/res/add.png
similarity index 100%
rename from Code/Sandbox/Editor/res/add.png
rename to Code/Editor/res/add.png
diff --git a/Code/Sandbox/Editor/res/anim.bmp b/Code/Editor/res/anim.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/anim.bmp
rename to Code/Editor/res/anim.bmp
diff --git a/Code/Sandbox/Editor/res/animatio.bmp b/Code/Editor/res/animatio.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animatio.bmp
rename to Code/Editor/res/animatio.bmp
diff --git a/Code/Sandbox/Editor/res/animations_tree_soundevent.bmp b/Code/Editor/res/animations_tree_soundevent.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animations_tree_soundevent.bmp
rename to Code/Editor/res/animations_tree_soundevent.bmp
diff --git a/Code/Sandbox/Editor/res/animflag_inside_pak.bmp b/Code/Editor/res/animflag_inside_pak.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animflag_inside_pak.bmp
rename to Code/Editor/res/animflag_inside_pak.bmp
diff --git a/Code/Sandbox/Editor/res/animflag_on_disk.bmp b/Code/Editor/res/animflag_on_disk.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animflag_on_disk.bmp
rename to Code/Editor/res/animflag_on_disk.bmp
diff --git a/Code/Sandbox/Editor/res/animtree.bmp b/Code/Editor/res/animtree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animtree.bmp
rename to Code/Editor/res/animtree.bmp
diff --git a/Code/Sandbox/Editor/res/arhitype_tree.bmp b/Code/Editor/res/arhitype_tree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/arhitype_tree.bmp
rename to Code/Editor/res/arhitype_tree.bmp
diff --git a/Code/Sandbox/Editor/res/arr_addkey.cur b/Code/Editor/res/arr_addkey.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arr_addkey.cur
rename to Code/Editor/res/arr_addkey.cur
diff --git a/Code/Sandbox/Editor/res/arrow.cur b/Code/Editor/res/arrow.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow.cur
rename to Code/Editor/res/arrow.cur
diff --git a/Code/Sandbox/Editor/res/arrow_down.cur b/Code/Editor/res/arrow_down.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_down.cur
rename to Code/Editor/res/arrow_down.cur
diff --git a/Code/Sandbox/Editor/res/arrow_down_black.ico b/Code/Editor/res/arrow_down_black.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_down_black.ico
rename to Code/Editor/res/arrow_down_black.ico
diff --git a/Code/Sandbox/Editor/res/arrow_downright.cur b/Code/Editor/res/arrow_downright.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_downright.cur
rename to Code/Editor/res/arrow_downright.cur
diff --git a/Code/Sandbox/Editor/res/arrow_up.cur b/Code/Editor/res/arrow_up.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_up.cur
rename to Code/Editor/res/arrow_up.cur
diff --git a/Code/Sandbox/Editor/res/arrow_up_black.ico b/Code/Editor/res/arrow_up_black.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_up_black.ico
rename to Code/Editor/res/arrow_up_black.ico
diff --git a/Code/Sandbox/Editor/res/arrow_upright.cur b/Code/Editor/res/arrow_upright.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_upright.cur
rename to Code/Editor/res/arrow_upright.cur
diff --git a/Code/Sandbox/Editor/res/arrowcop.cur b/Code/Editor/res/arrowcop.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrowcop.cur
rename to Code/Editor/res/arrowcop.cur
diff --git a/Code/Sandbox/Editor/res/assetIsDraggable.ico b/Code/Editor/res/assetIsDraggable.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/assetIsDraggable.ico
rename to Code/Editor/res/assetIsDraggable.ico
diff --git a/Code/Sandbox/Editor/res/avi_reco.bmp b/Code/Editor/res/avi_reco.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/avi_reco.bmp
rename to Code/Editor/res/avi_reco.bmp
diff --git a/Code/Sandbox/Editor/res/ball_disabled.ico b/Code/Editor/res/ball_disabled.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ball_disabled.ico
rename to Code/Editor/res/ball_disabled.ico
diff --git a/Code/Sandbox/Editor/res/ball_offline.ico b/Code/Editor/res/ball_offline.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ball_offline.ico
rename to Code/Editor/res/ball_offline.ico
diff --git a/Code/Sandbox/Editor/res/ball_online.ico b/Code/Editor/res/ball_online.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ball_online.ico
rename to Code/Editor/res/ball_online.ico
diff --git a/Code/Sandbox/Editor/res/ball_pending.ico b/Code/Editor/res/ball_pending.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ball_pending.ico
rename to Code/Editor/res/ball_pending.ico
diff --git a/Code/Sandbox/Editor/res/bitmap5.bmp b/Code/Editor/res/bitmap5.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bitmap5.bmp
rename to Code/Editor/res/bitmap5.bmp
diff --git a/Code/Sandbox/Editor/res/bitmap6.bmp b/Code/Editor/res/bitmap6.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bitmap6.bmp
rename to Code/Editor/res/bitmap6.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00001.bmp b/Code/Editor/res/bmp00001.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00001.bmp
rename to Code/Editor/res/bmp00001.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00002.bmp b/Code/Editor/res/bmp00002.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00002.bmp
rename to Code/Editor/res/bmp00002.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00003.bmp b/Code/Editor/res/bmp00003.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00003.bmp
rename to Code/Editor/res/bmp00003.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00005.bmp b/Code/Editor/res/bmp00005.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00005.bmp
rename to Code/Editor/res/bmp00005.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00006.bmp b/Code/Editor/res/bmp00006.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00006.bmp
rename to Code/Editor/res/bmp00006.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00007.bmp b/Code/Editor/res/bmp00007.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007.bmp
rename to Code/Editor/res/bmp00007.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00007_0.png b/Code/Editor/res/bmp00007_0.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_0.png
rename to Code/Editor/res/bmp00007_0.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_1.png b/Code/Editor/res/bmp00007_1.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_1.png
rename to Code/Editor/res/bmp00007_1.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_2.png b/Code/Editor/res/bmp00007_2.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_2.png
rename to Code/Editor/res/bmp00007_2.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_3.png b/Code/Editor/res/bmp00007_3.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_3.png
rename to Code/Editor/res/bmp00007_3.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_4.png b/Code/Editor/res/bmp00007_4.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_4.png
rename to Code/Editor/res/bmp00007_4.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_5.png b/Code/Editor/res/bmp00007_5.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_5.png
rename to Code/Editor/res/bmp00007_5.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_6.png b/Code/Editor/res/bmp00007_6.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_6.png
rename to Code/Editor/res/bmp00007_6.png
diff --git a/Code/Sandbox/Editor/res/bmp00008.bmp b/Code/Editor/res/bmp00008.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00008.bmp
rename to Code/Editor/res/bmp00008.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00009.bmp b/Code/Editor/res/bmp00009.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00009.bmp
rename to Code/Editor/res/bmp00009.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00010.bmp b/Code/Editor/res/bmp00010.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00010.bmp
rename to Code/Editor/res/bmp00010.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00011.bmp b/Code/Editor/res/bmp00011.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00011.bmp
rename to Code/Editor/res/bmp00011.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00012.bmp b/Code/Editor/res/bmp00012.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00012.bmp
rename to Code/Editor/res/bmp00012.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00013.bmp b/Code/Editor/res/bmp00013.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00013.bmp
rename to Code/Editor/res/bmp00013.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00014.bmp b/Code/Editor/res/bmp00014.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00014.bmp
rename to Code/Editor/res/bmp00014.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00015.bmp b/Code/Editor/res/bmp00015.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00015.bmp
rename to Code/Editor/res/bmp00015.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00016.bmp b/Code/Editor/res/bmp00016.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00016.bmp
rename to Code/Editor/res/bmp00016.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00017.bmp b/Code/Editor/res/bmp00017.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00017.bmp
rename to Code/Editor/res/bmp00017.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00019.bmp b/Code/Editor/res/bmp00019.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00019.bmp
rename to Code/Editor/res/bmp00019.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00020.bmp b/Code/Editor/res/bmp00020.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00020.bmp
rename to Code/Editor/res/bmp00020.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00024.bmp b/Code/Editor/res/bmp00024.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00024.bmp
rename to Code/Editor/res/bmp00024.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00025.bmp b/Code/Editor/res/bmp00025.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00025.bmp
rename to Code/Editor/res/bmp00025.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00026.bmp b/Code/Editor/res/bmp00026.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00026.bmp
rename to Code/Editor/res/bmp00026.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00027.bmp b/Code/Editor/res/bmp00027.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00027.bmp
rename to Code/Editor/res/bmp00027.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00028.bmp b/Code/Editor/res/bmp00028.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00028.bmp
rename to Code/Editor/res/bmp00028.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00029.bmp b/Code/Editor/res/bmp00029.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00029.bmp
rename to Code/Editor/res/bmp00029.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00030.bmp b/Code/Editor/res/bmp00030.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00030.bmp
rename to Code/Editor/res/bmp00030.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00031.bmp b/Code/Editor/res/bmp00031.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00031.bmp
rename to Code/Editor/res/bmp00031.bmp
diff --git a/Code/Sandbox/Editor/res/brush24bpp.bmp b/Code/Editor/res/brush24bpp.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/brush24bpp.bmp
rename to Code/Editor/res/brush24bpp.bmp
diff --git a/Code/Sandbox/Editor/res/ce_animations_toolbar.bmp b/Code/Editor/res/ce_animations_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/ce_animations_toolbar.bmp
rename to Code/Editor/res/ce_animations_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/character_parts_bar.bmp b/Code/Editor/res/character_parts_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/character_parts_bar.bmp
rename to Code/Editor/res/character_parts_bar.bmp
diff --git a/Code/Sandbox/Editor/res/charedit.bmp b/Code/Editor/res/charedit.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/charedit.bmp
rename to Code/Editor/res/charedit.bmp
diff --git a/Code/Sandbox/Editor/res/chrparamsicons.bmp b/Code/Editor/res/chrparamsicons.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/chrparamsicons.bmp
rename to Code/Editor/res/chrparamsicons.bmp
diff --git a/Code/Sandbox/Editor/res/clapperboard_cancel.bmp b/Code/Editor/res/clapperboard_cancel.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/clapperboard_cancel.bmp
rename to Code/Editor/res/clapperboard_cancel.bmp
diff --git a/Code/Sandbox/Editor/res/clapperboard_ready.bmp b/Code/Editor/res/clapperboard_ready.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/clapperboard_ready.bmp
rename to Code/Editor/res/clapperboard_ready.bmp
diff --git a/Code/Sandbox/Editor/res/clone.ico b/Code/Editor/res/clone.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/clone.ico
rename to Code/Editor/res/clone.ico
diff --git a/Code/Sandbox/Editor/res/cur00001.cur b/Code/Editor/res/cur00001.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00001.cur
rename to Code/Editor/res/cur00001.cur
diff --git a/Code/Sandbox/Editor/res/cur00002.cur b/Code/Editor/res/cur00002.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00002.cur
rename to Code/Editor/res/cur00002.cur
diff --git a/Code/Sandbox/Editor/res/cur00003.cur b/Code/Editor/res/cur00003.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00003.cur
rename to Code/Editor/res/cur00003.cur
diff --git a/Code/Sandbox/Editor/res/cur00004.cur b/Code/Editor/res/cur00004.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00004.cur
rename to Code/Editor/res/cur00004.cur
diff --git a/Code/Sandbox/Editor/res/cur00005.cur b/Code/Editor/res/cur00005.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00005.cur
rename to Code/Editor/res/cur00005.cur
diff --git a/Code/Sandbox/Editor/res/cursor1.cur b/Code/Editor/res/cursor1.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cursor1.cur
rename to Code/Editor/res/cursor1.cur
diff --git a/Code/Sandbox/Editor/res/cursor2.cur b/Code/Editor/res/cursor2.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cursor2.cur
rename to Code/Editor/res/cursor2.cur
diff --git a/Code/Sandbox/Editor/res/cvar_dark.bmp b/Code/Editor/res/cvar_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/cvar_dark.bmp
rename to Code/Editor/res/cvar_dark.bmp
diff --git a/Code/Sandbox/Editor/res/db_gametoken.bmp b/Code/Editor/res/db_gametoken.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_gametoken.bmp
rename to Code/Editor/res/db_gametoken.bmp
diff --git a/Code/Sandbox/Editor/res/db_library_add.svg b/Code/Editor/res/db_library_add.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_add.svg
rename to Code/Editor/res/db_library_add.svg
diff --git a/Code/Sandbox/Editor/res/db_library_additem.svg b/Code/Editor/res/db_library_additem.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_additem.svg
rename to Code/Editor/res/db_library_additem.svg
diff --git a/Code/Sandbox/Editor/res/db_library_assignitem.svg b/Code/Editor/res/db_library_assignitem.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_assignitem.svg
rename to Code/Editor/res/db_library_assignitem.svg
diff --git a/Code/Sandbox/Editor/res/db_library_bar.bmp b/Code/Editor/res/db_library_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar.bmp
rename to Code/Editor/res/db_library_bar.bmp
diff --git a/Code/Sandbox/Editor/res/db_library_bar_00.png b/Code/Editor/res/db_library_bar_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_00.png
rename to Code/Editor/res/db_library_bar_00.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_01.png b/Code/Editor/res/db_library_bar_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_01.png
rename to Code/Editor/res/db_library_bar_01.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_02.png b/Code/Editor/res/db_library_bar_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_02.png
rename to Code/Editor/res/db_library_bar_02.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_03.png b/Code/Editor/res/db_library_bar_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_03.png
rename to Code/Editor/res/db_library_bar_03.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_04.png b/Code/Editor/res/db_library_bar_04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_04.png
rename to Code/Editor/res/db_library_bar_04.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_05.png b/Code/Editor/res/db_library_bar_05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_05.png
rename to Code/Editor/res/db_library_bar_05.png
diff --git a/Code/Sandbox/Editor/res/db_library_cloneitem.svg b/Code/Editor/res/db_library_cloneitem.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_cloneitem.svg
rename to Code/Editor/res/db_library_cloneitem.svg
diff --git a/Code/Sandbox/Editor/res/db_library_copy.svg b/Code/Editor/res/db_library_copy.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_copy.svg
rename to Code/Editor/res/db_library_copy.svg
diff --git a/Code/Sandbox/Editor/res/db_library_delete.svg b/Code/Editor/res/db_library_delete.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_delete.svg
rename to Code/Editor/res/db_library_delete.svg
diff --git a/Code/Sandbox/Editor/res/db_library_getproperties.svg b/Code/Editor/res/db_library_getproperties.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_getproperties.svg
rename to Code/Editor/res/db_library_getproperties.svg
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar.bmp b/Code/Editor/res/db_library_item_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar.bmp
rename to Code/Editor/res/db_library_item_bar.bmp
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_00.png b/Code/Editor/res/db_library_item_bar_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_00.png
rename to Code/Editor/res/db_library_item_bar_00.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_01.png b/Code/Editor/res/db_library_item_bar_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_01.png
rename to Code/Editor/res/db_library_item_bar_01.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_02.png b/Code/Editor/res/db_library_item_bar_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_02.png
rename to Code/Editor/res/db_library_item_bar_02.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_03.png b/Code/Editor/res/db_library_item_bar_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_03.png
rename to Code/Editor/res/db_library_item_bar_03.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_04.png b/Code/Editor/res/db_library_item_bar_04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_04.png
rename to Code/Editor/res/db_library_item_bar_04.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_05.png b/Code/Editor/res/db_library_item_bar_05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_05.png
rename to Code/Editor/res/db_library_item_bar_05.png
diff --git a/Code/Sandbox/Editor/res/db_library_open.svg b/Code/Editor/res/db_library_open.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_open.svg
rename to Code/Editor/res/db_library_open.svg
diff --git a/Code/Sandbox/Editor/res/db_library_paste.svg b/Code/Editor/res/db_library_paste.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_paste.svg
rename to Code/Editor/res/db_library_paste.svg
diff --git a/Code/Sandbox/Editor/res/db_library_redo.svg b/Code/Editor/res/db_library_redo.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_redo.svg
rename to Code/Editor/res/db_library_redo.svg
diff --git a/Code/Sandbox/Editor/res/db_library_refresh.svg b/Code/Editor/res/db_library_refresh.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_refresh.svg
rename to Code/Editor/res/db_library_refresh.svg
diff --git a/Code/Sandbox/Editor/res/db_library_reload.svg b/Code/Editor/res/db_library_reload.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_reload.svg
rename to Code/Editor/res/db_library_reload.svg
diff --git a/Code/Sandbox/Editor/res/db_library_removeitem.svg b/Code/Editor/res/db_library_removeitem.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_removeitem.svg
rename to Code/Editor/res/db_library_removeitem.svg
diff --git a/Code/Sandbox/Editor/res/db_library_save.svg b/Code/Editor/res/db_library_save.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_save.svg
rename to Code/Editor/res/db_library_save.svg
diff --git a/Code/Sandbox/Editor/res/db_library_undo.svg b/Code/Editor/res/db_library_undo.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_undo.svg
rename to Code/Editor/res/db_library_undo.svg
diff --git a/Code/Sandbox/Editor/res/db_music.bmp b/Code/Editor/res/db_music.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_music.bmp
rename to Code/Editor/res/db_music.bmp
diff --git a/Code/Sandbox/Editor/res/db_music_logic.bmp b/Code/Editor/res/db_music_logic.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_music_logic.bmp
rename to Code/Editor/res/db_music_logic.bmp
diff --git a/Code/Sandbox/Editor/res/db_standart.bmp b/Code/Editor/res/db_standart.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart.bmp
rename to Code/Editor/res/db_standart.bmp
diff --git a/Code/Sandbox/Editor/res/db_standart_00.png b/Code/Editor/res/db_standart_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart_00.png
rename to Code/Editor/res/db_standart_00.png
diff --git a/Code/Sandbox/Editor/res/db_standart_01.png b/Code/Editor/res/db_standart_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart_01.png
rename to Code/Editor/res/db_standart_01.png
diff --git a/Code/Sandbox/Editor/res/db_standart_02.png b/Code/Editor/res/db_standart_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart_02.png
rename to Code/Editor/res/db_standart_02.png
diff --git a/Code/Sandbox/Editor/res/db_standart_03.png b/Code/Editor/res/db_standart_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart_03.png
rename to Code/Editor/res/db_standart_03.png
diff --git a/Code/Sandbox/Editor/res/desc_editor_toolbar.bmp b/Code/Editor/res/desc_editor_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/desc_editor_toolbar.bmp
rename to Code/Editor/res/desc_editor_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/down_arr.ico b/Code/Editor/res/down_arr.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/down_arr.ico
rename to Code/Editor/res/down_arr.ico
diff --git a/Code/Sandbox/Editor/res/down_arrow.ico b/Code/Editor/res/down_arrow.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/down_arrow.ico
rename to Code/Editor/res/down_arrow.ico
diff --git a/Code/Sandbox/Editor/res/dynamichelp.bmp b/Code/Editor/res/dynamichelp.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/dynamichelp.bmp
rename to Code/Editor/res/dynamichelp.bmp
diff --git a/Code/Sandbox/Editor/res/edit_mod.bmp b/Code/Editor/res/edit_mod.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/edit_mod.bmp
rename to Code/Editor/res/edit_mod.bmp
diff --git a/Code/Sandbox/Editor/res/editwithbutton.bmp b/Code/Editor/res/editwithbutton.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/editwithbutton.bmp
rename to Code/Editor/res/editwithbutton.bmp
diff --git a/Code/Sandbox/Editor/res/editwithbutton_dark.bmp b/Code/Editor/res/editwithbutton_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/editwithbutton_dark.bmp
rename to Code/Editor/res/editwithbutton_dark.bmp
diff --git a/Code/Sandbox/Editor/res/emptycontainer.png b/Code/Editor/res/emptycontainer.png
similarity index 100%
rename from Code/Sandbox/Editor/res/emptycontainer.png
rename to Code/Editor/res/emptycontainer.png
diff --git a/Code/Sandbox/Editor/res/entitybar.bmp b/Code/Editor/res/entitybar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/entitybar.bmp
rename to Code/Editor/res/entitybar.bmp
diff --git a/Code/Sandbox/Editor/res/error_report.bmp b/Code/Editor/res/error_report.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report.bmp
rename to Code/Editor/res/error_report.bmp
diff --git a/Code/Sandbox/Editor/res/error_report_checkmark.svg b/Code/Editor/res/error_report_checkmark.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report_checkmark.svg
rename to Code/Editor/res/error_report_checkmark.svg
diff --git a/Code/Sandbox/Editor/res/error_report_comment.svg b/Code/Editor/res/error_report_comment.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report_comment.svg
rename to Code/Editor/res/error_report_comment.svg
diff --git a/Code/Sandbox/Editor/res/error_report_error.svg b/Code/Editor/res/error_report_error.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report_error.svg
rename to Code/Editor/res/error_report_error.svg
diff --git a/Code/Sandbox/Editor/res/error_report_warning.svg b/Code/Editor/res/error_report_warning.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report_warning.svg
rename to Code/Editor/res/error_report_warning.svg
diff --git a/Code/Sandbox/Editor/res/expand1.ico b/Code/Editor/res/expand1.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/expand1.ico
rename to Code/Editor/res/expand1.ico
diff --git a/Code/Sandbox/Editor/res/expand2.ico b/Code/Editor/res/expand2.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/expand2.ico
rename to Code/Editor/res/expand2.ico
diff --git a/Code/Sandbox/Editor/res/faceit_playbar.bmp b/Code/Editor/res/faceit_playbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/faceit_playbar.bmp
rename to Code/Editor/res/faceit_playbar.bmp
diff --git a/Code/Sandbox/Editor/res/faceit_slidersbar.bmp b/Code/Editor/res/faceit_slidersbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/faceit_slidersbar.bmp
rename to Code/Editor/res/faceit_slidersbar.bmp
diff --git a/Code/Sandbox/Editor/res/faceit_spline_bar.bmp b/Code/Editor/res/faceit_spline_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/faceit_spline_bar.bmp
rename to Code/Editor/res/faceit_spline_bar.bmp
diff --git a/Code/Sandbox/Editor/res/facejoystickbar.bmp b/Code/Editor/res/facejoystickbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/facejoystickbar.bmp
rename to Code/Editor/res/facejoystickbar.bmp
diff --git a/Code/Sandbox/Editor/res/facesequence_bar.bmp b/Code/Editor/res/facesequence_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/facesequence_bar.bmp
rename to Code/Editor/res/facesequence_bar.bmp
diff --git a/Code/Sandbox/Editor/res/facialsequence_bar.bmp b/Code/Editor/res/facialsequence_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/facialsequence_bar.bmp
rename to Code/Editor/res/facialsequence_bar.bmp
diff --git a/Code/Sandbox/Editor/res/feedback.ico b/Code/Editor/res/feedback.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/feedback.ico
rename to Code/Editor/res/feedback.ico
diff --git a/Code/Sandbox/Editor/res/file_browse.ico b/Code/Editor/res/file_browse.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/file_browse.ico
rename to Code/Editor/res/file_browse.ico
diff --git a/Code/Sandbox/Editor/res/filesimage.bmp b/Code/Editor/res/filesimage.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage.bmp
rename to Code/Editor/res/filesimage.bmp
diff --git a/Code/Sandbox/Editor/res/filesimage_00.png b/Code/Editor/res/filesimage_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_00.png
rename to Code/Editor/res/filesimage_00.png
diff --git a/Code/Sandbox/Editor/res/filesimage_01.png b/Code/Editor/res/filesimage_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_01.png
rename to Code/Editor/res/filesimage_01.png
diff --git a/Code/Sandbox/Editor/res/filesimage_02.png b/Code/Editor/res/filesimage_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_02.png
rename to Code/Editor/res/filesimage_02.png
diff --git a/Code/Sandbox/Editor/res/filesimage_03.png b/Code/Editor/res/filesimage_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_03.png
rename to Code/Editor/res/filesimage_03.png
diff --git a/Code/Sandbox/Editor/res/filesimage_04.png b/Code/Editor/res/filesimage_04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_04.png
rename to Code/Editor/res/filesimage_04.png
diff --git a/Code/Sandbox/Editor/res/filesimage_05.png b/Code/Editor/res/filesimage_05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_05.png
rename to Code/Editor/res/filesimage_05.png
diff --git a/Code/Sandbox/Editor/res/filesimage_06.png b/Code/Editor/res/filesimage_06.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_06.png
rename to Code/Editor/res/filesimage_06.png
diff --git a/Code/Sandbox/Editor/res/filesimage_07.png b/Code/Editor/res/filesimage_07.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_07.png
rename to Code/Editor/res/filesimage_07.png
diff --git a/Code/Sandbox/Editor/res/filesimage_08.png b/Code/Editor/res/filesimage_08.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_08.png
rename to Code/Editor/res/filesimage_08.png
diff --git a/Code/Sandbox/Editor/res/filesimage_09.png b/Code/Editor/res/filesimage_09.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_09.png
rename to Code/Editor/res/filesimage_09.png
diff --git a/Code/Sandbox/Editor/res/filestatus.bmp b/Code/Editor/res/filestatus.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/filestatus.bmp
rename to Code/Editor/res/filestatus.bmp
diff --git a/Code/Sandbox/Editor/res/folder.ico b/Code/Editor/res/folder.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/folder.ico
rename to Code/Editor/res/folder.ico
diff --git a/Code/Sandbox/Editor/res/folder.png b/Code/Editor/res/folder.png
similarity index 100%
rename from Code/Sandbox/Editor/res/folder.png
rename to Code/Editor/res/folder.png
diff --git a/Code/Sandbox/Editor/res/fopen_back.ico b/Code/Editor/res/fopen_back.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/fopen_back.ico
rename to Code/Editor/res/fopen_back.ico
diff --git a/Code/Sandbox/Editor/res/fopen_back.png b/Code/Editor/res/fopen_back.png
similarity index 100%
rename from Code/Sandbox/Editor/res/fopen_back.png
rename to Code/Editor/res/fopen_back.png
diff --git a/Code/Sandbox/Editor/res/fopen_up.ico b/Code/Editor/res/fopen_up.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/fopen_up.ico
rename to Code/Editor/res/fopen_up.ico
diff --git a/Code/Sandbox/Editor/res/fopen_up.png b/Code/Editor/res/fopen_up.png
similarity index 100%
rename from Code/Sandbox/Editor/res/fopen_up.png
rename to Code/Editor/res/fopen_up.png
diff --git a/Code/Sandbox/Editor/res/grid.ico b/Code/Editor/res/grid.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/grid.ico
rename to Code/Editor/res/grid.ico
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/icons/group_closed.png b/Code/Editor/res/group_closed.png
similarity index 100%
rename from Code/Sandbox/Plugins/ProjectSettingsTool/icons/group_closed.png
rename to Code/Editor/res/group_closed.png
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/icons/group_open.png b/Code/Editor/res/group_open.png
similarity index 100%
rename from Code/Sandbox/Plugins/ProjectSettingsTool/icons/group_open.png
rename to Code/Editor/res/group_open.png
diff --git a/Code/Sandbox/Editor/res/handDrag.cur b/Code/Editor/res/handDrag.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/handDrag.cur
rename to Code/Editor/res/handDrag.cur
diff --git a/Code/Sandbox/Editor/res/hit.cur b/Code/Editor/res/hit.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/hit.cur
rename to Code/Editor/res/hit.cur
diff --git a/Code/Sandbox/Editor/res/hypergraph_components.bmp b/Code/Editor/res/hypergraph_components.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/hypergraph_components.bmp
rename to Code/Editor/res/hypergraph_components.bmp
diff --git a/Code/Sandbox/Editor/res/hypergraphtree.bmp b/Code/Editor/res/hypergraphtree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/hypergraphtree.bmp
rename to Code/Editor/res/hypergraphtree.bmp
diff --git a/Code/Sandbox/Editor/res/ico00001.ico b/Code/Editor/res/ico00001.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ico00001.ico
rename to Code/Editor/res/ico00001.ico
diff --git a/Code/Sandbox/Editor/res/ico00002.ico b/Code/Editor/res/ico00002.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ico00002.ico
rename to Code/Editor/res/ico00002.ico
diff --git a/Code/Sandbox/Editor/res/icon1.ico b/Code/Editor/res/icon1.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon1.ico
rename to Code/Editor/res/icon1.ico
diff --git a/Code/Sandbox/Editor/res/icon_delete.ico b/Code/Editor/res/icon_delete.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_delete.ico
rename to Code/Editor/res/icon_delete.ico
diff --git a/Code/Sandbox/Editor/res/icon_export.ico b/Code/Editor/res/icon_export.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_export.ico
rename to Code/Editor/res/icon_export.ico
diff --git a/Code/Sandbox/Editor/res/icon_import.ico b/Code/Editor/res/icon_import.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_import.ico
rename to Code/Editor/res/icon_import.ico
diff --git a/Code/Sandbox/Editor/res/icon_new.ico b/Code/Editor/res/icon_new.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_new.ico
rename to Code/Editor/res/icon_new.ico
diff --git a/Code/Sandbox/Editor/res/icon_pause.ico b/Code/Editor/res/icon_pause.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_pause.ico
rename to Code/Editor/res/icon_pause.ico
diff --git a/Code/Sandbox/Editor/res/icon_play.ico b/Code/Editor/res/icon_play.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_play.ico
rename to Code/Editor/res/icon_play.ico
diff --git a/Code/Sandbox/Editor/res/icon_question.bmp b/Code/Editor/res/icon_question.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_question.bmp
rename to Code/Editor/res/icon_question.bmp
diff --git a/Code/Sandbox/Editor/res/icon_question.ico b/Code/Editor/res/icon_question.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_question.ico
rename to Code/Editor/res/icon_question.ico
diff --git a/Code/Sandbox/Editor/res/idb_.bmp b/Code/Editor/res/idb_.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/idb_.bmp
rename to Code/Editor/res/idb_.bmp
diff --git a/Code/Sandbox/Editor/res/infobar/CameraCollision-default.svg b/Code/Editor/res/infobar/CameraCollision-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/CameraCollision-default.svg
rename to Code/Editor/res/infobar/CameraCollision-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/GotoLocation-default.svg b/Code/Editor/res/infobar/GotoLocation-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/GotoLocation-default.svg
rename to Code/Editor/res/infobar/GotoLocation-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/LockScale-default.svg b/Code/Editor/res/infobar/LockScale-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/LockScale-default.svg
rename to Code/Editor/res/infobar/LockScale-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/LockSelection-default.svg b/Code/Editor/res/infobar/LockSelection-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/LockSelection-default.svg
rename to Code/Editor/res/infobar/LockSelection-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/Mute-default.svg b/Code/Editor/res/infobar/Mute-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/Mute-default.svg
rename to Code/Editor/res/infobar/Mute-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/NoPlayerSync-default.svg b/Code/Editor/res/infobar/NoPlayerSync-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/NoPlayerSync-default.svg
rename to Code/Editor/res/infobar/NoPlayerSync-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/NoPlayerSync-selected.svg b/Code/Editor/res/infobar/NoPlayerSync-selected.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/NoPlayerSync-selected.svg
rename to Code/Editor/res/infobar/NoPlayerSync-selected.svg
diff --git a/Code/Sandbox/Editor/res/infobar/Pause-default.svg b/Code/Editor/res/infobar/Pause-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/Pause-default.svg
rename to Code/Editor/res/infobar/Pause-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/PausePlay-default.svg b/Code/Editor/res/infobar/PausePlay-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/PausePlay-default.svg
rename to Code/Editor/res/infobar/PausePlay-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/PhysicsCol-default.svg b/Code/Editor/res/infobar/PhysicsCol-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/PhysicsCol-default.svg
rename to Code/Editor/res/infobar/PhysicsCol-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/VR-default.svg b/Code/Editor/res/infobar/VR-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/VR-default.svg
rename to Code/Editor/res/infobar/VR-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/XYZ-default.svg b/Code/Editor/res/infobar/XYZ-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/XYZ-default.svg
rename to Code/Editor/res/infobar/XYZ-default.svg
diff --git a/Code/Sandbox/Editor/res/k_PlayerButtons.bmp b/Code/Editor/res/k_PlayerButtons.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/k_PlayerButtons.bmp
rename to Code/Editor/res/k_PlayerButtons.bmp
diff --git a/Code/Sandbox/Editor/res/layer_editor_layer_buttons-0.png b/Code/Editor/res/layer_editor_layer_buttons-0.png
similarity index 100%
rename from Code/Sandbox/Editor/res/layer_editor_layer_buttons-0.png
rename to Code/Editor/res/layer_editor_layer_buttons-0.png
diff --git a/Code/Sandbox/Editor/res/layer_editor_layer_buttons-1.png b/Code/Editor/res/layer_editor_layer_buttons-1.png
similarity index 100%
rename from Code/Sandbox/Editor/res/layer_editor_layer_buttons-1.png
rename to Code/Editor/res/layer_editor_layer_buttons-1.png
diff --git a/Code/Sandbox/Editor/res/layer_icon.svg b/Code/Editor/res/layer_icon.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layer_icon.svg
rename to Code/Editor/res/layer_icon.svg
diff --git a/Code/Sandbox/Editor/res/layouts.bmp b/Code/Editor/res/layouts.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts.bmp
rename to Code/Editor/res/layouts.bmp
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-0.svg b/Code/Editor/res/layouts/layouts-0.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-0.svg
rename to Code/Editor/res/layouts/layouts-0.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-1.svg b/Code/Editor/res/layouts/layouts-1.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-1.svg
rename to Code/Editor/res/layouts/layouts-1.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-2.svg b/Code/Editor/res/layouts/layouts-2.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-2.svg
rename to Code/Editor/res/layouts/layouts-2.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-3.svg b/Code/Editor/res/layouts/layouts-3.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-3.svg
rename to Code/Editor/res/layouts/layouts-3.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-4.svg b/Code/Editor/res/layouts/layouts-4.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-4.svg
rename to Code/Editor/res/layouts/layouts-4.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-5.svg b/Code/Editor/res/layouts/layouts-5.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-5.svg
rename to Code/Editor/res/layouts/layouts-5.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-6.svg b/Code/Editor/res/layouts/layouts-6.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-6.svg
rename to Code/Editor/res/layouts/layouts-6.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-7.svg b/Code/Editor/res/layouts/layouts-7.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-7.svg
rename to Code/Editor/res/layouts/layouts-7.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-8.svg b/Code/Editor/res/layouts/layouts-8.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-8.svg
rename to Code/Editor/res/layouts/layouts-8.svg
diff --git a/Code/Sandbox/Editor/res/lc_connecting.ico b/Code/Editor/res/lc_connecting.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/lc_connecting.ico
rename to Code/Editor/res/lc_connecting.ico
diff --git a/Code/Sandbox/Editor/res/lc_running.ico b/Code/Editor/res/lc_running.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/lc_running.ico
rename to Code/Editor/res/lc_running.ico
diff --git a/Code/Sandbox/Editor/res/leftright.cur b/Code/Editor/res/leftright.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/leftright.cur
rename to Code/Editor/res/leftright.cur
diff --git a/Code/Sandbox/Editor/res/litebulb.bmp b/Code/Editor/res/litebulb.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/litebulb.bmp
rename to Code/Editor/res/litebulb.bmp
diff --git a/Code/Sandbox/Editor/res/lock_circle_default.svg b/Code/Editor/res/lock_circle_default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_circle_default.svg
rename to Code/Editor/res/lock_circle_default.svg
diff --git a/Code/Sandbox/Editor/res/lock_circle_transparent.svg b/Code/Editor/res/lock_circle_transparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_circle_transparent.svg
rename to Code/Editor/res/lock_circle_transparent.svg
diff --git a/Code/Sandbox/Editor/res/lock_on_NotTransparent.svg b/Code/Editor/res/lock_on_NotTransparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_on_NotTransparent.svg
rename to Code/Editor/res/lock_on_NotTransparent.svg
diff --git a/Code/Sandbox/Editor/res/lock_on_transparent.svg b/Code/Editor/res/lock_on_transparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_on_transparent.svg
rename to Code/Editor/res/lock_on_transparent.svg
diff --git a/Code/Sandbox/Editor/res/lock_sel.bmp b/Code/Editor/res/lock_sel.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_sel.bmp
rename to Code/Editor/res/lock_sel.bmp
diff --git a/Code/Sandbox/Editor/res/locked.svg b/Code/Editor/res/locked.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/locked.svg
rename to Code/Editor/res/locked.svg
diff --git a/Code/Sandbox/Editor/res/locksele.bmp b/Code/Editor/res/locksele.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/locksele.bmp
rename to Code/Editor/res/locksele.bmp
diff --git a/Code/Sandbox/Editor/res/logo.bmp b/Code/Editor/res/logo.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/logo.bmp
rename to Code/Editor/res/logo.bmp
diff --git a/Code/Sandbox/Editor/res/logo.gif b/Code/Editor/res/logo.gif
similarity index 100%
rename from Code/Sandbox/Editor/res/logo.gif
rename to Code/Editor/res/logo.gif
diff --git a/Code/Sandbox/Editor/res/lyeditor_small.ico b/Code/Editor/res/lyeditor_small.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/lyeditor_small.ico
rename to Code/Editor/res/lyeditor_small.ico
diff --git a/Code/Sandbox/Editor/res/mainfram.bmp b/Code/Editor/res/mainfram.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/mainfram.bmp
rename to Code/Editor/res/mainfram.bmp
diff --git a/Code/Sandbox/Editor/res/mann_tagdef_toolbar.bmp b/Code/Editor/res/mann_tagdef_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/mann_tagdef_toolbar.bmp
rename to Code/Editor/res/mann_tagdef_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/mann_tagdef_tree.bmp b/Code/Editor/res/mann_tagdef_tree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/mann_tagdef_tree.bmp
rename to Code/Editor/res/mann_tagdef_tree.bmp
diff --git a/Code/Sandbox/Editor/res/material.bmp b/Code/Editor/res/material.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/material.bmp
rename to Code/Editor/res/material.bmp
diff --git a/Code/Sandbox/Editor/res/material_browser.bmp b/Code/Editor/res/material_browser.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/material_browser.bmp
rename to Code/Editor/res/material_browser.bmp
diff --git a/Code/Sandbox/Editor/res/materialbar.bmp b/Code/Editor/res/materialbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/materialbar.bmp
rename to Code/Editor/res/materialbar.bmp
diff --git a/Code/Sandbox/Editor/res/maximize.ico b/Code/Editor/res/maximize.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/maximize.ico
rename to Code/Editor/res/maximize.ico
diff --git a/Code/Sandbox/Editor/res/minus.ico b/Code/Editor/res/minus.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/minus.ico
rename to Code/Editor/res/minus.ico
diff --git a/Code/Sandbox/Editor/res/misc_bar.bmp b/Code/Editor/res/misc_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/misc_bar.bmp
rename to Code/Editor/res/misc_bar.bmp
diff --git a/Code/Sandbox/Editor/res/model_viewport_dock.bmp b/Code/Editor/res/model_viewport_dock.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/model_viewport_dock.bmp
rename to Code/Editor/res/model_viewport_dock.bmp
diff --git a/Code/Sandbox/Editor/res/model_viewport_fullscreen.bmp b/Code/Editor/res/model_viewport_fullscreen.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/model_viewport_fullscreen.bmp
rename to Code/Editor/res/model_viewport_fullscreen.bmp
diff --git a/Code/Sandbox/Editor/res/motion_b.bmp b/Code/Editor/res/motion_b.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/motion_b.bmp
rename to Code/Editor/res/motion_b.bmp
diff --git a/Code/Sandbox/Editor/res/musictree.bmp b/Code/Editor/res/musictree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/musictree.bmp
rename to Code/Editor/res/musictree.bmp
diff --git a/Code/Sandbox/Editor/res/nodrop.cur b/Code/Editor/res/nodrop.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/nodrop.cur
rename to Code/Editor/res/nodrop.cur
diff --git a/Code/Sandbox/Editor/res/o3de_editor.ico b/Code/Editor/res/o3de_editor.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/o3de_editor.ico
rename to Code/Editor/res/o3de_editor.ico
diff --git a/Code/Sandbox/Editor/res/object_move.cur b/Code/Editor/res/object_move.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/object_move.cur
rename to Code/Editor/res/object_move.cur
diff --git a/Code/Sandbox/Editor/res/object_rotate.cur b/Code/Editor/res/object_rotate.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/object_rotate.cur
rename to Code/Editor/res/object_rotate.cur
diff --git a/Code/Sandbox/Editor/res/object_scale.cur b/Code/Editor/res/object_scale.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/object_scale.cur
rename to Code/Editor/res/object_scale.cur
diff --git a/Code/Sandbox/Editor/res/objectsbrowser.bmp b/Code/Editor/res/objectsbrowser.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/objectsbrowser.bmp
rename to Code/Editor/res/objectsbrowser.bmp
diff --git a/Code/Sandbox/Editor/res/pakmanager_file.png b/Code/Editor/res/pakmanager_file.png
similarity index 100%
rename from Code/Sandbox/Editor/res/pakmanager_file.png
rename to Code/Editor/res/pakmanager_file.png
diff --git a/Code/Sandbox/Editor/res/pakmanager_folder.png b/Code/Editor/res/pakmanager_folder.png
similarity index 100%
rename from Code/Sandbox/Editor/res/pakmanager_folder.png
rename to Code/Editor/res/pakmanager_folder.png
diff --git a/Code/Sandbox/Editor/res/panel_ve.bmp b/Code/Editor/res/panel_ve.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_ve.bmp
rename to Code/Editor/res/panel_ve.bmp
diff --git a/Code/Sandbox/Editor/res/panel_veg.bmp b/Code/Editor/res/panel_veg.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_veg.bmp
rename to Code/Editor/res/panel_veg.bmp
diff --git a/Code/Sandbox/Editor/res/panel_veg2.bmp b/Code/Editor/res/panel_veg2.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_veg2.bmp
rename to Code/Editor/res/panel_veg2.bmp
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-00.png b/Code/Editor/res/panel_vegetation-00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-00.png
rename to Code/Editor/res/panel_vegetation-00.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-01.png b/Code/Editor/res/panel_vegetation-01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-01.png
rename to Code/Editor/res/panel_vegetation-01.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-02.png b/Code/Editor/res/panel_vegetation-02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-02.png
rename to Code/Editor/res/panel_vegetation-02.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-03.png b/Code/Editor/res/panel_vegetation-03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-03.png
rename to Code/Editor/res/panel_vegetation-03.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-04.png b/Code/Editor/res/panel_vegetation-04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-04.png
rename to Code/Editor/res/panel_vegetation-04.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-05.png b/Code/Editor/res/panel_vegetation-05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-05.png
rename to Code/Editor/res/panel_vegetation-05.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-00.png b/Code/Editor/res/panel_vegetation_2-00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-00.png
rename to Code/Editor/res/panel_vegetation_2-00.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-01.png b/Code/Editor/res/panel_vegetation_2-01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-01.png
rename to Code/Editor/res/panel_vegetation_2-01.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-02.png b/Code/Editor/res/panel_vegetation_2-02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-02.png
rename to Code/Editor/res/panel_vegetation_2-02.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-03.png b/Code/Editor/res/panel_vegetation_2-03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-03.png
rename to Code/Editor/res/panel_vegetation_2-03.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-04.png b/Code/Editor/res/panel_vegetation_2-04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-04.png
rename to Code/Editor/res/panel_vegetation_2-04.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-05.png b/Code/Editor/res/panel_vegetation_2-05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-05.png
rename to Code/Editor/res/panel_vegetation_2-05.png
diff --git a/Code/Sandbox/Editor/res/particles_tree.bmp b/Code/Editor/res/particles_tree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/particles_tree.bmp
rename to Code/Editor/res/particles_tree.bmp
diff --git a/Code/Sandbox/Editor/res/particlesbar.bmp b/Code/Editor/res/particlesbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/particlesbar.bmp
rename to Code/Editor/res/particlesbar.bmp
diff --git a/Code/Sandbox/Editor/res/pick.bmp b/Code/Editor/res/pick.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/pick.bmp
rename to Code/Editor/res/pick.bmp
diff --git a/Code/Sandbox/Editor/res/pick_cursor.cur b/Code/Editor/res/pick_cursor.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pick_cursor.cur
rename to Code/Editor/res/pick_cursor.cur
diff --git a/Code/Sandbox/Editor/res/plus.ico b/Code/Editor/res/plus.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/plus.ico
rename to Code/Editor/res/plus.ico
diff --git a/Code/Sandbox/Editor/res/pointerDragItem.cur b/Code/Editor/res/pointerDragItem.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointerDragItem.cur
rename to Code/Editor/res/pointerDragItem.cur
diff --git a/Code/Sandbox/Editor/res/pointerHit.cur b/Code/Editor/res/pointerHit.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointerHit.cur
rename to Code/Editor/res/pointerHit.cur
diff --git a/Code/Sandbox/Editor/res/pointer_.cur b/Code/Editor/res/pointer_.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_.cur
rename to Code/Editor/res/pointer_.cur
diff --git a/Code/Sandbox/Editor/res/pointer_flatten.cur b/Code/Editor/res/pointer_flatten.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_flatten.cur
rename to Code/Editor/res/pointer_flatten.cur
diff --git a/Code/Sandbox/Editor/res/pointer_getheight.cur b/Code/Editor/res/pointer_getheight.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_getheight.cur
rename to Code/Editor/res/pointer_getheight.cur
diff --git a/Code/Sandbox/Editor/res/pointer_link.cur b/Code/Editor/res/pointer_link.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_link.cur
rename to Code/Editor/res/pointer_link.cur
diff --git a/Code/Sandbox/Editor/res/pointer_linknow.cur b/Code/Editor/res/pointer_linknow.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_linknow.cur
rename to Code/Editor/res/pointer_linknow.cur
diff --git a/Code/Sandbox/Editor/res/pointer_minus.cur b/Code/Editor/res/pointer_minus.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_minus.cur
rename to Code/Editor/res/pointer_minus.cur
diff --git a/Code/Sandbox/Editor/res/pointer_plus.cur b/Code/Editor/res/pointer_plus.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_plus.cur
rename to Code/Editor/res/pointer_plus.cur
diff --git a/Code/Sandbox/Editor/res/pointer_smooth.cur b/Code/Editor/res/pointer_smooth.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_smooth.cur
rename to Code/Editor/res/pointer_smooth.cur
diff --git a/Code/Sandbox/Editor/res/pointer_so_sel_plus.cur b/Code/Editor/res/pointer_so_sel_plus.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_so_sel_plus.cur
rename to Code/Editor/res/pointer_so_sel_plus.cur
diff --git a/Code/Sandbox/Editor/res/pointer_so_select.cur b/Code/Editor/res/pointer_so_select.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_so_select.cur
rename to Code/Editor/res/pointer_so_select.cur
diff --git a/Code/Sandbox/Editor/res/proceduralmaterial_toolbar.bmp b/Code/Editor/res/proceduralmaterial_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/proceduralmaterial_toolbar.bmp
rename to Code/Editor/res/proceduralmaterial_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_end.bmp b/Code/Editor/res/progslider_end.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_end.bmp
rename to Code/Editor/res/progslider_end.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_marker.bmp b/Code/Editor/res/progslider_marker.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_marker.bmp
rename to Code/Editor/res/progslider_marker.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_start.bmp b/Code/Editor/res/progslider_start.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_start.bmp
rename to Code/Editor/res/progslider_start.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_thumb.bmp b/Code/Editor/res/progslider_thumb.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_thumb.bmp
rename to Code/Editor/res/progslider_thumb.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_track.bmp b/Code/Editor/res/progslider_track.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_track.bmp
rename to Code/Editor/res/progslider_track.bmp
diff --git a/Code/Sandbox/Editor/res/properties.bmp b/Code/Editor/res/properties.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/properties.bmp
rename to Code/Editor/res/properties.bmp
diff --git a/Code/Sandbox/Editor/res/psd.ico b/Code/Editor/res/psd.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/psd.ico
rename to Code/Editor/res/psd.ico
diff --git a/Code/Sandbox/Editor/res/remove.png b/Code/Editor/res/remove.png
similarity index 100%
rename from Code/Sandbox/Editor/res/remove.png
rename to Code/Editor/res/remove.png
diff --git a/Code/Sandbox/Editor/res/rename.ico b/Code/Editor/res/rename.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/rename.ico
rename to Code/Editor/res/rename.ico
diff --git a/Code/Sandbox/Editor/res/replace.ico b/Code/Editor/res/replace.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/replace.ico
rename to Code/Editor/res/replace.ico
diff --git a/Code/Sandbox/Editor/res/ribbon_system_button.png b/Code/Editor/res/ribbon_system_button.png
similarity index 100%
rename from Code/Sandbox/Editor/res/ribbon_system_button.png
rename to Code/Editor/res/ribbon_system_button.png
diff --git a/Code/Sandbox/Editor/res/sandbox_dark.bmp b/Code/Editor/res/sandbox_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sandbox_dark.bmp
rename to Code/Editor/res/sandbox_dark.bmp
diff --git a/Code/Sandbox/Editor/res/sb_welcome_dark.bmp b/Code/Editor/res/sb_welcome_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sb_welcome_dark.bmp
rename to Code/Editor/res/sb_welcome_dark.bmp
diff --git a/Code/Sandbox/Editor/res/selectobj.bmp b/Code/Editor/res/selectobj.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/selectobj.bmp
rename to Code/Editor/res/selectobj.bmp
diff --git a/Code/Sandbox/Editor/res/seq_1_colour_keys.bmp b/Code/Editor/res/seq_1_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_1_colour_keys.bmp
rename to Code/Editor/res/seq_1_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_2_colour_keys.bmp b/Code/Editor/res/seq_2_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_2_colour_keys.bmp
rename to Code/Editor/res/seq_2_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_3_colour_keys.bmp b/Code/Editor/res/seq_3_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_3_colour_keys.bmp
rename to Code/Editor/res/seq_3_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_4_colour_keys.bmp b/Code/Editor/res/seq_4_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_4_colour_keys.bmp
rename to Code/Editor/res/seq_4_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_5_colour_keys.bmp b/Code/Editor/res/seq_5_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_5_colour_keys.bmp
rename to Code/Editor/res/seq_5_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_6_colour_keys.bmp b/Code/Editor/res/seq_6_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_6_colour_keys.bmp
rename to Code/Editor/res/seq_6_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_7_colour_keys.bmp b/Code/Editor/res/seq_7_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_7_colour_keys.bmp
rename to Code/Editor/res/seq_7_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/sequencer_keys.bmp b/Code/Editor/res/sequencer_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sequencer_keys.bmp
rename to Code/Editor/res/sequencer_keys.bmp
diff --git a/Code/Sandbox/Editor/res/sequencer_nodes.bmp b/Code/Editor/res/sequencer_nodes.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sequencer_nodes.bmp
rename to Code/Editor/res/sequencer_nodes.bmp
diff --git a/Code/Sandbox/Editor/res/soundfiles.bmp b/Code/Editor/res/soundfiles.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/soundfiles.bmp
rename to Code/Editor/res/soundfiles.bmp
diff --git a/Code/Sandbox/Editor/res/soundmood.bmp b/Code/Editor/res/soundmood.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/soundmood.bmp
rename to Code/Editor/res/soundmood.bmp
diff --git a/Code/Sandbox/Editor/res/soundpre.bmp b/Code/Editor/res/soundpre.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/soundpre.bmp
rename to Code/Editor/res/soundpre.bmp
diff --git a/Code/Sandbox/Editor/res/source_control-not_setup.svg b/Code/Editor/res/source_control-not_setup.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control-not_setup.svg
rename to Code/Editor/res/source_control-not_setup.svg
diff --git a/Code/Sandbox/Editor/res/source_control-warning_v2.svg b/Code/Editor/res/source_control-warning_v2.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control-warning_v2.svg
rename to Code/Editor/res/source_control-warning_v2.svg
diff --git a/Code/Sandbox/Editor/res/source_control_buttons.bmp b/Code/Editor/res/source_control_buttons.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control_buttons.bmp
rename to Code/Editor/res/source_control_buttons.bmp
diff --git a/Code/Sandbox/Editor/res/source_control_connected.svg b/Code/Editor/res/source_control_connected.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control_connected.svg
rename to Code/Editor/res/source_control_connected.svg
diff --git a/Code/Sandbox/Editor/res/source_control_error_v2.svg b/Code/Editor/res/source_control_error_v2.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control_error_v2.svg
rename to Code/Editor/res/source_control_error_v2.svg
diff --git a/Code/Sandbox/Editor/res/spline_edit_bar.bmp b/Code/Editor/res/spline_edit_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/spline_edit_bar.bmp
rename to Code/Editor/res/spline_edit_bar.bmp
diff --git a/Code/Sandbox/Editor/res/splineextrabar.bmp b/Code/Editor/res/splineextrabar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/splineextrabar.bmp
rename to Code/Editor/res/splineextrabar.bmp
diff --git a/Code/Sandbox/Editor/res/status_mem_low1.ico b/Code/Editor/res/status_mem_low1.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/status_mem_low1.ico
rename to Code/Editor/res/status_mem_low1.ico
diff --git a/Code/Sandbox/Editor/res/status_mem_low2.ico b/Code/Editor/res/status_mem_low2.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/status_mem_low2.ico
rename to Code/Editor/res/status_mem_low2.ico
diff --git a/Code/Sandbox/Editor/res/status_mem_ok.ico b/Code/Editor/res/status_mem_ok.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/status_mem_ok.ico
rename to Code/Editor/res/status_mem_ok.ico
diff --git a/Code/Sandbox/Editor/res/stdviews.bmp b/Code/Editor/res/stdviews.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/stdviews.bmp
rename to Code/Editor/res/stdviews.bmp
diff --git a/Code/Sandbox/Editor/res/subobjseltype.bmp b/Code/Editor/res/subobjseltype.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/subobjseltype.bmp
rename to Code/Editor/res/subobjseltype.bmp
diff --git a/Code/Sandbox/Editor/res/sw_mapbar.bmp b/Code/Editor/res/sw_mapbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sw_mapbar.bmp
rename to Code/Editor/res/sw_mapbar.bmp
diff --git a/Code/Sandbox/Editor/res/sw_toolbar.bmp b/Code/Editor/res/sw_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sw_toolbar.bmp
rename to Code/Editor/res/sw_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/tabPanel.bmp b/Code/Editor/res/tabPanel.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/tabPanel.bmp
rename to Code/Editor/res/tabPanel.bmp
diff --git a/Code/Sandbox/Editor/res/tiff.ico b/Code/Editor/res/tiff.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/tiff.ico
rename to Code/Editor/res/tiff.ico
diff --git a/Code/Sandbox/Editor/res/toolbar1.bmp b/Code/Editor/res/toolbar1.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/toolbar1.bmp
rename to Code/Editor/res/toolbar1.bmp
diff --git a/Code/Sandbox/Editor/res/toolbar2.bmp b/Code/Editor/res/toolbar2.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/toolbar2.bmp
rename to Code/Editor/res/toolbar2.bmp
diff --git a/Code/Sandbox/Editor/res/toolbox.bmp b/Code/Editor/res/toolbox.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/toolbox.bmp
rename to Code/Editor/res/toolbox.bmp
diff --git a/Code/Sandbox/Editor/res/trackvie.bmp b/Code/Editor/res/trackvie.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackvie.bmp
rename to Code/Editor/res/trackvie.bmp
diff --git a/Code/Sandbox/Editor/res/trackview.bmp b/Code/Editor/res/trackview.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview.bmp
rename to Code/Editor/res/trackview.bmp
diff --git a/Code/Sandbox/Editor/res/trackview1.bmp b/Code/Editor/res/trackview1.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview1.bmp
rename to Code/Editor/res/trackview1.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_key.bmp b/Code/Editor/res/trackview_key.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_key.bmp
rename to Code/Editor/res/trackview_key.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_keys.bmp b/Code/Editor/res/trackview_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_keys.bmp
rename to Code/Editor/res/trackview_keys.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_nodes.bmp b/Code/Editor/res/trackview_nodes.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_nodes.bmp
rename to Code/Editor/res/trackview_nodes.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_play.bmp b/Code/Editor/res/trackview_play.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_play.bmp
rename to Code/Editor/res/trackview_play.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_view.bmp b/Code/Editor/res/trackview_view.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_view.bmp
rename to Code/Editor/res/trackview_view.bmp
diff --git a/Code/Sandbox/Editor/res/tree_vie.bmp b/Code/Editor/res/tree_vie.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/tree_vie.bmp
rename to Code/Editor/res/tree_vie.bmp
diff --git a/Code/Sandbox/Editor/res/tree_view_folder.png b/Code/Editor/res/tree_view_folder.png
similarity index 100%
rename from Code/Sandbox/Editor/res/tree_view_folder.png
rename to Code/Editor/res/tree_view_folder.png
diff --git a/Code/Sandbox/Editor/res/tree_view_level.png b/Code/Editor/res/tree_view_level.png
similarity index 100%
rename from Code/Sandbox/Editor/res/tree_view_level.png
rename to Code/Editor/res/tree_view_level.png
diff --git a/Code/Sandbox/Editor/res/uieditor_main.bmp b/Code/Editor/res/uieditor_main.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/uieditor_main.bmp
rename to Code/Editor/res/uieditor_main.bmp
diff --git a/Code/Sandbox/Editor/res/unlocked.svg b/Code/Editor/res/unlocked.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/unlocked.svg
rename to Code/Editor/res/unlocked.svg
diff --git a/Code/Sandbox/Editor/res/up_arrow.ico b/Code/Editor/res/up_arrow.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/up_arrow.ico
rename to Code/Editor/res/up_arrow.ico
diff --git a/Code/Sandbox/Editor/res/value_types.bmp b/Code/Editor/res/value_types.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/value_types.bmp
rename to Code/Editor/res/value_types.bmp
diff --git a/Code/Sandbox/Editor/res/veed_tree.bmp b/Code/Editor/res/veed_tree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/veed_tree.bmp
rename to Code/Editor/res/veed_tree.bmp
diff --git a/Code/Sandbox/Editor/res/vegetati.bmp b/Code/Editor/res/vegetati.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/vegetati.bmp
rename to Code/Editor/res/vegetati.bmp
diff --git a/Code/Sandbox/Editor/res/vegtree.bmp b/Code/Editor/res/vegtree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/vegtree.bmp
rename to Code/Editor/res/vegtree.bmp
diff --git a/Code/Sandbox/Editor/res/video_record.ico b/Code/Editor/res/video_record.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/video_record.ico
rename to Code/Editor/res/video_record.ico
diff --git a/Code/Sandbox/Editor/res/vis_circle_default.svg b/Code/Editor/res/vis_circle_default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/vis_circle_default.svg
rename to Code/Editor/res/vis_circle_default.svg
diff --git a/Code/Sandbox/Editor/res/vis_circle_transparent.svg b/Code/Editor/res/vis_circle_transparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/vis_circle_transparent.svg
rename to Code/Editor/res/vis_circle_transparent.svg
diff --git a/Code/Sandbox/Editor/res/vis_on_NotTransparent.svg b/Code/Editor/res/vis_on_NotTransparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/vis_on_NotTransparent.svg
rename to Code/Editor/res/vis_on_NotTransparent.svg
diff --git a/Code/Sandbox/Editor/res/vis_on_transparent.svg b/Code/Editor/res/vis_on_transparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/vis_on_transparent.svg
rename to Code/Editor/res/vis_on_transparent.svg
diff --git a/Code/Sandbox/Editor/res/visb.svg b/Code/Editor/res/visb.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/visb.svg
rename to Code/Editor/res/visb.svg
diff --git a/Code/Sandbox/Editor/res/visb_hidden.svg b/Code/Editor/res/visb_hidden.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/visb_hidden.svg
rename to Code/Editor/res/visb_hidden.svg
diff --git a/Code/Sandbox/Editor/res/warning16x16.ico b/Code/Editor/res/warning16x16.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/warning16x16.ico
rename to Code/Editor/res/warning16x16.ico
diff --git a/Code/Sandbox/Editor/res/water.bmp b/Code/Editor/res/water.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/water.bmp
rename to Code/Editor/res/water.bmp
diff --git a/Code/Sandbox/Editor/res/work_in_progress_icon.ico b/Code/Editor/res/work_in_progress_icon.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/work_in_progress_icon.ico
rename to Code/Editor/res/work_in_progress_icon.ico
diff --git a/Code/Sandbox/Editor/res/work_in_progress_icon.png b/Code/Editor/res/work_in_progress_icon.png
similarity index 100%
rename from Code/Sandbox/Editor/res/work_in_progress_icon.png
rename to Code/Editor/res/work_in_progress_icon.png
diff --git a/Code/Editor/splashscreen_background_gradient.jpg b/Code/Editor/splashscreen_background_gradient.jpg
new file mode 100644
index 0000000000..e4894dd3be
--- /dev/null
+++ b/Code/Editor/splashscreen_background_gradient.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2f54f31e63dc9f0c9ed7847745a929ba501ed21841f7ee6a5de9e25768fd05e
+size 53310
diff --git a/Code/Sandbox/Editor/water.png b/Code/Editor/water.png
similarity index 100%
rename from Code/Sandbox/Editor/water.png
rename to Code/Editor/water.png
diff --git a/Code/Framework/AtomCore/AtomCore/Instance/Instance.h b/Code/Framework/AtomCore/AtomCore/Instance/Instance.h
index d334b9fd2d..562c980e6f 100644
--- a/Code/Framework/AtomCore/AtomCore/Instance/Instance.h
+++ b/Code/Framework/AtomCore/AtomCore/Instance/Instance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/Instance/InstanceData.cpp b/Code/Framework/AtomCore/AtomCore/Instance/InstanceData.cpp
index 4492581b2d..aec220b92d 100644
--- a/Code/Framework/AtomCore/AtomCore/Instance/InstanceData.cpp
+++ b/Code/Framework/AtomCore/AtomCore/Instance/InstanceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/Instance/InstanceData.h b/Code/Framework/AtomCore/AtomCore/Instance/InstanceData.h
index 0f039a64f4..d9dc49f97f 100644
--- a/Code/Framework/AtomCore/AtomCore/Instance/InstanceData.h
+++ b/Code/Framework/AtomCore/AtomCore/Instance/InstanceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/Instance/InstanceDatabase.h b/Code/Framework/AtomCore/AtomCore/Instance/InstanceDatabase.h
index 130dfa2954..4639a22fe9 100644
--- a/Code/Framework/AtomCore/AtomCore/Instance/InstanceDatabase.h
+++ b/Code/Framework/AtomCore/AtomCore/Instance/InstanceDatabase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/Instance/InstanceId.cpp b/Code/Framework/AtomCore/AtomCore/Instance/InstanceId.cpp
index 3e319f792d..f875e0022e 100644
--- a/Code/Framework/AtomCore/AtomCore/Instance/InstanceId.cpp
+++ b/Code/Framework/AtomCore/AtomCore/Instance/InstanceId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/Instance/InstanceId.h b/Code/Framework/AtomCore/AtomCore/Instance/InstanceId.h
index 3a15ea9d29..047f3490ef 100644
--- a/Code/Framework/AtomCore/AtomCore/Instance/InstanceId.h
+++ b/Code/Framework/AtomCore/AtomCore/Instance/InstanceId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/Serialization/Json/JsonUtils.cpp b/Code/Framework/AtomCore/AtomCore/Serialization/Json/JsonUtils.cpp
index e31497854b..3d47d6b74e 100644
--- a/Code/Framework/AtomCore/AtomCore/Serialization/Json/JsonUtils.cpp
+++ b/Code/Framework/AtomCore/AtomCore/Serialization/Json/JsonUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/Serialization/Json/JsonUtils.h b/Code/Framework/AtomCore/AtomCore/Serialization/Json/JsonUtils.h
index d37e5ad0b5..3ba7a69190 100644
--- a/Code/Framework/AtomCore/AtomCore/Serialization/Json/JsonUtils.h
+++ b/Code/Framework/AtomCore/AtomCore/Serialization/Json/JsonUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/atomcore_files.cmake b/Code/Framework/AtomCore/AtomCore/atomcore_files.cmake
index 01c68d1668..11278a4c56 100644
--- a/Code/Framework/AtomCore/AtomCore/atomcore_files.cmake
+++ b/Code/Framework/AtomCore/AtomCore/atomcore_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AtomCore/AtomCore/std/containers/array_view.h b/Code/Framework/AtomCore/AtomCore/std/containers/array_view.h
index b7654d79b3..8bfcb6d423 100644
--- a/Code/Framework/AtomCore/AtomCore/std/containers/array_view.h
+++ b/Code/Framework/AtomCore/AtomCore/std/containers/array_view.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/std/containers/fixed_vector_set.h b/Code/Framework/AtomCore/AtomCore/std/containers/fixed_vector_set.h
index 4c84847c3b..88e47a0e65 100644
--- a/Code/Framework/AtomCore/AtomCore/std/containers/fixed_vector_set.h
+++ b/Code/Framework/AtomCore/AtomCore/std/containers/fixed_vector_set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/std/containers/lru_cache.h b/Code/Framework/AtomCore/AtomCore/std/containers/lru_cache.h
index 5c3e727515..a8394d6142 100644
--- a/Code/Framework/AtomCore/AtomCore/std/containers/lru_cache.h
+++ b/Code/Framework/AtomCore/AtomCore/std/containers/lru_cache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/std/containers/vector_set.h b/Code/Framework/AtomCore/AtomCore/std/containers/vector_set.h
index a37f85254f..0759c9e9ff 100644
--- a/Code/Framework/AtomCore/AtomCore/std/containers/vector_set.h
+++ b/Code/Framework/AtomCore/AtomCore/std/containers/vector_set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/std/containers/vector_set_base.h b/Code/Framework/AtomCore/AtomCore/std/containers/vector_set_base.h
index 9144a4fb92..d276460c87 100644
--- a/Code/Framework/AtomCore/AtomCore/std/containers/vector_set_base.h
+++ b/Code/Framework/AtomCore/AtomCore/std/containers/vector_set_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/AtomCore/std/parallel/concurrency_checker.h b/Code/Framework/AtomCore/AtomCore/std/parallel/concurrency_checker.h
index a6727fa649..1697c4a333 100644
--- a/Code/Framework/AtomCore/AtomCore/std/parallel/concurrency_checker.h
+++ b/Code/Framework/AtomCore/AtomCore/std/parallel/concurrency_checker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/CMakeLists.txt b/Code/Framework/AtomCore/CMakeLists.txt
index a116cc665a..31fd938096 100644
--- a/Code/Framework/AtomCore/CMakeLists.txt
+++ b/Code/Framework/AtomCore/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AtomCore/Tests/ArrayView.cpp b/Code/Framework/AtomCore/Tests/ArrayView.cpp
index a1004d58cc..81a9ba770d 100644
--- a/Code/Framework/AtomCore/Tests/ArrayView.cpp
+++ b/Code/Framework/AtomCore/Tests/ArrayView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/Tests/ConcurrencyCheckerTests.cpp b/Code/Framework/AtomCore/Tests/ConcurrencyCheckerTests.cpp
index a7a5f8f73c..3a8f1f1c1e 100644
--- a/Code/Framework/AtomCore/Tests/ConcurrencyCheckerTests.cpp
+++ b/Code/Framework/AtomCore/Tests/ConcurrencyCheckerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/Tests/InstanceDatabase.cpp b/Code/Framework/AtomCore/Tests/InstanceDatabase.cpp
index 64a7da7258..62d144a585 100644
--- a/Code/Framework/AtomCore/Tests/InstanceDatabase.cpp
+++ b/Code/Framework/AtomCore/Tests/InstanceDatabase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/Tests/JsonSerializationUtilsTests.cpp b/Code/Framework/AtomCore/Tests/JsonSerializationUtilsTests.cpp
index 5d5461034f..08b5820fba 100644
--- a/Code/Framework/AtomCore/Tests/JsonSerializationUtilsTests.cpp
+++ b/Code/Framework/AtomCore/Tests/JsonSerializationUtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/Tests/Main.cpp b/Code/Framework/AtomCore/Tests/Main.cpp
index 8d9cdcd71d..25c9fe11e2 100644
--- a/Code/Framework/AtomCore/Tests/Main.cpp
+++ b/Code/Framework/AtomCore/Tests/Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/Tests/NameSetTests.cpp b/Code/Framework/AtomCore/Tests/NameSetTests.cpp
index c3e1713740..f69d7f3085 100644
--- a/Code/Framework/AtomCore/Tests/NameSetTests.cpp
+++ b/Code/Framework/AtomCore/Tests/NameSetTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/Tests/atomcore_tests_files.cmake b/Code/Framework/AtomCore/Tests/atomcore_tests_files.cmake
index 28c6fc17b6..5e6c9e2d3a 100644
--- a/Code/Framework/AtomCore/Tests/atomcore_tests_files.cmake
+++ b/Code/Framework/AtomCore/Tests/atomcore_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AtomCore/Tests/lru_cache.cpp b/Code/Framework/AtomCore/Tests/lru_cache.cpp
index ef9e42d3d8..acf587fd3e 100644
--- a/Code/Framework/AtomCore/Tests/lru_cache.cpp
+++ b/Code/Framework/AtomCore/Tests/lru_cache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AtomCore/Tests/vector_set.cpp b/Code/Framework/AtomCore/Tests/vector_set.cpp
index 246bac55e4..c9e0c6d9b4 100644
--- a/Code/Framework/AtomCore/Tests/vector_set.cpp
+++ b/Code/Framework/AtomCore/Tests/vector_set.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/ActivityResultsListener.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/ActivityResultsListener.java
index 8c8b514379..576f5b7eb5 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/ActivityResultsListener.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/ActivityResultsListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/AndroidDeviceManager.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/AndroidDeviceManager.java
index d2850c8643..266154270c 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/AndroidDeviceManager.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/AndroidDeviceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java
index 02a5b7ecf1..a64cf02da6 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/NativeUI/LumberyardNativeUI.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/NativeUI/LumberyardNativeUI.java
index 37179aa1c7..d49e351dc5 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/NativeUI/LumberyardNativeUI.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/NativeUI/LumberyardNativeUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/KeyboardHandler.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/KeyboardHandler.java
index b12d144527..09ec06b17b 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/KeyboardHandler.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/KeyboardHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/MotionSensorManager.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/MotionSensorManager.java
index 2190ad421c..5bdc32bee4 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/MotionSensorManager.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/MotionSensorManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/MouseDevice.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/MouseDevice.java
index d590dafcbe..9c8d1d6018 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/MouseDevice.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/input/MouseDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/APKHandler.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/APKHandler.java
index 4b24f259d9..01883aea25 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/APKHandler.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/APKHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderActivity.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderActivity.java
index 292eaff7b7..9316d24d6f 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderActivity.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderAlarmReceiver.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderAlarmReceiver.java
index 25c0a3c06d..641b1fbba7 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderAlarmReceiver.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderAlarmReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderService.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderService.java
index 86baeb0bf0..a3fd799547 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderService.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/io/obb/ObbDownloaderService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAndroid/java/com/amazon/test/SimpleObject.java b/Code/Framework/AzAndroid/java/com/amazon/test/SimpleObject.java
index 14667731b1..c77e3519a1 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/test/SimpleObject.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/test/SimpleObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzAutoGen/AzAutoGen.py b/Code/Framework/AzAutoGen/AzAutoGen.py
index 5266dc7b3f..b97552d091 100755
--- a/Code/Framework/AzAutoGen/AzAutoGen.py
+++ b/Code/Framework/AzAutoGen/AzAutoGen.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 
@@ -164,7 +164,7 @@ def ProcessTemplateConversion(dataInputSet, dataInputFiles, templateFile, output
             outputExtension = os.path.splitext(outputFile)[1]
             if outputExtension == ".xml" or outputExtension == ".xhtml" or outputExtension == ".xsd":
                 compareFD.write('<?xml version="1.0"?>\n')
-                compareFD.write('<!-- Copyright (c) Contributors to the Open 3D Engine Project.                 -->\n')
+                compareFD.write('<!-- 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..                 -->\n')
                 compareFD.write('\n')
                 compareFD.write('<!-- SPDX-License-Identifier: Apache-2.0 OR MIT                                -->\n')
                 compareFD.write('\n')
@@ -172,7 +172,7 @@ def ProcessTemplateConversion(dataInputSet, dataInputFiles, templateFile, output
                 compareFD.write('<!-- Template Source {0}; XML Sources {1}-->\n'.format(templateFile, ', '.join(dataInputFiles)))
                 compareFD.write('\n')
             elif outputExtension == ".lua":
-                compareFD.write('-- Copyright (c) Contributors to the Open 3D Engine Project.\n')
+                compareFD.write('-- 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..\n')
                 compareFD.write('\n')
                 compareFD.write('-- SPDX-License-Identifier: Apache-2.0 OR MIT\n')
                 compareFD.write('\n')
@@ -181,7 +181,7 @@ def ProcessTemplateConversion(dataInputSet, dataInputFiles, templateFile, output
                 compareFD.write('\n')
             elif outputExtension == ".h" or outputExtension == ".hpp" or outputExtension == ".inl" or outputExtension == ".c" or outputExtension == ".cpp":
                 compareFD.write('/*\n')
-                compareFD.write(' * Copyright (c) Contributors to the Open 3D Engine Project.\n')
+                compareFD.write(' * 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..\n')
                 compareFD.write(' *\n')
                 compareFD.write(' * SPDX-License-Identifier: Apache-2.0 OR MIT\n')
                 compareFD.write(' *\n')
diff --git a/Code/Framework/AzAutoGen/CMakeLists.txt b/Code/Framework/AzAutoGen/CMakeLists.txt
index 7eacafd22b..0251d1c448 100644
--- a/Code/Framework/AzAutoGen/CMakeLists.txt
+++ b/Code/Framework/AzAutoGen/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzAutoGen/azautogen_files.cmake b/Code/Framework/AzAutoGen/azautogen_files.cmake
index 2ea26ae7d7..c16a7a51f3 100644
--- a/Code/Framework/AzAutoGen/azautogen_files.cmake
+++ b/Code/Framework/AzAutoGen/azautogen_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/AzCore/Android/APKFileHandler.cpp b/Code/Framework/AzCore/AzCore/Android/APKFileHandler.cpp
index 621b826316..6dbf4ad2d8 100644
--- a/Code/Framework/AzCore/AzCore/Android/APKFileHandler.cpp
+++ b/Code/Framework/AzCore/AzCore/Android/APKFileHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/APKFileHandler.h b/Code/Framework/AzCore/AzCore/Android/APKFileHandler.h
index 2b623cae1e..ff460cc9cc 100644
--- a/Code/Framework/AzCore/AzCore/Android/APKFileHandler.h
+++ b/Code/Framework/AzCore/AzCore/Android/APKFileHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/AndroidEnv.cpp b/Code/Framework/AzCore/AzCore/Android/AndroidEnv.cpp
index 6eb0ec77dc..d0fe19cace 100644
--- a/Code/Framework/AzCore/AzCore/Android/AndroidEnv.cpp
+++ b/Code/Framework/AzCore/AzCore/Android/AndroidEnv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h b/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h
index 24b3e93b99..2a962a9c95 100644
--- a/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h
+++ b/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/ApiLevel.h b/Code/Framework/AzCore/AzCore/Android/ApiLevel.h
index 7c056c7f0e..200833e1aa 100644
--- a/Code/Framework/AzCore/AzCore/Android/ApiLevel.h
+++ b/Code/Framework/AzCore/AzCore/Android/ApiLevel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/Internal/ClassName.h b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/ClassName.h
index ce8af36e9c..7d67072000 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/ClassName.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/ClassName.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils.h b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils.h
index 64c59575ad..0a7fb7853d 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils_impl.h b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils_impl.h
index 4ef7ae528a..9cae0172a8 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils_impl.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/JStringUtils_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Object_impl.h b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Object_impl.h
index 3ed5cc545f..e1e7518f43 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Object_impl.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Object_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Signature_impl.h b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Signature_impl.h
index 3ae5014ad8..e6846abf96 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Signature_impl.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/Internal/Signature_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/JNI.cpp b/Code/Framework/AzCore/AzCore/Android/JNI/JNI.cpp
index 07fa1e005a..302e95463f 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/JNI.cpp
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/JNI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/JNI.h b/Code/Framework/AzCore/AzCore/Android/JNI/JNI.h
index a53ff8736c..c125c5af21 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/JNI.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/JNI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/Object.h b/Code/Framework/AzCore/AzCore/Android/JNI/Object.h
index 59597bbd76..4eacbc1869 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/Object.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/Object.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/Object_fwd.h b/Code/Framework/AzCore/AzCore/Android/JNI/Object_fwd.h
index 1c17cb3aaa..83b981728f 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/Object_fwd.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/Object_fwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/Signature.h b/Code/Framework/AzCore/AzCore/Android/JNI/Signature.h
index 05bf68b710..82b42c67e0 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/Signature.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/Signature.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/scoped_ref.h b/Code/Framework/AzCore/AzCore/Android/JNI/scoped_ref.h
index ce56457128..dc28c48725 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/scoped_ref.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/scoped_ref.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/JNI/shared_ref.h b/Code/Framework/AzCore/AzCore/Android/JNI/shared_ref.h
index df537e5d5b..dd2c80733f 100644
--- a/Code/Framework/AzCore/AzCore/Android/JNI/shared_ref.h
+++ b/Code/Framework/AzCore/AzCore/Android/JNI/shared_ref.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/Tests/JNI/Signature_tests.cpp b/Code/Framework/AzCore/AzCore/Android/Tests/JNI/Signature_tests.cpp
index e9baaf8acc..b958a1e894 100644
--- a/Code/Framework/AzCore/AzCore/Android/Tests/JNI/Signature_tests.cpp
+++ b/Code/Framework/AzCore/AzCore/Android/Tests/JNI/Signature_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/Tests/JNI/shared_ref_tests.cpp b/Code/Framework/AzCore/AzCore/Android/Tests/JNI/shared_ref_tests.cpp
index 5226efdba0..0aec779825 100644
--- a/Code/Framework/AzCore/AzCore/Android/Tests/JNI/shared_ref_tests.cpp
+++ b/Code/Framework/AzCore/AzCore/Android/Tests/JNI/shared_ref_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/Utils.cpp b/Code/Framework/AzCore/AzCore/Android/Utils.cpp
index 10ff4c0b1d..72f02ed925 100644
--- a/Code/Framework/AzCore/AzCore/Android/Utils.cpp
+++ b/Code/Framework/AzCore/AzCore/Android/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Android/Utils.h b/Code/Framework/AzCore/AzCore/Android/Utils.h
index ae9ffbe6e8..68ef0b1cad 100644
--- a/Code/Framework/AzCore/AzCore/Android/Utils.h
+++ b/Code/Framework/AzCore/AzCore/Android/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetCommon.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.cpp
index a727809339..27bbcbb9f0 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetCommon.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h
index 3c6ac21555..78b42fd9ef 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp
index 3a5c7b672c..7421fe995d 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h
index 2548460b02..de451a27ed 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetDataStream.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetDataStream.cpp
index 140fc02755..bce06db098 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetDataStream.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetDataStream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetDataStream.h b/Code/Framework/AzCore/AzCore/Asset/AssetDataStream.h
index d269eb629d..8fe5c5f266 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetDataStream.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetDataStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetInternal/WeakAsset.h b/Code/Framework/AzCore/AzCore/Asset/AssetInternal/WeakAsset.h
index 49f0c0d60c..d294def781 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetInternal/WeakAsset.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetInternal/WeakAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp
index 078def9ad6..dbc5394a19 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.h b/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.h
index 77ccbb51ea..ec7908e8ac 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
index 56ed6dd32b..df9a8aac77 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetManager.h b/Code/Framework/AzCore/AzCore/Asset/AssetManager.h
index 9eab332a62..2c24ff0756 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManager.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetManagerBus.h b/Code/Framework/AzCore/AzCore/Asset/AssetManagerBus.h
index 52a193f4c8..a5fd0f36f4 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManagerBus.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManagerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetManagerComponent.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetManagerComponent.cpp
index 2b710ee4b5..0cc02ac9ef 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManagerComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManagerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetManagerComponent.h b/Code/Framework/AzCore/AzCore/Asset/AssetManagerComponent.h
index 7599ed54c8..0a1ce2bf4a 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManagerComponent.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManagerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetManager_private.h b/Code/Framework/AzCore/AzCore/Asset/AssetManager_private.h
index 7b84eb77ca..42b57dd19c 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManager_private.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManager_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetSerializer.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetSerializer.cpp
index cd3f0a0a87..698710d5a0 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetSerializer.h b/Code/Framework/AzCore/AzCore/Asset/AssetSerializer.h
index e8e12f7964..8b5f586476 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Asset/AssetTypeInfoBus.h b/Code/Framework/AzCore/AzCore/Asset/AssetTypeInfoBus.h
index 65e4d37faf..2750071891 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetTypeInfoBus.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetTypeInfoBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/AzCoreModule.cpp b/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
index 2a1ec5213a..0614ca95e7 100644
--- a/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
+++ b/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/AzCoreModule.h b/Code/Framework/AzCore/AzCore/AzCoreModule.h
index 8efed6e2bb..04e0002e6a 100644
--- a/Code/Framework/AzCore/AzCore/AzCoreModule.h
+++ b/Code/Framework/AzCore/AzCore/AzCoreModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/BuildInfo.h b/Code/Framework/AzCore/AzCore/BuildInfo.h
index 0ea5470b2a..e048b97d0f 100644
--- a/Code/Framework/AzCore/AzCore/BuildInfo.h
+++ b/Code/Framework/AzCore/AzCore/BuildInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Casting/lossy_cast.h b/Code/Framework/AzCore/AzCore/Casting/lossy_cast.h
index e9cfa2b6b8..e15871c89d 100644
--- a/Code/Framework/AzCore/AzCore/Casting/lossy_cast.h
+++ b/Code/Framework/AzCore/AzCore/Casting/lossy_cast.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Casting/numeric_cast.h b/Code/Framework/AzCore/AzCore/Casting/numeric_cast.h
index 659d7ba246..313f34e7b9 100644
--- a/Code/Framework/AzCore/AzCore/Casting/numeric_cast.h
+++ b/Code/Framework/AzCore/AzCore/Casting/numeric_cast.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/Component.cpp b/Code/Framework/AzCore/AzCore/Component/Component.cpp
index 9f20d75fcd..a97d294548 100644
--- a/Code/Framework/AzCore/AzCore/Component/Component.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/Component.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/Component.h b/Code/Framework/AzCore/AzCore/Component/Component.h
index 23a44543c6..a323613e47 100644
--- a/Code/Framework/AzCore/AzCore/Component/Component.h
+++ b/Code/Framework/AzCore/AzCore/Component/Component.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
index 8be8fbcd25..4a14a37e10 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
index 3264cfcd92..91212372af 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/ComponentApplicationBus.h b/Code/Framework/AzCore/AzCore/Component/ComponentApplicationBus.h
index e1587ae7ff..041cf3690b 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplicationBus.h
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplicationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/ComponentBus.cpp b/Code/Framework/AzCore/AzCore/Component/ComponentBus.cpp
index 4d48179a3e..5e54007c83 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentBus.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/ComponentBus.h b/Code/Framework/AzCore/AzCore/Component/ComponentBus.h
index 82c2b82314..850ccbb567 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentBus.h
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/ComponentExport.h b/Code/Framework/AzCore/AzCore/Component/ComponentExport.h
index cc986a8eb1..de2b53d375 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentExport.h
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentExport.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/Entity.cpp b/Code/Framework/AzCore/AzCore/Component/Entity.cpp
index a6a7d4899d..c9b8c39f3e 100644
--- a/Code/Framework/AzCore/AzCore/Component/Entity.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/Entity.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/Entity.h b/Code/Framework/AzCore/AzCore/Component/Entity.h
index d874b21cea..182527a663 100644
--- a/Code/Framework/AzCore/AzCore/Component/Entity.h
+++ b/Code/Framework/AzCore/AzCore/Component/Entity.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/EntityBus.h b/Code/Framework/AzCore/AzCore/Component/EntityBus.h
index e2e5d07341..68c7a50446 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntityBus.h
+++ b/Code/Framework/AzCore/AzCore/Component/EntityBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/EntityId.h b/Code/Framework/AzCore/AzCore/Component/EntityId.h
index 495eab4a6f..5b6aae29bd 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntityId.h
+++ b/Code/Framework/AzCore/AzCore/Component/EntityId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.cpp b/Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.cpp
index 3a6b0cc941..88eb487f92 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.h b/Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.h
index 39eb9cc4fa..ccb12d3edd 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/EntitySerializer.cpp b/Code/Framework/AzCore/AzCore/Component/EntitySerializer.cpp
index d328875f7f..b4e919a0d8 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntitySerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/EntitySerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/EntitySerializer.h b/Code/Framework/AzCore/AzCore/Component/EntitySerializer.h
index 4c8384dec6..de1f2885c8 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntitySerializer.h
+++ b/Code/Framework/AzCore/AzCore/Component/EntitySerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/EntityUtils.cpp b/Code/Framework/AzCore/AzCore/Component/EntityUtils.cpp
index 63979f3191..4452029397 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntityUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/EntityUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/EntityUtils.h b/Code/Framework/AzCore/AzCore/Component/EntityUtils.h
index e497fcb234..b224f07845 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntityUtils.h
+++ b/Code/Framework/AzCore/AzCore/Component/EntityUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/NamedEntityId.cpp b/Code/Framework/AzCore/AzCore/Component/NamedEntityId.cpp
index d13366975b..d617df4d1d 100644
--- a/Code/Framework/AzCore/AzCore/Component/NamedEntityId.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/NamedEntityId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/NamedEntityId.h b/Code/Framework/AzCore/AzCore/Component/NamedEntityId.h
index eb00af08f6..2f7503c0ba 100644
--- a/Code/Framework/AzCore/AzCore/Component/NamedEntityId.h
+++ b/Code/Framework/AzCore/AzCore/Component/NamedEntityId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/NonUniformScaleBus.cpp b/Code/Framework/AzCore/AzCore/Component/NonUniformScaleBus.cpp
index 4aaca8ce40..3edcf85ccb 100644
--- a/Code/Framework/AzCore/AzCore/Component/NonUniformScaleBus.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/NonUniformScaleBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/NonUniformScaleBus.h b/Code/Framework/AzCore/AzCore/Component/NonUniformScaleBus.h
index 62e47a1608..62fafda702 100644
--- a/Code/Framework/AzCore/AzCore/Component/NonUniformScaleBus.h
+++ b/Code/Framework/AzCore/AzCore/Component/NonUniformScaleBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/TickBus.h b/Code/Framework/AzCore/AzCore/Component/TickBus.h
index e51d2f7f5c..766f59bdd1 100644
--- a/Code/Framework/AzCore/AzCore/Component/TickBus.h
+++ b/Code/Framework/AzCore/AzCore/Component/TickBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Component/TransformBus.h b/Code/Framework/AzCore/AzCore/Component/TransformBus.h
index ce307d4117..76b5ce5167 100644
--- a/Code/Framework/AzCore/AzCore/Component/TransformBus.h
+++ b/Code/Framework/AzCore/AzCore/Component/TransformBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Compression/Compression.h b/Code/Framework/AzCore/AzCore/Compression/Compression.h
index 2c83c72484..218ff5c90c 100644
--- a/Code/Framework/AzCore/AzCore/Compression/Compression.h
+++ b/Code/Framework/AzCore/AzCore/Compression/Compression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Compression/compression.cpp b/Code/Framework/AzCore/AzCore/Compression/compression.cpp
index b217745cac..22b8ce32a9 100644
--- a/Code/Framework/AzCore/AzCore/Compression/compression.cpp
+++ b/Code/Framework/AzCore/AzCore/Compression/compression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Compression/zstd_compression.cpp b/Code/Framework/AzCore/AzCore/Compression/zstd_compression.cpp
index b438f4d24a..9d30ce1120 100644
--- a/Code/Framework/AzCore/AzCore/Compression/zstd_compression.cpp
+++ b/Code/Framework/AzCore/AzCore/Compression/zstd_compression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Compression/zstd_compression.h b/Code/Framework/AzCore/AzCore/Compression/zstd_compression.h
index 81030fcd1e..91d27c6fb8 100644
--- a/Code/Framework/AzCore/AzCore/Compression/zstd_compression.h
+++ b/Code/Framework/AzCore/AzCore/Compression/zstd_compression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/Console.cpp b/Code/Framework/AzCore/AzCore/Console/Console.cpp
index 9aa8b728ac..fd7a3d7a11 100644
--- a/Code/Framework/AzCore/AzCore/Console/Console.cpp
+++ b/Code/Framework/AzCore/AzCore/Console/Console.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/Console.h b/Code/Framework/AzCore/AzCore/Console/Console.h
index 0b0b53ea73..6c46224627 100644
--- a/Code/Framework/AzCore/AzCore/Console/Console.h
+++ b/Code/Framework/AzCore/AzCore/Console/Console.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.h b/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.h
index fbf3c15a19..f0259adada 100644
--- a/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.h
+++ b/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl b/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl
index 476e34fceb..9529e7aae4 100644
--- a/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl
+++ b/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.cpp b/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.cpp
index cc10b79c23..c93c596a17 100644
--- a/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.cpp
+++ b/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.h b/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.h
index 160aaa88c2..6044dc76b9 100644
--- a/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.h
+++ b/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.inl b/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.inl
index 4b5895c8fd..92913e13b1 100644
--- a/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.inl
+++ b/Code/Framework/AzCore/AzCore/Console/ConsoleFunctor.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/ConsoleTypeHelpers.h b/Code/Framework/AzCore/AzCore/Console/ConsoleTypeHelpers.h
index 2a0dabe26d..2cdf20f9d9 100644
--- a/Code/Framework/AzCore/AzCore/Console/ConsoleTypeHelpers.h
+++ b/Code/Framework/AzCore/AzCore/Console/ConsoleTypeHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/ConsoleTypeHelpers.inl b/Code/Framework/AzCore/AzCore/Console/ConsoleTypeHelpers.inl
index 46abf7125c..809e6a5800 100644
--- a/Code/Framework/AzCore/AzCore/Console/ConsoleTypeHelpers.inl
+++ b/Code/Framework/AzCore/AzCore/Console/ConsoleTypeHelpers.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/IConsole.h b/Code/Framework/AzCore/AzCore/Console/IConsole.h
index cc12d141a3..6e20525850 100644
--- a/Code/Framework/AzCore/AzCore/Console/IConsole.h
+++ b/Code/Framework/AzCore/AzCore/Console/IConsole.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/IConsoleTypes.h b/Code/Framework/AzCore/AzCore/Console/IConsoleTypes.h
index d71cd2beae..fcfe70ff68 100644
--- a/Code/Framework/AzCore/AzCore/Console/IConsoleTypes.h
+++ b/Code/Framework/AzCore/AzCore/Console/IConsoleTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/ILogger.h b/Code/Framework/AzCore/AzCore/Console/ILogger.h
index 65388ca53c..47a117df05 100644
--- a/Code/Framework/AzCore/AzCore/Console/ILogger.h
+++ b/Code/Framework/AzCore/AzCore/Console/ILogger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/LoggerSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Console/LoggerSystemComponent.cpp
index 4defb10b7b..3603846ec5 100644
--- a/Code/Framework/AzCore/AzCore/Console/LoggerSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Console/LoggerSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Console/LoggerSystemComponent.h b/Code/Framework/AzCore/AzCore/Console/LoggerSystemComponent.h
index f7ea16885d..b618503240 100644
--- a/Code/Framework/AzCore/AzCore/Console/LoggerSystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/Console/LoggerSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/AssetTracking.cpp b/Code/Framework/AzCore/AzCore/Debug/AssetTracking.cpp
index 373b496541..8a90be688b 100644
--- a/Code/Framework/AzCore/AzCore/Debug/AssetTracking.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/AssetTracking.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/AssetTracking.h b/Code/Framework/AzCore/AzCore/Debug/AssetTracking.h
index b052656eda..c2a1cd63cf 100644
--- a/Code/Framework/AzCore/AzCore/Debug/AssetTracking.h
+++ b/Code/Framework/AzCore/AzCore/Debug/AssetTracking.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypes.h b/Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypes.h
index 30d8974701..c1cf896ad5 100644
--- a/Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypes.h
+++ b/Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypesImpl.h b/Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypesImpl.h
index f8367fc767..a32dae66e3 100644
--- a/Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypesImpl.h
+++ b/Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypesImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/EventTrace.cpp b/Code/Framework/AzCore/AzCore/Debug/EventTrace.cpp
index e40491ca7f..ae6b514340 100644
--- a/Code/Framework/AzCore/AzCore/Debug/EventTrace.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/EventTrace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/EventTrace.h b/Code/Framework/AzCore/AzCore/Debug/EventTrace.h
index 56e2f08fc9..cde36c0f34 100644
--- a/Code/Framework/AzCore/AzCore/Debug/EventTrace.h
+++ b/Code/Framework/AzCore/AzCore/Debug/EventTrace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp b/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp
index 7100c9ad41..42bc1373a2 100644
--- a/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.h b/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.h
index 97297de668..b0f232e6a3 100644
--- a/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.h
+++ b/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/EventTraceDrillerBus.h b/Code/Framework/AzCore/AzCore/Debug/EventTraceDrillerBus.h
index 24c2409ac2..bfdb00c291 100644
--- a/Code/Framework/AzCore/AzCore/Debug/EventTraceDrillerBus.h
+++ b/Code/Framework/AzCore/AzCore/Debug/EventTraceDrillerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/FrameProfiler.h b/Code/Framework/AzCore/AzCore/Debug/FrameProfiler.h
index 34c97c0c2a..405521ad3c 100644
--- a/Code/Framework/AzCore/AzCore/Debug/FrameProfiler.h
+++ b/Code/Framework/AzCore/AzCore/Debug/FrameProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/FrameProfilerBus.h b/Code/Framework/AzCore/AzCore/Debug/FrameProfilerBus.h
index 85bfba814f..1eee68f1c2 100644
--- a/Code/Framework/AzCore/AzCore/Debug/FrameProfilerBus.h
+++ b/Code/Framework/AzCore/AzCore/Debug/FrameProfilerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/FrameProfilerComponent.cpp b/Code/Framework/AzCore/AzCore/Debug/FrameProfilerComponent.cpp
index 842edc15bb..4faa0475f5 100644
--- a/Code/Framework/AzCore/AzCore/Debug/FrameProfilerComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/FrameProfilerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/FrameProfilerComponent.h b/Code/Framework/AzCore/AzCore/Debug/FrameProfilerComponent.h
index 238260876b..36f2fb3d25 100644
--- a/Code/Framework/AzCore/AzCore/Debug/FrameProfilerComponent.h
+++ b/Code/Framework/AzCore/AzCore/Debug/FrameProfilerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/IEventLogger.h b/Code/Framework/AzCore/AzCore/Debug/IEventLogger.h
index 1c6ec38a32..4361cb246b 100644
--- a/Code/Framework/AzCore/AzCore/Debug/IEventLogger.h
+++ b/Code/Framework/AzCore/AzCore/Debug/IEventLogger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/LocalFileEventLogger.cpp b/Code/Framework/AzCore/AzCore/Debug/LocalFileEventLogger.cpp
index 151fc16f91..cc30b4711c 100644
--- a/Code/Framework/AzCore/AzCore/Debug/LocalFileEventLogger.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/LocalFileEventLogger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/LocalFileEventLogger.h b/Code/Framework/AzCore/AzCore/Debug/LocalFileEventLogger.h
index 732ccc3d11..9ebcf6711b 100644
--- a/Code/Framework/AzCore/AzCore/Debug/LocalFileEventLogger.h
+++ b/Code/Framework/AzCore/AzCore/Debug/LocalFileEventLogger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/ProfileModuleInit.cpp b/Code/Framework/AzCore/AzCore/Debug/ProfileModuleInit.cpp
index 8f3a5ebc0d..5f5a6d1ca7 100644
--- a/Code/Framework/AzCore/AzCore/Debug/ProfileModuleInit.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/ProfileModuleInit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/ProfileModuleInit.h b/Code/Framework/AzCore/AzCore/Debug/ProfileModuleInit.h
index 76a8891834..ab5e829a04 100644
--- a/Code/Framework/AzCore/AzCore/Debug/ProfileModuleInit.h
+++ b/Code/Framework/AzCore/AzCore/Debug/ProfileModuleInit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/Profiler.cpp b/Code/Framework/AzCore/AzCore/Debug/Profiler.cpp
index 174c4a981d..0ec66d2434 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Profiler.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/Profiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/Profiler.h b/Code/Framework/AzCore/AzCore/Debug/Profiler.h
index 343a38a547..5409dfffdf 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Profiler.h
+++ b/Code/Framework/AzCore/AzCore/Debug/Profiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/ProfilerBus.h b/Code/Framework/AzCore/AzCore/Debug/ProfilerBus.h
index 448495ab74..cbcd2e63b4 100644
--- a/Code/Framework/AzCore/AzCore/Debug/ProfilerBus.h
+++ b/Code/Framework/AzCore/AzCore/Debug/ProfilerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/ProfilerDriller.cpp b/Code/Framework/AzCore/AzCore/Debug/ProfilerDriller.cpp
index 67694eed75..8acaf48126 100644
--- a/Code/Framework/AzCore/AzCore/Debug/ProfilerDriller.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/ProfilerDriller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/ProfilerDriller.h b/Code/Framework/AzCore/AzCore/Debug/ProfilerDriller.h
index 4478e4b78d..42880376d1 100644
--- a/Code/Framework/AzCore/AzCore/Debug/ProfilerDriller.h
+++ b/Code/Framework/AzCore/AzCore/Debug/ProfilerDriller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/ProfilerDrillerBus.h b/Code/Framework/AzCore/AzCore/Debug/ProfilerDrillerBus.h
index 2420db9a4b..563232a01c 100644
--- a/Code/Framework/AzCore/AzCore/Debug/ProfilerDrillerBus.h
+++ b/Code/Framework/AzCore/AzCore/Debug/ProfilerDrillerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/StackTracer.h b/Code/Framework/AzCore/AzCore/Debug/StackTracer.h
index c63b1b327c..bb7428b28c 100644
--- a/Code/Framework/AzCore/AzCore/Debug/StackTracer.h
+++ b/Code/Framework/AzCore/AzCore/Debug/StackTracer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/Timer.h b/Code/Framework/AzCore/AzCore/Debug/Timer.h
index aaced58d52..87cb2d2f43 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Timer.h
+++ b/Code/Framework/AzCore/AzCore/Debug/Timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/Trace.cpp b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
index c59dd9da19..ed0ee7f3b7 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/Trace.h b/Code/Framework/AzCore/AzCore/Debug/Trace.h
index bd935e401c..594322f1f3 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Trace.h
+++ b/Code/Framework/AzCore/AzCore/Debug/Trace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/TraceMessageBus.h b/Code/Framework/AzCore/AzCore/Debug/TraceMessageBus.h
index 12832c2ae8..6de1924106 100644
--- a/Code/Framework/AzCore/AzCore/Debug/TraceMessageBus.h
+++ b/Code/Framework/AzCore/AzCore/Debug/TraceMessageBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp b/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp
index 187476bcf5..8d14188f16 100644
--- a/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.h b/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.h
index 44e8db916f..53fba34107 100644
--- a/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.h
+++ b/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDrillerBus.h b/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDrillerBus.h
index 308e453015..20f5b4e6b4 100644
--- a/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDrillerBus.h
+++ b/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDrillerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp b/Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp
index d669bb0ad0..bc00e9639e 100644
--- a/Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Debug/TraceReflection.h b/Code/Framework/AzCore/AzCore/Debug/TraceReflection.h
index 3ff40b991a..d207f59050 100644
--- a/Code/Framework/AzCore/AzCore/Debug/TraceReflection.h
+++ b/Code/Framework/AzCore/AzCore/Debug/TraceReflection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Docs.h b/Code/Framework/AzCore/AzCore/Docs.h
index 52f9795a82..088e083e23 100644
--- a/Code/Framework/AzCore/AzCore/Docs.h
+++ b/Code/Framework/AzCore/AzCore/Docs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Driller/DefaultStringPool.h b/Code/Framework/AzCore/AzCore/Driller/DefaultStringPool.h
index 92dc3cc805..9a005a9c87 100644
--- a/Code/Framework/AzCore/AzCore/Driller/DefaultStringPool.h
+++ b/Code/Framework/AzCore/AzCore/Driller/DefaultStringPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Driller/Driller.cpp b/Code/Framework/AzCore/AzCore/Driller/Driller.cpp
index 0fefc349eb..cccd20027b 100644
--- a/Code/Framework/AzCore/AzCore/Driller/Driller.cpp
+++ b/Code/Framework/AzCore/AzCore/Driller/Driller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Driller/Driller.h b/Code/Framework/AzCore/AzCore/Driller/Driller.h
index f489a65a6e..4bd68b73e3 100644
--- a/Code/Framework/AzCore/AzCore/Driller/Driller.h
+++ b/Code/Framework/AzCore/AzCore/Driller/Driller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Driller/DrillerBus.cpp b/Code/Framework/AzCore/AzCore/Driller/DrillerBus.cpp
index e6e4363a03..2c9aca682a 100644
--- a/Code/Framework/AzCore/AzCore/Driller/DrillerBus.cpp
+++ b/Code/Framework/AzCore/AzCore/Driller/DrillerBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Driller/DrillerBus.h b/Code/Framework/AzCore/AzCore/Driller/DrillerBus.h
index 85645512c0..b696a0b131 100644
--- a/Code/Framework/AzCore/AzCore/Driller/DrillerBus.h
+++ b/Code/Framework/AzCore/AzCore/Driller/DrillerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Driller/DrillerRootHandler.h b/Code/Framework/AzCore/AzCore/Driller/DrillerRootHandler.h
index 25873eae82..8f2ce77ed9 100644
--- a/Code/Framework/AzCore/AzCore/Driller/DrillerRootHandler.h
+++ b/Code/Framework/AzCore/AzCore/Driller/DrillerRootHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Driller/Stream.cpp b/Code/Framework/AzCore/AzCore/Driller/Stream.cpp
index 9a61081eb6..4d8b061a2c 100644
--- a/Code/Framework/AzCore/AzCore/Driller/Stream.cpp
+++ b/Code/Framework/AzCore/AzCore/Driller/Stream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Driller/Stream.h b/Code/Framework/AzCore/AzCore/Driller/Stream.h
index 4402e318f3..0872da2682 100644
--- a/Code/Framework/AzCore/AzCore/Driller/Stream.h
+++ b/Code/Framework/AzCore/AzCore/Driller/Stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/BusImpl.h b/Code/Framework/AzCore/AzCore/EBus/BusImpl.h
index 3273872cf7..cce7283c60 100644
--- a/Code/Framework/AzCore/AzCore/EBus/BusImpl.h
+++ b/Code/Framework/AzCore/AzCore/EBus/BusImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/EBus.h b/Code/Framework/AzCore/AzCore/EBus/EBus.h
index 0ffe280187..17ac9b3e78 100644
--- a/Code/Framework/AzCore/AzCore/EBus/EBus.h
+++ b/Code/Framework/AzCore/AzCore/EBus/EBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/EBusEnvironment.cpp b/Code/Framework/AzCore/AzCore/EBus/EBusEnvironment.cpp
index 9c8c237571..f5e66c1d37 100644
--- a/Code/Framework/AzCore/AzCore/EBus/EBusEnvironment.cpp
+++ b/Code/Framework/AzCore/AzCore/EBus/EBusEnvironment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Environment.h b/Code/Framework/AzCore/AzCore/EBus/Environment.h
index 65c200119c..027a25ede4 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Environment.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Environment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Event.h b/Code/Framework/AzCore/AzCore/EBus/Event.h
index 52ee112415..6f4a48e84c 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Event.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Event.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Event.inl b/Code/Framework/AzCore/AzCore/EBus/Event.inl
index d3b86abb52..006ff81e34 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Event.inl
+++ b/Code/Framework/AzCore/AzCore/EBus/Event.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.cpp b/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.cpp
index ae46132494..60f98ead2e 100644
--- a/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.h b/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.h
index d58acdc82e..fde37b6022 100644
--- a/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/IEventScheduler.h b/Code/Framework/AzCore/AzCore/EBus/IEventScheduler.h
index bbdf54b8a8..a4e0e454db 100644
--- a/Code/Framework/AzCore/AzCore/EBus/IEventScheduler.h
+++ b/Code/Framework/AzCore/AzCore/EBus/IEventScheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Internal/BusContainer.h b/Code/Framework/AzCore/AzCore/EBus/Internal/BusContainer.h
index c2d4baedb1..03a6b34359 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Internal/BusContainer.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Internal/BusContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Internal/CallstackEntry.h b/Code/Framework/AzCore/AzCore/EBus/Internal/CallstackEntry.h
index 90bdac65d4..6b2642ce13 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Internal/CallstackEntry.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Internal/CallstackEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Internal/Debug.h b/Code/Framework/AzCore/AzCore/EBus/Internal/Debug.h
index 64e01ef285..b437737742 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Internal/Debug.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Internal/Debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Internal/Handlers.h b/Code/Framework/AzCore/AzCore/EBus/Internal/Handlers.h
index 133b00e454..85221d7de3 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Internal/Handlers.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Internal/Handlers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Internal/StoragePolicies.h b/Code/Framework/AzCore/AzCore/EBus/Internal/StoragePolicies.h
index 580354dc9e..2367de6ea7 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Internal/StoragePolicies.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Internal/StoragePolicies.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/OrderedEvent.h b/Code/Framework/AzCore/AzCore/EBus/OrderedEvent.h
index 777f99780d..cc7b14af8c 100644
--- a/Code/Framework/AzCore/AzCore/EBus/OrderedEvent.h
+++ b/Code/Framework/AzCore/AzCore/EBus/OrderedEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/OrderedEvent.inl b/Code/Framework/AzCore/AzCore/EBus/OrderedEvent.inl
index c0004907b3..e4418682a6 100644
--- a/Code/Framework/AzCore/AzCore/EBus/OrderedEvent.inl
+++ b/Code/Framework/AzCore/AzCore/EBus/OrderedEvent.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Policies.h b/Code/Framework/AzCore/AzCore/EBus/Policies.h
index 6f77f3f47f..a75395b05d 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Policies.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Policies.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/Results.h b/Code/Framework/AzCore/AzCore/EBus/Results.h
index bd30a10204..618fbd6d03 100644
--- a/Code/Framework/AzCore/AzCore/EBus/Results.h
+++ b/Code/Framework/AzCore/AzCore/EBus/Results.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.cpp b/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.cpp
index 6a9032ba1d..138fe95849 100644
--- a/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.cpp
+++ b/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.h b/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.h
index c0c06a703d..6087806f30 100644
--- a/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.h
+++ b/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/ScheduledEventHandle.cpp b/Code/Framework/AzCore/AzCore/EBus/ScheduledEventHandle.cpp
index 081a769597..04895a9a31 100644
--- a/Code/Framework/AzCore/AzCore/EBus/ScheduledEventHandle.cpp
+++ b/Code/Framework/AzCore/AzCore/EBus/ScheduledEventHandle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/EBus/ScheduledEventHandle.h b/Code/Framework/AzCore/AzCore/EBus/ScheduledEventHandle.h
index 4c8e3d6fb2..7df8459e5f 100644
--- a/Code/Framework/AzCore/AzCore/EBus/ScheduledEventHandle.h
+++ b/Code/Framework/AzCore/AzCore/EBus/ScheduledEventHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/ByteContainerStream.h b/Code/Framework/AzCore/AzCore/IO/ByteContainerStream.h
index 7807e7f587..5375a69ff2 100644
--- a/Code/Framework/AzCore/AzCore/IO/ByteContainerStream.h
+++ b/Code/Framework/AzCore/AzCore/IO/ByteContainerStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/CompressionBus.cpp b/Code/Framework/AzCore/AzCore/IO/CompressionBus.cpp
index 6fdbd86bc1..6e6f687f10 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressionBus.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/CompressionBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/CompressionBus.h b/Code/Framework/AzCore/AzCore/IO/CompressionBus.h
index 517aeb539e..88ef777607 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressionBus.h
+++ b/Code/Framework/AzCore/AzCore/IO/CompressionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Compressor.cpp b/Code/Framework/AzCore/AzCore/IO/Compressor.cpp
index 06f70cee55..3b926f3147 100644
--- a/Code/Framework/AzCore/AzCore/IO/Compressor.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Compressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Compressor.h b/Code/Framework/AzCore/AzCore/IO/Compressor.h
index af143f8102..14309e90ed 100644
--- a/Code/Framework/AzCore/AzCore/IO/Compressor.h
+++ b/Code/Framework/AzCore/AzCore/IO/Compressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/CompressorStream.cpp b/Code/Framework/AzCore/AzCore/IO/CompressorStream.cpp
index 5263e896a6..f63a63b66d 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorStream.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorStream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/CompressorStream.h b/Code/Framework/AzCore/AzCore/IO/CompressorStream.h
index e9ef3e14c4..35a9cc6bbc 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorStream.h
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp b/Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp
index 569d51cf07..5e9d060765 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/CompressorZLib.h b/Code/Framework/AzCore/AzCore/IO/CompressorZLib.h
index 92c56dfe5a..5e4e4b9154 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorZLib.h
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorZLib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp b/Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp
index 9efc9a394b..0435e41c21 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/CompressorZStd.h b/Code/Framework/AzCore/AzCore/IO/CompressorZStd.h
index 5a447d8477..b7e4c7e8b2 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorZStd.h
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorZStd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/FileIO.cpp b/Code/Framework/AzCore/AzCore/IO/FileIO.cpp
index 5164017efe..b675663db0 100644
--- a/Code/Framework/AzCore/AzCore/IO/FileIO.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/FileIO.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/FileIO.h b/Code/Framework/AzCore/AzCore/IO/FileIO.h
index 4ff2024b4d..2f39141c73 100644
--- a/Code/Framework/AzCore/AzCore/IO/FileIO.h
+++ b/Code/Framework/AzCore/AzCore/IO/FileIO.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/FileIOEventBus.h b/Code/Framework/AzCore/AzCore/IO/FileIOEventBus.h
index 51fe8b27ad..f5a8ee7ea1 100644
--- a/Code/Framework/AzCore/AzCore/IO/FileIOEventBus.h
+++ b/Code/Framework/AzCore/AzCore/IO/FileIOEventBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/GenericStreams.cpp b/Code/Framework/AzCore/AzCore/IO/GenericStreams.cpp
index 44178709b6..a4cc751b43 100644
--- a/Code/Framework/AzCore/AzCore/IO/GenericStreams.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/GenericStreams.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/GenericStreams.h b/Code/Framework/AzCore/AzCore/IO/GenericStreams.h
index ecbba87943..1d141b72d6 100644
--- a/Code/Framework/AzCore/AzCore/IO/GenericStreams.h
+++ b/Code/Framework/AzCore/AzCore/IO/GenericStreams.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/IOUtils.cpp b/Code/Framework/AzCore/AzCore/IO/IOUtils.cpp
index 2abfd6d86f..767a092744 100644
--- a/Code/Framework/AzCore/AzCore/IO/IOUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/IOUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/IOUtils.h b/Code/Framework/AzCore/AzCore/IO/IOUtils.h
index 0cef738194..533c3a3f8f 100644
--- a/Code/Framework/AzCore/AzCore/IO/IOUtils.h
+++ b/Code/Framework/AzCore/AzCore/IO/IOUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/IStreamer.h b/Code/Framework/AzCore/AzCore/IO/IStreamer.h
index f794339d44..84b79ac55b 100644
--- a/Code/Framework/AzCore/AzCore/IO/IStreamer.h
+++ b/Code/Framework/AzCore/AzCore/IO/IStreamer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.cpp b/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.cpp
index 7507014027..40408d8232 100644
--- a/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.h b/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.h
index b174a902d3..1f806c4c36 100644
--- a/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.h
+++ b/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.inl b/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.inl
index c1590a27e4..4fe5dd7e2e 100644
--- a/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.inl
+++ b/Code/Framework/AzCore/AzCore/IO/IStreamerTypes.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp b/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp
index 49fcca909a..c229d176a4 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Path/Path.h b/Code/Framework/AzCore/AzCore/IO/Path/Path.h
index e9e2c79d46..3a0ab4b59a 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path.h
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Path/Path.inl b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
index 32ebed0840..f899522916 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h b/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h
index 5d7b140619..8384c98c0c 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
index bc1b5b5ebd..87b41892e2 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.h b/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.h
index 2845974dab..497b3d78ea 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
index b7470d00d5..e15f3b31f4 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.h b/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.h
index 50e9ca1ede..4f0565cd33 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.cpp
index d82272e34b..40e81abb6c 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.h b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.h
index cb590cdb53..3670b832de 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.cpp
index 286f6d03f3..228cd408bb 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.h b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.h
index 137e1b7360..70648d2506 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.inl b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.inl
index 3bb91e9e9d..aa08aba6b2 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.inl
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.cpp
index 0f786d1ce8..bcc5e715ba 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.h b/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.h
index 1697bdaa4e..4cdda03fb8 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.cpp
index 28ef9d7b64..f62eca385e 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.h b/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.h
index 4ee09944ce..8e0d91f13a 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/RequestPath.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/RequestPath.cpp
index b380449c2e..2ba1db6760 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/RequestPath.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/RequestPath.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/RequestPath.h b/Code/Framework/AzCore/AzCore/IO/Streamer/RequestPath.h
index 19bddd28ab..c50e766a64 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/RequestPath.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/RequestPath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/Scheduler.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/Scheduler.cpp
index b291fb8173..2b5c04e895 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/Scheduler.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/Scheduler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/Scheduler.h b/Code/Framework/AzCore/AzCore/IO/Streamer/Scheduler.h
index b437486a3e..2b0a5c57f9 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/Scheduler.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/Scheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/Statistics.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/Statistics.cpp
index 199f7adc36..5c1b56b80b 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/Statistics.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/Statistics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/Statistics.h b/Code/Framework/AzCore/AzCore/IO/Streamer/Statistics.h
index 9c42ca8a4e..b0e9115041 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/Statistics.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/Statistics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.cpp
index c4065f2803..787cd9371d 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.h b/Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.h
index b583dc5710..4004b34a7f 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StreamStackEntry.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamStackEntry.cpp
index e367ba4efb..4aa866f08b 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StreamStackEntry.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamStackEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StreamStackEntry.h b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamStackEntry.h
index 84e7021f9d..a005b86add 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StreamStackEntry.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamStackEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.cpp
index cf7c5c5a17..6ae40d1a1f 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.h b/Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.h
index dab9c04314..9b84ebc169 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerComponent.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerComponent.cpp
index 77d8aef8e4..d820fcfa25 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerComponent.h b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerComponent.h
index 426fd9fbad..c31b83b600 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerComponent.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.cpp
index 59d57461e0..0480bd9e57 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.h b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.h
index 5e278e8aaf..0a66cf85b9 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerContext.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerContext.cpp
index 0fb809f4ae..64a7b6ff0a 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerContext.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerContext.h b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerContext.h
index a8bfee3c28..ccd86d49bc 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerContext.h
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/StreamerContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/SystemFile.cpp b/Code/Framework/AzCore/AzCore/IO/SystemFile.cpp
index 0ec50b41b0..2e1cec6807 100644
--- a/Code/Framework/AzCore/AzCore/IO/SystemFile.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/SystemFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/SystemFile.h b/Code/Framework/AzCore/AzCore/IO/SystemFile.h
index dc6215e78d..42879b3349 100644
--- a/Code/Framework/AzCore/AzCore/IO/SystemFile.h
+++ b/Code/Framework/AzCore/AzCore/IO/SystemFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IO/TextStreamWriters.h b/Code/Framework/AzCore/AzCore/IO/TextStreamWriters.h
index e40f2ca7af..90bf6043ae 100644
--- a/Code/Framework/AzCore/AzCore/IO/TextStreamWriters.h
+++ b/Code/Framework/AzCore/AzCore/IO/TextStreamWriters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IPC/SharedMemory.cpp b/Code/Framework/AzCore/AzCore/IPC/SharedMemory.cpp
index 1f2f00a61a..575ba8abc8 100644
--- a/Code/Framework/AzCore/AzCore/IPC/SharedMemory.cpp
+++ b/Code/Framework/AzCore/AzCore/IPC/SharedMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IPC/SharedMemory.h b/Code/Framework/AzCore/AzCore/IPC/SharedMemory.h
index 334c59f932..64810dfa37 100644
--- a/Code/Framework/AzCore/AzCore/IPC/SharedMemory.h
+++ b/Code/Framework/AzCore/AzCore/IPC/SharedMemory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/IPC/SharedMemory_Common.h b/Code/Framework/AzCore/AzCore/IPC/SharedMemory_Common.h
index ab3cd4170c..bcb20c1dc1 100644
--- a/Code/Framework/AzCore/AzCore/IPC/SharedMemory_Common.h
+++ b/Code/Framework/AzCore/AzCore/IPC/SharedMemory_Common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Interface/Interface.h b/Code/Framework/AzCore/AzCore/Interface/Interface.h
index 78c5896a9a..c1989c9044 100644
--- a/Code/Framework/AzCore/AzCore/Interface/Interface.h
+++ b/Code/Framework/AzCore/AzCore/Interface/Interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/allocators.h b/Code/Framework/AzCore/AzCore/JSON/allocators.h
index ed72d22f86..ff656969a7 100644
--- a/Code/Framework/AzCore/AzCore/JSON/allocators.h
+++ b/Code/Framework/AzCore/AzCore/JSON/allocators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/cursorstreamwrapper.h b/Code/Framework/AzCore/AzCore/JSON/cursorstreamwrapper.h
index 5752edfa11..eed9b213d5 100644
--- a/Code/Framework/AzCore/AzCore/JSON/cursorstreamwrapper.h
+++ b/Code/Framework/AzCore/AzCore/JSON/cursorstreamwrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/document.h b/Code/Framework/AzCore/AzCore/JSON/document.h
index 2d8b092e9a..fc680621bc 100644
--- a/Code/Framework/AzCore/AzCore/JSON/document.h
+++ b/Code/Framework/AzCore/AzCore/JSON/document.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/encodedstream.h b/Code/Framework/AzCore/AzCore/JSON/encodedstream.h
index 78919f2a3e..15ae285df2 100644
--- a/Code/Framework/AzCore/AzCore/JSON/encodedstream.h
+++ b/Code/Framework/AzCore/AzCore/JSON/encodedstream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/encodings.h b/Code/Framework/AzCore/AzCore/JSON/encodings.h
index e57cf8b02f..89fcf8f88b 100644
--- a/Code/Framework/AzCore/AzCore/JSON/encodings.h
+++ b/Code/Framework/AzCore/AzCore/JSON/encodings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/error/en.h b/Code/Framework/AzCore/AzCore/JSON/error/en.h
index af1ce7622f..b89b44f083 100644
--- a/Code/Framework/AzCore/AzCore/JSON/error/en.h
+++ b/Code/Framework/AzCore/AzCore/JSON/error/en.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/error/error.h b/Code/Framework/AzCore/AzCore/JSON/error/error.h
index 5a4389b61f..9f5ce1e82c 100644
--- a/Code/Framework/AzCore/AzCore/JSON/error/error.h
+++ b/Code/Framework/AzCore/AzCore/JSON/error/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/filereadstream.h b/Code/Framework/AzCore/AzCore/JSON/filereadstream.h
index 159e839d9c..1f3669ab08 100644
--- a/Code/Framework/AzCore/AzCore/JSON/filereadstream.h
+++ b/Code/Framework/AzCore/AzCore/JSON/filereadstream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/filewritestream.h b/Code/Framework/AzCore/AzCore/JSON/filewritestream.h
index 29a38358be..1c5f1a7dc3 100644
--- a/Code/Framework/AzCore/AzCore/JSON/filewritestream.h
+++ b/Code/Framework/AzCore/AzCore/JSON/filewritestream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/fwd.h b/Code/Framework/AzCore/AzCore/JSON/fwd.h
index 9a30fa48fd..7391def7aa 100644
--- a/Code/Framework/AzCore/AzCore/JSON/fwd.h
+++ b/Code/Framework/AzCore/AzCore/JSON/fwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/istreamwrapper.h b/Code/Framework/AzCore/AzCore/JSON/istreamwrapper.h
index 8ac6518883..1fe3c9c13a 100644
--- a/Code/Framework/AzCore/AzCore/JSON/istreamwrapper.h
+++ b/Code/Framework/AzCore/AzCore/JSON/istreamwrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/memorybuffer.h b/Code/Framework/AzCore/AzCore/JSON/memorybuffer.h
index 480d9039e3..881e949b6e 100644
--- a/Code/Framework/AzCore/AzCore/JSON/memorybuffer.h
+++ b/Code/Framework/AzCore/AzCore/JSON/memorybuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/memorystream.h b/Code/Framework/AzCore/AzCore/JSON/memorystream.h
index 2586ddaa14..7e8d3d90d7 100644
--- a/Code/Framework/AzCore/AzCore/JSON/memorystream.h
+++ b/Code/Framework/AzCore/AzCore/JSON/memorystream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/ostreamwrapper.h b/Code/Framework/AzCore/AzCore/JSON/ostreamwrapper.h
index 9b22f0f32f..3a9c781051 100644
--- a/Code/Framework/AzCore/AzCore/JSON/ostreamwrapper.h
+++ b/Code/Framework/AzCore/AzCore/JSON/ostreamwrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/pointer.h b/Code/Framework/AzCore/AzCore/JSON/pointer.h
index 5362120b72..7507cab78f 100644
--- a/Code/Framework/AzCore/AzCore/JSON/pointer.h
+++ b/Code/Framework/AzCore/AzCore/JSON/pointer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/prettywriter.h b/Code/Framework/AzCore/AzCore/JSON/prettywriter.h
index 1b25525fd5..e6c4f5dc9f 100644
--- a/Code/Framework/AzCore/AzCore/JSON/prettywriter.h
+++ b/Code/Framework/AzCore/AzCore/JSON/prettywriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/rapidjson.h b/Code/Framework/AzCore/AzCore/JSON/rapidjson.h
index e7491c374d..28a7c2b861 100644
--- a/Code/Framework/AzCore/AzCore/JSON/rapidjson.h
+++ b/Code/Framework/AzCore/AzCore/JSON/rapidjson.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/reader.h b/Code/Framework/AzCore/AzCore/JSON/reader.h
index b4bd22d4cc..77c6ed67e4 100644
--- a/Code/Framework/AzCore/AzCore/JSON/reader.h
+++ b/Code/Framework/AzCore/AzCore/JSON/reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/schema.h b/Code/Framework/AzCore/AzCore/JSON/schema.h
index 80e1811987..03d0847263 100644
--- a/Code/Framework/AzCore/AzCore/JSON/schema.h
+++ b/Code/Framework/AzCore/AzCore/JSON/schema.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/stream.h b/Code/Framework/AzCore/AzCore/JSON/stream.h
index 4c64322d6e..14730348f5 100644
--- a/Code/Framework/AzCore/AzCore/JSON/stream.h
+++ b/Code/Framework/AzCore/AzCore/JSON/stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/stringbuffer.h b/Code/Framework/AzCore/AzCore/JSON/stringbuffer.h
index 6c7d2cd8f6..07311411c9 100644
--- a/Code/Framework/AzCore/AzCore/JSON/stringbuffer.h
+++ b/Code/Framework/AzCore/AzCore/JSON/stringbuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/JSON/writer.h b/Code/Framework/AzCore/AzCore/JSON/writer.h
index 3faab05eec..4c25c6d6c0 100644
--- a/Code/Framework/AzCore/AzCore/JSON/writer.h
+++ b/Code/Framework/AzCore/AzCore/JSON/writer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/Algorithms.h b/Code/Framework/AzCore/AzCore/Jobs/Algorithms.h
index 7c3c9a6916..d087bc98f4 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Algorithms.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/Algorithms.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerBase.cpp b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerBase.cpp
index 9e39c2ebba..529183d0f8 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerBase.cpp
+++ b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerBase.h b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerBase.h
index 1f93606c25..dd5e431e4e 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerBase.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.cpp b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.cpp
index d4a56f0197..8396a63278 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.cpp
+++ b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h
index 818826ccec..d44d2a8392 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/Internal/JobNotify.h b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobNotify.h
index 457e393e11..7e4556d54b 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobNotify.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobNotify.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/Job.h b/Code/Framework/AzCore/AzCore/Jobs/Job.h
index a19eb1713c..7f7aa0b00b 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Job.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/Job.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobCancelGroup.h b/Code/Framework/AzCore/AzCore/Jobs/JobCancelGroup.h
index 07441f4cd8..c1124a0b77 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobCancelGroup.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobCancelGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobCompletion.h b/Code/Framework/AzCore/AzCore/Jobs/JobCompletion.h
index 3fe44403a9..57a3850ca1 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobCompletion.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobCompletion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobCompletionSpin.h b/Code/Framework/AzCore/AzCore/Jobs/JobCompletionSpin.h
index 19a1f15562..33f4e58043 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobCompletionSpin.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobCompletionSpin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobContext.cpp b/Code/Framework/AzCore/AzCore/Jobs/JobContext.cpp
index d343da43cf..d98ce4adcf 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobContext.cpp
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobContext.h b/Code/Framework/AzCore/AzCore/Jobs/JobContext.h
index 5b97e46981..e01c66dbf9 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobContext.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobEmpty.h b/Code/Framework/AzCore/AzCore/Jobs/JobEmpty.h
index b68df34c38..fc26c58c5f 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobEmpty.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobEmpty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobFunction.h b/Code/Framework/AzCore/AzCore/Jobs/JobFunction.h
index 34da320056..86e862eb91 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobFunction.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobFunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobManager.cpp b/Code/Framework/AzCore/AzCore/Jobs/JobManager.cpp
index 4b35a91172..c081a6f98a 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobManager.h b/Code/Framework/AzCore/AzCore/Jobs/JobManager.h
index 4b14dda324..3571a8a972 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobManager.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobManagerBus.h b/Code/Framework/AzCore/AzCore/Jobs/JobManagerBus.h
index 92f106d693..30e1b4d6a3 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobManagerBus.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobManagerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp b/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp
index 4a707f0383..974dbf230f 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.h b/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.h
index f4b8c773ac..47d5f57a73 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/JobManagerDesc.h b/Code/Framework/AzCore/AzCore/Jobs/JobManagerDesc.h
index 8e82cb28e0..e5cc7b6548 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobManagerDesc.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobManagerDesc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/LegacyJobExecutor.h b/Code/Framework/AzCore/AzCore/Jobs/LegacyJobExecutor.h
index 118ff5f426..fee53ba427 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/LegacyJobExecutor.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/LegacyJobExecutor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/MultipleDependentJob.h b/Code/Framework/AzCore/AzCore/Jobs/MultipleDependentJob.h
index 68033ac700..6af2633ab2 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/MultipleDependentJob.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/MultipleDependentJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Jobs/task_group.h b/Code/Framework/AzCore/AzCore/Jobs/task_group.h
index e561bbcede..e54f272817 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/task_group.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/task_group.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Aabb.cpp b/Code/Framework/AzCore/AzCore/Math/Aabb.cpp
index 92e4c5ef7e..b8368cb0a1 100644
--- a/Code/Framework/AzCore/AzCore/Math/Aabb.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Aabb.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Aabb.h b/Code/Framework/AzCore/AzCore/Math/Aabb.h
index e85f3d9dcc..500f31aa7a 100644
--- a/Code/Framework/AzCore/AzCore/Math/Aabb.h
+++ b/Code/Framework/AzCore/AzCore/Math/Aabb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Aabb.inl b/Code/Framework/AzCore/AzCore/Math/Aabb.inl
index 1b405e2ec6..8ee8b671ec 100644
--- a/Code/Framework/AzCore/AzCore/Math/Aabb.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Aabb.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Color.cpp b/Code/Framework/AzCore/AzCore/Math/Color.cpp
index 396083252a..3455ad1db0 100644
--- a/Code/Framework/AzCore/AzCore/Math/Color.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Color.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Color.h b/Code/Framework/AzCore/AzCore/Math/Color.h
index f27c412d9b..c4c303318b 100644
--- a/Code/Framework/AzCore/AzCore/Math/Color.h
+++ b/Code/Framework/AzCore/AzCore/Math/Color.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Color.inl b/Code/Framework/AzCore/AzCore/Math/Color.inl
index b42844fb8b..e18974f185 100644
--- a/Code/Framework/AzCore/AzCore/Math/Color.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Color.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/ColorSerializer.cpp b/Code/Framework/AzCore/AzCore/Math/ColorSerializer.cpp
index 3f04c66c48..7b1efd58a7 100644
--- a/Code/Framework/AzCore/AzCore/Math/ColorSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/ColorSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/ColorSerializer.h b/Code/Framework/AzCore/AzCore/Math/ColorSerializer.h
index 67794d1e83..9af25a4634 100644
--- a/Code/Framework/AzCore/AzCore/Math/ColorSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Math/ColorSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Crc.cpp b/Code/Framework/AzCore/AzCore/Math/Crc.cpp
index 5eb375ac88..dd3e82aea9 100644
--- a/Code/Framework/AzCore/AzCore/Math/Crc.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Crc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Crc.h b/Code/Framework/AzCore/AzCore/Math/Crc.h
index 5653f3c541..a47f4d7d8b 100644
--- a/Code/Framework/AzCore/AzCore/Math/Crc.h
+++ b/Code/Framework/AzCore/AzCore/Math/Crc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Crc.inl b/Code/Framework/AzCore/AzCore/Math/Crc.inl
index 76114c28bb..6edb1eed4d 100644
--- a/Code/Framework/AzCore/AzCore/Math/Crc.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Crc.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/DocsMath.h b/Code/Framework/AzCore/AzCore/Math/DocsMath.h
index 3c1f888d4a..952a1022bb 100644
--- a/Code/Framework/AzCore/AzCore/Math/DocsMath.h
+++ b/Code/Framework/AzCore/AzCore/Math/DocsMath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Frustum.cpp b/Code/Framework/AzCore/AzCore/Math/Frustum.cpp
index 0f993eae42..ac772427ea 100644
--- a/Code/Framework/AzCore/AzCore/Math/Frustum.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Frustum.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Frustum.h b/Code/Framework/AzCore/AzCore/Math/Frustum.h
index ca79f0cc56..990f808815 100644
--- a/Code/Framework/AzCore/AzCore/Math/Frustum.h
+++ b/Code/Framework/AzCore/AzCore/Math/Frustum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Frustum.inl b/Code/Framework/AzCore/AzCore/Math/Frustum.inl
index d493c93ca3..a6f9521213 100644
--- a/Code/Framework/AzCore/AzCore/Math/Frustum.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Frustum.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.cpp b/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.cpp
index 3a52cf93d4..2717f835d5 100644
--- a/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.h b/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.h
index f3bab88b6e..413a3a73c2 100644
--- a/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.h
+++ b/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Guid.h b/Code/Framework/AzCore/AzCore/Math/Guid.h
index fe0f23526c..765dd66e64 100644
--- a/Code/Framework/AzCore/AzCore/Math/Guid.h
+++ b/Code/Framework/AzCore/AzCore/Math/Guid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/MathTypes.h b/Code/Framework/AzCore/AzCore/Math/Internal/MathTypes.h
index d64cfd08c9..c1f745ded6 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/MathTypes.h
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/MathTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neon.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neon.inl
index 71b09df625..fea607894c 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neon.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neonDouble.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neonDouble.inl
index ac44174a4b..ddc1d10084 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neonDouble.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neonDouble.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neonQuad.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neonQuad.inl
index 99cd1edfd4..62652ee41d 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neonQuad.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_neonQuad.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_scalar.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_scalar.inl
index 0c1ee727ef..3f04d609b2 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_scalar.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_scalar.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_simd.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_simd.inl
index 965e87aaeb..0b47f1638f 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_simd.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_simd.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_sse.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_sse.inl
index 144745a411..9824aa9184 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_sse.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathCommon_sse.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_neon.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_neon.inl
index c3c602073d..9832c2f664 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_neon.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_neon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_scalar.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_scalar.inl
index 46a50ac0f9..b316ac01a7 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_scalar.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_scalar.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_sse.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_sse.inl
index 5694cd7f07..f61b0b4413 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_sse.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec1_sse.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_neon.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_neon.inl
index 44ce7d0d34..1f8e009848 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_neon.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_neon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_scalar.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_scalar.inl
index 020bea5301..b221856d75 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_scalar.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_scalar.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_sse.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_sse.inl
index 9c5e51ecdc..32066c03a5 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_sse.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec2_sse.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_neon.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_neon.inl
index e316f9c7d7..16de359673 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_neon.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_neon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_scalar.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_scalar.inl
index d0bbd10ef9..46f5b5db6d 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_scalar.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_scalar.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_sse.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_sse.inl
index d7ee5411be..18c5dcdc82 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_sse.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec3_sse.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_neon.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_neon.inl
index ec7441de70..e5847cc5a2 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_neon.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_neon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_scalar.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_scalar.inl
index 7195bd4c44..7c14c552ab 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_scalar.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_scalar.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_sse.inl b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_sse.inl
index 57d31e8644..272c4e994d 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_sse.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/SimdMathVec4_sse.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/VectorConversions.inl b/Code/Framework/AzCore/AzCore/Math/Internal/VectorConversions.inl
index ceef457ce9..519b57f873 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/VectorConversions.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/VectorConversions.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Internal/VertexContainer.inl b/Code/Framework/AzCore/AzCore/Math/Internal/VertexContainer.inl
index 7309987c01..0291512fdd 100644
--- a/Code/Framework/AzCore/AzCore/Math/Internal/VertexContainer.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Internal/VertexContainer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/InterpolationSample.h b/Code/Framework/AzCore/AzCore/Math/InterpolationSample.h
index 3d818a183f..19814df8f2 100644
--- a/Code/Framework/AzCore/AzCore/Math/InterpolationSample.h
+++ b/Code/Framework/AzCore/AzCore/Math/InterpolationSample.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/IntersectPoint.h b/Code/Framework/AzCore/AzCore/Math/IntersectPoint.h
index 6e411f4899..da6fc63fbc 100644
--- a/Code/Framework/AzCore/AzCore/Math/IntersectPoint.h
+++ b/Code/Framework/AzCore/AzCore/Math/IntersectPoint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/IntersectSegment.cpp b/Code/Framework/AzCore/AzCore/Math/IntersectSegment.cpp
index bf26262583..50e49e3dd3 100644
--- a/Code/Framework/AzCore/AzCore/Math/IntersectSegment.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/IntersectSegment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/IntersectSegment.h b/Code/Framework/AzCore/AzCore/Math/IntersectSegment.h
index 5bdb46e5a9..948ac62279 100644
--- a/Code/Framework/AzCore/AzCore/Math/IntersectSegment.h
+++ b/Code/Framework/AzCore/AzCore/Math/IntersectSegment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathIntrinsics.h b/Code/Framework/AzCore/AzCore/Math/MathIntrinsics.h
index 1537be4487..913440daae 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathIntrinsics.h
+++ b/Code/Framework/AzCore/AzCore/Math/MathIntrinsics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.cpp b/Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.cpp
index 2dd81699c5..c3137b7434 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.h b/Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.h
index 73118dfaff..766a1c7c78 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathReflection.cpp b/Code/Framework/AzCore/AzCore/Math/MathReflection.cpp
index d4d3d39e2b..46717440d5 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathReflection.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/MathReflection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathReflection.h b/Code/Framework/AzCore/AzCore/Math/MathReflection.h
index d4621705f3..3d14396b5c 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathReflection.h
+++ b/Code/Framework/AzCore/AzCore/Math/MathReflection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathScriptHelpers.cpp b/Code/Framework/AzCore/AzCore/Math/MathScriptHelpers.cpp
index 617dc05871..87edf0bcf2 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathScriptHelpers.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/MathScriptHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathScriptHelpers.h b/Code/Framework/AzCore/AzCore/Math/MathScriptHelpers.h
index 42eaf8883f..8820fb95ca 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathScriptHelpers.h
+++ b/Code/Framework/AzCore/AzCore/Math/MathScriptHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathUtils.cpp b/Code/Framework/AzCore/AzCore/Math/MathUtils.cpp
index 34d2698890..df9fd17fe4 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/MathUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathUtils.h b/Code/Framework/AzCore/AzCore/Math/MathUtils.h
index 8353652288..f6acca82a9 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathUtils.h
+++ b/Code/Framework/AzCore/AzCore/Math/MathUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.cpp b/Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.cpp
index f723412836..617b76c655 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.h b/Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.h
index 3842743139..d590af0e52 100644
--- a/Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix3x3.cpp b/Code/Framework/AzCore/AzCore/Math/Matrix3x3.cpp
index ef889fe3f5..c5dfe1f820 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x3.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x3.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix3x3.h b/Code/Framework/AzCore/AzCore/Math/Matrix3x3.h
index 3fb580a550..dde66a82c4 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x3.h
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix3x3.inl b/Code/Framework/AzCore/AzCore/Math/Matrix3x3.inl
index 41cc354f35..7fe5004807 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x3.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x3.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp
index 6fc0ef6712..75550178aa 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h
index 03585fbcd4..14dbf6308e 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl
index da0c2659d4..e3f11aaef4 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix4x4.cpp b/Code/Framework/AzCore/AzCore/Math/Matrix4x4.cpp
index 66213e0ab5..d9f97c9056 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix4x4.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix4x4.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix4x4.h b/Code/Framework/AzCore/AzCore/Math/Matrix4x4.h
index 0f95feb102..619276e8f6 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix4x4.h
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix4x4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Matrix4x4.inl b/Code/Framework/AzCore/AzCore/Math/Matrix4x4.inl
index ab0bd3a872..e8e9e6281e 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix4x4.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix4x4.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp b/Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp
index 4cb7da7e59..cd097f1e2f 100644
--- a/Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/MatrixUtils.h b/Code/Framework/AzCore/AzCore/Math/MatrixUtils.h
index 8e035d7e6e..9c2e9a8657 100644
--- a/Code/Framework/AzCore/AzCore/Math/MatrixUtils.h
+++ b/Code/Framework/AzCore/AzCore/Math/MatrixUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Obb.cpp b/Code/Framework/AzCore/AzCore/Math/Obb.cpp
index c018bed00f..1d00f08a42 100644
--- a/Code/Framework/AzCore/AzCore/Math/Obb.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Obb.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Obb.h b/Code/Framework/AzCore/AzCore/Math/Obb.h
index b113fc806b..b6bc8d1d89 100644
--- a/Code/Framework/AzCore/AzCore/Math/Obb.h
+++ b/Code/Framework/AzCore/AzCore/Math/Obb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Obb.inl b/Code/Framework/AzCore/AzCore/Math/Obb.inl
index d33f0a8f4c..fca2980683 100644
--- a/Code/Framework/AzCore/AzCore/Math/Obb.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Obb.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/PackedVector3.h b/Code/Framework/AzCore/AzCore/Math/PackedVector3.h
index 7ed7e45bd2..a438269d29 100644
--- a/Code/Framework/AzCore/AzCore/Math/PackedVector3.h
+++ b/Code/Framework/AzCore/AzCore/Math/PackedVector3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Plane.cpp b/Code/Framework/AzCore/AzCore/Math/Plane.cpp
index 7f8e36a0bc..eb46969189 100644
--- a/Code/Framework/AzCore/AzCore/Math/Plane.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Plane.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Plane.h b/Code/Framework/AzCore/AzCore/Math/Plane.h
index 6629c38504..8d8ea877a2 100644
--- a/Code/Framework/AzCore/AzCore/Math/Plane.h
+++ b/Code/Framework/AzCore/AzCore/Math/Plane.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Plane.inl b/Code/Framework/AzCore/AzCore/Math/Plane.inl
index 0fb1638a78..e454b5411c 100644
--- a/Code/Framework/AzCore/AzCore/Math/Plane.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Plane.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/PolygonPrism.cpp b/Code/Framework/AzCore/AzCore/Math/PolygonPrism.cpp
index ce46c2268e..fd975fb0ce 100644
--- a/Code/Framework/AzCore/AzCore/Math/PolygonPrism.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/PolygonPrism.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/PolygonPrism.h b/Code/Framework/AzCore/AzCore/Math/PolygonPrism.h
index 9ab2206bc6..fdfe2375b1 100644
--- a/Code/Framework/AzCore/AzCore/Math/PolygonPrism.h
+++ b/Code/Framework/AzCore/AzCore/Math/PolygonPrism.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Quaternion.cpp b/Code/Framework/AzCore/AzCore/Math/Quaternion.cpp
index 7b383e07d3..45db838bd0 100644
--- a/Code/Framework/AzCore/AzCore/Math/Quaternion.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Quaternion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Quaternion.h b/Code/Framework/AzCore/AzCore/Math/Quaternion.h
index 27b5f469c9..cac6569938 100644
--- a/Code/Framework/AzCore/AzCore/Math/Quaternion.h
+++ b/Code/Framework/AzCore/AzCore/Math/Quaternion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Quaternion.inl b/Code/Framework/AzCore/AzCore/Math/Quaternion.inl
index b4cafec17d..9405fe4ea1 100644
--- a/Code/Framework/AzCore/AzCore/Math/Quaternion.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Quaternion.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Random.h b/Code/Framework/AzCore/AzCore/Math/Random.h
index cea8a6b5f4..8474fc9eab 100644
--- a/Code/Framework/AzCore/AzCore/Math/Random.h
+++ b/Code/Framework/AzCore/AzCore/Math/Random.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Sfmt.cpp b/Code/Framework/AzCore/AzCore/Math/Sfmt.cpp
index 3e3a6c6169..b49d934c96 100644
--- a/Code/Framework/AzCore/AzCore/Math/Sfmt.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Sfmt.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Sfmt.h b/Code/Framework/AzCore/AzCore/Math/Sfmt.h
index 3dc5ce452e..d5458288cf 100644
--- a/Code/Framework/AzCore/AzCore/Math/Sfmt.h
+++ b/Code/Framework/AzCore/AzCore/Math/Sfmt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/ShapeIntersection.h b/Code/Framework/AzCore/AzCore/Math/ShapeIntersection.h
index 374c5eee2e..54a4327681 100644
--- a/Code/Framework/AzCore/AzCore/Math/ShapeIntersection.h
+++ b/Code/Framework/AzCore/AzCore/Math/ShapeIntersection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/ShapeIntersection.inl b/Code/Framework/AzCore/AzCore/Math/ShapeIntersection.inl
index 8cae4e772d..a19189ac7c 100644
--- a/Code/Framework/AzCore/AzCore/Math/ShapeIntersection.inl
+++ b/Code/Framework/AzCore/AzCore/Math/ShapeIntersection.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/SimdMath.h b/Code/Framework/AzCore/AzCore/Math/SimdMath.h
index bc34f3c4ae..a65dba8e8e 100644
--- a/Code/Framework/AzCore/AzCore/Math/SimdMath.h
+++ b/Code/Framework/AzCore/AzCore/Math/SimdMath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/SimdMathVec1.h b/Code/Framework/AzCore/AzCore/Math/SimdMathVec1.h
index 5a5768443a..63537a8385 100644
--- a/Code/Framework/AzCore/AzCore/Math/SimdMathVec1.h
+++ b/Code/Framework/AzCore/AzCore/Math/SimdMathVec1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/SimdMathVec2.h b/Code/Framework/AzCore/AzCore/Math/SimdMathVec2.h
index a1d59f4b0c..5576217bba 100644
--- a/Code/Framework/AzCore/AzCore/Math/SimdMathVec2.h
+++ b/Code/Framework/AzCore/AzCore/Math/SimdMathVec2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/SimdMathVec3.h b/Code/Framework/AzCore/AzCore/Math/SimdMathVec3.h
index 89dd6b3e23..c3440a9db8 100644
--- a/Code/Framework/AzCore/AzCore/Math/SimdMathVec3.h
+++ b/Code/Framework/AzCore/AzCore/Math/SimdMathVec3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/SimdMathVec4.h b/Code/Framework/AzCore/AzCore/Math/SimdMathVec4.h
index e37a1f1f00..3756c7bc22 100644
--- a/Code/Framework/AzCore/AzCore/Math/SimdMathVec4.h
+++ b/Code/Framework/AzCore/AzCore/Math/SimdMathVec4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Sphere.h b/Code/Framework/AzCore/AzCore/Math/Sphere.h
index 48ed42827b..7f27270700 100644
--- a/Code/Framework/AzCore/AzCore/Math/Sphere.h
+++ b/Code/Framework/AzCore/AzCore/Math/Sphere.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Sphere.inl b/Code/Framework/AzCore/AzCore/Math/Sphere.inl
index 4dabd50082..41ab538c30 100644
--- a/Code/Framework/AzCore/AzCore/Math/Sphere.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Sphere.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Spline.cpp b/Code/Framework/AzCore/AzCore/Math/Spline.cpp
index 0b962dd975..445eb8ac74 100644
--- a/Code/Framework/AzCore/AzCore/Math/Spline.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Spline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Spline.h b/Code/Framework/AzCore/AzCore/Math/Spline.h
index 8629406f61..786a4332a0 100644
--- a/Code/Framework/AzCore/AzCore/Math/Spline.h
+++ b/Code/Framework/AzCore/AzCore/Math/Spline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/ToString.cpp b/Code/Framework/AzCore/AzCore/Math/ToString.cpp
index 66647c3fa4..e75efcbf7d 100644
--- a/Code/Framework/AzCore/AzCore/Math/ToString.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/ToString.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/ToString.h b/Code/Framework/AzCore/AzCore/Math/ToString.h
index fde194bbd8..b41c7be25e 100644
--- a/Code/Framework/AzCore/AzCore/Math/ToString.h
+++ b/Code/Framework/AzCore/AzCore/Math/ToString.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Transform.cpp b/Code/Framework/AzCore/AzCore/Math/Transform.cpp
index d0c235b4d9..0cdeb9403e 100644
--- a/Code/Framework/AzCore/AzCore/Math/Transform.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Transform.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Transform.h b/Code/Framework/AzCore/AzCore/Math/Transform.h
index 96cf5f699e..32fba00663 100644
--- a/Code/Framework/AzCore/AzCore/Math/Transform.h
+++ b/Code/Framework/AzCore/AzCore/Math/Transform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Transform.inl b/Code/Framework/AzCore/AzCore/Math/Transform.inl
index 3586e959e8..c6a6ed5dc0 100644
--- a/Code/Framework/AzCore/AzCore/Math/Transform.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Transform.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/TransformSerializer.cpp b/Code/Framework/AzCore/AzCore/Math/TransformSerializer.cpp
index 270e92360b..939ba614fa 100644
--- a/Code/Framework/AzCore/AzCore/Math/TransformSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/TransformSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/TransformSerializer.h b/Code/Framework/AzCore/AzCore/Math/TransformSerializer.h
index 96e126156f..a4effa42fe 100644
--- a/Code/Framework/AzCore/AzCore/Math/TransformSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Math/TransformSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Uuid.cpp b/Code/Framework/AzCore/AzCore/Math/Uuid.cpp
index ecc108c706..4da6fadff5 100644
--- a/Code/Framework/AzCore/AzCore/Math/Uuid.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Uuid.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Uuid.h b/Code/Framework/AzCore/AzCore/Math/Uuid.h
index 948bd5c230..57c9b010cf 100644
--- a/Code/Framework/AzCore/AzCore/Math/Uuid.h
+++ b/Code/Framework/AzCore/AzCore/Math/Uuid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/UuidSerializer.cpp b/Code/Framework/AzCore/AzCore/Math/UuidSerializer.cpp
index 33bbb5968d..7e83d5c307 100644
--- a/Code/Framework/AzCore/AzCore/Math/UuidSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/UuidSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/UuidSerializer.h b/Code/Framework/AzCore/AzCore/Math/UuidSerializer.h
index e305e1728d..e3c1f4c7ed 100644
--- a/Code/Framework/AzCore/AzCore/Math/UuidSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Math/UuidSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector2.cpp b/Code/Framework/AzCore/AzCore/Math/Vector2.cpp
index ed4cac2c34..50dc000ee0 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector2.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Vector2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector2.h b/Code/Framework/AzCore/AzCore/Math/Vector2.h
index a6a635b051..455685b54e 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector2.h
+++ b/Code/Framework/AzCore/AzCore/Math/Vector2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector2.inl b/Code/Framework/AzCore/AzCore/Math/Vector2.inl
index 85f3db3742..d044a5af9f 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector2.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Vector2.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector3.cpp b/Code/Framework/AzCore/AzCore/Math/Vector3.cpp
index 96b8a3aa1c..6273478d69 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector3.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Vector3.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector3.h b/Code/Framework/AzCore/AzCore/Math/Vector3.h
index 5bc19617bf..b489b7e951 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector3.h
+++ b/Code/Framework/AzCore/AzCore/Math/Vector3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector3.inl b/Code/Framework/AzCore/AzCore/Math/Vector3.inl
index ce1315560b..53e82e4800 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector3.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Vector3.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector4.cpp b/Code/Framework/AzCore/AzCore/Math/Vector4.cpp
index 9eb55cc58e..d7058890b4 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector4.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Vector4.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector4.h b/Code/Framework/AzCore/AzCore/Math/Vector4.h
index 87be4dc275..04ca45da1a 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector4.h
+++ b/Code/Framework/AzCore/AzCore/Math/Vector4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/Vector4.inl b/Code/Framework/AzCore/AzCore/Math/Vector4.inl
index f5c891b8cc..e4a9b0a468 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector4.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Vector4.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/VectorConversions.h b/Code/Framework/AzCore/AzCore/Math/VectorConversions.h
index 79fde103cd..8171362dbf 100644
--- a/Code/Framework/AzCore/AzCore/Math/VectorConversions.h
+++ b/Code/Framework/AzCore/AzCore/Math/VectorConversions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/VertexContainer.cpp b/Code/Framework/AzCore/AzCore/Math/VertexContainer.cpp
index c10fe305cf..e7f84b3709 100644
--- a/Code/Framework/AzCore/AzCore/Math/VertexContainer.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/VertexContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/VertexContainer.h b/Code/Framework/AzCore/AzCore/Math/VertexContainer.h
index 710e20b5be..caf6e5ab8a 100644
--- a/Code/Framework/AzCore/AzCore/Math/VertexContainer.h
+++ b/Code/Framework/AzCore/AzCore/Math/VertexContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Math/VertexContainerInterface.h b/Code/Framework/AzCore/AzCore/Math/VertexContainerInterface.h
index e1756a7a9a..652f7ac5fe 100644
--- a/Code/Framework/AzCore/AzCore/Math/VertexContainerInterface.h
+++ b/Code/Framework/AzCore/AzCore/Math/VertexContainerInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocationRecords.cpp b/Code/Framework/AzCore/AzCore/Memory/AllocationRecords.cpp
index 8ab0f3396e..de7a5d0428 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocationRecords.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocationRecords.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocationRecords.h b/Code/Framework/AzCore/AzCore/Memory/AllocationRecords.h
index 67d0b208df..6076409a6a 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocationRecords.h
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocationRecords.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocatorBase.cpp b/Code/Framework/AzCore/AzCore/Memory/AllocatorBase.cpp
index 2f6dd28dbe..6cabcba11f 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorBase.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocatorBase.h b/Code/Framework/AzCore/AzCore/Memory/AllocatorBase.h
index 35121253ee..8c342173a0 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorBase.h
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp
index 3015a19922..bb301e0106 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h
index 6e20ed5da1..c6472551d4 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.cpp b/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.cpp
index 4ca9ca842d..d5761dbb96 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.h b/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.h
index 481e351419..2d0bad6284 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.h
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocatorScope.h b/Code/Framework/AzCore/AzCore/Memory/AllocatorScope.h
index 50cbb18e32..2ab75fd51c 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorScope.h
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorScope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/AllocatorWrapper.h b/Code/Framework/AzCore/AzCore/Memory/AllocatorWrapper.h
index a9e687944f..fe52c33de0 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorWrapper.h
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.cpp b/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.cpp
index 59fafcc297..c8cd434d82 100644
--- a/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.h b/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.h
index 38d0214c61..4fe3d0c35b 100644
--- a/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.h
+++ b/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.cpp
index 5020e26b51..0fd37ce227 100644
--- a/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.h b/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.h
index d194981b56..2489f79a6c 100644
--- a/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.h
+++ b/Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/Config.h b/Code/Framework/AzCore/AzCore/Memory/Config.h
index b57e06939b..c21aa982b4 100644
--- a/Code/Framework/AzCore/AzCore/Memory/Config.h
+++ b/Code/Framework/AzCore/AzCore/Memory/Config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/HeapSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/HeapSchema.cpp
index 59674e918c..75e23abed7 100644
--- a/Code/Framework/AzCore/AzCore/Memory/HeapSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/HeapSchema.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/HeapSchema.h b/Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
index e94fb62845..ce1f2c4f41 100644
--- a/Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
+++ b/Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
index e68d34e2dc..fc0c876f91 100644
--- a/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/HphaSchema.h b/Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
index fccdcfd162..6473ec4fd2 100644
--- a/Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
+++ b/Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/IAllocator.cpp b/Code/Framework/AzCore/AzCore/Memory/IAllocator.cpp
index 283bddbe6d..0bfa1aba94 100644
--- a/Code/Framework/AzCore/AzCore/Memory/IAllocator.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/IAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/IAllocator.h b/Code/Framework/AzCore/AzCore/Memory/IAllocator.h
index 28be709761..d29929af7b 100644
--- a/Code/Framework/AzCore/AzCore/Memory/IAllocator.h
+++ b/Code/Framework/AzCore/AzCore/Memory/IAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/MallocSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/MallocSchema.cpp
index 8194e9df10..4cd0c28869 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MallocSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/MallocSchema.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/MallocSchema.h b/Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
index be6accbfe8..51adc45be0 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
+++ b/Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/Memory.cpp b/Code/Framework/AzCore/AzCore/Memory/Memory.cpp
index 29779dc4f4..0abdc22cf9 100644
--- a/Code/Framework/AzCore/AzCore/Memory/Memory.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/Memory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/Memory.h b/Code/Framework/AzCore/AzCore/Memory/Memory.h
index 11b18bbfcd..a592d5896e 100644
--- a/Code/Framework/AzCore/AzCore/Memory/Memory.h
+++ b/Code/Framework/AzCore/AzCore/Memory/Memory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/MemoryComponent.cpp b/Code/Framework/AzCore/AzCore/Memory/MemoryComponent.cpp
index 78592f0028..c1b56d10ff 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MemoryComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/MemoryComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/MemoryComponent.h b/Code/Framework/AzCore/AzCore/Memory/MemoryComponent.h
index 7de64c9a5e..84e487ec24 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MemoryComponent.h
+++ b/Code/Framework/AzCore/AzCore/Memory/MemoryComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.cpp b/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.cpp
index f534e67e04..226a88e4a5 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.h b/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.h
index e955547fcd..497876a0ae 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.h
+++ b/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/MemoryDrillerBus.h b/Code/Framework/AzCore/AzCore/Memory/MemoryDrillerBus.h
index 17320c84ba..341a5fff7f 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MemoryDrillerBus.h
+++ b/Code/Framework/AzCore/AzCore/Memory/MemoryDrillerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/NewAndDelete.inl b/Code/Framework/AzCore/AzCore/Memory/NewAndDelete.inl
index a951200392..ae36f72357 100644
--- a/Code/Framework/AzCore/AzCore/Memory/NewAndDelete.inl
+++ b/Code/Framework/AzCore/AzCore/Memory/NewAndDelete.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/OSAllocator.cpp b/Code/Framework/AzCore/AzCore/Memory/OSAllocator.cpp
index 006e7b23f5..0bc5ca296b 100644
--- a/Code/Framework/AzCore/AzCore/Memory/OSAllocator.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/OSAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/OSAllocator.h b/Code/Framework/AzCore/AzCore/Memory/OSAllocator.h
index 2ec1cdbb59..cca0726204 100644
--- a/Code/Framework/AzCore/AzCore/Memory/OSAllocator.h
+++ b/Code/Framework/AzCore/AzCore/Memory/OSAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.cpp b/Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.cpp
index 0c20786b63..55ce73d50e 100644
--- a/Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h b/Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h
index 2e1bc523ca..8e539a976e 100644
--- a/Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h
+++ b/Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/PlatformMemoryInstrumentation.h b/Code/Framework/AzCore/AzCore/Memory/PlatformMemoryInstrumentation.h
index f066c8fb70..1112738443 100644
--- a/Code/Framework/AzCore/AzCore/Memory/PlatformMemoryInstrumentation.h
+++ b/Code/Framework/AzCore/AzCore/Memory/PlatformMemoryInstrumentation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/PoolAllocator.h b/Code/Framework/AzCore/AzCore/Memory/PoolAllocator.h
index 134fd952ae..3b345779f4 100644
--- a/Code/Framework/AzCore/AzCore/Memory/PoolAllocator.h
+++ b/Code/Framework/AzCore/AzCore/Memory/PoolAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp
index 80cafab4a5..765d8a4107 100644
--- a/Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/PoolSchema.h b/Code/Framework/AzCore/AzCore/Memory/PoolSchema.h
index 81cd31d2cf..558a1e209c 100644
--- a/Code/Framework/AzCore/AzCore/Memory/PoolSchema.h
+++ b/Code/Framework/AzCore/AzCore/Memory/PoolSchema.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/SimpleSchemaAllocator.h b/Code/Framework/AzCore/AzCore/Memory/SimpleSchemaAllocator.h
index 3748655c80..d4f5d9b04b 100644
--- a/Code/Framework/AzCore/AzCore/Memory/SimpleSchemaAllocator.h
+++ b/Code/Framework/AzCore/AzCore/Memory/SimpleSchemaAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp b/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp
index cd88273dfd..58e7059c9f 100644
--- a/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.h b/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.h
index 09024c8ca3..2793aed98b 100644
--- a/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.h
+++ b/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/dlmalloc.inl b/Code/Framework/AzCore/AzCore/Memory/dlmalloc.inl
index 380537eb35..3219380db4 100644
--- a/Code/Framework/AzCore/AzCore/Memory/dlmalloc.inl
+++ b/Code/Framework/AzCore/AzCore/Memory/dlmalloc.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Memory/nedmalloc.inl b/Code/Framework/AzCore/AzCore/Memory/nedmalloc.inl
index 79a51c8e21..67a06a12fd 100644
--- a/Code/Framework/AzCore/AzCore/Memory/nedmalloc.inl
+++ b/Code/Framework/AzCore/AzCore/Memory/nedmalloc.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.cpp b/Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.cpp
index 24bc2b33ef..ffd2d3a9ad 100644
--- a/Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.cpp
+++ b/Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.h b/Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.h
index 6be5df0c52..214abbc2f6 100644
--- a/Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.h
+++ b/Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/Environment.cpp b/Code/Framework/AzCore/AzCore/Module/Environment.cpp
index 1e74c03b86..e759221522 100644
--- a/Code/Framework/AzCore/AzCore/Module/Environment.cpp
+++ b/Code/Framework/AzCore/AzCore/Module/Environment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/Environment.h b/Code/Framework/AzCore/AzCore/Module/Environment.h
index 4b778f3b2e..4f0bd251d2 100644
--- a/Code/Framework/AzCore/AzCore/Module/Environment.h
+++ b/Code/Framework/AzCore/AzCore/Module/Environment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.cpp b/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.cpp
index b0c337a1de..ecad58938c 100644
--- a/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.cpp
+++ b/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.h b/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.h
index a03c4d8707..e1b7c6bbea 100644
--- a/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.h
+++ b/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/Module.cpp b/Code/Framework/AzCore/AzCore/Module/Module.cpp
index 502ff0929d..f64673ad13 100644
--- a/Code/Framework/AzCore/AzCore/Module/Module.cpp
+++ b/Code/Framework/AzCore/AzCore/Module/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/Module.h b/Code/Framework/AzCore/AzCore/Module/Module.h
index 8464fc8dea..db8b49a672 100644
--- a/Code/Framework/AzCore/AzCore/Module/Module.h
+++ b/Code/Framework/AzCore/AzCore/Module/Module.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/ModuleManager.cpp b/Code/Framework/AzCore/AzCore/Module/ModuleManager.cpp
index cbdf71b7e9..7ef86f9210 100644
--- a/Code/Framework/AzCore/AzCore/Module/ModuleManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Module/ModuleManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/ModuleManager.h b/Code/Framework/AzCore/AzCore/Module/ModuleManager.h
index 369b4ab70b..2d62cb656e 100644
--- a/Code/Framework/AzCore/AzCore/Module/ModuleManager.h
+++ b/Code/Framework/AzCore/AzCore/Module/ModuleManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Module/ModuleManagerBus.h b/Code/Framework/AzCore/AzCore/Module/ModuleManagerBus.h
index 609d049a12..6146bd041d 100644
--- a/Code/Framework/AzCore/AzCore/Module/ModuleManagerBus.h
+++ b/Code/Framework/AzCore/AzCore/Module/ModuleManagerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp b/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
index e307915dfe..542f59f41c 100644
--- a/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/Internal/NameData.h b/Code/Framework/AzCore/AzCore/Name/Internal/NameData.h
index 364935be56..69993f7fbc 100644
--- a/Code/Framework/AzCore/AzCore/Name/Internal/NameData.h
+++ b/Code/Framework/AzCore/AzCore/Name/Internal/NameData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/Name.cpp b/Code/Framework/AzCore/AzCore/Name/Name.cpp
index fcdb2440ae..f11ca3913d 100644
--- a/Code/Framework/AzCore/AzCore/Name/Name.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/Name.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/Name.h b/Code/Framework/AzCore/AzCore/Name/Name.h
index c169c52c8b..8d0dec18f4 100644
--- a/Code/Framework/AzCore/AzCore/Name/Name.h
+++ b/Code/Framework/AzCore/AzCore/Name/Name.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp b/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
index 456f2caa0f..ad4ad3aa3a 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/NameDictionary.h b/Code/Framework/AzCore/AzCore/Name/NameDictionary.h
index c4c0d79b17..b92314f634 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameDictionary.h
+++ b/Code/Framework/AzCore/AzCore/Name/NameDictionary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.cpp b/Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.cpp
index d2089749ac..f2112864c7 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.h b/Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.h
index 98733387be..6909f4dffe 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/NameSerializer.cpp b/Code/Framework/AzCore/AzCore/Name/NameSerializer.cpp
index ad78cb1c87..65fa2be36a 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/NameSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Name/NameSerializer.h b/Code/Framework/AzCore/AzCore/Name/NameSerializer.h
index 0cb437704a..cfc3a355f7 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Name/NameSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h b/Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h
index 7959846a6e..d8548e02c6 100644
--- a/Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h
+++ b/Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp b/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp
index 66cd69f739..9a36c8f69f 100644
--- a/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h b/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h
index 3ea6120e63..58dd369ca4 100644
--- a/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Outcome/Internal/OutcomeImpl.h b/Code/Framework/AzCore/AzCore/Outcome/Internal/OutcomeImpl.h
index 19804421a8..eba52bba0e 100644
--- a/Code/Framework/AzCore/AzCore/Outcome/Internal/OutcomeImpl.h
+++ b/Code/Framework/AzCore/AzCore/Outcome/Internal/OutcomeImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Outcome/Internal/OutcomeStorage.h b/Code/Framework/AzCore/AzCore/Outcome/Internal/OutcomeStorage.h
index 199e5ce7e8..81b67c5787 100644
--- a/Code/Framework/AzCore/AzCore/Outcome/Internal/OutcomeStorage.h
+++ b/Code/Framework/AzCore/AzCore/Outcome/Internal/OutcomeStorage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Outcome/Outcome.h b/Code/Framework/AzCore/AzCore/Outcome/Outcome.h
index 96ddbffb71..0f1f8466e4 100644
--- a/Code/Framework/AzCore/AzCore/Outcome/Outcome.h
+++ b/Code/Framework/AzCore/AzCore/Outcome/Outcome.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Platform.cpp b/Code/Framework/AzCore/AzCore/Platform.cpp
index 36980289b0..98a2ab3e45 100644
--- a/Code/Framework/AzCore/AzCore/Platform.cpp
+++ b/Code/Framework/AzCore/AzCore/Platform.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Platform.h b/Code/Framework/AzCore/AzCore/Platform.h
index 98387eded2..60985820c8 100644
--- a/Code/Framework/AzCore/AzCore/Platform.h
+++ b/Code/Framework/AzCore/AzCore/Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/PlatformDef.h b/Code/Framework/AzCore/AzCore/PlatformDef.h
index 714dc09aec..c966de7808 100644
--- a/Code/Framework/AzCore/AzCore/PlatformDef.h
+++ b/Code/Framework/AzCore/AzCore/PlatformDef.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp b/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp
index b3ab7b7c59..fae4d7475e 100644
--- a/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp
+++ b/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h b/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h
index 55793b17af..f2a84952b8 100644
--- a/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h
+++ b/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp b/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp
index 72c4245f9e..6130c5080f 100644
--- a/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp
+++ b/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h b/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h
index 335e1e9daf..4021879b06 100644
--- a/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h
+++ b/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/PlatformIncl.h b/Code/Framework/AzCore/AzCore/PlatformIncl.h
index 259db10c08..a4c1ebd37f 100644
--- a/Code/Framework/AzCore/AzCore/PlatformIncl.h
+++ b/Code/Framework/AzCore/AzCore/PlatformIncl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/PlatformRestrictedFileDef.h b/Code/Framework/AzCore/AzCore/PlatformRestrictedFileDef.h
index dfa60d8870..3dde6160d1 100644
--- a/Code/Framework/AzCore/AzCore/PlatformRestrictedFileDef.h
+++ b/Code/Framework/AzCore/AzCore/PlatformRestrictedFileDef.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Preprocessor/CodeGen.h b/Code/Framework/AzCore/AzCore/Preprocessor/CodeGen.h
index ed7ca0b93c..0d3fa33168 100644
--- a/Code/Framework/AzCore/AzCore/Preprocessor/CodeGen.h
+++ b/Code/Framework/AzCore/AzCore/Preprocessor/CodeGen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Preprocessor/CodeGenBoilerplate.h b/Code/Framework/AzCore/AzCore/Preprocessor/CodeGenBoilerplate.h
index 5287d61341..3a331ded1c 100644
--- a/Code/Framework/AzCore/AzCore/Preprocessor/CodeGenBoilerplate.h
+++ b/Code/Framework/AzCore/AzCore/Preprocessor/CodeGenBoilerplate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Preprocessor/Enum.h b/Code/Framework/AzCore/AzCore/Preprocessor/Enum.h
index 2ee4dfc5f1..25082aa882 100644
--- a/Code/Framework/AzCore/AzCore/Preprocessor/Enum.h
+++ b/Code/Framework/AzCore/AzCore/Preprocessor/Enum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Preprocessor/EnumReflectUtils.h b/Code/Framework/AzCore/AzCore/Preprocessor/EnumReflectUtils.h
index 6073185701..b12ccc7acd 100644
--- a/Code/Framework/AzCore/AzCore/Preprocessor/EnumReflectUtils.h
+++ b/Code/Framework/AzCore/AzCore/Preprocessor/EnumReflectUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Preprocessor/Sequences.h b/Code/Framework/AzCore/AzCore/Preprocessor/Sequences.h
index fc50afa3b2..c86e8c6690 100644
--- a/Code/Framework/AzCore/AzCore/Preprocessor/Sequences.h
+++ b/Code/Framework/AzCore/AzCore/Preprocessor/Sequences.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/AttributeReader.h b/Code/Framework/AzCore/AzCore/RTTI/AttributeReader.h
index aa84f75eac..7ea21b8fa0 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/AttributeReader.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/AttributeReader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandPrettyName.inl b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandPrettyName.inl
index 75d3db7ff5..e19efb6cb2 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandPrettyName.inl
+++ b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandPrettyName.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
index 7534038bcd..12c61cd903 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
+++ b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflectionLuaFunctions.inl b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflectionLuaFunctions.inl
index f5249ba2bb..79aa141208 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflectionLuaFunctions.inl
+++ b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflectionLuaFunctions.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/AzStdReflectionComponent.cpp b/Code/Framework/AzCore/AzCore/RTTI/AzStdReflectionComponent.cpp
index 33c952fb51..55574c1fb3 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/AzStdReflectionComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/RTTI/AzStdReflectionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/AzStdReflectionComponent.h b/Code/Framework/AzCore/AzCore/RTTI/AzStdReflectionComponent.h
index 75ea070519..61882eea8d 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/AzStdReflectionComponent.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/AzStdReflectionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.cpp b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.cpp
index 826a3310fc..69b33ff9aa 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.cpp
+++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h
index b647a9a113..58ff739801 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextAttributes.inl b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextAttributes.inl
index f3336f853f..8a852a2c61 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextAttributes.inl
+++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextAttributes.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.cpp b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.cpp
index 20f58dca6f..c4a53c5a71 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.cpp
+++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.h b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.h
index d424bbde64..3771471138 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/BehaviorObjectSignals.h b/Code/Framework/AzCore/AzCore/RTTI/BehaviorObjectSignals.h
index 78e100c6f2..14c0e46210 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorObjectSignals.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorObjectSignals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/RTTI.h b/Code/Framework/AzCore/AzCore/RTTI/RTTI.h
index 487ed33d8d..bea4e16e10 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/RTTI.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/RTTI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/ReflectContext.cpp b/Code/Framework/AzCore/AzCore/RTTI/ReflectContext.cpp
index 9eb18f42d4..d9f7ce1951 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/ReflectContext.cpp
+++ b/Code/Framework/AzCore/AzCore/RTTI/ReflectContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/ReflectContext.h b/Code/Framework/AzCore/AzCore/RTTI/ReflectContext.h
index 73419b9084..f1b8a3a0f3 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/ReflectContext.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/ReflectContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.cpp b/Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.cpp
index 3a2c0ed81e..e586393573 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.cpp
+++ b/Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.h b/Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.h
index 7b4ce3928e..37da59c167 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
index d0a499a137..27a3e9d2cf 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/RTTI/TypeSafeIntegral.h b/Code/Framework/AzCore/AzCore/RTTI/TypeSafeIntegral.h
index 3a4d2e3880..13c05d9792 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/TypeSafeIntegral.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/TypeSafeIntegral.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptAsset.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptAsset.cpp
index 6825df1c66..02f26c2768 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptAsset.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptAsset.h b/Code/Framework/AzCore/AzCore/Script/ScriptAsset.h
index 94fab4f516..afd053866f 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptAsset.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp
index 0dd24261b8..bcce4beb2c 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -5596,7 +5596,7 @@ LUA_API const Node* lua_getDummyNode()
             // Debugging
             void Error(ScriptContext::ErrorType error, bool doStackTrace, const char* format, va_list mark)
             {
-                // max size due to requirements of \CryEngine\CrySystem\Log.h MAX_TEMP_LENGTH_SIZE(2048) minus room for the time stamp (128)
+                // max size due to requirements of \Legacy\CrySystem\Log.h MAX_TEMP_LENGTH_SIZE(2048) minus room for the time stamp (128)
                 // otherwise if the script passes in a string larger, their script will cause an assert 
                 char message[4096 - 128];
                 azvsnprintf(message, AZ_ARRAY_SIZE(message), format, mark);
diff --git a/Code/Framework/AzCore/AzCore/Script/ScriptContext.h b/Code/Framework/AzCore/AzCore/Script/ScriptContext.h
index ddae4bf1e1..29d7e3a368 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptContext.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptContextAttributes.h b/Code/Framework/AzCore/AzCore/Script/ScriptContextAttributes.h
index 2970ee2e67..e09e0699f9 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptContextAttributes.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptContextAttributes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.cpp
index 05cad19e2d..b68b19ddda 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.h b/Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.h
index e5ddc3a7af..01ce5d579b 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptDebug.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptDebug.cpp
index 2f2ac5bdfa..8725e7f3f2 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptDebug.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptDebug.h b/Code/Framework/AzCore/AzCore/Script/ScriptDebug.h
index 638f95626e..f4b188fdd0 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptDebug.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptProperty.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptProperty.cpp
index 1247fdbdbd..ff7b64f9cf 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptProperty.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptProperty.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptProperty.h b/Code/Framework/AzCore/AzCore/Script/ScriptProperty.h
index 36998d6429..436465644e 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptProperty.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptProperty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptPropertyTable.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptPropertyTable.cpp
index 507a768537..0041cc2ee6 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptPropertyTable.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptPropertyTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptPropertyTable.h b/Code/Framework/AzCore/AzCore/Script/ScriptPropertyTable.h
index cd861db400..53718a3b0c 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptPropertyTable.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptPropertyTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptPropertyWatcherBus.h b/Code/Framework/AzCore/AzCore/Script/ScriptPropertyWatcherBus.h
index 66ee103b6f..2a27c0e234 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptPropertyWatcherBus.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptPropertyWatcherBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptSystemBus.h b/Code/Framework/AzCore/AzCore/Script/ScriptSystemBus.h
index f40bde1068..561e51ec2b 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptSystemBus.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptSystemBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
index 8469d57e63..ec81e34cd0 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.h b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.h
index a7febadcc5..b3e38ac851 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptTimePoint.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptTimePoint.cpp
index 92fd60caec..1b1953710e 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptTimePoint.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptTimePoint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/ScriptTimePoint.h b/Code/Framework/AzCore/AzCore/Script/ScriptTimePoint.h
index 604c007df6..867365c677 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptTimePoint.h
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptTimePoint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Script/lua/lua.h b/Code/Framework/AzCore/AzCore/Script/lua/lua.h
index e7e615164f..31f36cba67 100644
--- a/Code/Framework/AzCore/AzCore/Script/lua/lua.h
+++ b/Code/Framework/AzCore/AzCore/Script/lua/lua.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasAttributes.h b/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasAttributes.h
index 0f5e8c967b..59255164f1 100644
--- a/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasAttributes.h
+++ b/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasAttributes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.cpp b/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.cpp
index 7ea38173fc..82252b43a9 100644
--- a/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.cpp
+++ b/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.h b/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.h
index 7aedae0295..ea1b07a42d 100644
--- a/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.h
+++ b/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/AZStdAnyDataContainer.inl b/Code/Framework/AzCore/AzCore/Serialization/AZStdAnyDataContainer.inl
index 98d5ed6f5e..5f4989db37 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/AZStdAnyDataContainer.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/AZStdAnyDataContainer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
index 5e2e8cad49..efa9eb2bd1 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataOverlay.h b/Code/Framework/AzCore/AzCore/Serialization/DataOverlay.h
index add5f4e373..7c6393ad8e 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataOverlay.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataOverlay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataOverlayInstanceMsgs.h b/Code/Framework/AzCore/AzCore/Serialization/DataOverlayInstanceMsgs.h
index 1b36f054b1..b539ffb0f9 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataOverlayInstanceMsgs.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataOverlayInstanceMsgs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.cpp b/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.cpp
index 0c2931d767..8274e82786 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.h b/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.h
index 6376bc6d88..4b47ae5e76 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp b/Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp
index f773f81ce3..7ff0b8b117 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataPatch.h b/Code/Framework/AzCore/AzCore/Serialization/DataPatch.h
index 3adefda223..4a7858fe87 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataPatch.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataPatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataPatchBus.h b/Code/Framework/AzCore/AzCore/Serialization/DataPatchBus.h
index 6d9dfbfb5d..1f3f2c65e8 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataPatchBus.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataPatchBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataPatchUpgradeManager.cpp b/Code/Framework/AzCore/AzCore/Serialization/DataPatchUpgradeManager.cpp
index 309efef095..8c865323d0 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataPatchUpgradeManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataPatchUpgradeManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DataPatchUpgradeManager.h b/Code/Framework/AzCore/AzCore/Serialization/DataPatchUpgradeManager.h
index 26377aa12b..bf8410015e 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataPatchUpgradeManager.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataPatchUpgradeManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DynamicSerializableField.cpp b/Code/Framework/AzCore/AzCore/Serialization/DynamicSerializableField.cpp
index 020498350a..750980269d 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DynamicSerializableField.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/DynamicSerializableField.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/DynamicSerializableField.h b/Code/Framework/AzCore/AzCore/Serialization/DynamicSerializableField.h
index b6b5042b02..3dbabfdcc7 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DynamicSerializableField.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/DynamicSerializableField.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/EditContext.cpp b/Code/Framework/AzCore/AzCore/Serialization/EditContext.cpp
index 1443faee38..26910a016f 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/EditContext.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/EditContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/EditContext.h b/Code/Framework/AzCore/AzCore/Serialization/EditContext.h
index 8ad85dea9d..12ec84161b 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/EditContext.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/EditContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/EditContext.inl b/Code/Framework/AzCore/AzCore/Serialization/EditContext.inl
index 6d5ac0b162..c94c251423 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/EditContext.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/EditContext.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl b/Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl
index f63aedb3c2..5e5b7d4a63 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/IdUtils.h b/Code/Framework/AzCore/AzCore/Serialization/IdUtils.h
index 7c8c7c9d13..d390769eea 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/IdUtils.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/IdUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/IdUtils.inl b/Code/Framework/AzCore/AzCore/Serialization/IdUtils.inl
index 6e426bca40..cc0ecb3b5d 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/IdUtils.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/IdUtils.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/ArraySerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/ArraySerializer.cpp
index e70247c36f..cb0d0f14f6 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/ArraySerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/ArraySerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/ArraySerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/ArraySerializer.h
index beefc22b5f..95ab13f4b5 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/ArraySerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/ArraySerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/BaseJsonSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/BaseJsonSerializer.cpp
index daabd8a94f..fb62198a23 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/BaseJsonSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/BaseJsonSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/BaseJsonSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/BaseJsonSerializer.h
index 2e40a20fb3..37a6b70b05 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/BaseJsonSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/BaseJsonSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/BasicContainerSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/BasicContainerSerializer.cpp
index 3058f1a140..47c6c9035e 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/BasicContainerSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/BasicContainerSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/BasicContainerSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/BasicContainerSerializer.h
index b0f98ff73e..be13e65f70 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/BasicContainerSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/BasicContainerSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/BoolSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/BoolSerializer.cpp
index 87f138c4fe..9b71154f83 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/BoolSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/BoolSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/BoolSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/BoolSerializer.h
index e88786f6bb..6dca578c09 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/BoolSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/BoolSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
index 94744c755a..9b03108375 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.h
index a7114679f2..fccda5cc35 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/CastingHelpers.h b/Code/Framework/AzCore/AzCore/Serialization/Json/CastingHelpers.h
index 5b92387e66..07aa60fc64 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/CastingHelpers.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/CastingHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/DoubleSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/DoubleSerializer.cpp
index d208f1623e..35c03ae33c 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/DoubleSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/DoubleSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/DoubleSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/DoubleSerializer.h
index 52e81dcf54..62a51c8670 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/DoubleSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/DoubleSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/IntSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/IntSerializer.cpp
index 0e74500ff6..a87c8f89a5 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/IntSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/IntSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/IntSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/IntSerializer.h
index 9059be7e70..6a9fee2ff0 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/IntSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/IntSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp
index eded1764aa..1d95aa5740 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.h
index ed4978c800..d6f38f88bc 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp
index acbab9ba77..61869b7eb5 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -403,7 +403,12 @@ namespace AZ
         {
             if (!parentValue->EraseMember(tokens[path.GetTokenCount() - 1].name))
             {
-                return settings.m_reporting(R"(The "remove" operation failed to remove member from object.)",
+                rapidjson::StringBuffer pathString;
+                path.Stringify(pathString);
+                return settings.m_reporting(
+                    AZStd::string::format(
+                        R"(The "remove" operation failed to remove member '%s' from object at path '%s'.)",
+                        tokens[path.GetTokenCount() - 1].name, pathString.GetString()),
                     ResultCode(Tasks::Merge, Outcomes::Invalid), element);
             }
         }
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.h
index 7dc95e1a83..da1803b607 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerialization.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerialization.cpp
index 7d852d65a1..d168c9e1b8 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerialization.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerialization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerialization.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerialization.h
index df356660c1..d4d11aa84d 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerialization.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerialization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationMetadata.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationMetadata.h
index 1a56d3c784..15dfd4c02d 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationMetadata.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationMetadata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationMetadata.inl b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationMetadata.inl
index 2003d022c1..9dc6270c2c 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationMetadata.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationMetadata.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.cpp
index 632a016842..0397cc5937 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.h
index b2a4cfa19f..6d0b53c7fd 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationSettings.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationSettings.h
index d874d5c6ee..db65ceba76 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationSettings.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp
index 057c0591b0..2d69865b0b 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h
index 1cebb3a246..c2183691f3 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonStringConversionUtils.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonStringConversionUtils.h
index 255ed92bbb..b3ae8a5a6f 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonStringConversionUtils.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonStringConversionUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
index 49ccb7161c..71ba182dc6 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.h b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.h
index 17b9be31be..e1a08b7f49 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.cpp
index d090a2d0c7..aebd1dc5a6 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.h
index 1422aa9a03..1b56683068 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.cpp
index c285882d82..cf17a15f2b 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.h b/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.h
index 9ae292c71b..4a7bb87c58 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/RegistrationContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/SmartPointerSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/SmartPointerSerializer.cpp
index 924d9d99a3..ef03c87d50 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/SmartPointerSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/SmartPointerSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/SmartPointerSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/SmartPointerSerializer.h
index c9d2f84d06..6e1d90a638 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/SmartPointerSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/SmartPointerSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/StackedString.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/StackedString.cpp
index ab640b83c8..9466950d57 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/StackedString.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/StackedString.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/StackedString.h b/Code/Framework/AzCore/AzCore/Serialization/Json/StackedString.h
index 75c44859a3..dc66c8dab5 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/StackedString.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/StackedString.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/StringSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/StringSerializer.cpp
index 42473247f3..c7c649429c 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/StringSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/StringSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/StringSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/StringSerializer.h
index 5774f2757b..851c358357 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/StringSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/StringSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/TupleSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/TupleSerializer.cpp
index 8b39f02721..6582954389 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/TupleSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/TupleSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/TupleSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/TupleSerializer.h
index 0429430b47..bed78030b1 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/TupleSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/TupleSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/UnorderedSetSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/UnorderedSetSerializer.cpp
index 656d2ed7ee..18d34224dd 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/UnorderedSetSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/UnorderedSetSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/UnorderedSetSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/UnorderedSetSerializer.h
index 8f4c3be875..dd2bedf615 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/UnorderedSetSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/UnorderedSetSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.cpp
index e4854b0f7c..6fa6677659 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.h
index d154c157d3..78c3091610 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp b/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp
index 5ba8d9f36d..d236350b16 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.h b/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.h
index 14925fdbd9..a478e8d65c 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/SerializationUtils.cpp b/Code/Framework/AzCore/AzCore/Serialization/SerializationUtils.cpp
index 5d784dab0a..346198ef5a 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/SerializationUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/SerializationUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp b/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp
index e252dbb9e8..9db17e743b 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h b/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h
index 9b8d292a50..17527b12f8 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.cpp b/Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.cpp
index af6801bb17..e627cde621 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.inl b/Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.inl
index 4820a6be12..7e1e75cdc7 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/Utils.h b/Code/Framework/AzCore/AzCore/Serialization/Utils.h
index f34adc6971..bf0d245813 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Utils.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl b/Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl
index 1cb319cc6d..9bab5a82b9 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/CommandLine.cpp b/Code/Framework/AzCore/AzCore/Settings/CommandLine.cpp
index b02529e436..984cddd5c9 100644
--- a/Code/Framework/AzCore/AzCore/Settings/CommandLine.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/CommandLine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/CommandLine.h b/Code/Framework/AzCore/AzCore/Settings/CommandLine.h
index bcdc847eca..7e185f82b5 100644
--- a/Code/Framework/AzCore/AzCore/Settings/CommandLine.h
+++ b/Code/Framework/AzCore/AzCore/Settings/CommandLine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.cpp
index 748515ce7f..efbc0eaa1f 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
index 8b3490eb1d..baeca89636 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp
index 5959ae71ff..1a9a9bf11c 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h
index 075e5618af..19a5c7c1a6 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
index 4bb45e91ee..7e79db728b 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.h
index dec5128d70..a5c18c84a6 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
index 4faf6cb754..cca9a9453a 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
index e28c009877..12768217b1 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryScriptUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryScriptUtils.cpp
index 044b267aee..ebf5f7ca9e 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryScriptUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryScriptUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryScriptUtils.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryScriptUtils.h
index f5a82abb4a..9fc556230c 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryScriptUtils.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryScriptUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceAsset.cpp b/Code/Framework/AzCore/AzCore/Slice/SliceAsset.cpp
index bd1ff09733..ec886eb424 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceAsset.cpp
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceAsset.h b/Code/Framework/AzCore/AzCore/Slice/SliceAsset.h
index 93633596c5..7a6807b911 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceAsset.h
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceAssetHandler.cpp b/Code/Framework/AzCore/AzCore/Slice/SliceAssetHandler.cpp
index 577e0c936e..2b2bafd291 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceAssetHandler.cpp
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceAssetHandler.h b/Code/Framework/AzCore/AzCore/Slice/SliceAssetHandler.h
index 62ed44c10c..26c2035902 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceAssetHandler.h
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceBus.h b/Code/Framework/AzCore/AzCore/Slice/SliceBus.h
index 1563e03763..460191abaa 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceBus.h
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp b/Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp
index 23539143bf..cf65f52ba7 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceComponent.h b/Code/Framework/AzCore/AzCore/Slice/SliceComponent.h
index 8bc88cb982..22c32e148e 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceComponent.h
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoBus.h b/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoBus.h
index 1932b416fc..0d01727228 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoBus.h
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.cpp b/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.cpp
index b449368979..6b3689496d 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.h b/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.h
index 74485dc18c..d79109f47d 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.h
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.cpp
index cf7d55c739..e4ee783505 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.h b/Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.h
index 726a34acd5..f7bd3855d3 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Socket/AzSocket.cpp b/Code/Framework/AzCore/AzCore/Socket/AzSocket.cpp
index 2c8385619e..bbca7e39d0 100644
--- a/Code/Framework/AzCore/AzCore/Socket/AzSocket.cpp
+++ b/Code/Framework/AzCore/AzCore/Socket/AzSocket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Socket/AzSocket.h b/Code/Framework/AzCore/AzCore/Socket/AzSocket.h
index 06f30cc940..0ac599e104 100644
--- a/Code/Framework/AzCore/AzCore/Socket/AzSocket.h
+++ b/Code/Framework/AzCore/AzCore/Socket/AzSocket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Socket/AzSocket_fwd.h b/Code/Framework/AzCore/AzCore/Socket/AzSocket_fwd.h
index 590f9e1277..4549c55c32 100644
--- a/Code/Framework/AzCore/AzCore/Socket/AzSocket_fwd.h
+++ b/Code/Framework/AzCore/AzCore/Socket/AzSocket_fwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/State/HSM.cpp b/Code/Framework/AzCore/AzCore/State/HSM.cpp
index 671c8685b4..ca051bd60d 100644
--- a/Code/Framework/AzCore/AzCore/State/HSM.cpp
+++ b/Code/Framework/AzCore/AzCore/State/HSM.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/State/HSM.h b/Code/Framework/AzCore/AzCore/State/HSM.h
index c6f1f693ba..0d4150a038 100644
--- a/Code/Framework/AzCore/AzCore/State/HSM.h
+++ b/Code/Framework/AzCore/AzCore/State/HSM.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/NamedRunningStatistic.h b/Code/Framework/AzCore/AzCore/Statistics/NamedRunningStatistic.h
index 16c3c04a5a..421a659475 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/NamedRunningStatistic.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/NamedRunningStatistic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.cpp b/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.cpp
index 577dbad915..af7fbba403 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.cpp
+++ b/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.h b/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.h
index f87eac2f15..7a229c6733 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/RunningStatisticsManager.cpp b/Code/Framework/AzCore/AzCore/Statistics/RunningStatisticsManager.cpp
index 0ed49b0984..6ed79b4c3d 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/RunningStatisticsManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Statistics/RunningStatisticsManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfiler.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfiler.h
index 3edb1c3c9c..81cf1bf840 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfiler.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -20,11 +20,6 @@ namespace AZ
         //!
         //! See "StatisticalProfilerProxy.h" for more explanations on the meaning of Statistical Profiling.
         //!
-        //! See sample UnitTest code in "dev\Code\Framework\Tests\StatisticalProfiler.cpp" which is part of the "FrameworkTests"
-        //! project. Also, "dev\Code\CryEngine\Cry3DEngine\TerrainProfiler.h,.cpp"
-        //! and "dev\Code\CryEngine\RenderDll\Common\RendElements\TerrainUtils\Debug\TerrainProfiler.h,.cpp"
-        //! are good examples.
-        //!
         //! The StatisticalProfiler was made as a template to accommodate for several performance needs...
         //! If all the code that is being profiled is single threaded and you want to identify
         //! each statistic by its string name, then the default StatisticalProfiler<> works for you.
diff --git a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h
index a9180f1f71..2e4ab26d74 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp
index a6f0f09351..5d2b82b61e 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.h
index 111d3d305f..57bc7622ad 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h
index 753eea20bf..80f7b4ca0e 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/TimeDataStatisticsManager.cpp b/Code/Framework/AzCore/AzCore/Statistics/TimeDataStatisticsManager.cpp
index 26ddb22863..88be99fa75 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/TimeDataStatisticsManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Statistics/TimeDataStatisticsManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Statistics/TimeDataStatisticsManager.h b/Code/Framework/AzCore/AzCore/Statistics/TimeDataStatisticsManager.h
index da34e19d26..4fc0968c97 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/TimeDataStatisticsManager.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/TimeDataStatisticsManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp b/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp
index c582c0298d..4aa62cfd4e 100644
--- a/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp
+++ b/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.h b/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.h
index 35ca20d897..527513baa6 100644
--- a/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.h
+++ b/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Threading/ThreadSafeDeque.h b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeDeque.h
index a0077cd79f..37f3190c08 100644
--- a/Code/Framework/AzCore/AzCore/Threading/ThreadSafeDeque.h
+++ b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeDeque.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Threading/ThreadSafeDeque.inl b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeDeque.inl
index 1c9377f301..d6cac8ebcc 100644
--- a/Code/Framework/AzCore/AzCore/Threading/ThreadSafeDeque.inl
+++ b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeDeque.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.h b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.h
index cb5b1c2884..cae5400e83 100644
--- a/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.h
+++ b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.inl b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.inl
index fd6e544df3..cd34f1153d 100644
--- a/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.inl
+++ b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Time/ITime.h b/Code/Framework/AzCore/AzCore/Time/ITime.h
index 07260a2f32..38bb325693 100644
--- a/Code/Framework/AzCore/AzCore/Time/ITime.h
+++ b/Code/Framework/AzCore/AzCore/Time/ITime.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.cpp
index c57d79ec1e..e3915f0b4d 100644
--- a/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.h b/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.h
index a8563a1ee4..4a10cb2711 100644
--- a/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.h
+++ b/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.cpp b/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.cpp
index 0264d2f96a..d609af02ae 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.cpp
+++ b/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.h b/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.h
index 7e1786c26e..758a4baf5d 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.h
+++ b/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockFileIOBase.h b/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockFileIOBase.h
index 101f097800..806bccb68e 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockFileIOBase.h
+++ b/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockFileIOBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockSettingsRegistry.h b/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockSettingsRegistry.h
index 9641c9fd68..b898f04cc0 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockSettingsRegistry.h
+++ b/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockSettingsRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h b/Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h
index a25a705ac2..94ac460eef 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h
+++ b/Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UnitTest/UnitTest.h b/Code/Framework/AzCore/AzCore/UnitTest/UnitTest.h
index fe010e6c41..165de4a76b 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/UnitTest.h
+++ b/Code/Framework/AzCore/AzCore/UnitTest/UnitTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UserSettings/UserSettings.cpp b/Code/Framework/AzCore/AzCore/UserSettings/UserSettings.cpp
index f3bd5e7970..059dc53247 100644
--- a/Code/Framework/AzCore/AzCore/UserSettings/UserSettings.cpp
+++ b/Code/Framework/AzCore/AzCore/UserSettings/UserSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UserSettings/UserSettings.h b/Code/Framework/AzCore/AzCore/UserSettings/UserSettings.h
index 3dc1cf9688..a01540e8fa 100644
--- a/Code/Framework/AzCore/AzCore/UserSettings/UserSettings.h
+++ b/Code/Framework/AzCore/AzCore/UserSettings/UserSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.cpp b/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.cpp
index 5622317d11..268df797d2 100644
--- a/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.h b/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.h
index 671603df0c..7a6518ec49 100644
--- a/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.h
+++ b/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsProvider.cpp b/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsProvider.cpp
index b77444ae2f..4c3829cb50 100644
--- a/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsProvider.cpp
+++ b/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsProvider.h b/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsProvider.h
index cd5f7180ab..d5392ff431 100644
--- a/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsProvider.h
+++ b/Code/Framework/AzCore/AzCore/UserSettings/UserSettingsProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Utils/TypeHash.cpp b/Code/Framework/AzCore/AzCore/Utils/TypeHash.cpp
index 9cf0c0738b..4dc43659a3 100644
--- a/Code/Framework/AzCore/AzCore/Utils/TypeHash.cpp
+++ b/Code/Framework/AzCore/AzCore/Utils/TypeHash.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Utils/TypeHash.h b/Code/Framework/AzCore/AzCore/Utils/TypeHash.h
index 531f07fe40..5b6f58507a 100644
--- a/Code/Framework/AzCore/AzCore/Utils/TypeHash.h
+++ b/Code/Framework/AzCore/AzCore/Utils/TypeHash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Utils/Utils.cpp b/Code/Framework/AzCore/AzCore/Utils/Utils.cpp
index 92e38171f3..be2921aaca 100644
--- a/Code/Framework/AzCore/AzCore/Utils/Utils.cpp
+++ b/Code/Framework/AzCore/AzCore/Utils/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/Utils/Utils.h b/Code/Framework/AzCore/AzCore/Utils/Utils.h
index 4726898292..67807a9204 100644
--- a/Code/Framework/AzCore/AzCore/Utils/Utils.h
+++ b/Code/Framework/AzCore/AzCore/Utils/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/XML/rapidxml.h b/Code/Framework/AzCore/AzCore/XML/rapidxml.h
index 1439aff69c..4dec81a97f 100644
--- a/Code/Framework/AzCore/AzCore/XML/rapidxml.h
+++ b/Code/Framework/AzCore/AzCore/XML/rapidxml.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/XML/rapidxml_iterators.h b/Code/Framework/AzCore/AzCore/XML/rapidxml_iterators.h
index aca2d28a8f..48d2c3f12e 100644
--- a/Code/Framework/AzCore/AzCore/XML/rapidxml_iterators.h
+++ b/Code/Framework/AzCore/AzCore/XML/rapidxml_iterators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/XML/rapidxml_print.h b/Code/Framework/AzCore/AzCore/XML/rapidxml_print.h
index c95fb798c9..f880f495f1 100644
--- a/Code/Framework/AzCore/AzCore/XML/rapidxml_print.h
+++ b/Code/Framework/AzCore/AzCore/XML/rapidxml_print.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/XML/rapidxml_utils.h b/Code/Framework/AzCore/AzCore/XML/rapidxml_utils.h
index f8079005f1..d1e20a3b20 100644
--- a/Code/Framework/AzCore/AzCore/XML/rapidxml_utils.h
+++ b/Code/Framework/AzCore/AzCore/XML/rapidxml_utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/azcore_files.cmake b/Code/Framework/AzCore/AzCore/azcore_files.cmake
index e4f76ed0f0..5cfdb67d03 100644
--- a/Code/Framework/AzCore/AzCore/azcore_files.cmake
+++ b/Code/Framework/AzCore/AzCore/azcore_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/AzCore/azcoretestcommon_files.cmake b/Code/Framework/AzCore/AzCore/azcoretestcommon_files.cmake
index e546ee55dd..fa970754fa 100644
--- a/Code/Framework/AzCore/AzCore/azcoretestcommon_files.cmake
+++ b/Code/Framework/AzCore/AzCore/azcoretestcommon_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/AzCore/base.h b/Code/Framework/AzCore/AzCore/base.h
index 0f02ff6982..2338ebd863 100644
--- a/Code/Framework/AzCore/AzCore/base.h
+++ b/Code/Framework/AzCore/AzCore/base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/algorithm.h b/Code/Framework/AzCore/AzCore/std/algorithm.h
index 92a2b62841..62ba455fc2 100644
--- a/Code/Framework/AzCore/AzCore/std/algorithm.h
+++ b/Code/Framework/AzCore/AzCore/std/algorithm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/allocator.cpp b/Code/Framework/AzCore/AzCore/std/allocator.cpp
index 5d44a92976..58c6406624 100644
--- a/Code/Framework/AzCore/AzCore/std/allocator.cpp
+++ b/Code/Framework/AzCore/AzCore/std/allocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/allocator.h b/Code/Framework/AzCore/AzCore/std/allocator.h
index e5039a8f37..d407b90d11 100644
--- a/Code/Framework/AzCore/AzCore/std/allocator.h
+++ b/Code/Framework/AzCore/AzCore/std/allocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/allocator_ref.h b/Code/Framework/AzCore/AzCore/std/allocator_ref.h
index 40274bd24f..2561d70c5f 100644
--- a/Code/Framework/AzCore/AzCore/std/allocator_ref.h
+++ b/Code/Framework/AzCore/AzCore/std/allocator_ref.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/allocator_stack.h b/Code/Framework/AzCore/AzCore/std/allocator_stack.h
index 407721410a..eb74205d9f 100644
--- a/Code/Framework/AzCore/AzCore/std/allocator_stack.h
+++ b/Code/Framework/AzCore/AzCore/std/allocator_stack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/allocator_static.h b/Code/Framework/AzCore/AzCore/std/allocator_static.h
index a28dbb355d..1ec93b9c0e 100644
--- a/Code/Framework/AzCore/AzCore/std/allocator_static.h
+++ b/Code/Framework/AzCore/AzCore/std/allocator_static.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/allocator_traits.h b/Code/Framework/AzCore/AzCore/std/allocator_traits.h
index 0a668d4aac..a984e0aa9f 100644
--- a/Code/Framework/AzCore/AzCore/std/allocator_traits.h
+++ b/Code/Framework/AzCore/AzCore/std/allocator_traits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/any.h b/Code/Framework/AzCore/AzCore/std/any.h
index d5b4507227..8b57ed2baa 100644
--- a/Code/Framework/AzCore/AzCore/std/any.h
+++ b/Code/Framework/AzCore/AzCore/std/any.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/azstd_files.cmake b/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
index 1c50811c0a..06aa6672fe 100644
--- a/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
+++ b/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/AzCore/std/base.h b/Code/Framework/AzCore/AzCore/std/base.h
index f0f718c8d3..bc940cf0aa 100644
--- a/Code/Framework/AzCore/AzCore/std/base.h
+++ b/Code/Framework/AzCore/AzCore/std/base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/bind/bind.h b/Code/Framework/AzCore/AzCore/std/bind/bind.h
index b18adf0be2..c5d287fbfb 100644
--- a/Code/Framework/AzCore/AzCore/std/bind/bind.h
+++ b/Code/Framework/AzCore/AzCore/std/bind/bind.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/bind/mem_fn.h b/Code/Framework/AzCore/AzCore/std/bind/mem_fn.h
index f0ea015b61..afb0a03319 100644
--- a/Code/Framework/AzCore/AzCore/std/bind/mem_fn.h
+++ b/Code/Framework/AzCore/AzCore/std/bind/mem_fn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/chrono/chrono.h b/Code/Framework/AzCore/AzCore/std/chrono/chrono.h
index 85b31a870c..0fa535da4d 100644
--- a/Code/Framework/AzCore/AzCore/std/chrono/chrono.h
+++ b/Code/Framework/AzCore/AzCore/std/chrono/chrono.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/chrono/clocks.h b/Code/Framework/AzCore/AzCore/std/chrono/clocks.h
index 3d9e2906ab..7eb9ab4070 100644
--- a/Code/Framework/AzCore/AzCore/std/chrono/clocks.h
+++ b/Code/Framework/AzCore/AzCore/std/chrono/clocks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/chrono/types.h b/Code/Framework/AzCore/AzCore/std/chrono/types.h
index 47284be04c..62d261ca32 100644
--- a/Code/Framework/AzCore/AzCore/std/chrono/types.h
+++ b/Code/Framework/AzCore/AzCore/std/chrono/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/config.h b/Code/Framework/AzCore/AzCore/std/config.h
index 43bc3ee527..a6fa1d99cc 100644
--- a/Code/Framework/AzCore/AzCore/std/config.h
+++ b/Code/Framework/AzCore/AzCore/std/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/array.h b/Code/Framework/AzCore/AzCore/std/containers/array.h
index 5043cbdd16..b0f728c507 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/array.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/array.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/bitset.h b/Code/Framework/AzCore/AzCore/std/containers/bitset.h
index c1bab6af7e..8fecbb2659 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/bitset.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/bitset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.h b/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.h
index 45460b6ae4..d8d6644623 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.inl b/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.inl
index 46822588be..e3322532e1 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.inl
+++ b/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/deque.h b/Code/Framework/AzCore/AzCore/std/containers/deque.h
index b3902f1807..c9536fc2ac 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/deque.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/deque.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/fixed_forward_list.h b/Code/Framework/AzCore/AzCore/std/containers/fixed_forward_list.h
index b5a66bf03e..fcbe26fd60 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/fixed_forward_list.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/fixed_forward_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/fixed_list.h b/Code/Framework/AzCore/AzCore/std/containers/fixed_list.h
index abb8bcf9b2..6f0faa6e00 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/fixed_list.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/fixed_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/fixed_unordered_map.h b/Code/Framework/AzCore/AzCore/std/containers/fixed_unordered_map.h
index 67559ff9ab..a160fa02d9 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/fixed_unordered_map.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/fixed_unordered_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/fixed_unordered_set.h b/Code/Framework/AzCore/AzCore/std/containers/fixed_unordered_set.h
index 395ca52bda..e0c073cc32 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/fixed_unordered_set.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/fixed_unordered_set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h b/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h
index 5173c11d8a..47d89e210b 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/forward_list.h b/Code/Framework/AzCore/AzCore/std/containers/forward_list.h
index 94fe3d3eb1..d8eea2cecf 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/forward_list.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/forward_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/intrusive_list.h b/Code/Framework/AzCore/AzCore/std/containers/intrusive_list.h
index a07effec46..e0727c78c7 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/intrusive_list.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/intrusive_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/intrusive_set.h b/Code/Framework/AzCore/AzCore/std/containers/intrusive_set.h
index fbe7697cec..8bc711cf81 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/intrusive_set.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/intrusive_set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/intrusive_slist.h b/Code/Framework/AzCore/AzCore/std/containers/intrusive_slist.h
index 25d72cdd5f..5db1e8441b 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/intrusive_slist.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/intrusive_slist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/list.h b/Code/Framework/AzCore/AzCore/std/containers/list.h
index a759396f43..0d06a23301 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/list.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/map.h b/Code/Framework/AzCore/AzCore/std/containers/map.h
index cd6c5d94fc..e37fd0440e 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/map.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/node_handle.h b/Code/Framework/AzCore/AzCore/std/containers/node_handle.h
index ebe4474aba..aecd6974cc 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/node_handle.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/node_handle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/queue.h b/Code/Framework/AzCore/AzCore/std/containers/queue.h
index 9613d512bd..518fa73123 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/queue.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/queue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/rbtree.h b/Code/Framework/AzCore/AzCore/std/containers/rbtree.h
index 507e31f71c..c2ab950ad2 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/rbtree.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/rbtree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/ring_buffer.h b/Code/Framework/AzCore/AzCore/std/containers/ring_buffer.h
index 174000d61d..fb72340e33 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/ring_buffer.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/ring_buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/set.h b/Code/Framework/AzCore/AzCore/std/containers/set.h
index 546e4e7407..03cf38a1c7 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/set.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/stack.h b/Code/Framework/AzCore/AzCore/std/containers/stack.h
index 23c695e51c..7e3325c091 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/stack.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/stack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/unordered_map.h b/Code/Framework/AzCore/AzCore/std/containers/unordered_map.h
index 062011d88b..2ca584e41d 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/unordered_map.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/unordered_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/unordered_set.h b/Code/Framework/AzCore/AzCore/std/containers/unordered_set.h
index 1de8ebbd3a..948a7e58c8 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/unordered_set.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/unordered_set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/variant.h b/Code/Framework/AzCore/AzCore/std/containers/variant.h
index 30e55aaafc..d0920c838c 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/variant.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/variant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/variant.inl b/Code/Framework/AzCore/AzCore/std/containers/variant.inl
index d156de4159..4fd6e14a6c 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/variant.inl
+++ b/Code/Framework/AzCore/AzCore/std/containers/variant.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/variant_impl.h b/Code/Framework/AzCore/AzCore/std/containers/variant_impl.h
index 9c63f6171c..407296dec6 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/variant_impl.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/variant_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/containers/vector.h b/Code/Framework/AzCore/AzCore/std/containers/vector.h
index 54af89b86b..a92fc98427 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/vector.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/vector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/createdestroy.h b/Code/Framework/AzCore/AzCore/std/createdestroy.h
index 34f039d4b0..693b39ad55 100644
--- a/Code/Framework/AzCore/AzCore/std/createdestroy.h
+++ b/Code/Framework/AzCore/AzCore/std/createdestroy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/delegate/delegate.h b/Code/Framework/AzCore/AzCore/std/delegate/delegate.h
index 073d8ec046..6eb363ccfb 100644
--- a/Code/Framework/AzCore/AzCore/std/delegate/delegate.h
+++ b/Code/Framework/AzCore/AzCore/std/delegate/delegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/delegate/delegate_bind.h b/Code/Framework/AzCore/AzCore/std/delegate/delegate_bind.h
index 98a8cb80b9..72b88be9d2 100644
--- a/Code/Framework/AzCore/AzCore/std/delegate/delegate_bind.h
+++ b/Code/Framework/AzCore/AzCore/std/delegate/delegate_bind.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/delegate/delegate_fwd.h b/Code/Framework/AzCore/AzCore/std/delegate/delegate_fwd.h
index f7a5040de2..ad5be681a8 100644
--- a/Code/Framework/AzCore/AzCore/std/delegate/delegate_fwd.h
+++ b/Code/Framework/AzCore/AzCore/std/delegate/delegate_fwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/docs.h b/Code/Framework/AzCore/AzCore/std/docs.h
index 82dbc0ab15..6f1886cf39 100644
--- a/Code/Framework/AzCore/AzCore/std/docs.h
+++ b/Code/Framework/AzCore/AzCore/std/docs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/exceptions.h b/Code/Framework/AzCore/AzCore/std/exceptions.h
index 2b2d372706..05d7683631 100644
--- a/Code/Framework/AzCore/AzCore/std/exceptions.h
+++ b/Code/Framework/AzCore/AzCore/std/exceptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/function/function_base.h b/Code/Framework/AzCore/AzCore/std/function/function_base.h
index 7d8ed2920d..f07a4f86a5 100644
--- a/Code/Framework/AzCore/AzCore/std/function/function_base.h
+++ b/Code/Framework/AzCore/AzCore/std/function/function_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/function/function_fwd.h b/Code/Framework/AzCore/AzCore/std/function/function_fwd.h
index 33f407bef8..a7e2ef1698 100644
--- a/Code/Framework/AzCore/AzCore/std/function/function_fwd.h
+++ b/Code/Framework/AzCore/AzCore/std/function/function_fwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/function/function_template.h b/Code/Framework/AzCore/AzCore/std/function/function_template.h
index d8f9fdc0e0..62175b566f 100644
--- a/Code/Framework/AzCore/AzCore/std/function/function_template.h
+++ b/Code/Framework/AzCore/AzCore/std/function/function_template.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/function/identity.h b/Code/Framework/AzCore/AzCore/std/function/identity.h
index 2bf6c96e2e..63788d579c 100644
--- a/Code/Framework/AzCore/AzCore/std/function/identity.h
+++ b/Code/Framework/AzCore/AzCore/std/function/identity.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/function/invoke.h b/Code/Framework/AzCore/AzCore/std/function/invoke.h
index 919e3e73e3..682420c885 100644
--- a/Code/Framework/AzCore/AzCore/std/function/invoke.h
+++ b/Code/Framework/AzCore/AzCore/std/function/invoke.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/functional.h b/Code/Framework/AzCore/AzCore/std/functional.h
index 37c7d38fef..1f27f1f60a 100644
--- a/Code/Framework/AzCore/AzCore/std/functional.h
+++ b/Code/Framework/AzCore/AzCore/std/functional.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/functional_basic.h b/Code/Framework/AzCore/AzCore/std/functional_basic.h
index 74319d9c11..e1c40dfb31 100644
--- a/Code/Framework/AzCore/AzCore/std/functional_basic.h
+++ b/Code/Framework/AzCore/AzCore/std/functional_basic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/hash.cpp b/Code/Framework/AzCore/AzCore/std/hash.cpp
index 84ab7eacbf..2997df5e42 100644
--- a/Code/Framework/AzCore/AzCore/std/hash.cpp
+++ b/Code/Framework/AzCore/AzCore/std/hash.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/hash.h b/Code/Framework/AzCore/AzCore/std/hash.h
index 26e07ae814..a4b676636b 100644
--- a/Code/Framework/AzCore/AzCore/std/hash.h
+++ b/Code/Framework/AzCore/AzCore/std/hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/hash_table.h b/Code/Framework/AzCore/AzCore/std/hash_table.h
index d4cdbeee7c..873201caf4 100644
--- a/Code/Framework/AzCore/AzCore/std/hash_table.h
+++ b/Code/Framework/AzCore/AzCore/std/hash_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/iterator.h b/Code/Framework/AzCore/AzCore/std/iterator.h
index c2667ce58a..378852d57b 100644
--- a/Code/Framework/AzCore/AzCore/std/iterator.h
+++ b/Code/Framework/AzCore/AzCore/std/iterator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/limits.h b/Code/Framework/AzCore/AzCore/std/limits.h
index 40ea49ad74..27eead376f 100644
--- a/Code/Framework/AzCore/AzCore/std/limits.h
+++ b/Code/Framework/AzCore/AzCore/std/limits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/math.h b/Code/Framework/AzCore/AzCore/std/math.h
index 6fa063124a..8482ed76f5 100644
--- a/Code/Framework/AzCore/AzCore/std/math.h
+++ b/Code/Framework/AzCore/AzCore/std/math.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/numeric.h b/Code/Framework/AzCore/AzCore/std/numeric.h
index 37d7f9e32e..d0a63fac4e 100644
--- a/Code/Framework/AzCore/AzCore/std/numeric.h
+++ b/Code/Framework/AzCore/AzCore/std/numeric.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/optional.h b/Code/Framework/AzCore/AzCore/std/optional.h
index 795fda0a60..0c86efe150 100644
--- a/Code/Framework/AzCore/AzCore/std/optional.h
+++ b/Code/Framework/AzCore/AzCore/std/optional.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/allocator_concurrent_static.h b/Code/Framework/AzCore/AzCore/std/parallel/allocator_concurrent_static.h
index 47a419d831..94c6afc656 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/allocator_concurrent_static.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/allocator_concurrent_static.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/atomic.h b/Code/Framework/AzCore/AzCore/std/parallel/atomic.h
index 3ac8bd35c9..09924bdc4d 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/atomic.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/atomic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/binary_semaphore.h b/Code/Framework/AzCore/AzCore/std/parallel/binary_semaphore.h
index 2ba6fb731d..2f267d63a1 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/binary_semaphore.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/binary_semaphore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/combinable.h b/Code/Framework/AzCore/AzCore/std/parallel/combinable.h
index f228d14697..5fe91b7288 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/combinable.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/combinable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/condition_variable.h b/Code/Framework/AzCore/AzCore/std/parallel/condition_variable.h
index 240ed3c758..d612aeec78 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/condition_variable.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/condition_variable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/conditional_variable.h b/Code/Framework/AzCore/AzCore/std/parallel/conditional_variable.h
index a4c409a452..a38322c639 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/conditional_variable.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/conditional_variable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/config.h b/Code/Framework/AzCore/AzCore/std/parallel/config.h
index 61e2c32565..2b125a9fbb 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/config.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_fixed_unordered_map.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_fixed_unordered_map.h
index 99a5d49d7f..9a185ad50f 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_fixed_unordered_map.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_fixed_unordered_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_fixed_unordered_set.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_fixed_unordered_set.h
index 3993e3e6b4..e9ded4193f 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_fixed_unordered_set.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_fixed_unordered_set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_unordered_map.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_unordered_map.h
index 04fcc99b5c..05192062eb 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_unordered_map.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_unordered_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_unordered_set.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_unordered_set.h
index 4ff9fcbc45..cfba0f7ff6 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_unordered_set.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_unordered_set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_vector.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_vector.h
index 4a83309ff8..a0411c0a8a 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_vector.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/concurrent_vector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/internal/concurrent_hash_table.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/internal/concurrent_hash_table.h
index 2add213057..0dc8b02800 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/internal/concurrent_hash_table.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/internal/concurrent_hash_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_intrusive_stack.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_intrusive_stack.h
index 016bec0a28..41846fd5f2 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_intrusive_stack.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_intrusive_stack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_intrusive_stamped_stack.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_intrusive_stamped_stack.h
index 7cc21ad5fc..e662a9f0f7 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_intrusive_stamped_stack.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_intrusive_stamped_stack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_queue.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_queue.h
index ff0a570375..5237f2ffda 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_queue.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_queue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stack.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stack.h
index 27cab07b91..53622154c5 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stack.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stamped_queue.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stamped_queue.h
index 102861cc9d..679c7fa934 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stamped_queue.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stamped_queue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stamped_stack.h b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stamped_stack.h
index 1c121b3ccd..46c4f516e9 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stamped_stack.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/containers/lock_free_stamped_stack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/exponential_backoff.h b/Code/Framework/AzCore/AzCore/std/parallel/exponential_backoff.h
index 0f439cb699..0c4558163d 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/exponential_backoff.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/exponential_backoff.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/lock.h b/Code/Framework/AzCore/AzCore/std/parallel/lock.h
index f48ed86491..154d97cd4f 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/lock.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/lock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/mutex.h b/Code/Framework/AzCore/AzCore/std/parallel/mutex.h
index 697fcb8c4d..df3f3e3c5e 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/mutex.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/mutex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/scoped_lock.h b/Code/Framework/AzCore/AzCore/std/parallel/scoped_lock.h
index 2100480107..9f8b14e19b 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/scoped_lock.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/scoped_lock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/semaphore.h b/Code/Framework/AzCore/AzCore/std/parallel/semaphore.h
index dc39cf37a0..3997180bd0 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/semaphore.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/semaphore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/shared_mutex.h b/Code/Framework/AzCore/AzCore/std/parallel/shared_mutex.h
index 24430b1c6e..1ba2fb8d99 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/shared_mutex.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/shared_mutex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/shared_spin_mutex.h b/Code/Framework/AzCore/AzCore/std/parallel/shared_spin_mutex.h
index 350d311b0b..3409dd21ca 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/shared_spin_mutex.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/shared_spin_mutex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/spin_mutex.h b/Code/Framework/AzCore/AzCore/std/parallel/spin_mutex.h
index 5e5a3a0f5f..8b002dddbc 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/spin_mutex.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/spin_mutex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/thread.h b/Code/Framework/AzCore/AzCore/std/parallel/thread.h
index 2e808c9146..d3b5b398c6 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/thread.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/thread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/parallel/threadbus.h b/Code/Framework/AzCore/AzCore/std/parallel/threadbus.h
index d6acfd6e1c..09846c4c2b 100644
--- a/Code/Framework/AzCore/AzCore/std/parallel/threadbus.h
+++ b/Code/Framework/AzCore/AzCore/std/parallel/threadbus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/ratio.h b/Code/Framework/AzCore/AzCore/std/ratio.h
index 9c7babdcd0..3f015b7aa1 100644
--- a/Code/Framework/AzCore/AzCore/std/ratio.h
+++ b/Code/Framework/AzCore/AzCore/std/ratio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/reference_wrapper.h b/Code/Framework/AzCore/AzCore/std/reference_wrapper.h
index f41ec60a0d..75936085a9 100644
--- a/Code/Framework/AzCore/AzCore/std/reference_wrapper.h
+++ b/Code/Framework/AzCore/AzCore/std/reference_wrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/checked_delete.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/checked_delete.h
index 21a6660d05..e567e5f661 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/checked_delete.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/checked_delete.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/enable_shared_from_this.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/enable_shared_from_this.h
index e2aacdae25..6dc27a2f55 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/enable_shared_from_this.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/enable_shared_from_this.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/enable_shared_from_this2.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/enable_shared_from_this2.h
index a26c4cdbfd..2401b655f8 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/enable_shared_from_this2.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/enable_shared_from_this2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_base.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_base.h
index 7e4595a95b..3800e211bf 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_base.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_ptr.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_ptr.h
index 32c5d61d0a..15bcf9e185 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_ptr.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_ptr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_refcount.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_refcount.h
index 0b555bf6fa..814d6fe463 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_refcount.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/intrusive_refcount.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/make_shared.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/make_shared.h
index b2559f2e6d..a88f07802e 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/make_shared.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/make_shared.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/scoped_array.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/scoped_array.h
index 64b93c2342..ae22da6731 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/scoped_array.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/scoped_array.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/scoped_ptr.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/scoped_ptr.h
index a16fbfea25..88eeb10795 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/scoped_ptr.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/scoped_ptr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_array.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_array.h
index 03c67fa0a6..2a4e04f0d4 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_array.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_array.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_count.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_count.h
index ef5e07f08f..7044685cb9 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_count.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_count.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_ptr.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_ptr.h
index 7c8f0d080d..29e5ddc988 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_ptr.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/shared_ptr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/sp_convertible.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/sp_convertible.h
index 2aa58c7cea..88ba2abbe1 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/sp_convertible.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/sp_convertible.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/unique_ptr.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/unique_ptr.h
index 51b862f253..63cd12c09b 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/unique_ptr.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/unique_ptr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/smart_ptr/weak_ptr.h b/Code/Framework/AzCore/AzCore/std/smart_ptr/weak_ptr.h
index 89aaac9101..6e6a4f442b 100644
--- a/Code/Framework/AzCore/AzCore/std/smart_ptr/weak_ptr.h
+++ b/Code/Framework/AzCore/AzCore/std/smart_ptr/weak_ptr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/sort.h b/Code/Framework/AzCore/AzCore/std/sort.h
index 4a6cdc9967..3e6df36dff 100644
--- a/Code/Framework/AzCore/AzCore/std/sort.h
+++ b/Code/Framework/AzCore/AzCore/std/sort.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/alphanum.cpp b/Code/Framework/AzCore/AzCore/std/string/alphanum.cpp
index 8ab0305dbd..e9706d8cd2 100644
--- a/Code/Framework/AzCore/AzCore/std/string/alphanum.cpp
+++ b/Code/Framework/AzCore/AzCore/std/string/alphanum.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/alphanum.h b/Code/Framework/AzCore/AzCore/std/string/alphanum.h
index 4eaede022f..9dc2912962 100644
--- a/Code/Framework/AzCore/AzCore/std/string/alphanum.h
+++ b/Code/Framework/AzCore/AzCore/std/string/alphanum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/conversions.h b/Code/Framework/AzCore/AzCore/std/string/conversions.h
index 909f6c4a15..16b87f9bfc 100644
--- a/Code/Framework/AzCore/AzCore/std/string/conversions.h
+++ b/Code/Framework/AzCore/AzCore/std/string/conversions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/fixed_string.h b/Code/Framework/AzCore/AzCore/std/string/fixed_string.h
index d9562ea42a..935180c4c7 100644
--- a/Code/Framework/AzCore/AzCore/std/string/fixed_string.h
+++ b/Code/Framework/AzCore/AzCore/std/string/fixed_string.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl b/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl
index fc45fd0796..7ae03be127 100644
--- a/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl
+++ b/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/memorytoascii.cpp b/Code/Framework/AzCore/AzCore/std/string/memorytoascii.cpp
index 9b16d5aca3..e195fd8f1a 100644
--- a/Code/Framework/AzCore/AzCore/std/string/memorytoascii.cpp
+++ b/Code/Framework/AzCore/AzCore/std/string/memorytoascii.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/memorytoascii.h b/Code/Framework/AzCore/AzCore/std/string/memorytoascii.h
index 045c8b64bb..591393cf01 100644
--- a/Code/Framework/AzCore/AzCore/std/string/memorytoascii.h
+++ b/Code/Framework/AzCore/AzCore/std/string/memorytoascii.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/osstring.h b/Code/Framework/AzCore/AzCore/std/string/osstring.h
index 28ae1e1508..2a74d54519 100644
--- a/Code/Framework/AzCore/AzCore/std/string/osstring.h
+++ b/Code/Framework/AzCore/AzCore/std/string/osstring.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/regex.cpp b/Code/Framework/AzCore/AzCore/std/string/regex.cpp
index aa51f5d90b..87181f33bf 100644
--- a/Code/Framework/AzCore/AzCore/std/string/regex.cpp
+++ b/Code/Framework/AzCore/AzCore/std/string/regex.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/regex.h b/Code/Framework/AzCore/AzCore/std/string/regex.h
index da875caf78..427ee42a9b 100644
--- a/Code/Framework/AzCore/AzCore/std/string/regex.h
+++ b/Code/Framework/AzCore/AzCore/std/string/regex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/string.cpp b/Code/Framework/AzCore/AzCore/std/string/string.cpp
index 9f5f779faa..200f608450 100644
--- a/Code/Framework/AzCore/AzCore/std/string/string.cpp
+++ b/Code/Framework/AzCore/AzCore/std/string/string.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/string.h b/Code/Framework/AzCore/AzCore/std/string/string.h
index a8bfaa1190..df727aec6f 100644
--- a/Code/Framework/AzCore/AzCore/std/string/string.h
+++ b/Code/Framework/AzCore/AzCore/std/string/string.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/string_view.h b/Code/Framework/AzCore/AzCore/std/string/string_view.h
index 990dd81a13..b74fbacec3 100644
--- a/Code/Framework/AzCore/AzCore/std/string/string_view.h
+++ b/Code/Framework/AzCore/AzCore/std/string/string_view.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/tokenize.h b/Code/Framework/AzCore/AzCore/std/string/tokenize.h
index 47bbea6abb..5fda23c233 100644
--- a/Code/Framework/AzCore/AzCore/std/string/tokenize.h
+++ b/Code/Framework/AzCore/AzCore/std/string/tokenize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/string/wildcard.h b/Code/Framework/AzCore/AzCore/std/string/wildcard.h
index 0dbf4c0a6e..820b17cb10 100644
--- a/Code/Framework/AzCore/AzCore/std/string/wildcard.h
+++ b/Code/Framework/AzCore/AzCore/std/string/wildcard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/time.h b/Code/Framework/AzCore/AzCore/std/time.h
index 1a81fa612b..148ceefd15 100644
--- a/Code/Framework/AzCore/AzCore/std/time.h
+++ b/Code/Framework/AzCore/AzCore/std/time.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/tuple.h b/Code/Framework/AzCore/AzCore/std/tuple.h
index 43229fd6b1..489973eefd 100644
--- a/Code/Framework/AzCore/AzCore/std/tuple.h
+++ b/Code/Framework/AzCore/AzCore/std/tuple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/add_const.h b/Code/Framework/AzCore/AzCore/std/typetraits/add_const.h
index 8bb8dfdc96..708efb1cf9 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/add_const.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/add_const.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/add_cv.h b/Code/Framework/AzCore/AzCore/std/typetraits/add_cv.h
index 0d51a68ad9..f1ae7cb536 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/add_cv.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/add_cv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/add_pointer.h b/Code/Framework/AzCore/AzCore/std/typetraits/add_pointer.h
index adf52bfc0f..9c83e5c84a 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/add_pointer.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/add_pointer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/add_reference.h b/Code/Framework/AzCore/AzCore/std/typetraits/add_reference.h
index ce2d119796..43e777a1b9 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/add_reference.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/add_reference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/add_volatile.h b/Code/Framework/AzCore/AzCore/std/typetraits/add_volatile.h
index 50f8f38f55..bc8461120e 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/add_volatile.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/add_volatile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/aligned_storage.h b/Code/Framework/AzCore/AzCore/std/typetraits/aligned_storage.h
index 2e1a18eb80..6d92f56508 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/aligned_storage.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/aligned_storage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/alignment_of.h b/Code/Framework/AzCore/AzCore/std/typetraits/alignment_of.h
index 0f1edb21e5..2485a61996 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/alignment_of.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/alignment_of.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/common_type.h b/Code/Framework/AzCore/AzCore/std/typetraits/common_type.h
index 75804b57d6..895a1294a1 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/common_type.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/common_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/conditional.h b/Code/Framework/AzCore/AzCore/std/typetraits/conditional.h
index edaffa8b77..deb00a21ed 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/conditional.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/conditional.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/config.h b/Code/Framework/AzCore/AzCore/std/typetraits/config.h
index ebdce3bc8d..13e3db9242 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/config.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/conjunction.h b/Code/Framework/AzCore/AzCore/std/typetraits/conjunction.h
index 79435a8330..37e74f4c54 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/conjunction.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/conjunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/decay.h b/Code/Framework/AzCore/AzCore/std/typetraits/decay.h
index 77698c3a9c..dc0945d31e 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/decay.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/decay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/disjunction.h b/Code/Framework/AzCore/AzCore/std/typetraits/disjunction.h
index e5210cad68..ca4cd04614 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/disjunction.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/disjunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/extent.h b/Code/Framework/AzCore/AzCore/std/typetraits/extent.h
index 73e82d1b39..36726ebaa3 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/extent.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/extent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/function_traits.h b/Code/Framework/AzCore/AzCore/std/typetraits/function_traits.h
index 52e22b9205..4683d9e1d5 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/function_traits.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/function_traits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/has_member_function.h b/Code/Framework/AzCore/AzCore/std/typetraits/has_member_function.h
index afaf69181a..e581f26a29 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/has_member_function.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/has_member_function.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/has_virtual_destructor.h b/Code/Framework/AzCore/AzCore/std/typetraits/has_virtual_destructor.h
index 6a269aafac..bca10857bf 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/has_virtual_destructor.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/has_virtual_destructor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/integral_constant.h b/Code/Framework/AzCore/AzCore/std/typetraits/integral_constant.h
index 98b58b7270..47852a2743 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/integral_constant.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/integral_constant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/internal/is_template_copy_constructible.h b/Code/Framework/AzCore/AzCore/std/typetraits/internal/is_template_copy_constructible.h
index fc1c80596c..2350b2ac55 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/internal/is_template_copy_constructible.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/internal/is_template_copy_constructible.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/internal/type_sequence_traits.h b/Code/Framework/AzCore/AzCore/std/typetraits/internal/type_sequence_traits.h
index eb43659303..06a4451248 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/internal/type_sequence_traits.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/internal/type_sequence_traits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/intrinsics.h b/Code/Framework/AzCore/AzCore/std/typetraits/intrinsics.h
index b1c53282b8..e138b367a0 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/intrinsics.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/intrinsics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/invoke_traits.h b/Code/Framework/AzCore/AzCore/std/typetraits/invoke_traits.h
index b8c244e8d7..28cd20aa97 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/invoke_traits.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/invoke_traits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_abstract.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_abstract.h
index 4c89f4e4e1..276360b24c 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_abstract.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_abstract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_arithmetic.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_arithmetic.h
index acc0d12cca..bd975c9f56 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_arithmetic.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_arithmetic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_array.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_array.h
index f2ec66cf15..3847f0f140 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_array.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_array.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_assignable.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_assignable.h
index 17ee0281d4..ebdf796b50 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_assignable.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_assignable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_base_of.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_base_of.h
index bc9f0a4716..31a606a54f 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_base_of.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_base_of.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_class.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_class.h
index 08b224dfeb..1c21c3bd96 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_class.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_class.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_compound.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_compound.h
index 96ab8ce3f4..d5eb58b68b 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_compound.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_compound.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_const.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_const.h
index 892c410285..d915c67a81 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_const.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_const.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_constructible.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_constructible.h
index 43775ea281..dbee0c6a74 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_constructible.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_constructible.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_convertible.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_convertible.h
index eb12fe0175..941ecd9a1a 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_convertible.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_convertible.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_destructible.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_destructible.h
index 894527803f..2b6b949b18 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_destructible.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_destructible.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_empty.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_empty.h
index d41de63e4d..f0c5556380 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_empty.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_empty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_enum.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_enum.h
index 8f06c417d3..28beb54311 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_enum.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_enum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_floating_point.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_floating_point.h
index f3e252b4c3..32efdccde4 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_floating_point.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_floating_point.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_function.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_function.h
index 4dba157f73..8da8f6234f 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_function.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_function.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_fundamental.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_fundamental.h
index 953e6f8c4d..2b9044fa6e 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_fundamental.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_fundamental.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_integral.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_integral.h
index c21f4d8018..396953f5fc 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_integral.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_integral.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_lvalue_reference.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_lvalue_reference.h
index 1a2c8fa4f0..5b66326aec 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_lvalue_reference.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_lvalue_reference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_member_function_pointer.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_member_function_pointer.h
index 1d36c2569a..47c8b29ad2 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_member_function_pointer.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_member_function_pointer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_member_object_pointer.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_member_object_pointer.h
index 19aa14b16d..1b09d26711 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_member_object_pointer.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_member_object_pointer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_member_pointer.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_member_pointer.h
index ae06085ec4..ed3ad24808 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_member_pointer.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_member_pointer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_object.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_object.h
index 3542e0f0c2..6872ee631d 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_object.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_object.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_pod.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_pod.h
index 127799e620..b67da3fa12 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_pod.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_pod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_pointer.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_pointer.h
index 070754bc23..dd20bc441b 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_pointer.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_pointer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_polymorphic.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_polymorphic.h
index 3354430eeb..3e57a28320 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_polymorphic.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_polymorphic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_reference.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_reference.h
index ae965827f7..caf0a680c5 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_reference.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_reference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_rvalue_reference.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_rvalue_reference.h
index 0dd14d88be..97a9448c7e 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_rvalue_reference.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_rvalue_reference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_same.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_same.h
index 9859745c54..3ec2a3decf 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_same.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_same.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_scalar.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_scalar.h
index a0938b4d3b..b9378c86b2 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_scalar.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_scalar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_signed.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_signed.h
index 9a93f0e8a2..d96bc287a2 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_signed.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_signed.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_swappable.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_swappable.h
index 80f614be51..82f9619a58 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_swappable.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_swappable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_trivial.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_trivial.h
index d1df9cbbd0..35887560ab 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_trivial.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_trivial.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_trivially_copyable.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_trivially_copyable.h
index c85f14fc89..844404a4c5 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_trivially_copyable.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_trivially_copyable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_union.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_union.h
index e29df7bd46..ba9ba5744c 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_union.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_union.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_unsigned.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_unsigned.h
index e2b57ca497..9f992b85ab 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_unsigned.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_unsigned.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_void.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_void.h
index eb1bd8041a..178897e2cc 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_void.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_void.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/is_volatile.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_volatile.h
index 286fccee74..20bd88b6e7 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_volatile.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_volatile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/negation.h b/Code/Framework/AzCore/AzCore/std/typetraits/negation.h
index 473a434bd2..845430624a 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/negation.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/negation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/rank.h b/Code/Framework/AzCore/AzCore/std/typetraits/rank.h
index 43663715ba..6cebc16c66 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/rank.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/rank.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/remove_all_extents.h b/Code/Framework/AzCore/AzCore/std/typetraits/remove_all_extents.h
index 8d89469f82..a56c3b1da4 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/remove_all_extents.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/remove_all_extents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/remove_const.h b/Code/Framework/AzCore/AzCore/std/typetraits/remove_const.h
index 8a51ec5b1b..3902c69fad 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/remove_const.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/remove_const.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/remove_cv.h b/Code/Framework/AzCore/AzCore/std/typetraits/remove_cv.h
index 8474d5c970..f26d60ef4f 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/remove_cv.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/remove_cv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/remove_cvref.h b/Code/Framework/AzCore/AzCore/std/typetraits/remove_cvref.h
index 0f952f7ca4..a01f93a9d3 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/remove_cvref.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/remove_cvref.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/remove_extent.h b/Code/Framework/AzCore/AzCore/std/typetraits/remove_extent.h
index b823838388..c36410bd8c 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/remove_extent.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/remove_extent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/remove_pointer.h b/Code/Framework/AzCore/AzCore/std/typetraits/remove_pointer.h
index c3dd895ad9..538646d3bf 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/remove_pointer.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/remove_pointer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/remove_reference.h b/Code/Framework/AzCore/AzCore/std/typetraits/remove_reference.h
index 8e85403724..ebe215a290 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/remove_reference.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/remove_reference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/remove_volatile.h b/Code/Framework/AzCore/AzCore/std/typetraits/remove_volatile.h
index 503c7a202f..676f3a1028 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/remove_volatile.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/remove_volatile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/static_storage.h b/Code/Framework/AzCore/AzCore/std/typetraits/static_storage.h
index ca9dc70eab..196ff4fdf6 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/static_storage.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/static_storage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/tuple_traits.h b/Code/Framework/AzCore/AzCore/std/typetraits/tuple_traits.h
index 8e27567e3e..fac05660fe 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/tuple_traits.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/tuple_traits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/type_id.h b/Code/Framework/AzCore/AzCore/std/typetraits/type_id.h
index bd821c1239..3499cb969e 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/type_id.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/type_id.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/type_identity.h b/Code/Framework/AzCore/AzCore/std/typetraits/type_identity.h
index 066b772567..c3f066b7a4 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/type_identity.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/type_identity.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/typetraits.h b/Code/Framework/AzCore/AzCore/std/typetraits/typetraits.h
index 564b870857..61827d2caf 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/typetraits.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/typetraits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/underlying_type.h b/Code/Framework/AzCore/AzCore/std/typetraits/underlying_type.h
index a22c46c8a0..9ad1a4475b 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/underlying_type.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/underlying_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/typetraits/void_t.h b/Code/Framework/AzCore/AzCore/std/typetraits/void_t.h
index 1420832ab8..0f89e2beb0 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/void_t.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/void_t.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/AzCore/std/utils.h b/Code/Framework/AzCore/AzCore/std/utils.h
index 0a457ecddc..0b1d884dac 100644
--- a/Code/Framework/AzCore/AzCore/std/utils.h
+++ b/Code/Framework/AzCore/AzCore/std/utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/CMakeLists.txt b/Code/Framework/AzCore/CMakeLists.txt
index ea10cce12b..b52881e4bf 100644
--- a/Code/Framework/AzCore/CMakeLists.txt
+++ b/Code/Framework/AzCore/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h
index 5dad1dd56f..4f02655d6f 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Platform.h
index 0ed51b5a30..68af67980f 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Debug/Trace_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Debug/Trace_Android.cpp
index aa38d9eef5..a7b7912c2d 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Debug/Trace_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Debug/Trace_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/IO/Streamer/StreamerContext_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/IO/Streamer/StreamerContext_Platform.h
index c66d15b505..0fcaf8ef70 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/IO/Streamer/StreamerContext_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/IO/Streamer/StreamerContext_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Android.cpp
index 5a5d3ea73d..d4c3e8d36d 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Android.h
index 46947c357a..c194c3b380 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Android.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Platform.h
index 3f4297660d..03b848ed02 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/IO/SystemFile_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/IPC/SharedMemory_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/IPC/SharedMemory_Platform.h
index f508f78483..a07e94878c 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/IPC/SharedMemory_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/IPC/SharedMemory_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Math/Internal/MathTypes_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/Math/Internal/MathTypes_Android.h
index 4df1796ef8..664191178f 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Math/Internal/MathTypes_Android.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Math/Internal/MathTypes_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Math/Internal/MathTypes_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/Math/Internal/MathTypes_Platform.h
index 2640b3986d..f232d71694 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Math/Internal/MathTypes_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Math/Internal/MathTypes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Math/Random_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/Math/Random_Platform.h
index 0990131d76..879fa1efca 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Math/Random_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Math/Random_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Memory/HeapSchema_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Memory/HeapSchema_Android.cpp
index 8de1bb29ae..82c72b87f6 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Memory/HeapSchema_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Memory/HeapSchema_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Memory/OSAllocator_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/Memory/OSAllocator_Platform.h
index 2a63a8ddf0..80372c577b 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Memory/OSAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Memory/OSAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Memory/OverrunDetectionAllocator_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/Memory/OverrunDetectionAllocator_Platform.h
index fc01128d34..ac831358eb 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Memory/OverrunDetectionAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Memory/OverrunDetectionAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Module/DynamicModuleHandle_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Module/DynamicModuleHandle_Android.cpp
index d705a77a16..ea4e5d00d6 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Module/DynamicModuleHandle_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Module/DynamicModuleHandle_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp
index 39f1bf98b8..49d840bbec 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/NativeUI/NativeUISystemComponent_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/PlatformId/PlatformId_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/PlatformId/PlatformId_Android.h
index 4c65d33cc9..c29081ba41 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/PlatformId/PlatformId_Android.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/PlatformId/PlatformId_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/PlatformId/PlatformId_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/PlatformId/PlatformId_Platform.h
index 07f371febb..30dde65d6b 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/PlatformId/PlatformId_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/PlatformId/PlatformId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/PlatformIncl_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/PlatformIncl_Platform.h
index 86e0ad7373..06a27d3726 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/PlatformIncl_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/PlatformIncl_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Socket/AzSocket_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/Socket/AzSocket_Platform.h
index 9faf72b439..3f4fe10957 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Socket/AzSocket_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Socket/AzSocket_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Socket/AzSocket_fwd_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/Socket/AzSocket_fwd_Platform.h
index 283d9c3d7a..8f5812ac2c 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Socket/AzSocket_fwd_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Socket/AzSocket_fwd_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/Utils/Utils_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Utils/Utils_Android.cpp
index 590e8f684d..34b2e91813 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Utils/Utils_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Utils/Utils_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/base_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/base_Android.h
index ad49d2df73..e41e011a88 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/base_Android.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/base_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/base_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/base_Platform.h
index b8831d17aa..cff62bcf74 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/base_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/base_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/config_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/config_Android.h
index caad999251..02fded02c7 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/config_Android.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/config_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/config_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/config_Platform.h
index 1c02dacc24..78ee961620 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/config_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/config_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/condition_variable_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/condition_variable_Platform.h
index b54fc50c44..47c17a8adf 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/condition_variable_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/condition_variable_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/mutex_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/mutex_Platform.h
index 3e72c3e236..c1b11e1a44 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/mutex_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/mutex_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/semaphore_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/semaphore_Platform.h
index b893c41e0f..76b92717f1 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/semaphore_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/semaphore_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Android.cpp
index 6672c95b4b..c705504dd1 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Platform.h b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Platform.h
index f6b6486b62..36124f3d1d 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Platform.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/AzCore/std/string/fixed_string_Platform.inl b/Code/Framework/AzCore/Platform/Android/AzCore/std/string/fixed_string_Platform.inl
index 95ac9a5d46..33697c45af 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/string/fixed_string_Platform.inl
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/string/fixed_string_Platform.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Android/platform_android.cmake b/Code/Framework/AzCore/Platform/Android/platform_android.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/AzCore/Platform/Android/platform_android.cmake
+++ b/Code/Framework/AzCore/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Android/platform_android_files.cmake b/Code/Framework/AzCore/Platform/Android/platform_android_files.cmake
index e7d262358a..a746fe9c30 100644
--- a/Code/Framework/AzCore/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/AzCore/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Android/profile_telemetry_platform_android.cmake b/Code/Framework/AzCore/Platform/Android/profile_telemetry_platform_android.cmake
index c487144b42..9a1c433e6c 100644
--- a/Code/Framework/AzCore/Platform/Android/profile_telemetry_platform_android.cmake
+++ b/Code/Framework/AzCore/Platform/Android/profile_telemetry_platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/AppleTV/AzCore/IO/Streamer/StreamerContext_Platform.h b/Code/Framework/AzCore/Platform/AppleTV/AzCore/IO/Streamer/StreamerContext_Platform.h
index c66d15b505..0fcaf8ef70 100644
--- a/Code/Framework/AzCore/Platform/AppleTV/AzCore/IO/Streamer/StreamerContext_Platform.h
+++ b/Code/Framework/AzCore/Platform/AppleTV/AzCore/IO/Streamer/StreamerContext_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Debug/Trace_Apple.cpp b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Debug/Trace_Apple.cpp
index 5f7fc765b8..1b4fbc9a5a 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Debug/Trace_Apple.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Debug/Trace_Apple.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/IO/SystemFile_Apple.cpp b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/IO/SystemFile_Apple.cpp
index 3772458059..fb9331d931 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/IO/SystemFile_Apple.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/IO/SystemFile_Apple.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/IO/SystemFile_Apple.h b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/IO/SystemFile_Apple.h
index 43496cb161..70c02bc745 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/IO/SystemFile_Apple.h
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/IO/SystemFile_Apple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Memory/OSAllocator_Apple.h b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Memory/OSAllocator_Apple.h
index c0bbee3423..344f23c09a 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Memory/OSAllocator_Apple.h
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Memory/OSAllocator_Apple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Module/DynamicModuleHandle_Apple.cpp b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Module/DynamicModuleHandle_Apple.cpp
index 05b3e68cd0..b44f3a9943 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Module/DynamicModuleHandle_Apple.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Module/DynamicModuleHandle_Apple.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Utils/Utils_Apple.cpp b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Utils/Utils_Apple.cpp
index 4a13539281..b5abc239d1 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Utils/Utils_Apple.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/Utils/Utils_Apple.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/config_Apple.h b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/config_Apple.h
index f2cc0487a3..c715b2ad75 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/config_Apple.h
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/config_Apple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/semaphore_Apple.h b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/semaphore_Apple.h
index 1890ad36f5..7063f9989b 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/semaphore_Apple.h
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/semaphore_Apple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/thread_Apple.cpp b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/thread_Apple.cpp
index 2b5c130d27..7a3d3dc629 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/thread_Apple.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/thread_Apple.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/time_Apple.h b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/time_Apple.h
index bc17c340f6..6d52ffc5ab 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/time_Apple.h
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/time_Apple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/time_Apple.cpp b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/time_Apple.cpp
index 3151cfbcba..ca49fedf31 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/time_Apple.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/time_Apple.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Clang/AzCore/std/string/fixed_string_Clang.inl b/Code/Framework/AzCore/Platform/Common/Clang/AzCore/std/string/fixed_string_Clang.inl
index 9915e31dd8..46cb831331 100644
--- a/Code/Framework/AzCore/Platform/Common/Clang/AzCore/std/string/fixed_string_Clang.inl
+++ b/Code/Framework/AzCore/Platform/Common/Clang/AzCore/std/string/fixed_string_Clang.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerConfiguration_Default.cpp b/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerConfiguration_Default.cpp
index 754da8bdf1..24d00b9598 100644
--- a/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerConfiguration_Default.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerConfiguration_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerContext_Default.cpp b/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerContext_Default.cpp
index a8f32927c1..1fdcd7edd5 100644
--- a/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerContext_Default.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerContext_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerContext_Default.h b/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerContext_Default.h
index 3e28294bc4..4526f0c84d 100644
--- a/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerContext_Default.h
+++ b/Code/Framework/AzCore/Platform/Common/Default/AzCore/IO/Streamer/StreamerContext_Default.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Default/AzCore/Module/Internal/ModuleManagerSearchPathTool_Default.cpp b/Code/Framework/AzCore/Platform/Common/Default/AzCore/Module/Internal/ModuleManagerSearchPathTool_Default.cpp
index 178adbf6a1..b062f14c29 100644
--- a/Code/Framework/AzCore/Platform/Common/Default/AzCore/Module/Internal/ModuleManagerSearchPathTool_Default.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Default/AzCore/Module/Internal/ModuleManagerSearchPathTool_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/MSVC/AzCore/std/string/fixed_string_MSVC.inl b/Code/Framework/AzCore/Platform/Common/MSVC/AzCore/std/string/fixed_string_MSVC.inl
index 2a5b3628f9..d1362e9e46 100644
--- a/Code/Framework/AzCore/Platform/Common/MSVC/AzCore/std/string/fixed_string_MSVC.inl
+++ b/Code/Framework/AzCore/Platform/Common/MSVC/AzCore/std/string/fixed_string_MSVC.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/RadTelemetry/ProfileTelemetry.h b/Code/Framework/AzCore/Platform/Common/RadTelemetry/ProfileTelemetry.h
index 83f9133d46..6e75fa4f61 100644
--- a/Code/Framework/AzCore/Platform/Common/RadTelemetry/ProfileTelemetry.h
+++ b/Code/Framework/AzCore/Platform/Common/RadTelemetry/ProfileTelemetry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/RadTelemetry/ProfileTelemetryBus.h b/Code/Framework/AzCore/Platform/Common/RadTelemetry/ProfileTelemetryBus.h
index 06476a9491..aa70c7b3c6 100644
--- a/Code/Framework/AzCore/Platform/Common/RadTelemetry/ProfileTelemetryBus.h
+++ b/Code/Framework/AzCore/Platform/Common/RadTelemetry/ProfileTelemetryBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Debug/StackTracer_Unimplemented.cpp b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Debug/StackTracer_Unimplemented.cpp
index 37f7447b46..12731284b7 100644
--- a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Debug/StackTracer_Unimplemented.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Debug/StackTracer_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/IPC/SharedMemory_Unimplemented.h b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/IPC/SharedMemory_Unimplemented.h
index 45e03ed3ec..86a11c7ba5 100644
--- a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/IPC/SharedMemory_Unimplemented.h
+++ b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/IPC/SharedMemory_Unimplemented.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Memory/OverrunDetectionAllocator_Unimplemented.h b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Memory/OverrunDetectionAllocator_Unimplemented.h
index 529cb108ff..1033ad50c2 100644
--- a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Memory/OverrunDetectionAllocator_Unimplemented.h
+++ b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Memory/OverrunDetectionAllocator_Unimplemented.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Module/DynamicModuleHandle_Unimplemented.cpp b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Module/DynamicModuleHandle_Unimplemented.cpp
index fd95a23d02..87cd1cecbb 100644
--- a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Module/DynamicModuleHandle_Unimplemented.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Module/DynamicModuleHandle_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/NativeUI/NativeUISystemComponent_Unimplemented.cpp b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/NativeUI/NativeUISystemComponent_Unimplemented.cpp
index ea3885fe3a..4b5c9e28e4 100644
--- a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/NativeUI/NativeUISystemComponent_Unimplemented.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/NativeUI/NativeUISystemComponent_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/PlatformIncl_Unimplemented.h b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/PlatformIncl_Unimplemented.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/PlatformIncl_Unimplemented.h
+++ b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/PlatformIncl_Unimplemented.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Utils/Utils_Unimplemented.cpp b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Utils/Utils_Unimplemented.cpp
index 2d301fd534..d3d9b9b836 100644
--- a/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Utils/Utils_Unimplemented.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Unimplemented/AzCore/Utils/Utils_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/StackTracer_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/StackTracer_UnixLike.cpp
index bb0d0a0d18..aaf5b63272 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/StackTracer_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/StackTracer_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/Trace_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/Trace_UnixLike.cpp
index 1108821397..29cc9b2c4d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 67856d9b8c..a1c0164349 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/Internal/SystemFileUtils_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/Internal/SystemFileUtils_UnixLike.h
index d023f72c80..8f2a6850bc 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/Internal/SystemFileUtils_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/Internal/SystemFileUtils_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/SystemFile_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/SystemFile_UnixLike.cpp
index 33020d1dba..9489c5eaf8 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/SystemFile_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/SystemFile_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/SystemFile_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/SystemFile_UnixLike.h
index 2f2e2ef4ea..082e601cc3 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/SystemFile_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/SystemFile_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Math/Random_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Math/Random_UnixLike.cpp
index 2a4f697a81..0b938e8b3c 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Math/Random_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Math/Random_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Math/Random_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Math/Random_UnixLike.h
index cfaae2f65b..89f80f8f3c 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Math/Random_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Math/Random_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Memory/OSAllocator_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Memory/OSAllocator_UnixLike.h
index a875e05156..5ee9debb07 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Memory/OSAllocator_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Memory/OSAllocator_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Module/DynamicModuleHandle_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Module/DynamicModuleHandle_UnixLike.cpp
index 3c210caf3c..522818f9f9 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Module/DynamicModuleHandle_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Module/DynamicModuleHandle_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/PlatformIncl_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/PlatformIncl_UnixLike.h
index 0cea92a94e..4714c433fe 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/PlatformIncl_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/PlatformIncl_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Platform_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Platform_UnixLike.cpp
index e71e4f1f30..901fbe82e1 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Platform_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Platform_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.cpp
index 6577cf1728..01cc49a745 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.h
index 8e95c6599e..186935098f 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_fwd_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_fwd_UnixLike.h
index 1e75cb1239..60261f1b94 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_fwd_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_fwd_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp
index 9ce158d335..b1d4cb13b0 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/condition_variable_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/condition_variable_UnixLike.h
index 4d6cfa28b8..74a2a677d2 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/condition_variable_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/condition_variable_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/mutex_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/mutex_UnixLike.h
index e9136277e9..8452ff8396 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/mutex_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/mutex_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/semaphore_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/semaphore_UnixLike.h
index a7d42750a7..bfe0361c0f 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/semaphore_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/semaphore_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.cpp
index cf75cdc96f..19415f2f87 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.h
index 2e72e6a163..c55d5ae4f5 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/time_UnixLike.h b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/time_UnixLike.h
index 1478315499..ea48f2cb01 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/time_UnixLike.h
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/time_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/time_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/time_UnixLike.cpp
index b91e4df622..5abe4080c0 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/time_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/time_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/UnixLikeDefault/AzCore/IO/SystemFile_UnixLikeDefault.cpp b/Code/Framework/AzCore/Platform/Common/UnixLikeDefault/AzCore/IO/SystemFile_UnixLikeDefault.cpp
index 3112ff6197..a14ad6e696 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLikeDefault/AzCore/IO/SystemFile_UnixLikeDefault.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLikeDefault/AzCore/IO/SystemFile_UnixLikeDefault.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Debug/Trace_WinAPI.cpp b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Debug/Trace_WinAPI.cpp
index eb0580dca9..c0cebfe8c2 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Debug/Trace_WinAPI.cpp
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Debug/Trace_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.cpp b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.cpp
index 0a1bd846b5..d32a30bcec 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.cpp
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.h
index fb52aee40f..0a4abc2056 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/SystemFile_WinAPI.cpp b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/SystemFile_WinAPI.cpp
index c006e8d6c0..997d450e8e 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/SystemFile_WinAPI.cpp
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/SystemFile_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/SystemFile_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/SystemFile_WinAPI.h
index 454aa480c5..ca833c07dd 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/SystemFile_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/SystemFile_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Memory/OSAllocator_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Memory/OSAllocator_WinAPI.h
index 3eed9d8d02..582b949897 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Memory/OSAllocator_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Memory/OSAllocator_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Memory/OverrunDetectionAllocator_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Memory/OverrunDetectionAllocator_WinAPI.h
index e753023f66..24e200ad11 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Memory/OverrunDetectionAllocator_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Memory/OverrunDetectionAllocator_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Module/DynamicModuleHandle_WinAPI.cpp b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Module/DynamicModuleHandle_WinAPI.cpp
index 170da4f62e..2119197500 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Module/DynamicModuleHandle_WinAPI.cpp
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Module/DynamicModuleHandle_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_WinAPI.cpp b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_WinAPI.cpp
index db4e592066..763c4caf97 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_WinAPI.cpp
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_WinAPI.h
index 1140f3f89b..8bdf2dccfb 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_WinAPI.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_fwd_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_fwd_WinAPI.h
index c2df14ce5f..7630cb546b 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_fwd_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Socket/AzSocket_fwd_WinAPI.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Utils/Utils_WinAPI.cpp b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Utils/Utils_WinAPI.cpp
index 1d1a7cd148..f8787fc6f3 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Utils/Utils_WinAPI.cpp
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Utils/Utils_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/config_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/config_WinAPI.h
index a6a8c7e315..2488fd065c 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/config_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/config_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/condition_variable_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/condition_variable_WinAPI.h
index 42cec3cb8c..7ba31098ca 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/condition_variable_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/condition_variable_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/mutex_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/mutex_WinAPI.h
index 60cb8bd1ee..b32b1dc4e9 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/mutex_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/mutex_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/semaphore_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/semaphore_WinAPI.h
index f27b191119..fdccf4f6d9 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/semaphore_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/semaphore_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/thread_WinAPI.cpp b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/thread_WinAPI.cpp
index 2a7437fea5..643dfe3d83 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/thread_WinAPI.cpp
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/thread_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/thread_WinAPI.h b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/thread_WinAPI.h
index 4be301ff0e..6a4905a0ab 100644
--- a/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/thread_WinAPI.h
+++ b/Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/std/parallel/internal/thread_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Common/azcore_profile_telemetry_files.cmake b/Code/Framework/AzCore/Platform/Common/azcore_profile_telemetry_files.cmake
index aff17d814b..f125f3bfc5 100644
--- a/Code/Framework/AzCore/Platform/Common/azcore_profile_telemetry_files.cmake
+++ b/Code/Framework/AzCore/Platform/Common/azcore_profile_telemetry_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h b/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h
index a590e574e5..67702a5f39 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Platform.h
index 2af3cd7d0f..ffc1c2a15f 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Debug/Trace_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Debug/Trace_Linux.cpp
index 7afdee4aa1..2b93565bb2 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Debug/Trace_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Debug/Trace_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/IO/Streamer/StreamerContext_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/IO/Streamer/StreamerContext_Platform.h
index c66d15b505..0fcaf8ef70 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/IO/Streamer/StreamerContext_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/IO/Streamer/StreamerContext_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/IO/SystemFile_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/IO/SystemFile_Linux.cpp
index 3772458059..fb9331d931 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/IO/SystemFile_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/IO/SystemFile_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/IO/SystemFile_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/IO/SystemFile_Platform.h
index fb00b16ded..eeaf7f6a46 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/IO/SystemFile_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/IO/SystemFile_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/IPC/SharedMemory_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/IPC/SharedMemory_Platform.h
index f508f78483..a07e94878c 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/IPC/SharedMemory_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/IPC/SharedMemory_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Internal/MathTypes_Linux.h b/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Internal/MathTypes_Linux.h
index 855a939f5b..db07bcf49c 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Internal/MathTypes_Linux.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Internal/MathTypes_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Internal/MathTypes_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Internal/MathTypes_Platform.h
index 91850a006a..338a374292 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Internal/MathTypes_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Internal/MathTypes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Random_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Random_Platform.h
index 0990131d76..879fa1efca 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Random_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Math/Random_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/HeapSchema_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/HeapSchema_Linux.cpp
index 8de1bb29ae..82c72b87f6 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/HeapSchema_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/HeapSchema_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/OSAllocator_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/OSAllocator_Platform.h
index 2a63a8ddf0..80372c577b 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/OSAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/OSAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/OverrunDetectionAllocator_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/OverrunDetectionAllocator_Platform.h
index fc01128d34..ac831358eb 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/OverrunDetectionAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/OverrunDetectionAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Module/DynamicModuleHandle_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Module/DynamicModuleHandle_Linux.cpp
index 05b3e68cd0..b44f3a9943 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Module/DynamicModuleHandle_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Module/DynamicModuleHandle_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Module/Internal/ModuleManagerSearchPathTool_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Module/Internal/ModuleManagerSearchPathTool_Linux.cpp
index 178adbf6a1..b062f14c29 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformId/PlatformId_Linux.h b/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformId/PlatformId_Linux.h
index 3cd0bbe440..31d5e29413 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformId/PlatformId_Linux.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformId/PlatformId_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformId/PlatformId_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformId/PlatformId_Platform.h
index 07c7dcf9a4..d172b551a4 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformId/PlatformId_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformId/PlatformId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformIncl_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformIncl_Platform.h
index 4f0f008803..cadad78908 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformIncl_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/PlatformIncl_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Socket/AzSocket_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/Socket/AzSocket_Platform.h
index 9faf72b439..3f4fe10957 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Socket/AzSocket_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Socket/AzSocket_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Socket/AzSocket_fwd_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/Socket/AzSocket_fwd_Platform.h
index 283d9c3d7a..8f5812ac2c 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Socket/AzSocket_fwd_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Socket/AzSocket_fwd_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/Utils/Utils_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Utils/Utils_Linux.cpp
index b8007393bb..47e4a343e8 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Utils/Utils_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Utils/Utils_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/base_Linux.h b/Code/Framework/AzCore/Platform/Linux/AzCore/base_Linux.h
index ad49d2df73..e41e011a88 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/base_Linux.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/base_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/base_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/base_Platform.h
index 801461fe43..e38990bec4 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/base_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/base_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/config_Linux.h b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/config_Linux.h
index cf9d0fc1fb..d12889b220 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/config_Linux.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/config_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/config_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/config_Platform.h
index 97bdbb1915..b45710c591 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/config_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/config_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/condition_variable_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/condition_variable_Platform.h
index b54fc50c44..47c17a8adf 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/condition_variable_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/condition_variable_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/mutex_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/mutex_Platform.h
index 3e72c3e236..c1b11e1a44 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/mutex_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/mutex_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/semaphore_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/semaphore_Platform.h
index b893c41e0f..76b92717f1 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/semaphore_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/semaphore_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Linux.cpp
index 8e1d2e040e..d524854e84 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Platform.h b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Platform.h
index f6b6486b62..36124f3d1d 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Platform.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/AzCore/std/string/fixed_string_Platform.inl b/Code/Framework/AzCore/Platform/Linux/AzCore/std/string/fixed_string_Platform.inl
index 95ac9a5d46..33697c45af 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/string/fixed_string_Platform.inl
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/string/fixed_string_Platform.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Linux/platform_linux.cmake b/Code/Framework/AzCore/Platform/Linux/platform_linux.cmake
index f6696b9b66..1680124b4e 100644
--- a/Code/Framework/AzCore/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/AzCore/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzCore/Platform/Linux/platform_linux_files.cmake
index 1c4705721a..3ef9ef89b5 100644
--- a/Code/Framework/AzCore/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzCore/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Linux/profile_telemetry_platform_linux.cmake b/Code/Framework/AzCore/Platform/Linux/profile_telemetry_platform_linux.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/AzCore/Platform/Linux/profile_telemetry_platform_linux.cmake
+++ b/Code/Framework/AzCore/Platform/Linux/profile_telemetry_platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h b/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h
index 4e65fe5fe2..4f148f080c 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Platform.h
index 7fc52ae007..2308376a7c 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/IO/Streamer/StreamerContext_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/IO/Streamer/StreamerContext_Platform.h
index c66d15b505..0fcaf8ef70 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/IO/Streamer/StreamerContext_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/IO/Streamer/StreamerContext_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/IO/SystemFile_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/IO/SystemFile_Platform.h
index 5ae7a8e7b6..0349df7199 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/IO/SystemFile_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/IO/SystemFile_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Mac.cpp b/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Mac.cpp
index 70f06d5172..54aff8a78b 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Mac.cpp
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Mac.h b/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Mac.h
index 73e15fd447..498104a57f 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Mac.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Platform.h
index 5f7b864b8a..381604b527 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/IPC/SharedMemory_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Internal/MathTypes_Mac.h b/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Internal/MathTypes_Mac.h
index 855a939f5b..db07bcf49c 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Internal/MathTypes_Mac.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Internal/MathTypes_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Internal/MathTypes_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Internal/MathTypes_Platform.h
index b5b01a1ff6..83d395328c 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Internal/MathTypes_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Internal/MathTypes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Random_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Random_Platform.h
index 0990131d76..879fa1efca 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Random_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Math/Random_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/HeapSchema_Mac.cpp b/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/HeapSchema_Mac.cpp
index 8de1bb29ae..82c72b87f6 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/HeapSchema_Mac.cpp
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/HeapSchema_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/OSAllocator_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/OSAllocator_Platform.h
index 39204ead68..4e4e41cbc7 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/OSAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/OSAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/OverrunDetectionAllocator_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/OverrunDetectionAllocator_Platform.h
index fc01128d34..ac831358eb 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/OverrunDetectionAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Memory/OverrunDetectionAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Module/Internal/ModuleManagerSearchPathTool_Mac.cpp b/Code/Framework/AzCore/Platform/Mac/AzCore/Module/Internal/ModuleManagerSearchPathTool_Mac.cpp
index 2ce5fa18fc..a619074b5c 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Module/Internal/ModuleManagerSearchPathTool_Mac.cpp
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Module/Internal/ModuleManagerSearchPathTool_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm b/Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm
index 4691bb6c24..4bf32677f8 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/NativeUI/NativeUISystemComponent_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h b/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h
index 7a0a18100e..ef0b552e60 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Platform.h
index a561cfa41c..6086bbe7c6 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformIncl_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformIncl_Platform.h
index 4f0f008803..cadad78908 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformIncl_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformIncl_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Platform_Mac.cpp b/Code/Framework/AzCore/Platform/Mac/AzCore/Platform_Mac.cpp
index 60637265da..4ea7a841ec 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Platform_Mac.cpp
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Platform_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Socket/AzSocket_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/Socket/AzSocket_Platform.h
index 9faf72b439..3f4fe10957 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Socket/AzSocket_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Socket/AzSocket_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Socket/AzSocket_fwd_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/Socket/AzSocket_fwd_Platform.h
index 20c6d6b9a6..c0f16d8910 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Socket/AzSocket_fwd_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Socket/AzSocket_fwd_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/Utils/Utils_Mac.cpp b/Code/Framework/AzCore/Platform/Mac/AzCore/Utils/Utils_Mac.cpp
index 8798808a77..a6ea14631c 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/Utils/Utils_Mac.cpp
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/Utils/Utils_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/base_Mac.h b/Code/Framework/AzCore/Platform/Mac/AzCore/base_Mac.h
index ad49d2df73..e41e011a88 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/base_Mac.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/base_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/base_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/base_Platform.h
index edbf5cae59..800b7ac43f 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/base_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/base_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/config_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/config_Platform.h
index a73f24dab4..ae069fa5f0 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/config_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/config_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/condition_variable_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/condition_variable_Platform.h
index d7dcd5d53c..54196c74d3 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/condition_variable_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/condition_variable_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/mutex_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/mutex_Platform.h
index 3e72c3e236..c1b11e1a44 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/mutex_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/mutex_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/semaphore_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/semaphore_Platform.h
index c460382685..168af9333c 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/semaphore_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/semaphore_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/thread_Platform.h b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/thread_Platform.h
index f6b6486b62..36124f3d1d 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/thread_Platform.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/std/parallel/internal/thread_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/AzCore/std/string/fixed_string_Platform.inl b/Code/Framework/AzCore/Platform/Mac/AzCore/std/string/fixed_string_Platform.inl
index 95ac9a5d46..33697c45af 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/std/string/fixed_string_Platform.inl
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/std/string/fixed_string_Platform.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Mac/platform_mac.cmake b/Code/Framework/AzCore/Platform/Mac/platform_mac.cmake
index 96d4f55803..323661d138 100644
--- a/Code/Framework/AzCore/Platform/Mac/platform_mac.cmake
+++ b/Code/Framework/AzCore/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzCore/Platform/Mac/platform_mac_files.cmake
index e3177cff07..a44f781f6b 100644
--- a/Code/Framework/AzCore/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzCore/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Mac/profile_telemetry_platform_mac.cmake b/Code/Framework/AzCore/Platform/Mac/profile_telemetry_platform_mac.cmake
index c487144b42..9a1c433e6c 100644
--- a/Code/Framework/AzCore/Platform/Mac/profile_telemetry_platform_mac.cmake
+++ b/Code/Framework/AzCore/Platform/Mac/profile_telemetry_platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Platform.h
index 348ae2e0d6..03ab33992d 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h
index 762ecdb7a7..cc45d5e882 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp
index 4814159e48..9b2ccbe754 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDriveConfig_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDriveConfig_Windows.cpp
index 6fbbb42c73..e294e2f74c 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDriveConfig_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDriveConfig_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDriveConfig_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDriveConfig_Windows.h
index e47f6649ab..2c58a0220c 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDriveConfig_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDriveConfig_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDrive_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDrive_Windows.cpp
index 12509e7031..174585a09c 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDrive_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDrive_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDrive_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDrive_Windows.h
index 3922dac478..2d6f504a20 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDrive_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StorageDrive_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.cpp
index 80f098eb2f..af33925371 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.h
index e3180e414f..2acab50c70 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerContext_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerContext_Platform.h
index c4b2913ca9..9626be37f4 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerContext_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerContext_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IO/SystemFile_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/SystemFile_Platform.h
index e02fe5fc59..3d2b6b6fb0 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IO/SystemFile_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IO/SystemFile_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Platform.h
index b922fa737e..845fa23a53 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Windows.cpp
index 58b3a4b5af..be832714fd 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Windows.h
index 449186fdb6..3d3164a1cb 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/IPC/SharedMemory_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Internal/MathTypes_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Internal/MathTypes_Platform.h
index da3978004c..fce7c978b4 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Internal/MathTypes_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Internal/MathTypes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Internal/MathTypes_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Internal/MathTypes_Windows.h
index f437d994a1..179a7407c0 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Internal/MathTypes_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Internal/MathTypes_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Platform.h
index a3e8367776..94af8b2a77 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Windows.cpp
index 9016392e99..807af504f7 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Windows.h
index de9db10103..7379475872 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Math/Random_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/HeapSchema_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/HeapSchema_Windows.cpp
index 412d66c420..718d14369c 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/HeapSchema_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/HeapSchema_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/OSAllocator_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/OSAllocator_Platform.h
index 39ea1e7626..e61dbda4e6 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/OSAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/OSAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/OverrunDetectionAllocator_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/OverrunDetectionAllocator_Platform.h
index 67ac76ee0d..487f73c626 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/OverrunDetectionAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Memory/OverrunDetectionAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Module/Internal/ModuleManagerSearchPathTool_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/Module/Internal/ModuleManagerSearchPathTool_Windows.cpp
index 313cf585c3..b75d3453db 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Module/Internal/ModuleManagerSearchPathTool_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Module/Internal/ModuleManagerSearchPathTool_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp
index 6c28c63a75..47ca0fe90c 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformId/PlatformId_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformId/PlatformId_Platform.h
index 6bebf31229..f152c9b533 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformId/PlatformId_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformId/PlatformId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformId/PlatformId_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformId/PlatformId_Windows.h
index ea0e54d78e..a71b94e20b 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformId/PlatformId_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformId/PlatformId_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Platform.h
index 05ca098dde..36c5bd8808 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
index d9cdff2835..7845e5784d 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Platform_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/Platform_Windows.cpp
index 0db37353f6..e226837549 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Platform_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Platform_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_Platform.h
index 740fc7a48d..f9f58e4b4f 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_Platform.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_fwd_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_fwd_Platform.h
index 124c56f97f..d60dde2bde 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_fwd_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_fwd_Platform.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_fwd_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_fwd_Windows.h
index db630dabae..26eb767900 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_fwd_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Socket/AzSocket_fwd_Windows.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/Utils/Utils_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/Utils/Utils_Windows.cpp
index 97e7bb52e5..f3344f48be 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/Utils/Utils_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/Utils/Utils_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/base_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/base_Platform.h
index 89c47922b3..e82466c542 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/base_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/base_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/base_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/base_Windows.h
index ad49d2df73..e41e011a88 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/base_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/base_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/config_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/config_Platform.h
index b66f19da49..e5d348a864 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/config_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/config_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/condition_variable_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/condition_variable_Platform.h
index 8c7d538b5d..542da3367d 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/condition_variable_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/condition_variable_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/mutex_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/mutex_Platform.h
index 779debd21b..3c049b2adc 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/mutex_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/mutex_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/semaphore_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/semaphore_Platform.h
index b6b6329362..b340c5894e 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/semaphore_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/semaphore_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/thread_Platform.h b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/thread_Platform.h
index 1285e31c18..f19ed310aa 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/thread_Platform.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/thread_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/thread_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/thread_Windows.cpp
index 1837e2b26c..5c3e2fcb05 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/thread_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/std/parallel/internal/thread_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/std/string/fixed_string_Platform.inl b/Code/Framework/AzCore/Platform/Windows/AzCore/std/string/fixed_string_Platform.inl
index 163982d4f1..23da029193 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/std/string/fixed_string_Platform.inl
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/std/string/fixed_string_Platform.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/AzCore/std/time_Windows.cpp b/Code/Framework/AzCore/Platform/Windows/AzCore/std/time_Windows.cpp
index 787f5e4130..833745b7d3 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/std/time_Windows.cpp
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/std/time_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/Windows/platform_windows.cmake b/Code/Framework/AzCore/Platform/Windows/platform_windows.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/AzCore/Platform/Windows/platform_windows.cmake
+++ b/Code/Framework/AzCore/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzCore/Platform/Windows/platform_windows_files.cmake
index b642e24b01..520c53f74c 100644
--- a/Code/Framework/AzCore/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzCore/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/Windows/profile_telemetry_platform_windows.cmake b/Code/Framework/AzCore/Platform/Windows/profile_telemetry_platform_windows.cmake
index c487144b42..9a1c433e6c 100644
--- a/Code/Framework/AzCore/Platform/Windows/profile_telemetry_platform_windows.cmake
+++ b/Code/Framework/AzCore/Platform/Windows/profile_telemetry_platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_Platform.h
index 598f0dd7db..5a3d212adb 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h b/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h
index 2affdcfcc4..6b6e33601e 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/IO/Streamer/StreamerContext_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/IO/Streamer/StreamerContext_Platform.h
index c66d15b505..0fcaf8ef70 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/IO/Streamer/StreamerContext_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/IO/Streamer/StreamerContext_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/IO/SystemFile_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/IO/SystemFile_Platform.h
index 5ae7a8e7b6..0349df7199 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/IO/SystemFile_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/IO/SystemFile_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/IPC/SharedMemory_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/IPC/SharedMemory_Platform.h
index f508f78483..a07e94878c 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/IPC/SharedMemory_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/IPC/SharedMemory_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Internal/MathTypes_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Internal/MathTypes_Platform.h
index c94a46e60a..446a54c2e6 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Internal/MathTypes_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Internal/MathTypes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Internal/MathTypes_iOS.h b/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Internal/MathTypes_iOS.h
index 4df1796ef8..664191178f 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Internal/MathTypes_iOS.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Internal/MathTypes_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Random_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Random_Platform.h
index 0990131d76..879fa1efca 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Random_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Math/Random_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/HeapSchema_iOS.cpp b/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/HeapSchema_iOS.cpp
index 8de1bb29ae..82c72b87f6 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/HeapSchema_iOS.cpp
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/HeapSchema_iOS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/OSAllocator_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/OSAllocator_Platform.h
index 39204ead68..4e4e41cbc7 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/OSAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/OSAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/OverrunDetectionAllocator_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/OverrunDetectionAllocator_Platform.h
index fc01128d34..ac831358eb 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/OverrunDetectionAllocator_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Memory/OverrunDetectionAllocator_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp b/Code/Framework/AzCore/Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp
index c1076cc589..4fc33f4133 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm b/Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm
index 24729cb669..e663760b35 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/NativeUI/NativeUISystemComponent_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformId/PlatformId_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformId/PlatformId_Platform.h
index ac5d3896ba..e40eb0cc58 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformId/PlatformId_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformId/PlatformId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformId/PlatformId_iOS.h b/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformId/PlatformId_iOS.h
index 9d328ea76a..10ab069004 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformId/PlatformId_iOS.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformId/PlatformId_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformIncl_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformIncl_Platform.h
index 4f0f008803..cadad78908 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformIncl_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/PlatformIncl_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Socket/AzSocket_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/Socket/AzSocket_Platform.h
index 9faf72b439..3f4fe10957 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Socket/AzSocket_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Socket/AzSocket_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Socket/AzSocket_fwd_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/Socket/AzSocket_fwd_Platform.h
index 20c6d6b9a6..c0f16d8910 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Socket/AzSocket_fwd_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Socket/AzSocket_fwd_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/Utils/Utils_iOS.mm b/Code/Framework/AzCore/Platform/iOS/AzCore/Utils/Utils_iOS.mm
index c3d1843e98..48f3f9a40d 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Utils/Utils_iOS.mm
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Utils/Utils_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/base_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/base_Platform.h
index a6da0194d9..02cb720bd7 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/base_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/base_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/base_iOS.h b/Code/Framework/AzCore/Platform/iOS/AzCore/base_iOS.h
index ad49d2df73..e41e011a88 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/base_iOS.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/base_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/config_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/config_Platform.h
index a73f24dab4..ae069fa5f0 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/config_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/config_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/condition_variable_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/condition_variable_Platform.h
index d7dcd5d53c..54196c74d3 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/condition_variable_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/condition_variable_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/mutex_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/mutex_Platform.h
index 3e72c3e236..c1b11e1a44 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/mutex_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/mutex_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/semaphore_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/semaphore_Platform.h
index c460382685..168af9333c 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/semaphore_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/semaphore_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/thread_Platform.h b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/thread_Platform.h
index f6b6486b62..36124f3d1d 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/thread_Platform.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/std/parallel/internal/thread_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/AzCore/std/string/fixed_string_Platform.inl b/Code/Framework/AzCore/Platform/iOS/AzCore/std/string/fixed_string_Platform.inl
index 95ac9a5d46..33697c45af 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/std/string/fixed_string_Platform.inl
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/std/string/fixed_string_Platform.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Platform/iOS/platform_ios.cmake b/Code/Framework/AzCore/Platform/iOS/platform_ios.cmake
index 9335a19a19..42aa2152da 100644
--- a/Code/Framework/AzCore/Platform/iOS/platform_ios.cmake
+++ b/Code/Framework/AzCore/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzCore/Platform/iOS/platform_ios_files.cmake
index 8b2131b059..87e90e26e5 100644
--- a/Code/Framework/AzCore/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/AzCore/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Platform/iOS/profile_telemetry_platform_ios.cmake b/Code/Framework/AzCore/Platform/iOS/profile_telemetry_platform_ios.cmake
index df87ae239b..20a62135a6 100644
--- a/Code/Framework/AzCore/Platform/iOS/profile_telemetry_platform_ios.cmake
+++ b/Code/Framework/AzCore/Platform/iOS/profile_telemetry_platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/AZStd/Algorithms.cpp b/Code/Framework/AzCore/Tests/AZStd/Algorithms.cpp
index 53575ddefc..18de76c735 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Algorithms.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Algorithms.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Allocators.cpp b/Code/Framework/AzCore/Tests/AZStd/Allocators.cpp
index be747cf0c8..9978b7c3aa 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Allocators.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Allocators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Any.cpp b/Code/Framework/AzCore/Tests/AZStd/Any.cpp
index f5f17f435e..93e1364852 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Any.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Any.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Atomics.cpp b/Code/Framework/AzCore/Tests/AZStd/Atomics.cpp
index 35f0ea2885..bfdc745935 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Atomics.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Atomics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Bitset.cpp b/Code/Framework/AzCore/Tests/AZStd/Bitset.cpp
index abc7a78978..1074189696 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Bitset.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Bitset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/ChronoTests.cpp b/Code/Framework/AzCore/Tests/AZStd/ChronoTests.cpp
index c25d7db90e..b6a1608acd 100644
--- a/Code/Framework/AzCore/Tests/AZStd/ChronoTests.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/ChronoTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/ConcurrentAllocators.cpp b/Code/Framework/AzCore/Tests/AZStd/ConcurrentAllocators.cpp
index 271763d857..f3b1ce2582 100644
--- a/Code/Framework/AzCore/Tests/AZStd/ConcurrentAllocators.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/ConcurrentAllocators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/ConcurrentContainers.cpp b/Code/Framework/AzCore/Tests/AZStd/ConcurrentContainers.cpp
index 0d02250f4d..7ee0fa3eb6 100644
--- a/Code/Framework/AzCore/Tests/AZStd/ConcurrentContainers.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/ConcurrentContainers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/CreateDestroy.cpp b/Code/Framework/AzCore/Tests/AZStd/CreateDestroy.cpp
index 00df9e0ea2..2ff9fffba6 100644
--- a/Code/Framework/AzCore/Tests/AZStd/CreateDestroy.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/CreateDestroy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/DequeAndSimilar.cpp b/Code/Framework/AzCore/Tests/AZStd/DequeAndSimilar.cpp
index e335082698..46872bd3da 100644
--- a/Code/Framework/AzCore/Tests/AZStd/DequeAndSimilar.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/DequeAndSimilar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Examples.cpp b/Code/Framework/AzCore/Tests/AZStd/Examples.cpp
index 9529503e98..4a1565dc2c 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Examples.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Examples.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/FunctionalBasic.cpp b/Code/Framework/AzCore/Tests/AZStd/FunctionalBasic.cpp
index 0e32590123..f76303cf9e 100644
--- a/Code/Framework/AzCore/Tests/AZStd/FunctionalBasic.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/FunctionalBasic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp b/Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp
index c96c57067d..1b6aae7177 100644
--- a/Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Hashed.cpp b/Code/Framework/AzCore/Tests/AZStd/Hashed.cpp
index a8d554ac0f..8b35cab137 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Hashed.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Hashed.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Invoke.cpp b/Code/Framework/AzCore/Tests/AZStd/Invoke.cpp
index 203b7e8f4a..2c0ed54237 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Invoke.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Invoke.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Iterators.cpp b/Code/Framework/AzCore/Tests/AZStd/Iterators.cpp
index eac0789231..268cc6c03c 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Iterators.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Iterators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Lists.cpp b/Code/Framework/AzCore/Tests/AZStd/Lists.cpp
index de2cf17f58..98ba5a2997 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Lists.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Lists.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/ListsFixed.cpp b/Code/Framework/AzCore/Tests/AZStd/ListsFixed.cpp
index c3e356ce76..debac7114b 100644
--- a/Code/Framework/AzCore/Tests/AZStd/ListsFixed.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/ListsFixed.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/ListsIntrusive.cpp b/Code/Framework/AzCore/Tests/AZStd/ListsIntrusive.cpp
index 1cc98b001b..43baf49ec5 100644
--- a/Code/Framework/AzCore/Tests/AZStd/ListsIntrusive.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/ListsIntrusive.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/LockFreeQueues.cpp b/Code/Framework/AzCore/Tests/AZStd/LockFreeQueues.cpp
index 02be1a34d8..b87eb69bbe 100644
--- a/Code/Framework/AzCore/Tests/AZStd/LockFreeQueues.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/LockFreeQueues.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/LockFreeStacks.cpp b/Code/Framework/AzCore/Tests/AZStd/LockFreeStacks.cpp
index 9700bb2019..dd2d831c9d 100644
--- a/Code/Framework/AzCore/Tests/AZStd/LockFreeStacks.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/LockFreeStacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/LockTests.cpp b/Code/Framework/AzCore/Tests/AZStd/LockTests.cpp
index baf2403eda..94d22873e7 100644
--- a/Code/Framework/AzCore/Tests/AZStd/LockTests.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/LockTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Numeric.cpp b/Code/Framework/AzCore/Tests/AZStd/Numeric.cpp
index 1225df3d0b..219902960b 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Numeric.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Numeric.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Optional.cpp b/Code/Framework/AzCore/Tests/AZStd/Optional.cpp
index cad8002b52..86ebe37e98 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Optional.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Optional.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Ordered.cpp b/Code/Framework/AzCore/Tests/AZStd/Ordered.cpp
index 32e35f8613..ec24594ac1 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Ordered.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Ordered.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Pair.cpp b/Code/Framework/AzCore/Tests/AZStd/Pair.cpp
index 4fbd2792b8..7f7b409f9d 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Pair.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Pair.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Parallel.cpp b/Code/Framework/AzCore/Tests/AZStd/Parallel.cpp
index 2611728700..73326333a3 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Parallel.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Parallel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/ScopedLockTests.cpp b/Code/Framework/AzCore/Tests/AZStd/ScopedLockTests.cpp
index a2f9a37b93..3091fcb4ea 100644
--- a/Code/Framework/AzCore/Tests/AZStd/ScopedLockTests.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/ScopedLockTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/SetsIntrusive.cpp b/Code/Framework/AzCore/Tests/AZStd/SetsIntrusive.cpp
index 6dafb002e0..51a9920c70 100644
--- a/Code/Framework/AzCore/Tests/AZStd/SetsIntrusive.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/SetsIntrusive.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp b/Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp
index 841ad874ee..e9b241c518 100644
--- a/Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/String.cpp b/Code/Framework/AzCore/Tests/AZStd/String.cpp
index 2f39345206..85c0b88292 100644
--- a/Code/Framework/AzCore/Tests/AZStd/String.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/String.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Tuple.cpp b/Code/Framework/AzCore/Tests/AZStd/Tuple.cpp
index b26d6a702a..18f5e6a0bd 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Tuple.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Tuple.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/TypeTraits.cpp b/Code/Framework/AzCore/Tests/AZStd/TypeTraits.cpp
index 5fd0eac58e..667dabc787 100644
--- a/Code/Framework/AzCore/Tests/AZStd/TypeTraits.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/TypeTraits.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/UserTypes.h b/Code/Framework/AzCore/Tests/AZStd/UserTypes.h
index b17ea07f9a..0425e8cde1 100644
--- a/Code/Framework/AzCore/Tests/AZStd/UserTypes.h
+++ b/Code/Framework/AzCore/Tests/AZStd/UserTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/Variant.cpp b/Code/Framework/AzCore/Tests/AZStd/Variant.cpp
index 222c84f28b..bb8bf09f5a 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Variant.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Variant.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/VariantSerialization.cpp b/Code/Framework/AzCore/Tests/AZStd/VariantSerialization.cpp
index 69c45d15b0..f9cfd9c794 100644
--- a/Code/Framework/AzCore/Tests/AZStd/VariantSerialization.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/VariantSerialization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp
index 084b00d202..1bb6defa8f 100644
--- a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZTestShared/Math/MathTestHelpers.cpp b/Code/Framework/AzCore/Tests/AZTestShared/Math/MathTestHelpers.cpp
index ac12f7694f..e03359d54c 100644
--- a/Code/Framework/AzCore/Tests/AZTestShared/Math/MathTestHelpers.cpp
+++ b/Code/Framework/AzCore/Tests/AZTestShared/Math/MathTestHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZTestShared/Math/MathTestHelpers.h b/Code/Framework/AzCore/Tests/AZTestShared/Math/MathTestHelpers.h
index 7870b2456a..539195b11f 100644
--- a/Code/Framework/AzCore/Tests/AZTestShared/Math/MathTestHelpers.h
+++ b/Code/Framework/AzCore/Tests/AZTestShared/Math/MathTestHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZTestShared/Utils/Utils.cpp b/Code/Framework/AzCore/Tests/AZTestShared/Utils/Utils.cpp
index a49b5a6c18..a654302da6 100644
--- a/Code/Framework/AzCore/Tests/AZTestShared/Utils/Utils.cpp
+++ b/Code/Framework/AzCore/Tests/AZTestShared/Utils/Utils.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AZTestShared/Utils/Utils.h b/Code/Framework/AzCore/Tests/AZTestShared/Utils/Utils.h
index 22a15cbf56..ff2ac534c5 100644
--- a/Code/Framework/AzCore/Tests/AZTestShared/Utils/Utils.h
+++ b/Code/Framework/AzCore/Tests/AZTestShared/Utils/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Asset/AssetCommon.cpp b/Code/Framework/AzCore/Tests/Asset/AssetCommon.cpp
index e0f54e4627..35c5983b28 100644
--- a/Code/Framework/AzCore/Tests/Asset/AssetCommon.cpp
+++ b/Code/Framework/AzCore/Tests/Asset/AssetCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Asset/AssetDataStreamTests.cpp b/Code/Framework/AzCore/Tests/Asset/AssetDataStreamTests.cpp
index 06ab1d04ad..635d92b21c 100644
--- a/Code/Framework/AzCore/Tests/Asset/AssetDataStreamTests.cpp
+++ b/Code/Framework/AzCore/Tests/Asset/AssetDataStreamTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp b/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp
index e26afce755..4618f6ea85 100644
--- a/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp
+++ b/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Asset/AssetManagerStreamingTests.cpp b/Code/Framework/AzCore/Tests/Asset/AssetManagerStreamingTests.cpp
index 06fc537bbb..5c1b737662 100644
--- a/Code/Framework/AzCore/Tests/Asset/AssetManagerStreamingTests.cpp
+++ b/Code/Framework/AzCore/Tests/Asset/AssetManagerStreamingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.cpp b/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.cpp
index 07382ca172..4f9ef9f262 100644
--- a/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.cpp
+++ b/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.h b/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.h
index 0b62f40bb4..c5eb15f086 100644
--- a/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.h
+++ b/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Asset/MockLoadAssetCatalogAndHandler.h b/Code/Framework/AzCore/Tests/Asset/MockLoadAssetCatalogAndHandler.h
index b7e168bd7e..cfbb56d02e 100644
--- a/Code/Framework/AzCore/Tests/Asset/MockLoadAssetCatalogAndHandler.h
+++ b/Code/Framework/AzCore/Tests/Asset/MockLoadAssetCatalogAndHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Asset/TestAssetTypes.h b/Code/Framework/AzCore/Tests/Asset/TestAssetTypes.h
index 5c9a492744..9d6f92f91a 100644
--- a/Code/Framework/AzCore/Tests/Asset/TestAssetTypes.h
+++ b/Code/Framework/AzCore/Tests/Asset/TestAssetTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AssetJsonSerializerTests.cpp b/Code/Framework/AzCore/Tests/AssetJsonSerializerTests.cpp
index 5b3574d5ef..89824bc127 100644
--- a/Code/Framework/AzCore/Tests/AssetJsonSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/AssetJsonSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AssetManager.cpp b/Code/Framework/AzCore/Tests/AssetManager.cpp
index 0df1cec517..70f2c70d33 100644
--- a/Code/Framework/AzCore/Tests/AssetManager.cpp
+++ b/Code/Framework/AzCore/Tests/AssetManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AssetSerializerTests.cpp b/Code/Framework/AzCore/Tests/AssetSerializerTests.cpp
index b5b8fd1ac0..7614f50926 100644
--- a/Code/Framework/AzCore/Tests/AssetSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/AssetSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/AzEnumTest.cpp b/Code/Framework/AzCore/Tests/AzEnumTest.cpp
index 827c6af767..2c8c8271df 100644
--- a/Code/Framework/AzCore/Tests/AzEnumTest.cpp
+++ b/Code/Framework/AzCore/Tests/AzEnumTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/BehaviorContext.cpp b/Code/Framework/AzCore/Tests/BehaviorContext.cpp
index 8f8d722b8c..5b2a4a4e9f 100644
--- a/Code/Framework/AzCore/Tests/BehaviorContext.cpp
+++ b/Code/Framework/AzCore/Tests/BehaviorContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/BehaviorContextFixture.h b/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
index 5edb1f591a..440b269027 100644
--- a/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
+++ b/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Components.cpp b/Code/Framework/AzCore/Tests/Components.cpp
index eb81b5b786..610ede1dde 100644
--- a/Code/Framework/AzCore/Tests/Components.cpp
+++ b/Code/Framework/AzCore/Tests/Components.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Console/ConsoleTests.cpp b/Code/Framework/AzCore/Tests/Console/ConsoleTests.cpp
index 64bd8a1e21..89bfb807fe 100644
--- a/Code/Framework/AzCore/Tests/Console/ConsoleTests.cpp
+++ b/Code/Framework/AzCore/Tests/Console/ConsoleTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Console/LoggerSystemComponentTests.cpp b/Code/Framework/AzCore/Tests/Console/LoggerSystemComponentTests.cpp
index daec3b1d12..e028719a60 100644
--- a/Code/Framework/AzCore/Tests/Console/LoggerSystemComponentTests.cpp
+++ b/Code/Framework/AzCore/Tests/Console/LoggerSystemComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/DLL.cpp b/Code/Framework/AzCore/Tests/DLL.cpp
index b5665a7d1c..1ef803d066 100644
--- a/Code/Framework/AzCore/Tests/DLL.cpp
+++ b/Code/Framework/AzCore/Tests/DLL.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/DLLMainTest.cpp b/Code/Framework/AzCore/Tests/DLLMainTest.cpp
index 882d522164..4dd8194572 100644
--- a/Code/Framework/AzCore/Tests/DLLMainTest.cpp
+++ b/Code/Framework/AzCore/Tests/DLLMainTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Debug.cpp b/Code/Framework/AzCore/Tests/Debug.cpp
index e66d7dd548..a7d69a229c 100644
--- a/Code/Framework/AzCore/Tests/Debug.cpp
+++ b/Code/Framework/AzCore/Tests/Debug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Debug/AssetTracking.cpp b/Code/Framework/AzCore/Tests/Debug/AssetTracking.cpp
index 541d9a7aa6..6c52b0f701 100644
--- a/Code/Framework/AzCore/Tests/Debug/AssetTracking.cpp
+++ b/Code/Framework/AzCore/Tests/Debug/AssetTracking.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Debug/LocalFileEventLoggerTests.cpp b/Code/Framework/AzCore/Tests/Debug/LocalFileEventLoggerTests.cpp
index 395f77c758..4517a355bb 100644
--- a/Code/Framework/AzCore/Tests/Debug/LocalFileEventLoggerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Debug/LocalFileEventLoggerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Debug/Trace.cpp b/Code/Framework/AzCore/Tests/Debug/Trace.cpp
index 95aa0427f5..055f8772ac 100644
--- a/Code/Framework/AzCore/Tests/Debug/Trace.cpp
+++ b/Code/Framework/AzCore/Tests/Debug/Trace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Driller.cpp b/Code/Framework/AzCore/Tests/Driller.cpp
index deafc0e8cb..aa19e0e161 100644
--- a/Code/Framework/AzCore/Tests/Driller.cpp
+++ b/Code/Framework/AzCore/Tests/Driller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/EBus.cpp b/Code/Framework/AzCore/Tests/EBus.cpp
index 07d1934cb0..9d129524f9 100644
--- a/Code/Framework/AzCore/Tests/EBus.cpp
+++ b/Code/Framework/AzCore/Tests/EBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp b/Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp
index 58d237c96d..5a7407720a 100644
--- a/Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp
+++ b/Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/EntityIdTests.cpp b/Code/Framework/AzCore/Tests/EntityIdTests.cpp
index ba7cae1273..8adca10fde 100644
--- a/Code/Framework/AzCore/Tests/EntityIdTests.cpp
+++ b/Code/Framework/AzCore/Tests/EntityIdTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/EntityTests.cpp b/Code/Framework/AzCore/Tests/EntityTests.cpp
index b944d3e5d3..4bc6a19e25 100644
--- a/Code/Framework/AzCore/Tests/EntityTests.cpp
+++ b/Code/Framework/AzCore/Tests/EntityTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/EnumTests.cpp b/Code/Framework/AzCore/Tests/EnumTests.cpp
index 8e24604789..5cca8fcc76 100644
--- a/Code/Framework/AzCore/Tests/EnumTests.cpp
+++ b/Code/Framework/AzCore/Tests/EnumTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/EventTests.cpp b/Code/Framework/AzCore/Tests/EventTests.cpp
index b491011144..7640201e0d 100644
--- a/Code/Framework/AzCore/Tests/EventTests.cpp
+++ b/Code/Framework/AzCore/Tests/EventTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/FileIOBaseTestTypes.h b/Code/Framework/AzCore/Tests/FileIOBaseTestTypes.h
index 74e66a9a79..4641c21232 100644
--- a/Code/Framework/AzCore/Tests/FileIOBaseTestTypes.h
+++ b/Code/Framework/AzCore/Tests/FileIOBaseTestTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/FixedWidthIntegers.cpp b/Code/Framework/AzCore/Tests/FixedWidthIntegers.cpp
index 4ff43f0299..16cbc60889 100644
--- a/Code/Framework/AzCore/Tests/FixedWidthIntegers.cpp
+++ b/Code/Framework/AzCore/Tests/FixedWidthIntegers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/GenericStreamMock.h b/Code/Framework/AzCore/Tests/GenericStreamMock.h
index a8adbc8e1a..848f9402fc 100644
--- a/Code/Framework/AzCore/Tests/GenericStreamMock.h
+++ b/Code/Framework/AzCore/Tests/GenericStreamMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/GenericStreamTests.cpp b/Code/Framework/AzCore/Tests/GenericStreamTests.cpp
index 78926dae69..0b1ebd0379 100644
--- a/Code/Framework/AzCore/Tests/GenericStreamTests.cpp
+++ b/Code/Framework/AzCore/Tests/GenericStreamTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Geometry2DUtils.cpp b/Code/Framework/AzCore/Tests/Geometry2DUtils.cpp
index da6f5f50b8..64350a4316 100644
--- a/Code/Framework/AzCore/Tests/Geometry2DUtils.cpp
+++ b/Code/Framework/AzCore/Tests/Geometry2DUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/IO/Path/PathTests.cpp b/Code/Framework/AzCore/Tests/IO/Path/PathTests.cpp
index 9a3b4d2ecf..84136e024c 100644
--- a/Code/Framework/AzCore/Tests/IO/Path/PathTests.cpp
+++ b/Code/Framework/AzCore/Tests/IO/Path/PathTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/IPC.cpp b/Code/Framework/AzCore/Tests/IPC.cpp
index d1a48d12e4..69faa0a10b 100644
--- a/Code/Framework/AzCore/Tests/IPC.cpp
+++ b/Code/Framework/AzCore/Tests/IPC.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Interface.cpp b/Code/Framework/AzCore/Tests/Interface.cpp
index 71e39997ad..7fadbfb212 100644
--- a/Code/Framework/AzCore/Tests/Interface.cpp
+++ b/Code/Framework/AzCore/Tests/Interface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/IntersectPoint.cpp b/Code/Framework/AzCore/Tests/IntersectPoint.cpp
index d3d04925b3..b60f069fcc 100644
--- a/Code/Framework/AzCore/Tests/IntersectPoint.cpp
+++ b/Code/Framework/AzCore/Tests/IntersectPoint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/JSON.cpp b/Code/Framework/AzCore/Tests/JSON.cpp
index b980eef17a..14be069ef3 100644
--- a/Code/Framework/AzCore/Tests/JSON.cpp
+++ b/Code/Framework/AzCore/Tests/JSON.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Jobs.cpp b/Code/Framework/AzCore/Tests/Jobs.cpp
index 8ecabf8d96..cbfa029412 100644
--- a/Code/Framework/AzCore/Tests/Jobs.cpp
+++ b/Code/Framework/AzCore/Tests/Jobs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Main.cpp b/Code/Framework/AzCore/Tests/Main.cpp
index 4e854cbc54..694c2a33ba 100644
--- a/Code/Framework/AzCore/Tests/Main.cpp
+++ b/Code/Framework/AzCore/Tests/Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/AabbTests.cpp b/Code/Framework/AzCore/Tests/Math/AabbTests.cpp
index ba6e9d40eb..6d643ecb56 100644
--- a/Code/Framework/AzCore/Tests/Math/AabbTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/AabbTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/ColorTests.cpp b/Code/Framework/AzCore/Tests/Math/ColorTests.cpp
index 769954b8e6..ed178950f4 100644
--- a/Code/Framework/AzCore/Tests/Math/ColorTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/ColorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/CrcTests.cpp b/Code/Framework/AzCore/Tests/Math/CrcTests.cpp
index 3dd5ea3a43..215fe3575a 100644
--- a/Code/Framework/AzCore/Tests/Math/CrcTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/CrcTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/CrcTestsCompileTimeLiterals.h b/Code/Framework/AzCore/Tests/Math/CrcTestsCompileTimeLiterals.h
index 3ee140da6f..66d760f325 100644
--- a/Code/Framework/AzCore/Tests/Math/CrcTestsCompileTimeLiterals.h
+++ b/Code/Framework/AzCore/Tests/Math/CrcTestsCompileTimeLiterals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/FrustumPerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/FrustumPerformanceTests.cpp
index 02982919a4..efdb463525 100644
--- a/Code/Framework/AzCore/Tests/Math/FrustumPerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/FrustumPerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/FrustumTests.cpp b/Code/Framework/AzCore/Tests/Math/FrustumTests.cpp
index c75230d48f..2ed3a6f5e4 100644
--- a/Code/Framework/AzCore/Tests/Math/FrustumTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/FrustumTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp b/Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp
index 485e12ec4e..b3910190cf 100644
--- a/Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/MathIntrinsicsTests.cpp b/Code/Framework/AzCore/Tests/Math/MathIntrinsicsTests.cpp
index 85927680c5..80721c1421 100644
--- a/Code/Framework/AzCore/Tests/Math/MathIntrinsicsTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/MathIntrinsicsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/MathTestData.h b/Code/Framework/AzCore/Tests/Math/MathTestData.h
index f6576f17e1..a300fc906c 100644
--- a/Code/Framework/AzCore/Tests/Math/MathTestData.h
+++ b/Code/Framework/AzCore/Tests/Math/MathTestData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/MathUtilsTests.cpp b/Code/Framework/AzCore/Tests/Math/MathUtilsTests.cpp
index c3872f9030..dbcf1fc797 100644
--- a/Code/Framework/AzCore/Tests/Math/MathUtilsTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/MathUtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Matrix3x3PerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/Matrix3x3PerformanceTests.cpp
index a944956641..01188128ff 100644
--- a/Code/Framework/AzCore/Tests/Math/Matrix3x3PerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Matrix3x3PerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Matrix3x3Tests.cpp b/Code/Framework/AzCore/Tests/Math/Matrix3x3Tests.cpp
index b2586ff585..3a5c86a9f1 100644
--- a/Code/Framework/AzCore/Tests/Math/Matrix3x3Tests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Matrix3x3Tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Matrix3x4PerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/Matrix3x4PerformanceTests.cpp
index 4252e79ce2..ef2c61647f 100644
--- a/Code/Framework/AzCore/Tests/Math/Matrix3x4PerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Matrix3x4PerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp b/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp
index acd07a6e07..49640db0ee 100644
--- a/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Matrix4x4PerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/Matrix4x4PerformanceTests.cpp
index fb683edd39..f3eae72d49 100644
--- a/Code/Framework/AzCore/Tests/Math/Matrix4x4PerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Matrix4x4PerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Matrix4x4Tests.cpp b/Code/Framework/AzCore/Tests/Math/Matrix4x4Tests.cpp
index b6ece79193..44b82ad23e 100644
--- a/Code/Framework/AzCore/Tests/Math/Matrix4x4Tests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Matrix4x4Tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/MatrixUtilsTests.cpp b/Code/Framework/AzCore/Tests/Math/MatrixUtilsTests.cpp
index 0ee0d0282d..411c7c0bd5 100644
--- a/Code/Framework/AzCore/Tests/Math/MatrixUtilsTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/MatrixUtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/ObbPerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/ObbPerformanceTests.cpp
index 61cd55c451..335c52e153 100644
--- a/Code/Framework/AzCore/Tests/Math/ObbPerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/ObbPerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/ObbTests.cpp b/Code/Framework/AzCore/Tests/Math/ObbTests.cpp
index b2ed207574..16849b94f3 100644
--- a/Code/Framework/AzCore/Tests/Math/ObbTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/ObbTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/PlanePerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/PlanePerformanceTests.cpp
index f714d2c337..b001e73cea 100644
--- a/Code/Framework/AzCore/Tests/Math/PlanePerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/PlanePerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/PlaneTests.cpp b/Code/Framework/AzCore/Tests/Math/PlaneTests.cpp
index fb539dbdf9..bda89a353a 100644
--- a/Code/Framework/AzCore/Tests/Math/PlaneTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/PlaneTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/QuaternionPerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/QuaternionPerformanceTests.cpp
index fd12353443..5f3cf7581c 100644
--- a/Code/Framework/AzCore/Tests/Math/QuaternionPerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/QuaternionPerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/QuaternionTests.cpp b/Code/Framework/AzCore/Tests/Math/QuaternionTests.cpp
index 38ee83851d..a3e29706fa 100644
--- a/Code/Framework/AzCore/Tests/Math/QuaternionTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/QuaternionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/RandomTests.cpp b/Code/Framework/AzCore/Tests/Math/RandomTests.cpp
index fb7ea1d0d4..7de7640ad6 100644
--- a/Code/Framework/AzCore/Tests/Math/RandomTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/RandomTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/SfmtTests.cpp b/Code/Framework/AzCore/Tests/Math/SfmtTests.cpp
index ad925e41fd..7a70c2a399 100644
--- a/Code/Framework/AzCore/Tests/Math/SfmtTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/SfmtTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/ShapeIntersectionPerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/ShapeIntersectionPerformanceTests.cpp
index a91b09481c..292d32687d 100644
--- a/Code/Framework/AzCore/Tests/Math/ShapeIntersectionPerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/ShapeIntersectionPerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/ShapeIntersectionTests.cpp b/Code/Framework/AzCore/Tests/Math/ShapeIntersectionTests.cpp
index 84e1e4e3db..56f90a1db4 100644
--- a/Code/Framework/AzCore/Tests/Math/ShapeIntersectionTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/ShapeIntersectionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/SimdMathTests.cpp b/Code/Framework/AzCore/Tests/Math/SimdMathTests.cpp
index ee63266d65..1e7a6aa95f 100644
--- a/Code/Framework/AzCore/Tests/Math/SimdMathTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/SimdMathTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/SphereTests.cpp b/Code/Framework/AzCore/Tests/Math/SphereTests.cpp
index 8534561835..f56ff62fba 100644
--- a/Code/Framework/AzCore/Tests/Math/SphereTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/SphereTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/SplineTests.cpp b/Code/Framework/AzCore/Tests/Math/SplineTests.cpp
index 9e6749ba0d..4ef1796715 100644
--- a/Code/Framework/AzCore/Tests/Math/SplineTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/SplineTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/TransformPerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/TransformPerformanceTests.cpp
index 16d6d00be7..a64472f9d6 100644
--- a/Code/Framework/AzCore/Tests/Math/TransformPerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/TransformPerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/TransformTests.cpp b/Code/Framework/AzCore/Tests/Math/TransformTests.cpp
index 8606138476..77c6f76731 100644
--- a/Code/Framework/AzCore/Tests/Math/TransformTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/TransformTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Vector2PerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/Vector2PerformanceTests.cpp
index 63a1718a40..c4205db156 100644
--- a/Code/Framework/AzCore/Tests/Math/Vector2PerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Vector2PerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Vector2Tests.cpp b/Code/Framework/AzCore/Tests/Math/Vector2Tests.cpp
index 9ac3119d10..8d9c695efd 100644
--- a/Code/Framework/AzCore/Tests/Math/Vector2Tests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Vector2Tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Vector3PerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/Vector3PerformanceTests.cpp
index 33cdca5847..c5e01c5d8a 100644
--- a/Code/Framework/AzCore/Tests/Math/Vector3PerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Vector3PerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Vector3Tests.cpp b/Code/Framework/AzCore/Tests/Math/Vector3Tests.cpp
index abc8d417a1..3de78d749e 100644
--- a/Code/Framework/AzCore/Tests/Math/Vector3Tests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Vector3Tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Vector4PerformanceTests.cpp b/Code/Framework/AzCore/Tests/Math/Vector4PerformanceTests.cpp
index a9a87c682c..b557443ff5 100644
--- a/Code/Framework/AzCore/Tests/Math/Vector4PerformanceTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Vector4PerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Math/Vector4Tests.cpp b/Code/Framework/AzCore/Tests/Math/Vector4Tests.cpp
index 6eb7244ffc..8f0ab69a7b 100644
--- a/Code/Framework/AzCore/Tests/Math/Vector4Tests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Vector4Tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Memory.cpp b/Code/Framework/AzCore/Tests/Memory.cpp
index ce2c701858..2c3a272735 100644
--- a/Code/Framework/AzCore/Tests/Memory.cpp
+++ b/Code/Framework/AzCore/Tests/Memory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Memory/AllocatorManager.cpp b/Code/Framework/AzCore/Tests/Memory/AllocatorManager.cpp
index 26224d83d9..097f80bed2 100644
--- a/Code/Framework/AzCore/Tests/Memory/AllocatorManager.cpp
+++ b/Code/Framework/AzCore/Tests/Memory/AllocatorManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Memory/HphaSchema.cpp b/Code/Framework/AzCore/Tests/Memory/HphaSchema.cpp
index e567abf21d..00b7d5d6e2 100644
--- a/Code/Framework/AzCore/Tests/Memory/HphaSchema.cpp
+++ b/Code/Framework/AzCore/Tests/Memory/HphaSchema.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Memory/HphaSchemaErrorDetection.cpp b/Code/Framework/AzCore/Tests/Memory/HphaSchemaErrorDetection.cpp
index f6d3eb25b8..86ec9ec4b5 100644
--- a/Code/Framework/AzCore/Tests/Memory/HphaSchemaErrorDetection.cpp
+++ b/Code/Framework/AzCore/Tests/Memory/HphaSchemaErrorDetection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Memory/LeakDetection.cpp b/Code/Framework/AzCore/Tests/Memory/LeakDetection.cpp
index dd45e0ba44..fbad1eceaa 100644
--- a/Code/Framework/AzCore/Tests/Memory/LeakDetection.cpp
+++ b/Code/Framework/AzCore/Tests/Memory/LeakDetection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Memory/MallocSchema.cpp b/Code/Framework/AzCore/Tests/Memory/MallocSchema.cpp
index 8fd952900a..977db01892 100644
--- a/Code/Framework/AzCore/Tests/Memory/MallocSchema.cpp
+++ b/Code/Framework/AzCore/Tests/Memory/MallocSchema.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Module.cpp b/Code/Framework/AzCore/Tests/Module.cpp
index 1a0e62fc02..4a2c514c0b 100644
--- a/Code/Framework/AzCore/Tests/Module.cpp
+++ b/Code/Framework/AzCore/Tests/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/ModuleTestBus.h b/Code/Framework/AzCore/Tests/ModuleTestBus.h
index a8ccbc9f0c..5b9ababf4e 100644
--- a/Code/Framework/AzCore/Tests/ModuleTestBus.h
+++ b/Code/Framework/AzCore/Tests/ModuleTestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Name/NameJsonSerializerTests.cpp b/Code/Framework/AzCore/Tests/Name/NameJsonSerializerTests.cpp
index 3331da61df..08286c91c7 100644
--- a/Code/Framework/AzCore/Tests/Name/NameJsonSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Name/NameJsonSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Name/NameTests.cpp b/Code/Framework/AzCore/Tests/Name/NameTests.cpp
index 80cd0c83d0..d55a081d9c 100644
--- a/Code/Framework/AzCore/Tests/Name/NameTests.cpp
+++ b/Code/Framework/AzCore/Tests/Name/NameTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/OrderedEventBenchmarks.cpp b/Code/Framework/AzCore/Tests/OrderedEventBenchmarks.cpp
index 7f536d2d9c..9383901ce5 100644
--- a/Code/Framework/AzCore/Tests/OrderedEventBenchmarks.cpp
+++ b/Code/Framework/AzCore/Tests/OrderedEventBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/OrderedEventTests.cpp b/Code/Framework/AzCore/Tests/OrderedEventTests.cpp
index 4d179f0059..090201048d 100644
--- a/Code/Framework/AzCore/Tests/OrderedEventTests.cpp
+++ b/Code/Framework/AzCore/Tests/OrderedEventTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Outcome.cpp b/Code/Framework/AzCore/Tests/Outcome.cpp
index 3c3cf56529..c5ea2d8582 100644
--- a/Code/Framework/AzCore/Tests/Outcome.cpp
+++ b/Code/Framework/AzCore/Tests/Outcome.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Patching.cpp b/Code/Framework/AzCore/Tests/Patching.cpp
index e2da5daeb2..028d4358a9 100644
--- a/Code/Framework/AzCore/Tests/Patching.cpp
+++ b/Code/Framework/AzCore/Tests/Patching.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Android/Tests/UtilsTests_Android.cpp b/Code/Framework/AzCore/Tests/Platform/Android/Tests/UtilsTests_Android.cpp
index 70d8f973ee..36c130ce12 100644
--- a/Code/Framework/AzCore/Tests/Platform/Android/Tests/UtilsTests_Android.cpp
+++ b/Code/Framework/AzCore/Tests/Platform/Android/Tests/UtilsTests_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Android/platform_android.cmake b/Code/Framework/AzCore/Tests/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzCore/Tests/Platform/Android/platform_android.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/Android/platform_android_files.cmake b/Code/Framework/AzCore/Tests/Platform/Android/platform_android_files.cmake
index 3e413f26f9..5e3a421170 100644
--- a/Code/Framework/AzCore/Tests/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/Common/Apple/Tests/UtilsTests_Apple.cpp b/Code/Framework/AzCore/Tests/Platform/Common/Apple/Tests/UtilsTests_Apple.cpp
index 48e7aa4e01..e602c52b14 100644
--- a/Code/Framework/AzCore/Tests/Platform/Common/Apple/Tests/UtilsTests_Apple.cpp
+++ b/Code/Framework/AzCore/Tests/Platform/Common/Apple/Tests/UtilsTests_Apple.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Common/UnixLike/Tests/UtilsTests_UnixLike.cpp b/Code/Framework/AzCore/Tests/Platform/Common/UnixLike/Tests/UtilsTests_UnixLike.cpp
index e069cca2da..87b8e550ab 100644
--- a/Code/Framework/AzCore/Tests/Platform/Common/UnixLike/Tests/UtilsTests_UnixLike.cpp
+++ b/Code/Framework/AzCore/Tests/Platform/Common/UnixLike/Tests/UtilsTests_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Common/WinAPI/Tests/UtilsTests_WinAPI.cpp b/Code/Framework/AzCore/Tests/Platform/Common/WinAPI/Tests/UtilsTests_WinAPI.cpp
index 2c34988049..1bcd7e8600 100644
--- a/Code/Framework/AzCore/Tests/Platform/Common/WinAPI/Tests/UtilsTests_WinAPI.cpp
+++ b/Code/Framework/AzCore/Tests/Platform/Common/WinAPI/Tests/UtilsTests_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Linux/Tests/UtilsTests_Linux.cpp b/Code/Framework/AzCore/Tests/Platform/Linux/Tests/UtilsTests_Linux.cpp
index 9068176264..d0097920ac 100644
--- a/Code/Framework/AzCore/Tests/Platform/Linux/Tests/UtilsTests_Linux.cpp
+++ b/Code/Framework/AzCore/Tests/Platform/Linux/Tests/UtilsTests_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Linux/platform_linux.cmake b/Code/Framework/AzCore/Tests/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzCore/Tests/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzCore/Tests/Platform/Linux/platform_linux_files.cmake
index 80de53083d..9ac60b9ff9 100644
--- a/Code/Framework/AzCore/Tests/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/Mac/platform_mac.cmake b/Code/Framework/AzCore/Tests/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzCore/Tests/Platform/Mac/platform_mac.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzCore/Tests/Platform/Mac/platform_mac_files.cmake
index 4315ba2283..766f781ff0 100644
--- a/Code/Framework/AzCore/Tests/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp b/Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp
index 22a1c080cf..e654ef4aa3 100644
--- a/Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp
+++ b/Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Windows/Tests/Memory/OverrunDetectionAllocator_Windows.cpp b/Code/Framework/AzCore/Tests/Platform/Windows/Tests/Memory/OverrunDetectionAllocator_Windows.cpp
index 06bce20c9b..bf9d0867ac 100644
--- a/Code/Framework/AzCore/Tests/Platform/Windows/Tests/Memory/OverrunDetectionAllocator_Windows.cpp
+++ b/Code/Framework/AzCore/Tests/Platform/Windows/Tests/Memory/OverrunDetectionAllocator_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Windows/Tests/Serialization_Windows.cpp b/Code/Framework/AzCore/Tests/Platform/Windows/Tests/Serialization_Windows.cpp
index c535158868..6d51a967ac 100644
--- a/Code/Framework/AzCore/Tests/Platform/Windows/Tests/Serialization_Windows.cpp
+++ b/Code/Framework/AzCore/Tests/Platform/Windows/Tests/Serialization_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Platform/Windows/platform_windows.cmake b/Code/Framework/AzCore/Tests/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzCore/Tests/Platform/Windows/platform_windows.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzCore/Tests/Platform/Windows/platform_windows_files.cmake
index c1d20c7f99..b3a8c2b1fd 100644
--- a/Code/Framework/AzCore/Tests/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/iOS/platform_ios.cmake b/Code/Framework/AzCore/Tests/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzCore/Tests/Platform/iOS/platform_ios.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzCore/Tests/Platform/iOS/platform_ios_files.cmake
index 4315ba2283..766f781ff0 100644
--- a/Code/Framework/AzCore/Tests/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/AzCore/Tests/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/RTTI/TypeSafeIntegralTests.cpp b/Code/Framework/AzCore/Tests/RTTI/TypeSafeIntegralTests.cpp
index b4df7c2c7c..e7e7314e68 100644
--- a/Code/Framework/AzCore/Tests/RTTI/TypeSafeIntegralTests.cpp
+++ b/Code/Framework/AzCore/Tests/RTTI/TypeSafeIntegralTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/RemappableId.cpp b/Code/Framework/AzCore/Tests/RemappableId.cpp
index 9b4827c764..8f645dd302 100644
--- a/Code/Framework/AzCore/Tests/RemappableId.cpp
+++ b/Code/Framework/AzCore/Tests/RemappableId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Rtti.cpp b/Code/Framework/AzCore/Tests/Rtti.cpp
index b53685bf48..c6201841ff 100644
--- a/Code/Framework/AzCore/Tests/Rtti.cpp
+++ b/Code/Framework/AzCore/Tests/Rtti.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Script.cpp b/Code/Framework/AzCore/Tests/Script.cpp
index 10f6f574bc..82d5d87ec9 100644
--- a/Code/Framework/AzCore/Tests/Script.cpp
+++ b/Code/Framework/AzCore/Tests/Script.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/ScriptMath.cpp b/Code/Framework/AzCore/Tests/ScriptMath.cpp
index 10399d8e62..7c0291e8c9 100644
--- a/Code/Framework/AzCore/Tests/ScriptMath.cpp
+++ b/Code/Framework/AzCore/Tests/ScriptMath.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/ScriptProperty.cpp b/Code/Framework/AzCore/Tests/ScriptProperty.cpp
index 247511bf28..7b09309df5 100644
--- a/Code/Framework/AzCore/Tests/ScriptProperty.cpp
+++ b/Code/Framework/AzCore/Tests/ScriptProperty.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization.cpp b/Code/Framework/AzCore/Tests/Serialization.cpp
index bdacc9b237..b063fd4967 100644
--- a/Code/Framework/AzCore/Tests/Serialization.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/ArraySerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/ArraySerializerTests.cpp
index e63db07bcb..fe4f311a6f 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/ArraySerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/ArraySerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerFixture.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerFixture.cpp
index aa5f40ba35..5b7e7a7973 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerFixture.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerFixture.h b/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerFixture.h
index 4e2a4f7695..0936f6d1c5 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerFixture.h
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerTests.cpp
index ff6274750d..20cff97604 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/BaseJsonSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/BasicContainerSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/BasicContainerSerializerTests.cpp
index 3abeb76a96..48ad7d838f 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/BasicContainerSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/BasicContainerSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/BoolSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/BoolSerializerTests.cpp
index 621722b9c3..d17fc3d6d7 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/BoolSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/BoolSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/ByteStreamSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/ByteStreamSerializerTests.cpp
index 0b908b0ae8..d14ced50d5 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/ByteStreamSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/ByteStreamSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/ColorSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/ColorSerializerTests.cpp
index 0199608d09..bd9f516db3 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/ColorSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/ColorSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/DoubleSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/DoubleSerializerTests.cpp
index d9eb929caa..e6506e7b7a 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/DoubleSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/DoubleSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp
index 36165aeff1..560acaf72e 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/JsonRegistrationContextTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/JsonRegistrationContextTests.cpp
index 6bff06ece0..02d4b96703 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonRegistrationContextTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonRegistrationContextTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationMetadataTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationMetadataTests.cpp
index c7896d39d7..5d09673c7a 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationMetadataTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationMetadataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationResultTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationResultTests.cpp
index 4b622439a5..a49b19a4d8 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationResultTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationResultTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp
index 88b73847a9..7af5f37257 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.h b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.h
index 8df258a3fd..13c77f5da5 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.h
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h
index b2ab3df6b2..b5900b8356 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerMock.h b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerMock.h
index 43b4532b0a..f9512b36a4 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerMock.h
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/MapSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/MapSerializerTests.cpp
index 70b8ae7537..1c690aad71 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/MapSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/MapSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp
index d942fd022e..9494600d28 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/MathVectorSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/MathVectorSerializerTests.cpp
index 7c1b894b24..e0e49ab757 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/MathVectorSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/MathVectorSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/SmartPointerSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/SmartPointerSerializerTests.cpp
index 4126867bdf..e26dab92d9 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/SmartPointerSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/SmartPointerSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/StringSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/StringSerializerTests.cpp
index f56e7f168c..c0c3d68c7a 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/StringSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/StringSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases.h b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases.h
index 1803b9611e..809769654a 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases.h
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Base.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Base.cpp
index 5451af137e..f6b78ccaa5 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Base.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Base.h b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Base.h
index 5918306dfb..0d80160edc 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Base.h
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Classes.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Classes.cpp
index fb42c6d484..df1a768a4a 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Classes.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Classes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Classes.h b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Classes.h
index b291e11ace..88c0371d90 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Classes.h
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Classes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Compare.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Compare.cpp
index b6cc9364ae..7aaf8e2be4 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Compare.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Compare.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Enum.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Enum.cpp
index d8a87e499d..456550ee50 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Enum.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Enum.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp
index 47fa5b071a..ae2dea4e48 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Pointers.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Pointers.cpp
index 3bcb77c668..fbb06bb714 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Pointers.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Pointers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Pointers.h b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Pointers.h
index 9e01accae5..2142b1c041 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Pointers.h
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Pointers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_TypeId.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_TypeId.cpp
index 7773d2fafd..58fac46e73 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_TypeId.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_TypeId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TransformSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TransformSerializerTests.cpp
index fa547d7e42..94661c9cf7 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TransformSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TransformSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/TupleSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TupleSerializerTests.cpp
index fd492c9a24..40c6b36d34 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TupleSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TupleSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/UnorderedSetSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/UnorderedSetSerializerTests.cpp
index 3870f54cae..10eabe10c7 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/UnorderedSetSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/UnorderedSetSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/UnsupportedTypesSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/UnsupportedTypesSerializerTests.cpp
index ee5919d8a1..b9814ff384 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/UnsupportedTypesSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/UnsupportedTypesSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Serialization/Json/UuidSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/UuidSerializerTests.cpp
index af0877be37..95f9f515bb 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/UuidSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/UuidSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/SerializeContextFixture.h b/Code/Framework/AzCore/Tests/SerializeContextFixture.h
index e83a10258f..0f68fe3ee8 100644
--- a/Code/Framework/AzCore/Tests/SerializeContextFixture.h
+++ b/Code/Framework/AzCore/Tests/SerializeContextFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Settings/CommandLineTests.cpp b/Code/Framework/AzCore/Tests/Settings/CommandLineTests.cpp
index 17371b5437..43153aac73 100644
--- a/Code/Framework/AzCore/Tests/Settings/CommandLineTests.cpp
+++ b/Code/Framework/AzCore/Tests/Settings/CommandLineTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Settings/SettingsRegistryConsoleUtilsTests.cpp b/Code/Framework/AzCore/Tests/Settings/SettingsRegistryConsoleUtilsTests.cpp
index 99f4be2679..21953f7ea2 100644
--- a/Code/Framework/AzCore/Tests/Settings/SettingsRegistryConsoleUtilsTests.cpp
+++ b/Code/Framework/AzCore/Tests/Settings/SettingsRegistryConsoleUtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Settings/SettingsRegistryScriptUtilsTests.cpp b/Code/Framework/AzCore/Tests/Settings/SettingsRegistryScriptUtilsTests.cpp
index a89dcaef86..e3015cf661 100644
--- a/Code/Framework/AzCore/Tests/Settings/SettingsRegistryScriptUtilsTests.cpp
+++ b/Code/Framework/AzCore/Tests/Settings/SettingsRegistryScriptUtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp b/Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp
index b8d44d9528..b9aa383fc1 100644
--- a/Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp
+++ b/Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/SettingsRegistryTests.cpp b/Code/Framework/AzCore/Tests/SettingsRegistryTests.cpp
index 4d2cf75b6a..f3f69803ee 100644
--- a/Code/Framework/AzCore/Tests/SettingsRegistryTests.cpp
+++ b/Code/Framework/AzCore/Tests/SettingsRegistryTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Slice.cpp b/Code/Framework/AzCore/Tests/Slice.cpp
index dace07321c..f80c2e3a70 100644
--- a/Code/Framework/AzCore/Tests/Slice.cpp
+++ b/Code/Framework/AzCore/Tests/Slice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/State.cpp b/Code/Framework/AzCore/Tests/State.cpp
index fc17cfa553..87530a0613 100644
--- a/Code/Framework/AzCore/Tests/State.cpp
+++ b/Code/Framework/AzCore/Tests/State.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/StatisticalProfiler.cpp b/Code/Framework/AzCore/Tests/StatisticalProfiler.cpp
index b130916ed2..cf4b6b0205 100644
--- a/Code/Framework/AzCore/Tests/StatisticalProfiler.cpp
+++ b/Code/Framework/AzCore/Tests/StatisticalProfiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Statistics.cpp b/Code/Framework/AzCore/Tests/Statistics.cpp
index 2f96200747..cd33c85320 100644
--- a/Code/Framework/AzCore/Tests/Statistics.cpp
+++ b/Code/Framework/AzCore/Tests/Statistics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/BlockCacheTests.cpp b/Code/Framework/AzCore/Tests/Streamer/BlockCacheTests.cpp
index 1c8072d11a..43474bce56 100644
--- a/Code/Framework/AzCore/Tests/Streamer/BlockCacheTests.cpp
+++ b/Code/Framework/AzCore/Tests/Streamer/BlockCacheTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/DedicatedCacheTests.cpp b/Code/Framework/AzCore/Tests/Streamer/DedicatedCacheTests.cpp
index f230889754..f9fb4a05ea 100644
--- a/Code/Framework/AzCore/Tests/Streamer/DedicatedCacheTests.cpp
+++ b/Code/Framework/AzCore/Tests/Streamer/DedicatedCacheTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/FullDecompressorTests.cpp b/Code/Framework/AzCore/Tests/Streamer/FullDecompressorTests.cpp
index 457613a747..669baf02e6 100644
--- a/Code/Framework/AzCore/Tests/Streamer/FullDecompressorTests.cpp
+++ b/Code/Framework/AzCore/Tests/Streamer/FullDecompressorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/IStreamerMock.h b/Code/Framework/AzCore/Tests/Streamer/IStreamerMock.h
index 6dffee40b3..1db0a11136 100644
--- a/Code/Framework/AzCore/Tests/Streamer/IStreamerMock.h
+++ b/Code/Framework/AzCore/Tests/Streamer/IStreamerMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/IStreamerTypesMock.h b/Code/Framework/AzCore/Tests/Streamer/IStreamerTypesMock.h
index a37142a1a1..20a19138d1 100644
--- a/Code/Framework/AzCore/Tests/Streamer/IStreamerTypesMock.h
+++ b/Code/Framework/AzCore/Tests/Streamer/IStreamerTypesMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/ReadSplitterTests.cpp b/Code/Framework/AzCore/Tests/Streamer/ReadSplitterTests.cpp
index 0199752a70..66e1dd7241 100644
--- a/Code/Framework/AzCore/Tests/Streamer/ReadSplitterTests.cpp
+++ b/Code/Framework/AzCore/Tests/Streamer/ReadSplitterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/SchedulerTests.cpp b/Code/Framework/AzCore/Tests/Streamer/SchedulerTests.cpp
index 25ff00a749..d29855096f 100644
--- a/Code/Framework/AzCore/Tests/Streamer/SchedulerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Streamer/SchedulerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryConformityTests.h b/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryConformityTests.h
index 2e090ff394..4445280d29 100644
--- a/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryConformityTests.h
+++ b/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryConformityTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryMock.h b/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryMock.h
index 7d82904d81..e4e90497aa 100644
--- a/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryMock.h
+++ b/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryTests.cpp b/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryTests.cpp
index 37497530bc..ff685ede59 100644
--- a/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryTests.cpp
+++ b/Code/Framework/AzCore/Tests/Streamer/StreamStackEntryTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/StreamerTests.cpp b/Code/Framework/AzCore/Tests/StreamerTests.cpp
index 0c3f783e57..15cd58055d 100644
--- a/Code/Framework/AzCore/Tests/StreamerTests.cpp
+++ b/Code/Framework/AzCore/Tests/StreamerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/StringFunc.cpp b/Code/Framework/AzCore/Tests/StringFunc.cpp
index 76e07c0976..5ab60fa1d1 100644
--- a/Code/Framework/AzCore/Tests/StringFunc.cpp
+++ b/Code/Framework/AzCore/Tests/StringFunc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/SystemFile.cpp b/Code/Framework/AzCore/Tests/SystemFile.cpp
index cdc85643a4..127214dfe8 100644
--- a/Code/Framework/AzCore/Tests/SystemFile.cpp
+++ b/Code/Framework/AzCore/Tests/SystemFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/TestCatalog.cpp b/Code/Framework/AzCore/Tests/TestCatalog.cpp
index 8f64737fc8..09ef24bd95 100644
--- a/Code/Framework/AzCore/Tests/TestCatalog.cpp
+++ b/Code/Framework/AzCore/Tests/TestCatalog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/TestCatalog.h b/Code/Framework/AzCore/Tests/TestCatalog.h
index d37d054aee..3c74b5fbf7 100644
--- a/Code/Framework/AzCore/Tests/TestCatalog.h
+++ b/Code/Framework/AzCore/Tests/TestCatalog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/TickBusTest.cpp b/Code/Framework/AzCore/Tests/TickBusTest.cpp
index df3e2d51ca..b9ffd4c984 100644
--- a/Code/Framework/AzCore/Tests/TickBusTest.cpp
+++ b/Code/Framework/AzCore/Tests/TickBusTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/TimeDataStatistics.cpp b/Code/Framework/AzCore/Tests/TimeDataStatistics.cpp
index dd0eb0b320..ef08987bad 100644
--- a/Code/Framework/AzCore/Tests/TimeDataStatistics.cpp
+++ b/Code/Framework/AzCore/Tests/TimeDataStatistics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/UUIDTests.cpp b/Code/Framework/AzCore/Tests/UUIDTests.cpp
index d511aac16f..d76a20aa93 100644
--- a/Code/Framework/AzCore/Tests/UUIDTests.cpp
+++ b/Code/Framework/AzCore/Tests/UUIDTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/XML.cpp b/Code/Framework/AzCore/Tests/XML.cpp
index 1ebee905a6..9e15c22572 100644
--- a/Code/Framework/AzCore/Tests/XML.cpp
+++ b/Code/Framework/AzCore/Tests/XML.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzCore/Tests/azcoretestdll_files.cmake b/Code/Framework/AzCore/Tests/azcoretestdll_files.cmake
index 09b69a5a48..7dadc2c09a 100644
--- a/Code/Framework/AzCore/Tests/azcoretestdll_files.cmake
+++ b/Code/Framework/AzCore/Tests/azcoretestdll_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/azcoretests_files.cmake b/Code/Framework/AzCore/Tests/azcoretests_files.cmake
index 1a93847e3b..3d2e2a645f 100644
--- a/Code/Framework/AzCore/Tests/azcoretests_files.cmake
+++ b/Code/Framework/AzCore/Tests/azcoretests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzCore/Tests/aztestshared_files.cmake b/Code/Framework/AzCore/Tests/aztestshared_files.cmake
index ca6b57f8da..a905713baf 100644
--- a/Code/Framework/AzCore/Tests/aztestshared_files.cmake
+++ b/Code/Framework/AzCore/Tests/aztestshared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h b/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
index 3d300dd1db..6515471c00 100644
--- a/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
+++ b/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Application/Application.cpp b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
index bb2e1ec050..07f4865863 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Application/Application.h b/Code/Framework/AzFramework/AzFramework/Application/Application.h
index 548c20fe02..4bdd634e53 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.h
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
index 8958c996a2..92d2e15cc0 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
@@ -1,13 +1,11 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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 : Implementation of the Crytek package files management
-
 
 #include <AzCore/base.h>
 
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.h b/Code/Framework/AzFramework/AzFramework/Archive/Archive.h
index b1a849b23d..15ac084e00 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ArchiveBus.h b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveBus.h
index dfe19ae6a0..414f9e5480 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp
index 9fdd2c11d7..3cee77abd8 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.h b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.h
index 2b0649bc3a..a4a685c513 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
index 595e40ac8f..3d74c9126f 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.h b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.h
index 3777eec4a9..88d7dc7d0d 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h
index 181c6e619f..171c644da9 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/Codec.h b/Code/Framework/AzFramework/AzFramework/Archive/Codec.h
index 1ec4de2914..75ba0c4f4e 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Codec.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Codec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/IArchive.h b/Code/Framework/AzFramework/AzFramework/Archive/IArchive.h
index 6c81232f52..3cee8309aa 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/IArchive.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/IArchive.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/INestedArchive.h b/Code/Framework/AzFramework/AzFramework/Archive/INestedArchive.h
index f88959bad1..77419cce0a 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/INestedArchive.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/INestedArchive.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/MissingFileReport.cpp b/Code/Framework/AzFramework/AzFramework/Archive/MissingFileReport.cpp
index db9ab4332c..a66d6ff35b 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/MissingFileReport.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/MissingFileReport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/MissingFileReport.h b/Code/Framework/AzFramework/AzFramework/Archive/MissingFileReport.h
index 49bcb61361..84241b9876 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/MissingFileReport.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/MissingFileReport.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.cpp
index 3a24c6f109..6cebe7f38a 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.h b/Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.h
index af4f10d656..551f7da5b6 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/NestedArchive.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.cpp
index 48895654bc..c9686b20c0 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.h b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.h
index 5e0762b99d..09e4db405d 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.cpp
index d166320136..c90f7d48bd 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.h b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.h
index d5a0b70fcd..ff70ab97a4 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirCacheFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirFind.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirFind.cpp
index ca71a40e79..120886781c 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirFind.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirFind.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirFind.h b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirFind.h
index 1cef4ea0b5..92f3c82b10 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirFind.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirFind.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirList.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirList.cpp
index 08da199a87..34f823d3b1 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirList.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirList.h b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirList.h
index c2177a9f39..3cfb36c690 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirList.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.cpp
index 787afbbb61..7784fddb4f 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.h b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.h
index 0327ffba7d..17d2e58322 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirTree.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirTree.cpp
index 2255c6b331..d1190849d1 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirTree.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipDirTree.h b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirTree.h
index 7b94bd5bcc..7697269a2f 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipDirTree.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipDirTree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Archive/ZipFileFormat.h b/Code/Framework/AzFramework/AzFramework/Archive/ZipFileFormat.h
index 624e3b55b4..5c19745138 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ZipFileFormat.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ZipFileFormat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.cpp
index cccd0ce56b..a9b67738ac 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.h
index ef9e325a2c..47f6867ebd 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
index d471225a58..91f0e5e2b9 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.h
index 5ea7e284a8..0473d9b7e0 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogBus.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogBus.h
index dfdf1337eb..718f7d933a 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.cpp
index ce4ffc31ca..620aafdc2f 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.h
index de187f0ae5..f960731472 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.cpp
index e1e56936cf..632087504e 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h
index 5cc144690d..0182f32ce0 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetRegistry.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetRegistry.cpp
index dba1fed6f4..2707c9e853 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetRegistry.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetRegistry.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetRegistry.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetRegistry.h
index 9ea8532520..16d76fd39f 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetRegistry.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetRegistry.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetSeedList.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetSeedList.cpp
index d330f80dd4..1694b36d7f 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSeedList.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSeedList.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetSeedList.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetSeedList.h
index c5a1784833..ee2c8caccf 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSeedList.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSeedList.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemBus.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemBus.h
index 6598876efd..1ff94d2383 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp
index 5b354bedce..fb92947443 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.h
index f1637ec3e8..83de66ab89 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
index ffd39c50c0..5c92ab08d4 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemTypes.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemTypes.h
index eb6cd5d676..168033fab7 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemTypes.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkAsset.cpp b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkAsset.cpp
index 9d4d7f3a4b..091d074f69 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkAsset.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkAsset.h b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkAsset.h
index 8a539bdbc6..64e51bd30e 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkAsset.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkCommands.cpp b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkCommands.cpp
index 5bad82e8d8..988063bab1 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkCommands.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkCommands.h b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkCommands.h
index b20acf0792..86f17b2f9b 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkCommands.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkSettingsAsset.cpp b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkSettingsAsset.cpp
index 5bf21b205a..79d4780375 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkSettingsAsset.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkSettingsAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkSettingsAsset.h b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkSettingsAsset.h
index 53e598b7f5..11130c6926 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkSettingsAsset.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/Benchmark/BenchmarkSettingsAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/CfgFileAsset.h b/Code/Framework/AzFramework/AzFramework/Asset/CfgFileAsset.h
index 5a294e5289..429e244ac8 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/CfgFileAsset.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/CfgFileAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/CustomAssetTypeComponent.cpp b/Code/Framework/AzFramework/AzFramework/Asset/CustomAssetTypeComponent.cpp
index 64de2b0817..bc892aef62 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/CustomAssetTypeComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/CustomAssetTypeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/CustomAssetTypeComponent.h b/Code/Framework/AzFramework/AzFramework/Asset/CustomAssetTypeComponent.h
index a5d660096d..402417c902 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/CustomAssetTypeComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/CustomAssetTypeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/FileTagAsset.cpp b/Code/Framework/AzFramework/AzFramework/Asset/FileTagAsset.cpp
index c2623cb180..c2a68ae33b 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/FileTagAsset.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/FileTagAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/FileTagAsset.h b/Code/Framework/AzFramework/AzFramework/Asset/FileTagAsset.h
index d083e30161..1f296edeb7 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/FileTagAsset.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/FileTagAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/GenericAssetHandler.h b/Code/Framework/AzFramework/AzFramework/Asset/GenericAssetHandler.h
index 23d61fad5a..1fd13c59a3 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/GenericAssetHandler.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/GenericAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/NetworkAssetNotification_private.h b/Code/Framework/AzFramework/AzFramework/Asset/NetworkAssetNotification_private.h
index 160a8a5f23..3b8ce4bb48 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/NetworkAssetNotification_private.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/NetworkAssetNotification_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/SimpleAsset.cpp b/Code/Framework/AzFramework/AzFramework/Asset/SimpleAsset.cpp
index f3037bd533..c36fd0fa71 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/SimpleAsset.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/SimpleAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/SimpleAsset.h b/Code/Framework/AzFramework/AzFramework/Asset/SimpleAsset.h
index 0c4b5b6d40..aecdb45297 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/SimpleAsset.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/SimpleAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/XmlSchemaAsset.cpp b/Code/Framework/AzFramework/AzFramework/Asset/XmlSchemaAsset.cpp
index bc53983dd9..1da6872f19 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/XmlSchemaAsset.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/XmlSchemaAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Asset/XmlSchemaAsset.h b/Code/Framework/AzFramework/AzFramework/Asset/XmlSchemaAsset.h
index ca56e28cfe..d7c050f107 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/XmlSchemaAsset.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/XmlSchemaAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/AzFrameworkModule.cpp b/Code/Framework/AzFramework/AzFramework/AzFrameworkModule.cpp
index 2af5edd7cd..80cb164a84 100644
--- a/Code/Framework/AzFramework/AzFramework/AzFrameworkModule.cpp
+++ b/Code/Framework/AzFramework/AzFramework/AzFrameworkModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/AzFrameworkModule.h b/Code/Framework/AzFramework/AzFramework/AzFrameworkModule.h
index d9069584f7..80bb8d90ae 100644
--- a/Code/Framework/AzFramework/AzFramework/AzFrameworkModule.h
+++ b/Code/Framework/AzFramework/AzFramework/AzFrameworkModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/CommandLine/CommandLine.h b/Code/Framework/AzFramework/AzFramework/CommandLine/CommandLine.h
index 76f4879371..0cf54959c8 100644
--- a/Code/Framework/AzFramework/AzFramework/CommandLine/CommandLine.h
+++ b/Code/Framework/AzFramework/AzFramework/CommandLine/CommandLine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/CommandLine/CommandRegistrationBus.h b/Code/Framework/AzFramework/AzFramework/CommandLine/CommandRegistrationBus.h
index 9deb10e3a7..cab90b360a 100644
--- a/Code/Framework/AzFramework/AzFramework/CommandLine/CommandRegistrationBus.h
+++ b/Code/Framework/AzFramework/AzFramework/CommandLine/CommandRegistrationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp
index 84d6b369ae..0ba430a5ea 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.h b/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.h
index a165c10c79..bb6cffd4eb 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/CameraBus.h b/Code/Framework/AzFramework/AzFramework/Components/CameraBus.h
index 21f52814fb..2aef646cd6 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/CameraBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/CameraBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.h b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.h
index 86bb80faa8..7a07be7175 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.inl b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.inl
index 0b6033bf1c..fdd102fb8f 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.inl
+++ b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapterHelpers.h b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapterHelpers.h
index c37826fcc7..e761cb32ec 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapterHelpers.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapterHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.cpp b/Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.cpp
index 191652415f..af1d27cd57 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.h b/Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.h
index 8504522f4e..4ad28226db 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/DeprecatedComponentsBus.h b/Code/Framework/AzFramework/AzFramework/Components/DeprecatedComponentsBus.h
index cd78dad2b6..1c2d05c4e1 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/DeprecatedComponentsBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/DeprecatedComponentsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/EditorEntityEvents.h b/Code/Framework/AzFramework/AzFramework/Components/EditorEntityEvents.h
index 0f8ec90434..d92cb8e22e 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/EditorEntityEvents.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/EditorEntityEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp
index ca24fe15ed..1bd381b518 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.h b/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.h
index 0c9676250a..8aabaa3873 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
index 04fcb145bf..6a71619293 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h
index 4cef0a1379..4844b15845 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Debug/DebugCameraBus.h b/Code/Framework/AzFramework/AzFramework/Debug/DebugCameraBus.h
index 248ba3a640..8fbbad4e14 100644
--- a/Code/Framework/AzFramework/AzFramework/Debug/DebugCameraBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Debug/DebugCameraBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Dependency/Dependency.h b/Code/Framework/AzFramework/AzFramework/Dependency/Dependency.h
index 3dbe695948..c548ba6d1b 100644
--- a/Code/Framework/AzFramework/AzFramework/Dependency/Dependency.h
+++ b/Code/Framework/AzFramework/AzFramework/Dependency/Dependency.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Dependency/Dependency.inl b/Code/Framework/AzFramework/AzFramework/Dependency/Dependency.inl
index 1e0fc1bc02..bdea03c34a 100644
--- a/Code/Framework/AzFramework/AzFramework/Dependency/Dependency.inl
+++ b/Code/Framework/AzFramework/AzFramework/Dependency/Dependency.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Dependency/Version.h b/Code/Framework/AzFramework/AzFramework/Dependency/Version.h
index 9b1a927586..ce9a65cc43 100644
--- a/Code/Framework/AzFramework/AzFramework/Dependency/Version.h
+++ b/Code/Framework/AzFramework/AzFramework/Dependency/Version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Driller/DrillToFileComponent.cpp b/Code/Framework/AzFramework/AzFramework/Driller/DrillToFileComponent.cpp
index 84f163bdda..e4b96cb9af 100644
--- a/Code/Framework/AzFramework/AzFramework/Driller/DrillToFileComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Driller/DrillToFileComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Driller/DrillToFileComponent.h b/Code/Framework/AzFramework/AzFramework/Driller/DrillToFileComponent.h
index 9f6d85931b..079f22cdf0 100644
--- a/Code/Framework/AzFramework/AzFramework/Driller/DrillToFileComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Driller/DrillToFileComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Driller/DrillerConsoleAPI.h b/Code/Framework/AzFramework/AzFramework/Driller/DrillerConsoleAPI.h
index 3ffb041c86..9bb73f4b59 100644
--- a/Code/Framework/AzFramework/AzFramework/Driller/DrillerConsoleAPI.h
+++ b/Code/Framework/AzFramework/AzFramework/Driller/DrillerConsoleAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Driller/RemoteDrillerInterface.cpp b/Code/Framework/AzFramework/AzFramework/Driller/RemoteDrillerInterface.cpp
index 04e1008604..0830530944 100644
--- a/Code/Framework/AzFramework/AzFramework/Driller/RemoteDrillerInterface.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Driller/RemoteDrillerInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Driller/RemoteDrillerInterface.h b/Code/Framework/AzFramework/AzFramework/Driller/RemoteDrillerInterface.h
index b655a2cbd7..b50f3e4fcd 100644
--- a/Code/Framework/AzFramework/AzFramework/Driller/RemoteDrillerInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Driller/RemoteDrillerInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.cpp b/Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.cpp
index b21dce5cc2..5314e9ed30 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.h b/Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.h
index 0861dcce20..4775a17ab2 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.cpp b/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.cpp
index e8350b3714..77535a4cf1 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.h
index ab46c4a500..1b19b8cbff 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/EntityContextBus.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityContextBus.h
index 92a76cca1f..e092fdef02 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityContextBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
index b06289d6bd..0852535fa0 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/EntityOwnershipService.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityOwnershipService.h
index 9d7a2d082a..5c5606a43d 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityOwnershipService.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityOwnershipService.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/EntityOwnershipServiceBus.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityOwnershipServiceBus.h
index d9e249a066..ccf28e70ee 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityOwnershipServiceBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityOwnershipServiceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextBus.h b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextBus.h
index ca2b9413b4..6ddeda3cbf 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -90,6 +90,15 @@ namespace AzFramework
          */
         virtual void DestroyGameEntity(const AZ::EntityId& /*id*/) = 0;
 
+        /**
+         * Destroys an entity only in slice mode (when prefabs are disabled). This request is only added as a stop-gap solution
+         * to prevent the editor from crashing when prefabs are enabled and must only be called through the BehaviorContext binding
+         * for 'DestroyGameEntity'. No code should be written to directly call this method. This will be removed soon.
+         * 
+         * @param id The ID of the entity to destroy.
+         */
+        virtual void DestroyGameEntityOnlyInSliceMode(const AZ::EntityId& /*id*/) = 0;
+
         /**
          * Destroys an entity and all of its descendants. 
          * The entity and its descendants are immediately deactivated and will be 
@@ -98,6 +107,15 @@ namespace AzFramework
          */
         virtual void DestroyGameEntityAndDescendants(const AZ::EntityId& /*id*/) = 0;
 
+        /**
+         * Destroys an entity and its descendants only in slice mode (when prefabs are disabled). This request is only added as a stop-gap
+         * solution to prevent the editor from crashing when prefabs are enabled and must only be called through the BehaviorContext
+         * binding for 'DestroyGameEntityAndDescendants'.No code should be written to directly call this method. This will be removed soon.
+         *
+         * @param id The ID of the entity to destroy.
+         */
+        virtual void DestroyGameEntityAndDescendantsOnlyInSliceMode(const AZ::EntityId& /*id*/) = 0;
+
         /**
          * Activates the game entity.
          * @param id The ID of the entity to activate.
diff --git a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.cpp b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.cpp
index e48c9a43e1..4c50722843 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -46,8 +46,9 @@ namespace AzFramework
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Event("CreateGameEntity", &GameEntityContextRequestBus::Events::CreateGameEntityForBehaviorContext)
                     ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("DestroyGameEntity", &GameEntityContextRequestBus::Events::DestroyGameEntity)
-                ->Event("DestroyGameEntityAndDescendants", &GameEntityContextRequestBus::Events::DestroyGameEntityAndDescendants)
+                ->Event("DestroyGameEntity", &GameEntityContextRequestBus::Events::DestroyGameEntityOnlyInSliceMode)
+                ->Event(
+                    "DestroyGameEntityAndDescendants", &GameEntityContextRequestBus::Events::DestroyGameEntityAndDescendantsOnlyInSliceMode)
                 ->Event("ActivateGameEntity", &GameEntityContextRequestBus::Events::ActivateGameEntity)
                 ->Event("DeactivateGameEntity", &GameEntityContextRequestBus::Events::DeactivateGameEntity)
                     ->Attribute(AZ::ScriptCanvasAttributes::DeactivatesInputEntity, true)
@@ -247,6 +248,23 @@ namespace AzFramework
         DestroyGameEntityInternal(id, false);
     }
 
+    void GameEntityContextComponent::DestroyGameEntityOnlyInSliceMode(const AZ::EntityId& id)
+    {
+        bool isPrefabSystemEnabled = false;
+        AzFramework::ApplicationRequests::Bus::BroadcastResult(
+            isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+        if (!isPrefabSystemEnabled)
+        {
+            DestroyGameEntityInternal(id, false);
+        }
+        else
+        {
+            AZ_Error(
+                "GameEntityContextComponent", false,
+                "Destroying a game entity is temporarily disabled until the Spawnable system can support this.");
+        }
+    }
+
     //=========================================================================
     // GameEntityContextComponent::DestroyGameEntityAndDescendantsById
     //=========================================================================
@@ -255,6 +273,24 @@ namespace AzFramework
         DestroyGameEntityInternal(id, true);
     }
 
+    
+    void GameEntityContextComponent::DestroyGameEntityAndDescendantsOnlyInSliceMode(const AZ::EntityId& id)
+    {
+        bool isPrefabSystemEnabled = false;
+        AzFramework::ApplicationRequests::Bus::BroadcastResult(
+            isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+        if (!isPrefabSystemEnabled)
+        {
+            DestroyGameEntityInternal(id, true);
+        }
+        else
+        {
+            AZ_Error(
+                "GameEntityContextComponent", false,
+                "Destroying a game entity and its descendants is temporarily disabled until the Spawnable system can support this.");
+        }
+    }
+
     //=========================================================================
     // GameEntityContextComponent::DestroyGameEntityInternal
     //=========================================================================
diff --git a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h
index 6e6d1c64c9..3fa4d2b35c 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -89,6 +89,12 @@ namespace AzFramework
         }
 
     private:
+        //////////////////////////////////////////////////////////////////////////
+        // GameEntityContextRequestBus
+        void DestroyGameEntityOnlyInSliceMode(const AZ::EntityId&) override;
+        void DestroyGameEntityAndDescendantsOnlyInSliceMode(const AZ::EntityId&) override;
+        /////////////////////////////////////////////////////////////////////////
+
         AzFramework::EntityVisibilityBoundsUnionSystem m_entityVisibilityBoundsUnionSystem;
     };
 } // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Entity/PrefabEntityOwnershipService.cpp b/Code/Framework/AzFramework/AzFramework/Entity/PrefabEntityOwnershipService.cpp
index 4b2271d31e..61d2b2e653 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/PrefabEntityOwnershipService.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Entity/PrefabEntityOwnershipService.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/PrefabEntityOwnershipService.h b/Code/Framework/AzFramework/AzFramework/Entity/PrefabEntityOwnershipService.h
index fa04bb0ac5..57cdacffee 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/PrefabEntityOwnershipService.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/PrefabEntityOwnershipService.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipService.cpp b/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipService.cpp
index df32daa302..ac2c6239a0 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipService.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipService.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipService.h b/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipService.h
index c1884ae80b..a696321f27 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipService.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipService.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipServiceBus.h b/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipServiceBus.h
index bc84518829..664b87f943 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipServiceBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/SliceEntityOwnershipServiceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipService.cpp b/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipService.cpp
index b4545a7c94..16f349df7d 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipService.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipService.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipService.h b/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipService.h
index 70096b9a39..d31ae3afed 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipService.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipService.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipServiceBus.h b/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipServiceBus.h
index 71716a086f..58559b07cf 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipServiceBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/SliceGameEntityOwnershipServiceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/FileFunc/FileFunc.cpp b/Code/Framework/AzFramework/AzFramework/FileFunc/FileFunc.cpp
index 99931640e8..a28a5eb3ba 100644
--- a/Code/Framework/AzFramework/AzFramework/FileFunc/FileFunc.cpp
+++ b/Code/Framework/AzFramework/AzFramework/FileFunc/FileFunc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/FileFunc/FileFunc.h b/Code/Framework/AzFramework/AzFramework/FileFunc/FileFunc.h
index 4708491cb9..63b58eee76 100644
--- a/Code/Framework/AzFramework/AzFramework/FileFunc/FileFunc.h
+++ b/Code/Framework/AzFramework/AzFramework/FileFunc/FileFunc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp b/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp
index 63c39e6fff..74816ff80e 100644
--- a/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp
+++ b/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.h b/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.h
index 3452823557..b039a8985e 100644
--- a/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.h
+++ b/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/FileTag/FileTagBus.h b/Code/Framework/AzFramework/AzFramework/FileTag/FileTagBus.h
index 5326b2e622..def44f01b6 100644
--- a/Code/Framework/AzFramework/AzFramework/FileTag/FileTagBus.h
+++ b/Code/Framework/AzFramework/AzFramework/FileTag/FileTagBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/FileTag/FileTagComponent.cpp b/Code/Framework/AzFramework/AzFramework/FileTag/FileTagComponent.cpp
index 1c70482e5a..9a4fd786ac 100644
--- a/Code/Framework/AzFramework/AzFramework/FileTag/FileTagComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/FileTag/FileTagComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/FileTag/FileTagComponent.h b/Code/Framework/AzFramework/AzFramework/FileTag/FileTagComponent.h
index 192a741fc0..44d6b8d9d7 100644
--- a/Code/Framework/AzFramework/AzFramework/FileTag/FileTagComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/FileTag/FileTagComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Font/FontInterface.h b/Code/Framework/AzFramework/AzFramework/Font/FontInterface.h
index 7c8c118398..212c2ff8d3 100644
--- a/Code/Framework/AzFramework/AzFramework/Font/FontInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Font/FontInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.cpp b/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.cpp
index 90a2b0f612..a29e073b07 100644
--- a/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.h b/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.h
index 0678ef52ee..ed30ddf4f2 100644
--- a/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.h
+++ b/Code/Framework/AzFramework/AzFramework/Gem/GemInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/IO/FileOperations.cpp b/Code/Framework/AzFramework/AzFramework/IO/FileOperations.cpp
index 2baea30991..decf9f3cfb 100644
--- a/Code/Framework/AzFramework/AzFramework/IO/FileOperations.cpp
+++ b/Code/Framework/AzFramework/AzFramework/IO/FileOperations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/IO/FileOperations.h b/Code/Framework/AzFramework/AzFramework/IO/FileOperations.h
index bcf9f7d03f..87d788fb34 100644
--- a/Code/Framework/AzFramework/AzFramework/IO/FileOperations.h
+++ b/Code/Framework/AzFramework/AzFramework/IO/FileOperations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/IO/LocalFileIO.cpp b/Code/Framework/AzFramework/AzFramework/IO/LocalFileIO.cpp
index 07408b251a..69bf6bb394 100644
--- a/Code/Framework/AzFramework/AzFramework/IO/LocalFileIO.cpp
+++ b/Code/Framework/AzFramework/AzFramework/IO/LocalFileIO.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/IO/LocalFileIO.h b/Code/Framework/AzFramework/AzFramework/IO/LocalFileIO.h
index e66de67346..e79ddb151a 100644
--- a/Code/Framework/AzFramework/AzFramework/IO/LocalFileIO.h
+++ b/Code/Framework/AzFramework/AzFramework/IO/LocalFileIO.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp b/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp
index d944404336..9a2aa841b2 100644
--- a/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp
+++ b/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.h b/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.h
index 12d1942ed7..6afde7084f 100644
--- a/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.h
+++ b/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/IO/RemoteStorageDrive.cpp b/Code/Framework/AzFramework/AzFramework/IO/RemoteStorageDrive.cpp
index 33da76e486..c20ddcfeb5 100644
--- a/Code/Framework/AzFramework/AzFramework/IO/RemoteStorageDrive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/IO/RemoteStorageDrive.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/IO/RemoteStorageDrive.h b/Code/Framework/AzFramework/AzFramework/IO/RemoteStorageDrive.h
index b616512cd3..5f80c8fe44 100644
--- a/Code/Framework/AzFramework/AzFramework/IO/RemoteStorageDrive.h
+++ b/Code/Framework/AzFramework/AzFramework/IO/RemoteStorageDrive.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/InGameUI/UiFrameworkBus.h b/Code/Framework/AzFramework/AzFramework/InGameUI/UiFrameworkBus.h
index 4c85bdbaa0..c08af5e93b 100644
--- a/Code/Framework/AzFramework/AzFramework/InGameUI/UiFrameworkBus.h
+++ b/Code/Framework/AzFramework/AzFramework/InGameUI/UiFrameworkBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputChannelNotificationBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputChannelNotificationBus.h
index ef88b25469..111d3af5e4 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputChannelNotificationBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputChannelNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputDeviceNotificationBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputDeviceNotificationBus.h
index 3ee20dc1a2..ea1e83e6f8 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputDeviceNotificationBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputDeviceNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputSystemNotificationBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputSystemNotificationBus.h
index 1d224b7969..eab74e556c 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputSystemNotificationBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputSystemNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputTextNotificationBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputTextNotificationBus.h
index 538123ea29..5a12960d5a 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputTextNotificationBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Notifications/InputTextNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputChannelRequestBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputChannelRequestBus.h
index 0788af4479..44f4661da7 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputChannelRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputChannelRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputDeviceRequestBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputDeviceRequestBus.h
index afcaae9c7e..a1ec4a05f0 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputDeviceRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputDeviceRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputHapticFeedbackRequestBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputHapticFeedbackRequestBus.h
index 3ec2b99810..86ac0b21d1 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputHapticFeedbackRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputHapticFeedbackRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputLightBarRequestBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputLightBarRequestBus.h
index 3051935680..c00d0a5b0e 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputLightBarRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputLightBarRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputMotionSensorRequestBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputMotionSensorRequestBus.h
index d325e761f0..bd0e2cdb8f 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputMotionSensorRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputMotionSensorRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h
index a565affc43..e4a9d2eb17 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputSystemRequestBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputSystemRequestBus.h
index 23a405d861..f0a6f01e58 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputSystemRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputSystemRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputTextEntryRequestBus.h b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputTextEntryRequestBus.h
index 3dd35d2131..40cc2183c1 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputTextEntryRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Buses/Requests/InputTextEntryRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannel.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannel.cpp
index a63ef6e998..c274bbf491 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannel.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannel.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannel.h
index eb7dc25675..fc5dc2a7b2 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannel.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalog.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalog.cpp
index 73905d5925..e6f383aae9 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalog.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalog.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalog.h
index 1d4000dc60..3f928d72b3 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalog.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalogWithPosition2D.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalogWithPosition2D.cpp
index 4e87b2b8b4..85f8a28b0b 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalogWithPosition2D.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalogWithPosition2D.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalogWithPosition2D.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalogWithPosition2D.h
index 3bf21171cc..29079956aa 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalogWithPosition2D.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAnalogWithPosition2D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis1D.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis1D.cpp
index 62b9ce2525..76d3eb192b 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis1D.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis1D.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis1D.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis1D.h
index 61319bf309..3760ad6f8c 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis1D.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis1D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis2D.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis2D.cpp
index 0d3c026716..d7a2a781fc 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis2D.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis2D.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis2D.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis2D.h
index 0008dd5c4f..5cbe20d5b6 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis2D.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis2D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis3D.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis3D.cpp
index d8675cfa5c..01bf5c1bd0 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis3D.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis3D.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis3D.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis3D.h
index 81a46c8327..e13c0b25d9 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis3D.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelAxis3D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDelta.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDelta.cpp
index 4c392e2749..16b2060606 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDelta.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDelta.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDelta.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDelta.h
index 45c39c5b64..418a6937d0 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDelta.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDelta.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDeltaWithSharedPosition2D.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDeltaWithSharedPosition2D.cpp
index c604414cee..cc0aa09941 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDeltaWithSharedPosition2D.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDeltaWithSharedPosition2D.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDeltaWithSharedPosition2D.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDeltaWithSharedPosition2D.h
index de596354a9..e1b2f0baf9 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDeltaWithSharedPosition2D.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDeltaWithSharedPosition2D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigital.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigital.cpp
index f6ab0e7f9f..3c9c730749 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigital.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigital.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigital.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigital.h
index 97b361efa8..7b0dc0ceb3 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigital.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigital.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithPosition2D.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithPosition2D.cpp
index 7821c3d08d..997526d2f0 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithPosition2D.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithPosition2D.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithPosition2D.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithPosition2D.h
index 7f0e930ede..5c6201bdd0 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithPosition2D.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithPosition2D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.cpp
index 99e09b2f41..811ddab1b7 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h
index c971eb1224..be802ef446 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedPosition2D.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedPosition2D.cpp
index 2b8a122e03..f28b2dabcc 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedPosition2D.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedPosition2D.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedPosition2D.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedPosition2D.h
index f9525ea28e..403b789787 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedPosition2D.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelDigitalWithSharedPosition2D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelId.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelId.cpp
index fb59cc42de..1de6ca0ff9 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelId.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelId.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelId.h
index fb4e470da4..f225d7eaaf 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelId.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelQuaternion.cpp b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelQuaternion.cpp
index fd743fb85d..78dc4ed20d 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelQuaternion.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelQuaternion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelQuaternion.h b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelQuaternion.h
index 0884691aa4..023f3cebbb 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelQuaternion.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Channels/InputChannelQuaternion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContext.cpp b/Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContext.cpp
index 1252d2ebdc..06657e7073 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContext.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContext.h b/Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContext.h
index 3c0272e698..b8f3ae6d44 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContext.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.cpp b/Code/Framework/AzFramework/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.cpp
index 6a7f0341b1..b41007216c 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.h
index 5301d1d22c..2a49078303 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDevice.cpp b/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDevice.cpp
index 1edff2bfd7..8e842e3cff 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDevice.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDevice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDevice.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDevice.h
index 7df38929cf..8c0088419b 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDevice.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDevice.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDeviceId.cpp b/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDeviceId.cpp
index 9979b1ed82..888b033520 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDeviceId.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDeviceId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDeviceId.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDeviceId.h
index 166e1ff6e1..3d2a46f415 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDeviceId.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/InputDeviceId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.cpp b/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.cpp
index 013fc4bb3d..7625679d69 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h
index bfeaa5b9f1..ea0aa1beec 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboardWindowsScanCodes.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboardWindowsScanCodes.h
index 4480c96b53..14835e5b57 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboardWindowsScanCodes.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboardWindowsScanCodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Motion/InputDeviceMotion.cpp b/Code/Framework/AzFramework/AzFramework/Input/Devices/Motion/InputDeviceMotion.cpp
index d6b092e1f9..198ebb3bea 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Motion/InputDeviceMotion.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Motion/InputDeviceMotion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Motion/InputDeviceMotion.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/Motion/InputDeviceMotion.h
index 229b2a3c6c..2e9a6de7ec 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Motion/InputDeviceMotion.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Motion/InputDeviceMotion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Mouse/InputDeviceMouse.cpp b/Code/Framework/AzFramework/AzFramework/Input/Devices/Mouse/InputDeviceMouse.cpp
index 93b450a990..a7180d7ec1 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Mouse/InputDeviceMouse.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Mouse/InputDeviceMouse.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Mouse/InputDeviceMouse.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/Mouse/InputDeviceMouse.h
index 79067640b0..7fc6a7a505 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Mouse/InputDeviceMouse.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Mouse/InputDeviceMouse.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Touch/InputDeviceTouch.cpp b/Code/Framework/AzFramework/AzFramework/Input/Devices/Touch/InputDeviceTouch.cpp
index 0e50301c6a..3594e5a7b7 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Touch/InputDeviceTouch.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Touch/InputDeviceTouch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/Touch/InputDeviceTouch.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/Touch/InputDeviceTouch.h
index 152d03df95..0621fd55e6 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/Touch/InputDeviceTouch.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/Touch/InputDeviceTouch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.cpp b/Code/Framework/AzFramework/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.cpp
index 2ebaabcc49..8f3b83cba7 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.h b/Code/Framework/AzFramework/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.h
index 98c1642869..2f3f380a92 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventFilter.cpp b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventFilter.cpp
index 7b25636bbf..1606ae6c29 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventFilter.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventFilter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventFilter.h b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventFilter.h
index 2339e92329..73e8b34d1f 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventFilter.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventFilter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.cpp b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.cpp
index 1d1fc01ffb..7c25638efc 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.h b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.h
index f87f1495e8..dac0b0ff2a 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventListener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventSink.cpp b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventSink.cpp
index ad53160093..74a952626b 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventSink.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventSink.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventSink.h b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventSink.h
index ea5fdaa3e8..cefaae0e0d 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventSink.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Events/InputChannelEventSink.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.cpp b/Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.cpp
index 7db36a10ed..3fccaeeb32 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.h b/Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.h
index 31be7b90fa..fba7f43528 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Events/InputTextEventListener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMapping.cpp b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMapping.cpp
index 2ca678ed56..f002ba0a22 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMapping.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMapping.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMapping.h b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMapping.h
index 86888e98cb..270814a5da 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMapping.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMapping.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingAnd.cpp b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingAnd.cpp
index e47ef6d5b7..5436935085 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingAnd.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingAnd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingAnd.h b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingAnd.h
index 0fe410589c..e67fc698c7 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingAnd.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingAnd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingOr.cpp b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingOr.cpp
index d21c16457c..f84e9ca6df 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingOr.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingOr.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingOr.h b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingOr.h
index 24da8f744e..627ab17ae7 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingOr.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Mappings/InputMappingOr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.cpp
index 83559a5abc..68d4ea4d02 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.h b/Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.h
index f1ad60a752..8893c83fed 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/User/LocalUserId.h b/Code/Framework/AzFramework/AzFramework/Input/User/LocalUserId.h
index 852204d22c..95052cfa85 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/User/LocalUserId.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/User/LocalUserId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Utils/AdjustAnalogInputForDeadZone.h b/Code/Framework/AzFramework/AzFramework/Input/Utils/AdjustAnalogInputForDeadZone.h
index e0ae39e2f9..f2fffc6e40 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Utils/AdjustAnalogInputForDeadZone.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Utils/AdjustAnalogInputForDeadZone.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Utils/IsAnyKeyOrButton.h b/Code/Framework/AzFramework/AzFramework/Input/Utils/IsAnyKeyOrButton.h
index 8d2c07ca08..4379927081 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Utils/IsAnyKeyOrButton.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Utils/IsAnyKeyOrButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Input/Utils/ProcessRawInputEventQueues.h b/Code/Framework/AzFramework/AzFramework/Input/Utils/ProcessRawInputEventQueues.h
index aa9d6d33c9..53426aedb5 100644
--- a/Code/Framework/AzFramework/AzFramework/Input/Utils/ProcessRawInputEventQueues.h
+++ b/Code/Framework/AzFramework/AzFramework/Input/Utils/ProcessRawInputEventQueues.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/LogFile.cpp b/Code/Framework/AzFramework/AzFramework/Logging/LogFile.cpp
index b9f3f97bc1..efb3920c38 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/LogFile.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Logging/LogFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/LogFile.h b/Code/Framework/AzFramework/AzFramework/Logging/LogFile.h
index 7696d40fa6..fa2ea58b59 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/LogFile.h
+++ b/Code/Framework/AzFramework/AzFramework/Logging/LogFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.cpp b/Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.cpp
index 70319bb3dd..1cd685a7d2 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.h b/Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.h
index c032e11299..9bcece00a8 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetLogger.cpp b/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetLogger.cpp
index 557ca92a49..5a21940d42 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetLogger.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetLogger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetLogger.h b/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetLogger.h
index 21105b937f..6e5eba8e5f 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetLogger.h
+++ b/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetLogger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetNotificationBus.h b/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetNotificationBus.h
index a3d76e2760..94cfc5e3da 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetNotificationBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Logging/MissingAssetNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/StartupLogSinkReporter.cpp b/Code/Framework/AzFramework/AzFramework/Logging/StartupLogSinkReporter.cpp
index 502be722f3..e49aa39d1b 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/StartupLogSinkReporter.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Logging/StartupLogSinkReporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Logging/StartupLogSinkReporter.h b/Code/Framework/AzFramework/AzFramework/Logging/StartupLogSinkReporter.h
index 201bd8f37d..3674f0e27c 100644
--- a/Code/Framework/AzFramework/AzFramework/Logging/StartupLogSinkReporter.h
+++ b/Code/Framework/AzFramework/AzFramework/Logging/StartupLogSinkReporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Math/InterpolationSample.h b/Code/Framework/AzFramework/AzFramework/Math/InterpolationSample.h
index 25706d1399..e5f7b5b874 100644
--- a/Code/Framework/AzFramework/AzFramework/Math/InterpolationSample.h
+++ b/Code/Framework/AzFramework/AzFramework/Math/InterpolationSample.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Metrics/MetricsPlainTextNameRegistration.h b/Code/Framework/AzFramework/AzFramework/Metrics/MetricsPlainTextNameRegistration.h
index bca01f2b54..84eafebbe8 100644
--- a/Code/Framework/AzFramework/AzFramework/Metrics/MetricsPlainTextNameRegistration.h
+++ b/Code/Framework/AzFramework/AzFramework/Metrics/MetricsPlainTextNameRegistration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Network/AssetProcessorConnection.cpp b/Code/Framework/AzFramework/AzFramework/Network/AssetProcessorConnection.cpp
index 13f11ca9a1..f84c654e40 100644
--- a/Code/Framework/AzFramework/AzFramework/Network/AssetProcessorConnection.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Network/AssetProcessorConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Network/AssetProcessorConnection.h b/Code/Framework/AzFramework/AzFramework/Network/AssetProcessorConnection.h
index 70069710b0..b370cca4ce 100644
--- a/Code/Framework/AzFramework/AzFramework/Network/AssetProcessorConnection.h
+++ b/Code/Framework/AzFramework/AzFramework/Network/AssetProcessorConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Network/SocketConnection.cpp b/Code/Framework/AzFramework/AzFramework/Network/SocketConnection.cpp
index c180919d9f..47ec06cc14 100644
--- a/Code/Framework/AzFramework/AzFramework/Network/SocketConnection.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Network/SocketConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Network/SocketConnection.h b/Code/Framework/AzFramework/AzFramework/Network/SocketConnection.h
index f0087225a6..bbd9c3e4e2 100644
--- a/Code/Framework/AzFramework/AzFramework/Network/SocketConnection.h
+++ b/Code/Framework/AzFramework/AzFramework/Network/SocketConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/AnimationConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/AnimationConfiguration.cpp
index 6919907d83..970a272eea 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/AnimationConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/AnimationConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/AnimationConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/AnimationConfiguration.h
index 6bf6d961f6..d2c57b3666 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/AnimationConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/AnimationConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Character.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Character.cpp
index 6b85505d4f..59f492359d 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Character.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Character.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Character.h b/Code/Framework/AzFramework/AzFramework/Physics/Character.h
index 543717dd8f..ac46120879 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Character.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Character.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/CharacterBus.h b/Code/Framework/AzFramework/AzFramework/Physics/CharacterBus.h
index 16d3a840af..54cfbe3d7c 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/CharacterBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/CharacterBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/CharacterPhysicsDataBus.h b/Code/Framework/AzFramework/AzFramework/Physics/CharacterPhysicsDataBus.h
index 9de7f9ae14..0336df246a 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/CharacterPhysicsDataBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/CharacterPhysicsDataBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/ClassConverters.cpp b/Code/Framework/AzFramework/AzFramework/Physics/ClassConverters.cpp
index 62ea06ef9c..f80e9724ce 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/ClassConverters.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/ClassConverters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/ClassConverters.h b/Code/Framework/AzFramework/AzFramework/Physics/ClassConverters.h
index 6e69c0ec05..7320644373 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/ClassConverters.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/ClassConverters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/ColliderComponentBus.h b/Code/Framework/AzFramework/AzFramework/Physics/ColliderComponentBus.h
index 15ac58649b..58c220082a 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/ColliderComponentBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/ColliderComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.cpp
index d5d0b63fab..040988f410 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.h b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.h
index 52c0ace008..3dff9e00ff 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.cpp
index 36bd7178c1..a8c8c4470f 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -34,6 +34,28 @@ namespace AzPhysics
     const CollisionGroup CollisionGroup::All_NoTouchBend = CollisionGroup::All.GetMask() & ~CollisionLayer::TouchBend.GetMask();
 #endif
 
+    void CollisionGroupScriptConstructor(CollisionGroup* thisPtr, AZ::ScriptDataContext& scriptDataContext)
+    {
+        if (int numArgs = scriptDataContext.GetNumArguments();
+            numArgs != 1)
+        {
+            scriptDataContext.GetScriptContext()->Error(AZ::ScriptContext::ErrorType::Error, true,
+                "CollisionGroup() accepts only 1 argument, not %d", numArgs);
+            return;
+        }
+
+        if (!scriptDataContext.IsString(0))
+        {
+            scriptDataContext.GetScriptContext()->Error(AZ::ScriptContext::ErrorType::Error, true,
+                "Argument to CollisionGroup() should be string");
+            return;
+        }
+
+        AZStd::string groupName;
+        scriptDataContext.ReadArg(0, groupName);
+        *thisPtr = CollisionGroup(groupName);
+    }
+
     void CollisionGroup::Reflect(AZ::ReflectContext* context)
     {
         if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
@@ -50,7 +72,9 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "AzPhysics")
-                ->Constructor<const AZStd::string>()
+                ->Constructor<const AZStd::string&>()
+                ->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::Value)
+                ->Attribute(AZ::Script::Attributes::ConstructorOverride, &CollisionGroupScriptConstructor)
                 ;
         }
     }
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.h b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.h
index 224a6cf93c..78a467e571 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.cpp
index f2ad065cad..93d0501076 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.h b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.h
index 73fa2eda41..fcbf424f6e 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.cpp b/Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.cpp
index 1605d96742..773822bab4 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.h b/Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.h
index cf31a65c71..06ec1d3e6d 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsEvents.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsEvents.h
index 492d57e736..b69888a952 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsEvents.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp
index 92cd89a801..3ccf093e4f 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -88,6 +88,19 @@ namespace AzPhysics
                     ;
             }
         }
+
+        if (auto* behaviorContext = azdynamic_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->Class<SceneQueryRequest>("SceneQueryRequest")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Module, "physics")
+                ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Property("Collision", BehaviorValueProperty(&SceneQueryRequest::m_collisionGroup))
+                // Until enum class support for behavior context is done, expose this as an int
+                ->Property("QueryType", [](const SceneQueryRequest& self) { return static_cast<int>(self.m_queryType); },
+                    [](SceneQueryRequest& self, int newQueryType) { self.m_queryType = SceneQuery::QueryType(newQueryType); })
+                ;
+        }
     }
 
     /*static*/ void RayCastRequest::Reflect(AZ::ReflectContext* context)
@@ -123,10 +136,6 @@ namespace AzPhysics
                 ->Property("Distance", BehaviorValueProperty(&RayCastRequest::m_distance))
                 ->Property("Start", BehaviorValueProperty(&RayCastRequest::m_start))
                 ->Property("Direction", BehaviorValueProperty(&RayCastRequest::m_direction))
-                ->Property("Collision", BehaviorValueProperty(&RayCastRequest::m_collisionGroup))
-                // Until enum class support for behavior context is done, expose this as an int
-                ->Property("QueryType", [](const RayCastRequest& self) { return static_cast<int>(self.m_queryType); },
-                    [](RayCastRequest& self, int newQueryType) { self.m_queryType = SceneQuery::QueryType(newQueryType); })
                 ;
         }
     }
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.h
index a953049d9e..af1f5947a4 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.cpp
index edb17c15c7..9faef9ae06 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h
index 641d78062d..b2822f57de 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyAutomation.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyAutomation.cpp
index de8d04d4d6..9a8adf04d8 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyAutomation.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyAutomation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyAutomation.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyAutomation.h
index 9f1008cbd0..964cf30dda 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyAutomation.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyAutomation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyEvents.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyEvents.cpp
index 0bd8649276..7c3fa42219 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyEvents.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyEvents.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyEvents.h
index 4caa7e3d20..334478ad86 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyEvents.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBodyEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsTypes.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsTypes.h
index 2397595dce..bede489939 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsTypes.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Components/SimulatedBodyComponentBus.h b/Code/Framework/AzFramework/AzFramework/Physics/Components/SimulatedBodyComponentBus.h
index abd65e35bf..9c1926040f 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Components/SimulatedBodyComponentBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Components/SimulatedBodyComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.cpp
index 56d38b3407..460f74ffc4 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.h
index 6c08c55d28..603832ebcb 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/RigidBodyConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/RigidBodyConfiguration.cpp
index 5ae00e099e..e5ef00f900 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/RigidBodyConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/RigidBodyConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/RigidBodyConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/RigidBodyConfiguration.h
index a249fadca8..df0f43c0b7 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/RigidBodyConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/RigidBodyConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.cpp
index aef5cbe205..45fb3f5ddd 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.h
index a9f520931f..88bb64df70 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp
index 93d175fca4..021d255b6b 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h
index 03d2687c6e..8e448cc2d4 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.cpp
index f5907271a7..e2aadbea8d 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.h
index 7908659180..a04c6c6106 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SystemConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SystemConfiguration.cpp
index ced2137752..6cf7432929 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SystemConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SystemConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SystemConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SystemConfiguration.h
index 24e4160e1c..3fa90ad3ed 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SystemConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SystemConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp
index 8f3219a372..cdcdbe4655 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Material.h b/Code/Framework/AzFramework/AzFramework/Physics/Material.h
index cdcdbcc332..bd15dd338e 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Material.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Material.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h b/Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h
index cd31b92825..1784bee93e 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/NameConstants.cpp b/Code/Framework/AzFramework/AzFramework/Physics/NameConstants.cpp
index a688bac4d2..db70817d1b 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/NameConstants.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/NameConstants.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/NameConstants.h b/Code/Framework/AzFramework/AzFramework/Physics/NameConstants.h
index 3bd20c8462..2e80c6a2c1 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/NameConstants.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/NameConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/PhysicsScene.cpp b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsScene.cpp
index 3780ff7f59..7840d10a6c 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/PhysicsScene.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsScene.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/PhysicsScene.h b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsScene.h
index 038897eb9e..329ae5a389 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/PhysicsScene.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsScene.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp
index 2c13a7d071..4d41ab13b4 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.h b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.h
index c3d3f91434..d35e784656 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/PropertyTypes.h b/Code/Framework/AzFramework/AzFramework/Physics/PropertyTypes.h
index de9f0b3bc0..ebdcd06919 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/PropertyTypes.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/PropertyTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp
index 37d8ab07b9..24a477a180 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h
index 0d4993cadd..840c8066c1 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/RagdollPhysicsBus.h b/Code/Framework/AzFramework/AzFramework/Physics/RagdollPhysicsBus.h
index 04f393e2ad..3c6ce75739 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/RagdollPhysicsBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/RagdollPhysicsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/RigidBody.h b/Code/Framework/AzFramework/AzFramework/Physics/RigidBody.h
index bf7b4acaa1..5d829cc27c 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/RigidBody.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/RigidBody.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/RigidBodyBus.h b/Code/Framework/AzFramework/AzFramework/Physics/RigidBodyBus.h
index 807240f7de..408f1a4978 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/RigidBodyBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/RigidBodyBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Shape.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Shape.cpp
index 48d96aae0f..03351053aa 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Shape.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Shape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Shape.h b/Code/Framework/AzFramework/AzFramework/Physics/Shape.h
index abd6988de1..8cf8837b57 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Shape.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Shape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp
index fc29b64c8c..a122b48d91 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h
index ccc230f2ed..032ca8f826 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/RigidBody.cpp b/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/RigidBody.cpp
index eac976d0c5..ea014b9b5f 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/RigidBody.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/RigidBody.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/RigidBody.h b/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/RigidBody.h
index 871e48d737..cc90d79584 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/RigidBody.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/RigidBody.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.cpp b/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.cpp
index 5b522efe04..fd54ee01bd 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.h b/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.h
index f1a7f20ee5..121ae11987 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/SystemBus.h b/Code/Framework/AzFramework/AzFramework/Physics/SystemBus.h
index 90a0c84c2a..1b65c303e6 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/SystemBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/SystemBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/Utils.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Utils.cpp
index d4cef3521e..72c82ddada 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Utils.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -74,21 +74,22 @@ namespace Physics
         {
             if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
             {
-                behaviorContext->EBus<Physics::CharacterRequestBus>("CharacterControllerRequestBus", "Character Controller")
-                    ->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::RuntimeOwn)
+                behaviorContext->EBus<CharacterRequestBus>("CharacterControllerRequestBus")
+                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                    ->Attribute(AZ::Script::Attributes::Module, "physics")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Event("GetBasePosition", &Physics::CharacterRequests::GetBasePosition, "Get Base Position")
-                    ->Event("SetBasePosition", &Physics::CharacterRequests::SetBasePosition, "Set Base Position")
-                    ->Event("GetCenterPosition", &Physics::CharacterRequests::GetCenterPosition, "Get Center Position")
-                    ->Event("GetStepHeight", &Physics::CharacterRequests::GetStepHeight, "Get Step Height")
-                    ->Event("SetStepHeight", &Physics::CharacterRequests::SetStepHeight, "Set Step Height")
-                    ->Event("GetUpDirection", &Physics::CharacterRequests::GetUpDirection, "Get Up Direction")
-                    ->Event("GetSlopeLimitDegrees", &Physics::CharacterRequests::GetSlopeLimitDegrees, "Get Slope Limit (Degrees)")
-                    ->Event("SetSlopeLimitDegrees", &Physics::CharacterRequests::SetSlopeLimitDegrees, "Set Slope Limit (Degrees)")
-                    ->Event("GetMaximumSpeed", &Physics::CharacterRequests::GetMaximumSpeed, "Get Maximum Speed")
-                    ->Event("SetMaximumSpeed", &Physics::CharacterRequests::SetMaximumSpeed, "Set Maximum Speed")
-                    ->Event("GetVelocity", &Physics::CharacterRequests::GetVelocity, "Get Velocity")
-                    ->Event("AddVelocity", &Physics::CharacterRequests::AddVelocity, "Add Velocity")
+                    ->Event("GetBasePosition", &CharacterRequests::GetBasePosition, "Get Base Position")
+                    ->Event("SetBasePosition", &CharacterRequests::SetBasePosition, "Set Base Position")
+                    ->Event("GetCenterPosition", &CharacterRequests::GetCenterPosition, "Get Center Position")
+                    ->Event("GetStepHeight", &CharacterRequests::GetStepHeight, "Get Step Height")
+                    ->Event("SetStepHeight", &CharacterRequests::SetStepHeight, "Set Step Height")
+                    ->Event("GetUpDirection", &CharacterRequests::GetUpDirection, "Get Up Direction")
+                    ->Event("GetSlopeLimitDegrees", &CharacterRequests::GetSlopeLimitDegrees, "Get Slope Limit (Degrees)")
+                    ->Event("SetSlopeLimitDegrees", &CharacterRequests::SetSlopeLimitDegrees, "Set Slope Limit (Degrees)")
+                    ->Event("GetMaximumSpeed", &CharacterRequests::GetMaximumSpeed, "Get Maximum Speed")
+                    ->Event("SetMaximumSpeed", &CharacterRequests::SetMaximumSpeed, "Set Maximum Speed")
+                    ->Event("GetVelocity", &CharacterRequests::GetVelocity, "Get Velocity")
+                    ->Event("AddVelocity", &CharacterRequests::AddVelocity, "Add Velocity")
                     ;
             }
         }
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Utils.h b/Code/Framework/AzFramework/AzFramework/Physics/Utils.h
index 119a1e4dd2..b479d6df44 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Utils.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Physics/WindBus.h b/Code/Framework/AzFramework/AzFramework/Physics/WindBus.h
index 91577dc5a7..58d1ab544d 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/WindBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/WindBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Platform/PlatformDefaults.h b/Code/Framework/AzFramework/AzFramework/Platform/PlatformDefaults.h
index cbb179af9a..e6ebee9049 100644
--- a/Code/Framework/AzFramework/AzFramework/Platform/PlatformDefaults.h
+++ b/Code/Framework/AzFramework/AzFramework/Platform/PlatformDefaults.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Process/ProcessCommon_fwd.h b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommon_fwd.h
index cb51330a77..be6c34e798 100644
--- a/Code/Framework/AzFramework/AzFramework/Process/ProcessCommon_fwd.h
+++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommon_fwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicator.cpp b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicator.cpp
index 3020d048ad..e8cd8d167f 100644
--- a/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicator.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicator.h b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicator.h
index 6d0e0682f3..07df0b4d1d 100644
--- a/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicator.h
+++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Process/ProcessWatcher.cpp b/Code/Framework/AzFramework/AzFramework/Process/ProcessWatcher.cpp
index e1621c1381..c76231fa4b 100644
--- a/Code/Framework/AzFramework/AzFramework/Process/ProcessWatcher.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessWatcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Process/ProcessWatcher.h b/Code/Framework/AzFramework/AzFramework/Process/ProcessWatcher.h
index 909d173d9a..52de420e14 100644
--- a/Code/Framework/AzFramework/AzFramework/Process/ProcessWatcher.h
+++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessWatcher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp b/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
index e1167368ec..206ab1edb3 100644
--- a/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
+++ b/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.h b/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.h
index a2a45de98b..b5814481a8 100644
--- a/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.h
+++ b/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Render/GameIntersectorComponent.cpp b/Code/Framework/AzFramework/AzFramework/Render/GameIntersectorComponent.cpp
index b219e714d3..9327c1deff 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/GameIntersectorComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Render/GameIntersectorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Render/GameIntersectorComponent.h b/Code/Framework/AzFramework/AzFramework/Render/GameIntersectorComponent.h
index d43101f8d7..f8e57c7a78 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/GameIntersectorComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Render/GameIntersectorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Render/GeometryIntersectionBus.h b/Code/Framework/AzFramework/AzFramework/Render/GeometryIntersectionBus.h
index 253fa5715d..dd9c807dad 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/GeometryIntersectionBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Render/GeometryIntersectionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Render/GeometryIntersectionStructures.h b/Code/Framework/AzFramework/AzFramework/Render/GeometryIntersectionStructures.h
index 9b35eb4794..532b29fd47 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/GeometryIntersectionStructures.h
+++ b/Code/Framework/AzFramework/AzFramework/Render/GeometryIntersectionStructures.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Render/Intersector.cpp b/Code/Framework/AzFramework/AzFramework/Render/Intersector.cpp
index ffd6fd0bc1..eb24b0937a 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/Intersector.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Render/Intersector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Render/Intersector.h b/Code/Framework/AzFramework/AzFramework/Render/Intersector.h
index c079dbec1b..abffd8da8a 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/Intersector.h
+++ b/Code/Framework/AzFramework/AzFramework/Render/Intersector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Render/IntersectorInterface.h b/Code/Framework/AzFramework/AzFramework/Render/IntersectorInterface.h
index ab8cbe2abd..06148e5d6c 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/IntersectorInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Render/IntersectorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Render/RenderSystemBus.h b/Code/Framework/AzFramework/AzFramework/Render/RenderSystemBus.h
index 79e6fb4d4f..b6c17c1698 100644
--- a/Code/Framework/AzFramework/AzFramework/Render/RenderSystemBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Render/RenderSystemBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Scene/Scene.cpp b/Code/Framework/AzFramework/AzFramework/Scene/Scene.cpp
index f45eefe9ca..ebc032896e 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/Scene.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Scene/Scene.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Scene/Scene.h b/Code/Framework/AzFramework/AzFramework/Scene/Scene.h
index 8d5e2fae1e..65d9e3def0 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/Scene.h
+++ b/Code/Framework/AzFramework/AzFramework/Scene/Scene.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Scene/Scene.inl b/Code/Framework/AzFramework/AzFramework/Scene/Scene.inl
index 76aa9ac30a..e1fec8fef7 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/Scene.inl
+++ b/Code/Framework/AzFramework/AzFramework/Scene/Scene.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp
index 975b4c7940..4c18e8454e 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.h b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.h
index 93454e5bba..08dfc3b176 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemInterface.h b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemInterface.h
index 66adf07221..4f69de67c0 100644
--- a/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Scene/SceneSystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.cpp b/Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.cpp
index 419736b368..bf6ae9f659 100644
--- a/Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.h b/Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.h
index 75b4a01266..ac25e77363 100644
--- a/Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugAgentBus.h b/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugAgentBus.h
index f1299b1d83..94ce590a5c 100644
--- a/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugAgentBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugAgentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.cpp b/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.cpp
index cbbd34cec0..da2ac10316 100644
--- a/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.h b/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.h
index e29c541d7d..586390917a 100644
--- a/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.h
+++ b/Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.cpp b/Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.cpp
index 63535fb9e1..dec20979fe 100644
--- a/Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.h b/Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.h
index 79a892801d..d2e3e6f268 100644
--- a/Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.h
+++ b/Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Session/ISessionHandlingRequests.h b/Code/Framework/AzFramework/AzFramework/Session/ISessionHandlingRequests.h
index 2fc993f9d8..c7d32739f2 100644
--- a/Code/Framework/AzFramework/AzFramework/Session/ISessionHandlingRequests.h
+++ b/Code/Framework/AzFramework/AzFramework/Session/ISessionHandlingRequests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Session/ISessionRequests.cpp b/Code/Framework/AzFramework/AzFramework/Session/ISessionRequests.cpp
index 84937df424..c19aab33c6 100644
--- a/Code/Framework/AzFramework/AzFramework/Session/ISessionRequests.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Session/ISessionRequests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Session/ISessionRequests.h b/Code/Framework/AzFramework/AzFramework/Session/ISessionRequests.h
index e96e8c9a96..ae2896c337 100644
--- a/Code/Framework/AzFramework/AzFramework/Session/ISessionRequests.h
+++ b/Code/Framework/AzFramework/AzFramework/Session/ISessionRequests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Session/SessionConfig.cpp b/Code/Framework/AzFramework/AzFramework/Session/SessionConfig.cpp
index df7bb94815..bd36013438 100644
--- a/Code/Framework/AzFramework/AzFramework/Session/SessionConfig.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Session/SessionConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Session/SessionConfig.h b/Code/Framework/AzFramework/AzFramework/Session/SessionConfig.h
index 297136ba89..17f61317e6 100644
--- a/Code/Framework/AzFramework/AzFramework/Session/SessionConfig.h
+++ b/Code/Framework/AzFramework/AzFramework/Session/SessionConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Session/SessionNotifications.h b/Code/Framework/AzFramework/AzFramework/Session/SessionNotifications.h
index 89fc422d33..f0f7e68cd4 100644
--- a/Code/Framework/AzFramework/AzFramework/Session/SessionNotifications.h
+++ b/Code/Framework/AzFramework/AzFramework/Session/SessionNotifications.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Slice/SliceEntityBus.h b/Code/Framework/AzFramework/AzFramework/Slice/SliceEntityBus.h
index bf42e08fae..80971cce26 100644
--- a/Code/Framework/AzFramework/AzFramework/Slice/SliceEntityBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Slice/SliceEntityBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationBus.h b/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationBus.h
index 326716a750..6c224713de 100644
--- a/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.cpp b/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.cpp
index ed6bf110b4..6a94796d3a 100644
--- a/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.h b/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.h
index 6191df18c6..e84ed103b1 100644
--- a/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.h
+++ b/Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/RootSpawnableInterface.h b/Code/Framework/AzFramework/AzFramework/Spawnable/RootSpawnableInterface.h
index 3ddd9c7841..618e182fbb 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/RootSpawnableInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/RootSpawnableInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.cpp
index 1c81cb578a..dfbc9e23cf 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
index 1b41a43ea8..1c95a72d6c 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
index 453295f9a1..a7d8d0f7af 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.h
index 1725416687..1fabb3a08a 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesContainer.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesContainer.cpp
index 603b544a37..a25fbe500b 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesContainer.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesContainer.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesContainer.h
index bd184c35d4..c598175382 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesContainer.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
index 3f82ad4415..cd2c6b75c1 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h
index 19ee6aac3f..7b5c63e903 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
index 3ca9d2e0e9..a0f5ba1012 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.h
index acfe92a394..b62c28d9a3 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMetaData.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMetaData.cpp
index ce52e0e5a3..8ee62cd5e9 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMetaData.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMetaData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMetaData.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMetaData.h
index 6466e89467..5a83f69bc2 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMetaData.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMetaData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.cpp
index dcf73c08d6..86c7155657 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.h
index 4777bc7305..7f1756517a 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableSystemComponent.cpp
index fdb43df870..2cea83ed84 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableSystemComponent.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableSystemComponent.h
index 829c3d4aaf..af47586a79 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableSystemComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstall.cpp b/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstall.cpp
index 008ec1dd9a..52547fe690 100644
--- a/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstall.cpp
+++ b/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstall.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstall.h b/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstall.h
index a98700ea29..ef3b8d76ce 100644
--- a/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstall.h
+++ b/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstall.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstallNotifications.h b/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstallNotifications.h
index 113139bcdb..c741f58f60 100644
--- a/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstallNotifications.h
+++ b/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstallNotifications.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstallRequests.h b/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstallRequests.h
index 5492c1d812..d0b4787108 100644
--- a/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstallRequests.h
+++ b/Code/Framework/AzFramework/AzFramework/StreamingInstall/StreamingInstallRequests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/StringFunc/StringFunc.h b/Code/Framework/AzFramework/AzFramework/StringFunc/StringFunc.h
index 0124514304..2762933835 100644
--- a/Code/Framework/AzFramework/AzFramework/StringFunc/StringFunc.h
+++ b/Code/Framework/AzFramework/AzFramework/StringFunc/StringFunc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/TargetManagement/NeighborhoodAPI.cpp b/Code/Framework/AzFramework/AzFramework/TargetManagement/NeighborhoodAPI.cpp
index d0df4c6426..3a8512cb84 100644
--- a/Code/Framework/AzFramework/AzFramework/TargetManagement/NeighborhoodAPI.cpp
+++ b/Code/Framework/AzFramework/AzFramework/TargetManagement/NeighborhoodAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/TargetManagement/NeighborhoodAPI.h b/Code/Framework/AzFramework/AzFramework/TargetManagement/NeighborhoodAPI.h
index c201dd2564..d01d094e80 100644
--- a/Code/Framework/AzFramework/AzFramework/TargetManagement/NeighborhoodAPI.h
+++ b/Code/Framework/AzFramework/AzFramework/TargetManagement/NeighborhoodAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementAPI.h b/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementAPI.h
index 73c7efdcd0..64e0c7fb06 100644
--- a/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementAPI.h
+++ b/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementComponent.cpp b/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementComponent.cpp
index 76b39b1c4f..d5d7febda4 100644
--- a/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementComponent.h b/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementComponent.h
index 0232090a09..ee7b62eca9 100644
--- a/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/TargetManagement/TargetManagementComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp
index 504b4077da..ca258d89b1 100644
--- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
index 31b3f9d4d1..74148b1e11 100644
--- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Thermal/ThermalInfo.h b/Code/Framework/AzFramework/AzFramework/Thermal/ThermalInfo.h
index 7487fb632e..60154aa790 100644
--- a/Code/Framework/AzFramework/AzFramework/Thermal/ThermalInfo.h
+++ b/Code/Framework/AzFramework/AzFramework/Thermal/ThermalInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/UnitTest/FrameworkTestTypes.h b/Code/Framework/AzFramework/AzFramework/UnitTest/FrameworkTestTypes.h
index 0fcce7aad5..046f60ae8e 100644
--- a/Code/Framework/AzFramework/AzFramework/UnitTest/FrameworkTestTypes.h
+++ b/Code/Framework/AzFramework/AzFramework/UnitTest/FrameworkTestTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.cpp b/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.cpp
index e9aa006e5b..d471d6070f 100644
--- a/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.cpp
+++ b/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.h b/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.h
index faf2fee15d..0059d3cf9e 100644
--- a/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.h
+++ b/Code/Framework/AzFramework/AzFramework/UnitTest/TestDebugDisplayRequests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
index f444ca9b3d..df807f63e8 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h
index 15ec50d2be..da9a73f313 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp
index f017e1397e..10e496a80d 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h
index bc8927c587..e0c4660f85 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
index bffc590a3e..c25d1d2f25 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
index a6b2acb9ab..737c28bbe5 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/CursorState.h b/Code/Framework/AzFramework/AzFramework/Viewport/CursorState.h
index 3a3c87b84b..dc0fcca036 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CursorState.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CursorState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/DisplayContextRequestBus.h b/Code/Framework/AzFramework/AzFramework/Viewport/DisplayContextRequestBus.h
index 7cb93656a2..fbcf4dbe07 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/DisplayContextRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/DisplayContextRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/MultiViewportController.h b/Code/Framework/AzFramework/AzFramework/Viewport/MultiViewportController.h
index 686ee76363..fba7c7c1ef 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/MultiViewportController.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/MultiViewportController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/MultiViewportController.inl b/Code/Framework/AzFramework/AzFramework/Viewport/MultiViewportController.inl
index 5fca572796..009b14fa3e 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/MultiViewportController.inl
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/MultiViewportController.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp
index 5f3ace940c..a98686cc4e 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h
index 6aeba7b53e..bb5d605628 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/SingleViewportController.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/SingleViewportController.cpp
index 1e8b3e62d9..da76660816 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/SingleViewportController.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/SingleViewportController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/SingleViewportController.h b/Code/Framework/AzFramework/AzFramework/Viewport/SingleViewportController.h
index 798ec708f7..3ad3d6c3bc 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/SingleViewportController.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/SingleViewportController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.cpp
index d85b2d4649..96ee702aff 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h
index b3d7aff8d2..ba2d0a0bac 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportColors.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportColors.cpp
index 32c10f6fa4..efd1f962bd 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportColors.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportColors.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportColors.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportColors.h
index a5bc0aac0f..6108ba78a4 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportColors.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportColors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportConstants.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportConstants.cpp
index 47774c57f2..baef3f234d 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportConstants.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportConstants.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportConstants.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportConstants.h
index 3ab197dd39..ff051ff4ff 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportConstants.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerInterface.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerInterface.h
index 977a2469f0..a5a45629bc 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.cpp
index 677f0897f4..d6819dbde3 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.h
index 7e4ff6b6b2..bdbe3e5505 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportControllerList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportId.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportId.h
index cb9a493201..f480b6e7d4 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportId.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp
index ed222f2c5e..7bce9d148f 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h
index f3697a57a8..47bebe8ea1 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.cpp b/Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.cpp
index d09678054d..ad84ad73d8 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.h b/Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.h
index bca07c4fdf..7c533b6196 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/EntityBoundsUnionBus.h b/Code/Framework/AzFramework/AzFramework/Visibility/EntityBoundsUnionBus.h
index 6406bfd7a6..93c0a32c98 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/EntityBoundsUnionBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/EntityBoundsUnionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.cpp b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.cpp
index 92b7bc566c..4f0c2ea70e 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.h b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.h
index 2db0334611..8ef2529fdd 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.h
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityBoundsUnionSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityQuery.cpp b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityQuery.cpp
index 41b7835230..2427a84e85 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityQuery.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityQuery.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityQuery.h b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityQuery.h
index a55d4ad0a5..1b7d3c5076 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityQuery.h
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/EntityVisibilityQuery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/IVisibilitySystem.h b/Code/Framework/AzFramework/AzFramework/Visibility/IVisibilitySystem.h
index 14232c9bd1..ed70f91486 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/IVisibilitySystem.h
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/IVisibilitySystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.cpp
index 832f1ff4d7..d09f647820 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.h b/Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.h
index 85e5d08f80..d0d04b261e 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/VisibilityDebug.cpp b/Code/Framework/AzFramework/AzFramework/Visibility/VisibilityDebug.cpp
index a8a3259b90..1a4b09d060 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/VisibilityDebug.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/VisibilityDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Visibility/VisibilityDebug.h b/Code/Framework/AzFramework/AzFramework/Visibility/VisibilityDebug.h
index 6e9380028b..0de6e12f7d 100644
--- a/Code/Framework/AzFramework/AzFramework/Visibility/VisibilityDebug.h
+++ b/Code/Framework/AzFramework/AzFramework/Visibility/VisibilityDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp
index dbb60ce3ce..b92d8dc3bc 100644
--- a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h
index 1c9fed6448..0b53b5b31c 100644
--- a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h
+++ b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h b/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h
index 3b66587d9d..959d7cc07b 100644
--- a/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/AzFramework/azframework_files.cmake b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
index 7ca0c83a91..d683d0ae40 100644
--- a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
+++ b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/CMakeLists.txt b/Code/Framework/AzFramework/CMakeLists.txt
index aea7b4733c..1f53472ff8 100644
--- a/Code/Framework/AzFramework/CMakeLists.txt
+++ b/Code/Framework/AzFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/Android/AzFramework/API/ApplicationAPI_Android.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/API/ApplicationAPI_Android.h
index 2924b1b31d..1352215bd6 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/API/ApplicationAPI_Android.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/API/ApplicationAPI_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/API/ApplicationAPI_Platform.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/API/ApplicationAPI_Platform.h
index 3e501a6604..ccb87926de 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/API/ApplicationAPI_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/API/ApplicationAPI_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Application/Application_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Application/Application_Android.cpp
index a0d95c2292..8855d86a0e 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Application/Application_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Application/Application_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h
index 4e7af2a913..1bb2789178 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h
index 988b3c3d7c..2feb1ffb7c 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Android.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Android.h
index ae9754df1b..19aaa4f5c8 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Android.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Platform.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Platform.h
index 081a18f834..eab85b808c 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/IO/LocalFileIO_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/IO/LocalFileIO_Android.cpp
index e7f4a076ae..080b33fc8e 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/IO/LocalFileIO_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/IO/LocalFileIO_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Android.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Android.h
index 65ae23a89a..8393164c3b 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Android.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
index 721719c720..535fd8c4a0 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Android.cpp
index 2dab4582c2..88265f0725 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Android.cpp
index 9b26c71601..35e1c5db23 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Motion/InputDeviceMotion_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Motion/InputDeviceMotion_Android.cpp
index 394c1dc731..c5af803ae8 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Motion/InputDeviceMotion_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Motion/InputDeviceMotion_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Android.cpp
index 8a279ba94e..c7243a2ed0 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Touch/InputDeviceTouch_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Touch/InputDeviceTouch_Android.cpp
index 43441bd9cc..d6b2af17a6 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Touch/InputDeviceTouch_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/Touch/InputDeviceTouch_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Android.cpp
index f59877b92e..3e1bcf2f9a 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/User/LocalUserId_Platform.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/User/LocalUserId_Platform.h
index 8caf396d80..875323de40 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/User/LocalUserId_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Input/User/LocalUserId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommon.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommon.h
index 08baab3289..05cee34949 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommon.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommunicator_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommunicator_Android.cpp
index 53b2c09b7c..da4ad3285f 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommunicator_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommunicator_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessWatcher_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessWatcher_Android.cpp
index d0d06f0554..f3d61d7c38 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessWatcher_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessWatcher_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Thermal/ThermalInfo_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Thermal/ThermalInfo_Android.cpp
index 675df74950..48e9e01832 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Thermal/ThermalInfo_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Thermal/ThermalInfo_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Thermal/ThermalInfo_Android.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Thermal/ThermalInfo_Android.h
index f179f90deb..1a552acc34 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Thermal/ThermalInfo_Android.h
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Thermal/ThermalInfo_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/AzFramework/Windowing/NativeWindow_Android.cpp b/Code/Framework/AzFramework/Platform/Android/AzFramework/Windowing/NativeWindow_Android.cpp
index 1e3d5a7659..516f9069ef 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Windowing/NativeWindow_Android.cpp
+++ b/Code/Framework/AzFramework/Platform/Android/AzFramework/Windowing/NativeWindow_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Android/platform_android.cmake b/Code/Framework/AzFramework/Platform/Android/platform_android.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Framework/AzFramework/Platform/Android/platform_android.cmake
+++ b/Code/Framework/AzFramework/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake b/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake
index cbefaef87f..641285bd25 100644
--- a/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Apple.mm b/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Apple.mm
index ddab67d785..7e53707359 100644
--- a/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Apple.mm
+++ b/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Apple.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Apple.mm b/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Apple.mm
index 0298ea12cc..48268cc495 100644
--- a/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Apple.mm
+++ b/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Apple.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Utils/SystemUtilsApple.h b/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Utils/SystemUtilsApple.h
index d976c06afd..5db090965b 100644
--- a/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Utils/SystemUtilsApple.h
+++ b/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Utils/SystemUtilsApple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Utils/SystemUtilsApple.mm b/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Utils/SystemUtilsApple.mm
index 5e3c3c5c22..de46bcc506 100644
--- a/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Utils/SystemUtilsApple.mm
+++ b/Code/Framework/AzFramework/Platform/Common/Apple/AzFramework/Utils/SystemUtilsApple.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Input/User/LocalUserId_Default.h b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Input/User/LocalUserId_Default.h
index 5fd649636d..57bf1d6d51 100644
--- a/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Input/User/LocalUserId_Default.h
+++ b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Input/User/LocalUserId_Default.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Network/AssetProcessorConnection_Default.cpp b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Network/AssetProcessorConnection_Default.cpp
index 16c54ca84e..9bcda872f0 100644
--- a/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Network/AssetProcessorConnection_Default.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Network/AssetProcessorConnection_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessCommon_Default.h b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessCommon_Default.h
index 15cd823e6b..bf8356b779 100644
--- a/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessCommon_Default.h
+++ b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessCommon_Default.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessCommunicator_Default.cpp b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessCommunicator_Default.cpp
index 679584c7c9..db7e9a5dc0 100644
--- a/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessCommunicator_Default.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessCommunicator_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessWatcher_Default.cpp b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessWatcher_Default.cpp
index d0d06f0554..f3d61d7c38 100644
--- a/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessWatcher_Default.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/Process/ProcessWatcher_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/TargetManagement/TargetManagementComponent_Default.cpp b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/TargetManagement/TargetManagementComponent_Default.cpp
index d3f0239865..d8f28a8fc3 100644
--- a/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/TargetManagement/TargetManagementComponent_Default.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Default/AzFramework/TargetManagement/TargetManagementComponent_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Asset/AssetSystemComponentHelper_Unimplemented.cpp b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Asset/AssetSystemComponentHelper_Unimplemented.cpp
index eaa313bb55..a8062ee941 100644
--- a/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Asset/AssetSystemComponentHelper_Unimplemented.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Asset/AssetSystemComponentHelper_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Unimplemented.cpp b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Unimplemented.cpp
index 67fa8860a1..2731b8d321 100644
--- a/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Unimplemented.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Unimplemented.cpp b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Unimplemented.cpp
index 75860f02f0..42a3d7f63b 100644
--- a/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Unimplemented.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Motion/InputDeviceMotion_Unimplemented.cpp b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Motion/InputDeviceMotion_Unimplemented.cpp
index 86200b3e1f..d3d31b4c1a 100644
--- a/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Motion/InputDeviceMotion_Unimplemented.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Motion/InputDeviceMotion_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Unimplemented.cpp b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Unimplemented.cpp
index ec897b7478..c564913a1c 100644
--- a/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Unimplemented.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Touch/InputDeviceTouch_Unimplemented.cpp b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Touch/InputDeviceTouch_Unimplemented.cpp
index 4299d10b3f..0e46dd8b6f 100644
--- a/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Touch/InputDeviceTouch_Unimplemented.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/Touch/InputDeviceTouch_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
index 099679dbee..3ec48df751 100644
--- a/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/StreamingInstall/StreamingInstall_Unimplemented.cpp b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/StreamingInstall/StreamingInstall_Unimplemented.cpp
index bd1bbc8925..1ae738ce96 100644
--- a/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/StreamingInstall/StreamingInstall_Unimplemented.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/Unimplemented/AzFramework/StreamingInstall/StreamingInstall_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/UnixLike/AzFramework/IO/LocalFileIO_UnixLike.cpp b/Code/Framework/AzFramework/Platform/Common/UnixLike/AzFramework/IO/LocalFileIO_UnixLike.cpp
index 8453336ead..1b1e9f1a50 100644
--- a/Code/Framework/AzFramework/Platform/Common/UnixLike/AzFramework/IO/LocalFileIO_UnixLike.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/UnixLike/AzFramework/IO/LocalFileIO_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/IO/LocalFileIO_WinAPI.cpp b/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/IO/LocalFileIO_WinAPI.cpp
index b1dd7fe97d..850e2e0130 100644
--- a/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/IO/LocalFileIO_WinAPI.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/IO/LocalFileIO_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_WinAPI.h b/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_WinAPI.h
index 2f3f087c20..c261082f68 100644
--- a/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_WinAPI.h
+++ b/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/Network/AssetProcessorConnection_WinAPI.cpp b/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/Network/AssetProcessorConnection_WinAPI.cpp
index e8375b9073..d49bf53950 100644
--- a/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/Network/AssetProcessorConnection_WinAPI.cpp
+++ b/Code/Framework/AzFramework/Platform/Common/WinAPI/AzFramework/Network/AssetProcessorConnection_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/API/ApplicationAPI_Linux.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/API/ApplicationAPI_Linux.h
index 4e19388306..1f0868b5ca 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/API/ApplicationAPI_Linux.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/API/ApplicationAPI_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/API/ApplicationAPI_Platform.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/API/ApplicationAPI_Platform.h
index cc6d5be6d7..3c13f95638 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/API/ApplicationAPI_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/API/ApplicationAPI_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Application/Application_Linux.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Application/Application_Linux.cpp
index 7ac0eff1ae..3ce27999e7 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Application/Application_Linux.cpp
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Application/Application_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h
index 4e7af2a913..1bb2789178 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h
index d3db5f0fb2..2520572770 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp
index a10e13db49..56f9f7a641 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Linux.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Linux.h
index 1e0c806eeb..98893e2d01 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Linux.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Platform.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Platform.h
index 4ded6709b5..5c389ffc6f 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/AzFramework_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Input/User/LocalUserId_Platform.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Input/User/LocalUserId_Platform.h
index 8caf396d80..875323de40 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Input/User/LocalUserId_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Input/User/LocalUserId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessCommon.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessCommon.h
index b135468671..19c296b521 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessCommon.h
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessCommunicator_Linux.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessCommunicator_Linux.cpp
index 06039fc0a2..e581fce9fb 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessCommunicator_Linux.cpp
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessCommunicator_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessWatcher_Linux.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessWatcher_Linux.cpp
index 1877529939..b558b48d73 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessWatcher_Linux.cpp
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessWatcher_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/AzFramework/Windowing/NativeWindow_Linux.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Windowing/NativeWindow_Linux.cpp
index e68f8cf5d4..d36bafd777 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Windowing/NativeWindow_Linux.cpp
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Windowing/NativeWindow_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Linux/platform_linux.cmake b/Code/Framework/AzFramework/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzFramework/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/AzFramework/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
index 83d1a35eee..8e8e17cf25 100644
--- a/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/API/ApplicationAPI_Mac.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/API/ApplicationAPI_Mac.h
index b788306ef0..b2ee9044b1 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/API/ApplicationAPI_Mac.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/API/ApplicationAPI_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/API/ApplicationAPI_Platform.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/API/ApplicationAPI_Platform.h
index cf47b9c46a..a53b876690 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/API/ApplicationAPI_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/API/ApplicationAPI_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Application/Application_Mac.mm b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Application/Application_Mac.mm
index 2b86d57a08..ae64442b04 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Application/Application_Mac.mm
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Application/Application_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h
index 4e7af2a913..1bb2789178 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h
index 7bfe2f6627..ab2e1cfd89 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp
index bc1f58c5c2..9cac74d172 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Mac.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Mac.h
index fab40a544c..6af4294a5c 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Mac.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Platform.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Platform.h
index b1adae5a03..a9c29bedc0 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/AzFramework_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Mac.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Mac.h
index 7f5e3ab75c..d81222fb6b 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Mac.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
index a6e72eb2db..b62ab56a53 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Mac.mm b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Mac.mm
index 08d1dccdc5..280a1b98cb 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Mac.mm
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Mac.mm b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Mac.mm
index 08afae53cf..4828985ff4 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Mac.mm
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/User/LocalUserId_Platform.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/User/LocalUserId_Platform.h
index 8caf396d80..875323de40 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/User/LocalUserId_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/User/LocalUserId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessCommon.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessCommon.h
index 1d4a97349e..a8edfe1cb5 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessCommon.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessCommunicator_Mac.cpp b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessCommunicator_Mac.cpp
index 2afe81f5d1..66e85f04e0 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessCommunicator_Mac.cpp
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessCommunicator_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessWatcher_Mac.cpp b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessWatcher_Mac.cpp
index 3a90ce4af7..b5020d7dbd 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessWatcher_Mac.cpp
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Process/ProcessWatcher_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/TargetManagement/TargetManagementComponent_Mac.cpp b/Code/Framework/AzFramework/Platform/Mac/AzFramework/TargetManagement/TargetManagementComponent_Mac.cpp
index 770929d2fb..d4e743026c 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/TargetManagement/TargetManagementComponent_Mac.cpp
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/TargetManagement/TargetManagementComponent_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Utils/SystemUtilsApple.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Utils/SystemUtilsApple.h
index 0659f53953..fca050fde6 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Utils/SystemUtilsApple.h
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Utils/SystemUtilsApple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/AzFramework/Windowing/NativeWindow_Mac.mm b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Windowing/NativeWindow_Mac.mm
index ca5b9baab2..d700f54de0 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Windowing/NativeWindow_Mac.mm
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Windowing/NativeWindow_Mac.mm
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Mac/platform_mac.cmake b/Code/Framework/AzFramework/Platform/Mac/platform_mac.cmake
index 21a8db46ec..184e432430 100644
--- a/Code/Framework/AzFramework/Platform/Mac/platform_mac.cmake
+++ b/Code/Framework/AzFramework/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake
index 9555a19582..b06280dc99 100644
--- a/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/API/ApplicationAPI_Platform.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/API/ApplicationAPI_Platform.h
index 4657c5df96..740e3ca191 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/API/ApplicationAPI_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/API/ApplicationAPI_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/API/ApplicationAPI_Windows.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/API/ApplicationAPI_Windows.h
index 158c6deaf8..db35f7d8f2 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/API/ApplicationAPI_Windows.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/API/ApplicationAPI_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Application/Application_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Application/Application_Windows.cpp
index c361531188..a9ffef43ea 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Application/Application_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Application/Application_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h
index 850784a969..8afff88434 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h
index 4e7af2a913..1bb2789178 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp
index 2e7e299e69..d360b43e8f 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/AzFramework_Traits_Platform.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/AzFramework_Traits_Platform.h
index 7cd500e282..c994690bdb 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/AzFramework_Traits_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/AzFramework_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/AzFramework_Traits_Windows.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/AzFramework_Traits_Windows.h
index 82a736d879..dae082c0f6 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/AzFramework_Traits_Windows.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/AzFramework_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/IO/LocalFileIO_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/IO/LocalFileIO_Windows.cpp
index d35cf7d964..387d146022 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/IO/LocalFileIO_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/IO/LocalFileIO_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
index f43af3099b..e9a03f82e7 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Windows.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Windows.h
index c21bcd8f61..c61e575a9f 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Windows.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Windows.cpp
index 94446479d9..895980e84e 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Gamepad/InputDeviceGamepad_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Windows.cpp
index 7f9c4b4fd6..939dc10e71 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Windows.cpp
index 8d213d3cc0..af4ce51ad5 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/User/LocalUserId_Platform.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/User/LocalUserId_Platform.h
index 8caf396d80..875323de40 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/User/LocalUserId_Platform.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Input/User/LocalUserId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommon.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommon.h
index 5a8aba3fd6..19a6ceca71 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommon.h
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp
index fbba0991bb..5bfffcbfc6 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessWatcher_Win.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessWatcher_Win.cpp
index cdb8be58e6..b6601b87e1 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessWatcher_Win.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessWatcher_Win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp
index 3ef86f1e46..1a0c66f356 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/AzFramework/Windowing/NativeWindow_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Windowing/NativeWindow_Windows.cpp
index 23fe762fa0..44a3757aea 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Windowing/NativeWindow_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Windowing/NativeWindow_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/Windows/platform_windows.cmake b/Code/Framework/AzFramework/Platform/Windows/platform_windows.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Framework/AzFramework/Platform/Windows/platform_windows.cmake
+++ b/Code/Framework/AzFramework/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake
index f2bee7dda5..6397a48f8f 100644
--- a/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/API/ApplicationAPI_Platform.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/API/ApplicationAPI_Platform.h
index 55eb2b5ebd..43eeaebbf5 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/API/ApplicationAPI_Platform.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/API/ApplicationAPI_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/API/ApplicationAPI_iOS.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/API/ApplicationAPI_iOS.h
index 0b0e63e92c..c6dcc713b4 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/API/ApplicationAPI_iOS.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/API/ApplicationAPI_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Application/Application_iOS.mm b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Application/Application_iOS.mm
index a44a1044c6..26f918c509 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Application/Application_iOS.mm
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Application/Application_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h
index 2d3909ba5b..7913675c1e 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h
index 4e7af2a913..1bb2789178 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/AzFramework_Traits_Platform.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/AzFramework_Traits_Platform.h
index 75a55726fe..42c733dff4 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/AzFramework_Traits_Platform.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/AzFramework_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/AzFramework_Traits_iOS.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/AzFramework_Traits_iOS.h
index d19f8b9e3f..4af61d2ecc 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/AzFramework_Traits_iOS.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/AzFramework_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
index 0cbe181938..d14e61b1e4 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_iOS.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_iOS.h
index 6d59c56562..8e0de65dd5 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_iOS.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Buses/Notifications/RawInputNotificationBus_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Motion/InputDeviceMotion_iOS.mm b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Motion/InputDeviceMotion_iOS.mm
index 04c0c63e50..4a63e4bc92 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Motion/InputDeviceMotion_iOS.mm
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Motion/InputDeviceMotion_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Touch/InputDeviceTouch_iOS.mm b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Touch/InputDeviceTouch_iOS.mm
index faa7f210b5..a786da4c26 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Touch/InputDeviceTouch_iOS.mm
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/Devices/Touch/InputDeviceTouch_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/User/LocalUserId_Platform.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/User/LocalUserId_Platform.h
index 8caf396d80..875323de40 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/User/LocalUserId_Platform.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Input/User/LocalUserId_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessCommon.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessCommon.h
index 08baab3289..05cee34949 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessCommon.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessCommunicator_iOS.cpp b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessCommunicator_iOS.cpp
index 53b2c09b7c..da4ad3285f 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessCommunicator_iOS.cpp
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessCommunicator_iOS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessWatcher_iOS.cpp b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessWatcher_iOS.cpp
index d0d06f0554..f3d61d7c38 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessWatcher_iOS.cpp
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Process/ProcessWatcher_iOS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Utils/SystemUtilsApple.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Utils/SystemUtilsApple.h
index 5d339967a1..9bb911dffe 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Utils/SystemUtilsApple.h
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Utils/SystemUtilsApple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/AzFramework/Windowing/NativeWindow_ios.mm b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Windowing/NativeWindow_ios.mm
index d44af3c770..3ea603b604 100644
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Windowing/NativeWindow_ios.mm
+++ b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Windowing/NativeWindow_ios.mm
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzFramework/Platform/iOS/platform_ios.cmake b/Code/Framework/AzFramework/Platform/iOS/platform_ios.cmake
index d343aa2585..2f4ff8f12c 100644
--- a/Code/Framework/AzFramework/Platform/iOS/platform_ios.cmake
+++ b/Code/Framework/AzFramework/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake
index 16ee7bb14f..2a23a3e625 100644
--- a/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzGameFramework/AzGameFramework/API/GameApplicationAPI.h b/Code/Framework/AzGameFramework/AzGameFramework/API/GameApplicationAPI.h
index b601f0afa4..99fec8500d 100644
--- a/Code/Framework/AzGameFramework/AzGameFramework/API/GameApplicationAPI.h
+++ b/Code/Framework/AzGameFramework/AzGameFramework/API/GameApplicationAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.cpp b/Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.cpp
index 50026ef1fd..9b532ea0e1 100644
--- a/Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.cpp
+++ b/Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.h b/Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.h
index 9a5f14c845..79a891265d 100644
--- a/Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.h
+++ b/Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzGameFramework/AzGameFramework/AzGameFrameworkModule.cpp b/Code/Framework/AzGameFramework/AzGameFramework/AzGameFrameworkModule.cpp
index 7001c48b39..3361894bab 100644
--- a/Code/Framework/AzGameFramework/AzGameFramework/AzGameFrameworkModule.cpp
+++ b/Code/Framework/AzGameFramework/AzGameFramework/AzGameFrameworkModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzGameFramework/AzGameFramework/AzGameFrameworkModule.h b/Code/Framework/AzGameFramework/AzGameFramework/AzGameFrameworkModule.h
index 17e70b8aaa..8ca3ccebbf 100644
--- a/Code/Framework/AzGameFramework/AzGameFramework/AzGameFrameworkModule.h
+++ b/Code/Framework/AzGameFramework/AzGameFramework/AzGameFrameworkModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzGameFramework/AzGameFramework/CMakeLists.txt b/Code/Framework/AzGameFramework/AzGameFramework/CMakeLists.txt
index de1d870b4c..cf94f34961 100644
--- a/Code/Framework/AzGameFramework/AzGameFramework/CMakeLists.txt
+++ b/Code/Framework/AzGameFramework/AzGameFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzGameFramework/AzGameFramework/azgameframework_files.cmake b/Code/Framework/AzGameFramework/AzGameFramework/azgameframework_files.cmake
index 3ae8009875..fc884a49b0 100644
--- a/Code/Framework/AzGameFramework/AzGameFramework/azgameframework_files.cmake
+++ b/Code/Framework/AzGameFramework/AzGameFramework/azgameframework_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzGameFramework/CMakeLists.txt b/Code/Framework/AzGameFramework/CMakeLists.txt
index 7d894affae..4e7a772bfc 100644
--- a/Code/Framework/AzGameFramework/CMakeLists.txt
+++ b/Code/Framework/AzGameFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzManipulatorTestFramework/CMakeLists.txt b/Code/Framework/AzManipulatorTestFramework/CMakeLists.txt
index c1bd3482ff..83efa39de7 100644
--- a/Code/Framework/AzManipulatorTestFramework/CMakeLists.txt
+++ b/Code/Framework/AzManipulatorTestFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
index e1e51237db..fff12365b0 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
index b9054d2522..838a621478 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h
index bc8c2a3c63..7f4c0f508f 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h
index 49e0b5272b..31fc8aec47 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h
index 2ed36bb9f3..7e915ed253 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
index 4479d605e7..1bdd0858ef 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h
index 7594b424f8..91fe8b349e 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/RetainedModeActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/RetainedModeActionDispatcher.h
index ff602ff2e9..5c3865a92b 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/RetainedModeActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/RetainedModeActionDispatcher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
index 44a544a8e2..535881c8e7 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkFixture.cpp b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkFixture.cpp
index 764e698a81..8dab41c3d0 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkFixture.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
index e35fc77b31..acd5e8a1f0 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp
index 1e0d4ee356..d7cb9d9a39 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
index 20d9227fa7..143cd0329e 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp
index 832e3d89ef..ca6e168ca5 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Source/RetainedModeActionDispatcher.cpp b/Code/Framework/AzManipulatorTestFramework/Source/RetainedModeActionDispatcher.cpp
index 5f694eada5..c1754b1808 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/RetainedModeActionDispatcher.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/RetainedModeActionDispatcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
index 6068df4cfc..965de4d949 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Tests/AzManipulatorTestFrameworkTestFixtures.h b/Code/Framework/AzManipulatorTestFramework/Tests/AzManipulatorTestFrameworkTestFixtures.h
index cc39426d3a..a685fff0de 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/AzManipulatorTestFrameworkTestFixtures.h
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/AzManipulatorTestFrameworkTestFixtures.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp
index 04f7870dcf..af5512167d 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Tests/DirectCallTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/DirectCallTest.cpp
index 764c4bbb55..a0250f1332 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/DirectCallTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/DirectCallTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp
index 3754816fb1..2dd03ff91e 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Tests/Main.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/Main.cpp
index 651b837900..402c050157 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/Main.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp
index a6bebc2374..d525f24580 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
index 169b3ed31d..91a02eb571 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzManipulatorTestFramework/azmanipulatortestframework_files.cmake b/Code/Framework/AzManipulatorTestFramework/azmanipulatortestframework_files.cmake
index d5bcaaaf4b..e31c90e0ba 100644
--- a/Code/Framework/AzManipulatorTestFramework/azmanipulatortestframework_files.cmake
+++ b/Code/Framework/AzManipulatorTestFramework/azmanipulatortestframework_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzManipulatorTestFramework/azmanipulatortestframework_tests_files.cmake b/Code/Framework/AzManipulatorTestFramework/azmanipulatortestframework_tests_files.cmake
index be1f52b375..3d499eaa6a 100644
--- a/Code/Framework/AzManipulatorTestFramework/azmanipulatortestframework_tests_files.cmake
+++ b/Code/Framework/AzManipulatorTestFramework/azmanipulatortestframework_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Header.jinja b/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Header.jinja
index aadd0bde19..3d14f878de 100644
--- a/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Header.jinja
+++ b/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Header.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Inline.jinja b/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Inline.jinja
index 18527afeb4..8dd092431b 100644
--- a/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Inline.jinja
+++ b/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Inline.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Source.jinja b/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Source.jinja
index 2923f136fa..e500035b86 100644
--- a/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Source.jinja
+++ b/Code/Framework/AzNetworking/AzNetworking/AutoGen/AutoPackets_Source.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Code/Framework/AzNetworking/AzNetworking/AzNetworkingModule.cpp b/Code/Framework/AzNetworking/AzNetworking/AzNetworkingModule.cpp
index 6684888832..35fc43d6f5 100644
--- a/Code/Framework/AzNetworking/AzNetworking/AzNetworkingModule.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/AzNetworkingModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/AzNetworkingModule.h b/Code/Framework/AzNetworking/AzNetworking/AzNetworkingModule.h
index 2179e15305..5661e4e015 100644
--- a/Code/Framework/AzNetworking/AzNetworking/AzNetworkingModule.h
+++ b/Code/Framework/AzNetworking/AzNetworking/AzNetworkingModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionEnums.h b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionEnums.h
index 8e921a4d47..e0719bae1f 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionEnums.h
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.cpp b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.cpp
index d31d00ec55..1a90df9d2a 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.h b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.h
index f9e54b20d2..21eb3f73cd 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.h
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.inl b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.inl
index 41d1a0c770..d14d007f28 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h
index 77fe105c72..98c10e8a0e 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.inl b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.inl
index a5f6ad119b..a7161464cc 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnectionListener.h b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnectionListener.h
index 4ffe40a86d..7fb3dcd8e8 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnectionListener.h
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnectionListener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnectionSet.h b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnectionSet.h
index 7f0f46317c..0cd9817090 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnectionSet.h
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnectionSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/SequenceGenerator.h b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/SequenceGenerator.h
index b755edfd6e..bebb72020b 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/SequenceGenerator.h
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/SequenceGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/SequenceGenerator.inl b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/SequenceGenerator.inl
index 742704b369..5464c1a59a 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/SequenceGenerator.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/SequenceGenerator.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/ByteBuffer.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/ByteBuffer.h
index d5f4f2c543..4f4000fdaa 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/ByteBuffer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/ByteBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/ByteBuffer.inl b/Code/Framework/AzNetworking/AzNetworking/DataStructures/ByteBuffer.inl
index 0bc69b691e..07591f7e70 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/ByteBuffer.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/ByteBuffer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h
index 3492481c98..95f07a2ce0 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.inl b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.inl
index 967f4fd3ad..2bcae25132 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.h
index ce63efee83..3297ba8904 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.inl b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.inl
index 3e01f6f1a9..8e2ab9083c 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeVectorBitset.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeVectorBitset.h
index 8f8f79cf9b..bf56518314 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeVectorBitset.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeVectorBitset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeVectorBitset.inl b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeVectorBitset.inl
index 213c3bee56..42ad051bd5 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeVectorBitset.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeVectorBitset.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/IBitset.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/IBitset.h
index e9c7b1ef21..5c47fa8ba1 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/IBitset.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/IBitset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/RingBufferBitset.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/RingBufferBitset.h
index 4ee95e7cdb..f965c9f2aa 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/RingBufferBitset.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/RingBufferBitset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/RingBufferBitset.inl b/Code/Framework/AzNetworking/AzNetworking/DataStructures/RingBufferBitset.inl
index 6a0089a434..20510182bb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/RingBufferBitset.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/RingBufferBitset.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.cpp b/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.cpp
index 17155df365..e7defe5409 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.h
index f9f1698175..24f468d3cf 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.inl b/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.inl
index e04b4ebd25..56f62f285d 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Framework/ICompressor.h b/Code/Framework/AzNetworking/AzNetworking/Framework/ICompressor.h
index 552df26984..2971dd9a19 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Framework/ICompressor.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Framework/ICompressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Framework/INetworkInterface.h b/Code/Framework/AzNetworking/AzNetworking/Framework/INetworkInterface.h
index 45d96bc04f..92eeacb968 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Framework/INetworkInterface.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Framework/INetworkInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Framework/INetworking.h b/Code/Framework/AzNetworking/AzNetworking/Framework/INetworking.h
index b418db83e2..1722e53c16 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Framework/INetworking.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Framework/INetworking.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkInterfaceMetrics.h b/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkInterfaceMetrics.h
index d9f0ec3d88..f860302038 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkInterfaceMetrics.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkInterfaceMetrics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkingSystemComponent.cpp b/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkingSystemComponent.cpp
index 3fb5cdf040..6097abf6db 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkingSystemComponent.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkingSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkingSystemComponent.h b/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkingSystemComponent.h
index 20a0ec01c5..d6e34fc6a1 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkingSystemComponent.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkingSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/PacketLayer/IPacket.h b/Code/Framework/AzNetworking/AzNetworking/PacketLayer/IPacket.h
index 264674f914..abc5c10ac3 100644
--- a/Code/Framework/AzNetworking/AzNetworking/PacketLayer/IPacket.h
+++ b/Code/Framework/AzNetworking/AzNetworking/PacketLayer/IPacket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/PacketLayer/IPacketHeader.h b/Code/Framework/AzNetworking/AzNetworking/PacketLayer/IPacketHeader.h
index f9fe21f2f1..1053a4cecb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/PacketLayer/IPacketHeader.h
+++ b/Code/Framework/AzNetworking/AzNetworking/PacketLayer/IPacketHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/AbstractValue.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/AbstractValue.h
index 37d5655861..c139edcdb0 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/AbstractValue.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/AbstractValue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h
index 549aba2a82..25b1543b1f 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.cpp b/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.cpp
index 97c4fe6c23..b67fabfa85 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.h
index 9d26955690..bd97fe8607 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.inl b/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.inl
index 6a58d216a6..dbdb18eff7 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/DeltaSerializer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.cpp b/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.cpp
index 9ec5248d8a..187dfcdfd0 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.h
index 1a89a80a93..74def4f450 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/ISerializer.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/ISerializer.h
index 41327610b3..dde108a902 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/ISerializer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/ISerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/ISerializer.inl b/Code/Framework/AzNetworking/AzNetworking/Serialization/ISerializer.inl
index af2b8a702a..72c7e681cb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/ISerializer.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/ISerializer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.cpp b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.cpp
index 36ef0cf01a..7c4b92f87d 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.h
index 9c5a749ec4..4af7b61c64 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.inl b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.inl
index f9c3eb9912..ed2ff09ac9 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkInputSerializer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.cpp b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.cpp
index 1c3e452b75..b4a1d7887b 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.h
index 2698cd9630..142696e999 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.inl b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.inl
index 7ea51afa5e..0d71646d25 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/NetworkOutputSerializer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/StringifySerializer.cpp b/Code/Framework/AzNetworking/AzNetworking/Serialization/StringifySerializer.cpp
index 02b08dee8a..6a466f5810 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/StringifySerializer.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/StringifySerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/StringifySerializer.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/StringifySerializer.h
index 10b00cc872..bb3932d441 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/StringifySerializer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/StringifySerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/TrackChangedSerializer.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/TrackChangedSerializer.h
index 5793f56aab..606a2a6b4b 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/TrackChangedSerializer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/TrackChangedSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Serialization/TrackChangedSerializer.inl b/Code/Framework/AzNetworking/AzNetworking/Serialization/TrackChangedSerializer.inl
index b732119f2f..aa8a9cc750 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/TrackChangedSerializer.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/TrackChangedSerializer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.cpp
index fc0847b5ab..ec9e8e373c 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.h
index c218cc7de0..f670600e3e 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.inl b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.inl
index ad494299c9..9fbf90be46 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnectionSet.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnectionSet.cpp
index b8b7258a9b..3af45c4325 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnectionSet.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnectionSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnectionSet.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnectionSet.h
index c1cec7dd94..e394783eaf 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnectionSet.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnectionSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.cpp
index 9b80b12cde..d27a8dfbb2 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.h
index 8dffd95ae3..7c67ac86cb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp
index 0f1832c99d..87adde3615 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h
index 53128ac4ac..926a74cc75 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.cpp
index f28338d290..9efecde085 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.h
index be680ad489..4311a0834c 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.inl b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.inl
index 8de4bb3e13..54544eadbe 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpPacketHeader.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.h
index 50d333b514..bc95c87747 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.inl b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.inl
index 3c7edb8777..3a20ca6926 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.cpp
index 3dbe00670a..ce5b3d2d2f 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.h
index 2057145ffe..26da711f96 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.inl b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.inl
index 00eb0c9305..929210750a 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBufferImpl.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.cpp
index 7d2e8fd7f6..f9c9b987eb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.h
index 58a384b254..7b5140cfe4 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.inl b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.inl
index 4b0ef0e005..2f392bdd21 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager.h
index bc985283a9..4e8628e9cb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_Epoll.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_Epoll.cpp
index d5615151bf..c247335d68 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_Epoll.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_Epoll.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_None.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_None.cpp
index 01d59e0871..2ed33d4ca7 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_None.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_None.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_Select.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_Select.cpp
index 6c1de87987..130739ca39 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_Select.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocketManager_Select.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.cpp
index 2d76d29d1d..ee7b7e6e8a 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.h
index 187f556afc..fa1b87cdea 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.cpp
index e457e13fe7..2e380fd60b 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.h
index b5c43aa002..17988baea7 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsSocket.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsSocket.cpp
index 31e3fcb8a0..d7f3dedc13 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsSocket.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsSocket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsSocket.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsSocket.h
index aa8171a4dd..c5c064c1cf 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsSocket.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsSocket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.cpp
index 37b8da82e3..1dccc1fcc3 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.h
index 907829968e..a1d20ddbb6 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.inl b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.inl
index 39d150aae2..28828913e0 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnection.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnectionSet.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnectionSet.cpp
index 2c7f76a2bc..aa13b4c77b 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnectionSet.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnectionSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnectionSet.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnectionSet.h
index baa01e6295..6a96c28e57 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnectionSet.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpConnectionSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.cpp
index 9a1ef66531..7c79c48e7a 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.h
index ba5ed2b700..ca2d44a804 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
index 134f505913..b2aad4e094 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -199,6 +199,13 @@ namespace AzNetworking
                 connection->Disconnect(disconnectReason, TerminationEndpoint::Local);
                 continue;
             }
+            
+            const ConnectionState connectionState = connection->GetConnectionState();
+            if (connectionState == ConnectionState::Disconnecting || connectionState == ConnectionState::Disconnected)
+            {
+                // Skip packets from disconnected connections
+                continue;
+            }
 
             int32_t decodedPacketSize = 0;
             m_decryptBuffer.Resize(m_decryptBuffer.GetCapacity());
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h
index f379912e0d..4997612b5e 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.cpp
index 7065daf3ed..7f0b70a9c8 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.h
index 69888734d1..77dccad6a1 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.inl b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.inl
index 7c03f89273..190af9a39a 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketHeader.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.cpp
index d67308c126..a09c1454b0 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.h
index 1e87a1b80d..b08351349e 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.inl b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.inl
index 8e60b65ff6..781b2b1f77 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketIdWindow.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.cpp
index e57d3eb64a..fff36f62fc 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.h
index 2c596ba6f6..0f716afb27 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.inl b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.inl
index 6e85a8095d..f142dd4ce9 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpPacketTracker.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.cpp
index a0eb38d8cf..873a439aa0 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.h
index b7ae0e5639..d12728889d 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReliableQueue.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReliableQueue.cpp
index 286faaed46..85c971379a 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReliableQueue.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReliableQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReliableQueue.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReliableQueue.h
index d82ea1b76c..0677d33ba0 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReliableQueue.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReliableQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
index b475b15965..c533ab0fdb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.h
index 8fca24c5f3..61f4c74b68 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.inl b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.inl
index 3b8fe5f32a..37fe7796e3 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/CidrAddress.cpp b/Code/Framework/AzNetworking/AzNetworking/Utilities/CidrAddress.cpp
index 66872bc16e..b6a69d08a0 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/CidrAddress.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/CidrAddress.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/CidrAddress.h b/Code/Framework/AzNetworking/AzNetworking/Utilities/CidrAddress.h
index d6ee123d95..d3db76b3db 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/CidrAddress.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/CidrAddress.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.cpp b/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.cpp
index 0274c50eb8..6244991807 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.h b/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.h
index d165ceef4d..a4a0266812 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/Endian.h b/Code/Framework/AzNetworking/AzNetworking/Utilities/Endian.h
index 30924da6fd..24f32d756c 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/Endian.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/Endian.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.cpp b/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.cpp
index e6b2b16214..b958619ccc 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.h b/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.h
index b0a6a3b143..772ef14314 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.inl b/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.inl
index bae6bbc533..82f05bea51 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/IpAddress.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.cpp b/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.cpp
index 9c44d91f48..94028ebee9 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.h b/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.h
index 4852da38b0..54817af051 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.inl b/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.inl
index dabf5fcc0b..86e0bc6291 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkCommon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkIncludes.h b/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkIncludes.h
index 3ecc9917d6..084f20b403 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkIncludes.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/NetworkIncludes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/QuantizedValues.h b/Code/Framework/AzNetworking/AzNetworking/Utilities/QuantizedValues.h
index b29ccd5ca4..5e4784f07e 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/QuantizedValues.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/QuantizedValues.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/QuantizedValues.inl b/Code/Framework/AzNetworking/AzNetworking/Utilities/QuantizedValues.inl
index 1a740bce2e..5c1c1fbf42 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/QuantizedValues.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/QuantizedValues.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.cpp b/Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.cpp
index 3a8f1b895d..32c16c6c66 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.h b/Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.h
index 8778e37b0d..e45da0fda9 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/AzNetworking/aznetworking_files.cmake b/Code/Framework/AzNetworking/AzNetworking/aznetworking_files.cmake
index d59f32a7af..4e6927ddc8 100644
--- a/Code/Framework/AzNetworking/AzNetworking/aznetworking_files.cmake
+++ b/Code/Framework/AzNetworking/AzNetworking/aznetworking_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/CMakeLists.txt b/Code/Framework/AzNetworking/CMakeLists.txt
index 5703b0b878..6419947056 100644
--- a/Code/Framework/AzNetworking/CMakeLists.txt
+++ b/Code/Framework/AzNetworking/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/Android/AzNetworking/AzNetworking_Traits_Platform.h b/Code/Framework/AzNetworking/Platform/Android/AzNetworking/AzNetworking_Traits_Platform.h
index ae5d0d8368..43f8a6bb9f 100644
--- a/Code/Framework/AzNetworking/Platform/Android/AzNetworking/AzNetworking_Traits_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Android/AzNetworking/AzNetworking_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Android/AzNetworking/Utilities/Endian_Platform.h b/Code/Framework/AzNetworking/Platform/Android/AzNetworking/Utilities/Endian_Platform.h
index 51f4973d46..02efe9ddcc 100644
--- a/Code/Framework/AzNetworking/Platform/Android/AzNetworking/Utilities/Endian_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Android/AzNetworking/Utilities/Endian_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Android/AzNetworking/Utilities/NetworkIncludes_Platform.h b/Code/Framework/AzNetworking/Platform/Android/AzNetworking/Utilities/NetworkIncludes_Platform.h
index 7e775911de..2d9ca9a0f8 100644
--- a/Code/Framework/AzNetworking/Platform/Android/AzNetworking/Utilities/NetworkIncludes_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Android/AzNetworking/Utilities/NetworkIncludes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Android/platform_android.cmake b/Code/Framework/AzNetworking/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzNetworking/Platform/Android/platform_android.cmake
+++ b/Code/Framework/AzNetworking/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/Android/platform_android_files.cmake b/Code/Framework/AzNetworking/Platform/Android/platform_android_files.cmake
index eae5fd66a5..11bcd0d09d 100644
--- a/Code/Framework/AzNetworking/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/AzNetworking/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/Common/Apple/AzNetworking/Utilities/Endian_Apple.h b/Code/Framework/AzNetworking/Platform/Common/Apple/AzNetworking/Utilities/Endian_Apple.h
index e02fcdc915..f5f8e68278 100644
--- a/Code/Framework/AzNetworking/Platform/Common/Apple/AzNetworking/Utilities/Endian_Apple.h
+++ b/Code/Framework/AzNetworking/Platform/Common/Apple/AzNetworking/Utilities/Endian_Apple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Common/Default/AzNetworking/Utilities/IpAddress_Default.cpp b/Code/Framework/AzNetworking/Platform/Common/Default/AzNetworking/Utilities/IpAddress_Default.cpp
index 9fe81a8493..361e9b939d 100644
--- a/Code/Framework/AzNetworking/Platform/Common/Default/AzNetworking/Utilities/IpAddress_Default.cpp
+++ b/Code/Framework/AzNetworking/Platform/Common/Default/AzNetworking/Utilities/IpAddress_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/Endian_UnixLike.h b/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/Endian_UnixLike.h
index 4ad6b162ce..7d6f41e2e9 100644
--- a/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/Endian_UnixLike.h
+++ b/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/Endian_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/NetworkCommon_UnixLike.cpp b/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/NetworkCommon_UnixLike.cpp
index 10de65b169..d26990bd29 100644
--- a/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/NetworkCommon_UnixLike.cpp
+++ b/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/NetworkCommon_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/NetworkIncludes_UnixLike.h b/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/NetworkIncludes_UnixLike.h
index 58b4997d1d..5525fcd7cd 100644
--- a/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/NetworkIncludes_UnixLike.h
+++ b/Code/Framework/AzNetworking/Platform/Common/UnixLike/AzNetworking/Utilities/NetworkIncludes_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/Endian_WinAPI.h b/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/Endian_WinAPI.h
index cec16ff3f1..4f1d8129da 100644
--- a/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/Endian_WinAPI.h
+++ b/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/Endian_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/NetworkCommon_WinAPI.cpp b/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/NetworkCommon_WinAPI.cpp
index 8ffae7732d..bbc926d36d 100644
--- a/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/NetworkCommon_WinAPI.cpp
+++ b/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/NetworkCommon_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/NetworkIncludes_WinAPI.h b/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/NetworkIncludes_WinAPI.h
index aa05baf5b1..c0b2d2492b 100644
--- a/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/NetworkIncludes_WinAPI.h
+++ b/Code/Framework/AzNetworking/Platform/Common/WinAPI/AzNetworking/Utilities/NetworkIncludes_WinAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/AzNetworking_Traits_Platform.h b/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/AzNetworking_Traits_Platform.h
index 3e53b7d27c..99c68ff533 100644
--- a/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/AzNetworking_Traits_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/AzNetworking_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/Utilities/Endian_Platform.h b/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/Utilities/Endian_Platform.h
index 51f4973d46..02efe9ddcc 100644
--- a/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/Utilities/Endian_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/Utilities/Endian_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/Utilities/NetworkIncludes_Platform.h b/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/Utilities/NetworkIncludes_Platform.h
index 7e775911de..2d9ca9a0f8 100644
--- a/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/Utilities/NetworkIncludes_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/Utilities/NetworkIncludes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Linux/platform_linux.cmake b/Code/Framework/AzNetworking/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzNetworking/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/AzNetworking/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzNetworking/Platform/Linux/platform_linux_files.cmake
index eae5fd66a5..11bcd0d09d 100644
--- a/Code/Framework/AzNetworking/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzNetworking/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/AzNetworking_Traits_Platform.h b/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/AzNetworking_Traits_Platform.h
index 02d1221966..ed5f6b0e5e 100644
--- a/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/AzNetworking_Traits_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/AzNetworking_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/Utilities/Endian_Platform.h b/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/Utilities/Endian_Platform.h
index ca2cea3c2d..6fc9fa10f3 100644
--- a/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/Utilities/Endian_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/Utilities/Endian_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/Utilities/NetworkIncludes_Platform.h b/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/Utilities/NetworkIncludes_Platform.h
index 7e775911de..2d9ca9a0f8 100644
--- a/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/Utilities/NetworkIncludes_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Mac/AzNetworking/Utilities/NetworkIncludes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Mac/platform_mac.cmake b/Code/Framework/AzNetworking/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzNetworking/Platform/Mac/platform_mac.cmake
+++ b/Code/Framework/AzNetworking/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzNetworking/Platform/Mac/platform_mac_files.cmake
index 51057ea419..026044a083 100644
--- a/Code/Framework/AzNetworking/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzNetworking/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/AzNetworking_Traits_Platform.h b/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/AzNetworking_Traits_Platform.h
index 33033c7d8d..acb999919e 100644
--- a/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/AzNetworking_Traits_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/AzNetworking_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/Utilities/Endian_Platform.h b/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/Utilities/Endian_Platform.h
index f9ded4f68b..ecf39fea13 100644
--- a/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/Utilities/Endian_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/Utilities/Endian_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/Utilities/NetworkIncludes_Platform.h b/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/Utilities/NetworkIncludes_Platform.h
index 126d21bc46..50841c5a3b 100644
--- a/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/Utilities/NetworkIncludes_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/Windows/AzNetworking/Utilities/NetworkIncludes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/Windows/platform_windows.cmake b/Code/Framework/AzNetworking/Platform/Windows/platform_windows.cmake
index 999bbb19df..9784af9309 100644
--- a/Code/Framework/AzNetworking/Platform/Windows/platform_windows.cmake
+++ b/Code/Framework/AzNetworking/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzNetworking/Platform/Windows/platform_windows_files.cmake
index 7274acf9ca..4f6b12fa69 100644
--- a/Code/Framework/AzNetworking/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzNetworking/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/AzNetworking_Traits_Platform.h b/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/AzNetworking_Traits_Platform.h
index 02d1221966..ed5f6b0e5e 100644
--- a/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/AzNetworking_Traits_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/AzNetworking_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/Utilities/Endian_Platform.h b/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/Utilities/Endian_Platform.h
index ca2cea3c2d..6fc9fa10f3 100644
--- a/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/Utilities/Endian_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/Utilities/Endian_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/Utilities/NetworkIncludes_Platform.h b/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/Utilities/NetworkIncludes_Platform.h
index 7e775911de..2d9ca9a0f8 100644
--- a/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/Utilities/NetworkIncludes_Platform.h
+++ b/Code/Framework/AzNetworking/Platform/iOS/AzNetworking/Utilities/NetworkIncludes_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Platform/iOS/platform_ios.cmake b/Code/Framework/AzNetworking/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzNetworking/Platform/iOS/platform_ios.cmake
+++ b/Code/Framework/AzNetworking/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzNetworking/Platform/iOS/platform_ios_files.cmake
index 51057ea419..026044a083 100644
--- a/Code/Framework/AzNetworking/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/AzNetworking/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzNetworking/Tests/ConnectionLayer/ConnectionMetricsTests.cpp b/Code/Framework/AzNetworking/Tests/ConnectionLayer/ConnectionMetricsTests.cpp
index 99afeed1ed..86b782e904 100644
--- a/Code/Framework/AzNetworking/Tests/ConnectionLayer/ConnectionMetricsTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/ConnectionLayer/ConnectionMetricsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/ConnectionLayer/SequenceGeneratorTests.cpp b/Code/Framework/AzNetworking/Tests/ConnectionLayer/SequenceGeneratorTests.cpp
index e714d6da2e..5385bfe73a 100644
--- a/Code/Framework/AzNetworking/Tests/ConnectionLayer/SequenceGeneratorTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/ConnectionLayer/SequenceGeneratorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeBitsetTests.cpp b/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeBitsetTests.cpp
index 89d2c4d535..ad8b384be0 100644
--- a/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeBitsetTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeBitsetTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeBitsetViewTests.cpp b/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeBitsetViewTests.cpp
index d3b7c411c1..4838cec5ca 100644
--- a/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeBitsetViewTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeBitsetViewTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeVectorBitsetTests.cpp b/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeVectorBitsetTests.cpp
index d9de4c1742..34e9323058 100644
--- a/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeVectorBitsetTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/DataStructures/FixedSizeVectorBitsetTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/DataStructures/RingBufferBitsetTests.cpp b/Code/Framework/AzNetworking/Tests/DataStructures/RingBufferBitsetTests.cpp
index 6ad6bd1d02..8260b79fcb 100644
--- a/Code/Framework/AzNetworking/Tests/DataStructures/RingBufferBitsetTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/DataStructures/RingBufferBitsetTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/DataStructures/TimeoutQueueTests.cpp b/Code/Framework/AzNetworking/Tests/DataStructures/TimeoutQueueTests.cpp
index 7e981f1112..099dafd146 100644
--- a/Code/Framework/AzNetworking/Tests/DataStructures/TimeoutQueueTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/DataStructures/TimeoutQueueTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Main.cpp b/Code/Framework/AzNetworking/Tests/Main.cpp
index 35a6d84e78..141f9473b8 100644
--- a/Code/Framework/AzNetworking/Tests/Main.cpp
+++ b/Code/Framework/AzNetworking/Tests/Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp b/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp
index 650cadd1ee..1353f5de4c 100644
--- a/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Serialization/HashSerializerTests.cpp b/Code/Framework/AzNetworking/Tests/Serialization/HashSerializerTests.cpp
index 98f7f3f7fc..ee41022407 100644
--- a/Code/Framework/AzNetworking/Tests/Serialization/HashSerializerTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Serialization/HashSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Serialization/NetworkInputSerializerTests.cpp b/Code/Framework/AzNetworking/Tests/Serialization/NetworkInputSerializerTests.cpp
index b3cab55ca3..f1da8680aa 100644
--- a/Code/Framework/AzNetworking/Tests/Serialization/NetworkInputSerializerTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Serialization/NetworkInputSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Serialization/NetworkOutputSerializerTests.cpp b/Code/Framework/AzNetworking/Tests/Serialization/NetworkOutputSerializerTests.cpp
index 3ba824420c..6cafe0802e 100644
--- a/Code/Framework/AzNetworking/Tests/Serialization/NetworkOutputSerializerTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Serialization/NetworkOutputSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Serialization/TrackChangedSerializerTests.cpp b/Code/Framework/AzNetworking/Tests/Serialization/TrackChangedSerializerTests.cpp
index 9c7686667d..4876976947 100644
--- a/Code/Framework/AzNetworking/Tests/Serialization/TrackChangedSerializerTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Serialization/TrackChangedSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/TcpTransport/TcpTransportTests.cpp b/Code/Framework/AzNetworking/Tests/TcpTransport/TcpTransportTests.cpp
index 213abde08d..10ef156c7f 100644
--- a/Code/Framework/AzNetworking/Tests/TcpTransport/TcpTransportTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/TcpTransport/TcpTransportTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/UdpTransport/UdpTransportTests.cpp b/Code/Framework/AzNetworking/Tests/UdpTransport/UdpTransportTests.cpp
index 2fd3c93e23..dfc80e9475 100644
--- a/Code/Framework/AzNetworking/Tests/UdpTransport/UdpTransportTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/UdpTransport/UdpTransportTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Utilities/CidrAddressTests.cpp b/Code/Framework/AzNetworking/Tests/Utilities/CidrAddressTests.cpp
index a14bb65368..96ff9194af 100644
--- a/Code/Framework/AzNetworking/Tests/Utilities/CidrAddressTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Utilities/CidrAddressTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Utilities/IpAddressTests.cpp b/Code/Framework/AzNetworking/Tests/Utilities/IpAddressTests.cpp
index 5d2d4fa819..d2b7164abe 100644
--- a/Code/Framework/AzNetworking/Tests/Utilities/IpAddressTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Utilities/IpAddressTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Utilities/NetworkCommonTests.cpp b/Code/Framework/AzNetworking/Tests/Utilities/NetworkCommonTests.cpp
index ebf2788186..86cbc519ca 100644
--- a/Code/Framework/AzNetworking/Tests/Utilities/NetworkCommonTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Utilities/NetworkCommonTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/Utilities/QuantizedValuesTests.cpp b/Code/Framework/AzNetworking/Tests/Utilities/QuantizedValuesTests.cpp
index b44601fbe6..7825601383 100644
--- a/Code/Framework/AzNetworking/Tests/Utilities/QuantizedValuesTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Utilities/QuantizedValuesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzNetworking/Tests/aznetworkingtests_files.cmake b/Code/Framework/AzNetworking/Tests/aznetworkingtests_files.cmake
index ce0875011e..0da3068819 100644
--- a/Code/Framework/AzNetworking/Tests/aznetworkingtests_files.cmake
+++ b/Code/Framework/AzNetworking/Tests/aznetworkingtests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/AzQtComponents/AzQtComponentsAPI.h b/Code/Framework/AzQtComponents/AzQtComponents/AzQtComponentsAPI.h
index aaabb06136..2c91498ae3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/AzQtComponentsAPI.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/AzQtComponentsAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Buses/DragAndDrop.h b/Code/Framework/AzQtComponents/AzQtComponents/Buses/DragAndDrop.h
index 3b0c51cfa2..ffd3adbbb6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Buses/DragAndDrop.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Buses/DragAndDrop.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Buses/ShortcutDispatch.h b/Code/Framework/AzQtComponents/AzQtComponents/Buses/ShortcutDispatch.h
index b53b8f27be..e23f0d0093 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Buses/ShortcutDispatch.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Buses/ShortcutDispatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/AutoCustomWindowDecorations.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/AutoCustomWindowDecorations.cpp
index 330b68af68..0c7541b501 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/AutoCustomWindowDecorations.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/AutoCustomWindowDecorations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/AutoCustomWindowDecorations.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/AutoCustomWindowDecorations.h
index 2e76624459..5d0cf98e13 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/AutoCustomWindowDecorations.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/AutoCustomWindowDecorations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonDivider.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonDivider.cpp
index b1dd26bc14..7b9e87b1b4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonDivider.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonDivider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonDivider.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonDivider.h
index 309ffacdcc..b3799ad1a9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonDivider.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonDivider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonStripe.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonStripe.cpp
index 374e3aeb0b..2aa1c2283d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonStripe.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonStripe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonStripe.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonStripe.h
index d2057f1902..f54194e830 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonStripe.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ButtonStripe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ConfigHelpers.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/ConfigHelpers.cpp
index a056dd7d63..0e01be82c9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ConfigHelpers.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ConfigHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ConfigHelpers.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/ConfigHelpers.h
index a081fedf82..4e66775152 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ConfigHelpers.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ConfigHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBar.cpp
index 800f71cb21..d759dd3c8e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBar.h
index 1e911ad0cd..eab4ef7333 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.cpp
index 8954b7e312..d8044a3bdc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.h
index 885a73cf94..fe574eecdb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockMainWindow.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockMainWindow.cpp
index 444e37156b..325e09aae8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockMainWindow.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockMainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockMainWindow.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockMainWindow.h
index 0e77ee176a..29a9704a11 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockMainWindow.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockMainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.cpp
index b799c6ff88..c78dccea3e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.h
index 83e05968f0..94817a85fd 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabWidget.cpp
index 48b7976caa..09e151aff6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabWidget.h
index 71a38c45c0..695c4c1037 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/EditorProxyStyle_mac.mm b/Code/Framework/AzQtComponents/AzQtComponents/Components/EditorProxyStyle_mac.mm
index 19d62295ee..81548c8d6a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/EditorProxyStyle_mac.mm
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/EditorProxyStyle_mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ExtendedLabel.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/ExtendedLabel.cpp
index cd2bcc5f3b..379523214d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ExtendedLabel.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ExtendedLabel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ExtendedLabel.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/ExtendedLabel.h
index 0cf2c0c8cc..5b493f7290 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ExtendedLabel.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ExtendedLabel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
index 9fe4ac29fb..4c5e2adabd 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
index 4192d5ea28..43ce090c9f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp
index 87925da49a..87c1871722 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h
index 513c27d616..55155a176a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingGhostWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingGhostWidget.cpp
index a390d8f60a..d2b1a8b8fc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingGhostWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingGhostWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingGhostWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingGhostWidget.h
index 1353102a94..56f9466da3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingGhostWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingGhostWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.cpp
index b028455271..15f371bdaf 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.h
index b48b7cd38c..4e74d3b410 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/GlobalEventFilter.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/GlobalEventFilter.cpp
index 7900a8ddab..0103674a73 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/GlobalEventFilter.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/GlobalEventFilter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/GlobalEventFilter.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/GlobalEventFilter.h
index 9f26c2a5e0..8349d645cf 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/GlobalEventFilter.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/GlobalEventFilter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/HelpButton.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/HelpButton.cpp
index e0367ed0bb..5b01c6378e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/HelpButton.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/HelpButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/HelpButton.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/HelpButton.h
index e848fb6950..4bb8648e72 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/HelpButton.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/HelpButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/InteractiveWindowGeometryChanger.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/InteractiveWindowGeometryChanger.cpp
index 136df6c95f..e1f40eefe9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/InteractiveWindowGeometryChanger.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/InteractiveWindowGeometryChanger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/InteractiveWindowGeometryChanger.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/InteractiveWindowGeometryChanger.h
index de7b02b628..1cd6b8b7b7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/InteractiveWindowGeometryChanger.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/InteractiveWindowGeometryChanger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/O3DEStylesheet.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/O3DEStylesheet.h
index 226417b9d9..aedc192d17 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/O3DEStylesheet.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/O3DEStylesheet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/RepolishMinimizer.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/RepolishMinimizer.h
index a1ed36050e..666a25f405 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/RepolishMinimizer.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/RepolishMinimizer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/SearchLineEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/SearchLineEdit.cpp
index c53598d240..a5952b5dd5 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/SearchLineEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/SearchLineEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/SearchLineEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/SearchLineEdit.h
index 23ee189096..78aee0a796 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/SearchLineEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/SearchLineEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
index 34f04095a9..3356955ae7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Style.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Style.h
index dff189354f..02bc5189aa 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Style.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Style.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleHelpers.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleHelpers.h
index 96fe0ffd2f..b1c954a4bf 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleHelpers.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp
index d69a9e63ef..aba6cfb623 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.h
index 787b5dc7d9..8fbd662fac 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleSheetCache.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleSheetCache.cpp
index c957515cc6..1c1acdc63d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleSheetCache.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleSheetCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleSheetCache.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleSheetCache.h
index a071ecb95c..273d930d8b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleSheetCache.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyleSheetCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledBusyLabel.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledBusyLabel.cpp
index 00b5dd92a1..4caa4b1a50 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledBusyLabel.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledBusyLabel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledBusyLabel.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledBusyLabel.h
index ae0c7615fc..583513789d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledBusyLabel.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledBusyLabel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableModel.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableModel.cpp
index 80152ad4e7..c5ae0e475d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableModel.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableModel.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableModel.h
index fd962f59a5..21a6608643 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableModel.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableView.cpp
index 1f7e8b9d0d..615e1d5a9d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableView.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableView.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableView.h
index f62f4eb009..3adf3bc2a8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableView.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDetailsTableView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDialog.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDialog.cpp
index a2aeb89a06..7c6f8979b1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDialog.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDialog.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDialog.h
index 0617f921a1..6428bdb548 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDialog.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDockWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDockWidget.cpp
index 9667be70d0..92355e03a3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDockWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDockWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDockWidget.h
index 96e168f2bd..7400937593 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDockWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledLineEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledLineEdit.cpp
index b1f697963f..e9228c8c42 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledLineEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledLineEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledLineEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledLineEdit.h
index 50d8b054b2..73ea93cfbe 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledLineEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledLineEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledSpinBox.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledSpinBox.cpp
index 8edcc2eb07..1aa9115e4b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledSpinBox.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledSpinBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledSpinBox.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledSpinBox.h
index ea06a6009e..d80ecae2f9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledSpinBox.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StyledSpinBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StylesheetPreprocessor.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/StylesheetPreprocessor.cpp
index 0d15e8ff2a..b91bac83df 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StylesheetPreprocessor.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StylesheetPreprocessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/StylesheetPreprocessor.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/StylesheetPreprocessor.h
index 27af40c839..f6d43eb54b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/StylesheetPreprocessor.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/StylesheetPreprocessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/TagSelector.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/TagSelector.cpp
index ea635419ed..2f77f3d379 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/TagSelector.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/TagSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/TagSelector.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/TagSelector.h
index 981f992b51..9ecb0bd4ae 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/TagSelector.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/TagSelector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler.cpp
index 65438d81b2..8f866f4278 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler.h
index e4fc27bf89..0935a9bf3d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler_win.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler_win.cpp
index 86d6dc7cbe..2feff22bb3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler_win.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler_win.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler_win.h
index fa0b22f11f..ab9e0d68be 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler_win.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawHandler_win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawScreenHandler_win.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawScreenHandler_win.cpp
index d0a8412818..8a3fcdcd8e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawScreenHandler_win.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawScreenHandler_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawScreenHandler_win.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawScreenHandler_win.h
index 3646e450c1..c48409b678 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawScreenHandler_win.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/TitleBarOverdrawScreenHandler_win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Titlebar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Titlebar.cpp
index dbff0d3304..2e80578ee6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Titlebar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Titlebar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Titlebar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Titlebar.h
index ac5328b10e..28d366a016 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Titlebar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Titlebar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolBarArea.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolBarArea.cpp
index df1efff133..abfce53378 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolBarArea.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolBarArea.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolBarArea.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolBarArea.h
index 09960b10da..26135f47ea 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolBarArea.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolBarArea.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonComboBox.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonComboBox.cpp
index 6a0772c89c..403279f4fb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonComboBox.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonComboBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonComboBox.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonComboBox.h
index 4d0f1f14c7..698805c2f0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonComboBox.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonComboBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonLineEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonLineEdit.cpp
index 4c8ac797e7..d8892495c0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonLineEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonLineEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonLineEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonLineEdit.h
index f6d0239163..e6bf60a461 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonLineEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonLineEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonWithWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonWithWidget.cpp
index 419d97cd3e..0c3354e3d4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonWithWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonWithWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonWithWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonWithWidget.h
index 880faf0167..a736ba5479 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonWithWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/ToolButtonWithWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/VectorEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/VectorEdit.cpp
index 0a8bf09940..a202e663a6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/VectorEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/VectorEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/VectorEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/VectorEdit.h
index 5f4f24cafe..2d4aef65c7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/VectorEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/VectorEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.cpp
index 573a887809..e136282c32 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.h
index ca571b4f22..b625a2484b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.qss
index 27e3d0e255..cc71b0292a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderListView.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderThumbnailView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderThumbnailView.cpp
index 2a082b5bb2..13e013dc28 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderThumbnailView.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderThumbnailView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderThumbnailView.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderThumbnailView.h
index 846e1a1d23..411f76a568 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderThumbnailView.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/AssetFolderThumbnailView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss
index ed0ae1c043..894b2921d4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -53,7 +53,7 @@ QMainWindow:separator
 
 QMainWindow::separator:hover
 {
-    background-color: #00A1C9;
+    background-color: #1E70EB;
 }
 
 QMainWindow,
@@ -107,7 +107,7 @@ QPlainTextEdit:focus
 {
     margin: 1px;
     border-width: 1px;
-    border-color: #00A1C9;
+    border-color: #94D2FF;
     background-color: #FFFFFF;
 }
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.cpp
index 5f10aa18ef..7b7c96f6c9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.h
index 30bd633c56..26a9125a0d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.qss
index d57c97c8a8..581aafa246 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BreadCrumbs.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp
index 81756d974a..f6d9c74850 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.h
index 5d4d9be5e4..e684bef9fc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.qss
index 841a28195b..7784c852e0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp
index 0712b7f551..c2b3fabc3e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.h
index 178b8c65f4..e6f1dd35e4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss
index 9c9ffa1bbb..230a7b0b74 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -33,7 +33,7 @@ AzQtComponents--Card #contentContainer
 
 AzQtComponents--Card[selected="true"] > #contentContainer
 {
-    border: 1px solid #00A1C9;
+    border: 1px solid #94D2FF;
     border-top: none;
 }
 
@@ -99,7 +99,7 @@ AzQtComponents--CardHeader #Background
 
 AzQtComponents--Card[selected="true"] > AzQtComponents--CardHeader #Background
 {
-    border: 1px solid #00A1C9;
+    border: 1px solid #94D2FF;
     border-bottom: none;
     border-top-left-radius: 2px;
     border-top-right-radius: 2px;
@@ -107,7 +107,7 @@ AzQtComponents--Card[selected="true"] > AzQtComponents--CardHeader #Background
 
 AzQtComponents--Card[selected="true"][expanded="false"] > AzQtComponents--CardHeader #Background
 {
-    border: 1px solid #00A1C9;
+    border: 1px solid #94D2FF;
     border-radius: 2px
 }
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardHeader.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardHeader.cpp
index 5a8b750130..bcad9c9c28 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardHeader.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardHeader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardHeader.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardHeader.h
index 689e40edb3..1fe000ce42 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardHeader.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardNotification.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardNotification.cpp
index 142f7a6f47..241cce723d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardNotification.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardNotification.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardNotification.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardNotification.h
index fbbd895698..1b491562b1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardNotification.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CardNotification.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.cpp
index c636f4c2c0..5f4b72538c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.h
index 795730a5a7..ed98b430e7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.qss
index 1cd6b2f4fb..45cde77f42 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/CheckBox.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.cpp
index 1c10b0c7dd..5abca5e999 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.h
index 6cdfe826dd..3992f8d6f0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.qss
index 9610af6ae5..20a1d3448e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorLabel.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.cpp
index a250a89edb..bab5044d8f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.h
index 439384d203..9c21ca091f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.qss
index 377ea69eac..b3c1fccb8b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorComponentSliders.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorComponentSliders.cpp
index 2b914142c7..dc33ab730c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorComponentSliders.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorComponentSliders.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorComponentSliders.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorComponentSliders.h
index fd51ac6b73..d9a167e059 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorComponentSliders.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorComponentSliders.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp
index 17482ab832..010e44c22c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.h
index 4d0931ec52..49e51c232b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorGrid.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorGrid.cpp
index 6eac672fd4..b92b18826c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorGrid.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorGrid.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorGrid.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorGrid.h
index debce4f79f..b73d0371f9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorGrid.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorGrid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorHexEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorHexEdit.cpp
index e37a677e9b..b77137a24b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorHexEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorHexEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorHexEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorHexEdit.h
index 96122b3f11..2f3667025a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorHexEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorHexEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorPreview.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorPreview.cpp
index 67cb89793f..23d9ba9ab7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorPreview.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorPreview.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorPreview.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorPreview.h
index 354419a1aa..d400cfc599 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorPreview.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorPreview.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorRGBAEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorRGBAEdit.cpp
index ff92d9be29..61a3bfbe6f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorRGBAEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorRGBAEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorRGBAEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorRGBAEdit.h
index e28540eb91..530fc2beb1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorRGBAEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorRGBAEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorValidator.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorValidator.cpp
index e9857a7e71..959a49277a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorValidator.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorValidator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorValidator.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorValidator.h
index e898e2a098..68df197191 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorValidator.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorWarning.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorWarning.cpp
index 7439f21f28..8aea7f64be 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorWarning.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorWarning.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorWarning.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorWarning.h
index 92dd2c283a..64072824a1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorWarning.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorWarning.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/GammaEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/GammaEdit.cpp
index 77c0f5e285..08cc7154c9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/GammaEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/GammaEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/GammaEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/GammaEdit.h
index 481abf7c31..1448c7c45c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/GammaEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/GammaEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Palette.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Palette.cpp
index 460e291fff..7be0f99e56 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Palette.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Palette.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Palette.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Palette.h
index e2bfc2c022..155c0c03bd 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Palette.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Palette.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCard.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCard.cpp
index 87c3f84d03..39896bf765 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCard.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCard.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCard.h
index 1a19701c2a..d39ffc5580 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCard.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.cpp
index e9e3d05b74..f9c88b477d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.h
index 4c083829ba..5ee4156ffc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteView.cpp
index fddecc3594..0cdd8dccf6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteView.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteView.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteView.h
index cd97dc1ded..fbb77ecce3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteView.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Swatch.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Swatch.cpp
index 19eccad49e..e39fa749a8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Swatch.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Swatch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Swatch.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Swatch.h
index 3f0ff45fce..38eb64fedb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Swatch.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/Swatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.cpp
index 008f619f94..0aa6264ce8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.h
index 20d4be843a..b82904be9e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss
index 5300e65a6a..ff553467ab 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -35,7 +35,7 @@ QComboBox[HasPopupOpen=true][HasPopupOpen=true]
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #00A1C9;
+    border-color: #94D2FF;
 
     background-color: #FFFFFF;
 }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DialogButtonBox.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DialogButtonBox.cpp
index e004461ed4..a98cf4ef49 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DialogButtonBox.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DialogButtonBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DialogButtonBox.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DialogButtonBox.h
index 373fe2025f..f0a514535f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DialogButtonBox.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DialogButtonBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp
index 82723285b9..eb80d73f2e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -47,10 +47,10 @@ namespace AzQtComponents
         config.dropIndicator.ballDiameter = 5;
         config.dropIndicator.ballOutlineWidth = 1;
 
-        config.dropIndicator.rectOutlineColor = QColor("#00A1C9");
-        config.dropIndicator.lineSeparatorColor = QColor("#00A1C9");
+        config.dropIndicator.rectOutlineColor = QColor("#94D2FF");
+        config.dropIndicator.lineSeparatorColor = QColor("#94D2FF");
         config.dropIndicator.ballFillColor = QColor("#444444");
-        config.dropIndicator.ballOutlineColor = QColor("#00A1C9");
+        config.dropIndicator.ballOutlineColor = QColor("#94D2FF");
 
         config.dragIndicator.rectBorderRadius = 2;
         config.dragIndicator.rectFillColor = QColor("#888888");
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.h
index 4754446037..f3e6ef52f4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini
index 14aca1f9d4..e0dd79b5d4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini
@@ -1,9 +1,9 @@
 [DropIndicator]
 rectOutlineWidth=1
-rectOutlineColor=#00A1C9
+rectOutlineColor=#94D2FF
 ballFillColor=#0x444444
-ballOutlineColor=#00A1C9
-lineSeparatorColor=#00A1C9
+ballOutlineColor=#94D2FF
+lineSeparatorColor=#94D2FF
 lineSeparatorOutlineWidth=1
 ballDiameter=5
 ballOutlineWidth=1
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ElidingLabel.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ElidingLabel.cpp
index c3375d02dd..950c4a4029 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ElidingLabel.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ElidingLabel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ElidingLabel.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ElidingLabel.h
index 60127837c8..96674b85b4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ElidingLabel.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ElidingLabel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.cpp
index fcc029f7db..f38888f474 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.h
index 91a5c3e68b..6d241909f4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/FilteredSearchWidget.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/FilteredSearchWidget.qss
index c88e62b5ff..4498b1b627 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/FilteredSearchWidget.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/FilteredSearchWidget.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.cpp
index b9642ce807..4178d542ef 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.h
index 752d55123b..ea6dbd65d2 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp
index 4ca442b3e9..9d84bbfa5e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h
index 2f78d0040c..86cb64ad0a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp
index b96f4f9002..a5adec9423 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -471,7 +471,7 @@ namespace AzQtComponents
         config.hoverBackgroundColor = QColor("#FFFFFF");
         config.hoverBorderColor = QColor("#222222");
         config.hoverLineWidth = 1;
-        config.focusedBorderColor = QColor("#00A1C9");
+        config.focusedBorderColor = QColor("#94D2FF");
         config.focusedLineWidth = 1;
         config.errorBorderColor = QColor("#E25243");
         config.errorLineWidth = 2;
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.h
index e6ec6d1886..7ab2b1efaf 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.qss
index 314d3c934d..bce318e115 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LogicalTabOrderingWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LogicalTabOrderingWidget.cpp
index 4fdb78211a..c1ba167354 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LogicalTabOrderingWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LogicalTabOrderingWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LogicalTabOrderingWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LogicalTabOrderingWidget.h
index 2365922818..822142fe1d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LogicalTabOrderingWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LogicalTabOrderingWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.cpp
index accce27d54..5e2d61c795 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.h
index c292310dea..68e7ab5c29 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.qss
index 1e07b044c1..67b006d880 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MenuBar.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MenuBar.qss
index b51cdcf60c..a69c6a6db5 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MenuBar.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MenuBar.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.cpp
index ea20a713bb..3ab3475954 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.h
index 4e4c5d8334..aef86f6a5b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/OverlayWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/OverlayWidget.cpp
index f65b21c84f..68616ad9d3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/OverlayWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/OverlayWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/OverlayWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/OverlayWidget.h
index 9cf330952c..ccf7a5cf62 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/OverlayWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/OverlayWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.cpp
index 939a253257..dba32dd60f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.h
index 4164738f0b..f1d923354b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss
index 527bdf6fdf..565acd1987 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp
index c8d203034e..aa1e242b76 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -442,7 +442,7 @@ PushButton::Config PushButton::defaultConfig()
     config.smallIcon.width = 24;
     config.smallIcon.arrowWidth = 10;
 
-    config.iconButton.activeColor = QColor("#00A1C9");
+    config.iconButton.activeColor = QColor("#94D2FF");
     config.iconButton.disabledColor = QColor("#999999");
     config.iconButton.selectedColor = QColor("#FFFFFF");
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.h
index 34cd257f48..27ac7e9cd3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.qss
index 568c8ac2d2..1752424ff0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini
index 34c084b0f2..897e894a31 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini
@@ -45,7 +45,7 @@ Thickness=1
 Color=#4B8CEF
 
 [IconButton]
-ActiveColor=#1E70EB
+ActiveColor=#94D2FF
 DisabledColor=#999999
 SelectedColor=#FFFFFF
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/QDockWidget.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/QDockWidget.qss
index d578d17eca..79320c9479 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/QDockWidget.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/QDockWidget.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.cpp
index 75119c9bb3..ff8c094268 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.h
index 75e7a3478e..d28853f5c9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.qss
index 8eebefba8a..772de7b2e0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/RadioButton.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ReflectedPropertyEditor.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ReflectedPropertyEditor.qss
index e164e95b26..b141e1296d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ReflectedPropertyEditor.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ReflectedPropertyEditor.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.cpp
index 5b75e2a8ee..e9a047ced1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.h
index 5db373f0b1..cd9533846c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.qss
index 4472288f4b..b586748cad 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ScrollBar.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentBar.cpp
index 02a0ddd16d..2e2119fb68 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentBar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentBar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentBar.h
index 0c96b2e59d..fc4c61d6e6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentBar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.cpp
index 7d7926e006..01125774ae 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.h
index cac88cc6a5..bdb764fd31 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.qss
index 0f47363759..1f7e34bee1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SegmentControl.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.cpp
index 1dcaaffd03..411cddc24d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.h
index cae3c24883..ec07d03596 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.qss
index 5349c9ea3e..9191139607 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderCombo.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderCombo.cpp
index 22df61df2b..f8c43a0932 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderCombo.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderCombo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderCombo.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderCombo.h
index d163aeab69..fa62ded371 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderCombo.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderCombo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.cpp
index 85b449bcd4..c9a7779b65 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.h
index 4955fe85d5..cf4269f2b7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss
index 35d27d6eaa..1261893f90 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -41,7 +41,7 @@ QDoubleSpinBox:hover
 QSpinBox:focus,
 QDoubleSpinBox:focus
 {
-    border-color: #00A1C9;
+    border-color: #94D2FF;
     background-color: #FFFFFF;
 }
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss
index b032b6bdbe..18b2d81842 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -19,5 +19,5 @@ QSplitter::handle:vertical {
 
 QSplitter::handle:hover
 {
-    background-color: #00A1C9;
+    background-color: #1E70EB;
 }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StatusBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StatusBar.cpp
index d5f290b0e4..df752c3cc2 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StatusBar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StatusBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StatusBar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StatusBar.h
index fa58af6e5f..227ff35708 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StatusBar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StatusBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StyledDockWidget.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StyledDockWidget.qss
index 3a19aef9c4..fce0770ee1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StyledDockWidget.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/StyledDockWidget.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
index 6ad3069b28..7fdbd98640 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
index 5aee614e15..946a57187f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.qss
index 174af7e488..92b6a68998 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidget.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidgetActionToolBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidgetActionToolBar.cpp
index 8dc0579f74..fb60a77091 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidgetActionToolBar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidgetActionToolBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidgetActionToolBar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidgetActionToolBar.h
index 99b8b06199..c8b046cda0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidgetActionToolBar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TabWidgetActionToolBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp
index c57ed22c15..7ecada1c15 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -49,7 +49,7 @@ namespace AzQtComponents
         config.borderWidth = 1;
         config.borderColor = QStringLiteral("#dddddd");
         config.focusBorderWidth = 1;
-        config.focusBorderColor = QStringLiteral("#00a1c9");
+        config.focusBorderColor = QStringLiteral("#94D2FF");
         config.focusFillColor = QStringLiteral("#10ffffff");
         config.headerFillColor = QStringLiteral("#2d2d2d");
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.h
index 79bd483d48..258b025a51 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.qss
index 09c7270504..b6dca72ebc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp
index d8e6ab69f0..0550703f60 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.h
index 44dd21c065..eb80711c6a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.qss
index e04196af98..56b4321c82 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TitleBar.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TitleBar.qss
index a27de8b87e..aa3c2f444a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TitleBar.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TitleBar.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.cpp
index 7b0dfd5fa5..80bd80d2ef 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.h
index a9e33464b7..38f631c9cb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.qss
index 9fdac241b8..49fea8cad9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolBar.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp
index 0efb5b9f1b..7bad3586a2 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -42,7 +42,7 @@ ToolButton::Config ToolButton::defaultConfig()
     config.buttonIconSize = 16;
     config.defaultButtonMargin = 1;
     config.menuIndicatorWidth = 10;
-    config.checkedStateBackgroundColor = QStringLiteral("#00A1C9");
+    config.checkedStateBackgroundColor = QStringLiteral("#1E70EB");
     config.menuIndicatorIcon = QStringLiteral(":/stylesheet/img/UI20/menu-indicator.svg");
     config.menuIndicatorIconSize = QSize(6, 3);
 
@@ -200,13 +200,6 @@ bool ToolButton::drawToolButton(const Style* style, const QStyleOptionComplex* o
 
         const QRect highlightRect = buttonOption->rect;
         painter->drawRect(highlightRect);
-
-        if (buttonOption->state & QStyle::State_MouseOver)
-        {
-            // If a checkable QToolButton is checked, don't use the Active icon
-            // color - it is the same as the background color.
-            label.state.setFlag(QStyle::State_MouseOver, false);
-        }
     }
 
     label.rect = buttonRect;
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.h
index adc526b2c4..88eb9948fb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolTip.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolTip.qss
index 7322c4a813..7f3150b05c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolTip.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolTip.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TreeView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TreeView.cpp
index 785b623326..7460070c55 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TreeView.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TreeView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TreeView.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TreeView.h
index 9aa9e0254a..aa59dcb065 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TreeView.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TreeView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.cpp
index e012a10ef0..2969685bdc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.h
index 17eacea8dd..034b6f39d7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.qss
index 73c5403efb..0781cba32e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/WindowDecorationWrapper.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/WindowDecorationWrapper.qss
index 9000f08206..c2fbf3c82b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/WindowDecorationWrapper.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/WindowDecorationWrapper.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.cpp
index fdb6322e9e..66f85e7fed 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.h
index c6b81d777f..f7cab3ee77 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
index d6cd99b1d9..20a25f8fcb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
@@ -395,8 +395,8 @@
     <file>img/line.png</file>
 </qresource>
 <qresource>
-    <file alias="Assets/Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json</file>
-    <file alias="Assets/Editor/Style/NewEditorStylesheet.qss">../../../../Sandbox/Editor/Style/NewEditorStylesheet.qss</file>
+    <file alias="Assets/Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Editor/Style/EditorStylesheetVariables_Dark.json</file>
+    <file alias="Assets/Editor/Style/NewEditorStylesheet.qss">../../../../Editor/Style/NewEditorStylesheet.qss</file>
 </qresource>
 <qresource prefix="/Cards">
     <file>img/UI20/Cards/point_hand.png</file>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h b/Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h
index 4de1aa7d3e..b0fbdcc340 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/ViewportDragAndDrop.h b/Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/ViewportDragAndDrop.h
index e3b23cdc1d..4f61e4bf60 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/ViewportDragAndDrop.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/ViewportDragAndDrop.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/AssetBrowserFolderPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/AssetBrowserFolderPage.cpp
index 128884ea40..f8559847f2 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/AssetBrowserFolderPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/AssetBrowserFolderPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/AssetBrowserFolderPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/AssetBrowserFolderPage.h
index 13b11dc310..82f461fd46 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/AssetBrowserFolderPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/AssetBrowserFolderPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BreadCrumbsPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BreadCrumbsPage.cpp
index 20f2a4f768..4e295e9496 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BreadCrumbsPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BreadCrumbsPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BreadCrumbsPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BreadCrumbsPage.h
index 6e2e98847a..f82a02016a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BreadCrumbsPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BreadCrumbsPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BrowseEditPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BrowseEditPage.cpp
index 669b69c270..333923c17a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BrowseEditPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BrowseEditPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BrowseEditPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BrowseEditPage.h
index e894a1f67f..4ac83af59a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BrowseEditPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/BrowseEditPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.cpp
index f85a095afb..9a17180c56 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.h
index 84df92139b..7b1c3c9dc3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui
index 11500dac62..b8870340a1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui
@@ -236,8 +236,10 @@
        <item row="1" column="1">
         <widget class="QLabel" name="toolButtonHoverLabel">
          <property name="text">
-          <string>Hover state
-#00A1C9</string>
+          <string>
+            Hover state
+            #94D2FF
+          </string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -247,8 +249,10 @@
        <item row="1" column="3">
         <widget class="QLabel" name="toolButtonSelectedLabel">
          <property name="text">
-          <string>Selected state
-#00A1C9</string>
+          <string>
+            Selected state
+            #1E70EB
+          </string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CardPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CardPage.cpp
index 5964b1546f..83b4a700db 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CardPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CardPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CardPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CardPage.h
index ebb3d21d59..8f561c5b33 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CardPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CardPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CheckBoxPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CheckBoxPage.cpp
index b7f8f6daf4..f6d6fc3132 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CheckBoxPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CheckBoxPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CheckBoxPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CheckBoxPage.h
index 1ff7e17d2a..8ce74f5756 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CheckBoxPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/CheckBoxPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorLabelPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorLabelPage.cpp
index 24d572fe15..eb0ae43627 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorLabelPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorLabelPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorLabelPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorLabelPage.h
index 9e19b51d09..187d1a7b24 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorLabelPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorLabelPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorPickerPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorPickerPage.cpp
index 5258fbea82..fa99319953 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorPickerPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorPickerPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorPickerPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorPickerPage.h
index c80f8fd43b..955c896253 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorPickerPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ColorPickerPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComboBoxPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComboBoxPage.cpp
index e94e84bb76..f53869527d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComboBoxPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComboBoxPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComboBoxPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComboBoxPage.h
index 6e0a9545cb..e918294fca 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComboBoxPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComboBoxPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComponentDemoWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComponentDemoWidget.cpp
index 582890363a..e2bf67db76 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComponentDemoWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComponentDemoWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComponentDemoWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComponentDemoWidget.h
index 70fdf1d8d5..acc8041718 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComponentDemoWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ComponentDemoWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/DragAndDropPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/DragAndDropPage.cpp
index 1f2850e012..5f42d5d4a4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/DragAndDropPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/DragAndDropPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/DragAndDropPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/DragAndDropPage.h
index d12db47c44..3a7b9a6505 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/DragAndDropPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/DragAndDropPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ExampleWidget.qss b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ExampleWidget.qss
index 3d7d58fd2e..f084d5c8af 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ExampleWidget.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ExampleWidget.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FilteredSearchWidgetPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FilteredSearchWidgetPage.cpp
index fa9645ed24..11e15ff072 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FilteredSearchWidgetPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FilteredSearchWidgetPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FilteredSearchWidgetPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FilteredSearchWidgetPage.h
index 6c2dee659a..110c525a79 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FilteredSearchWidgetPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FilteredSearchWidgetPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FixedStateButton.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FixedStateButton.cpp
index 265dfd3ac6..3691ce7750 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FixedStateButton.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FixedStateButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FixedStateButton.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FixedStateButton.h
index 6c41640b33..f9eda0f274 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FixedStateButton.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/FixedStateButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/GradientSliderPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/GradientSliderPage.cpp
index 28e44932a6..e1edc85a82 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/GradientSliderPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/GradientSliderPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/GradientSliderPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/GradientSliderPage.h
index c3b0db7cee..06c97efdd5 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/GradientSliderPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/GradientSliderPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/HyperlinkPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/HyperlinkPage.cpp
index 9d6de91745..c0cba45898 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/HyperlinkPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/HyperlinkPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/HyperlinkPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/HyperlinkPage.h
index 25bd2ed181..a13469ee8c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/HyperlinkPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/HyperlinkPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/LineEditPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/LineEditPage.cpp
index d6bbcbcb1c..2489ccfe8d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/LineEditPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/LineEditPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/LineEditPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/LineEditPage.h
index 3e6124842f..9f865b2edb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/LineEditPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/LineEditPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.cpp
index dc7e71be24..9f21a73f32 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.h
index 187148b536..b2b3fc1dbc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ProgressIndicatorPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ProgressIndicatorPage.cpp
index d3be6eb398..1459c85ee2 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ProgressIndicatorPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ProgressIndicatorPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ProgressIndicatorPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ProgressIndicatorPage.h
index f1f41200ed..bbf366b0f3 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ProgressIndicatorPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ProgressIndicatorPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/RadioButtonPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/RadioButtonPage.cpp
index 3769fd45d7..3586ac8bf1 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/RadioButtonPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/RadioButtonPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/RadioButtonPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/RadioButtonPage.h
index 244243db72..5a4a038497 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/RadioButtonPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/RadioButtonPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ReflectedPropertyEditorPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ReflectedPropertyEditorPage.cpp
index 3ed448b1c2..ea1d85eee7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ReflectedPropertyEditorPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ReflectedPropertyEditorPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ReflectedPropertyEditorPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ReflectedPropertyEditorPage.h
index 504a1adfe2..327a52e600 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ReflectedPropertyEditorPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ReflectedPropertyEditorPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ScrollBarPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ScrollBarPage.cpp
index 5b0b79d160..437bb22e25 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ScrollBarPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ScrollBarPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ScrollBarPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ScrollBarPage.h
index 408d67f432..d80839ba36 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ScrollBarPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ScrollBarPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SegmentControlPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SegmentControlPage.cpp
index 779d5ded77..c63ce3e614 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SegmentControlPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SegmentControlPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SegmentControlPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SegmentControlPage.h
index dd457c63a7..de6340f9bb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SegmentControlPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SegmentControlPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderComboPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderComboPage.cpp
index eaa2fe8795..bd92e278cd 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderComboPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderComboPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderComboPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderComboPage.h
index 1cc92b86ce..b65b5aed36 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderComboPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderComboPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderPage.cpp
index 8a7f5d50fb..c72f8d24fc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderPage.h
index 4c1cc2adc4..d67287e20c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SliderPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SpinBoxPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SpinBoxPage.cpp
index ab81db5fbf..5026c9679e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SpinBoxPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SpinBoxPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SpinBoxPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SpinBoxPage.h
index 064e559bb1..22f9dff1db 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SpinBoxPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SpinBoxPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SplitterPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SplitterPage.cpp
index 3788551ced..f35d1a1fab 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SplitterPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SplitterPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SplitterPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SplitterPage.h
index 0ac3f788b8..e4f517834e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SplitterPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SplitterPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetLabel.qss b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetLabel.qss
index 42f06577c9..c2614fe876 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetLabel.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetLabel.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.cpp
index e4e55277ac..258d305f49 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.h
index aaa4e54a58..4a19711300 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.qss b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.qss
index e0be6c11d5..a6f72faa64 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetPage.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetView.qss b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetView.qss
index 9d7b282dd2..ed1fe60922 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetView.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyleSheetView.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyledDockWidgetPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyledDockWidgetPage.cpp
index 05dcbdc2b5..e6f15c78d0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyledDockWidgetPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyledDockWidgetPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyledDockWidgetPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyledDockWidgetPage.h
index 79e1b3dd22..96473b075f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyledDockWidgetPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/StyledDockWidgetPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SvgLabelPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SvgLabelPage.cpp
index 0f3d39e30b..3425182a3f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SvgLabelPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SvgLabelPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SvgLabelPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SvgLabelPage.h
index cad7ff0f57..496b0e93db 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SvgLabelPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/SvgLabelPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TabWidgetPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TabWidgetPage.cpp
index e061cecf40..716c5138f8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TabWidgetPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TabWidgetPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TabWidgetPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TabWidgetPage.h
index 481ac6a5fa..977cc541ae 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TabWidgetPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TabWidgetPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TableViewPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TableViewPage.cpp
index e3d27224f9..59a17ec49d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TableViewPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TableViewPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TableViewPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TableViewPage.h
index 4901b17136..de7e57eaf4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TableViewPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TableViewPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TitleBarPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TitleBarPage.cpp
index 9bcc506497..151e5a503e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TitleBarPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TitleBarPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TitleBarPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TitleBarPage.h
index d578c3c5b6..5087f94a54 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TitleBarPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TitleBarPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToggleSwitchPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToggleSwitchPage.cpp
index 91719c557f..c0836cabb2 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToggleSwitchPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToggleSwitchPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToggleSwitchPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToggleSwitchPage.h
index 97d61c6029..ef45e33d51 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToggleSwitchPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToggleSwitchPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToolBarPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToolBarPage.cpp
index 23446672c4..78477320a5 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToolBarPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToolBarPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToolBarPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToolBarPage.h
index 075cc4985d..43f5e69d36 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToolBarPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ToolBarPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TreeViewPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TreeViewPage.cpp
index 896fd0471f..305ac4801f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TreeViewPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TreeViewPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TreeViewPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TreeViewPage.h
index 4423e7a683..36dadbf99b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TreeViewPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TreeViewPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TypographyPage.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TypographyPage.cpp
index fa19f10d4e..e235a862be 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TypographyPage.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TypographyPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TypographyPage.h b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TypographyPage.h
index 5f06cc8f70..a232f51dd7 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TypographyPage.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/TypographyPage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Gallery/main.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/main.cpp
index 01c935323d..055b672494 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/main.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -129,8 +129,8 @@ int main(int argc, char **argv)
 {
     ComponentApplicationWrapper componentApplicationWrapper;
 
-    QApplication::setOrganizationName("Amazon");
-    QApplication::setOrganizationDomain("amazon.com");
+    QApplication::setOrganizationName("O3DE");
+    QApplication::setOrganizationDomain("o3de.org");
     QApplication::setApplicationName("O3DEWidgetGallery");
 
     QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg
index 324eacf60e..924fb353c8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg
@@ -2,6 +2,6 @@
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>icon  / prefab / default</title>
     <g id="icon-/-prefab-/-default" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M9.01093446,0.257293069 L14.9911739,3.62370791 C15.3058938,3.80087098 15.5006326,4.13396751 15.5006326,4.49512584 L15.5006328,11.4931225 C15.5006328,11.8624338 15.2970852,12.2016805 14.9712226,12.3754746 L8.48752208,15.8334626 C8.19400447,15.990006 7.84185823,15.9903446 7.54804013,15.8343659 L1.03174045,12.3750698 C0.70493456,12.2015789 0.500632643,11.861816 0.500632639,11.4918144 L0.500632563,4.49769236 C0.500632559,4.13516649 0.696835902,3.80103179 1.01342467,3.62440633 L7.05543612,0.253556938 C7.66348099,-0.0856724221 8.40419027,-0.0842572398 9.01093446,0.257293069 Z M8.44349404,1.4553223 L8.44349404,3.95766864 L11.5129336,5.75047713 L8.11643669,7.55905296 L4.48837667,5.75047713 L7.67766332,3.95766864 L7.67766332,1.4553223 L1.898437,4.60740364 L1.898437,10.8388369 L4.13088856,9.66309228 L4.13088856,6.24729579 L7.67766332,8.22739656 L7.67766332,11.8739531 L4.48837667,10.3290206 L2.15275043,11.4618665 L8.01645,14.6038628 L13.831895,11.4618665 L11.5129336,10.3290206 L8.44349404,11.8739531 L8.44349404,8.22739656 L11.8791162,6.24729579 L11.8791162,9.66309228 L14.134463,10.8388369 L14.134463,4.60740364 L8.44349404,1.4553223 Z" id="Combined-Shape-Copy" fill="#4A90E2"></path>
+        <path d="M9.01093446,0.257293069 L14.9911739,3.62370791 C15.3058938,3.80087098 15.5006326,4.13396751 15.5006326,4.49512584 L15.5006328,11.4931225 C15.5006328,11.8624338 15.2970852,12.2016805 14.9712226,12.3754746 L8.48752208,15.8334626 C8.19400447,15.990006 7.84185823,15.9903446 7.54804013,15.8343659 L1.03174045,12.3750698 C0.70493456,12.2015789 0.500632643,11.861816 0.500632639,11.4918144 L0.500632563,4.49769236 C0.500632559,4.13516649 0.696835902,3.80103179 1.01342467,3.62440633 L7.05543612,0.253556938 C7.66348099,-0.0856724221 8.40419027,-0.0842572398 9.01093446,0.257293069 Z M8.44349404,1.4553223 L8.44349404,3.95766864 L11.5129336,5.75047713 L8.11643669,7.55905296 L4.48837667,5.75047713 L7.67766332,3.95766864 L7.67766332,1.4553223 L1.898437,4.60740364 L1.898437,10.8388369 L4.13088856,9.66309228 L4.13088856,6.24729579 L7.67766332,8.22739656 L7.67766332,11.8739531 L4.48837667,10.3290206 L2.15275043,11.4618665 L8.01645,14.6038628 L13.831895,11.4618665 L11.5129336,10.3290206 L8.44349404,11.8739531 L8.44349404,8.22739656 L11.8791162,6.24729579 L11.8791162,9.66309228 L14.134463,10.8388369 L14.134463,4.60740364 L8.44349404,1.4553223 Z" id="Combined-Shape-Copy" fill="#1E70EB"></path>
     </g>
 </svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg
index e782a7066a..41f9638134 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg
@@ -1,24 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Helpers Icon</title>
-    <defs>
-        <circle id="path-1" cx="8" cy="8" r="8"></circle>
-        <path d="M8.59736328,10.1821289 L8.59736328,9.79394531 C8.59736328,9.07617188 8.86835937,8.71728516 9.84248047,8.15332031 C10.8751953,7.54541016 11.4098633,6.77636719 11.4098633,5.67041016 C11.4098633,4.00048828 10.0255859,2.8359375 7.93085937,2.8359375 C5.68232422,2.8359375 4.40791016,4.09570312 4.37128906,5.89746094 L6.35615234,5.89746094 C6.40009766,5.06982422 6.95673828,4.53515625 7.79902344,4.53515625 C8.63398437,4.53515625 9.190625,5.04052734 9.190625,5.73632812 C9.190625,6.43212891 8.90498047,6.79101562 7.96015625,7.35498047 C6.94941406,7.94824219 6.54658203,8.60742188 6.64179687,9.75732422 L6.65644531,10.1821289 L8.59736328,10.1821289 Z M7.70380859,13.7124023 C8.52412109,13.7124023 9.02949219,13.2436523 9.02949219,12.4892578 C9.02949219,11.7275391 8.52412109,11.2587891 7.70380859,11.2587891 C6.88349609,11.2587891 6.37080078,11.7275391 6.37080078,12.4892578 C6.37080078,13.2436523 6.88349609,13.7124023 7.70380859,13.7124023 Z" id="path-3"></path>
-    </defs>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="2nd-ToolBar-v2-(Perspective)-3" transform="translate(-1161.000000, -7.000000)">
-            <g id="2nd-ToolBar-buttons-on-right" transform="translate(1076.000000, 5.000000)">
-                <g id="Helpers-Icon" transform="translate(85.000000, 2.000000)">
-                    <mask id="mask-2" fill="white">
-                        <use xlink:href="#path-1"></use>
-                    </mask>
-                    <use id="Oval" fill="#FFFFFF" xlink:href="#path-1"></use>
-                    <g id="?" fill-rule="nonzero" mask="url(#mask-2)">
-                        <use fill="#909090" xlink:href="#path-3"></use>
-                        <use fill="#3F3F3F" xlink:href="#path-3"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+</style>
+<path class="st0" d="M8,5.511C6.626,5.511,5.511,6.626,5.511,8S6.626,10.489,8,10.489S10.489,9.374,10.489,8S9.374,5.511,8,5.511z
+	 M8,9.694C7.064,9.694,6.306,8.936,6.306,8S7.064,6.306,8,6.306S9.694,7.064,9.694,8S8.936,9.694,8,9.694z"/>
+<path class="st0" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8s8-3.582,8-8S12.418,0,8,0z M8,12.463c-4,0-7.242-2.915-7.242-4.463
+	S4,3.537,8,3.537c4,0,7.242,2.915,7.242,4.463S12,12.463,8,12.463z"/>
+</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default.svg
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_hover.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_hover.svg
new file mode 100644
index 0000000000..fdc98bc788
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_hover.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
+    <title>Outliner / vis &amp; lock / lock / Default - hover</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Outliner-/-vis-&amp;-lock-/-lock-/-Default---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M7.62646385,1.48235749 C9.42626113,1.48235749 10.8852851,2.94138146 10.8852851,4.74117875 L10.8843498,7.34735749 L12.8405779,7.34823575 L12.8405779,14.5176425 L2.41234985,14.5176425 L2.41234985,7.34823575 L9.58134985,7.34735749 L9.5817566,4.74117875 C9.5817566,3.66130038 8.70634222,2.78588599 7.62646385,2.78588599 C7.21874475,2.78588599 6.62971236,2.90054702 6.14480925,3.34844343 C6.01584142,3.46756874 5.88452781,3.71832946 5.75086844,4.10072562 L4.38428828,4.10072562 C4.43323512,3.87757947 4.47506118,3.7202004 4.50976646,3.62858842 C4.59003595,3.41669999 4.80061604,3.0404071 4.86756375,2.94801197 C5.78155489,1.68660458 6.73091609,1.48235749 7.62646385,1.48235749 Z M11.5370494,8.65176425 L3.71587835,8.65176425 L3.71587835,13.214114 L11.5370494,13.214114 L11.5370494,8.65176425 Z M8.2782281,9.95529275 L8.2782281,11.9105855 L6.9746996,11.9105855 L6.9746996,9.95529275 L8.2782281,9.95529275 Z" id="Combined-Shape-Copy-4" fill="#94D2FF"></path>
+    </g>
+</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_transparent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_transparent.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_transparent.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_transparent.svg
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on.svg
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_hover.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_hover.svg
new file mode 100644
index 0000000000..97580d3462
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_hover.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
+    <title>Outliner / vis &amp; lock /lock / on - hover</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Outliner-/-vis-&amp;-lock-/lock-/-on---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8,1.53182564 C9.78613703,1.53182564 11.2340872,2.97977579 11.2340872,4.76591282 L11.2340872,7.35318256 L13.1745395,7.35318256 L13.1745395,14.4681744 L2.82546052,14.4681744 L2.82546052,7.35318256 L4.76591282,7.35318256 L4.76591282,4.76591282 C4.76591282,2.97977579 6.21386297,1.53182564 8,1.53182564 Z M8.64681744,9.94045231 L7.35318256,9.94045231 L7.35318256,11.8809046 L8.64681744,11.8809046 L8.64681744,9.94045231 Z M8,2.82546052 C6.92831778,2.82546052 6.05954769,3.69423061 6.05954769,4.76591282 L6.05954769,4.76591282 L6.05954769,7.35318256 L9.94045231,7.35318256 L9.94045231,4.76591282 C9.94045231,3.69423061 9.07168222,2.82546052 8,2.82546052 Z" id="Combined-Shape" fill="#94D2FF"></path>
+    </g>
+</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_transparent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_transparent.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_transparent.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_transparent.svg
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_a_to_z.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_a_to_z.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_a_to_z.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_a_to_z.svg
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_manually.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_manually.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_manually.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_manually.svg
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_z_to_a.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_z_to_a.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_z_to_a.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_z_to_a.svg
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default.svg
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_hover.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_hover.svg
new file mode 100644
index 0000000000..1d5db1ca6b
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_hover.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
+    <title>Outliner / vis &amp; lock /visible / Default - hover</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Outliner-/-vis-&amp;-lock-/visible-/-Default---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-9" transform="translate(0.500000, 3.500000)" fill="#94D2FF">
+            <path d="M7.31366902,0.423140577 C8.81176272,0.423140577 11.0671071,1.77422153 14.0797023,4.47638343 C11.0671071,7.17854533 8.81176272,8.52962629 7.31366902,8.52962629 C5.81557532,8.52962629 3.56731657,7.17854533 0.568892758,4.47638343 C3.56731657,1.77422153 5.81557532,0.423140577 7.31366902,0.423140577 Z M7.32429752,1.43645129 C5.64538935,1.43645129 4.28436537,2.79747527 4.28436537,4.47638343 C4.28436537,6.15529159 5.64538935,7.51631557 7.32429752,7.51631557 C9.00320568,7.51631557 10.3642297,6.15529159 10.3642297,4.47638343 C10.3642297,2.79747527 9.00320568,1.43645129 7.32429752,1.43645129 Z M7.32429752,2.449762 C8.44356962,2.449762 9.35091894,3.35711132 9.35091894,4.47638343 C9.35091894,5.59565554 8.44356962,6.50300486 7.32429752,6.50300486 C6.20502541,6.50300486 5.29767609,5.59565554 5.29767609,4.47638343 C5.29767609,3.35711132 6.20502541,2.449762 7.32429752,2.449762 Z" id="Combined-Shape-Copy-2"></path>
+        </g>
+    </g>
+</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_transparent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_transparent.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_transparent.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_transparent.svg
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on.svg
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_hover.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_hover.svg
new file mode 100644
index 0000000000..9d453c7eed
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_hover.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
+    <title>Outliner / vis &amp; lock / visible / on - hover</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Outliner-/-vis-&amp;-lock-/-visible-/-on---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Sky-Icon-/-System-/-View" fill="#94D2FF">
+            <path d="M12.0662207,5.86712992 C12.858042,6.44428281 13.7248573,7.1552395 14.6666667,8 C11.6936446,10.6666667 9.46792606,12 7.98951112,12 C7.51688042,12 6.96858989,11.8637332 6.34463953,11.5911997 L7.07876759,10.8559032 C7.36903278,10.9494633 7.67861466,11 8,11 C9.65685425,11 11,9.65685425 11,8 C11,7.67861466 10.9494633,7.36903278 10.8559032,7.07876759 Z M7.98951112,4 C8.76679076,4 9.75063645,4.36855358 10.9410482,5.10566074 L10.1454186,5.90305312 C9.60073119,5.34585444 8.84075491,5 8,5 C6.34314575,5 5,6.34314575 5,8 C5,8.84036125 5.34553064,9.60001949 5.90227058,10.1446534 L5.11233104,10.9366587 C4.02637979,10.2706404 2.76671388,9.29175412 1.33333333,8 C4.29237025,5.33333333 6.51109618,4 7.98951112,4 Z M10.0073333,7.926 L10.0102404,8 C10.0102404,9.1045695 9.1125175,10 8.00512019,10 C7.98181012,10 7.95859295,9.99960325 7.9354751,9.99881616 L10.0073333,7.926 Z M8.00512019,6 C8.5686887,6 9.07795318,6.23190942 9.44222587,6.60527205 L6.6105304,9.43702678 C6.23403952,9.07344399 6,8.56398363 6,8 C6,6.8954305 6.89772289,6 8.00512019,6 Z" id="Combined-Shape"></path>
+            <polygon id="Rectangle-25" transform="translate(7.522750, 7.541445) rotate(45.000000) translate(-7.522750, -7.541445) " points="6.80375237 0.92856205 8.2417471 0.925883489 8.2197393 14.1570058 6.80375237 14.1278886"></polygon>
+        </g>
+    </g>
+</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_transparent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_transparent.svg
similarity index 100%
rename from Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_transparent.svg
rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_transparent.svg
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
index 74610dca90..c72687359b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
@@ -10,11 +10,6 @@
     <qresource prefix="/Level">
         <file alias="level.svg">Level/level.svg</file>
     </qresource>
-    <qresource prefix="/Notifications">
-        <file alias="checkmark.svg">Notifications/checkmark.svg</file>
-        <file alias="download.svg">Notifications/download.svg</file>
-        <file alias="link.svg">Notifications/link.svg</file>
-    </qresource>
     <qresource prefix="/Menu">
         <file alias="resolution.svg">Menu/resolution.svg</file>
         <file alias="debug.svg">Menu/debug.svg</file>
@@ -31,4 +26,26 @@
         <file alias="menu.svg">Menu/menu.svg</file>
         <file alias="helpers.svg">Menu/helpers.svg</file>
     </qresource>
+    <qresource prefix="/Notifications">
+        <file alias="checkmark.svg">Notifications/checkmark.svg</file>
+        <file alias="download.svg">Notifications/download.svg</file>
+        <file alias="link.svg">Notifications/link.svg</file>
+    </qresource>
+    <qresource prefix="/Outliner">
+        <file alias="sort_a_to_z.svg">Outliner/sort_a_to_z.svg</file>
+        <file alias="sort_manually.svg">Outliner/sort_manually.svg</file>
+        <file alias="sort_z_to_a.svg">Outliner/sort_z_to_a.svg</file>
+        <file alias="visibility_default.svg">Outliner/visibility_default.svg</file>
+        <file alias="visibility_default_hover.svg">Outliner/visibility_default_hover.svg</file>
+        <file alias="visibility_default_transparent.svg">Outliner/visibility_default_transparent.svg</file>
+        <file alias="visibility_on.svg">Outliner/visibility_on.svg</file>
+        <file alias="visibility_on_hover.svg">Outliner/visibility_on_hover.svg</file>
+        <file alias="visibility_on_transparent.svg">Outliner/visibility_on_transparent.svg</file>
+        <file alias="lock_default.svg">Outliner/lock_default.svg</file>
+        <file alias="lock_default_hover.svg">Outliner/lock_default_hover.svg</file>
+        <file alias="lock_default_transparent.svg">Outliner/lock_default_transparent.svg</file>
+        <file alias="lock_on.svg">Outliner/lock_on.svg</file>
+        <file alias="lock_on_hover.svg">Outliner/lock_on_hover.svg</file>
+        <file alias="lock_on_transparent.svg">Outliner/lock_on_transparent.svg</file>
+    </qresource>
 </RCC>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzQtComponents/AzQtComponents/Platform/Linux/platform_linux_files.cmake
index 934e6519cb..c734aa03f6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/AzQtComponents/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzQtComponents/AzQtComponents/Platform/Mac/platform_mac_files.cmake
index 2fea039c53..32e168e1f8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/AzQtComponents/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzQtComponents/AzQtComponents/Platform/Windows/platform_windows_files.cmake
index d2690e8b19..06a45b0701 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/AzQtComponents/PropertyEditorStandalone/main.cpp b/Code/Framework/AzQtComponents/AzQtComponents/PropertyEditorStandalone/main.cpp
index 3cc9321a36..0082693c83 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/PropertyEditorStandalone/main.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/PropertyEditorStandalone/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionGroupWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionGroupWidget.cpp
deleted file mode 100644
index a1898cc6ae..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionGroupWidget.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ConditionGroupWidget.h"
-#include "ConditionWidget.h"
-#include <QGridLayout>
-#include <QToolButton>
-#include <QWidgetItem>
-#include <QLayoutItem>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QStyleOptionToolButton>
-
-enum Action {
-    ActionAdd,
-    ActionRemove
-};
-
-class ActionButton : public QToolButton
-{
-public:
-    explicit ActionButton(QWidget *parent = nullptr)
-        : QToolButton(parent)
-    {
-        setAttribute(Qt::WA_Hover);
-    }
-
-    void paintEvent(QPaintEvent *)
-    {
-        QStyleOptionToolButton opt;
-        initStyleOption(&opt);
-        auto state = (opt.state & QStyle::State_Sunken) ? QIcon::Active
-                                                        : ((opt.state & QStyle::State_MouseOver) ? QIcon::Selected
-                                                                                                 : QIcon::Normal);
-
-        QPixmap pix = icon().pixmap(QSize(16, 16), state);
-        QPainter p(this);
-        QRect pixRect = pix.rect();
-        pixRect.moveCenter(rect().center());
-        pixRect.adjust(-2, 1, -2, 1);
-        p.drawPixmap(pixRect , pix);
-    }
-};
-
-ConditionGroupWidget::ConditionGroupWidget(QWidget *parent)
-    : QWidget(parent)
-    , m_layout(new QGridLayout(this))
-{
-    m_addIcon.addPixmap(QPixmap(":/stylesheet/img/condition_add.png"), QIcon::Normal);
-    m_addIcon.addPixmap(QPixmap(":/stylesheet/img/condition_add_hover.png"), QIcon::Selected);
-    m_addIcon.addPixmap(QPixmap(":/stylesheet/img/condition_add_pressed.png"), QIcon::Active);
-
-    m_delIcon.addPixmap(QPixmap(":/stylesheet/img/condition_remove.png"), QIcon::Normal);
-    m_delIcon.addPixmap(QPixmap(":/stylesheet/img/condition_remove_hover.png"), QIcon::Selected);
-    m_delIcon.addPixmap(QPixmap(":/stylesheet/img/condition_remove_pressed.png"), QIcon::Active);
-
-    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-    m_layout->setHorizontalSpacing(0);
-
-    // Lets have at least one condition
-    appendCondition();
-}
-
-void ConditionGroupWidget::appendCondition()
-{
-    auto cond = new ConditionWidget();
-    connect(cond, SIGNAL(geometryChanged()), this, SLOT(update()));
-    m_layout->addWidget(cond, count(), 0);
-    m_layout->addWidget(new ActionButton(), count() - 1, 1);
-    updateButtons();
-}
-
-void ConditionGroupWidget::removeCondition(int n)
-{
-    if (n >= 0 && n < count() && count() > 1) {
-        m_layout->removeItem(m_layout->itemAtPosition(n, 0));
-        m_layout->removeItem(m_layout->itemAtPosition(n, 1));
-        updateButtons();
-    }
-}
-
-int ConditionGroupWidget::count() const
-{
-    return m_layout->rowCount();
-}
-
-void ConditionGroupWidget::paintEvent(QPaintEvent *)
-{
-    const int c = count();
-    for (int i = 0; i < c - 1; ++i) {
-        ConditionWidget *cond1 = conditionAt(i);
-        ConditionWidget *cond2 = conditionAt(i + 1);
-        if (!cond1 || !cond2)
-            continue; // defensive, doesn't happen
-
-        const int separatorHeight = 3;
-        const int y = ((cond1->geometry().bottom() + cond2->y()) / 2) - (separatorHeight / 2);
-        QPainter p(this);
-        p.setPen(QColor(50, 52, 53));
-        p.setBrush(QColor(94, 96, 96));
-        p.drawRoundedRect(QRect(0, y, width() - 1, separatorHeight), 1, 1);
-    }
-}
-
-ConditionWidget *ConditionGroupWidget::conditionAt(int row) const
-{
-    if (row < 0 || row >= count())
-        return nullptr;
-
-    if (auto item = m_layout->itemAtPosition(row, 0))
-        return qobject_cast<ConditionWidget*>(item->widget());
-
-    return nullptr;
-}
-
-void ConditionGroupWidget::updateButtons()
-{
-    update();
-    const int n = count();
-    for (int i = 0; i < n; ++i) {
-        if (auto item = m_layout->itemAtPosition(i, 1)) {
-            if (auto button = qobject_cast<QToolButton*>(item->widget())) {
-                bool isLast = i == n - 1;
-                button->setCheckable(true);
-                button->setChecked(true);
-                button->setIcon(isLast ? m_addIcon : m_delIcon);
-                button->disconnect();
-
-                if (isLast) {
-                    connect(button, &QToolButton::clicked, this, &ConditionGroupWidget::appendCondition);
-                } else {
-                    connect(button, &QToolButton::clicked, this, [this, i] {
-                        removeCondition(i);
-                    });
-                }
-            }
-        }
-    }
-}
-
-#include "StyleGallery/moc_ConditionGroupWidget.cpp"
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionGroupWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionGroupWidget.h
deleted file mode 100644
index ff61a745a6..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionGroupWidget.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CONDITIONGROUPWIDGET_H
-#define CONDITIONGROUPWIDGET_H
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <QIcon>
-#endif
-
-class QGridLayout;
-class ConditionWidget;
-
-class ConditionGroupWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit ConditionGroupWidget(QWidget *parent = nullptr);
-    void appendCondition();
-    void removeCondition(int n);
-    int count() const;
-    void paintEvent(QPaintEvent *) override;
-private:
-    ConditionWidget* conditionAt(int row) const;
-    void updateButtons();
-    QGridLayout *const m_layout;
-    QIcon m_addIcon;
-    QIcon m_delIcon;
-};
-
-#endif
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionWidget.cpp
deleted file mode 100644
index 400dd9f7e7..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionWidget.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ConditionWidget.h"
-#include <QHBoxLayout>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QLineEdit>
-
-ConditionWidget::ConditionWidget(QWidget *parent)
-    : QWidget(parent)
-{
-    auto layout = new QHBoxLayout(this);
-    auto checkbox = new QCheckBox();
-    auto combo1 = new QComboBox();
-    combo1->addItem(QStringLiteral("Asset Type"));
-    combo1->addItem(QStringLiteral("Asset Name"));
-    combo1->setProperty("class", "condition");
-    auto combo2 = new QComboBox();
-    combo2->setFixedWidth(88);
-    combo2->setProperty("class", "condition");
-    combo2->addItem(QStringLiteral("is"));
-    combo2->addItem(QStringLiteral("is not"));
-    auto lineedit = new QLineEdit();
-
-    layout->addWidget(checkbox);
-    layout->addWidget(combo1);
-    layout->addWidget(combo2);
-    layout->addWidget(lineedit);
-    layout->setSpacing(5);
-
-    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-}
-
-void ConditionWidget::resizeEvent(QResizeEvent *event)
-{
-   QWidget::resizeEvent(event);
-   emit geometryChanged();
-}
-
-void ConditionWidget::moveEvent(QMoveEvent *event)
-{
-    QWidget::moveEvent(event);
-    emit geometryChanged();
-}
-
-#include "StyleGallery/moc_ConditionWidget.cpp"
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionWidget.h
deleted file mode 100644
index 75bbab4c9b..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ConditionWidget.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CONDITIONWIDGET_H
-#define CONDITIONWIDGET_H
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-class ConditionWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit ConditionWidget(QWidget *parent = nullptr);
-
-signals:
-    void geometryChanged();
-
-protected:
-    void resizeEvent(QResizeEvent *event) override;
-    void moveEvent(QMoveEvent *event) override;
-};
-
-#endif
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/DeploymentsWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/DeploymentsWidget.cpp
deleted file mode 100644
index 597b33007d..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/DeploymentsWidget.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "DeploymentsWidget.h"
-#include <AzQtComponents/Components/StyledDockWidget.h>
-#include <QPainter>
-#include <QInputDialog>
-
-using namespace AzQtComponents;
-
-DeploymentsWidget::DeploymentsWidget(QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::DeploymentsWidget())
-{
-    setFixedSize(263, 238);
-    ui->setupUi(this);
-    ui->titlebar->setWindowTitleOverride(tr("Deployments"));
-    //ui->titlebar->setFrameHackEnabled(true);
-    ui->titlebar->setForceInactive(true);
-    ui->deploymentOk->setProperty("class", "Primary");
-    ui->contents->setAttribute(Qt::WA_TranslucentBackground);
-    ui->blueLabel->setProperty("class", "addDeployment"); // Should this label style be more generic ?
-    ui->blueLabel->installEventFilter(this);
-    ui->blueLabel->setCursor(Qt::PointingHandCursor);
-}
-
-void DeploymentsWidget::paintEvent(QPaintEvent *)
-{
-    QPainter p(this);
-    StyledDockWidget::drawFrame(p, rect(), false);
-
-    p.setPen(QColor(35, 36, 37));
-    p.drawLine(1, height()-51, width() - 2, height() - 51);
-    p.setPen(QColor(66, 67, 68));
-    p.drawLine(1, height()-50, width() - 2, height() - 50);
-}
-
-bool DeploymentsWidget::eventFilter(QObject *watched, QEvent *event)
-{
-    if (event->type() == QEvent::MouseButtonRelease) {
-        addDeployment();
-        return true;
-    }
-
-    return QWidget::eventFilter(watched, event);
-}
-
-void DeploymentsWidget::addDeployment()
-{
-    QInputDialog::getText(this, tr("Enter deployment name"), QString());
-}
-
-#include "StyleGallery/moc_DeploymentsWidget.cpp"
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/DeploymentsWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/DeploymentsWidget.h
deleted file mode 100644
index ca1aa38034..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/DeploymentsWidget.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef DEPLOYMENTSWIDGET_H
-#define DEPLOYMENTSWIDGET_H
-
-#if !defined(Q_MOC_RUN)
-#include <AzQtComponents/StyleGallery/ui_deploymentswidget.h>
-
-#include <QWidget>
-#include <QScopedPointer>
-#endif
-
-class DeploymentsWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit DeploymentsWidget(QWidget *parent = 0);
-    void paintEvent(QPaintEvent *event) override;
-    bool eventFilter(QObject *watched, QEvent *event) override;
-    void addDeployment();
-private:
-    QScopedPointer<Ui::DeploymentsWidget> ui;
-};
-
-#endif
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/MyCombo.cpp b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/MyCombo.cpp
deleted file mode 100644
index 1c9a349182..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/MyCombo.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "MyCombo.h"
-
-MyComboBox::MyComboBox(QWidget *parent)
-    : QComboBox(parent)
-{
-
-}
-
-#include "StyleGallery/moc_MyCombo.cpp"
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/MyCombo.h b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/MyCombo.h
deleted file mode 100644
index 418abc656c..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/MyCombo.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef MY_COMBO_H
-#define MY_COMBO_H
-
-#if !defined(Q_MOC_RUN)
-#include <QComboBox>
-#endif
-
-class MyComboBox : public QComboBox
-{
-    Q_OBJECT
-public:
-    explicit MyComboBox(QWidget *parent = nullptr);
-};
-
-
-#endif
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.cpp b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.cpp
deleted file mode 100644
index 748e8bab8d..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CViewportTitleDlg implementation file
-
-
-#include "ViewportTitleDlg.h"
-
-#include <AzQtComponents/StyleGallery/ui_ViewportTitleDlg.h>
-#include <QAction>
-
-ViewportTitleDlg::ViewportTitleDlg(QWidget* pParent)
-    : QWidget(pParent),
-    m_ui(new Ui::ViewportTitleDlg)
-{
-    m_ui->setupUi(this);
-
-    OnInitDialog();
-    m_ui->m_viewportSearch->setIcon(QIcon(":/stylesheet/img/16x16/Search.png"));
-
-    auto clearAction = new QAction(this);
-    clearAction->setIcon(QIcon(":/stylesheet/img/16x16/lineedit-clear.png"));
-
-    m_ui->m_viewportSearch->setFixedWidth(190);
-}
-
-ViewportTitleDlg::~ViewportTitleDlg()
-{
-}
-
-void ViewportTitleDlg::OnInitDialog()
-{
-    m_ui->m_titleBtn->setText(m_title);
-    m_ui->m_sizeStaticCtrl->setText(QString());
-
-    connect(m_ui->m_maxBtn, &QToolButton::clicked, this, &ViewportTitleDlg::OnMaximize);
-    connect(m_ui->m_toggleHelpersBtn, &QToolButton::clicked, this, &ViewportTitleDlg::OnToggleHelpers);
-    connect(m_ui->m_toggleDisplayInfoBtn, &QToolButton::clicked, this, &ViewportTitleDlg::OnToggleDisplayInfo);
-
-    m_ui->m_maxBtn->setProperty("class", "big");
-    m_ui->m_toggleHelpersBtn->setProperty("class", "big");
-    m_ui->m_toggleDisplayInfoBtn->setProperty("class", "big");
-}
-
-void ViewportTitleDlg::SetTitle( const QString &title )
-{
-    m_title = title;
-    m_ui->m_titleBtn->setText(m_title);
-    m_ui->m_viewportSearch->setVisible(title == QLatin1String("Perspective"));
-}
-
-void ViewportTitleDlg::OnMaximize()
-{
-}
-
-void ViewportTitleDlg::OnToggleHelpers()
-{
-}
-
-void ViewportTitleDlg::OnToggleDisplayInfo()
-{
-}
-
-#include "StyleGallery/moc_ViewportTitleDlg.cpp"
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.h b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.h
deleted file mode 100644
index 053d2f8714..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-namespace Ui
-{
-    class ViewportTitleDlg;
-}
-
-class ViewportTitleDlg : public QWidget
-{
-    Q_OBJECT
-public:
-    ViewportTitleDlg(QWidget* pParent = nullptr);
-    virtual ~ViewportTitleDlg();
-protected slots:
-    void OnMaximize();
-    void OnToggleHelpers();
-    void OnToggleDisplayInfo();
-private:
-    void OnInitDialog();
-    void SetTitle(const QString &title);
-
-    QString m_title = QLatin1String("Perspective");
-    QScopedPointer<Ui::ViewportTitleDlg> m_ui;
-};
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.ui b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.ui
deleted file mode 100644
index 066dafe912..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/ViewportTitleDlg.ui
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ViewportTitleDlg</class>
- <widget class="QWidget" name="ViewportTitleDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>574</width>
-    <height>29</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2,0,0,0,0,0,0,0,0,0,0,0">
-   <property name="leftMargin">
-    <number>10</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="m_titleBtn">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Static</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="AzQtComponents::ToolButtonLineEdit" name="m_viewportSearch">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>147</width>
-       <height>22</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>147</width>
-       <height>22</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>FOV:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_fovStaticCtrl">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>120°</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Ratio:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_ratioStaticCtrl">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>40</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>40</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>000:000</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_sizeStaticCtrl">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>60</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>60</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>0000 x 0000</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="AzQtComponents::ButtonDivider" name="divider1" native="true"/>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_toggleDisplayInfoBtn">
-     <property name="toolTip">
-      <string>Toggle display info</string>
-     </property>
-     <property name="icon">
-      <iconset>
-       <normaloff>:/stylesheet/img/UI20/Info.svg</normaloff>:/stylesheet/img/UI20/Info.svg</iconset>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_toggleHelpersBtn">
-     <property name="toolTip">
-      <string>Toggle display helpers</string>
-     </property>
-     <property name="icon">
-      <iconset>
-       <normaloff>:/stylesheet/img/UI20/Helpers.svg</normaloff>:/stylesheet/img/UI20/Helpers.svg</iconset>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="AzQtComponents::ButtonDivider" name="divider2" native="true"/>
-   </item>
-   <item>
-    <widget class="QToolButton" name="m_maxBtn">
-     <property name="icon">
-      <iconset>
-       <normaloff>:/stylesheet/img/16x16/Maximize.png</normaloff>:/stylesheet/img/16x16/Maximize.png</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>16</width>
-       <height>16</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="rightSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>5</width>
-       <height>5</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ToolButtonLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>AzQtComponents/Components/ToolButtonLineEdit.h</header>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::ButtonDivider</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/ButtonDivider.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/assets.svg b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/assets.svg
deleted file mode 100644
index a64626e47a..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/assets.svg
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4.0527225mm"
-   height="4.0527225mm"
-   viewBox="0 0 14.36004 14.36004"
-   id="svg3348"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="assets.svg">
-  <defs
-     id="defs3350">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4232">
-      <stop
-         style="stop-color:#7b7b7b;stop-opacity:1"
-         offset="0"
-         id="stop4234" />
-      <stop
-         style="stop-color:#666666;stop-opacity:1"
-         offset="1"
-         id="stop4236" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4232"
-       id="linearGradient4238"
-       x1="13.081557"
-       y1="1055.9957"
-       x2="13.081557"
-       y2="1070.327"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.755391"
-     inkscape:cx="19.18662"
-     inkscape:cy="25.784244"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata3353">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.31998014,-1037.6822)">
-    <ellipse
-       style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4e413a;stroke-width:5.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3356"
-       cx="27.955313"
-       cy="1029.9979"
-       rx="18.015646"
-       ry="19.879333" />
-    <ellipse
-       style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4e413a;stroke-width:5.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3358"
-       cx="26.091625"
-       cy="1032.4829"
-       rx="27.334084"
-       ry="23.606709" />
-    <ellipse
-       style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4e413a;stroke-width:5.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3360"
-       cx="6.2122917"
-       cy="1006.3912"
-       rx="41.001125"
-       ry="44.7285" />
-    <ellipse
-       style="opacity:0;fill:#417176;fill-opacity:0.44148937;fill-rule:evenodd;stroke:#4e413a;stroke-width:5.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4162"
-       cx="24.849167"
-       cy="1026.8918"
-       rx="16.773188"
-       ry="41.622353" />
-    <circle
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#3675dd;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4164"
-       cx="-4.3371701"
-       cy="1029.7621"
-       r="6.6800199"
-       inkscape:export-xdpi="94.010872"
-       inkscape:export-ydpi="94.010872"
-       inkscape:export-filename="/data/secured/home/serj/kdab/amazon-style/img/radio-hover.png" />
-    <ellipse
-       style="opacity:1;fill:#3675dd;fill-opacity:1;fill-rule:evenodd;stroke:#3675dd;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4164-1"
-       cx="24.819975"
-       cy="1043.5323"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       inkscape:export-filename="/data/secured/home/serj/kdab/amazon-style/img/radio-selected.png"
-       rx="7.4999924"
-       ry="7.4999919" />
-    <circle
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#3675dd;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4164-5"
-       cx="26.94738"
-       cy="1025.5796"
-       r="7.4999933"
-       inkscape:export-xdpi="90.000015"
-       inkscape:export-ydpi="90.000015"
-       inkscape:export-filename="/data/secured/home/serj/kdab/amazon-style/img/radio-unselected.png" />
-    <circle
-       style="opacity:1;fill:url(#linearGradient4238);fill-opacity:1;fill-rule:evenodd;stroke:#3675dd;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4164-5-7"
-       cx="12.839327"
-       cy="1063.1339"
-       r="7.4999924"
-       inkscape:export-xdpi="90.000015"
-       inkscape:export-ydpi="90.000015"
-       inkscape:export-filename="/data/secured/home/serj/kdab/amazon-style/img/radio-disabled.png" />
-    <ellipse
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#3675dd;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4259"
-       cx="24.819977"
-       cy="1043.6315"
-       rx="2.9999933"
-       ry="3.139528"
-       inkscape:export-filename="/data/secured/home/serj/kdab/amazon-style/img/radio-selected.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#4285f4;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4263"
-       width="10.999988"
-       height="10.999988"
-       x="7.7876616"
-       y="1014.0333"
-       rx="2.1999974"
-       inkscape:export-filename="/data/secured/home/serj/kdab/amazon-style/img/combo-checked.png"
-       inkscape:export-xdpi="90.000015"
-       inkscape:export-ydpi="90.000015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#eeeeee;stroke-width:1.09999859;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 9.6716909,1020.2265 2.4883481,2.5829 c 4.574398,-6.5447 4.574398,-6.5447 4.574398,-6.5447"
-       id="path4269"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/data/secured/home/serj/kdab/amazon-style/img/combo-checked.png"
-       inkscape:export-xdpi="90.000015"
-       inkscape:export-ydpi="90.000015" />
-  </g>
-</svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/deploymentswidget.ui b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/deploymentswidget.ui
deleted file mode 100644
index f02c215e4f..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/deploymentswidget.ui
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DeploymentsWidget</class>
- <widget class="QWidget" name="DeploymentsWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>263</width>
-    <height>238</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>263</width>
-    <height>238</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>263</width>
-    <height>238</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>1</number>
-     </property>
-     <property name="rightMargin">
-      <number>1</number>
-     </property>
-     <item>
-      <widget class="AzQtComponents::TitleBar" name="titlebar" native="true"/>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QWidget" name="contents" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="spacing">
-       <number>10</number>
-      </property>
-      <property name="leftMargin">
-       <number>12</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>You must select a default deployment where
-you would like to add these resurces.</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="blueLabel">
-        <property name="text">
-         <string>Add a deployment</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="radioButton">
-        <property name="text">
-         <string>New deployment name 3</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="radioButton_2">
-        <property name="text">
-         <string>Deployment name 2</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="radioButton_3">
-        <property name="text">
-         <string>Deployment name 1</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>5</number>
-        </property>
-        <item>
-         <widget class="QPushButton" name="deploymentO2">
-          <property name="text">
-           <string>Cancel</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="deploymentOk">
-          <property name="text">
-           <string>Ok</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::TitleBar</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/Titlebar.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/main.cpp b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/main.cpp
deleted file mode 100644
index db8024b0e4..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/main.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "mainwidget.h"
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzQtComponents/Components/StyledDockWidget.h>
-#include <AzQtComponents/Components/ToolButtonComboBox.h>
-#include <AzQtComponents/Components/ToolButtonLineEdit.h>
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-#include <AzQtComponents/Components/O3DEStylesheet.h>
-#include "MyCombo.h"
-
-#include <QPushButton>
-#include <QDebug>
-#include <QApplication>
-#include <QStyleFactory>
-#include <QMainWindow>
-#include <QAction>
-#include <QMenuBar>
-#include <QToolBar>
-#include <QDockWidget>
-#include <QTextEdit>
-#include <QComboBox>
-#include <QToolButton>
-#include <QVBoxLayout>
-#include <QSettings>
-
-#include <QDialog>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <AzQtComponents/Components/StyledDetailsTableView.h>
-#include <AzQtComponents/Components/StyledDetailsTableModel.h>
-
-using namespace AzQtComponents;
-
-QToolBar * toolBar()
-{
-    auto t = new QToolBar(QString());
-    QAction *a = nullptr;
-    QMenu *menu = nullptr;
-    auto but = new QToolButton();
-    menu = new QMenu();
-    but->setMenu(menu);
-    but->setCheckable(true);
-    but->setPopupMode(QToolButton::MenuButtonPopup);
-    but->setDefaultAction(new QAction(QStringLiteral("Test"), but));
-    but->setIcon(QIcon(":/stylesheet/img/undo.png"));
-    t->addWidget(but);
-
-    a = t->addAction(QIcon(":/stylesheet/img/select.png"), QString());
-    a->setCheckable(true);
-    t->addSeparator();
-
-    auto tbcb = new AzQtComponents::ToolButtonComboBox();
-    tbcb->setIcon(QIcon(":/stylesheet/img/angle.png"));
-    tbcb->comboBox()->addItem("1");
-    tbcb->comboBox()->addItem("2");
-    tbcb->comboBox()->addItem("3");
-    tbcb->comboBox()->addItem("4");
-    t->addWidget(tbcb);
-
-    auto tble = new AzQtComponents::ToolButtonLineEdit();
-    tble->setFixedWidth(130);
-    tble->setIcon(QIcon(":/stylesheet/img/16x16/Search.png"));
-    t->addWidget(tble);
-
-    auto combo = new QComboBox();
-    combo->addItem("Test1");
-    combo->addItem("Test3");
-    combo->addItem("Selection,Area");
-    t->addWidget(combo);
-
-    const QStringList iconNames = {
-        "Align_object_to_surface",
-        "Align_to_grid",
-        "Align_to_Object",
-        "Angle",
-        "Asset_Browser",
-        "Audio",
-        "Database_view",
-        "Delete_named_selection",
-        "Follow_terrain",
-        "Freeze",
-        "Gepetto",
-        "Get_physics_state",
-        "Grid",
-        "layer_editor",
-        "layers",
-        "LIghting",
-        "lineedit-clear",
-        "LOD_generator",
-        "LUA",
-        "Material",
-        "Maximize",
-        "Measure",
-        "Move",
-        "Object_follow_terrain",
-        "Object_list",
-        "Redo",
-        "Reset_physics_state",
-        "Scale",
-        "select_object",
-        "Select",
-        "Select_terrain",
-        "Simulate_Physics_on_selected_objects",
-        "Substance",
-        "Terrain",
-        "Terrain_Texture",
-        "Texture_browser",
-        "Time_of_Day",
-        "Trackview",
-        "Translate",
-        "UI_editor",
-        "undo",
-        "Unfreeze_all",
-        "Vertex_snapping" };
-
-    for (auto name : iconNames) {
-        auto a2 = t->addAction(QIcon(QString(":/stylesheet/img/16x16/%1.png").arg(name)), nullptr);
-        a2->setToolTip(name);
-        a2->setDisabled(name == "Audio");
-    }
-
-    combo = new MyComboBox();
-    combo->addItem("Test1");
-    combo->addItem("Test3");
-    combo->addItem("Selection,Area");
-    t->addWidget(combo);
-
-    return t;
-}
-
-class MainWindow : public QMainWindow
-{
-public:
-    explicit MainWindow(QWidget *parent = nullptr)
-        : QMainWindow(parent)
-        , m_settings("org", "app")
-    {
-        setAttribute(Qt::WA_DeleteOnClose);
-        QVariant geoV = m_settings.value("geo");
-        if (geoV.isValid()) {
-            restoreGeometry(geoV.toByteArray());
-        }
-    }
-
-    ~MainWindow()
-    {
-        qDebug() << "Deleted mainwindow";
-        auto geo = saveGeometry();
-        m_settings.setValue("geo", geo);
-    }
-private:
-    QSettings m_settings;
-};
-
-static void addMenu(QMainWindow *w, const QString &name)
-{
-    auto action = w->menuBar()->addAction(name);
-    auto menu = new QMenu();
-    action->setMenu(menu);
-    menu->addAction("Item 1");
-    menu->addAction("Item 2");
-    menu->addAction("Item 3");
-    menu->addAction("Longer item 4");
-    menu->addAction("Longer item 5");
-}
-
-int main(int argc, char **argv)
-{
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
-
-    QApplication app(argc, argv);
-    AzQtComponents::O3DEStylesheet stylesheet(&app);
-    AZ::IO::FixedMaxPath engineRootPath;
-    {
-        AZ::ComponentApplication componentApplication(argc, argv);
-        auto settingsRegistry = AZ::SettingsRegistry::Get();
-        settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
-    }
-    stylesheet.initialize(&app, engineRootPath);
-
-    auto wrapper = new AzQtComponents::WindowDecorationWrapper();
-    QMainWindow *w = new MainWindow();
-    w->setWindowTitle("Component Gallery");
-    auto widget = new MainWidget(w);
-    w->resize(550, 900);
-    w->setMinimumWidth(500);
-    wrapper->setGuest(w);
-    wrapper->enableSaveRestoreGeometry("app", "org", "windowGeometry");
-    w->setCentralWidget(widget);
-    w->setWindowFlags(w->windowFlags() | Qt::WindowStaysOnTopHint);
-    w->show();
-
-    auto action = w->menuBar()->addAction("Menu 1");
-
-    auto fileMenu = new QMenu();
-    action->setMenu(fileMenu);
-    auto openDock = fileMenu->addAction("Open dockwidget");
-    QObject::connect(openDock, &QAction::triggered, w, [&w] {
-        auto dock = new AzQtComponents::StyledDockWidget(QLatin1String("O3DE"), w);
-        auto button = new QPushButton("Click to dock");
-        auto wid = new QWidget();
-        auto widLayout = new QVBoxLayout(wid);
-        widLayout->addWidget(button);
-        wid->resize(300, 200);
-        QObject::connect(button, &QPushButton::clicked, dock, [dock]{
-            dock->setFloating(!dock->isFloating());
-        });
-        w->addDockWidget(Qt::BottomDockWidgetArea, dock);
-        dock->setWidget(wid);
-        dock->resize(300, 200);
-        dock->setFloating(true);
-        dock->show();
-    });
-
-
-    QAction* newAction = fileMenu->addAction("Test StyledDetailsTableView");
-    newAction->setShortcut(QKeySequence::Delete);
-    QObject::connect(newAction, &QAction::triggered, w, [w]() {
-        QDialog temp(w);
-        temp.setWindowTitle("StyleTableWidget Test");
-
-        QVBoxLayout* layout = new QVBoxLayout(&temp);
-
-        AzQtComponents::StyledDetailsTableModel* tableModel = new AzQtComponents::StyledDetailsTableModel();
-        tableModel->AddColumn("Status", AzQtComponents::StyledDetailsTableModel::StatusIcon);
-        tableModel->AddColumn("Platform");
-        tableModel->AddColumn("Message");
-        tableModel->AddColumnAlias("message", "Message");
-
-        tableModel->AddPrioritizedKey("Data3");
-        tableModel->AddDeprioritizedKey("Data1");
-
-        auto table = new AzQtComponents::StyledDetailsTableView();
-        table->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-        table->setModel(tableModel);
-
-        {
-            AzQtComponents::StyledDetailsTableModel::TableEntry entry;
-            entry.Add("Message", "A very very long first message. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus et maximus tortor, ac commodo ante. Maecenas porta posuere mauris, vel consectetur arcu ornare interdum. Praesent rhoncus consequat neque, non volutpat mauris cursus a. Proin a nisl quis dui consectetur malesuada a et diam. Integer finibus luctus nibh nec cursus.");
-            entry.Add("Platform", "PC");
-            entry.Add("Status", AzQtComponents::StyledDetailsTableModel::StatusSuccess);
-            tableModel->AddEntry(entry);
-        }
-
-        {
-            AzQtComponents::StyledDetailsTableModel::TableEntry entry;
-            entry.Add("Message", "Second message. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus et maximus tortor, ac commodo ante. Maecenas porta posuere mauris, vel consectetur arcu ornare interdum. Praesent rhoncus consequat neque, non volutpat mauris cursus a. Proin a nisl quis dui consectetur malesuada a et diam. Integer finibus luctus nibh nec cursus.");
-            entry.Add("Platform", "PC");
-            entry.Add("Status", AzQtComponents::StyledDetailsTableModel::StatusError);
-            entry.Add("Data1", "Deprioritized item.");
-            entry.Add("Data3", "Prioritized item.");
-            tableModel->AddEntry(entry);
-        }
-
-        for (int i = 0; i < 4; i++)
-        {
-            AzQtComponents::StyledDetailsTableModel::TableEntry entry;
-            entry.Add("message", "Third message");
-            entry.Add("Status", AzQtComponents::StyledDetailsTableModel::StatusWarning);
-            entry.Add("Platform", "PC");
-            entry.Add("Index1", "A smaller detail.");
-            entry.Add("Index2", "Another small detail.");
-            entry.Add("Index3", "A final small detail.");
-            tableModel->AddEntry(entry);
-        }
-
-        layout->addWidget(table);
-
-        temp.exec();
-    });
-
-    QAction* refreshAction = fileMenu->addAction("Refresh Stylesheet");
-    QObject::connect(refreshAction, &QAction::triggered, refreshAction, [&stylesheet]() {
-        stylesheet.Refresh();
-    });
-
-
-    addMenu(w, "Menu 2");
-    addMenu(w, "Menu 3");
-    addMenu(w, "Menu 4");
-
-    w->addToolBar(toolBar());
-
-    QObject::connect(widget, &MainWidget::reloadCSS, widget, [] {
-        qDebug() << "Reloading CSS";
-        qApp->setStyleSheet(QString());
-        qApp->setStyleSheet("file:///style.qss");
-    });
-
-    return app.exec();
-}
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.cpp
deleted file mode 100644
index c5383cd787..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "mainwidget.h"
-#include <AzQtComponents/StyleGallery/ui_mainwidget.h>
-#include <AzQtComponents/Components/ButtonStripe.h>
-#include <AzQtComponents/Components/DockBarButton.h>
-
-#include <QButtonGroup>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QStringList>
-#include <QStandardItemModel>
-#include <QMainWindow>
-#include <QMenuBar>
-#include <QDebug>
-
-using namespace AzQtComponents;
-
-MainWidget::MainWidget(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::MainWidget)
-{
-    ui->setupUi(this);
-
-    QStringList stripeButtonsNames = QStringList();
-    stripeButtonsNames << "Controls" << "ItemViews" << "Styles" << "Layouts";
-    ui->buttonStripe->addButtons(stripeButtonsNames, ui->stackedWidget->currentIndex());
-    connect(ui->buttonStripe, &AzQtComponents::ButtonStripe::buttonClicked,
-            ui->stackedWidget, &QStackedWidget::setCurrentIndex);
-
-    initializeControls();
-    initializeItemViews();
-
-    connect(ui->button1, &QPushButton::clicked, this, []{
-        auto mainwindow = new QMainWindow();
-        auto menu = new QMenu("File");
-        auto mb = new QMenuBar();
-        menu->addAction("Action1");
-        menu->addAction("Action2");
-        menu->addAction("Action3");
-        mb->addMenu(menu);
-        mb->addAction("Edit");
-        mb->addMenu("Create");
-        mb->addMenu("Select");
-        mb->addMenu("Modify");
-        mb->addMenu("Display");
-        mainwindow->setMenuBar(mb);
-        mainwindow->resize(400, 400);
-        mainwindow->show();
-        mainwindow->raise();
-    });
-}
-
-MainWidget::~MainWidget()
-{
-    delete ui;
-    qDebug() << "Deleted main widget";
-}
-
-void MainWidget::mouseReleaseEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::MiddleButton) {
-        emit reloadCSS();
-    }
-}
-
-void MainWidget::initializeControls()
-{
-    auto menu = new QMenu();
-    menu->addAction("Test 1");
-    menu->addAction("Test 2");
-    ui->button3->setMenu(menu);
-
-    auto menu2 = new QMenu();
-    menu2->addAction("Test 1");
-    menu2->addAction("Test 2");
-    ui->disabledButton3->setMenu(menu2);
-
-    ui->selectedCheckBox->setCheckState(Qt::Checked);
-    ui->enabledCheckBox->setCheckState(Qt::Unchecked);
-    ui->tristateCheckBox->setCheckState(Qt::PartiallyChecked);
-
-    // TODO: Move these into subclass, can't be done from .css
-    // Nicolas: or do it in the proxy style
-    // Sergio: css doesn't work well with proxy style , says Qt's docs.
-    ui->progressBar->setFormat(QString());
-    ui->progressBar->setMaximumHeight(8);
-    ui->progressBarFull->setFormat(QString());
-    ui->progressBarFull->setMaximumHeight(8);
-
-    ui->button2->setProperty("class", "Primary");
-    ui->disabledButton1->setProperty("class", "Primary");
-
-    ui->invalidLineEdit->setFlavor(AzQtComponents::StyledLineEdit::Invalid);
-    ui->validLineEdit->setFlavor(AzQtComponents::StyledLineEdit::Valid);
-    ui->questionLineEdit->setFlavor(AzQtComponents::StyledLineEdit::Question);
-    ui->infoLineEdit->setFlavor(AzQtComponents::StyledLineEdit::Information);
-
-    // In order to try out validator impact on flavor
-    ui->invalidLineEdit->setPlaceholderText("Enter 4 digits");
-    ui->invalidLineEdit->setValidator(new QRegExpValidator(QRegExp("[1-9]\\d{3,3}")));
-
-    ui->disabledVectorEdit->setColors(qRgb(84, 190, 93), qRgb(226, 82, 67), qRgb(66, 133, 244));
-    ui->vectorEdit->setColors(qRgb(84, 190, 93), qRgb(226, 82, 67), qRgb(66, 133, 244));
-    ui->unknownVectorEdit->setColors(qRgb(84, 190, 93), qRgb(226, 82, 67), qRgb(66, 133, 244));
-    ui->warningVectorEdit->setColors(qRgb(84, 190, 93), qRgb(226, 82, 67), qRgb(66, 133, 244));
-    ui->warningVectorEdit->setFlavor(AzQtComponents::VectorEditElement::Invalid);
-
-    QStringList rpy = {tr("R"), tr("P"), tr("Y")};
-    ui->disabledRPYVectorEdit->setLabels(rpy);
-    ui->rPYVectorEdit->setLabels(rpy);
-    ui->unknownRPYVectorEdit->setLabels(rpy);
-    ui->warningRPYVectorEdit->setLabels(rpy);
-
-    ui->filterNameLineEdit->setClearButtonEnabled(true);
-
-    ui->comboBox_4->setEnabled(false);
-    for (int i = 0; i < 10; ++i) {
-        ui->comboBox->addItem(QStringLiteral("combo 0: Item %1").arg(i));
-        ui->comboBox_2->addItem(QStringLiteral("combo 2: Item %1").arg(i));
-        ui->comboBox_3->addItem(QStringLiteral("combo 3: Item %1").arg(i));
-        ui->comboBox_4->addItem(QStringLiteral("combo 4: Item %1").arg(i));
-        ui->comboBox_5->addItem(QStringLiteral("combo 5: Item %1").arg(i));
-        ui->comboBox_6->addItem(QStringLiteral("combo 6: Item %1").arg(i));
-    }
-
-    ui->allCombo->setProperty("class", "condition");
-    ui->allCombo->setFixedWidth(37);
-    ui->allCombo->setFixedHeight(21);
-    ui->allCombo->addItem("all");
-    ui->allCombo->addItem("any");
-
-
-    // Construct the available tag list.
-    const int numAvailableTags = 128;
-    QVector<QString> availableTags;
-    availableTags.reserve(numAvailableTags+8);
-
-    availableTags.push_back("Healthy");
-    availableTags.push_back("Tired");
-    availableTags.push_back("Laughing");
-    availableTags.push_back("Happy");
-    availableTags.push_back("Smiling");
-    availableTags.push_back("Weapon Left");
-    availableTags.push_back("Weapon Right");
-    availableTags.push_back("Loooooooooooooooooong Tag");
-
-    for (const QString& tag : availableTags)
-    {
-        ui->searchWidget->AddTypeFilter("Foo", tag);
-    }
-
-    for (int i = 0; i < numAvailableTags; ++i)
-    {
-        QString tagName = "tag" + QString::number(i + 1);
-        availableTags.push_back(tagName);
-        if (i < 10)
-        {
-            ui->searchWidget->AddTypeFilter("Bar", tagName);
-        }
-    }
-
-    ui->tagSelector->Reinit(availableTags);
-
-    // Pre-select some of the tags.
-    ui->tagSelector->SelectTag("Healthy");
-    ui->tagSelector->SelectTag("Laughing");
-    ui->tagSelector->SelectTag("Smiling");
-    ui->tagSelector->SelectTag("Happy");
-    ui->tagSelector->SelectTag("Weapon Left");
-
-
-    ui->toolButton->setProperty("class", "QToolBar");
-    ui->toolButton_2->setProperty("class", "QToolBar");
-    ui->toolButton_3->setProperty("class", "QToolBar");
-    ui->toolButton_4->setProperty("class", "QToolBar");
-    ui->toolButton_5->setProperty("class", "QToolBar");
-    ui->toolButton_6->setProperty("class", "QToolBar");
-    ui->toolButton_7->setProperty("class", "QToolBar");
-    ui->toolButton_8->setProperty("class", "QToolBar");
-    ui->toolButton_9->setProperty("class", "QToolBar");
-    ui->toolButton_10->setProperty("class", "QToolBar");
-    ui->toolButton_11->setProperty("class", "QToolBar");
-    ui->toolButton_12->setProperty("class", "QToolBar");
-
-    ui->conditionGroup->appendCondition();
-
-    // place the viewportTitle menu into the place holder we prepared in the ui file
-    /*ViewportTitleDlg* viewPortTitleDlg = new ViewportTitleDlg(ui->ViewportTitle);
-    auto viewPortTitleLayout = new QHBoxLayout();
-    viewPortTitleLayout->addWidget(viewPortTitleDlg);
-    ui->ViewportTitle->setLayout(viewPortTitleLayout);*/
-
-    QStringList fontSizeMockup = {"8pt", "9pt", "10pt", "11pt", "12pt", "14pt", "16pt", "18pt", "24pt", "30pt",};
-    QStringList viewZoomMockup = {"20", "32", "40", "80", "160", "240"};
-    const auto tbcbList = ui->toolButtonsComboBoxWidget->findChildren<AzQtComponents::ToolButtonComboBox*>();
-    foreach (auto tbcb, tbcbList) {
-        if (tbcb->objectName().contains("1")) {
-            tbcb->setIcon(QIcon(QStringLiteral(":/stylesheet/img/16x16/Font_text.png")));
-            tbcb->comboBox()->addItems(fontSizeMockup);
-        } else if (tbcb->objectName().contains("2")) {
-            tbcb->setIcon(QIcon(QStringLiteral(":/stylesheet/img/16x16/Picture_view.png")));
-            tbcb->comboBox()->addItems(viewZoomMockup);
-        } else if (tbcb->objectName().contains("3")) {
-            tbcb->setIcon(QIcon(QStringLiteral(":/stylesheet/img/16x16/List_view.png")));
-            tbcb->comboBox()->addItems(fontSizeMockup);
-        }
-    }
-
-    ui->WidgetHeader1->setForceInactive(true);
-    ui->WidgetHeader1->setButtons({ AzQtComponents::DockBarButton::DividerButton, AzQtComponents::DockBarButton::MaximizeButton,
-                                    AzQtComponents::DockBarButton::DividerButton, AzQtComponents::DockBarButton::CloseButton });
-    ui->WidgetHeader1->setWindowTitleOverride("Widget Header");
-    ui->WidgetHeader2->setButtons({AzQtComponents::DockBarButton::DividerButton, AzQtComponents::DockBarButton::MaximizeButton,
-                                   AzQtComponents::DockBarButton::DividerButton, AzQtComponents::DockBarButton::CloseButton});
-    ui->WidgetHeader2->setWindowTitleOverride("Widget Header");
-
-    ui->NonDockableWidget1->setForceInactive(true);
-    ui->NonDockableWidget1->setWindowTitleOverride("Non-Dockable Widget");
-    ui->NonDockableWidget1->setButtons({ AzQtComponents::DockBarButton::CloseButton });
-    ui->NonDockableWidget1->setTearEnabled(false);
-    ui->NonDockableWidget1->setDragEnabled(false);
-    ui->NonDockableWidget2->setWindowTitleOverride("Non-Dockable Widget");
-    ui->NonDockableWidget2->setButtons({ AzQtComponents::DockBarButton::CloseButton });
-    ui->NonDockableWidget2->setTearEnabled(false);
-    ui->NonDockableWidget2->setDragEnabled(false);
-
-    const auto rpbList = ui->RoundedButtonWidget->findChildren<QPushButton*>();
-    foreach (auto rpb, rpbList) {
-        if (rpb->objectName().contains("Small"))
-            rpb->setProperty("class", "smallRounded");
-        else
-            rpb->setProperty("class", "rounded");
-    }
-
-    ui->buttonOrange1->setProperty("class", "Primary");
-    ui->buttonOrange2->setProperty("class", "Primary");
-
-    ui->tabWidget->tabBar()->setTabsClosable(true);
-    connect(ui->tabWidget->tabBar(), &QTabBar::tabCloseRequested, this, [this](int index) {
-        ui->tabWidget->removeTab(index);
-    });
-}
-
-void MainWidget::initializeItemViews()
-{
-    auto model = new QStandardItemModel(this);
-    model->setHorizontalHeaderLabels({QString(), tr("Priority"), tr("State"), tr("ID"), tr("Completed"), tr("Platform")});
-
-    for (int i = 0; i < 20; ++i) {
-        auto col0Item = new QStandardItem();
-        col0Item->setCheckState(Qt::Checked);
-        col0Item->setData(QVariant(QSize(10, 20)), Qt::SizeHintRole);
-        col0Item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
-        auto col1Item = new QStandardItem((i < 10) ? tr("Top"): "");
-        model->appendRow({
-            col0Item,
-            col1Item,
-            new QStandardItem(i == 0 ? tr("Running") : (i < 10 ? tr("Failed") : tr("Waiting"))),
-            new QStandardItem("Environnment/Sky/Cloud/Cloudy-cloud"),
-            new QStandardItem(QString::number(i)),
-            new QStandardItem(i % 2 ? tr("Android") : tr("iPhone"))
-        });
-    }
-
-    ui->treeView->setModel(model);
-    ui->treeView->setSortingEnabled(true);
-    ui->treeView->setColumnWidth(0, 50);
-}
-
-#include "StyleGallery/moc_mainwidget.cpp"
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.h b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.h
deleted file mode 100644
index b6837901cc..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef MAINWIDGET_H
-#define MAINWIDGET_H
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-namespace Ui {
-class MainWidget;
-}
-
-class MainWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit MainWidget(QWidget *parent = 0);
-    ~MainWidget();
-
-protected:
-    void mouseReleaseEvent(QMouseEvent *event) override;
-
-private:
-    void initializeControls();
-    void initializeItemViews();
-
-signals:
-    void reloadCSS();
-
-private:
-    Ui::MainWidget *ui;
-};
-
-#endif // MAINWIDGET_H
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.ui b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.ui
deleted file mode 100644
index 0330857418..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/mainwidget.ui
+++ /dev/null
@@ -1,2042 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWidget</class>
- <widget class="QWidget" name="MainWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>592</width>
-    <height>781</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="8">
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>10</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="AzQtComponents::ButtonStripe" name="buttonStripe" native="true"/>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>10</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="0" colspan="8">
-    <widget class="QStackedWidget" name="stackedWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="controlsPage">
-      <layout class="QGridLayout" name="gridLayout_4">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <property name="horizontalSpacing">
-        <number>6</number>
-       </property>
-       <property name="verticalSpacing">
-        <number>16</number>
-       </property>
-       <item row="2" column="0">
-        <layout class="QVBoxLayout" name="verticalLayout_5">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <item>
-          <widget class="QLineEdit" name="UnfocusedLineEdit">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="inputMask">
-            <string/>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="placeholderText">
-            <string>place holder text</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="emptyLineEdit"/>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="disabledLineEdit">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>disabled</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="simpleLineEditClearable">
-           <property name="text">
-            <string>simple and enabled</string>
-           </property>
-           <property name="clearButtonEnabled">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="AzQtComponents::StyledLineEdit" name="invalidLineEdit">
-           <property name="text">
-            <string>invalid (need 4 digits)</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="AzQtComponents::StyledLineEdit" name="validLineEdit">
-           <property name="text">
-            <string>valid</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="AzQtComponents::StyledLineEdit" name="questionLineEdit">
-           <property name="text">
-            <string>question</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="AzQtComponents::StyledLineEdit" name="infoLineEdit">
-           <property name="text">
-            <string>information</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer_5">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="0">
-        <layout class="QFormLayout" name="formLayout">
-         <property name="horizontalSpacing">
-          <number>2</number>
-         </property>
-         <property name="verticalSpacing">
-          <number>6</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Vector3</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="AzQtComponents::VectorEdit" name="disabledVectorEdit" native="true">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Vector3</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="AzQtComponents::VectorEdit" name="vectorEdit" native="true"/>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="label_3">
-           <property name="text">
-            <string>Vector3</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="AzQtComponents::VectorEdit" name="unknownVectorEdit" native="true">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="label_4">
-           <property name="text">
-            <string>Vector3</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="AzQtComponents::VectorEdit" name="warningVectorEdit" native="true"/>
-         </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="label_5">
-           <property name="text">
-            <string>Vector3</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="AzQtComponents::VectorEdit" name="disabledRPYVectorEdit" native="true">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="label_7">
-           <property name="text">
-            <string>Vector3</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1">
-          <widget class="AzQtComponents::VectorEdit" name="rPYVectorEdit" native="true"/>
-         </item>
-         <item row="6" column="0">
-          <widget class="QLabel" name="label_6">
-           <property name="text">
-            <string>Vector3</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <widget class="AzQtComponents::VectorEdit" name="unknownRPYVectorEdit" native="true">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="0">
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string>Vector3</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="AzQtComponents::VectorEdit" name="warningRPYVectorEdit" native="true"/>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="1">
-        <widget class="QTextEdit" name="textEdit">
-         <property name="html">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <layout class="QGridLayout" name="gridLayout_2">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <item row="2" column="1">
-          <widget class="QPushButton" name="disabledButton2">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>Button 1</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="2">
-          <widget class="QPushButton" name="disabledButton3">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>Button 2</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QPushButton" name="disabledButton1">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>Button 1</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="1" column="1">
-          <widget class="QPushButton" name="button1">
-           <property name="text">
-            <string>Button 1</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
-          <widget class="QPushButton" name="button3">
-           <property name="text">
-            <string>Button 2</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QPushButton" name="button2">
-           <property name="text">
-            <string>Button 1</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0">
-        <layout class="QVBoxLayout" name="verticalLayout_4">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <item>
-          <widget class="QComboBox" name="comboBox_3">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-           <property name="currentText">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_4">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_5">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_6">
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer_6">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="0" column="1">
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <item>
-          <widget class="QFrame" name="frame">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QCheckBox" name="selectedCheckBox">
-              <property name="text">
-               <string>Selected</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QCheckBox" name="enabledCheckBox">
-              <property name="text">
-               <string>Enabled</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QCheckBox" name="disabledCheckBox">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="text">
-               <string>Disabled</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QFrame" name="frame_2">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <item>
-             <widget class="QCheckBox" name="tristateCheckBox">
-              <property name="text">
-               <string>Tristate checkbox</string>
-              </property>
-              <property name="checked">
-               <bool>false</bool>
-              </property>
-              <property name="tristate">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer_4">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QFrame" name="frame_3">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <widget class="QRadioButton" name="selectedRadioButton">
-              <property name="text">
-               <string>Selected</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="enabledRadioButton">
-              <property name="text">
-               <string>Enabled</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="disabledRadioButton">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="text">
-               <string>Disabled</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="1">
-        <layout class="QGridLayout" name="gridLayout_3">
-         <property name="spacing">
-          <number>7</number>
-         </property>
-         <item row="0" column="0" colspan="2">
-          <widget class="QProgressBar" name="progressBar">
-           <property name="value">
-            <number>24</number>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0" colspan="2">
-          <widget class="QProgressBar" name="progressBarFull">
-           <property name="value">
-            <number>100</number>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QWidget" name="styledSpinBoxWidget" native="true">
-           <layout class="QVBoxLayout" name="verticalLayout_6">
-            <item>
-             <layout class="QHBoxLayout" name="spinBoxRightLayout">
-              <item>
-               <widget class="AzQtComponents::StyledDoubleSpinBox" name="spinBoxLeft">
-                <property name="minimum">
-                 <double>-45.500000000000000</double>
-                </property>
-                <property name="maximum">
-                 <double>100.519999999999996</double>
-                </property>
-                <property name="value">
-                 <double>48.700000000000003</double>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="AzQtComponents::StyledSpinBox" name="spinBoxRight">
-                <property name="minimum">
-                 <number>-50</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="value">
-                 <number>50</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="spinBoxLeftLayout"/>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="1" column="0" colspan="2">
-          <widget class="QSlider" name="horizontalSlider">
-           <property name="maximum">
-            <number>100</number>
-           </property>
-           <property name="value">
-            <number>24</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="1">
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <item>
-          <widget class="QComboBox" name="comboBox">
-           <item>
-            <property name="text">
-             <string>Dropdown Default</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>New Selection</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_2">
-           <item>
-            <property name="text">
-             <string>Selection 1</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Selection 2</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Selection 3</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Selection 4</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item>
-          <widget class="AzQtComponents::FilteredSearchWidget" name="searchWidget" native="true"/>
-         </item>
-         <item>
-          <spacer name="verticalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="itemviewsPage">
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <property name="spacing">
-        <number>10</number>
-       </property>
-       <property name="leftMargin">
-        <number>50</number>
-       </property>
-       <property name="rightMargin">
-        <number>50</number>
-       </property>
-       <property name="bottomMargin">
-        <number>50</number>
-       </property>
-       <item>
-        <widget class="QScrollArea" name="scrollArea">
-         <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Plain</enum>
-         </property>
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>98</width>
-            <height>512</height>
-           </rect>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_8">
-           <property name="spacing">
-            <number>15</number>
-           </property>
-           <item>
-            <widget class="QTreeView" name="treeView">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>320</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>320</height>
-              </size>
-             </property>
-             <property name="alternatingRowColors">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QTextEdit" name="textEdit_2">
-             <property name="html">
-              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QListWidget" name="listWidget">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <item>
-              <property name="text">
-               <string>item1</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>item2</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>item3</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="stylesPage">
-      <layout class="QGridLayout" name="stylesPageLayout">
-       <property name="verticalSpacing">
-        <number>0</number>
-       </property>
-       <item row="1" column="1">
-        <widget class="QWidget" name="TreeStatesToolButtons" native="true">
-         <property name="maximumSize">
-          <size>
-           <width>140</width>
-           <height>160</height>
-          </size>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_6">
-          <property name="spacing">
-           <number>2</number>
-          </property>
-          <item row="0" column="1">
-           <widget class="QToolButton" name="toolButton_2">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Select_right.png</normaloff>:/stylesheet/img/16x16/Select_right.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QToolButton" name="toolButton">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Move.png</normaloff>:/stylesheet/img/16x16/Move.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QToolButton" name="toolButton_3">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Select_right.png</normaloff>:/stylesheet/img/16x16/Select_right.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QToolButton" name="toolButton_4">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Move.png</normaloff>:/stylesheet/img/16x16/Move.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3">
-           <widget class="QToolButton" name="toolButton_5">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Translate.png</normaloff>:/stylesheet/img/16x16/Translate.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QToolButton" name="toolButton_6">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Translate.png</normaloff>:/stylesheet/img/16x16/Translate.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QToolButton" name="toolButton_8">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Move.png</normaloff>:/stylesheet/img/16x16/Move.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QToolButton" name="toolButton_7">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Select_right.png</normaloff>:/stylesheet/img/16x16/Select_right.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="3">
-           <widget class="QToolButton" name="toolButton_9">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Translate.png</normaloff>:/stylesheet/img/16x16/Translate.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="4">
-           <widget class="QToolButton" name="toolButton_10">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Scale.png</normaloff>:/stylesheet/img/16x16/Scale.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="4">
-           <widget class="QToolButton" name="toolButton_11">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Scale.png</normaloff>:/stylesheet/img/16x16/Scale.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="4">
-           <widget class="QToolButton" name="toolButton_12">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Scale.png</normaloff>:/stylesheet/img/16x16/Scale.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QWidget" name="coloredIconsWidget" native="true">
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>180</height>
-          </size>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_7">
-          <item row="1" column="4">
-           <widget class="QToolButton" name="toolButton_24">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QToolButton" name="toolButton_13">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="6">
-           <widget class="QToolButton" name="toolButton_20">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="4">
-           <widget class="QToolButton" name="toolButton_22">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="5">
-           <widget class="QToolButton" name="toolButton_25">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="3">
-           <widget class="QToolButton" name="toolButton_23">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QToolButton" name="toolButton_19">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QToolButton" name="toolButton_27">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="3">
-           <widget class="QToolButton" name="toolButton_21">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QToolButton" name="toolButton_14">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="2">
-           <widget class="QToolButton" name="toolButton_31">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
-           <widget class="QToolButton" name="toolButton_29">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QToolButton" name="toolButton_18">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="7">
-           <widget class="QToolButton" name="toolButton_26">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="5">
-           <widget class="QToolButton" name="toolButton_16">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="3">
-           <widget class="QToolButton" name="toolButton_15">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="4">
-           <widget class="QToolButton" name="toolButton_30">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="5">
-           <widget class="QToolButton" name="toolButton_28">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="2">
-           <widget class="QToolButton" name="toolButton_17">
-            <property name="text">
-             <string>Sample</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/stylesheet/img/16x16/Audio.png</normaloff>:/stylesheet/img/16x16/Audio.png</iconset>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="0" column="1" colspan="2">
-        <widget class="QWidget" name="ButtonArrowComboBoxWidget" native="true">
-         <property name="maximumSize">
-          <size>
-           <width>250</width>
-           <height>50</height>
-          </size>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_9">
-          <item>
-           <widget class="QComboBox" name="textCombo1">
-            <property name="currentText">
-             <string>Text</string>
-            </property>
-            <property name="frame">
-             <bool>false</bool>
-            </property>
-            <item>
-             <property name="text">
-              <string>Text</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="textCombo2">
-            <item>
-             <property name="text">
-              <string>Text</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="textCombo3">
-            <item>
-             <property name="text">
-              <string>Text</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="textCombo4">
-            <item>
-             <property name="text">
-              <string>Text</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Item 1</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Item 2</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Longer Item 3</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Longer Item 4</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Item 5</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <spacer name="comboBoxSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>25</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QWidget" name="titleBarsWidget" native="true">
-         <property name="maximumSize">
-          <size>
-           <width>260</width>
-           <height>400</height>
-          </size>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_9">
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="AzQtComponents::TitleBar" name="WidgetHeader1" native="true"/>
-          </item>
-          <item>
-           <widget class="AzQtComponents::TitleBar" name="WidgetHeader2" native="true"/>
-          </item>
-          <item>
-           <spacer name="verticalSpacer_9">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>10</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="AzQtComponents::TitleBar" name="NonDockableWidget1" native="true"/>
-          </item>
-          <item>
-           <widget class="AzQtComponents::TitleBar" name="NonDockableWidget2" native="true"/>
-          </item>
-          <item>
-           <spacer name="verticalSpacer_8">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>230</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="AzQtComponents::TabWidget" name="tabWidget">
-            <property name="currentIndex">
-             <number>2</number>
-            </property>
-            <widget class="QWidget" name="tab">
-             <attribute name="title">
-              <string>Tab 1</string>
-             </attribute>
-            </widget>
-            <widget class="QWidget" name="tab_2">
-             <attribute name="title">
-              <string>Tab 2</string>
-             </attribute>
-            </widget>
-            <widget class="QWidget" name="tab_3">
-             <attribute name="title">
-              <string>Tab 3</string>
-             </attribute>
-            </widget>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QWidget" name="toolButtonsComboBoxWidget" native="true">
-         <property name="maximumSize">
-          <size>
-           <width>250</width>
-           <height>60</height>
-          </size>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="0" column="1">
-           <widget class="AzQtComponents::ToolButtonComboBox" name="widget_2" native="true"/>
-          </item>
-          <item row="0" column="0">
-           <widget class="AzQtComponents::ToolButtonComboBox" name="widget_1" native="true"/>
-          </item>
-          <item row="0" column="2">
-           <widget class="AzQtComponents::ToolButtonComboBox" name="widget_3" native="true"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <spacer name="verticalSpacer_10">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="0">
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>300</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="6" column="0">
-        <widget class="QWidget" name="RoundedButtonWidget" native="true">
-         <property name="minimumSize">
-          <size>
-           <width>250</width>
-           <height>100</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>300</width>
-           <height>100</height>
-          </size>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_10">
-          <property name="spacing">
-           <number>8</number>
-          </property>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_11">
-            <property name="spacing">
-             <number>8</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="pushButtonNormal">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>24</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question.png</normaloff>:/stylesheet/img/question.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="AzQtComponents::ButtonDivider" name="divider1" native="true"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="pushButtonNormalLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>24</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question.png</normaloff>:/stylesheet/img/question.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_16">
-              <property name="text">
-               <string>Support</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="AzQtComponents::ButtonDivider" name="divider2" native="true"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="pushButtonSmall">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question_small.png</normaloff>:/stylesheet/img/question_small.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_19">
-              <property name="text">
-               <string>Support</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_9">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_12">
-            <property name="spacing">
-             <number>8</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="pushButtonPressed">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>24</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question.png</normaloff>:/stylesheet/img/question.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="AzQtComponents::ButtonDivider" name="divider3" native="true"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="pushButtonPressedLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>24</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question.png</normaloff>:/stylesheet/img/question.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_17">
-              <property name="text">
-               <string>Support</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="AzQtComponents::ButtonDivider" name="divider4" native="true"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="pushButtonSmallPressed">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question_small.png</normaloff>:/stylesheet/img/question_small.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_20">
-              <property name="text">
-               <string>Support</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_8">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_13">
-            <property name="spacing">
-             <number>8</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="pushButtonHover">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>24</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question.png</normaloff>:/stylesheet/img/question.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="AzQtComponents::ButtonDivider" name="divider5" native="true"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="pushButtonHoverLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>24</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question.png</normaloff>:/stylesheet/img/question.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_18">
-              <property name="text">
-               <string>Support</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="AzQtComponents::ButtonDivider" name="divider6" native="true"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="pushButtonSmallHover">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/stylesheet/img/question_small.png</normaloff>:/stylesheet/img/question_small.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_21">
-              <property name="text">
-               <string>Support</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_5">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="6" column="1">
-        <widget class="QWidget" name="widget_4" native="true">
-         <layout class="QGridLayout" name="gridLayout_8">
-          <item row="0" column="0">
-           <widget class="QPushButton" name="pushButton">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Cancel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="pushButton_4">
-            <property name="text">
-             <string>Cancel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QPushButton" name="buttonOrange1">
-            <property name="text">
-             <string>Button</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="buttonOrange2">
-            <property name="text">
-             <string>Button</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="layoutsPage">
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <item alignment="Qt::AlignHCenter">
-        <widget class="QWidget" name="widget" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_7">
-          <property name="spacing">
-           <number>10</number>
-          </property>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_7">
-            <item>
-             <widget class="QLabel" name="label_9">
-              <property name="text">
-               <string>Filter Name:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="filterNameLineEdit">
-              <property name="minimumSize">
-               <size>
-                <width>200</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>200</width>
-                <height>23</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>character</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_6">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_8">
-            <property name="spacing">
-             <number>10</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="label_10">
-              <property name="text">
-               <string>Show assets which match</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="allCombo"/>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_11">
-              <property name="text">
-               <string>of the following conditions:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_7">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_6">
-            <item>
-             <widget class="ConditionGroupWidget" name="conditionGroup" native="true"/>
-            </item>
-           </layout>
-          </item>
-          <item alignment="Qt::AlignHCenter">
-           <widget class="DeploymentsWidget" name="deploymentsWidget" native="true"/>
-          </item>
-          <item>
-           <spacer name="verticalSpacer_7">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>25</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item alignment="Qt::AlignHCenter">
-           <widget class="AzQtComponents::TagSelector" name="tagSelector" native="true">
-            <property name="minimumSize">
-             <size>
-              <width>300</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>300</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="verticalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::StyledLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>AzQtComponents/Components/StyledLineEdit.h</header>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::VectorEdit</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/VectorEdit.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::StyledDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>AzQtComponents/Components/StyledSpinBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::StyledSpinBox</class>
-   <extends>AzQtComponents::StyledDoubleSpinBox</extends>
-   <header>AzQtComponents/Components/StyledSpinBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::ButtonStripe</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/ButtonStripe.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConditionGroupWidget</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/StyleGallery/ConditionGroupWidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::TagSelector</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/TagSelector.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>DeploymentsWidget</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/StyleGallery/DeploymentsWidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::TabWidget</class>
-   <extends>QTabWidget</extends>
-   <header>AzQtComponents/Components/Widgets/TabWidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::ToolButtonComboBox</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/ToolButtonComboBox.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::TitleBar</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/Titlebar.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::ButtonDivider</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/ButtonDivider.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AzQtComponents::FilteredSearchWidget</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/FilteredSearchWidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>horizontalSlider</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>progressBar</receiver>
-   <slot>setValue(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>535</x>
-     <y>403</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>535</x>
-     <y>375</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/triangles.svg b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/triangles.svg
deleted file mode 100644
index 445aa2a462..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/triangles.svg
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="triangles.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="175.07984"
-     inkscape:cy="551.37808"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="58"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="star"
-       style="fill:#cccccc;fill-rule:evenodd;stroke:#9d9e9f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:1"
-       id="path3344"
-       sodipodi:sides="3"
-       sodipodi:cx="380"
-       sodipodi:cy="403.79077"
-       sodipodi:r1="243.10912"
-       sodipodi:r2="121.55456"
-       sodipodi:arg1="0.51623067"
-       sodipodi:arg2="1.5634282"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 591.42857,523.79077 380.89562,525.34203 170.36266,526.89329 274.28571,343.79077 378.20876,160.68825 484.81867,342.23951 Z"
-       inkscape:transform-center-x="0.016954397"
-       inkscape:transform-center-y="0.65189465"
-       transform="matrix(-0.01892764,0,0,-0.01086489,180.59057,495.21492)"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#737475;fill-opacity:1;fill-rule:evenodd;stroke:#575859;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path3344-5"
-       sodipodi:sides="3"
-       sodipodi:cx="380"
-       sodipodi:cy="403.79077"
-       sodipodi:r1="243.10912"
-       sodipodi:r2="121.55456"
-       sodipodi:arg1="0.51623067"
-       sodipodi:arg2="1.5634282"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 591.42857,523.79077 380.89562,525.34203 170.36266,526.89329 274.28571,343.79077 378.20876,160.68825 484.81867,342.23951 Z"
-       inkscape:transform-center-x="0.016954397"
-       inkscape:transform-center-y="0.65189465"
-       transform="matrix(-0.01892764,0,0,-0.01086489,185.09108,503.38349)"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#323334;fill-opacity:1;fill-rule:evenodd;stroke:#959595;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path3344-5-8"
-       sodipodi:sides="3"
-       sodipodi:cx="380"
-       sodipodi:cy="403.79077"
-       sodipodi:r1="243.10912"
-       sodipodi:r2="121.55456"
-       sodipodi:arg1="0.51623067"
-       sodipodi:arg2="1.5634282"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 591.42857,523.79077 380.89562,525.34203 170.36266,526.89329 274.28571,343.79077 378.20876,160.68825 484.81867,342.23951 Z"
-       inkscape:transform-center-x="0.016954397"
-       inkscape:transform-center-y="0.65189465"
-       transform="matrix(-0.01892764,0,0,-0.01086489,170.507,509.8342)"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       inkscape:export-filename="C:\d\projects\amazon-style\img\triangle3.png" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#323334;fill-opacity:1;fill-rule:evenodd;stroke:#959595;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path3344-5-1"
-       sodipodi:sides="3"
-       sodipodi:cx="380"
-       sodipodi:cy="403.79077"
-       sodipodi:r1="243.10912"
-       sodipodi:r2="121.55456"
-       sodipodi:arg1="0.51623067"
-       sodipodi:arg2="1.5634282"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 591.42857,523.79077 380.89562,525.34203 170.36266,526.89329 274.28571,343.79077 378.20876,160.68825 484.81867,342.23951 Z"
-       inkscape:transform-center-x="-0.0169559"
-       inkscape:transform-center-y="-0.65188753"
-       transform="matrix(0.01892764,0,0,0.01086489,156.12199,496.40855)"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       inkscape:export-filename="C:\d\projects\amazon-style\img\double_triangles.png" />
-  </g>
-</svg>
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Tests/AzQtComponentTests.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Tests/AzQtComponentTests.cpp
index 70914a81c7..141028fd0a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Tests/AzQtComponentTests.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Tests/AzQtComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp
index fa988f68d1..5ca30016ac 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Tests/FloatToStringConversionTests.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Tests/FloatToStringConversionTests.cpp
index 6c86ecd73d..2d2cf5c73d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Tests/FloatToStringConversionTests.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Tests/FloatToStringConversionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Tests/HexParsingTests.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Tests/HexParsingTests.cpp
index 83b4ff47fc..0b63470561 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Tests/HexParsingTests.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Tests/HexParsingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Tests/StyleSheetCacheTests.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Tests/StyleSheetCacheTests.cpp
index 89d035c600..aa4120f764 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Tests/StyleSheetCacheTests.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Tests/StyleSheetCacheTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/AutoSettingsGroup.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/AutoSettingsGroup.h
index b75fda159e..b13f12472a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/AutoSettingsGroup.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/AutoSettingsGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ColorUtilities.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ColorUtilities.cpp
index 232e0c811d..ef4bc424e9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ColorUtilities.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ColorUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ColorUtilities.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ColorUtilities.h
index 9553d3cbb1..343ccea609 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ColorUtilities.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ColorUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/Conversions.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/Conversions.cpp
index e1b4cdd8ea..916694c155 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/Conversions.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/Conversions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/Conversions.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/Conversions.h
index 853c0a851b..944f95a83e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/Conversions.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/Conversions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/DesktopUtilities.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/DesktopUtilities.cpp
index fd0b136432..56f755568b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/DesktopUtilities.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/DesktopUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/DesktopUtilities.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/DesktopUtilities.h
index 2986e076c7..557fff00ae 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/DesktopUtilities.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/DesktopUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/HandleDpiAwareness.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/HandleDpiAwareness.cpp
index df1797c598..9ebb3fea9c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/HandleDpiAwareness.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/HandleDpiAwareness.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/HandleDpiAwareness.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/HandleDpiAwareness.h
index d1c8c2e63a..338257d19c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/HandleDpiAwareness.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/HandleDpiAwareness.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider.h
index f70f3b3605..b2460484e6 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_linux.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_linux.cpp
index 1c0158654a..5e5e64f5db 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_linux.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_mac.mm b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_mac.mm
index c7f3d4aabb..6605f3fdab 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_mac.mm
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_win.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_win.cpp
index 03fba64041..8e013c31a5 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_win.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/MouseHider_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtPluginPaths.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtPluginPaths.cpp
index 75e199f06c..0ab1aefd13 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtPluginPaths.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtPluginPaths.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtPluginPaths.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtPluginPaths.h
index 8c043f6576..f99f6b6bb5 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtPluginPaths.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtPluginPaths.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtViewPaneEffects.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtViewPaneEffects.cpp
index 763c7c2907..5ad481df5c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtViewPaneEffects.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtViewPaneEffects.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtViewPaneEffects.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtViewPaneEffects.h
index 940bb9416c..8fc9b498fe 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtViewPaneEffects.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtViewPaneEffects.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities.cpp
index 928cf640f5..a5c029274e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities.h
index f7db6308eb..50dedc801d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_linux.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_linux.cpp
index e67af5b0c8..4e4dfbdeb5 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_linux.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_mac.mm b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_mac.mm
index 84c4f1b1cb..5bbdb8f971 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_mac.mm
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_win.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_win.cpp
index 90e6c0ebd7..ec021e9c4c 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_win.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/QtWindowUtilities_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/RandomNumberGenerator.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/RandomNumberGenerator.cpp
index 29f5b87523..52a44825a4 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/RandomNumberGenerator.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/RandomNumberGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/RandomNumberGenerator.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/RandomNumberGenerator.h
index 401b68981e..430adf7af0 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/RandomNumberGenerator.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/RandomNumberGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScopedCleanup.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScopedCleanup.h
index 25e65b0264..a0f7348591 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScopedCleanup.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScopedCleanup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber.h
index f1e629fb54..625a4e9fd9 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_linux.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_linux.cpp
index 6ddcbcba5e..368a40673e 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_linux.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_mac.mm b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_mac.mm
index 75cf6db8a4..fc2d27704f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_mac.mm
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_win.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_win.cpp
index 0ba8964f36..eccba83221 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_win.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenUtilities.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenUtilities.cpp
index 1e78f2cb4f..3e82bc2170 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenUtilities.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenUtilities.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenUtilities.h
index a4cd621a24..61cc97c6cb 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenUtilities.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/SelectionProxyModel.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/SelectionProxyModel.cpp
index 746f65ab79..db03e1ef3b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/SelectionProxyModel.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/SelectionProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/SelectionProxyModel.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/SelectionProxyModel.h
index f8913e59aa..dc647a3d26 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/SelectionProxyModel.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/SelectionProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/TextUtilities.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/TextUtilities.cpp
index 61f3959c2a..b025667b8d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/TextUtilities.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/TextUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/Utilities/TextUtilities.h b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/TextUtilities.h
index 8be0faa74f..a0a7c6c9d5 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Utilities/TextUtilities.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Utilities/TextUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_files.cmake b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_files.cmake
index 4d24b402e9..cd00aff988 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_files.cmake
+++ b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_gallery_files.cmake b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_gallery_files.cmake
index 01e21dbd50..b93c93a823 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_gallery_files.cmake
+++ b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_gallery_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_rpestandalone_files.cmake b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_rpestandalone_files.cmake
index bd73d6dd59..2d2c20574f 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_rpestandalone_files.cmake
+++ b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_rpestandalone_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_style_files.cmake b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_style_files.cmake
deleted file mode 100644
index 598309d1ff..0000000000
--- a/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_style_files.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    StyleGallery/ConditionGroupWidget.cpp
-    StyleGallery/ConditionGroupWidget.h
-    StyleGallery/ConditionWidget.cpp
-    StyleGallery/ConditionWidget.h
-    StyleGallery/DeploymentsWidget.cpp
-    StyleGallery/DeploymentsWidget.h
-    StyleGallery/deploymentswidget.ui
-    StyleGallery/main.cpp
-    StyleGallery/mainwidget.cpp
-    StyleGallery/mainwidget.h
-    StyleGallery/mainwidget.ui
-    StyleGallery/MyCombo.cpp
-    StyleGallery/MyCombo.h
-    StyleGallery/ViewportTitleDlg.cpp
-    StyleGallery/ViewportTitleDlg.h
-    StyleGallery/ViewportTitleDlg.ui
-)
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_testing_files.cmake b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_testing_files.cmake
index bfe00cf495..aa0155fd96 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_testing_files.cmake
+++ b/Code/Framework/AzQtComponents/AzQtComponents/azqtcomponents_testing_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/CMakeLists.txt b/Code/Framework/AzQtComponents/CMakeLists.txt
index 48c4d31469..d97ad4c59f 100644
--- a/Code/Framework/AzQtComponents/CMakeLists.txt
+++ b/Code/Framework/AzQtComponents/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -40,26 +40,8 @@ ly_add_target(
             AZ::AzCore
 )
 
-# DEPRECATED: this target was marked as deprecated in the VS filter
 ly_add_target(
-    NAME AmazonStyle APPLICATION
-    NAMESPACE AZ
-    AUTOMOC
-    AUTOUIC
-    FILES_CMAKE
-        AzQtComponents/azqtcomponents_style_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            .
-            AzQtComponents
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Widgets
-            AZ::AzQtComponents
-)
-
-ly_add_target(
-    NAME AmazonQtControlGallery APPLICATION
+    NAME O3DEQtControlGallery APPLICATION
     NAMESPACE AZ
     AUTOMOC
     AUTOUIC
diff --git a/Code/Framework/AzQtComponents/Platform/Common/Default/AzQtComponents/Utilities/HandleDpiAwareness_Default.cpp b/Code/Framework/AzQtComponents/Platform/Common/Default/AzQtComponents/Utilities/HandleDpiAwareness_Default.cpp
index 4648c4c19f..0c035f200d 100644
--- a/Code/Framework/AzQtComponents/Platform/Common/Default/AzQtComponents/Utilities/HandleDpiAwareness_Default.cpp
+++ b/Code/Framework/AzQtComponents/Platform/Common/Default/AzQtComponents/Utilities/HandleDpiAwareness_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/Platform/Linux/AzQtComponents/Components/StyledDockWidget_Linux.cpp b/Code/Framework/AzQtComponents/Platform/Linux/AzQtComponents/Components/StyledDockWidget_Linux.cpp
index 806670eab2..8d7d56df96 100644
--- a/Code/Framework/AzQtComponents/Platform/Linux/AzQtComponents/Components/StyledDockWidget_Linux.cpp
+++ b/Code/Framework/AzQtComponents/Platform/Linux/AzQtComponents/Components/StyledDockWidget_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/Platform/Linux/platform_linux.cmake b/Code/Framework/AzQtComponents/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzQtComponents/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/AzQtComponents/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/Platform/Mac/AzQtComponents/Components/StyledDockWidget_Mac.cpp b/Code/Framework/AzQtComponents/Platform/Mac/AzQtComponents/Components/StyledDockWidget_Mac.cpp
index 806670eab2..8d7d56df96 100644
--- a/Code/Framework/AzQtComponents/Platform/Mac/AzQtComponents/Components/StyledDockWidget_Mac.cpp
+++ b/Code/Framework/AzQtComponents/Platform/Mac/AzQtComponents/Components/StyledDockWidget_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/Platform/Mac/platform_mac.cmake b/Code/Framework/AzQtComponents/Platform/Mac/platform_mac.cmake
index bdb1867450..a09cf33f46 100644
--- a/Code/Framework/AzQtComponents/Platform/Mac/platform_mac.cmake
+++ b/Code/Framework/AzQtComponents/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzQtComponents/Platform/Windows/AzQtComponents/Components/StyledDockWidget_Windows.cpp b/Code/Framework/AzQtComponents/Platform/Windows/AzQtComponents/Components/StyledDockWidget_Windows.cpp
index 4e51821c9f..089f7bef9b 100644
--- a/Code/Framework/AzQtComponents/Platform/Windows/AzQtComponents/Components/StyledDockWidget_Windows.cpp
+++ b/Code/Framework/AzQtComponents/Platform/Windows/AzQtComponents/Components/StyledDockWidget_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/Platform/Windows/AzQtComponents/Utilities/HandleDpiAwareness_Windows.cpp b/Code/Framework/AzQtComponents/Platform/Windows/AzQtComponents/Utilities/HandleDpiAwareness_Windows.cpp
index ebff38a5c9..7e7b45433b 100644
--- a/Code/Framework/AzQtComponents/Platform/Windows/AzQtComponents/Utilities/HandleDpiAwareness_Windows.cpp
+++ b/Code/Framework/AzQtComponents/Platform/Windows/AzQtComponents/Utilities/HandleDpiAwareness_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzQtComponents/Platform/Windows/platform_windows.cmake b/Code/Framework/AzQtComponents/Platform/Windows/platform_windows.cmake
index 4ca0a39a88..30d3209953 100644
--- a/Code/Framework/AzQtComponents/Platform/Windows/platform_windows.cmake
+++ b/Code/Framework/AzQtComponents/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/AzTest.cpp b/Code/Framework/AzTest/AzTest/AzTest.cpp
index b9742c3ff6..3b1b276eb4 100644
--- a/Code/Framework/AzTest/AzTest/AzTest.cpp
+++ b/Code/Framework/AzTest/AzTest/AzTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/AzTest.h b/Code/Framework/AzTest/AzTest/AzTest.h
index 3f39c40c2a..f5ea61c035 100644
--- a/Code/Framework/AzTest/AzTest/AzTest.h
+++ b/Code/Framework/AzTest/AzTest/AzTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/ColorizedOutput.cpp b/Code/Framework/AzTest/AzTest/ColorizedOutput.cpp
index 13ed2d0c89..c8fe3d9aa2 100644
--- a/Code/Framework/AzTest/AzTest/ColorizedOutput.cpp
+++ b/Code/Framework/AzTest/AzTest/ColorizedOutput.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/GemTestEnvironment.cpp b/Code/Framework/AzTest/AzTest/GemTestEnvironment.cpp
index 339ed308fb..388a315333 100644
--- a/Code/Framework/AzTest/AzTest/GemTestEnvironment.cpp
+++ b/Code/Framework/AzTest/AzTest/GemTestEnvironment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/GemTestEnvironment.h b/Code/Framework/AzTest/AzTest/GemTestEnvironment.h
index 62e1ae368e..ef28d2b35a 100644
--- a/Code/Framework/AzTest/AzTest/GemTestEnvironment.h
+++ b/Code/Framework/AzTest/AzTest/GemTestEnvironment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform.h b/Code/Framework/AzTest/AzTest/Platform.h
index 4c5bbbc8a8..1d8d1dad5c 100644
--- a/Code/Framework/AzTest/AzTest/Platform.h
+++ b/Code/Framework/AzTest/AzTest/Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Android/AzTest_Traits_Android.h b/Code/Framework/AzTest/AzTest/Platform/Android/AzTest_Traits_Android.h
index f03b27a156..6e18b1192d 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Android/AzTest_Traits_Android.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Android/AzTest_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Android/AzTest_Traits_Platform.h b/Code/Framework/AzTest/AzTest/Platform/Android/AzTest_Traits_Platform.h
index dac60fc790..1a1fa20b7e 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Android/AzTest_Traits_Platform.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Android/AzTest_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Android/Platform_Android.cpp b/Code/Framework/AzTest/AzTest/Platform/Android/Platform_Android.cpp
index 844dfb6465..66c5d3c002 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Android/Platform_Android.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Android/Platform_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp b/Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp
index 8271123b6c..d3345a71f6 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Android/platform_android.cmake b/Code/Framework/AzTest/AzTest/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Android/platform_android.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/Android/platform_android_files.cmake b/Code/Framework/AzTest/AzTest/Platform/Android/platform_android_files.cmake
index 3d6aea1cb7..d870bdd8ab 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/AzTest/ColorizedOutput_Unimplemented.cpp b/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/AzTest/ColorizedOutput_Unimplemented.cpp
index b93538168c..a1f3fb9581 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/AzTest/ColorizedOutput_Unimplemented.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/AzTest/ColorizedOutput_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/AzTest/ScopedAutoTempDirectory_Unimplemented.cpp b/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/AzTest/ScopedAutoTempDirectory_Unimplemented.cpp
index 8d8dde4246..76e6da1102 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/AzTest/ScopedAutoTempDirectory_Unimplemented.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/AzTest/ScopedAutoTempDirectory_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/Platform_Unimplemented.cpp b/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/Platform_Unimplemented.cpp
index df642af7b4..3523056884 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/Platform_Unimplemented.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Common/Unimplemented/Platform_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Common/UnixLike/AzTest/ColorizedOutput_UnixLike.cpp b/Code/Framework/AzTest/AzTest/Platform/Common/UnixLike/AzTest/ColorizedOutput_UnixLike.cpp
index 8e605a7cbd..e2491f73d8 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Common/UnixLike/AzTest/ColorizedOutput_UnixLike.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Common/UnixLike/AzTest/ColorizedOutput_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Common/UnixLike/AzTest/ScopedAutoTempDirectory_UnixLike.cpp b/Code/Framework/AzTest/AzTest/Platform/Common/UnixLike/AzTest/ScopedAutoTempDirectory_UnixLike.cpp
index 4f27499f53..fb57fbec19 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Common/UnixLike/AzTest/ScopedAutoTempDirectory_UnixLike.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Common/UnixLike/AzTest/ScopedAutoTempDirectory_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Common/WinAPI/AzTest/ColorizedOutput_WinAPI.cpp b/Code/Framework/AzTest/AzTest/Platform/Common/WinAPI/AzTest/ColorizedOutput_WinAPI.cpp
index 315e33a43a..30d68c939e 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Common/WinAPI/AzTest/ColorizedOutput_WinAPI.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Common/WinAPI/AzTest/ColorizedOutput_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
index f8bc2e51a0..c27b22c84d 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Platform.h b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Platform.h
index ce874861dd..967a8ef1ac 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Platform.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Linux/Platform_Linux.cpp b/Code/Framework/AzTest/AzTest/Platform/Linux/Platform_Linux.cpp
index e589cbd16d..f7deeb656c 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Linux/Platform_Linux.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Linux/Platform_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Linux/platform_linux.cmake b/Code/Framework/AzTest/AzTest/Platform/Linux/platform_linux.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzTest/AzTest/Platform/Linux/platform_linux_files.cmake
index 29e5c9ff6f..f67015560e 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/Mac/AzTest_Traits_Mac.h b/Code/Framework/AzTest/AzTest/Platform/Mac/AzTest_Traits_Mac.h
index f4837486ec..588ab85f9d 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Mac/AzTest_Traits_Mac.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Mac/AzTest_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Mac/AzTest_Traits_Platform.h b/Code/Framework/AzTest/AzTest/Platform/Mac/AzTest_Traits_Platform.h
index 1cc5e24332..ea0a74900b 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Mac/AzTest_Traits_Platform.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Mac/AzTest_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Mac/Platform_Mac.cpp b/Code/Framework/AzTest/AzTest/Platform/Mac/Platform_Mac.cpp
index 975f2d1074..33b0ed9847 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Mac/Platform_Mac.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Mac/Platform_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Mac/platform_mac.cmake b/Code/Framework/AzTest/AzTest/Platform/Mac/platform_mac.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Mac/platform_mac.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzTest/AzTest/Platform/Mac/platform_mac_files.cmake
index c01ba6f914..250d5742ea 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/Windows/AzTest_Traits_Platform.h b/Code/Framework/AzTest/AzTest/Platform/Windows/AzTest_Traits_Platform.h
index e4fe538f3b..f6e96f4a99 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Windows/AzTest_Traits_Platform.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Windows/AzTest_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Windows/AzTest_Traits_Windows.h b/Code/Framework/AzTest/AzTest/Platform/Windows/AzTest_Traits_Windows.h
index d5fa8c38bc..c9474e4451 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Windows/AzTest_Traits_Windows.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Windows/AzTest_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Windows/Platform_Windows.cpp b/Code/Framework/AzTest/AzTest/Platform/Windows/Platform_Windows.cpp
index 98b5bcc50e..800d2dc8fd 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Windows/Platform_Windows.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Windows/Platform_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Windows/ScopedAutoTempDirectory_Windows.cpp b/Code/Framework/AzTest/AzTest/Platform/Windows/ScopedAutoTempDirectory_Windows.cpp
index 92591c67b2..6803bbf3dd 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Windows/ScopedAutoTempDirectory_Windows.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/Windows/ScopedAutoTempDirectory_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/Windows/platform_windows.cmake b/Code/Framework/AzTest/AzTest/Platform/Windows/platform_windows.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Windows/platform_windows.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzTest/AzTest/Platform/Windows/platform_windows_files.cmake
index 35a7e58d19..5d6e4104a7 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/iOS/AzTest_Traits_Platform.h b/Code/Framework/AzTest/AzTest/Platform/iOS/AzTest_Traits_Platform.h
index 286b00a11c..0f6d57bd0b 100644
--- a/Code/Framework/AzTest/AzTest/Platform/iOS/AzTest_Traits_Platform.h
+++ b/Code/Framework/AzTest/AzTest/Platform/iOS/AzTest_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/iOS/AzTest_Traits_iOS.h b/Code/Framework/AzTest/AzTest/Platform/iOS/AzTest_Traits_iOS.h
index f4837486ec..588ab85f9d 100644
--- a/Code/Framework/AzTest/AzTest/Platform/iOS/AzTest_Traits_iOS.h
+++ b/Code/Framework/AzTest/AzTest/Platform/iOS/AzTest_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/iOS/Platform_iOS.cpp b/Code/Framework/AzTest/AzTest/Platform/iOS/Platform_iOS.cpp
index 6be602ff62..2054e88b76 100644
--- a/Code/Framework/AzTest/AzTest/Platform/iOS/Platform_iOS.cpp
+++ b/Code/Framework/AzTest/AzTest/Platform/iOS/Platform_iOS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Platform/iOS/platform_ios.cmake b/Code/Framework/AzTest/AzTest/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzTest/AzTest/Platform/iOS/platform_ios.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzTest/AzTest/Platform/iOS/platform_ios_files.cmake
index 692d57b0c7..2e39d7b780 100644
--- a/Code/Framework/AzTest/AzTest/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/AzTest/AzTest/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/AzTest/Utils.cpp b/Code/Framework/AzTest/AzTest/Utils.cpp
index 39bb7a0355..681fe413af 100644
--- a/Code/Framework/AzTest/AzTest/Utils.cpp
+++ b/Code/Framework/AzTest/AzTest/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/Utils.h b/Code/Framework/AzTest/AzTest/Utils.h
index 64e73d6898..9d80b96d36 100644
--- a/Code/Framework/AzTest/AzTest/Utils.h
+++ b/Code/Framework/AzTest/AzTest/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzTest/AzTest/aztest_files.cmake b/Code/Framework/AzTest/AzTest/aztest_files.cmake
index 2edf58c480..519ed51ba4 100644
--- a/Code/Framework/AzTest/AzTest/aztest_files.cmake
+++ b/Code/Framework/AzTest/AzTest/aztest_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzTest/CMakeLists.txt b/Code/Framework/AzTest/CMakeLists.txt
index 8d0afb37c8..34a8dacdb4 100644
--- a/Code/Framework/AzTest/CMakeLists.txt
+++ b/Code/Framework/AzTest/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/AssetDatabaseBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/AssetDatabaseBus.h
index 22f20ad324..c3554ea50c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/AssetDatabaseBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/AssetDatabaseBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentEntityObjectBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentEntityObjectBus.h
index 1c56de77ef..ab7e4be2dd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentEntityObjectBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentEntityObjectBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentEntitySelectionBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentEntitySelectionBus.h
index d2b3eace9e..5502df4226 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentEntitySelectionBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentEntitySelectionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAnimationSystemRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAnimationSystemRequestBus.h
index be56624fe6..1a785a6309 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAnimationSystemRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAnimationSystemRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h
index b2aeb85674..5ff1bbeb6a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.cpp
index 69c398cbd6..c68e04d402 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.h
index e77c55aed0..0b1dc1a51d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorEntityAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorEntityAPI.h
index d293840c2c..b3fb4d578c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorEntityAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorEntityAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorLevelNotificationBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorLevelNotificationBus.h
index c2e0c92ed6..d2aa632b57 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorLevelNotificationBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorLevelNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonConsoleBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonConsoleBus.h
index 7a2b2e6b3f..51aecbd8e7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonConsoleBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonConsoleBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonRunnerRequestsBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonRunnerRequestsBus.h
index cef9e1dacc..1a3631a9b5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonRunnerRequestsBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonRunnerRequestsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h
index 5224ee9625..f86c21c9c8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorViewportIconDisplayInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorViewportIconDisplayInterface.h
index b74de38345..805b188abf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorViewportIconDisplayInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorViewportIconDisplayInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorWindowRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorWindowRequestBus.h
index af963145b9..03bb76b03a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorWindowRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorWindowRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionNotificationBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionNotificationBus.h
index adbc0b2fee..122c692d94 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionNotificationBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionRequestBus.h
index 753e311707..a8125a23e9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityPropertyEditorRequestsBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityPropertyEditorRequestsBus.h
index 5253acca46..e491f4835b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityPropertyEditorRequestsBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityPropertyEditorRequestsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
index 107e67eab6..db78866f2e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewPaneOptions.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewPaneOptions.h
index a7b7e3b33b..9583312f66 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewPaneOptions.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewPaneOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.cpp
index 20bbe7e295..fd6ca3d845 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h
index d4143ab7c6..b1c4b47886 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Application/Ticker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/Ticker.cpp
index 63a0a32947..898b4ca02e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/Ticker.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/Ticker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Application/Ticker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/Ticker.h
index fdb6271b9a..355a3f4c1c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/Ticker.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/Ticker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
index 7dc0587475..95f13dc649 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -45,6 +45,7 @@
 #include <AzToolsFramework/UI/UICore/QTreeViewStateSaver.hxx>
 #include <AzToolsFramework/UI/UICore/QWidgetSavedState.h>
 #include <AzToolsFramework/UI/UICore/ProgressShield.hxx>
+#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
 #include <AzToolsFramework/Slice/SliceUtilities.h>
 #include <AzToolsFramework/ToolsComponents/EditorInspectorComponent.h>
 #include <AzToolsFramework/API/ComponentEntityObjectBus.h>
@@ -1589,7 +1590,13 @@ namespace AzToolsFramework
                 // Multiple changes to the same entity are just split between different undo nodes.
                 for (AZ::EntityId entityId : m_dirtyEntities)
                 {
-                    prefabPublicInterface->GenerateUndoNodesForEntityChangeAndUpdateCache(entityId, m_currentBatchUndo);
+                    auto outcome = prefabPublicInterface->GenerateUndoNodesForEntityChangeAndUpdateCache(entityId, m_currentBatchUndo);
+
+                    if (!outcome.IsSuccess())
+                    {
+                        QMessageBox::warning(
+                            AzToolsFramework::GetActiveWindow(), QString("Error"), QString(outcome.GetError().c_str()), QMessageBox::Ok, QMessageBox::Ok);
+                    }
                 }
             }
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
index a823132d48..96277bd1b5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveAPI.h
index 35613aae0d..81bfe60c8d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.cpp
index 02e235d126..0bbf3ea33c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.h
index 99ee62599d..9da8c5db23 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/NullArchiveComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/NullArchiveComponent.cpp
index 384483afe2..c7c23d8075 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/NullArchiveComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/NullArchiveComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/NullArchiveComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/NullArchiveComponent.h
index 8d66a59398..9ad465ec25 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/NullArchiveComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/NullArchiveComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetBundler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetBundler.cpp
index a6a70395bd..aa9528efd8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetBundler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetBundler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetBundler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetBundler.h
index 78ea542af2..dff21bd456 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetBundler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetBundler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetDebugInfo.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetDebugInfo.cpp
index 4fd665d374..0b692a0ccf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetDebugInfo.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetDebugInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetDebugInfo.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetDebugInfo.h
index 924e14d12f..3de92d91db 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetDebugInfo.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetDebugInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp
index e9924fee30..3b06a1e249 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.h
index 300f8b4d46..9d68f26f19 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSeedManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSeedManager.cpp
index 8effe11e48..a17de15b46 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSeedManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSeedManager.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSeedManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSeedManager.h
index 51b2bb5399..0eb7c95906 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSeedManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSeedManager.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp
index f99893a7f3..cf96a624fb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.h
index 264ba86de0..d419962259 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
index ea164c427e..69bebf6600 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.h
index 8ba7d1aab3..ed4e67222b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserBus.h
index 1754cd377a..97a6e158be 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserBus.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserBus.inl
index 558dc86007..b06419522f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserBus.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserBus.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
index da30bd5232..14038069dd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.h
index a2c533645d..12e2f81a3d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserEntry.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserEntry.h
index 903c3b8b0a..76fa850163 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserEntry.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp
index 9bbdbc8442..6eb481ba6c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.h
index c84b6fecaa..e4362a4d7a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserModel.cpp
index 069ac6de84..f70d0ab904 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserModel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserModel.h
index 572f040f78..b303c229f8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserModel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserSourceDropBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserSourceDropBus.h
index dde9f90918..c5dedfa778 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserSourceDropBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserSourceDropBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChange.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChange.h
index 847994410e..e9b2b55625 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChange.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChange.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChangeset.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChangeset.cpp
index 646db7b43e..b3dc27fadf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChangeset.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChangeset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChangeset.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChangeset.h
index c36d6505c4..4f4ad82a31 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChangeset.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetEntryChangeset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
index 15d0fd5af1..9411424f0e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h
index 35504e512b..04890ede72 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp
index 3653439cfd..7d7c0907c1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.h
index 4f12a57fed..56e48ce9d3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/EBusFindAssetTypeByName.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/EBusFindAssetTypeByName.h
index 5becff49a6..24df133c3f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/EBusFindAssetTypeByName.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/EBusFindAssetTypeByName.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.cpp
index 90695e6176..1007ad280d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.h
index 3a4f2bc7cb..e061e7fc77 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.inl
index c2861d9f20..99ad927a88 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.cpp
index 2447f5668c..fe0cc0ec43 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.h
index 8be5737e0e..6c73002f42 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/FolderAssetBrowserEntry.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/FolderAssetBrowserEntry.cpp
index f94bc1efb1..f14420a355 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/FolderAssetBrowserEntry.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/FolderAssetBrowserEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/FolderAssetBrowserEntry.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/FolderAssetBrowserEntry.h
index 4a2f90416f..f86513d16b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/FolderAssetBrowserEntry.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/FolderAssetBrowserEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.cpp
index b34afb0a7d..58431f1767 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.h
index a5b73e8e44..9ae1593a45 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
index 507ed497cf..4708d9def8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h
index bca2cbb561..883f9dec01 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.cpp
index 19aea8bc73..e45c234c92 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h
index ef3f473b94..4b588454f9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/EmptyPreviewer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/EmptyPreviewer.cpp
index e2ea6bed66..6d143b3a25 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/EmptyPreviewer.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/EmptyPreviewer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/EmptyPreviewer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/EmptyPreviewer.h
index fbe3e3a048..5cffa7abea 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/EmptyPreviewer.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/EmptyPreviewer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/Previewer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/Previewer.cpp
index 6dafc1f7fb..23878826d2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/Previewer.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/Previewer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/Previewer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/Previewer.h
index 0dd8726d5d..e0c6f33182 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/Previewer.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/Previewer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerBus.h
index 0f1ccdfb0d..742389ea56 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFactory.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFactory.h
index d44b165a14..bc09e6cdcd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFactory.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.cpp
index 1570d1f93e..ebf72ab2a6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.h
index 4da0a5ed57..5251b05811 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/Filter.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/Filter.cpp
index ede9568f4b..1b9396a3fa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/Filter.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/Filter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/Filter.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/Filter.h
index a2d2e2aeda..e31c551330 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/Filter.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/Filter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/FilterByWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/FilterByWidget.cpp
index 81b6ac2505..a5c2d2e808 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/FilterByWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/FilterByWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/FilterByWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/FilterByWidget.h
index 82ab35f3f7..e7df3b9641 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/FilterByWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/FilterByWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchAssetTypeSelectorWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchAssetTypeSelectorWidget.cpp
index 44d8db0521..f1385fa2f1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchAssetTypeSelectorWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchAssetTypeSelectorWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchAssetTypeSelectorWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchAssetTypeSelectorWidget.h
index b0cba12bb4..ec48d1b147 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchAssetTypeSelectorWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchAssetTypeSelectorWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchParametersWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchParametersWidget.cpp
index f5b1115fdf..898cce9415 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchParametersWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchParametersWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchParametersWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchParametersWidget.h
index a2fa0a16e4..2dd9c1d707 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchParametersWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchParametersWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchWidget.cpp
index 74a4e3ce9d..0ec27ff6c6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchWidget.h
index 879100787d..b256e81496 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Search/SearchWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/SortFilterProxyModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/SortFilterProxyModel.cpp
index 3aa3fd22bd..3b499465cf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/SortFilterProxyModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/SortFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/AssetBrowserProductThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/AssetBrowserProductThumbnail.cpp
index c3e4f22003..24c9158f18 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/AssetBrowserProductThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/AssetBrowserProductThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp
index 5197ec75ce..0ac2127244 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h
index 0c563b7706..93b2e0a6fa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
index 7136995b15..8cae683848 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h
index 80ea876501..a6dd416c12 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
index cb4572502c..bc30021baf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h
index 1f42b7e124..232a94778f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.cpp
index 63f4f5ce41..b814f17715 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.h
index fd77a773fd..920441bd26 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
index 900f1874cd..9db1e2e170 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h
index 67c6633bf3..c0af7996cd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
index 721ef06c01..e70ae248b3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.h
index 92fe7ba0fa..8b3bcd5b49 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleAPI.h
index 900498e9fb..3f65ee380b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
index fcc9fe09fb..a21bba0add 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.h
index 75962e6836..adc810f969 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.cpp
index b089cba832..d0a0852ecb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h
index 6975d2cd9c..e1da359576 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogBus.h
index fcd6a5d0d3..0094d3ef64 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.cpp
index 02aaa43321..d10ade0aa8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.h
index de59da6775..ffd2020a9a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp
index 54962bcb1d..4485b0fc5e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h
index d2e4eade2c..e7e7522908 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorBus.h
index d041e61727..260ce3824d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.cpp
index 30a65780be..d2e5225745 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.h
index 465f596b47..3b0d8794c1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorUtils.h
index a238b9d5f6..578ebbcd1a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp
index 37733702ba..a13e5acf84 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.h
index 47d05eac3a..7acd6e630e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
index b6be9ec974..0b757da960 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.h
index c09a49ecff..4357d485cf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
index f0fd233d87..2c3443a910 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.cpp
index f9a03bc0bc..966b2c3aa6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.h
index be8b52413d..67472d496d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/ComponentModeCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/ComponentModeCommand.cpp
index a70952d773..62d3093428 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/ComponentModeCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/ComponentModeCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/ComponentModeCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/ComponentModeCommand.h
index 92476d3e37..799ce4e037 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/ComponentModeCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/ComponentModeCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.cpp
index 378eae3291..8c5223ed9f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.h
index f50304d4c6..6e19e0762d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.cpp
index 8eefd79656..d6f10bab03 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.h
index 4d2cd5e399..3417b24b5d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityManipulatorCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityManipulatorCommand.cpp
index c76efb1235..9ad69f45db 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityManipulatorCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityManipulatorCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityManipulatorCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityManipulatorCommand.h
index 3999fba524..f714269f68 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityManipulatorCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityManipulatorCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp
index baab400390..a6cad1ff65 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.h
index 571b05f7c2..14111bbabe 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.cpp
index 8af6d536ab..7c6fc8381d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.h
index 67138cf86f..708f57d327 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/LegacyCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/LegacyCommand.h
index af9cee44a1..075276f7a4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/LegacyCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/LegacyCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp
index 556be128cf..a967b654cd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.h
index 1d9df0d714..c820d8e147 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.cpp
index 74654e1958..a416188a01 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.h
index 2e92c56f53..9dbb4f6ab9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp
index 94e67b7f65..07c076873f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.h
index 4ce0940724..8a71f18c2e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.cpp
index 06b8c81068..27bce797bd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.h
index eba64b0dd9..9dde68d2f7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIBus.h
index 4dd7417cb9..ce2eb1089c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp
index d2d560cbde..61e0788135 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.h
index a8cbc3bdc7..f4cd158d9b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIBus.h
index a73a7779ef..9580ed5236 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIComponent.cpp
index 065b790a32..9a430fafcc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIComponent.h
index 17a12e1f1c..1f253efed0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorLevelComponentAPIComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp
index 1730885511..a17720c97d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.h
index 5a18034d32..93f5344a7b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeDelegate.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeDelegate.cpp
index 8c1350e671..33a1601ff4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeDelegate.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeDelegate.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeDelegate.h
index f0bf6a34c1..384603b192 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeDelegate.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUi.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUi.cpp
index 97c84b674e..3568658daf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUi.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUi.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUi.h
index a88ff36547..19286d367b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUi.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUiRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUiRequestBus.h
index 19a3b9ea3c..ce7a701838 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUiRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeViewportUiRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp
index b678c73559..819d8a0d5c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.h
index 42905707d2..c210cfd172 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorComponentModeBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorComponentModeBus.h
index 789816a23a..4bee225f2b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorComponentModeBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorComponentModeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxComponentMode.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxComponentMode.cpp
index ba48e8ba22..0d80bc64fd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxComponentMode.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxComponentMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxComponentMode.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxComponentMode.h
index 4aa0775434..7e2e571c3a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxComponentMode.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.cpp
index ac36bf0d38..f7291ca573 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.h
index d7dd141cd7..e862d6dd11 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContext.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContext.h
index 04c87dd276..4f14399ad9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContext.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContext.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContext.inl
index a016a3ad52..e3852dd148 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContext.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContext.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.cpp
index 800572d494..cf4f815f4a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.h
index fc6e74a7a2..5d1c4cb169 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.inl
index 76fbeefaff..19d10b6515 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextBufferedFormatter.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextLogFormatter.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextLogFormatter.cpp
index 4dde9fd3a8..f1f6a91825 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextLogFormatter.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextLogFormatter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextLogFormatter.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextLogFormatter.h
index f4a9db9d9a..7284f98185 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextLogFormatter.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextLogFormatter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextMultiStackHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextMultiStackHandler.cpp
index 4860d179f8..5a5f5cac5c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextMultiStackHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextMultiStackHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextMultiStackHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextMultiStackHandler.h
index ed3a69f14a..36b86149f0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextMultiStackHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextMultiStackHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextSingleStackHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextSingleStackHandler.cpp
index 818339ff06..7dab69d383 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextSingleStackHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextSingleStackHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextSingleStackHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextSingleStackHandler.h
index 660a09e3da..af486906b4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextSingleStackHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextSingleStackHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStack.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStack.cpp
index 2fcbafbeb1..66048e4142 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStack.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStack.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStack.h
index 556d370703..261e07db9c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStack.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStackInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStackInterface.h
index 3d19ea95f9..367801098c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStackInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Debug/TraceContextStackInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/EditorContextMenuBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/EditorContextMenuBus.h
index 55d43faa06..338deb6c62 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/EditorContextMenuBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/EditorContextMenuBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/EditorSettingsAPIBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/EditorSettingsAPIBus.h
index 4f037b870a..324a46b4dc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/EditorSettingsAPIBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/EditorSettingsAPIBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityAPIBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityAPIBus.h
index e54b8eb30c..d87e5639b9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityAPIBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityAPIBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.cpp
index d407d6d369..2aaf7826ef 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.h
index 2628ba0898..1acaa4bebb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h
index 287fe86d83..4ff7c6916c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.cpp
index c386ced0f3..daaac12f14 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.h
index c6104cb5d3..706400a49c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextPickingBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextPickingBus.h
index 9539a22274..6050aa4fdd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextPickingBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextPickingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp
index 26967c4112..502dd8cfa6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.h
index 9022768c66..e86c87040d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
index 9686e0ac98..ddb61e6307 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.h
index 70f488a85c..8b1a38cecb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityInfoBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityInfoBus.h
index e6206a1b7a..5629207ab0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityInfoBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityInfoBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp
index 465de44049..2f832b5d5d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h
index afd52915d5..ca5d3e5d9c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelBus.h
index 395933a901..d232640c97 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.cpp
index be68322e25..6465944811 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.h
index 24b26aa849..0fc203e3f1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityRuntimeActivationBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityRuntimeActivationBus.h
index 119d3d82b8..925f2d7d99 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityRuntimeActivationBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityRuntimeActivationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchBus.h
index b134e6b23b..d45ca05452 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchComponent.cpp
index f263f42b38..9ae135c5a8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchComponent.h
index 35381be624..0b32ce1587 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySearchComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortBus.h
index 528cea4029..6cea813809 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp
index 19bdc5c2c7..61a35d6c04 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h
index a2f27f298d..c1252253ec 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityStartStatus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityStartStatus.h
index 4a19f85d50..f9e6c4a752 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityStartStatus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityStartStatus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityTransformBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityTransformBus.h
index 76215caddf..198dda2a05 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityTransformBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityTransformBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
index 49bdc2ca49..f629a92795 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
index c308a73874..8c541a2392 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
index 6d37f59347..777486d27a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp
index 87ce7a70cc..7d496a9913 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.h
index b759b3795f..d001de08f3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h
index fdd2e97e6f..cc6206d53b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.cpp
index d8a246c7ef..1a9ef476c1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.h
index aee0f2fa01..a711c153f0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.cpp
index 7c9c8cf533..96ba50cac4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.h
index ac10760eea..1f6d1371d4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/AngularManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.cpp
index c340f3b251..383a69e20d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
index 6958055c29..182a56f524 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
index 6e34553c6d..a00ac459ac 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
index b86cc5e958..ce12d4839f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
index 9d6b3cfbc7..aec4852517 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/HoverSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/HoverSelection.h
index 95f2c698af..ef03e86a91 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/HoverSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/HoverSelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.cpp
index 2f0c9a7c59..665c32ab34 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.h
index 8adad1dfad..a84a8b016c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineHoverSelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
index a5e722c536..59443cc2a6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h
index 016cc2284d..2ccc4712f5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
index b90f377348..3e452c8956 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.h
index 73ddc008db..bbab944a20 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorBus.h
index f48e948f85..641d6bf89b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorDebug.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorDebug.cpp
index bc34fd6a8d..2a9991d11f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorDebug.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorDebug.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorDebug.h
index c9533a486f..8821926424 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorDebug.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.cpp
index 02bfe9e3ad..7144452495 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.h
index 6d1b733e5b..7e8013fa0d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
index b0fd8442b3..5622cb781c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
index e723dcf90f..412a7380ab 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp
index 1144f4191f..5ab94ea9fe 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.h
index 01f8b4c7d6..e59b2f03f4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp
index 9baab089ec..0f2f75af03 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.h
index 2fe5997bfe..da27cbe999 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.cpp
index 7638361a36..1d853d8f3f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.h
index 581e31b600..96736b7dde 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/MultiLinearManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.cpp
index 59589951f9..7c09aff31b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.h
index 9b3fa78d76..0ccb75441b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/PlanarManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp
index 545ffc766d..5c2d39f173 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h
index aedf4e862c..24ccea2824 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp
index d0c8c0b2f3..977e3f4e11 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h
index 154bc5d409..52e7fc5e19 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.cpp
index bb78277c3f..93c7e3f6f3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.h
index 73857ab093..a040dc260a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SelectionManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.cpp
index 0458b19cb6..9d1838ac1e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.h
index 093fa98873..a6cf0ecc6e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineHoverSelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.cpp
index eae1c879fc..6f6d714fb6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.h
index 0fee01b510..c9c25d0abc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SplineSelectionManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
index 9327f91281..04c77c4227 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
index 5494d48bbc..542c944656 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
index 307a30dd4d..9c4b803b4f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
index 15c158545b..fe1255a3c3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Maths/TransformUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Maths/TransformUtils.h
index e00870bf3b..f3a8fc08c4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Maths/TransformUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Maths/TransformUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/BoundInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/BoundInterface.h
index c1c9d880b3..2bf36fede0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/BoundInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/BoundInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/ContextBoundAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/ContextBoundAPI.h
index 9d73cbfa4d..d1c0828ad2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/ContextBoundAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/ContextBoundAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.cpp
index a1ae8b923c..85ff51be2b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.h
index 9342188671..f7b56e667c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBoundManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp
index 7b0d6ddd1d..1cafdb8840 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h
index 373fa0a524..32f2027687 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp
index a83e1d6653..dc9f1c105c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.h
index fa32499f61..75fb1eabd2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
index 718a1e8f85..1bacc11df3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -280,9 +280,11 @@ namespace AzToolsFramework
                 }
             }
 
+            // Destroy the entities *before* clearing the lookup maps so that any lookups triggered during an entity's destructor
+            // are still valid.
+            m_entities.clear();
             m_instanceToTemplateEntityIdMap.clear();
             m_templateToInstanceEntityIdMap.clear();
-            m_entities.clear();
         }
 
         bool Instance::RegisterEntity(const AZ::EntityId& entityId, const EntityAlias& entityAlias)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.h
index ea3449f4c8..80fd434579 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityIdMapper.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityIdMapper.cpp
index b15addb2b8..33cbe67608 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityIdMapper.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityIdMapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -157,7 +157,7 @@ namespace AzToolsFramework
                     "Prefab - EntityIdMapper: Entity with Id %s has no registered owning instance",
                     entityId.ToString().c_str());
 
-                return AZStd::string::format("Entity_%s", entityId.ToString().c_str());
+                return {};
             }
 
             Instance* owningInstance = &(owningInstanceReference->get());
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityIdMapper.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityIdMapper.h
index 03ceaf8020..d74d20ba6d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityIdMapper.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityIdMapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapper.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapper.cpp
index 74ec429a7e..a16b5233a8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapper.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapper.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapper.h
index f45566c592..8d39d9e13d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapper.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapperInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapperInterface.h
index 100b7f88f8..2c2636709d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapperInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityMapperInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityScrubber.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityScrubber.cpp
index bf353a1d27..1b57352c11 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityScrubber.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityScrubber.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityScrubber.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityScrubber.h
index fb5eba58c7..8f3e2262be 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityScrubber.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceEntityScrubber.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp
index faa5925806..95cfa38bd6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.h
index 638ac52867..e49ae60c50 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h
index c0f3b4bdf2..63a29ecde1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
index a7b76d27db..720c14ed36 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h
index c32707dd40..b6210b26e4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
index 1b659ef67b..8cd76c6c73 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.h
index dadec60c52..6eb43c0713 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutorInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutorInterface.h
index 5cd5aaf89d..f13c4542cf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutorInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapper.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapper.cpp
index 1e9f08948e..a5125701a7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapper.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapper.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapper.h
index 3239e8f82a..d3773a4928 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapper.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapperInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapperInterface.h
index 2458a7336b..64cbde6db8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapperInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/TemplateInstanceMapperInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
index 39b8f4a3cd..1d27fa6375 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
index f5c8480ce4..e0387357cf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomTypes.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomTypes.h
index bd455c4998..439942587d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomTypes.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp
index 1dfb1a2a0b..4d02c61b3d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h
index 6aeeb9eb7d..20ba49e0ca 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabIdTypes.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabIdTypes.h
index 7dca46c400..58e58735f3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabIdTypes.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabIdTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.cpp
index 51d6ff0ac6..92ff87b9ba 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.h
index c34bb92f11..b1c8daeaac 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoaderInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoaderInterface.h
index d642b0ca6a..c3d20a6dc5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoaderInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoaderInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 0398609c0c..1632e8534b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -587,21 +587,21 @@ namespace AzToolsFramework
             return AZ::Success(entityId);
         }
 
-        void PrefabPublicHandler::GenerateUndoNodesForEntityChangeAndUpdateCache(
+        PrefabOperationResult PrefabPublicHandler::GenerateUndoNodesForEntityChangeAndUpdateCache(
             AZ::EntityId entityId, UndoSystem::URSequencePoint* parentUndoBatch)
         {
             // Create Undo node on entities if they belong to an instance
             InstanceOptionalReference owningInstance = m_instanceEntityMapperInterface->FindOwningInstance(entityId);
             if (!owningInstance.has_value())
             {
-                return;
+                return AZ::Success();
             }
 
             AZ::Entity* entity = GetEntityById(entityId);
             if (!entity)
             {
                 m_prefabUndoCache.PurgeCache(entityId);
-                return;
+                return AZ::Success();
             }
 
             PrefabDom beforeState;
@@ -633,6 +633,41 @@ namespace AzToolsFramework
                         (&beforeOwningInstance->get() != &afterOwningInstance->get()))
                     {
                         isNewParentOwnedByDifferentInstance = true;
+
+                        // Detect loops. Assert if an instance has been reparented in such a way to generate circular dependencies.
+                        AZStd::vector<Instance*> instancesInvolved;
+
+                        if (isInstanceContainerEntity)
+                        {
+                            instancesInvolved.push_back(&owningInstance->get());
+                        }
+                        else
+                        {
+                            // Retrieve all nested instances that are part of the subtree under the current entity.
+                            EntityList entities;
+                            RetrieveAndSortPrefabEntitiesAndInstances({ entity }, beforeOwningInstance->get(), entities, instancesInvolved);
+                        }
+
+                        for (Instance* instance : instancesInvolved)
+                        {
+                            const PrefabDom& templateDom =
+                                m_prefabSystemComponentInterface->FindTemplateDom(instance->GetTemplateId());
+                            AZStd::unordered_set<AZ::IO::Path> templatePaths;
+                            PrefabDomUtils::GetTemplateSourcePaths(templateDom, templatePaths);
+
+                            if (IsCyclicalDependencyFound(afterOwningInstance->get(), templatePaths))
+                            {
+                                // Cancel the operation by restoring the previous parent
+                                AZ::TransformBus::Event(entityId, &AZ::TransformBus::Events::SetParent, beforeParentId);
+                                m_prefabUndoCache.UpdateCache(entityId);
+
+                                // Skip the creation of an undo node
+                                return AZ::Failure(AZStd::string::format(
+                                    "Reparent Prefab operation aborted - Cyclical dependency detected\n(%s depends on %s).",
+                                    instance->GetTemplateSourcePath().Native().c_str(),
+                                    afterOwningInstance->get().GetTemplateSourcePath().Native().c_str()));
+                            }
+                        }
                     }
                 }
 
@@ -673,6 +708,8 @@ namespace AzToolsFramework
             }
 
             m_prefabUndoCache.UpdateCache(entityId);
+
+            return AZ::Success();
         }
 
         void PrefabPublicHandler::Internal_HandleContainerOverride(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
index 75e151a7a4..7dbb7b1e71 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -46,7 +46,7 @@ namespace AzToolsFramework
             PrefabOperationResult SavePrefab(AZ::IO::Path filePath) override;
             PrefabEntityResult CreateEntity(AZ::EntityId parentId, const AZ::Vector3& position) override;
             
-            void GenerateUndoNodesForEntityChangeAndUpdateCache(AZ::EntityId entityId, UndoSystem::URSequencePoint* parentUndoBatch) override;
+            PrefabOperationResult GenerateUndoNodesForEntityChangeAndUpdateCache(AZ::EntityId entityId, UndoSystem::URSequencePoint* parentUndoBatch) override;
 
             bool IsInstanceContainerEntity(AZ::EntityId entityId) const override;
             bool IsLevelInstanceContainerEntity(AZ::EntityId entityId) const override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h
index dd30767bc7..100e403660 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -79,8 +79,9 @@ namespace AzToolsFramework
              * 
              * @param entityId The entity to patch.
              * @param parentUndoBatch The undo batch the undo nodes should be parented to.
+             * @return Returns Success if the node was generated correctly, or an error message otherwise.
              */
-            virtual void GenerateUndoNodesForEntityChangeAndUpdateCache(
+            virtual PrefabOperationResult GenerateUndoNodesForEntityChangeAndUpdateCache(
                 AZ::EntityId entityId, UndoSystem::URSequencePoint* parentUndoBatch) = 0;
             
             /**
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicNotificationBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicNotificationBus.h
index f5baa8b134..6eba957049 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicNotificationBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
index 9d1e95657d..45b019f0a7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h
index aeb64e97f8..89452543fc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h
index 99adafb361..4e77d0b89a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp
index fa21c4a308..e29c33a21f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -70,7 +70,15 @@ namespace AzToolsFramework
                 "Failed to find an owning instance for the entity with id %llu.", static_cast<AZ::u64>(entityId));
             Instance& instance = instanceReference->get();
             m_templateId = instance.GetTemplateId();
-            m_entityAlias = (instance.GetEntityAlias(entityId)).value();
+            auto aliasReference = instance.GetEntityAlias(entityId);
+            if (!aliasReference.has_value())
+            {
+                AZ_Error(
+                    "Prefab", aliasReference.has_value(), "Failed to find the entity alias for entity %s.", entityId.ToString().c_str());
+                return;
+            }
+
+            m_entityAlias = aliasReference.value();
 
             //generate undo/redo patches
             m_instanceToTemplateInterface->GeneratePatch(m_redoPatch, initialState, endState);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.h
index 747ed29865..51bd2ca0c0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.cpp
index dcf2a57c64..f6750459ff 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.h
index c0472a1c7c..ca1ad086ee 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.cpp
index 597ccb6b85..6801c094c3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.h
index a15d9c4f17..607302e1c1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ComponentRequirementsValidator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ComponentRequirementsValidator.cpp
index 87ec9a5bd8..569968de8c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ComponentRequirementsValidator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ComponentRequirementsValidator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ComponentRequirementsValidator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ComponentRequirementsValidator.h
index 4a4cdb360c..9342d61d24 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ComponentRequirementsValidator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ComponentRequirementsValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.cpp
index 6ba4d2de19..1944893069 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.h
index 8fa1a2abf5..a7c093eb8a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/EditorOnlyEntityHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/EditorOnlyEntityHandler.cpp
index f7f6454ca6..95263c1355 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/EditorOnlyEntityHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/EditorOnlyEntityHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/EditorOnlyEntityHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/EditorOnlyEntityHandler.h
index cf14a46924..ca75f26aac 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/EditorOnlyEntityHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/EditorOnlyEntityHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/UiEditorOnlyEntityHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/UiEditorOnlyEntityHandler.cpp
index c6fe602139..d236fb412b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/UiEditorOnlyEntityHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/UiEditorOnlyEntityHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/UiEditorOnlyEntityHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/UiEditorOnlyEntityHandler.h
index 14b3423cc3..152d7008ad 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/UiEditorOnlyEntityHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/UiEditorOnlyEntityHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/WorldEditorOnlyEntityHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/WorldEditorOnlyEntityHandler.cpp
index 86b1eaaeef..ebb277a2dc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/WorldEditorOnlyEntityHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/WorldEditorOnlyEntityHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/WorldEditorOnlyEntityHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/WorldEditorOnlyEntityHandler.h
index 29a35921f4..c94c5e5ba2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/WorldEditorOnlyEntityHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorOnlyEntityHandler/WorldEditorOnlyEntityHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp
index 21770551be..8a4b4f6cc5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.h
index 2472816be3..ae793629ad 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.cpp
index 5c4cfc4f25..fd167ee4e7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.h
index ed8276176f..4ede599ad9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessor.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessor.h
index fd54bff234..3be7a3e518 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessor.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.cpp
index 38d6288a21..8b9913dfc3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.h
index 28c87b7391..6e5eb5fc14 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.cpp
index 2feee7d7bc..612c587f63 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.h
index 8746319fdb..d80b240901 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableMetaDataBuilder.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableMetaDataBuilder.cpp
index 319a22ef32..d4f765db38 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableMetaDataBuilder.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableMetaDataBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableMetaDataBuilder.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableMetaDataBuilder.h
index 375bc18ce8..21dd41f902 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableMetaDataBuilder.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableMetaDataBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableUtils.cpp
index f23f9c6187..d046fc733d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableUtils.h
index e727f3487d..2c2ec2f532 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/SpawnableUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Template/Template.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Template/Template.cpp
index 5c0edd8a74..a750468eb7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Template/Template.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Template/Template.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Template/Template.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Template/Template.h
index 46a5f71bc6..fd44349901 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Template/Template.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Template/Template.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.cpp
index 469bcc617d..fecb2614cc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.h b/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.h
index bd4e54533b..a3563616e5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.cpp
index 8f2f8b7253..aadd1fd24f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.h
index 0b4430dc8d..4f62adeab4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.cpp
index abdb5f9642..6e0560d2fa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.h b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.h
index 54a8f51788..412de079e3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptTermDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptTermDialog.cpp
index 87a320ac41..66d69683f1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptTermDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptTermDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptTermDialog.h b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptTermDialog.h
index ef6079f90e..72f7d2d9cf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptTermDialog.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptTermDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Render/EditorIntersectorComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Render/EditorIntersectorComponent.cpp
index 7d3c0c3be3..fa53959f30 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Render/EditorIntersectorComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Render/EditorIntersectorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Render/EditorIntersectorComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Render/EditorIntersectorComponent.h
index 2a6153467c..aa5d265b84 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Render/EditorIntersectorComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Render/EditorIntersectorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteBoundColumnSet.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteBoundColumnSet.cpp
index ae32907446..0b8decfc67 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteBoundColumnSet.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteBoundColumnSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteBoundColumnSet.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteBoundColumnSet.h
index 7ed182e372..59a3d5a814 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteBoundColumnSet.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteBoundColumnSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteConnection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteConnection.cpp
index 529333e7d6..ee2534ed9c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteConnection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteConnection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteConnection.h
index b1a18e4711..db3ccd2631 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteConnection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteConnection.h
@@ -2,7 +2,7 @@
 #define AZFRAMEWORK_SQLITECONNECTION_H
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQuery.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQuery.cpp
index 7ab28ba4c3..bf0a2bdbdf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQuery.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQuery.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQuery.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQuery.h
index cf57f0257d..4e1001fa6d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQuery.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQuery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQueryLogBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQueryLogBus.h
index cab763aa15..5592d7779f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQueryLogBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SQLite/SQLiteQueryLogBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceCompilation.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceCompilation.cpp
index 3b4c81a65a..80a9f8dd9c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceCompilation.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceCompilation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceCompilation.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceCompilation.h
index 31de722e97..d0f4a0234c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceCompilation.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceCompilation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.cpp
index 0930aa3526..138851580d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.h
index 08969755fd..375ec23383 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserBus.h
index 253a59a13a..5f3f28d273 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.cpp
index 2273105667..b908ccfebd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.h
index bb5655b58b..bbad6b778d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextBus.h
index ca71e64509..e6b6836c7a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp
index d317e90886..f83569bb13 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.h
index 13e113bd0f..739aa425b3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRelationshipNode.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRelationshipNode.cpp
index 756b6d08ca..53e5253c94 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRelationshipNode.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRelationshipNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRelationshipNode.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRelationshipNode.h
index 0319faff3a..517ebd74f6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRelationshipNode.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRelationshipNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestBus.h
index 2b8483cdc5..562311dd26 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.cpp
index 2d12e0e633..043ed2f1a3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.h
index 270c9b2567..111ce81fbc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.cpp
index 9a5f9c7ae2..81aacf9372 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.h
index 41d8a176f6..89346a3fa0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp
index 17d2af1812..b5c8058f73 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.h
index 2ae749a730..165daac713 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.cpp
index eec4c90c5e..db766eae61 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.h
index 5c42027a51..aa125fad8f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp
index ca5a9ac6e9..8685dd1eec 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.h
index 176cbb5f28..548940c198 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.cpp
index 79fe86b161..6ed42a28a9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.h
index 30ad7d42b4..ce0f3b126a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.cpp
index 061efb9b0d..5f78008661 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.h
index 7430dfef72..dff7d32506 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/SourceControlAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/SourceControlAPI.h
index 19521181d6..0eff682b41 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/SourceControlAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/SourceControlAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp
index 8a87109658..a91fb9a8ad 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h
index 0e659ba259..02912f806a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp
index 5f7c46167b..7541641e24 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h
index c42a42b951..aef2a335ea 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
index 46ef77bd38..4bd21a0baa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h
index 5dcedc2a93..8deb79d1df 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnailBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnailBus.h
index 10d89a15ab..85d4f44d3b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnailBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnailBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
index 78b70a5fd2..c29c578599 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
index 5f4cb48a13..558f902f90 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl
index c5952734a4..f355555346 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp
index b440e66593..865e8a4207 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h
index e0f55c7645..2f863803b2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailDelegate.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailDelegate.h
index b2ba8d715b..5b036a32f2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailDelegate.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.cpp
index 04d11df59f..7ed0ba0697 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.h
index 8ee76a7b82..8e099b7d06 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
index c94390cd2b..dc6cb30546 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
index e5f83baffd..ee2f58e409 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
index 32b7406925..2a8e5eeae7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp
index 5016487d75..39866b2fe9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h
index 5b704c3aa2..463d1fa5b2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp
index eda4b2493b..d737074e11 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.h
index d6b94a2687..8bdee09ba7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.cpp
index 0fc42725f7..bb16f7ecfe 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h
index c465375705..2918885bdc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.cpp
index 0c16671c7a..31ab4714af 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.h
index 3b403f0490..71da90225f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.cpp
index 60446fe859..050034bce4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h
index 30b0fb8acc..6edeff2785 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.cpp
index 8e0280b17f..e6e7c86acc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.h
index 3f018f6b36..4f19892427 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.h
index c21b31debc..b938c37695 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.inl
index 7a8f4e9bfb..35e75c68a8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.cpp
index fd954162e2..38aa806f44 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.h
index 0229b2c8a0..5c1db2cf19 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionBus.h
index cb05c5424e..0edfb52c57 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp
index cfb79ceb81..20ef7e64d4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.h
index f6b4d65041..eaff41c2e8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp
index 257b22f61d..c25450949c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.h
index 5c9d15ee65..81bf1fe50f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h
index 8eb853c144..8c12de824c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.cpp
index fbca745eac..613edb0d1b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.h
index c31a6e684c..1f00d64ff9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.cpp
index 99b2abb1a5..3f2d7464ba 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.h
index e54f756819..d10c6711bb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponentBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponentBus.h
index 2fe84e98c2..312226808e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponentBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp
index 4d1cfe7305..5a73129e92 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.h
index 64db3670c9..ec0b7c0285 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h
index c15884931b..855763b061 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp
index 4212ff5b75..4224b7de9f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.h
index 5e6f23f6d1..8a10e9abe1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponentBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponentBus.h
index 67dd484670..bd459d47e3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponentBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
index 09869072f1..22d11d6a0a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h
index d41e6594f5..edeb87e60e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.cpp
index 93fe7b3fb7..e6cbf11d20 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.h
index 90634bf274..bdb721e871 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp
index a493d013bb..848c324f2f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.h
index 95ec3c1ac6..9ce6c31f98 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponentBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponentBus.h
index c9e5a3b124..ed7c884b43 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponentBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOutlinerComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOutlinerComponent.h
index b76ed5be95..6ea16f020d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOutlinerComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOutlinerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionBus.h
index d4a1fd2b15..201a536942 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp
index 2d686792e8..0ce45bd4db 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.h
index 990872ed5a..2d3aae9156 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.cpp
index ed9e122ff8..4c193b587e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.h
index 4b9519b235..d965f153d1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentingBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentingBus.h
index f794f59797..fa576bfb6a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentingBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityBus.h
index a270f38ca5..38077efef1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp
index 7ac3c06a13..77e491e840 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h
index e86ffdd2d9..1bde2fc114 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp
index 51651c380b..72c34ac3f9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.h
index 36c4dd7623..31407e2952 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.cpp
index 0b462435d5..b6bf985857 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.h
index 2c124d30c4..0120f58955 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
index 7f81d001d0..31a9a2da8e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.h
index d64f21a398..aca9568576 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.cpp
index a4868abac7..6bcebbe009 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.h
index 49102c0ec2..4b5d0772a1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponentBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponentBus.h
index a69b255d55..3643a28b4e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponentBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogBus.h
index 94c865b41b..1e86bba840 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.cpp
index db46d06296..68f842c8b1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.h
index b4e41686c5..ea0e5a4c1b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
index 5d7fce4515..eea6696e4e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h
index 5e5f30b30d..3b1a12738b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponentBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponentBus.h
index 6dda1a95fe..1614646fb6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponentBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils.h
index 436f82162b..8e9990f686 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils_generic.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils_generic.cpp
index 1863b0557b..a73804f195 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils_generic.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils_generic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils_win.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils_win.cpp
index 2a3dd22052..8f4fa0294f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils_win.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsFileUtils/ToolsFileUtils_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsMessaging/EntityHighlightBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsMessaging/EntityHighlightBus.h
index 9f12a00c04..812977bec5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsMessaging/EntityHighlightBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsMessaging/EntityHighlightBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.cpp
index 0dc73dc42b..817494f7f2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.hxx
index d8ca23b96f..162e25cb0e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.cpp
index 86104298fa..66de920903 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.hxx
index da70c3cbbe..592634920d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.cpp
index ccfe7cd7ec..be8bb1ed9a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.hxx
index 449823db12..12eb05c2a1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.cpp
index 58d72139a7..19258647e7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.hxx
index 34b25d2d5c..81f5e43ee5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Docking/DockWidgetUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Docking/DockWidgetUtils.cpp
index 33c69e2e8f..2978fbf487 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Docking/DockWidgetUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Docking/DockWidgetUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Docking/DockWidgetUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Docking/DockWidgetUtils.h
index e14aa63d84..8b317f6c78 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Docking/DockWidgetUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Docking/DockWidgetUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.cpp
index dd3c23fafb..7544f8a8be 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h
index fc5eefe971..1cf0d67b9c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h
index 2228221d03..b1cf840200 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.cpp
index c7c3b1b24b..cc46ebd55a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.h
index 6e4bf46b31..353f7371ee 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.cpp
index 4e53f5811e..170d725bfa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.h
index bef3d5092c..d64b0af84c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.cpp
index 287772ecf9..c74bc8566f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.h
index c96e9f11d4..b783778c0c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/NameConflictWarning.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/NameConflictWarning.cpp
index 84ce84f858..c96d4ce034 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/NameConflictWarning.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/NameConflictWarning.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/NameConflictWarning.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/NameConflictWarning.hxx
index 5fcde57bfc..eeda7c5a5a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/NameConflictWarning.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/NameConflictWarning.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorContextBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorContextBus.h
index 1bc102ca15..426972f97e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorContextBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp
index 65d111a1ea..71d077d284 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h
index a17b06fee9..854f762d0f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp
index e692d9d4c1..ccc7ef1fd7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.h
index c6b446c95a..42aacf3dbd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.cpp
index 9546c235f8..38b65c3454 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.h
index f38687c0ca..828877222d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusAPI.h
index 1bdd12ac7e..246395630f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusComponent.cpp
index be0b201d30..ac0430a62a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp
index df1a005b5e..f256dc703e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.h
index 042e45d21f..bfbe18fed5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
index 50e21bc84a..9150ef35c4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.hxx
index 23311899f7..cb056e959f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.cpp
index bba9149070..daf516c808 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.h
index feaabe25da..a73b1ee0ff 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkPreferences.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkPreferences.cpp
index 7d662a43e2..51f88c1dde 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkPreferences.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkPreferences.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.cpp
index 7a0ef4ff78..6402848300 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.h
index 594536c710..42e0ebeca5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.cpp
index 648acacfa0..2624624f2e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.h
index e09b228b99..c43ad49dd6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogEntry.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogEntry.cpp
index 725c35b332..4e76510e87 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogEntry.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogEntry.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogEntry.h
index 9fae443941..00ae414c48 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogEntry.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogLine.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogLine.cpp
index b246d22483..bfcf55f7e9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogLine.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogLine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogLine.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogLine.h
index 644593d1af..932f265b4e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogLine.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogLine.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp
index 2f8f0ef7fe..b65cd14f8e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.h
index efdbab9902..9a9503dbfd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableItemDelegate.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableItemDelegate.cpp
index 160bf78fff..c589497880 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableItemDelegate.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableItemDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableItemDelegate.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableItemDelegate.h
index 48d9fd8053..9944eed2ce 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableItemDelegate.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableItemDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableModel.cpp
index 6918e6957c..744d3a8c0b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableModel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableModel.h
index aa4cd010a1..d8098f1057 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableModel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LoggingCommon.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LoggingCommon.h
index 29cd4d30c9..a975eac435 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LoggingCommon.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LoggingCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.cpp
index b4a585ca2d..5b29777054 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.h
index c82c2af7ff..ad2c3f5bcd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.qss b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.qss
index 6ee8d7c6e2..6ce5340320 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.qss
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledLogPanel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledLogPanel.cpp
index a92685900a..ed50f30621 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledLogPanel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledLogPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledLogPanel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledLogPanel.h
index 2c02937707..1f55bb1f67 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledLogPanel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledLogPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledTracePrintFLogPanel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledTracePrintFLogPanel.cpp
index bd41e23ec2..0454b12a37 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledTracePrintFLogPanel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledTracePrintFLogPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledTracePrintFLogPanel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledTracePrintFLogPanel.h
index 3938a77bfb..279b365a73 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledTracePrintFLogPanel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/StyledTracePrintFLogPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.cpp
index 9070a83400..f67bf27149 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.h
index 455a2477dc..613f71c182 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss
index d5160c3599..a8447ffc00 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -87,24 +87,24 @@ AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixed::indicator:checked
 AzToolsFramework--EntityOutlinerCheckBox#Visibility::indicator:checked
 , AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixed::indicator:checked
 {
-    image: url(:/visibility_default.svg);
+    image: url(:/Outliner/visibility_default.svg);
 }
 
 AzToolsFramework--EntityOutlinerCheckBox#Visibility::indicator:unchecked
 , AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixed::indicator:unchecked
 {
-    image: url(:/visibility_on.svg);
+    image: url(:/Outliner/visibility_on.svg);
 	margin-top: 3px;
 }
 
 AzToolsFramework--EntityOutlinerCheckBox#VisibilityOverridden::indicator:checked
 {
-    image: url(:/visibility_default_transparent.svg);
+    image: url(:/Outliner/visibility_default_transparent.svg);
 }
 
 AzToolsFramework--EntityOutlinerCheckBox#VisibilityOverridden::indicator:unchecked
 {
-    image: url(:/visibility_on_transparent.svg);
+    image: url(:/Outliner/visibility_on_transparent.svg);
 	margin-top: 3px;
 }
 
@@ -112,7 +112,7 @@ AzToolsFramework--EntityOutlinerCheckBox#VisibilityHover::indicator:checked
 , AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixedHover::indicator:checked
 , AzToolsFramework--EntityOutlinerCheckBox#VisibilityOverriddenHover::indicator:checked
 {
-    image: url(:/visibility_default_hover.svg);
+    image: url(:/Outliner/visibility_default_hover.svg);
 	margin-top: 3px;
 }
 
@@ -120,7 +120,7 @@ AzToolsFramework--EntityOutlinerCheckBox#VisibilityHover::indicator:unchecked
 , AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixedHover::indicator:unchecked
 , AzToolsFramework--EntityOutlinerCheckBox#VisibilityOverriddenHover::indicator:unchecked
 {
-    image: url(:/visibility_on_hover.svg);
+    image: url(:/Outliner/visibility_on_hover.svg);
 	margin-top: 3px;
 }
 
@@ -130,24 +130,24 @@ AzToolsFramework--EntityOutlinerCheckBox#VisibilityHover::indicator:unchecked
 AzToolsFramework--EntityOutlinerCheckBox#Lock::indicator:checked
 , AzToolsFramework--EntityOutlinerCheckBox#LockMixed::indicator:checked
 {
-    image: url(:/lock_on.svg);
+    image: url(:/Outliner/lock_on.svg);
 	margin-top: 1px;
 }
 
 AzToolsFramework--EntityOutlinerCheckBox#Lock::indicator:unchecked
 , AzToolsFramework--EntityOutlinerCheckBox#LockMixed::indicator:unchecked
 {
-    image: url(:/lock_default.svg);
+    image: url(:/Outliner/lock_default.svg);
 }
 
 AzToolsFramework--EntityOutlinerCheckBox#LockOverridden::indicator:checked
 {
-    image: url(:/lock_on_transparent.svg);
+    image: url(:/Outliner/lock_on_transparent.svg);
 }
 
 AzToolsFramework--EntityOutlinerCheckBox#LockOverridden::indicator:unchecked
 {
-    image: url(:/lock_default_transparent.svg);
+    image: url(:/Outliner/lock_default_transparent.svg);
 	margin-top: 1px;
 }
 
@@ -155,7 +155,7 @@ AzToolsFramework--EntityOutlinerCheckBox#LockHover::indicator:checked
 , AzToolsFramework--EntityOutlinerCheckBox#LockMixedHover::indicator:checked
 , AzToolsFramework--EntityOutlinerCheckBox#LockOverriddenHover::indicator:checked
 {
-    image: url(:/lock_on_hover.svg);
+    image: url(:/Outliner/lock_on_hover.svg);
 	margin-top: 1px;
 }
 
@@ -163,6 +163,6 @@ AzToolsFramework--EntityOutlinerCheckBox#LockHover::indicator:unchecked
 , AzToolsFramework--EntityOutlinerCheckBox#LockMixedHover::indicator:unchecked
 , AzToolsFramework--EntityOutlinerCheckBox#LockOverriddenHover::indicator:unchecked
 {
-    image: url(:/lock_default_hover.svg);
+    image: url(:/Outliner/lock_default_hover.svg);
 	margin-top: 1px;
 }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerCacheBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerCacheBus.h
index 5539da62ab..342e6bd4f7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerCacheBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerCacheBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp
index b9b0cfedce..d33be96b98 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -17,15 +17,15 @@ namespace AzToolsFramework
         DisplayOptionsMenu::DisplayOptionsMenu(QWidget* parent)
             : QMenu(parent)
         {
-            auto sortManually = addAction(QIcon(QStringLiteral(":/sort_manually.svg")), tr("Sort: Manually"));
+            auto sortManually = addAction(QIcon(QStringLiteral(":/Outliner/sort_manually.svg")), tr("Sort: Manually"));
             sortManually->setData(static_cast<int>(DisplaySortMode::Manually));
             sortManually->setCheckable(true);
 
-            auto sortAtoZ = addAction(QIcon(QStringLiteral(":/sort_a_to_z.svg")), tr("Sort: A to Z"));
+            auto sortAtoZ = addAction(QIcon(QStringLiteral(":/Outliner/sort_a_to_z.svg")), tr("Sort: A to Z"));
             sortAtoZ->setData(static_cast<int>(DisplaySortMode::AtoZ));
             sortAtoZ->setCheckable(true);
 
-            auto sortZtoA = addAction(QIcon(QStringLiteral(":/sort_z_to_a.svg")), tr("Sort: Z to A"));
+            auto sortZtoA = addAction(QIcon(QStringLiteral(":/Outliner/sort_z_to_a.svg")), tr("Sort: Z to A"));
             sortZtoA->setData(static_cast<int>(DisplaySortMode::ZtoA));
             sortZtoA->setCheckable(true);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.h
index 17fa919561..8c17fc9c20 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
index 01ef39affd..c51c1b654b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
index 453af16ca4..528ec44dac 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.cpp
index 6b6b5fe990..ff7a43431f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.h
index 98e23f2843..3776f17eba 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSearchWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.cpp
index 9e950b8288..73139b5a67 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.hxx
index e2d3c768d2..7bc483623e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerSortFilterProxyModel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
index 73fa4dfc6d..f445453777 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
index 5f365bfaa9..900d9fe89a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
index aca008264a..96479bb54c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -48,6 +48,12 @@
 
 #include <AzToolsFramework/UI/Outliner/ui_EntityOutlinerWidget.h>
 
+// This has to live outside of any namespaces due to issues on Linux with calls to Q_INIT_RESOURCE if they are inside a namespace
+void initEntityOutlinerWidgetResources()
+{
+    Q_INIT_RESOURCE(resources);
+}
+
 namespace
 {
     const int queuedChangeDelay = 16; // milliseconds
@@ -143,6 +149,8 @@ namespace AzToolsFramework
         , m_sortContentQueued(false)
         , m_dropOperationInProgress(false)
     {
+        initEntityOutlinerWidgetResources();
+
         m_gui = new Ui::EntityOutlinerWidgetUI();
         m_gui->setupUi(this);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
index 611889f7ae..68f538c3ff 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp
index 8a5596c087..c768ab0d82 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.h
index 2def23e9f9..286bdf2b54 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditInterface.h
index f878852f3f..0cb228bc40 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditManager.cpp
index f510ac1223..69c17d2d90 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditManager.h
index 141ed6117e..58f991882e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabEditManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationBus.h
index 6e0c3e7b8d..e6f6911f63 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationInterface.h
index 3e7e6b475a..4e2109771a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
index 41622f854f..eb9f94d75c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
index a37390bd11..e7cf46dfab 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
index 686b394a05..971e7c85a2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
index f94872bab7..7bd9ad147c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp
index bd3e6727fe..4c151bebef 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.hxx
index 7456a6a6e7..e4f629b7fa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.cpp
index 009174495f..4998eec360 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.hxx
index 638befbd77..b9409418fa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.cpp
index 94472018dc..4136d19087 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.hxx
index 2bd8e8d995..02fd3a158e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.cpp
index a06512978b..f6eed6bfd1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.hxx
index 8438cdd028..184d2b426c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.cpp
index 91a2cfa421..1f01389d57 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.hxx
index c7e2271bbf..fcaac9ea2f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.cpp
index 6f8d3447a0..6e24641ffc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.h
index e81d28dce9..7a8cc3da0e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
index d59fd8b9ee..6a399ad816 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
index 9d99950b90..b15e27e41a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.cpp
index c86458d119..6a7bd30990 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.h
index f8de5a0dd4..cf8440f773 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.inl
index 2e77e83eb5..b4aa792084 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GrowTextEdit.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GrowTextEdit.cpp
index 0612cfd8a9..6d3b158dfa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GrowTextEdit.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GrowTextEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GrowTextEdit.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GrowTextEdit.h
index daec8f33e8..cb3adca59e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GrowTextEdit.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/GrowTextEdit.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.cpp
index 1c4386ff1e..f411c60625 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h
index 58f7cacab5..e953450300 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.cpp
index 9698177f15..fbdc2ddf81 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.h
index 87f050ca48..6198c81ae3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.cpp
index 0cb137de56..5c7b5353a8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.h
index b83a1e14c4..d77b639d81 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/MultiLineTextEditHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
index 61aee20412..ba53688aa4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
index 2cd1e53c6c..f943709098 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.cpp
index a8b68413cd..599fa7bdfe 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.h
index 501fb14f4b..2d539587dd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrlTypes.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrlTypes.h
index a9f33185cb..cd17162335 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrlTypes.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrlTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.cpp
index 8c75dc10e7..28f6d6af65 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.hxx
index fc1585fb5c..f68377e778 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.cpp
index 9163f74458..8c7fb1757e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.hxx
index 2770822709..bca0b0d004 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.cpp
index 076fb862e7..c03d276ed7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.hxx
index e74e433698..ff35d19cc7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.cpp
index 576cfae3de..523cbe1ca0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.h
index 0286e3e7a3..d16d63b588 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.cpp
index aadcd104db..b637bc61c6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.hxx
index f34947d154..904d1254fe 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.cpp
index efc7286f6d..9368685af4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.hxx
index a6a50d65aa..dfe53cd8a7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.cpp
index f7e892c8b1..aac2d70d20 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.hxx
index 6cbbcc82e4..0a378031d6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.cpp
index 3e5b5d3f83..01c85f11c9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.hxx
index 4155809e97..924619942e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h
index 6cd54a1084..b61ad9ee40 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h
index c42320cf30..bb3b624269 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals_Impl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals_Impl.h
index 1621de6c60..721e471321 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals_Impl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals_Impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorApi.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorApi.cpp
index 96bad01bc7..ccd9c367bf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorApi.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorApi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditor_UITypes.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditor_UITypes.h
index 9ed4f25f31..d97a269473 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditor_UITypes.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditor_UITypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
index 2d41107669..92d0ea9139 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.hxx
index 637b24c447..efdfaa3824 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.cpp
index 59104205ff..571a293333 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.hxx
index 16aa8d7619..0f38ddbd33 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
index 99b91781f2..e71639d2f2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.cpp
index defc1cd91b..041fc2dab1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.hxx
index a8331432e0..106dd53cf4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.cpp
index e1952171dc..5edefdd8a1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.hxx
index e23a4833aa..caf3468439 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp
index 9ad039090c..617a6e2823 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h
index 7482c6c3ad..fbbd3e05e0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyQTConstants.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyQTConstants.h
index 91276c07ac..5a711ed77b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyQTConstants.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyQTConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp
index b7e52e176f..d66ee34c3b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx
index 8dcff35b1f..b23691ea44 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.cpp
index 3c1a8fe2e6..e8c8157c98 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.hxx
index a5252fef24..9ab3dc9fae 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.cpp
index e784fa9b76..58414d6c37 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.hxx
index 5d822ecc1a..c100d5498a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.cpp
index 087dd0c71b..662a17ebb7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx
index a57f12fb74..851779ca96 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/QtWidgetLimits.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/QtWidgetLimits.h
index a8c79c052e..b7947a174d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/QtWidgetLimits.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/QtWidgetLimits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp
index 56d0e742a1..1e7b0395c8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx
index 7286869f94..c27acaa374 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
index 2f4da9619b..2da35d7de9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
index bcf4daf4a2..fe5c18caa4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/View/AssetCompleterListView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/View/AssetCompleterListView.cpp
index a6ac43eff6..984aba2aa2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/View/AssetCompleterListView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/View/AssetCompleterListView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/View/AssetCompleterListView.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/View/AssetCompleterListView.h
index 31059694ea..439e6640d8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/View/AssetCompleterListView.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/View/AssetCompleterListView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp
index 0ba4c58f05..15a7b7d482 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx
index 30dc8a06a0..9ed93aba93 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx
index b81b9c891d..052d7567ff 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/Constants.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/Constants.h
index 7bb95fb8b9..7f2172abdc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/Constants.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/Constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.cpp
index d243c2554c..b131e3d560 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx
index ef49112d82..29314c32fe 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.cpp
index 9e26f3d911..f7b1521ee6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx
index 3dd95950c4..8fbb397dd4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp
index 550b535d8a..d88799d5aa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.hxx
index 51242daf01..b78d9488d6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipBus.h
index b1b498743f..b0f8554cdc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.cpp
index b9a7cb3c17..61045de69a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx
index ef1f0bbd39..2a1a7e74d9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.cpp
index dcd8cf9b9e..4e73acbb40 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.hxx
index 95b680ef29..08c73d9198 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.cpp
index bf7d110c04..b3b2c3ad21 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.hxx
index 127c4493f6..269fa888c8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.cpp
index c4e0792d67..99400ae39d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.hxx
index 46af1f7a81..ed822372e8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.cpp
index 820f4e0a44..814fa1c28f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.hxx
index ee5404f265..3a48e1e5f9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/IconButton.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/IconButton.cpp
index 718917541e..0374268dbb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/IconButton.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/IconButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/IconButton.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/IconButton.hxx
index 0b8fc1fca6..84480965fa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/IconButton.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/IconButton.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.cpp
index 66cf145255..ad425ea615 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.hxx
index 5afe37f313..cb74225e9f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.cpp
index 7daaefd10a..ceaf0d0090 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.hxx
index 87936c3c4c..469345a483 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.cpp
index 7d0b0a2692..904cf417a4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.hxx
index 582a6bd645..5fc353225e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.cpp
index 1df0b0fe59..10fb8accfc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.hxx
index c4e9c8a480..5edf1cd56d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.cpp
index 1fa4cb06cb..82b8a4aa92 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.h
index b51f9b914b..6de3bb5b83 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.cpp
index 8eb0087504..5c94a6c0bd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.hxx
index 7b8e031c37..9d147c14fd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.cpp
index 14b5017edf..7f65eefde5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.hxx
index 8c2717e58d..a37a9c9e03 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/WidgetHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/WidgetHelpers.h
index 6727e87c4f..b17ff2b434 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/WidgetHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/WidgetHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoCacheInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoCacheInterface.h
index 8c1f86f9df..2a3689db41 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoCacheInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoCacheInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.cpp
index 7f522495f3..49e2f89854 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.h
index aa9c8bf866..b47c7f0b42 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp
index 0030939c20..f268199a9f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
index a4d97b5bb4..e6ea5642f1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/ToolsTestApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/ToolsTestApplication.cpp
index ced20bd429..4c0f7a0581 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/ToolsTestApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/ToolsTestApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/ToolsTestApplication.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/ToolsTestApplication.h
index d3ae5aabd9..ae06ca6c0d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/ToolsTestApplication.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/ToolsTestApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h
index 9a764c0c19..a6aa7c30d6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp
index 070211c244..490ed683f4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.h
index e77c071369..622272bf00 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.cpp
index 524c3cf441..6baf2a4982 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.h
index 98072bec39..ca4de95060 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/VertexContainerDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
index 6c5821cc07..4d3af0e878 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.cpp
index d477cc441d..7a48d9f8e2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.h
index ba2d494182..af0a7642b8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.cpp
index d9adbcc679..386fed6894 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.h
index 9b7a3e06d8..07bce3747d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorBoxSelect.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
index 39f80df0a2..4d795e8671 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
index bacadd4cfa..f92ee6b00b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
index cbcdf60a43..f1d57e760c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
index a25d5a0361..de8eb678bf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
index b5603920da..86852ed0ac 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h
index 76d15ed111..ec863dc6d2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
index 260708dfdd..e342fbb050 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
index 404cd9d2e9..9de10788f5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
index db0efe9f24..147ac64795 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
index c213598b63..f9a5d17f4b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
index ff0cbe1aae..d2b7dfc648 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index 2e39634072..8f46fd90cb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -2081,7 +2081,7 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
-        // note: see Code/Sandbox/Editor/Resource.h for ID_EDIT_<action> ids
+        // note: see Code/Editor/Resource.h for ID_EDIT_<action> ids
 
         const auto lockUnlock = [this](const bool lock)
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
index 3f346a4f8d..b58fe095a9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp
index d8c59d7931..552dc8ee19 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h
index be5e308c71..ecfedd61cc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
index c2609e94f1..05c78adfa3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
index 52f0c1649c..929900d69c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
index 8ce57ccfbb..8acb21ca18 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
index 1d5c142bd5..ebe0741e67 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
index 372c1f189c..e151351099 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
index 13ccb154d6..6be0e547b7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
index bb230a524e..7f6917502c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
index 71675711ec..b73765b83a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
index 762f49eff3..75d352906e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
index 006947994a..55bd1b2399 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index b1b171784a..5609cdac06 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
index 891720a5b9..e933ca44e1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
index 965846e101..2f6e88f9cb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
index 68ee1ddf4a..879383cae7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
index f06057150f..d4e839baec 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
index 343f4ef2d0..2ef6da9265 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
index 06544d4a26..817219d5ef 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
index 43124f56f2..af74c2a1f6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
index bcc75195eb..a0d4973914 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
index 078bd4da76..95d36dec83 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
index b6b122c496..d3ca65a152 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
index 767cc1d90e..82db5bb7b9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
index 4ed9d63014..4b422f0b80 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
index f83f27c276..b5b2c028a5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_linux_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_linux_files.cmake
index 77cc02a498..d79b933d19 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_linux_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_linux_tests_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_linux_tests_files.cmake
index 2e32304c65..15322dd5b6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_linux_tests_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_linux_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_mac_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_mac_files.cmake
index 77cc02a498..d79b933d19 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_mac_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_win_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_win_files.cmake
index f64deff4a9..37791a3877 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_win_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_win_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_windows_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_windows_files.cmake
index f64deff4a9..37791a3877 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_windows_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframeworktestcommon_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframeworktestcommon_files.cmake
index ed096f26a5..ad13f0d515 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframeworktestcommon_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframeworktestcommon_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/AzToolsFramework/newoverride.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/newoverride.inl
index d53a9ad078..73b46dd60f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/newoverride.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/newoverride.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/CMakeLists.txt b/Code/Framework/AzToolsFramework/CMakeLists.txt
index 36195be8bc..b2a9690948 100644
--- a/Code/Framework/AzToolsFramework/CMakeLists.txt
+++ b/Code/Framework/AzToolsFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/Platform/Common/Clang/aztoolsframework_clang.cmake b/Code/Framework/AzToolsFramework/Platform/Common/Clang/aztoolsframework_clang.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/AzToolsFramework/Platform/Common/Clang/aztoolsframework_clang.cmake
+++ b/Code/Framework/AzToolsFramework/Platform/Common/Clang/aztoolsframework_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/Platform/Common/MSVC/aztoolsframework_msvc.cmake b/Code/Framework/AzToolsFramework/Platform/Common/MSVC/aztoolsframework_msvc.cmake
index 892f6725ef..8c9099fea3 100644
--- a/Code/Framework/AzToolsFramework/Platform/Common/MSVC/aztoolsframework_msvc.cmake
+++ b/Code/Framework/AzToolsFramework/Platform/Common/MSVC/aztoolsframework_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/Archive/ArchiveComponent_Linux.cpp b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/Archive/ArchiveComponent_Linux.cpp
index d853c38156..fe8dec2b55 100644
--- a/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/Archive/ArchiveComponent_Linux.cpp
+++ b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/Archive/ArchiveComponent_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake
index dbb0331fe2..a25032a679 100644
--- a/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/Platform/Mac/AzToolsFramework/Archive/ArchiveComponent_Mac.cpp b/Code/Framework/AzToolsFramework/Platform/Mac/AzToolsFramework/Archive/ArchiveComponent_Mac.cpp
index 3e93f39398..a1b1675e1f 100644
--- a/Code/Framework/AzToolsFramework/Platform/Mac/AzToolsFramework/Archive/ArchiveComponent_Mac.cpp
+++ b/Code/Framework/AzToolsFramework/Platform/Mac/AzToolsFramework/Archive/ArchiveComponent_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake
index 2bcaacb0ab..8164ca7f9c 100644
--- a/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/Platform/Windows/AzToolsFramework/Archive/ArchiveComponent_Windows.cpp b/Code/Framework/AzToolsFramework/Platform/Windows/AzToolsFramework/Archive/ArchiveComponent_Windows.cpp
index 597faef34f..9c16d1b0d4 100644
--- a/Code/Framework/AzToolsFramework/Platform/Windows/AzToolsFramework/Archive/ArchiveComponent_Windows.cpp
+++ b/Code/Framework/AzToolsFramework/Platform/Windows/AzToolsFramework/Archive/ArchiveComponent_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake
index 031142f42e..916ff5ce58 100644
--- a/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/AzToolsFramework/Tests/ArchiveTests.cpp b/Code/Framework/AzToolsFramework/Tests/ArchiveTests.cpp
index e3bad818e9..4335e42d62 100644
--- a/Code/Framework/AzToolsFramework/Tests/ArchiveTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ArchiveTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/AssetFileInfoListComparison.cpp b/Code/Framework/AzToolsFramework/Tests/AssetFileInfoListComparison.cpp
index de253aa9a4..f950f43abc 100644
--- a/Code/Framework/AzToolsFramework/Tests/AssetFileInfoListComparison.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/AssetFileInfoListComparison.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp b/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp
index e2c2752859..71e4184eb6 100644
--- a/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/AssetSystemMocks.h b/Code/Framework/AzToolsFramework/Tests/AssetSystemMocks.h
index 3a95d8573d..1029616760 100644
--- a/Code/Framework/AzToolsFramework/Tests/AssetSystemMocks.h
+++ b/Code/Framework/AzToolsFramework/Tests/AssetSystemMocks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp b/Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp
index 1b56818e05..8f61e27480 100644
--- a/Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp
index ae8d16199f..caf6411eda 100644
--- a/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.h b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.h
index 673a5261c8..9e7be21038 100644
--- a/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.h
+++ b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ComponentModeTestFixture.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestFixture.cpp
index 46b67ecb04..ebbc93963b 100644
--- a/Code/Framework/AzToolsFramework/Tests/ComponentModeTestFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ComponentModeTestFixture.h b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestFixture.h
index 52958947af..55b01bb350 100644
--- a/Code/Framework/AzToolsFramework/Tests/ComponentModeTestFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp
index 8d2ebce56e..775c771a8a 100644
--- a/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
index 67994ad435..d80dc90fc3 100644
--- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp
index cb8ea95e4c..e1656eb504 100644
--- a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntityContextComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntityContextComponentTests.cpp
index 73517fab59..0b0f22a6fb 100644
--- a/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntityContextComponentTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntityContextComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntityHelpersTests.cpp b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntityHelpersTests.cpp
index 93b5856be3..c75d14527e 100644
--- a/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntityHelpersTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntityHelpersTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp
index 3480471565..b7790d72c8 100644
--- a/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySelectionTests.cpp
index 83c79ae162..c60d3e4788 100644
--- a/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySelectionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/EntityIdQLabelTests.cpp b/Code/Framework/AzToolsFramework/Tests/EntityIdQLabelTests.cpp
index 40edd2593e..8938351561 100644
--- a/Code/Framework/AzToolsFramework/Tests/EntityIdQLabelTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EntityIdQLabelTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp b/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp
index 7daceafe25..3bc4c092dc 100644
--- a/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
  */
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/FingerprintingTests.cpp b/Code/Framework/AzToolsFramework/Tests/FingerprintingTests.cpp
index c44ca45de2..79407e6a90 100644
--- a/Code/Framework/AzToolsFramework/Tests/FingerprintingTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/FingerprintingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/IntegerPrimtitiveTestConfig.h b/Code/Framework/AzToolsFramework/Tests/IntegerPrimtitiveTestConfig.h
index b3cafff4f2..5fedeed472 100644
--- a/Code/Framework/AzToolsFramework/Tests/IntegerPrimtitiveTestConfig.h
+++ b/Code/Framework/AzToolsFramework/Tests/IntegerPrimtitiveTestConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/LogLines.cpp b/Code/Framework/AzToolsFramework/Tests/LogLines.cpp
index 4d24b94fa9..6f1a11b635 100644
--- a/Code/Framework/AzToolsFramework/Tests/LogLines.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/LogLines.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Main.cpp b/Code/Framework/AzToolsFramework/Tests/Main.cpp
index 5b298c00c0..ff94f9af5c 100644
--- a/Code/Framework/AzToolsFramework/Tests/Main.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ManipulatorBoundsTests.cpp b/Code/Framework/AzToolsFramework/Tests/ManipulatorBoundsTests.cpp
index 5234d9dcf9..b2e11108b0 100644
--- a/Code/Framework/AzToolsFramework/Tests/ManipulatorBoundsTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ManipulatorBoundsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ManipulatorCoreTests.cpp b/Code/Framework/AzToolsFramework/Tests/ManipulatorCoreTests.cpp
index 08e1cd6b38..ae484b8365 100644
--- a/Code/Framework/AzToolsFramework/Tests/ManipulatorCoreTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ManipulatorCoreTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ManipulatorViewTests.cpp b/Code/Framework/AzToolsFramework/Tests/ManipulatorViewTests.cpp
index 2fa2e080df..8548c20abf 100644
--- a/Code/Framework/AzToolsFramework/Tests/ManipulatorViewTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ManipulatorViewTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/PerforceComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/PerforceComponentTests.cpp
index e1c96ea6b2..db7430085b 100644
--- a/Code/Framework/AzToolsFramework/Tests/PerforceComponentTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PerforceComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp b/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
index f84ea72769..e581f4fac7 100644
--- a/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
index b4441f3af4..58578939e3 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.h b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.h
index d55df6839b..3d6d62349b 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabCreateBenchmarks.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabCreateBenchmarks.cpp
index f8d6ab646a..b77669fc01 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabCreateBenchmarks.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabCreateBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabInstantiateBenchmarks.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabInstantiateBenchmarks.cpp
index a05a340814..fe879bc1f0 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabInstantiateBenchmarks.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabInstantiateBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabLoadBenchmarks.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabLoadBenchmarks.cpp
index 142f54d239..1915a6886a 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabLoadBenchmarks.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabLoadBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp
index 99877fed0d..4fa17ad8dd 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/SpawnableCreateBenchmarks.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/SpawnableCreateBenchmarks.cpp
index 181405ecdd..44723a04c6 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/SpawnableCreateBenchmarks.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/SpawnableCreateBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/MockPrefabFileIOActionValidator.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/MockPrefabFileIOActionValidator.cpp
index a94724410e..baab1099b0 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/MockPrefabFileIOActionValidator.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/MockPrefabFileIOActionValidator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/MockPrefabFileIOActionValidator.h b/Code/Framework/AzToolsFramework/Tests/Prefab/MockPrefabFileIOActionValidator.h
index a0aae0139d..ce2dde3b36 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/MockPrefabFileIOActionValidator.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/MockPrefabFileIOActionValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDuplicateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDuplicateTests.cpp
index 0cf85be1d4..189aa7b0ee 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDuplicateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDuplicateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp
index f31669f4ce..b68d44ec61 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstanceToTemplatePropagatorTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstanceToTemplatePropagatorTests.cpp
index 5e56acd5f0..602339e426 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstanceToTemplatePropagatorTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstanceToTemplatePropagatorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
index 2a60f1dbbb..a08de99d3e 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp
index 36a48d3542..9cf1194834 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestComponent.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestComponent.cpp
index 1c2d24e76f..f97535f72b 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestComponent.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestComponent.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestComponent.h
index 69f59cd700..e8419a4454 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestComponent.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestData.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestData.cpp
index ff7dfdc3ac..17627ace96 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestData.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestData.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestData.h
index 58954604eb..595274cada 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestData.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDataUtils.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDataUtils.cpp
index 1d09ac2db8..a8c23e274a 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDataUtils.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDataUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDataUtils.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDataUtils.h
index 23fe39da3c..45fe8ecd70 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDataUtils.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDataUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
index 5b4790045e..34cff98a73 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.h
index b0ca1be027..d7c30d8dfb 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
index 47aba7415f..a086ab84a1 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
index e63db8a52e..763d3bec1f 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUndoFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUndoFixture.cpp
index 791090a977..c21677869e 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUndoFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUndoFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUndoFixture.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUndoFixture.h
index a15e9f0c04..b65e9eb155 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUndoFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUndoFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUtils.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUtils.h
index 2f0532bb6e..08861e62ad 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUtils.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoLinkTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoLinkTests.cpp
index 01640c334e..cdc5faaef0 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoLinkTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoLinkTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoTests.cpp
index e672bfdb8a..c27541357d 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateInstancesTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateInstancesTests.cpp
index 36318372e3..27cc192c06 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateInstancesTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateInstancesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateTemplateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateTemplateTests.cpp
index f14e840e4b..108eb25641 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateTemplateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateTemplateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateWithPatchesTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateWithPatchesTests.cpp
index b7c6865e12..64552213f2 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateWithPatchesTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateWithPatchesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/Spawnable/SpawnableMetaDataTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Spawnable/SpawnableMetaDataTests.cpp
index 84f0caf928..a9b016055e 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Spawnable/SpawnableMetaDataTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Spawnable/SpawnableMetaDataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableCreateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableCreateTests.cpp
index a31f3fcceb..90b55eaec6 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableCreateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableCreateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTestFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTestFixture.cpp
index 530cd3ce09..2f57347dc3 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTestFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTestFixture.h b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTestFixture.h
index 03997204e3..60e8c45460 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTestFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTests.cpp
index 303cfe10cf..cb0427f8e3 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableRemoveEditorInfoTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTestFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTestFixture.cpp
index cf47eae897..abe8c321d3 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTestFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTestFixture.h b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTestFixture.h
index bf02f0c348..d23292ccb4 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTestFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTests.cpp
index fd036f2bd6..92e17ea882 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/SpawnableSortEntitiesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp
index 9001711ade..7aeaf392a9 100644
--- a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h
index 6364fc78fe..2d40427d0d 100644
--- a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h
+++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/PropertyIntSliderCtrlTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyIntSliderCtrlTests.cpp
index 8d80186421..8e3e99146e 100644
--- a/Code/Framework/AzToolsFramework/Tests/PropertyIntSliderCtrlTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntSliderCtrlTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp
index 13a2b03f48..40b693422e 100644
--- a/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp
index 2a8efe199e..99cf334dc9 100644
--- a/Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/PythonBindingTests.cpp b/Code/Framework/AzToolsFramework/Tests/PythonBindingTests.cpp
index 4c4d6fb9ab..05efb746b8 100644
--- a/Code/Framework/AzToolsFramework/Tests/PythonBindingTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PythonBindingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/QtWidgetLimitsTests.cpp b/Code/Framework/AzToolsFramework/Tests/QtWidgetLimitsTests.cpp
index 0d3ac5be65..c2bd535850 100644
--- a/Code/Framework/AzToolsFramework/Tests/QtWidgetLimitsTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/QtWidgetLimitsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Slice.cpp b/Code/Framework/AzToolsFramework/Tests/Slice.cpp
index 5ecd91ee2e..e0343e60aa 100644
--- a/Code/Framework/AzToolsFramework/Tests/Slice.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Slice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityCreateTests.cpp b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityCreateTests.cpp
index e2e761a703..5987f78b76 100644
--- a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityCreateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityCreateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityPushTests.cpp b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityPushTests.cpp
index 9f9386ec45..259f1b9441 100644
--- a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityPushTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityPushTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityReParentTests.cpp b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityReParentTests.cpp
index 18da45ea76..d7ef0dff6e 100644
--- a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityReParentTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityReParentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.cpp b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.cpp
index 2606b64641..c881a98baf 100644
--- a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h
index 65ca218f5f..22023ccdd5 100644
--- a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h
+++ b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTests.cpp b/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTests.cpp
index 5c92c8b265..98b004feba 100644
--- a/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTestsData.h b/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTestsData.h
index ecbbbbe7ba..aa45b4c155 100644
--- a/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTestsData.h
+++ b/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTestsData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/SpinBoxTests.cpp b/Code/Framework/AzToolsFramework/Tests/SpinBoxTests.cpp
index 63d35c341d..4fa87ceb38 100644
--- a/Code/Framework/AzToolsFramework/Tests/SpinBoxTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/SpinBoxTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp b/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
index 5065ed7b51..05ffc6055f 100644
--- a/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp
index 2b1162f1b3..3007f12192 100644
--- a/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorTransformComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorTransformComponentTests.cpp
index c2b2c56275..f1afdb2ff2 100644
--- a/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorTransformComponentTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorTransformComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/UI/EntityIdQLineEditTests.cpp b/Code/Framework/AzToolsFramework/Tests/UI/EntityIdQLineEditTests.cpp
index f2285da973..6d3dcf8e61 100644
--- a/Code/Framework/AzToolsFramework/Tests/UI/EntityIdQLineEditTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/UI/EntityIdQLineEditTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp b/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp
index 8dd23b8b1f..cf9f95ef31 100644
--- a/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/UndoStack.cpp b/Code/Framework/AzToolsFramework/Tests/UndoStack.cpp
index faed9b4cc1..9ee830d7d9 100644
--- a/Code/Framework/AzToolsFramework/Tests/UndoStack.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/UndoStack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp
index 4b7b8e856e..1139b8fc21 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp
index bb4be77fbf..335424eda4 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp
index f1db4f4808..0c387c8a74 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp
index d2ea6a566c..a2f5ab8b36 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp
index a3c4568140..0fd570830f 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiWidgetManagerTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiWidgetManagerTests.cpp
index 66418e7ebd..f1d282e869 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiWidgetManagerTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiWidgetManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/Visibility/EditorVisibilityTests.cpp b/Code/Framework/AzToolsFramework/Tests/Visibility/EditorVisibilityTests.cpp
index ce5934b9b2..ad08a7ca20 100644
--- a/Code/Framework/AzToolsFramework/Tests/Visibility/EditorVisibilityTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Visibility/EditorVisibilityTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
index 31a8dc7de8..2e2be6f921 100644
--- a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
+++ b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/CMakeLists.txt b/Code/Framework/CMakeLists.txt
index ac006a8771..e12a8f4cab 100644
--- a/Code/Framework/CMakeLists.txt
+++ b/Code/Framework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Crcfix/CMakeLists.txt b/Code/Framework/Crcfix/CMakeLists.txt
index 269e73751e..e456fdd06d 100644
--- a/Code/Framework/Crcfix/CMakeLists.txt
+++ b/Code/Framework/Crcfix/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Crcfix/Platform/Linux/PAL_linux.cmake b/Code/Framework/Crcfix/Platform/Linux/PAL_linux.cmake
index 65ad844da5..360d3eea74 100644
--- a/Code/Framework/Crcfix/Platform/Linux/PAL_linux.cmake
+++ b/Code/Framework/Crcfix/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Crcfix/Platform/Mac/PAL_mac.cmake b/Code/Framework/Crcfix/Platform/Mac/PAL_mac.cmake
index 65ad844da5..360d3eea74 100644
--- a/Code/Framework/Crcfix/Platform/Mac/PAL_mac.cmake
+++ b/Code/Framework/Crcfix/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Crcfix/Platform/Windows/PAL_windows.cmake b/Code/Framework/Crcfix/Platform/Windows/PAL_windows.cmake
index 27e5814394..6ff80ae234 100644
--- a/Code/Framework/Crcfix/Platform/Windows/PAL_windows.cmake
+++ b/Code/Framework/Crcfix/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Crcfix/crcfix.cpp b/Code/Framework/Crcfix/crcfix.cpp
index 15543c6da2..ab39b19e3b 100644
--- a/Code/Framework/Crcfix/crcfix.cpp
+++ b/Code/Framework/Crcfix/crcfix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Crcfix/crcfix_files.cmake b/Code/Framework/Crcfix/crcfix_files.cmake
index 6b04f18a6b..5a62b2ca47 100644
--- a/Code/Framework/Crcfix/crcfix_files.cmake
+++ b/Code/Framework/Crcfix/crcfix_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GFxFramework/CMakeLists.txt b/Code/Framework/GFxFramework/CMakeLists.txt
index 0e00ae7043..999d42caeb 100644
--- a/Code/Framework/GFxFramework/CMakeLists.txt
+++ b/Code/Framework/GFxFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GFxFramework/GFxFramework/CMakeLists.txt b/Code/Framework/GFxFramework/GFxFramework/CMakeLists.txt
index 7b09fbd2df..d31d586197 100644
--- a/Code/Framework/GFxFramework/GFxFramework/CMakeLists.txt
+++ b/Code/Framework/GFxFramework/GFxFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GFxFramework/GFxFramework/MaterialIO/IMaterial.h b/Code/Framework/GFxFramework/GFxFramework/MaterialIO/IMaterial.h
index 09c437cb5a..3fdfa17a4b 100644
--- a/Code/Framework/GFxFramework/GFxFramework/MaterialIO/IMaterial.h
+++ b/Code/Framework/GFxFramework/GFxFramework/MaterialIO/IMaterial.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GFxFramework/GFxFramework/MaterialIO/Material.cpp b/Code/Framework/GFxFramework/GFxFramework/MaterialIO/Material.cpp
index 3b44a7eb90..d187d60ff7 100644
--- a/Code/Framework/GFxFramework/GFxFramework/MaterialIO/Material.cpp
+++ b/Code/Framework/GFxFramework/GFxFramework/MaterialIO/Material.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GFxFramework/GFxFramework/MaterialIO/Material.h b/Code/Framework/GFxFramework/GFxFramework/MaterialIO/Material.h
index 71fcc15520..3def1b811b 100644
--- a/Code/Framework/GFxFramework/GFxFramework/MaterialIO/Material.h
+++ b/Code/Framework/GFxFramework/GFxFramework/MaterialIO/Material.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GFxFramework/GFxFramework/gfxframework_files.cmake b/Code/Framework/GFxFramework/GFxFramework/gfxframework_files.cmake
index fc29aae71a..09fd8ca467 100644
--- a/Code/Framework/GFxFramework/GFxFramework/gfxframework_files.cmake
+++ b/Code/Framework/GFxFramework/GFxFramework/gfxframework_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GFxFramework/Platform/Linux/platform_linux.cmake b/Code/Framework/GFxFramework/Platform/Linux/platform_linux.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/GFxFramework/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/GFxFramework/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GFxFramework/Platform/Mac/platform_mac.cmake b/Code/Framework/GFxFramework/Platform/Mac/platform_mac.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/GFxFramework/Platform/Mac/platform_mac.cmake
+++ b/Code/Framework/GFxFramework/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GFxFramework/Platform/Windows/platform_windows.cmake b/Code/Framework/GFxFramework/Platform/Windows/platform_windows.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/GFxFramework/Platform/Windows/platform_windows.cmake
+++ b/Code/Framework/GFxFramework/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/CMakeLists.txt b/Code/Framework/GridMate/CMakeLists.txt
index bacd20c97f..c8db3f99f9 100644
--- a/Code/Framework/GridMate/CMakeLists.txt
+++ b/Code/Framework/GridMate/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/GridMate/BuildInfo.h b/Code/Framework/GridMate/GridMate/BuildInfo.h
index 5f30572c89..cf70213086 100644
--- a/Code/Framework/GridMate/GridMate/BuildInfo.h
+++ b/Code/Framework/GridMate/GridMate/BuildInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/Carrier.cpp b/Code/Framework/GridMate/GridMate/Carrier/Carrier.cpp
index d538240078..c511f01767 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/Carrier.cpp
+++ b/Code/Framework/GridMate/GridMate/Carrier/Carrier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/Carrier.h b/Code/Framework/GridMate/GridMate/Carrier/Carrier.h
index adb162c3a6..95586daeb0 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/Carrier.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/Carrier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/Compressor.h b/Code/Framework/GridMate/GridMate/Carrier/Compressor.h
index 5cfc963abd..cdb31b2e64 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/Compressor.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/Compressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/Cripter.h b/Code/Framework/GridMate/GridMate/Carrier/Cripter.h
index 5a3feda026..a7677d944a 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/Cripter.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/Cripter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/DefaultHandshake.cpp b/Code/Framework/GridMate/GridMate/Carrier/DefaultHandshake.cpp
index 806cdde432..d30f15e15c 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/DefaultHandshake.cpp
+++ b/Code/Framework/GridMate/GridMate/Carrier/DefaultHandshake.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/DefaultHandshake.h b/Code/Framework/GridMate/GridMate/Carrier/DefaultHandshake.h
index 11e5a0ef06..4f84020c2f 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/DefaultHandshake.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/DefaultHandshake.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/DefaultSimulator.cpp b/Code/Framework/GridMate/GridMate/Carrier/DefaultSimulator.cpp
index 3deb771d94..c5ecb77cf1 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/DefaultSimulator.cpp
+++ b/Code/Framework/GridMate/GridMate/Carrier/DefaultSimulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/DefaultSimulator.h b/Code/Framework/GridMate/GridMate/Carrier/DefaultSimulator.h
index 127361e67e..147c58dc8c 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/DefaultSimulator.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/DefaultSimulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/DefaultTrafficControl.cpp b/Code/Framework/GridMate/GridMate/Carrier/DefaultTrafficControl.cpp
index a04ed6ca04..281f3c6acf 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/DefaultTrafficControl.cpp
+++ b/Code/Framework/GridMate/GridMate/Carrier/DefaultTrafficControl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/DefaultTrafficControl.h b/Code/Framework/GridMate/GridMate/Carrier/DefaultTrafficControl.h
index db4b62dda5..c9b6b1227c 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/DefaultTrafficControl.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/DefaultTrafficControl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/Driver.h b/Code/Framework/GridMate/GridMate/Carrier/Driver.h
index 04a56a2aaa..650d485f52 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/Driver.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/Driver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/DriverEvents.h b/Code/Framework/GridMate/GridMate/Carrier/DriverEvents.h
index 93b1482e36..4ef7415efb 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/DriverEvents.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/DriverEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/Handshake.h b/Code/Framework/GridMate/GridMate/Carrier/Handshake.h
index d5da6afb76..3afa564a96 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/Handshake.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/Handshake.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.cpp b/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.cpp
index 8c6d8a7db1..70bcb2b051 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.cpp
+++ b/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.h b/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.h
index c6fa5d31c3..1167f03fac 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/Simulator.h b/Code/Framework/GridMate/GridMate/Carrier/Simulator.h
index 5933654f88..a6df8cf0e6 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/Simulator.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/Simulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/SocketDriver.cpp b/Code/Framework/GridMate/GridMate/Carrier/SocketDriver.cpp
index 97f4379e0f..3d2a9e134c 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/SocketDriver.cpp
+++ b/Code/Framework/GridMate/GridMate/Carrier/SocketDriver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/SocketDriver.h b/Code/Framework/GridMate/GridMate/Carrier/SocketDriver.h
index 3ae74a6421..3965777452 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/SocketDriver.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/SocketDriver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.cpp b/Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.cpp
index 14713806d6..f08762781c 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.cpp
+++ b/Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.h b/Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.h
index 625c8e8f9d..789c9f3e20 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/StreamSecureSocketDriver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/StreamSocketDriver.cpp b/Code/Framework/GridMate/GridMate/Carrier/StreamSocketDriver.cpp
index 0ab96b03aa..74978e1db5 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/StreamSocketDriver.cpp
+++ b/Code/Framework/GridMate/GridMate/Carrier/StreamSocketDriver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/StreamSocketDriver.h b/Code/Framework/GridMate/GridMate/Carrier/StreamSocketDriver.h
index 364b4243d0..8fdcc8346b 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/StreamSocketDriver.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/StreamSocketDriver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/TrafficControl.h b/Code/Framework/GridMate/GridMate/Carrier/TrafficControl.h
index 2e4296fbef..0e540091de 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/TrafficControl.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/TrafficControl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Carrier/Utils.h b/Code/Framework/GridMate/GridMate/Carrier/Utils.h
index ae6a4b6f4c..29618b6897 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/Utils.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Containers/list.h b/Code/Framework/GridMate/GridMate/Containers/list.h
index 19815ae465..1c34f65a50 100644
--- a/Code/Framework/GridMate/GridMate/Containers/list.h
+++ b/Code/Framework/GridMate/GridMate/Containers/list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Containers/queue.h b/Code/Framework/GridMate/GridMate/Containers/queue.h
index 5088f43d46..7ae04ffc3a 100644
--- a/Code/Framework/GridMate/GridMate/Containers/queue.h
+++ b/Code/Framework/GridMate/GridMate/Containers/queue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Containers/set.h b/Code/Framework/GridMate/GridMate/Containers/set.h
index b9f5af3b47..5cc3551476 100644
--- a/Code/Framework/GridMate/GridMate/Containers/set.h
+++ b/Code/Framework/GridMate/GridMate/Containers/set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Containers/slist.h b/Code/Framework/GridMate/GridMate/Containers/slist.h
index 25aad21d57..af90e7d12c 100644
--- a/Code/Framework/GridMate/GridMate/Containers/slist.h
+++ b/Code/Framework/GridMate/GridMate/Containers/slist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Containers/unordered_map.h b/Code/Framework/GridMate/GridMate/Containers/unordered_map.h
index b33693124f..a7cfe4549a 100644
--- a/Code/Framework/GridMate/GridMate/Containers/unordered_map.h
+++ b/Code/Framework/GridMate/GridMate/Containers/unordered_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Containers/unordered_set.h b/Code/Framework/GridMate/GridMate/Containers/unordered_set.h
index 8fff2bc22a..4bd1c24782 100644
--- a/Code/Framework/GridMate/GridMate/Containers/unordered_set.h
+++ b/Code/Framework/GridMate/GridMate/Containers/unordered_set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Containers/vector.h b/Code/Framework/GridMate/GridMate/Containers/vector.h
index 080f8f56cb..44922dd8c6 100644
--- a/Code/Framework/GridMate/GridMate/Containers/vector.h
+++ b/Code/Framework/GridMate/GridMate/Containers/vector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Docs.h b/Code/Framework/GridMate/GridMate/Docs.h
index 2d9df42bac..900b0528b0 100644
--- a/Code/Framework/GridMate/GridMate/Docs.h
+++ b/Code/Framework/GridMate/GridMate/Docs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Drillers/CarrierDriller.cpp b/Code/Framework/GridMate/GridMate/Drillers/CarrierDriller.cpp
index 7321c091e5..07f4605714 100644
--- a/Code/Framework/GridMate/GridMate/Drillers/CarrierDriller.cpp
+++ b/Code/Framework/GridMate/GridMate/Drillers/CarrierDriller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Drillers/CarrierDriller.h b/Code/Framework/GridMate/GridMate/Drillers/CarrierDriller.h
index 6883adbc65..3d5fe15711 100644
--- a/Code/Framework/GridMate/GridMate/Drillers/CarrierDriller.h
+++ b/Code/Framework/GridMate/GridMate/Drillers/CarrierDriller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Drillers/ReplicaDriller.cpp b/Code/Framework/GridMate/GridMate/Drillers/ReplicaDriller.cpp
index 581f143866..9c21f3d625 100644
--- a/Code/Framework/GridMate/GridMate/Drillers/ReplicaDriller.cpp
+++ b/Code/Framework/GridMate/GridMate/Drillers/ReplicaDriller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Drillers/ReplicaDriller.h b/Code/Framework/GridMate/GridMate/Drillers/ReplicaDriller.h
index 0eb776d946..35f123e594 100644
--- a/Code/Framework/GridMate/GridMate/Drillers/ReplicaDriller.h
+++ b/Code/Framework/GridMate/GridMate/Drillers/ReplicaDriller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Drillers/SessionDriller.cpp b/Code/Framework/GridMate/GridMate/Drillers/SessionDriller.cpp
index daeee3c3d7..96fa20935f 100644
--- a/Code/Framework/GridMate/GridMate/Drillers/SessionDriller.cpp
+++ b/Code/Framework/GridMate/GridMate/Drillers/SessionDriller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Drillers/SessionDriller.h b/Code/Framework/GridMate/GridMate/Drillers/SessionDriller.h
index 64cc848fe7..6446cca4c7 100644
--- a/Code/Framework/GridMate/GridMate/Drillers/SessionDriller.h
+++ b/Code/Framework/GridMate/GridMate/Drillers/SessionDriller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/EBus.h b/Code/Framework/GridMate/GridMate/EBus.h
index 2c38059df2..0ed22edf55 100644
--- a/Code/Framework/GridMate/GridMate/EBus.h
+++ b/Code/Framework/GridMate/GridMate/EBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/GridMate.cpp b/Code/Framework/GridMate/GridMate/GridMate.cpp
index 72b36d0849..83acda4997 100644
--- a/Code/Framework/GridMate/GridMate/GridMate.cpp
+++ b/Code/Framework/GridMate/GridMate/GridMate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/GridMate.h b/Code/Framework/GridMate/GridMate/GridMate.h
index f85c4cf66d..5d58084b49 100644
--- a/Code/Framework/GridMate/GridMate/GridMate.h
+++ b/Code/Framework/GridMate/GridMate/GridMate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/GridMateEventsBus.h b/Code/Framework/GridMate/GridMate/GridMateEventsBus.h
index 69c22309d8..24eb1cfd73 100644
--- a/Code/Framework/GridMate/GridMate/GridMateEventsBus.h
+++ b/Code/Framework/GridMate/GridMate/GridMateEventsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/GridMateService.h b/Code/Framework/GridMate/GridMate/GridMateService.h
index 1443e0ac69..18cc4f2fad 100644
--- a/Code/Framework/GridMate/GridMate/GridMateService.h
+++ b/Code/Framework/GridMate/GridMate/GridMateService.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/MathUtils.h b/Code/Framework/GridMate/GridMate/MathUtils.h
index eb560e1528..8b8a1967e3 100644
--- a/Code/Framework/GridMate/GridMate/MathUtils.h
+++ b/Code/Framework/GridMate/GridMate/MathUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Memory.h b/Code/Framework/GridMate/GridMate/Memory.h
index 00c9f61342..d9755f5b95 100644
--- a/Code/Framework/GridMate/GridMate/Memory.h
+++ b/Code/Framework/GridMate/GridMate/Memory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Online/OnlineUtilityThread.h b/Code/Framework/GridMate/GridMate/Online/OnlineUtilityThread.h
index 5d8d45b6b0..b6e52c9b1c 100644
--- a/Code/Framework/GridMate/GridMate/Online/OnlineUtilityThread.h
+++ b/Code/Framework/GridMate/GridMate/Online/OnlineUtilityThread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Online/UserServiceTypes.h b/Code/Framework/GridMate/GridMate/Online/UserServiceTypes.h
index 911f423be2..7749c3aee2 100644
--- a/Code/Framework/GridMate/GridMate/Online/UserServiceTypes.h
+++ b/Code/Framework/GridMate/GridMate/Online/UserServiceTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/BasicHostChunkDescriptor.h b/Code/Framework/GridMate/GridMate/Replica/BasicHostChunkDescriptor.h
index ee6565c13c..add71b27ef 100644
--- a/Code/Framework/GridMate/GridMate/Replica/BasicHostChunkDescriptor.h
+++ b/Code/Framework/GridMate/GridMate/Replica/BasicHostChunkDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/DataSet.cpp b/Code/Framework/GridMate/GridMate/Replica/DataSet.cpp
index 902f1101a0..1e50ba0228 100644
--- a/Code/Framework/GridMate/GridMate/Replica/DataSet.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/DataSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/DataSet.h b/Code/Framework/GridMate/GridMate/Replica/DataSet.h
index 59c26943d4..6e3d5c4717 100644
--- a/Code/Framework/GridMate/GridMate/Replica/DataSet.h
+++ b/Code/Framework/GridMate/GridMate/Replica/DataSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/DeltaCompressedDataSet.h b/Code/Framework/GridMate/GridMate/Replica/DeltaCompressedDataSet.h
index 8a6e66bcee..d4bc67f6fc 100644
--- a/Code/Framework/GridMate/GridMate/Replica/DeltaCompressedDataSet.h
+++ b/Code/Framework/GridMate/GridMate/Replica/DeltaCompressedDataSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.cpp b/Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.cpp
index 5d01d91fae..9e35427c04 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.h b/Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.h
index 4e9d958ba2..d6bf57206c 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/BitmaskInterestHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/InterestDefs.h b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestDefs.h
index 57c4fdc7e7..19b78be546 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/InterestDefs.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestDefs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/InterestEvents.h b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestEvents.h
index 4e5cb345c4..3c6ba51be6 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/InterestEvents.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/InterestManager.cpp b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestManager.cpp
index 70c1cea63a..723ec7d35b 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/InterestManager.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/InterestManager.h b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestManager.h
index d836fa52bc..e37c6b68e7 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/InterestManager.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/InterestQueryResult.cpp b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestQueryResult.cpp
index 3392dd63ce..dd06adb453 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/InterestQueryResult.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestQueryResult.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/InterestQueryResult.h b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestQueryResult.h
index 59c2ffd329..3c07589151 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/InterestQueryResult.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/InterestQueryResult.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interest/RulesHandler.h b/Code/Framework/GridMate/GridMate/Replica/Interest/RulesHandler.h
index 54a17820ef..dcf63ec2a6 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interest/RulesHandler.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Interest/RulesHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Interpolators.h b/Code/Framework/GridMate/GridMate/Replica/Interpolators.h
index af903d4f49..30e78de9fe 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Interpolators.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Interpolators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/MigrationSequence.cpp b/Code/Framework/GridMate/GridMate/Replica/MigrationSequence.cpp
index d662ea3064..c55b449d56 100644
--- a/Code/Framework/GridMate/GridMate/Replica/MigrationSequence.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/MigrationSequence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/MigrationSequence.h b/Code/Framework/GridMate/GridMate/Replica/MigrationSequence.h
index f11eb7229d..8c479291eb 100644
--- a/Code/Framework/GridMate/GridMate/Replica/MigrationSequence.h
+++ b/Code/Framework/GridMate/GridMate/Replica/MigrationSequence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/RemoteProcedureCall.cpp b/Code/Framework/GridMate/GridMate/Replica/RemoteProcedureCall.cpp
index e594b0c928..da7af23b02 100644
--- a/Code/Framework/GridMate/GridMate/Replica/RemoteProcedureCall.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/RemoteProcedureCall.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/RemoteProcedureCall.h b/Code/Framework/GridMate/GridMate/Replica/RemoteProcedureCall.h
index 23f2fdf88a..d33ee28b9e 100644
--- a/Code/Framework/GridMate/GridMate/Replica/RemoteProcedureCall.h
+++ b/Code/Framework/GridMate/GridMate/Replica/RemoteProcedureCall.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Replica.cpp b/Code/Framework/GridMate/GridMate/Replica/Replica.cpp
index 5602580c5a..63e42f41d5 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Replica.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/Replica.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Replica.h b/Code/Framework/GridMate/GridMate/Replica/Replica.h
index 1f5c8cc14b..b7bace0f8d 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Replica.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Replica.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaChunk.cpp b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunk.cpp
index 50d021695e..16e186c163 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaChunk.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunk.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaChunk.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunk.h
index 58c981827e..ecd3d5e711 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaChunk.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkDescriptor.cpp b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkDescriptor.cpp
index 6d9d151037..2f60f95395 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkDescriptor.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkDescriptor.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkDescriptor.h
index 7c3f767f81..4251ade1c0 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkDescriptor.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkInterface.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkInterface.h
index 9be4c0760b..bc1db81410 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkInterface.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaChunkInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaCommon.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaCommon.h
index 20f7ec0944..52760f6812 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaCommon.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaDefs.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaDefs.h
index 5f9a4d7b56..4722c5500c 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaDefs.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaDefs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaDrillerEvents.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaDrillerEvents.h
index 8d53d2147c..6c3cadde0d 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaDrillerEvents.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaDrillerEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaFunctions.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaFunctions.h
index d06e016c61..84367baca7 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaFunctions.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaFunctions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaFunctions.inl b/Code/Framework/GridMate/GridMate/Replica/ReplicaFunctions.inl
index c862df5004..013a9c0c4c 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaFunctions.inl
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaFunctions.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaInline.inl b/Code/Framework/GridMate/GridMate/Replica/ReplicaInline.inl
index 8f089129f9..aa4a9d5ead 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaInline.inl
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaInline.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaMgr.cpp b/Code/Framework/GridMate/GridMate/Replica/ReplicaMgr.cpp
index 1388896e18..762172910e 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaMgr.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaMgr.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaMgr.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaMgr.h
index a642818594..e7b856a16e 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaMgr.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaMgr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaStatus.cpp b/Code/Framework/GridMate/GridMate/Replica/ReplicaStatus.cpp
index faca465bc8..9cc161560f 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaStatus.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaStatus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaStatus.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaStatus.h
index a23c244678..95535daf92 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaStatus.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaStatus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaStatusInterface.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaStatusInterface.h
index 23f9ae3bed..5d31676bad 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaStatusInterface.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaStatusInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaTarget.cpp b/Code/Framework/GridMate/GridMate/Replica/ReplicaTarget.cpp
index 56e7e00db3..9a9a7cc577 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaTarget.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaTarget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaTarget.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaTarget.h
index 47c778644c..cd2e8a52d7 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaTarget.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaTarget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/ReplicaUtils.h b/Code/Framework/GridMate/GridMate/Replica/ReplicaUtils.h
index aac5ddf3ce..3b84fc6150 100644
--- a/Code/Framework/GridMate/GridMate/Replica/ReplicaUtils.h
+++ b/Code/Framework/GridMate/GridMate/Replica/ReplicaUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/SystemReplicas.cpp b/Code/Framework/GridMate/GridMate/Replica/SystemReplicas.cpp
index 2e42fd11e9..51b9f712d7 100644
--- a/Code/Framework/GridMate/GridMate/Replica/SystemReplicas.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/SystemReplicas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/SystemReplicas.h b/Code/Framework/GridMate/GridMate/Replica/SystemReplicas.h
index 3e352b3ddc..999d9e9c0f 100644
--- a/Code/Framework/GridMate/GridMate/Replica/SystemReplicas.h
+++ b/Code/Framework/GridMate/GridMate/Replica/SystemReplicas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.cpp b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.cpp
index 0781108709..bf1f51fce7 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.h b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.h
index 433d5336e4..fcffa9cd18 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaPriorityPolicy.h b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaPriorityPolicy.h
index 1743f1bfaa..995148aa7d 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaPriorityPolicy.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaPriorityPolicy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaProcessPolicy.cpp b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaProcessPolicy.cpp
index 9193093a6b..9751080462 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaProcessPolicy.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaProcessPolicy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaProcessPolicy.h b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaProcessPolicy.h
index afd7283509..f6f59dcf10 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaProcessPolicy.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaProcessPolicy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaTask.h b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaTask.h
index 7e309cd4b3..c46b35f202 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaTask.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaTask.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaTaskManager.h b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaTaskManager.h
index c77b885f0c..5665b6e2b5 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaTaskManager.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaTaskManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaUpdateTasks.cpp b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaUpdateTasks.cpp
index 17ea5a8f9a..f894a5b1bd 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaUpdateTasks.cpp
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaUpdateTasks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaUpdateTasks.h b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaUpdateTasks.h
index 90c3fda97b..0f455cb6df 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaUpdateTasks.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaUpdateTasks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Replica/Throttles.h b/Code/Framework/GridMate/GridMate/Replica/Throttles.h
index 0316f42a3c..f599a555a4 100644
--- a/Code/Framework/GridMate/GridMate/Replica/Throttles.h
+++ b/Code/Framework/GridMate/GridMate/Replica/Throttles.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/Buffer.cpp b/Code/Framework/GridMate/GridMate/Serialize/Buffer.cpp
index 4abaaaf213..b14001b543 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/Buffer.cpp
+++ b/Code/Framework/GridMate/GridMate/Serialize/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/Buffer.h b/Code/Framework/GridMate/GridMate/Serialize/Buffer.h
index be451036fe..830d67c17f 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/Buffer.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.cpp b/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.cpp
index e1f1f4c985..6f6ed549bd 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.cpp
+++ b/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.h b/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.h
index 9afe093f67..1eee912f65 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/ContainerMarshal.h b/Code/Framework/GridMate/GridMate/Serialize/ContainerMarshal.h
index ead4d3dc7c..6c7af219b1 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/ContainerMarshal.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/ContainerMarshal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/DataMarshal.h b/Code/Framework/GridMate/GridMate/Serialize/DataMarshal.h
index 1b841898ec..7b4a3e1aa0 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/DataMarshal.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/DataMarshal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/MarshalerTypes.h b/Code/Framework/GridMate/GridMate/Serialize/MarshalerTypes.h
index 0a091ee1ce..bc8d0f6ef5 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/MarshalerTypes.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/MarshalerTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/MathMarshal.h b/Code/Framework/GridMate/GridMate/Serialize/MathMarshal.h
index c56c88e17a..677be29dfc 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/MathMarshal.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/MathMarshal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/PackedSize.h b/Code/Framework/GridMate/GridMate/Serialize/PackedSize.h
index 56648d4c77..2b7fa2f3c7 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/PackedSize.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/PackedSize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/UtilityMarshal.h b/Code/Framework/GridMate/GridMate/Serialize/UtilityMarshal.h
index 1d3d1bb92c..4620b96db1 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/UtilityMarshal.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/UtilityMarshal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Serialize/UuidMarshal.h b/Code/Framework/GridMate/GridMate/Serialize/UuidMarshal.h
index 262efac06b..5599e99ead 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/UuidMarshal.h
+++ b/Code/Framework/GridMate/GridMate/Serialize/UuidMarshal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Session/LANSession.cpp b/Code/Framework/GridMate/GridMate/Session/LANSession.cpp
index 8e4f51e688..c6b57a972c 100644
--- a/Code/Framework/GridMate/GridMate/Session/LANSession.cpp
+++ b/Code/Framework/GridMate/GridMate/Session/LANSession.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Session/LANSession.h b/Code/Framework/GridMate/GridMate/Session/LANSession.h
index 8c12de4997..6dee34926c 100644
--- a/Code/Framework/GridMate/GridMate/Session/LANSession.h
+++ b/Code/Framework/GridMate/GridMate/Session/LANSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Session/LANSessionServiceBus.h b/Code/Framework/GridMate/GridMate/Session/LANSessionServiceBus.h
index ab8e0703e0..96aa02d170 100644
--- a/Code/Framework/GridMate/GridMate/Session/LANSessionServiceBus.h
+++ b/Code/Framework/GridMate/GridMate/Session/LANSessionServiceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Session/LANSessionServiceTypes.h b/Code/Framework/GridMate/GridMate/Session/LANSessionServiceTypes.h
index c5456988da..7a381e7cc4 100644
--- a/Code/Framework/GridMate/GridMate/Session/LANSessionServiceTypes.h
+++ b/Code/Framework/GridMate/GridMate/Session/LANSessionServiceTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Session/Session.cpp b/Code/Framework/GridMate/GridMate/Session/Session.cpp
index 25256f815c..ca54844c37 100644
--- a/Code/Framework/GridMate/GridMate/Session/Session.cpp
+++ b/Code/Framework/GridMate/GridMate/Session/Session.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Session/Session.h b/Code/Framework/GridMate/GridMate/Session/Session.h
index 966bd26a37..3796c11921 100644
--- a/Code/Framework/GridMate/GridMate/Session/Session.h
+++ b/Code/Framework/GridMate/GridMate/Session/Session.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Session/SessionServiceBus.h b/Code/Framework/GridMate/GridMate/Session/SessionServiceBus.h
index a6152ff582..874f3f5d18 100644
--- a/Code/Framework/GridMate/GridMate/Session/SessionServiceBus.h
+++ b/Code/Framework/GridMate/GridMate/Session/SessionServiceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/String/StringUtils.h b/Code/Framework/GridMate/GridMate/String/StringUtils.h
index d977bb6f85..b73043bff7 100644
--- a/Code/Framework/GridMate/GridMate/String/StringUtils.h
+++ b/Code/Framework/GridMate/GridMate/String/StringUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/String/string.h b/Code/Framework/GridMate/GridMate/String/string.h
index f265b85e32..a1fad474fd 100644
--- a/Code/Framework/GridMate/GridMate/String/string.h
+++ b/Code/Framework/GridMate/GridMate/String/string.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Types.h b/Code/Framework/GridMate/GridMate/Types.h
index 2e07f4838d..50d6f4caaa 100644
--- a/Code/Framework/GridMate/GridMate/Types.h
+++ b/Code/Framework/GridMate/GridMate/Types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/Version.h b/Code/Framework/GridMate/GridMate/Version.h
index 7c2ffa4976..517bb1c396 100644
--- a/Code/Framework/GridMate/GridMate/Version.h
+++ b/Code/Framework/GridMate/GridMate/Version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/VoiceChat/VoiceChatServiceBus.h b/Code/Framework/GridMate/GridMate/VoiceChat/VoiceChatServiceBus.h
index 9a0a7e8951..ad645eac0f 100644
--- a/Code/Framework/GridMate/GridMate/VoiceChat/VoiceChatServiceBus.h
+++ b/Code/Framework/GridMate/GridMate/VoiceChat/VoiceChatServiceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/GridMate/gridmate_files.cmake b/Code/Framework/GridMate/GridMate/gridmate_files.cmake
index e386f73e59..669e1a7cc2 100644
--- a/Code/Framework/GridMate/GridMate/gridmate_files.cmake
+++ b/Code/Framework/GridMate/GridMate/gridmate_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/GridMate/gridmate_ssl_files.cmake b/Code/Framework/GridMate/GridMate/gridmate_ssl_files.cmake
index 76c116ea18..51d2357a4f 100644
--- a/Code/Framework/GridMate/GridMate/gridmate_ssl_files.cmake
+++ b/Code/Framework/GridMate/GridMate/gridmate_ssl_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/SocketDriver_Android.h b/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/SocketDriver_Android.h
index 6f295fb547..77f9029fb6 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/SocketDriver_Android.h
+++ b/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/SocketDriver_Android.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/SocketDriver_Platform.h b/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/SocketDriver_Platform.h
index edc7f125f9..64653656af 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/SocketDriver_Platform.h
+++ b/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/SocketDriver_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/Utils_Android.cpp b/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/Utils_Android.cpp
index d9caea200b..300654d0fe 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/Utils_Android.cpp
+++ b/Code/Framework/GridMate/Platform/Android/GridMate/Carrier/Utils_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp b/Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp
index e146caac18..cb912512bd 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp
+++ b/Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Android/GridMate/Session/Session_Android.h b/Code/Framework/GridMate/Platform/Android/GridMate/Session/Session_Android.h
index ad49d2df73..e41e011a88 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate/Session/Session_Android.h
+++ b/Code/Framework/GridMate/Platform/Android/GridMate/Session/Session_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Android/GridMate/Session/Session_Platform.h b/Code/Framework/GridMate/Platform/Android/GridMate/Session/Session_Platform.h
index 46270ff119..8ea796554e 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate/Session/Session_Platform.h
+++ b/Code/Framework/GridMate/Platform/Android/GridMate/Session/Session_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Android/GridMate_Traits_Android.h b/Code/Framework/GridMate/Platform/Android/GridMate_Traits_Android.h
index 1fd7d025fe..146fadfb8b 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate_Traits_Android.h
+++ b/Code/Framework/GridMate/Platform/Android/GridMate_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Android/GridMate_Traits_Platform.h b/Code/Framework/GridMate/Platform/Android/GridMate_Traits_Platform.h
index e94398f645..dcbe9fcfe5 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate_Traits_Platform.h
+++ b/Code/Framework/GridMate/Platform/Android/GridMate_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Android/platform_android.cmake b/Code/Framework/GridMate/Platform/Android/platform_android.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/GridMate/Platform/Android/platform_android.cmake
+++ b/Code/Framework/GridMate/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Android/platform_android_files.cmake b/Code/Framework/GridMate/Platform/Android/platform_android_files.cmake
index 23d9be9f58..d5751bd3a7 100644
--- a/Code/Framework/GridMate/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/GridMate/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/SocketDriver_UnixLike.cpp b/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/SocketDriver_UnixLike.cpp
index a759e6a6b3..f63e8cc2c1 100644
--- a/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/SocketDriver_UnixLike.cpp
+++ b/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/SocketDriver_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/SocketDriver_UnixLike.h b/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/SocketDriver_UnixLike.h
index 6e3b047086..58c1719c8a 100644
--- a/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/SocketDriver_UnixLike.h
+++ b/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/SocketDriver_UnixLike.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/Utils_UnixLike.cpp b/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/Utils_UnixLike.cpp
index 93430978c7..df1098e0f2 100644
--- a/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/Utils_UnixLike.cpp
+++ b/Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/Utils_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/SocketDriver_WinAPI.cpp b/Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/SocketDriver_WinAPI.cpp
index fabd0400fd..9c4e289f3b 100644
--- a/Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/SocketDriver_WinAPI.cpp
+++ b/Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/SocketDriver_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/Utils_WinAPI.cpp b/Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/Utils_WinAPI.cpp
index 9b0d9e6089..d4832adf76 100644
--- a/Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/Utils_WinAPI.cpp
+++ b/Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/Utils_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Common/gridmate_clang.cmake b/Code/Framework/GridMate/Platform/Common/gridmate_clang.cmake
index f1893b4f46..b17baf630e 100644
--- a/Code/Framework/GridMate/Platform/Common/gridmate_clang.cmake
+++ b/Code/Framework/GridMate/Platform/Common/gridmate_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Common/gridmate_msvc.cmake b/Code/Framework/GridMate/Platform/Common/gridmate_msvc.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Framework/GridMate/Platform/Common/gridmate_msvc.cmake
+++ b/Code/Framework/GridMate/Platform/Common/gridmate_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Linux/GridMate/Carrier/SocketDriver_Platform.h b/Code/Framework/GridMate/Platform/Linux/GridMate/Carrier/SocketDriver_Platform.h
index a97f614686..15eba20540 100644
--- a/Code/Framework/GridMate/Platform/Linux/GridMate/Carrier/SocketDriver_Platform.h
+++ b/Code/Framework/GridMate/Platform/Linux/GridMate/Carrier/SocketDriver_Platform.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Linux/GridMate/Session/LANSession_Linux.cpp b/Code/Framework/GridMate/Platform/Linux/GridMate/Session/LANSession_Linux.cpp
index e146caac18..cb912512bd 100644
--- a/Code/Framework/GridMate/Platform/Linux/GridMate/Session/LANSession_Linux.cpp
+++ b/Code/Framework/GridMate/Platform/Linux/GridMate/Session/LANSession_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Linux/GridMate/Session/Session_Linux.h b/Code/Framework/GridMate/Platform/Linux/GridMate/Session/Session_Linux.h
index dc129a5077..34c445c169 100644
--- a/Code/Framework/GridMate/Platform/Linux/GridMate/Session/Session_Linux.h
+++ b/Code/Framework/GridMate/Platform/Linux/GridMate/Session/Session_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Linux/GridMate/Session/Session_Platform.h b/Code/Framework/GridMate/Platform/Linux/GridMate/Session/Session_Platform.h
index 47af77ac29..a86ebc4c3b 100644
--- a/Code/Framework/GridMate/Platform/Linux/GridMate/Session/Session_Platform.h
+++ b/Code/Framework/GridMate/Platform/Linux/GridMate/Session/Session_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Linux/GridMate/String/StringUtils_Platform.h b/Code/Framework/GridMate/Platform/Linux/GridMate/String/StringUtils_Platform.h
index ad49d2df73..e41e011a88 100644
--- a/Code/Framework/GridMate/Platform/Linux/GridMate/String/StringUtils_Platform.h
+++ b/Code/Framework/GridMate/Platform/Linux/GridMate/String/StringUtils_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Linux/GridMate_Traits_Linux.h b/Code/Framework/GridMate/Platform/Linux/GridMate_Traits_Linux.h
index a59e69d937..25cb21edd6 100644
--- a/Code/Framework/GridMate/Platform/Linux/GridMate_Traits_Linux.h
+++ b/Code/Framework/GridMate/Platform/Linux/GridMate_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Linux/GridMate_Traits_Platform.h b/Code/Framework/GridMate/Platform/Linux/GridMate_Traits_Platform.h
index 8c697bbb8f..dca67cb734 100644
--- a/Code/Framework/GridMate/Platform/Linux/GridMate_Traits_Platform.h
+++ b/Code/Framework/GridMate/Platform/Linux/GridMate_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Linux/platform_linux.cmake b/Code/Framework/GridMate/Platform/Linux/platform_linux.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/GridMate/Platform/Linux/platform_linux.cmake
+++ b/Code/Framework/GridMate/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Linux/platform_linux_files.cmake b/Code/Framework/GridMate/Platform/Linux/platform_linux_files.cmake
index 1e8c715448..07f6b56c86 100644
--- a/Code/Framework/GridMate/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/GridMate/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Mac/GridMate/Carrier/SocketDriver_Platform.h b/Code/Framework/GridMate/Platform/Mac/GridMate/Carrier/SocketDriver_Platform.h
index a97f614686..15eba20540 100644
--- a/Code/Framework/GridMate/Platform/Mac/GridMate/Carrier/SocketDriver_Platform.h
+++ b/Code/Framework/GridMate/Platform/Mac/GridMate/Carrier/SocketDriver_Platform.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Mac/GridMate/Session/LANSession_Mac.cpp b/Code/Framework/GridMate/Platform/Mac/GridMate/Session/LANSession_Mac.cpp
index e146caac18..cb912512bd 100644
--- a/Code/Framework/GridMate/Platform/Mac/GridMate/Session/LANSession_Mac.cpp
+++ b/Code/Framework/GridMate/Platform/Mac/GridMate/Session/LANSession_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Mac/GridMate/Session/Session_Mac.h b/Code/Framework/GridMate/Platform/Mac/GridMate/Session/Session_Mac.h
index dc129a5077..34c445c169 100644
--- a/Code/Framework/GridMate/Platform/Mac/GridMate/Session/Session_Mac.h
+++ b/Code/Framework/GridMate/Platform/Mac/GridMate/Session/Session_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Mac/GridMate/Session/Session_Platform.h b/Code/Framework/GridMate/Platform/Mac/GridMate/Session/Session_Platform.h
index 4cf810781e..0413b0f3b9 100644
--- a/Code/Framework/GridMate/Platform/Mac/GridMate/Session/Session_Platform.h
+++ b/Code/Framework/GridMate/Platform/Mac/GridMate/Session/Session_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Mac/GridMate_Traits_Mac.h b/Code/Framework/GridMate/Platform/Mac/GridMate_Traits_Mac.h
index 0f59b897ca..b5d2829fa7 100644
--- a/Code/Framework/GridMate/Platform/Mac/GridMate_Traits_Mac.h
+++ b/Code/Framework/GridMate/Platform/Mac/GridMate_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Mac/GridMate_Traits_Platform.h b/Code/Framework/GridMate/Platform/Mac/GridMate_Traits_Platform.h
index 15a7b01fd1..ede5b8e8f0 100644
--- a/Code/Framework/GridMate/Platform/Mac/GridMate_Traits_Platform.h
+++ b/Code/Framework/GridMate/Platform/Mac/GridMate_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Mac/platform_mac.cmake b/Code/Framework/GridMate/Platform/Mac/platform_mac.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Code/Framework/GridMate/Platform/Mac/platform_mac.cmake
+++ b/Code/Framework/GridMate/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Mac/platform_mac_files.cmake b/Code/Framework/GridMate/Platform/Mac/platform_mac_files.cmake
index 97c9903b4d..77d1771061 100644
--- a/Code/Framework/GridMate/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/GridMate/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/SocketDriver_Platform.h b/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/SocketDriver_Platform.h
index fef13b6733..833d25574f 100644
--- a/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/SocketDriver_Platform.h
+++ b/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/SocketDriver_Platform.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/SocketDriver_Windows.h b/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/SocketDriver_Windows.h
index 8e2494e899..f6eb3609dd 100644
--- a/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/SocketDriver_Windows.h
+++ b/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/SocketDriver_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/Utils_Windows.cpp b/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/Utils_Windows.cpp
index fff3774fec..330c17563a 100644
--- a/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/Utils_Windows.cpp
+++ b/Code/Framework/GridMate/Platform/Windows/GridMate/Carrier/Utils_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Windows/GridMate/Session/LANSession_Windows.cpp b/Code/Framework/GridMate/Platform/Windows/GridMate/Session/LANSession_Windows.cpp
index eed0a25e66..b9fb9bb225 100644
--- a/Code/Framework/GridMate/Platform/Windows/GridMate/Session/LANSession_Windows.cpp
+++ b/Code/Framework/GridMate/Platform/Windows/GridMate/Session/LANSession_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Windows/GridMate/Session/Session_Platform.h b/Code/Framework/GridMate/Platform/Windows/GridMate/Session/Session_Platform.h
index 48ec464f90..f8adc33b8b 100644
--- a/Code/Framework/GridMate/Platform/Windows/GridMate/Session/Session_Platform.h
+++ b/Code/Framework/GridMate/Platform/Windows/GridMate/Session/Session_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Windows/GridMate/Session/Session_Windows.h b/Code/Framework/GridMate/Platform/Windows/GridMate/Session/Session_Windows.h
index 0dc42bf462..bd142402ab 100644
--- a/Code/Framework/GridMate/Platform/Windows/GridMate/Session/Session_Windows.h
+++ b/Code/Framework/GridMate/Platform/Windows/GridMate/Session/Session_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Windows/GridMate_Traits_Platform.h b/Code/Framework/GridMate/Platform/Windows/GridMate_Traits_Platform.h
index b4faf3b604..856705aeb3 100644
--- a/Code/Framework/GridMate/Platform/Windows/GridMate_Traits_Platform.h
+++ b/Code/Framework/GridMate/Platform/Windows/GridMate_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Windows/GridMate_Traits_Windows.h b/Code/Framework/GridMate/Platform/Windows/GridMate_Traits_Windows.h
index f702544228..ccd697ed3f 100644
--- a/Code/Framework/GridMate/Platform/Windows/GridMate_Traits_Windows.h
+++ b/Code/Framework/GridMate/Platform/Windows/GridMate_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/Windows/platform_windows.cmake b/Code/Framework/GridMate/Platform/Windows/platform_windows.cmake
index d7b83d1d3f..1f16efff0b 100644
--- a/Code/Framework/GridMate/Platform/Windows/platform_windows.cmake
+++ b/Code/Framework/GridMate/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/Windows/platform_windows_files.cmake b/Code/Framework/GridMate/Platform/Windows/platform_windows_files.cmake
index 62eaaca1f4..bbbb9e9bb0 100644
--- a/Code/Framework/GridMate/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/GridMate/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/iOS/GridMate/Carrier/SocketDriver_Platform.h b/Code/Framework/GridMate/Platform/iOS/GridMate/Carrier/SocketDriver_Platform.h
index a97f614686..15eba20540 100644
--- a/Code/Framework/GridMate/Platform/iOS/GridMate/Carrier/SocketDriver_Platform.h
+++ b/Code/Framework/GridMate/Platform/iOS/GridMate/Carrier/SocketDriver_Platform.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/iOS/GridMate/Session/LANSession_iOS.cpp b/Code/Framework/GridMate/Platform/iOS/GridMate/Session/LANSession_iOS.cpp
index e146caac18..cb912512bd 100644
--- a/Code/Framework/GridMate/Platform/iOS/GridMate/Session/LANSession_iOS.cpp
+++ b/Code/Framework/GridMate/Platform/iOS/GridMate/Session/LANSession_iOS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/iOS/GridMate/Session/Session_Platform.h b/Code/Framework/GridMate/Platform/iOS/GridMate/Session/Session_Platform.h
index 0de3f37dc5..b6862a5369 100644
--- a/Code/Framework/GridMate/Platform/iOS/GridMate/Session/Session_Platform.h
+++ b/Code/Framework/GridMate/Platform/iOS/GridMate/Session/Session_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/iOS/GridMate/Session/Session_iOS.h b/Code/Framework/GridMate/Platform/iOS/GridMate/Session/Session_iOS.h
index dc129a5077..34c445c169 100644
--- a/Code/Framework/GridMate/Platform/iOS/GridMate/Session/Session_iOS.h
+++ b/Code/Framework/GridMate/Platform/iOS/GridMate/Session/Session_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/iOS/GridMate_Traits_Platform.h b/Code/Framework/GridMate/Platform/iOS/GridMate_Traits_Platform.h
index 0b1899258e..087a910207 100644
--- a/Code/Framework/GridMate/Platform/iOS/GridMate_Traits_Platform.h
+++ b/Code/Framework/GridMate/Platform/iOS/GridMate_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/iOS/GridMate_Traits_iOS.h b/Code/Framework/GridMate/Platform/iOS/GridMate_Traits_iOS.h
index 0f59b897ca..b5d2829fa7 100644
--- a/Code/Framework/GridMate/Platform/iOS/GridMate_Traits_iOS.h
+++ b/Code/Framework/GridMate/Platform/iOS/GridMate_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Platform/iOS/platform_ios.cmake b/Code/Framework/GridMate/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Framework/GridMate/Platform/iOS/platform_ios.cmake
+++ b/Code/Framework/GridMate/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Platform/iOS/platform_ios_files.cmake b/Code/Framework/GridMate/Platform/iOS/platform_ios_files.cmake
index e79a39bf27..a5663ff518 100644
--- a/Code/Framework/GridMate/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/GridMate/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Tests/Carrier.cpp b/Code/Framework/GridMate/Tests/Carrier.cpp
index 4c7e96b7ea..778747cf27 100644
--- a/Code/Framework/GridMate/Tests/Carrier.cpp
+++ b/Code/Framework/GridMate/Tests/Carrier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/CarrierStreamSocketDriverTests.cpp b/Code/Framework/GridMate/Tests/CarrierStreamSocketDriverTests.cpp
index ded4509997..c1478aad06 100644
--- a/Code/Framework/GridMate/Tests/CarrierStreamSocketDriverTests.cpp
+++ b/Code/Framework/GridMate/Tests/CarrierStreamSocketDriverTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Certificates.cpp b/Code/Framework/GridMate/Tests/Certificates.cpp
index 6bd403d723..abd728df60 100644
--- a/Code/Framework/GridMate/Tests/Certificates.cpp
+++ b/Code/Framework/GridMate/Tests/Certificates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests/Tests_Platform.h b/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests/Tests_Platform.h
index 44326e4a8c..de23de2bad 100644
--- a/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests/Tests_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests/Tests_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests_Traits_Android.h b/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests_Traits_Android.h
index e03d7cb85a..b084c4aa7c 100644
--- a/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests_Traits_Android.h
+++ b/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests_Traits_Platform.h b/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests_Traits_Platform.h
index d4b52796fc..5173892461 100644
--- a/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests_Traits_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/Android/GridMateTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Android/platform_android_files.cmake b/Code/Framework/GridMate/Tests/Platform/Android/platform_android_files.cmake
index 1b6da36626..f5bcc5730a 100644
--- a/Code/Framework/GridMate/Tests/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/GridMate/Tests/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Tests/Platform/Common/Unimplemented/GridMateTests/Tests_Unimplemented.h b/Code/Framework/GridMate/Tests/Platform/Common/Unimplemented/GridMateTests/Tests_Unimplemented.h
index b6bfd1b5eb..f624cdf416 100644
--- a/Code/Framework/GridMate/Tests/Platform/Common/Unimplemented/GridMateTests/Tests_Unimplemented.h
+++ b/Code/Framework/GridMate/Tests/Platform/Common/Unimplemented/GridMateTests/Tests_Unimplemented.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests/Tests_Platform.h b/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests/Tests_Platform.h
index 44326e4a8c..de23de2bad 100644
--- a/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests/Tests_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests/Tests_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests_Traits_Linux.h b/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests_Traits_Linux.h
index a0e9dabea0..3c6b3bdef1 100644
--- a/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests_Traits_Linux.h
+++ b/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests_Traits_Platform.h b/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests_Traits_Platform.h
index eb621b8323..3ba6d53bc8 100644
--- a/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests_Traits_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/Linux/GridMateTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Linux/platform_linux_files.cmake b/Code/Framework/GridMate/Tests/Platform/Linux/platform_linux_files.cmake
index 0c5d20e09f..1ef165360e 100644
--- a/Code/Framework/GridMate/Tests/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/GridMate/Tests/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests/Tests_Platform.h b/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests/Tests_Platform.h
index 44326e4a8c..de23de2bad 100644
--- a/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests/Tests_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests/Tests_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests_Traits_Mac.h b/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests_Traits_Mac.h
index f3d06f1839..176b8826af 100644
--- a/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests_Traits_Mac.h
+++ b/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests_Traits_Platform.h b/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests_Traits_Platform.h
index d611a0434f..c8dcb249e4 100644
--- a/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests_Traits_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/Mac/GridMateTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Mac/platform_mac_files.cmake b/Code/Framework/GridMate/Tests/Platform/Mac/platform_mac_files.cmake
index 4cd9f0825f..5a1cdaef92 100644
--- a/Code/Framework/GridMate/Tests/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/GridMate/Tests/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests/Tests_Platform.h b/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests/Tests_Platform.h
index d9e0af1208..193d4fce2e 100644
--- a/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests/Tests_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests/Tests_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests_Traits_Platform.h b/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests_Traits_Platform.h
index cc580b68ff..881cbe6b85 100644
--- a/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests_Traits_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests_Traits_Windows.h b/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests_Traits_Windows.h
index 8c0fc4bae3..3fe67a9057 100644
--- a/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests_Traits_Windows.h
+++ b/Code/Framework/GridMate/Tests/Platform/Windows/GridMateTests_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/Windows/platform_windows_files.cmake b/Code/Framework/GridMate/Tests/Platform/Windows/platform_windows_files.cmake
index bc754e6524..afa369b1de 100644
--- a/Code/Framework/GridMate/Tests/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/GridMate/Tests/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests/Tests_Platform.h b/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests/Tests_Platform.h
index 44326e4a8c..de23de2bad 100644
--- a/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests/Tests_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests/Tests_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests_Traits_Platform.h b/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests_Traits_Platform.h
index d6630c94ec..50d36cb500 100644
--- a/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests_Traits_Platform.h
+++ b/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests_Traits_iOS.h b/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests_Traits_iOS.h
index f3d06f1839..176b8826af 100644
--- a/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests_Traits_iOS.h
+++ b/Code/Framework/GridMate/Tests/Platform/iOS/GridMateTests_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Platform/iOS/platform_ios_files.cmake b/Code/Framework/GridMate/Tests/Platform/iOS/platform_ios_files.cmake
index 4e697ff263..5645b9b592 100644
--- a/Code/Framework/GridMate/Tests/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/GridMate/Tests/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Tests/Replica.cpp b/Code/Framework/GridMate/Tests/Replica.cpp
index 91df9b68a9..588073acd8 100644
--- a/Code/Framework/GridMate/Tests/Replica.cpp
+++ b/Code/Framework/GridMate/Tests/Replica.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/ReplicaBehavior.cpp b/Code/Framework/GridMate/Tests/ReplicaBehavior.cpp
index a567a5d1df..ca419a5560 100644
--- a/Code/Framework/GridMate/Tests/ReplicaBehavior.cpp
+++ b/Code/Framework/GridMate/Tests/ReplicaBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/ReplicaMedium.cpp b/Code/Framework/GridMate/Tests/ReplicaMedium.cpp
index 8a00f729e5..1d3f7d8c52 100644
--- a/Code/Framework/GridMate/Tests/ReplicaMedium.cpp
+++ b/Code/Framework/GridMate/Tests/ReplicaMedium.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/ReplicaSmall.cpp b/Code/Framework/GridMate/Tests/ReplicaSmall.cpp
index 8419c89eac..4cbd8baf1b 100644
--- a/Code/Framework/GridMate/Tests/ReplicaSmall.cpp
+++ b/Code/Framework/GridMate/Tests/ReplicaSmall.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Serialize.cpp b/Code/Framework/GridMate/Tests/Serialize.cpp
index 9561527d34..f2e0bf6a68 100644
--- a/Code/Framework/GridMate/Tests/Serialize.cpp
+++ b/Code/Framework/GridMate/Tests/Serialize.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Session.cpp b/Code/Framework/GridMate/Tests/Session.cpp
index f249448a3f..e386c0ed56 100644
--- a/Code/Framework/GridMate/Tests/Session.cpp
+++ b/Code/Framework/GridMate/Tests/Session.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/StreamSecureSocketDriverTests.cpp b/Code/Framework/GridMate/Tests/StreamSecureSocketDriverTests.cpp
index 603d555e6a..dd262fb24d 100644
--- a/Code/Framework/GridMate/Tests/StreamSecureSocketDriverTests.cpp
+++ b/Code/Framework/GridMate/Tests/StreamSecureSocketDriverTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/StreamSocketDriverTests.cpp b/Code/Framework/GridMate/Tests/StreamSocketDriverTests.cpp
index 48724c21d4..a9391b60e4 100644
--- a/Code/Framework/GridMate/Tests/StreamSocketDriverTests.cpp
+++ b/Code/Framework/GridMate/Tests/StreamSocketDriverTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/TestProfiler.cpp b/Code/Framework/GridMate/Tests/TestProfiler.cpp
index ea32b20a46..e747d69aa4 100644
--- a/Code/Framework/GridMate/Tests/TestProfiler.cpp
+++ b/Code/Framework/GridMate/Tests/TestProfiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/TestProfiler.h b/Code/Framework/GridMate/Tests/TestProfiler.h
index 31ee85e18a..d6cea91a55 100644
--- a/Code/Framework/GridMate/Tests/TestProfiler.h
+++ b/Code/Framework/GridMate/Tests/TestProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/Tests.h b/Code/Framework/GridMate/Tests/Tests.h
index db9bd7aeb9..4ea19392bf 100644
--- a/Code/Framework/GridMate/Tests/Tests.h
+++ b/Code/Framework/GridMate/Tests/Tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/GridMate/Tests/gridmate_test_files.cmake b/Code/Framework/GridMate/Tests/gridmate_test_files.cmake
index 26b069f310..12633b0f8d 100644
--- a/Code/Framework/GridMate/Tests/gridmate_test_files.cmake
+++ b/Code/Framework/GridMate/Tests/gridmate_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/GridMate/Tests/test_Main.cpp b/Code/Framework/GridMate/Tests/test_Main.cpp
index 032dff4d3e..f1e9eb2b69 100644
--- a/Code/Framework/GridMate/Tests/test_Main.cpp
+++ b/Code/Framework/GridMate/Tests/test_Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Application.cpp b/Code/Framework/Tests/Application.cpp
index 7037718ebf..375a950654 100644
--- a/Code/Framework/Tests/Application.cpp
+++ b/Code/Framework/Tests/Application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/ArchiveCompressionTests.cpp b/Code/Framework/Tests/ArchiveCompressionTests.cpp
index b536c1c4e9..80f23fde1f 100644
--- a/Code/Framework/Tests/ArchiveCompressionTests.cpp
+++ b/Code/Framework/Tests/ArchiveCompressionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/ArchiveTests.cpp b/Code/Framework/Tests/ArchiveTests.cpp
index 597a7d3b66..b05e3d4f96 100644
--- a/Code/Framework/Tests/ArchiveTests.cpp
+++ b/Code/Framework/Tests/ArchiveTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/AssetCatalog.cpp b/Code/Framework/Tests/AssetCatalog.cpp
index 7e9c6e4de7..9b0808295e 100644
--- a/Code/Framework/Tests/AssetCatalog.cpp
+++ b/Code/Framework/Tests/AssetCatalog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/AssetProcessorConnection.cpp b/Code/Framework/Tests/AssetProcessorConnection.cpp
index d5c0cbcfe6..a9a0d5b83e 100644
--- a/Code/Framework/Tests/AssetProcessorConnection.cpp
+++ b/Code/Framework/Tests/AssetProcessorConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/BehaviorEntityTests.cpp b/Code/Framework/Tests/BehaviorEntityTests.cpp
index 88863573e9..e918d5b28d 100644
--- a/Code/Framework/Tests/BehaviorEntityTests.cpp
+++ b/Code/Framework/Tests/BehaviorEntityTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/BinToTextEncode.cpp b/Code/Framework/Tests/BinToTextEncode.cpp
index 148e24f7ea..6e7a362f4d 100644
--- a/Code/Framework/Tests/BinToTextEncode.cpp
+++ b/Code/Framework/Tests/BinToTextEncode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/CMakeLists.txt b/Code/Framework/Tests/CMakeLists.txt
index 88ea05bee0..6781466413 100644
--- a/Code/Framework/Tests/CMakeLists.txt
+++ b/Code/Framework/Tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Tests/CameraInputTests.cpp b/Code/Framework/Tests/CameraInputTests.cpp
index 108af39abf..b4070dee5a 100644
--- a/Code/Framework/Tests/CameraInputTests.cpp
+++ b/Code/Framework/Tests/CameraInputTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/CameraState.cpp b/Code/Framework/Tests/CameraState.cpp
index 1ae9132b0e..d85d2ce22a 100644
--- a/Code/Framework/Tests/CameraState.cpp
+++ b/Code/Framework/Tests/CameraState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/ClickDetectorTests.cpp b/Code/Framework/Tests/ClickDetectorTests.cpp
index 05a74ea01f..d604f572ef 100644
--- a/Code/Framework/Tests/ClickDetectorTests.cpp
+++ b/Code/Framework/Tests/ClickDetectorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/ComponentAdapterTests.cpp b/Code/Framework/Tests/ComponentAdapterTests.cpp
index 0786d4ead6..47cf658b10 100644
--- a/Code/Framework/Tests/ComponentAdapterTests.cpp
+++ b/Code/Framework/Tests/ComponentAdapterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/ComponentAddRemove.cpp b/Code/Framework/Tests/ComponentAddRemove.cpp
index 241f830879..6050101f0e 100644
--- a/Code/Framework/Tests/ComponentAddRemove.cpp
+++ b/Code/Framework/Tests/ComponentAddRemove.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/CursorStateTests.cpp b/Code/Framework/Tests/CursorStateTests.cpp
index cb88fcec10..7ebdb94192 100644
--- a/Code/Framework/Tests/CursorStateTests.cpp
+++ b/Code/Framework/Tests/CursorStateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/EntityContext.cpp b/Code/Framework/Tests/EntityContext.cpp
index b7e740cb18..7f44ca54a0 100644
--- a/Code/Framework/Tests/EntityContext.cpp
+++ b/Code/Framework/Tests/EntityContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp b/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp
index 22a51e3217..79da3656bc 100644
--- a/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp
+++ b/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h b/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h
index 429b98fd9f..4d2421dad1 100644
--- a/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h
+++ b/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp b/Code/Framework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp
index 7bbbc8acb9..4f8d56c3dd 100644
--- a/Code/Framework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp
+++ b/Code/Framework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp b/Code/Framework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp
index 69ac60471e..fa693eca5e 100644
--- a/Code/Framework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp
+++ b/Code/Framework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/EntityTestbed.h b/Code/Framework/Tests/EntityTestbed.h
index 54ee341a3e..719ffb371e 100644
--- a/Code/Framework/Tests/EntityTestbed.h
+++ b/Code/Framework/Tests/EntityTestbed.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/FileFunc.cpp b/Code/Framework/Tests/FileFunc.cpp
index e06f15d2ca..4edb91164c 100644
--- a/Code/Framework/Tests/FileFunc.cpp
+++ b/Code/Framework/Tests/FileFunc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/FileIO.cpp b/Code/Framework/Tests/FileIO.cpp
index 40cca873ec..670893ad46 100644
--- a/Code/Framework/Tests/FileIO.cpp
+++ b/Code/Framework/Tests/FileIO.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/FileTagTests.cpp b/Code/Framework/Tests/FileTagTests.cpp
index d0291668d4..16337ea24c 100644
--- a/Code/Framework/Tests/FileTagTests.cpp
+++ b/Code/Framework/Tests/FileTagTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/FrameworkApplicationFixture.h b/Code/Framework/Tests/FrameworkApplicationFixture.h
index 2095ac7abd..acc5a70b6c 100644
--- a/Code/Framework/Tests/FrameworkApplicationFixture.h
+++ b/Code/Framework/Tests/FrameworkApplicationFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/GenAppDescriptors.cpp b/Code/Framework/Tests/GenAppDescriptors.cpp
index 8f3077ddea..dde3800895 100644
--- a/Code/Framework/Tests/GenAppDescriptors.cpp
+++ b/Code/Framework/Tests/GenAppDescriptors.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/GenericComponentWrapperTest.cpp b/Code/Framework/Tests/GenericComponentWrapperTest.cpp
index e0318d0338..23964774ab 100644
--- a/Code/Framework/Tests/GenericComponentWrapperTest.cpp
+++ b/Code/Framework/Tests/GenericComponentWrapperTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/InputTests.cpp b/Code/Framework/Tests/InputTests.cpp
index fba2ff9352..d5e0c8b72e 100644
--- a/Code/Framework/Tests/InputTests.cpp
+++ b/Code/Framework/Tests/InputTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/InstanceDataHierarchy.cpp b/Code/Framework/Tests/InstanceDataHierarchy.cpp
index c72cb38bfd..db0223c0cf 100644
--- a/Code/Framework/Tests/InstanceDataHierarchy.cpp
+++ b/Code/Framework/Tests/InstanceDataHierarchy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Mocks/MockSpawnableEntitiesInterface.h b/Code/Framework/Tests/Mocks/MockSpawnableEntitiesInterface.h
index 31b999cb22..eb7370aa16 100644
--- a/Code/Framework/Tests/Mocks/MockSpawnableEntitiesInterface.h
+++ b/Code/Framework/Tests/Mocks/MockSpawnableEntitiesInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/NativeWindow.cpp b/Code/Framework/Tests/NativeWindow.cpp
index 9b1c3eb691..f40d644288 100644
--- a/Code/Framework/Tests/NativeWindow.cpp
+++ b/Code/Framework/Tests/NativeWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/OctreePerformanceTests.cpp b/Code/Framework/Tests/OctreePerformanceTests.cpp
index 2b2c838ca4..0d0ac3e943 100644
--- a/Code/Framework/Tests/OctreePerformanceTests.cpp
+++ b/Code/Framework/Tests/OctreePerformanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/OctreeTests.cpp b/Code/Framework/Tests/OctreeTests.cpp
index bb45d42a7b..6c93dc7541 100644
--- a/Code/Framework/Tests/OctreeTests.cpp
+++ b/Code/Framework/Tests/OctreeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h b/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h
index 8f41f2ab40..95530f916e 100644
--- a/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h
+++ b/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h b/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h
index 18e0699c76..3f1ac768c8 100644
--- a/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h
+++ b/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Android/platform_android_files.cmake b/Code/Framework/Tests/Platform/Android/platform_android_files.cmake
index 8d5dc85c64..bd315a50be 100644
--- a/Code/Framework/Tests/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/Tests/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h b/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h
index a7ead6e00c..70b7955ccd 100644
--- a/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h
+++ b/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h b/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h
index 38e594962a..a65f611fe9 100644
--- a/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h
+++ b/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Linux/platform_linux_files.cmake b/Code/Framework/Tests/Platform/Linux/platform_linux_files.cmake
index 57ed1dec34..0b8dab3d7d 100644
--- a/Code/Framework/Tests/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/Tests/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h b/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h
index a7ead6e00c..70b7955ccd 100644
--- a/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h
+++ b/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h b/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h
index f96ffee5d7..0d48e6009f 100644
--- a/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h
+++ b/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Mac/platform_mac_files.cmake b/Code/Framework/Tests/Platform/Mac/platform_mac_files.cmake
index 5921f69f79..7806d60019 100644
--- a/Code/Framework/Tests/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/Tests/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h b/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h
index f1b3f05da2..b34a3304f3 100644
--- a/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h
+++ b/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h b/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h
index 0d3313f0c3..c6395bda04 100644
--- a/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h
+++ b/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/Windows/platform_windows_files.cmake b/Code/Framework/Tests/Platform/Windows/platform_windows_files.cmake
index 8b78e17f1d..4a653507c6 100644
--- a/Code/Framework/Tests/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/Tests/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h b/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h
index 625e445799..60af263fec 100644
--- a/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h
+++ b/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h b/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h
index 8f41f2ab40..95530f916e 100644
--- a/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h
+++ b/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Platform/iOS/platform_ios_files.cmake b/Code/Framework/Tests/Platform/iOS/platform_ios_files.cmake
index 4fc0fe6a62..35a27755e5 100644
--- a/Code/Framework/Tests/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/Tests/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Tests/PlatformHelper.cpp b/Code/Framework/Tests/PlatformHelper.cpp
index 4329706292..9e0b61968e 100644
--- a/Code/Framework/Tests/PlatformHelper.cpp
+++ b/Code/Framework/Tests/PlatformHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/ProcessLaunchMain.cpp b/Code/Framework/Tests/ProcessLaunchMain.cpp
index 5f943e8a20..ca9dca4284 100644
--- a/Code/Framework/Tests/ProcessLaunchMain.cpp
+++ b/Code/Framework/Tests/ProcessLaunchMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/ProcessLaunchParseTests.cpp b/Code/Framework/Tests/ProcessLaunchParseTests.cpp
index 15141941f2..2f19441688 100644
--- a/Code/Framework/Tests/ProcessLaunchParseTests.cpp
+++ b/Code/Framework/Tests/ProcessLaunchParseTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/SQLiteConnectionTests.cpp b/Code/Framework/Tests/SQLiteConnectionTests.cpp
index e6fe420606..984f9c5104 100644
--- a/Code/Framework/Tests/SQLiteConnectionTests.cpp
+++ b/Code/Framework/Tests/SQLiteConnectionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Scene.cpp b/Code/Framework/Tests/Scene.cpp
index 2192753632..32a0958692 100644
--- a/Code/Framework/Tests/Scene.cpp
+++ b/Code/Framework/Tests/Scene.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Script/ScriptComponentTests.cpp b/Code/Framework/Tests/Script/ScriptComponentTests.cpp
index 9b7c0852fa..9185d6a0bd 100644
--- a/Code/Framework/Tests/Script/ScriptComponentTests.cpp
+++ b/Code/Framework/Tests/Script/ScriptComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Script/ScriptEntityTests.cpp b/Code/Framework/Tests/Script/ScriptEntityTests.cpp
index 612cedf7cf..8e73fd8209 100644
--- a/Code/Framework/Tests/Script/ScriptEntityTests.cpp
+++ b/Code/Framework/Tests/Script/ScriptEntityTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Slices.cpp b/Code/Framework/Tests/Slices.cpp
index ac37d276db..ba413eb727 100644
--- a/Code/Framework/Tests/Slices.cpp
+++ b/Code/Framework/Tests/Slices.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp b/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
index 3775a4b0bf..734ba03dba 100644
--- a/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
+++ b/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/TransformComponent.cpp b/Code/Framework/Tests/TransformComponent.cpp
index 4fa287ddbd..57edbf7f74 100644
--- a/Code/Framework/Tests/TransformComponent.cpp
+++ b/Code/Framework/Tests/TransformComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Utils/Utils.cpp b/Code/Framework/Tests/Utils/Utils.cpp
index 832a26f14f..df3d08c6fa 100644
--- a/Code/Framework/Tests/Utils/Utils.cpp
+++ b/Code/Framework/Tests/Utils/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/Utils/Utils.h b/Code/Framework/Tests/Utils/Utils.h
index c58ec51338..c3f71dc1dc 100644
--- a/Code/Framework/Tests/Utils/Utils.h
+++ b/Code/Framework/Tests/Utils/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Framework/Tests/framework_shared_tests_files.cmake b/Code/Framework/Tests/framework_shared_tests_files.cmake
index e280ed9a4d..72ffdf0043 100644
--- a/Code/Framework/Tests/framework_shared_tests_files.cmake
+++ b/Code/Framework/Tests/framework_shared_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Tests/frameworktests_files.cmake b/Code/Framework/Tests/frameworktests_files.cmake
index 0885684aec..398bb8f45b 100644
--- a/Code/Framework/Tests/frameworktests_files.cmake
+++ b/Code/Framework/Tests/frameworktests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Framework/Tests/process_launch_test_files.cmake b/Code/Framework/Tests/process_launch_test_files.cmake
index a49a323ec1..4deddbdfc9 100644
--- a/Code/Framework/Tests/process_launch_test_files.cmake
+++ b/Code/Framework/Tests/process_launch_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/CMakeLists.txt b/Code/LauncherUnified/CMakeLists.txt
index 5a74fb3fb7..0eaad4af64 100644
--- a/Code/LauncherUnified/CMakeLists.txt
+++ b/Code/LauncherUnified/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/FindLauncherGenerator.cmake b/Code/LauncherUnified/FindLauncherGenerator.cmake
index dcc8a83759..30bde3556b 100644
--- a/Code/LauncherUnified/FindLauncherGenerator.cmake
+++ b/Code/LauncherUnified/FindLauncherGenerator.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Game.cpp b/Code/LauncherUnified/Game.cpp
index 406754a2c1..140b579a02 100644
--- a/Code/LauncherUnified/Game.cpp
+++ b/Code/LauncherUnified/Game.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Launcher.cpp b/Code/LauncherUnified/Launcher.cpp
index ed6be76234..36d7659429 100644
--- a/Code/LauncherUnified/Launcher.cpp
+++ b/Code/LauncherUnified/Launcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Launcher.h b/Code/LauncherUnified/Launcher.h
index 6cce91a2ce..40d7a4befe 100644
--- a/Code/LauncherUnified/Launcher.h
+++ b/Code/LauncherUnified/Launcher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/LauncherProject.cpp b/Code/LauncherUnified/LauncherProject.cpp
index 62669e4310..8aff6737c6 100644
--- a/Code/LauncherUnified/LauncherProject.cpp
+++ b/Code/LauncherUnified/LauncherProject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Android/LauncherUnified_traits_android.cmake b/Code/LauncherUnified/Platform/Android/LauncherUnified_traits_android.cmake
index 52da2f3a38..9e271cc9f3 100644
--- a/Code/LauncherUnified/Platform/Android/LauncherUnified_traits_android.cmake
+++ b/Code/LauncherUnified/Platform/Android/LauncherUnified_traits_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Android/Launcher_Android.cpp b/Code/LauncherUnified/Platform/Android/Launcher_Android.cpp
index 79f754f48d..547d387a4e 100644
--- a/Code/LauncherUnified/Platform/Android/Launcher_Android.cpp
+++ b/Code/LauncherUnified/Platform/Android/Launcher_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Android/Launcher_Traits_Android.h b/Code/LauncherUnified/Platform/Android/Launcher_Traits_Android.h
index ef3b161308..7ce0cac011 100644
--- a/Code/LauncherUnified/Platform/Android/Launcher_Traits_Android.h
+++ b/Code/LauncherUnified/Platform/Android/Launcher_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Android/Launcher_Traits_Platform.h b/Code/LauncherUnified/Platform/Android/Launcher_Traits_Platform.h
index 170f44a458..fb19a0f9e9 100644
--- a/Code/LauncherUnified/Platform/Android/Launcher_Traits_Platform.h
+++ b/Code/LauncherUnified/Platform/Android/Launcher_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Android/launcher_game_android_files.cmake b/Code/LauncherUnified/Platform/Android/launcher_game_android_files.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/LauncherUnified/Platform/Android/launcher_game_android_files.cmake
+++ b/Code/LauncherUnified/Platform/Android/launcher_game_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Android/launcher_project_android.cmake b/Code/LauncherUnified/Platform/Android/launcher_project_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/LauncherUnified/Platform/Android/launcher_project_android.cmake
+++ b/Code/LauncherUnified/Platform/Android/launcher_project_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Android/native_app_glue_include.c b/Code/LauncherUnified/Platform/Android/native_app_glue_include.c
index 5a968aab31..1139b244f9 100644
--- a/Code/LauncherUnified/Platform/Android/native_app_glue_include.c
+++ b/Code/LauncherUnified/Platform/Android/native_app_glue_include.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Android/platform_android.cmake b/Code/LauncherUnified/Platform/Android/platform_android.cmake
index d6a0bc5464..e359965fc3 100644
--- a/Code/LauncherUnified/Platform/Android/platform_android.cmake
+++ b/Code/LauncherUnified/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Android/platform_android_files.cmake b/Code/LauncherUnified/Platform/Android/platform_android_files.cmake
index 033e288bab..dede18f903 100644
--- a/Code/LauncherUnified/Platform/Android/platform_android_files.cmake
+++ b/Code/LauncherUnified/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Common/Apple/Launcher_Apple.h b/Code/LauncherUnified/Platform/Common/Apple/Launcher_Apple.h
index 8fe0d148ee..d260ce19db 100644
--- a/Code/LauncherUnified/Platform/Common/Apple/Launcher_Apple.h
+++ b/Code/LauncherUnified/Platform/Common/Apple/Launcher_Apple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Common/Apple/Launcher_Apple.mm b/Code/LauncherUnified/Platform/Common/Apple/Launcher_Apple.mm
index 496fa12113..045dd39305 100644
--- a/Code/LauncherUnified/Platform/Common/Apple/Launcher_Apple.mm
+++ b/Code/LauncherUnified/Platform/Common/Apple/Launcher_Apple.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp b/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp
index 2bcdc7a0ce..426fe50236 100644
--- a/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp
+++ b/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.h b/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.h
index baec8c1cea..b1765dfa9d 100644
--- a/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.h
+++ b/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Linux/LauncherUnified_traits_linux.cmake b/Code/LauncherUnified/Platform/Linux/LauncherUnified_traits_linux.cmake
index eb5a46f899..3beb8a2442 100644
--- a/Code/LauncherUnified/Platform/Linux/LauncherUnified_traits_linux.cmake
+++ b/Code/LauncherUnified/Platform/Linux/LauncherUnified_traits_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Linux/Launcher_Linux.cpp b/Code/LauncherUnified/Platform/Linux/Launcher_Linux.cpp
index e7861c56ab..19b2f4bfd5 100644
--- a/Code/LauncherUnified/Platform/Linux/Launcher_Linux.cpp
+++ b/Code/LauncherUnified/Platform/Linux/Launcher_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Linux/Launcher_Traits_Linux.h b/Code/LauncherUnified/Platform/Linux/Launcher_Traits_Linux.h
index 4609f8dc2f..fde9569211 100644
--- a/Code/LauncherUnified/Platform/Linux/Launcher_Traits_Linux.h
+++ b/Code/LauncherUnified/Platform/Linux/Launcher_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Linux/Launcher_Traits_Platform.h b/Code/LauncherUnified/Platform/Linux/Launcher_Traits_Platform.h
index b2c5fcd986..643fb7c39a 100644
--- a/Code/LauncherUnified/Platform/Linux/Launcher_Traits_Platform.h
+++ b/Code/LauncherUnified/Platform/Linux/Launcher_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Linux/launcher_game_linux_files.cmake b/Code/LauncherUnified/Platform/Linux/launcher_game_linux_files.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/LauncherUnified/Platform/Linux/launcher_game_linux_files.cmake
+++ b/Code/LauncherUnified/Platform/Linux/launcher_game_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Linux/launcher_project_linux.cmake b/Code/LauncherUnified/Platform/Linux/launcher_project_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/LauncherUnified/Platform/Linux/launcher_project_linux.cmake
+++ b/Code/LauncherUnified/Platform/Linux/launcher_project_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Linux/platform_linux.cmake b/Code/LauncherUnified/Platform/Linux/platform_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/LauncherUnified/Platform/Linux/platform_linux.cmake
+++ b/Code/LauncherUnified/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Linux/platform_linux_files.cmake b/Code/LauncherUnified/Platform/Linux/platform_linux_files.cmake
index 7f3f76be63..0db96489dc 100644
--- a/Code/LauncherUnified/Platform/Linux/platform_linux_files.cmake
+++ b/Code/LauncherUnified/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Mac/LauncherUnified_traits_mac.cmake b/Code/LauncherUnified/Platform/Mac/LauncherUnified_traits_mac.cmake
index eb5a46f899..3beb8a2442 100644
--- a/Code/LauncherUnified/Platform/Mac/LauncherUnified_traits_mac.cmake
+++ b/Code/LauncherUnified/Platform/Mac/LauncherUnified_traits_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Mac/Launcher_Mac.mm b/Code/LauncherUnified/Platform/Mac/Launcher_Mac.mm
index c70a6e422f..68c6ae5c9d 100644
--- a/Code/LauncherUnified/Platform/Mac/Launcher_Mac.mm
+++ b/Code/LauncherUnified/Platform/Mac/Launcher_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Mac/Launcher_Traits_Mac.h b/Code/LauncherUnified/Platform/Mac/Launcher_Traits_Mac.h
index 0415b1016f..1ee87b5d96 100644
--- a/Code/LauncherUnified/Platform/Mac/Launcher_Traits_Mac.h
+++ b/Code/LauncherUnified/Platform/Mac/Launcher_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Mac/Launcher_Traits_Platform.h b/Code/LauncherUnified/Platform/Mac/Launcher_Traits_Platform.h
index e16046ee09..dd9019f26c 100644
--- a/Code/LauncherUnified/Platform/Mac/Launcher_Traits_Platform.h
+++ b/Code/LauncherUnified/Platform/Mac/Launcher_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Mac/O3DEApplicationDelegate_Mac.mm b/Code/LauncherUnified/Platform/Mac/O3DEApplicationDelegate_Mac.mm
index ecdf012ff2..aaedef56c2 100644
--- a/Code/LauncherUnified/Platform/Mac/O3DEApplicationDelegate_Mac.mm
+++ b/Code/LauncherUnified/Platform/Mac/O3DEApplicationDelegate_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Mac/O3DEApplication_Mac.h b/Code/LauncherUnified/Platform/Mac/O3DEApplication_Mac.h
index e230b1cbe5..ead851954d 100644
--- a/Code/LauncherUnified/Platform/Mac/O3DEApplication_Mac.h
+++ b/Code/LauncherUnified/Platform/Mac/O3DEApplication_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Mac/O3DEApplication_Mac.mm b/Code/LauncherUnified/Platform/Mac/O3DEApplication_Mac.mm
index 93a120e70d..a740a6b985 100644
--- a/Code/LauncherUnified/Platform/Mac/O3DEApplication_Mac.mm
+++ b/Code/LauncherUnified/Platform/Mac/O3DEApplication_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Mac/launcher_game_mac_files.cmake b/Code/LauncherUnified/Platform/Mac/launcher_game_mac_files.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/LauncherUnified/Platform/Mac/launcher_game_mac_files.cmake
+++ b/Code/LauncherUnified/Platform/Mac/launcher_game_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Mac/launcher_project_mac.cmake b/Code/LauncherUnified/Platform/Mac/launcher_project_mac.cmake
index 1130c01cd2..d00d7d3303 100644
--- a/Code/LauncherUnified/Platform/Mac/launcher_project_mac.cmake
+++ b/Code/LauncherUnified/Platform/Mac/launcher_project_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Mac/platform_mac.cmake b/Code/LauncherUnified/Platform/Mac/platform_mac.cmake
index 569a14d20e..f2e48c3e91 100644
--- a/Code/LauncherUnified/Platform/Mac/platform_mac.cmake
+++ b/Code/LauncherUnified/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Mac/platform_mac_files.cmake b/Code/LauncherUnified/Platform/Mac/platform_mac_files.cmake
index 2146f38e24..6ec9d6f295 100644
--- a/Code/LauncherUnified/Platform/Mac/platform_mac_files.cmake
+++ b/Code/LauncherUnified/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Windows/LauncherUnified_traits_windows.cmake b/Code/LauncherUnified/Platform/Windows/LauncherUnified_traits_windows.cmake
index eb5a46f899..3beb8a2442 100644
--- a/Code/LauncherUnified/Platform/Windows/LauncherUnified_traits_windows.cmake
+++ b/Code/LauncherUnified/Platform/Windows/LauncherUnified_traits_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Windows/Launcher_Game_Windows.cpp b/Code/LauncherUnified/Platform/Windows/Launcher_Game_Windows.cpp
index 2f77d4ad86..eec1e4fd5d 100644
--- a/Code/LauncherUnified/Platform/Windows/Launcher_Game_Windows.cpp
+++ b/Code/LauncherUnified/Platform/Windows/Launcher_Game_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Windows/Launcher_Traits_Platform.h b/Code/LauncherUnified/Platform/Windows/Launcher_Traits_Platform.h
index f12863372d..4f2b93bc33 100644
--- a/Code/LauncherUnified/Platform/Windows/Launcher_Traits_Platform.h
+++ b/Code/LauncherUnified/Platform/Windows/Launcher_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Windows/Launcher_Traits_Windows.h b/Code/LauncherUnified/Platform/Windows/Launcher_Traits_Windows.h
index 6f89fa0e5c..846515c29e 100644
--- a/Code/LauncherUnified/Platform/Windows/Launcher_Traits_Windows.h
+++ b/Code/LauncherUnified/Platform/Windows/Launcher_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Windows/Launcher_Windows.cpp b/Code/LauncherUnified/Platform/Windows/Launcher_Windows.cpp
index bfce304e5e..ccf28bd1af 100644
--- a/Code/LauncherUnified/Platform/Windows/Launcher_Windows.cpp
+++ b/Code/LauncherUnified/Platform/Windows/Launcher_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/Windows/launcher_game_windows_files.cmake b/Code/LauncherUnified/Platform/Windows/launcher_game_windows_files.cmake
index 99927e16b4..38608e6da0 100644
--- a/Code/LauncherUnified/Platform/Windows/launcher_game_windows_files.cmake
+++ b/Code/LauncherUnified/Platform/Windows/launcher_game_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake b/Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake
index 7c5962dc60..07cbceac29 100644
--- a/Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake
+++ b/Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Windows/platform_windows.cmake b/Code/LauncherUnified/Platform/Windows/platform_windows.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/LauncherUnified/Platform/Windows/platform_windows.cmake
+++ b/Code/LauncherUnified/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/Windows/platform_windows_files.cmake b/Code/LauncherUnified/Platform/Windows/platform_windows_files.cmake
index bd33c684ee..ed7df1026a 100644
--- a/Code/LauncherUnified/Platform/Windows/platform_windows_files.cmake
+++ b/Code/LauncherUnified/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/iOS/LauncherUnified_traits_ios.cmake b/Code/LauncherUnified/Platform/iOS/LauncherUnified_traits_ios.cmake
index eb5a46f899..3beb8a2442 100644
--- a/Code/LauncherUnified/Platform/iOS/LauncherUnified_traits_ios.cmake
+++ b/Code/LauncherUnified/Platform/iOS/LauncherUnified_traits_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/iOS/Launcher_Traits_Platform.h b/Code/LauncherUnified/Platform/iOS/Launcher_Traits_Platform.h
index da0311c706..3be865221e 100644
--- a/Code/LauncherUnified/Platform/iOS/Launcher_Traits_Platform.h
+++ b/Code/LauncherUnified/Platform/iOS/Launcher_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/iOS/Launcher_Traits_iOS.h b/Code/LauncherUnified/Platform/iOS/Launcher_Traits_iOS.h
index 76f0474466..db1454bf52 100644
--- a/Code/LauncherUnified/Platform/iOS/Launcher_Traits_iOS.h
+++ b/Code/LauncherUnified/Platform/iOS/Launcher_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/iOS/Launcher_iOS.mm b/Code/LauncherUnified/Platform/iOS/Launcher_iOS.mm
index 651e2fb3dc..480a1b0be1 100644
--- a/Code/LauncherUnified/Platform/iOS/Launcher_iOS.mm
+++ b/Code/LauncherUnified/Platform/iOS/Launcher_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/iOS/O3DEApplicationDelegate_iOS.mm b/Code/LauncherUnified/Platform/iOS/O3DEApplicationDelegate_iOS.mm
index e056181d03..317b00d183 100644
--- a/Code/LauncherUnified/Platform/iOS/O3DEApplicationDelegate_iOS.mm
+++ b/Code/LauncherUnified/Platform/iOS/O3DEApplicationDelegate_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/iOS/O3DEApplication_iOS.mm b/Code/LauncherUnified/Platform/iOS/O3DEApplication_iOS.mm
index 3766d4b5f3..7ba4739578 100644
--- a/Code/LauncherUnified/Platform/iOS/O3DEApplication_iOS.mm
+++ b/Code/LauncherUnified/Platform/iOS/O3DEApplication_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Platform/iOS/launcher_game_ios_files.cmake b/Code/LauncherUnified/Platform/iOS/launcher_game_ios_files.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/LauncherUnified/Platform/iOS/launcher_game_ios_files.cmake
+++ b/Code/LauncherUnified/Platform/iOS/launcher_game_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/iOS/launcher_project_ios.cmake b/Code/LauncherUnified/Platform/iOS/launcher_project_ios.cmake
index 617d8fc58a..38aca405a6 100644
--- a/Code/LauncherUnified/Platform/iOS/launcher_project_ios.cmake
+++ b/Code/LauncherUnified/Platform/iOS/launcher_project_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -32,6 +32,7 @@ set_target_properties(${project_name}.GameLauncher PROPERTIES
     MACOSX_BUNDLE_INFO_PLIST ${ly_game_resource_folder}/Info.plist
     RESOURCE ${ly_game_resource_folder}/Images.xcassets
     XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME ${project_name}AppIcon
+    XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME LaunchImage
 )
 
 set(layout_tool_dir ${LY_ROOT_FOLDER}/cmake/Tools)
diff --git a/Code/LauncherUnified/Platform/iOS/platform_ios.cmake b/Code/LauncherUnified/Platform/iOS/platform_ios.cmake
index cc31ad670b..8aa815a176 100644
--- a/Code/LauncherUnified/Platform/iOS/platform_ios.cmake
+++ b/Code/LauncherUnified/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Platform/iOS/platform_ios_files.cmake b/Code/LauncherUnified/Platform/iOS/platform_ios_files.cmake
index 98eff11601..9ebcf485a1 100644
--- a/Code/LauncherUnified/Platform/iOS/platform_ios_files.cmake
+++ b/Code/LauncherUnified/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/Server.cpp b/Code/LauncherUnified/Server.cpp
index 509ee53349..8b4cd6beeb 100644
--- a/Code/LauncherUnified/Server.cpp
+++ b/Code/LauncherUnified/Server.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Tests/LauncherUnifiedTests.cpp b/Code/LauncherUnified/Tests/LauncherUnifiedTests.cpp
index adc24b64b8..3a0146f946 100644
--- a/Code/LauncherUnified/Tests/LauncherUnifiedTests.cpp
+++ b/Code/LauncherUnified/Tests/LauncherUnifiedTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/Tests/Test.cpp b/Code/LauncherUnified/Tests/Test.cpp
index 5aa5af78b2..cf4fc7ad38 100644
--- a/Code/LauncherUnified/Tests/Test.cpp
+++ b/Code/LauncherUnified/Tests/Test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/LauncherUnified/launcher_files.cmake b/Code/LauncherUnified/launcher_files.cmake
index 810f52e39f..fb0708cd79 100644
--- a/Code/LauncherUnified/launcher_files.cmake
+++ b/Code/LauncherUnified/launcher_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/launcher_game_files.cmake b/Code/LauncherUnified/launcher_game_files.cmake
index b242e50516..b4e04b509c 100644
--- a/Code/LauncherUnified/launcher_game_files.cmake
+++ b/Code/LauncherUnified/launcher_game_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/launcher_generator.cmake b/Code/LauncherUnified/launcher_generator.cmake
index 349527e97d..85976e1cb9 100644
--- a/Code/LauncherUnified/launcher_generator.cmake
+++ b/Code/LauncherUnified/launcher_generator.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/launcher_project_files.cmake b/Code/LauncherUnified/launcher_project_files.cmake
index fdcc7296c2..9dd1b7d540 100644
--- a/Code/LauncherUnified/launcher_project_files.cmake
+++ b/Code/LauncherUnified/launcher_project_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/launcher_server_files.cmake b/Code/LauncherUnified/launcher_server_files.cmake
index 049e62d8b8..20af0fe051 100644
--- a/Code/LauncherUnified/launcher_server_files.cmake
+++ b/Code/LauncherUnified/launcher_server_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/LauncherUnified/launcher_test_files.cmake b/Code/LauncherUnified/launcher_test_files.cmake
index 1c35656d1d..c16934bafd 100644
--- a/Code/LauncherUnified/launcher_test_files.cmake
+++ b/Code/LauncherUnified/launcher_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Legacy/CMakeLists.txt b/Code/Legacy/CMakeLists.txt
new file mode 100644
index 0000000000..17a99bf460
--- /dev/null
+++ b/Code/Legacy/CMakeLists.txt
@@ -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
+#
+#
+
+add_subdirectory(CryCommon)
+add_subdirectory(CrySystem)
diff --git a/Code/Legacy/CryCommon/AndroidSpecific.h b/Code/Legacy/CryCommon/AndroidSpecific.h
new file mode 100644
index 0000000000..7868291a5d
--- /dev/null
+++ b/Code/Legacy/CryCommon/AndroidSpecific.h
@@ -0,0 +1,215 @@
+/*
+ * 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 : Specific to Android declarations, inline functions etc.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_ANDROIDSPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_ANDROIDSPECIFIC_H
+#pragma once
+
+#if defined(__arm__) || defined(__aarch64__)
+#define _CPU_ARM
+#endif
+
+#if defined(__aarch64__)
+#define PLATFORM_64BIT
+#endif
+
+#if defined(__ARM_NEON__)
+#define _CPU_NEON
+#endif
+
+#ifndef MOBILE
+#define MOBILE
+#endif
+
+#if (defined(__clang__) && NDK_REV_MAJOR >= 14) || (defined(_CPU_ARM) && defined(PLATFORM_64BIT))
+    // The version of clang that NDK r14+ ships with is seemingly generating different (for better or worse) code for the atomic operations
+    // used in the LocklessLinkedList.  In either case, this is causing deadlocks in the job system and crashes from memory stomps in
+    // the bucket allocator.  By defining INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED it will disable the Cry job system as well as
+    // change the implementation of the LocklessLinkedList to use a mutex in it's operations instead, essentially use the same behaviour
+    // as iOS.  While not ideal to use this as a band-aid on the problem, it does fix it with a negligible performance impact.
+    //
+    // Additionally, arm64 processors do not provide a cmpxchg16b (or equivalent) instruction required for _InterlockedCompareExchange128
+    #define INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED
+#endif
+
+// Force all allocations to be aligned to TARGET_DEFAULT_ALIGN.
+// This is because malloc on Android 32 bit returns memory that is not aligned
+// to what some structs/classes need.
+#define CRY_FORCE_MALLOC_NEW_ALIGN
+
+#define DEBUG_BREAK raise(SIGTRAP)
+#define RC_EXECUTABLE "rc"
+#define USE_CRT 1
+#define SIZEOF_PTR 4
+
+//////////////////////////////////////////////////////////////////////////
+// Standard includes.
+//////////////////////////////////////////////////////////////////////////
+#include <malloc.h>
+#include <stdint.h>
+#include <fcntl.h>
+#include <float.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <ctype.h>
+#include <sys/socket.h>
+#include <errno.h>
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Define platform independent types.
+//////////////////////////////////////////////////////////////////////////
+#include "BaseTypes.h"
+
+typedef signed long long  INT64;
+
+typedef double real;
+
+typedef uint32              DWORD;
+typedef DWORD*              LPDWORD;
+#if defined(PLATFORM_64BIT)
+typedef uint64              DWORD_PTR;
+#else
+typedef DWORD               DWORD_PTR;
+#endif
+typedef intptr_t INT_PTR, *PINT_PTR;
+typedef uintptr_t UINT_PTR, * PUINT_PTR;
+typedef char* LPSTR, * PSTR;
+typedef uint64      __uint64;
+typedef int64       INT64;
+typedef uint64      UINT64;
+
+typedef long LONG_PTR, * PLONG_PTR, * PLONG;
+typedef unsigned long ULONG_PTR, * PULONG_PTR;
+
+typedef unsigned char               BYTE;
+typedef unsigned short          WORD;
+typedef void*                               HWND;
+typedef UINT_PTR                        WPARAM;
+typedef LONG_PTR                        LPARAM;
+typedef LONG_PTR                        LRESULT;
+#define PLARGE_INTEGER LARGE_INTEGER *
+typedef const char* LPCSTR, * PCSTR;
+typedef long long                       LONGLONG;
+typedef ULONG_PTR                       SIZE_T;
+typedef unsigned char               byte;
+
+#define ILINE __forceinline
+
+#define _A_RDONLY (0x01)
+#define _A_SUBDIR (0x10)
+
+//////////////////////////////////////////////////////////////////////////
+// Win32 FileAttributes.
+//////////////////////////////////////////////////////////////////////////
+#define FILE_ATTRIBUTE_READONLY             0x00000001
+#define FILE_ATTRIBUTE_HIDDEN               0x00000002
+#define FILE_ATTRIBUTE_SYSTEM               0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
+#define FILE_ATTRIBUTE_DEVICE               0x00000040
+#define FILE_ATTRIBUTE_NORMAL               0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
+#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
+#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
+#define FILE_ATTRIBUTE_COMPRESSED           0x00000800
+#define FILE_ATTRIBUTE_OFFLINE              0x00001000
+#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
+#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
+
+#define INVALID_FILE_ATTRIBUTES (-1)
+
+#define DEFINE_ALIGNED_DATA(type, name, alignment) \
+    type __attribute__ ((aligned(alignment))) name;
+#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) \
+    static type __attribute__ ((aligned(alignment))) name;
+#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) \
+    const type __attribute__ ((aligned(alignment))) name;
+
+#include "LinuxSpecific.h"
+// these functions do not exist int the wchar.h header
+#undef wscasecomp
+#undef wscasencomp
+extern int wcsicmp (const wchar_t* s1, const wchar_t* s2);
+extern int wcsnicmp (const wchar_t* s1, const wchar_t* s2, size_t count);
+
+// these are not defined in android-19 and prior
+#undef wcsnlen
+extern size_t wcsnlen(const wchar_t* str, size_t maxLen);
+
+#undef stpcpy
+extern char* stpcpy(char* dest, const char* str);
+// end android-19
+
+
+#define TARGET_DEFAULT_ALIGN (16U)
+
+#ifdef _RELEASE
+    #define __debugbreak()
+#else
+    #define __debugbreak() __builtin_trap()
+#endif
+
+// there is no __finite in android, only variants of isfinite
+#undef __finite
+#if NDK_REV_MAJOR >= 16
+    #define __finite isfinite
+#else
+    #define __finite __isfinite
+#endif
+
+#define S_IWRITE S_IWUSR
+
+#define ILINE __forceinline
+#define _A_RDONLY (0x01)
+#define _A_SUBDIR (0x10)
+#define _A_HIDDEN (0x02)
+
+
+#include <android/api-level.h>
+
+#if __ANDROID_API__ == 19
+    // The following were apparently introduced in API 21, however in earlier versions of the
+    // platform specific headers they were defines.  In the move to unified headers, the follwoing
+    // defines were removed from stat.h
+    #ifndef stat64
+        #define stat64 stat
+    #endif
+
+    #ifndef fstat64
+        #define fstat64 fstat
+    #endif
+
+    #ifndef lstat64
+        #define lstat64 lstat
+    #endif
+#endif // __ANDROID_API__ == 19
+
+
+// std::stoull deosn't exist on android, so we need to define it
+namespace std
+{
+    inline unsigned long long stoull(const std::string& str, size_t* idx = 0, int base = 10)
+    {
+        const char* start = str.c_str();
+        char* end = nullptr;
+        unsigned long long result = strtoull(start, &end, base);
+        if (idx)
+        {
+            *idx = end - start;
+        }
+        return result;
+    }
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_ANDROIDSPECIFIC_H
diff --git a/Code/Legacy/CryCommon/AnimKey.h b/Code/Legacy/CryCommon/AnimKey.h
new file mode 100644
index 0000000000..8fe3a9d9c0
--- /dev/null
+++ b/Code/Legacy/CryCommon/AnimKey.h
@@ -0,0 +1,496 @@
+/*
+ * 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_ANIMKEY_H
+#define CRYINCLUDE_CRYCOMMON_ANIMKEY_H
+#pragma once
+
+#include <IConsole.h> // <> required for Interfuscator
+#include <ISystem.h>
+#include <Cry_Color.h>
+#include <AzCore/Math/Color.h>
+#include <AzCore/Component/EntityId.h>
+
+enum EAnimKeyFlags
+{
+    AKEY_SELECTED = 0x01,       //! This key is selected in track view.
+    AKEY_SORT_MARKER = 0x02     //! Internal use to locate a key after a sort.
+};
+
+//! Interface to animation key.
+//! Not real interface though...
+//! No virtuals for optimization reason.
+struct IKey
+{
+    float time;
+    int flags;
+
+    // compare keys.
+    bool operator<(const IKey& key) const { return time < key.time; }
+    bool operator==(const IKey& key) const { return time == key.time; }
+    bool operator>(const IKey& key) const { return time > key.time; }
+    bool operator<=(const IKey& key) const { return time <= key.time; }
+    bool operator>=(const IKey& key) const { return time >= key.time; }
+    bool operator!=(const IKey& key) const { return time != key.time; }
+
+    IKey()
+        : time(0)
+        , flags(0) {};
+
+    virtual ~IKey() = default;
+};
+
+/** I2DBezierKey used in float tracks.
+        Its x component actually represents kinda time-warping curve.
+*/
+struct I2DBezierKey
+    : public IKey
+{
+    Vec2 value;
+};
+
+/** ITcbKey used in all TCB tracks.
+*/
+struct ITcbKey
+    : public IKey
+{
+    // Values.
+    float fval[4];
+    // Key controls.
+    float tens;         //!< Key tension value.
+    float cont;       //!< Key continuity value.
+    float bias;       //!< Key bias value.
+    float easeto;     //!< Key ease to value.
+    float easefrom;   //!< Key ease from value.
+
+    //! Protect from direct instantiation of this class.
+    //! Only derived classes can be created,
+    ITcbKey()
+    {
+        fval[0] = 0;
+        fval[1] = 0;
+        fval[2] = 0;
+        fval[3] = 0;
+        tens = 0, cont = 0, bias = 0, easeto = 0, easefrom = 0;
+    };
+
+    void SetFloat(float val) { fval[0] = val; };
+    void SetVec3(const Vec3& val)
+    {
+        fval[0] = val.x;
+        fval[1] = val.y;
+        fval[2] = val.z;
+    };
+    void SetQuat(const Quat& val)
+    {
+        fval[0] = val.v.x;
+        fval[1] = val.v.y;
+        fval[2] = val.v.z;
+        fval[3] = val.w;
+    };
+
+    ILINE void SetValue(float val)             { SetFloat(val);   }
+    ILINE void SetValue(const Vec3& val) { SetVec3(val); }
+    ILINE void SetValue(const Quat& val) { SetQuat(val); }
+
+    float GetFloat() const { return *((float*)fval); };
+    Vec3 GetVec3() const
+    {
+        Vec3 vec;
+        vec.x = fval[0];
+        vec.y = fval[1];
+        vec.z = fval[2];
+        return vec;
+    };
+    Quat GetQuat() const
+    {
+        Quat quat;
+        quat.v.x = fval[0];
+        quat.v.y = fval[1];
+        quat.v.z = fval[2];
+        quat.w = fval[3];
+        return quat;
+    };
+    ILINE void GetValue(float& val) { val = GetFloat(); };
+    ILINE void GetValue(Vec3& val)  { val = GetVec3(); };
+    ILINE void GetValue(Quat& val)  { val = GetQuat(); };
+};
+
+struct IEventKey
+    : public IKey
+{
+    AZStd::string event;
+    AZStd::string eventValue;
+    AZStd::string animation;
+    AZStd::string target;
+
+    union
+    {
+        float value;
+        float duration;
+    };
+    bool bNoTriggerInScrubbing;
+
+    IEventKey()
+    {
+        duration = 0;
+        bNoTriggerInScrubbing = false;
+    }
+};
+
+/** ISelectKey used in Camera selection track or Scene node.
+*/
+struct ISelectKey
+    : public IKey
+{
+    AZStd::string szSelection;        //!< Node name.
+    AZ::EntityId cameraAzEntityId;    // will be Invalid for legacy Cameras
+    float fDuration;
+    float fBlendTime;
+
+    ISelectKey()
+    {
+        fDuration = 0;
+        fBlendTime = 0;
+    }
+};
+
+/** ISequenceKey used in sequence track.
+*/
+struct ISequenceKey
+    : public IKey
+{
+    AZStd::string szSelection;          //!@deprecated : use sequenceEntityId to identify sequences
+    AZ::EntityId sequenceEntityId;
+    float fDuration;
+    float fStartTime;
+    float fEndTime;
+    bool bOverrideTimes;
+    bool  bDoNotStop;
+
+    ISequenceKey()
+    {
+        fDuration = 0;
+        fStartTime = 0;
+        fEndTime = 0;
+        bOverrideTimes = false;
+        bDoNotStop = false; // default crysis behaviour
+    }
+};
+
+/** ISoundKey used in sound track.
+*/
+struct ISoundKey
+    : public IKey
+{
+    ISoundKey()
+        : fDuration(0.0f)
+    {
+        customColor.x = Col_TrackviewDefault.r;
+        customColor.y = Col_TrackviewDefault.g;
+        customColor.z = Col_TrackviewDefault.b;
+    }
+
+    AZStd::string sStartTrigger;
+    AZStd::string sStopTrigger;
+    float         fDuration;
+    Vec3          customColor;
+};
+
+/** ITimeRangeKey used in time ranges animation track.
+*/
+#define ANIMKEY_TIME_RANGE_END_TIME_UNSET .0f
+struct ITimeRangeKey
+    : public IKey
+{
+    float m_duration;       //!< Duration in seconds of this animation.
+    float m_startTime;      //!< Start time of this animation (Offset from beginning of animation).
+    float m_endTime;        //!< End time of this animation (can be smaller than the duration).
+    float m_speed;          //!< Speed multiplier for this key.
+    bool  m_bLoop;          //!< True if time is looping
+
+    ITimeRangeKey()
+    {
+        m_duration = 0.0f;
+        m_endTime = ANIMKEY_TIME_RANGE_END_TIME_UNSET;
+        m_startTime = 0.0f;
+        m_speed = 1.0f;
+        m_bLoop = false;
+    }
+
+    float GetValidEndTime() const
+    {
+        float endTime = m_endTime;
+        if (endTime == ANIMKEY_TIME_RANGE_END_TIME_UNSET || (!m_bLoop && endTime > m_duration))
+        {
+            endTime = m_duration;
+        }
+        return endTime;
+    }
+
+    float GetValidSpeed() const
+    {
+        float speed = m_speed;
+        if (speed <= 0.0f)
+        {
+            speed = 1.0f;
+        }
+        return speed;
+    }
+
+    float GetActualDuration() const
+    {
+        return (GetValidEndTime() - m_startTime) / GetValidSpeed();
+    }
+
+    // Return true if the input time falls in range of the start/end time for this key.
+    bool IsInRange(float sequenceTime) const
+    {
+        return sequenceTime >= time && sequenceTime <= (time + GetActualDuration());
+    }
+};
+
+/** ICharacterKey used in Character animation track.
+*/
+struct ICharacterKey
+    : public ITimeRangeKey
+{
+    AZStd::string m_animation;      //!< Name of character animation.
+    bool m_bBlendGap;               //!< True if gap to next animation should be blended
+    bool m_bInPlace;                // Play animation in place (Do not move root).
+
+    ICharacterKey()
+        : ITimeRangeKey()
+    {
+        m_bLoop = false;
+        m_bBlendGap = false;
+        m_bInPlace = false;
+    }
+};
+
+/** IExprKey used in expression animation track.
+*/
+struct IExprKey
+    : public IKey
+{
+    IExprKey()
+    {
+        pszName[0] = 0;
+        fAmp = 1.0f;
+        fBlendIn = 0.5f;
+        fHold = 1.0f;
+        fBlendOut = 0.5f;
+    }
+    char pszName[128];  //!< Name of morph-target
+    float fAmp;
+    float fBlendIn;
+    float fHold;
+    float fBlendOut;
+};
+
+/** IConsoleKey used in Console track, triggers console commands and variables.
+*/
+struct IConsoleKey
+    : public IKey
+{
+    AZStd::string command;
+};
+
+struct ILookAtKey
+    : public IKey
+{
+    AZStd::string szSelection;  //!< Node name.
+    float fDuration;
+    AZStd::string lookPose;
+    float smoothTime;
+
+    ILookAtKey()
+    {
+        fDuration = 0;
+        smoothTime = 0.2f;
+    }
+};
+
+//! Discrete (non-interpolated) float key.
+struct IDiscreteFloatKey
+    : public IKey
+{
+    float m_fValue;
+
+    void SetValue(float fValue)
+    {
+        m_fValue = fValue;
+    }
+
+    IDiscreteFloatKey()
+    {
+        m_fValue = -1.0f;
+    }
+};
+
+//! A key for the capture track.
+struct ICaptureKey
+    : public IKey
+{
+    friend class AnimSerializer;
+
+    AZStd::string folder;
+    AZStd::string prefix;
+    float duration;
+    float timeStep;
+    bool once;
+
+    ICaptureKey()
+        : IKey()
+        , duration(0.0f)
+        , timeStep(0.033f)
+        , once(false)
+    {
+        ICVar* pCaptureFolderCVar = gEnv->pConsole->GetCVar("capture_folder");
+        if (pCaptureFolderCVar != NULL  && pCaptureFolderCVar->GetString())
+        {
+            folder = pCaptureFolderCVar->GetString();
+        }
+        ICVar* pCaptureFilePrefixCVar = gEnv->pConsole->GetCVar("capture_file_prefix");
+        if (pCaptureFilePrefixCVar != NULL  && pCaptureFilePrefixCVar->GetString())
+        {
+            prefix = pCaptureFilePrefixCVar->GetString();
+        }
+    }
+
+    ICaptureKey(const ICaptureKey& other)
+        : IKey(other)
+        , folder(other.folder)
+        , prefix(other.prefix)
+        , duration(other.duration)
+        , timeStep(other.timeStep)
+        , once(other.once)
+    {
+    }
+};
+
+//! Boolean key.
+struct IBoolKey
+    : public IKey
+{
+    IBoolKey() {};
+};
+
+//! Comment Key.
+struct ICommentKey
+    : public IKey
+{
+    enum ETextAlign : int
+    {
+        eTA_Left    =   0,
+        eTA_Center  =   BIT(1),
+        eTA_Right   =   BIT(2)
+    };
+
+    //-----------------------------------------------------------------------------
+    //!
+    ICommentKey()
+        : m_duration(1.f)
+        , m_size(1.f)
+        , m_align(eTA_Left)
+        , m_strFont("default")
+        , m_color(1.f, 1.f, 1.f, 1.f)
+    {
+    }
+
+    //-----------------------------------------------------------------------------
+    //!
+    ICommentKey(const ICommentKey& other)
+        : IKey(other)
+        , m_strComment(other.m_strComment)
+        , m_strFont(other.m_strFont)
+    {
+        m_duration = other.m_duration;
+        m_color = other.m_color;
+        m_size = other.m_size;
+        m_align = other.m_align;
+    }
+
+    AZStd::string m_strComment;
+    float   m_duration;
+
+    AZStd::string m_strFont;
+    AZ::Color    m_color;
+    float   m_size;
+    ETextAlign  m_align;
+};
+
+//-----------------------------------------------------------------------------
+//!
+struct IScreenFaderKey
+    : public IKey
+{
+    //-----------------------------------------------------------------------------
+    //!
+    enum EFadeType : int
+    {
+        eFT_FadeIn = 0, eFT_FadeOut = 1
+    };
+    enum EFadeChangeType : int
+    {
+        eFCT_Linear = 0, eFCT_Square = 1, eFCT_CubicSquare = 2, eFCT_SquareRoot = 3, eFCT_Sin = 4
+    };
+
+    //-----------------------------------------------------------------------------
+    //!
+    IScreenFaderKey()
+        : IKey()
+        , m_fadeTime(2.f)
+        , m_bUseCurColor(true)
+        , m_fadeType(eFT_FadeOut)
+        , m_fadeChangeType(eFCT_Linear)
+    {
+        m_fadeColor = AZ::Color(.0f, .0f, .0f, 1.0f);
+    }
+
+    //-----------------------------------------------------------------------------
+    //!
+    IScreenFaderKey(const IScreenFaderKey& other)
+        : IKey(other)
+        , m_fadeTime(other.m_fadeTime)
+        , m_bUseCurColor(other.m_bUseCurColor)
+        , m_fadeType(other.m_fadeType)
+        , m_fadeChangeType(other.m_fadeChangeType)
+    {
+        m_fadeColor = other.m_fadeColor;
+        m_strTexture = other.m_strTexture;
+    }
+
+    //-----------------------------------------------------------------------------
+    //!
+    float       m_fadeTime;
+    AZ::Color   m_fadeColor;
+    AZStd::string m_strTexture;
+    bool        m_bUseCurColor;
+    EFadeType   m_fadeType;
+    EFadeChangeType m_fadeChangeType;
+};
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(IKey, "{680BD51E-C106-4BBF-9A6F-CD551E00519F}");
+    AZ_TYPE_INFO_SPECIALIZE(IBoolKey, "{DBF8044F-6E64-403D-807D-F3152F640703}");
+    AZ_TYPE_INFO_SPECIALIZE(ICaptureKey, "{93AA8D63-6B1E-4D33-8CC3-C82147BB95CB}");
+    AZ_TYPE_INFO_SPECIALIZE(ICharacterKey, "{6D1FB9E2-128C-4B33-84FF-4F696C1F7D53}");
+    AZ_TYPE_INFO_SPECIALIZE(ICommentKey, "{99C2234E-A4DD-45D1-90C3-D5AFC54FA47F}");
+    AZ_TYPE_INFO_SPECIALIZE(IConsoleKey, "{8C0DCB9B-297D-4AF4-A0D1-F5160E6900E8}");
+    AZ_TYPE_INFO_SPECIALIZE(IDiscreteFloatKey, "{469A2B90-E019-4147-A53F-2EB42E179596}");
+    AZ_TYPE_INFO_SPECIALIZE(IEventKey, "{F09533AA-9780-494D-9E5C-8CB98266AC5E}");
+    AZ_TYPE_INFO_SPECIALIZE(ILookAtKey, "{6F4CED0E-D83A-40E2-B7BF-038D82BC0374}");
+    AZ_TYPE_INFO_SPECIALIZE(IScreenFaderKey, "{FA15E27D-603F-4829-925A-E36D75C93964}");
+    AZ_TYPE_INFO_SPECIALIZE(ISelectKey, "{FCEADCF5-042E-473B-845F-0778F087B6DC}");
+    AZ_TYPE_INFO_SPECIALIZE(ISequenceKey, "{B55294AD-F14E-43AC-B6B5-AC27B377FE00}");
+    AZ_TYPE_INFO_SPECIALIZE(ISoundKey, "{452E50CF-B7D0-42D5-A86A-B295682674BB}");
+    AZ_TYPE_INFO_SPECIALIZE(ITimeRangeKey, "{17807C95-C7A1-481B-AD94-C54D83928D0B}");
+}
+#endif // CRYINCLUDE_CRYCOMMON_ANIMKEY_H
diff --git a/Code/Legacy/CryCommon/AppleSpecific.h b/Code/Legacy/CryCommon/AppleSpecific.h
new file mode 100644
index 0000000000..f2cc9ce559
--- /dev/null
+++ b/Code/Legacy/CryCommon/AppleSpecific.h
@@ -0,0 +1,595 @@
+/*
+ * 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 : Apple specific declarations common amongst its products
+
+#ifndef CRYINCLUDE_CRYCOMMON_APPLESPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_APPLESPECIFIC_H
+#pragma once
+
+#if defined(__clang__)
+#pragma diagnostic ignore "-W#pragma-messages"
+#endif
+
+
+#define DEBUG_BREAK __builtin_trap()
+#define RC_EXECUTABLE "rc"
+
+//////////////////////////////////////////////////////////////////////////
+// Standard includes.
+//////////////////////////////////////////////////////////////////////////
+#include <stdlib.h>
+#include <stdint.h>
+#include <math.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <ctype.h>
+#include <limits.h>
+#include <signal.h>
+#include <unistd.h>
+#include <errno.h>
+#include <malloc/malloc.h>
+#include <Availability.h>
+// Atomic operations , guaranteed to work across all apple platforms
+#include <libkern/OSAtomic.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <string>
+//////////////////////////////////////////////////////////////////////////
+
+#define FP16_MESH
+#define BOOST_DISABLE_WIN32
+
+#ifndef __COUNTER__
+#define __COUNTER__ __LINE__
+#endif
+
+#ifdef __FUNC__
+#undef __FUNC__
+#endif
+
+#define __FUNC__ __func__
+
+typedef void*                               LPVOID;
+#define VOID                    void
+#define PVOID                               void*
+
+typedef unsigned int UINT;
+typedef char CHAR;
+typedef float FLOAT;
+
+#define PHYSICS_EXPORTS
+
+// MSVC compiler-specific keywords
+#define __forceinline inline
+#define _inline inline
+#define __cdecl
+#define _cdecl
+#define __stdcall
+#define _stdcall
+#define __fastcall
+#define _fastcall
+#define IN
+#define OUT
+
+#define MAP_ANONYMOUS MAP_ANON
+
+//////////////////////////////////////////////////////////////////////////
+// Define platform independent types.
+//////////////////////////////////////////////////////////////////////////
+#include "BaseTypes.h"
+
+typedef double real;
+
+typedef uint32          DWORD;
+typedef DWORD*          LPDWORD;
+typedef uint64                          DWORD_PTR;
+typedef intptr_t INT_PTR, * PINT_PTR;
+typedef uintptr_t UINT_PTR, * PUINT_PTR;
+typedef char* LPSTR, * PSTR;
+typedef char TCHAR;
+typedef uint64          __uint64;
+#if !defined(__clang__)
+typedef int64               __int64;
+#endif
+typedef int64               INT64;
+typedef uint64          UINT64;
+
+typedef long LONG_PTR, * PLONG_PTR, * PLONG;
+typedef unsigned long ULONG_PTR, * PULONG_PTR;
+
+typedef uint8                               BYTE;
+typedef uint16                          WORD;
+typedef void*                               HWND;
+typedef UINT_PTR                        WPARAM;
+typedef LONG_PTR                        LPARAM;
+typedef LONG_PTR                        LRESULT;
+#define PLARGE_INTEGER LARGE_INTEGER *
+typedef const char* LPCSTR, * PCSTR;
+typedef long long                       LONGLONG;
+typedef ULONG_PTR                       SIZE_T;
+typedef uint8                               byte;
+#define ILINE __forceinline
+
+#ifndef MAXUINT
+#define MAXUINT ((uint) ~((uint)0))
+#endif
+
+#ifndef MAXINT
+#define MAXINT ((int)(MAXUINT >> 1))
+#endif
+
+#ifndef _CVTBUFSIZE
+#define _CVTBUFSIZE (309+40) /* # of digits in max. dp value + slop */
+#endif
+
+#ifndef STDMETHODCALLTYPE_DEFINED
+#define STDMETHODCALLTYPE_DEFINED
+#define STDMETHODCALLTYPE
+#endif
+
+#define _ALIGN(num) \
+    __attribute__ ((aligned(num))) \
+    AZ_POP_DISABLE_WARNING
+
+#define _PACK __attribute__ ((packed))
+
+// Safe memory freeing
+#ifndef SAFE_DELETE
+#define SAFE_DELETE(p)          { if (p) { delete (p);       (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_DELETE_ARRAY
+#define SAFE_DELETE_ARRAY(p)    { if (p) { delete[] (p);     (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
+}
+#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))
+#define HIWORD(l)           ((WORD)((DWORD_PTR)(l) >> 16))
+#define LOBYTE(w)           ((BYTE)((DWORD_PTR)(w) & 0xff))
+#define HIBYTE(w)           ((BYTE)((DWORD_PTR)(w) >> 8))
+
+#define CALLBACK
+#define WINAPI
+
+#ifndef __cplusplus
+#ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#define TCHAR wchar_t;
+#define _WCHAR_T_DEFINED
+#endif
+#endif
+typedef wchar_t WCHAR;    // wc,   16-bit UNICODE character
+typedef WCHAR* PWCHAR;
+typedef WCHAR* LPWCH, * PWCH;
+typedef const WCHAR* LPCWCH, * PCWCH;
+typedef WCHAR* NWPSTR;
+typedef WCHAR* LPWSTR, * PWSTR;
+typedef WCHAR* LPUWSTR, * PUWSTR;
+
+typedef const WCHAR* LPCWSTR, * PCWSTR;
+typedef const WCHAR* LPCUWSTR, * PCUWSTR;
+
+#ifdef UNICODE
+typedef LPCWSTR LPCTSTR;
+typedef LPWSTR LPTSTR;
+#else
+typedef LPCSTR LPCTSTR;
+typedef LPSTR LPTSTR;
+#endif
+
+typedef DWORD COLORREF;
+#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
+
+#define GetRValue(rgb)  (LOBYTE(rgb))
+#define GetGValue(rgb)  (LOBYTE(((WORD)(rgb)) >> 8))
+#define GetBValue(rgb)  (LOBYTE((rgb)>>16))
+
+#define MAKEFOURCC(ch0, ch1, ch2, ch3)                \
+    ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
+     ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24))
+#define FILE_ATTRIBUTE_NORMAL               0x00000080
+
+// Conflit with OBJC defined bool type.
+
+#if defined(IOS)
+typedef bool BOOL;
+#else
+typedef signed char BOOL;
+#endif
+
+typedef int32_t LONG;
+typedef unsigned int ULONG;
+typedef int HRESULT;
+
+//typedef int32 __int32;
+typedef uint32 __uint32;
+typedef int64 __int64;
+typedef uint64 __uint64;
+
+#define TRUE 1
+#define FALSE 0
+
+#ifndef MAX_PATH
+#define MAX_PATH PATH_MAX
+#endif
+#ifndef _MAX_PATH
+#define _MAX_PATH MAX_PATH
+#endif
+
+#define _PTRDIFF_T_DEFINED 1
+
+#define _A_RDONLY       (0x01)    /* Read only file */
+#define _A_HIDDEN (0x02)    /* Hidden file */
+#define _A_SUBDIR       (0x10)    /* Subdirectory */
+
+//////////////////////////////////////////////////////////////////////////
+// Win32 FileAttributes.
+//////////////////////////////////////////////////////////////////////////
+#define FILE_ATTRIBUTE_READONLY             0x00000001
+#define FILE_ATTRIBUTE_HIDDEN               0x00000002
+#define FILE_ATTRIBUTE_SYSTEM               0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
+#define FILE_ATTRIBUTE_DEVICE               0x00000040
+#define FILE_ATTRIBUTE_NORMAL               0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
+#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
+#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
+#define FILE_ATTRIBUTE_COMPRESSED           0x00000800
+#define FILE_ATTRIBUTE_OFFLINE              0x00001000
+#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
+#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
+
+#define INVALID_FILE_ATTRIBUTES (-1)
+
+#define DEFINE_ALIGNED_DATA(type, name, alignment) \
+    type __attribute__ ((aligned(alignment))) name;
+#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) \
+    static type __attribute__ ((aligned(alignment))) name;
+#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) \
+    const type __attribute__ ((aligned(alignment))) name;
+
+#define BST_UNCHECKED   0x0000
+
+#ifndef HRESULT_VALUES_DEFINED
+#define HRESULT_VALUES_DEFINED
+enum
+{
+    E_OUTOFMEMORY  = 0x8007000E,
+    E_FAIL         = 0x80004005,
+    E_ABORT        = 0x80004004,
+    E_INVALIDARG   = 0x80070057,
+    E_NOINTERFACE  = 0x80004002,
+    E_NOTIMPL      = 0x80004001,
+    E_UNEXPECTED   = 0x8000FFFF
+};
+#endif
+
+#define ERROR_SUCCESS   0L
+
+enum
+{
+    IDOK        = 1,
+    IDCANCEL    = 2,
+    IDABORT     = 3,
+    IDRETRY     = 4,
+    IDIGNORE    = 5,
+    IDYES       = 6,
+    IDNO        = 7,
+    IDTRYAGAIN  = 10,
+    IDCONTINUE  = 11
+};
+
+#define ES_MULTILINE    0x0004L
+#define ES_AUTOVSCROLL  0x0040L
+#define ES_AUTOHSCROLL  0x0080L
+#define ES_WANTRETURN   0x1000L
+
+#define LB_ERR  (-1)
+
+#define LB_ADDSTRING    0x0180
+#define LB_GETCOUNT     0x018B
+#define LB_SETTOPINDEX  0x0197
+
+#define MB_OK                0x00000000L
+#define MB_OKCANCEL          0x00000001L
+#define MB_ABORTRETRYIGNORE  0x00000002L
+#define MB_YESNOCANCEL       0x00000003L
+#define MB_YESNO             0x00000004L
+#define MB_RETRYCANCEL       0x00000005L
+#define MB_CANCELTRYCONTINUE 0x00000006L
+
+#define MB_ICONQUESTION     0x00000020L
+#define MB_ICONEXCLAMATION  0x00000030L
+    
+#define MB_ICONERROR        0x00000010L
+#define MB_ICONWARNING      0x00000030L
+#define MB_ICONINFORMATION  0x00000040L
+
+#define MB_SETFOREGROUND    0x00010000L
+
+#define MB_APPLMODAL    0x00000000L
+
+#define MF_STRING   0x00000000L
+
+#define MK_LBUTTON  0x0001
+#define MK_RBUTTON  0x0002
+#define MK_SHIFT    0x0004
+#define MK_CONTROL  0x0008
+#define MK_MBUTTON  0x0010
+
+#define MK_ALT  ( 0x20 )
+
+#define SM_MOUSEPRESENT 0x00000000L
+
+#define SM_CMOUSEBUTTONS    43
+
+#define USER_TIMER_MINIMUM  0x0000000A
+
+#define VK_TAB      0x09
+#define VK_SHIFT    0x10
+#define VK_MENU     0x12
+#define VK_ESCAPE   0x1B
+#define VK_SPACE    0x20
+#define VK_DELETE   0x2E
+
+#define VK_NUMPAD1  0x61
+#define VK_NUMPAD2  0x62
+#define VK_NUMPAD3  0x63
+#define VK_NUMPAD4  0x64
+
+#define VK_OEM_COMMA    0xBC   // ',' any country
+#define VK_OEM_PERIOD   0xBE   // '.' any country
+#define VK_OEM_3        0xC0   // '`~' for US
+#define VK_OEM_4        0xDB  //  '[{' for US
+#define VK_OEM_6        0xDD  //  ']}' for US
+
+#define WAIT_TIMEOUT 258L    // dderror
+
+#define WM_MOVE 0x0003
+#define WM_USER 0x0400
+
+#define WHEEL_DELTA 120
+
+#define WS_CHILD    0x40000000L
+#define WS_VISIBLE  0x10000000L
+
+#define CB_ERR  (-1)
+
+// function renaming
+#define _finite std::isfinite
+#define _snprintf snprintf
+//#define _isnan isnan
+#define stricmp strcasecmp
+#define _stricmp strcasecmp
+#define strnicmp strncasecmp
+#define _strnicmp strncasecmp
+#define wcsicmp wcscasecmp
+#define wcsnicmp wcsncasecmp
+//#define memcpy_s(dest,bytes,src,n) memcpy(dest,src,n)
+#define _isnan ISNAN
+#define _wtof(str) wcstod(str, 0)
+
+
+#define TARGET_DEFAULT_ALIGN (0x8U)
+
+
+
+#define _msize malloc_size
+
+
+struct _OVERLAPPED;
+
+typedef void (* LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, struct _OVERLAPPED* lpOverlapped);
+
+typedef struct _OVERLAPPED
+{
+    void* pCaller;//this is orginally reserved for internal purpose, we store the Caller pointer here
+    LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine; ////this is orginally ULONG_PTR InternalHigh and reserved for internal purpose
+    union
+    {
+        struct
+        {
+            DWORD Offset;
+            DWORD OffsetHigh;
+        };
+        PVOID Pointer;
+    };
+    DWORD dwNumberOfBytesTransfered;    //additional member temporary speciying the number of bytes to be read
+    /*HANDLE*/ void*  hEvent;
+} OVERLAPPED, * LPOVERLAPPED;
+
+typedef struct _SECURITY_ATTRIBUTES
+{
+    DWORD nLength;
+    LPVOID lpSecurityDescriptor;
+    BOOL bInheritHandle;
+} SECURITY_ATTRIBUTES, * PSECURITY_ATTRIBUTES, * LPSECURITY_ATTRIBUTES;
+
+#ifdef __cplusplus
+
+#define __min(_S, _T) min(_S, _T)
+#define __max(_S, _T) max(_S, _T)
+
+typedef enum
+{
+    INVALID_HANDLE_VALUE = -1l
+}INVALID_HANDLE_VALUE_ENUM;
+//for compatibility reason we got to create a class which actually contains an int rather than a void* and make sure it does not get mistreated
+template <class T, T U>
+//U is default type for invalid handle value, T the encapsulated handle type to be used instead of void* (as under windows and never linux)
+class CHandle
+{
+public:
+    typedef T           HandleType;
+    typedef void* PointerType;  //for compatibility reason to encapsulate a void* as an int
+
+    static const HandleType sciInvalidHandleValue = U;
+
+    CHandle(const CHandle<T, U>& cHandle)
+        : m_Value(cHandle.m_Value){}
+    CHandle(const HandleType cHandle = U)
+        : m_Value(cHandle){}
+    CHandle(const PointerType cpHandle)
+        : m_Value(reinterpret_cast<HandleType>(cpHandle)){}
+    CHandle(INVALID_HANDLE_VALUE_ENUM)
+        : m_Value(U){}                               //to be able to use a common value for all InvalidHandle - types
+#if defined(PLATFORM_64BIT)
+    //treat __null tyope also as invalid handle type
+    CHandle(long)
+        : m_Value(U){}          //to be able to use a common value for all InvalidHandle - types
+#endif
+    operator HandleType(){
+        return m_Value;
+    }
+    bool operator!() const{return m_Value == sciInvalidHandleValue; }
+    const CHandle& operator =(const CHandle& crHandle){m_Value = crHandle.m_Value; return *this; }
+    const CHandle& operator =(const PointerType cpHandle){m_Value = (HandleType) reinterpret_cast<UINT_PTR>(cpHandle); return *this; }
+    const bool operator ==(const CHandle& crHandle)     const{return m_Value == crHandle.m_Value; }
+    const bool operator ==(const HandleType cHandle)    const{return m_Value == cHandle; }
+    const bool operator ==(const PointerType cpHandle) const{return m_Value == reinterpret_cast<HandleType>(cpHandle); }
+    const bool operator !=(const HandleType cHandle)    const{return m_Value != cHandle; }
+    const bool operator !=(const CHandle& crHandle)     const{return m_Value != crHandle.m_Value; }
+    const bool operator !=(const PointerType cpHandle) const{return m_Value != reinterpret_cast<HandleType>(cpHandle); }
+    const bool operator <   (const CHandle& crHandle)       const{return m_Value < crHandle.m_Value; }
+    HandleType Handle() const{return m_Value; }
+
+private:
+    HandleType m_Value; //the actual value, remember that file descriptors are ints under linux
+
+    typedef void    ReferenceType;//for compatibility reason to encapsulate a void* as an int
+    //forbid these function which would actually not work on an int
+    PointerType operator->();
+    PointerType operator->() const;
+    ReferenceType operator*();
+    ReferenceType operator*() const;
+    operator PointerType();
+};
+
+typedef CHandle<int, (int) - 1l> HANDLE;
+
+typedef HANDLE EVENT_HANDLE;
+typedef HANDLE THREAD_HANDLE;
+
+typedef HANDLE HKEY;
+typedef HANDLE HDC;
+
+typedef HANDLE HBITMAP;
+
+typedef HANDLE HMENU;
+
+#endif //__cplusplus
+
+inline char* _fullpath(char* absPath, const char* relPath, size_t maxLength)
+{
+    char path[PATH_MAX];
+    
+    if (realpath(relPath, path) == NULL)
+    {
+        return NULL;
+    }
+    const size_t len = std::min(strlen(path), maxLength - 1);
+    memcpy(absPath, path, len);
+    absPath[len] = 0;
+    return absPath;
+}
+
+typedef union _LARGE_INTEGER
+{
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    };
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    } u;
+
+    long long QuadPart;
+} LARGE_INTEGER;
+
+extern bool QueryPerformanceCounter(LARGE_INTEGER*);
+extern bool QueryPerformanceFrequency(LARGE_INTEGER* frequency);
+
+inline int64 CryGetTicks()
+{
+    LARGE_INTEGER counter;
+    QueryPerformanceCounter(&counter);
+    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
+#define __debugbreak() ::raise(SIGTRAP)
+#endif
+
+#define __assume(x)
+#define _flushall sync
+
+inline int closesocket(int s)
+{
+    return ::close(s);
+}
+
+inline int WSAGetLastError()
+{
+    return errno;
+}
+
+//we take the definition of the pthread_t type directly from the pthread file
+#define THREADID_NULL 0
+
+template <typename T, size_t N>
+char (*RtlpNumberOf( T (&)[N] ))[N];
+
+#define RTL_NUMBER_OF_V2(A) (sizeof(*RtlpNumberOf(A)))
+
+#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A)
+
+#undef SUCCEEDED
+#define SUCCEEDED(x) ((x) >= 0)
+#undef FAILED
+#define FAILED(x) (!(SUCCEEDED(x)))
+
+#endif // CRYINCLUDE_CRYCOMMON_APPLESPECIFIC_H
diff --git a/Code/Legacy/CryCommon/BaseTypes.h b/Code/Legacy/CryCommon/BaseTypes.h
new file mode 100644
index 0000000000..ed110e35d7
--- /dev/null
+++ b/Code/Legacy/CryCommon/BaseTypes.h
@@ -0,0 +1,84 @@
+/*
+ * 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_BASETYPES_H
+#define CRYINCLUDE_CRYCOMMON_BASETYPES_H
+#pragma once
+
+#include "CompileTimeAssert.h"
+
+
+COMPILE_TIME_ASSERT(sizeof(char) == 1);
+COMPILE_TIME_ASSERT(sizeof(float) == 4);
+COMPILE_TIME_ASSERT(sizeof(int) >= 4);
+
+
+typedef unsigned char  uchar;
+typedef signed   char  schar;
+
+typedef unsigned short ushort;
+typedef signed   short sshort;
+
+#if !defined(CLANG_FIX_UINT_REDEF)
+typedef unsigned int   uint;
+#endif
+typedef signed   int   sint;
+
+typedef unsigned long  ulong;
+typedef signed   long  slong;
+
+typedef unsigned long long ulonglong;
+typedef signed   long long slonglong;
+
+COMPILE_TIME_ASSERT(sizeof(uchar)     == sizeof(schar));
+COMPILE_TIME_ASSERT(sizeof(ushort)    == sizeof(sshort));
+COMPILE_TIME_ASSERT(sizeof(uint)      == sizeof(sint));
+COMPILE_TIME_ASSERT(sizeof(ulong)     == sizeof(slong));
+COMPILE_TIME_ASSERT(sizeof(ulonglong) == sizeof(slonglong));
+
+COMPILE_TIME_ASSERT(sizeof(uchar)  <= sizeof(ushort));
+COMPILE_TIME_ASSERT(sizeof(ushort) <= sizeof(uint));
+COMPILE_TIME_ASSERT(sizeof(uint)   <= sizeof(ulong));
+COMPILE_TIME_ASSERT(sizeof(ulong)  <= sizeof(ulonglong));
+
+
+typedef schar int8;
+typedef schar sint8;
+typedef uchar uint8;
+COMPILE_TIME_ASSERT(sizeof(uint8) == 1);
+COMPILE_TIME_ASSERT(sizeof(sint8) == 1);
+
+typedef sshort int16;
+typedef sshort sint16;
+typedef ushort uint16;
+COMPILE_TIME_ASSERT(sizeof(uint16) == 2);
+COMPILE_TIME_ASSERT(sizeof(sint16) == 2);
+
+typedef sint int32;
+typedef sint sint32;
+typedef uint uint32;
+COMPILE_TIME_ASSERT(sizeof(uint32) == 4);
+COMPILE_TIME_ASSERT(sizeof(sint32) == 4);
+
+typedef slonglong int64;
+
+#ifndef O3DE_INT64_DEFINED
+#define O3DE_INT64_DEFINED
+typedef slonglong sint64;
+typedef ulonglong uint64;
+COMPILE_TIME_ASSERT(sizeof(uint64) == 8);
+COMPILE_TIME_ASSERT(sizeof(sint64) == 8);
+#endif
+
+
+typedef float  f32;
+typedef double f64;
+COMPILE_TIME_ASSERT(sizeof(f32) == 4);
+COMPILE_TIME_ASSERT(sizeof(f64) == 8);
+
+#endif // CRYINCLUDE_CRYCOMMON_BASETYPES_H
diff --git a/Code/Legacy/CryCommon/BitFiddling.h b/Code/Legacy/CryCommon/BitFiddling.h
new file mode 100644
index 0000000000..a1daaebd97
--- /dev/null
+++ b/Code/Legacy/CryCommon/BitFiddling.h
@@ -0,0 +1,593 @@
+/*
+ * 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 : various integer bit fiddling hacks
+
+
+#pragma once
+
+#include "CompileTimeAssert.h"
+#include <AzCore/Casting/numeric_cast.h>
+
+// Section dictionary
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define BITFIDDLING_H_SECTION_TRAITS 1
+#define BITFIDDLING_H_SECTION_INTEGERLOG2 2
+#endif
+
+// Traits
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION BITFIDDLING_H_SECTION_TRAITS
+    #include AZ_RESTRICTED_FILE(BitFiddling_h)
+#elif defined(LINUX) || defined(APPLE)
+#define BITFIDDLING_H_TRAIT_HAS_COUNT_LEADING_ZEROS 1
+#endif
+
+#if BITFIDDLING_H_TRAIT_HAS_COUNT_LEADING_ZEROS
+#define countLeadingZeros32(x)              __builtin_clz(x)
+#else       // Windows implementation
+ILINE uint32 countLeadingZeros32(uint32 x)
+{
+    DWORD result = 32 ^ 31; // assumes result is unmodified if _BitScanReverse returns 0
+    _BitScanReverse(&result, x);
+    PREFAST_SUPPRESS_WARNING(6102);
+    result ^= 31; // needed because the index is from LSB (whereas all other implementations are from MSB)
+    return result;
+}
+#endif
+
+inline uint32 circularShift(uint32 nbits, uint32 i)
+{
+    return (i << nbits) | (i >> (32 - nbits));
+}
+
+template <typename T>
+inline size_t countTrailingZeroes(T v)
+{
+    size_t n = 0;
+
+    v = ~v & (v - 1);
+    while (v)
+    {
+        ++n;
+        v >>= 1;
+    }
+
+    return n;
+}
+
+// this function returns the integer logarithm of various numbers without branching
+#define IL2VAL(mask, shift)         \
+    c |= ((x & mask) != 0) * shift; \
+    x >>= ((x & mask) != 0) * shift
+
+template <typename TInteger>
+inline bool IsPowerOfTwo(TInteger x)
+{
+    return (x & (x - 1)) == 0;
+}
+
+// compile time version of IsPowerOfTwo, useful for STATIC_CHECK
+template <int nValue>
+struct IsPowerOfTwoCompileTime
+{
+    enum
+    {
+        IsPowerOfTwo = ((nValue & (nValue - 1)) == 0)
+    };
+};
+
+inline uint32 NextPower2(uint32 n)
+{
+    n--;
+    n |= n >> 1;
+    n |= n >> 2;
+    n |= n >> 4;
+    n |= n >> 8;
+    n |= n >> 16;
+    n++;
+    return n;
+}
+
+inline uint8 IntegerLog2(uint8 x)
+{
+    uint8 c = 0;
+    IL2VAL(0xf0, 4);
+    IL2VAL(0xc, 2);
+    IL2VAL(0x2, 1);
+    return c;
+}
+inline uint16 IntegerLog2(uint16 x)
+{
+    uint16 c = 0;
+    IL2VAL(0xff00, 8);
+    IL2VAL(0xf0, 4);
+    IL2VAL(0xc, 2);
+    IL2VAL(0x2, 1);
+    return c;
+}
+
+inline uint32 IntegerLog2(uint32 x)
+{
+    return 31 - countLeadingZeros32(x);
+}
+
+inline uint64 IntegerLog2(uint64 x)
+{
+    uint64 c = 0;
+    IL2VAL(0xffffffff00000000ull, 32);
+    IL2VAL(0xffff0000u, 16);
+    IL2VAL(0xff00, 8);
+    IL2VAL(0xf0, 4);
+    IL2VAL(0xc, 2);
+    IL2VAL(0x2, 1);
+    return c;
+}
+
+#if defined(APPLE) || defined(LINUX)
+inline unsigned long int IntegerLog2(unsigned long int x)
+{
+    #if defined(PLATFORM_64BIT)
+    return IntegerLog2((uint64)x);
+  #else
+    return IntegerLog2((uint32)x);
+  #endif
+}
+#endif
+#undef IL2VAL
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION BITFIDDLING_H_SECTION_INTEGERLOG2
+    #include AZ_RESTRICTED_FILE(BitFiddling_h)
+#endif
+
+template <typename TInteger>
+inline TInteger IntegerLog2_RoundUp(TInteger x)
+{
+    return 1 + IntegerLog2(x - 1);
+}
+
+static ILINE uint8 BitIndex(uint8 v)
+{
+    uint32 vv = v;
+    return aznumeric_caster(31 - countLeadingZeros32(vv));
+}
+
+static ILINE uint8 BitIndex(uint16 v)
+{
+    uint32 vv = v;
+    return aznumeric_caster(31 - countLeadingZeros32(vv));
+}
+
+static ILINE uint8 BitIndex(uint32 v)
+{
+    return aznumeric_caster(31 - countLeadingZeros32(v));
+}
+
+static ILINE uint8 CountBits(uint8 v)
+{
+    uint8 c = v;
+    c = ((c >> 1) & 0x55) + (c & 0x55);
+    c = ((c >> 2) & 0x33) + (c & 0x33);
+    c = ((c >> 4) & 0x0f) + (c & 0x0f);
+    return c;
+}
+
+static ILINE uint8 CountBits(uint16 v)
+{
+    return CountBits((uint8)(v  & 0xff)) +
+           CountBits((uint8)((v >> 8) & 0xff));
+}
+
+static ILINE uint8 CountBits(uint32 v)
+{
+    return CountBits((uint8)(v          & 0xff)) +
+           CountBits((uint8)((v >> 8) & 0xff)) +
+           CountBits((uint8)((v >> 16) & 0xff)) +
+           CountBits((uint8)((v >> 24) & 0xff));
+}
+
+// Branchless version of return v < 0 ? alt : v;
+ILINE int32 Isel32(int32 v, int32 alt)
+{
+    return ((static_cast<int32>(v) >> 31) & alt) | ((static_cast<int32>(~v) >> 31) & v);
+}
+
+template <uint32 ILOG>
+struct CompileTimeIntegerLog2
+{
+    static const uint32 result = 1 + CompileTimeIntegerLog2<(ILOG >> 1)>::result;
+};
+template <>
+struct CompileTimeIntegerLog2<1>
+{
+    static const uint32 result = 0;
+};
+template <>
+struct CompileTimeIntegerLog2<0>; // keep it undefined, we cannot represent "minus infinity" result
+
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<1>::result == 0);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<2>::result == 1);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<3>::result == 1);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<4>::result == 2);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<5>::result == 2);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<255>::result == 7);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<256>::result == 8);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2<257>::result == 8);
+
+template <uint32 ILOG>
+struct CompileTimeIntegerLog2_RoundUp
+{
+    static const uint32 result = CompileTimeIntegerLog2<ILOG>::result + ((ILOG & (ILOG - 1)) != 0);
+};
+template <>
+struct CompileTimeIntegerLog2_RoundUp<0>; // we can return 0, but let's keep it undefined (same as CompileTimeIntegerLog2<0>)
+
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<1>::result == 0);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<2>::result == 1);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<3>::result == 2);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<4>::result == 2);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<5>::result == 3);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<255>::result == 8);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<256>::result == 8);
+COMPILE_TIME_ASSERT(CompileTimeIntegerLog2_RoundUp<257>::result == 9);
+
+// Character-to-bitfield mapping
+
+inline uint32 AlphaBit(char c)
+{
+    return c >= 'a' && c <= 'z' ? 1 << (c - 'z' + 31) : 0;
+}
+
+inline uint64 AlphaBit64(char c)
+{
+    return (c >= 'a' && c <= 'z' ? 1U << (c - 'z' + 31) : 0) |
+           (c >= 'A' && c <= 'Z' ? 1LL << (c - 'Z' + 63) : 0);
+}
+
+inline uint32 AlphaBits(uint32 wc)
+{
+    // Handle wide multi-char constants, can be evaluated at compile-time.
+    return AlphaBit((char)wc)
+           | AlphaBit((char)(wc >> 8))
+           | AlphaBit((char)(wc >> 16))
+           | AlphaBit((char)(wc >> 24));
+}
+
+inline uint32 AlphaBits(const char* s)
+{
+    // Handle string of any length.
+    uint32 n = 0;
+    while (*s)
+    {
+        n |= AlphaBit(*s++);
+    }
+    return n;
+}
+
+inline uint64 AlphaBits64(const char* s)
+{
+    // Handle string of any length.
+    uint64 n = 0;
+    while (*s)
+    {
+        n |= AlphaBit64(*s++);
+    }
+    return n;
+}
+
+// s should point to a buffer at least 65 chars long
+inline void BitsAlpha64(uint64 n, char* s)
+{
+    for (int i = 0; n != 0; n >>= 1, i++)
+    {
+        if (n & 1)
+        {
+            *s++ = i < 32 ? static_cast<char>(i + 'z' - 31) : static_cast<char>(i + 'Z' - 63);
+        }
+    }
+    *s++ = '\0';
+}
+
+
+// if hardware doesn't support 3Dc we can convert to DXT5 (different channels are used)
+// with almost the same quality but the same memory requirements
+inline void ConvertBlock3DcToDXT5(uint8 pDstBlock[16], const uint8 pSrcBlock[16])
+{
+    assert(pDstBlock != pSrcBlock);       // does not work in place
+
+    // 4x4 block requires 8 bytes in DXT5 or 3DC
+
+    // DXT5:  8 bit alpha0, 8 bit alpha1, 16*3 bit alpha lerp
+    //        16bit col0, 16 bit col1 (R5G6B5 low byte then high byte), 16*2 bit color lerp
+
+    //  3DC:  8 bit x0, 8 bit x1, 16*3 bit x lerp
+    //        8 bit y0, 8 bit y1, 16*3 bit y lerp
+
+    for (uint32 dwK = 0; dwK < 8; ++dwK)
+    {
+        pDstBlock[dwK] = pSrcBlock[dwK];
+    }
+    for (uint32 dwK = 8; dwK < 16; ++dwK)
+    {
+        pDstBlock[dwK] = 0;
+    }
+
+    // 6 bit green channel (highest bits)
+    // by using all 3 channels with a slight offset we can get more precision but then a dot product would be needed in PS
+    // because of bilinear filter we cannot just distribute bits to get perfect result
+    uint16 colDst0 = (((uint16)pSrcBlock[8] + 2) >> 2) << 5;
+    uint16 colDst1 = (((uint16)pSrcBlock[9] + 2) >> 2) << 5;
+
+    bool bFlip = colDst0 <= colDst1;
+
+    if (bFlip)
+    {
+        uint16 help = colDst0;
+        colDst0 = colDst1;
+        colDst1 = help;
+    }
+
+    bool bEqual = colDst0 == colDst1;
+
+    // distribute bytes by hand to not have problems with endianess
+    pDstBlock[8 + 0] = (uint8)colDst0;
+    pDstBlock[8 + 1] = (uint8)(colDst0 >> 8);
+    pDstBlock[8 + 2] = (uint8)colDst1;
+    pDstBlock[8 + 3] = (uint8)(colDst1 >> 8);
+
+    uint16* pSrcBlock16 = (uint16*)(pSrcBlock + 10);
+    uint16* pDstBlock16 = (uint16*)(pDstBlock + 12);
+
+    // distribute 16 3 bit values to 16 2 bit values (loosing LSB)
+    for (uint32 dwK = 0; dwK < 16; ++dwK)
+    {
+        uint32 dwBit0 = dwK * 3 + 0;
+        uint32 dwBit1 = dwK * 3 + 1;
+        uint32 dwBit2 = dwK * 3 + 2;
+
+        uint8 hexDataIn = (((pSrcBlock16[(dwBit2 >> 4)] >> (dwBit2 & 0xf)) & 1) << 2)         // get HSB
+            | (((pSrcBlock16[(dwBit1 >> 4)] >> (dwBit1 & 0xf)) & 1) << 1)
+            | ((pSrcBlock16[(dwBit0 >> 4)] >> (dwBit0 & 0xf)) & 1);                 // get LSB
+
+        uint8 hexDataOut = 0;
+
+        switch (hexDataIn)
+        {
+        case 0:
+            hexDataOut = 0;
+            break;                          // color 0
+        case 1:
+            hexDataOut = 1;
+            break;                          // color 1
+
+        case 2:
+            hexDataOut = 0;
+            break;                          // mostly color 0
+        case 3:
+            hexDataOut = 2;
+            break;
+        case 4:
+            hexDataOut = 2;
+            break;
+        case 5:
+            hexDataOut = 3;
+            break;
+        case 6:
+            hexDataOut = 3;
+            break;
+        case 7:
+            hexDataOut = 1;
+            break;                          // mostly color 1
+
+        default:
+            assert(0);
+        }
+
+        if (bFlip)
+        {
+            if (hexDataOut < 2)
+            {
+                hexDataOut = 1 - hexDataOut;        // 0<->1
+            }
+            else
+            {
+                hexDataOut = 5 - hexDataOut;  // 2<->3
+            }
+        }
+
+        if (bEqual)
+        {
+            if (hexDataOut == 3)
+            {
+                hexDataOut = 1;
+            }
+        }
+
+        pDstBlock16[(dwK >> 3)] |= (hexDataOut << ((dwK & 0x7) << 1));
+    }
+}
+
+
+
+
+// is a bit on in a new bit field, but off in an old bit field
+static ILINE bool TurnedOnBit(unsigned bit, unsigned oldBits, unsigned newBits)
+{
+    return (newBits & bit) != 0 && (oldBits & bit) == 0;
+}
+
+
+
+
+
+
+
+inline uint32 cellUtilCountLeadingZero(uint32 x)
+{
+    uint32 y;
+    uint32 n = 32;
+
+    y = x >> 16;
+    if (y != 0)
+    {
+        n = n - 16;
+        x = y;
+    }
+    y = x >>  8;
+    if (y != 0)
+    {
+        n = n -  8;
+        x = y;
+    }
+    y = x >>  4;
+    if (y != 0)
+    {
+        n = n -  4;
+        x = y;
+    }
+    y = x >>  2;
+    if (y != 0)
+    {
+        n = n -  2;
+        x = y;
+    }
+    y = x >>  1;
+    if (y != 0)
+    {
+        return n - 2;
+    }
+    return n - x;
+}
+
+inline uint32 cellUtilLog2(uint32 x)
+{
+    return 31 - cellUtilCountLeadingZero(x);
+}
+
+
+
+
+inline void convertSwizzle(uint8*& dst, const uint8*&    src,
+    const uint32 SrcPitch, const uint32 depth,
+    const uint32 xpos, const uint32 ypos,
+    const uint32 SciX1, const uint32 SciY1,
+    const uint32 SciX2, const uint32 SciY2,
+    const uint32 level)
+{
+    if (level == 1)
+    {
+        switch (depth)
+        {
+        case 16:
+            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
+            {
+                //                  *((uint32*&)dst)++ = ((uint32*)src)[ypos * width + xpos];
+                //                  *((uint32*&)dst)++ = ((uint32*)src)[ypos * width + xpos+1];
+                //                  *((uint32*&)dst)++ = ((uint32*)src)[ypos * width + xpos+2];
+                //                  *((uint32*&)dst)++ = ((uint32*)src)[ypos * width + xpos+3];
+                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 16)));
+                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 16 + 4)));
+                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 16 + 8)));
+                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 16 + 12)));
+            }
+            else
+            {
+                ((uint32*&)dst) += 4;
+            }
+            break;
+        case 8:
+            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
+            {
+                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 8)));
+                *((uint32*&)dst)++ = *((uint32*)(src + (ypos * SrcPitch + xpos * 8 + 4)));
+            }
+            else
+            {
+                ((uint32*&)dst) += 2;
+            }
+            break;
+        case 4:
+            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
+            {
+                *((uint32*&)dst) = *((uint32*)(src + (ypos * SrcPitch + xpos * 4)));
+            }
+            dst += 4;
+            break;
+        case 3:
+            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
+            {
+                *dst++ = src[ypos * SrcPitch + xpos * depth];
+                *dst++ = src[ypos * SrcPitch + xpos * depth + 1];
+                *dst++ = src[ypos * SrcPitch + xpos * depth + 2];
+            }
+            else
+            {
+                dst += 3;
+            }
+            break;
+        case 1:
+            if (xpos >= SciX1 && xpos < SciX2 && ypos >= SciY1 && ypos < SciY2)
+            {
+                *dst++ = src[ypos * SrcPitch + xpos * depth];
+            }
+            else
+            {
+                dst++;
+            }
+            break;
+        default:
+            assert(0);
+        }
+        return;
+    }
+    else
+    {
+        convertSwizzle(dst, src, SrcPitch, depth, xpos, ypos, SciX1, SciY1, SciX2, SciY2, level - 1);
+        convertSwizzle(dst, src, SrcPitch, depth, xpos + (1U << (level - 2)), ypos, SciX1, SciY1, SciX2, SciY2, level - 1);
+        convertSwizzle(dst, src, SrcPitch, depth, xpos, ypos + (1U << (level - 2)), SciX1, SciY1, SciX2, SciY2, level - 1);
+        convertSwizzle(dst, src, SrcPitch, depth, xpos + (1U << (level - 2)), ypos + (1U << (level - 2)), SciX1, SciY1, SciX2, SciY2, level - 1);
+    }
+}
+
+
+
+
+inline void Linear2Swizzle(uint8*   dst,
+    const uint8*     src,
+    const uint32 SrcPitch,
+    const uint32 width,
+    const uint32 height,
+    const uint32 depth,
+    const uint32 SciX1, const uint32 SciY1,
+    const uint32 SciX2, const uint32 SciY2)
+{
+    src -= SciY1 * SrcPitch + SciX1 * depth;
+    if (width == height)
+    {
+        convertSwizzle(dst, src, SrcPitch, depth, 0, 0, SciX1, SciY1, SciX2, SciY2, cellUtilLog2(width) + 1);
+    }
+    else
+    if (width > height)
+    {
+        uint32 baseLevel    = cellUtilLog2(width) - (cellUtilLog2(width) - cellUtilLog2(height));
+        for (uint32 i = 0; i < (1UL << (cellUtilLog2(width) - cellUtilLog2(height))); i++)
+        {
+            convertSwizzle(dst, src, SrcPitch, depth, (1U << baseLevel) * i, 0, SciX1, SciY1, SciX2, SciY2, baseLevel + 1);
+        }
+    }
+    else
+    //  if (width < height)//wtf
+    {
+        uint32 baseLevel    = cellUtilLog2(height) - (cellUtilLog2(height) - cellUtilLog2(width));
+        for (uint32 i = 0; i < (1UL << (cellUtilLog2(height) - cellUtilLog2(width))); i++)
+        {
+            convertSwizzle(dst, src, SrcPitch, depth, 0, (1U << baseLevel) * i, SciX1, SciY1, SciX2, SciY2, baseLevel + 1);
+        }
+    }
+}
diff --git a/Code/Legacy/CryCommon/CMakeLists.txt b/Code/Legacy/CryCommon/CMakeLists.txt
new file mode 100644
index 0000000000..f52b4c811a
--- /dev/null
+++ b/Code/Legacy/CryCommon/CMakeLists.txt
@@ -0,0 +1,35 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+ly_add_target(
+    NAME CryCommon STATIC
+    NAMESPACE Legacy
+    FILES_CMAKE
+        crycommon_files.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .         # Lots of code without CryCommon/
+            ..        # Dangerous since exports Legacy's path (client code can do CrySystem/ without depending on that target)
+    BUILD_DEPENDENCIES
+        PUBLIC
+            AZ::AzCore
+            AZ::AzFramework
+)
+
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+
+    ly_add_target(
+        NAME CryCommonMocks HEADERONLY
+        NAMESPACE Legacy
+        FILES_CMAKE
+            crycommon_testing_files.cmake
+        INCLUDE_DIRECTORIES
+            INTERFACE
+                Mocks
+    )
+
+endif()
diff --git a/Code/Legacy/CryCommon/Common_TypeInfo.cpp b/Code/Legacy/CryCommon/Common_TypeInfo.cpp
new file mode 100644
index 0000000000..88e159b715
--- /dev/null
+++ b/Code/Legacy/CryCommon/Common_TypeInfo.cpp
@@ -0,0 +1,160 @@
+/*
+ * 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 "TypeInfo_impl.h"
+#include "Cry_Geo.h"
+
+STRUCT_INFO_T_BEGIN(Vec2_tpl, class, F)
+VAR_INFO(x)
+VAR_INFO(y)
+STRUCT_INFO_T_END(Vec2_tpl, class, F)
+
+#include "Cry_Vector3.h"
+
+STRUCT_INFO_T_BEGIN(Vec3_tpl, typename, F)
+VAR_INFO(x)
+VAR_INFO(y)
+VAR_INFO(z)
+STRUCT_INFO_T_END(Vec3_tpl, typename, F)
+
+typedef TFixed<unsigned char, 1, 255, 0> TFixedUChar_1_255_0;
+STRUCT_INFO_T_INSTANTIATE(Vec3_tpl, TFixedUChar_1_255_0)
+
+STRUCT_INFO_T_BEGIN(Vec4_tpl, typename, F)
+VAR_INFO(x)
+VAR_INFO(y)
+VAR_INFO(z)
+VAR_INFO(w)
+STRUCT_INFO_T_END(Vec4_tpl, typename, F)
+
+STRUCT_INFO_T_INSTANTIATE(Vec4_tpl, short)
+
+STRUCT_INFO_T_BEGIN(Ang3_tpl, typename, F)
+VAR_INFO(x)
+VAR_INFO(y)
+VAR_INFO(z)
+STRUCT_INFO_T_END(Ang3_tpl, typename, F)
+
+STRUCT_INFO_T_BEGIN(Plane_tpl, typename, F)
+VAR_INFO(n)
+VAR_INFO(d)
+STRUCT_INFO_T_END(Plane_tpl, typename, F)
+
+//-----------------------------------------------------------------
+//#include "Cry_Quat_info.h"
+STRUCT_INFO_T_BEGIN(Quat_tpl, typename, F)
+VAR_INFO(v)
+VAR_INFO(w)
+STRUCT_INFO_T_END(Quat_tpl, typename, F)
+
+STRUCT_INFO_T_INSTANTIATE(Quat_tpl, float)
+
+STRUCT_INFO_T_BEGIN(QuatT_tpl, typename, F)
+VAR_INFO(q)
+VAR_INFO(t)
+STRUCT_INFO_T_END(QuatT_tpl, typename, F)
+
+STRUCT_INFO_T_INSTANTIATE(QuatT_tpl, float)
+
+STRUCT_INFO_T_BEGIN(QuatTS_tpl, typename, F)
+VAR_INFO(q)
+VAR_INFO(t)
+VAR_INFO(s)
+STRUCT_INFO_T_END(QuatTS_tpl, typename, F)
+
+STRUCT_INFO_T_BEGIN(DualQuat_tpl, typename, F)
+VAR_INFO(nq)
+VAR_INFO(dq)
+STRUCT_INFO_T_END(DualQuat_tpl, typename, F)
+
+
+//------------------------------------------------------------
+//#include "Cry_Matrix_info.h"
+STRUCT_INFO_T_BEGIN(Matrix33_tpl, typename, F)
+VAR_INFO(m00)
+VAR_INFO(m01)
+VAR_INFO(m02)
+VAR_INFO(m10)
+VAR_INFO(m11)
+VAR_INFO(m12)
+VAR_INFO(m20)
+VAR_INFO(m21)
+VAR_INFO(m22)
+STRUCT_INFO_T_END(Matrix33_tpl, typename, F)
+
+STRUCT_INFO_T_BEGIN(Matrix34_tpl, typename, F)
+VAR_INFO(m00)
+VAR_INFO(m01)
+VAR_INFO(m02)
+VAR_INFO(m03)
+VAR_INFO(m10)
+VAR_INFO(m11)
+VAR_INFO(m12)
+VAR_INFO(m13)
+VAR_INFO(m20)
+VAR_INFO(m21)
+VAR_INFO(m22)
+VAR_INFO(m23)
+STRUCT_INFO_T_END(Matrix34_tpl, typename, F)
+
+STRUCT_INFO_T_INSTANTIATE(Matrix34_tpl, float)
+
+STRUCT_INFO_T_BEGIN(Matrix44_tpl, typename, F)
+VAR_INFO(m00)
+VAR_INFO(m01)
+VAR_INFO(m02)
+VAR_INFO(m03)
+VAR_INFO(m10)
+VAR_INFO(m11)
+VAR_INFO(m12)
+VAR_INFO(m13)
+VAR_INFO(m20)
+VAR_INFO(m21)
+VAR_INFO(m22)
+VAR_INFO(m23)
+VAR_INFO(m30)
+VAR_INFO(m31)
+VAR_INFO(m32)
+VAR_INFO(m33)
+STRUCT_INFO_T_END(Matrix44_tpl, typename, F)
+
+
+//#include "Cry_Color_info.h"
+STRUCT_INFO_T_BEGIN(Color_tpl, class, T)
+VAR_INFO(r)
+VAR_INFO(g)
+VAR_INFO(b)
+VAR_INFO(a)
+STRUCT_INFO_T_END(Color_tpl, class, T)
+
+STRUCT_INFO_T_INSTANTIATE(Color_tpl, unsigned char)
+
+//#include "Cry_Geo_info.h"
+STRUCT_INFO_BEGIN(AABB)
+VAR_INFO(min)
+VAR_INFO(max)
+STRUCT_INFO_END(AABB)
+
+STRUCT_INFO_BEGIN(RectF)
+VAR_INFO(x)
+VAR_INFO(y)
+VAR_INFO(w)
+VAR_INFO(h)
+STRUCT_INFO_END(RectF)
+
+#include "TimeValue_info.h"
+#include "CryHalf_info.h"
+
+// Manually instantiate templates as needed here.
+template struct Vec3_tpl<float>;
+template struct Vec4_tpl<float>;
+template struct Vec2_tpl<float>;
+template struct Ang3_tpl<float>;
+template struct Plane_tpl<float>;
+template struct Matrix33_tpl<float>;
+template struct Color_tpl<float>;
diff --git a/Code/Legacy/CryCommon/CompileTimeAssert.h b/Code/Legacy/CryCommon/CompileTimeAssert.h
new file mode 100644
index 0000000000..33189e2080
--- /dev/null
+++ b/Code/Legacy/CryCommon/CompileTimeAssert.h
@@ -0,0 +1,55 @@
+/*
+ * 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
+ *
+ */
+
+// Inspired by the Boost library's BOOST_STATIC_ASSERT(),
+// see http://www.boost.org/doc/libs/1_49_0/doc/html/boost_staticassert/how.html
+// or http://www.boost.org/libs/static_assert
+
+#ifndef CRYINCLUDE_CRYCOMMON_COMPILETIMEASSERT_H
+#define CRYINCLUDE_CRYCOMMON_COMPILETIMEASSERT_H
+#pragma once
+
+#if defined(__cplusplus)
+/*
+template <bool b>
+struct COMPILE_TIME_ASSERT_FAIL;
+
+template <>
+struct COMPILE_TIME_ASSERT_FAIL<true>
+{
+};
+
+template <int i>
+struct COMPILE_TIME_ASSERT_TEST
+{
+    enum { dummy = i };
+};
+
+#define COMPILE_TIME_ASSERT_BUILD_NAME2(x, y) x##y
+#define COMPILE_TIME_ASSERT_BUILD_NAME1(x, y) COMPILE_TIME_ASSERT_BUILD_NAME2(x, y)
+#define COMPILE_TIME_ASSERT_BUILD_NAME(x, y) COMPILE_TIME_ASSERT_BUILD_NAME1(x, y)
+
+#ifndef __RECODE__
+    #define COMPILE_TIME_ASSERT(expr) \
+        typedef COMPILE_TIME_ASSERT_TEST<sizeof(COMPILE_TIME_ASSERT_FAIL<(bool)(expr)>)> \
+        COMPILE_TIME_ASSERT_BUILD_NAME(compile_time_assert_test_, __LINE__)
+    // note: for MS Visual Studio we could use __COUNTER__ instead of __LINE__
+#else
+    #define COMPILE_TIME_ASSERT(expr)
+#endif  // __RECODE__
+
+#else
+
+#define COMPILE_TIME_ASSERT(expr)
+*/
+#endif
+
+#define COMPILE_TIME_ASSERT_MSG(expr, msg) static_assert(expr, msg)
+#define COMPILE_TIME_ASSERT(expr) COMPILE_TIME_ASSERT_MSG(expr, "Compile Time Assert")
+
+
+#endif // CRYINCLUDE_CRYCOMMON_COMPILETIMEASSERT_H
diff --git a/Code/Legacy/CryCommon/CryArray.h b/Code/Legacy/CryCommon/CryArray.h
new file mode 100644
index 0000000000..07f49467e9
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryArray.h
@@ -0,0 +1,1346 @@
+/*
+ * 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_CRYARRAY_H
+#define CRYINCLUDE_CRYCOMMON_CRYARRAY_H
+#pragma once
+
+#include "CryLegacyAllocator.h"
+
+//---------------------------------------------------------------------------
+// Convenient iteration macros
+#define for_iter(IT, it, b, e)          for (IT it = (b), _e = (e); it != _e; ++it)
+#define for_container(CT, it, cont) for_iter (CT::iterator, it, (cont).begin(), (cont).end())
+
+#define for_ptr(T, it, b, e)                for (T* it = (b), * _e = (e); it != _e; ++it)
+#define for_array_ptr(T, it, arr)       for_ptr (T, it, (arr).begin(), (arr).end())
+
+#define for_array(i, arr)                       for (int i = 0, _e = (arr).size(); i < _e; i++)
+#define for_all(cont)                               for_array (_i, cont) cont[_i]
+
+//---------------------------------------------------------------------------
+// Stack array helper
+#define ALIGNED_STACK_ARRAY(T, name, size, alignment)           \
+    PREFAST_SUPPRESS_WARNING(6255)                              \
+    T * name = (T*) alloca((size) * sizeof(T) + alignment - 1); \
+    name = Align(name, alignment);
+
+#define STACK_ARRAY(T, name, size)                 \
+    ALIGNED_STACK_ARRAY(T, name, size, alignof(T)) \
+
+//---------------------------------------------------------------------------
+// Specify semantics for moving objects.
+// If raw_movable() is true, objects will be moved with memmove().
+// If false, with the templated move_init() function.
+template<class T>
+bool raw_movable([[maybe_unused]] T const& dest)
+{
+    return false;
+}
+
+// This container was written before C++11 and move semantics. As a result, it attempts
+// to fake move semantics where possible by constructing over top of existing instances.
+// This works great, unless the type being operated on has internal pointers to its own
+// memory space (for instance a string with SSO, or COW semantics).
+template <class T>
+struct fake_move_helper
+{
+    static void move(T& dest, T& source)
+    {
+        ::new(&dest) T(source);
+        source.~T();
+    }
+};
+
+// Override for string to ensure proper construction
+template <>
+struct fake_move_helper<string>
+{
+    static void move(string& dest, string& source)
+    {
+        ::new((void*)&dest) string(); 
+        dest = source;
+        source.~string();
+    }
+};
+
+// Generic move function: transfer an existing source object to uninitialized dest address.
+// Addresses must not overlap (requirement on caller).
+// May be specialized for specific types, to provide a more optimal move.
+// For types that can be trivially moved (memcpy), do not specialize move_init, rather specialize raw_movable to return true.
+template<class T>
+void move_init(T& dest, T& source)
+{
+    assert(&dest != &source);
+    fake_move_helper<T>::move(dest, source);
+}
+
+/*---------------------------------------------------------------------------
+Public classes:
+
+        Array<T, [I, STORAGE]>
+        StaticArray<T, nSIZE, [I]>
+        DynArray<T, [I, STORAGE, ALLOC]>
+        StaticDynArray<T, nSIZE, [I]>
+
+Support classes are placed in namespaces NArray and NAlloc to reduce global name usage.
+---------------------------------------------------------------------------*/
+
+namespace NArray
+{
+    // We should never have these defined as macros.
+    #undef min
+    #undef max
+
+    // Define our own min/max here, to avoid including entire <algorithm>.
+    template<class T>
+    inline T min(T a, T b)
+    { return a < b ? a : b; }
+    template<class T>
+    inline T max(T a, T b)
+    { return a > b ? a : b; }
+
+    // Automatic inference of signed from unsigned int type.
+    template<class T>
+    struct IntTraits
+    {
+        typedef T TSigned;
+    };
+
+    template<>
+    struct IntTraits<uint>
+    {
+        typedef int TSigned;
+    };
+    template<>
+    struct IntTraits<uint64>
+    {
+        typedef int64 TSigned;
+    };
+#if !defined(LINUX) && !defined(APPLE)
+    template<>
+    struct IntTraits<unsigned long>
+    {
+        typedef long TSigned;
+    };
+#endif
+
+    /*---------------------------------------------------------------------------
+    // STORAGE prototype for Array<T,I,STORAGE>.
+    struct Storage
+    {
+        template<class T, class I>
+        struct Store
+        {
+            [const] T* begin() [const];
+            I size() const;
+        };
+    };
+    ---------------------------------------------------------------------------*/
+
+    //---------------------------------------------------------------------------
+    // ArrayStorage: Default STORAGE Array<T,I,STORAGE>.
+    // Simply contains a pointer and count to an existing array,
+    // performs no allocation or deallocation.
+
+    struct ArrayStorage
+    {
+        template<class T, class I = int>
+        struct Store
+        {
+            // Construction.
+            Store()
+                : m_aElems(0)
+                , m_nCount(0)
+            {}
+            Store(T* elems, I count)
+                : m_aElems(elems)
+                , m_nCount(count)
+            {}
+            Store(T* start, T* finish)
+                : m_aElems(start)
+                , m_nCount(check_cast<I>(finish - start))
+            {}
+
+            void set(T* elems, I count)
+            {
+                m_aElems = elems;
+                m_nCount = count;
+            }
+
+            // Basic storage.
+            CONST_VAR_FUNCTION(T * begin(),
+                { return m_aElems;
+                })
+            inline I size() const
+            { return m_nCount; }
+
+            // Modifiers, alter range in place.
+            void erase_front(I count = 1)
+            {
+                assert(count >= 0 && count <= m_nCount);
+                m_nCount -= count;
+                m_aElems += count;
+            }
+
+            void erase_back(I count = 1)
+            {
+                assert(count >= 0 && count <= m_nCount);
+                m_nCount -= count;
+            }
+
+            void resize(I count)
+            {
+                assert(count >= 0 && count <= m_nCount);
+                m_nCount = count;
+            }
+
+        protected:
+            T*  m_aElems;
+            I       m_nCount;
+        };
+    };
+
+    //---------------------------------------------------------------------------
+    // StaticArrayStorage: STORAGE scheme with a statically sized member array.
+
+    template<int nSIZE>
+    struct StaticArrayStorage
+    {
+        template<class T, class I = int>
+        struct Store
+        {
+            // Basic storage.
+            CONST_VAR_FUNCTION(T * begin(),
+                { return m_aElems;
+                })
+            inline static I size()
+            { return (I)nSIZE; }
+
+        protected:
+            T               m_aElems[nSIZE];
+        };
+    };
+};
+
+//---------------------------------------------------------------------------
+// Array<T,I,S>: Non-growing array.
+// S serves as base class, and implements storage scheme: begin(), size()
+
+template< class T, class I = int, class STORE = NArray::ArrayStorage >
+struct Array
+    : STORE::template Store<T, I>
+{
+    typedef typename STORE::template Store<T, I> S;
+
+    // Tedious redundancy.
+    using S::size;
+    using S::begin;
+
+    // STL-compatible typedefs.
+    typedef T                           value_type;
+    typedef T*                      pointer;
+    typedef const T*            const_pointer;
+    typedef T&                      reference;
+    typedef const T&            const_reference;
+
+    typedef T*                      iterator;
+    typedef const T*            const_iterator;
+
+    typedef I                           size_type;
+    typedef typename NArray::IntTraits<size_type>::TSigned
+        difference_type;
+
+    typedef Array<T, I>              array;
+    typedef Array<const T, I>    const_array;
+
+    // Construction.
+    Array()
+    {}
+
+    // Forward single- and double-argument constructors.
+    template<class In>
+    explicit Array(const In& i)
+        : S(i)
+    {}
+
+    template<class In1, class In2>
+    Array(const In1& i1, const In2& i2)
+        : S(i1, i2)
+    {}
+
+    // Accessors.
+    inline bool empty() const
+    { return size() == 0; }
+    inline size_type size_mem() const
+    { return size() * sizeof(T); }
+
+    CONST_VAR_FUNCTION(T * data(),
+        { return begin();
+        })
+
+    CONST_VAR_FUNCTION(T * end(),
+        { return begin() + size();
+        })
+
+    CONST_VAR_FUNCTION(T * rbegin(),
+        { return begin() + size() - 1;
+        })
+
+    CONST_VAR_FUNCTION(T * rend(),
+        { return begin() - 1;
+        })
+
+    CONST_VAR_FUNCTION(T & front(),
+        {
+            assert(!empty());
+            return *begin();
+        })
+
+    CONST_VAR_FUNCTION(T & back(),
+        {
+            assert(!empty());
+            return *rbegin();
+        })
+
+    CONST_VAR_FUNCTION(T & at(size_type i),
+        {
+            CRY_ASSERT_TRACE(i >= 0 && i < size(), ("Index %lld is out of range (array size is %lld)", (long long int) i, (long long int) size()));
+            return begin()[i];
+        })
+
+    CONST_VAR_FUNCTION(T & operator [](size_type i),
+        {
+            CRY_ASSERT_TRACE(i >= 0 && i < size(), ("Index %lld is out of range (array size is %lld)", (long long int) i, (long long int) size()));
+            return begin()[i];
+        })
+
+    // Conversion to canonical array type.
+    operator array()
+    { return array(begin(), size()); }
+    operator const_array() const
+    {
+        return const_array(begin(), size());
+    }
+
+    // Additional conversion via operator() to full or sub array.
+    array operator ()(size_type i, size_type count)
+    {
+        assert(i >= 0 && i + count <= size());
+        return array(begin() + i, count);
+    }
+    const_array operator ()(size_type i, size_type count) const
+    {
+        assert(i >= 0 && i + count <= size());
+        return const_array(begin() + i, count);
+    }
+
+    array operator ()(size_type i = 0)
+    { return (*this)(i, size() - i); }
+    const_array operator ()(size_type i = 0) const
+    { return (*this)(i, size() - i); }
+
+    // Basic element assignment functions.
+
+    // Copy values to existing elements.
+    void fill(const T& val)
+    {
+        for_array_ptr (T, it, *this)
+        * it = val;
+    }
+
+    void copy(const_array source)
+    {
+        assert(source.size() >= size());
+        const T* s = source.begin();
+        for_array_ptr (T, it, *this)
+        * it = *s++;
+    }
+
+    // Raw element construct/destruct functions.
+    iterator init()
+    {
+        for_array_ptr (T, it, *this)
+        new(it) T;
+        return begin();
+    }
+    iterator init(const T& val)
+    {
+        for_array_ptr (T, it, *this)
+        new(it) T(val);
+        return begin();
+    }
+    iterator init(const_array source)
+    {
+        assert(source.size() >= size());
+        assert(source.end() <= begin() || source.begin() >= end());
+        const_iterator s = source.begin();
+        for_array_ptr (T, it, *this)
+        new(it) T(*s++);
+        return begin();
+    }
+
+    iterator move_init(array source)
+    {
+        assert(source.size() >= size());
+        iterator s = source.begin();
+        if (s != begin())
+        {
+            if (raw_movable(*s))
+            {
+                memmove(begin(), s, size_mem());
+            }
+            else if (s > begin() || source.end() <= begin())
+            {
+                for_array_ptr (T, it, *this)
+                    ::move_init(*it, *s++);
+            }
+            else
+            {
+                s += size();
+                for (iterator it = end(); it > begin(); )
+                {
+                    ::move_init(*--it, *--s);
+                }
+            }
+        }
+        return begin();
+    }
+
+    void destroy()
+    {
+        // Destroy in reverse order, to complement construction order.
+        for (iterator it = rbegin(); it > rend(); --it)
+        {
+            it->~T();
+        }
+    }
+};
+
+// Type-inferring constructor.
+
+template<class T, class I>
+inline Array<T, I> ArrayT(T* elems, I count)
+{
+    return Array<T, I>(elems, count);
+}
+
+template<class T>
+inline Array<T, size_t> ArrayT(T* start, T* finish)
+{
+    return Array<T, size_t>(start, finish);
+}
+
+// StaticArray<T,I,nSIZE>
+// A superior alternative to static C arrays.
+// Provides standard STL-like Array interface, including bounds-checking.
+//      standard:       Type array[256];
+//      structured: StaticArray<Type,256> array;
+
+template<class T, int nSIZE, class I = int>
+struct StaticArray
+    : Array< T, I, NArray::StaticArrayStorage<nSIZE> >
+{
+};
+
+//---------------------------------------------------------------------------
+// Specify allocation for dynamic arrays
+
+namespace NAlloc
+{
+    // Multi-purpose allocation function prototype
+    // pMem = 0, nSize != 0:        allocate new mem, nSize = actual amount alloced
+    // pMem != 0, nSize = 0:        deallcate mem
+    // pMem != 0, nSize != 0:       nSize = actual amount allocated
+    typedef void* (* Allocator)(void* pMem, size_t& nSize, size_t nAlign, bool bSlack);
+
+    //
+    // Allocation utilities
+    //
+
+    inline size_t realloc_size(size_t nMinSize)
+    {
+        // Choose an efficient realloc size, when growing an existing (non-zero) block.
+        // Find the next power-of-two, minus a bit of presumed system alloc overhead.
+        static const size_t nMinAlloc = 32;
+        static const size_t nOverhead = 16;
+        static const size_t nDoubleLimit =
+            sizeof(size_t) < 8 ? 1 << 12      // 32-bit system
+            : 1 << 16;                                            // >= 64-bit system
+
+        nMinSize += nOverhead;
+        size_t nAlloc = nMinAlloc;
+        while (nAlloc < nMinSize)
+        {
+            nAlloc <<= 1;
+        }
+        if (nAlloc > nDoubleLimit)
+        {
+            size_t nAlign = NArray::max(nAlloc >> 3, nDoubleLimit);
+            nAlloc = Align(nMinSize, nAlign);
+        }
+        return nAlloc - nOverhead;
+    }
+
+    template<class A, class T, class I>
+    T* reallocate(A& allocator, T* old_elems, I old_size, I& new_size, size_t alignment = 1, bool allow_slack = false)
+    {
+        T* new_elems;
+        if (new_size)
+        {
+            size_t new_bytes = new_size * sizeof(T);
+            new_elems = (T*) allocator.alloc(0, new_bytes, alignment, allow_slack);
+            assert(IsAligned(new_elems, alignment));
+            assert(new_bytes >= new_size * sizeof(T));
+            new_size = check_cast<I>(new_bytes / sizeof(T));
+        }
+        else
+        {
+            new_elems = 0;
+        }
+
+        if (old_elems)
+        {
+            Array<T, I> old_elems_array(old_elems, old_size);
+            if (new_elems)
+            {
+                // Move elements.
+                ArrayT(new_elems, NArray::min(old_size, new_size)).move_init(old_elems_array);
+            }
+
+            // Dealloc old.
+            old_elems_array.destroy(); // call destructors
+            size_t zero = 0;
+            allocator.alloc(old_elems, zero, alignment);
+        }
+
+        return new_elems;
+    }
+
+    template<class A>
+    inline size_t get_alloc_size(const A& allocator, const void* pMem, size_t nSize, size_t nAlign)
+    {
+        non_const(allocator).alloc((void*)pMem, nSize, nAlign);
+        return nSize;
+    }
+
+    struct AllocFunction
+    {
+        Allocator       m_Function;
+
+        void* alloc(void* pMem, size_t& nSize, size_t nAlign, bool bSlack = false)
+        {
+            return m_Function(pMem, nSize, nAlign, bSlack);
+        }
+    };
+
+    // Adds prefix bytes to allocation, preserving alignment
+    template<class A, class Prefix, int nSizeAlign = 1>
+    struct AllocPrefix
+        : A
+    {
+        void* alloc(void* pMem, size_t& nSize, size_t nAlign, bool bSlack = false)
+        {
+            // Adjust pointer and size for prefix bytes
+            nAlign = NArray::max(nAlign, alignof(Prefix));
+            size_t nPrefixSize = Align(sizeof(Prefix), nAlign);
+
+            if (pMem)
+            {
+                pMem = (char*)pMem - nPrefixSize;
+            }
+            if (nSize)
+            {
+                nSize = Align(nSize, nSizeAlign);
+                nSize += nPrefixSize;
+            }
+
+            pMem = A::alloc(pMem, nSize, nAlign, bSlack);
+
+            if (nSize)
+            {
+                nSize -= nPrefixSize;
+            }
+            if (pMem)
+            {
+                pMem = (char*)pMem + nPrefixSize;
+            }
+            return pMem;
+        }
+    };
+
+    // Stores and retrieves allocator function in memory, for compatibility with diverse allocators
+    template<class A>
+    struct AllocCompatible
+    {
+        void* alloc(void* pMem, size_t& nSize, size_t nAlign, bool bSlack = false)
+        {
+            nAlign = NArray::max(nAlign, alignof(Allocator));
+            if (pMem)
+            {
+                // Retrieve original allocation function, for dealloc or size query
+                AllocPrefix<AllocFunction, Allocator> alloc_prefix;
+                alloc_prefix.m_Function = ((Allocator*)pMem)[-1];
+                return alloc_prefix.alloc(pMem, nSize, nAlign, bSlack);
+            }
+            else if (nSize)
+            {
+                // Allocate new with this module's base_allocator, storing pointer to function
+                AllocPrefix<A, Allocator> alloc_prefix;
+                pMem = alloc_prefix.alloc(pMem, nSize, nAlign, bSlack);
+                if (pMem)
+                {
+                    ((Allocator*)pMem)[-1] = &A::alloc;
+                }
+            }
+            return pMem;
+        }
+    };
+
+    //---------------------------------------------------------------------------
+    // Allocators for DynArray.
+
+    // Standard CryModule memory allocation, using aligned versions
+    struct ModuleAlloc
+    {
+        static void* alloc(void* pMem, size_t& nSize, size_t nAlign, bool bSlack = false)
+        {
+            if (pMem)
+            {
+                if (nSize)
+                {
+                    // Return memory usage, adding presumed alignment padding
+                    if (nAlign > sizeof(size_t))
+                    {
+                        nSize += nAlign - sizeof(size_t);
+                    }
+                }
+                else
+                {
+                    // Dealloc
+                    CryModuleMemalignFree(pMem);
+                }
+            }
+            else if (nSize)
+            {
+                // Alloc
+                if (bSlack)
+                {
+                    nSize = realloc_size(nSize);
+                }
+                return CryModuleMemalign(nSize, nAlign);
+            }
+            return 0;
+        }
+    };
+
+    // Standard allocator for DynArray stores a compatibility pointer in the memory
+    typedef AllocCompatible<ModuleAlloc> StandardAlloc;
+};
+
+//---------------------------------------------------------------------------
+// Storage schemes for dynamic arrays
+namespace NArray
+{
+    //---------------------------------------------------------------------------
+    // SmallDynStorage: STORAGE scheme for DynArray<T,I,STORAGE,ALLOC>.
+    // Array is just a single pointer, size and capacity information stored before the array data.
+
+    template<class A = NAlloc::StandardAlloc>
+    struct SmallDynStorage
+    {
+        template<class T, class I>
+        struct Store
+            : private A
+        {
+            struct Header
+            {
+                static const I nCAP_BIT = I(1) << (sizeof(I) * 8 - 1);
+
+                ILINE char* data() const
+                {
+                    assert(IsAligned(this, sizeof(I)));
+                    return (char*)(this + 1);
+                }
+                ILINE bool is_null() const
+                { return m_nSizeCap == 0; }
+                ILINE I size() const
+                { return m_nSizeCap & ~nCAP_BIT; }
+
+                I   capacity() const
+                {
+                    I aligned_bytes = Align(size() * sizeof(T), sizeof(I));
+                    if (m_nSizeCap & nCAP_BIT)
+                    {
+                        // Capacity stored in word following data
+                        return *(I*)(data() + aligned_bytes);
+                    }
+                    else
+                    {
+                        // Capacity - size < sizeof(I)
+                        return aligned_bytes / sizeof(T);
+                    }
+                }
+
+                void set_sizes(I s, I c)
+                {
+                    // Store size, and assert against overflow.
+                    assert(s <= c);
+                    m_nSizeCap = s;
+                    I aligned_bytes = Align(s * sizeof(T), sizeof(I));
+                    if (c * sizeof(T) >= aligned_bytes + sizeof(I))
+                    {
+                        // Has extra capacity, more than word-alignment
+                        m_nSizeCap |= nCAP_BIT;
+                        *(I*)(data() + aligned_bytes) = c;
+                    }
+                    assert(size() == s);
+                    assert(capacity() == c);
+                }
+
+            protected:
+                I       m_nSizeCap;             // Store allocation size, with last bit indicating extra capacity.
+
+            public:
+
+                static T* null_header()
+                {
+                    // m_aElems is never 0, for empty array points to a static empty header.
+                    // Declare a big enough static var to account for alignment.
+                    struct EmptyHeader
+                    {
+                        Header  head;
+                        char        pad[alignof(T)];
+                    };
+                    static EmptyHeader s_EmptyHeader;
+
+                    // The actual header pointer can be anywhere in the struct, it's all initialized to 0.
+                    static T* s_EmptyElems = (T*)Align(s_EmptyHeader.pad, alignof(T));
+
+                    return s_EmptyElems;
+                }
+            };
+
+            // Construction.
+            Store()
+            {
+                set_null();
+            }
+
+            Store(const A& a)
+                : A(a)
+            {
+                set_null();
+            }
+
+            // Basic storage.
+            CONST_VAR_FUNCTION(T * begin(),
+                { return m_aElems;
+                })
+            inline I size() const
+            { return header()->size(); }
+            inline I capacity() const
+            { return header()->capacity(); }
+            size_t get_alloc_size() const
+            { return is_null() ? 0 : NAlloc::get_alloc_size(allocator(), begin(), capacity() * sizeof(T), alignof(T)); }
+
+            void resize_raw(I new_size, bool allow_slack = false)
+            {
+                I new_cap = capacity();
+                if (allow_slack ? new_size > new_cap : new_size != new_cap)
+                {
+                    new_cap = new_size;
+                    m_aElems = NAlloc::reallocate(allocator(), header()->is_null() ? 0 : m_aElems, size(), new_cap, alignof(T), allow_slack);
+                    if (!m_aElems)
+                    {
+                        set_null();
+                        return;
+                    }
+                }
+                header()->set_sizes(new_size, new_cap);
+            }
+
+        protected:
+
+            T*              m_aElems;
+
+            CONST_VAR_FUNCTION(Header * header(),
+                {
+                    assert(m_aElems);
+                    return ((Header*)m_aElems) - 1;
+                })
+
+            void set_null()
+            { m_aElems = Header::null_header(); }
+            bool is_null() const
+            { return header()->is_null(); }
+
+            typedef NAlloc::AllocPrefix<A, Header, sizeof(I)> AP;
+
+            AP& allocator()
+            {
+                COMPILE_TIME_ASSERT(sizeof(AP) == sizeof(A));
+                return *(AP*)this;
+            }
+            const AP& allocator() const
+            {
+                return *(const AP*)this;
+            }
+        };
+    };
+
+    //---------------------------------------------------------------------------
+    // StaticDynStorage: STORAGE scheme with a statically sized member array.
+
+    template<int nSIZE>
+    struct StaticDynStorage
+    {
+        template<class T, class I = int>
+        struct Store
+            : ArrayStorage::Store<T, I>
+        {
+            Store()
+                : ArrayStorage::Store<T, I>((T*)Align(m_aData, alignof(T)), 0) {}
+
+            static I capacity()
+            { return (I)nSIZE; }
+            static size_t get_alloc_size()
+            { return 0; }
+
+            void resize_raw(I new_size, [[maybe_unused]] bool allow_slack = false)
+            {
+                // cannot realloc, just set size
+                assert(new_size >= 0 && new_size <= capacity());
+                this->m_nCount = new_size;
+            }
+
+        protected:
+
+            char        m_aData[nSIZE * sizeof(T) + alignof(T) - 1];      // Storage for elems, deferred construction
+        };
+    };
+};
+
+// Legacy base class of DynArray, only used for read-only access
+#define DynArrayRef DynArray
+
+//---------------------------------------------------------------------------
+// DynArray<T,I,S>: Extension of Array allowing dynamic allocation.
+// S specifies storage scheme, as with Array, but adds resize(), capacity(), ...
+// A specifies the actual memory allocation function: alloc()
+
+// NOTE: This version has been re-based on AZStd::vector for correctness and performance
+// The original implementation has been retained as LegacyDynArray below, for the few
+// cases where we must retain the old internal behavior
+template< class T, class I = int, class STORE = NArray::SmallDynStorage<> >
+struct DynArray
+    : public AZStd::vector<T, AZ::StdLegacyAllocator>
+{
+    typedef AZStd::vector<T, AZ::StdLegacyAllocator> vector_base;
+    using value_type = typename vector_base::value_type;
+    using size_type = I;
+    using iterator = typename vector_base::iterator;
+    using const_iterator = typename vector_base::const_iterator;
+
+    using vector_base::begin;
+    using vector_base::end;
+
+    DynArray()
+        : vector_base::vector()
+    {
+    }
+
+    explicit DynArray(size_type numElements)
+        : vector_base::vector(numElements)
+    {
+    }
+
+    DynArray(size_type numElements, const T& value)
+        : vector_base::vector(numElements, value)
+    {
+    }
+
+    // Ignore any specialized allocators, they all pull from the LegacyAllocator now
+    // Because we mandate that all DynArrays use the StdLegacyAllocator, matching allocators
+    // isn't meaningful here, so it's factored out
+    // Note that the STORE/S& is ignored entirely, because we do not support sharing storage
+    // between 2 DynArrays anymore. LegacyDynArray can still do that, but this feature is no longer used
+    template <typename S, typename = AZStd::enable_if_t<AZStd::is_base_of<S, typename STORE::template Store<T, I>>::value>>
+    explicit DynArray(const S&)
+        : vector_base::vector()
+    {
+    }
+
+    size_type capacity() const
+    {
+        return static_cast<size_type>(vector_base::capacity());
+    }
+
+    size_type size() const
+    {
+        return static_cast<size_type>(vector_base::size());
+    }
+
+    size_type available() const
+    {
+        return capacity() - size();
+    }
+
+    size_type get_alloc_size() const
+    {
+        return capacity() * sizeof(T);
+    }
+
+    // Grow array, return iterator to new raw elems.
+    iterator grow_raw(size_type count = 1, bool /*allow_slack*/ = true)
+    {
+        vector_base::resize(size() + count);
+        return end() - count;
+    }
+    
+    iterator grow(size_type count)
+    {
+        return grow_raw(count);
+    }
+    iterator grow(size_type count, const T& val)
+    {
+        vector_base::reserve(size() + count);
+        for (size_type idx = 0; idx < count; ++idx)
+        {
+            vector_base::push_back(val);
+        }
+        return end() - count;
+    }
+
+    void shrink()
+    {
+        // Realloc memory to exact array size.
+        vector_base::shrink_to_fit();
+    }
+
+    void resize(size_type newSize)
+    {
+        vector_base::resize(newSize);
+    }
+
+    void resize(size_type new_size, const T& val)
+    {
+        size_type s = size();
+        if (new_size > s)
+        {
+            grow(new_size - s, val);
+        }
+        else
+        {
+            pop_back(s - new_size);
+        }
+    }
+
+    void assign(const_iterator first, const_iterator last)
+    {
+        vector_base::assign(first, last);
+    }
+
+    void assign(size_type n, const T& val)
+    {
+        clear();
+        grow(n, val);
+    }
+
+    iterator push_back()
+    {
+        return grow(1);
+    }
+    iterator push_back(const T& val)
+    {
+        vector_base::push_back(val);
+        return vector_base::end() - 1;
+    }
+    iterator push_back(const DynArray& other)
+    {
+        return insert(end(), other.begin(), other.end());
+    }
+
+    iterator insert_raw(iterator pos, size_type count = 1)
+    {
+        // Grow array, return iterator to inserted raw elems.
+        assert(pos >= begin() && pos <= end());
+        vector_base::insert(pos, count, T());
+        return pos;
+    }
+
+    iterator insert(iterator it, const T& val)
+    {
+        vector_base::insert(it, 1, val);
+        return it;
+    }
+    iterator insert(iterator it, size_type count, const T& val)
+    {
+        vector_base::insert(it, count, val);
+        return it;
+    }
+    iterator insert(iterator it, const_iterator start, const_iterator finish)
+    {
+        vector_base::insert(it, start, finish);
+        return it;
+    }
+
+    iterator insert(size_type pos)
+    {
+        return insert_raw(begin() + pos);
+    }
+    iterator insert(size_type pos, const T& val)
+    {
+        iterator it = insert_raw(begin() + pos);
+        *it = val;
+        return it;
+    }
+
+    void pop_back(size_type count = 1, [[maybe_unused]] bool allow_slack = true)
+    {
+        // Destroy erased elems, change size without reallocing.
+        assert(count >= 0 && count <= size());
+        for (size_type idx = 0; idx < count; ++idx)
+        {
+            vector_base::pop_back();
+        }
+    }
+
+    iterator erase(iterator pos)
+    {
+        return vector_base::erase(pos);
+    }
+
+    iterator erase(iterator start, iterator finish)
+    {
+        AZ_Assert(start >= begin() && finish >= start && finish <= end(), "DynArray: Erasure range out of bounds");
+
+        // Copy over erased elems, destroy those at end.
+        iterator it = start, e = end();
+        while (finish < e)
+        {
+            *it++ = *finish++;
+        }
+        pop_back(check_cast<size_type>(finish - it));
+        return it;
+    }
+
+    iterator erase(size_type pos, size_type count = 1)
+    {
+        return erase(begin() + pos, begin() + pos + count);
+    }
+
+    void clear()
+    {
+        vector_base::clear();
+        vector_base::shrink_to_fit();
+    }
+};
+
+//---------------------------------------------------------------------------
+// Original Cry DynArray
+//---------------------------------------------------------------------------
+template< class T, class I = int, class STORE = NArray::SmallDynStorage<> >
+struct LegacyDynArray
+    : Array< T, I, STORE >
+{
+    typedef LegacyDynArray<T, I, STORE> self_type;
+    typedef Array<T, I, STORE> super_type;
+    typedef typename STORE::template Store<T, I> S;
+
+    // Tedious redundancy for GCC.
+    using_type(super_type, size_type);
+    using_type(super_type, iterator);
+    using_type(super_type, const_iterator);
+    using_type(super_type, array);
+    using_type(super_type, const_array);
+
+    using super_type::size;
+    using super_type::capacity;
+    using super_type::begin;
+    using super_type::end;
+    using super_type::at;
+    using super_type::copy;
+    using super_type::init;
+    using super_type::destroy;
+
+    //
+    // Construction.
+    //
+    LegacyDynArray()
+    {}
+
+    LegacyDynArray(size_type count)
+    {
+        grow(count);
+    }
+    LegacyDynArray(size_type count, const T& val)
+    {
+        grow(count, val);
+    }
+
+#if !defined(_DISALLOW_INITIALIZER_LISTS)
+    // Initializer-list
+    LegacyDynArray(std::initializer_list<T> l)
+    {
+        push_back(Array<const T, I>(l.begin(), l.size()));
+    }
+#endif
+
+    // Copying from a generic array type.
+    LegacyDynArray(const_array a)
+    {
+        push_back(a);
+    }
+    self_type& operator =(const_array a)
+    {
+        if (a.begin() >= begin() && a.end() <= end())
+        {
+            // Assigning from (partial) self; remove undesired elements.
+            erase((T*)a.end(), end());
+            erase(begin(), (T*)a.begin());
+        }
+        else
+        {
+            // Assert no overlap.
+            assert(a.end() <= begin() || a.begin() >= end());
+            if (a.size() == size())
+            {
+                // If same size, perform element copy.
+                copy(a);
+            }
+            else
+            {
+                // If different sizes, destroy then copy init elements.
+                pop_back(size());
+                push_back(a);
+            }
+        }
+        return *this;
+    }
+
+    // Copy init/assign.
+    inline LegacyDynArray(const self_type& a)
+    {
+        push_back(a());
+    }
+    inline self_type& operator =(const self_type& a)
+    {
+        return *this = a();
+    }
+
+    // Init/assign from basic storage type.
+    inline LegacyDynArray(const S& a)
+    {
+        push_back(const_array(a.begin(), a.size()));
+    }
+    inline self_type& operator =(const S& a)
+    {
+        return *this = const_array(a.begin(), a.size());
+    }
+
+    inline ~LegacyDynArray()
+    {
+        destroy();
+        S::resize_raw(0);
+    }
+
+    void swap(self_type& a)
+    {
+        // Swap storage structures, no element copying
+        S temp = static_cast<S&>(*this);
+        static_cast<S&>(*this) = static_cast<S&>(a);
+        static_cast<S&>(a) = temp;
+    }
+
+    inline size_type available() const
+    {
+        return capacity() - size();
+    }
+
+    //
+    // Allocation modifiers.
+    //
+
+    void reserve(size_type count)
+    {
+        if (count > capacity())
+        {
+            I s = size();
+            S::resize_raw(count, false);
+            S::resize_raw(s, true);
+        }
+    }
+
+    // Grow array, return iterator to new raw elems.
+    iterator grow_raw(size_type count = 1, bool allow_slack = true)
+    {
+        S::resize_raw(size() + count, allow_slack);
+        return end() - count;
+    }
+    Array<T, I> append_raw(size_type count = 1, bool allow_slack = true)
+    {
+        return Array<T, I>(grow_raw(count, allow_slack), count);
+    }
+
+    iterator grow(size_type count)
+    {
+        return append_raw(count).init();
+    }
+    iterator grow(size_type count, const T& val)
+    {
+        return append_raw(count).init(val);
+    }
+
+    void shrink()
+    {
+        // Realloc memory to exact array size.
+        S::resize_raw(size());
+    }
+
+    void resize(size_type new_size)
+    {
+        size_type s = size();
+        if (new_size > s)
+        {
+            append_raw(new_size - s, false).init();
+        }
+        else
+        {
+            pop_back(s - new_size, false);
+        }
+    }
+    void resize(size_type new_size, const T& val)
+    {
+        size_type s = size();
+        if (new_size > s)
+        {
+            append_raw(new_size - s, false).init(val);
+        }
+        else
+        {
+            pop_back(s - new_size, false);
+        }
+    }
+
+    void assign(size_type n, const T& val)
+    {
+        resize(n);
+        fill(val);
+    }
+
+    void assign(const_iterator start, const_iterator finish)
+    {
+        *this = const_array(start, finish);
+    }
+
+    iterator push_back()
+    {
+        return grow(1);
+    }
+    iterator push_back(const T& val)
+    {
+        return grow(1, val);
+    }
+    iterator push_back(const_array a)
+    {
+        return append_raw(a.size(), false).init(a);
+    }
+
+    array insert_raw(iterator pos, size_type count = 1)
+    {
+        // Grow array, return iterator to inserted raw elems.
+        assert(pos >= begin() && pos <= end());
+        size_t i = pos - begin();
+        append_raw(count);
+        (*this)(i + count).move_init((*this)(i));
+        return (*this)(i, count);
+    }
+
+    iterator insert(iterator it, const T& val)
+    {
+        return insert_raw(it, 1).init(val);
+    }
+    iterator insert(iterator it, size_type count, const T& val)
+    {
+        return insert_raw(it, count).init(val);
+    }
+    iterator insert(iterator it, const_iterator start, const_iterator finish)
+    {
+        return insert(it, const_array(start, finish));
+    }
+    iterator insert(iterator it, const_array a)
+    {
+        return insert_raw(it, a.size()).init(a);
+    }
+
+    iterator insert(size_type pos)
+    {
+        return insert_raw(&at(pos)).init();
+    }
+    iterator insert(size_type pos, const T& val)
+    {
+        return insert_raw(&at(pos)).init(val);
+    }
+    iterator insert(size_type pos, const_array a)
+    {
+        return insert_raw(&at(pos), a.size()).init(a);
+    }
+
+    void pop_back(size_type count = 1, bool allow_slack = true)
+    {
+        // Destroy erased elems, change size without reallocing.
+        assert(count >= 0 && count <= size());
+        size_type new_size = size() - count;
+        (*this)(new_size).destroy();
+        S::resize_raw(new_size, allow_slack);
+    }
+
+    iterator erase(iterator start, iterator finish)
+    {
+        assert(start >= begin() && finish >= start && finish <= end());
+
+        // Copy over erased elems, destroy those at end.
+        iterator it = start, e = end();
+        while (finish < e)
+        {
+            *it++ = *finish++;
+        }
+        pop_back(check_cast<size_type>(finish - it));
+        return it;
+    }
+
+    iterator erase(iterator it)
+    {
+        return erase(it, it + 1);
+    }
+
+    iterator erase(size_type pos, size_type count = 1)
+    {
+        return erase(begin() + pos, begin() + pos + count);
+    }
+
+    void clear()
+    {
+        destroy();
+        S::resize_raw(0);
+    }
+};
+
+template<class T, int nSIZE, class I = int>
+struct StaticDynArray
+    : LegacyDynArray< T, I, NArray::StaticDynStorage<nSIZE> >
+{
+};
+
+
+
+    #include "CryPodArray.h"
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYARRAY_H
diff --git a/Code/Legacy/CryCommon/CryAssert.h b/Code/Legacy/CryCommon/CryAssert.h
new file mode 100644
index 0000000000..40e53934eb
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryAssert.h
@@ -0,0 +1,104 @@
+/*
+ * 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 : Assert dialog box
+
+#pragma once
+
+#include <AzCore/base.h>
+
+//-----------------------------------------------------------------------------------------------------
+// Just undef this if you want to use the standard assert function
+//-----------------------------------------------------------------------------------------------------
+
+// if AZ_ENABLE_TRACING is enabled, then calls to AZ_Assert(...) will flow in.  This is the case
+// even in Profile mode - thus if you want to manage what happens, USE_CRY_ASSERT also needs to be enabled in those cases.
+// if USE_CRY_ASSERT is not enabled, but AZ_ENABLE_TRACING is enabled, then the default behavior for assets will occur instead
+// which is to throw the DEBUG BREAK exception / signal, which tends to end with application shutdown.
+#if defined(AZ_ENABLE_TRACE_ASSERTS)
+#define USE_AZ_ASSERT
+#endif
+
+#if !defined (USE_AZ_ASSERT) && defined(AZ_ENABLE_TRACING)
+#undef USE_CRY_ASSERT
+#define USE_CRY_ASSERT
+#endif
+
+// you can undefine this.  It will cause the assert message box to appear anywhere that USE_CRY_ASSERT is enabled
+// instead of it only appearing in debug. 
+// if this is DEFINED then only in debug builds will you see the message box.  In other builds, CRY_ASSERTS become CryWarning instead of
+// instead (showing no message box, only a warning).
+#define CRY_ASSERT_DIALOG_ONLY_IN_DEBUG
+
+#if defined(FORCE_STANDARD_ASSERT) || defined(USE_AZ_ASSERT)
+#undef USE_CRY_ASSERT
+#undef CRY_ASSERT_DIALOG_ONLY_IN_DEBUG
+#endif
+
+// Using AZ_Assert for all assert kinds (assert =, CRY_ASSERT, AZ_Assert).
+// see Trace::Assert for implementation
+#if defined(USE_AZ_ASSERT)
+    #undef assert
+    #if !defined(NDEBUG)
+        #define assert(condition) AZ_Assert(condition, "%s", #condition)
+    #else
+        #define assert(condition)
+    #endif
+#endif //defined(USE_AZ_ASSERT)
+
+//-----------------------------------------------------------------------------------------------------
+// Use like this:
+// CRY_ASSERT(expression);
+// CRY_ASSERT_MESSAGE(expression,"Useful message");
+// CRY_ASSERT_TRACE(expression,("This should never happen because parameter n%d named %s is %f",iParameter,szParam,fValue));
+//-----------------------------------------------------------------------------------------------------
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(CryAssert_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(WIN32) || defined(APPLE) || defined(LINUX)
+    #define CRYASSERT_H_TRAIT_USE_CRY_ASSERT_MESSAGE 1
+#endif
+
+#if defined(USE_CRY_ASSERT) && CRYASSERT_H_TRAIT_USE_CRY_ASSERT_MESSAGE
+void CryAssertTrace(const char*, ...);
+bool CryAssert(const char*, const char*, unsigned int, bool*);
+void CryDebugBreak();
+
+    #define CRY_ASSERT(condition) CRY_ASSERT_MESSAGE(condition, NULL)
+
+    #define CRY_ASSERT_MESSAGE(condition, message) CRY_ASSERT_TRACE(condition, (message))
+
+    #define CRY_ASSERT_TRACE(condition, parenthese_message)                  \
+    do                                                                       \
+    {                                                                        \
+        static bool s_bIgnoreAssert = false;                                 \
+        if (!s_bIgnoreAssert && !(condition))                                \
+        {                                                                    \
+            CryAssertTrace parenthese_message;                               \
+            if (CryAssert(#condition, __FILE__, __LINE__, &s_bIgnoreAssert)) \
+            {                                                                \
+                DEBUG_BREAK;                                                 \
+            }                                                                \
+        }                                                                    \
+    } while (0)
+
+    #undef assert
+    #define assert CRY_ASSERT
+#elif !defined(CRY_ASSERT)
+#ifndef USE_AZ_ASSERT
+    #include <assert.h>
+#endif //USE_AZ_ASSERT
+    #define CRY_ASSERT(condition) assert(condition)
+    #define CRY_ASSERT_MESSAGE(condition, message) assert(condition)
+    #define CRY_ASSERT_TRACE(condition, parenthese_message) assert(condition)
+#endif
+
+//-----------------------------------------------------------------------------------------------------
diff --git a/Code/Legacy/CryCommon/CryAssert_Android.h b/Code/Legacy/CryCommon/CryAssert_Android.h
new file mode 100644
index 0000000000..f740712adc
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryAssert_Android.h
@@ -0,0 +1,100 @@
+/*
+ * 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 : Assert dialog box for android
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYASSERT_ANDROID_H
+#define CRYINCLUDE_CRYCOMMON_CRYASSERT_ANDROID_H
+#pragma once
+
+#if defined(USE_CRY_ASSERT) && defined(ANDROID)
+
+#include <AzCore/NativeUI/NativeUIRequests.h>
+
+static char gs_szMessage[MAX_PATH];
+
+void CryAssertTrace(const char* szFormat, ...)
+{
+    if (gEnv == 0)
+    {
+        return;
+    }
+
+    if (!gEnv->bIgnoreAllAsserts)
+    {
+        if (szFormat == NULL)
+        {
+            gs_szMessage[0] = '\0';
+        }
+        else
+        {
+            va_list args;
+            va_start(args, szFormat);
+            vsnprintf(gs_szMessage, sizeof(gs_szMessage), szFormat, args);
+            va_end(args);
+        }
+    }
+}
+
+bool CryAssert(const char* szCondition, const char* szFile, unsigned int line, bool* pIgnore)
+{
+    if (!gEnv)
+    {
+        return true;
+    }
+
+#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
+    // we are in a non-debug build, so we should turn this into a warning instead.
+    if ((gEnv) && (gEnv->pLog))
+    {
+        if (!gEnv->bIgnoreAllAsserts)
+        {
+            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", szFile, line, szCondition);
+        }
+    }
+    
+    if (pIgnore)
+    {
+        // avoid showing the same one repeatedly.
+        *pIgnore = true;
+    }
+    return false;
+#endif
+
+    gEnv->pSystem->OnAssert(szCondition, gs_szMessage, szFile, line);
+
+    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
+    {
+        AZ::NativeUI::AssertAction result;
+        EBUS_EVENT_RESULT(result, AZ::NativeUI::NativeUIRequestBus, DisplayAssertDialog, gs_szMessage);
+
+        switch (result)
+        {
+        case AZ::NativeUI::AssertAction::IGNORE_ASSERT:
+            return false;
+        case AZ::NativeUI::AssertAction::IGNORE_ALL_ASSERTS:
+            gEnv->bNoAssertDialog = true;
+            gEnv->bIgnoreAllAsserts = true;
+            return false;
+        case AZ::NativeUI::AssertAction::BREAK:
+            return true;
+        default:
+            break;
+        }
+        
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+#endif
+#endif // CRYINCLUDE_CRYCOMMON_CRYASSERT_ANDROID_H
diff --git a/Code/Legacy/CryCommon/CryAssert_Linux.h b/Code/Legacy/CryCommon/CryAssert_Linux.h
new file mode 100644
index 0000000000..445fc8a6cf
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryAssert_Linux.h
@@ -0,0 +1,131 @@
+/*
+ * 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 :
+//     Assert dialog box for LINUX. The linux assert dialog is based on a
+//     small ncurses application which writes the choice to a file. This
+//     was chosen since there is no default UI system on Linux. X11 wasn't
+//     used due to the possibility of the system running another display
+//     protocol (e.g.: WayLand, Mir)
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYASSERT_LINUX_H
+#define CRYINCLUDE_CRYCOMMON_CRYASSERT_LINUX_H
+#pragma once
+
+#if defined(USE_CRY_ASSERT) && defined(LINUX) && !defined(ANDROID)
+
+static char gs_szMessage[MAX_PATH];
+
+void CryAssertTrace(const char* szFormat, ...)
+{
+    if (gEnv == 0)
+    {
+        return;
+    }
+
+    if (!gEnv->bIgnoreAllAsserts)
+    {
+        if (szFormat == NULL)
+        {
+            gs_szMessage[0] = '\0';
+        }
+        else
+        {
+            va_list args;
+            va_start(args, szFormat);
+            vsnprintf(gs_szMessage, sizeof(gs_szMessage), szFormat, args);
+            va_end(args);
+        }
+    }
+}
+
+bool CryAssert(const char* szCondition, const char* szFile, unsigned int line, bool* pIgnore)
+{
+    if (!gEnv)
+    {
+        return false;
+    }
+
+#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
+    // we are in a non-debug build, so we should turn this into a warning instead.
+    if (gEnv->pLog)
+    {
+        if (!gEnv->bIgnoreAllAsserts)
+        {
+            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", szFile, line, szCondition);
+        }
+    }
+    if (pIgnore)
+    {
+        // avoid showing the same one repeatedly.
+        *pIgnore = true;
+    }
+    return false;
+#endif
+
+    static const int max_len = 4096;
+    static char gs_command_str[4096];
+    static CryLockT<CRYLOCK_RECURSIVE> lock;
+
+    gEnv->pSystem->OnAssert(szCondition, gs_szMessage, szFile, line);
+
+    size_t file_len = strlen(szFile);
+
+    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
+    {
+        CryAutoLock< CryLockT<CRYLOCK_RECURSIVE> > lk (lock);
+        snprintf(gs_command_str, max_len, "xterm -geometry 100x20 -n 'Assert Dialog [Linux Launcher]' -T 'Assert Dialog [Linux Launcher]' -e 'BinLinux/assert_term \"%s\" \"%s\" %d \"%s\"; echo \"$?\" > .assert_return'",
+            szCondition, (file_len > 60) ? szFile + (file_len - 61) : szFile, line, gs_szMessage);
+        int ret = system(gs_command_str);
+        if (ret != 0)
+        {
+            CryLogAlways("<Assert> Terminal failed to execute");
+            return false;
+        }
+
+        FILE* assert_file = fopen(".assert_return", "r");
+        if (!assert_file)
+        {
+            CryLogAlways("<Assert> Couldn't open assert file");
+            return false;
+        }
+        int result = -1;
+        fscanf(assert_file, "%d", &result);
+        fclose(assert_file);
+
+        switch (result)
+        {
+        case 0:
+            break;
+        case 1:
+            *pIgnore = true;
+            break;
+        case 2:
+            gEnv->bIgnoreAllAsserts = true;
+            break;
+        case 3:
+            return true;
+            break;
+        case 4:
+            raise(SIGABRT);
+            exit(-1);
+            break;
+        default:
+            CryLogAlways("<Assert> Unknown result in assert file: %d", result);
+            return false;
+        }
+    }
+
+
+    return false;
+}
+
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYASSERT_LINUX_H
diff --git a/Code/Legacy/CryCommon/CryAssert_Mac.h b/Code/Legacy/CryCommon/CryAssert_Mac.h
new file mode 100644
index 0000000000..43894d2f05
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryAssert_Mac.h
@@ -0,0 +1,108 @@
+/*
+ * 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 : Assert dialog box for Mac OS X
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYASSERT_MAC_H
+#define CRYINCLUDE_CRYCOMMON_CRYASSERT_MAC_H
+#pragma once
+
+#if defined(USE_CRY_ASSERT) && defined(MAC)
+#include <AzCore/NativeUI/NativeUIRequests.h>
+
+static char gs_szMessage[MAX_PATH];
+
+void CryAssertTrace(const char* szFormat, ...)
+{
+    if (gEnv == 0)
+    {
+        return;
+    }
+
+    if (!gEnv->bIgnoreAllAsserts)
+    {
+        if (szFormat == NULL)
+        {
+            gs_szMessage[0] = '\0';
+        }
+        else
+        {
+            va_list args;
+            va_start(args, szFormat);
+            vsnprintf(gs_szMessage, sizeof(gs_szMessage), szFormat, args);
+            va_end(args);
+        }
+    }
+}
+
+bool CryAssert(const char* szCondition, const char* szFile, unsigned int line, bool* pIgnore)
+{
+    if (!gEnv)
+    {
+        return false;
+    }
+
+#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
+    // we are in a non-debug build, so we should turn this into a warning instead.
+    if ((gEnv) && (gEnv->pLog))
+    {
+        if (!gEnv->bIgnoreAllAsserts)
+        {
+            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", szFile, line, szCondition);
+        }
+    }
+    
+    if (pIgnore)
+    {
+        // avoid showing the same one repeatedly.
+        *pIgnore = true;
+    }
+    return false;
+#endif
+
+    static const int max_len = 4096;
+    static char gs_command_str[4096];
+
+    static CryLockT<CRYLOCK_RECURSIVE> lock;
+
+    gEnv->pSystem->OnAssert(szCondition, gs_szMessage, szFile, line);
+
+    size_t file_len = strlen(szFile);
+
+    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
+    {
+        AZ::NativeUI::AssertAction result;
+        EBUS_EVENT_RESULT(result, AZ::NativeUI::NativeUIRequestBus, DisplayAssertDialog, gs_szMessage);
+        
+        switch(result)
+        {
+            case AZ::NativeUI::AssertAction::IGNORE_ASSERT:
+                return false;
+            case AZ::NativeUI::AssertAction::IGNORE_ALL_ASSERTS:
+                gEnv->bNoAssertDialog = true;
+                gEnv->bIgnoreAllAsserts = true;
+                return false;
+            case AZ::NativeUI::AssertAction::BREAK:
+                return true;
+            default:
+                break;
+        }
+        
+        // For asserts on the Mac always trigger a debug break. Annoying but at least it does not kill the thread like assert() does.
+        __asm__("int $3");
+    }
+
+
+    return false;
+}
+
+
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYASSERT_MAC_H
diff --git a/Code/Legacy/CryCommon/CryAssert_iOS.h b/Code/Legacy/CryCommon/CryAssert_iOS.h
new file mode 100644
index 0000000000..40e52b1ee6
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryAssert_iOS.h
@@ -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
+ *
+ */
+
+
+// Description : Assert dialog box for Mac OS X
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYASSERT_IOS_H
+#define CRYINCLUDE_CRYCOMMON_CRYASSERT_IOS_H
+#pragma once
+
+#if defined(USE_CRY_ASSERT) && (defined(IOS)
+
+#include <AzCore/NativeUI/NativeUIRequests.h>
+
+static char gs_szMessage[MAX_PATH];
+
+void CryAssertTrace(const char* szFormat, ...)
+{
+    if (gEnv == 0)
+    {
+        return;
+    }
+
+    if (!gEnv->bIgnoreAllAsserts)
+    {
+        if (szFormat == NULL)
+        {
+            gs_szMessage[0] = '\0';
+        }
+        else
+        {
+            va_list args;
+            va_start(args, szFormat);
+            vsnprintf(gs_szMessage, sizeof(gs_szMessage), szFormat, args);
+            va_end(args);
+        }
+    }
+}
+
+bool CryAssert(const char* szCondition, const char* szFile, unsigned int line, bool* pIgnore)
+{
+    if (!gEnv)
+    {
+        return false;
+    }
+
+#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
+    // we are in a non-debug build, so we should turn this into a warning instead.
+    if ((gEnv) && (gEnv->pLog))
+    {
+        if (!gEnv->bIgnoreAllAsserts)
+        {
+            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", szFile, line, szCondition);
+        }
+    }
+    
+    if (pIgnore)
+    {
+        // avoid showing the same one repeatedly.
+        *pIgnore = true;
+    }
+    return false;
+#endif
+
+    gEnv->pSystem->OnAssert(szCondition, gs_szMessage, szFile, line);
+    
+    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
+    {
+        printf("!!ASSERT!!\n\tCondition: %s\n\tMessage  : %s\n\tFile     : %s\n\tLine     : %d", szCondition, gs_szMessage, szFile, line);
+
+        AZ::NativeUI::AssertAction result;
+        EBUS_EVENT_RESULT(result, AZ::NativeUI::NativeUIRequestBus, DisplayAssertDialog, gs_szMessage);
+        
+        switch(result)
+        {
+        case AZ::NativeUI::AssertAction::IGNORE_ASSERT:
+            return false;
+        case AZ::NativeUI::AssertAction::IGNORE_ALL_ASSERTS:
+            gEnv->bNoAssertDialog = true;
+            gEnv->bIgnoreAllAsserts = true;
+            return false;
+        case AZ::NativeUI::AssertAction::BREAK:
+            return true;
+        default:
+            break;
+        }
+    }
+    return false;
+}
+
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYASSERT_IOS_H
diff --git a/Code/Legacy/CryCommon/CryAssert_impl.h b/Code/Legacy/CryCommon/CryAssert_impl.h
new file mode 100644
index 0000000000..9aa2f25e46
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryAssert_impl.h
@@ -0,0 +1,468 @@
+/*
+ * 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 : Assert dialog box
+
+#pragma once
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define CRYASSERT_IMPL_H_SECTION_1 1
+#define CRYASSERT_IMPL_H_SECTION_2 2
+#endif
+
+#if defined(USE_CRY_ASSERT)
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYASSERT_IMPL_H_SECTION_1
+    #include AZ_RESTRICTED_FILE(CryAssert_impl_h)
+#endif
+
+#if defined(APPLE)
+#if defined(MAC)
+#include "CryAssert_Mac.h"
+#else
+#include "CryAssert_iOS.h"
+#endif
+#endif
+
+#if defined(LINUX)
+#if defined(ANDROID)
+#include "CryAssert_Android.h"
+#else
+#include "CryAssert_Linux.h"
+#endif
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYASSERT_IMPL_H_SECTION_2
+    #include AZ_RESTRICTED_FILE(CryAssert_impl_h)
+#elif defined(WIN32)
+
+//-----------------------------------------------------------------------------------------------------
+
+#include <signal.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+//-----------------------------------------------------------------------------------------------------
+
+#define IDD_DIALOG_ASSERT           101
+#define IDC_CRYASSERT_EDIT_LINE                 1000
+#define IDC_CRYASSERT_EDIT_FILE                 1001
+#define IDC_CRYASSERT_EDIT_CONDITION        1002
+#define IDC_CRYASSERT_BUTTON_CONTINUE       1003
+#define IDC_CRYASSERT_EDIT_REASON               1004
+#define IDC_CRYASSERT_BUTTON_IGNORE         1005
+#define IDC_CRYASSERT_BUTTON_STOP               1007
+#define IDC_CRYASSERT_BUTTON_BREAK          1008
+#define IDC_CRYASSERT_BUTTON_IGNORE_ALL 1009
+
+#define IDC_CRYASSERT_STATIC_TEXT 0
+
+#define DLG_TITLE                   L"Assertion Failed"
+#define DLG_FONT                    L"MS Sans Serif"
+#define DLG_ITEM_TEXT_0     L"Continue"
+#define DLG_ITEM_TEXT_1     L"Stop"
+#define DLG_ITEM_TEXT_2     L"Info"
+#define DLG_ITEM_TEXT_3     L""
+#define DLG_ITEM_TEXT_4     L"Line"
+#define DLG_ITEM_TEXT_5     L""
+#define DLG_ITEM_TEXT_6     L"File"
+#define DLG_ITEM_TEXT_7     L"Condition"
+#define DLG_ITEM_TEXT_8     L""
+#define DLG_ITEM_TEXT_9     L"failed"
+#define DLG_ITEM_TEXT_10    L""
+#define DLG_ITEM_TEXT_11    L"Reason"
+#define DLG_ITEM_TEXT_12    L"Ignore"
+
+#define DLG_ITEM_TEXT_14    L"Break"
+#define DLG_ITEM_TEXT_15    L"Ignore All"
+
+#define DLG_NB_ITEM   15
+
+
+template<int iTitleSize>
+struct SDlgItem
+{
+    // If use my struct instead of DLGTEMPLATE, or else (for some strange reason) it is not DWORD aligned !!
+    DWORD style;
+    DWORD dwExtendedStyle;
+    short x;
+    short y;
+    short cx;
+    short cy;
+    WORD id;
+    WORD ch;
+    WORD c;
+    WCHAR t[iTitleSize];
+    WORD dummy;
+};
+#define SDLGITEM(TEXT, V) SDlgItem<sizeof(TEXT) / 2> V;
+
+struct SDlgData
+{
+    DLGTEMPLATE dlt;
+    WORD _menu;
+    WORD _class;
+    WCHAR _title[sizeof(DLG_TITLE) / 2];
+    WORD pointSize;
+    WCHAR _font[sizeof(DLG_FONT) / 2];
+
+    SDLGITEM(DLG_ITEM_TEXT_0,   i0);
+    SDLGITEM(DLG_ITEM_TEXT_12, i12);
+    SDLGITEM(DLG_ITEM_TEXT_15, i15);
+    SDLGITEM(DLG_ITEM_TEXT_14, i14);
+    SDLGITEM(DLG_ITEM_TEXT_1,   i1);
+    SDLGITEM(DLG_ITEM_TEXT_2,   i2);
+    SDLGITEM(DLG_ITEM_TEXT_3,   i3);
+    SDLGITEM(DLG_ITEM_TEXT_4,   i4);
+    SDLGITEM(DLG_ITEM_TEXT_5,   i5);
+    SDLGITEM(DLG_ITEM_TEXT_6,   i6);
+    SDLGITEM(DLG_ITEM_TEXT_7,   i7);
+    SDLGITEM(DLG_ITEM_TEXT_8,   i8);
+    SDLGITEM(DLG_ITEM_TEXT_9,   i9);
+    SDLGITEM(DLG_ITEM_TEXT_10, i10);
+    SDLGITEM(DLG_ITEM_TEXT_11, i11);
+};
+
+//-----------------------------------------------------------------------------------------------------
+
+static SDlgData g_dialogRC =
+{
+    {DS_SETFOREGROUND | DS_MODALFRAME | DS_3DLOOK | DS_SETFONT | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE, 0, DLG_NB_ITEM, 0, 0, 330, 134}, 0, 0, DLG_TITLE, 8, DLG_FONT,
+    {BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                      0,  12, 113, 50, 14, IDC_CRYASSERT_BUTTON_CONTINUE,  0xFFFF, 0x0080, DLG_ITEM_TEXT_0,  0},
+    {BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                   0,  66, 113, 50, 14, IDC_CRYASSERT_BUTTON_IGNORE,        0xFFFF, 0x0080, DLG_ITEM_TEXT_12, 0},
+    {BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                      0,  120, 113, 50, 14, IDC_CRYASSERT_BUTTON_IGNORE_ALL, 0xFFFF, 0x0080, DLG_ITEM_TEXT_15, 0},
+    {BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                      0,  214, 113, 50, 14, IDC_CRYASSERT_BUTTON_BREAK,         0xFFFF, 0x0080, DLG_ITEM_TEXT_14, 0},
+    {BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP,                                      0,  268, 113, 50, 14, IDC_CRYASSERT_BUTTON_STOP,          0xFFFF, 0x0080, DLG_ITEM_TEXT_1,  0},
+    {BS_GROUPBOX | WS_CHILD | WS_VISIBLE,                                                                   0,  7,  7,  316, 100, IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0080, DLG_ITEM_TEXT_2,  0},
+    {ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_CHILD | WS_VISIBLE, 0,    50, 48, 25, 13, IDC_CRYASSERT_EDIT_LINE,                0xFFFF, 0x0081, DLG_ITEM_TEXT_3,  0},
+    {WS_CHILD | WS_VISIBLE,                                                                                           0,  14, 50, 14, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_4,  0},
+    {ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_CHILD | WS_VISIBLE, 0,    50, 32, 240, 13, IDC_CRYASSERT_EDIT_FILE,                0xFFFF, 0x0081, DLG_ITEM_TEXT_5,  0},
+    {WS_CHILD | WS_VISIBLE,                                                                                           0,  14, 34, 12, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_6,  0},
+    {WS_CHILD | WS_VISIBLE,                                                                                           0,  13, 18, 30, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_7,  0},
+    {ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_CHILD | WS_VISIBLE, 0,    50, 16, 240, 13, IDC_CRYASSERT_EDIT_CONDITION,       0xFFFF, 0x0081, DLG_ITEM_TEXT_8,  0},
+    {WS_CHILD | WS_VISIBLE,                                                                                           0,  298, 19, 18, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_9,  0},
+    {ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_CHILD | WS_VISIBLE, 0,    50, 67, 240, 13, IDC_CRYASSERT_EDIT_REASON,          0xFFFF, 0x0081, DLG_ITEM_TEXT_10, 0},
+    {WS_CHILD | WS_VISIBLE,                                                                                           0,  15, 69, 26, 8,  IDC_CRYASSERT_STATIC_TEXT,          0xFFFF, 0x0082, DLG_ITEM_TEXT_11, 0},
+};
+
+//-----------------------------------------------------------------------------------------------------
+
+struct SCryAssertInfo
+{
+    const char* pszCondition;
+    const char* pszFile;
+    const char* pszMessage;
+
+    unsigned int uiLine;
+
+    enum
+    {
+        BUTTON_CONTINUE,
+        BUTTON_IGNORE,
+        BUTTON_IGNORE_ALL,
+        BUTTON_BREAK,
+        BUTTON_STOP,
+        BUTTON_REPORT_AS_BUG,
+    } btnChosen;
+
+    unsigned int uiX;
+    unsigned int uiY;
+};
+
+//-----------------------------------------------------------------------------------------------------
+
+static INT_PTR CALLBACK DlgProc(HWND _hDlg, UINT _uiMsg, WPARAM _wParam, LPARAM _lParam)
+{
+    static SCryAssertInfo* pAssertInfo = NULL;
+
+    const UINT WM_USER_SHOWFILE_MESSAGE = (WM_USER + 0x4000);
+
+    switch (_uiMsg)
+    {
+    case WM_INITDIALOG:
+    {
+        pAssertInfo = (SCryAssertInfo*) _lParam;
+
+        SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_CONDITION),   pAssertInfo->pszCondition);
+        SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_FILE),            pAssertInfo->pszFile);
+
+        // Want to move the cursor on the file text, so that the end of the file is the first thing visible,
+        // instead of the beginning, which will be the user's depot, and the same for pretty much every file.
+        // Have to do this delayed, because if it's done in WM_INITDIALOG, it doesn't work.
+        // PostMessage will add this to the end of the message queue.
+        PostMessage(_hDlg, WM_USER_SHOWFILE_MESSAGE, 0, 0);
+
+        char szLine[MAX_PATH];
+        sprintf_s(szLine, "%d", pAssertInfo->uiLine);
+        SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_LINE), szLine);
+
+        if (pAssertInfo->pszMessage && pAssertInfo->pszMessage[0] != '\0')
+        {
+            SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_REASON), pAssertInfo->pszMessage);
+        }
+        else
+        {
+            SetWindowText(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_REASON), "No Reason");
+        }
+
+        SetWindowPos(_hDlg, HWND_TOPMOST, pAssertInfo->uiX, pAssertInfo->uiY, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
+
+        break;
+    }
+
+    case WM_USER_SHOWFILE_MESSAGE:
+    {
+        // Still have to delay sending this message, or it won't work for some reason.
+        // Windows does a whole bunch of stuff behind the scenes. Using PostMessage here seems to work better.
+        PostMessage(GetDlgItem(_hDlg, IDC_CRYASSERT_EDIT_FILE), EM_SETSEL, strlen(pAssertInfo->pszFile), -1);
+        break;
+    }
+
+    case WM_COMMAND:
+    {
+        switch (LOWORD(_wParam))
+        {
+        case IDCANCEL:
+        case IDC_CRYASSERT_BUTTON_CONTINUE:
+        {
+            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_CONTINUE;
+            EndDialog(_hDlg, 0);
+            break;
+        }
+        case IDC_CRYASSERT_BUTTON_IGNORE:
+        {
+            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_IGNORE;
+            EndDialog(_hDlg, 0);
+            break;
+        }
+        case IDC_CRYASSERT_BUTTON_IGNORE_ALL:
+        {
+            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_IGNORE_ALL;
+            EndDialog(_hDlg, 0);
+            break;
+        }
+        case IDC_CRYASSERT_BUTTON_BREAK:
+        {
+            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_BREAK;
+            EndDialog(_hDlg, 0);
+            break;
+        }
+        case IDC_CRYASSERT_BUTTON_STOP:
+        {
+            pAssertInfo->btnChosen = SCryAssertInfo::BUTTON_STOP;
+            EndDialog(_hDlg, 1);
+            break;
+        }
+        default:
+            break;
+        }
+        ;
+        break;
+    }
+
+    case WM_DESTROY:
+    {
+        if (pAssertInfo)
+        {
+            RECT rcWindowBounds;
+            GetWindowRect(_hDlg, &rcWindowBounds);
+            pAssertInfo->uiX = rcWindowBounds.left;
+            pAssertInfo->uiY = rcWindowBounds.top;
+        }
+        break;
+    }
+
+    default:
+        return FALSE;
+    }
+    ;
+
+    return TRUE;
+}
+
+//-----------------------------------------------------------------------------------------------------
+
+static char gs_szMessage[MAX_PATH];
+
+//-----------------------------------------------------------------------------------------------------
+
+void CryAssertTrace(const char* _pszFormat, ...)
+{
+    if (gEnv == 0)
+    {
+        return;
+    }
+    if (!gEnv->bIgnoreAllAsserts)
+    {
+        if (NULL == _pszFormat)
+        {
+            gs_szMessage[0] = '\0';
+        }
+        else
+        {
+            va_list args;
+            va_start(args, _pszFormat);
+            vsnprintf_s(gs_szMessage, sizeof(gs_szMessage), _TRUNCATE, _pszFormat, args);
+            va_end(args);
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------------------------------
+
+static const char* gs_strRegSubKey  = "Software\\O3DE\\AssertWindow";
+static const char* gs_strRegXValue  = "AssertInfoX";
+static const char* gs_strRegYValue  = "AssertInfoY";
+
+//-----------------------------------------------------------------------------------------------------
+
+void RegistryReadUInt32(const char* _strSubKey, const char* _strRegName, unsigned int* _puiValue, unsigned int _uiDefault)
+{
+    HKEY hKey;
+    RegCreateKeyEx(HKEY_CURRENT_USER, _strSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL);
+
+    DWORD dwType;
+    DWORD dwLength = sizeof(DWORD);
+
+    if (ERROR_SUCCESS != RegQueryValueEx(hKey, _strRegName, 0, &dwType, (BYTE*) _puiValue, &dwLength))
+    {
+        *_puiValue = _uiDefault;
+    }
+
+    RegCloseKey(hKey);
+}
+
+//-----------------------------------------------------------------------------------------------------
+
+void RegistryWriteUInt32(const char* _strSubKey, const char* _strRegName, unsigned int _uiValue)
+{
+    HKEY hKey;
+    RegCreateKeyEx(HKEY_CURRENT_USER, _strSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL);
+    RegSetValueEx   (hKey, _strRegName, 0, REG_DWORD, (BYTE*) &_uiValue, sizeof(DWORD));
+    RegCloseKey     (hKey);
+}
+
+//-----------------------------------------------------------------------------------------------------
+
+class CCursorShowerWithStack
+{
+public:
+    void StoreCurrentAndShow()
+    {
+        m_numberOfShows = 1;
+
+        while (ShowCursor(TRUE) < 0)
+        {
+            ++m_numberOfShows;
+        }
+    }
+
+    void RevertToPrevious()
+    {
+        while (m_numberOfShows > 0)
+        {
+            ShowCursor(FALSE);
+            --m_numberOfShows;
+        }
+    }
+
+private:
+    int m_numberOfShows;
+};
+
+bool CryAssert(const char* _pszCondition, const char* _pszFile, unsigned int _uiLine, bool* _pbIgnore)
+{
+    if (!gEnv)
+    {
+        return false;
+    }
+
+#if defined(CRY_ASSERT_DIALOG_ONLY_IN_DEBUG) && !defined(AZ_DEBUG_BUILD)
+    // we are in a non-debug build, so we should turn this into a warning instead.
+    if ((gEnv) && (gEnv->pLog))
+    {
+        if (!gEnv->bIgnoreAllAsserts)
+        {
+            gEnv->pLog->LogWarning("%s(%u): Assertion failed - \"%s\"", _pszFile, _uiLine, _pszCondition);
+        }
+    }
+    
+    if (_pbIgnore)
+    {
+        // avoid showing the same one repeatedly.
+        *_pbIgnore = true;
+    }
+    return false;
+#endif
+
+    if (!gEnv->bNoAssertDialog && !gEnv->bIgnoreAllAsserts)
+    {
+        SCryAssertInfo assertInfo;
+
+        assertInfo.pszCondition = _pszCondition;
+        assertInfo.pszFile          = _pszFile;
+        assertInfo.pszMessage       = gs_szMessage;
+        assertInfo.uiLine               = _uiLine;
+        assertInfo.btnChosen        = SCryAssertInfo::BUTTON_CONTINUE;
+
+        gEnv->pSystem->SetAssertVisible(true);
+        RegistryReadUInt32(gs_strRegSubKey, gs_strRegXValue, &assertInfo.uiX, 10);
+        RegistryReadUInt32(gs_strRegSubKey, gs_strRegYValue, &assertInfo.uiY, 10);
+
+        CCursorShowerWithStack cursorShowerWithStack;
+        cursorShowerWithStack.StoreCurrentAndShow();
+
+        DialogBoxIndirectParam(GetModuleHandle(NULL), (DLGTEMPLATE*) &g_dialogRC, GetDesktopWindow(), DlgProc, (LPARAM) &assertInfo);
+
+        cursorShowerWithStack.RevertToPrevious();
+
+        RegistryWriteUInt32(gs_strRegSubKey, gs_strRegXValue, assertInfo.uiX);
+        RegistryWriteUInt32(gs_strRegSubKey, gs_strRegYValue, assertInfo.uiY);
+        gEnv->pSystem->SetAssertVisible(false);
+
+        switch (assertInfo.btnChosen)
+        {
+        case SCryAssertInfo::BUTTON_IGNORE:
+            *_pbIgnore = true;
+            break;
+        case SCryAssertInfo::BUTTON_IGNORE_ALL:
+            gEnv->bIgnoreAllAsserts = true;
+            break;
+        case SCryAssertInfo::BUTTON_BREAK:
+            return true;
+        case SCryAssertInfo::BUTTON_STOP:
+            raise(SIGABRT);
+            exit(-1);
+        case SCryAssertInfo::BUTTON_REPORT_AS_BUG:
+            if (gEnv && gEnv->pSystem)
+            {
+                const char* pszSafeMessage = (assertInfo.pszMessage && assertInfo.pszMessage[0]) ? assertInfo.pszMessage : "<no reason>";
+                gEnv->pSystem->ReportBug("Assert: %s - %s", assertInfo.pszCondition, pszSafeMessage);
+            }
+            break;
+        }
+    }
+    
+    if (gEnv && gEnv->pSystem)
+    {
+        // this also can cause fatal / shutdown behavior:
+        gEnv->pSystem->OnAssert(_pszCondition, gs_szMessage, _pszFile, _uiLine);
+    }
+
+    return false;
+}
+
+//-----------------------------------------------------------------------------------------------------
+
+#endif
+#endif
+
+//-----------------------------------------------------------------------------------------------------
diff --git a/Code/Legacy/CryCommon/CryCommon.cpp b/Code/Legacy/CryCommon/CryCommon.cpp
new file mode 100644
index 0000000000..36a41a73c9
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryCommon.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+
+//      This contains compiled code that is used by other projects in the solution.
+//      Because we don't want static DLL dependencies, the CryCommon project is not compiled into a library.
+//      Instead, this .cpp file is included in every project which needs it.
+//      But we also include it in the CryCommon project (disabled in the build),
+//      so that CryCommon can have the same editable settings as other projects.
+
+// Set this to 1 to get an output of some pre-defined compiler symbols.
+
+#if 0
+
+#ifdef _WIN32
+#pragma message("_WIN32")
+#endif
+#ifdef _WIN64
+#pragma message("_WIN64")
+#endif
+
+#ifdef _M_IX86
+#pragma message("_M_IX86")
+#endif
+#ifdef _M_PPC
+#pragma message("_M_PPC")
+#endif
+
+#ifdef _DEBUG
+#pragma message("_DEBUG")
+#endif
+
+#ifdef _DLL
+#pragma message("_DLL")
+#endif
+#ifdef _USRDLL
+#pragma message("_USRDLL")
+#endif
+#ifdef _MT
+#pragma message("_MT")
+#endif
+
+#endif
+
+#include <AzCore/PlatformIncl.h>
+
+#include "TypeInfo_impl.h"
diff --git a/Code/Legacy/CryCommon/CryCrc32.h b/Code/Legacy/CryCommon/CryCrc32.h
new file mode 100644
index 0000000000..3e76c94c17
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryCrc32.h
@@ -0,0 +1,209 @@
+/*
+ * 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 "BaseTypes.h"
+
+// CRC-32
+//
+// Polynomial:
+//   0x04C11DB7
+//   x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1
+//
+// Validation:
+//   CCrc32::Compute("123456789") == 0xCBF43926
+//
+// Examples of using:
+//
+//   printf("crc32: %08x\n", (unsigned)CCrc32::Compute(ptr, size));
+//
+//   CCrc32 crc;
+//   crc.Add(ptr0, size0);
+//   crc.Add(ptr1, size1);
+//   printf("crc32: %08x\n", (unsigned)crc.Get());
+
+class CCrc32
+{
+public:
+    static uint32 Compute(const void* const pData, const size_t sizeInBytes)
+    {
+        CCrc32 c;
+        c.Add(pData, sizeInBytes);
+        return c.Get();
+    }
+
+    static uint32 Compute(const char* const szData)
+    {
+        CCrc32 c;
+        c.Add(szData);
+        return c.Get();
+    }
+
+    static uint32 ComputeLowercase(const char* const pData, const size_t sizeInBytes)
+    {
+        CCrc32 c;
+        c.AddLowercase(pData, sizeInBytes);
+        return c.Get();
+    }
+
+    static uint32 ComputeLowercase(const char* const szData)
+    {
+        CCrc32 c;
+        c.AddLowercase(szData);
+        return c.Get();
+    }
+
+
+    CCrc32()
+        : m_crc(0xFFFFffff)
+        , m_pTable(GetTable())
+    {
+    }
+
+    CCrc32(unsigned int initializer)
+        : m_crc(initializer)
+        , m_pTable(GetTable())
+    {
+    }
+
+    void Reset()
+    {
+        m_crc = 0xFFFFffff;
+    }
+
+    uint32 Get() const
+    {
+        return ~m_crc;
+    }
+
+    unsigned int Add(const void* const pData, size_t sizeInBytes)
+    {
+        const uint8* p = (const uint8*)pData;
+        while (sizeInBytes--)
+        {
+            m_crc = (m_crc >> 8) ^ m_pTable[(m_crc & 0xFF) ^ (*p++)];
+        }
+        return Get();
+    }
+
+    unsigned int Add(const char* szData)
+    {
+        while (*szData)
+        {
+            m_crc = (m_crc >> 8) ^ m_pTable[(m_crc & 0xFF) ^ uint8(*szData++)];
+        }
+        return Get();
+    }
+
+#if defined(CRY_TMP_ASCII_TO_LOWER)
+#   error CRY_TMP_ASCII_TO_LOWER already defined
+#endif
+#define CRY_TMP_ASCII_TO_LOWER(c)  uint8(((c) <= 'Z' && (c) >= 'A') ? (c) + ('a' - 'A') : (c))
+
+    unsigned int AddLowercase(const char* pData, size_t sizeInBytes)
+    {
+        while (sizeInBytes--)
+        {
+            const uint8 c = *pData++;
+            m_crc = (m_crc >> 8) ^ m_pTable[(m_crc & 0xFF) ^ CRY_TMP_ASCII_TO_LOWER(c)];
+        }
+        return Get();
+    }
+
+    unsigned int AddLowercase(const char* szData)
+    {
+        while (*szData)
+        {
+            const uint8 c = *szData++;
+            m_crc = (m_crc >> 8) ^ m_pTable[(m_crc & 0xFF) ^ CRY_TMP_ASCII_TO_LOWER(c)];
+        }
+        return Get();
+    }
+
+#undef CRY_TMP_ASCII_TO_LOWER
+
+private:
+    static const uint32* GetTable()
+    {
+        static const uint32 table[256] =
+        {
+            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+            0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+            0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+            0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+            0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+            0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+            0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+            0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+            0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+            0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+            0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+            0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+            0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+            0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+            0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+            0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+            0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+            0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+            0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+            0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+            0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+            0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+            0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+            0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+            0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+            0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+            0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+            0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+            0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+            0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+            0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+            0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+            0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+            0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+            0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+            0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+            0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+            0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+            0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+        };
+        return &table[0];
+    }
+
+private:
+    uint32 m_crc;
+    const uint32* const m_pTable;
+};
+
+// eof
diff --git a/Code/Legacy/CryCommon/CryCustomTypes.h b/Code/Legacy/CryCommon/CryCustomTypes.h
new file mode 100644
index 0000000000..6438bd5e21
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryCustomTypes.h
@@ -0,0 +1,1203 @@
+/*
+ * 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 : Derived CTypeInfos for structs, enums, etc.
+//               Compressed numerical types  and associated TypeInfos
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYCUSTOMTYPES_H
+#define CRYINCLUDE_CRYCOMMON_CRYCUSTOMTYPES_H
+#pragma once
+
+#include "CryTypeInfo.h"
+#include "CryFixedString.h"
+#include <Cry_Math.h>
+#include <Cry_Color.h>
+#include <AzCore/Casting/numeric_cast.h>
+
+#define STATIC_CONST(T, name, val) \
+    static inline T name()  { static T t = val; return t; }
+
+#define ARRAY_COUNT(arr)        (sizeof(arr) / sizeof *(arr))
+#define ARRAY_VAR(arr)          ArrayT(&(arr)[0], (int)ARRAY_COUNT(arr))
+
+//---------------------------------------------------------------------------
+// String helper function.
+
+template<class T>
+inline bool HasString(const T& val, FToString flags, const void* def_data = 0)
+{
+    if (flags.SkipDefault)
+    {
+        if (val == (def_data ? *(const T*)def_data : T()))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+float NumToFromString(float val, int digits, bool floating, char buffer[], int buf_size);
+
+template<class T>
+string NumToString(T val, int min_digits, int max_digits, bool floating)
+{
+    char buffer[64];
+    float f(val);
+    for (int digits = min_digits; digits < max_digits; digits++)
+    {
+        if (T(NumToFromString(f, digits, floating, buffer, 64)) == val)
+        {
+            break;
+        }
+    }
+    return buffer;
+}
+
+//---------------------------------------------------------------------------
+// TypeInfo for structs
+
+struct CStructInfo
+    : CTypeInfo
+{
+    CStructInfo(cstr name, size_t size, size_t align, Array<CVarInfo> vars = Array<CVarInfo>(), Array<CTypeInfo const*> templates = Array<CTypeInfo const*>());
+    virtual bool IsType(CTypeInfo const& Info) const;
+    virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const;
+    virtual bool FromString(void* data, cstr str, FFromString flags = 0) const;
+    virtual bool ToValue(const void* data, void* value, const CTypeInfo& typeVal) const;
+    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const;
+    virtual bool ValueEqual(const void* data, const void* def_data) const;
+    virtual void SwapEndian(void* pData, size_t nCount, bool bWriting) const;
+    virtual void GetMemoryUsage(ICrySizer* pSizer, void const* data) const;
+
+    virtual const CVarInfo* NextSubVar(const CVarInfo* pPrev, bool bRecurseBase = false) const;
+    virtual const CVarInfo* FindSubVar(cstr name) const;
+
+    virtual CTypeInfo const* const* NextTemplateType(CTypeInfo const* const* pPrev) const
+    {
+        pPrev = pPrev ? pPrev + 1 : TemplateTypes.begin();
+        return pPrev < TemplateTypes.end() ? pPrev : 0;
+    }
+
+protected:
+    Array<CVarInfo>                     Vars;
+    CryStackStringT<char, 16>   EndianDesc;             // Encodes instructions for endian swapping.
+    bool                                            HasBitfields;
+    Array<CTypeInfo const*>     TemplateTypes;
+
+    void MakeEndianDesc();
+    size_t AddEndianDesc(cstr desc, size_t dim, size_t elem_size);
+    bool IsCompatibleType(CTypeInfo const& Info) const;
+};
+
+//---------------------------------------------------------------------------
+// Template TypeInfo for base types, using global To/FromString functions.
+
+template<class T>
+struct TTypeInfo
+    : CTypeInfo
+{
+    TTypeInfo(cstr name)
+        : CTypeInfo(name, sizeof(T), alignof(T))
+    {}
+
+    virtual bool ToValue(const void* data, void* value, const CTypeInfo& typeVal) const
+    {
+        if (&typeVal == this)
+        {
+            return *(T*)value = *(const T*)data, true;
+        }
+        return false;
+    }
+    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
+    {
+        if (&typeVal == this)
+        {
+            return *(T*)data = *(const T*)value, true;
+        }
+        return false;
+    }
+
+    virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const
+    {
+        if (!HasString(*(const T*)data, flags, def_data))
+        {
+            return string();
+        }
+        return ::ToString(*(const T*)data);
+    }
+    virtual bool FromString(void* data, cstr str, FFromString flags = 0) const
+    {
+        if (!*str)
+        {
+            if (!flags.SkipEmpty)
+            {
+                *(T*)data = T();
+            }
+            return true;
+        }
+        return ::FromString(*(T*)data, str);
+    }
+    virtual bool ValueEqual(const void* data, const void* def_data = 0) const
+    {
+        return *(const T*)data == (def_data ? *(const T*)def_data : T());
+    }
+
+    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer, [[maybe_unused]] void const* data) const
+    {}
+};
+
+//---------------------------------------------------------------------------
+// Template TypeInfo for modified types (e.g. compressed, range-limited)
+
+template<class T, class S>
+struct TProxyTypeInfo
+    : CTypeInfo
+{
+    TProxyTypeInfo(cstr name)
+        : CTypeInfo(name, sizeof(S), alignof(S))
+    {}
+
+    virtual bool IsType(CTypeInfo const& Info) const
+    { return &Info == this || ValTypeInfo().IsType(Info); }
+
+    virtual bool ToValue(const void* data, void* value, const CTypeInfo& typeVal) const
+    {
+        if (&typeVal == this)
+        {
+            *(S*)value = *(const S*)data;
+            return true;
+        }
+        T val = T(*(const S*)data);
+        return ValTypeInfo().ToValue(&val, value, typeVal);
+    }
+    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
+    {
+        if (&typeVal == this)
+        {
+            *(S*)data = *(const S*)value;
+            return true;
+        }
+        T val;
+        if (ValTypeInfo().FromValue(&val, value, typeVal))
+        {
+            *(S*)data = S(val);
+            return true;
+        }
+        return false;
+    }
+
+    virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const
+    {
+        T val = T(*(const S*)data);
+        T def_val = def_data ? T(*(const S*)def_data) : T();
+        return ValTypeInfo().ToString(&val, flags, &def_val);
+    }
+    virtual bool FromString(void* data, cstr str, FFromString flags = 0) const
+    {
+        T val;
+        if (!*str)
+        {
+            if (!flags.SkipEmpty)
+            {
+                *(S*)data = S();
+            }
+            return true;
+        }
+        if (!TypeInfo(&val).FromString(&val, str))
+        {
+            return false;
+        }
+        *(S*)data = S(val);
+        return true;
+    }
+
+    // Forward additional TypeInfo functions.
+    virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
+    { return ValTypeInfo().GetLimit(eLimit, fVal); }
+    virtual cstr EnumElem(uint nIndex) const
+    { return ValTypeInfo().EnumElem(nIndex); }
+
+protected:
+
+    static const CTypeInfo& ValTypeInfo()
+    { return TypeInfo((T*)0); }
+};
+
+//---------------------------------------------------------------------------
+// Customisation for string.
+
+template<>
+inline string TTypeInfo<string>::ToString(const void* data, FToString flags, const void* def_data) const
+{
+    const string& val = *(const string*)data;
+    if (def_data && flags.SkipDefault)
+    {
+        if (val == *(const string*)def_data)
+        {
+            return string();
+        }
+    }
+    return val;
+}
+
+template<>
+inline bool TTypeInfo<string>::FromString(void* data, cstr str, FFromString flags) const
+{
+    if (!*str && flags.SkipEmpty)
+    {
+        return true;
+    }
+    *(string*)data = str;
+    return true;
+}
+
+template<>
+void TTypeInfo<string>::GetMemoryUsage(ICrySizer* pSizer, void const* data) const;
+
+//---------------------------------------------------------------------------
+//
+// TypeInfo for small integer types.
+
+
+template<class T>
+struct TIntTraits
+{
+    static const bool bSIGNED
+        = T(-1) < T(0);
+
+    static const T nMIN_FACTOR
+        = bSIGNED ? T(-1) : T(0);
+
+    static const size_t nPOS_BITS
+        = sizeof(T) * 8 - bSIGNED;
+
+    static const T nMIN = std::numeric_limits<T>::min();
+
+    static const T nMAX = std::numeric_limits<T>::max();
+};
+
+template<uint S>
+struct TIntType
+{};
+
+template<>
+struct TIntType<1>
+{
+    typedef int8 TType;
+};
+template<>
+struct TIntType<2>
+{
+    typedef int16 TType;
+};
+template<>
+struct TIntType<4>
+{
+    typedef int32 TType;
+};
+template<>
+struct TIntType<8>
+{
+    typedef int64 TType;
+};
+
+template<class D, class S>
+inline bool ConvertInt(D& dest, S src)
+{
+    if constexpr (TIntTraits<D>::nPOS_BITS < TIntTraits<S>::nPOS_BITS)
+    {
+        src = clamp_tpl(src, S(TIntTraits<D>::nMIN), S(TIntTraits<D>::nMAX));
+    }
+    else if constexpr (TIntTraits<D>::bSIGNED < TIntTraits<S>::bSIGNED)
+    {
+        src = max(src, S(0));
+    }
+
+    dest = D(src);
+    assert(S(dest) == src);
+    return true;
+}
+
+template<class D>
+inline bool ConvertInt(D& dest, const void* src, const CTypeInfo& typeSrc)
+{
+    if (typeSrc.IsType<int>())
+    {
+        switch (typeSrc.Size)
+        {
+        case 1:
+            return ConvertInt(dest, *(const int8*)src);
+        case 2:
+            return ConvertInt(dest, *(const int16*)src);
+        case 4:
+            return ConvertInt(dest, *(const int32*)src);
+        case 8:
+            return ConvertInt(dest, *(const int64*)src);
+        }
+    }
+    else if (typeSrc.IsType<uint>())
+    {
+        switch (typeSrc.Size)
+        {
+        case 1:
+            return ConvertInt(dest, *(const uint8*)src);
+        case 2:
+            return ConvertInt(dest, *(const uint16*)src);
+        case 4:
+            return ConvertInt(dest, *(const uint32*)src);
+        case 8:
+            return ConvertInt(dest, *(const uint64*)src);
+        }
+    }
+    return false;
+}
+
+template<class S>
+inline bool ConvertInt(void* dest, const CTypeInfo& typeDest, S src)
+{
+    if (typeDest.IsType<int>())
+    {
+        switch (typeDest.Size)
+        {
+        case 1:
+            return ConvertInt(*(int8*)dest, src);
+        case 2:
+            return ConvertInt(*(int16*)dest, src);
+        case 4:
+            return ConvertInt(*(int32*)dest, src);
+        case 8:
+            return ConvertInt(*(int64*)dest, src);
+        }
+    }
+    else if (typeDest.IsType<uint>())
+    {
+        switch (typeDest.Size)
+        {
+        case 1:
+            return ConvertInt(*(uint8*)dest, src);
+        case 2:
+            return ConvertInt(*(uint16*)dest, src);
+        case 4:
+            return ConvertInt(*(uint32*)dest, src);
+        case 8:
+            return ConvertInt(*(uint64*)dest, src);
+        }
+    }
+    return false;
+}
+
+template<class T>
+struct TIntTypeInfo
+    : TTypeInfo<T>
+{
+    TIntTypeInfo(cstr name)
+        : TTypeInfo<T>(name)
+    {}
+
+    virtual bool IsType(CTypeInfo const& Info) const
+    { return &Info == this || &Info == (TIntTraits<T>::bSIGNED ? &TypeInfo((int*)0) : &TypeInfo((uint*)0)); }
+
+    virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
+    {
+        if (eLimit == eLimit_Min)
+        {
+            return fVal = float(TIntTraits<T>::nMIN), true;
+        }
+        if (eLimit == eLimit_Max)
+        {
+            return fVal = float(TIntTraits<T>::nMAX), true;
+        }
+        if (eLimit == eLimit_Step)
+        {
+            return fVal = 1.f, true;
+        }
+        return false;
+    }
+
+    // Override to allow int conversion
+    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
+    { return ConvertInt(*(T*)data, value, typeVal); }
+    virtual bool ToValue(const void* data, void* value, const CTypeInfo& typeVal) const
+    { return ConvertInt(value, typeVal, *(const T*)data); }
+};
+
+//---------------------------------------------------------------------------
+// Store any type, such as an enum, in a small int.
+
+template<class T, int nMIN = INT_MIN, int nMAX = INT_MAX, int nDEFAULT = 0>
+struct TRangedType
+{
+    typedef TRangedType<T, nMIN, nMAX, nDEFAULT> TThis;
+
+    TRangedType(T init = T(nDEFAULT))
+        : m_Val(init)
+    {
+        CheckRange(m_Val);
+    }
+
+    operator T() const
+    {
+        return m_Val;
+    }
+
+    CUSTOM_STRUCT_INFO(CCustomInfo)
+
+protected:
+    T       m_Val;
+
+    static bool HasMin()
+    { return nMIN > INT_MIN; }
+    static bool HasMax()
+    { return nMAX < INT_MAX; }
+
+    static bool CheckRange(T& val)
+    {
+        if (HasMin() && val < T(nMIN))
+        {
+            val = T(nMIN);
+            return false;
+        }
+        else if (HasMax() && val > T(nMAX))
+        {
+            val = T(nMAX);
+            return false;
+        }
+        return true;
+    }
+
+    // Adaptor TypeInfo for specifying limits, and implementing range checking
+    struct CCustomInfo
+        : TProxyTypeInfo<T, TThis>
+    {
+        CCustomInfo()
+            : TProxyTypeInfo<T, TThis>(::TypeInfo((T*) 0).Name)
+        {}
+
+        virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
+        {
+            if (eLimit == eLimit_Min && HasMin())
+            {
+                return fVal = T(nMIN), true;
+            }
+            if (eLimit == eLimit_Max && HasMax())
+            {
+                return fVal = T(nMAX), true;
+            }
+            return ::TypeInfo((T*)0).GetLimit(eLimit, fVal);
+        }
+    };
+};
+
+//---------------------------------------------------------------------------
+// Store any type, such as an enum, in a small int.
+
+template<class T, class S = uint8, int nOffset = 0, int nDefault = nOffset>
+struct TSmall
+{
+    typedef TSmall<T, S, nOffset, nDefault> TThis;
+    typedef T       TValue;
+
+    inline TSmall(T val = T(nDefault))
+    {
+        set(val);
+    }
+    void set(T val = T(nDefault))
+    {
+        m_Val = S(val) - S(nOffset);
+
+        // The unary operator+() forces integer promotion to happen and thus
+        // induces a call to operator T(), which allows the equality operator to work.
+        assert(+(*this) == val);
+    }
+
+    inline operator T() const
+    { return T(T(m_Val) + nOffset); }
+    inline T operator +() const
+    { return T(T(m_Val) + nOffset); }
+
+    CUSTOM_STRUCT_INFO(CCustomInfo)
+
+protected:
+    S       m_Val;
+
+    struct CCustomInfo
+        : TProxyTypeInfo<T, TThis>
+    {
+        CCustomInfo()
+            : TProxyTypeInfo<T, TThis>("TSmall<>")
+        {}
+
+        virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
+        {
+            if (eLimit == eLimit_Min)
+            {
+                return fVal = float(TIntTraits<S>::nMIN + nOffset), true;
+            }
+            if (eLimit == eLimit_Max)
+            {
+                return fVal = float(TIntTraits<S>::nMAX + nOffset), true;
+            }
+            if (eLimit == eLimit_Step)
+            {
+                return fVal = 1.f, true;
+            }
+            return false;
+        }
+    };
+};
+
+//---------------------------------------------------------------------------
+// Quantise a float linearly in an int.
+template<class S, int nLIMIT, S nQUANT = TIntTraits<S>::nMAX, bool bTRUNC = false>
+struct TFixed
+{
+    typedef float TValue;
+
+    inline TFixed()
+        : m_Store(0)
+    {}
+
+    inline TFixed(float fIn)
+    {
+        float fStore = ToStore(fIn);
+        fStore = clamp_tpl(fStore, float(TIntTraits<S>::nMIN_FACTOR * nQUANT), float(nQUANT));
+        m_Store = bTRUNC ? S(fStore) : fStore < 0.f ? S(fStore - 0.5f) : S(fStore + 0.5f);
+    }
+
+    // Conversion.
+    inline operator float() const
+    { return FromStore(m_Store); }
+    inline float operator +() const
+    { return FromStore(m_Store); }
+    inline bool operator !() const
+    { return !m_Store; }
+
+    inline bool operator ==(const TFixed& x) const
+    { return m_Store == x.m_Store; }
+    inline bool operator ==(float x) const
+    { return m_Store == TFixed(x); }
+    inline S GetStore() const
+    { return m_Store; }
+
+    static S GetMaxStore()
+    { return nQUANT; }
+    static float GetMaxValue()
+    { return float(nLIMIT); }
+
+    CUSTOM_STRUCT_INFO(CCustomInfo)
+
+protected:
+    S       m_Store;
+
+    typedef TFixed<S, nLIMIT, nQUANT, bTRUNC> TThis;
+
+    static const int nMAX = nLIMIT;
+    static const int nMIN = TIntTraits<S>::nMIN_FACTOR * nLIMIT;
+
+    static inline float ToStore(float f)
+    { return f * float(nQUANT) / float(nLIMIT); }
+    static inline float FromStore(float f)
+    { return f * float(nLIMIT) / float(nQUANT); }
+
+    // TypeInfo implementation.
+    struct CCustomInfo
+        : TProxyTypeInfo<float, TThis>
+    {
+        CCustomInfo()
+            : TProxyTypeInfo<float, TThis>("TFixed<>")
+        {}
+
+        virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
+        {
+            if (eLimit == eLimit_Min)
+            {
+                return fVal = float(nMIN), true;
+            }
+            if (eLimit == eLimit_Max)
+            {
+                return fVal = float(nMAX), true;
+            }
+            if (eLimit == eLimit_Step)
+            {
+                return fVal = FromStore(1.f), true;
+            }
+            return false;
+        }
+
+        // Override ToString: Limit to significant digits.
+        virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const
+        {
+            if (!HasString(*(const S*)data, flags, def_data))
+            {
+                return string();
+            }
+            static int digits = int_ceil(log10f(float(nQUANT)));
+            return NumToString(*(const TFixed*)data, 1, digits + 3, true);
+        }
+    };
+};
+
+
+// Define the canonical float-to-byte quantisation.
+typedef TFixed<uint8, 1> UnitFloat8;
+
+#ifdef COMPRESSED_FLOATS
+
+//---------------------------------------------------------------------------
+// A floating point number, with templated storage size (and sign), and number of exponent bits
+template<class S, int nEXP_BITS>
+struct TFloat
+{
+    typedef float TValue;
+
+    ILINE TFloat()
+        : m_Store(0)
+    {}
+
+    ILINE TFloat(float fIn)
+        : m_Store(FromFloat(fIn))
+    {}
+
+    ILINE operator float() const
+    { return ToFloat(m_Store); }
+    ILINE float operator +() const
+    { return ToFloat(m_Store); }
+
+    ILINE bool operator !() const
+    { return !m_Store; }
+
+    ILINE bool operator ==(TFloat x) const
+    { return m_Store == x.m_Store; }
+    ILINE bool operator ==(float x) const
+    { return float(*this) == x; }
+
+    inline TFloat& operator *=(float x)
+    { return *this = *this * x; }
+
+    ILINE uint32 partial_float_conversion() const
+    { return (0 == m_Store) ? 0 : ToFloatCore(m_Store); }
+
+    STATIC_CONST(float, fMAX, ToFloat(TIntTraits<S>::nMAX));
+    STATIC_CONST(float, fPOS_MIN, ToFloat(1 << nMANT_BITS));
+    STATIC_CONST(float, fMIN, -fMAX() * (float)TIntTraits<S>::bSIGNED);
+
+    CUSTOM_STRUCT_INFO(CCustomInfo)
+
+protected:
+    S       m_Store;
+
+    typedef TFloat<S, nEXP_BITS> TThis;
+
+    static const S nBITS = sizeof(S) * 8;
+    static const S nSIGN = TIntTraits<S>::bSIGNED;
+    static const S nMANT_BITS = nBITS - nEXP_BITS - nSIGN;
+    static const S nSIGN_MASK = S(nSIGN << (nBITS - 1));
+    static const S nMANT_MASK = (S(1) << nMANT_BITS) - 1;
+    static const S nEXP_MASK = ~S(nMANT_MASK | nSIGN_MASK);
+    static const int nEXP_MAX = 1 << (nEXP_BITS - 1),
+                     nEXP_MIN = 1 - nEXP_MAX;
+
+    STATIC_CONST(float, fROUNDER, 1.f + fPOS_MIN() * 0.5f);
+
+    static inline S FromFloat(float fIn)
+    {
+        COMPILE_TIME_ASSERT(sizeof(S) <= 4);
+        COMPILE_TIME_ASSERT(nEXP_BITS > 0 && nEXP_BITS <= 8 && nEXP_BITS < sizeof(S) * 8 - 4);
+
+        // Clamp to allowed range.
+        float fClamped = clamp_tpl(fIn * fROUNDER(), fMIN(), fMAX());
+
+        // Bit shift to convert from IEEE float32.
+        uint32 uBits = *(const uint32*)&fClamped;
+
+        // Convert exp.
+        int32 iExp = (uBits >> 23) & 0xFF;
+        iExp -= 127 + nEXP_MIN;
+        IF (iExp < 0, 0)
+        {
+            // Underflow.
+            return 0;
+        }
+
+        // Reduce mantissa.
+        uint32 uMant = uBits >> (23 - nMANT_BITS);
+
+        S bits = (uMant & nMANT_MASK)
+            | (iExp << nMANT_BITS)
+            | ((uBits >> (32 - nBITS)) & nSIGN_MASK);
+
+        #ifdef _DEBUG
+        fIn = clamp_tpl(fIn, fMIN(), fMAX());
+        float fErr = fabs(ToFloat(bits) - fIn);
+        float fMaxErr = fabs(fIn) / float(1 << nMANT_BITS);
+        assert(fErr <= fMaxErr);
+        #endif
+
+        return bits;
+    }
+
+    static inline uint32 ToFloatCore(S bits)
+    {
+        // Extract FP components.
+        uint32 uBits = bits & nMANT_MASK,
+               uExp = (bits & ~nSIGN_MASK) >> nMANT_BITS,
+               uSign = bits & nSIGN_MASK;
+
+        // Shift to 32-bit.
+        uBits <<= 23 - nMANT_BITS;
+        uBits |= (uExp + 127 + nEXP_MIN) << 23;
+        uBits |= uSign << (32 - nBITS);
+
+        return uBits;
+    }
+
+    static ILINE float ToFloat(S bits)
+    {
+        IF (bits == 0, 0)
+        {
+            return 0.f;
+        }
+
+        uint32 uBits = ToFloatCore(bits);
+        return *(float*)&uBits;
+    }
+
+    // TypeInfo implementation.
+    struct CCustomInfo
+        : TProxyTypeInfo<float, TThis>
+    {
+        CCustomInfo()
+            : TProxyTypeInfo<float, TThis>("TFloat<>")
+        {}
+
+        virtual bool GetLimit(ENumericLimit eLimit, float& fVal) const
+        {
+            if (eLimit == eLimit_Min)
+            {
+                return fVal = fMIN(), true;
+            }
+            if (eLimit == eLimit_Max)
+            {
+                return fVal = fMAX(), true;
+            }
+            if (eLimit == eLimit_Step)
+            {
+                return fVal = fPOS_MIN(), true;
+            }
+            return false;
+        }
+
+        // Override ToString: Limit to significant digits.
+        virtual string ToString(const void* data, FToString flags = 0, const void* def_data = 0) const
+        {
+            if (!HasString(*(const S*)data, flags, def_data))
+            {
+                return string();
+            }
+            static int digits = int_ceil(log10f(1 << nMANT_BITS));
+            return NumToString(*(const TFloat*)data, 1, digits + 3, true);
+        }
+    };
+};
+
+// Canonical float16 types, with range ~= 64K.
+typedef TFloat<int16, 5>     SFloat16;
+typedef TFloat<uint16, 5>    UFloat16;
+
+template<typename T>
+ILINE T partial_float_cast(const SFloat16& s) { return static_cast<T>(s.partial_float_conversion()); }
+
+template<typename T>
+ILINE T partial_float_cast(const UFloat16& u) { return static_cast<T>(u.partial_float_conversion()); }
+
+#ifdef _DEBUG
+
+// Classes for unit tests.
+template<class T2, class T>
+void TestValues(T val)
+{
+    T2 val2 = val;
+    T2 val2c;
+
+    bool b = TypeInfo(&val2c).FromValue(&val2c, val);
+    assert(b);
+    assert(val2 == val2c);
+    b = TypeInfo(&val2c).ToValue(&val2c, val);
+    assert(b);
+    assert(val2 == T2(val));
+}
+
+template<class T2, class T>
+void TestTypes(T val)
+{
+    T2 val2 = val;
+    string s = TypeInfo(&val2).ToString(&val2);
+    bool b = TypeInfo(&val).FromString(&val, s);
+    assert(b);
+    assert(val2 == T2(val));
+
+    TestValues<T2>(val);
+}
+
+template<class T>
+void TestType(T val)
+{
+    TestTypes<T>(val);
+}
+
+#endif // _DEBUG
+
+#endif // COMPRESSED_FLOATS
+
+//---------------------------------------------------------------------------
+// TypeInfo for enums
+
+//---------------------------------------------------------------------------
+// Implement data features based on enum definition
+/*
+    interface EnumDef
+    {
+        typedef TInt;
+        uint Count();
+        TInt Value(uint i);
+        cstr Name(uint i);
+        bool MatchName(uint i, cstr str);
+        cstr ToName(TInt value);
+    } const
+*/
+
+template<class TEnumDef, class TInt>
+struct TEnumInfo
+    : TIntTypeInfo<TInt>
+    , TEnumDef
+{
+    TEnumInfo(cstr name)
+        : TIntTypeInfo<TInt>(name) {}
+
+    virtual cstr EnumElem(uint nIndex) const
+    {
+        if (nIndex < TEnumDef::Count())
+        {
+            cstr name = TEnumDef::Name(nIndex);
+            if (*name != '_')
+            {
+                return name;
+            }
+        }
+        return 0;
+    }
+
+    virtual bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
+    {
+        TInt val;
+        if (ConvertInt(val, value, typeVal))
+        {
+            if (TEnumDef::ToName(val))
+            {
+                return *(TInt*)data = val, true;
+            }
+        }
+        return false;
+    }
+
+    virtual string ToString(const void* data, FToString flags, const void* def_data) const
+    {
+        TInt val = *(const TInt*)(data);
+        if (flags.SkipDefault && val == (def_data ? *(const TInt*)def_data : TInt(0)))
+        {
+            return string();
+        }
+
+        if (cstr sName = TEnumDef::ToName(val))
+        {
+            return sName;
+        }
+
+        // Unmatched value, return as number.
+        return ::ToString(val);
+    }
+
+    virtual bool FromString(void* data, cstr str, FFromString flags) const
+    {
+        if (!*str)
+        {
+            if (!flags.SkipEmpty)
+            {
+                *(TInt*)data = (TInt)0;
+            }
+            return true;
+        }
+
+        for (int i = 0, count = TEnumDef::Count(); i < count; i++)
+        {
+            if (TEnumDef::MatchName(i, str))
+            {
+                return *(TInt*)data = check_cast<TInt>(TEnumDef::Value(i)), true;
+            }
+        }
+
+        // No match, attempt numeric or bool conversion.
+        if (::FromString(*(TInt*)data, str))
+        {
+            return true;
+        }
+
+        bool b;
+        if (::FromString(b, str))
+        {
+            return *(TInt*)data = b, true;
+        }
+
+        return false;
+    }
+};
+
+//---------------------------------------------------------------------------
+// TypeInfo for regular enums
+
+struct CSimpleEnumDef
+{
+    void Init(Array<cstr> names, char* enum_str);
+
+    // TEnumDef implementations
+    ILINE uint Count() const
+    { return asNames.size(); }
+    ILINE static uint Value(uint i)
+    { return i; }
+    ILINE cstr Name(uint i) const
+    { return asNames[i]; }
+    ILINE bool MatchName(uint i, cstr str) const
+    {
+        cstr name = asNames[i];
+        if (*name == '_')
+        {
+            name++;
+        }
+        return azstricmp(name, str) == 0;
+    }
+    ILINE cstr ToName(uint value) const
+    {
+        if (value < Count())
+        {
+            return asNames[value];
+        }
+        return 0;
+    }
+
+protected:
+
+    Array<cstr>     asNames;
+};
+
+struct CSimpleEnumInfo
+    : TEnumInfo<CSimpleEnumDef, uint8>
+{
+    CSimpleEnumInfo(cstr name, Array<cstr> names, char* enum_str)
+        : TEnumInfo<CSimpleEnumDef, uint8>(name)
+    {
+        Init(names, enum_str);
+    }
+};
+
+// Define a regular small enum with TypeInfo
+
+#define DEFINE_ENUM_VALUE(EType, E, TInt)           \
+    TInt Value;                                     \
+    ILINE EType(E val = E(0))                       \
+        : Value(aznumeric_caster(val)) {}           \
+    ILINE operator E() const { return E(Value); }   \
+    ILINE E operator +() const { return E(Value); } \
+
+#define DEFINE_ENUM(EType, ...)                                                             \
+    struct EType                                                                            \
+    {                                                                                       \
+        enum E { __VA_ARGS__, _count };                                                     \
+        typedef uint8 TInt;                                                                 \
+        DEFINE_ENUM_VALUE(EType, E, TInt)                                                   \
+        ILINE static uint Count() { return _count; }                                        \
+        static const CSimpleEnumInfo& TypeInfo() {                                          \
+            static cstr names[_count];                                                      \
+            static char enum_str[] = #__VA_ARGS__;                                          \
+            static CSimpleEnumInfo info( #EType, Array<cstr>(&names[0], _count), enum_str); \
+            return info;                                                                    \
+        }                                                                                   \
+    };
+
+//---------------------------------------------------------------------------
+// TypeInfo for irregular enums
+
+struct CEnumDef
+{
+    typedef int64 TValue;
+
+    struct SElem
+    {
+        TValue  Value;
+        cstr        Name;
+    };
+
+    void Init(Array<SElem> elems, char* enum_str = 0);
+
+    // TEnumDef implementations
+    ILINE uint Count() const
+    { return Elems.size(); }
+    ILINE TValue Value(uint i) const
+    { return Elems[i].Value; }
+    ILINE cstr Name(uint i) const
+    { return *Elems[i].Name ? Elems[i].Name + nPrefixLength : ""; }
+    bool MatchName(uint i, cstr str) const;
+    cstr ToName(TValue val) const;
+
+    struct SInit
+    {
+        static LegacyDynArray<SElem>* s_pElems;
+
+        static void Init(LegacyDynArray<SElem>& elems)
+        {
+            s_pElems = &elems;
+        }
+        SInit()
+        {
+            TValue val = s_pElems->empty() ? 0 : s_pElems->back().Value + 1;
+            s_pElems->push_back()->Value = val;
+        }
+        SInit(TValue val)
+        {
+            s_pElems->push_back()->Value = val;
+        }
+    };
+
+protected:
+
+    Array<SElem>    Elems;
+    TValue              MinValue;
+    bool                    bRegular;
+    uint                    nPrefixLength;
+};
+
+template<class TInt>
+struct CEnumInfo
+    : TEnumInfo<CEnumDef, TInt>
+{
+    CEnumInfo(cstr name, Array<CEnumDef::SElem> elems, char* enum_str = 0)
+        : TEnumInfo<CEnumDef, TInt>(name)
+    {
+        CEnumDef::Init(elems, enum_str);
+    }
+};
+
+struct CEnumDefUuid
+    : public TTypeInfo<AZ::Uuid>
+{
+    struct SElem
+    {
+        AZ::Uuid  Value;
+        cstr        Name;
+    };
+
+    CEnumDefUuid(cstr name, Array<CEnumDefUuid::SElem> elems, char* enum_str = 0)
+        : TTypeInfo<AZ::Uuid>(name)
+    {
+        CEnumDefUuid::Init(elems, enum_str);
+    }
+    void Init(Array<SElem> elems, char* enum_str = 0);
+
+    // TEnumDef implementations
+    ILINE uint Count() const
+    {
+        return Elems.size();
+    }
+    ILINE AZ::Uuid Value(uint i) const
+    {
+        return Elems[i].Value;
+    }
+    ILINE cstr Name(uint i) const
+    {
+        return *Elems[i].Name ? Elems[i].Name + nPrefixLength : "";
+    }
+    bool MatchName(uint i, cstr str) const;
+    cstr ToName(AZ::Uuid val) const;
+
+    cstr EnumElem(uint nIndex) const override
+    {
+        if (nIndex < Count())
+        {
+            cstr name = Name(nIndex);
+            if (*name != '_')
+            {
+                return name;
+            }
+        }
+        return 0;
+    }
+
+    bool FromValue(void* data, const void* value, const CTypeInfo& typeVal) const override
+    {
+        if (&typeVal == this)
+        {
+            const AZ::Uuid& valueUuid = *reinterpret_cast<const AZ::Uuid*>(value);
+            if (ToName(valueUuid))
+            {
+                AZ::Uuid& dataUuid = *reinterpret_cast<AZ::Uuid*>(data);
+                dataUuid = valueUuid;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    string ToString(const void* data, FToString flags, const void* def_data) const override
+    {
+        const AZ::Uuid& uuidData = *reinterpret_cast<const AZ::Uuid*>(data);
+        const AZ::Uuid& defUuidData = *reinterpret_cast<const AZ::Uuid*>(def_data);
+        if (flags.SkipDefault && uuidData == (def_data ? defUuidData : AZ::Uuid::CreateNull()))
+        {
+            return string();
+        }
+
+        if (cstr sName = ToName(uuidData))
+        {
+            return sName;
+        }
+
+        return string();
+    }
+
+    bool FromString(void* data, cstr str, FFromString flags) const override
+    {
+        AZ::Uuid& uuidData = *reinterpret_cast<AZ::Uuid*>(data);
+        if (!*str)
+        {
+            if (!flags.SkipEmpty)
+            {
+                uuidData = AZ::Uuid::CreateNull();
+            }
+            return true;
+        }
+
+        for (int i = 0, count = Count(); i < count; i++)
+        {
+            if (MatchName(i, str))
+            {
+                uuidData = Value(i);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+protected:
+
+    Array<SElem>    Elems;
+    bool                    bRegular;
+    uint                    nPrefixLength;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYCUSTOMTYPES_H
diff --git a/Code/Legacy/CryCommon/CryEndian.h b/Code/Legacy/CryCommon/CryEndian.h
new file mode 100644
index 0000000000..4b9873297d
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryEndian.h
@@ -0,0 +1,294 @@
+/*
+ * 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_CRYENDIAN_H
+#define CRYINCLUDE_CRYCOMMON_CRYENDIAN_H
+#pragma once
+
+#include <BaseTypes.h>
+
+//////////////////////////////////////////////////////////////////////////
+// Endian support
+//////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////////////////////
+// NEED_ENDIAN_SWAP is an older define still used in several places to toggle endian swapping.
+// It is only used when reading files which are assumed to be little-endian.
+// For legacy support, define it to swap on big endian platforms.
+/////////////////////////////////////////////////////////////////////////////////////
+
+typedef bool    EEndian;
+
+#if defined(SYSTEM_IS_LITTLE_ENDIAN)
+#   undef SYSTEM_IS_LITTLE_ENDIAN
+#endif
+#if defined(SYSTEM_IS_BIG_ENDIAN)
+#   undef SYSTEM_IS_BIG_ENDIAN
+#endif
+
+#if 0 // no big-endian platforms right now, but keep the code
+      // Big-endian platform
+#   define SYSTEM_IS_LITTLE_ENDIAN 0
+#   define SYSTEM_IS_BIG_ENDIAN 1
+#else
+// Little-endian platform
+#   define SYSTEM_IS_LITTLE_ENDIAN 1
+#   define SYSTEM_IS_BIG_ENDIAN 0
+#endif
+
+#if SYSTEM_IS_BIG_ENDIAN
+// Big-endian platform. Swap to/from little.
+    #define eBigEndian          false
+    #define eLittleEndian       true
+    #define NEED_ENDIAN_SWAP
+#else
+// Little-endian platform. Swap to/from big.
+    #define eLittleEndian       false
+    #define eBigEndian          true
+    #undef NEED_ENDIAN_SWAP
+#endif
+
+
+enum EEndianness
+{
+    eEndianness_Little,
+    eEndianness_Big,
+#if SYSTEM_IS_BIG_ENDIAN
+    eEndianness_Native = eEndianness_Big,
+    eEndianness_NonNative = eEndianness_Little,
+#else
+    eEndianness_Native = eEndianness_Little,
+    eEndianness_NonNative = eEndianness_Big,
+#endif
+};
+
+
+// Legacy macros
+#define GetPlatformEndian() false
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+inline bool IsSystemLittleEndian()
+{
+    const int a = 1;
+    return 1 == *(const char*)&a;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+// SwapEndian function, using TypeInfo.
+struct CTypeInfo;
+void SwapEndian(const CTypeInfo& Info, size_t nSizeCheck, void* pData, size_t nCount = 1, bool bWriting = false);
+
+// Default template utilizes TypeInfo.
+template<class T>
+inline void SwapEndianBase(T* t, size_t nCount = 1, bool bWriting = false)
+{
+    SwapEndian(TypeInfo(t), sizeof(T), t, nCount, bWriting);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+// SwapEndianBase functions.
+// Always swap the data (the functions named SwapEndian swap based on an optional bSwapEndian parameter).
+// The bWriting parameter must be specified in general when the output is for writing,
+// but it matters only for types with bitfields.
+
+// Overrides for base types.
+
+template<>
+inline void SwapEndianBase(char* p, size_t nCount, bool bWriting)
+{
+    (void)p;
+    (void)nCount;
+    (void)bWriting;
+}
+
+template<>
+inline void SwapEndianBase(uint8* p, size_t nCount, bool bWriting)
+{
+    (void)p;
+    (void)nCount;
+    (void)bWriting;
+}
+
+template<>
+inline void SwapEndianBase(int8* p, size_t nCount, bool bWriting)
+{
+    (void)p;
+    (void)nCount;
+    (void)bWriting;
+}
+
+template<>
+inline void SwapEndianBase(uint16* p, size_t nCount, bool bWriting)
+{
+    (void)bWriting;
+    for (; nCount-- > 0; p++)
+    {
+        *p = (uint16) (((*p >> 8) + (*p << 8)) & 0xFFFF);
+    }
+}
+
+template<>
+inline void SwapEndianBase(int16* p, size_t nCount, bool bWriting)
+{
+    (void)bWriting;
+    SwapEndianBase((uint16*)p, nCount);
+}
+
+template<>
+inline void SwapEndianBase(uint32* p, size_t nCount, bool bWriting)
+{
+    (void)bWriting;
+    for (; nCount-- > 0; p++)
+    {
+        *p = (*p >> 24) + ((*p >> 8) & 0xFF00) + ((*p & 0xFF00) << 8) + (*p << 24);
+    }
+}
+
+template<>
+inline void SwapEndianBase(int32* p, size_t nCount, bool bWriting)
+{
+    (void)bWriting;
+    SwapEndianBase((uint32*)p, nCount);
+}
+
+template<>
+inline void SwapEndianBase(float* p, size_t nCount, bool bWriting)
+{
+    (void)bWriting;
+    SwapEndianBase((uint32*)p, nCount);
+}
+
+template<>
+inline void SwapEndianBase(uint64* p, size_t nCount, bool bWriting)
+{
+    (void)bWriting;
+    for (; nCount-- > 0; p++)
+    {
+        *p = (*p >> 56) + ((*p >> 40) & 0xFF00) + ((*p >> 24) & 0xFF0000) + ((*p >> 8) & 0xFF000000)
+            + ((*p & 0xFF000000) << 8) + ((*p & 0xFF0000) << 24) + ((*p & 0xFF00) << 40) + (*p << 56);
+    }
+}
+
+template<>
+inline void SwapEndianBase(int64* p, size_t nCount, bool bWriting)
+{
+    (void)bWriting;
+    SwapEndianBase((uint64*)p, nCount);
+}
+
+template<>
+inline void SwapEndianBase(double* p, size_t nCount, bool bWriting)
+{
+    (void)bWriting;
+    SwapEndianBase((uint64*)p, nCount);
+}
+
+//---------------------------------------------------------------------------
+// SwapEndian functions.
+// bSwapEndian argument optional, and defaults to swapping from LittleEndian format.
+
+template<class T>
+inline void SwapEndian(T* t, size_t nCount, bool bSwapEndian = eLittleEndian)
+{
+    if (bSwapEndian)
+    {
+        SwapEndianBase(t, nCount);
+    }
+}
+
+// Specify int and uint as well as size_t, to resolve overload ambiguities.
+template<class T>
+inline void SwapEndian(T* t, int nCount, bool bSwapEndian = eLittleEndian)
+{
+    if (bSwapEndian)
+    {
+        SwapEndianBase(t, nCount);
+    }
+}
+
+#if defined(PLATFORM_64BIT)
+template<class T>
+inline void SwapEndian(T* t, unsigned int nCount, bool bSwapEndian = eLittleEndian)
+{
+    if (bSwapEndian)
+    {
+        SwapEndianBase(t, nCount);
+    }
+}
+#endif
+
+template<class T>
+inline void SwapEndian(T& t, bool bSwapEndian = eLittleEndian)
+{
+    if (bSwapEndian)
+    {
+        SwapEndianBase(&t, 1);
+    }
+}
+
+template<class T>
+inline T SwapEndianValue(T t, bool bSwapEndian = eLittleEndian)
+{
+    if (bSwapEndian)
+    {
+        SwapEndianBase(&t, 1);
+    }
+    return t;
+}
+
+//---------------------------------------------------------------------------
+// Object-oriented data extraction for endian-swapping reading.
+template<class T, class D>
+inline T* StepData(D*& pData, size_t nCount, bool bSwapEndian)
+{
+    T* Elems = (T*)pData;
+    SwapEndian(Elems, nCount, bSwapEndian);
+    pData = (D*)((T*)pData + nCount);
+    return Elems;
+}
+
+template<class T, class D>
+inline T* StepData(D*& pData, bool bSwapEndian)
+{
+    return StepData<T, D>(pData, 1, bSwapEndian);
+}
+
+template<class T, class D>
+inline void StepData(T*& Result, D*& pData, size_t nCount, bool bSwapEndian)
+{
+    Result = StepData<T, D>(pData, nCount, bSwapEndian);
+}
+
+template<class T, class D>
+inline void StepDataCopy(T* Dest, D*& pData, size_t nCount, bool bSwapEndian)
+{
+    memcpy(Dest, pData, nCount * sizeof(T));
+    SwapEndian(Dest, nCount, bSwapEndian);
+    pData = (D*)((T*)pData + nCount);
+}
+
+template<class T, class D>
+inline void StepDataWrite(D*& pDest, const T* aSrc, size_t nCount, bool bSwapEndian)
+{
+    memcpy(pDest, aSrc, nCount * sizeof(T));
+    if (bSwapEndian)
+    {
+        SwapEndianBase((T*)pDest, nCount, true);
+    }
+    (T*&)pDest += nCount;
+}
+
+template<class T, class D>
+inline void StepDataWrite(D*& pDest, const T& Src, bool bSwapEndian)
+{
+    StepDataWrite(pDest, &Src, 1, bSwapEndian);
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYENDIAN_H
diff --git a/Code/Legacy/CryCommon/CryFile.h b/Code/Legacy/CryCommon/CryFile.h
new file mode 100644
index 0000000000..e3e619bce5
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryFile.h
@@ -0,0 +1,437 @@
+/*
+ * 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 : File wrapper.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYFILE_H
+#define CRYINCLUDE_CRYCOMMON_CRYFILE_H
+#pragma once
+
+#include <CryPath.h>
+#include <ISystem.h>
+#include <AzFramework/Archive/IArchive.h>
+#include <IConsole.h>
+#include "StringUtils.h"
+#include <AzCore/IO/FileIO.h>
+
+//////////////////////////////////////////////////////////////////////////
+// Defines for CryEngine filetypes extensions.
+//////////////////////////////////////////////////////////////////////////
+#define CRY_GEOMETRY_FILE_EXT                    "cgf"
+#define CRY_SKEL_FILE_EXT                        "chr" //will be a SKEL soon
+#define CRY_SKIN_FILE_EXT                        "skin"
+#define CRY_CHARACTER_ANIMATION_FILE_EXT         "caf"
+#define CRY_CHARACTER_DEFINITION_FILE_EXT        "cdf"
+#define CRY_CHARACTER_LIST_FILE_EXT              "cid"
+#define CRY_ANIM_GEOMETRY_FILE_EXT               "cga"
+#define CRY_ANIM_GEOMETRY_ANIMATION_FILE_EXT     "anm"
+#define CRY_COMPILED_FILE_EXT                    "(c)"
+#define CRY_BINARY_XML_FILE_EXT                  "binxml"
+#define CRY_XML_FILE_EXT                         "xml"
+#define CRY_CHARACTER_PARAM_FILE_EXT             "chrparams"
+#define CRY_GEOM_CACHE_FILE_EXT                  "cax"
+//////////////////////////////////////////////////////////////////////////
+#define CRYFILE_MAX_PATH                         260
+//////////////////////////////////////////////////////////////////////////
+
+inline const char* CryGetExt(const char* filepath)
+{
+    const char* str = filepath;
+    size_t len = strlen(filepath);
+    for (const char* p = str + len - 1; p >= str; --p)
+    {
+        switch (*p)
+        {
+        case ':':
+        case '/':
+        case '\\':
+            // we've reached a path separator - it means there's no extension in this name
+            return "";
+        case '.':
+            // there's an extension in this file name
+            return p + 1;
+        }
+    }
+    return "";
+}
+
+// Summary:
+//   Checks if specified file name is a character file.
+// Summary:
+//   Checks if specified file name is a character file.
+inline bool IsCharacterFile(const char* filename)
+{
+    const char* ext = CryGetExt(filename);
+    if (_stricmp(ext, CRY_SKEL_FILE_EXT) == 0 || _stricmp(ext, CRY_SKIN_FILE_EXT) == 0 || _stricmp(ext, CRY_CHARACTER_DEFINITION_FILE_EXT) == 0 || _stricmp(ext, CRY_ANIM_GEOMETRY_FILE_EXT) == 0)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+// Description:
+//   Checks if specified file name is a static geometry file.
+inline bool IsStatObjFile(const char* filename)
+{
+    const char* ext = CryGetExt(filename);
+    if (_stricmp(ext, CRY_GEOMETRY_FILE_EXT) == 0)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+// Summary:
+//   Wrapper on file system.
+class CCryFile
+{
+public:
+    CCryFile();
+    CCryFile(AZ::IO::IArchive* pIArchive);    // allow an alternative IArchiveinterface
+    CCryFile(const char* filename, const char* mode);
+    ~CCryFile();
+
+    bool Open(const char* filename, const char* mode, int nOpenFlagsEx = 0);
+    void Close();
+
+    // Summary:
+    //   Writes data in a file to the current file position.
+    size_t Write(const void* lpBuf, size_t nSize);
+    // Summary:
+    //   Reads data from a file at the current file position.
+    size_t ReadRaw(void* lpBuf, size_t nSize);
+    // Summary:
+    //   Template version, for automatic size support.
+    template<class T>
+    inline size_t ReadTypeRaw(T* pDest, size_t nCount = 1)
+    {
+        return ReadRaw(pDest, sizeof(T) * nCount);
+    }
+
+    // Summary:
+    //   Automatic endian-swapping version.
+    template<class T>
+    inline size_t ReadType(T* pDest, size_t nCount = 1)
+    {
+        size_t nRead = ReadRaw(pDest, sizeof(T) * nCount);
+        SwapEndian(pDest, nCount);
+        return nRead;
+    }
+
+    // Summary:
+    //   Retrieves the length of the file.
+    size_t GetLength();
+
+    // Summary:
+    //   Moves the current file pointer to the specified position.
+    size_t Seek(size_t seek, int mode);
+    // Summary:
+    //   Moves the current file pointer at the beginning of the file.
+    void SeekToBegin();
+    // Summary:
+    //   Moves the current file pointer at the end of the file.
+    size_t SeekToEnd();
+    // Summary:
+    //   Retrieves the current file pointer.
+    size_t GetPosition();
+
+    // Summary:
+    //   Tests for end-of-file on a selected file.
+    bool IsEof();
+
+    // Summary:
+    //   Flushes any data yet to be written.
+    void Flush();
+
+    // Summary:
+    //   Gets a handle to a pack object.
+    AZ::IO::HandleType GetHandle() const { return m_fileHandle; };
+
+    // Description:
+    //    Retrieves the filename of the selected file.
+    const char* GetFilename() const { return m_filename; };
+
+    // Description:
+    //    Retrieves the filename after adjustment to the real relative to engine root path.
+    // Example:
+    //    Original filename "textures/red.dds" adjusted filename will look like "game/textures/red.dds"
+    // Return:
+    //    Adjusted filename, this is a pointer to a static string, copy return value if you want to keep it.
+    const char* GetAdjustedFilename() const;
+
+    // Summary:
+    //   Checks if file is opened from Archive file.
+    bool IsInPak() const;
+
+    // Summary:
+    //   Gets path of archive this file is in.
+    const char* GetPakPath() const;
+
+private:
+    char m_filename[CRYFILE_MAX_PATH];
+    AZ::IO::HandleType m_fileHandle;
+    AZ::IO::IArchive* m_pIArchive;
+};
+
+// Summary:
+// CCryFile implementation.
+inline CCryFile::CCryFile()
+{
+    m_fileHandle = AZ::IO::InvalidHandle;
+    m_pIArchive = gEnv ? gEnv->pCryPak : NULL;
+}
+
+inline CCryFile::CCryFile(AZ::IO::IArchive* pIArchive)
+{
+    m_fileHandle = AZ::IO::InvalidHandle;
+    m_pIArchive = pIArchive;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryFile::CCryFile(const char* filename, const char* mode)
+{
+    m_fileHandle = AZ::IO::InvalidHandle;
+    m_pIArchive = gEnv ? gEnv->pCryPak : NULL;
+    Open(filename, mode);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryFile::~CCryFile()
+{
+    Close();
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Notes:
+//   For nOpenFlagsEx see IArchive::EFOpenFlags
+// See also:
+//   IArchive::EFOpenFlags
+inline bool CCryFile::Open(const char* filename, const char* mode, int nOpenFlagsEx)
+{
+    char tempfilename[CRYFILE_MAX_PATH] = "";
+    cry_strcpy(tempfilename, filename);
+
+#if !defined (_RELEASE)
+    if (gEnv && gEnv->IsEditor() && gEnv->pConsole)
+    {
+        ICVar* const pCvar = gEnv->pConsole->GetCVar("ed_lowercasepaths");
+        if (pCvar)
+        {
+            const int lowercasePaths = pCvar->GetIVal();
+            if (lowercasePaths)
+            {
+                const string lowerString = PathUtil::ToLower(tempfilename);
+                cry_strcpy(tempfilename, lowerString.c_str());
+            }
+        }
+    }
+#endif
+    if (m_fileHandle != AZ::IO::InvalidHandle)
+    {
+        Close();
+    }
+    cry_strcpy(m_filename, tempfilename);
+
+    if (m_pIArchive)
+    {
+        m_fileHandle = m_pIArchive->FOpen(tempfilename, mode, nOpenFlagsEx);
+    }
+    else
+    {
+        AZ::IO::FileIOBase::GetInstance()->Open(tempfilename, AZ::IO::GetOpenModeFromStringMode(mode), m_fileHandle);
+    }
+
+    return m_fileHandle != AZ::IO::InvalidHandle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline void CCryFile::Close()
+{
+    if (m_fileHandle != AZ::IO::InvalidHandle)
+    {
+        if (m_pIArchive)
+        {
+            m_pIArchive->FClose(m_fileHandle);
+        }
+        else
+        {
+            AZ::IO::FileIOBase::GetInstance()->Close(m_fileHandle);
+        }
+        m_fileHandle = AZ::IO::InvalidHandle;
+        m_filename[0] = 0;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline size_t CCryFile::Write(const void* lpBuf, size_t nSize)
+{
+    assert(m_fileHandle != AZ::IO::InvalidHandle);
+    if (m_pIArchive)
+    {
+        return m_pIArchive->FWrite(lpBuf, 1, nSize, m_fileHandle);
+    }
+
+    if (AZ::IO::FileIOBase::GetInstance()->Write(m_fileHandle, lpBuf, nSize))
+    {
+        return nSize;
+    }
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline size_t CCryFile::ReadRaw(void* lpBuf, size_t nSize)
+{
+    assert(m_fileHandle != AZ::IO::InvalidHandle);
+    if (m_pIArchive)
+    {
+        return m_pIArchive->FReadRaw(lpBuf, 1, nSize, m_fileHandle);
+    }
+
+    AZ::u64 bytesRead = 0;
+    AZ::IO::FileIOBase::GetInstance()->Read(m_fileHandle, lpBuf, nSize, false, &bytesRead);
+
+    return static_cast<size_t>(bytesRead);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline size_t CCryFile::GetLength()
+{
+    assert(m_fileHandle != AZ::IO::InvalidHandle);
+    if (m_pIArchive)
+    {
+        return m_pIArchive->FGetSize(m_fileHandle);
+    }
+    //long curr = ftell(m_file);
+    AZ::u64 size = 0;
+    AZ::IO::FileIOBase::GetInstance()->Size(m_fileHandle, size);
+    return static_cast<size_t>(size);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline size_t CCryFile::Seek(size_t seek, int mode)
+{
+    assert(m_fileHandle != AZ::IO::InvalidHandle);
+    if (m_pIArchive)
+    {
+        return m_pIArchive->FSeek(m_fileHandle, long(seek), mode);
+    }
+
+    if (AZ::IO::FileIOBase::GetInstance()->Seek(m_fileHandle, seek, AZ::IO::GetSeekTypeFromFSeekMode(mode)))
+    {
+        return 0;
+    }
+    return 1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline void CCryFile::SeekToBegin()
+{
+    Seek(0, SEEK_SET);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline size_t CCryFile::SeekToEnd()
+{
+    return Seek(0, SEEK_END);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline size_t CCryFile::GetPosition()
+{
+    assert(m_fileHandle != AZ::IO::InvalidHandle);
+    if (m_pIArchive)
+    {
+        return m_pIArchive->FTell(m_fileHandle);
+    }
+
+    AZ::u64 tellOffset = 0;
+    AZ::IO::FileIOBase::GetInstance()->Tell(m_fileHandle, tellOffset);
+
+    return static_cast<size_t>(tellOffset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline bool CCryFile::IsEof()
+{
+    assert(m_fileHandle != AZ::IO::InvalidHandle);
+    if (m_pIArchive)
+    {
+        return m_pIArchive->FEof(m_fileHandle) != 0;
+    }
+    
+    return AZ::IO::FileIOBase::GetInstance()->Eof(m_fileHandle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline void CCryFile::Flush()
+{
+    assert(m_fileHandle != AZ::IO::InvalidHandle);
+
+    if (m_pIArchive)
+    {
+        m_pIArchive->FFlush(m_fileHandle);
+    }
+    
+    AZ::IO::FileIOBase::GetInstance()->Flush(m_fileHandle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline bool CCryFile::IsInPak() const
+{
+    if (m_fileHandle != AZ::IO::InvalidHandle && m_pIArchive)
+    {
+        return m_pIArchive->GetFileArchivePath(m_fileHandle) != NULL;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline const char* CCryFile::GetPakPath() const
+{
+    if (m_fileHandle != AZ::IO::InvalidHandle && m_pIArchive)
+    {
+        const char* sPath = m_pIArchive->GetFileArchivePath(m_fileHandle);
+        if (sPath != NULL)
+        {
+            return sPath;
+        }
+    }
+    return "";
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+inline const char* CCryFile::GetAdjustedFilename() const
+{
+    static char szAdjustedFile[AZ::IO::IArchive::MaxPath];
+    assert(m_pIArchive);
+    if (!m_pIArchive)
+    {
+        return "";
+    }
+
+    // Gets mod path to file.
+    const char* gameUrl = m_pIArchive->AdjustFileName(m_filename, szAdjustedFile, AZ::IO::IArchive::MaxPath, 0);
+
+    // Returns standard path otherwise.
+    if (gameUrl != &szAdjustedFile[0])
+    {
+        cry_strcpy(szAdjustedFile, gameUrl);
+    }
+    return szAdjustedFile;
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYFILE_H
diff --git a/Code/Legacy/CryCommon/CryFixedString.h b/Code/Legacy/CryCommon/CryFixedString.h
new file mode 100644
index 0000000000..07038a51e0
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryFixedString.h
@@ -0,0 +1,2336 @@
+/*
+ * 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 : Stack-based fixed-size String class, similar to CryString.
+//               will switch to heap-based allocation when string does no longer fit
+//               Can easily be substituted instead of CryString.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYFIXEDSTRING_H
+#define CRYINCLUDE_CRYCOMMON_CRYFIXEDSTRING_H
+#pragma once
+
+#include <string.h>
+#include <wchar.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <wctype.h>
+#include <AzCore/base.h>
+
+#include "CryString.h"
+
+#ifndef CRY_STRING_DEBUG
+#define CRY_STRING_DEBUG(s)
+#endif
+
+#define UNITTEST_CRYFIXEDSTRING (0)
+
+template <class T>
+class CharTraits;
+
+// traits for char
+template <>
+class CharTraits<char>
+{
+public:
+    typedef size_t size_type;
+    typedef char value_type;
+    typedef const value_type* const_str;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+    typedef pointer iterator;
+    typedef const_pointer const_iterator;
+
+    ILINE int _isspace(value_type c) const
+    {
+        return ::isspace((int)c);
+    }
+
+    ILINE value_type _traits_toupper(value_type c) const
+    {
+        return static_cast<value_type>(toupper(c));
+    }
+
+    ILINE value_type _traits_tolower(value_type c) const
+    {
+        return static_cast<value_type>(tolower(c));
+    }
+
+    ILINE value_type _ascii_tolower(value_type c) const
+    {
+        return (c >= 'A' && c <= 'Z') ? c - 'A' + 'a' : c;
+    }
+
+    ILINE value_type _ascii_toupper(value_type c) const
+    {
+        return (c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c;
+    }
+
+    ILINE int _strcmp (const_str a, const_str b) const
+    {
+        return ::strcmp(a, b);
+    }
+
+    ILINE int _strncmp (const_str a, const_str b, size_type n) const
+    {
+        return ::strncmp(a, b, n);
+    }
+
+    ILINE int _stricmp (const_str a, const_str b) const
+    {
+        return ::azstricmp(a, b);
+    }
+
+    ILINE int _strnicmp (const_str a, const_str b, size_type n) const
+    {
+        return ::azstrnicmp(a, b, n);
+    }
+
+    ILINE size_type _strspn(const_str str, const_str strCharSet) const
+    {
+        return (str == NULL) ? 0 : (size_type)::strspn(str, strCharSet);
+    }
+
+    ILINE size_type _strcspn(const_str str, const_str strCharSet) const
+    {
+        return (str == NULL) ? 0 : (size_type)::strcspn(str, strCharSet);
+    }
+
+    static ILINE size_type _strlen(const_str str)
+    {
+        return (str == NULL) ? 0 : (size_type)::strlen(str);
+    }
+
+    ILINE const_str _strchr(const_str str, value_type c) const
+    {
+        return (str == NULL) ? 0 : ::strchr(str, c);
+    }
+
+    ILINE value_type* _strstr(value_type* str, const_str strSearch) const
+    {
+        return (str == NULL) ? 0 : (value_type*) ::strstr(str, strSearch);
+    }
+
+    ILINE void _copy(value_type* dest, const value_type* src, size_type count)
+    {
+        memcpy(dest, src, count * sizeof(value_type));
+    }
+
+    ILINE void _move(value_type* dest, const value_type* src, size_type count)
+    {
+        memmove(dest, src, count * sizeof(value_type));
+    }
+
+    ILINE void _set(value_type* dest, value_type ch, size_type count)
+    {
+        memset(dest, ch, count * sizeof(value_type));
+    }
+
+    ILINE int   _vsnprintf(value_type* str, size_type size, const_str format, va_list ap)
+    {
+        return ::azvsnprintf(str, size, format, ap);
+    }
+};
+
+// traits for wchar_t
+template <>
+class CharTraits<wchar_t>
+{
+public:
+    typedef size_t size_type;
+    typedef wchar_t value_type;
+    typedef const value_type* const_str;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+    typedef pointer iterator;
+    typedef const_pointer const_iterator;
+
+    ILINE int _isspace(value_type c) const
+    {
+        return iswspace(c);
+    }
+
+    ILINE value_type _traits_toupper(value_type c) const
+    {
+        return towupper(c);
+    }
+
+    ILINE value_type _traits_tolower(value_type c) const
+    {
+        return towlower(c);
+    }
+
+    ILINE value_type _ascii_tolower(value_type c) const
+    {
+        return ((((c) >= 'A') && ((c) <= 'Z')) ? ((c) - 'A' + 'a') : (c));
+    }
+
+    ILINE value_type _ascii_toupper(value_type c) const
+    {
+        return ((((c) >= 'a') && ((c) <= 'z')) ? ((c) - 'a' + 'A') : (c));
+    }
+
+    ILINE int _strcmp (const_str a, const_str b) const
+    {
+        return wcscmp (a, b);
+    }
+
+    ILINE int _strncmp (const_str a, const_str b, size_type n) const
+    {
+        return wcsncmp (a, b, n);
+    }
+
+    ILINE int _stricmp (const_str a, const_str b) const
+    {
+        return azwcsicmp(a, b);
+    }
+
+    ILINE int _strnicmp (const_str a, const_str b, size_type n) const
+    {
+        return azwcsnicmp(a, b, n);
+    }
+
+    ILINE size_type _strspn(const_str str, const_str strCharSet) const
+    {
+        return (str == NULL) ? 0 : (size_type)::wcsspn(str, strCharSet);
+    }
+
+    ILINE size_type _strcspn(const_str str, const_str strCharSet) const
+    {
+        return (str == NULL) ? 0 : (size_type)::wcscspn(str, strCharSet);
+    }
+
+    static ILINE size_type _strlen(const_str str)
+    {
+        return (str == NULL) ? 0 : (size_type)::wcslen(str);
+    }
+
+    ILINE const_str _strchr(const_str str, value_type c) const
+    {
+        return (str == NULL) ? 0 : ::wcschr(str, c);
+    }
+
+    ILINE value_type* _strstr(value_type* str, const_str strSearch) const
+    {
+        return (str == NULL) ? 0 : ::wcsstr(str, strSearch);
+    }
+
+    ILINE void _copy(value_type* dest, const value_type* src, size_type count)
+    {
+        memcpy(dest, src, count * sizeof(value_type));
+    }
+
+    ILINE void _move(value_type* dest, const value_type* src, size_type count)
+    {
+        memmove(dest, src, count * sizeof(value_type));
+    }
+
+    ILINE void _set(value_type* dest, value_type ch, size_type count)
+    {
+        wmemset(dest, ch, count);
+    }
+
+    ILINE int   _vsnprintf(value_type* str, size_type size, const_str format, va_list ap)
+    {
+        return ::_vsnwprintf_s(str, size + 1, size, format, ap);
+    }
+};
+
+template <class T, size_t S>
+class CryStackStringT
+    : public CharTraits<T>
+{
+public:
+    //////////////////////////////////////////////////////////////////////////
+    // Types compatible with STL string.
+    //////////////////////////////////////////////////////////////////////////
+    typedef CryStackStringT<T, S> _Self;
+    typedef size_t size_type;
+    typedef T value_type;
+    typedef const value_type* const_str;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+    typedef pointer iterator;
+    typedef const_pointer const_iterator;
+    static const size_type MAX_SIZE = S;
+
+    enum _npos_type
+    {
+        npos = (size_type) ~0
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Constructors
+    //////////////////////////////////////////////////////////////////////////
+    CryStackStringT();
+
+public:
+
+    CryStackStringT(const _Self& str);
+    CryStackStringT(const _Self& str, size_type nOff, size_type nCount);
+    CryStackStringT(size_type nRepeat, value_type ch);
+
+    // The reason of making this constructor unavailable (for a while) is
+    // explained in comments in front of the declaration of
+    // CryStringT::CryStringT(size_type nRepeat, value_type ch)
+    // (see CryString.h).
+private:
+    CryStackStringT(value_type ch, size_type nRepeat);
+
+public:
+
+    CryStackStringT(const_str str);
+    CryStackStringT(const CryStringT<T>& str);
+    CryStackStringT(const_str str, size_type nLength);
+    CryStackStringT(const_iterator _First, const_iterator _Last);
+    ~CryStackStringT();
+
+    //////////////////////////////////////////////////////////////////////////
+    // STL string like interface.
+    //////////////////////////////////////////////////////////////////////////
+    //! Operators.
+    size_type length() const;
+    size_type size() const;
+    bool empty() const;
+    void clear();  // free up the data
+
+    //! Returns the storage currently allocated to hold the string, a value at least as large as length().
+    //  Also: capacity is always >= (MAX_SIZE-1)
+    size_type capacity() const;
+
+    // Sets the capacity of the string to a number at least as great as a specified number.
+    // nCount = 0 is shrinking string to fit number of characters in it.
+    // Shrink to fit post-cond: capacity() >= (MAX_SIZE-1)
+    void reserve(size_type nCount = 0);
+
+    _Self& append(const value_type* _Ptr);
+    _Self& append(const value_type* _Ptr, size_type nCount);
+    _Self& append(const _Self& _Str, size_type nOff, size_type nCount);
+    _Self& append(const _Self& _Str);
+    _Self& append(size_type nCount, value_type _Ch);
+    _Self& append(const_iterator _First, const_iterator _Last);
+
+    _Self& assign(const_str _Ptr);
+    _Self& assign(const_str _Ptr, size_type nCount);
+    _Self& assign(const _Self& _Str, size_type off, size_type nCount);
+    _Self& assign(const _Self& _Str);
+    _Self& assign(size_type nCount, value_type _Ch);
+    _Self& assign(const_iterator _First, const_iterator _Last);
+
+    value_type  at(size_type index) const;
+    //value_type& at( size_type index );
+
+    const_iterator begin() const { return m_str; };
+    const_iterator end() const { return m_str + length(); };
+
+    iterator begin() { return m_str; };
+    iterator end() { return m_str + length(); };
+
+    //! cast to C string operator.
+    operator const_str() const {
+        return m_str;
+    }
+
+    //! cast to C string.
+    const value_type* c_str() const { return m_str; }
+    const value_type* data() const { return m_str; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // string comparison.
+    //////////////////////////////////////////////////////////////////////////
+    int compare(const _Self& _Str) const;
+    int compare(size_type _Pos1, size_type _Num1, const _Self& _Str) const;
+    int compare(size_type _Pos1, size_type _Num1, const _Self& _Str, size_type nOff, size_type nCount) const;
+    int compare(const value_type* _Ptr) const;
+    int compare(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2 = npos) const;
+
+    // Case insensitive comparison
+    int compareNoCase(const _Self& _Str) const;
+    int compareNoCase(size_type _Pos1, size_type _Num1, const _Self& _Str) const;
+    int compareNoCase(size_type _Pos1, size_type _Num1, const _Self& _Str, size_type nOff, size_type nCount) const;
+    int compareNoCase(const value_type* _Ptr) const;
+    int compareNoCase(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2 = npos) const;
+
+    // Copies at most a specified number of characters from an indexed position in a source string to a target character array.
+    size_type copy(value_type* _Ptr, size_type nCount, size_type nOff = 0) const;
+
+    void push_back(value_type _Ch) { _ConcatenateInPlace(&_Ch, 1); }
+    void resize(size_type nCount, value_type _Ch = ' ');
+
+    //! simple sub-string extraction
+    _Self substr(size_type pos, size_type count = npos) const;
+
+    // replace part of string.
+    _Self& replace(value_type chOld, value_type chNew);
+    _Self& replace(const_str strOld, const_str strNew);
+    _Self& replace(size_type pos, size_type count, const_str strNew);
+    _Self& replace(size_type pos, size_type count, const_str strNew, size_type count2);
+    _Self& replace(size_type pos, size_type count, size_type nNumChars, value_type chNew);
+
+    // insert new elements to string.
+    _Self& insert(size_type nIndex, value_type ch);
+    _Self& insert(size_type nIndex, size_type nCount, value_type ch);
+    _Self& insert(size_type nIndex, const_str pstr);
+    _Self& insert(size_type nIndex, const_str pstr, size_type nCount);
+
+    //! delete count characters starting at zero-based index
+    _Self& erase(size_type nIndex, size_type count = npos);
+
+    //! searching (return starting index, or -1 if not found)
+    //! look for a single character match
+    //! like "C" strchr
+    size_type find(value_type ch, size_type pos = 0) const;
+    //! look for a specific sub-string
+    //! like "C" strstr
+    size_type find(const_str subs, size_type pos = 0) const;
+    size_type rfind(value_type ch, size_type pos = npos) const;
+
+    size_type find_first_of(value_type _Ch, size_type nOff = 0) const;
+    size_type find_first_of(const_str charSet, size_type nOff = 0) const;
+    //size_type find_first_of( const value_type* _Ptr,size_type _Off,size_type _Count ) const;
+    size_type find_first_of(const _Self& _Str, size_type _Off = 0) const;
+
+    size_type find_first_not_of(value_type _Ch, size_type _Off = 0) const;
+    size_type find_first_not_of(const value_type* _Ptr, size_type _Off = 0) const;
+    size_type find_first_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const;
+    size_type find_first_not_of(const _Self& _Str, size_type _Off = 0) const;
+
+    void swap(_Self& _Str);
+
+    //////////////////////////////////////////////////////////////////////////
+    // overloaded operators.
+    //////////////////////////////////////////////////////////////////////////
+    // overloaded indexing.
+    value_type operator[](size_type index) const;
+    //  value_type& operator[]( size_type index ); // same as at()
+
+    // overloaded assignment
+    _Self& operator=(const _Self& str);
+    _Self& operator=(value_type ch);
+    _Self& operator=(const_str str);
+    _Self& operator=(const CryStringT<T>& str);
+
+    void move(_Self& src);
+
+#if defined(LINUX) || defined(APPLE)
+    template<size_t AnySize>
+    _Self& operator=(const CryStackStringT<T, AnySize>& str)
+    {
+        _Assign(str.c_str(), str.size());
+        return *this;
+    }
+#endif
+
+    // string concatenation
+    _Self& operator+=(const _Self& str);
+    _Self& operator+=(value_type ch);
+    _Self& operator+=(const_str str);
+    _Self& operator+=(const CryStringT<T>& str);
+
+    size_t GetAllocatedMemory() const
+    {
+        size_t size = sizeof(*this);
+        if (m_str != m_strBuf)
+        {
+            size += (m_nAllocSize + 1) * sizeof(value_type);
+        }
+        return size;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Extended functions.
+    // This functions are not in the STL string.
+    // They have an ATL CString interface.
+    //////////////////////////////////////////////////////////////////////////
+    //! Format string, use (sprintf)
+    _Self& Format(const value_type* format, ...);
+
+    //! Format string fast, directly formats into string's buffer.
+    //  Make sure there is enough space to hold the string
+    _Self& FormatFast (const value_type* format, ...);
+
+    //! Converts the string to lower-case.
+    //  This function uses the "C" locale for case-conversion (ie, A-Z only).
+    _Self& MakeLower();
+
+    //! Converts the string to upper-case.
+    //  This function uses the "C" locale for case-conversion (ie, A-Z only).
+    _Self& MakeUpper();
+
+    _Self& Trim();
+    _Self& Trim(value_type ch);
+    _Self& Trim(const value_type* sCharSet);
+
+    _Self& TrimLeft();
+    _Self& TrimLeft(value_type ch);
+    _Self& TrimLeft(const value_type* sCharSet);
+
+    _Self& TrimRight();
+    _Self& TrimRight(value_type ch);
+    _Self& TrimRight(const value_type* sCharSet);
+
+    _Self SpanIncluding(const_str charSet) const;
+    _Self SpanExcluding(const_str charSet) const;
+    _Self Tokenize(const_str charSet, int& nStart) const;
+    _Self Mid(size_type nFirst, size_type nCount = npos) const {  return substr(nFirst, nCount); };
+
+    _Self Left(size_type count) const;
+    _Self Right(size_type count) const;
+    //////////////////////////////////////////////////////////////////////////
+
+    // public utilities.
+    static bool _IsValidString(const_str str);
+
+public:
+    //////////////////////////////////////////////////////////////////////////
+    // Only used for debugging statistics.
+    //////////////////////////////////////////////////////////////////////////
+    static size_t _usedMemory(size_t size)
+    {
+        static size_t s_used_memory = 0;
+        s_used_memory += size;
+        return s_used_memory;
+    }
+
+    //private:
+public:
+    size_type   m_nLength;
+    size_type   m_nAllocSize;
+    value_type* m_str;                              // pointer to ref counted string data
+    value_type  m_strBuf[MAX_SIZE];
+
+    // implementation helpers
+    void _AllocData(size_type nLen);
+    void _FreeData(value_type* pData);
+    void _Free();
+    void _Initialize();
+
+    void _Concatenate(const_str sStr1, size_type nLen1, const_str sStr2, size_type nLen2);
+    void _ConcatenateInPlace(const_str sStr, size_type nLen);
+    void _Assign(const_str sStr, size_type nLen);
+    void _MakeUnique();
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CryStackStringT<T,S> Implementation
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline bool CryStackStringT<T, S>::_IsValidString(const_str)
+{
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::_Assign(const_str sStr, size_type nLen)
+{
+    // Check if this string is shared (reference count greater then 1) or not enough capacity to store new string.
+    // Then allocate new string buffer.
+    if (nLen > capacity())
+    {
+        _Free();
+        _AllocData(nLen);
+    }
+    // Copy characters from new string to this buffer.
+    CharTraits<T>::_copy(m_str, sStr, nLen);
+    // Set new length.
+    m_nLength = nLen;
+    // Make null terminated string.
+    m_str[nLen] = 0;
+    CRY_STRING_DEBUG(m_str)
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::_Concatenate(const_str sStr1, size_type nLen1, const_str sStr2, size_type nLen2)
+{
+    size_type nLen = nLen1 + nLen2;
+    if (nLen1 * 2 > nLen)
+    {
+        nLen = nLen1 * 2;
+    }
+    if (nLen != 0)
+    {
+        if (nLen < 8)
+        {
+            nLen = 8;
+        }
+        _AllocData(nLen);
+        CharTraits<T>::_copy(m_str, sStr1, nLen1);
+        CharTraits<T>::_copy(m_str + nLen1, sStr2, nLen2);
+        m_nLength = nLen1 + nLen2;
+        m_str[nLen1 + nLen2] = 0;
+    }
+    CRY_STRING_DEBUG(m_str)
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::_ConcatenateInPlace(const_str sStr, size_type nLen)
+{
+    if (nLen != 0)
+    {
+        // Check if this string is shared (reference count greater then 1) or not enough capacity to store new string.
+        // Then allocate new string buffer.
+        if (length() + nLen > capacity())
+        {
+            value_type* pOldData = m_str;
+            _Concatenate(m_str, length(), sStr, nLen);
+            _FreeData(pOldData);
+        }
+        else
+        {
+            CharTraits<T>::_copy(m_str + length(), sStr, nLen);
+            m_nLength += nLen;
+            m_str[m_nLength] = 0; // Make null terminated string.
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::_MakeUnique()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::_Initialize()
+{
+    m_strBuf[0] = 0;
+    m_str = m_strBuf;
+    m_nLength = 0;
+    m_nAllocSize = MAX_SIZE - 1; // 0 termination not counted!
+}
+
+// always allocate one extra character for '\0' termination
+// assumes [optimistically] that data length will equal allocation length
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::_AllocData(size_type nLen)
+{
+    assert(nLen >= 0);
+    assert(nLen <= INT_MAX - 1);    // max size (enough room for 1 extra)
+
+    if (nLen == 0)
+    {
+        _Initialize();
+    }
+    else
+    {
+        size_type allocLen = (nLen + 1) * sizeof(value_type);
+        value_type* pData = m_strBuf;
+        if (allocLen > MAX_SIZE)
+        {
+            pData = (value_type*)CryModuleMalloc(allocLen);
+            _usedMemory(allocLen);   // For statistics.
+            m_nAllocSize = nLen;
+        }
+        else
+        {
+            m_nAllocSize = MAX_SIZE - 1;
+        }
+        m_nLength = nLen;
+        m_str = pData;
+        m_str[nLen] = 0; // null terminated string.
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::_Free()
+{
+    _FreeData(m_str);
+    _Initialize();
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::_FreeData(value_type* pData)
+{
+    if (pData != m_strBuf)
+    {
+        size_t allocLen = (m_nAllocSize + 1) * sizeof(value_type);
+        _usedMemory(-check_cast<ptrdiff_t>(allocLen));   // For statistics.
+        CryModuleFree(pData);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>::CryStackStringT()
+{
+    _Initialize();
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>::CryStackStringT(const CryStackStringT<T, S>& str)
+{
+    _Initialize();
+    _Assign(str.c_str(), str.length());
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>::CryStackStringT(const CryStackStringT<T, S>& str, size_type nOff, size_type nCount)
+{
+    _Initialize();
+    assign(str, nOff, nCount);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>::CryStackStringT(const_str str)
+{
+    _Initialize();
+    // Make a copy of C string.
+    size_type nLen = this->_strlen(str);
+    if (nLen != 0)
+    {
+        _AllocData(nLen);
+        CharTraits<T>::_copy(m_str, str, nLen);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>::CryStackStringT(const CryStringT<T>& str)
+{
+    _Initialize();
+    size_t nLength = str.size();
+    if (nLength > 0)
+    {
+        _AllocData(nLength);
+        CharTraits<T>::_copy(m_str, str.c_str(), nLength);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>::CryStackStringT(const_str str, size_type nLength)
+{
+    _Initialize();
+    if (nLength > 0)
+    {
+        _AllocData(nLength);
+        CharTraits<T>::_copy(m_str, str, nLength);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// The reason of making this constructor unavailable (for a while) is
+// explained in comments in front of the declaration of
+// CryStringT::CryStringT(size_type nRepeat, value_type ch)
+// (see CryString.h).
+template <class T, size_t S>
+inline CryStackStringT<T, S>::CryStackStringT(size_type nRepeat, value_type ch)
+{
+    _Initialize();
+    if (nRepeat > 0)
+    {
+        _AllocData(nRepeat);
+        CharTraits<T>::_set(m_str, ch, nRepeat);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>::CryStackStringT(const_iterator _First, const_iterator _Last)
+{
+    _Initialize();
+    size_type nLength = (size_type)(_Last - _First);
+    if (nLength > 0)
+    {
+        _AllocData(nLength);
+        CharTraits<T>::_copy(m_str, _First, nLength);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>::~CryStackStringT()
+{
+    _FreeData(m_str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::length() const
+{
+    return m_nLength;
+}
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::size() const
+{
+    return m_nLength;
+}
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::capacity() const
+{
+    return m_nAllocSize;
+}
+
+template <class T, size_t S>
+inline bool CryStackStringT<T, S>::empty() const
+{
+    return length() == 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::clear()
+{
+    if (length() == 0)
+    {
+        return;
+    }
+    _Free();
+    assert(length() == 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::reserve(size_type nCount)
+{
+    // Reserve of 0 is shrinking container to fit number of characters in it..
+    if (nCount > capacity())
+    {
+        value_type* pOldData = m_str;
+        size_type nOldLength = m_nLength;
+        _AllocData(nCount);
+        CharTraits<T>::_copy(m_str, pOldData, nOldLength);
+        m_nLength = nOldLength;
+        m_str[m_nLength] = 0;
+        _FreeData(pOldData);
+    }
+    else if (nCount == 0)
+    {
+        if (length() != capacity())
+        {
+            value_type* pOldData = m_str;
+            if (pOldData != m_strBuf)  // in case we fit into our static buffer, we cannot shrink anyway
+            {
+                size_type nOldLength = m_nLength;
+                _AllocData(m_nLength);
+                // if (pOldData != m_strBuf || m_str != m_strBuf) // actually always true
+                // {
+                CharTraits<T>::_copy(m_str, pOldData, nOldLength); // we can safely use CharTraits<T>::_copy, as we never overlap here (in case of static buffer, we don't shrink anyway)
+                _FreeData(pOldData);
+                // }
+            }
+        }
+    }
+    CRY_STRING_DEBUG(m_str)
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const_str _Ptr)
+{
+    *this += _Ptr;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const_str _Ptr, size_type nCount)
+{
+    _ConcatenateInPlace(_Ptr, nCount);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const CryStackStringT<T, S>& _Str, size_type off, size_type nCount)
+{
+    size_type len = _Str.length();
+    if (off > len)
+    {
+        return *this;
+    }
+    if (off + nCount > len)
+    {
+        nCount = len - off;
+    }
+    _ConcatenateInPlace(_Str.m_str + off, nCount);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const CryStackStringT<T, S>& _Str)
+{
+    *this += _Str;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(size_type nCount, value_type _Ch)
+{
+    if (nCount > 0)
+    {
+        if (length() + nCount >= capacity())
+        {
+            value_type* pOldData = m_str;
+            size_type nOldLength = m_nLength;
+            _AllocData(length() + nCount);
+            CharTraits<T>::_copy(m_str, pOldData, nOldLength);
+            CharTraits<T>::_set(m_str + nOldLength, _Ch, nCount);
+            _FreeData(pOldData);
+        }
+        else
+        {
+            size_type nOldLength = length();
+            CharTraits<T>::_set(m_str + nOldLength, _Ch, nCount);
+            m_nLength = nOldLength + nCount;
+            m_str[length()] = 0; // Make null terminated string.
+        }
+    }
+    CRY_STRING_DEBUG(m_str)
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::append(const_iterator _First, const_iterator _Last)
+{
+    append(_First, (size_type)(_Last - _First));
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const_str _Ptr)
+{
+    *this = _Ptr;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const_str _Ptr, size_type nCount)
+{
+    size_type len = this->_strlen(_Ptr);
+    _Assign(_Ptr, (nCount < len) ? nCount : len);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const CryStackStringT<T, S>& _Str, size_type off, size_type nCount)
+{
+    size_type len = _Str.length();
+    if (off > len)
+    {
+        return *this;
+    }
+    if (off + nCount > len)
+    {
+        nCount = len - off;
+    }
+    _Assign(_Str.m_str + off, nCount);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const CryStackStringT<T, S>& _Str)
+{
+    *this = _Str;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(size_type nCount, value_type _Ch)
+{
+    if (nCount >= 1)
+    {
+        _AllocData(nCount);
+        CharTraits<T>::_set(m_str, _Ch, nCount);
+        CRY_STRING_DEBUG(m_str)
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::assign(const_iterator _First, const_iterator _Last)
+{
+    assign(_First, (size_type)(_Last - _First));
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::value_type CryStackStringT<T, S>::at(size_type index) const
+{
+    assert(index >= 0 && index < length());
+    return m_str[index];
+}
+
+/*
+inline value_type& CryStackStringT<T,S>::at( size_type index )
+{
+// same as GetAt
+assert( index >= 0 && index < length() );
+return m_str[index];
+}
+*/
+
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::value_type CryStackStringT<T, S>::operator[](size_type index) const
+{
+    assert(index < length());
+    return m_str[index];
+}
+
+
+/*
+inline value_type& CryStackStringT<T,S>::operator[]( size_type index )
+{
+// same as GetAt
+assert( index >= 0 && index < length() );
+return m_str[index];
+}
+*/
+
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compare(const CryStackStringT<T, S>& _Str) const
+{
+    return CharTraits<T>::_strcmp(m_str, _Str.m_str);
+}
+
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compare(size_type _Pos1, size_type _Num1, const CryStackStringT<T, S>& _Str) const
+{
+    return compare(_Pos1, _Num1, _Str.m_str, npos);
+}
+
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compare(size_type _Pos1, size_type _Num1, const CryStackStringT<T, S>& _Str, size_type nOff, size_type nCount) const
+{
+    assert(nOff < _Str.length());
+    return compare(_Pos1, _Num1, _Str.m_str + nOff, nCount);
+}
+
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compare(const value_type* _Ptr) const
+{
+    return CharTraits<T>::_strcmp(m_str, _Ptr);
+}
+
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compare(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2) const
+{
+    assert(_Pos1 < length());
+    if (length() - _Pos1 < _Num1)
+    {
+        _Num1 = length() - _Pos1; // trim to size
+    }
+    int res = _Num1 == 0 ? 0 : CharTraits<T>::_strncmp(m_str + _Pos1, _Ptr, (_Num1 < _Num2) ? _Num1 : _Num2);
+    return (res != 0 ? res : _Num2 == npos && _Ptr[_Num1] == 0 ? 0 : _Num1 < _Num2 ? -1 : _Num1 == _Num2 ? 0 : +1);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compareNoCase(const CryStackStringT<T, S>& _Str) const
+{
+    return CharTraits<T>::_stricmp(m_str, _Str.m_str);
+}
+
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compareNoCase(size_type _Pos1, size_type _Num1, const CryStackStringT<T, S>& _Str) const
+{
+    return compareNoCase(_Pos1, _Num1, _Str.m_str, npos);
+}
+
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compareNoCase(size_type _Pos1, size_type _Num1, const CryStackStringT<T, S>& _Str, size_type nOff, size_type nCount) const
+{
+    assert(nOff < _Str.length());
+    return compareNoCase(_Pos1, _Num1, _Str.m_str + nOff, nCount);
+}
+
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compareNoCase(const value_type* _Ptr) const
+{
+    return CharTraits<T>::_stricmp(m_str, _Ptr);
+}
+
+template <class T, size_t S>
+inline int CryStackStringT<T, S>::compareNoCase(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2) const
+{
+    assert(_Pos1 < length());
+    if (length() - _Pos1 < _Num1)
+    {
+        _Num1 = length() - _Pos1; // trim to size
+    }
+    int res = _Num1 == 0 ? 0 : CharTraits<T>::_strnicmp(m_str + _Pos1, _Ptr, (_Num1 < _Num2) ? _Num1 : _Num2);
+    return (res != 0 ? res : _Num2 == npos && _Ptr[_Num1] == 0 ? 0 : _Num1 < _Num2 ? -1 : _Num1 == _Num2 ? 0 : +1);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::copy(value_type* _Ptr, size_type nCount, size_type nOff) const
+{
+    assert(nOff < length());
+    if (nCount < 0)
+    {
+        nCount = 0;
+    }
+    if (nOff + nCount > length()) // trim to offset.
+    {
+        nCount = length() - nOff;
+    }
+
+    CharTraits<T>::_copy(_Ptr, m_str + nOff, nCount);
+    return nCount;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::resize(size_type nCount, value_type _Ch)
+{
+    _MakeUnique();
+    if (nCount > length())
+    {
+        size_type numToAdd = nCount - length();
+        append(numToAdd, _Ch);
+    }
+    else if (nCount < length())
+    {
+        m_nLength = nCount;
+        m_str[length()] = 0; // Make null terminated string.
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+//! compare helpers
+template <class T, size_t S>
+inline bool operator==(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
+{ return s1.compare(s2) == 0; }
+template <class T, size_t S>
+inline bool operator==(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
+{ return s1.compare(s2) == 0; }
+template <class T, size_t S>
+inline bool operator==(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
+{ return s2.compare(s1) == 0; }
+template <class T, size_t S>
+inline bool operator!=(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
+{ return s1.compare(s2) != 0; }
+template <class T, size_t S>
+inline bool operator!=(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
+{ return s1.compare(s2) != 0; }
+template <class T, size_t S>
+inline bool operator!=(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
+{ return s2.compare(s1) != 0; }
+template <class T, size_t S>
+inline bool operator<(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
+{ return s1.compare(s2) < 0; }
+template <class T, size_t S>
+inline bool operator<(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
+{ return s1.compare(s2) < 0; }
+template <class T, size_t S>
+inline bool operator<(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
+{ return s2.compare(s1) > 0; }
+template <class T, size_t S>
+inline bool operator>(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
+{ return s1.compare(s2) > 0; }
+template <class T, size_t S>
+inline bool operator>(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
+{ return s1.compare(s2) > 0; }
+template <class T, size_t S>
+inline bool operator>(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
+{ return s2.compare(s1) < 0; }
+template <class T, size_t S>
+inline bool operator<=(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
+{ return s1.compare(s2) <= 0; }
+template <class T, size_t S>
+inline bool operator<=(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
+{ return s1.compare(s2) <= 0; }
+template <class T, size_t S>
+inline bool operator<=(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
+{ return s2.compare(s1) >= 0; }
+template <class T, size_t S>
+inline bool operator>=(const CryStackStringT<T, S>& s1, const CryStackStringT<T, S>& s2)
+{ return s1.compare(s2) >= 0; }
+template <class T, size_t S>
+inline bool operator>=(const CryStackStringT<T, S>& s1, const typename CryStackStringT<T, S>::value_type* s2)
+{ return s1.compare(s2) >= 0; }
+template <class T, size_t S>
+inline bool operator>=(const typename CryStackStringT<T, S>::value_type* s1, const CryStackStringT<T, S>& s2)
+{ return s2.compare(s1) <= 0; }
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator=(value_type ch)
+{
+    _Assign(&ch, 1);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S> operator+(const CryStackStringT<T, S>& string1, typename CryStackStringT<T, S>::value_type ch)
+{
+    CryStackStringT<T, S> s(string1);
+    s.append(1, ch);
+    return s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S> operator+(typename CryStackStringT<T, S>::value_type ch, const CryStackStringT<T, S>& str)
+{
+    CryStackStringT<T, S> s;
+    s.reserve(str.size() + 1);
+    s.append(1, ch);
+    s.append(str);
+    return s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S> operator+(const CryStackStringT<T, S>& string1, const CryStackStringT<T, S>& string2)
+{
+    CryStackStringT<T, S> s(string1);
+    s.append(string2);
+    return s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S> operator+(const CryStackStringT<T, S>& str1, const typename CryStackStringT<T, S>::value_type* str2)
+{
+    CryStackStringT<T, S> s(str1);
+    s.append(str2);
+    return s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S> operator+(const typename CryStackStringT<T, S>::value_type* str1, const CryStackStringT<T, S>& str2)
+{
+    assert(str1 == NULL || (CryStackStringT<T, S>::_IsValidString(str1)));
+    CryStackStringT<T, S> s;
+    s.reserve(CharTraits<T>::_strlen(str1) + str2.size());
+    s.append(str1);
+    s.append(str2);
+    return s;
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator=(const CryStackStringT<T, S>& str)
+{
+    _Assign (str.c_str(), str.length());
+    return *this;
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator=(const_str str)
+{
+    assert(str == NULL || _IsValidString(str));
+    _Assign(str, this->_strlen(str));
+    return *this;
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator=(const CryStringT<T>& str)
+{
+    _Assign(str.c_str(), str.size());
+    return *this;
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator+=(const CryStringT<T>& str)
+{
+    _ConcatenateInPlace(str.c_str(), str.size());
+    return *this;
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator+=(const_str str)
+{
+    assert(str == NULL || _IsValidString(str));
+    _ConcatenateInPlace(str, this->_strlen(str));
+    return *this;
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator+=(value_type ch)
+{
+    _ConcatenateInPlace(&ch, 1);
+    return *this;
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::operator+=(const CryStackStringT<T, S>& str)
+{
+    _ConcatenateInPlace(str.m_str, str.length());
+    return *this;
+}
+
+//! find first single character
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find(value_type ch, size_type pos) const
+{
+    if (!(/*pos >= 0 && */ pos <= length()))
+    {
+        return (typename CryStackStringT<T, S>::size_type)npos;
+    }
+    const_str str = CharTraits<T>::_strchr(m_str + pos, ch);
+    // return npos if not found and index otherwise
+    return (str == NULL) ? npos : (size_type)(str - m_str);
+}
+
+//! find a sub-string (like strstr)
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find(const_str subs, size_type pos) const
+{
+    assert(_IsValidString(subs));
+    if (!(pos >= 0 && pos <= length()))
+    {
+        return npos;
+    }
+
+    // find first matching substring
+    const_str str = CharTraits<T>::_strstr(m_str + pos, subs);
+
+    // return npos for not found, distance from beginning otherwise
+    return (str == NULL) ? npos : (size_type)(str - m_str);
+}
+
+//! find last single character
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::rfind(value_type ch, size_type pos) const
+{
+    const_str str;
+    if (pos == npos)
+    {
+        // find last single character
+        str = strrchr(m_str, ch);
+        // return -1 if not found, distance from beginning otherwise
+        return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
+    }
+    else
+    {
+        if (pos == npos)
+        {
+            pos = length();
+        }
+        if (!(pos >= 0 && pos <= length()))
+        {
+            return npos;
+        }
+
+        value_type tmp = m_str[pos + 1];
+        m_str[pos + 1] = 0;
+        str = strrchr(m_str, ch);
+        m_str[pos + 1] = tmp;
+    }
+    // return -1 if not found, distance from beginning otherwise
+    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_of(const CryStackStringT<T, S>& _Str, size_type _Off) const
+{
+    return find_first_of(_Str.m_str, _Off);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_of(value_type _Ch, size_type nOff) const
+{
+    if (!(nOff >= 0 && nOff <= length()))
+    {
+        return npos;
+    }
+    value_type charSet[2] = { _Ch, 0 };
+    const_str str = strpbrk(m_str + nOff, charSet);
+    return (str == NULL) ? -1 : (size_type)(str - m_str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_of(const_str charSet, size_type nOff) const
+{
+    assert(_IsValidString(charSet));
+    if (!(nOff >= 0 && nOff <= length()))
+    {
+        return npos;
+    }
+    const_str str = strpbrk(m_str + nOff, charSet);
+    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
+}
+
+//size_type find_first_not_of(const _Self& __s, size_type __pos = 0) const
+//{ return find_first_not_of(__s._M_start, __pos, __s.size()); }
+
+//size_type find_first_not_of(const _CharT* __s, size_type __pos = 0) const
+//{ _STLP_FIX_LITERAL_BUG(__s) return find_first_not_of(__s, __pos, _Traits::length(__s)); }
+
+//size_type find_first_not_of(const _CharT* __s, size_type __pos,   size_type __n) const;
+
+//size_type find_first_not_of(_CharT __c, size_type __pos = 0) const;
+
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_not_of(const value_type* _Ptr, size_type _Off) const
+{ return find_first_not_of(_Ptr, _Off, this->_strlen(_Ptr)); }
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_not_of(const CryStackStringT<T, S>& _Str, size_type _Off) const
+{ return find_first_not_of(_Str.m_str, _Off); }
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_not_of(value_type _Ch, size_type _Off) const
+{
+    if (_Off > length())
+    {
+        return npos;
+    }
+    else
+    {
+        for (const value_type* str = begin() + _Off; str != end(); ++str)
+        {
+            if (*str != _Ch)
+            {
+                return size_type(str - begin()); // Character found!
+            }
+        }
+        return npos;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline typename CryStackStringT<T, S>::size_type CryStackStringT<T, S>::find_first_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const
+{
+    if (_Off > length())
+    {
+        return npos;
+    }
+    else
+    {
+        const value_type* charsFirst = _Ptr, * charsLast = _Ptr + _Count;
+        for (const value_type* str = begin() + _Off; str != end(); ++str)
+        {
+            const value_type* c;
+            for (c = charsFirst; c != charsLast; ++c)
+            {
+                if (*c == *str)
+                {
+                    break;
+                }
+            }
+            if (c == charsLast)
+            {
+                return size_type(str - begin());// Current character not in char set.
+            }
+        }
+        return npos;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S> CryStackStringT<T, S>::substr(size_type pos, size_type count) const
+{
+    if (pos >= length())
+    {
+        return CryStackStringT<T, S>();
+    }
+    if (count == npos)
+    {
+        count = length() - pos;
+    }
+    if (pos + count > length())
+    {
+        count = length() - pos;
+    }
+    return CryStackStringT<T, S>(m_str + pos, count);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::erase(size_type nIndex, size_type nCount)
+{
+    if (nIndex < 0)
+    {
+        nIndex = 0;
+    }
+    if (nCount < 0 || nCount > length() - nIndex)
+    {
+        nCount = length() - nIndex;
+    }
+    if (nCount > 0 && nIndex < length())
+    {
+        _MakeUnique();
+        size_type nNumToCopy = length() - (nIndex + nCount) + 1;
+        CharTraits<T>::_move(m_str + nIndex, m_str + nIndex + nCount, nNumToCopy);
+        m_nLength = length() - nCount;
+    }
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::insert(size_type nIndex, value_type ch)
+{
+    return insert(nIndex, 1, ch);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::insert(size_type nIndex, size_type nCount, value_type ch)
+{
+    _MakeUnique();
+
+    if (nIndex < 0)
+    {
+        nIndex = 0;
+    }
+
+    size_type nNewLength = length();
+    if (nIndex > nNewLength)
+    {
+        nIndex = nNewLength;
+    }
+    nNewLength += nCount;
+
+    if (capacity() < nNewLength)
+    {
+        value_type* pOldData = m_str;
+        size_type nOldLength = m_nLength;
+        const_str pstr = m_str;
+        _AllocData(nNewLength);
+        CharTraits<T>::_copy(m_str, pstr, nOldLength + 1);
+        _FreeData(pOldData);
+    }
+
+    CharTraits<T>::_move(m_str + nIndex + nCount, m_str + nIndex, (nNewLength - nIndex));
+    CharTraits<T>::_set(m_str + nIndex, ch, nCount);
+    m_nLength = nNewLength;
+    CRY_STRING_DEBUG(m_str)
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::insert(size_type nIndex, const_str pstr, size_type nCount)
+{
+    if (nIndex < 0)
+    {
+        nIndex = 0;
+    }
+
+    size_type nInsertLength = nCount;
+    size_type nNewLength = length();
+    if (nInsertLength > 0)
+    {
+        _MakeUnique();
+        if (nIndex > nNewLength)
+        {
+            nIndex = nNewLength;
+        }
+        nNewLength += nInsertLength;
+
+        if (capacity() < nNewLength)
+        {
+            value_type* pOldData = m_str;
+            size_type nOldLength = m_nLength;
+            const_str pOldStr = m_str;
+            _AllocData(nNewLength);
+            CharTraits<T>::_copy(m_str, pOldStr, (nOldLength + 1));
+            _FreeData(pOldData);
+        }
+
+        CharTraits<T>::_move(m_str + nIndex + nInsertLength, m_str + nIndex, (nNewLength - nIndex - nInsertLength + 1));
+        CharTraits<T>::_copy(m_str + nIndex, pstr, nInsertLength);
+        m_nLength = nNewLength;
+        m_str[length()] = 0;
+    }
+    CRY_STRING_DEBUG(m_str)
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::insert(size_type nIndex, const_str pstr)
+{
+    return insert(nIndex, pstr, this->_strlen(pstr));
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(size_type pos, size_type count, const_str strNew)
+{
+    return replace(pos, count, strNew, this->_strlen(strNew));
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(size_type pos, size_type count, const_str strNew, size_type count2)
+{
+    erase(pos, count);
+    insert(pos, strNew, count2);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(size_type pos, size_type count, size_type nNumChars, value_type chNew)
+{
+    erase(pos, count);
+    insert(pos, nNumChars, chNew);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(value_type chOld, value_type chNew)
+{
+    if (chOld != chNew)
+    {
+        _MakeUnique();
+        value_type* strend = m_str + length();
+        for (value_type* str = m_str; str != strend; ++str)
+        {
+            if (*str == chOld)
+            {
+                *str = chNew;
+            }
+        }
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::replace(const_str strOld, const_str strNew)
+{
+    size_type nSourceLen = this->_strlen(strOld);
+    if (nSourceLen == 0)
+    {
+        return *this;
+    }
+    size_type nReplacementLen = this->_strlen(strNew);
+
+    size_type nCount = 0;
+    value_type* strStart = m_str;
+    value_type* strEnd = m_str + length();
+    value_type* strTarget;
+    while (strStart < strEnd)
+    {
+        while ((strTarget = CharTraits<T>::_strstr(strStart, strOld)) != NULL)
+        {
+            nCount++;
+            strStart = strTarget + nSourceLen;
+        }
+        strStart += this->_strlen(strStart) + 1;
+    }
+
+    if (nCount > 0)
+    {
+        _MakeUnique();
+
+        size_type nOldLength = length();
+        size_type nNewLength =  nOldLength + (nReplacementLen - nSourceLen) * nCount;
+        if (capacity() < nNewLength)
+        {
+            value_type* pOldData = m_str;
+            size_type nPrevLength = m_nLength;
+            const_str pstr = m_str;
+            _AllocData(nNewLength);
+            CharTraits<T>::_copy(m_str, pstr, nPrevLength);
+            _FreeData(pOldData);
+        }
+        strStart = m_str;
+        strEnd = m_str + length();
+
+        while (strStart < strEnd)
+        {
+            while ((strTarget = CharTraits<T>::_strstr(strStart, strOld)) != NULL)
+            {
+                size_type nBalance = nOldLength - ((size_type)(strTarget - m_str) + nSourceLen);
+                CharTraits<T>::_move(strTarget + nReplacementLen, strTarget + nSourceLen, nBalance);
+                CharTraits<T>::_copy(strTarget, strNew, nReplacementLen);
+                strStart = strTarget + nReplacementLen;
+                strStart[nBalance] = 0;
+                nOldLength += (nReplacementLen - nSourceLen);
+            }
+            strStart += this->_strlen(strStart) + 1;
+        }
+        m_nLength = nNewLength;
+    }
+    CRY_STRING_DEBUG(m_str)
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::move(CryStackStringT<T, S>& str)
+{
+    memcpy(this, &str, sizeof(*this));
+    if (str.m_str == str.m_strBuf)
+    {
+        m_str = m_strBuf;
+    }
+}
+
+template <class T, size_t S>
+inline void CryStackStringT<T, S>::swap(CryStackStringT<T, S>& _Str)
+{
+    CryStackStringT<T, S> temp;
+    temp.move(*this);
+    move(_Str);
+    _Str.move(temp);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::Format(const_str format, ...)
+{
+    assert(_IsValidString(format));
+
+    value_type temp[4096]; // Limited to 4096 characters!
+    va_list argList;
+    va_start(argList, format);
+    this->_vsnprintf(temp, 4095, format, argList);
+    temp[4095] = '\0';
+    va_end(argList);
+    *this = temp;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::FormatFast(const_str format, ...)
+{
+    assert(_IsValidString(format));
+
+    va_list argList;
+    va_start(argList, format);
+
+    int newLength = this->_vsnprintf(m_str, capacity(), format, argList);
+    if (newLength >= 0)
+    {
+        m_nLength = (size_type)newLength;
+    }
+    else
+    {
+        m_nLength = capacity();
+        m_str[capacity()] = '\0';
+    }
+
+    va_end(argList);
+
+    return *this;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::MakeLower()
+{
+    _MakeUnique();
+    for (value_type* s = m_str; *s != 0; s++)
+    {
+        *s = this->_ascii_tolower(*s);
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::MakeUpper()
+{
+    _MakeUnique();
+    for (value_type* s = m_str; *s != 0; s++)
+    {
+        *s = this->_ascii_toupper(*s);
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::Trim()
+{
+    return TrimRight().TrimLeft();
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::Trim(value_type ch)
+{
+    _MakeUnique();
+    const value_type chset[2] = { ch, 0 };
+    return TrimRight(chset).TrimLeft(chset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::Trim(const value_type* sCharSet)
+{
+    _MakeUnique();
+    return TrimRight(sCharSet).TrimLeft(sCharSet);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimRight(value_type ch)
+{
+    const value_type chset[2] = { ch, 0 };
+    return TrimRight(chset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimRight(const value_type* sCharSet)
+{
+    if (!sCharSet || !(*sCharSet) || length() < 1)
+    {
+        return *this;
+    }
+
+    const value_type* last = m_str + length() - 1;
+    const value_type* str = last;
+    while ((str != m_str) && (CharTraits<T>::_strchr(sCharSet, *str) != 0))
+    {
+        str--;
+    }
+
+    if (str != last)
+    {
+        // Just shrink length of the string.
+        size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
+        _MakeUnique();
+        m_nLength = nNewLength;
+        m_str[nNewLength] = 0;
+    }
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimRight()
+{
+    if (length() < 1)
+    {
+        return *this;
+    }
+
+    const value_type* last = m_str + length() - 1;
+    const value_type* str = last;
+    while ((str != m_str) && (CharTraits<T>::_isspace(*str) != 0))
+    {
+        str--;
+    }
+
+    if (str != last)     // something changed?
+    {
+        // Just shrink length of the string.
+        size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
+        _MakeUnique();
+        m_nLength = nNewLength;
+        m_str[nNewLength] = 0;
+    }
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimLeft(value_type ch)
+{
+    const value_type chset[2] = { ch, 0 };
+    return TrimLeft(chset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimLeft(const value_type* sCharSet)
+{
+    if (!sCharSet || !(*sCharSet))
+    {
+        return *this;
+    }
+
+    const value_type* str = m_str;
+    while ((*str != 0) && (CharTraits<T>::_strchr(sCharSet, *str) != 0))
+    {
+        str++;
+    }
+
+    if (str != m_str)
+    {
+        size_type nOff = (size_type)(str - m_str); // m_str can change in _MakeUnique
+        _MakeUnique();
+        size_type nNewLength = length() - nOff;
+        CharTraits<T>::_move(m_str, m_str + nOff, nNewLength + 1);
+        m_nLength = nNewLength;
+        m_str[nNewLength] = 0;
+    }
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S>& CryStackStringT<T, S>::TrimLeft()
+{
+    const value_type* str = m_str;
+    while ((*str != 0) && (CharTraits<T>::_isspace(*str) != 0))
+    {
+        str++;
+    }
+
+    if (str != m_str)
+    {
+        size_type nOff = (size_type)(str - m_str); // m_str can change in _MakeUnique
+        _MakeUnique();
+        size_type nNewLength = length() - nOff;
+        CharTraits<T>::_move(m_str, m_str + nOff, nNewLength + 1);
+        m_nLength = nNewLength;
+        m_str[nNewLength] = 0;
+    }
+
+    return *this;
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S> CryStackStringT<T, S>::Right(size_type count) const
+{
+    if (count == npos)
+    {
+        return CryStackStringT<T, S>();
+    }
+    else if (count > length())
+    {
+        return *this;
+    }
+
+    return CryStackStringT<T, S>(m_str + length() - count, count);
+}
+
+template <class T, size_t S>
+inline CryStackStringT<T, S> CryStackStringT<T, S>::Left(size_type count) const
+{
+    if (count == npos)
+    {
+        return CryStackStringT<T, S>();
+    }
+    else if (count > length())
+    {
+        count = length();
+    }
+
+    return CryStackStringT<T, S>(m_str, count);
+}
+
+// strspn equivalent
+template <class T, size_t S>
+inline CryStackStringT<T, S> CryStackStringT<T, S>::SpanIncluding(const_str charSet) const
+{
+    assert(_IsValidString(charSet));
+    return Left((size_type)this->_strspn(m_str, charSet));
+}
+
+// strcspn equivalent
+template <class T, size_t S>
+inline CryStackStringT<T, S> CryStackStringT<T, S>::SpanExcluding(const_str charSet) const
+{
+    assert(_IsValidString(charSet));
+    return Left((size_type)this->_strcspn(m_str, charSet));
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t S>
+inline CryStackStringT<T, S> CryStackStringT<T, S>::Tokenize(const_str charSet, int& nStart) const
+{
+    if (nStart < 0)
+    {
+        return CryStackStringT<T, S>();
+    }
+
+    if (!charSet)
+    {
+        return *this;
+    }
+
+    const_str sPlace = m_str + nStart;
+    const_str sEnd = m_str + length();
+    if (sPlace < sEnd)
+    {
+        int nIncluding = (int)this->_strspn(sPlace, charSet);
+
+        if ((sPlace + nIncluding) < sEnd)
+        {
+            sPlace += nIncluding;
+            int nExcluding = (int)this->_strcspn(sPlace, charSet);
+            int nFrom = nStart + nIncluding;
+            nStart = nFrom + nExcluding + 1;
+
+            return substr(nFrom, nExcluding);
+        }
+    }
+    // Return empty string.
+    nStart = -1;
+    return CryStackStringT<T, S>();
+}
+
+#if defined(_RELEASE)
+#define ASSERT_LEN        (void)(0)
+#define ASSERT_WLEN       (void)(0)
+#else
+#define ASSERT_LEN        CRY_ASSERT_TRACE(this->length() <= S, ("String '%s' is %u character(s) longer than MAX_SIZE=%u", this->c_str(), this->length() - S, S))
+#define ASSERT_WLEN       CRY_ASSERT_TRACE(this->length() <= S, ("Wide-char string '%ls' is %u character(s) longer than MAX_SIZE=%u", this->c_str(), this->length() - S, S))
+#endif
+
+// a template specialization for char
+template<size_t S>
+class CryFixedStringT
+    : public CryStackStringT<char, S>
+{
+public:
+    typedef CryStackStringT<char, S> _parentType;
+    typedef CryFixedStringT<S> _Self;
+    typedef size_t size_type;
+    typedef char value_type;
+    typedef const value_type* const_str;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+    typedef pointer iterator;
+    typedef const_pointer const_iterator;
+    static const size_type MAX_SIZE = S;
+    CryFixedStringT()
+        : _parentType() {}
+    CryFixedStringT(const _parentType& str)
+        : _parentType(str) {ASSERT_LEN; }
+    CryFixedStringT(const _parentType& str, size_type nOff, size_type nCount)
+        : _parentType(str, nOff, nCount) {ASSERT_LEN; }
+    CryFixedStringT(const _Self& str)
+        : _parentType(str) {ASSERT_LEN; }
+    CryFixedStringT(const _Self& str, size_type nOff, size_type nCount)
+        : _parentType(str, nOff, nCount) {ASSERT_LEN; }
+    CryFixedStringT(size_type nRepeat, value_type ch)
+        : _parentType(nRepeat, ch) {ASSERT_LEN; }
+    CryFixedStringT(const_str str)
+        : _parentType (str) {ASSERT_LEN; }
+    CryFixedStringT(const_str str, size_type nLength)
+        : _parentType(str, nLength) {ASSERT_LEN; }
+    CryFixedStringT(const_iterator _First, const_iterator _Last)
+        : _parentType(_First, _Last) {ASSERT_LEN; }
+
+    template<size_t AnySize>
+    _Self& operator=(const CryFixedStringT<AnySize>& str)
+    {
+        _parentType::operator = (str);
+        ASSERT_LEN;
+        return *this;
+    }
+    template<size_t AnySize>
+    _Self& operator=(const CryStackStringT<char, AnySize>& str)
+    {
+        _parentType::operator = (str);
+        ASSERT_LEN;
+        return *this;
+    }
+    _Self& operator=(value_type ch)
+    {
+        _parentType::operator = (ch);
+        ASSERT_LEN;
+        return *this;
+    }
+
+    void GetMemoryUsage(class ICrySizer* pSizer) const{}
+};
+
+// a template specialization for a fixed list of CryFixedString [Jan M.]
+template<size_t maxElements, size_t stringSize>
+class CCryFixedStringListT
+{
+public:
+    CCryFixedStringListT()
+    { Clear(); }
+
+    void Clear()
+    {
+        m_currentAmount = -1;
+        for (int a = 0; a < NUM_MAX_ELEMENTS; ++a)
+        {
+            m_data[a] = "";
+        }
+    }
+
+    void Add(const char* name)
+    {
+        m_data[++m_currentAmount] = name;
+        if (m_currentAmount == NUM_MAX_ELEMENTS)
+        {
+            m_currentAmount = -1;
+        }
+    }
+
+    const char* operator[](int index)
+    {
+        if (index <= m_currentAmount)
+        {
+            return m_data[index].c_str();
+        }
+        return NULL;
+    }
+
+    ILINE int Size() { return m_currentAmount + 1; }
+
+    CryFixedStringT<32>* GetData(int& amount)
+    {
+        amount = m_currentAmount + 1;
+        return m_data;
+    }
+private:
+    const static int NUM_MAX_ELEMENTS = maxElements;
+    CryFixedStringT<stringSize> m_data[NUM_MAX_ELEMENTS];
+    int32   m_currentAmount;
+};
+
+// a template specialization for wchar_t
+template<size_t S>
+class CryFixedWStringT
+    : public CryStackStringT<wchar_t, S>
+{
+public:
+    typedef CryStackStringT<wchar_t, S> _parentType;
+    typedef CryFixedWStringT<S> _Self;
+    typedef size_t size_type;
+    typedef wchar_t value_type;
+    typedef const value_type* const_str;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+    typedef pointer iterator;
+    typedef const_pointer const_iterator;
+    static const size_type MAX_SIZE = S;
+    CryFixedWStringT()
+        : _parentType() {}
+    CryFixedWStringT(const _parentType& str)
+        : _parentType(str) {ASSERT_WLEN; }
+    CryFixedWStringT(const _parentType& str, size_type nOff, size_type nCount)
+        : _parentType(str, nOff, nCount) {ASSERT_WLEN; }
+    CryFixedWStringT(const _Self& str)
+        : _parentType(str) {ASSERT_WLEN; }
+    CryFixedWStringT(const _Self& str, size_type nOff, size_type nCount)
+        : _parentType(str, nOff, nCount) {ASSERT_WLEN; }
+    CryFixedWStringT(size_type nRepeat, value_type ch)
+        : _parentType(nRepeat, ch) {ASSERT_WLEN; }
+    CryFixedWStringT(const_str str)
+        : _parentType (str) {ASSERT_WLEN; }
+    CryFixedWStringT(const_str str, size_type nLength)
+        : _parentType(str, nLength) {ASSERT_WLEN; }
+    CryFixedWStringT(const_iterator _First, const_iterator _Last)
+        : _parentType(_First, _Last) {ASSERT_WLEN; }
+
+    template<size_t AnySize>
+    _Self& operator=(const CryFixedWStringT<AnySize>& str)
+    {
+        _parentType::operator = (str);
+        ASSERT_WLEN;
+        return *this;
+    }
+    template<size_t AnySize>
+    _Self& operator=(const CryStackStringT<wchar_t, AnySize>& str)
+    {
+        _parentType::operator = (str);
+        ASSERT_WLEN;
+        return *this;
+    }
+};
+#undef ASSERT_LEN
+#undef ASSERT_WLEN
+typedef CryStackStringT<char, 512> stack_string;
+
+// Special string type used for specifying file paths.
+typedef CryStackStringT<char, 512> CryPathString;
+
+
+#if UNITTEST_CRYFIXEDSTRING
+
+struct SUnitTest_FixedString
+{
+    bool UnitAssert(const char* message, const char* value, const char* refValue)
+    {
+        int res = strcmp(value, refValue);
+        CRY_ASSERT_MESSAGE(res == 0, message);
+        return res == 0;
+    }
+
+    bool UnitAssert(const char* message, const wchar_t* value, const wchar_t* refValue)
+    {
+        int res = wcscmp(value, refValue);
+        CRY_ASSERT_MESSAGE(res == 0, message);
+        return res == 0;
+    }
+
+    bool UnitAssert(const char* message, bool cond)
+    {
+        CRY_ASSERT_MESSAGE(cond, message);
+        return cond;
+    }
+
+    bool UnitAssert(const char* message, size_t a, size_t b)
+    {
+        CRY_ASSERT_MESSAGE(a == b, message);
+        return a == b;
+    }
+
+    int UnitTest()
+    {
+        CryStackStringT<char, 10> str1;
+        CryStackStringT<char, 10> str2;
+        CryStackStringT<char, 4> str3;
+        CryStackStringT<char, 10> str4;
+        CryStackStringT<char, 5 + 1> str5;
+        CryStackStringT<wchar_t, 16> wstr1;
+        CryStackStringT<wchar_t, 255> wstr2;
+        CryFixedStringT<100> fixedString100;
+        CryFixedStringT<200> fixedString200;
+
+        typedef CryStackStringT<char, 10> T;
+        T* pStr = new T;
+        * pStr = "adads";
+        delete pStr;
+
+        str1 = "abcd";
+        UnitAssert ("Assignment1-EnoughSpace", str1, "abcd");
+
+        str2 = "efg";
+        UnitAssert ("Assignment2-EnoughSpace", str2, "efg");
+
+        str2 = str1;
+        UnitAssert ("Assignment3-EnoughSpace", str2, "abcd");
+
+        str3 = str1;
+        UnitAssert ("Assignment4-NotEnoughSpace", str3, "abcd");
+
+        str1 += "XY";
+        UnitAssert ("Concatenate-EnoughSpace", str1, "abcdXY");
+
+        str2 += "efghijk";
+        UnitAssert ("Concatenate-NotEnoughSpace", str2, "abcdefghijk");
+
+        str1.replace("bc", "");
+        UnitAssert ("Replace-Shrink-EnoughSpace", str1, "adXY");
+
+        str1.replace("XY", "1234");
+        UnitAssert ("Replace-Grow-EnoughSpace", str1, "ad1234");
+
+        str1.replace("1234", "1234567890");
+        UnitAssert ("Replace-Grow-NotEnoughSpace", str1, "ad1234567890");
+
+        str1.reserve(200);
+        UnitAssert ("Reserve200-SameString", str1, "ad1234567890");
+        UnitAssert ("Reserve200-Capacity", str1.capacity() == 200);
+
+        str1.reserve(0);
+        UnitAssert ("Reserve0-SameString", str1, "ad1234567890");
+        UnitAssert ("Reserve0-Capacity==Length", str1.capacity() == str1.length());
+
+        str1.erase(7); // doesn't change capacity
+        UnitAssert ("Erase-SameString", str1, "ad12345");
+
+        str4.assign("abc");
+        UnitAssert ("Str4 Assignment", str4, "abc");
+        str4.reserve(9);
+        UnitAssert ("Str4", str4.capacity() >= 9); // capacity is always >= MAX_SIZE-1
+        str4.reserve(0);
+        UnitAssert ("Str4-Shrink", str4.capacity() >= 9); // capacity is always >= MAX_SIZE-1
+
+        size_t idx = str1.find("123");
+        UnitAssert ("Str1-Find", idx == 2);
+
+        idx = str1.find("123", 3);
+        UnitAssert ("Str1-Find", idx == str1.npos);
+
+        wstr1 = L"abc";
+        UnitAssert ("WStr1-Assign", wstr1, L"abc");
+        UnitAssert ("WStr1-CompareCaseGT", wstr1.compare(L"aBc") > 0);
+        UnitAssert ("WStr1-CompareCaseLT", wstr1.compare(L"babc") < 0);
+        UnitAssert ("WStr1-CompareNoCase", wstr1.compareNoCase(L"aBc") == 0);
+
+        str1.Format("This is a %s %S with %d params", "mixed", L"string", 3);
+        str2.Format("This is a %S %s with %d params", L"mixed", "string", 3);
+        UnitAssert ("Str1-Format1", str1, "This is a mixed string with 3 params");
+        UnitAssert ("Str1-Format2", str1, str2);
+
+        wstr1.Format(L"This is a %s %S with %d params", L"mixed", "string", 3);
+        wstr2.Format(L"This is a %S %s with %d params", "mixed", L"string", 3);
+        UnitAssert ("WStr1-Format1", wstr1, L"This is a mixed string with 3 params");
+        UnitAssert ("WStr1-Format2", wstr1, wstr2);
+
+        str5.FormatFast("%s", "12345");
+        UnitAssert ("Str5-FormatFast", str5, "12345");
+
+        str5.FormatFast("%s", "012345");
+        UnitAssert ("Str5-FormatFast-Truncate", str5, "01234");
+
+        fixedString100 = str5;
+        str2 = fixedString200;
+        fixedString200 = fixedString100;
+        UnitAssert ("FixedString-Test2", fixedString100, "01234");
+        UnitAssert ("FixedString-Test1", fixedString100, fixedString200);
+
+        CryStackStringT<char, 10> testStr;
+        CryFixedStringT<100> testStr2;
+        CryFixedWStringT<100> testWStr1;
+        string normalString;
+        wstring normalWString;
+        normalString = string(testStr);
+        normalString = string(testStr2);
+        normalString.assign(testStr2.c_str());
+        // normalString = testStr;  // <- must NOT compile, as we don't allow it!
+        // normalWString = testWStr1;  // <- must NOT compile, as we don't allow it!
+        normalWString = wstring(testWStr1);
+        return 0;
+    }
+};
+#endif // #if UNITTEST_CRYFIXEDSTRING
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYFIXEDSTRING_H
diff --git a/Code/Legacy/CryCommon/CryHalf.inl b/Code/Legacy/CryCommon/CryHalf.inl
new file mode 100644
index 0000000000..a32cc17814
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryHalf.inl
@@ -0,0 +1,202 @@
+/*
+ * 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 CRY_HALF_INL
+#define CRY_HALF_INL
+
+#pragma once
+
+
+
+typedef uint16 CryHalf;
+class ICrySizer;
+
+typedef union floatint_union
+{
+    float f;
+    uint32 i;
+} floatint_union;
+
+__forceinline CryHalf CryConvertFloatToHalf(const float Value)
+{
+#if defined(LINUX) || defined(MAC)
+    asm volatile("" ::: "memory");
+#endif
+    unsigned int Result;
+
+    unsigned int IValue = ((unsigned int*)(&Value))[0];
+    unsigned int Sign = (IValue & 0x80000000U) >> 16U;
+    IValue = IValue & 0x7FFFFFFFU;      // Hack off the sign
+
+    if (IValue > 0x47FFEFFFU)
+    {
+        // The number is too large to be represented as a half.  Saturate to infinity.
+        Result = 0x7FFFU;
+    }
+    else
+    {
+        if (IValue < 0x38800000U)
+        {
+            // The number is too small to be represented as a normalized half.
+            // Convert it to a denormalized value.
+            unsigned int Shift = 113U - (IValue >> 23U);
+            IValue = (0x800000U | (IValue & 0x7FFFFFU)) >> Shift;
+        }
+        else
+        {
+            // Rebias the exponent to represent the value as a normalized half.
+            IValue += 0xC8000000U;
+        }
+
+        Result = ((IValue + 0x0FFFU + ((IValue >> 13U) & 1U)) >> 13U) & 0x7FFFU;
+    }
+    return (CryHalf)(Result | Sign);
+}
+
+__forceinline float CryConvertHalfToFloat(const CryHalf Value)
+{
+#if defined(LINUX) || defined(MAC)
+    asm volatile("" ::: "memory");
+#endif
+    unsigned int Mantissa;
+    unsigned int Exponent;
+    unsigned int Result;
+
+    Mantissa = (unsigned int)(Value & 0x03FF);
+
+    if ((Value & 0x7C00) != 0)  // The value is normalized
+    {
+        Exponent = (unsigned int)((Value >> 10) & 0x1F);
+    }
+    else if (Mantissa != 0)     // The value is denormalized
+    {
+        // Normalize the value in the resulting float
+        Exponent = 1;
+
+        do
+        {
+            Exponent--;
+            Mantissa <<= 1;
+        } while ((Mantissa & 0x0400) == 0);
+
+        Mantissa &= 0x03FF;
+    }
+    else                        // The value is zero
+    {
+        Exponent = (unsigned int)-112;
+    }
+
+    Result = ((Value & 0x8000) << 16) | // Sign
+        ((Exponent + 112) << 23) | // Exponent
+        (Mantissa << 13);          // Mantissa
+
+    return *(float*)&Result;
+}
+
+struct CryHalf2
+{
+    CryHalf x;
+    CryHalf y;
+
+    CryHalf2()
+    {
+    }
+    CryHalf2(CryHalf _x, CryHalf _y)
+        : x(_x)
+        , y(_y)
+    {
+    }
+    CryHalf2(const CryHalf* const __restrict pArray)
+    {
+        x = pArray[0];
+        y = pArray[1];
+    }
+    CryHalf2(float _x, float _y)
+    {
+        x = CryConvertFloatToHalf(_x);
+        y = CryConvertFloatToHalf(_y);
+    }
+    CryHalf2(const float* const __restrict pArray)
+    {
+        x = CryConvertFloatToHalf(pArray[0]);
+        y = CryConvertFloatToHalf(pArray[1]);
+    }
+    CryHalf2& operator= (const CryHalf2& Half2)
+    {
+        x = Half2.x;
+        y = Half2.y;
+        return *this;
+    }
+
+    bool operator !=(const CryHalf2& rhs) const
+    {
+        return x != rhs.x || y != rhs.y;
+    }
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
+
+    AUTO_STRUCT_INFO
+};
+
+struct CryHalf4
+{
+    CryHalf x;
+    CryHalf y;
+    CryHalf z;
+    CryHalf w;
+
+    CryHalf4()
+    {
+    }
+    CryHalf4(CryHalf _x, CryHalf _y, CryHalf _z, CryHalf _w)
+        : x(_x)
+        , y(_y)
+        , z(_z)
+        , w(_w)
+    {
+    }
+    CryHalf4(const CryHalf* const __restrict pArray)
+    {
+        x = pArray[0];
+        y = pArray[1];
+        z = pArray[2];
+        w = pArray[3];
+    }
+    CryHalf4(float _x, float _y, float _z, float _w)
+    {
+        x = CryConvertFloatToHalf(_x);
+        y = CryConvertFloatToHalf(_y);
+        z = CryConvertFloatToHalf(_z);
+        w = CryConvertFloatToHalf(_w);
+    }
+    CryHalf4(const float* const __restrict pArray)
+    {
+        x = CryConvertFloatToHalf(pArray[0]);
+        y = CryConvertFloatToHalf(pArray[1]);
+        z = CryConvertFloatToHalf(pArray[2]);
+        w = CryConvertFloatToHalf(pArray[3]);
+    }
+    CryHalf4& operator= (const CryHalf4& Half4)
+    {
+        x = Half4.x;
+        y = Half4.y;
+        z = Half4.z;
+        w = Half4.w;
+        return *this;
+    }
+    bool operator !=(const CryHalf4& rhs) const
+    {
+        return x != rhs.x || y != rhs.y || z != rhs.z || w != rhs.w;
+    }
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
+
+    AUTO_STRUCT_INFO
+};
+
+#endif // #ifndef CRY_HALF_INL
diff --git a/Code/Legacy/CryCommon/CryHalf_info.h b/Code/Legacy/CryCommon/CryHalf_info.h
new file mode 100644
index 0000000000..8261b0390e
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryHalf_info.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYHALF_INFO_H
+#define CRYINCLUDE_CRYCOMMON_CRYHALF_INFO_H
+#pragma once
+
+#include "CryHalf.inl"
+
+STRUCT_INFO_BEGIN(CryHalf2)
+STRUCT_VAR_INFO(x, TYPE_INFO(CryHalf))
+STRUCT_VAR_INFO(y, TYPE_INFO(CryHalf))
+STRUCT_INFO_END(CryHalf2)
+
+STRUCT_INFO_BEGIN(CryHalf4)
+STRUCT_VAR_INFO(x, TYPE_INFO(CryHalf))
+STRUCT_VAR_INFO(y, TYPE_INFO(CryHalf))
+STRUCT_VAR_INFO(z, TYPE_INFO(CryHalf))
+STRUCT_VAR_INFO(w, TYPE_INFO(CryHalf))
+STRUCT_INFO_END(CryHalf4)
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYHALF_INFO_H
diff --git a/Code/Legacy/CryCommon/CryHeaders.h b/Code/Legacy/CryCommon/CryHeaders.h
new file mode 100644
index 0000000000..0127e4cb8d
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryHeaders.h
@@ -0,0 +1,1505 @@
+/*
+ * 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_CRYHEADERS_H
+#define CRYINCLUDE_CRYCOMMON_CRYHEADERS_H
+#pragma once
+
+
+#include "BaseTypes.h"
+#include "Cry_Math.h"
+
+#ifdef MAX_SUB_MATERIALS
+// This checks that the values are in sync in the different files.
+COMPILE_TIME_ASSERT(MAX_SUB_MATERIALS == 128);
+#else
+    #define MAX_SUB_MATERIALS 128
+#endif
+
+#include "CryEndian.h"
+
+// Chunk type must fit into uint16
+enum ChunkTypes
+{
+    ChunkType_ANY     = 0,
+
+    ChunkType_Mesh = 0x1000,  // was 0xCCCC0000 in chunk files with versions <= 0x745
+    ChunkType_Helper,
+    ChunkType_VertAnim,
+    ChunkType_BoneAnim,
+    ChunkType_GeomNameList, // obsolete
+    ChunkType_BoneNameList,
+    ChunkType_MtlList,      // obsolete
+    ChunkType_MRM,          // obsolete
+    ChunkType_SceneProps,   // obsolete
+    ChunkType_Light,        // obsolete
+    ChunkType_PatchMesh,    // not implemented
+    ChunkType_Node,
+    ChunkType_Mtl,          // obsolete
+    ChunkType_Controller,
+    ChunkType_Timing,
+    ChunkType_BoneMesh,
+    ChunkType_BoneLightBinding, // obsolete. describes the lights binded to bones
+    ChunkType_MeshMorphTarget,  // describes a morph target of a mesh chunk
+    ChunkType_BoneInitialPos,   // describes the initial position (4x3 matrix) of each bone; just an array of 4x3 matrices
+    ChunkType_SourceInfo, // describes the source from which the cgf was exported: source max file, machine and user
+    ChunkType_MtlName, // material name
+    ChunkType_ExportFlags, // Special export flags.
+    ChunkType_DataStream, // Stream data.
+    ChunkType_MeshSubsets, // Array of mesh subsets.
+    ChunkType_MeshPhysicsData, // Physicalized mesh data.
+
+    // these are the new compiled chunks for characters
+    ChunkType_CompiledBones = 0x2000,  // was 0xACDC0000 in chunk files with versions <= 0x745
+    ChunkType_CompiledPhysicalBones,
+    ChunkType_CompiledMorphTargets,
+    ChunkType_CompiledPhysicalProxies,
+    ChunkType_CompiledIntFaces,
+    ChunkType_CompiledIntSkinVertices,
+    ChunkType_CompiledExt2IntMap,
+
+    ChunkType_BreakablePhysics = 0x3000,  // was 0xAAFC0000 in chunk files with versions <= 0x745
+    ChunkType_FaceMap,         // obsolete
+    ChunkType_MotionParameters,
+    ChunkType_FootPlantInfo,   // obsolete
+    ChunkType_BonesBoxes,
+    ChunkType_FoliageInfo,
+    ChunkType_Timestamp,
+    ChunkType_GlobalAnimationHeaderCAF,
+    ChunkType_GlobalAnimationHeaderAIM,
+    ChunkType_BspTreeData
+};
+
+enum ECgfStreamType
+{
+    CGF_STREAM_POSITIONS,
+    CGF_STREAM_NORMALS,
+    CGF_STREAM_TEXCOORDS,
+    CGF_STREAM_COLORS,
+    CGF_STREAM_COLORS2,
+    CGF_STREAM_INDICES,
+    CGF_STREAM_TANGENTS,
+    CGF_STREAM_DUMMY0_,  // used to be CGF_STREAM_SHCOEFFS, dummy is needed to keep existing assets loadable
+    CGF_STREAM_DUMMY1_,  // used to be CGF_STREAM_SHAPEDEFORMATION, dummy is needed to keep existing assets loadable
+    CGF_STREAM_BONEMAPPING,
+    CGF_STREAM_FACEMAP,
+    CGF_STREAM_VERT_MATS,
+    CGF_STREAM_QTANGENTS,
+    CGF_STREAM_SKINDATA,
+    CGF_STREAM_DUMMY2_,  // used to be old console specific, dummy is needed to keep existing assets loadable
+    CGF_STREAM_P3S_C4B_T2S,
+    CGF_STREAM_NUM_TYPES
+};
+
+//////////////////////////////////////////////////////////////////////////
+enum EPhysicsGeomType
+{
+    PHYS_GEOM_TYPE_NONE       = -1,
+    PHYS_GEOM_TYPE_DEFAULT    = 0x1000 + 0,
+    PHYS_GEOM_TYPE_NO_COLLIDE = 0x1000 + 1,
+    PHYS_GEOM_TYPE_OBSTRUCT   = 0x1000 + 2,
+
+    PHYS_GEOM_TYPE_DEFAULT_PROXY  = 0x1000 + 0x100, // Default physicalization, but only proxy (NoDraw geometry).
+};
+
+struct CryVertex
+{
+    Vec3 p;     //position
+    Vec3 n;     //normal vector
+
+    AUTO_STRUCT_INFO
+};
+
+struct CryFace
+{
+    int v0, v1, v2;     //vertex indices
+    int MatID;        //mat ID
+
+    int& operator [] (int i) {return (&v0)[i]; }
+    int operator [] (int i) const {return (&v0)[i]; }
+    bool isDegenerate () const {return v0 == v1 || v1 == v2 || v2 == v0; }
+
+    AUTO_STRUCT_INFO
+};
+
+struct CryUV
+{
+    float u, v;        //texture coordinates
+    AUTO_STRUCT_INFO
+};
+
+struct CrySkinVtx
+{
+    int bVolumetric;
+    int idx[4];
+    float w[4];
+    Matrix33 M;
+
+    AUTO_STRUCT_INFO
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct CryLink
+{
+    int     BoneID;
+    Vec3    offset;
+    float   Blending;
+
+    AUTO_STRUCT_INFO
+};
+
+struct CryIRGB
+{
+    unsigned char r, g, b;
+    AUTO_STRUCT_INFO
+};
+
+struct NAME_ENTITY
+{
+    char  name[64];
+};
+
+struct phys_geometry;
+
+struct CryBonePhysics
+{
+    phys_geometry* pPhysGeom; // id of a separate mesh for this bone // MUST not be in File Structures!!!
+    // additional joint parameters
+    int   flags;
+    float min[3], max[3];
+    float spring_angle[3];
+    float spring_tension[3];
+    float damping[3];
+    float framemtx[3][3];
+};
+
+// the compatible between 32- and 64-bits structure
+struct CryBonePhysics_Comp
+{
+    int nPhysGeom; // id of a separate mesh for this bone
+    // additional joint parameters
+    int   flags;
+    float min[3], max[3];
+    float spring_angle[3];
+    float spring_tension[3];
+    float damping[3];
+    float framemtx[3][3];
+
+    AUTO_STRUCT_INFO
+};
+
+#define __copy3(MEMBER) left.MEMBER[0] = right.MEMBER[0]; left.MEMBER[1] = right.MEMBER[1]; left.MEMBER[2] = right.MEMBER[2];
+inline void CopyPhysInfo(CryBonePhysics& left, const CryBonePhysics_Comp& right)
+{
+    left.pPhysGeom = (phys_geometry*)(INT_PTR)right.nPhysGeom;
+    left.flags = right.flags;
+    __copy3(min);
+    __copy3(max);
+    __copy3(spring_angle);
+    __copy3(spring_tension);
+    __copy3(damping);
+    __copy3(framemtx[0]);
+    __copy3(framemtx[1]);
+    __copy3(framemtx[2]);
+}
+inline void CopyPhysInfo(CryBonePhysics_Comp& left, const CryBonePhysics& right)
+{
+    left.nPhysGeom = (int)(INT_PTR)right.pPhysGeom;
+    left.flags = right.flags;
+    __copy3(min);
+    __copy3(max);
+    __copy3(spring_angle);
+    __copy3(spring_tension);
+    __copy3(damping);
+    __copy3(framemtx[0]);
+    __copy3(framemtx[1]);
+    __copy3(framemtx[2]);
+}
+#undef __copy3
+
+struct CryBoneDescData
+{
+    unsigned int m_nControllerID; // unic id of bone (generated from bone name in the max)
+
+    // [Sergiy] physics info for different lods
+    // lod 0 is the physics of alive body, lod 1 is the physics of a dead body
+    CryBonePhysics m_PhysInfo[2];
+    float m_fMass;
+
+    Matrix34 m_DefaultW2B; //intitalpose matrix World2Bone
+    Matrix34 m_DefaultB2W; //intitalpose matrix Bone2World
+
+    enum
+    {
+        kBoneNameMaxSize = 256,
+    };
+    char m_arrBoneName[CryBoneDescData::kBoneNameMaxSize];
+
+    int m_nLimbId; // set by model state class
+
+    // this bone parent is this[m_nOffsetParent], 0 if the bone is root. Normally this is <= 0
+    int m_nOffsetParent;
+
+    // The whole hierarchy of bones is kept in one big array that belongs to the ModelState
+    // Each bone that has children has its own range of bone objects in that array,
+    // and this points to the beginning of that range and defines the number of bones.
+    unsigned m_numChildren;
+    // the beginning of the subarray of children is at this[m_nOffsetChildren]
+    // this is 0 if there are no children
+    int m_nOffsetChildren;
+};
+
+struct CryBoneDescData_Comp
+{
+    unsigned int m_nControllerID; // unique id of bone (generated from bone name)
+
+    // [Sergiy] physics info for different lods
+    // lod 0 is the physics of alive body, lod 1 is the physics of a dead body
+    CryBonePhysics_Comp m_PhysInfo[2];
+    float m_fMass;
+
+    Matrix34 m_DefaultW2B; //intitalpose matrix World2Bone
+    Matrix34 m_DefaultB2W; //intitalpose matrix Bone2World
+
+    char m_arrBoneName[256];
+
+    int m_nLimbId; // set by model state class
+
+    // this bone parent is this[m_nOffsetParent], 0 if the bone is root. Normally this is <= 0
+    int m_nOffsetParent;
+
+    // The whole hierarchy of bones is kept in one big array that belongs to the ModelState
+    // Each bone that has children has its own range of bone objects in that array,
+    // and this points to the beginning of that range and defines the number of bones.
+    unsigned m_numChildren;
+    // the beginning of the subarray of children is at this[m_nOffsetChildren]
+    // this is 0 if there are no children
+    int m_nOffsetChildren;
+
+    AUTO_STRUCT_INFO
+};
+
+inline void CopyBoneDescData(CryBoneDescData_Comp& left, const CryBoneDescData& right)
+{
+    left.m_nControllerID = right.m_nControllerID;
+
+    CopyPhysInfo(left.m_PhysInfo[0], right.m_PhysInfo[0]);
+    CopyPhysInfo(left.m_PhysInfo[1], right.m_PhysInfo[1]);
+
+    left.m_fMass = right.m_fMass;
+    left.m_DefaultW2B = right.m_DefaultW2B;
+    left.m_DefaultB2W = right.m_DefaultB2W;
+    memcpy(left.m_arrBoneName, right.m_arrBoneName, sizeof(left.m_arrBoneName));
+    left.m_nLimbId = right.m_nLimbId;
+    left.m_nOffsetParent = right.m_nOffsetParent;
+    left.m_numChildren = right.m_numChildren;
+    left.m_nOffsetChildren = right.m_nOffsetChildren;
+}
+
+struct BONE_ENTITY
+{
+    int   BoneID;
+    int   ParentID;
+    int   nChildren;
+
+    // Id of controller (CRC32 From name of bone).
+    unsigned int  ControllerID;
+
+    char prop[32];
+    CryBonePhysics_Comp phys;
+
+    AUTO_STRUCT_INFO
+};
+
+struct KEY_HEADER
+{
+    int   KeyTime;  //in ticks
+    AUTO_STRUCT_INFO
+};
+
+struct RANGE_ENTITY
+{
+    char name[32];
+    int start;
+    int end;
+    AUTO_STRUCT_INFO
+};
+
+//========================================
+//Timing Chunk Header
+//========================================
+struct TIMING_CHUNK_DESC_0918
+{
+    enum
+    {
+        VERSION = 0x0918
+    };
+
+    f32     m_SecsPerTick;    // seconds/ticks
+    int32   m_TicksPerFrame;    // ticks/Frame
+
+    RANGE_ENTITY  global_range;   // covers all of the time ranges
+    int       qqqqnSubRanges;
+
+    AUTO_STRUCT_INFO
+};
+
+
+struct SPEED_CHUNK_DESC_2
+{
+    enum
+    {
+        VERSION = 0x0922
+    };
+
+    float     Speed;
+    float     Distance;
+    float     Slope;
+    uint32    AnimFlags;
+    f32       MoveDir[3];
+    QuatT     StartPosition;
+    AUTO_STRUCT_INFO
+};
+
+
+struct MotionParams905
+{
+    uint32  m_nAssetFlags;
+    uint32  m_nCompression;
+
+    int32   m_nTicksPerFrame;
+    f32     m_fSecsPerTick;
+    int32   m_nStart;
+    int32   m_nEnd;
+
+    f32     m_fMoveSpeed;
+    f32     m_fTurnSpeed;
+    f32     m_fAssetTurn;
+    f32     m_fDistance;
+    f32     m_fSlope;
+
+    QuatT   m_StartLocation;
+    QuatT   m_EndLocation;
+
+    f32     m_LHeelStart, m_LHeelEnd;
+    f32     m_LToe0Start, m_LToe0End;
+    f32     m_RHeelStart, m_RHeelEnd;
+    f32     m_RToe0Start, m_RToe0End;
+
+    MotionParams905()
+    {
+        m_nAssetFlags = 0;
+        m_nCompression = -1;
+        m_nTicksPerFrame = 0;
+        m_fSecsPerTick = 0;
+        m_nStart = 0;
+        m_nEnd = 0;
+
+        m_fMoveSpeed = -1;
+        m_fTurnSpeed = -1;
+        m_fAssetTurn = -1;
+        m_fDistance = -1;
+        m_fSlope = -1;
+
+        m_LHeelStart = -1;
+        m_LHeelEnd = -1;
+        m_LToe0Start = -1;
+        m_LToe0End = -1;
+        m_RHeelStart = -1;
+        m_RHeelEnd = -1;
+        m_RToe0Start = -1;
+        m_RToe0End = -1;
+
+        m_StartLocation.SetIdentity();
+        m_EndLocation.SetIdentity();
+    }
+};
+
+
+struct CHUNK_MOTION_PARAMETERS
+{
+    enum
+    {
+        VERSION = 0x0925
+    };
+
+    MotionParams905 mp;
+};
+
+
+
+struct CHUNK_GAHCAF_INFO
+{
+    enum
+    {
+        VERSION = 0x0971
+    };
+    enum
+    {
+        FILEPATH_SIZE = 256
+    };
+
+    uint32  m_Flags;
+    char    m_FilePath[FILEPATH_SIZE];
+    uint32  m_FilePathCRC32;
+    uint32  m_FilePathDBACRC32;
+
+    f32 m_LHeelStart, m_LHeelEnd;
+    f32 m_LToe0Start, m_LToe0End;
+    f32 m_RHeelStart, m_RHeelEnd;
+    f32 m_RToe0Start, m_RToe0End;
+
+    f32 m_fStartSec;                //asset-feature: Start time in seconds.
+    f32 m_fEndSec;                  //asset-feature: End time in seconds.
+    f32 m_fTotalDuration;           //asset-feature: asset-feature: total duration in seconds.
+    uint32 m_nControllers;
+
+    //locator information
+    QuatT m_StartLocation;
+    QuatT m_LastLocatorKey;
+    Vec3  m_vVelocity;         //asset-feature: the velocity vector for this asset
+    f32   m_fDistance;          //asset-feature: the absolute distance this objects is moving
+    f32   m_fSpeed;             //asset-feature: speed (meters in second)
+    f32   m_fSlope;             //asset-feature: uphill-downhill measured in degrees
+    f32   m_fTurnSpeed;         //asset-feature: turning speed per second
+    f32   m_fAssetTurn;         //asset-feature: radiant between first and last frame
+};
+
+
+
+
+struct CHUNK_GAHAIM_INFO
+{
+    struct VirtualExampleInit2
+    {
+        Vec2 polar;
+        uint8 i0, i1, i2, i3;
+        f32 w0, w1, w2, w3;
+    };
+    struct VirtualExample
+    {
+        uint8 i0, i1, i2, i3;
+        int16 v0, v1, v2, v3;
+    };
+
+    enum
+    {
+        VERSION = 0x0970
+    };
+    enum
+    {
+        XGRID = 17
+    };
+    enum
+    {
+        YGRID = 9
+    };
+    enum
+    {
+        FILEPATH_SIZE = 256
+    };
+
+    uint32  m_Flags;
+    char    m_FilePath[FILEPATH_SIZE];
+    uint32  m_FilePathCRC32;
+
+    f32 m_fStartSec;                //asset-feature: Start time in seconds.
+    f32 m_fEndSec;                  //asset-feature: End time in seconds.
+    f32 m_fTotalDuration;           //asset-feature: asset-feature: total duration in seconds.
+
+    uint32 m_AnimTokenCRC32;
+
+    uint64 m_nExist;
+    Quat m_MiddleAimPoseRot;
+    Quat m_MiddleAimPose;
+    VirtualExample m_PolarGrid[XGRID * YGRID];
+    uint32 m_numAimPoses;
+};
+
+
+//========================================
+//Material Chunk Header
+//========================================
+
+//////////////////////////////////////////////////////////////////////////
+#define MTL_NAME_CHUNK_DESC_0800_MAX_SUB_MATERIALS (32)
+struct MTL_NAME_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+    enum EFlags
+    {
+        FLAG_MULTI_MATERIAL  = 0x0001, // Have sub materials info.
+        FLAG_SUB_MATERIAL    = 0x0002, // This is sub material.
+        FLAG_SH_COEFFS       = 0x0004, // This material should get spherical harmonics coefficients computed.
+        FLAG_SH_2SIDED       = 0x0008, // This material will be used as 2 sided in the sh precomputation
+        FLAG_SH_AMBIENT      = 0x0010, // This material will get an ambient sh term(to not shadow it entirely)
+    };
+
+    int nFlags; // see EFlags.
+    int nFlags2;
+    char name[128]; //material/shader name
+    int nPhysicalizeType;
+    int nSubMaterials;
+    int nSubMatChunkId[MTL_NAME_CHUNK_DESC_0800_MAX_SUB_MATERIALS];
+    int nAdvancedDataChunkId;
+    float sh_opacity;
+    int reserve[32];
+
+    AUTO_STRUCT_INFO
+};
+
+struct MTL_NAME_CHUNK_DESC_0802
+{
+    enum
+    {
+        VERSION = 0x0802
+    };
+
+    char name[128];  //material/shader name
+    int nSubMaterials;
+
+    // Data continues from here.
+    // 1) if nSubMaterials is 0, this is a single-material: we store physicalization type of the material (int32).
+    // 2) if nSubMaterials is not 0, this is a multi-material: we store nSubMaterials physicalization types (int32
+    //    value for each sub-material). After the physicalization types we store chain of ASCIIZ names of sub-materials.
+
+    AUTO_STRUCT_INFO
+};
+
+//========================================
+//Mesh Chunk Header
+//========================================
+
+struct MESH_CHUNK_DESC_0745
+{
+    // Versions 0x0744 and 0x0745 are *exactly* the same.
+    // Version number was increased from 0x0744 to 0x0745 just because
+    // it was the only way to inform *old* (existing) executables that
+    // NODE_CHUNK_DESC(!) chunk format was changed and cannot be read
+    // by them (old CLoaderCGF::LoadNodeChunk() didn't check
+    // NODE_CHUNK_DESC's version number).
+    enum
+    {
+        VERSION = 0x0745
+    };
+    enum
+    {
+        COMPATIBLE_OLD_VERSION = 0x0744
+    };
+
+    enum EFlags1
+    {
+        FLAG1_BONE_INFO = 0x01,
+    };
+    enum EFlags2
+    {
+        FLAG2_HAS_VERTEX_COLOR = 0x01,
+        FLAG2_HAS_VERTEX_ALPHA = 0x02,
+        FLAG2_HAS_TOPOLOGY_IDS = 0x04,
+    };
+    unsigned char flags1;
+    unsigned char flags2;
+    int   nVerts;
+    int   nTVerts;      // # of texture vertices (0 or nVerts)
+    int   nFaces;
+    int   VertAnimID;   // id of the related vertAnim chunk if present. otherwise it is -1
+
+    AUTO_STRUCT_INFO
+};
+
+// Compiled Mesh chunk.
+struct MESH_CHUNK_DESC_0801
+{
+    // Versions 0x0800 and 0x0801 are *exactly* the same.
+    // Version number was increased from 0x0800 to 0x0801 just because
+    // it was the only way to inform *old* (existing) executables that
+    // NODE_CHUNK_DESC(!) chunk format was changed and cannot be read
+    // by them (old CLoaderCGF::LoadNodeChunk() didn't check
+    // NODE_CHUNK_DESC's version number).
+    enum
+    {
+        VERSION = 0x0801
+    };
+    enum
+    {
+        COMPATIBLE_OLD_VERSION = 0x0800
+    };
+
+    enum EFlags
+    {
+        MESH_IS_EMPTY           = 0x0001, // Empty mesh (no streams are saved)
+        HAS_TEX_MAPPING_DENSITY = 0x0002, // texMappingDensity contains a valid value
+        HAS_EXTRA_WEIGHTS       = 0x0004, // The weight stream will have weights for influences 5-8
+        HAS_FACE_AREA           = 0x0008, // geometricMeanFaceArea contains a valid value
+    };
+
+    int nFlags;  // @see EFlags
+    int nFlags2;
+
+    // Just for info.
+    int nVerts;       // Number of vertices.
+    int nIndices;     // Number of indices.
+    int nSubsets;     // Number of mesh subsets.
+
+    int nSubsetsChunkId; // Chunk id of subsets. (Must be ChunkType_MeshSubsets)
+    int nVertAnimID;    // id of the related vertAnim chunk if present. otherwise it is -1
+
+    // ChunkIDs of data streams (Must be ChunkType_DataStream).
+    int GetStreamChunkID(ECgfStreamType streamType, [[maybe_unused]] int streamIndex) const
+    {
+        // Ignore streamIndex since all chunks with version 0x0801 have only one stream per type
+        return nStreamChunkID[streamType];
+    }
+    int nStreamChunkID[ECgfStreamType::CGF_STREAM_NUM_TYPES]; // Index is one of ECgfStreamType values.
+
+    // Chunk IDs of physical mesh data. (Must be ChunkType_MeshPhysicsData)
+    int nPhysicsDataChunkId[4];
+
+    // Bounding box of the mesh.
+    Vec3 bboxMin;
+    Vec3 bboxMax;
+
+    float texMappingDensity;
+    float geometricMeanFaceArea;
+    int reserved[31];
+    AUTO_STRUCT_INFO
+};
+
+struct MESH_CHUNK_DESC_0802
+{
+    // Version 0x0802 adds an additional dimention to the nStreamChunkID array to allow for multiple streams of the same type
+    enum
+    {
+        VERSION = 0x0802
+    };
+    enum
+    {
+        COMPATIBLE_OLD_VERSION = 0x0802
+    };
+
+    enum EFlags
+    {
+        MESH_IS_EMPTY = 0x0001, // Empty mesh (no streams are saved)
+        HAS_TEX_MAPPING_DENSITY = 0x0002, // texMappingDensity contains a valid value
+        HAS_EXTRA_WEIGHTS = 0x0004, // The weight stream will have weights for influences 5-8
+        HAS_FACE_AREA = 0x0008, // geometricMeanFaceArea contains a valid value
+    };
+
+    int nFlags;  // @see EFlags
+    int nFlags2;
+
+    // Just for info.
+    int nVerts;       // Number of vertices.
+    int nIndices;     // Number of indices.
+    int nSubsets;     // Number of mesh subsets.
+
+    int nSubsetsChunkId; // Chunk id of subsets. (Must be ChunkType_MeshSubsets)
+    int nVertAnimID;    // id of the related vertAnim chunk if present. otherwise it is -1
+
+    // ChunkIDs of data streams (Must be ChunkType_DataStream).
+    int GetStreamChunkID(ECgfStreamType streamType, int streamIndex) const
+    {
+        return nStreamChunkID[streamType][streamIndex];
+    }
+    int nStreamChunkID[ECgfStreamType::CGF_STREAM_NUM_TYPES][8]; // [ECgfStreamType value][streamIndex] e.g. [CGF_STREAM_TEXCOORDS][1] to get UV set 1
+
+    // Chunk IDs of physical mesh data. (Must be ChunkType_MeshPhysicsData)
+    int nPhysicsDataChunkId[4];
+
+    // Bounding box of the mesh.
+    Vec3 bboxMin;
+    Vec3 bboxMax;
+
+    float texMappingDensity;
+    float geometricMeanFaceArea;
+    int reserved[31];
+    AUTO_STRUCT_INFO
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+// Stream chunk contains data about a mesh data stream (positions, normals, etc...)
+//////////////////////////////////////////////////////////////////////////
+struct STREAM_DATA_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    enum EFlags { }; // Not implemented.
+
+    int nFlags;
+    int nStreamType;  // Stream type one of ECgfStreamType.
+    int nCount;       // Number of elements.
+    int nElementSize; // Element Size.
+    int reserved[2];
+
+    // Data starts here at the end of the chunk..
+    //char streamData[nCount*nElementSize];
+
+    AUTO_STRUCT_INFO
+};
+
+struct STREAM_DATA_CHUNK_DESC_0801
+{
+    enum
+    {
+        VERSION = 0x0801
+    };
+
+    enum EFlags { }; // Not implemented.
+
+    int nFlags;
+    int nStreamType;  // Stream type one of ECgfStreamType.
+    int nStreamIndex; // To handle multiple streams of the same type
+    int nCount;       // Number of elements.
+    int nElementSize; // Element Size.
+    int reserved[2];
+
+    // Data starts here at the end of the chunk..
+    //char streamData[nCount*nElementSize];
+
+    AUTO_STRUCT_INFO
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Contains array of mesh subsets.
+// Each subset holds an info about material id, indices ranges etc...
+//////////////////////////////////////////////////////////////////////////
+struct MESH_SUBSETS_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    enum EFlags
+    {
+        SH_HAS_DECOMPR_MAT = 0x0001,    // obsolete
+        BONEINDICES        = 0x0002,
+        HAS_SUBSET_TEXEL_DENSITY = 0x0004,
+    };
+
+    int nFlags;
+    int nCount;       // Number of elements.
+    int reserved[2];
+
+    struct MeshSubset
+    {
+        int nFirstIndexId;
+        int nNumIndices;
+        int nFirstVertId;
+        int nNumVerts;
+        int nMatID; // Material sub-object Id.
+        float fRadius;
+        Vec3 vCenter;
+
+        AUTO_STRUCT_INFO
+    };
+
+    struct MeshBoneIDs
+    {
+        uint32 numBoneIDs;
+        uint16 arrBoneIDs[0x80];
+
+        AUTO_STRUCT_INFO
+    };
+
+    struct MeshSubsetTexelDensity
+    {
+        float texelDensity;
+
+        AUTO_STRUCT_INFO
+    };
+
+    // Data starts here at the end of the chunk.
+    //Subset streamData[nCount];
+
+    MESH_SUBSETS_CHUNK_DESC_0800()
+        : nFlags(0)
+        , nCount(0)
+    {
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Contain array of mesh subsets.
+// Each subset holds an info about material id, indices ranges etc...
+//////////////////////////////////////////////////////////////////////////
+struct MESH_PHYSICS_DATA_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    int nDataSize;  // Size of physical data at the end of the chunk.
+    int nFlags;
+    int nTetrahedraDataSize;
+    int nTetrahedraChunkId; // Chunk of physics Tetrahedra data.
+    int reserved[2];
+
+    // Data starts here at the end of the chunk.
+    //char physicsData[nDataSize];
+    //char tetrahedraData[nTetrahedraDataSize];
+
+    AUTO_STRUCT_INFO
+};
+
+
+struct VERTANIM_CHUNK_DESC_0744
+{
+    enum
+    {
+        VERSION = 0x0744
+    };
+
+    int   GeomID;     // ID of the related mesh chunk
+    int   nKeys;      // # of keys
+    int   nVerts;     // # of vertices this object has
+    int   nFaces;     // # of faces this object has (for double check purpose)
+
+    AUTO_STRUCT_INFO
+};
+
+typedef VERTANIM_CHUNK_DESC_0744 VERTANIM_CHUNK_DESC;
+#define VERTANIM_CHUNK_DESC_VERSION VERTANIM_CHUNK_DESC_0744::VERSION
+
+//========================================
+//Bone Anim Chunk Header
+//========================================
+
+struct BONEANIM_CHUNK_DESC_0290
+{
+    enum
+    {
+        VERSION = 0x0290
+    };
+
+    int   nBones;
+
+    AUTO_STRUCT_INFO
+};
+
+//========================================
+//Bonelist Chunk Header
+//========================================
+
+// this structure describes the bone names
+// it's followed by numEntities packed \0-terminated strings, the list terminated by double-\0
+struct BONENAMELIST_CHUNK_DESC_0745
+{
+    enum
+    {
+        VERSION = 0x0745
+    };
+
+    int numEntities;
+    AUTO_STRUCT_INFO
+};
+
+
+struct COMPILED_BONE_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    char reserved[32];
+    AUTO_STRUCT_INFO
+};
+
+struct COMPILED_PHYSICALBONE_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    char reserved[32];
+    AUTO_STRUCT_INFO
+};
+
+struct COMPILED_PHYSICALPROXY_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    uint32 numPhysicalProxies;
+    AUTO_STRUCT_INFO
+};
+
+struct COMPILED_MORPHTARGETS_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800, VERSION1 = 0x801
+    };
+
+    uint32 numMorphTargets;
+    AUTO_STRUCT_INFO
+};
+
+
+struct COMPILED_INTFACES_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    AUTO_STRUCT_INFO
+};
+
+struct COMPILED_INTSKINVERTICES_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    char reserved[32];
+    AUTO_STRUCT_INFO
+};
+
+struct COMPILED_EXT2INTMAP_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800
+    };
+
+    AUTO_STRUCT_INFO
+};
+
+struct COMPILED_BONEBOXES_CHUNK_DESC_0800
+{
+    enum
+    {
+        VERSION = 0x0800, VERSION1 = 0x801
+    };
+
+    AUTO_STRUCT_INFO
+};
+
+// Keyframe and Timing Primitives __________________________________________________________________________________________________________________
+struct BaseKey
+{
+    int time;
+    AUTO_STRUCT_INFO
+};
+
+struct BaseTCB
+{
+    float t, c, b;
+    float ein, eout;
+    AUTO_STRUCT_INFO
+};
+
+struct BaseKey1
+    : BaseKey
+{
+    float   val;
+    AUTO_STRUCT_INFO
+};
+struct BaseKey3
+    : BaseKey
+{
+    Vec3  val;
+    AUTO_STRUCT_INFO
+};
+struct BaseKeyQ
+    : BaseKey
+{
+    CryQuat val;
+    AUTO_STRUCT_INFO
+};
+
+struct CryLin1Key
+    : BaseKey1
+{
+    AUTO_STRUCT_INFO
+};
+struct CryLin3Key
+    : BaseKey3
+{
+    AUTO_STRUCT_INFO
+};
+struct CryLinQKey
+    : BaseKeyQ
+{
+    AUTO_STRUCT_INFO
+};
+struct CryTCB1Key
+    : BaseKey1
+    , BaseTCB
+{
+    AUTO_STRUCT_INFO
+};
+struct CryTCB3Key
+    : BaseKey3
+    , BaseTCB
+{
+    AUTO_STRUCT_INFO
+};
+struct CryTCBQKey
+    : BaseKeyQ
+    , BaseTCB
+{
+    AUTO_STRUCT_INFO
+};
+struct CryBez1Key
+    : BaseKey1
+{
+    float    intan, outtan;
+    AUTO_STRUCT_INFO
+};
+struct CryBez3Key
+    : BaseKey3
+{
+    Vec3 intan, outtan;
+    AUTO_STRUCT_INFO
+};
+struct CryBezQKey
+    : BaseKeyQ
+{
+    AUTO_STRUCT_INFO
+};
+
+struct CryKeyPQLog
+{
+    int nTime;
+    Vec3 vPos;
+    Vec3 vRotLog; // logarithm of the rotation
+
+    // resets to initial position/rotation/time
+    void reset ()
+    {
+        nTime = 0;
+        vPos.x = vPos.y = vPos.z = 0;
+        vRotLog.x = vRotLog.y = vRotLog.z = 0;
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+//========================================
+//Controller Chunk Header
+//========================================
+enum CtrlTypes
+{
+    CTRL_NONE,
+    CTRL_CRYBONE,
+    CTRL_LINEER1, CTRL_LINEER3, CTRL_LINEERQ,
+    CTRL_BEZIER1, CTRL_BEZIER3, CTRL_BEZIERQ,
+    CTRL_TCB1,    CTRL_TCB3,    CTRL_TCBQ,
+    CTRL_BSPLINE_2O, // 2-byte fixed values, open
+    CTRL_BSPLINE_1O, // 1-byte fixed values, open
+    CTRL_BSPLINE_2C, // 2-byte fixed values, closed
+    CTRL_BSPLINE_1C,  // 1-byte fixed values, closed
+    CTRL_CONST       // constant position&rotation
+};
+
+enum CtrlFlags
+{
+    CTRL_ORT_CYCLE = 0x01,
+    CTRL_ORT_LOOP = 0x02
+};
+
+// Used to store TCB-controllers in .anm files
+struct CONTROLLER_CHUNK_DESC_0826
+{
+    enum
+    {
+        VERSION = 0x0826
+    };
+
+    CtrlTypes   type;   //one ot the CtrlTypes values
+    int       nKeys;    // # of keys this controller has; toatl # of knots (positional and orientational) in the case of B-Spline
+
+    //unsigned short nSubCtrl;  // # of sub controllers; not used now/reserved
+    unsigned int nFlags;    // Flags of controller.
+    //int       nSubCtrl; // # of sub controllers; not used now/reserved
+
+    unsigned nControllerId; // unique generated in exporter id based on crc32 of bone name
+
+    AUTO_STRUCT_INFO
+};
+
+// Format used to store uncompressed sampled animation exported from DCC into .i_caf files (earlier .caf)
+struct CONTROLLER_CHUNK_DESC_0827
+{
+    enum
+    {
+        VERSION = 0x0827
+    };
+    unsigned numKeys;
+    unsigned nControllerId;
+
+    AUTO_STRUCT_INFO
+};
+
+// Unused format (was it introduced to fix missing header in 827?)
+struct CONTROLLER_CHUNK_DESC_0828
+{
+    enum
+    {
+        VERSION = 0x0828
+    };
+};
+
+struct CONTROLLER_CHUNK_DESC_0829
+{
+    enum
+    {
+        VERSION = 0x0829
+    };
+
+    enum
+    {
+        eKeyTimeRotation = 0, eKeyTimePosition = 1, eKeyTimeScale = 2
+    };
+
+    unsigned int nControllerId;
+
+    uint16 numRotationKeys;
+    uint16 numPositionKeys;
+    uint8 RotationFormat;
+    uint8 RotationTimeFormat;
+    uint8 PositionFormat;
+    uint8 PositionKeysInfo;
+    uint8 PositionTimeFormat;
+    uint8 TracksAligned;
+
+    AUTO_STRUCT_INFO
+};
+
+// Added new controller flags field, correspond to v827 and v829 respectively
+struct CONTROLLER_CHUNK_DESC_0830
+{
+    enum
+    {
+        VERSION = 0x830
+    };
+
+    CONTROLLER_CHUNK_DESC_0830(){}
+
+    CONTROLLER_CHUNK_DESC_0830(const CONTROLLER_CHUNK_DESC_0827* oldChunk)
+        : numKeys(oldChunk->numKeys)
+        , nControllerId(oldChunk->nControllerId)
+        , nFlags(0)
+    {}
+
+    unsigned numKeys;
+    unsigned nControllerId;
+    unsigned nFlags;
+
+    AUTO_STRUCT_INFO
+};
+
+struct CONTROLLER_CHUNK_DESC_0831
+{
+    enum
+    {
+        VERSION = 0x831
+    };
+
+    CONTROLLER_CHUNK_DESC_0831(){}
+
+    CONTROLLER_CHUNK_DESC_0831(const CONTROLLER_CHUNK_DESC_0829* oldChunk)
+        : nControllerId(oldChunk->nControllerId)
+        , nFlags(0)
+        , numPositionKeys(oldChunk->numPositionKeys)
+        , numRotationKeys(oldChunk->numRotationKeys)
+        , RotationFormat(oldChunk->RotationFormat)
+        , RotationTimeFormat(oldChunk->RotationTimeFormat)
+        , PositionFormat(oldChunk->PositionFormat)
+        , PositionKeysInfo(oldChunk->PositionKeysInfo)
+        , PositionTimeFormat(oldChunk->PositionTimeFormat)
+        , TracksAligned(oldChunk->TracksAligned)
+    {}
+
+    enum
+    {
+        eKeyTimeRotation = 0, eKeyTimePosition = 1, eKeyTimeScale = 2
+    };
+
+    unsigned int nControllerId;
+    unsigned int nFlags;
+
+    uint16 numRotationKeys;
+    uint16 numPositionKeys;
+    uint8 RotationFormat;
+    uint8 RotationTimeFormat;
+    uint8 PositionFormat;
+    uint8 PositionKeysInfo;
+    uint8 PositionTimeFormat;
+    uint8 TracksAligned;
+
+    AUTO_STRUCT_INFO
+};
+
+struct CONTROLLER_CHUNK_DESC_0905
+{
+    enum
+    {
+        VERSION = 0x0905
+    };
+
+    uint32 numKeyPos;
+    uint32 numKeyRot;
+    uint32 numKeyTime;
+    uint32 numAnims;
+    AUTO_STRUCT_INFO
+};
+
+//========================================
+//Node Chunk Header
+//========================================
+struct NODE_CHUNK_DESC_0824
+{
+    // Versions 0x0823 and 0x0824 have exactly same layout.
+    // The only difference between 0x0823 and 0x0824 is that some members
+    // are now named _obsoleteXXX_ and are not filled/used in 0x0824.
+    enum
+    {
+        VERSION = 0x0824
+    };
+    enum
+    {
+        COMPATIBLE_OLD_VERSION = 0x0823
+    };
+
+    char    name[64];
+
+    int     ObjectID;        // ID of this node's object chunk (if present)
+    int     ParentID;        // chunk ID of the parent Node's chunk
+    int     nChildren;       // # of children Nodes
+    int     MatID;           // Material chunk No
+
+    uint8   _obsoleteA_[4];  // uint8 IsGroupHead; uint8 IsGroupMember; uint8 _padding_[2]. not used anymore.
+
+    float   tm[4][4];        // transformation matrix
+
+    float   _obsoleteB_[3];  // position component of the matrix, stored as Vec3. not used anymore.
+    float   _obsoleteC_[4];  // rotation component of the matrix, stored as CryQuat. not used anymore.
+    float   _obsoleteD_[3];  // scale component of the matrix, stored as Vec3. not used anymore.
+
+    int     pos_cont_id;     // position controller chunk id
+    int     rot_cont_id;     // rotation controller chunk id
+    int     scl_cont_id;     // scale controller chunk id
+
+    int     PropStrLen;      // length of the property string
+
+    AUTO_STRUCT_INFO
+};
+
+//========================================
+//Helper Chunk Header
+//========================================
+enum HelperTypes
+{
+    HP_POINT = 0,
+    HP_DUMMY = 1,
+    HP_XREF = 2,
+    HP_CAMERA = 3,
+    HP_GEOMETRY = 4
+};
+
+struct HELPER_CHUNK_DESC_0744
+{
+    enum
+    {
+        VERSION = 0x0744
+    };
+
+    HelperTypes type;     // one of the HelperTypes values
+    Vec3  size;     // size in local x,y,z axises (for dummy only)
+
+    AUTO_STRUCT_INFO
+};
+
+typedef HELPER_CHUNK_DESC_0744 HELPER_CHUNK_DESC;
+#define HELPER_CHUNK_DESC_VERSION HELPER_CHUNK_DESC::VERSION
+
+
+// ChunkType_MeshMorphTarget  - morph target of a mesh chunk
+// This chunk contains only the information about the vertices that are changed in the mesh
+// This chunk is followed by an array of numMorphVertices structures SMeshMorphTargetVertex,
+// immediately followed by the name (null-terminated, variable-length string) of the morph target.
+// The string is after the array because of future alignment considerations; it may be padded with 0s.
+struct MESHMORPHTARGET_CHUNK_DESC_0001
+{
+    enum
+    {
+        VERSION = 0x0001
+    };
+    uint32 nChunkIdMesh;   // the chunk id of the mesh chunk (ChunkType_Mesh) for which this morph target is
+    uint32 numMorphVertices;  // number of MORPHED vertices
+
+    AUTO_STRUCT_INFO
+};
+
+
+// an array of these structures follows the MESHMORPHTARGET_CHUNK_DESC_0001
+// there are numMorphVertices of them
+struct SMeshMorphTargetVertex
+{
+    uint32 nVertexId; // vertex index in the original (mesh) array of vertices
+    Vec3 ptVertex;     // the target point of the morph target
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
+    AUTO_STRUCT_INFO
+};
+
+struct SMeshMorphTargetHeader
+{
+    uint32 MeshID;
+    uint32 NameLength;  //size of the name string
+    uint32 numIntVertices; //type SMeshMorphTargetVertex
+    uint32 numExtVertices; //type SMeshMorphTargetVertex
+
+    AUTO_STRUCT_INFO
+};
+
+struct SMeshPhysicalProxyHeader
+{
+    uint32 ChunkID;
+    uint32 numPoints;
+    uint32 numIndices;
+    uint32 numMaterials;
+
+    AUTO_STRUCT_INFO
+};
+
+//
+// ChunkType_BoneInitialPos   - describes the initial position (4x3 matrix) of each bone; just an array of 4x3 matrices
+// This structure is followed by
+struct BONEINITIALPOS_CHUNK_DESC_0001
+{
+    enum
+    {
+        VERSION = 0x0001
+    };
+    // the chunk id of the mesh chunk (ChunkType_Mesh) with bone info for which these bone initial positions are applicable.
+    // there might be some unused bones here as well. There must be the same number of bones as in the other chunks - they're placed
+    // in BoneId order.
+    unsigned nChunkIdMesh;
+    // this is the number of bone initial pose matrices here
+    unsigned numBones;
+
+    AUTO_STRUCT_INFO
+};
+
+// an array of these matrices follows the  BONEINITIALPOS_CHUNK_DESC_0001 header
+// there are numBones of them
+// TO BE REPLACED WITH Matrix43
+struct SBoneInitPosMatrix
+{
+    float mx[4][3];
+    float* operator [] (int i) {return mx[i]; }
+    const float* operator [] (int i) const {return mx[i]; }
+    const Vec3& getOrt (int nOrt) const {return *(const Vec3*)(mx[nOrt]); }
+
+    AUTO_STRUCT_INFO
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Custom Attributes chunk description.
+//////////////////////////////////////////////////////////////////////////
+struct EXPORT_FLAGS_CHUNK_DESC
+{
+    enum
+    {
+        VERSION = 0x0001
+    };
+    enum EFlags
+    {
+        MERGE_ALL_NODES          = 0x0001,
+        HAVE_AUTO_LODS           = 0x0002,
+        USE_CUSTOM_NORMALS       = 0x0004,
+        WANT_F32_VERTICES        = 0x0008,
+        EIGHT_WEIGHTS_PER_VERTEX = 0x0010,
+        //START: Prevent reprocessing skinning data for skinned CGF
+        SKINNED_CGF              = 0x0020,
+        //END: Prevent reprocessing skinning data for skinned CGF
+    };
+    enum ESrcFlags
+    {
+        FROM_MAX_EXPORTER = 0x0000,
+        FROM_COLLADA_XSI  = 0x1001,
+        FROM_COLLADA_MAX  = 0x1002,
+        FROM_COLLADA_MAYA = 0x1003,
+    };
+
+    unsigned int flags; // @see EFlags
+    unsigned int rc_version[4]; // Resource compiler version.
+    char rc_version_string[16]; // Version as a string.
+    unsigned int assetAuthorTool;
+    unsigned int authorToolVersion;
+    unsigned int reserved[30];
+
+    AUTO_STRUCT_INFO
+};
+
+struct BREAKABLE_PHYSICS_CHUNK_DESC
+{
+    enum
+    {
+        VERSION = 0x0001
+    };
+
+    unsigned int granularity;
+    int nMode;
+    int nRetVtx;
+    int nRetTets;
+    int nReserved[10];
+
+    AUTO_STRUCT_INFO
+};
+
+struct FOLIAGE_INFO_CHUNK_DESC
+{
+    enum
+    {
+        //START: Add Skinned Geometry (.CGF) export type (for touch bending vegetation)
+        VERSION = 0x0001,
+        VERSION2 = 0x0002
+        //END: Add Skinned Geometry (.CGF) export type (for touch bending vegetation)
+    };
+
+    int nSpines;
+    int nSpineVtx;
+    int nSkinnedVtx;
+    int nBoneIds;
+
+    AUTO_STRUCT_INFO
+};
+
+struct FOLIAGE_SPINE_SUB_CHUNK
+{
+    unsigned char nVtx;
+    char _paddingA_[3];
+    float len;
+    Vec3 navg;
+    unsigned char iAttachSpine;
+    unsigned char iAttachSeg;
+    char _paddingB_[2];
+
+    AUTO_STRUCT_INFO
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYHEADERS_H
diff --git a/Code/Legacy/CryCommon/CryHeaders_info.cpp b/Code/Legacy/CryCommon/CryHeaders_info.cpp
new file mode 100644
index 0000000000..776894233b
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryHeaders_info.cpp
@@ -0,0 +1,485 @@
+/*
+ * 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 "TypeInfo_impl.h"
+#include "CryHeaders.h"
+
+STRUCT_INFO_BEGIN(CryVertex)
+STRUCT_VAR_INFO(p, TYPE_INFO(Vec3))
+STRUCT_VAR_INFO(n, TYPE_INFO(Vec3))
+STRUCT_INFO_END(CryVertex)
+
+STRUCT_INFO_BEGIN(CryFace)
+STRUCT_VAR_INFO(v0, TYPE_INFO(int))
+STRUCT_VAR_INFO(v1, TYPE_INFO(int))
+STRUCT_VAR_INFO(v2, TYPE_INFO(int))
+STRUCT_VAR_INFO(MatID, TYPE_INFO(int))
+STRUCT_INFO_END(CryFace)
+
+STRUCT_INFO_BEGIN(CryUV)
+STRUCT_VAR_INFO(u, TYPE_INFO(float))
+STRUCT_VAR_INFO(v, TYPE_INFO(float))
+STRUCT_INFO_END(CryUV)
+
+STRUCT_INFO_BEGIN(CrySkinVtx)
+STRUCT_VAR_INFO(bVolumetric, TYPE_INFO(int))
+STRUCT_VAR_INFO(idx, TYPE_INFO_ARRAY(4, TYPE_INFO(int)))
+STRUCT_VAR_INFO(w, TYPE_INFO_ARRAY(4, TYPE_INFO(float)))
+STRUCT_VAR_INFO(M, TYPE_INFO(Matrix33))
+STRUCT_INFO_END(CrySkinVtx)
+
+STRUCT_INFO_BEGIN(CryLink)
+STRUCT_VAR_INFO(BoneID, TYPE_INFO(int))
+STRUCT_VAR_INFO(offset, TYPE_INFO(Vec3))
+STRUCT_VAR_INFO(Blending, TYPE_INFO(float))
+STRUCT_INFO_END(CryLink)
+
+STRUCT_INFO_BEGIN(CryIRGB)
+STRUCT_VAR_INFO(r, TYPE_INFO(unsigned char))
+STRUCT_VAR_INFO(g, TYPE_INFO(unsigned char))
+STRUCT_VAR_INFO(b, TYPE_INFO(unsigned char))
+STRUCT_INFO_END(CryIRGB)
+
+STRUCT_INFO_BEGIN(CryBonePhysics_Comp)
+STRUCT_VAR_INFO(nPhysGeom, TYPE_INFO(int))
+STRUCT_VAR_INFO(flags, TYPE_INFO(int))
+STRUCT_VAR_INFO(min, TYPE_ARRAY(3, TYPE_INFO(float)))
+STRUCT_VAR_INFO(max, TYPE_ARRAY(3, TYPE_INFO(float)))
+STRUCT_VAR_INFO(spring_angle, TYPE_ARRAY(3, TYPE_INFO(float)))
+STRUCT_VAR_INFO(spring_tension, TYPE_ARRAY(3, TYPE_INFO(float)))
+STRUCT_VAR_INFO(damping, TYPE_ARRAY(3, TYPE_INFO(float)))
+STRUCT_VAR_INFO(framemtx, TYPE_ARRAY(3, TYPE_ARRAY(3, TYPE_INFO(float))))
+STRUCT_INFO_END(CryBonePhysics_Comp)
+
+STRUCT_INFO_BEGIN(CryBoneDescData_Comp)
+STRUCT_VAR_INFO(m_nControllerID, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(m_PhysInfo, TYPE_ARRAY(2, TYPE_INFO(BONE_PHYSICS_COMP)))
+STRUCT_VAR_INFO(m_fMass, TYPE_INFO(float))
+STRUCT_VAR_INFO(m_DefaultW2B, TYPE_INFO(Matrix34))
+STRUCT_VAR_INFO(m_DefaultB2W, TYPE_INFO(Matrix34))
+STRUCT_VAR_INFO(m_arrBoneName, TYPE_ARRAY(256, TYPE_INFO(char)))
+STRUCT_VAR_INFO(m_nLimbId, TYPE_INFO(int))
+STRUCT_VAR_INFO(m_nOffsetParent, TYPE_INFO(int))
+STRUCT_VAR_INFO(m_numChildren, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(m_nOffsetChildren, TYPE_INFO(int))
+STRUCT_INFO_END(CryBoneDescData_Comp)
+
+STRUCT_INFO_BEGIN(BONE_ENTITY)
+STRUCT_VAR_INFO(BoneID, TYPE_INFO(int))
+STRUCT_VAR_INFO(ParentID, TYPE_INFO(int))
+STRUCT_VAR_INFO(nChildren, TYPE_INFO(int))
+STRUCT_VAR_INFO(ControllerID, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(prop, TYPE_ARRAY(32, TYPE_INFO(char)))
+STRUCT_VAR_INFO(phys, TYPE_INFO(BONE_PHYSICS_COMP))
+STRUCT_INFO_END(BONE_ENTITY)
+
+ENUM_INFO_BEGIN(ChunkTypes)
+ENUM_ELEM_INFO(, ChunkType_ANY)
+ENUM_ELEM_INFO(, ChunkType_Mesh)
+ENUM_ELEM_INFO(, ChunkType_Helper)
+ENUM_ELEM_INFO(, ChunkType_VertAnim)
+ENUM_ELEM_INFO(, ChunkType_BoneAnim)
+ENUM_ELEM_INFO(, ChunkType_GeomNameList)
+ENUM_ELEM_INFO(, ChunkType_BoneNameList)
+ENUM_ELEM_INFO(, ChunkType_MtlList)
+ENUM_ELEM_INFO(, ChunkType_MRM)
+ENUM_ELEM_INFO(, ChunkType_SceneProps)
+ENUM_ELEM_INFO(, ChunkType_Light)
+ENUM_ELEM_INFO(, ChunkType_PatchMesh)
+ENUM_ELEM_INFO(, ChunkType_Node)
+ENUM_ELEM_INFO(, ChunkType_Mtl)
+ENUM_ELEM_INFO(, ChunkType_Controller)
+ENUM_ELEM_INFO(, ChunkType_Timing)
+ENUM_ELEM_INFO(, ChunkType_BoneMesh)
+ENUM_ELEM_INFO(, ChunkType_BoneLightBinding)
+ENUM_ELEM_INFO(, ChunkType_MeshMorphTarget)
+ENUM_ELEM_INFO(, ChunkType_BoneInitialPos)
+ENUM_ELEM_INFO(, ChunkType_SourceInfo)
+ENUM_ELEM_INFO(, ChunkType_MtlName)
+ENUM_ELEM_INFO(, ChunkType_ExportFlags)
+ENUM_ELEM_INFO(, ChunkType_DataStream)
+ENUM_ELEM_INFO(, ChunkType_MeshSubsets)
+ENUM_ELEM_INFO(, ChunkType_MeshPhysicsData)
+ENUM_ELEM_INFO(, ChunkType_CompiledBones)
+ENUM_ELEM_INFO(, ChunkType_CompiledPhysicalBones)
+ENUM_ELEM_INFO(, ChunkType_CompiledMorphTargets)
+ENUM_ELEM_INFO(, ChunkType_CompiledPhysicalProxies)
+ENUM_ELEM_INFO(, ChunkType_CompiledIntFaces)
+ENUM_ELEM_INFO(, ChunkType_CompiledIntSkinVertices)
+ENUM_ELEM_INFO(, ChunkType_CompiledExt2IntMap)
+ENUM_ELEM_INFO(, ChunkType_BreakablePhysics)
+ENUM_ELEM_INFO(, ChunkType_FaceMap)
+ENUM_ELEM_INFO(, ChunkType_MotionParameters)
+ENUM_ELEM_INFO(, ChunkType_FootPlantInfo)
+ENUM_ELEM_INFO(, ChunkType_BonesBoxes)
+ENUM_ELEM_INFO(, ChunkType_FoliageInfo)
+ENUM_INFO_END(ChunkTypes)
+
+STRUCT_INFO_BEGIN(RANGE_ENTITY)
+STRUCT_VAR_INFO(name, TYPE_ARRAY(32, TYPE_INFO(char)))
+STRUCT_VAR_INFO(start, TYPE_INFO(int))
+STRUCT_VAR_INFO(end, TYPE_INFO(int))
+STRUCT_INFO_END(RANGE_ENTITY)
+
+STRUCT_INFO_BEGIN(TIMING_CHUNK_DESC_0918)
+STRUCT_VAR_INFO(m_SecsPerTick, TYPE_INFO(float))
+STRUCT_VAR_INFO(m_TicksPerFrame, TYPE_INFO(int))
+STRUCT_VAR_INFO(global_range, TYPE_INFO(RANGE_ENTITY))
+STRUCT_VAR_INFO(qqqqnSubRanges, TYPE_INFO(int))
+STRUCT_INFO_END(TIMING_CHUNK_DESC_0918)
+
+
+STRUCT_INFO_BEGIN(SPEED_CHUNK_DESC_2)
+STRUCT_VAR_INFO(Speed, TYPE_INFO(float))
+STRUCT_VAR_INFO(Distance, TYPE_INFO(float))
+STRUCT_VAR_INFO(Slope, TYPE_INFO(float))
+STRUCT_VAR_INFO(AnimFlags, TYPE_INFO(int))
+STRUCT_VAR_INFO(MoveDir, TYPE_ARRAY(3, TYPE_INFO(f32)))
+STRUCT_VAR_INFO(StartPosition, TYPE_INFO(QuatT))
+STRUCT_INFO_END(SPEED_CHUNK_DESC_2)
+
+STRUCT_INFO_BEGIN(MTL_NAME_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
+STRUCT_VAR_INFO(nFlags2, TYPE_INFO(int))
+STRUCT_VAR_INFO(name, TYPE_ARRAY(128, TYPE_INFO(char)))
+STRUCT_VAR_INFO(nPhysicalizeType, TYPE_INFO(int))
+STRUCT_VAR_INFO(nSubMaterials, TYPE_INFO(int))
+STRUCT_VAR_INFO(nSubMatChunkId, TYPE_ARRAY(MTL_NAME_CHUNK_DESC_0800_MAX_SUB_MATERIALS, TYPE_INFO(int)))
+STRUCT_VAR_INFO(nAdvancedDataChunkId, TYPE_INFO(int))
+STRUCT_VAR_INFO(sh_opacity, TYPE_INFO(float))
+STRUCT_VAR_INFO(reserve, TYPE_ARRAY(32, TYPE_INFO(int)))
+STRUCT_INFO_END(MTL_NAME_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(MTL_NAME_CHUNK_DESC_0802)
+STRUCT_VAR_INFO(name, TYPE_ARRAY(128, TYPE_INFO(char)))
+STRUCT_VAR_INFO(nSubMaterials, TYPE_INFO(int))
+STRUCT_INFO_END(MTL_NAME_CHUNK_DESC_0802)
+
+STRUCT_INFO_BEGIN(MESH_CHUNK_DESC_0745)
+STRUCT_VAR_INFO(flags1, TYPE_INFO(unsigned char))
+STRUCT_VAR_INFO(flags2, TYPE_INFO(unsigned char))
+STRUCT_VAR_INFO(nVerts, TYPE_INFO(int))
+STRUCT_VAR_INFO(nTVerts, TYPE_INFO(int))
+STRUCT_VAR_INFO(nFaces, TYPE_INFO(int))
+STRUCT_VAR_INFO(VertAnimID, TYPE_INFO(int))
+STRUCT_INFO_END(MESH_CHUNK_DESC_0745)
+
+STRUCT_INFO_BEGIN(MESH_CHUNK_DESC_0801)
+STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
+STRUCT_VAR_INFO(nFlags2, TYPE_INFO(int))
+STRUCT_VAR_INFO(nVerts, TYPE_INFO(int))
+STRUCT_VAR_INFO(nIndices, TYPE_INFO(int))
+STRUCT_VAR_INFO(nSubsets, TYPE_INFO(int))
+STRUCT_VAR_INFO(nSubsetsChunkId, TYPE_INFO(int))
+STRUCT_VAR_INFO(nVertAnimID, TYPE_INFO(int))
+STRUCT_VAR_INFO(nStreamChunkID, TYPE_ARRAY(16, TYPE_INFO(int)))
+STRUCT_VAR_INFO(nPhysicsDataChunkId, TYPE_ARRAY(4, TYPE_INFO(int)))
+STRUCT_VAR_INFO(bboxMin, TYPE_INFO(Vec3))
+STRUCT_VAR_INFO(bboxMax, TYPE_INFO(Vec3))
+STRUCT_VAR_INFO(texMappingDensity, TYPE_INFO(float))
+STRUCT_VAR_INFO(geometricMeanFaceArea, TYPE_INFO(float))
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(30, TYPE_INFO(int)))
+STRUCT_INFO_END(MESH_CHUNK_DESC_0801)
+
+STRUCT_INFO_BEGIN(MESH_CHUNK_DESC_0802)
+STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
+STRUCT_VAR_INFO(nFlags2, TYPE_INFO(int))
+STRUCT_VAR_INFO(nVerts, TYPE_INFO(int))
+STRUCT_VAR_INFO(nIndices, TYPE_INFO(int))
+STRUCT_VAR_INFO(nSubsets, TYPE_INFO(int))
+STRUCT_VAR_INFO(nSubsetsChunkId, TYPE_INFO(int))
+STRUCT_VAR_INFO(nVertAnimID, TYPE_INFO(int))
+STRUCT_VAR_INFO(nStreamChunkID, TYPE_ARRAY(16, TYPE_ARRAY(8, TYPE_INFO(int))))
+STRUCT_VAR_INFO(nPhysicsDataChunkId, TYPE_ARRAY(4, TYPE_INFO(int)))
+STRUCT_VAR_INFO(bboxMin, TYPE_INFO(Vec3))
+STRUCT_VAR_INFO(bboxMax, TYPE_INFO(Vec3))
+STRUCT_VAR_INFO(texMappingDensity, TYPE_INFO(float))
+STRUCT_VAR_INFO(geometricMeanFaceArea, TYPE_INFO(float))
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(30, TYPE_INFO(int)))
+STRUCT_INFO_END(MESH_CHUNK_DESC_0802)
+
+STRUCT_INFO_BEGIN(STREAM_DATA_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
+STRUCT_VAR_INFO(nStreamType, TYPE_INFO(int))
+STRUCT_VAR_INFO(nCount, TYPE_INFO(int))
+STRUCT_VAR_INFO(nElementSize, TYPE_INFO(int))
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(2, TYPE_INFO(int)))
+STRUCT_INFO_END(STREAM_DATA_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(STREAM_DATA_CHUNK_DESC_0801)
+STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
+STRUCT_VAR_INFO(nStreamType, TYPE_INFO(int))
+STRUCT_VAR_INFO(nStreamIndex, TYPE_INFO(int))
+STRUCT_VAR_INFO(nCount, TYPE_INFO(int))
+STRUCT_VAR_INFO(nElementSize, TYPE_INFO(int))
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(2, TYPE_INFO(int)))
+STRUCT_INFO_END(STREAM_DATA_CHUNK_DESC_0801)
+
+STRUCT_INFO_BEGIN(MESH_SUBSETS_CHUNK_DESC_0800::MeshSubset)
+STRUCT_VAR_INFO(nFirstIndexId, TYPE_INFO(int))
+STRUCT_VAR_INFO(nNumIndices, TYPE_INFO(int))
+STRUCT_VAR_INFO(nFirstVertId, TYPE_INFO(int))
+STRUCT_VAR_INFO(nNumVerts, TYPE_INFO(int))
+STRUCT_VAR_INFO(nMatID, TYPE_INFO(int))
+STRUCT_VAR_INFO(fRadius, TYPE_INFO(float))
+STRUCT_VAR_INFO(vCenter, TYPE_INFO(Vec3))
+STRUCT_INFO_END(MESH_SUBSETS_CHUNK_DESC_0800::MeshSubset)
+
+STRUCT_INFO_BEGIN(MESH_SUBSETS_CHUNK_DESC_0800::MeshBoneIDs)
+STRUCT_VAR_INFO(numBoneIDs, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(arrBoneIDs, TYPE_ARRAY(128, TYPE_INFO(uint16)))
+STRUCT_INFO_END(MESH_SUBSETS_CHUNK_DESC_0800::MeshBoneIDs)
+
+STRUCT_INFO_BEGIN(MESH_SUBSETS_CHUNK_DESC_0800::MeshSubsetTexelDensity)
+STRUCT_VAR_INFO(texelDensity, TYPE_INFO(float))
+STRUCT_INFO_END(MESH_SUBSETS_CHUNK_DESC_0800::MeshSubsetTexelDensity)
+
+
+STRUCT_INFO_BEGIN(MESH_SUBSETS_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
+STRUCT_VAR_INFO(nCount, TYPE_INFO(int))
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(2, TYPE_INFO(int)))
+STRUCT_INFO_END(MESH_SUBSETS_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(MESH_PHYSICS_DATA_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(nDataSize, TYPE_INFO(int))
+STRUCT_VAR_INFO(nFlags, TYPE_INFO(int))
+STRUCT_VAR_INFO(nTetrahedraDataSize, TYPE_INFO(int))
+STRUCT_VAR_INFO(nTetrahedraChunkId, TYPE_INFO(int))
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(2, TYPE_INFO(int)))
+STRUCT_INFO_END(MESH_PHYSICS_DATA_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(BONEANIM_CHUNK_DESC_0290)
+STRUCT_VAR_INFO(nBones, TYPE_INFO(int))
+STRUCT_INFO_END(BONEANIM_CHUNK_DESC_0290)
+
+STRUCT_INFO_BEGIN(BONENAMELIST_CHUNK_DESC_0745)
+STRUCT_VAR_INFO(numEntities, TYPE_INFO(int))
+STRUCT_INFO_END(BONENAMELIST_CHUNK_DESC_0745)
+
+STRUCT_INFO_BEGIN(COMPILED_BONE_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(32, TYPE_INFO(char)))
+STRUCT_INFO_END(COMPILED_BONE_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(COMPILED_PHYSICALBONE_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(32, TYPE_INFO(char)))
+STRUCT_INFO_END(COMPILED_PHYSICALBONE_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(COMPILED_PHYSICALPROXY_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(numPhysicalProxies, TYPE_INFO(uint32))
+STRUCT_INFO_END(COMPILED_PHYSICALPROXY_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(COMPILED_MORPHTARGETS_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(numMorphTargets, TYPE_INFO(uint32))
+STRUCT_INFO_END(COMPILED_MORPHTARGETS_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(COMPILED_INTSKINVERTICES_CHUNK_DESC_0800)
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(32, TYPE_INFO(char)))
+STRUCT_INFO_END(COMPILED_INTSKINVERTICES_CHUNK_DESC_0800)
+
+STRUCT_INFO_BEGIN(BaseKey)
+STRUCT_VAR_INFO(time, TYPE_INFO(int))
+STRUCT_INFO_END(BaseKey)
+
+STRUCT_INFO_BEGIN(BaseTCB)
+STRUCT_VAR_INFO(t, TYPE_INFO(float))
+STRUCT_VAR_INFO(c, TYPE_INFO(float))
+STRUCT_VAR_INFO(b, TYPE_INFO(float))
+STRUCT_VAR_INFO(ein, TYPE_INFO(float))
+STRUCT_VAR_INFO(eout, TYPE_INFO(float))
+STRUCT_INFO_END(BaseTCB)
+
+STRUCT_INFO_BEGIN(BaseKey3)
+STRUCT_BASE_INFO(BaseKey)
+STRUCT_VAR_INFO(val, TYPE_INFO(Vec3))
+STRUCT_INFO_END(BaseKey3)
+
+STRUCT_INFO_BEGIN(BaseKeyQ)
+STRUCT_BASE_INFO(BaseKey)
+STRUCT_VAR_INFO(val, TYPE_INFO(CryQuat))
+STRUCT_INFO_END(BaseKeyQ)
+
+STRUCT_INFO_BEGIN(CryTCB3Key)
+STRUCT_BASE_INFO(BaseKey3)
+STRUCT_BASE_INFO(BaseTCB)
+STRUCT_INFO_END(CryTCB3Key)
+
+STRUCT_INFO_BEGIN(CryTCBQKey)
+STRUCT_BASE_INFO(BaseKeyQ)
+STRUCT_BASE_INFO(BaseTCB)
+STRUCT_INFO_END(CryTCBQKey)
+
+STRUCT_INFO_BEGIN(CryKeyPQLog)
+STRUCT_VAR_INFO(nTime, TYPE_INFO(int))
+STRUCT_VAR_INFO(vPos, TYPE_INFO(Vec3))
+STRUCT_VAR_INFO(vRotLog, TYPE_INFO(Vec3))
+STRUCT_INFO_END(CryKeyPQLog)
+
+ENUM_INFO_BEGIN(CtrlTypes)
+ENUM_ELEM_INFO(, CTRL_NONE)
+ENUM_ELEM_INFO(, CTRL_CRYBONE)
+ENUM_ELEM_INFO(, CTRL_LINEER1)
+ENUM_ELEM_INFO(, CTRL_LINEER3)
+ENUM_ELEM_INFO(, CTRL_LINEERQ)
+ENUM_ELEM_INFO(, CTRL_BEZIER1)
+ENUM_ELEM_INFO(, CTRL_BEZIER3)
+ENUM_ELEM_INFO(, CTRL_BEZIERQ)
+ENUM_ELEM_INFO(, CTRL_TCB1)
+ENUM_ELEM_INFO(, CTRL_TCB3)
+ENUM_ELEM_INFO(, CTRL_TCBQ)
+ENUM_ELEM_INFO(, CTRL_BSPLINE_2O)
+ENUM_ELEM_INFO(, CTRL_BSPLINE_1O)
+ENUM_ELEM_INFO(, CTRL_BSPLINE_2C)
+ENUM_ELEM_INFO(, CTRL_BSPLINE_1C)
+ENUM_ELEM_INFO(, CTRL_CONST)
+ENUM_INFO_END(CtrlTypes)
+
+STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0826)
+STRUCT_VAR_INFO(type, TYPE_INFO(CtrlTypes))
+STRUCT_VAR_INFO(nKeys, TYPE_INFO(int))
+STRUCT_VAR_INFO(nFlags, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
+STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0826)
+
+STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0827)
+STRUCT_VAR_INFO(numKeys, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
+STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0827)
+
+STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0829)
+STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(numRotationKeys, TYPE_INFO(uint16))
+STRUCT_VAR_INFO(numPositionKeys, TYPE_INFO(uint16))
+STRUCT_VAR_INFO(RotationFormat, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(RotationTimeFormat, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(PositionFormat, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(PositionKeysInfo, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(PositionTimeFormat, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(TracksAligned, TYPE_INFO(uint8))
+STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0829)
+
+STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0830)
+STRUCT_VAR_INFO(numKeys, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(nFlags, Type_info(unsigned int))
+STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
+STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0830)
+
+STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0831)
+STRUCT_VAR_INFO(nControllerId, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(nFlags, Type_info(unsigned int))
+STRUCT_VAR_INFO(numRotationKeys, TYPE_INFO(uint16))
+STRUCT_VAR_INFO(numPositionKeys, TYPE_INFO(uint16))
+STRUCT_VAR_INFO(RotationFormat, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(RotationTimeFormat, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(PositionFormat, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(PositionKeysInfo, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(PositionTimeFormat, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(TracksAligned, TYPE_INFO(uint8))
+STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0831)
+
+STRUCT_INFO_BEGIN(CONTROLLER_CHUNK_DESC_0905)
+STRUCT_VAR_INFO(numKeyPos, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(numKeyRot, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(numKeyTime, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(numAnims, TYPE_INFO(uint32))
+STRUCT_INFO_END(CONTROLLER_CHUNK_DESC_0905)
+
+STRUCT_INFO_BEGIN(NODE_CHUNK_DESC_0824)
+STRUCT_VAR_INFO(name, TYPE_ARRAY(64, TYPE_INFO(char)))
+STRUCT_VAR_INFO(ObjectID, TYPE_INFO(int))
+STRUCT_VAR_INFO(ParentID, TYPE_INFO(int))
+STRUCT_VAR_INFO(nChildren, TYPE_INFO(int))
+STRUCT_VAR_INFO(MatID, TYPE_INFO(int))
+STRUCT_VAR_INFO(_obsoleteA_, TYPE_ARRAY(4, TYPE_INFO(uint8)))
+STRUCT_VAR_INFO(tm, TYPE_ARRAY(4, TYPE_ARRAY(4, TYPE_INFO(float))))
+STRUCT_VAR_INFO(_obsoleteB_, TYPE_ARRAY(3, TYPE_INFO(float)))
+STRUCT_VAR_INFO(_obsoleteC_, TYPE_ARRAY(4, TYPE_INFO(float)))
+STRUCT_VAR_INFO(_obsoleteD_, TYPE_ARRAY(3, TYPE_INFO(float)))
+STRUCT_VAR_INFO(pos_cont_id, TYPE_INFO(int))
+STRUCT_VAR_INFO(rot_cont_id, TYPE_INFO(int))
+STRUCT_VAR_INFO(scl_cont_id, TYPE_INFO(int))
+STRUCT_VAR_INFO(PropStrLen, TYPE_INFO(int))
+STRUCT_INFO_END(NODE_CHUNK_DESC_0824)
+
+ENUM_INFO_BEGIN(HelperTypes)
+ENUM_ELEM_INFO(, HP_POINT)
+ENUM_ELEM_INFO(, HP_DUMMY)
+ENUM_ELEM_INFO(, HP_XREF)
+ENUM_ELEM_INFO(, HP_CAMERA)
+ENUM_ELEM_INFO(, HP_GEOMETRY)
+ENUM_INFO_END(HelperTypes)
+
+STRUCT_INFO_BEGIN(HELPER_CHUNK_DESC_0744)
+STRUCT_VAR_INFO(type, TYPE_INFO(HelperTypes))
+STRUCT_VAR_INFO(size, TYPE_INFO(Vec3))
+STRUCT_INFO_END(HELPER_CHUNK_DESC_0744)
+
+STRUCT_INFO_BEGIN(MESHMORPHTARGET_CHUNK_DESC_0001)
+STRUCT_VAR_INFO(nChunkIdMesh, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(numMorphVertices, TYPE_INFO(unsigned int))
+STRUCT_INFO_END(MESHMORPHTARGET_CHUNK_DESC_0001)
+
+STRUCT_INFO_BEGIN(SMeshMorphTargetVertex)
+STRUCT_VAR_INFO(nVertexId, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(ptVertex, TYPE_INFO(Vec3))
+STRUCT_INFO_END(SMeshMorphTargetVertex)
+
+STRUCT_INFO_BEGIN(SMeshMorphTargetHeader)
+STRUCT_VAR_INFO(MeshID, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(NameLength, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(numIntVertices, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(numExtVertices, TYPE_INFO(uint32))
+STRUCT_INFO_END(SMeshMorphTargetHeader)
+
+STRUCT_INFO_BEGIN(SMeshPhysicalProxyHeader)
+STRUCT_VAR_INFO(ChunkID, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(numPoints, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(numIndices, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(numMaterials, TYPE_INFO(uint32))
+STRUCT_INFO_END(SMeshPhysicalProxyHeader)
+
+STRUCT_INFO_BEGIN(BONEINITIALPOS_CHUNK_DESC_0001)
+STRUCT_VAR_INFO(nChunkIdMesh, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(numBones, TYPE_INFO(unsigned int))
+STRUCT_INFO_END(BONEINITIALPOS_CHUNK_DESC_0001)
+
+STRUCT_INFO_BEGIN(SBoneInitPosMatrix)
+STRUCT_VAR_INFO(mx, TYPE_ARRAY(4, TYPE_ARRAY(3, TYPE_INFO(float))))
+STRUCT_INFO_END(SBoneInitPosMatrix)
+
+STRUCT_INFO_BEGIN(EXPORT_FLAGS_CHUNK_DESC)
+STRUCT_VAR_INFO(flags, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(rc_version, TYPE_ARRAY(4, TYPE_INFO(unsigned int)))
+STRUCT_VAR_INFO(rc_version_string, TYPE_ARRAY(16, TYPE_INFO(char)))
+STRUCT_VAR_INFO(assetAuthorTool, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(authorToolVersion, TYPE_INFO(uint32))
+STRUCT_VAR_INFO(reserved, TYPE_ARRAY(30, TYPE_INFO(unsigned int)))
+STRUCT_INFO_END(EXPORT_FLAGS_CHUNK_DESC)
+
+STRUCT_INFO_BEGIN(BREAKABLE_PHYSICS_CHUNK_DESC)
+STRUCT_VAR_INFO(granularity, TYPE_INFO(unsigned int))
+STRUCT_VAR_INFO(nMode, TYPE_INFO(int))
+STRUCT_VAR_INFO(nRetVtx, TYPE_INFO(int))
+STRUCT_VAR_INFO(nRetTets, TYPE_INFO(int))
+STRUCT_VAR_INFO(nReserved, TYPE_ARRAY(10, TYPE_INFO(int)))
+STRUCT_INFO_END(BREAKABLE_PHYSICS_CHUNK_DESC)
+
+STRUCT_INFO_BEGIN(FOLIAGE_INFO_CHUNK_DESC)
+STRUCT_VAR_INFO(nSpines, TYPE_INFO(int))
+STRUCT_VAR_INFO(nSpineVtx, TYPE_INFO(int))
+STRUCT_VAR_INFO(nSkinnedVtx, TYPE_INFO(int))
+STRUCT_VAR_INFO(nBoneIds, TYPE_INFO(int))
+STRUCT_INFO_END(FOLIAGE_INFO_CHUNK_DESC)
+
+STRUCT_INFO_BEGIN(FOLIAGE_SPINE_SUB_CHUNK)
+STRUCT_VAR_INFO(nVtx, TYPE_INFO(char))
+STRUCT_VAR_INFO(len, TYPE_INFO(float))
+STRUCT_VAR_INFO(navg, TYPE_INFO(Vec3))
+STRUCT_VAR_INFO(iAttachSpine, TYPE_INFO(unsigned char))
+STRUCT_VAR_INFO(iAttachSeg, TYPE_INFO(unsigned char))
+STRUCT_INFO_END(FOLIAGE_SPINE_SUB_CHUNK)
diff --git a/Code/Legacy/CryCommon/CryLegacyAllocator.h b/Code/Legacy/CryCommon/CryLegacyAllocator.h
new file mode 100644
index 0000000000..c4360f6b2c
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryLegacyAllocator.h
@@ -0,0 +1,221 @@
+/*
+ * 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 "LegacyAllocator.h"
+
+#include <AzCore/std/algorithm.h>
+
+//-----------------------------------------------------------------------------
+// CryModule allocation API
+//-----------------------------------------------------------------------------
+#define CryModuleMalloc(size) CryModuleMallocImpl(size, __FILE__, __LINE__)
+
+inline void* CryModuleMallocImpl(size_t size, const char* file, const int line)
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(size, 0, 0, "LegacyAllocator malloc", file, line);
+}
+
+#define CryModuleFree(ptr) CryModuleFreeImpl(ptr, __FILE__, __LINE__)
+#define CryModuleMemalignFree(ptr) CryModuleFreeImpl(ptr, __FILE__, __LINE__)
+
+inline void CryModuleFreeImpl(void* ptr, const char* file, const int line)
+{
+
+    AZ::IAllocator& allocator = AZ::AllocatorInstance<AZ::LegacyAllocator>::GetAllocator();
+
+    if (allocator.IsAllocationSourceChanged())
+    {
+        allocator.GetAllocationSource()->DeAllocate(ptr);
+    }
+    else
+    {
+        static_cast<AZ::LegacyAllocator&>(allocator).DeAllocate(ptr, file, line);
+    }
+}
+
+#define CryModuleMemalign(size, alignment) CryModuleMemalignImpl(size, alignment, __FILE__, __LINE__)
+
+inline void* CryModuleMemalignImpl(size_t size, size_t alignment, const char* file, const int line)
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(size, alignment, 0, "LegacyAllocator memalign", file, line);
+}
+
+#define CryModuleCalloc(num, size) CryModuleCallocImpl(num, size, __FILE__, __LINE__)
+
+inline void* CryModuleCallocImpl(size_t num, size_t size, const char* file, const int line)
+{
+    void* ptr = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(num * size, 0, 0, "LegacyAllocator calloc", file, line);
+    ::memset(ptr, 0, num * size);
+    return ptr;
+}
+
+#define CryModuleRealloc(ptr, size) CryModuleReallocAlignImpl(ptr, size, 0, __FILE__, __LINE__)
+#define CryModuleReallocAlign(ptr, size, alignment) CryModuleReallocAlignImpl(ptr, size, alignment, __FILE__, __LINE__)
+
+inline void* CryModuleReallocAlignImpl(void* prev, size_t size, size_t alignment, const char* file, const int line)
+{
+    if (!prev)
+    {
+        // map realloc(nullptr, ...) -> alloc() so that we can track the location of the initial alloc
+        return CryModuleMemalignImpl(size, alignment, file, line);
+    }
+    if (size == 0)
+    {
+        CryModuleFreeImpl(prev, file, line);
+        return nullptr;
+    }
+    // There should not be any code using CryRealloc during static-init time or before the allocators
+// are initialized.
+#if defined(AZ_MONOLITHIC_BUILD)
+    if (!AZ::AllocatorInstance<AZ::LegacyAllocator>::IsReady())
+    {
+        AZ_Assert(false, "CryRealloc/CryReallocAlign cannot be used unless the LegacyAllocator has been initialized");
+        return nullptr;
+    }
+#endif
+
+    AZ::IAllocator& allocator = AZ::AllocatorInstance<AZ::LegacyAllocator>::GetAllocator();
+    void *ptr;
+
+    if (allocator.IsAllocationSourceChanged())
+    {
+        ptr = allocator.GetAllocationSource()->ReAllocate(prev, size, 0);
+    }
+    else
+    {
+        ptr = static_cast<AZ::LegacyAllocator&>(allocator).ReAllocate(prev, size, 0, file, line);
+    }
+
+    return ptr;
+}
+
+//-----------------------------------------------------------------------------
+// CryCrt alloc API
+//-----------------------------------------------------------------------------
+inline size_t CryCrtSize(void* p)
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(p);
+}
+
+inline void* CryCrtMalloc(size_t size)
+{
+    return CryModuleMalloc(size);
+}
+
+inline size_t CryCrtFree(void* p)
+{
+    size_t size = CryCrtSize(p);
+    CryModuleFree(p);
+    return size;
+};
+
+//-----------------------------------------------------------------------------
+// CrySystemCrt alloc API
+//-----------------------------------------------------------------------------
+inline size_t CrySystemCrtSize(void* p)
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(p);
+}
+
+inline void* CrySystemCrtMalloc(size_t size)
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(size, 0, 0, "AZ::LegacyAllocator");
+}
+
+inline void* CrySystemCrtRealloc(void* p, size_t size)
+{
+    // Use LegacyAllocator's special ReAllocate
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().ReAllocate(p, size, 0);
+}
+
+inline size_t CrySystemCrtFree(void* p)
+{
+    size_t size = CrySystemCrtSize(p);
+    CryModuleFree(p);
+    return size;
+}
+
+inline size_t CrySystemCrtGetUsedSpace()
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().NumAllocatedBytes();
+}
+
+//-----------------------------------------------------------------------------
+// CryMalloc API
+//-----------------------------------------------------------------------------
+inline void* CryMalloc(size_t size, size_t& allocated, size_t alignment)
+{
+    if (!size)
+    {
+        allocated = 0;
+        return nullptr;
+    }
+
+    // The original implementation guaranteed 16 byte min alignment
+    alignment = AZStd::GetMax<size_t>(alignment, 16);
+    void* ptr = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().Allocate(size, alignment, 0, "CryMalloc", __FILE__, __LINE__);
+    allocated = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(ptr);
+    return ptr;
+}
+
+inline void* CryRealloc(void* memblock, size_t size, size_t& allocated, size_t& oldsize, size_t alignment)
+{
+    oldsize = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(memblock);
+    void* ptr = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().ReAllocate(memblock, size, alignment);
+    allocated = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(ptr);
+    return ptr;
+}
+
+inline size_t CryFree(void* p, size_t /*alignment*/)
+{
+    size_t size = AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(p);
+    AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().DeAllocate(p, size);
+    return size;
+}
+
+inline size_t CryGetMemSize(void* memblock, size_t /*sourceSize*/)
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().AllocationSize(memblock);
+}
+
+inline int CryMemoryGetAllocatedSize()
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().NumAllocatedBytes();
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline int CryMemoryGetPoolSize()
+{
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline int CryStats([[maybe_unused]] char* buf)
+{
+    return 0;
+}
+
+inline int CryGetUsedHeapSize()
+{
+    return AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().NumAllocatedBytes();
+}
+
+inline int CryGetWastedHeapSize()
+{
+    return 0;
+}
+
+inline void CryCleanup()
+{
+    AZ::AllocatorInstance<AZ::LegacyAllocator>::Get().GarbageCollect();
+}
+
+inline void CryResetStats(void)
+{
+}
diff --git a/Code/Legacy/CryCommon/CryLibrary.cpp b/Code/Legacy/CryCommon/CryLibrary.cpp
new file mode 100644
index 0000000000..72c87512da
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryLibrary.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 <CryCommon/CryLibrary.h>
+
+#if !defined(AZ_RESTRICTED_PLATFORM) && defined(WIN32)
+
+HMODULE CryLoadLibrary(const char* libName)
+{
+    HMODULE module = ::LoadLibraryA(libName);
+    if (module != NULL)
+    {
+        // We need to inject the environment first thing so that allocators are available immediately
+        InjectEnvironmentFunction injectEnv = reinterpret_cast<InjectEnvironmentFunction>(::GetProcAddress(module, INJECT_ENVIRONMENT_FUNCTION));
+        if (injectEnv)
+        {
+            auto env = AZ::Environment::GetInstance();
+            injectEnv(env);
+        }
+    }
+
+    return module;
+}
+
+// Cry code seems to have used void* as their abstraction for HMODULE across
+// platforms.
+bool CryFreeLibrary(void* lib)
+{
+    if (lib != NULL)
+    {
+        DetachEnvironmentFunction detachEnv = reinterpret_cast<DetachEnvironmentFunction>(::GetProcAddress((HMODULE)lib, DETACH_ENVIRONMENT_FUNCTION));
+        if (detachEnv)
+        {
+            detachEnv();
+        }
+        return ::FreeLibrary((HMODULE)lib) != FALSE;
+    }
+    return false;
+}
+
+#endif
diff --git a/Code/Legacy/CryCommon/CryLibrary.h b/Code/Legacy/CryCommon/CryLibrary.h
new file mode 100644
index 0000000000..89e8e33825
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryLibrary.h
@@ -0,0 +1,194 @@
+/*
+ * 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
+
+
+/*!
+    CryLibrary
+
+    Convenience-Macros which abstract the use of DLLs/shared libraries in a platform independent way.
+    A short explanation of the different macros follows:
+
+    CrySharedLibrarySupported:
+        This macro can be used to test if the current active platform supports shared library calls. The default
+        value is false. This gets redefined if a certain platform (WIN32 or LINUX) is desired.
+
+    CrySharedLibraryPrefix:
+        The default prefix which will get prepended to library names in calls to CryLoadLibraryDefName
+        (see below).
+
+    CrySharedLibraryExtension:
+        The default extension which will get appended to library names in calls to CryLoadLibraryDefName
+        (see below).
+
+    CryLoadLibrary(libName):
+        Loads a shared library.
+
+    CryLoadLibraryDefName(libName):
+        Loads a shared library. The platform-specific default library prefix and extension are appended to the libName.
+        This allows writing of somewhat platform-independent library loading code and is therefore the function
+        which should be used most of the time, unless some special extensions are used (e.g. for plugins).
+
+    CryGetProcAddress(libHandle, procName):
+        Import function from the library presented by libHandle.
+
+    CryFreeLibrary(libHandle):
+        Unload the library presented by libHandle.
+
+    HISTORY:
+        03.03.2004 MarcoK
+            - initial version
+            - added to CryPlatform
+*/
+
+#include <stdio.h>
+#include <AzCore/PlatformDef.h>
+#include <AzCore/Module/Environment.h>
+
+#define INJECT_ENVIRONMENT_FUNCTION "InjectEnvironment"
+#define DETACH_ENVIRONMENT_FUNCTION "DetachEnvironment"
+using InjectEnvironmentFunction = void(*)(void*);
+using DetachEnvironmentFunction = void(*)();
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(CryLibrary_h)
+#elif defined(WIN32)
+    #if !defined(WIN32_LEAN_AND_MEAN)
+        #define WIN32_LEAN_AND_MEAN
+    #endif
+    #include <CryWindows.h>
+
+    HMODULE CryLoadLibrary(const char* libName);
+    
+    // Cry code seems to have used void* as their abstraction for HMODULE across
+    // platforms.
+    bool CryFreeLibrary(void* lib);
+
+    #define CRYLIBRARY_H_TRAIT_USE_WINDOWS_DLL 1
+#elif ((defined(LINUX) || AZ_TRAIT_OS_PLATFORM_APPLE))
+    #include <dlfcn.h>
+    #include <stdlib.h>
+    #include <libgen.h>
+    #include "platform.h"
+    #include <AzCore/Debug/Trace.h>
+
+// for compatibility with code written for windows
+    #define CrySharedLibrarySupported true
+    #define CrySharedLibraryPrefix "lib"
+#if AZ_TRAIT_OS_PLATFORM_APPLE
+    #include <mach-o/dyld.h>
+    #define CrySharedLibraryExtension ".dylib"
+#else
+    #define CrySharedLibraryExtension ".so"
+#endif
+
+    #define CryGetProcAddress(libHandle, procName) ::dlsym(libHandle, procName)
+    #define HMODULE void*
+static const char* gEnvName("MODULE_PATH");
+
+static const char* GetModulePath()
+{
+    return getenv(gEnvName);
+}
+
+static void SetModulePath(const char* pModulePath)
+{
+    setenv(gEnvName, pModulePath ? pModulePath : "", true);
+}
+
+// bInModulePath is only ever set to false in RC, because rc needs to load dlls from a $PATH that
+// it has modified to include ..
+static HMODULE CryLoadLibrary(const char* libName, bool bLazy = false, bool bInModulePath = true)
+{
+    const char* libPath = nullptr;
+    char pathBuffer[MAX_PATH] = {0};
+    
+    libPath = libName;
+
+#if !defined(AZ_PLATFORM_ANDROID)
+    if (bInModulePath)
+    {
+        char exePath[MAX_PATH + 1] = { 0 };
+        const char* modulePath = GetModulePath();
+        if (!modulePath)
+        {
+            modulePath = ".";
+            #if defined(LINUX)
+                int len = readlink("/proc/self/exe", exePath, MAX_PATH);
+                if (len != -1)
+                {
+                    exePath[len] = 0;
+                    modulePath = dirname(exePath);
+                }
+            #elif AZ_TRAIT_OS_PLATFORM_APPLE
+                uint32_t bufsize = MAX_PATH;
+                if (_NSGetExecutablePath(exePath, &bufsize) == 0)
+                {
+                    exePath[bufsize] = 0;
+                    modulePath = dirname(exePath);
+                }
+            #endif
+        }
+        sprintf_s(pathBuffer, "%s/%s", modulePath, libName);
+        libPath = pathBuffer;
+    }
+#endif
+
+    HMODULE module;
+    #if defined(LINUX) && !defined(ANDROID)
+        module = ::dlopen(libPath, (bLazy ? RTLD_LAZY : RTLD_NOW) | RTLD_DEEPBIND);
+    #else
+        module = ::dlopen(libPath, bLazy ? RTLD_LAZY : RTLD_NOW);
+    #endif
+    AZ_Warning("LMBR", module, "Can't load library [%s]: %s", libName, dlerror());
+
+    if (module)
+    {
+        // We need to inject the environment first thing so that allocators are available immediately
+        InjectEnvironmentFunction injectEnv = reinterpret_cast<InjectEnvironmentFunction>(CryGetProcAddress(module, INJECT_ENVIRONMENT_FUNCTION));
+        if (injectEnv)
+        {
+            injectEnv(AZ::Environment::GetInstance());
+        }
+    }
+
+    return module;
+}
+
+static bool CryFreeLibrary(void* lib)
+{
+    if (lib)
+    {
+        DetachEnvironmentFunction detachEnv = reinterpret_cast<DetachEnvironmentFunction>(CryGetProcAddress(lib, DETACH_ENVIRONMENT_FUNCTION));
+        if (detachEnv)
+        {
+            detachEnv();
+        }
+        return (::dlclose(lib) == 0);
+    }
+    return false;
+}
+#endif
+
+#if CRYLIBRARY_H_TRAIT_USE_WINDOWS_DLL
+#define CrySharedLibrarySupported true
+#define CrySharedLibraryPrefix ""
+#define CrySharedLibraryExtension ".dll"
+#define CryGetProcAddress(libHandle, procName) ::GetProcAddress((HMODULE)(libHandle), procName)
+#elif !defined(CrySharedLibrarySupported)
+#define CrySharedLibrarySupported false
+#define CrySharedLibraryPrefix ""
+#define CrySharedLibraryExtension ""
+#define CryLoadLibrary(libName) NULL
+#define CryGetProcAddress(libHandle, procName) NULL
+#define CryFreeLibrary(libHandle)
+#define GetModuleHandle(x)  0
+#endif
+#define CryLibraryDefName(libName) CrySharedLibraryPrefix libName CrySharedLibraryExtension
+#define CryLoadLibraryDefName(libName) CryLoadLibrary(CryLibraryDefName(libName))
diff --git a/Code/Legacy/CryCommon/CryListenerSet.h b/Code/Legacy/CryCommon/CryListenerSet.h
new file mode 100644
index 0000000000..893baf5c0d
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryListenerSet.h
@@ -0,0 +1,613 @@
+/*
+ * 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 : A simple, intelligent and efficient container for listeners.
+
+//               This is designed to provide a simple & consistent interface and behavior
+//               for adding, removing and iterating listeners - hopefully avoiding the
+//               common pitfalls such as duplicated elements, invalid iterators and
+//               dangling pointers.
+
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYLISTENERSET_H
+#define CRYINCLUDE_CRYCOMMON_CRYLISTENERSET_H
+#pragma once
+
+
+#include <CrySizer.h>
+/************************************************************************
+
+Core elements:
+
+    * CListenerSet<T> - The collection of listeners.
+    * CListenerSet<T>::Notifier - The iterator for safely calling listeners in sequence.
+
+    [Where T is a pointer or something with pointer traits]
+
+Advantages:
+
+    * Greatly reduces the complexity of managing listener collections.
+    * Can safely add and remove listeners during listener iteration.
+    * Automatically and safely removes NULL elements.
+    * Simple interface (but different from an STL collection to avoid confusion).
+    * Checks to see all listeners have been removed at destruction.
+    * Low overhead implementation (cheap use of std::vector and minimal heap allocation).
+    * Can add debug checks as needed - including stack tracing of Add() calls.
+    * Safe for recursive notification chains.
+    * Works with vanilla pointers and smart pointers.
+    * Provides full support for named listeners to aid debugging.
+    * Listener names tracked during notification to help resolve crashes.
+    * Designed to ensure names are recorded correctly in crash dump files.
+
+Named listener support:
+
+    Supplying a name for a listener provides valuable debug information in the following cases:
+
+        * Resolving crashes during listener notification - the name will help trace what listener caused the crash.
+        * Resolving which listeners are present in the CListenerSet during runtime.
+
+    IMPORTANT: Please ensure heap allocated strings passed in as names are marked as such ie.
+
+        m_listeners.Add(pListener, "MyListener");                               // OK: Static string passed.
+        m_listeners.Add(pListener2, m_myName.c_str(), false);       // OK: Heap string passed and marked as non-static.
+        m_listeners.Add(pListener3, m_myName.c_str(), true);        // BAD: Heap string passed and marked as static (potential CRASH).
+
+    Why store names like this?
+
+        * 99% of use cases use static strings - so why allocate memory to make copies of static data?
+        * Pointers to static strings will *always* survive crash dumps - great for debugging crashes.
+        * We can enable debug support in QA builds - key for catching rare listener related crashes.
+
+Example:
+
+    class CMyWorld
+    {
+    public:
+        void AddListener(IMyWorldListener* pListener, const char* szName) { m_listeners.Add(pListener, szName); }
+        void RemoveListener(IMyWorldListener* pListener) { m_listeners.Remove(pListener); }
+
+        void NotifyListeners(CSomeEvent& event)
+        {
+            for (TWorldListeners::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
+            {
+                notifier->OnWorldEvent(event);
+            }
+        }
+
+    private:
+        typedef CListenerSet<IMyWorldListener*> TWorldListeners;
+        TWorldListeners m_listeners;
+    };
+
+
+    // Implements IMyWorldListener
+    CMyWorldUser::OnWorldEvent(CSomeEvent& event)
+    {
+        // OK: Removing a listeners within an event handler
+        m_pWorld->RemoveListener(this);
+
+        // OK: Notifying listeners within an event handler
+        m_pWorld->NotifyListeners(CSomeEvent newEvent(USER_REMOVED, this));
+    }
+
+
+*************************************************************************/
+
+#ifndef _RELEASE
+    #define CRY_LISTENERSET_DEBUG
+#endif
+
+// Forward decl.
+template <typename T>
+class CListenerNotifier;
+
+
+// Main listener collection class used in conjunction with CListenerNotifier.
+template <typename T>
+class CListenerSet
+{
+public:
+    // NOTE: No default constructor in favor of forcing users to provide an expectedCapacity
+    inline CListenerSet(size_t expectedCapacity);
+    inline /*non-virtual*/ ~CListenerSet();
+
+    // Appends a listener to the end of the collection. Name is optional but recommended.
+    inline bool Add(T pListener, const char* name = NULL, bool staticName = true);
+
+    // Removes a listener from the collection.
+    inline void Remove(T pListener);
+
+    // Removes all listeners from the collection (NOTE: prefer informing listeners to remove themselves)
+    inline void Clear(bool bFreeMemory = false);
+
+    // Returns true if this contains pListener
+    inline bool Contains(T pListener) const;
+
+    // Returns number of valid listeners
+    inline size_t ValidListenerCount() const;
+
+    // Returns true if no valid listeners exist
+    inline bool Empty() const;
+
+    // Reserves space to help avoid runtime reallocation
+    inline void Reserve(size_t capacity);
+
+    // Returns the memory size of this object (to support CrySizer)
+    inline size_t MemSize() const;
+
+    // Returns true if currently in the process of notifying listeners.
+    inline bool IsNotifying() const;
+
+    // Allow access for Notifier for iteration
+    friend class CListenerNotifier<T>;
+
+    // Allow TListeners::Notifier style usage
+    typedef class CListenerNotifier<T> Notifier;
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddContainer(m_listeners);
+#if defined(CRY_LISTENERSET_DEBUG)
+        pSizer->AddContainer(m_allocatedNames);
+#endif
+    }
+private:    // DO NOT REMOVE - following methods only to be accessed only via CNotifier
+
+    struct ListenerRecord
+    {
+        ListenerRecord()
+            : m_pListener() {}
+        ListenerRecord(T pListener, [[maybe_unused]] const char* szName = NULL)
+            : m_pListener(pListener)
+#ifdef CRY_LISTENERSET_DEBUG
+            , m_szName(szName)
+#endif
+        {}
+
+        bool operator==(const ListenerRecord& other) const  { return m_pListener == other.m_pListener; }
+        bool operator==(const T& other) const                               { return m_pListener == other; }
+
+        T                       m_pListener;                // The listener reference
+
+#ifdef CRY_LISTENERSET_DEBUG
+        const char* m_szName;                       // Name of tracked listener (owned if pointing to data in m_allocatedNames)
+#endif
+    };
+
+    typedef std::vector<ListenerRecord> TListenerVec;
+    typedef std::vector<string> TAllocatedNameVec;
+
+    inline void StartNotificationScope();
+    inline void EndNotificationScope();
+
+    inline void EraseNullElements();
+
+private:
+    TListenerVec            m_listeners;                            // Collection of unique listeners.
+    size_t                      m_activeNotifications;      // Counts current notifications in progress (cleanup cannot occur unless this is 0).
+    bool                            m_cleanupRequired;      // Indicates NULL elements in listener.
+    bool                            m_freeMemOnCleanup;     // Indicates how to clean up.
+
+#ifdef CRY_LISTENERSET_DEBUG
+    // Used to delete heap allocated names
+    inline void DeleteName(const char* name);
+
+    TAllocatedNameVec m_allocatedNames;                 // Collection of strings pointing at heap allocated (i.e. copied) names (typically empty)
+#endif
+};
+
+
+// Helper class used to iterate listeners during listener notification.
+template <typename T>
+class CListenerNotifier
+{
+public:
+    ILINE CListenerNotifier(CListenerSet<T>& listeners);
+    ILINE /*non-virtual*/ ~CListenerNotifier();
+
+    // True if the current element is ready for iteration
+    ILINE bool IsValid();
+
+    // Dereference current listener, MUST only be done after a call to IsValid().
+    ILINE T operator->();
+
+    // Dereference current listener, MUST only be done after a call to IsValid().
+    ILINE T operator*();
+
+    // Move to next valid listener (skipping NULL elements)
+    ILINE void Next();
+
+    // Returns the name of the listener (if available)
+    inline const char* Name() const;
+
+private:
+    CListenerSet<T>&    m_listenerSet;      // ListenerSet being notified
+    T                                   m_pListener;            // Current listener at index (resolved by IsValid(), cleared after each dereference)
+    size_t                      m_index;                    // Current index of element (incremented by next)
+
+#ifdef CRY_LISTENERSET_DEBUG
+    const char*             m_szName;                   // Name of the listener (if provided) to aid debugging
+#endif
+};
+
+/******************************************************************************************/
+
+
+
+template <typename T>
+inline CListenerSet<T>::CListenerSet(size_t expectedCapacity)
+    : m_activeNotifications(0)
+    , m_cleanupRequired(false)
+    , m_freeMemOnCleanup(false)
+{
+    // Reserve the expected capacity to avoid reallocations
+    m_listeners.reserve(expectedCapacity);
+}
+
+template <typename T>
+inline CListenerSet<T>::~CListenerSet()
+{
+    // Ensure no notifications are in progress
+    CRY_ASSERT(m_activeNotifications == 0);
+
+    // Ensure NULL elements were removed at end of last notification
+    CRY_ASSERT(!m_cleanupRequired);
+}
+
+// Appends a listener to the end of the collection. Name is optional but recommended.
+template <typename T>
+inline bool CListenerSet<T>::Add(T pListener, const char* name, [[maybe_unused]] bool staticName)
+{
+    bool success = false;
+
+    // Ensure the listener exists
+    CRY_ASSERT(pListener);
+
+    if (pListener)
+    {
+        // Ensure the listener is only added once
+        if (!Contains(pListener))
+        {
+            // Resolve name buffer safe for usage outside of this scope
+            const char* safeName = name;
+
+#ifdef CRY_LISTENERSET_DEBUG
+            // If a name was provided but it's not static data
+            if (name && !staticName)
+            {
+                // Add it to the list of heap allocated names (that we need to later delete)
+                m_allocatedNames.push_back(name);
+                safeName = m_allocatedNames.back().c_str();
+            }
+#endif
+
+            m_listeners.push_back(ListenerRecord(pListener, safeName));
+            success = true;
+        }
+    }
+
+    return success;
+}
+
+// Removes a listener from the collection.
+template <typename T>
+inline void CListenerSet<T>::Remove(T pListener)
+{
+    typename TListenerVec::iterator endIter(m_listeners.end());
+    typename TListenerVec::iterator iter(std::find(m_listeners.begin(), endIter, pListener));
+    if (iter != endIter)
+    {
+#ifdef CRY_LISTENERSET_DEBUG
+        // Delete name if it was heap allocated
+        if (const char* name = iter->m_szName)
+        {
+            DeleteName(name);
+        }
+#endif
+
+        // If no notifications in progress
+        if (m_activeNotifications == 0)
+        {
+            // Just delete the listener entry immediately
+            m_listeners.erase(iter);
+        }
+        else    // Notification(s) in progress, cannot re-order listeners
+        {
+            // Mark for cleanup
+            iter->m_pListener = NULL;
+
+            m_cleanupRequired = true;
+            m_freeMemOnCleanup = false;
+        }
+    }
+    else    // The listener is not in the set
+    {
+        // TODO: Warn about redundant Remove()
+    }
+}
+
+// Removes all listeners from the collection (NOTE: prefer informing listeners to remove themselves)
+template <typename T>
+inline void CListenerSet<T>::Clear(bool bFreeMemory)
+{
+    // If no notifications in progress
+    if (m_activeNotifications == 0)
+    {
+        // Simply clear the listeners immediately
+        if (bFreeMemory)
+        {
+            stl::free_container(m_listeners);
+        }
+        else
+        {
+            m_listeners.clear();
+        }
+    }
+    else
+    {
+        // Mark all listeners for cleanup
+        std::fill(m_listeners.begin(), m_listeners.end(), ListenerRecord());
+
+        m_cleanupRequired = true;
+        m_freeMemOnCleanup = true;
+    }
+
+#ifdef CRY_LISTENERSET_DEBUG
+    // Safe to clear allocated names immediately (no references exist any more)
+    if (bFreeMemory)
+    {
+        stl::free_container(m_allocatedNames);
+    }
+    else
+    {
+        m_allocatedNames.clear();
+    }
+#endif
+}
+
+// Returns true if this contains pListener
+template <typename T>
+inline bool CListenerSet<T>::Contains(T pListener) const
+{
+    return stl::find(m_listeners, pListener);
+}
+
+// Returns number of valid listeners
+template <typename T>
+inline size_t CListenerSet<T>::ValidListenerCount() const
+{
+    size_t validCount = m_listeners.size();
+
+    if (m_cleanupRequired)
+    {
+        // Remove the count of NULL elements from the result
+        validCount = validCount - std::count(m_listeners.begin(), m_listeners.end(), T());
+    }
+
+    return validCount;
+}
+
+// Returns true if no valid listeners exist
+template <typename T>
+inline bool CListenerSet<T>::Empty() const
+{
+    return ValidListenerCount() == 0;
+}
+
+// Reserves space to help avoid runtime reallocation
+template <typename T>
+inline void CListenerSet<T>::Reserve(size_t capacity)
+{
+    m_listeners.reserve(capacity);
+}
+
+// Returns the memory size of this object (to support CrySizer)
+template <typename T>
+inline size_t CListenerSet<T>::MemSize() const
+{
+    size_t size = sizeof(CListenerSet<T>) + sizeof(ListenerRecord) * m_listeners.size();
+
+#ifdef CRY_LISTENERSET_DEBUG
+    size += sizeof(typename TAllocatedNameVec::value_type);
+    for (typename TAllocatedNameVec::const_iterator iter(m_allocatedNames.begin()); iter != m_allocatedNames.end(); ++iter)
+    {
+        size += iter->GetAllocatedMemory();
+    }
+#endif
+
+    return size;
+}
+
+template <typename T>
+inline bool CListenerSet<T>::IsNotifying() const
+{
+    return m_activeNotifications > 0;
+}
+
+template <typename T>
+inline void CListenerSet<T>::StartNotificationScope()
+{
+    ++m_activeNotifications;
+}
+
+template <typename T>
+inline void CListenerSet<T>::EndNotificationScope()
+{
+    // Ensure at least one notification scope was started
+    CRY_ASSERT(m_activeNotifications > 0);
+
+    // If this is the last notification
+    if (--m_activeNotifications == 0)
+    {
+        EraseNullElements();
+    }
+}
+
+template <typename T>
+inline void CListenerSet<T>::EraseNullElements()
+{
+    // Ensure no modification while notification(s) are ongoing
+    CRY_ASSERT(m_activeNotifications == 0);
+
+    if (m_cleanupRequired && m_activeNotifications == 0)
+    {
+        stl::find_and_erase_all(m_listeners, T());
+        if (m_freeMemOnCleanup && m_listeners.empty())
+        {
+            stl::free_container(m_listeners);
+        }
+        m_cleanupRequired = false;
+        m_freeMemOnCleanup = false;
+    }
+}
+
+#ifdef CRY_LISTENERSET_DEBUG
+
+// Used to delete heap allocated names
+template <typename T>
+inline void CListenerSet<T>::DeleteName(const char* name)
+{
+    if (!m_allocatedNames.empty())
+    {
+        typename TAllocatedNameVec::iterator endIter(m_allocatedNames.end());
+        for (typename TAllocatedNameVec::iterator iter(m_allocatedNames.begin()); iter != endIter; ++iter)
+        {
+            // Is this the source string?
+            if (iter->c_str() == name)
+            {
+                // Delete it
+                m_allocatedNames.erase(iter);
+                break;
+            }
+        }
+    }
+}
+
+#endif  // defined CRY_LISTENERSET_DEBUG
+
+
+/******************************************************************************************/
+
+
+
+template <typename T>
+ILINE CListenerNotifier<T>::CListenerNotifier(CListenerSet<T>& listeners)
+    : m_listenerSet(listeners)
+    , m_pListener()
+    , m_index(0)
+#ifdef CRY_LISTENERSET_DEBUG
+    , m_szName()
+#endif
+{
+    // Flag iteration to listener set to ensure no erase is attempted during iteration
+    m_listenerSet.StartNotificationScope();
+
+    // If first element is NULL, move to next valid element
+    if (!IsValid())
+    {
+        Next();
+    }
+}
+
+template <typename T>
+ILINE CListenerNotifier<T>::~CListenerNotifier()
+{
+    // Erases any NULL elements from listeners
+    m_listenerSet.EndNotificationScope();
+}
+
+// True if the current element is ready for iteration
+template <typename T>
+ILINE bool CListenerNotifier<T>::IsValid()
+{
+    if (!m_pListener)
+    {
+        // Always check with original collection
+        if (m_index < m_listenerSet.m_listeners.size())
+        {
+            const typename CListenerSet<T>::ListenerRecord & record(m_listenerSet.m_listeners[m_index]);
+            m_pListener = record.m_pListener;
+
+#ifdef CRY_LISTENERSET_DEBUG
+            m_szName = record.m_szName;
+#endif
+        }
+    }
+
+    return m_pListener != NULL;
+}
+
+// Dereference current listener, MUST only be done after a call to IsReady().
+template <typename T>
+ILINE T CListenerNotifier<T>::operator->()
+{
+    return operator*();
+}
+
+// Dereference current listener, MUST only be done after a call to IsReady().
+template <typename T>
+ILINE T CListenerNotifier<T>::operator*()
+{
+    // Ensure IsReady() was called and its return value checked
+    CRY_ASSERT(m_pListener);
+
+    // Clear cached listener pointer to force a IsReady() call before this can be called again.
+    // This is done as the listener could be removed during any call to its own event handlers
+    // resulting in m_pListener becoming a dangling pointer.
+    T pListener(m_pListener);
+    m_pListener = T();
+    return pListener;
+}
+
+// Move to next valid listener
+template <typename T>
+ILINE void CListenerNotifier<T>::Next()
+{
+    size_t index = m_index;
+    typename CListenerSet<T>::ListenerRecord * pNextRecord = NULL;
+    m_pListener = NULL; // Always assume there's no next, let the code below prove otherwise!
+
+    const size_t listenerCount = m_listenerSet.m_listeners.size();
+    while (++index < listenerCount)
+    {
+        typename CListenerSet<T>::ListenerRecord & record(m_listenerSet.m_listeners[index]);
+
+        // Is this element valid?
+        if (record.m_pListener)
+        {
+            pNextRecord = &record;
+            break;
+        }
+        // Else move to next element
+    }
+
+    if (pNextRecord)
+    {
+        m_pListener = pNextRecord->m_pListener;
+#ifdef CRY_LISTENERSET_DEBUG
+        m_szName = pNextRecord->m_szName;
+#endif
+    }
+
+    m_index = index;
+}
+
+// Returns the name of the listener (if available)
+template <typename T>
+inline const char* CListenerNotifier<T>::Name() const
+{
+#ifdef CRY_LISTENERSET_DEBUG
+    return m_szName;
+#else
+    return NULL;
+#endif
+}
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYLISTENERSET_H
diff --git a/Code/Legacy/CryCommon/CryName.h b/Code/Legacy/CryCommon/CryName.h
new file mode 100644
index 0000000000..eb9cd584fd
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryName.h
@@ -0,0 +1,563 @@
+/*
+ * 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_CRYNAME_H
+#define CRYINCLUDE_CRYCOMMON_CRYNAME_H
+#pragma once
+
+#include <ISystem.h>
+#include <StlUtils.h>
+#include <CrySizer.h>
+#include <CryCrc32.h>
+#include <AzCore/std/containers/unordered_map.h>
+
+class CNameTable;
+
+
+struct INameTable
+{
+    virtual ~INameTable(){}
+
+    // Name entry header, immediately after this header in memory starts actual string data.
+    struct SNameEntry
+    {
+        enum
+        {
+            TAG = 0xdeadbeef
+        };
+
+        int nTag; // tag to ensure that this is actually a name entry
+        // Reference count of this string.
+        int nRefCount;
+        // Current length of string.
+        int nLength;
+        // Size of memory allocated at the end of this class.
+        int nAllocSize;
+        // Here in memory starts character buffer of size nAllocSize.
+        //char data[nAllocSize]
+
+        const char* GetStr() { return (char*)(this + 1); }
+        void  AddRef() { nRefCount++; /*InterlockedIncrement(&_header()->nRefCount);*/};
+        int   Release() { return --nRefCount; };
+        int   GetMemoryUsage() { return sizeof(SNameEntry) + strlen(GetStr()); }
+        int     GetLength(){return nLength; }
+    };
+
+
+    // Finds an existing name table entry, or creates a new one if not found.
+    virtual INameTable::SNameEntry* GetEntry(const char* str) = 0;
+    // Only finds an existing name table entry, return 0 if not found.
+    virtual INameTable::SNameEntry* FindEntry(const char* str) = 0;
+    // Release existing name table entry.
+    virtual void Release(SNameEntry* pEntry) = 0;
+    virtual int GetMemoryUsage() = 0;
+    virtual int GetNumberOfEntries() = 0;
+
+    // Output all names from the table to log.
+    virtual void LogNames() = 0;
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const  = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CNameTable
+    : public INameTable
+{
+private:
+    typedef AZStd::unordered_map<const char*, SNameEntry*, stl::hash_string_caseless<const char*>, stl::equality_string_caseless<const char*> > NameMap;
+    NameMap m_nameMap;
+
+public:
+    CNameTable()
+    {
+        // Ensure that SNameEntry is an aligned size
+        static_assert(sizeof(INameTable::SNameEntry) % sizeof(void*) == 0, "SNameEntry must be an aligned size");
+    }
+
+    ~CNameTable()
+    {
+        for (NameMap::iterator it = m_nameMap.begin(); it != m_nameMap.end(); ++it)
+        {
+            CryModuleFree(it->second);
+        }
+    }
+
+    // Only finds an existing name table entry, return 0 if not found.
+    virtual INameTable::SNameEntry* FindEntry(const char* str)
+    {
+        SNameEntry* pEntry = stl::find_in_map(m_nameMap, str, 0);
+        return pEntry;
+    }
+
+    // Finds an existing name table entry, or creates a new one if not found.
+    virtual INameTable::SNameEntry* GetEntry(const char* str)
+    {
+        SNameEntry* pEntry = FindEntry(str);
+        if (!pEntry)
+        {
+            // Create a new entry.
+            unsigned int nLen = strlen(str);
+            unsigned int allocLen = sizeof(SNameEntry) + (nLen + 1) * sizeof(char);
+            pEntry = (SNameEntry*)CryModuleMalloc(allocLen);
+            assert(pEntry != NULL);
+            pEntry->nTag = SNameEntry::TAG;
+            pEntry->nRefCount = 0;
+            pEntry->nLength = nLen;
+            pEntry->nAllocSize = allocLen;
+            // Copy string to the end of name entry.
+            char* pEntryStr = const_cast<char*>(pEntry->GetStr());
+            memcpy(pEntryStr, str, nLen + 1);
+            // put in map.
+            //m_nameMap.insert( NameMap::value_type(pEntry->GetStr(),pEntry) );
+            m_nameMap[pEntry->GetStr()] = pEntry;
+        }
+        return pEntry;
+    }
+
+    // Release existing name table entry.
+    virtual void Release(SNameEntry* pEntry)
+    {
+        assert(pEntry);
+        m_nameMap.erase(pEntry->GetStr());
+        CryModuleFree(pEntry);
+    }
+    virtual int GetMemoryUsage()
+    {
+        int nSize = 0;
+        NameMap::iterator it;
+        int n = 0;
+        for (it = m_nameMap.begin(); it != m_nameMap.end(); it++)
+        {
+            nSize += strlen(it->first);
+            nSize += it->second->GetMemoryUsage();
+            n++;
+        }
+        nSize += n * 8;
+
+        return nSize;
+    }
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(this, sizeof(*this));
+        pSizer->AddContainer(m_nameMap);
+    }
+    virtual int GetNumberOfEntries()
+    {
+        return m_nameMap.size();
+    }
+
+    // Log all names inside CryName table.
+    virtual void LogNames()
+    {
+        NameMap::iterator it;
+        for (it = m_nameMap.begin(); it != m_nameMap.end(); ++it)
+        {
+            SNameEntry* pNameEntry = it->second;
+            CryLog("[%4d] %s", pNameEntry->nLength, pNameEntry->GetStr());
+        }
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Class CCryName.
+//////////////////////////////////////////////////////////////////////////
+class CCryName
+{
+public:
+    CCryName();
+    CCryName(const CCryName& n);
+    explicit CCryName(const char* s);
+    CCryName(const char* s, bool bOnlyFind);
+    ~CCryName();
+
+    CCryName& operator=(const CCryName& n);
+    CCryName& operator=(const char* s);
+
+    bool    operator==(const CCryName& n) const;
+    bool    operator!=(const CCryName& n) const;
+
+    bool    operator==(const char* s) const;
+    bool    operator!=(const char* s) const;
+
+    bool    operator<(const CCryName& n) const;
+    bool    operator>(const CCryName& n) const;
+
+    bool    empty() const { return !m_str || !m_str[0]; }
+    void    reset() {   _release(m_str);    m_str = 0; }
+    void  addref()    {   _addref(m_str); }
+
+    const   char*   c_str() const
+    {
+        return (m_str) ? m_str : "";
+    }
+    int length() const { return _length(); };
+
+    static bool find(const char* str) { return GetNameTable()->FindEntry(str) != 0; }
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        //pSizer->AddObject(m_str);
+        pSizer->AddObject(GetNameTable());   // cause for slowness?
+    }
+    static int GetMemoryUsage()
+    {
+#ifdef USE_STATIC_NAME_TABLE
+        CNameTable* pTable = GetNameTable();
+#else
+        INameTable* pTable = GetNameTable();
+#endif
+        return pTable->GetMemoryUsage();
+    }
+    static int GetNumberOfEntries()
+    {
+#ifdef USE_STATIC_NAME_TABLE
+        CNameTable* pTable = GetNameTable();
+#else
+        INameTable* pTable = GetNameTable();
+#endif
+        return pTable->GetNumberOfEntries();
+    }
+
+    // Compare functor for sorting CCryNames lexically.
+    struct CmpLex
+    {
+        bool operator () (const CCryName& n1, const CCryName& n2) const
+        {
+            return strcmp(n1.c_str(), n2.c_str()) < 0;
+        }
+    };
+
+private:
+    typedef INameTable::SNameEntry SNameEntry;
+
+#ifdef USE_STATIC_NAME_TABLE
+    static CNameTable* GetNameTable()
+    {
+        // Note: can not use a 'static CNameTable sTable' here, because that
+        // implies a static destruction order depenency - the name table is
+        // accessed from static destructor calls.
+        static CNameTable* table = NULL;
+
+        if (table == NULL)
+        {
+            table = new CNameTable();
+        }
+        return table;
+    }
+#else
+    //static INameTable* GetNameTable() { return GetISystem()->GetINameTable(); }
+    static INameTable* GetNameTable()
+    {
+        assert(gEnv && gEnv->pNameTable);
+        return gEnv->pNameTable;
+    }
+#endif
+
+    SNameEntry* _entry(const char* pBuffer) const
+    {
+        CRY_ASSERT(pBuffer);
+        CRY_ASSERT((((SNameEntry*)pBuffer) - 1)->nTag == SNameEntry::TAG);
+        return ((SNameEntry*)pBuffer) - 1;
+    }
+    void _release(const char* pBuffer)
+    {
+        if (pBuffer && _entry(pBuffer)->Release() <= 0 && gEnv)
+        {
+            GetNameTable()->Release(_entry(pBuffer));
+        }
+    }
+    int  _length() const { return (m_str) ? _entry(m_str)->nLength : 0; };
+    void _addref(const char* pBuffer)
+    {
+        if (pBuffer)
+        {
+            _entry(pBuffer)->AddRef();
+        }
+    }
+
+
+    const char* m_str;
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// CryName
+//////////////////////////////////////////////////////////////////////////
+inline CCryName::CCryName()
+{
+    m_str = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryName::CCryName(const CCryName& n)
+{
+    _addref(n.m_str);
+    m_str = n.m_str;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryName::CCryName(const char* s)
+{
+    m_str = 0;
+    *this = s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryName::CCryName(const char* s, [[maybe_unused]] bool bOnlyFind)
+{
+    assert(s);
+    m_str = 0;
+    if (*s) // if not empty
+    {
+        SNameEntry* pNameEntry = GetNameTable()->FindEntry(s);
+        if (pNameEntry)
+        {
+            m_str = pNameEntry->GetStr();
+            _addref(m_str);
+        }
+    }
+}
+
+inline CCryName::~CCryName()
+{
+    _release(m_str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryName&    CCryName::operator=(const CCryName& n)
+{
+    if (m_str != n.m_str)
+    {
+        _release(m_str);
+        m_str = n.m_str;
+        _addref(m_str);
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryName&    CCryName::operator=(const char* s)
+{
+    assert(s);
+    const char* pBuf = 0;
+    if (s && *s) // if not empty
+    {
+        pBuf = GetNameTable()->GetEntry(s)->GetStr();
+    }
+    if (m_str != pBuf)
+    {
+        _release(m_str);
+        m_str = pBuf;
+        _addref(m_str);
+    }
+    return *this;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+inline bool CCryName::operator==(const CCryName& n) const
+{
+    return m_str == n.m_str;
+}
+
+inline bool CCryName::operator!=(const CCryName& n) const
+{
+    return !(*this == n);
+}
+
+inline bool CCryName::operator==(const char* str) const
+{
+    return m_str && _stricmp(m_str, str) == 0;
+}
+
+inline bool CCryName::operator!=(const char* str) const
+{
+    if (!m_str)
+    {
+        return true;
+    }
+    return _stricmp(m_str, str) != 0;
+}
+
+inline bool CCryName::operator<(const CCryName& n) const
+{
+    return m_str < n.m_str;
+}
+
+inline bool CCryName::operator>(const CCryName& n) const
+{
+    return m_str > n.m_str;
+}
+
+inline bool operator==(const string& s, const CCryName& n)
+{
+    return n == s;
+}
+inline bool operator!=(const string& s, const CCryName& n)
+{
+    return n != s;
+}
+
+inline bool operator==(const char* s, const CCryName& n)
+{
+    return n == s;
+}
+inline bool operator!=(const char* s, const CCryName& n)
+{
+    return n != s;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Class CCryNameCRC.
+//////////////////////////////////////////////////////////////////////////
+class CCryNameCRC
+{
+public:
+    CCryNameCRC();
+    CCryNameCRC(const CCryNameCRC& n);
+    CCryNameCRC(const char* s);
+    CCryNameCRC(const char* s, bool bOnlyFind);
+    explicit CCryNameCRC(uint32 n) { m_nID = n; } //  We use "explicit" to prevent comparison of strings with ints due to implicit conversion.
+    ~CCryNameCRC();
+
+    CCryNameCRC& operator=(const CCryNameCRC& n);
+    CCryNameCRC& operator=(const char* s);
+
+    bool  operator==(const CCryNameCRC& n) const;
+    bool  operator!=(const CCryNameCRC& n) const;
+
+    bool  operator==(const char* s) const;
+    bool  operator!=(const char* s) const;
+
+    bool  operator<(const CCryNameCRC& n) const;
+    bool  operator>(const CCryNameCRC& n) const;
+
+    bool  empty() const { return m_nID == 0; }
+    void  reset() {   m_nID = 0; }
+    uint32 get() const    {   return m_nID; }
+    void  add(int nAdd) { m_nID += nAdd; }
+
+    AUTO_STRUCT_INFO
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
+private:
+
+    uint32 m_nID;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// CCryNameCRC
+//////////////////////////////////////////////////////////////////////////
+inline CCryNameCRC::CCryNameCRC()
+{
+    m_nID = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryNameCRC::CCryNameCRC(const CCryNameCRC& n)
+{
+    m_nID = n.m_nID;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryNameCRC::CCryNameCRC(const char* s)
+{
+    m_nID = 0;
+    *this = s;
+}
+
+inline CCryNameCRC::~CCryNameCRC()
+{
+    m_nID = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryNameCRC& CCryNameCRC::operator=(const CCryNameCRC& n)
+{
+    m_nID = n.m_nID;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CCryNameCRC& CCryNameCRC::operator=(const char* s)
+{
+    assert(s);
+    if (*s) // if not empty
+    {
+        m_nID = CCrc32::ComputeLowercase(s);
+    }
+    return *this;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+inline bool CCryNameCRC::operator==(const CCryNameCRC& n) const
+{
+    return m_nID == n.m_nID;
+}
+
+inline bool CCryNameCRC::operator!=(const CCryNameCRC& n) const
+{
+    return !(*this == n);
+}
+
+inline bool CCryNameCRC::operator==(const char* str) const
+{
+    assert(str);
+    if (*str) // if not empty
+    {
+        uint32 nID = CCrc32::ComputeLowercase(str);
+        return m_nID == nID;
+    }
+    return m_nID == 0;
+}
+
+inline bool CCryNameCRC::operator!=(const char* str) const
+{
+    if (!m_nID)
+    {
+        return true;
+    }
+    if (*str) // if not empty
+    {
+        uint32 nID = CCrc32::ComputeLowercase(str);
+        return m_nID != nID;
+    }
+    return false;
+}
+
+inline bool CCryNameCRC::operator<(const CCryNameCRC& n) const
+{
+    return m_nID < n.m_nID;
+}
+
+inline bool CCryNameCRC::operator>(const CCryNameCRC& n) const
+{
+    return m_nID > n.m_nID;
+}
+
+inline bool operator==(const string& s, const CCryNameCRC& n)
+{
+    return n == s;
+}
+inline bool operator!=(const string& s, const CCryNameCRC& n)
+{
+    return n != s;
+}
+
+inline bool operator==(const char* s, const CCryNameCRC& n)
+{
+    return n == s;
+}
+inline bool operator!=(const char* s, const CCryNameCRC& n)
+{
+    return n != s;
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYNAME_H
diff --git a/Code/Legacy/CryCommon/CryPath.h b/Code/Legacy/CryCommon/CryPath.h
new file mode 100644
index 0000000000..9f09ba31e4
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryPath.h
@@ -0,0 +1,618 @@
+/*
+ * 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 : Defines namespace PathUtil for operations on files paths.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYPATH_H
+#define CRYINCLUDE_CRYCOMMON_CRYPATH_H
+#pragma once
+
+#include <ISystem.h>
+#include <AzFramework/Archive/IArchive.h>
+#include <IConsole.h>
+
+#include "platform.h"
+
+#define UNIX_PATH_SEP_STR    "/"
+#define UNIX_PATH_SEP_CHR    '/'
+#define DOS_PATH_SEP_STR     "\\"
+#define DOS_PATH_SEP_CHR     '\\'
+
+#if AZ_LEGACY_CRYCOMMON_TRAIT_USE_UNIX_PATHS
+#define CRY_NATIVE_PATH_SEPSTR  UNIX_PATH_SEP_STR
+#else
+#define CRY_NATIVE_PATH_SEPSTR  DOS_PATH_SEP_STR
+#endif
+
+namespace PathUtil
+{
+    const static int maxAliasLength = 32;
+    inline string GetLocalizationFolder()
+    {
+        return gEnv->pCryPak->GetLocalizationFolder();
+    }
+
+    inline string GetLocalizationRoot()
+    {
+        return gEnv->pCryPak->GetLocalizationRoot();
+    }
+
+    //! Convert a path to the uniform form.
+    inline string ToUnixPath(const string& strPath)
+    {
+        if (strPath.find(DOS_PATH_SEP_CHR) != string::npos)
+        {
+            string path = strPath;
+            path.replace(DOS_PATH_SEP_CHR, UNIX_PATH_SEP_CHR);
+            return path;
+        }
+        return strPath;
+    }
+
+    //! Convert a path to the uniform form in place on stack
+    inline void ToUnixPath(stack_string& rConv)
+    {
+        const char* const cpEnd = &(rConv.c_str()[rConv.size()]);
+        char*   __restrict pC = rConv.begin();
+        while (pC != cpEnd)
+        {
+            char c = *pC;
+            if (c == DOS_PATH_SEP_CHR)
+            {
+                c = UNIX_PATH_SEP_CHR;
+            }
+            *pC++ = c;
+        }
+    }
+
+    //! Convert a path to the DOS form.
+    inline string ToDosPath(const string& strPath)
+    {
+        if (strPath.find(UNIX_PATH_SEP_CHR) != string::npos)
+        {
+            string path = strPath;
+            path.replace(UNIX_PATH_SEP_CHR, DOS_PATH_SEP_CHR);
+            return path;
+        }
+        return strPath;
+    }
+
+    //! Convert a path to the Native form.
+    inline string ToNativePath(const string& strPath)
+    {
+#if AZ_LEGACY_CRYCOMMON_TRAIT_USE_UNIX_PATHS
+        return ToUnixPath(strPath);
+#else
+        return ToDosPath(strPath);
+#endif
+    }
+
+    //! Convert a path to lowercase form
+    inline string ToLower(const string& strPath)
+    {
+        string path = strPath;
+        path.MakeLower();
+        return path;
+    }
+
+
+    //! Split full file name to path and filename
+    //! @param filepath [IN] Full file name including path.
+    //! @param path [OUT] Extracted file path.
+    //! @param filename [OUT] Extracted file (without extension).
+    //! @param ext [OUT] Extracted files extension.
+    inline void Split(const string& filepath, string& path, string& filename, string& fext)
+    {
+        path = filename = fext = string();
+        if (filepath.empty())
+        {
+            return;
+        }
+        const char* str = filepath.c_str();
+        const char* pext = str + filepath.length() - 1;
+        const char* p;
+        for (p = str + filepath.length() - 1; p >= str; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                path = filepath.substr(0, p - str + 1);
+                filename = filepath.substr(p - str + 1, pext - p);
+                return;
+            case '.':
+                // there's an extension in this file name
+                fext = filepath.substr(p - str + 1);
+                pext = p;
+                break;
+            }
+        }
+        filename = filepath.substr(p - str + 1, pext - p);
+    }
+
+    //! Split full file name to path and filename
+    //! @param filepath [IN] Full file name inclusing path.
+    //! @param path [OUT] Extracted file path.
+    //! @param file [OUT] Extracted file (with extension).
+    inline void Split(const string& filepath, string& path, string& file)
+    {
+        string fext;
+        Split(filepath, path, file, fext);
+        file += fext;
+    }
+
+    // Extract extension from full specified file path
+    // Returns
+    //   pointer to the extension (without .) or pointer to an empty 0-terminated string
+    inline const char* GetExt(const char* filepath)
+    {
+        const char* str = filepath;
+        size_t len = strlen(filepath);
+        for (const char* p = str + len - 1; p >= str; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                // we've reached a path separator - it means there's no extension in this name
+                return "";
+            case '.':
+                // there's an extension in this file name
+                return p + 1;
+            }
+        }
+        return "";
+    }
+
+    //! Extract path from full specified file path.
+    inline string GetPath(const string& filepath)
+    {
+        const char* str = filepath.c_str();
+        for (const char* p = str + filepath.length() - 1; p >= str; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                return filepath.substr(0, p - str + 1);
+            }
+        }
+        return "";
+    }
+
+    //! Extract path from full specified file path.
+    inline string GetPath(const char* filepath)
+    {
+        return GetPath(string(filepath));
+    }
+
+    //! Extract path from full specified file path.
+    inline stack_string GetPath(const stack_string& filepath)
+    {
+        const char* str = filepath.c_str();
+        for (const char* p = str + filepath.length() - 1; p >= str; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                return filepath.substr(0, p - str + 1);
+            }
+        }
+        return "";
+    }
+
+    //! Extract file name with extension from full specified file path.
+    inline string GetFile(const string& filepath)
+    {
+        const char* str = filepath.c_str();
+        for (const char* p = str + filepath.length() - 1; p >= str; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                return filepath.substr(p - str + 1);
+            }
+        }
+        return filepath;
+    }
+
+    inline const char* GetFile(const char* filepath)
+    {
+        const size_t len = strlen(filepath);
+        for (const char* p = filepath + len - 1; p >= filepath; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                return p + 1;
+            }
+        }
+        return filepath;
+    }
+
+    //! Replace extension for given file.
+    inline void RemoveExtension(string& filepath)
+    {
+        const char* str = filepath.c_str();
+        for (const char* p = str + filepath.length() - 1; p >= str; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                // we've reached a path separator - it means there's no extension in this name
+                return;
+            case '.':
+                // there's an extension in this file name
+                filepath = filepath.substr(0, p - str);
+                return;
+            }
+        }
+        // it seems the file name is a pure name, without path or extension
+    }
+
+    //! Replace extension for given file.
+    inline void RemoveExtension(stack_string& filepath)
+    {
+        const char* str = filepath.c_str();
+        for (const char* p = str + filepath.length() - 1; p >= str; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                // we've reached a path separator - it means there's no extension in this name
+                return;
+            case '.':
+                // there's an extension in this file name
+                filepath = filepath.substr(0, p - str);
+                return;
+            }
+        }
+        // it seems the file name is a pure name, without path or extension
+    }
+
+    //! Extract file name without extension from full specified file path.
+    inline string GetFileName(const string& filepath)
+    {
+        string file = filepath;
+        RemoveExtension(file);
+        return GetFile(file);
+    }
+
+    //! Removes the trailing slash or backslash from a given path.
+    inline string RemoveSlash(const string& path)
+    {
+        if (path.empty() || (path[path.length() - 1] != '/' && path[path.length() - 1] != '\\'))
+        {
+            return path;
+        }
+        return path.substr(0, path.length() - 1);
+    }
+
+    //! get slash
+    inline string GetSlash()
+    {
+        return CRY_NATIVE_PATH_SEPSTR;
+    }
+
+    //! add a backslash if needed
+    inline string AddSlash(const string& path)
+    {
+        if (path.empty() || path[path.length() - 1] == '/')
+        {
+            return path;
+        }
+        if (path[path.length() - 1] == '\\')
+        {
+            return path.substr(0, path.length() - 1) + "/";
+        }
+        return path + "/";
+    }
+
+    //! add a backslash if needed
+    inline stack_string AddSlash(const stack_string& path)
+    {
+        if (path.empty() || path[path.length() - 1] == '/')
+        {
+            return path;
+        }
+        if (path[path.length() - 1] == '\\')
+        {
+            return path.substr(0, path.length() - 1) + "/";
+        }
+        return path + "/";
+    }
+
+    //! add a backslash if needed
+    inline string AddSlash(const char* path)
+    {
+        return AddSlash(string(path));
+    }
+
+    inline stack_string ReplaceExtension(const stack_string& filepath, const char* ext)
+    {
+        stack_string str = filepath;
+        if (ext != 0)
+        {
+            RemoveExtension(str);
+            if (ext[0] != 0 && ext[0] != '.')
+            {
+                str += ".";
+            }
+            str += ext;
+        }
+        return str;
+    }
+
+    //! Replace extension for given file.
+    inline string ReplaceExtension(const string& filepath, const char* ext)
+    {
+        string str = filepath;
+        if (ext != 0)
+        {
+            RemoveExtension(str);
+            if (ext[0] != 0 && ext[0] != '.')
+            {
+                str += ".";
+            }
+            str += ext;
+        }
+        return str;
+    }
+
+    //! Replace extension for given file.
+    inline string ReplaceExtension(const char* filepath, const char* ext)
+    {
+        return ReplaceExtension(string(filepath), ext);
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline string Make(const string& path, const string& file)
+    {
+        return AddSlash(path) + file;
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline string Make(const string& dir, const string& filename, const string& ext)
+    {
+        string path = ReplaceExtension(filename, ext);
+        path = AddSlash(dir) + path;
+        return path;
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline string Make(const string& dir, const string& filename, const char* ext)
+    {
+        return Make(dir, filename, string(ext));
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline stack_string Make(const stack_string& path, const stack_string& file)
+    {
+        return AddSlash(path) + file;
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline stack_string Make(const stack_string& dir, const stack_string& filename, const stack_string& ext)
+    {
+        stack_string path = ReplaceExtension(filename, ext);
+        path = AddSlash(dir) + path;
+        return path;
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline string Make(const char* path, const string& file)
+    {
+        return Make(string(path), file);
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline string Make(const string& path, const char* file)
+    {
+        return Make(path, string(file));
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline string Make(const char path[], const char file[])
+    {
+        return Make(string(path), string(file));
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline string Make(const char* path, const char* file, const char* ext)
+    {
+        return Make(string(path), string(file), string(ext));
+    }
+
+    //! Makes a fully specified file path from path and file name.
+    inline string MakeFullPath(const string& relativePath)
+    {
+        return relativePath;
+    }
+
+    inline string GetParentDirectory (const string& strFilePath, int nGeneration = 1)
+    {
+        for (const char* p = strFilePath.c_str() + strFilePath.length() - 2; // -2 is for the possible trailing slash: there always must be some trailing symbol which is the file/directory name for which we should get the parent
+             p >= strFilePath.c_str();
+             --p)
+        {
+            switch (*p)
+            {
+            case ':':
+                return string (strFilePath.c_str(), p);
+            case '/':
+            case '\\':
+                // we've reached a path separator - return everything before it.
+                if (!--nGeneration)
+                {
+                    return string(strFilePath.c_str(), p);
+                }
+                break;
+            }
+        }
+        // it seems the file name is a pure name, without path or extension
+        return string();
+    }
+
+    template<typename T, size_t SIZE>
+    inline CryStackStringT<T, SIZE> GetParentDirectoryStackString(const CryStackStringT<T, SIZE>& strFilePath, int nGeneration = 1)
+    {
+        for (const char* p = strFilePath.c_str() + strFilePath.length() - 2; // -2 is for the possible trailing slash: there always must be some trailing symbol which is the file/directory name for which we should get the parent
+             p >= strFilePath.c_str();
+             --p)
+        {
+            switch (*p)
+            {
+            case ':':
+                return CryStackStringT<T, SIZE> (strFilePath.c_str(), p);
+            case '/':
+            case '\\':
+                // we've reached a path separator - return everything before it.
+                if (!--nGeneration)
+                {
+                    return CryStackStringT<T, SIZE>(strFilePath.c_str(), p);
+                }
+                break;
+            }
+        }
+        // it seems the file name is a pure name, without path or extension
+        return CryStackStringT<T, SIZE>();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Description:
+    //    Make a game correct path out of any input path.
+    inline stack_string MakeGamePath(const stack_string& path)
+    {
+        stack_string relativePath(ToUnixPath(path));
+
+        if ((!gEnv) || (!gEnv->pFileIO))
+        {
+            return relativePath;
+        }
+        unsigned int index = 0;
+        if (relativePath.length() && relativePath[index] == '@') // already aliased
+        {
+            if (relativePath.compareNoCase(0, 9, "@assets@/") == 0)
+            {
+                return relativePath.substr(9); // assets is assumed.
+            }
+            return relativePath;
+        }
+
+        const char* rootValue = gEnv->pFileIO->GetAlias("@root@");
+        if (rootValue)
+        {
+            stack_string rootPath(ToUnixPath(rootValue));
+            if (
+                (rootPath.size() > 0) &&
+                (rootPath.size() < relativePath.size()) &&
+                (relativePath.compareNoCase(0, rootPath.size(), rootPath) == 0)
+                )
+            {
+                stack_string chopped_string = relativePath.substr(rootPath.size());
+                stack_string rooted = stack_string("@root@") + chopped_string;
+                return rooted;
+            }
+        }
+
+
+
+        return relativePath;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Description:
+    //    Make a game correct path out of any input path.
+    inline string MakeGamePath(const string& path)
+    {
+        stack_string stackPath(path.c_str());
+        return MakeGamePath(stackPath).c_str();
+    }
+
+    // returns true if the string matches the wildcard
+    inline bool MatchWildcard (const char* szString, const char* szWildcard)
+    {
+        const char* pString = szString, * pWildcard = szWildcard;
+        // skip the obviously the same starting substring
+        while (*pWildcard && *pWildcard != '*' && *pWildcard != '?')
+        {
+            if (*pString != *pWildcard)
+            {
+                return false; // must be exact match unless there's a wildcard character in the wildcard string
+            }
+            else
+            {
+                ++pString, ++pWildcard;
+            }
+        }
+
+        if (!*pString)
+        {
+            // this will only match if there are no non-wild characters in the wildcard
+            for (; *pWildcard; ++pWildcard)
+            {
+                if (*pWildcard != '*' && *pWildcard != '?')
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        switch (*pWildcard)
+        {
+        case '\0':
+            return false; // the only way to match them after the leading non-wildcard characters is !*pString, which was already checked
+
+        // we have a wildcard with wild character at the start.
+        case '*':
+        {
+            // merge consecutive ? and *, since they are equivalent to a single *
+            while (*pWildcard == '*' || *pWildcard == '?')
+            {
+                ++pWildcard;
+            }
+
+            if (!*pWildcard)
+            {
+                return true;     // the rest of the string doesn't matter: the wildcard ends with *
+            }
+            for (; *pString; ++pString)
+            {
+                if (MatchWildcard(pString, pWildcard))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+        case '?':
+            return MatchWildcard(pString + 1, pWildcard + 1) || MatchWildcard(pString, pWildcard + 1);
+        default:
+            assert (0);
+            return false;
+        }
+    }
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYPATH_H
diff --git a/Code/Legacy/CryCommon/CryPodArray.h b/Code/Legacy/CryCommon/CryPodArray.h
new file mode 100644
index 0000000000..7cb081a80c
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryPodArray.h
@@ -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
+ *
+ */
+
+
+// Description : Simple POD types container
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYPODARRAY_H
+#define CRYINCLUDE_CRYCOMMON_CRYPODARRAY_H
+#pragma once
+
+#include <AzCore/std/containers/vector.h>
+
+//////////////////////////////////////////////////////////////////////////
+// POD Array
+// vector like class (random access O(1)) without construction/destructor/copy constructor/assignment handling
+// over-allocation allows safe prefetching where required without worrying about memory page boundaries
+//////////////////////////////////////////////////////////////////////////
+template <class T, size_t overAllocBytes = 0>
+class PodArray
+{
+    AZStd::vector<T> m_elements;
+
+public:
+    typedef T        value_type;
+    typedef T*       iterator;
+    typedef const T* const_iterator;
+
+    //////////////////////////////////////////////////////////////////////////
+    // STL compatible interface
+    //////////////////////////////////////////////////////////////////////////
+    void resize(size_t numElements)
+    {
+        m_elements.resize(numElements);
+    }
+    //////////////////////////////////////////////////////////////////////////
+    ILINE void reserve(unsigned numElements) { m_elements.reserve(numElements); }
+    ILINE void push_back(const T& rElement) { m_elements.push_back(rElement); }
+    ILINE size_t size() const   { return m_elements.size(); }
+    ILINE size_t capacity() const { return m_elements.capacity(); }
+
+    ILINE void clear() { m_elements.clear(); }
+    ILINE T* begin() { return m_elements.begin(); }
+    ILINE T* end() { return m_elements.end(); }
+    ILINE const T* begin() const { return m_elements.begin(); }
+    ILINE const T* end() const { return m_elements.end(); }
+    ILINE bool empty() const { return m_elements.empty(); }
+
+    ILINE const T& front() const { return m_elements.front(); }
+    ILINE T& front() { return m_elements.front(); }
+
+    ILINE const T& back() const { return m_elements.back(); }
+    ILINE T& back() { return m_elements.back(); }
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    PodArray()
+        : m_elements()
+    {
+    }
+    PodArray(int elem_count, int nNewCount = 0)
+    {
+        m_elements.reserve(elem_count);
+        m_elements.resize(nNewCount);
+    }
+    PodArray(const PodArray<T>& from)
+        : m_elements(from.m_elements)
+    {
+    }
+    ~PodArray()
+    {
+    }
+
+    void Reset() { m_elements.clear(); }
+    void Free()
+    {
+        m_elements.clear();
+        m_elements.shrink_to_fit();
+    }
+
+    ILINE void Clear()
+    {
+        m_elements.clear();
+    }
+
+    int Find(const T& p)
+    {
+        const auto it = AZStd::find(m_elements.begin(), m_elements.end(), p);
+        if (it != m_elements.end())
+        {
+            return static_cast<int>(AZStd::distance(m_elements.begin(), it));
+        }
+        return -1;
+    }
+
+    inline void AddList(const PodArray<T>& lstAnother)
+    {
+        AZStd::copy(lstAnother.m_elements.begin(), lstAnother.m_elements.end(), AZStd::back_inserter(m_elements));
+    }
+
+    inline void AddList(T* pAnotherArray, int nAnotherCount)
+    {
+        AZStd::copy(pAnotherArray, pAnotherArray + nAnotherCount, AZStd::back_inserter(m_elements));
+    }
+
+    ILINE void Add(const T& p)
+    {
+        m_elements.push_back(p);
+    }
+
+    ILINE T& AddNew()
+    {
+        m_elements.emplace_back();
+        return m_elements.back();
+    }
+
+    void InsertBefore(const T& p, const unsigned int nBefore)
+    {
+        m_elements.insert(m_elements.begin() + nBefore, p);
+    }
+
+    void CheckAllocated(int elem_count)
+    {
+        if (m_elements.size() < elem_count)
+        {
+            m_elements.resize(elem_count);
+        }
+    }
+
+    void PreAllocate(int elem_count, int nNewCount = -1)
+    {
+        m_elements.reserve(elem_count);
+        if (nNewCount >= 0)
+        {
+            m_elements.resize(nNewCount);
+        }
+    }
+
+    inline void Delete(const int nElemId, const int nElemCount = 1)
+    {
+        AZ_Assert(nElemId >= 0 && nElemId + nElemCount <= size(), "Index out of bounds");
+        m_elements.erase(m_elements.begin() + nElemId, m_elements.begin() + nElemId + nElemCount);
+    }
+
+    inline void DeleteFastUnsorted(const int nElemId, const int nElemCount = 1)
+    {
+        AZ_Assert(nElemId >= 0 && nElemId + nElemCount <= size(), "Index out of bounds");
+        m_elements.erase(m_elements.begin() + nElemId, m_elements.begin() + nElemId + nElemCount);
+    }
+
+    inline bool Delete(const T& del)
+    {
+        const size_t numElements = m_elements.size();
+        m_elements.erase(std::remove(m_elements.begin(), m_elements.end(), del), m_elements.end());
+        return numElements != m_elements.size();
+    }
+
+    ILINE  int Count() const { return m_elements.size(); }
+    ILINE  unsigned int Size() const { return m_elements.size(); }
+
+    ILINE  int IsEmpty() const { return m_elements.empty(); }
+
+    ILINE  const T& operator [] (int i) const { return m_elements[i]; }
+    ILINE  T& operator [] (int i) { return m_elements[i]; }
+    ILINE  const T& GetAt(int i) const { return m_elements[i]; }
+    ILINE  T& GetAt(int i) { return m_elements[i]; }
+    ILINE  const T* Get(int i) const { return &m_elements[i]; }
+    ILINE  T* Get(int i) { return &m_elements[i]; }
+    ILINE  const T* GetElements() const { return m_elements.data(); }
+    ILINE  T* GetElements() { return m_elements.data(); }
+    
+    ILINE  unsigned int GetDataSize() const { return m_elements.size() * sizeof(T); }
+
+    const T& Last() const { return m_elements.back(); }
+    T& Last() { return m_elements.back(); }
+
+    ILINE void DeleteLast()
+    {
+        assert(!m_elements.empty());
+        m_elements.pop_back();
+    }
+
+    PodArray<T>& operator=(const PodArray<T>& source_list)
+    {
+        m_elements = source_list.m_elements;
+        return *this;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Return true if arrays have the same data.
+    bool Compare(const PodArray<T>& l) const
+    {
+        return m_elements == l.m_elements;
+    }
+
+    // for statistics
+    ILINE size_t ComputeSizeInMemory() const
+    {
+        return (sizeof(*this) + sizeof(T) * m_elements.capacity()) + overAllocBytes;
+    }
+
+    ILINE void RemoveIf(AZStd::function<bool(const T&)> testFunc)
+    {
+        m_elements.erase(AZStd::remove_if(m_elements.begin(), m_elements.end(), testFunc), m_elements.end());
+    }
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYPODARRAY_H
diff --git a/Code/Legacy/CryCommon/CryRandomInternal.h b/Code/Legacy/CryCommon/CryRandomInternal.h
new file mode 100644
index 0000000000..e7c27a413e
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryRandomInternal.h
@@ -0,0 +1,163 @@
+/*
+ * 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 <algorithm>  // std::swap()
+#include <limits>  // std::numeric_limits
+#include <type_traits>  // std::make_unsigned
+#include "BaseTypes.h"  // uint32, uint64
+#include "CompileTimeAssert.h"
+#include "Cry_Vector2.h"
+#include "Cry_Vector3.h"
+#include "Cry_Vector4.h"
+
+
+namespace CryRandom_Internal
+{
+    template <class R, class T, size_t size>
+    struct BoundedRandomUint
+    {
+        COMPILE_TIME_ASSERT(std::numeric_limits<T>::is_integer);
+        COMPILE_TIME_ASSERT(!std::numeric_limits<T>::is_signed);
+        COMPILE_TIME_ASSERT(sizeof(T) == size);
+        COMPILE_TIME_ASSERT(sizeof(T) <= sizeof(uint32));
+
+        inline static T Get(R& randomGenerator, const T maxValue)
+        {
+            const uint32 r = randomGenerator.GenerateUint32();
+            // Note that the computation below is biased. An alternative computation
+            // (also biased): uint32((uint64)r * ((uint64)maxValue + 1)) >> 32)
+            return (T)((uint64)r % ((uint64)maxValue + 1));
+        }
+    };
+
+    template <class R, class T>
+    struct BoundedRandomUint<R, T, 8>
+    {
+        COMPILE_TIME_ASSERT(std::numeric_limits<T>::is_integer);
+        COMPILE_TIME_ASSERT(!std::numeric_limits<T>::is_signed);
+        COMPILE_TIME_ASSERT(sizeof(T) == sizeof(uint64));
+
+        inline static T Get(R& randomGenerator, const T maxValue)
+        {
+            const uint64 r = randomGenerator.GenerateUint64();
+            if (maxValue >= (std::numeric_limits<uint64>::max)())
+            {
+                return r;
+            }
+            // Note that the computation below is biased.
+            return (T)(r % ((uint64)maxValue + 1));
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+
+    template <class R, class T, bool bInteger = std::numeric_limits<T>::is_integer>
+    struct BoundedRandom;
+
+    template <class R, class T>
+    struct BoundedRandom<R, T, true>
+    {
+        COMPILE_TIME_ASSERT(std::numeric_limits<T>::is_integer);
+        typedef typename std::make_unsigned<T>::type UT;
+        COMPILE_TIME_ASSERT(sizeof(T) == sizeof(UT));
+        COMPILE_TIME_ASSERT(std::numeric_limits<UT>::is_integer);
+        COMPILE_TIME_ASSERT(!std::numeric_limits<UT>::is_signed);
+
+        inline static T Get(R& randomGenerator, T minValue, T maxValue)
+        {
+            if (minValue > maxValue)
+            {
+                std::swap(minValue, maxValue);
+            }
+            return (T)((UT)minValue + (UT)BoundedRandomUint<R, UT, sizeof(UT)>::Get(randomGenerator, (UT)(maxValue - minValue)));
+        }
+    };
+
+    template <class R, class T>
+    struct BoundedRandom<R, T, false>
+    {
+        COMPILE_TIME_ASSERT(!std::numeric_limits<T>::is_integer);
+
+        inline static T Get(R& randomGenerator, const T minValue, const T maxValue)
+        {
+            return minValue + (maxValue - minValue) * randomGenerator.GenerateFloat();
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+
+    template <class R, class VT, class T = typename VT::value_type, size_t componentCount = VT::component_count>
+    struct BoundedRandomComponentwise;
+
+    template <class R, class VT, class T>
+    struct BoundedRandomComponentwise<R, VT, T, 2>
+    {
+        inline static VT Get(R& randomGenerator, const VT& minValue, const VT& maxValue)
+        {
+            const T x = BoundedRandom<R, T>::Get(randomGenerator, minValue.x, maxValue.x);
+            const T y = BoundedRandom<R, T>::Get(randomGenerator, minValue.y, maxValue.y);
+            return VT(x, y);
+        }
+    };
+
+    template <class R, class VT, class T>
+    struct BoundedRandomComponentwise<R, VT, T, 3>
+    {
+        inline static VT Get(R& randomGenerator, const VT& minValue, const VT& maxValue)
+        {
+            const T x = BoundedRandom<R, T>::Get(randomGenerator, minValue.x, maxValue.x);
+            const T y = BoundedRandom<R, T>::Get(randomGenerator, minValue.y, maxValue.y);
+            const T z = BoundedRandom<R, T>::Get(randomGenerator, minValue.z, maxValue.z);
+            return VT(x, y, z);
+        }
+    };
+
+    template <class R, class VT, class T>
+    struct BoundedRandomComponentwise<R, VT, T, 4>
+    {
+        inline static VT Get(R& randomGenerator, const VT& minValue, const VT& maxValue)
+        {
+            const T x = BoundedRandom<R, T>::Get(randomGenerator, minValue.x, maxValue.x);
+            const T y = BoundedRandom<R, T>::Get(randomGenerator, minValue.y, maxValue.y);
+            const T z = BoundedRandom<R, T>::Get(randomGenerator, minValue.z, maxValue.z);
+            const T w = BoundedRandom<R, T>::Get(randomGenerator, minValue.w, maxValue.w);
+            return VT(x, y, z, w);
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+
+    template <class R, class VT>
+    inline VT GetRandomUnitVector(R& randomGenerator)
+    {
+        typedef typename VT::value_type T;
+        COMPILE_TIME_ASSERT(!std::numeric_limits<T>::is_integer);
+
+        VT res;
+        T lenSquared;
+
+        do
+        {
+            res = BoundedRandomComponentwise<R, VT>::Get(randomGenerator, VT(-1), VT(1));
+            lenSquared = res.GetLengthSquared();
+        } while (lenSquared > 1);
+
+        if (lenSquared >= (std::numeric_limits<T>::min)())
+        {
+            return res * isqrt_tpl(lenSquared);
+        }
+
+        res = VT(ZERO);
+        res.x = 1;
+        return res;
+    }
+} // namespace CryRandom_Internal
+
+// eof
diff --git a/Code/Legacy/CryCommon/CrySizer.h b/Code/Legacy/CryCommon/CrySizer.h
new file mode 100644
index 0000000000..259bc80133
--- /dev/null
+++ b/Code/Legacy/CryCommon/CrySizer.h
@@ -0,0 +1,586 @@
+/*
+ * 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 : Declaration and definition of the CrySizer class, which is used to
+//               calculate the memory usage by the subsystems and components, to help
+//               the artists keep the memory budged low.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYSIZER_H
+#define CRYINCLUDE_CRYCOMMON_CRYSIZER_H
+#pragma once
+
+
+//////////////////////////////////////////////////////////////////////////
+
+// common containers for overloads
+#include <list>
+
+#include "Cry_Math.h"
+#include <StlUtils.h>
+#include <Tarray.h>
+#include <CryPodArray.h>
+#include <Cry_Vector3.h>
+#include <Cry_Quat.h>
+#include <Cry_Color.h>
+#include <smartptr.h>
+
+// forward declarations for overloads
+struct AABB;
+struct SVF_P3F;
+struct SVF_P3F_C4B_T2F;
+struct SVF_P3F_C4B_T2S;
+struct SVF_P3S_C4B_T2S;
+struct SPipTangents;
+
+#ifdef WIN64
+#include <string.h> // workaround for Amd64 compiler
+#endif
+
+namespace AZ
+{
+    class Vector3;
+}
+
+// flags applicable to the ICrySizer (retrieved via getFlags() method)
+//
+enum ICrySizerFlagsEnum
+{
+    // if this flag is set, during getSize(), the subsystem must count all the objects
+    // it uses in the other subsystems also
+    CSF_RecurseSubsystems = 1 << 0,
+
+    CSF_Reserved1 = 1 << 1,
+    CSF_Reserved2 = 1 << 2
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Helper functions to calculate size of the std containers.
+//////////////////////////////////////////////////////////////////////////
+namespace stl
+{
+    template <class Map>
+    inline size_t size_of_map(const Map& m)
+    {
+        if (!m.empty())
+        {
+            return m.size() * sizeof(typename Map::value_type) + m.size() * sizeof(MapLikeStruct);
+        }
+        return 0;
+    }
+    template <class Map>
+    inline size_t size_of_set(const Map& m)
+    {
+        if (!m.empty())
+        {
+            return m.size() * sizeof(typename Map::value_type) + m.size() * sizeof(MapLikeStruct);
+        }
+        return 0;
+    }
+    template <class List>
+    inline size_t size_of_list(const List& c)
+    {
+        if (!c.empty())
+        {
+            return c.size() * sizeof(typename List::value_type) + c.size() * sizeof(void*) * 2; // sizeof stored type + 2 pointers prev,next
+        }
+        return 0;
+    }
+    template <class Deque>
+    inline size_t size_of_deque(const Deque& c)
+    {
+        if (!c.empty())
+        {
+            return c.size() * sizeof(typename Deque::value_type);
+        }
+        return 0;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// interface ICrySizer
+// USAGE
+//   An instance of this class is passed down to each and every component in the system.
+//   Every component it's passed to optionally pushes its name on top of the
+//     component name stack (thus ensuring that all the components calculated down
+//     the tree will be assigned the correct subsystem/component name)
+//   Every component must Add its size with one of the Add* functions, and Add the
+//     size of all its subcomponents recursively
+//   In order to push the component/system name on the name stack, the clients must
+//     use the SIZER_COMPONENT_NAME macro or CrySizerComponentNameHelper class:
+//
+//   void X::getSize (ICrySizer* pSizer)
+//   {
+//     SIZER_COMPONENT_NAME(pSizer, X);
+//     if (!pSizer->Add (this))
+//       return;
+//     pSizer->Add (m_arrMySimpleArray);
+//     pSizer->Add (m_setMySimpleSet);
+//     m_pSubobject->getSize (pSizer);
+//   }
+//
+//   The Add* functions return bool. If they return true, then the object has been added
+//   to the set for the first time, and you should go on recursively adding all its children.
+//   If it returns false, then you can spare time and rather not go on into recursion;
+//   however it doesn't reflect on the results: an object that's added more than once is
+//   counted only once.
+//
+// WARNING:
+//   If you have an array (pointer), you should Add its size with addArray
+class ICrySizer
+{
+public:
+    virtual ~ICrySizer(){}
+    // this class is used to push/pop the name to/from the stack automatically
+    // (to exclude stack overruns or underruns at runtime)
+    friend class CrySizerComponentNameHelper;
+
+    virtual void Release() = 0;
+
+    // Return total calculated size.
+    virtual size_t GetTotalSize() = 0;
+
+    // Return total objects added.
+    virtual size_t GetObjectCount() = 0;
+
+    // Resets the counting.
+    virtual void Reset() = 0;
+
+    virtual void End() = 0;
+
+    // adds an object identified by the unique pointer (it needs not be
+    // the actual object position in the memory, though it would be nice,
+    // but it must be unique throughout the system and unchanging for this object)
+    // nCount parameter is only used for counting number of objects, it doesnt affect the size of the object.
+    // RETURNS: true if the object has actually been added (for the first time)
+    //          and calculated
+    virtual bool AddObject (const void* pIdentifier, size_t nSizeBytes, int nCount = 1) = 0;
+
+    template<typename Type>
+    bool AddObjectSize(const Type* pObj)
+    {
+        return AddObject(pObj, sizeof *pObj);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////
+    // temp dummy function while checking in the CrySizer changes, will be removed soon
+
+    template<typename Type>
+    void AddObject(const Type& rObj)
+    {
+        (void)rObj;
+    }
+
+    template<typename Type>
+    void AddObject(Type* pObj)
+    {
+        if (pObj)
+        {
+            //forward to reference object to allow function overload
+            this->AddObject(*pObj);
+        }
+    }
+
+    // overloads for smart_ptr and other common objects
+    template<typename T>
+    void AddObject(const _smart_ptr<T>& rObj) { this->AddObject(rObj.get()); }
+    template<typename T>
+    void AddObject(const AZStd::shared_ptr<T>& rObj) { this->AddObject(rObj.get()); }
+    template<typename T>
+    void AddObject(const std::shared_ptr<T>& rObj) { this->AddObject(rObj.get()); }
+    template<typename T>
+    void AddObject(const std::unique_ptr<T>& rObj) { this->AddObject(rObj.get()); }
+    template<typename T, typename U>
+    void AddObject(const std::pair<T, U>& rPair)
+    {
+        this->AddObject(rPair.first);
+        this->AddObject(rPair.second);
+    }
+    template<typename T, typename U>
+    void AddObject(const AZStd::pair<T, U>& rPair)
+    {
+        this->AddObject(rPair.first);
+        this->AddObject(rPair.second);
+    }
+    void AddObject(const string& rString) {this->AddObject(rString.c_str(), rString.capacity()); }
+    void AddObject(const CryStringT<wchar_t>& rString) {this->AddObject(rString.c_str(), rString.capacity()); }
+    void AddObject(const CryFixedStringT<32>&){}
+    void AddObject(const wchar_t&) {}
+    void AddObject(const char&) {}
+    void AddObject(const unsigned char&) {}
+    void AddObject(const signed char&) {}
+    void AddObject(const short&) {}
+    void AddObject(const unsigned short&) {}
+    void AddObject(const int&) {}
+    void AddObject(const unsigned int&) {}
+    void AddObject(const long&) {}
+    void AddObject(const unsigned long&) {}
+    void AddObject(const float&) {}
+    void AddObject(const bool&) {}
+    void AddObject(const unsigned long long&) {}
+    void AddObject(const long long&) {}
+    void AddObject(const double&) {}
+    void AddObject(const Vec2&) {}
+    void AddObject(const Vec3&) {}
+    void AddObject(const Vec4&) {}
+    void AddObject(const Ang3&) {}
+    void AddObject(const Matrix34&) {}
+    void AddObject(const Quat&) {}
+    void AddObject(const QuatT&) {}
+    void AddObject(const QuatTS&) {}
+    void AddObject(const ColorF&) {}
+    void AddObject(const AABB&) {}
+    void AddObject(const SVF_P3F&) {}
+    void AddObject(const SVF_P3F_C4B_T2F&) {}
+    void AddObject(const SVF_P3F_C4B_T2S&) {}
+    void AddObject(const SVF_P3S_C4B_T2S&) {}
+    void AddObject(const SPipTangents&) {}
+    void AddObject([[maybe_unused]] const AZ::Vector3& rObj) {}
+    void AddObject(void*) {}
+
+    // overloads for container, will automaticly traverse the content
+    template<typename T, typename Alloc>
+    void AddObject(const std::list<T, Alloc>& rList)
+    {
+        // dummy struct to get correct element size
+        struct Dummy
+        {
+            void* a;
+            void* b;
+            T t;
+        };
+
+        for (typename std::list<T, Alloc>::const_iterator it = rList.begin(); it != rList.end(); ++it)
+        {
+            if (this->AddObject(&(*it), sizeof(Dummy)))
+            {
+                this->AddObject(*it);
+            }
+        }
+    }
+    template<typename K, typename T, typename Comp, typename Equal, typename Alloc>
+    void AddObject([[maybe_unused]] const AZStd::unordered_map<K, T, Comp, Equal, Alloc>& rVector)
+    {
+
+    }
+
+    template<typename T, typename Alloc>
+    void AddObject(const std::vector<T, Alloc>& rVector)
+    {
+        if (rVector.empty())
+        {
+            this->AddObject(&rVector, rVector.capacity() * sizeof(T));
+            return;
+        }
+
+        if (!this->AddObject(&rVector[0], rVector.capacity() * sizeof(T)))
+        {
+            return;
+        }
+
+        for (typename std::vector<T, Alloc>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
+        {
+            this->AddObject(*it);
+        }
+    }
+
+    template<typename T, typename Alloc>
+    void AddObject(const std::deque<T, Alloc>& rVector)
+    {
+        for (typename std::deque<T, Alloc>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
+        {
+            if (this->AddObject(&(*it), sizeof(T)))
+            {
+                this->AddObject(*it);
+            }
+        }
+    }
+
+    template<typename T, typename I, typename S>
+    void AddObject(const DynArray<T, I, S>& rVector)
+    {
+        if (rVector.empty())
+        {
+            this->AddObject(rVector.begin(), rVector.get_alloc_size());
+            return;
+        }
+
+        if (!this->AddObject(rVector.begin(), rVector.get_alloc_size()))
+        {
+            return;
+        }
+
+        for (typename DynArray<T, I, S>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
+        {
+            this->AddObject(*it);
+        }
+    }
+
+    template<typename T>
+    void AddObject(const PodArray<T>& rVector)
+    {
+        if (!this->AddObject(rVector.begin(), rVector.capacity() * sizeof(T)))
+        {
+            return;
+        }
+
+        for (typename PodArray<T>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
+        {
+            this->AddObject(*it);
+        }
+    }
+
+    template<typename K, typename T, typename Comp, typename Alloc>
+    void AddObject(const std::map<K, T, Comp, Alloc>& rVector)
+    {
+        // dummy struct to get correct element size
+        struct Dummy
+        {
+            void* a;
+            void* b;
+            void* c;
+            void* d;
+            K k;
+            T t;
+        };
+
+        for (typename std::map<K, T, Comp, Alloc>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
+        {
+            if (this->AddObject(&(*it), sizeof(Dummy)))
+            {
+                this->AddObject(it->first);
+                this->AddObject(it->second);
+            }
+        }
+    }
+
+    template<typename T, typename Comp, typename Alloc>
+    void AddObject(const std::set<T, Comp, Alloc>& rVector)
+    {
+        // dummy struct to get correct element size
+        struct Dummy
+        {
+            void* a;
+            void* b;
+            void* c;
+            void* d;
+            T t;
+        };
+
+        for (typename std::set<T, Comp, Alloc>::const_iterator it = rVector.begin(); it != rVector.end(); ++it)
+        {
+            if (this->AddObject(&(*it), sizeof(Dummy)))
+            {
+                this->AddObject(*it);
+            }
+        }
+    }
+
+    template <typename TKey, typename TValue, typename TPredicate, typename TAlloc>
+    void AddObject (const std::multimap<TKey, TValue, TPredicate, TAlloc>& rContainer)
+    {
+        AddContainer(rContainer);
+    }
+    ////////////////////////////////////////////////////////////////////////////////////////
+    template <typename T>
+    bool Add (const T* pId, size_t num)
+    {
+        return AddObject(pId, num * sizeof(T));
+    }
+
+    template <class T>
+    bool Add (const T& rObject)
+    {
+        return AddObject (&rObject, sizeof(T));
+    }
+
+    bool Add (const char* szText)
+    {
+        return AddObject(szText, strlen(szText) + 1);
+    }
+
+    template <class StringCls>
+    bool AddString (const StringCls& strText)
+    {
+        if (!strText.empty())
+        {
+            return AddObject (strText.c_str(), strText.size());
+        }
+        else
+        {
+            return false;
+        }
+    }
+#ifdef _XSTRING_
+    template <class Elem, class Traits, class Allocator>
+    bool Add (const std::basic_string<Elem, Traits, Allocator>& strText)
+    {
+        AddString (strText);
+        return true;
+    }
+#endif
+
+ #ifndef NOT_USE_CRY_STRING
+    bool Add (const string& strText)
+    {
+        AddString(strText);
+        return true;
+    }
+ #endif
+
+
+    // Template helper function to add generic stl container
+    template <typename Container>
+    bool AddContainer (const Container& rContainer)
+    {
+        if (rContainer.capacity())
+        {
+            return AddObject (&rContainer, rContainer.capacity() * sizeof(typename Container::value_type));
+        }
+        return false;
+    }
+    template <typename Container>
+    bool AddHashMap(const Container& rContainer)
+    {
+        if (!rContainer.empty())
+        {
+            return AddObject (&(*rContainer.begin()), rContainer.size() * sizeof(typename Container::value_type));
+        }
+        return false;
+    }
+
+    // Specialization of the AddContainer for the std::list
+    template <typename Type, typename TAlloc>
+    bool AddContainer (const std::list<Type, TAlloc>& rContainer)
+    {
+        if (!rContainer.empty())
+        {
+            return AddObject(&(*rContainer.begin()), stl::size_of_list(rContainer));
+        }
+        return false;
+    }
+    // Specialization of the AddContainer for the std::deque
+    template <typename Type, typename TAlloc>
+    bool AddContainer (const std::deque<Type, TAlloc>& rContainer)
+    {
+        if (!rContainer.empty())
+        {
+            return AddObject(&(*rContainer.begin()), stl::size_of_deque(rContainer));
+        }
+        return false;
+    }
+    // Specialization of the AddContainer for the std::map
+    template <typename TKey, typename TValue, typename TPredicate, typename TAlloc>
+    bool AddContainer (const std::map<TKey, TValue, TPredicate, TAlloc>& rContainer)
+    {
+        if (!rContainer.empty())
+        {
+            return AddObject(&(*rContainer.begin()), stl::size_of_map(rContainer));
+        }
+        return false;
+    }
+    // Specialization of the AddContainer for the std::multimap
+    template <typename TKey, typename TValue, typename TPredicate, typename TAlloc>
+    bool AddContainer (const std::multimap<TKey, TValue, TPredicate, TAlloc>& rContainer)
+    {
+        if (!rContainer.empty())
+        {
+            return AddObject(&(*rContainer.begin()), stl::size_of_map(rContainer));
+        }
+        return false;
+    }
+    // Specialization of the AddContainer for the std::set
+    template <typename TKey, typename TPredicate, typename TAlloc>
+    bool AddContainer (const std::set<TKey, TPredicate, TAlloc>& rContainer)
+    {
+        if (!rContainer.empty())
+        {
+            return AddObject(&(*rContainer.begin()), stl::size_of_set(rContainer));
+        }
+        return false;
+    }
+
+    // Specialization of the AddContainer for the AZStd::unordered_map
+    template <typename KEY, typename TYPE, class HASH, class EQUAL, class ALLOCATOR>
+    bool AddContainer(const AZStd::unordered_map<KEY, TYPE, HASH, EQUAL, ALLOCATOR>& rContainer)
+    {
+        if (!rContainer.empty())
+        {
+            return AddObject(&(*rContainer.begin()), rContainer.size() * sizeof(typename AZStd::unordered_map<KEY, TYPE, HASH, EQUAL, ALLOCATOR>::value_type));
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    void Test()
+    {
+        std::map<int, float> mymap;
+        AddContainer(mymap);
+    }
+
+    // returns the flags
+    unsigned GetFlags() const {return m_nFlags; }
+
+protected:
+    // these functions must operate on the component name stack
+    // they are to be only accessible from within class CrySizerComponentNameHelper
+    // which should be used through macro SIZER_COMPONENT_NAME
+    virtual void Push (const char* szComponentName) = 0;
+    // pushes the name that is the name of the previous component . (dot) this name
+    virtual void PushSubcomponent (const char* szSubcomponentName) = 0;
+    virtual void Pop () = 0;
+
+    unsigned m_nFlags;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// This is on-stack class that is only used to push/pop component names
+// to/from the sizer name stack.
+//
+// USAGE:
+//
+//   Create an instance of this class at the start of a function, before
+//   calling Add* methods of the sizer interface. Everything added in the
+//   function and below will be considered this component, unless
+//   explicitly set otherwise.
+//
+class CrySizerComponentNameHelper
+{
+public:
+    // pushes the component name on top of the name stack of the given sizer
+    CrySizerComponentNameHelper (ICrySizer* pSizer, const char* szComponentName, bool bSubcomponent)
+        : m_pSizer(pSizer)
+    {
+        if (bSubcomponent)
+        {
+            pSizer->PushSubcomponent (szComponentName);
+        }
+        else
+        {
+            pSizer->Push (szComponentName);
+        }
+    }
+
+    // pops the component name off top of the name stack of the sizer
+    ~CrySizerComponentNameHelper()
+    {
+        m_pSizer->Pop();
+    }
+
+protected:
+    ICrySizer* m_pSizer;
+};
+
+// use this to push (and automatically pop) the sizer component name at the beginning of the
+// getSize() function
+#define SIZER_COMPONENT_NAME(pSizerPointer, szComponentName) PREFAST_SUPPRESS_WARNING(6246) CrySizerComponentNameHelper AZ_JOIN(sizerHelper, __LINE__)(pSizerPointer, szComponentName, false)
+#define SIZER_SUBCOMPONENT_NAME(pSizerPointer, szComponentName) PREFAST_SUPPRESS_WARNING(6246) CrySizerComponentNameHelper AZ_JOIN(sizerHelper, __LINE__)(pSizerPointer, szComponentName, true)
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYSIZER_H
diff --git a/Code/Legacy/CryCommon/CryString.h b/Code/Legacy/CryCommon/CryString.h
new file mode 100644
index 0000000000..bb010d80e0
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryString.h
@@ -0,0 +1,2522 @@
+/*
+ * 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 : Custom reference counted string class.
+//               Can easily be substituted instead of string
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYSTRING_H
+#define CRYINCLUDE_CRYCOMMON_CRYSTRING_H
+#pragma once
+
+#include <AzCore/Casting/numeric_cast.h>
+#include <AzCore/std/hash.h>
+
+#if !defined(NOT_USE_CRY_STRING)
+
+#include <string.h>
+#include <wchar.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include "LegacyAllocator.h"
+
+#define CRY_STRING
+
+// forward declaration of CryStackString
+template<class T, size_t S>
+class CryStackStringT;
+
+
+class CConstCharWrapper;    //forward declaration for special const char * without memory allocations
+
+//extern void CryDebugStr( const char *format,... );
+//#define CRY_STRING_DEBUG(s) { if (*s) CryDebugStr( "[%6d] %s",_usedMemory(0),(s) );}
+#define CRY_STRING_DEBUG(s)
+
+class CryStringAllocator
+    : public AZ::SimpleSchemaAllocator<AZ::HphaSchema>
+{
+public:
+    AZ_TYPE_INFO(CryStringAllocator, "{763DFC83-8A6E-4FD9-B6BC-BBF56E93E4EE}");
+
+    using Base = AZ::SimpleSchemaAllocator<AZ::HphaSchema>;
+    using Descriptor = Base::Descriptor;
+
+    CryStringAllocator()
+        : Base("CryStringAllocator", "Allocator for CryString<T>")
+    {
+        Descriptor desc;
+        desc.m_systemChunkSize = 4 * 1024 * 1024;     // grow by 4 MB at a time
+        desc.m_subAllocator = &AZ::AllocatorInstance<AZ::LegacyAllocator>::Get();
+        Create(desc);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// CryStringT class.
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+class CryStringT
+{
+public:
+    //////////////////////////////////////////////////////////////////////////
+    // Types compatible with STL string.
+    //////////////////////////////////////////////////////////////////////////
+    typedef CryStringT<T> _Self;
+    typedef size_t size_type;
+    typedef T value_type;
+    typedef const value_type* const_str;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+    typedef pointer iterator;
+    typedef const_pointer const_iterator;
+
+    enum _npos_type
+    {
+        npos = (size_type) ~0
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Constructors
+    //////////////////////////////////////////////////////////////////////////
+    CryStringT();
+
+protected:
+    CryStringT(const CConstCharWrapper& str);   //ctor for strings without memory allocations
+    friend class CConstCharWrapper;
+public:
+
+    CryStringT(const _Self& str);
+    CryStringT(const _Self& str, size_type nOff, size_type nCount);
+
+    // Before September 2012 this constructor looked like this:
+    //    explicit CryStringT( value_type ch, size_type nRepeat = 1 );
+    // It was very error-prone, because the matching constructor
+    // std::string constructor is different:
+    //    std::string( size_type nRepeat, value_type ch );
+    //
+    // To prevent hard-to-catch bugs, we removed all calls of this
+    // constructor in the existing CryEngine code (in September 2012)
+    // and started using proper order of parameters (matching std::).
+    //
+    // To catch calls using the reversed arguments in other projects,
+    // we retain the previous function with reversed arguments,
+    // and declare it private.
+    CryStringT(size_type nRepeat, value_type ch);
+private:
+    CryStringT(value_type ch, size_type nRepeat);
+
+public:
+
+    CryStringT(const_str str);
+    CryStringT(const_str str, size_type nLength);
+    CryStringT(const_iterator _First, const_iterator _Last);
+    ~CryStringT();
+
+    //////////////////////////////////////////////////////////////////////////
+    // STL string like interface.
+    //////////////////////////////////////////////////////////////////////////
+    //! Operators.
+    size_type length() const;
+    size_type size() const;
+    bool empty() const;
+    void clear();  // free up the data
+
+    //! Returns the storage currently allocated to hold the string, a value at least as large as length().
+    size_type capacity() const;
+
+    // Sets the capacity of the string to a number at least as great as a specified number.
+    // nCount = 0 is shrinking string to fit number of characters in it.
+    void reserve(size_type nCount = 0);
+
+    _Self& append(const value_type* _Ptr);
+    _Self& append(const value_type* _Ptr, size_type nCount);
+    _Self& append(const _Self& _Str, size_type nOff, size_type nCount);
+    _Self& append(const _Self& _Str);
+    _Self& append(size_type nCount, value_type _Ch);
+    _Self& append(const_iterator _First, const_iterator _Last);
+
+    _Self& assign(const_str _Ptr);
+    _Self& assign(const_str _Ptr, size_type nCount);
+    _Self& assign(const _Self& _Str, size_type off, size_type nCount);
+    _Self& assign(const _Self& _Str);
+    _Self& assign(size_type nCount, value_type _Ch);
+    _Self& assign(const_iterator _First, const_iterator _Last);
+
+    value_type at(size_type index) const;
+
+    const_iterator begin() const { return m_str; };
+    const_iterator end() const { return m_str + length(); };
+
+    iterator begin() { return m_str; };
+    iterator end() { return m_str + length(); };
+
+    // Following functions are commented out because they provide direct write access to
+    // the string and such access doesn't work properly with our current reference-count
+    // implementation.
+    // If you really need write access to your string's elements, please consider
+    // using CryStackStringT<> instead of CryString<>. Alternatively, you can modify
+    // your string by multiple calls of erase() and append().
+    // Note: If you need *linear memory read* access to your string's elements, use data()
+    // or c_str(). If you need *linear memory write* access to your string's elements,
+    // use a non-string class (std::vector<>, DynArray<>, etc.) instead of CryString<>.
+    //value_type& at( size_type index );
+    //iterator begin() { return m_str; };
+    //iterator end() { return m_str+length(); };
+
+    //! cast to C string operator.
+    operator const_str() const {
+        return m_str;
+    }
+
+    //! cast to C string.
+    const value_type* c_str() const { return m_str; }
+    const value_type* data() const { return m_str; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // string comparison.
+    //////////////////////////////////////////////////////////////////////////
+    int compare(const _Self& _Str) const;
+    int compare(size_type _Pos1, size_type _Num1, const _Self& _Str) const;
+    int compare(size_type _Pos1, size_type _Num1, const _Self& _Str, size_type nOff, size_type nCount) const;
+    int compare(const char* _Ptr) const;
+    int compare(const wchar_t* _Ptr) const;
+    int compare(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2 = npos) const;
+
+    // Case insensitive comparison
+    int compareNoCase(const _Self& _Str) const;
+    int compareNoCase(size_type _Pos1, size_type _Num1, const _Self& _Str) const;
+    int compareNoCase(size_type _Pos1, size_type _Num1, const _Self& _Str, size_type nOff, size_type nCount) const;
+    int compareNoCase(const value_type* _Ptr) const;
+    int compareNoCase(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2 = npos) const;
+
+    // Copies at most a specified number of characters from an indexed position in a source string to a target character array.
+    size_type copy(value_type* _Ptr, size_type nCount, size_type nOff = 0) const;
+
+    void push_back(value_type _Ch) { _ConcatenateInPlace(&_Ch, 1); }
+    void resize(size_type nCount, value_type _Ch = ' ');
+
+    //! simple sub-string extraction
+    _Self substr(size_type pos, size_type count = npos) const;
+
+    // replace part of string.
+    _Self& replace(value_type chOld, value_type chNew);
+    _Self& replace(const_str strOld, const_str strNew);
+    _Self& replace(size_type pos, size_type count, const_str strNew);
+    _Self& replace(size_type pos, size_type count, const_str strNew, size_type count2);
+    _Self& replace(size_type pos, size_type count, size_type nNumChars, value_type chNew);
+
+    // insert new elements to string.
+    _Self& insert(size_type nIndex, value_type ch);
+    _Self& insert(size_type nIndex, size_type nCount, value_type ch);
+    _Self& insert(size_type nIndex, const_str pstr);
+    _Self& insert(size_type nIndex, const_str pstr, size_type nCount);
+
+    //! delete count characters starting at zero-based index
+    _Self& erase(size_type nIndex, size_type count = npos);
+
+    //! searching (return starting index, or -1 if not found)
+    //! look for a single character match
+    //! like "C" strchr
+    size_type find(value_type ch, size_type pos = 0) const;
+    //! look for a specific sub-string
+    //! like "C" strstr
+    size_type find(const_str subs, size_type pos = 0) const;
+    size_type rfind(value_type ch, size_type pos = npos) const;
+    size_type rfind(const _Self& subs, size_type pos = 0) const;
+
+    size_type find_first_of(value_type _Ch, size_type nOff = 0) const;
+    size_type find_first_of(const_str charSet, size_type nOff = 0) const;
+    //size_type find_first_of( const value_type* _Ptr,size_type _Off,size_type _Count ) const;
+    size_type find_first_of(const _Self& _Str, size_type _Off = 0) const;
+
+    size_type find_first_not_of(value_type _Ch, size_type _Off = 0) const;
+    size_type find_first_not_of(const value_type* _Ptr, size_type _Off = 0) const;
+    size_type find_first_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const;
+    size_type find_first_not_of(const _Self& _Str, size_type _Off = 0) const;
+
+    size_type find_last_of(value_type _Ch, size_type _Off = npos) const;
+    size_type find_last_of(const value_type* _Ptr, size_type _Off = npos) const;
+    size_type find_last_of(const value_type* _Ptr, size_type _Off, size_type _Count) const;
+    size_type find_last_of(const _Self& _Str, size_type _Off = npos) const;
+
+    size_type find_last_not_of(value_type _Ch, size_type _Off = npos) const;
+    size_type find_last_not_of(const value_type* _Ptr, size_type _Off = npos) const;
+    size_type find_last_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const;
+    size_type find_last_not_of(const _Self& _Str, size_type _Off = npos) const;
+
+
+    void swap(_Self& _Str);
+
+    //////////////////////////////////////////////////////////////////////////
+    // overloaded operators.
+    //////////////////////////////////////////////////////////////////////////
+    // overloaded indexing.
+    //value_type operator[]( size_type index ) const; // same as at()
+    //  value_type& operator[]( size_type index ); // same as at()
+
+    // overloaded assignment
+    _Self& operator=(const _Self& str);
+    _Self& operator=(value_type ch);
+    _Self& operator=(const_str str);
+
+    template<size_t AnySize>
+    CryStringT(const CryStackStringT<T, AnySize>& str);
+
+protected:
+    // we prohibit an implicit conversion from CryStackString to make user aware of allocation!
+    // -> use string(stackedString) instead
+    // as the private statement seems to be ignored (VS C++), we add a compile time error, see below
+    template<size_t AnySize>
+    _Self& operator=(const CryStackStringT<T, AnySize>& str)
+    {
+        // we add a compile-time error as the Visual C++ compiler seems to ignore the private statement?
+#if defined(__clang__)
+        //CLANG_TODO: clang verifies things differently
+#else
+        static_assert(false, "Use explicit string assignment when assigning from_StackString");
+#endif
+        // not reached, as above will generate a compile time error
+        _Assign(str.c_str(), str.length());
+        return *this;
+    }
+
+public:
+    // string concatenation
+    _Self& operator+=(const _Self& str);
+    _Self& operator+=(value_type ch);
+    _Self& operator+=(const_str str);
+
+    //template <class TT> friend CryStringT<TT> operator+( const CryStringT<TT>& str1, const CryStringT<TT>& str2 );
+    //template <class TT> friend CryStringT<TT> operator+( const CryStringT<TT>& str, value_type ch );
+    //template <class TT> friend CryStringT<TT> operator+( value_type ch, const CryStringT<TT>& str );
+    //template <class TT> friend CryStringT<TT> operator+( const CryStringT<TT>& str1, const_str str2 );
+    //template <class TT> friend CryStringT<TT> operator+( const_str str1, const CryStringT<TT>& str2 );
+
+    size_t GetAllocatedMemory() const
+    {
+        StrHeader* header = _header();
+        if (header == _emptyHeader())
+        {
+            return 0;
+        }
+        return sizeof(StrHeader) + (header->nAllocSize + 1) * sizeof(value_type);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Extended functions.
+    // This functions are not in the STL string.
+    // They have an ATL CString interface.
+    //////////////////////////////////////////////////////////////////////////
+    //! Format string, use (sprintf)
+    _Self& Format(const value_type* format, ...);
+
+    //! Converts the string to lower-case
+    //  This function uses the "C" locale for case-conversion (ie, A-Z only)
+    _Self& MakeLower();
+
+    //! Converts the string to upper-case
+    //  This function uses the "C" locale for case-conversion (ie, A-Z only)
+    _Self& MakeUpper();
+
+    _Self& Trim();
+    _Self& Trim(value_type ch);
+    _Self& Trim(const value_type* sCharSet);
+
+    _Self& TrimLeft();
+    _Self& TrimLeft(value_type ch);
+    _Self& TrimLeft(const value_type* sCharSet);
+
+    _Self& TrimRight();
+    _Self& TrimRight(value_type ch);
+    _Self& TrimRight(const value_type* sCharSet);
+
+    _Self SpanIncluding(const_str charSet) const;
+    _Self SpanExcluding(const_str charSet) const;
+    _Self Tokenize(const_str charSet, int& nStart) const;
+    _Self Mid(size_type nFirst, size_type nCount = npos) const {  return substr(nFirst, nCount); };
+
+    _Self Left(size_type count) const;
+    _Self Right(size_type count) const;
+    //////////////////////////////////////////////////////////////////////////
+
+    // public utilities.
+    static size_type _strlen(const_str str);
+    static size_type _strnlen(const_str str, size_type maxLen);
+    static const_str _strchr(const_str str, value_type c);
+    static const_str _strrchr(const_str str, value_type c);
+    static value_type* _strstr(value_type* str, const_str strSearch);
+    static bool _IsValidString(const_str str);
+
+#if defined(WIN32) || defined(WIN64)
+    static int _vscpf(const_str format, va_list args);
+#endif
+    static int _vsnpf(value_type* buf, int cnt, const_str format, va_list args);
+
+
+public:
+    //////////////////////////////////////////////////////////////////////////
+    // Only used for debugging statistics.
+    //////////////////////////////////////////////////////////////////////////
+    static size_t _usedMemory(ptrdiff_t size)
+    {
+        static size_t s_used_memory = 0;
+        s_used_memory += size;
+        return s_used_memory;
+    }
+
+protected:
+    value_type* m_str; // pointer to ref counted string data
+
+    // String header. Immediately after this header in memory starts actual string data.
+    struct StrHeader
+    {
+        int nRefCount;
+        int nLength;
+        int nAllocSize;     // Size of memory allocated at the end of this class.
+
+        value_type* GetChars() { return (value_type*)(this + 1); }
+        void  AddRef() { nRefCount++; /*InterlockedIncrement(&_header()->nRefCount);*/};
+        int   Release() { return --nRefCount; };
+    };
+    static StrHeader* _emptyHeader()
+    {
+        // Define 2 static buffers in a row. The 2nd is a dummy object to hold a single empty char string.
+        static StrHeader sEmptyStringBuffer[2] = {
+            {-1, 0, 0}, {0, 0, 0}
+        };
+        return &sEmptyStringBuffer[0];
+    }
+
+    // implementation helpers
+    StrHeader* _header() const;
+
+    void _AllocData(size_type nLen);
+    static void _FreeData(StrHeader* pData);
+    void _Free();
+    void _Initialize();
+
+    void _Concatenate(const_str sStr1, size_type nLen1, const_str sStr2, size_type nLen2);
+    void _ConcatenateInPlace(const_str sStr, size_type nLen);
+    void _Assign(const_str sStr, size_type nLen);
+    void _MakeUnique();
+
+    static void _copy(value_type* dest, const value_type* src, size_type count);
+    static void _move(value_type* dest, const value_type* src, size_type count);
+    static void _set(value_type* dest, value_type ch, size_type count);
+};
+
+// Variant of CryStringT<T> which does not share memory with other strings.
+template<class T>
+class CryStringLocalT
+    : public CryStringT<T>
+{
+public:
+    typedef CryStringT<T> BaseType;
+    typedef typename BaseType::const_str const_str;
+    typedef typename BaseType::value_type value_type;
+    typedef typename BaseType::size_type size_type;
+    typedef typename BaseType::iterator iterator;
+
+    CryStringLocalT()
+    {}
+    CryStringLocalT(const CryStringLocalT& str)
+        : BaseType(str.c_str())
+    {}
+    CryStringLocalT(const BaseType& str)
+        : BaseType(str.c_str())
+    {}
+    template<size_t Size>
+    CryStringLocalT(const CryStackStringT<T, Size>& str)
+        : BaseType(str.c_str())
+    {}
+    CryStringLocalT(const_str str)
+        : BaseType(str)
+    {}
+    CryStringLocalT(const_str str, size_t len)
+        : BaseType(str, len)
+    {}
+    CryStringLocalT(const_str begin, const_str end)
+        : BaseType(begin, end)
+    {}
+    CryStringLocalT(size_type nRepeat, value_type ch)
+        : BaseType(nRepeat, ch)
+    {}
+
+    CryStringLocalT(const typename CryStringT<T>::_Self& str, size_type nOff, size_type nCount)
+        : BaseType(str, nOff, nCount)
+    {}
+
+    CryStringLocalT& operator=(const BaseType& str)
+    {
+        BaseType::operator=(str.c_str());
+        return *this;
+    }
+    CryStringLocalT& operator=(const CryStringLocalT& str)
+    {
+        BaseType::operator=(str.c_str());
+        return *this;
+    }
+    CryStringLocalT& operator=(const_str str)
+    {
+        BaseType::operator=(str);
+        return *this;
+    }
+    iterator begin() { return BaseType::m_str; }
+    using BaseType::begin; // const version
+    iterator end() { return BaseType::m_str + BaseType::length(); }
+    using BaseType::end; // const version
+};
+
+typedef CryStringLocalT<char> CryStringLocal;
+
+
+// wrapper class for creation of strings without memory allocation
+// it creates a string with pointer pointing to const char* location
+// destructor sets the string to empty
+// NOTE: never copy a string from it, just use it as function parameters instead of const char* itself
+class CConstCharWrapper
+{
+public:
+    //passing *this is safe since the char pointer is already set and therefore is the this-ptr constructed complete enough
+#pragma warning (push)
+#pragma warning (disable : 4355)
+    CConstCharWrapper(const char* const cpString)
+        : cpChar(cpString)
+        , str(*this){AZ_Assert(cpString, "c-string parameter cannot be nullptr"); } //create stack string
+#pragma warning (pop)
+    ~CConstCharWrapper(){str.m_str = CryStringT<char>::_emptyHeader()->GetChars(); }//reset string
+    operator const CryStringT<char>&() const {
+        return str;
+    }                                                     //cast operator to const string reference
+private:
+    const char* const cpChar;
+    CryStringT<char> str;
+
+    char* GetCharPointer() const {return const_cast<char*>(cpChar); }    //access function for string ctor
+
+    friend class CryStringT<char>;  //both are bidirectional friends to avoid any other accesses
+};
+
+
+//macro needed because compiler somehow cannot find the cast operator when not invoked directly
+#define CONST_TEMP_STRING(a) ((const string&)CConstCharWrapper(a))
+
+/////////////////////////////////////////////////////////////////////////////
+// CryStringT<T> Implementation
+//////////////////////////////////////////////////////////////////////////
+
+template <class T>
+inline typename CryStringT<T>::StrHeader * CryStringT<T>::_header() const
+{
+    AZ_Assert(m_str != nullptr, "string header is nullptr");
+    return ((StrHeader*)m_str) - 1;
+}
+
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::_strlen(const_str str)
+{
+    return (str == NULL) ? 0 : (size_type)::strlen(str);
+}
+
+template <>
+inline CryStringT<wchar_t>::size_type CryStringT<wchar_t>::_strlen(const_str str)
+{
+    return (str == NULL) ? 0 : (size_type)::wcslen(str);
+}
+
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::_strnlen(const_str str, size_type maxLen)
+{
+    size_type len = 0;
+    if (str)
+    {
+        while (len < maxLen && *str != '\0')
+        {
+            len++;
+            str++;
+        }
+    }
+    return len;
+}
+
+template <class T>
+inline typename CryStringT<T>::const_str CryStringT<T>::_strchr(const_str str, value_type c)
+{
+    return (str == NULL) ? 0 : ::strchr(str, c);
+}
+
+template <>
+inline CryStringT<wchar_t>::const_str CryStringT<wchar_t>::_strchr(const_str str, value_type c)
+{
+    return (str == NULL) ? 0 : ::wcschr(str, c);
+}
+
+template <class T>
+inline typename CryStringT<T>::const_str CryStringT<T>::_strrchr(const_str str, value_type c)
+{
+    return (str == NULL) ? 0 : ::strrchr(str, c);
+}
+
+template <>
+inline CryStringT<wchar_t>::const_str CryStringT<wchar_t>::_strrchr(const_str str, value_type c)
+{
+    return (str == NULL) ? 0 : ::wcsrchr(str, c);
+}
+
+template <class T>
+inline typename CryStringT<T>::value_type * CryStringT<T>::_strstr(value_type * str, const_str strSearch)
+{
+    return (str == NULL) ? 0 : (value_type*)::strstr(str, strSearch);
+}
+
+template <>
+inline CryStringT<wchar_t>::value_type * CryStringT<wchar_t>::_strstr(value_type * str, const_str strSearch)
+{
+    return (str == NULL) ? 0 : ::wcsstr(str, strSearch);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_copy(value_type* dest, const value_type* src, size_type count)
+{
+    if (dest != src)
+    {
+        memcpy(dest, src, count * sizeof(value_type));
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_move(value_type* dest, const value_type* src, size_type count)
+{
+    memmove(dest, src, count * sizeof(value_type));
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_set(value_type* dest, value_type ch, size_type count)
+{
+    static_assert(sizeof(value_type) == sizeof(T));
+    static_assert(sizeof(value_type) == 1);
+    memset(dest, ch, count);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <>
+inline void CryStringT<wchar_t>::_set(value_type* dest, value_type ch, size_type count)
+{
+    static_assert(sizeof(value_type) == sizeof(wchar_t));
+    wmemset(dest, ch, count);
+}
+
+#if defined(WIN32) || defined(WIN64)
+
+template<>
+inline int CryStringT<char>::_vscpf(const_str format, va_list args)
+{
+    return _vscprintf(format, args);
+}
+
+template<>
+inline int CryStringT<wchar_t>::_vscpf(const_str format, va_list args)
+{
+    return _vscwprintf(format, args);
+}
+
+template<>
+inline int CryStringT<char>::_vsnpf(value_type* buf, int cnt, const_str format, va_list args)
+{
+    return azvsnprintf(buf, cnt, format, args);
+}
+
+template<>
+inline int CryStringT<wchar_t>::_vsnpf(value_type* buf, int cnt, const_str format, va_list args)
+{
+    return azvsnwprintf(buf, cnt, format, args);
+}
+
+#else
+
+template<>
+inline int CryStringT<char>::_vsnpf(value_type* buf, int cnt, const_str format, va_list args)
+{
+    return vsnprintf(buf, cnt, format, args);
+}
+
+template<>
+inline int CryStringT<wchar_t>::_vsnpf(value_type* buf, int cnt, const_str format, va_list args)
+{
+    return vswprintf(buf, cnt, format, args);
+}
+
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline bool CryStringT<T>::_IsValidString(const_str)
+{
+    /*
+    if (str == NULL)
+        return false;
+    int nLength = _strlen(str);
+    return !::IsBadStringPtrA(str, nLength);
+    */
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_Assign(const_str sStr, size_type nLen)
+{
+    // Check if this string is shared (reference count greater then 1) or not enough capacity to store new string.
+    // Then allocate new string buffer.
+    if (_header()->nRefCount > 1 || nLen > capacity())
+    {
+        _Free();
+        _AllocData(nLen);
+    }
+    // Copy characters from new string to this buffer.
+    _copy(m_str, sStr, nLen);
+    // Set new length.
+    _header()->nLength = aznumeric_cast<int>(nLen);
+    // Make null terminated string.
+    m_str[nLen] = 0;
+    CRY_STRING_DEBUG(m_str)
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_Concatenate(const_str sStr1, size_type nLen1, const_str sStr2, size_type nLen2)
+{
+    size_type nLen = nLen1 + nLen2;
+
+    if (nLen1 * 2 > nLen)
+    {
+        nLen = nLen1 * 2;
+    }
+
+    if (nLen != 0)
+    {
+        if (nLen < 8)
+        {
+            nLen = 8;
+        }
+
+        _AllocData(nLen);
+        _copy(m_str, sStr1, nLen1);
+        _copy(m_str + nLen1, sStr2, nLen2);
+        _header()->nLength = aznumeric_cast<int>(nLen1 + nLen2);
+        m_str[nLen1 + nLen2] = 0;
+    }
+    CRY_STRING_DEBUG(m_str)
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_ConcatenateInPlace(const_str sStr, size_type nLen)
+{
+    if (nLen != 0)
+    {
+        // Check if this string is shared (reference count greater then 1) or not enough capacity to store new string.
+        // Then allocate new string buffer.
+        if (_header()->nRefCount > 1 || length() + nLen > capacity())
+        {
+            StrHeader* pOldData = _header();
+            _Concatenate(m_str, length(), sStr, nLen);
+            _FreeData(pOldData);
+        }
+        else
+        {
+            _copy(m_str + length(), sStr, nLen);
+            _header()->nLength = aznumeric_cast<int>(_header()->nLength + nLen);
+            m_str[_header()->nLength] = 0; // Make null terminated string.
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_MakeUnique()
+{
+    if (_header()->nRefCount > 1)
+    {
+        // If string is shared, make a copy of string buffer.
+        StrHeader* pOldData = _header();
+        // This will not free header because reference count is greater then 1.
+        _Free();
+        // Allocate a new string buffer.
+        _AllocData(pOldData->nLength);
+        // Full copy of null terminated string.
+        _copy(m_str, pOldData->GetChars(), pOldData->nLength + 1);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_Initialize()
+{
+    m_str = _emptyHeader()->GetChars();
+}
+
+// always allocate one extra character for '\0' termination
+// assumes [optimistically] that data length will equal allocation length
+template <class T>
+inline void CryStringT<T>::_AllocData(size_type nLen)
+{
+    AZ_Assert(nLen <= (std::numeric_limits<int>::max)() - 1, "New string allocation size %zu is greater than the max allowed size of %d",
+        nLen, (std::numeric_limits<int>::max)() - 1);    // max size (enough room for 1 extra)
+
+    if (nLen == 0)
+    {
+        _Initialize();
+    }
+    else
+    {
+        size_type allocLen = sizeof(StrHeader) + (nLen + 1) * sizeof(value_type);
+
+        StrHeader* pData = (StrHeader*)azmalloc(allocLen, 32, CryStringAllocator);
+
+        _usedMemory(allocLen);   // For statistics.
+        pData->nRefCount = 1;
+        m_str = pData->GetChars();
+        pData->nLength = aznumeric_cast<int>(nLen);
+        pData->nAllocSize = aznumeric_cast<int>(nLen);
+        m_str[nLen] = 0; // null terminated string.
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_Free()
+{
+    if (_header()->nRefCount >= 0) // Not empty string.
+    {
+        _FreeData(_header());
+        _Initialize();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::_FreeData(StrHeader* pData)
+{
+    //Cry uses -1 to represent strings on the stack. 
+    if (pData->nRefCount < 0)
+    {
+        return;
+    }
+
+    if (pData->nRefCount == 0 || pData->Release() <= 0)
+    {
+        azfree((void*)pData, CryStringAllocator);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>::CryStringT()
+{
+    _Initialize();
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>::CryStringT(const CryStringT<T>& str)
+{
+    AZ_Assert(str._header()->nRefCount != 0, "Reference count input cry string should be greater than 0");
+    if (str._header()->nRefCount >= 0)
+    {
+        m_str = str.m_str;
+        _header()->AddRef();
+    }
+    else
+    {
+        _Initialize();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>::CryStringT(const CryStringT<T>& str, size_type nOff, size_type nCount)
+{
+    _Initialize();
+    assign(str, nOff, nCount);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>::CryStringT(const_str str)
+{
+    _Initialize();
+    // Make a copy of C string.
+    size_type nLen = _strlen(str);
+    if (nLen != 0)
+    {
+        _AllocData(nLen);
+        _copy(m_str, str, nLen);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+template <class T>
+inline CryStringT<T>::CryStringT(const CConstCharWrapper& str)
+{
+    _Initialize();
+    m_str = const_cast<pointer>(str.GetCharPointer());
+}
+
+template<class T>
+template<size_t AnySize>
+inline CryStringT<T>::CryStringT(const CryStackStringT<T, AnySize>& str)
+{
+    _Initialize();
+    const size_type nLength = str.length();
+    if (nLength > 0)
+    {
+        _AllocData(nLength);
+        _copy(m_str, str, nLength);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>::CryStringT(const_str str, size_type nLength)
+{
+    _Initialize();
+    if (nLength > 0)
+    {
+        _AllocData(nLength);
+        _copy(m_str, str, nLength);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>::CryStringT(size_type nRepeat, value_type ch)
+{
+    _Initialize();
+    if (nRepeat > 0)
+    {
+        _AllocData(nRepeat);
+        _set(m_str, ch, nRepeat);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>::CryStringT(const_iterator _First, const_iterator _Last)
+{
+    _Initialize();
+    size_type nLength = (size_type)(_Last - _First);
+    if (nLength > 0)
+    {
+        _AllocData(nLength);
+        _copy(m_str, _First, nLength);
+        CRY_STRING_DEBUG(m_str)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>::~CryStringT()
+{
+    _FreeData(_header());
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::length() const
+{
+    return _header()->nLength;
+}
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::size() const
+{
+    return _header()->nLength;
+}
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::capacity() const
+{
+    return _header()->nAllocSize;
+}
+
+template <class T>
+inline bool CryStringT<T>::empty() const
+{
+    return length() == 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::clear()
+{
+    if (length() == 0)
+    {
+        return;
+    }
+    if (_header()->nRefCount >= 0)
+    {
+        _Free();
+    }
+    else
+    {
+        resize(0);
+    }
+    AZ_Assert(length() == 0, "Cleared string should have a length of 0");
+    AZ_Assert(_header()->nRefCount < 0 || capacity() == 0,
+        "Cleared string should have a reference count or capacity of 0");
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::reserve(size_type nCount)
+{
+    // Reserve of 0 is shrinking container to fit number of characters in it..
+    if (nCount > capacity())
+    {
+        StrHeader* pOldData = _header();
+        _AllocData(nCount);
+        _copy(m_str, pOldData->GetChars(), pOldData->nLength);
+        _header()->nLength = pOldData->nLength;
+        m_str[pOldData->nLength] = 0;
+        _FreeData(pOldData);
+    }
+    else if (nCount == 0)
+    {
+        if (length() != capacity())
+        {
+            StrHeader* pOldData = _header();
+            _AllocData(length());
+            _copy(m_str, pOldData->GetChars(), pOldData->nLength);
+            _FreeData(pOldData);
+        }
+    }
+    CRY_STRING_DEBUG(m_str)
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::append(const_str _Ptr)
+{
+    *this += _Ptr;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::append(const_str _Ptr, size_type nCount)
+{
+    _ConcatenateInPlace(_Ptr, nCount);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::append(const CryStringT<T>& _Str, size_type off, size_type nCount)
+{
+    size_type len = _Str.length();
+    if (off > len)
+    {
+        return *this;
+    }
+    if (off + nCount > len)
+    {
+        nCount = len - off;
+    }
+    _ConcatenateInPlace(_Str.m_str + off, nCount);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::append(const CryStringT<T>& _Str)
+{
+    *this += _Str;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::append(size_type nCount, value_type _Ch)
+{
+    if (nCount > 0)
+    {
+        if (_header()->nRefCount > 1 || length() + nCount > capacity())
+        {
+            StrHeader* pOldData = _header();
+            _AllocData(length() + nCount);
+            _copy(m_str, pOldData->GetChars(), pOldData->nLength);
+            _set(m_str + pOldData->nLength, _Ch, nCount);
+            _FreeData(pOldData);
+        }
+        else
+        {
+            size_type nOldLength = length();
+            _set(m_str + nOldLength, _Ch, nCount);
+            _header()->nLength = aznumeric_cast<int>(nOldLength + nCount);
+            m_str[length()] = 0; // Make null terminated string.
+        }
+    }
+    CRY_STRING_DEBUG(m_str)
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::append(const_iterator _First, const_iterator _Last)
+{
+    append(_First, (size_type)(_Last - _First));
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::assign(const_str _Ptr)
+{
+    *this = _Ptr;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::assign(const_str _Ptr, size_type nCount)
+{
+    size_type len = _strnlen(_Ptr, nCount);
+    _Assign(_Ptr, len);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::assign(const CryStringT<T>& _Str, size_type off, size_type nCount)
+{
+    size_type len = _Str.length();
+    if (off > len)
+    {
+        return *this;
+    }
+    if (off + nCount > len)
+    {
+        nCount = len - off;
+    }
+    _Assign(_Str.m_str + off, nCount);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::assign(const CryStringT<T>& _Str)
+{
+    *this = _Str;
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::assign(size_type nCount, value_type _Ch)
+{
+    if (nCount >= 1)
+    {
+        _AllocData(nCount);
+        _set(m_str, _Ch, nCount);
+        CRY_STRING_DEBUG(m_str)
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::assign(const_iterator _First, const_iterator _Last)
+{
+    assign(_First, (size_type)(_Last - _First));
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::value_type CryStringT<T>::at(size_type index) const
+{
+    AZ_Assert(index >= 0 && index < length(), "index into CryString is out of range");
+    return m_str[index];
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline int CryStringT<T>::compare(const CryStringT<T>& _Str) const
+{
+    return compare(_Str.m_str);
+}
+
+template <class T>
+inline int CryStringT<T>::compare(size_type _Pos1, size_type _Num1, const CryStringT<T>& _Str) const
+{
+    return compare(_Pos1, _Num1, _Str.m_str, npos);
+}
+
+template <class T>
+inline int CryStringT<T>::compare(size_type _Pos1, size_type _Num1, const CryStringT<T>& _Str, size_type nOff, size_type nCount) const
+{
+    AZ_Assert(nOff < _Str.length(), "Offset into input string is larger than the index range");
+    return compare(_Pos1, _Num1, _Str.m_str + nOff, nCount);
+}
+
+template <class T>
+inline int CryStringT<T>::compare(const char* _Ptr) const
+{
+    return strcmp(m_str, _Ptr);
+}
+
+template <class T>
+inline int CryStringT<T>::compare(const wchar_t* _Ptr) const
+{
+    return wcscmp(m_str, _Ptr);
+}
+
+template <class T>
+inline int CryStringT<T>::compare(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2) const
+{
+    AZ_Assert(_Pos1 < length(), "position index to compare is larger than the length of this string");
+    if (length() - _Pos1 < _Num1)
+    {
+        _Num1 = length() - _Pos1; // trim to size
+    }
+    int res = _Num1 == 0 ? 0 : strncmp(m_str + _Pos1, _Ptr, (_Num1 < _Num2) ? _Num1 : _Num2);
+    return (res != 0 ? res : _Num2 == npos && _Ptr[_Num1] == 0 ? 0 : _Num1 < _Num2 ? -1 : _Num1 == _Num2 ? 0 : +1);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline int CryStringT<T>::compareNoCase(const CryStringT<T>& _Str) const
+{
+    return _stricmp(m_str, _Str.m_str);
+}
+
+template <class T>
+inline int CryStringT<T>::compareNoCase(size_type _Pos1, size_type _Num1, const CryStringT<T>& _Str) const
+{
+    return compareNoCase(_Pos1, _Num1, _Str.m_str, npos);
+}
+
+template <class T>
+inline int CryStringT<T>::compareNoCase(size_type _Pos1, size_type _Num1, const CryStringT<T>& _Str, size_type nOff, size_type nCount) const
+{
+    AZ_Assert(nOff < _Str.length(), "offset to start comparison within input string is larger than the string index range");
+    return compareNoCase(_Pos1, _Num1, _Str.m_str + nOff, nCount);
+}
+
+template <class T>
+inline int CryStringT<T>::compareNoCase(const value_type* _Ptr) const
+{
+    return _stricmp(m_str, _Ptr);
+}
+
+template <class T>
+inline int CryStringT<T>::compareNoCase(size_type _Pos1, size_type _Num1, const value_type* _Ptr, size_type _Num2) const
+{
+    AZ_Assert(_Pos1 < length(), "Position to start case-insensitive search is larger the indexable range");
+    if (length() - _Pos1 < _Num1)
+    {
+        _Num1 = length() - _Pos1; // trim to size
+    }
+    int res = _Num1 == 0 ? 0 : _strnicmp(m_str + _Pos1, _Ptr, (_Num1 < _Num2) ? _Num1 : _Num2);
+    return (res != 0 ? res : _Num2 == npos && _Ptr[_Num1] == 0 ? 0 : _Num1 < _Num2 ? -1 : _Num1 == _Num2 ? 0 : +1);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::copy(value_type* _Ptr, size_type nCount, size_type nOff) const
+{
+    AZ_Assert(nOff < length(), "Offset to copy from string to output address is outside the indexable range");
+    if (nCount < 0)
+    {
+        nCount = 0;
+    }
+    if (nOff + nCount > length()) // trim to offset.
+    {
+        nCount = length() - nOff;
+    }
+
+    _copy(_Ptr, m_str + nOff, nCount);
+    return nCount;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::resize(size_type nCount, value_type _Ch)
+{
+    _MakeUnique();
+    if (nCount > length())
+    {
+        size_type numToAdd = nCount - length();
+        append(numToAdd, _Ch);
+    }
+    else if (nCount < length())
+    {
+        _header()->nLength = nCount;
+        m_str[length()] = 0; // Make null terminated string.
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+//! compare helpers
+template <class T>
+inline bool operator==(const CryStringT<T>& s1, const CryStringT<T>& s2)
+{ return s1.compare(s2) == 0; }
+template <class T>
+inline bool operator==(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
+{ return s1.compare(s2) == 0; }
+template <class T>
+inline bool operator==(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
+{ return s2.compare(s1) == 0; }
+template <class T>
+inline bool operator!=(const CryStringT<T>& s1, const CryStringT<T>& s2)
+{ return s1.compare(s2) != 0; }
+template <class T>
+inline bool operator!=(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
+{ return s1.compare(s2) != 0; }
+template <class T>
+inline bool operator!=(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
+{ return s2.compare(s1) != 0; }
+template <class T>
+inline bool operator<(const CryStringT<T>& s1, const CryStringT<T>& s2)
+{ return s1.compare(s2) < 0; }
+template <class T>
+inline bool operator<(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
+{ return s1.compare(s2) < 0; }
+template <class T>
+inline bool operator<(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
+{ return s2.compare(s1) > 0; }
+template <class T>
+inline bool operator>(const CryStringT<T>& s1, const CryStringT<T>& s2)
+{ return s1.compare(s2) > 0; }
+template <class T>
+inline bool operator>(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
+{ return s1.compare(s2) > 0; }
+template <class T>
+inline bool operator>(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
+{ return s2.compare(s1) < 0; }
+template <class T>
+inline bool operator<=(const CryStringT<T>& s1, const CryStringT<T>& s2)
+{ return s1.compare(s2) <= 0; }
+template <class T>
+inline bool operator<=(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
+{ return s1.compare(s2) <= 0; }
+template <class T>
+inline bool operator<=(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
+{ return s2.compare(s1) >= 0; }
+template <class T>
+inline bool operator>=(const CryStringT<T>& s1, const CryStringT<T>& s2)
+{ return s1.compare(s2) >= 0; }
+template <class T>
+inline bool operator>=(const CryStringT<T>& s1, const typename CryStringT<T>::value_type* s2)
+{ return s1.compare(s2) >= 0; }
+template <class T>
+inline bool operator>=(const typename CryStringT<T>::value_type* s1, const CryStringT<T>& s2)
+{ return s2.compare(s1) <= 0; }
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::operator=(value_type ch)
+{
+    _Assign(&ch, 1);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T> operator+(const CryStringT<T>& string1, typename CryStringT<T>::value_type ch)
+{
+    CryStringT<T> s(string1);
+    s.append(1, ch);
+    return s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T> operator+(typename CryStringT<T>::value_type ch, const CryStringT<T>& str)
+{
+    CryStringT<T> s;
+    s.reserve(str.size() + 1);
+    s.append(1, ch);
+    s.append(str);
+    return s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T> operator+(const CryStringT<T>& string1, const CryStringT<T>& string2)
+{
+    CryStringT<T> s(string1);
+    s.append(string2);
+    return s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T> operator+(const CryStringT<T>& str1, const typename CryStringT<T>::value_type* str2)
+{
+    CryStringT<T> s(str1);
+    s.append(str2);
+    return s;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T> operator+(const typename CryStringT<T>::value_type* str1, const CryStringT<T>& str2)
+{
+    AZ_Assert(str1 == nullptr || CryStringT<T>::_IsValidString(str1), "Input string is not valid");
+    CryStringT<T> s;
+    s.reserve(CryStringT<T>::_strlen(str1) + str2.size());
+    s.append(str1);
+    s.append(str2);
+    return s;
+}
+
+template <class T>
+inline CryStringT<T>& CryStringT<T>::operator=(const CryStringT<T>& str)
+{
+    if (m_str != str.m_str)
+    {
+        if (_header()->nRefCount < 0)
+        {
+            // Empty string.
+            //          _Assign( str.m_str,str.length() );
+            if (str._header()->nRefCount < 0)
+            {
+                ; // two empty strings...
+            }
+            else
+            {
+                m_str = str.m_str;
+                _header()->AddRef();
+            }
+        }
+        else if (str._header()->nRefCount < 0)
+        {
+            // If source string is empty.
+            _Free();
+            m_str = str.m_str;
+        }
+        else
+        {
+            // Copy string reference.
+            _Free();
+            m_str = str.m_str;
+            _header()->AddRef();
+        }
+    }
+    return *this;
+}
+
+template <class T>
+inline CryStringT<T>& CryStringT<T>::operator=(const_str str)
+{
+    AZ_Assert(str == nullptr || _IsValidString(str), "Input string is not valid");
+    _Assign(str, _strlen(str));
+    return *this;
+}
+
+template <class T>
+inline CryStringT<T>& CryStringT<T>::operator+=(const_str str)
+{
+    AZ_Assert(str == nullptr || _IsValidString(str), "Input string is not valid");
+    _ConcatenateInPlace(str, _strlen(str));
+    return *this;
+}
+
+template <class T>
+inline CryStringT<T>& CryStringT<T>::operator+=(value_type ch)
+{
+    _ConcatenateInPlace(&ch, 1);
+    return *this;
+}
+
+template <class T>
+inline CryStringT<T>& CryStringT<T>::operator+=(const CryStringT<T>& str)
+{
+    _ConcatenateInPlace(str.m_str, str.length());
+    return *this;
+}
+
+//! find first single character
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find(value_type ch, size_type pos) const
+{
+    if (!(pos >= 0 && pos <= length()))
+    {
+        return (typename CryStringT<T>::size_type)npos;
+    }
+    const_str str = _strchr(m_str + pos, ch);
+    // return npos if not found and index otherwise
+    return (str == NULL) ? npos : (size_type)(str - m_str);
+}
+
+//! find a sub-string (like strstr)
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find(const_str subs, size_type pos) const
+{
+    AZ_Assert(_IsValidString(subs), "Input string is not valid");
+    if (!(pos >= 0 && pos <= length()))
+    {
+        return npos;
+    }
+
+    // find first matching substring
+    const_str str = _strstr(m_str + pos, subs);
+
+    // return npos for not found, distance from beginning otherwise
+    return (str == NULL) ? npos : (size_type)(str - m_str);
+}
+
+//! find last single character
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::rfind(value_type ch, size_type pos) const
+{
+    const_str str;
+    if (pos == npos)
+    {
+        // find last single character
+        str = _strrchr(m_str, ch);
+        // return -1 if not found, distance from beginning otherwise
+        return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
+    }
+    else
+    {
+        if (pos == npos)
+        {
+            pos = length();
+        }
+        if (!(pos >= 0 && pos <= length()))
+        {
+            return npos;
+        }
+
+        value_type tmp = m_str[pos + 1];
+        m_str[pos + 1] = 0;
+        str = _strrchr(m_str, ch);
+        m_str[pos + 1] = tmp;
+    }
+    // return -1 if not found, distance from beginning otherwise
+    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
+}
+
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::rfind(const CryStringT<T>& subs, size_type pos) const
+{
+    size_type res = npos;
+    for (int i = (int)size(); i >= (int)pos; --i)
+    {
+        size_type findRes = find(subs, i);
+        if (findRes != npos)
+        {
+            res = findRes;
+            break;
+        }
+    }
+    return res;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_first_of(const CryStringT<T>& _Str, size_type _Off) const
+{
+    return find_first_of(_Str.m_str, _Off);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_first_of(value_type _Ch, size_type nOff) const
+{
+    if (!(nOff >= 0 && nOff <= length()))
+    {
+        return npos;
+    }
+    value_type charSet[2] = { _Ch, 0 };
+    const_str str = strpbrk(m_str + nOff, charSet);
+    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_first_of(const_str charSet, size_type nOff) const
+{
+    AZ_Assert(_IsValidString(charSet), "input c-string must not be nullptr");
+    if (!(nOff >= 0 && nOff <= length()))
+    {
+        return npos;
+    }
+    const_str str = strpbrk(m_str + nOff, charSet);
+    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
+}
+
+template <>
+inline CryStringT<wchar_t>::size_type CryStringT<wchar_t>::find_first_of(const_str charSet, size_type nOff) const
+{
+    AZ_Assert(_IsValidString(charSet), "input c-string must not be nullptr");
+    if (!(nOff >= 0 && nOff <= length()))
+    {
+        return npos;
+    }
+    const_str str = wcspbrk(m_str + nOff, charSet);
+    return (str == NULL) ? (size_type) - 1 : (size_type)(str - m_str);
+}
+
+//size_type find_first_not_of(const _Self& __s, size_type __pos = 0) const
+//{ return find_first_not_of(__s._M_start, __pos, __s.size()); }
+
+//size_type find_first_not_of(const _CharT* __s, size_type __pos = 0) const
+//{ _STLP_FIX_LITERAL_BUG(__s) return find_first_not_of(__s, __pos, _Traits::length(__s)); }
+
+//size_type find_first_not_of(const _CharT* __s, size_type __pos,   size_type __n) const;
+
+//size_type find_first_not_of(_CharT __c, size_type __pos = 0) const;
+
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_first_not_of(const value_type* _Ptr, size_type _Off) const
+{ return find_first_not_of(_Ptr, _Off, _strlen(_Ptr)); }
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_first_not_of(const CryStringT<T>& _Str, size_type _Off) const
+{ return find_first_not_of(_Str.m_str, _Off); }
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_first_not_of(value_type _Ch, size_type _Off) const
+{
+    if (_Off > length())
+    {
+        return npos;
+    }
+    else
+    {
+        for (const value_type* str = begin() + _Off; str != end(); ++str)
+        {
+            if (*str != _Ch)
+            {
+                return size_type(str - begin()); // Character found!
+            }
+        }
+        return npos;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_first_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const
+{
+    if (_Off > length())
+    {
+        return npos;
+    }
+    else
+    {
+        const value_type* charsFirst = _Ptr, * charsLast = _Ptr + _Count;
+        for (const value_type* str = begin() + _Off; str != end(); ++str)
+        {
+            const value_type* c;
+            for (c = charsFirst; c != charsLast; ++c)
+            {
+                if (*c == *str)
+                {
+                    break;
+                }
+            }
+            if (c == charsLast)
+            {
+                return size_type(str - begin());// Current character not in char set.
+            }
+        }
+        return npos;
+    }
+}
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_last_of(value_type _Ch, size_type _Off) const
+{
+    size_type nLenght(length());
+    // Empty strings, always return npos (same semantic as std::string).
+    if (nLenght == 0)
+    {
+        return npos;
+    }
+
+    // If the offset is is bigger than the size of the string
+    if (_Off >= nLenght)
+    {
+        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
+        // test the null terminating character.
+        _Off = nLenght - 1;
+    }
+
+    // From the character at the offset position, going to to the direction of the first character.
+    for (const value_type* str = begin() + _Off; true; --str)
+    {
+        // We found a character in the string which matches the input character.
+        if (*str == _Ch)
+        {
+            return size_type(str - begin()); // Character found!
+        }
+        // If the next element will be begin()-1, then we should stop.
+        if (str == begin())
+        {
+            break;
+        }
+    }
+
+    // We found nothing.
+    return npos;
+}
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_last_of(const value_type* _Ptr, size_type _Off) const
+{
+    // This function is actually a convenience alias...
+    // BTW: what will happeb if wchar_t is used here?
+    return find_last_of(_Ptr, _Off, _strlen(_Ptr));
+}
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_last_of(const value_type* _Ptr, size_type _Off, size_type _Count) const
+{
+    size_type nLenght(length());
+    // Empty strings, always return npos (same semantic as std::string).
+    if (nLenght == 0)
+    {
+        return npos;
+    }
+
+    // If the offset is is bigger than the size of the string
+    if (_Off >= nLenght)
+    {
+        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
+        // test the null terminating character.
+        _Off = nLenght - 1;
+    }
+
+    // From the character at the offset position, going to to the direction of the first character.
+    const value_type* charsFirst = _Ptr, * charsLast = _Ptr + _Count;
+    for (const value_type* str = begin() + _Off; true; --str)
+    {
+        const value_type* c;
+        // For every character in the character set.
+        for (c = charsFirst; c != charsLast; ++c)
+        {
+            // If the current character matches any of the charcaters in the input string...
+            if (*c == *str)
+            {
+                // This is the value we must return.
+                return size_type(str - begin());
+            }
+        }
+
+        // If the next element will be begin()-1, then we should stop.
+        if (str == begin())
+        {
+            break;
+        }
+    }
+    // We couldn't find any character of the input string in the current string.
+    return npos;
+}
+/////////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_last_of(const _Self& strCharSet, size_type _Off) const
+{
+    size_type nLenght(length());
+    // Empty strings, always return npos (same semantic as std::string).
+    if (nLenght == 0)
+    {
+        return npos;
+    }
+
+    // If the offset is is bigger than the size of the string
+    if (_Off >= nLenght)
+    {
+        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
+        // test the null terminating character.
+        _Off = nLenght - 1;
+    }
+
+
+    // From the character at the offset position, going to to the direction of the first character.
+    for (const value_type* str = begin() + _Off; true; --str)
+    {
+        // We check every character of the input string.
+        for (const value_type* strInputCharacter = strCharSet.begin(); strInputCharacter != strCharSet.end(); ++strInputCharacter)
+        {
+            // If any character matches.
+            if (*str == *strInputCharacter)
+            {
+                // We return the position where we found it.
+                return size_type(str - begin()); // Character found!
+            }
+        }
+        // If the next element will be begin()-1, then we should stop.
+        if (str == begin())
+        {
+            break;
+        }
+    }
+
+    // As we couldn't find any matching character...we return the appropriate value.
+    return npos;
+}
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_last_not_of(value_type _Ch, size_type _Off) const
+{
+    size_type nLenght(length());
+    // Empty strings, always return npos (same semantic as std::string).
+    if (nLenght == 0)
+    {
+        return npos;
+    }
+
+    // If the offset is is bigger than the size of the string
+    if (_Off >= nLenght)
+    {
+        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
+        // test the null terminating character.
+        _Off = nLenght - 1;
+    }
+
+
+    // From the character at the offset position, going to to the direction of the first character.
+    for (const value_type* str = begin() + _Off; true; --str)
+    {
+        // If the current character being analyzed is different of the input character.
+        if (*str != _Ch)
+        {
+            // We found the last item which is not the input character before the given offset.
+            return size_type(str - begin()); // Character found!
+        }
+        // If the next element will be begin()-1, then we should stop.
+        if (str == begin())
+        {
+            break;
+        }
+    }
+
+    // As we couldn't find any matching character...we return the appropriate value.
+    return npos;
+}
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_last_not_of(const value_type* _Ptr, size_type _Off) const
+{
+    // This function is actually a convenience alias...
+    // BTW: what will happeb if wchar_t is used here?
+    return find_last_not_of(_Ptr, _Off, _strlen(_Ptr));
+}
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_last_not_of(const value_type* _Ptr, size_type _Off, size_type _Count) const
+{
+    size_type nLenght(length());
+    // Empty strings, always return npos (same semantic as std::string).
+    if (nLenght == 0)
+    {
+        return npos;
+    }
+
+    // If the offset is is bigger than the size of the string
+    if (_Off >= nLenght)
+    {
+        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
+        // test the null terminating character.
+        _Off = nLenght - 1;
+    }
+
+
+    // From the character at the offset position, going to to the direction of the first character.
+    const value_type* charsFirst = _Ptr, * charsLast = _Ptr + _Count;
+    for (const value_type* str = begin() + _Off; true; --str)
+    {
+        bool boFoundAny(false);
+        const value_type* c;
+        // For every character in the character set.
+        for (c = charsFirst; c != charsLast; ++c)
+        {
+            // If the current character matches any of the charcaters in the input string...
+            if (*c == *str)
+            {
+                // So we signal it was found and stop this search.
+                boFoundAny = true;
+                break;
+            }
+        }
+
+        // Using a different solution of the other similar methods
+        // to make it easier to read.
+        // If the character being analyzed is not in the set...
+        if (!boFoundAny)
+        {
+            //.. we return the position where we found it.
+            return size_type(str - begin());
+        }
+
+        // If the next element will be begin()-1, then we should stop.
+        if (str == begin())
+        {
+            break;
+        }
+    }
+    // We couldn't find any character of the input string not in the character set.
+    return npos;
+}
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline typename CryStringT<T>::size_type CryStringT<T>::find_last_not_of(const _Self& _Str, size_type _Off) const
+{
+    size_type nLenght(length());
+    // Empty strings, always return npos (same semantic as std::string).
+    if (nLenght == 0)
+    {
+        return npos;
+    }
+
+    // If the offset is is bigger than the size of the string
+    if (_Off >= nLenght)
+    {
+        // We set it to the size of the string -1, so we will not do bad pointer operations nor we will
+        // test the null terminating character.
+        _Off = nLenght - 1;
+    }
+
+
+    // From the character at the offset position, going to to the direction of the first character.
+    for (const value_type* str = begin() + _Off; true; --str)
+    {
+        bool boFoundAny(false);
+        for (const value_type* strInputCharacter = _Str.begin(); strInputCharacter != _Str.end(); ++strInputCharacter)
+        {
+            // The character matched one of the character set...
+            if (*strInputCharacter == *str)
+            {
+                // So we signal it was found and stop this search.
+                boFoundAny = true;
+                break;
+            }
+        }
+
+        // Using a different solution of the other similar methods
+        // to make it easier to read.
+        // If the character being analyzed is not in the set...
+        if (!boFoundAny)
+        {
+            //.. we return the position where we found it.
+            return size_type(str - begin());
+        }
+
+        // If the next element will be begin()-1, then we should stop.
+        if (str == begin())
+        {
+            break;
+        }
+    }
+
+    // As we couldn't find any matching character...we return the appropriate value.
+    return npos;
+}
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T> CryStringT<T>::substr(size_type pos, size_type count) const
+{
+    if (pos >= length())
+    {
+        return CryStringT<T>();
+    }
+    if (count == npos)
+    {
+        count = length() - pos;
+    }
+    if (pos + count > length())
+    {
+        count = length() - pos;
+    }
+    return CryStringT<T>(m_str + pos, count);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::erase(size_type nIndex, size_type nCount)
+{
+    if (nIndex < 0)
+    {
+        nIndex = 0;
+    }
+    if (nCount < 0 || nCount > length() - nIndex)
+    {
+        nCount = length() - nIndex;
+    }
+    if (nCount > 0 && nIndex < length())
+    {
+        _MakeUnique();
+        size_type nNumToCopy = length() - (nIndex + nCount) + 1;
+        _move(m_str + nIndex, m_str + nIndex + nCount, nNumToCopy);
+        _header()->nLength = length() - nCount;
+    }
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::insert(size_type nIndex, value_type ch)
+{
+    return insert(nIndex, 1, ch);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::insert(size_type nIndex, size_type nCount, value_type ch)
+{
+    _MakeUnique();
+
+    if (nIndex < 0)
+    {
+        nIndex = 0;
+    }
+
+    size_type nNewLength = length();
+    if (nIndex > nNewLength)
+    {
+        nIndex = nNewLength;
+    }
+    nNewLength += nCount;
+
+    if (capacity() < nNewLength)
+    {
+        StrHeader* pOldData = _header();
+        const_str pstr = m_str;
+        _AllocData(nNewLength);
+        _copy(m_str, pstr, pOldData->nLength + 1);
+        _FreeData(pOldData);
+    }
+
+    _move(m_str + nIndex + nCount, m_str + nIndex, (nNewLength - nIndex - nCount) + 1);
+    _set(m_str + nIndex, ch, nCount);
+    _header()->nLength = nNewLength;
+    CRY_STRING_DEBUG(m_str)
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::insert(size_type nIndex, const_str pstr, size_type nCount)
+{
+    if (nIndex < 0)
+    {
+        nIndex = 0;
+    }
+
+    size_type nInsertLength = nCount;
+    size_type nNewLength = length();
+    if (nInsertLength > 0)
+    {
+        _MakeUnique();
+        if (nIndex > nNewLength)
+        {
+            nIndex = nNewLength;
+        }
+        nNewLength += nInsertLength;
+
+        if (capacity() < nNewLength)
+        {
+            StrHeader* pOldData = _header();
+            const_str pOldStr = m_str;
+            _AllocData(nNewLength);
+            _copy(m_str, pOldStr, (pOldData->nLength + 1));
+            _FreeData(pOldData);
+        }
+
+        _move(m_str + nIndex + nInsertLength, m_str + nIndex, (nNewLength - nIndex - nInsertLength + 1));
+        _copy(m_str + nIndex, pstr, nInsertLength);
+        _header()->nLength = nNewLength;
+        m_str[length()] = 0;
+    }
+    CRY_STRING_DEBUG(m_str)
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::insert(size_type nIndex, const_str pstr)
+{
+    return insert(nIndex, pstr, _strlen(pstr));
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::replace(size_type pos, size_type count, const_str strNew)
+{
+    return replace(pos, count, strNew, _strlen(strNew));
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::replace(size_type pos, size_type count, const_str strNew, size_type count2)
+{
+    erase(pos, count);
+    insert(pos, strNew, count2);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::replace(size_type pos, size_type count, size_type nNumChars, value_type chNew)
+{
+    erase(pos, count);
+    insert(pos, nNumChars, chNew);
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::replace(value_type chOld, value_type chNew)
+{
+    if (chOld != chNew)
+    {
+        _MakeUnique();
+        value_type* strend = m_str + length();
+        for (value_type* str = m_str; str != strend; ++str)
+        {
+            if (*str == chOld)
+            {
+                *str = chNew;
+            }
+        }
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::replace(const_str strOld, const_str strNew)
+{
+    size_type nSourceLen = _strlen(strOld);
+    if (nSourceLen == 0)
+    {
+        return *this;
+    }
+    size_type nReplacementLen = _strlen(strNew);
+
+    size_type nCount = 0;
+    value_type* strStart = m_str;
+    value_type* strEnd = m_str + length();
+    value_type* strTarget;
+    while (strStart < strEnd)
+    {
+        while ((strTarget = _strstr(strStart, strOld)) != NULL)
+        {
+            nCount++;
+            strStart = strTarget + nSourceLen;
+        }
+        strStart += _strlen(strStart) + 1;
+    }
+
+    if (nCount > 0)
+    {
+        _MakeUnique();
+
+        size_type nOldLength = length();
+        size_type nNewLength =  nOldLength + (nReplacementLen - nSourceLen) * nCount;
+        if (capacity() < nNewLength || _header()->nRefCount > 1)
+        {
+            StrHeader* pOldData = _header();
+            const_str pstr = m_str;
+            _AllocData(nNewLength);
+            _copy(m_str, pstr, pOldData->nLength);
+            _FreeData(pOldData);
+        }
+        strStart = m_str;
+        strEnd = m_str + length();
+
+        while (strStart < strEnd)
+        {
+            while ((strTarget = _strstr(strStart, strOld)) != NULL)
+            {
+                size_type nBalance = nOldLength - ((size_type)(strTarget - m_str) + nSourceLen);
+                _move(strTarget + nReplacementLen, strTarget + nSourceLen, nBalance);
+                _copy(strTarget, strNew, nReplacementLen);
+                strStart = strTarget + nReplacementLen;
+                strStart[nBalance] = 0;
+                nOldLength += (nReplacementLen - nSourceLen);
+            }
+            strStart += _strlen(strStart) + 1;
+        }
+        _header()->nLength = nNewLength;
+    }
+    CRY_STRING_DEBUG(m_str)
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline void CryStringT<T>::swap(CryStringT<T>& _Str)
+{
+    value_type* temp = _Str.m_str;
+    _Str.m_str = m_str;
+    m_str = temp;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::Format(const_str format, ...)
+{
+    AZ_Assert(_IsValidString(format), "format c-string must not be nullptr");
+
+#if defined(WIN32) || defined(WIN64)
+    va_list argList;
+    va_start(argList, format);
+    int n = _vscpf(format, argList);
+    if (n < 0)
+    {
+        n = 0;
+    }
+    resize(n);  //this will actually allocate n+1 elements to accommodate the null terminator
+    _vsnpf(m_str, n, format, argList);
+    va_end(argList);
+    return *this;
+#else
+    value_type temp[4096]; // Limited to 4096 characters!
+    va_list argList;
+    va_start(argList, format);
+    _vsnpf(temp, 4096, format, argList);
+    temp[4095] = '\0';
+    va_end(argList);
+    *this = temp;
+    return *this;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::MakeLower()
+{
+    _MakeUnique();
+    for (value_type* s = m_str; *s != 0; s++)
+    {
+        const value_type c = *s;
+        *s = (c >= 'A' && c <= 'Z') ? c - 'A' + 'a' : c; // ASCII only, standard "C" locale
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::MakeUpper()
+{
+    _MakeUnique();
+    for (value_type* s = m_str; *s != 0; s++)
+    {
+        const value_type c = *s;
+        *s = (c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c; // ASCII only, standard "C" locale
+    }
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::Trim()
+{
+    return TrimRight().TrimLeft();
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::Trim(value_type ch)
+{
+    _MakeUnique();
+    const value_type chset[2] = { ch, 0 };
+    return TrimRight(chset).TrimLeft(chset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::Trim(const value_type* sCharSet)
+{
+    _MakeUnique();
+    return TrimRight(sCharSet).TrimLeft(sCharSet);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::TrimRight(value_type ch)
+{
+    const value_type chset[2] = { ch, 0 };
+    return TrimRight(chset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::TrimRight(const value_type* sCharSet)
+{
+    if (!sCharSet || !(*sCharSet) || length() < 1)
+    {
+        return *this;
+    }
+
+    const value_type* last = m_str + length() - 1;
+    const value_type* str = last;
+    while ((str != m_str) && (_strchr(sCharSet, *str) != 0))
+    {
+        str--;
+    }
+
+    if (str != last)
+    {
+        // Just shrink length of the string.
+        size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
+        _MakeUnique();
+        _header()->nLength = nNewLength;
+        m_str[nNewLength] = 0;
+    }
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::TrimRight()
+{
+    if (length() < 1)
+    {
+        return *this;
+    }
+
+    const value_type* last = m_str + length() - 1;
+    const value_type* str = last;
+    while ((str != m_str) && (isspace((unsigned char)*str) != 0))
+    {
+        str--;
+    }
+
+    if (str != last)     // something changed?
+    {
+        // Just shrink length of the string.
+        size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
+        _MakeUnique();
+        _header()->nLength = nNewLength;
+        m_str[nNewLength] = 0;
+    }
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::TrimLeft(value_type ch)
+{
+    const value_type chset[2] = { ch, 0 };
+    return TrimLeft(chset);
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::TrimLeft(const value_type* sCharSet)
+{
+    if (!sCharSet || !(*sCharSet))
+    {
+        return *this;
+    }
+
+    const value_type* str = m_str;
+    while ((*str != 0) && (_strchr(sCharSet, *str) != 0))
+    {
+        str++;
+    }
+
+    if (str != m_str)
+    {
+        size_type nOff = (size_type)(str - m_str); // m_str can change in _MakeUnique
+        _MakeUnique();
+        size_type nNewLength = length() - nOff;
+        _move(m_str, m_str + nOff, nNewLength + 1);
+        _header()->nLength = nNewLength;
+        m_str[nNewLength] = 0;
+    }
+
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T>& CryStringT<T>::TrimLeft()
+{
+    const value_type* str = m_str;
+    while ((*str != 0) && (isspace((unsigned char)*str) != 0))
+    {
+        str++;
+    }
+
+    if (str != m_str)
+    {
+        size_type nOff = (size_type)(str - m_str); // m_str can change in _MakeUnique
+        _MakeUnique();
+        size_type nNewLength = length() - nOff;
+        _move(m_str, m_str + nOff, nNewLength + 1);
+        _header()->nLength = nNewLength;
+        m_str[nNewLength] = 0;
+    }
+
+    return *this;
+}
+
+template <class T>
+inline CryStringT<T> CryStringT<T>::Right(size_type count) const
+{
+    if (count == npos)
+    {
+        return CryStringT<T>();
+    }
+    else if (count > length())
+    {
+        return *this;
+    }
+
+    return CryStringT<T>(m_str + length() - count, count);
+}
+
+template <class T>
+inline CryStringT<T> CryStringT<T>::Left(size_type count) const
+{
+    if (count == npos)
+    {
+        return CryStringT<T>();
+    }
+    else if (count > length())
+    {
+        count = length();
+    }
+
+    return CryStringT<T>(m_str, count);
+}
+
+// strspn equivalent
+template <class T>
+inline CryStringT<T> CryStringT<T>::SpanIncluding(const_str charSet) const
+{
+    AZ_Assert(_IsValidString(charSet), "input c-string must not be nullptr");
+    return Left((size_type)strspn(m_str, charSet));
+}
+
+// strcspn equivalent
+template <class T>
+inline CryStringT<T> CryStringT<T>::SpanExcluding(const_str charSet) const
+{
+    AZ_Assert(_IsValidString(charSet), "input c-string must not be nullptr");
+    return Left((size_type)strcspn(m_str, charSet));
+}
+
+//////////////////////////////////////////////////////////////////////////
+template <class T>
+inline CryStringT<T> CryStringT<T>::Tokenize(const_str charSet, int& nStart) const
+{
+    if (nStart < 0)
+    {
+        return CryStringT<T>();
+    }
+
+    if (!charSet)
+    {
+        return *this;
+    }
+
+    const_str sPlace = m_str + nStart;
+    const_str sEnd = m_str + length();
+    if (sPlace < sEnd)
+    {
+        int nIncluding = (int)strspn(sPlace, charSet);
+
+        if ((sPlace + nIncluding) < sEnd)
+        {
+            sPlace += nIncluding;
+            int nExcluding = (int)strcspn(sPlace, charSet);
+            int nFrom = nStart + nIncluding;
+            nStart = nFrom + nExcluding + 1;
+
+            return substr(nFrom, nExcluding);
+        }
+    }
+    // Return empty string.
+    nStart = -1;
+    return CryStringT<T>();
+}
+
+//////////////////////////////////////////////////////////////////////////
+// This code prevents std::string compiling in Win32 with STLPort
+//////////////////////////////////////////////////////////////////////////
+#if defined(WIN32) && !defined(WIN64) && defined(_STLP_BEGIN_NAMESPACE) && !defined(DONT_BAN_STD_STRING)
+#define CRYINCLUDE_STLP_STRING_FWD_H
+#define CRYINCLUDE_STLP_INTERNAL_STRING_H
+namespace std
+{
+    //const char* __get_c_string( const CryStringT<char> &str ) { return str.c_str(); };
+    class string
+    {
+        // std::string must not be used if CryString included.
+        // Use string instead.
+    };
+}
+//////////////////////////////////////////////////////////////////////////
+#endif // WIN64
+
+typedef CryStringT<char> string;
+typedef CryStringT<wchar_t> wstring;
+
+#else // !defined(NOT_USE_CRY_STRING)
+
+#include <string>  // STL string
+typedef std::string string;
+typedef std::wstring wstring;
+
+#endif // !defined(NOT_USE_CRY_STRING)
+
+namespace AZStd
+{
+    template <>
+    struct hash<::string>
+    {
+        typedef ::string   argument_type;
+        typedef size_t     result_type;
+        inline result_type operator()(const argument_type& value) const 
+        { 
+            return hash_string(value.c_str(), value.length());
+        }
+
+        static size_t hash_string(const char* str, size_t length)
+        {
+            size_t hash = 14695981039346656037ULL;
+            const size_t fnvPrime = 1099511628211ULL;
+            const char* cptr = str;
+            for (; length; --length)
+            {
+                hash ^= static_cast<size_t>(*cptr++);
+                hash *= fnvPrime;
+            }
+            return hash;
+        }
+    };
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYSTRING_H
diff --git a/Code/Legacy/CryCommon/CrySystemBus.h b/Code/Legacy/CryCommon/CrySystemBus.h
new file mode 100644
index 0000000000..3565e0f2c4
--- /dev/null
+++ b/Code/Legacy/CryCommon/CrySystemBus.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
+ *
+ */
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYSYSTEMBUS_H
+#define CRYINCLUDE_CRYCOMMON_CRYSYSTEMBUS_H
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+struct ISystem;
+struct SSystemInitParams;
+
+/*!
+ * Events from CrySystem
+ */
+class CrySystemEvents
+    : public AZ::EBusTraits
+{
+public:
+    //! ISystem has been created and is about to initialize.
+    virtual void OnCrySystemPreInitialize(ISystem&, const SSystemInitParams&) {}
+
+    //! ISystem and IConsole has been created but the cfg files have not been parsed
+    virtual void OnCrySystemCVarRegistry() {}
+
+    //! ISystem has been created and initialized.
+    virtual void OnCrySystemInitialized(ISystem&, const SSystemInitParams&) {}
+
+    //! In-Editor systems have been created and initialized.
+    virtual void OnCryEditorInitialized() {}
+
+    //! Editor has started a level export
+    virtual void OnCryEditorBeginLevelExport() {}
+
+    //! Editor has finished a level export
+    virtual void OnCryEditorEndLevelExport(bool /*success*/) {}
+
+    //! ISystem is about to begin shutting down
+    virtual void OnCrySystemShutdown(ISystem&) {}
+
+    //! ISystem has shut down.
+    virtual void OnCrySystemPostShutdown() {}
+
+    //! Sent when a new level is being created.
+    virtual void OnCryEditorBeginCreate() {}
+
+    //! Sent after a new level has been created.
+    virtual void OnCryEditorEndCreate() {}
+
+    //! Sent when a level is about to be loaded.
+    virtual void OnCryEditorBeginLoad() {}
+
+    //! Sent after a level has been loaded.
+    virtual void OnCryEditorEndLoad() {}
+
+    //! Sent when the document is about to close.
+    virtual void OnCryEditorCloseScene() {}
+
+    //! Sent when the document is closed.
+    virtual void OnCryEditorSceneClosed() {}
+};
+using CrySystemEventBus = AZ::EBus<CrySystemEvents>;
+
+/*!
+ * Requests to CrySystem
+ */
+class CrySystemRequests
+    : public AZ::EBusTraits
+{
+public:
+    //! Get CrySystem
+    virtual ISystem* GetCrySystem() = 0;
+};
+using CrySystemRequestBus = AZ::EBus<CrySystemRequests>;
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYSYSTEMBUS_H
diff --git a/Code/Legacy/CryCommon/CryThread.h b/Code/Legacy/CryCommon/CryThread.h
new file mode 100644
index 0000000000..b4e9df07d9
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryThread.h
@@ -0,0 +1,823 @@
+/*
+ * 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 : Public include file for the multi-threading API.
+
+
+#pragma once
+
+
+// Include basic multithread primitives.
+#include "MultiThread.h"
+#include "BitFiddling.h"
+#include <AzCore/std/string/string.h>
+//////////////////////////////////////////////////////////////////////////
+// Lock types:
+//
+// CRYLOCK_FAST
+//   A fast potentially (non-recursive) mutex.
+// CRYLOCK_RECURSIVE
+//   A recursive mutex.
+//////////////////////////////////////////////////////////////////////////
+enum CryLockType
+{
+    CRYLOCK_FAST = 1,
+    CRYLOCK_RECURSIVE = 2,
+};
+
+#define CRYLOCK_HAVE_FASTLOCK 1
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Primitive locks and conditions.
+//
+// Primitive locks are represented by instance of class CryLockT<Type>
+//
+//
+template<CryLockType Type>
+class CryLockT
+{
+    /* Unsupported lock type. */
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Typedefs.
+//////////////////////////////////////////////////////////////////////////
+typedef CryLockT<CRYLOCK_RECURSIVE>   CryCriticalSection;
+typedef CryLockT<CRYLOCK_FAST>        CryCriticalSectionNonRecursive;
+//////////////////////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////
+//
+// CryAutoCriticalSection implements a helper class to automatically
+// lock critical section in constructor and release on destructor.
+//
+//////////////////////////////////////////////////////////////////////////
+template<class LockClass>
+class CryAutoLock
+{
+private:
+    LockClass* m_pLock;
+
+    CryAutoLock();
+    CryAutoLock(const CryAutoLock<LockClass>&);
+    CryAutoLock<LockClass>& operator = (const CryAutoLock<LockClass>&);
+
+public:
+    CryAutoLock(LockClass& Lock)
+        : m_pLock(&Lock) { m_pLock->Lock(); }
+    CryAutoLock(const LockClass& Lock)
+        : m_pLock(const_cast<LockClass*>(&Lock)) { m_pLock->Lock(); }
+    ~CryAutoLock() { m_pLock->Unlock(); }
+};
+
+//////////////////////////////////////////////////////////////////////////
+//
+// CryOptionalAutoLock implements a helper class to automatically
+// lock critical section (if needed) in constructor and release on destructor.
+//
+//////////////////////////////////////////////////////////////////////////
+template<class LockClass>
+class CryOptionalAutoLock
+{
+private:
+    LockClass* m_Lock;
+    bool m_bLockAcquired;
+
+    CryOptionalAutoLock();
+    CryOptionalAutoLock(const CryOptionalAutoLock<LockClass>&);
+    CryOptionalAutoLock<LockClass>& operator = (const CryOptionalAutoLock<LockClass>&);
+
+public:
+    CryOptionalAutoLock(LockClass& Lock, bool acquireLock)
+        : m_Lock(&Lock)
+        , m_bLockAcquired(false)
+    {
+        if (acquireLock)
+        {
+            Acquire();
+        }
+    }
+    ~CryOptionalAutoLock()
+    {
+        Release();
+    }
+    void Release()
+    {
+        if (m_bLockAcquired)
+        {
+            m_Lock->Unlock();
+            m_bLockAcquired = false;
+        }
+    }
+    void Acquire()
+    {
+        if (!m_bLockAcquired)
+        {
+            m_Lock->Lock();
+            m_bLockAcquired = true;
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+//
+// CryAutoSet implements a helper class to automatically
+// set and reset value in constructor and release on destructor.
+//
+//////////////////////////////////////////////////////////////////////////
+template<class ValueClass>
+class CryAutoSet
+{
+private:
+    ValueClass* m_pValue;
+
+    CryAutoSet();
+    CryAutoSet(const CryAutoSet<ValueClass>&);
+    CryAutoSet<ValueClass>& operator = (const CryAutoSet<ValueClass>&);
+
+public:
+    CryAutoSet(ValueClass& value)
+        : m_pValue(&value) { *m_pValue = (ValueClass)1; }
+    ~CryAutoSet() { *m_pValue = (ValueClass)0; }
+};
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Auto critical section is the most commonly used type of auto lock.
+//
+//////////////////////////////////////////////////////////////////////////
+typedef CryAutoLock<CryCriticalSection> CryAutoCriticalSection;
+
+#define AUTO_LOCK_T(Type, lock) PREFAST_SUPPRESS_WARNING(6246); CryAutoLock<Type> __AutoLock(lock)
+#define AUTO_LOCK(lock)             AUTO_LOCK_T(CryCriticalSection, lock)
+#define AUTO_LOCK_CS(csLock) CryAutoCriticalSection __AL__##csLock(csLock)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Threads.
+
+// Base class for runnable objects.
+//
+// A runnable is an object with a Run() and a Cancel() method.  The Run()
+// method should perform the runnable's job.  The Cancel() method may be
+// called by another thread requesting early termination of the Run() method.
+// The runnable may ignore the Cancel() call, the default implementation of
+// Cancel() does nothing.
+class CryRunnable
+{
+public:
+    virtual ~CryRunnable() { }
+    virtual void Run() = 0;
+    virtual void Cancel() { }
+};
+
+// Class holding information about a thread.
+//
+// A reference to the thread information can be obtained by calling GetInfo()
+// on the CrySimpleThread (or derived class) instance.
+//
+// NOTE:
+// If the code is compiled with NO_THREADINFO defined, then the GetInfo()
+// method will return a reference to a static dummy instance of this
+// structure.  It is currently undecided if NO_THREADINFO will be defined for
+// release builds!
+
+struct CryThreadInfo
+{
+    // The symbolic name of the thread.
+    //
+    // You may set this name directly or through the SetName() method of
+    // CrySimpleThread (or derived class).
+    AZStd::string m_Name;
+
+
+    // A thread identification number.
+    // The number is unique but architecture specific.  Do not assume anything
+    // about that number except for being unique.
+    //
+    // This field is filled when the thread is started (i.e. before the Run()
+    // method or thread routine is called).  It is advised that you do not
+    // change this number manually.
+    uint32 m_ID;
+};
+
+// Simple thread class.
+//
+// CrySimpleThread is a simple wrapper around a system thread providing
+// nothing but system-level functionality of a thread.  There are two typical
+// ways to use a simple thread:
+//
+// 1. Derive from the CrySimpleThread class and provide an implementation of
+//    the Run() (and optionally Cancel()) methods.
+// 2. Specify a runnable object when the thread is started.  The default
+//    runnable type is CryRunnable.
+//
+// The Runnable class specfied as the template argument must provide Run()
+// and Cancel() methods compatible with the following signatures:
+//
+//   void Runnable::Run();
+//   void Runnable::Cancel();
+//
+// If the Runnable does not support cancellation, then the Cancel() method
+// should do nothing.
+//
+// The same instance of CrySimpleThread may be used for multiple thread
+// executions /in sequence/, i.e. it is valid to re-start the thread by
+// calling Start() after the thread has been joined by calling WaitForThread().
+template<class Runnable = CryRunnable>
+class CrySimpleThread;
+
+// Standard thread class.
+//
+// The class provides a lock (mutex) and an associated condition variable.  If
+// you don't need the lock, then you should used CrySimpleThread instead of
+// CryThread.
+template<class Runnable = CryRunnable>
+class CryThread;
+
+///////////////////////////////////////////////////////////////////////////////
+// Include architecture specific code.
+#if AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS
+#include <CryThread_pthreads.h>
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(WIN32) || defined(WIN64)
+#include <CryThread_windows.h>
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(CryThread_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+// Put other platform specific includes here!
+#include <CryThread_dummy.h>
+#endif
+
+#if !defined _CRYTHREAD_CONDLOCK_GLITCH
+typedef CryLockT<CRYLOCK_RECURSIVE> CryMutex;
+#endif // !_CRYTHREAD_CONDLOCK_GLITCH
+
+// The the architecture specific code does not define a class CryRWLock, then
+// a default implementation is provided here.
+#if !defined _CRYTHREAD_HAVE_RWLOCK && !defined _CRYTHREAD_CONDLOCK_GLITCH
+class CryRWLock
+{
+    CryCriticalSection m_lockExclusiveAccess;
+    CryCriticalSection m_lockSharedAccessComplete;
+    CryConditionVariable m_condSharedAccessComplete;
+
+    int m_nSharedAccessCount;
+    int m_nCompletedSharedAccessCount;
+    bool m_bExclusiveAccess;
+
+    CryRWLock(const CryRWLock&);
+    CryRWLock& operator= (const CryRWLock&);
+
+    void AdjustSharedAccessCount()
+    {
+        m_nSharedAccessCount -= m_nCompletedSharedAccessCount;
+        m_nCompletedSharedAccessCount = 0;
+    }
+
+public:
+    CryRWLock()
+        : m_nSharedAccessCount(0)
+        , m_nCompletedSharedAccessCount(0)
+        , m_bExclusiveAccess(false)
+    { }
+
+    void RLock()
+    {
+        m_lockExclusiveAccess.Lock();
+        if (++m_nSharedAccessCount == INT_MAX)
+        {
+            m_lockSharedAccessComplete.Lock();
+            AdjustSharedAccessCount();
+            m_lockSharedAccessComplete.Unlock();
+        }
+        m_lockExclusiveAccess.Unlock();
+    }
+
+    bool TryRLock()
+    {
+        if (!m_lockExclusiveAccess.TryLock())
+        {
+            return false;
+        }
+        if (++m_nSharedAccessCount == INT_MAX)
+        {
+            m_lockSharedAccessComplete.Lock();
+            AdjustSharedAccessCount();
+            m_lockSharedAccessComplete.Unlock();
+        }
+        m_lockExclusiveAccess.Unlock();
+        return true;
+    }
+
+    void RUnlock()
+    {
+        Unlock();
+    }
+
+    void WLock()
+    {
+        m_lockExclusiveAccess.Lock();
+        m_lockSharedAccessComplete.Lock();
+        assert(!m_bExclusiveAccess);
+        AdjustSharedAccessCount();
+        if (m_nSharedAccessCount > 0)
+        {
+            m_nCompletedSharedAccessCount -= m_nSharedAccessCount;
+            do
+            {
+                m_condSharedAccessComplete.Wait(m_lockSharedAccessComplete);
+            }
+            while (m_nCompletedSharedAccessCount < 0);
+            m_nSharedAccessCount = 0;
+        }
+        m_bExclusiveAccess = true;
+    }
+
+    bool TryWLock()
+    {
+        if (!m_lockExclusiveAccess.TryLock())
+        {
+            return false;
+        }
+        if (!m_lockSharedAccessComplete.TryLock())
+        {
+            m_lockExclusiveAccess.Unlock();
+            return false;
+        }
+        assert(!m_bExclusiveAccess);
+        AdjustSharedAccessCount();
+        if (m_nSharedAccessCount > 0)
+        {
+            m_lockSharedAccessComplete.Unlock();
+            m_lockExclusiveAccess.Unlock();
+            return false;
+        }
+        else
+        {
+            m_bExclusiveAccess = true;
+        }
+        return true;
+    }
+
+    void WUnlock()
+    {
+        Unlock();
+    }
+
+    void Unlock()
+    {
+        if (!m_bExclusiveAccess)
+        {
+            m_lockSharedAccessComplete.Lock();
+            if (++m_nCompletedSharedAccessCount == 0)
+            {
+                m_condSharedAccessComplete.NotifySingle();
+            }
+            m_lockSharedAccessComplete.Unlock();
+        }
+        else
+        {
+            m_bExclusiveAccess = false;
+            m_lockSharedAccessComplete.Unlock();
+            m_lockExclusiveAccess.Unlock();
+        }
+    }
+};
+#endif // !defined _CRYTHREAD_HAVE_RWLOCK
+
+// Thread class.
+//
+// CryThread is an extension of CrySimpleThread providing a lock (mutex) and a
+// condition variable per instance.
+template<class Runnable>
+class CryThread
+    : public CrySimpleThread<Runnable>
+{
+    CryMutex m_Lock;
+    CryConditionVariable m_Cond;
+
+    CryThread(const CryThread<Runnable>&);
+    void operator = (const CryThread<Runnable>&);
+
+public:
+    CryThread() { }
+    void Lock() { m_Lock.Lock(); }
+    bool TryLock() { return m_Lock.TryLock(); }
+    void Unlock() { m_Lock.Unlock(); }
+    void Wait() { m_Cond.Wait(m_Lock); }
+    // Timed wait on the associated condition.
+    //
+    // The 'milliseconds' parameter specifies the relative timeout in
+    // milliseconds.  The method returns true if a notification was received and
+    // false if the specified timeout expired without receiving a notification.
+    //
+    // UNIX note: the method will _not_ return if the calling thread receives a
+    // signal.  Instead the call is re-started with the _original_ timeout
+    // value.  This misfeature may be fixed in the future.
+    bool TimedWait(uint32 milliseconds)
+    {
+        return m_Cond.TimedWait(m_Lock, milliseconds);
+    }
+    void Notify() { m_Cond.Notify(); }
+    void NotifySingle() { m_Cond.NotifySingle(); }
+    CryMutex& GetLock() { return m_Lock; }
+};
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Sync primitive for multiple reads and exclusive locking change access
+//
+//  Desc:
+//      Useful in case if you have rarely modified object that needs
+//      to be read quite often from different threads but still
+//      need to be exclusively modified sometimes
+//  Debug functionality:
+//      Can be used for debug-only lock calls, which verify that no
+//      simultaneous access is attempted.
+//      Use the bDebug argument of LockRead or LockModify,
+//      or use the DEBUG_READLOCK or DEBUG_MODIFYLOCK macros.
+//      There is no overhead in release builds, if you use the macros,
+//      and the lock definition is inside #ifdef _DEBUG.
+//////////////////////////////////////////////////////////////////////////
+
+class CryReadModifyLock
+{
+public:
+    CryReadModifyLock()
+        : m_modifyCount(0)
+        , m_readCount(0)
+    {
+        SetDebugLocked(false);
+    }
+
+    bool LockRead(bool bTry = false, cstr strDebug = 0, bool bDebug = false) const
+    {
+        if (!WriteLock(bTry, bDebug, strDebug))         // wait until write unlocked
+        {
+            return false;
+        }
+        CryInterlockedIncrement(&m_readCount);          // increment read counter
+        m_writeLock.Unlock();
+        return true;
+    }
+    void UnlockRead() const
+    {
+        SetDebugLocked(false);
+        const int counter = CryInterlockedDecrement(&m_readCount);       // release read
+        assert(counter >= 0);
+        if (m_writeLock.TryLock())
+        {
+            m_writeLock.Unlock();
+        }
+        else
+        if (counter == 0 && m_modifyCount)
+        {
+            m_ReadReleased.Set();                                           // signal the final read released
+        }
+    }
+    bool LockModify(bool bTry = false, cstr strDebug = 0, bool bDebug = false) const
+    {
+        if (!WriteLock(bTry, bDebug, strDebug))
+        {
+            return false;
+        }
+        CryInterlockedIncrement(&m_modifyCount);        // increment write counter (counter is for nested cases)
+        while (m_readCount)
+        {
+            m_ReadReleased.Wait();                                      // wait for all threads finish read operation
+        }
+        return true;
+    }
+    void UnlockModify() const
+    {
+        SetDebugLocked(false);
+#if !defined(NDEBUG)
+        int counter =
+#endif
+            CryInterlockedDecrement(&m_modifyCount);      // decrement write counter
+        assert(counter >= 0);
+        m_writeLock.Unlock();                                               // release exclusive lock
+    }
+
+protected:
+    mutable volatile int          m_readCount;
+    mutable volatile int          m_modifyCount;
+    mutable CryEvent              m_ReadReleased;
+    mutable CryCriticalSection    m_writeLock;
+    mutable bool                                    m_debugLocked;
+    mutable const char*                     m_debugLockStr;
+
+    void SetDebugLocked([[maybe_unused]] bool b, [[maybe_unused]] const char* str = 0) const
+    {
+#ifdef _DEBUG
+        m_debugLocked = b;
+        m_debugLockStr = str;
+#endif
+    }
+
+    bool WriteLock(bool bTry, [[maybe_unused]] bool bDebug, [[maybe_unused]] const char* strDebug) const
+    {
+        if (!m_writeLock.TryLock())
+        {
+#ifdef _DEBUG
+            assert(!m_debugLocked);
+            assert(!bDebug);
+#endif
+            if (bTry)
+            {
+                return false;
+            }
+            m_writeLock.Lock();
+        }
+#ifdef _DEBUG
+        if (!m_readCount && !m_modifyCount)                 // not yet locked
+        {
+            SetDebugLocked(bDebug, strDebug);
+        }
+#endif
+        return true;
+    }
+};
+
+// Auto-locking classes.
+template<class T, bool bDEBUG = false>
+class AutoLockRead
+{
+protected:
+    const T& m_lock;
+public:
+    AutoLockRead(const T& lock, cstr strDebug = 0)
+        : m_lock(lock) { m_lock.LockRead(bDEBUG, strDebug, bDEBUG); }
+    ~AutoLockRead()
+    { m_lock.UnlockRead(); }
+};
+
+template<class T, bool bDEBUG = false>
+class AutoLockModify
+{
+protected:
+    const T& m_lock;
+public:
+    AutoLockModify(const T& lock, cstr strDebug = 0)
+        : m_lock(lock) { m_lock.LockModify(bDEBUG, strDebug, bDEBUG); }
+    ~AutoLockModify()
+    { m_lock.UnlockModify(); }
+};
+
+#define AUTO_READLOCK(p) PREFAST_SUPPRESS_WARNING(6246) AutoLockRead<CryReadModifyLock> AZ_JOIN(__readlock, __LINE__)(p, __FUNC__)
+#define AUTO_READLOCK_PROT(p) PREFAST_SUPPRESS_WARNING(6246) AutoLockRead<CryReadModifyLock> AZ_JOIN(__readlock_prot, __LINE__)(p, __FUNC__)
+#define AUTO_MODIFYLOCK(p) PREFAST_SUPPRESS_WARNING(6246) AutoLockModify<CryReadModifyLock> AZ_JOIN(__modifylock, __LINE__)(p, __FUNC__)
+
+#if defined(_DEBUG)
+    #define DEBUG_READLOCK(p) AutoLockRead<CryReadModifyLock> AZ_JOIN(__readlock, __LINE__)(p, __FUNC__)
+    #define DEBUG_MODIFYLOCK(p) AutoLockModify<CryReadModifyLock> AZ_JOIN(__modifylock, __LINE__)(p, __FUNC__)
+#else
+    #define DEBUG_READLOCK(p)
+    #define DEBUG_MODIFYLOCK(p)
+#endif
+
+// producer consumer queue implementations, but here instead of MultiThread_Container.h
+// since they requiere platform specific code, and including windows.h in a very common
+// header file leads to all kinds of problems
+namespace CryMT
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Producer/Consumer Queue for 1 to 1 thread communication
+    // Realized with only volatile variables and memory barriers
+    // *warning* this producer/consumer queue is only thread safe in a 1 to 1 situation
+    // and doesn't provide any yields or similar to prevent spinning
+    //////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    class SingleProducerSingleConsumerQueue
+        : public CryMT::detail::SingleProducerSingleConsumerQueueBase
+    {
+    public:
+        SingleProducerSingleConsumerQueue();
+        ~SingleProducerSingleConsumerQueue();
+
+        void Init(size_t nSize);
+
+        void Push(const T& rObj);
+        void Pop(T* pResult);
+        uint32 Size() { return (m_nProducerIndex - m_nComsumerIndex); }
+        uint32 BufferSize() { return m_nBufferSize;  }
+        uint32 FreeCount() { return (m_nBufferSize - (m_nProducerIndex - m_nComsumerIndex)); }
+
+    private:
+        T* m_arrBuffer;
+        uint32 m_nBufferSize;
+
+        volatile uint32 m_nProducerIndex _ALIGN(16);
+        volatile uint32 m_nComsumerIndex _ALIGN(16);
+    } _ALIGN(128);
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline SingleProducerSingleConsumerQueue<T>::SingleProducerSingleConsumerQueue()
+        : m_arrBuffer(NULL)
+        , m_nBufferSize(0)
+        , m_nProducerIndex(0)
+        , m_nComsumerIndex(0)
+    {}
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline SingleProducerSingleConsumerQueue<T>::~SingleProducerSingleConsumerQueue()
+    {
+        CryModuleMemalignFree(m_arrBuffer);
+        m_nBufferSize = 0;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline void SingleProducerSingleConsumerQueue<T>::Init(size_t nSize)
+    {
+        assert(m_arrBuffer == NULL);
+        assert(m_nBufferSize == 0);
+        assert((nSize & (nSize - 1)) == 0);
+
+        m_arrBuffer = alias_cast<T*>(CryModuleMemalign(nSize * sizeof(T), 16));
+        m_nBufferSize = nSize;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline void SingleProducerSingleConsumerQueue<T>::Push(const T& rObj)
+    {
+        assert(m_arrBuffer != NULL);
+        assert(m_nBufferSize != 0);
+        SingleProducerSingleConsumerQueueBase::Push((void*)&rObj, m_nProducerIndex, m_nComsumerIndex, m_nBufferSize, m_arrBuffer, sizeof(T));
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline void SingleProducerSingleConsumerQueue<T>::Pop(T* pResult)
+    {
+        assert(m_arrBuffer != NULL);
+        assert(m_nBufferSize != 0);
+        SingleProducerSingleConsumerQueueBase::Pop(pResult, m_nProducerIndex, m_nComsumerIndex, m_nBufferSize, m_arrBuffer, sizeof(T));
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // Producer/Consumer Queue for N to 1 thread communication
+    // lockfree implemenation, to copy with multiple producers,
+    // a internal producer refcount is managed, the queue is empty
+    // as soon as there are no more producers and no new elements
+    //////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    class N_ProducerSingleConsumerQueue
+        : public CryMT::detail::N_ProducerSingleConsumerQueueBase
+    {
+    public:
+        N_ProducerSingleConsumerQueue();
+        ~N_ProducerSingleConsumerQueue();
+
+        void Init(size_t nSize);
+
+        void Push(const T& rObj);
+        bool Pop(T* pResult);
+
+        // needs to be called before using, assumes that there is at least one producer
+        // so the first one doesn't need to call AddProducer, but he has to deregister itself
+        void SetRunningState();
+
+        // to correctly track when the queue is empty(and no new jobs will be added), refcount the producer
+        void AddProducer();
+        void RemoveProducer();
+
+        uint32 Size() { return (m_nProducerIndex - m_nComsumerIndex); }
+        uint32 BufferSize() { return m_nBufferSize; }
+        uint32 FreeCount() { return (m_nBufferSize - (m_nProducerIndex - m_nComsumerIndex)); }
+
+    private:
+        T*                              m_arrBuffer;
+        volatile uint32*    m_arrStates;
+        uint32                      m_nBufferSize;
+
+        volatile uint32 m_nProducerIndex;
+        volatile uint32 m_nComsumerIndex;
+        volatile uint32 m_nRunning;
+        volatile uint32 m_nProducerCount;
+    } _ALIGN(128);
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline N_ProducerSingleConsumerQueue<T>::N_ProducerSingleConsumerQueue()
+        : m_arrBuffer(NULL)
+        , m_arrStates(NULL)
+        , m_nBufferSize(0)
+        , m_nProducerIndex(0)
+        , m_nComsumerIndex(0)
+        , m_nRunning(0)
+        , m_nProducerCount(0)
+    {}
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline N_ProducerSingleConsumerQueue<T>::~N_ProducerSingleConsumerQueue()
+    {
+        CryModuleMemalignFree(m_arrBuffer);
+        CryModuleMemalignFree((void*)m_arrStates);
+        m_nBufferSize = 0;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline void N_ProducerSingleConsumerQueue<T>::Init(size_t nSize)
+    {
+        assert(m_arrBuffer == NULL);
+        assert(m_arrStates == NULL);
+        assert(m_nBufferSize == 0);
+        assert((nSize & (nSize - 1)) == 0);
+
+        m_arrBuffer = alias_cast<T*>(CryModuleMemalign(nSize * sizeof(T), 16));
+        m_arrStates = alias_cast<uint32*>(CryModuleMemalign(nSize * sizeof(uint32), 16));
+        memset((void*)m_arrStates, 0, sizeof(uint32) * nSize);
+        m_nBufferSize = nSize;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline void N_ProducerSingleConsumerQueue<T>::SetRunningState()
+    {
+#if !defined(_RELEASE)
+        if (m_nRunning == 1)
+        {
+            __debugbreak();
+        }
+#endif
+        m_nRunning = 1;
+        m_nProducerCount = 1;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline void N_ProducerSingleConsumerQueue<T>::AddProducer()
+    {
+        assert(m_arrBuffer != NULL);
+        assert(m_arrStates != NULL);
+        assert(m_nBufferSize != 0);
+#if !defined(_RELEASE)
+        if (m_nRunning == 0)
+        {
+            __debugbreak();
+        }
+#endif
+        CryInterlockedIncrement((volatile int*)&m_nProducerCount);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline void N_ProducerSingleConsumerQueue<T>::RemoveProducer()
+    {
+        assert(m_arrBuffer != NULL);
+        assert(m_arrStates != NULL);
+        assert(m_nBufferSize != 0);
+#if !defined(_RELEASE)
+        if (m_nRunning == 0)
+        {
+            __debugbreak();
+        }
+#endif
+        if (CryInterlockedDecrement((volatile int*)&m_nProducerCount) == 0)
+        {
+            m_nRunning = 0;
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline void N_ProducerSingleConsumerQueue<T>::Push(const T& rObj)
+    {
+        assert(m_arrBuffer != NULL);
+        assert(m_arrStates != NULL);
+        assert(m_nBufferSize != 0);
+        CryMT::detail::N_ProducerSingleConsumerQueueBase::Push((void*)&rObj, m_nProducerIndex, m_nComsumerIndex, m_nRunning, m_arrBuffer, m_nBufferSize, sizeof(T), m_arrStates);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    inline bool N_ProducerSingleConsumerQueue<T>::Pop(T* pResult)
+    {
+        assert(m_arrBuffer != NULL);
+        assert(m_arrStates != NULL);
+        assert(m_nBufferSize != 0);
+        return CryMT::detail::N_ProducerSingleConsumerQueueBase::Pop(pResult, m_nProducerIndex, m_nComsumerIndex, m_nRunning, m_arrBuffer, m_nBufferSize, sizeof(T), m_arrStates);
+    }
+} //namespace CryMT
+
+// Include all multithreading containers.
+#include "MultiThread_Containers.h"
diff --git a/Code/Legacy/CryCommon/CryThreadImpl.h b/Code/Legacy/CryCommon/CryThreadImpl.h
new file mode 100644
index 0000000000..727f9e173e
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryThreadImpl.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
+
+
+#include <CryThread.h>
+
+// Include architecture specific code.
+#if defined(LINUX) || defined(APPLE)
+#include <CryThreadImpl_pthreads.h>
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(WIN32) || defined(WIN64)
+#include <CryThreadImpl_windows.h>
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(CryThreadImpl_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+// Put other platform specific includes here!
+#endif
diff --git a/Code/Legacy/CryCommon/CryThreadImpl_pthreads.h b/Code/Legacy/CryCommon/CryThreadImpl_pthreads.h
new file mode 100644
index 0000000000..b5d2e55ebd
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryThreadImpl_pthreads.h
@@ -0,0 +1,300 @@
+/*
+ * 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_CRYTHREADIMPL_PTHREADS_H
+#define CRYINCLUDE_CRYCOMMON_CRYTHREADIMPL_PTHREADS_H
+#pragma once
+
+
+#include "CryThread_pthreads.h"
+
+#if PLATFORM_SUPPORTS_THREADLOCAL
+THREADLOCAL CrySimpleThreadSelf
+* CrySimpleThreadSelf::m_Self = NULL;
+#else
+TLS_DEFINE(CrySimpleThreadSelf*, g_CrySimpleThreadSelf)
+#endif
+
+
+//////////////////////////////////////////////////////////////////////////
+// CryEvent(Timed) implementation
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+void CryEventTimed::Reset()
+{
+    m_lockNotify.Lock();
+    m_flag = false;
+    m_lockNotify.Unlock();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryEventTimed::Set()
+{
+    m_lockNotify.Lock();
+    m_flag = true;
+    m_cond.Notify();
+    m_lockNotify.Unlock();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryEventTimed::Wait()
+{
+    m_lockNotify.Lock();
+    if (!m_flag)
+    {
+        m_cond.Wait(m_lockNotify);
+    }
+    m_flag  =   false;
+    m_lockNotify.Unlock();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CryEventTimed::Wait(const uint32 timeoutMillis)
+{
+    bool bResult = true;
+    m_lockNotify.Lock();
+    if (!m_flag)
+    {
+        bResult = m_cond.TimedWait(m_lockNotify, timeoutMillis);
+    }
+    m_flag  =   false;
+    m_lockNotify.Unlock();
+    return bResult;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// CryCriticalSection implementation
+///////////////////////////////////////////////////////////////////////////////
+typedef CryLockT<CRYLOCK_RECURSIVE> TCritSecType;
+
+void  CryDeleteCriticalSection(void* cs)
+{
+    delete ((TCritSecType*)cs);
+}
+
+void  CryEnterCriticalSection(void* cs)
+{
+    ((TCritSecType*)cs)->Lock();
+}
+
+bool  CryTryCriticalSection(void* cs)
+{
+    return false;
+}
+
+void  CryLeaveCriticalSection(void* cs)
+{
+    ((TCritSecType*)cs)->Unlock();
+}
+
+void  CryCreateCriticalSectionInplace(void* pCS)
+{
+    new (pCS) TCritSecType;
+}
+
+void CryDeleteCriticalSectionInplace(void*)
+{
+}
+
+void* CryCreateCriticalSection()
+{
+    return (void*) new TCritSecType;
+}
+
+#if AZ_TRAIT_SKIP_CRYINTERLOCKED
+#elif defined(INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED)
+//////////////////////////////////////////////////////////////////////////
+void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
+{
+    AZStd::lock_guard<AZStd::mutex> lock(list.mutex);
+
+    element.pNext = list.pNext;
+    list.pNext = &element;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
+{
+    AZStd::lock_guard<AZStd::mutex> lock(list.mutex);
+
+    SLockFreeSingleLinkedListEntry* returnValue = list.pNext;
+    if (list.pNext)
+    {
+        list.pNext = list.pNext->pNext;
+    }
+    return returnValue;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
+{
+    AZStd::lock_guard<AZStd::mutex> lock(list.mutex);
+
+    list.pNext = NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
+{
+    AZStd::lock_guard<AZStd::mutex> lock(list.mutex);
+
+    SLockFreeSingleLinkedListEntry* returnValue = list.pNext;
+    list.pNext = nullptr;
+    return returnValue;
+}
+
+#elif defined(LINUX32)
+//////////////////////////////////////////////////////////////////////////
+// Implementation for Linux32 with gcc using uint64
+//////////////////////////////////////////////////////////////////////////
+void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
+{
+    uint32 curSetting[2];
+    uint32 newSetting[2];
+    uint32 newPointer = (uint32) & element;
+    do
+    {
+        curSetting[0] = (uint32)list.pNext;
+        curSetting[1] = list.salt;
+        element.pNext = (SLockFreeSingleLinkedListEntry*)curSetting[0];
+        newSetting[0] = newPointer;     // new pointer
+        newSetting[1] = curSetting[1] + 1;   // new salt
+    }
+    while (false == __sync_bool_compare_and_swap((volatile uint64*)&list.pNext, *(uint64*)&curSetting[0], *(uint64*)&newSetting[0]));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
+{
+    uint32 curSetting[2];
+    uint32 newSetting[2];
+    do
+    {
+        curSetting[1] = list.salt;
+        curSetting[0] = (uint32)list.pNext;
+        if (curSetting[0] == 0)
+        {
+            return NULL;
+        }
+        newSetting[0] = *(uint32*)curSetting[0];     // new pointer
+        newSetting[1] = curSetting[1] + 1;   // new salt
+    }
+    while (false == __sync_bool_compare_and_swap((volatile uint64*)&list.pNext, *(uint64*)&curSetting[0], *(uint64*)&newSetting[0]));
+    return (void*)curSetting[0];
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
+{
+    list.salt = 0;
+    list.pNext = NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
+{
+    uint32 curSetting[2];
+    uint32 newSetting[2];
+    uint32 newSalt;
+    uint32 newPointer;
+    do
+    {
+        curSetting[1] = list.salt;
+        curSetting[0] = (uint32)list.pNext;
+        if (curSetting[0] == 0)
+        {
+            return NULL;
+        }
+        newSetting[0] = 0;
+        newSetting[1] = curSetting[1] + 1;
+    }
+    while (false == __sync_bool_compare_and_swap((volatile uint64*)&list.pNext, *(uint64*)&curSetting[0], *(uint64*)&newSetting[0]));
+    return (void*)curSetting[0];
+}
+#else
+// This implementation get's used on multiple platforms that support uint128 compare and swap.
+
+//////////////////////////////////////////////////////////////////////////
+// LINUX64 Implementation of Lockless Single Linked List
+//////////////////////////////////////////////////////////////////////////
+typedef __uint128_t uint128;
+
+//////////////////////////////////////////////////////////////////////////
+// Implementation for Linux64 with gcc using __int128_t
+//////////////////////////////////////////////////////////////////////////
+void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
+{
+    uint64 curSetting[2];
+    uint64 newSetting[2];
+    uint64 newPointer = (uint64) & element;
+    do
+    {
+        curSetting[0] = (uint64)list.pNext;
+        curSetting[1] = list.salt;
+        element.pNext = (SLockFreeSingleLinkedListEntry*)curSetting[0];
+        newSetting[0] = newPointer;     // new pointer
+        newSetting[1] = curSetting[1] + 1;   // new salt
+    }
+    // while (false == __sync_bool_compare_and_swap( (volatile uint128*)&list.pNext,*(uint128*)&curSetting[0],*(uint128*)&newSetting[0] ));
+    while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
+{
+    uint64 curSetting[2];
+    uint64 newSetting[2];
+    do
+    {
+        curSetting[1] = list.salt;
+        curSetting[0] = (uint64)list.pNext;
+        if (curSetting[0] == 0)
+        {
+            return NULL;
+        }
+        newSetting[0] = *(uint64*)curSetting[0];     // new pointer
+        newSetting[1] = curSetting[1] + 1;   // new salt
+    }
+    //while (false == __sync_bool_compare_and_swap( (volatile uint128*)&list.pNext,*(uint128*)&curSetting[0],*(uint128*)&newSetting[0] ));
+    while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
+    return (void*)curSetting[0];
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
+{
+    list.salt = 0;
+    list.pNext = NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
+{
+    uint64 curSetting[2];
+    uint64 newSetting[2];
+    uint64 newSalt;
+    uint64 newPointer;
+    do
+    {
+        curSetting[1] = list.salt;
+        curSetting[0] = (uint64)list.pNext;
+        if (curSetting[0] == 0)
+        {
+            return NULL;
+        }
+        newSetting[0] = 0;
+        newSetting[1] = curSetting[1] + 1;
+    }
+    //  while (false == __sync_bool_compare_and_swap( (volatile uint128*)&list.pNext,*(uint128*)&curSetting[0],*(uint128*)&newSetting[0] ));
+    while (0 == _InterlockedCompareExchange128((volatile int64*)&list.pNext, (int64)newSetting[1], (int64)newSetting[0], (int64*)&curSetting[0]));
+    return (void*)curSetting[0];
+}
+//////////////////////////////////////////////////////////////////////////
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYTHREADIMPL_PTHREADS_H
diff --git a/Code/Legacy/CryCommon/CryThreadImpl_windows.h b/Code/Legacy/CryCommon/CryThreadImpl_windows.h
new file mode 100644
index 0000000000..bede6be9bd
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryThreadImpl_windows.h
@@ -0,0 +1,598 @@
+/*
+ * 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 WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+#include <process.h>
+#include <AzCore/std/parallel/semaphore.h> // for CreateSemaphore
+struct SThreadNameDesc
+{
+    DWORD dwType;
+    LPCSTR szName;
+    DWORD dwThreadID;
+    DWORD dwFlags;
+};
+
+THREADLOCAL CrySimpleThreadSelf* CrySimpleThreadSelf::m_Self = NULL;
+
+//////////////////////////////////////////////////////////////////////////
+CryEvent::CryEvent()
+{
+    m_handle = (void*)CreateEvent(NULL, FALSE, FALSE, NULL);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CryEvent::~CryEvent()
+{
+    CloseHandle(m_handle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryEvent::Reset()
+{
+    ResetEvent(m_handle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryEvent::Set()
+{
+    SetEvent(m_handle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryEvent::Wait() const
+{
+    WaitForSingleObject(m_handle, INFINITE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CryEvent::Wait(const uint32 timeoutMillis) const
+{
+    if (WaitForSingleObject(m_handle, timeoutMillis) == WAIT_TIMEOUT)
+    {
+        return false;
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CryLock_WinMutex
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+CryLock_WinMutex::CryLock_WinMutex()
+    : m_hdl(CreateMutex(NULL, FALSE, NULL)) {}
+CryLock_WinMutex::~CryLock_WinMutex()
+{
+    CloseHandle(m_hdl);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryLock_WinMutex::Lock()
+{
+    WaitForSingleObject(m_hdl, INFINITE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryLock_WinMutex::Unlock()
+{
+    ReleaseMutex(m_hdl);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CryLock_WinMutex::TryLock()
+{
+    return WaitForSingleObject(m_hdl, 0) != WAIT_TIMEOUT;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CryLock_CritSection
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+CryLock_CritSection::CryLock_CritSection()
+{
+    InitializeCriticalSection((CRITICAL_SECTION*)&m_cs);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CryLock_CritSection::~CryLock_CritSection()
+{
+    DeleteCriticalSection((CRITICAL_SECTION*)&m_cs);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryLock_CritSection::Lock()
+{
+    EnterCriticalSection((CRITICAL_SECTION*)&m_cs);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryLock_CritSection::Unlock()
+{
+    LeaveCriticalSection((CRITICAL_SECTION*)&m_cs);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CryLock_CritSection::TryLock()
+{
+    return TryEnterCriticalSection((CRITICAL_SECTION*)&m_cs) != FALSE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// most of this is taken from http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
+//////////////////////////////////////////////////////////////////////////
+CryConditionVariable::CryConditionVariable()
+{
+    m_waitersCount = 0;
+    m_wasBroadcast = 0;
+    m_sema = CreateSemaphore(NULL, 0, 0x7fffffff, NULL);
+    InitializeCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    m_waitersDone = CreateEvent(NULL, FALSE, FALSE, NULL);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CryConditionVariable::~CryConditionVariable()
+{
+    CloseHandle(m_sema);
+    DeleteCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    CloseHandle(m_waitersDone);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryConditionVariable::Wait(LockType& lock)
+{
+    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    m_waitersCount++;
+    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+
+    SignalObjectAndWait(lock._get_win32_handle(), m_sema, INFINITE, FALSE);
+
+    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    m_waitersCount--;
+    bool lastWaiter = m_wasBroadcast && m_waitersCount == 0;
+    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+
+    if (lastWaiter)
+    {
+        SignalObjectAndWait(m_waitersDone, lock._get_win32_handle(), INFINITE, FALSE);
+    }
+    else
+    {
+        WaitForSingleObject(lock._get_win32_handle(), INFINITE);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CryConditionVariable::TimedWait(LockType& lock, uint32 millis)
+{
+    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    m_waitersCount++;
+    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+
+    bool ok = true;
+    if (WAIT_TIMEOUT == SignalObjectAndWait(lock._get_win32_handle(), m_sema, millis, FALSE))
+    {
+        ok = false;
+    }
+
+    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    m_waitersCount--;
+    bool lastWaiter = m_wasBroadcast && m_waitersCount == 0;
+    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+
+    if (lastWaiter)
+    {
+        SignalObjectAndWait(m_waitersDone, lock._get_win32_handle(), INFINITE, FALSE);
+    }
+    else
+    {
+        WaitForSingleObject(lock._get_win32_handle(), INFINITE);
+    }
+
+    return ok;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryConditionVariable::NotifySingle()
+{
+    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    bool haveWaiters = m_waitersCount > 0;
+    LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    if (haveWaiters)
+    {
+        ReleaseSemaphore(m_sema, 1, 0);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryConditionVariable::Notify()
+{
+    EnterCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    bool haveWaiters = false;
+    if (m_waitersCount > 0)
+    {
+        m_wasBroadcast = 1;
+        haveWaiters = true;
+    }
+    if (haveWaiters)
+    {
+        ReleaseSemaphore(m_sema, m_waitersCount, 0);
+        LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+        WaitForSingleObject(m_waitersDone, INFINITE);
+        m_wasBroadcast = 0;
+    }
+    else
+    {
+        LeaveCriticalSection((CRITICAL_SECTION*)&m_waitersCountLock);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CrySemaphore::CrySemaphore(int nMaximumCount, int nInitialCount)
+{
+    m_Semaphore = (void*)CreateSemaphore(NULL, nInitialCount, nMaximumCount, NULL);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CrySemaphore::~CrySemaphore()
+{
+    CloseHandle((HANDLE)m_Semaphore);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CrySemaphore::Acquire()
+{
+    WaitForSingleObject((HANDLE)m_Semaphore, INFINITE);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CrySemaphore::Release()
+{
+    ReleaseSemaphore((HANDLE)m_Semaphore, 1, NULL);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CryFastSemaphore::CryFastSemaphore(int nMaximumCount, int nInitialCount)
+    : m_Semaphore(nMaximumCount)
+    , m_nCounter(nInitialCount)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CryFastSemaphore::~CryFastSemaphore()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryFastSemaphore::Acquire()
+{
+    int nCount = ~0;
+    do
+    {
+        nCount = *const_cast<volatile int*>(&m_nCounter);
+    } while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nCounter), nCount - 1, nCount) != nCount);
+
+    // if the count would have been 0 or below, go to kernel semaphore
+    if ((nCount - 1)  < 0)
+    {
+        m_Semaphore.Acquire();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryFastSemaphore::Release()
+{
+    int nCount = ~0;
+    do
+    {
+        nCount = *const_cast<volatile int*>(&m_nCounter);
+    } while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nCounter), nCount + 1, nCount) != nCount);
+
+    // wake up kernel semaphore if we have waiter
+    if (nCount < 0)
+    {
+        m_Semaphore.Release();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+CryRWLock::CryRWLock()
+{
+    STATIC_ASSERT(sizeof(m_Lock) == sizeof(PSRWLOCK), "RWLock-pointer has invalid size");
+    InitializeSRWLock(reinterpret_cast<PSRWLOCK>(&m_Lock));
+}
+
+//////////////////////////////////////////////////////////////////////////
+CryRWLock::~CryRWLock()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryRWLock::RLock()
+{
+    AcquireSRWLockShared(reinterpret_cast<PSRWLOCK>(&m_Lock));
+}
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(_CRYTHREAD_WANT_TRY_RWLOCK)
+bool CryRWLock::TryRLock()
+{
+    return TryAcquireSRWLockShared(reinterpret_cast<PSRWLOCK>(&m_Lock)) != 0;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+void CryRWLock::RUnlock()
+{
+    ReleaseSRWLockShared(reinterpret_cast<PSRWLOCK>(&m_Lock));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryRWLock::WLock()
+{
+    AcquireSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&m_Lock));
+}
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(_CRYTHREAD_WANT_TRY_RWLOCK)
+bool CryRWLock::TryWLock()
+{
+    return TryAcquireSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&m_Lock)) != 0;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+void CryRWLock::WUnlock()
+{
+    ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&m_Lock));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryRWLock::Lock()
+{
+    WLock();
+}
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(_CRYTHREAD_WANT_TRY_RWLOCK)
+bool CryRWLock::TryLock()
+{
+    return TryWLock();
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+void CryRWLock::Unlock()
+{
+    WUnlock();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CrySimpleThreadSelf::CrySimpleThreadSelf()
+    : m_thread(NULL)
+    , m_threadId(0)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CrySimpleThreadSelf::WaitForThread()
+{
+    assert(m_thread);
+    PREFAST_ASSUME(m_thread);
+    if (GetCurrentThreadId() != m_threadId)
+    {
+        WaitForSingleObject((HANDLE)m_thread, INFINITE);
+    }
+}
+
+CrySimpleThreadSelf::~CrySimpleThreadSelf()
+{
+    if (m_thread)
+    {
+        CloseHandle(m_thread);
+    }
+}
+
+void CrySimpleThreadSelf::StartThread(unsigned (__stdcall * func)(void*), void* argList)
+{
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(CryThreadImpl_windows_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    m_thread = (void*)_beginthreadex(NULL, 0, func, argList, CREATE_SUSPENDED, &m_threadId);
+#endif
+    assert(m_thread);
+    PREFAST_ASSUME(m_thread);
+    ResumeThread((HANDLE)m_thread);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list,  SLockFreeSingleLinkedListEntry& element)
+{
+    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListHeader) == sizeof(SLIST_HEADER), CRY_INTERLOCKED_SLIST_HEADER_HAS_WRONG_SIZE);
+    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListEntry) >= sizeof(SLIST_ENTRY), CRY_INTERLOCKED_SLIST_ENTRY_HAS_WRONG_SIZE);
+
+    assert(IsAligned(&list, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Header has wrong Alignment");
+    assert(IsAligned(&element, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Entry has wrong Alignment");
+    InterlockedPushEntrySList(alias_cast<PSLIST_HEADER>(&list), alias_cast<PSLIST_ENTRY>(&element));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list)
+{
+    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListHeader) == sizeof(SLIST_HEADER), CRY_INTERLOCKED_SLIST_HEADER_HAS_WRONG_SIZE);
+
+    assert(IsAligned(&list, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Header has wrong Alignment");
+    return reinterpret_cast<void*>(InterlockedPopEntrySList(alias_cast<PSLIST_HEADER>(&list)));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list)
+{
+    assert(IsAligned(&list, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Header has wrong Alignment");
+
+    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListHeader) == sizeof(SLIST_HEADER), CRY_INTERLOCKED_SLIST_HEADER_HAS_WRONG_SIZE);
+    InitializeSListHead(alias_cast<PSLIST_HEADER>(&list));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list)
+{
+    assert(IsAligned(&list, MEMORY_ALLOCATION_ALIGNMENT) && "LockFree SingleLink List Header has wrong Alignment");
+
+    STATIC_CHECK(sizeof(SLockFreeSingleLinkedListHeader) == sizeof(SLIST_HEADER), CRY_INTERLOCKED_SLIST_HEADER_HAS_WRONG_SIZE);
+    return InterlockedFlushSList(alias_cast<PSLIST_HEADER>(&list));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// base class for lock less Producer/Consumer queue, due platforms specific they
+// are implemeted in CryThead_platform.h
+namespace CryMT {
+    namespace detail {
+        ///////////////////////////////////////////////////////////////////////////////
+        void SingleProducerSingleConsumerQueueBase::Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize)
+        {
+            // spin if queue is full
+            int iter = 0;
+            while (rProducerIndex - rComsumerIndex == nBufferSize)
+            {
+                CryLowLatencySleep(iter++ > 10 ? 1 : 0);
+            }
+
+            MemoryBarrier();
+            char* pBuffer = alias_cast<char*>(arrBuffer);
+            uint32 nIndex = rProducerIndex % nBufferSize;
+
+            memcpy(pBuffer + (nIndex * nObjectSize), pObj, nObjectSize);
+            MemoryBarrier();
+            rProducerIndex += 1;
+            MemoryBarrier();
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////
+        void SingleProducerSingleConsumerQueueBase::Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize)
+        {
+            MemoryBarrier();
+            // busy-loop if queue is empty
+            int iter = 0;
+            while (rProducerIndex - rComsumerIndex == 0)
+            {
+                CryLowLatencySleep(iter++ > 10 ? 1 : 0);
+            }
+
+            char* pBuffer = alias_cast<char*>(arrBuffer);
+            uint32 nIndex = rComsumerIndex % nBufferSize;
+
+            memcpy(pObj, pBuffer + (nIndex * nObjectSize), nObjectSize);
+            MemoryBarrier();
+            rComsumerIndex += 1;
+            MemoryBarrier();
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////
+        void N_ProducerSingleConsumerQueueBase::Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, [[maybe_unused]] volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*    arrStates)
+        {
+            MemoryBarrier();
+            uint32 nProducerIndex;
+            uint32 nComsumerIndex;
+
+            int iter = 0;
+            do
+            {
+                nProducerIndex = rProducerIndex;
+                nComsumerIndex = rComsumerIndex;
+
+                if (nProducerIndex - nComsumerIndex == nBufferSize)
+                {
+                    CryLowLatencySleep(iter++ > 10 ? 1 : 0);
+                    if (iter > 20) // 10 spins + 10 ms wait
+                    {
+                        uint32 nSizeToAlloc = sizeof(SFallbackList) + nObjectSize - 1;
+                        SFallbackList* pFallbackEntry = (SFallbackList*)CryModuleMemalign(nSizeToAlloc, 128);
+                        memcpy(pFallbackEntry->object, pObj, nObjectSize);
+                        MemoryBarrier();
+                        CryInterlockedPushEntrySList(fallbackList,  pFallbackEntry->nextEntry);
+                        return;
+                    }
+                    continue;
+                }
+
+                if (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&rProducerIndex), nProducerIndex + 1, nProducerIndex) == nProducerIndex)
+                {
+                    break;
+                }
+            } while (true);
+
+            MemoryBarrier();
+            char* pBuffer = alias_cast<char*>(arrBuffer);
+            uint32 nIndex = nProducerIndex % nBufferSize;
+
+            memcpy(pBuffer + (nIndex * nObjectSize), pObj, nObjectSize);
+            MemoryBarrier();
+            arrStates[nIndex] = 1;
+            MemoryBarrier();
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////
+        bool N_ProducerSingleConsumerQueueBase::Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32* arrStates)
+        {
+            MemoryBarrier();
+
+            // busy-loop if queue is empty
+            int iter = 0;
+            if (rRunning && rProducerIndex - rComsumerIndex == 0)
+            {
+                while (rRunning && rProducerIndex - rComsumerIndex == 0)
+                {
+                    CryLowLatencySleep(iter++ > 10 ? 1 : 0);
+                }
+            }
+
+            if (rRunning == 0 && rProducerIndex - rComsumerIndex == 0)
+            {
+                SFallbackList* pFallback = (SFallbackList*)CryInterlockedPopEntrySList(fallbackList);
+                IF (pFallback, 0)
+                {
+                    memcpy(pObj, pFallback->object, nObjectSize);
+                    CryModuleMemalignFree(pFallback);
+                    return true;
+                }
+                // if the queue was empty, make sure we really are empty
+                return false;
+            }
+
+            iter = 0;
+            while (arrStates[rComsumerIndex % nBufferSize] == 0)
+            {
+                CryLowLatencySleep(iter++ > 10 ? 1 : 0);
+            }
+
+            char* pBuffer = alias_cast<char*>(arrBuffer);
+            uint32 nIndex = rComsumerIndex % nBufferSize;
+
+            memcpy(pObj, pBuffer + (nIndex * nObjectSize), nObjectSize);
+            MemoryBarrier();
+            arrStates[nIndex] = 0;
+            MemoryBarrier();
+            rComsumerIndex += 1;
+            MemoryBarrier();
+
+            return true;
+        }
+    } // namespace detail
+} // namespace CryMT
diff --git a/Code/Legacy/CryCommon/CryThread_dummy.h b/Code/Legacy/CryCommon/CryThread_dummy.h
new file mode 100644
index 0000000000..94ce8192d7
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryThread_dummy.h
@@ -0,0 +1,151 @@
+/*
+ * 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_CRYTHREAD_DUMMY_H
+#define CRYINCLUDE_CRYCOMMON_CRYTHREAD_DUMMY_H
+#pragma once
+
+#include <AzCore/base.h>
+
+//////////////////////////////////////////////////////////////////////////
+CryEvent::CryEvent() {}
+CryEvent::~CryEvent() {}
+void CryEvent::Reset() {}
+void CryEvent::Set() {}
+void CryEvent::Wait() const {}
+bool CryEvent::Wait(const uint32 timeoutMillis) const {}
+typedef CryEvent CryEventTimed;
+
+//////////////////////////////////////////////////////////////////////////
+class _DummyLock
+{
+public:
+    _DummyLock();
+
+    void Lock();
+    bool TryLock();
+    void Unlock();
+
+#if defined(AZ_DEBUG_BUILD)
+    bool IsLocked();
+#endif
+};
+
+template<>
+class CryLock<CRYLOCK_FAST>
+    : public _DummyLock
+{
+    CryLock(const CryLock<CRYLOCK_FAST>&);
+    void operator = (const CryLock<CRYLOCK_FAST>&);
+
+public:
+    CryLock();
+};
+
+template<>
+class CryLock<CRYLOCK_RECURSIVE>
+    : public _DummyLock
+{
+    CryLock(const CryLock<CRYLOCK_RECURSIVE>&);
+    void operator = (const CryLock<CRYLOCK_RECURSIVE>&);
+
+public:
+    CryLock();
+};
+
+template<>
+class CryCondLock<CRYLOCK_FAST>
+    : public CryLock<CRYLOCK_FAST>
+{
+};
+
+template<>
+class CryCondLock<CRYLOCK_RECURSIVE>
+    : public CryLock<CRYLOCK_FAST>
+{
+};
+
+template<>
+class CryCond< CryLock<CRYLOCK_FAST> >
+{
+    typedef CryLock<CRYLOCK_FAST> LockT;
+    CryCond(const CryCond<LockT>&);
+    void operator = (const CryCond<LockT>&);
+
+public:
+    CryCond();
+
+    void Notify();
+    void NotifySingle();
+    void Wait(LockT&);
+    bool TimedWait(LockT &, uint32);
+};
+
+template<>
+class CryCond< CryLock<CRYLOCK_RECURSIVE> >
+{
+    typedef CryLock<CRYLOCK_RECURSIVE> LockT;
+    CryCond(const CryCond<LockT>&);
+    void operator = (const CryCond<LockT>&);
+
+public:
+    CryCond();
+
+    void Notify();
+    void NotifySingle();
+    void Wait(LockT&);
+    bool TimedWait(LockT &, uint32);
+};
+
+class _DummyRWLock
+{
+public:
+    _DummyRWLock() { }
+
+    void RLock();
+    bool TryRLock();
+    void WLock();
+    bool TryWLock();
+    void Lock() { WLock(); }
+    bool TryLock() { return TryWLock(); }
+    void Unlock();
+};
+
+template<class Runnable>
+class CrySimpleThread
+    : public CryRunnable
+{
+public:
+    typedef void (* ThreadFunction)(void*);
+
+    CrySimpleThread();
+    virtual ~CrySimpleThread();
+#if !defined(NO_THREADINFO)
+    CryThreadInfo& GetInfo();
+#endif
+    const char* GetName();
+    void SetName(const char*);
+
+    virtual void Run();
+    virtual void Cancel();
+    virtual void Start(Runnable&, unsigned = 0, const char* = NULL);
+    virtual void Start(unsigned = 0, const char* = NULL);
+    void StartFunction(ThreadFunction, void* = NULL, unsigned = 0);
+
+    void Exit();
+    void Join();
+    unsigned SetCpuMask(unsigned);
+    unsigned GetCpuMask();
+
+    void Stop();
+    bool IsStarted() const;
+    bool IsRunning() const;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYTHREAD_DUMMY_H
+
diff --git a/Code/Legacy/CryCommon/CryThread_pthreads.h b/Code/Legacy/CryCommon/CryThread_pthreads.h
new file mode 100644
index 0000000000..b876ef2896
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryThread_pthreads.h
@@ -0,0 +1,1328 @@
+/*
+ * 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/PlatformRestrictedFileDef.h>
+
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <sched.h>
+
+#include <ISystem.h>
+#include <ILog.h>
+#include <errno.h>
+
+// Section dictionary
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define CRYTHREAD_PTHREADS_H_SECTION_REGISTER_THREAD 1
+#define CRYTHREAD_PTHREADS_H_SECTION_TRAITS 2
+#define CRYTHREAD_PTHREADS_H_SECTION_PTHREADCOND 3
+#define CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_CONSTRUCT 4
+#define CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_DESTROY 5
+#define CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_ACQUIRE 6
+#define CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_RELEASE 7
+#define CRYTHREAD_PTHREADS_H_SECTION_TRY_RLOCK 8
+#define CRYTHREAD_PTHREADS_H_SECTION_TRY_WLOCK 9
+#define CRYTHREAD_PTHREADS_H_SECTION_START_RUNNABLE 10
+#define CRYTHREAD_PTHREADS_H_SECTION_START_CPUMASK 11
+#define CRYTHREAD_PTHREADS_H_SECTION_START_CPUMASK_POSTCREATE 12
+#define CRYTHREAD_PTHREADS_H_SECTION_SETCPUMASK 13
+#define CRYTHREAD_PTHREADS_H_SECTION_START_RUNNABLE_CPUMASK_POSTCREATE 14
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_REGISTER_THREAD
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#endif
+
+#if !defined(RegisterThreadName)
+    #define RegisterThreadName(id, name)
+    #define UnRegisterThreadName(id)
+#endif
+
+#if defined(APPLE) || defined(ANDROID)
+// PTHREAD_MUTEX_FAST_NP is only defined by Pthreads-w32, thus not on MAC
+    #define PTHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_NORMAL
+#endif
+
+// Define LARGE_THREAD_STACK to use larger than normal per-thread stack
+#if defined(_DEBUG) && (defined(MAC) || defined(LINUX) || defined(AZ_PLATFORM_IOS))
+#define LARGE_THREAD_STACK
+#endif
+
+#if defined(LINUX)
+#undef RegisterThreadName
+ILINE void RegisterThreadName(pthread_t id, const char* name)
+{
+    if ((!name) || (!id))
+    {
+        return;
+    }
+    int ret;
+    // pthread names on linux are limited to 16 char
+    if (strlen(name) >= 16)
+    {
+        char thread_name[16];
+        memcpy(thread_name, name, 15);
+        thread_name[15] = 0;
+        ret = pthread_setname_np(id, thread_name);
+    }
+    else
+    {
+        ret = pthread_setname_np(id, name);
+    }
+    if (ret != 0)
+    {
+        CryLog("Failed to set thread name for %" PRI_THREADID ", name: %s", id, name);
+    }
+}
+#endif
+
+#if !defined _CRYTHREAD_HAVE_LOCK
+template<class LockClass>
+class _PthreadCond;
+template<int PthreadMutexType>
+class _PthreadLockBase;
+
+template<int PthreadMutexType>
+class _PthreadLockAttr
+{
+    friend class _PthreadLockBase<PthreadMutexType>;
+
+protected:
+    _PthreadLockAttr()
+    {
+        pthread_mutexattr_init(&m_Attr);
+        pthread_mutexattr_settype(&m_Attr, PthreadMutexType);
+    }
+    ~_PthreadLockAttr()
+    {
+        pthread_mutexattr_destroy(&m_Attr);
+    }
+    pthread_mutexattr_t m_Attr;
+};
+
+template<int PthreadMutexType>
+class _PthreadLockBase
+{
+protected:
+    static pthread_mutexattr_t& GetAttr()
+    {
+        static _PthreadLockAttr<PthreadMutexType> m_Attr;
+        return m_Attr.m_Attr;
+    }
+};
+
+template<class LockClass, int PthreadMutexType>
+class _PthreadLock
+    : public _PthreadLockBase<PthreadMutexType>
+{
+    friend class _PthreadCond<LockClass>;
+
+    //#if defined(_DEBUG)
+public:
+    //#endif
+    pthread_mutex_t m_Lock;
+
+public:
+    _PthreadLock()
+        : LockCount(0)
+    {
+        pthread_mutex_init(
+            &m_Lock,
+            &_PthreadLockBase<PthreadMutexType>::GetAttr());
+    }
+    ~_PthreadLock() { pthread_mutex_destroy(&m_Lock); }
+
+    void Lock() { pthread_mutex_lock(&m_Lock); CryInterlockedIncrement(&LockCount); }
+
+    bool TryLock()
+    {
+        const int rc = pthread_mutex_trylock(&m_Lock);
+        if (0 == rc)
+        {
+            CryInterlockedIncrement(&LockCount);
+            return true;
+        }
+        return false;
+    }
+
+    void Unlock() { CryInterlockedDecrement(&LockCount); pthread_mutex_unlock(&m_Lock); }
+
+    // Get the POSIX pthread_mutex_t.
+    // Warning:
+    // This method will not be available in the Win32 port of CryThread.
+    pthread_mutex_t& Get_pthread_mutex_t() { return m_Lock; }
+
+    bool IsLocked()
+    {
+#if defined(LINUX) || defined(APPLE)
+        // implementation taken from CrysisWars
+        return LockCount > 0;
+#else
+        return true;
+#endif
+    }
+
+private:
+    volatile int LockCount;
+};
+
+#if defined CRYLOCK_HAVE_FASTLOCK
+    #if defined(_DEBUG) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
+template<>
+class CryLockT<CRYLOCK_FAST>
+    : public _PthreadLock<CryLockT<CRYLOCK_FAST>, PTHREAD_MUTEX_ERRORCHECK_NP>
+    #else
+template<>
+class CryLockT<CRYLOCK_FAST>
+    : public _PthreadLock<CryLockT<CRYLOCK_FAST>, PTHREAD_MUTEX_FAST_NP>
+    #endif
+{
+    CryLockT(const CryLockT<CRYLOCK_FAST>&);
+    void operator = (const CryLockT<CRYLOCK_FAST>&);
+
+public:
+    CryLockT() { }
+};
+#endif // CRYLOCK_HAVE_FASTLOCK
+
+template<>
+class CryLockT<CRYLOCK_RECURSIVE>
+    : public _PthreadLock<CryLockT<CRYLOCK_RECURSIVE>, PTHREAD_MUTEX_RECURSIVE>
+{
+    CryLockT(const CryLockT<CRYLOCK_RECURSIVE>&);
+    void operator = (const CryLockT<CRYLOCK_RECURSIVE>&);
+
+public:
+    CryLockT() { }
+};
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_TRAITS
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#else
+#if !defined(LINUX) && !defined(APPLE)
+#define CRYTHREAD_PTHREADS_H_TRAIT_DEFINE_CRYMUTEX 1
+#endif
+#if !defined(LINUX) && !defined(APPLE)
+#define CRYTHREAD_PTHREADS_H_TRAIT_SET_THREAD_NAME 1
+#endif
+#endif
+
+#if CRYTHREAD_PTHREADS_H_TRAIT_DEFINE_CRYMUTEX
+#if defined CRYLOCK_HAVE_FASTLOCK
+class CryMutex
+    : public CryLockT<CRYLOCK_FAST>
+{
+};
+#else
+class CryMutex
+    : public CryLockT<CRYLOCK_RECURSIVE>
+{
+};
+#endif
+#endif // CRYTHREAD_PTHREADS_TRAIT_DEFINE_CRYMUTEX
+
+template<class LockClass>
+class _PthreadCond
+{
+    pthread_cond_t m_Cond;
+
+public:
+    _PthreadCond() { pthread_cond_init(&m_Cond, NULL); }
+    ~_PthreadCond() { pthread_cond_destroy(&m_Cond); }
+    void Notify() { pthread_cond_broadcast(&m_Cond); }
+    void NotifySingle() { pthread_cond_signal(&m_Cond); }
+    void Wait(LockClass& Lock) { pthread_cond_wait(&m_Cond, &Lock.m_Lock); }
+    bool TimedWait(LockClass& Lock, uint32 milliseconds)
+    {
+        struct timeval now;
+        struct timespec timeout;
+        int err;
+
+        gettimeofday(&now, NULL);
+        while (true)
+        {
+            timeout.tv_sec = now.tv_sec + milliseconds / 1000;
+            uint64 nsec = (uint64)now.tv_usec * 1000 + (uint64)milliseconds * 1000000;
+            if (nsec >= 1000000000)
+            {
+                timeout.tv_sec += (long)(nsec / 1000000000);
+                nsec %= 1000000000;
+            }
+            timeout.tv_nsec = (long)nsec;
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_PTHREADCOND
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+            #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+            err = pthread_cond_timedwait(&m_Cond, &Lock.m_Lock, &timeout);
+            if (err == EINTR)
+            {
+                // Interrupted by a signal.
+                continue;
+            }
+            else if (err == ETIMEDOUT)
+            {
+                return false;
+            }
+#endif
+            else
+            {
+                assert(err == 0);
+            }
+            break;
+        }
+        return true;
+    }
+
+    // Get the POSIX pthread_cont_t.
+    // Warning:
+    // This method will not be available in the Win32 port of CryThread.
+    pthread_cond_t& Get_pthread_cond_t() { return m_Cond; }
+};
+
+#if AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS
+template <class LockClass>
+class CryConditionVariableT
+    : public _PthreadCond<LockClass>
+{
+};
+
+#if defined CRYLOCK_HAVE_FASTTLOCK
+template<>
+class CryConditionVariableT< CryLockT<CRYLOCK_FAST> >
+    : public _PthreadCond< CryLockT<CRYLOCK_FAST> >
+{
+    typedef CryLockT<CRYLOCK_FAST> LockClass;
+    CryConditionVariableT(const CryConditionVariableT<LockClass>&);
+    CryConditionVariableT<LockClass>& operator = (const CryConditionVariableT<LockClass>&);
+
+public:
+    CryConditionVariableT() { }
+};
+#endif // CRYLOCK_HAVE_FASTLOCK
+
+template<>
+class CryConditionVariableT< CryLockT<CRYLOCK_RECURSIVE> >
+    : public _PthreadCond< CryLockT<CRYLOCK_RECURSIVE> >
+{
+    typedef CryLockT<CRYLOCK_RECURSIVE> LockClass;
+    CryConditionVariableT(const CryConditionVariableT<LockClass>&);
+    CryConditionVariableT<LockClass>& operator = (const CryConditionVariableT<LockClass>&);
+
+public:
+    CryConditionVariableT() { }
+};
+
+#if !defined(_CRYTHREAD_CONDLOCK_GLITCH)
+typedef CryConditionVariableT< CryLockT<CRYLOCK_RECURSIVE> > CryConditionVariable;
+#else
+typedef CryConditionVariableT< CryLockT<CRYLOCK_FAST> > CryConditionVariable;
+#endif
+
+#define _CRYTHREAD_HAVE_LOCK 1
+
+#else // LINUX MAC
+
+#if defined CRYLOCK_HAVE_FASTLOCK
+template<>
+class CryConditionVariable
+    : public _PthreadCond< CryLockT<CRYLOCK_FAST> >
+{
+    typedef CryLockT<CRYLOCK_FAST> LockClass;
+    CryConditionVariable(const CryConditionVariable&);
+    CryConditionVariable& operator = (const CryConditionVariable&);
+
+public:
+    CryConditionVariable() { }
+};
+#endif // CRYLOCK_HAVE_FASTLOCK
+
+template<>
+class CryConditionVariable
+    : public _PthreadCond< CryLockT<CRYLOCK_RECURSIVE> >
+{
+    typedef CryLockT<CRYLOCK_RECURSIVE> LockClass;
+    CryConditionVariable(const CryConditionVariable&);
+    CryConditionVariable& operator = (const CryConditionVariable&);
+
+public:
+    CryConditionVariable() { }
+};
+
+#define _CRYTHREAD_HAVE_LOCK 1
+
+#endif // LINUX MAC
+#endif // !defined _CRYTHREAD_HAVE_LOCK
+
+//////////////////////////////////////////////////////////////////////////
+// Platform independet wrapper for a counting semaphore
+class CrySemaphore
+{
+public:
+    CrySemaphore(int nMaximumCount, int nInitialCount = 0);
+    ~CrySemaphore();
+
+    void Acquire();
+    void Release();
+
+private:
+#if defined(APPLE)
+    // Apple only supports named semaphores so have to use sem_open/unlink/sem_close instead
+    // of sem_open/sem_destroy, passing in this array for the name.
+    char m_semaphoreName[L_tmpnam];
+#endif
+    sem_t* m_Semaphore;
+};
+
+//////////////////////////////////////////////////////////////////////////
+inline CrySemaphore::CrySemaphore(int nMaximumCount, int nInitialCount)
+{
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_CONSTRUCT
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(APPLE)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    tmpnam(m_semaphoreName);
+#   pragma clang diagnostic pop
+    m_Semaphore = sem_open(m_semaphoreName, O_CREAT | O_EXCL, 0644, nInitialCount);
+#else
+    m_Semaphore = new sem_t;
+    sem_init(m_Semaphore, 0, nInitialCount);
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CrySemaphore::~CrySemaphore()
+{
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_DESTROY
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(APPLE)
+    sem_close(m_Semaphore);
+    sem_unlink(m_semaphoreName);
+#else
+    sem_destroy(m_Semaphore);
+    delete m_Semaphore;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline void CrySemaphore::Acquire()
+{
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_ACQUIRE
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    while (sem_wait(m_Semaphore) != 0 && errno == EINTR)
+    {
+        ;
+    }
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline void CrySemaphore::Release()
+{
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SEMAPHORE_RELEASE
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    sem_post(m_Semaphore);
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Platform independet wrapper for a counting semaphore
+// except that this version uses C-A-S only until a blocking call is needed
+// -> No kernel call if there are object in the semaphore
+
+class CryFastSemaphore
+{
+public:
+    CryFastSemaphore(int nMaximumCount, int nInitialCount = 0);
+    ~CryFastSemaphore();
+    void Acquire();
+    void Release();
+
+private:
+    CrySemaphore m_Semaphore;
+    volatile int32 m_nCounter;
+};
+
+//////////////////////////////////////////////////////////////////////////
+inline CryFastSemaphore::CryFastSemaphore(int nMaximumCount, int nInitialCount)
+    : m_Semaphore(nMaximumCount)
+    , m_nCounter(nInitialCount)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline CryFastSemaphore::~CryFastSemaphore()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////
+inline void CryFastSemaphore::Acquire()
+{
+    int nCount = ~0;
+    do
+    {
+        nCount = *const_cast<volatile int*>(&m_nCounter);
+    } while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nCounter), nCount - 1, nCount) != nCount);
+
+    // if the count would have been 0 or below, go to kernel semaphore
+    if ((nCount - 1)  < 0)
+    {
+        m_Semaphore.Acquire();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline void CryFastSemaphore::Release()
+{
+    int nCount = ~0;
+    do
+    {
+        nCount = *const_cast<volatile int*>(&m_nCounter);
+    } while (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&m_nCounter), nCount + 1, nCount) != nCount);
+
+    // wake up kernel semaphore if we have waiter
+    if (nCount < 0)
+    {
+        m_Semaphore.Release();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+#if !defined _CRYTHREAD_HAVE_RWLOCK
+class CryRWLock
+{
+    pthread_rwlock_t m_Lock;
+
+    CryRWLock(const CryRWLock&);
+    CryRWLock& operator= (const CryRWLock&);
+
+public:
+    CryRWLock() { pthread_rwlock_init(&m_Lock, NULL); }
+    ~CryRWLock() { pthread_rwlock_destroy(&m_Lock); }
+    void RLock() { pthread_rwlock_rdlock(&m_Lock); }
+    bool TryRLock()
+    {
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_TRY_RLOCK
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+        #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+        return pthread_rwlock_tryrdlock(&m_Lock) != EBUSY;
+#endif
+    }
+    void RUnlock() { Unlock(); }
+    void WLock() { pthread_rwlock_wrlock(&m_Lock); }
+    bool TryWLock()
+    {
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_TRY_RLOCK
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+        #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+        return pthread_rwlock_trywrlock(&m_Lock) != EBUSY;
+#endif
+    }
+    void WUnlock() { Unlock(); }
+    void Lock() { WLock(); }
+    bool TryLock() { return TryWLock(); }
+    void Unlock() { pthread_rwlock_unlock(&m_Lock); }
+};
+
+// Indicate that this implementation header provides an implementation for
+// CryRWLock.
+#define _CRYTHREAD_HAVE_RWLOCK 1
+#endif // !defined _CRYTHREAD_HAVE_RWLOCK
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Provide TLS implementation using pthreads for those platforms without __thread
+////////////////////////////////////////////////////////////////////////////////
+
+struct SCryPthreadTLSBase
+{
+    SCryPthreadTLSBase(void (*pDestructor)(void*))
+    {
+        pthread_key_create(&m_kKey, pDestructor);
+    }
+
+    ~SCryPthreadTLSBase()
+    {
+        pthread_key_delete(m_kKey);
+    }
+
+    void* GetSpecific()
+    {
+        return pthread_getspecific(m_kKey);
+    }
+
+    void SetSpecific(const void* pValue)
+    {
+        pthread_setspecific(m_kKey, pValue);
+    }
+
+    pthread_key_t m_kKey;
+};
+
+template <typename T, bool bDirect>
+struct SCryPthreadTLSImpl{};
+
+template <typename T>
+struct SCryPthreadTLSImpl<T, true>
+    : private SCryPthreadTLSBase
+{
+    SCryPthreadTLSImpl()
+        :   SCryPthreadTLSBase(NULL)
+    {
+    }
+
+    T Get()
+    {
+        void* pSpecific(GetSpecific());
+        return *reinterpret_cast<const T*>(&pSpecific);
+    }
+
+    void Set(const T& kValue)
+    {
+        SetSpecific(*reinterpret_cast<const void* const*>(&kValue));
+    }
+};
+
+template <typename T>
+struct SCryPthreadTLSImpl<T, false>
+    : private SCryPthreadTLSBase
+{
+    SCryPthreadTLSImpl()
+        :   SCryPthreadTLSBase(&Destroy)
+    {
+    }
+
+    T* GetPtr()
+    {
+        T* pPtr(static_cast<T*>(GetSpecific()));
+        if (pPtr == NULL)
+        {
+            pPtr = new T();
+            SetSpecific(pPtr);
+        }
+        return pPtr;
+    }
+
+    static void Destroy(void* pPointer)
+    {
+        delete static_cast<T*>(pPointer);
+    }
+
+    const T& Get()
+    {
+        return *GetPtr();
+    }
+
+    void Set(const T& kValue)
+    {
+        *GetPtr() = kValue;
+    }
+};
+
+template <typename T>
+struct SCryPthreadTLS
+    : SCryPthreadTLSImpl<T, sizeof(T) <= sizeof(void*)>
+{
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+// CryEvent(Timed) represent a synchronization event
+//////////////////////////////////////////////////////////////////////////
+class CryEventTimed
+{
+public:
+    ILINE CryEventTimed(){m_flag = false; }
+    ILINE ~CryEventTimed(){}
+
+    // Reset the event to the unsignalled state.
+    void Reset();
+    // Set the event to the signalled state.
+    void Set();
+    // Access a HANDLE to wait on.
+    void* GetHandle() const { return NULL; };
+    // Wait indefinitely for the object to become signalled.
+    void Wait();
+    // Wait, with a time limit, for the object to become signalled.
+    bool Wait(const uint32 timeoutMillis);
+
+private:
+    // Lock for synchronization of notifications.
+    CryCriticalSection m_lockNotify;
+#if defined(LINUX) || defined(APPLE)
+    CryConditionVariableT< CryLockT<CRYLOCK_RECURSIVE> > m_cond;
+#else
+    CryConditionVariable m_cond;
+#endif
+    volatile bool m_flag;
+};
+
+typedef CryEventTimed CryEvent;
+
+#if !PLATFORM_SUPPORTS_THREADLOCAL
+TLS_DECLARE(class CrySimpleThreadSelf*, g_CrySimpleThreadSelf);
+#endif
+
+class CrySimpleThreadSelf
+{
+protected:
+#if PLATFORM_SUPPORTS_THREADLOCAL
+
+    static CrySimpleThreadSelf* GetSelf()
+    {
+        return m_Self;
+    }
+
+    static void SetSelf(CrySimpleThreadSelf* pSelf)
+    {
+        m_Self = pSelf;
+    }
+private:
+    static THREADLOCAL CrySimpleThreadSelf* m_Self;
+
+#else
+
+    static CrySimpleThreadSelf* GetSelf()
+    {
+        return TLS_GET(CrySimpleThreadSelf*, g_CrySimpleThreadSelf);
+    }
+
+    static void SetSelf(CrySimpleThreadSelf* pSelf)
+    {
+        TLS_SET(g_CrySimpleThreadSelf, pSelf);
+    }
+
+#endif
+};
+
+template<class Runnable>
+class CrySimpleThread
+    : public CryRunnable
+    , protected CrySimpleThreadSelf
+{
+public:
+    typedef void (* ThreadFunction)(void*);
+    typedef CryRunnable RunnableT;
+    
+    const volatile bool& GetStartedState() const { return m_bIsStarted; }
+
+private:
+#if !defined(NO_THREADINFO)
+    CryThreadInfo m_Info;
+#endif
+    pthread_t m_ThreadID;
+    unsigned m_CpuMask;
+    Runnable* m_Runnable;
+    struct
+    {
+        ThreadFunction m_ThreadFunction;
+        void* m_ThreadParameter;
+    } m_ThreadFunction;
+    volatile bool m_bIsStarted;
+    volatile bool m_bIsRunning;
+
+protected:
+    virtual void Terminate()
+    {
+        // This method must be empty.
+        // Derived classes overriding Terminate() are not required to call this
+        // method.
+    }
+
+private:
+#if !defined(NO_THREADINFO)
+    static void SetThreadInfo(CrySimpleThread<Runnable>* self)
+    {
+        pthread_t thread = pthread_self();
+        self->m_Info.m_ID = (uint32)(TRUNCATE_PTR)thread;
+#if defined(APPLE)
+        pthread_setname_np(self->m_Info.m_Name.c_str());
+#endif
+    }
+#else
+    static void SetThreadInfo(CrySimpleThread<Runnable>* self) { }
+#endif
+
+    static void* PthreadRunRunnable(void* thisPtr)
+    {
+        CrySimpleThread<Runnable>* const self = (CrySimpleThread<Runnable>*)thisPtr;
+        SetSelf(self);
+        self->m_bIsStarted = true;
+        self->m_bIsRunning = true;
+        SetThreadInfo(self);
+        self->m_Runnable->Run();
+        self->m_bIsRunning = false;
+        self->Terminate();
+        SetSelf(NULL);
+        return NULL;
+    }
+
+    static void* PthreadRunThis(void* thisPtr)
+    {
+        CrySimpleThread<Runnable>* const self = (CrySimpleThread<Runnable>*)thisPtr;
+        SetSelf(self);
+        self->m_bIsStarted = true;
+        self->m_bIsRunning = true;
+        SetThreadInfo(self);
+        self->Run();
+        self->m_bIsRunning = false;
+        self->Terminate();
+        SetSelf(NULL);
+        return NULL;
+    }
+
+    CrySimpleThread(const CrySimpleThread<Runnable>&);
+    void operator = (const CrySimpleThread<Runnable>&);
+
+public:
+    CrySimpleThread()
+        : m_CpuMask(0)
+        , m_bIsStarted(false)
+        , m_bIsRunning(false)
+    {
+        m_ThreadFunction.m_ThreadFunction = NULL;
+        m_ThreadFunction.m_ThreadParameter = NULL;
+#if !defined(NO_THREADINFO)
+        m_Info.m_Name = "<Thread>";
+        m_Info.m_ID = 0;
+#endif
+        memset(&m_ThreadID, 0, sizeof m_ThreadID);
+        m_Runnable = NULL;
+    }
+
+    virtual ~CrySimpleThread()
+    {
+        if (IsStarted())
+        {
+            // Note: We don't want to cache a pointer to ISystem and/or ILog to
+            // gain more freedom on when the threading classes are used (e.g.
+            // threads may be started very early in the initialization).
+            ISystem* pSystem = GetISystem();
+            ILog* pLog = NULL;
+            if (pSystem != NULL)
+            {
+                pLog = pSystem->GetILog();
+            }
+            if (pLog != NULL)
+            {
+                pLog->LogError("Runaway thread %s", GetName());
+            }
+            Cancel();
+            WaitForThread();
+        }
+    }
+
+#if !defined(NO_THREADINFO)
+    CryThreadInfo& GetInfo() { return m_Info; }
+    const char* GetName()
+    {
+        return m_Info.m_Name.c_str();
+    }
+
+    // Set the name of the called thread.
+    //
+    // WIN32:
+    // If the thread is started, then the VC debugger is informed about the new
+    // thread name.  If the thread is not started, then the VC debugger will be
+    // informed lated when the thread is started through one of the Start()
+    // methods.
+    //
+    // If the parameter Name is NULL, then the name of the thread is kept
+    // unchanged.  This may be used to sent the current thread name to the VC
+    // debugger.
+    void SetName(const char* Name)
+    {
+        if (Name != NULL)
+        {
+            if (m_ThreadID)
+            {
+                RegisterThreadName(m_ThreadID, Name);
+            }
+            m_Info.m_Name = Name;
+        }
+#if defined(WIN32)
+        if (IsStarted())
+        {
+            // The VC debugger gets the information about a thread's name through
+            // the exception 0x406D1388.
+            struct
+            {
+                DWORD Type;
+                const char* Name;
+                DWORD ID;
+                DWORD Flags;
+            } Info = { 0x1000, NULL, 0, 0 };
+            Info.ID = (DWORD)m_Info.m_ID;
+            __try
+            {
+                RaiseException(
+                    0x406D1388, 0, sizeof Info / sizeof(DWORD), (ULONG_PTR*)&Info);
+            }
+            __except (EXCEPTION_CONTINUE_EXECUTION)
+            {
+            }
+        }
+#endif
+    }
+#else
+#if !defined(NO_THREADINFO)
+    CryThreadInfo& GetInfo()
+    {
+        static CryThreadInfo dummyInfo = { "<dummy>", 0 };
+        return dummyInfo;
+    }
+#endif
+    const char* GetName() { return "<dummy>"; }
+    void SetName(const char* Name) { }
+#endif
+
+    virtual void Run()
+    {
+        // This Run() implementation supports the void StartFunction() method.
+        // However, code using this class (or derived classes) should eventually
+        // be refactored to use one of the other Start() methods.  This code will
+        // be removed some day and the default implementation of Run() will be
+        // empty.
+        if (m_ThreadFunction.m_ThreadFunction != NULL)
+        {
+            m_ThreadFunction.m_ThreadFunction(m_ThreadFunction.m_ThreadParameter);
+        }
+    }
+
+    // Cancel the running thread.
+    //
+    // If the thread class is implemented as a derived class of CrySimpleThread,
+    // then the derived class should provide an appropriate implementation for
+    // this method.  Calling the base class implementation is _not_ required.
+    //
+    // If the thread was started by specifying a Runnable (template argument),
+    // then the Cancel() call is passed on to the specified runnable.
+    //
+    // If the thread was started using the StartFunction() method, then the
+    // caller must find other means to inform the thread about the cancellation
+    // request.
+    virtual void Cancel()
+    {
+        if (IsStarted() && m_Runnable != NULL)
+        {
+            UnRegisterThreadName(m_ThreadID);
+            m_Runnable->Cancel();
+        }
+    }
+
+    virtual void Start(Runnable& runnable, unsigned cpuMask = 0, const char* name = NULL, int32 StackSize = (SIMPLE_THREAD_STACK_SIZE_KB * 1024))
+    {
+#if defined(LARGE_THREAD_STACK)
+        StackSize *= 4;//debug code needs a lot more than profile
+#endif
+        assert(m_ThreadID == 0);
+        pthread_attr_t threadAttr;
+        pthread_attr_init(&threadAttr);
+        pthread_attr_setdetachstate(&threadAttr, PTHREAD_CREATE_JOINABLE);
+        pthread_attr_setstacksize(&threadAttr, StackSize);
+        if (name)
+        {
+            this->m_Info.m_Name = name;
+        }
+#if CRYTHREAD_PTHREADS_H_TRAIT_SET_THREAD_NAME
+        threadAttr.name = (char*)name;
+#endif
+        m_CpuMask = cpuMask;
+#if defined(PTHREAD_NPTL)
+        if (cpuMask != ~0 && cpuMask != 0)
+        {
+            cpu_set_t cpuSet;
+            CPU_ZERO(&cpuSet);
+            for (int cpu = 0; cpu < sizeof(cpuMask) * 8; ++cpu)
+            {
+                if (cpuMask & (1 << cpu))
+                {
+                    CPU_SET(cpu, &cpuSet);
+                }
+            }
+            pthread_attr_setaffinity_np(&threadAttr, sizeof cpuSet, &cpuSet);
+        }
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_START_RUNNABLE
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+        m_Runnable = &runnable;
+        int err = pthread_create(
+                &m_ThreadID,
+                &threadAttr,
+                PthreadRunRunnable,
+                this);
+        pthread_attr_destroy(&threadAttr);
+        RegisterThreadName(m_ThreadID, name);
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_START_RUNNABLE_CPUMASK_POSTCREATE
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+        assert(err == 0);
+    }
+
+    virtual void Start(unsigned cpuMask = 0, const char* name = NULL, int32 Priority = THREAD_PRIORITY_NORMAL, int32 StackSize = (SIMPLE_THREAD_STACK_SIZE_KB * 1024))
+    {
+#if defined(LARGE_THREAD_STACK)
+        StackSize *= 4;//debug code needs a lot more than profile
+#endif
+        assert(m_ThreadID == 0);
+        pthread_attr_t threadAttr;
+        sched_param schedParam;
+        pthread_attr_init(&threadAttr);
+        pthread_attr_getschedparam(&threadAttr, &schedParam);
+        schedParam.sched_priority   =   Priority;
+        pthread_attr_setschedparam(&threadAttr, &schedParam);
+        pthread_attr_setdetachstate(&threadAttr, PTHREAD_CREATE_JOINABLE);
+        pthread_attr_setstacksize(&threadAttr, StackSize);
+        if (name)
+        {
+            this->m_Info.m_Name = name;
+        }
+#if CRYTHREAD_PTHREADS_H_TRAIT_SET_THREAD_NAME
+        threadAttr.name = (char*)name;
+#endif
+        m_CpuMask = cpuMask;
+#if defined(PTHREAD_NPTL)
+        if (cpuMask != ~0 && cpuMask != 0)
+        {
+            cpu_set_t cpuSet;
+            CPU_ZERO(&cpuSet);
+            for (int cpu = 0; cpu < sizeof(cpuMask) * 8; ++cpu)
+            {
+                if (cpuMask & (1 << cpu))
+                {
+                    CPU_SET(cpu, &cpuSet);
+                }
+            }
+            pthread_attr_setaffinity_np(&threadAttr, sizeof cpuSet, &cpuSet);
+        }
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_START_CPUMASK
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+        int err = pthread_create(
+                &m_ThreadID,
+                &threadAttr,
+                PthreadRunThis,
+                this);
+        pthread_attr_destroy(&threadAttr);
+        RegisterThreadName(m_ThreadID, name);
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_START_CPUMASK_POSTCREATE
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+        assert(err == 0);
+    }
+
+    void StartFunction(
+        ThreadFunction threadFunction,
+        void* threadParameter = NULL,
+        unsigned cpuMask = 0
+        )
+    {
+        m_ThreadFunction.m_ThreadFunction = threadFunction;
+        m_ThreadFunction.m_ThreadParameter = threadParameter;
+        Start(cpuMask);
+    }
+
+    static CrySimpleThread<Runnable>* Self()
+    {
+        return reinterpret_cast<CrySimpleThread<Runnable>*>(GetSelf());
+    }
+
+    void Exit()
+    {
+        assert(m_ThreadID == pthread_self());
+        m_bIsRunning = false;
+        Terminate();
+        SetSelf(NULL);
+        pthread_exit(NULL);
+        UnRegisterThreadName(m_ThreadID);
+    }
+
+    void WaitForThread()
+    {
+        if (pthread_self() != m_ThreadID)
+        {
+            int err = pthread_join(m_ThreadID, NULL);
+            assert(err == 0);
+        }
+        m_bIsStarted = false;
+        memset(&m_ThreadID, 0, sizeof m_ThreadID);
+    }
+
+    unsigned SetCpuMask(unsigned cpuMask)
+    {
+        int oldCpuMask = m_CpuMask;
+        if (cpuMask == m_CpuMask)
+        {
+            return oldCpuMask;
+        }
+        m_CpuMask = cpuMask;
+#if defined(PTHREAD_NPTL)
+        cpu_set_t cpuSet;
+        CPU_ZERO(&cpuSet);
+        if (cpuMask != ~0 && cpuMask != 0)
+        {
+            for (int cpu = 0; cpu < sizeof(cpuMask) * 8; ++cpu)
+            {
+                if (cpuMask & (1 << cpu))
+                {
+                    CPU_SET(cpu, &cpuSet);
+                }
+            }
+            else
+            {
+                CPU_ZERO(&cpuSet);
+                for (int cpu = 0; i < sizeof(cpuSet) * 8; ++cpu)
+                {
+                    CPU_SET(cpu, &cpuSet);
+                }
+            }
+            pthread_attr_setaffinity_np(&threadAttr, sizeof cpuSet, &cpuSet);
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_PTHREADS_H_SECTION_SETCPUMASK
+    #include AZ_RESTRICTED_FILE(CryThread_pthreads_h)
+#endif
+            return oldCpuMask;
+        }
+
+        unsigned GetCpuMask() { return m_CpuMask; }
+
+        void Stop()
+        {
+            m_bIsStarted = false;
+        }
+
+        bool IsStarted() const { return m_bIsStarted; }
+        bool IsRunning() const { return m_bIsRunning; }
+    };
+
+#include "MemoryAccess.h"
+
+    ///////////////////////////////////////////////////////////////////////////////
+    // base class for lock less Producer/Consumer queue, due platforms specific they
+    // are implemeted in CryThead_platform.h
+    namespace CryMT {
+        namespace detail {
+            ///////////////////////////////////////////////////////////////////////////////
+            ///////////////////////////////////////////////////////////////////////////////
+            class SingleProducerSingleConsumerQueueBase
+            {
+            public:
+                SingleProducerSingleConsumerQueueBase()
+                {}
+
+                void Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize);
+                void Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize);
+            };
+
+            ///////////////////////////////////////////////////////////////////////////////
+            inline void SingleProducerSingleConsumerQueueBase::Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize)
+            {
+                MemoryBarrier();
+                // spin if queue is full
+                int iter = 0;
+                while (rProducerIndex - rComsumerIndex == nBufferSize)
+                {
+                    Sleep(iter++ > 10 ? 1 : 0);
+                }
+
+                char* pBuffer = alias_cast<char*>(arrBuffer);
+                uint32 nIndex = rProducerIndex % nBufferSize;
+                memcpy(pBuffer + (nIndex * nObjectSize), pObj, nObjectSize);
+
+                MemoryBarrier();
+                rProducerIndex += 1;
+                MemoryBarrier();
+            }
+
+            ///////////////////////////////////////////////////////////////////////////////
+            inline void SingleProducerSingleConsumerQueueBase::Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize)
+            {
+                MemoryBarrier();
+                // busy-loop if queue is empty
+                int iter = 0;
+                while (rProducerIndex - rComsumerIndex == 0)
+                {
+                    Sleep(iter++ > 10 ? 1 : 0);
+                }
+
+                char* pBuffer = alias_cast<char*>(arrBuffer);
+                uint32 nIndex = rComsumerIndex % nBufferSize;
+
+                memcpy(pObj, pBuffer + (nIndex * nObjectSize), nObjectSize);
+
+                MemoryBarrier();
+                rComsumerIndex += 1;
+                MemoryBarrier();
+            }
+
+
+            ///////////////////////////////////////////////////////////////////////////////
+            ///////////////////////////////////////////////////////////////////////////////
+            class N_ProducerSingleConsumerQueueBase
+            {
+            public:
+                N_ProducerSingleConsumerQueueBase()
+                {
+                    CryInitializeSListHead(fallbackList);
+                }
+
+                void Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*   arrStates);
+                bool Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*    arrStates);
+
+                SLockFreeSingleLinkedListHeader fallbackList;
+                struct SFallbackList
+                {
+                    SLockFreeSingleLinkedListEntry nextEntry;
+                    char alignment_padding[128 - sizeof(SLockFreeSingleLinkedListEntry)];
+                    char object[1]; // struct will be overallocated with enough memory for the object
+                };
+            };
+
+            ///////////////////////////////////////////////////////////////////////////////
+            inline void N_ProducerSingleConsumerQueueBase::Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32* arrStates)
+            {
+                MemoryBarrier();
+                uint32 nProducerIndex;
+                uint32 nComsumerIndex;
+
+                int iter = 0;
+                do
+                {
+                    nProducerIndex = rProducerIndex;
+                    nComsumerIndex = rComsumerIndex;
+
+                    if (nProducerIndex - nComsumerIndex == nBufferSize)
+                    {
+                        Sleep(iter++ > 10 ? 1 : 0);
+                        if (iter > 20) // 10 spins + 10 ms wait
+                        {
+                            uint32 nSizeToAlloc = sizeof(SFallbackList) + nObjectSize - 1;
+                            SFallbackList* pFallbackEntry = (SFallbackList*)CryModuleMemalign(nSizeToAlloc, 128);
+                            memcpy(pFallbackEntry->object, pObj, nObjectSize);
+                            CryInterlockedPushEntrySList(fallbackList,  pFallbackEntry->nextEntry);
+                            return;
+                        }
+                        continue;
+                    }
+
+                    if (CryInterlockedCompareExchange(alias_cast<volatile LONG*>(&rProducerIndex), nProducerIndex + 1, nProducerIndex) == nProducerIndex)
+                    {
+                        break;
+                    }
+                } while (true);
+
+                char* pBuffer = alias_cast<char*>(arrBuffer);
+                uint32 nIndex = nProducerIndex % nBufferSize;
+
+                memcpy(pBuffer + (nIndex * nObjectSize), pObj, nObjectSize);
+
+                MemoryBarrier();
+                arrStates[nIndex] = 1;
+                MemoryBarrier();
+            }
+
+            ///////////////////////////////////////////////////////////////////////////////
+            inline bool N_ProducerSingleConsumerQueueBase::Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32* arrStates)
+            {
+                MemoryBarrier();
+                // busy-loop if queue is empty
+                int iter = 0;
+                do
+                {
+                    SFallbackList* pFallback = (SFallbackList*)CryInterlockedPopEntrySList(fallbackList);
+                    IF (pFallback, 0)
+                    {
+                        memcpy(pObj, pFallback->object, nObjectSize);
+                        CryModuleMemalignFree(pFallback);
+                        return true;
+                    }
+
+                    if (iter > 10)
+                    {
+                        Sleep(iter > 100 ? 1 : 0);
+                    }
+                    iter++;
+                } while (rRunning && rProducerIndex - rComsumerIndex == 0);
+
+                if (rRunning == 0 && rProducerIndex - rComsumerIndex == 0)
+                {
+                    // if the queue was empty, make sure we really are empty
+                    SFallbackList* pFallback = (SFallbackList*)CryInterlockedPopEntrySList(fallbackList);
+                    IF (pFallback, 0)
+                    {
+                        memcpy(pObj, pFallback->object, nObjectSize);
+                        CryModuleMemalignFree(pFallback);
+                        return true;
+                    }
+                    return false;
+                }
+
+                iter = 0;
+                while (arrStates[rComsumerIndex % nBufferSize] == 0)
+                {
+                    Sleep(iter++ > 10 ? 1 : 0);
+                }
+
+                char* pBuffer = alias_cast<char*>(arrBuffer);
+                uint32 nIndex = rComsumerIndex % nBufferSize;
+
+                memcpy(pObj, pBuffer + (nIndex * nObjectSize), nObjectSize);
+
+                MemoryBarrier();
+                arrStates[nIndex] = 0;
+                MemoryBarrier();
+                rComsumerIndex += 1;
+                MemoryBarrier();
+
+                return true;
+            }
+        } // namespace detail
+    } // namespace CryMT
diff --git a/Code/Legacy/CryCommon/CryThread_windows.h b/Code/Legacy/CryCommon/CryThread_windows.h
new file mode 100644
index 0000000000..a67de49fd4
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryThread_windows.h
@@ -0,0 +1,464 @@
+/*
+ * 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 <process.h>
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define CRYTHREAD_WINDOWS_H_SECTION_1 1
+#define CRYTHREAD_WINDOWS_H_SECTION_2 2
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// CryEvent represent a synchronization event
+//////////////////////////////////////////////////////////////////////////
+class CryEvent
+{
+public:
+    CryEvent();
+    ~CryEvent();
+
+    // Reset the event to the unsignalled state.
+    void Reset();
+    // Set the event to the signalled state.
+    void Set();
+    // Access a HANDLE to wait on.
+    void* GetHandle() const { return m_handle; };
+    // Wait indefinitely for the object to become signalled.
+    void Wait() const;
+    // Wait, with a time limit, for the object to become signalled.
+    bool Wait(const uint32 timeoutMillis) const;
+
+private:
+    CryEvent(const CryEvent&);
+    CryEvent& operator = (const CryEvent&);
+
+private:
+    void* m_handle;
+};
+
+typedef CryEvent CryEventTimed;
+
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// from winnt.h
+struct CRY_CRITICAL_SECTION
+{
+    void* DebugInfo;
+    long LockCount;
+    long RecursionCount;
+    threadID OwningThread;
+    void* LockSemaphore;
+    unsigned long* SpinCount;        // force size on 64-bit systems when packed
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+// kernel mutex - don't use... use CryMutex instead
+class CryLock_WinMutex
+{
+public:
+    CryLock_WinMutex();
+    ~CryLock_WinMutex();
+
+    void Lock();
+    void Unlock();
+    bool TryLock();
+
+    void* _get_win32_handle() { return m_hdl; }
+
+private:
+    CryLock_WinMutex(const CryLock_WinMutex&);
+    CryLock_WinMutex& operator = (const CryLock_WinMutex&);
+
+private:
+    void* m_hdl;
+};
+
+// critical section... don't use... use CryCriticalSection instead
+class CryLock_CritSection
+{
+public:
+    CryLock_CritSection();
+    ~CryLock_CritSection();
+
+    void Lock();
+    void Unlock();
+    bool TryLock();
+
+    bool IsLocked()
+    {
+        return m_cs.RecursionCount > 0 && m_cs.OwningThread == CryGetCurrentThreadId();
+    }
+
+private:
+    CryLock_CritSection(const CryLock_CritSection&);
+    CryLock_CritSection& operator = (const CryLock_CritSection&);
+
+private:
+    CRY_CRITICAL_SECTION m_cs;
+};
+
+template <>
+class CryLockT<CRYLOCK_RECURSIVE>
+    : public CryLock_CritSection
+{
+};
+template <>
+class CryLockT<CRYLOCK_FAST>
+    : public CryLock_CritSection
+{
+};
+class CryMutex
+    : public CryLock_WinMutex
+{
+};
+#define _CRYTHREAD_CONDLOCK_GLITCH 1
+
+//////////////////////////////////////////////////////////////////////////
+class CryConditionVariable
+{
+public:
+    typedef CryMutex LockType;
+
+    CryConditionVariable();
+    ~CryConditionVariable();
+    void Wait(LockType& lock);
+    bool TimedWait(LockType& lock, uint32 millis);
+    void NotifySingle();
+    void Notify();
+
+private:
+    CryConditionVariable(const CryConditionVariable&);
+    CryConditionVariable& operator = (const CryConditionVariable&);
+
+private:
+    int m_waitersCount;
+    CRY_CRITICAL_SECTION m_waitersCountLock;
+    void* m_sema;
+    void* m_waitersDone;
+    size_t m_wasBroadcast;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Platform independet wrapper for a counting semaphore
+class CrySemaphore
+{
+public:
+    CrySemaphore(int nMaximumCount, int nInitialCount = 0);
+    ~CrySemaphore();
+    void Acquire();
+    void Release();
+
+private:
+    void* m_Semaphore;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Platform independet wrapper for a counting semaphore
+// except that this version uses C-A-S only until a blocking call is needed
+// -> No kernel call if there are object in the semaphore
+class CryFastSemaphore
+{
+public:
+    CryFastSemaphore(int nMaximumCount, int nInitialCount = 0);
+    ~CryFastSemaphore();
+    void Acquire();
+    void Release();
+
+private:
+    CrySemaphore m_Semaphore;
+    volatile int32 m_nCounter;
+};
+
+//////////////////////////////////////////////////////////////////////////
+#if !defined(_CRYTHREAD_HAVE_RWLOCK)
+class CryRWLock
+{
+    void* /*SRWLOCK*/ m_Lock;
+
+    CryRWLock(const CryRWLock&);
+    CryRWLock& operator= (const CryRWLock&);
+
+public:
+    CryRWLock();
+    ~CryRWLock();
+
+    void RLock();
+    void RUnlock();
+
+    void WLock();
+    void WUnlock();
+
+    void Lock();
+    void Unlock();
+
+#if defined(_CRYTHREAD_WANT_TRY_RWLOCK)
+    // Enabling TryXXX requires Windows 7 or newer
+    bool TryRLock();
+    bool TryWLock();
+    bool TryLock();
+#endif
+};
+
+// Indicate that this implementation header provides an implementation for
+// CryRWLock.
+#define _CRYTHREAD_HAVE_RWLOCK 1
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+class CrySimpleThreadSelf
+{
+public:
+    CrySimpleThreadSelf();
+    void WaitForThread();
+    virtual ~CrySimpleThreadSelf();
+protected:
+    void StartThread(unsigned (__stdcall * func)(void*), void* argList);
+    static THREADLOCAL CrySimpleThreadSelf* m_Self;
+private:
+    CrySimpleThreadSelf(const CrySimpleThreadSelf&);
+    CrySimpleThreadSelf& operator = (const CrySimpleThreadSelf&);
+protected:
+    void* m_thread;
+    uint32 m_threadId;
+};
+
+template<class Runnable>
+class CrySimpleThread
+    : public CryRunnable
+    , public CrySimpleThreadSelf
+{
+public:
+    typedef void (* ThreadFunction)(void*);
+    typedef CryRunnable RunnableT;
+
+    void SetName(const char* Name)
+    {
+        m_name = Name;
+    }
+    const char* GetName() { return m_name; }
+
+    const volatile bool& GetStartedState() const { return m_bIsStarted; }
+
+private:
+    Runnable* m_Runnable;
+    struct
+    {
+        ThreadFunction m_ThreadFunction;
+        void* m_ThreadParameter;
+    } m_ThreadFunction;
+    volatile bool m_bIsStarted;
+    volatile bool m_bIsRunning;
+    volatile bool m_bCreatedThread;
+    string m_name;
+
+protected:
+    virtual void Terminate()
+    {
+        // This method must be empty.
+        // Derived classes overriding Terminate() are not required to call this
+        // method.
+    }
+
+private:
+    static unsigned __stdcall RunRunnable(void* thisPtr)
+    {
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_WINDOWS_H_SECTION_1
+    #include AZ_RESTRICTED_FILE(CryThread_windows_h)
+#endif
+        CrySimpleThread<Runnable>* const self = (CrySimpleThread<Runnable>*)thisPtr;
+        self->m_bIsStarted = true;
+        self->m_bIsRunning = true;
+
+        self->m_Runnable->Run();
+        self->m_bIsRunning = false;
+        self->m_bCreatedThread = false;
+        self->Terminate();
+        return 0;
+    }
+
+    static unsigned __stdcall RunThis(void* thisPtr)
+    {
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION CRYTHREAD_WINDOWS_H_SECTION_2
+    #include AZ_RESTRICTED_FILE(CryThread_windows_h)
+#endif
+        CrySimpleThread<Runnable>* const self = (CrySimpleThread<Runnable>*)thisPtr;
+        self->m_bIsStarted = true;
+        self->m_bIsRunning = true;
+
+        self->Run();
+        self->m_bIsRunning = false;
+        self->m_bCreatedThread = false;
+        self->Terminate();
+        return 0;
+    }
+
+    CrySimpleThread(const CrySimpleThread<Runnable>&);
+    void operator = (const CrySimpleThread<Runnable>&);
+
+public:
+    CrySimpleThread()
+        : m_bIsStarted(false)
+        , m_bIsRunning(false)
+        , m_bCreatedThread(false)
+    {
+        m_thread = NULL;
+        m_Runnable = NULL;
+    }
+    void* GetHandle() { return m_thread; }
+
+    virtual ~CrySimpleThread()
+    {
+        if (IsStarted())
+        {
+            if (gEnv && gEnv->pLog)
+            {
+                gEnv->pLog->LogError("Runaway thread %p '%s'", m_thread, m_name.c_str());
+            }
+        }
+
+        if (m_bCreatedThread)
+        {
+            Cancel();
+            WaitForThread();
+        }
+    }
+
+    virtual void Run()
+    {
+        // This Run() implementation supports the void StartFunction() method.
+        // However, code using this class (or derived classes) should eventually
+        // be refactored to use one of the other Start() methods.  This code will
+        // be removed some day and the default implementation of Run() will be
+        // empty.
+        if (m_ThreadFunction.m_ThreadFunction != NULL)
+        {
+            m_ThreadFunction.m_ThreadFunction(m_ThreadFunction.m_ThreadParameter);
+        }
+    }
+
+    // Cancel the running thread.
+    //
+    // If the thread class is implemented as a derived class of CrySimpleThread,
+    // then the derived class should provide an appropriate implementation for
+    // this method.  Calling the base class implementation is _not_ required.
+    //
+    // If the thread was started by specifying a Runnable (template argument),
+    // then the Cancel() call is passed on to the specified runnable.
+    //
+    // If the thread was started using the StartFunction() method, then the
+    // caller must find other means to inform the thread about the cancellation
+    // request.
+    virtual void Cancel()
+    {
+        if (IsStarted() && m_Runnable != NULL)
+        {
+            m_Runnable->Cancel();
+        }
+    }
+
+    virtual void Start(Runnable& runnable, [[maybe_unused]] unsigned cpuMask = 0, const char* = NULL, int32 = 0)
+    {
+        if (m_bCreatedThread)
+        {
+            // Don't start thread more than once!
+            return;
+        }
+        m_Runnable = &runnable;
+        m_bCreatedThread = true;
+        StartThread(RunRunnable, this);
+    }
+
+    virtual void Start([[maybe_unused]] unsigned cpuMask = 0, const char* = NULL, int32 = 0, int32 = 0)
+    {
+        if (m_bCreatedThread)
+        {
+            // Don't start thread more than once!
+            return;
+        }
+        m_bCreatedThread = true;
+        StartThread(RunThis, this);
+    }
+
+    void StartFunction(
+        ThreadFunction threadFunction,
+        void* threadParameter = NULL
+        )
+    {
+        m_ThreadFunction.m_ThreadFunction = threadFunction;
+        m_ThreadFunction.m_ThreadParameter = threadParameter;
+        Start();
+    }
+
+    static CrySimpleThread<Runnable>* Self()
+    {
+        return reinterpret_cast<CrySimpleThread<Runnable>*>(m_Self);
+    }
+
+    void Exit()
+    {
+        assert(!"implemented");
+    }
+
+    void Stop()
+    {
+        m_bIsStarted = false;
+    }
+
+    bool IsStarted() const { return m_bIsStarted; }
+    bool IsRunning() const { return m_bIsRunning; }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// base class for lock less Producer/Consumer queue, due platforms specific they
+// are implemented in CryThead_platform.h
+namespace CryMT {
+    namespace detail {
+        ///////////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////////////
+        class SingleProducerSingleConsumerQueueBase
+        {
+        public:
+            SingleProducerSingleConsumerQueueBase()
+            {}
+
+            void Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize);
+            void Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, uint32 nBufferSize, void* arrBuffer, uint32 nObjectSize);
+        };
+
+
+        ///////////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////////////
+        class N_ProducerSingleConsumerQueueBase
+        {
+        public:
+            N_ProducerSingleConsumerQueueBase()
+            {
+                CryInitializeSListHead(fallbackList);
+            }
+
+            void Push(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*   arrStates);
+            bool Pop(void* pObj, volatile uint32& rProducerIndex, volatile uint32& rComsumerIndex, volatile uint32& rRunning, void* arrBuffer, uint32 nBufferSize, uint32 nObjectSize, volatile uint32*    arrStates);
+
+        private:
+            SLockFreeSingleLinkedListHeader fallbackList;
+            struct SFallbackList
+            {
+                SLockFreeSingleLinkedListEntry nextEntry;
+                char alignment_padding[128 - sizeof(SLockFreeSingleLinkedListEntry)];
+                char object[1]; // struct will be overallocated with enough memory for the object
+            };
+        };
+    } // namespace detail
+} // namespace CryMT
diff --git a/Code/Legacy/CryCommon/CryTypeInfo.cpp b/Code/Legacy/CryCommon/CryTypeInfo.cpp
new file mode 100644
index 0000000000..b5c45f26bd
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryTypeInfo.cpp
@@ -0,0 +1,1468 @@
+/*
+ * 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 : Implementation of TypeInfo classes and functions.
+
+#include <AzCore/base.h>
+#include "CryTypeInfo.h"
+#include "CryCustomTypes.h"
+#include "Cry_Math.h"
+#include "CrySizer.h"
+#include "CryEndian.h"
+#include "TypeInfo_impl.h"
+
+// Traits
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(CryTypeInfo_cpp)
+#elif defined(LINUX) || defined(APPLE)
+#define CRYTYPEINFO_CPP_TRAIT_DEFINE_LTOA_S 1
+#endif
+
+#if CRYTYPEINFO_CPP_TRAIT_DEFINE_LTOA_S
+
+char* _ltoa_s(long value, char* string, size_t size, int32 radix)
+{
+    if (10 == radix)
+    {
+        sprintf_s(string, size, "%ld", value);
+    }
+    else
+    {
+        sprintf_s(string, size, "%lx", value);
+    }
+    return(string);
+}
+
+
+char* _i64toa_s(int64 value, char* string, size_t size, int32 radix)
+{
+    if (10 == radix)
+    {
+        sprintf_s(string, size, "%llu", (unsigned long long)value);
+    }
+    else
+    {
+        sprintf_s(string, size, "%llx", (unsigned long long)value);
+    }
+    return(string);
+}
+
+char* _ultoa_s(uint32 value, char* string, size_t size, int32 radix)
+{
+    if (10 == radix)
+    {
+        sprintf_s(string, size, "%.d", value);
+    }
+    else
+    {
+        sprintf_s(string, size, "%.x", value);
+    }
+    return(string);
+}
+
+#endif //LINUX || MAC
+
+//////////////////////////////////////////////////////////////////////
+// Case-insensitive comparison helpers.
+
+class StrNoCase
+{
+public:
+    inline StrNoCase(cstr str)
+        : m_Str(str) {}
+    inline bool operator == (cstr str) const        { return azstricmp(m_Str, str) == 0; }
+    inline bool operator != (cstr str) const        { return azstricmp(m_Str, str) != 0; }
+private:
+    cstr    m_Str;
+};
+
+// Default Endian swap function, forwards to TypeInfo.
+void SwapEndian(const CTypeInfo& Info, [[maybe_unused]] size_t nSizeCheck, void* data, size_t nCount, bool bWriting)
+{
+    assert(nSizeCheck == Info.Size);
+    Info.SwapEndian(data, nCount, bWriting);
+}
+
+//////////////////////////////////////////////////////////////////////
+// Basic TypeInfo implementations.
+
+// Basic type infos.
+
+DEFINE_TYPE_INFO(void, CTypeInfo, ("void", 0, 0))
+
+TYPE_INFO_BASIC(bool)
+TYPE_INFO_BASIC(char)
+TYPE_INFO_BASIC(wchar_t)
+
+TYPE_INFO_INT(signed char)
+TYPE_INFO_INT(unsigned char)
+TYPE_INFO_INT(short)
+TYPE_INFO_INT(unsigned short)
+TYPE_INFO_INT(int)
+TYPE_INFO_INT(unsigned int)
+TYPE_INFO_INT(long)
+TYPE_INFO_INT(unsigned long)
+TYPE_INFO_INT(int64)
+TYPE_INFO_INT(uint64)
+
+TYPE_INFO_BASIC(float)
+TYPE_INFO_BASIC(double)
+
+TYPE_INFO_BASIC(string)
+
+
+const CTypeInfo&PtrTypeInfo()
+{
+    static CTypeInfo Info(TYPE_INFO_NAME(void*), sizeof(void*), alignof(void*));
+    return Info;
+}
+
+//////////////////////////////////////////////////////////////////////
+// Basic type info implementations.
+
+// String conversion functions needed by TypeInfo.
+
+// bool
+string ToString(bool const& val)
+{
+    static string sTrue = "true", sFalse = "false";
+    return val ? sTrue : sFalse;
+}
+
+bool FromString(bool& val, cstr s)
+{
+    if (!strcmp(s, "0") || !azstricmp(s, "false"))
+    {
+        val = false;
+        return true;
+    }
+    if (!strcmp(s, "1") || !azstricmp(s, "true"))
+    {
+        val = true;
+        return true;
+    }
+    return false;
+}
+
+// int64
+string ToString(int64 const& val)
+{
+    char buffer[64];
+    _i64toa_s(val, buffer, sizeof(buffer), 10);
+    return buffer;
+}
+// uint64
+string ToString(uint64 const& val)
+{
+    char buffer[64];
+    sprintf_s(buffer, "%" PRIu64, val);
+    return buffer;
+}
+
+
+
+// long
+string ToString(long const& val)
+{
+    char buffer[64];
+    _ltoa_s(val, buffer, sizeof(buffer), 10);
+    return buffer;
+}
+
+// ulong
+string ToString(unsigned long const& val)
+{
+    char buffer[64];
+    _ultoa_s(val, buffer, sizeof(buffer), 10);
+    return buffer;
+}
+
+template<class T>
+bool ClampedIntFromString(T& val, const char* s)
+{
+    bool signbit = *s == '-';
+    s += signbit;
+    if (signbit && !TIntTraits<T>::bSIGNED)
+    {
+        // Negative number on unsigned.
+        val = T(0);
+        return true;
+    }
+
+    uint digit = (uint8) * s - '0';
+    if (digit > 9)
+    {
+        // No digits.
+        return false;
+    }
+
+    // Extract digits until overflow.
+    T v = static_cast<T>(digit);
+    while ((digit = (uint8) * ++s - '0') <= 9)
+    {
+        T vnew = static_cast<T>(v * 10 + digit);
+        if (vnew < v)
+        {
+            // Overflow.
+            if (signbit)
+            {
+                val = TIntTraits<T>::nMIN;
+            }
+            else
+            {
+                val = TIntTraits<T>::nMAX;
+            }
+            return true;
+        }
+        v = vnew;
+    }
+
+    val = signbit ? ~v + 1 : v;
+    return true;
+}
+
+bool FromString(int64& val, const char* s)                      { return ClampedIntFromString(val, s); }
+bool FromString(uint64& val, const char* s)                     { return ClampedIntFromString(val, s); }
+
+bool FromString(long& val, const char* s)                           { return ClampedIntFromString(val, s); }
+bool FromString(unsigned long& val, const char* s)      { return ClampedIntFromString(val, s); }
+
+string ToString(int const& val)                                             { return ToString(long(val)); }
+bool FromString(int& val, const char* s)                            { return ClampedIntFromString(val, s); }
+
+string ToString(unsigned int const& val)                            { return ToString((unsigned long)(val)); }
+bool FromString(unsigned int& val, const char* s)           { return ClampedIntFromString(val, s); }
+
+string ToString(short const& val)                                           { return ToString(long(val)); }
+bool FromString(short& val, const char* s)                      {   return ClampedIntFromString(val, s); }
+
+string ToString(unsigned short const& val)                      { return ToString((unsigned long)(val)); }
+bool FromString(unsigned short& val, const char* s)     {   return ClampedIntFromString(val, s); }
+
+string ToString(char const& val)                                            { return ToString(long(val)); }
+bool FromString(char& val, const char* s)                           {   return ClampedIntFromString(val, s); }
+
+string ToString(wchar_t const& val)                                     { return ToString(long(val)); }
+bool FromString(wchar_t& val, const char* s)                    {   return ClampedIntFromString(val, s); }
+
+string ToString(signed char const& val)                             { return ToString(long(val)); }
+bool FromString(signed char& val, const char* s)            {   return ClampedIntFromString(val, s); }
+
+string ToString(unsigned char const& val)                           { return ToString((unsigned long)(val)); }
+bool FromString(unsigned char& val, const char* s)      {   return ClampedIntFromString(val, s); }
+
+string ToString(const AZ::Uuid& val)
+{
+    return val.ToString<string>();
+}
+
+bool FromString(AZ::Uuid& val, const char* s)
+{
+    val = AZ::Uuid(s);
+    return true;
+}
+
+float NumToFromString(float val, int digits, bool floating, char buffer[], int buf_size)
+{
+    assert(buf_size >= 32);
+    if (floating)
+    {
+        if (val >= powf(10.f, float(digits)))
+        {
+            sprintf_s(buffer, buf_size, "%.0f", val);
+        }
+        else
+        {
+            sprintf_s(buffer, buf_size, "%.*g", digits, val);
+        }
+    }
+    else
+    {
+        sprintf_s(buffer, buf_size, "%.*f", digits, float(val));
+    }
+#if !defined(NDEBUG)
+    int readCount =
+#endif
+        azsscanf(buffer, "%g", &val);
+    assert(readCount == 1);
+    return val;
+}
+
+// double
+string ToString(double const& val)
+{
+    char buffer[64];
+    sprintf_s(buffer, "%.16g", val);
+    return buffer;
+}
+bool FromString(double& val, const char* s)
+{
+    return azsscanf(s, "%lg", &val) == 1;
+}
+
+// float
+string ToString(float const& val)
+{
+    char buffer[64];
+    for (int digits = 7; digits < 10; digits++)
+    {
+        if (NumToFromString(val, digits, true, buffer, 64) == val)
+        {
+            break;
+        }
+    }
+    return buffer;
+}
+
+bool FromString(float& val, const char* s)
+{
+    return azsscanf(s, "%g", &val) == 1;
+}
+
+
+
+// string override.
+template <>
+void TTypeInfo<string>::GetMemoryUsage(ICrySizer* pSizer, void const* data) const
+{
+    // CRAIG: just a temp hack to try and get things working
+#if !defined(LINUX) && !defined(APPLE)
+    pSizer->AddString(*(string*)data);
+#endif
+}
+
+#if defined(TEST_TYPEINFO) && defined(_DEBUG)
+
+struct STypeInfoTest
+{
+    STypeInfoTest()
+    {
+        TestType(string("well"));
+
+        TestType(true);
+
+        TestType(int8(-0x12));
+        TestType(uint8(0x87));
+        TestType(int16(-0x1234));
+        TestType(uint16(0x8765));
+        TestType(int32(-0x12345678));
+        TestType(uint32(0x87654321));
+        TestType(int64(-0x123456789ABCDEF0LL));
+        TestType(uint64(0xFEDCBA9876543210LL));
+
+        TestType(float(1234.5678));
+        TestType(float(12345678));
+        TestType(float(12345678e-20));
+        TestType(float(12345678e20));
+
+        TestType(double(987654321.0123456789));
+        TestType(double(9876543210123456789.0));
+        TestType(double(9876543210123456789e-40));
+        TestType(double(9876543210123456789e40));
+    }
+};
+static STypeInfoTest _TypeInfoTest;
+
+#endif //TEST_TYPEINFO
+
+
+//////////////////////////////////////////////////////////////////////
+// CTypeInfo implementation
+
+//---------------------------------------------------------------------------
+// Endian helper functions.
+
+void CTypeInfo::SwapEndian(void* pData, size_t nCount, [[maybe_unused]] bool bWriting) const
+{
+    switch (Size)
+    {
+    case 1:
+        break;
+    case 2:
+        ::SwapEndianBase((uint16*)pData, nCount);
+        break;
+    case 4:
+        ::SwapEndianBase((uint32*)pData, nCount);
+        break;
+    case 8:
+        ::SwapEndianBase((uint64*)pData, nCount);
+        break;
+    default:
+        assert(0);
+    }
+}
+
+// If attr name is found, return pointer to start of value text; else 0.
+static cstr FindAttr(cstr attrs, cstr name)
+{
+    size_t name_len = strlen(name);
+    while (attrs)
+    {
+        attrs = strchr(attrs, '<');
+        if (!attrs)
+        {
+            return 0;
+        }
+
+        attrs++;
+        size_t attr_len = strcspn(attrs, "=>");
+        if (attr_len == name_len && _strnicmp(attrs, name, name_len) == 0)
+        {
+            attrs += attr_len;
+            if (*attrs == '=')
+            {
+                ++attrs;
+            }
+            return attrs;
+        }
+        attrs += attr_len;
+        if (*attrs == '=')
+        {
+            attrs = strchr(attrs + 1, '>');
+        }
+    }
+    return 0;
+}
+
+bool CTypeInfo::CVarInfo::GetAttr(cstr name) const
+{
+    return FindAttr(Attrs, name) != 0;
+}
+
+bool CTypeInfo::CVarInfo::GetAttr(cstr name, string& val) const
+{
+    cstr valstr = FindAttr(Attrs, name);
+    if (!valstr)
+    {
+        return false;
+    }
+
+    // Find attr delimiter.
+    cstr end = strchr(valstr, '>');
+    if (!end)
+    {
+        return false;
+    }
+
+    // Strip quotes.
+    if (*valstr == '"')
+    {
+        valstr++;
+        if (end - valstr > 1 && end[-1] == '"')
+        {
+            end--;
+        }
+    }
+    val = string(valstr, end - valstr);
+    return true;
+}
+
+bool CTypeInfo::CVarInfo::GetAttr(cstr name, float& val) const
+{
+    cstr valstr = FindAttr(Attrs, name);
+    if (!valstr)
+    {
+        return false;
+    }
+    val = (float)atof(valstr);
+    return true;
+}
+
+cstr CTypeInfo::CVarInfo::GetComment() const
+{
+    cstr send = strrchr(Attrs, '>');
+    if (send)
+    {
+        do
+        {
+            ++send;
+        } while (*send == ' ');
+        return send;
+    }
+    else
+    {
+        return Attrs;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+// CStructInfo implementation
+
+inline cstr DisplayName(cstr name)
+{
+    // Skip prefixes in Name.
+    cstr dname = name;
+    while (islower((unsigned char)*dname) || *dname == '_')
+    {
+        dname++;
+    }
+    if (isupper((unsigned char)*dname))
+    {
+        return dname;
+    }
+    else
+    {
+        return name;
+    }
+}
+
+CStructInfo::CStructInfo(cstr name, size_t size, size_t align, Array<CVarInfo> vars, Array<CTypeInfo const*> templates)
+    : CTypeInfo(name, size, align)
+    , Vars(vars)
+    , TemplateTypes(templates)
+    , HasBitfields(false)
+{
+    // Process and validate offsets and sizes.
+    if (Vars.size() > 0)
+    {
+        size = 0;
+        int bitoffset = 0;
+
+        for (int i = 0; i < Vars.size(); i++)
+        {
+            CStructInfo::CVarInfo& var = Vars[i];
+
+            // Convert name.
+            var.Name = DisplayName(var.Name);
+
+            if (var.bBitfield)
+            {
+                HasBitfields = true;
+                if (bitoffset > 0)
+                {
+                    // Continuing bitfield.
+                    var.Offset = Vars[i - 1].Offset;
+                    var.BitWordWidth = Vars[i - 1].BitWordWidth;
+
+                    if (bitoffset + var.ArrayDim > var.GetSize() * 8)
+                    {
+                        // Overflows word, start on next one.
+                        bitoffset = 0;
+                        size += var.GetSize();
+                    }
+                }
+
+                if (bitoffset == 0)
+                {
+                    var.Offset = check_cast<uint32>(size);
+
+                    // Detect real word size of bitfield, from offset of next field.
+                    size_t next_offset = Size;
+                    for (int j = i + 1; j < Vars.size(); j++)
+                    {
+                        if (!Vars[j].bBitfield)
+                        {
+                            next_offset = Vars[j].Offset;
+                            break;
+                        }
+                    }
+                    assert(next_offset > size);
+                    size_t wordsize = min(next_offset - size, var.Type.Size);
+                    size = next_offset;
+                    switch (wordsize)
+                    {
+                    case 1:
+                        var.BitWordWidth = 0;
+                        break;
+                    case 2:
+                        var.BitWordWidth = 1;
+                        break;
+                    case 4:
+                        var.BitWordWidth = 2;
+                        break;
+                    case 8:
+                        var.BitWordWidth = 3;
+                        break;
+                    default:
+                        assert(0);
+                    }
+                }
+
+                assert(var.ArrayDim <= var.GetSize() * 8);
+                var.BitOffset = bitoffset;
+                bitoffset += var.ArrayDim;
+            }
+            else
+            {
+                bitoffset = 0;
+                if (var.Offset >= size)
+                {
+                    size = var.Offset + var.GetSize();
+                }
+            }
+        }
+        assert(Align(size, Alignment) == Align(Size, Alignment));
+    }
+}
+
+size_t EndianDescSize(cstr desc)
+{
+    // Iterate the endian descriptor.
+    size_t nSize = 0;
+    for (; *desc; desc++)
+    {
+        size_t count = *desc & 0x3F;
+        size_t nType = *(uint8*)desc >> 6;
+        nSize += count << nType;
+    }
+    return nSize;
+}
+
+size_t CStructInfo::AddEndianDesc(cstr desc, size_t dim, size_t elem_size)
+{
+    if (dim == 0)
+    {
+        return 0;
+    }
+
+    size_t endian_size = EndianDescSize(desc);
+    size_t total_size = elem_size * (dim - 1) + endian_size;
+
+    if (desc[1] || (endian_size < elem_size && dim > 1))
+    {
+        // Composite endian descriptor, replicate it.
+        assert(endian_size <= elem_size);
+        assert(elem_size - endian_size < 0x40);
+        while (dim-- > 0)
+        {
+            EndianDesc += (cstr)desc;
+            if (dim > 1 && endian_size < elem_size)
+            {
+                EndianDesc += char(0x40 | (elem_size - endian_size));
+            }
+        }
+    }
+    else
+    {
+        // Single endian component. Replicate using count field.
+        size_t subdim = desc[0] & 0x3F;
+        dim *= subdim;
+        if (!EndianDesc.empty())
+        {
+            // Combine with previous component if possible.
+            char prevdesc = *(EndianDesc.end() - 1);
+            if ((prevdesc & ~0x3F) == (desc[0] & ~0x3F))
+            {
+                // Combine with previous char.
+                size_t maxdim = min(dim, size_t(0x3F - (prevdesc & 0x3F)));
+                prevdesc += check_cast<char>(maxdim);
+                EndianDesc.erase(EndianDesc.length() - 1, 1);
+                EndianDesc.append(1, prevdesc);
+                dim -= maxdim;
+            }
+        }
+        for (; dim > 0x3F; dim -= 0x3F)
+        {
+            EndianDesc += desc[0] | 0x3F;
+        }
+        if (dim > 0)
+        {
+            EndianDesc += check_cast<char>((desc[0] & ~0x3F) | dim);
+        }
+    }
+
+    return total_size;
+}
+
+bool CStructInfo::FromValue(void* data, const void* value, const CTypeInfo& typeVal) const
+{
+    if (IsCompatibleType(typeVal))
+    {
+        bool bOK = true;
+        int i = 0;
+        for AllSubVars(pToVar, typeVal)
+        {
+            if (!Vars[i].Type.FromValue(Vars[i].GetAddress(data), pToVar->GetAddress(value), pToVar->Type))
+            {
+                bOK = false;
+            }
+            i++;
+        }
+        return bOK;
+    }
+
+    // Check all subclasses.
+    for (int i = 0; i < Vars.size() && Vars[i].IsBaseClass(); i++)
+    {
+        if (Vars[i].Type.FromValue(Vars[i].GetAddress(data), value, typeVal))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CStructInfo::ToValue(const void* data, void* value, const CTypeInfo& typeVal) const
+{
+    if (IsCompatibleType(typeVal))
+    {
+        bool bOK = true;
+        int i = 0;
+        for AllSubVars(pToVar, typeVal)
+        {
+            if (!Vars[i].Type.ToValue(Vars[i].GetAddress(data), pToVar->GetAddress(value), pToVar->Type))
+            {
+                bOK = false;
+            }
+            i++;
+        }
+        return bOK;
+    }
+
+    // Check all subclasses.
+    for (int i = 0; i < Vars.size() && Vars[i].IsBaseClass(); i++)
+    {
+        if (Vars[i].Type.ToValue(Vars[i].GetAddress(data), value, typeVal))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+// Parse structs as comma-separated values.
+
+/*                                  ,               1,      ,2      1,2
+
+        Top                                         1           ,2      1,2             ; strip trail commas
+        Child   Named                           1           (,2)    (1,2)           ; strip trail commas, paren if internal commas
+                    Nameless    ,               1,      ,2      1,2             ;
+*/
+
+static void StripCommas(string& str)
+{
+    size_t nLast = str.size();
+    while (nLast > 0 && str[nLast - 1] == ',')
+    {
+        nLast--;
+    }
+    str.resize(nLast);
+}
+
+string CStructInfo::ToString(const void* data, FToString flags, const void* def_data) const
+{
+    string str;                     // Return str.
+
+    for (int i = 0; i < Vars.size(); i++)
+    {
+        // Handling of empty values: Skip trailing empty values.
+        // If there are intermediate empty values, replace them with non-empty ones.
+        const CVarInfo& var = Vars[i];
+
+        if (!var.IsInline())
+        {
+            // Named sub var or struct.
+            if (!flags.NamedFields && i > 0)
+            {
+                str += ",";
+            }
+
+            string substr = var.ToString(data, FToString(flags).Sub(0), def_data);
+
+            if (flags.SkipDefault && substr.empty())
+            {
+                continue;
+            }
+
+            if (flags.NamedFields)
+            {
+                if (*str)
+                {
+                    str += ",";
+                }
+                if (*var.Name)
+                {
+                    str += var.Name;
+                    str += "=";
+                }
+            }
+            if (substr.find(',') != string::npos || substr.find('=') != string::npos)
+            {
+                // Encase nested composite types in parens.
+                str += "(";
+                str += substr;
+                str += ")";
+            }
+            else
+            {
+                str += substr;
+            }
+        }
+        else
+        {
+            // Nameless base struct. Treat children as inline.
+            str += var.ToString(data, FToString(flags).Sub(1), def_data);
+        }
+    }
+
+    if (flags.SkipDefault && !flags.Sub)
+    {
+        StripCommas(str);
+    }
+    return str;
+}
+
+// Retrieve and return one subelement from src, advancing the pointer.
+// Copy to tempstr if necessary.
+
+typedef CryStackStringT<char, 256> CTempStr;
+
+void ParseElement(cstr& src, cstr& varname, cstr& val, CTempStr& tempstr)
+{
+    varname = val = 0;
+
+    while (*src == ' ')
+    {
+        src++;
+    }
+    if (!*src)
+    {
+        return;
+    }
+
+    // Find end of var assignment.
+    int nest = 0;
+    cstr eq = 0;
+
+    cstr end;
+    for (end = src; *end; end++)
+    {
+        if (*end == '(')
+        {
+            nest++;
+        }
+        else if (*end == ')')
+        {
+            nest--;
+        }
+        else if (nest == 0)
+        {
+            if (*end == '=' && !eq)
+            {
+                eq = end;
+            }
+            else if (*end == ',')
+            {
+                break;
+            }
+        }
+    }
+
+    // Advance src past element.
+    val = src;
+    src = end;
+
+    if (*src == ',')
+    {
+        src++;
+    }
+
+    if (eq)
+    {
+        varname = val;
+        val = eq + 1;
+    }
+
+    PREFAST_ASSUME(val);
+    if (*val == '(' && end[-1] == ')')
+    {
+        // Remove parens.
+        val++;
+        end--;
+    }
+
+    if (eq)
+    {
+        if (*end)
+        {
+            // Must copy sub string to temp.
+            val = (cstr)tempstr + (val - varname);
+            eq = (cstr)tempstr + (eq - varname);
+            varname = tempstr.assign(varname, end);
+            non_const(*eq) = 0;
+        }
+        else
+        {
+            // Copy just varname to temp, return val in place.
+            varname = tempstr.assign(varname, eq);
+        }
+    }
+    else if (*end)
+    {
+        // Must copy sub string to temp.
+        val = tempstr.assign(val, end);
+    }
+
+    // Else can return val without copying.
+}
+
+bool CStructInfo::FromString(void* data, cstr str, FFromString flags) const
+{
+    if (!flags.SkipEmpty)
+    {
+        // Initialise all to default
+        for (int i = 0; i < Vars.size(); i++)
+        {
+            Vars[i].FromString(data, "");
+        }
+    }
+
+    CTempStr tempstr;
+    const CVarInfo* pVar = 0;
+    int nErrors = 0;
+
+    while (*str)
+    {
+        cstr varname, val;
+        ParseElement(str, varname, val, tempstr);
+
+        if (varname)
+        {
+            pVar = FindSubVar(varname);
+        }
+        else
+        {
+            pVar = NextSubVar(pVar, true);
+        }
+        if (pVar)
+        {
+            if (*val || !flags.SkipEmpty)
+            {
+                nErrors += !pVar->FromString(data, val, flags);
+            }
+        }
+        else
+        {
+            nErrors++;
+        }
+    }
+
+    return !nErrors;
+}
+
+bool CStructInfo::ValueEqual(const void* data, const void* def_data) const
+{
+    for (int i = 0; i < Vars.size(); i++)
+    {
+        const CVarInfo& var = Vars[i];
+        if (!var.Type.ValueEqual((char*)data + var.Offset, (def_data ? (char*)def_data + var.Offset : 0)))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+void CStructInfo::SwapEndian(void* data, size_t nCount, bool bWriting) const
+{
+    non_const(*this).MakeEndianDesc();
+
+    if (EndianDesc.length() == 1 && !HasBitfields && EndianDescSize(EndianDesc) == Size)
+    {
+        // Optimised array swap.
+        size_t nElems = (EndianDesc[0u] & 0x3F) * nCount;
+        switch (EndianDesc[0u] & 0xC0)
+        {
+        case 0:             // Skip bytes
+            break;
+        case 0x40:      // Swap 2 bytes
+            ::SwapEndianBase((uint16*)data, nElems);
+            break;
+        case 0x80:      // Swap 4 bytes
+            ::SwapEndianBase((uint32*)data, nElems);
+            break;
+        case 0xC0:      // Swap 8 bytes
+            ::SwapEndianBase((uint64*)data, nElems);
+            break;
+        }
+        return;
+    }
+
+    for (; nCount-- > 0; data = (char*)data + Size)
+    {
+        // First swap bits.
+        // Iterate the endian descriptor.
+        void* step = data;
+        for (cstr desc = EndianDesc; *desc; desc++)
+        {
+            size_t nElems = *desc & 0x3F;
+            switch (*desc & 0xC0)
+            {
+            case 0:             // Skip bytes
+                step = (uint8*)step + nElems;
+                break;
+            case 0x40:      // Swap 2 bytes
+                ::SwapEndianBase((uint16*)step, nElems);
+                step = (uint16*)step + nElems;
+                break;
+            case 0x80:      // Swap 4 bytes
+                ::SwapEndianBase((uint32*)step, nElems);
+                step = (uint32*)step + nElems;
+                break;
+            case 0xC0:      // Swap 8 bytes
+                ::SwapEndianBase((uint64*)step, nElems);
+                step = (uint64*)step + nElems;
+                break;
+            }
+        }
+
+        // Then bitfields if needed.
+        if (HasBitfields)
+        {
+            uint64 uOrigBits = 0, uNewBits = 0;
+            for (int i = 0; i < Vars.size(); i++)
+            {
+                CVarInfo const& var = Vars[i];
+                if (var.bBitfield)
+                {
+                    // Reverse location of all bitfields in word.
+                    size_t nWordBits = var.GetElemSize() * 8;
+                    assert(nWordBits <= 64);
+                    if (var.BitOffset == 0)
+                    {
+                        // Initialise bitfield swapping.
+                        var.Type.ToValue(var.GetAddress(data), uOrigBits);
+                        uNewBits = 0;
+                    }
+                    size_t nSrcOffset = (GetPlatformEndian() == eLittleEndian) == bWriting ? var.BitOffset : nWordBits - var.GetBits() - var.BitOffset;
+                    size_t nDstOffset = nWordBits - var.GetBits() - nSrcOffset;
+
+                    uint64 uFieldVal = uOrigBits >> nSrcOffset;
+                    uFieldVal &= ((1 << var.GetBits()) - 1);
+                    uNewBits |= uFieldVal << nDstOffset;
+                    var.Type.FromValue(var.GetAddress(data), uNewBits);
+                }
+            }
+        }
+    }
+}
+
+void CStructInfo::MakeEndianDesc()
+{
+    if (!EndianDesc.empty())
+    {
+        return;
+    }
+
+    size_t last_offset = 0;
+    for (int i = 0; i < Vars.size(); i++)
+    {
+        CVarInfo const& var = Vars[i];
+        bool bUnionAlias = var.bBitfield ? var.BitOffset > 0 : var.Offset < last_offset;
+        if (!bUnionAlias)
+        {
+            // Add endian desc for member.
+            cstr subdesc = 0;
+            if (var.Type.HasSubVars())
+            {
+                // Struct-computed endian desc.
+                CStructInfo const& infoSub = static_cast<CStructInfo const&>(var.Type);
+                non_const(infoSub).MakeEndianDesc();
+                subdesc = infoSub.EndianDesc;
+                if (!*subdesc)
+                {
+                    // No swapping.
+                    continue;
+                }
+            }
+            else
+            {
+                // Basic type.
+                switch (var.GetElemSize())
+                {
+                case 0:
+                case 1:
+                    continue;                                           // No swapping needed.
+                case 2:
+                    subdesc = "\x41";
+                    break;
+                case 4:
+                    subdesc = "\x81";
+                    break;
+                case 8:
+                    subdesc = "\xC1";
+                    break;
+                default:
+                    assert(0);
+                }
+            }
+
+            // Apply any padding to current offset.
+            assert(last_offset <= var.Offset);
+            if (last_offset < var.Offset)
+            {
+                last_offset += AddEndianDesc("\x01", var.Offset - last_offset, 1);
+            }
+            last_offset += AddEndianDesc(subdesc, var.GetDim(), var.GetElemSize());
+        }
+    }
+}
+
+void CStructInfo::GetMemoryUsage(ICrySizer* pSizer, void const* data) const
+{
+    for (int i = 0; i < Vars.size(); i++)
+    {
+        Vars[i].Type.GetMemoryUsage(pSizer, (char*)data + Vars[i].Offset);
+    }
+}
+
+const CTypeInfo::CVarInfo* CStructInfo::NextSubVar(const CVarInfo* pPrev, bool bRecurseBase) const
+{
+    if (pPrev >= Vars.begin() && pPrev < Vars.end())
+    {
+        // pPrev is within this struct's vars
+        if (++pPrev < Vars.end())
+        {
+            return pPrev;
+        }
+        return 0;
+    }
+
+    if (Vars.empty())
+    {
+        return 0;
+    }
+
+    if (bRecurseBase)
+    {
+        // Recurse into inline base structs
+        const CVarInfo* pBase = Vars.begin();
+        if (pBase->IsInline())
+        {
+            if (const CVarInfo* pNext = pBase->Type.NextSubVar(pPrev, true))
+            {
+                return pNext;
+            }
+            if (++pBase < Vars.end())
+            {
+                return pBase;
+            }
+            return 0;
+        }
+    }
+
+    if (!pPrev)
+    {
+        // Return first var
+        return Vars.begin();
+    }
+
+    return 0;
+}
+
+const CTypeInfo::CVarInfo* CStructInfo::FindSubVar(cstr name) const
+{
+    static int s_nLast = 0;
+    int nSize = Vars.size();
+    if (s_nLast >= nSize)
+    {
+        s_nLast = 0;
+    }
+
+    for (int i = s_nLast, iEnd = s_nLast + nSize; i < iEnd; i++)
+    {
+        int v = i >= nSize ? i - nSize : i;
+        const CVarInfo& var = Vars[v];
+        if (var.Type.Size > 0 && StrNoCase(var.GetName()) == name)
+        {
+            s_nLast = v;
+            return &var;
+        }
+        if (var.IsBaseClass())
+        {
+            if (const CVarInfo* pSubVar = var.Type.FindSubVar(name))
+            {
+                return pSubVar;
+            }
+        }
+    }
+    return 0;
+}
+
+bool CStructInfo::IsCompatibleType(CTypeInfo const& Info) const
+{
+    if (this == &Info)
+    {
+        return true;
+    }
+
+    if (!TemplateTypes.empty() && Info.IsTemplate() && strcmp(Name, Info.Name) == 0)
+    {
+        CTypeInfo const* const* pA = NextTemplateType(0);
+        CTypeInfo const* const* pB = Info.NextTemplateType(0);
+
+        while (pA && pB && (*pA)->IsType(**pB))
+        {
+            pA = Info.NextTemplateType(pA);
+            pB = Info.NextTemplateType(pB);
+        }
+        return !pA && !pB;
+    }
+
+    return false;
+}
+
+bool CStructInfo::IsType(CTypeInfo const& Info) const
+{
+    if (IsCompatibleType(Info))
+    {
+        return true;
+    }
+
+    // Check all subclasses.
+    for (int i = 0; i < Vars.size() && Vars[i].IsBaseClass(); i++)
+    {
+        if (Vars[i].Type.IsType(Info))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+// CSimpleEnumDef implementation
+
+cstr ParseNextEnum(char*& rs)
+{
+    char* s = rs;
+    while (isspace(*s))
+    {
+        s++;
+    }
+    if (!*s)
+    {
+        return 0;
+    }
+
+    cstr se = s;
+    while (isalnum(*s) || *s == '_')
+    {
+        s++;
+    }
+
+    if (*s == ',')
+    {
+        *s++ = 0;
+    }
+    else if (*s)
+    {
+        *s++ = 0;
+        while (*s && *s != ',')
+        {
+            s++;
+        }
+        if (*s)
+        {
+            s++;
+        }
+    }
+    rs = s;
+    return se;
+}
+
+void CSimpleEnumDef::Init(Array<cstr> names, char* enum_str)
+{
+    asNames = names;
+
+    // Split copy of enums string into elements, store in array.
+    int i = 0;
+    while (cstr se = ParseNextEnum(enum_str))
+    {
+        asNames[i++] = se;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+// CEnumDef implementation
+
+void CEnumDef::Init(Array<SElem> elems, char* enum_str)
+{
+    Elems = elems;
+    MinValue = 0;
+    bRegular = true;
+    nPrefixLength = 0;
+
+    if (enum_str)
+    {
+        // Parse enum names from str
+        int i = 0;
+        while (cstr se = ParseNextEnum(enum_str))
+        {
+            Elems[i++].Name = se;
+        }
+    }
+
+    // Analyse names and values.
+    if (!elems.empty())
+    {
+        cstr sPrefix = "";
+        MinValue =  Elems[0].Value;
+        for (int i = 0; i < elems.size(); i++)
+        {
+            if (Elems[i].Value != i + Elems[0].Value)
+            {
+                bRegular = false;
+            }
+            MinValue = min(MinValue, Elems[i].Value);
+
+            // Find common prefix.
+            cstr sElem = Elems[i].Name;
+            if (*sElem)
+            {
+                if (!*sPrefix)
+                {
+                    sPrefix = sElem;
+                    nPrefixLength = static_cast<uint>(strlen(sPrefix));
+                }
+                else
+                {
+                    uint p = 0;
+                    while (p < nPrefixLength && sElem[p] == sPrefix[p])
+                    {
+                        p++;
+                    }
+                    nPrefixLength = p;
+                }
+            }
+        }
+
+        // Ensure prefix is on underscore boundary.
+        while (nPrefixLength > 0 && sPrefix[nPrefixLength - 1] != '_')
+        {
+            nPrefixLength--;
+        }
+    }
+}
+
+bool CEnumDef::MatchName(uint i, cstr str) const
+{
+    cstr name = Elems[i].Name;
+    if (*name && nPrefixLength)
+    {
+        if (azstricmp(name + nPrefixLength, str) == 0)
+        {
+            return true;
+        }
+    }
+    if (*name == '_')
+    {
+        name++;
+    }
+    return azstricmp(name, str) == 0;
+}
+
+cstr CEnumDef::ToName(TValue value) const
+{
+    // Find matching element.
+    if (bRegular)
+    {
+        TValue index = value - MinValue;
+        if (index >= 0 && index < Elems.size())
+        {
+            return Name((uint)index);
+        }
+    }
+    else
+    {
+        for (int i = 0; i < Elems.size(); i++)
+        {
+            if (Elems[i].Value == value)
+            {
+                return Name(i);
+            }
+        }
+    }
+
+    // No match
+    return 0;
+}
+
+LegacyDynArray<CEnumDef::SElem>* CEnumDef::SInit::s_pElems = 0;
+
+void CEnumDefUuid::Init(Array<SElem> elems, char* enum_str)
+{
+    Elems = elems;
+    bRegular = false;
+    nPrefixLength = 0;
+
+    if (enum_str)
+    {
+        // Parse enum names from str
+        int i = 0;
+        while (cstr se = ParseNextEnum(enum_str))
+        {
+            Elems[i++].Name = se;
+        }
+    }
+
+    // Analyse names and values.
+    if (!elems.empty())
+    {
+        cstr sPrefix = "";
+        for (int i = 0; i < elems.size(); i++)
+        {
+            // Find common prefix.
+            cstr sElem = Elems[i].Name;
+            if (*sElem)
+            {
+                if (!*sPrefix)
+                {
+                    sPrefix = sElem;
+                    nPrefixLength = static_cast<uint>(strlen(sPrefix));
+                }
+                else
+                {
+                    uint p = 0;
+                    while (p < nPrefixLength && sElem[p] == sPrefix[p])
+                    {
+                        p++;
+                    }
+                    nPrefixLength = p;
+                }
+            }
+        }
+
+        // Ensure prefix is on underscore boundary.
+        while (nPrefixLength > 0 && sPrefix[nPrefixLength - 1] != '_')
+        {
+            nPrefixLength--;
+        }
+    }
+}
+
+bool CEnumDefUuid::MatchName(uint i, cstr str) const
+{
+    cstr name = Elems[i].Name;
+    if (*name && nPrefixLength)
+    {
+        if (azstricmp(name + nPrefixLength, str) == 0)
+        {
+            return true;
+        }
+    }
+    if (*name == '_')
+    {
+        name++;
+    }
+    return azstricmp(name, str) == 0;
+}
+
+cstr CEnumDefUuid::ToName(AZ::Uuid value) const
+{
+    // Find matching element.
+    for (int i = 0; i < Elems.size(); ++i)
+    {
+        if (Elems[i].Value == value)
+        {
+            return Elems[i].Name;
+        }
+    }
+    // No match
+    return 0;
+}
diff --git a/Code/Legacy/CryCommon/CryTypeInfo.h b/Code/Legacy/CryCommon/CryTypeInfo.h
new file mode 100644
index 0000000000..319bd054fd
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryTypeInfo.h
@@ -0,0 +1,223 @@
+/*
+ * 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 : Declaration of CTypeInfo and related types.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYTYPEINFO_H
+#define CRYINCLUDE_CRYCOMMON_CRYTYPEINFO_H
+#pragma once
+
+#include <platform.h>
+#include "CryArray.h"
+#include "Options.h"
+#include "CryString.h"
+#include "TypeInfo_decl.h"
+
+class ICrySizer;
+
+class CCryName;
+string ToString(CCryName const& val);
+bool FromString(CCryName& val, const char* s);
+
+//---------------------------------------------------------------------------
+// Specify options for converting data to/from strings
+struct FToString
+{
+    OPT_STRUCT(FToString)
+    OPT_VAR(bool, SkipDefault)      // Omit default values on writing.
+    OPT_VAR(bool, NamedFields)      // Add Name= text to sub-values.
+    OPT_VAR(bool, Sub)                      // Write sub-structures (internal usage).
+};
+
+struct FFromString
+{
+    OPT_STRUCT(FFromString)
+    OPT_VAR(bool, SkipEmpty)            // Do not set values from empty strings (otherwise, set to zero).
+};
+
+// Specify which limits a variable has
+enum ENumericLimit
+{
+    eLimit_Min,
+    eLimit_Max,
+    eLimit_SoftMin,
+    eLimit_SoftMax,
+    eLimit_MinIsInfinite,
+    eLimit_Step,
+};
+
+//---------------------------------------------------------------------------
+// Type info base class, and default implementation
+
+struct CTypeInfo
+{
+    cstr        Name;
+    size_t  Size;
+    size_t  Alignment;
+
+    CTypeInfo(cstr name, size_t size, size_t align)
+        : Name(name)
+        , Size(size)
+        , Alignment(align) {}
+
+    virtual ~CTypeInfo()
+    {}
+
+    //
+    // Inheritance.
+    //
+    virtual bool IsType(CTypeInfo const& Info) const
+    { return this == &Info; }
+
+    template<class T>
+    bool IsType() const
+    { return IsType(TypeInfo((T*)0)); }
+
+    //
+    // Data access interface.
+    //
+
+    // Convert value to string.
+    virtual string ToString([[maybe_unused]] const void* data, [[maybe_unused]] FToString flags = 0, [[maybe_unused]] const void* def_data = 0) const
+    { return ""; }
+
+    // Write value from string, return success.
+    virtual bool FromString([[maybe_unused]] void* data, [[maybe_unused]] cstr str, [[maybe_unused]] FFromString flags = 0) const
+    { return false; }
+
+    // Read and write values of a specified type.
+    virtual bool ToValue([[maybe_unused]] const void* data, [[maybe_unused]] void* value, [[maybe_unused]] const CTypeInfo& typeVal) const
+    { return false; }
+
+    virtual bool FromValue([[maybe_unused]] void* data, [[maybe_unused]] const void* value, [[maybe_unused]] const CTypeInfo& typeVal) const
+    { return false; }
+
+    // Templated interface to above functions.
+    template<class T>
+    bool ToValue(const void* data, T& value) const
+    { return ToValue(data, &value, TypeInfo(&value)); }
+    template<class T>
+    bool FromValue(void* data, const T& value) const
+    { return FromValue(data, &value, TypeInfo(&value)); }
+
+    virtual bool ValueEqual(const void* data, const void* def_data = 0) const
+    { return ToString(data, FToString().SkipDefault(1), def_data).empty(); }
+
+    virtual bool GetLimit([[maybe_unused]] ENumericLimit eLimit, [[maybe_unused]] float& fVal) const
+    { return false; }
+
+    // Convert numeric formats from big-to-little endian or vice versa.
+    // Swaps bitfield order as well (which may be separate from integer bit order).
+    virtual void SwapEndian(void* pData, size_t nCount, bool bWriting) const;
+
+    // Track memory used by any internal structures (not counting object size itself).
+    // Add to CrySizer as needed, return remaining mem count.
+    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer, [[maybe_unused]] const void* data) const
+    {}
+
+    //
+    // Structure interface.
+    //
+    struct CVarInfo
+    {
+        const CTypeInfo&        Type;                               // Info for type of variable.
+        cstr                                Name;                               // Display name of variable.
+        cstr                                Attrs;                          // Var-specific attribute string, of form:
+        // "<name=value>" for each attr, concatenated.
+        // Remaining text considered as comment.
+        uint32                          Offset;                         // Offset in bytes from struct start.
+        uint32                          ArrayDim : 22,               // Number of array elements, or bits if bitfield.
+                                        bBaseClass : 1,                 // Sub-var is actually a base class.
+                                        bBitfield : 1,                      // Var is a bitfield, ArrayDim is number of bits.
+                                        BitOffset : 6,                      // Additional offset in bits for bitfields.
+        // Bit offset is computed in declaration order; on some platforms, it goes high to low.
+                                        BitWordWidth : 2;               // Width of bitfield = 1 byte << BitWordWidth
+
+
+        // Accessors.
+        cstr GetName() const                                    { return Name; }
+        size_t GetDim() const                                   { return bBitfield ? 1 : ArrayDim; }
+        size_t GetSize() const                              { return bBitfield ? (size_t)1 << BitWordWidth : Type.Size* ArrayDim; }
+        size_t GetElemSize() const                      { return bBitfield ? (size_t)1 << BitWordWidth : Type.Size; }
+        size_t GetBits() const                              { return bBitfield ? ArrayDim : ArrayDim* Type.Size* 8; }
+        bool IsBaseClass() const                            { return bBaseClass; }
+        bool IsInline() const
+        {
+            if (bBaseClass && Offset == 0)
+            {
+                const CVarInfo* pFirst = Type.NextSubVar(0);
+                if (pFirst)
+                {
+                    return pFirst->IsBaseClass();
+                }
+            }
+            return false;
+        }
+
+        bool GetLimit(ENumericLimit eLimit, float& fVal) const
+        {
+            return Type.GetLimit(eLimit, fVal);
+        }
+
+        // Useful functions.
+        void* GetAddress(void* base) const
+        {
+            return (char*)base + Offset;
+        }
+        const void* GetAddress(const void* base) const
+        {
+            return (const char*)base + Offset;
+        }
+        bool FromString(void* base, cstr str, FFromString flags = 0) const
+        {
+            assert(!bBitfield);
+            return Type.FromString((char*)base + Offset, str, flags);
+        }
+        string ToString(const void* base, FToString flags = 0, const void* def_base = 0) const
+        {
+            assert(!bBitfield);
+            return Type.ToString((const char*)base + Offset, flags, def_base ? (const char*)def_base + Offset : 0);
+        }
+
+        // Attribute access. Not fast.
+        bool GetAttr(cstr name) const;
+        bool GetAttr(cstr name, float& val) const;
+        bool GetAttr(cstr name, string& val) const;
+
+        // Comment, excluding attributes.
+        cstr GetComment() const;
+    };
+
+    // Structure var iteration.
+    virtual CVarInfo const* NextSubVar([[maybe_unused]] CVarInfo const* pPrev, [[maybe_unused]] bool bRecurseBase = false) const
+    { return 0; }
+    inline bool HasSubVars() const
+    { return NextSubVar(0) != 0; }
+    #define AllSubVars(pVar, Info) \
+    (const CTypeInfo::CVarInfo* pVar = (Info).NextSubVar(0); pVar; pVar = (Info).NextSubVar(pVar))
+
+    // Named var search.
+    virtual const CVarInfo* FindSubVar([[maybe_unused]] cstr name) const
+    { return 0; }
+
+    virtual CTypeInfo const* const* NextTemplateType([[maybe_unused]] CTypeInfo const* const* pPrev) const
+    { return 0; }
+    inline bool IsTemplate() const
+    { return NextTemplateType(0) != 0; }
+
+    //
+    // String enumeration interface.
+    // Return sequential strings in enumeration, then 0 when out of range.
+    // String/int conversion is handled by ToString/FromString.
+    //
+    virtual cstr EnumElem([[maybe_unused]] uint nIndex) const { return 0; }
+};
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYTYPEINFO_H
diff --git a/Code/Legacy/CryCommon/CryVersion.h b/Code/Legacy/CryCommon/CryVersion.h
new file mode 100644
index 0000000000..0a850c47fb
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryVersion.h
@@ -0,0 +1,165 @@
+/*
+ * 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 : Defines File version structure.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYVERSION_H
+#define CRYINCLUDE_CRYCOMMON_CRYVERSION_H
+#pragma once
+
+//////////////////////////////////////////////////////////////////////////
+/** This class keeps file version information.
+*/
+struct SFileVersion
+{
+    int v[4];
+
+    SFileVersion()
+    {
+        v[0] = v[1] = v[2] = v[3] = 0;
+    }
+    SFileVersion(const int vers[])
+    {
+        v[0] = vers[0];
+        v[1] = vers[1];
+        v[2] = vers[2];
+        v[3] = 1;
+    }
+
+    void Set(const char* s)
+    {
+        v[0] = v[1] = v[2] = v[3] = 0;
+
+        char t[50];
+        const size_t len = (std::min)(strlen(s), sizeof(t) - 1);
+        memcpy(t, s, len);
+        t[len] = 0;
+
+        char* p;
+        char* next = nullptr;
+        [[maybe_unused]] size_t strmax = sizeof(t);
+        p = azstrtok(t, &strmax, ".", &next);
+        if (!p)
+        {
+            return;
+        }
+        v[3] = atoi(p);
+        p = azstrtok(nullptr, &strmax, ".", &next);
+        if (!p)
+        {
+            return;
+        }
+        v[2] = atoi(p);
+        p = azstrtok(nullptr, &strmax, ".", &next);
+        if (!p)
+        {
+            return;
+        }
+        v[1] = atoi(p);
+        p = azstrtok(nullptr, &strmax, ".", &next);
+        if (!p)
+        {
+            return;
+        }
+        v[0] = atoi(p);
+    }
+
+    explicit SFileVersion(const char* s)
+    {
+        Set(s);
+    }
+
+    bool operator <(const SFileVersion& v2) const
+    {
+        if (v[3] < v2.v[3])
+        {
+            return true;
+        }
+        if (v[3] > v2.v[3])
+        {
+            return false;
+        }
+
+        if (v[2] < v2.v[2])
+        {
+            return true;
+        }
+        if (v[2] > v2.v[2])
+        {
+            return false;
+        }
+
+        if (v[1] < v2.v[1])
+        {
+            return true;
+        }
+        if (v[1] > v2.v[1])
+        {
+            return false;
+        }
+
+        if (v[0] < v2.v[0])
+        {
+            return true;
+        }
+        if (v[0] > v2.v[0])
+        {
+            return false;
+        }
+        return false;
+    }
+    bool operator ==(const SFileVersion& v1) const
+    {
+        if (v[0] == v1.v[0] && v[1] == v1.v[1] &&
+            v[2] == v1.v[2] && v[3] == v1.v[3])
+        {
+            return true;
+        }
+        return false;
+    }
+    bool operator >(const SFileVersion& v1) const
+    {
+        return !(*this < v1);
+    }
+    bool operator >=(const SFileVersion& v1) const
+    {
+        return (*this == v1) || (*this > v1);
+    }
+    bool operator <=(const SFileVersion& v1) const
+    {
+        return (*this == v1) || (*this < v1);
+    }
+
+    int& operator[](int i)       { return v[i]; }
+    int  operator[](int i) const { return v[i]; }
+
+    template <size_t size>
+    void ToShortString(char(&buffer)[size]) const
+    {
+        sprintf_s(buffer, size, "%d.%d.%d", v[2], v[1], v[0]);
+    }
+
+    void ToShortString(char* s, size_t bufferSize) const
+    {
+        sprintf_s(s, bufferSize, "%d.%d.%d", v[2], v[1], v[0]);
+    }
+
+    template <size_t size>
+    void ToString(char(&buffer)[size]) const
+    {
+        sprintf_s(buffer, size, "%d.%d.%d.%d", v[3], v[2], v[1], v[0]);
+    }
+
+    void ToString(char* s, size_t bufferSize) const
+    {
+        sprintf_s(s, bufferSize, "%d.%d.%d.%d", v[3], v[2], v[1], v[0]);
+    }
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYVERSION_H
diff --git a/Code/Legacy/CryCommon/CryWindows.h b/Code/Legacy/CryCommon/CryWindows.h
new file mode 100644
index 0000000000..52810c01ec
--- /dev/null
+++ b/Code/Legacy/CryCommon/CryWindows.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
+ *
+ */
+
+
+// Description : Specific header to handle Windows.h include
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRYWINDOWS_H
+#define CRYINCLUDE_CRYCOMMON_CRYWINDOWS_H
+#pragma once
+
+
+#if defined(WIN32) || defined(WIN64)
+
+#ifndef FULL_WINDOWS_HEADER
+    #define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+
+#undef GetCommandLine
+#undef GetObject
+#undef PlaySound
+#undef GetClassName
+#undef DrawText
+#undef GetCharWidth
+#undef GetUserName
+#undef LoadLibrary
+#undef RegisterClass
+
+#undef min
+#undef max
+
+#undef NOMINMAX
+#undef WIN32_LEAN_AND_MEAN
+#undef FULL_WINDOWS_HEADER
+
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_CRYWINDOWS_H
diff --git a/Code/Legacy/CryCommon/Cry_Camera.h b/Code/Legacy/CryCommon/Cry_Camera.h
new file mode 100644
index 0000000000..5295535e28
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Camera.h
@@ -0,0 +1,2428 @@
+/*
+ * 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
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_CAMERA_H
+#define CRYINCLUDE_CRYCOMMON_CRY_CAMERA_H
+#pragma once
+
+
+//DOC-IGNORE-BEGIN
+#include <Cry_Math.h>
+#include <Cry_Geo.h>
+#include <MemoryAccess.h>
+#include <Cry_XOptimise.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.
+};
+
+class CameraViewParameters
+{
+public:
+    CameraViewParameters();
+
+    void LookAt(const Vec3& Eye, const Vec3& ViewRefPt, const Vec3& ViewUp);
+    void Perspective(float Yfov, float Aspect, float Ndist, float Fdist);
+    void Frustum(float l, float r, float b, float t, float Ndist, float Fdist);
+    const Vec3& wCOP() const;
+    Vec3 ViewDir() const;
+    Vec3 ViewDirOffAxis() const;
+
+    float* GetXform_Screen2Obj(float* M, int WW, int WH) const;
+    float* GetXform_Obj2Screen(float* M, int WW, int WH) const;
+
+    float* GetModelviewMatrix(float* M) const;
+    float* GetProjectionMatrix(float* M) const;
+    float* GetViewportMatrix(float* M, int WW, int WH) const;
+
+    void SetModelviewMatrix(const float* M);
+
+    void GetLookAtParams(Vec3* Eye, Vec3* ViewRefPt, Vec3* ViewUp) const;
+    void GetPerspectiveParams(float* Yfov, float* Xfov, float* Aspect, float* Ndist, float* Fdist) const;
+    void GetFrustumParams(float* l, float* r, float* b, float* t, float* Ndist, float* Fdist) const;
+
+    float* GetInvModelviewMatrix(float* M) const;
+    float* GetInvProjectionMatrix(float* M) const;
+    float* GetInvViewportMatrix(float* M, int WW, int WH) const;
+
+    Vec3 WorldToCam(const Vec3& wP) const;
+    float WorldToCamZ(const Vec3& wP) const;
+    Vec3 CamToWorld(const Vec3& cP) const;
+
+    void LoadIdentityXform();
+    void Xform(const float M[16]);
+
+    void Translate(const Vec3& trans);
+    void Rotate(const float M[9]);
+
+    void GetPixelRay(float sx, float sy, int ww, int wh, Vec3* Start, Vec3* Dir) const;
+
+    void CalcVerts(Vec3* V) const;
+    void CalcTileVerts(Vec3* V, f32 nPosX, f32 nPosY, f32 nGridSizeX, f32 nGridSizeY) const;
+    void CalcRegionVerts(Vec3* V, const Vec2& vMin, const Vec2& vMax) const;
+    void CalcTiledRegionVerts(Vec3* V, Vec2& vMin, Vec2& vMax, f32 nPosX, f32 nPosY, f32 nGridSizeX, f32 nGridSizeY) const;
+
+    Vec3 vX, vY, vZ;
+    Vec3 vOrigin;
+    float fWL, fWR, fWB, fWT;
+    float fNear, fFar;
+};
+
+inline float* Frustum16fv(float* M, float l, float r, float b, float t, float n, float f)
+{
+    M[0] = (2 * n) / (r - l);
+    M[4] = 0;
+    M[8] = (r + l) / (r - l);
+    M[12] = 0;
+    M[1] = 0;
+    M[5] = (2 * n) / (t - b);
+    M[9] = (t + b) / (t - b);
+    M[13] = 0;
+    M[2] = 0;
+    M[6] = 0;
+    M[10] = -(f + n) / (f - n);
+    M[14] = (-2 * f * n) / (f - n);
+    M[3] = 0;
+    M[7] = 0;
+    M[11] = -1;
+    M[15] = 0;
+
+    return M;
+}
+
+inline float* Viewing16fv(float* M, const Vec3 X, const Vec3 Y, const Vec3 Z, const Vec3 O)
+{
+    M[0] = X.x;
+    M[4] = X.y;
+    M[8] = X.z;
+    M[12] = -X | O;
+    M[1] = Y.x;
+    M[5] = Y.y;
+    M[9] = Y.z;
+    M[13] = -Y | O;
+    M[2] = Z.x;
+    M[6] = Z.y;
+    M[10] = Z.z;
+    M[14] = -Z | O;
+    M[3] = 0;
+    M[7] = 0;
+    M[11] = 0;
+    M[15] = 1;
+    return M;
+}
+
+
+inline CameraViewParameters::CameraViewParameters()
+{
+    vX.Set(1, 0, 0);
+    vY.Set(0, 1, 0);
+    vZ.Set(0, 0, 1);
+    vOrigin.Set(0, 0, 0);
+    fNear = 1.4142f;
+    fFar = 10;
+    fWL = -1;
+    fWR = 1;
+    fWT = 1;
+    fWB = -1;
+}
+
+inline void CameraViewParameters::LookAt(const Vec3& Eye, const Vec3& ViewRefPt, const Vec3& ViewUp)
+{
+    vZ = Eye - ViewRefPt;
+    vZ.NormalizeSafe();
+    vX = ViewUp % vZ;
+    vX.NormalizeSafe();
+    vY = vZ % vX;
+    vY.NormalizeSafe();
+    vOrigin = Eye;
+}
+
+inline void CameraViewParameters::Perspective(float Yfov, float Aspect, float Ndist, float Fdist)
+{
+    fNear = Ndist;
+    fFar = Fdist;
+    fWT = tanf(Yfov * 0.5f) * fNear;
+    fWB = -fWT;
+    fWR = fWT * Aspect;
+    fWL = -fWR;
+}
+
+inline void CameraViewParameters::Frustum(float l, float r, float b, float t, float Ndist, float Fdist)
+{
+    fNear = Ndist;
+    fFar = Fdist;
+    fWR = r;
+    fWL = l;
+    fWB = b;
+    fWT = t;
+}
+
+
+inline void CameraViewParameters::GetLookAtParams(Vec3* Eye, Vec3* ViewRefPt, Vec3* ViewUp) const
+{
+    *Eye = vOrigin;
+    *ViewRefPt = vOrigin - vZ;
+    *ViewUp = vY;
+}
+
+inline void CameraViewParameters::GetPerspectiveParams(float* Yfov, float* Xfov, float* Aspect, float* Ndist, float* Fdist) const
+{
+    *Yfov = atanf(fWT / fNear) * 57.29578f * 2.0f;
+    *Xfov = atanf(fWR / fNear) * 57.29578f * 2.0f;
+    *Aspect = fWT / fWR;
+    *Ndist = fNear;
+    *Fdist = fFar;
+}
+
+inline void CameraViewParameters::GetFrustumParams(float* l, float* r, float* b, float* t, float* Ndist, float* Fdist) const
+{
+    *l = fWL;
+    *r = fWR;
+    *b = fWB;
+    *t = fWT;
+    *Ndist = fNear;
+    *Fdist = fFar;
+}
+
+inline const Vec3& CameraViewParameters::wCOP() const
+{
+    return(vOrigin);
+}
+
+inline Vec3 CameraViewParameters::ViewDir() const
+{
+    return(-vZ);
+}
+
+inline Vec3 CameraViewParameters::ViewDirOffAxis() const
+{
+    float fX = (fWL + fWR) * 0.5f, fY = (fWT + fWB) * 0.5f;  // MIDPOINT ON VIEWPLANE WINDOW
+    Vec3 ViewDir = vX * fX + vY * fY - vZ * fNear;
+    ViewDir.Normalize();
+    return ViewDir;
+}
+
+inline Vec3 CameraViewParameters::WorldToCam(const Vec3& wP) const
+{
+    Vec3 sP(wP - vOrigin);
+    Vec3 cP(vX | sP, vY | sP, vZ | sP);
+    return cP;
+}
+
+inline float CameraViewParameters::WorldToCamZ(const Vec3& wP) const
+{
+    Vec3 sP(wP - vOrigin);
+    float zdist = vZ | sP;
+    return zdist;
+}
+
+inline Vec3 CameraViewParameters::CamToWorld(const Vec3& cP) const
+{
+    Vec3 wP(vX * cP.x + vY * cP.y + vZ * cP.z + vOrigin);
+    return wP;
+}
+
+inline void CameraViewParameters::LoadIdentityXform()
+{
+    vX.Set(1, 0, 0);
+    vY.Set(0, 1, 0);
+    vZ.Set(0, 0, 1);
+    vOrigin.Set(0, 0, 0);
+}
+
+inline void CameraViewParameters::Xform(const float M[16])
+{
+    vX.Set(vX.x * M[0] + vX.y * M[4] + vX.z * M[8],
+        vX.x * M[1] + vX.y * M[5] + vX.z * M[9],
+        vX.x * M[2] + vX.y * M[6] + vX.z * M[10]);
+    vY.Set(vY.x * M[0] + vY.y * M[4] + vY.z * M[8],
+        vY.x * M[1] + vY.y * M[5] + vY.z * M[9],
+        vY.x * M[2] + vY.y * M[6] + vY.z * M[10]);
+    vZ.Set(vZ.x * M[0] + vZ.y * M[4] + vZ.z * M[8],
+        vZ.x * M[1] + vZ.y * M[5] + vZ.z * M[9],
+        vZ.x * M[2] + vZ.y * M[6] + vZ.z * M[10]);
+    vOrigin.Set(vOrigin.x * M[0] + vOrigin.y * M[4] + vOrigin.z * M[8] + M[12],
+        vOrigin.x * M[1] + vOrigin.y * M[5] + vOrigin.z * M[9] + M[13],
+        vOrigin.x * M[2] + vOrigin.y * M[6] + vOrigin.z * M[10] + M[14]);
+
+    float Scale = vX.GetLength();
+    vX /= Scale;
+    vY /= Scale;
+    vZ /= Scale;
+
+    fWL *= Scale;
+    fWR *= Scale;
+    fWB *= Scale;
+    fWT *= Scale;
+    fNear *= Scale;
+    fFar *= Scale;
+};
+
+inline void CameraViewParameters::Translate(const Vec3& trans)
+{
+    vOrigin += trans;
+}
+
+inline void CameraViewParameters::Rotate(const float M[9])
+{
+    vX.Set(vX.x * M[0] + vX.y * M[3] + vX.z * M[6],
+        vX.x * M[1] + vX.y * M[4] + vX.z * M[7],
+        vX.x * M[2] + vX.y * M[5] + vX.z * M[8]);
+    vY.Set(vY.x * M[0] + vY.y * M[3] + vY.z * M[6],
+        vY.x * M[1] + vY.y * M[4] + vY.z * M[7],
+        vY.x * M[2] + vY.y * M[5] + vY.z * M[8]);
+    vZ.Set(vZ.x * M[0] + vZ.y * M[3] + vZ.z * M[6],
+        vZ.x * M[1] + vZ.y * M[4] + vZ.z * M[7],
+        vZ.x * M[2] + vZ.y * M[5] + vZ.z * M[8]);
+}
+
+inline float* CameraViewParameters::GetModelviewMatrix(float* M) const
+{
+    Viewing16fv(M, vX, vY, vZ, vOrigin);
+    return M;
+}
+
+inline float* CameraViewParameters::GetProjectionMatrix(float* M) const
+{
+    Frustum16fv(M, fWL, fWR, fWB, fWT, fNear, fFar);
+    return(M);
+}
+
+inline void CameraViewParameters::GetPixelRay(float sx, float sy, int ww, int wh, Vec3* Start, Vec3* Dir) const
+{
+    Vec3 wTL = vOrigin + (vX * fWL) + (vY * fWT) - (vZ * fNear);      // FIND LOWER-LEFT
+    Vec3 dX = (vX * (fWR - fWL)) / (float)ww;                 // WORLD WIDTH OF PIXEL
+    Vec3 dY = (vY * (fWT - fWB)) / (float)wh;                 // WORLD HEIGHT OF PIXEL
+    wTL += (dX * sx - dY * sy);                         // INCR TO WORLD PIXEL
+    wTL += (dX * 0.5f - dY * 0.5f);                       // INCR TO PIXEL CNTR
+    *Start = vOrigin;
+    *Dir = wTL - vOrigin;
+}
+
+inline void CameraViewParameters::CalcVerts(Vec3* V)  const
+{
+    float NearZ = -fNear;
+    V[0].Set(fWR, fWT, NearZ);
+    V[1].Set(fWL, fWT, NearZ);
+    V[2].Set(fWL, fWB, NearZ);
+    V[3].Set(fWR, fWB, NearZ);
+
+    float FarZ = -fFar, FN = fFar / fNear;
+    float fwL = fWL * FN, fwR = fWR * FN, fwB = fWB * FN, fwT = fWT * FN;
+    V[4].Set(fwR, fwT, FarZ);
+    V[5].Set(fwL, fwT, FarZ);
+    V[6].Set(fwL, fwB, FarZ);
+    V[7].Set(fwR, fwB, FarZ);
+
+    for (int i = 0; i < 8; i++)
+    {
+        V[i] = CamToWorld(V[i]);
+    }
+}
+
+inline void CameraViewParameters::CalcTileVerts(Vec3* V, f32 nPosX, f32 nPosY, f32 nGridSizeX, f32 nGridSizeY)  const
+{
+    float NearZ = -fNear;
+
+    float TileWidth = abs(fWR - fWL) / nGridSizeX;
+    float TileHeight = abs(fWT - fWB) / nGridSizeY;
+    float TileL = fWL + TileWidth * nPosX;
+    float TileR = fWL + TileWidth * (nPosX + 1);
+    float TileB = fWB + TileHeight * nPosY;
+    float TileT = fWB + TileHeight * (nPosY + 1);
+
+    V[0].Set(TileR, TileT, NearZ);
+    V[1].Set(TileL, TileT, NearZ);
+    V[2].Set(TileL, TileB, NearZ);
+    V[3].Set(TileR, TileB, NearZ);
+
+    float FarZ = -fFar, FN = fFar / fNear;
+    float fwL = fWL * FN, fwR = fWR * FN, fwB = fWB * FN, fwT = fWT * FN;
+
+    float TileFarWidth = abs(fwR - fwL) / nGridSizeX;
+    float TileFarHeight = abs(fwT - fwB) / nGridSizeY;
+    float TileFarL = fwL + TileFarWidth * nPosX;
+    float TileFarR = fwL + TileFarWidth * (nPosX + 1);
+    float TileFarB = fwB + TileFarHeight * nPosY;
+    float TileFarT = fwB + TileFarHeight * (nPosY + 1);
+
+    V[4].Set(TileFarR, TileFarT, FarZ);
+    V[5].Set(TileFarL, TileFarT, FarZ);
+    V[6].Set(TileFarL, TileFarB, FarZ);
+    V[7].Set(TileFarR, TileFarB, FarZ);
+
+    for (int i = 0; i < 8; i++)
+    {
+        V[i] = CamToWorld(V[i]);
+    }
+}
+
+inline void CameraViewParameters::CalcTiledRegionVerts(Vec3* V, Vec2& vMin, Vec2& vMax, f32 nPosX, f32 nPosY, f32 nGridSizeX, f32 nGridSizeY) const
+{
+    float NearZ = -fNear;
+
+    Vec2 vTileMin, vTileMax;
+
+    vMin.x = max(vMin.x, nPosX / nGridSizeX);
+    vMax.x = min(vMax.x, (nPosX + 1) / nGridSizeX);
+
+    vMin.y = max(vMin.y, nPosY / nGridSizeY);
+    vMax.y = min(vMax.y, (nPosY + 1) / nGridSizeY);
+
+    vTileMin.x = abs(fWR - fWL) * vMin.x;
+    vTileMin.y = abs(fWT - fWB) * vMin.y;
+    vTileMax.x = abs(fWR - fWL) * vMax.x;
+    vTileMax.y = abs(fWT - fWB) * vMax.y;
+
+
+    float TileL = fWL + vTileMin.x;
+    float TileR = fWL + vTileMax.x;
+    float TileB = fWB + vTileMin.y;
+    float TileT = fWB + vTileMax.y;
+
+    V[0].Set(TileR, TileT, NearZ);
+    V[1].Set(TileL, TileT, NearZ);
+    V[2].Set(TileL, TileB, NearZ);
+    V[3].Set(TileR, TileB, NearZ);
+
+    float FarZ = -fFar, FN = fFar / fNear;
+    float fwL = fWL * FN, fwR = fWR * FN, fwB = fWB * FN, fwT = fWT * FN;
+
+    Vec2 vTileFarMin, vTileFarMax;
+
+    vTileFarMin.x = abs(fwR - fwL) * vMin.x;
+    vTileFarMin.y = abs(fwT - fwB) * vMin.y;
+    vTileFarMax.x = abs(fwR - fwL) * vMax.x;
+    vTileFarMax.y = abs(fwT - fwB) * vMax.y;
+
+
+    float TileFarL = fwL + vTileFarMin.x;
+    float TileFarR = fwL + vTileFarMax.x;
+    float TileFarB = fwB + vTileFarMin.y;
+    float TileFarT = fwB + vTileFarMax.y;
+
+    V[4].Set(TileFarR, TileFarT, FarZ);
+    V[5].Set(TileFarL, TileFarT, FarZ);
+    V[6].Set(TileFarL, TileFarB, FarZ);
+    V[7].Set(TileFarR, TileFarB, FarZ);
+
+    for (int i = 0; i < 8; i++)
+    {
+        V[i] = CamToWorld(V[i]);
+    }
+}
+
+
+inline void CameraViewParameters::CalcRegionVerts(Vec3* V, const Vec2& vMin, const Vec2& vMax) const
+{
+    float NearZ = -fNear;
+
+    Vec2 vTileMin, vTileMax;
+
+    vTileMin.x = abs(fWR - fWL) * vMin.x;
+    vTileMin.y = abs(fWT - fWB) * vMin.y;
+    vTileMax.x = abs(fWR - fWL) * vMax.x;
+    vTileMax.y = abs(fWT - fWB) * vMax.y;
+
+    float TileL = fWL + vTileMin.x;
+    float TileR = fWL + vTileMax.x;
+    float TileB = fWB + vTileMin.y;
+    float TileT = fWB + vTileMax.y;
+
+    V[0].Set(TileR, TileT, NearZ);
+    V[1].Set(TileL, TileT, NearZ);
+    V[2].Set(TileL, TileB, NearZ);
+    V[3].Set(TileR, TileB, NearZ);
+
+    float FarZ = -fFar, FN = fFar / fNear;
+    float fwL = fWL * FN, fwR = fWR * FN, fwB = fWB * FN, fwT = fWT * FN;
+
+    Vec2 vTileFarMin, vTileFarMax;
+
+    vTileFarMin.x = abs(fwR - fwL) * vMin.x;
+    vTileFarMin.y = abs(fwT - fwB) * vMin.y;
+    vTileFarMax.x = abs(fwR - fwL) * vMax.x;
+    vTileFarMax.y = abs(fwT - fwB) * vMax.y;
+
+    float TileFarL = fwL + vTileFarMin.x;
+    float TileFarR = fwL + vTileFarMax.x;
+    float TileFarB = fwB + vTileFarMin.y;
+    float TileFarT = fwB + vTileFarMax.y;
+
+    V[4].Set(TileFarR, TileFarT, FarZ);
+    V[5].Set(TileFarL, TileFarT, FarZ);
+    V[6].Set(TileFarL, TileFarB, FarZ);
+    V[7].Set(TileFarR, TileFarB, FarZ);
+
+    for (int i = 0; i < 8; i++)
+    {
+        V[i] = CamToWorld(V[i]);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// 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 static Vec3 CreateViewdir(const Ang3& ypr);
+    ILINE static Vec3 CreateViewdir(const Matrix33& m) { return m.GetColumn1(); };
+
+    ILINE void SetMatrix(const Matrix34& mat) { assert(mat.IsOrthonormal()); m_Matrix = mat; UpdateFrustum(); };
+    ILINE void SetMatrixNoUpdate(const Matrix34& mat) { assert(mat.IsOrthonormal()); m_Matrix = mat; };
+    ILINE const Matrix34& GetMatrix() const { return m_Matrix; };
+    ILINE Vec3 GetViewdir() const { return m_Matrix.GetColumn1(); };
+    
+    ILINE void SetEntityRotation(const Quat& entityRot) { m_entityRot = entityRot; }
+    ILINE Quat GetEntityRotation() { return m_entityRot; }
+    ILINE void SetEntityPos(const Vec3& entityPos) { m_entityPos = entityPos; }
+    ILINE Vec3 GetEntityPos() const { return m_entityPos; };
+
+    ILINE Matrix34 GetViewMatrix() const { return m_Matrix.GetInverted(); };
+    ILINE Vec3 GetPosition() const { return m_Matrix.GetTranslation(); }
+    ILINE void SetPosition(const Vec3& p)   { m_Matrix.SetTranslation(p); UpdateFrustum(); }
+    ILINE void SetPositionNoUpdate(const Vec3& p)   { m_Matrix.SetTranslation(p); }
+    ILINE bool Project(const Vec3& p, Vec3& result, Vec2i topLeft = Vec2i(0, 0), Vec2i widthHeight = Vec2i(0, 0)) const;
+    ILINE bool Unproject(const Vec3& viewportPos, Vec3& result, Vec2i topLeft = Vec2i(0, 0), Vec2i widthHeight = Vec2i(0, 0)) const;
+    ILINE void CalcScreenBounds(int* vOut, const AABB* pAABB, int nWidth, int nHeight) const;
+    ILINE Vec3 GetUp() const { return m_Matrix.GetColumn2(); }
+
+    //------------------------------------------------------------
+
+    void SetFrustum(int nWidth, int nHeight, f32 FOV = DEFAULT_FOV, f32 nearplane = DEFAULT_NEAR, f32 farplane = DEFAULT_FAR, f32 fPixelAspectRatio = 1.0f);
+    ILINE void SetAsymmetry(float l, float r, float b, float t) { m_asymLeft = l; m_asymRight = r; m_asymBottom = b; m_asymTop = t; UpdateFrustum(); }
+
+    ILINE int GetViewSurfaceX() const { return m_Width; }
+    ILINE int GetViewSurfaceZ() const { return m_Height; }
+    ILINE f32 GetFov() const { return m_fov; }
+    ILINE float GetHorizontalFov() const;
+    ILINE f32 GetNearPlane() const { return m_edge_nlt.y; }
+    ILINE f32 GetFarPlane() const { return m_edge_flt.y; }
+    ILINE f32 GetProjRatio() const { return(m_ProjectionRatio); }
+    ILINE f32 GetAngularResolution() const { return m_Height / m_fov; }
+    ILINE f32 GetPixelAspectRatio() const { return m_PixelAspectRatio; }
+
+    ILINE Vec3 GetEdgeP() const { return m_edge_plt; }
+    ILINE Vec3 GetEdgeN() const { return m_edge_nlt; }
+    ILINE Vec3 GetEdgeF() const { return m_edge_flt; }
+
+    ILINE f32 GetAsymL() const { return m_asymLeft; }
+    ILINE f32 GetAsymR() const { return m_asymRight; }
+    ILINE f32 GetAsymB() const { return m_asymBottom; }
+    ILINE f32 GetAsymT() const { return m_asymTop; }
+
+    ILINE const Vec3& GetNPVertex(int nId) const; //get near-plane vertices
+    ILINE const Vec3& GetFPVertex(int nId) const; //get far-plane vertices
+    ILINE const Vec3& GetPPVertex(int nId) const; //get projection-plane vertices
+
+    ILINE const Plane_tpl<f32>* GetFrustumPlane(int numplane)    const       { return &m_fp[numplane]; }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Z-Buffer ranges.
+    // This values are defining near/far clipping plane, it only used to specify z-buffer range.
+    // Use it only when you want to override default z-buffer range.
+    // Valid values for are: 0 <= zrange <= 1
+    //////////////////////////////////////////////////////////////////////////
+    ILINE void SetZRange(float zmin, float zmax)
+    {
+        // Clamp to 0-1 range.
+        m_zrangeMin = min(1.0f, max(0.0f, zmin));
+        m_zrangeMax = min(1.0f, max(0.0f, zmax));
+    };
+    ILINE float GetZRangeMin() const { return m_zrangeMin; }
+    ILINE float GetZRangeMax() const { return m_zrangeMax; }
+    //////////////////////////////////////////////////////////////////////////
+
+    //-----------------------------------------------------------------------------------
+    //--------                Frustum-Culling                ----------------------------
+    //-----------------------------------------------------------------------------------
+
+    //Check if a point lies within camera's frustum
+    bool IsPointVisible(const Vec3& p) const;
+
+    //sphere-frustum test
+    bool IsSphereVisible_F(const ::Sphere& s) const;
+    uint8 IsSphereVisible_FH(const ::Sphere& s) const;   //this is going to be the exact version of sphere-culling
+
+    // AABB-frustum test
+    // Fast
+    bool IsAABBVisible_F(const ::AABB& aabb) const;
+    uint8 IsAABBVisible_FH(const ::AABB& aabb, bool* pAllInside) const;
+    uint8 IsAABBVisible_FH(const ::AABB& aabb) const;
+
+    // Exact
+    bool IsAABBVisible_E(const ::AABB& aabb) const;
+    uint8 IsAABBVisible_EH(const ::AABB& aabb, bool* pAllInside) const;
+    uint8 IsAABBVisible_EH(const ::AABB& aabb) const;
+
+    // Multi-camera
+    bool IsAABBVisible_EHM(const ::AABB& aabb, bool* pAllInside) const;
+    bool IsAABBVisible_EM(const ::AABB& aabb) const;
+    bool IsAABBVisible_FM(const ::AABB& aabb) const;
+
+    //OBB-frustum test
+    bool IsOBBVisible_F(const Vec3& wpos, const OBB& obb) const;
+    uint8 IsOBBVisible_FH(const Vec3& wpos,  const OBB& obb) const;
+    bool IsOBBVisible_E(const Vec3& wpos,  const OBB& obb, f32 uscale) const;
+    uint8 IsOBBVisible_EH(const Vec3& wpos,  const OBB& obb, f32 uscale) const;
+
+    //## constructor/destructor
+    CCamera()
+    {
+        m_Matrix.SetIdentity();
+        m_asymRight = 0;
+        m_asymLeft = 0;
+        m_asymBottom = 0;
+        m_asymTop = 0;
+        SetFrustum(640, 480);
+        m_zrangeMin = 0.0f;
+        m_zrangeMax = 1.0f;
+        m_pMultiCamera = NULL;
+        m_pPortal = NULL;
+        m_JustActivated = 0;
+        m_nPosX = m_nPosY = m_nSizeX = m_nSizeY = 0;
+        m_entityPos = Vec3(0, 0, 0);
+        m_entityRot = Quat(0, 0, 0, 1);
+    }
+    ~CCamera() {}
+
+    void GetFrustumVertices(Vec3* pVerts) const;
+    void GetFrustumVerticesCam(Vec3* pVerts) const;
+
+    void SetJustActivated(const bool justActivated) {m_JustActivated = (int)justActivated; }
+    bool IsJustActivated() const {return m_JustActivated != 0; }
+
+    void SetViewPort(int nPosX, int nPosY, int nSizeX, int nSizeY)
+    {
+        m_nPosX = nPosX;
+        m_nPosY = nPosY;
+        m_nSizeX = nSizeX;
+        m_nSizeY = nSizeY;
+    }
+
+    void GetViewPort(int& nPosX, int& nPosY, int& nSizeX, int& nSizeY) const
+    {
+        nPosX = m_nPosX;
+        nPosY = m_nPosY;
+        nSizeX = m_nSizeX;
+        nSizeY = m_nSizeY;
+    }
+
+    void UpdateFrustum();
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
+
+    CameraViewParameters m_viewParameters;
+
+private:
+    bool AdditionalCheck(const AABB& aabb) const;
+    bool AdditionalCheck(const Vec3& wpos, const OBB& obb, f32 uscale) const;
+
+    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_ProjectionRatio;  // ratio between width and height of view-surface
+    f32     m_PixelAspectRatio; // accounts for aspect ratio and non-square pixels
+
+    Quat    m_entityRot;                //The rotation of this camera's entity (does not include HMD orientation)
+    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]; //
+
+    // Near Far range of the z-buffer to use for this camera.
+    float m_zrangeMin;
+    float m_zrangeMax;
+
+    int m_nPosX, m_nPosY, m_nSizeX, m_nSizeY;
+
+    //------------------------------------------------------------------------
+    //---   OLD STUFF
+    //------------------------------------------------------------------------
+public:
+
+    void SetFrustumVertices(Vec3* arrvVerts)
+    {
+        m_clbp = arrvVerts[0];
+        m_cltp = arrvVerts[1];
+        m_crtp = arrvVerts[2];
+        m_crbp = arrvVerts[3];
+    }
+    inline void SetFrustumPlane(int i, const Plane_tpl<f32>& plane)
+    {
+        m_fp[i] = plane;
+        //do not break strict aliasing rules, use union instead of reinterpret_casts
+        union f32_u
+        {
+            float floatVal;
+            uint32 uintVal;
+        };
+
+        {
+            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;
+        }
+    }
+
+    inline Ang3 GetAngles()   const { return CreateAnglesYPR(Matrix33(m_Matrix)); }
+    void SetAngles(const Ang3& angles)  { SetMatrix(Matrix34::CreateRotationXYZ(angles)); }
+
+
+    struct IVisArea* m_pPortal; // pointer to portal used to create this camera
+    struct ScissorInfo
+    {
+        ScissorInfo() { x1 = y1 = x2 = y2 = 0; }
+        uint16 x1, y1, x2, y2;
+    };
+    ScissorInfo m_ScissorInfo;
+    class PodArray<CCamera>* m_pMultiCamera; // maybe used for culling instead of this camera
+
+    Vec3    m_OccPosition;      //Position for calculate occlusions (needed for portals rendering)
+    inline const Vec3& GetOccPos() const { return(m_OccPosition); }
+
+    int m_JustActivated;        //Camera activated in this frame, used for disabling motion blur effect at camera changes in movies
+};
+
+inline float CCamera::GetHorizontalFov() const
+{
+    float fFractionVert = tanf(m_fov * 0.5f);
+    float fFractionHoriz = fFractionVert * GetProjRatio();
+    float fHorizFov = atanf(fFractionHoriz) * 2;
+
+    return fHorizFov;
+}
+
+
+// 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);
+    }
+}
+
+// Description
+//   <PRE>
+//x=yaw
+//y=pitch
+//z=roll (we ignore this element, since its not possible to convert the roll-component into a vector)
+// </PRE>
+ILINE Vec3 CCamera::CreateViewdir(const Ang3& ypr)
+{
+    assert(ypr.IsInRangePI()); //all angles need to be in range between -pi and +pi
+    f32 sz, cz;
+    sincos_tpl(ypr.x, &sz, &cz);          //YAW
+    f32 sx, cx;
+    sincos_tpl(ypr.y, &sx, &cx);          //PITCH
+    return Vec3(-sz * cx, cz * cx, sx); //calculate the view-direction
+}
+
+// Description
+//   <PRE>
+//p=world space position
+//result=spreen space pos
+//retval=is visible on screen
+// </PRE>
+ILINE bool CCamera::Project(const Vec3& p, Vec3& result, Vec2i topLeft, Vec2i widthHeight) const
+{
+    Matrix44A mProj, mView;
+    Vec4 in, transformed, projected;
+
+    mathMatrixPerspectiveFov(&mProj, GetFov(), GetProjRatio(), GetNearPlane(), GetFarPlane());
+
+    mathMatrixLookAt(&mView, GetPosition(), GetPosition() + GetViewdir(), GetUp());
+
+    int pViewport[4] = {0, 0, GetViewSurfaceX(), GetViewSurfaceZ()};
+
+    if (!topLeft.IsZero() || !widthHeight.IsZero())
+    {
+        pViewport[0] = topLeft.x;
+        pViewport[1] = topLeft.y;
+        pViewport[2] = widthHeight.x;
+        pViewport[3] = widthHeight.y;
+    }
+
+    in.x = p.x;
+    in.y = p.y;
+    in.z = p.z;
+    in.w = 1.0f;
+    mathVec4Transform((f32*)&transformed, (f32*)&mView, (f32*)&in);
+
+    bool visible = transformed.z < 0.0f;
+
+    mathVec4Transform((f32*)&projected, (f32*)&mProj, (f32*)&transformed);
+
+    if (projected.w == 0.0f)
+    {
+        result = Vec3(0.f, 0.f, 0.f);
+        return false;
+    }
+
+    projected.x /= projected.w;
+    projected.y /= projected.w;
+    projected.z /= projected.w;
+
+    visible = visible && (fabs_tpl(projected.x) <= 1.0f) && (fabs_tpl(projected.y) <= 1.0f);
+
+    //output coords
+    result.x = pViewport[0] + (1 + projected.x) * pViewport[2] / 2;
+    result.y = pViewport[1] + (1 - projected.y) * pViewport[3] / 2;  //flip coords for y axis
+    result.z = projected.z;
+
+    return visible;
+}
+
+ILINE bool CCamera::Unproject(const Vec3& viewportPos, Vec3& result, Vec2i topLeft, Vec2i widthHeight) const
+{
+    Matrix44A mProj, mView;
+
+    mathMatrixPerspectiveFov(&mProj, GetFov(), GetProjRatio(), GetNearPlane(), GetFarPlane());
+    mathMatrixLookAt(&mView, GetPosition(), GetPosition() + GetViewdir(), Vec3(0, 0, 1));
+
+    int viewport[4] = {0, 0, GetViewSurfaceX(), GetViewSurfaceZ()};
+
+    if (!topLeft.IsZero() || !widthHeight.IsZero())
+    {
+        viewport[0] = topLeft.x;
+        viewport[1] = topLeft.y;
+        viewport[2] = widthHeight.x;
+        viewport[3] = widthHeight.y;
+    }
+
+    Vec4 vIn;
+    vIn.x = (viewportPos.x - viewport[0]) * 2 / viewport[2] - 1.0f;
+    vIn.y = (viewportPos.y - viewport[1]) * 2 / viewport[3] - 1.0f;
+    vIn.z = viewportPos.z;
+    vIn.w = 1.0;
+
+    Matrix44A m;
+    const float* proj = mProj.GetData();
+    const float* view = mView.GetData();
+    float* mdata = m.GetData();
+    for (int i = 0; i < 4; i++)
+    {
+        float ai0 = proj[i],  ai1 = proj[4 + i],  ai2 = proj[8 + i],  ai3 = proj[12 + i];
+        mdata[i] = ai0 * view[0] + ai1 * view[1] + ai2 * view[2] + ai3 * view[3];
+        mdata[4 + i] = ai0 * view[4] + ai1 * view[5] + ai2 * view[6] + ai3 * view[7];
+        mdata[8 + i] = ai0 * view[8] + ai1 * view[9] + ai2 * view[10] + ai3 * view[11];
+        mdata[12 + i] = ai0 * view[12] + ai1 * view[13] + ai2 * view[14] + ai3 * view[15];
+    }
+
+    m.Invert();
+    if (!m.IsValid())
+    {
+        return false;
+    }
+
+    Vec4 vOut = vIn * m;
+    if (vOut.w == 0.0)
+    {
+        return false;
+    }
+
+    result = Vec3(vOut.x / vOut.w, vOut.y / vOut.w, vOut.z / vOut.w);
+
+    return true;
+}
+
+ILINE void CCamera::CalcScreenBounds(int* vOut, const AABB* pAABB, int nWidth, int nHeight) const
+{
+    Matrix44A mProj, mView, mVP;
+    mathMatrixPerspectiveFov(&mProj, GetFov(), GetProjRatio(), GetNearPlane(), GetFarPlane());
+    mathMatrixLookAt(&mView, GetPosition(), GetPosition() + GetViewdir(), GetMatrix().GetColumn2());
+    mVP = mView * mProj;
+
+    Vec3 verts[8];
+
+    Vec2i   topLeft = Vec2i(0, 0);
+    Vec2i widthHeight = Vec2i(nWidth, nHeight);
+    float pViewport[4] = {0.0f, 0.0f, (float)widthHeight.x, (float)widthHeight.y};
+
+    float x0 = 9999.9f, x1 = -9999.9f, y0 = 9999.9f, y1 = -9999.9f;
+    float fIntersect = 1.0f;
+
+    Vec3 vDir = GetViewdir();
+    Vec3 vPos = GetPosition();
+    float d = vPos.Dot(vDir);
+
+    verts[0] = Vec3(pAABB->min.x, pAABB->min.y, pAABB->min.z);
+    verts[1] = Vec3(pAABB->max.x, pAABB->min.y, pAABB->min.z);
+    verts[2] = Vec3(pAABB->min.x, pAABB->max.y, pAABB->min.z);
+    verts[3] = Vec3(pAABB->max.x, pAABB->max.y, pAABB->min.z);
+    verts[4] = Vec3(pAABB->min.x, pAABB->min.y, pAABB->max.z);
+    verts[5] = Vec3(pAABB->max.x, pAABB->min.y, pAABB->max.z);
+    verts[6] = Vec3(pAABB->min.x, pAABB->max.y, pAABB->max.z);
+    verts[7] = Vec3(pAABB->max.x, pAABB->max.y, pAABB->max.z);
+
+    for (int i = 0; i < 8; i++)
+    {
+        float fDist = verts[i].Dot(vDir) - d;
+        fDist = (float)fsel(fDist, 0.0f, -fDist);
+
+        //Project(verts[i],vertsOut[i], topLeft, widthHeight);
+
+        Vec3 result = Vec3(0.0f, 0.0f, 0.0f);
+        Vec4 transformed, projected, vIn;
+
+        vIn = Vec4(verts[i].x, verts[i].y, verts[i].z, 1.0f);
+
+        mathVec4Transform((f32*)&projected, (f32*)&mVP, (f32*)&vIn);
+
+        fIntersect = (float)fsel(-projected.w, 0.0f, 1.0f);
+
+        if (!fzero(fIntersect) && !fzero(projected.w))
+        {
+            projected.x /= projected.w;
+            projected.y /= projected.w;
+            projected.z /= projected.w;
+
+            //output coords
+            result.x = pViewport[0] + (1.0f + projected.x) * pViewport[2] / 2.0f;
+            result.y = pViewport[1] + (1.0f - projected.y) * pViewport[3] / 2.0f;  //flip coords for y axis
+            result.z = projected.z;
+        }
+        else
+        {
+            vOut[0] = topLeft.x;
+            vOut[1] = topLeft.y;
+            vOut[2] = widthHeight.x;
+            vOut[3] = widthHeight.y;
+            return;
+        }
+
+        x0 = min(x0, result.x);
+        x1 = max(x1, result.x);
+        y0 = min(y0, result.y);
+        y1 = max(y1, result.y);
+    }
+
+    vOut[0] = (int)max(0.0f, min(pViewport[2], x0));
+    vOut[1] = (int)max(0.0f, min(pViewport[3], y0));
+    vOut[2] = (int)max(0.0f, min(pViewport[2], x1));
+    vOut[3] = (int)max(0.0f, min(pViewport[3], y1));
+}
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+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_ProjectionRatio = fWidth / fHeight;    // projection ratio (1.0 for square pixels)
+
+    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;
+
+    assert(fabs(acos_tpl(Vec3d(0, m_edge_plt.y, m_edge_plt.z).GetNormalized().y) * 2 - m_fov) < 0.001);
+
+    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;
+    }
+    m_OccPosition = GetPosition();
+}
+
+// Summary
+//   Return frustum vertices in world space
+// Description
+//   Takes pointer to array of 8 elements
+inline void CCamera::GetFrustumVertices(Vec3* pVerts) const
+{
+    Matrix33 m33 = Matrix33(m_Matrix);
+
+    /*
+        The frustum array contains points in the following order
+
+        frustum[0] = far left top
+        frustum[1] = far left bottom
+        frustum[2] = far right bottom
+        frustum[3] = far right top
+
+        frustum[4] = near left top
+        frustum[5] = near left bottom
+        frustum[6] = near right bottom
+        frustum[7] = near right top
+    */
+
+    int i = 0;
+
+    pVerts[i++] = m33 * Vec3(+m_edge_flt.x, +m_edge_flt.y, +m_edge_flt.z) + GetPosition();
+    pVerts[i++] = m33 * Vec3(+m_edge_flt.x, +m_edge_flt.y, -m_edge_flt.z) + GetPosition();
+    pVerts[i++] = m33 * Vec3(-m_edge_flt.x, +m_edge_flt.y, -m_edge_flt.z) + GetPosition();
+    pVerts[i++] = m33 * Vec3(-m_edge_flt.x, +m_edge_flt.y, +m_edge_flt.z) + GetPosition();
+
+    pVerts[i++] = m33 * Vec3(+m_edge_nlt.x, +m_edge_nlt.y, +m_edge_nlt.z) + GetPosition();
+    pVerts[i++] = m33 * Vec3(+m_edge_nlt.x, +m_edge_nlt.y, -m_edge_nlt.z) + GetPosition();
+    pVerts[i++] = m33 * Vec3(-m_edge_nlt.x, +m_edge_nlt.y, -m_edge_nlt.z) + GetPosition();
+    pVerts[i++] = m33 * Vec3(-m_edge_nlt.x, +m_edge_nlt.y, +m_edge_nlt.z) + GetPosition();
+}
+
+inline void CCamera::GetFrustumVerticesCam(Vec3* pVerts) const
+{
+    int i = 0;
+
+    //near plane
+    pVerts[i++] = Vec3(+m_edge_nlt.x, +m_edge_nlt.y, +m_edge_nlt.z);
+    pVerts[i++] = Vec3(+m_edge_nlt.x, +m_edge_nlt.y, -m_edge_nlt.z);
+    pVerts[i++] = Vec3(-m_edge_nlt.x, +m_edge_nlt.y, -m_edge_nlt.z);
+    pVerts[i++] = Vec3(-m_edge_nlt.x, +m_edge_nlt.y, +m_edge_nlt.z);
+
+    //far plane
+    pVerts[i++] = Vec3(+m_edge_flt.x, +m_edge_flt.y, +m_edge_flt.z);
+    pVerts[i++] = Vec3(+m_edge_flt.x, +m_edge_flt.y, -m_edge_flt.z);
+    pVerts[i++] = Vec3(-m_edge_flt.x, +m_edge_flt.y, -m_edge_flt.z);
+    pVerts[i++] = Vec3(-m_edge_flt.x, +m_edge_flt.y, +m_edge_flt.z);
+}
+
+//get near-plane vertices
+ILINE const Vec3& CCamera::GetNPVertex(int nId) const
+{
+    switch (nId)
+    {
+    case 0:
+        return m_clbn;
+    case 1:
+        return m_cltn;
+    case 2:
+        return m_crtn;
+    case 3:
+        return m_crbn;
+    }
+    assert(0);
+    return m_clbn;
+}
+//get far-plane vertices
+ILINE const Vec3& CCamera::GetFPVertex(int nId) const
+{
+    switch (nId)
+    {
+    case 0:
+        return m_clbf;
+    case 1:
+        return m_cltf;
+    case 2:
+        return m_crtf;
+    case 3:
+        return m_crbf;
+    }
+    assert(0);
+    return m_clbf;
+}
+ILINE const Vec3& CCamera::GetPPVertex(int nId) const
+{
+    switch (nId)
+    {
+    case 0:
+        return m_clbp;
+    case 1:
+        return m_cltp;
+    case 2:
+        return m_crtp;
+    case 3:
+        return m_crbp;
+    }
+    assert(0);
+    return m_clbp;
+}
+
+
+
+
+// Description
+//   Check if a point lies within camera's frustum
+//
+// Example
+//   u8 InOut=camera.IsPointVisible(point);
+//
+// return values
+//   CULL_EXCLUSION = point outside of frustum
+//   CULL_INTERSECT = point inside of frustum
+inline bool CCamera::IsPointVisible(const Vec3& p) const
+{
+    if ((m_fp[FR_PLANE_NEAR  ] | p) > 0)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[FR_PLANE_RIGHT ] | p) > 0)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[FR_PLANE_LEFT  ] | p) > 0)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[FR_PLANE_TOP   ] | p) > 0)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[FR_PLANE_BOTTOM] | p) > 0)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[FR_PLANE_FAR   ] | p) > 0)
+    {
+        return CULL_EXCLUSION;
+    }
+    return CULL_OVERLAP;
+}
+
+
+
+
+
+
+
+
+// Description
+//   Conventional method to check if a sphere and the camera-frustum overlap
+//   The center of the sphere is assumed to be in world-space.
+//
+// Example
+//   u8 InOut=camera.IsSphereVisible_F(sphere);
+//
+// return values
+//   CULL_EXCLUSION = sphere outside of frustum (very fast rejection-test)
+//   CULL_INTERSECT = sphere and frustum intersects or sphere in completely inside frustum
+inline bool CCamera::IsSphereVisible_F(const ::Sphere& s) const
+{
+    if ((m_fp[0] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[1] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[2] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[3] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[4] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((m_fp[5] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    return CULL_OVERLAP;
+}
+
+// Description
+//   Conventional method to check if a sphere and the camera-frustum overlap, or
+//   if the sphere is completely inside the camera-frustum. The center of the
+//   sphere is assumed to be in world-space.
+//
+// Example
+//   u8 InOut=camera.IsSphereVisible_FH(sphere);
+//
+// return values
+//   CULL_EXCLUSION   = sphere outside of frustum (very fast rejection-test)
+//   CULL_INTERSECT   = sphere intersects the borders of the frustum, further checks necessary
+//   CULL_INCLUSION   = sphere is complete inside the frustum, no further checks necessary
+inline uint8 CCamera::IsSphereVisible_FH(const ::Sphere& s) const
+{
+    f32 nc, rc, lc, tc, bc, cc;
+    if ((nc = m_fp[0] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((rc = m_fp[1] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((lc = m_fp[2] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((tc = m_fp[3] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((bc = m_fp[4] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+    if ((cc = m_fp[5] | s.center) > s.radius)
+    {
+        return CULL_EXCLUSION;
+    }
+
+    //now we have to check if it is completely in frustum
+    f32 r = -s.radius;
+    if (nc > r)
+    {
+        return CULL_OVERLAP;
+    }
+    if (lc > r)
+    {
+        return CULL_OVERLAP;
+    }
+    if (rc > r)
+    {
+        return CULL_OVERLAP;
+    }
+    if (tc > r)
+    {
+        return CULL_OVERLAP;
+    }
+    if (bc > r)
+    {
+        return CULL_OVERLAP;
+    }
+    if (cc > r)
+    {
+        return CULL_OVERLAP;
+    }
+    return CULL_INCLUSION;
+}
+
+
+
+
+
+// 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;
+}
+
+
+// Description
+//   Hierarchical approach to check if an AABB and the camera-frustum overlap, or if the AABB
+//   is totally inside the camera-frustum. The AABB is assumed to be in world-space.
+//
+// Example
+//   int InOut=camera.IsAABBVisible_FH(aabb);
+//
+// return values
+//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
+//   CULL_OVERLAP     = AABB intersects the borders of the frustum, further checks necessary
+//   CULL_INCLUSION   = AABB is complete inside the frustum, no further checks necessary
+
+inline uint8 CCamera::IsAABBVisible_FH(const AABB& aabb, bool* pAllInside) const
+{
+    assert(pAllInside && *pAllInside == false);
+    if (IsAABBVisible_F(aabb) == CULL_EXCLUSION)
+    {
+        return CULL_EXCLUSION;
+    }
+    const f32* p = &aabb.min.x;
+    uint32 x, y, z;
+    x = m_idx2[0];
+    y = m_idy2[0];
+    z = m_idz2[0];
+    if ((m_fp[0] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[1];
+    y = m_idy2[1];
+    z = m_idz2[1];
+    if ((m_fp[1] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[2];
+    y = m_idy2[2];
+    z = m_idz2[2];
+    if ((m_fp[2] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[3];
+    y = m_idy2[3];
+    z = m_idz2[3];
+    if ((m_fp[3] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[4];
+    y = m_idy2[4];
+    z = m_idz2[4];
+    if ((m_fp[4] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[5];
+    y = m_idy2[5];
+    z = m_idz2[5];
+    if ((m_fp[5] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    *pAllInside = true;
+    return CULL_INCLUSION;
+}
+
+// Description
+//   Hierarchical approach to check if an AABB and the camera-frustum overlap, or if the AABB
+//   is totally inside the camera-frustum. The AABB is assumed to be in world-space.
+//
+// Example
+//   int InOut=camera.IsAABBVisible_FH(aabb);
+//
+// return values
+//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
+//   CULL_OVERLAP     = AABB intersects the borders of the frustum, further checks necessary
+//   CULL_INCLUSION   = AABB is complete inside the frustum, no further checks necessary
+inline uint8 CCamera::IsAABBVisible_FH(const AABB& aabb) const
+{
+    if (IsAABBVisible_F(aabb) == CULL_EXCLUSION)
+    {
+        return CULL_EXCLUSION;
+    }
+    const f32* p = &aabb.min.x;
+    uint32 x, y, z;
+    x = m_idx2[0];
+    y = m_idy2[0];
+    z = m_idz2[0];
+    if ((m_fp[0] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[1];
+    y = m_idy2[1];
+    z = m_idz2[1];
+    if ((m_fp[1] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[2];
+    y = m_idy2[2];
+    z = m_idz2[2];
+    if ((m_fp[2] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[3];
+    y = m_idy2[3];
+    z = m_idz2[3];
+    if ((m_fp[3] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[4];
+    y = m_idy2[4];
+    z = m_idz2[4];
+    if ((m_fp[4] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    x = m_idx2[5];
+    y = m_idy2[5];
+    z = m_idz2[5];
+    if ((m_fp[5] | Vec3(p[x], p[y], p[z])) > 0)
+    {
+        return CULL_OVERLAP;
+    }
+    return CULL_INCLUSION;
+}
+
+
+// Description
+//  This function checks if an AABB and the camera-frustum overlap. The AABB is assumed to be in world-space.
+//  This test can reject even such AABBs that overlap a frustum-plane far outside the view-frustum.
+// IMPORTANT:
+//  This function is only useful if you really need exact-culling.
+//  It's about 30% slower then "IsAABBVisible_F(aabb)"
+//
+// Example:
+//  int InOut=camera.IsAABBVisible_E(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_E(const AABB& aabb) const
+{
+    uint8 o = IsAABBVisible_FH(aabb);
+    if (o == CULL_EXCLUSION)
+    {
+        return CULL_EXCLUSION;
+    }
+    if (o == CULL_INCLUSION)
+    {
+        return CULL_OVERLAP;
+    }
+    return AdditionalCheck(aabb); //result is either "exclusion" or "overlap"
+}
+
+// Description:
+//   Improved approach to check if an AABB and the camera-frustum overlap, or if the AABB
+//   is totally inside the camera-frustum. The AABB is assumed to be in world-space. This
+//   test can reject even such AABBs that overlap a frustum-plane far outside the view-frustum.
+// IMPORTANT:
+//   This function is only useful if you really need exact-culling.
+//   It's about 30% slower then "IsAABBVisible_FH(aabb)"
+//
+// Example:
+//   int InOut=camera.IsAABBVisible_EH(aabb);
+//
+// return values:
+//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
+//   CULL_OVERLAP     = AABB intersects the borders of the frustum, further checks necessary
+//   CULL_INCLUSION   = AABB is complete inside the frustum, no further checks necessary
+inline uint8 CCamera::IsAABBVisible_EH(const AABB& aabb, bool* pAllInside) const
+{
+    uint8 o = IsAABBVisible_FH(aabb, pAllInside);
+    if (o == CULL_EXCLUSION)
+    {
+        return CULL_EXCLUSION;
+    }
+    if (o == CULL_INCLUSION)
+    {
+        return CULL_INCLUSION;
+    }
+    return AdditionalCheck(aabb); //result is either "exclusion" or "overlap"
+}
+
+// Description:
+//   Improved approach to check if an AABB and the camera-frustum overlap, or if the AABB
+//   is totally inside the camera-frustum. The AABB is assumed to be in world-space. This
+//   test can reject even such AABBs that overlap a frustum-plane far outside the view-frustum.
+// IMPORTANT:
+//   This function is only useful if you really need exact-culling.
+//   It's about 30% slower then "IsAABBVisible_FH(aabb)"
+//
+// Example:
+//   int InOut=camera.IsAABBVisible_EH(aabb);
+//
+// return values:
+//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
+//   CULL_OVERLAP     = AABB intersects the borders of the frustum, further checks necessary
+//   CULL_INCLUSION   = AABB is complete inside the frustum, no further checks necessary
+inline uint8 CCamera::IsAABBVisible_EH(const AABB& aabb) const
+{
+    uint8 o = IsAABBVisible_FH(aabb);
+    if (o == CULL_EXCLUSION)
+    {
+        return CULL_EXCLUSION;
+    }
+    if (o == CULL_INCLUSION)
+    {
+        return CULL_INCLUSION;
+    }
+    return AdditionalCheck(aabb); //result is either "exclusion" or "overlap"
+}
+
+// Description:
+//  Makes culling taking into account presence of m_pMultiCamera
+//  If m_pMultiCamera exists - object is visible if at least one of cameras see's it
+//
+// return values:
+//  true - box visible
+//  true - not visible
+inline bool CCamera::IsAABBVisible_EHM(const AABB& aabb, bool* pAllInside) const
+{
+    assert(pAllInside && *pAllInside == false);
+
+    if (!m_pMultiCamera) // use main camera
+    {
+        return IsAABBVisible_EH(aabb, pAllInside) != CULL_EXCLUSION;
+    }
+
+    bool bVisible = false;
+
+    for (int i = 0; i < m_pMultiCamera->Count(); i++)
+    {
+        bool bAllIn = false;
+
+        if (m_pMultiCamera->GetAt(i).IsAABBVisible_EH(aabb, &bAllIn))
+        {
+            bVisible = true;
+
+            // don't break here always because another camera may include bbox completely
+            if (bAllIn)
+            {
+                *pAllInside = true;
+                break;
+            }
+        }
+    }
+
+    return bVisible;
+}
+
+// Description:
+//  Makes culling taking into account presence of m_pMultiCamera
+//  If m_pMultiCamera exists - object is visible if at least one of cameras see's it
+//
+// return values:
+//  true - box visible
+//  true - not visible
+ILINE bool CCamera::IsAABBVisible_EM(const AABB& aabb) const
+{
+    if (!m_pMultiCamera) // use main camera
+    {
+        return IsAABBVisible_E(aabb) != CULL_EXCLUSION;
+    }
+
+    // check several parallel cameras - object is visible if at least one camera see's it
+
+    for (int i = 0; i < m_pMultiCamera->Count(); i++)
+    {
+        if (m_pMultiCamera->GetAt(i).IsAABBVisible_E(aabb))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+// Description:
+//  Makes culling taking into account presence of m_pMultiCamera
+//  If m_pMultiCamera exists - object is visible if at least one of cameras see's it
+//
+// return values:
+//  true - box visible
+//  true - not visible
+ILINE bool CCamera::IsAABBVisible_FM(const AABB& aabb) const
+{
+    PrefetchLine(&aabb, sizeof(AABB));
+
+    if (!m_pMultiCamera) // use main camera
+    {
+        return IsAABBVisible_F(aabb) != CULL_EXCLUSION;
+    }
+
+    // check several parallel cameras - object is visible if at least one camera see's it
+
+    for (int i = 0; i < m_pMultiCamera->Count(); i++)
+    {
+        if (m_pMultiCamera->GetAt(i).IsAABBVisible_F(aabb))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+
+
+// Description
+//   Fast check if an OBB and the camera-frustum overlap, using the separating-axis-theorem (SAT)
+//   The center of the OOBB is assumed to be in world-space.
+// NOTE: even if the OBB is totally inside the frustum, this function returns CULL_OVERLAP
+//   For hierarchical frustum-culling this function is not perfect.
+//
+// Example:
+//   bool InOut=camera.IsOBBVisibleFast(obb);
+//
+// return values:
+//   CULL_EXCLUSION = OBB outside of frustum (very fast rejection-test)
+//   CULL_OVERLAP   = OBB and frustum intersects or OBB in totally inside frustum
+inline bool CCamera::IsOBBVisible_F(const Vec3& wpos, const OBB& obb) const
+{
+    CRY_ASSERT(obb.m33.IsOrthonormalRH(0.001f));
+
+    //transform the obb-center into world-space
+    Vec3 p  =   obb.m33 * obb.c + wpos;
+
+    //extract the orientation-vectors from the columns of the 3x3 matrix
+    //and scale them by the half-lengths
+    Vec3 ax = obb.m33.GetColumn0() * obb.h.x;
+    Vec3 ay = obb.m33.GetColumn1() * obb.h.y;
+    Vec3 az = obb.m33.GetColumn2() * obb.h.z;
+
+    //we project the axes of the OBB onto the normal of each of the 6 planes.
+    //If the absolute value of the distance from the center of the OBB to the plane
+    //is larger then the "radius" of the OBB, then the OBB is outside the frustum.
+    f32 t;
+    if ((t = m_fp[0] | p) > 0.0f)
+    {
+        if (t > (fabsf(m_fp[0].n | ax) + fabsf(m_fp[0].n | ay) + fabsf(m_fp[0].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if ((t = m_fp[1] | p) > 0.0f)
+    {
+        if (t > (fabsf(m_fp[1].n | ax) + fabsf(m_fp[1].n | ay) + fabsf(m_fp[1].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if ((t = m_fp[2] | p) > 0.0f)
+    {
+        if (t > (fabsf(m_fp[2].n | ax) + fabsf(m_fp[2].n | ay) + fabsf(m_fp[2].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if ((t = m_fp[3] | p) > 0.0f)
+    {
+        if (t > (fabsf(m_fp[3].n | ax) + fabsf(m_fp[3].n | ay) + fabsf(m_fp[3].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if ((t = m_fp[4] | p) > 0.0f)
+    {
+        if (t > (fabsf(m_fp[4].n | ax) + fabsf(m_fp[4].n | ay) + fabsf(m_fp[4].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if ((t = m_fp[5] | p) > 0.0f)
+    {
+        if (t > (fabsf(m_fp[5].n | ax) + fabsf(m_fp[5].n | ay) + fabsf(m_fp[5].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+
+    //probably the OBB is visible!
+    //With this test we can't be sure if the OBB partially visible or totally included or
+    //totally outside the frustum but still intersecting one of the 6 planes (=worst case)
+    return CULL_OVERLAP;
+}
+
+ILINE uint8 CCamera::IsOBBVisible_FH([[maybe_unused]] const Vec3& wpos, [[maybe_unused]] const OBB& obb) const
+{
+    //not implemented yet
+    return CULL_EXCLUSION;
+}
+
+// Description:
+//   This function checks if an OBB and the camera-frustum overlap.
+//   This test can reject even such OBBs that overlap a frustum-plane
+//   far outside the view-frustum.
+// IMPORTANT: It is about 10% slower then "IsOBBVisibleFast(obb)"
+//
+// Example:
+//   int InOut=camera.IsOBBVisible_E(OBB);
+//
+// return values:
+//   CULL_EXCLUSION   = OBB outside of frustum (very fast rejection-test)
+//   CULL_OVERLAP     = OBB intersects the borders of the frustum or is totally inside
+inline bool CCamera::IsOBBVisible_E(const Vec3& wpos, const OBB& obb, f32 uscale = 1.0f) const
+{
+    assert(obb.m33.IsOrthonormalRH(0.001f));
+
+    //transform the obb-center into world-space
+    Vec3 p  =   obb.m33 * obb.c * uscale + wpos;
+
+    //extract the orientation-vectors from the columns of the 3x3 matrix
+    //and scale them by the half-lengths
+    Vec3 ax = obb.m33.GetColumn0() * obb.h.x * uscale;
+    Vec3 ay = obb.m33.GetColumn1() * obb.h.y * uscale;
+    Vec3 az = obb.m33.GetColumn2() * obb.h.z * uscale;
+
+    //we project the axes of the OBB onto the normal of each of the 6 planes.
+    //If the absolute value of the distance from the center of the OBB to the plane
+    //is larger then the "radius" of the OBB, then the OBB is outside the frustum.
+    f32 t0, t1, t2, t3, t4, t5;
+    bool mt0, mt1, mt2, mt3, mt4, mt5;
+    mt0 = (t0 = m_fp[0] | p) > 0.0f;
+    if (mt0)
+    {
+        if (t0 > (fabsf(m_fp[0].n | ax) + fabsf(m_fp[0].n | ay) + fabsf(m_fp[0].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    mt1 = (t1 = m_fp[1] | p) > 0.0f;
+    if (mt1)
+    {
+        if (t1 > (fabsf(m_fp[1].n | ax) + fabsf(m_fp[1].n | ay) + fabsf(m_fp[1].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    mt2 = (t2 = m_fp[2] | p) > 0.0f;
+    if (mt2)
+    {
+        if (t2 > (fabsf(m_fp[2].n | ax) + fabsf(m_fp[2].n | ay) + fabsf(m_fp[2].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    mt3 = (t3 = m_fp[3] | p) > 0.0f;
+    if (mt3)
+    {
+        if (t3 > (fabsf(m_fp[3].n | ax) + fabsf(m_fp[3].n | ay) + fabsf(m_fp[3].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    mt4 = (t4 = m_fp[4] | p) > 0.0f;
+    if (mt4)
+    {
+        if (t4 > (fabsf(m_fp[4].n | ax) + fabsf(m_fp[4].n | ay) + fabsf(m_fp[4].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    mt5 = (t5 = m_fp[5] | p) > 0.0f;
+    if (mt5)
+    {
+        if (t5 > (fabsf(m_fp[5].n | ax) + fabsf(m_fp[5].n | ay) + fabsf(m_fp[5].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+
+    //if obb-center is in view-frustum, then stop further calculation
+    if (!(mt0 | mt1 | mt2 | mt3 | mt4 | mt5))
+    {
+        return CULL_OVERLAP;
+    }
+
+    return AdditionalCheck(wpos, obb, uscale);
+}
+
+
+// Description:
+//   Improved approach to check if an OBB and the camera-frustum intersect, or if the OBB
+//   is totally inside the camera-frustum. The bounding-box of the OBB is assumed to be
+//   in world-space. This test can reject even such OBBs that intersect a frustum-plane far
+//   outside the view-frustum
+//
+// Example:
+//   int InOut=camera.IsOBBVisible_EH(obb);
+//
+// return values:
+//   CULL_EXCLUSION   = OBB outside of frustum (very fast rejection-test)
+//   CULL_OVERLAP     = OBB intersects the borders of the frustum, further checks necessary
+//   CULL_INCLUSION   = OBB is complete inside the frustum, no further checks necessary
+inline uint8 CCamera::IsOBBVisible_EH(const Vec3& wpos, const OBB& obb, f32 uscale = 1.0f) const
+{
+    assert(obb.m33.IsOrthonormalRH(0.001f));
+    //transform the obb-center into world-space
+    Vec3 p  =   obb.m33 * obb.c * uscale + wpos;
+
+    //extract the orientation-vectors from the columns of the 3x3 matrix
+    //and scale them by the half-lengths
+    Vec3 ax = obb.m33.GetColumn0() * obb.h.x * uscale;
+    Vec3 ay = obb.m33.GetColumn1() * obb.h.y * uscale;
+    Vec3 az = obb.m33.GetColumn2() * obb.h.z * uscale;
+
+    //we project the axes of the OBB onto the normal of each of the 6 planes.
+    //If the absolute value of the distance from the center of the OBB to the plane
+    //is larger then the "radius" of the OBB, then the OBB is outside the frustum.
+    f32 t0, t1, t2, t3, t4, t5;
+    bool mt0, mt1, mt2, mt3, mt4, mt5;
+    if (mt0 = (t0 = m_fp[0] | p) > 0.0f)
+    {
+        if (t0 > (fabsf(m_fp[0].n | ax) + fabsf(m_fp[0].n | ay) + fabsf(m_fp[0].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if (mt1 = (t1 = m_fp[1] | p) > 0.0f)
+    {
+        if (t1 > (fabsf(m_fp[1].n | ax) + fabsf(m_fp[1].n | ay) + fabsf(m_fp[1].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if (mt2 = (t2 = m_fp[2] | p) > 0.0f)
+    {
+        if (t2 > (fabsf(m_fp[2].n | ax) + fabsf(m_fp[2].n | ay) + fabsf(m_fp[2].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if (mt3 = (t3 = m_fp[3] | p) > 0.0f)
+    {
+        if (t3 > (fabsf(m_fp[3].n | ax) + fabsf(m_fp[3].n | ay) + fabsf(m_fp[3].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if (mt4 = (t4 = m_fp[4] | p) > 0.0f)
+    {
+        if (t4 > (fabsf(m_fp[4].n | ax) + fabsf(m_fp[4].n | ay) + fabsf(m_fp[4].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    if (mt5 = (t5 = m_fp[5] | p) > 0.0f)
+    {
+        if (t5 > (fabsf(m_fp[5].n | ax) + fabsf(m_fp[5].n | ay) + fabsf(m_fp[5].n | az)))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+
+    //check if obb-center is in view-frustum
+    if (!(mt0 | mt1 | mt2 | mt3 | mt4 | mt5))
+    {
+        //yes, it is!
+        //and now check if OBB is totally included
+        if (-t0 < (fabsf(m_fp[0].n | ax) + fabsf(m_fp[0].n | ay) + fabsf(m_fp[0].n | az)))
+        {
+            return CULL_OVERLAP;
+        }
+        if (-t1 < (fabsf(m_fp[1].n | ax) + fabsf(m_fp[1].n | ay) + fabsf(m_fp[1].n | az)))
+        {
+            return CULL_OVERLAP;
+        }
+        if (-t2 < (fabsf(m_fp[2].n | ax) + fabsf(m_fp[2].n | ay) + fabsf(m_fp[2].n | az)))
+        {
+            return CULL_OVERLAP;
+        }
+        if (-t3 < (fabsf(m_fp[3].n | ax) + fabsf(m_fp[3].n | ay) + fabsf(m_fp[3].n | az)))
+        {
+            return CULL_OVERLAP;
+        }
+        if (-t4 < (fabsf(m_fp[4].n | ax) + fabsf(m_fp[4].n | ay) + fabsf(m_fp[4].n | az)))
+        {
+            return CULL_OVERLAP;
+        }
+        if (-t5 < (fabsf(m_fp[5].n | ax) + fabsf(m_fp[5].n | ay) + fabsf(m_fp[5].n | az)))
+        {
+            return CULL_OVERLAP;
+        }
+        return CULL_INCLUSION;
+    }
+    return AdditionalCheck(wpos, obb, uscale);
+}
+
+//------------------------------------------------------------------------------
+//---                         ADDITIONAL-TEST                                ---
+//------------------------------------------------------------------------------
+
+extern _MS_ALIGN(64) uint32 BoxSides[];
+
+// Description:
+//   A box can easily straddle one of the view-frustum planes far
+//   outside the view-frustum and in this case the previous test would
+//   return CULL_OVERLAP.
+//
+// Note:  With this check, we make sure the AABB is really not visble
+NO_INLINE_WEAK bool CCamera::AdditionalCheck(const AABB& aabb) const
+{
+    Vec3d m = (aabb.min + aabb.max) * 0.5;
+    uint32 o = 1; //will be reset to 0 if center is outside
+    o &= isneg(m_fp[0] | m);
+    o &= isneg(m_fp[2] | m);
+    o &= isneg(m_fp[3] | m);
+    o &= isneg(m_fp[4] | m);
+    o &= isneg(m_fp[5] | m);
+    o &= isneg(m_fp[1] | m);
+    if (o)
+    {
+        return CULL_OVERLAP;    //if obb-center is in view-frustum, then stop further calculation
+    }
+    Vec3d vmin(aabb.min - GetPosition());  //AABB in camera-space
+    Vec3d vmax(aabb.max - GetPosition());  //AABB in camera-space
+
+    uint32 frontx8 = 0; // make the flags using the fact that the upper bit in f32 is its sign
+
+    union f64_u
+    {
+        f64 floatVal;
+        int64 intVal;
+    };
+    f64_u uminx, uminy, uminz, umaxx, umaxy, umaxz;
+    uminx.floatVal = vmin.x;
+    uminy.floatVal = vmin.y;
+    uminz.floatVal = vmin.z;
+    umaxx.floatVal = vmax.x;
+    umaxy.floatVal = vmax.y;
+    umaxz.floatVal = vmax.z;
+
+    frontx8 |= (-uminx.intVal >> 0x3f) & 0x008; //if (AABB.min.x>0.0f)  frontx8|=0x008;
+    frontx8 |= (umaxx.intVal >> 0x3f) & 0x010; //if (AABB.max.x<0.0f)  frontx8|=0x010;
+    frontx8 |= (-uminy.intVal >> 0x3f) & 0x020; //if (AABB.min.y>0.0f)  frontx8|=0x020;
+    frontx8 |= (umaxy.intVal >> 0x3f) & 0x040; //if (AABB.max.y<0.0f)  frontx8|=0x040;
+    frontx8 |= (-uminz.intVal >> 0x3f) & 0x080; //if (AABB.min.z>0.0f)  frontx8|=0x080;
+    frontx8 |= (umaxz.intVal >> 0x3f) & 0x100; //if (AABB.max.z<0.0f)  frontx8|=0x100;
+
+    //check if camera is inside the aabb
+    if (frontx8 == 0)
+    {
+        return CULL_OVERLAP;             //AABB is patially visible
+    }
+    Vec3d v[8] = {
+        Vec3d(vmin.x, vmin.y, vmin.z),
+        Vec3d(vmax.x, vmin.y, vmin.z),
+        Vec3d(vmin.x, vmax.y, vmin.z),
+        Vec3d(vmax.x, vmax.y, vmin.z),
+        Vec3d(vmin.x, vmin.y, vmax.z),
+        Vec3d(vmax.x, vmin.y, vmax.z),
+        Vec3d(vmin.x, vmax.y, vmax.z),
+        Vec3d(vmax.x, vmax.y, vmax.z)
+    };
+
+    //---------------------------------------------------------------------
+    //---            find the silhouette-vertices of the AABB            ---
+    //---------------------------------------------------------------------
+    uint32 p0   =   BoxSides[frontx8 + 0];
+    uint32 p1   =   BoxSides[frontx8 + 1];
+    uint32 p2   =   BoxSides[frontx8 + 2];
+    uint32 p3   =   BoxSides[frontx8 + 3];
+    uint32 p4   =   BoxSides[frontx8 + 4];
+    uint32 p5   =   BoxSides[frontx8 + 5];
+    uint32 sideamount = BoxSides[frontx8 + 7];
+
+    if (sideamount == 4)
+    {
+        //--------------------------------------------------------------------------
+        //---     we take the 4 vertices of projection-plane in cam-space,       ---
+        //-----  and clip them against the 4 side-frustum-planes of the AABB        -
+        //--------------------------------------------------------------------------
+        Vec3d s0 = v[p0] % v[p1];
+        if ((s0 | m_cltp) > 0 && (s0 | m_crtp) > 0 && (s0 | m_crbp) > 0 && (s0 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3d s1 = v[p1] % v[p2];
+        if ((s1 | m_cltp) > 0 && (s1 | m_crtp) > 0 && (s1 | m_crbp) > 0 && (s1 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3d s2 = v[p2] % v[p3];
+        if ((s2 | m_cltp) > 0 && (s2 | m_crtp) > 0 && (s2 | m_crbp) > 0 && (s2 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3d s3 = v[p3] % v[p0];
+        if ((s3 | m_cltp) > 0 && (s3 | m_crtp) > 0 && (s3 | m_crbp) > 0 && (s3 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+
+    if (sideamount == 6)
+    {
+        //--------------------------------------------------------------------------
+        //---     we take the 4 vertices of projection-plane in cam-space,       ---
+        //---    and clip them against the 6 side-frustum-planes of the AABB      ---
+        //--------------------------------------------------------------------------
+        Vec3d s0 = v[p0] % v[p1];
+        if ((s0 | m_cltp) > 0 && (s0 | m_crtp) > 0 && (s0 | m_crbp) > 0 && (s0 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3d s1 = v[p1] % v[p2];
+        if ((s1 | m_cltp) > 0 && (s1 | m_crtp) > 0 && (s1 | m_crbp) > 0 && (s1 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3d s2 = v[p2] % v[p3];
+        if ((s2 | m_cltp) > 0 && (s2 | m_crtp) > 0 && (s2 | m_crbp) > 0 && (s2 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3d s3 = v[p3] % v[p4];
+        if ((s3 | m_cltp) > 0 && (s3 | m_crtp) > 0 && (s3 | m_crbp) > 0 && (s3 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3d s4 = v[p4] % v[p5];
+        if ((s4 | m_cltp) > 0 && (s4 | m_crtp) > 0 && (s4 | m_crbp) > 0 && (s4 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3d s5 = v[p5] % v[p0];
+        if ((s5 | m_cltp) > 0 && (s5 | m_crtp) > 0 && (s5 | m_crbp) > 0 && (s5 | m_clbp) > 0)
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    return CULL_OVERLAP; //AABB is patially visible
+}
+
+//------------------------------------------------------------------------------
+//---                         ADDITIONAL-TEST                                ---
+//------------------------------------------------------------------------------
+
+// Description:
+//   A box can easily straddle one of the view-frustum planes far
+//   outside the view-frustum and in this case the previous test would
+//   return CULL_OVERLAP.
+// Note:
+//   With this check, we make sure the OBB is really not visible
+NO_INLINE_WEAK bool CCamera::AdditionalCheck(const Vec3& wpos, const OBB& obb, f32 uscale) const
+{
+    Vec3 CamInOBBSpace  = wpos - GetPosition();
+    Vec3 iCamPos = -CamInOBBSpace * obb.m33;
+    uint32 front8 = 0;
+    AABB aabb = AABB((obb.c - obb.h) * uscale, (obb.c + obb.h) * uscale);
+    if (iCamPos.x < aabb.min.x)
+    {
+        front8 |= 0x008;
+    }
+    if (iCamPos.x > aabb.max.x)
+    {
+        front8 |= 0x010;
+    }
+    if (iCamPos.y < aabb.min.y)
+    {
+        front8 |= 0x020;
+    }
+    if (iCamPos.y > aabb.max.y)
+    {
+        front8 |= 0x040;
+    }
+    if (iCamPos.z < aabb.min.z)
+    {
+        front8 |= 0x080;
+    }
+    if (iCamPos.z > aabb.max.z)
+    {
+        front8 |= 0x100;
+    }
+
+    if (front8 == 0)
+    {
+        return CULL_OVERLAP;
+    }
+
+    //the transformed OBB-vertices in cam-space
+    Vec3 v[8] = {
+        obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.min.z) + CamInOBBSpace,
+        obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.min.z) + CamInOBBSpace,
+        obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.min.z) + CamInOBBSpace,
+        obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.min.z) + CamInOBBSpace,
+        obb.m33 * Vec3(aabb.min.x, aabb.min.y, aabb.max.z) + CamInOBBSpace,
+        obb.m33 * Vec3(aabb.max.x, aabb.min.y, aabb.max.z) + CamInOBBSpace,
+        obb.m33 * Vec3(aabb.min.x, aabb.max.y, aabb.max.z) + CamInOBBSpace,
+        obb.m33 * Vec3(aabb.max.x, aabb.max.y, aabb.max.z) + CamInOBBSpace
+    };
+
+    //---------------------------------------------------------------------
+    //---            find the silhouette-vertices of the OBB            ---
+    //---------------------------------------------------------------------
+    uint32 p0   =   BoxSides[front8 + 0];
+    uint32 p1   =   BoxSides[front8 + 1];
+    uint32 p2   =   BoxSides[front8 + 2];
+    uint32 p3   =   BoxSides[front8 + 3];
+    uint32 p4   =   BoxSides[front8 + 4];
+    uint32 p5   =   BoxSides[front8 + 5];
+    uint32 sideamount = BoxSides[front8 + 7];
+
+    if (sideamount == 4)
+    {
+        //--------------------------------------------------------------------------
+        //---     we take the 4 vertices of projection-plane in cam-space,       ---
+        //-----  and clip them against the 4 side-frustum-planes of the OBB        -
+        //--------------------------------------------------------------------------
+        Vec3 s0 = v[p0] % v[p1];
+        if (((s0 | m_cltp) >= 0) && ((s0 | m_crtp) >= 0) && ((s0 | m_crbp) >= 0) && ((s0 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3 s1 = v[p1] % v[p2];
+        if (((s1 | m_cltp) >= 0) && ((s1 | m_crtp) >= 0) && ((s1 | m_crbp) >= 0) && ((s1 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3 s2 = v[p2] % v[p3];
+        if (((s2 | m_cltp) >= 0) && ((s2 | m_crtp) >= 0) && ((s2 | m_crbp) >= 0) && ((s2 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3 s3 = v[p3] % v[p0];
+        if (((s3 | m_cltp) >= 0) && ((s3 | m_crtp) >= 0) && ((s3 | m_crbp) >= 0) && ((s3 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+
+    if (sideamount == 6)
+    {
+        //--------------------------------------------------------------------------
+        //---     we take the 4 vertices of projection-plane in cam-space,       ---
+        //---    and clip them against the 6 side-frustum-planes of the OBB      ---
+        //--------------------------------------------------------------------------
+        Vec3 s0 = v[p0] % v[p1];
+        if (((s0 | m_cltp) >= 0) && ((s0 | m_crtp) >= 0) && ((s0 | m_crbp) >= 0) && ((s0 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3 s1 = v[p1] % v[p2];
+        if (((s1 | m_cltp) >= 0) && ((s1 | m_crtp) >= 0) && ((s1 | m_crbp) >= 0) && ((s1 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3 s2 = v[p2] % v[p3];
+        if (((s2 | m_cltp) >= 0) && ((s2 | m_crtp) >= 0) && ((s2 | m_crbp) >= 0) && ((s2 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3 s3 = v[p3] % v[p4];
+        if (((s3 | m_cltp) >= 0) && ((s3 | m_crtp) >= 0) && ((s3 | m_crbp) >= 0) && ((s3 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3 s4 = v[p4] % v[p5];
+        if (((s4 | m_cltp) >= 0) && ((s4 | m_crtp) >= 0) && ((s4 | m_crbp) >= 0) && ((s4 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+        Vec3 s5 = v[p5] % v[p0];
+        if (((s5 | m_cltp) >= 0) && ((s5 | m_crtp) >= 0) && ((s5 | m_crbp) >= 0) && ((s5 | m_clbp) >= 0))
+        {
+            return CULL_EXCLUSION;
+        }
+    }
+    //now we are 100% sure that the OBB is visible on the screen
+    return CULL_OVERLAP;
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_CAMERA_H
diff --git a/Code/Legacy/CryCommon/Cry_Color.h b/Code/Legacy/CryCommon/Cry_Color.h
new file mode 100644
index 0000000000..365c7a75be
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Color.h
@@ -0,0 +1,1215 @@
+/*
+ * 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 : 4D Color template.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_COLOR_H
+#define CRYINCLUDE_CRYCOMMON_CRY_COLOR_H
+#pragma once
+
+#include <CryHeaders.h>
+#include <platform.h>
+#include <AzCore/std/containers/array.h>
+
+ILINE float FClamp(float X, float Min, float Max)
+{
+    return X < Min ? Min : X < Max ? X : Max;
+}
+
+template <class T>
+struct Color_tpl;
+
+typedef Color_tpl<uint8> ColorB; // [ 0,  255]
+typedef Color_tpl<float> ColorF; // [0.0, 1.0]
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+// RGBA Color structure.
+//////////////////////////////////////////////////////////////////////////////////////////////
+template <class T>
+struct Color_tpl
+{
+    T   r, g, b, a;
+
+    ILINE Color_tpl() {};
+
+    ILINE Color_tpl(T _x, T _y, T _z, T _w);
+    ILINE Color_tpl(T _x, T _y, T _z);
+
+    /*  inline Color_tpl(const Color_tpl<T> & v)    {
+    r = v.r; g = v.g; b = v.b; a = v.a;
+    }*/
+
+    // works together with pack_abgr8888
+    ILINE Color_tpl(const unsigned int abgr);
+    ILINE Color_tpl(const f32 c);
+    ILINE Color_tpl(const ColorF& c);
+    ILINE Color_tpl(const ColorF& c, float fAlpha);
+    ILINE Color_tpl(const Vec3& c, float fAlpha);
+    ILINE Color_tpl(const Vec4& c);
+
+    void Clamp(float Min = 0, float Max = 1.0f)
+    {
+        r = ::FClamp(r, Min, Max);
+        g = ::FClamp(g, Min, Max);
+        b = ::FClamp(b, Min, Max);
+        a = ::FClamp(a, Min, Max);
+    }
+    void ScaleCol (float f)
+    {
+        r = static_cast<T>(r * f);
+        g = static_cast<T>(g * f);
+        b = static_cast<T>(b * f);
+    }
+
+    float Luminance() const
+    {
+        return r * 0.30f + g * 0.59f + b * 0.11f;
+    }
+
+    ILINE float Max() const
+    {
+        return max(r, max(b, g));
+    }
+
+    float NormalizeCol (ColorF& out) const
+    {
+        float max = Max();
+
+        if (max == 0)
+        {
+            return 0;
+        }
+
+        out = *this / max;
+
+        return max;
+    }
+
+    ILINE Color_tpl(const Vec3& vVec)
+    {
+        r = (T)vVec.x;
+        g = (T)vVec.y;
+        b = (T)vVec.z;
+        a = (T)1.f;
+    }
+
+    ILINE Color_tpl& operator = (const Vec3& v) { r = (T)v.x; g = (T)v.y; b = (T)v.z; a = (T)1.0f; return *this; }
+    ILINE Color_tpl& operator = (const Color_tpl& c) { r = (T)c.r; g = (T)c.g; b = (T)c.b; a = (T)c.a; return *this; }
+
+    ILINE T& operator [] (int index)          { assert(index >= 0 && index <= 3); return ((T*)this)[index]; }
+    ILINE T operator [] (int index) const { assert(index >= 0 && index <= 3); return ((T*)this)[index]; }
+
+    ILINE void Set(float fR, float fG, float fB, float fA = 1.0f)
+    {
+        r = static_cast<T>(fR);
+        g = static_cast<T>(fG);
+        b = static_cast<T>(fB);
+        a = static_cast<T>(fA);
+    }
+
+    ILINE void set(T _x, T _y = 0, T _z = 0, T _w = 0)
+    {
+        r = _x;
+        g = _y;
+        b = _z;
+        a = _w;
+    }
+    ILINE void set(T _x, T _y = 0, T _z = 0)
+    {
+        r = _x;
+        g = _y;
+        b = _z;
+        a = 1;
+    }
+    ILINE Color_tpl operator + () const
+    {
+        return *this;
+    }
+    ILINE Color_tpl operator - () const
+    {
+        return Color_tpl<T>(-r, -g, -b, -a);
+    }
+
+    ILINE Color_tpl& operator += (const Color_tpl& v)
+    {
+        T _r = r,       _g = g,         _b = b,         _a = a;
+        _r += v.r;
+        _g += v.g;
+        _b += v.b;
+        _a += v.a;
+        r = _r;
+        g = _g;
+        b = _b;
+        a = _a;
+        return *this;
+    }
+    ILINE Color_tpl& operator -= (const Color_tpl& v)
+    {
+        r -= v.r;
+        g -= v.g;
+        b -= v.b;
+        a -= v.a;
+        return *this;
+    }
+    ILINE Color_tpl& operator *= (const Color_tpl& v)
+    {
+        r *= v.r;
+        g *= v.g;
+        b *= v.b;
+        a *= v.a;
+        return *this;
+    }
+    ILINE Color_tpl& operator /= (const Color_tpl& v)
+    {
+        r /= v.r;
+        g /= v.g;
+        b /= v.b;
+        a /= v.a;
+        return *this;
+    }
+    ILINE Color_tpl& operator *= (T s)
+    {
+        r *= s;
+        g *= s;
+        b *= s;
+        a *= s;
+        return *this;
+    }
+    ILINE Color_tpl& operator /= (T s)
+    {
+        s = 1.0f / s;
+        r *= s;
+        g *= s;
+        b *= s;
+        a *= s;
+        return *this;
+    }
+
+    ILINE Color_tpl operator + (const Color_tpl& v) const
+    {
+        return Color_tpl(r + v.r, g + v.g, b + v.b, a + v.a);
+    }
+    ILINE Color_tpl operator - (const Color_tpl& v) const
+    {
+        return Color_tpl(r - v.r, g - v.g, b - v.b, a - v.a);
+    }
+    ILINE Color_tpl operator * (const Color_tpl& v) const
+    {
+        return Color_tpl(r * v.r, g * v.g, b * v.b, a * v.a);
+    }
+    ILINE Color_tpl operator / (const Color_tpl& v) const
+    {
+        return Color_tpl(r / v.r, g / v.g, b / v.b, a / v.a);
+    }
+    ILINE Color_tpl operator * (T s) const
+    {
+        return Color_tpl(r * s, g * s, b * s, a * s);
+    }
+    ILINE Color_tpl operator / (T s) const
+    {
+        s = 1.0f / s;
+        return Color_tpl(r * s, g * s, b * s, a * s);
+    }
+
+    ILINE bool operator == (const Color_tpl& v) const
+    {
+        return (r == v.r) && (g == v.g) && (b == v.b) && (a == v.a);
+    }
+    ILINE bool operator != (const Color_tpl& v) const
+    {
+        return (r != v.r) || (g != v.g) || (b != v.b) || (a != v.a);
+    }
+
+    ILINE unsigned char pack_rgb332() const;
+    ILINE unsigned short pack_argb4444() const;
+    ILINE unsigned short pack_rgb555() const;
+    ILINE unsigned short pack_rgb565() const;
+    ILINE unsigned int pack_bgr888() const;
+    ILINE unsigned int pack_rgb888() const;
+    ILINE unsigned int pack_abgr8888() const;
+    ILINE unsigned int pack_argb8888() const;
+    inline Vec4 toVec4() const { return Vec4(r, g, b, a); }
+    inline Vec3 toVec3() const { return Vec3(r, g, b); }
+    inline void toFloat4(f32* out) const;
+
+    inline void toHSV(f32& h, f32& s, f32& v) const;
+    inline void fromHSV(f32 h, f32 s, f32 v);
+
+    inline void clamp(T bottom = 0.0f, T top = 1.0f);
+
+    inline void maximum(const Color_tpl<T>& ca, const Color_tpl<T>& cb);
+    inline void minimum(const Color_tpl<T>& ca, const Color_tpl<T>& cb);
+    inline void abs();
+
+    inline void adjust_contrast(T c);
+    inline void adjust_saturation(T s);
+    inline void adjust_luminance(float newLum);
+
+    inline void lerpFloat(const Color_tpl<T>& ca, const Color_tpl<T>& cb, float s);
+    inline void negative(const Color_tpl<T>& c);
+    inline void grey(const Color_tpl<T>& c);
+
+    // helper function - maybe we can improve the integration
+    static inline uint32 ComputeAvgCol_Fast(const uint32 dwCol0, const uint32 dwCol1)
+    {
+        uint32 dwHalfCol0 = (dwCol0 / 2) & 0x7f7f7f7f;            // each component /2
+        uint32 dwHalfCol1 = (dwCol1 / 2) & 0x7f7f7f7f;            // each component /2
+
+        return dwHalfCol0 + dwHalfCol1;
+    }
+
+    // mCIE: adjusted to compensate problems of DXT compression (extra bit in green channel causes green/purple artifacts)
+    // explained in CryEngine wiki: ColorSpaces
+    Color_tpl<T> RGB2mCIE() const
+    {
+        Color_tpl<T> in = *this;
+
+        // to get grey chrominance for dark colors
+        in.r += 0.000001f;
+        in.g += 0.000001f;
+        in.b += 0.000001f;
+
+        float RGBSum = in.r + in.g + in.b;
+
+        float fInv = 1.0f / RGBSum;
+
+        float RNorm = 3 * 10.0f / 31.0f * in.r * fInv;
+        float GNorm = 3 * 21.0f / 63.0f * in.g * fInv;
+        float Scale = RGBSum / 3.0f;
+
+        // test grey
+        //  out.r = 10.0f/31.0f;        // 1/3 = 10/30      Red range     0..30, 31 unused
+        //  out.g = 21.0f/63.0f;        // 1/3 = 21/63      Green range   0..63
+
+        RNorm = max(0.0f, min(1.0f, RNorm));
+        GNorm = max(0.0f, min(1.0f, GNorm));
+
+        return Color_tpl<T>(RNorm, GNorm, Scale);
+    }
+
+    // mCIE: adjusted to compensate problems of DXT compression (extra bit in green channel causes green/purple artefacts)
+    // explained in CryEngine wiki: ColorSpaces
+    Color_tpl<T> mCIE2RGB() const
+    {
+        Color_tpl<T> out = *this;
+
+        float fScale = out.b;               //                  Blue range   0..31
+
+        // test grey
+        //  out.r = 10.0f/31.0f;        // 1/3 = 10/30      Red range     0..30, 31 unused
+        //  out.g = 21.0f/63.0f;        // 1/3 = 21/63      Green range   0..63
+
+        out.r *= 31.0f / 30.0f;       //
+        out.g *= 63.0f / 63.0f;       //
+        out.b = 0.999f - out.r - out.g;
+
+        float s = 3.0f * fScale;
+
+        out.r *= s;
+        out.g *= s;
+        out.b *= s;
+
+        out.Clamp();
+
+        return out;
+    }
+
+    void rgb2srgb()
+    {
+        for (int i = 0; i < 3; i++)
+        {
+            T& c = (*this)[i];
+
+            if (c < 0.0031308f)
+            {
+                c = 12.92f * c;
+            }
+            else
+            {
+                c = 1.055f * pow(c, 1.0f / 2.4f) - 0.055f;
+            }
+        }
+    }
+
+    void srgb2rgb()
+    {
+        for (int i = 0; i < 3; i++)
+        {
+            T& c = (*this)[i];
+
+            if (c <= 0.040448643f)
+            {
+                c = c / 12.92f;
+            }
+            else
+            {
+                c = pow((c + 0.055f) / 1.055f, 2.4f);
+            }
+        }
+    }
+
+    void GetMemoryUsage([[maybe_unused]] class ICrySizer* pSizer) const { /*nothing*/}
+
+    AZStd::array<T, 4> GetAsArray() const
+    {
+        AZStd::array<T, 4> primitiveArray = { { r, g, b, a } };
+        return primitiveArray;
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+// template specialization
+///////////////////////////////////////////////
+
+template<>
+ILINE Color_tpl<f32>::Color_tpl(f32 _x, f32 _y, f32 _z, f32 _w)
+{
+    r = _x;
+    g = _y;
+    b = _z;
+    a = _w;
+}
+
+template<>
+ILINE Color_tpl<f32>::Color_tpl(f32 _x, f32 _y, f32 _z)
+{
+    r = _x;
+    g = _y;
+    b = _z;
+    a = 1.f;
+}
+
+template<>
+ILINE Color_tpl<uint8>::Color_tpl(uint8 _x, uint8 _y, uint8 _z, uint8 _w)
+{
+    r = _x;
+    g = _y;
+    b = _z;
+    a = _w;
+}
+
+template<>
+ILINE Color_tpl<uint8>::Color_tpl(uint8 _x, uint8 _y, uint8 _z)
+{
+    r = _x;
+    g = _y;
+    b = _z;
+    a = 255;
+}
+
+//-----------------------------------------------------------------------------
+
+template<>
+ILINE Color_tpl<f32>::Color_tpl(const unsigned int abgr)
+{
+    r = (abgr & 0xff) / 255.0f;
+    g = ((abgr >> 8) & 0xff) / 255.0f;
+    b = ((abgr >> 16) & 0xff) / 255.0f;
+    a = ((abgr >> 24) & 0xff) / 255.0f;
+}
+
+template<>
+ILINE Color_tpl<uint8>::Color_tpl(const unsigned int c)
+{
+    *(unsigned int*)(&r) = c;
+} //use this with RGBA8 macro!
+
+//-----------------------------------------------------------------------------
+
+template<>
+ILINE Color_tpl<f32>::Color_tpl(const float c)
+{
+    r = c;
+    g = c;
+    b = c;
+    a = c;
+}
+template<>
+ILINE Color_tpl<uint8>::Color_tpl(const float c)
+{
+    r = (uint8)(c * 255);
+    g = (uint8)(c * 255);
+    b = (uint8)(c * 255);
+    a = (uint8)(c * 255);
+}
+//-----------------------------------------------------------------------------
+
+template<>
+ILINE Color_tpl<f32>::Color_tpl(const ColorF& c)
+{
+    r = c.r;
+    g = c.g;
+    b = c.b;
+    a = c.a;
+}
+template<>
+ILINE Color_tpl<uint8>::Color_tpl(const ColorF& c)
+{
+    r = (uint8)(c.r * 255);
+    g = (uint8)(c.g * 255);
+    b = (uint8)(c.b * 255);
+    a = (uint8)(c.a * 255);
+}
+
+template<>
+ILINE Color_tpl<f32>::Color_tpl(const ColorF& c, float fAlpha)
+{
+    r = c.r;
+    g = c.g;
+    b = c.b;
+    a = fAlpha;
+}
+
+template<>
+ILINE Color_tpl<f32>::Color_tpl(const Vec3& c, float fAlpha)
+{
+    r = c.x;
+    g = c.y;
+    b = c.z;
+    a = fAlpha;
+}
+
+template<>
+ILINE Color_tpl<f32>::Color_tpl(const Vec4& c)
+{
+    r = c.x;
+    g = c.y;
+    b = c.z;
+    a = c.w;
+}
+
+template<>
+ILINE Color_tpl<uint8>::Color_tpl(const ColorF& c, float fAlpha)
+{
+    r = (uint8)(c.r * 255);
+    g = (uint8)(c.g * 255);
+    b = (uint8)(c.b * 255);
+    a = (uint8)(fAlpha * 255);
+}
+template<>
+ILINE Color_tpl<uint8>::Color_tpl(const Vec3& c, float fAlpha)
+{
+    r = (uint8)(c.x * 255);
+    g = (uint8)(c.y * 255);
+    b = (uint8)(c.z * 255);
+    a = (uint8)(fAlpha * 255);
+}
+
+template<>
+ILINE Color_tpl<uint8>::Color_tpl(const Vec4& c)
+{
+    r = (uint8)(c.x * 255);
+    g = (uint8)(c.y * 255);
+    b = (uint8)(c.z * 255);
+    a = (uint8)(c.w * 255);
+}
+
+template<>
+inline void Color_tpl<uint8>::toFloat4(f32* out) const
+{
+    out[0] = r / 255.0f;
+    out[1] = g / 255.0f;
+    out[2] = b / 255.0f;
+    out[3] = a / 255.0f;
+}
+
+template<>
+inline void Color_tpl<f32>::toFloat4(f32* out) const
+{
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+    out[3] = a;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+// functions implementation
+///////////////////////////////////////////////
+
+///////////////////////////////////////////////
+/*template <class T>
+inline Color_tpl<T>::Color_tpl(const T *p_elts)
+{
+r = p_elts[0]; g = p_elts[1]; b = p_elts[2]; a = p_elts[3];
+}*/
+
+///////////////////////////////////////////////
+///////////////////////////////////////////////
+template <class T>
+ILINE Color_tpl<T> operator * (T s, const Color_tpl<T>& v)
+{
+    return Color_tpl<T>(v.r * s, v.g * s, v.b * s, v.a * s);
+}
+
+///////////////////////////////////////////////
+template <class T>
+ILINE unsigned char Color_tpl<T>::pack_rgb332() const
+{
+    unsigned char cr;
+    unsigned char cg;
+    unsigned char cb;
+    if constexpr (sizeof(r) == 1) // char and unsigned char
+    {
+        cr = (unsigned char)r;
+        cg = (unsigned char)g;
+        cb = (unsigned char)b;
+    }
+    else if constexpr (sizeof(r) == 2) // short and unsigned short
+    {
+        cr = (unsigned short)(r) >> 8;
+        cg = (unsigned short)(g) >> 8;
+        cb = (unsigned short)(b) >> 8;
+    }
+    else // float or double
+    {
+        cr = (unsigned char)(r * 255.0f);
+        cg = (unsigned char)(g * 255.0f);
+        cb = (unsigned char)(b * 255.0f);
+    }
+    return ((cr >> 5) << 5) | ((cg >> 5) << 2) | (cb >> 5);
+}
+
+///////////////////////////////////////////////
+template <class T>
+ILINE unsigned short Color_tpl<T>::pack_argb4444() const
+{
+    unsigned char cr;
+    unsigned char cg;
+    unsigned char cb;
+    unsigned char ca;
+    if constexpr (sizeof(r) == 1) // char and unsigned char
+    {
+        cr = (unsigned char)r;
+        cg = (unsigned char)g;
+        cb = (unsigned char)b;
+        ca = (unsigned char)a;
+    }
+    else if constexpr (sizeof(r) == 2) // short and unsigned short
+    {
+        cr = (unsigned short)(r) >> 8;
+        cg = (unsigned short)(g) >> 8;
+        cb = (unsigned short)(b) >> 8;
+        ca = (unsigned short)(a) >> 8;
+    }
+    else // float or double
+    {
+        cr = (unsigned char)(r * 255.0f);
+        cg = (unsigned char)(g * 255.0f);
+        cb = (unsigned char)(b * 255.0f);
+        ca = (unsigned char)(a * 255.0f);
+    }
+    return ((ca >> 4) << 12) | ((cr >> 4) << 8) | ((cg >> 4) << 4) | (cb >> 4);
+}
+
+///////////////////////////////////////////////
+template <class T>
+ILINE unsigned short Color_tpl<T>::pack_rgb555() const
+{
+    unsigned char cr;
+    unsigned char cg;
+    unsigned char cb;
+    if constexpr (sizeof(r) == 1) // char and unsigned char
+    {
+        cr = (unsigned char)r;
+        cg = (unsigned char)g;
+        cb = (unsigned char)b;
+    }
+    else if constexpr (sizeof(r) == 2) // short and unsigned short
+    {
+        cr = (unsigned short)(r) >> 8;
+        cg = (unsigned short)(g) >> 8;
+        cb = (unsigned short)(b) >> 8;
+    }
+    else // float or double
+    {
+        cr = (unsigned char)(r * 255.0f);
+        cg = (unsigned char)(g * 255.0f);
+        cb = (unsigned char)(b * 255.0f);
+    }
+    return ((cr >> 3) << 10) | ((cg >> 3) << 5) | (cb >> 3);
+}
+
+///////////////////////////////////////////////
+template <class T>
+ILINE unsigned short Color_tpl<T>::pack_rgb565() const
+{
+    unsigned short cr;
+    unsigned short cg;
+    unsigned short cb;
+    if constexpr (sizeof(r) == 1) // char and unsigned char
+    {
+        cr = (unsigned short)r;
+        cg = (unsigned short)g;
+        cb = (unsigned short)b;
+    }
+    else if constexpr (sizeof(r) == 2) // short and unsigned short
+    {
+        cr = (unsigned short)(r) >> 8;
+        cg = (unsigned short)(g) >> 8;
+        cb = (unsigned short)(b) >> 8;
+    }
+    else // float or double
+    {
+        cr = (unsigned short)(r * 255.0f);
+        cg = (unsigned short)(g * 255.0f);
+        cb = (unsigned short)(b * 255.0f);
+    }
+    return ((cr >> 3) << 11) |  ((cg >> 2) << 5) | (cb >> 3);
+}
+
+///////////////////////////////////////////////
+template <class T>
+ILINE unsigned int Color_tpl<T>::pack_bgr888() const
+{
+    unsigned char cr;
+    unsigned char cg;
+    unsigned char cb;
+    if constexpr (sizeof(r) == 1) // char and unsigned char
+    {
+        cr = (unsigned char)r;
+        cg = (unsigned char)g;
+        cb = (unsigned char)b;
+    }
+    else if constexpr (sizeof(r) == 2) // short and unsigned short
+    {
+        cr = (unsigned short)(r) >> 8;
+        cg = (unsigned short)(g) >> 8;
+        cb = (unsigned short)(b) >> 8;
+    }
+    else // float or double
+    {
+        cr = (unsigned char)(r * 255.0f);
+        cg = (unsigned char)(g * 255.0f);
+        cb = (unsigned char)(b * 255.0f);
+    }
+    return (cb << 16) | (cg << 8) | cr;
+}
+
+///////////////////////////////////////////////
+template <class T>
+ILINE unsigned int Color_tpl<T>::pack_rgb888() const
+{
+    unsigned char cr;
+    unsigned char cg;
+    unsigned char cb;
+    if constexpr (sizeof(r) == 1) // char and unsigned char
+    {
+        cr = (unsigned char)r;
+        cg = (unsigned char)g;
+        cb = (unsigned char)b;
+    }
+    else if constexpr (sizeof(r) == 2) // short and unsigned short
+    {
+        cr = (unsigned short)(r) >> 8;
+        cg = (unsigned short)(g) >> 8;
+        cb = (unsigned short)(b) >> 8;
+    }
+    else // float or double
+    {
+        cr = (unsigned char)(r * 255.0f);
+        cg = (unsigned char)(g * 255.0f);
+        cb = (unsigned char)(b * 255.0f);
+    }
+    return (cr << 16) | (cg << 8) | cb;
+}
+
+///////////////////////////////////////////////
+template <class T>
+ILINE unsigned int Color_tpl<T>::pack_abgr8888() const
+{
+    unsigned char cr;
+    unsigned char cg;
+    unsigned char cb;
+    unsigned char ca;
+    if constexpr (sizeof(r) == 1) // char and unsigned char
+    {
+        cr = (unsigned char)r;
+        cg = (unsigned char)g;
+        cb = (unsigned char)b;
+        ca = (unsigned char)a;
+    }
+    else if constexpr (sizeof(r) == 2) // short and unsigned short
+    {
+        cr = (unsigned short)(r) >> 8;
+        cg = (unsigned short)(g) >> 8;
+        cb = (unsigned short)(b) >> 8;
+        ca = (unsigned short)(a) >> 8;
+    }
+    else // float or double
+    {
+        cr = (unsigned char)(r * 255.0f);
+        cg = (unsigned char)(g * 255.0f);
+        cb = (unsigned char)(b * 255.0f);
+        ca = (unsigned char)(a * 255.0f);
+    }
+    return (ca << 24) | (cb << 16) | (cg << 8) | cr;
+}
+
+
+///////////////////////////////////////////////
+template <class T>
+ILINE unsigned int Color_tpl<T>::pack_argb8888() const
+{
+    unsigned char cr;
+    unsigned char cg;
+    unsigned char cb;
+    unsigned char ca;
+    if constexpr (sizeof(r) == 1) // char and unsigned char
+    {
+        cr = (unsigned char)r;
+        cg = (unsigned char)g;
+        cb = (unsigned char)b;
+        ca = (unsigned char)a;
+    }
+    else if constexpr (sizeof(r) == 2) // short and unsigned short
+    {
+        cr = (unsigned short)(r) >> 8;
+        cg = (unsigned short)(g) >> 8;
+        cb = (unsigned short)(b) >> 8;
+        ca = (unsigned short)(a) >> 8;
+    }
+    else // float or double
+    {
+        cr = (unsigned char)(r * 255.0f);
+        cg = (unsigned char)(g * 255.0f);
+        cb = (unsigned char)(b * 255.0f);
+        ca = (unsigned char)(a * 255.0f);
+    }
+    return (ca << 24) | (cr << 16) | (cg << 8) | cb;
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::toHSV(f32& h, f32& s, f32& v) const
+{
+    f32 red, green, blue;
+    if constexpr (sizeof(this->r) == 1) // 8bit integer
+    {
+        red = this->r * (1.0f / f32(0xff));
+        green = this->g * (1.0f / f32(0xff));
+        blue = this->b * (1.0f / f32(0xff));
+    }
+    else if constexpr (sizeof(this->r) == 2) // 16bit integer
+    {
+        red = this->r * (1.0f / f32(0xffff));
+        green = this->g * (1.0f / f32(0xffff));
+        blue = this->b * (1.0f / f32(0xffff));
+    }
+    else // floating point
+    {
+        red = this->r;
+        green = this->g;
+        blue = this->b;
+    }
+
+    if ((blue > green) && (blue > red))
+    {
+        if (!::iszero(v = blue))
+        {
+            const f32 min = red < green ? red : green;
+            const f32 delta = v - min;
+            if (!::iszero(delta))
+            {
+                s = delta / v;
+                h = (240.0f / 360.0f) + (red - green) / delta * (60.0f / 360.0f);
+            }
+            else
+            {
+                s = 0.0f;
+                h = (240.0f / 360.0f) + (red - green) * (60.0f / 360.0f);
+            }
+            if (h < 0.0f)
+            {
+                h += 1.0f;
+            }
+        }
+        else
+        {
+            s = 0.0f;
+            h = 0.0f;
+        }
+    }
+    else if (green > red)
+    {
+        if (!::iszero(v = green))
+        {
+            const f32 min = red < blue ? red : blue;
+            const f32 delta = v - min;
+            if (!::iszero(delta))
+            {
+                s = delta / v;
+                h = (120.0f / 360.0f) + (blue - red) / delta * (60.0f / 360.0f);
+            }
+            else
+            {
+                s = 0.0f;
+                h = (120.0f / 360.0f) + (blue - red) * (60.0f / 360.0f);
+            }
+            if (h < 0.0f)
+            {
+                h += 1.0f;
+            }
+        }
+        else
+        {
+            s = 0.0f;
+            h = 0.0f;
+        }
+    }
+    else
+    {
+        if (!::iszero(v = red))
+        {
+            const f32 min = green < blue ? green : blue;
+            const f32 delta = v - min;
+            if (!::iszero(delta))
+            {
+                s = delta / v;
+                h = (green - blue) / delta * (60.0f / 360.0f);
+            }
+            else
+            {
+                s = 0.0f;
+                h = (green - blue) * (60.0f / 360.0f);
+            }
+            if (h < 0.0f)
+            {
+                h += 1.0f;
+            }
+        }
+        else
+        {
+            s = 0.0f;
+            h = 0.0f;
+        }
+    }
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::fromHSV(f32 h, f32 s, f32 v)
+{
+    f32 red, green, blue;
+    if (::iszero(v))
+    {
+        red = 0.0f;
+        green = 0.0f;
+        blue = 0.0f;
+    }
+    else if (::iszero(s))
+    {
+        red = v;
+        green = v;
+        blue = v;
+    }
+    else
+    {
+        const f32 hi = h * 6.0f;
+        const int32 i = (int32)::floor(hi);
+        const f32 f = hi - i;
+
+        const f32 v0 = v * (1.0f - s);
+        const f32 v1 = v * (1.0f - s * f);
+        const f32 v2 = v * (1.0f - s * (1.0f - f));
+
+        switch (i)
+        {
+        case 0:
+            red = v;
+            green = v2;
+            blue = v0;
+            break;
+        case 1:
+            red = v1;
+            green = v;
+            blue = v0;
+            break;
+        case 2:
+            red = v0;
+            green = v;
+            blue = v2;
+            break;
+        case 3:
+            red = v0;
+            green = v1;
+            blue = v;
+            break;
+        case 4:
+            red = v2;
+            green = v0;
+            blue = v;
+            break;
+        case 5:
+            red = v;
+            green = v0;
+            blue = v1;
+            break;
+
+        case 6:
+            red = v;
+            green = v2;
+            blue = v0;
+            break;
+        case -1:
+            red = v;
+            green = v0;
+            blue = v1;
+            break;
+        default:
+            red = 0.0f;
+            green = 0.0f;
+            blue = 0.0f;
+            break;
+        }
+    }
+
+    if constexpr (sizeof(this->r) == 1) // 8bit integer
+    {
+        this->r = red * f32(0xff);
+        this->g = green * f32(0xff);
+        this->b = blue * f32(0xff);
+    }
+    else if constexpr (sizeof(this->r) == 2) // 16bit integer
+    {
+        this->r = red * f32(0xffff);
+        this->g = green * f32(0xffff);
+        this->b = blue * f32(0xffff);
+    }
+    else // floating point
+    {
+        this->r = red;
+        this->g = green;
+        this->b = blue;
+    }
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::clamp(T bottom, T top)
+{
+    r = min(top, max(bottom, r));
+    g = min(top, max(bottom, g));
+    b = min(top, max(bottom, b));
+    a = min(top, max(bottom, a));
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::maximum(const Color_tpl<T>& ca, const Color_tpl<T>& cb)
+{
+    r = max(ca.r, cb.r);
+    g = max(ca.g, cb.g);
+    b = max(ca.b, cb.b);
+    a = max(ca.a, cb.a);
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::minimum(const Color_tpl<T>& ca, const Color_tpl<T>& cb)
+{
+    r = min(ca.r, cb.r);
+    g = min(ca.g, cb.g);
+    b = min(ca.b, cb.b);
+    a = min(ca.a, cb.a);
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::abs()
+{
+    r = fabs_tpl(r);
+    g = fabs_tpl(g);
+    b = fabs_tpl(b);
+    a = fabs_tpl(a);
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::adjust_contrast(T c)
+{
+    r = 0.5f + c * (r - 0.5f);
+    g = 0.5f + c * (g - 0.5f);
+    b = 0.5f + c * (b - 0.5f);
+    a = 0.5f + c * (a - 0.5f);
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::adjust_saturation(T s)
+{
+    // Approximate values for each component's contribution to luminance.
+    // Based upon the NTSC standard described in ITU-R Recommendation BT.709.
+    T grey = r * 0.2125f + g * 0.7154f + b * 0.0721f;
+    r = grey + s * (r - grey);
+    g = grey + s * (g - grey);
+    b = grey + s * (b - grey);
+    a = grey + s * (a - grey);
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::adjust_luminance(float newLum)
+{
+    // Optimized yet equivalent version of replacing luminance in XYZ space.
+    // Color and luminance are expected to be linear.
+
+    Color_tpl<f32> colF(r, g, b, a);
+
+    float lum = colF.r * 0.212671f + colF.g * 0.715160f + colF.b * 0.072169f;
+    if (iszero(lum))
+    {
+        return;
+    }
+
+    *this = Color_tpl<T>(colF * newLum / lum);
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::lerpFloat(const Color_tpl<T>& ca, const Color_tpl<T>& cb, float s)
+{
+    r = (T)(ca.r + s * (cb.r - ca.r));
+    g = (T)(ca.g + s * (cb.g - ca.g));
+    b = (T)(ca.b + s * (cb.b - ca.b));
+    a = (T)(ca.a + s * (cb.a - ca.a));
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::negative([[maybe_unused]] const Color_tpl<T>& c)
+{
+    r = T(1.0f) - r;
+    g = T(1.0f) - g;
+    b = T(1.0f) - b;
+    a = T(1.0f) - a;
+}
+
+///////////////////////////////////////////////
+template <class T>
+inline void Color_tpl<T>::grey([[maybe_unused]] const Color_tpl<T>& c)
+{
+    T m = (r + g + b) / T(3);
+
+    r = m;
+    g = m;
+    b = m;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//#define RGBA8(r,g,b,a)   (ColorB((uint8)(r),(uint8)(g),(uint8)(b),(uint8)(a)))
+#if defined(NEED_ENDIAN_SWAP)
+    #define RGBA8(a, b, g, r)     ((uint32)(((uint8)(r) | ((uint16)((uint8)(g)) << 8)) | (((uint32)(uint8)(b)) << 16)) | (((uint32)(uint8)(a)) << 24))
+#else
+    #define RGBA8(r, g, b, a)     ((uint32)(((uint8)(r) | ((uint16)((uint8)(g)) << 8)) | (((uint32)(uint8)(b)) << 16)) | (((uint32)(uint8)(a)) << 24))
+#endif
+#define Col_Black                               ColorF (0.000f, 0.000f, 0.000f) // 0xFF000000   RGB: 0, 0, 0
+#define Col_White                               ColorF (1.000f, 1.000f, 1.000f) // 0xFFFFFFFF   RGB: 255, 255, 255
+#define Col_Aquamarine                  ColorF (0.498f, 1.000f, 0.831f) // 0xFF7FFFD4   RGB: 127, 255, 212
+#define Col_Azure                               ColorF (0.000f, 0.498f, 1.000f) // 0xFF007FFF       RGB: 0, 127, 255
+#define Col_Blue                                ColorF (0.000f, 0.000f, 1.000f) // 0xFF0000FF   RGB: 0, 0, 255
+#define Col_BlueViolet                  ColorF (0.541f, 0.169f, 0.886f) // 0xFF8A2BE2   RGB: 138, 43, 226
+#define Col_Brown                               ColorF (0.647f, 0.165f, 0.165f) // 0xFFA52A2A   RGB: 165, 42, 42
+#define Col_CadetBlue                       ColorF (0.373f, 0.620f, 0.627f) // 0xFF5F9EA0   RGB: 95, 158, 160
+#define Col_Coral                               ColorF (1.000f, 0.498f, 0.314f) // 0xFFFF7F50   RGB: 255, 127, 80
+#define Col_CornflowerBlue          ColorF (0.392f, 0.584f, 0.929f) // 0xFF6495ED   RGB: 100, 149, 237
+#define Col_Cyan                                ColorF (0.000f, 1.000f, 1.000f) // 0xFF00FFFF   RGB: 0, 255, 255
+#define Col_DarkGray                        ColorF (0.663f, 0.663f, 0.663f) // 0xFFA9A9A9   RGB: 169, 169, 169
+#define Col_DarkGrey                        ColorF (0.663f, 0.663f, 0.663f) // 0xFFA9A9A9   RGB: 169, 169, 169
+#define Col_DarkGreen                       ColorF (0.000f, 0.392f, 0.000f) // 0xFF006400   RGB: 0, 100, 0
+#define Col_DarkOliveGreen          ColorF (0.333f, 0.420f, 0.184f) // 0xFF556B2F   RGB: 85, 107, 47
+#define Col_DarkOrchid                  ColorF (0.600f, 0.196f, 0.800f) // 0xFF9932CC   RGB: 153, 50, 204
+#define Col_DarkSlateBlue               ColorF (0.282f, 0.239f, 0.545f) // 0xFF483D8B   RGB: 72, 61, 139
+#define Col_DarkSlateGray               ColorF (0.184f, 0.310f, 0.310f) // 0xFF2F4F4F   RGB: 47, 79, 79
+#define Col_DarkSlateGrey               ColorF (0.184f, 0.310f, 0.310f) // 0xFF2F4F4F   RGB: 47, 79, 79
+#define Col_DarkTurquoise               ColorF (0.000f, 0.808f, 0.820f) // 0xFF00CED1       RGB: 0, 206, 209
+#define Col_DarkWood                        ColorF (0.050f, 0.010f, 0.005f) // 0xFF0D0301       RGB: 13, 3, 1
+#define Col_DeepPink                        ColorF (1.000f, 0.078f, 0.576f) // 0xFFFF1493       RGB: 255, 20, 147
+#define Col_DimGray                         ColorF (0.412f, 0.412f, 0.412f) // 0xFF696969   RGB: 105, 105, 105
+#define Col_DimGrey                         ColorF (0.412f, 0.412f, 0.412f) // 0xFF696969   RGB: 105, 105, 105
+#define Col_FireBrick                       ColorF (0.698f, 0.133f, 0.133f) // 0xFFB22222   RGB: 178, 34, 34
+#define Col_ForestGreen                 ColorF (0.133f, 0.545f, 0.133f) // 0xFF228B22   RGB: 34, 139, 34
+#define Col_Gold                                ColorF (1.000f, 0.843f, 0.000f) // 0xFFFFD700   RGB: 255, 215, 0
+#define Col_Goldenrod                       ColorF (0.855f, 0.647f, 0.125f) // 0xFFDAA520   RGB: 218, 165, 32
+#define Col_Gray                                ColorF (0.502f, 0.502f, 0.502f) // 0xFF808080   RGB: 128, 128, 128
+#define Col_Grey                                ColorF (0.502f, 0.502f, 0.502f) // 0xFF808080   RGB: 128, 128, 128
+#define Col_Green                               ColorF (0.000f, 0.502f, 0.000f) // 0xFF008000   RGB: 0, 128, 0
+#define Col_GreenYellow                 ColorF (0.678f, 1.000f, 0.184f) // 0xFFADFF2F   RGB: 173, 255, 47
+#define Col_IndianRed                       ColorF (0.804f, 0.361f, 0.361f) // 0xFFCD5C5C   RGB: 205, 92, 92
+#define Col_Khaki                               ColorF (0.941f, 0.902f, 0.549f) // 0xFFF0E68C   RGB: 240, 230, 140
+#define Col_LightBlue                       ColorF (0.678f, 0.847f, 0.902f) // 0xFFADD8E6   RGB: 173, 216, 230
+#define Col_LightGray                       ColorF (0.827f, 0.827f, 0.827f) // 0xFFD3D3D3   RGB: 211, 211, 211
+#define Col_LightGrey                       ColorF (0.827f, 0.827f, 0.827f) // 0xFFD3D3D3   RGB: 211, 211, 211
+#define Col_LightSteelBlue          ColorF (0.690f, 0.769f, 0.871f) // 0xFFB0C4DE   RGB: 176, 196, 222
+#define Col_LightWood                       ColorF (0.600f, 0.240f, 0.100f) // 0xFF993D1A       RGB: 153, 61, 26
+#define Col_Lime                                ColorF (0.000f, 1.000f, 0.000f) // 0xFF00FF00   RGB: 0, 255, 0
+#define Col_LimeGreen                       ColorF (0.196f, 0.804f, 0.196f) // 0xFF32CD32   RGB: 50, 205, 50
+#define Col_Magenta                         ColorF (1.000f, 0.000f, 1.000f) // 0xFFFF00FF   RGB: 255, 0, 255
+#define Col_Maroon                          ColorF (0.502f, 0.000f, 0.000f) // 0xFF800000   RGB: 128, 0, 0
+#define Col_MedianWood                  ColorF (0.300f, 0.120f, 0.030f) // 0xFF4D1F09       RGB: 77, 31, 9
+#define Col_MediumAquamarine        ColorF (0.400f, 0.804f, 0.667f) // 0xFF66CDAA   RGB: 102, 205, 170
+#define Col_MediumBlue                  ColorF (0.000f, 0.000f, 0.804f) // 0xFF0000CD   RGB: 0, 0, 205
+#define Col_MediumForestGreen       ColorF (0.420f, 0.557f, 0.137f) // 0xFF6B8E23       RGB: 107, 142, 35
+#define Col_MediumGoldenrod         ColorF (0.918f, 0.918f, 0.678f) // 0xFFEAEAAD       RGB: 234, 234, 173
+#define Col_MediumOrchid                ColorF (0.729f, 0.333f, 0.827f) // 0xFFBA55D3   RGB: 186, 85, 211
+#define Col_MediumSeaGreen          ColorF (0.235f, 0.702f, 0.443f) // 0xFF3CB371   RGB: 60, 179, 113
+#define Col_MediumSlateBlue         ColorF (0.482f, 0.408f, 0.933f) // 0xFF7B68EE   RGB: 123, 104, 238
+#define Col_MediumSpringGreen       ColorF (0.000f, 0.980f, 0.604f) // 0xFF00FA9A   RGB: 0, 250, 154
+#define Col_MediumTurquoise         ColorF (0.282f, 0.820f, 0.800f) // 0xFF48D1CC   RGB: 72, 209, 204
+#define Col_MediumVioletRed         ColorF (0.780f, 0.082f, 0.522f) // 0xFFC71585   RGB: 199, 21, 133
+#define Col_MidnightBlue                ColorF (0.098f, 0.098f, 0.439f) // 0xFF191970   RGB: 25, 25, 112
+#define Col_Navy                                ColorF (0.000f, 0.000f, 0.502f) // 0xFF000080   RGB: 0, 0, 128
+#define Col_NavyBlue                        ColorF (0.137f, 0.137f, 0.557f) // 0xFF23238E       RGB: 35, 35, 142
+#define Col_Orange                          ColorF (1.000f, 0.647f, 0.000f) // 0xFFFFA500   RGB: 255, 165, 0
+#define Col_OrangeRed                       ColorF (1.000f, 0.271f, 0.000f) // 0xFFFF4500   RGB: 255, 69, 0
+#define Col_Orchid                          ColorF (0.855f, 0.439f, 0.839f) // 0xFFDA70D6   RGB: 218, 112, 214
+#define Col_PaleGreen                       ColorF (0.596f, 0.984f, 0.596f) // 0xFF98FB98   RGB: 152, 251, 152
+#define Col_Pink                                ColorF (1.000f, 0.753f, 0.796f) // 0xFFFFC0CB   RGB: 255, 192, 203
+#define Col_Plum                                ColorF (0.867f, 0.627f, 0.867f) // 0xFFDDA0DD   RGB: 221, 160, 221
+#define Col_Red                                 ColorF (1.000f, 0.000f, 0.000f) // 0xFFFF0000   RGB: 255, 0, 0
+#define Col_Salmon                          ColorF (0.980f, 0.502f, 0.447f) // 0xFFFA8072   RGB: 250, 128, 114
+#define Col_SeaGreen                        ColorF (0.180f, 0.545f, 0.341f) // 0xFF2E8B57   RGB: 46, 139, 87
+#define Col_Sienna                          ColorF (0.627f, 0.322f, 0.176f) // 0xFFA0522D   RGB: 160, 82, 45
+#define Col_SkyBlue                         ColorF (0.529f, 0.808f, 0.922f) // 0xFF87CEEB   RGB: 135, 206, 235
+#define Col_SlateBlue                       ColorF (0.416f, 0.353f, 0.804f) // 0xFF6A5ACD   RGB: 106, 90, 205
+#define Col_SpringGreen                 ColorF (0.000f, 1.000f, 0.498f) // 0xFF00FF7F   RGB: 0, 255, 127
+#define Col_SteelBlue                       ColorF (0.275f, 0.510f, 0.706f) // 0xFF4682B4   RGB: 70, 130, 180
+#define Col_Tan                                 ColorF (0.824f, 0.706f, 0.549f) // 0xFFD2B48C   RGB: 210, 180, 140
+#define Col_Thistle                         ColorF (0.847f, 0.749f, 0.847f) // 0xFFD8BFD8   RGB: 216, 191, 216
+#define Col_Transparent                 ColorF (0.0f, 0.0f, 0.0f, 0.0f) // 0x00000000       RGB: 0, 0, 0
+#define Col_Turquoise                       ColorF (0.251f, 0.878f, 0.816f) // 0xFF40E0D0   RGB: 64, 224, 208
+#define Col_Violet                          ColorF (0.933f, 0.510f, 0.933f) // 0xFFEE82EE   RGB: 238, 130, 238
+#define Col_VioletRed                       ColorF (0.800f, 0.196f, 0.600f) // 0xFFCC3299       RGB: 204, 50, 153
+#define Col_Wheat                               ColorF (0.961f, 0.871f, 0.702f) // 0xFFF5DEB3   RGB: 245, 222, 179
+#define Col_Yellow                          ColorF (1.000f, 1.000f, 0.000f) // 0xFFFFFF00   RGB: 255, 255, 0
+#define Col_YellowGreen                 ColorF (0.604f, 0.804f, 0.196f) // 0xFF9ACD32   RGB: 154, 205, 50
+#define Col_TrackviewDefault    ColorF (0.187820792f, 0.187820792f, 1.0f)
+
+#define Clr_Empty                               ColorF(0.0f, 0.0f, 0.0f, 1.0f)
+#define Clr_Dark                                ColorF(0.15f, 0.15f, 0.15f, 1.0f)
+#define Clr_White                               ColorF(1.0f, 1.0f, 1.0f, 1.0f)
+#define Clr_WhiteTrans                          ColorF(1.0f, 1.0f, 1.0f, 0.0f)
+#define Clr_Full                                ColorF(1.0f, 1.0f, 1.0f, 1.0f)
+#define Clr_Neutral                             ColorF(1.0f, 1.0f, 1.0f, 1.0f)
+#define Clr_Transparent                         ColorF(0.0f, 0.0f, 0.0f, 0.0f)
+#define Clr_FrontVector                         ColorF(0.0f, 0.0f, 0.5f, 1.0f)
+#define Clr_Static                              ColorF(127.0f / 255.0f, 127.0f / 255.0f, 0.0f, 0.0f)
+#define Clr_Median                              ColorF(0.5f, 0.5f, 0.5f, 0.0f)
+#define Clr_MedianHalf                          ColorF(0.5f, 0.5f, 0.5f, 0.5f)
+#define Clr_FarPlane                            ColorF(1.0f, 0.0f, 0.0f, 0.0f)
+#define Clr_FarPlane_R                          ColorF(bReverseDepth ? 0.0f : 1.0f, 0.0f, 0.0f, 0.0f)
+#define Clr_Unknown                             ColorF(0.0f, 0.0f, 0.0f, 0.0f)
+#define Clr_Unused                              ColorF(0.0f, 0.0f, 0.0f, 0.0f)
+#define Clr_Debug                               ColorF(1.0f, 0.0f, 0.0f, 1.0f)
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_COLOR_H
+
+
diff --git a/Code/Legacy/CryCommon/Cry_Geo.h b/Code/Legacy/CryCommon/Cry_Geo.h
new file mode 100644
index 0000000000..d3bdeec105
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Geo.h
@@ -0,0 +1,1183 @@
+/*
+ * 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 structures for geometry computations
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_GEO_H
+#define CRYINCLUDE_CRYCOMMON_CRY_GEO_H
+#pragma once
+
+#include "Cry_Math.h"
+///////////////////////////////////////////////////////////////////////////////
+// Forward declarations                                                      //
+///////////////////////////////////////////////////////////////////////////////
+
+struct Ray;
+template <typename F>
+struct Lineseg_tpl;
+template <typename F>
+struct Triangle_tpl;
+
+struct AABB;
+template <typename F>
+struct OBB_tpl;
+
+struct Sphere;
+struct AAEllipsoid;
+struct Ellipsoid;
+struct Cone;
+
+//-----------------------------------------------------
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Definitions                                                               //
+///////////////////////////////////////////////////////////////////////////////
+
+//
+// Random geometry generation functions.
+//
+
+enum EGeomForm
+{
+    GeomForm_Vertices,
+    GeomForm_Edges,
+    GeomForm_Surface,
+    GeomForm_Volume,
+
+    MaxGeomForm
+};
+AUTO_TYPE_INFO(EGeomForm)
+
+enum EGeomType
+{
+    GeomType_None,
+    GeomType_BoundingBox,
+    GeomType_Physics,
+    GeomType_Render,
+};
+AUTO_TYPE_INFO(EGeomType)
+
+struct PosNorm
+{
+    Vec3    vPos;
+    Vec3    vNorm;
+
+    void zero()
+    {
+        vPos.zero();
+        vNorm.zero();
+    }
+
+    // transform by matrix, etc
+    void operator <<= (Matrix34 const& mx)
+    {
+        vPos = mx * vPos;
+        vNorm = Matrix33(mx) * vNorm;
+    }
+    void operator <<= (QuatTS const& qts)
+    {
+        vPos = qts * vPos;
+        vNorm = qts.q * vNorm;
+    }
+    void operator <<= (DualQuat const& dq)
+    {
+        vPos = dq * vPos;
+        vNorm = dq.nq * vNorm;
+    }
+};
+
+struct RectF
+{
+    float   x, y, w, h;
+    RectF()
+        : x(0)
+        , y(0)
+        , w(1)
+        , h(1)
+    {
+    }
+    AUTO_STRUCT_INFO
+};
+
+struct RectI
+{
+    int   x, y, w, h;
+    RectI()
+        : x(0)
+        , y(0)
+        , w(1)
+        , h(1)
+    {
+    }
+    RectI(int inX, int inY, int inW, int inH)
+        : x(inX)
+        , y(inY)
+        , w(inW)
+        , h(inH)
+    {
+    }
+    _inline void Add(RectI rcAdd)
+    {
+        int x2 = x + w;
+        int y2 = y + h;
+        int x22 = rcAdd.x + rcAdd.w;
+        int y22 = rcAdd.y + rcAdd.h;
+        x =  min(x, rcAdd.x);
+        y =  min(y, rcAdd.y);
+        x2 = max(x2, x22);
+        y2 = max(y2, y22);
+        w = x2 - x;
+        h = y2 - y;
+    }
+    _inline void Add(int inX, int inY, int inW, int inH)
+    {
+        Add(RectI(inX, inY, inW, inH));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Line
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+struct Line
+{
+    Vec3 pointonline;
+    Vec3 direction; //caution: the direction is important for any intersection test
+
+    //default Line constructor (without initialisation)
+    inline Line(void) {}
+    inline Line(const Vec3& o, const Vec3& d) {  pointonline = o; direction = d; }
+    inline void operator () (const Vec3& o, const Vec3& d) {  pointonline = o; direction = d; }
+
+    ~Line(void) {};
+};
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Ray
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+struct Ray
+{
+    Vec3 origin;
+    Vec3 direction;
+
+    //default Ray constructor (without initialisation)
+    inline Ray(void) {}
+    inline Ray(const Vec3& o, const Vec3& d) {  origin = o; direction = d; }
+    inline void operator () (const Vec3& o, const Vec3& d) {  origin = o; direction = d; }
+
+    ~Ray(void) {};
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Lineseg
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+template <typename F>
+struct Lineseg_tpl
+{
+    Vec3_tpl<F> start;
+    Vec3_tpl<F> end;
+
+    //default Lineseg constructor (without initialisation)
+    inline Lineseg_tpl(void) {}
+    inline Lineseg_tpl(const Vec3_tpl<F>& s, const Vec3_tpl<F>& e) {  start = s; end = e; }
+    inline void operator () (const Vec3_tpl<F>& s, const Vec3_tpl<F>& e) {  start = s; end = e; }
+
+    Vec3 GetPoint(F t) const {return t * end + (F(1.0) - t) * start; }
+
+    ~Lineseg_tpl(void) {};
+};
+
+typedef Lineseg_tpl<float> Lineseg;
+typedef Lineseg_tpl<real> Linesegr;
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Triangle
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+template <typename F>
+struct Triangle_tpl
+{
+    Vec3_tpl<F> v0, v1, v2;
+
+    //default Lineseg constructor (without initialisation)
+    ILINE Triangle_tpl(void) {}
+    ILINE Triangle_tpl(const Vec3_tpl<F>& a, const Vec3_tpl<F>& b, const Vec3_tpl<F>& c) {  v0 = a; v1 = b; v2 = c; }
+    ILINE void operator () (const Vec3_tpl<F>& a, const Vec3_tpl<F>& b, const Vec3_tpl<F>& c) { v0 = a; v1 = b; v2 = c; }
+
+    ~Triangle_tpl(void) {};
+
+    Vec3_tpl<F> GetNormal() const
+    {
+        return ((v1 - v0) ^ (v2 - v0)).GetNormalized();
+    }
+
+    F GetArea() const
+    {
+        return 0.5f * (v1 - v0).Cross(v2 - v0).GetLength();
+    }
+};
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Cone
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+struct Cone
+{
+    Vec3 mTip;
+    Vec3 mDir;
+    Vec3 mBase;
+
+    float mHeight;
+    float mBaseRadius;
+
+    Cone() {}
+    Cone(const Vec3& tip, const Vec3& dir, float height, float baseRadius)
+        : mTip(tip)
+        , mDir(dir)
+        , mBase(tip + dir * height)
+        , mHeight(height)
+        , mBaseRadius(baseRadius) {}
+};
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct AABB
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+struct AABB
+{
+    Vec3 min;
+    Vec3 max;
+
+    /// default AABB constructor (without initialisation)
+    ILINE  AABB()
+    {}
+    enum type_reset
+    {
+        RESET
+    };
+    // AABB aabb(RESET) generates a reset aabb
+    ILINE  AABB(type_reset)
+    { Reset(); }
+    ILINE  explicit AABB(float radius)
+    { max = Vec3(radius); min = -max; }
+    ILINE  explicit AABB(const Vec3& v)
+    { min = max = v; }
+    ILINE  AABB(const Vec3& v, float radius)
+    { Vec3 ext(radius); min = v - ext; max = v + ext; }
+    ILINE  AABB(const Vec3& vmin, const Vec3& vmax)
+    { min = vmin; max = vmax; }
+    ILINE  AABB(const AABB& aabb)
+    {
+        min.x = aabb.min.x;
+        min.y = aabb.min.y;
+        min.z = aabb.min.z;
+        max.x = aabb.max.x;
+        max.y = aabb.max.y;
+        max.z = aabb.max.z;
+    }
+    inline AABB(const Vec3* points, int num)
+    {
+        Reset();
+        for (int i = 0; i < num; i++)
+        {
+            Add(points[i]);
+        }
+    }
+
+    //! Reset Bounding box before calculating bounds.
+    //! These values ensure that Add() functions work correctly for Reset bbs, without additional comparisons.
+    ILINE void Reset()
+    {   min = Vec3(1e15f);  max = Vec3(-1e15f); }
+
+    ILINE bool IsReset() const
+    { return min.x > max.x; }
+
+    ILINE float IsResetSel(float ifReset, float ifNotReset) const
+    { return (float)fsel(max.x - min.x, ifNotReset, ifReset); }
+
+    //! Check if bounding box is empty (Zero volume).
+    ILINE bool IsEmpty() const
+    { return min == max; }
+
+    //! Check if bounding box has valid, non zero volume
+    ILINE bool IsNonZero() const
+    { return min.x < max.x && min.y < max.y && min.z < max.z; }
+
+    ILINE Vec3 GetCenter() const
+    { return (min + max) * 0.5f; }
+
+    ILINE Vec3 GetSize() const
+    { return (max - min) * IsResetSel(0.0f, 1.0f); }
+
+    ILINE float GetRadius() const
+    { return IsResetSel(0.0f, (max - min).GetLengthFloat() * 0.5f); }
+
+    ILINE float GetRadiusSqr() const
+    { return IsResetSel(0.0f, ((max - min) * 0.5f).GetLengthSquaredFloat()); }
+
+    ILINE float GetVolume() const
+    { return IsResetSel(0.0f, (max.x - min.x) * (max.y - min.y) * (max.z - min.z)); }
+
+    ILINE void Add(const Vec3& v)
+    {
+        min.CheckMin(v);
+        max.CheckMax(v);
+    }
+
+    inline void Add(const Vec3& v, float radius)
+    {
+        Vec3 ext(radius);
+        min.CheckMin(v - ext);
+        max.CheckMax(v + ext);
+    }
+
+    ILINE void Add(const AABB& bb)
+    {
+        min.CheckMin(bb.min);
+        max.CheckMax(bb.max);
+    }
+
+    inline void Move(const Vec3& v)
+    {
+        const float moveMult = IsResetSel(0.0f, 1.0f);
+        const Vec3 vMove = v * moveMult;
+        min += vMove;
+        max += vMove;
+    }
+
+    inline void Expand(Vec3 const& v)
+    {
+        if (!IsReset())
+        {
+            min -= v;
+            max += v;
+        }
+    }
+
+    // Augment the box on all sides by a box.
+    inline void Augment(AABB const& bb)
+    {
+        if (!IsReset() && !bb.IsReset())
+        {
+            Add(min + bb.min);
+            Add(max + bb.max);
+        }
+    }
+
+    void ClipToBox(AABB const& bb)
+    {
+        min.CheckMax(bb.min);
+        max.CheckMin(bb.max);
+    }
+
+    void ClipMoveToBox(AABB const& bb)
+    {
+        for (int a = 0; a < 3; a++)
+        {
+            if (max[a] - min[a] > bb.max[a] - bb.min[a])
+            {
+                min[a] = bb.min[a];
+                max[a] = bb.max[a];
+            }
+            else if (min[a] < bb.min[a])
+            {
+                max[a] += bb.min[a] - min[a];
+                min[a] = bb.min[a];
+            }
+            else if (max[a] > bb.max[a])
+            {
+                min[a] += bb.max[a] - max[a];
+                max[a] = bb.max[a];
+            }
+        }
+    }
+
+    //! Check if this bounding box overlap with bounding box of sphere.
+    bool IsOverlapSphereBounds(const Vec3& pos, float radius) const
+    {
+        assert(min.IsValid());
+        assert(max.IsValid());
+        assert(pos.IsValid());
+
+        if (pos.x > min.x && pos.x < max.x &&   pos.y > min.y && pos.y < max.y &&   pos.z > min.z && pos.z < max.z)
+        {
+            return true;
+        }
+
+        if (pos.x + radius < min.x)
+        {
+            return false;
+        }
+        if (pos.y + radius < min.y)
+        {
+            return false;
+        }
+        if (pos.z + radius < min.z)
+        {
+            return false;
+        }
+        if (pos.x - radius > max.x)
+        {
+            return false;
+        }
+        if (pos.y - radius > max.y)
+        {
+            return false;
+        }
+        if (pos.z - radius > max.z)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    //! Check if this bounding box contain sphere within itself.
+    bool IsContainSphere(const Vec3& pos, float radius) const
+    {
+        assert(min.IsValid());
+        assert(max.IsValid());
+        assert(pos.IsValid());
+        if (pos.x - radius < min.x)
+        {
+            return false;
+        }
+        if (pos.y - radius < min.y)
+        {
+            return false;
+        }
+        if (pos.z - radius < min.z)
+        {
+            return false;
+        }
+        if (pos.x + radius > max.x)
+        {
+            return false;
+        }
+        if (pos.y + radius > max.y)
+        {
+            return false;
+        }
+        if (pos.z + radius > max.z)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    //! Check if this bounding box contains a point within itself.
+    bool IsContainPoint(const Vec3& pos) const
+    {
+        assert(min.IsValid());
+        assert(max.IsValid());
+        assert(pos.IsValid());
+        if (pos.x < min.x)
+        {
+            return false;
+        }
+        if (pos.y < min.y)
+        {
+            return false;
+        }
+        if (pos.z < min.z)
+        {
+            return false;
+        }
+        if (pos.x > max.x)
+        {
+            return false;
+        }
+        if (pos.y > max.y)
+        {
+            return false;
+        }
+        if (pos.z > max.z)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    float GetDistanceSqr(Vec3 const& v) const
+    {
+        Vec3 vNear = v;
+        vNear.CheckMax(min);
+        vNear.CheckMin(max);
+        return vNear.GetSquaredDistance(v);
+    }
+
+    float GetDistance(Vec3 const& v) const
+    {
+        return sqrt(GetDistanceSqr(v));
+    }
+
+    bool ContainsBox(AABB const& b) const
+    {
+        assert(min.IsValid());
+        assert(max.IsValid());
+        assert(b.min.IsValid());
+        assert(b.max.IsValid());
+        return min.x <= b.min.x && min.y <= b.min.y && min.z <= b.min.z
+               && max.x >= b.max.x && max.y >= b.max.y && max.z >= b.max.z;
+    }
+
+    bool ContainsBox2D(AABB const& b) const
+    {
+        assert(min.IsValid());
+        assert(max.IsValid());
+        assert(b.min.IsValid());
+        assert(b.max.IsValid());
+        return min.x <= b.min.x && min.y <= b.min.y
+               && max.x >= b.max.x && max.y >= b.max.y;
+    }
+
+
+    // Check two bounding boxes for intersection.
+    inline bool IsIntersectBox(const AABB& b) const
+    {
+        assert(min.IsValid());
+        assert(max.IsValid());
+        assert(b.min.IsValid());
+        assert(b.max.IsValid());
+        // Check for intersection on X axis.
+        if ((min.x > b.max.x) || (b.min.x > max.x))
+        {
+            return false;
+        }
+        // Check for intersection on Y axis.
+        if ((min.y > b.max.y) || (b.min.y > max.y))
+        {
+            return false;
+        }
+        // Check for intersection on Z axis.
+        if ((min.z > b.max.z) || (b.min.z > max.z))
+        {
+            return false;
+        }
+        // Boxes overlap in all 3 axises.
+        return true;
+    }
+
+    /*!
+    * calculate the new bounds of a transformed AABB
+    *
+    * Example:
+    * AABB aabb = AABB::CreateAABBfromOBB(m34,aabb);
+    *
+    * return values:
+    *  expanded AABB in world-space
+    */
+    ILINE void SetTransformedAABB(const Matrix34& m34, const AABB& aabb)
+    {
+        if (aabb.IsReset())
+        {
+            Reset();
+        }
+        else
+        {
+            Matrix33 m33;
+            m33.m00 = fabs_tpl(m34.m00);
+            m33.m01 = fabs_tpl(m34.m01);
+            m33.m02 = fabs_tpl(m34.m02);
+            m33.m10 = fabs_tpl(m34.m10);
+            m33.m11 = fabs_tpl(m34.m11);
+            m33.m12 = fabs_tpl(m34.m12);
+            m33.m20 = fabs_tpl(m34.m20);
+            m33.m21 = fabs_tpl(m34.m21);
+            m33.m22 = fabs_tpl(m34.m22);
+
+            Vec3 sz     =   m33 * ((aabb.max - aabb.min) * 0.5f);
+            Vec3 pos    = m34 * ((aabb.max + aabb.min) * 0.5f);
+            min = pos - sz;
+            max = pos + sz;
+        }
+    }
+    ILINE static AABB CreateTransformedAABB(const Matrix34& m34, const AABB& aabb)
+    { AABB taabb; taabb.SetTransformedAABB(m34, aabb); return taabb;     }
+
+
+
+    ILINE void SetTransformedAABB(const QuatT& qt, const AABB& aabb)
+    {
+        if (aabb.IsReset())
+        {
+            Reset();
+        }
+        else
+        {
+            Matrix33 m33 = Matrix33(qt.q);
+            m33.m00 = fabs_tpl(m33.m00);
+            m33.m01 = fabs_tpl(m33.m01);
+            m33.m02 = fabs_tpl(m33.m02);
+            m33.m10 = fabs_tpl(m33.m10);
+            m33.m11 = fabs_tpl(m33.m11);
+            m33.m12 = fabs_tpl(m33.m12);
+            m33.m20 = fabs_tpl(m33.m20);
+            m33.m21 = fabs_tpl(m33.m21);
+            m33.m22 = fabs_tpl(m33.m22);
+            Vec3 sz     =   m33 * ((aabb.max - aabb.min) * 0.5f);
+            Vec3 pos    =  qt * ((aabb.max + aabb.min) * 0.5f);
+            min = pos - sz;
+            max = pos + sz;
+        }
+    }
+    ILINE static AABB CreateTransformedAABB(const QuatT& qt, const AABB& aabb)
+    { AABB taabb; taabb.SetTransformedAABB(qt, aabb); return taabb;  }
+
+
+    //create an AABB using just the extensions of the OBB and ignore the orientation.
+    template<typename F>
+    ILINE void SetAABBfromOBB(const OBB_tpl<F>& obb)
+    { min = obb.c - obb.h; max = obb.c + obb.h; }
+    template<typename F>
+    ILINE static AABB CreateAABBfromOBB(const OBB_tpl<F>& obb)
+    {   return AABB(obb.c - obb.h, obb.c + obb.h);   }
+
+    /*!
+    * converts an OBB into an tight fitting AABB
+    *
+    * Example:
+    * AABB aabb = AABB::CreateAABBfromOBB(wposition,obb,1.0f);
+    *
+    * return values:
+    *  expanded AABB in world-space
+    */
+    template<typename F>
+    ILINE void SetAABBfromOBB(const Vec3& wpos, const OBB_tpl<F>& obb, f32 scaling = 1.0f)
+    {
+        Vec3 pos    = obb.m33 * obb.c * scaling + wpos;
+        Vec3 sz     =   obb.m33.GetFabs() * obb.h * scaling;
+        min = pos - sz;
+        max = pos + sz;
+    }
+    template<typename F>
+    ILINE static AABB CreateAABBfromOBB(const Vec3& wpos, const OBB_tpl<F>& obb, f32 scaling = 1.0f)
+    { AABB taabb; taabb.SetAABBfromOBB(wpos, obb, scaling); return taabb;     }
+
+    /* Converts a Cone into a tight fitting AABB */
+    ILINE static AABB CreateAABBfromCone(const Cone& c)
+    {
+        // Construct AABB for cone base
+        Vec3 baseX = Vec3(1.f - c.mDir.x * c.mDir.x, c.mDir.x * c.mDir.y, c.mDir.x * c.mDir.z).GetNormalized() * c.mBaseRadius;
+        Vec3 baseY = Vec3(c.mDir.y * c.mDir.x, 1.f - c.mDir.y * c.mDir.y, c.mDir.y * c.mDir.z).GetNormalized() * c.mBaseRadius;
+        Vec3 baseZ = Vec3(c.mDir.z * c.mDir.x, c.mDir.z * c.mDir.y, 1.f - c.mDir.z * c.mDir.z).GetNormalized() * c.mBaseRadius;
+
+        Vec3 aabbMax = Vec3(baseX.x, baseY.y, baseZ.z).abs();
+        Vec3 aabbMin = -aabbMax;
+
+        AABB result(aabbMin, aabbMax);
+        result.Move(c.mBase);
+
+        // add tip
+        result.Add(c.mTip);
+        return result;
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+ILINE bool IsEquivalent(const AABB& a, const AABB& b, float epsilon = VEC_EPSILON)
+{
+    return IsEquivalent(a.min, b.min, epsilon) && IsEquivalent(a.max, b.max, epsilon);
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct OBB
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename F>
+struct OBB_tpl
+{
+    Matrix33 m33; //orientation vectors
+    Vec3 h;             //half-length-vector
+    Vec3 c;             //center of obb
+
+    //default OBB constructor (without initialisation)
+    inline OBB_tpl() {}
+
+    ILINE void SetOBB(const Matrix33& matrix, const Vec3& hlv, const Vec3& center) {  m33 = matrix; h = hlv; c = center;   }
+    ILINE static OBB_tpl<F> CreateOBB(const Matrix33& m33, const Vec3& hlv, const Vec3& center) {    OBB_tpl<f32> obb; obb.m33 = m33; obb.h = hlv; obb.c = center; return obb; }
+
+    ILINE void SetOBBfromAABB(const Matrix33& mat33, const AABB& aabb)
+    {
+        m33 =   mat33;
+        h       =   (aabb.max - aabb.min) * 0.5f;   //calculate the half-length-vectors
+        c       =   (aabb.max + aabb.min) * 0.5f;   //the center is relative to the PIVOT
+    }
+    ILINE void SetOBBfromAABB(const Quat& q, const AABB& aabb)
+    {
+        m33 =   Matrix33(q);
+        h       =   (aabb.max - aabb.min) * 0.5f;   //calculate the half-length-vectors
+        c       =   (aabb.max + aabb.min) * 0.5f;   //the center is relative to the PIVOT
+    }
+    ILINE static OBB_tpl<F> CreateOBBfromAABB(const Matrix33& m33, const AABB& aabb) { OBB_tpl<f32> obb; obb.SetOBBfromAABB(m33, aabb); return obb;    }
+    ILINE static OBB_tpl<F> CreateOBBfromAABB(const Quat& q, const AABB& aabb) { OBB_tpl<f32> obb; obb.SetOBBfromAABB(q, aabb); return obb;    }
+
+    ~OBB_tpl(void) {};
+};
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Sphere
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+struct Sphere
+{
+    Vec3 center;
+    float radius;
+
+    Sphere() {}
+    Sphere(const Vec3& c, float r)
+        : center(c)
+        , radius(r) {}
+    void operator()(const Vec3& c, float r) { center = c; radius = r; }
+};
+
+struct HWVSphere
+{
+    hwvec3  center;
+    simdf       radius;
+
+    ILINE HWVSphere(const hwvec3& c, const simdf& r)
+    {
+        center = c;
+        radius = r;
+    }
+
+    ILINE HWVSphere(const ::Sphere& sp)
+    {
+        center = HWVLoadVecUnaligned(&sp.center);
+        radius = SIMDFLoadFloat(sp.radius);
+    }
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct AAEllipsoid
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+struct AAEllipsoid
+{
+    Vec3 center;
+    Vec3 radius_vec;
+
+    //default AAEllipsoid constructor (without initialisation)
+    inline AAEllipsoid(void) {}
+    inline AAEllipsoid(const Vec3& c, const Vec3& rv) {  radius_vec = rv; center = c; }
+    inline void operator () (const Vec3& c, const Vec3& rv) {  radius_vec = rv; center = c; }
+
+    ~AAEllipsoid(void) {};
+};
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Ellipsoid
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+struct Ellipsoid
+{
+    Matrix34 ExtensionPos;
+
+    //default Ellipsoid constructor (without initialisation)
+    inline Ellipsoid(void) {}
+    inline Ellipsoid(const Matrix34& ep) {  ExtensionPos = ep; }
+    inline void operator () (const Matrix34& ep) {  ExtensionPos = ep; }
+
+    ~Ellipsoid(void) {};
+};
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct TRect
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+template <class Num>
+struct TRect_tpl
+{
+    typedef Vec2_tpl<Num> Vec;
+
+    Vec Min, Max;
+
+    inline TRect_tpl() {}
+    inline TRect_tpl(Num x1, Num y1, Num x2, Num y2)
+        : Min(x1, y1)
+        , Max(x2, y2) {}
+    inline TRect_tpl(const TRect_tpl<Num>& rc)
+        : Min(rc.Min)
+        , Max(rc.Max) {}
+    inline TRect_tpl(const Vec& min, const Vec& max)
+        : Min(min)
+        , Max(max) {}
+
+    inline TRect_tpl<Num> operator * (Num k) const
+    {
+        return TRect_tpl<Num>(Min.x * k, Min.y * k, Max.x * k, Max.y * k);
+    }
+    inline TRect_tpl<Num> operator / (Num k) const
+    {
+        return TRect_tpl<Num>(Min.x / k, Min.y / k, Max.x / k, Max.y / k);
+    }
+
+    inline bool IsEmpty() const { return Max.x < Min.x && Max.y < Min.y; }
+    inline TRect_tpl<Num>& SetEmpty() { Max = Vec(-1, -1); Min = Vec(0, 0); return *this; }
+
+    inline Vec GetDim() const { return Max - Min; }
+    inline Num GetWidth() const { return Max.x - Min.x; }
+    inline Num GetHeight() const { return Max.y - Min.y; }
+
+    inline bool IsEqual(const TRect_tpl<Num>& rc) const { return Min.x == rc.Min.x && Min.y == rc.Min.y && Max.x == rc.Max.x && Max.y == rc.Max.y; }
+
+    inline bool InRect(const TRect_tpl<Num>& rc) const { return rc.Min.x >= Min.x && rc.Max.x <= Max.x && rc.Min.y >= Min.y && rc.Max.y <= Max.y; }
+    inline bool InRect(Vec pt) const { return pt.x >= Min.x && pt.x <= Max.x && pt.y >= Min.y && pt.y <= Max.y; }
+    inline Vec& IntoRect(Vec& pt) const
+    {
+        if (pt.x < Min.x)
+        {
+            pt.x = Min.x;
+        }
+        else if (pt.x > Max.x)
+        {
+            pt.x = Max.x;
+        }
+        if (pt.y < Min.y)
+        {
+            pt.y = Min.y;
+        }
+        else if (pt.y > Max.y)
+        {
+            pt.y = Max.y;
+        }
+        return pt;
+    }
+
+    inline bool Intersects(const TRect_tpl<Num>& rc) const
+    {
+        return !IsEmpty() && !rc.IsEmpty() &&
+               !(Min.x > rc.Max.x || Max.x < rc.Min.x ||
+                 Min.y > rc.Max.y || Max.y < rc.Min.y);
+    }
+
+    inline TRect_tpl<Num>& DoUnite(const TRect_tpl<Num>& rc)
+    {
+        if (IsEmpty())
+        {
+            Min = rc.Min;
+            Max = rc.Max;
+            return *this;
+        }
+        if (rc.IsEmpty())
+        {
+            return *this;
+        }
+        if (Min.x > rc.Min.x)
+        {
+            Min.x = rc.Min.x;
+        }
+        if (Min.y > rc.Min.y)
+        {
+            Min.y = rc.Min.y;
+        }
+        if (Max.x < rc.Max.x)
+        {
+            Max.x = rc.Max.x;
+        }
+        if (Max.y < rc.Max.y)
+        {
+            Max.y = rc.Max.y;
+        }
+        return *this;
+    }
+
+    inline TRect_tpl<Num>& DoIntersect(const TRect_tpl<Num>& rc)
+    {
+        if (IsEmpty())
+        {
+            return *this;
+        }
+        if (rc.IsEmpty())
+        {
+            return SetEmpty();
+        }
+        if (Min.x < rc.Min.x)
+        {
+            Min.x = rc.Min.x;
+        }
+        if (Min.y < rc.Min.y)
+        {
+            Min.y = rc.Min.y;
+        }
+        if (Max.x > rc.Max.x)
+        {
+            Max.x = rc.Max.x;
+        }
+        if (Max.y > rc.Max.y)
+        {
+            Max.y = rc.Max.y;
+        }
+
+        if (Min.x == Max.x || Min.y == Max.y)
+        {
+            return SetEmpty();
+        }
+
+        return *this;
+    }
+
+    inline TRect_tpl<Num> GetSubRect(const TRect_tpl<Num>& rc) const
+    {
+        if (IsEmpty())
+        {
+            return *this;
+        }
+        if (rc.IsEmpty())
+        {
+            return rc;
+        }
+        return TRect_tpl<Num>(Min.x + rc.Min.x * GetWidth(),
+            Min.y + rc.Min.y * GetHeight(),
+            Min.x + rc.Max.x * GetWidth(),
+            Min.y + rc.Max.y * GetHeight());
+    }
+
+    inline TRect_tpl<Num> GetSubRectInv(const TRect_tpl<Num>& rcSub) const
+    {
+        if (IsEmpty())
+        {
+            return *this;
+        }
+        if (rcSub.IsEmpty())
+        {
+            return rcSub;
+        }
+        return TRect_tpl((rcSub.Min.x - Min.x) / GetWidth(),
+            (rcSub.Min.y - Min.y) / GetHeight(),
+            (rcSub.Max.x - Min.x) / GetWidth(),
+            (rcSub.Max.y - Min.y) / GetHeight());
+    }
+};
+
+typedef TRect_tpl<float> Rectf;
+typedef TRect_tpl<int> Recti;
+
+typedef Triangle_tpl<f32>   Triangle;
+typedef Triangle_tpl<f64>   Triangle_f64;
+typedef OBB_tpl<f32>    OBB;
+
+//////////////////////////////////////////////////////////////////////////
+// Manage linear and rotational 3D velocity in a class
+class Velocity3
+{
+public:
+    Vec3        vLin, vRot;
+
+    Velocity3()
+    {}
+    Velocity3(type_zero)
+        : vLin(ZERO)
+        , vRot(ZERO) {}
+    Velocity3(Vec3 const& lin)
+        : vLin(lin)
+        , vRot(ZERO) {}
+    Velocity3(Vec3 const& lin, Vec3 const& rot)
+        : vLin(lin)
+        , vRot(rot) {}
+
+    void FromDelta(QuatT const& loc0, QuatT const& loc1, float fTime)
+    {
+        float fInvT = 1.f / fTime;
+        vLin = (loc1.t - loc0.t) * fInvT;
+        vRot = Quat::log(loc1.q * loc0.q.GetInverted()) * fInvT;
+    }
+
+    Vec3 VelocityAt(Vec3 const& vPosRel) const
+    { return vLin + (vRot % vPosRel); }
+
+    void operator += (Velocity3 const& vv)
+    {
+        vLin += vv.vLin;
+        vRot += vv.vRot;
+    }
+    void operator *= (float f)
+    {
+        vLin *= f;
+        vRot *= f;
+    }
+    void Interp(Velocity3 const& vv, float f)
+    {
+        vLin += (vv.vLin - vLin) * f;
+        vRot += (vv.vRot - vRot) * f;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+#include "Cry_GeoDistance.h"
+#include "Cry_GeoOverlap.h"
+#include "Cry_GeoIntersect.h"
+
+
+
+
+
+
+
+
+
+
+/////////////////////////////////////////////////////////////////////////
+//this is some special engine stuff, should be moved to a better location
+/////////////////////////////////////////////////////////////////////////
+
+// for bbox's checks and calculations
+#define MAX_BB  +99999.0f
+#define MIN_BB  -99999.0f
+
+//! checks if this has been set to minBB
+inline bool IsMinBB(const Vec3& v)
+{
+    if (v.x <= MIN_BB)
+    {
+        return (true);
+    }
+    if (v.y <= MIN_BB)
+    {
+        return (true);
+    }
+    if (v.z <= MIN_BB)
+    {
+        return (true);
+    }
+    return (false);
+}
+
+//! checks if this has been set to maxBB
+inline bool IsMaxBB(const Vec3& v)
+{
+    if (v.x >= MAX_BB)
+    {
+        return (true);
+    }
+    if (v.y >= MAX_BB)
+    {
+        return (true);
+    }
+    if (v.z >= MAX_BB)
+    {
+        return (true);
+    }
+    return (false);
+}
+
+inline Vec3 SetMaxBB(void) { return Vec3(MAX_BB, MAX_BB, MAX_BB); }
+inline Vec3 SetMinBB(void) { return Vec3(MIN_BB, MIN_BB, MIN_BB); }
+
+inline void AddToBounds (const Vec3& v, Vec3& mins, Vec3& maxs)
+{
+    if (v.x < mins.x)
+    {
+        mins.x = v.x;
+    }
+    if (v.x > maxs.x)
+    {
+        maxs.x = v.x;
+    }
+    if (v.y < mins.y)
+    {
+        mins.y = v.y;
+    }
+    if (v.y > maxs.y)
+    {
+        maxs.y = v.y;
+    }
+    if (v.z < mins.z)
+    {
+        mins.z = v.z;
+    }
+    if (v.z > maxs.z)
+    {
+        maxs.z = v.z;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////
+//! calc the area of a polygon giving a list of vertices and normal
+inline float CalcArea(const Vec3* vertices, int numvertices, const Vec3& normal)
+{
+    Vec3 csum(0, 0, 0);
+
+    int n = numvertices;
+    for (int i = 0, j = 1; i <= n - 2; i++, j++)
+    {
+        csum.x += vertices[i].y * vertices[j].z - vertices[i].z * vertices[j].y;
+        csum.y += vertices[i].z * vertices[j].x - vertices[i].x * vertices[j].z;
+        csum.z += vertices[i].x * vertices[j].y - vertices[i].y * vertices[j].x;
+    }
+
+    csum.x += vertices[n - 1].y * vertices[0].z - vertices[n - 1].z * vertices[0].y;
+    csum.y += vertices[n - 1].z * vertices[0].x - vertices[n - 1].x * vertices[0].z;
+    csum.z += vertices[n - 1].x * vertices[0].y - vertices[n - 1].y * vertices[0].x;
+
+    float area = 0.5f * (float)fabs(normal | csum);
+    return (area);
+}
+
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_GEO_H
diff --git a/Code/Legacy/CryCommon/Cry_GeoDistance.h b/Code/Legacy/CryCommon/Cry_GeoDistance.h
new file mode 100644
index 0000000000..af7f9f1efb
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_GeoDistance.h
@@ -0,0 +1,1693 @@
+/*
+ * 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 distance-computations
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_GEODISTANCE_H
+#define CRYINCLUDE_CRYCOMMON_CRY_GEODISTANCE_H
+#pragma once
+
+#include <Cry_Geo.h>
+#include <limits>
+#include <AzCore/Math/Vector3.h>
+
+#ifdef max
+#undef max
+#endif
+
+namespace Intersect
+{
+    bool Lineseg_Triangle(const Lineseg& lineseg, const Vec3& v0, const Vec3& v1, const Vec3& v2, Vec3& output, float* outT);
+}
+
+namespace Distance {
+    template<typename F>
+    ILINE F Point_Point(const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2)
+    {
+        return sqrt_tpl(square(p1.x - p2.x) + square(p1.y - p2.y) + square(p1.z - p2.z));
+    }
+
+    template<typename F>
+    ILINE F Point_PointSq(const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2)
+    {
+        return square(p1.x - p2.x) + square(p1.y - p2.y) + square(p1.z - p2.z);
+    }
+
+    template<typename F>
+    ILINE F Point_Point2DSq(const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2)
+    {
+        return square(p1.x - p2.x) + square(p1.y - p2.y);
+    }
+
+    template<typename F>
+    ILINE F Point_Point2D(const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2)
+    {
+        return sqrt_tpl(square(p1.x - p2.x) + square(p1.y - p2.y));
+    }
+
+    // Description:
+    //  Distance: Origin_Triangle2D.
+    //  Calculate the closest distance of a triangle in XY-plane to the coordinate origin.
+    //  it is assumed that the z-values of the triangle are all in the same plane.
+    // Return Value:
+    //  The 3d-position of the closest point on the triangle.
+    // Example:
+    //  Vec3 result = Distance::Origin_Triangle2D( triangle );
+    template<typename F>
+    ILINE Vec3_tpl<F> Origin_Triangle2D(const Triangle_tpl<F>& t)
+    {
+        Vec3_tpl<F> a = t.v0;
+        Vec3_tpl<F> b = t.v1;
+        Vec3_tpl<F> c = t.v2;
+        //check if (0,0,0) is inside or in fron of any triangle sides.
+        uint32 flag = ((a.x * (a.y - b.y) - a.y * (a.x - b.x)) < 0) | (((b.x * (b.y - c.y) - b.y * (b.x - c.x)) < 0) << 1) | (((c.x * (c.y - a.y) - c.y * (c.x - a.x)) < 0) << 2);
+        switch (flag)
+        {
+        case 0:
+            return Vec3_tpl<F>(0, 0, a.z);   //center is inside of triangle
+        case 1:
+            if ((a | (b - a)) > 0.0f)
+            {
+                flag = 5;
+            }
+            else if ((b | (a - b)) > 0.0f)
+            {
+                flag = 3;
+            }
+            break;
+        case 2:
+            if ((b | (c - b)) > 0.0f)
+            {
+                flag = 3;
+            }
+            else if ((c | (b - c)) > 0.0f)
+            {
+                flag = 6;
+            }
+            break;
+        case 3:
+            return b;     //vertex B is closed
+        case 4:
+            if ((c | (a - c)) > 0.0f)
+            {
+                flag = 6;
+            }
+            else if ((a | (c - a)) > 0.0f)
+            {
+                flag = 5;
+            }
+            break;
+        case 5:
+            return a;     //vertex A is closed
+        case 6:
+            return c;     //vertex C is closed
+        }
+        //check again using expanded area
+        switch (flag)
+        {
+        case 1:
+        {
+            Vec3_tpl<F> n = (b - a).GetNormalized();
+            return n * (-a | n) + a;
+        }
+        case 2:
+        {
+            Vec3_tpl<F> n = (c - b).GetNormalized();
+            return n * (-b | n) + b;
+        }
+        case 3:
+            return b;
+        case 4:
+        {
+            Vec3_tpl<F> n = (a - c).GetNormalized();
+            return n * (-c | n) + c;
+        }
+        case 5:
+            return a;
+        case 6:
+            return c;
+        }
+        return Vec3_tpl<F>(0, 0, 0);
+    }
+
+    ILINE hwvec3 Origin_Triangle2D(const hwvec3& a, const hwvec3& b, const hwvec3& c)
+    {
+        const hwvec3 vZero = HWV3Zero();
+        const hwvec3 aNeg = HWV3Negate(a);
+        const hwvec3 bNeg = HWV3Negate(b);
+        const hwvec3 cNeg = HWV3Negate(c);
+
+        const hwvec3 vASubB = HWVSub(a, b);
+        const hwvec3 vBSubA = HWVSub(b, a);
+        const hwvec3 vASubC = HWVSub(a, c);
+        const hwvec3 vCSubA = HWVSub(c, a);
+        const hwvec3 vBSubC = HWVSub(b, c);
+        const hwvec3 vCSubB = HWVSub(c, b);
+
+        HWV4PermuteControl(vSwapXY, HWV_PERMUTE_0Y, HWV_PERMUTE_0X, HWV_PERMUTE_0Z, HWV_PERMUTE_0W);
+
+        const hwvec3 aPerm = HWV3PermuteWord(a, a, vSwapXY);
+        const hwvec3 vACombined = HWVMultiply(aPerm, vASubB);
+
+        //Yes, this is the right way around, check the non-vectorized version below :)
+        const simdf vAY = HWV3SplatXToSIMDF(vACombined);
+        const simdf vAX = HWV3SplatYToSIMDF(vACombined);
+
+
+        const hwvec3 bPerm = HWV3PermuteWord(b, b, vSwapXY);
+        const hwvec3 vBCombined = HWVMultiply(bPerm, vBSubC);
+
+        const simdf vBY = HWV3SplatXToSIMDF(vBCombined);
+        const simdf vBX = HWV3SplatYToSIMDF(vBCombined);
+
+
+        const hwvec3 cPerm = HWV3PermuteWord(c, c, vSwapXY);
+        const hwvec3 vCCombined = HWVMultiply(cPerm, vCSubA);
+
+        const simdf vCY = HWV3SplatXToSIMDF(vCCombined);
+        const simdf vCX = HWV3SplatYToSIMDF(vCCombined);
+
+
+        //check if (0,0,0) is inside or in front of any triangle sides.
+        bool subflag0 = SIMDFLessThanB(vAX, vAY);
+        bool subflag1 = SIMDFLessThanB(vBX, vBY);
+        bool subflag2 = SIMDFLessThanB(vCX, vCY);
+
+        uint32 flag = ((uint32)subflag0) | ((uint32)(subflag1 << 1)) | ((uint32)(subflag2 << 2));
+
+        switch (flag)
+        {
+        case 0:
+        {
+            HWV4PermuteControl(selectz, HWV_PERMUTE_1X, HWV_PERMUTE_1Y, HWV_PERMUTE_0Z, HWV_PERMUTE_1W);
+            return HWV3PermuteWord(a, vZero, selectz);     //center is inside of triangle
+        }
+        case 1:
+        {
+            if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(a, vBSubA)))
+            {
+                flag = 5;
+            }
+            else if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(b, vASubB)))
+            {
+                flag = 3;
+            }
+            break;
+        }
+        case 2:
+        {
+            if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(b, vCSubB)))
+            {
+                flag = 3;
+            }
+            else if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(c, vBSubC)))
+            {
+                flag = 6;
+            }
+            break;
+        }
+        case 3:
+            return b;     //vertex B is closed
+        case 4:
+        {
+            if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(c, vASubC)))
+            {
+                flag = 6;
+            }
+            else if (SIMDFLessThanB(HWV3AsSIMDF(vZero), HWV3Dot(a, vCSubA)))
+            {
+                flag = 5;
+            }
+            break;
+        }
+        case 5:
+            return a;     //vertex A is closed
+        case 6:
+            return c;     //vertex C is closed
+        }
+
+        switch (flag)
+        {
+        case 1:
+        {
+            //hwvec3 n = HWV3Normalize(vBSubA);
+            simdf nLengthSq = HWV3Dot(vBSubA, vBSubA);
+            simdf invLengthSq = SIMDFReciprocal(nLengthSq);
+            return HWVMultiplySIMDFAdd(vBSubA, SIMDFMult(HWV3Dot(aNeg, vBSubA), invLengthSq), a);
+        }
+        case 2:
+        {
+            simdf nLengthSq = HWV3Dot(vCSubB, vCSubB);
+            simdf invLengthSq = SIMDFReciprocal(nLengthSq);
+            return HWVMultiplySIMDFAdd(vCSubB, SIMDFMult(HWV3Dot(bNeg, vCSubB), invLengthSq), b);
+        }
+        case 3:
+            return b;
+        case 4:
+        {
+            simdf nLengthSq = HWV3Dot(vASubC, vASubC);
+            simdf invLengthSq = SIMDFReciprocal(nLengthSq);
+            return HWVMultiplySIMDFAdd(vASubC, SIMDFMult(HWV3Dot(cNeg, vASubC), invLengthSq), c);
+        }
+        case 5:
+            return a;
+        case 6:
+            return c;
+        }
+
+        //      switch (flag) {
+        //          case 1: { Vec3_tpl<F> n=(b-a).GetNormalized(); return n*(-a|n)+a; }
+        //          case 2: {   Vec3_tpl<F> n=(c-b).GetNormalized(); return n*(-b|n)+b; }
+        //          case 3: return b;
+        //          case 4: { Vec3_tpl<F> n=(a-c).GetNormalized(); return n*(-c|n)+c; }
+        //          case 5: return a;
+        //          case 6: return c;
+        //      }
+
+        return vZero;
+    }
+
+
+    // Description:
+    //  Distance: Point_Triangle.
+    //  Calculate the closest distance of a point to a triangle in 3d-space.
+    // Return value:
+    //  The squared distance.
+    // Example:
+    //  float result = Distance::Point_Triangle( pos, triangle );
+    template<typename F>
+    ILINE F Point_TriangleSq(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t)
+    {
+        //translate triangle into origin
+        Vec3_tpl<F> a = t.v0 - p;
+        Vec3_tpl<F> b = t.v1 - p;
+        Vec3_tpl<F> c = t.v2 - p;
+        //transform triangle into XY-plane to simplify the test
+        Matrix33_tpl<F> r33 = Matrix33_tpl<F>::CreateRotationV0V1(((b - a) % (a - c)).GetNormalized(), Vec3(0, 0, 1));
+        Vec3_tpl<F> h = Origin_Triangle2D(Triangle_tpl<F>(r33 * a, r33 * b, r33 * c));
+        return (h | h); //return squared distance
+    }
+
+    inline simdf Point_TriangleByPointsSq(const hwvec3& p, const hwvec3& t0, const hwvec3& t1, const hwvec3& t2)
+    {
+        //translate triangle into origin
+
+        HWV3Constant(kUp, 0.0f, 0.0f, 1.0f);
+
+        const hwvec3 a = HWVSub(t0, p);
+        const hwvec3 b = HWVSub(t1, p);
+        const hwvec3 c = HWVSub(t2, p);
+
+        const hwvec3 baDiff = HWVSub(b, a);
+        const hwvec3 acDiff = HWVSub(a, c);
+
+        const hwvec3 cross = HWVCross(baDiff, acDiff);
+
+        const hwvec3 crossNormalized = HWV3Normalize(cross);
+
+        hwmtx33 r33 = HWMtx33CreateRotationV0V1(crossNormalized, kUp);
+
+        hwmtx33 r33opt = HWMtx33GetOptimized(r33);
+
+        //transform triangle into XY-plane to simplify the test
+        const hwvec3 aRot = HWMtx33RotateVecOpt(r33opt, a);
+        const hwvec3 bRot = HWMtx33RotateVecOpt(r33opt, b);
+        const hwvec3 cRot = HWMtx33RotateVecOpt(r33opt, c);
+
+        hwvec3 h = Origin_Triangle2D(aRot, bRot, cRot);
+
+        return HWV3Dot(h, h);
+    }
+
+    template<typename F>
+    ILINE F Point_Triangle(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t)
+    {
+        return sqrt_tpl(Point_TriangleSq(p, t));
+    }
+
+    // Description:
+    //      Distance: Point_Triangle.
+    //      Calculate the closest distance of a point to a triangle in 3d-space.
+    //      The function returns the squared distance and the 3d-position of the
+    //      closest point on the triangle.
+    // Example:
+    //      float result = Distance::Point_Triangle( pos, triangle, output );
+    template<typename F>
+    ILINE F Point_TriangleSq(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t, Vec3_tpl<F>& output)
+    {
+        //translate triangle into origin
+        Vec3_tpl<F> a = t.v0 - p;
+        Vec3_tpl<F> b = t.v1 - p;
+        Vec3_tpl<F> c = t.v2 - p;
+        //transform triangle into XY-plane to simplify the test
+        Matrix33_tpl<F> r33 = Matrix33_tpl<F>::CreateRotationV0V1(((b - a) % (a - c)).GetNormalized(), Vec3_tpl<F>(0, 0, 1));
+        Vec3_tpl<F> h = Origin_Triangle2D(Triangle_tpl<F>(r33 * a, r33 * b, r33 * c));
+        output = h * r33 + p;
+        return (h | h); //return squared distance
+    }
+
+    template<typename F>
+    ILINE F Point_Triangle(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t, Vec3_tpl<F>& output)
+    {
+        return sqrt_tpl(Point_TriangleSq(p, t, output));
+    }
+
+    // Description:
+    //  Squared distance from point to triangle, optionally returning the triangle position in
+    //  parameteric form.
+    template<typename F>
+    ILINE F Point_TriangleSq(const Vec3_tpl<F>& point, const Triangle_tpl<F>& triangle, F* pT0, F* pT1)
+    {
+        Vec3 diff = triangle.v0 - point;
+        const Vec3 edge0 = triangle.v1 - triangle.v0;
+        const Vec3 edge1 = triangle.v2 - triangle.v0;
+        F fA00 = edge0.GetLengthSquared();
+        F fA01 = edge0.Dot(edge1);
+        F fA11 = edge1.GetLengthSquared();
+        F fB0 = diff.Dot(edge0);
+        F fB1 = diff.Dot(edge1);
+        F fC = diff.GetLengthSquared();
+        F fDet = abs(fA00 * fA11 - fA01 * fA01);
+        F fS = fA01 * fB1 - fA11 * fB0;
+        F fT = fA01 * fB0 - fA00 * fB1;
+        F fSqrDist;
+
+        if (fS + fT <= fDet)
+        {
+            if (fS < (F)0.0)
+            {
+                if (fT < (F)0.0) // region 4
+                {
+                    if (fB0 < (F)0.0)
+                    {
+                        fT = (F)0.0;
+                        if (-fB0 >= fA00)
+                        {
+                            fS = (F)1.0;
+                            fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                        }
+                        else
+                        {
+                            fS = -fB0 / fA00;
+                            fSqrDist = fB0 * fS + fC;
+                        }
+                    }
+                    else
+                    {
+                        fS = (F)0.0;
+                        if (fB1 >= (F)0.0)
+                        {
+                            fT = (F)0.0;
+                            fSqrDist = fC;
+                        }
+                        else if (-fB1 >= fA11)
+                        {
+                            fT = (F)1.0;
+                            fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                        }
+                        else
+                        {
+                            fT = -fB1 / fA11;
+                            fSqrDist = fB1 * fT + fC;
+                        }
+                    }
+                }
+                else // region 3
+                {
+                    fS = (F)0.0;
+                    if (fB1 >= (F)0.0)
+                    {
+                        fT = (F)0.0;
+                        fSqrDist = fC;
+                    }
+                    else if (-fB1 >= fA11)
+                    {
+                        fT = (F)1.0;
+                        fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                    }
+                    else
+                    {
+                        fT = -fB1 / fA11;
+                        fSqrDist = fB1 * fT + fC;
+                    }
+                }
+            }
+            else if (fT < (F)0.0) // region 5
+            {
+                fT = (F)0.0;
+                if (fB0 >= (F)0.0)
+                {
+                    fS = (F)0.0;
+                    fSqrDist = fC;
+                }
+                else if (-fB0 >= fA00)
+                {
+                    fS = (F)1.0;
+                    fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                }
+                else
+                {
+                    fS = -fB0 / fA00;
+                    fSqrDist = fB0 * fS + fC;
+                }
+            }
+            else // region 0
+            {
+                // minimum at interior point
+                F fInvDet = ((F)1.0) / fDet;
+                fS *= fInvDet;
+                fT *= fInvDet;
+                fSqrDist = fS * (fA00 * fS + fA01 * fT + ((F)2.0) * fB0) +
+                    fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
+            }
+        }
+        else
+        {
+            F fTmp0, fTmp1, fNumer, fDenom;
+
+            if (fS < (F)0.0) // region 2
+            {
+                fTmp0 = fA01 + fB0;
+                fTmp1 = fA11 + fB1;
+                if (fTmp1 > fTmp0)
+                {
+                    fNumer = fTmp1 - fTmp0;
+                    fDenom = fA00 - 2.0f * fA01 + fA11;
+                    if (fNumer >= fDenom)
+                    {
+                        fS = (F)1.0;
+                        fT = (F)0.0;
+                        fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                    }
+                    else
+                    {
+                        fS = fNumer / fDenom;
+                        fT = (F)1.0 - fS;
+                        fSqrDist = fS * (fA00 * fS + fA01 * fT + 2.0f * fB0) +
+                            fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
+                    }
+                }
+                else
+                {
+                    fS = (F)0.0;
+                    if (fTmp1 <= (F)0.0)
+                    {
+                        fT = (F)1.0;
+                        fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                    }
+                    else if (fB1 >= (F)0.0)
+                    {
+                        fT = (F)0.0;
+                        fSqrDist = fC;
+                    }
+                    else
+                    {
+                        fT = -fB1 / fA11;
+                        fSqrDist = fB1 * fT + fC;
+                    }
+                }
+            }
+            else if (fT < (F)0.0) // region 6
+            {
+                fTmp0 = fA01 + fB1;
+                fTmp1 = fA00 + fB0;
+                if (fTmp1 > fTmp0)
+                {
+                    fNumer = fTmp1 - fTmp0;
+                    fDenom = fA00 - ((F)2.0) * fA01 + fA11;
+                    if (fNumer >= fDenom)
+                    {
+                        fT = (F)1.0;
+                        fS = (F)0.0;
+                        fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                    }
+                    else
+                    {
+                        fT = fNumer / fDenom;
+                        fS = (F)1.0 - fT;
+                        fSqrDist = fS * (fA00 * fS + fA01 * fT + ((F)2.0) * fB0) +
+                            fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
+                    }
+                }
+                else
+                {
+                    fT = (F)0.0;
+                    if (fTmp1 <= (F)0.0)
+                    {
+                        fS = (F)1.0;
+                        fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                    }
+                    else if (fB0 >= (F)0.0)
+                    {
+                        fS = (F)0.0;
+                        fSqrDist = fC;
+                    }
+                    else
+                    {
+                        fS = -fB0 / fA00;
+                        fSqrDist = fB0 * fS + fC;
+                    }
+                }
+            }
+            else // region 1
+            {
+                fNumer = fA11 + fB1 - fA01 - fB0;
+                if (fNumer <= (F)0.0)
+                {
+                    fS = (F)0.0;
+                    fT = (F)1.0;
+                    fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                }
+                else
+                {
+                    fDenom = fA00 - 2.0f * fA01 + fA11;
+                    if (fNumer >= fDenom)
+                    {
+                        fS = (F)1.0;
+                        fT = (F)0.0;
+                        fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                    }
+                    else
+                    {
+                        fS = fNumer / fDenom;
+                        fT = (F)1.0 - fS;
+                        fSqrDist = fS * (fA00 * fS + fA01 * fT + ((F)2.0) * fB0) +
+                            fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
+                    }
+                }
+            }
+        }
+
+        if (pT0)
+        {
+            *pT0 = fS;
+        }
+
+        if (pT1)
+        {
+            *pT1 = fT;
+        }
+
+        return abs(fSqrDist);
+    }
+
+    // Description:
+    //  Distance from point to triangle, optionally returning the triangle position in
+    //  parameteric form.
+    template<typename F>
+    ILINE F Point_Triangle(const Vec3_tpl<F>& point, const Triangle_tpl<F>& triangle, F* pT0, F* pT1)
+    {
+        return sqrt_tpl(Point_TriangleSq(point, triangle, pT0, pT1));
+    }
+
+    //----------------------------------------------------------------------------------
+    /// Returns squared distance from a point to a line segment and also the "t value" (from 0 to 1) of the
+    /// closest point on the line segment
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE F Point_LinesegSq(const Vec3_tpl<F>& p, const Lineseg& lineseg, F& fT)
+    {
+        Vec3_tpl<F> diff = p - lineseg.start;
+        Vec3_tpl<F> dir = lineseg.end - lineseg.start;
+        fT = diff.Dot(dir);
+
+        if (fT <= 0.0f)
+        {
+            fT = 0.0f;
+        }
+        else
+        {
+            F fSqrLen = dir.GetLengthSquared();
+            if (fT >= fSqrLen)
+            {
+                fT = 1.0f;
+                diff -= dir;
+            }
+            else
+            {
+                fT /= fSqrLen;
+                diff -= fT * dir;
+            }
+        }
+
+        return diff.GetLengthSquared();
+    }
+
+    /// Returns distance from a point to a line segment and also the "t value" (from 0 to 1) of the
+    /// closest point on the line segment
+    template<typename F>
+    ILINE F Point_Lineseg(const Vec3_tpl<F>& p, const Lineseg& lineseg, F& fT)
+    {
+        return sqrt_tpl(Point_LinesegSq(p, lineseg, fT));
+    }
+
+
+    //----------------------------------------------------------------------------------
+    /// Returns squared distance from a point to a line segment, ignoring the z coordinates
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE F Point_Lineseg2DSq(const Vec3_tpl<F>& p, const Lineseg& lineseg)
+    {
+        F dspx = p.x - lineseg.start.x, dspy = p.y - lineseg.start.y;
+        F dsex = lineseg.end.x - lineseg.start.x, dsey = lineseg.end.y - lineseg.start.y;
+
+        F denom = (dsex * dsex + dsey * dsey);
+        F t;
+        if (denom > 1e-7)
+        {
+            t = (F)(dspx * dsex + dspy * dsey) / denom;
+            t = clamp_tpl(t, 0.0f, 1.0f);
+        }
+        else
+        {
+            t = 0;
+        }
+
+        F dx = dsex * t - dspx;
+        F dy = dsey * t - dspy;
+
+        return dx * dx + dy * dy;
+    }
+
+    //----------------------------------------------------------------------------------
+    /// Returns squared distance from a point to a line segment and also the "t value" (from 0 to 1) of the
+    /// closest point on the line segment, ignoring the z coordinates
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE F Point_Lineseg2DSq(Vec3_tpl<F> p, Lineseg lineseg, F& fT)
+    {
+        p.z = 0.0f;
+        lineseg.start.z = 0.0f;
+        lineseg.end.z = 0.0f;
+        return Point_LinesegSq(p, lineseg, fT);
+    }
+
+    /// Returns distance from a point to a line segment, ignoring the z coordinates
+    template<typename F>
+    ILINE F Point_Lineseg2D(const Vec3_tpl<F>& p, const Lineseg& lineseg, F& fT)
+    {
+        return sqrt_tpl(Point_Lineseg2DSq(p, lineseg, fT));
+    }
+
+    /// Returns the squared distance from a point to a line as defined by two points (for accuracy
+    /// in some situations), and also the closest position on the line
+    template<typename F>
+    ILINE F Point_LineSq(const Vec3_tpl<F>& vPoint,
+        const Vec3_tpl<F>& vLineStart, const Vec3_tpl<F>& vLineEnd, Vec3_tpl<F>& linePt)
+    {
+        Vec3_tpl<F> dir;
+        Vec3_tpl<F> pointVector;
+
+        if ((vPoint - vLineStart).GetLengthSquared() > (vPoint - vLineEnd).GetLengthSquared())
+        {
+            dir = vLineStart - vLineEnd;
+            pointVector = vPoint - vLineEnd;
+            linePt = vLineEnd;
+        }
+        else
+        {
+            dir = vLineEnd - vLineStart;
+            pointVector = vPoint - vLineStart;
+            linePt = vLineStart;
+        }
+
+        F dirLen2 = dir.GetLengthSquared();
+        if (dirLen2 <= 0.0f)
+        {
+            return pointVector.GetLengthSquared();
+        }
+        dir /= sqrt_tpl(dirLen2);
+
+        F t0 = pointVector.Dot(dir);
+        linePt += t0 * dir;
+        return (vPoint - linePt).GetLengthSquared();
+    }
+
+    /// Returns the distance from a point to a line as defined by two points (for accuracy
+    /// in some situations)
+    template<typename F>
+    ILINE F Point_Line(const Vec3_tpl<F>& vPoint,
+        const Vec3_tpl<F>& vLineStart, const Vec3_tpl<F>& vLineEnd, Vec3_tpl<F>& linePt)
+    {
+        return sqrt_tpl(Point_LineSq(vPoint, vLineStart, vLineEnd, linePt));
+    }
+
+    /// In 2D. The returned linePt will have 0 z value
+    template<typename F>
+    ILINE F Point_Line2DSq(Vec3_tpl<F> vPoint,
+        Vec3_tpl<F> vLineStart, Vec3_tpl<F> vLineEnd, Vec3_tpl<F>& linePt)
+    {
+        vPoint.z = 0.0f;
+        vLineStart.z = 0.0f;
+        vLineEnd.z = 0.0f;
+        return Point_LineSq(vPoint, vLineStart, vLineEnd, linePt);
+    }
+
+    /// In 2D. The returned linePt will have 0 z value
+    template<typename F>
+    ILINE F Point_Line2D(const Vec3_tpl<F>& vPoint,
+        const Vec3_tpl<F>& vLineStart, const Vec3_tpl<F>& vLineEnd, Vec3_tpl<F>& linePt)
+    {
+        return sqrt_tpl(Point_Line2DSq(vPoint, vLineStart, vLineEnd, linePt));
+    }
+
+
+    /// Returns squared distance from a point to a polygon _edge_, together with the closest point on
+    /// the edge of the polygon. Can use the same point in/out
+    template<typename F, typename VecContainer>
+    inline F Point_Polygon2DSq(const Vec3_tpl<F> p, const VecContainer& polygon, Vec3_tpl<F>& polyPos, Vec3_tpl<F>* pNormal = NULL)
+    {
+        typename VecContainer::const_iterator li = polygon.begin();
+        typename VecContainer::const_iterator liend = polygon.end();
+        polyPos.x = polyPos.y = polyPos.z = 0.f;
+        float bestDist = std::numeric_limits<F>::max();
+        for (; li != liend; ++li)
+        {
+            typename VecContainer::const_iterator linext = li;
+            ++linext;
+            if (linext == liend)
+            {
+                linext = polygon.begin();
+            }
+            const Vec3_tpl<F>& l0 = *li;
+            const Vec3_tpl<F>& l1 = *linext;
+
+            float f;
+            float thisDist = Distance::Point_Lineseg2DSq<F>(p, Lineseg(l0, l1), f);
+            if (thisDist < bestDist)
+            {
+                bestDist = thisDist;
+                polyPos = l0 + f * (l1 - l0);
+                if (pNormal)
+                {
+                    Vec3_tpl<F> vPolyseg = l1  - l0;
+                    Vec3_tpl<F> vIntSeg = (polyPos - p);
+                    pNormal->x = vPolyseg.y;
+                    pNormal->y = -vPolyseg.x;
+                    pNormal->z = 0;
+                    pNormal->NormalizeSafe();
+                    // returns the normal towards the start point of the intersecting segment
+                    if ((vIntSeg.Dot(*pNormal)) > 0)
+                    {
+                        pNormal->x = -pNormal->x;
+                        pNormal->y = -pNormal->y;
+                    }
+                }
+            }
+        }
+        return bestDist;
+    }
+
+    //----------------------------------------------------------------------------------
+    /// Calculate squared distance between two line segments
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE F Lineseg_Lineseg2DSq(const Lineseg& seg0, const Lineseg& seg1)
+    {
+        const F Epsilon = (F)0.0000001;
+
+        Vec3_tpl<F> delta = seg1.start - seg0.start;
+
+        Vec3_tpl<F> dir0 = seg0.end - seg0.start;
+        Vec3_tpl<F> dir1 = seg1.end - seg1.start;
+
+        F det = dir0.x * dir1.y - dir0.y * dir1.x;
+        F det0 = delta.x * dir1.y - delta.y * dir1.x;
+        F det1 = delta.x * dir0.y - delta.y * dir0.x;
+
+        F absDet = fabs_tpl(det);
+
+        if (absDet >= Epsilon)
+        {
+            F invDet = (F)1.0 / det;
+
+            F a = det0 * invDet;
+            F b = det1 * invDet;
+
+            if ((a <= (F)1.0) && (a >= (F)0.0) && (b <= (F)1.0) && (b >= (F)0.0))
+            {
+                return (F)0.0;
+            }
+        }
+
+        return min(Distance::Point_Lineseg2DSq(seg0.start, seg1), min(Distance::Point_Lineseg2DSq(seg0.end, seg1),
+                min(Distance::Point_Lineseg2DSq(seg1.start, seg0), Distance::Point_Lineseg2DSq(seg1.end, seg0))));
+    }
+
+    /// Returns squared distance from a lineseg to a polygon, together with the closest point on
+    /// the edge of the polygon. Can use the same point in/out
+    template<typename VecContainer>
+    inline float Lineseg_Polygon2DSq(const Lineseg& line, const VecContainer& polygon)
+    {
+        typename VecContainer::const_iterator li = polygon.begin();
+        typename VecContainer::const_iterator liend = polygon.end();
+
+        float bestDistSq = std::numeric_limits<float>::max();
+        for (; li != liend; ++li)
+        {
+            typename VecContainer::const_iterator linext = li;
+            ++linext;
+            if (linext == liend)
+            {
+                linext = polygon.begin();
+            }
+
+            float thisDistSq = Distance::Lineseg_Lineseg2DSq<float>(line, Lineseg(*li, *linext));
+            if (thisDistSq < bestDistSq)
+            {
+                bestDistSq = thisDistSq;
+            }
+        }
+
+        return bestDistSq;
+    }
+
+    /// Returns distance from a point to a polygon _edge_, together with the closest point on
+    /// the edge of the polygon
+    template<typename F, typename VecContainer>
+    inline F Point_Polygon2D(const Vec3_tpl<F> p, const VecContainer& polygon, Vec3_tpl<F>& polyPos, Vec3_tpl<F>* pNormal = NULL)
+    {
+        return sqrt_tpl(Point_Polygon2DSq(p, polygon, polyPos, pNormal));
+    }
+
+
+    //! \brief Get the distance squared from a point to an OBB.
+    //! \param point Vec3 indicating the point to test
+    //! \param obb OBB indicating the Obb to test
+    //! \return float Closest distance squared from the point to the obb.
+    template <typename F>
+    AZ_INLINE F Point_OBBSq(const Vec3_tpl<F>& point, const OBB& obb)
+    {
+        F distanceSquared = 0;
+        const Vec3 v = point - obb.c; // box center to point
+        for (int i = 0; i < 3; ++i)
+        {
+            F d = v.Dot(obb.m33.GetColumn(i));
+            F ex = 0;
+            F halfLength = obb.h[i];
+            if (d < -halfLength)
+            {
+                ex = d + halfLength;
+            }
+            else if (d > halfLength)
+            {
+                ex = d - halfLength;
+            }
+            distanceSquared += sqr(ex);
+        }
+
+        return distanceSquared;
+    }
+
+    //! \brief Get the distance squared from a Point to a Cylinder.
+    //! \param point AZ::Vector3 The point to test distance against the cylinder
+    //! \param cylinderAxisEndA AZ::Vector3 One end of the cylinder axis (centered in the circle)
+    //! \param cylinderAxisEndB AZ::Vector3 Other end of the cylinder axis (centered in the circle)
+    //! \param radius float Radius of the cylinder
+    //! \return float Closest distance squared from the point to the cylinder.
+    AZ_INLINE float Point_CylinderSq(
+        const AZ::Vector3& point,
+        const AZ::Vector3& cylinderAxisEndA,
+        const AZ::Vector3& cylinderAxisEndB,
+        float radius
+        )
+    {
+        // Use the cylinder axis' center point to determine distance by
+        // splitting into Voronoi regions and using symmetry.
+        // The regions are:
+        // - Inside
+        // - Beyond cylinder radius but between two disc ends.
+        // - Within cylinder radius but beyond two disc ends.
+        // - Beyond cylinder radius and beyond two disc ends.
+
+        const AZ::Vector3 cylinderAxis = cylinderAxisEndB - cylinderAxisEndA;
+        float halfLength = cylinderAxis.GetLength() * 0.5f;
+        const AZ::Vector3 cylinderAxisUnit = cylinderAxis.GetNormalized();
+
+        // get the center of the axis and the vector from center to the test point
+        const AZ::Vector3 centerPoint = (cylinderAxis * 0.5) + cylinderAxisEndA;
+        const AZ::Vector3 pointToCenter = point - centerPoint;
+
+        // distance point is from center (projected onto axis)
+        // the abs here takes advantage of symmetry.
+        float x = fabsf(pointToCenter.Dot(cylinderAxisUnit));
+
+        // squared distance from point to center (hypotenuse)
+        float n2 = pointToCenter.GetLengthSq();
+
+        // squared distance from point to center perpendicular to axis (pythagorean)
+        float y2 = n2 - sqr(x);
+
+        float distanceSquared = 0.f;
+
+        if (x < halfLength) // point is between the two ends
+        {
+            if (y2 > sqr(radius))   // point is outside of radius
+            {
+                distanceSquared = sqr(sqrtf(y2) - radius);
+            }
+            // else point is inside cylinder, distance is zero.
+        }
+        else if (y2 < sqr(radius))
+        {
+            // point is within radius
+            // point projects into a disc at either end, grab the "parallel" distance only
+            distanceSquared = sqr(x - halfLength);
+        }
+        else
+        {
+            // point is outside of radius
+            // point projects onto the edge of the disc, grab distance in two directions,
+            // combine "parallel" and "perpendicular" distances.
+            distanceSquared = sqr(sqrtf(y2) - radius) + sqr(x - halfLength);
+        }
+
+        return distanceSquared;
+    }
+
+    //----------------------------------------------------------------------------------
+    // Distance: Point_AABB
+    //----------------------------------------------------------------------------------
+    // Calculate the closest distance of a point to a AABB in 3d-space.
+    // The function returns the squared distance.
+    // optionally the closest point on the hull is calculated
+    //
+    // Example:
+    //  float result = Distance::Point_AABBSq( pos, aabb );
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE F Point_AABBSq(const Vec3_tpl<F>& vPoint, const AABB& aabb)
+    {
+        F fDist2 = 0;
+
+        F min0Diff = (F)aabb.min[0] - (F)vPoint[0];
+        fDist2 = (F)fsel(min0Diff, fDist2 + sqr(min0Diff), fDist2);
+        F max0Diff = (F)vPoint[0] - (F)aabb.max[0];
+        fDist2 = (F)fsel(max0Diff, fDist2 + sqr(max0Diff), fDist2);
+
+        F min1Diff = (F)aabb.min[1] - (F)vPoint[1];
+        fDist2 = (F)fsel(min1Diff, fDist2 + sqr(min1Diff), fDist2);
+        F max1Diff = (F)vPoint[1] - (F)aabb.max[1];
+        fDist2 = (F)fsel(max1Diff, fDist2 + sqr(max1Diff), fDist2);
+
+        F min2Diff = (F)aabb.min[2] - (F)vPoint[2];
+        fDist2 = (F)fsel(min2Diff, fDist2 + sqr(min2Diff), fDist2);
+        F max2Diff = (F)vPoint[2] - (F)aabb.max[2];
+        fDist2 = (F)fsel(max2Diff, fDist2 + sqr(max2Diff), fDist2);
+
+        return fDist2;
+    }
+
+    template<typename F>
+    ILINE F Point_AABBSq(const Vec3_tpl<F>& vPoint, const AABB& aabb, Vec3_tpl<F>& vClosest)
+    {
+        F fDist2 = Point_AABBSq(vPoint, aabb);
+
+        vClosest = vPoint;
+        if (!iszero(fDist2))
+        {
+            // vPoint is outside the AABB
+            vClosest.x = max(vClosest.x, aabb.min.x);
+            vClosest.x = min(vClosest.x, aabb.max.x);
+            vClosest.y = max(vClosest.y, aabb.min.y);
+            vClosest.y = min(vClosest.y, aabb.max.y);
+            vClosest.z = max(vClosest.z, aabb.min.z);
+            vClosest.z = min(vClosest.z, aabb.max.z);
+        }
+        else
+        {
+            // vPoint is inside the AABB
+            uint16 nSubBox = 0;
+            F fHalf = 2;
+
+            F fMiddleX = ((aabb.max.x - aabb.min.x) / fHalf) + aabb.min.x;
+            F fMiddleY = ((aabb.max.y - aabb.min.y) / fHalf) + aabb.min.y;
+            F fMiddleZ = ((aabb.max.z - aabb.min.z) / fHalf) + aabb.min.z;
+
+            if (vPoint.x < fMiddleX)
+            {
+                nSubBox |= 0x001; // Is Left
+            }
+            if (vPoint.y < fMiddleY)
+            {
+                nSubBox |= 0x010; // Is Rear
+            }
+            if (vPoint.z < fMiddleZ)
+            {
+                nSubBox |= 0x100; // Is Low
+            }
+            F fDistanceToX = 0;
+            F fDistanceToY = 0;
+            F fDistanceToZ = 0;
+
+            F fNewX, fNewY, fNewZ;
+
+            switch (nSubBox & 0xFFF)
+            {
+            case 0x000:
+                // Is Right/Front/Top
+                fDistanceToX = aabb.max.x - vPoint.x;
+                fDistanceToY = aabb.max.y - vPoint.y;
+                fDistanceToZ = aabb.max.z - vPoint.z;
+
+                fNewX = aabb.max.x;
+                fNewY = aabb.max.y;
+                fNewZ = aabb.max.z;
+
+                break;
+            case 0x001:
+                // Is Left/Front/Top
+                fDistanceToX = vPoint.x - aabb.min.x;
+                fDistanceToY = aabb.max.y - vPoint.y;
+                fDistanceToZ = aabb.max.z - vPoint.z;
+
+                fNewX = aabb.min.x;
+                fNewY = aabb.max.y;
+                fNewZ = aabb.max.z;
+
+                break;
+            case 0x010:
+                // Is Right/Rear/Top
+                fDistanceToX = aabb.max.x - vPoint.x;
+                fDistanceToY = vPoint.y - aabb.min.y;
+                fDistanceToZ = aabb.max.z - vPoint.z;
+
+                fNewX = aabb.max.x;
+                fNewY = aabb.min.y;
+                fNewZ = aabb.max.z;
+
+                break;
+            case 0x011:
+                // Is Left/Rear/Top
+                fDistanceToX = vPoint.x - aabb.min.x;
+                fDistanceToY = vPoint.y - aabb.min.y;
+                fDistanceToZ = aabb.max.z - vPoint.z;
+
+                fNewX = aabb.min.x;
+                fNewY = aabb.min.y;
+                fNewZ = aabb.max.z;
+
+                break;
+            case 0x100:
+                // Is Right/Front/Low
+                fDistanceToX = aabb.max.x - vPoint.x;
+                fDistanceToY = aabb.max.y - vPoint.y;
+                fDistanceToZ = vPoint.z - aabb.min.z;
+
+                fNewX = aabb.max.x;
+                fNewY = aabb.max.y;
+                fNewZ = aabb.min.z;
+
+                break;
+            case 0x101:
+                // Is Left/Front/Low
+                fDistanceToX = vPoint.x - aabb.min.x;
+                fDistanceToY = aabb.max.y - vPoint.y;
+                fDistanceToZ = vPoint.z - aabb.min.z;
+
+                fNewX = aabb.min.x;
+                fNewY = aabb.max.y;
+                fNewZ = aabb.min.z;
+
+                break;
+            case 0x110:
+                // Is Right/Rear/Low
+                fDistanceToX = aabb.max.x - vPoint.x;
+                fDistanceToY = vPoint.y - aabb.min.y;
+                fDistanceToZ = vPoint.z - aabb.min.z;
+
+                fNewX = aabb.max.x;
+                fNewY = aabb.min.y;
+                fNewZ = aabb.min.z;
+
+                break;
+            case 0x111:
+                // Is Left/Rear/Low
+                fDistanceToX = vPoint.x - aabb.min.x;
+                fDistanceToY = vPoint.y - aabb.min.y;
+                fDistanceToZ = vPoint.z - aabb.min.z;
+
+                fNewX = aabb.min.x;
+                fNewY = aabb.min.y;
+                fNewZ = aabb.min.z;
+
+                break;
+            default:
+                fNewX = fNewY = fNewZ = 0;
+                break;
+            }
+
+            if (fDistanceToX < fDistanceToY && fDistanceToX < fDistanceToZ)
+            {
+                vClosest.x = fNewX;
+            }
+
+            if (fDistanceToY < fDistanceToX && fDistanceToY < fDistanceToZ)
+            {
+                vClosest.y = fNewY;
+            }
+
+            if (fDistanceToZ < fDistanceToX && fDistanceToZ < fDistanceToY)
+            {
+                vClosest.z = fNewZ;
+            }
+
+            fDist2 = vClosest.GetSquaredDistance(vPoint);
+        }
+        return fDist2;
+    }
+
+    //----------------------------------------------------------------------------------
+    // Distance: Sphere_Triangle
+    //----------------------------------------------------------------------------------
+    // Calculate the closest distance of a sphere to a triangle in 3d-space.
+    // The function returns the squared distance. If sphere and triangle overlaps,
+    // the returned distance is 0
+    //
+    // Example:
+    //  float result = Distance::Point_TriangleSq( pos, triangle );
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE F Sphere_TriangleSq(const ::Sphere& s, const Triangle_tpl<F>& t)
+    {
+        F sqdistance =  Distance::Point_TriangleSq(s.center, t) - (s.radius * s.radius);
+        if (sqdistance < 0)
+        {
+            sqdistance = 0;
+        }
+        return sqdistance;
+    }
+
+    template<typename F>
+    ILINE F Sphere_TriangleSq(const ::Sphere& s, const Triangle_tpl<F>& t, Vec3_tpl<F>& output)
+    {
+        F sqdistance =  Distance::Point_TriangleSq(s.center, t, output) - (s.radius * s.radius);
+        if (sqdistance < 0)
+        {
+            sqdistance = 0;
+        }
+        return sqdistance;
+    }
+
+    //----------------------------------------------------------------------------------
+    /// Calculate squared distance between two line segments, along with the optional
+    /// parameters of the closest points
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE F Lineseg_LinesegSq(const Lineseg& seg0, const Lineseg seg1, F* t0, F* t1)
+    {
+        Vec3 diff = seg0.start - seg1.start;
+        Vec3 delta0 = seg0.end - seg0.start;
+        Vec3 delta1 = seg1.end - seg1.start;
+        F fA00 = delta0.GetLengthSquared();
+        F fA01 = -delta0.Dot(delta1);
+        F fA11 = delta1.GetLengthSquared();
+        F fB0 = diff.Dot(delta0);
+        F fC = diff.GetLengthSquared();
+        F fDet = abs(fA00 * fA11 - fA01 * fA01);
+        F fB1, fS, fT, fSqrDist, fTmp;
+
+        if (fDet > (F) 0.0)
+        {
+            // line segments are not parallel
+            fB1 = -diff.Dot(delta1);
+            fS = fA01 * fB1 - fA11 * fB0;
+            fT = fA01 * fB0 - fA00 * fB1;
+
+            if (fS >= (F)0.0)
+            {
+                if (fS <= fDet)
+                {
+                    if (fT >= (F)0.0)
+                    {
+                        if (fT <= fDet) // region 0 (interior)
+                        {
+                            // minimum at two interior points of 3D lines
+                            F fInvDet = ((F)1.0) / fDet;
+                            fS *= fInvDet;
+                            fT *= fInvDet;
+                            fSqrDist = fS * (fA00 * fS + fA01 * fT + ((F)2.0) * fB0) +
+                                fT * (fA01 * fS + fA11 * fT + ((F)2.0) * fB1) + fC;
+                        }
+                        else // region 3 (side)
+                        {
+                            fT = (F)1.0;
+                            fTmp = fA01 + fB0;
+                            if (fTmp >= (F)0.0)
+                            {
+                                fS = (F)0.0;
+                                fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                            }
+                            else if (-fTmp >= fA00)
+                            {
+                                fS = (F)1.0;
+                                fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fB1 + fTmp);
+                            }
+                            else
+                            {
+                                fS = -fTmp / fA00;
+                                fSqrDist = fTmp * fS + fA11 + ((F)2.0) * fB1 + fC;
+                            }
+                        }
+                    }
+                    else // region 7 (side)
+                    {
+                        fT = (F)0.0;
+                        if (fB0 >= (F)0.0)
+                        {
+                            fS = (F)0.0;
+                            fSqrDist = fC;
+                        }
+                        else if (-fB0 >= fA00)
+                        {
+                            fS = (F)1.0;
+                            fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                        }
+                        else
+                        {
+                            fS = -fB0 / fA00;
+                            fSqrDist = fB0 * fS + fC;
+                        }
+                    }
+                }
+                else
+                {
+                    if (fT >= (F)0.0)
+                    {
+                        if (fT <= fDet) // region 1 (side)
+                        {
+                            fS = (F)1.0;
+                            fTmp = fA01 + fB1;
+                            if (fTmp >= (F)0.0)
+                            {
+                                fT = (F)0.0;
+                                fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                            }
+                            else if (-fTmp >= fA11)
+                            {
+                                fT = (F)1.0;
+                                fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fB0 + fTmp);
+                            }
+                            else
+                            {
+                                fT = -fTmp / fA11;
+                                fSqrDist = fTmp * fT + fA00 + ((F)2.0) * fB0 + fC;
+                            }
+                        }
+                        else // region 2 (corner)
+                        {
+                            fTmp = fA01 + fB0;
+                            if (-fTmp <= fA00)
+                            {
+                                fT = (F)1.0;
+                                if (fTmp >= (F)0.0)
+                                {
+                                    fS = (F)0.0;
+                                    fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                                }
+                                else
+                                {
+                                    fS = -fTmp / fA00;
+                                    fSqrDist = fTmp * fS + fA11 + ((F)2.0) * fB1 + fC;
+                                }
+                            }
+                            else
+                            {
+                                fS = (F)1.0;
+                                fTmp = fA01 + fB1;
+                                if (fTmp >= (F)0.0)
+                                {
+                                    fT = (F)0.0;
+                                    fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                                }
+                                else if (-fTmp >= fA11)
+                                {
+                                    fT = (F)1.0;
+                                    fSqrDist = fA00 + fA11 + fC +
+                                        ((F)2.0) * (fB0 + fTmp);
+                                }
+                                else
+                                {
+                                    fT = -fTmp / fA11;
+                                    fSqrDist = fTmp * fT + fA00 + ((F)2.0) * fB0 + fC;
+                                }
+                            }
+                        }
+                    }
+                    else // region 8 (corner)
+                    {
+                        if (-fB0 < fA00)
+                        {
+                            fT = (F)0.0;
+                            if (fB0 >= (F)0.0)
+                            {
+                                fS = (F)0.0;
+                                fSqrDist = fC;
+                            }
+                            else
+                            {
+                                fS = -fB0 / fA00;
+                                fSqrDist = fB0 * fS + fC;
+                            }
+                        }
+                        else
+                        {
+                            fS = (F)1.0;
+                            fTmp = fA01 + fB1;
+                            if (fTmp >= (F)0.0)
+                            {
+                                fT = (F)0.0;
+                                fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                            }
+                            else if (-fTmp >= fA11)
+                            {
+                                fT = (F)1.0;
+                                fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fB0 + fTmp);
+                            }
+                            else
+                            {
+                                fT = -fTmp / fA11;
+                                fSqrDist = fTmp * fT + fA00 + ((F)2.0) * fB0 + fC;
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (fT >= (F)0.0)
+                {
+                    if (fT <= fDet) // region 5 (side)
+                    {
+                        fS = (F)0.0;
+                        if (fB1 >= (F)0.0)
+                        {
+                            fT = (F)0.0;
+                            fSqrDist = fC;
+                        }
+                        else if (-fB1 >= fA11)
+                        {
+                            fT = (F)1.0;
+                            fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                        }
+                        else
+                        {
+                            fT = -fB1 / fA11;
+                            fSqrDist = fB1 * fT + fC;
+                        }
+                    }
+                    else // region 4 (corner)
+                    {
+                        fTmp = fA01 + fB0;
+                        if (fTmp < (F)0.0)
+                        {
+                            fT = (F)1.0;
+                            if (-fTmp >= fA00)
+                            {
+                                fS = (F)1.0;
+                                fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fB1 + fTmp);
+                            }
+                            else
+                            {
+                                fS = -fTmp / fA00;
+                                fSqrDist = fTmp * fS + fA11 + ((F)2.0) * fB1 + fC;
+                            }
+                        }
+                        else
+                        {
+                            fS = (F)0.0;
+                            if (fB1 >= (F)0.0)
+                            {
+                                fT = (F)0.0;
+                                fSqrDist = fC;
+                            }
+                            else if (-fB1 >= fA11)
+                            {
+                                fT = (F)1.0;
+                                fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                            }
+                            else
+                            {
+                                fT = -fB1 / fA11;
+                                fSqrDist = fB1 * fT + fC;
+                            }
+                        }
+                    }
+                }
+                else // region 6 (corner)
+                {
+                    if (fB0 < (F)0.0)
+                    {
+                        fT = (F)0.0;
+                        if (-fB0 >= fA00)
+                        {
+                            fS = (F)1.0;
+                            fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                        }
+                        else
+                        {
+                            fS = -fB0 / fA00;
+                            fSqrDist = fB0 * fS + fC;
+                        }
+                    }
+                    else
+                    {
+                        fS = (F)0.0;
+                        if (fB1 >= (F)0.0)
+                        {
+                            fT = (F)0.0;
+                            fSqrDist = fC;
+                        }
+                        else if (-fB1 >= fA11)
+                        {
+                            fT = (F)1.0;
+                            fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                        }
+                        else
+                        {
+                            fT = -fB1 / fA11;
+                            fSqrDist = fB1 * fT + fC;
+                        }
+                    }
+                }
+            }
+        }
+        else
+        {
+            // line segments are parallel
+            if (fA01 > (F)0.0)
+            {
+                // direction vectors form an obtuse angle
+                if (fB0 >= (F)0.0)
+                {
+                    fS = (F)0.0;
+                    fT = (F)0.0;
+                    fSqrDist = fC;
+                }
+                else if (-fB0 <= fA00)
+                {
+                    fS = -fB0 / fA00;
+                    fT = (F)0.0;
+                    fSqrDist = fB0 * fS + fC;
+                }
+                else
+                {
+                    fB1 = -diff.Dot(delta1);
+                    fS = (F)1.0;
+                    fTmp = fA00 + fB0;
+                    if (-fTmp >= fA01)
+                    {
+                        fT = (F)1.0;
+                        fSqrDist = fA00 + fA11 + fC + ((F)2.0) * (fA01 + fB0 + fB1);
+                    }
+                    else
+                    {
+                        fT = -fTmp / fA01;
+                        fSqrDist = fA00 + ((F)2.0) * fB0 + fC + fT * (fA11 * fT +
+                                                                      ((F)2.0) * (fA01 + fB1));
+                    }
+                }
+            }
+            else
+            {
+                // direction vectors form an acute angle
+                if (-fB0 >= fA00)
+                {
+                    fS = (F)1.0;
+                    fT = (F)0.0;
+                    fSqrDist = fA00 + ((F)2.0) * fB0 + fC;
+                }
+                else if (fB0 <= (F)0.0)
+                {
+                    fS = -fB0 / fA00;
+                    fT = (F)0.0;
+                    fSqrDist = fB0 * fS + fC;
+                }
+                else
+                {
+                    fB1 = -diff.Dot(delta1);
+                    fS = (F)0.0;
+                    if (fB0 >= -fA01)
+                    {
+                        fT = (F)1.0;
+                        fSqrDist = fA11 + ((F)2.0) * fB1 + fC;
+                    }
+                    else
+                    {
+                        fT = -fB0 / fA01;
+                        fSqrDist = fC + fT * (((F)2.0) * fB1 + fA11 * fT);
+                    }
+                }
+            }
+        }
+
+        if (t0)
+        {
+            *t0 = fS;
+        }
+
+        if (t1)
+        {
+            *t1 = fT;
+        }
+
+        return abs(fSqrDist);
+    }
+
+    /// Calculate distance between two line segments, along with the optional
+    /// parameters of the closest points
+    template<typename F>
+    ILINE F Lineseg_Lineseg(const Lineseg& seg0, const Lineseg seg1, F* s, F* t)
+    {
+        return sqrt_tpl(Lineseg_LinesegSq(seg0, seg1, s, t));
+    }
+
+    //----------------------------------------------------------------------------------
+    /// Squared distance from line segment to triangle. Optionally returns the parameters
+    /// describing the closest points
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE F Lineseg_TriangleSq(const Lineseg_tpl<F>& seg, const Triangle_tpl<F>& triangle,
+        F* segT, F* triT0, F* triT1)
+    {
+        Vec3_tpl<F> intersection;
+        if (Intersect::Lineseg_Triangle(seg, triangle.v0, triangle.v1, triangle.v2, intersection, segT))
+        {
+            if (triT0 || triT1)
+            {
+                const Vec3_tpl<F> v0v1 = triangle.v1  - triangle.v0;
+                Lineseg_tpl<F> projPtOnV0V2(intersection, intersection - v0v1);
+                Lineseg_tpl<F> v0v2(triangle.v0, triangle.v2);
+                Lineseg_LinesegSq(projPtOnV0V2, v0v2, triT0, triT1);
+            }
+            return 0.0f;
+        }
+
+        // compare segment to all three edges of the triangle
+        F s, t, u;
+        F distEdgeSq = Distance::Lineseg_LinesegSq(seg, Lineseg(triangle.v0, triangle.v1), &s, &t);
+        F distSq = distEdgeSq;
+        if (segT)
+        {
+            *segT = s;
+        }
+        if (triT0)
+        {
+            *triT0 = t;
+        }
+        if (triT1)
+        {
+            *triT1 = 0.0f;
+        }
+
+        distEdgeSq = Distance::Lineseg_LinesegSq(seg, Lineseg(triangle.v0, triangle.v2), &s, &t);
+        if (distEdgeSq < distSq)
+        {
+            distSq = distEdgeSq;
+            if (segT)
+            {
+                *segT = s;
+            }
+            if (triT0)
+            {
+                *triT0 = 0.0f;
+            }
+            if (triT1)
+            {
+                *triT1 = t;
+            }
+        }
+        distEdgeSq = Distance::Lineseg_LinesegSq(seg, Lineseg(triangle.v1, triangle.v2), &s, &t);
+        if (distEdgeSq < distSq)
+        {
+            distSq = distEdgeSq;
+            if (segT)
+            {
+                *segT = s;
+            }
+            if (triT0)
+            {
+                *triT0 = 1.0f - t;
+            }
+            if (triT1)
+            {
+                *triT1 = t;
+            }
+        }
+
+        // compare segment end points to triangle interior
+        F startTriSq = Distance::Point_TriangleSq(seg.start, triangle, &t, &u);
+        if (startTriSq < distSq)
+        {
+            distSq = startTriSq;
+            if (segT)
+            {
+                *segT = 0.0f;
+            }
+            if (triT0)
+            {
+                *triT0 = t;
+            }
+            if (triT1)
+            {
+                *triT1 = u;
+            }
+        }
+        F endTriSq = Distance::Point_TriangleSq(seg.end, triangle, &t, &u);
+        if (endTriSq < distSq)
+        {
+            distSq = endTriSq;
+            if (segT)
+            {
+                *segT = 1.0f;
+            }
+            if (triT0)
+            {
+                *triT0 = t;
+            }
+            if (triT1)
+            {
+                *triT1 = u;
+            }
+        }
+        return distSq;
+    }
+
+    /// Distance from line segment to triangle. Optionally returns the parameters
+    /// describing the closest points
+    template<typename F>
+    ILINE F Lineseg_Triangle(const Lineseg_tpl<F>& seg, const Triangle_tpl<F>& triangle,
+        F* segT, F* triT0, F* triT1)
+    {
+        return sqrt_tpl(Lineseg_TriangleSq(seg, triangle, segT, triT0, triT1));
+    }
+} //namespace Distance
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_GEODISTANCE_H
diff --git a/Code/Legacy/CryCommon/Cry_GeoIntersect.h b/Code/Legacy/CryCommon/Cry_GeoIntersect.h
new file mode 100644
index 0000000000..4ae20aa01c
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_GeoIntersect.h
@@ -0,0 +1,958 @@
+/*
+ * 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 intersection-tests
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_GEOINTERSECT_H
+#define CRYINCLUDE_CRYCOMMON_CRY_GEOINTERSECT_H
+#pragma once
+
+
+#include <Cry_Geo.h>
+
+namespace Intersect {
+    inline bool Ray_Plane(const Ray& ray, const Plane_tpl<f32>& plane, Vec3& output, bool bSingleSidePlane = true)
+    {
+        float cosine    =   plane.n | ray.direction;
+
+        //REJECTION 1: if "line-direction" is perpendicular to "plane-normal", an intersection is not possible! That means ray is parallel
+        //             to the plane
+        //REJECTION 2: if bSingleSidePlane == true we deal with single-sided planes. That means
+        //             if "line-direction" is pointing in the same direction as "the plane-normal",
+        //             an intersection is not possible!
+        if ((cosine == 0.0f) ||                                     // normal is orthogonal to vector, cant intersect
+            (bSingleSidePlane && (cosine > 0.0f)))  // we are trying to find an intersection in the same direction as the plane normal
+        {
+            return false;
+        }
+
+        float numer     = plane.DistFromPlane(ray.origin);
+        float fLength   = -numer / cosine;
+        output              =   ray.origin + (ray.direction * fLength);
+        //skip, if cutting-point is "behind" ray.origin
+        if (fLength < 0.0f)
+        {
+            return false;
+        }
+
+        return true;        //intersection occurred
+    }
+
+    inline bool Line_Plane(const Line& line, const Plane_tpl<f32>& plane, Vec3& output, bool bSingleSidePlane = true)
+    {
+        float cosine        =   plane.n | line.direction;
+
+        //REJECTION 1: if "line-direction" is perpendicular to "plane-normal", an intersection is not possible! That means ray is parallel
+        //             to the plane
+        //REJECTION 2: if bSingleSidePlane == true we deal with single-sided planes. That means
+        //             if "line-direction" is pointing in the same direction as "the plane-normal",
+        //             an intersection is not possible!
+        if ((cosine == 0.0f) ||                                     // normal is orthogonal to vector, cant intersect
+            (bSingleSidePlane && (cosine > 0.0f)))  // we are trying to find an intersection in the same direction as the plane normal
+        {
+            return false;
+        }
+
+        //an intersection is possible: calculate the exact point!
+        float perpdist  = plane | line.pointonline;
+        float pd_c          =   -perpdist / cosine;
+        output                  =   line.pointonline + (line.direction * pd_c);
+
+        return true;        //intersection occurred
+    }
+
+    // Algorithm description:
+    // http://softsurfer.com/Archive/algorithm_0104/algorithm_0104B.htm#Line-Plane%20Intersection
+    template <typename T>
+    inline bool Segment_Plane(const Lineseg_tpl<T>& segment, const Plane_tpl<T>& plane, Vec3_tpl<T>& vOutput, bool bSingleSidePlane = true)
+    {
+        Vec3_tpl<T> vSegment                                = segment.end - segment.start;
+        T                       planeNormalDotSegment       =   plane.n | vSegment;
+
+        //REJECTION 1: if "line-direction" is perpendicular to "plane-normal", an intersection is not possible! That means ray is parallel
+        //             to the plane
+        //REJECTION 2: if bSingleSidePlane == true we deal with single-sided planes. That means
+        //             if "line-direction" is pointing in the same direction as "the plane-normal",
+        //             an intersection is not possible!
+        if ((planeNormalDotSegment == T(0)) ||                                   // normal is orthogonal to vector, cant intersect
+            (bSingleSidePlane && (planeNormalDotSegment > T(0))))  // we are trying to find an intersection in the same direction as the plane normal
+        {
+            return false;
+        }
+
+        // n Dot (segment.start - closest_point_in_plane) = 1 * DistFromPlane(segment.start) * cos(0) = DistFromPlane(segment.start)
+        T distanceToStart   = plane.DistFromPlane(segment.start);
+        T scale                     = -distanceToStart / planeNormalDotSegment;
+        vOutput                     =   segment.start + (vSegment * scale);
+
+        // skip, if segment start and ends in one side of the plane
+        if ((scale < T(0)) || (scale > T(1)))
+        {
+            return false;
+        }
+
+        return true;        //intersection occurred
+    }
+
+    /// Intersection between two line segments in 2D (ignoring z coordinate). The two parametric
+    /// values are set to between 0 and 1 if intersection occurs. If intersection does not occur
+    /// their values will indicate the parametric values for intersection of the lines extended
+    /// beyond the segment lengths. Parallel lines will result in a negative result, but the parametric
+    /// values will both be equal to 0.5
+    template<typename F>
+    inline bool Lineseg_Lineseg2D(const Lineseg_tpl<F>& lineA, const Lineseg_tpl<F>& lineB, F& outA, F& outB)
+    {
+        const F Epsilon = (F)0.0000001;
+
+        Vec3_tpl<F> delta = lineB.start - lineA.start;
+
+        Vec3_tpl<F> dirA = lineA.end - lineA.start;
+        Vec3_tpl<F> dirB = lineB.end - lineB.start;
+
+        F det = dirA.x * dirB.y - dirA.y * dirB.x;
+        F detA = delta.x * dirB.y - delta.y * dirB.x;
+        F detB = delta.x * dirA.y - delta.y * dirA.x;
+
+        F absDet = fabs_tpl(det);
+
+        if (absDet >= Epsilon)
+        {
+            F invDet = (F)1.0 / det;
+
+            F a = detA * invDet;
+            F b = detB * invDet;
+            outA = a;
+            outB = b;
+
+            if ((a > (F)1.0) || (a < (F)0.0) || (b > (F)1.0) || (b < (F)0.0))
+            {
+                return false;
+            }
+        }
+        else
+        {
+            outA = outB = (F)0.5;
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /// Calculates the intersection between a line segment and a polygon, in 2D (i.e.
+    /// ignoring z coordinate). The VecContainer should be a container of Vec3 such
+    /// that we can traverse it using iterators. intersectionPoint is set to the intersection
+    /// point or the end of the segment, if no intersection.
+    template<typename VecIterator>
+    inline bool Lineseg_Polygon2D(const Lineseg& lineseg, VecIterator polygonBegin, VecIterator polygonEnd, Vec3& intersectionPoint, Vec3* pNormal = NULL, bool bForceNormalOutwards = false)
+    {
+        intersectionPoint = lineseg.end;
+        bool gotIntersection = false;
+
+        float tmin = 1.0f;
+
+        VecIterator iend = polygonEnd;
+        VecIterator li, linext;
+        Lineseg intersectSegment;
+        for (li = polygonBegin; li != iend; ++li)
+        {
+            linext = li;
+            ++linext;
+            if (linext == iend)
+            {
+                linext = polygonBegin;
+            }
+            Lineseg segmentPoly(*li, *linext);
+            float s, t;
+            if (Intersect::Lineseg_Lineseg2D(lineseg, segmentPoly, s, t))
+            {
+                if (s < 0.00001f || s > 0.99999f || t < 0.00001f || t > 0.99999f)
+                {
+                    continue;
+                }
+                if (s < tmin)
+                {
+                    tmin = s;
+                    gotIntersection = true;
+                    intersectSegment = segmentPoly;
+                }
+            }
+        }
+
+        intersectionPoint = lineseg.start + tmin * (lineseg.end - lineseg.start);
+
+        if (pNormal && gotIntersection)
+        {
+            Vec3 vPolyseg = intersectSegment.end - intersectSegment.start;
+            Vec3 vIntSeg = (lineseg.end - lineseg.start);
+            pNormal->x = vPolyseg.y;
+            pNormal->y = -vPolyseg.x;
+            pNormal->z = 0;
+            pNormal->NormalizeSafe();
+            // returns the normal towards the start point of the intersecting segment (if it's not forced to be outwards)
+            if (!bForceNormalOutwards && vIntSeg.Dot(*pNormal) > 0)
+            {
+                pNormal->x = -pNormal->x;
+                pNormal->y = -pNormal->y;
+            }
+        }
+        return gotIntersection;
+    }
+
+    template<typename VecContainer>
+    inline bool Lineseg_Polygon2D(const Lineseg& lineseg, const VecContainer& polygon, Vec3& intersectionPoint, Vec3* pNormal = NULL, bool bForceNormalOutwards = false)
+    {
+        return Lineseg_Polygon2D(lineseg, polygon.begin(), polygon.end(), intersectionPoint, pNormal, bForceNormalOutwards);
+    }
+
+    /*
+    * calculates intersection between a line and a triangle.
+    * IMPORTANT: this is a single-sided intersection test. That means its not enough
+    * that the triangle and line overlap, its also important that the triangle
+    * is "visible" when you are looking along the line-direction.
+    *
+    * If you need a double-sided test, you'll have to call this function twice with
+    * reversed order of triangle vertices.
+    *
+    * return values
+    * if there is an intertection the functions return "true" and stores the
+    * 3d-intersection point in "output". if the function returns "false" the value in
+    * "output" is undefined
+    *
+    */
+    inline bool Line_Triangle(const Line& line, const Vec3& v0, const Vec3& v1, const Vec3& v2, Vec3& output)
+    {
+        const float Epsilon = 0.0000001f;
+
+        Vec3 edgeA = v1 - v0;
+        Vec3 edgeB = v2 - v0;
+
+        Vec3 dir = line.direction;
+
+        Vec3 p = dir.Cross(edgeA);
+        Vec3 t = line.pointonline - v0;
+        Vec3 q = t.Cross(edgeB);
+
+        float dot = edgeB.Dot(p);
+
+        float u = t.Dot(p);
+        float v = dir.Dot(q);
+
+        float DotGreaterThanEpsilon = dot - Epsilon;
+        float VGreaterEqualThanZero = v;
+        float UGreaterEqualThanZero = u;
+        float UVLessThanDot = dot - (u + v);
+        float ULessThanDot = dot - u;
+
+        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
+        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
+        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
+        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
+
+        if (AllGood < 0.0f)
+        {
+            return false;
+        }
+
+        float dt = edgeA.Dot(q) / dot;
+
+        Vec3 result = (dir * dt) + line.pointonline;
+        output = result;
+
+        return true;
+    }
+
+
+
+    /*
+    * calculates intersection between a ray and a triangle.
+    * IMPORTANT: this is a single-sided intersection test. That means its not sufficient
+    * that the triangle and rayt overlap, its also important that the triangle
+    * is "visible" when you from the origin along the ray-direction.
+    *
+    * If you need a double-sided test, you'll have to call this function twice with
+    * reversed order of triangle vertices.
+    *
+    * return values
+    * if there is an intertection the functions return "true" and stores the
+    * 3d-intersection point in "output". if the function returns "false" the value in
+    * "output" is undefined
+    */
+    inline bool Ray_Triangle(const Ray& ray, const Vec3& v0, const Vec3& v1, const Vec3& v2, Vec3& output)
+    {
+        const float Epsilon = 0.0000001f;
+
+        Vec3 edgeA = v1 - v0;
+        Vec3 edgeB = v2 - v0;
+
+        Vec3 dir = ray.direction;
+
+        Vec3 p = dir.Cross(edgeA);
+        Vec3 t = ray.origin - v0;
+        Vec3 q = t.Cross(edgeB);
+
+        float dot = edgeB.Dot(p);
+
+        float u = t.Dot(p);
+        float v = dir.Dot(q);
+
+        float DotGreaterThanEpsilon = dot - Epsilon;
+        float VGreaterEqualThanZero = v;
+        float UGreaterEqualThanZero = u;
+        float UVLessThanDot = dot - (u + v);
+        float ULessThanDot = dot - u;
+
+        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
+        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
+        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
+        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
+
+        if (AllGood < 0.0f)
+        {
+            return false;
+        }
+
+        float dt = edgeA.Dot(q) / dot;
+
+        Vec3 result = (dir * dt) + ray.origin;
+        output = result;
+
+        float AfterStart = (result - ray.origin).Dot(dir);
+
+        return AfterStart >= 0.0f;
+    }
+
+
+
+    /*
+    * Description:
+    *   Calculates intersection between a line-segment and a triangle.
+    * Remarks:
+    *   IMPORTANT: this is a single-sided intersection test. That means its not sufficient
+    *   that the triangle and line-segment overlap, its also important that the triangle
+    *   is "visible" when you are looking along the linesegment from "start" to "end".
+    * Notes:
+    *   If you need a double-sided test, you'll have to call this function twice with
+    *   reversed order of triangle vertices.
+    *
+    * Return value:
+    *   If there is an intertection the the functions return "true" and stores the
+    *   3d-intersection point in "output". if the function returns "false" the value in
+    *   "output" is undefined. If pT is non-zero then if there is an intersection the "t-value"
+    *   (from 0-1) is also returned (unmodified if there is no intersection).
+    */
+    inline bool Lineseg_Triangle(const Lineseg& lineseg, const Vec3& v0, const Vec3& v1, const Vec3& v2, Vec3& output,
+        float* outT = 0)
+    {
+        const float Epsilon = 0.0000001f;
+
+        Vec3 edgeA = v1 - v0;
+        Vec3 edgeB = v2 - v0;
+
+        Vec3 dir = lineseg.end - lineseg.start;
+
+        Vec3 p = dir.Cross(edgeA);
+        Vec3 t = lineseg.start - v0;
+        Vec3 q = t.Cross(edgeB);
+
+        float dot = edgeB.Dot(p);
+
+        float u = t.Dot(p);
+        float v = dir.Dot(q);
+
+        float DotGreaterThanEpsilon = dot - Epsilon;
+        float VGreaterEqualThanZero = v;
+        float UGreaterEqualThanZero = u;
+        float UVLessThanDot = dot - (u + v);
+        float ULessThanDot = dot - u;
+
+        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
+        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
+        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
+        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
+
+        if (AllGood < 0.0f)
+        {
+            return false;
+        }
+
+        float dt = edgeA.Dot(q) / dot;
+
+        Vec3 result = (dir * dt) + lineseg.start;
+        output = result;
+
+        float AfterStart = (result - lineseg.start).Dot(dir);
+        float BeforeEnd = -(result - lineseg.end).Dot(dir);
+        float Within = (float)fsel(AfterStart, BeforeEnd, AfterStart);
+
+        if (outT)
+        {
+            *outT = dt;
+        }
+
+        return Within >= 0.0f;
+    }
+
+
+
+
+    //----------------------------------------------------------------------------------
+    //  Ray_AABB
+    //
+    //  just ONE intersection point is calculated, and thats the entry point           -
+    //   Lineseg and AABB are assumed to be in the same space
+    //
+    //--- 0x00 = no intersection (output undefined)        --------------------------
+    //--- 0x01 = intersection (intersection point in output)              --------------
+    //--- 0x02 = start of Lineseg is inside the AABB (ls.start is output)
+    //----------------------------------------------------------------------------------
+    inline uint8 Ray_AABB(const Ray& ray, const AABB& aabb, Vec3& output1)
+    {
+        uint8 cflags;
+        float cosine;
+        Vec3 cut;
+        //--------------------------------------------------------------------------------------
+        //----         check if "ray.origin" is inside of AABB    ---------------------------
+        //--------------------------------------------------------------------------------------
+        cflags = (ray.origin.x >= aabb.min.x) << 0;
+        cflags |= (ray.origin.x <= aabb.max.x) << 1;
+        cflags |= (ray.origin.y >= aabb.min.y) << 2;
+        cflags |= (ray.origin.y <= aabb.max.y) << 3;
+        cflags |= (ray.origin.z >= aabb.min.z) << 4;
+        cflags |= (ray.origin.z <= aabb.max.z) << 5;
+        if (cflags == 0x3f)
+        {
+            output1 = ray.origin;
+            return 0x02;
+        }
+
+        //--------------------------------------------------------------------------------------
+        //----         check intersection with planes           ------------------------------
+        //--------------------------------------------------------------------------------------
+        for (int i = 0; i < 3; i++)
+        {
+            if ((ray.direction[i] > 0) && (ray.origin[i] < aabb.min[i]))
+            {
+                cosine = (-ray.origin[i] + aabb.min[i]) / ray.direction[i];
+                cut[i] = aabb.min[i];
+                cut[incm3(i)] = ray.origin[incm3(i)] + (ray.direction[incm3(i)] * cosine);
+                cut[decm3(i)] = ray.origin[decm3(i)] + (ray.direction[decm3(i)] * cosine);
+                if ((cut[incm3(i)] > aabb.min[incm3(i)]) && (cut[incm3(i)] < aabb.max[incm3(i)]) && (cut[decm3(i)] > aabb.min[decm3(i)]) && (cut[decm3(i)] < aabb.max[decm3(i)]))
+                {
+                    output1 = cut;
+                    return 0x01;
+                }
+            }
+            if ((ray.direction[i] < 0) && (ray.origin[i] > aabb.max[i]))
+            {
+                cosine = (+ray.origin[i] - aabb.max[i]) / ray.direction[i];
+                cut[i] = aabb.max[i];
+                cut[incm3(i)] = ray.origin[incm3(i)] - (ray.direction[incm3(i)] * cosine);
+                cut[decm3(i)] = ray.origin[decm3(i)] - (ray.direction[decm3(i)] * cosine);
+                if ((cut[incm3(i)] > aabb.min[incm3(i)]) && (cut[incm3(i)] < aabb.max[incm3(i)]) && (cut[decm3(i)] > aabb.min[decm3(i)]) && (cut[decm3(i)] < aabb.max[decm3(i)]))
+                {
+                    output1 = cut;
+                    return 0x01;
+                }
+            }
+        }
+        return 0x00;//no intersection
+    }
+
+
+
+    //----------------------------------------------------------------------------------
+    //  Ray_OBB
+    //
+    //  just ONE intersection point is calculated, and thats the entry point           -
+    //   Lineseg and OBB are assumed to be in the same space
+    //
+    //--- 0x00 = no intersection (output undefined)                                 ----
+    //--- 0x01 = intersection (intersection point in output)              --------------
+    //--- 0x02 = start of Lineseg is inside the OBB (ls.start is output)
+    //----------------------------------------------------------------------------------
+    inline uint8 Ray_OBB(const Ray& ray, const Vec3& pos, const OBB& obb, Vec3& output1)
+    {
+        AABB aabb(obb.c - obb.h, obb.c + obb.h);
+        Ray aray((ray.origin - pos) * obb.m33, ray.direction * obb.m33);
+
+        uint8 cflags;
+        float cosine;
+        Vec3 cut;
+        //--------------------------------------------------------------------------------------
+        //----         check if "aray.origin" is inside of AABB    ---------------------------
+        //--------------------------------------------------------------------------------------
+        cflags = (aray.origin.x > aabb.min.x) << 0;
+        cflags |= (aray.origin.x < aabb.max.x) << 1;
+        cflags |= (aray.origin.y > aabb.min.y) << 2;
+        cflags |= (aray.origin.y < aabb.max.y) << 3;
+        cflags |= (aray.origin.z > aabb.min.z) << 4;
+        cflags |= (aray.origin.z < aabb.max.z) << 5;
+        if (cflags == 0x3f)
+        {
+            output1 = aray.origin;
+            return 0x02;
+        }
+
+        //--------------------------------------------------------------------------------------
+        //----         check intersection with planes           ------------------------------
+        //--------------------------------------------------------------------------------------
+        for (int i = 0; i < 3; i++)
+        {
+            if ((aray.direction[i] > 0) && (aray.origin[i] < aabb.min[i]))
+            {
+                cosine = (-aray.origin[i] + aabb.min[i]) / aray.direction[i];
+                cut[i] = aabb.min[i];
+                cut[incm3(i)] = aray.origin[incm3(i)] + (aray.direction[incm3(i)] * cosine);
+                cut[decm3(i)] = aray.origin[decm3(i)] + (aray.direction[decm3(i)] * cosine);
+                if ((cut[incm3(i)] > aabb.min[incm3(i)]) && (cut[incm3(i)] < aabb.max[incm3(i)]) && (cut[decm3(i)] > aabb.min[decm3(i)]) && (cut[decm3(i)] < aabb.max[decm3(i)]))
+                {
+                    output1 = obb.m33 * cut + pos;
+                    return 0x01;
+                }
+            }
+            if ((aray.direction[i] < 0) && (aray.origin[i] > aabb.max[i]))
+            {
+                cosine = (+aray.origin[i] - aabb.max[i]) / aray.direction[i];
+                cut[i] = aabb.max[i];
+                cut[incm3(i)] = aray.origin[incm3(i)] - (aray.direction[incm3(i)] * cosine);
+                cut[decm3(i)] = aray.origin[decm3(i)] - (aray.direction[decm3(i)] * cosine);
+                if ((cut[incm3(i)] > aabb.min[incm3(i)]) && (cut[incm3(i)] < aabb.max[incm3(i)]) && (cut[decm3(i)] > aabb.min[decm3(i)]) && (cut[decm3(i)] < aabb.max[decm3(i)]))
+                {
+                    output1 = obb.m33 * cut + pos;
+                    return 0x01;
+                }
+            }
+        }
+        return 0x00;//no intersection
+    }
+
+    //----------------------------------------------------------------------------------
+    //  Lineseg_AABB
+    //
+    //  just ONE intersection point is calculated, and thats the entry point           -
+    //   Lineseg and AABB are assumed to be in the same space
+    //
+    //--- 0x00 = no intersection (output undefined)        --------------------------
+    //--- 0x01 = intersection (intersection point in output)              --------------
+    //--- 0x02 = start of Lineseg is inside the AABB (ls.start is output)
+    //----------------------------------------------------------------------------------
+    inline uint8    Lineseg_AABB(const Lineseg& ls, const AABB& aabb, Vec3& output1)
+    {
+        uint8 cflags;
+        float cosine;
+        Vec3 cut;
+        Vec3 lnormal = (ls.start - ls.end).GetNormalized();
+        //--------------------------------------------------------------------------------------
+        //----         check if "ls.start" is inside of AABB    ---------------------------
+        //--------------------------------------------------------------------------------------
+        cflags = (ls.start.x > aabb.min.x) << 0;
+        cflags |= (ls.start.x < aabb.max.x) << 1;
+        cflags |= (ls.start.y > aabb.min.y) << 2;
+        cflags |= (ls.start.y < aabb.max.y) << 3;
+        cflags |= (ls.start.z > aabb.min.z) << 4;
+        cflags |= (ls.start.z < aabb.max.z) << 5;
+        if (cflags == 0x3f)
+        {
+            //ls.start is inside of aabb
+            output1 = ls.start;
+            return 0x02;
+        }
+
+        //--------------------------------------------------------------------------------------
+        //----         check intersection with x-planes           ------------------------------
+        //--------------------------------------------------------------------------------------
+        if (lnormal.x)
+        {
+            if ((ls.start.x < aabb.min.x) && (ls.end.x > aabb.min.x))
+            {
+                cosine = (-ls.start.x + (+aabb.min.x)) / lnormal.x;
+                cut(aabb.min.x, ls.start.y + (lnormal.y * cosine), ls.start.z + (lnormal.z * cosine));
+                //check if cut-point is inside YZ-plane border
+                if ((cut.y > aabb.min.y) && (cut.y < aabb.max.y) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
+                {
+                    output1 = cut;
+                    return 0x01;
+                }
+            }
+            if ((ls.start.x > aabb.max.x) && (ls.end.x < aabb.max.x))
+            {
+                cosine = (+ls.start.x + (-aabb.max.x)) / lnormal.x;
+                cut(aabb.max.x, ls.start.y - (lnormal.y * cosine), ls.start.z - (lnormal.z * cosine));
+                //check if cut-point is inside YZ-plane border
+                if ((cut.y > aabb.min.y) && (cut.y < aabb.max.y) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
+                {
+                    output1 = cut;
+                    return 0x01;
+                }
+            }
+        }
+        //--------------------------------------------------------------------------------------
+        //----         check intersection with z-planes           ------------------------------
+        //--------------------------------------------------------------------------------------
+        if (lnormal.z)
+        {
+            if ((ls.start.z < aabb.min.z) && (ls.end.z > aabb.min.z))
+            {
+                cosine = (-ls.start.z + (+aabb.min.z)) / lnormal.z;
+                cut(ls.start.x + (lnormal.x * cosine), ls.start.y + (lnormal.y * cosine), aabb.min.z);
+                //check if cut-point is inside XY-plane border
+                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.y > aabb.min.y) && (cut.y < aabb.max.y))
+                {
+                    output1 = cut;
+                    return 0x01;
+                }
+            }
+            if ((ls.start.z > aabb.max.z) && (ls.end.z < aabb.max.z))
+            {
+                cosine = (+ls.start.z + (-aabb.max.z)) / lnormal.z;
+                cut(ls.start.x - (lnormal.x * cosine), ls.start.y - (lnormal.y * cosine), aabb.max.z);
+                //check if cut-point is inside XY-plane border
+                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.y > aabb.min.y) && (cut.y < aabb.max.y))
+                {
+                    output1 = cut;
+                    return 0x01;
+                }
+            }
+        }
+        //--------------------------------------------------------------------------------------
+        //----         check intersection with y-planes           ------------------------------
+        //--------------------------------------------------------------------------------------
+        if (lnormal.y)
+        {
+            if ((ls.start.y < aabb.min.y) && (ls.end.y > aabb.min.y))
+            {
+                cosine = (-ls.start.y + (+aabb.min.y)) / lnormal.y;
+                cut(ls.start.x + (lnormal.x * cosine), aabb.min.y, ls.start.z + (lnormal.z * cosine));
+                //check if cut-point is inside XZ-plane border
+                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
+                {
+                    output1 = cut;
+                    return 0x01;
+                }
+            }
+            if ((ls.start.y > aabb.max.y) && (ls.end.y < aabb.max.y))
+            {
+                cosine = (+ls.start.y + (-aabb.max.y)) / lnormal.y;
+                cut(ls.start.x - (lnormal.x * cosine), aabb.max.y, ls.start.z - (lnormal.z * cosine));
+                //check if cut-point is inside XZ-plane border
+                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
+                {
+                    output1 = cut;
+                    return 0x01;
+                }
+            }
+        }
+        //no intersection
+        return 0x00;
+    }
+
+
+
+    //----------------------------------------------------------------------------------
+    //  Lineseg_OBB
+    //
+    //  just ONE intersection point is calculated, and thats the entry point           -
+    //  Lineseg and OBB are assumed to be in the same space
+    //
+    //--- 0x00 = no intersection (output undefined)           --------------------------
+    //--- 0x01 = intersection (intersection point in output)              --------------
+    //--- 0x02 = start of Lineseg is inside the OBB (ls.start is output)
+    //----------------------------------------------------------------------------------
+    inline uint8    Lineseg_OBB(const Lineseg& lseg, const Vec3& pos, const OBB& obb, Vec3& output1)
+    {
+        AABB aabb(obb.c - obb.h, obb.c + obb.h);
+        Lineseg ls((lseg.start - pos) * obb.m33, (lseg.end - pos) * obb.m33);
+
+        uint8 cflags;
+        float cosine;
+        Vec3 cut;
+        Vec3 lnormal = (ls.start - ls.end).GetNormalized();
+        //--------------------------------------------------------------------------------------
+        //----         check if "ls.start" is inside of AABB    ---------------------------
+        //--------------------------------------------------------------------------------------
+        cflags = (ls.start.x > aabb.min.x) << 0;
+        cflags |= (ls.start.x < aabb.max.x) << 1;
+        cflags |= (ls.start.y > aabb.min.y) << 2;
+        cflags |= (ls.start.y < aabb.max.y) << 3;
+        cflags |= (ls.start.z > aabb.min.z) << 4;
+        cflags |= (ls.start.z < aabb.max.z) << 5;
+        if (cflags == 0x3f)
+        {
+            //ls.start is inside of aabb
+            output1 = obb.m33 * ls.start + pos;
+            return 0x02;
+        }
+
+        //--------------------------------------------------------------------------------------
+        //----         check intersection with x-planes           ------------------------------
+        //--------------------------------------------------------------------------------------
+        if (lnormal.x)
+        {
+            if ((ls.start.x < aabb.min.x) && (ls.end.x > aabb.min.x))
+            {
+                cosine = (-ls.start.x + (+aabb.min.x)) / lnormal.x;
+                cut(aabb.min.x, ls.start.y + (lnormal.y * cosine), ls.start.z + (lnormal.z * cosine));
+                //check if cut-point is inside YZ-plane border
+                if ((cut.y > aabb.min.y) && (cut.y < aabb.max.y) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
+                {
+                    output1 = obb.m33 * cut + pos;
+                    return 0x01;
+                }
+            }
+            if ((ls.start.x > aabb.max.x) && (ls.end.x < aabb.max.x))
+            {
+                cosine = (+ls.start.x + (-aabb.max.x)) / lnormal.x;
+                cut(aabb.max.x, ls.start.y - (lnormal.y * cosine), ls.start.z - (lnormal.z * cosine));
+                //check if cut-point is inside YZ-plane border
+                if ((cut.y > aabb.min.y) && (cut.y < aabb.max.y) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
+                {
+                    output1 = obb.m33 * cut + pos;
+                    return 0x01;
+                }
+            }
+        }
+        //--------------------------------------------------------------------------------------
+        //----         check intersection with z-planes           ------------------------------
+        //--------------------------------------------------------------------------------------
+        if (lnormal.z)
+        {
+            if ((ls.start.z < aabb.min.z) && (ls.end.z > aabb.min.z))
+            {
+                cosine = (-ls.start.z + (+aabb.min.z)) / lnormal.z;
+                cut(ls.start.x + (lnormal.x * cosine), ls.start.y + (lnormal.y * cosine), aabb.min.z);
+                //check if cut-point is inside XY-plane border
+                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.y > aabb.min.y) && (cut.y < aabb.max.y))
+                {
+                    output1 = obb.m33 * cut + pos;
+                    return 0x01;
+                }
+            }
+            if ((ls.start.z > aabb.max.z) && (ls.end.z < aabb.max.z))
+            {
+                cosine = (+ls.start.z + (-aabb.max.z)) / lnormal.z;
+                cut(ls.start.x - (lnormal.x * cosine), ls.start.y - (lnormal.y * cosine), aabb.max.z);
+                //check if cut-point is inside XY-plane border
+                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.y > aabb.min.y) && (cut.y < aabb.max.y))
+                {
+                    output1 = obb.m33 * cut + pos;
+                    return 0x01;
+                }
+            }
+        }
+        //--------------------------------------------------------------------------------------
+        //----         check intersection with y-planes           ------------------------------
+        //--------------------------------------------------------------------------------------
+        if (lnormal.y)
+        {
+            if ((ls.start.y < aabb.min.y) && (ls.end.y > aabb.min.y))
+            {
+                cosine = (-ls.start.y + (+aabb.min.y)) / lnormal.y;
+                cut(ls.start.x + (lnormal.x * cosine), aabb.min.y, ls.start.z + (lnormal.z * cosine));
+                //check if cut-point is inside XZ-plane border
+                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
+                {
+                    output1 = obb.m33 * cut + pos;
+                    return 0x01;
+                }
+            }
+            if ((ls.start.y > aabb.max.y) && (ls.end.y < aabb.max.y))
+            {
+                cosine = (+ls.start.y + (-aabb.max.y)) / lnormal.y;
+                cut(ls.start.x - (lnormal.x * cosine), aabb.max.y, ls.start.z - (lnormal.z * cosine));
+                //check if cut-point is inside XZ-plane border
+                if ((cut.x > aabb.min.x) && (cut.x < aabb.max.x) && (cut.z > aabb.min.z) && (cut.z < aabb.max.z))
+                {
+                    output1 = obb.m33 * cut + pos;
+                    return 0x01;
+                }
+            }
+        }
+        //no intersection
+        return 0x00;
+    }
+
+
+
+    //----------------------------------------------------------------------------------
+    //--- 0x00 = no intersection                               --------------------------
+    //--- 0x01 = not possible   --
+    //--- 0x02 = not possible  --
+    //--- 0x03 = two intersection, lineseg has ENTRY and EXIT point  --
+    //----------------------------------------------------------------------------------
+
+    inline unsigned char Line_Sphere(const Line& line, const ::Sphere& s, Vec3& i0, Vec3& i1)
+    {
+        Vec3 end = line.pointonline + line.direction;
+
+        float a = line.direction | line.direction;
+        float b = (line.direction | (line.pointonline - s.center)) * 2.0f;
+        float c = ((line.pointonline - s.center) | (line.pointonline - s.center)) - (s.radius * s.radius);
+
+        float desc = (b * b) - (4 * a * c);
+
+        unsigned char intersection = 0;
+        if (desc >= 0.0f)
+        {
+            float lamba0 = (-b - sqrt_tpl(desc)) / (2.0f * a);
+            //_stprintf(d3dApp.token,"lamba0: %20.12f",lamba0);
+            //d3dApp.m_pFont->DrawText( 2, d3dApp.PrintY, D3DCOLOR_ARGB(255,255,255,0), d3dApp.token ); d3dApp.PrintY+=20;
+            i0 = line.pointonline + ((end - line.pointonline) * lamba0);
+            intersection = 1;
+
+            float lamba1 = (-b + sqrt_tpl(desc)) / (2.0f * a);
+            //_stprintf(d3dApp.token,"lamba1: %20.12f",lamba1);
+            //d3dApp.m_pFont->DrawText( 2, d3dApp.PrintY, D3DCOLOR_ARGB(255,255,255,0), d3dApp.token ); d3dApp.PrintY+=20;
+            i1 = line.pointonline + ((end - line.pointonline) * lamba1);
+            intersection |= 2;
+        }
+
+        return intersection;
+    }
+
+
+
+    //----------------------------------------------------------------------------------
+    //--- 0x00 = no intersection                               --------------------------
+    //--- 0x01 = not possible   --
+    //--- 0x02 = one intersection, lineseg has just an EXIT point but no ENTRY point (ls.start is inside the sphere)  --
+    //--- 0x03 = two intersection, lineseg has ENTRY and EXIT point  --
+    //----------------------------------------------------------------------------------
+
+    inline unsigned char Ray_Sphere(const Ray& ray, const ::Sphere& s, Vec3& i0, Vec3& i1)
+    {
+        Vec3 end = ray.origin + ray.direction;
+        float a = ray.direction | ray.direction;
+        float b = (ray.direction | (ray.origin - s.center)) * 2.0f;
+        float c = ((ray.origin - s.center) | (ray.origin - s.center)) - (s.radius * s.radius);
+
+        float desc = (b * b) - (4 * a * c);
+
+        unsigned char intersection = 0;
+        if (desc >= 0.0f)
+        {
+            float lamba0 = (-b - sqrt_tpl(desc)) / (2.0f * a);
+            //  _stprintf(d3dApp.token,"lamba0: %20.12f",lamba0);
+            //  d3dApp.m_pFont->DrawText( 2, d3dApp.PrintY, D3DCOLOR_ARGB(255,255,255,0), d3dApp.token );   d3dApp.PrintY+=20;
+            if (lamba0 > 0.0f)
+            {
+                i0 = ray.origin + ((end - ray.origin) * lamba0);
+                intersection = 1;
+            }
+
+            float lamba1 = (-b + sqrt_tpl(desc)) / (2.0f * a);
+            //  _stprintf(d3dApp.token,"lamba1: %20.12f",lamba1);
+            //  d3dApp.m_pFont->DrawText( 2, d3dApp.PrintY, D3DCOLOR_ARGB(255,255,255,0), d3dApp.token );   d3dApp.PrintY+=20;
+            if (lamba1 > 0.0f)
+            {
+                i1 = ray.origin + ((end - ray.origin) * lamba1);
+                intersection |= 2;
+            }
+        }
+        return intersection;
+    }
+
+    inline bool Ray_SphereFirst(const Ray& ray, const ::Sphere& s, Vec3& intPoint)
+    {
+        Vec3 p2;
+        unsigned char res = Ray_Sphere(ray, s, intPoint, p2);
+        if (res == 2)
+        {
+            intPoint = p2;
+        }
+        if (res > 1)
+        {
+            return true;
+        }
+        return false;
+    }
+
+
+
+    //----------------------------------------------------------------------------------
+    //--- 0x00 = no intersection                               --------------------------
+    //--- 0x01 = one intersection, lineseg has just an ENTRY point but no EXIT point (ls.end is inside the sphere)  --
+    //--- 0x02 = one intersection, lineseg has just an EXIT point but no ENTRY point (ls.start is inside the sphere)  --
+    //--- 0x03 = two intersection, lineseg has ENTRY and EXIT point  --
+    //----------------------------------------------------------------------------------
+    inline unsigned char Lineseg_Sphere(const Lineseg& ls, const ::Sphere& s, Vec3& i0, Vec3& i1)
+    {
+        Vec3 dir = (ls.end - ls.start);
+
+        float a = dir | dir;
+        if (a == 0.0f)
+        {
+            return 0;
+        }
+
+        float b = (dir | (ls.start - s.center)) * 2.0f;
+        float c = ((ls.start - s.center) | (ls.start - s.center)) - (s.radius * s.radius);
+        float desc = (b * b) - (4 * a * c);
+
+        unsigned char intersection = 0;
+        if (desc >= 0.0f)
+        {
+            float lamba0 = (-b - sqrt_tpl(desc)) / (2.0f * a);
+            if (lamba0 > 0.0f)
+            {
+                i0 = ls.start + ((ls.end - ls.start) * lamba0);
+                //skip, if 1st cutting-point is "in front" of ls.end
+                if (((i0 - ls.end) | dir) > 0)
+                {
+                    return 0;
+                }
+                intersection = 0x01;
+            }
+
+            float lamba1 = (-b + sqrt_tpl(desc)) / (2.0f * a);
+            if (lamba1 > 0.0f)
+            {
+                i1 = ls.start + ((ls.end - ls.start) * lamba1);
+                //skip, if 2nd cutting-point is "in front" of ls.end (=ls.end is inside sphere)
+                if (((i1 - ls.end) | dir) > 0)
+                {
+                    return intersection;
+                }
+                intersection |= 0x02;
+            }
+        }
+        return intersection;
+    }
+
+
+    inline bool Lineseg_SphereFirst(const Lineseg& lineseg, const ::Sphere& s, Vec3& intPoint)
+    {
+        Vec3 p2;
+        uint8 res = Lineseg_Sphere(lineseg, s, intPoint, p2);
+        if (res == 2)
+        {
+            intPoint = p2;
+        }
+        if (res > 1)
+        {
+            return true;
+        }
+        return false;
+    }
+}; //CIntersect
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_GEOINTERSECT_H
diff --git a/Code/Legacy/CryCommon/Cry_GeoOverlap.h b/Code/Legacy/CryCommon/Cry_GeoOverlap.h
new file mode 100644
index 0000000000..f72ab6d190
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_GeoOverlap.h
@@ -0,0 +1,2039 @@
+/*
+ * 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 overlap-tests
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_GEOOVERLAP_H
+#define CRYINCLUDE_CRYCOMMON_CRY_GEOOVERLAP_H
+#pragma once
+
+#include <Cry_Geo.h>
+#include <AzCore/Math/Vector3.h>
+
+namespace Distance
+{
+    template<typename F>
+    ILINE F Point_TriangleSq(const Vec3_tpl<F>& p, const Triangle_tpl<F>& t);
+    template<typename F>
+    ILINE F Point_Lineseg2DSq(Vec3_tpl<F> p, Lineseg lineseg, F& fT);
+    simdf Point_TriangleByPointsSq(const hwvec3& p, const hwvec3& t0, const hwvec3& t1, const hwvec3& t2);
+}
+
+
+namespace Overlap {
+    ILINE void FINDMINMAX(const f32 x0, const f32 x1, const f32 x2, f32& min_value, f32& max_value)
+    {
+        min_value = max_value = x0;
+        min_value = min(x1, min_value);
+        max_value = max(x1, max_value);
+        min_value = min(x2, min_value);
+        max_value = max(x2, max_value);
+    }
+
+    inline bool Lineseg_AABB2D(const Lineseg&, const AABB&);
+    ILINE bool AABB_AABB2D(const AABB&, const AABB&);
+
+    ////////////////////////////////////////////////////////////////
+    // Checks if the point is inside an AABB
+    /*  inline bool Point_AABB(const Vec3 &p, const Vec3 &mins,const Vec3 &maxs)
+        {
+            if ((p.x>=mins.x && p.x<=maxs.x) && (p.y>=mins.y && p.y<=maxs.y) && (p.z>=mins.z && p.z<=maxs.z))   return (true);
+            return (false);
+        }*/
+
+    // Description:
+    //      Checks if the point is inside an AABB
+    //      The min value of the AABB is inclusive
+    //      The max value of the AABB is exclusive
+    ILINE bool  Point_AABB(const Vec3& p, const AABB& aabb)
+    {
+        return ((p.x >= aabb.min.x && p.x < aabb.max.x) && (p.y >= aabb.min.y && p.y < aabb.max.y) && (p.z >= aabb.min.z && p.z < aabb.max.z));
+    }
+
+    // Description:
+    //      Checks if the point is inside a 2D AABB
+    //      The min value of the AABB is inclusive
+    //      The max value of the AABB is exclusive
+    template<typename PtType>
+    ILINE bool  Point_AABB2D(const PtType& p, const AABB& aabb)
+    {
+        return ((p.x >= aabb.min.x && p.x < aabb.max.x) && (p.y >= aabb.min.y && p.y < aabb.max.y));
+    }
+
+    // Description:
+    //      Checks if the point is inside an AABB
+    //      The min and max value of the AABB is inclusive
+    ILINE bool  Point_AABB_MaxInclusive(const Vec3& p, const AABB& aabb)
+    {
+        return ((p.x >= aabb.min.x && p.x <= aabb.max.x) && (p.y >= aabb.min.y && p.y <= aabb.max.y) && (p.z >= aabb.min.z && p.z <= aabb.max.z));
+    }
+
+    // Description:
+    //      Checks if the point is inside a 2D AABB
+    //      The min and max value of the AABB is inclusive
+    template<typename PtType>
+    ILINE bool  Point_AABB2D_MaxInclusive(const PtType& p, const AABB& aabb)
+    {
+        return ((p.x >= aabb.min.x && p.x <= aabb.max.x) && (p.y >= aabb.min.y && p.y <= aabb.max.y));
+    }
+
+    // Description:
+    //  Checks if a point is inside an OBB.
+    // Example:
+    //  bool result=Overlap::Point_OBB( point, obb );
+    ILINE bool  Point_OBB(const Vec3& p, const Vec3& wpos, const OBB& obb)
+    {
+        AABB aabb = AABB(obb.c - obb.h, obb.c + obb.h);
+        Vec3 t = (p - wpos) * obb.m33;
+        return ((t.x >= aabb.min.x && t.x <= aabb.max.x) && (t.y >= aabb.min.y && t.y <= aabb.max.y) && (t.z >= aabb.min.z && t.z <= aabb.max.z));
+    }
+
+    // Description:
+    //  Checks if a point is inside a sphere.
+    // Example:
+    //  bool result=Overlap::Point_Sphere( point, sphere );
+    ILINE bool  Point_Sphere(const Vec3& p, const ::Sphere& s)
+    {
+        Vec3 distc  =   p - s.center;
+        f32 sqrad       =   s.radius * s.radius;
+        return (sqrad > (distc | distc));
+    }
+
+    /// Two line segments, in 2D (ignore z)
+    inline bool Lineseg_Lineseg2D(const Lineseg& lineA, const Lineseg& lineB)
+    {
+        const float Epsilon = 0.0000001f;
+
+        Vec3 delta = lineB.start - lineA.start;
+
+        Vec3 dirA = lineA.end - lineA.start;
+        Vec3 dirB = lineB.end - lineB.start;
+
+        float det = dirA.x * dirB.y - dirA.y * dirB.x;
+        float detA = delta.x * dirB.y - delta.y * dirB.x;
+        float detB = delta.x * dirA.y - delta.y * dirA.x;
+
+        float absDet = fabs_tpl(det);
+
+        if (absDet >= Epsilon)
+        {
+            float invDet = 1.0f / det;
+
+            float a = detA * invDet;
+            float b = detB * invDet;
+
+            if ((a > 1.0f) || (a < 0.0f) || (b > 1.0f) || (b < 0.0f))
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+
+
+    /// Check if a point is within a polygon, in 2D (i.e. ignoring z coordinate)
+    /// The VecContainer should be a container of Vec3_tpl<F> such that we can traverse
+    /// it using iterators.
+    ///
+    /// This works by checking all the lines that start/end above/below the point
+    /// and counting how many have the point on the right/left side. If the
+    /// point is inside, then left/right counts should be odd - if outside then
+    /// even. If it's on the edge then this algorithm will return an arbitrary
+    /// result. This is basically the same as casting a ray horizontally and
+    /// counting the intersections.
+    /// Don't mess with putting tolerances etc in this code, or chaning the <
+    /// to <= etc in case you're worried about the "ray" going through a vertex.
+    /// the only issue is when the point is on the edge - if you're worried about
+    /// that then use the separate function that indicates if a point is within
+    /// a certain tolerance of an edge.
+    template<typename PtType, typename VecContainer>
+    inline bool Point_Polygon2D(const PtType& p, const VecContainer& polygon, const AABB* pAABBPolygon = 0)
+    {
+        if (pAABBPolygon && !Overlap::Point_AABB2D(p, *pAABBPolygon))
+        {
+            return false;
+        }
+
+        int count = 0;
+
+        typename VecContainer::const_iterator li, linext;
+        typename VecContainer::const_iterator liend = polygon.end();
+        for (li = polygon.begin(); li != liend; ++li)
+        {
+            linext = li;
+            ++linext;
+            if (linext == liend)
+            {
+                linext = polygon.begin();
+            }
+            const PtType& l0 = *li;
+            const PtType& l1 = *linext;
+
+            if ((((l1.y <= p.y) && (p.y < l0.y)) ||
+                 ((l0.y <= p.y) && (p.y < l1.y))) &&
+                (p.x < (l0.x - l1.x) * (p.y - l1.y) / (l0.y - l1.y) + l1.x))
+            {
+                count = !count;
+            }
+        }
+        return (0 != count);
+    }
+
+    template<typename PtType>
+    inline bool Point_Polygon2D(const PtType& p, const PtType* polygon, size_t vertexCount, const AABB* pAABBPolygon = 0)
+    {
+        if (pAABBPolygon && !Overlap::Point_AABB2D(p, *pAABBPolygon))
+        {
+            return false;
+        }
+
+        bool count = false;
+
+        for (size_t i = 0; i < vertexCount; ++i)
+        {
+            const PtType l0 = polygon[i % vertexCount];
+            const PtType l1 = polygon[(i + 1) % vertexCount];
+
+            if ((((l1.y <= p.y) && (p.y < l0.y)) ||
+                 ((l0.y <= p.y) && (p.y < l1.y))) &&
+                (p.x < (l0.x - l1.x) * (p.y - l1.y) / (l0.y - l1.y) + l1.x))
+            {
+                count = !count;
+            }
+        }
+
+        return count;
+    }
+
+
+    template<typename F, typename VecContainer>
+    inline bool Circle_Polygon2D(const Vec3_tpl<F>& p, F radius, const VecContainer& polygon)
+    {
+        if (Overlap::Point_Polygon2D(p, polygon))
+        {
+            return true;
+        }
+        typename VecContainer::const_iterator li, linext;
+        typename VecContainer::const_iterator liend = polygon.end();
+        for (li = polygon.begin(); li != liend; ++li)
+        {
+            linext = li;
+            ++linext;
+            if (linext == liend)
+            {
+                linext = polygon.begin();
+            }
+            const Vec3_tpl<F>& l0 = *li;
+            const Vec3_tpl<F>& l1 = *linext;
+            float junk;
+            if (Distance::Point_Lineseg2DSq(p, Lineseg(l0, l1), junk) < square(radius))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+    /// Checks if a line segment overlaps a polygon (defined by a container of sorted
+    /// points) in 2D (ignoring z). If you know the polygon AABB pass it in (z is ignored)
+    template<typename VecContainer>
+    inline bool Lineseg_Polygon2D(const Lineseg& lineseg,
+        const VecContainer& polygon,
+        const AABB* pAABBPolygon = 0)
+    {
+        if (pAABBPolygon && !Overlap::Lineseg_AABB2D(lineseg, *pAABBPolygon))
+        {
+            return false;
+        }
+
+        typename VecContainer::const_iterator it;
+        for (it = polygon.begin(); it != polygon.end(); ++it)
+        {
+            typename VecContainer::const_iterator itNext = it;
+            ++itNext;
+            if (itNext == polygon.end())
+            {
+                itNext = polygon.begin();
+            }
+
+            Lineseg polySeg(*it, *itNext);
+            if (Lineseg_Lineseg2D(lineseg, polySeg))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /// Checks for overlap of two polygons in 2D (ignoring z)
+    template<typename VecContainerA, typename VecContainerB>
+    inline bool Polygon_Polygon2D(const VecContainerA& polygonA, const VecContainerB& polygonB,
+        const AABB* pAABBA = 0, const AABB* pAABBB = 0)
+    {
+        const typename VecContainerA::const_iterator itEndA = polygonA.end();
+        const typename VecContainerB::const_iterator itEndB = polygonB.end();
+        typename VecContainerA::const_iterator itA;
+        typename VecContainerB::const_iterator itB;
+
+        AABB aabbA, aabbB;
+        if (!pAABBA)
+        {
+            pAABBA = &aabbA;
+            aabbA.Reset();
+            for (itA = polygonA.begin(); itA != itEndA; ++itA)
+            {
+                aabbA.Add(*itA);
+            }
+        }
+        if (!pAABBB)
+        {
+            pAABBB = &aabbB;
+            aabbB.Reset();
+            for (itB = polygonB.begin(); itB != itEndB; ++itB)
+            {
+                aabbB.Add(*itB);
+            }
+        }
+
+        // AABB
+        if (!Overlap::AABB_AABB2D(*pAABBA, *pAABBB))
+        {
+            return false;
+        }
+
+        // points of A in B
+        for (itA = polygonA.begin(); itA != itEndA; ++itA)
+        {
+            if (Point_Polygon2D(*itA, polygonB, pAABBB))
+            {
+                return true;
+            }
+        }
+        // points of B in A
+        for (itB = polygonB.begin(); itB != itEndB; ++itB)
+        {
+            if (Point_Polygon2D(*itB, polygonA, pAABBA))
+            {
+                return true;
+            }
+        }
+        // segments of one A against B
+        for (itA = polygonA.begin(); itA != itEndA; ++itA)
+        {
+            typename VecContainerA::const_iterator itNext = itA;
+            ++itNext;
+            if (itNext == itEndA)
+            {
+                itNext = polygonA.begin();
+            }
+            if (Lineseg_Polygon2D(Lineseg(*itA, *itNext), polygonB, pAABBB))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /// Checks if a triangle (defined by three vertices) overlaps a polygon (defined
+    /// by a container of sorted points), all in 2D only (ignoring z).
+    template<typename F, typename VecContainer>
+    inline bool Triangle_Polygon2D(const Vec3_tpl<F>& p0, const Vec3_tpl<F>& p1, const Vec3_tpl<F>& p2,
+        const VecContainer& polygon)
+    {
+        // Check for triangle points within the poly
+        if (Point_Polygon2D(p0, polygon))
+        {
+            return true;
+        }
+        if (Point_Polygon2D(p1, polygon))
+        {
+            return true;
+        }
+        if (Point_Polygon2D(p2, polygon))
+        {
+            return true;
+        }
+
+        // check the poly points against the triangle
+        static std::vector<Vec3> triangle;
+        triangle.clear();
+        triangle.push_back(p0);
+        triangle.push_back(p1);
+        triangle.push_back(p2);
+
+        typename VecContainer::const_iterator it;
+        for (it = polygon.begin(); it != polygon.end(); ++it)
+        {
+            if (Point_Polygon2D(*it, triangle))
+            {
+                return true;
+            }
+        }
+
+        // finally check the edges
+        if (Overlap::Lineseg_Polygon2D(Lineseg(p0, p1), polygon))
+        {
+            return true;
+        }
+        if (Overlap::Lineseg_Polygon2D(Lineseg(p1, p2), polygon))
+        {
+            return true;
+        }
+        if (Overlap::Lineseg_Polygon2D(Lineseg(p2, p0), polygon))
+        {
+            return true;
+        }
+        return false;
+    }
+
+    //-----------------------------------------------------------------------------------------
+
+
+    //! check if a Lineseg and a Sphere overlap
+    inline bool Lineseg_Sphere(const Lineseg& ls, const ::Sphere& s)
+    {
+        float radius2 = s.radius * s.radius;
+
+        //check if one of the two edpoints of the line is inside the sphere
+        Vec3 diff = ls.end - s.center;
+        if (diff.x * diff.x + diff.y * diff.y + diff.z * diff.z <= radius2)
+        {
+            return true;
+        }
+
+        Vec3 AC = s.center - ls.start;
+        if (AC.x * AC.x + AC.y * AC.y + AC.z * AC.z <= radius2)
+        {
+            return true;
+        }
+
+        //check distance from the sphere to the line
+        Vec3 AB = ls.end - ls.start;
+
+        float r = (AC.x * AB.x + AC.y * AB.y + AC.z * AB.z) / (AB.x * AB.x + AB.y * AB.y + AB.z * AB.z);
+
+        //projection falls outside the line
+        if (r < 0 || r > 1)
+        {
+            return false;
+        }
+
+        //check if the distance from the line to the center of the sphere is less than radius
+        Vec3 point = ls.start + r * AB;
+        if ((point.x - s.center.x) * (point.x - s.center.x) + (point.y - s.center.y) * (point.y - s.center.y) + (point.z - s.center.z) * (point.z - s.center.z) > radius2)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+
+    /*!
+    * we use the SEPARATING AXIS TEST to check if a Linesegment overlap an AABB.
+    *
+    * Example:
+    *  bool result=Overlap::Lineseg_AABB( ls, pos,aabb );
+    */
+    inline bool Lineseg_AABB (const Lineseg& ls, const AABB& aabb)
+    {
+        //calculate the half-length-vectors of the AABB
+        Vec3 h  =   (aabb.max - aabb.min) * 0.5f;
+        //"t" is the transfer-vector from one center to the other
+        Vec3 t      = (ls.start + ls.end) * 0.5f - (aabb.max + aabb.min) * 0.5f;
+        //calculate line-direction
+        Vec3 ld  =  (ls.end - ls.start) * 0.5f;
+        if (fabsf(t.x) > (h.x + fabsf(ld.x)))
+        {
+            return 0;
+        }
+        if (fabsf(t.y) > (h.y + fabsf(ld.y)))
+        {
+            return 0;
+        }
+        if (fabsf(t.z) > (h.z + fabsf(ld.z)))
+        {
+            return 0;
+        }
+        if (fabsf(t.z * ld.y - t.y * ld.z) > (fabsf(h.y * ld.z) + fabsf(h.z * ld.y)))
+        {
+            return 0;
+        }
+        if (fabsf(t.x * ld.z - t.z * ld.x) > (fabsf(h.x * ld.z) + fabsf(h.z * ld.x)))
+        {
+            return 0;
+        }
+        if (fabsf(t.y * ld.x - t.x * ld.y) > (fabsf(h.x * ld.y) + fabsf(h.y * ld.x)))
+        {
+            return 0;
+        }
+        return 1; //no separating axis found, objects overlap
+    }
+
+    /// 2D seaparating axis test - ignores z
+    inline bool Lineseg_AABB2D (const Lineseg& ls, const AABB& aabb)
+    {
+        //calculate the half-length-vectors of the AABB
+        Vec3 h  =   (aabb.max - aabb.min) * 0.5f;
+        //"t" is the transfer-vector from one center to the other
+        Vec3 t      = (ls.start + ls.end) * 0.5f - (aabb.max + aabb.min) * 0.5f;
+        //calculate line-direction
+        Vec3 ld  =  (ls.end - ls.start) * 0.5f;
+        if (fabsf(t.x) > (h.x + fabsf(ld.x)))
+        {
+            return 0;
+        }
+        if (fabsf(t.y) > (h.y + fabsf(ld.y)))
+        {
+            return 0;
+        }
+        if (fabsf(t.y * ld.x - t.x * ld.y) > (fabsf(h.x * ld.y) + fabsf(h.y * ld.x)))
+        {
+            return 0;
+        }
+        return 1; //no separating axis found, objects overlap
+    }
+
+
+
+    /*!
+    * we use the SEPARATING AXIS TEST to check if two OBB's overlap.
+    *
+    * Example:
+    *  bool result=Overlap::Lineseg_OBB( lineseg, pos,obb );
+    */
+    inline bool Lineseg_OBB (const Lineseg& ls, const Vec3& pos, const OBB& obb)
+    {
+        //the new center-position of Lineseg and OBB in world-space
+        Vec3 wposobb    =   obb.m33 * obb.c + pos;
+        Vec3 wposls =   (ls.start + ls.end) * 0.5f;
+        //"t" is the transfer-vector from one center to the other
+        Vec3 t      = (wposls - wposobb) * obb.m33;
+        //calculate line-direction in local obb-space
+        Vec3 ld  =  ((ls.end - ls.start) * obb.m33) * 0.5f;
+        if (fabsf(t.x) > (obb.h.x + fabsf(ld.x)))
+        {
+            return 0;
+        }
+        if (fabsf(t.y) > (obb.h.y + fabsf(ld.y)))
+        {
+            return 0;
+        }
+        if (fabsf(t.z) > (obb.h.z + fabsf(ld.z)))
+        {
+            return 0;
+        }
+        if (fabsf(t.z * ld.y - t.y * ld.z) > (fabsf(obb.h.y * ld.z) + fabsf(obb.h.z * ld.y)))
+        {
+            return 0;
+        }
+        if (fabsf(t.x * ld.z - t.z * ld.x) > (fabsf(obb.h.x * ld.z) + fabsf(obb.h.z * ld.x)))
+        {
+            return 0;
+        }
+        if (fabsf(t.y * ld.x - t.x * ld.y) > (fabsf(obb.h.x * ld.y) + fabsf(obb.h.y * ld.x)))
+        {
+            return 0;
+        }
+        return 1; //no separating axis found, objects overlap
+    }
+
+
+
+
+    /*!
+    *
+    * overlap-test between a line and a triangle.
+    * IMPORTANT: this is a single-sided test. That means its not enough
+    * that the triangle and line overlap, its also important that the triangle
+    * is "visible" when you are looking along the line-direction.
+    *
+    * If you need a double-sided test, you'll have to call this function twice with
+    * reversed order of triangle vertices.
+    *
+    * return values
+    * return "true" if line and triangle overlap.
+    *
+    */
+    inline bool Line_Triangle(const Line& line, const Vec3& v0, const Vec3& v1, const Vec3& v2)
+    {
+        const float Epsilon = 0.0000001f;
+
+        Vec3 edgeA = v1 - v0;
+        Vec3 edgeB = v2 - v0;
+
+        Vec3 dir = line.direction;
+
+        Vec3 p = dir.Cross(edgeA);
+        Vec3 t = line.pointonline - v0;
+        Vec3 q = t.Cross(edgeB);
+
+        float dot = edgeB.Dot(p);
+
+        float u = t.Dot(p);
+        float v = dir.Dot(q);
+
+        float DotGreaterThanEpsilon = dot - Epsilon;
+        float VGreaterEqualThanZero = v;
+        float UGreaterEqualThanZero = u;
+        float UVLessThanDot = dot - (u + v);
+        float ULessThanDot = dot - u;
+
+        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
+        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
+        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
+        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
+
+        return AllGood >= 0.0f;
+    }
+
+
+    /*!
+    *
+    * overlap-test between a ray and a triangle.
+    * IMPORTANT: this is a single-sided test. That means its not sufficient
+    * that the triangle and ray overlap, its also important that the triangle
+    * is "visible" when you are looking from the origin along the ray-direction.
+    *
+    * If you need a double-sided test, you'll have to call this function twice with
+    * reversed order of triangle vertices.
+    *
+    * return values
+    * return "true" if ray and triangle overlap.
+    */
+    inline bool Ray_Triangle(const Ray& ray, const Vec3& v0, const Vec3& v1, const Vec3& v2)
+    {
+        const float Epsilon = 0.0000001f;
+
+        Vec3 edgeA = v1 - v0;
+        Vec3 edgeB = v2 - v0;
+
+        Vec3 dir = ray.direction;
+
+        Vec3 p = dir.Cross(edgeA);
+        Vec3 t = ray.origin - v0;
+        Vec3 q = t.Cross(edgeB);
+
+        float dot = edgeB.Dot(p);
+
+        float u = t.Dot(p);
+        float v = dir.Dot(q);
+
+        float DotGreaterThanEpsilon = dot - Epsilon;
+        float VGreaterEqualThanZero = v;
+        float UGreaterEqualThanZero = u;
+        float UVLessThanDot = dot - (u + v);
+        float ULessThanDot = dot - u;
+
+        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
+        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
+        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
+        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
+
+        if (AllGood < 0.0f)
+        {
+            return false;
+        }
+
+        float dt = edgeA.Dot(q) / dot;
+
+        Vec3 result = (dir * dt) + ray.origin;
+
+        float AfterStart = (result - ray.origin).Dot(dir);
+
+        return AfterStart >= 0.0f;
+    }
+
+    /*!
+    *
+    * overlap-test between line-segment and a triangle.
+    * IMPORTANT: this is a single-sided test. That means its not sufficient
+    * that the triangle and line-segment overlap, its also important that the triangle
+    * is "visible" when you are looking along the linesegment from "start" to "end".
+    *
+    * If you need a double-sided test, you'll have to call this function twice with
+    * reversed order of triangle vertices.
+    *
+    * return values
+    * return "true" if linesegment and triangle overlap.
+    */
+    inline bool Lineseg_Triangle(const Lineseg& lineseg, const Vec3& v0, const Vec3& v1, const Vec3& v2)
+    {
+        const float Epsilon = 0.0000001f;
+
+        Vec3 edgeA = v1 - v0;
+        Vec3 edgeB = v2 - v0;
+
+        Vec3 dir = lineseg.end - lineseg.start;
+
+        Vec3 p = dir.Cross(edgeA);
+        Vec3 t = lineseg.start - v0;
+        Vec3 q = t.Cross(edgeB);
+
+        float dot = edgeB.Dot(p);
+
+        float u = t.Dot(p);
+        float v = dir.Dot(q);
+
+        float DotGreaterThanEpsilon = dot - Epsilon;
+        float VGreaterEqualThanZero = v;
+        float UGreaterEqualThanZero = u;
+        float UVLessThanDot = dot - (u + v);
+        float ULessThanDot = dot - u;
+
+        float UVGreaterEqualThanZero = (float)fsel(VGreaterEqualThanZero, UGreaterEqualThanZero, VGreaterEqualThanZero);
+        float UUVLessThanDot = (float)fsel(UVLessThanDot, ULessThanDot, UVLessThanDot);
+        float BothGood = (float)fsel(UVGreaterEqualThanZero, UUVLessThanDot, UVGreaterEqualThanZero);
+        float AllGood = (float)fsel(DotGreaterThanEpsilon, BothGood, DotGreaterThanEpsilon);
+
+        if (AllGood < 0.0f)
+        {
+            return false;
+        }
+
+        float dt = edgeA.Dot(q) / dot;
+
+        Vec3 result = (dir * dt) + lineseg.start;
+
+        float AfterStart = (result - lineseg.start).Dot(dir);
+        float BeforeEnd = -(result - lineseg.end).Dot(dir);
+        float Within = (float)fsel(AfterStart, BeforeEnd, AfterStart);
+
+        return Within >= 0.0f;
+    }
+
+    /*----------------------------------------------------------------------------------
+    * Sphere_AABB
+    *   Sphere and AABB are assumed to be in the same space
+    *
+    * Example:
+    *  bool result=Overlap::Sphere_AABB_Inside( sphere, aabb );
+    *
+    * 0 = no overlap
+    * 1 = overlap
+    *----------------------------------------------------------------------------------*/
+    ILINE bool Sphere_AABB(const ::Sphere& s, const AABB& aabb)
+    {
+        Vec3 center(s.center);
+
+        Vec3 aabb_min(aabb.min);
+        Vec3 aabb_max(aabb.max);
+
+        float radiusSq = s.radius * s.radius;
+
+        float x = (float)fsel(aabb_min.x - center.x, center.x - aabb_min.x, fsel(center.x - aabb_max.x, center.x - aabb_max.x, 0.0f));
+        float y = (float)fsel(aabb_min.y - center.y, center.y - aabb_min.y, fsel(center.y - aabb_max.y, center.y - aabb_max.y, 0.0f));
+        float z = (float)fsel(aabb_min.z - center.z, center.z - aabb_min.z, fsel(center.z - aabb_max.z, center.z - aabb_max.z, 0.0f));
+
+        return (x * x + y * y + z * z) < radiusSq;
+    }
+
+    // As Sphere_AABB but ignores z parts
+    ILINE bool Sphere_AABB2D(const ::Sphere& s, const AABB& aabb)
+    {
+        Vec3 center(s.center);
+
+        Vec3 aabb_min(aabb.min);
+        Vec3 aabb_max(aabb.max);
+
+        float radiusSq = s.radius * s.radius;
+
+        float x = (float)fsel(aabb_min.x - center.x, center.x - aabb_min.x, fsel(center.x - aabb_max.x, center.x - aabb_max.x, 0.0f));
+        float y = (float)fsel(aabb_min.y - center.y, center.y - aabb_min.y, fsel(center.y - aabb_max.y, center.y - aabb_max.y, 0.0f));
+
+        return (x * x + y * y) < radiusSq;
+    }
+
+
+    /*!
+    *
+    * conventional method to check if a Sphere and an AABB overlap,
+    * or if the Sphere is completely inside the AABB.
+    *   Sphere and AABB are assumed to be in the same space
+    *
+    * Example:
+    *  bool result=Overlap::Sphere_AABB_Inside( sphere, aabb );
+    *
+    * return values:
+    * 0x00 = no overlap
+    * 0x01 = Sphere and AABB overlap
+    * 0x02 = Sphere in inside AABB
+    */
+    ILINE char Sphere_AABB_Inside(const ::Sphere& s, const AABB& aabb)
+    {
+        if (Sphere_AABB(s, aabb))
+        {
+            Vec3 amin = aabb.min - s.center;
+            Vec3 amax = aabb.max - s.center;
+            if  (amin.x >= (-s.radius))
+            {
+                return 1;
+            }
+            if  (amin.y >= (-s.radius))
+            {
+                return 1;
+            }
+            if  (amin.z >= (-s.radius))
+            {
+                return 1;
+            }
+            if  (amax.x <= (+s.radius))
+            {
+                return 1;
+            }
+            if  (amax.y <= (+s.radius))
+            {
+                return 1;
+            }
+            if  (amax.z <= (+s.radius))
+            {
+                return 1;
+            }
+            //yes, its inside
+            return 2;
+        }
+        return 0;
+    }
+
+    //----------------------------------------------------------------------------------
+    //  Sphere_OBB
+    //  VERY IMPORTANT: Sphere is assumed to be in the space of the OBB, otherwise it won't work
+    //
+    //--- 0 = no overlap                                     ---------------------------
+    //--- 1 = overlap                                                  -----------------
+    //----------------------------------------------------------------------------------
+    inline bool Sphere_OBB(const ::Sphere& s, const OBB& obb)
+    {
+        //first we transform the sphere-center into the AABB-space of the OBB
+        Vec3 SphereInOBBSpace   =   s.center * obb.m33;
+        //the rest ist the same as the "Overlap::Sphere_AABB" calculation
+        float quatradius = s.radius * s.radius;
+        Vec3 quat(0, 0, 0);
+        AABB aabb = AABB(obb.c - obb.h, obb.c + obb.h);
+        if (SphereInOBBSpace.x < aabb.min.x)
+        {
+            quat.x = SphereInOBBSpace.x - aabb.min.x;
+        }
+        else if (SphereInOBBSpace.x > aabb.max.x)
+        {
+            quat.x = SphereInOBBSpace.x - aabb.max.x;
+        }
+        if (SphereInOBBSpace.y < aabb.min.y)
+        {
+            quat.y = SphereInOBBSpace.y - aabb.min.y;
+        }
+        else if (SphereInOBBSpace.y > aabb.max.y)
+        {
+            quat.y = SphereInOBBSpace.y - aabb.max.y;
+        }
+        if (SphereInOBBSpace.z < aabb.min.z)
+        {
+            quat.z = SphereInOBBSpace.z - aabb.min.z;
+        }
+        else if (SphereInOBBSpace.z > aabb.max.z)
+        {
+            quat.z = SphereInOBBSpace.z - aabb.max.z;
+        }
+        return((quat | quat) < quatradius);
+    }
+
+
+    //----------------------------------------------------------------------------------
+    //  Sphere_Sphere overlap test
+    //
+    //--- 0 = no overlap                                     ---------------------------
+    //--- 1 = overlap                                                  -----------------
+    //----------------------------------------------------------------------------------
+    inline bool Sphere_Sphere(const ::Sphere& s1, const ::Sphere& s2)
+    {
+        Vec3 distc  =   s1.center - s2.center;
+        f32 sqrad       =   (s1.radius + s2.radius) * (s1.radius + s2.radius);
+        return (sqrad > (distc | distc));
+    }
+
+    ILINE bool HWVSphere_HWVSphere(const HWVSphere& s1, const HWVSphere& s2)
+    {
+        simdf fTotalRadius = SIMDFAdd(s1.radius, s2.radius);
+        hwvec3 distc = HWVSub(s1.center, s2.center);
+        simdf fTotalRadiusSqr = SIMDFMult(fTotalRadius, fTotalRadius);
+        simdf fDistanceSqr = HWV3Dot(distc, distc);
+        return SIMDFLessThanEqualB(fDistanceSqr, fTotalRadiusSqr);
+    }
+
+    //----------------------------------------------------------------------------------
+    //  Sphere_Triangle overlap test
+    //
+    //--- 0 = no overlap                                     ---------------------------
+    //--- 1 = overlap                                                  -----------------
+    //----------------------------------------------------------------------------------
+    template<typename F>
+    ILINE bool Sphere_Triangle(const ::Sphere& s, const Triangle_tpl<F>& t)
+    {
+        //create a "bouding sphere" around triangle for fast rejection test
+        Vec3_tpl<F> middle = (t.v0 + t.v1 + t.v2) * (1 / 3.0f);
+        Vec3_tpl<F> ov0 = t.v0 - middle;
+        Vec3_tpl<F> ov1 = t.v1 - middle;
+        Vec3_tpl<F> ov2 = t.v2 - middle;
+        F SqRad0 = (ov0 | ov0);
+        F SqRad1 = (ov1 | ov1);
+        F SqRad2 = (ov2 | ov2);
+
+        SqRad0 = (F)fsel(SqRad0 - SqRad1, SqRad0, SqRad1);
+        SqRad0 = (F)fsel(SqRad0 - SqRad2, SqRad0, SqRad2);
+
+        //first simple rejection-test...
+        if (Sphere_Sphere(s, ::Sphere(middle, sqrt_tpl(SqRad0))) == 0)
+        {
+            return 0;                                                        //overlap not possible
+        }
+        //...and now the hardcore-test!
+        if ((s.radius * s.radius) < Distance::Point_TriangleSq(s.center, t))
+        {
+            return 0;
+        }
+        return 1; //sphere and triangle are overlapping
+    }
+
+    ILINE bool HWVSphere_TriangleFromPoints(const HWVSphere& s, const hwvec3& t0, const hwvec3& t1, const hwvec3& t2)
+    {
+        //create a "bounding sphere" around triangle for fast rejection test
+        SIMDFConstant(fOneThird, 1.0f / 3.0f);
+
+        hwvec3 middle = HWVMultiplySIMDF(HWVAdd(t0, HWVAdd(t1, t2)), fOneThird);
+
+        hwvec3 ov0 = HWVSub(t0, middle);
+        hwvec3 ov1 = HWVSub(t1, middle);
+        hwvec3 ov2 = HWVSub(t2, middle);
+
+        simdf SqRad0 = HWV3Dot(ov0, ov0);
+        simdf SqRad1 = HWV3Dot(ov1, ov1);
+        simdf SqRad2 = HWV3Dot(ov2, ov2);
+
+        SqRad0 = SIMDFMax(SqRad0, SqRad1);
+        SqRad0 = SIMDFMax(SqRad0, SqRad2);
+
+        //first simple rejection-test...
+        //if( HWVSphere_HWVSphere(s, HWVSphere(middle, SIMDFSqrtEstFast(SqRad0)))==0 )
+        if (HWVSphere_HWVSphere(s, HWVSphere(middle, SIMDFSqrtEst(SqRad0))) == 0)
+        {
+            return 0; //overlap not possible
+        }
+        else
+        {
+            //...and now the hardcore-test!
+            simdf fRadiusSq = SIMDFMult(s.radius, s.radius);
+            simdf fDistToTriangleSq = Distance::Point_TriangleByPointsSq(s.center, t0, t1, t2);
+
+            return SIMDFLessThanEqualB(fDistToTriangleSq, fRadiusSq);
+        }
+    }
+
+    /*!
+    *
+    * we use the SEPARATING AXIS TEST to check if a triangle and AABB overlap.
+    *
+    * Example:
+    *  bool result=Overlap::AABB_Triangle( pos,aabb, tv0,tv1,tv2 );
+    *
+    */
+    inline bool AABB_Triangle (const AABB& aabb,  const Vec3& tv0, const Vec3& tv1, const Vec3& tv2)
+    {
+        //------ convert AABB into half-length AABB -----------
+        Vec3 h  =   (aabb.max - aabb.min) * 0.5f;   //calculate the half-length-vectors
+        Vec3 c  =   (aabb.max + aabb.min) * 0.5f;   //the center is relative to the PIVOT
+
+        //move everything so that the boxcenter is in (0,0,0)
+        Vec3 v0 =   tv0 - c;
+        Vec3 v1 =   tv1 - c;
+        Vec3 v2 =   tv2 - c;
+
+        //compute triangle edges
+        Vec3 e0 =   v1 - v0;
+        Vec3 e1 =   v2 - v1;
+        Vec3 e2 =   v0 - v2;
+
+        //--------------------------------------------------------------------------------------
+        //    use SEPARATING AXIS THEOREM to test overlap  between AABB and triangle
+        //    cross-product(edge from triangle, {x,y,z}-direction),  this are 3x3=9 tests
+        //--------------------------------------------------------------------------------------
+        float min, max, p0, p1, p2, rad, fex, fey, fez;
+        fex = fabsf(e0.x);
+        fey = fabsf(e0.y);
+        fez = fabsf(e0.z);
+
+        //AXISTEST_X01(e0.z, e0.y, fez, fey);
+        p0 = e0.z * v0.y - e0.y * v0.z;
+        p2 = e0.z * v2.y - e0.y * v2.z;
+        if (p0 < p2)
+        {
+            min = p0;
+            max = p2;
+        }
+        else
+        {
+            min = p2;
+            max = p0;
+        }
+        rad = fez * h.y + fey * h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Y02(e0.z, e0.x, fez, fex);
+        p0 = -e0.z * v0.x + e0.x * v0.z;
+        p2 = -e0.z * v2.x + e0.x * v2.z;
+        if (p0 < p2)
+        {
+            min = p0;
+            max = p2;
+        }
+        else
+        {
+            min = p2;
+            max = p0;
+        }
+        rad = fez * h.x + fex * h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Z12(e0.y, e0.x, fey, fex);
+        p1 = e0.y * v1.x - e0.x * v1.y;
+        p2 = e0.y * v2.x - e0.x * v2.y;
+        if (p2 < p1)
+        {
+            min = p2;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p2;
+        }
+        rad = fey * h.x + fex * h.y;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //-----------------------------------------------
+
+        fex = fabsf(e1.x);
+        fey = fabsf(e1.y);
+        fez = fabsf(e1.z);
+        //AXISTEST_X01(e1.z, e1.y, fez, fey);
+        p0 = e1.z * v0.y - e1.y * v0.z;
+        p2 = e1.z * v2.y - e1.y * v2.z;
+        if (p0 < p2)
+        {
+            min = p0;
+            max = p2;
+        }
+        else
+        {
+            min = p2;
+            max = p0;
+        }
+        rad = fez * h.y + fey * h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Y02(e1.z, e1.x, fez, fex);
+        p0 = -e1.z * v0.x + e1.x * v0.z;
+        p2 = -e1.z * v2.x + e1.x * v2.z;
+        if (p0 < p2)
+        {
+            min = p0;
+            max = p2;
+        }
+        else
+        {
+            min = p2;
+            max = p0;
+        }
+        rad = fez * h.x + fex * h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Z0(e1.y, e1.x, fey, fex);
+        p0 = e1.y * v0.x - e1.x * v0.y;
+        p1 = e1.y * v1.x - e1.x * v1.y;
+        if (p0 < p1)
+        {
+            min = p0;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p0;
+        }
+        rad = fey * h.x + fex * h.y;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //-----------------------------------------------
+
+        fex = fabsf(e2.x);
+        fey = fabsf(e2.y);
+        fez = fabsf(e2.z);
+        //AXISTEST_X2(e2.z, e2.y, fez, fey);
+        p0 = e2.z * v0.y - e2.y * v0.z;
+        p1 = e2.z * v1.y - e2.y * v1.z;
+        if (p0 < p1)
+        {
+            min = p0;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p0;
+        }
+        rad = fez * h.y + fey * h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Y1(e2.z, e2.x, fez, fex);
+        p0 = -e2.z * v0.x + e2.x * v0.z;
+        p1 = -e2.z * v1.x + e2.x * v1.z;
+        if (p0 < p1)
+        {
+            min = p0;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p0;
+        }
+        rad = fez * h.x + fex * h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Z12(e2.y, e2.x, fey, fex);
+        p1 = e2.y * v1.x - e2.x * v1.y;
+        p2 = e2.y * v2.x - e2.x * v2.y;
+        if (p2 < p1)
+        {
+            min = p2;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p2;
+        }
+        rad = fey * h.x + fex * h.y;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //the {x,y,z}-directions (actually, since we use the AABB of the triangle we don't even need to test these)
+        //first test overlap in the {x,y,z}-directions
+        //find min, max of the triangle each direction, and test for overlap in that direction --
+        //this is equivalent to testing a minimal AABB around the triangle against the AABB
+        AABB taabb;
+        FINDMINMAX(v0.x, v1.x, v2.x, taabb.min.x, taabb.max.x);
+        FINDMINMAX(v0.y, v1.y, v2.y, taabb.min.y, taabb.max.y);
+        FINDMINMAX(v0.z, v1.z, v2.z, taabb.min.z, taabb.max.z);
+
+        //test in X-direction
+        FINDMINMAX(v0.x, v1.x, v2.x, taabb.min.x, taabb.max.x);
+        if (taabb.min.x > h.x || taabb.max.x < -h.x)
+        {
+            return 0;
+        }
+
+        //test in Y-direction
+        FINDMINMAX(v0.y, v1.y, v2.y, taabb.min.y, taabb.max.y);
+        if (taabb.min.y > h.y || taabb.max.y < -h.y)
+        {
+            return 0;
+        }
+
+        //test in Z-direction
+        FINDMINMAX(v0.z, v1.z, v2.z, taabb.min.z, taabb.max.z);
+        if (taabb.min.z > h.z || taabb.max.z < -h.z)
+        {
+            return 0;
+        }
+
+        //test if the box intersects the plane of the triangle
+        //compute plane equation of triangle: normal*x+d=0
+        Plane_tpl<f32> plane = Plane_tpl<f32>::CreatePlane((e0 % e1), v0);
+
+        Vec3 vmin, vmax;
+        if (plane.n.x > 0.0f)
+        {
+            vmin.x = -h.x;
+            vmax.x = +h.x;
+        }
+        else
+        {
+            vmin.x = +h.x;
+            vmax.x = -h.x;
+        }
+        if (plane.n.y > 0.0f)
+        {
+            vmin.y = -h.y;
+            vmax.y = +h.y;
+        }
+        else
+        {
+            vmin.y = +h.y;
+            vmax.y = -h.y;
+        }
+        if (plane.n.z > 0.0f)
+        {
+            vmin.z = -h.z;
+            vmax.z = +h.z;
+        }
+        else
+        {
+            vmin.z = +h.z;
+            vmax.z = -h.z;
+        }
+        if ((plane | vmin) > 0.0f)
+        {
+            return 0;
+        }
+        if ((plane | vmax) < 0.0f)
+        {
+            return 0;
+        }
+        return 1;
+    }
+
+
+
+    /*!
+    *
+    * we use the SEPARATING AXIS TEST to check if a triangle and an OBB overlaps.
+    *
+    * Example:
+    *  bool result=Overlap::OBB_Trinagle( pos1,obb1, tv0,tv1,tv2 );
+    *
+    */
+    inline bool OBB_Triangle(const Vec3& pos, const OBB& obb,  const Vec3& tv0, const Vec3& tv1, const Vec3& tv2)
+    {
+        Vec3 p  =   obb.m33 * obb.c + pos;                                    //the new center-position in world-space
+
+        //move everything so that the boxcenter is in (0,0,0)
+        Vec3 v0 =   (tv0 - p) * obb.m33; //pre-transform
+        Vec3 v1 =   (tv1 - p) * obb.m33; //pre-transform
+        Vec3 v2 =   (tv2 - p) * obb.m33; //pre-transform
+
+
+        //compute triangle edges
+        Vec3 e0 =   v1 - v0;
+        Vec3 e1 =   v2 - v1;
+        Vec3 e2 =   v0 - v2;
+
+        //--------------------------------------------------------------------------------------
+        //    use SEPARATING AXIS THEOREM to test intersection between AABB and triangle
+        //    cross-product(edge from triangle, {x,y,z}-direction),  this are 3x3=9 tests
+        //--------------------------------------------------------------------------------------
+        float min, max, p0, p1, p2, rad, fex, fey, fez;
+        fex = fabsf(e0.x);
+        fey = fabsf(e0.y);
+        fez = fabsf(e0.z);
+
+        //AXISTEST_X01(e0.z, e0.y, fez, fey);
+        p0 = e0.z * v0.y - e0.y * v0.z;
+        p2 = e0.z * v2.y - e0.y * v2.z;
+        if (p0 < p2)
+        {
+            min = p0;
+            max = p2;
+        }
+        else
+        {
+            min = p2;
+            max = p0;
+        }
+        rad = fez * obb.h.y + fey * obb.h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Y02(e0.z, e0.x, fez, fex);
+        p0 = -e0.z * v0.x + e0.x * v0.z;
+        p2 = -e0.z * v2.x + e0.x * v2.z;
+        if (p0 < p2)
+        {
+            min = p0;
+            max = p2;
+        }
+        else
+        {
+            min = p2;
+            max = p0;
+        }
+        rad = fez * obb.h.x + fex * obb.h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Z12(e0.y, e0.x, fey, fex);
+        p1 = e0.y * v1.x - e0.x * v1.y;
+        p2 = e0.y * v2.x - e0.x * v2.y;
+        if (p2 < p1)
+        {
+            min = p2;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p2;
+        }
+        rad = fey * obb.h.x + fex * obb.h.y;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //-----------------------------------------------
+
+        fex = fabsf(e1.x);
+        fey = fabsf(e1.y);
+        fez = fabsf(e1.z);
+        //AXISTEST_X01(e1.z, e1.y, fez, fey);
+        p0 = e1.z * v0.y - e1.y * v0.z;
+        p2 = e1.z * v2.y - e1.y * v2.z;
+        if (p0 < p2)
+        {
+            min = p0;
+            max = p2;
+        }
+        else
+        {
+            min = p2;
+            max = p0;
+        }
+        rad = fez * obb.h.y + fey * obb.h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Y02(e1.z, e1.x, fez, fex);
+        p0 = -e1.z * v0.x + e1.x * v0.z;
+        p2 = -e1.z * v2.x + e1.x * v2.z;
+        if (p0 < p2)
+        {
+            min = p0;
+            max = p2;
+        }
+        else
+        {
+            min = p2;
+            max = p0;
+        }
+        rad = fez * obb.h.x + fex * obb.h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Z0(e1.y, e1.x, fey, fex);
+        p0 = e1.y * v0.x - e1.x * v0.y;
+        p1 = e1.y * v1.x - e1.x * v1.y;
+        if (p0 < p1)
+        {
+            min = p0;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p0;
+        }
+        rad = fey * obb.h.x + fex * obb.h.y;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //-----------------------------------------------
+
+        fex = fabsf(e2.x);
+        fey = fabsf(e2.y);
+        fez = fabsf(e2.z);
+        //AXISTEST_X2(e2.z, e2.y, fez, fey);
+        p0 = e2.z * v0.y - e2.y * v0.z;
+        p1 = e2.z * v1.y - e2.y * v1.z;
+        if (p0 < p1)
+        {
+            min = p0;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p0;
+        }
+        rad = fez * obb.h.y + fey * obb.h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Y1(e2.z, e2.x, fez, fex);
+        p0 = -e2.z * v0.x + e2.x * v0.z;
+        p1 = -e2.z * v1.x + e2.x * v1.z;
+        if (p0 < p1)
+        {
+            min = p0;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p0;
+        }
+        rad = fez * obb.h.x + fex * obb.h.z;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //AXISTEST_Z12(e2.y, e2.x, fey, fex);
+        p1 = e2.y * v1.x - e2.x * v1.y;
+        p2 = e2.y * v2.x - e2.x * v2.y;
+        if (p2 < p1)
+        {
+            min = p2;
+            max = p1;
+        }
+        else
+        {
+            min = p1;
+            max = p2;
+        }
+        rad = fey * obb.h.x + fex * obb.h.y;
+        if (min > rad || max < -rad)
+        {
+            return 0;
+        }
+
+        //the {x,y,z}-directions (actually, since we use the AABB of the triangle we don't even need to test these)
+        //first test overlap in the {x,y,z}-directions
+        //find min, max of the triangle each direction, and test for overlap in that direction --
+        //this is equivalent to testing a minimal AABB around the triangle against the AABB
+        AABB taabb;
+        FINDMINMAX(v0.x, v1.x, v2.x, taabb.min.x, taabb.max.x);
+        FINDMINMAX(v0.y, v1.y, v2.y, taabb.min.y, taabb.max.y);
+        FINDMINMAX(v0.z, v1.z, v2.z, taabb.min.z, taabb.max.z);
+
+        // test in X-direction
+        FINDMINMAX(v0.x, v1.x, v2.x, taabb.min.x, taabb.max.x);
+        if (taabb.min.x > obb.h.x || taabb.max.x < -obb.h.x)
+        {
+            return 0;
+        }
+
+        // test in Y-direction
+        FINDMINMAX(v0.y, v1.y, v2.y, taabb.min.y, taabb.max.y);
+        if (taabb.min.y > obb.h.y || taabb.max.y < -obb.h.y)
+        {
+            return 0;
+        }
+
+        // test in Z-direction
+        FINDMINMAX(v0.z, v1.z, v2.z, taabb.min.z, taabb.max.z);
+        if (taabb.min.z > obb.h.z || taabb.max.z < -obb.h.z)
+        {
+            return 0;
+        }
+
+        //test if the box overlaps the plane of the triangle
+        //compute plane equation of triangle: normal*x+d=0
+        Plane_tpl<f32> plane = Plane_tpl<f32>::CreatePlane((e0 % e1), v0);
+
+        Vec3 vmin, vmax;
+        if (plane.n.x > 0.0f)
+        {
+            vmin.x = -obb.h.x;
+            vmax.x = +obb.h.x;
+        }
+        else
+        {
+            vmin.x = +obb.h.x;
+            vmax.x = -obb.h.x;
+        }
+        if (plane.n.y > 0.0f)
+        {
+            vmin.y = -obb.h.y;
+            vmax.y = +obb.h.y;
+        }
+        else
+        {
+            vmin.y = +obb.h.y;
+            vmax.y = -obb.h.y;
+        }
+        if (plane.n.z > 0.0f)
+        {
+            vmin.z = -obb.h.z;
+            vmax.z = +obb.h.z;
+        }
+        else
+        {
+            vmin.z = +obb.h.z;
+            vmax.z = -obb.h.z;
+        }
+        if ((plane | vmin) > 0.0f)
+        {
+            return 0;
+        }
+        if ((plane | vmax) < 0.0f)
+        {
+            return 0;
+        }
+        return 1;
+    }
+
+
+
+
+
+
+
+
+
+    /*!
+    *
+    * conventional method to check if two AABB's overlap.
+    * both AABBs are assumed to be in the same space
+    *
+    * Example:
+    *  bool result=Overlap::AABB_AABB( aabb1, aabb2 );
+    *
+    */
+    ILINE bool AABB_AABB(const AABB& aabb1, const AABB& aabb2)
+    {
+        if  (aabb1.min.x >= aabb2.max.x)
+        {
+            return 0;
+        }
+        if  (aabb1.min.y >= aabb2.max.y)
+        {
+            return 0;
+        }
+        if  (aabb1.min.z >= aabb2.max.z)
+        {
+            return 0;
+        }
+        if  (aabb1.max.x <= aabb2.min.x)
+        {
+            return 0;
+        }
+        if  (aabb1.max.y <= aabb2.min.y)
+        {
+            return 0;
+        }
+        if  (aabb1.max.z <= aabb2.min.z)
+        {
+            return 0;
+        }
+        return 1; //the aabb's overlap
+    }
+
+    /// AABB overlap test - but ignores z values
+    ILINE bool AABB_AABB2D(const AABB& aabb1, const AABB& aabb2)
+    {
+        if  (aabb1.min.x >= aabb2.max.x)
+        {
+            return 0;
+        }
+        if  (aabb1.min.y >= aabb2.max.y)
+        {
+            return 0;
+        }
+        if  (aabb1.max.x <= aabb2.min.x)
+        {
+            return 0;
+        }
+        if  (aabb1.max.y <= aabb2.min.y)
+        {
+            return 0;
+        }
+        return 1; //the aabb's overlap
+    }
+
+
+    /*!
+    *
+    * Conventional method to check if two AABB's overlap.
+    * Both AABBs are in local object space. Used the position-vector
+    * to translate them into world-space
+    *
+    * Example:
+    *  bool result=Overlap::AABB_AABB( pos1,aabb1, pos2,aabb2 );
+    *
+    */
+    ILINE bool AABB_AABB(const Vec3& pos1, const AABB& aabb1,  const Vec3& pos2, const AABB& aabb2)
+    {
+        AABB waabb1(aabb1.min + pos1, aabb1.max + pos1);
+        AABB waabb2(aabb2.min + pos2, aabb2.max + pos2);
+        return AABB_AABB(waabb1, waabb2);
+    }
+
+
+    /*!
+    *
+    * conventional method to check if two AABB's overlap
+    * or if AABB1 is comletely inside AABB2.
+    * both AABBs are assumed to be in the same space
+    *
+    * Example:
+    *  bool result=Overlap::AABB_AABB_Inside( aabb1, aabb2 );
+    *
+    * return values:
+    * 0x00 = no overlap
+    * 0x01 = both AABBs one overlap
+    * 0x02 = AABB1 in inside AABB2
+    */
+    ILINE char AABB_AABB_Inside(const AABB& aabb1, const AABB& aabb2)
+    {
+        if (AABB_AABB(aabb1, aabb2))
+        {
+            if  (aabb1.min.x <= aabb2.min.x)
+            {
+                return 1;
+            }
+            if  (aabb1.min.y <= aabb2.min.y)
+            {
+                return 1;
+            }
+            if  (aabb1.min.z <= aabb2.min.z)
+            {
+                return 1;
+            }
+            if  (aabb1.max.x >= aabb2.max.x)
+            {
+                return 1;
+            }
+            if  (aabb1.max.y >= aabb2.max.y)
+            {
+                return 1;
+            }
+            if  (aabb1.max.z >= aabb2.max.z)
+            {
+                return 1;
+            }
+            //yes, its inside
+            return 2;
+        }
+        return 0;
+    }
+
+
+    /*!
+    *
+    * we use the SEPARATING AXIS TEST to check if and AABB and an OBB overlap.
+    *
+    * Example:
+    *  bool result=Overlap::AABB_OBB( aabb, pos,obb );
+    *
+    */
+    inline bool AABB_OBB (const AABB& aabb,  const Vec3& pos, const OBB& obb)
+    {
+        Vec3 h  =   (aabb.max - aabb.min) * 0.5f;   //calculate the half-length-vectors
+        Vec3 c  =   (aabb.max + aabb.min) * 0.5f;   //the center in world-space
+
+        //"t" is the transfer-vector from one center to the other
+        Vec3 t  = obb.m33 * obb.c + pos - c;
+
+        f32 ra, rb;
+
+        //--------------------------------------------------------------------------
+        //--  we use the vectors "1,0,0","0,1,0" and "0,0,1" as separating axis
+        //--------------------------------------------------------------------------
+        rb  =   fabsf(obb.m33.m00 * obb.h.x) + fabsf(obb.m33.m01 * obb.h.y) + fabsf(obb.m33.m02 * obb.h.z);
+        if (fabsf(t.x) > (fabsf(h.x) + rb))
+        {
+            return 0;
+        }
+        rb  =   fabsf(obb.m33.m10 * obb.h.x) + fabsf(obb.m33.m11 * obb.h.y) + fabsf(obb.m33.m12 * obb.h.z);
+        if (fabsf(t.y) > (fabsf(h.y) + rb))
+        {
+            return 0;
+        }
+        rb  =   fabsf(obb.m33.m20 * obb.h.x) + fabsf(obb.m33.m21 * obb.h.y) + fabsf(obb.m33.m22 * obb.h.z);
+        if (fabsf(t.z) > (fabsf(h.z) + rb))
+        {
+            return 0;
+        }
+
+        //--------------------------------------------------------------------------
+        //--  we use the orientation-vectors "Mx","My" and "Mz" as separating axis
+        //--------------------------------------------------------------------------
+        ra  = fabsf(obb.m33.m00 * h.x) + fabsf(obb.m33.m10 * h.y) + fabsf(obb.m33.m20 * h.z);
+        if (fabsf(t | Vec3(obb.m33.m00, obb.m33.m10, obb.m33.m20)) > (ra + obb.h.x))
+        {
+            return 0;
+        }
+        ra  = fabsf(obb.m33.m01 * h.x) + fabsf(obb.m33.m11 * h.y) + fabsf(obb.m33.m21 * h.z);
+        if (fabsf(t | Vec3(obb.m33.m01, obb.m33.m11, obb.m33.m21)) > (ra + obb.h.y))
+        {
+            return 0;
+        }
+        ra  = fabsf(obb.m33.m02 * h.x) + fabsf(obb.m33.m12 * h.y) + fabsf(obb.m33.m22 * h.z);
+        if (fabsf(t | Vec3(obb.m33.m02, obb.m33.m12, obb.m33.m22)) > (ra + obb.h.z))
+        {
+            return 0;
+        }
+
+        //---------------------------------------------------------------------
+        //----  using 9 cross products we generate new separating axis
+        //---------------------------------------------------------------------
+        const float e0 = h.x + h.y + h.z, e1 = obb.h.x + obb.h.y + obb.h.z, e = (e0 + e1 - fabsf(e0 - e1)) * 0.0001f;
+        ra = h.y * fabsf(obb.m33.m20) + h.z * fabsf(obb.m33.m10);
+        rb = obb.h.y * fabsf(obb.m33.m02) + obb.h.z * fabsf(obb.m33.m01);
+        if (fabsf(t.z * obb.m33.m10 - t.y * obb.m33.m20) > (ra + rb) + e)
+        {
+            return 0;
+        }
+        ra = h.y * fabsf(obb.m33.m21) + h.z * fabsf(obb.m33.m11);
+        rb = obb.h.x * fabsf(obb.m33.m02) + obb.h.z * fabsf(obb.m33.m00);
+        if (fabsf(t.z * obb.m33.m11 - t.y * obb.m33.m21) > (ra + rb) + e)
+        {
+            return 0;
+        }
+        ra = h.y * fabsf(obb.m33.m22) + h.z * fabsf(obb.m33.m12);
+        rb = obb.h.x * fabsf(obb.m33.m01) + obb.h.y * fabsf(obb.m33.m00);
+        if (fabsf(t.z * obb.m33.m12 - t.y * obb.m33.m22) > (ra + rb) + e)
+        {
+            return 0;
+        }
+
+
+        ra = h.x * fabsf(obb.m33.m20) + h.z * fabsf(obb.m33.m00);
+        rb = obb.h.y * fabsf(obb.m33.m12) + obb.h.z * fabsf(obb.m33.m11);
+        if (fabsf(t.x * obb.m33.m20 - t.z * obb.m33.m00) > (ra + rb) + e)
+        {
+            return 0;
+        }
+        ra = h.x * fabsf(obb.m33.m21) + h.z * fabsf(obb.m33.m01);
+        rb = obb.h.x * fabsf(obb.m33.m12) + obb.h.z * fabsf(obb.m33.m10);
+        if (fabsf(t.x * obb.m33.m21 - t.z * obb.m33.m01) > (ra + rb) + e)
+        {
+            return 0;
+        }
+        ra = h.x * fabsf(obb.m33.m22) + h.z * fabsf(obb.m33.m02);
+        rb = obb.h.x * fabsf(obb.m33.m11) + obb.h.y * fabsf(obb.m33.m10);
+        if (fabsf(t.x * obb.m33.m22 - t.z * obb.m33.m02) > (ra + rb) + e)
+        {
+            return 0;
+        }
+
+
+        ra = h.x * fabsf(obb.m33.m10) + h.y * fabsf(obb.m33.m00);
+        rb = obb.h.y * fabsf(obb.m33.m22) + obb.h.z * fabsf(obb.m33.m21);
+        if (fabsf(t.y * obb.m33.m00 - t.x * obb.m33.m10) > (ra + rb) + e)
+        {
+            return 0;
+        }
+        ra = h.x * fabsf(obb.m33.m11) + h.y * fabsf(obb.m33.m01);
+        rb = obb.h.x * fabsf(obb.m33.m22) + obb.h.z * fabsf(obb.m33.m20);
+        if (fabsf(t.y * obb.m33.m01 - t.x * obb.m33.m11) > (ra + rb) + e)
+        {
+            return 0;
+        }
+        ra = h.x * fabsf(obb.m33.m12) + h.y * fabsf(obb.m33.m02);
+        rb = obb.h.x * fabsf(obb.m33.m21) + obb.h.y * fabsf(obb.m33.m20);
+        if (fabsf(t.y * obb.m33.m02 - t.x * obb.m33.m12) > (ra + rb) + e)
+        {
+            return 0;
+        }
+
+        //no separating axis found, we have an intersection
+        return 1;
+    }
+
+    /*!
+    *
+    * we use the SEPARATING AXIS TEST to check if two OBB's overlap.
+    *
+    * Example:
+    *  bool result=Overlap::OBB_OBB( pos1,obb1, pos2,obb2 );
+    *
+    */
+    inline bool OBB_OBB (const Vec3& pos1, const OBB& obb1,  const Vec3& pos2, const OBB& obb2)
+    {
+        //tranform obb2 in local space of obb1
+        Matrix33 M = obb1.m33.T() * obb2.m33;
+
+        //the new center-position in world-space
+        Vec3 p1 =   obb1.m33 * obb1.c + pos1;
+        Vec3 p2 =   obb2.m33 * obb2.c + pos2;
+
+        //"t" is the transfer-vector from one center to the other
+        Vec3 t      = (p2 - p1) * obb1.m33;
+
+        float ra, rb;
+
+        //--------------------------------------------------------------------------
+        //--  we use the vectors "1,0,0","0,1,0" and "0,0,1" as separating axis
+        //--------------------------------------------------------------------------
+        rb  =   fabsf(M.m00 * obb2.h.x) + fabsf(M.m01 * obb2.h.y) + fabsf(M.m02 * obb2.h.z);
+        if (fabsf(t.x) > (fabsf(obb1.h.x) + rb))
+        {
+            return 0;
+        }
+        rb  =   fabsf(M.m10 * obb2.h.x) + fabsf(M.m11 * obb2.h.y) + fabsf(M.m12 * obb2.h.z);
+        if (fabsf(t.y) > (fabsf(obb1.h.y) + rb))
+        {
+            return 0;
+        }
+        rb  =   fabsf(M.m20 * obb2.h.x) + fabsf(M.m21 * obb2.h.y) + fabsf(M.m22 * obb2.h.z);
+        if (fabsf(t.z) > (fabsf(obb1.h.z) + rb))
+        {
+            return 0;
+        }
+
+        //--------------------------------------------------------------------------
+        //--  we use the orientation-vectors "Mx","My" and "Mz" as separating axis
+        //--------------------------------------------------------------------------
+        ra  = fabsf(M.m00 * obb1.h.x) + fabsf(M.m10 * obb1.h.y) + fabsf(M.m20 * obb1.h.z);
+        if (fabsf(t | Vec3(M.m00, M.m10, M.m20)) > (ra + obb2.h.x))
+        {
+            return 0;
+        }
+        ra  = fabsf(M.m01 * obb1.h.x) + fabsf(M.m11 * obb1.h.y) + fabsf(M.m21 * obb1.h.z);
+        if (fabsf(t | Vec3(M.m01, M.m11, M.m21)) > (ra + obb2.h.y))
+        {
+            return 0;
+        }
+        ra  = fabsf(M.m02 * obb1.h.x) + fabsf(M.m12 * obb1.h.y) + fabsf(M.m22 * obb1.h.z);
+        if (fabsf(t | Vec3(M.m02, M.m12, M.m22)) > (ra + obb2.h.z))
+        {
+            return 0;
+        }
+
+        //---------------------------------------------------------------------
+        //----  using 9 cross products we generate new separating axis
+        //---------------------------------------------------------------------
+        ra = obb1.h.y * fabsf(M.m20) + obb1.h.z * fabsf(M.m10);
+        rb = obb2.h.y * fabsf(M.m02) + obb2.h.z * fabsf(M.m01);
+        if (fabsf(t.z * M.m10 - t.y * M.m20) > (ra + rb))
+        {
+            return 0;
+        }
+        ra = obb1.h.y * fabsf(M.m21) + obb1.h.z * fabsf(M.m11);
+        rb = obb2.h.x * fabsf(M.m02) + obb2.h.z * fabsf(M.m00);
+        if (fabsf(t.z * M.m11 - t.y * M.m21) > (ra + rb))
+        {
+            return 0;
+        }
+        ra = obb1.h.y * fabsf(M.m22) + obb1.h.z * fabsf(M.m12);
+        rb = obb2.h.x * fabsf(M.m01) + obb2.h.y * fabsf(M.m00);
+        if (fabsf(t.z * M.m12 - t.y * M.m22) > (ra + rb))
+        {
+            return 0;
+        }
+
+
+        ra = obb1.h.x * fabsf(M.m20) + obb1.h.z * fabsf(M.m00);
+        rb = obb2.h.y * fabsf(M.m12) + obb2.h.z * fabsf(M.m11);
+        if (fabsf(t.x * M.m20 - t.z * M.m00) > (ra + rb))
+        {
+            return 0;
+        }
+        ra = obb1.h.x * fabsf(M.m21) + obb1.h.z * fabsf(M.m01);
+        rb = obb2.h.x * fabsf(M.m12) + obb2.h.z * fabsf(M.m10);
+        if (fabsf(t.x * M.m21 - t.z * M.m01) > (ra + rb))
+        {
+            return 0;
+        }
+        ra = obb1.h.x * fabsf(M.m22) + obb1.h.z * fabsf(M.m02);
+        rb = obb2.h.x * fabsf(M.m11) + obb2.h.y * fabsf(M.m10);
+        if (fabsf(t.x * M.m22 - t.z * M.m02) > (ra + rb))
+        {
+            return 0;
+        }
+
+
+        ra = obb1.h.x * fabsf(M.m10) + obb1.h.y * fabsf(M.m00);
+        rb = obb2.h.y * fabsf(M.m22) + obb2.h.z * fabsf(M.m21);
+        if (fabsf(t.y * M.m00 - t.x * M.m10) > (ra + rb))
+        {
+            return 0;
+        }
+        ra = obb1.h.x * fabsf(M.m11) + obb1.h.y * fabsf(M.m01);
+        rb = obb2.h.x * fabsf(M.m22) + obb2.h.z * fabsf(M.m20);
+        if (fabsf(t.y * M.m01 - t.x * M.m11) > (ra + rb))
+        {
+            return 0;
+        }
+        ra = obb1.h.x * fabsf(M.m12) + obb1.h.y * fabsf(M.m02);
+        rb = obb2.h.x * fabsf(M.m21) + obb2.h.y * fabsf(M.m20);
+        if (fabsf(t.y * M.m02 - t.x * M.m12) > (ra + rb))
+        {
+            return 0;
+        }
+
+        return 1; //no separating axis found, we have an overlap
+    }
+
+
+
+
+
+
+#define PLANE_X         0
+#define PLANE_Y         1
+#define PLANE_Z         2
+#define PLANE_NON_AXIAL 3
+
+    //! check if the point is inside a triangle
+    inline bool PointInTriangle(const Vec3& point, const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& normal)
+    {
+        float xt, yt;
+        Vec3 nn;
+
+        int p1, p2;
+
+        nn = normal;
+        nn.x = (float)fabs(nn.x);
+        nn.y = (float)fabs(nn.y);
+        nn.z = (float)fabs(nn.z);
+
+        if ((nn.x >= nn.y) && (nn.x >= nn.z))
+        {
+            xt = point.y;
+            yt = point.z;
+            p1 = PLANE_Y;
+            p2 = PLANE_Z;
+        }
+        else
+        if ((nn.y >= nn.x) && (nn.y >= nn.z))
+        {
+            xt = point.x;
+            yt = point.z;
+            p1 = PLANE_X;
+            p2 = PLANE_Z;
+        }
+        else
+        {
+            xt = point.x;
+            yt = point.y;
+            p1 = PLANE_X;
+            p2 = PLANE_Y;
+        }
+
+        float Ax, Ay, Bx, By;
+        float s;
+
+        bool front = false;
+        bool back = false;
+
+
+        Ax = (v0)[p1];
+        Bx = (v1)[p1];
+        Ay = (v0)[p2];
+        By = (v1)[p2];
+
+        s = ((Ay - yt) * (Bx - Ax) - (Ax - xt) * (By - Ay));
+
+        if (s >= 0)
+        {
+            if (back)
+            {
+                return (false);
+            }
+            front = true;
+        }
+        else
+        {
+            if (front)
+            {
+                return (false);
+            }
+            back = true;
+        }
+
+        Ax = (v1)[p1];
+        Bx = (v2)[p1];
+        Ay = (v1)[p2];
+        By = (v2)[p2];
+
+        s = ((Ay - yt) * (Bx - Ax) - (Ax - xt) * (By - Ay));
+
+        if (s >= 0)
+        {
+            if (back)
+            {
+                return (false);
+            }
+            front = true;
+        }
+        else
+        {
+            if (front)
+            {
+                return (false);
+            }
+            back = true;
+        }
+
+        Ax = (v2)[p1];
+        Bx = (v0)[p1];
+        Ay = (v2)[p2];
+        By = (v0)[p2];
+
+        s = ((Ay - yt) * (Bx - Ax) - (Ax - xt) * (By - Ay));
+
+        if (s >= 0)
+        {
+            if (back)
+            {
+                return (false);
+            }
+            front = true;
+        }
+        else
+        {
+            if (front)
+            {
+                return (false);
+            }
+            back = true;
+        }
+
+        return (true);
+    }
+}
+
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_GEOOVERLAP_H
diff --git a/Code/Legacy/CryCommon/Cry_HWMatrix.h b/Code/Legacy/CryCommon/Cry_HWMatrix.h
new file mode 100644
index 0000000000..29444d59ec
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_HWMatrix.h
@@ -0,0 +1,84 @@
+/*
+ * 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 : Scalar implementation of hardware vector based matrix
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_HWMATRIX_H
+#define CRYINCLUDE_CRYCOMMON_CRY_HWMATRIX_H
+#pragma once
+
+struct hwmtx33
+{
+    hwvec3 m0, m1, m2;
+};
+
+ILINE void HWMtx33LoadAligned(hwmtx33& out, const Matrix34A& inMtx)
+{
+    out.m0 = HWVLoadVecAligned(reinterpret_cast<const Vec4A*>(&inMtx.m00));
+    out.m1 = HWVLoadVecAligned(reinterpret_cast<const Vec4A*>(&inMtx.m10));
+    out.m2 = HWVLoadVecAligned(reinterpret_cast<const Vec4A*>(&inMtx.m20));
+}
+
+ILINE hwvec3 HWMtx33RotateVec(const hwmtx33& m, const hwvec3& v)
+{
+    return Vec3((m.m0[0] * v.x) + (m.m0[1] * v.y) + (m.m0[2] * v.z),
+        (m.m1[0] * v.x) + (m.m1[1] * v.y) + (m.m1[2] * v.z),
+        (m.m2[0] * v.x) + (m.m2[1] * v.y) + (m.m2[2] * v.z));
+}
+
+ILINE hwvec3 HWMtx33RotateVecOpt(const hwmtx33& m, const hwvec3& v)
+{
+    return HWMtx33RotateVec(m, v);
+}
+
+ILINE hwmtx33 HWMtx33CreateRotationV0V1(const hwvec3& v0, const hwvec3& v1)
+{
+    assert((fabs_tpl(1 - (v0 | v0))) < 0.01); //check if unit-vector
+    assert((fabs_tpl(1 - (v1 | v1))) < 0.01); //check if unit-vector
+    hwmtx33 m;
+    float dot = v0 | v1;
+    if (dot < -0.9999f)
+    {
+        Vec3 axis = v0.GetOrthogonal().GetNormalized();
+        m.m0[0] = (2.0f * axis.x * axis.x - 1);
+        m.m0[1] = (2.0f * axis.x * axis.y);
+        m.m0[2] = (2.0f * axis.x * axis.z);
+        m.m1[0] = (2.0f * axis.y * axis.x);
+        m.m1[1] = (2.0f * axis.y * axis.y - 1);
+        m.m1[2] = (2.0f * axis.y * axis.z);
+        m.m2[0] = (2.0f * axis.z * axis.x);
+        m.m2[1] = (2.0f * axis.z * axis.y);
+        m.m2[2] = (2.0f * axis.z * axis.z - 1);
+    }
+    else
+    {
+        Vec3 v = v0 % v1;
+        f32 h = 1.0f / (1.0f + dot);
+        m.m0[0] = (dot + h * v.x * v.x);
+        m.m0[1] = (h * v.x * v.y - v.z);
+        m.m0[2] = (h * v.x * v.z + v.y);
+        m.m1[0] = (h * v.x * v.y + v.z);
+        m.m1[1] = (dot + h * v.y * v.y);
+        m.m1[2] = (h * v.y * v.z - v.x);
+        m.m2[0] = (h * v.x * v.z - v.y);
+        m.m2[1] = (h * v.y * v.z + v.x);
+        m.m2[2] = (dot + h * v.z * v.z);
+    }
+
+    return m;
+}
+
+//Returns a matrix optimized for this platform's matrix ops, in this case, not doing a thing;
+ILINE hwmtx33 HWMtx33GetOptimized(const hwmtx33& m)
+{
+    return (hwmtx33)m;
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_HWMATRIX_H
+
diff --git a/Code/Legacy/CryCommon/Cry_HWVector3.h b/Code/Legacy/CryCommon/Cry_HWVector3.h
new file mode 100644
index 0000000000..bcc0ec0105
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_HWVector3.h
@@ -0,0 +1,277 @@
+/*
+ * 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: Hardware vector class - scalar implementation
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_HWVECTOR3_H
+#define CRYINCLUDE_CRYCOMMON_CRY_HWVECTOR3_H
+#pragma once
+
+
+#define HWV_PERMUTE_0X 0
+#define HWV_PERMUTE_0Y 1
+#define HWV_PERMUTE_0Z 2
+#define HWV_PERMUTE_0W 3
+#define HWV_PERMUTE_1X 4
+#define HWV_PERMUTE_1Y 5
+#define HWV_PERMUTE_1Z 6
+#define HWV_PERMUTE_1W 7
+
+typedef Vec3 hwvec3;
+typedef Vec4 hwvec4;
+typedef float simdf;
+typedef Vec4 hwvec4fconst;
+typedef int hwvec4i[4];
+
+#define HWV3Constant(name, f0, f1, f2) const Vec3 name(f0, f1, f2)
+#define SIMDFConstant(name, f0) const simdf name = f0
+#define HWV4PermuteControl(name, i0, i1, i2, i3) static const hwvec4i name = {i0, i1, i2, i3};
+#define SIMDFAsVec3(a) (hwvec3)a
+#define HWV3AsSIMDF(a) (simdf)a.x
+
+ILINE hwvec3 HWVLoadVecUnaligned(const Vec3* pLoadFrom)
+{
+    return *pLoadFrom;
+}
+
+ILINE hwvec3 HWVLoadVecAligned(const Vec4A* pLoadFrom)
+{
+    return Vec3(pLoadFrom->x, pLoadFrom->y, pLoadFrom->z);
+}
+
+ILINE void HWVSaveVecUnaligned(Vec3* pSaveTo, const hwvec3& pLoadFrom)
+{
+    *pSaveTo = pLoadFrom;
+}
+
+ILINE void HWVSaveVecAligned(Vec4* pSaveTo, const hwvec4& pLoadFrom)
+{
+    *pSaveTo = pLoadFrom;
+}
+
+ILINE hwvec3 HWVAdd(const hwvec3& a, const hwvec3& b)
+{
+    return hwvec3(a.x + b.x, a.y + b.y, a.z + b.z);
+}
+
+ILINE hwvec3 HWVMultiply(const hwvec3& a, const hwvec3& b)
+{
+    return hwvec3(a.x * b.x, a.y * b.y, a.z * b.z);
+}
+
+ILINE hwvec3 HWVMultiplySIMDF(const hwvec3& a, const simdf& b)
+{
+    return hwvec3(a.x * b, a.y * b, a.z * b);
+}
+
+ILINE hwvec3 HWVMultiplyAdd(const hwvec3& a, const hwvec3& b, const hwvec3& c)
+{
+    return hwvec3((a.x * b.x) + c.x, (a.y * b.y) + c.y, (a.z * b.z) + c.z);
+}
+
+ILINE hwvec3 HWVMultiplySIMDFAdd(const hwvec3& a, const simdf& b, const hwvec3& c)
+{
+    return hwvec3((a.x * b) + c.x, (a.y * b) + c.y, (a.z * b) + c.z);
+}
+
+ILINE hwvec3 HWVSub(const hwvec3& a, const hwvec3& b)
+{
+    return (a - b);
+}
+
+ILINE hwvec3 HWVCross(const hwvec3& a, const hwvec3& b)
+{
+    return hwvec3((a.y * b.z) - (a.z * b.y)
+        , (a.z * b.x) - (a.x * b.z)
+        , (a.x * b.y) - (a.y * b.x));
+}
+
+ILINE simdf HWV3Dot(const hwvec3& a, const hwvec3& b)
+{
+    return (a.x * b.x) + (a.y * b.y) + (a.z * b.z);
+}
+
+ILINE hwvec3 HWVMax(const hwvec3& a, const hwvec3& b)
+{
+    return Vec3(a.x > b.x ? a.x : b.x,
+        a.y > b.y ? a.y : b.y,
+        a.z > b.z ? a.z : b.z);
+}
+
+ILINE hwvec3 HWVMin(const hwvec3& a, const hwvec3& b)
+{
+    return Vec3(a.x < b.x ? a.x : b.x,
+        a.y < b.y ? a.y : b.y,
+        a.z < b.z ? a.z : b.z);
+}
+
+ILINE hwvec3 HWVClamp(const hwvec3& a, const hwvec3& min, const hwvec3& max)
+{
+    return HWVMax(min, HWVMin(a, max));
+}
+
+ILINE hwvec3 HWV3Normalize(const hwvec3& a)
+{
+    float fInvLen = isqrt_safe_tpl((a.x * a.x) + (a.y * a.y) + (a.z * a.z));
+    return Vec3(a.x * fInvLen, a.y * fInvLen, a.z * fInvLen);
+}
+
+ILINE hwvec3 HWVGetOrthogonal(const hwvec3& a)
+{
+    hwvec3 result = a;
+
+    //int i = isneg(square(0.9f)*a.GetLengthSquared()-(a.x*a.x));
+    int i = isneg(square(0.9f) * a.GetLengthSquared() - a.x * a.x);
+    result[i] = 0;
+    result[incm3(i)] = a[decm3(i)];
+    result[decm3(i)] = -a[incm3(i)];
+    return result;
+}
+
+ILINE simdf HWV3SplatXToSIMDF(const hwvec3& a)
+{
+    return a.x;
+}
+
+ILINE simdf HWV3SplatYToSIMDF(const hwvec3& a)
+{
+    return a.y;
+}
+
+ILINE hwvec3 HWV3PermuteWord(const hwvec3& a, const hwvec3& b, const hwvec4i& p)
+{
+    hwvec3 selection[2] = {a, b};
+    float* fSelection = (float*)selection;
+    return Vec3(fSelection[p[0]], fSelection[p[1]], fSelection[p[2]]);
+}
+
+ILINE hwvec3 HWV3Zero()
+{
+    return Vec3(0.0f, 0.0f, 0.0f);
+}
+
+ILINE hwvec4 HWV4Zero()
+{
+    return Vec4(0.0f, 0.0f, 0.0f, 0.0f);
+}
+
+
+ILINE hwvec3 HWV3Negate(const hwvec3& a)
+{
+    return Vec3(-a.x, -a.y, -a.z);
+}
+
+ILINE hwvec3 HWVSelect(const hwvec3& a, const hwvec3& b, const hwvec3& control)
+{
+    return Vec3(control[0] > 0.0f ? b[0] : a[0],
+        control[1] > 0.0f ? b[1] : a[1],
+        control[2] > 0.0f ? b[2] : a[2]);
+}
+
+ILINE hwvec3 HWVSelectSIMDF(const hwvec3& a, const hwvec3& b, const bool& control)
+{
+    return control ? b : a;
+}
+
+ILINE simdf HWV3LengthSq(const hwvec3& a)
+{
+    return a.len2();
+}
+
+
+//////////////////////////////////////////////////
+//SIMDF functions for float stored in HWVEC4 data
+//////////////////////////////////////////////////
+
+ILINE simdf SIMDFLoadFloat(const float& f)
+{
+    return f;
+}
+
+ILINE void SIMDFSaveFloat(float* f, const simdf& a)
+{
+    *f = a;
+}
+
+ILINE bool SIMDFGreaterThan(const simdf& a, const simdf& b)
+{
+    return (a > b);
+}
+
+ILINE bool SIMDFLessThanEqualB(const simdf& a, const simdf& b)
+{
+    return (a <= b);
+}
+
+ILINE bool SIMDFLessThanEqual(const simdf& a, const simdf& b)
+{
+    return (a <= b);
+}
+
+ILINE bool SIMDFLessThanB(const simdf& a, const simdf& b)
+{
+    return (a < b);
+}
+
+ILINE bool SIMDFLessThan(const simdf& a, const simdf& b)
+{
+    return (a < b);
+}
+
+ILINE simdf SIMDFAdd(const simdf& a, const simdf& b)
+{
+    return a + b;
+}
+
+ILINE simdf SIMDFMult(const simdf& a, const simdf& b)
+{
+    return a * b;
+}
+
+ILINE simdf SIMDFReciprocal(const simdf& a)
+{
+    return 1.0f / a;
+}
+
+ILINE simdf SIMDFSqrt(const simdf& a)
+{
+    return sqrt_tpl(a);
+}
+
+ILINE simdf SIMDFSqrtEst(const simdf& a)
+{
+    return sqrt_tpl(a);
+}
+
+ILINE simdf SIMDFSqrtEstFast(const simdf& a)
+{
+    return sqrt_tpl(a);
+}
+
+ILINE simdf SIMDFMax(const simdf& a, const simdf& b)
+{
+    return max(a, b);
+}
+
+ILINE simdf SIMDFMin(const simdf& a, const simdf& b)
+{
+    return min(a, b);
+}
+
+ILINE simdf SIMDFClamp(const simdf& a, const simdf& min, const simdf& max)
+{
+    return clamp_tpl(a, min, max);
+}
+
+ILINE simdf SIMDFAbs(const simdf& a)
+{
+    return fabsf(a);
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_HWVECTOR3_H
diff --git a/Code/Legacy/CryCommon/Cry_Math.h b/Code/Legacy/CryCommon/Cry_Math.h
new file mode 100644
index 0000000000..bf9f6c38c8
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Math.h
@@ -0,0 +1,732 @@
+/*
+ * 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 math class
+
+
+#pragma once
+
+//========================================================================================
+
+#include <platform.h>
+#include "Cry_ValidNumber.h"
+#include <CryEndian.h>  // eLittleEndian
+#include <CryHalf.inl>
+#include <MetaUtils.h>
+#include <float.h>
+///////////////////////////////////////////////////////////////////////////////
+// Forward declarations                                                      //
+///////////////////////////////////////////////////////////////////////////////
+template <typename F>
+struct Vec2_tpl;
+template <typename F>
+struct Vec3_tpl;
+template <typename F>
+struct Vec4_tpl;
+
+template <typename F>
+struct Ang3_tpl;
+template <typename F>
+struct Plane_tpl;
+template <typename F>
+struct AngleAxis_tpl;
+template <typename F>
+struct Quat_tpl;
+template <typename F>
+struct QuatT_tpl;
+template <typename F>
+struct DualQuat_tpl;
+template <typename F>
+struct QuatTS_tpl;
+template <typename F>
+struct QuatTNS_tpl;
+
+template <typename F>
+struct Diag33_tpl;
+template <typename F>
+struct Matrix33_tpl;
+template <typename F>
+struct Matrix34_tpl;
+template <typename F>
+struct Matrix44_tpl;
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Definitions                                                               //
+///////////////////////////////////////////////////////////////////////////////
+const f32 gf_PI  = f32(3.14159265358979323846264338327950288419716939937510);
+const f64 g_PI   = 3.14159265358979323846264338327950288419716939937510; // pi
+
+const f32 gf_PI2 = f32(3.14159265358979323846264338327950288419716939937510 * 2.0);
+const f64 g_PI2  = 3.14159265358979323846264338327950288419716939937510 * 2.0; // 2*pi
+
+const f64 sqrt2  = 1.4142135623730950488016887242097;
+const f64 sqrt3  = 1.7320508075688772935274463415059;
+
+const f32 gf_halfPI = f32(1.57079632679489661923132169163975144209858469968755);
+
+#ifndef MAX
+#define MAX(a, b)    (((a) > (b)) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a, b)    (((a) < (b)) ? (a) : (b))
+#endif
+
+#define VEC_EPSILON (0.05f)
+#define RAD_EPSILON (0.01f)
+#define DEG2RAD(a) ((a) * (gf_PI / 180.0f))
+#define RAD2DEG(a) ((a) * (180.0f / gf_PI))
+#define DEG2COS(a) (cos_tpl((a) * (gf_PI / 180.0f)))
+#define COS2DEG(a) (acos_tpl(a) * (180.0f / gf_PI))
+#define RAD2HCOS(a) (cos_tpl((a * 0.5f)))
+#define HCOS2RAD(a) (acos_tpl(a) * 2.0f)
+#define DEG2HCOS(a) (cos_tpl((a * 0.5f) * (gf_PI / 180.0f)))
+#define DEG2HSIN(a) (sin_tpl((a * 0.5f) * (gf_PI / 180.0f)))
+#define HCOS2DEG(a) (acos_tpl(a) * 2.0f * (180.0f / gf_PI))
+#define SIGN_MASK(x) ((intptr_t)(x) >> ((sizeof(size_t) * 8) - 1))
+#define TANGENT30 0.57735026918962576450914878050196f // tan(30)
+#define TANGENT30_2 0.57735026918962576450914878050196f * 2 // 2*tan(30)
+#define LN2 0.69314718055994530941723212145818f // ln(2)
+
+
+
+
+
+ILINE f32 fsel(const f32 _a, const f32 _b, const f32 _c) { return (_a < 0.0f) ? _c : _b; }
+ILINE f64 fsel(const f64 _a, const f64 _b, const f64 _c) { return (_a < 0.0f) ? _c : _b; }
+ILINE f32 fself(const f32 _a, const f32 _b, const f32 _c) { return (_a < 0.0f) ? _c : _b; }
+ILINE f32 fsels(const f32 _a, const f32 _b, const f32 _c) { return (_a < 0.0f) ? _c : _b; }
+ILINE f32 fres(const f32 _a) { return 1.f / _a; }
+template<class T>
+ILINE T isel(int c, T a, T b) {   return (c < 0) ? b : a; }
+template<class T>
+ILINE T isel(int64 c, T a, T b) { return (c < 0) ? b : a; }
+template<class T>
+ILINE T iselnz(int c, T a, T b) {     return c ? a : b; }
+template<class T>
+ILINE T iselnz(uint32 c, T a, T b) { return c ? a : b; }
+template<class T>
+ILINE T iselnz(int64 c, T a, T b) {   return c ? a : b; }
+template<class T>
+ILINE T iselnz(uint64 c, T a, T b) { return c ? a : b; }
+//provides fast way of checking against 0 (saves fcmp)
+ILINE bool fzero(const float& val) { return val == 0.0f; }
+ILINE bool fzero(float* pVal) { return *pVal == 0.0f; }
+
+
+
+//////////////////////////////////////////////////////////////////////////
+// Define min/max
+//////////////////////////////////////////////////////////////////////////
+#ifdef min
+#undef min
+#endif //min
+
+#ifdef max
+#undef max
+#endif //max
+
+
+// Bring min and max from std namespace to global scope.
+template <class T>
+ILINE T min(const T& a, const T& b) {  return b < a ? b : a; }
+template <class T>
+ILINE T max(const T& a, const T& b) {  return a < b ? b : a; }
+template <class T, class _Compare>
+ILINE const T& min(const T& a, const T& b, _Compare comp) { return comp(b, a) ? b : a; }
+template <class T, class _Compare>
+ILINE const T& max(const T& a, const T& b, _Compare comp) {     return comp(a, b) ? b : a; }
+ILINE int min_branchless(int a, int b) { int diff = a - b; int mask = diff >> 31; return (b & (~mask)) | (a & mask); }
+
+template<class T>
+ILINE T clamp_tpl(T X, T Min, T Max) {  return X < Min ? Min : X < Max ? X : Max; }
+template<class T>
+ILINE void Limit(T& val, const T& min, const T& max)
+{
+    if (val < min)
+    {
+        val = min;
+    }
+    else if (val > max)
+    {
+        val = max;
+    }
+}
+template<class T>
+ILINE T Lerp(const T& a, const T& b, float s) { return T(a + (b - a) * s); }
+
+
+
+//-------------------------------------------
+//-- the portability functions for CPU_X86
+//-------------------------------------------
+
+#if defined(_CPU_SSE)
+#include <xmmintrin.h>
+#endif
+
+ILINE f32 fabs_tpl(f32 op) { return op < 0.0f ? -op : op; }
+ILINE f64 fabs_tpl(f64 op) { return fabs(op); }
+ILINE int32 fabs_tpl(int32 op) { int32 mask = op >> 31; return op + mask ^ mask; }
+
+ILINE f32 floor_tpl(f32 op) {return floorf(op); }
+ILINE f64 floor_tpl(f64 op) {return floor(op); }
+ILINE int32 floor_tpl(int32 op) {return op; }
+
+ILINE f32 ceil_tpl(f32 op) {return ceilf(op); }
+ILINE f64 ceil_tpl(f64 op) {return ceil(op); }
+ILINE int32 ceil_tpl(int32 op) {return op; }
+
+ILINE f32 fmod_tpl(f32 x, f32 y) {return (f32)fmodf(x, y); }
+ILINE f64 fmod_tpl(f64 x, f64 y) {return (f32)fmod(x, y); }
+
+ILINE void sincos_tpl (f32 angle, f32* pSin, f32* pCos) {   *pSin = f32(sin(angle));    *pCos = f32(cos(angle));    }
+ILINE void sincos_tpl (f64 angle, f64* pSin, f64* pCos) {   *pSin = f64(sin(angle));  *pCos = f64(cos(angle));  }
+
+ILINE f32 cos_tpl(f32 op) { return cosf(op); }
+ILINE f64 cos_tpl(f64 op) { return cos(op); }
+
+ILINE f32 sin_tpl(f32 op) { return sinf(op); }
+ILINE f64 sin_tpl(f64 op) { return sin(op); }
+
+ILINE f32 acos_tpl(f32 op) { return acosf(clamp_tpl(op, -1.0f, +1.0f)); }
+ILINE f64 acos_tpl(f64 op) { return acos(clamp_tpl(op, -1.0, +1.0)); }
+
+ILINE f32 asin_tpl(f32 op) { return asinf(clamp_tpl(op, -1.0f, +1.0f)); }
+ILINE f64 asin_tpl(f64 op) { return asin(clamp_tpl(op, -1.0, +1.0)); }
+
+ILINE f32 atan_tpl(f32 op) { return atanf(op); }
+ILINE f64 atan_tpl(f64 op) { return atan(op); }
+
+ILINE f32 atan2_tpl(f32 op1, f32 op2) { return atan2f(op1, op2); }
+ILINE f64 atan2_tpl(f64 op1, f64 op2) { return atan2(op1, op2); }
+
+ILINE f32 tan_tpl(f32 op) {return tanf(op); }
+ILINE f64 tan_tpl(f64 op) {return tan(op); }
+
+ILINE f32 exp_tpl(f32 op) { return expf(op); }
+ILINE f64 exp_tpl(f64 op) { return exp(op); }
+
+ILINE f32 log_tpl(f32 op) { return logf(op); }
+ILINE f64 log_tpl(f64 op) { return log(op); }
+
+ILINE f32 pow_tpl(f32 x, f32 y) {return (f32) pow((f64)x, (f64)y); }
+ILINE f64 pow_tpl(f64 x, f64 y) {return pow(x, y); }
+
+#if defined(_CPU_SSE)
+ILINE f32 sqrt_tpl(f32 op)
+{
+    __m128 s = _mm_sqrt_ss(_mm_set_ss(op));
+    float r;
+    _mm_store_ss(&r, s);
+    return r;
+}
+ILINE f64 sqrt_tpl(f64 op)
+{
+    return sqrt(op);
+}
+
+ILINE f32 sqrt_fast_tpl(f32 op)
+{
+    return sqrt_tpl(op);
+}
+ILINE f64 sqrt_fast_tpl(f64 op)
+{
+    return sqrt_tpl(op);
+}
+
+ILINE f32 isqrt_tpl(f32 op)
+{
+    __m128 value = _mm_set_ss(op);
+    __m128 oneHalf = _mm_set_ss(0.5f);
+    __m128 threeHalfs = _mm_set_ss(1.5f);
+    __m128 simdRecipSqrt = _mm_rsqrt_ss(value);
+    __m128 inverseMult = _mm_mul_ps(_mm_mul_ss(_mm_mul_ss(value, simdRecipSqrt), simdRecipSqrt), oneHalf);
+    __m128 inverseInner = _mm_sub_ps(threeHalfs, inverseMult);
+    __m128 newtonIteration1 = _mm_mul_ss(simdRecipSqrt, inverseInner);
+    float r;
+    _mm_store_ss(&r, newtonIteration1);
+    return r;
+}
+ILINE f64 isqrt_tpl(f64 op)
+{
+    return 1.0 / sqrt(op);
+}
+
+ILINE f32 isqrt_fast_tpl(f32 op)
+{
+    return isqrt_tpl(op);
+}
+ILINE f64 isqrt_fast_tpl(f64 op)
+{
+    return isqrt_tpl(op);
+}
+
+ILINE f32 isqrt_safe_tpl(f32 value)
+{
+    return isqrt_tpl(value + (std::numeric_limits<f32>::min)());
+}
+
+ILINE f64 isqrt_safe_tpl(f64 value)
+{
+    return isqrt_tpl(value + (std::numeric_limits<f64>::min)());
+}
+#elif defined (__ARM_NEON__)
+#include "arm_neon.h"
+
+template <int n>
+float isqrt_helper(float f)
+{
+    float32x2_t v = vdup_n_f32(f);
+    float32x2_t r = vrsqrte_f32(v);
+    // n+1 newton iterations because initial approximation is crude
+    for (int i = 0; i <= n; ++i)
+    {
+        r = vrsqrts_f32(v * r, r) * r;
+    }
+    return vget_lane_f32(r, 0);
+}
+
+ILINE f32 sqrt_tpl(f32 op) { return op != 0.0f ? op* isqrt_helper<1>(op) : op; }
+ILINE f64 sqrt_tpl(f64 op) { return sqrt(op); }
+
+ILINE f32 sqrt_fast_tpl(f32 op) { return op != 0.0f ? op* isqrt_helper<0>(op) : op; }
+ILINE f64 sqrt_fast_tpl(f64 op) { return sqrt(op); }
+
+ILINE f32 isqrt_tpl(f32 op) { return isqrt_helper<1>(op); }
+ILINE f64 isqrt_tpl(f64 op) {   return 1.0 / sqrt(op); }
+
+ILINE f32 isqrt_fast_tpl(f32 op) { return isqrt_helper<0>(op); }
+ILINE f64 isqrt_fast_tpl(f64 op) { return 1.0 / sqrt(op); }
+
+ILINE f32 isqrt_safe_tpl(f32 op) { return isqrt_helper<1>(op + FLT_MIN); }
+ILINE f64 isqrt_safe_tpl(f64 op) { return 1.0 / sqrt(op + DBL_MIN); }
+#else
+#error unsupported CPU
+#endif
+
+ILINE int32 int_round(f32 f)  { return f < 0.f ? int32(f - 0.5f) : int32(f + 0.5f); }
+ILINE int32 pos_round(f32 f)  { return int32(f + 0.5f); }
+ILINE int64 int_round(f64 f)  { return f < 0.0 ? int64(f - 0.5) : int64(f + 0.5); }
+ILINE int64 pos_round(f64 f)  { return int64(f + 0.5); }
+
+ILINE int32 int_ceil(f32 f) {   int32 i = int32(f); return (f > f32(i)) ? i + 1 : i; }
+ILINE int64 int_ceil(f64 f) {   int64 i = int64(f); return (f > f64(i)) ? i + 1 : i; }
+
+ILINE float ufrac8_to_float(float u) { return u * (1.f / 255.f); }
+ILINE float ifrac8_to_float(float i) { return i * (1.f / 127.f); }
+ILINE uint8 float_to_ufrac8(float f) { int i = pos_round(f * 255.f);  assert(i >= 0 && i < 256);  return uint8(i); }
+ILINE int8  float_to_ifrac8(float f) { int i = int_round(f * 127.f);  assert(abs(i) <= 127);  return int8(i); }
+
+
+
+template<class F>
+ILINE F sqr(const F& op) { return op * op; }
+template<class F>
+ILINE F sqr(const Vec2_tpl<F>& op) { return op | op; }
+template<class F>
+ILINE F sqr(const Vec3_tpl<F>& op) { return op | op; }
+template<class F>
+ILINE F sqr_signed(const F& op) { return op * fabs_tpl(op); }
+template<class F>
+ILINE F cube(const F& op) { return op * op * op; }
+
+template<class F>
+ILINE F square(F fOp) { return(fOp * fOp); }
+ILINE float div_min(float n, float d, float m) {    return n * d < m * d * d ? n / d : m; }
+
+
+// Utility functions for returning -1 if input is negative and non-zero, returns positive 1 otherwise
+// Uses extensive bit shifting for performance reasons.
+ILINE int32 sgnnz(f64 x)
+{
+    union
+    {
+        f32 f;
+        int32 i;
+    } u;
+    u.f = (f32)x;
+    return ((u.i >> 31) << 1) + 1;
+}
+ILINE int32 sgnnz(f32 x)
+{
+    union
+    {
+        f32 f;
+        int32 i;
+    } u;
+    u.f = x;
+    return ((u.i >> 31) << 1) + 1;
+}
+ILINE int32 sgnnz(int32 x) {    return ((x >> 31) << 1) + 1; }
+ILINE f32   fsgnnz(f32 x)
+{
+    union
+    {
+        f32 f;
+        int32 i;
+    } u;
+    u.f = x;
+    u.i = (u.i & 0x80000000) | 0x3f800000;
+    return u.f;
+}
+
+ILINE int32 isneg(f32 x)
+{
+    union
+    {
+        f32 f;
+        uint32 i;
+    } u;
+    u.f = x;
+    return (int32)(u.i >> 31);
+}
+ILINE int32 isneg(f64 x)
+{
+    union
+    {
+        f32 f;
+        uint32 i;
+    } u;
+    u.f = (f32)x;
+    return (int32)(u.i >> 31);
+}
+ILINE int32 isneg(int32 x) {    return (int32)((uint32)x >> 31);  }
+
+
+
+
+
+ILINE int32 sgn(f64 x)
+{
+    union
+    {
+        f32 f;
+        int32 i;
+    } u;
+    u.f = (f32)x;
+    return (u.i >> 31) + ((u.i - 1) >> 31) + 1;
+}
+ILINE int32 sgn(f32 x)
+{
+    union
+    {
+        f32 f;
+        int32 i;
+    } u;
+    u.f = x;
+    return (u.i >> 31) + ((u.i - 1) >> 31) + 1;
+}
+ILINE int32 sgn(int32 x) {  return (x >> 31) + ((x - 1) >> 31) + 1; }
+ILINE f32   fsgnf(f32 x) {  return f32(sgn(x)); }
+
+ILINE int32 isnonneg(f32 x)
+{
+    union
+    {
+        f32 f;
+        uint32 i;
+    } u;
+    u.f = x;
+    return (int32)(u.i >> 31 ^ 1);
+}
+ILINE int32 isnonneg(f64 x)
+{
+    union
+    {
+        f32 f;
+        uint32 i;
+    } u;
+    u.f = (f32)x;
+    return (int32)(u.i >> 31 ^ 1);
+}
+ILINE int32 isnonneg(int32 x) {     return (int32)((uint32)x >> 31 ^ 1); }
+
+
+
+ILINE int32 getexp(f32 x) {     return (int32)(*(uint32*)&x >> 23 & 0x0FF) - 127;  }
+ILINE int32 getexp(f64 x) {     return (int32)(*((uint32*)&x + 1) >> 20 & 0x7FF) - 1023; }
+ILINE f32& setexp(f32& x, int32 iexp) {  (*(uint32*)& x &= ~(0x0FF << 23)) |= (iexp + 127) << 23;   return x;  }
+ILINE f64& setexp(f64& x, int32 iexp) {  (*((uint32*)&x + 1) &= ~(0x7FF << 20)) |= (iexp + 1023) << 20;  return x; }
+
+
+ILINE int32 iszero(f32 x)
+{
+    union
+    {
+        f32 f;
+        int32 i;
+    } u;
+    u.f = x;
+    u.i &= 0x7FFFFFFF;
+    return -(u.i >> 31 ^ (u.i - 1) >> 31);
+}
+ILINE int32 iszero(f64 x)
+{
+    union
+    {
+        f32 f;
+        int32 i;
+    } u;
+    u.f = (f32)x;
+    u.i &= 0x7FFFFFFF;
+    return -((u.i >> 31) ^ (u.i - 1) >> 31);
+}
+ILINE int32 iszero(int32 x) {   return -(x >> 31 ^ (x - 1) >> 31); }
+#if defined(PLATFORM_64BIT) && !defined(__clang__)
+ILINE int64 iszero(__int64 x) { return -(x >> 63 ^ (x - 1) >> 63); }
+#endif
+#if defined(PLATFORM_64BIT) && defined(__clang__) && !defined(LINUX)
+ILINE int64 iszero(int64_t x) { return -(x >> 63 ^ (x - 1) >> 63); }
+#endif
+#if defined(PLATFORM_64BIT) && (defined(LINUX) || defined(APPLE))
+ILINE int64 iszero(long int x) {    return -(x >> 63 ^ (x - 1) >> 63); }
+#endif
+
+ILINE float if_neg_else(float test, float val_neg, float val_nonneg) {  return (float)fsel(test, val_nonneg, val_neg); }
+ILINE float if_pos_else(float test, float val_pos, float val_nonpos) {  return (float)fsel(-test, val_nonpos, val_pos); }
+template<class F>
+ILINE int32 inrange(F x, F end1, F end2) {    return isneg(fabs_tpl(end1 + end2 - x * (F)2) - fabs_tpl(end1 - end2)); }
+template<class F>
+ILINE F cond_select(int32 bFirst, F op1, F op2) {  F arg[2] = { op1, op2 };     return arg[bFirst ^ 1]; }
+
+template<class F>
+ILINE int32 idxmax3(const F* pdata)
+{
+    int32 imax = isneg(pdata[0] - pdata[1]);
+    imax |= isneg(pdata[imax] - pdata[2]) << 1;
+    return imax & (2 | (imax >> 1 ^ 1));
+}
+template<class F>
+ILINE int32 idxmax3(const Vec3_tpl<F>& vec)
+{
+    int32 imax = isneg(vec.x - vec.y);
+    imax |= isneg(vec[imax] - vec.z) << 1;
+    return imax & (2 | (imax >> 1 ^ 1));
+}
+template<class F>
+ILINE int32 idxmin3(const F* pdata)
+{
+    int32 imin = isneg(pdata[1] - pdata[0]);
+    imin |= isneg(pdata[2] - pdata[imin]) << 1;
+    return imin & (2 | (imin >> 1 ^ 1));
+}
+template<class F>
+ILINE int32 idxmin3(const Vec3_tpl<F>& vec)
+{
+    int32 imin = isneg(vec.y - vec.x);
+    imin |= isneg(vec.z - vec[imin]) << 1;
+    return imin & (2 | (imin >> 1 ^ 1));
+}
+// Approximation of exp(-x)
+ILINE float approxExp(float x) { return fres(1.f + x); }
+// Approximation of 1.f - exp(-x)
+ILINE float approxOneExp(float x) {     return x * fres(1.f + x); }
+
+
+ILINE int ilog2(uint64 x)   // if x==1<<i (i=0..63), returns i
+{
+#if defined(CRY_PLATFORM_X64)
+# if defined(AZ_RESTRICTED_PLATFORM)
+#  include AZ_RESTRICTED_FILE(Cry_Math_h)
+# endif
+# if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#  undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+# elif defined(CRY_PLATFORM_LINUX)
+#  define HAS_BIT_SCAN_FORWARD64 0
+# else
+#  define HAS_BIT_SCAN_FORWARD64 1
+# endif
+#endif
+
+#if HAS_BIT_SCAN_FORWARD64
+    unsigned long i;
+    _BitScanForward64(&i, x);
+    return i;
+#else
+    union
+    {
+        float f;
+        uint i;
+    } u;
+    u.f = (float)x;
+    return (u.i >> 23) - 127;
+#endif
+}
+
+
+static int32 inc_mod3[] = {1, 2, 0}, dec_mod3[] = {2, 0, 1};
+#ifdef PHYSICS_EXPORTS
+#define incm3(i) inc_mod3[i]
+#define decm3(i) dec_mod3[i]
+#else
+ILINE int32 incm3(int32 i) { return i + 1 & (i - 2) >> 31; }
+ILINE int32 decm3(int32 i) { return i - 1 + ((i - 1) >> 31 & 3); }
+#endif
+
+
+//////////////////////////////////////////////////////////////////////////
+enum type_zero
+{
+    ZERO
+};
+enum type_min
+{
+    VMIN
+};
+enum type_max
+{
+    VMAX
+};
+enum type_identity
+{
+    IDENTITY
+};
+
+#include "Cry_Vector2.h"
+#include "Cry_Vector3.h"
+#include "Cry_Vector4.h"
+#include "Cry_MatrixDiag.h"
+#include "Cry_Matrix33.h"
+#include "Cry_Matrix34.h"
+#include "Cry_Matrix44.h"
+#include "Cry_Quat.h"
+#include "Cry_HWVector3.h"
+#include "Cry_HWMatrix.h"
+#include "Cry_XOptimise.h"
+
+//////////////////////////////////////////////////////////////////////////
+
+/// This function relaxes a value (val) towards a desired value (to) whilst maintaining continuity
+/// of val and its rate of change (valRate). timeDelta is the time between this call and the previous one.
+/// The caller would normally keep val and valRate as working variables, and smoothTime is normally
+/// a fixed parameter. The to/timeDelta values can change.
+///
+/// Implementation details:
+///
+/// This is a critically damped spring system. A linear spring is attached between "val" and "to" that
+/// drags "val" to "to". At the same time a damper between the two removes oscillations; it's tweaked
+/// so it doesn't dampen more than necessary. In combination this gives smooth ease-in and ease-out behavior.
+///
+/// smoothTime can be interpreted in a couple of ways:
+/// - it's the "expected time to reach the target when at maximum velocity" (the target will, however, not be reached
+///   in that time because the speed will decrease the closer it gets to the target)
+/// - it's the 'lag time', how many seconds "val" lags behind "to". If your
+///   target has a certain speed, the lag distance is simply the smoothTime times that speed.
+/// - it's 2/omega, where omega is the spring's natural frequency (or less formally a measure of the spring stiffness)
+///
+/// The implementation is stable for varying timeDelta, but for performance reasons it uses a polynomial approximation
+/// to the exponential function. The approximation works well (within 0.1% of accuracy) when smoothTime > 2*deltaTime,
+/// which is usually the case. (but it might be troublesome when you want a stiff spring or have frame hikes!)
+/// The implementation handles cases where smoothTime==0 separately and reliably. In that case the target will be
+/// reached immediately, and valRate is updated appropriately.
+///
+/// Based on "Critically Damped Ease-In/Ease-Out Smoothing", Thomas Lowe, Game Programming Gems IV
+///
+
+
+template <typename T>
+ILINE void SmoothCD(
+    T& val,                 ///< in/out: value to be smoothed
+    T& valRate,             ///< in/out: rate of change of the value
+    const float timeDelta,  ///< in: time interval
+    const T& to,            ///< in: the target value
+    const float smoothTime) ///< in: timescale for smoothing
+{
+    if (smoothTime > 0.0f)
+    {
+        const float omega = 2.0f / smoothTime;
+        const float x = omega * timeDelta;
+        const float exp = 1.0f / (1.0f + x + 0.48f * x * x + 0.235f * x * x * x);
+        const T change = (val - to);
+        const T temp = (T)((valRate + change * omega) * timeDelta);
+        valRate = (T)((valRate - temp * omega) * exp);
+        val = (T)(to + (change + temp) * exp);
+    }
+    else if (timeDelta > 0.0f)
+    {
+        valRate = (T)((to - val) / timeDelta);
+        val = to;
+    }
+    else
+    {
+        val = to;
+        T zeroizeAmount = valRate;
+        valRate -= zeroizeAmount; // zero it...
+    }
+}
+
+
+template <typename T>
+ILINE void SmoothCDWithMaxRate(
+    T& val,                 ///< in/out: value to be smoothed
+    T& valRate,             ///< in/out: rate of change of the value
+    const float timeDelta,  ///< in: time interval
+    const T& to,            ///< in: the target value
+    const float smoothTime, ///< in: timescale for smoothing
+    const T& maxValRate)    ///< in: maximum allowed rate of change
+{
+    if (smoothTime > 0.0f)
+    {
+        const float omega = 2.0f / smoothTime;
+        const float x = omega * timeDelta;
+        const float exp = 1.0f / (1.0f + x + 0.48f * x * x + 0.235f * x * x * x);
+        const T unclampedChange = val - to;
+        const T maxChange = maxValRate * smoothTime;
+        const T clampedChange = clamp_tpl<T>(unclampedChange, -maxChange, maxChange);
+        const T clampedTo = val - clampedChange;
+        const T temp = (T)((valRate + clampedChange * omega) * timeDelta);
+        valRate = (T)((valRate - temp * omega) * exp);
+        val = (T)(clampedTo + (clampedChange + temp) * exp);
+    }
+    else if (timeDelta > 0.0f)
+    {
+        const T unclampedRate = (T)((to - val) / timeDelta);
+        valRate = clamp_tpl<T>(unclampedRate, -maxValRate, maxValRate);
+        val += valRate * timeDelta;
+    }
+    else
+    {
+        val = to;
+        T zeroizeAmount = valRate;
+        valRate -= zeroizeAmount; // zero it...
+    }
+}
+
+// Smoothes linear blending into cubic (b-spline) with 0-derivatives
+// near 0 and 1
+inline f32 SmoothBlendValue (const f32 fBlend)
+{
+    const f32 fBlendAdj = fBlend - 0.5f;
+    return (f32)fsel(-fBlend, 0.f, fsel(fBlend - 1.f, 1.f, 0.5f - 2.f * (fBlendAdj * fBlendAdj * fBlendAdj) + 1.5f * fBlendAdj));
+}
+
+// function for safe comparsion of floating point  values
+ILINE bool fcmp(f32 fA, f32 fB, f32 fEpsilon = FLT_EPSILON)
+{
+    return fabs(fA - fB) <= fEpsilon;
+}
+
+//! Given an arbitrary unit vector this function will compute two axes to build the orthonormal basis.
+//! \param n Unit 3D vector
+//! \param[out] b1 Orthonormal axis vector
+//! \param[out] b2 Orthonormal axis vector
+inline void GetBasisVectors(const Vec3& n, Vec3& b1, Vec3& b2)
+{
+    if (n.z < FLT_EPSILON - 1.0f)
+    {
+        b1 = Vec3(0.0f, -1.0f, 0.0f);
+        b2 = Vec3(-1.0f, 0.0f, 0.0f);
+        return;
+    }
+
+    const float a = 1.0f / (1.0f + n.z);
+    const float b = -n.x * n.y * a;
+    b1 = Vec3(1.0f - n.x * n.x * a, b, -n.x);
+    b2 = Vec3(b, 1.0f - n.y * n.y * a, -n.y);
+}
diff --git a/Code/Legacy/CryCommon/Cry_Matrix33.h b/Code/Legacy/CryCommon/Cry_Matrix33.h
new file mode 100644
index 0000000000..9a8f8aeaaf
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Matrix33.h
@@ -0,0 +1,1572 @@
+/*
+ * 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 matrix class
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_MATRIX33_H
+#define CRYINCLUDE_CRYCOMMON_CRY_MATRIX33_H
+#pragma once
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Matrix33_tpl
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+template<typename F>
+struct Matrix33_tpl
+{
+    F m00, m01, m02;
+    F m10, m11, m12;
+    F m20, m21, m22;
+
+    //---------------------------------------------------------------------------------
+
+#ifdef _DEBUG
+    ILINE Matrix33_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&m00);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+            p[3] = F32NAN;
+            p[4] = F32NAN;
+            p[5] = F32NAN;
+            p[6] = F32NAN;
+            p[7] = F32NAN;
+            p[8] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&m00);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+            p[3] = F64NAN;
+            p[4] = F64NAN;
+            p[5] = F64NAN;
+            p[6] = F64NAN;
+            p[7] = F64NAN;
+            p[8] = F64NAN;
+        }
+    }
+#else
+    ILINE Matrix33_tpl(){};
+#endif
+
+    //set matrix to Identity
+    ILINE Matrix33_tpl(type_identity)
+    {
+        m00 = 1;
+        m01 = 0;
+        m02 = 0;
+        m10 = 0;
+        m11 = 1;
+        m12 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = 1;
+    }
+    //set matrix to Zero
+    ILINE Matrix33_tpl(type_zero)
+    {
+        m00 = 0;
+        m01 = 0;
+        m02 = 0;
+        m10 = 0;
+        m11 = 0;
+        m12 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = 0;
+    }
+
+
+    //ASSIGNMENT OPERATOR of identical Matrix33 types.
+    //The assignment operator has precedence over assignment constructor
+    //Matrix33 m; m=m33;
+    ILINE Matrix33_tpl<F>& operator = (const Matrix33_tpl<F>& m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        return *this;
+    }
+
+
+    //--------------------------------------------------------------------
+    //----   implementation of the constructors                        ---
+    //--------------------------------------------------------------------
+
+    //CONSTRUCTOR for identical float-types. It initializes a Matrix33 with 9 floats.
+    //Matrix33(0,1,2, 3,4,5, 6,7,8);
+    explicit ILINE Matrix33_tpl<F>(F x00, F x01, F x02, F x10, F x11, F x12, F x20, F x21, F x22)
+    {
+        m00 = x00;
+        m01 = x01;
+        m02 = x02;
+        m10 = x10;
+        m11 = x11;
+        m12 = x12;
+        m20 = x20;
+        m21 = x21;
+        m22 = x22;
+    }
+    //CONSTRUCTOR for different float-types. It initializes a Matrix33 with 9 floats.
+    //Matrix33(0.0,1.0,2.0, 3.0,4.0,5.0, 6.0,7.0,8.0);
+    template<class F1>
+    explicit ILINE Matrix33_tpl<F>(F1 x00, F1 x01, F1 x02, F1 x10, F1 x11, F1 x12, F1 x20, F1 x21, F1 x22)
+    {
+        m00 = F(x00);
+        m01 = F(x01);
+        m02 = F(x02);
+        m10 = F(x10);
+        m11 = F(x11);
+        m12 = F(x12);
+        m20 = F(x20);
+        m21 = F(x21);
+        m22 = F(x22);
+    }
+
+
+    //CONSTRUCTOR for identical float-types. It initializes a Matrix33 with 3 vectors stored in the columns.
+    //Matrix33(v0,v1,v2);
+    explicit ILINE Matrix33_tpl<F>(const Vec3_tpl<F>&vx, const Vec3_tpl<F>&vy, const Vec3_tpl<F>&vz)
+    {
+        m00 = vx.x;
+        m01 = vy.x;
+        m02 = vz.x;
+        m10 = vx.y;
+        m11 = vy.y;
+        m12 = vz.y;
+        m20 = vx.z;
+        m21 = vy.z;
+        m22 = vz.z;
+    }
+    //CONSTRUCTOR for different float-types. It initializes a Matrix33 with 3 vectors stored in the columns and converts between floats/doubles.
+    //Matrix33r(v0,v1,v2);
+    template<class F1>
+    explicit ILINE Matrix33_tpl<F>(const Vec3_tpl<F1>&vx, const Vec3_tpl<F1>&vy, const Vec3_tpl<F1>&vz)
+    {
+        m00 = F(vx.x);
+        m01 = F(vy.x);
+        m02 = F(vz.x);
+        m10 = F(vx.y);
+        m11 = F(vy.y);
+        m12 = F(vz.y);
+        m20 = F(vx.z);
+        m21 = F(vy.z);
+        m22 = F(vz.z);
+    }
+
+
+
+
+
+    //CONSTRUCTOR for identical float-types. It converts a Diag33 into a Matrix33.
+    //Matrix33(diag33);
+    ILINE Matrix33_tpl<F>(const Diag33_tpl<F>&d)
+    {
+        assert(d.IsValid());
+        m00 = d.x;
+        m01 = 0;
+        m02 = 0;
+        m10 = 0;
+        m11 = d.y;
+        m12 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = d.z;
+    }
+    //CONSTRUCTOR for different float-types. It converts a Diag33 into a Matrix33 and also converts between double/float.
+    //Matrix33(diag33);
+    template<class F1>
+    ILINE Matrix33_tpl<F>(const Diag33_tpl<F1>&d)
+    {
+        assert(d.IsValid());
+        m00 = F(d.x);
+        m01 = 0;
+        m02 = 0;
+        m10 = 0;
+        m11 = F(d.y);
+        m12 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = F(d.z);
+    }
+
+
+
+    //CONSTRUCTOR for identical float-types
+    //Matrix33 m=m33;
+    ILINE Matrix33_tpl<F>(const Matrix33_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+    }
+    //CONSTRUCTOR for different float-types which converts between double/float
+    //Matrix33 m=m33r;
+    template<class F1>
+    ILINE Matrix33_tpl<F>(const Matrix33_tpl<F1>&m)
+    {
+        assert(m.IsValid());
+        m00 = F(m.m00);
+        m01 = F(m.m01);
+        m02 = F(m.m02);
+        m10 = F(m.m10);
+        m11 = F(m.m11);
+        m12 = F(m.m12);
+        m20 = F(m.m20);
+        m21 = F(m.m21);
+        m22 = F(m.m22);
+    }
+
+
+
+    //CONSTRUCTOR for identical float-types. It converts a Matrix34 into a Matrix33.
+    //Needs to be 'explicit' because we loose the translation vector in the conversion process
+    //Matrix33(m34);
+    explicit ILINE Matrix33_tpl<F>(const Matrix34_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+    }
+    //CONSTRUCTOR for different float-types. It converts a Matrix34 into a Matrix33 and converts between double/float.
+    //Needs to be 'explicit' because we loose the translation vector in the conversion process
+    //Matrix33(m34r);
+    template<class F1>
+    explicit ILINE Matrix33_tpl<F>(const Matrix34_tpl<F1>&m)
+    {
+        assert(m.IsValid());
+        m00 = F(m.m00);
+        m01 = F(m.m01);
+        m02 = F(m.m02);
+        m10 = F(m.m10);
+        m11 = F(m.m11);
+        m12 = F(m.m12);
+        m20 = F(m.m20);
+        m21 = F(m.m21);
+        m22 = F(m.m22);
+    }
+
+
+
+
+    //CONSTRUCTOR for identical float-types. It converts a Matrix44 into a Matrix33.
+    //Needs to be 'explicit' because we loose the translation vector and the 3rd row in the conversion process
+    //Matrix33(m44);
+    explicit ILINE Matrix33_tpl<F>(const Matrix44_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+    }
+    //CONSTRUCTOR for different float-types. It converts a Matrix44 into a Matrix33 and converts between double/float.
+    //Needs to be 'explicit' because we loose the translation vector and the 3rd row in the conversion process
+    //Matrix33(m44r);
+    template<class F1>
+    explicit ILINE Matrix33_tpl<F>(const Matrix44_tpl<F1>&m)
+    {
+        assert(m.IsValid());
+        m00 = F(m.m00);
+        m01 = F(m.m01);
+        m02 = F(m.m02);
+        m10 = F(m.m10);
+        m11 = F(m.m11);
+        m12 = F(m.m12);
+        m20 = F(m.m20);
+        m21 = F(m.m21);
+        m22 = F(m.m22);
+    }
+
+    //CONSTRUCTOR for identical float-types. It converts a Quat into a Matrix33.
+    //Needs to be 'explicit' because we loose fp-precision in the conversion process
+    //Matrix33(quat);
+    explicit ILINE Matrix33_tpl<F>(const Quat_tpl<F>&q)
+    {
+        assert(q.IsValid(0.05f));
+        Vec3_tpl<F> v2 = q.v + q.v;
+        F xx = 1 - v2.x * q.v.x;
+        F yy = v2.y * q.v.y;
+        F xw = v2.x * q.w;
+        F xy = v2.y * q.v.x;
+        F yz = v2.z * q.v.y;
+        F yw = v2.y * q.w;
+        F xz = v2.z * q.v.x;
+        F zz = v2.z * q.v.z;
+        F zw = v2.z * q.w;
+        m00 = 1 - yy - zz;
+        m01 = xy - zw;
+        m02 = xz + yw;
+        m10 = xy + zw;
+        m11 = xx - zz;
+        m12 = yz - xw;
+        m20 = xz - yw;
+        m21 = yz + xw;
+        m22 = xx - yy;
+    }
+
+    //CONSTRUCTOR for different float-types. It converts a Quat into a Matrix33 and converts between double/float.
+    //Needs to be 'explicit' because we loose fp-precision in the conversion process
+    //Matrix33(quatr);
+    template<class F1>
+    explicit ILINE Matrix33_tpl<F>(const Quat_tpl<F1>&q)
+    {
+        assert(q.IsValid(0.05f));
+        Vec3_tpl<F1> v2 = q.v + q.v;
+        F1 xx = 1 - v2.x * q.v.x;
+        F1 yy = v2.y * q.v.y;
+        F1 xw = v2.x * q.w;
+        F1 xy = v2.y * q.v.x;
+        F1 yz = v2.z * q.v.y;
+        F1 yw = v2.y * q.w;
+        F1 xz = v2.z * q.v.x;
+        F1 zz = v2.z * q.v.z;
+        F1 zw = v2.z * q.w;
+        m00 = F(1 - yy - zz);
+        m01 = F(xy - zw);
+        m02 = F(xz + yw);
+        m10 = F(xy + zw);
+        m11 = F(xx - zz);
+        m12 = F(yz - xw);
+        m20 = F(xz - yw);
+        m21 = F(yz + xw);
+        m22 = F(xx - yy);
+    }
+
+
+    //CONSTRUCTOR for identical float-types. It converts a Euler Angle into a Matrix33.
+    //Needs to be 'explicit' because we loose fp-precision in the conversion process
+    //Matrix33(Ang3(1,2,3));
+    explicit ILINE Matrix33_tpl<F>(const Ang3_tpl<F>&ang)
+    {
+        assert(ang.IsValid());
+        SetRotationXYZ(ang);
+    }
+    //CONSTRUCTOR for different float-types. It converts a Euler Angle into a Matrix33 and converts between double/float. .
+    //Needs to be 'explicit' because we loose fp-precision in the conversion process
+    //Matrix33(Ang3r(1,2,3));
+    template<class F1>
+    explicit ILINE Matrix33_tpl<F>(const Ang3_tpl<F1>&ang)
+    {
+        assert(ang.IsValid());
+        SetRotationXYZ(Ang3_tpl<F>(F(ang.x), F(ang.y), F(ang.z)));
+    }
+
+
+
+
+    //Bracket OPERATOR: initializes a Matrix33 with 9 floats.
+    //Matrix33 m; m(0,1,2, 3,4,5, 6,7,8);
+    ILINE void operator () (F x00, F x01, F x02, F x10, F x11, F x12, F x20, F x21, F x22)
+    {
+        m00 = x00;
+        m01 = x01;
+        m02 = x02;
+        m10 = x10;
+        m11 = x11;
+        m12 = x12;
+        m20 = x20;
+        m21 = x21;
+        m22 = x22;
+        assert(IsValid());
+    }
+
+
+    //---------------------------------------------------------------------------------------
+
+    ILINE void SetIdentity(void)
+    {
+        m00 = 1;
+        m01 = 0;
+        m02 = 0;
+        m10 = 0;
+        m11 = 1;
+        m12 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = 1;
+    }
+
+    ILINE static Matrix33_tpl<F> CreateIdentity()
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetIdentity();
+        return m33;
+    }
+
+    ILINE void SetZero()
+    {
+        m00 = 0;
+        m01 = 0;
+        m02 = 0;
+        m10 = 0;
+        m11 = 0;
+        m12 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = 0;
+    }
+
+
+    /*!
+    *  Create a rotation matrix around an arbitrary axis (Eulers Theorem).
+    *  The axis is specified as a normalized Vec3. The angle is assumed to be in radians.
+    *
+    *  Example:
+    *       Matrix34 m34;
+    *       Vec3 axis=GetNormalized( Vec3(-1.0f,-0.3f,0.0f) );
+    *       m34.SetRotationAA( rad, axis );
+    */
+    ILINE void SetRotationAA(F angle, const Vec3_tpl<F> axis)
+    {
+        F s, c;
+        sincos_tpl(angle, &s, &c);
+        SetRotationAA(c, s, axis);
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationAA(const F rad, const Vec3_tpl<F>& axis)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationAA(rad, axis);
+        return m33;
+    }
+
+
+    ILINE void SetRotationAA(F c, F s, const Vec3_tpl<F>& axis)
+    {
+        assert(axis.IsUnit(0.001f));
+        F   mc  =   1 - c;
+        m00 = mc * axis.x * axis.x + c;
+        m01 = mc * axis.x * axis.y - axis.z * s;
+        m02 = mc * axis.x * axis.z + axis.y * s;
+        m10 = mc * axis.y * axis.x + axis.z * s;
+        m11 = mc * axis.y * axis.y + c;
+        m12 = mc * axis.y * axis.z - axis.x * s;
+        m20 = mc * axis.z * axis.x - axis.y * s;
+        m21 = mc * axis.z * axis.y + axis.x * s;
+        m22 = mc * axis.z * axis.z + c;
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationAA(F c, F s, const Vec3_tpl<F>& axis)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationAA(c, s, axis);
+        return m33;
+    }
+
+    ILINE void SetRotationAA(const Vec3_tpl<F> axis)
+    {
+        F angle = axis.GetLength();
+        if (angle == F(0))
+        {
+            SetIdentity();
+        }
+        else
+        {
+            SetRotationAA(angle, axis / angle);
+        }
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationAA(const Vec3_tpl<F>& axis)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationAA(axis);
+        return m33;
+    }
+
+
+
+    /*!
+    *
+    * Create rotation-matrix about X axis using an angle.
+    * The angle is assumed to be in radians.
+    *
+    *  Example:
+    *       Matrix m33;
+    *       m33.SetRotationX(0.5f);
+    */
+    ILINE void SetRotationX(const f32 rad)
+    {
+        F s, c;
+        sincos_tpl(rad, &s, &c);
+        m00 = 1.0f;
+        m01 = 0.0f;
+        m02 =    0.0f;
+        m10 = 0.0f;
+        m11 = c;
+        m12 = -s;
+        m20 = 0.0f;
+        m21 = s;
+        m22 = c;
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationX(const f32 rad)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationX(rad);
+        return m33;
+    }
+
+    ILINE void SetRotationY(const f32 rad)
+    {
+        F s, c;
+        sincos_tpl(rad, &s, &c);
+        m00 =   c;
+        m01 =   0;
+        m02 =   s;
+        m10 =   0;
+        m11 =   1;
+        m12 =   0;
+        m20 = -s;
+        m21 =   0;
+        m22 = c;
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationY(const f32 rad)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationY(rad);
+        return m33;
+    }
+
+    ILINE void SetRotationZ(const f32 rad)
+    {
+        F s, c;
+        sincos_tpl(rad, &s, &c);
+        m00 =   c;
+        m01 = -s;
+        m02 =   0.0f;
+        m10 =   s;
+        m11 =   c;
+        m12 =   0.0f;
+        m20 =   0.0f;
+        m21 =   0.0f;
+        m22 = 1.0f;
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationZ(const f32 rad)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationZ(rad);
+        return m33;
+    }
+
+    ILINE void SetRotationXYZ(const Ang3_tpl<F>& rad)
+    {
+        assert(rad.IsValid());
+        F sx, cx;
+        sincos_tpl(rad.x, &sx, &cx);
+        F sy, cy;
+        sincos_tpl(rad.y, &sy, &cy);
+        F sz, cz;
+        sincos_tpl(rad.z, &sz, &cz);
+        F sycz  = (sy * cz), sysz  = (sy * sz);
+        m00 = cy * cz;
+        m01 = sycz * sx - cx * sz;
+        m02 = sycz * cx + sx * sz;
+        m10 = cy * sz;
+        m11 = sysz * sx + cx * cz;
+        m12 = sysz * cx - sx * cz;
+        m20 = -sy;
+        m21 = cy * sx;
+        m22 = cy * cx;
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationXYZ(const Ang3_tpl<F>& rad)
+    {
+        assert(rad.IsValid());
+        Matrix33_tpl<F> m33;
+        m33.SetRotationXYZ(rad);
+        return m33;
+    }
+
+
+
+
+    /*!
+    * Creates a rotation matrix that rotates the vector "v0" into "v1".
+    *
+    *   a) If both vectors are exactly parallel it returns an identity-matrix
+    *   b) CAUTION: If both vectors are exactly diametrical it returns a matrix that rotates
+    *    pi-radians about a "random" axis that is orthogonal to v0.
+    *   c) CAUTION: If both vectors are almost diametrical we have to normalize
+    *    a very small vector and the result is inaccurate. It is recommended to use this
+    *    function with 64-bit precision.
+    */
+    ILINE void SetRotationV0V1(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
+    {
+        assert((fabs_tpl(1 - (v0 | v0))) < 0.01); //check if unit-vector
+        assert((fabs_tpl(1 - (v1 | v1))) < 0.01); //check if unit-vector
+        F dot = v0 | v1;
+        if (dot < F(-0.9999f))
+        {
+            Vec3d axis = v0.GetOrthogonal().GetNormalized();
+            m00 = F(2 * axis.x * axis.x - 1);
+            m01 = F(2 * axis.x * axis.y);
+            m02 = F(2 * axis.x * axis.z);
+            m10 = F(2 * axis.y * axis.x);
+            m11 = F(2 * axis.y * axis.y - 1);
+            m12 = F(2 * axis.y * axis.z);
+            m20 = F(2 * axis.z * axis.x);
+            m21 = F(2 * axis.z * axis.y);
+            m22 = F(2 * axis.z * axis.z - 1);
+        }
+        else
+        {
+            Vec3_tpl<F> v = v0 % v1;
+            F h = 1 / (1 + dot);
+            m00 = F(dot + h * v.x * v.x);
+            m01 = F(h * v.x * v.y - v.z);
+            m02 = F(h * v.x * v.z + v.y);
+            m10 = F(h * v.x * v.y + v.z);
+            m11 = F(dot + h * v.y * v.y);
+            m12 = F(h * v.y * v.z - v.x);
+            m20 = F(h * v.x * v.z - v.y);
+            m21 = F(h * v.y * v.z + v.x);
+            m22 = F(dot + h * v.z * v.z);
+        }
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationV0V1(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationV0V1(v0, v1);
+        return m33;
+    }
+
+
+
+
+
+
+    /*!
+    *
+    * \param vdir  normalized view direction.
+    * \param roll  radiant to rotate about Y-axis.
+    *
+    *  Given a view-direction and a radiant to rotate about Y-axis, this function builds a 3x3 look-at matrix
+    *  using only simple vector arithmetic. This function is always using the implicit up-vector Vec3(0,0,1).
+    *  The view-direction is always stored in column(1).
+    *  IMPORTANT: The view-vector is assumed to be normalized, because all trig-values for the orientation are being
+    *  extracted  directly out of the vector. This function must NOT be called with a view-direction
+    *  that is close to Vec3(0,0,1) or Vec3(0,0,-1). If one of these rules is broken, the function returns a matrix
+    *  with an undefined rotation about the Z-axis.
+    *
+    *  Rotation order for the look-at-matrix is Z-X-Y. (Zaxis=YAW / Xaxis=PITCH / Yaxis=ROLL)
+    *
+    *  COORDINATE-SYSTEM
+    *
+    *  z-axis
+    *    ^
+    *    |
+    *    |  y-axis
+    *    |  /
+    *    | /
+    *    |/
+    *    +--------------->   x-axis
+    *
+    *  Example:
+    *       Matrix33 orientation=Matrix33::CreateRotationVDir( Vec3(0,1,0), 0 );
+    */
+    ILINE void SetRotationVDir(const Vec3_tpl<F>& vdir)
+    {
+        assert((fabs_tpl(1 - (vdir | vdir))) < 0.01);     //check if unit-vector
+        //set default initialisation for up-vector
+        m00 = 1;
+        m01 = 0;
+        m02 = 0;
+        m10 = 0;
+        m11 = 0;
+        m12 = -vdir.z;
+        m20 = 0;
+        m21 = vdir.z;
+        m22 = 0;
+        //calculate look-at matrix
+        F l = sqrt(vdir.x * vdir.x + vdir.y * vdir.y);
+        if (l > F(0.00001))
+        {
+            F xl = -vdir.x / l;
+            F yl = vdir.y / l;
+            m00 = F(yl);
+            m01 = F(vdir.x);
+            m02 = F(xl * vdir.z);
+            m10 = F(xl);
+            m11 = F(vdir.y);
+            m12 = F(-vdir.z * yl);
+            m20 = 0;
+            m21 = F(vdir.z);
+            m22 = F(l);
+        }
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationVDir(const Vec3_tpl<F> vdir)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationVDir(vdir);
+        return m33;
+    }
+
+
+    //look-at matrix with roll
+    ILINE void SetRotationVDir(const Vec3_tpl<F>& vdir, F roll)
+    {
+        SetRotationVDir(vdir);
+        F s, c;
+        sincos_tpl(roll, &s, &c);
+        F x00 = m00, x10 = m10;
+        m00 = m00 * c - m02 * s;
+        m02 = x00 * s + m02 * c;
+        m10 = m10 * c - m12 * s;
+        m12 = x10 * s + m12 * c;
+        m20 = -m22 * s;
+        m22 = m22 * c;
+    }
+    ILINE static Matrix33_tpl<F> CreateRotationVDir(const Vec3_tpl<F>& vdir, F roll)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetRotationVDir(vdir, roll);
+        return m33;
+    }
+
+
+    //! calculate 2 vector that form a orthogonal base with a given input vector (by M.M.)
+    //! /param invDirection input direction (has to be normalized)
+    //! /param outvA first output vector that is perpendicular to the input direction
+    //! /param outvB second output vector that is perpendicular the input vector and the first output vector
+    ILINE static Matrix33_tpl<F> CreateOrthogonalBase(const Vec3& invDirection)
+    {
+        Vec3 outvA;
+        if (invDirection.z < -0.5f || invDirection.z > 0.5f)
+        {
+            outvA = Vec3(invDirection.z, invDirection.y, -invDirection.x);
+        }
+        else
+        {
+            outvA = Vec3(invDirection.y, -invDirection.x, invDirection.z);
+        }
+        Vec3 outvB = (invDirection % outvA).GetNormalized();
+        outvA = (invDirection % outvB).GetNormalized();
+        return CreateFromVectors(invDirection, outvA, outvB);
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    ILINE static Matrix33_tpl<F> CreateOrientation(const Vec3_tpl<F>& dir, const Vec3_tpl<F>& up, float rollAngle)
+    {
+        // LookAt transform.
+        Vec3 xAxis, yAxis, zAxis;
+        Vec3 upVector = up;
+        if (dir.IsZeroFast())
+        {
+            Matrix33_tpl<F> tm;
+            tm.SetIdentity();
+            return tm;
+        }
+        yAxis = dir.GetNormalized();
+
+        if (yAxis.x == 0 && yAxis.y == 0 && up.IsEquivalent(Vec3_tpl<F>(0, 0, 1.0f)))
+        {
+            upVector.Set(-yAxis.z, 0, 0);
+        }
+
+        xAxis = (upVector % yAxis).GetNormalized();
+        zAxis = (xAxis % yAxis).GetNormalized();
+
+        Matrix33_tpl<F> tm;
+        tm.SetFromVectors(xAxis, yAxis, zAxis);
+
+        if (rollAngle != 0)
+        {
+            Matrix33_tpl<F> RollMtx;
+            RollMtx.SetRotationY(rollAngle);
+            tm = tm * RollMtx;
+        }
+        return tm;
+    }
+
+
+    /*!
+    *  Direct-Matrix-Slerp: for the sake of completeness, I have included the following expression
+    *  for Spherical-Linear-Interpolation without using quaternions. This is much faster then converting
+    *  both matrices into quaternions in order to do a quaternion slerp and then converting the slerped
+    *  quaternion back into a matrix.
+    *  This is a high-precision calculation. Given two orthonormal 3x3 matrices this function calculates
+    *  the shortest possible interpolation-path between the two rotations. The interpolation curve forms
+    *  a great arc on the rotation sphere (geodesic). Not only does Slerp follow a great arc it follows
+    *  the shortest great arc.  Furthermore Slerp has constant angular velocity. All in all Slerp is the
+    *  optimal interpolation curve between two rotations.
+    *
+    *  STABILITY PROBLEM: There are two singularities at angle=0 and angle=PI. At 0 the interpolation-axis
+    *  is arbitrary, which means any axis will produce the same result because we have no rotation. Thats
+    *  why I'm using (1,0,0). At PI the rotations point away from each other and the interpolation-axis
+    *  is unpredictable. In this case I'm also using the axis (1,0,0). If the angle is ~0 or ~PI, then we
+    *  have to normalize a very small vector and this can cause numerical instability. The quaternion-slerp
+    *  has exactly the same problems.
+    *                                                                                                  Ivo
+    *  Example:
+    *       Matrix33 slerp=Matrix33::CreateSlerp( m,n,0.333f );
+    */
+    ILINE void SetSlerp(const Matrix33_tpl<F>& m, const Matrix33_tpl<F>& n, F t)
+    {
+        assert(m.IsValid());
+        assert(n.IsValid());
+        //calculate delta-rotation between m and n (=39 flops)
+        Matrix33_tpl<F> d, i;
+        d.m00 = m.m00 * n.m00 + m.m10 * n.m10 + m.m20 * n.m20;
+        d.m01 = m.m00 * n.m01 + m.m10 * n.m11 + m.m20 * n.m21;
+        d.m02 = m.m00 * n.m02 + m.m10 * n.m12 + m.m20 * n.m22;
+        d.m10 = m.m01 * n.m00 + m.m11 * n.m10 + m.m21 * n.m20;
+        d.m11 = m.m01 * n.m01 + m.m11 * n.m11 + m.m21 * n.m21;
+        d.m12 = m.m01 * n.m02 + m.m11 * n.m12 + m.m21 * n.m22;
+        d.m20 = d.m01 * d.m12 - d.m02 * d.m11;
+        d.m21 = d.m02 * d.m10 - d.m00 * d.m12;
+        d.m22 = d.m00 * d.m11 - d.m01 * d.m10;
+        assert(d.IsOrthonormalRH(0.0001f));
+
+        Vec3_tpl<F> axis(d.m21 - d.m12, d.m02 - d.m20, d.m10 - d.m01);
+        F l = sqrt(axis | axis);
+        if (l > F(0.00001))
+        {
+            axis /= l;
+        }
+        else
+        {
+            axis(1, 0, 0);
+        }
+        i.SetRotationAA(acos(clamp_tpl((d.m00 + d.m11 + d.m22 - 1) * 0.5f, F(-1), F(+1))) * t, axis); //angle interpolation and calculation of new delta-matrix (=26 flops)
+
+        //final concatenation (=39 flops)
+        m00 = F(m.m00 * i.m00 + m.m01 * i.m10 + m.m02 * i.m20);
+        m01 = F(m.m00 * i.m01 + m.m01 * i.m11 + m.m02 * i.m21);
+        m02 = F(m.m00 * i.m02 + m.m01 * i.m12 + m.m02 * i.m22);
+        m10 = F(m.m10 * i.m00 + m.m11 * i.m10 + m.m12 * i.m20);
+        m11 = F(m.m10 * i.m01 + m.m11 * i.m11 + m.m12 * i.m21);
+        m12 = F(m.m10 * i.m02 + m.m11 * i.m12 + m.m12 * i.m22);
+        m20 = m01 * m12 - m02 * m11;
+        m21 = m02 * m10 - m00 * m12;
+        m22 = m00 * m11 - m01 * m10;
+        assert(this->IsOrthonormalRH(0.0001f));
+    }
+    ILINE static Matrix33_tpl<F> CreateSlerp(const Matrix33_tpl<F> m, const Matrix33_tpl<F> n, F t)
+    {
+        Matrix33_tpl<F> m33;
+        m33.SetSlerp(m, n, t);
+        return m33;
+    }
+
+
+    ILINE void SetScale(const Vec3_tpl<F>& s)
+    {
+        m00 = s.x;
+        m01 = 0;
+        m02 = 0;
+        m10 = 0;
+        m11 = s.y;
+        m12 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = s.z;
+    }
+    ILINE static Matrix33_tpl<F> CreateScale(const Vec3_tpl<F>& s) { Matrix33_tpl<F> m; m.SetScale(s);   return m;   }
+
+
+    //NOTE: all vectors are stored in columns
+    ILINE void SetFromVectors(const Vec3_tpl<F>& vx, const Vec3_tpl<F>& vy, const Vec3_tpl<F>& vz)
+    {
+        m00 = vx.x;
+        m01 = vy.x;
+        m02 = vz.x;
+        m10 = vx.y;
+        m11 = vy.y;
+        m12 = vz.y;
+        m20 = vx.z;
+        m21 = vy.z;
+        m22 = vz.z;
+    }
+    ILINE static Matrix33_tpl<F> CreateFromVectors(const Vec3_tpl<F>& vx, const Vec3_tpl<F>& vy, const Vec3_tpl<F>& vz) { Matrix33_tpl<F> dst; dst.SetFromVectors(vx, vy, vz); return dst;  }
+
+
+
+
+    ILINE void Transpose()   // in-place transposition
+    {
+        F t;
+        t = m01;
+        m01 = m10;
+        m10 = t;
+        t = m02;
+        m02 = m20;
+        m20 = t;
+        t = m12;
+        m12 = m21;
+        m21 = t;
+    }
+    ILINE Matrix33_tpl<F> GetTransposed() const
+    {
+        Matrix33_tpl<F> dst;
+        dst.m00 = m00;
+        dst.m01 = m10;
+        dst.m02 = m20;
+        dst.m10 = m01;
+        dst.m11 = m11;
+        dst.m12 = m21;
+        dst.m20 = m02;
+        dst.m21 = m12;
+        dst.m22 = m22;
+        return dst;
+    }
+    ILINE Matrix33_tpl<F> T() const { return GetTransposed(); }
+
+    ILINE Matrix33_tpl& Fabs()
+    {
+        m00 = fabs_tpl(m00);
+        m01 = fabs_tpl(m01);
+        m02 = fabs_tpl(m02);
+        m10 = fabs_tpl(m10);
+        m11 = fabs_tpl(m11);
+        m12 = fabs_tpl(m12);
+        m20 = fabs_tpl(m20);
+        m21 = fabs_tpl(m21);
+        m22 = fabs_tpl(m22);
+        return *this;
+    }
+    ILINE Matrix33_tpl<F> GetFabs() const { Matrix33_tpl<F> m = *this; m.Fabs();  return m;   }
+
+
+    ILINE void Adjoint(void)
+    {
+        //rescue members
+        Matrix33_tpl<F> m = *this;
+        //calculate the adjoint-matrix
+        m00 = m.m11 * m.m22 - m.m12 * m.m21;
+        m01 = m.m12 * m.m20 - m.m10 * m.m22;
+        m02 = m.m10 * m.m21 - m.m11 * m.m20;
+        m10 = m.m21 * m.m02 - m.m22 * m.m01;
+        m11 = m.m22 * m.m00 - m.m20 * m.m02;
+        m12 = m.m20 * m.m01 - m.m21 * m.m00;
+        m20 = m.m01 * m.m12 - m.m02 * m.m11;
+        m21 = m.m02 * m.m10 - m.m00 * m.m12;
+        m22 = m.m00 * m.m11 - m.m01 * m.m10;
+    }
+    ILINE Matrix33_tpl<F> GetAdjoint() const {  Matrix33_tpl<F> dst = *this; dst.Adjoint(); return dst;   }
+
+
+
+    /*!
+    *
+    * calculate a real inversion of a Matrix33.
+    * an inverse-matrix is an UnDo-matrix for all kind of transformations
+    * NOTE: if the return value of Invert33() is zero, then the inversion failed!
+    *
+    *  Example 1:
+    *       Matrix33 im33;
+    *       bool st=i33.Invert();
+    *   assert(st);
+    *
+    *  Example 2:
+    *   matrix33 im33=Matrix33::GetInverted(m33);
+    */
+    ILINE bool Invert(void)
+    {
+        //rescue members
+        Matrix33_tpl<F> m = *this;
+        //calculate the cofactor-matrix (=transposed adjoint-matrix)
+        m00 = m.m22 * m.m11 - m.m12 * m.m21;
+        m01 = m.m02 * m.m21 - m.m22 * m.m01;
+        m02 = m.m12 * m.m01 - m.m02 * m.m11;
+        m10 = m.m12 * m.m20 - m.m22 * m.m10;
+        m11 = m.m22 * m.m00 - m.m02 * m.m20;
+        m12 = m.m02 * m.m10 - m.m12 * m.m00;
+        m20 = m.m10 * m.m21 - m.m20 * m.m11;
+        m21 = m.m20 * m.m01 - m.m00 * m.m21;
+        m22 = m.m00 * m.m11 - m.m10 * m.m01;
+        // calculate determinant
+        F det = (m.m00 * m00 + m.m10 * m01 + m.m20 * m02);
+        if (fabs_tpl(det) < 1E-20f)
+        {
+            return 0;
+        }
+        //divide the cofactor-matrix by the determinant
+        F idet = (F)1.0 / det;
+        m00 *= idet;
+        m01 *= idet;
+        m02 *= idet;
+        m10 *= idet;
+        m11 *= idet;
+        m12 *= idet;
+        m20 *= idet;
+        m21 *= idet;
+        m22 *= idet;
+        return 1;
+    }
+    ILINE Matrix33_tpl<F> GetInverted() const
+    {
+        Matrix33_tpl<F> dst = *this;
+        dst.Invert();
+        return dst;
+    }
+
+    ILINE Vec3_tpl<F> TransformVector(const Vec3_tpl<F>& v) const
+    {
+        return Vec3_tpl<F>(m00 * v.x + m01 * v.y + m02 * v.z, m10 * v.x + m11 * v.y + m12 * v.z, m20 * v.x + m21 * v.y + m22 * v.z);
+    }
+
+
+
+    //! make a right-handed orthonormal matrix.
+    ILINE void OrthonormalizeFast()
+    {
+        Vec3 x = Vec3(m00, m10, m20).GetNormalized();
+        Vec3 y = (Vec3(m02, m12, m22) % x).GetNormalized();
+        Vec3 z = (x % y);
+        m00 = x.x;
+        m01 = y.x;
+        m02 = z.x;
+        m10 = x.y;
+        m11 = y.y;
+        m12 = z.y;
+        m20 = x.z;
+        m21 = y.z;
+        m22 = z.z;
+    }
+
+    ILINE f32 Determinant() const
+    {
+        return (m00 * m11 * m22) + (m01 * m12 * m20) + (m02 * m10 * m21) - (m02 * m11 * m20) - (m00 * m12 * m21) - (m01 * m10 * m22);
+    }
+
+    //--------------------------------------------------------------------------------
+    //----                  helper functions to access matrix-members     ------------
+    //--------------------------------------------------------------------------------
+    F* GetData() { return &m00; }
+    const F* GetData() const { return &m00; }
+
+    ILINE F operator () (uint32 i, uint32 j) const {    assert ((i < 3) && (j < 3));    const F* const p_data = (const F*)(&m00);     return p_data[i * 3 + j];   }
+    ILINE F& operator () (uint32 i, uint32 j)   {   assert ((i < 3) && (j < 3));    F* p_data = (F*)(&m00);       return p_data[i * 3 + j];   }
+    ILINE void SetRow(int i, const Vec3_tpl<F>& v)  {   assert(i < 3);    F* p = (F*)(&m00);    p[0 + 3 * i] = v.x;   p[1 + 3 * i] = v.y;   p[2 + 3 * i] = v.z;       }
+    ILINE Vec3_tpl<F> GetRow(int i) const   {   assert(i < 3);    const F* const p = (const F*)(&m00);  return Vec3_tpl<F>(p[0 + 3 * i], p[1 + 3 * i], p[2 + 3 * i]); }
+    ILINE void SetColumn(int i, const Vec3_tpl<F>& v)   {   assert(i < 3);    F* p = (F*)(&m00);    p[i + 3 * 0] = v.x;   p[i + 3 * 1] = v.y;   p[i + 3 * 2] = v.z;       }
+    ILINE Vec3_tpl<F> GetColumn(int i) const    {   assert(i < 3);    const F* const p = (const F*)(&m00);  return Vec3_tpl<F>(p[i + 3 * 0], p[i + 3 * 1], p[i + 3 * 2]); }
+
+
+    ILINE Vec3_tpl<F> GetColumn0() const    { return Vec3_tpl<F> (m00, m10, m20); }
+    ILINE Vec3_tpl<F> GetColumn1() const    { return Vec3_tpl<F> (m01, m11, m21); }
+    ILINE Vec3_tpl<F> GetColumn2() const    { return Vec3_tpl<F> (m02, m12, m22); }
+    ILINE void SetColumn0(const Vec3_tpl<F>& v) { m00 = v.x; m10 = v.y; m20 = v.z;    }
+    ILINE void SetColumn1(const Vec3_tpl<F>& v) { m01 = v.x; m11 = v.y; m21 = v.z;    }
+    ILINE void SetColumn2(const Vec3_tpl<F>& v) { m02 = v.x; m12 = v.y; m22 = v.z;    }
+
+    ILINE Matrix33_tpl<F>& operator *= (F op)
+    {
+        m00 *= op;
+        m01 *= op;
+        m02 *= op;
+        m10 *= op;
+        m11 *= op;
+        m12 *= op;
+        m20 *= op;
+        m21 *= op;
+        m22 *= op;
+        return *this;
+    }
+
+    ILINE Matrix33_tpl<F>& operator /= (F op)
+    {
+        F iop = (F)1.0 / op;
+        m00 *= iop;
+        m01 *= iop;
+        m02 *= iop;
+        m10 *= iop;
+        m11 *= iop;
+        m12 *= iop;
+        m20 *= iop;
+        m21 *= iop;
+        m22 *= iop;
+        return *this;
+    }
+
+    ILINE static bool IsEquivalent(const Matrix33_tpl<F>& m0, const Matrix33_tpl<F>& m1, F e = VEC_EPSILON)
+    {
+        return  (
+            (fabs_tpl(m0.m00 - m1.m00) <= e) && (fabs_tpl(m0.m01 - m1.m01) <= e) && (fabs_tpl(m0.m02 - m1.m02) <= e) &&
+            (fabs_tpl(m0.m10 - m1.m10) <= e) && (fabs_tpl(m0.m11 - m1.m11) <= e) && (fabs_tpl(m0.m12 - m1.m12) <= e) &&
+            (fabs_tpl(m0.m20 - m1.m20) <= e) && (fabs_tpl(m0.m21 - m1.m21) <= e) && (fabs_tpl(m0.m22 - m1.m22) <= e)
+            );
+    }
+
+    ILINE bool IsIdentity(F e) const
+    {
+        return  (
+            (fabs_tpl((F)1 - m00) <= e) && (fabs_tpl(m01) <= e) && (fabs_tpl(m02) <= e) &&
+            (fabs_tpl(m10) <= e) && (fabs_tpl((F)1 - m11) <= e) && (fabs_tpl(m12) <= e) &&
+            (fabs_tpl(m20) <= e) && (fabs_tpl(m21) <= e) && (fabs_tpl((F)1 - m22) <= e)
+            );
+    }
+
+    ILINE bool IsIdentity() const
+    {
+        return 0 == (fabs_tpl((F)1 - m00) + fabs_tpl(m01) + fabs_tpl(m02) + fabs_tpl(m10) + fabs_tpl((F)1 - m11) + fabs_tpl(m12) + fabs_tpl(m20) + fabs_tpl(m21) + fabs_tpl((F)1 - m22));
+    }
+    ILINE int IsZero() const
+    {
+        return 0 == (fabs_tpl(m00) + fabs_tpl(m01) + fabs_tpl(m02) + fabs_tpl(m10) + fabs_tpl(m11) + fabs_tpl(m12) + fabs_tpl(m20) + fabs_tpl(m21) + fabs_tpl(m22));
+    }
+
+    //check if we have an orthonormal-base (general case, works even with reflection matrices)
+    ILINE int IsOrthonormal(F threshold = 0.001) const
+    {
+        f32 d0 = fabs_tpl(GetColumn0() | GetColumn1());
+        if  (d0 > threshold)
+        {
+            return 0;
+        }
+        f32 d1 = fabs_tpl(GetColumn0() | GetColumn2());
+        if  (d1 > threshold)
+        {
+            return 0;
+        }
+        f32 d2 = fabs_tpl(GetColumn1() | GetColumn2());
+        if  (d2 > threshold)
+        {
+            return 0;
+        }
+        int a = (fabs_tpl(1 - (GetColumn0() | GetColumn0()))) < threshold;
+        int b = (fabs_tpl(1 - (GetColumn1() | GetColumn1()))) < threshold;
+        int c = (fabs_tpl(1 - (GetColumn2() | GetColumn2()))) < threshold;
+        return a & b & c;
+    }
+
+    //check if we have an orthonormal-base (assuming we are using a right-handed coordinate system)
+    ILINE int IsOrthonormalRH(F threshold = 0.002) const
+    {
+        Vec3_tpl<F> x = GetColumn0();
+        Vec3_tpl<F> y = GetColumn1();
+        Vec3_tpl<F> z = GetColumn2();
+        bool a = x.IsEquivalent(y % z, threshold);
+        bool b = y.IsEquivalent(z % x, threshold);
+        bool c = z.IsEquivalent(x % y, threshold);
+        a &= x.IsUnit(0.01f);
+        b &= y.IsUnit(0.01f);
+        c &= z.IsUnit(0.01f);
+        return a & b & c;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Remove uniform scale from matrix.
+    ILINE void NoScale()
+    {
+        *this /= GetColumn(0).GetLength();
+    }
+
+    ILINE bool IsValid() const
+    {
+        if (!NumberValid(m00))
+        {
+            return false;
+        }
+        if (!NumberValid(m01))
+        {
+            return false;
+        }
+        if (!NumberValid(m02))
+        {
+            return false;
+        }
+        if (!NumberValid(m10))
+        {
+            return false;
+        }
+        if (!NumberValid(m11))
+        {
+            return false;
+        }
+        if (!NumberValid(m12))
+        {
+            return false;
+        }
+        if (!NumberValid(m20))
+        {
+            return false;
+        }
+        if (!NumberValid(m21))
+        {
+            return false;
+        }
+        if (!NumberValid(m22))
+        {
+            return false;
+        }
+        return true;
+    }
+
+
+    AUTO_STRUCT_INFO
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Typedefs                                                                  //
+///////////////////////////////////////////////////////////////////////////////
+
+typedef Matrix33_tpl<f32>  Matrix33;  //always 32 bit
+typedef Matrix33_tpl<f64>  Matrix33d; //always 64 bit
+typedef Matrix33_tpl<real> Matrix33r; //variable float precision. depending on the target system it can be between 32, 64 or 80 bit
+typedef _MS_ALIGN(16) Matrix33_tpl<f32> _ALIGN (16) Matrix33A;
+
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//-------------       implementation of Matrix33      ------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+
+template<class F1, class F2>
+ILINE Matrix33_tpl<F1> operator*(const Matrix33_tpl<F1>& l, const Diag33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix33_tpl<F1> res;
+    res.m00 = l.m00 * r.x;
+    res.m01 = l.m01 * r.y;
+    res.m02 = l.m02 * r.z;
+    res.m10 = l.m10 * r.x;
+    res.m11 = l.m11 * r.y;
+    res.m12 = l.m12 * r.z;
+    res.m20 = l.m20 * r.x;
+    res.m21 = l.m21 * r.y;
+    res.m22 = l.m22 * r.z;
+    return res;
+}
+template<class F1, class F2>
+ILINE Matrix33_tpl<F1>& operator *= (Matrix33_tpl<F1>& l, const Diag33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    l.m00 *= r.x;
+    l.m01 *= r.y;
+    l.m02 *= r.z;
+    l.m10 *= r.x;
+    l.m11 *= r.y;
+    l.m12 *= r.z;
+    l.m20 *= r.x;
+    l.m21 *= r.y;
+    l.m22 *= r.z;
+    return l;
+}
+
+//Matrix33 operations with another Matrix33
+template<class F1, class F2>
+ILINE Matrix33_tpl<F1> operator * (const Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix33_tpl<F1> m;
+    m.m00 = l.m00 * r.m00 +   l.m01 * r.m10 +   l.m02 * r.m20;
+    m.m01 = l.m00 * r.m01 +   l.m01 * r.m11 +   l.m02 * r.m21;
+    m.m02 = l.m00 * r.m02 +   l.m01 * r.m12 +   l.m02 * r.m22;
+    m.m10 = l.m10 * r.m00 +   l.m11 * r.m10 +   l.m12 * r.m20;
+    m.m11 = l.m10 * r.m01 +   l.m11 * r.m11 +   l.m12 * r.m21;
+    m.m12 = l.m10 * r.m02 +   l.m11 * r.m12 +   l.m12 * r.m22;
+    m.m20 = l.m20 * r.m00 +   l.m21 * r.m10 + l.m22 * r.m20;
+    m.m21 = l.m20 * r.m01 +   l.m21 * r.m11 +   l.m22 * r.m21;
+    m.m22 = l.m20 * r.m02 +   l.m21 * r.m12 +   l.m22 * r.m22;
+    return m;
+}
+
+
+/*!
+*
+*  Implements the multiplication operator: Matrix34=Matrix33*Matrix34
+*
+*  Matrix33 and Matrix34 are specified in collumn order for a right-handed coordinate-system.
+*  AxB = operation B followed by operation A.
+*  A multiplication takes 36 muls and 24 adds.
+*
+*  Example:
+*   Matrix33 m33=Matrix33::CreateRotationX(1.94192f);;
+*   Matrix34 m34=Matrix34::CreateRotationZ(3.14192f);
+*     Matrix34 result=m33*m34;
+*
+*/
+template<class F1, class F2>
+ILINE Matrix34_tpl<F2> operator * (const Matrix33_tpl<F1>& l, const Matrix34_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix34_tpl<F2> m;
+    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
+    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
+    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
+    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
+    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
+    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
+    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
+    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
+    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
+    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23;
+    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23;
+    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23;
+    return m;
+}
+
+/*!
+*
+*  Implements the multiplication operator: Matrix44=Matrix33*Matrix44
+*
+*  Matrix33 and Matrix44 are specified in collumn order for a right-handed coordinate-system.
+*  AxB = operation B followed by operation A.
+*  A multiplication takes 36 muls and 24 adds.
+*
+*  Example:
+*   Matrix33 m33=Matrix33::CreateRotationX(1.94192f);;
+*   Matrix44 m44=Matrix33::CreateRotationZ(3.14192f);
+*     Matrix44 result=m33*m44;
+*
+*/
+template<class F1, class F2>
+ILINE Matrix44_tpl<F2> operator * (const Matrix33_tpl<F1>& l, const Matrix44_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix44_tpl<F2> m;
+    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
+    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
+    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
+    m.m30 = r.m30;
+    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
+    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
+    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
+    m.m31 = r.m31;
+    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
+    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
+    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
+    m.m32 = r.m32;
+    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23;
+    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23;
+    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23;
+    m.m33 = r.m33;
+    return m;
+}
+
+template<class F1, class F2>
+ILINE Matrix33_tpl<F1>& operator *= (Matrix33_tpl<F1>& l,   const Matrix33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix33_tpl<F1> tmp;
+    tmp.m00 = l.m00 * r.m00 + l.m01 * r.m10 +   l.m02 * r.m20;
+    tmp.m01 = l.m00 * r.m01 + l.m01 * r.m11 +   l.m02 * r.m21;
+    tmp.m02 = l.m00 * r.m02 + l.m01 * r.m12 +   l.m02 * r.m22;
+    tmp.m10 = l.m10 * r.m00 + l.m11 * r.m10 +   l.m12 * r.m20;
+    tmp.m11 = l.m10 * r.m01 + l.m11 * r.m11 +   l.m12 * r.m21;
+    tmp.m12 = l.m10 * r.m02 + l.m11 * r.m12 +   l.m12 * r.m22;
+    tmp.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
+    tmp.m21 = l.m20 * r.m01 + l.m21 * r.m11 +   l.m22 * r.m21;
+    tmp.m22 = l.m20 * r.m02 + l.m21 * r.m12 +   l.m22 * r.m22;
+    l = tmp;
+    return l;
+}
+
+
+template<class F1, class F2>
+ILINE Matrix33_tpl<F1> operator+(const Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix33_tpl<F1> res;
+    res.m00 = l.m00 + r.m00;
+    res.m01 = l.m01 + r.m01;
+    res.m02 = l.m02 + r.m02;
+    res.m10 = l.m10 + r.m10;
+    res.m11 = l.m11 + r.m11;
+    res.m12 = l.m12 + r.m12;
+    res.m20 = l.m20 + r.m20;
+    res.m21 = l.m21 + r.m21;
+    res.m22 = l.m22 + r.m22;
+    return res;
+}
+template<class F1, class F2>
+ILINE Matrix33_tpl<F1>& operator+=(Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    l.m00 += r.m00;
+    l.m01 += r.m01;
+    l.m02 += r.m02;
+    l.m10 += r.m10;
+    l.m11 += r.m11;
+    l.m12 += r.m12;
+    l.m20 += r.m20;
+    l.m21 += r.m21;
+    l.m22 += r.m22;
+    return l;
+}
+
+
+
+
+template<class F1, class F2>
+ILINE Matrix33_tpl<F1> operator - (const Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix33_tpl<F1> res;
+    res.m00 = l.m00 - r.m00;
+    res.m01 = l.m01 - r.m01;
+    res.m02 = l.m02 - r.m02;
+    res.m10 = l.m10 - r.m10;
+    res.m11 = l.m11 - r.m11;
+    res.m12 = l.m12 - r.m12;
+    res.m20 = l.m20 - r.m20;
+    res.m21 = l.m21 - r.m21;
+    res.m22 = l.m22 - r.m22;
+    return res;
+}
+template<class F1, class F2>
+ILINE Matrix33_tpl<F1>& operator-=(Matrix33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    l.m00 -= r.m00;
+    l.m01 -= r.m01;
+    l.m02 -= r.m02;
+    l.m10 -= r.m10;
+    l.m11 -= r.m11;
+    l.m12 -= r.m12;
+    l.m20 -= r.m20;
+    l.m21 -= r.m21;
+    l.m22 -= r.m22;
+    return l;
+}
+
+
+
+
+template<class F>
+ILINE Matrix33_tpl<F> operator*(const Matrix33_tpl<F>& m, F op)
+{
+    assert(m.IsValid());
+    Matrix33_tpl<F> res;
+    res.m00 = m.m00 * op;
+    res.m01 = m.m01 * op;
+    res.m02 = m.m02 * op;
+    res.m10 = m.m10 * op;
+    res.m11 = m.m11 * op;
+    res.m12 = m.m12 * op;
+    res.m20 = m.m20 * op;
+    res.m21 = m.m21 * op;
+    res.m22 = m.m22 * op;
+    return res;
+}
+template<class F>
+ILINE Matrix33_tpl<F> operator/(const Matrix33_tpl<F>& src, F op) { return src * ((F)1.0 / op); }
+
+//post-multiply
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator*(const Matrix33_tpl<F2>& m, const Vec3_tpl<F1>& p)
+{
+    assert(m.IsValid());
+    assert(p.IsValid());
+    Vec3_tpl<F1> tp;
+    tp.x    =   F1(m.m00 * p.x + m.m01 * p.y + m.m02 * p.z);
+    tp.y    =   F1(m.m10 * p.x + m.m11 * p.y + m.m12 * p.z);
+    tp.z    =   F1(m.m20 * p.x + m.m21 * p.y + m.m22 * p.z);
+    return tp;
+}
+
+//pre-multiply
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator*(const Vec3_tpl<F1>& p, const Matrix33_tpl<F2>& m)
+{
+    assert(m.IsValid());
+    assert(p.IsValid());
+    Vec3_tpl<F1> tp;
+    tp.x    =   F1(p.x * m.m00 + p.y * m.m10 + p.z * m.m20);
+    tp.y    =   F1(p.x * m.m01 + p.y * m.m11 + p.z * m.m21);
+    tp.z    =   F1(p.x * m.m02 + p.y * m.m12 + p.z * m.m22);
+    return tp;
+}
+
+//post-multiply
+template<class F1, class F2>
+ILINE Vec2_tpl<F1> operator*(const Matrix33_tpl<F2>& m, const Vec2_tpl<F1>& v)
+{
+    assert(m.IsValid());
+    assert(v.IsValid());
+    return Vec2_tpl<F1>(v.x * m.m00 + v.y * m.m01,    v.x * m.m10 + v.y * m.m11);
+}
+
+//pre-multiply
+template<class F1, class F2>
+ILINE Vec2_tpl<F1> operator*(const Vec2_tpl<F1>& v, const Matrix33_tpl<F2>& m)
+{
+    assert(m.IsValid());
+    assert(v.IsValid());
+    return Vec2_tpl<F1>(v.x * m.m00 + v.y * m.m10, v.x * m.m01 + v.y * m.m11);
+}
+
+template<class F1>
+ILINE Matrix33_tpl<F1>& crossproduct_matrix(const Vec3_tpl<F1>& v, Matrix33_tpl<F1>& m)
+{
+    m.m00 = 0;
+    m.m01 = -v.z;
+    m.m02 = v.y;
+    m.m10 = v.z;
+    m.m11 = 0;
+    m.m12 = -v.x;
+    m.m20 = -v.y;
+    m.m21 = v.x;
+    m.m22 = 0;
+    return m;
+}
+
+template<class F1>
+ILINE Matrix33_tpl<F1>& dotproduct_matrix(const Vec3_tpl<F1>& v, const Vec3_tpl<F1>& op, Matrix33_tpl<F1>& m)
+{
+    m.m00 = v.x * op.x;
+    m.m10 = v.y * op.x;
+    m.m20 = v.z * op.x;
+    m.m01 = v.x * op.y;
+    m.m11 = v.y * op.y;
+    m.m21 = v.z * op.y;
+    m.m02 = v.x * op.z;
+    m.m12 = v.y * op.z;
+    m.m22 = v.z * op.z;
+    return m;
+}
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_MATRIX33_H
+
diff --git a/Code/Legacy/CryCommon/Cry_Matrix34.h b/Code/Legacy/CryCommon/Cry_Matrix34.h
new file mode 100644
index 0000000000..edfde740b5
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Matrix34.h
@@ -0,0 +1,1462 @@
+/*
+ * 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 matrix class
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_MATRIX34_H
+#define CRYINCLUDE_CRYCOMMON_CRY_MATRIX34_H
+#pragma once
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Matrix34_tpl
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+template <typename F>
+struct Matrix34_tpl
+{
+    F m00, m01, m02, m03;
+    F m10, m11, m12, m13;
+    F m20, m21, m22, m23;
+
+    //default constructor
+#if defined(_DEBUG)
+    ILINE Matrix34_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = (uint32*)&m00;
+            p[ 0] = F32NAN;
+            p[ 1] = F32NAN;
+            p[ 2] = F32NAN;
+            p[ 3] = F32NAN;
+            p[ 4] = F32NAN;
+            p[ 5] = F32NAN;
+            p[ 6] = F32NAN;
+            p[ 7] = F32NAN;
+            p[ 8] = F32NAN;
+            p[ 9] = F32NAN;
+            p[10] = F32NAN;
+            p[11] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = (uint64*)&m00;
+            p[ 0] = F64NAN;
+            p[ 1] = F64NAN;
+            p[ 2] = F64NAN;
+            p[ 3] = F64NAN;
+            p[ 4] = F64NAN;
+            p[ 5] = F64NAN;
+            p[ 6] = F64NAN;
+            p[ 7] = F64NAN;
+            p[ 8] = F64NAN;
+            p[ 9] = F64NAN;
+            p[10] = F64NAN;
+            p[11] = F64NAN;
+        }
+    }
+#else
+    ILINE Matrix34_tpl(){};
+#endif
+
+    //set matrix to Identity
+    ILINE Matrix34_tpl(type_identity)
+    {
+        m00 = 1;
+        m01 = 0;
+        m02 = 0;
+        m03 = 0;
+        m10 = 0;
+        m11 = 1;
+        m12 = 0;
+        m13 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = 1;
+        m23 = 0;
+    }
+
+    //set matrix to Zero
+    ILINE Matrix34_tpl(type_zero)
+    {
+        m00 = 0;
+        m01 = 0;
+        m02 = 0;
+        m03 = 0;
+        m10 = 0;
+        m11 = 0;
+        m12 = 0;
+        m13 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = 0;
+        m23 = 0;
+    }
+
+    //ASSIGNMENT OPERATOR of identical Matrix33 types.
+    //The assignment operator has precedence over assignment constructor
+    //Matrix34 m; m=m34;
+    ILINE Matrix34_tpl<F>& operator = (const Matrix34_tpl<F>& m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = m.m03;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = m.m13;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = m.m23;
+        return *this;
+    }
+
+
+
+
+    //--------------------------------------------------------------------
+    //----   implementation of the constructors                        ---
+    //--------------------------------------------------------------------
+
+
+    //CONSTRUCTOR for identical float-types. It initialises a matrix34 with 12 floats.
+    ILINE Matrix34_tpl<F>(F v00, F v01, F v02, F v03, F v10, F v11, F v12, F v13, F v20, F v21, F v22, F v23)
+    {
+        m00 = v00;
+        m01 = v01;
+        m02 = v02;
+        m03 = v03;
+        m10 = v10;
+        m11 = v11;
+        m12 = v12;
+        m13 = v13;
+        m20 = v20;
+        m21 = v21;
+        m22 = v22;
+        m23 = v23;
+    }
+    //CONSTRUCTOR for different float-types. It initialises a matrix34 with 12 floats.
+    template<class F1>
+    ILINE Matrix34_tpl<F>(F1 v00, F1 v01, F1 v02, F1 v03, F1 v10, F1 v11, F1 v12, F1 v13, F1 v20, F1 v21, F1 v22, F1 v23)
+    {
+        m00 = F(v00);
+        m01 = F(v01);
+        m02 = F(v02);
+        m03 = F(v03);
+        m10 = F(v10);
+        m11 = F(v11);
+        m12 = F(v12);
+        m13 = F(v13);
+        m20 = F(v20);
+        m21 = F(v21);
+        m22 = F(v22);
+        m23 = F(v23);
+    }
+
+
+    //CONSTRUCTOR for identical float-types. It converts a Matrix33 into a Matrix34.
+    //Matrix34(m33);
+    ILINE Matrix34_tpl<F>(const Matrix33_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = 0;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = 0;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = 0;
+    }
+    //CONSTRUCTOR for different float-types. It converts a Matrix33 into a Matrix34 and also converts between double/float.
+    //Matrix34(Matrix33);
+    template<class F1>
+    ILINE Matrix34_tpl<F>(const Matrix33_tpl<F1>&m)
+    {
+        assert(m.IsValid());
+        m00 = F(m.m00);
+        m01 = F(m.m01);
+        m02 = F(m.m02);
+        m03 = 0;
+        m10 = F(m.m10);
+        m11 = F(m.m11);
+        m12 = F(m.m12);
+        m13 = 0;
+        m20 = F(m.m20);
+        m21 = F(m.m21);
+        m22 = F(m.m22);
+        m23 = 0;
+    }
+
+
+    //CONSTRUCTOR for identical float-types. It converts a Matrix33 with a translation-vector into a Matrix34.
+    //Matrix34(m33,Vec3(1,2,3));
+    ILINE Matrix34_tpl<F>(const Matrix33_tpl<F>&m, const Vec3_tpl<F>&t)
+    {
+        assert(m.IsValid());
+        assert(t.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = t.x;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = t.y;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = t.z;
+    }
+    //CONSTRUCTOR for different float-types. It converts a Matrix33 with a translation-vector into a Matrix34 and also converts between double/float.
+    //Matrix34(Matrix33r,Vec3d(1,2,3));
+    template<class F1>
+    ILINE Matrix34_tpl<F>(const Matrix33_tpl<F1>&m, const Vec3_tpl<F1>&t)
+    {
+        assert(m.IsValid());
+        assert(t.IsValid());
+        m00 = F(m.m00);
+        m01 = F(m.m01);
+        m02 = F(m.m02);
+        m03 = F(t.x);
+        m10 = F(m.m10);
+        m11 = F(m.m11);
+        m12 = F(m.m12);
+        m13 = F(t.y);
+        m20 = F(m.m20);
+        m21 = F(m.m21);
+        m22 = F(m.m22);
+        m23 = F(t.z);
+    }
+
+
+
+    //CONSTRUCTOR for identical float types
+    //Matrix34 m=m34;
+    ILINE Matrix34_tpl<F>(const Matrix34_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = m.m03;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = m.m13;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = m.m23;
+    }
+    //CONSTRUCTOR for different float-types.
+    //Matrix34 m=m34d;
+    template<class F1>
+    ILINE Matrix34_tpl<F>(const Matrix34_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);
+    }
+
+
+    //CONSTRUCTOR for identical float-types. It converts a Matrix44 into a Matrix34.
+    //Needs to be 'explicit' because we loose the translation vector in the conversion process
+    //Matrix34(m44);
+    ILINE explicit Matrix34_tpl<F>(const Matrix44_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = m.m03;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = m.m13;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = m.m23;
+    }
+    //CONSTRUCTOR for different float types. It converts a Matrix44 into a Matrix34 and converts between double/float.
+    //Needs to be 'explicit' because we loose the translation vector in the conversion process
+    //Matrix34(m44r);
+    template<class F1>
+    ILINE explicit Matrix34_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);
+    }
+
+    //CONSTRUCTOR for identical float-types. It converts a Quat into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    explicit ILINE Matrix34_tpl<F>(const Quat_tpl<F>&q)
+    {
+        *this = Matrix33_tpl<F>(q);
+    }
+    //CONSTRUCTOR for different float-types. It converts a Quat into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatTd);
+    template<class F1>
+    explicit ILINE Matrix34_tpl<F>(const Quat_tpl<F1>&q)
+    {
+        *this = Matrix33_tpl<F>(q);
+    }
+
+
+
+    //CONSTRUCTOR for identical float-types. It converts a QuatT into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    explicit ILINE Matrix34_tpl<F>(const QuatT_tpl<F> &q)
+    {
+        *this = Matrix34_tpl<F>(Matrix33_tpl<F>(q.q), q.t);
+    }
+    //CONSTRUCTOR for different float-types. It converts a QuatT into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    template<class F1>
+    ILINE explicit Matrix34_tpl(const QuatT_tpl<F1> q)
+    {
+        *this = Matrix34_tpl<F>(Matrix33_tpl<F1>(q.q), q.t);
+    }
+
+
+
+
+    //CONSTRUCTOR for identical float-types. It converts a QuatTS into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    explicit ILINE Matrix34_tpl<F>(const QuatTS_tpl<F> &q)
+    {
+        assert(q.q.IsValid());
+        Vec3_tpl<F> v2 = q.q.v + q.q.v;
+        F xx = 1 - v2.x * q.q.v.x;
+        F yy = v2.y * q.q.v.y;
+        F xw = v2.x * q.q.w;
+        F xy = v2.y * q.q.v.x;
+        F yz = v2.z * q.q.v.y;
+        F yw = v2.y * q.q.w;
+        F xz = v2.z * q.q.v.x;
+        F zz = v2.z * q.q.v.z;
+        F zw = v2.z * q.q.w;
+        m00 = (1 - yy - zz) * q.s;
+        m01 = (xy - zw) * q.s;
+        m02 = (xz + yw) * q.s;
+        m03 = q.t.x;
+        m10 = (xy + zw) * q.s;
+        m11 = (xx - zz) * q.s;
+        m12 = (yz - xw) * q.s;
+        m13 = q.t.y;
+        m20 = (xz - yw) * q.s;
+        m21 = (yz + xw) * q.s;
+        m22 = (xx - yy) * q.s;
+        m23 = q.t.z;
+    }
+    //CONSTRUCTOR for different float-types. It converts a QuatTS into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    template<class F1>
+    ILINE explicit Matrix34_tpl<F>(const QuatTS_tpl<F1> &q)
+    {
+        assert(q.q.IsValid());
+        Vec3_tpl<F1> v2 = q.q.v + q.q.v;
+        F1 xx = 1 - v2.x * q.q.v.x;
+        F1 yy = v2.y * q.q.v.y;
+        F1 xw = v2.x * q.q.w;
+        F1 xy = v2.y * q.q.v.x;
+        F1 yz = v2.z * q.q.v.y;
+        F1 yw = v2.y * q.q.w;
+        F1 xz = v2.z * q.q.v.x;
+        F1 zz = v2.z * q.q.v.z;
+        F1 zw = v2.z * q.q.w;
+        m00 = F((1 - yy - zz) * q.s);
+        m01 = F((xy - zw) * q.s);
+        m02 = F((xz + yw) * q.s);
+        m03 = F(q.t.x);
+        m10 = F((xy + zw) * q.s);
+        m11 = F((xx - zz) * q.s);
+        m12 = F((yz - xw) * q.s);
+        m13 = F(q.t.y);
+        m20 = F((xz - yw) * q.s);
+        m21 = F((yz + xw) * q.s);
+        m22 = F((xx - yy) * q.s);
+        m23 = F(q.t.z);
+    }
+
+
+
+
+    //CONSTRUCTOR for identical float-types. It converts a QuatTNS into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    explicit ILINE Matrix34_tpl<F>(const QuatTNS_tpl<F> &q)
+    {
+        assert(q.q.IsValid());
+        Vec3_tpl<F> v2 = q.q.v + q.q.v;
+        F xx = 1 - v2.x * q.q.v.x;
+        F yy = v2.y * q.q.v.y;
+        F xw = v2.x * q.q.w;
+        F xy = v2.y * q.q.v.x;
+        F yz = v2.z * q.q.v.y;
+        F yw = v2.y * q.q.w;
+        F xz = v2.z * q.q.v.x;
+        F zz = v2.z * q.q.v.z;
+        F zw = v2.z * q.q.w;
+        m00 = (1 - yy - zz) * q.s.x;
+        m01 = (xy - zw) * q.s.y;
+        m02 = (xz + yw) * q.s.z;
+        m03 = q.t.x;
+        m10 = (xy + zw) * q.s.x;
+        m11 = (xx - zz) * q.s.y;
+        m12 = (yz - xw) * q.s.z;
+        m13 = q.t.y;
+        m20 = (xz - yw) * q.s.x;
+        m21 = (yz + xw) * q.s.y;
+        m22 = (xx - yy) * q.s.z;
+        m23 = q.t.z;
+    }
+    //CONSTRUCTOR for different float-types. It converts a QuatTNS into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    template<class F1>
+    ILINE explicit Matrix34_tpl<F>(const QuatTNS_tpl<F1> &q)
+    {
+        assert(q.q.IsValid());
+        Vec3_tpl<F1> v2 = q.q.v + q.q.v;
+        F1 xx = 1 - v2.x * q.q.v.x;
+        F1 yy = v2.y * q.q.v.y;
+        F1 xw = v2.x * q.q.w;
+        F1 xy = v2.y * q.q.v.x;
+        F1 yz = v2.z * q.q.v.y;
+        F1 yw = v2.y * q.q.w;
+        F1 xz = v2.z * q.q.v.x;
+        F1 zz = v2.z * q.q.v.z;
+        F1 zw = v2.z * q.q.w;
+        m00 = F((1 - yy - zz) * q.s.x);
+        m01 = F((xy - zw) * q.s.y);
+        m02 = F((xz + yw) * q.s.z);
+        m03 = F(q.t.x);
+        m10 = F((xy + zw) * q.s.x);
+        m11 = F((xx - zz) * q.s.y);
+        m12 = F((yz - xw) * q.s.z);
+        m13 = F(q.t.y);
+        m20 = F((xz - yw) * q.s.x);
+        m21 = F((yz + xw) * q.s.y);
+        m22 = F((xx - yy) * q.s.z);
+        m23 = F(q.t.z);
+    }
+
+
+
+
+    //CONSTRUCTOR for identical float-types. It converts a DualQuat into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    ILINE explicit Matrix34_tpl<F>(const DualQuat_tpl<F> &q)
+    {
+        assert((fabs_tpl(1 - (q.nq | q.nq))) < 0.01); //check if unit-quaternion
+        Vec3_tpl<F>  t = (q.nq.w * q.dq.v - q.dq.w * q.nq.v + q.nq.v % q.dq.v); //perfect for HLSL
+        Vec3_tpl<F> v2 = q.nq.v + q.nq.v;
+        F xx = 1 - v2.x * q.nq.v.x;
+        F yy = v2.y * q.nq.v.y;
+        F xw = v2.x * q.nq.w;
+        F xy = v2.y * q.nq.v.x;
+        F yz = v2.z * q.nq.v.y;
+        F yw = v2.y * q.nq.w;
+        F xz = v2.z * q.nq.v.x;
+        F zz = v2.z * q.nq.v.z;
+        F zw = v2.z * q.nq.w;
+        m00 = 1 - yy - zz;
+        m01 = xy - zw;
+        m02 = xz + yw;
+        m03 = t.x + t.x;
+        m10 = xy + zw;
+        m11 = xx - zz;
+        m12 = yz - xw;
+        m13 = t.y + t.y;
+        m20 = xz - yw;
+        m21 = yz + xw;
+        m22 = xx - yy;
+        m23 = t.z + t.z;
+    }
+    //CONSTRUCTOR for different float-types. It converts a DualQuat into a Matrix34.
+    //Needs to be 'explicit' because we loose float-precision in the conversion process
+    //Matrix34(QuatT);
+    template<class F1>
+    ILINE explicit Matrix34_tpl<F>(const DualQuat_tpl<F1> &q)
+    {
+        assert((fabs_tpl(1 - (q.nq | q.nq))) < 0.01); //check if unit-quaternion
+        Vec3_tpl<F1>  t = (q.nq.w * q.dq.v - q.dq.w * q.nq.v + q.nq.v % q.dq.v); //perfect for HLSL
+        Vec3_tpl<F1> v2 = q.nq.v + q.nq.v;
+        F1 xx = 1 - v2.x * q.nq.v.x;
+        F1 yy = v2.y * q.nq.v.y;
+        F1 xw = v2.x * q.nq.w;
+        F1 xy = v2.y * q.nq.v.x;
+        F1 yz = v2.z * q.nq.v.y;
+        F1 yw = v2.y * q.nq.w;
+        F1 xz = v2.z * q.nq.v.x;
+        F1 zz = v2.z * q.nq.v.z;
+        F1 zw = v2.z * q.nq.w;
+        m00 = F(1 - yy - zz);
+        m01 = F(xy - zw);
+        m02 = F(xz + yw);
+        m03 = F(t.x + t.x);
+        m10 = F(xy + zw);
+        m11 = F(xx - zz);
+        m12 = F(yz - xw);
+        m13 = F(t.y + t.y);
+        m20 = F(xz - yw);
+        m21 = F(yz + xw);
+        m22 = F(xx - yy);
+        m23 = F(t.z + t.z);
+    }
+
+
+
+
+
+
+    //apply scaling to the columns of the matrix.
+    ILINE void ScaleColumn(const Vec3_tpl<F>& s)
+    {
+        m00 *= s.x;
+        m01 *= s.y;
+        m02 *= s.z;
+        m10 *= s.x;
+        m11 *= s.y;
+        m12 *= s.z;
+        m20 *= s.x;
+        m21 *= s.y;
+        m22 *= s.z;
+    }
+
+    /*!
+    *
+    *  Initializes the Matrix34 with the identity.
+    *
+    */
+    void SetIdentity(void)
+    {
+        m00 = 1.0f;
+        m01 = 0.0f;
+        m02 = 0.0f;
+        m03 = 0.0f;
+        m10 = 0.0f;
+        m11 = 1.0f;
+        m12 = 0.0f;
+        m13 = 0.0f;
+        m20 = 0.0f;
+        m21 = 0.0f;
+        m22 = 1.0f;
+        m23 = 0.0f;
+    }
+
+    ILINE static Matrix34_tpl<F> CreateIdentity(void)
+    {
+        Matrix34_tpl<F> m;
+        m.SetIdentity();
+        return m;
+    }
+
+    ILINE bool IsIdentity() const
+    {
+        return 0 == (fabs_tpl((F)1 - m00) + fabs_tpl(m01) + fabs_tpl(m02) + fabs_tpl(m03) + fabs_tpl(m10) + fabs_tpl((F)1 - m11) + fabs_tpl(m12) + fabs_tpl(m13) + fabs_tpl(m20) + fabs_tpl(m21) + fabs_tpl((F)1 - m22)) + fabs_tpl(m23);
+    }
+
+    ILINE int IsZero() const
+    {
+        return 0 == (fabs_tpl(m00) + fabs_tpl(m01) + fabs_tpl(m02) + fabs_tpl(m03) + fabs_tpl(m10) + fabs_tpl(m11) + fabs_tpl(m12) + fabs_tpl(m13) + fabs_tpl(m20) + fabs_tpl(m21) + fabs_tpl(m22)) + fabs_tpl(m23);
+    }
+
+    /*!
+    *  Create a rotation matrix around an arbitrary axis (Eulers Theorem).
+    *  The axis is specified as an normalized Vec3. The angle is assumed to be in radians.
+    *  This function also assumes a translation-vector and stores it in the right column.
+    *
+    *  Example:
+    *       Matrix34 m34;
+    *       Vec3 axis=GetNormalized( Vec3(-1.0f,-0.3f,0.0f) );
+    *       m34.SetRotationAA( 3.14314f, axis, Vec3(5,5,5) );
+    */
+    ILINE void SetRotationAA(const F rad, const Vec3_tpl<F>& axis, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        *this = Matrix33_tpl<F>::CreateRotationAA(rad, axis);
+        this->SetTranslation(t);
+    }
+    ILINE static Matrix34_tpl<F> CreateRotationAA(const F rad, const Vec3_tpl<F>& axis, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Matrix34_tpl<F> m34;
+        m34.SetRotationAA(rad, axis, t);
+        return m34;
+    }
+
+    ILINE void SetRotationAA(const Vec3_tpl<F>& rot, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        *this = Matrix33_tpl<F>::CreateRotationAA(rot);
+        this->SetTranslation(t);
+    }
+    ILINE static Matrix34_tpl<F> CreateRotationAA(const Vec3_tpl<F>& rot, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Matrix34_tpl<F> m34;
+        m34.SetRotationAA(rot, t);
+        return m34;
+    }
+
+
+    /*!
+    * Create rotation-matrix about X axis using an angle.
+    * The angle is assumed to be in radians.
+    * The translation-vector is set to zero.
+    *
+    *  Example:
+    *       Matrix34 m34;
+    *       m34.SetRotationX(0.5f);
+    */
+    ILINE void SetRotationX(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        *this = Matrix33_tpl<F>::CreateRotationX(rad);
+        this->SetTranslation(t);
+    }
+    ILINE static Matrix34_tpl<F> CreateRotationX(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Matrix34_tpl<F> m34;
+        m34.SetRotationX(rad, t);
+        return m34;
+    }
+
+    /*!
+    * Create rotation-matrix about Y axis using an angle.
+    * The angle is assumed to be in radians.
+    * The translation-vector is set to zero.
+    *
+    *  Example:
+    *       Matrix34 m34;
+    *       m34.SetRotationY(0.5f);
+    */
+    ILINE void SetRotationY(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        *this = Matrix33_tpl<F>::CreateRotationY(rad);
+        this->SetTranslation(t);
+    }
+    ILINE static Matrix34_tpl<F> CreateRotationY(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Matrix34_tpl<F> m34;
+        m34.SetRotationY(rad, t);
+        return m34;
+    }
+
+    /*!
+    * Create rotation-matrix about Z axis using an angle.
+    * The angle is assumed to be in radians.
+    * The translation-vector is set to zero.
+    *
+    *  Example:
+    *       Matrix34 m34;
+    *       m34.SetRotationZ(0.5f);
+    */
+    ILINE void SetRotationZ(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        *this = Matrix33_tpl<F>::CreateRotationZ(rad);
+        this->SetTranslation(t);
+    }
+    ILINE static Matrix34_tpl<F> CreateRotationZ(const f32 rad, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Matrix34_tpl<F> m34;
+        m34.SetRotationZ(rad, t);
+        return m34;
+    }
+
+
+    /*!
+    *
+    * Convert three Euler angle to mat33 (rotation order:XYZ)
+    * The Euler angles are assumed to be in radians.
+    * The translation-vector is set to zero.
+    *
+    *  Example 1:
+    *       Matrix34 m34;
+    *       m34.SetRotationXYZ( Ang3(0.5f,0.2f,0.9f), translation );
+    *
+    *  Example 2:
+    *       Matrix34 m34=Matrix34::CreateRotationXYZ( Ang3(0.5f,0.2f,0.9f), translation );
+    */
+    ILINE void SetRotationXYZ(const Ang3_tpl<F>& rad, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        assert(rad.IsValid());
+        assert(t.IsValid());
+        *this = Matrix33_tpl<F>::CreateRotationXYZ(rad);
+        this->SetTranslation(t);
+    }
+    ILINE static Matrix34_tpl<F> CreateRotationXYZ(const Ang3_tpl<F>& rad, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        assert(rad.IsValid());
+        assert(t.IsValid());
+        Matrix34_tpl<F> m34;
+        m34.SetRotationXYZ(rad, t);
+        return m34;
+    }
+
+
+    ILINE void SetRotationAA(F c, F s, Vec3_tpl<F> axis, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        assert(axis.IsValid());
+        assert(t.IsValid());
+        *this = Matrix33_tpl<F>::CreateRotationAA(c, s, axis);
+        m03 = t.x;
+        m13 = t.y;
+        m23 = t.z;
+    }
+    ILINE static Matrix34_tpl<F> CreateRotationAA(F c, F s, Vec3_tpl<F> axis, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Matrix34_tpl<F> m34;
+        m34.SetRotationAA(c, s, axis, t);
+        return m34;
+    }
+
+    ILINE void SetTranslationMat(const Vec3_tpl<F>& v)
+    {
+        m00 = 1.0f;
+        m01 = 0.0f;
+        m02 = 0.0f;
+        m03 = v.x;
+        m10 = 0.0f;
+        m11 = 1.0f;
+        m12 = 0.0f;
+        m13 = v.y;
+        m20 = 0.0f;
+        m21 = 0.0f;
+        m22 = 1.0f;
+        m23 = v.z;
+    }
+    ILINE static Matrix34_tpl<F> CreateTranslationMat(const Vec3_tpl<F>& v)
+    {
+        Matrix34_tpl<F> m34;
+        m34.SetTranslationMat(v);
+        return m34;
+    }
+
+
+    //NOTE: all vectors are stored in columns
+    ILINE void SetFromVectors(const Vec3& vx, const Vec3& vy, const Vec3& vz, const Vec3& pos)
+    {
+        m00 = vx.x;
+        m01 = vy.x;
+        m02 = vz.x;
+        m03 = pos.x;
+        m10 = vx.y;
+        m11 = vy.y;
+        m12 = vz.y;
+        m13 = pos.y;
+        m20 = vx.z;
+        m21 = vy.z;
+        m22 = vz.z;
+        m23 = pos.z;
+    }
+    ILINE static Matrix34_tpl<F> CreateFromVectors(const Vec3_tpl<F>& vx, const Vec3_tpl<F>& vy, const Vec3_tpl<F>& vz, const Vec3_tpl<F>& pos)
+    {
+        Matrix34_tpl<F> m;
+        m.SetFromVectors(vx, vy, vz, pos);
+        return m;
+    }
+
+    void InvertFast()
+    { // in-place transposition
+        assert(IsOrthonormal());
+        F t;
+        Vec3 v(m03, m13, m23);
+        t = m01;
+        m01 = m10;
+        m10 = t;
+        m03 = -v.x * m00 - v.y * m01 - v.z * m20;
+        t = m02;
+        m02 = m20;
+        m20 = t;
+        m13 = -v.x * m10 - v.y * m11 - v.z * m21;
+        t = m12;
+        m12 = m21;
+        m21 = t;
+        m23 = -v.x * m20 - v.y * m21 - v.z * m22;
+    }
+
+    Matrix34_tpl<F> GetInvertedFast() const
+    {
+        assert(IsOrthonormal());
+        Matrix34_tpl<F> dst;
+        dst.m00 = m00;
+        dst.m01 = m10;
+        dst.m02 = m20;
+        dst.m03 = -m03 * m00 - m13 * m10 - m23 * m20;
+        dst.m10 = m01;
+        dst.m11 = m11;
+        dst.m12 = m21;
+        dst.m13 = -m03 * m01 - m13 * m11 - m23 * m21;
+        dst.m20 = m02;
+        dst.m21 = m12;
+        dst.m22 = m22;
+        dst.m23 = -m03 * m02 - m13 * m12 - m23 * m22;
+        return dst;
+    }
+
+    //! transforms a vector. the translation is not beeing considered
+    ILINE Vec3_tpl<F> TransformVector(const Vec3_tpl<F>& v) const
+    {
+        assert(v.IsValid());
+        return Vec3_tpl<F>(m00 * v.x + m01 * v.y + m02 * v.z, m10 * v.x + m11 * v.y + m12 * v.z, m20 * v.x + m21 * v.y + m22 * v.z);
+    }
+    //! transforms a point and add translation vector
+    ILINE Vec3_tpl<F> TransformPoint(const Vec3_tpl<F>& p) const
+    {
+        assert(p.IsValid());
+        return Vec3_tpl<F>(m00 * p.x + m01 * p.y + m02 * p.z + m03, m10 * p.x + m11 * p.y + m12 * p.z + m13, m20 * p.x + m21 * p.y + m22 * p.z + m23);
+    }
+
+    //! Remove scale from matrix.
+    void OrthonormalizeFast()
+    {
+        Vec3_tpl<F> x(m00, m10, m20);
+        Vec3_tpl<F> y(m01, m11, m21);
+        Vec3_tpl<F> z;
+        x = x.GetNormalized();
+        z = (x % y).GetNormalized();
+        y = (z % x).GetNormalized();
+        m00 = x.x;
+        m10 = x.y;
+        m20 = x.z;
+        m01 = y.x;
+        m11 = y.y;
+        m21 = y.z;
+        m02 = z.x;
+        m12 = z.y;
+        m22 = z.z;
+    }
+
+
+    //determinant is ambiguous: only the upper-left-submatrix's determinant is calculated
+    ILINE f32 Determinant() const
+    {
+        return (m00 * m11 * m22) + (m01 * m12 * m20) + (m02 * m10 * m21) - (m02 * m11 * m20) - (m00 * m12 * m21) - (m01 * m10 * m22);
+    }
+
+
+    //--------------------------------------------------------------------------------
+    //----                  helper functions to access matrix-members     ------------
+    //--------------------------------------------------------------------------------
+
+    F* GetData() { return &m00; }
+    const F* GetData() const { return &m00; }
+
+    ILINE F operator () (uint32 i, uint32 j) const {    assert ((i < 3) && (j < 4));    F* p_data = (F*)(&m00);   return p_data[i * 4 + j];   }
+    ILINE F& operator () (uint32 i, uint32 j)   {   assert ((i < 3) && (j < 4));    F* p_data = (F*)(&m00);       return p_data[i * 4 + j];   }
+
+    ILINE void SetRow(int i, const Vec3_tpl<F>& v)  {   assert(i < 3);    F* p = (F*)(&m00);    p[0 + 4 * i] = v.x;   p[1 + 4 * i] = v.y;   p[2 + 4 * i] = v.z;       }
+
+    ILINE const Vec3_tpl<F>& GetRow(int i) const    {   assert(i < 3); return *(const Vec3_tpl<F>*)(&m00 + 4 * i);  }
+    ILINE const Vec4_tpl<F>& GetRow4(int i) const   {   assert(i < 3); return *(const Vec4_tpl<F>*)(&m00 + 4 * i);  }
+
+    ILINE void SetColumn(int i, const Vec3_tpl<F>& v)   {   assert(i < 4);    F* p = (F*)(&m00);    p[i + 4 * 0] = v.x;   p[i + 4 * 1] = v.y;   p[i + 4 * 2] = v.z;       }
+    ILINE Vec3_tpl<F> GetColumn(int i) const    {   assert(i < 4);    F* p = (F*)(&m00);    return Vec3(p[i + 4 * 0], p[i + 4 * 1], p[i + 4 * 2]);    }
+    ILINE Vec3_tpl<F> GetColumn0() const    { return Vec3_tpl<F>(m00, m10, m20);  }
+    ILINE Vec3_tpl<F> GetColumn1() const    { return Vec3_tpl<F>(m01, m11, m21);  }
+    ILINE Vec3_tpl<F> GetColumn2() const    { return Vec3_tpl<F>(m02, m12, m22);  }
+    ILINE Vec3_tpl<F> GetColumn3() const    { return Vec3_tpl<F>(m03, m13, m23);  }
+
+
+    ILINE void SetTranslation(const Vec3_tpl<F>& t) { m03 = t.x;    m13 = t.y; m23 = t.z;   }
+    ILINE Vec3_tpl<F> GetTranslation() const { return Vec3_tpl<F>(m03, m13, m23); }
+    ILINE void ScaleTranslation (F s)                       {   m03 *= s;     m13 *= s;     m23 *= s;     }
+    ILINE Matrix34_tpl<F> AddTranslation(const Vec3_tpl<F>& t)    {   m03 += t.x;   m13 += t.y;   m23 += t.z;   return *this; }
+
+    ILINE void SetRotation33(const Matrix33_tpl<F>& m33)
+    {
+        m00 = m33.m00;
+        m01 = m33.m01;
+        m02 = m33.m02;
+        m10 = m33.m10;
+        m11 = m33.m11;
+        m12 = m33.m12;
+        m20 = m33.m20;
+        m21 = m33.m21;
+        m22 = m33.m22;
+    }
+
+    ILINE void GetRotation33(Matrix33_tpl<F>& m33) const
+    {
+        m33.m00 = m00;
+        m33.m01 = m01;
+        m33.m02 = m02;
+        m33.m10 = m10;
+        m33.m11 = m11;
+        m33.m12 = m12;
+        m33.m20 = m20;
+        m33.m21 = m21;
+        m33.m22 = m22;
+    }
+
+    //check if we have an orthonormal-base (general case, works even with reflection matrices)
+    int IsOrthonormal(F threshold = 0.001) const
+    {
+        f32 d0 = fabs_tpl(GetColumn0() | GetColumn1());
+        if  (d0 > threshold)
+        {
+            return 0;
+        }
+        f32 d1 = fabs_tpl(GetColumn0() | GetColumn2());
+        if  (d1 > threshold)
+        {
+            return 0;
+        }
+        f32 d2 = fabs_tpl(GetColumn1() | GetColumn2());
+        if  (d2 > threshold)
+        {
+            return 0;
+        }
+        int a = (fabs_tpl(1 - (GetColumn0() | GetColumn0()))) < threshold;
+        int b = (fabs_tpl(1 - (GetColumn1() | GetColumn1()))) < threshold;
+        int c = (fabs_tpl(1 - (GetColumn2() | GetColumn2()))) < threshold;
+        return a & b & c;
+    }
+
+    //check if we have an orthonormal-base (assuming we are using a right-handed coordinate system)
+    int IsOrthonormalRH(F threshold = 0.001) const
+    {
+        int a = Vec3_tpl<F>::IsEquivalent(GetColumn0(), GetColumn1() % GetColumn2(), threshold);
+        int b = Vec3_tpl<F>::IsEquivalent(GetColumn1(), GetColumn2() % GetColumn0(), threshold);
+        int c = Vec3_tpl<F>::IsEquivalent(GetColumn2(), GetColumn0() % GetColumn1(), threshold);
+        return a & b & c;
+    }
+    bool static IsEquivalent(const Matrix34_tpl<F>& m0, const Matrix34_tpl<F>& m1, F e = VEC_EPSILON)
+    {
+        return  (
+            (fabs_tpl(m0.m00 - m1.m00) <= e) && (fabs_tpl(m0.m01 - m1.m01) <= e) && (fabs_tpl(m0.m02 - m1.m02) <= e) && (fabs_tpl(m0.m03 - m1.m03) <= e) &&
+            (fabs_tpl(m0.m10 - m1.m10) <= e) && (fabs_tpl(m0.m11 - m1.m11) <= e) && (fabs_tpl(m0.m12 - m1.m12) <= e) && (fabs_tpl(m0.m13 - m1.m13) <= e) &&
+            (fabs_tpl(m0.m20 - m1.m20) <= e) && (fabs_tpl(m0.m21 - m1.m21) <= e) && (fabs_tpl(m0.m22 - m1.m22) <= e) && (fabs_tpl(m0.m23 - m1.m23) <= e)
+            );
+    }
+
+    bool IsValid() const
+    {
+        if (!NumberValid(m00))
+        {
+            return false;
+        }
+        if (!NumberValid(m01))
+        {
+            return false;
+        }
+        if (!NumberValid(m02))
+        {
+            return false;
+        }
+        if (!NumberValid(m03))
+        {
+            return false;
+        }
+        if (!NumberValid(m10))
+        {
+            return false;
+        }
+        if (!NumberValid(m11))
+        {
+            return false;
+        }
+        if (!NumberValid(m12))
+        {
+            return false;
+        }
+        if (!NumberValid(m13))
+        {
+            return false;
+        }
+        if (!NumberValid(m20))
+        {
+            return false;
+        }
+        if (!NumberValid(m21))
+        {
+            return false;
+        }
+        if (!NumberValid(m22))
+        {
+            return false;
+        }
+        if (!NumberValid(m23))
+        {
+            return false;
+        }
+        return true;
+    }
+
+
+    bool IsDegenerate(float epsilon = FLT_EPSILON) const
+    {
+        //check the basis vectors for 0 vector
+        return GetColumn0().len2() < epsilon
+               || GetColumn1().len2() < epsilon
+               || GetColumn2().len2() < epsilon;
+    }
+
+    /*!
+    * Create a matrix with SCALING, ROTATION and TRANSLATION (in this order).
+    *
+    *  Example 1:
+    *       Matrix m34;
+    *       m34.SetMatrix( Vec3(1,2,3), quat, Vec3(11,22,33)  );
+    */
+    ILINE void Set(const Vec3_tpl<F>& s, const Quat_tpl<F>& q, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        assert(s.IsValid());
+        assert(q.IsUnit(0.1f));
+        assert(t.IsValid());
+        F vxvx = q.v.x * q.v.x;
+        F vzvz = q.v.z * q.v.z;
+        F vyvy = q.v.y * q.v.y;
+        F vxvy = q.v.x * q.v.y;
+        F vxvz = q.v.x * q.v.z;
+        F vyvz = q.v.y * q.v.z;
+        F svx = q.w * q.v.x;
+        F svy = q.w * q.v.y;
+        F svz = q.w * q.v.z;
+        m00 = (1 - (vyvy + vzvz) * 2) * s.x;
+        m01 = (vxvy - svz) * 2 * s.y;
+        m02 = (vxvz + svy) * 2 * s.z;
+        m03 = t.x;
+        m10 = (vxvy + svz) * 2 * s.x;
+        m11 = (1 - (vxvx + vzvz) * 2) * s.y;
+        m12 = (vyvz - svx) * 2 * s.z;
+        m13 = t.y;
+        m20 = (vxvz - svy) * 2 * s.x;
+        m21 = (vyvz + svx) * 2 * s.y;
+        m22 = (1 - (vxvx + vyvy) * 2) * s.z;
+        m23 = t.z;
+    }
+    ILINE static Matrix34_tpl<F> Create(const Vec3_tpl<F>& s, const Quat_tpl<F>& q, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Matrix34_tpl<F> m34;
+        m34.Set(s, q, t);
+        return m34;
+    }
+    Matrix34_tpl(const Vec3_tpl<F>& s, const Quat_tpl<F>& q, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Set(s, q, t);
+    }
+
+
+    /*!
+    * Create scaling-matrix.
+    * The translation-vector is set to zero.
+    *
+    *  Example 1:
+    *       Matrix m34;
+    *       m34.SetScale( Vec3(0.5f, 1.0f, 2.0f) );
+    *  Example 2:
+    *       Matrix34 m34 = Matrix34::CreateScale( Vec3(0.5f, 1.0f, 2.0f) );
+    */
+    ILINE void SetScale(const Vec3_tpl<F>& s, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        *this = Matrix33::CreateScale(s);
+        this->SetTranslation(t);
+    }
+    ILINE static Matrix34_tpl<F> CreateScale(const Vec3_tpl<F>& s, const Vec3_tpl<F>& t = Vec3(ZERO))
+    {
+        Matrix34_tpl<F> m34;
+        m34.SetScale(s, t);
+        return m34;
+    }
+
+
+    ILINE Matrix44_tpl<F> GetTransposed() const
+    {
+        Matrix44_tpl<F> tmp;
+        tmp.m00 = m00;
+        tmp.m01 = m10;
+        tmp.m02 = m20;
+        tmp.m03 = 0;
+        tmp.m10 = m01;
+        tmp.m11 = m11;
+        tmp.m12 = m21;
+        tmp.m13 = 0;
+        tmp.m20 = m02;
+        tmp.m21 = m12;
+        tmp.m22 = m22;
+        tmp.m23 = 0;
+        tmp.m30 = m03;
+        tmp.m31 = m13;
+        tmp.m32 = m23;
+        tmp.m33 = 1;
+        return tmp;
+    }
+
+    /*!
+    * calculate a real inversion of a Matrix34
+    * an inverse-matrix is an UnDo-matrix for all kind of transformations
+    *
+    *  Example 1:
+    *       Matrix34 im34; im34.Invert();
+    *
+    *  Example 2:
+    *   Matrix34 im34 = m34.GetInverted();
+    */
+    void Invert(void)
+    {
+        //rescue members
+        Matrix34_tpl<F> m = *this;
+        // calculate 12 cofactors
+        m00 = m.m22 * m.m11 - m.m12 * m.m21;
+        m10 = m.m12 * m.m20 - m.m22 * m.m10;
+        m20 = m.m10 * m.m21 - m.m20 * m.m11;
+        m01 = m.m02 * m.m21 - m.m22 * m.m01;
+        m11 = m.m22 * m.m00 - m.m02 * m.m20;
+        m21 = m.m20 * m.m01 - m.m00 * m.m21;
+        m02 = m.m12 * m.m01 - m.m02 * m.m11;
+        m12 = m.m02 * m.m10 - m.m12 * m.m00;
+        m22 = m.m00 * m.m11 - m.m10 * m.m01;
+        m03 = (m.m22 * m.m13 * m.m01 + m.m02 * m.m23 * m.m11 + m.m12 * m.m03 * m.m21) - (m.m12 * m.m23 * m.m01 + m.m22 * m.m03 * m.m11 + m.m02 * m.m13 * m.m21);
+        m13 = (m.m12 * m.m23 * m.m00 + m.m22 * m.m03 * m.m10 + m.m02 * m.m13 * m.m20) - (m.m22 * m.m13 * m.m00 + m.m02 * m.m23 * m.m10 + m.m12 * m.m03 * m.m20);
+        m23 = (m.m20 * m.m11 * m.m03 + m.m00 * m.m21 * m.m13 + m.m10 * m.m01 * m.m23) - (m.m10 * m.m21 * m.m03 + m.m20 * m.m01 * m.m13 + m.m00 * m.m11 * m.m23);
+        // calculate determinant
+        F det = m.m00 * m00 + m.m10 * m01 + m.m20 * m02;
+        assert(fabs_tpl(det) > (F)0.00000001);
+        F rcpDet = 1.0f / det;
+        // calculate matrix inverse/
+        m00 *= rcpDet;
+        m01 *= rcpDet;
+        m02 *= rcpDet;
+        m03 *= rcpDet;
+        m10 *= rcpDet;
+        m11 *= rcpDet;
+        m12 *= rcpDet;
+        m13 *= rcpDet;
+        m20 *= rcpDet;
+        m21 *= rcpDet;
+        m22 *= rcpDet;
+        m23 *= rcpDet;
+    }
+    ILINE Matrix34_tpl<F> GetInverted() const
+    {
+        Matrix34_tpl<F> dst = *this;
+        dst.Invert();
+        return dst;
+    }
+
+    /*!
+    *  Name:             ReflectMat34
+    *  Description:      reflect a rotation matrix with respect to a plane.
+    *
+    *  Example:
+    *       Vec3 normal( 0.0f,-1.0f, 0.0f);
+    *       Vec3 pos(0,1000,0);
+    *       Matrix34 m34=CreateReflectionMat( pos, normal );
+    */
+    ILINE static Matrix34_tpl<F> CreateReflectionMat (const Vec3_tpl<F>& p, const Vec3_tpl<F>& n)
+    {
+        Matrix34_tpl<F> m;
+        F vxy   = -2.0f * n.x * n.y;
+        F vxz   = -2.0f * n.x * n.z;
+        F vyz   = -2.0f * n.y * n.z;
+        F pdotn = 2.0f * (p | n);
+        m.m00 = 1.0f - 2.0f * n.x * n.x;
+        m.m01 = vxy;
+        m.m02 = vxz;
+        m.m03 = pdotn * n.x;
+        m.m10 = vxy;
+        m.m11 = 1.0f - 2.0f * n.y * n.y;
+        m.m12 = vyz;
+        m.m13 = pdotn * n.y;
+        m.m20 = vxz;
+        m.m21 = vyz;
+        m.m22 = 1.0f - 2.0f * n.z * n.z;
+        m.m23 = pdotn * n.z;
+        return m;
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Typedefs                                                                  //
+///////////////////////////////////////////////////////////////////////////////
+
+typedef Matrix34_tpl<f32>  Matrix34; //always 32 bit
+typedef Matrix34_tpl<f64>  Matrix34d;//always 64 bit
+typedef Matrix34_tpl<real> Matrix34r;//variable float precision. depending on the target system it can be between 32, 64 or bit
+typedef _MS_ALIGN(16) Matrix34_tpl<f32> _ALIGN (16) Matrix34A;
+
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//-------------       implementation of Matrix34      ------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+
+//! multiply all matrix's values by f and return the matrix
+template<class F>
+ILINE Matrix34_tpl<F> operator * (const Matrix34_tpl<F>& m, const f32 f)
+{
+    assert(m.IsValid());
+    Matrix34_tpl<F> r;
+    r.m00 = m.m00 * f;
+    r.m01 = m.m01 * f;
+    r.m02 = m.m02 * f;
+    r.m03 = m.m03 * f;
+    r.m10 = m.m10 * f;
+    r.m11 = m.m11 * f;
+    r.m12 = m.m12 * f;
+    r.m13 = m.m13 * f;
+    r.m20 = m.m20 * f;
+    r.m21 = m.m21 * f;
+    r.m22 = m.m22 * f;
+    r.m23 = m.m23 * f;
+    return r;
+}
+
+/*!
+*  multiplication of Matrix34 by a (column) Vec3.
+*  This function transforms the given input Vec3
+*  into the coordinate system defined by this matrix.
+*
+*  Example:
+*   Matrix34 m34;
+*   Vec3 vector(44,55,66);
+*   Vec3 result = m34*vector;
+*/
+template<class F>
+ILINE Vec3_tpl<F> operator * (const Matrix34_tpl<F>& m, const Vec3_tpl<F>& p)
+{
+    assert(m.IsValid());
+    assert(p.IsValid());
+    Vec3_tpl<F> tp;
+    tp.x    =   m.m00 * p.x + m.m01 * p.y + m.m02 * p.z + m.m03;
+    tp.y    =   m.m10 * p.x + m.m11 * p.y + m.m12 * p.z + m.m13;
+    tp.z    =   m.m20 * p.x + m.m21 * p.y + m.m22 * p.z + m.m23;
+    return tp;
+}
+
+
+template<class F1, class F2>
+ILINE Matrix34_tpl<F1> operator*(const Matrix34_tpl<F1>& l, const Diag33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix34_tpl<F1> m;
+    m.m00 = l.m00 * r.x;
+    m.m01 = l.m01 * r.y;
+    m.m02 = l.m02 * r.z;
+    m.m03 = l.m03;
+    m.m10 = l.m10 * r.x;
+    m.m11 = l.m11 * r.y;
+    m.m12 = l.m12 * r.z;
+    m.m13 = l.m13;
+    m.m20 = l.m20 * r.x;
+    m.m21 = l.m21 * r.y;
+    m.m22 = l.m22 * r.z;
+    m.m23 = l.m23;
+    return m;
+}
+template<class F1, class F2>
+ILINE Matrix34_tpl<F1>& operator *= (Matrix34_tpl<F1>& l, const Diag33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    l.m00 *= r.x;
+    l.m01 *= r.y;
+    l.m02 *= r.z;
+    l.m10 *= r.x;
+    l.m11 *= r.y;
+    l.m12 *= r.z;
+    l.m20 *= r.x;
+    l.m21 *= r.y;
+    l.m22 *= r.z;
+    return l;
+}
+template<class F1, class F2>
+ILINE Matrix34_tpl<F1> operator + (const Matrix34_tpl<F1>& l, const Matrix34_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix34_tpl<F1> m;
+    m.m00 = l.m00 + r.m00;
+    m.m01 = l.m01 + r.m01;
+    m.m02 = l.m02 + r.m02;
+    m.m03 = l.m03 + r.m03;
+    m.m10 = l.m10 + r.m10;
+    m.m11 = l.m11 + r.m11;
+    m.m12 = l.m12 + r.m12;
+    m.m13 = l.m13 + r.m13;
+    m.m20 = l.m20 + r.m20;
+    m.m21 = l.m21 + r.m21;
+    m.m22 = l.m22 + r.m22;
+    m.m23 = l.m23 + r.m23;
+    return m;
+}
+template<class F1, class F2>
+ILINE Matrix34_tpl<F1>& operator += (Matrix34_tpl<F1>& l, const Matrix34_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    l.m00 += r.m00;
+    l.m01 += r.m01;
+    l.m02 += r.m02;
+    l.m03 += r.m03;
+    l.m10 += r.m10;
+    l.m11 += r.m11;
+    l.m12 += r.m12;
+    l.m13 += r.m13;
+    l.m20 += r.m20;
+    l.m21 += r.m21;
+    l.m22 += r.m22;
+    l.m23 += r.m23;
+    return l;
+}
+
+/*!
+*  Implements the multiplication operator: Matrix34=Matrix34*Matrix33
+*
+*  Matrix33 and Matrix44 are specified in collumn order for a right-handed coordinate-system.
+*  AxB = operation B followed by operation A.
+*  A multiplication takes 27 muls and 24 adds.
+*
+*  Example:
+*   Matrix34 m34=Matrix33::CreateRotationX(1.94192f);;
+*   Matrix33 m33=Matrix34::CreateRotationZ(3.14192f);
+*     Matrix34 result=m34*m33;
+*/
+template<class F>
+ILINE Matrix34_tpl<F> operator * (const Matrix34_tpl<F>& l, const Matrix33_tpl<F>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix34_tpl<F> m;
+    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
+    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
+    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
+    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
+    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
+    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
+    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
+    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
+    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
+    m.m03 = l.m03;
+    m.m13 = l.m13;
+    m.m23 = l.m23;
+    return m;
+}
+
+
+
+/*!
+*  Implements the multiplication operator: Matrix34=Matrix34*Matrix34
+*
+*  Matrix34 is specified in collumn order.
+*  AxB = rotation B followed by rotation A.
+*  This operation takes 36 mults and 27 adds.
+*
+*  Example:
+*   Matrix34 m34=Matrix34::CreateRotationX(1.94192f, Vec3(11,22,33));;
+*   Matrix34 m34=Matrix33::CreateRotationZ(3.14192f);
+*     Matrix34 result=m34*m34;
+*/
+template<class F>
+ILINE Matrix34_tpl<F> operator * (const Matrix34_tpl<F>& l, const Matrix34_tpl<F>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix34_tpl<F> m;
+    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
+    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
+    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
+    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
+    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
+    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
+    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
+    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
+    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
+    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23 + l.m03;
+    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23 + l.m13;
+    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23 + l.m23;
+    return m;
+}
+
+/*!
+*  Implements the multiplication operator: Matrix44=Matrix34*Matrix44
+*
+*  Matrix44 and Matrix34 are specified in collumn order.
+*    AxB = rotation B followed by rotation A.
+*  This operation takes 48 mults and 36 adds.
+*
+*  Example:
+*   Matrix34 m34=Matrix33::CreateRotationX(1.94192f);;
+*   Matrix44 m44=Matrix33::CreateRotationZ(3.14192f);
+*     Matrix44 result=m34*m44;
+*/
+template<class F>
+ILINE Matrix44_tpl<F> operator * (const Matrix34_tpl<F>& l, const Matrix44_tpl<F>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix44_tpl<F> m;
+    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20 + l.m03 * r.m30;
+    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20 + l.m13 * r.m30;
+    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20 + l.m23 * r.m30;
+    m.m30 = r.m30;
+    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21 + l.m03 * r.m31;
+    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21 + l.m13 * r.m31;
+    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21 + l.m23 * r.m31;
+    m.m31 = r.m31;
+    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22 + l.m03 * r.m32;
+    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22 + l.m13 * r.m32;
+    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22 + l.m23 * r.m32;
+    m.m32 = r.m32;
+    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23 + l.m03 * r.m33;
+    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23 + l.m13 * r.m33;
+    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23 + l.m23 * r.m33;
+    m.m33 = r.m33;
+    return m;
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_MATRIX34_H
+
diff --git a/Code/Legacy/CryCommon/Cry_Matrix44.h b/Code/Legacy/CryCommon/Cry_Matrix44.h
new file mode 100644
index 0000000000..01c0e58c5c
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Matrix44.h
@@ -0,0 +1,874 @@
+/*
+ * 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 matrix class
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_MATRIX44_H
+#define CRYINCLUDE_CRYCOMMON_CRY_MATRIX44_H
+#pragma once
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Matrix44_tpl
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+template<typename F>
+struct Matrix44_tpl
+{
+    F m00, m01, m02, m03;
+    F m10, m11, m12, m13;
+    F m20, m21, m22, m23;
+    F m30, m31, m32, m33;
+
+    //---------------------------------------------------------------------------------
+
+#if defined(_DEBUG)
+    ILINE Matrix44_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = (uint32*)&m00;
+            p[ 0] = F32NAN;
+            p[ 1] = F32NAN;
+            p[ 2] = F32NAN;
+            p[ 3] = F32NAN;
+            p[ 4] = F32NAN;
+            p[ 5] = F32NAN;
+            p[ 6] = F32NAN;
+            p[ 7] = F32NAN;
+            p[ 8] = F32NAN;
+            p[ 9] = F32NAN;
+            p[10] = F32NAN;
+            p[11] = F32NAN;
+            p[12] = F32NAN;
+            p[13] = F32NAN;
+            p[14] = F32NAN;
+            p[15] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = (uint64*)&m00;
+            p[ 0] = F64NAN;
+            p[ 1] = F64NAN;
+            p[ 2] = F64NAN;
+            p[ 3] = F64NAN;
+            p[ 4] = F64NAN;
+            p[ 5] = F64NAN;
+            p[ 6] = F64NAN;
+            p[ 7] = F64NAN;
+            p[ 8] = F64NAN;
+            p[ 9] = F64NAN;
+            p[10] = F64NAN;
+            p[11] = F64NAN;
+            p[12] = F64NAN;
+            p[13] = F64NAN;
+            p[14] = F64NAN;
+            p[15] = F64NAN;
+        }
+    }
+#else
+    ILINE Matrix44_tpl(){};
+#endif
+
+    //initialize with zeros
+    ILINE Matrix44_tpl(type_zero)
+    {
+        m00 = 0;
+        m01 = 0;
+        m02 = 0;
+        m03 = 0;
+        m10 = 0;
+        m11 = 0;
+        m12 = 0;
+        m13 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = 0;
+        m23 = 0;
+        m30 = 0;
+        m31 = 0;
+        m32 = 0;
+        m33 = 0;
+    }
+
+
+    //ASSIGNMENT OPERATOR of identical Matrix44 types.
+    //The assignment operator has precedence over assignment constructor
+    //Matrix44 m; m=m44;
+    ILINE Matrix44_tpl<F>& operator = (const Matrix44_tpl<F>& m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = m.m03;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = m.m13;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = m.m23;
+        m30 = m.m30;
+        m31 = m.m31;
+        m32 = m.m32;
+        m33 = m.m33;
+        return *this;
+    }
+
+
+
+    //--------------------------------------------------------------------
+    //----   implementation of the constructors                        ---
+    //--------------------------------------------------------------------
+    ILINE Matrix44_tpl<F>(F v00, F v01, F v02, F v03,
+                          F v10, F v11, F v12, F v13,
+                          F v20, F v21, F v22, F v23,
+                          F v30, F v31, F v32, F v33)
+    {
+        m00 = v00;
+        m01 = v01;
+        m02 = v02;
+        m03 = v03;
+        m10 = v10;
+        m11 = v11;
+        m12 = v12;
+        m13 = v13;
+        m20 = v20;
+        m21 = v21;
+        m22 = v22;
+        m23 = v23;
+        m30 = v30;
+        m31 = v31;
+        m32 = v32;
+        m33 = v33;
+    }
+
+
+
+
+
+
+    //CONSTRUCTOR for different types. It converts a Matrix33 into a Matrix44.
+    //Matrix44(m33);
+    ILINE Matrix44_tpl<F>(const Matrix33_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = 0;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = 0;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = 0;
+        m30 = 0;
+        m31 = 0;
+        m32 = 0;
+        m33 = 1;
+    }
+    //CONSTRUCTOR for different types. It converts a Matrix33 into a Matrix44 and also converts between double/float.
+    //Matrix44(Matrix33);
+    template<class F1>
+    ILINE Matrix44_tpl<F>(const Matrix33_tpl<F1>&m)
+    {
+        assert(m.IsValid());
+        m00 = F(m.m00);
+        m01 = F(m.m01);
+        m02 = F(m.m02);
+        m03 = 0;
+        m10 = F(m.m10);
+        m11 = F(m.m11);
+        m12 = F(m.m12);
+        m13 = 0;
+        m20 = F(m.m20);
+        m21 = F(m.m21);
+        m22 = F(m.m22);
+        m23 = 0;
+        m30 = 0;
+        m31 = 0;
+        m32 = 0;
+        m33 = 1;
+    }
+
+
+    //CONSTRUCTOR for different types. It converts a Matrix34 into a Matrix44.
+    //Matrix44(m34);
+    ILINE Matrix44_tpl<F>(const Matrix34_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = m.m03;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = m.m13;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = m.m23;
+        m30 = 0;
+        m31 = 0;
+        m32 = 0;
+        m33 = 1;
+    }
+    //CONSTRUCTOR for different types. It converts a Matrix34 into a Matrix44 and also converts between double/float.
+    //Matrix44(Matrix34);
+    template<class F1>
+    ILINE Matrix44_tpl<F>(const Matrix34_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 = 0;
+        m31 = 0;
+        m32 = 0;
+        m33 = 1;
+    }
+
+
+    //CONSTRUCTOR for identical types
+    //Matrix44 m=m44;
+    ILINE Matrix44_tpl<F>(const Matrix44_tpl<F>&m)
+    {
+        assert(m.IsValid());
+        m00 = m.m00;
+        m01 = m.m01;
+        m02 = m.m02;
+        m03 = m.m03;
+        m10 = m.m10;
+        m11 = m.m11;
+        m12 = m.m12;
+        m13 = m.m13;
+        m20 = m.m20;
+        m21 = m.m21;
+        m22 = m.m22;
+        m23 = m.m23;
+        m30 = m.m30;
+        m31 = m.m31;
+        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);
+    }
+
+    //---------------------------------------------------------------------
+
+    //! multiply all m1 matrix's values by f and return the matrix
+    friend  ILINE Matrix44_tpl<F> operator * (const Matrix44_tpl<F>& m, const f32 f)
+    {
+        assert(m.IsValid());
+        Matrix44_tpl<F> r;
+        r.m00 = m.m00 * f;
+        r.m01 = m.m01 * f;
+        r.m02 = m.m02 * f;
+        r.m03 = m.m03 * f;
+        r.m10 = m.m10 * f;
+        r.m11 = m.m11 * f;
+        r.m12 = m.m12 * f;
+        r.m13 = m.m13 * f;
+        r.m20 = m.m20 * f;
+        r.m21 = m.m21 * f;
+        r.m22 = m.m22 * f;
+        r.m23 = m.m23 * f;
+        r.m30 = m.m30 * f;
+        r.m31 = m.m31 * f;
+        r.m32 = m.m32 * f;
+        r.m33 = m.m33 * f;
+        return r;
+    }
+
+    //! add all m matrix's values and return the matrix
+    friend    ILINE Matrix44_tpl<F> operator + (const Matrix44_tpl<F>& mm0, const Matrix44_tpl<F>& mm1)
+    {
+        assert(mm0.IsValid());
+        assert(mm1.IsValid());
+        Matrix44_tpl<F> r;
+        r.m00 = mm0.m00 + mm1.m00;
+        r.m01 = mm0.m01 + mm1.m01;
+        r.m02 = mm0.m02 + mm1.m02;
+        r.m03 = mm0.m03 + mm1.m03;
+        r.m10 = mm0.m10 + mm1.m10;
+        r.m11 = mm0.m11 + mm1.m11;
+        r.m12 = mm0.m12 + mm1.m12;
+        r.m13 = mm0.m13 + mm1.m13;
+        r.m20 = mm0.m20 + mm1.m20;
+        r.m21 = mm0.m21 + mm1.m21;
+        r.m22 = mm0.m22 + mm1.m22;
+        r.m23 = mm0.m23 + mm1.m23;
+        r.m30 = mm0.m30 + mm1.m30;
+        r.m31 = mm0.m31 + mm1.m31;
+        r.m32 = mm0.m32 + mm1.m32;
+        r.m33 = mm0.m33 + mm1.m33;
+        return r;
+    }
+
+    ILINE void SetIdentity()
+    {
+        m00 = 1;
+        m01 = 0;
+        m02 = 0;
+        m03 = 0;
+        m10 = 0;
+        m11 = 1;
+        m12 = 0;
+        m13 = 0;
+        m20 = 0;
+        m21 = 0;
+        m22 = 1;
+        m23 = 0;
+        m30 = 0;
+        m31 = 0;
+        m32 = 0;
+        m33 = 1;
+    }
+    ILINE Matrix44_tpl(type_identity) { SetIdentity(); }
+
+
+    ILINE void Transpose()
+    {
+        Matrix44_tpl<F> tmp = *this;
+        m00 = tmp.m00;
+        m01 = tmp.m10;
+        m02 = tmp.m20;
+        m03 = tmp.m30;
+        m10 = tmp.m01;
+        m11 = tmp.m11;
+        m12 = tmp.m21;
+        m13 = tmp.m31;
+        m20 = tmp.m02;
+        m21 = tmp.m12;
+        m22 = tmp.m22;
+        m23 = tmp.m32;
+        m30 = tmp.m03;
+        m31 = tmp.m13;
+        m32 = tmp.m23;
+        m33 = tmp.m33;
+    }
+    ILINE Matrix44_tpl<F> GetTransposed() const
+    {
+        Matrix44_tpl<F> tmp;
+        tmp.m00 = m00;
+        tmp.m01 = m10;
+        tmp.m02 = m20;
+        tmp.m03 = m30;
+        tmp.m10 = m01;
+        tmp.m11 = m11;
+        tmp.m12 = m21;
+        tmp.m13 = m31;
+        tmp.m20 = m02;
+        tmp.m21 = m12;
+        tmp.m22 = m22;
+        tmp.m23 = m32;
+        tmp.m30 = m03;
+        tmp.m31 = m13;
+        tmp.m32 = m23;
+        tmp.m33 = m33;
+        return tmp;
+    }
+
+    /*!
+    *
+    * Calculate a real inversion of a Matrix44.
+    *
+    * Uses Cramer's Rule which is faster (branchless) but numerically more unstable
+    * than other methods like Gaussian Elimination.
+    *
+    *  Example 1:
+    *       Matrix44 im44; im44.Invert();
+    *
+    *  Example 2:
+    *   Matrix44 im44 = m33.GetInverted();
+    */
+    void Invert(void)
+    {
+        F   tmp[12];
+        Matrix44_tpl<F> m = *this;
+
+        // Calculate pairs for first 8 elements (cofactors)
+        tmp[0] = m.m22 * m.m33;
+        tmp[1] = m.m32 * m.m23;
+        tmp[2] = m.m12 * m.m33;
+        tmp[3] = m.m32 * m.m13;
+        tmp[4] = m.m12 * m.m23;
+        tmp[5] = m.m22 * m.m13;
+        tmp[6] = m.m02 * m.m33;
+        tmp[7] = m.m32 * m.m03;
+        tmp[8] = m.m02 * m.m23;
+        tmp[9] = m.m22 * m.m03;
+        tmp[10] = m.m02 * m.m13;
+        tmp[11] = m.m12 * m.m03;
+
+        // Calculate first 8 elements (cofactors)
+        m00 = tmp[0] * m.m11 + tmp[3] * m.m21 + tmp[ 4] * m.m31;
+        m00 -= tmp[1] * m.m11 + tmp[2] * m.m21 + tmp[ 5] * m.m31;
+        m01 = tmp[1] * m.m01 + tmp[6] * m.m21 + tmp[ 9] * m.m31;
+        m01 -= tmp[0] * m.m01 + tmp[7] * m.m21 + tmp[ 8] * m.m31;
+        m02 = tmp[2] * m.m01 + tmp[7] * m.m11 + tmp[10] * m.m31;
+        m02 -= tmp[3] * m.m01 + tmp[6] * m.m11 + tmp[11] * m.m31;
+        m03 = tmp[5] * m.m01 + tmp[8] * m.m11 + tmp[11] * m.m21;
+        m03 -= tmp[4] * m.m01 + tmp[9] * m.m11 + tmp[10] * m.m21;
+        m10 = tmp[1] * m.m10 + tmp[2] * m.m20 + tmp[ 5] * m.m30;
+        m10 -= tmp[0] * m.m10 + tmp[3] * m.m20 + tmp[ 4] * m.m30;
+        m11 = tmp[0] * m.m00 + tmp[7] * m.m20 + tmp[ 8] * m.m30;
+        m11 -= tmp[1] * m.m00 + tmp[6] * m.m20 + tmp[ 9] * m.m30;
+        m12 = tmp[3] * m.m00 + tmp[6] * m.m10 + tmp[11] * m.m30;
+        m12 -= tmp[2] * m.m00 + tmp[7] * m.m10 + tmp[10] * m.m30;
+        m13 = tmp[4] * m.m00 + tmp[9] * m.m10 + tmp[10] * m.m20;
+        m13 -= tmp[5] * m.m00 + tmp[8] * m.m10 + tmp[11] * m.m20;
+
+        // Calculate pairs for second 8 elements (cofactors)
+        tmp[ 0] = m.m20 * m.m31;
+        tmp[ 1] = m.m30 * m.m21;
+        tmp[ 2] = m.m10 * m.m31;
+        tmp[ 3] = m.m30 * m.m11;
+        tmp[ 4] = m.m10 * m.m21;
+        tmp[ 5] = m.m20 * m.m11;
+        tmp[ 6] = m.m00 * m.m31;
+        tmp[ 7] = m.m30 * m.m01;
+        tmp[ 8] = m.m00 * m.m21;
+        tmp[ 9] = m.m20 * m.m01;
+        tmp[10] = m.m00 * m.m11;
+        tmp[11] = m.m10 * m.m01;
+
+        // Calculate second 8 elements (cofactors)
+        m20 = tmp[ 0] * m.m13 + tmp[ 3] * m.m23 + tmp[ 4] * m.m33;
+        m20 -= tmp[ 1] * m.m13 + tmp[ 2] * m.m23 + tmp[ 5] * m.m33;
+        m21 = tmp[ 1] * m.m03 + tmp[ 6] * m.m23 + tmp[ 9] * m.m33;
+        m21 -= tmp[ 0] * m.m03 + tmp[ 7] * m.m23 + tmp[ 8] * m.m33;
+        m22 = tmp[ 2] * m.m03 + tmp[ 7] * m.m13 + tmp[10] * m.m33;
+        m22 -= tmp[ 3] * m.m03 + tmp[ 6] * m.m13 + tmp[11] * m.m33;
+        m23 = tmp[ 5] * m.m03 + tmp[ 8] * m.m13 + tmp[11] * m.m23;
+        m23 -= tmp[ 4] * m.m03 + tmp[ 9] * m.m13 + tmp[10] * m.m23;
+        m30 = tmp[ 2] * m.m22 + tmp[ 5] * m.m32 + tmp[ 1] * m.m12;
+        m30 -= tmp[ 4] * m.m32 + tmp[ 0] * m.m12 + tmp[ 3] * m.m22;
+        m31 = tmp[ 8] * m.m32 + tmp[ 0] * m.m02 + tmp[ 7] * m.m22;
+        m31 -= tmp[ 6] * m.m22 + tmp[ 9] * m.m32 + tmp[ 1] * m.m02;
+        m32 = tmp[ 6] * m.m12 + tmp[11] * m.m32 + tmp[ 3] * m.m02;
+        m32 -= tmp[10] * m.m32 + tmp[ 2] * m.m02 + tmp[ 7] * m.m12;
+        m33 = tmp[10] * m.m22 + tmp[ 4] * m.m02 + tmp[ 9] * m.m12;
+        m33 -= tmp[ 8] * m.m12 + tmp[11] * m.m22 + tmp[ 5] * m.m02;
+
+        // Calculate determinant
+        F det = (m.m00 * m00 + m.m10 * m01 + m.m20 * m02 + m.m30 * m03);
+        //if (fabs_tpl(det)<0.0001f) assert(0);
+
+        // Divide the cofactor-matrix by the determinant
+        F idet = (F)1.0 / det;
+        m00 *= idet;
+        m01 *= idet;
+        m02 *= idet;
+        m03 *= idet;
+        m10 *= idet;
+        m11 *= idet;
+        m12 *= idet;
+        m13 *= idet;
+        m20 *= idet;
+        m21 *= idet;
+        m22 *= idet;
+        m23 *= idet;
+        m30 *= idet;
+        m31 *= idet;
+        m32 *= idet;
+        m33 *= idet;
+    }
+
+    ILINE Matrix44_tpl<F> GetInverted() const
+    {
+        Matrix44_tpl<F> dst = *this;
+        dst.Invert();
+        return dst;
+    }
+
+
+    ILINE f32 Determinant() const
+    {
+        //determinant is ambiguous: only the upper-left-submatrix's determinant is calculated
+        return (m00 * m11 * m22) + (m01 * m12 * m20) + (m02 * m10 * m21) - (m02 * m11 * m20) - (m00 * m12 * m21) - (m01 * m10 * m22);
+    }
+
+    //! transform a vector
+    ILINE Vec3 TransformVector(const Vec3& b) const
+    {
+        assert(b.IsValid());
+        Vec3 v;
+        v.x = m00 * b.x + m01 * b.y + m02 * b.z;
+        v.y = m10 * b.x + m11 * b.y + m12 * b.z;
+        v.z = m20 * b.x + m21 * b.y + m22 * b.z;
+        return v;
+    }
+    //! transform a point
+    ILINE Vec3 TransformPoint(const Vec3& b) const
+    {
+        assert(b.IsValid());
+        Vec3 v;
+        v.x = m00 * b.x + m01 * b.y + m02 * b.z + m03;
+        v.y = m10 * b.x + m11 * b.y + m12 * b.z + m13;
+        v.z = m20 * b.x + m21 * b.y + m22 * b.z + m23;
+        return v;
+    }
+
+
+    //--------------------------------------------------------------------------------
+    //----                  helper functions to access matrix-members     ------------
+    //--------------------------------------------------------------------------------
+    ILINE F* GetData() { return &m00; }
+    ILINE const F* GetData() const { return &m00; }
+
+    ILINE F operator ()  (uint32 i, uint32 j) const {   assert ((i < 4) && (j < 4));    F* p_data = (F*)(&m00);   return p_data[i * 4 + j];   }
+    ILINE F& operator () (uint32 i, uint32 j)   {   assert ((i < 4) && (j < 4));    F* p_data = (F*)(&m00);       return p_data[i * 4 + j];   }
+
+    ILINE void SetRow(int i, const Vec3_tpl<F>& v)  {   assert(i < 4);    F* p = (F*)(&m00);    p[0 + 4 * i] = v.x;   p[1 + 4 * i] = v.y;   p[2 + 4 * i] = v.z;       }
+    ILINE void SetRow4(int i, const Vec4_tpl<F>& v)   {   assert(i < 4);    F* p = (F*)(&m00);    p[0 + 4 * i] = v.x;   p[1 + 4 * i] = v.y;   p[2 + 4 * i] = v.z;   p[3 + 4 * i] = v.w;   }
+    ILINE const Vec3_tpl<F>& GetRow(int i) const    {   assert(i < 4); return *(const Vec3_tpl<F>*)(&m00 + 4 * i);  }
+
+    ILINE void SetColumn(int i, const Vec3_tpl<F>& v)   {   assert(i < 4);    F* p = (F*)(&m00);    p[i + 4 * 0] = v.x;   p[i + 4 * 1] = v.y;   p[i + 4 * 2] = v.z;       }
+    ILINE Vec3_tpl<F> GetColumn(int i) const    {   assert(i < 4);    F* p = (F*)(&m00);    return Vec3(p[i + 4 * 0], p[i + 4 * 1], p[i + 4 * 2]);    }
+    ILINE Vec4_tpl<F> GetColumn4(int i) const {   assert(i < 4);    F* p = (F*)(&m00);    return Vec4(p[i + 4 * 0], p[i + 4 * 1], p[i + 4 * 2], p[i + 4 * 3]);   }
+
+    ILINE Vec3 GetTranslation() const { return Vec3(m03, m13, m23);   }
+    ILINE void SetTranslation(const Vec3& t)  {   m03 = t.x; m13 = t.y; m23 = t.z; }
+
+    bool IsValid() const
+    {
+        if (!NumberValid(m00))
+        {
+            return false;
+        }
+        if (!NumberValid(m01))
+        {
+            return false;
+        }
+        if (!NumberValid(m02))
+        {
+            return false;
+        }
+        if (!NumberValid(m03))
+        {
+            return false;
+        }
+        if (!NumberValid(m10))
+        {
+            return false;
+        }
+        if (!NumberValid(m11))
+        {
+            return false;
+        }
+        if (!NumberValid(m12))
+        {
+            return false;
+        }
+        if (!NumberValid(m13))
+        {
+            return false;
+        }
+        if (!NumberValid(m20))
+        {
+            return false;
+        }
+        if (!NumberValid(m21))
+        {
+            return false;
+        }
+        if (!NumberValid(m22))
+        {
+            return false;
+        }
+        if (!NumberValid(m23))
+        {
+            return false;
+        }
+        if (!NumberValid(m30))
+        {
+            return false;
+        }
+        if (!NumberValid(m31))
+        {
+            return false;
+        }
+        if (!NumberValid(m32))
+        {
+            return false;
+        }
+        if (!NumberValid(m33))
+        {
+            return false;
+        }
+        return true;
+    }
+    static bool IsEquivalent(const Matrix44_tpl<F>& m0, const Matrix44_tpl<F>& m1, F e = VEC_EPSILON)
+    {
+        return  (
+            (fabs_tpl(m0.m00 - m1.m00) <= e) && (fabs_tpl(m0.m01 - m1.m01) <= e) && (fabs_tpl(m0.m02 - m1.m02) <= e) && (fabs_tpl(m0.m03 - m1.m03) <= e) &&
+            (fabs_tpl(m0.m10 - m1.m10) <= e) && (fabs_tpl(m0.m11 - m1.m11) <= e) && (fabs_tpl(m0.m12 - m1.m12) <= e) && (fabs_tpl(m0.m13 - m1.m13) <= e) &&
+            (fabs_tpl(m0.m20 - m1.m20) <= e) && (fabs_tpl(m0.m21 - m1.m21) <= e) && (fabs_tpl(m0.m22 - m1.m22) <= e) && (fabs_tpl(m0.m23 - m1.m23) <= e) &&
+            (fabs_tpl(m0.m30 - m1.m30) <= e) && (fabs_tpl(m0.m31 - m1.m31) <= e) && (fabs_tpl(m0.m32 - m1.m32) <= e) && (fabs_tpl(m0.m33 - m1.m33) <= e)
+            );
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Typedefs                                                                  //
+///////////////////////////////////////////////////////////////////////////////
+
+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
+typedef _MS_ALIGN(16) Matrix44_tpl<f32> _ALIGN (16) Matrix44A;
+
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//-------------       implementation of Matrix44      ------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------
+
+/*!
+*  Implements the multiplication operator: Matrix44=Matrix44*Matrix33diag
+*
+*  Matrix44 and Matrix33diag are specified in collumn order.
+*  AxB = operation B followed by operation A.
+*  This operation takes 12 mults.
+*
+*  Example:
+*   Matrix33diag diag(1,2,3);
+*   Matrix44 m44=CreateRotationZ33(3.14192f);
+*     Matrix44 result=m44*diag;
+*/
+template<class F1,  class F2>
+ILINE Matrix44_tpl<F1> operator * (const Matrix44_tpl<F1>& l, const Diag33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix44_tpl<F1> m;
+    m.m00 = l.m00 * r.x;
+    m.m01 = l.m01 * r.y;
+    m.m02 = l.m02 * r.z;
+    m.m03 = l.m03;
+    m.m10 = l.m10 * r.x;
+    m.m11 = l.m11 * r.y;
+    m.m12 = l.m12 * r.z;
+    m.m13 = l.m13;
+    m.m20 = l.m20 * r.x;
+    m.m21 = l.m21 * r.y;
+    m.m22 = l.m22 * r.z;
+    m.m23 = l.m23;
+    m.m30 = l.m30 * r.x;
+    m.m31 = l.m31 * r.y;
+    m.m32 = l.m32 * r.z;
+    m.m33 = l.m33;
+    return m;
+}
+template<class F1, class F2>
+ILINE Matrix44_tpl<F1>& operator *= (Matrix44_tpl<F1>& l, const Diag33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    l.m00 *= r.x;
+    l.m01 *= r.y;
+    l.m02 *= r.z;
+    l.m10 *= r.x;
+    l.m11 *= r.y;
+    l.m12 *= r.z;
+    l.m20 *= r.x;
+    l.m21 *= r.y;
+    l.m22 *= r.z;
+    l.m30 *= r.x;
+    l.m31 *= r.y;
+    l.m32 *= r.z;
+    return l;
+}
+
+
+/*!
+*  Implements the multiplication operator: Matrix44=Matrix44*Matrix33
+*
+*  Matrix44 and Matrix33 are specified in collumn order.
+*  AxB = rotation B followed by rotation A.
+*  This operation takes 48 mults and 24 adds.
+*
+*  Example:
+*   Matrix33 m34=CreateRotationX33(1.94192f);;
+*   Matrix44 m44=CreateRotationZ33(3.14192f);
+*     Matrix44 result=m44*m33;
+*/
+template<class F1,  class F2>
+ILINE Matrix44_tpl<F1> operator * (const Matrix44_tpl<F1>& l, const Matrix33_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix44_tpl<F1> m;
+    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
+    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
+    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
+    m.m30 = l.m30 * r.m00 + l.m31 * r.m10 + l.m32 * r.m20;
+    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
+    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
+    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
+    m.m31 = l.m30 * r.m01 + l.m31 * r.m11 + l.m32 * r.m21;
+    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
+    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
+    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
+    m.m32 = l.m30 * r.m02 + l.m31 * r.m12 + l.m32 * r.m22;
+    m.m03 = l.m03;
+    m.m13 = l.m13;
+    m.m23 = l.m23;
+    m.m33 = l.m33;
+    return m;
+}
+
+
+/*!
+*  Implements the multiplication operator: Matrix44=Matrix44*Matrix34
+*
+*  Matrix44 and Matrix34 are specified in collumn order.
+*  AxB = rotation B followed by rotation A.
+*  This operation takes 48 mults and 36 adds.
+*
+*  Example:
+*   Matrix34 m34=CreateRotationX33(1.94192f);;
+*   Matrix44 m44=CreateRotationZ33(3.14192f);
+*     Matrix44 result=m44*m34;
+*/
+template<class F>
+ILINE Matrix44_tpl<F> operator * (const Matrix44_tpl<F>& l, const Matrix34_tpl<F>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix44_tpl<F> m;
+    m.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20;
+    m.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20;
+    m.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20;
+    m.m30 = l.m30 * r.m00 + l.m31 * r.m10 + l.m32 * r.m20;
+    m.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21;
+    m.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21;
+    m.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21;
+    m.m31 = l.m30 * r.m01 + l.m31 * r.m11 + l.m32 * r.m21;
+    m.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22;
+    m.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22;
+    m.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22;
+    m.m32 = l.m30 * r.m02 + l.m31 * r.m12 + l.m32 * r.m22;
+    m.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23 + l.m03;
+    m.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23 + l.m13;
+    m.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23 + l.m23;
+    m.m33 = l.m30 * r.m03 + l.m31 * r.m13 + l.m32 * r.m23 + l.m33;
+    return m;
+}
+
+
+/*!
+*  Implements the multiplication operator: Matrix44=Matrix44*Matrix44
+*
+*  Matrix44 and Matrix34 are specified in collumn order.
+*    AxB = rotation B followed by rotation A.
+*  This operation takes 48 mults and 36 adds.
+*
+*  Example:
+*   Matrix44 m44=CreateRotationX33(1.94192f);;
+*   Matrix44 m44=CreateRotationZ33(3.14192f);
+*     Matrix44 result=m44*m44;
+*/
+template<class F1, class F2>
+ILINE Matrix44_tpl<F1> operator * (const Matrix44_tpl<F1>& l, const Matrix44_tpl<F2>& r)
+{
+    assert(l.IsValid());
+    assert(r.IsValid());
+    Matrix44_tpl<F1> res;
+    res.m00 = l.m00 * r.m00 + l.m01 * r.m10 + l.m02 * r.m20 + l.m03 * r.m30;
+    res.m10 = l.m10 * r.m00 + l.m11 * r.m10 + l.m12 * r.m20 + l.m13 * r.m30;
+    res.m20 = l.m20 * r.m00 + l.m21 * r.m10 + l.m22 * r.m20 + l.m23 * r.m30;
+    res.m30 = l.m30 * r.m00 + l.m31 * r.m10 + l.m32 * r.m20 + l.m33 * r.m30;
+    res.m01 = l.m00 * r.m01 + l.m01 * r.m11 + l.m02 * r.m21 + l.m03 * r.m31;
+    res.m11 = l.m10 * r.m01 + l.m11 * r.m11 + l.m12 * r.m21 + l.m13 * r.m31;
+    res.m21 = l.m20 * r.m01 + l.m21 * r.m11 + l.m22 * r.m21 + l.m23 * r.m31;
+    res.m31 = l.m30 * r.m01 + l.m31 * r.m11 + l.m32 * r.m21 + l.m33 * r.m31;
+    res.m02 = l.m00 * r.m02 + l.m01 * r.m12 + l.m02 * r.m22 + l.m03 * r.m32;
+    res.m12 = l.m10 * r.m02 + l.m11 * r.m12 + l.m12 * r.m22 + l.m13 * r.m32;
+    res.m22 = l.m20 * r.m02 + l.m21 * r.m12 + l.m22 * r.m22 + l.m23 * r.m32;
+    res.m32 = l.m30 * r.m02 + l.m31 * r.m12 + l.m32 * r.m22 + l.m33 * r.m32;
+    res.m03 = l.m00 * r.m03 + l.m01 * r.m13 + l.m02 * r.m23 + l.m03 * r.m33;
+    res.m13 = l.m10 * r.m03 + l.m11 * r.m13 + l.m12 * r.m23 + l.m13 * r.m33;
+    res.m23 = l.m20 * r.m03 + l.m21 * r.m13 + l.m22 * r.m23 + l.m23 * r.m33;
+    res.m33 = l.m30 * r.m03 + l.m31 * r.m13 + l.m32 * r.m23 + l.m33 * r.m33;
+    return res;
+}
+
+//post-multiply
+template<class F1, class F2>
+ILINE Vec4_tpl<F1> operator*(const Matrix44_tpl<F2>& m, const Vec4_tpl<F1>& v)
+{
+    assert(m.IsValid());
+    assert(v.IsValid());
+    return Vec4_tpl<F1>(v.x * m.m00 + v.y * m.m01 + v.z * m.m02 + v.w * m.m03,
+        v.x * m.m10 + v.y * m.m11 + v.z * m.m12 + v.w * m.m13,
+        v.x * m.m20 + v.y * m.m21 + v.z * m.m22 + v.w * m.m23,
+        v.x * m.m30 + v.y * m.m31 + v.z * m.m32 + v.w * m.m33);
+}
+
+//pre-multiply
+template<class F1, class F2>
+ILINE Vec4_tpl<F1> operator*(const Vec4_tpl<F1>& v, const Matrix44_tpl<F2>& m)
+{
+    assert(m.IsValid());
+    assert(v.IsValid());
+    return Vec4_tpl<F1>(v.x * m.m00 + v.y * m.m10 + v.z * m.m20 + v.w * m.m30,
+        v.x * m.m01 + v.y * m.m11 + v.z * m.m21 + v.w * m.m31,
+        v.x * m.m02 + v.y * m.m12 + v.z * m.m22 + v.w * m.m32,
+        v.x * m.m03 + v.y * m.m13 + v.z * m.m23 + v.w * m.m33);
+}
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_MATRIX44_H
+
diff --git a/Code/Legacy/CryCommon/Cry_MatrixDiag.h b/Code/Legacy/CryCommon/Cry_MatrixDiag.h
new file mode 100644
index 0000000000..9b07437ecf
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_MatrixDiag.h
@@ -0,0 +1,191 @@
+/*
+ * 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 matrix class
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_MATRIXDIAG_H
+#define CRYINCLUDE_CRYCOMMON_CRY_MATRIXDIAG_H
+#pragma once
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Diag33_tpl
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+template<typename F>
+struct Diag33_tpl
+{
+    F x, y, z;
+
+#ifdef _DEBUG
+    ILINE Diag33_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+        }
+    }
+#else
+    ILINE Diag33_tpl()  {};
+#endif
+
+
+    Diag33_tpl(F dx, F dy, F dz) { x = dx; y = dy; z = dz; }
+    Diag33_tpl(const Vec3_tpl<F>& v) {  x = v.x; y = v.y; z = v.z;    }
+    template<class F1>
+    const Diag33_tpl& operator=(const Vec3_tpl<F1>& v) { x = v.x; y = v.y; z = v.z; return *this;    }
+    Diag33_tpl& operator=(const Diag33_tpl<F>& diag) { x = diag.x; y = diag.y; z = diag.z; return *this;  }
+    template<class F1>
+    Diag33_tpl& operator=(const Diag33_tpl<F1>& diag) { x = diag.x; y = diag.y; z = diag.z; return *this; }
+
+    const void SetIdentity() { x = y = z = 1; }
+    Diag33_tpl(type_identity) { x = y = z = 1; }
+
+    const Diag33_tpl& zero() {  x = y = z = 0; return *this; }
+
+    Diag33_tpl& fabs() {    x = fabs_tpl(x); y = fabs_tpl(y); z = fabs_tpl(z); return *this;  }
+
+    Diag33_tpl& invert()   // in-place inversion
+    {
+        F det = determinant();
+        if (det == 0)
+        {
+            return *this;
+        }
+        det = (F)1.0 / det;
+        F oldata[3];
+        oldata[0] = x;
+        oldata[1] = y;
+        oldata[2] = z;
+        x = oldata[1] * oldata[2] * det;
+        y = oldata[0] * oldata[2] * det;
+        z = oldata[0] * oldata[1] * det;
+        return *this;
+    }
+
+    /*!
+    * Linear-Interpolation between Diag33(lerp)
+    *
+    * Example:
+    *  Diag33 r=Diag33::CreateLerp( p, q, 0.345f );
+    */
+    ILINE void SetLerp(const Diag33_tpl<F>& p, const Diag33_tpl<F>& q, F t)
+    {
+        x = p.x * (1.0f - t) + q.x * t;
+        y = p.y * (1.0f - t) + q.y * t;
+        z = p.z * (1.0f - t) + q.z * t;
+    }
+    ILINE static Diag33_tpl<F> CreateLerp(const Diag33_tpl<F>& p, const Diag33_tpl<F>& q, F t)
+    {
+        Diag33_tpl<F>  d;
+        d.x = p.x * (1.0f - t) + q.x * t;
+        d.y = p.y * (1.0f - t) + q.y * t;
+        d.z = p.z * (1.0f - t) + q.z * t;
+        return d;
+    }
+
+    F determinant() const { return x * y * z; }
+
+    ILINE bool IsValid() const
+    {
+        if (!NumberValid(x))
+        {
+            return false;
+        }
+        if (!NumberValid(y))
+        {
+            return false;
+        }
+        if (!NumberValid(z))
+        {
+            return false;
+        }
+        return true;
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Typedefs                                                                  //
+///////////////////////////////////////////////////////////////////////////////
+
+typedef Diag33_tpl<f32>  Diag33; //always 32 bit
+typedef Diag33_tpl<f64>  Diag33d;//always 64 bit
+typedef Diag33_tpl<real> Diag33r;//variable float precision. depending on the target system it can be between 32, 64 or 80 bit
+
+
+template<class F1, class F2>
+Diag33_tpl<F1> operator*(const Diag33_tpl<F1>& l, const Diag33_tpl<F2>& r)
+{
+    return Diag33_tpl<F1>(l.x * r.x, l.y * r.y,   l.z * r.z);
+}
+
+template<class F1, class F2>
+Matrix33_tpl<F2> operator*(const Diag33_tpl<F1>& l, const Matrix33_tpl<F2>& r)
+{
+    Matrix33_tpl<F2> res;
+    res.m00 = r.m00 * l.x;
+    res.m01 = r.m01 * l.x;
+    res.m02 = r.m02 * l.x;
+    res.m10 = r.m10 * l.y;
+    res.m11 = r.m11 * l.y;
+    res.m12 = r.m12 * l.y;
+    res.m20 = r.m20 * l.z;
+    res.m21 = r.m21 * l.z;
+    res.m22 = r.m22 * l.z;
+    return res;
+}
+template<class F1, class F2>
+Matrix34_tpl<F2> operator*(const Diag33_tpl<F1>& l, const Matrix34_tpl<F2>& r)
+{
+    Matrix34_tpl<F2> m;
+    m.m00 = l.x * r.m00;
+    m.m01 = l.x * r.m01;
+    m.m02 = l.x * r.m02;
+    m.m03 = l.x * r.m03;
+    m.m10 = l.y * r.m10;
+    m.m11 = l.y * r.m11;
+    m.m12 = l.y * r.m12;
+    m.m13 = l.y * r.m13;
+    m.m20 = l.z * r.m20;
+    m.m21 = l.z * r.m21;
+    m.m22 = l.z * r.m22;
+    m.m23 = l.z * r.m23;
+    return m;
+}
+
+template<class F1, class F2>
+Vec3_tpl<F2> operator *(const Diag33_tpl<F1>& mtx, const Vec3_tpl<F2>& vec)
+{
+    return Vec3_tpl<F2>(mtx.x * vec.x, mtx.y * vec.y, mtx.z * vec.z);
+}
+
+template<class F1, class F2>
+Vec3_tpl<F1> operator *(const Vec3_tpl<F1>& vec, const Diag33_tpl<F2>& mtx)
+{
+    return Vec3_tpl<F1>(mtx.x * vec.x, mtx.y * vec.y, mtx.z * vec.z);
+}
+
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_MATRIXDIAG_H
+
diff --git a/Code/Legacy/CryCommon/Cry_Quat.h b/Code/Legacy/CryCommon/Cry_Quat.h
new file mode 100644
index 0000000000..74da78cc77
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Quat.h
@@ -0,0 +1,2228 @@
+/*
+ * 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 quaternion class
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_QUAT_H
+#define CRYINCLUDE_CRYCOMMON_CRY_QUAT_H
+#pragma once
+
+#include <AzCore/Math/Quaternion.h>
+
+//----------------------------------------------------------------------
+// Quaternion
+//----------------------------------------------------------------------
+template <typename F>
+struct Quat_tpl
+{
+    Vec3_tpl<F> v;
+    F w;
+
+    //-------------------------------
+
+    //constructors
+#if defined(_DEBUG)
+    ILINE Quat_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&v.x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+            p[3] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&v.x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+            p[3] = F64NAN;
+        }
+    }
+#else
+    ILINE Quat_tpl() {}
+#endif
+
+    //initialize with zeros
+    ILINE Quat_tpl(type_zero)
+    {
+        w = 0, v.x = 0, v.y = 0, v.z = 0;
+    }
+    ILINE Quat_tpl(type_identity)
+    {
+        w = 1, v.x = 0, v.y = 0, v.z = 0;
+    }
+
+    //ASSIGNMENT OPERATOR of identical Quat types.
+    //The assignment operator has precedence over assignment constructor
+    //Quat q; q=q0;
+    ILINE Quat_tpl<F>& operator = (const Quat_tpl<F>& src)
+    {
+        v.x = src.v.x;
+        v.y = src.v.y;
+        v.z = src.v.z;
+        w = src.w;
+        assert(IsValid());
+        return *this;
+    }
+
+
+    //CONSTRUCTOR to initialize a Quat from 4 floats
+    //Quat q(1,0,0,0);
+    ILINE Quat_tpl<F>(F qw, F qx, F qy, F qz)
+    {
+        w = qw;
+        v.x = qx;
+        v.y = qy;
+        v.z = qz;
+        assert(IsValid());
+    }
+    //CONSTRUCTOR to initialize a Quat with a scalar and a vector
+    //Quat q(1,Vec3(0,0,0));
+    ILINE Quat_tpl<F>(F scalar, const Vec3_tpl<F> &vector)
+    {
+        v = vector;
+        w = scalar;
+        assert(IsValid());
+    };
+
+
+    //CONSTRUCTOR for identical types
+    //Quat q=q0;
+    ILINE  Quat_tpl<F>(const Quat_tpl<F>&q)
+    {
+        w = q.w;
+        v.x = q.v.x;
+        v.y = q.v.y;
+        v.z = q.v.z;
+        assert(IsValid());
+    }
+
+    //CONSTRUCTOR for AZ::Quaternion
+    explicit ILINE  Quat_tpl<F>(const AZ::Quaternion& q)
+    {
+        w = q.GetW();
+        v.x = q.GetX();
+        v.y = q.GetY();
+        v.z = q.GetZ();
+        assert(IsValid());
+    }
+
+    //CONSTRUCTOR for identical types which converts between double/float
+    //Quat q32=q64;
+    //Quatr q64=q32;
+    template <class F1>
+    ILINE  Quat_tpl<F>(const Quat_tpl<F1>&q)
+    {
+        assert(q.IsValid());
+        w = F(q.w);
+        v.x = F(q.v.x);
+        v.y = F(q.v.y);
+        v.z = F(q.v.z);
+    }
+
+
+
+
+
+
+
+    //CONSTRUCTOR for different types. It converts a Euler Angle into a Quat.
+    //Needs to be 'explicit' because we loose fp-precision in the conversion process
+    //Quat(Ang3(1,2,3));
+    explicit ILINE Quat_tpl<F>(const Ang3_tpl<F>&ang)
+    {
+        assert(ang.IsValid());
+        SetRotationXYZ(ang);
+    }
+    //CONSTRUCTOR for different types. It converts a Euler Angle into a Quat and converts between double/float. .
+    //Needs to be 'explicit' because we loose fp-precision in the conversion process
+    //Quat(Ang3r(1,2,3));
+    template<class F1>
+    explicit ILINE Quat_tpl<F>(const Ang3_tpl<F1>&ang)
+    {
+        assert(ang.IsValid());
+        SetRotationXYZ(Ang3_tpl<F>(F(ang.x), F(ang.y), F(ang.z)));
+    }
+
+
+    //CONSTRUCTOR for different types. It converts a Matrix33 into a Quat.
+    //Needs to be 'explicit' because we loose fp-precision in the conversion process
+    //Quat(m33);
+    explicit ILINE Quat_tpl<F>(const Matrix33_tpl<F>&m)
+    {
+        assert(m.IsOrthonormalRH(0.1f));
+        F s, p, tr = m.m00 + m.m11 + m.m22;
+        w = 1, v.x = 0, v.y = 0, v.z = 0;
+        if (tr > 0)
+        {
+            s = sqrt_tpl(tr + 1.0f), p = 0.5f / s, w = s * 0.5f, v.x = (m.m21 - m.m12) * p, v.y = (m.m02 - m.m20) * p, v.z = (m.m10 - m.m01) * p;
+        }
+        else if ((m.m00 >= m.m11) && (m.m00 >= m.m22))
+        {
+            s = sqrt_tpl(m.m00 - m.m11 - m.m22 + 1.0f), p = 0.5f / s, w = (m.m21 - m.m12) * p, v.x = s * 0.5f, v.y = (m.m10 + m.m01) * p, v.z = (m.m20 + m.m02) * p;
+        }
+        else if ((m.m11 >= m.m00) && (m.m11 >= m.m22))
+        {
+            s = sqrt_tpl(m.m11 - m.m22 - m.m00 + 1.0f), p = 0.5f / s, w = (m.m02 - m.m20) * p, v.x = (m.m01 + m.m10) * p, v.y = s * 0.5f, v.z = (m.m21 + m.m12) * p;
+        }
+        else if ((m.m22 >= m.m00) && (m.m22 >= m.m11))
+        {
+            s = sqrt_tpl(m.m22 - m.m00 - m.m11 + 1.0f), p = 0.5f / s, w = (m.m10 - m.m01) * p, v.x = (m.m02 + m.m20) * p, v.y = (m.m12 + m.m21) * p, v.z = s * 0.5f;
+        }
+    }
+    //CONSTRUCTOR for different types. It converts a Matrix33 into a Quat and converts between double/float.
+    //Needs to be 'explicit' because we loose fp-precision the conversion process
+    //Quat(m33r);
+    //Quatr(m33);
+    template<class F1>
+    explicit ILINE Quat_tpl<F>(const Matrix33_tpl<F1>&m)
+    {
+        assert(m.IsOrthonormalRH(0.1f));
+        F1 s, p, tr = m.m00 + m.m11 + m.m22;
+        w = 1, v.x = 0, v.y = 0, v.z = 0;
+        if (tr > 0)
+        {
+            s = sqrt_tpl(tr + 1.0f), p = 0.5f / s, w = F(s * 0.5), v.x = F((m.m21 - m.m12) * p), v.y = F((m.m02 - m.m20) * p), v.z = F((m.m10 - m.m01) * p);
+        }
+        else if ((m.m00 >= m.m11) && (m.m00 >= m.m22))
+        {
+            s = sqrt_tpl(m.m00 - m.m11 - m.m22 + 1.0f), p = 0.5f / s, w = F((m.m21 - m.m12) * p), v.x = F(s * 0.5), v.y = F((m.m10 + m.m01) * p), v.z = F((m.m20 + m.m02) * p);
+        }
+        else if ((m.m11 >= m.m00) && (m.m11 >= m.m22))
+        {
+            s = sqrt_tpl(m.m11 - m.m22 - m.m00 + 1.0f), p = 0.5f / s, w = F((m.m02 - m.m20) * p), v.x = F((m.m01 + m.m10) * p), v.y = F(s * 0.5), v.z = F((m.m21 + m.m12) * p);
+        }
+        else if ((m.m22 >= m.m00) && (m.m22 >= m.m11))
+        {
+            s = sqrt_tpl(m.m22 - m.m00 - m.m11 + 1.0f), p = 0.5f / s, w = F((m.m10 - m.m01) * p), v.x = F((m.m02 + m.m20) * p), v.y = F((m.m12 + m.m21) * p), v.z = F(s * 0.5);
+        }
+    }
+
+    //CONSTRUCTOR for different types. It converts a Matrix34 into a Quat.
+    //Needs to be 'explicit' because we loose fp-precision in the conversion process
+    //Quat(m34);
+    explicit ILINE Quat_tpl<F>(const Matrix34_tpl<F>&m)
+    {
+        *this = Quat_tpl<F>(Matrix33_tpl<F>(m));
+    }
+    //CONSTRUCTOR for different types. It converts a Matrix34 into a Quat and converts between double/float.
+    //Needs to be 'explicit' because we loose fp-precision the conversion process
+    //Quat(m34r);
+    //Quatr(m34);
+    template<class F1>
+    explicit ILINE Quat_tpl<F>(const Matrix34_tpl<F1>&m)
+    {
+        *this = Quat_tpl<F>(Matrix33_tpl<F1>(m));
+    }
+
+
+
+
+
+    /*!
+    * invert quaternion.
+    *
+    * Example 1:
+    *  Quat q=Quat::CreateRotationXYZ(Ang3(1,2,3));
+    *  Quat result = !q;
+    *  Quat result = GetInverted(q);
+    *  q.Invert();
+    */
+    ILINE Quat_tpl<F> operator ! () const { return Quat_tpl(w, -v); }
+    ILINE void Invert(void) { *this = !*this;   }
+    ILINE Quat_tpl<F> GetInverted() const { return !(*this); }
+    //flip quaternion. don't confuse this with quaternion-inversion.
+    ILINE Quat_tpl<F>   operator - () const { return Quat_tpl<F>(-w, -v); };
+    //multiplication by a scalar
+    void operator *= (F op) {   w *= op; v *= op;   }
+
+    // Exact compare of 2 quats.
+    ILINE bool operator==(const Quat_tpl<F>& q) const { return (v == q.v) && (w == q.w); }
+    ILINE bool operator!=(const Quat_tpl<F>& q) const { return !(*this == q); }
+
+
+
+
+    //A quaternion is a compressed matrix. Thus there is no problem extracting the rows & columns.
+    ILINE Vec3_tpl<F> GetColumn(uint32 i)
+    {
+        if (i == 0)
+        {
+            return GetColumn0();
+        }
+        if (i == 1)
+        {
+            return GetColumn1();
+        }
+        if (i == 2)
+        {
+            return GetColumn2();
+        }
+        assert(0); //bad index
+        return Vec3(ZERO);
+    }
+
+    ILINE Vec3_tpl<F> GetColumn0() const {return Vec3_tpl<F>(2 * (v.x * v.x + w * w) - 1, 2 * (v.y * v.x + v.z * w), 2 * (v.z * v.x - v.y * w)); }
+    ILINE Vec3_tpl<F> GetColumn1() const {return Vec3_tpl<F>(2 * (v.x * v.y - v.z * w), 2 * (v.y * v.y + w * w) - 1, 2 * (v.z * v.y + v.x * w)); }
+    ILINE Vec3_tpl<F> GetColumn2() const {return Vec3_tpl<F>(2 * (v.x * v.z + v.y * w), 2 * (v.y * v.z - v.x * w), 2 * (v.z * v.z + w * w) - 1); }
+    ILINE Vec3_tpl<F> GetRow0() const {return Vec3_tpl<F>(2 * (v.x * v.x + w * w) - 1, 2 * (v.x * v.y - v.z * w), 2 * (v.x * v.z + v.y * w)); }
+    ILINE Vec3_tpl<F> GetRow1() const {return Vec3_tpl<F>(2 * (v.y * v.x + v.z * w), 2 * (v.y * v.y + w * w) - 1, 2 * (v.y * v.z - v.x * w)); }
+    ILINE Vec3_tpl<F> GetRow2() const   {return Vec3_tpl<F>(2 * (v.z * v.x - v.y * w), 2 * (v.z * v.y + v.x * w), 2 * (v.z * v.z + w * w) - 1); }
+
+    // These are just copy & pasted components of the GetColumn1() above.
+    ILINE F GetFwdX() const { return (2 * (v.x * v.y - v.z * w)); }
+    ILINE F GetFwdY() const { return (2 * (v.y * v.y + w * w) - 1); }
+    ILINE F GetFwdZ() const { return (2 * (v.z * v.y + v.x * w)); }
+    ILINE F GetRotZ() const { return atan2_tpl(-GetFwdX(), GetFwdY()); }
+
+
+
+    /*!
+    * set identity quaternion
+    *
+    * Example:
+    *       Quat q=Quat::CreateIdentity();
+    *   or
+    *       q.SetIdentity();
+    *   or
+    *       Quat p=Quat(IDENTITY);
+    */
+    ILINE void SetIdentity(void)
+    {
+        w = 1;
+        v.x = 0;
+        v.y = 0;
+        v.z = 0;
+    }
+    ILINE static Quat_tpl<F> CreateIdentity(void)
+    {
+        return Quat_tpl<F>(1, 0, 0, 0);
+    }
+
+
+
+
+    // Description:
+    //    Check if identity quaternion.
+    ILINE bool IsIdentity() const
+    {
+        return w == 1 && v.x == 0 && v.y == 0 && v.z == 0;
+    }
+
+    ILINE bool IsUnit(F e = VEC_EPSILON) const
+    {
+        return fabs_tpl(1 - (w * w + v.x * v.x + v.y * v.y + v.z * v.z)) < e;
+    }
+
+    ILINE bool IsValid([[maybe_unused]] F e = VEC_EPSILON) const
+    {
+        if (!v.IsValid())
+        {
+            return false;
+        }
+        if (!NumberValid(w))
+        {
+            return false;
+        }
+        //if (!IsUnit(e))   return false;
+        return true;
+    }
+
+
+
+    ILINE void SetRotationAA(F rad, const Vec3_tpl<F>& axis)
+    {
+        F s, c;
+        sincos_tpl(rad * (F)0.5, &s, &c);
+        SetRotationAA(c, s, axis);
+    }
+    ILINE static Quat_tpl<F> CreateRotationAA(F rad, const Vec3_tpl<F>& axis)
+    {
+        Quat_tpl<F> q;
+        q.SetRotationAA(rad, axis);
+        return q;
+    }
+
+    ILINE void SetRotationAA(F cosha, F sinha, const Vec3_tpl<F>& axis)
+    {
+        assert(axis.IsUnit(0.001f));
+        w = cosha;
+        v = axis * sinha;
+    }
+    ILINE static Quat_tpl<F> CreateRotationAA(F cosha, F sinha, const Vec3_tpl<F>& axis)
+    {
+        Quat_tpl<F> q;
+        q.SetRotationAA(cosha, sinha, axis);
+        return q;
+    }
+
+
+
+
+    /*!
+    * Create rotation-quaternion that around the fixed coordinate axes.
+    *
+    * Example:
+    *       Quat q=Quat::CreateRotationXYZ( Ang3(1,2,3) );
+    *   or
+    *       q.SetRotationXYZ( Ang3(1,2,3) );
+    */
+    ILINE void SetRotationXYZ(const Ang3_tpl<F>& a)
+    {
+        assert(a.IsValid());
+        F sx, cx;
+        sincos_tpl(F(a.x * F(0.5)), &sx, &cx);
+        F sy, cy;
+        sincos_tpl(F(a.y * F(0.5)), &sy, &cy);
+        F sz, cz;
+        sincos_tpl(F(a.z * F(0.5)), &sz, &cz);
+        w       = cx * cy * cz + sx * sy * sz;
+        v.x = cz * cy * sx - sz * sy * cx;
+        v.y = cz * sy * cx + sz * cy * sx;
+        v.z = sz * cy * cx - cz * sy * sx;
+    }
+    ILINE static Quat_tpl<F> CreateRotationXYZ(const Ang3_tpl<F>& a)
+    {
+        assert(a.IsValid());
+        Quat_tpl<F> q;
+        q.SetRotationXYZ(a);
+        return q;
+    }
+
+    /*!
+    * Create rotation-quaternion that about the x-axis.
+    *
+    * Example:
+    *       Quat q=Quat::CreateRotationX( radiant );
+    *   or
+    *       q.SetRotationX( Ang3(1,2,3) );
+    */
+    ILINE void SetRotationX(f32 r)
+    {
+        F s, c;
+        sincos_tpl(F(r * F(0.5)), &s, &c);
+        w = c;
+        v.x = s;
+        v.y = 0;
+        v.z = 0;
+    }
+    ILINE static Quat_tpl<F> CreateRotationX(f32 r)
+    {
+        Quat_tpl<F> q;
+        q.SetRotationX(r);
+        return q;
+    }
+
+
+    /*!
+    * Create rotation-quaternion that about the y-axis.
+    *
+    * Example:
+    *       Quat q=Quat::CreateRotationY( radiant );
+    *   or
+    *       q.SetRotationY( radiant );
+    */
+    ILINE void SetRotationY(f32 r)
+    {
+        F s, c;
+        sincos_tpl(F(r * F(0.5)), &s, &c);
+        w = c;
+        v.x = 0;
+        v.y = s;
+        v.z = 0;
+    }
+    ILINE static Quat_tpl<F> CreateRotationY(f32 r)
+    {
+        Quat_tpl<F> q;
+        q.SetRotationY(r);
+        return q;
+    }
+
+
+    /*!
+    * Create rotation-quaternion that about the z-axis.
+    *
+    * Example:
+    *       Quat q=Quat::CreateRotationZ( radiant );
+    *   or
+    *       q.SetRotationZ( radiant );
+    */
+    ILINE void SetRotationZ(f32 r)
+    {
+        F s, c;
+        sincos_tpl(F(r * F(0.5)), &s, &c);
+        w = c;
+        v.x = 0;
+        v.y = 0;
+        v.z = s;
+    }
+    ILINE static Quat_tpl<F> CreateRotationZ(f32 r)
+    {
+        Quat_tpl<F> q;
+        q.SetRotationZ(r);
+        return q;
+    }
+
+
+
+    /*!
+    *
+    * Create rotation-quaternion that rotates from one vector to another.
+    * Both vectors are assumed to be normalized.
+    *
+    * Example:
+    *       Quat q=Quat::CreateRotationV0V1( v0,v1 );
+    *       q.SetRotationV0V1( v0,v1 );
+    */
+    ILINE void SetRotationV0V1(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
+    {
+        assert(v0.IsUnit(0.01f));
+        assert(v1.IsUnit(0.01f));
+        F dot = v0.x * v1.x + v0.y * v1.y + v0.z * v1.z + F(1.0);
+        if (dot > F(0.0001))
+        {
+            F vx = v0.y * v1.z - v0.z * v1.y;
+            F vy = v0.z * v1.x - v0.x * v1.z;
+            F vz = v0.x * v1.y - v0.y * v1.x;
+            F d = isqrt_tpl(dot * dot + vx * vx + vy * vy + vz * vz);
+            w = F(dot * d);
+            v.x = F(vx * d);
+            v.y = F(vy * d);
+            v.z = F(vz * d);
+            return;
+        }
+        w = 0;
+        v = v0.GetOrthogonal().GetNormalized();
+    }
+    ILINE static Quat_tpl<F> CreateRotationV0V1(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1) { Quat_tpl<F> q;  q.SetRotationV0V1(v0, v1);   return q;   }
+
+
+
+
+
+
+    /*!
+    *
+    * \param vdir  normalized view direction.
+    * \param roll  radiant to rotate about Y-axis.
+    *
+    *  Given a view-direction and a radiant to rotate about Y-axis, this function builds a 3x3 look-at quaternion
+    *  using only simple vector arithmetic. This function is always using the implicit up-vector Vec3(0,0,1).
+    *  The view-direction is always stored in column(1).
+    *  IMPORTANT: The view-vector is assumed to be normalized, because all trig-values for the orientation are being
+    *  extracted  directly out of the vector. This function must NOT be called with a view-direction
+    *  that is close to Vec3(0,0,1) or Vec3(0,0,-1). If one of these rules is broken, the function returns a quaternion
+    *  with an undefined rotation about the Z-axis.
+    *
+    *  Rotation order for the look-at-quaternion is Z-X-Y. (Zaxis=YAW / Xaxis=PITCH / Yaxis=ROLL)
+    *
+    *  COORDINATE-SYSTEM
+    *
+    *  z-axis
+    *    ^
+    *    |
+    *    |  y-axis
+    *    |  /
+    *    | /
+    *    |/
+    *    +--------------->   x-axis
+    *
+    *  Example:
+    *       Quat LookAtQuat=Quat::CreateRotationVDir( Vec3(0,1,0) );
+    *   or
+    *       Quat LookAtQuat=Quat::CreateRotationVDir( Vec3(0,1,0), 0.333f );
+    */
+    ILINE void SetRotationVDir(const Vec3_tpl<F>& vdir)
+    {
+        assert(vdir.IsUnit(0.01f));
+        //set default initialization for up-vector
+        w = F(0.70710676908493042);
+        v.x = F(vdir.z * 0.70710676908493042);
+        v.y = F(0.0);
+        v.z = F(0.0);
+        F l = sqrt_tpl(vdir.x * vdir.x + vdir.y * vdir.y);
+        if (l > F(0.00001))
+        {
+            //calculate LookAt quaternion
+            Vec3_tpl<F> hv  =   Vec3_tpl<F> (vdir.x / l, vdir.y / l + 1.0f, l + 1.0f);
+            F r = sqrt_tpl(hv.x * hv.x + hv.y * hv.y);
+            F s = sqrt_tpl(hv.z * hv.z + vdir.z * vdir.z);
+            //generate the half-angle sine&cosine
+            F hacos0 = 0.0;
+            F hasin0 = -1.0;
+            if (r > F(0.00001))
+            {
+                hacos0 = hv.y / r;
+                hasin0 = -hv.x / r;
+            }                                                       //yaw
+            F hacos1 = hv.z / s;
+            F hasin1 = vdir.z / s;                                  //pitch
+            w = F(hacos0 * hacos1);
+            v.x = F(hacos0 * hasin1);
+            v.y = F(hasin0 * hasin1);
+            v.z = F(hasin0 * hacos1);
+        }
+    }
+    ILINE static Quat_tpl<F> CreateRotationVDir(const Vec3_tpl<F>& vdir) {    Quat_tpl<F> q;  q.SetRotationVDir(vdir); return q;  }
+
+
+    ILINE void SetRotationVDir(const Vec3_tpl<F>& vdir, F r)
+    {
+        SetRotationVDir(vdir);
+        F sy, cy;
+        sincos_tpl(r * (F)0.5, &sy, &cy);
+        F vx = v.x, vy = v.y;
+        v.x = F(vx * cy - v.z * sy);
+        v.y = F(w * sy + vy * cy);
+        v.z = F(v.z * cy + vx * sy);
+        w = F(w * cy - vy * sy);
+    }
+    ILINE static Quat_tpl<F> CreateRotationVDir(const Vec3_tpl<F>& vdir, F roll) {    Quat_tpl<F> q; q.SetRotationVDir(vdir, roll);    return q;   }
+
+
+
+
+    /*!
+    * normalize quaternion.
+    *
+    * Example 1:
+    *  Quat q; q.Normalize();
+    *
+    * Example 2:
+    *  Quat q=Quat(1,2,3,4);
+    *  Quat qn=q.GetNormalized();
+    */
+    ILINE void Normalize(void)
+    {
+        F d = isqrt_tpl(w * w + v.x * v.x + v.y * v.y + v.z * v.z);
+        w *= d;
+        v.x *= d;
+        v.y *= d;
+        v.z *= d;
+    }
+    ILINE Quat_tpl<F> GetNormalized() const
+    {
+        Quat_tpl<F> t = *this;
+        t.Normalize();
+        return t;
+    }
+
+
+    ILINE void NormalizeSafe(void)
+    {
+        F d = w * w + v.x * v.x + v.y * v.y + v.z * v.z;
+        if (d > 1e-8f)
+        {
+            d = isqrt_tpl(d);
+            w *= d;
+            v.x *= d;
+            v.y *= d;
+            v.z *= d;
+        }
+        else
+        {
+            SetIdentity();
+        }
+    }
+    ILINE Quat_tpl<F> GetNormalizedSafe() const
+    {
+        Quat_tpl<F> t = *this;
+        t.NormalizeSafe();
+        return t;
+    }
+
+
+    ILINE void  NormalizeFast(void)
+    {
+        assert(this->IsValid());
+        F fInvLen = isqrt_fast_tpl(v.x * v.x + v.y * v.y + v.z * v.z + w * w);
+        v.x *= fInvLen;
+        v.y *= fInvLen;
+        v.z *= fInvLen;
+        w *= fInvLen;
+    }
+    ILINE Quat_tpl<F> GetNormalizedFast() const
+    {
+        Quat_tpl<F> t = *this;
+        t.NormalizeFast();
+        return t;
+    }
+
+
+    /*!
+    * get length of quaternion.
+    *
+    * Example 1:
+    *  f32 l=q.GetLength();
+    */
+    ILINE F GetLength() const
+    {
+        return sqrt_tpl(w * w + v.x * v.x + v.y * v.y + v.z * v.z);
+    }
+
+    ILINE static bool IsEquivalent(const Quat_tpl<F>& q1, const Quat_tpl<F>& q2, F qe = RAD_EPSILON)
+    {
+        Quat_tpl<f64> q1r = q1;
+        Quat_tpl<f64> q2r = q2;
+        f64 rad = acos(min(1.0, fabs_tpl(q1r.v.x * q2r.v.x + q1r.v.y * q2r.v.y + q1r.v.z * q2r.v.z + q1r.w * q2r.w)));
+        bool qdif = rad <= qe;
+        return qdif;
+    }
+
+
+    // Exponent of Quaternion.
+    ILINE static Quat_tpl<F> exp(const Vec3_tpl<F>& v)
+    {
+        F lensqr = v.len2();
+        if (lensqr > F(0))
+        {
+            F len = sqrt_tpl(lensqr);
+            F s, c;
+            sincos_tpl(len, &s, &c);
+            s /= len;
+            return Quat_tpl<F>(c, v.x * s, v.y * s, v.z * s);
+        }
+        return Quat_tpl<F> (IDENTITY);
+    }
+
+    // logarithm of a quaternion, imaginary part (the real part of the logarithm is always 0)
+    ILINE static Vec3_tpl<F> log (const Quat_tpl<F>& q)
+    {
+        assert(q.IsValid());
+        F lensqr = q.v.len2();
+        if (lensqr > 0.0f)
+        {
+            F len = sqrt_tpl(lensqr);
+            F angle = atan2_tpl(len, q.w) / len;
+            return q.v * angle;
+        }
+        // logarithm of a quaternion, imaginary part (the real part of the logarithm is always 0)
+        return Vec3_tpl<F>(0, 0, 0);
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Logarithm of Quaternion difference.
+    ILINE static Quat_tpl<F> LnDif(const Quat_tpl<F>& q1, const Quat_tpl<F>& q2)
+    {
+        return Quat_tpl<F>(0, log(q2 / q1));
+    }
+
+
+
+
+    /*!
+    * linear-interpolation between quaternions (lerp)
+    *
+    * Example:
+    *  CQuaternion result,p,q;
+    *  result=qlerp( p, q, 0.5f );
+    */
+    ILINE void SetNlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
+    {
+        Quat_tpl<F> q = tq;
+        assert(p.IsValid());
+        assert(q.IsValid());
+        if ((p | q) < 0)
+        {
+            q = -q;
+        }
+        v.x = p.v.x * (1.0f - t) + q.v.x * t;
+        v.y = p.v.y * (1.0f - t) + q.v.y * t;
+        v.z = p.v.z * (1.0f - t) + q.v.z * t;
+        w       = p.w  * (1.0f - t) + q.w  * t;
+        Normalize();
+    }
+
+    ILINE static Quat_tpl<F> CreateNlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
+    {
+        Quat_tpl<F> d;
+        d.SetNlerp(p, tq, t);
+        return d;
+    }
+
+
+    /*!
+    * linear-interpolation between quaternions (nlerp)
+    * in this case we convert the t-value into a 1d cubic spline to get closer to Slerp
+    *
+    * Example:
+    *  Quat result,p,q;
+    *  result.SetNlerpCubic( p, q, 0.5f );
+    */
+    ILINE void SetNlerpCubic(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
+    {
+        Quat_tpl<F> q = tq;
+        assert((fabs_tpl(1 - (p | p))) < 0.001); //check if unit-quaternion
+        assert((fabs_tpl(1 - (q | q))) < 0.001); //check if unit-quaternion
+        F cosine = (p | q);
+        if (cosine < 0)
+        {
+            q = -q;
+        }
+        F k = (1 - fabs_tpl(cosine)) * F(0.4669269);
+        F s = 2 * k * t * t * t - 3 * k * t * t + (1 + k) * t;
+        v.x = p.v.x * (1.0f - s) + q.v.x * s;
+        v.y = p.v.y * (1.0f - s) + q.v.y * s;
+        v.z = p.v.z * (1.0f - s) + q.v.z * s;
+        w       = p.w  * (1.0f - s) + q.w * s;
+        Normalize();
+    }
+    ILINE static Quat_tpl<F> CreateNlerpCubic(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
+    {
+        Quat_tpl<F> d;
+        d.SetNlerpCubic(p, tq, t);
+        return d;
+    }
+
+
+    /*!
+    * spherical-interpolation between quaternions (geometrical slerp)
+    *
+    * Example:
+    *  Quat result,p,q;
+    *  result.SetSlerp( p, q, 0.5f );
+    */
+    ILINE void SetSlerp(const Quat_tpl<F>& tp, const Quat_tpl<F>& tq, F t)
+    {
+        assert(tp.IsValid());
+        assert(tq.IsUnit());
+        Quat_tpl<F> p = tp, q = tq;
+        Quat_tpl<F> q2;
+
+        F cosine = (p | q);
+        if (cosine < 0.0f)
+        {
+            cosine = -cosine;
+            q = -q;
+        }                                             //take shortest arc
+        if (cosine > 0.9999f)
+        {
+            SetNlerp(p, q, t);
+            return;
+        }
+        // from now on, a division by 0 is not possible any more
+        q2.w        = q.w - p.w * cosine;
+        q2.v.x  = q.v.x - p.v.x * cosine;
+        q2.v.y  = q.v.y - p.v.y * cosine;
+        q2.v.z  = q.v.z - p.v.z * cosine;
+        F sine  = sqrt(q2 | q2);
+
+        // Actually you can divide by 0 right here.
+        assert(sine != 0.0000f);
+
+        F s, c;
+        sincos_tpl(atan2_tpl(sine, cosine) * t, &s, &c);
+        w =   F(p.w  * c + q2.w  * s / sine);
+        v.x = F(p.v.x * c + q2.v.x * s / sine);
+        v.y = F(p.v.y * c + q2.v.y * s / sine);
+        v.z = F(p.v.z * c + q2.v.z * s / sine);
+    }
+
+    ILINE static Quat_tpl<F> CreateSlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
+    {
+        Quat_tpl<F> d;
+        d.SetSlerp(p, tq, t);
+        return d;
+    }
+
+    /*!
+    * spherical-interpolation between quaternions (algebraic slerp_a)
+    * I have included this function just for the sake of completeness, because
+    * its the only useful application to check if exp & log really work.
+    * Both slerp-functions are returning the same result.
+    *
+    * Example:
+    *  Quat result,p,q;
+    *  result.SetExpSlerp( p,q,0.3345f );
+    */
+    ILINE void SetExpSlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& tq, F t)
+    {
+        assert((fabs_tpl(1 - (p | p))) < 0.001); //check if unit-quaternion
+        assert((fabs_tpl(1 - (tq | tq))) < 0.001); //check if unit-quaternion
+        Quat_tpl<F> q = tq;
+        if ((p | q) < 0)
+        {
+            q = -q;
+        }
+        *this = p * exp(log(!p * q) * t);                     //algebraic slerp (1)
+        //...and some more exp-slerp-functions producing all the same result
+        //*this = exp( log (p* !q) * (1-t)) * q;    //algebraic slerp (2)
+        //*this = exp( log (q* !p) * t) * p;            //algebraic slerp (3)
+        //*this = q * exp( log (!q*p) * (1-t));     //algebraic slerp (4)
+    }
+    ILINE static Quat_tpl<F> CreateExpSlerp(const Quat_tpl<F>& p, const Quat_tpl<F>& q, F t)
+    {
+        Quat_tpl<F> d;
+        d.SetExpSlerp(p, q, t);
+        return d;
+    }
+
+
+    //! squad(p,a,b,q,t) = slerp( slerp(p,q,t),slerp(a,b,t), 2(1-t)t).
+    ILINE void SetSquad(const Quat_tpl<F>& p, const Quat_tpl<F>& a, const Quat_tpl<F>& b, const Quat_tpl<F>& q, F t)
+    {
+        SetSlerp(CreateSlerp(p, q, t), CreateSlerp(a, b, t), 2.0f * (1.0f - t) * t);
+    }
+
+    ILINE static Quat_tpl<F> CreateSquad(const Quat_tpl<F>& p, const Quat_tpl<F>& a, const Quat_tpl<F>& b, const Quat_tpl<F>& q, F t)
+    {
+        Quat_tpl<F> d;
+        d.SetSquad(p, a, b, q, t);
+        return d;
+    }
+
+
+    //useless, please delete
+    ILINE Quat_tpl<F> GetScaled(F scale) const
+    {
+        return CreateNlerp(IDENTITY, *this, scale);
+    }
+
+
+    AUTO_STRUCT_INFO
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Typedefs                                                                  //
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef MAX_API_NUM
+typedef Quat_tpl<f32>  Quat;  //always 32 bit
+typedef Quat_tpl<f64>  Quatd; //always 64 bit
+typedef Quat_tpl<real> Quatr; //variable float precision. depending on the target system it can be between 32, 64 or 80 bit
+#endif
+
+typedef Quat_tpl<f32>   CryQuat;
+typedef Quat_tpl<f32> quaternionf;
+typedef Quat_tpl<real>  quaternion;
+
+// alligned versions
+#ifndef MAX_API_NUM
+typedef DEFINE_ALIGNED_DATA (Quat, QuatA, 16);               // typedef __declspec(align(16)) Quat_tpl<f32>     CryQuatA;
+typedef DEFINE_ALIGNED_DATA (Quatd, QuatrA, 32); // typedef __declspec(align(16)) Quat_tpl<f32>     quaternionfA;
+#endif
+
+
+
+/*!
+*
+* The "inner product" or "dot product" operation.
+*
+* calculate the "inner product" between two Quaternion.
+* If both Quaternion are unit-quaternions, the result is the cosine: p*q=cos(angle)
+*
+* Example:
+*  Quat p(1,0,0,0),q(1,0,0,0);
+*  f32 cosine = ( p | q );
+*
+*/
+template<typename F1, typename F2>
+ILINE F1 operator | (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    assert(q.v.IsValid());
+    assert(p.v.IsValid());
+    return (q.v.x * p.v.x + q.v.y * p.v.y + q.v.z * p.v.z + q.w * p.w);
+}
+
+
+/*!
+*
+*  Implements the multiplication operator: Qua=QuatA*QuatB
+*
+*  AxB = operation B followed by operation A.
+*  A multiplication takes 16 muls and 12 adds.
+*
+*  Example 1:
+*   Quat p(1,0,0,0),q(1,0,0,0);
+*   Quat result=p*q;
+*
+*  Example 2: (self-multiplication)
+*   Quat p(1,0,0,0),q(1,0,0,0);
+*   Quat p*=q;
+*/
+template<class F1, class F2>
+Quat_tpl<F1> ILINE operator * (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    assert(q.IsValid());
+    assert(p.IsValid());
+    return Quat_tpl<F1>
+           (
+        q.w * p.w  - (q.v.x * p.v.x + q.v.y * p.v.y + q.v.z * p.v.z),
+        q.v.y * p.v.z - q.v.z * p.v.y + q.w * p.v.x + q.v.x * p.w,
+        q.v.z * p.v.x - q.v.x * p.v.z + q.w * p.v.y + q.v.y * p.w,
+        q.v.x * p.v.y - q.v.y * p.v.x + q.w * p.v.z + q.v.z * p.w
+           );
+}
+template<class F1, class F2>
+ILINE void operator *= (Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    assert(q.IsValid());
+    assert(p.IsValid());
+    F1 s0 = q.w;
+    q.w = q.w * p.w - (q.v | p.v);
+    q.v = p.v * s0 + q.v * p.w + (q.v % p.v);
+}
+
+/*!
+*  Implements the multiplication operator: QuatT=Quat*Quatpos
+*
+*  AxB = operation B followed by operation A.
+*  A multiplication takes 31 muls and 27 adds (=58 float operations).
+*
+*  Example:
+*   Quat    quat        =   Quat::CreateRotationX(1.94192f);;
+*   QuatT quatpos   =   QuatT::CreateRotationZ(3.14192f,Vec3(11,22,33));
+*     QuatT qp          =   quat*quatpos;
+*/
+template<class F1, class F2>
+ILINE QuatT_tpl<F1> operator * (const Quat_tpl<F1>& q, const QuatT_tpl<F2>& p)
+{
+    return QuatT_tpl<F1>(q * p.q, q * p.t);
+}
+
+
+
+/*!
+*  division operator
+*
+*  Example 1:
+*   Quat p(1,0,0,0),q(1,0,0,0);
+*   Quat result=p/q;
+*
+*  Example 2: (self-division)
+*   Quat p(1,0,0,0),q(1,0,0,0);
+*   Quat p/=q;
+*/
+template<class F1, class F2>
+ILINE Quat_tpl<F1> operator / (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    return (!p * q);
+}
+template<class F1, class F2>
+ILINE void operator /= (Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    q = (!p * q);
+}
+
+
+/*!
+*  addition operator
+*
+*  Example:
+*   Quat p(1,0,0,0),q(1,0,0,0);
+*   Quat result=p+q;
+*
+*  Example:(self-addition operator)
+*   Quat p(1,0,0,0),q(1,0,0,0);
+*   Quat p-=q;
+*/
+template<class F1, class F2>
+ILINE Quat_tpl<F1> operator + (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    return Quat_tpl<F1>(q.w + p.w, q.v + p.v);
+}
+template<class F1, class F2>
+ILINE void operator += (Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    q.w += p.w;
+    q.v += p.v;
+}
+
+
+
+/*!
+*  subtraction operator
+*
+*  Example:
+*   Quat p(1,0,0,0),q(1,0,0,0);
+*   Quat result=p-q;
+*
+*  Example: (self-subtraction operator)
+*   Quat p(1,0,0,0),q(1,0,0,0);
+*   Quat p-=q;
+*
+*/
+template<class F1, class F2>
+ILINE Quat_tpl<F1> operator - (const Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    return Quat_tpl<F1>(q.w - p.w, q.v - p.v);
+}
+template<class F1, class F2>
+ILINE void operator -= (Quat_tpl<F1>& q, const Quat_tpl<F2>& p)
+{
+    q.w -= p.w;
+    q.v -= p.v;
+}
+
+
+//! Scale quaternion free function.
+template <typename F>
+ILINE Quat_tpl<F> operator * (F t, const Quat_tpl<F>& q)
+{
+    return Quat_tpl<F>(t * q.w, t * q.v);
+};
+
+
+template <typename F1, typename F2>
+ILINE Quat_tpl<F1>   operator * (const Quat_tpl<F1>& q, F2 t)
+{
+    return Quat_tpl<F1>(q.w * t, q.v * t);
+};
+template <typename F1, typename F2>
+ILINE Quat_tpl<F1>   operator / (const Quat_tpl<F1>& q, F2 t)
+{
+    return Quat_tpl<F1>(q.w / t, q.v / t);
+};
+
+
+/*!
+*
+* post-multiply of a quaternion and a Vec3 (3D rotations with quaternions)
+*
+* Example:
+*  Quat q(1,0,0,0);
+*  Vec3 v(33,44,55);
+*    Vec3 result = q*v;
+*/
+template<class F, class F2>
+ILINE Vec3_tpl<F> operator * (const Quat_tpl<F>& q, const Vec3_tpl<F2>& v)
+{
+    assert(v.IsValid());
+    assert(q.IsValid());
+    //muls=15 / adds=15
+    Vec3_tpl<F> out, r2;
+    r2.x = (q.v.y * v.z - q.v.z * v.y) + q.w * v.x;
+    r2.y = (q.v.z * v.x - q.v.x * v.z) + q.w * v.y;
+    r2.z = (q.v.x * v.y - q.v.y * v.x) + q.w * v.z;
+    out.x = (r2.z * q.v.y - r2.y * q.v.z);
+    out.x += out.x + v.x;
+    out.y = (r2.x * q.v.z - r2.z * q.v.x);
+    out.y += out.y + v.y;
+    out.z = (r2.y * q.v.x - r2.x * q.v.y);
+    out.z += out.z + v.z;
+    return out;
+}
+
+
+/*!
+* pre-multiply of a quaternion and a Vec3 (3D rotations with quaternions)
+*
+* Example:
+*  Quat q(1,0,0,0);
+*  Vec3 v(33,44,55);
+*    Vec3 result = v*q;
+*/
+template<class F, class F2>
+ILINE Vec3_tpl<F2> operator * (const Vec3_tpl<F>& v, const Quat_tpl<F2>& q)
+{
+    assert(v.IsValid());
+    assert(q.IsValid());
+    //muls=15 / adds=15
+    Vec3_tpl<F> out, r2;
+    r2.x = (q.v.z * v.y - q.v.y * v.z) + q.w * v.x;
+    r2.y = (q.v.x * v.z - q.v.z * v.x) + q.w * v.y;
+    r2.z = (q.v.y * v.x - q.v.x * v.y) + q.w * v.z;
+    out.x = (r2.y * q.v.z - r2.z * q.v.y);
+    out.x += out.x + v.x;
+    out.y = (r2.z * q.v.x - r2.x * q.v.z);
+    out.y += out.y + v.y;
+    out.z = (r2.x * q.v.y - r2.y * q.v.x);
+    out.z += out.z + v.z;
+    return out;
+}
+
+
+
+template<class F1, class F2>
+ILINE Quat_tpl<F1> operator % (const Quat_tpl<F1>& q, const Quat_tpl<F2>& tp)
+{
+    Quat_tpl<F1> p = tp;
+    if ((p | q) < 0)
+    {
+        p = -p;
+    }
+    return Quat_tpl<F1>(q.w + p.w, q.v + p.v);
+}
+template<class F1, class F2>
+ILINE void operator %= (Quat_tpl<F1>& q, const Quat_tpl<F2>& tp)
+{
+    Quat_tpl<F1> p = tp;
+    if ((p | q) < 0)
+    {
+        p = -p;
+    }
+    q = Quat_tpl<F1>(q.w + p.w, q.v + p.v);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//----------------------------------------------------------------------
+// Quaternion with translation vector
+//----------------------------------------------------------------------
+template <typename F>
+struct QuatT_tpl
+{
+    Quat_tpl<F> q; //this is the quaternion
+    Vec3_tpl<F> t; //this is the translation vector and a scalar (for uniform scaling?)
+
+    ILINE QuatT_tpl(){}
+
+    //initialize with zeros
+    ILINE QuatT_tpl(type_zero)
+    {
+        q.w = 0, q.v.x = 0, q.v.y = 0, q.v.z = 0, t.x = 0, t.y = 0, t.z = 0;
+    }
+    ILINE QuatT_tpl(type_identity)
+    {
+        q.w = 1, q.v.x = 0, q.v.y = 0, q.v.z = 0, t.x = 0, t.y = 0, t.z = 0;
+    }
+
+    ILINE QuatT_tpl(const Vec3_tpl<F>& _t, const Quat_tpl<F>& _q) { q = _q; t = _t; }
+
+    //CONSTRUCTOR: implement the copy/casting/assignment constructor:
+    template <typename F1>
+    ILINE QuatT_tpl(const QuatT_tpl<F1>& qt)
+        : q(qt.q)
+        , t(qt.t) {}
+
+    //convert unit DualQuat back to QuatT
+    ILINE QuatT_tpl(const DualQuat_tpl<F>& qd)
+    {
+        //copy quaternion part
+        q = qd.nq;
+        //convert translation vector:
+        t = (qd.nq.w * qd.dq.v - qd.dq.w * qd.nq.v + qd.nq.v % qd.dq.v) * 2; //perfect for HLSL
+    }
+
+    explicit ILINE QuatT_tpl(const QuatTS_tpl<F>& qts)
+        : q(qts.q)
+        , t(qts.t) {}
+
+    explicit ILINE QuatT_tpl(const Matrix34_tpl<F>& m)
+    {
+        q = Quat_tpl<F>(Matrix33(m));
+        t = m.GetTranslation();
+    }
+
+    ILINE QuatT_tpl(const Quat_tpl<F>& quat, const Vec3_tpl<F>& trans)
+    {
+        q = quat;
+        t = trans;
+    }
+
+    ILINE void SetIdentity()
+    {
+        q.w = 1;
+        q.v.x = 0;
+        q.v.y = 0;
+        q.v.z = 0;
+        t.x = 0;
+        t.y = 0;
+        t.z = 0;
+    }
+
+    ILINE bool IsIdentity() const
+    {
+        return (q.IsIdentity() && t.IsZero());
+    }
+
+    /*!
+    * Convert three Euler angle to mat33 (rotation order:XYZ)
+    * The Euler angles are assumed to be in radians.
+    * The translation-vector is set to zero by default.
+    *
+    *  Example 1:
+    *       QuatT qp;
+    *       qp.SetRotationXYZ( Ang3(0.5f,0.2f,0.9f), translation );
+    *
+    *  Example 2:
+    *       QuatT qp=QuatT::CreateRotationXYZ( Ang3(0.5f,0.2f,0.9f), translation );
+    */
+    ILINE void SetRotationXYZ(const Ang3_tpl<F>& rad, const Vec3_tpl<F>& trans = Vec3(ZERO))
+    {
+        assert(rad.IsValid());
+        assert(trans.IsValid());
+        q.SetRotationXYZ(rad);
+        t = trans;
+    }
+    ILINE static QuatT_tpl<F> CreateRotationXYZ(const Ang3_tpl<F>& rad, const Vec3_tpl<F>& trans = Vec3(ZERO))
+    {
+        assert(rad.IsValid());
+        assert(trans.IsValid());
+        QuatT_tpl<F> qp;
+        qp.SetRotationXYZ(rad, trans);
+        return qp;
+    }
+
+
+
+    ILINE void SetRotationAA(F cosha, F sinha, const Vec3_tpl<F> axis, const Vec3_tpl<F>& trans = Vec3(ZERO))
+    {
+        q.SetRotationAA(cosha, sinha, axis);
+        t = trans;
+    }
+    ILINE static QuatT_tpl<F> CreateRotationAA(F cosha, F sinha, const Vec3_tpl<F> axis, const Vec3_tpl<F>& trans = Vec3(ZERO))
+    {
+        QuatT_tpl<F> qt;
+        qt.SetRotationAA(cosha, sinha, axis, trans);
+        return qt;
+    }
+
+
+    ILINE void Invert()
+    { // in-place transposition
+        assert(q.IsValid());
+        t = -t * q;
+        q = !q;
+    }
+    ILINE QuatT_tpl<F> GetInverted() const
+    {
+        assert(q.IsValid());
+        QuatT_tpl<F> qpos;
+        qpos.q = !q;
+        qpos.t = -t * q;
+        return qpos;
+    }
+
+    ILINE void SetTranslation(const Vec3_tpl<F>& trans)   {   t = trans;    }
+
+    ILINE Vec3_tpl<F> GetColumn0() const {return q.GetColumn0(); }
+    ILINE Vec3_tpl<F> GetColumn1() const {return q.GetColumn1(); }
+    ILINE Vec3_tpl<F> GetColumn2() const {return q.GetColumn2(); }
+    ILINE Vec3_tpl<F> GetColumn3() const {return t; }
+    ILINE Vec3_tpl<F> GetRow0() const { return q.GetRow0(); }
+    ILINE Vec3_tpl<F> GetRow1() const { return q.GetRow1(); }
+    ILINE Vec3_tpl<F> GetRow2() const { return q.GetRow2(); }
+
+    ILINE static bool IsEquivalent(const QuatT_tpl<F>& qt1, const QuatT_tpl<F>& qt2, F qe = RAD_EPSILON, F ve = VEC_EPSILON)
+    {
+        real rad = acos(min(1.0f, fabs_tpl(qt1.q | qt2.q)));
+        bool qdif = rad <= qe;
+        bool vdif   = fabs_tpl(qt1.t.x - qt2.t.x) <= ve && fabs_tpl(qt1.t.y - qt2.t.y) <= ve && fabs_tpl(qt1.t.z - qt2.t.z) <= ve;
+        return (qdif && vdif);
+    }
+
+    ILINE bool IsValid() const
+    {
+        if (!t.IsValid())
+        {
+            return false;
+        }
+        if (!q.IsValid())
+        {
+            return false;
+        }
+        return true;
+    }
+
+    /*!
+    * linear-interpolation between quaternions (lerp)
+    *
+    * Example:
+    *  CQuaternion result,p,q;
+    *  result=qlerp( p, q, 0.5f );
+    */
+    ILINE void SetNLerp(const QuatT_tpl<F>& p, const QuatT_tpl<F>& tq, F ti)
+    {
+        assert(p.q.IsValid());
+        assert(tq.q.IsValid());
+        Quat_tpl<F> d = tq.q;
+        if ((p.q | d) < 0)
+        {
+            d = -d;
+        }
+        Vec3_tpl<F> vDiff = d.v - p.q.v;
+        q.v = p.q.v + (vDiff * ti);
+        q.w = p.q.w + ((d.w - p.q.w) * ti);
+        q.Normalize();
+        vDiff = tq.t - p.t;
+        t = p.t + (vDiff * ti);
+    }
+    ILINE static QuatT_tpl<F> CreateNLerp(const QuatT_tpl<F>& p, const QuatT_tpl<F>& q, F t)
+    {
+        QuatT_tpl<F> d;
+        d.SetNLerp(p, q, t);
+        return d;
+    }
+
+    //NOTE: all vectors are stored in columns
+    ILINE void SetFromVectors(const Vec3& vx, const Vec3& vy, const Vec3& vz, const Vec3& pos)
+    {
+        Matrix34 m34;
+        m34.m00 = vx.x;
+        m34.m01 = vy.x;
+        m34.m02 = vz.x;
+        m34.m03 = pos.x;
+        m34.m10 = vx.y;
+        m34.m11 = vy.y;
+        m34.m12 = vz.y;
+        m34.m13 = pos.y;
+        m34.m20 = vx.z;
+        m34.m21 = vy.z;
+        m34.m22 = vz.z;
+        m34.m23 = pos.z;
+        *this = QuatT_tpl<F>(m34);
+    }
+    ILINE static QuatT_tpl<F> CreateFromVectors(const Vec3_tpl<F>& vx, const Vec3_tpl<F>& vy, const Vec3_tpl<F>& vz, const Vec3_tpl<F>& pos)
+    {
+        QuatT_tpl<F> qt;
+        qt.SetFromVectors(vx, vy, vz, pos);
+        return qt;
+    }
+
+    QuatT_tpl<F> GetScaled(F scale)
+    {
+        return QuatT_tpl<F>(t * scale, q.GetScaled(scale));
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+typedef QuatT_tpl<f32>  QuatT; //always 32 bit
+typedef QuatT_tpl<f64>  QuatTd;//always 64 bit
+typedef QuatT_tpl<real> QuatTr;//variable float precision. depending on the target system it can be between 32, 64 or bit
+
+// alligned versions
+typedef DEFINE_ALIGNED_DATA (QuatT, QuatTA, 32);                 //wastest 4byte per quatT // typedef __declspec(align(16)) Quat_tpl<f32>       QuatTA;
+typedef DEFINE_ALIGNED_DATA (QuatTd, QuatTrA, 16);           // typedef __declspec(align(16)) Quat_tpl<f32>     QuatTrA;
+
+
+/*!
+*
+*  Implements the multiplication operator: QuatT=Quatpos*Quat
+*
+*  AxB = operation B followed by operation A.
+*  A multiplication takes 16 muls and 12 adds (=28 float operations).
+*
+*  Example:
+*   Quat    quat        =   Quat::CreateRotationX(1.94192f);;
+*   QuatT quatpos   =   QuatT::CreateRotationZ(3.14192f,Vec3(11,22,33));
+*     QuatT qp          =   quatpos*quat;
+*/
+template<class F1, class F2>
+ILINE QuatT_tpl<F1> operator * (const QuatT_tpl<F1>& p, const Quat_tpl<F2>& q)
+{
+    assert(p.IsValid());
+    assert(q.IsValid());
+    return QuatT_tpl<F1>(p.q * q, p.t);
+}
+
+/*!
+*  Implements the multiplication operator: QuatT=QuatposA*QuatposB
+*
+*  AxB = operation B followed by operation A.
+*  A multiplication takes 31 muls and 30 adds  (=61 float operations).
+*
+*  Example:
+*   QuatT quatposA  =   QuatT::CreateRotationX(1.94192f,Vec3(77,55,44));
+*   QuatT quatposB  =   QuatT::CreateRotationZ(3.14192f,Vec3(11,22,33));
+*     QuatT qp              =   quatposA*quatposB;
+*/
+template<class F1, class F2>
+ILINE QuatT_tpl<F1> operator * (const QuatT_tpl<F1>& q, const QuatT_tpl<F2>& p)
+{
+    assert(q.IsValid());
+    assert(p.IsValid());
+    return QuatT_tpl<F1>(q.q * p.q, q.q * p.t + q.t);
+}
+
+
+
+/*!
+* post-multiply of a QuatT and a Vec3 (3D rotations with quaternions)
+*
+* Example:
+*  Quat q(1,0,0,0);
+*  Vec3 v(33,44,55);
+*    Vec3 result = q*v;
+*/
+template<class F, class F2>
+Vec3_tpl<F> operator * (const QuatT_tpl<F>& q, const Vec3_tpl<F2>& v)
+{
+    assert(v.IsValid());
+    assert(q.IsValid());
+    //muls=15 / adds=15+3
+    Vec3_tpl<F> out, r2;
+    r2.x = (q.q.v.y * v.z - q.q.v.z * v.y) + q.q.w * v.x;
+    r2.y = (q.q.v.z * v.x - q.q.v.x * v.z) + q.q.w * v.y;
+    r2.z = (q.q.v.x * v.y - q.q.v.y * v.x) + q.q.w * v.z;
+    out.x = (r2.z * q.q.v.y - r2.y * q.q.v.z);
+    out.x += out.x + v.x + q.t.x;
+    out.y = (r2.x * q.q.v.z - r2.z * q.q.v.x);
+    out.y += out.y + v.y + q.t.y;
+    out.z = (r2.y * q.q.v.x - r2.x * q.q.v.y);
+    out.z += out.z + v.z + q.t.z;
+    return out;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//----------------------------------------------------------------------
+// Quaternion with translation vector and scale
+// Similar to QuatT, but s is not ignored.
+// Most functions then differ, so we don't inherit.
+//----------------------------------------------------------------------
+template <typename F>
+struct QuatTS_tpl
+{
+    Quat_tpl<F> q;
+    Vec3_tpl<F> t;
+    F                       s;
+
+    //constructors
+#if defined(_DEBUG)
+    ILINE QuatTS_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&q.v.x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+            p[3] = F32NAN;
+            p[4] = F32NAN;
+            p[5] = F32NAN;
+            p[6] = F32NAN;
+            p[7] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&q.v.x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+            p[3] = F64NAN;
+            p[4] = F64NAN;
+            p[5] = F64NAN;
+            p[6] = F64NAN;
+            p[7] = F64NAN;
+        }
+    }
+#else
+    ILINE QuatTS_tpl(){}
+#endif
+
+    ILINE QuatTS_tpl(const Quat_tpl<F>& quat, const Vec3_tpl<F>& trans, F scale = 1)    { q = quat; t = trans; s = scale; }
+    ILINE QuatTS_tpl(type_identity) { SetIdentity(); }
+
+    //CONSTRUCTOR: implement the copy/casting/assignment constructor:
+    template <typename F1>
+    ILINE QuatTS_tpl(const QuatTS_tpl<F1>& qts)
+        :  q(qts.q)
+        , t(qts.t)
+        , s(qts.s)    {}
+
+    ILINE QuatTS_tpl& operator = (const QuatT_tpl<F>& qt)
+    {
+        q = qt.q;
+        t = qt.t;
+        s = 1.0f;
+        return *this;
+    }
+    ILINE QuatTS_tpl(const QuatT_tpl<F>& qp)  { q = qp.q; t = qp.t; s = 1.0f; }
+
+
+    ILINE void SetIdentity()
+    {
+        q.SetIdentity();
+        t = Vec3(ZERO);
+        s = 1;
+    }
+
+    explicit ILINE QuatTS_tpl(const Matrix34_tpl<F>& m)
+    {
+        t = m.GetTranslation();
+
+        // The determinant of a matrix is the volume spanned by its base vectors.
+        // We need an approximate length scale, so we calculate the cube root of the determinant.
+        s = pow(m.Determinant(), F(1.0 / 3.0));
+
+        // Orthonormalize using X and Z as anchors.
+        const Vec3_tpl<F>& r0 = m.GetRow(0);
+        const Vec3_tpl<F>& r2 = m.GetRow(2);
+
+        const Vec3_tpl<F> v0 = r0.GetNormalized();
+        const Vec3_tpl<F> v1 = (r2 % r0).GetNormalized();
+        const Vec3_tpl<F> v2 = (v0 % v1);
+
+        Matrix33_tpl<F> m3;
+        m3.SetRow(0, v0);
+        m3.SetRow(1, v1);
+        m3.SetRow(2, v2);
+
+        q = Quat_tpl<F>(m3);
+    }
+
+    void Invert()
+    {
+        s = 1 / s;
+        q = !q;
+        t = q * t * -s;
+    }
+    QuatTS_tpl<F> GetInverted() const
+    {
+        QuatTS_tpl<F> inv;
+        inv.s = 1 / s;
+        inv.q = !q;
+        inv.t = inv.q * t * -inv.s;
+        return inv;
+    }
+
+
+    /*!
+    * linear-interpolation between quaternions (nlerp)
+    *
+    * Example:
+    *  CQuaternion result,p,q;
+    *  result=qlerp( p, q, 0.5f );
+    */
+    ILINE void SetNLerp(const QuatTS_tpl<F>& p, const QuatTS_tpl<F>& tq, F ti)
+    {
+        assert(p.q.IsValid());
+        assert(tq.q.IsValid());
+        Quat_tpl<F> d = tq.q;
+        if ((p.q | d) < 0)
+        {
+            d = -d;
+        }
+        Vec3_tpl<F> vDiff = d.v - p.q.v;
+        q.v = p.q.v + (vDiff * ti);
+        q.w = p.q.w + ((d.w - p.q.w) * ti);
+        q.Normalize();
+
+        vDiff = tq.t - p.t;
+        t = p.t + (vDiff * ti);
+
+        s     = p.s + ((tq.s - p.s) * ti);
+    }
+
+    ILINE static QuatTS_tpl<F> CreateNLerp(const QuatTS_tpl<F>& p, const QuatTS_tpl<F>& q, F t)
+    {
+        QuatTS_tpl<F> d;
+        d.SetNLerp(p, q, t);
+        return d;
+    }
+
+
+
+    ILINE static bool IsEquivalent(const QuatTS_tpl<F>& qts1, const QuatTS_tpl<F>& qts2, F qe = RAD_EPSILON, F ve = VEC_EPSILON)
+    {
+        f64 rad  =  acos(min(1.0f, fabs_tpl(qts1.q | qts2.q)));
+        bool qdif = rad <= qe;
+        bool vdif   = fabs_tpl(qts1.t.x - qts2.t.x) <= ve && fabs_tpl(qts1.t.y - qts2.t.y) <= ve && fabs_tpl(qts1.t.z - qts2.t.z) <= ve;
+        bool sdif   = fabs_tpl(qts1.s - qts2.s) <= ve;
+        return (qdif && vdif && sdif);
+    }
+
+
+    bool IsValid(F e = VEC_EPSILON) const
+    {
+        if (!q.v.IsValid())
+        {
+            return false;
+        }
+        if (!NumberValid(q.w))
+        {
+            return false;
+        }
+        if (!q.IsUnit(e))
+        {
+            return false;
+        }
+        if (!t.IsValid())
+        {
+            return false;
+        }
+        if (!NumberValid(s))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    ILINE Vec3_tpl<F> GetColumn0() const {return q.GetColumn0(); }
+    ILINE Vec3_tpl<F> GetColumn1() const {return q.GetColumn1(); }
+    ILINE Vec3_tpl<F> GetColumn2() const {return q.GetColumn2(); }
+    ILINE Vec3_tpl<F> GetColumn3() const {return t; }
+    ILINE Vec3_tpl<F> GetRow0() const { return q.GetRow0(); }
+    ILINE Vec3_tpl<F> GetRow1() const { return q.GetRow1(); }
+    ILINE Vec3_tpl<F> GetRow2() const { return q.GetRow2(); }
+
+    AUTO_STRUCT_INFO
+};
+
+typedef QuatTS_tpl<f32>  QuatTS; //always 64 bit
+typedef QuatTS_tpl<f64>  QuatTSd;//always 64 bit
+typedef QuatTS_tpl<real> QuatTSr;//variable float precision. depending on the target system it can be between 32, 64 or 80 bit
+
+// alligned versions
+typedef DEFINE_ALIGNED_DATA (QuatTS, QuatTSA, 16);               // typedef __declspec(align(16)) Quat_tpl<f32>     QuatTSA;
+typedef DEFINE_ALIGNED_DATA (QuatTSd, QuatTSrA, 64);             // typedef __declspec(align(16)) QuatTS_tpl<f32>       QuatTSrA;
+
+template<class F1, class F2>
+ILINE QuatTS_tpl<F1> operator * (const QuatTS_tpl<F1>& a, const Quat_tpl<F2>& b)
+{
+    return QuatTS_tpl<F1>(a.q * b, a.t, a.s);
+}
+
+
+template<class F1, class F2>
+ILINE QuatTS_tpl<F1> operator * (const QuatTS_tpl<F1>& a, const QuatT_tpl<F2>& b)
+{
+    return QuatTS_tpl<F1>(a.q * b.q, a.q * (b.t * a.s) + a.t, a.s);
+}
+template<class F1, class F2>
+ILINE QuatTS_tpl<F1> operator * (const QuatT_tpl<F1>& a, const QuatTS_tpl<F2>& b)
+{
+    return QuatTS_tpl<F1>(a.q * b.q, a.q * b.t + a.t, b.s);
+}
+template<class F1, class F2>
+ILINE QuatTS_tpl<F1> operator * (const Quat_tpl<F1>& a, const QuatTS_tpl<F2>& b)
+{
+    return QuatTS_tpl<F1>(a * b.q, a * b.t, b.s);
+}
+
+/*!
+*  Implements the multiplication operator: QuatTS=QuatTS*QuatTS
+*/
+template<class F1, class F2>
+ILINE QuatTS_tpl<F1> operator * (const QuatTS_tpl<F1>& a, const QuatTS_tpl<F2>& b)
+{
+    assert(a.IsValid());
+    assert(b.IsValid());
+    return QuatTS_tpl<F1>(a.q * b.q, a.q * (b.t * a.s) + a.t, a.s * b.s);
+}
+
+/*!
+* post-multiply of a QuatT and a Vec3 (3D rotations with quaternions)
+*/
+template<class F, class F2>
+ILINE Vec3_tpl<F> operator * (const QuatTS_tpl<F>& q, const Vec3_tpl<F2>& v)
+{
+    assert(q.IsValid());
+    assert(v.IsValid());
+    return q.q * v * q.s + q.t;
+}
+
+
+//----------------------------------------------------------------------
+// Quaternion with translation vector and non-uniform scale
+//----------------------------------------------------------------------
+template <typename F>
+struct QuatTNS_tpl
+{
+    Quat_tpl<F> q;
+    Vec3_tpl<F> t;
+    Vec3_tpl<F> s;
+
+    //constructors
+#if defined(_DEBUG)
+    ILINE QuatTNS_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&q.v.x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+            p[3] = F32NAN;
+            p[4] = F32NAN;
+            p[5] = F32NAN;
+            p[6] = F32NAN;
+            p[7] = F32NAN;
+            p[8] = F32NAN;
+            p[9] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&q.v.x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+            p[3] = F64NAN;
+            p[4] = F64NAN;
+            p[5] = F64NAN;
+            p[6] = F64NAN;
+            p[7] = F64NAN;
+            p[8] = F64NAN;
+            p[9] = F64NAN;
+        }
+    }
+#else
+    ILINE QuatTNS_tpl() {};
+#endif
+
+    ILINE QuatTNS_tpl(const Quat_tpl<F>& quat, const Vec3_tpl<F>& trans, const Vec3_tpl<F>& scale = Vec3_tpl<F>(1)) { q = quat; t = trans; s = scale; }
+    ILINE QuatTNS_tpl(type_identity) { SetIdentity(); }
+
+    //CONSTRUCTOR: implement the copy/casting/assignment constructor:
+    template <typename F1>
+    ILINE QuatTNS_tpl(const QuatTS_tpl<F1>& qts)
+        :     q(qts.q)
+        , t(qts.t)
+        , s(qts.s)
+    {
+    }
+
+    ILINE QuatTNS_tpl& operator = (const QuatT_tpl<F>& qt)
+    {
+        q = qt.q;
+        t = qt.t;
+        s = Vec3_tpl<F>(1);
+        return *this;
+    }
+    ILINE QuatTNS_tpl(const QuatT_tpl<F>& qp) { q = qp.q; t = qp.t; s = Vec3_tpl<F>(1); }
+
+
+    ILINE void SetIdentity()
+    {
+        q.SetIdentity();
+        t = Vec3_tpl<F>(ZERO);
+        s = Vec3_tpl<F>(1);
+    }
+
+    explicit ILINE QuatTNS_tpl(const Matrix34_tpl<F>& m)
+    {
+        t = m.GetTranslation();
+
+        // Lengths of base vectors equates to scaling in matrix
+        s.x = m.GetColumn0().GetLength();
+        s.y = m.GetColumn1().GetLength();
+        s.z = m.GetColumn2().GetLength();
+
+        // Orthonormalize using X and Z as anchors.
+        const Vec3_tpl<F>& r0 = m.GetRow(0);
+        const Vec3_tpl<F>& r2 = m.GetRow(2);
+
+        const Vec3_tpl<F> v0 = r0.GetNormalized();
+        const Vec3_tpl<F> v1 = (r2 % r0).GetNormalized();
+        const Vec3_tpl<F> v2 = (v0 % v1);
+
+        Matrix33_tpl<F> m3;
+        m3.SetRow(0, v0);
+        m3.SetRow(1, v1);
+        m3.SetRow(2, v2);
+
+        q = Quat_tpl<F>(m3);
+    }
+
+    void Invert()
+    {
+        s = Vec3_tpl<F>(1) / s;
+        q = !q;
+        t = q * t * -s;
+    }
+    QuatTNS_tpl<F> GetInverted() const
+    {
+        QuatTNS_tpl<F> inv;
+        inv.s = Vec3_tpl<F>(1) / s;
+        inv.q = !q;
+        inv.t = inv.q * t * -inv.s;
+        return inv;
+    }
+
+
+    /*!
+    * linear-interpolation between quaternions (nlerp)
+    *
+    * Example:
+    *  CQuaternion result,p,q;
+    *  result=qlerp( p, q, 0.5f );
+    */
+    ILINE void SetNLerp(const QuatTNS_tpl<F>& p, const QuatTNS_tpl<F>& tq, F ti)
+    {
+        assert(p.q.IsValid());
+        assert(tq.q.IsValid());
+        Quat_tpl<F> d = tq.q;
+        if ((p.q | d) < 0)
+        {
+            d = -d;
+        }
+        Vec3_tpl<F> vDiff = d.v - p.q.v;
+        q.v = p.q.v + (vDiff * ti);
+        q.w = p.q.w + ((d.w - p.q.w) * ti);
+        q.Normalize();
+
+        vDiff = tq.t - p.t;
+        t = p.t + (vDiff * ti);
+
+        s     = p.s + ((tq.s - p.s) * ti);
+    }
+
+    ILINE static QuatTNS_tpl<F> CreateNLerp(const QuatTNS_tpl<F>& p, const QuatTNS_tpl<F>& q, F t)
+    {
+        QuatTNS_tpl<F> d;
+        d.SetNLerp(p, q, t);
+        return d;
+    }
+
+
+
+    ILINE static bool IsEquivalent(const QuatTNS_tpl<F>& qts1, const QuatTNS_tpl<F>& qts2, F qe = RAD_EPSILON, F ve = VEC_EPSILON)
+    {
+        real rad  = acos(min(1.0f, fabs_tpl(qts1.q | qts2.q)));
+        bool qdif = rad <= qe;
+        bool vdif   = fabs_tpl(qts1.t.x - qts2.t.x) <= ve && fabs_tpl(qts1.t.y - qts2.t.y) <= ve && fabs_tpl(qts1.t.z - qts2.t.z) <= ve;
+        bool sdif   = fabs_tpl(qts1.s.x - qts2.s.x) <= ve && fabs_tpl(qts1.s.y - qts2.s.y) <= ve && fabs_tpl(qts1.s.z - qts2.s.z) <= ve;
+        return (qdif && vdif && sdif);
+    }
+
+
+    bool IsValid(F e = VEC_EPSILON) const
+    {
+        if (!q.v.IsValid())
+        {
+            return false;
+        }
+        if (!NumberValid(q.w))
+        {
+            return false;
+        }
+        if (!q.IsUnit(e))
+        {
+            return false;
+        }
+        if (!t.IsValid())
+        {
+            return false;
+        }
+        if (!NumberValid(s.x))
+        {
+            return false;
+        }
+        if (!NumberValid(s.y))
+        {
+            return false;
+        }
+        if (!NumberValid(s.z))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    ILINE Vec3_tpl<F> GetColumn0() const {return q.GetColumn0(); }
+    ILINE Vec3_tpl<F> GetColumn1() const {return q.GetColumn1(); }
+    ILINE Vec3_tpl<F> GetColumn2() const {return q.GetColumn2(); }
+    ILINE Vec3_tpl<F> GetColumn3() const {return t; }
+    ILINE Vec3_tpl<F> GetRow0() const { return q.GetRow0(); }
+    ILINE Vec3_tpl<F> GetRow1() const { return q.GetRow1(); }
+    ILINE Vec3_tpl<F> GetRow2() const { return q.GetRow2(); }
+
+    AUTO_STRUCT_INFO
+};
+
+typedef QuatTNS_tpl<f32> QuatTNS;
+typedef QuatTNS_tpl<f64> QuatTNSr;
+typedef QuatTNS_tpl<f64> QuatTNS_f64;
+
+// alligned versions
+typedef DEFINE_ALIGNED_DATA (QuatTNS, QuatTNSA, 16);
+typedef DEFINE_ALIGNED_DATA (QuatTNSr, QuatTNSrA, 64);
+typedef DEFINE_ALIGNED_DATA (QuatTNS_f64, QuatTNS_f64A, 64);
+
+template<class F1, class F2>
+ILINE QuatTNS_tpl<F1> operator * (const QuatTNS_tpl<F1>& a, const Quat_tpl<F2>& b)
+{
+    return QuatTNS_tpl<F1>(a.q * b, a.t, a.s);
+}
+
+template<class F1, class F2>
+ILINE QuatTNS_tpl<F1> operator * (const Quat_tpl<F1>& a, const QuatTNS_tpl<F2>& b)
+{
+    return QuatTNS_tpl<F1>(a * b.q, a * b.t, b.s);
+}
+
+template<class F1, class F2>
+ILINE QuatTNS_tpl<F1> operator * (const QuatTNS_tpl<F1>& a, const QuatT_tpl<F2>& b)
+{
+    return QuatTNS_tpl<F1>(a.q * b.q, a.q * Vec3_tpl<F1>(b.x * a.s.x, b.y * a.s.y, b.z * a.s.z) + a.t, a.s);
+}
+
+template<class F1, class F2>
+ILINE QuatTNS_tpl<F1> operator * (const QuatT_tpl<F1>& a, const QuatTNS_tpl<F2>& b)
+{
+    return QuatTNS_tpl<F1>(a.q * b.q, a.q * b.t + a.t, b.s);
+}
+
+/*!
+*  Implements the multiplication operator: QuatTNS=QuatTNS*QuatTNS
+*/
+template<class F1, class F2>
+ILINE QuatTNS_tpl<F1> operator * (const QuatTNS_tpl<F1>& a, const QuatTNS_tpl<F2>& b)
+{
+    assert(a.IsValid());
+    assert(b.IsValid());
+    return QuatTNS_tpl<F1>(
+        a.q * b.q,
+        a.q * Vec3_tpl<F1>(b.t.x * a.s.x, b.t.y * a.s.y, b.t.z * a.s.z) + a.t,
+        Vec3_tpl<F1>(a.s.x * b.s.x, a.s.y * b.s.y, a.s.z * b.s.z)
+        );
+}
+
+/*!
+* post-multiply of a QuatTNS and a Vec3 (3D rotations with quaternions)
+*/
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator * (const QuatTNS_tpl<F1>& q, const Vec3_tpl<F2>& v)
+{
+    assert(q.IsValid());
+    assert(v.IsValid());
+    return q.q * Vec3_tpl<F1>(v.x * q.s.x, v.y * q.s.y, v.z * q.s.z) + q.t;
+}
+
+//----------------------------------------------------------------------
+// Dual Quaternion
+//----------------------------------------------------------------------
+template <typename F>
+struct DualQuat_tpl
+{
+    Quat_tpl<F> nq;
+    Quat_tpl<F> dq;
+
+    ILINE DualQuat_tpl()  {}
+
+    ILINE DualQuat_tpl(const Quat_tpl<F>& q, const Vec3_tpl<F>& t)
+    {
+        //copy the quaternion part
+        nq = q;
+        //convert the translation into a dual quaternion part
+        dq.w        = -0.5f * (t.x * q.v.x  + t.y * q.v.y + t.z * q.v.z);
+        dq.v.x  = 0.5f * (t.x * q.w        + t.y * q.v.z - t.z * q.v.y);
+        dq.v.y  = 0.5f * (-t.x * q.v.z  + t.y * q.w       + t.z * q.v.x);
+        dq.v.z  = 0.5f * (t.x * q.v.y  - t.y * q.v.x + t.z * q.w);
+    }
+
+    ILINE DualQuat_tpl(const QuatT_tpl<F>& qt)
+    {
+        //copy the quaternion part
+        nq = qt.q;
+        //convert the translation into a dual quaternion part
+        dq.w        = -0.5f * (qt.t.x * qt.q.v.x    + qt.t.y * qt.q.v.y   + qt.t.z * qt.q.v.z);
+        dq.v.x  = 0.5f * (qt.t.x * qt.q.w      - qt.t.z * qt.q.v.y + qt.t.y * qt.q.v.z);
+        dq.v.y  = 0.5f * (qt.t.y * qt.q.w      - qt.t.x * qt.q.v.z   + qt.t.z * qt.q.v.x);
+        dq.v.z  = 0.5f * (qt.t.x * qt.q.v.y    - qt.t.y * qt.q.v.x   + qt.t.z * qt.q.w);
+    }
+
+    explicit ILINE DualQuat_tpl( const Matrix34_tpl<F>& m34 )
+    {
+        // non-dual part (just copy q0):
+        nq = Quat_tpl<F>(m34);
+        f32 tx = m34.m03;
+        f32 ty = m34.m13;
+        f32 tz = m34.m23;
+
+        // dual part:
+        dq.w        = -0.5f * (tx * nq.v.x  + ty * nq.v.y + tz * nq.v.z);
+        dq.v.x  = 0.5f * (tx * nq.w        + ty * nq.v.z - tz * nq.v.y);
+        dq.v.y  = 0.5f * (-tx * nq.v.z  + ty * nq.w       + tz * nq.v.x);
+        dq.v.z  = 0.5f * (tx * nq.v.y  - ty * nq.v.x + tz * nq.w);
+    }
+
+
+    ILINE DualQuat_tpl(type_identity)
+    {
+        SetIdentity();
+    }
+
+    ILINE DualQuat_tpl(type_zero)
+    {
+        SetZero();
+    }
+
+    template <typename F1>
+    ILINE DualQuat_tpl(const DualQuat_tpl<F1>& QDual)
+        : nq(QDual.nq)
+        , dq(QDual.dq) {}
+
+    ILINE void SetIdentity()
+    {
+        nq.SetIdentity();
+        dq.w = 0.0f;
+        dq.v.x = 0.0f;
+        dq.v.y = 0.0f;
+        dq.v.z = 0.0f;
+    }
+
+    ILINE void SetZero()
+    {
+        nq.w = 0.0f;
+        nq.v.x = 0.0f;
+        nq.v.y = 0.0f;
+        nq.v.z = 0.0f;
+        dq.w = 0.0f;
+        dq.v.x = 0.0f;
+        dq.v.y = 0.0f;
+        dq.v.z = 0.0f;
+    }
+
+    ILINE void Normalize()
+    {
+        // Normalize both components so that nq is unit
+        F norm = isqrt_safe_tpl(nq.v.len2() + sqr(nq.w));
+        nq *= norm;
+        dq *= norm;
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+#ifndef MAX_API_NUM
+typedef DualQuat_tpl<f32>  DualQuat; //always 32 bit
+typedef DualQuat_tpl<f64>  DualQuatd;//always 64 bit
+typedef DualQuat_tpl<real> DualQuatr;//variable float precision. depending on the target system it can be between 32, 64 or 80 bit
+#else
+typedef DualQuat_tpl<f32> CryDualQuat;
+#endif
+
+template<class F1, class F2>
+ILINE DualQuat_tpl<F1> operator*(const DualQuat_tpl<F1>& l, const F2 r)
+{
+    DualQuat_tpl<F1> dual;
+    dual.nq.w  = l.nq.w  * r;
+    dual.nq.v.x = l.nq.v.x * r;
+    dual.nq.v.y = l.nq.v.y * r;
+    dual.nq.v.z = l.nq.v.z * r;
+
+    dual.dq.w  = l.dq.w  * r;
+    dual.dq.v.x = l.dq.v.x * r;
+    dual.dq.v.y = l.dq.v.y * r;
+    dual.dq.v.z = l.dq.v.z * r;
+    return dual;
+}
+
+template<class F1, class F2>
+ILINE DualQuat_tpl<F1> operator+(const DualQuat_tpl<F1>& l, const DualQuat_tpl<F2>& r)
+{
+    DualQuat_tpl<F1> dual;
+    dual.nq.w  = l.nq.w  + r.nq.w;
+    dual.nq.v.x = l.nq.v.x + r.nq.v.x;
+    dual.nq.v.y = l.nq.v.y + r.nq.v.y;
+    dual.nq.v.z = l.nq.v.z + r.nq.v.z;
+
+    dual.dq.w  = l.dq.w  + r.dq.w;
+    dual.dq.v.x = l.dq.v.x + r.dq.v.x;
+    dual.dq.v.y = l.dq.v.y + r.dq.v.y;
+    dual.dq.v.z = l.dq.v.z + r.dq.v.z;
+    return dual;
+}
+
+template<class F1, class F2>
+ILINE void operator += (DualQuat_tpl<F1>& l, const DualQuat_tpl<F2>& r)
+{
+    l.nq.w  += r.nq.w;
+    l.nq.v.x += r.nq.v.x;
+    l.nq.v.y += r.nq.v.y;
+    l.nq.v.z += r.nq.v.z;
+
+    l.dq.w  += r.dq.w;
+    l.dq.v.x += r.dq.v.x;
+    l.dq.v.y += r.dq.v.y;
+    l.dq.v.z += r.dq.v.z;
+}
+
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator*(const DualQuat_tpl<F1>& dq, const Vec3_tpl<F2>& v)
+{
+    F2 t;
+    const F2 ax = dq.nq.v.y * v.z - dq.nq.v.z * v.y + dq.nq.w * v.x;
+    const F2 ay = dq.nq.v.z * v.x - dq.nq.v.x * v.z + dq.nq.w * v.y;
+    const F2 az = dq.nq.v.x * v.y - dq.nq.v.y * v.x + dq.nq.w * v.z;
+    F2 x = dq.dq.v.x * dq.nq.w - dq.nq.v.x * dq.dq.w + dq.nq.v.y * dq.dq.v.z - dq.nq.v.z * dq.dq.v.y;
+    x += x;
+    t = (az * dq.nq.v.y - ay * dq.nq.v.z);
+    x += t + t + v.x;
+    F2 y = dq.dq.v.y * dq.nq.w - dq.nq.v.y * dq.dq.w + dq.nq.v.z * dq.dq.v.x - dq.nq.v.x * dq.dq.v.z;
+    y += y;
+    t = (ax * dq.nq.v.z - az * dq.nq.v.x);
+    y += t + t + v.y;
+    F2 z = dq.dq.v.z * dq.nq.w - dq.nq.v.z * dq.dq.w + dq.nq.v.x * dq.dq.v.y - dq.nq.v.y * dq.dq.v.x;
+    z += z;
+    t = (ay * dq.nq.v.x - ax * dq.nq.v.y);
+    z += t + t + v.z;
+    return Vec3_tpl<F2>(x, y, z);
+}
+
+template<class F1, class F2>
+ILINE DualQuat_tpl<F1> operator*(const DualQuat_tpl<F1>& a, const DualQuat_tpl<F2>& b)
+{
+    DualQuat_tpl<F1> dual;
+
+    dual.nq.v.x = a.nq.v.y * b.nq.v.z - a.nq.v.z * b.nq.v.y + a.nq.w * b.nq.v.x + a.nq.v.x * b.nq.w;
+    dual.nq.v.y = a.nq.v.z * b.nq.v.x - a.nq.v.x * b.nq.v.z + a.nq.w * b.nq.v.y + a.nq.v.y * b.nq.w;
+    dual.nq.v.z = a.nq.v.x * b.nq.v.y - a.nq.v.y * b.nq.v.x + a.nq.w * b.nq.v.z + a.nq.v.z * b.nq.w;
+    dual.nq.w = a.nq.w * b.nq.w  - (a.nq.v.x * b.nq.v.x + a.nq.v.y * b.nq.v.y + a.nq.v.z * b.nq.v.z);
+
+    //dual.dq   = a.nq*b.dq + a.dq*b.nq;
+    dual.dq.v.x = a.nq.v.y * b.dq.v.z - a.nq.v.z * b.dq.v.y + a.nq.w * b.dq.v.x + a.nq.v.x * b.dq.w;
+    dual.dq.v.y = a.nq.v.z * b.dq.v.x - a.nq.v.x * b.dq.v.z + a.nq.w * b.dq.v.y + a.nq.v.y * b.dq.w;
+    dual.dq.v.z = a.nq.v.x * b.dq.v.y - a.nq.v.y * b.dq.v.x + a.nq.w * b.dq.v.z + a.nq.v.z * b.dq.w;
+    dual.dq.w = a.nq.w * b.dq.w  - (a.nq.v.x * b.dq.v.x + a.nq.v.y * b.dq.v.y + a.nq.v.z * b.dq.v.z);
+
+    dual.dq.v.x += a.dq.v.y * b.nq.v.z - a.dq.v.z * b.nq.v.y + a.dq.w * b.nq.v.x + a.dq.v.x * b.nq.w;
+    dual.dq.v.y += a.dq.v.z * b.nq.v.x - a.dq.v.x * b.nq.v.z + a.dq.w * b.nq.v.y + a.dq.v.y * b.nq.w;
+    dual.dq.v.z += a.dq.v.x * b.nq.v.y - a.dq.v.y * b.nq.v.x + a.dq.w * b.nq.v.z + a.dq.v.z * b.nq.w;
+    dual.dq.w += a.dq.w * b.nq.w  - (a.dq.v.x * b.nq.v.x + a.dq.v.y * b.nq.v.y + a.dq.v.z * b.nq.v.z);
+
+    return dual;
+}
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_QUAT_H
+
+
diff --git a/Code/Legacy/CryCommon/Cry_ValidNumber.h b/Code/Legacy/CryCommon/Cry_ValidNumber.h
new file mode 100644
index 0000000000..d4f5d311e8
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_ValidNumber.h
@@ -0,0 +1,176 @@
+/*
+ * 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_CRY_VALIDNUMBER_H
+#define CRYINCLUDE_CRYCOMMON_CRY_VALIDNUMBER_H
+#pragma once
+
+//--------------------------------------------------------------------------------
+
+// http://www.psc.edu/general/software/packages/ieee/ieee.html
+
+/*
+    The IEEE standard for floating point arithmetic
+    """"""""""""""""""""""""""""""""""""""""""""""""
+
+    Single Precision
+    """""""""""""""""
+
+    The IEEE single precision floating point standard representation requires a 32 bit word,
+    which may be represented as numbered from 0 to 31, left to right.
+    The first bit is the sign bit, S,
+    the next eight bits are the exponent bits, 'E',
+    and the final 23 bits are the fraction 'F':
+
+    S EEEEEEEE FFFFFFFFFFFFFFFFFFFFFFF
+    0 1      8 9                    31
+
+    The value V represented by the word may be determined as follows:
+
+    * If E=255 and F is nonzero, then V=NaN ("Not a number")
+    * If E=255 and F is zero and S is 1, then V=-Infinity
+    * If E=255 and F is zero and S is 0, then V=Infinity
+    * If 0<E<255 then V=(-1)**S * 2 ** (E-127) * (1.F) where "1.F" is intended to represent the binary number created by prefixing F with an implicit leading 1 and a binary point.
+    * If E=0 and F is nonzero, then V=(-1)**S * 2 ** (-126) * (0.F) These are "unnormalized" values.
+    * If E=0 and F is zero and S is 1, then V=-0
+    * If E=0 and F is zero and S is 0, then V=0
+
+
+
+    Double Precision
+    """""""""""""""""
+
+    The IEEE double precision floating point standard representation requires a 64 bit word,
+    which may be represented as numbered from 0 to 63, left to right.
+    The first bit is the sign bit, S,
+    the next eleven bits are the exponent bits, 'E',
+    and the final 52 bits are the fraction 'F':
+
+    S EEEEEEEEEEE FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+    0 1        11 12                                                63
+
+    The value V represented by the word may be determined as follows:
+
+    * If E=2047 and F is nonzero, then V=NaN ("Not a number")
+    * If E=2047 and F is zero and S is 1, then V=-Infinity
+    * If E=2047 and F is zero and S is 0, then V=Infinity
+    * If 0<E<2047 then V=(-1)**S * 2 ** (E-1023) * (1.F) where "1.F" is intended to represent the binary number created by prefixing F with an implicit leading 1 and a binary point.
+    * If E=0 and F is nonzero, then V=(-1)**S * 2 ** (-1022) * (0.F) These are "unnormalized" values.
+    * If E=0 and F is zero and S is 1, then V=-0
+    * If E=0 and F is zero and S is 0, then V=0
+
+*/
+
+//--------------------------------------------------------------------------------
+
+#define FloatU32(x)                     (alias_cast<uint32, float>(x))
+#define FloatU32ExpMask             (0xFF << 23)
+#define FloatU32FracMask            ((1 << 23) - 1)
+#define FloatU32SignMask            (1 << 31)
+#define F32NAN                              (0x7F800001)                    // Produces rock solid fp-exceptions.
+#define F32NAN_SAFE                     (FloatU32ExpMask | FloatU32FracMask) // This one is not triggering an fp-exception.
+
+#define DoubleU64(x)                    (*((uint64*) &(x)))
+#define DoubleU64ExpMask            ((uint64)255 << 55)
+#define DoubleU64FracMask           (((uint64)1 << 55) - (uint64)1)
+#define DoubleU64SignMask           ((uint64)1 << 63)
+#if defined(__GNUC__)
+    #define F64NAN                              (0x7FF0000000000001ULL) // Produces rock solid fp-exceptions.
+#else
+    #define F64NAN                              (0x7FF0000000000001)    // Produces rock solid fp-exceptions.
+#endif
+#define F64NAN_SAFE                     (DoubleU64ExpMask | DoubleU64FracMask)  // This one is not triggering an fp-exception.
+
+//--------------------------------------------------------------------------------
+
+ILINE bool NumberValid(const float& x)
+{
+    return ((FloatU32(x) & FloatU32ExpMask) != FloatU32ExpMask);
+}
+
+ILINE bool NumberNAN(const float& x)
+{
+    return (((FloatU32(x) & FloatU32ExpMask) == FloatU32ExpMask) &&
+            ((FloatU32(x) & FloatU32FracMask) != 0));
+}
+
+ILINE bool NumberINF(const float& x)
+{
+    return (((FloatU32(x) & FloatU32ExpMask) == FloatU32ExpMask) &&
+            ((FloatU32(x) & FloatU32FracMask) == 0));
+}
+
+ILINE bool NumberDEN(const float& x)
+{
+    return (((FloatU32(x) & FloatU32ExpMask) == 0) &&
+            ((FloatU32(x) & FloatU32FracMask) != 0));
+}
+
+//--------------------------------------------------------------------------------
+
+ILINE bool NumberValid(const double& x)
+{
+    return ((DoubleU64(x) & DoubleU64ExpMask) != DoubleU64ExpMask);
+}
+
+ILINE bool NumberNAN(const double& x)
+{
+    return (((DoubleU64(x) & DoubleU64ExpMask) == DoubleU64ExpMask) &&
+            ((DoubleU64(x) & DoubleU64FracMask) != 0));
+}
+
+ILINE bool NumberINF(const double& x)
+{
+    return (((DoubleU64(x) & DoubleU64ExpMask) == DoubleU64ExpMask) &&
+            ((DoubleU64(x) & DoubleU64FracMask) == 0));
+}
+
+ILINE bool NumberDEN(const double& x)
+{
+    return (((DoubleU64(x) & DoubleU64ExpMask) == 0) &&
+            ((DoubleU64(x) & DoubleU64FracMask) != 0));
+}
+
+//--------------------------------------------------------------------------------
+
+
+ILINE bool NumberValid([[maybe_unused]] const int8 x)
+{
+    return true; //integers are always valid
+}
+ILINE bool NumberValid([[maybe_unused]] const uint8 x)
+{
+    return true; //integers are always valid
+}
+ILINE bool NumberValid([[maybe_unused]] const int16 x)
+{
+    return true; //integers are always valid
+}
+ILINE bool NumberValid([[maybe_unused]] const uint16 x)
+{
+    return true; //integers are always valid
+}
+ILINE bool NumberValid([[maybe_unused]] const int32 x)
+{
+    return true; //integers are always valid
+}
+ILINE bool NumberValid([[maybe_unused]] const uint32 x)
+{
+    return true; //integers are always valid
+}
+ILINE bool NumberValid([[maybe_unused]] const int64 x)
+{
+    return true; //integers are always valid
+}
+ILINE bool NumberValid([[maybe_unused]] const uint64 x)
+{
+    return true; //integers are always valid
+}
+
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_VALIDNUMBER_H
diff --git a/Code/Legacy/CryCommon/Cry_Vector2.h b/Code/Legacy/CryCommon/Cry_Vector2.h
new file mode 100644
index 0000000000..e5400362a3
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Vector2.h
@@ -0,0 +1,384 @@
+/*
+ * 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 matrix class
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
+#define CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
+#pragma once
+
+#include <AzCore/RTTI/TypeInfo.h>
+#include "Cry_Math.h"
+
+template<class F>
+struct Vec2_tpl
+{
+    typedef F value_type;
+    enum
+    {
+        component_count = 2
+    };
+
+    F x, y;
+
+#ifdef _DEBUG
+    ILINE Vec2_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+        }
+    }
+#else
+    ILINE Vec2_tpl() {}
+#endif
+
+    ILINE Vec2_tpl(type_zero)
+        : x(0)
+        , y(0) {}
+    ILINE Vec2_tpl(F vx, F vy) { x = vx; y = vy; }
+    explicit ILINE Vec2_tpl(F m) { x = y = m; }
+
+    ILINE Vec2_tpl& set(F nx, F ny) { x = F(nx); y = F(ny); return *this; }
+
+
+    template<class F1>
+    ILINE Vec2_tpl(const Vec2_tpl<F1>& src) { x = F(src.x); y = F(src.y); }
+    template<class F1>
+    ILINE explicit Vec2_tpl(const Vec3_tpl<F1>& src) { x = F(src.x); y = F(src.y); }
+    template<class F1>
+    ILINE explicit Vec2_tpl(const F1* psrc) { x = F(psrc[0]); y = F(psrc[1]); }
+
+    explicit ILINE Vec2_tpl(const Vec3_tpl<F>& v)
+        : 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; }
+
+    ILINE int operator!() const { return x == 0 && y == 0; }
+
+    // The default Normalize function is in fact "safe". 0 vectors remain unchanged.
+    Vec2_tpl& Normalize()
+    {
+        F fInvLen = isqrt_safe_tpl(x * x + y * y);
+        x *= fInvLen;
+        y *= fInvLen;
+        return *this;
+    }
+
+    // Normalize if non-0, otherwise set to specified "safe" value.
+    Vec2_tpl& NormalizeSafe(const struct Vec2_tpl<F>& safe = Vec2_tpl<F>(0, 0))
+    {
+        F fLen2 = x * x + y * y;
+        if (fLen2 > 0.0f)
+        {
+            F fInvLen = isqrt_tpl(fLen2);
+            x *= fInvLen;
+            y *= fInvLen;
+        }
+        else
+        {
+            *this = safe;
+        }
+        return *this;
+    }
+
+    Vec2_tpl GetNormalized() const
+    {
+        F fInvLen = isqrt_safe_tpl(x * x + y * y);
+        return *this * fInvLen;
+    }
+
+    Vec2_tpl GetNormalizedSafe(const struct Vec2_tpl<F>& safe = Vec2_tpl<F>(1, 0)) const
+    {
+        F fLen2 = x * x + y * y;
+        if (fLen2 > 0.0f)
+        {
+            F fInvLen = isqrt_tpl(fLen2);
+            return *this * fInvLen;
+        }
+        else
+        {
+            return safe;
+        }
+    }
+
+    ILINE bool IsEquivalent(const Vec2_tpl<F>& v1, F epsilon = VEC_EPSILON) const
+    {
+        assert(v1.IsValid());
+        assert(this->IsValid());
+        return  ((fabs_tpl(x - v1.x) <= epsilon) &&   (fabs_tpl(y - v1.y) <= epsilon));
+    }
+
+    ILINE static bool IsEquivalent(const Vec2_tpl<F>& v0, const Vec2_tpl<F>& v1, F epsilon = VEC_EPSILON)
+    {
+        assert(v0.IsValid());
+        assert(v1.IsValid());
+        return  ((fabs_tpl(v0.x - v1.x) <= epsilon) &&    (fabs_tpl(v0.y - v1.y) <= epsilon));
+    }
+
+
+    ILINE F GetLength() const
+    {
+        return sqrt_tpl(x * x + y * y);
+    }
+
+    ILINE F GetLengthSquared() const
+    {
+        return x * x + y * y;
+    }
+
+    ILINE F GetLength2() const
+    {
+        return x * x + y * y;
+    }
+
+    void SetLength(F fLen)
+    {
+        F fLenMe = GetLength2();
+        if (fLenMe < 0.00001f * 0.00001f)
+        {
+            return;
+        }
+        fLenMe = fLen * isqrt_tpl(fLenMe);
+        x *= fLenMe;
+        y *= fLenMe;
+    }
+
+    ILINE F area() const { return x * y; }
+
+    ILINE F& operator[](int idx) { return *((F*)&x + idx); }
+    ILINE F operator[](int idx) const { return *((F*)&x + idx); }
+    ILINE operator F*() { return &x; }
+    ILINE Vec2_tpl& flip() { x = -x; y = -y; return *this; }
+    ILINE Vec2_tpl& zero() { x = y = 0; return *this; }
+    ILINE Vec2_tpl rot90ccw() const { return Vec2_tpl(-y, x); }
+    ILINE Vec2_tpl rot90cw() const { return Vec2_tpl(y, -x); }
+
+    #ifdef quotient_h
+    quotient_tpl<F> fake_atan2() const
+    {
+        quotient_tpl<F> res;
+        int quad = -(signnz(x * x - y * y) - 1 >> 1); // hope the optimizer will remove complement shifts and adds
+        if (quad)
+        {
+            res.x = -y;
+            res.y = x;
+        }
+        else
+        {
+            res.x = x;
+            res.y = y;
+        }
+        int sgny = signnz(res.y);
+        quad |= 1 - sgny;                               //(res.y<0)<<1;
+        res.x *= sgny;
+        res.y *= sgny;
+        res += 1 + (quad << 1);
+        return res;
+    }
+    #endif
+    ILINE F atan2() const { return atan2_tpl(y, x); }
+
+    ILINE Vec2_tpl operator-() const { return Vec2_tpl(-x, -y); }
+
+    ILINE Vec2_tpl operator*(F k) const { return Vec2_tpl(x * k, y * k); }
+    ILINE Vec2_tpl& operator*=(F k) { x *= k; y *= k; return *this; }
+    ILINE Vec2_tpl operator/(F k) const { return *this * ((F)1.0 / k); }
+    ILINE Vec2_tpl& operator/=(F k) { return *this *= ((F)1.0 / k); }
+
+    //  bool operator==(const Vec2_tpl<F> &vec) { return x == vec.x && y == vec.y; }
+    ILINE bool operator!=(const Vec2_tpl<F>& vec) { return !(*this == vec); }
+
+    ILINE friend bool operator==(const Vec2_tpl<F>& left, const Vec2_tpl<F>& right) { return left.x == right.x && left.y == right.y; }
+    ILINE friend bool operator!=(const Vec2_tpl<F>& left, const Vec2_tpl<F>& right) {   return !(left == right);  }
+
+    ILINE bool IsZero(F e = (F)0.0) const
+    {
+        return (fabs_tpl(x) <= e) && (fabs_tpl(y) <= e);
+    }
+
+    // IsZeroSlow would be a better name [5/20/2010 evgeny]
+    ILINE bool IsZeroFast(F e = (F)0.0003) const
+    {
+        return (fabs_tpl(x) + fabs_tpl(y)) <= e;
+    }
+
+    ILINE F Dot(const Vec2_tpl& rhs) const {return x * rhs.x + y * rhs.y; }
+    /// returns a vector perpendicular to this one (this->Cross(newVec) points "up")
+    ILINE Vec2_tpl Perp() const {return Vec2_tpl(-y, x); }
+
+    // The size of the "paralell-trapets" area spanned by the two vectors.
+    ILINE F Cross (const Vec2_tpl<F>& v) const
+    {
+        return float (x * v.y - y * v.x);
+    }
+
+    /*!
+    * Linear-Interpolation between Vec3 (lerp)
+    *
+    * Example:
+    *  Vec3 r=Vec3::CreateLerp( p, q, 0.345f );
+    */
+    ILINE void SetLerp(const Vec2_tpl<F>& p, const Vec2_tpl<F>& q, F t) { *this = p * (1.0f - t) + q * t; }
+    ILINE static Vec2_tpl<F> CreateLerp(const Vec2_tpl<F>& p, const Vec2_tpl<F>& q, F t) {    return p * (1.0f - t) + q * t; }
+
+
+    /*!
+    * Spherical-Interpolation between 3d-vectors (geometrical slerp)
+    * both vectors are assumed to be normalized.
+    *
+    * Example:
+    *  Vec3 r=Vec3::CreateSlerp( p, q, 0.5674f );
+    */
+    void SetSlerp(const Vec2_tpl<F>& p, const Vec2_tpl<F>& q, F t)
+    {
+        assert((fabs_tpl(1 - (p | p))) < 0.005); //check if unit-vector
+        assert((fabs_tpl(1 - (q | q))) < 0.005); //check if unit-vector
+        // calculate cosine using the "inner product" between two vectors: p*q=cos(radiant)
+        F cosine = (p | q);
+        //we explore the special cases where the both vectors are very close together,
+        //in which case we approximate using the more economical LERP and avoid "divisions by zero" since sin(Angle) = 0  as   Angle=0
+        if (cosine >= (F)0.99)
+        {
+            SetLerp(p, q, t); //perform LERP:
+            this->Normalize();
+        }
+        else
+        {
+            //perform SLERP: because of the LERP-check above, a "division by zero" is not possible
+            F rad               = acos_tpl(cosine);
+            F scale_0   = sin_tpl((1 - t) * rad);
+            F scale_1   = sin_tpl(t * rad);
+            *this = (p * scale_0 + q * scale_1) / sin_tpl(rad);
+            this->Normalize();
+        }
+    }
+    ILINE static Vec2_tpl<F> CreateSlerp(const Vec2_tpl<F>& p, const Vec2_tpl<F>& q, F t)
+    {
+        Vec2_tpl<F> v;
+        v.SetSlerp(p, q, t);
+        return v;
+    }
+
+    bool IsValid() const
+    {
+        if (!NumberValid(x))
+        {
+            return false;
+        }
+        if (!NumberValid(y))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    ILINE F GetDistance(const Vec2_tpl<F>& vec1) const
+    {
+        return sqrt_tpl((x - vec1.x) * (x - vec1.x) + (y - vec1.y) * (y - vec1.y));
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Typedefs                                                                  //
+///////////////////////////////////////////////////////////////////////////////
+
+typedef Vec2_tpl<f32>    Vec2;  // always 32 bit
+typedef Vec2_tpl<f64>    Vec2d; // always 64 bit
+typedef Vec2_tpl<int32>  Vec2i;
+typedef Vec2_tpl<uint32> Vec2ui;
+typedef Vec2_tpl<real>   Vec2r; // variable float precision. depending on the target system it can be 32, 64 or 80 bit
+
+typedef Vec2_tpl<float> vector2f;
+#if defined(LINUX64)
+typedef Vec2_tpl<int>    vector2l;
+#else
+typedef Vec2_tpl<long>   vector2l;
+#endif
+typedef Vec2_tpl<float> vector2df;
+typedef Vec2_tpl<real> vector2d;
+typedef Vec2_tpl<int> vector2di;
+typedef Vec2_tpl<unsigned int> vector2dui;
+
+template<class F>
+Vec2_tpl<F> operator*(F op1, const Vec2_tpl<F>& op2) {return Vec2_tpl<F>(op1 * op2.x, op1 * op2.y); }
+
+template<class F1, class F2>
+F1 operator*(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2) { return op1.x * op2.x + op1.y * op2.y; } // dot product
+template<class F1, class F2>
+F1 operator|(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2) { return op1.x * op2.x + op1.y * op2.y; } // dot product
+
+template<class F1, class F2>
+F1 operator^(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2) { return op1.x * op2.y - op1.y * op2.x; } // cross product
+
+template<class F1, class F2>
+Vec2_tpl<F1> operator+(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2)
+{
+    return Vec2_tpl<F1>(op1.x + op2.x, op1.y + op2.y);
+}
+template<class F1, class F2>
+Vec2_tpl<F1> operator-(const Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2)
+{
+    return Vec2_tpl<F1>(op1.x - op2.x, op1.y - op2.y);
+}
+
+template<class F1, class F2>
+Vec2_tpl<F1>& operator+=(Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2)
+{
+    op1.x += op2.x;
+    op1.y += op2.y;
+    return op1;
+}
+template<class F1, class F2>
+Vec2_tpl<F1>& operator-=(Vec2_tpl<F1>& op1, const Vec2_tpl<F2>& op2)
+{
+    op1.x -= op2.x;
+    op1.y -= op2.y;
+    return op1;
+}
+
+template<class F>
+bool operator==(const Vec2_tpl<F>& left, const Vec2_tpl<F>& right)
+{
+    return left.x == right.x && left.y == right.y;
+}
+
+
+template<>
+ILINE Vec2 clamp_tpl<Vec2>(Vec2 X, Vec2 Min, Vec2 Max)
+{
+    return Vec2(clamp_tpl(X.x, Min.x, Max.x), clamp_tpl(X.y, Min.y, Max.y));
+}
+
+
+// declare common constants.  Must be done after the class for compiler conformance
+// (msvc and clang handle instantiation differently)
+const Vec2_tpl<float> Vec2_Zero(0, 0);
+const Vec2_tpl<float> Vec2_OneX(1, 0);
+const Vec2_tpl<float> Vec2_OneY(0, 1);
+const Vec2_tpl<float> Vec2_One(1, 1);
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(Vec2, "{844131BA-9565-42F3-8482-6F65A6D5FC59}");
+}
+#endif // CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
diff --git a/Code/Legacy/CryCommon/Cry_Vector3.h b/Code/Legacy/CryCommon/Cry_Vector3.h
new file mode 100644
index 0000000000..b33225c712
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Vector3.h
@@ -0,0 +1,1429 @@
+/*
+ * 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 vector class
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_VECTOR3_H
+#define CRYINCLUDE_CRYCOMMON_CRY_VECTOR3_H
+#pragma once
+
+
+#include "CryEndian.h"
+#include <AzCore/Math/Vector3.h>
+
+template<typename T>
+struct VecPrecisionValues
+{
+    ILINE static bool CheckGreater(const T value)
+    {
+        return value > 0;
+    }
+};
+
+template<>
+struct VecPrecisionValues<float>
+{
+    ILINE static bool CheckGreater(const float value)
+    {
+        return value > FLT_EPSILON;
+    }
+};
+
+
+template <typename F>
+struct Vec3s_tpl
+{
+    F x, y, z;
+
+    ILINE Vec3s_tpl(F vx, F vy, F vz)
+        : x(vx)
+        , y(vy)
+        , z(vz){}
+    ILINE F& operator [] (int32 index)        { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
+    ILINE F operator [] (int32 index) const { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// class Vec3_tpl
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+template <typename F>
+struct Vec3_tpl
+{
+    typedef F value_type;
+    enum
+    {
+        component_count = 3
+    };
+
+    F x, y, z;
+
+#if defined(_DEBUG)
+    ILINE Vec3_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+        }
+    }
+#else
+    ILINE Vec3_tpl()    {};
+#endif
+
+    /*!
+    * template specialization to initialize a vector
+    *
+    * Example:
+    *  Vec3 v0=Vec3(ZERO);
+    *  Vec3 v1=Vec3(MIN);
+    *  Vec3 v2=Vec3(MAX);
+    */
+    Vec3_tpl(type_zero)
+        : x(0)
+        , y(0)
+        , z(0) {}
+    Vec3_tpl(type_min);
+    Vec3_tpl(type_max);
+
+    /*!
+    * constructors and bracket-operator to initialize a vector
+    *
+    * Example:
+    *  Vec3 v0=Vec3(1,2,3);
+    *  Vec3 v1(1,2,3);
+    *  v2.Set(1,2,3);
+    */
+    ILINE Vec3_tpl(F vx, F vy, F vz)
+        : x(vx)
+        , y(vy)
+        , z(vz){ assert(this->IsValid()); }
+    ILINE void operator () (F vx, F vy, F vz) { x = vx; y = vy; z = vz; assert(this->IsValid()); }
+    ILINE Vec3_tpl<F>& Set(const F xval, const F yval, const F zval) { x = xval; y = yval; z = zval; assert(this->IsValid()); return *this; }
+
+    explicit ILINE Vec3_tpl(F f)
+        : x(f)
+        , y(f)
+        , z(f) { assert(this->IsValid()); }
+
+    explicit ILINE Vec3_tpl(const AZ::Vector3& v)
+    {
+        x = v.GetX();
+        y = v.GetY();
+        z = v.GetZ();
+    }
+
+    /*!
+    * the copy/casting/assignement constructor
+    *
+    * Example:
+    *  Vec3 v0=v1;
+    *  Vec3 v0=Vec3(angle);
+    *  Vec3 v0=Vec3(vector4);
+    */
+    ILINE Vec3_tpl(const Vec3_tpl& v)   {   x = v.x; y = v.y; z = v.z; }
+    template<class F1>
+    ILINE  Vec3_tpl<F>(const Vec3_tpl<F1>&v)  {
+        x = F(v.x);
+        y = F(v.y);
+        z = F(v.z);
+        assert(IsValid());
+    }
+
+    ILINE Vec3_tpl<F>(const Vec2_tpl<F>&v) {
+        x = v.x;
+        y = v.y;
+        z = 0;
+        assert(IsValid());
+    }
+    template<class T>
+    ILINE Vec3_tpl<F>(const Vec2_tpl<T>&v) {
+        x = F(v.x);
+        y = F(v.y);
+        z = 0;
+        assert(IsValid());
+    }
+
+    explicit ILINE Vec3_tpl<F>(const Ang3_tpl<F>&v) {
+        x = v.x;
+        y = v.y;
+        z = v.z;
+        assert(IsValid());
+    }
+    template<class T>
+    explicit ILINE Vec3_tpl<F>(const Ang3_tpl<T>&v) {
+        x = v.x;
+        y = v.y;
+        z = v.z;
+        assert(IsValid());
+    }
+
+    explicit ILINE Vec3_tpl<F>(const Vec4_tpl<F> &v) {
+        x = F(v.x);
+        y = F(v.y);
+        z = F(v.z);
+    }
+    template<class T>
+    explicit ILINE Vec3_tpl<F>(const Vec4_tpl<T> &v) {
+        x = F(v.x);
+        y = F(v.y);
+        z = F(v.z);
+    }
+
+
+
+
+    /*!
+    * overloaded arithmetic operator
+    *
+    * Example:
+    *  Vec3 v0=v1*4;
+    */
+    ILINE Vec3_tpl<F> operator * (F k) const
+    {
+        const Vec3_tpl<F> v = *this;
+        return Vec3_tpl<F>(v.x * k, v.y * k, v.z * k);
+    }
+    ILINE Vec3_tpl<F> operator / (F k) const
+    {
+        k = (F)1.0 / k;
+        return Vec3_tpl<F>(x * k, y * k, z * k);
+    }
+    ILINE friend Vec3_tpl<F> operator * (F f, const Vec3_tpl& vec)
+    {
+        return Vec3_tpl((F)(f * vec.x), (F)(f * vec.y), (F)(f * vec.z));
+    }
+
+    ILINE Vec3_tpl<F>& operator *= (F k)
+    {
+        x *= k;
+        y *= k;
+        z *= k;
+        return *this;
+    }
+    ILINE Vec3_tpl<F>& operator /= (F k)
+    {
+        k = (F)1.0 / k;
+        x *= k;
+        y *= k;
+        z *= k;
+        return *this;
+    }
+
+    ILINE Vec3_tpl<F> operator - (void) const
+    {
+        return Vec3_tpl<F>(-x, -y, -z);
+    }
+    ILINE Vec3_tpl<F>& Flip()
+    {
+        x = -x;
+        y = -y;
+        z = -z;
+        return *this;
+    }
+
+
+    /*!
+    * bracked-operator
+    *
+    * Example:
+    *  uint32 t=v[0];
+    */
+    ILINE F& operator [] (int32 index)        { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
+    ILINE F operator [] (int32 index) const { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
+
+
+    /*!
+    * functions and operators to compare vector
+    *
+    * Example:
+    *  if (v0==v1) dosomething;
+    */
+    ILINE bool operator==(const Vec3_tpl<F>& vec)
+    {
+        return x == vec.x && y == vec.y && z == vec.z;
+    }
+    ILINE bool operator!=(const Vec3_tpl<F>& vec)
+    {
+        return !(*this == vec);
+    }
+
+    ILINE friend bool operator ==(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
+    {
+        return ((v0.x == v1.x) && (v0.y == v1.y) && (v0.z == v1.z));
+    }
+    ILINE friend bool operator !=(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1)
+    {
+        return !(v0 == v1);
+    }
+
+    ILINE bool IsZero(F e = (F) 0.0) const
+    {
+        return (fabs_tpl(x) <= e) && (fabs_tpl(y) <= e) && (fabs_tpl(z) <= e);
+    }
+
+    ILINE bool IsZeroFast(F e = (F) 0.0003) const
+    {
+        return (fabs_tpl(x) + fabs_tpl(y) + fabs_tpl(z)) <= e;
+    }
+
+    // Chebyshev distance (axis aligned)
+    ILINE bool IsEquivalent(const Vec3_tpl<F>& v1, F epsilon = VEC_EPSILON) const
+    {
+        assert(v1.IsValid());
+        assert(this->IsValid());
+        return  ((fabs_tpl(x - v1.x) <= epsilon) &&   (fabs_tpl(y - v1.y) <= epsilon) && (fabs_tpl(z - v1.z) <= epsilon));
+    }
+    ILINE static bool IsEquivalent(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, F epsilon = VEC_EPSILON)
+    {
+        assert(v0.IsValid());
+        assert(v1.IsValid());
+        return  ((fabs_tpl(v0.x - v1.x) <= epsilon) &&    (fabs_tpl(v0.y - v1.y) <= epsilon) &&  (fabs_tpl(v0.z - v1.z) <= epsilon));
+    }
+
+    // Euclidean distance L2
+    ILINE bool IsEquivalentL2(const Vec3_tpl<F>& v1, F epsilon = VEC_EPSILON) const
+    {
+        assert(v1.IsValid());
+        assert(this->IsValid());
+        return (*this - v1).GetLengthSquared() <= (epsilon * epsilon);
+    }
+    ILINE static bool IsEquivalentL2(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, F epsilon = VEC_EPSILON)
+    {
+        assert(v0.IsValid());
+        assert(v1.IsValid());
+        return (v0 - v1).GetLengthSquared() <= (epsilon * epsilon);
+    }
+
+    ILINE bool IsUnit(F epsilon = VEC_EPSILON) const
+    {
+        return (fabs_tpl(1 - GetLengthSquared()) <= epsilon);
+    }
+
+    bool IsValid() const
+    {
+        if (!NumberValid(x))
+        {
+            return false;
+        }
+        if (!NumberValid(y))
+        {
+            return false;
+        }
+        if (!NumberValid(z))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    //! force vector length by normalizing it
+    ILINE void SetLength(F fLen)
+    {
+        F fLenMe = GetLengthSquared();
+        if (fLenMe < 0.00001f * 0.00001f)
+        {
+            return;
+        }
+        fLenMe = fLen * isqrt_tpl(fLenMe);
+        x *= fLenMe;
+        y *= fLenMe;
+        z *= fLenMe;
+    }
+
+    ILINE void ClampLength(F maxLength)
+    {
+        F sqrLength = GetLengthSquared();
+        if (sqrLength > (maxLength * maxLength))
+        {
+            F scale = maxLength * isqrt_tpl(sqrLength);
+            x *= scale;
+            y *= scale;
+            z *= scale;
+        }
+    }
+
+    //! calculate the length of the vector
+    ILINE F GetLength() const
+    {
+        return sqrt_tpl(x * x + y * y + z * z);
+    }
+
+    ILINE F GetLengthFloat() const
+    {
+        return GetLength();
+    }
+
+    ILINE F GetLengthFast() const
+    {
+        return sqrt_fast_tpl(x * x + y * y + z * z);
+    }
+
+    //! calculate the squared length of the vector
+    ILINE F GetLengthSquared() const
+    {
+        return x * x + y * y + z * z;
+    }
+
+    ILINE F GetLengthSquaredFloat() const
+    {
+        return GetLengthSquared();
+    }
+
+    //! calculate the length of the vector ignoring the z component
+    ILINE F GetLength2D() const
+    {
+        return sqrt_tpl(x * x + y * y);
+    }
+
+    //! calculate the squared length of the vector ignoring the z component
+    ILINE F GetLengthSquared2D() const
+    {
+        return x * x + y * y;
+    }
+
+    ILINE F GetDistance(const Vec3_tpl<F>& vec1) const
+    {
+        return sqrt_tpl((x - vec1.x) * (x - vec1.x) + (y - vec1.y) * (y - vec1.y) + (z - vec1.z) * (z - vec1.z));
+    }
+    ILINE F GetSquaredDistance (const Vec3_tpl<F>& v) const
+    {
+        return (x - v.x) * (x - v.x) + (y - v.y) * (y - v.y) + (z - v.z) * (z - v.z);
+    }
+    ILINE F GetSquaredDistance2D (const Vec3_tpl<F>& v) const
+    {
+        return (x - v.x) * (x - v.x) + (y - v.y) * (y - v.y);
+    }
+
+    //! Normalize the vector.
+    // The default Normalize function is in fact "safe". 0 vectors remain unchanged.
+    ILINE void  Normalize()
+    {
+        assert(this->IsValid());
+        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z);
+        x *= fInvLen;
+        y *= fInvLen;
+        z *= fInvLen;
+    }
+
+    //! May be faster and less accurate.
+    ILINE void NormalizeFast()
+    {
+        assert(this->IsValid());
+        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z);
+        x *= fInvLen;
+        y *= fInvLen;
+        z *= fInvLen;
+    }
+
+    //! Normalize the vector to a scale.
+    ILINE void Normalize(F scale)
+    {
+        assert(this->IsValid());
+        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z) * scale;
+        x *= fInvLen;
+        y *= fInvLen;
+        z *= fInvLen;
+    }
+    ILINE void NormalizeFast(F scale)
+    {
+        assert(this->IsValid());
+        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z) * scale;
+        x *= fInvLen;
+        y *= fInvLen;
+        z *= fInvLen;
+    }
+
+    //! Normalize the vector.
+    // check for null vector - set to the passed in vector (which should be normalised!) if it is null vector
+    // returns the original length of the vector
+    ILINE F NormalizeSafe(const struct Vec3_tpl<F>& safe = Vec3_tpl<F>(0, 0, 0))
+    {
+        assert(this->IsValid());
+        F fLen2 = x * x + y * y + z * z;
+        IF (VecPrecisionValues<F>::CheckGreater(fLen2), 1)
+        {
+            F fInvLen = isqrt_tpl(fLen2);
+            x *= fInvLen;
+            y *= fInvLen;
+            z *= fInvLen;
+            return F(1) / fInvLen;
+        }
+        else
+        {
+            *this = safe;
+            return F(0);
+        }
+    }
+
+    ILINE Vec3_tpl GetNormalizedFloat() const
+    {
+        return GetNormalized();
+    }
+
+    //! Return a normalized vector.
+    ILINE Vec3_tpl GetNormalized() const
+    {
+        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z);
+        return *this * fInvLen;
+    }
+
+    //! Return a normalized vector.
+    ILINE Vec3_tpl GetNormalizedFast() const
+    {
+        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z);
+        return *this * fInvLen;
+    }
+
+    //! Return a safely normalized vector - returns safe vector (should be normalised) if original is zero length.
+    ILINE Vec3_tpl GetNormalizedSafe(const struct Vec3_tpl<F>& safe = Vec3_tpl<F>(1, 0, 0)) const
+    {
+        F fLen2 = x * x + y * y + z * z;
+        IF (VecPrecisionValues<F>::CheckGreater(fLen2), 1)
+        {
+            F fInvLen = isqrt_tpl(fLen2);
+            return *this * fInvLen;
+        }
+        else
+        {
+            return safe;
+        }
+    }
+
+    //! Return a safely normalized vector - returns safe vector (should be normalised) if original is zero length.
+    ILINE Vec3_tpl GetNormalizedSafeFloat(const struct Vec3_tpl<F>& safe = Vec3_tpl<F>(1, 0, 0)) const
+    {
+        return GetNormalizedSafe(safe);
+    }
+
+    //! Return a normalized and scaled vector.
+    ILINE Vec3_tpl GetNormalized(F scale) const
+    {
+        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z);
+        return *this * (fInvLen * scale);
+    }
+    ILINE Vec3_tpl GetNormalizedFast(F scale) const
+    {
+        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z);
+        return *this * (fInvLen * scale);
+    }
+
+    //! Permutate coordinates so that z goes to new_z slot.
+    ILINE Vec3_tpl GetPermutated(int new_z) const { return Vec3_tpl(*(&x + inc_mod3[new_z]), *(&x + dec_mod3[new_z]), *(&x + new_z)); }
+
+    //! Returns volume of a box with this vector as diagonal.
+    ILINE F GetVolume() const { return x * y * z; }
+
+    //! Returns a vector that consists of absolute values of this one's coordinates.
+    ILINE Vec3_tpl<F> abs() const
+    {
+        return Vec3_tpl(fabs_tpl(x), fabs_tpl(y), fabs_tpl(z));
+    }
+
+    //! Check for min bounds.
+    ILINE void CheckMin(const Vec3_tpl<F> other)
+    {
+        x = min(other.x, x);
+        y = min(other.y, y);
+        z = min(other.z, z);
+    }
+    //! Check for max bounds.
+    ILINE void CheckMax(const Vec3_tpl<F> other)
+    {
+        x = max(other.x, x);
+        y = max(other.y, y);
+        z = max(other.z, z);
+    }
+
+
+
+    /*!
+    * Sets a vector orthogonal to the input vector.
+    *
+    * Example:
+    *  Vec3 v;
+    *  v.SetOrthogonal( i );
+    */
+    ILINE void SetOrthogonal(const Vec3_tpl<F>& v)
+    {
+        sqr(F(0.9)) * (v | v) - v.x * v.x < 0 ? (x = -v.z, y = 0, z = v.x) : (x = 0, y = v.z, z = -v.y);
+    }
+    //! Returns a vector orthogonal to this one.
+    ILINE Vec3_tpl GetOrthogonal() const
+    {
+        return sqr(F(0.9)) * (x * x + y * y + z * z) - x * x < 0 ? Vec3_tpl<F>(-z, 0, x) : Vec3_tpl<F>(0, z, -y);
+    }
+
+    /*!
+    * Project a point/vector on a (virtual) plane
+    * Consider we have a plane going through the origin.
+    * Because d=0 we need just the normal. The vector n is assumed to be a unit-vector.
+    *
+    * Example:
+    *  Vec3 result=Vec3::CreateProjection( incident, normal );
+    */
+    ILINE void SetProjection(const Vec3_tpl& i, const Vec3_tpl& n)
+    {
+        *this = i - n * (n | i);
+    }
+    ILINE static Vec3_tpl<F> CreateProjection(const Vec3_tpl& i, const Vec3_tpl& n)
+    {
+        return i - n * (n | i);
+    }
+
+    /*!
+    * Calculate a reflection vector. Vec3 n is assumed to be a unit-vector.
+    *
+    * Example:
+    *  Vec3 result=Vec3::CreateReflection( incident, normal );
+    */
+    ILINE void SetReflection(const Vec3_tpl<F>& i, const Vec3_tpl<F>& n)
+    {
+        *this = (n * (i | n) * 2) - i;
+    }
+    ILINE static Vec3_tpl<F> CreateReflection(const Vec3_tpl<F>& i, const Vec3_tpl<F>& n)
+    {
+        return (n * (i | n) * 2) - i;
+    }
+
+    /*!
+    * Linear-Interpolation between Vec3 (lerp)
+    *
+    * Example:
+    *  Vec3 r=Vec3::CreateLerp( p, q, 0.345f );
+    */
+    ILINE void SetLerp(const Vec3_tpl<F>& p, const Vec3_tpl<F>& q, F t)
+    {
+        const Vec3_tpl<F> diff = q - p;
+        *this = p + (diff * t);
+    }
+    ILINE static Vec3_tpl<F> CreateLerp(const Vec3_tpl<F>& p, const Vec3_tpl<F>& q, F t)
+    {
+        const Vec3_tpl<F> diff = q - p;
+        return p + (diff * t);
+    }
+
+
+    /*!
+    * Spherical-Interpolation between 3d-vectors (geometrical slerp)
+    * both vectors are assumed to be normalized.
+    *
+    * Example:
+    *  Vec3 r=Vec3::CreateSlerp( p, q, 0.5674f );
+    */
+    void SetSlerp(const Vec3_tpl<F>& p, const Vec3_tpl<F>& q, F t)
+    {
+        assert(p.IsUnit(0.005f));
+        assert(q.IsUnit(0.005f));
+        // calculate cosine using the "inner product" between two vectors: p*q=cos(radiant)
+        F cosine = clamp_tpl((p | q), F(-1), F(1));
+        //we explore the special cases where the both vectors are very close together,
+        //in which case we approximate using the more economical LERP and avoid "divisions by zero" since sin(Angle) = 0  as   Angle=0
+        if (cosine >= (F)0.99)
+        {
+            SetLerp(p, q, t); //perform LERP:
+            Normalize();
+        }
+        else
+        {
+            //perform SLERP: because of the LERP-check above, a "division by zero" is not possible
+            F rad               = acos_tpl(cosine);
+            F scale_0   = sin_tpl((1 - t) * rad);
+            F scale_1   = sin_tpl(t * rad);
+            *this = (p * scale_0 + q * scale_1) / sin_tpl(rad);
+            Normalize();
+        }
+    }
+    ILINE static Vec3_tpl<F> CreateSlerp(const Vec3_tpl<F>& p, const Vec3_tpl<F>& q, F t)
+    {
+        Vec3_tpl<F> v;
+        v.SetSlerp(p, q, t);
+        return v;
+    }
+
+
+
+
+    /*!
+        * Quadratic-Interpolation between vectors v0,v1,v2.
+        * This is repeated linear interpolation from 3 points and the resulting curve is a parabola.
+        * If t is in the range [0...1], then the curve goes only through v0 and v2.
+        *
+        * Example:
+        *  Vec3 ip; ip.SetQuadraticCurve( v0,v1,v2, 0.345f );
+        */
+    ILINE void SetQuadraticCurve(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, F t1)
+    {
+        F t0 = 1.0f - t1;
+        *this = t0 * t0 * v0 + t0 * t1 * 2.0f * v1 + t1 * t1 * v2;
+    }
+    ILINE static Vec3_tpl<F> CreateQuadraticCurve(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, F t)
+    {
+        Vec3_tpl<F> ip;
+        ip.SetQuadraticCurve(v0, v1, v2, t);
+        return ip;
+    }
+
+    /*!
+    * Cubic-Interpolation between vectors v0,v1,v2,v3.
+    * This is repeated linear interpolation from 4 points.
+    * If t is in the range [0...1], then the curve goes only through v0 and v3.
+    *
+    * Example:
+    *  Vec3 ip; ip.SetCubicCurve( v0,v1,v2,v3, 0.345f );
+    */
+    ILINE void SetCubicCurve(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, const Vec3_tpl<F>& v3, F t1)
+    {
+        F t0 = 1.0f - t1;
+        *this = t0 * t0 * t0 * v0 + 3 * t0 * t0 * t1 * v1 + 3 * t0 * t1 * t1 * v2 + t1 * t1 * t1 * v3;
+    }
+    ILINE static Vec3_tpl<F> CreateCubicCurve(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, const Vec3_tpl<F>& v3, F t)
+    {
+        Vec3_tpl<F> ip;
+        ip.SetCubicCurve(v0, v1, v2, v3, t);
+        return ip;
+    }
+
+    /*!
+       * Spline-Interpolation between vectors v0,v1,v2.
+       * This is a variation of a quadratic curve.
+       * If t is in the range [0...1], then the spline goes through all 3 points
+       *
+       * Example:
+       *  Vec3 ip; ip.SetSplineInterpolation( v0,v1,v2, 0.345f );
+       */
+    ILINE void SetQuadraticSpline(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, F t)
+    {
+        SetQuadraticCurve(v0, v1 - (v0 * 0.5f + v1 + v2 * 0.5f - v1 * 2.0f), v2, t);
+    }
+    ILINE static Vec3_tpl<F> CreateQuadraticSpline(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2, F t)
+    {
+        Vec3_tpl<F> ip;
+        ip.SetQuadraticSpline(v0, v1, v2, t);
+        return ip;
+    }
+
+    /*!
+    * Rotate a vector using angle&axis.
+    *
+    * Example:
+    *  Vec3 r=v.GetRotated(axis,angle);
+    */
+    ILINE Vec3_tpl<F> GetRotated(const Vec3_tpl<F>& axis, F angle) const
+    {
+        return GetRotated(axis, cos_tpl(angle), sin_tpl(angle));
+    }
+    ILINE Vec3_tpl<F> GetRotated(const Vec3_tpl<F>& axis, F cosa, F sina) const
+    {
+        Vec3_tpl<F> zax = axis * (*this | axis);
+        Vec3_tpl<F> xax = *this - zax;
+        Vec3_tpl<F> yax = axis % xax;
+        return xax * cosa + yax * sina + zax;
+    }
+
+    /*!
+    * Rotate a vector around a center using angle&axis.
+    *
+    * Example:
+    *  Vec3 r=v.GetRotated(axis,angle);
+    */
+    ILINE Vec3_tpl<F> GetRotated(const Vec3_tpl& center, const Vec3_tpl<F>& axis, F angle) const
+    {
+        return center + (*this - center).GetRotated(axis, angle);
+    }
+    ILINE Vec3_tpl<F> GetRotated(const Vec3_tpl<F>& center, const Vec3_tpl<F>& axis, F cosa, F sina) const
+    {
+        return center + (*this - center).GetRotated(axis, cosa, sina);
+    }
+
+    /*!
+    * Component wise multiplication of two vectors.
+    */
+    ILINE Vec3_tpl CompMul(const Vec3_tpl<F> rhs) const
+    {
+        return(Vec3_tpl(x * rhs.x, y * rhs.y, z * rhs.z));
+    }
+
+    //! Three methods for a "dot-product" operation.
+    ILINE F Dot (const Vec3_tpl<F> v)   const
+    {
+        return x * v.x + y * v.y + z * v.z;
+    }
+    //! Two methods for a "cross-product" operation.
+    ILINE Vec3_tpl<F> Cross (const Vec3_tpl<F> vec2) const
+    {
+        return Vec3_tpl<F>(y * vec2.z  -  z * vec2.y,     z * vec2.x -    x * vec2.z,   x * vec2.y  -  y * vec2.x);
+    }
+
+    //f32* fptr=vec;
+    DEPRECATED operator F* ()                   { return (F*)this; }
+    template <class T>
+    explicit DEPRECATED Vec3_tpl(const T* src) { x = F(src[0]); y = F(src[1]); z = F(src[2]); }
+
+    ILINE Vec3_tpl& zero() { x = y = z = 0; return *this; }
+    ILINE F len() const
+    {
+        return sqrt_tpl(x * x + y * y + z * z);
+    }
+    ILINE F len2() const
+    {
+        return x * x + y * y + z * z;
+    }
+
+    ILINE Vec3_tpl& normalize()
+    {
+        F len2 = x * x + y * y + z * z;
+        if (len2 > (F)1e-20f)
+        {
+            F rlen = isqrt_tpl(len2);
+            x *= rlen;
+            y *= rlen;
+            z *= rlen;
+        }
+        else
+        {
+            Set(0, 0, 1);
+        }
+        return *this;
+    }
+    ILINE Vec3_tpl normalized() const
+    {
+        F len2 = x * x + y * y + z * z;
+        if (len2 > (F)1e-20f)
+        {
+            F rlen = isqrt_tpl(len2);
+            return Vec3_tpl(x * rlen, y * rlen, z * rlen);
+        }
+        else
+        {
+            return Vec3_tpl(0, 0, 1);
+        }
+    }
+
+    //vector subtraction
+    template<class F1>
+    ILINE Vec3_tpl<F1> sub(const Vec3_tpl<F1>& v) const
+    {
+        return Vec3_tpl<F1>(x - v.x, y - v.y, z - v.z);
+    }
+    //vector scale
+    template<class F1>
+    ILINE Vec3_tpl<F1> scale(const F1 k) const
+    {
+        return Vec3_tpl<F>(x * k, y * k, z * k);
+    }
+
+    //vector dot product
+    template<class F1>
+    ILINE F1 dot(const Vec3_tpl<F1>& v) const
+    {
+        return (F1)(x * v.x + y * v.y + z * v.z);
+    }
+    //vector cross product
+    template<class F1>
+    ILINE Vec3_tpl<F1> cross(const Vec3_tpl<F1>& v) const
+    {
+        return Vec3_tpl<F1>(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x);
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+// dot product (2 versions)
+template<class F1, class F2>
+ILINE F1 operator * (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return v0.Dot(v1);
+}
+template<class F1, class F2>
+ILINE F1 operator | (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return v0.Dot(v1);
+}
+// cross product (2 versions)
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator ^ (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return v0.Cross(v1);
+}
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator % (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return v0.Cross(v1);
+}
+
+
+//vector addition
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator + (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return Vec3_tpl<F1>(static_cast<F1>(v0.x + v1.x), static_cast<F1>(v0.y + v1.y), static_cast<F1>(v0.z + v1.z));
+}
+//vector addition
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator + (const Vec2_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return Vec3_tpl<F1>(v0.x + v1.x, v0.y + v1.y, v1.z);
+}
+//vector addition
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator + (const Vec3_tpl<F1>& v0, const Vec2_tpl<F2>& v1)
+{
+    return Vec3_tpl<F1>(v0.x + v1.x, v0.y + v1.y, v0.z);
+}
+
+//vector subtraction
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator - (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return Vec3_tpl<F1>((F1)(v0.x - v1.x), (F1)(v0.y - v1.y), (F1)(v0.z - v1.z));
+}
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator - (const Vec2_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return Vec3_tpl<F1>(v0.x - v1.x, v0.y - v1.y, 0.0f - v1.z);
+}
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator - (const Vec3_tpl<F1>& v0, const Vec2_tpl<F2>& v1)
+{
+    return Vec3_tpl<F1>(v0.x - v1.x, v0.y - v1.y, v0.z);
+}
+
+
+//---------------------------------------------------------------------------
+
+
+//vector self-addition
+template<class F1, class F2>
+ILINE Vec3_tpl<F1>& operator += (Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    v0 = v0 + v1;
+    return v0;
+}
+//vector self-subtraction
+template<class F1, class F2>
+ILINE Vec3_tpl<F1>& operator -= (Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    v0 = v0 - v1;
+    return v0;
+}
+template<class F1, class F2>
+ILINE Vec3_tpl<F1> operator / (const Vec3_tpl<F1>& v0, const Vec3_tpl<F2>& v1)
+{
+    return Vec3_tpl<F1>(v0.x / v1.x, v0.y / v1.y, v0.z / v1.z);
+}
+
+template <class F>
+ILINE bool IsEquivalent(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, f32 epsilon = VEC_EPSILON)
+{
+    return  ((fabs_tpl(v0.x - v1.x) <= epsilon) &&    (fabs_tpl(v0.y - v1.y) <= epsilon) &&  (fabs_tpl(v0.z - v1.z) <= epsilon));
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Typedefs                                                                  //
+///////////////////////////////////////////////////////////////////////////////
+typedef Vec3_tpl<f32>    Vec3;  // always 32 bit
+
+typedef Vec3_tpl<f64>    Vec3d; // always 64 bit
+typedef Vec3_tpl<int32>  Vec3i;
+typedef Vec3_tpl<uint32> Vec3ui;
+typedef Vec3_tpl<real>   Vec3r; // variable float precision. depending on the target system it can be 32, 64 or 80 bit
+
+template<>
+inline Vec3_tpl<f64>::Vec3_tpl(type_min) { x = y = z = -1.7E308; }
+template<>
+inline Vec3_tpl<f64>::Vec3_tpl(type_max) { x = y = z = 1.7E308; }
+template<>
+inline Vec3_tpl<f32>::Vec3_tpl(type_min) { x = y = z = -3.3E38f; }
+template<>
+inline Vec3_tpl<f32>::Vec3_tpl(type_max) { x = y = z = 3.3E38f; }
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct Ang3_tpl
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename F>
+struct Ang3_tpl
+{
+    F x, y, z;
+
+#if defined(_DEBUG)
+    ILINE Ang3_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+        }
+    }
+#else
+    ILINE Ang3_tpl()    {};
+#endif
+
+
+    Ang3_tpl(type_zero) { x = y = z = 0; }
+
+    void operator () (F vx, F vy, F vz) { x = vx; y = vy; z = vz; };
+    ILINE Ang3_tpl<F>(F vx, F vy, F vz)   {
+        x = vx;
+        y = vy;
+        z = vz;
+    }
+
+    explicit ILINE Ang3_tpl(const Vec3_tpl<F>& v)
+        : x((F)v.x)
+        , y((F)v.y)
+        , z((F)v.z) { assert(this->IsValid()); }
+
+    ILINE bool operator==(const Ang3_tpl<F>& vec) { return x == vec.x && y == vec.y && z == vec.z; }
+    ILINE bool operator!=(const Ang3_tpl<F>& vec) { return !(*this == vec); }
+
+    ILINE Ang3_tpl<F> operator * (F k) const { return Ang3_tpl<F>(x * k, y * k, z * k); }
+    ILINE Ang3_tpl<F> operator / (F k) const { k = (F)1.0 / k; return Ang3_tpl<F>(x * k, y * k, z * k); }
+
+
+    ILINE Ang3_tpl<F>& operator *= (F k) { x *= k; y *= k; z *= k; return *this; }
+    //explicit ILINE Ang3_tpl<F>& operator = (const Vec3_tpl<F>& v)  { x=v.x; y=v.y; z=v.z; return *this;   }
+
+    ILINE Ang3_tpl<F> operator - (void) const { return Ang3_tpl<F>(-x, -y, -z); }
+
+    ILINE friend bool operator ==(const Ang3_tpl<F>& v0, const Ang3_tpl<F>& v1)
+    {
+        return ((v0.x == v1.x) && (v0.y == v1.y) && (v0.z == v1.z));
+    }
+    ILINE void Set(F xval, F yval, F zval) { x = xval; y = yval; z = zval; }
+
+    ILINE bool IsEquivalent(const Ang3_tpl<F>& v1, F epsilon = VEC_EPSILON) const
+    {
+        return  ((fabs_tpl(x - v1.x) <= epsilon) &&   (fabs_tpl(y - v1.y) <= epsilon) && (fabs_tpl(z - v1.z) <= epsilon));
+    }
+    ILINE bool IsInRangePI() const
+    {
+        F pi = (F)(gf_PI + 0.001); //we need this to fix fp-precision problem
+        return  ((x > -pi) && (x < pi) && (y > -pi) && (y < pi) && (z > -pi) && (z < pi));
+    }
+
+    //! Normalize angle to -pi and +pi range.
+    ILINE void RangePI()
+    {
+        const F modX = fmod(x + gf_PI, gf_PI2);
+        x = if_neg_else(modX, modX + gf_PI, modX - gf_PI);
+
+        const F modY = fmod(y + gf_PI, gf_PI2);
+        y = if_neg_else(modY, modY + gf_PI, modY - gf_PI);
+
+        const F modZ = fmod(z + gf_PI, gf_PI2);
+        z = if_neg_else(modZ, modZ + gf_PI, modZ - gf_PI);
+    }
+
+    //! Convert unit Quat to Euler Angles (xyz).
+    template<class F1>
+    explicit Ang3_tpl(const Quat_tpl<F1>& q)
+    {
+        assert(q.IsValid());
+        y = F(asin_tpl(max((F)-1.0, min((F)1.0, -(q.v.x * q.v.z - q.w * q.v.y) * 2))));
+        if (fabs_tpl(fabs_tpl(y) - (F)((F)g_PI * (F)0.5)) < (F)0.01)
+        {
+            x = F(0);
+            z = F(atan2_tpl(-2 * (q.v.x * q.v.y - q.w * q.v.z), 1 - (q.v.x * q.v.x + q.v.z * q.v.z) * 2));
+        }
+        else
+        {
+            x = F(atan2_tpl((q.v.y * q.v.z + q.w * q.v.x) * 2, 1 - (q.v.x * q.v.x + q.v.y * q.v.y) * 2));
+            z = F(atan2_tpl((q.v.x * q.v.y + q.w * q.v.z) * 2, 1 - (q.v.z * q.v.z + q.v.y * q.v.y) * 2));
+        }
+    }
+
+    //! Convert Matrix33 to Euler Angles (xyz).
+    template<class F1>
+    explicit Ang3_tpl(const Matrix33_tpl<F1>& m)
+    {
+        assert(m.IsOrthonormalRH(0.001f));
+        y = (F)asin_tpl(max((F)-1.0, min((F)1.0, -m.m20)));
+        if (fabs_tpl(fabs_tpl(y) - (F)((F)g_PI * (F)0.5)) < (F)0.01)
+        {
+            x = F(0);
+            z = F(atan2_tpl(-m.m01, m.m11));
+        }
+        else
+        {
+            x = F(atan2_tpl(m.m21, m.m22));
+            z = F(atan2_tpl(m.m10, m.m00));
+        }
+    }
+
+    //! Convert Matrix34 to Euler Angles (xyz).
+    template<class F1>
+    explicit Ang3_tpl(const Matrix34_tpl<F1>& m)
+    {
+        assert(m.IsOrthonormalRH(0.001f));
+        y = F(asin_tpl(max((F)-1.0, min((F)1.0, -m.m20))));
+        if (fabs_tpl(fabs_tpl(y) - (F)((F)g_PI * (F)0.5)) < (F)0.01)
+        {
+            x = F(0);
+            z = F(atan2_tpl(-m.m01, m.m11));
+        }
+        else
+        {
+            x = F(atan2_tpl(m.m21, m.m22));
+            z = F(atan2_tpl(m.m10, m.m00));
+        }
+    }
+
+    //! Convert Matrix44 to Euler Angles (xyz).
+    template<class F1>
+    explicit Ang3_tpl(const Matrix44_tpl<F1>& m)
+    {
+        assert(Matrix33(m).IsOrthonormalRH(0.001f));
+        y = F(asin_tpl(max((F)-1.0, min((F)1.0, -m.m20))));
+        if (fabs_tpl(fabs_tpl(y) - (F)((F)g_PI * (F)0.5)) < (F)0.01)
+        {
+            x = F(0);
+            z = F(atan2_tpl(-m.m01, m.m11));
+        }
+        else
+        {
+            x = F(atan2_tpl(m.m21, m.m22));
+            z = F(atan2_tpl(m.m10, m.m00));
+        }
+    }
+
+    template<typename F1>
+    static ILINE F CreateRadZ(const Vec2_tpl<F1>& v0, const Vec2_tpl<F1>& v1)
+    {
+        F cz    = v0.x * v1.y - v0.y * v1.x;
+        F c     =   v0.x * v1.x + v0.y * v1.y;
+        return F(atan2_tpl(cz, c));
+    }
+
+    template<typename F1>
+    static ILINE F CreateRadZ(const Vec3_tpl<F1>& v0, const Vec3_tpl<F1>& v1)
+    {
+        F cz    = v0.x * v1.y - v0.y * v1.x;
+        F c     =   v0.x * v1.x + v0.y * v1.y;
+        return F(atan2_tpl(cz, c));
+    }
+
+    template<typename F1>
+    ILINE static Ang3_tpl<F> GetAnglesXYZ(const Quat_tpl<F1>& q) {    return Ang3_tpl<F>(q); }
+    template<typename F1>
+    ILINE void SetAnglesXYZ(const Quat_tpl<F1>& q)    {   *this = Ang3_tpl<F>(q);   }
+
+    template<typename F1>
+    ILINE static Ang3_tpl<F> GetAnglesXYZ(const Matrix33_tpl<F1>& m) {    return Ang3_tpl<F>(m); }
+    template<typename F1>
+    ILINE void SetAnglesXYZ(const Matrix33_tpl<F1>& m)    {   *this = Ang3_tpl<F>(m);   }
+
+    template<typename F1>
+    ILINE static Ang3_tpl<F> GetAnglesXYZ(const Matrix34_tpl<F1>& m) {    return Ang3_tpl<F>(m); }
+    template<typename F1>
+    ILINE void SetAnglesXYZ(const Matrix34_tpl<F1>& m)    {   *this = Ang3_tpl<F>(m);   }
+
+    //---------------------------------------------------------------
+    ILINE F& operator [] (int index)          { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
+    ILINE F operator [] (int index) const { assert(index >= 0 && index <= 2); return ((F*)this)[index]; }
+
+
+    bool IsValid() const
+    {
+        if (!NumberValid(x))
+        {
+            return false;
+        }
+        if (!NumberValid(y))
+        {
+            return false;
+        }
+        if (!NumberValid(z))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+typedef Ang3_tpl<f32>       Ang3;
+typedef Ang3_tpl<real>  Ang3r;
+typedef Ang3_tpl<f64>       Ang3_f64;
+
+//---------------------------------------
+
+//vector addition
+template<class F1, class F2>
+ILINE Ang3_tpl<F1> operator + (const Ang3_tpl<F1>& v0, const Ang3_tpl<F2>& v1)
+{
+    return Ang3_tpl<F1>(v0.x + v1.x, v0.y + v1.y, v0.z + v1.z);
+}
+//vector subtraction
+template<class F1, class F2>
+ILINE Ang3_tpl<F1> operator - (const Ang3_tpl<F1>& v0, const Ang3_tpl<F2>& v1)
+{
+    return Ang3_tpl<F1>(v0.x - v1.x, v0.y - v1.y, v0.z - v1.z);
+}
+
+//---------------------------------------
+
+//vector self-addition
+template<class F1, class F2>
+ILINE Ang3_tpl<F1>& operator += (Ang3_tpl<F1>& v0, const Ang3_tpl<F2>& v1)
+{
+    v0 = v0 + v1;
+    return v0;
+}
+//vector self-subtraction
+template<class F1, class F2>
+ILINE Ang3_tpl<F1>& operator -= (Ang3_tpl<F1>& v0, const Ang3_tpl<F2>& v1)
+{
+    v0 = v0 - v1;
+    return v0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// struct CAngleAxis
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+template <typename F>
+struct AngleAxis_tpl
+{
+    //! storage for the Angle&Axis coordinates.
+    F angle;
+    Vec3_tpl<F> axis;
+
+    // default quaternion constructor
+    AngleAxis_tpl(void) { };
+    AngleAxis_tpl(F a, F ax, F ay, F az) {  angle = a; axis.x = ax; axis.y = ay; axis.z = az; }
+    AngleAxis_tpl(F a, const Vec3_tpl<F>& n) { angle = a; axis = n; }
+    void operator () (F a, const Vec3_tpl<F>& n) {  angle = a; axis = n; }
+    AngleAxis_tpl(const AngleAxis_tpl<F>& aa);   //CAngleAxis aa=angleaxis
+    const Vec3_tpl<F> operator * (const Vec3_tpl<F>& v) const;
+
+    AngleAxis_tpl(const Quat_tpl<F>& q)
+    {
+        angle = acos_tpl(q.w) * 2;
+        axis    = q.v;
+        axis.Normalize();
+        F s = sin_tpl(angle * (F)0.5);
+        if (s == 0)
+        {
+            angle = 0;
+            axis.x = 0;
+            axis.y = 0;
+            axis.z = 1;
+        }
+    }
+};
+
+typedef AngleAxis_tpl<f32> AngleAxis;
+typedef AngleAxis_tpl<f64> AngleAxis_f64;
+
+template<typename F>
+ILINE const Vec3_tpl<F> AngleAxis_tpl<F>::operator * (const Vec3_tpl<F>& v) const
+{
+    Vec3_tpl<F> origin  = axis * (axis | v);
+    return origin +  (v - origin) * cos_tpl(angle)  +  (axis % v) * sin_tpl(angle);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//////////////////////////////////////////////////////////////////////
+template<typename F>
+struct Plane_tpl
+{
+    //plane-equation: n.x*x + n.y*y + n.z*z + d > 0 is in front of the plane
+    Vec3_tpl<F> n;  //!< normal
+    F   d;                      //!< distance
+
+    //----------------------------------------------------------------
+
+#if defined(_DEBUG)
+    ILINE Plane_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&n.x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+            p[3] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&n.x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+            p[3] = F64NAN;
+        }
+    }
+#else
+    ILINE Plane_tpl()   {};
+#endif
+
+
+    ILINE Plane_tpl(const Plane_tpl<F>& p) {  n = p.n; d = p.d; }
+    ILINE Plane_tpl(const Vec3_tpl<F>& normal, const F& distance) {  n = normal; d = distance; }
+
+    //! set normal and dist for this plane and  then calculate plane type
+    ILINE void Set(const Vec3_tpl<F>& vNormal, const F fDist)
+    {
+        n = vNormal;
+        d = fDist;
+    }
+
+    ILINE void SetPlane(const Vec3_tpl<F>& normal, const Vec3_tpl<F>& point)
+    {
+        n = normal;
+        d = -(point | normal);
+    }
+    ILINE static Plane_tpl<F> CreatePlane(const Vec3_tpl<F>& normal, const Vec3_tpl<F>& point)
+    {
+        return Plane_tpl<F>(normal, -(point | normal));
+    }
+
+    ILINE Plane_tpl<F> operator - (void) const { return Plane_tpl<F>(-n, -d); }
+
+    /*!
+    * Constructs the plane by tree given Vec3s (=triangle) with a right-hand (anti-clockwise) winding
+    *
+    * Example 1:
+    *  Vec3 v0(1,2,3),v1(4,5,6),v2(6,5,6);
+    *  Plane_tpl<F>  plane;
+    *  plane.SetPlane(v0,v1,v2);
+    *
+    * Example 2:
+    *  Vec3 v0(1,2,3),v1(4,5,6),v2(6,5,6);
+    *  Plane_tpl<F>  plane=Plane_tpl<F>::CreatePlane(v0,v1,v2);
+    */
+    ILINE void SetPlane(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2)
+    {
+        n = ((v1 - v0) % (v2 - v0)).GetNormalized();  //vector cross-product
+        d   =   -(n | v0);              //calculate d-value
+    }
+    ILINE static Plane_tpl<F> CreatePlane(const Vec3_tpl<F>& v0, const Vec3_tpl<F>& v1, const Vec3_tpl<F>& v2)
+    {
+        Plane_tpl<F> p;
+        p.SetPlane(v0, v1, v2);
+        return p;
+    }
+
+    /*!
+    * Computes signed distance from point to plane.
+    * This is the standard plane-equation: d=Ax*By*Cz+D.
+    * The normal-vector is assumed to be normalized.
+    *
+    * Example:
+    *  Vec3 v(1,2,3);
+    *  Plane_tpl<F>  plane=CalculatePlane(v0,v1,v2);
+    *  f32 distance = plane|v;
+    */
+    ILINE F operator | (const Vec3_tpl<F>& point) const { return (n | point) + d; }
+    ILINE F DistFromPlane(const Vec3_tpl<F>& vPoint) const  {   return (n * vPoint + d); }
+
+    ILINE Plane_tpl<F> operator - (const Plane_tpl<F>& p) const { return Plane_tpl<F>(n - p.n, d - p.d); }
+    ILINE Plane_tpl<F> operator + (const Plane_tpl<F>& p) const { return Plane_tpl<F>(n + p.n, d + p.d); }
+    ILINE void operator -= (const Plane_tpl<F>& p) { d -= p.d; n -= p.n; }
+    ILINE Plane_tpl<F> operator * (F s) const {   return Plane_tpl<F>(n * s, d * s);   }
+    ILINE Plane_tpl<F> operator / (F s) const {   return Plane_tpl<F>(n / s, d / s); }
+
+    //! check for equality between two planes
+    friend  bool operator ==(const Plane_tpl<F>& p1, const Plane_tpl<F>& p2)
+    {
+        if (fabsf(p1.n.x - p2.n.x) > 0.0001f)
+        {
+            return (false);
+        }
+        if (fabsf(p1.n.y - p2.n.y) > 0.0001f)
+        {
+            return (false);
+        }
+        if (fabsf(p1.n.z - p2.n.z) > 0.0001f)
+        {
+            return (false);
+        }
+        if (fabsf(p1.d - p2.d) < 0.01f)
+        {
+            return(true);
+        }
+        return (false);
+    }
+
+    Vec3_tpl<F> MirrorVector(const Vec3_tpl<F>& i)   {  return n * (2 * (n | i)) - i;  }
+    Vec3_tpl<F> MirrorPosition(const Vec3_tpl<F>& i) {  return i - n * (2 * ((n | i) + d)); }
+
+    ILINE bool IsValid() const { return !n.IsZeroFast(); } //A plane with a zero normal isn't valid.
+
+    AUTO_STRUCT_INFO
+};
+
+typedef Plane_tpl<f32>  Plane; //always 32 bit
+typedef Plane_tpl<f64>  Planed;//always 64 bit
+typedef Plane_tpl<real> Planer;//variable float precision. depending on the target system it can be between 32, 64 or 80 bit
+
+
+// declare common constants.  Must be done after the class for compiler conformance
+// (msvc and clang handle instantiation differently)
+const Vec3_tpl<float> Vec3_Zero(0, 0, 0);
+const Vec3_tpl<float> Vec3_OneX(1, 0, 0);
+const Vec3_tpl<float> Vec3_OneY(0, 1, 0);
+const Vec3_tpl<float> Vec3_OneZ(0, 0, 1);
+const Vec3_tpl<float> Vec3_One(1, 1, 1);
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(Vec3, "{DFA993FB-4E92-4A13-BDB3-4E9285A5346F}");
+}
+#endif // CRYINCLUDE_CRYCOMMON_CRY_VECTOR3_H
diff --git a/Code/Legacy/CryCommon/Cry_Vector4.h b/Code/Legacy/CryCommon/Cry_Vector4.h
new file mode 100644
index 0000000000..bc5b8bdcde
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_Vector4.h
@@ -0,0 +1,279 @@
+/*
+ * 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 vector class
+
+
+#pragma once
+
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+// class Vec4_tpl
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename F>
+struct Vec4_tpl
+{
+    typedef F value_type;
+    enum
+    {
+        component_count = 4
+    };
+
+    F x, y, z, w;
+
+#if defined(_DEBUG)
+    ILINE Vec4_tpl()
+    {
+        if constexpr (sizeof(F) == 4)
+        {
+            uint32* p = alias_cast<uint32*>(&x);
+            p[0] = F32NAN;
+            p[1] = F32NAN;
+            p[2] = F32NAN;
+            p[3] = F32NAN;
+        }
+        if constexpr (sizeof(F) == 8)
+        {
+            uint64* p = alias_cast<uint64*>(&x);
+            p[0] = F64NAN;
+            p[1] = F64NAN;
+            p[2] = F64NAN;
+            p[3] = F64NAN;
+        }
+    }
+#else
+    ILINE Vec4_tpl() {}
+#endif
+
+    template<typename F2>
+    ILINE Vec4_tpl<F>& operator = (const Vec4_tpl<F2>& v1)
+    {
+        x = F(v1.x);
+        y = F(v1.y);
+        z = F(v1.z);
+        w = F(v1.w);
+        return (*this);
+    }
+
+    ILINE Vec4_tpl(F vx, F vy, F vz, F vw) { x = vx; y = vy; z = vz; w = vw; }
+    ILINE Vec4_tpl(const Vec3_tpl<F>& v, F vw) {  x = v.x; y = v.y; z = v.z; w = vw; }
+    explicit ILINE Vec4_tpl(F m) { x = y = z = w = m; }
+    ILINE Vec4_tpl(type_zero) { x = y = z = w = F(0); }
+
+    ILINE void operator () (F vx, F vy, F vz, F vw) { x = vx; y = vy; z = vz; w = vw; }
+    ILINE void operator () (const Vec3_tpl<F>& v, F vw) {  x = v.x; y = v.y; z = v.z; w = vw; }
+
+    ILINE F& operator [] (int index)          { assert(index >= 0 && index <= 3);  return ((F*)this)[index]; }
+    ILINE F operator [] (int index) const { assert(index >= 0 && index <= 3);  return ((F*)this)[index]; }
+    template <class T>
+    ILINE  Vec4_tpl(const Vec4_tpl<T>& v)
+        : x((F)v.x)
+        , y((F)v.y)
+        , z((F)v.z)
+        , w((F)v.w) { assert(this->IsValid()); }
+
+    ILINE Vec4_tpl& zero() { x = y = z = w = 0; return *this; }
+
+    ILINE bool IsEquivalent(const Vec4_tpl<F>& v1, F epsilon = VEC_EPSILON) const
+    {
+        assert(v1.IsValid());
+        assert(this->IsValid());
+        return  ((fabs_tpl(x - v1.x) <= epsilon) &&   (fabs_tpl(y - v1.y) <= epsilon) && (fabs_tpl(z - v1.z) <= epsilon) && (fabs_tpl(w - v1.w) <= epsilon));
+    }
+
+
+    ILINE Vec4_tpl& operator=(const Vec4_tpl& src)
+    {
+        x = src.x;
+        y = src.y;
+        z = src.z;
+        w = src.w;
+        return *this;
+    }
+
+    ILINE Vec4_tpl<F> operator * (F k) const
+    {
+        return Vec4_tpl<F>(x * k, y * k, z * k, w * k);
+    }
+    ILINE Vec4_tpl<F> operator / (F k) const
+    {
+        k = (F)1.0 / k;
+        return Vec4_tpl<F>(x * k, y * k, z * k, w * k);
+    }
+
+    ILINE Vec4_tpl<F>& operator *= (F k)
+    {
+        x *= k;
+        y *= k;
+        z *= k;
+        w *= k;
+        return *this;
+    }
+    ILINE Vec4_tpl<F>& operator /= (F k)
+    {
+        k = (F)1.0 / k;
+        x *= k;
+        y *= k;
+        z *= k;
+        w *= k;
+        return *this;
+    }
+
+    ILINE void operator += (const Vec4_tpl<F>& v)
+    {
+        x += v.x;
+        y += v.y;
+        z += v.z;
+        w += v.w;
+    }
+
+    ILINE void operator -= (const Vec4_tpl<F>& v)
+    {
+        x -= v.x;
+        y -= v.y;
+        z -= v.z;
+        w -= v.w;
+    }
+
+
+    ILINE F Dot (const Vec4_tpl<F>& vec2)   const
+    {
+        return x * vec2.x + y * vec2.y + z * vec2.z + w * vec2.w;
+    }
+
+    ILINE F GetLength() const
+    {
+        return sqrt_tpl(Dot(*this));
+    }
+
+    ILINE F GetLengthSquared() const
+    {
+        return Dot(*this);
+    }
+
+
+    bool IsValid() const
+    {
+        if (!NumberValid(x))
+        {
+            return false;
+        }
+        if (!NumberValid(y))
+        {
+            return false;
+        }
+        if (!NumberValid(z))
+        {
+            return false;
+        }
+        if (!NumberValid(w))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    /*!
+    * functions and operators to compare vector
+    *
+    * Example:
+    *  if (v0==v1) dosomething;
+    */
+    ILINE bool operator==(const Vec4_tpl<F>& vec)
+    {
+        return x == vec.x && y == vec.y && z == vec.z && w == vec.w;
+    }
+    ILINE bool operator!=(const Vec4_tpl<F>& vec) { return !(*this == vec); }
+
+    ILINE friend bool operator ==(const Vec4_tpl<F>& v0, const Vec4_tpl<F>& v1)
+    {
+        return ((v0.x == v1.x) && (v0.y == v1.y) && (v0.z == v1.z) && (v0.w == v1.w));
+    }
+    ILINE friend bool operator !=(const Vec4_tpl<F>& v0, const Vec4_tpl<F>& v1) {   return !(v0 == v1);   }
+
+    //! normalize the vector
+    // The default Normalize function is in fact "safe". 0 vectors remain unchanged.
+    ILINE void  Normalize()
+    {
+        assert(this->IsValid());
+        F fInvLen = isqrt_safe_tpl(x * x + y * y + z * z + w * w);
+        x *= fInvLen;
+        y *= fInvLen;
+        z *= fInvLen;
+        w *= fInvLen;
+    }
+
+    //! may be faster and less accurate
+    ILINE void NormalizeFast()
+    {
+        assert(this->IsValid());
+        F fInvLen = isqrt_fast_tpl(x * x + y * y + z * z + w * w);
+        x *= fInvLen;
+        y *= fInvLen;
+        z *= fInvLen;
+        w *= fInvLen;
+    }
+
+    ILINE void SetLerp(const Vec4_tpl<F>& p, const Vec4_tpl<F>& q, F t) { *this = p * (1.0f - t) + q * t; }
+    ILINE static Vec4_tpl<F> CreateLerp(const Vec4_tpl<F>& p, const Vec4_tpl<F>& q, F t) {    return p * (1.0f - t) + q * t; }
+
+    AUTO_STRUCT_INFO
+};
+
+
+typedef Vec4_tpl<f32>    Vec4;  // always 32 bit
+typedef Vec4_tpl<f64>    Vec4d; // always 64 bit
+typedef Vec4_tpl<int32>  Vec4i;
+typedef Vec4_tpl<uint32> Vec4ui;
+typedef Vec4_tpl<real> Vec4r; // variable float precision. depending on the target system it can be 32, 64 or 80 bit
+
+#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE)
+typedef Vec4_tpl<f32> Vec4A;
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(Cry_Vector4_h)
+#endif
+
+//vector self-addition
+template<class F1, class F2>
+ILINE Vec4_tpl<F1>& operator += (Vec4_tpl<F1>& v0, const Vec4_tpl<F2>& v1)
+{
+    v0 = v0 + v1;
+    return v0;
+}
+
+//vector addition
+template<class F1, class F2>
+ILINE Vec4_tpl<F1> operator + (const Vec4_tpl<F1>& v0, const Vec4_tpl<F2>& v1)
+{
+    return Vec4_tpl<F1>(v0.x + v1.x, v0.y + v1.y, v0.z + v1.z, v0.w + v1.w);
+}
+//vector subtraction
+template<class F1, class F2>
+ILINE Vec4_tpl<F1> operator - (const Vec4_tpl<F1>& v0, const Vec4_tpl<F2>& v1)
+{
+    return Vec4_tpl<F1>(v0.x - v1.x, v0.y - v1.y, v0.z - v1.z, v0.w - v1.w);
+}
+
+//vector multiplication
+template<class F1, class F2>
+ILINE Vec4_tpl<F1> operator * (const Vec4_tpl<F1> v0, const Vec4_tpl<F2>& v1)
+{
+    return Vec4_tpl<F1>(v0.x * v1.x, v0.y * v1.y, v0.z * v1.z, v0.w * v1.w);
+}
+
+//vector division
+template<class F1, class F2>
+ILINE Vec4_tpl<F1> operator / (const Vec4_tpl<F1>& v0, const Vec4_tpl<F2>& v1)
+{
+    return Vec4_tpl<F1>(v0.x / v1.x, v0.y / v1.y, v0.z / v1.z, v0.w / v1.w);
+}
diff --git a/Code/Legacy/CryCommon/Cry_XOptimise.h b/Code/Legacy/CryCommon/Cry_XOptimise.h
new file mode 100644
index 0000000000..7a68545fa6
--- /dev/null
+++ b/Code/Legacy/CryCommon/Cry_XOptimise.h
@@ -0,0 +1,565 @@
+/*
+ * 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 : Misc mathematical functions
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_CRY_XOPTIMISE_H
+#define CRYINCLUDE_CRYCOMMON_CRY_XOPTIMISE_H
+#pragma once
+
+#include <platform.h>
+
+
+
+
+inline float AngleMod(float a)
+{
+    a = (float)((360.0 / 65536) * ((int)(a * (65536 / 360.0)) & 65535));
+    return a;
+}
+
+inline float AngleModRad(float a)
+{
+    a = (float)((gf_PI2 / 65536) * ((int)(a * (65536 / gf_PI2)) & 65535));
+    return a;
+}
+inline unsigned short Degr2Word(float f)
+{
+    return (unsigned short)(AngleMod(f) / 360.0f * 65536.0f);
+}
+inline float Word2Degr(unsigned short s)
+{
+    return (float)s / 65536.0f * 360.0f;
+}
+
+#if defined(_CPU_X86)
+ILINE float __fastcall Ffabs(float f)
+{
+    *((unsigned*) &f) &= ~0x80000000;
+    return (f);
+}
+#else
+inline float Ffabs(float x) { return fabsf(x); }
+#endif
+
+
+
+#define mathMatrixRotationZ(pOut, angle) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateRotationZ(angle)))
+#define mathMatrixRotationY(pOut, angle) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateRotationY(angle)))
+#define mathMatrixRotationX(pOut, angle) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateRotationX(angle)))
+#define mathMatrixTranslation(pOut, x, y, z) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateTranslationMat(Vec3(x, y, z))))
+#define mathMatrixScaling(pOut, sx, sy, sz) (*(Matrix44*)pOut) = GetTransposed44(Matrix44(Matrix34::CreateScale(Vec3(sx, sy, sz))))
+
+template <class T>
+inline void ExchangeVals(T& X, T& Y)
+{
+    const T Tmp = X;
+    X = Y;
+    Y = Tmp;
+}
+
+
+inline void mathMatrixPerspectiveFov(Matrix44A* pMatr, f32 fovY, f32 Aspect, f32 zn, f32 zf)
+{
+    f32 yScale = 1.0f / tan_tpl(fovY / 2.0f);
+    f32 xScale = yScale / Aspect;
+
+    f32 m22 = f32(f64(zf) / (f64(zn) - f64(zf)));
+    f32 m32 = f32(f64(zn) * f64(zf) / (f64(zn) - f64(zf)));
+
+    (*pMatr)(0, 0) = xScale;
+    (*pMatr)(0, 1) = 0;
+    (*pMatr)(0, 2) = 0;
+    (*pMatr)(0, 3) = 0;
+    (*pMatr)(1, 0) = 0;
+    (*pMatr)(1, 1) = yScale;
+    (*pMatr)(1, 2) = 0;
+    (*pMatr)(1, 3) = 0;
+    (*pMatr)(2, 0) = 0;
+    (*pMatr)(2, 1) = 0;
+    (*pMatr)(2, 2) = m22;
+    (*pMatr)(2, 3) = -1.0f;
+    (*pMatr)(3, 0) = 0;
+    (*pMatr)(3, 1) = 0;
+    (*pMatr)(3, 2) = m32;
+    (*pMatr)(3, 3) = 0;
+}
+
+
+
+inline void mathMatrixOrtho(Matrix44A* pMatr, f32 w, f32 h, f32 zn, f32 zf)
+{
+    f32 m22 = f32(1.0 / (f64(zn) - f64(zf)));
+    f32 m32 = f32(f64(zn) / (f64(zn) - f64(zf)));
+
+    (*pMatr)(0, 0) = 2.0f / w;
+    (*pMatr)(0, 1) = 0;
+    (*pMatr)(0, 2) = 0;
+    (*pMatr)(0, 3) = 0;
+    (*pMatr)(1, 0) =     0;
+    (*pMatr)(1, 1) = 2.0f / h;
+    (*pMatr)(1, 2) = 0;
+    (*pMatr)(1, 3) = 0;
+    (*pMatr)(2, 0) =     0;
+    (*pMatr)(2, 1) = 0;
+    (*pMatr)(2, 2) = m22;
+    (*pMatr)(2, 3) = 0;
+    (*pMatr)(3, 0) =     0;
+    (*pMatr)(3, 1) = 0;
+    (*pMatr)(3, 2) = m32;
+    (*pMatr)(3, 3) = 1;
+}
+
+inline void mathMatrixOrthoOffCenter(Matrix44A* pMatr, f32 l, f32 r, f32 b, f32 t, f32 zn, f32 zf)
+{
+    f32 m22 = f32(1.0 / (f64(zn) - f64(zf)));
+    f32 m32 = f32(f64(zn) / (f64(zn) - f64(zf)));
+
+    (*pMatr)(0, 0) = 2.0f / (r - l);
+    (*pMatr)(0, 1) = 0;
+    (*pMatr)(0, 2) = 0;
+    (*pMatr)(0, 3) = 0;
+    (*pMatr)(1, 0) =     0;
+    (*pMatr)(1, 1) = 2.0f / (t - b);
+    (*pMatr)(1, 2) = 0;
+    (*pMatr)(1, 3) = 0;
+    (*pMatr)(2, 0) =     0;
+    (*pMatr)(2, 1) =  0;
+    (*pMatr)(2, 2) = m22;
+    (*pMatr)(2, 3) = 0;
+    (*pMatr)(3, 0) = (l + r) / (l - r);
+    (*pMatr)(3, 1) = (t + b) / (b - t);
+    (*pMatr)(3, 2) = m32;
+    (*pMatr)(3, 3) = 1.0f;
+}
+
+
+inline void mathMatrixOrthoOffCenterLH(Matrix44A* pMatr, f32 l, f32 r, f32 b, f32 t, f32 zn, f32 zf)
+{
+    f32 m22 = f32(1.0 / (f64(zf) - f64(zn)));
+    f32 m32 = f32(f64(zn) / (f64(zn) - f64(zf)));
+
+    (*pMatr)(0, 0) = 2.0f / (r - l);
+    (*pMatr)(0, 1) = 0;
+    (*pMatr)(0, 2) = 0;
+    (*pMatr)(0, 3) = 0;
+    (*pMatr)(1, 0) =     0;
+    (*pMatr)(1, 1) = 2.0f / (t - b);
+    (*pMatr)(1, 2) = 0;
+    (*pMatr)(1, 3) = 0;
+    (*pMatr)(2, 0) =     0;
+    (*pMatr)(2, 1) =  0;
+    (*pMatr)(2, 2) = m22;
+    (*pMatr)(2, 3) = 0;
+    (*pMatr)(3, 0) = (l + r) / (l - r);
+    (*pMatr)(3, 1) = (t + b) / (b - t);
+    (*pMatr)(3, 2) = m32;
+    (*pMatr)(3, 3) = 1.0f;
+}
+
+
+inline void mathMatrixPerspectiveOffCenter(Matrix44A* pMatr, f32 l, f32 r, f32 b, f32 t, f32 zn, f32 zf)
+{
+    f32 m22 = f32(f64(zf) / (f64(zn) - f64(zf)));
+    f32 m32 = f32(f64(zn) * f64(zf) / (f64(zn) - f64(zf)));
+
+    (*pMatr)(0, 0) = 2 * zn / (r - l);
+    (*pMatr)(0, 1) =  0;
+    (*pMatr)(0, 2) = 0;
+    (*pMatr)(0, 3) = 0;
+    (*pMatr)(1, 0) = 0;
+    (*pMatr)(1, 1) = 2 * zn / (t - b);
+    (*pMatr)(1, 2) = 0;
+    (*pMatr)(1, 3) = 0;
+    (*pMatr)(2, 0) = (l + r) / (r - l);
+    (*pMatr)(2, 1) = (t + b) / (t - b);
+    (*pMatr)(2, 2) =   m22;
+    (*pMatr)(2, 3) = -1;
+    (*pMatr)(3, 0) = 0;
+    (*pMatr)(3, 1) = 0;
+    (*pMatr)(3, 2) =   m32;
+    (*pMatr)(3, 3) = 0;
+}
+
+inline void mathMatrixPerspectiveOffCenterReverseDepth(Matrix44A* pMatr, f32 l, f32 r, f32 b, f32 t, f32 zn, f32 zf)
+{
+    f32 m22 = f32(-f64(zn) / (f64(zn) - f64(zf)));
+    f32 m32 = f32(-f64(zn) * f64(zf) / (f64(zn) - f64(zf)));
+
+    (*pMatr)(0, 0) = 2 * zn / (r - l);
+    (*pMatr)(0, 1) =  0;
+    (*pMatr)(0, 2) = 0;
+    (*pMatr)(0, 3) = 0;
+    (*pMatr)(1, 0) = 0;
+    (*pMatr)(1, 1) = 2 * zn / (t - b);
+    (*pMatr)(1, 2) = 0;
+    (*pMatr)(1, 3) = 0;
+    (*pMatr)(2, 0) = (l + r) / (r - l);
+    (*pMatr)(2, 1) = (t + b) / (t - b);
+    (*pMatr)(2, 2) =   m22;
+    (*pMatr)(2, 3) = -1;
+    (*pMatr)(3, 0) = 0;
+    (*pMatr)(3, 1) = 0;
+    (*pMatr)(3, 2) =   m32;
+    (*pMatr)(3, 3) = 0;
+}
+
+//RH
+inline void mathMatrixLookAt(Matrix44A* pMatr, const Vec3& Eye, const Vec3& At, const Vec3& Up)
+{
+    Vec3 vLightDir = (Eye - At);
+    Vec3 zaxis = vLightDir.GetNormalized();
+    Vec3 xaxis = (Up.Cross(zaxis)).GetNormalized();
+    Vec3 yaxis = zaxis.Cross(xaxis);
+
+    (*pMatr)(0, 0) = xaxis.x;
+    (*pMatr)(0, 1) = yaxis.x;
+    (*pMatr)(0, 2) = zaxis.x;
+    (*pMatr)(0, 3) = 0;
+    (*pMatr)(1, 0) = xaxis.y;
+    (*pMatr)(1, 1) = yaxis.y;
+    (*pMatr)(1, 2) = zaxis.y;
+    (*pMatr)(1, 3) = 0;
+    (*pMatr)(2, 0) = xaxis.z;
+    (*pMatr)(2, 1) = yaxis.z;
+    (*pMatr)(2, 2) = zaxis.z;
+    (*pMatr)(2, 3) = 0;
+    (*pMatr)(3, 0) = -xaxis.Dot(Eye);
+    (*pMatr)(3, 1) = -yaxis.Dot(Eye);
+    (*pMatr)(3, 2) = -zaxis.Dot(Eye);
+    (*pMatr)(3, 3) = 1;
+}
+
+inline bool mathMatrixPerspectiveFovInverse(Matrix44_tpl<f64>* pResult, const Matrix44A* pProjFov)
+{
+    if ((*pProjFov)(0, 1) == 0.0f && (*pProjFov)(0, 2) == 0.0f && (*pProjFov)(0, 3) == 0.0f &&
+        (*pProjFov)(1, 0) == 0.0f && (*pProjFov)(1, 2) == 0.0f && (*pProjFov)(1, 3) == 0.0f &&
+        (*pProjFov)(3, 0) == 0.0f && (*pProjFov)(3, 1) == 0.0f && (*pProjFov)(3, 2) != 0.0f)
+    {
+        (*pResult)(0, 0) = 1.0 / (*pProjFov).m00;
+        (*pResult)(0, 1) = 0;
+        (*pResult)(0, 2) = 0;
+        (*pResult)(0, 3) = 0;
+        (*pResult)(1, 0) = 0;
+        (*pResult)(1, 1) = 1.0 / (*pProjFov).m11;
+        (*pResult)(1, 2) = 0;
+        (*pResult)(1, 3) = 0;
+        (*pResult)(2, 0) = 0;
+        (*pResult)(2, 1) = 0;
+        (*pResult)(2, 2) = 0;
+        (*pResult)(2, 3) = 1.0 / (*pProjFov).m32;
+        (*pResult)(3, 0) = (*pProjFov).m20 / (*pProjFov).m00;
+        (*pResult)(3, 1) = (*pProjFov).m21 / (*pProjFov).m11;
+        (*pResult)(3, 2) = -1;
+        (*pResult)(3, 3) = (*pProjFov).m22 / (*pProjFov).m32;
+
+        return true;
+    }
+
+    return false;
+}
+
+template<class T_out, class T_in>
+inline void mathMatrixLookAtInverse(Matrix44_tpl<T_out>* pResult, const Matrix44_tpl<T_in>* pLookAt)
+{
+    (*pResult)(0, 0) = (*pLookAt).m00;
+    (*pResult)(0, 1) = (*pLookAt).m10;
+    (*pResult)(0, 2) = (*pLookAt).m20;
+    (*pResult)(0, 3) = (*pLookAt).m03;
+    (*pResult)(1, 0) = (*pLookAt).m01;
+    (*pResult)(1, 1) = (*pLookAt).m11;
+    (*pResult)(1, 2) = (*pLookAt).m21;
+    (*pResult)(1, 3) = (*pLookAt).m13;
+    (*pResult)(2, 0) = (*pLookAt).m02;
+    (*pResult)(2, 1) = (*pLookAt).m12;
+    (*pResult)(2, 2) = (*pLookAt).m22;
+    (*pResult)(2, 3) = (*pLookAt).m23;
+
+    (*pResult)(3, 0) = T_out(-(f64((*pLookAt).m00) * f64((*pLookAt).m30) + f64((*pLookAt).m01) * f64((*pLookAt).m31) + f64((*pLookAt).m02) * f64((*pLookAt).m32)));
+    (*pResult)(3, 1) = T_out(-(f64((*pLookAt).m10) * f64((*pLookAt).m30) + f64((*pLookAt).m11) * f64((*pLookAt).m31) + f64((*pLookAt).m12) * f64((*pLookAt).m32)));
+    (*pResult)(3, 2) = T_out(-(f64((*pLookAt).m20) * f64((*pLookAt).m30) + f64((*pLookAt).m21) * f64((*pLookAt).m31) + f64((*pLookAt).m22) * f64((*pLookAt).m32)));
+    (*pResult)(3, 3) = (*pLookAt).m33;
+};
+
+inline void mathVec4Transform(f32 out[4], const f32 m[16], const f32 in[4])
+{
+#define M(row, col)  m[col * 4 + row]
+    out[0] =    M(0, 0) * in[0] + M(0, 1) * in[1] + M(0, 2) * in[2] + M(0, 3) * in[3];
+    out[1] =    M(1, 0) * in[0] + M(1, 1) * in[1] + M(1, 2) * in[2] + M(1, 3) * in[3];
+    out[2] =    M(2, 0) * in[0] + M(2, 1) * in[1] + M(2, 2) * in[2] + M(2, 3) * in[3];
+    out[3] =    M(3, 0) * in[0] + M(3, 1) * in[1] + M(3, 2) * in[2] + M(3, 3) * in[3];
+#undef M
+}
+
+//fix: replace by 3x4 Matrix transformation and move to crymath
+inline void mathVec3Transform(f32 out[4], const f32 m[16], const f32 in[3])
+{
+#define M(row, col)  m[col * 4 + row]
+    out[0] =    M(0, 0) * in[0] + M(0, 1) * in[1] + M(0, 2) * in[2] + M(0, 3) * 1.0f;
+    out[1] =    M(1, 0) * in[0] + M(1, 1) * in[1] + M(1, 2) * in[2] + M(1, 3) * 1.0f;
+    out[2] =    M(2, 0) * in[0] + M(2, 1) * in[1] + M(2, 2) * in[2] + M(2, 3) * 1.0f;
+    out[3] =    M(3, 0) * in[0] + M(3, 1) * in[1] + M(3, 2) * in[2] + M(3, 3) * 1.0f;
+#undef M
+}
+
+#define mathVec3TransformF(pOut, pV, pM) mathVec3Transform((f32*)pOut, (const f32*)pM, (f32*)pV)
+#define mathVec4TransformF(pOut, pV, pM) mathVec4Transform((f32*)pOut, (const f32*)pM, (f32*)pV)
+#define mathVec3NormalizeF(pOut, pV) (*(Vec3*)pOut) = (((Vec3*)pV)->GetNormalizedSafe())
+#define mathVec2NormalizeF(pOut, pV) (*(Vec2*)pOut) = (((Vec2*)pV)->GetNormalizedSafe())
+
+
+//fix replace viewport by int16 array
+//fix for d3d viewport
+inline f32 mathVec3Project(Vec3* pvWin, const Vec3* pvObj, const int32 pViewport[4], const Matrix44A* pProjection, const Matrix44A* pView, const Matrix44A* pWorld)
+{
+    Vec4 in, out;
+
+    in.x = pvObj->x;
+    in.y = pvObj->y;
+    in.z = pvObj->z;
+    in.w = 1.0f;
+    mathVec4Transform((f32*)&out, (f32*)pWorld, (f32*)&in);
+    mathVec4Transform((f32*)&in, (f32*)pView, (f32*)&out);
+    mathVec4Transform((f32*)&out, (f32*)pProjection, (f32*)&in);
+
+    if (out.w == 0.0f)
+    {
+        return 0.f;
+    }
+
+    out.x /= out.w;
+    out.y /= out.w;
+    out.z /= out.w;
+
+    //output coords
+    pvWin->x = pViewport[0] + (1 + out.x) * pViewport[2] / 2;
+    pvWin->y = pViewport[1] + (1 - out.y) * pViewport[3] / 2;  //flip coords for y axis
+
+    //FIX: update fViewportMinZ fViewportMaxZ support for Viewport everywhere
+    float fViewportMinZ = 0, fViewportMaxZ = 1.0f;
+
+    pvWin->z = fViewportMinZ + out.z * (fViewportMaxZ - fViewportMinZ);
+
+    return out.w;
+}
+
+inline Vec3* mathVec3UnProject(Vec3* pvObj, const Vec3* pvWin, const int32 pViewport[4], const Matrix44A* pProjection, const Matrix44A* pView, const Matrix44A* pWorld, [[maybe_unused]] int32 OptFlags)
+{
+    Matrix44A m, mA;
+    Vec4 in, out;
+
+    //FIX: update fViewportMinZ fViewportMaxZ support for Viewport everywhere
+    float fViewportMinZ = 0, fViewportMaxZ = 1.0f;
+
+    in.x = (pvWin->x - pViewport[0]) * 2 / pViewport[2] - 1.0f;
+    in.y = 1.0f - ((pvWin->y - pViewport[1]) * 2 / pViewport[3]);   //flip coords for y axis
+    in.z = (pvWin->z - fViewportMinZ) / (fViewportMaxZ - fViewportMinZ);
+    in.w = 1.0f;
+
+    //prepare inverse projection matrix
+    mA = ((*pWorld) * (*pView)) * (*pProjection);
+    m = mA.GetInverted();
+
+    mathVec4Transform((f32*)&out, m.GetData(), (f32*)&in);
+    if (out.w == 0.0f)
+    {
+        return NULL;
+    }
+
+    pvObj->x = out.x / out.w;
+    pvObj->y = out.y / out.w;
+    pvObj->z = out.z / out.w;
+
+    return pvObj;
+}
+
+
+inline Vec3* mathVec3ProjectArray(Vec3* pOut, uint32 OutStride, const Vec3* pV,   uint32 VStride, const int32 pViewport[4],   const Matrix44A* pProjection,   const Matrix44A* pView, const Matrix44A* pWorld, uint32 n, int32)
+{
+    Matrix44A m;
+    Vec4 in, out;
+
+    int8* pOutT = (int8*)pOut;
+    int8* pInT = (int8*)pV;
+
+    Vec3* pvWin;
+    Vec3* pvObj;
+
+    //FIX: update fViewportMinZ fViewportMaxZ support for Viewport everywhere
+    float fViewportMinZ = 0, fViewportMaxZ = 1.0f;
+
+    m =  ((*pWorld) * (*pView)) * (*pProjection);
+
+    for (uint32 i = 0; i < n; i++)
+    {
+        pvObj = (Vec3*)pInT;
+        pvWin = (Vec3*)pOutT;
+
+        in.x = pvObj->x;
+        in.y = pvObj->y;
+        in.z = pvObj->z;
+        in.w = 1.0f;
+
+        mathVec4Transform((f32*)&out, m.GetData(), (f32*)&in);
+
+        if (out.w == 0.0f)
+        {
+            return NULL;
+        }
+
+        float fInvW = 1.0f / out.w;
+        out.x *= fInvW;
+        out.y *= fInvW;
+        out.z *= fInvW;
+
+        //output coords
+        pvWin->x = pViewport[0] + (1 + out.x) * pViewport[2] / 2;
+        pvWin->y = pViewport[1] + (1 - out.y) * pViewport[3] / 2;  //flip coords for y axis
+
+        pvWin->z = fViewportMinZ + out.z * (fViewportMaxZ - fViewportMinZ);
+
+        pOutT += OutStride;
+        pInT += VStride;
+    }
+
+    return pOut;
+}
+
+
+inline Vec3* mathVec3UnprojectArray(Vec3* pOut, uint32 OutStride, const Vec3* pV, uint32 VStride, const int32 pViewport[4], const Matrix44* pProjection, const Matrix44* pView, const Matrix44* pWorld, uint32 n, [[maybe_unused]]   int32 OptFlags)
+{
+    Vec4 in, out;
+    Matrix44 m, mA;
+
+    int8* pOutT = (int8*)pOut;
+    int8* pInT = (int8*)pV;
+
+    Vec3* pvWin;
+    Vec3* pvObj;
+
+    //FIX: update fViewportMinZ fViewportMaxZ support for Viewport everywhere
+    float fViewportMinZ = 0, fViewportMaxZ = 1.0f;
+
+    mA =  ((*pWorld) * (*pView)) * (*pProjection);
+    m = mA.GetInverted();
+
+    for (uint32 i = 0; i < n; i++)
+    {
+        pvWin = (Vec3*)pInT;
+        pvObj = (Vec3*)pOutT;
+
+        in.x = (pvWin->x - pViewport[0]) * 2 / pViewport[2] - 1.0f;
+        in.y = 1.0f - ((pvWin->y - pViewport[1]) * 2 / pViewport[3]);   //flip coords for y axis
+        in.z = (pvWin->z - fViewportMinZ) / (fViewportMaxZ - fViewportMinZ);
+        in.w = 1.0f;
+
+        mathVec4Transform((f32*)&out, m.GetData(), (f32*)&in);
+
+        assert(out.w != 0.0f);
+
+        if (out.w == 0.0f)
+        {
+            return NULL;
+        }
+
+        pvObj->x = out.x / out.w;
+        pvObj->y = out.y / out.w;
+        pvObj->z = out.z / out.w;
+
+        pOutT += OutStride;
+        pInT += VStride;
+    }
+
+    return pOut;
+}
+
+
+
+
+/*****************************************************
+MISC FUNCTIONS
+*****************************************************/
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(_CPU_X86)
+inline int fastftol_positive(float f)
+{
+    int i;
+
+    f -= 0.5f;
+#if defined(_MSC_VER)
+    __asm fld [f]
+    __asm fistp [i]
+#elif defined(__GNUC__)
+    __asm__ ("fld %[f]\n fistpl %[i]" : [i] "+m" (i) : [f] "m" (f));
+#else
+#error
+#endif
+    return i;
+}
+#else
+inline int fastftol_positive (float f)
+{
+    assert(f >= 0.f);
+    return (int)floorf(f);
+}
+#endif
+
+
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(_CPU_X86)
+inline int fastround_positive(float f)
+{
+    int i;
+    assert(f >= 0.f);
+#if defined(_MSC_VER)
+    __asm fld [f]
+    __asm fistp [i]
+#elif defined(__GNUC__)
+    __asm__ ("fld %[f]\n fistpl %[i]" : [i] "+m" (i) : [f] "m" (f));
+#else
+#error
+#endif
+    return i;
+}
+#else
+inline int fastround_positive(float f)
+{
+    assert(f >= 0.f);
+    return (int) (f + 0.5f);
+}
+#endif
+
+
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(_CPU_X86)
+ILINE int __fastcall FtoI(float  x)
+{
+    int    t;
+#if defined(_MSC_VER)
+    __asm
+    {
+        fld   x
+        fistp t
+    }
+#elif defined(__GNUC__)
+    __asm__ ("fld %[x]\n fistpl %[t]" : [t] "+m" (t) : [x] "m" (x));
+#else
+#error
+#endif
+    return t;
+}
+#else
+inline int FtoI(float x) { return (int)x; }
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_CRY_XOPTIMISE_H
+
diff --git a/Code/Legacy/CryCommon/FrameProfiler.h b/Code/Legacy/CryCommon/FrameProfiler.h
new file mode 100644
index 0000000000..01e6690777
--- /dev/null
+++ b/Code/Legacy/CryCommon/FrameProfiler.h
@@ -0,0 +1,73 @@
+/*
+ * 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/Profiler.h>
+
+#define SUBSYSTEM_DEFINES \
+    X(PROFILE_ANY,          "Any")          \
+    X(PROFILE_RENDERER,     "Renderer")     \
+    X(PROFILE_3DENGINE,     "3DEngine")     \
+    X(PROFILE_PARTICLE,     "Particle")     \
+    X(PROFILE_AI,           "AI")           \
+    X(PROFILE_ANIMATION,    "Animation")    \
+    X(PROFILE_MOVIE,        "Movie")        \
+    X(PROFILE_ENTITY,       "Entity")       \
+    X(PROFILE_UI,           "UI")           \
+    X(PROFILE_NETWORK,      "Network")      \
+    X(PROFILE_PHYSICS,      "Physics")      \
+    X(PROFILE_SCRIPT,       "Script")       \
+    X(PROFILE_SCRIPT_CFUNC, "Script C Functions")  \
+    X(PROFILE_AUDIO,        "Audio")        \
+    X(PROFILE_EDITOR,       "Editor")       \
+    X(PROFILE_SYSTEM,       "System")       \
+    X(PROFILE_ACTION,       "Action")       \
+    X(PROFILE_GAME,         "Game")         \
+    X(PROFILE_INPUT,        "Input")        \
+    X(PROFILE_SYNC,         "Sync")         \
+    X(PROFILE_NETWORK_TRAFFIC, "Network Traffic") \
+    X(PROFILE_DEVICE,       "Device")
+
+#define X(Subsystem, SubsystemName) Subsystem,
+enum EProfiledSubsystem
+{
+    SUBSYSTEM_DEFINES
+    PROFILE_LAST_SUBSYSTEM
+};
+#undef X
+
+static_assert(static_cast<AZ::Debug::ProfileCategory>(PROFILE_LAST_SUBSYSTEM) == AZ::Debug::ProfileCategory::LegacyLast, "Mismatched AZ and Legacy profile categories");
+#include <AzCore/Debug/EventTrace.h>
+
+
+
+#define FUNCTION_PROFILER_LEGACYONLY(pISystem, subsystem)
+
+#define FUNCTION_PROFILER(pISystem, subsystem) \
+    AZ_PROFILE_FUNCTION(static_cast<AZ::Debug::ProfileCategory>(subsystem));
+
+#define FUNCTION_PROFILER_FAST(pISystem, subsystem, bProfileEnabled) \
+    AZ_PROFILE_FUNCTION(static_cast<AZ::Debug::ProfileCategory>(subsystem));
+
+#define FUNCTION_PROFILER_ALWAYS(pISystem, subsystem) \
+    AZ_PROFILE_FUNCTION(static_cast<AZ::Debug::ProfileCategory>(subsystem));
+
+#define FRAME_PROFILER_LEGACYONLY(szProfilerName, pISystem, subsystem)
+
+#define FRAME_PROFILER(szProfilerName, pISystem, subsystem) \
+    AZ_PROFILE_SCOPE(static_cast<AZ::Debug::ProfileCategory>(subsystem), szProfilerName);
+
+#define FRAME_PROFILER_FAST(szProfilerName, pISystem, subsystem, bProfileEnabled) \
+    AZ_PROFILE_SCOPE(static_cast<AZ::Debug::ProfileCategory>(subsystem), szProfilerName);
+
+#define FUNCTION_PROFILER_SYS(subsystem) \
+    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_##subsystem)
+
+#define STALL_PROFILER(cause)
+
diff --git a/Code/Legacy/CryCommon/FunctorBaseFunction.h b/Code/Legacy/CryCommon/FunctorBaseFunction.h
new file mode 100644
index 0000000000..11a6858610
--- /dev/null
+++ b/Code/Legacy/CryCommon/FunctorBaseFunction.h
@@ -0,0 +1,92 @@
+/*
+ * 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 : Implementation of the common function template specializations.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_FUNCTORBASEFUNCTION_H
+#define CRYINCLUDE_CRYCOMMON_FUNCTORBASEFUNCTION_H
+#pragma once
+
+
+#include "IFunctorBase.h"
+
+//////////////////////////////////////////////////////////////////////////
+// Return type void
+// No arguments.
+template<>
+class TFunctor<void (*)()>
+    : public IFunctorBase
+{
+public:
+    typedef void (* TFunctionType)();
+
+    TFunctor(TFunctionType pFunction)
+        : m_pfnFunction(pFunction){}
+
+    virtual void Call()
+    {
+        m_pfnFunction();
+    }
+private:
+    TFunctionType                   m_pfnFunction;
+};
+//////////////////////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////
+// Return type void
+// 1 argument.
+template<typename tArgument1>
+class TFunctor<void (*)(tArgument1)>
+    : public IFunctorBase
+{
+public:
+    typedef void (* TFunctionType)(tArgument1);
+
+    TFunctor(TFunctionType pFunction, tArgument1 Argument1)
+        : m_pfnFunction(pFunction)
+        , m_tArgument1(Argument1){}
+
+    virtual void Call()
+    {
+        m_pfnFunction(m_tArgument1);
+    }
+private:
+    TFunctionType                   m_pfnFunction;
+    tArgument1                      m_tArgument1;
+};
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Return type void
+// 2 arguments.
+template<typename tArgument1, typename tArgument2>
+class TFunctor<void (*)(tArgument1, tArgument2)>
+    : public IFunctorBase
+{
+public:
+    typedef void (* TFunctionType)(tArgument1, tArgument2);
+
+    TFunctor(TFunctionType pFunction, const tArgument1& Argument1, const tArgument2& Argument2)
+        : m_pfnFunction(pFunction)
+        , m_tArgument1(Argument1)
+        , m_tArgument2(Argument2){}
+
+    virtual void Call()
+    {
+        m_pfnFunction(m_tArgument1, m_tArgument2);
+    }
+private:
+    TFunctionType                       m_pfnFunction;
+    tArgument1                          m_tArgument1;
+    tArgument2                          m_tArgument2;
+};
+//////////////////////////////////////////////////////////////////////////
+
+#endif // CRYINCLUDE_CRYCOMMON_FUNCTORBASEFUNCTION_H
diff --git a/Code/Legacy/CryCommon/FunctorBaseMember.h b/Code/Legacy/CryCommon/FunctorBaseMember.h
new file mode 100644
index 0000000000..364f168534
--- /dev/null
+++ b/Code/Legacy/CryCommon/FunctorBaseMember.h
@@ -0,0 +1,96 @@
+/*
+ * 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 : Implementation of the member function template specializations.
+
+#ifndef CRYINCLUDE_CRYCOMMON_FUNCTORBASEMEMBER_H
+#define CRYINCLUDE_CRYCOMMON_FUNCTORBASEMEMBER_H
+#pragma once
+
+
+#include "IFunctorBase.h"
+
+//////////////////////////////////////////////////////////////////////////
+// Return type void
+// No Arguments
+template<typename tCalleeType>
+class TFunctor<void (tCalleeType::*)()>
+    : public IFunctorBase
+{
+public:
+    typedef void (tCalleeType::* TMemberFunctionType)();
+
+    TFunctor(tCalleeType* pCallee, TMemberFunctionType pMemberFunction)
+        : m_pCalee(pCallee)
+        , m_pfnMemberFunction(pMemberFunction){}
+
+    virtual void Call()
+    {
+        (m_pCalee->*m_pfnMemberFunction)();
+    }
+private:
+    tCalleeType*                        m_pCalee;
+    TMemberFunctionType         m_pfnMemberFunction;
+};
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Return type void
+// 1 argument.
+template<typename tCalleeType, typename tArgument1>
+class TFunctor<void (tCalleeType::*)(tArgument1)>
+    : public IFunctorBase
+{
+public:
+    typedef void (tCalleeType::* TMemberFunctionType)(tArgument1);
+
+    TFunctor(tCalleeType* pCallee, TMemberFunctionType pMemberFunction, const tArgument1& Argument1)
+        : m_pCalee(pCallee)
+        , m_pfnMemberFunction(pMemberFunction)
+        , m_tArgument1(Argument1){}
+
+    virtual void Call()
+    {
+        (m_pCalee->*m_pfnMemberFunction)(m_tArgument1);
+    }
+private:
+    tCalleeType*                                    m_pCalee;
+    TMemberFunctionType                     m_pfnMemberFunction;
+    tArgument1                                      m_tArgument1;
+};
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Return type void
+// 2 arguments.
+template<typename tCalleeType, typename tArgument1, typename tArgument2>
+class TFunctor<void (tCalleeType::*)(tArgument1, tArgument2)>
+    : public IFunctorBase
+{
+public:
+    typedef void (tCalleeType::* TMemberFunctionType)(tArgument1, tArgument2);
+
+    TFunctor(tCalleeType* pCallee, TMemberFunctionType pMemberFunction, const tArgument1& Argument1, const tArgument2& Argument2)
+        : m_pCalee(pCallee)
+        , m_pfnMemberFunction(pMemberFunction)
+        , m_tArgument1(Argument1)
+        , m_tArgument2(Argument2){}
+
+    virtual void Call()
+    {
+        (m_pCalee->*m_pfnMemberFunction)(m_tArgument1, m_tArgument2);
+    }
+private:
+    tCalleeType*                                    m_pCalee;
+    TMemberFunctionType                     m_pfnMemberFunction;
+    tArgument1                                      m_tArgument1;
+    tArgument2                                      m_tArgument2;
+};
+//////////////////////////////////////////////////////////////////////////
+
+#endif // CRYINCLUDE_CRYCOMMON_FUNCTORBASEMEMBER_H
diff --git a/Code/Legacy/CryCommon/HMDBus.h b/Code/Legacy/CryCommon/HMDBus.h
new file mode 100644
index 0000000000..092d96ba9e
--- /dev/null
+++ b/Code/Legacy/CryCommon/HMDBus.h
@@ -0,0 +1,295 @@
+/*
+ * 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 <IStereoRenderer.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;
+            };
+
+            ///
+            /// Get per-eye camera info from the device. The specific info to get is defined in the EyeCameraInfo struct. This function can be used to setup
+            /// rendering cameras per-eye. Note that each eye may have different projection matrix information.
+            ///
+            /// @param eye The specific eye to get camera data for.
+            /// @param nearPlane Near distance for the main render camera.
+            /// @param farPlane Far distance for the main render camera.
+            /// @param cameraInfo Returned camera information for this particular eye.
+            ///
+            virtual void GetPerEyeCameraInfo([[maybe_unused]] const EStereoEye eye, [[maybe_unused]] const float nearPlane, [[maybe_unused]] const float farPlane, [[maybe_unused]] PerEyeCameraInfo& cameraInfo) {}
+            
+            /// 
+            /// 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() {}
+
+            ///
+            /// Retrieves the current index into the VR system's swapchain that should be used. 
+            /// This only really need to be overridden by VR implementations that keep track
+            /// of an internal swapchain like Oculus. OpenVR will handle swapchains 
+            /// internally and can just return 0.
+            ///
+            virtual AZ::u32 GetSwapchainIndex([[maybe_unused]] const EStereoEye& eye) { return 0; }
+
+        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/HeapAllocator.h b/Code/Legacy/CryCommon/HeapAllocator.h
new file mode 100644
index 0000000000..2d7387d109
--- /dev/null
+++ b/Code/Legacy/CryCommon/HeapAllocator.h
@@ -0,0 +1,456 @@
+/*
+ * 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_HEAPALLOCATOR_H
+#define CRYINCLUDE_CRYCOMMON_HEAPALLOCATOR_H
+#pragma once
+
+
+#include "Synchronization.h"
+#include "Options.h"
+
+#include <CrySizer.h>
+
+//---------------------------------------------------------------------------
+#define bMEM_ACCESS_CHECK       0
+#define bMEM_HEAP_CHECK         0
+
+namespace stl
+{
+    class HeapSysAllocator
+    {
+    public:
+        static void* SysAlloc(size_t nSize)
+        { return CryModuleMalloc(nSize); }
+        static void SysDealloc(void* ptr)
+        { CryModuleFree(ptr); }
+    };
+
+    class GlobalHeapSysAllocator
+    {
+    public:
+        static void* SysAlloc(size_t nSize)
+        {
+            return CryModuleMalloc(nSize);
+        }
+        static void SysDealloc(void* ptr)
+        {
+            CryModuleFree(ptr);
+        }
+    };
+
+    // Round up to next multiple of nAlign. Handles any positive integer.
+    inline size_t RoundUpTo(size_t nSize, size_t nAlign)
+    {
+        assert(nAlign > 0);
+        nSize += nAlign - 1;
+        return nSize - nSize % nAlign;
+    }
+
+    /*---------------------------------------------------------------------------
+    HeapAllocator
+        A memory pool that can allocate arbitrary amounts of memory of arbitrary size
+        and alignment. The heap may be freed all at once. Individual block deallocation
+        is not provided.
+
+        Usable as a base class to implement more general-purpose allocators that
+        track, free, and reuse individual memory blocks.
+
+        The class can optionally support multi-threading, using the second
+        template parameter. By default it is multithread-safe.
+        See Synchronization.h.
+
+        Allocation details: Maintains a linked list of pages.
+        All pages after first are in order of most free memory first.
+        Allocations are from the smallest free page available.
+
+    ---------------------------------------------------------------------------*/
+
+    struct SMemoryUsage
+    {
+        size_t nAlloc, nUsed;
+
+        SMemoryUsage(size_t _nAlloc = 0, size_t _nUsed = 0)
+            : nAlloc(_nAlloc)
+            , nUsed(_nUsed)
+        {
+            Validate();
+        }
+
+        size_t nFree() const
+        {
+            return nAlloc - nUsed;
+        }
+        void Validate() const
+        {
+            assert(nUsed <= nAlloc);
+        }
+        void Clear()
+        {
+            nAlloc = nUsed = 0;
+        }
+
+        void operator += (SMemoryUsage const& op)
+        {
+            nAlloc += op.nAlloc;
+            nUsed += op.nUsed;
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    struct FHeap
+    {
+        OPT_STRUCT(FHeap)
+        OPT_VAR(size_t, PageSize);          // Pages allocated at this size, or multiple thereof if needed.
+        OPT_VAR(bool, SinglePage)               // Only 1 page allowed (fixed alloc)
+        OPT_VAR(bool, FreeWhenEmpty)        // Release all memory when no longer used
+    };
+
+    template <typename L = PSyncMultiThread, typename SysAl = HeapSysAllocator>
+    class HeapAllocator
+        : public FHeap
+        , public L
+        , private SysAl
+    {
+    public:
+
+        typedef AutoLock<L> Lock;
+
+        enum
+        {
+            DefaultAlignment = sizeof(void*)
+        };
+        enum
+        {
+            DefaultPageSize = 0x1000
+        };
+
+    private:
+
+        struct PageNode
+        {
+            PageNode* pNext;
+            char*           pEndAlloc;
+            char*           pEndUsed;
+
+            char* StartUsed() const
+            {
+                return (char*)(this + 1);
+            }
+
+            PageNode(size_t nAlloc)
+            {
+                pNext = 0;
+                pEndAlloc = (char*)this + nAlloc;
+                pEndUsed = StartUsed();
+            }
+
+            void* Allocate(size_t nSize, size_t nAlign)
+            {
+                // Align current mem.
+                char* pNew = Align(pEndUsed, nAlign);
+                if (pNew + nSize > pEndAlloc)
+                {
+                    return 0;
+                }
+                pEndUsed = pNew + nSize;
+                return pNew;
+            }
+
+            bool CanAllocate(size_t nSize, size_t nAlign)
+            {
+                return Align(pEndUsed, nAlign) + nSize <= pEndAlloc;
+            }
+
+            void Reset()
+            {
+                pEndUsed = StartUsed();
+            }
+
+            size_t GetMemoryAlloc() const
+            {
+                return pEndAlloc - (char*)this;
+            }
+            size_t GetMemoryUsed() const
+            {
+                return pEndUsed - StartUsed();
+            }
+            size_t GetMemoryFree() const
+            {
+                return pEndAlloc - pEndUsed;
+            }
+
+            void Validate() const
+            {
+                assert(pEndAlloc >= (char*)this);
+                assert(pEndUsed >= StartUsed() && pEndUsed <= pEndAlloc);
+            }
+
+            bool CheckPtr(void* ptr) const
+            {
+                return (char*)ptr >= StartUsed() && (char*)ptr < pEndUsed;
+            }
+        };
+
+    public:
+
+        HeapAllocator(FHeap opts = 0)
+            : FHeap(opts)
+            , _pPageList(0)
+        {
+            PageSize = max<size_t>(Align(PageSize, DefaultPageSize), DefaultPageSize);
+        }
+
+        ~HeapAllocator()
+        {
+            Clear();
+        }
+
+        //
+        // Raw memory allocation.
+        //
+        void* Allocate(const Lock& lock, size_t nSize, size_t nAlign = DefaultAlignment)
+        {
+            for (;; )
+            {
+                // Try allocating from head page first.
+                if (_pPageList)
+                {
+                    if (void* ptr = _pPageList->Allocate(nSize, nAlign))
+                    {
+                        _TotalMem.nUsed += nSize;
+                        return ptr;
+                    }
+
+                    if (_pPageList->pNext && _pPageList->pNext->GetMemoryFree() > _pPageList->GetMemoryFree())
+                    {
+                        SortPage(lock, _pPageList);
+                        Validate(lock);
+
+                        // Try allocating from new head, which has the most free memory.
+                        // If this fails, we know no further pages will succeed.
+                        if (void* ptr = _pPageList->Allocate(nSize, nAlign))
+                        {
+                            _TotalMem.nUsed += nSize;
+                            return ptr;
+                        }
+                    }
+                    if (SinglePage)
+                    {
+                        return 0;
+                    }
+                }
+
+                // Allocate the new page of the required size.
+                size_t nAllocSize = Align(sizeof(PageNode), nAlign) + nSize;
+                nAllocSize = RoundUpTo(nAllocSize, PageSize);
+
+                void* pAlloc = this->SysAlloc(nAllocSize);
+                PageNode* pPageNode = new(pAlloc) PageNode(nAllocSize);
+
+                // Insert at head of list.
+                pPageNode->pNext = _pPageList;
+                _pPageList = pPageNode;
+
+                _TotalMem.nAlloc += nAllocSize;
+
+                Validate(lock);
+            }
+        }
+
+        void Deallocate([[maybe_unused]] const Lock& lock, [[maybe_unused]] void* ptr, size_t nSize)
+        {
+            // Just to maintain counts, can't reuse memory.
+            assert(CheckPtr(lock, ptr));
+            assert(_TotalMem.nUsed >= nSize);
+            _TotalMem.nUsed -= nSize;
+        }
+
+        //
+        // Templated type allocation.
+        //
+        template<typename T>
+        T* New(size_t nAlign = 0)
+        {
+            void* pMemory = Allocate(Lock(*this), sizeof(T), nAlign ? nAlign : alignof(T));
+            return pMemory ? new(pMemory) T : 0;
+        }
+
+        template<typename T>
+        T* NewArray(size_t nCount, size_t nAlign = 0)
+        {
+            void* pMemory = Allocate(Lock(*this), sizeof(T) * nCount, nAlign ? nAlign : alignof(T));
+            return pMemory ? new(pMemory) T[nCount] : 0;
+        }
+
+        //
+        // Maintenance.
+        //
+        SMemoryUsage GetTotalMemory(const Lock&)
+        {
+            return _TotalMem;
+        }
+        SMemoryUsage GetTotalMemory()
+        {
+            Lock lock(*this);
+            return _TotalMem;
+        }
+
+        // Facility to defer freeing of dead pages during memory release calls.
+        struct FreeMemLock
+            : Lock
+        {
+            struct PageNode* _pPageList;
+
+            FreeMemLock(L& lock)
+                : Lock(lock)
+                , _pPageList(0) {}
+
+            ~FreeMemLock()
+            {
+                while (_pPageList != 0)
+                {
+                    // Read the "next" pointer before deleting.
+                    PageNode* pNext = _pPageList->pNext;
+
+                    // Delete the current page.
+                    SysAl::SysDealloc(_pPageList);
+
+                    // Move to the next page in the list.
+                    _pPageList = pNext;
+                }
+            }
+        };
+
+        void Clear(FreeMemLock& lock)
+        {
+            // Remove the pages from the object.
+            Validate(lock);
+            lock._pPageList = _pPageList;
+            _pPageList = 0;
+            _TotalMem.Clear();
+        }
+
+        void Clear()
+        {
+            FreeMemLock lock(*this);
+            Clear(lock);
+        }
+
+        void Reset(const Lock& lock)
+        {
+            // Reset all pages, allowing memory re-use.
+            Validate(lock);
+            size_t nPrevSize = ~0;
+            for (PageNode** ppPage = &_pPageList; *ppPage; )
+            {
+                (*ppPage)->Reset();
+                if ((*ppPage)->GetMemoryAlloc() > nPrevSize)
+                {
+                    // Move page to sorted location near beginning.
+                    SortPage(lock, *ppPage);
+
+                    // ppPage is now next page, so continue loop.
+                    continue;
+                }
+                nPrevSize = (*ppPage)->GetMemoryAlloc();
+                ppPage = &(*ppPage)->pNext;
+            }
+            _TotalMem.nUsed = 0;
+            Validate(lock);
+        }
+
+        void Reset()
+        {
+            Reset(Lock(*this));
+        }
+
+        //
+        // Validation.
+        //
+        bool CheckPtr(const Lock&, void* ptr) const
+        {
+            if (!ptr)
+            {
+                return true;
+            }
+            for (PageNode* pNode = _pPageList; pNode; pNode = pNode->pNext)
+            {
+                if (pNode->CheckPtr(ptr))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        void Validate(const Lock&) const
+        {
+        #ifdef _DEBUG
+            // Check page validity, and memory counts.
+            SMemoryUsage MemCheck;
+
+            for (PageNode* pPage = _pPageList; pPage; pPage = pPage->pNext)
+            {
+                pPage->Validate();
+                if (pPage != _pPageList && pPage->pNext)
+                {
+                    assert(pPage->GetMemoryFree() >= pPage->pNext->GetMemoryFree());
+                }
+                MemCheck.nAlloc += pPage->GetMemoryAlloc();
+                MemCheck.nUsed += pPage->GetMemoryUsed();
+            }
+            assert(MemCheck.nAlloc == _TotalMem.nAlloc);
+            assert(MemCheck.nUsed >= _TotalMem.nUsed);
+        #endif
+
+        #if bMEM_HEAP_CHECK
+            static int nCount = 0, nInterval = 0;
+            if (nCount++ >= nInterval)
+            {
+                nInterval++;
+                nCount = 0;
+            }
+        #endif
+        }
+
+        void GetMemoryUsage(ICrySizer* pSizer) const
+        {
+            Lock lock(non_const(*this));
+            for (PageNode* pNode = _pPageList; pNode; pNode = pNode->pNext)
+            {
+                pSizer->AddObject(pNode, pNode->GetMemoryAlloc());
+            }
+        }
+
+    private:
+
+        void SortPage(const Lock&, PageNode*& rpPage)
+        {
+            // Unlink rpPage.
+            PageNode* pPage = rpPage;
+            rpPage = pPage->pNext;
+
+            // Insert into list based on free memory.
+            PageNode** ppBefore = &_pPageList;
+            while (*ppBefore && (*ppBefore)->GetMemoryFree() > pPage->GetMemoryFree())
+            {
+                ppBefore = &(*ppBefore)->pNext;
+            }
+
+            // Link before rpList.
+            pPage->pNext = *ppBefore;
+            *ppBefore = pPage;
+        }
+
+        PageNode*           _pPageList;     // All allocated pages.
+        SMemoryUsage    _TotalMem;      // Track memory allocated and used.
+    };
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_HEAPALLOCATOR_H
diff --git a/Code/Legacy/CryCommon/HeightmapUpdateNotificationBus.h b/Code/Legacy/CryCommon/HeightmapUpdateNotificationBus.h
new file mode 100644
index 0000000000..3f05c77b45
--- /dev/null
+++ b/Code/Legacy/CryCommon/HeightmapUpdateNotificationBus.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/Math/Aabb.h>
+
+namespace AZ
+{
+    /**
+    * the EBus is used to request information about potential vegetation surfaces
+    */
+    class HeightmapUpdateNotification
+        : public AZ::EBusTraits
+    {
+    public:
+        ////////////////////////////////////////////////////////////////////////
+        // EBusTraits
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        ////////////////////////////////////////////////////////////////////////
+
+        // Occurs when the terrain height map is modified.
+        virtual void HeightmapModified(const AZ::Aabb& bounds) = 0;
+    };
+
+    typedef AZ::EBus<HeightmapUpdateNotification> HeightmapUpdateNotificationBus;
+}
diff --git a/Code/Legacy/CryCommon/IAudioInterfacesCommonData.h b/Code/Legacy/CryCommon/IAudioInterfacesCommonData.h
new file mode 100644
index 0000000000..4455517301
--- /dev/null
+++ b/Code/Legacy/CryCommon/IAudioInterfacesCommonData.h
@@ -0,0 +1,578 @@
+/*
+ * 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/base.h>
+#include <AzCore/Math/Matrix3x4.h>
+#include <AzCore/Math/Transform.h>
+#include <AzCore/RTTI/TypeInfo.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/string/string.h>
+
+
+#define AUDIO_BIT(x)     (1 << (x))
+#define AUDIO_TRIGGER_IMPL_ID_NUM_RESERVED 100// IDs below that value are used for the CATLTriggerImpl_Internal
+
+
+namespace Audio
+{
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    typedef AZ::u64 TATLIDType;
+    typedef AZ::u32 TATLEnumFlagsType;
+    typedef TATLIDType TAudioObjectID;
+    typedef TATLIDType TAudioControlID;
+    typedef TATLIDType TAudioSwitchStateID;
+    typedef TATLIDType TAudioEnvironmentID;
+    typedef TATLIDType TAudioPreloadRequestID;
+    typedef TATLIDType TAudioEventID;
+    typedef TATLIDType TAudioFileEntryID;
+    typedef TATLIDType TAudioTriggerImplID;
+    typedef TATLIDType TAudioTriggerInstanceID;
+    typedef TATLIDType TAudioProxyID;
+    typedef TATLIDType TAudioSourceId;
+    typedef TATLIDType TAudioFileId;
+    typedef TATLIDType TAudioFileCollectionId;
+    typedef TATLIDType TAudioFileLanguageId;
+
+#define INVALID_AUDIO_OBJECT_ID (static_cast<Audio::TAudioObjectID>(0))
+#define GLOBAL_AUDIO_OBJECT_ID (static_cast<Audio::TAudioObjectID>(1))
+#define INVALID_AUDIO_CONTROL_ID (static_cast<Audio::TAudioControlID>(0))
+#define INVALID_AUDIO_SWITCH_STATE_ID (static_cast<Audio::TAudioSwitchStateID>(0))
+#define INVALID_AUDIO_ENVIRONMENT_ID (static_cast<Audio::TAudioEnvironmentID>(0))
+#define INVALID_AUDIO_PRELOAD_REQUEST_ID (static_cast<Audio::TAudioPreloadRequestID>(0))
+#define INVALID_AUDIO_EVENT_ID (static_cast<Audio::TAudioEventID>(0))
+#define INVALID_AUDIO_FILE_ENTRY_ID (static_cast<Audio::TAudioFileEntryID>(0))
+#define INVALID_AUDIO_TRIGGER_IMPL_ID (static_cast<Audio::TAudioTriggerImplID>(0))
+#define INVALID_AUDIO_TRIGGER_INSTANCE_ID (static_cast<Audio::TAudioTriggerInstanceID>(0))
+#define INVALID_AUDIO_ENUM_FLAG_TYPE (static_cast<Audio::TATLEnumFlagsType>(0))
+#define ALL_AUDIO_REQUEST_SPECIFIC_TYPE_FLAGS (static_cast<Audio::TATLEnumFlagsType>(-1))
+#define INVALID_AUDIO_PROXY_ID (static_cast<Audio::TAudioProxyID>(0))
+#define DEFAULT_AUDIO_PROXY_ID (static_cast<Audio::TAudioProxyID>(1))
+#define INVALID_AUDIO_SOURCE_ID (static_cast<Audio::TAudioSourceId>(0))
+#define INVALID_AUDIO_FILE_ID (static_cast<Audio::TAudioFileId>(0))
+#define INVALID_AUDIO_FILE_COLLECTION_ID (static_cast<Audio::TAudioFileCollectionId>(0))
+#define INVALID_AUDIO_FILE_LANGUAGE_ID (static_cast<Audio::TAudioFileLanguageId>(0))
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    // <title EAudioRequestStatus>
+    // Summary:
+    //      An enum that lists possible statuses of an AudioRequest.
+    //      Used as a return type for many function used by the AudioSystem internally,
+    //      and also for most of the IAudioSystemImplementation calls.
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum EAudioRequestStatus : TATLEnumFlagsType
+    {
+        eARS_NONE = 0,
+        eARS_SUCCESS = 1,
+        eARS_PARTIAL_SUCCESS = 2,
+        eARS_FAILURE = 3,
+        eARS_PENDING = 4,
+        eARS_FAILURE_INVALID_OBJECT_ID = 5,
+        eARS_FAILURE_INVALID_CONTROL_ID = 6,
+        eARS_FAILURE_INVALID_REQUEST = 7,
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    //! Converts a boolean value to an EAudioRequestStatus.
+    //! @param result The boolean value to convert.
+    //! @return eARS_SUCCESS if result is true, eARS_FAILURE otherwise.
+    inline EAudioRequestStatus BoolToARS(bool result)
+    {
+        return result ? eARS_SUCCESS : eARS_FAILURE;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SATLWorldPosition
+    {
+        SATLWorldPosition()
+            : m_transform(AZ::Matrix3x4::CreateIdentity())
+        {}
+
+        SATLWorldPosition(const AZ::Vector3& rPos)
+            : m_transform(AZ::Matrix3x4::CreateIdentity())
+        {
+            m_transform.SetTranslation(rPos);
+        }
+
+        SATLWorldPosition(const AZ::Transform& rTransform)
+            : m_transform(AZ::Matrix3x4::CreateFromTransform(rTransform))
+        {}
+
+        SATLWorldPosition(const AZ::Matrix3x4& rTransform)
+            : m_transform(rTransform)
+        {
+        }
+
+        inline AZ::Vector3 GetPositionVec() const
+        {
+            return m_transform.GetTranslation();
+        }
+
+        inline AZ::Vector3 GetUpVec() const
+        {
+            return m_transform.GetBasisZ();
+        }
+
+        inline AZ::Vector3 GetForwardVec() const
+        {
+            return m_transform.GetBasisY();
+        }
+
+        inline AZ::Vector3 GetRightVec() const
+        {
+            return m_transform.GetBasisX();
+        }
+
+        inline void NormalizeForwardVec()
+        {
+            auto forward = GetForwardVec();
+            if (forward.IsZero())
+            {
+                m_transform.SetBasisY(AZ::Vector3::CreateAxisY());
+            }
+            else
+            {
+                forward.Normalize();
+                m_transform.SetBasisY(forward);
+            }
+        }
+
+        inline void NormalizeUpVec()
+        {
+            auto up = GetUpVec();
+            if (up.IsZero())
+            {
+                m_transform.SetBasisZ(AZ::Vector3::CreateAxisZ());
+            }
+            else
+            {
+                up.Normalize();
+                m_transform.SetBasisZ(up);
+            }
+        }
+
+    private:
+        AZ::Matrix3x4 m_transform;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum EAudioAssetType : TATLEnumFlagsType
+    {
+        eAAT_STREAM = 1,
+        eAAT_SOURCE = 2,
+        eAAT_NONE = 3,
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum EAudioCodecType : TATLEnumFlagsType
+    {
+        eACT_PCM        = 1,
+        eACT_ADPCM      = 2,
+        eACT_XMA        = 3,
+        eACT_VORBIS     = 4,
+        eACT_XWMA       = 5,
+        eACT_AAC        = 6,
+        eACT_STREAM_PCM = 7,
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum EAudioRequestFlags : TATLEnumFlagsType
+    {
+        eARF_NONE                   = 0,                // assumes Lowest priority
+        eARF_PRIORITY_NORMAL        = AUDIO_BIT(0),    // will be processed if no high priority requests are pending
+        eARF_PRIORITY_HIGH          = AUDIO_BIT(1),    // will be processed first
+        eARF_EXECUTE_BLOCKING       = AUDIO_BIT(2),    // blocks main thread until the request has been fully handled
+        eARF_SYNC_CALLBACK          = AUDIO_BIT(3),    // callback (ATL's NotifyListener) will happen on the main thread
+        eARF_SYNC_FINISHED_CALLBACK = AUDIO_BIT(4),    // "finished trigger instance" callback will happen on the main thread
+        eARF_THREAD_SAFE_PUSH       = AUDIO_BIT(5),    // use when pushing a request from a non-main thread, e.g. AK::EventManager or AudioThread
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum EAudioRequestType : TATLEnumFlagsType
+    {
+        eART_NONE                           = 0,
+        eART_AUDIO_MANAGER_REQUEST          = 1,
+        eART_AUDIO_CALLBACK_MANAGER_REQUEST = 2,
+        eART_AUDIO_OBJECT_REQUEST           = 3,
+        eART_AUDIO_LISTENER_REQUEST         = 4,
+        eART_AUDIO_ALL_REQUESTS             = static_cast<TATLEnumFlagsType>(-1),
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum EAudioRequestResult : TATLEnumFlagsType
+    {
+        eARR_NONE       = 0,
+        eARR_SUCCESS    = 1,
+        eARR_FAILURE    = 2,
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum EAudioEventState : TATLEnumFlagsType
+    {
+        eAES_NONE               = 0,
+        eAES_PLAYING            = 1,
+        eAES_PLAYING_DELAYED    = 2,
+        eAES_LOADING            = 3,
+        eAES_UNLOADING          = 4,
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum class ObstructionType : TATLEnumFlagsType
+    {
+        Ignore = 0,
+        SingleRay,
+        MultiRay,
+        Count,
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum class PanningMode
+    {
+        Speakers,
+        Headphones,
+    };
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum class AudioInputSourceType
+    {
+        Unsupported,    // Unsupported type
+        //OggFile,      // Audio Input from an Ogg file
+        //OpusFile,     // Audio Input from an Opus file
+        PcmFile,        // Audio Input from a raw PCM file
+        WavFile,        // Audio Input from a Wav file
+        Microphone,     // Audio Input from a Microphone
+        Synthesis,      // Audio Input that is synthesized (user-provided systhesis function)
+        ExternalStream, // Audio Input from a stream source (video stream, network stream, etc)
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum class AudioInputSampleType
+    {
+        Unsupported,    // Unsupported type
+        Int,            // Integer type, probably don't need to differentiate signed vs unsigned
+        Float,          // Floating poitn type
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    enum class MultiPositionBehaviorType
+    {
+        Separate,       // Sound positions are treated separately as individual point sources, i.e. like torches along a wall.
+        Blended,        // Sound positions are blended together as a 'spread out' sound, i.e. like a river.
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    using MultiPositionVec = AZStd::vector<AZ::Vector3>;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct MultiPositionParams
+    {
+        MultiPositionVec m_positions;
+        MultiPositionBehaviorType m_type;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioInputConfig
+    {
+        SAudioInputConfig()
+            : m_sourceId(INVALID_AUDIO_SOURCE_ID)
+            , m_sampleRate(0)
+            , m_numChannels(0)
+            , m_bitsPerSample(0)
+            , m_bufferSize(0)
+            , m_sampleType(AudioInputSampleType::Unsupported)
+            , m_autoUnloadFile(false)
+        {}
+
+        SAudioInputConfig(AudioInputSourceType sourceType, const char* filename, bool autoUnloadFile = true)
+            : m_sourceId(INVALID_AUDIO_SOURCE_ID)
+            , m_sampleRate(0)
+            , m_numChannels(0)
+            , m_bitsPerSample(0)
+            , m_bufferSize(0)
+            , m_sourceType(sourceType)
+            , m_sampleType(AudioInputSampleType::Unsupported)
+            , m_sourceFilename(filename)
+            , m_autoUnloadFile(autoUnloadFile)
+        {}
+
+        SAudioInputConfig(
+            AudioInputSourceType sourceType,
+            AZ::u32 sampleRate,
+            AZ::u32 numChannels,
+            AZ::u32 bitsPerSample,
+            AudioInputSampleType sampleType)
+            : m_sourceId(INVALID_AUDIO_SOURCE_ID)
+            , m_sampleRate(sampleRate)
+            , m_numChannels(numChannels)
+            , m_bitsPerSample(bitsPerSample)
+            , m_sourceType(sourceType)
+            , m_sampleType(sampleType)
+            , m_autoUnloadFile(false)
+        {}
+
+        void SetBufferSizeFromFrameCount(AZ::u32 frameCount)
+        {
+            m_bufferSize = (m_numChannels * frameCount * (m_bitsPerSample >> 3));
+        }
+
+        AZ::u32 GetSampleCountFromBufferSize() const
+        {
+            AZ_Assert(m_bitsPerSample >= 8, "Bits Per Sample is set too low!\n");
+            return m_bufferSize / (m_bitsPerSample >> 3);
+        }
+
+        TAudioSourceId m_sourceId;          // This is set later after the source is created
+        AZ::u32 m_sampleRate;               // 44100, 48000, ...
+        AZ::u32 m_numChannels;              // 1 = Mono, 2 = Stereo
+        AZ::u32 m_bitsPerSample;            // e.g. 16, 32
+        AZ::u32 m_bufferSize;               // Size in bytes
+        AudioInputSourceType m_sourceType;  // File, Synthesis, Microphone, ...
+        AudioInputSampleType m_sampleType;  // Int, Float
+        AZStd::string m_sourceFilename;
+        bool m_autoUnloadFile;              // For file types, specifies whether file should unload after playback finishes
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct AudioStreamData
+    {
+        AudioStreamData()
+        {}
+
+        AudioStreamData(AZ::u8* buffer, AZStd::size_t dataSize)
+            : m_data(buffer)
+            , m_sizeBytes(dataSize)
+        {}
+
+        AZ::u8* m_data = nullptr;           // points to start of raw data
+        union {
+            AZStd::size_t m_sizeBytes = 0;  // in bytes
+            AZStd::size_t m_offsetBytes;    // if using this structure as a read/write bookmark, use this alias
+        };
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct AudioStreamMultiTrackData
+    {
+        AudioStreamMultiTrackData()
+        {
+            m_data[0] = m_data[1] = m_data[2] = m_data[3] = m_data[4] = m_data[5] = nullptr;
+        }
+
+        const void* m_data[6];              // 6 channels max
+        union {
+            AZStd::size_t m_sizeBytes = 0;  // size in bytes of each track
+            AZStd::size_t m_offsetBytes;    // if using this structure as a read/write bookmark, use this alias
+        };
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioRequestDataBase
+    {
+        explicit SAudioRequestDataBase(const EAudioRequestType eType = eART_NONE)
+            : eRequestType(eType)
+        {}
+
+        virtual ~SAudioRequestDataBase() {}
+
+        const EAudioRequestType eRequestType;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioSourceInfo
+    {
+        TAudioSourceId m_sourceId;
+        TAudioFileId m_fileId;
+        TAudioFileCollectionId m_languageId;
+        TAudioFileLanguageId m_collectionId;
+        EAudioCodecType m_codecType;
+
+        SAudioSourceInfo()
+            : m_sourceId(INVALID_AUDIO_SOURCE_ID)
+            , m_fileId(INVALID_AUDIO_FILE_ID)
+            , m_languageId(INVALID_AUDIO_FILE_LANGUAGE_ID)
+            , m_collectionId(INVALID_AUDIO_FILE_COLLECTION_ID)
+            , m_codecType(eACT_STREAM_PCM)
+        {}
+
+        SAudioSourceInfo(TAudioSourceId sourceId)
+            : m_sourceId(sourceId)
+            , m_fileId(INVALID_AUDIO_FILE_ID)
+            , m_languageId(INVALID_AUDIO_FILE_LANGUAGE_ID)
+            , m_collectionId(INVALID_AUDIO_FILE_COLLECTION_ID)
+            , m_codecType(eACT_STREAM_PCM)
+        {}
+
+        SAudioSourceInfo(
+            TAudioSourceId sourceId,
+            TAudioFileId fileId,
+            TAudioFileLanguageId languageId,
+            TAudioFileCollectionId collectionId,
+            EAudioCodecType codecType)
+            : m_sourceId(sourceId)
+            , m_fileId(fileId)
+            , m_languageId(languageId)
+            , m_collectionId(collectionId)
+            , m_codecType(codecType)
+        {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioCallBackInfos
+    {
+        struct UserData
+        {
+            UserData(void* userData)
+                : m_pUserData(userData)
+            {}
+
+            UserData(uint64_t userData)
+                : m_userData(userData)
+            {}
+
+            UserData& operator=(void* userData)
+            {
+                m_pUserData = userData;
+                return *this;
+            }
+
+            UserData& operator=(uint64_t userData)
+            {
+                m_userData = userData;
+                return *this;
+            }
+
+            operator void*() const
+            {
+                return m_pUserData;
+            }
+
+            operator uint64_t() const
+            {
+                return m_userData;
+            }
+
+            bool operator==(void* const userData)
+            {
+                return this->m_pUserData == userData;
+            }
+
+            bool operator==(uint64_t userData)
+            {
+                return this->m_userData == userData;
+            }
+
+            union
+            {
+                void* m_pUserData;
+                uint64_t m_userData;
+            };
+        };
+
+        SAudioCallBackInfos(const SAudioCallBackInfos& rOther)
+            : pObjectToNotify(rOther.pObjectToNotify)
+            , pUserData(rOther.pUserData)
+            , pUserDataOwner(rOther.pUserDataOwner)
+            , nRequestFlags(rOther.nRequestFlags)
+        {
+        }
+
+        explicit SAudioCallBackInfos(
+            void* const pPassedObjectToNotify = nullptr,
+            UserData pPassedUserData = nullptr,
+            void* const pPassedUserDataOwner = nullptr,
+            const TATLEnumFlagsType nPassedRequestFlags = eARF_PRIORITY_NORMAL)
+            : pObjectToNotify(pPassedObjectToNotify)
+            , pUserData(pPassedUserData)
+            , pUserDataOwner(pPassedUserDataOwner)
+            , nRequestFlags(nPassedRequestFlags)
+        {
+        }
+
+        static const SAudioCallBackInfos& GetEmptyObject()
+        {
+            static SAudioCallBackInfos emptyInstance;
+            return emptyInstance;
+        }
+
+        void* const pObjectToNotify;
+        UserData pUserData;
+        void* const pUserDataOwner;
+        const TATLEnumFlagsType nRequestFlags;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioRequest
+    {
+        SAudioRequest()
+            : nFlags(eARF_NONE)
+            , nAudioObjectID(INVALID_AUDIO_OBJECT_ID)
+            , pOwner(nullptr)
+            , pUserData(nullptr)
+            , pUserDataOwner(nullptr)
+            , pData(nullptr)
+        {}
+
+        ~SAudioRequest() {}
+
+        SAudioRequest(const SAudioRequest& other) = delete;
+        SAudioRequest& operator=(const SAudioRequest& other) = delete;
+
+        TATLEnumFlagsType nFlags;
+        TAudioObjectID nAudioObjectID;
+        void* pOwner;
+        void* pUserData;
+        void* pUserDataOwner;
+        SAudioRequestDataBase* pData;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioRequestInfo
+    {
+        explicit SAudioRequestInfo(
+            const EAudioRequestResult ePassedResult,
+            void* const pPassedOwner,
+            void* const pPassedUserData,
+            void* const pPassedUserDataOwner,
+            const EAudioRequestType ePassedAudioRequestType,
+            const TATLEnumFlagsType nPassedSpecificAudioRequest,
+            const TAudioControlID nPassedAudioControlID,
+            const TAudioObjectID nPassedAudioObjectID,
+            const TAudioEventID passedAudioEventID)
+            : eResult(ePassedResult)
+            , pOwner(pPassedOwner)
+            , pUserData(pPassedUserData)
+            , pUserDataOwner(pPassedUserDataOwner)
+            , eAudioRequestType(ePassedAudioRequestType)
+            , nSpecificAudioRequest(nPassedSpecificAudioRequest)
+            , nAudioControlID(nPassedAudioControlID)
+            , nAudioObjectID(nPassedAudioObjectID)
+            , audioEventID(passedAudioEventID)
+        {}
+
+        const EAudioRequestResult eResult;
+        void* const pOwner;
+        void* const pUserData;
+        void* const pUserDataOwner;
+        const EAudioRequestType eAudioRequestType;
+        const TATLEnumFlagsType nSpecificAudioRequest;
+        const TAudioControlID nAudioControlID;
+        const TAudioObjectID nAudioObjectID;
+        const TAudioEventID audioEventID;
+    };
+
+} // namespace Audio
+
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(Audio::MultiPositionBehaviorType, "{96851568-74F9-4EEC-9195-82DCF701EEEF}");
+    AZ_TYPE_INFO_SPECIALIZE(Audio::ObstructionType, "{8C056768-40E2-4B2D-AF01-9F7A6817BAAA}");
+} // namespace AZ
+
diff --git a/Code/Legacy/CryCommon/IAudioSystem.h b/Code/Legacy/CryCommon/IAudioSystem.h
new file mode 100644
index 0000000000..6aa4525d1b
--- /dev/null
+++ b/Code/Legacy/CryCommon/IAudioSystem.h
@@ -0,0 +1,1070 @@
+/*
+ * 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 <IAudioInterfacesCommonData.h>
+
+#include <AzCore/Component/Component.h>
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/Math/Crc.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/std/parallel/mutex.h>
+
+// External forward declarations.
+struct IVisArea;
+struct ICVar;
+struct SSystemInitParams;
+
+namespace Audio
+{
+    // Internal forward declarations.
+    struct SAudioRequest;
+
+
+    enum EATLDataScope : TATLEnumFlagsType
+    {
+        eADS_NONE           = 0,
+        eADS_GLOBAL         = 1,
+        eADS_LEVEL_SPECIFIC = 2,
+        eADS_ALL            = 3,
+    };
+
+    enum EAudioManagerRequestType : TATLEnumFlagsType
+    {
+        eAMRT_NONE                      = 0,
+        eAMRT_INIT_AUDIO_IMPL           = AUDIO_BIT(0),
+        eAMRT_RELEASE_AUDIO_IMPL        = AUDIO_BIT(1),
+        eAMRT_RESERVE_AUDIO_OBJECT_ID   = AUDIO_BIT(2),
+        eAMRT_CREATE_SOURCE             = AUDIO_BIT(5),
+        eAMRT_DESTROY_SOURCE            = AUDIO_BIT(6),
+        eAMRT_PARSE_CONTROLS_DATA       = AUDIO_BIT(7),
+        eAMRT_PARSE_PRELOADS_DATA       = AUDIO_BIT(8),
+        eAMRT_CLEAR_CONTROLS_DATA       = AUDIO_BIT(9),
+        eAMRT_CLEAR_PRELOADS_DATA       = AUDIO_BIT(10),
+        eAMRT_PRELOAD_SINGLE_REQUEST    = AUDIO_BIT(11),
+        eAMRT_UNLOAD_SINGLE_REQUEST     = AUDIO_BIT(12),
+        eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE = AUDIO_BIT(13),
+        eAMRT_REFRESH_AUDIO_SYSTEM      = AUDIO_BIT(14),
+        eAMRT_LOSE_FOCUS                = AUDIO_BIT(15),
+        eAMRT_GET_FOCUS                 = AUDIO_BIT(16),
+        eAMRT_MUTE_ALL                  = AUDIO_BIT(17),
+        eAMRT_UNMUTE_ALL                = AUDIO_BIT(18),
+        eAMRT_STOP_ALL_SOUNDS           = AUDIO_BIT(19),
+        eAMRT_DRAW_DEBUG_INFO           = AUDIO_BIT(20),
+        eAMRT_CHANGE_LANGUAGE           = AUDIO_BIT(21),
+        eAMRT_SET_AUDIO_PANNING_MODE    = AUDIO_BIT(22),
+    };
+
+    enum EAudioCallbackManagerRequestType : TATLEnumFlagsType
+    {
+        eACMRT_NONE                             = 0,
+        eACMRT_REPORT_STARTED_EVENT             = AUDIO_BIT(0),
+        eACMRT_REPORT_FINISHED_EVENT            = AUDIO_BIT(1),
+        eACMRT_REPORT_FINISHED_TRIGGER_INSTANCE = AUDIO_BIT(2),
+    };
+
+    enum EAudioListenerRequestType : TATLEnumFlagsType
+    {
+        eALRT_NONE = 0,
+        eALRT_SET_POSITION = AUDIO_BIT(0),
+    };
+
+    enum EAudioObjectRequestType : TATLEnumFlagsType
+    {
+        eAORT_NONE                      = 0,
+        eAORT_PREPARE_TRIGGER           = AUDIO_BIT(0),
+        eAORT_UNPREPARE_TRIGGER         = AUDIO_BIT(1),
+        eAORT_EXECUTE_TRIGGER           = AUDIO_BIT(2),
+        eAORT_STOP_TRIGGER              = AUDIO_BIT(3),
+        eAORT_STOP_ALL_TRIGGERS         = AUDIO_BIT(4),
+        eAORT_SET_POSITION              = AUDIO_BIT(5),
+        eAORT_SET_RTPC_VALUE            = AUDIO_BIT(6),
+        eAORT_SET_SWITCH_STATE          = AUDIO_BIT(7),
+        eAORT_SET_ENVIRONMENT_AMOUNT    = AUDIO_BIT(8),
+        eAORT_RESET_ENVIRONMENTS        = AUDIO_BIT(9),
+        eAORT_RESET_RTPCS               = AUDIO_BIT(10),
+        eAORT_RELEASE_OBJECT            = AUDIO_BIT(11),
+        eAORT_EXECUTE_SOURCE_TRIGGER    = AUDIO_BIT(12),
+        eAORT_SET_MULTI_POSITIONS       = AUDIO_BIT(13),
+    };
+
+    enum EAudioObjectObstructionCalcType : TATLEnumFlagsType
+    {
+        eAOOCT_IGNORE       = 0,
+        eAOOCT_SINGLE_RAY   = 1,
+        eAOOCT_MULTI_RAY    = 2,
+    };
+
+    enum EAudioControlType : TATLEnumFlagsType
+    {
+        eACT_NONE           = 0,
+        eACT_AUDIO_OBJECT   = 1,
+        eACT_TRIGGER        = 2,
+        eACT_RTPC           = 3,
+        eACT_SWITCH         = 4,
+        eACT_SWITCH_STATE   = 5,
+        eACT_PRELOAD        = 6,
+        eACT_ENVIRONMENT    = 7,
+    };
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template <typename T>
+    AZ_FORCE_INLINE T AudioStringToID(const char* const source)
+    {
+        return static_cast<T>(AZ::Crc32(source));
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    // Function Callback Typedefs
+    using AudioRequestCallbackType = void(*)(const SAudioRequestInfo* const);
+    using TriggerFinishedCallbackType = void(*)(const TAudioObjectID, const TAudioControlID, void* const);
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    // Audio Manager Requests
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioManagerRequestDataBase
+        : public SAudioRequestDataBase
+    {
+        explicit SAudioManagerRequestDataBase(const EAudioManagerRequestType ePassedType = eAMRT_NONE)
+            : SAudioRequestDataBase(eART_AUDIO_MANAGER_REQUEST)
+            , eType(ePassedType)
+        {}
+
+        ~SAudioManagerRequestDataBase() override {}
+
+        const EAudioManagerRequestType eType;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template <EAudioManagerRequestType T>
+    struct SAudioManagerRequestData
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData()
+            : SAudioManagerRequestDataBase(T)
+        {}
+
+        ~SAudioManagerRequestData() override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_INIT_AUDIO_IMPL>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData()
+            : SAudioManagerRequestDataBase(eAMRT_INIT_AUDIO_IMPL)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_INIT_AUDIO_IMPL>() override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_RELEASE_AUDIO_IMPL> : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData()
+            : SAudioManagerRequestDataBase(eAMRT_RELEASE_AUDIO_IMPL)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_RELEASE_AUDIO_IMPL>() override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_RESERVE_AUDIO_OBJECT_ID>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData(TAudioObjectID* const pPassedObjectID, const char* const sPassedObjectName = nullptr)
+            : SAudioManagerRequestDataBase(eAMRT_RESERVE_AUDIO_OBJECT_ID)
+            , pObjectID(pPassedObjectID)
+            , sObjectName(sPassedObjectName)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_RESERVE_AUDIO_OBJECT_ID>()override {}
+
+        TAudioObjectID* const pObjectID;
+        const char* const sObjectName;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_CREATE_SOURCE>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData(const SAudioInputConfig& sourceConfig)
+            : SAudioManagerRequestDataBase(eAMRT_CREATE_SOURCE)
+            , m_sourceConfig(sourceConfig)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_CREATE_SOURCE>() override {}
+
+        SAudioInputConfig m_sourceConfig;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_DESTROY_SOURCE>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData(TAudioSourceId sourceId)
+            : SAudioManagerRequestDataBase(eAMRT_DESTROY_SOURCE)
+            , m_sourceId(sourceId)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_DESTROY_SOURCE>() override {}
+
+        const TAudioSourceId m_sourceId;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_PARSE_CONTROLS_DATA>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData(const char* const sControlsFolderPath, const EATLDataScope ePassedDataScope)
+            : SAudioManagerRequestDataBase(eAMRT_PARSE_CONTROLS_DATA)
+            , sFolderPath(sControlsFolderPath)
+            , eDataScope(ePassedDataScope)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_PARSE_CONTROLS_DATA>()override {}
+
+        const char* const sFolderPath;
+        const EATLDataScope eDataScope;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_PARSE_PRELOADS_DATA>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData(const char* const sControlsFolderPath, const EATLDataScope ePassedDataScope)
+            : SAudioManagerRequestDataBase(eAMRT_PARSE_PRELOADS_DATA)
+            , sFolderPath(sControlsFolderPath)
+            , eDataScope(ePassedDataScope)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_PARSE_PRELOADS_DATA>()override {}
+
+        const char* const sFolderPath;
+        const EATLDataScope eDataScope;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_CLEAR_CONTROLS_DATA>
+        : public SAudioManagerRequestDataBase
+    {
+        explicit SAudioManagerRequestData(const EATLDataScope ePassedDataScope = eADS_NONE)
+            : SAudioManagerRequestDataBase(eAMRT_CLEAR_CONTROLS_DATA)
+            , eDataScope(ePassedDataScope)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_CLEAR_CONTROLS_DATA>()override {}
+
+        const EATLDataScope eDataScope;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_CLEAR_PRELOADS_DATA>
+        : public SAudioManagerRequestDataBase
+    {
+        explicit SAudioManagerRequestData(const EATLDataScope ePassedDataScope = eADS_NONE)
+            : SAudioManagerRequestDataBase(eAMRT_CLEAR_PRELOADS_DATA)
+            , eDataScope(ePassedDataScope)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_CLEAR_PRELOADS_DATA>()override {}
+
+        const EATLDataScope eDataScope;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_PRELOAD_SINGLE_REQUEST>
+        : public SAudioManagerRequestDataBase
+    {
+        explicit SAudioManagerRequestData(const TAudioPreloadRequestID nRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID, const bool bPassedAutoLoadOnly = false)
+            : SAudioManagerRequestDataBase(eAMRT_PRELOAD_SINGLE_REQUEST)
+            , nPreloadRequestID(nRequestID)
+            , bAutoLoadOnly(bPassedAutoLoadOnly)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_PRELOAD_SINGLE_REQUEST>()override {}
+
+        const TAudioPreloadRequestID nPreloadRequestID;
+        const bool bAutoLoadOnly;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_UNLOAD_SINGLE_REQUEST>
+        : public SAudioManagerRequestDataBase
+    {
+        explicit SAudioManagerRequestData(const TAudioPreloadRequestID nRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID)
+            : SAudioManagerRequestDataBase(eAMRT_UNLOAD_SINGLE_REQUEST)
+            , nPreloadRequestID(nRequestID)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_UNLOAD_SINGLE_REQUEST>()override {}
+
+        const TAudioPreloadRequestID nPreloadRequestID;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData(const EATLDataScope eScope = eADS_NONE)
+            : SAudioManagerRequestDataBase(eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE)
+            , eDataScope(eScope)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE>()override {}
+
+        const EATLDataScope eDataScope;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_REFRESH_AUDIO_SYSTEM>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData(const char* const controlsPath, const char* const levelName, TAudioPreloadRequestID preloadId)
+            : SAudioManagerRequestDataBase(eAMRT_REFRESH_AUDIO_SYSTEM)
+            , m_controlsPath(controlsPath)
+            , m_levelName(levelName)
+            , m_levelPreloadId(preloadId)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_REFRESH_AUDIO_SYSTEM>()override {}
+
+        const char* const m_controlsPath;
+        const char* const m_levelName;
+        const TAudioPreloadRequestID m_levelPreloadId = INVALID_AUDIO_PRELOAD_REQUEST_ID;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_CHANGE_LANGUAGE>
+        : public SAudioManagerRequestDataBase
+    {
+        SAudioManagerRequestData()
+            : SAudioManagerRequestDataBase(eAMRT_CHANGE_LANGUAGE)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_CHANGE_LANGUAGE>()override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioManagerRequestData<eAMRT_SET_AUDIO_PANNING_MODE>
+        : public SAudioManagerRequestDataBase
+    {
+        explicit SAudioManagerRequestData(PanningMode panningMode)
+            : SAudioManagerRequestDataBase(eAMRT_SET_AUDIO_PANNING_MODE)
+            , m_panningMode(panningMode)
+        {}
+
+        ~SAudioManagerRequestData<eAMRT_SET_AUDIO_PANNING_MODE>() override {}
+
+        const PanningMode m_panningMode;
+    };
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    // Audio Callback Manager Requests
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioCallbackManagerRequestDataBase
+        : public SAudioRequestDataBase
+    {
+        explicit SAudioCallbackManagerRequestDataBase(const EAudioCallbackManagerRequestType ePassedType = eACMRT_NONE)
+            : SAudioRequestDataBase(eART_AUDIO_CALLBACK_MANAGER_REQUEST)
+            , eType(ePassedType)
+        {}
+
+        ~SAudioCallbackManagerRequestDataBase() override {}
+
+        const EAudioCallbackManagerRequestType eType;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template <EAudioCallbackManagerRequestType T>
+    struct SAudioCallbackManagerRequestData
+        : public SAudioCallbackManagerRequestDataBase
+    {
+        SAudioCallbackManagerRequestData()
+            : SAudioCallbackManagerRequestDataBase(T)
+        {}
+
+        ~SAudioCallbackManagerRequestData() override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioCallbackManagerRequestData<eACMRT_REPORT_STARTED_EVENT>
+        : public SAudioCallbackManagerRequestDataBase
+    {
+        SAudioCallbackManagerRequestData(TAudioEventID const nPassedEventID)
+            : SAudioCallbackManagerRequestDataBase(eACMRT_REPORT_STARTED_EVENT)
+            , nEventID(nPassedEventID)
+        {}
+
+        ~SAudioCallbackManagerRequestData<eACMRT_REPORT_STARTED_EVENT>() override {}
+
+        const TAudioEventID nEventID;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioCallbackManagerRequestData<eACMRT_REPORT_FINISHED_EVENT>
+        : public SAudioCallbackManagerRequestDataBase
+    {
+        SAudioCallbackManagerRequestData(const TAudioEventID nPassedEventID, const bool bPassedSuccess)
+            : SAudioCallbackManagerRequestDataBase(eACMRT_REPORT_FINISHED_EVENT)
+            , nEventID(nPassedEventID)
+            , bSuccess(bPassedSuccess)
+        {}
+
+        ~SAudioCallbackManagerRequestData<eACMRT_REPORT_FINISHED_EVENT>()override {}
+
+        const TAudioEventID nEventID;
+        const bool bSuccess;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioCallbackManagerRequestData<eACMRT_REPORT_FINISHED_TRIGGER_INSTANCE>
+        : public SAudioCallbackManagerRequestDataBase
+    {
+        SAudioCallbackManagerRequestData(TAudioControlID const nPassedControlID)
+            : SAudioCallbackManagerRequestDataBase(eACMRT_REPORT_FINISHED_TRIGGER_INSTANCE)
+            , nAudioTriggerID(nPassedControlID)
+        {}
+
+        ~SAudioCallbackManagerRequestData<eACMRT_REPORT_FINISHED_TRIGGER_INSTANCE>()override {}
+
+        const TAudioControlID nAudioTriggerID;
+    };
+
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    // Audio Object Requests
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioObjectRequestDataBase
+        : public SAudioRequestDataBase
+    {
+        explicit SAudioObjectRequestDataBase(const EAudioObjectRequestType ePassedType = eAORT_NONE)
+            : SAudioRequestDataBase(eART_AUDIO_OBJECT_REQUEST)
+            , eType(ePassedType)
+        {}
+
+        ~SAudioObjectRequestDataBase() override {}
+
+        const EAudioObjectRequestType eType;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template <EAudioObjectRequestType T>
+    struct SAudioObjectRequestData
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(T)
+        {}
+
+        ~SAudioObjectRequestData() override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_EXECUTE_TRIGGER>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_EXECUTE_TRIGGER)
+            , nTriggerID(INVALID_AUDIO_CONTROL_ID)
+            , fTimeUntilRemovalInMS(0.0f)
+        {}
+
+        SAudioObjectRequestData(const TAudioControlID nPassedTriggerID, const float fPassedTimeUntilRemovalInMS)
+            : SAudioObjectRequestDataBase(eAORT_EXECUTE_TRIGGER)
+            , nTriggerID(nPassedTriggerID)
+            , fTimeUntilRemovalInMS(fPassedTimeUntilRemovalInMS)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_EXECUTE_TRIGGER>()override {}
+
+        TAudioControlID nTriggerID;
+        float fTimeUntilRemovalInMS;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_PREPARE_TRIGGER>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_PREPARE_TRIGGER)
+            , nTriggerID(INVALID_AUDIO_CONTROL_ID)
+        {}
+
+        explicit SAudioObjectRequestData(const TAudioControlID nPassedTriggerID)
+            : SAudioObjectRequestDataBase(eAORT_PREPARE_TRIGGER)
+            , nTriggerID(nPassedTriggerID)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_PREPARE_TRIGGER>()override {}
+
+        TAudioControlID nTriggerID;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_UNPREPARE_TRIGGER>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_UNPREPARE_TRIGGER)
+            , nTriggerID(INVALID_AUDIO_CONTROL_ID)
+        {}
+
+        explicit SAudioObjectRequestData(const TAudioControlID nPassedTriggerID)
+            : SAudioObjectRequestDataBase(eAORT_UNPREPARE_TRIGGER)
+            , nTriggerID(nPassedTriggerID)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_UNPREPARE_TRIGGER>()override {}
+
+        TAudioControlID nTriggerID;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_STOP_TRIGGER>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_STOP_TRIGGER)
+            , nTriggerID(INVALID_AUDIO_CONTROL_ID)
+        {}
+
+        explicit SAudioObjectRequestData(const TAudioControlID nPassedTriggerID)
+            : SAudioObjectRequestDataBase(eAORT_STOP_TRIGGER)
+            , nTriggerID(nPassedTriggerID)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_STOP_TRIGGER>()override {}
+
+        TAudioControlID nTriggerID;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_STOP_ALL_TRIGGERS>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_STOP_ALL_TRIGGERS)
+            , m_filterByOwner(false)
+        {}
+
+        SAudioObjectRequestData(bool filterByOwner)
+            : SAudioObjectRequestDataBase(eAORT_STOP_ALL_TRIGGERS)
+            , m_filterByOwner(filterByOwner)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_STOP_ALL_TRIGGERS>()override {}
+
+        const bool m_filterByOwner;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_SET_POSITION>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_SET_POSITION)
+            , oPosition()
+        {}
+
+        explicit SAudioObjectRequestData(const SATLWorldPosition& oPassedPosition)
+            : SAudioObjectRequestDataBase(eAORT_SET_POSITION)
+            , oPosition(oPassedPosition)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_SET_POSITION>()override {}
+
+        SATLWorldPosition oPosition;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_SET_RTPC_VALUE>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_SET_RTPC_VALUE)
+            , nControlID(INVALID_AUDIO_CONTROL_ID)
+            , fValue(0.0f)
+        {}
+
+        SAudioObjectRequestData(const TAudioControlID nPassedControlID, const float fPassedValue)
+            : SAudioObjectRequestDataBase(eAORT_SET_RTPC_VALUE)
+            , nControlID(nPassedControlID)
+            , fValue(fPassedValue)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_SET_RTPC_VALUE>()override {}
+
+        TAudioControlID nControlID;
+        float fValue;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_SET_SWITCH_STATE>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_SET_SWITCH_STATE)
+            , nSwitchID(INVALID_AUDIO_CONTROL_ID)
+            , nStateID(INVALID_AUDIO_SWITCH_STATE_ID)
+        {}
+
+        SAudioObjectRequestData(const TAudioControlID nPassedControlID, const TAudioSwitchStateID nPassedStateID)
+            : SAudioObjectRequestDataBase(eAORT_SET_SWITCH_STATE)
+            , nSwitchID(nPassedControlID)
+            , nStateID(nPassedStateID)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_SET_SWITCH_STATE>()override {}
+
+        TAudioControlID nSwitchID;
+        TAudioSwitchStateID nStateID;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_SET_ENVIRONMENT_AMOUNT>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_SET_ENVIRONMENT_AMOUNT)
+            , nEnvironmentID(INVALID_AUDIO_ENVIRONMENT_ID)
+            , fAmount(1.0f)
+        {}
+
+        SAudioObjectRequestData(const TAudioEnvironmentID nPassedEnvironmentID, const float fPassedAmount)
+            : SAudioObjectRequestDataBase(eAORT_SET_ENVIRONMENT_AMOUNT)
+            , nEnvironmentID(nPassedEnvironmentID)
+            , fAmount(fPassedAmount)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_SET_ENVIRONMENT_AMOUNT>()override {}
+
+        TAudioEnvironmentID nEnvironmentID;
+        float fAmount;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_RESET_ENVIRONMENTS>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_RESET_ENVIRONMENTS)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_RESET_ENVIRONMENTS>()override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_RESET_RTPCS>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_RESET_RTPCS)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_RESET_RTPCS>() override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_RELEASE_OBJECT>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_RELEASE_OBJECT)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_RELEASE_OBJECT>()override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioObjectRequestData<eAORT_EXECUTE_SOURCE_TRIGGER>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_EXECUTE_SOURCE_TRIGGER)
+            , m_triggerId(INVALID_AUDIO_CONTROL_ID)
+        {}
+
+        SAudioObjectRequestData(
+            TAudioControlID triggerId,
+            const SAudioSourceInfo& sourceInfo)
+            : SAudioObjectRequestDataBase(eAORT_EXECUTE_SOURCE_TRIGGER)
+            , m_triggerId(triggerId)
+            , m_sourceInfo(sourceInfo)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_EXECUTE_SOURCE_TRIGGER>()override {}
+
+        TAudioControlID m_triggerId;
+        SAudioSourceInfo m_sourceInfo;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template <>
+    struct SAudioObjectRequestData<eAORT_SET_MULTI_POSITIONS>
+        : public SAudioObjectRequestDataBase
+    {
+        SAudioObjectRequestData()
+            : SAudioObjectRequestDataBase(eAORT_SET_MULTI_POSITIONS)
+        {}
+
+        SAudioObjectRequestData(const MultiPositionParams& params)
+            : SAudioObjectRequestDataBase(eAORT_SET_MULTI_POSITIONS)
+            , m_params(params)
+        {}
+
+        ~SAudioObjectRequestData<eAORT_SET_MULTI_POSITIONS>() override {}
+
+        MultiPositionParams m_params;
+    };
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    // Audio Listener Requests
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioListenerRequestDataBase
+        : public SAudioRequestDataBase
+    {
+        explicit SAudioListenerRequestDataBase(const EAudioListenerRequestType ePassedType = eALRT_NONE)
+            : SAudioRequestDataBase(eART_AUDIO_LISTENER_REQUEST)
+            , eType(ePassedType)
+        {}
+
+        ~SAudioListenerRequestDataBase() override {}
+
+        const EAudioListenerRequestType eType;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<EAudioListenerRequestType T>
+    struct SAudioListenerRequestData
+        : public SAudioListenerRequestDataBase
+    {
+        SAudioListenerRequestData()
+            : SAudioListenerRequestDataBase(T)
+        {}
+
+        ~SAudioListenerRequestData() override {}
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    template<>
+    struct SAudioListenerRequestData<eALRT_SET_POSITION>
+        : public SAudioListenerRequestDataBase
+    {
+        SAudioListenerRequestData()
+            : SAudioListenerRequestDataBase(eALRT_SET_POSITION)
+        {}
+
+        explicit SAudioListenerRequestData(const SATLWorldPosition& oWorldPosition)
+            : SAudioListenerRequestDataBase(eALRT_SET_POSITION)
+            , oNewPosition(oWorldPosition)
+        {}
+
+        ~SAudioListenerRequestData<eALRT_SET_POSITION>()override {}
+
+        SATLWorldPosition oNewPosition;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct SAudioSystemInfo
+    {
+        SAudioSystemInfo()
+            : nCountUsedAudioTriggers(0)
+            , nCountUnusedAudioTriggers(0)
+            , nCountUsedAudioEvents(0)
+            , nCountUnusedAudioEvents(0)
+        {}
+
+        AZStd::size_t nCountUsedAudioTriggers;
+        AZStd::size_t nCountUnusedAudioTriggers;
+        AZStd::size_t nCountUsedAudioEvents;
+        AZStd::size_t nCountUnusedAudioEvents;
+
+        AZ::Vector3 oListenerPos;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct IAudioProxy
+    {
+        virtual ~IAudioProxy() = default;
+
+        virtual void Initialize(const char* sObjectName, bool bInitAsync = true) = 0;
+        virtual void Release() = 0;
+        virtual void Reset() = 0;
+
+        virtual void ExecuteSourceTrigger(TAudioControlID nTriggerID, const SAudioSourceInfo& rSourceInfo, const SAudioCallBackInfos& rCallbackInfos = SAudioCallBackInfos::GetEmptyObject()) = 0;
+        virtual void ExecuteTrigger(TAudioControlID nTriggerID, const SAudioCallBackInfos& rCallbackInfos = SAudioCallBackInfos::GetEmptyObject()) = 0;
+        virtual void StopAllTriggers() = 0;
+        virtual void StopTrigger(TAudioControlID nTriggerID) = 0;
+        virtual void SetSwitchState(TAudioControlID nSwitchID, TAudioSwitchStateID nStateID) = 0;
+        virtual void SetRtpcValue(TAudioControlID nRtpcID, float fValue) = 0;
+        virtual void SetObstructionCalcType(EAudioObjectObstructionCalcType eObstructionType) = 0;
+        virtual void SetPosition(const SATLWorldPosition& rPosition) = 0;
+        virtual void SetPosition(const AZ::Vector3& rPosition) = 0;
+        virtual void SetMultiplePositions(const MultiPositionParams& params) = 0;
+        virtual void SetEnvironmentAmount(TAudioEnvironmentID nEnvironmentID, float fAmount) = 0;
+        virtual void SetCurrentEnvironments() = 0;
+        virtual void ResetRtpcValues() = 0;
+        virtual TAudioObjectID GetAudioObjectID() const = 0;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    class AudioPreloadNotifications
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~AudioPreloadNotifications() = default;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // EBusTraits - PreloadID Address, Multiple Handler
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        using BusIdType = TAudioPreloadRequestID;
+        using MutexType = AZStd::recursive_mutex;
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void OnAudioPreloadCached() = 0;
+        virtual void OnAudioPreloadUncached() = 0;
+    };
+
+    using AudioPreloadNotificationBus = AZ::EBus<AudioPreloadNotifications>;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    class AudioSystemRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~AudioSystemRequests() = default;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // EBusTraits - Single Bus Address, Single Handler
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual bool Initialize() = 0;
+        virtual void Release() = 0;
+        virtual void ExternalUpdate() = 0;
+
+        virtual void PushRequest(const SAudioRequest& rAudioRequestData) = 0;
+        virtual void PushRequestBlocking(const SAudioRequest& audioRequestData) = 0;
+
+        virtual void AddRequestListener(
+            AudioRequestCallbackType callBack,
+            void* objectToListenTo,
+            EAudioRequestType requestType = eART_AUDIO_ALL_REQUESTS,
+            TATLEnumFlagsType specificRequestMask = ALL_AUDIO_REQUEST_SPECIFIC_TYPE_FLAGS) = 0;
+        virtual void RemoveRequestListener(
+            AudioRequestCallbackType callBack,
+            void* requestOwner) = 0;
+
+        virtual TAudioControlID GetAudioTriggerID(const char* sAudioTriggerName) const = 0;
+        virtual TAudioControlID GetAudioRtpcID(const char* sAudioRtpcName) const = 0;
+        virtual TAudioControlID GetAudioSwitchID(const char* sAudioSwitchName) const = 0;
+        virtual TAudioSwitchStateID GetAudioSwitchStateID(TAudioControlID nSwitchID, const char* sAudioSwitchStateName) const = 0;
+        virtual TAudioPreloadRequestID GetAudioPreloadRequestID(const char* sAudioPreloadRequestName) const = 0;
+        virtual TAudioEnvironmentID GetAudioEnvironmentID(const char* sAudioEnvironmentName) const = 0;
+
+        virtual bool ReserveAudioListenerID(TAudioObjectID& rAudioObjectID) = 0;
+        virtual bool ReleaseAudioListenerID(TAudioObjectID nAudioObjectID) = 0;
+        virtual bool SetAudioListenerOverrideID(TAudioObjectID nAudioObjectID) = 0;
+
+        virtual void GetInfo(SAudioSystemInfo& rAudioSystemInfo) = 0;
+        virtual const char* GetControlsPath() const = 0;
+        virtual void UpdateControlsPath() = 0;
+        virtual void RefreshAudioSystem(const char* levelName) = 0;
+
+        virtual IAudioProxy* GetFreeAudioProxy() = 0;
+        virtual void FreeAudioProxy(IAudioProxy* pIAudioProxy) = 0;
+
+        virtual TAudioSourceId CreateAudioSource(const SAudioInputConfig& sourceConfig) = 0;
+        virtual void DestroyAudioSource(TAudioSourceId sourceId) = 0;
+
+        virtual const char* GetAudioControlName(EAudioControlType controlType, TATLIDType atlID) const = 0;
+        virtual const char* GetAudioSwitchStateName(TAudioControlID switchID, TAudioSwitchStateID stateID) const = 0;
+    };
+
+    using AudioSystemRequestBus = AZ::EBus<AudioSystemRequests>;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct AudioTriggerNotifications
+        : public AZ::EBusTraits
+    {
+        virtual ~AudioTriggerNotifications() = default;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // EBusTraits - Address by ID, Multiple Handler, Mutex, Queued
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const bool EnableEventQueue = true;
+        using MutexType = AZStd::recursive_mutex;
+        using BusIdType = Audio::TAudioControlID;
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void ReportDurationInfo(TAudioEventID, float /*duration*/, float /*estimatedDuration*/) = 0;
+    };
+
+    using AudioTriggerNotificationBus = AZ::EBus<AudioTriggerNotifications>;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    class AudioSystemThreadSafeRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~AudioSystemThreadSafeRequests() = default;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // EBusTraits - Single Bus Address, Single Handler, Mutex, Queued
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+        static const bool EnableEventQueue = true;
+        using MutexType = AZStd::recursive_mutex;
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void PushRequestThreadSafe(const SAudioRequest& audioRequestData) = 0;
+    };
+
+    using AudioSystemThreadSafeRequestBus = AZ::EBus<AudioSystemThreadSafeRequests>;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    struct IAudioSystem
+        : public AudioSystemRequestBus::Handler
+        , public AudioSystemThreadSafeRequestBus::Handler
+    {
+        ~IAudioSystem() override = default;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    class AudioStreamingRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~AudioStreamingRequests() = default;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides - Single Bus, Single Handler
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+        using BusIdType = TAudioSourceId;
+        using MutexType = AZStd::recursive_mutex;
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // <title ReadStreamingInput>
+        // Summary:
+        //      Load streaming input into the ATL-specific audio input
+        // Arguments:
+        //      data - Buffer of data to load into the input device's internal buffer
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        virtual AZStd::size_t ReadStreamingInput(const AudioStreamData& data) = 0;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // <title ReadStreamingMultiTrackInput>
+        // Summary:
+        //      Load streaming multi-track input into the ATL-specific audio input
+        // Arguments:
+        //      data - Buffers of multi-track data to load into the input device's internal buffer
+        // Return value:
+        //      The number of frames loaded into the internal buffer
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        virtual AZStd::size_t ReadStreamingMultiTrackInput(AudioStreamMultiTrackData& data) = 0;
+    };
+
+    using AudioStreamingRequestBus = AZ::EBus<AudioStreamingRequests>;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    namespace Gem
+    {
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // Used for initializing and releasing the audio system (AudioSystem/ATL) code.
+        class AudioSystemGemRequests
+            : public AZ::EBusTraits
+        {
+        public:
+            ///////////////////////////////////////////////////////////////////////////////////////////
+            // EBusTraits overrides
+            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+            static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+            ///////////////////////////////////////////////////////////////////////////////////////////
+
+            // Interface methods
+            virtual bool Initialize(const SSystemInitParams* initParams) = 0;
+            virtual void Release() = 0;
+        };
+
+        using AudioSystemGemRequestBus = AZ::EBus<AudioSystemGemRequests>;
+
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+        // Used for initializing and releasing the audio engine (middleware layer) code.
+        class AudioEngineGemRequests
+            : public AZ::EBusTraits
+        {
+        public:
+            ///////////////////////////////////////////////////////////////////////////////////////////
+            // EBusTraits overrides
+            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+            static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+            ///////////////////////////////////////////////////////////////////////////////////////////
+
+            // Interface methods
+            virtual bool Initialize() = 0;
+            virtual void Release() = 0;
+        };
+
+        using AudioEngineGemRequestBus = AZ::EBus<AudioEngineGemRequests>;
+
+    } // namespace Gem
+
+} // namespace Audio
diff --git a/Code/Legacy/CryCommon/ICmdLine.h b/Code/Legacy/CryCommon/ICmdLine.h
new file mode 100644
index 0000000000..8dc5de2a42
--- /dev/null
+++ b/Code/Legacy/CryCommon/ICmdLine.h
@@ -0,0 +1,110 @@
+/*
+ * 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 : This is the interface to access command line arguments.
+//               This will avoid the need to parse command line in multiple
+//               places  and thus  reduce unnecessary code duplication
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_ICMDLINE_H
+#define CRYINCLUDE_CRYCOMMON_ICMDLINE_H
+#pragma once
+
+// The type of command line argument
+enum ECmdLineArgType
+{
+    // Description:
+    //      Argument was not preceeded by anything
+    eCLAT_Normal = 0,
+    // Description:
+    //      Argument was preceeded by a minus sign '-'
+    eCLAT_Pre,
+    // Description:
+    //      Argument was preceeded by a plus signe '+'
+    eCLAT_Post,
+    // Description:
+    //      Argument is the executable filename
+    eCLAT_Executable,
+};
+
+// Container for a command line Argument
+class ICmdLineArg
+{
+public:
+    // <interfuscator:shuffle>
+    virtual ~ICmdLineArg(){}
+    // Description:
+    //      Retrieve the name of the argument.
+    // Return Value:
+    //      The name of the argument.
+    virtual const char* GetName() const = 0;
+
+    // Description:
+    //      Retrieve the value of the argument.
+    // Return Value:
+    //      The value of the argument as a null-terminated string.
+    virtual const char* GetValue() const = 0;
+
+    // Description:
+    //      Retrieve the type of argument.
+    // Return Value:
+    //      The type of argument.
+    // See Also:
+    //      ECmdLineArgType
+    virtual const ECmdLineArgType GetType() const = 0;
+
+    // Description:
+    //      Retrieve the value of the argument.
+    // Return Value:
+    //      The value of the argument as float number.
+    virtual const float GetFValue() const = 0;
+
+    // Description:
+    //      Retrieve the value of the argument.
+    // Return Value:
+    //      The value of the argument as integer number.
+    virtual const int GetIValue() const = 0;
+    // </interfuscator:shuffle>
+};
+
+// Command line interface
+class ICmdLine
+{
+public:
+    // <interfuscator:shuffle>
+    virtual ~ICmdLine(){}
+    // Description:
+    //      Returns the n-th command line argument.
+    // Arguments:
+    //      n - 0 returns executable name, otherwise returns n-th argument.
+    // Return Value:
+    //      Pointer to the command line argument at index specified by idx.
+    // See Also:
+    //      ICmdLineArg
+    virtual const ICmdLineArg* GetArg(int n) const = 0;
+
+    // Description:
+    //      Returns the number of command line arguments.
+    // Return Value:
+    //      The number of command line arguments.
+    virtual int GetArgCount() const = 0;
+
+    // Description:
+    //      Finds an argument in the command line.
+    // Arguments:
+    //      name - the name of the argument to find, excluding any '+' or '-'
+    // Return Value:
+    //      0 when if the argument was not found.
+    //      Pointer to a ICmdLineArg class containing the specified argument.
+    // See Also:
+    //      ICmdLineArg
+    virtual const ICmdLineArg* FindArg(const ECmdLineArgType ArgType, const char* name, bool caseSensitive = false) const = 0;
+    // </interfuscator:shuffle>
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_ICMDLINE_H
diff --git a/Code/Legacy/CryCommon/IConsole.h b/Code/Legacy/CryCommon/IConsole.h
new file mode 100644
index 0000000000..01fae6fce3
--- /dev/null
+++ b/Code/Legacy/CryCommon/IConsole.h
@@ -0,0 +1,688 @@
+/*
+ * 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_ICONSOLE_H
+#define CRYINCLUDE_CRYCOMMON_ICONSOLE_H
+#pragma once
+
+#include <CryCommon/platform.h>
+
+struct SFunctor;
+
+struct ConsoleBind;
+
+struct ICVar;
+class ITexture;
+class ICrySizer;
+struct ISystem;
+
+#define     CVAR_INT              1
+#define     CVAR_FLOAT          2
+#define     CVAR_STRING         3
+
+// By default, cvars registered as const, read-only, or cheat cannot be modified in release builds for security.
+// The common practice has been to hard-code the default values of all these 'const' cvars before generating a release build.
+// However, this is restrictive because the cannot be modified at run-time in release, and so cannot differ between (or during) levels.
+// If you wish, you can disable this restriction by defining ALLOW_CONST_CVAR_MODIFICATIONS 1 (which is the default for non-release builds),
+// thus allowing const/read-only/cheat cvars to be set at run-time in release, and removing the need to explicitly hard-code your default values for release builds.
+#if defined(_RELEASE)
+#define ALLOW_AUDIT_CVARS 0
+#define ALLOW_CONST_CVAR_MODIFICATIONS AZ_TRAIT_CVARS_ENABLED_FOR_RELEASE_BUILDS
+#define LOG_CVAR_INFRACTIONS 0
+#define LOG_CVAR_USAGE 0
+#else
+#define ALLOW_AUDIT_CVARS 1
+#define ALLOW_CONST_CVAR_MODIFICATIONS 1
+#define LOG_CVAR_INFRACTIONS 1
+#define LOG_CVAR_USAGE 1
+#endif // defined(_RELEASE)
+
+#define CVAR_GROUPS_ARE_PRIVILEGED 1 // allows cvar groups to manipulate const/cheat cvars (turn off to log group cvar manipulation)
+#define LOG_CVAR_INFRACTIONS_CALLSTACK (LOG_CVAR_INFRACTIONS && 0) // logs the callstack when certain cvar issues arise; helpful in tracking down where the problem originated
+
+// If this flag is set during registering a console variable, and the variable exists,
+// then the variable will store its value in memory given by src
+#define CVF_CHANGE_SOURCE (1u << 16)
+
+// Flags used by ICVar
+enum EVarFlags
+{
+    VF_NULL =                                           0x00000000,         // just to have one recognizable spot where the flags are located in the Register call
+    VF_CHEAT =                                      0x00000002,         // stays in the default state when cheats are disabled
+    VF_DEV_ONLY =                   0x00000004,         // cvar is only registered with the console in non release builds
+    VF_DEDI_ONLY =                  0x00000008,         // cvar is only registered with the console in non release or dedicated server builds
+    VF_NET_SYNCED =                             0x00000080,         // synchronised between server and client(s); server authorative
+    VF_DUMPTODISK   =                               0x00000100,
+    VF_READONLY =                                   0x00000800,         // can not be changed by the user
+    VF_REQUIRE_LEVEL_RELOAD =           0x00001000,
+    VF_REQUIRE_APP_RESTART =            0x00002000,
+    VF_WARNING_NOTUSED  =                   0x00004000,         // shows warning that this var was not used in config file
+    VF_COPYNAME =                                   0x00008000,         // otherwise the const char * to the name will be stored without copying the memory
+    VF_MODIFIED =                                   0x00010000,         // Set when variable value modified.
+    VF_WASINCONFIG  =                           0x00020000,         // Set when variable was present in config file.
+    VF_BITFIELD =                                   0x00040000,         // Allow bitfield setting syntax.
+    VF_RESTRICTEDMODE =                     0x00080000,         // is visible and usable in restricted (normal user) console mode
+    VF_INVISIBLE     =                      0x00100000,         // Invisible to the user in console
+    VF_ALWAYSONCHANGE =                     0x00200000,         // Always accept variable value and call on change callback even if variable value didnt change
+    VF_BLOCKFRAME =                             0x00400000,         // Blocks the execution of console commands for one frame
+    VF_CONST_CVAR =                             0x00800000,         // Set if it is a const cvar not to be set inside cfg-files
+    VF_CHEAT_ALWAYS_CHECK =             0x01000000,         // This variable is critical to check in every hash, since it's extremely vulnerable
+    VF_CHEAT_NOCHECK =                      0x02000000,       // This variable is set as VF_CHEAT but doesn't have to be checked/hashed since it's harmless to hack
+    VF_SYSSPEC_OVERWRITE =              0x04000000,       // This variable is specified by system.cfg with the intention to overwrite all subsequent settings
+    VF_CVARGRP_IGNOREINREALVAL =    0x08000000,       // This variable will be ignored when cvar group's real val is checked (Needed for cvars which are in a group but change in various situations)
+    VF_RESETTABLE =                          0x10000000,         // This variable will be reset when a commanded reset to defaults occurs
+    VF_RENDERER_CVAR =                      0x20000000,         // The update of this variable will be done in render thread
+    VF_DEPRECATED =                             0x40000000,         // Deprecated cvars use default values which cannot be modified outside the code
+    VF_EXPERIMENTAL =                           0x80000000,         // This variable is used by WIP or experimental feature
+};
+
+struct ICVarDumpSink
+{
+    // <interfuscator:shuffle>
+    virtual ~ICVarDumpSink(){}
+    virtual void OnElementFound(ICVar* pCVar) = 0;
+    // </interfuscator:shuffle>
+};
+
+struct IKeyBindDumpSink
+{
+    // <interfuscator:shuffle>
+    virtual ~IKeyBindDumpSink(){}
+    virtual void OnKeyBindFound(const char* sBind, const char* sCommand) = 0;
+    // </interfuscator:shuffle>
+};
+
+struct IOutputPrintSink
+{
+    // <interfuscator:shuffle>
+    virtual ~IOutputPrintSink(){}
+    virtual void Print(const char* inszText) = 0;
+    // </interfuscator:shuffle>
+};
+
+// Callback class to derive from when you want to receive callbacks when console var changes.
+struct IConsoleVarSink
+{
+    // <interfuscator:shuffle>
+    virtual ~IConsoleVarSink(){}
+    // Called by Console before changing console var value, to validate if var can be changed.
+    // Return value: true if ok to change value, false if should not change value.
+    virtual bool OnBeforeVarChange(ICVar* pVar, const char* sNewValue) = 0;
+    // Called by Console after variable has changed value
+    virtual void OnAfterVarChange(ICVar* pVar) = 0;
+    // </interfuscator:shuffle>
+};
+
+#if defined(GetCommandLine)
+#undef GetCommandLine
+#endif
+
+// Interface to the arguments of the console command.
+struct IConsoleCmdArgs
+{
+    // <interfuscator:shuffle>
+    virtual ~IConsoleCmdArgs(){}
+    // Gets number of arguments supplied to the command (including the command itself)
+    virtual int GetArgCount() const = 0;
+    // Gets argument by index, nIndex must be in 0 <= nIndex < GetArgCount()
+    virtual const char* GetArg(int nIndex) const = 0;
+    // Gets complete command line
+    virtual const char* GetCommandLine() const = 0;
+    // </interfuscator:shuffle>
+};
+
+// Interface to the arguments of the console command.
+struct IConsoleArgumentAutoComplete
+{
+    // <interfuscator:shuffle>
+    virtual ~IConsoleArgumentAutoComplete(){}
+    // Gets number of matches for the argument to auto complete.
+    virtual int GetCount() const = 0;
+    // Gets argument value by index, nIndex must be in 0 <= nIndex < GetCount()
+    virtual const char* GetValue(int nIndex) const = 0;
+    // </interfuscator:shuffle>
+};
+
+// This a definition of the console command function that can be added to console with AddCommand.
+typedef void (* ConsoleCommandFunc)(IConsoleCmdArgs*);
+
+// This a definition of the callback function that is called when variable change.
+typedef void (* ConsoleVarFunc)(ICVar*);
+
+/* Summary: Interface to the engine console.
+
+  Description:
+    The engine console allow to manipulate the internal engine parameters
+    and to invoke commands.
+    This interface allow external modules to integrate their functionalities
+    into the console as commands or variables.
+
+    IMPLEMENTATIONS NOTES:
+    The console takes advantage of the script engine to store the console variables,
+    this mean that all variables visible through script and console.
+*/
+struct IConsole
+{
+    // <interfuscator:shuffle>
+    virtual ~IConsole(){}
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Deletes the console
+    virtual void Release() = 0;
+
+    // Initialize this instance of engine console
+    // Arguments:
+    //   pSystem - an instance of ISystem
+    virtual void Init(ISystem* pSystem) = 0;
+    // Create a new console variable that store the value in a string
+    // Arguments:
+    //   sName - console variable name
+    //   sValue - default value
+    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
+    //   help - help text that is shown when you use <sName> ? in the console
+    // Return:
+    //   pointer to the interface ICVar
+    virtual ICVar* RegisterString(const char* sName, const char* sValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0) = 0;
+    // Create a new console variable that store the value in a int
+    // Arguments:
+    //   sName - console variable name
+    //   iValue - default value
+    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
+    //   help - help text that is shown when you use <sName> ? in the console
+    // Return:
+    //   pointer to the interface ICVar
+    virtual ICVar* RegisterInt(const char* sName, int iValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0) = 0;
+    // Create a new console variable that store the value in a int64
+    // Arguments:
+    //   sName - console variable name
+    //   iValue - default value
+    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
+    //   help - help text that is shown when you use <sName> ? in the console
+    // Return:
+    //   pointer to the interface ICVar
+    virtual ICVar* RegisterInt64(const char* sName, int64 iValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0) = 0;
+    // Create a new console variable that store the value in a float
+    // Arguments:
+    //   sName - console variable name
+    //   fValue - default value
+    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
+    //   help - help text that is shown when you use <sName> ? in the console
+    // Return:
+    //   pointer to the interface ICVar
+    virtual ICVar* RegisterFloat(const char* sName, float fValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0) = 0;
+
+    // Create a new console variable that will update the user defined float
+    // Arguments:
+    //   sName - console variable name
+    //   src - pointer to the memory that will be updated
+    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
+    //   help - help text that is shown when you use <sName> ? in the console
+    //   allowModify - allow modification through config vars, prevents missing modifications in release mode
+    // Return:
+    //   pointer to the interface ICVar
+    virtual ICVar* Register(const char* name, float* src, float defaultvalue, int nFlags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true) = 0;
+    // Create a new console variable that will update the user defined integer
+    // Arguments:
+    //   sName - console variable name
+    //   src - pointer to the memory that will be updated
+    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
+    //   help - help text that is shown when you use <sName> ? in the console
+    //   allowModify - allow modification through config vars, prevents missing modifications in release mode
+    // Return:
+    //   pointer to the interface ICVar
+    virtual ICVar* Register(const char* name, int* src, int defaultvalue, int nFlags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true) = 0;
+
+    // Create a new console variable that will update the user defined pointer to null terminated string
+    // Arguments:
+    //   sName - console variable name
+    //   src - pointer to the memory that will be updated
+    //   nFlags - user defined flag, this parameter is used by other subsystems and doesn't affect the console variable (basically of user data)
+    //   help - help text that is shown when you use <sName> ? in the console
+    //   allowModify - allow modification through config vars, prevents missing modifications in release mode
+    // Return:
+    //   pointer to the interface ICVar
+    virtual ICVar* Register(const char* name, const char** src, const char* defaultvalue, int nFlags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true) = 0;
+
+    // Registers an existing console variable
+    // Should only be used with static duration objects, object is never freed
+    // Arguments:
+    //   pVar - the existing console variable
+    // Return:
+    //   pointer to the interface ICVar (that was passed in)
+    virtual ICVar* Register(ICVar* pVar) = 0;
+
+    // ! Remove a variable from the console
+    // @param sVarName console variable name
+    // @param bDelete if true the variable is deleted
+    // @see ICVar
+    virtual void UnregisterVariable(const char* sVarName, bool bDelete = false) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Set the y coordinate where the console will stop to scroll when is dropped
+    // @param value y in screen coordinates
+    virtual void SetScrollMax(int value) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // add output sink (clases which are interested in the output) - order is not guaranteed
+    // @param inpSink must not be 0 and is not allowed to be added twice
+    virtual void AddOutputPrintSink(IOutputPrintSink* inpSink) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // remove output sink (clases which are interested in the output) - order is not guaranteed
+    // @param inpSink must not be 0 and has to be added before
+    virtual void RemoveOutputPrintSink(IOutputPrintSink* inpSink) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // show/hide the console
+    // @param specifies if the window must be (true=show,false=hide)
+    // @param specifies iRequestScrollMax <=0 if not used, otherwise it sets SetScrollMax temporary to the given value
+    virtual void ShowConsole(bool show, int iRequestScrollMax = -1) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Dump all console-variables to a callback-interface
+    // @param Callback callback-interface which needs to be called for each element
+    virtual void DumpCVars(ICVarDumpSink* pCallback, unsigned int nFlagsFilter = 0) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Bind a console command to a key
+    // @param sCmd console command that must be executed
+    // @param sRes name of the key to invoke the command
+    virtual void CreateKeyBind(const char* sCmd, const char* sRes) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Sets the background-image
+    // @param pImage background-image
+    virtual void    SetImage(ITexture* pImage, bool bDeleteCurrent) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Retrieves the background-image
+    // @return background-image
+    virtual ITexture* GetImage() = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Sets static/scroll background-mode
+    // @param bStatic true if static
+    virtual void StaticBackground(bool bStatic) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Sets the loading-background-image
+    // @param pImage background-image
+    virtual void    SetLoadingImage(const char* szFilename) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Iterate through the lines - used for dedicated server (truncated if needed)
+    // @param indwLineNo 0.. counted from the last printed line on
+    // @param outszBuffer pointer to the destination string buffer (zero terminated afterwards), must not be 0
+    // @param indwBufferSize 1.. size of the buffer
+    // @return true=line was returned, false=there are no more lines
+
+    virtual bool GetLineNo(int indwLineNo, char* outszBuffer, int indwBufferSize) const = 0;
+
+    // @return current number of lines in the console
+    virtual int GetLineCount() const = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Retrieve a console variable by name - not case sensitive
+    // @param name variable name
+    // @return a pointer to the ICVar interface, NULL if is not found
+    // @see ICVar
+    virtual ICVar* GetCVar(const char* name) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Read a value from a configuration file (.ini) and return the value
+    // @param szVarName variable name
+    // @param szFileName source configuration file
+    // @param def_val default value (if the variable is not found into the file)
+    // @return the variable value
+    virtual char* GetVariable(const char* szVarName, const char* szFileName, const char* def_val) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Read a value from a configuration file (.ini) and return the value
+    // @param szVarName variable name
+    // @param szFileName source configuration file
+    // @param def_val default value (if the variable is not found into the file)
+    // @return the variable value
+    virtual float GetVariable(const char* szVarName, const char* szFileName, float def_val) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Print a string in the console and go to the new line
+    // @param s the string to print
+    virtual void PrintLine(const char* s) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Append a string in the last console line
+    // @param s the string to print
+    virtual void PrintLinePlus(const char* s) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Retrieve the status of the console (active/not active)
+    // @return the variable value(true = active/false = not active)
+    virtual bool GetStatus() = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Clear the console text
+    virtual void    Clear() = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Update the console
+    virtual void    Update() = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Draw the console
+    virtual void    Draw() = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Description:
+    //    Register a new console command.
+    // Arguments:
+    //    sCommand - Command name.
+    //    func     - Pointer to the console command function to be called when command is invoked.
+    //    nFlags   - Bitfield consist of VF_ flags (e.g. VF_CHEAT)
+    //    sHelp    - Help string, will be displayed when typing in console "command ?".
+    // Return
+    //    True if successful, false otherwise.
+    virtual bool AddCommand(const char* sCommand, ConsoleCommandFunc func, int nFlags = 0, const char* sHelp = NULL) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Description:
+    //    Register a new console command that execute script function.
+    //    EG "Game.Connect(%1)" the symbol "%1" will be replaced with the command parameter 1
+    //    writing in the console "connect 127.0.0.1" will invoke Game.Connect("127.0.0.1")
+    // Arguments:
+    //    sCommand - Command name.
+    //    sScriptFunc - Script function to be executed when command is invoked.
+    //    nFlags   - Bitfield consist of VF_ flags (e.g. VF_CHEAT)
+    //    sHelp    - Help string, will be displayed when typing in console "command ?".
+    // Return
+    //    True if successful, false otherwise.
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    virtual bool AddCommand(const char* sName, const char* sScriptFunc, int nFlags = 0, const char* sHelp = NULL) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Description:
+    //    Removes a console command which was previously registered with AddCommand.
+    // Arguments:
+    //    sCommand - Command name
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    virtual void RemoveCommand(const char* sName) = 0;
+
+    // Execute a string in the console
+    // Arguments:
+    //   command - console command e.g. "map testy" - no leading slash
+    //   bSilentMode - true=suppresses log in error case and logging the command to the console
+    //   bDeferExecution - true=the command is stored in special fifo that allows delayed execution
+    //               by using wait_seconds and wait_frames commands
+    //
+    virtual void ExecuteString(const char* command, bool bSilentMode = false, bool bDeferExecution = false) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Print a message into the log and abort the execution of the application
+    // @param message error string to print in the log
+    virtual void Exit(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Return true if the console is opened
+    // @return the variable value(true = opened/false = closed)
+    virtual bool IsOpened() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Auto completion.
+    //////////////////////////////////////////////////////////////////////////
+    virtual int     GetNumVars() = 0;
+
+    virtual int     GetNumVisibleVars() = 0;
+
+    // Arguments:
+    //   szPrefix - 0 or prefix e.g. "sys_spec_"
+    // Return
+    //   used size
+    virtual size_t GetSortedVars(const char** pszArray, size_t numItems, const char* szPrefix = 0) = 0;
+    virtual const char* AutoComplete(const char* substr) = 0;
+    virtual const char* AutoCompletePrev(const char* substr) = 0;
+    virtual const char* ProcessCompletion(const char* szInputBuffer) = 0;
+    virtual void RegisterAutoComplete(const char* sVarOrCommand, IConsoleArgumentAutoComplete* pArgAutoComplete) = 0;
+    virtual void UnRegisterAutoComplete(const char* sVarOrCommand) = 0;
+    //
+    virtual void ResetAutoCompletion() = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    // Calculation of the memory used by the whole console system
+    virtual void GetMemoryUsage (ICrySizer* pSizer) const = 0;
+
+    // Function related to progress bar
+    virtual void ResetProgressBar(int nProgressRange) = 0;
+    // Function related to progress bar
+    virtual void TickProgressBar() = 0;
+
+    // Arguments:
+    //   szLine - must not be 0
+    virtual void SetInputLine(const char* szLine) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Dump all key bindings to a callback-interface
+    // @param Callback callback-interface which needs to be called for each element
+    virtual void DumpKeyBinds(IKeyBindDumpSink* pCallback) = 0;
+    virtual const char* FindKeyBind(const char* sCmd) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Hashing of cvars (for anti-cheat). Separates setting of range, calculation,
+    // and retrieval of result so calculation can be done at a known safe point
+    // (e.g end of frame) when we know cvars won't be modified or in temporary state
+
+    // Get Number of cvars that can be hashed
+    virtual int GetNumCheatVars() = 0;
+    // Set the range of cvars
+    virtual void SetCheatVarHashRange(size_t firstVar, size_t lastVar) = 0;
+    // Calculate the hash from current cvars
+    virtual void CalcCheatVarHash() = 0;
+    // Since hash is calculated async, check if it's completed
+    virtual bool IsHashCalculated() = 0;
+    // Get the hash calculated
+    virtual uint64 GetCheatVarHash() = 0;
+    virtual void PrintCheatVars(bool bUseLastHashRange) = 0;
+    virtual char* GetCheatVarAt(uint32 nOffset) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Console variable sink.
+    // Adds a new console variables sink callback.
+    virtual void AddConsoleVarSink(IConsoleVarSink* pSink) = 0;
+    //! Removes a console variables sink callback.
+    virtual void RemoveConsoleVarSink(IConsoleVarSink* pSink) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // History
+    //////////////////////////////////////////////////////////////////////////
+
+    // \param bUpOrDown true=after pressed "up", false=after pressed "down"
+    // \return 0 if there is no history line or pointer to the null terminated history line
+    virtual const char* GetHistoryElement(bool bUpOrDown) = 0;
+    //! \param szCommand must not be 0
+    virtual void AddCommandToHistory(const char* szCommand) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    virtual void LoadConfigVar(const char* sVariable, const char* sValue) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Enable or disable the activation key (tilde by default).
+    // This is useful when user is in a text field and want to be able to enter the default key.
+    // bEnable=true console will show
+    // bEnable=false console will no show
+    virtual void EnableActivationKey(bool bEnable) = 0;
+
+
+    // </interfuscator:shuffle>
+
+    virtual void SetClientDataProbeString(const char* pName, const char* pValue) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Description:
+//  This interface for the remote console
+struct IRemoteConsoleListener
+{
+    virtual ~IRemoteConsoleListener() {}
+
+    virtual void OnConsoleCommand([[maybe_unused]] const char* cmd) {};
+    virtual void OnGameplayCommand([[maybe_unused]] const char* cmd) {};
+};
+
+struct IRemoteConsole
+{
+    virtual ~IRemoteConsole() {};
+
+    virtual void RegisterConsoleVariables() = 0;
+    virtual void UnregisterConsoleVariables() = 0;
+
+    virtual void Start() = 0;
+    virtual void Stop() = 0;
+    virtual bool IsStarted() const = 0;
+
+    virtual void AddLogMessage(const char* log) = 0;
+    virtual void AddLogWarning(const char* log) = 0;
+    virtual void AddLogError(const char* log) = 0;
+
+    virtual void Update() = 0;
+
+    virtual void RegisterListener(IRemoteConsoleListener* pListener, const char* name) = 0;
+    virtual void UnregisterListener(IRemoteConsoleListener* pListener) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Description:
+//  This interface is the 1:1 "C++ representation"
+//  of a console variable.
+// Note:
+//  A console variable is accessible in C++ trough
+//  this interface and in all scripts as global variable
+//  (with the same name of the variable in the console)
+struct ICVar
+{
+    enum EConsoleLogMode
+    {
+        eCLM_Off,                           // off
+        eCLM_ConsoleAndFile,    // normal info to console and file
+        eCLM_FileOnly,              // normal info to file only
+        eCLM_FullInfo                   // full info to file only
+    };
+
+    // <interfuscator:shuffle>
+    // TODO make protected;
+    virtual ~ICVar() {}
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // delete the variable
+    // NOTE: the variable will automatically unregister itself from the console
+    virtual void Release() = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Return the integer value of the variable
+    // @return the value
+    virtual int GetIVal() const = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Return the 64-bit integer value of the variable
+    // @return the value
+    virtual int64 GetI64Val() const = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Return the float value of the variable
+    // @return the value
+    virtual float GetFVal() const = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Return the string value of the variable, don't store pointer as multiple calls to this function might return same memory ptr
+    // @return the value
+    virtual const char* GetString() const = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Return the data probe string value of the variable, don't store pointer as multiple calls to this function might return same memory ptr
+    // @return the value
+    virtual const char* GetDataProbeString() const = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Reset the CVar to its default value if possible
+    virtual void Reset() {}
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // set the string value of the variable
+    // @param s string representation the value
+    virtual void Set(const char* s) = 0;
+
+    // Force to set the string value of the variable - can be called
+    // from inside code only
+    // @param s string representation the value
+    virtual void ForceSet(const char* s) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // set the float value of the variable
+    // @param s float representation the value
+    virtual void Set(float f) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // set the float value of the variable
+    // @param s integer representation the value
+    virtual void Set(int i) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // clear the specified bits in the flag field
+    virtual void ClearFlags (int flags) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // return the variable's flags
+    // @return the variable's flags
+    // See Also: EVarFlags
+    virtual int GetFlags() const = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Set the variable's flags
+    // See Also: EVarFlags
+    virtual int SetFlags(int flags) = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // return the primary variable's type
+    // @return the primary variable's type  e.g. CVAR_INT, CVAR_FLOAT, CVAR_STRING
+    virtual int GetType() = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // return the variable's name
+    // @return the variable's name
+    virtual const char* GetName() const = 0;
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // return the variable's help text
+    // @return the variable's help text, can be 0 if no help is available
+    virtual const char* GetHelp() = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // return if the variable may be modified in config files
+    // @return if the variable may be modified in config files
+    virtual bool IsConstCVar() const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set a new on change function callback.
+    // Deprecated function. The functor should be preferred.
+    virtual void SetOnChangeCallback(ConsoleVarFunc pChangeFunc) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Adds a new on change functor to the list.
+    // It will add from index 1 on (0 is reserved).
+    // Returns an ID to use when getting or removing the functor
+    virtual uint64 AddOnChangeFunctor(const SFunctor& pChangeFunctor) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Returns the number of registered on change functos.
+    virtual uint64 GetNumberOfOnChangeFunctors() const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Returns the functors with the specified id.
+    virtual const SFunctor& GetOnChangeFunctor(uint64 nFunctorId) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Removes an on change functor
+    // returns true if removal was successful.
+    virtual bool RemoveOnChangeFunctor(uint64 nFunctorId) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Get the current callback function.
+    virtual ConsoleVarFunc GetOnChangeCallback() const = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // only useful for CVarGroups, other types return GetIVal()
+    // CVarGroups set multiple other CVars and this function returns
+    // the integer value the CVarGroup should have, when looking at the controlled cvars
+    // Returns:
+    //   value that would represent the state, -1 if the state cannot be found
+    virtual int GetRealIVal() const = 0;
+
+    virtual void SetLimits(float min, float max) = 0;
+    virtual void GetLimits(float& min, float& max) = 0;
+    virtual bool HasCustomLimits() = 0;
+
+    // only useful for CVarGroups
+    // log difference between expected state and real state
+    virtual void DebugLog([[maybe_unused]] const int iExpectedValue, [[maybe_unused]] const EConsoleLogMode mode) const {}
+    // </interfuscator:shuffle>
+
+    // Set the data probe string value of the variable
+    virtual void SetDataProbeString(const char* pDataProbeString) = 0;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_ICONSOLE_H
diff --git a/Code/Legacy/CryCommon/IEntityRenderState.h b/Code/Legacy/CryCommon/IEntityRenderState.h
new file mode 100644
index 0000000000..7e23bd9d92
--- /dev/null
+++ b/Code/Legacy/CryCommon/IEntityRenderState.h
@@ -0,0 +1,787 @@
+/*
+ * 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_IENTITYRENDERSTATE_H
+#define CRYINCLUDE_CRYCOMMON_IENTITYRENDERSTATE_H
+#pragma once
+
+#include <IRenderer.h>
+#include <limits>
+#include <AzCore/Component/EntityId.h>
+
+namespace AZ 
+{
+    class Vector2;
+}
+
+struct IMaterial;
+struct IVisArea;
+struct SRenderingPassInfo;
+struct SRendItemSorter;
+struct SFrameLodInfo;
+struct pe_params_area;
+struct pe_articgeomparams;
+
+// @NOTE: When removing an item from this enum, replace it with a dummy - ID's from this enum are stored in data and should not change.
+enum EERType
+{
+    eERType_NotRenderNode,
+    eERType_Dummy_10,
+    eERType_Dummy8, 
+    eERType_Light,
+    eERType_Cloud,
+    eERType_TerrainSystem, // used to be eERType_Dummy_1 which used to be eERType_VoxelObject, preserve order for compatibility
+    eERType_FogVolume,
+    eERType_Decal,
+    eERType_Dummy_6, // used to be eERType_ParticleEmitter, preserve order for compatibility
+    eERType_WaterVolume,
+    eERType_Dummy_5, // used to be eERType_WaterWave, preserve order for compatibility
+    eERType_Dummy_7, // used to be eERType_Road, preserve order for compatibility
+    eERType_DistanceCloud,
+    eERType_VolumeObject,
+    eERType_Dummy_0, // used to be eERType_AutoCubeMap, preserve order for compatibility
+    eERType_Rope,
+    eERType_PrismObject,
+    eERType_Dummy_2, // used to be eERType_IsoMesh, preserve order for compatibility
+    eERType_Dummy_4,
+    eERType_RenderComponent,
+    eERType_GameEffect,
+    eERType_BreakableGlass,
+    eERType_Dummy_3, // used to be eERType_LightShape, preserve order for compatibility
+    eERType_Dummy_9,
+    eERType_GeomCache,
+    eERType_StaticMeshRenderComponent,
+    eERType_DynamicMeshRenderComponent,
+    eERType_SkinnedMeshRenderComponent,
+    eERType_TypesNum, // MUST BE AT END TOTAL NUMBER OF ERTYPES
+};
+
+enum ERNListType
+{
+    eRNListType_Unknown,
+    eRNListType_DecalsAndRoads,
+    eRNListType_ListsNum,
+    eRNListType_First = eRNListType_Unknown, // This should be the last member
+    // And it counts on eRNListType_Unknown
+    // being the first enum element.
+};
+
+enum EOcclusionObjectType
+{
+    eoot_OCCLUDER,
+    eoot_OCEAN,
+    eoot_OCCELL,
+    eoot_OCCELL_OCCLUDER,
+    eoot_OBJECT,
+    eoot_OBJECT_TO_LIGHT,
+    eoot_TERRAIN_NODE,
+    eoot_PORTAL,
+};
+
+// RenderNode flags
+
+#define ERF_GOOD_OCCLUDER               BIT(0)
+#define ERF_PROCEDURAL                  BIT(1)
+#define ERF_CLONE_SOURCE                BIT(2) // set if this object was cloned from another one
+#define ERF_CASTSHADOWMAPS              BIT(3) // if you ever set this flag, be sure also to set ERF_HAS_CASTSHADOWMAPS
+#define ERF_RENDER_ALWAYS               BIT(4)
+#define ERF_DYNAMIC_DISTANCESHADOWS     BIT(5)
+#define ERF_HIDABLE                     BIT(6)
+#define ERF_HIDABLE_SECONDARY           BIT(7)
+#define ERF_HIDDEN                      BIT(8)
+#define ERF_SELECTED                    BIT(9)
+#define ERF_PROCEDURAL_ENTITY           BIT(10) // this is an object generated at runtime which has a limited lifetime (matches procedural entity)
+#define ERF_OUTDOORONLY                 BIT(11)
+#define ERF_NODYNWATER                  BIT(12)
+#define ERF_EXCLUDE_FROM_TRIANGULATION  BIT(13)
+#define ERF_REGISTER_BY_BBOX            BIT(14)
+#define ERF_STATIC_INSTANCING           BIT(15)
+#define ERF_VOXELIZE_STATIC             BIT(16)
+#define ERF_NO_PHYSICS                  BIT(17)
+#define ERF_NO_DECALNODE_DECALS         BIT(18)
+#define ERF_REGISTER_BY_POSITION        BIT(19)
+#define ERF_COMPONENT_ENTITY            BIT(20)
+#define ERF_RECVWIND                    BIT(21)
+#define ERF_COLLISION_PROXY             BIT(22) // Collision proxy is a special object that is only visible in editor
+// and used for physical collisions with player and vehicles.
+#define ERF_LOD_BBOX_BASED              BIT(23) // Lod changes based on bounding boxes.
+#define ERF_SPEC_BIT0                   BIT(24) // Bit0 of min config specification.
+#define ERF_SPEC_BIT1                   BIT(25) // Bit1 of min config specification.
+#define ERF_SPEC_BIT2                   BIT(26) // Bit2 of min config specification.
+#define ERF_SPEC_BITS_MASK              (ERF_SPEC_BIT0 | ERF_SPEC_BIT1 | ERF_SPEC_BIT2) // Bit mask of the min spec bits.
+#define ERF_SPEC_BITS_SHIFT             (24)    // Bit offset of the ERF_SPEC_BIT0.
+#define ERF_RAYCAST_PROXY               BIT(27) // raycast proxy is only used for raycasting
+#define ERF_HUD                         BIT(28) // Hud object that can avoid some visibility tests
+#define ERF_RAIN_OCCLUDER               BIT(29) // Is used for rain occlusion map
+#define ERF_HAS_CASTSHADOWMAPS          BIT(30) // at one point had ERF_CASTSHADOWMAPS set
+#define ERF_ACTIVE_LAYER                BIT(31) // the node is on a currently active layer
+
+struct IShadowCaster
+{
+    // <interfuscator:shuffle>
+    virtual ~IShadowCaster(){}
+    virtual bool HasOcclusionmap([[maybe_unused]] int nLod, [[maybe_unused]] IRenderNode* pLightOwner) { return false; }
+    virtual CLodValue ComputeLod(int wantedLod, [[maybe_unused]] const SRenderingPassInfo& passInfo) { return CLodValue(wantedLod); }
+    virtual void Render(const SRendParams& RendParams, const SRenderingPassInfo& passInfo) = 0;
+    virtual const AABB GetBBoxVirtual() = 0;
+    virtual void FillBBox(AABB& aabb) = 0;
+    virtual EERType GetRenderNodeType() = 0;
+    virtual bool IsRenderNode() { return true; }
+    // </interfuscator:shuffle>
+    uint8 m_cStaticShadowLod;
+};
+
+// Optional filter function for octree queries to perform custom filtering of the results.
+// return true to keep the render node, false to filter it out.
+using ObjectTreeQueryFilterCallback = AZStd::function<bool(IRenderNode*, EERType)>;
+
+struct IOctreeNode
+{
+public:
+    virtual ~IOctreeNode() {};
+
+    virtual void GetObjectsByType(PodArray<IRenderNode*>& lstObjects, EERType objType, const AABB* pBBox, ObjectTreeQueryFilterCallback filterCallback = nullptr) = 0;
+
+    struct CVisArea* m_pVisArea;
+};
+
+struct SLodDistDissolveTransitionState
+{
+    float fStartDist;
+    int8 nOldLod;
+    int8 nNewLod;
+    bool bFarside;
+};
+
+struct SLightInfo
+{
+    bool operator == (const SLightInfo& other) const
+    { return other.vPos.IsEquivalent(vPos, 0.1f) && fabs(other.fRadius - fRadius) < 0.1f; }
+    Vec3 vPos;
+    float fRadius;
+    bool bAffecting;
+};
+
+struct IRenderNode
+    : public IShadowCaster
+{
+    enum EInternalFlags
+    {
+        DECAL_OWNER     = BIT(0),           // Owns some decals.
+        REQUIRES_NEAREST_CUBEMAP = BIT(1), // Pick nearest cube map
+        UPDATE_DECALS   = BIT(2),           // The node changed geometry - decals must be updated.
+        REQUIRES_FORWARD_RENDERING = BIT(3), // Special shadow processing needed.
+        WAS_INVISIBLE   = BIT(4),           // Was invisible last frame.
+        WAS_IN_VISAREA  = BIT(5),           // Was inside vis-ares last frame.
+        WAS_FARAWAY         = BIT(6),         // Was considered 'far away' for the purposes of physics deactivation.
+        HAS_OCCLUSION_PROXY = BIT(7)    // This node has occlusion proxy.
+    };
+
+    IRenderNode()
+    {
+        m_dwRndFlags = 0;
+        m_fViewDistanceMultiplier = static_cast<float>(IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX); // By default object is not limited by distance. 
+        m_ucLodRatio = 100;
+        m_pOcNode = 0;
+        m_fWSMaxViewDist = 0;
+        m_nInternalFlags = 0;
+        m_nMaterialLayers = 0;
+        m_pRNTmpData = NULL;
+        m_pPrev = m_pNext = NULL;
+        m_nSID = 0;
+        m_cShadowLodBias = 0;
+        m_cStaticShadowLod = 0;
+    }
+
+    virtual bool CanExecuteRenderAsJob() { return false; }
+
+    // <interfuscator:shuffle>
+    // Debug info about object.
+    virtual const char* GetName() const = 0;
+    virtual const char* GetEntityClassName() const = 0;
+    virtual string GetDebugString([[maybe_unused]] char type = 0) const { return ""; }
+    virtual float GetImportance() const   { return 1.f; }
+
+    // Description:
+    //    Releases IRenderNode.
+    virtual void ReleaseNode([[maybe_unused]] bool bImmediate = false) { delete this; }
+
+
+    virtual IRenderNode* Clone() const { return NULL; }
+
+    // Description:
+    //    Sets render node transformation matrix.
+    virtual void SetMatrix([[maybe_unused]] const Matrix34& mat) {}
+
+    // Description:
+    //    Gets local bounds of the render node.
+    virtual void GetLocalBounds(AABB& bbox) { AABB WSBBox(GetBBox()); bbox = AABB(WSBBox.min - GetPos(true), WSBBox.max - GetPos(true)); }
+
+    virtual Vec3 GetPos(bool bWorldOnly = true) const = 0;
+    virtual const AABB GetBBox() const = 0;
+    virtual void FillBBox(AABB& aabb) { aabb = GetBBox(); }
+    virtual void SetBBox(const AABB& WSBBox) = 0;
+
+    virtual void SetScale([[maybe_unused]] const Vec3& scale) {}
+    
+    //Get the scales assuming the scale is uniform or per column as needed.
+    virtual float GetUniformScale() { return 1.0f; }
+    virtual float GetColumnScale([[maybe_unused]] int column) { return 1.0f; }
+
+    // Summary:
+    //    Changes the world coordinates position of this node by delta
+    //    Don't forget to call this base function when overriding it.
+    virtual void OffsetPosition(const Vec3& delta) = 0;
+
+    // Return true when the node is initialized and ready to render
+    virtual bool IsReady() const { return true; }
+
+    // Summary:
+    //   Renders node geometry
+    virtual void Render(const struct SRendParams& EntDrawParams, const SRenderingPassInfo& passInfo) = 0;
+
+    // Hides/disables node in renderer.
+    virtual void Hide(bool bHide) { SetRndFlags(ERF_HIDDEN, bHide); }
+    bool IsHidden() const { return (GetRndFlags() & ERF_HIDDEN) != 0; }
+
+    // Gives access to object components.
+    virtual struct IStatObj* GetEntityStatObj(unsigned int nPartId = 0, unsigned int nSubPartId = 0, Matrix34A* pMatrix = NULL, bool bReturnOnlyVisible = false);
+    virtual _smart_ptr<IMaterial> GetEntitySlotMaterial([[maybe_unused]] unsigned int nPartId, [[maybe_unused]] bool bReturnOnlyVisible = false, [[maybe_unused]] bool* pbDrawNear = NULL) { return NULL; }
+    virtual void SetEntityStatObj([[maybe_unused]] unsigned int nSlot, [[maybe_unused]] IStatObj* pStatObj, [[maybe_unused]] const Matrix34A* pMatrix = NULL) {};
+    virtual int GetSlotCount() const { return 1; }
+
+    // Summary:
+    //   Returns IRenderMesh of the object.
+    virtual struct IRenderMesh* GetRenderMesh([[maybe_unused]] int nLod) { return 0; };
+
+    // Description:
+    //   Allows to adjust default lod distance settings,
+    //   if fLodRatio is 100 - default lod distance is used.
+    virtual void SetLodRatio(int nLodRatio) { m_ucLodRatio = static_cast<unsigned char>(min(255, max(0, nLodRatio))); }
+
+    // Summary:
+    //   Gets material layers mask.
+    virtual uint8 GetMaterialLayers() const { return m_nMaterialLayers; }
+
+
+    // Summary
+    //   Physicalizes if it isn't already.
+    virtual void CheckPhysicalized() {};
+
+    // Summary:
+    //   Physicalizes node.
+    virtual void Physicalize([[maybe_unused]] bool bInstant = false) {}
+
+    virtual ~IRenderNode() { assert(!m_pRNTmpData); };
+
+    // Summary:
+    //   Sets override material for this instance.
+    virtual void SetMaterial(_smart_ptr<IMaterial> pMat) = 0;
+    // Summary:
+    //   Queries override material of this instance.
+    virtual _smart_ptr<IMaterial> GetMaterial(Vec3* pHitPos = NULL) = 0;
+    virtual _smart_ptr<IMaterial> GetMaterialOverride() = 0;
+    virtual void GetMaterials(AZStd::vector<_smart_ptr<IMaterial>>& materials)
+    {
+        _smart_ptr<IMaterial> currentMaterial = GetMaterialOverride();
+        if (!currentMaterial)
+        {
+            currentMaterial = GetMaterial();
+        }
+        if (currentMaterial)
+        {
+            materials.push_back(currentMaterial);
+        }
+    }
+
+    // Used by the editor during export
+    virtual void SetCollisionClassIndex([[maybe_unused]] int tableIndex) {}
+
+    virtual int GetEditorObjectId() { return 0; }
+    virtual void SetEditorObjectId([[maybe_unused]] int nEditorObjectId) {}
+    virtual void SetStatObjGroupIndex([[maybe_unused]] int nVegetationGroupIndex) { }
+    virtual int GetStatObjGroupId() const { return -1; }
+    virtual void SetLayerId([[maybe_unused]] uint16 nLayerId) { }
+    virtual uint16 GetLayerId() { return 0; }
+    virtual float GetMaxViewDist() = 0;
+
+    virtual EERType GetRenderNodeType() = 0;
+    virtual bool IsAllocatedOutsideOf3DEngineDLL() 
+    { 
+        return GetRenderNodeType() == eERType_RenderComponent || 
+            GetRenderNodeType() == eERType_StaticMeshRenderComponent || 
+            GetRenderNodeType() == eERType_DynamicMeshRenderComponent || 
+            GetRenderNodeType() == eERType_SkinnedMeshRenderComponent;
+    }
+    virtual void Dephysicalize([[maybe_unused]] bool bKeepIfReferenced = false) {}
+    virtual void Dematerialize() {}
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+
+    virtual void Precache() {};
+
+    virtual const AABB GetBBoxVirtual() { return GetBBox(); }
+
+    //  virtual float GetLodForDistance(float fDistance) { return 0; }
+
+    virtual void OnRenderNodeBecomeVisible([[maybe_unused]] const SRenderingPassInfo& passInfo) {}
+    virtual void OnPhysAreaChange() {}
+
+    virtual bool IsMovableByGame() const { return false; }
+
+    virtual uint8 GetSortPriority() { return 0; }
+
+    // Types of voxelization for objects and lights
+    enum EVoxelGIMode : int
+    {
+        VM_None = 0, // No voxelization
+        VM_Static, // Incremental or asynchronous lazy voxelization
+        VM_Dynamic, // Real-time every-frame voxelization on GPU
+    };
+
+    virtual EVoxelGIMode GetVoxelGIMode() { return VM_None; }
+    virtual void SetDesiredVoxelGIMode([[maybe_unused]] EVoxelGIMode voxelMode) {}
+
+    virtual void SetMinSpec(int nMinSpec) { m_dwRndFlags &= ~ERF_SPEC_BITS_MASK; m_dwRndFlags |= (nMinSpec << ERF_SPEC_BITS_SHIFT) & ERF_SPEC_BITS_MASK; };
+
+    // Description:
+    //  Allows to adjust default max view distance settings,
+    //  if fMaxViewDistRatio is 1.0f - default max view distance is used.
+    virtual void SetViewDistanceMultiplier(float fViewDistanceMultiplier);
+    // </interfuscator:shuffle>
+
+    void CopyIRenderNodeData(IRenderNode* pDest) const
+    {
+        pDest->m_fWSMaxViewDist         = m_fWSMaxViewDist;
+        pDest->m_dwRndFlags                 = m_dwRndFlags;
+        //pDest->m_pOcNode                      = m_pOcNode;        // Removed to stop the registering from earlying out.
+        pDest->m_fViewDistanceMultiplier = m_fViewDistanceMultiplier;
+        pDest->m_ucLodRatio                 = m_ucLodRatio;
+        pDest->m_cShadowLodBias         = m_cShadowLodBias;
+        pDest->m_cStaticShadowLod       = m_cStaticShadowLod;
+        pDest->m_nInternalFlags         = m_nInternalFlags;
+        pDest->m_nMaterialLayers        = m_nMaterialLayers;
+        //pDestBrush->m_pRNTmpData              //If this is copied from the source render node, there are two
+        //  pointers to the same data, and if either is deleted, there will
+        //  be a crash when the dangling pointer is used on the other
+    }
+
+    // Rendering flags.
+    ILINE void SetRndFlags(unsigned int dwFlags) { m_dwRndFlags = dwFlags; }
+    ILINE void SetRndFlags(unsigned int dwFlags, bool bEnable)
+    {
+        if (bEnable)
+        {
+            SetRndFlags(m_dwRndFlags | dwFlags);
+        }
+        else
+        {
+            SetRndFlags(m_dwRndFlags & (~dwFlags));
+        }
+    }
+    ILINE unsigned int GetRndFlags() const { return m_dwRndFlags; }
+
+    // Object draw frames (set if was drawn).
+    ILINE void SetDrawFrame(int nFrameID, int nRecursionLevel)
+    {
+        assert(m_pRNTmpData);
+        int* pDrawFrames = (int*)m_pRNTmpData;
+        pDrawFrames[nRecursionLevel] = nFrameID;
+    }
+
+    ILINE int GetDrawFrame(int nRecursionLevel = 0) const
+    {
+        IF (!m_pRNTmpData, 0)
+        {
+            return 0;
+        }
+
+        int* pDrawFrames = (int*)m_pRNTmpData;
+        return pDrawFrames[nRecursionLevel];
+    }
+
+    // Returns:
+    //   Current VisArea or null if in outdoors or entity was not registered in 3dengine.
+    ILINE IVisArea* GetEntityVisArea() const { return m_pOcNode ? (IVisArea*)(m_pOcNode->m_pVisArea) : NULL; }
+
+    // Summary:
+    //   Makes object visible at any distance.
+    ILINE void SetViewDistUnlimited() { SetViewDistanceMultiplier(100.0f); }
+
+    // Summary:
+    //   Retrieves the view distance settings.
+    ILINE float GetViewDistanceMultiplier() const
+    {
+        return m_fViewDistanceMultiplier;
+    }
+
+    // Summary:
+    //   Returns lod distance ratio.
+    ILINE int GetLodRatio() const { return m_ucLodRatio; }
+
+    // Summary:
+    //   Returns lod distance ratio
+    ILINE float GetLodRatioNormalized() const { return 0.01f * m_ucLodRatio; }
+
+    virtual bool GetLodDistances([[maybe_unused]] const SFrameLodInfo& frameLodInfo, [[maybe_unused]] float* distances) const { return false; }
+
+    // Returns distance for first lod change, not factoring in distance multiplier or lod ratio
+    virtual float GetFirstLodDistance() const { return FLT_MAX; }
+
+    // Description:
+    //  Bias value to add to the regular lod
+    virtual void SetShadowLodBias(int8 nShadowLodBias) { m_cShadowLodBias = nShadowLodBias; }
+
+    // Summary:
+    //   Returns lod distance ratio.
+    ILINE int GetShadowLodBias() const { return m_cShadowLodBias; }
+
+    // Summary:
+    //   Sets material layers mask.
+    ILINE void SetMaterialLayers(uint8 nMtlLayers) { m_nMaterialLayers = nMtlLayers; }
+
+    ILINE int  GetMinSpec() const { return (m_dwRndFlags & ERF_SPEC_BITS_MASK) >> ERF_SPEC_BITS_SHIFT; };
+
+    static const ERNListType GetRenderNodeListId(const EERType eRType)
+    {
+        switch (eRType)
+        {
+        case eERType_Decal:
+            return eRNListType_DecalsAndRoads;
+        default:
+            return eRNListType_Unknown;
+        }
+    }
+
+    virtual AZ::EntityId GetEntityId() { return AZ::EntityId(); }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Variables
+    //////////////////////////////////////////////////////////////////////////
+
+public:
+
+    // Every sector has linked list of IRenderNode objects.
+    IRenderNode* m_pNext, * m_pPrev;
+
+    // Current objects tree cell.
+    IOctreeNode* m_pOcNode;
+
+    // Pointer to temporary data allocated only for currently visible objects.
+    struct CRNTmpData* m_pRNTmpData;
+
+    // Max view distance.
+    float m_fWSMaxViewDist;
+
+    // Render flags.
+    int m_dwRndFlags;
+
+    // Shadow LOD bias
+    // Set to SHADOW_LODBIAS_DISABLE to disable any shadow lod overrides for this rendernode
+    static const int8 SHADOW_LODBIAS_DISABLE = -128;
+    int8 m_cShadowLodBias;
+
+    // Segment Id
+    int m_nSID;
+
+    // Max view distance settings.
+    static const int VIEW_DISTANCE_MULTIPLIER_MAX = 100;
+    float m_fViewDistanceMultiplier;
+
+    // LOD settings.
+    unsigned char m_ucLodRatio;
+
+    // Flags for render node internal usage, one or more bits from EInternalFlags.
+    unsigned char m_nInternalFlags;
+
+    // Material layers bitmask -> which material layers are active.
+    unsigned char m_nMaterialLayers;
+};
+
+inline void IRenderNode::SetViewDistanceMultiplier(float fViewDistanceMultiplier)
+{
+    fViewDistanceMultiplier = CLAMP(fViewDistanceMultiplier, 0.0f, 100.0f);
+    if (fabs(m_fViewDistanceMultiplier - fViewDistanceMultiplier) > FLT_EPSILON)
+    {
+        m_fViewDistanceMultiplier = fViewDistanceMultiplier;
+    }
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+inline IStatObj* IRenderNode::GetEntityStatObj([[maybe_unused]] unsigned int nPartId, [[maybe_unused]] unsigned int nSubPartId, [[maybe_unused]] Matrix34A* pMatrix, [[maybe_unused]] bool bReturnOnlyVisible)
+{
+    return 0;
+}
+
+
+//We must use interfaces instead of unsafe type casts and unnecessary includes
+
+struct ILightSource
+    : public IRenderNode
+{
+    // <interfuscator:shuffle>
+    virtual void SetLightProperties(const CDLight& light) = 0;
+    virtual CDLight& GetLightProperties() = 0;
+    virtual const Matrix34& GetMatrix() = 0;
+    virtual struct ShadowMapFrustum* GetShadowFrustum(int nId = 0) = 0;
+    virtual bool IsLightAreasVisible() = 0;
+    virtual void SetCastingException(IRenderNode* pNotCaster) = 0;
+    virtual void SetName(const char* name) = 0;
+    // </interfuscator:shuffle>
+};
+
+struct SCloudMovementProperties
+{
+    bool m_autoMove;
+    Vec3 m_speed;
+    Vec3 m_spaceLoopBox;
+    float m_fadeDistance;
+};
+
+// Summary:
+//   ICloudRenderNode is an interface to the Cloud Render Node object.
+struct ICloudRenderNode
+    : public IRenderNode
+{
+    // <interfuscator:shuffle>
+    // Description:
+    //    Loads a cloud from a cloud description XML file.
+    virtual bool LoadCloud(const char* sCloudFilename) = 0;
+    virtual bool LoadCloudFromXml(XmlNodeRef cloudNode) = 0;
+    virtual void SetMovementProperties(const SCloudMovementProperties& properties) = 0;
+    // </interfuscator:shuffle>
+};
+
+// Summary:
+//   IVoxelObject is an interface to the Voxel Object Render Node object.
+struct IVoxelObject
+    : public IRenderNode
+{
+    // <interfuscator:shuffle>
+    virtual void SetCompiledData(void* pData, int nSize, uint8 ucChildId, EEndian eEndian) = 0;
+    virtual void SetObjectName(const char* pName) = 0;
+    virtual void SetMatrix(const Matrix34& mat) = 0;
+    virtual bool ResetTransformation() = 0;
+    virtual void InterpolateVoxelData() = 0;
+    virtual void SetFlags(int nFlags) = 0;
+    virtual void Regenerate() = 0;
+    virtual void CopyHM() = 0;
+    virtual bool IsEmpty() = 0;
+    // </interfuscator:shuffle>
+};
+
+// Summary:
+//   IFogVolumeRenderNode is an interface to the Fog Volume Render Node object.
+struct SFogVolumeProperties
+{
+    // Common parameters.
+    // Center position & rotation values are taken from the entity matrix.
+
+    int           m_volumeType;
+    Vec3      m_size;
+    ColorF        m_color;
+    bool      m_useGlobalFogColor;
+    bool        m_ignoresVisAreas;
+    bool        m_affectsThisAreaOnly;
+    float     m_globalDensity;
+    float     m_densityOffset;
+    float     m_softEdges;
+    float     m_fHDRDynamic;            // 0 to get the same results in LDR, <0 to get darker, >0 to get brighter.
+    float     m_nearCutoff;
+
+    float m_heightFallOffDirLong;       // Height based fog specifics.
+    float m_heightFallOffDirLati;       // Height based fog specifics.
+    float m_heightFallOffShift;             // Height based fog specifics.
+    float m_heightFallOffScale;             // Height based fog specifics.
+
+    float m_rampStart;
+    float m_rampEnd;
+    float m_rampInfluence;
+    float m_windInfluence;
+    float m_densityNoiseScale;
+    float m_densityNoiseOffset;
+    float m_densityNoiseTimeFrequency;
+    Vec3 m_densityNoiseFrequency;
+};
+
+struct IFogVolumeRenderNode
+    : public IRenderNode
+{
+    // <interfuscator:shuffle>
+    virtual void SetFogVolumeProperties(const SFogVolumeProperties& properties) = 0;
+    virtual const Matrix34& GetMatrix() const = 0;
+
+    virtual void FadeGlobalDensity(float fadeTime, float newGlobalDensity) = 0;
+    // </interfuscator:shuffle>
+};
+
+// LY renderer system spec levels.
+enum class EngineSpec : AZ::u32
+{
+    Low = 1,
+    Medium,
+    High,
+    VeryHigh,
+    Never = UINT_MAX,
+};
+
+struct SDecalProperties
+{
+    SDecalProperties()
+    {
+        m_projectionType = ePlanar;
+        m_sortPrio = 0;
+        m_deferred = false;
+        m_pos = Vec3(0.0f, 0.0f, 0.0f);
+        m_normal = Vec3(0.0f, 0.0f, 1.0f);
+        m_explicitRightUpFront = Matrix33::CreateIdentity();
+        m_radius = 1.0f;
+        m_depth = 1.0f;
+        m_opacity = 1.0f;
+        m_angleAttenuation = 1.0f;
+        m_maxViewDist = 8000.0f;
+        m_minSpec = EngineSpec::Low;
+    }
+
+    enum EProjectionType : int
+    {
+        ePlanar,
+        eProjectOnTerrain,
+        eProjectOnTerrainAndStaticObjects
+    };
+
+    EProjectionType m_projectionType;
+    uint8 m_sortPrio;
+    uint8 m_deferred;
+    Vec3 m_pos;
+    Vec3 m_normal;
+    Matrix33 m_explicitRightUpFront;
+    float m_radius;
+    float m_depth;
+    const char* m_pMaterialName;
+    float m_opacity;
+    float m_angleAttenuation;
+    float m_maxViewDist;
+    EngineSpec m_minSpec;
+};
+
+// Description:
+//   IDecalRenderNode is an interface to the Decal Render Node object.
+struct IDecalRenderNode
+    : public IRenderNode
+{
+    // <interfuscator:shuffle>
+    virtual void SetDecalProperties(const SDecalProperties& properties) = 0;
+    virtual const SDecalProperties* GetDecalProperties() const = 0;
+    virtual const Matrix34& GetMatrix() = 0;
+    virtual void CleanUpOldDecals() = 0;
+    // </interfuscator:shuffle>
+};
+
+// Description:
+//   IWaterVolumeRenderNode is an interface to the Water Volume Render Node object.
+struct IWaterVolumeRenderNode
+    : public IRenderNode
+{
+    enum EWaterVolumeType
+    {
+        eWVT_Unknown,
+        eWVT_Ocean,
+        eWVT_Area,
+        eWVT_River
+    };
+
+    // <interfuscator:shuffle>
+    // Description:
+    // Sets if the render node is attached to a parent entity
+    // This must be called right after the object construction if it is the case
+    // Only supported for Areas (not rivers or ocean)
+    virtual void SetAreaAttachedToEntity() = 0;
+
+    virtual void SetFogDensity(float fogDensity) = 0;
+    virtual float GetFogDensity() const = 0;
+    virtual void SetFogColor(const Vec3& fogColor) = 0;
+    virtual void SetFogColorAffectedBySun(bool enable) = 0;
+    virtual void SetFogShadowing(float fogShadowing) = 0;
+
+    virtual void SetCapFogAtVolumeDepth(bool capFog) = 0;
+    virtual void SetVolumeDepth(float volumeDepth) = 0;
+    virtual void SetStreamSpeed(float streamSpeed) = 0;
+
+    virtual void SetCaustics(bool caustics) = 0;
+    virtual void SetCausticIntensity(float causticIntensity) = 0;
+    virtual void SetCausticTiling(float causticTiling) = 0;
+    virtual void SetCausticHeight(float causticHeight) = 0;
+    virtual void SetAuxPhysParams(pe_params_area*) = 0;
+
+    virtual void CreateOcean(uint64 volumeID, /* TBD */ bool keepSerializationParams = false) = 0;
+    virtual void CreateArea(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, const Vec2& surfUVScale, const Plane_tpl<f32>& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
+    virtual void CreateRiver(uint64 volumeID, const Vec3* pVertices, unsigned int numVertices, float uTexCoordBegin, float uTexCoordEnd, const Vec2& surfUVScale, const Plane_tpl<f32>& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
+    virtual void CreateRiver(uint64 volumeID, const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, float uTexCoordBegin, float uTexCoordEnd, const AZ::Vector2& surfUVScale, const AZ::Plane& fogPlane, bool keepSerializationParams = false, int nSID = -1) = 0;
+
+    virtual void SetAreaPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams = false) = 0;
+    virtual void SetRiverPhysicsArea(const Vec3* pVertices, unsigned int numVertices, bool keepSerializationParams = false) = 0;
+    virtual void SetRiverPhysicsArea(const AZStd::vector<AZ::Vector3>& verticies, const AZ::Transform& transform, bool keepSerializationParams = false) = 0;
+
+    // </interfuscator:shuffle>
+
+    // This flag is used to account for legacy entities which used to serialize the node without parent objects.
+    // Now there are runtime components which spawn the rendering node, however we need to support legacy code as well. 
+    // Remove this flag when legacy entities are removed entirely
+    bool m_hasToBeSerialised = true;
+};
+
+// Description:
+//   IDistanceCloudRenderNode is an interface to the Distance Cloud Render Node object.
+struct SDistanceCloudProperties
+{
+    Vec3 m_pos;
+    float m_sizeX;
+    float m_sizeY;
+    float m_rotationZ;
+    const char* m_pMaterialName;
+};
+
+struct IDistanceCloudRenderNode
+    : public IRenderNode
+{
+    virtual void SetProperties(const SDistanceCloudProperties& properties) = 0;
+};
+
+struct SVolumeObjectProperties
+{
+};
+
+struct SVolumeObjectMovementProperties
+{
+    bool m_autoMove;
+    Vec3 m_speed;
+    Vec3 m_spaceLoopBox;
+    float m_fadeDistance;
+};
+
+// Description:
+//   IVolumeObjectRenderNode is an interface to the Volume Object Render Node object.
+struct IVolumeObjectRenderNode
+    : public IRenderNode
+{
+    // <interfuscator:shuffle>
+    virtual void LoadVolumeData(const char* filePath) = 0;
+    virtual void SetProperties(const SVolumeObjectProperties& properties) = 0;
+    virtual void SetMovementProperties(const SVolumeObjectMovementProperties& properties) = 0;
+    // </interfuscator:shuffle>
+};
+
+#if !defined(EXCLUDE_DOCUMENTATION_PURPOSE)
+struct IPrismRenderNode
+    : public IRenderNode
+{
+};
+#endif // EXCLUDE_DOCUMENTATION_PURPOSE
+
+#endif // CRYINCLUDE_CRYCOMMON_IENTITYRENDERSTATE_H
diff --git a/Code/Legacy/CryCommon/IEntityRenderState_info.cpp b/Code/Legacy/CryCommon/IEntityRenderState_info.cpp
new file mode 100644
index 0000000000..73f404eddb
--- /dev/null
+++ b/Code/Legacy/CryCommon/IEntityRenderState_info.cpp
@@ -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
+ *
+ */
+
+
+#include "TypeInfo_impl.h"
+#include <IEntityRenderState.h> // <> required for Interfuscator
+
+ENUM_INFO_BEGIN(EERType)
+ENUM_ELEM_INFO(, eERType_NotRenderNode)
+ENUM_ELEM_INFO(, eERType_Dummy_10)
+ENUM_ELEM_INFO(, eERType_Light)
+ENUM_ELEM_INFO(, eERType_Cloud)
+ENUM_ELEM_INFO(, eERType_TerrainSystem)
+ENUM_ELEM_INFO(, eERType_FogVolume)
+ENUM_ELEM_INFO(, eERType_Decal)
+ENUM_ELEM_INFO(, eERType_Dummy_6)
+ENUM_ELEM_INFO(, eERType_WaterVolume)
+ENUM_ELEM_INFO(, eERType_Dummy_7)
+ENUM_ELEM_INFO(, eERType_DistanceCloud)
+ENUM_ELEM_INFO(, eERType_VolumeObject)
+ENUM_ELEM_INFO(, eERType_Dummy_0)
+ENUM_ELEM_INFO(, eERType_Rope)
+ENUM_ELEM_INFO(, eERType_PrismObject)
+ENUM_ELEM_INFO(, eERType_Dummy_2)
+ENUM_ELEM_INFO(, eERType_Dummy_4)
+ENUM_ELEM_INFO(, eERType_RenderComponent)
+ENUM_ELEM_INFO(, eERType_StaticMeshRenderComponent)
+ENUM_ELEM_INFO(, eERType_DynamicMeshRenderComponent)
+ENUM_ELEM_INFO(, eERType_SkinnedMeshRenderComponent)
+ENUM_ELEM_INFO(, eERType_GameEffect)
+ENUM_ELEM_INFO(, eERType_BreakableGlass)
+ENUM_ELEM_INFO(, eERType_Dummy_3)
+ENUM_ELEM_INFO(, eERType_Dummy_9)
+ENUM_ELEM_INFO(, eERType_GeomCache)
+ENUM_ELEM_INFO(, eERType_TypesNum)
+ENUM_INFO_END(EERType)
diff --git a/Code/Legacy/CryCommon/IFont.h b/Code/Legacy/CryCommon/IFont.h
new file mode 100644
index 0000000000..e496215107
--- /dev/null
+++ b/Code/Legacy/CryCommon/IFont.h
@@ -0,0 +1,374 @@
+/*
+ * 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 : CryFont interface.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IFONT_H
+#define CRYINCLUDE_CRYCOMMON_IFONT_H
+#pragma once
+
+#include <Cry_Math.h>
+#include <Cry_Color.h>
+#include <CryString.h>
+#include <smartptr.h>
+
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzCore/EBus/EBus.h>
+
+struct ISystem;
+class ICrySizer;
+
+struct ICryFont;
+struct IFFont;
+struct FontFamily;
+
+struct SVF_P2F_C4B_T2F_F4B;
+
+extern "C"
+#ifdef CRYFONT_EXPORTS
+DLL_EXPORT
+#else
+DLL_IMPORT
+#endif
+ICryFont * CreateCryFontInterface(ISystem * pSystem);
+
+typedef ICryFont*(* PFNCREATECRYFONTINTERFACE)(ISystem* pSystem);
+typedef AZStd::shared_ptr<FontFamily> FontFamilyPtr;
+
+namespace IFFontConstants
+{
+    //! The default scale applied to individual glyphs when rendering to the font texture.
+    //!
+    //! This is a "best guess" to try and fit all glyphs of a font within the
+    //! bounds of a font texture slot. This value can be defined on a per-font
+    //! basis via the "sizeratio" *.font XML attribute.
+    const float defaultSizeRatio = 0.8f;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+struct ICryFont
+{
+    static const int defaultGlyphSizeX = -1;    //!< Default glyph size indicates that glyphs in the font texture
+                                                //!< should be rendered at the maximum resolution supported by
+                                                //!< the font texture's glyph cell/slot configuration (configured
+                                                //!< via font XML).
+
+    static const int defaultGlyphSizeY = -1;    //!< Default glyph size indicates that glyphs in the font texture
+                                                //!< should be rendered at the maximum resolution supported by
+                                                //!< the font texture's glyph cell/slot configuration (configured
+                                                //!< via font XML).
+
+    // <interfuscator:shuffle>
+    virtual ~ICryFont(){}
+    //
+    virtual void Release() = 0;
+    // Summary:
+    //   Creates a named font (case insensitive)
+    virtual IFFont* NewFont(const char* pFontName) = 0;
+    // Summary:
+    //   Gets a named font (case insensitive)
+    virtual IFFont* GetFont(const char* pFontName) const = 0;
+
+    //! \brief Loads and initializes a Font Family from a *.fontfamily file
+    //! \param pFontFamilyName Name of font family to load (or name of a *.fontfamily file)
+    virtual FontFamilyPtr LoadFontFamily(const char* pFontFamilyName) = 0;
+
+    // Summary:
+    //   Gets font family (case insensitive)
+    virtual FontFamilyPtr GetFontFamily(const char* pFontFamilyName) = 0;
+
+    //! \brief Adds the characters in the given string to all of the font textures within the font family.
+    //! All font styles within the given font family (bold, italic, etc.) will have the given 
+    //! characters added to their font textures.
+    //!
+    //! \param pFontFamily  The font family to add the characters to.
+    //! \param pChars       String of characters to add to font textures (UTF-8 supported).
+    //! \param glyphSizeX   Width (in pixels) of the characters to be rendered at in the font texture.
+    //! \param glyphSizeY   Height (in pixels) of the characters to be rendered at in the font texture.
+    virtual void AddCharsToFontTextures(FontFamilyPtr pFontFamily, const char* pChars, int glyphSizeX = defaultGlyphSizeX, int glyphSizeY = defaultGlyphSizeY) = 0;
+
+    // Summary:
+    //   Puts the objects used in this module into the sizer interface
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+    // Summary:
+    //   All font names separated by ,
+    // Example:
+    //   "console,default,hud"
+    virtual string GetLoadedFontNames() const = 0;
+
+    //! \brief Called when the g_language (current language) setting changes.
+    //!
+    //! Mainly used to reload font family resources for the new language.
+    virtual void OnLanguageChanged() = 0;
+    
+    //! \brief Reload all fonts
+    virtual void ReloadAllFonts() = 0;
+
+    // </interfuscator:shuffle>
+};
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#define TTFFLAG_SMOOTH_NONE                 0x00000000      // No smooth.
+#define TTFFLAG_SMOOTH_BLUR                 0x00000001      // Smooth by blurring it.
+#define TTFFLAG_SMOOTH_SUPERSAMPLE  0x00000002      // Smooth by rendering the characters into a bigger texture, and then resize it to the normal size using bilinear filtering.
+
+#define TTFFLAG_SMOOTH_MASK                 0x0000000f      // Mask for retrieving.
+#define TTFFLAG_SMOOTH_SHIFT                0                           // Shift amount for retrieving.
+
+#define TTFLAG_SMOOTH_AMOUNT_2X         0x00010000      // Blur / supersample [2x]
+#define TTFLAG_SMOOTH_AMOUNT_4X         0x00020000      // Blur / supersample [4x]
+
+#define TTFFLAG_SMOOTH_AMOUNT_MASK  0x000f0000      // Mask for retrieving.
+#define TTFFLAG_SMOOTH_AMOUNT_SHIFT 16                      // Shift amount for retrieving.
+
+
+#define TTFFLAG_CREATE(smooth, amount)      ((((smooth) << TTFFLAG_SMOOTH_SHIFT) & TTFFLAG_SMOOTH_MASK) | (((amount) << TTFFLAG_SMOOTH_AMOUNT_SHIFT) & TTFFLAG_SMOOTH_AMOUNT_MASK))
+#define TTFFLAG_GET_SMOOTH(flag)                    (((flag) & TTFLAG_SMOOTH_MASK) >> TTFFLAG_SMOOTH_SHIFT)
+#define TTFFLAG_GET_SMOOTH_AMOUNT(flag)     (((flag) & TTFLAG_SMOOTH_SMOUNT_MASK) >> TTFFLAG_SMOOTH_AMOUNT_SHIFT)
+
+//////////////////////////////////////////////////////////////////////////
+struct STextDrawContext
+{
+    unsigned int m_fxIdx;
+
+    Vec2 m_size;
+    Vec2i m_requestSize;
+    float m_widthScale;
+    float m_lineSpacing;
+
+    float m_clipX;
+    float m_clipY;
+    float m_clipWidth;
+    float m_clipHeight;
+
+    int m_drawTextFlags;
+
+    bool m_proportional;
+    bool m_sizeIn800x600;
+    bool m_clippingEnabled;
+    bool m_framed;
+
+    ColorB m_colorOverride;
+
+    Matrix34 m_transform;
+
+    int m_baseState;
+    bool m_overrideViewProjMatrices;
+    bool m_kerningEnabled;
+    bool m_processSpecialChars;
+    bool m_pixelAligned;                    //!< toggles whether rendering is pixel aligned
+
+    float m_tracking;                       //!< extra space between characters in pixels (prior to any transform)
+
+    STextDrawContext()
+        : m_fxIdx(0)
+        , m_size(16.0f, 16.0f)
+        , m_requestSize(static_cast<int32>(m_size.x), static_cast<int32>(m_size.y))
+        , m_widthScale(1.0f)
+        , m_lineSpacing(0.f)
+        , m_clipX(0)
+        , m_clipY(0)
+        , m_clipWidth(0)
+        , m_clipHeight(0)
+        , m_proportional(true)
+        , m_sizeIn800x600(true)
+        , m_clippingEnabled(false)
+        , m_framed(false)
+        , m_colorOverride(0, 0, 0, 0)
+        , m_drawTextFlags(0)
+        , m_transform(IDENTITY)
+        , m_baseState(-1) // indicates not set, would like to set to GS_DEPTHFUNC_LEQUAL but header dependencies preclude that
+        , m_overrideViewProjMatrices(true) // the old behavior that overrides the currently set view and projection matrices
+        , m_kerningEnabled(true)
+        , m_processSpecialChars(true)
+        , m_pixelAligned(true)
+        , m_tracking(0.0f)
+    {
+    }
+
+    void Reset() { *this = STextDrawContext(); }
+    void SetEffect(unsigned int fxIdx) { m_fxIdx = fxIdx; }
+    void SetSize(const Vec2& size) { m_size = size; }
+    void SetCharWidthScale(float widthScale) { m_widthScale = widthScale; }
+    void SetClippingRect(float x, float y, float width, float height) { m_clipX = x; m_clipY = y; m_clipWidth = width; m_clipHeight = height; }
+    void SetProportional(bool proportional) { m_proportional = proportional; }
+    void SetSizeIn800x600(bool sizeIn800x600) { m_sizeIn800x600 = sizeIn800x600; }
+    void EnableClipping(bool enable) { m_clippingEnabled = enable; }
+    void EnableFrame(bool enable) { m_framed = enable; }
+    void SetColor(const ColorF& col) { m_colorOverride = col; }
+    void SetFlags(int flags) { m_drawTextFlags = flags; }
+    void SetTransform(const Matrix34& transform) { m_transform = transform; }
+    void SetBaseState(int baseState) { m_baseState = baseState; }
+    void SetOverrideViewProjMatrices(bool overrideViewProjMatrices) { m_overrideViewProjMatrices = overrideViewProjMatrices; }
+    void SetLineSpacing(float lineSpacing) { m_lineSpacing = lineSpacing; }
+
+    float GetCharWidth() const { return m_size.x; }
+    float GetCharHeight() const { return m_size.y; }
+    float GetCharWidthScale() const { return m_widthScale; }
+    int GetFlags() const { return m_drawTextFlags; }
+    float GetLineSpacing() const { return m_lineSpacing; }
+
+    bool IsColorOverridden() const { return m_colorOverride.a != 0; }
+};
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+struct IFFont
+{
+    // <interfuscator:shuffle>
+    virtual ~IFFont() {}
+
+    // We don't derive from CBaseResource currently, that could be an enhancement
+    virtual int32 AddRef() = 0;
+    virtual int32 Release() = 0;
+
+    //! \brief Loads a font from a TTF file.
+    //! \param pFontFilePath Path to font file
+    //! \param width Desired width of font texture.
+    //! \param height Desired width of font texture.
+    //! \param widthNumSlots Number of character slots across the width (X-axis) of the font texture
+    //! \param heightNumSlots Number of character slots across the height (Y-axis) of the font texture
+    //! \param flags Flags governing font, such as smoothness (see TTFFLAG_CREATE).
+    //! \param sizeRatio Scale to apply to the font size when storing glyphs in font texture slots.
+    virtual bool Load(const char* pFontFilePath, unsigned int width, unsigned int height, unsigned int widthNumSlots, unsigned int heightNumSlots, unsigned int flags, float sizeRatio) = 0;
+
+    //! \brief Loads a font from a XML file.
+    //! \param pXMLFile Path to font XML file
+    virtual bool Load(const char* pXMLFile) = 0;
+
+    // Summary:
+    //   Frees internally memory internally allocated by Load().
+    virtual void Free() = 0;
+
+    // Summary:
+    //   Draws a formatted string (UTF-8).
+    virtual void DrawString(float x, float y, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
+
+    // Summary:
+    //   Draws a formatted string (UTF-8), taking z into account.
+    virtual void DrawString(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
+
+    // Summary:
+    //   Computes the text size (UTF-8).
+    virtual Vec2 GetTextSize(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
+
+    // Description:
+    //   Computes virtual text-length (UTF-8) (because of special chars...).
+    virtual size_t GetTextLength(const char* pStr, const bool asciiMultiLine) const = 0;
+
+    // Description:
+    //   Wraps text based on specified maximum line width (UTF-8)
+    virtual void WrapText(string& result, float maxWidth, const char* pStr, const STextDrawContext& ctx) = 0;
+
+    // Description:
+    //   Puts the memory used by this font into the given sizer.
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+
+    // Description:
+    //   useful for special feature rendering interleaved with fonts (e.g. box behind the text)
+    virtual void GetGradientTextureCoord(float& minU, float& minV, float& maxU, float& maxV) const = 0;
+
+    virtual unsigned int GetEffectId(const char* pEffectName) const = 0;
+    virtual unsigned int GetNumEffects() const = 0;
+    virtual const char* GetEffectName(unsigned int effectId) const = 0;
+    virtual Vec2 GetMaxEffectOffset(unsigned int effectId) const = 0;
+    virtual bool DoesEffectHaveTransparency(unsigned int effectId) const = 0;
+
+    //! \brief Adds the given UTF-8 string of chars to this font's font texture.
+    //! \param pChars String of UTF-8 chars to add to font texture
+    //! \param glyphSizeX   Width (in pixels) of the characters to be rendered at in the font texture.
+    //! \param glyphSizeY   Height (in pixels) of the characters to be rendered at in the font texture.
+    virtual void AddCharsToFontTexture(const char* pChars, int glyphSizeX = ICryFont::defaultGlyphSizeX, int glyphSizeY = ICryFont::defaultGlyphSizeY) = 0;
+
+    //! \brief Returns XY kerning offsets (positive or negative) for two given glyphs.
+    //!
+    //! Kerning values are only returned for fonts that have a 'kern' table defined.
+    //! Even fonts that do have a 'kern' defined do not define kerning values for all
+    //! possible combination of characters. Zero values will be returned for those
+    //! cases.
+    virtual Vec2 GetKerning(uint32_t leftGlyph, uint32_t rightGlyph, const STextDrawContext& ctx) const = 0;
+
+    //! \brief Returns the ascender of the font
+    virtual float GetAscender(const STextDrawContext& ctx) const = 0;
+
+    //! \brief Returns the y offset from the top to the baseline
+    virtual float GetBaseline(const STextDrawContext& ctx) const = 0;
+
+    //! \brief Returns the scaling applied to glyphs before being rendered to the font texture from FreeType.
+    virtual float GetSizeRatio() const = 0;
+
+    //! \brief Get the number of quads required to render the text string
+    //! This is an upper limit. Due to clipping the rendering of the text string might actually use less quads.
+    virtual uint32 GetNumQuadsForText(const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
+
+    //! \brief Write the quads for the text into the given vertex and index buffers
+    //! The actual number of quads written to the buffer is returned
+    virtual uint32 WriteTextQuadsToBuffers(SVF_P2F_C4B_T2F_F4B* verts, uint16* indices, uint32 maxQuads,
+        float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
+
+    //! \brief get the font texture for this font, will return -1 if there is no valid font texture
+    virtual int GetFontTextureId() = 0;
+
+    //! \brief get the font texture version for this font. Incremented each time the texture is changed
+    virtual uint32 GetFontTextureVersion() = 0;
+
+    // </interfuscator:shuffle>
+};
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! Correlates several font files to define a family of fonts, specifically for styling.
+struct FontFamily
+{
+    FontFamily()
+        : normal(nullptr)
+        , bold(nullptr)
+        , italic(nullptr)
+        , boldItalic(nullptr)
+    {
+    }
+
+    FontFamily(const FontFamily&) = delete;
+    FontFamily(const FontFamily&&) = delete;
+    FontFamily& operator=(const FontFamily&) = delete;
+    FontFamily& operator=(const FontFamily&&) = delete;
+
+    string familyName;
+    IFFont* normal;
+    IFFont* bold;
+    IFFont* italic;
+    IFFont* boldItalic;
+
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct IFFont_RenderProxy
+{
+    // <interfuscator:shuffle>
+    virtual ~IFFont_RenderProxy() {}
+    virtual void RenderCallback(float x, float y, float z, const char* pStr, const bool asciiMultiLine, const STextDrawContext& ctx) = 0;
+    // </interfuscator:shuffle>
+};
+
+//////////////////////////////////////////////////////////////////////////
+//! Simple bus that notifies listeners of font changes
+class FontNotifications
+    : public AZ::EBusTraits
+{
+public:
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+
+    virtual ~FontNotifications() = default;
+
+    virtual void OnFontsReloaded() = 0;
+
+    virtual void OnFontTextureUpdated(IFFont* /*font*/) {}
+};
+
+using FontNotificationBus = AZ::EBus<FontNotifications>;
+
+#endif // CRYINCLUDE_CRYCOMMON_IFONT_H
diff --git a/Code/Legacy/CryCommon/IFunctorBase.h b/Code/Legacy/CryCommon/IFunctorBase.h
new file mode 100644
index 0000000000..40c6696209
--- /dev/null
+++ b/Code/Legacy/CryCommon/IFunctorBase.h
@@ -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
+ *
+ */
+
+
+// Description : Base header for multi DLL functors.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H
+#define CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H
+#pragma once
+
+
+// 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()
+    {
+        CryInterlockedIncrement(&m_nReferences);
+    }
+
+    void Release()
+    {
+        if (CryInterlockedDecrement(&m_nReferences) <= 0)
+        {
+            delete this;
+        }
+    }
+
+protected:
+    volatile 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/IGem.h b/Code/Legacy/CryCommon/IGem.h
new file mode 100644
index 0000000000..8c2de67dda
--- /dev/null
+++ b/Code/Legacy/CryCommon/IGem.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include "platform.h"
+#include "ISystem.h"
+#include "CrySystemBus.h"
+
+#include <AzCore/Module/Module.h>
+
+
+/**
+ * CryHooksModule is an AZ::Module with common hooks into CryEngine systems.
+ * - Sets gEnv once CrySystem has initialized.
+ * - Registers as a CrySystem event handler.
+ */
+class CryHooksModule
+    : public AZ::Module
+    , protected CrySystemEventBus::Handler
+    , protected  ISystemEventListener
+{
+public:
+    AZ_RTTI(CryHooksModule, "{BD896D16-6F7D-4EA6-A532-0A9E6BF3C089}", AZ::Module);
+    CryHooksModule()
+        : Module()
+    {
+        CrySystemEventBus::Handler::BusConnect();
+    }
+
+    ~CryHooksModule() override
+    {
+        CrySystemEventBus::Handler::BusDisconnect();
+
+        if (gEnv && gEnv->pSystem && gEnv->pSystem->GetISystemEventDispatcher())
+        {
+            gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
+        }
+    }
+
+protected:
+
+    void OnCrySystemPreInitialize(ISystem& system, const SSystemInitParams& systemInitParams) override
+    {
+        (void)systemInitParams;
+
+#if !defined(AZ_MONOLITHIC_BUILD)
+        // When module is linked dynamically, we must set our gEnv pointer.
+        // When module is linked statically, we'll share the application's gEnv pointer.
+        gEnv = system.GetGlobalEnvironment();
+#else
+        (void)system;
+#endif
+    }
+
+    void OnCrySystemInitialized(ISystem& system, const SSystemInitParams& systemInitParams) override
+    {
+        (void)systemInitParams;
+
+        system.GetISystemEventDispatcher()->RegisterListener(this);
+    }
+
+    void OnCrySystemPostShutdown() override
+    {
+#if !defined(AZ_MONOLITHIC_BUILD)
+        gEnv = nullptr;
+#endif
+    }
+
+    void OnSystemEvent(ESystemEvent /*event*/, UINT_PTR /*wparam*/, UINT_PTR /*lparam*/) override {}
+};
diff --git a/Code/Legacy/CryCommon/IIndexedMesh.h b/Code/Legacy/CryCommon/IIndexedMesh.h
new file mode 100644
index 0000000000..4256b6ab11
--- /dev/null
+++ b/Code/Legacy/CryCommon/IIndexedMesh.h
@@ -0,0 +1,2300 @@
+/*
+ * 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_IINDEXEDMESH_H
+#define CRYINCLUDE_CRYCOMMON_IINDEXEDMESH_H
+#pragma once
+
+#include "CryHeaders.h"
+#include "Cry_Color.h"
+#include "StlUtils.h"
+#include "CryEndian.h"
+#include <CrySizer.h>
+#include <Cry_Geo.h>    // for AABB
+#include <VertexFormats.h>
+#include <Vertex.h>
+#include <AzCore/Casting/numeric_cast.h>
+
+// Description:
+//    2D Texture coordinates used by CMesh.
+struct SMeshTexCoord
+{
+    SMeshTexCoord() {}
+
+private:
+    float s, t;
+
+public:
+    explicit SMeshTexCoord(float x, float y)
+    {
+        s = x;
+        t = y;
+    }
+
+    explicit SMeshTexCoord(const Vec2f16& other)
+    {
+        const Vec2 uv = other.ToVec2();
+
+        s = uv.x;
+        t = uv.y;
+    }
+
+    explicit SMeshTexCoord(const Vec2& other)
+    {
+        s = other.x;
+        t = other.y;
+    }
+
+    explicit SMeshTexCoord(const Vec4& other)
+    {
+        s = other.x;
+        t = other.y;
+    }
+
+    void ExportTo(Vec2f16& other) const
+    {
+        other = Vec2f16(s, t);
+    }
+
+    void ExportTo(float& others, float& othert) const
+    {
+        others = s;
+        othert = t;
+    }
+
+    bool operator ==(const SMeshTexCoord& other) const
+    {
+        return (s == other.s) && (t == other.t);
+    }
+
+    bool operator !=(const SMeshTexCoord& other) const
+    {
+        return !(*this == other);
+    }
+
+    bool operator <(const SMeshTexCoord& other) const
+    {
+        return (s != other.s) ? (s < other.s) : (t < other.t);
+    }
+
+    bool IsEquivalent(const Vec2& other, float epsilon = 0.003f) const
+    {
+        return
+            (fabs_tpl(s - other.x) <= epsilon) &&
+            (fabs_tpl(t - other.y) <= epsilon);
+    }
+
+    bool IsEquivalent(const SMeshTexCoord& other, float epsilon = 0.00005f) const
+    {
+        return
+            (fabs_tpl(s - other.s) <= epsilon) &&
+            (fabs_tpl(t - other.t) <= epsilon);
+    }
+
+    ILINE Vec2 GetUV() const
+    {
+        return Vec2(s, t);
+    }
+
+    void GetUV(Vec2& otheruv) const
+    {
+        otheruv = GetUV();
+    }
+
+    void GetUV(Vec4& otheruv) const
+    {
+        otheruv = Vec4(s, t, 0.0f, 1.0f);
+    }
+
+    void Lerp(const SMeshTexCoord& other, float pos)
+    {
+        Vec2 texA;
+        Vec2 texB;
+        this->GetUV();
+        other.GetUV();
+
+        texA.SetLerp(texA, texB, pos);
+
+        *this = SMeshTexCoord(texA);
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+// Description:
+//    RGBA Color description structure used by CMesh.
+struct SMeshColor
+{
+    SMeshColor() {}
+
+private:
+    uint8 r, g, b, a;
+
+public:
+    explicit SMeshColor(uint8 otherr, uint8 otherg, uint8 otherb, uint8 othera)
+    {
+        r = otherr;
+        g = otherg;
+        b = otherb;
+        a = othera;
+    }
+
+    explicit SMeshColor(const Vec4& otherc)
+    {
+        r = aznumeric_caster(FtoI(otherc.x));
+        g = aznumeric_caster(FtoI(otherc.y));
+        b = aznumeric_caster(FtoI(otherc.z));
+        a = aznumeric_caster(FtoI(otherc.w));
+    }
+
+    void TransferRGBTo(SMeshColor& other) const
+    {
+        other.r = r;
+        other.g = g;
+        other.b = b;
+    }
+
+    void TransferATo(SMeshColor& other) const
+    {
+        other.a = a;
+    }
+
+    void MaskA(uint8 maska)
+    {
+        a &= maska;
+    }
+
+    bool operator ==(const SMeshColor& other) const
+    {
+        return (r == other.r) && (g == other.g) && (b == other.b) && (a == other.a);
+    }
+
+    bool operator !=(const SMeshColor& other) const
+    {
+        return !(*this == other);
+    }
+
+    bool operator <(const SMeshColor& other) const
+    {
+        return (r != other.r) ? (r < other.r) : (g != other.g) ? (g < other.g) : (b != other.b) ? (b < other.b) : (a < other.a);
+    }
+
+    ILINE ColorB GetRGBA() const
+    {
+        return ColorB(r, g, b, a);
+    }
+
+    void GetRGBA(ColorB& otherc) const
+    {
+        otherc = GetRGBA();
+    }
+
+    void GetRGBA(Vec4& otherc) const
+    {
+        otherc = Vec4(r, g, b, a);
+    }
+
+    void Lerp(const SMeshColor& other, float pos)
+    {
+        Vec4 clrA;
+        Vec4 clrB;
+        this->GetRGBA(clrA);
+        other.GetRGBA(clrB);
+
+        clrA.SetLerp(clrA, clrB, pos);
+
+        *this = SMeshColor(clrA);
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+
+// 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.
+
+    AUTO_STRUCT_INFO
+};
+
+// Description:
+//    3D Normal Vector used by CMesh.
+struct SMeshNormal
+{
+    SMeshNormal() {}
+
+private:
+    Vec3 Normal;
+
+public:
+    explicit SMeshNormal(const Vec3& othern)
+    {
+        Normal = othern;
+    }
+
+    bool operator ==(const SMeshNormal& othern) const
+    {
+        return (Normal.x == othern.Normal.x) && (Normal.y == othern.Normal.y) && (Normal.z == othern.Normal.z);
+    }
+
+    bool operator !=(const SMeshNormal& othern) const
+    {
+        return !(*this == othern);
+    }
+
+    bool operator <(const SMeshNormal& othern) const
+    {
+        return (Normal.x != othern.Normal.x) ? (Normal.x < othern.Normal.x) : (Normal.y != othern.Normal.y) ? (Normal.y < othern.Normal.y) : (Normal.z < othern.Normal.z);
+    }
+
+    bool IsEquivalent(const Vec3& othern, float epsilon = 0.00005f) const
+    {
+        return
+            Normal.IsEquivalent(othern, epsilon);
+    }
+
+    bool IsEquivalent(const SMeshNormal& othern, float epsilon = 0.00005f) const
+    {
+        return
+            IsEquivalent(othern.Normal, epsilon);
+    }
+
+    ILINE Vec3 GetN() const
+    {
+        return Normal;
+    }
+
+    void GetN(Vec3& othern) const
+    {
+        othern = GetN();
+    }
+
+    void RotateBy(const Matrix33& rot)
+    {
+        Normal = rot * Normal;
+    }
+
+    void RotateSafelyBy(const Matrix33& rot)
+    {
+        Normal = rot * Normal;
+        // normalize in case "rot" wasn't length-preserving
+        Normal.Normalize();
+    }
+
+    void RotateBy(const Matrix34& trn)
+    {
+        Normal = trn.TransformVector(Normal);
+    }
+
+    void RotateSafelyBy(const Matrix34& trn)
+    {
+        Normal = trn.TransformVector(Normal);
+        // normalize in case "trn" wasn't length-preserving
+        Normal.Normalize();
+    }
+
+    void Slerp(const SMeshNormal& other, float pos)
+    {
+        Vec3 nrmA = this->GetN();
+        Vec3 nrmB = other.GetN();
+
+        nrmA.Normalize();
+        nrmB.Normalize();
+
+        nrmA.SetSlerp(nrmA, nrmB, pos);
+
+        *this = SMeshNormal(nrmA);
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+
+// Description:
+//    Mesh tangents (tangent space normals).
+struct SMeshTangents
+{
+    SMeshTangents() {}
+
+private:
+    Vec4sf Tangent;
+    Vec4sf Bitangent;
+
+public:
+    explicit SMeshTangents(const Vec4sf& othert, const Vec4sf& otherb)
+    {
+        Tangent   = othert;
+        Bitangent = otherb;
+    }
+
+    explicit SMeshTangents(const SPipTangents& other)
+    {
+        Tangent   = other.Tangent;
+        Bitangent = other.Bitangent;
+    }
+
+    explicit SMeshTangents(const Vec4& othert, const Vec4& otherb)
+    {
+        Tangent   = PackingSNorm::tPackF2Bv(othert);
+        Bitangent = PackingSNorm::tPackF2Bv(otherb);
+    }
+
+    explicit SMeshTangents(const Vec3& othert, const Vec3& otherb, const Vec3& othern)
+    {
+        // TODO: can be optimized to use only integer arithmetic
+        int16 othersign = 1;
+        if (othert.Cross(otherb).Dot(othern) < 0)
+        {
+            othersign = -1;
+        }
+
+        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), PackingSNorm::tPackS2B(othersign));
+        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), PackingSNorm::tPackS2B(othersign));
+    }
+
+    explicit SMeshTangents(const Vec3& othert, const Vec3& otherb, const int16& othersign)
+    {
+        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), PackingSNorm::tPackS2B(othersign));
+        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), PackingSNorm::tPackS2B(othersign));
+    }
+
+    void ExportTo(Vec4sf& othert, Vec4sf& otherb) const
+    {
+        othert = Tangent;
+        otherb = Bitangent;
+    }
+
+    void ExportTo(SPipTangents& other) const
+    {
+        other.Tangent   = Tangent;
+        other.Bitangent = Bitangent;
+    }
+
+    bool operator ==(const SMeshTangents& other) const
+    {
+        return
+            Tangent[0] == other.Tangent[0] ||
+            Tangent[1] == other.Tangent[1] ||
+            Tangent[2] == other.Tangent[2] ||
+            Tangent[3] == other.Tangent[3] ||
+            Bitangent[0] == other.Bitangent[0] ||
+            Bitangent[1] == other.Bitangent[1] ||
+            Bitangent[2] == other.Bitangent[2] ||
+            Bitangent[3] == other.Bitangent[3];
+    }
+
+    bool operator !=(const SMeshTangents& other) const
+    {
+        return !(*this == other);
+    }
+
+    bool IsEquivalent(const Vec3& othert, const Vec3& otherb, const int16& othersign, float epsilon = 0.01f) const
+    {
+        // TODO: can be optimized to use only integer arithmetic
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z);
+        Vec3 btg3(btg.x, btg.y, btg.z);
+
+        return
+            (tng.w == othersign) &&
+            (btg.w == othersign) &&
+            (tng3.Dot(othert) >= (1.0f - epsilon)) &&
+            (btg3.Dot(otherb) >= (1.0f - epsilon));
+    }
+
+    void GetTB(Vec4sf& othert, Vec4sf& otherb) const
+    {
+        othert = Tangent;
+        otherb = Bitangent;
+    }
+
+    void GetTB(Vec4& othert, Vec4& otherb) const
+    {
+        othert = PackingSNorm::tPackB2F(Tangent);
+        otherb = PackingSNorm::tPackB2F(Bitangent);
+    }
+
+    void GetTB(Vec3& othert, Vec3& otherb) const
+    {
+        const Vec4 t = PackingSNorm::tPackB2F(Tangent);
+        const Vec4 b = PackingSNorm::tPackB2F(Bitangent);
+
+        othert = Vec3(t.x, t.y, t.z);
+        otherb = Vec3(b.x, b.y, b.z);
+    }
+
+    ILINE Vec3 GetN() const
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z);
+        Vec3 btg3(btg.x, btg.y, btg.z);
+
+        // assumes w 1 or -1
+        return tng3.Cross(btg3) * tng.w;
+    }
+
+    void GetN(Vec3& othern) const
+    {
+        othern = GetN();
+    }
+
+    void GetTBN(Vec3& othert, Vec3& otherb, Vec3& othern) const
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z);
+        Vec3 btg3(btg.x, btg.y, btg.z);
+
+        // assumes w 1 or -1
+        othert = tng3;
+        otherb = btg3;
+        othern = tng3.Cross(btg3) * tng.w;
+    }
+
+    ILINE int16 GetR() const
+    {
+        return PackingSNorm::tPackB2S(Tangent.w);
+    }
+
+    void GetR(int16& sign) const
+    {
+        sign = GetR();
+    }
+
+    void RotateBy(const Matrix33& rot)
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z);
+        Vec3 btg3(btg.x, btg.y, btg.z);
+
+        tng3 = rot * tng3;
+        btg3 = rot * btg3;
+
+        *this = SMeshTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
+    }
+
+    void RotateSafelyBy(const Matrix33& rot)
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z);
+        Vec3 btg3(btg.x, btg.y, btg.z);
+
+        tng3 = rot * tng3;
+        btg3 = rot * btg3;
+
+        // normalize in case "rot" wasn't length-preserving
+        tng3.Normalize();
+        btg3.Normalize();
+
+        *this = SMeshTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
+    }
+
+    void RotateBy(const Matrix34& trn)
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z);
+        Vec3 btg3(btg.x, btg.y, btg.z);
+
+        tng3 = trn.TransformVector(tng3);
+        btg3 = trn.TransformVector(btg3);
+
+        *this = SMeshTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
+    }
+
+    void RotateSafelyBy(const Matrix34& trn)
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z);
+        Vec3 btg3(btg.x, btg.y, btg.z);
+
+        tng3 = trn.TransformVector(tng3);
+        btg3 = trn.TransformVector(btg3);
+
+        // normalize in case "rot" wasn't length-preserving
+        tng3.Normalize();
+        btg3.Normalize();
+
+        *this = SMeshTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
+    }
+
+    void SlerpTowards(const SMeshTangents& other, const SMeshNormal& normal, float pos)
+    {
+        Vec3 tngA, btgA;
+        Vec3 tngB, btgB;
+        this->GetTB(tngA, btgA);
+        other.GetTB(tngB, btgB);
+
+        // Q: necessary?
+        tngA.Normalize();
+        tngB.Normalize();
+        btgA.Normalize();
+        btgB.Normalize();
+
+        tngA.SetSlerp(tngA, tngB, pos);
+        btgA.SetSlerp(btgA, btgB, pos);
+
+        *this = SMeshTangents(tngA, btgA, normal.GetN());
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+struct SMeshQTangents
+{
+    SMeshQTangents() {}
+
+private:
+    Vec4sf TangentBitangent;
+
+public:
+    explicit SMeshQTangents(const SPipQTangents& other)
+    {
+        TangentBitangent = other.QTangent;
+    }
+
+    explicit SMeshQTangents(const Quat& other)
+    {
+        TangentBitangent.x = PackingSNorm::tPackF2B(other.v.x);
+        TangentBitangent.y = PackingSNorm::tPackF2B(other.v.y);
+        TangentBitangent.z = PackingSNorm::tPackF2B(other.v.z);
+        TangentBitangent.w = PackingSNorm::tPackF2B(other.w);
+    }
+
+    void ExportTo(SPipQTangents& other)
+    {
+        other.QTangent = TangentBitangent;
+    }
+
+    ILINE Quat GetQ() const
+    {
+        Quat q;
+
+        q.v.x = PackingSNorm::tPackB2F(TangentBitangent.x);
+        q.v.y = PackingSNorm::tPackB2F(TangentBitangent.y);
+        q.v.z = PackingSNorm::tPackB2F(TangentBitangent.z);
+        q.w   = PackingSNorm::tPackB2F(TangentBitangent.w);
+
+        return q;
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+// Description:
+//    for skinning every vertex has 4 bones and 4 weights.
+struct SMeshBoneMapping_uint16
+{
+    typedef uint16 BoneId;
+    typedef uint8 Weight;
+
+    BoneId boneIds[4];
+    Weight weights[4];
+
+    AUTO_STRUCT_INFO
+};
+
+struct SMeshBoneMapping_uint8
+{
+    typedef uint8 BoneId;
+    typedef uint8 Weight;
+
+    BoneId boneIds[4];
+    Weight weights[4];
+
+    AUTO_STRUCT_INFO
+};
+
+//START: Add LOD support for touch bending vegetation
+struct SMeshBoneMappingInfo_uint8
+{
+    SMeshBoneMappingInfo_uint8(int vertexCount)
+    {
+        //Will be deleted by ~SFoliageInfoCGF()
+        pBoneMapping = new SMeshBoneMapping_uint8[vertexCount];
+        nVertexCount = vertexCount;
+    }
+
+    int nVertexCount;
+    struct SMeshBoneMapping_uint8* pBoneMapping;
+
+    AUTO_STRUCT_INFO
+};
+//END: Add LOD support for touch bending vegetation
+
+// 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(PHYS_GEOM_TYPE_DEFAULT)
+        , vertexFormat(eVF_P3S_C4B_T2S)
+    {
+    }
+
+    void GetMemoryUsage([[maybe_unused]] class ICrySizer* pSizer) const
+    {
+    }
+
+    // fix numVerts
+    void FixRanges(vtx_idx* pIndices)
+    {
+        int startVertexToMerge = nFirstVertId;
+        int startIndexToMerge = nFirstIndexId;
+        int numIndiciesToMerge = nNumIndices;
+        // find good min and max AGAIN
+        int maxVertexInUse = 0;
+        for (int n = 0; n < numIndiciesToMerge; n++)
+        {
+            int i = (int)pIndices[n + startIndexToMerge];
+            startVertexToMerge = (i < startVertexToMerge ? i : startVertexToMerge);// min
+            maxVertexInUse = (i > maxVertexInUse ? i : maxVertexInUse);// max
+        }
+        nNumVerts = maxVertexInUse - startVertexToMerge + 1;
+    }
+};
+
+class CMeshHelpers
+{
+public:
+    template <class TPosition, class TTexCoordinates, class TIndex>
+    static bool ComputeTexMappingAreas(
+        size_t indexCount, const TIndex* pIndices,
+        size_t vertexCount,
+        const TPosition* pPositions, size_t stridePositions,
+        const TTexCoordinates* pTexCoords, size_t strideTexCoords,
+        float& computedPosArea, float& computedTexArea, const char*& errorText)
+    {
+        static const float minPosArea = 10e-6f;
+        static const float minTexArea = 10e-8f;
+
+        computedPosArea = 0;
+        computedTexArea = 0;
+        errorText = "?";
+
+        if (indexCount <= 0)
+        {
+            errorText = "index count is 0";
+            return false;
+        }
+
+        if (vertexCount <= 0)
+        {
+            errorText = "vertex count is 0";
+            return false;
+        }
+
+        if ((pIndices == NULL) || (pPositions == NULL))
+        {
+            errorText = "indices and/or positions are NULL";
+            return false;
+        }
+
+        if (pTexCoords == NULL)
+        {
+            errorText = "texture coordinates are NULL";
+            return false;
+        }
+
+        if (indexCount % 3 != 0)
+        {
+            assert(0);
+            errorText = "bad number of indices";
+            return false;
+        }
+
+        // Compute average geometry area of face
+
+        int count = 0;
+        float posAreaSum = 0;
+        float texAreaSum = 0;
+        for (size_t i = 0; i < indexCount; i += 3)
+        {
+            const size_t index0 = pIndices[i];
+            const size_t index1 = pIndices[i + 1];
+            const size_t index2 = pIndices[i + 2];
+
+            if ((index0 >= vertexCount) || (index1 >= vertexCount) || (index2 >= vertexCount))
+            {
+                errorText = "bad vertex index detected";
+                return false;
+            }
+
+            const Vec3 pos0 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index0 * stridePositions));
+            const Vec3 pos1 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index1 * stridePositions));
+            const Vec3 pos2 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index2 * stridePositions));
+
+            const Vec2 tex0 = ToVec2(*(const TTexCoordinates*) (((const char*)pTexCoords) + index0 * strideTexCoords));
+            const Vec2 tex1 = ToVec2(*(const TTexCoordinates*) (((const char*)pTexCoords) + index1 * strideTexCoords));
+            const Vec2 tex2 = ToVec2(*(const TTexCoordinates*) (((const char*)pTexCoords) + index2 * strideTexCoords));
+
+            const float posArea = ((pos1 - pos0).Cross(pos2 - pos0)).GetLength() * 0.5f;
+            const float texArea = fabsf((tex1 - tex0).Cross(tex2 - tex0)) * 0.5f;
+
+            if ((posArea >= minPosArea) && (texArea >= minTexArea))
+            {
+                posAreaSum += posArea;
+                texAreaSum += texArea;
+                ++count;
+            }
+        }
+
+        if (count == 0 || (posAreaSum < minPosArea) || (texAreaSum < minTexArea))
+        {
+            errorText = "faces are too small or have stretched mapping";
+            return false;
+        }
+
+        computedPosArea = posAreaSum;
+        computedTexArea = texAreaSum;
+        return true;
+    }
+
+    template <class TPosition>
+    static bool CollectFaceAreas(size_t indexCount, const vtx_idx* pIndices, size_t vertexCount,
+        const TPosition* pPositions, size_t stridePositions, std::vector<float>& areas)
+    {
+        static const float minFaceArea = 10e-6f;
+
+        if (indexCount % 3 != 0)
+        {
+            return false;
+        }
+
+        areas.reserve(areas.size() + indexCount / 3);
+
+        for (size_t i = 0; i < indexCount; i += 3)
+        {
+            const uint index0 = pIndices[i];
+            const uint index1 = pIndices[i + 1];
+            const uint index2 = pIndices[i + 2];
+
+            if ((index0 >= vertexCount) || (index1 >= vertexCount) || (index2 >= vertexCount))
+            {
+                return false;
+            }
+
+            const Vec3 pos0 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index0 * stridePositions));
+            const Vec3 pos1 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index1 * stridePositions));
+            const Vec3 pos2 = ToVec3(*(const TPosition*) (((const char*)pPositions) + index2 * stridePositions));
+
+            const float faceArea = ((pos1 - pos0).Cross(pos2 - pos0)).GetLength() * 0.5f;
+
+            if (faceArea >= minFaceArea)
+            {
+                areas.push_back(faceArea);
+            }
+        }
+
+        return true;
+    }
+
+private:
+    template <class T>
+    inline static Vec3 ToVec3(const T& v)
+    {
+        return v.ToVec3();
+    }
+
+    template <class T>
+    inline static Vec2 ToVec2(const T& v)
+    {
+        Vec2 uv;
+        v.GetUV(uv);
+
+        return uv;
+    }
+};
+
+template <>
+inline Vec3 CMeshHelpers::ToVec3<Vec3>(const Vec3& v)
+{
+    return v;
+}
+
+template <>
+inline Vec2 CMeshHelpers::ToVec2<Vec2>(const Vec2& v)
+{
+    return v;
+}
+
+template <>
+inline Vec2 CMeshHelpers::ToVec2<Vec2f16>(const Vec2f16& v)
+{
+    return v.ToVec2();
+}
+
+template <>
+inline Vec2 CMeshHelpers::ToVec2<SMeshTexCoord>(const SMeshTexCoord& v)
+{
+    return v.GetUV();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//    General purpose mesh class.
+//////////////////////////////////////////////////////////////////////////
+class CMesh
+{
+public:
+    // e.g. no more than 8 positions, 8 colors, 8 uv sets, etc.
+    const static uint maxStreamsPerType = 8;
+    enum EStream
+    {
+        POSITIONS = 0,
+        POSITIONSF16,
+        NORMALS,
+        FACES,
+        TOPOLOGY_IDS,
+        TEXCOORDS,
+        COLORS,
+        INDICES,
+        TANGENTS,
+        BONEMAPPING,
+        VERT_MATS,
+        QTANGENTS,
+        P3S_C4B_T2S,
+
+        EXTRABONEMAPPING, // Extra stream. Does not have a stream ID in the CGF. Its data is saved at the end of the BONEMAPPING stream.
+
+        LAST_STREAM,
+    };
+
+    SMeshFace* m_pFaces;  // faces are used in mesh processing/compilation
+    int32* m_pTopologyIds;
+
+    // geometry data
+    vtx_idx* m_pIndices;   // indices are used for the final render-mesh
+    Vec3* m_pPositions;
+    Vec3f16* m_pPositionsF16;
+
+    SMeshNormal* m_pNorms;
+    SMeshTangents* m_pTangents;
+    SMeshQTangents* m_pQTangents;
+    SMeshTexCoord* m_pTexCoord;
+    SMeshColor* m_pColor0;
+    SMeshColor* m_pColor1;
+
+    int* m_pVertMats;
+    SVF_P3S_C4B_T2S* m_pP3S_C4B_T2S;
+
+    SMeshBoneMapping_uint16* m_pBoneMapping;  //bone-mapping for the final render-mesh
+    SMeshBoneMapping_uint16* m_pExtraBoneMapping;   //bone indices and weights for bones 5 to 8.
+
+    int m_nCoorCount;                   //number of texture coordinates in m_pTexCoord array
+    int m_streamSize[LAST_STREAM][maxStreamsPerType];
+
+    // Bounding box.
+    AABB m_bbox;
+
+    // Array of mesh subsets.
+    DynArray<SMeshSubset> m_subsets;
+
+    // Mask that indicate if this stream is using not allocated in Mesh pointer;
+    // ex. if (m_sharedStreamMasks[0] & (1<<NORMALS) -> the 1st normals stream is shared
+    // if (m_sharedStreamMasks[1] & (1<<TEXCOORDS) -> the 2nd uv set stream is shared
+    uint32 m_sharedStreamMasks[maxStreamsPerType];
+
+    // Texture space area divided by geometry area. Zero if cannot compute.
+    float m_texMappingDensity;
+
+    // Geometric mean value calculated from the areas of this mesh faces.
+    float m_geometricMeanFaceArea;
+
+    //////////////////////////////////////////////////////////////////////////
+    void GetMemoryUsage(class ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(this, sizeof(*this));
+        pSizer->AddObject(m_subsets);
+
+        for (int streamType = 0; streamType < LAST_STREAM; streamType++)
+        {
+            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
+            {
+                void* pStream;
+                int nElementSize = 0;
+                GetStreamInfo(streamType, streamIndex, pStream, nElementSize);
+                pSizer->AddObject(pStream, m_streamSize[streamType][streamIndex] * nElementSize);
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    CMesh()
+    {
+        m_pFaces = NULL;
+        m_pTopologyIds = NULL;
+        m_pIndices = NULL;
+        m_pPositions = NULL;
+        m_pPositionsF16 = NULL;
+        m_pNorms = NULL;
+        m_pTangents = NULL;
+        m_pQTangents = NULL;
+        m_pTexCoord = NULL;
+        m_pColor0 = NULL;
+        m_pColor1 = NULL;
+        m_pVertMats = NULL;
+        m_pP3S_C4B_T2S = NULL;
+        m_pBoneMapping = NULL;
+        m_pExtraBoneMapping = NULL;
+
+        m_nCoorCount = 0;
+
+        memset(m_texCoords, 0, sizeof(m_texCoords));
+        memset(m_streamSize, 0, sizeof(m_streamSize));
+
+        m_bbox.Reset();
+
+        memset(m_sharedStreamMasks, 0, sizeof(m_sharedStreamMasks));
+
+        m_texMappingDensity = 0.0f;
+        m_geometricMeanFaceArea = 0.0f;
+    }
+
+    virtual ~CMesh()
+    {
+        FreeStreams();
+    }
+
+    void FreeStreams()
+    {
+        for (int streamType = 0; streamType < LAST_STREAM; ++streamType)
+        {
+            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
+            {
+                ReallocStream(streamType, streamIndex, 0);
+            }
+        }
+    }
+
+    int GetFaceCount() const
+    {
+        return m_streamSize[FACES][0];
+    }
+    int GetVertexCount() const
+    {
+        return max(max(m_streamSize[POSITIONS][0], m_streamSize[POSITIONSF16][0]), m_streamSize[P3S_C4B_T2S][0]);
+    }
+    int GetTexCoordCount() const
+    {
+        return m_nCoorCount;
+    }
+    int GetTangentCount() const
+    {
+        return m_streamSize[TANGENTS][0];
+    }
+    int GetSubSetCount() const
+    {
+        return m_subsets.size();
+    }
+    int GetIndexCount() const
+    {
+        return m_streamSize[INDICES][0];
+    }
+
+    void SetFaceCount(int nNewCount)
+    {
+        ReallocStream(FACES, 0, nNewCount);
+    }
+
+    void SetVertexCount(int nNewCount)
+    {
+        if (GetVertexCount() != nNewCount || GetVertexCount() == 0)
+        {
+            ReallocStream(POSITIONS, 0, nNewCount);
+            ReallocStream(POSITIONSF16, 0, 0);
+            ReallocStream(NORMALS, 0, nNewCount);
+
+            if (m_pColor0)
+            {
+                ReallocStream(COLORS, 0, nNewCount);
+            }
+
+            if (m_pColor1)
+            {
+                ReallocStream(COLORS, 1, nNewCount);
+            }
+
+            if (m_pVertMats)
+            {
+                ReallocStream(VERT_MATS, 0, nNewCount);
+            }
+        }
+    }
+
+    void SetTexCoordsCount(int nNewCount)
+    {
+        if (m_nCoorCount != nNewCount || m_nCoorCount == 0)
+        {
+            ReallocStream(TEXCOORDS, 0, nNewCount);
+            m_nCoorCount = nNewCount;
+        }
+    }
+
+    void SetTexCoordsAndTangentsCount(int nNewCount)
+    {
+        if (m_nCoorCount != nNewCount || m_nCoorCount == 0)
+        {
+            ReallocStream(TEXCOORDS, 0, nNewCount);
+            ReallocStream(TANGENTS, 0, nNewCount);
+            m_nCoorCount = nNewCount;
+        }
+    }
+
+    void SetIndexCount(int nNewCount)
+    {
+        ReallocStream(INDICES, 0, nNewCount);
+    }
+    // Once m_pTexCoords, m_pColors, etc. are wrapped in vectors, return the size of the vector
+    // or if we go with fixed size arrays, with a bunch of nullptrs, maybe just return the fixed size or the number of non-null ptrs
+    int GetNumberOfStreamsByType(int streamType) const
+    {
+        if (streamType == COLORS || streamType == TEXCOORDS)
+        {
+            return 2;
+        }
+        return 1;
+    }
+
+    bool Has32BitPositions(void) const
+    {
+        return m_pPositions != nullptr;
+    }
+
+    bool Has16BitPositions(void) const
+    {
+        return m_pPositionsF16 != nullptr;
+    }
+
+    bool IsUVSetEmptyForSubmesh(uint submeshIndex, uint uvSet)
+    {
+        // Get a pointer to the uv set
+        SMeshTexCoord* texCoords = nullptr;
+        if (uvSet == 0)
+        {
+            texCoords = m_pTexCoord;
+        }
+        else
+        {
+            texCoords = m_texCoords[uvSet];
+        }
+
+        if (texCoords)
+        {
+            // Iterate through the vertices for the submesh
+            Vec2 emptyTexCoord = Vec2(0.0f, 0.0f);
+            for (int i = m_subsets[submeshIndex].nFirstVertId; i < m_subsets[submeshIndex].nFirstVertId + m_subsets[submeshIndex].nNumVerts; ++i)
+            {
+                // If any of the texture coordinates for the given uv set are non-zero, return false.
+                if (texCoords[i].GetUV() != emptyTexCoord)
+                {
+                    return false;
+                }
+            }
+        }
+        // If no valid texture coordinates are found for submesh for the given uv set, return true.
+        return true;
+    }
+
+    void SetSubmeshVertexFormats(void)
+    {
+        EVertexFormat desiredFormat = eVF_Unknown;
+        for (int submeshIndex = 0; submeshIndex < m_subsets.size(); ++submeshIndex)
+        {
+            // Choose float or short based on the precision of the positions
+            if (this->Has32BitPositions())
+            {
+                // Choose one or two uv sets
+                if (IsUVSetEmptyForSubmesh(submeshIndex, 1))
+                {
+                    desiredFormat = eVF_P3F_C4B_T2F;
+                }
+                else
+                {
+                    desiredFormat = eVF_P3F_C4B_T2F_T2F;
+                }
+            }
+            else if (this->Has16BitPositions())
+            {
+                // Choose one or two uv sets
+                if (IsUVSetEmptyForSubmesh(submeshIndex, 1))
+                {
+                    desiredFormat = eVF_P3S_C4B_T2S;
+                }
+                else
+                {
+                    desiredFormat = eVF_P3S_C4B_T2S_T2S;
+                }
+            }
+            else
+            {
+                AZ_Assert(false, "Submesh does not contain positions");
+            }
+
+            // Set the vertex format for the submesh
+            m_subsets[submeshIndex].vertexFormat = AZ::Vertex::Format(desiredFormat);
+        }
+    }
+
+    AZ::Vertex::Format GetVertexFormatForSubmesh(int submeshIndex) const
+    {
+        assert(submeshIndex < m_subsets.size());
+
+        return m_subsets[submeshIndex].vertexFormat;
+    }
+
+    AZ::Vertex::Format GetMeshGroupVertexFormat() const
+    {
+        AZ::Vertex::Format meshGroupFormat;
+        for (int submeshIndex = 0; submeshIndex < m_subsets.size(); ++submeshIndex)
+        {
+            if (m_subsets[submeshIndex].vertexFormat > meshGroupFormat)
+            {
+                meshGroupFormat = m_subsets[submeshIndex].vertexFormat;
+            }
+        }
+
+        return meshGroupFormat;
+    }
+
+    // Set specific stream type as shared. If there are multiple streams for a given type (such as multiple uv sets), then all streams of that type will be marked as shared
+    void SetSharedStream(int streamType, int streamIndex, void* pStream, int nElementCount)
+    {
+        AZ_Assert(streamType >= 0 && streamType < LAST_STREAM && streamIndex < maxStreamsPerType, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
+        if ((m_sharedStreamMasks[streamIndex] & (1 << streamType)) == 0)
+        {
+            ReallocStream(streamType, streamIndex, 0);
+            m_sharedStreamMasks[streamIndex] |= (1 << streamType);
+        }
+        SetStreamData(streamType, streamIndex, pStream, nElementCount);
+    }
+
+    template <class T>
+    T* GetStreamPtrAndElementCount(int streamType, int streamIndex, int* pElementCount = 0) const
+    {
+        void* pStream = 0;
+        int nElementSize = 0;
+        GetStreamInfo(streamType, streamIndex, pStream, nElementSize);
+
+        if (nElementSize != sizeof(T))
+        {
+            AZ_Assert(false, "The element size %d returned by GetStreamInfo does not match the size %d of type T", nElementSize, sizeof(T));
+            pStream = 0;
+        }
+
+        const int nElementCount = (pStream ? this->m_streamSize[streamType][streamIndex] : 0);
+
+        if (pElementCount)
+        {
+            *pElementCount = nElementCount;
+        }
+        return (T*)pStream;
+    }
+
+    template <class T>
+    T* GetStreamPtr(int streamType, int streamIndex = 0) const
+    {
+        void* pStream = 0;
+        int nElementSize = 0;
+        GetStreamInfo(streamType, streamIndex, pStream, nElementSize);
+
+        if (nElementSize != sizeof(T))
+        {
+            AZ_Assert(false, "The element size %d returned by GetStreamInfo does not match the size %d of type T", nElementSize, sizeof(T));
+            pStream = 0;
+        }
+
+        return (T*)pStream;
+    }
+
+    void GetStreamInfo(int streamType, int streamIndex, void*& pStream, int& nElementSize) const
+    {
+        pStream = 0;
+        nElementSize = 0;
+        AZ_Assert(streamType >= 0 && streamType < LAST_STREAM && streamIndex < maxStreamsPerType, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
+
+        switch (streamType)
+        {
+        case POSITIONS:
+            pStream = m_pPositions;
+            nElementSize = sizeof(Vec3);
+            break;
+        case POSITIONSF16:
+            pStream = m_pPositionsF16;
+            nElementSize = sizeof(Vec3f16);
+            break;
+        case NORMALS:
+            pStream = m_pNorms;
+            nElementSize = sizeof(Vec3);
+            break;
+        case VERT_MATS:
+            pStream = m_pVertMats;
+            nElementSize = sizeof(int);
+            break;
+        case FACES:
+            pStream = m_pFaces;
+            nElementSize = sizeof(SMeshFace);
+            break;
+        case TOPOLOGY_IDS:
+            pStream = m_pTopologyIds;
+            nElementSize = sizeof(int32);
+            break;
+        case TEXCOORDS:
+            if (streamIndex == 0)
+            {
+                pStream = m_pTexCoord;
+            }
+            else
+            {
+                pStream = m_texCoords[streamIndex];
+            }
+            nElementSize = sizeof(SMeshTexCoord);
+            break;
+        case COLORS:
+            if (streamIndex == 0)
+            {
+                pStream = m_pColor0;
+            }
+            else
+            {
+                pStream = m_pColor1;
+            }
+            nElementSize = sizeof(SMeshColor);
+            break;
+        case INDICES:
+            pStream = m_pIndices;
+            nElementSize = sizeof(vtx_idx);
+            break;
+        case TANGENTS:
+            pStream = m_pTangents;
+            nElementSize = sizeof(SMeshTangents);
+            break;
+        case QTANGENTS:
+            pStream = m_pQTangents;
+            nElementSize = sizeof(SMeshQTangents);
+            break;
+        case BONEMAPPING:
+            pStream = m_pBoneMapping;
+            nElementSize = sizeof(SMeshBoneMapping_uint16);
+            break;
+        case EXTRABONEMAPPING:
+            pStream = m_pExtraBoneMapping;
+            nElementSize = sizeof(SMeshBoneMapping_uint16);
+            break;
+        case P3S_C4B_T2S:
+            pStream = m_pP3S_C4B_T2S;
+            nElementSize = sizeof(SVF_P3S_C4B_T2S);
+            break;
+        default:
+            AZ_Assert(false, "Unknown stream");
+            break;
+        }
+    }
+
+
+    virtual void ReallocStream(int streamType, int streamIndex, int nNewCount)
+    {
+        if (streamType < 0 || streamType >= LAST_STREAM || streamIndex >= maxStreamsPerType)
+        {
+            AZ_Assert(false, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
+            return;
+        }
+
+        if (m_sharedStreamMasks[streamIndex] & (1 << streamType))
+        {
+            m_sharedStreamMasks[streamIndex] &= ~(1 << streamType);
+
+            if (nNewCount <= 0)
+            {
+                SetStreamData(streamType, 0, nullptr, 0);
+            }
+            else
+            {
+                const int nOldCount = m_streamSize[streamType][streamIndex];
+                void* pOldElements = 0;
+                int nElementSize = 0;
+                GetStreamInfo(streamType, streamIndex, pOldElements, nElementSize);
+
+                void* const pNewElements = realloc(0, nNewCount * nElementSize);
+                if (!pNewElements)
+                {
+                    AZ_Assert(false, "Allocation failed");
+                    SetStreamData(streamType, streamIndex, nullptr, 0);
+                    return;
+                }
+
+                if (nOldCount > 0)
+                {
+                    memcpy(pNewElements, pOldElements, min(nOldCount, nNewCount) * nElementSize);
+                }
+                if (nNewCount > nOldCount)
+                {
+                    memset((char*)pNewElements + nOldCount * nElementSize, 0, (nNewCount - nOldCount) * nElementSize);
+                }
+
+                SetStreamData(streamType, streamIndex, pNewElements, nNewCount);
+            }
+        }
+        else
+        {
+            const int nOldCount = m_streamSize[streamType][streamIndex];
+            if (nOldCount == nNewCount)
+            {
+                // stream already has required size
+                return;
+            }
+
+            void* pOldElements = 0;
+            int nElementSize = 0;
+            GetStreamInfo(streamType, streamIndex, pOldElements, nElementSize);
+
+            if (nNewCount <= 0)
+            {
+                free(pOldElements);
+                SetStreamData(streamType, streamIndex, nullptr, 0);
+            }
+            else
+            {
+                void* const pNewElements = realloc(pOldElements, nNewCount * nElementSize);
+                if (!pNewElements)
+                {
+                    AZ_Assert(false, "Allocation failed");
+                    free(pOldElements);
+                    SetStreamData(streamType, streamIndex, nullptr, 0);
+                    return;
+                }
+
+                if (nNewCount > nOldCount)
+                {
+                    memset((char*)pNewElements + nOldCount * nElementSize, 0, (nNewCount - nOldCount) * nElementSize);
+                }
+
+                SetStreamData(streamType, streamIndex, pNewElements, nNewCount);
+            }
+        }
+    }
+
+    // Copy mesh from source mesh.
+    void Copy(const CMesh& mesh)
+    {
+        for (int streamType = 0; streamType < LAST_STREAM; streamType++)
+        {
+            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
+            {
+                ReallocStream(streamType, streamIndex, mesh.m_streamSize[streamType][streamIndex]);
+                if (mesh.m_streamSize[streamType][streamIndex] > 0)
+                {
+                    void* pSrcStream = 0;
+                    void* pTrgStream = 0;
+                    int nElementSize = 0;
+                    mesh.GetStreamInfo(streamType, streamIndex, pSrcStream, nElementSize);
+                    GetStreamInfo(streamType, streamIndex, pTrgStream, nElementSize);
+                    if (pSrcStream && pTrgStream)
+                    {
+                        memcpy(pTrgStream, pSrcStream, m_streamSize[streamType][streamIndex] * nElementSize);
+                    }
+                }
+            }
+        }
+        m_bbox = mesh.m_bbox;
+        m_subsets = mesh.m_subsets;
+        m_texMappingDensity = mesh.m_texMappingDensity;
+        m_geometricMeanFaceArea = mesh.m_geometricMeanFaceArea;
+    }
+
+    bool CompareStreams(const CMesh& mesh) const
+    {
+        for (int streamType = 0; streamType < LAST_STREAM; streamType++)
+        {
+            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
+            {
+                if (m_streamSize[streamType][streamIndex] != mesh.m_streamSize[streamType][streamIndex])
+                {
+                    return false;
+                }
+
+                if (m_streamSize[streamType][streamIndex])
+                {
+                    void* pStream1 = 0;
+                    void* pStream2 = 0;
+                    int nElementSize1 = 0;
+                    int nElementSize2 = 0;
+                    GetStreamInfo(streamType, streamIndex, pStream1, nElementSize1);
+                    mesh.GetStreamInfo(streamType, streamIndex, pStream2, nElementSize2);
+
+                    assert(nElementSize1 == nElementSize2);
+
+                    if ((pStream1 && !pStream2) || (!pStream1 && pStream2))
+                    {
+                        return false;
+                    }
+
+                    if (pStream1 && pStream2)
+                    {
+                        if (memcmp(pStream1, pStream2, m_streamSize[streamType][streamIndex] * nElementSize1) != 0)
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    // Add streams from source mesh to the end of existing streams.
+    const char* Append(const CMesh& mesh)
+    {
+        return Append(mesh, 0, -1, 0, -1);
+    }
+
+    // Add streams from source mesh to the end of existing streams.
+    const char* Append(const CMesh& mesh, int fromVertex, int vertexCount, int fromFace, int faceCount)
+    {
+        if (GetIndexCount() > 0 || mesh.GetIndexCount() > 0)
+        {
+            assert(0);
+            return "Cmesh::Append() cannot handle meshes with indices, it can handle faces only";
+        }
+
+        // Non-ranged requests should start from 0th element and element count should be <0.
+        if ((vertexCount < 0 && fromVertex != 0) || (faceCount < 0 && fromFace != 0))
+        {
+            assert(0);
+            return "Cmesh::Append(): Bad CMesh parameters";
+        }
+        if (vertexCount < 0)
+        {
+            vertexCount = mesh.GetVertexCount();
+        }
+        if (faceCount < 0)
+        {
+            faceCount = mesh.GetFaceCount();
+        }
+
+        const int oldVertexCount = GetVertexCount();
+        const int oldFaceCount = GetFaceCount();
+        const int nOldCoorCount = GetTexCoordCount();
+
+        if (GetTexCoordCount() != 0 && GetTexCoordCount() != oldVertexCount)
+        {
+            assert(0);
+            return "Cmesh::Append(): Mismatch in target CMesh vert/tcoord counts";
+        }
+
+        if (mesh.GetTexCoordCount() != 0 && mesh.GetTexCoordCount() != mesh.GetVertexCount())
+        {
+            assert(0);
+            return "Cmesh::Append(): Mismatch in source CMesh vert/tcoord counts";
+        }
+
+        for (int streamType = 0; streamType < LAST_STREAM; ++streamType)
+        {
+            for (int streamIndex = 0; streamIndex < GetNumberOfStreamsByType(streamType); ++streamIndex)
+            {
+                const int oldCount = (streamType == FACES) ? oldFaceCount : oldVertexCount;
+
+                const int from = (streamType == FACES) ? fromFace : fromVertex;
+                const int count = (streamType == FACES) ? faceCount : vertexCount;
+
+                const int oldStreamSize = m_streamSize[streamType][streamIndex];
+                const int streamSize = mesh.m_streamSize[streamType][streamIndex];
+
+                if (oldStreamSize <= 0 && (count <= 0 || streamSize <= 0))
+                {
+                    continue;
+                }
+
+                ReallocStream(streamType, streamIndex, oldCount + count);
+
+                if (count > 0)
+                {
+                    void* pSrcStream = 0;
+                    void* pTrgStream = 0;
+                    int srcElementSize = 0;
+                    int trgElementSize = 0;
+                    mesh.GetStreamInfo(streamType, streamIndex, pSrcStream, srcElementSize);
+                    GetStreamInfo(streamType, streamIndex, pTrgStream, trgElementSize);
+
+                    assert(srcElementSize == trgElementSize);
+
+                    if (pSrcStream && pTrgStream)
+                    {
+                        memcpy(
+                            (char*)pTrgStream + oldCount * trgElementSize,
+                            (char*)pSrcStream + from * srcElementSize,
+                            count * srcElementSize);
+                    }
+                }
+            }
+        }
+
+        {
+            const int nOffset = oldVertexCount - fromVertex;
+            const int newFaceCount = GetFaceCount();
+
+            for (int i = oldFaceCount; i < newFaceCount; ++i)
+            {
+                m_pFaces[i].v[0] += nOffset;
+                m_pFaces[i].v[1] += nOffset;
+                m_pFaces[i].v[2] += nOffset;
+            }
+        }
+
+        m_bbox.Add(mesh.m_bbox.min);
+        m_bbox.Add(mesh.m_bbox.max);
+
+        return 0;
+    }
+
+    void RemoveRangeFromStream(int streamType, int streamIndex, int nFirst, int nCount)
+    {
+        if (streamType < 0 || streamType >= LAST_STREAM || streamIndex >= maxStreamsPerType)
+        {
+            AZ_Assert(false, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
+            return;
+        }
+
+        if (m_sharedStreamMasks[streamIndex] & (1 << streamType))
+        {
+            // Make shared stream non-shared
+            ReallocStream(streamType, streamIndex, m_streamSize[streamType][streamIndex]);
+        }
+
+        const int nTotalCount = m_streamSize[streamType][streamIndex];
+
+        int nElementSize;
+        void* pStream = 0;
+        GetStreamInfo(streamType, streamIndex, pStream, nElementSize);
+
+        if (nFirst >= nTotalCount || nTotalCount <= 0 || pStream == 0)
+        {
+            return;
+        }
+        if (nFirst + nCount > nTotalCount)
+        {
+            nCount = nTotalCount - nFirst;
+        }
+        if (nCount <= 0)
+        {
+            return;
+        }
+
+        const int nTailCount = nTotalCount - (nFirst + nCount);
+        if (nTailCount > 0)
+        {
+            char* const pRangeStart = (char*)pStream + nFirst * nElementSize;
+            char* const pRangeEnd = (char*)pStream + (nFirst + nCount) * nElementSize;
+            memmove(pRangeStart, pRangeEnd, nTailCount * nElementSize);
+        }
+
+        ReallocStream(streamType, streamIndex, nTotalCount - nCount);
+    }
+
+    bool Validate(const char** const ppErrorDescription) const
+    {
+        const int vertexCount = GetVertexCount();
+        const int faceCount = GetFaceCount();
+        const int indexCount = GetIndexCount();
+
+        if ((faceCount <= 0) && (indexCount <= 0))
+        {
+            if (vertexCount > 0)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "no any indices, but vertices exist";
+                }
+                return false;
+            }
+        }
+
+        if ((uint)vertexCount > (sizeof(vtx_idx) == 2 ? 0xffff : 0x7fffffff))
+        {
+            if (ppErrorDescription)
+            {
+                ppErrorDescription[0] =
+                    (sizeof(vtx_idx) == 2)
+                    ? "vertex count is greater or equal than 64K"
+                    : "vertex count is greater or equal than 2G";
+            }
+            return false;
+        }
+
+        if (faceCount > 0)
+        {
+            if (vertexCount <= 0)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "no any vertices, but faces exist";
+                }
+                return false;
+            }
+        }
+
+        if (indexCount > 0)
+        {
+            if (vertexCount <= 0)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "no any vertices, but indices exist";
+                }
+                return false;
+            }
+        }
+
+        for (int i = 0; i < faceCount; ++i)
+        {
+            const SMeshFace& face = m_pFaces[i];
+            for (int j = 0; j < 3; ++j)
+            {
+                const int v = face.v[j];
+                if ((v < 0) || (v >= vertexCount))
+                {
+                    if (ppErrorDescription)
+                    {
+                        ppErrorDescription[0] = "a face refers vertex outside of vertex array";
+                    }
+                    return false;
+                }
+            }
+        }
+
+        for (int i = 0; i < indexCount; i++)
+        {
+            if ((uint)m_pIndices[i] >= (uint)vertexCount)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "an index refers vertex outside of vertex array";
+                }
+                return false;
+            }
+        }
+
+        if (GetTexCoordCount() != 0 && GetTexCoordCount() != vertexCount)
+        {
+            if (ppErrorDescription)
+            {
+                ppErrorDescription[0] = "number of texture coordinates is different from number of vertices";
+            }
+            return false;
+        }
+
+        if (!_finite(m_bbox.min.x) || !_finite(m_bbox.min.y) || !_finite(m_bbox.min.z) ||
+            !_finite(m_bbox.max.x) || !_finite(m_bbox.max.y) || !_finite(m_bbox.max.z))
+        {
+            if (ppErrorDescription)
+            {
+                ppErrorDescription[0] = "bounding box contains damaged data";
+            }
+            return false;
+        }
+
+        if (m_bbox.IsReset())
+        {
+            if (ppErrorDescription)
+            {
+                ppErrorDescription[0] = "bounding box is not set";
+            }
+            return false;
+        }
+
+        if (m_bbox.max.x < m_bbox.min.x ||
+            m_bbox.max.y < m_bbox.min.y ||
+            m_bbox.max.z < m_bbox.min.z)
+        {
+            if (ppErrorDescription)
+            {
+                ppErrorDescription[0] = "bounding box min is greater than max";
+            }
+            return false;
+        }
+
+        if (m_bbox.min.GetDistance(m_bbox.max) < 0.001f)
+        {
+            if (ppErrorDescription)
+            {
+                ppErrorDescription[0] = "bounding box is less than 1 mm in size";
+            }
+            return false;
+        }
+
+        for (int s = 0, subsetCount = m_subsets.size(); s < subsetCount; ++s)
+        {
+            const SMeshSubset& subset = m_subsets[s];
+
+            if (subset.nNumIndices <= 0)
+            {
+                if (subset.nNumVerts > 0)
+                {
+                    if (ppErrorDescription)
+                    {
+                        ppErrorDescription[0] = "a mesh subset without indices contains vertices";
+                    }
+                    return false;
+                }
+                continue;
+            }
+            else if (subset.nNumVerts <= 0)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "a mesh subset has indices but vertices are missing";
+                }
+                return false;
+            }
+
+            if (subset.nFirstIndexId < 0)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "a mesh subset has negative start position in index array";
+                }
+                return false;
+            }
+            if (subset.nFirstIndexId + subset.nNumIndices > indexCount)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "a mesh subset refers indices outside of index array";
+                }
+                return false;
+            }
+            if (subset.nFirstVertId < 0)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "a mesh subset has negative start position in vertex array";
+                }
+                return false;
+            }
+            if (subset.nFirstVertId + subset.nNumVerts > vertexCount)
+            {
+                if (ppErrorDescription)
+                {
+                    ppErrorDescription[0] = "a mesh subset refers vertices outside of vertex array";
+                }
+                return false;
+            }
+
+            for (int ii = subset.nFirstIndexId; ii < subset.nFirstIndexId + subset.nNumIndices; ++ii)
+            {
+                const uint index = m_pIndices[ii];
+                if (index < (uint)subset.nFirstVertId)
+                {
+                    if (ppErrorDescription)
+                    {
+                        ppErrorDescription[0] = "a mesh subset refers a vertex lying before subset vertices";
+                    }
+                    return false;
+                }
+                if (index >= (uint)(subset.nFirstVertId + subset.nNumVerts))
+                {
+                    if (ppErrorDescription)
+                    {
+                        ppErrorDescription[0] = "a mesh subset refers a vertex lying after subset vertices";
+                    }
+                    return false;
+                }
+
+                Vec3 p(ZERO);
+                const Vec3* pp = &p;
+                if (m_pPositions)
+                {
+                    pp = &m_pPositions[index];
+                }
+                else if (m_pPositionsF16)
+                {
+                    p = m_pPositionsF16[index].ToVec3();
+                }
+                else if (m_pP3S_C4B_T2S)
+                {
+                    p = m_pP3S_C4B_T2S[index].xyz.ToVec3();
+                }
+                if (!_finite(pp->x))
+                {
+                    if (ppErrorDescription)
+                    {
+                        ppErrorDescription[0] = "a mesh subset contains a vertex with damaged x component";
+                    }
+                    return false;
+                }
+                if (!_finite(pp->y))
+                {
+                    if (ppErrorDescription)
+                    {
+                        ppErrorDescription[0] = "a mesh subset contains a vertex with damaged y component";
+                    }
+                    return false;
+                }
+                if (!_finite(pp->z))
+                {
+                    if (ppErrorDescription)
+                    {
+                        ppErrorDescription[0] = "a mesh subset contains a vertex with damaged z component";
+                    }
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool ComputeSubsetTexMappingAreas(
+        size_t subsetIndex,
+        float& computedPosArea, float& computedTexArea, const char*& errorText)
+    {
+        computedPosArea = 0.0f;
+        computedTexArea = 0.0f;
+        errorText = "";
+
+        if (subsetIndex >= (size_t)m_subsets.size())
+        {
+            errorText = "subset index is bad";
+            return false;
+        }
+
+        if (GetIndexCount() <= 0)
+        {
+            errorText = "missing indices";
+            return false;
+        }
+
+        if ((GetVertexCount() <= 0) || ((m_pPositions == NULL) && (m_pPositionsF16 == NULL)))
+        {
+            errorText = "missing vertices";
+            return false;
+        }
+
+        if ((m_pTexCoord == NULL) || (GetTexCoordCount() <= 0))
+        {
+            errorText = "missing texture coordinates";
+            return false;
+        }
+
+        const SMeshSubset& subset = m_subsets[subsetIndex];
+
+        if ((subset.nNumIndices <= 0) || (subset.nFirstIndexId < 0))
+        {
+            errorText = "missing or bad indices in subset";
+            return false;
+        }
+
+        bool ok;
+        if (m_pPositions)
+        {
+            ok = CMeshHelpers::ComputeTexMappingAreas(
+                    subset.nNumIndices, &m_pIndices[subset.nFirstIndexId],
+                    GetVertexCount(),
+                    &m_pPositions[0], sizeof(m_pPositions[0]),
+                    &m_pTexCoord[0], sizeof(m_pTexCoord[0]),
+                    computedPosArea, computedTexArea, errorText);
+        }
+        else
+        {
+            ok = CMeshHelpers::ComputeTexMappingAreas(
+                    subset.nNumIndices, &m_pIndices[subset.nFirstIndexId],
+                    GetVertexCount(),
+                    &m_pPositionsF16[0], sizeof(m_pPositionsF16[0]),
+                    &m_pTexCoord[0], sizeof(m_pTexCoord[0]),
+                    computedPosArea, computedTexArea, errorText);
+        }
+
+        return ok;
+    }
+
+    // note: this function doesn't work for "old" uncompressed meshes (with faces instead of indices)
+    bool RecomputeTexMappingDensity()
+    {
+        m_texMappingDensity = 0;
+
+        if (GetFaceCount() > 0)
+        {
+            // uncompressed mesh - not supported
+            return false;
+        }
+
+        if ((GetIndexCount() <= 0) || (GetVertexCount() <= 0) || ((m_pPositions == NULL) && (m_pPositionsF16 == NULL)))
+        {
+            return false;
+        }
+
+        if ((m_pTexCoord == NULL) || (GetTexCoordCount() <= 0))
+        {
+            return false;
+        }
+
+        float totalPosArea = 0;
+        float totalTexArea = 0;
+
+        for (size_t i = 0, count = m_subsets.size(); i < count; ++i)
+        {
+
+            float posArea;
+            float texArea;
+            const char* errorText = "";
+
+            const bool ok = ComputeSubsetTexMappingAreas(i, posArea, texArea, errorText);
+
+            if (ok)
+            {
+                totalPosArea += posArea;
+                totalTexArea += texArea;
+            }
+        }
+
+        if (totalPosArea <= 0)
+        {
+            return false;
+        }
+
+        m_texMappingDensity = totalTexArea / totalPosArea;
+        return true;
+    }
+
+    bool RecomputeGeometricMeanFaceArea()
+    {
+        m_geometricMeanFaceArea = 0.0f;
+
+        if (GetFaceCount() > 0)
+        {
+            // uncompressed mesh - not supported
+            return false;
+        }
+
+        if ((GetIndexCount()  <= 0) || (GetVertexCount() <= 0) || ((m_pPositions == NULL) && (m_pPositionsF16 == NULL)))
+        {
+            return false;
+        }
+
+        std::vector<float> areas;
+        const size_t subsetCount = m_subsets.size();
+
+        for (size_t i = 0; i < subsetCount; ++i)
+        {
+            CollectSubsetFaceAreas(m_subsets[i], areas);
+        }
+
+        const size_t areasCount = areas.size();
+        if (areasCount == 0)
+        {
+            return false;
+        }
+
+        float fGeometricTotal = 0.0f;
+        for (size_t i = 0; i < areasCount; ++i)
+        {
+            fGeometricTotal += logf(areas[i]);
+        }
+
+        m_geometricMeanFaceArea = expf(fGeometricTotal / areasCount);
+
+        assert(m_geometricMeanFaceArea > 0.0f);
+
+        return true;
+    }
+
+    bool CollectSubsetFaceAreas(const SMeshSubset& subset, std::vector<float>& areas)
+    {
+        if ((subset.nNumIndices <= 0) || (subset.nFirstIndexId < 0))
+        {
+            return false;
+        }
+
+        bool ok = false;
+        if (m_pPositions != NULL)
+        {
+            ok = CMeshHelpers::CollectFaceAreas(subset.nNumIndices, &m_pIndices[subset.nFirstIndexId],
+                    GetVertexCount(), &m_pPositions[0], sizeof(m_pPositions[0]), areas);
+        }
+        else if (m_pPositionsF16 != NULL)
+        {
+            ok = CMeshHelpers::CollectFaceAreas(subset.nNumIndices, &m_pIndices[subset.nFirstIndexId],
+                    GetVertexCount(), &m_pPositionsF16[0], sizeof(m_pPositionsF16[0]), areas);
+        }
+
+        return ok;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Estimates the size of the render mesh.
+    uint32 EstimateRenderMeshMemoryUsage() const
+    {
+        const size_t cSizeStream[VSF_NUM] = {
+            0U,
+            sizeof(SPipTangents),        // VSF_TANGENTS
+            sizeof(SPipQTangents),       // VSF_QTANGENTS
+            sizeof(SVF_W4B_I4S),         // VSF_HWSKIN_INFO
+            sizeof(SVF_P3F),             // VSF_VERTEX_VELOCITY
+#if ENABLE_NORMALSTREAM_SUPPORT
+            sizeof(SPipNormal),          // VSF_NORMALS
+#endif
+        };
+
+        uint32 nMeshSize = 0;
+        uint32 activeStreams = (GetVertexCount()) ? 1U << VSF_GENERAL : 0U;
+        activeStreams |=
+            (m_pQTangents) ? (1U << VSF_QTANGENTS) :
+            (m_pTangents) ? (1U << VSF_TANGENTS) : 0U;
+        if (m_pBoneMapping)
+        {
+            activeStreams |= 1U << VSF_HWSKIN_INFO;
+        }
+        for (uint32 i = 0; i < VSF_NUM; i++)
+        {
+            if (activeStreams & (1U << i))
+            {
+                nMeshSize += ((i == VSF_GENERAL) ? sizeof(SVF_P3S_C4B_T2S) : cSizeStream[i]) * GetVertexCount();
+                nMeshSize += TARGET_DEFAULT_ALIGN - (nMeshSize & (TARGET_DEFAULT_ALIGN - 1));
+            }
+        }
+        if (GetIndexCount())
+        {
+            nMeshSize += GetIndexCount() * sizeof(vtx_idx);
+            nMeshSize += TARGET_DEFAULT_ALIGN - (nMeshSize & (TARGET_DEFAULT_ALIGN - 1));
+        }
+
+        return nMeshSize;
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    // This function used when we do not have an actual mesh, but only vertex/index count of it.
+    static uint32 ApproximateRenderMeshMemoryUsage(int nVertexCount, int nIndexCount)
+    {
+        uint32 nMeshSize = 0;
+        nMeshSize += nVertexCount * sizeof(SVF_P3S_C4B_T2S);
+        nMeshSize += nVertexCount * sizeof(SPipTangents);
+
+        nMeshSize += nIndexCount * sizeof(vtx_idx);
+        return nMeshSize;
+    }
+
+private:
+    // Set stream size.
+    void SetStreamData(int streamType, int streamIndex, void* pStream, int nNewCount)
+    {
+        if (streamType < 0 || streamType >= LAST_STREAM || streamIndex >= maxStreamsPerType)
+        {
+            AZ_Assert(false, "Stream type %d outside of allowable range (%d to %d) of CMesh::EStream, or stream index %d exceeds the maximum number of vertex streams (%d) per type.", streamType, 0, CMesh::LAST_STREAM, streamIndex, maxStreamsPerType);
+            return;
+        }
+        m_streamSize[streamType][streamIndex] = nNewCount;
+        switch (streamType)
+        {
+        case POSITIONS:
+            m_pPositions = (Vec3*)pStream;
+            break;
+        case POSITIONSF16:
+            m_pPositionsF16 = (Vec3f16*)pStream;
+            break;
+        case NORMALS:
+            m_pNorms = (SMeshNormal*)pStream;
+            break;
+        case VERT_MATS:
+            m_pVertMats = (int*)pStream;
+            break;
+        case FACES:
+            m_pFaces = (SMeshFace*)pStream;
+            break;
+        case TOPOLOGY_IDS:
+            m_pTopologyIds = (int32*)pStream;
+            break;
+        case TEXCOORDS:
+            if (streamIndex == 0)
+            {
+                m_pTexCoord = (SMeshTexCoord*)pStream;
+            }
+            else
+            {
+                m_texCoords[streamIndex] = (SMeshTexCoord*)pStream;
+            }
+            m_nCoorCount = nNewCount;
+            break;
+        case COLORS:
+            if (streamIndex == 0)
+            {
+                m_pColor0 = (SMeshColor*)pStream;
+            }
+            else
+            {
+                m_pColor1 = (SMeshColor*)pStream;
+            }
+            break;
+        case INDICES:
+            m_pIndices = (vtx_idx*)pStream;
+            break;
+        case TANGENTS:
+            m_pTangents = (SMeshTangents*)pStream;
+            break;
+        case QTANGENTS:
+            m_pQTangents = (SMeshQTangents*)pStream;
+            break;
+        case BONEMAPPING:
+            m_pBoneMapping = (SMeshBoneMapping_uint16*)pStream;
+            break;
+        case EXTRABONEMAPPING:
+            m_pExtraBoneMapping = (SMeshBoneMapping_uint16*)pStream;
+            break;
+        case P3S_C4B_T2S:
+            m_pP3S_C4B_T2S = (SVF_P3S_C4B_T2S*)pStream;
+            m_nCoorCount = nNewCount;
+            break;
+        default:
+            AZ_Assert(false, "Unknown stream");
+            break;
+        }
+    }
+
+    SMeshTexCoord* m_texCoords[maxStreamsPerType];
+};
+
+// 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
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IIndexedMesh() {}
+
+    // Release indexed mesh.
+    virtual void Release() = 0;
+
+    //! Gives read-only access to mesh data
+    virtual void GetMeshDescription(SMeshDescription& meshDesc) const = 0;
+
+    virtual CMesh* GetMesh() = 0;
+
+    virtual void SetMesh(CMesh& mesh) = 0;
+
+    /*! Frees vertex and face streams. Calling this function invalidates SMeshDescription pointers */
+    virtual void FreeStreams() = 0;
+
+    //! Return number of allocated faces
+    virtual int GetFaceCount() const = 0;
+
+    /*! Reallocates faces. Calling this function invalidates SMeshDescription pointers */
+    virtual void SetFaceCount(int nNewCount) = 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;
+
+    /*! Reallocates colors. Calling this function invalidates SMeshDescription pointers */
+    virtual void SetColorCount(int nNewCount) = 0;
+
+    //! Return number of allocated texture coordinates
+    virtual int GetTexCoordCount() const = 0;
+
+    /*! Reallocates texture coordinates. Calling this function invalidates SMeshDescription pointers */
+    virtual void SetTexCoordCount(int nNewCount, int numStreams = 1) = 0;
+
+    //! Return number of allocated tangents.
+    virtual int GetTangentCount() const = 0;
+
+    /*! Reallocates tangents. Calling this function invalidates SMeshDescription pointers */
+    virtual void SetTangentCount(int nNewCount) = 0;
+
+    // Get number of indices in the mesh.
+    virtual int GetIndexCount() const = 0;
+
+    // Set number of indices in the mesh.
+    virtual void SetIndexCount(int nNewCount) = 0;
+
+    // Allocates m_pBoneMapping in CMesh
+    virtual void AllocateBoneMapping() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Subset access.
+    //////////////////////////////////////////////////////////////////////////
+    virtual int GetSubSetCount() const = 0;
+    virtual void SetSubSetCount(int nSubsets) = 0;
+    virtual const SMeshSubset& GetSubSet(int nIndex) const = 0;
+    virtual void SetSubsetBounds(int nIndex, const Vec3& vCenter, float fRadius) = 0;
+    virtual void SetSubsetIndexVertexRanges(int nIndex, int nFirstIndexId, int nNumIndices, int nFirstVertId, int nNumVerts) = 0;
+    virtual void SetSubsetMaterialId(int nIndex, int nMatID) = 0;
+    virtual void SetSubsetMaterialProperties(int nIndex, int nMatFlags, int nPhysicalizeType, const AZ::Vertex::Format& vertexFormat) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Mesh bounding box.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetBBox(const AABB& box) = 0;
+    virtual AABB GetBBox() const = 0;
+    virtual void CalcBBox() = 0;
+
+    virtual void RestoreFacesFromIndices() = 0;
+    // </interfuscator:shuffle>
+
+    // Optimizes mesh
+    virtual void Optimize(const char* szComment = NULL) = 0;
+};
+
+
+#endif // CRYINCLUDE_CRYCOMMON_IINDEXEDMESH_H
diff --git a/Code/Legacy/CryCommon/IIndexedMesh_info.cpp b/Code/Legacy/CryCommon/IIndexedMesh_info.cpp
new file mode 100644
index 0000000000..b58af435bb
--- /dev/null
+++ b/Code/Legacy/CryCommon/IIndexedMesh_info.cpp
@@ -0,0 +1,45 @@
+/*
+ * 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 "TypeInfo_impl.h"
+#include <IIndexedMesh.h> // <> required for Interfuscator
+
+STRUCT_INFO_BEGIN(SMeshTexCoord)
+STRUCT_VAR_INFO(s, TYPE_INFO(float))
+STRUCT_VAR_INFO(t, TYPE_INFO(float))
+STRUCT_INFO_END(SMeshTexCoord)
+
+STRUCT_INFO_BEGIN(SMeshNormal)
+STRUCT_VAR_INFO(Normal, TYPE_INFO(Vec3))
+STRUCT_INFO_END(SMeshNormal)
+
+STRUCT_INFO_BEGIN(SMeshColor)
+STRUCT_VAR_INFO(r, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(g, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(b, TYPE_INFO(uint8))
+STRUCT_VAR_INFO(a, TYPE_INFO(uint8))
+STRUCT_INFO_END(SMeshColor)
+
+STRUCT_INFO_BEGIN(SMeshTangents)
+STRUCT_VAR_INFO(Tangent, TYPE_INFO(Vec4sf))
+STRUCT_VAR_INFO(Bitangent, TYPE_INFO(Vec4sf))
+STRUCT_INFO_END(SMeshTangents)
+
+STRUCT_INFO_BEGIN(SMeshQTangents)
+STRUCT_VAR_INFO(TangentBitangent, TYPE_INFO(Vec4sf))
+STRUCT_INFO_END(SMeshQTangents)
+
+STRUCT_INFO_BEGIN(SMeshBoneMapping_uint16)
+STRUCT_VAR_INFO(boneIds, TYPE_ARRAY(4, TYPE_INFO(SMeshBoneMapping_uint16::BoneId)))
+STRUCT_VAR_INFO(weights, TYPE_ARRAY(4, TYPE_INFO(SMeshBoneMapping_uint16::Weight)))
+STRUCT_INFO_END(SMeshBoneMapping_uint16)
+
+STRUCT_INFO_BEGIN(SMeshBoneMapping_uint8)
+STRUCT_VAR_INFO(boneIds, TYPE_ARRAY(4, TYPE_INFO(SMeshBoneMapping_uint8::BoneId)))
+STRUCT_VAR_INFO(weights, TYPE_ARRAY(4, TYPE_INFO(SMeshBoneMapping_uint8::Weight)))
+STRUCT_INFO_END(SMeshBoneMapping_uint8)
diff --git a/Code/Legacy/CryCommon/ILevelSystem.h b/Code/Legacy/CryCommon/ILevelSystem.h
new file mode 100644
index 0000000000..be0b1670ce
--- /dev/null
+++ b/Code/Legacy/CryCommon/ILevelSystem.h
@@ -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
+ *
+ */
+
+
+// Description : Gathers level information. Loads a level.
+
+
+#ifndef CRYINCLUDE_CRYACTION_ILEVELSYSTEM_H
+#define CRYINCLUDE_CRYACTION_ILEVELSYSTEM_H
+#pragma once
+
+#include <CrySizer.h>
+#include <IXml.h>
+#include <AzCore/Asset/AssetCommon.h>
+
+struct IConsoleCmdArgs;
+
+namespace AZ::IO
+{
+    struct IArchive;
+}
+
+// [LYN-2376] Remove once legacy slice support is removed
+struct ILevelInfo
+{
+    virtual ~ILevelInfo() = default;
+
+    virtual const char* GetName() const = 0;
+    virtual const char* GetPath() const = 0;
+    virtual const char* GetAssetName() const = 0;
+};
+
+
+/*!
+ * Extend this class and call ILevelSystem::AddListener() to receive level system related events.
+ */
+struct ILevelSystemListener
+{
+    virtual ~ILevelSystemListener() = default;
+    //! Called when loading a level fails due to it not being found.
+    virtual void OnLevelNotFound([[maybe_unused]] const char* levelName) {}
+    //! Called after ILevelSystem::PrepareNextLevel() completes.
+    virtual void OnPrepareNextLevel([[maybe_unused]] const char* levelName) {}
+    //! Called after ILevelSystem::OnLoadingStart() completes, before the level actually starts loading.
+    virtual void OnLoadingStart([[maybe_unused]] const char* levelName) {}
+    //! Called after the level finished
+    virtual void OnLoadingComplete([[maybe_unused]] const char* levelName) {}
+    //! Called when there's an error loading a level, with the level info and a description of the error.
+    virtual void OnLoadingError([[maybe_unused]] const char* levelName, [[maybe_unused]] const char* error) {}
+    //! Called whenever the loading status of a level changes. progressAmount goes from 0->100.
+    virtual void OnLoadingProgress([[maybe_unused]] const char* levelName, [[maybe_unused]] int progressAmount) {}
+    //! Called after a level is unloaded, before the data is freed.
+    virtual void OnUnloadComplete([[maybe_unused]] const char* levelName) {}
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { }
+};
+
+struct ILevelSystem
+{
+    virtual ~ILevelSystem() = default;
+
+    virtual void Release() = 0;
+
+    virtual void AddListener(ILevelSystemListener* pListener) = 0;
+    virtual void RemoveListener(ILevelSystemListener* pListener) = 0;
+
+    virtual bool LoadLevel(const char* levelName) = 0;
+    virtual void UnloadLevel() = 0;
+    virtual bool IsLevelLoaded() = 0;
+    virtual const char* GetCurrentLevelName() const = 0;
+
+    // If the level load failed then we need to have a different shutdown procedure vs when a level is naturally unloaded
+    virtual void SetLevelLoadFailed(bool loadFailed) = 0;
+    virtual bool GetLevelLoadFailed() = 0;
+
+    virtual AZ::Data::AssetType GetLevelAssetType() const = 0;
+
+    static const char* GetLevelsDirectoryName()
+    {
+        return LevelsDirectoryName;
+    }
+
+    // [LYN-2376] Deprecated methods, to be removed once slices are removed:
+    virtual void Rescan(const char* levelsFolder) = 0;
+    virtual int GetLevelCount() = 0;
+    virtual ILevelInfo* GetLevelInfo(int level) = 0;
+    virtual ILevelInfo* GetLevelInfo(const char* levelName) = 0;
+
+protected:
+
+    static constexpr const char* LevelsDirectoryName = "levels";
+};
+
+#endif // CRYINCLUDE_CRYACTION_ILEVELSYSTEM_H
diff --git a/Code/Legacy/CryCommon/ILocalizationManager.h b/Code/Legacy/CryCommon/ILocalizationManager.h
new file mode 100644
index 0000000000..b7a6bf66e1
--- /dev/null
+++ b/Code/Legacy/CryCommon/ILocalizationManager.h
@@ -0,0 +1,297 @@
+/*
+ * 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_ILOCALIZATIONMANAGER_H
+#define CRYINCLUDE_CRYCOMMON_ILOCALIZATIONMANAGER_H
+#pragma once
+
+#include "LocalizationManagerBus.h"
+//#include <platform.h> // Needed for LARGE_INTEGER (for consoles).
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+// Forward declarations
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+class XmlNodeRef;
+
+//////////////////////////////////////////////////////////////////////////
+// Localized strings manager interface.
+//////////////////////////////////////////////////////////////////////////
+
+// Localization Info structure
+struct SLocalizedInfoGame
+{
+    SLocalizedInfoGame ()
+        : szCharacterName(NULL)
+        , bUseSubtitle(false)
+    {
+    }
+
+    const char* szCharacterName;
+    string sUtf8TranslatedText;
+
+    bool bUseSubtitle;
+};
+
+struct SLocalizedAdvancesSoundEntry
+{
+    string  sName;
+    float       fValue;
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(sName);
+    }
+};
+
+// Localization Sound Info structure, containing sound related parameters.
+struct SLocalizedSoundInfoGame
+    : public SLocalizedInfoGame
+{
+    SLocalizedSoundInfoGame()
+        : sSoundEvent(NULL)
+        , fVolume(0.f)
+        , fRadioRatio (0.f)
+        , bIsDirectRadio(false)
+        , bIsIntercepted(false)
+        , nNumSoundMoods(0)
+        , pSoundMoods (NULL)
+        , nNumEventParameters(0)
+        , pEventParameters(NULL)
+    {
+    }
+
+    const char* sSoundEvent;
+    float fVolume;
+    float fRadioRatio;
+    bool    bIsDirectRadio;
+    bool    bIsIntercepted;
+
+    // SoundMoods.
+    int         nNumSoundMoods;
+    SLocalizedAdvancesSoundEntry* pSoundMoods;
+
+    // EventParameters.
+    int         nNumEventParameters;
+    SLocalizedAdvancesSoundEntry* pEventParameters;
+};
+
+// Localization Sound Info structure, containing sound related parameters.
+struct SLocalizedInfoEditor
+    : public SLocalizedInfoGame
+{
+    SLocalizedInfoEditor()
+        : sKey(NULL)
+        , sOriginalCharacterName(NULL)
+        , sOriginalActorLine(NULL)
+        , sUtf8TranslatedActorLine(NULL)
+        , nRow(0)
+    {
+    }
+
+    const char* sKey;
+    const char* sOriginalCharacterName;
+    const char* sOriginalActorLine;
+    const char* sUtf8TranslatedActorLine;
+    unsigned int nRow;
+};
+
+// Summary:
+//      Interface to the Localization Manager.
+struct ILocalizationManager
+    : public LocalizationManagerRequestBus::Handler
+{
+    //Platform independent language IDs. These are used to map the platform specific language codes to localization pakfiles
+    //Please ensure that each entry in this enum has a corresponding entry in the PLATFORM_INDEPENDENT_LANGUAGE_NAMES array which is defined in LocalizedStringManager.cpp currently.
+    enum EPlatformIndependentLanguageID
+    {
+        ePILID_English_US,
+        ePILID_English_GB,
+        ePILID_German_DE,
+        ePILID_Russian_RU,
+        ePILID_Polish_PL,
+        ePILID_Turkish_TR,
+        ePILID_Spanish_ES,
+        ePILID_Spanish_MX,
+        ePILID_French_FR,
+        ePILID_French_CA,
+        ePILID_Italian_IT,
+        ePILID_Portugese_PT,
+        ePILID_Portugese_BR,
+        ePILID_Japanese_JP,
+        ePILID_Korean_KR,
+        ePILID_Chinese_T,
+        ePILID_Chinese_S,
+        ePILID_Dutch_NL,
+        ePILID_Finnish_FI,
+        ePILID_Swedish_SE,
+        ePILID_Czech_CZ,
+        ePILID_Norwegian_NO,
+        ePILID_Arabic_SA,
+        ePILID_Danish_DK,
+        ePILID_MAX_OR_INVALID,   //Not a language, denotes the maximum number of languages or an unknown language
+    };
+
+    typedef uint32 TLocalizationBitfield;
+
+    // <interfuscator:shuffle>
+    virtual ~ILocalizationManager(){}
+    virtual const char* LangNameFromPILID(const ILocalizationManager::EPlatformIndependentLanguageID id) = 0;
+    virtual ILocalizationManager::EPlatformIndependentLanguageID PILIDFromLangName(AZStd::string langName) = 0;
+    virtual ILocalizationManager::EPlatformIndependentLanguageID GetSystemLanguage() { return ILocalizationManager::EPlatformIndependentLanguageID::ePILID_English_US; }
+    virtual ILocalizationManager::TLocalizationBitfield MaskSystemLanguagesFromSupportedLocalizations(const ILocalizationManager::TLocalizationBitfield systemLanguages) = 0;
+    virtual ILocalizationManager::TLocalizationBitfield IsLanguageSupported(const ILocalizationManager::EPlatformIndependentLanguageID id) = 0;
+    virtual bool SetLanguage([[maybe_unused]] const char* sLanguage) override { return false; }
+    virtual const char* GetLanguage() override { return nullptr; }
+
+    virtual int GetLocalizationFormat() const { return -1; }
+    virtual AZStd::string GetLocalizedSubtitleFilePath([[maybe_unused]] const AZStd::string& localVideoPath, [[maybe_unused]] const AZStd::string& subtitleFileExtension) const { return ""; }
+    virtual AZStd::string GetLocalizedLocXMLFilePath([[maybe_unused]] const AZStd::string& localXmlPath) const { return ""; }
+    // load the descriptor file with tag information
+    virtual bool InitLocalizationData(const char* sFileName, bool bReload = false) = 0;
+    // request to load loca data by tag. Actual loading will happen during next level load begin event.
+    virtual bool RequestLoadLocalizationDataByTag(const char* sTag) = 0;
+    // direct load of loca data by tag
+    virtual bool LoadLocalizationDataByTag(const char* sTag, bool bReload = false) = 0;
+    virtual bool ReleaseLocalizationDataByTag(const char* sTag) = 0;
+
+    virtual bool LoadAllLocalizationData(bool bReload = false) = 0;
+    virtual bool LoadExcelXmlSpreadsheet([[maybe_unused]] const char* sFileName, [[maybe_unused]] bool bReload = false) override { return false; }
+    virtual void ReloadData() override {};
+
+    // Summary:
+    //   Free localization data.
+    virtual void FreeData() = 0;
+
+    // Summary:
+    //   Translate a string into the currently selected language.
+    // Description:
+    //   Processes the input string and translates all labels contained into the currently selected language.
+    // Parameters:
+    //   sString             - String to be translated.
+    //   outLocalizedString  - Translated version of the string.
+    //   bEnglish            - if true, translates the string into the always present English language.
+    // Returns:
+    //   true if localization was successful, false otherwise
+    virtual bool LocalizeString_ch([[maybe_unused]] const char* sString, [[maybe_unused]] string& outLocalizedString, [[maybe_unused]] bool bEnglish = false) override { return false; }
+
+    // Summary:
+    //   Same as LocalizeString( const char* sString, string& outLocalizedString, bool bEnglish=false )
+    //   but at the moment this is faster.
+    virtual bool LocalizeString_s([[maybe_unused]] const string& sString, [[maybe_unused]] string& outLocalizedString, [[maybe_unused]] bool bEnglish = false) override { return false; }
+
+    // Summary:
+    virtual void LocalizeAndSubstituteInternal([[maybe_unused]] AZStd::string& locString, [[maybe_unused]] const AZStd::vector<AZStd::string>& keys, [[maybe_unused]] const AZStd::vector<AZStd::string>& values) override {}
+    //   Return the localized version corresponding to a label.
+    // Description:
+    //   A label has to start with '@' sign.
+    // Parameters:
+    //   sLabel              - Label to be translated, must start with '@' sign.
+    //   outLocalizedString  - Localized version of the label.
+    //   bEnglish            - if true, returns the always present English version of the label.
+    // Returns:
+    //   True if localization was successful, false otherwise.
+    virtual bool LocalizeLabel([[maybe_unused]] const char* sLabel, [[maybe_unused]] string& outLocalizedString, [[maybe_unused]] bool bEnglish = false) override { return false; }
+    virtual bool IsLocalizedInfoFound([[maybe_unused]] const char* sKey) { return false; }
+
+    // Summary:
+    //   Get localization info structure corresponding to a key (key=label without the '@' sign).
+    // Parameters:
+    //   sKey    - Key to be looked up. Key = Label without '@' sign.
+    //   outGameInfo - Reference to localization info structure to be filled in.
+    //  Returns:
+    //    True if info for key was found, false otherwise.
+    virtual bool GetLocalizedInfoByKey(const char* sKey, SLocalizedInfoGame& outGameInfo) = 0;
+
+    // Summary:
+    //   Get the sound localization info structure corresponding to a key.
+    // Parameters:
+    //   sKey         - Key to be looked up. Key = Label without '@' sign.
+    //   outSoundInfo - reference to sound info structure to be filled in
+    //                                  pSoundMoods requires nNumSoundMoods-times allocated memory
+    //                                  on return nNumSoundMoods will hold how many SoundsMood entries are needed
+    //                                  pEventParameters requires nNumEventParameters-times allocated memory
+    //                                  on return nNumEventParameters will hold how many EventParameter entries are needed
+    //                                  Passing 0 in the Num fields will make the query ignore checking for allocated memory
+    // Returns:
+    //   True if successful, false otherwise (key not found, or not enough memory provided to write additional info).
+    virtual bool GetLocalizedInfoByKey(const char* sKey, SLocalizedSoundInfoGame* pOutSoundInfo) = 0;
+
+    // Summary:
+    //   Return number of localization entries.
+    virtual int  GetLocalizedStringCount() override { return -1; }
+
+    // Summary:
+    //   Get the localization info structure at index nIndex.
+    // Parameters:
+    //   nIndex  - Index.
+    //   outEditorInfo - Reference to localization info structure to be filled in.
+    // Returns:
+    //   True if successful, false otherwise (out of bounds).
+    virtual bool GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoEditor& outEditorInfo) = 0;
+
+    // Summary:
+    //   Get the localization info structure at index nIndex.
+    // Parameters:
+    //   nIndex  - Index.
+    //   outGameInfo - Reference to localization info structure to be filled in.
+    // Returns:
+    //   True if successful, false otherwise (out of bounds).
+    virtual bool GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoGame& outGameInfo) = 0;
+
+    // Summary:
+    //   Get the english localization info structure corresponding to a key.
+    // Parameters:
+    //   sKey         - Key to be looked up. Key = Label without '@' sign.
+    //   sLocalizedString - Corresponding english language string.
+    // Returns:
+    //   True if successful, false otherwise (key not found).
+    virtual bool GetEnglishString([[maybe_unused]] const char* sKey, [[maybe_unused]] string& sLocalizedString) override { return false; }
+
+    // Summary:
+    //   Get Subtitle for Key or Label .
+    // Parameters:
+    //   sKeyOrLabel    - Key or Label to be used for subtitle lookup. Key = Label without '@' sign.
+    //   outSubtitle    - Subtitle (untouched if Key/Label not found).
+    //   bForceSubtitle - If true, get subtitle (sLocalized or sEnglish) even if not specified in Data file.
+    // Returns:
+    //   True if subtitle found (and outSubtitle filled in), false otherwise.
+    virtual bool GetSubtitle([[maybe_unused]] const char* sKeyOrLabel, [[maybe_unused]] string& outSubtitle, [[maybe_unused]] bool bForceSubtitle = false) override { return false; }
+
+    // Description:
+    //      These methods format outString depending on sString with ordered arguments
+    //      FormatStringMessage(outString, "This is %2 and this is %1", "second", "first");
+    // Arguments:
+    //      outString - This is first and this is second.
+    virtual void FormatStringMessage_List([[maybe_unused]] string& outString, [[maybe_unused]] const string& sString, [[maybe_unused]] const char** sParams, [[maybe_unused]] int nParams) override {}
+    virtual void FormatStringMessage([[maybe_unused]] string& outString, [[maybe_unused]] const string& sString, [[maybe_unused]] const char* param1, [[maybe_unused]] const char* param2 = 0, [[maybe_unused]] const char* param3 = 0, [[maybe_unused]] const char* param4 = 0) override {}
+
+    virtual void LocalizeTime([[maybe_unused]] time_t t, [[maybe_unused]] bool bMakeLocalTime, [[maybe_unused]] bool bShowSeconds, [[maybe_unused]] string& outTimeString) override {}
+    virtual void LocalizeDate([[maybe_unused]] time_t t, [[maybe_unused]] bool bMakeLocalTime, [[maybe_unused]] bool bShort, [[maybe_unused]] bool bIncludeWeekday, [[maybe_unused]] string& outDateString) override {}
+    virtual void LocalizeDuration([[maybe_unused]] int seconds, [[maybe_unused]] string& outDurationString) override {}
+    virtual void LocalizeNumber([[maybe_unused]] int number, [[maybe_unused]] string& outNumberString) override {}
+    virtual void LocalizeNumber_Decimal([[maybe_unused]] float number, [[maybe_unused]] int decimals, [[maybe_unused]] string& outNumberString) override {}
+
+    // Summary:
+    //   Returns true if the project has localization configured for use, false otherwise.
+    virtual bool ProjectUsesLocalization() const override { return false; }
+    // </interfuscator:shuffle>
+
+    static ILINE TLocalizationBitfield LocalizationBitfieldFromPILID(EPlatformIndependentLanguageID pilid)
+    {
+        assert(pilid >= 0 && pilid < ePILID_MAX_OR_INVALID);
+        return (1 << pilid);
+    }
+};
+
+// Summary:
+//      Simple bus that notifies listeners that the language (g_language) has changed.
+
+
+
+
+#endif // CRYINCLUDE_CRYCOMMON_ILOCALIZATIONMANAGER_H
diff --git a/Code/Legacy/CryCommon/ILog.h b/Code/Legacy/CryCommon/ILog.h
new file mode 100644
index 0000000000..98e0a46f59
--- /dev/null
+++ b/Code/Legacy/CryCommon/ILog.h
@@ -0,0 +1,273 @@
+/*
+ * 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
+ *
+ */
+
+
+// In Mac, including ILog without including platform.h first fails because platform.h 
+// includes CryThread.h which includes CryThread_pthreads.h which uses ILog. 
+// So plaform.h needs the contents of ILog.h.
+// By including platform.h outside of the guard, we give platform.h the right include order
+#include <platform.h>
+
+#ifndef CRYINCLUDE_CRYCOMMON_ILOG_H
+#define CRYINCLUDE_CRYCOMMON_ILOG_H
+#pragma once
+
+#include <IMiniLog.h> // <> required for Interfuscator
+
+// enable this define to support log scopes to provide more context information for log lines
+// this code is disable by default due it's runtime cost
+//#define SUPPORT_LOG_IDENTER
+
+// forward declarations
+class ICrySizer;
+
+// Summary:
+//   Callback interface to the ILog.
+struct ILogCallback
+{
+    // <interfuscator:shuffle>
+    virtual ~ILogCallback() {}
+    //OnWrite will always be called even if verbosity settings cause OnWriteToConsole and OnWriteToFile to not be called.
+    virtual void OnWrite(const char* sText, IMiniLog::ELogType type) = 0;
+    virtual void OnWriteToConsole(const char* sText, bool bNewLine) = 0;
+    virtual void OnWriteToFile(const char* sText, bool bNewLine) = 0;
+    // </interfuscator:shuffle>
+};
+
+// Summary:
+//   Interface for logging operations based on IMiniLog.
+// Notes:
+//   Logging in CryEngine should be done using the following global functions:
+//      CryLog (eMessage)
+//      CryLogAlways (eAlways)
+//      CryError (eError)
+//      CryWarning (eWarning)
+//      CryComment (eComment)
+//   ILog gives you more control on logging operations.
+// See also:
+//   IMiniLog, CryLog, CryLogAlways, CryError, CryWarning
+struct ILog
+    : public IMiniLog
+{
+    // <interfuscator:shuffle>
+    virtual void Release() = 0;
+
+    // Summary:
+    //   Sets the file used to log to disk.
+    //   if you don't specify the full path it will be assumed relative to the 'log folder'
+    //   dobackups controls whether or not it will backup old logs when creating new ones.
+    virtual bool SetFileName(const char* fileNameOrFullPath, bool doBackups) = 0;
+
+    // Summary:
+    //   Gets the filename used to log to disk.
+    virtual const char* GetFileName() = 0;
+
+    // Summary:
+    //   Gets the filename where the current log backup was copied to on disk
+    virtual const char* GetBackupFileName() = 0;
+
+    //all the following functions will be removed are here just to be able to compile the project ---------------------------
+
+    // Summary:
+    //   Logs the text both to file and console.
+    virtual void    Log(const char* szCommand, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    virtual void    LogAlways(const char* szCommand, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    virtual void    LogWarning(const char* szCommand, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    virtual void    LogError(const char* szCommand, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    // Summary:
+    //   Logs the text both to the end of file and console.
+    virtual void    LogPlus(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    // Summary:
+    //   Logs to the file specified in SetFileName.
+    // See also:
+    //   SetFileName
+    virtual void    LogToFile(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    //
+    virtual void    LogToFilePlus(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    // Summary:
+    //   Logs to console only.
+    virtual void    LogToConsole(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    //
+    virtual void    LogToConsolePlus(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    //
+    virtual void    UpdateLoadingScreen(const char* command, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    //
+    virtual void RegisterConsoleVariables() {}
+
+    //
+    virtual void UnregisterConsoleVariables() {}
+
+    // Notes:
+    //   Full logging (to console and file) can be enabled with verbosity 4.
+    //   In the console 'log_Verbosity 4' command can be used.
+    virtual void    SetVerbosity(int verbosity) = 0;
+
+    virtual int     GetVerbosityLevel() = 0;
+
+    virtual void  AddCallback(ILogCallback* pCallback) = 0;
+    virtual void  RemoveCallback(ILogCallback* pCallback) = 0;
+
+    // Notes:
+    //   The function called every frame by system.
+    virtual void Update() = 0;
+
+    virtual const char* GetModuleFilter() = 0;
+
+    // Notes:
+    //   Collect memory statistics in CrySizer
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+
+    // Asset scope strings help to figure out asset dependencies in case of asset loading errors.
+    // Should not be used directly, only by using define CRY_DEFINE_ASSET_SCOPE
+    // @see CRY_DEFINE_ASSET_SCOPE
+    virtual void PushAssetScopeName([[maybe_unused]] const char* sAssetType, [[maybe_unused]] const char* sName) {};
+    virtual void PopAssetScopeName() {};
+    virtual const char* GetAssetScopeString() { return ""; };
+    // </interfuscator:shuffle>
+
+#if defined(SUPPORT_LOG_IDENTER)
+    virtual void Indent(class CLogIndenter* indenter) = 0;
+    virtual void Unindent(class CLogIndenter* indenter) = 0;
+#endif
+
+#if !defined(RESOURCE_COMPILER)
+    virtual void FlushAndClose() = 0;
+#endif
+};
+
+#if !defined(SUPPORT_LOG_IDENTER)
+#define INDENT_LOG_DURING_SCOPE(...) (void)(0)
+#define CRY_DEFINE_ASSET_SCOPE(sAssetType, sAssetName) (void)(0)
+#else
+class CLogIndenter
+{
+public:
+    CLogIndenter(ILog* log)
+        : m_log(log)
+        , m_enabled(false)
+        , m_nextIndenter(NULL)
+        , m_needToPrintSectionText(false)
+    {
+    }
+
+    void Enable(bool enable = true, const char* sectionTextFormat = NULL, ...)
+    {
+        va_list args;
+        va_start (args, sectionTextFormat);
+
+        enable &= (m_log != NULL);
+
+        if (enable != m_enabled)
+        {
+            if (sectionTextFormat && enable)
+            {
+                char buffer[1024];
+
+                vsnprintf(buffer, sizeof(buffer), sectionTextFormat, args);
+                buffer[sizeof(buffer) - 1] = '\0';
+
+                m_sectionText = buffer;
+                m_needToPrintSectionText = true;
+            }
+            else
+            {
+                m_sectionText = "";
+                m_needToPrintSectionText = m_nextIndenter ? m_nextIndenter->m_needToPrintSectionText : false;
+            }
+
+            assert(m_log);
+
+            if (enable)
+            {
+                m_log->Indent(this);
+            }
+            else
+            {
+                m_log->Unindent(this);
+            }
+            m_enabled = enable;
+        }
+
+        va_end (args);
+    }
+
+    CLogIndenter* GetNextIndenter()
+    {
+        return m_nextIndenter;
+    }
+
+    void SetNextIndenter(CLogIndenter* indenter)
+    {
+        m_nextIndenter = indenter;
+    }
+
+    void DisplaySectionText()
+    {
+        if (m_needToPrintSectionText)
+        {
+            m_needToPrintSectionText = false;
+            string sectionText = m_sectionText;
+            Enable(false);
+
+            if (m_nextIndenter)
+            {
+                m_nextIndenter->DisplaySectionText();
+            }
+
+            if (!sectionText.empty())
+            {
+                assert (m_log);
+                m_log->Log ("%s", sectionText.c_str());
+            }
+            Enable(true);
+        }
+    }
+
+    ~CLogIndenter()
+    {
+        Enable(false);
+    }
+
+private:
+    bool m_enabled;
+    bool m_needToPrintSectionText;
+    ILog* m_log;
+    CLogIndenter* m_nextIndenter;
+    string m_sectionText;
+};
+
+class CLogAssetScopeName
+{
+    ILog* m_pLog;
+public:
+    CLogAssetScopeName(ILog* pLog, const char* sAssetType, const char* sAssetName)
+        : m_pLog(pLog) { pLog->PushAssetScopeName(sAssetType, sAssetName); }
+    ~CLogAssetScopeName() { m_pLog->PopAssetScopeName(); }
+};
+
+#define ILOG_CONCAT_IMPL(x, y) x##y
+#define ILOG_CONCAT_MACRO(x, y) ILOG_CONCAT_IMPL(x, y)
+#define INDENT_LOG_DURING_SCOPE(...) CLogIndenter ILOG_CONCAT_MACRO(indentMe, __LINE__) ((CryGetCurrentThreadId() == gEnv->mMainThreadId) ? gEnv->pLog : NULL); ILOG_CONCAT_MACRO(indentMe, __LINE__).Enable(__VA_ARGS__)
+
+#define CRY_DEFINE_ASSET_SCOPE(sAssetType, sAssetName) CLogAssetScopeName __asset_scope_name(gEnv->pLog, sAssetType, sAssetName);
+#endif
+
+
+#endif // CRYINCLUDE_CRYCOMMON_ILOG_H
+
+
+
diff --git a/Code/Legacy/CryCommon/IMNM.h b/Code/Legacy/CryCommon/IMNM.h
new file mode 100644
index 0000000000..0e12911089
--- /dev/null
+++ b/Code/Legacy/CryCommon/IMNM.h
@@ -0,0 +1,103 @@
+/*
+ * 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 __IMNM_H__
+#define __IMNM_H__
+
+#pragma once
+
+namespace MNM
+{
+    namespace Constants
+    {
+        enum Edges
+        {
+            InvalidEdgeIndex = ~0u
+        };
+
+        enum TileIdConstants
+        {
+            InvalidTileID = 0,
+        };
+        enum TriangleIDConstants
+        {
+            InvalidTriangleID = 0,
+        };
+
+        enum EStaticIsland
+        {
+            eStaticIsland_InvalidIslandID = 0,
+            eStaticIsland_FirstValidIslandID = 1,
+        };
+        enum EGlobalIsland
+        {
+            eGlobalIsland_InvalidIslandID = 0,
+        };
+
+        enum EOffMeshLink
+        {
+            eOffMeshLinks_InvalidOffMeshLinkID = 0,
+        };
+    }
+
+    // ------------------------------------------------------------------------------------------
+    // Basic types used in the MNM namespace
+
+    typedef uint32 TileID;
+    typedef uint32 TriangleID;
+    typedef uint32 OffMeshLinkID;
+
+    // StaticIslandIDs identify triangles that are statically connected inside a mesh
+    // and that are reachable without the use of any off mesh links.
+    typedef uint32 StaticIslandID;
+
+    // GlobalIslandIDs define IDs able to code and connect islands between meshes.
+    struct GlobalIslandID
+    {
+        GlobalIslandID(const uint64 defaultValue = MNM::Constants::eGlobalIsland_InvalidIslandID)
+            : id(defaultValue)
+        {
+            STATIC_ASSERT(sizeof(StaticIslandID) <= 4, "The maximum supported size for StaticIslandIDs is 4 bytes.");
+        }
+
+        GlobalIslandID(const uint32 navigationMeshID, const MNM::StaticIslandID islandID)
+        {
+            id = ((uint64)navigationMeshID << 32) | islandID;
+        }
+
+        GlobalIslandID operator=(const GlobalIslandID other)
+        {
+            id = other.id;
+            return *this;
+        }
+
+        inline bool operator==(const GlobalIslandID& rhs) const
+        {
+            return id == rhs.id;
+        }
+
+        inline bool operator<(const GlobalIslandID& rhs) const
+        {
+            return id < rhs.id;
+        }
+
+        MNM::StaticIslandID GetStaticIslandID() const
+        {
+            return (MNM::StaticIslandID) (id & ((uint64)1 << 32) - 1);
+        }
+
+        uint32 GetNavigationMeshIDAsUint32() const
+        {
+            return static_cast<uint32>(id >> 32);
+        }
+
+        uint64 id;
+    };
+}
+
+#endif // __IMNM_H__
diff --git a/Code/Legacy/CryCommon/IMaterial.h b/Code/Legacy/CryCommon/IMaterial.h
new file mode 100644
index 0000000000..55291c5835
--- /dev/null
+++ b/Code/Legacy/CryCommon/IMaterial.h
@@ -0,0 +1,579 @@
+/*
+ * 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 : IMaterial interface declaration.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IMATERIAL_H
+#define CRYINCLUDE_CRYCOMMON_IMATERIAL_H
+#pragma once
+
+struct ISurfaceType;
+struct ISurfaceTypeManager;
+class ICrySizer;
+
+enum EEfResTextures : int; // Need to specify a fixed size for the forward declare to work on clang
+struct IRenderShaderResources;
+struct SEfTexModificator;
+struct SInputShaderResources;
+
+struct SShaderItem;
+struct SShaderParam;
+struct IShader;
+struct IShaderPublicParams;
+struct IMaterial;
+struct IMaterialManager;
+struct CMaterialCGF;
+struct CRenderChunk;
+struct IRenderMesh;
+
+#include <Tarray.h>
+#include <IXml.h>
+#include <smartptr.h>
+#include <AzCore/EBus/EBus.h>
+
+#ifdef MAX_SUB_MATERIALS
+// This checks that the values are in sync in the different files.
+COMPILE_TIME_ASSERT(MAX_SUB_MATERIALS == 128);
+#else
+#define MAX_SUB_MATERIALS 128
+#endif
+
+// Special names for materials.
+#define MTL_SPECIAL_NAME_COLLISION_PROXY "collision_proxy"
+#define MTL_SPECIAL_NAME_COLLISION_PROXY_VEHICLE "nomaterial_vehicle"
+#define MTL_SPECIAL_NAME_RAYCAST_PROXY "raycast_proxy"
+
+namespace AZ
+{
+    class MaterialNotificationEvents : public AZ::EBusTraits
+    {
+    public:
+        virtual ~MaterialNotificationEvents() {}
+
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        static const bool EnableEventQueue = true;
+        using EventQueueMutexType = AZStd::mutex;
+
+
+        virtual void OnShaderLoaded([[maybe_unused]] IShader* shader) {}
+    };
+    using MaterialNotificationEventBus = AZ::EBus<MaterialNotificationEvents>;
+}
+
+enum
+{
+    MAX_STREAM_PREDICTION_ZONES = 2
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//    IMaterial is an interface to the material object, SShaderItem host which is a combination of IShader and SShaderInputResources.
+//    Material bind together rendering algorithm (Shader) and resources needed to render this shader, textures, colors, etc...
+//    All materials except for pure sub material childs have a unique name which directly represent .mtl file on disk.
+//    Ex: "Materials/Fire/Burn"
+//    Materials can be created by Sandbox MaterialEditor.
+//////////////////////////////////////////////////////////////////////////
+enum EMaterialFlags
+{
+    MTL_FLAG_WIRE                       = 0x0001,   // Use wire frame rendering for this material.
+    MTL_FLAG_2SIDED                     = 0x0002,   // Use 2 Sided rendering for this material.
+    MTL_FLAG_ADDITIVE                   = 0x0004,   // Use Additive blending for this material.
+    //MTL_FLAG_DETAIL_DECAL               = 0x0008,   // UNUSED RESERVED FOR LEGACY REASONS
+    MTL_FLAG_LIGHTING                   = 0x0010,   // Should lighting be applied on this material.
+    MTL_FLAG_NOSHADOW                   = 0x0020,   // Material do not cast shadows.
+    MTL_FLAG_ALWAYS_USED                = 0x0040,   // When set forces material to be export even if not explicitly used.
+    MTL_FLAG_PURE_CHILD                 = 0x0080,   // Not shared sub material, sub material unique to his parent multi material.
+    MTL_FLAG_MULTI_SUBMTL               = 0x0100,   // This material is a multi sub material.
+    MTL_FLAG_NOPHYSICALIZE              = 0x0200,   // Should not physicalize this material.
+    MTL_FLAG_NODRAW                     = 0x0400,   // Do not render this material.
+    MTL_FLAG_NOPREVIEW                  = 0x0800,   // Cannot preview the material.
+    MTL_FLAG_NOTINSTANCED               = 0x1000,   // Do not instantiate this material.
+    MTL_FLAG_COLLISION_PROXY            = 0x2000,   // This material is the collision proxy.
+    MTL_FLAG_SCATTER                    = 0x4000,   // Use scattering for this material
+    MTL_FLAG_REQUIRE_FORWARD_RENDERING  = 0x8000,   // This material has to be rendered in forward rendering passes (alpha/additive blended)
+    MTL_FLAG_NON_REMOVABLE              = 0x10000,  // Material with this flag once created are never removed from material manager (Used for decal materials, this flag should not be saved).
+    MTL_FLAG_HIDEONBREAK                = 0x20000,  // Non-physicalized subsets with such materials will be removed after the object breaks
+    MTL_FLAG_UIMATERIAL                 = 0x40000,  // Used for UI in Editor. Don't need show it DB.
+    MTL_64BIT_SHADERGENMASK             = 0x80000,  // ShaderGen mask is remapped
+    MTL_FLAG_RAYCAST_PROXY              = 0x100000,
+    MTL_FLAG_REQUIRE_NEAREST_CUBEMAP    = 0x200000, // materials with alpha blending requires special processing for shadows
+    MTL_FLAG_CONSOLE_MAT                = 0x400000,
+    MTL_FLAG_DELETE_PENDING             = 0x800000, // Internal use only
+    MTL_FLAG_BLEND_TERRAIN              = 0x1000000,
+    MTL_FLAG_IS_TERRAIN                 = 0x2000000,// indication to the loader - Terrain type
+    MTL_FLAG_IS_SKY                     = 0x4000000,// indication to the loader - Sky type
+    MTL_FLAG_FOG_VOLUME_SHADING_QUALITY_HIGH= 0x8000000 // high vertex shading quality behaves more accurately with fog volumes.
+};
+
+#define MTL_FLAGS_SAVE_MASK (MTL_FLAG_WIRE | MTL_FLAG_2SIDED | MTL_FLAG_ADDITIVE |  MTL_FLAG_LIGHTING | \
+                             MTL_FLAG_NOSHADOW | MTL_FLAG_MULTI_SUBMTL | MTL_FLAG_SCATTER | MTL_FLAG_REQUIRE_FORWARD_RENDERING | MTL_FLAG_FOG_VOLUME_SHADING_QUALITY_HIGH | MTL_FLAG_HIDEONBREAK | MTL_FLAG_UIMATERIAL | MTL_64BIT_SHADERGENMASK | MTL_FLAG_REQUIRE_NEAREST_CUBEMAP | MTL_FLAG_CONSOLE_MAT | MTL_FLAG_BLEND_TERRAIN)
+
+// Post effects flags
+enum EPostEffectFlags
+{
+    POST_EFFECT_GHOST     = 0x1,
+    POST_EFFECT_HOLOGRAM  = 0x2,
+
+    POST_EFFECT_MASK = POST_EFFECT_GHOST | POST_EFFECT_HOLOGRAM
+};
+
+// Bit offsets for shader layer flags
+enum EMaterialLayerFlags
+{
+    // Active layers flags
+    MTL_LAYER_FROZEN = 0x0001,
+    MTL_LAYER_WET    = 0x0002,
+    MTL_LAYER_DYNAMICFROZEN = 0x0008,
+
+    // Usage flags
+    MTL_LAYER_USAGE_NODRAW = 0x0001,     // Layer is disabled
+    MTL_LAYER_USAGE_REPLACEBASE = 0x0002, // Replace base pass rendering with layer - optimization
+    MTL_LAYER_USAGE_FADEOUT = 0x0004,            // Layer doesn't render but still causes parent to fade out
+
+    // Blend offsets
+    MTL_LAYER_BLEND_FROZEN = 0xff000000,
+    MTL_LAYER_BLEND_WET    = 0x00fe0000,
+    MTL_LAYER_BLEND_DYNAMICFROZEN = 0x000000ff,
+
+    MTL_LAYER_FROZEN_MASK                   = 0xff,
+    MTL_LAYER_WET_MASK                      = 0xfe, // bit stolen
+    MTL_LAYER_DYNAMICFROZEN_MASK    = 0xff,
+
+    MTL_LAYER_BLEND_MASK = (MTL_LAYER_BLEND_FROZEN | MTL_LAYER_BLEND_WET | MTL_LAYER_BLEND_DYNAMICFROZEN),
+
+    // Slot count
+    MTL_LAYER_MAX_SLOTS = 3
+};
+
+// copy flags
+enum EMaterialCopyFlags
+{
+    // copy flags
+    MTL_COPY_DEFAULT  = 0,
+    MTL_COPY_NAME     = BIT(0),
+    MTL_COPY_TEXTURES = BIT(1),
+};
+
+struct IMaterialHelpers
+{
+    virtual ~IMaterialHelpers() {}
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual EEfResTextures FindTexSlot(const char* texName) const = 0;
+    virtual const char* FindTexName(EEfResTextures texSlot) const = 0;
+    virtual const char* LookupTexName(EEfResTextures texSlot) const = 0;
+    virtual const char* LookupTexDesc(EEfResTextures texSlot) const = 0;
+    virtual const char* LookupTexEnum(EEfResTextures texSlot) const = 0;
+    virtual const char* LookupTexSuffix(EEfResTextures texSlot) const = 0;
+    virtual bool IsAdjustableTexSlot(EEfResTextures texSlot) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual bool SetGetMaterialParamFloat(IRenderShaderResources& pShaderResources, const char* sParamName, float& v, bool bGet) const = 0;
+    virtual bool SetGetMaterialParamVec3(IRenderShaderResources& pShaderResources, const char* sParamName, Vec3& v, bool bGet) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetTexModFromXml(SEfTexModificator& pShaderResources, const XmlNodeRef& node) const = 0;
+    virtual void SetXmlFromTexMod(const SEfTexModificator& pShaderResources, XmlNodeRef& node) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetTexturesFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
+    virtual void SetXmlFromTextures( SInputShaderResources& pShaderResources, XmlNodeRef& node) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetVertexDeformFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
+    virtual void SetXmlFromVertexDeform(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetLightingFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
+    virtual void SetXmlFromLighting(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetShaderParamsFromXml(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
+    virtual void SetXmlFromShaderParams(const SInputShaderResources& pShaderResources, XmlNodeRef& node) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void MigrateXmlLegacyData(SInputShaderResources& pShaderResources, const XmlNodeRef& node) const = 0;
+};
+
+//////////////////////////////////////////////////////////////////////////////////////
+// Description:
+//    IMaterialLayer is group of material layer properties.
+//    Each layer is composed of shader item, specific layer textures, lod info, etc
+struct IMaterialLayer
+{
+    // <interfuscator:shuffle>
+    virtual ~IMaterialLayer(){}
+    // Reference counting
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+
+    // Description:
+    //    - Enable/disable layer usage
+    virtual void Enable(bool bEnable = true) = 0;
+    // Description:
+    //    - Check if layer enabled
+    virtual bool IsEnabled() const = 0;
+    // Description:
+    //    - Enable/disable fade out
+    virtual void FadeOut(bool bFadeOut = true) = 0;
+    // Description:
+    //    - Check if layer fades out
+    virtual bool DoesFadeOut() const = 0;
+    // Description:
+    //    - Set shader item
+    virtual void SetShaderItem(const _smart_ptr<IMaterial> pParentMtl, const SShaderItem& pShaderItem) = 0;
+    // Description:
+    //    - Return shader item
+    virtual const SShaderItem& GetShaderItem() const = 0;
+    virtual SShaderItem& GetShaderItem() = 0;
+    // Description:
+    //    - Set layer usage flags
+    virtual void SetFlags(uint8 nFlags) = 0;
+    // Description:
+    //    - Get layer usage flags
+    virtual uint8 GetFlags() const = 0;
+
+    // todo: layer specific textures support
+    //
+    // </interfuscator:shuffle>
+};
+
+struct IMaterial
+{
+    // TODO: Remove it!
+    //! default texture mapping
+    uint8 m_ucDefautMappingAxis;
+    float m_fDefautMappingScale;
+
+    // <interfuscator:shuffle>
+    virtual ~IMaterial() {};
+
+    //////////////////////////////////////////////////////////////////////////
+    // Reference counting.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+    virtual int GetNumRefs() = 0;
+
+    virtual IMaterialHelpers& GetMaterialHelpers() = 0;
+    virtual IMaterialManager* GetMaterialManager() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // material name
+    //////////////////////////////////////////////////////////////////////////
+    //! Set material name, (Do not use this directly
+    virtual void SetName(const char* pName) = 0;
+    //! Returns material name.
+    virtual const char* GetName() const = 0;
+
+    //! Set/get shader name. The shader name may include technique name so it could be deferent than GetShaderItem()->m_pShader->GetName().
+    virtual void SetShaderName(const char* pName) = 0;
+    virtual const char* GetShaderName() const = 0;
+
+    //! Material flags.
+    //! @see EMaterialFlags
+    virtual void SetFlags(int flags) = 0;
+    virtual int GetFlags() const = 0;
+    virtual void UpdateFlags() = 0;
+
+    // Returns true if this is the default material.
+    virtual bool IsDefault() = 0;
+
+    virtual int GetSurfaceTypeId() = 0;
+
+    // Assign a different surface type to this material.
+    virtual void SetSurfaceType(const char* sSurfaceTypeName) = 0;
+
+    virtual ISurfaceType* GetSurfaceType() = 0;
+
+    // shader item
+    virtual void ReleaseCurrentShaderItem() = 0;
+    virtual void SetShaderItem(const SShaderItem& _ShaderItem) = 0;
+    // [Alexey] EF_LoadShaderItem return value with RefCount = 1, so if you'll use SetShaderItem after EF_LoadShaderItem use Assign function
+    virtual void AssignShaderItem(const SShaderItem& _ShaderItem) = 0;
+    virtual SShaderItem& GetShaderItem() = 0;
+    virtual const SShaderItem& GetShaderItem() const = 0;
+
+    // Returns shader item for correct sub material or for single material.
+    // Even if this is not sub material or nSubMtlSlot is invalid it will return valid renderable shader item.
+    virtual SShaderItem& GetShaderItem(int nSubMtlSlot) = 0;
+    virtual const SShaderItem& GetShaderItem(int nSubMtlSlot) const = 0;
+
+    // Returns true if streamed in
+    virtual bool IsStreamedIn(const int nMinPrecacheRoundIds[MAX_STREAM_PREDICTION_ZONES], IRenderMesh* pRenderMesh) const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Sub materials access.
+    //////////////////////////////////////////////////////////////////////////
+    //! Returns number of child sub materials holded by this material.
+    virtual void SetSubMtlCount(int numSubMtl) = 0;
+    //! Returns number of child sub materials holded by this material.
+    virtual int GetSubMtlCount() = 0;
+    //! Return sub material at specified index.
+    virtual _smart_ptr<IMaterial> GetSubMtl(int nSlot) = 0;
+    // Assign material to the sub mtl slot.
+    // Must first allocate slots using SetSubMtlCount.
+    virtual void SetSubMtl(int nSlot, _smart_ptr<IMaterial> pMtl) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Layers access.
+    //////////////////////////////////////////////////////////////////////////
+    //! Returns number of layers in this material.
+    virtual void SetLayerCount(uint32 nCount) = 0;
+    //! Returns number of layers in this material.
+    virtual uint32 GetLayerCount() const = 0;
+    //! Set layer at slot id (### MUST ALOCATE SLOTS FIRST ### USING SetLayerCount)
+    virtual void SetLayer(uint32 nSlot, IMaterialLayer* pLayer) = 0;
+    //! Return active layer
+    virtual const IMaterialLayer* GetLayer(uint8 nLayersMask, uint8 nLayersUsageMask) const = 0;
+    //! Return layer at slot id
+    virtual const IMaterialLayer* GetLayer(uint32 nSlot) const = 0;
+    //! Create a new layer
+    virtual IMaterialLayer* CreateLayer() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Always get a valid material.
+    // If not multi material return this material.
+    // If Multi material return Default material if wrong id.
+    virtual _smart_ptr<IMaterial> GetSafeSubMtl(int nSlot) = 0;
+
+    // Description:
+    //    Fill an array of integeres representing surface ids of the sub materials or the material itself.
+    // Arguments:
+    //    pSurfaceIdsTable is a pointer to the array of int with size enough to hold MAX_SUB_MATERIALS surface type ids.
+    // Return:
+    //    number of filled items.
+    virtual int FillSurfaceTypeIds(int pSurfaceIdsTable[]) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // UserData used to link with the Editor.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetUserData(void* pUserData) = 0;
+    virtual void* GetUserData() const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Set or get a material parameter value.
+    //! \param sParamName        - Name of the parameter
+    //! \param v                 - Input or output value depending on bGet
+    //! \param bGet              - If true, v is an output; if false, v is an input
+    //! \param allowShaderParam  - If true, and sParamName is not a built-in parameter of the Material, then custom shader parameters will be searched as well. Defaults to false to preserve legacy behavior.
+    //! \param materialIndex     - Index of the sub-material if this is a material group
+    //! return                   - True if sParamName was found
+    virtual bool SetGetMaterialParamFloat(const char* sParamName, float& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) = 0;
+    //! Set or get a material parameter value.
+    //! \param sParamName        - Name of the parameter
+    //! \param v                 - Input or output value depending on bGet
+    //! \param bGet              - If true, v is an output; if false, v is an input
+    //! \param allowShaderParam  - If true, and sParamName is not a built-in parameter of the Material, then custom shader parameters will be searched as well. Defaults to false to preserve legacy behavior.
+    //! \param materialIndex     - Index of the sub-material if this is a material group
+    //! return                   - True if sParamName was found
+    virtual bool SetGetMaterialParamVec3(const char* sParamName, Vec3& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) = 0;
+    //! Set or get a material parameter value.
+    //! \param sParamName        - Name of the parameter
+    //! \param v                 - Input or output value depending on bGet
+    //! \param bGet              - If true, v is an output; if false, v is an input
+    //! \param allowShaderParam  - If true, and sParamName is not a built-in parameter of the Material, then custom shader parameters will be searched as well. Defaults to false to preserve legacy behavior.
+    //! \param materialIndex     - Index of the sub-material if this is a material group
+    //! return                   - True if sParamName was found
+    virtual bool SetGetMaterialParamVec4(const char* sParamName, Vec4& v, bool bGet, bool allowShaderParam = false, int materialIndex = 0) = 0;
+
+    virtual void SetDirty(bool dirty = true) = 0;
+    virtual bool IsDirty() const = 0;
+
+    //! Returns true if the material is the parent of a group of materials
+    virtual bool IsMaterialGroup() const = 0;
+
+    //! Returns true if the material is a single material belongs to a material group
+    virtual bool IsSubMaterial() const = 0;
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+
+    virtual size_t GetResourceMemoryUsage(ICrySizer* pSizer) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Makes this specific material enter sketch mode.
+    // Current supported sketch modes:
+    //  - 0, no sketch.
+    //  - 1, normal sketch mode.
+    //  - 2, fast sketch mode.
+    virtual void SetSketchMode(int mode) = 0;
+
+    // Sets FT_DONT_STREAM flag for all textures used by the material
+    // If a stream is already in process, this will stop the stream and flush the device texture
+    virtual void DisableTextureStreaming() = 0;
+    //////////////////////////////////////////////////////////////////////////
+    // Tells to texture streamer to start loading textures asynchronously
+    //////////////////////////////////////////////////////////////////////////
+    virtual void RequestTexturesLoading(const float fMipFactor) = 0;
+
+    virtual void PrecacheMaterial(const float fEntDistance, struct IRenderMesh* pRenderMesh, bool bFullUpdate, bool bDrawNear = false) = 0;
+
+    // Estimates texture memory usage for this material
+    // When nMatID is not negative only caluclate for one sub-material
+    virtual int GetTextureMemoryUsage(ICrySizer* pSizer, int nMatID = -1) = 0;
+
+    // Set & retrieve a material link name
+    // This value by itself is not used by the material system per-se and hence
+    // has no real effect, however it is used on a higher level to tie related materials
+    // together, for example by procedural breakable glass to determine which material to
+    // switch to.
+    virtual void SetMaterialLinkName(const char* name) = 0;
+    virtual const char* GetMaterialLinkName() const = 0;
+    virtual void SetKeepLowResSysCopyForDiffTex() = 0;
+
+    virtual uint32 GetDccMaterialHash() const = 0;
+    virtual void SetDccMaterialHash(uint32 hash) = 0;
+
+    virtual CryCriticalSection& GetSubMaterialResizeLock() = 0;
+
+    virtual void UpdateShaderItems() = 0;
+
+    // </interfuscator:shuffle>
+};
+
+
+
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//     IMaterialManagerListener is a callback interface to listenen
+//     for special events of material manager, (used by Editor).
+struct IMaterialManagerListener
+{
+    // <interfuscator:shuffle>
+    virtual ~IMaterialManagerListener(){}
+    // Called when material manager tries to load a material.
+    //  nLoadingFlags - Zero or a bitwise combination of the flagas defined in ELoadingFlags.
+    virtual void OnCreateMaterial(_smart_ptr<IMaterial> pMaterial) = 0;
+    virtual void OnDeleteMaterial(_smart_ptr<IMaterial> pMaterial) = 0;
+    virtual bool IsCurrentMaterial(_smart_ptr<IMaterial> pMaterial) const = 0;
+    // </interfuscator:shuffle>
+};
+
+using IMaterialRef = _smart_ptr<IMaterial>;
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//     IMaterialManager interface provide access to the material manager
+//     implemented in 3d engine.
+struct IMaterialManager
+{
+    //! Loading flags
+    enum ELoadingFlags
+    {
+        ELoadingFlagsPreviewMode        = BIT(0),
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IMaterialManager(){}
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+
+    // Summary:
+    //   Creates a new material object and register it with the material manager
+    // Return Value:
+    //   A newly created object derived from IMaterial.
+    virtual _smart_ptr<IMaterial> CreateMaterial(const char* sMtlName, int nMtlFlags = 0) = 0;
+
+    // Summary:
+    //   Renames a material object
+    // Note:
+    //   Do not use IMaterial::SetName directly.
+    // Arguments:
+    //   pMtl - Pointer to a material object
+    //   sNewName - New name to assign to the material
+    virtual void RenameMaterial(_smart_ptr<IMaterial> pMtl, const char* sNewName) = 0;
+
+    // Description:
+    //    Finds named material.
+    virtual _smart_ptr<IMaterial> FindMaterial(const char* sMtlName) const = 0;
+
+    // Description:
+    //    Loads material.
+    //  nLoadingFlags - Zero or a bitwise combination of the values defined in ELoadingFlags.
+    virtual _smart_ptr<IMaterial> LoadMaterial(const char* sMtlName, bool bMakeIfNotFound = true, bool bNonremovable = false, unsigned long nLoadingFlags = 0) = 0;
+
+    // Description:
+    //    Loads material from xml.
+    virtual _smart_ptr<IMaterial> LoadMaterialFromXml(const char* sMtlName, XmlNodeRef mtlNode) = 0;
+
+    // Description:
+    //    Reloads the material from disk.
+    virtual void ReloadMaterial(_smart_ptr<IMaterial> pMtl) = 0;
+
+    // Description:
+    //    Saves material.
+    virtual bool SaveMaterial(XmlNodeRef mtlNode, _smart_ptr<IMaterial> pMtl) = 0;
+
+    // Description:
+    //    Clone single material or multi sub material.
+    // Arguments:
+    //    nSubMtl - when negative all sub materials of MultiSubMtl are cloned, if positive only specified slot is cloned.
+    virtual _smart_ptr<IMaterial> CloneMaterial(_smart_ptr<IMaterial> pMtl, int nSubMtl = -1) = 0;
+
+    // Description:
+    //    Copy single material.
+    virtual void CopyMaterial(_smart_ptr<IMaterial> pMtlSrc, _smart_ptr<IMaterial> pMtlDest, EMaterialCopyFlags flags) = 0;
+
+    // Description:
+    //    Clone MultiSubMtl material.
+    // Arguments:
+    //    sSubMtlName - name of the sub-material to clone, if NULL all submaterial are cloned.
+    virtual _smart_ptr<IMaterial> CloneMultiMaterial(_smart_ptr<IMaterial> pMtl, const char* sSubMtlName = 0) = 0;
+
+    // Description:
+    //    Associate a special listener callback with material manager inside 3d engine.
+    //    This listener callback is used primerly by the editor.
+    virtual void SetListener(IMaterialManagerListener* pListener) = 0;
+
+    // Description:
+    //    Retrieve a default engine material.
+    virtual _smart_ptr<IMaterial> GetDefaultMaterial() = 0;
+
+    // Description:
+    //    Retrieve a default engine material for terrain layer
+    virtual _smart_ptr<IMaterial> GetDefaultTerrainLayerMaterial() = 0;
+
+    // Description:
+    //    Retrieve a default engine material with material layers presets.
+    virtual _smart_ptr<IMaterial> GetDefaultLayersMaterial() = 0;
+
+    // Description:
+    //    Retrieve a default engine material for drawing helpers.
+    virtual _smart_ptr<IMaterial> GetDefaultHelperMaterial() = 0;
+
+    // Description:
+    //    Retrieve surface type by name.
+    virtual ISurfaceType* GetSurfaceTypeByName(const char* sSurfaceTypeName, const char* sWhy = NULL) = 0;
+    virtual int GetSurfaceTypeIdByName(const char* sSurfaceTypeName, const char* sWhy = NULL) = 0;
+    // Description:
+    //    Retrieve surface type by unique surface type id.
+    virtual ISurfaceType* GetSurfaceType(int nSurfaceTypeId, const char* sWhy = NULL) = 0;
+    // Description:
+    //    Retrieve interface to surface type manager.
+    virtual ISurfaceTypeManager* GetSurfaceTypeManager() = 0;
+
+    // Get IMaterial pointer from the CGF material structure.
+    //  nLoadingFlags - Zero, or a bitwise combination of the enum items from ELoadingFlags.
+    virtual _smart_ptr<IMaterial> LoadCGFMaterial(CMaterialCGF* pMaterialCGF, const char* sCgfFilename, unsigned long nLoadingFlags = 0) = 0;
+
+    // for statistics - call once to get the count (pData==0), again to get the data(pData!=0)
+    virtual void GetLoadedMaterials(AZStd::vector<_smart_ptr<IMaterial>>* pData, uint32& nObjCount) const = 0;
+
+    // Updates material data in the renderer
+    virtual void RefreshMaterialRuntime() = 0;
+
+    //// Forcing to create ISurfaceTypeManager
+    //virtual void CreateSurfaceTypeManager() = 0;
+    //// Forcing to destroy ISurfaceTypeManager
+    //virtual void ReleaseSurfaceTypeManager() = 0;
+
+    // </interfuscator:shuffle>
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_IMATERIAL_H
diff --git a/Code/Legacy/CryCommon/IMiniLog.h b/Code/Legacy/CryCommon/IMiniLog.h
new file mode 100644
index 0000000000..d6c2a800a2
--- /dev/null
+++ b/Code/Legacy/CryCommon/IMiniLog.h
@@ -0,0 +1,127 @@
+/*
+ * 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 : This is the smallest possible interface to the Log -
+//               it s independent and small  so that it can be easily moved
+//               across the engine and test applications  to test engine
+//               parts that need logging (e.g. Streaming Engine) separately
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IMINILOG_H
+#define CRYINCLUDE_CRYCOMMON_IMINILOG_H
+#pragma once
+
+
+struct IMiniLog
+{
+    enum ELogType
+    {
+        eMessage,
+        eWarning,
+        eError,
+        eAlways,
+        eWarningAlways,
+        eErrorAlways,
+        eInput,                     // e.g. "e_CaptureFolder ?" or all printouts from history or auto completion
+        eInputResponse,             // e.g. "Set output folder for video capturing" in response to "e_CaptureFolder ?"
+        eComment
+    };
+
+    // <interfuscator:shuffle>
+    // Notes:
+    //   You only have to implement this function.
+    virtual void LogV(ELogType nType, const char* szFormat, va_list args) PRINTF_PARAMS(3, 0) = 0;
+
+    virtual void LogV(ELogType nType, int flags, const char* szFormat, va_list args) PRINTF_PARAMS(4, 0) = 0;
+
+    // Summary:
+    //   Logs using type.
+    inline void LogWithType(ELogType nType, const char* szFormat, ...) PRINTF_PARAMS(3, 4);
+
+    inline void LogWithType(ELogType nType, int flags, const char* szFormat, ...) PRINTF_PARAMS(4, 5);
+
+    // --------------------------------------------------------------------------
+
+    // Summary:
+    //   Destructor.
+    virtual ~IMiniLog() {}
+
+    // Description:
+    //   This is the simplest log function for messages
+    //   with the default implementation.
+    virtual inline void Log(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
+
+    // Description:
+    //   This is the simplest log function for warnings
+    //   with the default implementation.
+    virtual inline void LogWarning(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
+
+    // Description:
+    //   This is the simplest log function for errors
+    //   with the default implementation.
+    virtual inline void LogError(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
+    // </interfuscator:shuffle>
+};
+
+inline void IMiniLog::LogWithType(ELogType nType, int flags, const char* szFormat, ...)
+{
+    va_list args;
+    va_start(args, szFormat);
+    LogV(nType, flags, szFormat, args);
+    va_end(args);
+}
+
+inline void IMiniLog::LogWithType(ELogType nType, const char* szFormat, ...)
+{
+    va_list args;
+    va_start(args, szFormat);
+    LogV(nType, szFormat, args);
+    va_end(args);
+}
+
+inline void IMiniLog::Log(const char* szFormat, ...)
+{
+    va_list args;
+    va_start(args, szFormat);
+    LogV (eMessage, szFormat, args);
+    va_end(args);
+}
+
+inline void IMiniLog::LogWarning(const char* szFormat, ...)
+{
+    va_list args;
+    va_start(args, szFormat);
+    LogV (eWarning, szFormat, args);
+    va_end(args);
+}
+
+inline void IMiniLog::LogError(const char* szFormat, ...)
+{
+    va_list args;
+    va_start(args, szFormat);
+    LogV (eError, szFormat, args);
+    va_end(args);
+}
+
+// Notes:
+//   By default, to make it possible not to implement the log at the beginning at all,
+//   empty implementations of the two functions are given.
+struct CNullMiniLog
+    : public IMiniLog
+{
+    // Notes:
+    //   The default implementation just won't do anything
+    //##@{
+    void LogV([[maybe_unused]] const char* szFormat, [[maybe_unused]] va_list args) {}
+    void LogV([[maybe_unused]] ELogType nType, [[maybe_unused]] const char* szFormat, [[maybe_unused]] va_list args) {}
+    void LogV ([[maybe_unused]] ELogType nType, [[maybe_unused]] int flags, [[maybe_unused]] const char* szFormat, [[maybe_unused]] va_list args) {}
+    //##@}
+};
+
+
+#endif // CRYINCLUDE_CRYCOMMON_IMINILOG_H
diff --git a/Code/Legacy/CryCommon/IMovieSystem.h b/Code/Legacy/CryCommon/IMovieSystem.h
new file mode 100644
index 0000000000..2c9a4d0620
--- /dev/null
+++ b/Code/Legacy/CryCommon/IMovieSystem.h
@@ -0,0 +1,1467 @@
+/*
+ * 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_IMOVIESYSTEM_H
+#define CRYINCLUDE_CRYCOMMON_IMOVIESYSTEM_H
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/Math/Crc.h>
+#include <AzCore/Math/Quaternion.h>
+#include <AzCore/Serialization/SerializeContext.h>
+
+#include <Range.h>
+#include <AnimKey.h>
+#include <ISplines.h>
+#include <IRenderer.h>
+#include <IRenderAuxGeom.h>
+#include <VectorSet.h>
+#include <CryName.h>
+
+// forward declaration.
+struct IAnimTrack;
+struct IAnimNode;
+struct IAnimSequence;
+struct IMovieSystem;
+struct IKey;
+class XmlNodeRef;
+struct ISplineInterpolator;
+struct ILightAnimWrapper;
+
+namespace AZ
+{
+    namespace Data
+    {
+        class AssetData;
+    }
+}
+
+namespace Maestro
+{
+    template<typename AssetType>
+    struct AssetBlends;
+}
+
+typedef IMovieSystem* (* PFNCREATEMOVIESYSTEM)(struct ISystem*);
+
+#define LIGHT_ANIMATION_SET_NAME "_LightAnimationSet"
+#define MAX_ANIM_NAME_LENGTH 64
+//! Very high priority for cut scene sounds.
+#define MOVIE_SOUND_PRIORITY 230
+
+#if !defined(CONSOLE)
+#define MOVIESYSTEM_SUPPORT_EDITING
+#endif
+
+typedef std::vector<IAnimSequence*> AnimSequences;
+typedef AZStd::vector<AZStd::string> TrackEvents;
+
+// Forward declare, including will cause much pain with the precompiled headers
+enum class SequenceType;
+enum class AnimNodeType;
+enum class AnimValueType;
+enum class AnimParamType;
+
+// TODO: Refactor headers that are using these values so they are not need in header files
+
+// AnimValueType::Float is the default value
+#define kAnimValueDefault static_cast<AnimValueType>(0)
+// AnimValueType::Unknown
+#define kAnimValueUnknown static_cast<AnimValueType>(0xFFFFFFFF)
+// SequenceType::SequenceComponent is the default value
+#define kSequenceTypeDefault static_cast<SequenceType>(1)
+// AnimParamType::Invalid
+#define kAnimParamTypeInvalid static_cast<AnimParamType>(0xFFFFFFFF)
+// AnimParamType::ByString
+#define kAnimParamTypeByString static_cast<AnimParamType>(8)
+
+//! Flags that can be set on animation node.
+enum EAnimNodeFlags
+{
+    eAnimNodeFlags_Expanded                 = BIT(0), //!< Deprecated, handled by sandbox now
+    eAnimNodeFlags_EntitySelected           = BIT(1), //!< Set if the referenced entity is selected in the editor
+    eAnimNodeFlags_CanChangeName            = BIT(2), //!< Set if this node allow changing of its name.
+    eAnimNodeFlags_Disabled                 = BIT(3), //!< Disable this node.
+    eAnimNodeFlags_DisabledForComponent     = BIT(4), //!< Disable this node for a disabled or pending entity component.
+};
+
+enum ENodeExportType
+{
+    eNodeExportType_Global = 0,
+    eNodeExportType_Local = 1,
+};
+
+// Common parameters of animation node.
+class CAnimParamType
+{
+    friend class CMovieSystem;
+    friend class AnimSerializer;
+
+public:
+    AZ_TYPE_INFO(CAnimParamType, "{E2F34955-3B07-4241-8D34-EA3BEF3B33D2}")
+
+    static const uint kParamTypeVersion = 9;
+
+    CAnimParamType()
+        : m_type(kAnimParamTypeInvalid) {}
+
+    CAnimParamType(const string& name)
+    {
+        *this = name;
+    }
+   
+    CAnimParamType(AnimParamType type)
+    {
+        *this = type;
+    }
+
+    // Convert from old enum or int
+    void operator =(AnimParamType type)
+    {
+        m_type = type;
+    }
+
+    void operator =(const string& name)
+    {
+        m_type = kAnimParamTypeByString;
+        m_name = name;
+    }
+
+    void operator =(const AZStd::string& name)
+    {
+        m_type = kAnimParamTypeByString;
+        m_name = name;
+    }
+    // Convert to enum. This needs to be explicit,
+    // otherwise operator== will be ambiguous
+    AnimParamType GetType() const { return m_type; }
+
+    // Get name
+    const char* GetName() const { return m_name.c_str(); }
+
+    bool operator ==(const CAnimParamType& animParamType) const
+    {
+        if (m_type == kAnimParamTypeByString && animParamType.m_type == kAnimParamTypeByString)
+        {
+            return m_name == animParamType.m_name;
+        }
+
+        return m_type == animParamType.m_type;
+    }
+
+    bool operator !=(const CAnimParamType& animParamType) const
+    {
+        return !(*this == animParamType);
+    }
+
+    bool operator <(const CAnimParamType& animParamType) const
+    {
+        if (m_type == kAnimParamTypeByString && animParamType.m_type == kAnimParamTypeByString)
+        {
+            return m_name < animParamType.m_name;
+        }
+        else if (m_type == kAnimParamTypeByString)
+        {
+            return false; // Always sort named params last
+        }
+        else if (animParamType.m_type == kAnimParamTypeByString)
+        {
+            return true; // Always sort named params last
+        }
+        if (m_type < animParamType.m_type)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+
+    void SaveToXml(XmlNodeRef& xmlNode) const;
+    void LoadFromXml(const XmlNodeRef& xmlNode, const uint version = kParamTypeVersion);
+
+    // Serialization. Defined in Movie.cpp
+    inline void Serialize(XmlNodeRef& xmlNode, bool bLoading, const uint version = kParamTypeVersion);
+
+private:
+    AnimParamType m_type;
+    AZStd::string m_name;
+};
+
+namespace AZStd
+{
+    // define hasher to allow for AZStd maps and sets of CAnimParamType
+    template <>
+    struct hash < CAnimParamType >
+    {
+        inline size_t operator()(const CAnimParamType& paramType) const
+        {
+            AZStd::hash<AnimParamType> paramTypeHasher;
+            size_t retVal = paramTypeHasher(paramType.GetType());
+            AZStd::hash_combine(retVal, AZ::Crc32(paramType.GetName()));
+            return retVal;
+        }
+    };
+}  // namespace AZStd
+
+//! Types of animation track.
+// Do not change values! they are serialized
+//
+// Attention: This should only be expanded if you add a completely new way how tracks store data!
+// If you just want to control a new parameter of an entity etc. extend EParamType
+//
+// Note: TCB splines are only for backward compatibility, Bezier is the default
+//
+enum EAnimCurveType
+{
+    eAnimCurveType_TCBFloat         = 1,
+    eAnimCurveType_TCBVector        = 2,
+    eAnimCurveType_TCBQuat          = 3,
+    eAnimCurveType_BezierFloat      = 4,
+
+    eAnimCurveType_Unknown          = 0xFFFFFFFF
+};
+
+enum ETrackMask
+{
+    eTrackMask_MaskSound = 1 << 11, // Old: 1 << ATRACK_SOUND
+};
+
+//! Structure passed to Animate function.
+struct SAnimContext
+{
+    SAnimContext()
+    {
+        singleFrame = false;
+        forcePlay = false;
+        resetting = false;
+        time = 0;
+        dt = 0;
+        fps = 0;
+        sequence = nullptr;
+        trackMask = 0;
+        startTime = 0;
+    }
+
+    float time;             //!< Current time in seconds.
+    float dt;               //!< Delta of time from previous animation frame in seconds.
+    float fps;              //!< Last calculated frames per second value.
+    bool singleFrame;       //!< This is not a playing animation, more a single-frame update.
+    bool forcePlay;         //!< Set when force playing animation.
+    bool resetting;         //!< Set when animation sequence is resetting.
+
+    IAnimSequence* sequence; //!< Sequence in which animation performed.
+
+    // TODO: Replace trackMask with something more type safe
+    // TODO: Mask should be stored with dynamic length
+    uint32 trackMask;       //!< To update certain types of tracks only
+    float startTime;        //!< The start time of this playing sequence
+
+    void Serialize(XmlNodeRef& xmlNode, bool loading);
+};
+
+/** Parameters for cut-scene cameras
+*/
+struct SCameraParams
+{
+    SCameraParams()
+    {
+        fov = 0.0f;
+        nearZ = DEFAULT_NEAR;
+        justActivated = false;
+    }
+    AZ::EntityId cameraEntityId;
+    float fov;
+    float nearZ;
+    bool justActivated;
+};
+
+//! Interface for movie-system implemented by user for advanced function-support
+struct IMovieUser
+{
+    // <interfuscator:shuffle>
+    virtual ~IMovieUser(){}
+    //! Called when movie system requests a camera-change.
+    virtual void SetActiveCamera(const SCameraParams& Params) = 0;
+    //! Called when movie system enters into cut-scene mode.
+    virtual void BeginCutScene(IAnimSequence* pSeq, unsigned long dwFlags, bool bResetFX) = 0;
+    //! Called when movie system exits from cut-scene mode.
+    virtual void EndCutScene(IAnimSequence* pSeq, unsigned long dwFlags) = 0;
+    //! Called when movie system wants to send a global event.
+    virtual void SendGlobalEvent(const char* pszEvent) = 0;
+    // </interfuscator:shuffle>
+};
+
+//! Callback-class
+struct IMovieCallback
+{
+    //! Callback-reasons
+    enum ECallbackReason
+    {
+        CBR_CHANGENODE, // Node is changing.
+        CBR_CHANGETRACK // Track of the node is changing.
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IMovieCallback(){}
+    // Called by movie system.
+    virtual void OnMovieCallback(ECallbackReason reason, IAnimNode* pNode) = 0;
+    virtual void OnSetCamera(const SCameraParams& Params) = 0;
+    virtual bool IsSequenceCamUsed() const = 0;
+    // </interfuscator:shuffle>
+};
+
+/** Interface of Animation Track.
+*/
+struct IAnimTrack
+{
+    AZ_RTTI(IAnimTrack, "{AA0D5170-FB28-426F-BA13-7EFF6BB3AC67}");
+    AZ_CLASS_ALLOCATOR(IAnimTrack, AZ::SystemAllocator, 0);
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<IAnimTrack>();
+        }
+    }
+
+    //! Flags that can be set on animation track.
+    enum EAnimTrackFlags
+    {
+        eAnimTrackFlags_Linear   = BIT(1), //!< Use only linear interpolation between keys.
+        eAnimTrackFlags_Loop     = BIT(2), //!< Play this track in a loop.
+        eAnimTrackFlags_Cycle    = BIT(3), //!< Cycle track.
+        eAnimTrackFlags_Disabled = BIT(4), //!< Disable this track.
+
+        //////////////////////////////////////////////////////////////////////////
+        // Used by editor.
+        //////////////////////////////////////////////////////////////////////////
+        eAnimTrackFlags_Hidden   = BIT(5), //!< Set when track is hidden in track view.
+        eAnimTrackFlags_Muted    = BIT(8), //!< Mute this sound track or music track. This only affects the playback in editor on these types of tracks.
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IAnimTrack() {};
+
+    // for intrusive_ptr support
+    virtual void add_ref() = 0;
+    virtual void release() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual EAnimCurveType GetCurveType() = 0;
+    virtual AnimValueType     GetValueType() = 0;
+
+#ifdef MOVIESYSTEM_SUPPORT_EDITING
+    // This color is used for the editor.
+    virtual ColorB GetCustomColor() const = 0;
+    virtual void SetCustomColor(ColorB color) = 0;
+    virtual bool HasCustomColor() const = 0;
+    virtual void ClearCustomColor() = 0;
+#endif
+
+    // Return what parameter of the node, this track is attached to.
+    virtual const CAnimParamType& GetParameterType() const = 0;
+
+    // Assign node parameter ID for this track.
+    virtual void SetParameterType(CAnimParamType type) = 0;
+
+    virtual void SetNode(IAnimNode* node) = 0;
+    // Return Animation Sequence that owns this node.
+    virtual IAnimNode* GetNode() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Animation track can contain sub-tracks (Position XYZ anim track have sub-tracks for x,y,z)
+    // Get count of sub tracks.
+    virtual int GetSubTrackCount() const = 0;
+    // Retrieve pointer the specfied sub track.
+    virtual IAnimTrack* GetSubTrack(int nIndex) const = 0;
+    virtual const char* GetSubTrackName(int nIndex) const = 0;
+    virtual void SetSubTrackName(int nIndex, const char* name) = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual void GetKeyValueRange(float& fMin, float& fMax) const = 0;
+    virtual void SetKeyValueRange(float fMin, float fMax) = 0;
+
+    //! Return number of keys in track.
+    virtual int GetNumKeys() const = 0;
+
+    //! Return true if keys exists in this track
+    virtual bool HasKeys() const = 0;
+
+    //! Set number of keys in track.
+    //! If needed adds empty keys at end or remove keys from end.
+    virtual void SetNumKeys(int numKeys) = 0;
+
+    //! Remove specified key.
+    virtual void RemoveKey(int num) = 0;
+
+    //! Get key at specified location.
+    //! @param key Must be valid pointer to compatible key structure, to be filled with specified key location.
+    virtual void GetKey(int index, IKey* key) const = 0;
+
+    //! Get time of specified key.
+    //! @return key time.
+    virtual float GetKeyTime(int index) const = 0;
+
+    //! Find key at given time.
+    //! @return Index of found key, or -1 if key with this time not found.
+    virtual int FindKey(float time) = 0;
+
+    //! Get flags of specified key.
+    //! @return key time.
+    virtual int GetKeyFlags(int index) = 0;
+
+    //! Set key at specified location.
+    //! @param key Must be valid pointer to compatible key structure.
+    virtual void SetKey(int index, IKey* key) = 0;
+
+    //! Set time of specified key.
+    virtual void SetKeyTime(int index, float time) = 0;
+
+    //! Set flags of specified key.
+    virtual void SetKeyFlags(int index, int flags) = 0;
+
+    //! Sort keys in track (after time of keys was modified).
+    virtual void SortKeys() = 0;
+
+    //! Get track flags.
+    virtual int GetFlags() = 0;
+
+    //! Check if track is masked by mask
+    // TODO: Mask should be stored with dynamic length
+    virtual bool IsMasked(const uint32 mask) const = 0;
+
+    //! Set track flags.
+    virtual void SetFlags(int flags) = 0;
+
+    //! Create key at given time, and return its index.
+    //! @return Index of new key.
+    virtual int CreateKey(float time) = 0;
+
+    //! Clone key at specified index.
+    //! @retun Index of new key.
+    virtual int CloneKey(int key) = 0;
+
+    //! Clone key at specified index from another track of SAME TYPE.
+    //! @retun Index of new key.
+    virtual int CopyKey(IAnimTrack* pFromTrack, int nFromKey) = 0;
+
+    //! Get info about specified key.
+    //! @param Short human readable text description of this key.
+    //! @param duration of this key in seconds.
+    virtual void GetKeyInfo(int key, const char*& description, float& duration) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Get track value at specified time.
+    // Interpolates keys if needed.
+    // Applies a scale multiplier set in SetMultiplier(), if requested
+    //////////////////////////////////////////////////////////////////////////
+    virtual void GetValue(float time, float& value, bool applyMultiplier=false) = 0;
+    virtual void GetValue(float time, Vec3& value, bool applyMultiplier = false) = 0;
+    virtual void GetValue(float time, Vec4& value, bool applyMultiplier = false) = 0;
+    virtual void GetValue(float time, Quat& value) = 0;
+    virtual void GetValue(float time, bool& value) = 0;
+    virtual void GetValue(float time, Maestro::AssetBlends<AZ::Data::AssetData>& value) = 0;
+
+    // support for AZ:: vector types - re-route to legacy types
+    void GetValue(float time, AZ::Vector3& value, bool applyMultiplier = false)
+    {
+        Vec3 vec3;
+        GetValue(time, vec3, applyMultiplier);
+        value.Set(vec3.x, vec3.y, vec3.z);
+    }
+    void GetValue(float time, AZ::Quaternion& value)
+    {
+        Quat quat;
+        GetValue(time, quat);
+        value.Set(quat.v.x, quat.v.y, quat.v.z, quat.w);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set track value at specified time.
+    // Adds new keys if required.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetValue(float time, const float& value, bool bDefault = false, bool applyMultiplier = false) = 0;
+    virtual void SetValue(float time, const Vec3& value, bool bDefault = false, bool applyMultiplier = false) = 0;
+    virtual void SetValue(float time, const Vec4& value, bool bDefault = false, bool applyMultiplier = false) = 0;
+    virtual void SetValue(float time, const Quat& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const bool& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const Maestro::AssetBlends<AZ::Data::AssetData>& value, bool bDefault = false) = 0;
+
+    // support for AZ:: vector types - re-route to legacy types
+    void SetValue(float time, AZ::Vector3& value, bool bDefault = false, bool applyMultiplier = false)
+    {
+        Vec3 vec3(value.GetX(), value.GetY(), value.GetZ());
+        SetValue(time, vec3, bDefault, applyMultiplier);
+    }
+    void SetValue(float time, AZ::Quaternion& value, [[maybe_unused]] bool bDefault = false)
+    {
+        Quat quat(value.GetW(), value.GetX(), value.GetY(), value.GetZ());
+        SetValue(time, quat);
+    }
+
+    // Only for position tracks, offset all track keys by this amount.
+    virtual void OffsetKeyPosition(const Vec3& value) = 0;
+
+    // Used to update the data in tracks after the parent entity has been changed.
+    virtual void UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM) = 0;
+
+    // Assign active time range for this track.
+    virtual void SetTimeRange(const Range& timeRange) = 0;
+
+    //! @deprecated - IAnimTracks use AZ::Serialization now. Legacy - Serialize this animation track to XML.
+    virtual bool Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks = true) = 0;
+    virtual bool SerializeSelection(XmlNodeRef& xmlNode, bool bLoading, bool bCopySelected = false, float fTimeOffset = 0) = 0;
+
+    virtual void InitPostLoad(IAnimSequence* /*sequence*/) {};
+
+    //! For custom track animate parameters.
+    virtual void Animate([[maybe_unused]] SAnimContext& ec) {};
+
+    // Get access to the internal spline of the track.
+    virtual ISplineInterpolator* GetSpline() const { return 0; };
+
+    virtual bool IsKeySelected([[maybe_unused]] int key) const { return false; }
+
+    virtual void SelectKey([[maybe_unused]] int key, [[maybe_unused]] bool select) {}
+
+    virtual void SetSortMarkerKey([[maybe_unused]] unsigned int keyIndex, [[maybe_unused]] bool enabled) {}
+    virtual bool IsSortMarkerKey([[maybe_unused]] unsigned int keyIndex) const { return false; }
+
+    //! Return the index of the key which lies right after the given key in time.
+    //! @param key Index of of key.
+    //! @return Index of the next key in time. If the last key given, this returns -1.
+    // In case of keys sorted, it's just 'key+1', but if not sorted, it can be another value.
+    virtual int NextKeyByTime(int key) const
+    {
+        if (key + 1 < GetNumKeys())
+        {
+            return key + 1;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    //! Get the animation layer index assigned. (only for character/look-at tracks ATM)
+    virtual int GetAnimationLayerIndex() const { return -1; }
+    //! Set the animation layer index. (only for character/look-at tracks ATM)
+    virtual void SetAnimationLayerIndex([[maybe_unused]] int index) { }
+
+    //! Returns whether the track responds to muting (false by default), which only affects the Edtior.
+    //! Tracks that use mute should override this, such as CSoundTrack
+    //! @return Boolean of whether the track respnnds to muting or not
+    virtual bool UsesMute() const { return false; }
+
+    //! Set a multiplier which will be multiplied to track values in SetValue and divided out in GetValue if requested
+    virtual void SetMultiplier(float trackValueMultiplier) = 0;
+
+    // Expanded state interface
+    virtual void SetExpanded(bool expanded) = 0;
+    virtual bool GetExpanded() const = 0;
+
+    virtual unsigned int GetId() const = 0;
+    virtual void SetId(unsigned int id) = 0;
+
+    // </interfuscator:shuffle>
+};
+
+
+/** Callback called by animation node when its animated.
+*/
+struct IAnimNodeOwner
+{
+    // <interfuscator:shuffle>
+    virtual ~IAnimNodeOwner(){}
+    virtual void OnNodeAnimated([[maybe_unused]] IAnimNode* pNode) {}
+    virtual void OnNodeVisibilityChanged(IAnimNode* pNode, const bool bHidden) = 0;
+    virtual void OnNodeReset([[maybe_unused]] IAnimNode* pNode) {}
+
+    // mark the node's sequence object layer as modified
+    virtual void MarkAsModified() = 0;
+    // </interfuscator:shuffle>
+};
+
+/** Base class for all Animation nodes,
+        can host multiple animation tracks, and execute them other time.
+        Animation node is reference counted.
+*/
+struct IAnimNode
+{
+public:
+    AZ_RTTI(IAnimNode, "{0A096354-7F26-4B18-B8C0-8F10A3E0440A}");
+    AZ_CLASS_ALLOCATOR(IAnimNode, AZ::SystemAllocator, 0);
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<IAnimNode>();
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Supported params.
+    //////////////////////////////////////////////////////////////////////////
+    enum ESupportedParamFlags
+    {
+        eSupportedParamFlags_MultipleTracks = 0x01, // Set if parameter can be assigned multiple tracks.
+        eSupportedParamFlags_Hidden         = 0x02, // Hidden from the Track View UI.
+    };
+
+    struct SParamInfo
+    {
+        SParamInfo()
+            : name("")
+            , valueType(kAnimValueDefault)
+            , flags(ESupportedParamFlags(0)) {};
+        SParamInfo(const char* _name, CAnimParamType _paramType, AnimValueType _valueType, ESupportedParamFlags _flags)
+            : name(_name)
+            , paramType(_paramType)
+            , valueType(_valueType)
+            , flags(_flags) {};
+
+        const char* name;           // parameter name.
+        CAnimParamType paramType;     // parameter id.
+        AnimValueType valueType;       // value type, defines type of track to use for animating this parameter.
+        ESupportedParamFlags flags; // combination of flags from ESupportedParamFlags.
+    };
+
+    using AnimParamInfos = AZStd::vector<SParamInfo>;
+
+    // <interfuscator:shuffle>
+    virtual ~IAnimNode() {};
+
+    // for intrusive_ptr support
+    virtual void add_ref() = 0;
+    virtual void release() = 0;
+
+    //! Set node name.
+    virtual void SetName(const char* name) = 0;
+
+    //! Get node name.
+    virtual const char* GetName() = 0;
+
+    // Get Type of this node.
+    virtual AnimNodeType GetType() const = 0;
+
+    // Return Animation Sequence that owns this node.
+    virtual IAnimSequence* GetSequence() const = 0;
+
+    // Set the Animation Sequence that owns this node.
+    virtual void SetSequence(IAnimSequence* sequence) = 0;
+
+    // Called when sequence is activated / deactivated
+    virtual void Activate(bool bActivate) = 0;
+
+    // Set AnimNode flags.
+    // @param flags One or more flags from EAnimNodeFlags.
+    // @see EAnimNodeFlags
+    virtual void SetFlags(int flags) = 0;
+
+    // Get AnimNode flags.
+    // @return flags set on node.
+    // @see EAnimNodeFlags
+    virtual int GetFlags() const = 0;
+
+    // return true if flagsToCheck is set on the node or any of the node's parents
+    virtual bool AreFlagsSetOnNodeOrAnyParent(EAnimNodeFlags flagsToCheck) const = 0;
+
+    // AZ::Entity is bound/handled via their Id over EBuses, as opposed to directly with pointers.
+    virtual void SetAzEntityId(const AZ::EntityId& id) = 0;
+    virtual AZ::EntityId GetAzEntityId() const = 0;
+
+    // Return movie system that created this node.
+    virtual IMovieSystem*   GetMovieSystem() const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Space position/orientation scale.
+    //////////////////////////////////////////////////////////////////////////
+    //! Translate entity node.
+    virtual void SetPos(float time, const Vec3& pos) = 0;
+    //! Rotate entity node.
+    virtual void SetRotate(float time, const Quat& quat) = 0;
+    //! Scale entity node.
+    virtual void SetScale(float time, const Vec3& scale) = 0;
+
+    //! Compute and return the offset which brings the current position to the given position
+    virtual Vec3 GetOffsetPosition(const Vec3& position) { return position - GetPos(); }
+
+    //! Get current entity position.
+    virtual Vec3 GetPos() = 0;
+    //! Get current entity rotation.
+    virtual Quat GetRotate() = 0;
+    //! Get entity rotation at specified time.
+    virtual Quat GetRotate(float time) = 0;
+    //! Get current entity scale.
+    virtual Vec3 GetScale() = 0;
+
+    // General Set param.
+    // Set float/vec3/vec4 parameter at given time.
+    // @return true if parameter set, false if this parameter not exist in node.
+    virtual bool SetParamValue(float time, CAnimParamType param, float value) = 0;
+    virtual bool SetParamValue(float time, CAnimParamType param, const Vec3& value) = 0;
+    virtual bool SetParamValue(float time, CAnimParamType param, const Vec4& value) = 0;
+    // Get float/vec3/vec4 parameter at given time.
+    // @return true if parameter exist, false if this parameter not exist in node.
+    virtual bool GetParamValue(float time, CAnimParamType param, float& value) = 0;
+    virtual bool GetParamValue(float time, CAnimParamType param, Vec3& value) = 0;
+    virtual bool GetParamValue(float time, CAnimParamType param, Vec4& value) = 0;
+
+    //! Evaluate animation node while not playing animation.
+    virtual void StillUpdate() = 0;
+
+    //! Evaluate animation to the given time.
+    virtual void Animate(SAnimContext& ec) = 0;
+
+    // Description:
+    //      Returns number of supported parameters by this animation node (position,rotation,scale,etc..).
+    // Returns:
+    //      Number of supported parameters.
+    virtual unsigned int GetParamCount() const = 0;
+
+    // Description:
+    //      Returns the type of a param by index
+    // Arguments:
+    //      nIndex - parameter index in range 0 <= nIndex < GetSupportedParamCount()
+    virtual CAnimParamType GetParamType(unsigned int nIndex) const = 0;
+
+    // Description:
+    //      Check if parameter is supported by this node.
+    virtual bool IsParamValid(const CAnimParamType& paramType) const = 0;
+
+    // Description:
+    //      Returns name of supported parameter of this animation node or NULL if not available
+    // Arguments:
+    //          paramType - parameter id
+    virtual const char* GetParamName(const CAnimParamType& paramType) const = 0;
+
+    // Description:
+    //      Returns the params value type
+    virtual AnimValueType GetParamValueType(const CAnimParamType& paramType) const = 0;
+
+    // Description:
+    //      Returns the params value type
+    virtual ESupportedParamFlags GetParamFlags(const CAnimParamType& paramType) const = 0;
+
+    // Called node data is re-initialized, such as when changing the entity associated with it.
+    virtual void OnReset() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Working with Tracks.
+    //////////////////////////////////////////////////////////////////////////
+    virtual int GetTrackCount() const = 0;
+
+    // Return track assigned to the specified parameter.
+    virtual IAnimTrack* GetTrackByIndex(int nIndex) const = 0;
+
+    // Return first track assigned to the specified parameter.
+    virtual IAnimTrack* GetTrackForParameter(const CAnimParamType& paramType) const = 0;
+
+    // Return the i-th track assigned to the specified parameter in case of multiple tracks.
+    virtual IAnimTrack* GetTrackForParameter(const CAnimParamType& paramType, uint32 index) const = 0;
+
+    // Get the index of a given track among tracks with the same parameter type in this node.
+    virtual uint32 GetTrackParamIndex(const IAnimTrack* pTrack) const = 0;
+
+    // Creates a new track for given parameter.
+    virtual IAnimTrack* CreateTrack(const CAnimParamType& paramType) = 0;
+
+    // Initializes track default values after de-serialization / user creation. Only called in editor.
+    virtual void InitializeTrackDefaultValue(IAnimTrack* pTrack, const CAnimParamType& paramType) = 0;
+
+    // Assign animation track to parameter.
+    // if track parameter is NULL track with parameter id param will be removed.
+    virtual void SetTrack(const CAnimParamType& paramType, IAnimTrack* track) = 0;
+
+    // Set time range for all tracks in this sequence.
+    virtual void SetTimeRange(Range timeRange) = 0;
+
+    // Remove track from anim node.
+    virtual void AddTrack(IAnimTrack* pTrack) = 0;
+
+    // Remove track from anim node.
+    virtual bool RemoveTrack(IAnimTrack* pTrack) = 0;
+
+    // Description:
+    //      Creates default set of tracks supported by this node.
+    virtual void CreateDefaultTracks() = 0;
+
+    // returns the tangent type to use for created keys. Override this if you have an animNode that you wish
+    // to have tangents other than UNIFIED created for new keys.
+    virtual int GetDefaultKeyTangentFlags() const { return SPLINE_KEY_TANGENT_UNIFIED; }
+
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Callback for animation node used by editor.
+    // Register notification callback with animation node.
+    virtual void SetNodeOwner(IAnimNodeOwner* pOwner) = 0;
+    virtual IAnimNodeOwner* GetNodeOwner() = 0;
+
+    // Serialize this animation node to XML.
+    virtual void Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks) = 0;
+
+    // Serialize only the tracks in this animation node to/from XML
+    virtual void SerializeAnims(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks) = 0;
+
+    // Sets up internal pointers post load from Sequence Component
+    virtual void InitPostLoad(IAnimSequence* sequence) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // Groups interface
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetParent(IAnimNode* pParent) = 0;
+    virtual IAnimNode* GetParent() const = 0;
+    virtual IAnimNode* HasDirectorAsParent() const = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual void Render() = 0;
+
+    virtual bool NeedToRender() const = 0;
+
+    // Called from editor if dynamic params need updating
+    virtual void UpdateDynamicParams() = 0;
+    // </interfuscator:shuffle>
+
+    // Used by AnimCameraNode
+    virtual bool GetShakeRotation([[maybe_unused]] const float& time, [[maybe_unused]] Quat& rot){return false; }
+
+    virtual void SetCameraShakeSeed([[maybe_unused]] const uint shakeSeed){};
+
+    // override this method to handle explicit setting of time
+    virtual void TimeChanged([[maybe_unused]] float newTime) {};
+
+    // Compares all of the node's track values at the given time with the associated property value and 
+    //     sets a key at that time if they are different to match the latter
+    // Returns the number of keys set
+    virtual int SetKeysForChangedTrackValues([[maybe_unused]] float time) { return 0; };
+
+    // Callbacks used when Game/Simulation mode is started and stopped in the Editor. Override if you want to handle these events
+    virtual void OnStartPlayInEditor() {};
+    virtual void OnStopPlayInEditor() {};
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // interface for Components - implemented by CAnimComponentNode
+
+    // Override if the derived node has an associated component type (e.g. CAnimComponentNode)
+    virtual void SetComponent([[maybe_unused]] AZ::ComponentId comopnentId, [[maybe_unused]] const AZ::Uuid& componentTypeId) {}
+
+    // returns the componentId of the component the node is associate with, if applicable, or a AZ::InvalidComponentId otherwise
+    virtual AZ::ComponentId GetComponentId() const { return AZ::InvalidComponentId; }
+    // ~interface for Components
+    ////////////////////////////////////////////////////////////////////////////////
+
+    // Used to disable any animation that is overridden by a SceneNode during camera interpolation, such as
+    // FoV, transform, nearZ
+    virtual void SetSkipInterpolatedCameraNode([[maybe_unused]] const bool skipNodeCameraAnimation) {};
+
+    // Expanded state interface
+    virtual void SetExpanded(bool expanded) = 0;
+    virtual bool GetExpanded() const = 0;
+
+    // Return the node id. This id is unique within a given sequence.
+    virtual int GetId() const = 0;
+};
+
+//! Track event listener
+struct ITrackEventListener
+{
+    //! Reasons
+    enum ETrackEventReason
+    {
+        eTrackEventReason_Added,
+        eTrackEventReason_Removed,
+        eTrackEventReason_Renamed,
+        eTrackEventReason_Triggered,
+        eTrackEventReason_MovedUp,
+        eTrackEventReason_MovedDown,
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~ITrackEventListener(){}
+    // Description:
+    //      Called when track event is updated
+    // Arguments:
+    //      pSeq - Animation sequence
+    //      reason - Reason for update (see EReason)
+    //      event - Track event added
+    //      pUserData - Data to accompany reason
+    virtual void OnTrackEvent(IAnimSequence* sequence, int reason, const char* event, void* pUserData) = 0;
+    virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{};
+    // </interfuscator:shuffle>
+};
+
+struct IAnimLegacySequenceObject
+{
+    // <interfuscator:shuffle>
+    virtual ~IAnimLegacySequenceObject() {}
+    virtual void OnNameChanged() = 0;
+    virtual void OnModified() = 0;
+    // </interfuscator:shuffle>
+};
+
+struct IAnimStringTable
+{
+    AZ_RTTI(IAnimStringTable, "{35690309-9D22-41FF-80B7-8AF7C8419945}")
+    virtual ~IAnimStringTable() {}
+
+    // for intrusive_ptr support
+    virtual void add_ref() = 0;
+    virtual void release() = 0;
+
+    virtual const char* Add(const char* p) = 0;
+};
+
+/** Animation sequence, operates on animation nodes contained in it.
+ */
+struct IAnimSequence
+{
+    AZ_RTTI(IAnimSequence, "{A60F95F5-5A4A-47DB-B3BB-525BBC0BC8DB}");
+    AZ_CLASS_ALLOCATOR(IAnimSequence, AZ::SystemAllocator, 0);
+
+    static const int kSequenceVersion = 5;
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<IAnimSequence>();
+        }
+    }
+
+    //! Flags used for SetFlags(),GetFlags(),SetParentFlags(),GetParentFlags() methods.
+    enum EAnimSequenceFlags
+    {
+        eSeqFlags_PlayOnReset         = BIT(0),   //!< Start playing this sequence immediately after reset of movie system(Level load).
+        eSeqFlags_OutOfRangeConstant  = BIT(1),   //!< Constant Out-Of-Range,time continues normally past sequence time range.
+        eSeqFlags_OutOfRangeLoop      = BIT(2),   //!< Loop Out-Of-Range,time wraps back to the start of range when reaching end of range.
+        eSeqFlags_CutScene            = BIT(3),   //!< Cut scene sequence.
+        eSeqFlags_NoHUD               = BIT(4),   //!< @deprecated - Don`t display HUD
+        eSeqFlags_NoPlayer            = BIT(5),   //!< Disable input and drawing of player
+        eSeqFlags_NoGameSounds        = BIT(9),   //!< Suppress all game sounds.
+        eSeqFlags_NoSeek              = BIT(10), //!< Cannot seek in sequence.
+        eSeqFlags_NoAbort             = BIT(11), //!< Cutscene can not be aborted
+        eSeqFlags_NoSpeed             = BIT(13), //!< Cannot modify sequence speed - TODO: add interface control if required
+     // eSeqFlags_CanWarpInFixedTime  = BIT(14), //!< @deprecated - Timewarp by scaling a fixed time step - removed July 2017, unused
+        eSeqFlags_EarlyMovieUpdate    = BIT(15), //!< Turn the 'sys_earlyMovieUpdate' on during the sequence.
+        eSeqFlags_LightAnimationSet   = BIT(16), //!< A special unique sequence for light animations
+        eSeqFlags_NoMPSyncingNeeded   = BIT(17), //!< this sequence doesn't require MP net syncing
+    };
+
+    virtual ~IAnimSequence() {};
+
+    // for intrusive_ptr support
+    virtual void add_ref() = 0;
+    virtual void release() = 0;
+
+    //! Set the name of this sequence. (ex. "Intro" in the same case as above)
+    virtual void SetName(const char* name) = 0;
+    //! Get the name of this sequence. (ex. "Intro" in the same case as above)
+    virtual const char* GetName() const = 0;
+    //! Get the ID (unique in a level and consistent across renaming) of this sequence.
+    virtual uint32 GetId () const = 0;
+    //! Resets the ID to the next available ID - used on sequence loads into levels to resolve ID collisions
+    virtual void ResetId() = 0;
+
+    // Legacy sequence objects are connected by pointers. SequenceComponents are connected by AZ::EntityId
+    virtual void SetLegacySequenceObject(IAnimLegacySequenceObject* legacySequenceObject) = 0;
+    virtual IAnimLegacySequenceObject* GetLegacySequenceObject() const = 0;
+    virtual void SetSequenceEntityId(const AZ::EntityId& entityOwnerId) = 0;
+    virtual const AZ::EntityId& GetSequenceEntityId() const = 0;
+
+    //! Set the currently active director node.
+    virtual void SetActiveDirector(IAnimNode* pDirectorNode) = 0;
+    //! Get the currently active director node, if any.
+    virtual IAnimNode* GetActiveDirector() const = 0;
+
+    //! Set animation sequence flags
+    virtual void SetFlags(int flags) = 0;
+    //! Get animation sequence flags
+    virtual int GetFlags() const = 0;
+    //! Get cutscene related animation sequence flags
+    virtual int GetCutSceneFlags(const bool localFlags = false) const = 0;
+    //! Set parent animation sequence
+    virtual void SetParentSequence(IAnimSequence* pParentSequence) = 0;
+    //! Get parent animation sequence
+    virtual const IAnimSequence* GetParentSequence() const = 0;
+    //! Check whether this sequence has the given sequence as a descendant through one of its sequence tracks.
+    virtual bool IsAncestorOf(const IAnimSequence* sequence) const = 0;
+
+    //! Return number of animation nodes in sequence.
+    virtual int GetNodeCount() const = 0;
+    //! Get animation node at specified index.
+    virtual IAnimNode* GetNode(int index) const = 0;
+
+    //! Add animation node to sequence.
+    //! @return True if node added, same node will not be added 2 times.
+    virtual bool AddNode(IAnimNode* node) = 0;
+
+    // Reorders the array of nodes, so the specified node is placed after or before the given pivot node depending on the parameter 'next'.
+    virtual void ReorderNode(IAnimNode* node, IAnimNode* pPivotNode, bool next) = 0;
+
+    // Description:
+    //      Creates a new animation node with specified type.
+    // Arguments:
+    //      nodeType - Type of node, one of AnimNodeType enums.
+    virtual IAnimNode* CreateNode(AnimNodeType nodeType) = 0;
+
+    // Description:
+    //      Creates a new animation node from serialized node XML.
+    // Arguments:
+    //      node - Serialized form of node
+    virtual IAnimNode* CreateNode(XmlNodeRef node) = 0;
+
+    //! Remove animation node from sequence.
+    virtual void RemoveNode(IAnimNode* node, bool removeChildRelationships /*=true*/) = 0;
+
+    // Finds node by name, can be slow.
+    // If the node belongs to a director, the director node also should be given
+    // since there can be multiple instances of the same node(i.e. the same name)
+    // across multiple director nodes.
+    virtual IAnimNode* FindNodeByName(const char* sNodeName, const IAnimNode* pParentDirector) = 0;
+
+    //! Remove all nodes from sequence.
+    virtual void RemoveAll() = 0;
+
+    // Activate sequence by binding sequence animations to nodes.
+    // must be called prior animating sequence.
+    virtual void Activate() = 0;
+
+    /** Check if sequence is activated
+    */
+    virtual bool IsActivated() const = 0;
+
+    // Deactivates sequence by unbinding sequence animations from nodes.
+    virtual void Deactivate() = 0;
+
+    // Pre-caches data associated with this anim sequence.
+    virtual void PrecacheData(float startTime = 0.0f) = 0;
+
+    // Update sequence while not playing animation.
+    virtual void StillUpdate() = 0;
+
+    // Render function call for some special node.
+    virtual void Render() = 0;
+
+    // Evaluate animations of all nodes in sequence.
+    // Sequence must be activated before animating.
+    virtual void Animate(const SAnimContext& ec) = 0;
+
+    //! Set time range of this sequence.
+    virtual void SetTimeRange(Range timeRange) = 0;
+
+    //! Get time range of this sequence.
+    virtual Range GetTimeRange() = 0;
+
+    //! Resets the sequence
+    virtual void Reset(bool bSeekToStart) = 0;
+
+    //! This can have more time-consuming tasks performed additional to tasks of the usual 'Reset()' method.
+    virtual void ResetHard() = 0;
+
+    // Called to pause sequence.
+    virtual void Pause() = 0;
+
+    // Called to resume sequence.
+    virtual void Resume() = 0;
+
+    /** Called to check if sequence is paused.
+    */
+    virtual bool IsPaused() const = 0;
+
+    /** Called when a sequence is looped.
+    */
+    virtual void OnLoop() = 0;
+
+    /** Move/Scale all keys in tracks from previous time range to new time range.
+    */
+    virtual void AdjustKeysToTimeRange(const Range& timeRange) = 0;
+
+    /** Called when time was explicitly jumped to/set.
+    */
+    virtual void TimeChanged(float newTime) = 0;
+
+    // fix up internal pointers after load from Sequence Component
+    virtual void InitPostLoad() = 0;
+
+    // Copy some nodes of this sequence to XML.
+    virtual void CopyNodes(XmlNodeRef& xmlNode, IAnimNode** pSelectedNodes, uint32 count) = 0;
+
+    // Paste nodes given by the XML to this sequence.
+    virtual void PasteNodes(const XmlNodeRef& xmlNode, IAnimNode* pParent) = 0;
+
+    // Summary:
+    //  Adds/removes track events in sequence.
+    virtual bool AddTrackEvent(const char* szEvent) = 0;
+    virtual bool RemoveTrackEvent(const char* szEvent) = 0;
+    virtual bool RenameTrackEvent(const char* szEvent, const char* szNewEvent) = 0;
+    virtual bool MoveUpTrackEvent(const char* szEvent) = 0;
+    virtual bool MoveDownTrackEvent(const char* szEvent) = 0;
+    virtual void ClearTrackEvents() = 0;
+
+    // Summary:
+    //  Gets the track events in the sequence.
+    virtual int GetTrackEventsCount() const = 0;
+    // Summary:
+    //  Gets the specified track event in the sequence.
+    virtual char const* GetTrackEvent(int iIndex) const = 0;
+
+    virtual IAnimStringTable* GetTrackEventStringTable() = 0;
+
+    // Summary:
+    //   Called to trigger a track event.
+    virtual void TriggerTrackEvent(const char* event, const char* param = NULL) = 0;
+
+    //! Track event listener
+    virtual void AddTrackEventListener(ITrackEventListener* pListener) = 0;
+    virtual void RemoveTrackEventListener(ITrackEventListener* pListener) = 0;
+
+    // return the sequence type - legacy or new component entity
+    virtual SequenceType GetSequenceType() const = 0;
+
+    // Expanded state interface
+    virtual void SetExpanded(bool expanded) = 0;
+    virtual bool GetExpanded() const = 0;
+
+    virtual unsigned int GetUniqueTrackIdAndGenerateNext() = 0;
+
+    // </interfuscator:shuffle>
+};
+
+/** Movie Listener interface.
+    Register at movie system to get notified about movie events
+*/
+struct IMovieListener
+{
+    enum EMovieEvent
+    {
+        eMovieEvent_Started = 0,   // fired when sequence is started
+        eMovieEvent_Stopped,       // fired when sequence ended normally
+        eMovieEvent_Aborted,       // fired when sequence was aborted before normal end (STOP and ABORTED event are mutually exclusive!)
+        eMovieEvent_Updated,            // fired after sequence time or playback speed was updated
+        eMovieEvent_RecordModeStarted,  // fired when Record Mode is started
+        eMovieEvent_RecordModeStopped,  // fired when Record Mode is stopped
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IMovieListener(){}
+    //! callback on movie events
+    virtual void OnMovieEvent(EMovieEvent movieEvent, IAnimSequence* pAnimSequence) = 0;
+    // </interfuscator:shuffle>
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
+};
+
+/** Movie System interface.
+        Main entrance point to engine movie capability.
+        Enumerate available movies, update all movies, create animation nodes and tracks.
+ */
+struct IMovieSystem
+{
+    AZ_RTTI(IMovieSystem, "{D8E6D6E9-830D-40DC-87F3-E9A069FBEB69}")
+
+    enum ESequenceStopBehavior
+    {
+        eSSB_LeaveTime = 0,         // When sequence is stopped it remains in last played time.
+        eSSB_GotoEndTime = 1,       // Default behavior in game, sequence is animated at end time before stop.
+        eSSB_GotoStartTime = 2, // Default behavior in editor, sequence is animated at start time before stop.
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IMovieSystem(){}
+
+    //! Release movie system.
+    virtual void Release() = 0;
+    //! Set the user.
+    virtual void SetUser(IMovieUser* pUser) = 0;
+    //! Get the user.
+    virtual IMovieUser* GetUser() = 0;
+
+    virtual IAnimSequence* CreateSequence(const char* sequence, bool bLoad = false, uint32 id = 0, SequenceType = kSequenceTypeDefault, AZ::EntityId entityId = AZ::EntityId()) = 0;
+    virtual void AddSequence(IAnimSequence* sequence) = 0;
+    virtual void RemoveSequence(IAnimSequence* sequence) = 0;
+    virtual IAnimSequence* FindLegacySequenceByName(const char* sequence) const = 0;
+    virtual IAnimSequence* FindSequence(const AZ::EntityId& componentEntitySequenceId) const = 0;
+    virtual IAnimSequence* FindSequenceById(uint32 id) const = 0;
+    virtual IAnimSequence* GetSequence(int i) const = 0;
+    virtual int GetNumSequences() const = 0;
+    virtual IAnimSequence* GetPlayingSequence(int i) const = 0;
+    virtual int GetNumPlayingSequences() const = 0;
+    virtual bool IsCutScenePlaying() const = 0;
+
+    virtual uint32 GrabNextSequenceId() = 0;
+    // called whenever a new sequence Id is set - to update nextSequenceId
+    virtual void OnSetSequenceId(uint32 sequenceId) = 0;
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // If the name of a sequence changes, the keys that refer it in the
+    // sequence track of the director node should be properly updated also.
+    //
+    // @param   before The old name of the sequence.
+    // @param   after The new name of the sequence.
+    // @return  Number of modified sequence keys.
+    //
+    //////////////////////////////////////////////////////////////////////////
+    virtual int OnSequenceRenamed(const char* before, const char* after) = 0;
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // If the name of a camera changes, the keys that refer it in the
+    // camera track of the director node should be properly updated also.
+    // This updates the name of the corresponding camera node also, if any.
+    //
+    // @param   before The old name of the camera.
+    // @param   after The new name of the camera.
+    // @return  Number of modified camera keys.
+    //
+    //////////////////////////////////////////////////////////////////////////
+    virtual int OnCameraRenamed(const char* before, const char* after) = 0;
+
+    // Adds a listener to a sequence
+    // @param sequence Pointer to sequence
+    // @param pListener Pointer to an IMovieListener
+    // @return true on successful add, false otherwise
+    virtual bool AddMovieListener(IAnimSequence* sequence, IMovieListener* pListener) = 0;
+
+    // Removes a listener from a sequence
+    // @param sequence Pointer to sequence
+    // @param pListener Pointer to an IMovieListener
+    // @return true on successful removal, false otherwise
+    virtual bool RemoveMovieListener(IAnimSequence* sequence, IMovieListener* pListener) = 0;
+
+    virtual ISystem* GetSystem() = 0;
+
+    // Remove all sequences from movie system.
+    virtual void RemoveAllSequences() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Sequence playback.
+    //////////////////////////////////////////////////////////////////////////
+    // Start playing sequence.
+    // Call ignored if sequence is already playing.
+    // @param sequence Name of sequence to play.
+    virtual void PlaySequence(const char* pSequenceName, IAnimSequence* pParentSeq, bool bResetFX, bool bTrackedSequence, float startTime = -FLT_MAX, float endTime = -FLT_MAX) = 0;
+
+    // Start playing sequence.
+    // Call ignored if sequence is already playing.
+    // @param sequence Pointer to Valid sequence to play.
+    virtual void PlaySequence(IAnimSequence* sequence, IAnimSequence* pParentSeq, bool bResetFX, bool bTrackedSequence, float startTime = -FLT_MAX, float endTime = -FLT_MAX) = 0;
+
+    // Stops currently playing sequence.
+    // Ignored if sequence is not playing.
+    // Returns true if sequence has been stopped. false otherwise
+    // @param sequence Name of playing sequence to stop.
+    virtual bool StopSequence(const char* pSequenceName) = 0;
+
+    // Stop's currently playing sequence.
+    // Ignored if sequence is not playing.
+    // Returns true if sequence has been stopped. false otherwise
+    // @param sequence Pointer to Valid sequence to stop.
+    virtual bool StopSequence(IAnimSequence* sequence) = 0;
+
+    /** Aborts a currently playing sequence.
+            Ignored if sequence is not playing.
+            Calls IMovieListener with MOVIE_EVENT_ABORTED event (MOVIE_EVENT_DONE is NOT called)
+            Returns true if sequence has been aborted. false otherwise
+            @param sequence Pointer to Valid sequence to stop.
+            @param bLeaveTime If false, uses default stop behavior, otherwise leaves the sequence at time
+    */
+    virtual bool AbortSequence(IAnimSequence* sequence, bool bLeaveTime = false) = 0;
+
+    // Stops all currently playing sequences.
+    virtual void StopAllSequences() = 0;
+
+    // Stops all playing cut-scene sequences.
+    // This will not stop all sequences, but only those with CUT_SCENE flag set.
+    virtual void StopAllCutScenes() = 0;
+
+    // Checks if specified sequence is playing.
+    virtual bool IsPlaying(IAnimSequence* seq) const = 0;
+
+    /** Resets playback state of movie system,
+            usually called after loading of level,
+    */
+    virtual void Reset(bool bPlayOnReset, bool bSeekToStart) = 0;
+
+    // Sequences with PLAY_ONRESET flag will start playing after this call.
+    virtual void PlayOnLoadSequences() = 0;
+
+    // Update movie system while not playing animation.
+    virtual void StillUpdate() = 0;
+
+    // Updates movie system every frame before the entity system to animate all playing sequences.
+    virtual void PreUpdate(const float dt) = 0;
+
+    // Updates movie system every frame after the entity system to animate all playing sequences.
+    virtual void PostUpdate(const float dt) = 0;
+
+    // Render function call of some special node.
+    virtual void Render() = 0;
+
+    // Set and enable Fixed Step cvars
+    virtual void EnableFixedStepForCapture(float step) = 0;
+
+    // Disable Fixed Step cvars and return to previous settings
+    virtual void DisableFixedStepForCapture() = 0;
+ 
+    // Signal the capturing start.
+    virtual void StartCapture(const ICaptureKey& key, int frame) = 0;
+
+    // Signal the capturing end.
+    virtual void EndCapture() = 0;
+
+    // Actually turn on/off the capturing.
+    // This is needed for the timing issue of turning on/off the capturing.
+    virtual void ControlCapture() = 0;
+
+    // Returns true if a Render Output capture is currently active.
+    virtual bool IsCapturing() const = 0;
+
+    // Set movie system into recording mode,
+    // While in recording mode any changes made to node will be added as keys to tracks.
+    virtual void SetRecording(bool recording) = 0;
+    virtual bool IsRecording() const = 0;
+
+    virtual void EnableCameraShake(bool bEnabled) = 0;
+    virtual bool IsCameraShakeEnabled() const = 0;
+
+    // Pause any playing sequences.
+    virtual void Pause() = 0;
+
+    // Resume playing sequences.
+    virtual void Resume() = 0;
+
+    // Pause cut scenes in editor.
+    virtual void PauseCutScenes() = 0;
+
+    // Resume cut scenes in editor.
+    virtual void ResumeCutScenes() = 0;
+
+    // Callback when animation-data changes
+    virtual void SetCallback(IMovieCallback* pCallback) = 0;
+
+    virtual IMovieCallback* GetCallback() = 0;
+
+    virtual const SCameraParams& GetCameraParams() const = 0;
+    virtual void SetCameraParams(const SCameraParams& Params) = 0;
+    virtual void SendGlobalEvent(const char* pszEvent) = 0;
+
+    // Gets the float time value for a sequence that is already playing
+    virtual float GetPlayingTime(IAnimSequence* pSeq) = 0;
+    virtual float GetPlayingSpeed(IAnimSequence* pSeq) = 0;
+    // Sets the time progression of an already playing cutscene.
+    // If IAnimSequence:NO_SEEK flag is set on pSeq, this call is ignored.
+    virtual bool SetPlayingTime(IAnimSequence* pSeq, float fTime) = 0;
+    virtual bool SetPlayingSpeed(IAnimSequence* pSeq, float fSpeed) = 0;
+    // Set behavior pattern for stopping sequences.
+    virtual void SetSequenceStopBehavior(ESequenceStopBehavior behavior) = 0;
+
+    // Set the start and end time of an already playing cutscene.
+    virtual bool GetStartEndTime(IAnimSequence* pSeq, float& fStartTime, float& fEndTime) = 0;
+    virtual bool SetStartEndTime(IAnimSequence* pSeq, const float fStartTime, const float fEndTime) = 0;
+
+    // Make the specified sequence go to a given frame time.
+    // @param seqName A sequence name.
+    // @param targetFrame A target frame to go to in time.
+    virtual void GoToFrame(const char* seqName, float targetFrame) = 0;
+
+    // Get the name of camera used for sequences instead of cameras specified in the director node.
+    virtual const char* GetOverrideCamName() const = 0;
+
+    // Get behavior pattern for stopping sequences.
+    virtual IMovieSystem::ESequenceStopBehavior GetSequenceStopBehavior() = 0;
+
+    // These are used to disable 'Ragdollize' events in the editor when the 'AI/Physics' is off.
+    virtual bool IsPhysicsEventsEnabled() const = 0;
+    virtual void EnablePhysicsEvents(bool enable) = 0;
+
+    virtual void EnableBatchRenderMode(bool bOn) = 0;
+    virtual bool IsInBatchRenderMode() const = 0;
+
+    virtual ILightAnimWrapper* CreateLightAnimWrapper(const char* name) const = 0;
+
+    virtual void LoadParamTypeFromXml(CAnimParamType& animParamType, const XmlNodeRef& xmlNode, const uint version) = 0;
+    virtual void SaveParamTypeToXml(const CAnimParamType& animParamType, XmlNodeRef& xmlNode) = 0;
+
+    // Should only be called from CAnimParamType
+    virtual void SerializeParamType(CAnimParamType& animParamType, XmlNodeRef& xmlNode, bool bLoading, const uint version) = 0;
+
+    // For buffering and presenting user notification messages in the Editor. Will also print as an AZ_Warning()
+    virtual void LogUserNotificationMsg(const AZStd::string& msg) = 0;
+    virtual void ClearUserNotificationMsgs() = 0;
+    virtual const AZStd::string& GetUserNotificationMsgs() const = 0;
+
+    // Call this from OnActivate() when a new sequence component entity is activated.
+    virtual void OnSequenceActivated(IAnimSequence* sequence) = 0;
+
+#ifdef MOVIESYSTEM_SUPPORT_EDITING
+    virtual AnimNodeType GetNodeTypeFromString(const char* pString) const = 0;
+    virtual CAnimParamType GetParamTypeFromString(const char* pString) const = 0;
+#endif
+
+    // fill in the animNodeType from the xmlNode description (or vice versa)
+    virtual void SerializeNodeType(AnimNodeType& animNodeType, XmlNodeRef& xmlNode, bool bLoading, const uint version, int flags) = 0;
+
+    // </interfuscator:shuffle>
+};
+
+inline void SAnimContext::Serialize(XmlNodeRef& xmlNode, bool bLoading)
+{
+    if (bLoading)
+    {
+        XmlString name;
+        if (xmlNode->getAttr("sequence", name))
+        {
+            sequence = gEnv->pMovieSystem->FindLegacySequenceByName(name.c_str());
+        }
+        xmlNode->getAttr("dt", dt);
+        xmlNode->getAttr("fps", fps);
+        xmlNode->getAttr("time", time);
+        xmlNode->getAttr("bSingleFrame", singleFrame);
+        xmlNode->getAttr("bResetting", resetting);
+        xmlNode->getAttr("trackMask", trackMask);
+        xmlNode->getAttr("startTime", startTime);
+    }
+    else
+    {
+        if (sequence)
+        {
+            string fullname = sequence->GetName();
+            xmlNode->setAttr("sequence", fullname.c_str());
+        }
+        xmlNode->setAttr("dt", dt);
+        xmlNode->setAttr("fps", fps);
+        xmlNode->setAttr("time", time);
+        xmlNode->setAttr("bSingleFrame", singleFrame);
+        xmlNode->setAttr("bResetting", resetting);
+        xmlNode->setAttr("trackMask", trackMask);
+        xmlNode->setAttr("startTime", startTime);
+    }
+}
+
+inline void CAnimParamType::SaveToXml(XmlNodeRef& xmlNode) const
+{
+    gEnv->pMovieSystem->SaveParamTypeToXml(*this, xmlNode);
+}
+
+inline void CAnimParamType::LoadFromXml(const XmlNodeRef& xmlNode, const uint version)
+{
+    gEnv->pMovieSystem->LoadParamTypeFromXml(*this, xmlNode, version);
+}
+
+inline void CAnimParamType::Serialize(XmlNodeRef& xmlNode, bool bLoading, const uint version)
+{
+    gEnv->pMovieSystem->SerializeParamType(*this, xmlNode, bLoading, version);
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_IMOVIESYSTEM_H
diff --git a/Code/Legacy/CryCommon/INavigationSystem.h b/Code/Legacy/CryCommon/INavigationSystem.h
new file mode 100644
index 0000000000..9725cf35ae
--- /dev/null
+++ b/Code/Legacy/CryCommon/INavigationSystem.h
@@ -0,0 +1,247 @@
+/*
+ * 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_INAVIGATIONSYSTEM_H
+#define CRYINCLUDE_CRYCOMMON_INAVIGATIONSYSTEM_H
+#pragma once
+
+#include <AzCore/std/functional.h>
+
+#include <IMNM.h>
+#include <physinterface.h>
+
+struct IOffMeshNavigationManager;
+
+enum ENavigationIDTag
+{
+    MeshIDTag = 0,
+    AgentTypeIDTag,
+    VolumeIDTag,
+};
+
+template <ENavigationIDTag T>
+struct TNavigationID
+{
+    explicit TNavigationID(uint32 _id = 0)
+        : id(_id) {}
+
+    TNavigationID& operator=(const TNavigationID& other) { id = other.id; return *this; }
+
+    ILINE operator uint32() const { return id; }
+    ILINE bool operator==(const TNavigationID& other) const { return id == other.id; }
+    ILINE bool operator!=(const TNavigationID& other) const { return id != other.id; }
+    ILINE bool operator<(const TNavigationID& other) const { return id < other.id; }
+
+private:
+    uint32 id;
+};
+
+
+typedef TNavigationID<MeshIDTag> NavigationMeshID;
+typedef TNavigationID<AgentTypeIDTag> NavigationAgentTypeID;
+typedef TNavigationID<VolumeIDTag> NavigationVolumeID;
+typedef AZStd::function<void(NavigationAgentTypeID, NavigationMeshID, uint32)> NavigationMeshChangeCallback;
+typedef AZStd::function<bool(IPhysicalEntity&, uint32&)> NavigationMeshEntityCallback;
+
+struct INavigationSystemUser
+{
+    virtual ~INavigationSystemUser() {}
+
+    virtual void Reset() = 0;
+    virtual void UpdateForSynchronousOrAsynchronousReadingOperation() = 0;
+    virtual void UpdateForSynchronousWritingOperations() = 0;
+    virtual void CompleteRunningTasks() = 0;
+};
+
+struct INavigationSystem
+{
+    enum ENavigationEvent
+    {
+        MeshReloaded = 0,
+        MeshReloadedAfterExporting,
+        NavigationCleared,
+    };
+
+    enum EAccessbilityDir
+    {
+        AccessibilityToward,
+        AccessibilityAway,
+    };
+
+    struct INavigationSystemListener
+    {
+        // <interfuscator:shuffle>
+        virtual ~INavigationSystemListener(){}
+        virtual void OnNavigationEvent(const ENavigationEvent event) = 0;
+        // </interfuscator:shuffle>
+    };
+
+    enum WorkingState
+    {
+        Idle = 0,
+        Working,
+    };
+
+
+    struct CreateAgentTypeParams
+    {
+        CreateAgentTypeParams(const Vec3& _voxelSize = Vec3(0.1f), uint16 _radiusVoxelCount = 4,
+            uint16 _climbableVoxelCount = 4, uint16 _heightVoxelCount = 18,
+            [[maybe_unused]] uint16 _maxWaterDepthVoxelCount = 6)
+            : voxelSize(_voxelSize)
+            , climbableInclineGradient(1.0f)
+            , climbableStepRatio(0.75f)
+            , radiusVoxelCount(_radiusVoxelCount)
+            , climbableVoxelCount(_climbableVoxelCount)
+            , heightVoxelCount(_heightVoxelCount)
+            , maxWaterDepthVoxelCount()
+        {
+        }
+
+        Vec3 voxelSize;
+
+        float climbableInclineGradient;
+        float climbableStepRatio;
+
+        uint16 radiusVoxelCount;
+        uint16 climbableVoxelCount;
+        uint16 heightVoxelCount;
+        uint16 maxWaterDepthVoxelCount;
+    };
+
+    struct CreateMeshParams
+    {
+        CreateMeshParams(const Vec3& _origin = Vec3(ZERO), const Vec3i& _tileSize = Vec3i(8), const uint32 _tileCount = 1024)
+            : origin(_origin)
+            , tileSize(_tileSize)
+            , tileCount(_tileCount)
+        {
+        }
+
+        Vec3 origin;
+        Vec3i tileSize;
+        uint32 tileCount;
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~INavigationSystem() {}
+    virtual NavigationAgentTypeID CreateAgentType(const char* name, const CreateAgentTypeParams& params) = 0;
+    virtual NavigationAgentTypeID GetAgentTypeID(const char* name) const = 0;
+    virtual NavigationAgentTypeID GetAgentTypeID(size_t index) const = 0;
+    virtual const char* GetAgentTypeName(NavigationAgentTypeID agentTypeID) const = 0;
+    virtual size_t GetAgentTypeCount() const = 0;
+
+    virtual NavigationMeshID CreateMesh(const char* name, NavigationAgentTypeID agentTypeID, const CreateMeshParams& params) = 0;
+    virtual NavigationMeshID CreateMesh(const char* name, NavigationAgentTypeID agentTypeID, const CreateMeshParams& params, NavigationMeshID requestedID) = 0;
+    virtual void DestroyMesh(NavigationMeshID meshID) = 0;
+
+    virtual void SetMeshEntityCallback(NavigationAgentTypeID agentTypeID, const NavigationMeshEntityCallback& callback) = 0;
+    virtual void AddMeshChangeCallback(NavigationAgentTypeID agentTypeID, const NavigationMeshChangeCallback& callback) = 0;
+    virtual void RemoveMeshChangeCallback(NavigationAgentTypeID agentTypeID, const NavigationMeshChangeCallback& callback) = 0;
+
+    virtual void SetMeshBoundaryVolume(NavigationMeshID meshID, NavigationVolumeID volumeID) = 0;
+    virtual NavigationVolumeID CreateVolume(Vec3* vertices, size_t vertexCount, float height) = 0;
+    virtual NavigationVolumeID CreateVolume(Vec3* vertices, size_t vertexCount, float height, NavigationVolumeID requestedID) = 0;
+    virtual void DestroyVolume(NavigationVolumeID volumeID) = 0;
+    virtual void SetVolume(NavigationVolumeID volumeID, Vec3* vertices, size_t vertexCount, float height) = 0;
+    virtual bool ValidateVolume(NavigationVolumeID volumeID) = 0;
+    virtual NavigationVolumeID GetVolumeID(NavigationMeshID meshID) = 0;
+
+    virtual void SetExclusionVolume(const NavigationAgentTypeID* agentTypeIDs, size_t agentTypeIDCount, NavigationVolumeID volumeID) = 0;
+
+    virtual NavigationMeshID GetMeshID(const char* name, NavigationAgentTypeID agentTypeID) const = 0;
+    virtual const char* GetMeshName(NavigationMeshID meshID) const = 0;
+    virtual void SetMeshName(NavigationMeshID meshID, const char* name) = 0;
+
+    virtual WorkingState GetState() const = 0;
+    virtual WorkingState Update(bool blocking = false) = 0;
+    virtual void PauseNavigationUpdate() = 0;
+    virtual void RestartNavigationUpdate() = 0;
+
+    virtual size_t QueueMeshUpdate(NavigationMeshID meshID, const AABB& aabb) = 0;
+    virtual void ProcessQueuedMeshUpdates() = 0;
+
+    virtual void Clear() = 0;
+    // ClearAndNotify it's used when the listeners need to be notified about
+    // the performed clear operation.
+    virtual void ClearAndNotify() = 0;
+    virtual bool ReloadConfig() = 0;
+    virtual void DebugDraw() = 0;
+    virtual void Reset() = 0;
+
+    virtual void WorldChanged(const AABB& aabb) = 0;
+
+    virtual void SetDebugDisplayAgentType(NavigationAgentTypeID agentTypeID) = 0;
+    virtual NavigationAgentTypeID GetDebugDisplayAgentType() const = 0;
+
+    //Returns impact mesh ID and point if segment intersects
+    virtual std::tuple<bool, NavigationMeshID, Vec3> RaycastWorld(const Vec3& segP0, const Vec3& segP1) const = 0;
+
+    virtual bool GetClosestPointInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location, float vrange, float hrange, Vec3* meshLocation, float minIslandArea = 0.f) const = 0;
+
+    //Returns nav mesh ID at the specified location based on the passed in agent type
+    virtual NavigationMeshID GetEnclosingMeshID(NavigationAgentTypeID agentTypeID, const Vec3& location) const = 0;
+
+    virtual bool IsLocationValidInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location) const = 0;
+
+    //Test to see if the specified location is within the navmesh.  The point has to be weithin downRange and upRange offset from location
+    virtual bool IsLocationContainedWithinTriangleInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location, float downRange, float upRange) const = 0;
+
+    //Returns a list of triangle centers within the specified AABB and navmesh
+    virtual size_t GetTriangleCenterLocationsInMesh(const NavigationMeshID meshID, const Vec3& location, const AABB& searchAABB, Vec3* centerLocations, size_t maxCenterLocationCount, float minIslandArea = 0.f) const = 0;
+
+    // Returns all borders (unconnected edges) in the specified AABB.  There are 3 Vec3's
+    // per border edge, vert 0, vert 1, and a normal pointing out from the edge.  You can
+    // pass null for pBorders to return the total number of borders (multiply this by 3 to
+    // get the total number of Vec3's you need to pass in).
+    virtual size_t GetTriangleBorders(const NavigationMeshID meshID, const AABB& aabb, Vec3* pBorders, size_t maxBorderCount, float minIslandArea = 0.f) const = 0;
+
+    //For Hunt - gets triangle centers, and island ids - this is used to compute spawn points for an area
+    virtual size_t GetTriangleInfo(const NavigationMeshID meshID, const AABB& aabb, Vec3* centerLocations, uint32* islandids, size_t max_count, float minIslandArea = 0.f) const = 0;
+
+    //returns island id of the triangle at the current position
+    virtual MNM::GlobalIslandID GetGlobalIslandIdAtPosition(const NavigationAgentTypeID agentID, const Vec3& location) = 0;
+
+    virtual bool ReadFromFile(const char* fileName, bool bAfterExporting) = 0;
+    virtual bool SaveToFile(const char* fileName) const = 0;
+
+    virtual void RegisterListener(INavigationSystemListener* pListener, const char* name = NULL) = 0;
+    virtual void UnRegisterListener(INavigationSystemListener* pListener) = 0;
+
+    virtual void RegisterUser(INavigationSystemUser* pExtension, const char* name = NULL) = 0;
+    virtual void UnRegisterUser(INavigationSystemUser* pExtension) = 0;
+
+    virtual void RegisterArea(const char* shapeName) = 0;
+    virtual void UnRegisterArea(const char* shapeName) = 0;
+    virtual bool IsAreaPresent(const char* shapeName) = 0;
+    virtual NavigationVolumeID GetAreaId(const char* shapeName) const = 0;
+    virtual void SetAreaId(const char* shapeName, NavigationVolumeID id) = 0;
+    virtual void UpdateAreaNameForId(const NavigationVolumeID id, const char* newShapeName) = 0;
+
+    virtual void StartWorldMonitoring() = 0;
+    virtual void StopWorldMonitoring() = 0;
+
+    virtual bool IsInUse() const = 0;
+
+    virtual void CalculateAccessibility() = 0;
+
+    virtual uint32 GetTileIdWhereLocationIsAtForMesh(NavigationMeshID meshID, const Vec3& location) = 0;
+    virtual void GetTileBoundsForMesh(NavigationMeshID meshID, uint32 tileID, AABB& bounds) const = 0;
+
+    virtual MNM::TriangleID GetTriangleIDWhereLocationIsAtForMesh(const NavigationAgentTypeID agentID, const Vec3& location) = 0;
+
+    virtual const IOffMeshNavigationManager& GetIOffMeshNavigationManager() const = 0;
+    virtual IOffMeshNavigationManager& GetIOffMeshNavigationManager() = 0;
+    virtual void ComputeAccessibility(const Vec3& seedPos, NavigationAgentTypeID agentTypeId = NavigationAgentTypeID(0), float range = 0.f, EAccessbilityDir dir = AccessibilityAway) = 0;
+    virtual bool TryGetAgentRadiusData(const char* agentType, Vec3& voxelSize, uint16& radiusInVoxels) const = 0;
+    // </interfuscator:shuffle>
+};
+
+
+
+#endif // CRYINCLUDE_CRYCOMMON_INAVIGATIONSYSTEM_H
diff --git a/Code/Legacy/CryCommon/IPathfinder.h b/Code/Legacy/CryCommon/IPathfinder.h
new file mode 100644
index 0000000000..2863cec82b
--- /dev/null
+++ b/Code/Legacy/CryCommon/IPathfinder.h
@@ -0,0 +1,753 @@
+/*
+ * 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 : Pathfinder Interface.
+
+#pragma once
+
+struct IAIPathAgent;
+
+#include <INavigationSystem.h>
+#include <IMNM.h>
+#include <ISerialize.h>
+#include <SerializeFwd.h>
+#include <Cry_Geo.h>
+
+#include <AzCore/std/functional.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <limits>
+
+// Hacks to deal with windows header inclusion.
+#ifdef GetObject
+#undef GetObject
+#endif
+#ifdef GetUserName
+#undef GetUserName
+#endif
+#ifdef DrawText
+#undef DrawText
+#endif
+#ifdef LoadLibrary
+#undef LoadLibrary
+#endif
+#ifdef max
+#undef max
+#endif
+
+/* WARNING: These interfaces and structures are soon to be deprecated.
+                        Use at your own risk of having to change your code later!
+*/
+
+
+// Passing through navigational SO methods.
+enum ENavSOMethod
+{
+    nSOmNone,                           // not passing or not passable
+    nSOmAction,                     // execute an AI action
+    nSOmPriorityAction,     // execute a higher priority AI action
+    nSOmStraight,                   // just pass straight
+    nSOmSignalAnimation,    // play signal animation
+    nSOmActionAnimation,    // play action animation
+    nSOmLast
+};
+
+// Indication of (a) what a graph node represents and (b) what kind of graph node an AI entity
+// can navigate. In the latter case it can be used as a bit mask.
+// Copied from CryCommon/IAISystem.h which has been deleted.
+enum ENavigationType
+{
+    NAV_UNSET              = 1 << 0,
+    NAV_TRIANGULAR         = 1 << 1,
+    NAV_WAYPOINT_HUMAN     = 1 << 2,
+    NAV_WAYPOINT_3DSURFACE = 1 << 3,
+    NAV_FLIGHT             = 1 << 4,
+    NAV_VOLUME             = 1 << 5,
+    NAV_ROAD               = 1 << 6,
+    NAV_SMARTOBJECT        = 1 << 7,
+    NAV_FREE_2D            = 1 << 8,
+    NAV_CUSTOM_NAVIGATION    = 1 << 9,
+    NAV_MAX_VALUE          = NAV_CUSTOM_NAVIGATION
+};
+
+//====================================================================
+// NavigationBlocker
+// Represents an object that might be blocking a link. Each blocker is
+// assumed to be spherical, with the position centred around the floor
+// so that links can intersect it.
+//====================================================================
+struct NavigationBlocker
+{
+    /// pos and radius define the sphere.
+    /// costAddMod is a fixed cost (in m) associated with the blocker obscuring a link - a value of 0 has
+    /// no effect - a value of 10 would make the link effectively 10m longer than it is.
+    /// costMultMod is the cost modification factor - a value of 0 has no effect - a value of 10 would make the link
+    /// 10x more costly. -ve disables the link
+    /// radialDecay indicates if the cost modifiers should decay linearly to 0 over the radius of the sphere
+    /// directional indicates if the cost should be unaffected for motion in a radial direction
+    NavigationBlocker(const Vec3& pos, float radius, float _costAddMod, float _costMultMod, bool _radialDecay, bool _directional)
+        : sphere(pos, radius)
+        , costAddMod(_costAddMod)
+        , costMultMod(_costMultMod)
+        , restrictedLocation(false)
+        , radialDecay(_radialDecay)
+        , directional(_directional) {}
+
+    /// Just to allow std::vector::resize(0)
+    NavigationBlocker()
+        : sphere(Vec3(0, 0, 0), 0.0f)
+        , costAddMod(0)
+        , costMultMod(0)
+        , radialDecay(false) {AZ_Assert(false, "Should never get called"); }
+
+    ::Sphere sphere;
+    bool radialDecay;
+    bool directional;
+
+    /// absolute cost added to any link going through this blocker (useful for small blockers)
+    float costAddMod;
+    /// multiplier for link costs going through this blocker (0 means no extra cost, 1 means to double etc)
+    float costMultMod;
+
+    // info to speed up the intersection checks
+    /// If this is true then the blocker is small enough that it only affects the
+    /// nav type it resides in. If false then it affects everything.
+    bool restrictedLocation;
+    ENavigationType navType;
+    union Location
+    {
+        struct // similar for other nav types when there's info to go in them
+        {
+            // no node because the node "areas" can overlap so it's not useful
+            int nBuildingID;
+        } waypoint;
+    };
+    /// Only gets used if restrictedLocation = true
+    Location location;
+};
+
+typedef DynArray<NavigationBlocker> NavigationBlockers;
+
+
+//====================================================================
+// PathPointDescriptor
+//====================================================================
+struct PathPointDescriptor
+{
+    struct SmartObjectNavData
+        : public _i_reference_target_t
+    {
+        unsigned fromIndex;
+        unsigned toIndex;
+    };
+    typedef _smart_ptr< SmartObjectNavData > SmartObjectNavDataPtr;
+
+    struct OffMeshLinkData
+    {
+        OffMeshLinkData()
+            : meshID(0)
+            , offMeshLinkID(0)
+        {}
+
+        uint32 meshID;
+        MNM::OffMeshLinkID offMeshLinkID;
+    };
+
+    PathPointDescriptor(ENavigationType _navType = NAV_UNSET, const Vec3& _vPos = ZERO)
+        : vPos(_vPos)
+        , navType(_navType)
+        , navTypeCustomId(0)
+        , iTriId(0)
+        , pSONavData(0)
+        , navSOMethod(nSOmNone)
+    {}
+
+    PathPointDescriptor(const Vec3& _vPos)
+        : vPos(_vPos)
+        , navType(NAV_UNSET)
+        , navTypeCustomId(0)
+        , iTriId(0)
+        , pSONavData(0)
+        , navSOMethod(nSOmNone)
+    {}
+
+    bool IsEquivalent(const PathPointDescriptor& other) const
+    {
+        return (navType == other.navType) && vPos.IsEquivalent(other.vPos, 0.01f);
+    }
+
+    static bool ArePointsEquivalent(const PathPointDescriptor& point1, const PathPointDescriptor& point2)
+    {
+        return point1.IsEquivalent(point2);
+    }
+
+    Vec3 vPos;
+    ENavigationType navType;
+    uint16 navTypeCustomId;
+
+    uint32 iTriId;
+    OffMeshLinkData offMeshLinkData;
+
+    SmartObjectNavDataPtr pSONavData;
+
+    ENavSOMethod navSOMethod;
+};
+
+struct PathfindingExtraConstraint
+{
+    enum EExtraConstraintType
+    {
+        ECT_MAXCOST,
+        ECT_MINDISTFROMPOINT,
+        ECT_AVOIDSPHERE,
+        ECT_AVOIDCAPSULE
+    };
+
+    EExtraConstraintType type;
+
+    union UConstraint
+    {
+        struct SConstraintMaxCost
+        {
+            float maxCost;
+        };
+        struct SConstraintMinDistFromPoint
+        {
+            float px, py, pz; // Can't use Vec3 as it has a constructor.
+            float minDistSq;
+        };
+        struct SConstraintAvoidSphere
+        {
+            float px, py, pz; // Can't use Vec3 as it has a constructor.
+            float minDistSq;
+        };
+        struct SConstraintAvoidCapsule
+        {
+            float px, py, pz;
+            float qx, qy, qz;
+            float minDistSq;
+        };
+        SConstraintMaxCost maxCost;
+        SConstraintMinDistFromPoint minDistFromPoint;
+        SConstraintAvoidSphere avoidSphere;
+        SConstraintAvoidCapsule avoidCapsule;
+    };
+    UConstraint constraint;
+};
+
+typedef DynArray<PathfindingExtraConstraint> PathfindingExtraConstraints;
+
+
+struct PathfindRequest
+{
+    enum ERequestType
+    {
+        TYPE_ACTOR,
+        TYPE_RAW,
+    };
+    ERequestType type;
+
+    unsigned startIndex;
+    unsigned endIndex;
+    Vec3 startPos;
+    Vec3 startDir;
+    Vec3 endPos;
+    /// endDir magnitude indicates the tendency to line up at the end of the path -
+    /// magnitude should be between 0 and 1
+    Vec3 endDir;
+    bool bSuccess;
+    IAIPathAgent* pRequester;
+    int nForceTargetBuildingId;
+    bool allowDangerousDestination;
+    float endTol;
+    float endDistance;
+    // as a result of RequestPathInDirection or RequestPathTo
+    bool isDirectional;
+
+    /// This gets set to false if the path end position doesn't match the requested end position
+    /// (e.g. in the event of a partial path, or if the destination is in forbidden)
+    bool bPathEndIsAsRequested;
+
+    int id;
+    float passRadius;
+
+    PathfindingExtraConstraints extraConstraints;
+
+    PathfindRequest(ERequestType _type)
+        : type(_type)
+        , startIndex(0)
+        , endIndex(0)
+        , pRequester(0)
+        , bPathEndIsAsRequested(false)
+        , allowDangerousDestination(false)
+        , endTol(std::numeric_limits<float>::max())
+        , endDistance(0)
+        , nForceTargetBuildingId(-1)
+        , isDirectional(false)
+        , id(-1)
+        , passRadius(0.0f)
+    {
+    }
+};
+
+struct PathFollowerParams
+{
+    PathFollowerParams()
+        : normalSpeed(0.0f)
+        , pathRadius(0.0f)
+        , pathLookAheadDist(1.0f)
+        , maxAccel(0.0f)
+        , maxDecel(1.0f)
+        , minSpeed(0.0f)
+        , maxSpeed(10.0f)
+        , endAccuracy(0.2f)
+        , endDistance(0.0f)
+        , stopAtEnd(true)
+        , use2D(true)
+        , isVehicle(false)
+        , isAllowedToShortcut(true)
+        , passRadius(0.5f)
+    {}
+
+    // OLD: Remove this when possible, Animation to take over majority of logic
+    float normalSpeed; ///< normal entity speed
+    float pathRadius; ///< max deviation allowed from the path
+    float pathLookAheadDist; ///< how far we look ahead along the path - normally the same as pathRadius
+    float maxAccel; ///< maximum acceleration of the entity
+    float maxDecel; ///< maximum deceleration of the entity
+    float minSpeed; ///< minimum output speed (unless it's zero on path end etc)
+    float maxSpeed; ///< maximum output speed
+
+    // KEEP: Additions and useful state for new impl.
+    float endAccuracy; ///< How close to the end point the agent must be to finish pathing
+    float endDistance; ///< stop this much before the end
+    bool stopAtEnd; ///< aim to finish the path by reaching the end position (stationary), or simply overshoot
+    bool use2D; ///< follow in 2 or 3D
+    bool isVehicle;
+    bool isAllowedToShortcut;
+
+    /// The minimum radius of the agent for navigating
+    float passRadius;
+};
+
+
+struct PathFollowResult
+{
+    struct SPredictedState
+    {
+        SPredictedState() {}
+        SPredictedState(const Vec3& p, const Vec3& v)
+            : pos(p)
+            , vel(v) {}
+        Vec3 pos;
+        Vec3 vel;
+    };
+    typedef AZStd::vector<SPredictedState, AZ::StdLegacyAllocator> TPredictedStates;
+
+    // OLD: Obsolete & to be replaced by new impl.
+
+    /// maximum time to predict out to - actual prediction may not go this far
+    float desiredPredictionTime;
+    /// the first element in predictedStates will be now + predictionDeltaTime, etc
+    float predictionDeltaTime;
+    /// if this is non-zero then on output the prediction will be placed into it
+    TPredictedStates* predictedStates;
+
+    PathFollowResult()
+        : predictionDeltaTime(0.1f)
+        , predictedStates(0)
+        , desiredPredictionTime(0)
+        , distanceToEnd(0.f)
+        , reachedEnd(false)
+        , followTargetPos(0)
+        , inflectionPoint(0) {}
+
+
+    float distanceToEnd;
+    bool reachedEnd;
+    Vec3 velocityOut;
+
+    // NEW: Replaces data above
+
+    // NOTE: If the turningPoint and inflectionPoint are equal, they represent the end of the path.
+    /// The furthest point on the path we can move directly towards without colliding with anything
+    Vec3 followTargetPos;
+    /// The next point on the path beyond the follow target that deviates substantially from a straight-line path
+    Vec3 inflectionPoint;
+
+    /// The maximum distance the agent can safely move in a straight line beyond the turning point
+    //  float maxOverrunDistance;
+};
+
+
+
+// Intermediary and minimal interface to use the pathfinder without requiring an AI object
+// TODO: Fix the long function names. At the moment they collide with IAIObject base.
+//           The alternative would be to make IAIObject derive from IAIPathAgent.
+struct IAIPathAgent
+{
+    virtual ~IAIPathAgent(){}
+    virtual const char* GetPathAgentName() const = 0;
+    virtual unsigned short GetPathAgentType() const = 0;
+
+    virtual float GetPathAgentPassRadius() const = 0;
+    virtual Vec3 GetPathAgentPos() const = 0;
+    virtual Vec3 GetPathAgentVelocity() const = 0;
+
+    // This cannot easily be const, but has no side-effects
+    virtual void GetPathAgentNavigationBlockers(NavigationBlockers& blockers, const PathfindRequest* pRequest) = 0;
+
+    virtual void SetPathToFollow(const char* pathName) = 0;
+    virtual void SetPathAttributeToFollow(bool bSpline) = 0;
+
+    //Path finding avoids blocker type by radius.
+    virtual void SetPFBlockerRadius(int blockerType, float radius) = 0;
+
+    virtual bool GetValidPositionNearby(const Vec3& proposedPosition, Vec3& adjustedPosition) const = 0;
+    virtual bool GetTeleportPosition(Vec3& teleportPos) const = 0;
+
+    virtual class IPathFollower* GetPathFollower() const = 0;
+
+    virtual bool IsPointValidForAgent(const Vec3& pos, uint32 flags) const = 0;
+};
+
+typedef std::list<PathPointDescriptor> TPathPoints;
+
+struct SNavPathParams
+{
+    SNavPathParams(const Vec3& _start = Vec3_Zero, const Vec3& _end = Vec3_Zero,
+        const Vec3& _startDir = Vec3_Zero, const Vec3& _endDir = Vec3_Zero,
+        int _nForceBuildingID = -1, bool _allowDangerousDestination = false, float _endDistance = 0.0f,
+        bool _continueMovingAtEnd = false, bool _isDirectional = false)
+        : start(_start)
+        , end(_end)
+        , startDir(_startDir)
+        , endDir(_endDir)
+        , nForceBuildingID(_nForceBuildingID)
+        , allowDangerousDestination(_allowDangerousDestination)
+        , precalculatedPath(false)
+        , inhibitPathRegeneration(false)
+        , continueMovingAtEnd(_continueMovingAtEnd)
+        , endDistance(_endDistance)
+        , isDirectional(_isDirectional)
+    {}
+
+    Vec3 start;
+    Vec3 end;
+    Vec3 startDir;
+    Vec3 endDir;
+    int nForceBuildingID;
+    bool allowDangerousDestination;
+    /// if path is precalculated it should not be regenerated, and also some things like steering
+    /// will be disabled
+    bool precalculatedPath;
+    /// sometimes it is necessary to disable a normal path from getting regenerated
+    bool inhibitPathRegeneration;
+    bool continueMovingAtEnd;
+    bool isDirectional;
+    float endDistance; // The requested cut distance of the path, positive value means distance from path end, negative value means distance from path start.
+    NavigationMeshID meshID;
+
+    void Clear()
+    {
+        start = Vec3_Zero;
+        end = Vec3_Zero;
+        startDir = Vec3_Zero;
+        endDir = Vec3_Zero;
+        allowDangerousDestination = false;
+        precalculatedPath = false;
+        inhibitPathRegeneration = false;
+        continueMovingAtEnd = false;
+        isDirectional = false;
+        endDistance = 0.0f;
+        meshID = NavigationMeshID(0);
+    }
+
+    void Serialize(TSerialize ser)
+    {
+        ser.Value("start", start);
+        ser.Value("end", end);
+        ser.Value("startDir", startDir);
+        ser.Value("endDir", endDir);
+        ser.Value("nForceBuildingID", nForceBuildingID);
+        ser.Value("allowDangerousDestination", allowDangerousDestination);
+        ser.Value("precalculatedPath", precalculatedPath);
+        ser.Value("inhibitPathRegeneration", inhibitPathRegeneration);
+        ser.Value("continueMovingAtEnd", continueMovingAtEnd);
+        ser.Value("isDirectional", isDirectional);
+        ser.Value("endDistance", endDistance);
+
+        if (ser.IsReading())
+        {
+            uint32 meshIdAsUint32;
+            ser.Value("meshID", meshIdAsUint32);
+            meshID = NavigationMeshID(meshIdAsUint32);
+        }
+        else
+        {
+            uint32 meshIdAsUint32 = (uint32) meshID;
+            ser.Value("meshID", meshIdAsUint32);
+        }
+    }
+};
+
+class INavPath
+{
+public:
+    virtual ~INavPath(){}
+    virtual void Release() = 0;
+    virtual void CopyTo(INavPath* pRecipient) const = 0;
+    virtual AZStd::shared_ptr<INavPath> Clone() const = 0;
+
+    virtual NavigationMeshID GetMeshID() const = 0;
+
+    virtual int GetVersion() const = 0;
+    virtual void SetVersion(int version) = 0;
+
+    virtual void SetParams(const SNavPathParams& params) = 0;
+    virtual const SNavPathParams& GetParams() const = 0;
+    virtual SNavPathParams& GetParams() = 0;
+    virtual const TPathPoints& GetPath() const = 0;
+    virtual void SetPathPoints(const TPathPoints& points) = 0;
+
+    virtual float   GetPathLength(bool twoD) const = 0;
+    virtual void PushFront(const PathPointDescriptor& newPathPoint, bool force = false) = 0;
+    virtual void PushBack(const PathPointDescriptor& newPathPoint, bool force = false) = 0;
+    virtual void Clear(const char* contextName) = 0;
+    virtual bool Advance(PathPointDescriptor& nextPathPoint) = 0;
+
+    virtual bool GetPathEndIsAsRequested() const = 0;
+    virtual void SetPathEndIsAsRequested(bool value) = 0;
+
+    virtual bool Empty() const = 0;
+
+    virtual const PathPointDescriptor* GetLastPathPoint() const = 0;
+    virtual const PathPointDescriptor* GetPrevPathPoint() const = 0;
+    virtual const PathPointDescriptor* GetNextPathPoint() const = 0;
+    virtual const PathPointDescriptor* GetNextNextPathPoint() const = 0;
+
+    virtual const Vec3& GetNextPathPos(const Vec3& defaultPos = Vec3_Zero) const = 0;
+    virtual const Vec3& GetLastPathPos(const Vec3& defaultPos = Vec3_Zero) const = 0;
+
+    virtual bool GetPosAlongPath(Vec3& posOut, float dist, bool twoD, bool extrapolateBeyondEnd, ENavigationType* nextPointType = NULL) const = 0;
+    virtual float GetDistToPath(Vec3& pathPosOut, float& distAlongPathOut, const Vec3& pos, float dist, bool twoD) const = 0;
+    virtual float GetDistToSmartObject(bool twoD) const = 0;
+    virtual PathPointDescriptor::SmartObjectNavDataPtr GetLastPathPointAnimNavSOData() const = 0;
+    virtual void SetPreviousPoint(const PathPointDescriptor& previousPoint) = 0;
+
+    virtual AABB GetAABB(float dist) const = 0;
+
+    virtual bool GetPathPropertiesAhead(float distAhead, bool twoD, Vec3& posOut, Vec3& dirOut, float* invROut, float& lowestPathDotOut, bool scaleOutputWithDist) const = 0;
+
+    virtual void SetEndDir(const Vec3& endDir) = 0;
+    virtual const Vec3& GetEndDir() const = 0;
+
+    virtual bool UpdateAndSteerAlongPath(Vec3& dirOut, float& distToEndOut, float& distToPathOut, bool& isResolvingSticking, Vec3& pathDirOut, Vec3& pathAheadDirOut, Vec3& pathAheadPosOut, Vec3 currentPos, const Vec3& currentVel, float lookAhead, float pathRadius, float dt, bool resolveSticking, bool twoD) = 0;
+
+    virtual void TrimPath(float length, bool twoD) = 0;
+    virtual float GetDiscardedPathLength() const = 0;
+    virtual float UpdatePathPosition(Vec3 agentPos, float pathLookahead, bool twoD, bool allowPathToFinish) = 0;
+    virtual Vec3 CalculateTargetPos(Vec3 agentPos, float lookAhead, float minLookAheadAlongPath, float pathRadius, bool twoD) const = 0;
+
+    virtual void Draw(const Vec3& drawOffset = ZERO) const = 0;
+    virtual void Dump(const char* name) const = 0;
+
+    bool ArePathsEqual(const INavPath& otherNavPath)
+    {
+        const TPathPoints& path1 = this->GetPath();
+        const TPathPoints& path2 = otherNavPath.GetPath();
+        const TPathPoints::size_type path1Size = path1.size();
+        const TPathPoints::size_type path2Size = path2.size();
+        if (path1Size != path2Size)
+        {
+            return false;
+        }
+
+        TPathPoints::const_iterator path1It = path1.begin();
+        TPathPoints::const_iterator path1End = path1.end();
+        TPathPoints::const_iterator path2It = path2.begin();
+
+        typedef std::pair<TPathPoints::const_iterator, TPathPoints::const_iterator> TMismatchResult;
+
+        TMismatchResult result = std::mismatch(path1It, path1End, path2It, PathPointDescriptor::ArePointsEquivalent);
+        return result.first == path1.end();
+    }
+};
+using INavPathPtr = AZStd::shared_ptr<INavPath>;
+
+enum EMNMPathResult
+{
+    eMNMPR_NoPathFound = 0,
+    eMNMPR_Success,
+};
+
+struct MNMPathRequestResult
+{
+    MNMPathRequestResult()
+        : cost(0.f)
+        , id(0)
+        , result(eMNMPR_NoPathFound)
+    {}
+
+    ILINE bool HasPathBeenFound() const
+    {
+        return result == eMNMPR_Success;
+    }
+
+    INavPathPtr pPath;
+    float cost;
+    uint32 id;
+    EMNMPathResult result;
+};
+
+struct IPathObstacles
+{
+    virtual ~IPathObstacles() {}
+
+    virtual bool IsPathIntersectingObstacles(const NavigationMeshID meshID, const Vec3& start, const Vec3& end, float radius) const = 0;
+    virtual bool IsPointInsideObstacles(const Vec3& position) const = 0;
+    virtual bool IsLineSegmentIntersectingObstaclesOrCloseToThem(const Lineseg& linesegToTest, float maxDistanceToConsiderClose) const = 0;
+};
+
+class IPathFollower
+{
+public:
+    virtual ~IPathFollower(){}
+
+    virtual void Release() = 0;
+
+    virtual void Reset() = 0;
+
+    /// This attaches us to a particular path (pass 0 to detach)
+    virtual void AttachToPath(INavPath* navPath) = 0;
+
+    virtual void SetParams(const PathFollowerParams& params) = 0;
+
+    /// Just view the params
+    virtual const PathFollowerParams& GetParams() const = 0;
+    virtual PathFollowerParams& GetParams() = 0;
+
+    // Advances the follow target along the path as far as possible while ensuring the follow
+    // target remains reachable. Returns true if the follow target is reachable, false otherwise.
+    virtual bool Update(PathFollowResult& result, const Vec3& curPos, const Vec3& curVel, float dt) = 0;
+
+    /// Advances the current state in terms of position - effectively pretending that the follower
+    /// has gone further than it has.
+    virtual void Advance(float distance) = 0;
+
+    /// Returns the distance from the lookahead to the end, plus the distance from the position passed in
+    /// to the LA if pCurPos != 0
+    virtual float GetDistToEnd(const Vec3* pCurPos) const = 0;
+
+    /// Returns the distance along the path from the current look-ahead position to the
+    /// first smart object path segment. If there's no path, or no smart objects on the
+    /// path, then std::numeric_limits<float>::max() will be returned
+    virtual float GetDistToSmartObject() const = 0;
+    virtual float GetDistToNavType(ENavigationType navType) const = 0;
+
+    /// Returns a point on the path some distance ahead. actualDist is set according to
+    /// how far we looked - may be less than dist if we'd reach the end
+    virtual Vec3 GetPathPointAhead(float dist, float& actualDist) const = 0;
+
+    virtual void Draw(const Vec3& drawOffset = ZERO) const = 0;
+
+    virtual void Serialize(TSerialize ser) = 0;
+
+    // Checks ability to walk along a piecewise linear path starting from the current position
+    // (useful for example when animation would like to deviate from the path)
+    virtual bool CheckWalkability(const Vec2* path, const size_t length) const = 0;
+
+    // Can the pathfollower cut corners if there is space to do so? (default: true)
+    virtual bool GetAllowCuttingCorners() const = 0;
+
+    // Sets whether or not the pathfollower is allowed to cut corners if there is space to do so. (default: true)
+    virtual void SetAllowCuttingCorners(const bool allowCuttingCorners) = 0;
+};
+
+namespace MNM
+{
+    typedef unsigned int QueuedPathID;
+
+    namespace Constants
+    {
+        enum EQueuedPathID
+        {
+            eQueuedPathID_InvalidID = 0,
+        };
+    }
+}
+
+struct MNMPathRequest
+{
+    using Callback = AZStd::function<void(const MNM::QueuedPathID&, MNMPathRequestResult&)>;
+
+    MNMPathRequest()
+        : resultCallback(0)
+        , startLocation(ZERO)
+        , endLocation(ZERO)
+        , endDirection(Vec3(0, 1, 0))
+        , agentTypeID(NavigationAgentTypeID())
+        , forceTargetBuildingId(0)
+        , endTolerance(0.0f)
+        , endDistance(0.0f)
+        , allowDangerousDestination(false)
+        , beautify(true)
+    {
+    }
+
+    MNMPathRequest(const Vec3& start, const Vec3& end, const Vec3& _endDirection, int _forceTargetBuildingId,
+        float _endTolerance, float _endDistance, [[maybe_unused]] bool _allowDangerousDestination, const Callback& callback,
+        const NavigationAgentTypeID& _agentTypeID)
+        : resultCallback(callback)
+        , startLocation(start)
+        , endLocation(end)
+        , endDirection(_endDirection)
+        , agentTypeID(_agentTypeID)
+        , forceTargetBuildingId(_forceTargetBuildingId)
+        , endTolerance(_endTolerance)
+        , endDistance(_endDistance)
+        , allowDangerousDestination(false)
+        , beautify(true)
+    {
+    }
+
+    Callback resultCallback;
+
+    Vec3    startLocation;
+    Vec3    endLocation;
+    Vec3    endDirection;
+
+    NavigationAgentTypeID agentTypeID;
+
+    //Set beautify to false if you don't want to "beautify" the path (make it little less jagged, and more curvy)
+    bool    beautify;
+
+    int     forceTargetBuildingId;
+    float   endTolerance;
+    float   endDistance;
+    bool    allowDangerousDestination;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+
+struct IMNMPathfinder
+{
+    virtual ~IMNMPathfinder() {};
+
+    //Request a path (look at MNMPathRequest for relevant request info).  This request is queued and processed in a seperate
+    //thread.  The path result is sent to the callback function specified in the request.  Returns an ID so you can cancel
+    //the request.
+    virtual MNM::QueuedPathID RequestPathTo(const IAIPathAgent* pRequester, const MNMPathRequest& request) = 0;
+    // Returns a four-tuple: triangle ID and three vertices
+    virtual const std::tuple<uint32, Vec3, Vec3, Vec3> GetCurrentNavTriangle(const IAIPathAgent* pRequester, NavigationAgentTypeID agentTypeID) const = 0;
+
+    //Cancel a requested path by ID
+    virtual void CancelPathRequest(MNM::QueuedPathID requestId) = 0;
+
+    virtual bool CheckIfPointsAreOnStraightWalkableLine(const NavigationMeshID& meshID, const Vec3& source, const Vec3& destination, float heightOffset = 0.2f) const = 0;
+};
diff --git a/Code/Legacy/CryCommon/IPhysics.h b/Code/Legacy/CryCommon/IPhysics.h
new file mode 100644
index 0000000000..8148abacfd
--- /dev/null
+++ b/Code/Legacy/CryCommon/IPhysics.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IPHYSICS_H
+#define CRYINCLUDE_CRYCOMMON_IPHYSICS_H
+#pragma once
+
+
+//
+#ifdef PHYSICS_EXPORTS
+    #define CRYPHYSICS_API DLL_EXPORT
+#else
+    #define CRYPHYSICS_API DLL_IMPORT
+#endif
+
+#define vector_class Vec3_tpl
+
+
+#include <CrySizer.h>
+
+//////////////////////////////////////////////////////////////////////////
+// IDs that can be used for foreign id.
+//////////////////////////////////////////////////////////////////////////
+enum EPhysicsForeignIds
+{
+    PHYS_FOREIGN_ID_TERRAIN = 0,
+    PHYS_FOREIGN_ID_STATIC = 1,
+    PHYS_FOREIGN_ID_ENTITY = 2,
+    PHYS_FOREIGN_ID_FOLIAGE = 3,
+    PHYS_FOREIGN_ID_ROPE = 4,
+    PHYS_FOREIGN_ID_SOUND_OBSTRUCTION = 5,
+    PHYS_FOREIGN_ID_SOUND_PROXY_OBSTRUCTION = 6,
+    PHYS_FOREIGN_ID_SOUND_REVERB_OBSTRUCTION = 7,
+    PHYS_FOREIGN_ID_WATERVOLUME = 8,
+    PHYS_FOREIGN_ID_BREAKABLE_GLASS = 9,
+    PHYS_FOREIGN_ID_BREAKABLE_GLASS_FRAGMENT = 10,
+    PHYS_FOREIGN_ID_RIGID_PARTICLE = 11,
+    PHYS_FOREIGN_ID_RESERVED1 = 12,
+    PHYS_FOREIGN_ID_RAGDOLL = 13,
+    PHYS_FOREIGN_ID_COMPONENT_ENTITY = 14,
+
+    PHYS_FOREIGN_ID_USER = 100, // All user defined foreign ids should start from this enum.
+};
+
+
+//#include "utils.h"
+#include "Cry_Math.h"
+#include "primitives.h"
+#include <physinterface.h> // <> required for Interfuscator
+
+
+#endif // CRYINCLUDE_CRYCOMMON_IPHYSICS_H
diff --git a/Code/Legacy/CryCommon/IPostEffectGroup.h b/Code/Legacy/CryCommon/IPostEffectGroup.h
new file mode 100644
index 0000000000..b60aaf6b26
--- /dev/null
+++ b/Code/Legacy/CryCommon/IPostEffectGroup.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 <AzCore/std/containers/variant.h>
+
+typedef AZStd::variant<float, Vec4, AZStd::string> PostEffectGroupParam;
+
+// A prioritized group of postprocessing effect parameters.
+// These are defined in XML files and can be enabled or disabled using flow graph or Lua scripts.
+// Effect groups can also optionally specify blend curves to smoothly transition between effects, whether to stay enabled until explicitly disabled,
+// and whether to make effect strength based on distance from the camera.
+class IPostEffectGroup
+{
+public:
+    virtual ~IPostEffectGroup(){}
+
+    virtual const char* GetName() const = 0;
+    virtual void SetEnable(bool enable) = 0;
+    virtual bool GetEnable() const = 0;
+    virtual unsigned int GetPriority() const = 0;
+    virtual bool GetHold() const = 0;
+    virtual float GetFadeDistance() const = 0;
+    virtual void SetParam(const char* name, const PostEffectGroupParam& value) = 0;
+    virtual PostEffectGroupParam* GetParam(const char* name) = 0;
+    virtual void ClearParams() = 0;
+    // Increases the strength of the effects based on distance from the camera each time it's called. The effect strength is cleared each frame.
+    // Only applies to effect groups with the fadeDistance attribute set.
+    virtual void ApplyAtPosition(const Vec3& position) = 0;
+};
+
+typedef AZStd::list<IPostEffectGroup*> PostEffectGroupList;
+
+class IPostEffectGroupManager
+{
+public:
+    virtual ~IPostEffectGroupManager(){}
+
+    virtual IPostEffectGroup* GetGroup(const char* name) = 0;
+    virtual IPostEffectGroup* GetGroup(const unsigned int index) = 0;
+    virtual const unsigned int GetGroupCount() = 0;
+    // Returns a list of IPostEffectGroups who had their Enabled state toggled this frame
+    virtual const PostEffectGroupList& GetGroupsToggledThisFrame() = 0;
+};
diff --git a/Code/Legacy/CryCommon/IProcess.h b/Code/Legacy/CryCommon/IProcess.h
new file mode 100644
index 0000000000..d80a0f639d
--- /dev/null
+++ b/Code/Legacy/CryCommon/IProcess.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Process common interface
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IPROCESS_H
+#define CRYINCLUDE_CRYCOMMON_IPROCESS_H
+#pragma once
+
+
+// forward declaration
+struct      SRenderingPassInfo;
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+struct IProcess
+{
+    // <interfuscator:shuffle>
+    virtual ~IProcess(){}
+    virtual bool    Init() = 0;
+    virtual void    Update() = 0;
+    virtual void    RenderWorld(int nRenderFlags, const SRenderingPassInfo& passInfo, const char* szDebugName) = 0;
+    virtual void    ShutDown() = 0;
+    virtual void    SetFlags(int flags) = 0;
+    virtual int     GetFlags(void) = 0;
+    // </interfuscator:shuffle>
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_IPROCESS_H
diff --git a/Code/Legacy/CryCommon/IReadWriteXMLSink.h b/Code/Legacy/CryCommon/IReadWriteXMLSink.h
new file mode 100644
index 0000000000..fba5841a56
--- /dev/null
+++ b/Code/Legacy/CryCommon/IReadWriteXMLSink.h
@@ -0,0 +1,104 @@
+/*
+ * 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 : Moved Craig's ReadWriteXMLSink from CryAction to CrySystem
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IREADWRITEXMLSINK_H
+#define CRYINCLUDE_CRYCOMMON_IREADWRITEXMLSINK_H
+#pragma once
+
+#include <IXml.h>
+#include <AzCore/std/containers/variant.h>
+
+struct IReadXMLSink;
+struct IWriteXMLSource;
+
+struct IReadWriteXMLSink
+{
+    // <interfuscator:shuffle>
+    virtual ~IReadWriteXMLSink(){}
+    virtual bool ReadXML(const char* definitionFile, const char* dataFile, IReadXMLSink* pSink) = 0;
+    virtual bool ReadXML(const char* definitionFile, XmlNodeRef node, IReadXMLSink* pSink) = 0;
+    virtual bool ReadXML(XmlNodeRef definition, const char* dataFile, IReadXMLSink* pSink) = 0;
+    virtual bool ReadXML(XmlNodeRef definition, XmlNodeRef node, IReadXMLSink* pSink) = 0;
+
+    virtual XmlNodeRef CreateXMLFromSource(const char* definitionFile, IWriteXMLSource* pSource) = 0;
+    virtual bool WriteXML(const char* definitionFile, const char* dataFile, IWriteXMLSource* pSource) = 0;
+    // </interfuscator:shuffle>
+};
+
+
+struct SReadWriteXMLCommon
+{
+    typedef AZStd::variant<Vec3, int, float, const char*, bool> TValue;
+};
+
+
+TYPEDEF_AUTOPTR(IReadXMLSink);
+typedef IReadXMLSink_AutoPtr IReadXMLSinkPtr;
+
+// this interface allows customization of the data read routines
+struct IReadXMLSink
+    : public SReadWriteXMLCommon
+{
+    // <interfuscator:shuffle>
+    virtual ~IReadXMLSink(){}
+    // reference counting
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+
+    virtual IReadXMLSinkPtr BeginTable(const char* name, const XmlNodeRef& definition) = 0;
+    virtual IReadXMLSinkPtr BeginTableAt(int elem, const XmlNodeRef& definition) = 0;
+    virtual bool SetValue(const char* name, const TValue& value, const XmlNodeRef& definition) = 0;
+    virtual bool EndTableAt(int elem) = 0;
+    virtual bool EndTable(const char* name) = 0;
+
+    virtual IReadXMLSinkPtr BeginArray(const char* name, const XmlNodeRef& definition) = 0;
+    virtual bool SetAt(int elem, const TValue& value, const XmlNodeRef& definition) = 0;
+    virtual bool EndArray(const char* name) = 0;
+
+    virtual bool Complete() = 0;
+
+    virtual bool IsCreationMode() = 0;
+    virtual XmlNodeRef GetCreationNode() = 0;
+    virtual void SetCreationNode(XmlNodeRef definition) = 0;
+    // </interfuscator:shuffle>
+};
+
+
+TYPEDEF_AUTOPTR(IWriteXMLSource);
+typedef IWriteXMLSource_AutoPtr IWriteXMLSourcePtr;
+
+// this interface allows customization of the data write routines
+struct IWriteXMLSource
+    : public SReadWriteXMLCommon
+{
+    // <interfuscator:shuffle>
+    virtual ~IWriteXMLSource(){}
+    // reference counting
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+
+    virtual IWriteXMLSourcePtr BeginTable(const char* name) = 0;
+    virtual IWriteXMLSourcePtr BeginTableAt(int elem) = 0;
+    virtual bool HaveValue(const char* name) = 0;
+    virtual bool GetValue(const char* name, TValue& value, const XmlNodeRef& definition) = 0;
+    virtual bool EndTableAt(int elem) = 0;
+    virtual bool EndTable(const char* name) = 0;
+
+    virtual IWriteXMLSourcePtr BeginArray(const char* name, size_t* numElems, const XmlNodeRef& definition) = 0;
+    virtual bool HaveElemAt(int elem) = 0;
+    virtual bool GetAt(int elem, TValue& value, const XmlNodeRef& definition) = 0;
+    virtual bool EndArray(const char* name) = 0;
+
+    virtual bool Complete() = 0;
+    // </interfuscator:shuffle>
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_IREADWRITEXMLSINK_H
diff --git a/Code/Legacy/CryCommon/IRenderAuxGeom.h b/Code/Legacy/CryCommon/IRenderAuxGeom.h
new file mode 100644
index 0000000000..4382a4fcb5
--- /dev/null
+++ b/Code/Legacy/CryCommon/IRenderAuxGeom.h
@@ -0,0 +1,837 @@
+/*
+ * 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_IRENDERAUXGEOM_H
+#define CRYINCLUDE_CRYCOMMON_IRENDERAUXGEOM_H
+#pragma once
+
+
+struct SAuxGeomRenderFlags;
+
+#include "IRenderer.h"
+
+
+enum EBoundingBoxDrawStyle
+{
+    eBBD_Faceted,
+    eBBD_Extremes_Color_Encoded
+};
+
+// Summary:
+//   Auxiliary geometry render interface.
+// Description:
+//   Used mostly for debugging, editor purposes, the Auxiliary geometry render
+//   interface provide functions to render 2d geometry and also text.
+struct IRenderAuxGeom
+{
+    // <interfuscator:shuffle>
+    virtual ~IRenderAuxGeom(){}
+    // Summary:
+    //   Sets render flags.
+    virtual void SetRenderFlags(const SAuxGeomRenderFlags& renderFlags) = 0;
+    // Summary:
+    //   Gets render flags.
+    virtual SAuxGeomRenderFlags GetRenderFlags() = 0;
+
+    // 2D/3D rendering function
+
+    // Summary:
+    //   Draws a point.
+    // Arguments:
+    //   v          - Vector storing the position of the point.
+    //   col        - Color used to draw the point.
+    //   size       - Size of the point drawn.
+    virtual void DrawPoint(const Vec3& v, const ColorB& col, uint8 size = 1) = 0;
+    // Summary:
+    //   Draws n points.
+    // Arguments:
+    //   v          - Pointer to a list of vector storing the position of the points.
+    //   numPoints  - Number of point we will find starting from the area memory defined by v.
+    //   col        - Color used to draw the points.
+    //   size       - Size of the points drawn.
+    //##@{
+    virtual void DrawPoints(const Vec3* v, uint32 numPoints, const ColorB& col, uint8 size = 1) = 0;
+    virtual void DrawPoints(const Vec3* v, uint32 numPoints, const ColorB* col, uint8 size = 1) = 0;
+    //##@}
+
+    // Summary:
+    //   Draws a line.
+    // Arguments:
+    //   v0         - Starting vertex of the line.
+    //   colV0      - Color of the first vertex.
+    //   v1         - Ending vertex of the line.
+    //   colV1      - Color of the second vertex.
+    //   thickness  - Thickness of the line.
+    virtual void DrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, float thickness = 1.0f) = 0;
+    // Summary:
+    //   Draws n lines.
+    // Arguments:
+    //   v          - List of vertexes belonging to the lines we want to draw.
+    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
+    //   col        - Color of the vertexes.
+    //   thickness  - Thickness of the line.
+    //##@{
+    virtual void DrawLines(const Vec3* v, uint32 numPoints, const ColorB& col, float thickness = 1.0f) = 0;
+    virtual void DrawLines(const Vec3* v, uint32 numPoints, const ColorB* col, float thickness = 1.0f) = 0;
+    //##@}
+
+    // Summary:
+    //   Draws n lines.
+    // Arguments:
+    //   v          - List of vertexes belonging to the lines we want to draw.
+    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
+    //   ind        -
+    //   numIndices -
+    //   col        - Color of the vertexes.
+    //   thickness  - Thickness of the line.
+    //##@{
+    virtual void DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col, float thickness = 1.0f) = 0;
+    virtual void DrawLines(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col, float thickness = 1.0f) = 0;
+    //##@}
+
+    // Summary:
+    //   Draws a polyline.
+    // Arguments:
+    //   v          - List of vertexes belonging to the polyline we want to draw.
+    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
+    //   closed     - If true a line between the last vertex and the first one is drawn.
+    //   col        - Color of the vertexes.
+    //   thickness  - Thickness of the line.
+    //##@{
+    virtual void DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB& col, float thickness = 1.0f) = 0;
+    virtual void DrawPolyline(const Vec3* v, uint32 numPoints, bool closed, const ColorB* col, float thickness = 1.0f) = 0;
+    //##@}
+
+    // Summary:
+    //   Draws a triangle.
+    // Arguments:
+    //   v0         - First vertex of the triangle.
+    //   colV0      - Color of the first vertex of the triangle.
+    //   v1         - Second vertex of the triangle.
+    //   colV1      - Color of the second vertex of the triangle.
+    //   v2         - Third vertex of the triangle.
+    //   colV2      - Color of the third vertex of the triangle.
+    virtual void DrawTriangle(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1, const Vec3& v2, const ColorB& colV2) = 0;
+    // Summary:
+    //   Draws n triangles.
+    // Arguments:
+    //   v          - List of vertexes belonging to the sequence of triangles we have to draw.
+    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
+    //   col        - Color of the vertexes.
+    //##@{
+    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB& col) = 0;
+    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const ColorB* col) = 0;
+    //##@}
+    // Summary:
+    //   Draws n triangles.
+    // Arguments:
+    //   v          - List of vertexes belonging to the sequence of triangles we have to draw.
+    //   numPoints  - Number of the points we will find starting from the area memory defined by v.
+    //   ind        -
+    //   numIndices -
+    //   col        - Color of the vertexes.
+    //##@{
+    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB& col) = 0;
+    virtual void DrawTriangles(const Vec3* v, uint32 numPoints, const vtx_idx* ind, uint32 numIndices, const ColorB* col) = 0;
+    //##@}
+
+    // Summary:
+    //   Draws a quad on the xz plane.
+    // Arguments:
+    //   pos        - Center position of the quad
+    //   width      - Width of the quad.
+    //   height     - Height of the quad.
+    //   matWorld   - World matrix to transform the quad.
+    //   col        - Color of the quad.
+    //   drawShaded - True if you want to draw the quad shaded, false otherwise.
+    virtual void DrawQuad(float width, float height, const Matrix34& matWorld, const ColorB& col, bool drawShaded = true) = 0;
+
+    // Summary:
+    //   Draws a Axis-aligned Bounding Boxes (AABB).
+    //##@{
+    virtual void DrawAABB(const AABB& aabb, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
+    virtual void DrawAABBs(const AABB* aabbs, uint32 aabbCount, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
+    virtual void DrawAABB(const AABB& aabb, const Matrix34& matWorld, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
+    //##@}
+
+    // Summary:
+    //   Draws a Oriented Bounding Boxes (AABB).
+    //##@{
+    virtual void DrawOBB(const OBB& obb, const Vec3& pos, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
+    virtual void DrawOBB(const OBB& obb, const Matrix34& matWorld, bool bSolid, const ColorB& col, const EBoundingBoxDrawStyle& bbDrawStyle) = 0;
+    //##@}
+
+    // Summary:
+    //   Draws a sphere.
+    // Arguments:
+    //   pos        - Center of the sphere.
+    //   radius     - Radius of the sphere.
+    //   col        - Color of the sphere.
+    //   drawShaded - True if you want to draw the sphere shaded, false otherwise.
+    virtual void DrawSphere(const Vec3& pos, float radius, const ColorB& col, bool drawShaded = true) = 0;
+
+    // Summary:
+    //   Draws a disk.
+    // Arguments:
+    //   pos        - Center of the disk.
+    //   radius     - Radius of the disk.
+    //   col        - Color of the disk.
+    //   drawShaded - True if you want to draw the disk shaded, false otherwise.
+    virtual void DrawDisk(const Vec3& pos, const Vec3& dir, float radius, const ColorB& col, bool drawShaded = true) = 0;
+
+    // Summary:
+    //   Draws a cone.
+    // Arguments:
+    //   pos        - Center of the base of the cone.
+    //   dir        - Direction of the cone.
+    //   radius     - Radius of the base of the cone.
+    //   height     - Height of the cone.
+    //   col        - Color of the cone.
+    //   drawShaded - True if you want to draw the cone shaded, false otherwise.
+    virtual void DrawCone(const Vec3& pos, const Vec3& dir, float radius, float height, const ColorB& col, bool drawShaded = true) = 0;
+    // Summary:
+    //   Draws a cylinder.
+    // Arguments:
+    //   pos        - Center of the base of the cylinder.
+    //   dir        - Direction of the cylinder.
+    //   radius     - Radius of the base of the cylinder.
+    //   height     - Height of the cylinder.
+    //   col        - Color of the cylinder.
+    //   drawShaded - True if you want to draw the cylinder shaded, false otherwise.
+    virtual void DrawCylinder(const Vec3& pos, const Vec3& dir, float radius, float height, const ColorB& col, bool drawShaded = true) = 0;
+
+    // Summary:
+    //   Draws bones.
+    //##@{
+    virtual void DrawBone(const Vec3& rParent, const Vec3& rBone, ColorB col) = 0;
+    //##@}
+
+    // Summary:
+    //   Draws Text.
+    //##@{
+    virtual void RenderText(Vec3 pos, SDrawTextInfo& ti, const char* format, va_list args) = 0;
+
+    // Summary:
+    //   Draws 3d Label.
+    //##@{
+    void Draw3dLabel(Vec3 pos, float font_size, const ColorF& color, const char* label_text, ...) PRINTF_PARAMS(5, 6)
+    {
+        va_list args;
+        va_start(args, label_text);
+
+        SDrawTextInfo ti;
+        ti.xscale = ti.yscale = font_size;
+        ti.color[0] = color[0];
+        ti.color[1] = color[1];
+        ti.color[2] = color[2];
+        ti.color[3] = color[3];
+        ti.flags = eDrawText_2D | eDrawText_FixedSize | eDrawText_Monospace;
+
+        RenderText(pos, ti, label_text, args);
+
+        va_end(args);
+    }
+
+    void Draw2dLabelInternal(float x, float y, float font_size, const float* pfColor, int flags, const char* format, va_list args)
+    {
+        SDrawTextInfo ti;
+        ti.xscale = ti.yscale = font_size;
+        ti.flags = (eDrawText_2D | eDrawText_800x600 | eDrawText_FixedSize | flags);
+        if (pfColor)
+        {
+            ti.color[0] = pfColor[0];
+            ti.color[1] = pfColor[1];
+            ti.color[2] = pfColor[2];
+            ti.color[3] = pfColor[3];
+        }
+
+        RenderText(Vec3(x, y, 0.5f), ti, format, args);
+    }
+
+    void Draw2dLabel(float x, float y, float font_size, const float* pfColor, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        va_list args;
+        va_start(args, label_text);
+        Draw2dLabelInternal(x, y, font_size, pfColor, (bCenter ? eDrawText_Center : eDrawText_Left), label_text, args);
+        va_end(args);
+    }
+
+    void Draw2dLabel(float x, float y, float font_size, const ColorF& fColor, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        const AZStd::array<float, 4> color = fColor.GetAsArray();
+        va_list args;
+        va_start(args, label_text);
+        Draw2dLabelInternal(x, y, font_size, color.data(), (bCenter ? eDrawText_Center : eDrawText_Left), label_text, args);
+        va_end(args);
+    }
+
+    void Draw2dLabelCustom(float x, float y, float font_size, const float* pfColor, int flags, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        va_list args;
+        va_start(args, label_text);
+        Draw2dLabelInternal(x, y, font_size, pfColor, flags, label_text, args);
+        va_end(args);
+    }
+
+    void Draw2dLabelCustom(float x, float y, float font_size, const ColorF& fColor, int flags, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        const AZStd::array<float, 4> color = fColor.GetAsArray();
+        va_list args;
+        va_start(args, label_text);
+        Draw2dLabelInternal(x, y, font_size, color.data(), flags, label_text, args);
+        va_end(args);
+    }
+    //##@}
+
+    // Summary:
+    //   If possible flushes all elements stored on the buffer to rendering system.
+    //   Note 1: rendering system may start processing flushed commands immediately or postpone it till Commit() call
+    //   Note 2: worker threads's commands are always postponed till Commit() call
+    //
+    virtual void Flush() = 0;
+    // </interfuscator:shuffle>
+
+    // Summary:
+    //   Flushes yet unprocessed elements and notifies rendering system that issuing rendering commands for current frame is done and frame is ready to be drawn
+    //   Thus Commit() guarantees that all previously issued commands will appear on the screen
+    //   Each thread rendering AUX geometry MUST call Commit() at the end of drawing cycle/frame
+    //   "frames" indicate how many frames current commands butch must be presented on screen unless there till next butch is ready.
+    //   for render and main thread this parameter has no effect
+    virtual void Commit(uint frames = 0) = 0;
+    // </interfuscator:shuffle>
+
+    /**
+    * Processes and resets the underlying vertex buffer
+    */
+    virtual void Process() = 0;
+};
+
+// Notes:
+//   Don't change the xxxShift values blindly as they affect the rendering output
+//   that is two primitives have to be rendered after 3d primitives, alpha blended
+//   geometry have to be rendered after opaque ones, etc.
+//   This also applies to the individual flags in EAuxGeomPublicRenderflags_*!
+// Remarks:
+//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
+//   Check RenderAuxGeom.h in ../RenderDll/Common
+enum EAuxGeomPublicRenderflagBitMasks
+{
+    e_Mode2D3DShift             = 31,
+    e_Mode2D3DMask              = 0x1 << e_Mode2D3DShift,
+
+    e_AlphaBlendingShift        = 29,
+    e_AlphaBlendingMask         = 0x3 << e_AlphaBlendingShift,
+
+    e_DrawInFrontShift          = 28,
+    e_DrawInFrontMask           = 0x1 << e_DrawInFrontShift,
+
+    e_FillModeShift             = 26,
+    e_FillModeMask              = 0x3 << e_FillModeShift,
+
+    e_CullModeShift             = 24,
+    e_CullModeMask              = 0x3 << e_CullModeShift,
+
+    e_DepthWriteShift           = 23,
+    e_DepthWriteMask            = 0x1 << e_DepthWriteShift,
+
+    e_DepthTestShift            = 22,
+    e_DepthTestMask             = 0x1 << e_DepthTestShift,
+
+    e_PublicParamsMask      = e_Mode2D3DMask | e_AlphaBlendingMask | e_DrawInFrontMask | e_FillModeMask |
+        e_CullModeMask | e_DepthWriteMask | e_DepthTestMask
+};
+
+// Notes:
+//   e_Mode2D renders in normalized [0.. 1] screen space.
+//   Don't change the xxxShift values blindly as they affect the rendering output
+//   that is two primitives have to be rendered after 3d primitives, alpha blended
+//   geometry have to be rendered after opaque ones, etc.
+//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
+// Remarks:
+//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
+//   Check RenderAuxGeom.h in ../RenderDll/Common
+// See also:
+//   EAuxGeomPublicRenderflagBitMasks
+enum EAuxGeomPublicRenderflags_Mode2D3D
+{
+    e_Mode3D                            = 0x0 << e_Mode2D3DShift,
+    e_Mode2D                            = 0x1 << e_Mode2D3DShift,
+};
+
+// Notes:
+//   Don't change the xxxShift values blindly as they affect the rendering output
+//   that is two primitives have to be rendered after 3d primitives, alpha blended
+//   geometry have to be rendered after opaque ones, etc.
+//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
+// Remarks:
+//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
+//   Check RenderAuxGeom.h in ../RenderDll/Common
+// See also:
+//   EAuxGeomPublicRenderflagBitMasks
+enum EAuxGeomPublicRenderflags_AlphaBlendMode
+{
+    e_AlphaNone                     = 0x0 << e_AlphaBlendingShift,
+    e_AlphaAdditive             = 0x1 << e_AlphaBlendingShift,
+    e_AlphaBlended              = 0x2 << e_AlphaBlendingShift,
+};
+
+// Notes:
+//   Don't change the xxxShift values blindly as they affect the rendering output
+//   that is two primitives have to be rendered after 3d primitives, alpha blended
+//   geometry have to be rendered after opaque ones, etc.
+//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
+// Remarks:
+//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
+//   Check RenderAuxGeom.h in ../RenderDll/Common
+// See also:
+//   EAuxGeomPublicRenderflagBitMasks
+enum EAuxGeomPublicRenderflags_DrawInFrontMode
+{
+    e_DrawInFrontOff            = 0x0 << e_DrawInFrontShift,
+    e_DrawInFrontOn             = 0x1 << e_DrawInFrontShift,
+};
+
+// Notes:
+//   Don't change the xxxShift values blindly as they affect the rendering output
+//   that is two primitives have to be rendered after 3d primitives, alpha blended
+//   geometry have to be rendered after opaque ones, etc.
+//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
+// Remarks:
+//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
+//   Check RenderAuxGeom.h in ../RenderDll/Common
+// See also:
+//   EAuxGeomPublicRenderflagBitMasks
+enum EAuxGeomPublicRenderflags_FillMode
+{
+    e_FillModeSolid             = 0x0 << e_FillModeShift,
+    e_FillModeWireframe     = 0x1 << e_FillModeShift,
+    e_FillModePoint             = 0x2 << e_FillModeShift,
+};
+
+// Notes:
+//   Don't change the xxxShift values blindly as they affect the rendering output
+//   that is two primitives have to be rendered after 3d primitives, alpha blended
+//   geometry have to be rendered after opaque ones, etc.
+//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
+// Remarks:
+//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
+//   Check RenderAuxGeom.h in ../RenderDll/Common
+// See also:
+//   EAuxGeomPublicRenderflagBitMasks
+enum EAuxGeomPublicRenderflags_CullMode
+{
+    e_CullModeNone              = 0x0 << e_CullModeShift,
+    e_CullModeFront             = 0x1 << e_CullModeShift,
+    e_CullModeBack              = 0x2 << e_CullModeShift,
+};
+
+// Notes:
+//   Don't change the xxxShift values blindly as they affect the rendering output
+//   that is two primitives have to be rendered after 3d primitives, alpha blended
+//   geometry have to be rendered after opaque ones, etc.
+//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
+// Remarks:
+//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
+//   Check RenderAuxGeom.h in ../RenderDll/Common
+// See also:
+//   EAuxGeomPublicRenderflagBitMasks
+enum EAuxGeomPublicRenderflags_DepthWrite
+{
+    e_DepthWriteOn              = 0x0 << e_DepthWriteShift,
+    e_DepthWriteOff             = 0x1 << e_DepthWriteShift,
+};
+
+// Notes:
+//   Don't change the xxxShift values blindly as they affect the rendering output
+//   that is two primitives have to be rendered after 3d primitives, alpha blended
+//   geometry have to be rendered after opaque ones, etc.
+//   This also applies to the individual flags in EAuxGeomPublicRenderflagBitMasks!
+// Remarks:
+//   Bits 0 - 22 are currently reserved for prim type and per draw call render parameters (point size, etc.)
+//   Check RenderAuxGeom.h in ../RenderDll/Common
+// See also:
+//   EAuxGeomPublicRenderflagBitMasks
+enum EAuxGeomPublicRenderflags_DepthTest
+{
+    e_DepthTestOn                   = 0x0 << e_DepthTestShift,
+    e_DepthTestOff              = 0x1 << e_DepthTestShift,
+};
+
+
+enum EAuxGeomPublicRenderflags_Defaults
+{
+    // Default render flags for 3d primitives.
+    e_Def3DPublicRenderflags = e_Mode3D | e_AlphaNone | e_DrawInFrontOff | e_FillModeSolid |
+        e_CullModeBack | e_DepthWriteOn | e_DepthTestOn,
+
+    // Default render flags for 2d primitives.
+    e_Def2DPublicRenderflags = e_Mode2D | e_AlphaNone | e_DrawInFrontOff | e_FillModeSolid |
+        e_CullModeBack | e_DepthWriteOn | e_DepthTestOn
+};
+
+
+struct SAuxGeomRenderFlags
+{
+    uint32 m_renderFlags;
+
+    SAuxGeomRenderFlags();
+    SAuxGeomRenderFlags(const SAuxGeomRenderFlags& rhs);
+    SAuxGeomRenderFlags(uint32 renderFlags);
+    SAuxGeomRenderFlags& operator =(const SAuxGeomRenderFlags& rhs);
+    SAuxGeomRenderFlags& operator =(uint32 rhs);
+
+    bool operator ==(const SAuxGeomRenderFlags& rhs) const;
+    bool operator ==(uint32 rhs) const;
+    bool operator !=(const SAuxGeomRenderFlags& rhs) const;
+    bool operator !=(uint32 rhs) const;
+
+    // Summary:
+    //   Gets the flags for 2D/3D rendering mode.
+    EAuxGeomPublicRenderflags_Mode2D3D GetMode2D3DFlag() const;
+    // Summary:
+    //   Sets the flags for 2D/3D rendering mode.
+    void SetMode2D3DFlag(const EAuxGeomPublicRenderflags_Mode2D3D& state);
+
+    // Summary:
+    //   Gets the flags for alpha blend mode.
+    EAuxGeomPublicRenderflags_AlphaBlendMode GetAlphaBlendMode() const;
+    // Summary:
+    //   Sets the flags for the alpha blend mode.
+    void SetAlphaBlendMode(const EAuxGeomPublicRenderflags_AlphaBlendMode& state);
+
+
+    EAuxGeomPublicRenderflags_DrawInFrontMode GetDrawInFrontMode() const;
+    void SetDrawInFrontMode(const EAuxGeomPublicRenderflags_DrawInFrontMode& state);
+
+    // Summary:
+    //   Gets the flags for the filling mode.
+    EAuxGeomPublicRenderflags_FillMode GetFillMode() const;
+    // Summary:
+    //   Sets the flags for the filling mode.
+    void SetFillMode(const EAuxGeomPublicRenderflags_FillMode& state);
+
+    // Summary:
+    //   Gets the flags for the culling mode.
+    EAuxGeomPublicRenderflags_CullMode GetCullMode() const;
+    // Summary:
+    //   Sets the flags for the culling mode.
+    void SetCullMode(const EAuxGeomPublicRenderflags_CullMode& state);
+
+
+    EAuxGeomPublicRenderflags_DepthWrite GetDepthWriteFlag() const;
+    void SetDepthWriteFlag(const EAuxGeomPublicRenderflags_DepthWrite& state);
+
+    // Summary:
+    //   Gets the flags for the depth test.
+    EAuxGeomPublicRenderflags_DepthTest GetDepthTestFlag() const;
+    // Summary:
+    //   Sets the flags for the depth test.
+    void SetDepthTestFlag(const EAuxGeomPublicRenderflags_DepthTest& state);
+};
+
+
+inline
+SAuxGeomRenderFlags::SAuxGeomRenderFlags()
+    : m_renderFlags(e_Def3DPublicRenderflags)
+{
+}
+
+inline
+SAuxGeomRenderFlags::SAuxGeomRenderFlags(const SAuxGeomRenderFlags& rhs)
+    : m_renderFlags(rhs.m_renderFlags)
+{
+}
+
+
+inline
+SAuxGeomRenderFlags::SAuxGeomRenderFlags(uint32 renderFlags)
+    : m_renderFlags(renderFlags)
+{
+}
+
+
+inline SAuxGeomRenderFlags&
+SAuxGeomRenderFlags::operator =(const SAuxGeomRenderFlags& rhs)
+{
+    m_renderFlags = rhs.m_renderFlags;
+    return(*this);
+}
+
+
+inline SAuxGeomRenderFlags&
+SAuxGeomRenderFlags::operator =(uint32 rhs)
+{
+    m_renderFlags = rhs;
+    return(*this);
+}
+
+
+inline bool
+SAuxGeomRenderFlags::operator ==(const SAuxGeomRenderFlags& rhs) const
+{
+    return(m_renderFlags == rhs.m_renderFlags);
+}
+
+
+inline bool
+SAuxGeomRenderFlags::operator ==(uint32 rhs) const
+{
+    return(m_renderFlags == rhs);
+}
+
+
+inline bool
+SAuxGeomRenderFlags::operator !=(const SAuxGeomRenderFlags& rhs) const
+{
+    return(m_renderFlags != rhs.m_renderFlags);
+}
+
+
+inline bool
+SAuxGeomRenderFlags::operator !=(uint32 rhs) const
+{
+    return(m_renderFlags != rhs);
+}
+
+
+inline EAuxGeomPublicRenderflags_Mode2D3D
+SAuxGeomRenderFlags::GetMode2D3DFlag() const
+{
+    int mode2D3D((int)(m_renderFlags & (uint32)e_Mode2D3DMask));
+    switch (mode2D3D)
+    {
+    case e_Mode2D:
+    {
+        return(e_Mode2D);
+    }
+    case e_Mode3D:
+    default:
+    {
+        assert(e_Mode3D == mode2D3D);
+        return(e_Mode3D);
+    }
+    }
+}
+
+
+inline void
+SAuxGeomRenderFlags::SetMode2D3DFlag(const EAuxGeomPublicRenderflags_Mode2D3D& state)
+{
+    m_renderFlags &= ~e_Mode2D3DMask;
+    m_renderFlags |= state;
+}
+
+
+inline EAuxGeomPublicRenderflags_AlphaBlendMode
+SAuxGeomRenderFlags::GetAlphaBlendMode() const
+{
+    uint32 alphaBlendMode(m_renderFlags & e_AlphaBlendingMask);
+    switch (alphaBlendMode)
+    {
+    case e_AlphaAdditive:
+    {
+        return(e_AlphaAdditive);
+    }
+    case e_AlphaBlended:
+    {
+        return(e_AlphaBlended);
+    }
+    case e_AlphaNone:
+    default:
+    {
+        assert(e_AlphaNone == alphaBlendMode);
+        return(e_AlphaNone);
+    }
+    }
+}
+
+
+inline void
+SAuxGeomRenderFlags::SetAlphaBlendMode(const EAuxGeomPublicRenderflags_AlphaBlendMode& state)
+{
+    m_renderFlags &= ~e_AlphaBlendingMask;
+    m_renderFlags |= state;
+}
+
+
+inline EAuxGeomPublicRenderflags_DrawInFrontMode
+SAuxGeomRenderFlags::GetDrawInFrontMode() const
+{
+    uint32 drawInFrontMode(m_renderFlags & e_DrawInFrontMask);
+    switch (drawInFrontMode)
+    {
+    case e_DrawInFrontOff:
+    {
+        return(e_DrawInFrontOff);
+    }
+    case e_DrawInFrontOn:
+    default:
+    {
+        assert(e_DrawInFrontOn == drawInFrontMode);
+        return(e_DrawInFrontOn);
+    }
+    }
+}
+
+
+inline void
+SAuxGeomRenderFlags::SetDrawInFrontMode(const EAuxGeomPublicRenderflags_DrawInFrontMode& state)
+{
+    m_renderFlags &= ~e_DrawInFrontMask;
+    m_renderFlags |= state;
+}
+
+
+inline EAuxGeomPublicRenderflags_FillMode
+SAuxGeomRenderFlags::GetFillMode() const
+{
+    uint32 fillMode(m_renderFlags & e_FillModeMask);
+    switch (fillMode)
+    {
+    case e_FillModePoint:
+    {
+        return(e_FillModePoint);
+    }
+    case e_FillModeWireframe:
+    {
+        return(e_FillModeWireframe);
+    }
+    case e_FillModeSolid:
+    default:
+    {
+        assert(e_FillModeSolid == fillMode);
+        return(e_FillModeSolid);
+    }
+    }
+}
+
+
+inline void
+SAuxGeomRenderFlags::SetFillMode(const EAuxGeomPublicRenderflags_FillMode& state)
+{
+    m_renderFlags &= ~e_FillModeMask;
+    m_renderFlags |= state;
+}
+
+
+inline EAuxGeomPublicRenderflags_CullMode
+SAuxGeomRenderFlags::GetCullMode() const
+{
+    uint32 cullMode(m_renderFlags & e_CullModeMask);
+    switch (cullMode)
+    {
+    case e_CullModeNone:
+    {
+        return(e_CullModeNone);
+    }
+    case e_CullModeFront:
+    {
+        return(e_CullModeFront);
+    }
+    case e_CullModeBack:
+    default:
+    {
+        assert(e_CullModeBack == cullMode);
+        return(e_CullModeBack);
+    }
+    }
+}
+
+
+inline void
+SAuxGeomRenderFlags::SetCullMode(const EAuxGeomPublicRenderflags_CullMode& state)
+{
+    m_renderFlags &= ~e_CullModeMask;
+    m_renderFlags |= state;
+}
+
+
+inline EAuxGeomPublicRenderflags_DepthWrite
+SAuxGeomRenderFlags::GetDepthWriteFlag() const
+{
+    uint32 depthWriteFlag(m_renderFlags & e_DepthWriteMask);
+    switch (depthWriteFlag)
+    {
+    case e_DepthWriteOff:
+    {
+        return(e_DepthWriteOff);
+    }
+    case e_DepthWriteOn:
+    default:
+    {
+        assert(e_DepthWriteOn == depthWriteFlag);
+        return(e_DepthWriteOn);
+    }
+    }
+}
+
+
+inline void
+SAuxGeomRenderFlags::SetDepthWriteFlag(const EAuxGeomPublicRenderflags_DepthWrite& state)
+{
+    m_renderFlags &= ~e_DepthWriteMask;
+    m_renderFlags |= state;
+}
+
+
+inline EAuxGeomPublicRenderflags_DepthTest
+SAuxGeomRenderFlags::GetDepthTestFlag() const
+{
+    uint32 depthTestFlag(m_renderFlags & e_DepthTestMask);
+    switch (depthTestFlag)
+    {
+    case e_DepthTestOff:
+    {
+        return(e_DepthTestOff);
+    }
+    case e_DepthTestOn:
+    default:
+    {
+        assert(e_DepthTestOn == depthTestFlag);
+        return(e_DepthTestOn);
+    }
+    }
+}
+
+
+inline void
+SAuxGeomRenderFlags::SetDepthTestFlag(const EAuxGeomPublicRenderflags_DepthTest& state)
+{
+    m_renderFlags &= ~e_DepthTestMask;
+    m_renderFlags |= state;
+}
+
+
+class CRenderAuxGeomRenderFlagsRestore
+{
+public:
+    explicit CRenderAuxGeomRenderFlagsRestore(IRenderAuxGeom* pRender);
+    ~CRenderAuxGeomRenderFlagsRestore();
+
+private:
+    IRenderAuxGeom* m_pRender;
+    SAuxGeomRenderFlags m_backuppedRenderFlags;
+
+    // copy-construction not supported
+    CRenderAuxGeomRenderFlagsRestore(const CRenderAuxGeomRenderFlagsRestore&);
+    CRenderAuxGeomRenderFlagsRestore& operator=(const CRenderAuxGeomRenderFlagsRestore&);
+};
+
+inline CRenderAuxGeomRenderFlagsRestore::CRenderAuxGeomRenderFlagsRestore(IRenderAuxGeom* pRender)
+{
+    m_pRender = pRender;
+    m_backuppedRenderFlags = m_pRender->GetRenderFlags();
+}
+
+inline CRenderAuxGeomRenderFlagsRestore::~CRenderAuxGeomRenderFlagsRestore()
+{
+    m_pRender->SetRenderFlags(m_backuppedRenderFlags);
+}
+
+
+#endif // CRYINCLUDE_CRYCOMMON_IRENDERAUXGEOM_H
diff --git a/Code/Legacy/CryCommon/IRenderMesh.h b/Code/Legacy/CryCommon/IRenderMesh.h
new file mode 100644
index 0000000000..4147c4b495
--- /dev/null
+++ b/Code/Legacy/CryCommon/IRenderMesh.h
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IRENDERMESH_H
+#define CRYINCLUDE_CRYCOMMON_IRENDERMESH_H
+#pragma once
+
+#include "VertexFormats.h"
+#include <IMaterial.h>
+#include <IShader.h>
+#include <IRenderer.h>  // PublicRenderPrimitiveType
+#include <Cry_Geo.h>
+#include <CryArray.h>
+#include <ITimer.h>
+
+class CMesh;
+struct CRenderChunk;
+class CRenderObject;
+struct SSkinningData;
+struct IMaterial;
+struct IShader;
+struct IIndexedMesh;
+struct SMRendTexVert;
+struct UCol;
+struct GeomInfo;
+
+struct TFace;
+struct SMeshSubset;
+struct SRenderingPassInfo;
+struct SRendItemSorter;
+struct SRenderObjectModifier;
+
+namespace AZ
+{
+    namespace Vertex
+    {
+        class Format;
+    }
+}
+
+enum eRenderPrimitiveType : int8;
+
+// Keep this in sync with BUFFER_USAGE hints DevBuffer.h
+enum ERenderMeshType
+{
+    eRMT_Immmutable = 0,
+    eRMT_Static = 1,
+    eRMT_Dynamic = 2,
+    eRMT_Transient = 3,
+};
+
+
+#define FSM_VERTEX_VELOCITY 1
+#define FSM_NO_TANGENTS   2
+#define FSM_CREATE_DEVICE_MESH 4
+#define FSM_SETMESH_ASYNC 8
+#define FSM_ENABLE_NORMALSTREAM 16
+#define FSM_IGNORE_TEXELDENSITY 32
+
+// Invalidate video buffer flags
+#define FMINV_STREAM      1
+#define FMINV_STREAM_MASK ((1 << VSF_NUM) - 1)
+#define FMINV_INDICES     0x100
+#define FMINV_ALL        -1
+
+// Stream lock flags
+#define  FSL_READ             0x01
+#define  FSL_WRITE            0x02
+#define  FSL_DYNAMIC          0x04
+#define  FSL_DISCARD          0x08
+#define  FSL_VIDEO            0x10
+#define  FSL_SYSTEM           0x20
+#define  FSL_INSTANCED        0x40
+#define  FSL_NONSTALL_MAP     0x80   // Map must not stall for VB/IB locking
+#define  FSL_VBIBPUSHDOWN     0x100  // Push down from vram on demand if target architecture supports it, used internally
+#define  FSL_DIRECT           0x200  // Access VRAM directly if target architecture supports it, used internally
+#define  FSL_LOCKED           0x400  // Internal use
+#define  FSL_SYSTEM_CREATE    (FSL_WRITE | FSL_DISCARD | FSL_SYSTEM)
+#define  FSL_SYSTEM_UPDATE    (FSL_WRITE | FSL_SYSTEM)
+#define  FSL_VIDEO_CREATE     (FSL_WRITE | FSL_DISCARD | FSL_VIDEO)
+#define  FSL_VIDEO_UPDATE     (FSL_WRITE | FSL_VIDEO)
+
+#define FSL_ASYNC_DEFER_COPY  (1u << 1)
+#define FSL_FREE_AFTER_ASYNC (2u << 1)
+
+struct IRenderMesh
+{
+    enum EMemoryUsageArgument
+    {
+        MEM_USAGE_COMBINED,
+        MEM_USAGE_ONLY_SYSTEM,
+        MEM_USAGE_ONLY_VIDEO,
+        MEM_USAGE_ONLY_STREAMS,
+    };
+
+    // Render mesh initialization parameters, that can be used to create RenderMesh from raw pointers.
+    struct SInitParamerers
+    {
+        AZ::Vertex::Format vertexFormat;
+        ERenderMeshType eType;
+
+        void* pVertBuffer;
+        int nVertexCount;
+        SPipTangents* pTangents;
+        SPipNormal* pNormals;
+        vtx_idx* pIndices;
+        int nIndexCount;
+        PublicRenderPrimitiveType nPrimetiveType;
+        int nRenderChunkCount;
+        int nClientTextureBindID;
+        bool bOnlyVideoBuffer;
+        bool bPrecache;
+        bool bLockForThreadAccess;
+
+        SInitParamerers()
+            : vertexFormat(eVF_P3F_C4B_T2F)
+            , eType(eRMT_Static)
+            , pVertBuffer(0)
+            , nVertexCount(0)
+            , pTangents(0)
+            , pNormals(0)
+            , pIndices(0)
+            , nIndexCount(0)
+            , nPrimetiveType(prtTriangleList)
+            , nRenderChunkCount(0)
+            , nClientTextureBindID(0)
+            , bOnlyVideoBuffer(false)
+            , bPrecache(true)
+            , bLockForThreadAccess(false) {}
+    };
+
+    struct ThreadAccessLock
+    {
+        ThreadAccessLock(IRenderMesh* pRM)
+            : m_pRM(pRM)
+        {
+            m_pRM->LockForThreadAccess();
+        }
+
+        ~ThreadAccessLock()
+        {
+            m_pRM->UnLockForThreadAccess();
+        }
+
+    private:
+        ThreadAccessLock(const ThreadAccessLock&);
+        ThreadAccessLock& operator = (const ThreadAccessLock&);
+
+    private:
+        IRenderMesh* m_pRM;
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IRenderMesh(){}
+
+    //////////////////////////////////////////////////////////////////////////
+    // Reference Counting.
+    virtual void AddRef() = 0;
+    virtual int Release() = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    // Prevent rendering if video memory could not been allocated for it
+    virtual bool CanRender() = 0;
+
+    // Returns type name given to the render mesh on creation time.
+    virtual const char* GetTypeName() = 0;
+    // Returns the name of the source given to the render mesh on creation time.
+    virtual const char* GetSourceName() const = 0;
+
+    virtual int  GetIndicesCount() = 0;
+    virtual int  GetVerticesCount() = 0;
+    virtual AZ::Vertex::Format GetVertexFormat() = 0;
+    virtual ERenderMeshType GetMeshType() = 0;
+    virtual float GetGeometricMeanFaceArea() const = 0;
+
+    virtual bool CheckUpdate(uint32 nStreamMask) = 0;
+    virtual int GetStreamStride(int nStream) const = 0;
+
+    virtual const uintptr_t GetVBStream(int nStream) const = 0;
+    virtual const uintptr_t GetIBStream() const = 0;
+    virtual int GetNumVerts() const  = 0;
+    virtual int GetNumInds() const = 0;
+    virtual const eRenderPrimitiveType GetPrimitiveType() const = 0;
+
+    virtual void SetSkinned(bool bSkinned = true) = 0;
+    virtual uint GetSkinningWeightCount() const = 0;
+
+    // Create render buffers from render mesh. Returns the final size of the render mesh or ~0U on failure
+    virtual size_t SetMesh(CMesh& mesh, int nSecColorsSetOffset, uint32 flags, bool requiresLock) = 0;
+    virtual void CopyTo(IRenderMesh* pDst, int nAppendVtx = 0, bool bDynamic = false, bool fullCopy = true) = 0;
+    virtual void SetSkinningDataVegetation(struct SMeshBoneMapping_uint8* pBoneMapping) = 0;
+    virtual void SetSkinningDataCharacter(CMesh& mesh, struct SMeshBoneMapping_uint16* pBoneMapping, struct SMeshBoneMapping_uint16* pExtraBoneMapping) = 0;
+    // Creates an indexed mesh from this render mesh (accepts an optional pointer to an IIndexedMesh object that should be used)
+    virtual IIndexedMesh* GetIndexedMesh(IIndexedMesh* pIdxMesh = 0) = 0;
+    virtual int GetRenderChunksCount(_smart_ptr<IMaterial> pMat, int& nRenderTrisCount) = 0;
+
+    virtual IRenderMesh* GenerateMorphWeights() = 0;
+    virtual IRenderMesh* GetMorphBuddy() = 0;
+    virtual void SetMorphBuddy(IRenderMesh* pMorph) = 0;
+
+    virtual bool UpdateVertices(const void* pVertBuffer, int nVertCount, int nOffset, int nStream, uint32 copyFlags, bool requiresLock = true) = 0;
+    virtual bool UpdateIndices(const vtx_idx* pNewInds, int nInds, int nOffsInd, uint32 copyFlags, bool requiresLock = true) = 0;
+    virtual void SetCustomTexID(int nCustomTID) = 0;
+    virtual void SetChunk(int nIndex, CRenderChunk& chunk) = 0;
+    virtual void SetChunk(_smart_ptr<IMaterial> pNewMat, int nFirstVertId, int nVertCount, int nFirstIndexId, int nIndexCount, float texelAreaDensity, const AZ::Vertex::Format& vertexFormat, int nMatID = 0) = 0;
+
+    // Assign array of render chunks.
+    // Initializes render element for each render chunk.
+    virtual void SetRenderChunks(CRenderChunk* pChunksArray, int nCount, bool bSubObjectChunks) = 0;
+
+    virtual void GenerateQTangents() = 0;
+    virtual void CreateChunksSkinned() = 0;
+    virtual void NextDrawSkinned() = 0;
+    virtual IRenderMesh* GetVertexContainer() = 0;
+    virtual void SetVertexContainer(IRenderMesh* pBuf) = 0;
+    virtual TRenderChunkArray& GetChunks() = 0;
+    virtual TRenderChunkArray& GetChunksSkinned() = 0;
+    virtual TRenderChunkArray& GetChunksSubObjects() = 0;
+    virtual void SetBBox(const Vec3& vBoxMin, const Vec3& vBoxMax) = 0;
+    virtual void GetBBox(Vec3& vBoxMin, Vec3& vBoxMax) = 0;
+    virtual void UpdateBBoxFromMesh() = 0;
+    virtual uint32* GetPhysVertexMap() = 0;
+    virtual bool IsEmpty() = 0;
+
+    virtual byte* GetPosPtrNoCache(int32& nStride, uint32 nFlags) = 0;
+    virtual byte* GetPosPtr(int32& nStride, uint32 nFlags) = 0;
+    virtual byte* GetColorPtr(int32& nStride, uint32 nFlags) = 0;
+    virtual byte* GetNormPtr(int32& nStride, uint32 nFlags) = 0;
+    //! Returns a pointer to the first uv coordinate in the interleaved vertex stream
+    virtual byte* GetUVPtrNoCache(int32& nStride, uint32 nFlags, uint32 uvSetIndex = 0) = 0;
+    /*! Get a pointer to the mesh's uv coordinates and the stride from the beginning of one uv coordinate to the next
+        \param[out] nStride The stride in between successive uv coordinates.
+        \param nFlags Stream lock flags (FSL_READ, FSL_WRITE, etc)
+        \param uvSetIndex Which uv set to retrieve (defaults to 0)
+        \return A pointer to cached uvs which contains all of the uv coordinates contiguous in memory, or as a fallback a pointer to the first uv coordinate in the interleaved vertex stream
+                Either way, nStride is set such that the caller can use it to iterate over the data in the same way regardless of which pointer was returned
+                Returns nullptr if there is no uv coordinate stream at the given index
+    */
+    virtual byte* GetUVPtr(int32& nStride, uint32 nFlags, uint32 uvSetIndex = 0) = 0;
+
+    virtual byte* GetTangentPtr(int32& nStride, uint32 nFlags) = 0;
+    virtual byte* GetQTangentPtr(int32& nStride, uint32 nFlags) = 0;
+
+    virtual byte* GetHWSkinPtr(int32& nStride, uint32 nFlags, bool remapped = false) = 0;
+    virtual byte* GetVelocityPtr(int32& nStride, uint32 nFlags) = 0;
+
+    virtual void UnlockStream(int nStream) = 0;
+    virtual void UnlockIndexStream() = 0;
+
+    virtual vtx_idx* GetIndexPtr(uint32 nFlags, int32 nOffset = 0) = 0;
+    virtual const PodArray<std::pair<int, int> >* GetTrisForPosition(const Vec3& vPos, _smart_ptr<IMaterial> pMaterial) = 0;
+
+    virtual float GetExtent(EGeomForm eForm) = 0;
+    virtual void GetRandomPos(PosNorm& ran, EGeomForm eForm, SSkinningData const* pSkinning = NULL) = 0;
+
+    virtual void Render(const struct SRendParams& rParams, CRenderObject* pObj, _smart_ptr<IMaterial> pMaterial, const SRenderingPassInfo& passInfo, bool bSkinned = false) = 0;
+    virtual void Render(CRenderObject* pObj, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter) = 0;
+    virtual void AddRenderElements(_smart_ptr<IMaterial> pIMatInfo, CRenderObject* pObj, const SRenderingPassInfo& passInfo, int nSortId = EFSLIST_GENERAL, int nAW = 1) = 0;
+    virtual void AddRE(_smart_ptr<IMaterial> pMaterial, CRenderObject* pObj, IShader* pEf, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter) = 0;
+    virtual void SetREUserData(float* pfCustomData, float fFogScale = 0, float fAlpha = 1) = 0;
+
+    // Debug draw this render mesh.
+    virtual void DebugDraw(const struct SGeometryDebugDrawInfo& info, uint32 nVisibleChunksMask = ~0, float fExtrdueScale = 0.01f) = 0;
+
+    // Returns mesh memory usage and add it to the CrySizer (if not NULL).
+    // Arguments:
+    //     pSizer - Sizer interface, can be NULL if caller only want to calculate size
+    //     nType - see EMemoryUsageArgument
+    virtual size_t GetMemoryUsage(ICrySizer* pSizer, EMemoryUsageArgument nType) const = 0;
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+
+    // Get allocated only in video memory or only in system memory.
+    virtual int GetAllocatedBytes(bool bVideoMem) const = 0;
+    virtual float GetAverageTrisNumPerChunk(_smart_ptr<IMaterial> pMat) = 0;
+    virtual int GetTextureMemoryUsage(const _smart_ptr<IMaterial> pMaterial, ICrySizer* pSizer = NULL, bool bStreamedIn = true) const = 0;
+    virtual void KeepSysMesh(bool keep) = 0;    // HACK: temp workaround for GDC-888
+    virtual void UnKeepSysMesh() = 0;
+    virtual void SetMeshLod(int nLod) = 0;
+
+    virtual void LockForThreadAccess() = 0;
+    virtual void UnLockForThreadAccess() = 0;
+
+    // Sets the async update state - will sync before rendering to this
+    virtual volatile int* SetAsyncUpdateState(void) = 0;
+    virtual void CreateRemappedBoneIndicesPair(const DynArray<JointIdType>& arrRemapTable, const uint pairGuid) = 0;
+    virtual void ReleaseRemappedBoneIndicesPair(const uint pairGuid) = 0;
+
+    virtual void OffsetPosition(const Vec3& delta) = 0;
+    // </interfuscator:shuffle>
+};
+
+struct SBufferStream
+{
+    void* m_pLocalData;       // pointer to buffer data
+    uintptr_t m_BufferHdl;
+    SBufferStream()
+    {
+        m_pLocalData = NULL;
+        m_BufferHdl = ~0u;
+    }
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_IRENDERMESH_H
diff --git a/Code/Legacy/CryCommon/IRenderer.h b/Code/Legacy/CryCommon/IRenderer.h
new file mode 100644
index 0000000000..a3f47c7e0b
--- /dev/null
+++ b/Code/Legacy/CryCommon/IRenderer.h
@@ -0,0 +1,2606 @@
+/*
+ * 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_Geo.h"
+#include "Cry_Camera.h"
+#include "ITexture.h"
+#include "Cry_Vector2.h"
+#include "Cry_Vector3.h"
+#include "Cry_Matrix33.h"
+#include "Cry_Color.h"
+#include "smartptr.h"
+#include "StringUtils.h"
+#include <IXml.h> // <> required for Interfuscator
+#include "smartptr.h"
+#include <AzCore/Casting/numeric_cast.h>
+#include <AzCore/std/containers/intrusive_slist.h>
+
+// forward declarations
+struct SRenderingPassInfo;
+struct SRTStack;
+struct SFogVolumeData;
+// Callback used for DXTCompress
+typedef void (* MIPDXTcallback)(const void* buffer, size_t count, void* userData);
+
+typedef void (* GpuCallbackFunc)(DWORD context);
+
+// Callback for shadercache miss
+typedef void (* ShaderCacheMissCallback)(const char* acShaderRequest);
+
+struct ICaptureFrameListener
+{
+    virtual ~ICaptureFrameListener (){}
+    virtual bool OnNeedFrameData(unsigned char*& pConvertedTextureBuf) = 0;
+    virtual void OnFrameCaptured(void) = 0;
+    virtual int OnGetFrameWidth(void) = 0;
+    virtual int OnGetFrameHeight(void) = 0;
+    virtual int OnCaptureFrameBegin(int* pTexHandle) = 0;
+
+    enum ECaptureFrameFlags
+    {
+        eCFF_NoCaptureThisFrame = (0 << 1),
+        eCFF_CaptureThisFrame = (1 << 1),
+    };
+};
+
+// Forward declarations.
+//////////////////////////////////////////////////////////////////////
+typedef void* WIN_HWND;
+typedef void* WIN_HINSTANCE;
+typedef void* WIN_HDC;
+typedef void* WIN_HGLRC;
+
+class CREMesh;
+class CMesh;
+//class   CImage;
+struct  CStatObj;
+class CVegetation;
+struct  ShadowMapFrustum;
+struct  IStatObj;
+class CObjManager;
+struct  SPrimitiveGroup;
+class CRendElementBase;
+class CRenderObject;
+class CTexMan;
+//class   ColorF;
+class CShadowVolEdge;
+class CCamera;
+class CDLight;
+struct SDeferredLightVolume;
+struct  ILog;
+struct  IConsole;
+struct  ICVar;
+struct  ITimer;
+struct  ISystem;
+class IGPUParticleEngine;
+class ICrySizer;
+struct IRenderAuxGeom;
+struct SREPointSpriteCreateParams;
+struct SPointSpriteVertex;
+struct RenderLMData;
+struct SShaderParam;
+struct SSkyLightRenderParams;
+struct SParticleRenderInfo;
+struct SParticleAddJobCompare;
+struct IColorGradingController;
+class IStereoRenderer;
+struct IFFont;
+struct IFFont_RenderProxy;
+struct STextDrawContext;
+struct IRenderMesh;
+struct ShadowFrustumMGPUCache;
+struct IAsyncTextureCompileListener;
+struct IClipVolume;
+struct SClipVolumeBlendInfo;
+class CRenderView;
+struct SDynTexture2;
+class CTexture;
+enum ETexPool : int;
+
+//////////////////////////////////////////////////////////////////////
+typedef unsigned char bvec4[4];
+typedef float vec4_t[4];
+typedef unsigned char byte;
+typedef float vec2_t[2];
+
+//DOC-IGNORE-BEGIN
+#include "Cry_Color.h"
+#include "Tarray.h"
+
+#include <IFont.h>
+//DOC-IGNORE-END
+
+#define MAX_NUM_VIEWPORTS 7
+
+// Query types for CryInd editor (used in EF_Query() function).
+enum ERenderQueryTypes
+{
+    EFQ_DeleteMemoryArrayPtr = 1,
+    EFQ_DeleteMemoryPtr,
+    EFQ_GetShaderCombinations,
+    EFQ_SetShaderCombinations,
+    EFQ_CloseShaderCombinations,
+
+    EFQ_MainThreadList,
+    EFQ_RenderThreadList,
+    EFQ_RenderMultithreaded,
+
+    EFQ_RecurseLevel,
+    EFQ_IncrementFrameID,
+    EFQ_DeviceLost,
+    EFQ_LightSource,
+
+    EFQ_Alloc_APITextures,
+    EFQ_Alloc_APIMesh,
+
+    // Memory allocated by meshes in system memory.
+    EFQ_Alloc_Mesh_SysMem,
+    EFQ_Mesh_Count,
+
+    EFQ_HDRModeEnabled,
+    EFQ_ParticlesTessellation,
+    EFQ_WaterTessellation,
+    EFQ_MeshTessellation,
+    EFQ_GetShadowPoolFrustumsNum,
+    EFQ_GetShadowPoolAllocThisFrameNum,
+    EFQ_GetShadowMaskChannelsNum,
+    EFQ_GetTiledShadingSkippedLightsNum,
+
+    // Description:
+    //      Query will return all textures in the renderer,
+    //      pass pointer to an SRendererQueryGetAllTexturesParam instance
+    EFQ_GetAllTextures,
+
+    // Description:
+    //      Release resources allocated by GetAllTextures query
+    //      pass pointer to an SRendererQueryGetAllTexturesParam instance, populated by EFQ_GetAllTextures
+    EFQ_GetAllTexturesRelease,
+
+    // Description:
+    //      Query will return all IRenderMesh objects in the renderer,
+    //      Pass an array pointer to be allocated and filled with the IRendermesh pointers. The calling function is responsible for freeing this memory.
+    //      This was originally a two pass process, but proved to be non-thread-safe, leading to buffer overruns and underruns.
+    EFQ_GetAllMeshes,
+
+    // Summary:
+    //      Multigpu (crossfire/sli) is enabled.
+    EFQ_MultiGPUEnabled,
+    EFQ_SetDrawNearFov,
+    EFQ_GetDrawNearFov,
+    EFQ_TextureStreamingEnabled,
+    EFQ_MSAAEnabled,
+    EFQ_AAMode,
+
+    EFQ_Fullscreen,
+    EFQ_GetTexStreamingInfo,
+    EFQ_GetMeshPoolInfo,
+
+    // Description:
+    //      True when shading is done in linear space, de-gamma on texture lookup, gamma on frame buffer writing (sRGB), false otherwise.
+    EFQ_sLinearSpaceShadingEnabled,
+
+    // The percentages of overscan borders for left/right and top/bottom to adjust the title safe area.
+    EFQ_OverscanBorders,
+
+    // Get num active post effects
+    EFQ_NumActivePostEffects,
+
+    // Get size of textures memory pool
+    EFQ_TexturesPoolSize,
+    EFQ_RenderTargetPoolSize,
+
+    EFQ_GetShaderCacheInfo,
+
+    EFQ_GetFogCullDistance,
+    EFQ_GetMaxRenderObjectsNum,
+
+    EFQ_IsRenderLoadingThreadActive,
+
+    EFQ_GetSkinningDataPoolSize,
+
+    EFQ_GetViewportDownscaleFactor,
+    EFQ_ReverseDepthEnabled,
+
+    EFQ_GetLastD3DDebugMessage
+};
+
+struct ID3DDebugMessage
+{
+public:
+    virtual void Release() = 0;
+    virtual const char* GetMessage() const = 0;
+
+protected:
+    ID3DDebugMessage() {}
+    virtual ~ID3DDebugMessage() {}
+};
+
+enum EScreenAspectRatio
+{
+    eAspect_Unknown,
+    eAspect_4_3,
+    eAspect_16_9,
+    eAspect_16_10,
+};
+
+class SBoundingVolume
+{
+public:
+    SBoundingVolume()
+        : m_vCenter(0, 0, 0)
+        , m_fRadius(0) {}
+    ~SBoundingVolume() {}
+
+    void SetCenter(const Vec3& center)  { m_vCenter = center; }
+    void SetRadius(float radius)        { m_fRadius = radius; }
+    const Vec3& GetCenter() const       { return m_vCenter;   }
+    float GetRadius() const             { return m_fRadius;   }
+
+protected:
+    Vec3    m_vCenter;
+    float   m_fRadius;
+};
+
+class SMinMaxBox
+    : public SBoundingVolume
+{
+public:
+    SMinMaxBox()
+    {
+        Clear();
+    }
+    SMinMaxBox(const Vec3& min, const Vec3& max) :
+        m_min(min), 
+        m_max(max)
+    {
+        UpdateSphere();
+    }
+
+    // Summary:
+    //  Destructor
+    virtual ~SMinMaxBox() {}
+
+    void  AddPoint(const Vec3& pt)
+    {
+        if (pt.x > m_max.x)
+        {
+            m_max.x = pt.x;
+        }
+        if (pt.x < m_min.x)
+        {
+            m_min.x = pt.x;
+        }
+
+        if (pt.y > m_max.y)
+        {
+            m_max.y = pt.y;
+        }
+        if (pt.y < m_min.y)
+        {
+            m_min.y = pt.y;
+        }
+
+        if (pt.z > m_max.z)
+        {
+            m_max.z = pt.z;
+        }
+        if (pt.z < m_min.z)
+        {
+            m_min.z = pt.z;
+        }
+
+        // Summary:
+        //   Updates the center and radius.
+        UpdateSphere();
+    }
+    void  AddPoint(float x, float y, float z)
+    {
+        AddPoint(Vec3(x, y, z));
+    }
+
+    void  Union(const SMinMaxBox& box)  { AddPoint(box.GetMin()); AddPoint(box.GetMax()); }
+
+    const Vec3& GetMin() const     { return m_min; }
+    const Vec3& GetMax() const     { return m_max; }
+
+    void  SetMin(const Vec3& min)  { m_min = min; UpdateSphere(); }
+    void  SetMax(const Vec3& max)  { m_max = max; UpdateSphere(); }
+
+    float GetWidthInX() const       { return m_max.x - m_min.x; }
+    float GetWidthInY() const       { return m_max.y - m_min.y; }
+    float GetWidthInZ() const       { return m_max.z - m_min.z; }
+
+    bool  PointInBBox(const Vec3& pt) const;
+
+    bool  ViewFrustumCull(const CameraViewParameters& viewParameters, const Matrix44& mat);
+
+    void  Transform(const Matrix34& mat)
+    {
+        Vec3 verts[8];
+        CalcVerts(verts);
+        Clear();
+        for (int i = 0; i < 8; i++)
+        {
+            AddPoint(mat.TransformPoint(verts[i]));
+        }
+    }
+
+    // Summary:
+    //  Resets the bounding box.
+    void  Clear()
+    {
+        m_min = Vec3(999999.0f, 999999.0f, 999999.0f);
+        m_max = Vec3(-999999.0f, -999999.0f, -999999.0f);
+    }
+
+protected:
+    void UpdateSphere()
+    {
+        m_vCenter =  m_min;
+        m_vCenter += m_max;
+        m_vCenter *= 0.5f;
+
+        Vec3 rad  =  m_max;
+        rad      -= m_vCenter;
+        m_fRadius =  rad.len();
+    }
+    void CalcVerts(Vec3 pVerts[8]) const
+    {
+        pVerts[0].Set(m_max.x, m_max.y, m_max.z);
+        pVerts[4].Set(m_max.x, m_max.y, m_min.z);
+        pVerts[1].Set(m_min.x, m_max.y, m_max.z);
+        pVerts[5].Set(m_min.x, m_max.y, m_min.z);
+        pVerts[2].Set(m_min.x, m_min.y, m_max.z);
+        pVerts[6].Set(m_min.x, m_min.y, m_min.z);
+        pVerts[3].Set(m_max.x, m_min.y, m_max.z);
+        pVerts[7].Set(m_max.x, m_min.y, m_min.z);
+    }
+
+private:
+    Vec3 m_min; // Original object space BV.
+    Vec3 m_max;
+};
+
+
+
+//////////////////////////////////////////////////////////////////////
+// All possible primitive types
+
+enum PublicRenderPrimitiveType
+{
+    prtTriangleList,
+    prtTriangleStrip,
+    prtLineList,
+    prtLineStrip
+};
+
+//////////////////////////////////////////////////////////////////////
+#define R_CULL_DISABLE  0
+#define R_CULL_NONE     0
+#define R_CULL_FRONT    1
+#define R_CULL_BACK     2
+
+//////////////////////////////////////////////////////////////////////
+#define R_DEFAULT_LODBIAS 0
+
+//////////////////////////////////////////////////////////////////////
+#define R_SOLID_MODE    0
+#define R_WIREFRAME_MODE 1
+
+#define R_DX9_RENDERER  2
+#define R_DX11_RENDERER 3
+#define R_NULL_RENDERER 4
+#define R_CUBAGL_RENDERER 5
+#define R_GL_RENDERER 6
+#define R_METAL_RENDERER 7
+#define R_DX12_RENDERER 8
+
+//////////////////////////////////////////////////////////////////////
+// Render features
+
+#define RFT_FREE_0x1          0x1
+#define RFT_ALLOW_RECTTEX     0x2
+#define RFT_OCCLUSIONQUERY    0x4
+#define RFT_FREE_0x8          0x8
+#define RFT_HWGAMMA           0x10
+#define RFT_FREE_0x20         0x20
+#define RFT_COMPRESSTEXTURE   0x40
+#define RFT_FREE_0x80         0x80
+#define RFT_ALLOWANISOTROPIC  0x100      // Allows anisotropic texture filtering.
+#define RFT_SUPPORTZBIAS      0x200
+#define RFT_FREE_0x400        0x400
+#define RFT_FREE_0x800        0x800
+#define RFT_FREE_0x1000       0x1000
+#define RFT_FREE_0x2000       0x2000
+#define RFT_OCCLUSIONTEST     0x8000     // Support hardware occlusion test.
+
+#define RFT_HW_ARM_MALI       0x04000    // Unclassified ARM (MALI) hardware.
+#define RFT_HW_INTEL          0x10000    // Unclassified intel hardware.
+#define RFT_HW_QUALCOMM       0x10000    // Unclassified Qualcomm hardware
+#define RFT_HW_ATI            0x20000    // Unclassified ATI hardware.
+#define RFT_HW_NVIDIA         0x40000    // Unclassified NVidia hardware.
+#define RFT_HW_MASK           0x74000    // Graphics chip mask.
+
+#define RFT_HW_HDR            0x80000    // Hardware supports high dynamic range rendering.
+
+#define RFT_HW_SM20           0x100000   // Shader model 2.0
+#define RFT_HW_SM2X           0x200000   // Shader model 2.X
+#define RFT_HW_SM30           0x400000   // Shader model 3.0
+#define RFT_HW_SM40           0x800000   // Shader model 4.0
+#define RFT_HW_SM50           0x1000000  // Shader model 5.0
+
+#define RFT_FREE_0x2000000    0x2000000
+#define RFT_FREE_0x4000000    0x4000000
+#define RFT_FREE_0x8000000    0x8000000
+
+#define RFT_HW_VERTEX_STRUCTUREDBUF 0x10000000 // Supports Structured Buffers in the Vertex Shader.
+#define RFT_RGBA                    0x20000000 // RGBA order (otherwise BGRA).
+#define RFT_COMPUTE_SHADERS         0x40000000 // Compute Shaders support
+#define RFT_HW_VERTEXTEXTURES       0x80000000 // Vertex texture fetching supported.
+
+//====================================================================
+// PrecacheResources flags
+
+#define FPR_NEEDLIGHT     1
+#define FPR_2D            2
+#define FPR_HIGHPRIORITY  4
+#define FPR_SYNCRONOUS    8
+#define FPR_STARTLOADING    16
+#define FPR_SINGLE_FRAME_PRIORITY_UPDATE 32
+
+//=====================================================================
+// SetRenderTarget flags
+#define SRF_SCREENTARGET  1
+#define SRF_USE_ORIG_DEPTHBUF 2
+#define SRF_USE_ORIG_DEPTHBUF_MSAA 4
+
+//====================================================================
+// Draw shaders flags (EF_EndEf3d)
+
+#define SHDF_ALLOWHDR               BIT(0)
+#define SHDF_CUBEMAPGEN             BIT(1)
+#define SHDF_ZPASS                  BIT(2)
+#define SHDF_ZPASS_ONLY             BIT(3)
+#define SHDF_DO_NOT_CLEAR_Z_BUFFER  BIT(4)
+#define SHDF_ALLOWPOSTPROCESS       BIT(5)
+#define SHDF_ALLOW_AO               BIT(8)
+#define SHDF_ALLOW_WATER            BIT(9)
+#define SHDF_NOASYNC                BIT(10)
+#define SHDF_NO_DRAWNEAR            BIT(11)
+#define SHDF_STREAM_SYNC            BIT(13)
+#define SHDF_NO_SHADOWGEN           BIT(15)
+
+//////////////////////////////////////////////////////////////////////
+// Virtual screen size
+const float VIRTUAL_SCREEN_WIDTH = 800.0f;
+const float VIRTUAL_SCREEN_HEIGHT = 600.0f;
+
+//////////////////////////////////////////////////////////////////////
+// Object states
+#define OS_ALPHA_BLEND             0x1
+#define OS_ADD_BLEND               0x2
+#define OS_MULTIPLY_BLEND          0x4
+#define OS_TRANSPARENT            (OS_ALPHA_BLEND | OS_ADD_BLEND | OS_MULTIPLY_BLEND)
+#define OS_NODEPTH_TEST            0x8
+#define OS_NODEPTH_WRITE           0x10
+#define OS_ANIM_BLEND              0x20
+#define OS_ENVIRONMENT_CUBEMAP     0x40
+
+// Render State flags
+#define GS_BLSRC_MASK              0xf
+#define GS_BLSRC_ZERO              0x1
+#define GS_BLSRC_ONE               0x2
+#define GS_BLSRC_DSTCOL            0x3
+#define GS_BLSRC_ONEMINUSDSTCOL    0x4
+#define GS_BLSRC_SRCALPHA          0x5
+#define GS_BLSRC_ONEMINUSSRCALPHA  0x6
+#define GS_BLSRC_DSTALPHA          0x7
+#define GS_BLSRC_ONEMINUSDSTALPHA  0x8
+#define GS_BLSRC_ALPHASATURATE     0x9
+#define GS_BLSRC_SRCALPHA_A_ZERO   0xa // separate alpha blend state
+#define GS_BLSRC_SRC1ALPHA         0xb // dual source blending
+
+
+#define GS_BLDST_MASK              0xf0
+#define GS_BLDST_ZERO              0x10
+#define GS_BLDST_ONE               0x20
+#define GS_BLDST_SRCCOL            0x30
+#define GS_BLDST_ONEMINUSSRCCOL    0x40
+#define GS_BLDST_SRCALPHA          0x50
+#define GS_BLDST_ONEMINUSSRCALPHA  0x60
+#define GS_BLDST_DSTALPHA          0x70
+#define GS_BLDST_ONEMINUSDSTALPHA  0x80
+#define GS_BLDST_ONE_A_ZERO        0x90 // separate alpha blend state
+#define GS_BLDST_ONEMINUSSRC1ALPHA 0xa0 // dual source blending
+
+
+#define GS_DEPTHWRITE              0x00000100
+
+#define GS_COLMASK_RT1             0x00000200
+#define GS_COLMASK_RT2             0x00000400
+#define GS_COLMASK_RT3             0x00000800
+
+#define GS_NOCOLMASK_R             0x00001000
+#define GS_NOCOLMASK_G             0x00002000
+#define GS_NOCOLMASK_B             0x00004000
+#define GS_NOCOLMASK_A             0x00008000
+#define GS_COLMASK_RGB             (GS_NOCOLMASK_A)
+#define GS_COLMASK_A               (GS_NOCOLMASK_R | GS_NOCOLMASK_G | GS_NOCOLMASK_B)
+#define GS_COLMASK_NONE            (GS_NOCOLMASK_R | GS_NOCOLMASK_G | GS_NOCOLMASK_B | GS_NOCOLMASK_A)
+#define GS_COLMASK_MASK            GS_COLMASK_NONE
+#define GS_COLMASK_SHIFT           12
+
+#define GS_WIREFRAME               0x00010000
+#define GS_NODEPTHTEST             0x00040000
+
+#define GS_BLEND_MASK              0x0f0000ff
+
+#define GS_DEPTHFUNC_LEQUAL        0x00000000
+#define GS_DEPTHFUNC_EQUAL         0x00100000
+#define GS_DEPTHFUNC_GREAT         0x00200000
+#define GS_DEPTHFUNC_LESS          0x00300000
+#define GS_DEPTHFUNC_GEQUAL        0x00400000
+#define GS_DEPTHFUNC_NOTEQUAL      0x00500000
+#define GS_DEPTHFUNC_HIZEQUAL      0x00600000 // keep hi-z test, always pass fine depth. Useful for debug display
+#define GS_DEPTHFUNC_ALWAYS        0x00700000
+#define GS_DEPTHFUNC_MASK          0x00700000
+
+#define GS_STENCIL                 0x00800000
+
+#define GS_BLEND_OP_MASK           0x03000000
+#define GS_BLOP_MAX                              0x01000000
+#define GS_BLOP_MIN                              0x02000000
+
+// Separate alpha blend mode
+#define GS_BLALPHA_MASK            0x0c000000
+#define GS_BLALPHA_MIN             0x04000000
+#define GS_BLALPHA_MAX             0x08000000
+
+#define GS_ALPHATEST_MASK          0xf0000000
+#define GS_ALPHATEST_GREATER       0x10000000
+#define GS_ALPHATEST_LESS          0x20000000
+#define GS_ALPHATEST_GEQUAL        0x40000000
+#define GS_ALPHATEST_LEQUAL        0x80000000
+
+#define FORMAT_8_BIT   8
+#define FORMAT_24_BIT 24
+#define FORMAT_32_BIT 32
+
+//==================================================================
+// StencilStates
+
+//Note: If these are altered, g_StencilFuncLookup and g_StencilOpLookup arrays
+//          need to be updated in turn
+
+#define FSS_STENCFUNC_ALWAYS   0x0
+#define FSS_STENCFUNC_NEVER    0x1
+#define FSS_STENCFUNC_LESS     0x2
+#define FSS_STENCFUNC_LEQUAL   0x3
+#define FSS_STENCFUNC_GREATER  0x4
+#define FSS_STENCFUNC_GEQUAL   0x5
+#define FSS_STENCFUNC_EQUAL    0x6
+#define FSS_STENCFUNC_NOTEQUAL 0x7
+#define FSS_STENCFUNC_MASK     0x7
+
+#define FSS_STENCIL_TWOSIDED   0x8
+
+#define FSS_CCW_SHIFT          16
+
+#define FSS_STENCOP_KEEP    0x0
+#define FSS_STENCOP_REPLACE 0x1
+#define FSS_STENCOP_INCR    0x2
+#define FSS_STENCOP_DECR    0x3
+#define FSS_STENCOP_ZERO    0x4
+#define FSS_STENCOP_INCR_WRAP 0x5
+#define FSS_STENCOP_DECR_WRAP 0x6
+#define FSS_STENCOP_INVERT 0x7
+
+#define FSS_STENCFAIL_SHIFT   4
+#define FSS_STENCFAIL_MASK    (0x7 << FSS_STENCFAIL_SHIFT)
+
+#define FSS_STENCZFAIL_SHIFT  8
+#define FSS_STENCZFAIL_MASK   (0x7 << FSS_STENCZFAIL_SHIFT)
+
+#define FSS_STENCPASS_SHIFT   12
+#define FSS_STENCPASS_MASK    (0x7 << FSS_STENCPASS_SHIFT)
+
+#define STENC_FUNC(op) (op)
+#define STENC_CCW_FUNC(op) (op << FSS_CCW_SHIFT)
+#define STENCOP_FAIL(op) (op << FSS_STENCFAIL_SHIFT)
+#define STENCOP_ZFAIL(op) (op << FSS_STENCZFAIL_SHIFT)
+#define STENCOP_PASS(op) (op << FSS_STENCPASS_SHIFT)
+#define STENCOP_CCW_FAIL(op) (op << (FSS_STENCFAIL_SHIFT + FSS_CCW_SHIFT))
+#define STENCOP_CCW_ZFAIL(op) (op << (FSS_STENCZFAIL_SHIFT + FSS_CCW_SHIFT))
+#define STENCOP_CCW_PASS(op) (op << (FSS_STENCPASS_SHIFT + FSS_CCW_SHIFT))
+
+//Stencil masks
+#define BIT_STENCIL_RESERVED 0x80
+#define BIT_STENCIL_INSIDE_CLIPVOLUME 0x40
+#define STENC_VALID_BITS_NUM 7
+#define STENC_MAX_REF ((1 << STENC_VALID_BITS_NUM) - 1)
+
+// Read FrameBuffer type
+enum ERB_Type
+{
+    eRB_BackBuffer,
+    eRB_FrontBuffer,
+    eRB_ShadowBuffer
+};
+
+enum EVertexCostTypes
+{
+    EVCT_STATIC = 0,
+    EVCT_VEGETATION,
+    EVCT_SKINNED,
+    EVCT_NUM
+};
+
+//////////////////////////////////////////////////////////////////////
+
+struct SDispFormat
+{
+    int m_Width;
+    int m_Height;
+    int m_BPP;
+};
+
+struct SAAFormat
+{
+    char szDescr[64];
+    int nSamples;
+    int nQuality;
+};
+
+// Summary:
+//   Info about Terrain sector texturing.
+struct SSectorTextureSet
+{
+    SSectorTextureSet(unsigned short nT0)
+    {
+        nTex0 = nT0;
+        fTexOffsetX = fTexOffsetY = 0;
+        fTexScale = 1.f;
+    }
+
+    unsigned short nTex0;
+    float fTexOffsetX, fTexOffsetY, fTexScale;
+};
+
+struct IRenderNode;
+struct SShaderItem;
+
+#ifdef SUPPORT_HW_MOUSE_CURSOR
+class IHWMouseCursor
+{
+public:
+    virtual ~IHWMouseCursor() {}
+    virtual void SetPosition(int x, int y) = 0;
+    virtual void Show() = 0;
+    virtual void Hide() = 0;
+};
+#endif
+
+//////////////////////////////////////////////////////////////////////
+//DOC-IGNORE-BEGIN
+#include <IShader.h> // <> required for Interfuscator
+//DOC-IGNORE-END
+#include <IRenderMesh.h>
+
+// Flags passed in function FreeResources.
+#define FRR_SHADERS   1
+#define FRR_SHADERTEXTURES 2
+#define FRR_TEXTURES  4
+#define FRR_SYSTEM    8
+#define FRR_RESTORE   0x10
+#define FRR_REINITHW  0x20
+#define FRR_DELETED_MESHES 0x40
+#define FRR_FLUSH_TEXTURESTREAMING 0x80
+#define FRR_OBJECTS     0x100
+#define FRR_RENDERELEMENTS 0x200
+#define FRR_RP_BUFFERS 0x400
+#define FRR_SYSTEM_RESOURCES 0x800
+#define FRR_POST_EFFECTS 0x1000
+#define FRR_ALL      -1
+
+// Refresh render resources flags.
+// Flags passed in function RefreshResources.
+#define FRO_SHADERS  1
+#define FRO_SHADERTEXTURES  2
+#define FRO_TEXTURES 4
+#define FRO_GEOMETRY 8
+#define FRO_FORCERELOAD 0x10
+
+//=============================================================================
+// Shaders render target stuff.
+
+#define FRT_CLEAR_DEPTH   0x1
+#define FRT_CLEAR_STENCIL 0x2
+#define FRT_CLEAR_COLOR   0x4
+#define FRT_CLEAR (FRT_CLEAR_COLOR | FRT_CLEAR_DEPTH | FRT_CLEAR_STENCIL)
+#define FRT_CLEAR_FOGCOLOR 0x8
+#define FRT_CLEAR_IMMEDIATE 0x10
+#define FRT_CLEAR_COLORMASK 0x20
+#define FRT_CLEAR_RESET_VIEWPORT 0x40
+
+#define FRT_CAMERA_REFLECTED_WATERPLANE 0x40
+#define FRT_CAMERA_REFLECTED_PLANE      0x80
+#define FRT_CAMERA_CURRENT              0x100
+
+#define FRT_USE_FRONTCLIPPLANE          0x200
+#define FRT_USE_BACKCLIPPLANE           0x400
+
+#define FRT_GENERATE_MIPS               0x800
+
+#define FRT_RENDTYPE_CUROBJECT          0x1000
+#define FRT_RENDTYPE_CURSCENE           0x2000
+#define FRT_RENDTYPE_RECURSIVECURSCENE  0x4000
+#define FRT_RENDTYPE_COPYSCENE          0x8000
+
+// Summary:
+//   Flags used in DrawText function.
+// See also:
+//   SDrawTextInfo
+// Remarks:
+//   Text must be fixed pixel size.
+enum EDrawTextFlags
+{
+    eDrawText_Left          = 0,        // default left alignment if neither Center or Right are specified
+    eDrawText_Center        = BIT(0),   // centered alignment, otherwise right or left
+    eDrawText_Right         = BIT(1),   // right alignment, otherwise center or left
+    eDrawText_CenterV       = BIT(2),   // center vertically, otherwise top
+    eDrawText_Bottom        = BIT(3),   // bottom alignment
+
+    eDrawText_2D            = BIT(4),   // 3 component vector is used for xy screen position, otherwise it's 3d world space position
+
+    eDrawText_FixedSize     = BIT(5),   // font size is defined in the actual pixel resolution, otherwise it's in the virtual 800x600
+    eDrawText_800x600       = BIT(6),   // position are specified in the virtual 800x600 resolution, otherwise coordinates are in pixels
+
+    eDrawText_Monospace     = BIT(7),   // non proportional font rendering (Font width is same for all characters)
+
+    eDrawText_Framed        = BIT(8),   // draw a transparent, rectangular frame behind the text to ease readability independent from the background
+
+    eDrawText_DepthTest     = BIT(9),   // text should be occluded by world geometry using the depth buffer
+    eDrawText_IgnoreOverscan = BIT(10),  // ignore the overscan borders, text should be drawn at the location specified
+    eDrawText_UseTransform  = BIT(11),  // use a transform for the text
+};
+
+// Debug stats/views for Partial resolves
+// if REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS is enabled, make sure REFRACTION_PARTIAL_RESOLVE_STATS is too
+#if defined(PERFORMANCE_BUILD)
+    #define REFRACTION_PARTIAL_RESOLVE_STATS 1
+    #define REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS 0
+#elif defined(_RELEASE) // note: _RELEASE is defined in PERFORMANCE_BUILD, so this check must come second
+    #define REFRACTION_PARTIAL_RESOLVE_STATS 0
+    #define REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS 0
+#else
+    #define REFRACTION_PARTIAL_RESOLVE_STATS 1
+    #define REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS 1
+#endif
+
+#if REFRACTION_PARTIAL_RESOLVE_DEBUG_VIEWS
+enum ERefractionPartialResolvesDebugViews
+{
+    eRPR_DEBUG_VIEW_2D_AREA = 1,
+    eRPR_DEBUG_VIEW_3D_BOUNDS,
+    eRPR_DEBUG_VIEW_2D_AREA_OVERLAY
+};
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//   This structure used in DrawText method of renderer.
+//   It provide all necessary information of how to render text on screen.
+// See also:
+//   IRenderer::Draw2dText
+struct SDrawTextInfo
+{
+    // Summary:
+    //  One of EDrawTextFlags flags.
+    // See also:
+    //  EDrawTextFlags
+    int     flags;
+    // Summary:
+    //  Text color, (r,g,b,a) all members must be specified.
+    float   color[4];
+    float xscale;
+    float yscale;
+
+    SDrawTextInfo()
+    {
+        flags = 0;
+        color[0] = color[1] = color[2] = color[3] = 1;
+        xscale = 1.0f;
+        yscale = 1.0f;
+    }
+};
+
+#define UIDRAW_TEXTSIZEFACTOR (12.0f)
+#define MIN_RESOLUTION_SCALE (0.25f)
+#define MAX_RESOLUTION_SCALE (4.0f)
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(IRenderer_h)
+#else
+//SLI/CROSSFIRE GPU maximum count
+    #define MAX_GPU_NUM 4
+#endif
+
+#define MAX_FRAME_ID_STEP_PER_FRAME 20
+const int MAX_GSM_LODS_NUM = 16;
+
+const f32 DRAW_NEAREST_MIN = 0.03f;
+const f32 DRAW_NEAREST_MAX = 40.0f;
+
+//===================================================================
+
+//////////////////////////////////////////////////////////////////////
+struct IRenderDebugListener
+{
+    virtual ~IRenderDebugListener() {}
+
+    virtual void OnDebugDraw() = 0;
+};
+
+//////////////////////////////////////////////////////////////////////
+struct ILoadtimeCallback
+{
+    virtual void LoadtimeUpdate(float fDeltaTime) = 0;
+    virtual void LoadtimeRender() = 0;
+    virtual ~ILoadtimeCallback(){}
+};
+
+//////////////////////////////////////////////////////////////////////
+struct ISyncMainWithRenderListener
+{
+    virtual void SyncMainWithRender() = 0;
+    virtual ~ISyncMainWithRenderListener(){}
+};
+
+//////////////////////////////////////////////////////////////////////
+enum ERenderType
+{
+    eRT_Undefined,
+    eRT_Null,
+    eRT_DX11,
+    eRT_DX12,
+    eRT_Provo,
+    eRT_OpenGL,
+    eRT_Metal,
+    eRT_Jasper,
+};
+
+//////////////////////////////////////////////////////////////////////
+// Enum for types of deferred lights
+enum eDeferredLightType
+{
+    eDLT_DeferredLight = 0,
+
+    eDLT_NumShadowCastingLights = eDLT_DeferredLight + 1,
+    // these lights cannot cast shadows
+    eDLT_DeferredCubemap = eDLT_NumShadowCastingLights,
+    eDLT_DeferredAmbientLight,
+    eDLT_NumLightTypes,
+};
+
+const float RENDERER_LIGHT_UNIT_SCALE = 10000.0f;  // Scale factor between photometric and internal light units
+
+//////////////////////////////////////////////////////////////////////
+struct SCustomRenderInitArgs
+{
+    bool appStartedFromMediaCenter;
+};
+
+#if defined(ANDROID)
+enum
+{
+    CULL_SIZEX = 128
+};
+enum
+{
+    CULL_SIZEY = 64
+};
+#else
+enum
+{
+    CULL_SIZEX = 256
+};
+enum
+{
+    CULL_SIZEY = 128
+};
+#endif
+
+//////////////////////////////////////////////////////////////////////
+// Description:
+//   Z-buffer as occlusion buffer definitions: used, shared and initialized in engine and renderer.
+struct SHWOccZBuffer
+{
+    uint32* pHardwareZBuffer;
+    uint32* pZBufferVMem;
+    uint32 ZBufferSizeX;
+    uint32 ZBufferSizeY;
+    uint32 HardwareZBufferRSXOff;
+    uint32 ZBufferVMemRSXOff;
+    uint32 pad[2];  // Keep 32 byte aligned
+    SHWOccZBuffer()
+        : pHardwareZBuffer(NULL)
+        , pZBufferVMem(NULL)
+        , ZBufferSizeX(CULL_SIZEX)
+        , ZBufferSizeY(CULL_SIZEY)
+        , ZBufferVMemRSXOff(0)
+        , HardwareZBufferRSXOff(0){}
+};
+
+class ITextureStreamListener
+{
+public:
+    virtual void OnCreatedStreamedTexture(void* pHandle, const char* name, int nMips, int nMinMipAvailable) = 0;
+    virtual void OnDestroyedStreamedTexture(void* pHandle) = 0;
+    virtual void OnTextureWantsMip(void* pHandle, int nMinMip) = 0;
+    virtual void OnTextureHasMip(void* pHandle, int nMinMip) = 0;
+    virtual void OnBegunUsingTextures(void** pHandles, size_t numHandles) = 0;
+    virtual void OnEndedUsingTextures(void** pHandle, size_t numHandles) = 0;
+
+protected:
+    virtual ~ITextureStreamListener() {}
+};
+
+enum eDolbyVisionMode
+{
+    eDVM_Disabled,
+    eDVM_RGBPQ,
+    eDVM_Vision,
+};
+
+enum ERenderPipelineProfilerStats
+{
+    eRPPSTATS_OverallFrame = 0,
+    eRPPSTATS_Recursion,
+
+    // Scene
+    eRPPSTATS_SceneOverall,
+    eRPPSTATS_SceneDecals,
+    eRPPSTATS_SceneForward,
+    eRPPSTATS_SceneWater,
+
+    // Shadows
+    eRPPSTATS_ShadowsOverall,
+    eRPPSTATS_ShadowsSun,
+    eRPPSTATS_ShadowsSunCustom,
+    eRPPSTATS_ShadowsLocal,
+
+    // Lighting
+    eRPPSTATS_LightingOverall,
+    eRPPSTATS_LightingGI,
+
+    // VFX
+    eRPPSTATS_VfxOverall,
+    eRPPSTATS_VfxTransparent,
+    eRPPSTATS_VfxFog,
+    eRPPSTATS_VfxFlares,
+
+    // Individual Total Illumination stats
+    eRPPSTATS_TI_INJECT_CLEAR,
+    eRPPSTATS_TI_VOXELIZE,
+    eRPPSTATS_TI_INJECT_AIR,
+    eRPPSTATS_TI_INJECT_LIGHT,
+    eRPPSTATS_TI_INJECT_REFL0,
+    eRPPSTATS_TI_INJECT_REFL1,
+    eRPPSTATS_TI_INJECT_DYNL,
+    eRPPSTATS_TI_NID_DIFF,
+    eRPPSTATS_TI_GEN_DIFF,
+    eRPPSTATS_TI_GEN_SPEC,
+    eRPPSTATS_TI_GEN_AIR,
+    eRPPSTATS_TI_DEMOSAIC_DIFF,
+    eRPPSTATS_TI_DEMOSAIC_SPEC,
+    eRPPSTATS_TI_UPSCALE_DIFF,
+    eRPPSTATS_TI_UPSCALE_SPEC,
+
+    RPPSTATS_NUM
+};
+
+struct RPProfilerStats
+{
+    float   gpuTime;
+    float   gpuTimeSmoothed;
+    float   gpuTimeMax;
+    float   cpuTime;
+    uint32  numDIPs;
+    uint32  numPolys;
+
+    // Internal
+    float   _gpuTimeMaxNew;
+};
+
+struct TransformationMatrices
+{
+    Matrix44A m_viewMatrix;
+    Matrix44A m_projectMatrix;
+};
+
+struct ISvoRenderer
+{
+    virtual bool IsShaderItemUsedForVoxelization([[maybe_unused]] SShaderItem& rShaderItem, [[maybe_unused]] IRenderNode* pRN){ return false; }
+    virtual void Release(){}
+};
+
+//////////////////////////////////////////////////////////////////////
+struct SRenderPipeline;
+struct SRenderThread;
+struct SShaderTechnique;
+struct SShaderPass;
+struct SDepthTexture;
+struct SRenderTileInfo;
+
+class CShaderMan;
+class CDeviceBufferManager;
+class CShaderResources;
+class PerInstanceConstantBufferPool;
+
+namespace AZ {
+    class Plane;
+    namespace Vertex {
+        class Format;
+    }
+}
+enum eRenderPrimitiveType : int8;
+enum RenderIndexType : int;
+
+struct IRenderAPI
+{
+};
+
+struct IRenderer
+    : public IRenderAPI
+{
+    virtual ~IRenderer(){}
+
+    virtual void AddRenderDebugListener(IRenderDebugListener* pRenderDebugListener) = 0;
+    virtual void RemoveRenderDebugListener(IRenderDebugListener* pRenderDebugListener) = 0;
+
+    virtual ERenderType GetRenderType() const = 0;
+
+    virtual const char* GetRenderDescription() const
+    {
+        return "CryRenderer";
+    }
+
+    // Summary:
+    //  Initializes the renderer, params are self-explanatory.
+    virtual WIN_HWND Init(int x, int y, int width, int height, unsigned int cbpp, int zbpp, int sbits, bool fullscreen, bool isEditor, WIN_HINSTANCE hinst, WIN_HWND Glhwnd = 0, bool bReInit = false, const SCustomRenderInitArgs* pCustomArgs = 0, bool bShaderCacheGen = false) = 0;
+    virtual void PostInit() = 0;
+
+    virtual bool IsPost3DRendererEnabled() const { return false; }
+
+    virtual int GetFeatures() = 0;
+    virtual const void SetApiVersion(const AZStd::string& apiVersion) = 0;
+    virtual const void SetAdapterDescription(const AZStd::string& adapterDescription) = 0;
+    virtual const AZStd::string& GetApiVersion() const = 0;
+    virtual const AZStd::string& GetAdapterDescription() const = 0;
+    virtual void GetVideoMemoryUsageStats(size_t& vidMemUsedThisFrame, size_t& vidMemUsedRecently, bool bGetPoolsSizes = false) = 0;
+    virtual int GetNumGeomInstances() const = 0;
+    virtual int GetNumGeomInstanceDrawCalls() const = 0;
+    virtual int GetCurrentNumberOfDrawCalls() const = 0;
+    virtual void GetCurrentNumberOfDrawCalls(int& nGeneral, int& nShadowGen) const = 0;
+    //Sums DIP counts for the EFSLIST_* passes that match the submitted mask.
+    //Compose the mask with bitwise arithmetic, use (1 << EFSLIST_*) per list.
+    //e.g. to sum general and transparent, pass in ( (1 << EFSLIST_GENERAL) | (1 << EFSLIST_TRANSP) )
+    virtual int GetCurrentNumberOfDrawCalls(uint32 EFSListMask) const = 0;
+    virtual float GetCurrentDrawCallRTTimes(uint32 EFSListMask) const = 0;
+
+    virtual void SetDebugRenderNode(IRenderNode* pRenderNode) = 0;
+    virtual bool IsDebugRenderNode(IRenderNode* pRenderNode) const = 0;
+
+    /////////////////////////////////////////////////////////////////////////////////
+    // Render-context management
+    /////////////////////////////////////////////////////////////////////////////////
+    virtual bool DeleteContext(WIN_HWND hWnd) = 0;
+    virtual bool CreateContext(WIN_HWND hWnd, bool bAllowMSAA = false, int SSX = 1, int SSY = 1) = 0;
+    virtual bool SetCurrentContext(WIN_HWND hWnd) = 0;
+    virtual void MakeMainContextActive() = 0;
+    virtual WIN_HWND GetCurrentContextHWND() = 0;
+    virtual bool IsCurrentContextMainVP() = 0;
+
+    // Summary:
+    //  Gets height of the current viewport.
+    virtual int   GetCurrentContextViewportHeight() const = 0;
+
+    // Summary:
+    //  Gets width of the current viewport.
+    virtual int   GetCurrentContextViewportWidth() const = 0;
+    /////////////////////////////////////////////////////////////////////////////////
+
+    // Summary:
+    //  Shuts down the renderer.
+    virtual void  ShutDown(bool bReInit = false) = 0;
+    virtual void  ShutDownFast() = 0;
+
+    // Description:
+    //  Creates array of all supported video formats (except low resolution formats).
+    // Return value:
+    //  Number of formats in memory.
+    virtual int EnumDisplayFormats(SDispFormat* Formats) = 0;
+
+    // Summary:
+    //  Returns all supported by video card video AA formats.
+    virtual int EnumAAFormats(SAAFormat* Formats) = 0;
+
+    // Summary:
+    //  Changes resolution of the window/device (doesn't require to reload the level.
+    virtual bool  ChangeResolution(int nNewWidth, int nNewHeight, int nNewColDepth, int nNewRefreshHZ, bool bFullScreen, bool bForceReset) = 0;
+
+    // Note:
+    //  Should be called at the beginning of every frame.
+    virtual void  BeginFrame() = 0;
+
+    // Summary:
+    //  Creates default system shaders and textures.
+    virtual void  InitSystemResources(int nFlags) = 0;
+    virtual void  InitTexturesSemantics() = 0;
+
+    // Summary:
+    //  Frees the allocated resources.
+    virtual void  FreeResources(int nFlags) = 0;
+
+    // Summary:
+    //  Shuts down the renderer.
+    virtual void  Release() = 0;
+
+    // See also:
+    //   r_ShowDynTextures
+    virtual void RenderDebug(bool bRenderStats = true) = 0;
+
+    // Note:
+    //   Should be called at the end of every frame.
+    virtual void  EndFrame() = 0;
+
+    // Force a swap on the backbuffer
+    virtual void    ForceSwapBuffers() = 0;
+
+    // Summary:
+    //      Try to flush the render thread commands to keep the render thread active during
+    //      level loading, but simpy return if the render thread is still busy
+    virtual void TryFlush() = 0;
+
+    virtual void GetViewport(int* x, int* y, int* width, int* height) const = 0;
+    virtual void SetViewport(int x, int y, int width, int height, int id = 0) = 0;
+    virtual void SetRenderTile(f32 nTilesPosX = 0.f, f32 nTilesPosY = 0.f, f32 nTilesGridSizeX = 1.f, f32 nTilesGridSizeY = 1.f) = 0;
+    virtual void SetScissor(int x = 0, int y = 0, int width = 0, int height = 0) = 0;
+    virtual Matrix44A& GetViewProjectionMatrix() = 0;
+    virtual void SetTranspOrigCameraProjMatrix(Matrix44A& matrix) = 0;
+
+    virtual EScreenAspectRatio GetScreenAspect(int nWidth, int nHeight) = 0;
+
+    virtual Vec2 SetViewportDownscale(float xscale, float yscale) = 0;
+    virtual void SetViewParameters(const CameraViewParameters& viewParameters) = 0; // Direct setter
+    virtual void ApplyViewParameters(const CameraViewParameters& viewParameters) = 0; // Uses CameraViewParameters to create matrices.
+
+    // Summary:
+    //  Draws user primitives.
+    virtual void DrawDynVB(SVF_P3F_C4B_T2F* pBuf, uint16* pInds, int nVerts, int nInds, PublicRenderPrimitiveType nPrimType) = 0;
+
+    struct DynUiPrimitive : public AZStd::intrusive_slist_node<DynUiPrimitive>
+    {
+        SVF_P2F_C4B_T2F_F4B* m_vertices = nullptr;
+        uint16* m_indices = nullptr;
+        int m_numVertices = 0;
+        int m_numIndices = 0;
+    };
+
+    using DynUiPrimitiveList = AZStd::intrusive_slist<DynUiPrimitive, AZStd::slist_base_hook<DynUiPrimitive>>;
+
+    // Summary:
+    //  Draws a list of UI primitives as one draw call (if using separate render thread)
+    virtual void DrawDynUiPrimitiveList(DynUiPrimitiveList& primitives, int totalNumVertices, int totalNumIndices) = 0;
+
+    // Summary:
+    //  Sets the renderer camera.
+    virtual void  SetCamera(const CCamera& cam) = 0;
+
+    // Summary:
+    //  Gets the renderer camera.
+    virtual const CCamera& GetCamera() = 0;
+
+    virtual CRenderView* GetRenderViewForThread(int nThreadID) = 0;
+    // Summary:
+    //  Gets the renderer previous camera.
+    //virtual const CCamera& GetCameraPrev() = 0;
+
+    // Summary:
+    //  Sets delta gamma.
+    virtual bool  SetGammaDelta(float fGamma) = 0;
+
+    // Summary:
+    //  Restores gamma
+    // Note:
+    //  Reset gamma setting if not in fullscreen mode.
+    virtual void  RestoreGamma(void) = 0;
+
+    // Summary:
+    //  Changes display size.
+    virtual bool  ChangeDisplay(unsigned int width, unsigned int height, unsigned int cbpp) = 0;
+
+    // Summary:
+    //  Changes viewport size.
+    virtual void  ChangeViewport(unsigned int x, unsigned int y, unsigned int width, unsigned int height, bool bMainViewport = false, float scaleWidth = 1.0f, float scaleHeight = 1.0f) = 0;
+
+    // Summary:
+    //  Saves source data to a Tga file.
+    // Note:
+    //  Should not be here.
+    virtual bool  SaveTga(unsigned char* sourcedata, int sourceformat, int w, int h, const char* filename, bool flip) const = 0;
+
+    // Summary:
+    //  Sets the current binded texture.
+    virtual void  SetTexture(int tnum) = 0;
+
+    // Summary:
+    //  Sets the current bound texture for the given texture unit
+    virtual void  SetTexture(int tnum, int nUnit) = 0;
+
+    // Summary:
+    //  Sets the white texture.
+    virtual void  SetWhiteTexture() = 0;
+
+    // Summary:
+    //  Gets the white texture Id.
+    virtual int  GetWhiteTextureId() const = 0;
+
+    // Summary:
+    //  Gets the white texture Id.
+    virtual int  GetBlackTextureId() const = 0;
+
+    // Summary:
+    //  Draws a 2d image on the screen.
+    // Example:
+    //  Hud etc.
+    virtual void  Draw2dImage(float xpos, float ypos, float w, float h, int texture_id, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0, float r = 1, float g = 1, float b = 1, float a = 1, float z = 1) = 0;
+
+    virtual void  Draw2dImageStretchMode(bool stretch) = 0;
+
+    // Summary:
+    //  Adds a 2d image that should be drawn on the screen to an internal render list. The list can be drawn with Draw2dImageList.
+    //  If several images will be drawn, using this function is more efficient than calling Draw2dImage as it allows better batching.
+    //  The function supports placing images in stereo 3d space.
+    // Arguments:
+    //      stereoDepth - Places image in stereo 3d space. The depth is specified in camera space, the stereo params are the same that
+    //                                  are used for the scene. A value of 0 is handled as a special case and always places the image on the screen plane.
+    virtual void  Push2dImage(float xpos, float ypos, float w, float h, int texture_id, float s0 = 0, float t0 = 0, float s1 = 1, float t1 = 1, float angle = 0, float r = 1, float g = 1, float b = 1, float a = 1, float z = 1, float stereoDepth = 0) = 0;
+
+    // Summary:
+    //  Draws all images to the screen that were collected with Push2dImage.
+    virtual void  Draw2dImageList() = 0;
+
+    // Summary:
+    //  Draws a image using the current matrix.
+    virtual void DrawImage(float xpos, float ypos, float w, float h, int texture_id, float s0, float t0, float s1, float t1, float r, float g, float b, float a, bool filtered = true) = 0;
+
+    // Description:
+    //  Draws a image using the current matrix, more flexible than DrawImage
+    //  order for s and t: 0=left_top, 1=right_top, 2=right_bottom, 3=left_bottom.
+    virtual void DrawImageWithUV(float xpos, float ypos, float z, float width, float height, int texture_id, float* s, float* t, float r = 1, float g = 1, float b = 1, float a = 1, bool filtered = true) = 0;
+
+    // Summary:
+    //  Sets the polygon mode with Push, Pop restores the last used one
+    // Example:
+    //  Wireframe, solid.
+    virtual void PushWireframeMode(int mode) = 0;
+    virtual void PopWireframeMode() = 0;
+
+    // Summary:
+    //  Gets height of the main rendering resolution.
+    virtual int   GetHeight() const = 0;
+
+    // Summary:
+    //  Gets width of the main rendering resolution.
+    virtual int   GetWidth() const = 0;
+
+    // Summary:
+    //  Gets Pixel Aspect Ratio.
+    virtual float GetPixelAspectRatio() const = 0;
+
+    // Summary:
+    //  Gets the height of the overlay viewport where UI and debug output are rendered.
+    virtual int   GetOverlayHeight() const = 0;
+
+    // Summary:
+    //  Gets the width of the overlay viewport where UI and debug output are rendered.
+    virtual int   GetOverlayWidth() const = 0;
+
+    // Summary:
+    //  Gets the maximum dimension for a square custom render resolution.
+    virtual int   GetMaxSquareRasterDimension() const = 0;
+
+    // Summary:
+    //  Switches subsequent rendering from the internal backbuffer to the native resolution backbuffer if available.
+    virtual void  SwitchToNativeResolutionBackbuffer() = 0;
+
+    // Summary:
+    //  Gets memory status information
+    virtual void GetMemoryUsage(ICrySizer* Sizer) = 0;
+
+    // Summary:
+    //  Gets textures streaming bandwidth information
+    virtual void GetBandwidthStats(float* fBandwidthRequested) = 0;
+
+    // Summary:
+    //  Sets an event listener for texture streaming updates
+    virtual void SetTextureStreamListener(ITextureStreamListener* pListener) = 0;
+
+    // Summary:
+    //  Populates a CPU-side occlusion buffer with the contents from the previous frame's downsampled depth buffer.
+    //  This will be called from a job thread within the occlusion system.
+    virtual int GetOcclusionBuffer(uint16* pOutOcclBuffer, Matrix44* pmCamBuffer) = 0;
+
+    // Summary:
+    //   Gets a screenshot and save to a file
+    // Returns:
+    //   true=success
+    virtual bool ScreenShot(const char* filename = NULL, int width = 0) = 0;
+
+    // Summary:
+    //  Gets current bpp.
+    virtual int GetColorBpp() = 0;
+
+    // Summary:
+    //  Gets current z-buffer depth.
+    virtual int GetDepthBpp() = 0;
+
+    // Summary:
+    //  Gets current stencil bits.
+    virtual int GetStencilBpp() = 0;
+
+    // Summary:
+    //  Returns true if stereo rendering is enabled.
+    virtual bool IsStereoEnabled() const = 0;
+
+    // Summary:
+    //  Returns values of nearest rendering z-range max
+    virtual float GetNearestRangeMax() const = 0;
+
+    // Summary:
+    //  Returns the PerInstanceConstantBufferPool
+    virtual PerInstanceConstantBufferPool* GetPerInstanceConstantBufferPoolPointer() = 0;
+
+    // Summary:
+    //  Projects to screen.
+    //  Returns true if successful.
+    virtual bool ProjectToScreen(
+        float ptx, float pty, float ptz,
+        float* sx, float* sy, float* sz) = 0;
+
+    // Summary:
+    //  Unprojects to screen.
+    virtual int UnProject(
+        float sx, float sy, float sz,
+        float* px, float* py, float* pz,
+        const float modelMatrix[16],
+        const float projMatrix[16],
+        const int    viewport[4]) = 0;
+
+    // Summary:
+    //  Unprojects from screen.
+    virtual int UnProjectFromScreen(
+        float  sx, float  sy, float  sz,
+        float* px, float* py, float* pz) = 0;
+
+    // Remarks:
+    //  For editor.
+    virtual void  GetModelViewMatrix(float* mat) = 0;
+
+    // Remarks:
+    //  For editor.
+    virtual void  GetProjectionMatrix(float* mat) = 0;
+
+    virtual bool WriteDDS(const byte* dat, int wdt, int hgt, int Size, const char* name, ETEX_Format eF, int NumMips) = 0;
+    virtual bool WriteTGA(const byte* dat, int wdt, int hgt, const char* name, int src_bits_per_pixel, int dest_bits_per_pixel) = 0;
+    virtual bool WriteJPG(const byte* dat, int wdt, int hgt, char* name, int src_bits_per_pixel, int nQuality = 100) = 0;
+
+    /////////////////////////////////////////////////////////////////////////////////
+    //Replacement functions for Font
+
+    static const bool FontCreateTextureGenMipsDefaultValue = false;
+    virtual int  FontCreateTexture(int Width, int Height, byte* pData, ETEX_Format eTF = eTF_R8G8B8A8, bool genMips = FontCreateTextureGenMipsDefaultValue, const char* textureName = nullptr) = 0;
+    virtual bool FontUpdateTexture(int nTexId, int X, int Y, int USize, int VSize, byte* pData) = 0;
+    virtual void FontSetTexture(int nTexId, int nFilterMode) = 0;
+    virtual void FontSetRenderingState(bool overrideViewProjMatrices, TransformationMatrices& backupMatrices) = 0;
+    virtual void FontSetBlending(int src, int dst, int baseState) = 0;
+    virtual void FontRestoreRenderingState(bool overrideViewProjMatrices, const TransformationMatrices& restoringMatrices) = 0;
+
+    virtual bool FlushRTCommands(bool bWait, bool bImmediatelly, bool bForce) = 0;
+    virtual void DrawStringU(IFFont_RenderProxy* pFont, float x, float y, float z, const char* pStr, bool asciiMultiLine, const STextDrawContext& ctx) const = 0;
+
+    virtual int  RT_CurThreadList() = 0;
+
+    /////////////////////////////////////////////////////////////////////////////////
+    // External interface for shaders
+    /////////////////////////////////////////////////////////////////////////////////
+    virtual bool EF_PrecacheResource(SShaderItem* pSI, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter = 1) = 0;
+    virtual bool EF_PrecacheResource(IShader* pSH, float fMipFactor, float fTimeToReady, int Flags) = 0;
+    virtual bool EF_PrecacheResource(ITexture* pTP, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId, int nCounter = 1) = 0;
+    virtual bool EF_PrecacheResource(IRenderMesh* pPB, _smart_ptr<IMaterial> pMaterial, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId) = 0;
+    virtual bool EF_PrecacheResource(CDLight* pLS, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId) = 0;
+
+    virtual ITexture* EF_CreateCompositeTexture(int type, const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, ETEX_Format eTF, const STexComposition* pCompositions, size_t nCompositions, int8 nPriority = -1) = 0;
+
+    virtual void PostLevelLoading() = 0;
+    virtual void PostLevelUnload() = 0;
+
+    virtual CRenderObject* EF_AddPolygonToScene(SShaderItem& si, int numPts, const SVF_P3F_C4B_T2F* verts, const SPipTangents* tangs, CRenderObject* obj, const SRenderingPassInfo& passInfo, uint16* inds, int ninds, int nAW, const SRendItemSorter& rendItemSorter) = 0;
+    virtual CRenderObject* EF_AddPolygonToScene(SShaderItem& si, CRenderObject* obj, const SRenderingPassInfo& passInfo, int numPts, int ninds, SVF_P3F_C4B_T2F*& verts, SPipTangents*& tangs, uint16*& inds, int nAW, const SRendItemSorter& rendItemSorter) = 0;
+
+    // This is a workaround for when an editor viewport needs to do immediate rendering
+    // in the editor. Specifically, global constants are updated in a deferred fashion, so
+    // if a viewport (like the lens flare view) starts doing main-thread rendering, those
+    // parameters are not bound.
+    virtual void ForceUpdateGlobalShaderParameters() {}
+
+    /////////////////////////////////////////////////////////////////////////////////
+    // Shaders/Shaders management /////////////////////////////////////////////////////////////////////////////////
+
+    virtual const char* EF_GetShaderMissLogPath() = 0;
+
+    /////////////////////////////////////////////////////////////////////////////////
+    virtual string* EF_GetShaderNames(int& nNumShaders) = 0;
+    // Summary:
+    //  Reloads file
+    virtual bool          EF_ReloadFile (const char* szFileName) = 0;
+    // Summary:
+    //  Reloads file at any time the renderer feels to do so (no guarantees, but likely on next frame update)
+    //  Is threadsafe
+    virtual bool          EF_ReloadFile_Request (const char* szFileName) = 0;
+
+    // Summary:
+    //      Remaps shader gen mask to common global mask.
+    virtual uint64      EF_GetRemapedShaderMaskGen(const char* name, uint64 nMaskGen = 0, bool bFixup = 0) = 0;
+
+    virtual uint64      EF_GetShaderGlobalMaskGenFromString(const char* szShaderName, const char* szShaderGen, uint64 nMaskGen = 0) = 0;
+    virtual AZStd::string EF_GetStringFromShaderGlobalMaskGen(const char* szShaderName, uint64 nMaskGen = 0) = 0;
+
+    virtual const SShaderProfile& GetShaderProfile(EShaderType eST) const = 0;
+    virtual void          EF_SetShaderQuality(EShaderType eST, EShaderQuality eSQ) = 0;
+
+    // Summary:
+    //  Gets renderer quality.
+    virtual ERenderQuality EF_GetRenderQuality() const = 0;
+    // Summary:
+    //  Gets shader type quality.
+    virtual EShaderQuality EF_GetShaderQuality(EShaderType eST) = 0;
+    // Summary:
+    //  Loads shader item for name (name).
+    virtual SShaderItem   EF_LoadShaderItem (const char* szName, bool bShare, int flags = 0, SInputShaderResources* Res = NULL, uint64 nMaskGen = 0) = 0;
+    // Summary:
+    //  Loads shader for name (name).
+    virtual IShader* EF_LoadShader (const char* name, int flags = 0, uint64 nMaskGen = 0) = 0;
+    // Summary:
+    //  Reinitializes all shader files (build hash tables).
+    virtual void          EF_ReloadShaderFiles (int nCategory) = 0;
+    // Summary:
+    //  Reloads all texture files.
+    virtual void          EF_ReloadTextures () = 0;
+    // Summary:
+    //  Gets texture object by ID.
+    virtual ITexture* EF_GetTextureByID(int Id) = 0;
+    // Summary:
+    //  Gets texture object by Name.
+    virtual ITexture* EF_GetTextureByName(const char* name, uint32 flags = 0) = 0;
+    // Summary:
+    //  Loads the texture for name(nameTex).
+    virtual ITexture* EF_LoadTexture(const char* nameTex, uint32 flags = 0) = 0;
+    virtual ITexture* EF_LoadCubemapTexture(const char* nameTex, uint32 flags = 0) = 0;
+    // Summary:
+    //  Loads default texture whose life cycle is managed by Texture Manager, do not try to release them by yourself!
+    virtual ITexture* EF_LoadDefaultTexture(const char* nameTex) = 0;
+
+    // Summary:
+    //  Loads lightmap for name.
+    virtual int           EF_LoadLightmap (const char* name) = 0;
+
+    // Summary:
+    //  Starts using of the shaders (return first index for allow recursions).
+    virtual void EF_StartEf (const SRenderingPassInfo& passInfo) = 0;
+
+    virtual SRenderObjData* EF_GetObjData(CRenderObject* pObj, bool bCreate, int nThreadID) = 0;
+
+    // Summary:
+    //  Gets CRenderObject for RE transformation.
+    //Get temporary RenderObject
+    virtual CRenderObject* EF_GetObject_Temp (int nThreadID) = 0;
+
+    //Get permanent RenderObject
+    virtual CRenderObject* EF_DuplicateRO(CRenderObject* pObj, const SRenderingPassInfo& passInfo) = 0;
+
+    // Summary:
+    //  Adds shader to the list.
+    virtual void EF_AddEf (IRenderElement* pRE, SShaderItem& pSH, CRenderObject* pObj, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter) = 0;
+
+    //! Draw all shaded REs in the list
+    virtual void EF_EndEf3D (int nFlags, int nPrecacheUpdateId, int nNearPrecacheUpdateId, const SRenderingPassInfo& passInfo) = 0;
+
+    virtual void EF_InvokeShadowMapRenderJobs(int nFlags) = 0;
+
+    // Dynamic lights
+    void EF_ClearLightsList() {}; // For FC Compatibility.
+    virtual bool EF_IsFakeDLight (const CDLight* Source) = 0;
+    virtual void EF_ADDDlight(CDLight* Source, const SRenderingPassInfo& passInfo) = 0;
+    virtual bool EF_UpdateDLight(SRenderLight* pDL) = 0;
+    virtual bool EF_AddDeferredDecal([[maybe_unused]] const SDeferredDecal& rDecal){return true; }
+
+    // Deferred lights/vis areas
+
+    virtual int EF_AddDeferredLight(const CDLight& pLight, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter) = 0;
+    virtual uint32 EF_GetDeferredLightsNum(eDeferredLightType eLightType = eDLT_DeferredLight) = 0;
+    virtual void EF_ClearDeferredLightsList() = 0;
+
+    virtual uint8 EF_AddDeferredClipVolume(const IClipVolume* pClipVolume) = 0;
+    virtual bool EF_SetDeferredClipVolumeBlendData(const IClipVolume* pClipVolume, const SClipVolumeBlendInfo& blendInfo) = 0;
+    virtual void EF_ClearDeferredClipVolumesList() = 0;
+
+    // called in between levels to free up memory
+    virtual void EF_ReleaseDeferredData() = 0;
+
+    // called in between levels to free up memory
+    virtual void EF_ReleaseInputShaderResource(SInputShaderResources* pRes) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Post processing effects interfaces
+
+    virtual void EF_SetPostEffectParam(const char* pParam, float fValue, bool bForceValue = false) = 0;
+    virtual void EF_SetPostEffectParamVec4(const char* pParam, const Vec4& pValue, bool bForceValue = false) = 0;
+    virtual void EF_SetPostEffectParamString(const char* pParam, const char* pszArg) = 0;
+
+    virtual void EF_GetPostEffectParam(const char* pParam, float& fValue) = 0;
+    virtual void EF_GetPostEffectParamVec4(const char* pParam, Vec4& pValue) = 0;
+    virtual void EF_GetPostEffectParamString(const char* pParam, const char*& pszArg) = 0;
+
+    virtual int32 EF_GetPostEffectID(const char* pPostEffectName) = 0;
+
+    virtual void EF_ResetPostEffects(bool bOnSpecChange = false) = 0;
+
+    virtual void SyncPostEffects() = 0;
+
+    virtual void EF_DisableTemporalEffects() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual void EF_AddWaterSimHit(const Vec3& vPos, float scale, float strength) = 0;
+    virtual void EF_DrawWaterSimHits() = 0;
+
+    /////////////////////////////////////////////////////////////////////////////////
+    // 2d interface for the shaders
+    /////////////////////////////////////////////////////////////////////////////////
+    virtual void EF_EndEf2D(bool bSort) = 0;
+
+    // Summary:
+    //   Returns various Renderer Settings, see ERenderQueryTypes.
+    // Arguments:
+    //   Query - e.g. EFQ_GetShaderCombinations.
+    //   rInOut - Input/Output Parameter, depends on the query if written to/read from, or both
+    void EF_Query(ERenderQueryTypes eQuery)
+    {
+        EF_QueryImpl(eQuery, NULL, 0, NULL, 0);
+    }
+    template<typename T>
+    void EF_Query(ERenderQueryTypes eQuery, T& rInOut)
+    {
+        EF_QueryImpl(eQuery, static_cast<void*>(&rInOut), sizeof(T), NULL, 0);
+    }
+    template<typename T0, typename T1>
+    void EF_Query(ERenderQueryTypes eQuery, T0& rInOut0, T1& rInOut1)
+    {
+        EF_QueryImpl(eQuery, static_cast<void*>(&rInOut0), sizeof(T0), static_cast<void*>(&rInOut1), sizeof(T1));
+    }
+
+    // Summary:
+    //   Toggles render mesh garbage collection
+    // Arguments:
+    //   Param -
+    virtual void ForceGC() = 0;
+
+    // Remarks:
+    //  For stats.
+    virtual int  GetPolyCount() const = 0;
+    virtual void GetPolyCount(int& nPolygons, int& nShadowVolPolys) const = 0;
+
+    // Note:
+    //  3d engine set this color to fog color.
+    virtual void SetClearColor(const Vec3& vColor) = 0;
+  
+    virtual void SetClearBackground(bool bClearBackground) = 0;
+
+    // Summary:
+    //  Creates/deletes RenderMesh object.
+    virtual _smart_ptr<IRenderMesh> CreateRenderMesh(
+        const char* szType
+        , const char* szSourceName
+        , IRenderMesh::SInitParamerers* pInitParams = NULL
+        , ERenderMeshType eBufType = eRMT_Static
+        ) = 0;
+
+    virtual _smart_ptr<IRenderMesh> CreateRenderMeshInitialized(
+        const void* pVertBuffer, int nVertCount, const AZ::Vertex::Format& vertexFormat,
+        const vtx_idx* pIndices, int nIndices,
+        const PublicRenderPrimitiveType nPrimetiveType, const char* szType, const char* szSourceName, ERenderMeshType eBufType = eRMT_Static,
+        int nMatInfoCount = 1, int nClientTextureBindID = 0,
+        bool (* PrepareBufferCallback)(IRenderMesh*, bool) = NULL,
+        void* CustomData = NULL,
+        bool bOnlyVideoBuffer = false,
+        bool bPrecache = true,
+        const SPipTangents* pTangents = NULL, bool bLockForThreadAcc = false, Vec3* pNormals = NULL) = 0;
+
+    //Pass false to get a frameID that increments by one each frame. For this case the increment happens in the game thread at the beginning of the frame.
+    virtual int GetFrameID(bool bIncludeRecursiveCalls = true) = 0;
+
+    virtual void MakeMatrix(const Vec3& pos, const Vec3& angles, const Vec3& scale, Matrix34* mat) = 0;
+
+    // Description:
+    //   Draws text queued.
+    // Note:
+    //   Position can be in 3d or in 2d depending on the flags.
+    virtual void DrawTextQueued(Vec3 pos, SDrawTextInfo& ti, const char* format, va_list args) = 0;
+
+    // Description:
+    //   Draws text queued.
+    // Note:
+    //   Position can be in 3d or in 2d depending on the flags.
+    virtual void DrawTextQueued(Vec3 pos, SDrawTextInfo& ti, const char* text) = 0;
+
+    //////////////////////////////////////////////////////////////////////
+
+    virtual float ScaleCoordX(float value) const = 0;
+    virtual float ScaleCoordY(float value) const = 0;
+    virtual void ScaleCoord(float& x, float& y) const = 0;
+
+    virtual void SetState(int State, int AlphaRef = -1) = 0;
+    virtual void SetCullMode  (int mode = R_CULL_BACK) = 0;
+    virtual void SetStencilState(int st, uint32 nStencRef, uint32 nStencMask, uint32 nStencWriteMask, bool bForceFullReadMask = false) = 0;
+
+    virtual void PushProfileMarker(const char* label) = 0;
+    virtual void PopProfileMarker(const char* label) = 0;
+
+    virtual bool EnableFog(bool enable) = 0;
+    virtual void SetFogColor(const ColorF& color) = 0;
+
+    virtual void SetColorOp(byte eCo, byte eAo, byte eCa, byte eAa) = 0;
+    virtual void SetSrgbWrite(bool srgbWrite) = 0;
+
+    // for one frame allows to disable limit of texture streaming requests
+    virtual void RequestFlushAllPendingTextureStreamingJobs([[maybe_unused]] int nFrames) { }
+
+    // allows to dynamically adjust texture streaming load depending on game conditions
+    virtual void SetTexturesStreamingGlobalMipFactor([[maybe_unused]] float fFactor) { }
+
+    //////////////////////////////////////////////////////////////////////
+    // Summary:
+    //  Interface for auxiliary geometry (for debugging, editor purposes, etc.)
+    virtual IRenderAuxGeom* GetIRenderAuxGeom(void* jobID = 0) = 0;
+    //////////////////////////////////////////////////////////////////////
+
+    //  Interface for renderer side SVO
+    virtual ISvoRenderer* GetISvoRenderer() { return 0; }
+
+    virtual IColorGradingController* GetIColorGradingController() = 0;
+    virtual IStereoRenderer* GetIStereoRenderer() = 0;
+
+    virtual ITexture* Create2DTexture(const char* name, int width, int height, int numMips, int flags, unsigned char* data, ETEX_Format format) = 0;
+    virtual void TextToScreen(float x, float y, const char* format, ...) PRINTF_PARAMS(4, 5) = 0;
+    virtual void TextToScreenColor(int x, int y, float r, float g, float b, float a, const char* format, ...) PRINTF_PARAMS(8, 9) = 0;
+    virtual void ResetToDefault() = 0;
+    virtual void SetMaterialColor(float r, float g, float b, float a) = 0;
+
+    // Sets default Blend, DepthStencil and Raster states.
+    virtual void SetDefaultRenderStates() = 0;
+
+    virtual void Graph(byte* g, int x, int y, int wdt, int hgt, int nC, int type, const char* text, ColorF& color, float fScale) = 0;
+    virtual void EF_RenderTextMessages() = 0;
+
+    virtual void ClearTargetsImmediately(uint32 nFlags) = 0;
+    virtual void ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors, float fDepth) = 0;
+    virtual void ClearTargetsImmediately(uint32 nFlags, const ColorF& Colors) = 0;
+    virtual void ClearTargetsImmediately(uint32 nFlags, float fDepth) = 0;
+
+    virtual void ClearTargetsLater(uint32 nFlags) = 0;
+    virtual void ClearTargetsLater(uint32 nFlags, const ColorF& Colors, float fDepth) = 0;
+    virtual void ClearTargetsLater(uint32 nFlags, const ColorF& Colors) = 0;
+    virtual void ClearTargetsLater(uint32 nFlags, float fDepth) = 0;
+
+    virtual void ReadFrameBuffer(unsigned char* pRGB, int nImageX, int nSizeX, int nSizeY, ERB_Type eRBType, bool bRGBA, int nScaledX = -1, int nScaledY = -1) = 0;
+    virtual void ReadFrameBufferFast(uint32* pDstARGBA8, int dstWidth, int dstHeight, bool BGRA = true) = 0;
+
+    // Note:
+    //  The following functions will be removed.
+    virtual void EnableVSync(bool enable) = 0;
+
+    virtual void CreateResourceAsync(SResourceAsync* Resource) = 0;
+    virtual void ReleaseResourceAsync(SResourceAsync* Resource) = 0;
+    virtual void ReleaseResourceAsync(AZStd::unique_ptr<SResourceAsync> pResource) = 0;
+    virtual unsigned int DownLoadToVideoMemory(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
+    virtual unsigned int DownLoadToVideoMemory3D(const byte* data, int w, int h, int d, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
+    virtual unsigned int DownLoadToVideoMemoryCube(const byte* data, int w, int h, ETEX_Format eTFSrc, ETEX_Format eTFDst, int nummipmap, bool repeat = true, int filter = FILTER_BILINEAR, int Id = 0, const char* szCacheName = NULL, int flags = 0, EEndian eEndian = eLittleEndian, RectI* pRegion = NULL, bool bAsynDevTexCreation = false) = 0;
+    virtual void UpdateTextureInVideoMemory(uint32 tnum, const byte* newdata, int posx, int posy, int w, int h, ETEX_Format eTFSrc = eTF_B8G8R8, int posz = 0, int sizez = 1) = 0;
+
+    virtual bool DXTCompress(const byte* raw_data, int nWidth, int nHeight, ETEX_Format eTF, bool bUseHW, bool bGenMips, int nSrcBytesPerPix, MIPDXTcallback callback) = 0;
+    virtual bool DXTDecompress(const byte* srcData, size_t srcFileSize, byte* dstData, int nWidth, int nHeight, int nMips, ETEX_Format eSrcTF, bool bUseHW, int nDstBytesPerPix) = 0;
+    virtual void RemoveTexture(unsigned int TextureId) = 0;
+    virtual void DeleteFont(IFFont* font) = 0;
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    // This routines uses 2 destination surfaces.  It triggers a backbuffer copy to one of its surfaces,
+    // and then copies the other surface to system memory.  This hopefully will remove any
+    // CPU stalls due to the rect lock call since the buffer will already be in system
+    // memory when it is called
+    // Inputs :
+    //          pDstARGBA8          :   Pointer to a buffer that will hold the captured frame (should be at least 4*dstWidth*dstHieght for RGBA surface)
+    //          destinationWidth    :   Width of the frame to copy
+    //          destinationHeight   :   Height of the frame to copy
+    //
+    //          Note :  If dstWidth or dstHeight is larger than the current surface dimensions, the dimensions
+    //                  of the surface are used for the copy
+    //
+    virtual bool CaptureFrameBufferFast(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight) = 0;
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Copy a captured surface to a buffer
+    //
+    // Inputs :
+    //          pDstARGBA8          :   Pointer to a buffer that will hold the captured frame (should be at least 4*dstWidth*dstHieght for RGBA surface)
+    //          destinationWidth    :   Width of the frame to copy
+    //          destinationHeight   :   Height of the frame to copy
+    //
+    //          Note :  If dstWidth or dstHeight is larger than the current surface dimensions, the dimensions
+    //                  of the surface are used for the copy
+    //
+    virtual bool CopyFrameBufferFast(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight) = 0;
+
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    // This routine registers a callback address that is called when a new frame is available
+    // Inputs :
+    //          pCapture            :   Address of the ICaptureFrameListener object
+    //
+    // Outputs : returns true if successful, otherwise false
+    //
+    virtual bool RegisterCaptureFrame(ICaptureFrameListener* pCapture) = 0;
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    // This routine unregisters a callback address that was previously registered
+    // Inputs :
+    //          pCapture            :   Address of the ICaptureFrameListener object to unregister
+    //
+    // Outputs : returns true if successful, otherwise false
+    //
+    virtual bool UnRegisterCaptureFrame(ICaptureFrameListener* pCapture) = 0;
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    // This routine initializes 2 destination surfaces for use by the CaptureFrameBufferFast routine
+    // It also, captures the current backbuffer into one of the created surfaces
+    //
+    // Inputs :
+    //          bufferWidth : Width of capture buffer, on consoles the scaling is done on the GPU. Pass in 0 (the default) to use backbuffer dimensions
+    //          bufferHeight    : Height of capture buffer.
+    //
+    // Outputs : returns true if surfaces were created otherwise returns false
+    //
+    virtual bool InitCaptureFrameBufferFast(uint32 bufferWidth = 0, uint32 bufferHeight = 0) = 0;
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    // This routine releases the 2 surfaces used for frame capture by the CaptureFrameBufferFast routine
+    //
+    // Inputs : None
+    //
+    // Returns : None
+    //
+    virtual void CloseCaptureFrameBufferFast(void) = 0;
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    // This routine checks for any frame buffer callbacks that are needed and calls them
+    //
+    // Inputs : None
+    //
+    //  Outputs : None
+    //
+    virtual void CaptureFrameBufferCallBack(void) = 0;
+
+    virtual void RegisterSyncWithMainListener(ISyncMainWithRenderListener* pListener) = 0;
+    virtual void RemoveSyncWithMainListener(const ISyncMainWithRenderListener* pListener) = 0;
+
+    virtual void Set2DMode(uint32 orthoX, uint32 orthoY, TransformationMatrices& backupMatrices, float znear = -1e10f, float zfar = 1e10f) = 0;
+    virtual void Unset2DMode(const TransformationMatrices& restoringMatrices) = 0;
+    virtual void Set2DModeNonZeroTopLeft(float orthoLeft, float orthoTop, float orthoWidth, float orthoHeight, TransformationMatrices& backupMatrices, float znear = -1e10f, float zfar = 1e10f) = 0;
+
+    virtual int ScreenToTexture(int nTexID) = 0;
+    virtual void EnableSwapBuffers(bool bEnable) = 0;
+    virtual WIN_HWND GetHWND() = 0;
+
+    // Set the window icon to be displayed on the output window.
+    // The parameter is the path to a DDS texture file to be used as the icon.
+    // For best results, pass a square power-of-two sized texture, with a mip-chain.
+    virtual bool SetWindowIcon(const char* path) = 0;
+
+    virtual void OnEntityDeleted(struct IRenderNode* pRenderNode) = 0;
+
+    virtual int CreateRenderTarget(const char* name, int nWidth, int nHeight, const ColorF& clearColor, ETEX_Format eTF) = 0;
+    virtual bool DestroyRenderTarget (int nHandle) = 0;
+    virtual bool ResizeRenderTarget(int nHandle, int nWidth, int nHeight) = 0;
+    virtual bool SetRenderTarget(int nHandle, SDepthTexture* pDepthSurf = nullptr) = 0;
+    virtual SDepthTexture* CreateDepthSurface(int nWidth, int nHeight, bool shaderResourceView = false) = 0;
+    virtual void DestroyDepthSurface(SDepthTexture* pDepthSurf) = 0;
+
+    // Note:
+    //  Used for pausing timer related stuff.
+    // Example:
+    //  For texture animations, and shader 'time' parameter.
+    virtual void PauseTimer(bool bPause) = 0;
+
+    // Description:
+    //    Creates an Interface to the public params container.
+    // Return:
+    //    Created IShaderPublicParams interface.
+    virtual IShaderPublicParams* CreateShaderPublicParams() = 0;
+
+    virtual void GetThreadIDs(threadID& mainThreadID, threadID& renderThreadID) const = 0;
+
+    struct SArtProfileData
+    {
+        enum EArtProfileUnit
+        {
+            eArtProfileUnit_GPU = 0,
+            eArtProfileUnit_CPU,
+            eArtProfile_NumUnits
+        };
+
+        enum EArtProfileSections
+        {
+            eArtProfile_Shadows = 0,
+            eArtProfile_ZPass,
+            eArtProfile_Decals,
+            eArtProfile_Lighting,
+            eArtProfile_Opaque,
+            eArtProfile_Transparent,
+            eArtProfile_Max,
+        };
+
+        float times[eArtProfile_Max];
+        float budgets[eArtProfile_Max];
+        float total, budgetTotal;
+
+        // detailed values for anything that is grouped together and can be timed
+        enum EBreakdownDetailValues
+        {
+            // Lighting
+            eArtProfileDetail_LightsAmbient,
+            eArtProfileDetail_LightsCubemaps,
+            eArtProfileDetail_LightsDeferred,
+            eArtProfileDetail_LightsShadowMaps, // just the cost of the shadow maps
+
+            // Transparent
+            eArtProfileDetail_Reflections,
+            eArtProfileDetail_Caustics,
+            eArtProfileDetail_RefractionOverhead, // partial resolves
+            eArtProfileDetail_Rain,
+            eArtProfileDetail_LensOptics,
+
+            eArtProfileDetail_Max,
+        };
+
+        float breakdowns[eArtProfileDetail_Max];
+
+        int batches, drawcalls, processedLights;
+
+#if defined(ENABLE_ART_RT_TIME_ESTIMATE)
+        int numStandardBatches;
+        int numStandardDrawCalls;
+        int numLightDrawCalls;
+        float actualRenderTimeMinusPost;
+        float actualRenderTimePost;
+        float actualMiscRTTime;
+        float actualTotalRTTime;
+#endif
+    };
+
+    virtual void EnableGPUTimers2(bool bEnabled) = 0;
+    virtual void AllowGPUTimers2(bool bAllow) = 0;
+    virtual const RPProfilerStats* GetRPPStats(ERenderPipelineProfilerStats eStat, bool bCalledFromMainThread = true) const = 0;
+    virtual const RPProfilerStats* GetRPPStatsArray(bool bCalledFromMainThread = true) const = 0;
+
+    virtual int GetPolygonCountByType(uint32 EFSList, EVertexCostTypes vct, uint32 z, bool bCalledFromMainThread = true) = 0;
+
+    virtual void SetCloudShadowsParams(int nTexID, const Vec3& speed, float tiling, bool invert, float brightness) = 0;
+    virtual uint16 PushFogVolumeContribution(const SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo) = 0;
+    virtual void PushFogVolume(class CREFogVolume* pFogVolume, const SRenderingPassInfo& passInfo) = 0;
+
+    virtual int GetMaxTextureSize() = 0;
+
+    virtual const char* GetTextureFormatName(ETEX_Format eTF) = 0;
+    virtual int GetTextureFormatDataSize(int nWidth, int nHeight, int nDepth, int nMips, ETEX_Format eTF) = 0;
+
+    virtual void SetDefaultMaterials(_smart_ptr<IMaterial> pDefMat, _smart_ptr<IMaterial> pTerrainDefMat) = 0;
+
+    virtual IGPUParticleEngine* GetGPUParticleEngine() const { return 0; }
+
+    virtual uint32 GetActiveGPUCount() const = 0;
+    virtual ShadowFrustumMGPUCache* GetShadowFrustumMGPUCache() = 0;
+    virtual const StaticArray<int, MAX_GSM_LODS_NUM>& GetCachedShadowsResolution() const = 0;
+    virtual void SetCachedShadowsResolution(const StaticArray<int, MAX_GSM_LODS_NUM>& arrResolutions) = 0;
+    virtual void UpdateCachedShadowsLodCount(int nGsmLods) const = 0;
+
+    virtual void SetTexturePrecaching(bool stat) = 0;
+
+    //platform specific
+    virtual void    RT_InsertGpuCallback(uint32 context, GpuCallbackFunc callback) = 0;
+    virtual void EnablePipelineProfiler(bool bEnable) = 0;
+
+    struct SRenderTimes
+    {
+        float fWaitForMain;
+        float fWaitForRender;
+        float fWaitForGPU;
+        float fTimeProcessedRT;
+        float fTimeProcessedRTScene;    //The part of the render thread between the "SCENE" profiler labels
+        float fTimeProcessedGPU;
+        float fTimeGPUIdlePercent;
+    };
+    virtual void GetRenderTimes(SRenderTimes& outTimes) = 0;
+    virtual float GetGPUFrameTime() = 0;
+
+    // Enable the batch mode if the meshpools are used to enable quick and dirty flushes.
+    virtual void EnableBatchMode(bool enable) = 0;
+    // Flag level unloading in progress to disable f.i. rendermesh creation requests
+    virtual void EnableLevelUnloading(bool enable) = 0;
+    // Function to handle cleanup required if a level load fails
+    virtual void OnLevelLoadFailed() = 0;
+
+    struct SDrawCallCountInfo
+    {
+        static const uint32 MESH_NAME_LENGTH = 32;
+        static const uint32 TYPE_NAME_LENGTH = 16;
+
+        SDrawCallCountInfo()
+            : pPos(0, 0, 0)
+            , nZpass(0)
+            , nShadows(0)
+            , nGeneral(0)
+            , nTransparent(0)
+            , nMisc(0)
+        {
+            meshName[0] = '\0';
+            typeName[0] = '\0';
+        }
+
+        void Update(CRenderObject* pObj, IRenderMesh* pRM);
+
+        Vec3 pPos;
+        uint8 nZpass, nShadows, nGeneral, nTransparent, nMisc;
+        char meshName[MESH_NAME_LENGTH];
+        char typeName[TYPE_NAME_LENGTH];
+    };
+
+    //Debug draw call info (per node)
+    typedef AZStd::unordered_map< IRenderNode*, IRenderer::SDrawCallCountInfo, AZStd::hash<IRenderNode*>, AZStd::equal_to<IRenderNode*>, AZ::StdLegacyAllocator > RNDrawcallsMapNode;
+    typedef RNDrawcallsMapNode::iterator RNDrawcallsMapNodeItor;
+
+    //Debug draw call info (per mesh)
+    typedef AZStd::unordered_map< IRenderMesh*, IRenderer::SDrawCallCountInfo, AZStd::hash<IRenderMesh*>, AZStd::equal_to<IRenderMesh*>, AZ::StdLegacyAllocator > RNDrawcallsMapMesh;
+    typedef RNDrawcallsMapMesh::iterator RNDrawcallsMapMeshItor;
+
+#if !defined(_RELEASE)
+    //Get draw call info for frame
+    virtual RNDrawcallsMapMesh& GetDrawCallsInfoPerMesh(bool mainThread = true) = 0;
+    virtual RNDrawcallsMapMesh& GetDrawCallsInfoPerMeshPreviousFrame(bool mainThread = true) = 0;
+    virtual RNDrawcallsMapNode& GetDrawCallsInfoPerNodePreviousFrame(bool mainThread = true) = 0;
+    virtual int GetDrawCallsPerNode(IRenderNode* pRenderNode) = 0;
+    virtual void ForceRemoveNodeFromDrawCallsMap(IRenderNode* pNode) = 0;
+#endif
+
+    virtual void CollectDrawCallsInfo(bool status) = 0;
+    virtual void CollectDrawCallsInfoPerNode(bool status) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Summary:
+    //   Helper functions to draw text.
+    //////////////////////////////////////////////////////////////////////////
+    void DrawLabel(Vec3 pos, float font_size, const char* label_text, ...) PRINTF_PARAMS(4, 5)
+    {
+        va_list args;
+        va_start(args, label_text);
+        SDrawTextInfo ti;
+        ti.xscale = ti.yscale = font_size;
+        ti.flags = eDrawText_FixedSize | eDrawText_800x600;
+        DrawTextQueued(pos, ti, label_text, args);
+        va_end(args);
+    }
+
+    void DrawLabelEx(Vec3 pos, float font_size, const float* pfColor, bool bFixedSize, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        va_list args;
+        va_start(args, label_text);
+        SDrawTextInfo ti;
+        ti.xscale = ti.yscale = font_size;
+        ti.flags = ((bFixedSize) ? eDrawText_FixedSize : 0) | ((bCenter) ? eDrawText_Center : 0) | eDrawText_800x600;
+        if (pfColor)
+        {
+            ti.color[0] = pfColor[0];
+            ti.color[1] = pfColor[1];
+            ti.color[2] = pfColor[2];
+            ti.color[3] = pfColor[3];
+        }
+        DrawTextQueued(pos, ti, label_text, args);
+        va_end(args);
+    }
+
+    void Draw2dLabelEx(float x, float y, float font_size, const ColorF& fColor, EDrawTextFlags flags, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        va_list args;
+        va_start(args, label_text);
+        SDrawTextInfo ti;
+        ti.xscale = ti.yscale = font_size;
+        ti.flags = flags;
+        {
+            ti.color[0] = fColor[0];
+            ti.color[1] = fColor[1];
+            ti.color[2] = fColor[2];
+            ti.color[3] = fColor[3];
+        }
+        DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
+        va_end(args);
+    }
+
+    void Draw2dLabel(float x, float y, float font_size, const float* pfColor, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        va_list args;
+        va_start(args, label_text);
+        SDrawTextInfo ti;
+        ti.xscale = ti.yscale = font_size;
+        ti.flags = eDrawText_2D | eDrawText_800x600 | eDrawText_FixedSize | ((bCenter) ? eDrawText_Center : 0);
+        if (pfColor)
+        {
+            ti.color[0] = pfColor[0];
+            ti.color[1] = pfColor[1];
+            ti.color[2] = pfColor[2];
+            ti.color[3] = pfColor[3];
+        }
+        DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
+        va_end(args);
+    }
+
+    void Draw2dLabel(float x, float y, float font_size, const ColorF& fColor, bool bCenter, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        va_list args;
+        va_start(args, label_text);
+        SDrawTextInfo ti;
+        ti.xscale = ti.yscale = font_size;
+        ti.flags = eDrawText_2D | eDrawText_800x600 | eDrawText_FixedSize | ((bCenter) ? eDrawText_Center : 0);
+        {
+            ti.color[0] = fColor[0];
+            ti.color[1] = fColor[1];
+            ti.color[2] = fColor[2];
+            ti.color[3] = fColor[3];
+        }
+        DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
+        va_end(args);
+    }
+
+    // BLM - Added override that takes flags manually, so we can draw monospaced, etc.
+    void Draw2dLabelWithFlags(float x, float y, float font_size, const ColorF& fColor, uint32 flags, const char* label_text, ...) PRINTF_PARAMS(7, 8)
+    {
+        va_list args;
+        va_start(args, label_text);
+        SDrawTextInfo ti;
+        ti.xscale = ti.yscale = font_size;
+        ti.flags = flags;
+        {
+            ti.color[0] = fColor[0];
+            ti.color[1] = fColor[1];
+            ti.color[2] = fColor[2];
+            ti.color[3] = fColor[3];
+        }
+        DrawTextQueued(Vec3(x, y, 0.5f), ti, label_text, args);
+        va_end(args);
+    }
+
+    /**
+    * Used to determine if the renderer has loaded default system
+    * textures yet.
+    *
+    * Some textures like s_ptexWhite aren't available until this is true.
+    *
+    * @return True if the renderer has loaded default resources
+    */
+    virtual bool HasLoadedDefaultResources() { return false; }
+
+    // Summary:
+    virtual SSkinningData* EF_CreateSkinningData(uint32 nNumBones, bool bNeedJobSyncVar, bool bUseMatrixSkinning = false) = 0;
+    virtual SSkinningData* EF_CreateRemappedSkinningData(uint32 nNumBones, SSkinningData* pSourceSkinningData, uint32 nCustomDataSize, uint32 pairGuid) = 0;
+    virtual void EF_ClearSkinningDataPool() = 0;
+    virtual int EF_GetSkinningPoolID() = 0;
+
+    virtual void ClearShaderItem(SShaderItem* pShaderItem) = 0;
+    virtual void UpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial) = 0;
+    virtual void ForceUpdateShaderItem(SShaderItem* pShaderItem, _smart_ptr<IMaterial> pMaterial) = 0;
+    virtual void RefreshShaderResourceConstants(SShaderItem* pShaderItem, IMaterial* pMaterial) = 0;
+
+    // Summary:
+    //  Determine if a switch to stereo mode will occur at the start of the next frame
+    virtual bool IsStereoModeChangePending() = 0;
+
+    // Summary:
+    // Lock/Unlock the video memory buffer used by particles when using the jobsystem
+    virtual void LockParticleVideoMemory(uint32 nId) = 0;
+    virtual void UnLockParticleVideoMemory(uint32 nId) = 0;
+
+    // Summary:
+    // tell the renderer that we will begin/stop spawning jobs which generate SRendItems
+    virtual void BeginSpawningGeneratingRendItemJobs(int nThreadID) = 0;
+    virtual void BeginSpawningShadowGeneratingRendItemJobs(int nThreadID) = 0;
+    virtual void EndSpawningGeneratingRendItemJobs() = 0;
+
+    virtual void StartLoadtimePlayback(ILoadtimeCallback* pCallback) = 0;
+    virtual void StopLoadtimePlayback() = 0;
+
+    // Summary:
+    // get the shared job state for SRendItem Generating jobs
+    virtual AZ::LegacyJobExecutor* GetGenerateRendItemJobExecutor() = 0;
+    virtual AZ::LegacyJobExecutor* GetGenerateShadowRendItemJobExecutor() = 0;
+    virtual AZ::LegacyJobExecutor* GetGenerateRendItemJobExecutorPreProcess() = 0;
+    virtual AZ::LegacyJobExecutor* GetFinalizeRendItemJobExecutor(int nThreadID) = 0;
+    virtual AZ::LegacyJobExecutor* GetFinalizeShadowRendItemJobExecutor(int nThreadID) = 0;
+
+    virtual void FlushPendingTextureTasks() = 0;
+
+    virtual void SetShadowJittering(float fShadowJittering) = 0;
+    virtual float GetShadowJittering() const = 0;
+
+    virtual bool LoadShaderStartupCache() = 0;
+    virtual void UnloadShaderStartupCache() = 0;
+
+    virtual bool LoadShaderLevelCache() = 0;
+    virtual void UnloadShaderLevelCache() = 0;
+
+    virtual void StartScreenShot([[maybe_unused]] int e_ScreenShot) {};
+    virtual void EndScreenShot([[maybe_unused]] int e_ScreenShot) {};
+
+    // Sets a renderer tracked cvar
+    virtual void SetRendererCVar(ICVar* pCVar, const char* pArgText, bool bSilentMode = false) = 0;
+
+    // Get the render piepline
+    virtual SRenderPipeline* GetRenderPipeline() = 0;
+
+    // Get the sahder manager
+    virtual CShaderMan* GetShaderManager() = 0;
+
+    // Get render thread
+    virtual SRenderThread* GetRenderThread() = 0;
+
+    // Get premade white texture
+    virtual ITexture* GetWhiteTexture() = 0;
+
+    // Get the texture for the name and format given
+    virtual ITexture* GetTextureForName(const char* name, uint32 nFlags, ETEX_Format eFormat) = 0;
+
+    // Get the camera view parameters
+    virtual const CameraViewParameters& GetViewParameters() = 0;
+
+    // Get frame reset number
+    virtual uint32 GetFrameReset() = 0;
+
+    // Get original depth buffer
+    virtual SDepthTexture* GetDepthBufferOrig() = 0;
+
+    // Get width of backbuffer
+    virtual uint32 GetBackBufferWidth() = 0;
+
+    // Get height of backbuffer
+    virtual uint32 GetBackBufferHeight() = 0;
+
+    // Get the device buffer manager
+    virtual CDeviceBufferManager* GetDeviceBufferManager() = 0;
+
+    // Get render tile info
+    virtual const SRenderTileInfo* GetRenderTileInfo() const = 0;
+
+    // Returns precomputed identity matrix
+    virtual Matrix44A GetIdentityMatrix() = 0;
+
+    // Get current GPU group Id. Used for tracking which GPU is being used
+    virtual int32 RT_GetCurrGpuID() const = 0;
+
+    // Generate the next texture id
+    virtual int GenerateTextureId() = 0;
+
+    // Set culling mode
+    virtual void SetCull(ECull eCull, bool bSkipMirrorCull = false) = 0;
+
+    // Draw a 2D quad
+    virtual void DrawQuad(float x0, float y0, float x1, float y1, const ColorF& color, float z = 1.0f, float s0 = 0.0f, float t0 = 0.0f, float s1 = 1.0f, float t1 = 1.0f) = 0;
+
+    // Draw a quad
+    virtual void DrawQuad3D(const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, const ColorF& color, float ftx0, float fty0, float ftx1, float fty1) = 0;
+
+    // Resets render pipeline state
+    virtual void FX_ResetPipe() = 0;
+
+    // Gets an (existing) depth surface of the dimensions given
+    virtual SDepthTexture* FX_GetDepthSurface(int nWidth, int nHeight, bool bAA, bool shaderResourceView = false) = 0;
+
+    // Check to see if buffers are full and if so flush
+    virtual void FX_CheckOverflow(int nVerts, int nInds, IRenderElement* re, int* nNewVerts = nullptr, int* nNewInds = nullptr) = 0;
+
+    // Perform pre render work
+    virtual void FX_PreRender(int Stage) = 0;
+
+    // Perform post render work
+    virtual void FX_PostRender() = 0;
+
+    // Set render states
+    virtual void FX_SetState(int st, int AlphaRef = -1, int RestoreState = 0) = 0;
+
+    // Commit render states
+    virtual void FX_CommitStates(const SShaderTechnique* pTech, const SShaderPass* pPass, bool bUseMaterialState) = 0;
+
+    // Commit changes made thus dar
+    virtual void FX_Commit(bool bAllowDIP = false) = 0;
+
+    // Sets vertex declaration
+    virtual long FX_SetVertexDeclaration(int StreamMask, const AZ::Vertex::Format& vertexFormat) = 0;
+
+    // Draw indexed prim
+    virtual void FX_DrawIndexedPrimitive(eRenderPrimitiveType eType, int nVBOffset, int nMinVertexIndex, int nVerticesCount, int nStartIndex, int nNumIndices, bool bInstanced = false) = 0;
+
+    // Set Index stream
+    virtual long FX_SetIStream(const void* pB, uint32 nOffs, RenderIndexType idxType) = 0;
+
+    // Set vertex stream
+    virtual long FX_SetVStream(int nID, const void* pB, uint32 nOffs, uint32 nStride, uint32 nFreq = 1) = 0;
+
+    // Draw primitives
+    virtual void FX_DrawPrimitive(eRenderPrimitiveType eType, int nStartVertex, int nVerticesCount, int nInstanceVertices = 0) = 0;
+
+    // Clear texture
+    virtual void FX_ClearTarget(ITexture* pTex) = 0;
+
+    // Clear depth
+    virtual void FX_ClearTarget(SDepthTexture* pTex) = 0;
+
+    // Set render target
+    virtual bool FX_SetRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount = 1) = 0;
+
+    // Pushes render target
+    virtual bool FX_PushRenderTarget(int nTarget, void* pTargetSurf, SDepthTexture* pDepthTarget, uint32 nTileCount = 1) = 0;
+
+    // Sets up the render target
+    virtual bool FX_SetRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, bool bPush = false, int nCMSide = -1, bool bScreenVP = false, uint32 nTileCount = 1) = 0;
+
+    // Push render target
+    virtual bool FX_PushRenderTarget(int nTarget, CTexture* pTarget, SDepthTexture* pDepthTarget, int nCMSide = -1, bool bScreenVP = false, uint32 nTileCount = 1) = 0;
+
+    // Restore render target
+    virtual bool FX_RestoreRenderTarget(int nTarget) = 0;
+
+    // Pop render target
+    virtual bool FX_PopRenderTarget(int nTarget) = 0;
+
+    // Set active render targets
+    virtual void FX_SetActiveRenderTargets(bool bAllowDIP = false) = 0;
+
+    // Start an effect / shader / etc..
+    virtual void FX_Start(CShader* ef, int nTech, CShaderResources* Res, IRenderElement* re) = 0;
+
+    // Pop render target on render thread
+    virtual void RT_PopRenderTarget(int nTarget) = 0;
+
+    // Sets viewport dimensions on render thread
+    virtual void RT_SetViewport(int x, int y, int width, int height, int id = -1) = 0;
+
+    // Push render target on render thread
+    virtual void RT_PushRenderTarget(int nTarget, CTexture* pTex, SDepthTexture* pDS, int nS) = 0;
+
+    // Setup scissors rect
+    virtual void EF_Scissor(bool bEnable, int sX, int sY, int sWdt, int sHgt) = 0;
+
+#ifdef SUPPORT_HW_MOUSE_CURSOR
+    virtual IHWMouseCursor* GetIHWMouseCursor() = 0;
+#endif
+
+    virtual int GetRecursionLevel() = 0;
+
+    virtual int GetIntegerConfigurationValue(const char* varName, int defaultValue) = 0;
+    virtual float GetFloatConfigurationValue(const char* varName, float defaultValue) = 0;
+    virtual bool GetBooleanConfigurationValue(const char* varName, bool defaultValue) = 0;
+
+    // Methods exposed to external libraries
+    virtual void ApplyDepthTextureState(int unit, int nFilter, bool clamp) = 0;
+    virtual ITexture* GetZTargetTexture() = 0;
+    virtual int GetTextureState(const STexState& TS) = 0;
+    virtual uint32 TextureDataSize(uint32 nWidth, uint32 nHeight, uint32 nDepth, uint32 nMips, uint32 nSlices, ETEX_Format eTF, ETEX_TileMode eTM = eTM_None) = 0;
+    virtual void ApplyForID(int nID, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit, bool useWhiteDefault) = 0;
+    virtual ITexture* Create3DTexture(const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte* pData, ETEX_Format eTFSrc, ETEX_Format eTFDst) = 0;
+    virtual bool IsTextureExist(const ITexture* pTex) = 0;
+    virtual const char* NameForTextureFormat(ETEX_Format eTF) = 0;
+    virtual const char* NameForTextureType(ETEX_Type eTT) = 0;
+    virtual bool IsVideoThreadModeEnabled() = 0;
+    virtual IDynTexture* CreateDynTexture2(uint32 nWidth, uint32 nHeight, uint32 nTexFlags, const char* szSource, ETexPool eTexPool) = 0;
+    virtual uint32 GetCurrentTextureAtlasSize() = 0;
+
+    virtual void BeginProfilerSection(const char* name, uint32 eProfileLabelFlags = 0) = 0;
+    virtual void EndProfilerSection(const char* name) = 0;
+    virtual void AddProfilerLabel(const char* name) = 0;
+
+private:
+    // use private for EF_Query to prevent client code to submit arbitrary combinations of output data/size
+    virtual void EF_QueryImpl(ERenderQueryTypes eQuery, void* pInOut0, uint32 nInOutSize0, void* pInOut1, uint32 nInOutSize1) = 0;
+};
+
+struct SShaderCacheStatistics
+{
+    size_t m_nTotalLevelShaderCacheMisses;
+    size_t m_nGlobalShaderCacheMisses;
+    size_t m_nNumShaderAsyncCompiles;
+    bool m_bShaderCompileActive;
+
+    SShaderCacheStatistics()
+        : m_nTotalLevelShaderCacheMisses(0)
+        , m_nGlobalShaderCacheMisses(0)
+        , m_nNumShaderAsyncCompiles(0)
+        , m_bShaderCompileActive(false)
+    {}
+};
+
+// The statistics about the pool for render mesh data
+// Note:
+struct SMeshPoolStatistics
+{
+    // The size of the mesh data size in bytes
+    size_t nPoolSize;
+
+    // The amount of memory currently in use in the pool
+    size_t nPoolInUse;
+
+    // The highest amount of memory allocated within the mesh data pool
+    size_t nPoolInUsePeak;
+
+    // The size of the mesh data size in bytes
+    size_t nInstancePoolSize;
+
+    // The amount of memory currently in use in the pool
+    size_t nInstancePoolInUse;
+
+    // The highest amount of memory allocated within the mesh data pool
+    size_t nInstancePoolInUsePeak;
+
+    size_t nFallbacks;
+    size_t nInstanceFallbacks;
+    size_t nFlushes;
+
+    SMeshPoolStatistics()
+        : nPoolSize()
+        , nPoolInUse()
+        , nInstancePoolSize()
+        , nInstancePoolInUse()
+        , nInstancePoolInUsePeak()
+        , nFallbacks()
+        , nInstanceFallbacks()
+        , nFlushes()
+    {}
+};
+
+struct SRendererQueryGetAllTexturesParam
+{
+    SRendererQueryGetAllTexturesParam()
+        : pTextures(NULL)
+        , numTextures(0)
+    {
+    }
+
+    _smart_ptr<ITexture>* pTextures;
+    uint32 numTextures;
+};
+
+
+//////////////////////////////////////////////////////////////////////
+
+#define STRIPTYPE_NONE           0
+#define STRIPTYPE_ONLYLISTS      1
+#define STRIPTYPE_SINGLESTRIP    2
+#define STRIPTYPE_MULTIPLESTRIPS 3
+#define STRIPTYPE_DEFAULT        4
+
+/////////////////////////////////////////////////////////////////////
+
+struct IRenderMesh;
+
+//DOC-IGNORE-BEGIN
+#include "VertexFormats.h"
+//DOC-IGNORE-END
+
+struct SRestLightingInfo
+{
+    SRestLightingInfo()
+    {
+        averDir.zero();
+        averCol = Col_Black;
+        refPoint.zero();
+    }
+    Vec3 averDir;
+    ColorF averCol;
+    Vec3 refPoint;
+};
+
+class CLodValue
+{
+public:
+    CLodValue()
+    {
+        m_nLodA = -1;
+        m_nLodB = -1;
+        m_nDissolveRef = 0;
+    }
+
+    CLodValue(int nLodA)
+    {
+        m_nLodA = aznumeric_caster(nLodA);
+        m_nLodB = -1;
+        m_nDissolveRef = 0;
+    }
+
+    CLodValue(int nLodA, uint8 nDissolveRef, int nLodB)
+    {
+        m_nLodA = aznumeric_caster(nLodA);
+        m_nLodB = aznumeric_caster(nLodB);
+        m_nDissolveRef = nDissolveRef;
+    }
+
+    int LodA() const { return m_nLodA; }
+    int LodB() const { return m_nLodB; }
+
+    uint8 DissolveRefA() const { return m_nDissolveRef; }
+    uint8 DissolveRefB() const { return 255 - m_nDissolveRef; }
+
+private:
+    int16 m_nLodA;
+    int16 m_nLodB;
+    uint8 m_nDissolveRef;
+};
+
+// Description:
+//   Structure used to pass render parameters to Render() functions of IStatObj and ICharInstance.
+struct SRendParams
+{
+    SRendParams()
+    {
+        memset(this, 0, sizeof(SRendParams));
+        fAlpha = 1.f;
+        fRenderQuality = 1.f;
+        nRenderList = EFSLIST_GENERAL;
+        nAfterWater = 1;
+        mRenderFirstContainer = false;
+        NoDecalReceiver = false;
+    }
+
+    // Summary:
+    //  object transformations.
+    Matrix34* pMatrix;
+    struct SInstancingInfo* pInstInfo;
+    // Summary:
+    //  object previous transformations - motion blur specific.
+    Matrix34* pPrevMatrix;
+    // Summary:
+    //  VisArea that contains this object, used for RAM-ambient cube query
+    IVisArea*       m_pVisArea;
+    // Summary:
+    //  Override material.
+    _smart_ptr<IMaterial> pMaterial;
+    // Summary:
+    //   Weights stream for deform morphs.
+    IRenderMesh* pWeights;
+    // Summary:
+    //  Object Id for objects identification in renderer.
+    struct IRenderNode* pRenderNode;
+    // Summary:
+    //  Unique object Id for objects identification in renderer.
+    void* pInstance;
+    // Summary:
+    //   TerrainTexInfo for grass.
+    struct SSectorTextureSet* pTerrainTexInfo;
+    // Summary:
+    //   storage for LOD transition states.
+    struct CRNTmpData** ppRNTmpData;
+    // Summary:
+    //  dynamic render data object which can be set by the game
+    AZStd::vector<SShaderParam>* pShaderParams;
+    // Summary:
+    //  Ambient color for the object.
+    ColorF AmbientColor;
+    // Summary:
+    //  Custom sorting offset.
+    float       fCustomSortOffset;
+    // Summary:
+    //  Object alpha.
+    float     fAlpha;
+    // Summary:
+    //  Distance from camera.
+    float     fDistance;
+    // Summary:
+    //   Quality of shaders rendering.
+    float fRenderQuality;
+    // Summary:
+    //  Light mask to specify which light to use on the object.
+    uint32 nDLightMask;
+    // Summary:
+    //  Approximate information about the lights not included into nDLightMask.
+    //  SRestLightingInfo restLightInfo;
+    // Summary:
+    //  CRenderObject flags.
+    int32       dwFObjFlags;
+    // Summary:
+    //   Material layers blending amount
+    uint32 nMaterialLayersBlend;
+    // Summary:
+    //  Vision modes params
+    uint32 nVisionParams;
+    // Summary:
+    //  Vision modes params
+    uint32 nHUDSilhouettesParams;
+    // Summary:
+    //  Defines what pieces of pre-broken geometry has to be rendered
+    uint64 nSubObjHideMask;
+
+    //   Defines per object float custom data
+    float fCustomData[4];
+
+    //   Custom TextureID
+    int16 nTextureID;
+
+    //   Defines per object custom flags
+    uint16 nCustomFlags;
+
+    // The LOD value compute for rendering
+    CLodValue lodValue;
+
+    //   Defines per object custom data
+    uint8 nCustomData;
+
+    // Summary:
+    //   Defines per object DissolveRef value if used by shader.
+    uint8 nDissolveRef;
+    // Summary:
+    //   per-instance vis area stencil ref id
+    uint8   nClipVolumeStencilRef;
+    // Summary:
+    //   Custom offset for sorting by distance.
+    uint8  nAfterWater;
+
+    // Summary:
+    //   Material layers bitmask -> which material layers are active.
+    uint8 nMaterialLayers;
+
+    // Summary:
+    //  Force a sort value for render elements.
+    uint8 nRenderList;
+    // Summary:
+    //  Special sorter to ensure correct ordering even if parts of the 3DEngine are run in parallel
+    uint32 rendItemSorter;
+    // Summary:
+    // Render the first particle container only, instead of all the containers
+    bool mRenderFirstContainer;
+
+    // Summary:
+    // Check if the preview would Show Wireframe - Vera,Confetti
+    bool bIsShowWireframe;
+
+    //Summary:
+    // Force drawing static instead of deformable meshes
+    bool bForceDrawStatic;
+
+    bool NoDecalReceiver;
+};
diff --git a/Code/Legacy/CryCommon/ISerialize.h b/Code/Legacy/CryCommon/ISerialize.h
new file mode 100644
index 0000000000..48b0d8e3ca
--- /dev/null
+++ b/Code/Legacy/CryCommon/ISerialize.h
@@ -0,0 +1,1016 @@
+/*
+ * 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 : main header file
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_ISERIALIZE_H
+#define CRYINCLUDE_CRYCOMMON_ISERIALIZE_H
+#pragma once
+
+#include <Cry_Math.h>
+#include <IXml.h>
+#include "MiniQueue.h"
+#include <VectorSet.h>
+#include <VectorMap.h>
+#include <StlUtils.h>
+#include <AzCore/Math/Vector3.h>
+#include <list>
+
+class CTimeValue;
+// Forward template declaration
+template<class T, class U>
+class InterpolatedValue_tpl;
+
+// Unfortunately this needs to be here - should be in CryNetwork somewhere.
+struct SNetObjectID
+{
+    static const uint16 InvalidId = ~uint16(0);
+
+    SNetObjectID()
+        : id(InvalidId)
+        , salt(0) {}
+    SNetObjectID(uint16 i, uint16 s)
+        : id(i)
+        , salt(s) {}
+
+    uint16 id;
+    uint16 salt;
+
+    ILINE bool operator!() const
+    {
+        return id == InvalidId;
+    }
+    typedef uint16 (SNetObjectID::* unknown_bool_type);
+    ILINE operator unknown_bool_type() const
+    {
+        return !!(*this) ? &SNetObjectID::id : NULL;
+    }
+    ILINE bool operator!=(const SNetObjectID& rhs) const
+    {
+        return !(*this == rhs);
+    }
+    ILINE bool operator==(const SNetObjectID& rhs) const
+    {
+        return id == rhs.id && salt == rhs.salt;
+    }
+    ILINE bool operator<(const SNetObjectID& rhs) const
+    {
+        return id < rhs.id || (id == rhs.id && salt < rhs.salt);
+    }
+    ILINE bool operator>(const SNetObjectID& rhs) const
+    {
+        return id > rhs.id || (id == rhs.id && salt > rhs.salt);
+    }
+
+    bool IsLegal() const
+    {
+        return salt != 0;
+    }
+
+    const char* GetText(char* tmpBuf = nullptr, size_t bufferSize = 0) const
+    {
+        static char singlebuf[64];
+        if (!tmpBuf)
+        {
+            tmpBuf = singlebuf;
+            bufferSize = sizeof(singlebuf);
+        }
+
+        if (id == InvalidId)
+        {
+            sprintf_s(tmpBuf, bufferSize, "<nil>");
+        }
+        else if (!salt)
+        {
+            sprintf_s(tmpBuf, bufferSize, "illegal:%d:%d", id, salt);
+        }
+        else
+        {
+            sprintf_s(tmpBuf, bufferSize, "%d:%d", id, salt);
+        }
+
+        return tmpBuf;
+    }
+
+    uint32 GetAsUint32() const
+    {
+        return (uint32(salt) << 16) | id;
+    }
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
+
+    AUTO_STRUCT_INFO
+};
+
+// this enumeration details what "kind" of serialization we are
+// performing, so that classes that want to, for instance, tailor
+// the data they present depending on where data is being written
+// to can do so
+enum ESerializationTarget
+{
+    eST_SaveGame,
+    eST_Network,
+    eST_Script
+};
+
+// this inner class defines an interface so that OnUpdate
+// functions can be passed abstractly through to concrete
+// serialization classes
+struct ISerializeUpdateFunction
+{
+    // <interfuscator:shuffle>
+    virtual ~ISerializeUpdateFunction(){}
+    virtual void Execute() = 0;
+    // </interfuscator:shuffle>
+};
+
+// concrete implementation of IUpdateFunction for a general functor class
+template <class F_Update>
+class CSerializeUpdateFunction
+    : public ISerializeUpdateFunction
+{
+public:
+    CSerializeUpdateFunction(F_Update& update)
+        : m_rUpdate(update) {}
+
+    virtual void Execute()
+    {
+        m_rUpdate();
+    }
+
+private:
+    F_Update m_rUpdate;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Temporary class for string serialization.
+//////////////////////////////////////////////////////////////////////////
+struct SSerializeString
+{
+    AUTO_STRUCT_INFO
+
+    SSerializeString() {};
+    SSerializeString(const SSerializeString& src) { m_str.assign(src.c_str()); };
+    explicit SSerializeString(const char* sbegin, const char* send)
+        : m_str(sbegin, send) {};
+    ~SSerializeString() {}
+
+    // Casting to const char*
+    SSerializeString(const char* s)
+        : m_str(s) { };
+    //operator const char* () const { return m_str; }
+
+    SSerializeString& operator =(const SSerializeString& src) { m_str.assign(src.c_str()); return *this; }
+    SSerializeString& operator =(const char* src) { m_str.assign(src); return *this; }
+
+    bool operator != (const SSerializeString& src) { return m_str != src.m_str; }
+
+    size_t size() const { return m_str.size(); }
+    size_t length() const { return m_str.length(); }
+    const char* c_str() const { return m_str.c_str(); };
+    bool empty() const { return m_str.empty(); }
+    void resize(int sz) { m_str.resize(sz); }
+    void reserve(int sz) { m_str.reserve(sz); }
+
+    void set_string(const string& s)
+    {
+        m_str.assign(s.begin(), s.size());
+    }
+#if !defined(RESOURCE_COMPILER)
+    void set_string(const CryStringLocal& s)
+    {
+        m_str.assign(s.begin(), s.size());
+    }
+#endif
+    template<size_t S>
+    void set_string(const CryFixedStringT<S>& s)
+    {
+        m_str.assign(s.begin(), s.size());
+    }
+
+    operator const string () const {
+        return m_str;
+    }
+
+private:
+    string m_str;
+};
+
+// the ISerialize is intended to be implemented by objects that need
+// to read and write from various data sources, in such a way that
+// different tradeoffs can be balanced by the object that is being
+// serialized, and so that objects being serialized need only write
+// a single function in order to be read from and written to
+struct ISerialize
+{
+    static const int ENUM_POLICY_TAG = 0xe0000000;
+
+    ILINE ISerialize() {}
+
+    // <interfuscator:shuffle>
+    virtual ~ISerialize(){}
+
+    // this is for string values -- they need special support
+    virtual void ReadStringValue(const char* name, SSerializeString& curValue, uint32 policy = 0) = 0;
+    virtual void WriteStringValue(const char* name, SSerializeString& buffer, uint32 policy = 0) = 0;
+    // this function should be implemented to call the passed in interface
+    // if we are reading, and to not call it if we are writing
+    virtual void Update(ISerializeUpdateFunction* pUpdate) = 0;
+
+    // for network updates: notify the network engine that this value was only partially read and we
+    // should re-request an update from the server soon
+    virtual void FlagPartialRead() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // these functions should be implemented to deal with groups
+    //////////////////////////////////////////////////////////////////////////
+
+    // Begins a serialization group - must be matched by an EndGroup
+    // szName is preferably as short as possible for performance reasons
+    // Spaces in szName cause undefined behaviour, use alpha characters,underscore and numbers only for a name.
+    virtual void BeginGroup(const char* szName) = 0;
+    virtual bool BeginOptionalGroup(const char* szName, bool condition) = 0;
+    virtual void EndGroup() = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual bool IsReading() const = 0;
+    virtual bool ShouldCommitValues() const = 0;
+    virtual ESerializationTarget GetSerializationTarget() const = 0;
+    virtual bool Ok() const = 0;
+    // </interfuscator:shuffle>
+
+    // declare all primitive Value() implementations
+#define SERIALIZATION_TYPE(T) \
+    virtual void Value(const char* name, T & x, uint32 policy) = 0;
+#include "SerializationTypes.h"
+#undef SERIALIZATION_TYPE
+
+    // declare all primitive Value() implementations
+#define SERIALIZATION_TYPE(T) \
+    virtual void ValueWithDefault(const char* name, T & x, const T&defaultValue) = 0;
+#include "SerializationTypes.h"
+    SERIALIZATION_TYPE(SSerializeString)
+#undef SERIALIZATION_TYPE
+    void Value([[maybe_unused]] const char* name, [[maybe_unused]] AZ::Vector3& x)
+    {
+    }
+    template <class B>
+    void Value(const char* name, B& x)
+    {
+        Value(name, x, 0);
+    }
+
+    template <class B>
+    void Value(const char* name, B& x, uint32 policy);
+
+    template <class B>
+    void ValueWithDefault(const char* name, B& x, const B& defaultValue);
+};
+
+// this class provides a wrapper so that ISerialize can be used much more
+// easily; it is a template so that if we need to wrap a more specific
+// ISerialize implementation we can do so easily
+template <class TISerialize>
+class CSerializeWrapper
+{
+public:
+    CSerializeWrapper(TISerialize* pSerialize)
+        : m_pSerialize(pSerialize)
+    {
+    }
+
+    // we provide a wrapper around the abstract implementation
+    // ISerialize to allow easy changing of our
+    // interface, and easy implementation of our details.
+    // some of the wrappers are trivial, however for consistency, they
+    // have been made to follow the trend.
+
+    // the value function allows us to declare that a value needs
+    // to be serialized/deserialized; we can pass a serialization policy
+    // in order to compress the value, and an update function to allow
+    // us to be informed of when this value is changed
+    template <typename T_Value>
+    ILINE void Value(const char* szName, T_Value& value, int policy)
+    {
+        m_pSerialize->Value(szName, value, policy);
+    }
+
+    template <typename T_Value>
+    ILINE void Value(const char* szName, T_Value& value)
+    {
+        m_pSerialize->Value(szName, value);
+    }
+
+    void Value(const char* szName, string& value, int policy)
+    {
+        if (IsWriting())
+        {
+            SSerializeString& serializeString = SetSharedSerializeString(value);
+            m_pSerialize->WriteStringValue(szName, serializeString, policy);
+        }
+        else
+        {
+            if (GetSerializationTarget() != eST_Script)
+            {
+                value = "";
+            }
+
+            SSerializeString& serializeString = SetSharedSerializeString(value);
+            m_pSerialize->ReadStringValue(szName, serializeString, policy);
+            value = serializeString.c_str();
+        }
+    }
+    ILINE void Value(const char* szName, string& value)
+    {
+        Value(szName, value, 0);
+    }
+    void Value(const char* szName, const string& value, int policy)
+    {
+        if (IsWriting())
+        {
+            SSerializeString& serializeString = SetSharedSerializeString(value);
+            m_pSerialize->WriteStringValue(szName, serializeString, policy);
+        }
+        else
+        {
+            assert(0 && "This function can only be used for Writing");
+        }
+    }
+    ILINE void Value(const char* szName, const string& value)
+    {
+        Value(szName, value, 0);
+    }
+    template <typename T>
+    void Value(const char* szName, CryStringLocalT<T>& value, int policy)
+    {
+        if (IsWriting())
+        {
+            SSerializeString& serializeString = SetSharedSerializeString(value);
+            m_pSerialize->WriteStringValue(szName, serializeString, policy);
+        }
+        else
+        {
+            if (GetSerializationTarget() != eST_Script)
+            {
+                value = "";
+            }
+
+            SSerializeString& serializeString = SetSharedSerializeString(value);
+            m_pSerialize->ReadStringValue(szName, serializeString, policy);
+            value = serializeString.c_str();
+        }
+    }
+    template <typename T>
+    ILINE void Value(const char* szName, CryStringLocalT<T>& value)
+    {
+        Value(szName, value, 0);
+    }
+    template <typename T>
+    void Value(const char* szName, const CryStringLocalT<T>& value, int policy)
+    {
+        if (IsWriting())
+        {
+            SSerializeString& serializeString = SetSharedSerializeString(value);
+            m_pSerialize->WriteStringValue(szName, serializeString, policy);
+        }
+        else
+        {
+            assert(0 && "This function can only be used for Writing");
+        }
+    }
+    template <typename T>
+    ILINE void Value(const char* szName, const CryStringLocalT<T>& value)
+    {
+        Value(szName, value, 0);
+    }
+    template<size_t S>
+    void Value(const char* szName, CryFixedStringT<S>& value, int policy)
+    {
+        if (IsWriting())
+        {
+            SSerializeString& serializeString = SetSharedSerializeString(value);
+            m_pSerialize->WriteStringValue(szName, serializeString, policy);
+        }
+        else
+        {
+            if (GetSerializationTarget() != eST_Script)
+            {
+                value = "";
+            }
+
+            SSerializeString& serializeString = SetSharedSerializeString(value);
+            m_pSerialize->ReadStringValue(szName, serializeString, policy);
+            assert(serializeString.length() <= S);
+            value = serializeString.c_str();
+        }
+    }
+    template<size_t S>
+    ILINE void Value(const char* szName, CryFixedStringT<S>& value)
+    {
+        Value(szName, value, 0);
+    }
+    template <class T_Class, typename T_Value>
+    void Value(const char* szName, T_Class* pInst, T_Value (T_Class::* get)() const, void (T_Class::* set)(T_Value))
+    {
+        if (IsWriting())
+        {
+            T_Value temp = (pInst->*get)();
+            Value(szName, temp);
+        }
+        else
+        {
+            T_Value temp;
+            Value(szName, temp);
+            (pInst->*set)(temp);
+        }
+    }
+
+    template<class T, class TT>
+    void Value(const char* name, InterpolatedValue_tpl<T, TT>& val)
+    {
+        if (IsWriting())
+        {
+            T a = val.Get();
+            Value(name, a);
+        }
+
+        if (IsReading())
+        {
+            T a;
+            Value(name, a);
+            val.SetGoal(a);
+        }
+    }
+
+    template<class T, class TT>
+    void Value(const char* name, InterpolatedValue_tpl<T, TT>& val, int policy)
+    {
+        if (IsWriting())
+        {
+            T a = val.Get();
+            Value(name, a, policy);
+        }
+
+        if (IsReading())
+        {
+            T a;
+            Value(name, a, policy);
+            val.SetGoal(a);
+        }
+    }
+
+    bool ValueChar(const char* name, char* buffer, int len)
+    {
+        string temp;
+        if (IsReading())
+        {
+            Value(name, temp);
+            if ((int)temp.length() > len - 1)
+            {
+                return false;       // truncated read
+            }
+            memcpy(buffer, temp.data(), temp.length() + 1);
+            buffer[len - 1] = 0;
+        }
+        else
+        {
+            temp = string(buffer, buffer + len);
+            Value(name, temp);
+        }
+        return true;
+    }
+
+    template <typename T>
+    void ValueWithDefault(const char* name, T& x, const T& defaultValue)
+    {
+        m_pSerialize->ValueWithDefault(name, x, defaultValue);
+    }
+
+    void ValueWithDefault(const char* szName, string& value, const string& defaultValue)
+    {
+        static SSerializeString defaultSerializeString;
+
+        {
+            defaultSerializeString.set_string(defaultValue);
+        }
+
+        SSerializeString& serializeString = SetSharedSerializeString(value);
+        m_pSerialize->ValueWithDefault(szName, serializeString, defaultSerializeString);
+        if (IsReading())
+        {
+            value = serializeString.c_str();
+        }
+    }
+
+    template <class T_Class, typename T_Value, class T_SerializationPolicy>
+    void Value(const char* szName, T_Class* pInst, T_Value (T_Class::* get)() const, void (T_Class::* set)(T_Value),
+        const T_SerializationPolicy& policy)
+    {
+        if (IsWriting())
+        {
+            T_Value temp = (pInst->*get)();
+            Value(szName, temp, policy);
+        }
+        else
+        {
+            T_Value temp = static_cast<T_Value>(0);
+            Value(szName, temp, policy);
+            (pInst->*set)(temp);
+        }
+    }
+
+    // a value that is written by referring to a map of key/value pairs - we receive the key, and write the value
+    template <class T_Key, class T_Map>
+    void MappedValue(const char* szName, T_Key& value, const T_Map& mapper)
+    {
+        typedef typename T_Map::ValueType T_Value;
+
+        if (IsWriting())
+        {
+            T_Value write = mapper.KeyToValue(value);
+            Value(szName, write);
+        }
+        else
+        {
+            T_Value read;
+            Value(szName, read);
+            value = mapper.ValueToKey(read);
+        }
+    }
+
+#define CONTAINER_VALUE(container_type, insert_function)                                                                \
+    template <typename T_Value, class Allocator>                                                                        \
+    void Value(const char* name, container_type<T_Value, Allocator>&cont)                                               \
+    {                                                                                                                   \
+        if (!BeginOptionalGroup(name, true)) {return; }                                                                 \
+        if (IsWriting())                                                                                                \
+        {                                                                                                               \
+            uint32 count = cont.size();                                                                                 \
+            Value("Size", count);                                                                                       \
+            for (typename container_type<T_Value, Allocator>::iterator iter = cont.begin(); iter != cont.end(); ++iter) \
+            {                                                                                                           \
+                BeginGroup("i");                                                                                        \
+                T_Value value = *iter;                                                                                  \
+                Value("v", value);                                                                                      \
+                EndGroup();                                                                                             \
+            }                                                                                                           \
+        }                                                                                                               \
+        else                                                                                                            \
+        {                                                                                                               \
+            cont.clear();                                                                                               \
+            uint32 count = 0;                                                                                           \
+            Value("Size", count);                                                                                       \
+            while (count--)                                                                                             \
+            {                                                                                                           \
+                BeginGroup("i");                                                                                        \
+                T_Value temp;                                                                                           \
+                Value("v", temp);                                                                                       \
+                cont.insert_function(temp);                                                                             \
+                EndGroup();                                                                                             \
+            }                                                                                                           \
+        }                                                                                                               \
+        EndGroup();                                                                                                     \
+    }                                                                                                                   \
+    template <typename T_Value, class T_Map>                                                                            \
+    void MappedValue(const char* name, container_type<T_Value>&cont, const T_Map&mapper)                                \
+    {                                                                                                                   \
+        if (!BeginOptionalGroup(name, true)) {return; }                                                                 \
+        if (IsWriting())                                                                                                \
+        {                                                                                                               \
+            uint32 count = cont.size();                                                                                 \
+            Value("Size", count);                                                                                       \
+            for (typename container_type<T_Value>::iterator iter = cont.begin(); iter != cont.end(); ++iter)            \
+            {                                                                                                           \
+                BeginGroup("i");                                                                                        \
+                MappedValue("v", *iter, mapper);                                                                        \
+                EndGroup();                                                                                             \
+            }                                                                                                           \
+        }                                                                                                               \
+        else                                                                                                            \
+        {                                                                                                               \
+            cont.clear();                                                                                               \
+            uint32 count = 0;                                                                                           \
+            Value("Size", count);                                                                                       \
+            while (count--)                                                                                             \
+            {                                                                                                           \
+                BeginGroup("i");                                                                                        \
+                T_Value temp;                                                                                           \
+                MappedValue("v", temp, mapper);                                                                         \
+                cont.insert_function(temp);                                                                             \
+                EndGroup();                                                                                             \
+            }                                                                                                           \
+        }                                                                                                               \
+        EndGroup();                                                                                                     \
+    }
+
+#define PAIR_CONTAINER_VALUE(container_type, insert_function)                                                                                 \
+    template <typename T_Value1, typename T_Value2, class Allocator>                                                                          \
+    void Value(const char* name, container_type<std::pair<T_Value1, T_Value2>, Allocator>&cont)                                               \
+    {                                                                                                                                         \
+        if (!BeginOptionalGroup(name, true)) {return; }                                                                                       \
+        if (IsWriting())                                                                                                                      \
+        {                                                                                                                                     \
+            uint32 count = cont.size();                                                                                                       \
+            Value("Size", count);                                                                                                             \
+            for (typename container_type<std::pair<T_Value1, T_Value2>, Allocator>::iterator iter = cont.begin(); iter != cont.end(); ++iter) \
+            {                                                                                                                                 \
+                BeginGroup("i");                                                                                                              \
+                T_Value1 value1 = iter->first;                                                                                                \
+                T_Value2 value2 = iter->second;                                                                                               \
+                Value("v1", value1);                                                                                                          \
+                Value("v2", value2);                                                                                                          \
+                EndGroup();                                                                                                                   \
+            }                                                                                                                                 \
+        }                                                                                                                                     \
+        else                                                                                                                                  \
+        {                                                                                                                                     \
+            cont.clear();                                                                                                                     \
+            uint32 count = 0;                                                                                                                 \
+            Value("Size", count);                                                                                                             \
+            while (count--)                                                                                                                   \
+            {                                                                                                                                 \
+                BeginGroup("i");                                                                                                              \
+                T_Value1 temp1;                                                                                                               \
+                T_Value2 temp2;                                                                                                               \
+                Value("v1", temp1);                                                                                                           \
+                Value("v2", temp2);                                                                                                           \
+                cont.insert_function(std::pair<T_Value1, T_Value2>(temp1, temp2));                                                            \
+                EndGroup();                                                                                                                   \
+            }                                                                                                                                 \
+        }                                                                                                                                     \
+        EndGroup();                                                                                                                           \
+    }                                                                                                                                         \
+
+    CONTAINER_VALUE(std::vector, push_back);
+    CONTAINER_VALUE(std::list, push_back);
+    CONTAINER_VALUE(std::set, insert);
+    CONTAINER_VALUE(std::deque, push_back);
+    CONTAINER_VALUE(VectorSet, insert);
+    CONTAINER_VALUE(DynArray, insert);
+
+    PAIR_CONTAINER_VALUE(std::list, push_back);
+    PAIR_CONTAINER_VALUE(std::vector, push_back);
+
+    template <typename T_Value>
+    void DummyValues(uint32 numDummyValues)
+    {
+        T_Value dummyValue;
+        for (uint32 i = 0; i < numDummyValues; ++i)
+        {
+            Value("Value", dummyValue);
+        }
+    }
+
+    template <typename T_Value, uint8 N>
+    void Value(const char* name, MiniQueue<T_Value, N>& cont)
+    {
+        if (!BeginOptionalGroup(name, true))
+        {
+            return;
+        }
+        if (IsWriting())
+        {
+            uint32 count = cont.Size();
+            Value("Size", count);
+            for (typename MiniQueue<T_Value, N>::SIterator iter = cont.Begin(); iter != cont.End(); ++iter)
+            {
+                T_Value value = *iter;
+                Value("Value", value);
+            }
+        }
+        else
+        {
+            cont.Clear();
+            uint32 count = 0;
+            Value("Size", count);
+            while (count--)
+            {
+                T_Value temp;
+                Value("Value", temp);
+                cont.Push(temp);
+            }
+        }
+        DummyValues<T_Value>(cont.Capacity() - cont.Size());
+        EndGroup();
+    }
+    template <typename T_Value, uint8 N, class T_Map>
+    void MappedValue(const char* name, MiniQueue<T_Value, N>& cont, const T_Map& mapper)
+    {
+        if (!BeginOptionalGroup(name, true))
+        {
+            return;
+        }
+        if (IsWriting())
+        {
+            uint8 count = cont.Size();
+            Value("Size", count);
+            for (typename MiniQueue<T_Value, N>::SIterator iter = cont.Begin(); iter != cont.End(); ++iter)
+            {
+                BeginGroup("i");
+                MappedValue("Value", *iter, mapper);
+                EndGroup();
+            }
+        }
+        else
+        {
+            cont.Clear();
+            uint8 count = 0;
+            Value("Size", count);
+            while (count--)
+            {
+                BeginGroup("i");
+                T_Value temp;
+                MappedValue("Value", temp, mapper);
+                cont.Push(temp);
+                EndGroup();
+            }
+        }
+        EndGroup();
+    }
+
+#define MAP_CONTAINER_VALUE(container_type)                                                                         \
+    template <typename T_Key, typename T_Value>                                                                     \
+    void Value(const char* name, container_type<T_Key, T_Value>&cont)                                               \
+    {                                                                                                               \
+        if (!BeginOptionalGroup(name, true)) {return; }                                                             \
+        if (IsWriting())                                                                                            \
+        {                                                                                                           \
+            uint32 count = (uint32)cont.size();                                                                     \
+            Value("Size", count);                                                                                   \
+            for (typename container_type<T_Key, T_Value>::iterator iter = cont.begin(); iter != cont.end(); ++iter) \
+            {                                                                                                       \
+                T_Key tempKey = iter->first;                                                                        \
+                BeginGroup("pair");                                                                                 \
+                Value("k", tempKey);                                                                                \
+                Value("v", iter->second);                                                                           \
+                EndGroup();                                                                                         \
+            }                                                                                                       \
+        }                                                                                                           \
+        else                                                                                                        \
+        {                                                                                                           \
+            cont.clear();                                                                                           \
+            uint32 count;                                                                                           \
+            Value("Size", count);                                                                                   \
+            while (count--)                                                                                         \
+            {                                                                                                       \
+                std::pair<T_Key, T_Value> temp;                                                                     \
+                BeginGroup("pair");                                                                                 \
+                Value("k", temp.first);                                                                             \
+                Value("v", temp.second);                                                                            \
+                EndGroup();                                                                                         \
+                cont.insert(temp);                                                                                  \
+            }                                                                                                       \
+        }                                                                                                           \
+        EndGroup();                                                                                                 \
+    }
+
+#define HASH_CONTAINER_VALUE(container_type)                                                                                \
+    template <typename T_Key, typename T_Value, typename T_Hash>                                                            \
+    void Value(const char* name, container_type<T_Key, T_Value, T_Hash>&cont)                                               \
+    {                                                                                                                       \
+        if (!BeginOptionalGroup(name, true)) {return; }                                                                     \
+        if (IsWriting())                                                                                                    \
+        {                                                                                                                   \
+            uint32 count = (uint32)cont.size();                                                                             \
+            Value("Size", count);                                                                                           \
+            for (typename container_type<T_Key, T_Value, T_Hash>::iterator iter = cont.begin(); iter != cont.end(); ++iter) \
+            {                                                                                                               \
+                T_Key tempKey = iter->first;                                                                                \
+                BeginGroup("pair");                                                                                         \
+                Value("k", tempKey);                                                                                        \
+                Value("v", iter->second);                                                                                   \
+                EndGroup();                                                                                                 \
+            }                                                                                                               \
+        }                                                                                                                   \
+        else                                                                                                                \
+        {                                                                                                                   \
+            cont.clear();                                                                                                   \
+            uint32 count;                                                                                                   \
+            Value("Size", count);                                                                                           \
+            while (count--)                                                                                                 \
+            {                                                                                                               \
+                AZStd::pair<T_Key, T_Value> temp;                                                                           \
+                BeginGroup("pair");                                                                                         \
+                Value("k", temp.first);                                                                                     \
+                Value("v", temp.second);                                                                                    \
+                EndGroup();                                                                                                 \
+                cont.insert(temp);                                                                                          \
+            }                                                                                                               \
+        }                                                                                                                   \
+        EndGroup();                                                                                                         \
+    }
+    MAP_CONTAINER_VALUE(std::map);
+    MAP_CONTAINER_VALUE(std::multimap);
+    MAP_CONTAINER_VALUE(VectorMap);
+
+    HASH_CONTAINER_VALUE(AZStd::unordered_map);
+
+    template <typename T_Value>
+    ILINE void EnumValue(const char* szName, T_Value& value,
+        T_Value first, T_Value last)
+    {
+        int32 nValue = int32(value) - first;
+        Value(szName, nValue, ISerialize::ENUM_POLICY_TAG | (last - first));
+        value = T_Value(nValue + first);
+    }
+    template <typename T_Value, class T_Class>
+    ILINE void EnumValue(const char* szName,
+        T_Class* pClass, T_Value (T_Class::* GetValue)() const, void (T_Class::* SetValue)(T_Value),
+        T_Value first, T_Value last)
+    {
+        bool w = IsWriting();
+        int nValue;
+        if (w)
+        {
+            nValue = int32((pClass->*GetValue)()) - first;
+        }
+        Value(szName, nValue, ISerialize::ENUM_POLICY_TAG | (last - first));
+        if (!w)
+        {
+            (pClass->*SetValue)(T_Value(nValue + first));
+        }
+    }
+    /*
+    // we can request that a functor be called whenever our values
+    // are being updated by calling this function
+    template <class F_Update>
+    ILINE void OnUpdate( F_Update& update )
+    {
+        CUpdateFunction<F_Update> func(update);
+        m_pSerialize->Update( &func );
+    }
+    template <class T>
+    ILINE void OnUpdate( T * pCls, void (T::*func)() )
+    {
+        class CFunc : public IUpdateFunction
+        {
+        public:
+            CFunc( T * pCls, void (T::*func)() ) : m_pCls(pCls), m_func(func) {}
+            virtual void Execute()
+            {
+                (m_pCls->*m_func)();
+            }
+        private:
+            T * m_pCls;
+            void (T::*m_func)();
+        };
+        CFunc ifunc( pCls, func );
+        m_pSerialize->Update( &ifunc );
+    }
+    */
+    // groups help us find common data
+    ILINE void BeginGroup(const char* szName)
+    {
+        m_pSerialize->BeginGroup(szName);
+    }
+    ILINE bool BeginOptionalGroup(const char* szName, bool condition)
+    {
+        return m_pSerialize->BeginOptionalGroup(szName, condition);
+    }
+    ILINE void EndGroup()
+    {
+        m_pSerialize->EndGroup();
+    }
+
+    // fetch the serialization target
+    ILINE ESerializationTarget GetSerializationTarget() const
+    {
+        return m_pSerialize->GetSerializationTarget();
+    }
+
+    ILINE bool IsWriting() const
+    {
+        return !m_pSerialize->IsReading();
+    }
+    ILINE bool IsReading() const
+    {
+        return m_pSerialize->IsReading();
+    }
+    ILINE bool ShouldCommitValues() const
+    {
+        assert(m_pSerialize->IsReading());
+        return m_pSerialize->ShouldCommitValues();
+    }
+
+    ILINE bool Ok() const
+    {
+        return m_pSerialize->Ok();
+    }
+
+    friend ILINE TISerialize* GetImpl(CSerializeWrapper<TISerialize> ser)
+    {
+        return ser.m_pSerialize;
+    }
+
+    ILINE void FlagPartialRead()
+    {
+        m_pSerialize->FlagPartialRead();
+    }
+
+    operator CSerializeWrapper<ISerialize>()
+    {
+        return CSerializeWrapper<ISerialize>(m_pSerialize);
+    }
+
+    SSerializeString& SetSharedSerializeString(const string& str)
+    {
+        static SSerializeString serializeString;
+        serializeString.set_string(str);
+        return serializeString;
+    }
+
+#if !defined(RESOURCE_COMPILER)
+    SSerializeString& SetSharedSerializeString(const CryStringLocal& str)
+    {
+        
+
+        static SSerializeString serializeString;
+        serializeString.set_string(str);
+        return serializeString;
+    }
+#endif
+
+    template<size_t S>
+    SSerializeString& SetSharedSerializeString(const CryFixedStringT<S>& str)
+    {
+        
+
+        static SSerializeString serializeString;
+        serializeString.set_string(str);
+        return serializeString;
+    }
+
+private:
+    TISerialize* m_pSerialize;
+};
+
+// default serialize class to use!!
+typedef CSerializeWrapper<ISerialize> TSerialize;
+
+// simple struct to declare something serializable... useful for
+// exposition
+struct ISerializable
+{
+    virtual ~ISerializable(){}
+    virtual void SerializeWith(TSerialize) = 0;
+};
+
+template <class B>
+void ISerialize::Value(const char* name, B& x, uint32 policy)
+{
+    if (!BeginOptionalGroup(name, true))
+    {
+        return;
+    }
+    TSerialize  ser(this);
+    x.Serialize(ser);
+    EndGroup();
+}
+//
+//template <>
+//void ISerialize::Value(const char * name, AZ::Vector3& x, uint32 policy)
+//{
+//
+//}
+
+// Based off ValueWithDefault in SimpleSerialize.h
+template <class B>
+void ISerialize::ValueWithDefault(const char* name, B& x, const B& defaultValue)
+{
+    if (BeginOptionalGroup(name, x != defaultValue))
+    {
+        TSerialize  ser(this);
+        x.Serialize(ser);
+        EndGroup();
+    }
+    else if (IsReading())
+    {
+        x = defaultValue;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Used to automatically Begin/End group in serialization stream
+//////////////////////////////////////////////////////////////////////////
+struct SSerializeScopedBeginGroup
+{
+    SSerializeScopedBeginGroup(TSerialize& ser, const char* sGroupName)
+    {
+        m_pSer = &ser;
+        m_pSer->BeginGroup(sGroupName);
+    }
+    ~SSerializeScopedBeginGroup()
+    {
+        m_pSer->EndGroup();
+    }
+private:
+    TSerialize* m_pSer;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_ISERIALIZE_H
diff --git a/Code/Legacy/CryCommon/IShader.h b/Code/Legacy/CryCommon/IShader.h
new file mode 100644
index 0000000000..544a0b7ef7
--- /dev/null
+++ b/Code/Legacy/CryCommon/IShader.h
@@ -0,0 +1,3309 @@
+/*
+ * 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 : Shaders common interface.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_ISHADER_H
+#define CRYINCLUDE_CRYCOMMON_ISHADER_H
+#pragma once
+
+
+#if defined(LINUX) || defined(APPLE)
+  #include <platform.h>
+#endif
+
+#include "smartptr.h"
+#include "Cry_Vector2.h"
+#include "Cry_Vector3.h"
+#include "Cry_Matrix33.h"
+#include "Cry_Color.h"
+#include "smartptr.h"
+#include "StringUtils.h"
+#include <IXml.h> // <> required for Interfuscator
+#include "smartptr.h"
+#include "VertexFormats.h"
+#include <Vertex.h>
+#include <AzCore/Casting/numeric_cast.h>
+#include <AzCore/std/containers/map.h>
+
+#include "Cry_XOptimise.h"
+#include <CrySizer.h>
+#include <IMaterial.h>
+
+struct IMaterial;
+class CRendElementBase;
+class CRenderObject;
+class CREMesh;
+struct IRenderMesh;
+struct IShader;
+struct IVisArea;
+class CShader;
+class CRendElement;
+class CRendElementBase;
+class ITexAnim;
+struct SShaderPass;
+struct SShaderItem;
+class ITexture;
+struct IMaterial;
+struct SParam;
+struct SShaderSerializeContext;
+struct IAnimNode;
+struct SSkinningData;
+struct SSTexSamplerFX;
+struct SShaderTextureSlot;
+struct IRenderElement;
+
+namespace AZ
+{
+    class LegacyJobExecutor;
+
+    namespace Vertex
+    {
+        class Format;
+    }
+}
+
+//================================================================
+// Summary:
+//   Geometry Culling type.
+enum ECull
+{
+    eCULL_Back = 0, // Back culling flag.
+    eCULL_Front,    // Front culling flag.
+    eCULL_None      // No culling flag.
+};
+
+enum ERenderResource
+{
+    eRR_Unknown,
+    eRR_Mesh,
+    eRR_Texture,
+    eRR_Shader,
+    eRR_ShaderResource,
+};
+
+enum EEfResTextures : int // This needs a fixed size so the enum can be forward declared (needed by IMaterial.h)
+{
+    EFTT_DIFFUSE = 0,
+    EFTT_NORMALS,
+    EFTT_SPECULAR,
+    EFTT_ENV,
+    EFTT_DETAIL_OVERLAY,
+    EFTT_SECOND_SMOOTHNESS,
+    EFTT_HEIGHT,
+    EFTT_DECAL_OVERLAY,
+    EFTT_SUBSURFACE,
+    EFTT_CUSTOM,
+    EFTT_CUSTOM_SECONDARY,
+    EFTT_OPACITY,
+    EFTT_SMOOTHNESS,
+    EFTT_EMITTANCE,
+    EFTT_OCCLUSION,
+    EFTT_SPECULAR_2,
+
+    EFTT_MAX,
+    EFTT_UNKNOWN = EFTT_MAX
+};
+
+enum EEfResSamplers
+{
+    EFSS_ANISO_HIGH = 0,
+    EFSS_ANISO_LOW,
+    EFSS_TRILINEAR,
+    EFSS_BILINEAR,
+    EFSS_TRILINEAR_CLAMP,
+    EFSS_BILINEAR_CLAMP,
+    EFSS_ANISO_HIGH_BORDER,
+    EFSS_TRILINEAR_BORDER,
+
+    EFSS_MAX,
+};
+
+//=========================================================================
+
+// Summary:
+//   Array Pointers for Shaders.
+
+enum ESrcPointer
+{
+    eSrcPointer_Unknown,
+    eSrcPointer_Vert,
+    eSrcPointer_Color,
+    eSrcPointer_Tex,
+    eSrcPointer_TexLM,
+    eSrcPointer_Normal,
+    eSrcPointer_Tangent,
+    eSrcPointer_Max,
+};
+
+struct SWaveForm;
+struct SWaveForm2;
+
+#define FRF_REFRACTIVE 1
+// FREE                2
+#define FRF_HEAT       4
+#define MAX_HEATSCALE 4
+
+#if !defined(MAX_JOINT_AMOUNT)
+#error MAX_JOINT_AMOUNT is not defined
+#endif
+
+#if (MAX_JOINT_AMOUNT <= 256)
+typedef uint8 JointIdType;
+#else
+typedef uint16 JointIdType;
+#endif
+
+// The soft maximum cap for the sliders for emissive intensity.  Also used to clamp legacy glow calculations in MaterialHelpers::MigrateXmlLegacyData.
+// Note this is a "soft max" because the Emissive Intensity slider is capped at 200, but values higher than 200 may be entered in the text field.
+#define EMISSIVE_INTENSITY_SOFT_MAX 200.0f
+
+//=========================================================================
+
+enum EParamType
+{
+    eType_UNKNOWN,
+    eType_BYTE,
+    eType_BOOL,
+    eType_SHORT,
+    eType_INT,
+    eType_HALF,
+    eType_FLOAT,
+    eType_STRING,
+    eType_FCOLOR,
+    eType_VECTOR,
+    eType_TEXTURE_HANDLE,
+    eType_CAMERA,
+    eType_FCOLORA, //  with alpha channel
+};
+
+enum ESamplerType
+{
+    eSType_UNKNOWN,
+    eSType_Sampler,
+    eSType_SamplerComp,
+};
+
+union UParamVal
+{
+    byte m_Byte;
+    bool m_Bool;
+    short m_Short;
+    int m_Int;
+    float m_Float;
+    char* m_String;
+    float m_Color[4];
+    float m_Vector[3];
+    CCamera* m_pCamera;
+};
+
+// Note:
+//   In order to facilitate the memory allocation tracking, we're using here this class;
+//   if you don't like it, please write a substitute for all string within the project and use them everywhere.
+struct SShaderParam
+{
+    AZStd::string m_Name;
+    AZStd::string m_Script;
+    UParamVal m_Value;
+    EParamType m_Type;
+    uint8 m_eSemantic;
+    uint8 m_Pad[3] = { 0 };
+
+    inline void Construct()
+    {
+        memset(&m_Value, 0, sizeof(m_Value));
+        m_Type = eType_UNKNOWN;
+        m_eSemantic = 0;
+        m_Name.clear();
+        m_Script.clear();
+    }
+    inline SShaderParam()
+    {
+        Construct();
+    }
+    size_t Size()
+    {
+        size_t nSize = sizeof(*this);
+        if (m_Type == eType_STRING)
+        {
+            nSize += strlen (m_Value.m_String) + 1;
+        }
+
+        return nSize;
+    }
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(m_Script);
+        if (m_Type == eType_STRING)
+        {
+            pSizer->AddObject(m_Value.m_String, strlen (m_Value.m_String) + 1);
+        }
+    }
+
+    inline void Destroy()
+    {
+        if (m_Type == eType_STRING)
+        {
+            delete [] m_Value.m_String;
+        }
+    }
+    inline ~SShaderParam()
+    {
+        Destroy();
+    }
+    inline SShaderParam (const SShaderParam& src)
+    {
+        m_Name = src.m_Name;
+        m_Script = src.m_Script;
+        m_Type = src.m_Type;
+        m_eSemantic = src.m_eSemantic;
+        if (m_Type == eType_STRING)
+        {
+            const size_t len = strlen(src.m_Value.m_String) + 1;
+            m_Value.m_String = new char[len];
+            azstrcpy(m_Value.m_String, len, src.m_Value.m_String);
+        }
+        else
+        {
+            m_Value = src.m_Value;
+        }
+    }
+    inline SShaderParam& operator = (const SShaderParam& src)
+    {
+        this->~SShaderParam();
+        new(this)SShaderParam(src);
+        return *this;
+    }
+
+    static bool SetParam(const char* name, AZStd::vector<SShaderParam>* Params, const UParamVal& pr)
+    {
+        uint32 i;
+        for (i = 0; i < (uint32)Params->size(); i++)
+        {
+            SShaderParam* sp = &(*Params)[i];
+            if (!sp || &sp->m_Value == &pr)
+            {
+                continue;
+            }
+            if (azstricmp(sp->m_Name.c_str(), name) == 0)
+            {
+                if (sp->m_Type == eType_STRING)
+                {
+                    delete[] sp->m_Value.m_String;
+                }
+
+
+                switch (sp->m_Type)
+                {
+                case eType_FLOAT:
+                    sp->m_Value.m_Float = pr.m_Float;
+                    break;
+                case eType_SHORT:
+                    sp->m_Value.m_Short = pr.m_Short;
+                    break;
+                case eType_INT:
+                case eType_TEXTURE_HANDLE:
+                    sp->m_Value.m_Int = pr.m_Int;
+                    break;
+
+                case eType_VECTOR:
+                    sp->m_Value.m_Vector[0] = pr.m_Vector[0];
+                    sp->m_Value.m_Vector[1] = pr.m_Vector[1];
+                    sp->m_Value.m_Vector[2] = pr.m_Vector[2];
+                    break;
+
+                case eType_FCOLOR:
+                case eType_FCOLORA:
+                    sp->m_Value.m_Color[0] = pr.m_Color[0];
+                    sp->m_Value.m_Color[1] = pr.m_Color[1];
+                    sp->m_Value.m_Color[2] = pr.m_Color[2];
+                    sp->m_Value.m_Color[3] = pr.m_Color[3];
+                    break;
+
+                case eType_STRING:
+                {
+                    char* str = pr.m_String;
+                    const size_t len = strlen(str) + 1;
+                    sp->m_Value.m_String = new char [len];
+                    azstrcpy(sp->m_Value.m_String, len, str);
+                }
+                break;
+                }
+                break;
+            }
+        }
+        if (i == Params->size())
+        {
+            return false;
+        }
+        return true;
+    }
+    static bool GetValue(const char* szName, AZStd::vector<SShaderParam>* Params, float* v, int nID);
+
+    static bool GetValue(uint8 eSemantic, AZStd::vector<SShaderParam>* Params, float* v, int nID);
+
+    inline void CopyValue(const SShaderParam& src)
+    {
+        if (m_Type == eType_STRING && this != &src)
+        {
+            delete[] m_Value.m_String;
+
+            if (src.m_Type == eType_STRING)
+            {
+                size_t size = strlen(src.m_Value.m_String) + 1;
+                m_Value.m_String = new char[size];
+                azstrcpy(m_Value.m_String, size, src.m_Value.m_String);
+                return;
+            }
+        }
+
+        m_Value = src.m_Value;
+    }
+
+    inline void CopyValueNoString(const SShaderParam& src)
+    {
+        assert(m_Type != eType_STRING && src.m_Type != eType_STRING);
+
+        m_Value = src.m_Value;
+    }
+
+    inline void CopyType(const SShaderParam& src)
+    {
+        m_Type = src.m_Type;
+    }
+};
+
+
+// Description:
+//    IShaderPublicParams can be used to hold a collection of the shader public params.
+//    Manipulate this collection, and use them during rendering by submit to the SRendParams.
+struct IShaderPublicParams
+{
+    // <interfuscator:shuffle>
+    virtual ~IShaderPublicParams(){}
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+
+    // Description:
+    //    Changes number of parameters in collection.
+    virtual void SetParamCount(int nParam) = 0;
+
+    // Description:
+    //    Retrieves number of parameters in collection.
+    virtual int  GetParamCount() const = 0;
+
+    // Description:
+    //    Retrieves shader public parameter at specified index of the collection.
+    virtual SShaderParam& GetParam(int nIndex) = 0;
+    virtual const SShaderParam& GetParam(int nIndex) const = 0;
+
+    // Description:
+    //    Retrieves shader public parameter at specified index of the collection.
+    virtual SShaderParam* GetParamByName(const char* pszName) = 0;
+    virtual const SShaderParam* GetParamByName(const char* pszName) const = 0;
+
+    virtual SShaderParam* GetParamBySemantic(uint8 eParamSemantic) = 0;
+    virtual const SShaderParam* GetParamBySemantic(uint8 eParamSemantic) const = 0;
+
+    // Description:
+    //    Sets a shader parameter (and if doesn't exists, add it to the parameters list).
+    virtual void SetParam(const char* pszName, UParamVal& pParam, EParamType nType = eType_FLOAT, uint8 eSemantic = 0) = 0;
+
+    // Description:
+    //    Assigns shader public parameter at specified index of the collection.
+    virtual void SetParam(int nIndex, const SShaderParam& param) = 0;
+
+    // Description:
+    //    Assigns existing shader parameters list.
+    virtual void SetShaderParams(const AZStd::vector<SShaderParam>& pParams) = 0;
+
+    // Description:
+    //    Adds a new shader public parameter at the end of the collection.
+    virtual void AddParam(const SShaderParam& param) = 0;
+
+    // Description:
+    //    Removes a shader public parameter
+    virtual void RemoveParamByName(const char* pszName) = 0;
+    virtual void RemoveParamBySemantic(uint8 eParamSemantic) = 0;
+
+    // Description:
+    //    Assigns collection of shader public parameters to the specified render params structure.
+    virtual void AssignToRenderParams(struct SRendParams& rParams) = 0;
+
+    virtual uint8 GetSemanticByName(const char* pszName) = 0;
+
+    // Description:
+    //    Gets shader parameters.
+    virtual AZStd::vector<SShaderParam>* GetShaderParams() = 0;
+    virtual const AZStd::vector<SShaderParam>* GetShaderParams() const = 0;
+    // </interfuscator:shuffle>
+};
+
+//=================================================================================
+
+class CInputLightMaterial
+{
+public:
+    CInputLightMaterial()
+        : m_Diffuse(0, 0, 0, 0)
+        , m_Specular(0, 0, 0, 0)
+        , m_Emittance(1, 1, 1, 0)
+        , m_Opacity(0)
+        , m_Smoothness(0)
+    {
+        // memset()
+        for (int i = 0; i < EFTT_MAX; i++)
+        {
+            m_Channels[i][0] = 0.0f,
+            m_Channels[i][1] = 1.0f;
+        }
+    }
+
+    // scale & bias
+    ColorF m_Channels[EFTT_MAX][2];
+
+    // TODO: these will go away
+    ColorF m_Diffuse;
+    ColorF m_Specular;
+    ColorF m_Emittance;  // RGB: Color, Alpha: Intensity (kcd/m2 or kilonits)
+    float m_Opacity;
+    float m_Smoothness;
+
+    inline friend bool operator == (const CInputLightMaterial& m1, const CInputLightMaterial& m2)
+    {
+        return !memcmp(&m1, &m2, CInputLightMaterial::Size());
+    }
+
+    inline static int Size()
+    {
+        int nSize = sizeof(CInputLightMaterial);
+        return nSize;
+    }
+};
+
+class CTexture;
+class CTexAnim;
+#include <ITexture.h>
+
+// Summary:
+//   Vertex modificators definitions (must be 16 bit flag).
+
+#define MDV_BENDING            0x100
+#define MDV_DET_BENDING        0x200
+#define MDV_DET_BENDING_GRASS  0x400
+#define MDV_WIND               0x800
+#define MDV_DEPTH_OFFSET       0x2000
+
+// Does the vertex shader require position-invariant compilation?
+// This would be true of shaders rendering multiple times with different vertex shaders - for example during zprepass and the gbuffer pass
+// Note this is different than the technique flag FHF_POSITION_INVARIANT as that does custom behavior for terrain
+#define MDV_POSITION_INVARIANT 0x4000
+
+// Summary:
+//   Deformations/Morphing types.
+enum EDeformType
+{
+    eDT_Unknown = 0,
+    eDT_SinWave = 1,
+    eDT_SinWaveUsingVtxColor = 2,
+    eDT_Bulge = 3,
+    eDT_Squeeze = 4,
+    eDT_Perlin2D = 5,
+    eDT_Perlin3D = 6,
+    eDT_FromCenter = 7,
+    eDT_Bending = 8,
+    eDT_ProcFlare = 9,
+    eDT_AutoSprite = 10,
+    eDT_Beam = 11,
+    eDT_FixedOffset = 12,
+};
+
+// Summary:
+//   Wave form evaluator flags.
+enum EWaveForm
+{
+    eWF_None,
+    eWF_Sin,
+    eWF_HalfSin,
+    eWF_InvHalfSin,
+    eWF_Square,
+    eWF_Triangle,
+    eWF_SawTooth,
+    eWF_InvSawTooth,
+    eWF_Hill,
+    eWF_InvHill,
+};
+
+#define WFF_CLAMP 1
+#define WFF_LERP  2
+
+// Summary:
+//   Wave form definition.
+struct SWaveForm
+{
+    EWaveForm m_eWFType;
+    byte m_Flags;
+
+    float m_Level;
+    float m_Level1;
+    float m_Amp;
+    float m_Amp1;
+    float m_Phase;
+    float m_Phase1;
+    float m_Freq;
+    float m_Freq1;
+
+    SWaveForm(EWaveForm eWFType, float fLevel, float fAmp, float fPhase, float fFreq)
+    {
+        m_eWFType = eWFType;
+        m_Level = m_Level1 = fLevel;
+        m_Amp = m_Amp1 = fAmp;
+        m_Phase = m_Phase1 = fPhase;
+        m_Freq = m_Freq1 = fFreq;
+    }
+
+    int Size()
+    {
+        int nSize = sizeof(SWaveForm);
+        return nSize;
+    }
+    SWaveForm()
+    {
+        memset(this, 0, sizeof(SWaveForm));
+    }
+    bool operator == (const SWaveForm& wf) const
+    {
+        if (m_eWFType == wf.m_eWFType && m_Level == wf.m_Level && m_Amp == wf.m_Amp && m_Phase == wf.m_Phase && m_Freq == wf.m_Freq && m_Level1 == wf.m_Level1 && m_Amp1 == wf.m_Amp1 && m_Phase1 == wf.m_Phase1 && m_Freq1 == wf.m_Freq1 && m_Flags == wf.m_Flags)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    SWaveForm& operator += (const SWaveForm& wf)
+    {
+        m_Level  += wf.m_Level;
+        m_Level1 += wf.m_Level1;
+        m_Amp  += wf.m_Amp;
+        m_Amp1 += wf.m_Amp1;
+        m_Phase  += wf.m_Phase;
+        m_Phase1 += wf.m_Phase1;
+        m_Freq  += wf.m_Freq;
+        m_Freq1 += wf.m_Freq1;
+        return *this;
+    }
+};
+
+struct SWaveForm2
+{
+    EWaveForm m_eWFType;
+
+    float m_Level;
+    float m_Amp;
+    float m_Phase;
+    float m_Freq;
+
+    SWaveForm2()
+    {
+        memset(this, 0, sizeof(SWaveForm2));
+    }
+    bool operator == (const SWaveForm2& wf) const
+    {
+        if (m_eWFType == wf.m_eWFType && m_Level == wf.m_Level && m_Amp == wf.m_Amp && m_Phase == wf.m_Phase && m_Freq == wf.m_Freq)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    SWaveForm2& operator += (const SWaveForm2& wf)
+    {
+        m_Level  += wf.m_Level;
+        m_Amp  += wf.m_Amp;
+        m_Phase  += wf.m_Phase;
+        m_Freq  += wf.m_Freq;
+        return *this;
+    }
+};
+
+struct SDeformInfo
+{
+    EDeformType m_eType;
+    SWaveForm2 m_WaveX;
+    float m_fDividerX;
+    Vec3 m_vNoiseScale;
+
+    SDeformInfo()
+    {
+        m_eType = eDT_Unknown;
+        m_fDividerX = 0.01f;
+        m_vNoiseScale = Vec3(1, 1, 1);
+    }
+
+    inline bool operator == (const SDeformInfo& m)
+    {
+        if (m_eType == m.m_eType &&
+            m_WaveX == m.m_WaveX &&
+            m_vNoiseScale == m.m_vNoiseScale &&
+            m_fDividerX == m.m_fDividerX)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    int Size()
+    {
+        return sizeof(SDeformInfo);
+    }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->Add(*this);
+    }
+};
+
+//==============================================================================
+// CRenderObject
+
+//////////////////////////////////////////////////////////////////////
+// CRenderObject::m_ObjFlags: Flags used by shader pipeline
+
+enum ERenderObjectFlags
+{
+    FOB_VERTEX_VELOCITY             = BIT(0),
+    FOB_RENDER_TRANS_AFTER_DOF      = BIT(1),  //transparencies rendered after depth of field
+    //Unused                        = BIT(2),
+    FOB_RENDER_AFTER_POSTPROCESSING = BIT(3),
+    FOB_OWNER_GEOMETRY              = BIT(4),
+    FOB_MESH_SUBSET_INDICES         = BIT(5),
+    FOB_SELECTED                    = BIT(6),
+    FOB_RENDERER_IDENDITY_OBJECT    = BIT(7),
+    FOB_GLOBAL_ILLUMINATION         = BIT(8),
+    FOB_NO_FOG                      = BIT(9),
+    FOB_DECAL                       = BIT(10),
+    FOB_OCTAGONAL                   = BIT(11),
+    FOB_POINT_SPRITE                = BIT(13),
+    FOB_SOFT_PARTICLE               = BIT(14),
+    FOB_REQUIRES_RESOLVE            = BIT(15),
+    FOB_UPDATED_RTMASK              = BIT(16),
+    FOB_AFTER_WATER                 = BIT(17),
+    FOB_BENDED                      = BIT(18),
+    FOB_ZPREPASS                    = BIT(19),
+    FOB_PARTICLE_SHADOWS            = BIT(20),
+    FOB_DISSOLVE                    = BIT(21),
+    FOB_MOTION_BLUR                 = BIT(22),
+    FOB_NEAREST                     = BIT(23), // [Rendered in Camera Space]
+    FOB_SKINNED                     = BIT(24),
+    FOB_DISSOLVE_OUT                = BIT(25),
+    FOB_DYNAMIC_OBJECT              = BIT(26),
+    FOB_ALLOW_TESSELLATION          = BIT(27),
+    FOB_DECAL_TEXGEN_2D             = BIT(28),
+    FOB_IN_DOORS                    = BIT(29),
+    FOB_HAS_PREVMATRIX              = BIT(30),
+    FOB_LIGHTVOLUME                 = BIT(31),
+
+    FOB_DECAL_MASK =  (FOB_DECAL | FOB_DECAL_TEXGEN_2D),
+    FOB_PARTICLE_MASK = (FOB_SOFT_PARTICLE | FOB_NO_FOG | FOB_GLOBAL_ILLUMINATION | FOB_PARTICLE_SHADOWS | FOB_NEAREST | FOB_MOTION_BLUR | FOB_LIGHTVOLUME | FOB_ALLOW_TESSELLATION | FOB_IN_DOORS | FOB_AFTER_WATER),
+
+    // WARNING: FOB_MASK_AFFECTS_MERGING must start from 0x10000/bit 16 (important for instancing).
+    FOB_MASK_AFFECTS_MERGING_GEOM  = (FOB_ZPREPASS | FOB_SKINNED | FOB_BENDED | FOB_DYNAMIC_OBJECT | FOB_ALLOW_TESSELLATION | FOB_NEAREST),
+    FOB_MASK_AFFECTS_MERGING = (FOB_ZPREPASS | FOB_MOTION_BLUR | FOB_HAS_PREVMATRIX | FOB_SKINNED | FOB_BENDED | FOB_PARTICLE_SHADOWS | FOB_AFTER_WATER | FOB_DISSOLVE | FOB_DISSOLVE_OUT | FOB_NEAREST | FOB_DYNAMIC_OBJECT | FOB_ALLOW_TESSELLATION)
+};
+
+struct SSkyInfo
+{
+    ITexture* m_SkyBox[3];
+    float m_fSkyLayerHeight;
+
+    int Size()
+    {
+        int nSize = sizeof(SSkyInfo);
+        return nSize;
+    }
+    SSkyInfo()
+    {
+        memset(this, 0, sizeof(SSkyInfo));
+    }
+};
+
+struct SBending
+{
+    Vec2 m_vBending;
+    float m_fMainBendingScale;
+    SWaveForm2 m_Waves[2];
+
+    SBending()
+    {
+        m_vBending.zero();
+        m_fMainBendingScale = 1.f;
+    }
+
+    Vec4 GetShaderConstants(float realTime) const;
+    void GetShaderConstantsStatic(float realTime, Vec4* vBendInfo) const;
+};
+
+// Description:
+//   Interface for the skinnable objects (renderer calls its functions to get the skinning data).
+// should only created by EF_CreateSkinningData
+_MS_ALIGN(16) struct SSkinningData
+{
+    uint32                  nNumBones;
+    uint32                  nHWSkinningFlags;
+    DualQuat*               pBoneQuatsS;
+    Matrix34*               pBoneMatrices;
+    JointIdType*            pRemapTable;
+    AZ::LegacyJobExecutor*  pAsyncJobExecutor;
+    AZ::LegacyJobExecutor*  pAsyncDataJobExecutor;
+    SSkinningData*          pPreviousSkinningRenderData; // used for motion blur
+    uint32                  remapGUID;
+    void*                   pCharInstCB; // used if per char instance cbs are available in renderdll (d3d11+);
+    // members below are for Software Skinning
+    void*                   pCustomData; // client specific data, used for example for sw-skinning on animation side
+    SSkinningData*          pNextSkinningData;          // List to the next element which needs SW-Skinning
+} _ALIGN(16);
+
+struct SRenderObjData
+{
+    uintptr_t m_uniqueObjectId;
+
+    SSkinningData* m_pSkinningData;
+
+    float   m_fTempVars[10];                                    // Different useful vars (ObjVal component in shaders)
+
+    // using a pointer, the client code has to ensure that the data stays valid
+    const AZStd::vector<SShaderParam>* m_pShaderParams;
+
+    uint32  m_nHUDSilhouetteParams;
+
+    uint64 m_nSubObjHideMask;
+
+    union
+    {
+        SBending* m_pBending;
+    };
+
+    SBending* m_BendingPrev;
+
+    uint16  m_FogVolumeContribIdx[2];
+    
+    uint16  m_nLightID;
+    uint16  m_LightVolumeId;
+
+    uint8 m_screenBounds[4];
+
+    uint16  m_nCustomFlags;
+    uint8   m_nCustomData;
+
+    SRenderObjData()
+    {
+        Init();
+    }
+
+    void Init()
+    {
+        m_nSubObjHideMask = 0;
+        m_uniqueObjectId = 0;
+        m_nLightID = 0;
+        m_LightVolumeId = 0;
+        m_pSkinningData = NULL;
+        m_screenBounds[0] = m_screenBounds[1] = m_screenBounds[2] = m_screenBounds[3] = 0;
+        m_nCustomData = 0;
+        m_nCustomFlags = 0;
+        m_nHUDSilhouetteParams = 0;
+        m_pBending = nullptr;
+        m_BendingPrev = nullptr;
+        m_pShaderParams = nullptr;
+        m_FogVolumeContribIdx[0] = m_FogVolumeContribIdx[1] = static_cast<uint16>(-1);
+
+        // The following should be changed to be something like 0xac to indicate invalid data so that by default 
+        // data that was not set will break render features and will be traced (otherwise, default 0 just might pass)
+        memset(m_fTempVars, 0, 10 * sizeof(float));
+    }
+
+    void SetShaderParams(const AZStd::vector<SShaderParam>* pShaderParams)
+    {
+        m_pShaderParams = pShaderParams;
+    }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        AZ_UNUSED(pSizer);
+    }
+} _ALIGN(16);
+
+//////////////////////////////////////////////////////////////////////
+// Objects using in shader pipeline
+
+
+// Summary:
+//   Same as in the 3dEngine.
+#define MAX_LIGHTS_NUM 32
+
+struct ShadowMapFrustum;
+
+//////////////////////////////////////////////////////////////////////
+///
+/// Objects using in shader pipeline
+/// Single rendering item, that can be created from 3DEngine and persist across multiple frames
+/// It can be compiled into the platform specific efficient rendering compiled object.
+///
+//////////////////////////////////////////////////////////////////////
+_MS_ALIGN(16) class CRenderObject
+{
+public:
+    AZ_CLASS_ALLOCATOR(CRenderObject, AZ::LegacyAllocator, 0);
+
+    struct SInstanceInfo
+    {
+        Matrix34 m_Matrix;
+        ColorF m_AmbColor;
+    };
+
+    struct SInstanceData
+    {
+        Matrix34 m_MatInst;
+        Vec4 m_vBendInfo;
+        Vec4 m_vDissolveInfo;
+    };
+
+    struct PerInstanceConstantBufferKey
+    {
+        PerInstanceConstantBufferKey()
+            : m_Id{0xFFFF}
+            , m_IndirectId{0xFF}
+        {}
+
+        inline bool IsValid() const
+        {
+            return m_Id != 0xFFFF;
+        }
+
+        AZ::u16 m_Id;
+        AZ::u8  m_IndirectId;
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    SInstanceInfo               m_II;                   //!< Per instance data
+
+    uint64                      m_ObjFlags;             //!< Combination of FOB_ flags.
+    uint32                      m_Id;
+
+    float                       m_fAlpha;               //!< Object alpha.
+    float                       m_fDistance;            //!< Distance to the object.
+
+    union
+    {
+        float                   m_fSort;                //!< Custom sort value.
+        uint16                  m_nSort;
+    };
+
+    uint64                      m_nRTMask;              //!< Shader runtime modification flags
+    uint16                      m_nMDV;                 //!< Vertex modifier flags for Shader.
+    uint16                      m_nRenderQuality;       //!< 65535 - full quality, 0 - lowest quality, used by CStatObj
+    int16                       m_nTextureID;           //!< Custom texture id.
+
+    union
+    {
+        uint8                   m_breakableGlassSubFragIndex;
+        uint8                   m_ParticleObjFlags;
+    };
+    uint8                       m_nClipVolumeStencilRef;  //!< Per instance vis area stencil reference ID
+    uint8                       m_DissolveRef;            //!< Dissolve value
+    uint8                       m_RState;                 //!< Render state used for object
+
+    bool                        m_NoDecalReceiver;
+
+    uint32                      m_nMaterialLayers;        //!< Which mtl layers active and how much to blend them
+
+    IRenderNode*                m_pRenderNode;            //!< Will define instance id.
+    _smart_ptr<IMaterial>       m_pCurrMaterial;          //!< Parent material used for render object.
+    IRenderElement*             m_pRE;                    //!< RenderElement used by this CRenderObject
+
+    PerInstanceConstantBufferKey m_PerInstanceConstantBufferKey;
+
+    //! Embedded SRenderObjData, optional data carried by CRenderObject
+    SRenderObjData             m_data;
+
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // Methods
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    /// Constructor
+    //////////////////////////////////////////////////////////////////////////
+    CRenderObject()
+        : m_Id(~0u)
+    {
+        Init();
+    }
+    ~CRenderObject() {};
+
+    //=========================================================================================================
+
+    inline Vec3 GetTranslation() const { return m_II.m_Matrix.GetTranslation(); }
+    inline float GetScaleX() const { return sqrt_tpl(m_II.m_Matrix(0, 0) * m_II.m_Matrix(0, 0) + m_II.m_Matrix(0, 1) * m_II.m_Matrix(0, 1) + m_II.m_Matrix(0, 2) * m_II.m_Matrix(0, 2)); }
+    inline float GetScaleZ() const { return sqrt_tpl(m_II.m_Matrix(2, 0) * m_II.m_Matrix(2, 0) + m_II.m_Matrix(2, 1) * m_II.m_Matrix(2, 1) + m_II.m_Matrix(2, 2) * m_II.m_Matrix(2, 2)); }
+
+    inline void Init()
+    {
+        m_ObjFlags = 0;
+        m_nRenderQuality = 65535;
+
+        m_RState = 0;
+        m_fDistance = 0.0f;
+
+        m_nClipVolumeStencilRef = 0;
+        m_nMaterialLayers = 0;
+        m_DissolveRef = 0;
+
+        m_nMDV = 0;
+        m_fSort = 0;
+
+        m_II.m_AmbColor = Col_White;
+        m_fAlpha = 1.0f;
+        m_nTextureID = -1;
+        m_pCurrMaterial = nullptr;
+        m_pRE = nullptr;
+        m_PerInstanceConstantBufferKey = {};
+
+        m_nRTMask = 0;
+        m_pRenderNode = NULL;
+
+        m_NoDecalReceiver = false;
+        m_data.Init();
+    }
+    void AssignId(uint32 id) { m_Id = id; }
+
+    ILINE Matrix34A& GetMatrix() { return m_II.m_Matrix; }
+
+    ILINE SRenderObjData* GetObjData()
+    {
+        return &m_data;
+    }
+
+    IRenderElement* GetRE() { return m_pRE; }
+    void SetRE(IRenderElement* re) { m_pRE = re; }
+
+protected:
+
+    // Disallow copy (potential bugs with PERMANENT objects)
+    // alwasy use IRendeer::EF_DuplicateRO if you want a copy
+    // of a CRenderObject
+    CRenderObject& operator= (CRenderObject& other) = default;
+
+    void CloneObject(CRenderObject* srcObj)
+    {
+        *this = *srcObj;
+    }
+
+    friend class CRenderer;
+} _ALIGN(16);
+
+enum EResClassName
+{
+    eRCN_Texture,
+    eRCN_Shader,
+};
+
+// className: CTexture, CHWShader_VS, CHWShader_PS, CShader
+struct SResourceAsync
+{
+    AZ_CLASS_ALLOCATOR(SResourceAsync, AZ::SystemAllocator, 0);
+    int nReady;          // 0: Not ready; 1: Ready; -1: Error
+    byte* pData;
+    EResClassName eClassName;     // Resource class name
+    char* Name;          // Resource name
+    union
+    {
+        // CTexture parameters
+        struct
+        {
+            int nWidth, nHeight, nMips, nTexFlags, nFormat, nTexId;
+        };
+        // CShader parameters
+        struct
+        {
+            int nShaderFlags;
+        };
+    };
+    void* pResource; // Pointer to created resource
+
+    SResourceAsync()
+    {
+        memset(this, 0, sizeof(SResourceAsync));
+    }
+
+    ~SResourceAsync()
+    {
+        delete Name;
+    }
+};
+
+#include "IRenderer.h"
+
+//==============================================================================
+
+// Summary:
+//   Color operations flags.
+enum EColorOp
+{
+    eCO_NOSET = 0,
+    eCO_DISABLE = 1,
+    eCO_REPLACE = 2,
+    eCO_DECAL = 3,
+    eCO_ARG2 = 4,
+    eCO_MODULATE = 5,
+    eCO_MODULATE2X = 6,
+    eCO_MODULATE4X = 7,
+    eCO_BLENDDIFFUSEALPHA = 8,
+    eCO_BLENDTEXTUREALPHA = 9,
+    eCO_DETAIL = 10,
+    eCO_ADD = 11,
+    eCO_ADDSIGNED = 12,
+    eCO_ADDSIGNED2X = 13,
+    eCO_MULTIPLYADD = 14,
+    eCO_BUMPENVMAP = 15,
+    eCO_BLEND = 16,
+    eCO_MODULATEALPHA_ADDCOLOR = 17,
+    eCO_MODULATECOLOR_ADDALPHA = 18,
+    eCO_MODULATEINVALPHA_ADDCOLOR = 19,
+    eCO_MODULATEINVCOLOR_ADDALPHA = 20,
+    eCO_DOTPRODUCT3 = 21,
+    eCO_LERP = 22,
+    eCO_SUBTRACT = 23,
+    eCO_MODULATE_METAL_FONT_SPECIAL_MODE = 24,
+};
+
+enum EColorArg
+{
+    eCA_Unknown,
+    eCA_Specular,
+    eCA_Texture,
+    eCA_Texture1,
+    eCA_Normal,
+    eCA_Diffuse,
+    eCA_Previous,
+    eCA_Constant,
+};
+
+#define DEF_TEXARG0 (eCA_Texture | (eCA_Diffuse << 3))
+#define DEF_TEXARG1 (eCA_Texture | (eCA_Previous << 3))
+
+enum ETexModRotateType
+{
+    ETMR_NoChange,
+    ETMR_Fixed,
+    ETMR_Constant,
+    ETMR_Oscillated,
+    ETMR_Max
+};
+
+enum ETexModMoveType
+{
+    ETMM_NoChange,
+    ETMM_Fixed,
+    ETMM_Constant,
+    ETMM_Jitter,
+    ETMM_Pan,
+    ETMM_Stretch,
+    ETMM_StretchRepeat,
+    ETMM_Max
+};
+
+enum ETexGenType
+{
+    ETG_Stream,
+    ETG_World,
+    ETG_Camera,
+    ETG_Max
+};
+
+#define CASE_TEXMOD(var_name)              \
+    if (!_stricmp(#var_name, szParamName)) \
+    {                                      \
+        var_name = fValue;                 \
+        return true;                       \
+    }                                      \
+
+#define CASE_TEXMODANGLE(var_name)         \
+    if (!_stricmp(#var_name, szParamName)) \
+    {                                      \
+        var_name = Degr2Word(fValue);      \
+        return true;                       \
+    }                                      \
+
+#define CASE_TEXMODBYTE(var_name)          \
+    if (!_stricmp(#var_name, szParamName)) \
+    {                                      \
+        var_name = (byte)fValue;           \
+        return true;                       \
+    }                                      \
+
+#define CASE_TEXMODBOOL(var_name)          \
+    if (!_stricmp(#var_name, szParamName)) \
+    {                                      \
+        var_name = (fValue == 1.f);        \
+        return true;                       \
+    }                                      \
+
+struct SEfTexModificator
+{
+    AZ_CLASS_ALLOCATOR(SEfTexModificator, AZ::SystemAllocator, 0);
+    bool SetMember(const char* szParamName, float fValue)
+    {
+        CASE_TEXMODBYTE(m_eTGType);
+        CASE_TEXMODBYTE(m_eRotType);
+        CASE_TEXMODBYTE(m_eMoveType[0]);
+        CASE_TEXMODBYTE(m_eMoveType[1]);
+        CASE_TEXMODBOOL(m_bTexGenProjected);
+
+        CASE_TEXMOD(m_Tiling[0]);
+        CASE_TEXMOD(m_Tiling[1]);
+        CASE_TEXMOD(m_Tiling[2]);
+        CASE_TEXMOD(m_Offs[0]);
+        CASE_TEXMOD(m_Offs[1]);
+        CASE_TEXMOD(m_Offs[2]);
+
+        CASE_TEXMODANGLE(m_Rot[0]);
+        CASE_TEXMODANGLE(m_Rot[1]);
+        CASE_TEXMODANGLE(m_Rot[2]);
+        CASE_TEXMODANGLE(m_RotOscRate[0]);
+        CASE_TEXMODANGLE(m_RotOscRate[1]);
+        CASE_TEXMODANGLE(m_RotOscRate[2]);
+        CASE_TEXMODANGLE(m_RotOscAmplitude[0]);
+        CASE_TEXMODANGLE(m_RotOscAmplitude[1]);
+        CASE_TEXMODANGLE(m_RotOscAmplitude[2]);
+        CASE_TEXMODANGLE(m_RotOscPhase[0]);
+        CASE_TEXMODANGLE(m_RotOscPhase[1]);
+        CASE_TEXMODANGLE(m_RotOscPhase[2]);
+        CASE_TEXMOD(m_RotOscCenter[0]);
+        CASE_TEXMOD(m_RotOscCenter[1]);
+        CASE_TEXMOD(m_RotOscCenter[2]);
+
+        CASE_TEXMOD(m_OscRate[0]);
+        CASE_TEXMOD(m_OscRate[1]);
+        CASE_TEXMOD(m_OscAmplitude[0]);
+        CASE_TEXMOD(m_OscAmplitude[1]);
+        CASE_TEXMOD(m_OscPhase[0]);
+        CASE_TEXMOD(m_OscPhase[1]);
+
+        return false;
+    }
+
+    _MS_ALIGN(16) Matrix44 m_TexGenMatrix _ALIGN(16);
+    _MS_ALIGN(16) Matrix44 m_TexMatrix _ALIGN(16);
+
+    float m_Tiling[3];
+    float m_Offs[3];
+
+    float m_RotOscCenter[3];
+
+    float m_OscRate[2];
+    float m_OscAmplitude[2];
+    float m_OscPhase[2];
+
+    // This members are used only during updating of the matrices
+    float m_LastTime[2];
+    float m_CurrentJitter[2];
+
+    uint16 m_RotOscPhase[3];
+    uint16 m_Rot[3];
+    uint16 m_RotOscRate[3];
+    uint16 m_RotOscAmplitude[3];
+
+    uint8 m_eTGType;
+    uint8 m_eRotType;
+    uint8 m_eMoveType[2];
+    bool m_bTexGenProjected;
+
+    void Reset()
+    {
+        memset(this, 0, sizeof(*this));
+        m_Tiling[0] = m_Tiling[1] = 1.0f;
+    }
+    inline SEfTexModificator()
+    {
+        Reset();
+    }
+    inline SEfTexModificator(const SEfTexModificator& m)
+    {
+        if (&m != this)
+        {
+            memcpy(this, &m, sizeof(*this));
+        }
+    }
+    SEfTexModificator& operator = (const SEfTexModificator& src)
+    {
+        if (&src != this)
+        {
+            this->~SEfTexModificator();
+            new(this)SEfTexModificator(src);
+        }
+        return *this;
+    }
+    int Size()
+    {
+        return sizeof(*this);
+    }
+
+    inline bool operator != (const SEfTexModificator& m)
+    {
+        return memcmp(this, &m, sizeof(*this)) != 0;
+    }
+
+    inline bool isModified()
+    {
+        return ( m_eMoveType[0] != ETMM_NoChange ||
+                 m_eMoveType[1] != ETMM_NoChange ||
+                 m_eRotType != ETMR_NoChange ||
+                 m_Offs[0] != 0.0f ||
+                 m_Offs[1] != 0.0f ||
+                 m_Tiling[0] != 1.0f ||
+                 m_Tiling[1] != 1.0f ||
+                 m_Rot[0] != 0.0f ||
+                 m_Rot[1] != 0.0f ||
+                 m_Rot[2] != 0.0f );
+    }
+};
+
+inline bool IsTextureModifierSupportedForTextureMap(EEfResTextures texture)
+{
+    // Custom uv modifiers are currently only supported for diffuse, detail, decal, 2nd diffuse, and emittance texture maps
+    if (texture == EFTT_DIFFUSE || texture == EFTT_DETAIL_OVERLAY || texture == EFTT_DECAL_OVERLAY || texture == EFTT_CUSTOM || texture == EFTT_EMITTANCE)
+    {
+        return true;
+    }
+
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+#define FILTER_NONE      -1
+#define FILTER_POINT      0
+#define FILTER_LINEAR     1
+#define FILTER_BILINEAR   2
+#define FILTER_TRILINEAR  3
+#define FILTER_ANISO2X    4
+#define FILTER_ANISO4X    5
+#define FILTER_ANISO8X    6
+#define FILTER_ANISO16X   7
+
+//////////////////////////////////////////////////////////////////////
+#define TADDR_WRAP        0
+#define TADDR_CLAMP       1
+#define TADDR_MIRROR      2
+#define TADDR_BORDER      3
+
+//==============================================================================
+//------------------------------------------------------------------------------
+struct STexState
+{
+    struct
+    {
+        signed char m_nMinFilter : 8;
+        signed char m_nMagFilter : 8;
+        signed char m_nMipFilter : 8;
+        signed char m_nAddressU : 8;
+        signed char m_nAddressV : 8;
+        signed char m_nAddressW : 8;
+        signed char m_nAnisotropy : 8;
+        signed char padding : 8;
+    };
+    DWORD  m_dwBorderColor;
+    float m_MipBias;
+    void* m_pDeviceState;
+    bool m_bActive;
+    bool m_bComparison;
+    bool m_bSRGBLookup;
+    byte m_bPAD;
+    // NOTE: There are 4 more pad bytes that exist here because m_pDeviceState is a 64-bit pointer.
+    uint32 m_PadBytes;
+
+    STexState ()
+    {
+        // Make sure we clear everything, including "invisible" pad bytes.
+        memset(this, 0, sizeof(*this));
+    }
+    STexState(int nFilter, bool bClamp)
+    {
+        memset(this, 0, sizeof(*this));
+        int nAddress = bClamp ? TADDR_CLAMP : TADDR_WRAP;
+        SetFilterMode(nFilter);
+        SetClampMode(nAddress, nAddress, nAddress);
+        SetBorderColor(0);
+    }
+    STexState(int nFilter, int nAddressU, int nAddressV, int nAddressW, unsigned int borderColor)
+    {
+        memset(this, 0, sizeof(*this));
+        SetFilterMode(nFilter);
+        SetClampMode(nAddressU, nAddressV, nAddressW);
+        SetBorderColor(borderColor);
+    }
+
+    void Destroy();
+    void Init(const STexState& src);
+
+    ~STexState() { Destroy(); }
+    STexState(const STexState& src) { Init(src); }
+    STexState& operator = (const STexState& src)
+    {
+        this->~STexState();
+        new(this)STexState(src);
+        return *this;
+    }
+    _inline friend bool operator == (const STexState& m1, const STexState& m2)
+    {
+        return (*(uint64*)&m1 == *(uint64*)&m2 && m1.m_dwBorderColor == m2.m_dwBorderColor &&
+            m1.m_bActive == m2.m_bActive && m1.m_bComparison == m2.m_bComparison && m1.m_bSRGBLookup == m2.m_bSRGBLookup &&
+            m1.m_MipBias == m2.m_MipBias);
+    }
+    void Release()
+    {
+        delete this;
+    }
+
+    bool SetFilterMode(int nFilter);
+    bool SetClampMode(int nAddressU, int nAddressV, int nAddressW);
+    void SetBorderColor(DWORD dwColor);
+    void SetComparisonFilter(bool bEnable);
+    void PostCreate();
+};
+
+
+struct IRenderTarget
+{
+    virtual ~IRenderTarget(){}
+    virtual void Release() = 0;
+    virtual void AddRef() = 0;
+};
+
+//==============================================================================
+// FX shader texture sampler (description)
+//------------------------------------------------------------------------------
+struct STexSamplerFX
+{
+#if SHADER_REFLECT_TEXTURE_SLOTS
+    string      m_szUIName;
+    string      m_szUIDescription;
+#endif
+
+    string      m_szName;
+    string      m_szTexture;
+
+    union
+    {
+        struct SHRenderTarget*  m_pTarget;
+        IRenderTarget*          m_pITarget;
+    };
+
+    int16       m_nTexState;
+    byte        m_eTexType;                    // ETEX_Type e.g. eTT_2D or eTT_Cube
+    byte        m_nSlotId;             // EFTT_ index if it references one of the material texture slots, EFTT_MAX otherwise
+    uint32      m_nTexFlags;
+
+    STexSamplerFX()
+    {
+        m_nTexState = -1;
+        m_eTexType = eTT_2D;
+        m_nSlotId = EFTT_MAX;
+        m_nTexFlags = 0;
+        m_pTarget = NULL;
+    }
+
+    ~STexSamplerFX()
+    {
+        SAFE_RELEASE(m_pITarget);
+    }
+
+    int Size()
+    {
+        int nSize = sizeof(*this);
+        nSize += m_szName.capacity();
+        nSize += m_szTexture.capacity();
+#if SHADER_REFLECT_TEXTURE_SLOTS
+        nSize += m_szUIName.capacity();
+        nSize += m_szUIDescription.capacity();
+#endif
+        return nSize;
+    }
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
+    {
+    }
+
+    uint32 GetTexFlags() { return m_nTexFlags; }
+    void Update();
+    void PostLoad();
+    NO_INLINE STexSamplerFX (const STexSamplerFX& src)
+    {
+        m_pITarget = src.m_pITarget;
+        if (m_pITarget)
+        {
+            m_pITarget->AddRef();
+        }
+        m_szName = src.m_szName;
+        m_szTexture = src.m_szTexture;
+        m_nSlotId = src.m_nSlotId;
+        m_eTexType = src.m_eTexType;
+        m_nTexFlags = src.m_nTexFlags;
+        m_nTexState = src.m_nTexState;
+
+#if SHADER_REFLECT_TEXTURE_SLOTS
+        m_szUIName = src.m_szUIName;
+        m_szUIDescription = src.m_szUIDescription;
+#endif
+    }
+    NO_INLINE STexSamplerFX& operator = (const STexSamplerFX& src)
+    {
+        this->~STexSamplerFX();
+        new(this)STexSamplerFX(src);
+        return *this;
+    }
+    _inline friend bool operator != (const STexSamplerFX& m1, const STexSamplerFX& m2)
+    {
+        if (m1.m_szTexture != m2.m_szTexture || m1.m_eTexType != m2.m_eTexType || m1.m_nTexFlags != m2.m_nTexFlags)
+        {
+            return true;
+        }
+        return false;
+    }
+    _inline bool operator == (const STexSamplerFX& m1)
+    {
+        return !(*this != m1);
+    }
+
+    bool Export(SShaderSerializeContext& SC);
+    bool Import(SShaderSerializeContext& SC, SSTexSamplerFX* pTS);
+};
+
+
+//==============================================================================
+// Resource texture sampler (runtime)
+//------------------------------------------------------------------------------
+struct STexSamplerRT
+{
+    union
+    {
+        CTexture* m_pTex;
+        ITexture* m_pITex;
+    };
+
+    union
+    {
+        struct SHRenderTarget* m_pTarget;
+        IRenderTarget* m_pITarget;
+    };
+
+    union
+    {
+        CTexAnim* m_pAnimInfo;
+        ITexAnim* m_pIAnimInfo;
+    };
+    
+    uint32      m_nTexFlags;
+    int16       m_nTexState;
+
+    uint8       m_eTexType;                       // ETEX_Type e.g. eTT_2D or eTT_Cube
+    int8        m_nSamplerSlot;
+    int8        m_nTextureSlot;
+
+    bool        m_bGlobal;
+
+    STexSamplerRT()
+    {
+        m_nTexState = -1;
+        m_pTex = NULL;
+        m_eTexType = eTT_2D;
+        m_nTexFlags = 0;
+        m_pTarget = NULL;
+        m_pAnimInfo = NULL;
+        m_nSamplerSlot = -1;
+        m_nTextureSlot = -1;
+        m_bGlobal = false;
+    }
+    ~STexSamplerRT()
+    {
+        Cleanup();
+    }
+
+    void Cleanup()
+    {
+        SAFE_RELEASE(m_pITex);
+        // TODO: ref counted deleting of m_pAnimInfo & m_pTarget! - CW
+        SAFE_RELEASE(m_pITarget);
+        SAFE_RELEASE(m_pIAnimInfo);
+    }
+    int Size() const
+    {
+        int nSize = sizeof(*this);
+        return nSize;
+    }
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
+    {
+    }
+
+    uint32 GetTexFlags() const { return m_nTexFlags; }
+    void Update();
+    void PostLoad();
+
+    NO_INLINE STexSamplerRT (const STexSamplerRT& src)
+    {
+        m_pITex = src.m_pITex;
+        if (m_pITex)
+        {
+            m_pITex->AddRef();
+        }
+        m_pITarget = src.m_pITarget;
+        if (m_pITarget)
+        {
+            m_pITarget->AddRef();
+        }
+        m_pIAnimInfo = src.m_pIAnimInfo;
+        if (m_pIAnimInfo)
+        {
+            m_pIAnimInfo->AddRef();
+        }
+        m_eTexType = src.m_eTexType;
+        m_nTexFlags = src.m_nTexFlags;
+        m_nTexState = src.m_nTexState;
+        m_nSamplerSlot = src.m_nSamplerSlot;
+        m_nTextureSlot = src.m_nTextureSlot;
+        m_bGlobal = src.m_bGlobal;
+    }
+    NO_INLINE STexSamplerRT& operator = (const STexSamplerRT& src)
+    {
+        this->~STexSamplerRT();
+        new(this)STexSamplerRT(src);
+        return *this;
+    }
+    STexSamplerRT (const STexSamplerFX& src)
+    {
+        m_pITex = NULL;
+        m_pAnimInfo = NULL;
+        m_pITarget = src.m_pITarget;
+        if (m_pITarget)
+        {
+            m_pITarget->AddRef();
+        }
+        m_eTexType = src.m_eTexType;
+        m_nTexFlags = src.m_nTexFlags;
+        m_nTexState = src.m_nTexState;
+        m_nSamplerSlot = -1;
+        m_nTextureSlot = -1;
+        m_bGlobal = (src.m_nTexFlags & FT_FROMIMAGE) != 0;
+    }
+    inline bool operator != (const STexSamplerRT& m) const
+    {
+        if (m_pTex != m.m_pTex || m_eTexType != m.m_eTexType || m_nTexFlags != m.m_nTexFlags || m_nTexState != m.m_nTexState)
+        {
+            return true;
+        }
+        return false;
+    }
+};
+
+//==============================================================================
+//------------------------------------------------------------------------------
+struct SEfResTextureExt
+{
+    int32 m_nFrameUpdated;
+    int32 m_nUpdateFlags;
+    int32 m_nLastRecursionLevel;
+    SEfTexModificator* m_pTexModifier;
+
+    SEfResTextureExt ()
+    {
+        m_nFrameUpdated = -1;
+        m_nUpdateFlags = 0;
+        m_nLastRecursionLevel = 0;
+        m_pTexModifier = nullptr;
+    }
+    ~SEfResTextureExt ()
+    {
+        Cleanup();
+    }
+    void Cleanup()
+    {
+        SAFE_DELETE(m_pTexModifier);
+    }
+    inline bool operator != (const SEfResTextureExt& m) const
+    {
+        if (m_pTexModifier && m.m_pTexModifier)
+        {
+            return *m_pTexModifier != *m.m_pTexModifier;
+        }
+        if (!m_pTexModifier && !m.m_pTexModifier)
+        {
+            return false;
+        }
+        return true;
+    }
+    SEfResTextureExt(const SEfResTextureExt& src)
+    {
+        if (&src != this)
+        {
+            Cleanup();
+            if (src.m_pTexModifier)
+            {
+                m_pTexModifier = new SEfTexModificator;
+                * m_pTexModifier = *src.m_pTexModifier;
+            }
+            m_nFrameUpdated = -1;
+            m_nUpdateFlags = src.m_nUpdateFlags;
+            m_nLastRecursionLevel = -1;
+        }
+    }
+    SEfResTextureExt& operator = (const SEfResTextureExt& src)
+    {
+        if (&src != this)
+        {
+            Cleanup();
+            new(this)SEfResTextureExt(src);
+        }
+        return *this;
+    }
+
+    void CopyTo(SEfResTextureExt* pTo) const
+    {
+        if (pTo && pTo != this)
+        {
+            pTo->Cleanup();
+            pTo->m_nFrameUpdated = -1;
+            pTo->m_nUpdateFlags = m_nUpdateFlags;
+            pTo->m_nLastRecursionLevel = -1;
+            pTo->m_pTexModifier = nullptr;
+            if (m_pTexModifier)
+            {
+                pTo->m_pTexModifier = new SEfTexModificator;
+                *(pTo->m_pTexModifier) = *m_pTexModifier;
+            }
+        }
+    }
+    inline int Size() const
+    {
+        int nSize = sizeof(SEfResTextureExt);
+        if (m_pTexModifier)
+        {
+            nSize += m_pTexModifier->Size();
+        }
+        return nSize;
+    }
+};
+
+//==============================================================================
+// SEfResTexture - holds the actual data representing a texture and its associated 
+// sampler and modulator properties.
+//------------------------------------------------------------------------------
+struct SEfResTexture
+{
+    string              m_Name;
+    bool                m_bUTile;
+    bool                m_bVTile;
+    signed char         m_Filter;
+
+    STexSamplerRT       m_Sampler;
+    SEfResTextureExt    m_Ext;
+
+    void UpdateForCreate(int nTSlot);
+    void Update(int nTSlot);
+    void UpdateWithModifier(int nTSlot);
+
+    inline bool operator != (const SEfResTexture& m) const
+    {
+        if (_stricmp(m_Name.c_str(), m.m_Name.c_str()) != 0 ||
+            m_bUTile != m.m_bUTile ||
+            m_bVTile != m.m_bVTile ||
+            m_Filter != m.m_Filter ||
+            m_Ext != m.m_Ext ||
+            m_Sampler != m.m_Sampler)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    inline bool IsHasModificators() const
+    {
+        return (m_Ext.m_pTexModifier != NULL);
+    }
+
+    //! Find out if the texture has modulator and if it requires per frame computation change
+    bool IsNeedTexTransform() const
+    {
+        if (!m_Ext.m_pTexModifier)
+        {
+            return false;
+        }
+        if (m_Ext.m_pTexModifier->m_eRotType != ETMR_NoChange || m_Ext.m_pTexModifier->m_eMoveType[0] != ETMM_NoChange || m_Ext.m_pTexModifier->m_eMoveType[1] != ETMM_NoChange)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    bool IsNeedTexGen() const
+    {
+        if (!m_Ext.m_pTexModifier)
+        {
+            return false;
+        }
+        if (m_Ext.m_pTexModifier->m_eTGType != ETG_Stream)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    inline float GetTiling(int n) const
+    {
+        if (!m_Ext.m_pTexModifier)
+        {
+            return 1.0f;
+        }
+        return m_Ext.m_pTexModifier->m_Tiling[n];
+    }
+
+    inline float GetOffset(int n) const
+    {
+        if (!m_Ext.m_pTexModifier)
+        {
+            return 0;
+        }
+        return m_Ext.m_pTexModifier->m_Offs[n];
+    }
+
+    inline SEfTexModificator* AddModificator()
+    {
+        if (!m_Ext.m_pTexModifier)
+        {
+            m_Ext.m_pTexModifier = new SEfTexModificator;
+        }
+        return m_Ext.m_pTexModifier;
+    }
+
+    inline SEfTexModificator* GetModificator() const
+    {
+        if (!m_Ext.m_pTexModifier)
+        {
+            static SEfTexModificator dummy;
+            dummy.Reset();
+            return &dummy;
+        }
+
+        return m_Ext.m_pTexModifier;
+    }
+
+    int Size() const
+    {
+        int nSize = sizeof(SEfResTexture) - sizeof(STexSamplerRT) - sizeof(SEfResTextureExt);
+        nSize += m_Name.size();
+        nSize += m_Sampler.Size();
+        nSize += m_Ext.Size();
+
+        return nSize;
+    }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->Add(*this);
+        pSizer->AddObject(m_Name);
+        pSizer->AddObject(m_Sampler);
+    }
+
+    void Cleanup()
+    {
+        m_Sampler.Cleanup();
+        m_Ext.Cleanup();
+    }
+
+    ~SEfResTexture()
+    {
+        Cleanup();
+    }
+
+    void Reset()
+    {
+        m_bUTile = true;
+        m_bVTile = true;
+        m_Filter = FILTER_NONE;
+        SAFE_DELETE(m_Ext.m_pTexModifier);
+        m_Ext.m_nFrameUpdated = -1;
+    }
+
+    SEfResTexture (const SEfResTexture& src)
+    {
+        if (&src != this)
+        {
+            Cleanup();
+            m_Sampler = src.m_Sampler;
+            m_Ext = src.m_Ext;
+            m_Name = src.m_Name;
+            m_bUTile = src.m_bUTile;
+            m_bVTile = src.m_bVTile;
+            m_Filter = src.m_Filter;
+        }
+    }
+
+    SEfResTexture& operator = (const SEfResTexture& src)
+    {
+        if (&src != this)
+        {
+            Cleanup();
+            new(this)SEfResTexture(src);
+        }
+        return *this;
+    }
+    void CopyTo(SEfResTexture* pTo) const
+    {
+        if (pTo && (pTo != this))
+        {
+            pTo->Cleanup();
+            pTo->m_Sampler = m_Sampler;
+            m_Ext.CopyTo(&pTo->m_Ext);
+            pTo->m_Name = m_Name;
+            pTo->m_bUTile = m_bUTile;
+            pTo->m_bVTile = m_bVTile;
+            pTo->m_Filter = m_Filter;
+        }
+    }
+
+    SEfResTexture()
+    {
+        Reset();
+    }
+};
+
+//==============================================================================
+//------------------------------------------------------------------------------
+struct SBaseShaderResources
+{
+    AZStd::vector<SShaderParam>  m_ShaderParams;
+    string                  m_TexturePath;
+    const char*             m_szMaterialName;
+
+    float                   m_AlphaRef;
+    uint32                  m_ResFlags;
+
+    uint16                  m_SortPrio;
+
+    uint8                   m_VoxelCoverage;
+
+    int Size() const
+    {
+        int nSize = sizeof(SBaseShaderResources) + m_ShaderParams.size() * sizeof(SShaderParam);
+        return nSize;
+    }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(m_ShaderParams);
+    }
+
+    SBaseShaderResources& operator=(const SBaseShaderResources& src)
+    {
+        if (&src != this)
+        {
+            ReleaseParams();
+            m_szMaterialName = src.m_szMaterialName;
+            m_ResFlags = src.m_ResFlags;
+            m_AlphaRef = src.m_AlphaRef;
+            m_VoxelCoverage = src.m_VoxelCoverage;
+            m_SortPrio = src.m_SortPrio;
+            m_ShaderParams = src.m_ShaderParams;
+        }
+        return *this;
+    }
+
+    SBaseShaderResources()
+    {
+        m_ResFlags = 0;
+        m_AlphaRef = 0;
+        m_VoxelCoverage = 255;
+        m_SortPrio = 0;
+        m_szMaterialName = NULL;
+    }
+
+    void ReleaseParams()
+    {
+        m_ShaderParams.clear();
+    }
+
+    virtual ~SBaseShaderResources()
+    {
+        ReleaseParams();
+    }
+};
+
+//------------------------------------------------------------------------------
+typedef uint16                                                          ResourceSlotIndex;
+typedef AZStd::unordered_map<ResourceSlotIndex, SEfResTexture>          TexturesResourcesMap;
+typedef AZStd::unordered_map<ResourceSlotIndex, SShaderTextureSlot*>    TexturesSlotsUsageMap;
+//------------------------------------------------------------------------------
+
+struct IRenderShaderResources
+{
+    // <interfuscator:shuffle>
+    virtual void AddRef() = 0;
+    virtual void UpdateConstants(IShader* pSH) = 0;
+    virtual void CloneConstants(const IRenderShaderResources* pSrc) = 0;
+    virtual bool HasLMConstants() const = 0;
+
+    // properties
+    virtual void ToInputLM(CInputLightMaterial& lm) = 0;
+    virtual void SetInputLM(const CInputLightMaterial& lm) = 0;
+
+    virtual ColorF GetColorValue(EEfResTextures slot) const = 0;
+    virtual void SetColorValue(EEfResTextures slot, const ColorF& color) = 0;
+
+    virtual float GetStrengthValue(EEfResTextures slot) const = 0;
+    virtual void SetStrengthValue(EEfResTextures slot, float value) = 0;
+
+    // configs
+    virtual const float& GetAlphaRef() const = 0;
+    virtual void SetAlphaRef(float v) = 0;
+
+    virtual int GetResFlags() = 0;
+    virtual void SetMtlLayerNoDrawFlags(uint8 nFlags) = 0;
+    virtual uint8 GetMtlLayerNoDrawFlags() const = 0;
+    virtual SSkyInfo* GetSkyInfo() = 0;
+    virtual void SetMaterialName(const char* szName) = 0;
+
+    virtual bool TextureSlotExists(ResourceSlotIndex slotId) const = 0;
+    virtual SEfResTexture* GetTextureResource(ResourceSlotIndex slotId) = 0;
+    virtual TexturesResourcesMap* GetTexturesResourceMap() = 0;
+    virtual AZStd::vector<SShaderParam>& GetParameters() = 0;
+
+    virtual ColorF GetFinalEmittance() = 0;
+    virtual float GetVoxelCoverage() = 0;
+
+    virtual ~IRenderShaderResources() {}
+    virtual void Release() = 0;
+    virtual void ConvertToInputResource(struct SInputShaderResources* pDst) = 0;
+    virtual IRenderShaderResources* Clone() const = 0;
+    virtual void SetShaderParams(struct SInputShaderResources* pDst, IShader* pSH) = 0;
+
+    virtual size_t GetResourceMemoryUsage(ICrySizer*    pSizer) = 0;
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+    // </interfuscator:shuffle>
+
+    inline bool IsEmissive() const
+    {
+        // worst: *reinterpret_cast<int32*>(&) > 0x00000000
+        // causes value to pass from FPU to CPU registers
+        return GetStrengthValue(EFTT_EMITTANCE) > 0.0f;
+    }
+    inline bool IsTransparent() const
+    {
+        // worst: *reinterpret_cast<int32*>(&) < 0x3f800000
+        // causes value to pass from FPU to CPU registers
+        return GetStrengthValue(EFTT_OPACITY) < 1.0f;
+    }
+    inline bool IsAlphaTested() const
+    {
+        return GetAlphaRef() > 0.0f;
+    }
+    inline bool IsInvisible() const
+    {
+        const float o = GetStrengthValue(EFTT_OPACITY);
+        const float a = GetAlphaRef();
+
+        return o == 0.0f || a == 1.0f || o <= a;
+    }
+};
+
+
+struct SInputShaderResources
+    : public SBaseShaderResources
+{
+    CInputLightMaterial                 m_LMaterial;
+    TexturesResourcesMap                m_TexturesResourcesMap;      // a map of all textures resources used by the shader by name
+    SDeformInfo                         m_DeformInfo;
+
+    int Size() const
+    {
+        int nSize = SBaseShaderResources::Size();// -sizeof(SEfResTexture) * m_TexturesResourcesMap.size();
+        nSize += m_TexturePath.size();
+        nSize += sizeof(SDeformInfo);
+
+        for (auto& iter : m_TexturesResourcesMap)
+        {
+            nSize += iter.second.Size();
+        }
+        return nSize;
+    }
+
+    SInputShaderResources& operator=(const SInputShaderResources& src)
+    {
+        if (&src != this)
+        {
+            Cleanup();  // this will also remove all texture slots
+            SBaseShaderResources::operator = (src);
+            m_TexturePath = src.m_TexturePath;
+            m_DeformInfo = src.m_DeformInfo;
+            m_TexturesResourcesMap = src.m_TexturesResourcesMap;
+            m_LMaterial = src.m_LMaterial;
+        }
+        return *this;
+    }
+
+    SInputShaderResources()    {}
+    SInputShaderResources(struct IRenderShaderResources* pSrc)
+    {
+        pSrc->ConvertToInputResource(this);
+        m_ShaderParams = pSrc->GetParameters();
+    }
+
+    void Cleanup()
+    {
+        m_TexturesResourcesMap.clear();
+    }
+
+    virtual ~SInputShaderResources()
+    {
+        Cleanup();
+    }
+
+    bool IsEmpty(ResourceSlotIndex nTSlot) const
+    {
+        auto    iter = m_TexturesResourcesMap.find(nTSlot);
+        return (iter != m_TexturesResourcesMap.end()) ? iter->second.m_Name.empty() : true;
+    }
+
+    SEfResTexture* GetTextureResource(ResourceSlotIndex slotId)
+    {
+        auto    iter = m_TexturesResourcesMap.find(slotId);
+        return (iter != m_TexturesResourcesMap.end()) ? &iter->second : nullptr;
+    }
+
+    inline TexturesResourcesMap* GetTexturesResourceMap()
+    {
+        return &m_TexturesResourcesMap;
+    }
+};
+
+//===================================================================================
+// Shader gen structure (used for automatic shader script generating).
+
+//
+#define SHGF_HIDDEN   1
+#define SHGF_PRECACHE 2
+#define SHGF_AUTO_PRECACHE 4
+#define SHGF_LOWSPEC_AUTO_PRECACHE 8
+#define SHGF_RUNTIME 0x10
+
+#define SHGD_LM_DIFFUSE             0x1
+#define SHGD_TEX_DETAIL             0x2
+#define SHGD_TEX_NORMALS            0x4
+#define SHGD_TEX_ENVCM              0x8
+#define SHGD_TEX_SPECULAR           0x10
+#define SHGD_TEX_SECOND_SMOOTHNESS  0x20
+#define SHGD_TEX_HEIGHT             0x40
+#define SHGD_TEX_SUBSURFACE         0x80
+#define SHGD_HW_BILINEARFP16        0x100
+#define SHGD_HW_SEPARATEFP16        0x200
+#define SHGD_HW_ORBIS               0x800
+#define SHGD_TEX_CUSTOM             0x1000
+#define SHGD_TEX_CUSTOM_SECONDARY   0x2000
+#define SHGD_TEX_DECAL              0x4000
+#define SHGD_TEX_OCC                0x8000
+#define SHGD_TEX_SPECULAR_2         0x10000
+#define SHGD_HW_GLES3               0x20000
+#define SHGD_USER_ENABLED           0x40000
+#define SHGD_HW_SAA                 0x80000
+#define SHGD_TEX_EMITTANCE          0x100000
+#define SHGD_HW_DX10                0x200000
+#define SHGD_HW_DX11                0x400000
+#define SHGD_HW_GL4                 0x800000
+#define SHGD_HW_WATER_TESSELLATION  0x1000000
+#define SHGD_HW_SILHOUETTE_POM      0x2000000
+// Confetti Nicholas Baldwin: adding metal shader language support
+#define SHGD_HW_METAL               0x4000000
+#define SHGD_TEX_MASK       (   SHGD_TEX_DETAIL | SHGD_TEX_NORMALS | SHGD_TEX_ENVCM | SHGD_TEX_SPECULAR | SHGD_TEX_SECOND_SMOOTHNESS | \
+                                SHGD_TEX_HEIGHT | SHGD_TEX_SUBSURFACE | SHGD_TEX_CUSTOM | SHGD_TEX_CUSTOM_SECONDARY | SHGD_TEX_DECAL | \
+                                SHGD_TEX_OCC | SHGD_TEX_SPECULAR_2 | SHGD_TEX_EMITTANCE)
+
+
+//------------------------------------------------------------------------------
+// Texture slot descriptor for shader 
+//------------------------------------------------------------------------------
+struct SShaderTextureSlot
+{
+    SShaderTextureSlot()
+    {
+        m_TexType = eTT_MaxTexType;
+    }
+
+    string  m_Name;
+    string  m_Description;
+    byte    m_TexType;      // 2D, 3D, Cube etc..
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(m_Name);
+        pSizer->AddObject(m_Description);
+        pSizer->AddObject(m_TexType);
+    }
+};
+
+//------------------------------------------------------------------------------
+// Shader's used texture slots
+//------------------------------------------------------------------------------
+/* [Shader System] - To Do: bring that back to life after testing
+struct SShaderTexSlots
+{
+    uint32                      m_nRefCount;
+    TexturesSlotsUsageMap       m_UsedTextureSlots;
+
+    SShaderTexSlots()
+    {
+        m_nRefCount = 1;
+    }
+
+    ~SShaderTexSlots()
+    {
+        for (auto& iter : m_UsedTextureSlots )
+        {
+            SAFE_DELETE( iter.second );
+        }
+        m_UsedTextureSlots.clear();
+    }
+    void Release()
+    {
+        m_nRefCount--;
+        if (!m_nRefCount)
+        {
+            delete this;
+        }
+    }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(m_UsedTextureSlots);
+    }
+
+    SShaderTextureSlot* GetUsedTextureSlot(uint16 slotId)
+    {
+        auto    iter = m_UsedTextureSlots.find(slotId);
+        return (iter != m_UsedTextureSlots.end()) ? iter->second : nullptr;
+    }
+};
+*/
+
+// [Shader System] - To Do: replace this with the code above after testing
+struct SShaderTexSlots
+{
+    uint32 m_nRefCount;
+    SShaderTextureSlot* m_UsedTextureSlots[EFTT_MAX];
+    SShaderTexSlots()
+    {
+        m_nRefCount = 1;
+        memset(m_UsedTextureSlots, 0, sizeof(m_UsedTextureSlots));
+    }
+    ~SShaderTexSlots()
+    {
+        uint32 i;
+        for (i = 0; i < EFTT_MAX; i++)
+        {
+            SShaderTextureSlot* pSlot = m_UsedTextureSlots[i];
+            SAFE_DELETE(pSlot);
+        }
+    }
+    void Release()
+    {
+        m_nRefCount--;
+        if (!m_nRefCount)
+        {
+            delete this;
+        }
+    }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(m_UsedTextureSlots);
+    }
+};
+
+//===================================================================================
+
+enum EShaderType
+{
+    eST_All = -1,           // To set all with one call.
+
+    eST_General = 0,
+    eST_Metal,
+    eST_Glass,
+    eST_Ice,
+    eST_Shadow,
+    eST_Water,
+    eST_FX,
+    eST_PostProcess,
+    eST_HDR,
+    eST_Sky,
+    eST_Compute,
+    eST_Max                     // To define array size.
+};
+
+enum EShaderDrawType
+{
+    eSHDT_General,
+    eSHDT_Light,
+    eSHDT_Shadow,
+    eSHDT_Terrain,
+    eSHDT_Overlay,
+    eSHDT_OceanShore,
+    eSHDT_Fur,
+    eSHDT_NoDraw,
+    eSHDT_CustomDraw,
+    eSHDT_Sky,
+    eSHDT_Volume
+};
+
+enum EShaderQuality
+{
+    eSQ_Low = 0,
+    eSQ_Medium = 1,
+    eSQ_High = 2,
+    eSQ_VeryHigh = 3,
+    eSQ_Max = 4
+};
+
+enum ERenderQuality
+{
+    eRQ_Low = 0,
+    eRQ_Medium = 1,
+    eRQ_High = 2,
+    eRQ_VeryHigh = 3,
+    eRQ_Max = 4
+};
+
+// Summary:
+//   Shader profile flags .
+#define SPF_LOADNORMALALPHA     0x1
+
+struct SShaderProfile
+{
+    SShaderProfile()
+        : m_iShaderProfileQuality(eSQ_High)
+        , m_nShaderProfileFlags(SPF_LOADNORMALALPHA)
+    {
+    }
+
+    EShaderQuality GetShaderQuality() const
+    {
+        return (EShaderQuality)CLAMP(m_iShaderProfileQuality, 0, eSQ_VeryHigh);
+    }
+
+    void SetShaderQuality(const EShaderQuality& rValue)
+    {
+        m_iShaderProfileQuality = (int)rValue;
+    }
+
+    // ----------------------------------------------------------------
+
+    int                                   m_iShaderProfileQuality;      // EShaderQuality e.g. eSQ_Medium, use Get/Set functions if possible
+    uint32                            m_nShaderProfileFlags;        // SPF_...
+};
+
+//====================================================================================
+// Phys. material flags
+
+#define MATF_NOCLIP 1
+
+//====================================================================================
+// Registered shader techniques ID's
+
+enum EShaderTechniqueID
+{
+    TTYPE_GENERAL = -1,
+    TTYPE_Z = 0,
+    TTYPE_SHADOWGEN,
+    TTYPE_GLOWPASS,
+    TTYPE_MOTIONBLURPASS,
+    TTYPE_CUSTOMRENDERPASS,
+    TTYPE_EFFECTLAYER,
+    TTYPE_SOFTALPHATESTPASS,
+    TTYPE_WATERREFLPASS,
+    TTYPE_WATERCAUSTICPASS,
+    TTYPE_ZPREPASS,
+    TTYPE_PARTICLESTHICKNESSPASS,
+
+    // PC specific techniques must go after this point, to support shader serializing
+    // TTYPE_CONSOLE_MAX must equal TTYPE_MAX for console
+    TTYPE_CONSOLE_MAX,
+    TTYPE_DEBUG = TTYPE_CONSOLE_MAX,
+
+    TTYPE_MAX
+};
+
+//====================================================================================
+
+// EFSLIST_ lists
+// Note - declaration order/index value has no explicit meaning.
+
+enum ERenderListID
+{
+    EFSLIST_INVALID = 0,                         // Don't use, internally used.
+    EFSLIST_PREPROCESS,                        // Pre-process items.
+    EFSLIST_GENERAL,                                 // Opaque ambient_light+shadow passes.
+    EFSLIST_SHADOW_GEN,                        // Shadow map generation.
+    EFSLIST_DECAL,                                   // Opaque or transparent decals.
+    EFSLIST_WATER_VOLUMES,                   // After decals.
+    EFSLIST_TRANSP,                                // Sorted by distance under-water render items.
+    EFSLIST_WATER,                                   // Water-ocean render items.
+    EFSLIST_HDRPOSTPROCESS,                // Hdr post-processing screen effects.
+    EFSLIST_AFTER_HDRPOSTPROCESS,      // After hdr post-processing screen effects.
+    EFSLIST_POSTPROCESS,                         // Post-processing screen effects.
+    EFSLIST_AFTER_POSTPROCESS,           // After post-processing screen effects.
+    EFSLIST_SHADOW_PASS,                         // Shadow mask generation (usually from from shadow maps).
+    EFSLIST_DEFERRED_PREPROCESS,         // Pre-process before deferred passes.
+    EFSLIST_SKIN,                                        // Skin rendering pre-process
+    EFSLIST_HALFRES_PARTICLES,           // Half resolution particles
+    EFSLIST_PARTICLES_THICKNESS,         // Particles thickness passes
+    EFSLIST_LENSOPTICS,                          // Lens-optics processing
+    EFSLIST_VOXELIZE,                                // Mesh voxelization
+    EFSLIST_EYE_OVERLAY,                         // Eye overlay layer requires special processing
+    EFSLIST_FOG_VOLUME,                          // Fog density injection passes.
+    EFSLIST_GPU_PARTICLE_CUBEMAP_COLLISION,       // Cubemaps for GPU particle cubemap depth collision
+    EFSLIST_REFRACTIVE_SURFACE,                   // After decals, used for instance for the water surface that comes with water volumes.
+
+    EFSLIST_NUM
+};
+
+//================================================================
+// Different preprocess flags for shaders that require preprocessing (like recursive render to texture, screen effects, visibility check, ...)
+// SShader->m_nPreprocess flags in priority order
+
+#define  SPRID_FIRST          25
+#define  SPRID_SCANTEXWATER   26
+#define  FSPR_SCANTEXWATER    (1 << SPRID_SCANTEXWATER)
+#define  SPRID_SCANTEX        27
+#define  FSPR_SCANTEX         (1 << SPRID_SCANTEX)
+#define  SPRID_SCANLCM        28
+#define  FSPR_SCANLCM         (1 << SPRID_SCANLCM)
+#define  SPRID_GENSPRITES_DEPRECATED     29
+#define  FSPR_GENSPRITES_DEPRECATED      (1 << SPRID_GENSPRITES_DEPRECATED)
+#define  SPRID_CUSTOMTEXTURE  30
+#define  FSPR_CUSTOMTEXTURE   (1 << SPRID_CUSTOMTEXTURE)
+#define  SPRID_GENCLOUDS      31
+#define  FSPR_GENCLOUDS       (1 << SPRID_GENCLOUDS)
+
+#define  FSPR_MASK            0xfff00000
+#define  FSPR_MAX             (1 << 31)
+
+#define FEF_DONTSETTEXTURES   1                 // Set: explicit setting of samplers (e.g. tex->Apply(1,nTexStatePoint)), not set: set sampler by sematics (e.g. $ZTarget).
+#define FEF_DONTSETSTATES     2
+
+// SShader::m_Flags
+// Different useful flags
+#define EF_RELOAD        1                      // Shader needs tangent vectors array.
+#define EF_FORCE_RELOAD  2
+#define EF_RELOADED      4
+#define EF_NODRAW        8
+#define EF_HASCULL       0x10
+#define EF_SUPPORTSDEFERREDSHADING_MIXED 0x20
+#define EF_SUPPORTSDEFERREDSHADING_FULL 0x40
+#define EF_SUPPORTSDEFERREDSHADING (EF_SUPPORTSDEFERREDSHADING_MIXED | EF_SUPPORTSDEFERREDSHADING_FULL)
+#define EF_DECAL         0x80
+#define EF_LOADED        0x100
+#define EF_LOCALCONSTANTS 0x200
+#define EF_BUILD_TREE     0x400
+#define EF_LIGHTSTYLE    0x800
+#define EF_NOCHUNKMERGING 0x1000
+#define EF_SUNFLARES     0x2000
+#define EF_NEEDNORMALS   0x4000                 // Need normals operations.
+#define EF_OFFSETBUMP    0x8000
+#define EF_NOTFOUND      0x10000
+#define EF_DEFAULT       0x20000
+#define EF_SKY           0x40000
+#define EF_USELIGHTS     0x80000
+#define EF_ALLOW3DC      0x100000
+#define EF_FOGSHADER     0x200000
+#define EF_FAILED_IMPORT 0x400000               // Currently just for debug, can be removed if necessary
+#define EF_PRECACHESHADER 0x800000
+#define EF_FORCEREFRACTIONUPDATE    0x1000000
+#define EF_SUPPORTSINSTANCING_CONST 0x2000000
+#define EF_SUPPORTSINSTANCING_ATTR  0x4000000
+#define EF_SUPPORTSINSTANCING (EF_SUPPORTSINSTANCING_CONST | EF_SUPPORTSINSTANCING_ATTR)
+#define EF_WATERPARTICLE  0x8000000
+#define EF_CLIENTEFFECT  0x10000000
+#define EF_SYSTEM        0x20000000
+#define EF_REFRACTIVE    0x40000000
+#define EF_NOPREVIEW     0x80000000
+
+#define EF_PARSE_MASK    (EF_SUPPORTSINSTANCING | EF_SKY | EF_HASCULL | EF_USELIGHTS | EF_REFRACTIVE)
+
+
+// SShader::Flags2
+// Additional Different useful flags
+
+#define EF2_PREPR_GENSPRITES_DEPRECATED 0x1
+#define EF2_PREPR_GENCLOUDS 0x2
+#define EF2_PREPR_SCANWATER 0x4
+#define EF2_NOCASTSHADOWS  0x8
+#define EF2_NODRAW         0x10
+#define EF2_HASOPAQUE      0x40
+#define EF2_AFTERHDRPOSTPROCESS  0x80
+#define EF2_DONTSORTBYDIST 0x100
+#define EF2_FORCE_WATERPASS    0x200
+#define EF2_FORCE_GENERALPASS   0x400
+#define EF2_AFTERPOSTPROCESS  0x800
+#define EF2_IGNORERESOURCESTATES  0x1000
+#define EF2_EYE_OVERLAY  0x2000
+#define EF2_FORCE_TRANSPASS       0x4000
+#define EF2_DEFAULTVERTEXFORMAT 0x8000
+#define EF2_FORCE_ZPASS 0x10000
+#define EF2_FORCE_DRAWLAST 0x20000
+#define EF2_FORCE_DRAWAFTERWATER 0x40000
+// free 0x80000
+#define EF2_DEPTH_FIXUP 0x100000
+#define EF2_SINGLELIGHTPASS 0x200000
+#define EF2_FORCE_DRAWFIRST 0x400000
+#define EF2_HAIR            0x800000
+#define EF2_DETAILBUMPMAPPING 0x1000000
+#define EF2_HASALPHATEST      0x2000000
+#define EF2_HASALPHABLEND     0x4000000
+#define EF2_ZPREPASS 0x8000000
+#define EF2_VERTEXCOLORS 0x10000000
+#define EF2_SKINPASS 0x20000000
+#define EF2_HW_TESSELLATION 0x40000000
+#define EF2_ALPHABLENDSHADOWS 0x80000000
+
+class CCryNameR;
+class CCryNameTSCRC;
+struct IShader
+{
+public:
+    // <interfuscator:shuffle>
+    virtual ~IShader(){}
+    virtual int GetID() = 0;
+    virtual int AddRef() = 0;
+    virtual int Release() = 0;
+    virtual int ReleaseForce() = 0;
+
+    virtual const char* GetName() = 0;
+    virtual const char* GetName() const = 0;
+    virtual int GetFlags() const = 0;
+    virtual int GetFlags2() const = 0;
+    virtual void SetFlags2(int Flags) = 0;
+    virtual void ClearFlags2(int Flags) = 0;
+    virtual bool Reload(int nFlags, const char* szShaderName) = 0;
+    virtual AZStd::vector<SShaderParam>& GetPublicParams() = 0;
+    virtual int GetTexId () = 0;
+    virtual ITexture* GetBaseTexture(int* nPass, int* nTU) = 0;
+    virtual unsigned int GetUsedTextureTypes(void) = 0;
+    virtual SShaderTexSlots* GetUsedTextureSlots(int nTechnique) = 0;
+    virtual ECull GetCull(void) = 0;
+    virtual int Size(int Flags) = 0;
+    virtual uint64 GetGenerationMask() = 0;
+    virtual size_t GetNumberOfUVSets() = 0;
+    virtual int GetTechniqueID(int nTechnique, int nRegisteredTechnique) = 0;
+    virtual AZ::Vertex::Format GetVertexFormat(void) = 0;
+
+    // D3D Effects interface
+    virtual bool FXSetTechnique(const CCryNameTSCRC& Name) = 0;
+    virtual bool FXSetPSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) = 0;
+    virtual bool FXSetCSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) = 0;
+    virtual bool FXSetVSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) = 0;
+    virtual bool FXSetGSFloat(const CCryNameR& NameParam, const Vec4 fParams[], int nParams) = 0;
+
+    virtual bool FXSetPSFloat(const char* NameParam, const Vec4 fParams[], int nParams) = 0;
+    virtual bool FXSetCSFloat(const char* NameParam, const Vec4 fParams[], int nParams) = 0;
+    virtual bool FXSetVSFloat(const char* NameParam, const Vec4 fParams[], int nParams) = 0;
+    virtual bool FXSetGSFloat(const char* NameParam, const Vec4 fParams[], int nParams) = 0;
+
+    virtual bool FXBegin(uint32* uiPassCount, uint32 nFlags) = 0;
+    virtual bool FXBeginPass(uint32 uiPass) = 0;
+    virtual bool FXCommit(const uint32 nFlags) = 0;
+    virtual bool FXEndPass() = 0;
+    virtual bool FXEnd() = 0;
+
+    virtual EShaderType GetShaderType() = 0;
+    virtual EShaderDrawType GetShaderDrawType() const = 0;
+    virtual uint32      GetVertexModificator() = 0;
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+    // </interfuscator:shuffle>
+
+    static uint32 GetTextureSlot(EEfResTextures textureType) { return (uint32)textureType; }
+};
+
+struct SShaderItem
+{
+    IShader* m_pShader;
+    IRenderShaderResources* m_pShaderResources;
+    int32 m_nTechnique;
+    uint32 m_nPreprocessFlags;
+
+    SShaderItem()
+    {
+        m_pShader = NULL;
+        m_pShaderResources = NULL;
+        m_nTechnique = -1;
+        m_nPreprocessFlags = 1;
+    }
+    SShaderItem(IShader* pSH)
+    {
+        m_pShader = pSH;
+        m_pShaderResources = NULL;
+        m_nTechnique = -1;
+        m_nPreprocessFlags = 1;
+    }
+    SShaderItem(IShader* pSH, IRenderShaderResources* pRS)
+    {
+        m_pShader = pSH;
+        m_pShaderResources = pRS;
+        m_nTechnique = -1;
+        m_nPreprocessFlags = 1;
+    }
+    SShaderItem(IShader* pSH, IRenderShaderResources* pRS, int nTechnique)
+    {
+        m_pShader = pSH;
+        m_pShaderResources = pRS;
+        m_nTechnique = nTechnique;
+        m_nPreprocessFlags = 1;
+    }
+
+    uint32 PostLoad();
+    bool Update();
+    bool RefreshResourceConstants();
+    // Note:
+    //   If you change this function please check bTransparent variable in CRenderMesh::Render().
+    // See also:
+    //   CRenderMesh::Render()
+    inline bool IsZWrite() const
+    {
+        IShader* pSH = m_pShader;
+        if (pSH->GetFlags() & (EF_NODRAW | EF_DECAL))
+        {
+            return false;
+        }
+        if (pSH->GetFlags2() & EF2_FORCE_ZPASS)
+        {
+            return true;
+        }
+        if (m_pShaderResources && m_pShaderResources->IsTransparent())
+        {
+            return false;
+        }
+        return true;
+    }
+    inline struct SShaderTechnique* GetTechnique() const;
+    bool IsMergable(SShaderItem& PrevSI);
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(m_pShader);
+        pSizer->AddObject(m_pShaderResources);
+    }
+};
+
+
+//////////////////////////////////////////////////////////////////////
+// define before including <IRenderMesh.h>
+
+struct CRenderChunk
+{
+    bool m_bUsesBones;
+    CREMesh* pRE;               // Pointer to the mesh.
+
+    float m_texelAreaDensity;
+
+    uint32 nFirstIndexId;
+    uint32 nNumIndices;
+
+    uint32 nFirstVertId;
+    uint32 nNumVerts;
+
+    uint16 m_nMatFlags;     // Material flags from originally assigned material @see EMaterialFlags.
+    uint16 m_nMatID;                // Material Sub-object id.
+
+    // Index of sub-object that this chunk originates from, used by sub-object hide mask.
+    // @see IStatObj::GetSubObject
+    uint32 nSubObjectIndex;
+
+    AZ::Vertex::Format m_vertexFormat;
+
+    //////////////////////////////////////////////////////////////////////////
+    CRenderChunk()
+        : m_bUsesBones(false)
+        , pRE(0)
+        , m_texelAreaDensity(1.0f)
+        , nFirstIndexId(0)
+        , nNumIndices(0)
+        , nFirstVertId(0)
+        , nNumVerts(0)
+        , m_nMatFlags(0)
+        , m_nMatID(0)
+        , nSubObjectIndex(0)
+        , m_vertexFormat(eVF_P3F_C4B_T2F)
+    {
+    }
+
+    int Size() const;
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
+    {
+    }
+};
+
+typedef DynArray<CRenderChunk> TRenderChunkArray;
+
+//////////////////////////////////////////////////////////////////////
+// DLights
+
+enum eDynamicLightFlags
+{
+    DLF_AREA_SPEC_TEX               = BIT(0),
+    DLF_DIRECTIONAL                 = BIT(1),
+    DLF_BOX_PROJECTED_CM            = BIT(2),
+    // BIT(3) DEPRECATED, Available for use
+    DLF_POST_3D_RENDERER            = BIT(4),
+    DLF_CASTSHADOW_MAPS             = BIT(5),
+    DLF_POINT                       = BIT(6),
+    DLF_PROJECT                     = BIT(7),
+    DLF_LIGHT_BEAM                  = BIT(8),
+    DLF_IGNORES_VISAREAS            = BIT(10),
+    DLF_DEFERRED_CUBEMAPS           = BIT(11),
+    DLF_HAS_CLIP_VOLUME             = BIT(12),
+    DLF_DISABLED                    = BIT(13),
+    DLF_AREA_LIGHT                  = BIT(14),
+    DLF_USE_FOR_SVOGI               = BIT(15),
+    // UNUSED                       = BIT(16),
+    DLF_FAKE                        = BIT(17), // No lighting, used for Flares, beams and such.
+    DLF_SUN                         = BIT(18),
+    DLF_LM                          = BIT(19),
+    DLF_THIS_AREA_ONLY              = BIT(20), // Affects only current area/sector.
+    DLF_AMBIENT                     = BIT(21), // Ambient light (has name indicates, used for replacing ambient)
+    DLF_INDOOR_ONLY                 = BIT(22), // Do not affect height map.
+    DLF_VOLUMETRIC_FOG              = BIT(23), // Affects volumetric fog.
+    DLF_ATTACH_TO_SUN               = BIT(24), // Add only to  Light Propagation Volume if it's possible.
+    DLF_TRACKVIEW_TIMESCRUBBING     = BIT(25), // Add only to  Light Propagation Volume if it's possible.
+    DLF_VOLUMETRIC_FOG_ONLY         = BIT(26), // Affects only volumetric fog.
+    DLF_DEFERRED_LIGHT              = BIT(27), // DEPRECATED. Remove once deferred shading by default
+    DLF_SPECULAROCCLUSION           = BIT(28), // DEPRECATED. Remove all dependencies editor side, etc
+    DLF_DIFFUSEOCCLUSION            = BIT(29),
+    DLF_CAST_TERRAIN_SHADOWS        = BIT(30), // Include terrain in shadow casters
+
+    DLF_LIGHTTYPE_MASK              = (DLF_DIRECTIONAL | DLF_POINT | DLF_PROJECT | DLF_AREA_LIGHT)
+};
+
+
+//Area light types
+#define DLAT_SPHERE             0x1
+#define DLAT_RECTANGLE      0x2
+#define DLAT_POINT              0x4
+
+#define DL_SHADOW_UPDATE_SHIFT 8
+
+#include <IRenderMesh.h>  // <> required for Interfuscator
+
+struct IAnimNode;
+
+struct ILightAnimWrapper
+    : public _i_reference_target_t
+{
+public:
+    virtual bool Resolve() = 0;
+    IAnimNode* GetNode() const { return m_pNode; }
+
+protected:
+    ILightAnimWrapper(const char* name)
+        : m_name(name)
+        , m_pNode(0) {}
+    virtual ~ILightAnimWrapper() {}
+
+protected:
+    string m_name;
+    IAnimNode* m_pNode;
+};
+
+struct SOpticsInstanceParameters
+{
+    SOpticsInstanceParameters(float brightness = 0.0f, float size = 0.0f, const ColorF& color = ColorF(), bool valid = false) : 
+        m_brightness(brightness), 
+        m_size(size), m_color(color), 
+        m_isValid(valid) {}
+
+    float m_brightness;
+    float m_size;
+    ColorF m_color;
+    bool m_isValid;
+};
+
+#define MAX_RECURSION_LEVELS 2
+
+struct SRenderLight
+{
+    SRenderLight()
+    {
+        memset(this, 0, sizeof(SRenderLight));
+        m_fLightFrustumAngle = 45.0f;
+        m_fRadius = 4.0f;
+        m_fBaseRadius = 4.0f;
+        m_SpecMult = m_BaseSpecMult = 1.0f;
+        m_ProjMatrix.SetIdentity();
+        m_ObjMatrix.SetIdentity();
+        m_BaseObjMatrix.SetIdentity();
+        m_sName = "";
+        m_pLightAnim = NULL;
+        m_fAreaWidth = 1;
+        m_fAreaHeight = 1;
+        m_fBoxWidth = 1.0f;
+        m_fBoxHeight = 1.0f;
+        m_fBoxLength = 1.0f;
+        m_fTimeScrubbed = 0.0f;
+
+        m_fShadowBias = 1.0f;
+        m_fShadowSlopeBias = 1.0f;
+        m_fShadowResolutionScale = 1.0f;
+        m_nShadowMinResolution = 0;
+        m_fShadowUpdateMinRadius = m_fRadius;
+        m_nShadowUpdateRatio = 1 << DL_SHADOW_UPDATE_SHIFT;
+        m_nEntityId = (uint32) - 1;
+        m_LensOpticsFrustumAngle = 255;
+        m_nAttenFalloffMax = 255;
+        m_fAttenuationBulbSize = 0.1f;
+        m_fProbeAttenuation = 1.0f;
+        m_lightId = -1;
+    }
+
+    const Vec3& GetPosition() const
+    {
+        return m_Origin;
+    }
+    void SetPosition(const Vec3& vPos)
+    {
+        m_BaseOrigin = vPos;
+        m_Origin = vPos;
+    }
+
+    // Summary:
+    //   Use this instead of m_Color.
+    void SetLightColor(const ColorF& cColor)
+    {
+        m_Color = cColor;
+        m_BaseColor = cColor;
+    }
+
+    ITexture* GetDiffuseCubemap() const
+    {
+        return m_pDiffuseCubemap;
+    }
+
+    ITexture* GetSpecularCubemap() const
+    {
+        return m_pSpecularCubemap;
+    }
+
+    ITexture* GetLightTexture() const
+    {
+        return m_pLightImage ? m_pLightImage : NULL;
+    }
+
+    void SetOpticsParams(const SOpticsInstanceParameters& params)
+    {
+        m_opticsParams = params;
+    }
+
+    const SOpticsInstanceParameters& GetOpticsParams() const
+    {
+        return m_opticsParams;
+    }
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*LATER*/}
+
+    void AcquireResources()
+    {
+        if (m_Shader.m_pShader)
+        {
+            m_Shader.m_pShader->AddRef();
+        }
+        if (m_pLightImage)
+        {
+            m_pLightImage->AddRef();
+        }
+        if (m_pDiffuseCubemap)
+        {
+            m_pDiffuseCubemap->AddRef();
+        }
+        if (m_pSpecularCubemap)
+        {
+            m_pSpecularCubemap->AddRef();
+        }
+        if (m_pLightAnim)
+        {
+            m_pLightAnim->AddRef();
+        }
+        if (m_pLightAttenMap)
+        {
+            m_pLightAttenMap->AddRef();
+        }
+    }
+
+    void DropResources()
+    {
+        SAFE_RELEASE(m_Shader.m_pShader);
+        SAFE_RELEASE(m_pLightImage);
+        SAFE_RELEASE(m_pDiffuseCubemap);
+        SAFE_RELEASE(m_pSpecularCubemap);
+        SAFE_RELEASE(m_pLightAnim);
+        SAFE_RELEASE(m_pLightAttenMap);
+    }
+
+    void SetAnimSpeed(float fAnimSpeed)
+    {
+        m_nAnimSpeed = aznumeric_caster(int_round(min(fAnimSpeed * 255.0f / 4.0f, 255.0f)));   // Assuming speed multiplier in range [0, 4]
+    }
+
+    float GetAnimSpeed() const
+    {
+        return ((float) m_nAnimSpeed) * (4.0f / 255.0f);
+    }
+
+    void SetFalloffMax(float fMax)
+    {
+        m_nAttenFalloffMax = aznumeric_caster(int_round(fMax * 255.0f));
+    }
+
+    float GetFalloffMax()  const
+    {
+        return ((float) m_nAttenFalloffMax) / 255.0f;
+    }
+
+    // Calculate the scissor rectangle in screenspace that encompasses this light.  These values are used to set
+    // the hardware scissor rect in order to clip the min/max 2d extents for the light.
+    // These values must be calculated and read on the render thread due to the VR tracking updates performed on the render thread.
+    void CalculateScissorRect();
+
+    //=========================================================================================================================
+
+    // Commonly used on most code paths (64 bytes)
+    int16 m_Id;                                     // Shader id
+    uint8 m_nStencilRef[2];
+    uint32 m_n3DEngineUpdateFrameID;
+    uint32 m_nEntityId;                             // Unique entity id
+    uint32 m_Flags;                                 // light flags (DLF_etc).
+    Vec3 m_Origin;                                  // World space position
+    float m_fRadius;                                // xyz= Origin, w=Radius. (Do not change order)
+    ColorF m_Color;                                 // w component unused - todo pack spec mul into alpha (post c3 - touches quite some code)
+    float m_SpecMult;                               // Specular multiplier
+    float m_fHDRDynamic;                            // <DEPRECATED> 0 to get the same results in HDR, <0 to get darker, >0 to get brighter.
+    int16 m_sX;                                     // Scissor parameters (2d extent).
+    int16 m_sY;
+    int16 m_sWidth;
+    int16 m_sHeight;
+    int m_lightId;
+
+    // Env. probes
+    ITexture* m_pDiffuseCubemap;                    // Very small cubemap texture to make a lookup for diffuse.
+    ITexture* m_pSpecularCubemap;                   // Cubemap texture to make a lookup for local specular.
+    Vec3 m_ProbeExtents;
+    float m_fBoxWidth;
+    float m_fBoxHeight;
+    float m_fBoxLength;
+    float m_fProbeAttenuation;                      // Can be used fade out distant probes, or to manually blend between multiple co-located probes 
+    uint8 m_nAttenFalloffMax;
+    uint8 m_nSortPriority;
+
+    // Shadow map fields
+    struct ILightSource* m_pOwner;
+    ShadowMapFrustum** m_pShadowMapFrustums;
+    float m_fShadowBias;
+    float m_fShadowSlopeBias;
+    float m_fShadowResolutionScale;
+    float m_fShadowUpdateMinRadius;
+    uint16 m_nShadowMinResolution;
+    uint16 m_nShadowUpdateRatio;
+    uint8 m_ShadowChanMask : 4;
+    uint8 m_ShadowMaskIndex : 4;
+
+    // Projector
+    ITexture*                       m_pLightAttenMap;                                       // User can specify custom light attenuation gradient
+    ITexture*                       m_pLightImage;
+    Matrix44                        m_ProjMatrix;
+    Matrix34                        m_ObjMatrix;
+    float                           m_fLightFrustumAngle;
+    float                           m_fProjectorNearPlane;
+
+    // Misc fields. todo: put in cold data struct (post c3 - touches quite some code)
+    const char* m_sName;                            // Optional name of the light source.
+    SShaderItem m_Shader;                           // Shader item
+    CRenderObject* m_pObject[MAX_RECURSION_LEVELS]; // Object for light coronas and light flares.
+    ILightAnimWrapper* m_pLightAnim;
+
+    Matrix34 m_BaseObjMatrix;
+    float m_fTimeScrubbed;
+    Vec3 m_BaseOrigin;                              // World space position.
+    float m_fBaseRadius;                            // Base radius 
+    ColorF m_BaseColor;                             // w component unused..
+    float m_BaseSpecMult;
+
+    float m_fAttenuationBulbSize;
+
+    float m_fAreaWidth;
+    float m_fAreaHeight;
+
+    float m_fFogRadialLobe;                         // The blend ratio of two radial lobe for volumetric fog.
+
+    AZ::u8 m_nAnimSpeed;
+    AZ::u8 m_nLightStyle;
+    AZ::u8 m_nLightPhase;
+    AZ::u8 m_LensOpticsFrustumAngle;                 // from 0 to 255, The range will be adjusted from 0 to 360 when used.
+
+    IClipVolume* m_pClipVolumes[2];
+
+    SOpticsInstanceParameters m_opticsParams;       // Per instance optics parameters
+};
+
+//////////////////////////////////////////////////////////////////////
+class CDLight
+    : public SRenderLight
+{
+public:
+    CDLight()
+        : SRenderLight()
+    {
+    }
+
+    ~CDLight()
+    {
+        DropResources();
+    }
+
+    // Summary:
+    //   Good for debugging.
+    bool IsOk() const
+    {
+        for (int i = 0; i < 3; ++i)
+        {
+            if (m_Color[i] < 0 || m_Color[i] > 100.0f || _isnan(m_Color[i]))
+            {
+                return false;
+            }
+            if (m_BaseColor[i] < 0 || m_BaseColor[i] > 100.0f || _isnan(m_BaseColor[i]))
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    CDLight(const CDLight& other)
+    {
+        operator=(other);
+    }
+
+    CDLight& operator=(const CDLight& dl)
+    {
+        if (this == &dl)
+        {
+            return *this;
+        }
+
+        DropResources();
+
+        m_pOwner = dl.m_pOwner;
+        memcpy(m_pObject, dl.m_pObject, sizeof(m_pObject));
+        m_Shader = dl.m_Shader;
+        m_pShadowMapFrustums = dl.m_pShadowMapFrustums;
+        m_pDiffuseCubemap = dl.m_pDiffuseCubemap;
+        m_pSpecularCubemap = dl.m_pSpecularCubemap;
+        m_pLightImage = dl.m_pLightImage;
+        m_pLightAttenMap = dl.m_pLightAttenMap;
+        m_sName = dl.m_sName;
+        m_ProjMatrix = dl.m_ProjMatrix;
+        m_ObjMatrix = dl.m_ObjMatrix;
+        m_BaseObjMatrix = dl.m_BaseObjMatrix;
+        m_Color = dl.m_Color;
+        m_BaseColor = dl.m_BaseColor;
+        m_Origin = dl.m_Origin;
+        m_BaseOrigin = dl.m_BaseOrigin;
+        m_fRadius = dl.m_fRadius;
+        m_fBaseRadius = dl.m_fBaseRadius;
+        m_ProbeExtents = dl.m_ProbeExtents;
+        m_SpecMult = dl.m_SpecMult;
+        m_BaseSpecMult = dl.m_BaseSpecMult;
+        m_fShadowBias = dl.m_fShadowBias;
+        m_fShadowSlopeBias = dl.m_fShadowSlopeBias;
+        m_fShadowResolutionScale = dl.m_fShadowResolutionScale;
+        m_fHDRDynamic = dl.m_fHDRDynamic;
+        m_LensOpticsFrustumAngle = dl.m_LensOpticsFrustumAngle;
+        m_fLightFrustumAngle = dl.m_fLightFrustumAngle;
+        m_fProjectorNearPlane = dl.m_fProjectorNearPlane;
+        m_Flags = dl.m_Flags;
+        m_Id = dl.m_Id;
+        m_n3DEngineUpdateFrameID = dl.m_n3DEngineUpdateFrameID;
+        m_sX = dl.m_sX;
+        m_sY = dl.m_sY;
+        m_sWidth = dl.m_sWidth;
+        m_sHeight = dl.m_sHeight;
+        m_nLightStyle = dl.m_nLightStyle;
+        m_nLightPhase = dl.m_nLightPhase;
+        m_ShadowChanMask = dl.m_ShadowChanMask;
+        m_pLightAnim = dl.m_pLightAnim;
+        m_fAreaWidth = dl.m_fAreaWidth;
+        m_fAreaHeight = dl.m_fAreaHeight;
+        m_fBoxWidth = dl.m_fBoxWidth;
+        m_fBoxHeight = dl.m_fBoxHeight;
+        m_fBoxLength = dl.m_fBoxLength;
+        m_fTimeScrubbed = dl.m_fTimeScrubbed;
+        m_nShadowMinResolution = dl.m_nShadowMinResolution;
+        m_fShadowUpdateMinRadius = dl.m_fShadowUpdateMinRadius;
+        m_nShadowUpdateRatio = dl.m_nShadowUpdateRatio;
+        m_nAnimSpeed = dl.m_nAnimSpeed;
+        m_nSortPriority = dl.m_nSortPriority;
+        m_nAttenFalloffMax = dl.m_nAttenFalloffMax;
+        m_fProbeAttenuation = dl.m_fProbeAttenuation;
+        m_fAttenuationBulbSize = dl.m_fAttenuationBulbSize;
+        m_fFogRadialLobe = dl.m_fFogRadialLobe;
+        m_nEntityId = dl.m_nEntityId;
+        memcpy(m_nStencilRef, dl.m_nStencilRef, sizeof(m_nStencilRef));
+        memcpy(m_pClipVolumes, dl.m_pClipVolumes, sizeof(m_pClipVolumes));
+        m_opticsParams = dl.m_opticsParams;
+        AcquireResources();
+
+        return *this;
+    }
+
+    // Summary:
+    //   Use this instead of m_Color.
+    const ColorF& GetFinalColor([[maybe_unused]] const ColorF& cColor) const
+    {
+        return m_Color;
+    }
+
+    // Summary:
+    //   Use this instead of m_Color.
+    void SetSpecularMult(float fSpecMult)
+    {
+        m_SpecMult = fSpecMult;
+        m_BaseSpecMult = fSpecMult;
+    }
+
+    void SetShadowBiasParams(float fShadowBias, float fShadowSlopeBias)
+    {
+        m_fShadowBias = fShadowBias;
+        m_fShadowSlopeBias = fShadowSlopeBias;
+    }
+
+    // Summary:
+    //   Use this instead of m_Color.
+    const float& GetSpecularMult() const
+    {
+        return m_SpecMult;
+    }
+    void SetMatrix(const Matrix34& Matrix, bool reset = true)
+    {
+        // Scale the cubemap to adjust the default 45 degree 1/2 angle fustrum to
+        // the desired angle (0 to 90 degrees).
+        float scaleFactor = tan_tpl((90.0f - m_fLightFrustumAngle) * gf_PI / 180.0f);
+        m_ProjMatrix = Matrix33(Matrix) * Matrix33::CreateScale(Vec3(1, scaleFactor, scaleFactor));
+        Matrix44 transMat;
+        transMat.SetIdentity();
+        transMat(3, 0) = -Matrix(0, 3);
+        transMat(3, 1) = -Matrix(1, 3);
+        transMat(3, 2) = -Matrix(2, 3);
+        m_ProjMatrix = transMat * m_ProjMatrix;
+        m_ObjMatrix = Matrix;
+
+        // Remove any scale
+        m_ObjMatrix.GetColumn0().NormalizeSafe(Vec3_OneX);
+        m_ObjMatrix.GetColumn1().NormalizeSafe(Vec3_OneY);
+        m_ObjMatrix.GetColumn2().NormalizeSafe(Vec3_OneZ);
+
+        if (reset)
+        {
+            m_BaseObjMatrix = m_ObjMatrix;
+        }
+    }
+
+    void SetSpecularCubemap(ITexture* texture)
+    {
+        m_pSpecularCubemap = texture;
+    }
+
+    void SetDiffuseCubemap(ITexture* texture)
+    {
+        m_pDiffuseCubemap = texture;
+    }
+
+    void ReleaseCubemaps()
+    {
+        SAFE_RELEASE(m_pSpecularCubemap);
+        SAFE_RELEASE(m_pDiffuseCubemap);
+    }
+};
+
+#define DECAL_HAS_NORMAL_MAP    (1 << 0)
+#define DECAL_STATIC                    (1 << 1)
+#define DECAL_HAS_SPECULAR_MAP (1 << 2)
+
+struct SDeferredDecal
+{
+    SDeferredDecal()
+    {
+        ZeroStruct(*this);
+        rectTexture.w = rectTexture.h = 1.f;
+        angleAttenuation = 1.0f;
+    }
+
+    Matrix34 projMatrix; // defines where projection should be applied in the world
+    _smart_ptr<IMaterial> pMaterial; // decal material
+    float fAlpha; // transparency of decal, used mostly for distance fading
+    float fGrowAlphaRef;
+    float angleAttenuation;
+    RectF rectTexture; // subset of texture to render
+    uint32 nFlags;
+    uint8 nSortOrder; // user defined sort order
+};
+
+// Summary:
+//   Runtime shader flags for HW skinning.
+enum EHWSkinningRuntimeFlags
+{
+    eHWS_MotionBlured = 0x04,
+    eHWS_Skinning_DQ_Linear = 0x08,     // Convert dual-quaternions to matrices on the GPU
+    eHWS_Skinning_Matrix = 0x10,        // Pass float3x4 skinning matrices directly to the GPU
+};
+
+// Enum of data types that can be used as bones on GPU for skinning
+enum EBoneTypes
+{
+    eBoneType_DualQuat = 0,
+    eBoneType_Matrix,
+    eBoneType_Count,
+};
+
+// Summary:
+//   Shader graph support.
+enum EGrBlockType
+{
+    eGrBlock_Unknown,
+    eGrBlock_VertexInput,
+    eGrBlock_VertexOutput,
+    eGrBlock_PixelInput,
+    eGrBlock_PixelOutput,
+    eGrBlock_Texture,
+    eGrBlock_Sampler,
+    eGrBlock_Function,
+    eGrBlock_Constant,
+};
+
+enum EGrBlockSamplerType
+{
+    eGrBlockSampler_Unknown,
+    eGrBlockSampler_2D,
+    eGrBlockSampler_3D,
+    eGrBlockSampler_Cube,
+    eGrBlockSampler_Bias2D,
+    eGrBlockSampler_BiasCube,
+};
+
+enum EGrNodeType
+{
+    eGrNode_Unknown,
+    eGrNode_Input,
+    eGrNode_Output,
+};
+
+enum EGrNodeFormat
+{
+    eGrNodeFormat_Unknown,
+    eGrNodeFormat_Float,
+    eGrNodeFormat_Vector,
+    eGrNodeFormat_Matrix,
+    eGrNodeFormat_Int,
+    eGrNodeFormat_Bool,
+    eGrNodeFormat_Texture2D,
+    eGrNodeFormat_Texture3D,
+    eGrNodeFormat_TextureCUBE,
+};
+
+enum EGrNodeIOSemantic
+{
+    eGrNodeIOSemantic_Unknown,
+    eGrNodeIOSemantic_Custom,
+    eGrNodeIOSemantic_VPos,
+    eGrNodeIOSemantic_Color0,
+    eGrNodeIOSemantic_Color1,
+    eGrNodeIOSemantic_Color2,
+    eGrNodeIOSemantic_Color3,
+    eGrNodeIOSemantic_Normal,
+    eGrNodeIOSemantic_TexCoord0,
+    eGrNodeIOSemantic_TexCoord1,
+    eGrNodeIOSemantic_TexCoord2,
+    eGrNodeIOSemantic_TexCoord3,
+    eGrNodeIOSemantic_TexCoord4,
+    eGrNodeIOSemantic_TexCoord5,
+    eGrNodeIOSemantic_TexCoord6,
+    eGrNodeIOSemantic_TexCoord7,
+    eGrNodeIOSemantic_Tangent,
+    eGrNodeIOSemantic_Binormal,
+};
+
+struct SShaderGraphFunction
+{
+    string m_Data;
+    string m_Name;
+    std::vector<string> inParams;
+    std::vector<string> outParams;
+    std::vector<string> szInTypes;
+    std::vector<string> szOutTypes;
+};
+
+struct SShaderGraphNode
+{
+    EGrNodeType m_eType;
+    EGrNodeFormat m_eFormat;
+    EGrNodeIOSemantic m_eSemantic;
+    string m_CustomSemantics;
+    string m_Name;
+    bool m_bEditable;
+    bool m_bWasAdded;
+    SShaderGraphFunction* m_pFunction;
+    AZStd::vector<SShaderParam> m_Properties;
+
+    SShaderGraphNode()
+    {
+        m_eType = eGrNode_Unknown;
+        m_eFormat = eGrNodeFormat_Unknown;
+        m_eSemantic = eGrNodeIOSemantic_Unknown;
+        m_bEditable = false;
+        m_bWasAdded = false;
+        m_pFunction = NULL;
+    }
+    ~SShaderGraphNode();
+};
+
+
+typedef std::vector<SShaderGraphNode*> FXShaderGraphNodes;
+typedef FXShaderGraphNodes::iterator FXShaderGraphNodeItor;
+
+struct SShaderGraphBlock
+{
+    EGrBlockType m_eType;
+    EGrBlockSamplerType m_eSamplerType;
+    string m_ClassName;
+    FXShaderGraphNodes  m_Nodes;
+
+    ~SShaderGraphBlock();
+};
+
+typedef std::vector<SShaderGraphBlock*> FXShaderGraphBlocks;
+typedef FXShaderGraphBlocks::iterator FXShaderGraphBlocksItor;
+
+#include <CryCommon/StaticInstance.h>
+
+#endif // CRYINCLUDE_CRYCOMMON_ISHADER_H
diff --git a/Code/Legacy/CryCommon/ISplines.h b/Code/Legacy/CryCommon/ISplines.h
new file mode 100644
index 0000000000..31d0091f34
--- /dev/null
+++ b/Code/Legacy/CryCommon/ISplines.h
@@ -0,0 +1,1258 @@
+/*
+ * 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_ISPLINES_H
+#define CRYINCLUDE_CRYCOMMON_ISPLINES_H
+#pragma once
+
+#include <CrySizer.h>
+#include <IXml.h>
+
+//////////////////////////////////////////////////////////////////////////
+
+// These flags are mostly applicable for hermit based splines.
+enum ESplineKeyTangentType
+{
+    SPLINE_KEY_TANGENT_NONE    = 0,
+    SPLINE_KEY_TANGENT_CUSTOM  = 1,
+    SPLINE_KEY_TANGENT_ZERO    = 2,
+    SPLINE_KEY_TANGENT_STEP    = 3,
+    SPLINE_KEY_TANGENT_LINEAR  = 4,
+    SPLINE_KEY_TANGENT_BEZIER  = 5
+};
+
+#define SPLINE_KEY_TANGENT_IN_SHIFT  (0)
+#define SPLINE_KEY_TANGENT_IN_MASK   (0x07)                                  // 0000111
+#define SPLINE_KEY_TANGENT_OUT_SHIFT (3)
+#define SPLINE_KEY_TANGENT_OUT_MASK  (0x07 << (SPLINE_KEY_TANGENT_OUT_SHIFT))  // 0111000
+#define SPLINE_KEY_TANGENT_UNIFY_SHIFT (6)
+#define SPLINE_KEY_TANGENT_UNIFY_MASK  (0x01 << (SPLINE_KEY_TANGENT_UNIFY_SHIFT))  // 1000000
+
+#define SPLINE_KEY_TANGENT_ALL_MASK (SPLINE_KEY_TANGENT_IN_MASK | SPLINE_KEY_TANGENT_OUT_MASK | SPLINE_KEY_TANGENT_UNIFY_MASK)
+#define SPLINE_KEY_TANGENT_UNIFIED ((SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_IN_SHIFT)    \
+                                    | (SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_OUT_SHIFT) \
+                                    | (0x01 << SPLINE_KEY_TANGENT_UNIFY_SHIFT))
+#define SPLINE_KEY_TANGENT_BROKEN ((SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_IN_SHIFT)    \
+                                   | (SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_OUT_SHIFT) \
+                                   | (0x00 << SPLINE_KEY_TANGENT_UNIFY_SHIFT))
+
+enum ESplineKeyFlags
+{
+    ESPLINE_KEY_UI_SELECTED_SHIFT = 16,
+    ESPLINE_KEY_UI_SELECTED_MAX_DIMENSION_COUNT = 4,   // should be power of 2 (see ESPLINE_KEY_UI_SELECTED_MASK)
+    ESPLINE_KEY_UI_SELECTED_MASK = ((1 << ESPLINE_KEY_UI_SELECTED_MAX_DIMENSION_COUNT) - 1) << ESPLINE_KEY_UI_SELECTED_SHIFT
+};
+
+
+// Return value closest to 0 if same sign, or 0 if opposite.
+template<class T>
+inline T minmag(T const& a, T const& b)
+{
+    if (a * b <= T(0.f))
+    {
+        return T(0.f);
+    }
+    else if (a < T(0.f))
+    {
+        return max(a, b);
+    }
+    else
+    {
+        return min(a, b);
+    }
+}
+
+template<class T>
+inline Vec3_tpl<T> minmag(Vec3_tpl<T> const& a, Vec3_tpl<T> const& b)
+{
+    return Vec3_tpl<T>(minmag(a.x, b.x), minmag(a.y, b.y), minmag(a.z, b.z));
+}
+
+template<class T>
+T abs(Vec3_tpl<T> v)
+{
+    return v.GetLength();
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Interface returned by backup methods of ISplineInterpolator.
+//////////////////////////////////////////////////////////////////////////
+struct ISplineBackup
+{
+    // <interfuscator:shuffle>
+    virtual ~ISplineBackup(){}
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+    // </interfuscator:shuffle>
+};
+
+//////////////////////////////////////////////////////////////////////////
+// General Interpolation interface.
+//////////////////////////////////////////////////////////////////////////
+struct ISplineInterpolator
+{
+    typedef float ElemType;
+    typedef ElemType ValueType[4];
+
+    // <interfuscator:shuffle>
+    virtual ~ISplineInterpolator(){}
+
+    // Dimension of the spline from 0 to 3, number of parameters used in ValueType.
+    virtual int GetNumDimensions() = 0;
+
+    // Insert`s a new key, returns index of the key.
+    virtual int  InsertKey(float time, ValueType value) = 0;
+    virtual void RemoveKey(int key) = 0;
+
+    virtual void FindKeysInRange(float startTime, float endTime, int& firstFoundKey, int& numFoundKeys) = 0;
+    virtual void RemoveKeysInRange(float startTime, float endTime) = 0;
+
+    virtual int   GetKeyCount() = 0;
+    virtual void  SetKeyTime(int key, float time) = 0;
+    virtual float GetKeyTime(int key) = 0;
+    virtual void  SetKeyValue(int key, ValueType value) = 0;
+    virtual bool  GetKeyValue(int key, ValueType& value) = 0;
+
+    virtual void  SetKeyInTangent(int key, ValueType tin) = 0;
+    virtual void  SetKeyOutTangent(int key, ValueType tout) = 0;
+    virtual void  SetKeyTangents(int key, ValueType tin, ValueType tout) = 0;
+    virtual bool  GetKeyTangents(int key, ValueType& tin, ValueType& tout) = 0;
+
+    // Changes key flags, @see ESplineKeyFlags
+    virtual void  SetKeyFlags(int key, int flags) = 0;
+    // Retrieve key flags, @see ESplineKeyFlags
+    virtual int   GetKeyFlags(int key) = 0;
+
+    virtual void Interpolate(float time, ValueType& value) = 0;
+    virtual void EvalInTangent([[maybe_unused]] float time, [[maybe_unused]] ValueType& value) {};
+    virtual void EvalOutTangent([[maybe_unused]] float time, [[maybe_unused]] ValueType& value) {};
+
+    virtual void SerializeSpline(XmlNodeRef& node, bool bLoading) = 0;
+
+    virtual ISplineBackup* Backup() = 0;
+    virtual void Restore(ISplineBackup* pBackup) = 0;
+
+    void ClearAllKeys()
+    {
+        while (GetKeyCount() > 0)
+        {
+            RemoveKey(0);
+        }
+        Update();
+    }
+
+    // </interfuscator:shuffle>
+
+    //////////////////////////////////////////////////////////////////////////
+    // Helper functions.
+    //////////////////////////////////////////////////////////////////////////
+    inline bool IsKeySelectedAtAnyDimension(const int key)
+    {
+        const int flags = GetKeyFlags(key);
+        const int dimensionCount = GetNumDimensions();
+        const int mask = ((1 << dimensionCount) - 1) << ESPLINE_KEY_UI_SELECTED_SHIFT;
+        return (flags & mask) != 0;
+    }
+
+    inline bool IsKeySelectedAtDimension(const int key, const int dimension)
+    {
+        const int flags = GetKeyFlags(key);
+        const int mask = 1 << (ESPLINE_KEY_UI_SELECTED_SHIFT + dimension);
+        return (flags & mask) != 0;
+    }
+
+    void SelectKeyAllDimensions(int key, bool select)
+    {
+        const int flags = GetKeyFlags(key);
+        if (select)
+        {
+            const int dimensionCount = GetNumDimensions();
+            const int mask = ((1 << dimensionCount) - 1) << ESPLINE_KEY_UI_SELECTED_SHIFT;
+            SetKeyFlags(key, (flags & (~ESPLINE_KEY_UI_SELECTED_MASK)) | mask);
+        }
+        else
+        {
+            SetKeyFlags(key, flags & (~ESPLINE_KEY_UI_SELECTED_MASK));
+        }
+    }
+
+    void SelectKeyAtDimension(int key, int dimension, bool select)
+    {
+        const int flags = GetKeyFlags(key);
+        const int mask = 1 << (ESPLINE_KEY_UI_SELECTED_SHIFT + dimension);
+        SetKeyFlags(key, (select ? (flags | mask) : (flags & (~mask))));
+    }
+
+    inline int InsertKeyFloat(float time, float val) { ValueType v = {val, 0, 0, 0}; return InsertKey(time, v); }
+    inline int InsertKeyFloat3(float time, float* vals) { ValueType v = {vals[0], vals[1], vals[2], 0}; return InsertKey(time, v); }
+    inline bool GetKeyValueFloat(int key, float& value) { ValueType v = {value}; bool b = GetKeyValue(key, v); value = v[0]; return b; }
+    inline void SetKeyValueFloat(int key, float value) { ValueType v = {value, 0, 0, 0}; SetKeyValue(key, v); }
+    inline void SetKeyValueFloat3(int key, float* vals) { ValueType v = {vals[0], vals[1], vals[2], 0}; SetKeyValue(key, v); }
+    inline void InterpolateFloat(float time, float& val) { ValueType v = {val}; Interpolate(time, v); val = v[0]; }
+    inline void InterpolateFloat3(float time, float* vals) { ValueType v = {vals[0], vals[1], vals[2]}; Interpolate(time, v); vals[0] = v[0]; vals[1] = v[1]; vals[2] = v[2]; }
+
+    inline void EvalInTangentFloat(float time, float& val) { ValueType v = { val }; EvalInTangent(time, v); val = v[0]; }
+    inline void EvalOutTangentFloat(float time, float& val) { ValueType v = { val }; EvalOutTangent(time, v); val = v[0]; }
+
+
+    // Return Key closest to the specified time.
+    inline int FindKey(float fTime, float fEpsilon = 0.01f)
+    {
+        int nKey = -1;
+        // Find key.
+        for (int k = 0; k < GetKeyCount(); k++)
+        {
+            if (fabs(GetKeyTime(k) - fTime) < fEpsilon)
+            {
+                nKey = k;
+                break;
+            }
+        }
+        return nKey;
+    }
+
+    // Force update.
+    void Update() { ValueType val; Interpolate(0.f, val); }
+    static void ZeroValue(ValueType& value) { value[0] = 0; value[1] = 0; value[2] = 0; value[3] = 0; }
+};
+
+//////////////////////////////////////////////////////////////////////////
+//
+//////////////////////////////////////////////////////////////////////////
+namespace spline
+{
+    template    <int N>
+    class BasisFunction
+    {
+    public:
+        const float& operator[](int i) const { return m_f[i]; };
+    protected:
+        float   m_f[N];
+    };
+
+    // Special functions that makes parameter zero.
+    template <class T>
+    inline void Zero(T& val)
+    {
+        memset(&val, 0, sizeof(val));
+    }
+    // Specialized Zero functions
+    template <>
+    inline void Zero(float& val) { val = 0.0f; }
+    template <>
+    inline void Zero(Vec2& val) { val = Vec2(0.0f, 0.0f); }
+    template <>
+    inline void Zero(Vec3& val) { val = Vec3(0.0f, 0.0f, 0.0f); }
+    template <>
+    inline void Zero(Quat& val) { val.SetIdentity(); }
+
+    inline float Concatenate(float left, float right) { return left + right; }
+    inline Vec3 Concatenate(const Vec3& left, const Vec3& right) { return left + right; }
+    inline Quat Concatenate(const Quat& left, const Quat& right) { return left * right; }
+    inline float Subtract (float left, float right) { return left - right; }
+    inline Vec3 Subtract (const Vec3& left, const Vec3& right) { return left - right; }
+    inline Quat Subtract(const Quat& left, const Quat& right) { return left / right; }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    // HermitBasis.
+    class HermitBasis
+        : public BasisFunction<4>
+    {
+    public:
+        HermitBasis(float t)
+        {
+            float t2, t3, t2_3, t3_2, t3_t2;
+
+            t2 = t * t;                                               // t2 = t^2;
+            t3 = t2 * t;                                          // t3 = t^3;
+
+            t3_2 = t3 + t3;
+            t2_3 = 3 * t2;
+            t3_t2 = t3 - t2;
+            m_f[0] = t3_2 - t2_3 + 1;
+            m_f[1] = -t3_2 + t2_3;
+            m_f[2] = t3_t2 - t2 + t;
+            m_f[3] = t3_t2;
+        }
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////
+    // BezierBasis.
+    class BezierBasis
+        : public BasisFunction<4>
+    {
+    public:
+        BezierBasis(const float t)
+        {
+            const float t2 = t * t;
+            const float t3 = t2 * t;
+            m_f[0] = -t3 + 3 * t2 - 3 * t + 1;
+            m_f[1] = 3 * t3 - 6 * t2 + 3 * t;
+            m_f[2] = -3 * t3 + 3 * t2;
+            m_f[3] = t3;
+        }
+    };
+
+    template<class T>
+    struct TCoeffBasis
+    {
+        // Coefficients for a cubic polynomial.
+        T   m_c[4];
+
+        inline T eval(float t) const
+        {
+            return m_c[0] + t * (m_c[1] + t * (m_c[2] + t * m_c[3]));
+        }
+        // Compute coeffs based on 2 endpoints & slopes.
+        void set(float t0, T v0, T s0, float t1, T v1, T s1)
+        {
+            /*
+                Solve cubic equation:
+                    v(u) = d t^3 + c t^2 + b t + a
+                for
+                    v(0) = v0, v'(0) = s0, v(t1) = v1, v'(t1) = s1
+
+                Solution:
+                    a   = v0
+                    b   =                       s0
+                    c   = -3v0 +3v1 -2s0    -s1
+                    d = +2v0 -2v1 +s0       +s1
+            */
+
+            /*
+                Polynomial will be evaluated on adjusted parameter u == t-t0. u0 = 0, u1 = t1-t0.
+                The range is normalised to start at 0 to avoid extra terms in the coefficient
+                computation that can compromise precision. However, the range is not normalised
+                to length 1, because that would require a division at runtime. Instead, we perform
+                the division on the coefficients.
+            */
+            m_c[0] = v0;
+
+            if (t1 <= t0)
+            {
+                m_c[1] = m_c[2] = m_c[3] = T(0.f);
+            }
+            else
+            {
+                float idt = 1.f / (t1 - t0);
+
+                m_c[1] = T(s0 * idt);
+                m_c[2] = T((-3.0f * v0 + 3.0f * v1 - 2.0f * s0 - s1) * idt * idt);
+                m_c[3] = T((2.0f * v0 - 2.0f * v1 + s0 + s1) * idt * idt * idt);
+            }
+        }
+
+        void GetMemoryUsage(ICrySizer* pSizer) const {}
+    };
+
+    inline float fast_fmod(float x, float y)
+    {
+        return fmod_tpl(x, y);
+        //int ival = ftoi(x/y);
+        //return x - ival*y;
+    }
+
+    /****************************************************************************
+    **                            Key classes                                                                    **
+    ****************************************************************************/
+    template    <class T>
+    struct  SplineKey
+    {
+        typedef T   value_type;
+
+        float               time;       //!< Key time.
+        int                 flags;  //!< Key flags.
+        value_type  value;  //!< Key value.
+        value_type  ds;         //!< Incoming tangent.
+        value_type  dd;         //!< Outgoing tangent.
+        SplineKey()
+        {
+            memset(this, 0, sizeof(SplineKey));
+        }
+
+        SplineKey& operator=(const SplineKey& src) { memcpy(this, &src, sizeof(*this)); return *this; }
+
+        static void Reflect(AZ::SerializeContext* serializeContext) {}
+    };
+
+    template    <class T>
+    bool    operator ==(const SplineKey<T>& k1, const SplineKey<T>& k2) { return k1.time == k2.time; };
+    template    <class T>
+    bool    operator !=(const SplineKey<T>& k1, const SplineKey<T>& k2) { return k1.time != k2.time; };
+    template    <class T>
+    bool    operator < (const SplineKey<T>& k1, const SplineKey<T>& k2) { return k1.time < k2.time; };
+    template    <class T>
+    bool    operator > (const SplineKey<T>& k1, const SplineKey<T>& k2) { return k1.time > k2.time; };
+
+    //////////////////////////////////////////////////////////////////////////
+    // TCBSplineKey class
+    //////////////////////////////////////////////////////////////////////////
+
+    template    <class T>
+    struct TCBSplineKey
+        :  public SplineKey<T>
+    {
+        // Key controls.
+        float tens;         //!< Key tension value.
+        float cont;         //!< Key continuity value.
+        float bias;         //!< Key bias value.
+        float easeto;       //!< Key ease to value.
+        float easefrom;     //!< Key ease from value.
+
+        TCBSplineKey() { tens = 0, cont = 0, bias = 0, easeto = 0, easefrom = 0; };
+    };
+
+    //! TCB spline key used in quaternion spline with angle axis as input.
+    struct TCBAngAxisKey
+        :  public TCBSplineKey<CryQuat>
+    {
+        float angle;
+        Vec3 axis;
+
+        TCBAngAxisKey()
+            : axis(0, 0, 0)
+            , angle(0) {};
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // General Spline class
+    //////////////////////////////////////////////////////////////////////////
+    template <class KeyType, class BasisType>
+    class TSpline
+    {
+    public:
+        typedef KeyType     key_type;
+        typedef typename KeyType::value_type    value_type;
+        typedef BasisType   basis_type;
+
+        // Out of range types.
+        enum
+        {
+            ORT_CONSTANT                =   0x0001, // Constant track.
+            ORT_CYCLE                       =   0x0002, // Cycle track
+            ORT_LOOP                        =   0x0003, // Loop track.
+            ORT_OSCILLATE               =   0x0004, // Oscillate track.
+            ORT_LINEAR                  =   0x0005, // Linear track.
+            ORT_RELATIVE_REPEAT =   0x0007  // Relative repeat track.
+        };
+        // Spline flags.
+        enum
+        {
+            MODIFIED        =   0x0001, // Track modified.
+            MUST_SORT       =   0x0002, // Track modified and must be sorted.
+        };
+
+        /////////////////////////////////////////////////////////////////////////////
+        // Methods.
+        inline TSpline()
+        {
+            m_flags = MODIFIED;
+            m_ORT = 0;
+            m_curr = 0;
+            m_rangeStart = 0;
+            m_rangeEnd = 0;
+            m_refCount = 0;
+        }
+
+        virtual ~TSpline() {};
+
+        ILINE void flag_set(int flag) { m_flags |= flag; };
+        ILINE void flag_clr(int flag) { m_flags &= ~flag; };
+        ILINE int  flag(int flag)  { return m_flags & flag; };
+
+        ILINE void ORT(int ort) { m_ORT = ort; };
+        ILINE int  ORT() const { return m_ORT; };
+        ILINE int  isORT(int o) const { return (m_ORT == o); };
+
+        ILINE void SetRange(float start, float end) { m_rangeStart = start; m_rangeEnd = end; };
+        ILINE float GetRangeStart() const { return m_rangeStart; };
+        ILINE float GetRangeEnd() const { return m_rangeEnd; };
+
+        // Keys access methods.
+        ILINE void reserve_keys(int n) { m_keys.reserve(n); };              // Reserve memory for more keys.
+        ILINE void clear()               { m_keys.clear(); };
+        ILINE void resize(int num)     { m_keys.resize(num); SetModified(true); };              // Set new key count.
+        ILINE bool empty() const         { return m_keys.empty(); };        // Check if curve empty (no keys).
+        ILINE int num_keys() const       { return (int)m_keys.size(); };        // Return number of keys in curve.
+
+        ILINE key_type& key(int n)     { return m_keys[n]; };               // Return n key.
+        ILINE float&    time(int n)      { return m_keys[n].time; };    // Shortcut to key n time.
+        ILINE value_type&   value(int n) { return m_keys[n].value; };   // Shortcut to key n value.
+        ILINE value_type&   ds(int n)    { return m_keys[n].ds; };          // Shortcut to key n incoming tangent.
+        ILINE value_type&   dd(int n)    { return m_keys[n].dd; };          // Shortcut to key n outgoing tangent.
+        ILINE int& flags(int n)        { return m_keys[n].flags; };   // Shortcut to key n flags.
+
+        ILINE key_type const&   key(int n) const          { return m_keys[n]; };                // Return n key.
+        ILINE float time(int n) const                             { return m_keys[n].time; };       // Shortcut to key n time.
+        ILINE value_type const& value(int n) const    { return m_keys[n].value; };      // Shortcut to key n value.
+        ILINE value_type const& ds(int n) const           { return m_keys[n].ds; };             // Shortcut to key n incoming tangent.
+        ILINE value_type const& dd(int n) const           { return m_keys[n].dd; };             // Shortcut to key n outgoing tangent.
+        ILINE int   flags(int n) const                { return m_keys[n].flags; };    // Shortcut to key n flags.
+
+        ILINE int GetInTangentType(int nkey) const  { return (flags(nkey) & SPLINE_KEY_TANGENT_IN_MASK)  >> SPLINE_KEY_TANGENT_IN_SHIFT; }
+        ILINE int GetOutTangentType(int nkey) const { return (flags(nkey) & SPLINE_KEY_TANGENT_OUT_MASK) >> SPLINE_KEY_TANGENT_OUT_SHIFT; }
+
+        ILINE void erase(int key)                     { m_keys.erase(m_keys.begin() + key); SetModified(true); };
+        ILINE bool closed()                                     { return (ORT() == ORT_LOOP); } // return True if curve closed.
+
+        ILINE void SetModified(bool bOn, bool bSort = false)
+        {
+            if (bOn)
+            {
+                m_flags |= MODIFIED;
+            }
+            else
+            {
+                m_flags &= ~(MODIFIED);
+            }
+            if (bSort)
+            {
+                m_flags |= MUST_SORT;
+            }
+            m_curr = 0;
+        }
+
+        ILINE void sort_keys()
+        {
+            std::stable_sort(m_keys.begin(), m_keys.end());
+            m_flags &= ~MUST_SORT;
+        }
+
+        ILINE void push_back(const key_type& k)
+        {
+            m_keys.push_back(k);
+            SetModified(true);
+        };
+        ILINE int insert_key(const key_type& k)
+        {
+            int num = num_keys();
+            for (int i = 0; i < num; i++)
+            {
+                if (m_keys[i].time > k.time)
+                {
+                    m_keys.insert(m_keys.begin() + i, k);
+                    SetModified(true);
+                    return i;
+                }
+            }
+            m_keys.push_back(k);
+            SetModified(true);
+            return num_keys() - 1;
+        };
+
+        ILINE int insert_key(float t, value_type const& val)
+        {
+            key_type key;
+            key.time = t;
+            key.value = val;
+            key.flags = 0;
+            Zero(key.ds);
+            Zero(key.dd);
+            return insert_key(key);
+        }
+
+        inline void update()
+        {
+            if (m_flags & MODIFIED)
+            {
+                sort_keys();
+                if (m_flags & MODIFIED)
+                {
+                    comp_deriv();
+                }
+            }
+        }
+
+        inline bool is_updated() const
+        {
+            return (m_flags & MODIFIED) == 0;
+        }
+
+        // Interpolate the value along the spline.
+        inline bool interpolate(float t, value_type& val)
+        {
+            update();
+
+            if (empty())
+            {
+                return false;
+            }
+
+            if (t < time(0))
+            {
+                val = value(0);
+                return true;
+            }
+
+            adjust_time(t);
+
+            int curr = seek_key(t);
+            if (curr < num_keys() - 1)
+            {
+                assert(t >= time(curr));
+                float u = (t - time(curr)) / (time(curr + 1) - time(curr));
+                interp_keys(curr, curr + 1, u, val);
+            }
+            else
+            {
+                val = value(num_keys() - 1);
+            }
+            return true;
+        }
+
+        size_t mem_size() const
+        {
+            return this->m_keys.capacity() * sizeof(this->m_keys[0]);
+        }
+
+        size_t sizeofThis() const
+        {
+            return sizeof(*this) + mem_size();
+        }
+
+        void swap(TSpline<KeyType, BasisType>& b)
+        {
+            using std::swap;
+
+            m_keys.swap(b.m_keys);
+            swap(m_flags, b.m_flags);
+            swap(m_ORT, b.m_ORT);
+            swap(m_curr, b.m_curr);
+            swap(m_rangeStart, b.m_rangeStart);
+            swap(m_rangeEnd, b.m_rangeEnd);
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        // This two functions must be overridden in derived spline classes.
+        //////////////////////////////////////////////////////////////////////////
+        // Pre-compute spline tangents.
+        virtual void comp_deriv() = 0;
+        // Interpolate value between two keys.
+        virtual void interp_keys(int key1, int key2, float u, value_type& val) = 0;
+        //////////////////////////////////////////////////////////////////////////
+
+        static void Reflect(AZ::SerializeContext* serializeContext) {}
+     
+        inline void add_ref()
+        {
+            ++m_refCount;
+        };
+
+        inline void release()
+        {
+            AZ_Assert(m_refCount > 0, "Reference count logic error, trying to decrement reference when refCount is 0");
+            if (--m_refCount == 0)
+            {
+                delete this;
+            }
+        }
+
+    private:
+        int m_refCount;
+
+    protected:
+        AZStd::vector<key_type> m_keys;                 // List of keys.
+        uint8           m_flags;
+        uint8           m_ORT;                          // Out-Of-Range type.
+        int16           m_curr;                         // Current key in track.
+
+        float           m_rangeStart;
+        float           m_rangeEnd;
+
+        // Return key before or equal to this time.
+        inline int seek_key(float t)
+        {
+            assert(num_keys() < (1 << 15));
+            if ((m_curr >= num_keys()) || (time(m_curr) > t))
+            {
+                // Search from begining.
+                m_curr = 0;
+            }
+            while ((m_curr < num_keys() - 1) && (time(m_curr + 1) <= t))
+            {
+                ++m_curr;
+            }
+            return m_curr;
+        }
+
+        inline void adjust_time(float& t)
+        {
+            if (isORT(ORT_CYCLE) || isORT(ORT_LOOP))
+            {
+                if (num_keys() > 0)
+                {
+                    float endtime = time(num_keys() - 1);
+                    if (t > endtime)
+                    {
+                        // Warp time.
+                        t = fast_fmod(t, endtime);
+                    }
+                }
+            }
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // TSplineSlopes is default implementation of slope computation
+    //////////////////////////////////////////////////////////////////////////
+    template < class T, class Key = SplineKey<T>, bool bCLAMP = false >
+    class TSplineSlopes
+        : public TSpline< Key, TCoeffBasis<T> >
+    {
+    public:
+        typedef TSpline< Key, TCoeffBasis<T> > super_type;
+        using_type(super_type, key_type);
+        using_type(super_type, value_type);
+        static const bool clamp_range = bCLAMP;
+
+        void comp_deriv()
+        {
+            this->SetModified(false);
+
+            int last = this->num_keys() - 1;
+            if (last <= 0)
+            {
+                return;
+            }
+
+            if (bCLAMP)
+            {
+                // Change discontinuous slopes.
+                for (int i = 0; i <= last; ++i)
+                {
+                    // Out slopes.
+                    if (i < last && this->GetOutTangentType(i) == SPLINE_KEY_TANGENT_LINEAR)
+                    {
+                        // Set linear between points.
+                        this->dd(i) = this->value(i + 1) - this->value(i);
+                        if (this->GetInTangentType(i + 1) == SPLINE_KEY_TANGENT_NONE)
+                        {
+                            // Match continuous slope on right.
+                            this->dd(i) = 2.0f * this->dd(i) - this->ds(i + 1);
+                        }
+                    }
+                    else if (i < last && this->GetOutTangentType(i) == SPLINE_KEY_TANGENT_NONE)
+                    {
+                        this->dd(i) = value_type(0.f);
+                    }
+
+                    // In slopes.
+                    if (i > 0 && this->GetInTangentType(i) == SPLINE_KEY_TANGENT_LINEAR)
+                    {
+                        // Set linear between points.
+                        this->ds(i) = this->value(i) - this->value(i - 1);
+                        if (this->GetOutTangentType(i - 1) == SPLINE_KEY_TANGENT_NONE)
+                        {
+                            // Match continuous slope on left.
+                            this->ds(i) = 2.0f * this->ds(i) - this->dd(i - 1);
+                        }
+                    }
+                    else if (i < last && this->GetInTangentType(i) == SPLINE_KEY_TANGENT_NONE)
+                    {
+                        this->ds(i) = value_type(0.f);
+                    }
+                }
+            }
+            else
+            {
+                key_type& k0 = this->key(0);
+                key_type& k1 = this->key(last);
+
+                Zero(k0.ds);
+                k0.dd = (0.5f) * (this->value(1) - this->value(0));
+                k1.ds = (0.5f) * (this->value(last) - this->value(last - 1));
+                Zero(k1.dd);
+
+                for (int i = 1; i < (this->num_keys() - 1); ++i)
+                {
+                    key_type& key = this->key(i);
+                    key.ds = 0.5f * (this->value(i + 1) - this->value(i - 1));
+                    key.dd = key.ds;
+                }
+            }
+        }
+
+        virtual void interp_keys(int key1, int key2, float u, value_type& val)
+        {
+            // Compute coeffs dynamically.
+            TCoeffBasis<T> coeff;
+            coeff.set(0.f, this->value(key1), this->dd(key1), 1.f, this->value(key2), this->ds(key2));
+            val = coeff.eval(u);
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // CatmullRomSpline class implementation
+    //////////////////////////////////////////////////////////////////////////
+    template <class T, class Key = SplineKey<T>, bool bRangeLimit = false >
+    class CatmullRomSpline
+        : public TSplineSlopes< T, Key, bRangeLimit >
+    {
+    protected:
+
+        typedef TSplineSlopes< T, Key, bRangeLimit > super_type;
+
+        std::vector< TCoeffBasis<T> > m_coeffs;
+
+        virtual void comp_deriv()
+        {
+            super_type::comp_deriv();
+
+            // Store coeffs for each segment.
+            m_coeffs.resize(this->num_keys());
+
+            if (this->num_keys() > 0)
+            {
+                unsigned i;
+                for (i = 0; i < m_coeffs.size() - 1; i++)
+                {
+                    m_coeffs[i].set(this->time(i), this->value(i), this->dd(i), this->time(i + 1), this->value(i + 1), this->ds(i + 1));
+                }
+
+                // Last segment is just constant value.
+                m_coeffs[i].set(this->time(i), this->value(i), T(0.f), this->time(i) + 1.f, this->value(i), T(0.f));
+            }
+        }
+
+        virtual void interp_keys(int key1, int key2, float u, typename TSpline<Key, HermitBasis>::value_type& val)
+        {
+            u *= this->time(key2) - this->time(key1);
+            val = m_coeffs[key1].eval(u);
+        }
+
+    public:
+
+        size_t mem_size() const
+        {
+            return super_type::mem_size() + this->m_coeffs.capacity() * sizeof(this->m_coeffs[0]);
+        }
+        size_t sizeofThis() const
+        {
+            return sizeof(*this) + mem_size();
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Extended version of Hermit Spline.
+    // Provides more control on key tangents.
+    //////////////////////////////////////////////////////////////////////////
+    template <class T, class Key = SplineKey<T> >
+    class HermitSplineEx
+        : public TSpline< Key, HermitBasis >
+    {
+    public:
+        typedef TSpline< Key, HermitBasis > super_type;
+        using_type(super_type, key_type);
+        using_type(super_type, value_type);
+
+        virtual void comp_deriv()
+        {
+            this->SetModified(false);
+            if (this->num_keys() > 1)
+            {
+                int last = this->num_keys() - 1;
+                key_type& k0 = this->key(0);
+                key_type& k1 = this->key(last);
+                Zero(k0.ds);
+                Zero(k0.dd);
+                Zero(k1.ds);
+                Zero(k1.dd);
+
+                Zero(k0.ds);
+                k0.dd = (0.5f) * (this->value(1) - this->value(0));
+                k1.ds = (0.5f) * (this->value(last) - this->value(last - 1));
+                Zero(k1.dd);
+
+                for (int i = 1; i < (this->num_keys() - 1); ++i)
+                {
+                    key_type& key = this->key(i);
+                    key.ds = 0.5f * (this->value(i + 1) - this->value(i - 1));
+                    key.dd = key.ds;
+                    switch (this->GetInTangentType(i))
+                    {
+                    case SPLINE_KEY_TANGENT_STEP:
+                        key.ds = value_type();
+                        break;
+                    case SPLINE_KEY_TANGENT_ZERO:
+                        key.ds = value_type();
+                        break;
+                    case SPLINE_KEY_TANGENT_LINEAR:
+                        key.ds = this->value(i) - this->value(i - 1);
+                        break;
+                    }
+                    switch (this->GetOutTangentType(i))
+                    {
+                    case SPLINE_KEY_TANGENT_STEP:
+                        key.dd = value_type();
+                        break;
+                    case SPLINE_KEY_TANGENT_ZERO:
+                        key.dd = value_type();
+                        break;
+                    case SPLINE_KEY_TANGENT_LINEAR:
+                        key.dd = this->value(i + 1) - this->value(i);
+                        break;
+                    }
+                }
+            }
+        }
+
+    protected:
+        virtual void interp_keys(int from, int to, float u, T& val)
+        {
+            if (this->GetInTangentType(to) == SPLINE_KEY_TANGENT_STEP || this->GetOutTangentType(from) == SPLINE_KEY_TANGENT_STEP)
+            {
+                val = this->value(from);
+                return;
+            }
+            typename TSpline<Key, HermitBasis >::basis_type basis(u);
+            val = (basis[0] * this->value(from)) + (basis[1] * this->value(to)) + (basis[2] * this->dd(from)) + (basis[3] * this->ds(to));
+        }
+    };
+
+
+    //////////////////////////////////////////////////////////////////////////
+    // Bezier Spline.
+    //////////////////////////////////////////////////////////////////////////
+    template <class T, class Key = SplineKey<T> >
+    class BezierSpline
+        : public TSpline< Key, BezierBasis >
+    {
+    public:
+        typedef TSpline< Key, BezierBasis > super_type;
+        using_type(super_type, key_type);
+        using_type(super_type, value_type);
+
+        virtual void comp_deriv()
+        {
+            this->SetModified(false);
+
+            if (this->num_keys() > 1)
+            {
+                const float oneThird = 1 / 3.0f;
+
+                const int last = this->num_keys() - 1;
+
+                {
+                    if (this->GetInTangentType(0) != SPLINE_KEY_TANGENT_CUSTOM)
+                    {
+                        Zero(this->key(0).ds);
+                    }
+                    if (this->GetOutTangentType(0) != SPLINE_KEY_TANGENT_CUSTOM)
+                    {
+                        this->key(0).dd = oneThird * (this->value(1) - this->value(0));
+                    }
+
+                    if (this->GetInTangentType(last) != SPLINE_KEY_TANGENT_CUSTOM)
+                    {
+                        this->key(last).ds = oneThird * (this->value(last) - this->value(last - 1));
+                    }
+                    if (this->GetOutTangentType(last) != SPLINE_KEY_TANGENT_CUSTOM)
+                    {
+                        Zero(this->key(last).dd);
+                    }
+                }
+
+                for (int i = 1; i < last; ++i)
+                {
+                    key_type& key = this->key(i);
+                    T ds0 = key.ds;
+                    T dd0 = key.dd;
+
+                    const float deltaTime = this->time(i + 1) - this->time(i - 1);
+                    if (deltaTime <= 0)
+                    {
+                        Zero(key.ds);
+                        Zero(key.dd);
+                    }
+                    else
+                    {
+                        const float k = (this->time(i) - this->time(i - 1)) / deltaTime;
+                        const value_type deltaValue = this->value(i + 1) - this->value(i - 1);
+                        key.ds = oneThird * deltaValue * k;
+                        key.dd = oneThird * deltaValue * (1 - k);
+                    }
+
+                    switch (this->GetInTangentType(i))
+                    {
+                    case SPLINE_KEY_TANGENT_STEP:
+                        Zero(key.ds);
+                        break;
+                    case SPLINE_KEY_TANGENT_ZERO:
+                        Zero(key.ds);
+                        break;
+                    case SPLINE_KEY_TANGENT_LINEAR:
+                        key.ds = oneThird * (this->value(i) - this->value(i - 1));
+                        break;
+                    case SPLINE_KEY_TANGENT_CUSTOM:
+                        key.ds = ds0;
+                        break;
+                    }
+
+                    switch (this->GetOutTangentType(i))
+                    {
+                    case SPLINE_KEY_TANGENT_STEP:
+                        Zero(key.dd);
+                        break;
+                    case SPLINE_KEY_TANGENT_ZERO:
+                        Zero(key.dd);
+                        break;
+                    case SPLINE_KEY_TANGENT_LINEAR:
+                        key.dd = oneThird * (this->value(i + 1) - this->value(i));
+                        break;
+                    case SPLINE_KEY_TANGENT_CUSTOM:
+                        key.dd = dd0;
+                        break;
+                    }
+                }
+            }
+        }
+
+        static void Reflect(AZ::SerializeContext* serializeContext) {}
+
+    protected:
+        virtual void interp_keys(int from, int to, float u, T& val)
+        {
+            if (this->GetOutTangentType(from) == SPLINE_KEY_TANGENT_STEP)
+            {
+                val = this->value(to);
+            }
+            else if (this->GetInTangentType(to) == SPLINE_KEY_TANGENT_STEP)
+            {
+                val = this->value(from);
+            }
+            else
+            {
+                typename TSpline<Key, BezierBasis >::basis_type basis(u);
+
+                const T p0 = this->value(from);
+                const T p3 = this->value(to);
+                const T p1 = p0 + this->dd(from);
+                const T p2 = p3 - this->ds(to);
+
+                val = (basis[0] * p0) + (basis[1] * p1) + (basis[2] * p2) + (basis[3] * p3);
+            }
+        }
+    };
+
+
+    //////////////////////////////////////////////////////////////////////////
+    // Base class for spline interpolators.
+    //////////////////////////////////////////////////////////////////////////
+
+    template <typename spline_type>
+    struct SSplineBackup
+        : public ISplineBackup
+        , public spline_type
+    {
+        int refCount;
+
+        SSplineBackup(spline_type const& s)
+            : spline_type(s)
+            , refCount(0) {}
+        virtual void AddRef() {++refCount; }
+        virtual void Release()
+        {
+            if (--refCount <= 0)
+            {
+                delete this;
+            }
+        }
+    };
+
+    template <class value_type, class spline_type>
+    class CBaseSplineInterpolator
+        : public ISplineInterpolator
+        , public spline_type
+    {
+    public:
+        static const int DIM = sizeof(value_type) / sizeof(ElemType);
+
+        //////////////////////////////////////////////////////////////////////////
+        inline void ToValueType(const value_type& t, ValueType& v) { *(value_type*)v = t; }
+        inline void FromValueType(ValueType v, value_type& t) { t = *(value_type*)v; }
+        //////////////////////////////////////////////////////////////////////////
+
+        virtual void SetModified(bool b, bool bSort = false)
+        {
+            spline_type::SetModified(b, bSort);
+        }
+        virtual int GetNumDimensions()
+        {
+            assert(sizeof(value_type) % sizeof(ElemType) == 0);
+            return DIM;
+        }
+
+        virtual int InsertKey(float t, ValueType val)
+        {
+            value_type value;
+            FromValueType(val, value);
+            return spline_type::insert_key(t, value);
+        }
+        virtual void RemoveKey(int key)
+        {
+            if (key >= 0 && key < this->num_keys())
+            {
+                this->erase(key);
+            }
+        }
+        virtual void FindKeysInRange(float startTime, float endTime, int& firstFoundKey, int& numFoundKeys)
+        {
+            int count = this->num_keys();
+            int start = 0;
+            int end = count;
+            for (int i = 0; i < count; ++i)
+            {
+                float keyTime = this->key(i).time;
+                if (keyTime < startTime)
+                {
+                    start = i + 1;
+                }
+                if (keyTime > endTime && end > i)
+                {
+                    end = i;
+                }
+            }
+            if (start < end)
+            {
+                firstFoundKey = start;
+                numFoundKeys = end - start;
+            }
+            else
+            {
+                firstFoundKey = -1;
+                numFoundKeys = 0;
+            }
+        }
+        virtual void RemoveKeysInRange(float startTime, float endTime)
+        {
+            int firstFoundKey, numFoundKeys;
+            FindKeysInRange(startTime, endTime, firstFoundKey, numFoundKeys);
+            while (numFoundKeys-- > 0)
+            {
+                this->erase(firstFoundKey++);
+            }
+        }
+        virtual int GetKeyCount()
+        {
+            return this->num_keys();
+        };
+        virtual float GetKeyTime(int key)
+        {
+            if (key >= 0 && key < this->num_keys())
+            {
+                return this->key(key).time;
+            }
+            return 0;
+        }
+        virtual bool GetKeyValue(int key, ValueType& val)
+        {
+            if (key >= 0 && key < this->num_keys())
+            {
+                ToValueType(this->key(key).value, val);
+                return true;
+            }
+            return false;
+        }
+        virtual void SetKeyValue(int k, ValueType val)
+        {
+            if (k >= 0 && k < this->num_keys())
+            {
+                FromValueType(val, this->key(k).value);
+                this->SetModified(true);
+            }
+        }
+        virtual void SetKeyTime(int k, float fTime)
+        {
+            if (k >= 0 && k < this->num_keys())
+            {
+                this->key(k).time = fTime;
+                this->SetModified(true, true);
+            }
+        }
+        virtual void  SetKeyInTangent(int k, ValueType tin)
+        {
+            if (k >= 0 && k < this->num_keys())
+            {
+                FromValueType(tin, this->key(k).ds);
+                this->SetModified(true);
+            }
+        }
+        virtual void  SetKeyOutTangent(int k, ValueType tout)
+        {
+            if (k >= 0 && k < this->num_keys())
+            {
+                FromValueType(tout, this->key(k).dd);
+                this->SetModified(true);
+            }
+        }
+        virtual void  SetKeyTangents(int k, ValueType tin, ValueType tout)
+        {
+            if (k >= 0 && k < this->num_keys())
+            {
+                FromValueType(tin, this->key(k).ds);
+                FromValueType(tout, this->key(k).dd);
+                this->SetModified(true);
+            }
+        }
+        virtual bool GetKeyTangents(int k, ValueType& tin, ValueType& tout)
+        {
+            if (k >= 0 && k < this->num_keys())
+            {
+                ToValueType(this->key(k).ds, tin);
+                ToValueType(this->key(k).dd, tout);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        virtual void  SetKeyFlags(int k, int flags)
+        {
+            if (k >= 0 && k < this->num_keys())
+            {
+                this->key(k).flags = flags;
+                this->SetModified(true);
+            }
+        }
+        virtual int   GetKeyFlags(int k)
+        {
+            if (k >= 0 && k < this->num_keys())
+            {
+                return this->key(k).flags;
+            }
+            return 0;
+        }
+
+        virtual void Interpolate(float time, ValueType& value)
+        {
+            value_type v;
+            if (spline_type::interpolate(time, v))
+            {
+                ToValueType(v, value);
+            }
+        }
+
+        virtual ISplineBackup* Backup()
+        {
+            return new SSplineBackup<spline_type>(*this);
+        }
+
+        virtual void Restore(ISplineBackup* p)
+        {
+            SSplineBackup<spline_type>* pBackup = static_cast<SSplineBackup<spline_type>*>(p);
+            static_cast<spline_type&>(*this) = *pBackup;
+        }
+    };
+}
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(spline::SplineKey<Vec2>, "{24A4D7E5-C36D-427D-AB49-CD86573B7288}");
+}
+#endif // CRYINCLUDE_CRYCOMMON_ISPLINES_H
diff --git a/Code/Legacy/CryCommon/IStatObj.h b/Code/Legacy/CryCommon/IStatObj.h
new file mode 100644
index 0000000000..75a592efbf
--- /dev/null
+++ b/Code/Legacy/CryCommon/IStatObj.h
@@ -0,0 +1,798 @@
+/*
+ * 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 "smartptr.h"           // TYPEDEF_AUTOPTR
+#include "IMaterial.h"
+
+// forward declarations
+//////////////////////////////////////////////////////////////////////
+struct ShadowMapFrustum;
+struct SRenderingPassInfo;
+struct SRendItemSorter;
+struct IShader;
+struct SPhysGeomArray;
+struct CStatObj;
+
+class CRenderObject;
+class CDLight;
+class IReadStream;
+class CRenderObject;
+class CLodValue;
+
+
+TYPEDEF_AUTOPTR(IReadStream);
+
+//! Interface to non animated object
+struct phys_geometry;
+struct IChunkFile;
+
+// General forward declaration.
+class CRenderObject;
+struct SMeshLodInfo;
+
+#include "CryHeaders.h"
+#include "Cry_Math.h"
+#include "Cry_Geo.h"
+#include "IPhysics.h"
+
+#define MAX_STATOBJ_LODS_NUM 6
+
+//////////////////////////////////////////////////////////////////////////
+// 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.
+    STATIC_SUB_OBJECT_POINT,
+    STATIC_SUB_OBJECT_DUMMY,
+    STATIC_SUB_OBJECT_XREF,
+    STATIC_SUB_OBJECT_CAMERA,
+    STATIC_SUB_OBJECT_LIGHT,
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Flags that can be set on static object.
+//////////////////////////////////////////////////////////////////////////
+enum EStaticObjectFlags
+{
+    STATIC_OBJECT_HIDDEN  =    BIT(0), // When set static object will not be displayed.
+    STATIC_OBJECT_CLONE     =      BIT(1), // specifies whether this object was cloned for modification
+    STATIC_OBJECT_GENERATED  = BIT(2), // tells that the object was generated procedurally (breakable obj., f.i.)
+    STATIC_OBJECT_CANT_BREAK = BIT(3), // StatObj has geometry unsuitable for procedural breaking
+    STATIC_OBJECT_DEFORMABLE = BIT(4), // StatObj can be procedurally smeared (using SmearStatObj)
+    STATIC_OBJECT_COMPOUND   = BIT(5), // StatObj has subobject meshes
+    STATIC_OBJECT_MULTIPLE_PARENTS = BIT(6), // Child StatObj referenced by several parents
+
+    // Collisions
+    STATIC_OBJECT_NO_PLAYER_COLLIDE = BIT(10),
+
+    // Special flags.
+    STATIC_OBJECT_SPAWN_ENTITY    = BIT(20), // StatObj spawns entity when broken.
+    STATIC_OBJECT_NO_AUTO_HIDEPOINTS = BIT(22), // Do not generate AI auto hide points around object if it's dynamic
+    STATIC_OBJECT_DYNAMIC                   = BIT(23), // mesh data should be kept in system memory (and yes, the name *is* an oxymoron)
+};
+
+#define HIT_NO_HIT (-1)
+#define HIT_UNKNOWN (-2)
+
+#define HIT_OBJ_TYPE_BRUSH   0
+#define HIT_OBJ_TYPE_TERRAIN 1
+#define HIT_OBJ_TYPE_VISAREA 2
+
+// used for on-CPU voxelization
+struct SRayHitTriangle
+{
+    SRayHitTriangle() { ZeroStruct(*this); }
+    Vec3 v[3];
+    Vec2 t[3];
+    ColorB c[3];
+    Vec3 n;
+    _smart_ptr<IMaterial> pMat;
+    uint8 nTriArea;
+    uint8 nOpacity;
+    uint8 nHitObjType;
+};
+
+struct SRayHitInfo
+{
+    SRayHitInfo()
+    {
+        memset(this, 0, sizeof(*this));
+        nHitTriID = HIT_UNKNOWN;
+    }
+    //////////////////////////////////////////////////////////////////////////
+    // Input parameters.
+    Vec3    inReferencePoint;
+    Ray     inRay;
+    bool    bInFirstHit;
+    bool        inRetTriangle;
+    bool    bUseCache;
+    bool    bOnlyZWrite;
+    bool    bGetVertColorAndTC;
+    float   fMaxHitDistance; // When not 0, only hits with closer distance will be registered.
+    Vec3        vTri0;
+    Vec3        vTri1;
+    Vec3        vTri2;
+    float       fMinHitOpacity;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Output parameters.
+    float fDistance; // Distance from reference point.
+    Vec3 vHitPos;
+    Vec3 vHitNormal;
+    int  nHitMatID; // Material Id that was hit.
+    int  nHitTriID; // Triangle Id that was hit.
+    int  nHitSurfaceID; // Material Id that was hit.
+    struct IRenderMesh* pRenderMesh;
+    struct IStatObj* pStatObj;
+    Vec2 vHitTC;
+    Vec4 vHitColor;
+    Vec4 vHitTangent;
+    Vec4 vHitBitangent;
+    PodArray<SRayHitTriangle>* pHitTris;
+};
+
+enum EFileStreamingStatus
+{
+    ecss_NotLoaded,
+    ecss_InProgress,
+    ecss_Ready
+};
+
+// Interface for streaming of objects like CStatObj.
+struct IStreamable
+{
+    struct SInstancePriorityInfo
+    {
+        int   nRoundId;
+        float fMaxImportance;
+    };
+
+    IStreamable()
+    {
+        ZeroStruct(m_arrUpdateStreamingPrioriryRoundInfo);
+        m_eStreamingStatus = ecss_NotLoaded;
+        fCurImportance = 0;
+        m_nSelectedFrameId = 0;
+        m_nStatsInUse = 0;
+    }
+
+    bool UpdateStreamingPrioriryLowLevel(float fImportance, int nRoundId, bool bFullUpdate)
+    {
+        bool bRegister = false;
+
+        if (m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId != nRoundId)
+        {
+            if (!m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId)
+            {
+                bRegister = true;
+            }
+
+            m_arrUpdateStreamingPrioriryRoundInfo[1] = m_arrUpdateStreamingPrioriryRoundInfo[0];
+
+            m_arrUpdateStreamingPrioriryRoundInfo[0].nRoundId = nRoundId;
+            m_arrUpdateStreamingPrioriryRoundInfo[0].fMaxImportance = fImportance;
+        }
+        else
+        {
+            m_arrUpdateStreamingPrioriryRoundInfo[0].fMaxImportance = max(m_arrUpdateStreamingPrioriryRoundInfo[0].fMaxImportance, fImportance);
+        }
+
+        if (bFullUpdate)
+        {
+            m_arrUpdateStreamingPrioriryRoundInfo[1] = m_arrUpdateStreamingPrioriryRoundInfo[0];
+            m_arrUpdateStreamingPrioriryRoundInfo[1].nRoundId--;
+        }
+
+        return bRegister;
+    }
+
+    // <interfuscator:shuffle>
+    virtual ~IStreamable(){}
+    virtual void StartStreaming(bool bFinishNow, IReadStream_AutoPtr* ppStream) = 0;
+    virtual int GetStreamableContentMemoryUsage(bool bJustForDebug = false) = 0;
+    virtual void ReleaseStreamableContent() = 0;
+    virtual void GetStreamableName(string& sName) = 0;
+    virtual uint32 GetLastDrawMainFrameId() = 0;
+    virtual bool IsUnloadable() const = 0;
+
+    SInstancePriorityInfo m_arrUpdateStreamingPrioriryRoundInfo[2];
+    float fCurImportance;
+    EFileStreamingStatus m_eStreamingStatus;
+    uint32 m_nSelectedFrameId : 31;
+    uint32 m_nStatsInUse : 1;
+};
+
+struct SMeshBoneMapping_uint8;
+struct SSpine;
+struct SMeshColor;
+
+// Summary:
+//     Interface to hold static object data
+struct IStatObj
+    : public IStreamable
+{
+    //! Loading flags
+    enum ELoadingFlags
+    {
+        ELoadingFlagsPreviewMode = BIT(0),
+        ELoadingFlagsForceBreakable = BIT(1),
+        ELoadingFlagsIgnoreLoDs = BIT(2),
+        ELoadingFlagsTessellate = BIT(3), // if e_StatObjTessellation enabled
+        ELoadingFlagsJustGeometry = BIT(4), // for streaming, to avoid parsing all chunks
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // SubObject
+    //////////////////////////////////////////////////////////////////////////
+    struct SSubObject
+    {
+        SSubObject() { bShadowProxy = 0; }
+
+        EStaticSubObjectType nType;
+        string name;
+        string properties;
+        int nParent;          // Index of the parent sub object, if there`s hierarchy between them.
+        Matrix34 tm;          // Transformation matrix.
+        Matrix34 localTM;     // Local transformation matrix, relative to parent.
+        IStatObj* pStatObj;   // Static object for sub part of CGF.
+        Vec3 helperSize;      // Size of the helper (if helper).
+        struct IRenderMesh* pWeights; // render mesh with a single deformation weights stream
+        unsigned int bIdentityMatrix : 1; // True if sub object matrix is identity.
+        unsigned int bHidden : 1; // True if sub object is hidden
+        unsigned int bShadowProxy : 1; // Child StatObj has 'shadowproxy' in name
+        unsigned int nBreakerJoints : 8; // number of joints that can switch this part to a broken state
+
+        void GetMemoryUsage(ICrySizer* pSizer) const
+        {
+            pSizer->AddObject(name);
+            pSizer->AddObject(properties);
+        }
+    };
+    //////////////////////////////////////////////////////////////////////////
+
+    // Statistics information about this object.
+    struct SStatistics
+    {
+        int nVertices;
+        int nVerticesPerLod[MAX_STATOBJ_LODS_NUM];
+        int nIndices;
+        int nIndicesPerLod[MAX_STATOBJ_LODS_NUM];
+        int nMeshSize;
+        int nMeshSizeLoaded;
+        int nPhysProxySize;
+        int nPhysProxySizeMax;
+        int nPhysPrimitives;
+        int nDrawCalls;
+        int nLods;
+        int nSubMeshCount;
+        int nNumRefs;
+        bool bSplitLods; // Lods split between files.
+
+        // Optional texture sizer.
+        ICrySizer* pTextureSizer;
+        ICrySizer* pTextureSizer2;
+
+        SStatistics() { Reset(); }
+
+        void Reset()
+        {
+            pTextureSizer = NULL;
+            pTextureSizer2 = NULL;
+            nVertices = 0;
+            nIndices = 0;
+            nMeshSize = 0;
+            nMeshSizeLoaded = 0;
+            nNumRefs = 0;
+            nPhysProxySize = 0;
+            nPhysPrimitives = 0;
+            nDrawCalls = 0;
+            nLods = 0;
+            nSubMeshCount = 0;
+            bSplitLods = false;
+            ZeroStruct(nVerticesPerLod);
+            ZeroStruct(nIndicesPerLod);
+        }
+    };
+
+    // <interfuscator:shuffle>
+    // Description:
+    //     Increase the reference count of the object.
+    // Summary:
+    //     Notifies that the object is being used
+    virtual int AddRef() = 0;
+
+    // Description:
+    //     Decrease the reference count of the object. If the reference count
+    //     reaches zero, the object will be deleted from memory.
+    // Summary:
+    //     Notifies that the object is no longer needed
+    virtual int Release() = 0;
+
+    // Description:
+    //     Set static object flags.
+    // Arguments:
+    //     nFlags - flags to set, a combination of EStaticObjectFlags values.
+    virtual void SetFlags(int nFlags) = 0;
+
+    // Description:
+    //     Retrieve flags set on the static object.
+    virtual int GetFlags() const = 0;
+
+    // Sets the default object indicator
+    virtual void SetDefaultObject(bool state) = 0;
+
+    // Description:
+    //     Retrieves the internal flag m_nVehicleOnlyPhysics.
+    virtual unsigned int  GetVehicleOnlyPhysics() = 0;
+
+    // Description:
+    //     Retrieves the internal flag m_nIdMaterialBreakable.
+    virtual int  GetIDMatBreakable() = 0;
+
+    // Description:
+    //     Retrieves the internal flag m_bBreakableByGame.
+    virtual unsigned int  GetBreakableByGame() = 0;
+
+    // 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;
+
+    // Description:
+    //     Create an empty indexed mesh ready to be filled with data
+    //      If an indexed mesh already exists it is returned
+    // Return Value:
+    //     An empty indexed mesh or the existing indexed mesh
+    virtual struct IIndexedMesh* CreateIndexedMesh() = 0;
+
+    //! Access to rendering geometry for indoor engine ( optimized vert arrays, lists of shader pointers )
+    virtual struct IRenderMesh* GetRenderMesh() = 0;
+
+    // Description:
+    //     Returns the physical representation of the object.
+    // Arguments:
+    //     nType - one of PHYS_GEOM_TYPE_'s, or an explicit slot index
+    // Return Value:
+    //     A pointer to a phys_geometry structure.
+    // Summary:
+    //     Get the physic representation
+    virtual phys_geometry* GetPhysGeom(int nType = PHYS_GEOM_TYPE_DEFAULT) = 0;
+
+    // Description:
+    //       Updates rendermesh's vertices, normals, and tangents with the data provided
+    // Summary:
+    //       Updates vertices in the range [iVtx0..iVtx0+nVtx-1], vertices are in their original order
+    //       (as they are physicalized). Clones the object if necessary to make the modifications
+    // Return Value:
+    //     modified IStatObj (a clone or this one, if it's already a clone)
+    virtual IStatObj* UpdateVertices(strided_pointer<Vec3> pVtx, strided_pointer<Vec3> pNormals, int iVtx0, int nVtx, int* pVtxMap = 0, float rscale = 1.f) = 0;
+
+    // Description:
+    //       Skins rendermesh's vertices based on skeleton vertices
+    // Summary:
+    //       Skins vertices based on mtxSkelToMesh[pSkelVtx[i]]
+    //       Clones the object if necessary to make the modifications
+    // Return Value:
+    //     modified IStatObj (a clone or this one, if it's already a clone)
+    virtual IStatObj* SkinVertices(strided_pointer<Vec3> pSkelVtx, const Matrix34& mtxSkelToMesh) = 0;
+
+    // Description:
+    //     Sets and replaces the physical representation of the object.
+    // Arguments:
+    //       pPhysGeom - A pointer to a phys_geometry class.
+    //     nType - Pass 0 to set the physic geometry or pass 1 to set the obstruct geometry
+    // Summary:
+    //     Set the physic representation
+    virtual void SetPhysGeom(phys_geometry* pPhysGeom, int nType = 0) = 0;
+
+    // Description:
+    //     Returns a tetrahedral lattice, if any (used for breakable objects)
+    virtual ITetrLattice* GetTetrLattice() = 0;
+
+    virtual float GetAIVegetationRadius() const = 0;
+    virtual void SetAIVegetationRadius(float radius) = 0;
+
+    // Description:
+    //     Set default material for the geometry.
+    // Arguments:
+    //     pMaterial - A valid pointer to the material.
+    virtual void SetMaterial(_smart_ptr<IMaterial> pMaterial) = 0;
+
+    // Description:
+    //     Returns default material of the geometry.
+    // Arguments:
+    //     nType - Pass 0 to get the physic geometry or pass 1 to get the obstruct geometry
+    // Return Value:
+    //     A pointer to a phys_geometry class.
+    virtual _smart_ptr<IMaterial> GetMaterial() = 0;
+    virtual const _smart_ptr<IMaterial> GetMaterial() const = 0;
+
+    // Return Value:
+    //     A Vec3 object containing the bounding box.
+    // Summary:
+    //     Get the minimal bounding box component
+    virtual Vec3 GetBoxMin() = 0;
+
+    // Return Value:
+    //     A Vec3 object containing the bounding box.
+    // Summary:
+    //     Get the minimal bounding box component
+    virtual Vec3 GetBoxMax() = 0;
+
+    // Return Value:
+    //     A Vec3 object containing the bounding box center.
+    // Summary:
+    //     Get the center of bounding box
+    virtual const Vec3 GetVegCenter() = 0;
+
+    // Arguments:
+    //     Minimum bounding box component
+    // Summary:
+    //     Set the minimum bounding box component
+    virtual void    SetBBoxMin(const Vec3& vBBoxMin) = 0;
+
+    // Arguments:
+    //     Minimum bounding box component
+    // Summary:
+    //     Set the minimum bounding box component
+    virtual void    SetBBoxMax(const Vec3& vBBoxMax) = 0;
+
+    // Summary:
+    //     Get the object radius
+    // Return Value:
+    //     A float containing the radius
+    virtual float GetRadius() = 0;
+
+    // Description:
+    //     Reloads one or more component of the object. The possible flags
+    //     are FRO_SHADERS, FRO_TEXTURES and FRO_GEOMETRY.
+    // Arguments:
+    //     nFlags - One or more flag which indicate which element of the object
+    //     to reload
+    // Summary:
+    //     Reloads the object
+    virtual void Refresh(int nFlags) = 0;
+
+    // Description:
+    //     Registers the object elements into the renderer.
+    // Arguments:
+    //     rParams   - Render parameters
+    //     nLogLevel - Level of the LOD
+    // Summary:
+    //     Renders the object
+    virtual void Render(const struct SRendParams& rParams, const SRenderingPassInfo& passInfo) = 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;
+
+    // Summary:
+    //     Generate a random point in object.
+    // Arguments:
+    //     eForm - Object aspect to generate on (surface, volume, etc)
+    virtual float GetExtent(EGeomForm eForm) = 0;
+    virtual void GetRandomPos(PosNorm& ran, EGeomForm eForm) const = 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;
+    virtual IStatObj* GetLowestLod() = 0;
+    virtual int FindNearesLoadedLOD(int nLodIn, bool bSearchUp = false) = 0;
+    virtual int FindHighestLOD(int nBias) = 0;
+
+    virtual bool LoadCGF(const char* filename, bool bLod, unsigned long nLoadingFlags, const void* pData, const int nDataSize) = 0;
+    virtual void DisableStreaming() = 0;
+    virtual void TryMergeSubObjects(bool bFromStreaming) = 0;
+    virtual bool IsUnloadable() const = 0;
+    virtual void SetCanUnload(bool value) = 0;
+
+    virtual string& GetFileName() = 0;
+    virtual const string& GetFileName() const = 0;
+
+    virtual const string& GetCGFNodeName() const = 0;
+
+    // Summary:
+    //     Returns the filename of the object
+    // Return Value:
+    //     A null terminated string which contain the filename of the object.
+    virtual const char* GetFilePath() const = 0;
+
+    // Summary:
+    //     Set the filename of the object
+    // Arguments:
+    //     szFileName - New filename of the object
+    // Return Value:
+    //       None
+    virtual void SetFilePath(const char* szFileName) = 0;
+
+    // Summary:
+    //     Returns the name of the geometry
+    // Return Value:
+    //     A null terminated string which contains the name of the geometry
+    virtual const char* GetGeoName() = 0;
+
+    // Summary:
+    //     Sets the name of the geometry
+    virtual void SetGeoName(const char* szGeoName) = 0;
+
+    // Summary:
+    //     Compares if another object is the same
+    // Arguments:
+    //     szFileName - Filename of the object to compare
+    //     szGeomName - Geometry name of the object to compare (optional)
+    // Return Value:
+    //     A boolean which equals to true in case both object are the same, or false in the opposite case.
+    virtual bool IsSameObject(const char* szFileName, const char* szGeomName) = 0;
+
+    // Description:
+    //     Will return the position of the helper named in the argument. The
+    //     helper should have been specified during the exporting process of
+    //     the cgf file.
+    // Arguments:
+    //     szHelperName - A null terminated string holding the name of the helper
+    // Return Value:
+    //     A Vec3 object which contains the position.
+    // Summary:
+    //     Gets the position of a specified helper
+    virtual Vec3 GetHelperPos(const char* szHelperName) = 0;
+
+    // Summary:
+    //     Gets the transformation matrix of a specified helper, see GetHelperPos
+    virtual const Matrix34& GetHelperTM(const char* szHelperName) = 0;
+
+    //! Tell us if the object is not found
+    virtual bool IsDefaultObject() = 0;
+
+    // Summary:
+    //     Free the geometry data
+    virtual void FreeIndexedMesh() = 0;
+
+    // Pushes the underlying tree of objects into the given Sizer object for statistics gathering
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const = 0;
+
+    //DOC-IGNORE-BEGIN
+    //! used for sprites
+    virtual float& GetRadiusVert() = 0;
+
+    //! used for sprites
+    virtual float& GetRadiusHors() = 0;
+    //DOC-IGNORE-END
+
+    // Summary:
+    //     Determines if the object has physics capabilities
+    virtual bool IsPhysicsExist() = 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; }
+
+    // Summary:
+    //     Invalidates geometry inside IStatObj, will mark hosted IIndexedMesh as invalid.
+    // Arguments:
+    //     bPhysics - if true will also recreate physics for indexed mesh.
+    virtual void Invalidate(bool bPhysics = false, float tolerance = 0.05f) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Interface to the Sub Objects.
+    //////////////////////////////////////////////////////////////////////////
+    // Summary:
+    //    Retrieve number of sub-objects.
+    virtual int GetSubObjectCount() const = 0;
+    // Summary:
+    //    Sets number of sub-objects.
+    virtual void SetSubObjectCount(int nCount) = 0;
+    // Summary:
+    //    Retrieve sub object by index, where 0 <= nIndex < GetSubObjectCount()
+    virtual IStatObj::SSubObject* GetSubObject(int nIndex) = 0;
+    // Summary:
+    //    Check if this object is sub object of another IStatObj.
+    virtual bool IsSubObject() const = 0;
+    // Summary:
+    //    Retrieve parent static object, only relevant when this IStatObj is Sub-object.
+    virtual IStatObj* GetParentObject() const = 0;
+    // Summary:
+    //    Retrieve the static object, from which this one was cloned (if that is the case)
+    virtual IStatObj* GetCloneSourceObject() const = 0;
+    // Summary:
+    //    Find sub-pbject by name.
+    virtual IStatObj::SSubObject* FindSubObject(const char* sNodeName) = 0;
+    //    Find sub-object by name (including spaces, comma and semi-colon.
+    virtual IStatObj::SSubObject* FindSubObject_CGA(const char* sNodeName) = 0;
+
+    // Summary:
+    //    Find object by full name (use all the characters)
+    virtual IStatObj::SSubObject* FindSubObject_StrStr(const char* sNodeName) = 0;
+    //    Remove Sub-Object.
+    virtual bool RemoveSubObject(int nIndex) = 0;
+    //    Copy Sub-Object.
+    virtual bool CopySubObject(int nToIndex, IStatObj* pFromObj, int nFromIndex) = 0;
+    //    adds a new sub object
+    virtual IStatObj::SSubObject& AddSubObject(IStatObj* pStatObj) = 0;
+
+    // Summary:
+    //      Adds subobjects to pent, meshes as parts, joint helpers as breakable joints
+    virtual int PhysicalizeSubobjects(IPhysicalEntity* pent, const Matrix34* pMtx, float mass, float density = 0.0f, int id0 = 0, strided_pointer<int> pJointsIdMap = 0, const char* szPropsOverride = 0) = 0;
+    // Summary:
+    //      Adds all phys geometries to pent, assigns ids starting from id; takes mass and density from the StatObj properties if not set in pgp
+    //    for compound objects calls PhysicalizeSubobjects
+    //    returns the physical id of the last physicalized part
+    virtual int Physicalize(IPhysicalEntity* pent, pe_geomparams* pgp, int id = 0, const char* szPropsOverride = 0) = 0;
+
+    virtual bool IsDeformable() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Save contents of static object to the CGF file.
+    //////////////////////////////////////////////////////////////////////////
+    // Save object to the CGF file.
+    // Arguments:
+    //    sFilename
+    //          Filename of the CGF file.
+    //          Note that the function fails if pOutChunkFile is NULL and the path
+    //          to the file does not exist on the drive. You can call
+    //          CFileUtil::CreatePath() before SaveToCGF() call to create all
+    //          folders that do not exist yet.
+    //    pOutChunkFile
+    //          Optional output parameter. If it is specified then the file will not be written to
+    //          the drive but instead the function returns a pointer to the IChunkFile interface with
+    //          filled CGF chunks. Caller of the function is responsible to call Release method
+    //          of IChunkFile to release it later.
+    virtual bool SaveToCGF(const char* sFilename, IChunkFile** pOutChunkFile = NULL, bool bHavePhysicalProxy = false) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Summary:
+    //    Clones static geometry, Makes an exact copy of the Static object and the contained geometry.
+    //virtual IStatObj* Clone(bool bCloneChildren=true, bool nDynamic=false) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Summary:
+    //    Clones static geometry, Makes an exact copy of the Static object and the contained geometry.
+    virtual IStatObj* Clone(bool bCloneGeometry, bool bCloneChildren, bool bMeshesOnly) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Summary:
+    //    makes sure that both objects have one-to-one vertex correspondance
+    //    sets MorphBuddy for this object's render mesh
+    //    returns 0 if failed (due to objects having no vertex maps most likely)
+    virtual int SetDeformationMorphTarget(IStatObj* pDeformed) = 0;
+
+    // chages the weights of the deformation morphing according to point, radius, and strength
+    // (radius==0 updates all weights of all vertices)
+    //  if the object is a compound object, updates the weights of its subobjects that have deformation morphs; clones the object if necessary
+    //   otherwise, updates the weights passed as a pWeights param
+    virtual IStatObj* DeformMorph(const Vec3& pt, float r, float strength, IRenderMesh* pWeights = 0) = 0;
+
+    // hides all non-physicalized geometry, clones the object if necessary
+    virtual IStatObj* HideFoliage() = 0;
+
+    // serializes the StatObj's mesh into a stream
+    virtual int Serialize(TSerialize ser) = 0;
+
+    // Get object properties as loaded from CGF.
+    virtual const char* GetProperties() = 0;
+
+    // Get physical properties specified for object.
+    virtual bool GetPhysicalProperties(float& mass, float& density) = 0;
+
+    // Returns the last B operand for this object as A, along with its relative scale
+    virtual IStatObj* GetLastBooleanOp(float& scale) = 0;
+
+    // Intersect ray with static object.
+    // Ray must be in object local space.
+    virtual bool RayIntersection(SRayHitInfo& hitInfo, _smart_ptr<IMaterial> pCustomMtl = 0) = 0;
+
+    // Intersect lineseg with static object. Works on dedi server as well.
+    // Lineseg must be in object local space. Returns the hit position and the surface type id of the point hit.
+    virtual bool LineSegIntersection(const Lineseg& lineSeg, Vec3& hitPos, int& surfaceTypeId) = 0;
+
+    // Debug Draw this static object.
+    virtual void DebugDraw(const struct SGeometryDebugDrawInfo& info, float fExtrdueScale = 0.01f) = 0;
+
+    // Fill statistics about the level.
+    virtual void GetStatistics(SStatistics& stats) = 0;
+
+    // Returns initial hide mask
+    virtual uint64 GetInitialHideMask() = 0;
+
+    // Updates hide mask as new mask = (mask & maskAND) | maskOR
+    virtual uint64 UpdateInitialHideMask(uint64 maskAND = 0ul - 1ul, uint64 maskOR = 0) = 0;
+
+    // Set the filename of the mesh of the next state (for example damaged version)
+    virtual void SetStreamingDependencyFilePath(const char* szFileName) = 0;
+
+    virtual void ComputeGeometricMean(SMeshLodInfo& lodInfo) = 0;
+
+    // Returns the distance for the first LOD switch. Used for brushes and vegetation.
+    virtual float GetLodDistance() const = 0;
+
+    // Returns true if the mesh has been stripped
+    virtual bool IsMeshStrippedCGF() const = 0;
+
+    virtual void LoadLowLODs(bool bUseStreaming, unsigned long nLoadingFlags) = 0;
+
+    // Indicates if lods have been loaded
+    virtual bool AreLodsLoaded() const = 0;
+
+    // Indicates if a garbage check should be done
+    virtual bool CheckGarbage() const = 0;
+
+    // Sets state of check garbage flags
+    virtual void SetCheckGarbage(bool val) = 0;
+
+    // Returns the number of child references
+    virtual int CountChildReferences() const = 0;
+
+    // Returns the user count
+    virtual int GetUserCount() const = 0;
+
+    // Shutdown
+    virtual void ShutDown() = 0;
+
+    virtual int GetMaxUsableLod() const = 0;
+    virtual int GetMinUsableLod() const = 0;
+
+    virtual SMeshBoneMapping_uint8* GetBoneMapping() const = 0;
+
+    virtual int GetSpineCount() const = 0;
+    virtual SSpine* GetSpines() const = 0;
+
+    virtual IStatObj* GetLodLevel0() = 0;
+    virtual void SetLodLevel0(IStatObj* lod) = 0;
+    virtual _smart_ptr<CStatObj>* GetLods() = 0;
+    virtual int GetLoadedLodsNum() = 0;
+
+    virtual bool UpdateStreamableComponents(float fImportance, const Matrix34A& objMatrix, bool bFullUpdate, int nNewLod) = 0;
+
+    virtual void RenderInternal(CRenderObject* pRenderObject, uint64 nSubObjectHideMask, const CLodValue& lodValue, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw) = 0;
+    virtual void RenderObjectInternal(CRenderObject* pRenderObject, int nLod, uint8 uLodDissolveRef, bool dissolveOut, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw) = 0;
+    virtual void RenderSubObject(CRenderObject* pRenderObject, int nLod, int nSubObjId, const Matrix34A& renderTM, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw) = 0;
+    virtual void RenderSubObjectInternal(CRenderObject* pRenderObject, int nLod, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter, bool forceStaticDraw) = 0;
+    virtual void RenderRenderMesh(CRenderObject* pObj, struct SInstancingInfo* pInstInfo, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter) = 0;
+
+    virtual SPhysGeomArray& GetArrPhysGeomInfo() = 0;
+    virtual bool IsLodsAreLoadedFromSeparateFile() = 0;
+
+    virtual void StartStreaming(bool bFinishNow, IReadStream_AutoPtr* ppStream) = 0;
+    virtual void UpdateStreamingPrioriryInternal(const Matrix34A& objMatrix, float fDistance, bool bFullUpdate) = 0;
+
+    virtual void SetMerged(bool state) = 0;
+
+    virtual int GetRenderMeshMemoryUsage() const = 0;
+    virtual void SetLodObject(int nLod, IStatObj* pLod) = 0;
+    virtual int GetLoadedTrisCount() const = 0;
+    virtual int GetRenderTrisCount() const = 0;
+    virtual int GetRenderMatIds() const = 0;
+
+    virtual bool IsUnmergable() const = 0;
+    virtual void SetUnmergable(bool state) = 0;
+
+    virtual int GetSubObjectMeshCount() const = 0;
+    virtual void SetSubObjectMeshCount(int count) = 0;
+    virtual void CleanUnusedLods() = 0;
+
+    virtual AZStd::vector<SMeshColor>& GetClothData() = 0;
+};
diff --git a/Code/Legacy/CryCommon/IStereoRenderer.h b/Code/Legacy/CryCommon/IStereoRenderer.h
new file mode 100644
index 0000000000..f03c554364
--- /dev/null
+++ b/Code/Legacy/CryCommon/IStereoRenderer.h
@@ -0,0 +1,104 @@
+/*
+ * 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 __ISTEREORENDERER_H__
+#define __ISTEREORENDERER_H__
+
+#pragma once
+
+#include "StereoRendererBus.h"
+
+enum EStereoEye
+{
+    STEREO_EYE_LEFT  = 0,
+    STEREO_EYE_RIGHT = 1,
+    STEREO_EYE_COUNT
+};
+
+enum EStereoDevice
+{
+    STEREO_DEVICE_NONE      = 0,
+    STEREO_DEVICE_FRAMECOMP = 1,
+    STEREO_DEVICE_HDMI      = 2,
+    STEREO_DEVICE_DRIVER    = 3,  //!< Nvidia and AMD drivers.
+    STEREO_DEVICE_DUALHEAD  = 4,
+    STEREO_DEVICE_COUNT,
+
+    STEREO_DEVICE_DEFAULT = 100  //!< Auto-detect device.
+};
+
+enum EStereoMode
+{
+    STEREO_MODE_NO_STEREO       = 0,  //!< Stereo disabled.
+    STEREO_MODE_DUAL_RENDERING  = 1,
+    STEREO_MODE_COUNT,
+};
+
+enum EStereoOutput
+{
+    STEREO_OUTPUT_STANDARD          = 0,
+    STEREO_OUTPUT_IZ3D              = 1,
+    STEREO_OUTPUT_CHECKERBOARD      = 2,
+    STEREO_OUTPUT_ABOVE_AND_BELOW   = 3,
+    STEREO_OUTPUT_SIDE_BY_SIDE      = 4,
+    STEREO_OUTPUT_LINE_BY_LINE      = 5,
+    STEREO_OUTPUT_ANAGLYPH          = 6,
+    STEREO_OUTPUT_HMD               = 7,
+    STEREO_OUTPUT_COUNT,
+};
+
+enum EStereoDeviceState
+{
+    STEREO_DEVSTATE_OK = 0,
+    STEREO_DEVSTATE_UNSUPPORTED_DEVICE,
+    STEREO_DEVSTATE_REQ_1080P,
+    STEREO_DEVSTATE_REQ_FRAMEPACKED,
+    STEREO_DEVSTATE_BAD_DRIVER,
+    STEREO_DEVSTATE_REQ_FULLSCREEN
+};
+
+class IStereoRenderer
+    : public AZ::StereoRendererRequestBus::Handler
+{
+public:
+    enum EHmdRender
+    {
+        eHR_Eyes = 0,
+        eHR_Latency
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IStereoRenderer(){}
+
+    virtual EStereoDevice GetDevice() = 0;
+    virtual EStereoDeviceState GetDeviceState() = 0;
+    virtual void GetInfo(EStereoDevice* device, EStereoMode* mode, EStereoOutput* output, EStereoDeviceState* state) const = 0;
+
+    virtual bool GetStereoEnabled() = 0;
+    virtual float GetStereoStrength() = 0;
+    virtual float GetMaxSeparationScene(bool half = true) = 0;
+    virtual float GetZeroParallaxPlaneDist() = 0;
+
+    virtual void OnHmdDeviceChanged() = 0;
+
+    virtual void OnResolutionChanged() {}
+
+    virtual void GetNVControlValues(bool& stereoEnabled, float& stereoStrength) = 0;
+    // </interfuscator:shuffle>
+
+    enum class Status
+    {
+        kRenderingFirstEye,
+        kRenderingSecondEye,
+        kIdle ///< Not currently rendering to either eye.
+    };
+
+    virtual Status GetStatus() const = 0;
+};
+
+#endif
diff --git a/Code/Legacy/CryCommon/ISurfaceType.h b/Code/Legacy/CryCommon/ISurfaceType.h
new file mode 100644
index 0000000000..1b970a6fd9
--- /dev/null
+++ b/Code/Legacy/CryCommon/ISurfaceType.h
@@ -0,0 +1,243 @@
+/*
+ * 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 : Defines interfaces to access Surface Types.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_ISURFACETYPE_H
+#define CRYINCLUDE_CRYCOMMON_ISURFACETYPE_H
+#pragma once
+
+//////////////////////////////////////////////////////////////////////////
+// Flags that ISurfaceType::GetFlags() can return.
+//////////////////////////////////////////////////////////////////////////
+enum ESurfaceTypeFlags
+{
+    SURFACE_TYPE_NO_PHYSICALIZE         = BIT(1), // This surface should not be physicalized.
+    SURFACE_TYPE_NO_COLLIDE             = BIT(2), // Should only be set for vegetation canopy mats
+    SURFACE_TYPE_VEHICLE_ONLY_COLLISION = BIT(3),
+    SURFACE_TYPE_CAN_SHATTER            = BIT(4), // This surface type can shatter
+    SURFACE_TYPE_BULLET_PIERCEABLE          = BIT(5), // This surface is pierceable by bullets (used by MFX system to spawn front/back FX)
+};
+
+// Parameter structure passed to ISurfaceType::Execute
+struct SSurfaceTypeExecuteParams
+{
+    Vec3 hitPoint;
+    Vec3 hitNormal;
+    int hitType;
+};
+
+#define SURFACE_BREAKAGE_TYPE(x) x
+
+//////////////////////////////////////////////////////////////////////////
+// Surface definition.
+//////////////////////////////////////////////////////////////////////////
+struct ISurfaceType
+{
+    //////////////////////////////////////////////////////////////////////////
+    struct SSurfaceTypeAIParams
+    {
+        float fImpactRadius;
+        float fImpactSoundRadius;
+        float fFootStepRadius;
+        float proneMult;
+        float crouchMult;
+        float movingMult;
+
+        SSurfaceTypeAIParams()
+        {
+            fImpactRadius = 2.5f;
+            fImpactSoundRadius = 20.0f;
+            fFootStepRadius = 20.0f;
+            proneMult = 0.2f;
+            crouchMult = 0.5f;
+            movingMult = 2.5f;
+        }
+    };
+    struct SPhysicalParams
+    {
+        int breakable_id;
+        int break_energy;
+        float hole_size;
+        float hole_size_explosion;
+        float hit_radius;
+        float hit_points;
+        float hit_points_secondary;
+        float hit_maxdmg;
+        float hit_lifetime;
+        int pierceability;
+        float damage_reduction;
+        float ric_angle;
+        float ric_dam_reduction;
+        float ric_vel_reduction;
+        float friction;
+        float bouncyness;
+        int iBreakability;
+        int collType;
+        float sound_obstruction;
+    };
+    struct SBreakable2DParams
+    {
+        string particle_effect;
+        float blast_radius;
+        float blast_radius_first;
+        float vert_size_spread;
+        int rigid_body;
+        float life_time;
+        float cell_size;
+        int max_patch_tris;
+        float filter_angle;
+        float shard_density;
+        int use_edge_alpha;
+        float crack_decal_scale;
+        string crack_decal_mtl;
+        float max_fracture;
+        string full_fracture_fx;
+        string fracture_fx;
+        int no_procedural_full_fracture;
+        string broken_mtl;
+        float destroy_timeout;
+        float destroy_timeout_spread;
+
+        SBreakable2DParams()
+            : blast_radius(0)
+            , rigid_body(0)
+            , life_time(0)
+            , cell_size(0)
+            , max_patch_tris(0)
+            , shard_density(0)
+            , crack_decal_scale(0)
+            , max_fracture(1.0f)
+            , vert_size_spread(0)
+            , filter_angle(0)
+            , use_edge_alpha(0)
+            , blast_radius_first(0)
+            , no_procedural_full_fracture(0)
+            , destroy_timeout(0)
+            , destroy_timeout_spread(0) {}
+    };
+    struct SBreakageParticles
+    {
+        string type;
+        string particle_effect;
+        int count_per_unit;
+        float count_scale;
+        float scale;
+        SBreakageParticles()
+            : count_per_unit(1)
+            , count_scale(1)
+            , scale(1) {}
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~ISurfaceType(){}
+
+    // Releases surface type.
+    virtual void Release() = 0;
+
+    // Return unique Id of this surface type.
+    // Maximum of 65535 simultanious surface types can exist.
+    virtual uint16 GetId() const = 0;
+
+    // Unique name of the surface type.
+    virtual const char* GetName() const = 0;
+
+    // Typename of this surface type.
+    virtual const char* GetType() const = 0;
+
+    // Flags of the surface type.
+    // Return:
+    //    A combination of ESurfaceTypeFlags flags.
+    virtual int  GetFlags() const = 0;
+
+    // Execute material.
+    virtual void Execute(SSurfaceTypeExecuteParams& params) = 0;
+
+    // returns a some cached properties for faster access
+    virtual int GetBreakability() const = 0;
+    virtual float GetBreakEnergy() const = 0;
+    virtual int GetHitpoints() const = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual const SPhysicalParams& GetPhyscalParams() = 0;
+
+    // Optional AI Params.
+    virtual const SSurfaceTypeAIParams* GetAIParams() = 0;
+
+    // Optional params for 2D breakable plane.
+    virtual SBreakable2DParams* GetBreakable2DParams() = 0;
+    virtual SBreakageParticles* GetBreakageParticles(const char* sType, bool bLookInDefault = true) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Called by Surface manager.
+    //////////////////////////////////////////////////////////////////////////
+    // Loads surface, (do not use directly).
+    virtual bool Load(int nId) = 0;
+    // </interfuscator:shuffle>
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Description:
+//    This interface is used to enumerate all items registered to the surface type manager.
+//////////////////////////////////////////////////////////////////////////
+struct ISurfaceTypeEnumerator
+{
+    // <interfuscator:shuffle>
+    virtual ~ISurfaceTypeEnumerator(){}
+    virtual void Release() = 0;
+    virtual ISurfaceType* GetFirst() = 0;
+    virtual ISurfaceType* GetNext() = 0;
+    // </interfuscator:shuffle>
+};
+
+// Description:
+//    Manages loading and mapping of physical surface materials to Ids and materials scripts.
+// Behaviour:
+//    At start will enumerate all material names.
+//    When the surface is first time requested by name it will be loaded and cached
+//    and new unique id will be generated for it.
+struct ISurfaceTypeManager
+{
+    // <interfuscator:shuffle>
+    virtual ~ISurfaceTypeManager(){}
+
+
+    // Description:
+    //    Load Surface types
+    virtual void LoadSurfaceTypes() = 0;
+
+    // Description:
+    //    Return surface type by name.
+    //    If surface is not yet loaded it will be loaded and and cached.
+    // Arguments:
+    //    sName - Name of the surface type ("mat_metal","mat_wood", etc..)
+    //    warn - print warning message if surface not found
+    virtual ISurfaceType* GetSurfaceTypeByName(const char* sName, const char* sWhy = NULL, bool warn = true) = 0;
+
+    // Description:
+    //    Return surface type by id.
+    //    If surface is not yet loaded it will be loaded and and cached.
+    // Arguments:
+    //    sName - Name of the surface type ("mat_metal","mat_wood", etc..)
+    virtual ISurfaceType* GetSurfaceType(int nSurfaceId, const char* sWhy = NULL) = 0;
+
+    // Description:
+    //    Retrieve an interface to the enumerator class that allow to iterate over all surface types.
+    virtual ISurfaceTypeEnumerator* GetEnumerator() = 0;
+
+    // Register a new surface type.
+    virtual bool RegisterSurfaceType(ISurfaceType* pSurfaceType, bool bDefault = false) = 0;
+    virtual void UnregisterSurfaceType(ISurfaceType* pSurfaceType) = 0;
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+    // </interfuscator:shuffle>
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_ISURFACETYPE_H
+
diff --git a/Code/Legacy/CryCommon/ISystem.h b/Code/Legacy/CryCommon/ISystem.h
new file mode 100644
index 0000000000..80ce514784
--- /dev/null
+++ b/Code/Legacy/CryCommon/ISystem.h
@@ -0,0 +1,1685 @@
+/*
+ * 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
+ *
+ */
+
+
+// In Mac, including ISystem without including platform.h first fails because platform.h
+// includes CryThread.h which includes CryThread_pthreads.h which uses ISystem (gEnv).
+// So plaform.h needs the contents of ISystem.h.
+// By including platform.h outside of the guard, we give platform.h the right include order
+#include <platform.h> // Needed for LARGE_INTEGER (for consoles).
+
+#ifndef CRYINCLUDE_CRYCOMMON_ISYSTEM_H
+#define CRYINCLUDE_CRYCOMMON_ISYSTEM_H
+#pragma once
+
+#ifdef CRYSYSTEM_EXPORTS
+#define CRYSYSTEM_API DLL_EXPORT
+#else
+#define CRYSYSTEM_API DLL_IMPORT
+#endif
+
+#include "CryAssert.h"
+#include "CompileTimeAssert.h"
+
+#include <AzCore/IO/SystemFile.h>
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define ISYSTEM_H_SECTION_1 1
+#define ISYSTEM_H_SECTION_2 2
+#define ISYSTEM_H_SECTION_3 3
+#define ISYSTEM_H_SECTION_4 4
+#define ISYSTEM_H_SECTION_5 5
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+// Forward declarations
+////////////////////////////////////////////////////////////////////////////////////////////////
+#include <IXml.h> // <> required for Interfuscator
+#include "IValidator.h" // <> required for Interfuscator
+#include <ILog.h> // <> required for Interfuscator
+#include "CryVersion.h"
+#include "smartptr.h"
+#include <memory> // shared_ptr
+#include <CrySystemBus.h>
+
+struct ISystem;
+struct ILog;
+namespace AZ::IO
+{
+    struct IArchive;
+}
+struct IConsole;
+struct IRemoteConsole;
+struct IRenderer;
+struct IProcess;
+struct ITimer;
+struct ICryFont;
+struct IMovieSystem;
+namespace Audio
+{
+    struct IAudioSystem;
+} // namespace Audio
+struct SFileVersion;
+struct INameTable;
+struct ILevelSystem;
+struct IViewSystem;
+class ICrySizer;
+class IXMLBinarySerializer;
+struct IReadWriteXMLSink;
+struct IAVI_Reader;
+class CPNoise3;
+struct ILocalizationManager;
+struct IOutputPrintSink;
+struct IWindowMessageHandler;
+
+namespace AZ
+{
+    namespace IO
+    {
+        class FileIOBase;
+    }
+}
+
+typedef void* WIN_HWND;
+
+class CCamera;
+struct CLoadingTimeProfiler;
+
+class ICmdLine;
+
+class ILyShine;
+
+enum ESystemUpdateFlags
+{
+    // Summary:
+    //   Special update mode for editor.
+    ESYSUPDATE_EDITOR = 0x0004
+};
+
+// Description:
+//   Configuration specification, depends on user selected machine specification.
+enum ESystemConfigSpec
+{
+    CONFIG_AUTO_SPEC = 0,
+    CONFIG_LOW_SPEC = 1,
+    CONFIG_MEDIUM_SPEC = 2,
+    CONFIG_HIGH_SPEC = 3,
+    CONFIG_VERYHIGH_SPEC = 4,
+
+    END_CONFIG_SPEC_ENUM, // MUST BE LAST VALUE. USED FOR ERROR CHECKING.
+};
+
+// Description:
+//   Configuration platform. Autodetected at start, can be modified through the editor.
+enum ESystemConfigPlatform
+{
+    CONFIG_INVALID_PLATFORM = 0,
+    CONFIG_PC = 1,
+    CONFIG_MAC = 2,
+    CONFIG_OSX_METAL = 3,
+    CONFIG_ANDROID = 4,
+    CONFIG_IOS = 5,
+    CONFIG_PROVO = 7,
+    CONFIG_SALEM = 8,
+    CONFIG_JASPER = 9,
+
+    END_CONFIG_PLATFORM_ENUM, // MUST BE LAST VALUE. USED FOR ERROR CHECKING.
+};
+
+enum ESystemGlobalState
+{
+    ESYSTEM_GLOBAL_STATE_UNKNOWN,
+    ESYSTEM_GLOBAL_STATE_INIT,
+    ESYSTEM_GLOBAL_STATE_RUNNING,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_MATERIALS,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_OBJECTS,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_STATIC_WORLD,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_TEXTURES,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END,
+    ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE
+};
+
+// Summary:
+//   System wide events.
+enum ESystemEvent
+{
+    // Description:
+    // Seeds all random number generators to the same seed number, WParam will hold seed value.
+    //##@{
+    ESYSTEM_EVENT_RANDOM_SEED = 1,
+    ESYSTEM_EVENT_RANDOM_ENABLE,
+    ESYSTEM_EVENT_RANDOM_DISABLE,
+    //##@}
+
+    // Description:
+    //   Changes to main window focus.
+    //   wparam is not 0 is focused, 0 if not focused
+    ESYSTEM_EVENT_CHANGE_FOCUS = 10,
+
+    // Description:
+    //   Moves of the main window.
+    //   wparam=x, lparam=y
+    ESYSTEM_EVENT_MOVE = 11,
+
+    // Description:
+    //   Resizes of the main window.
+    //   wparam=width, lparam=height
+    ESYSTEM_EVENT_RESIZE = 12,
+
+    // Description:
+    //   Activation of the main window.
+    //   wparam=1/0, 1=active 0=inactive
+    ESYSTEM_EVENT_ACTIVATE = 13,
+
+    // Description:
+    //   Main window position changed.
+    ESYSTEM_EVENT_POS_CHANGED = 14,
+
+    // Description:
+    //   Main window style changed.
+    ESYSTEM_EVENT_STYLE_CHANGED = 15,
+
+    // Description:
+    //   Sent before the loading movie is begun
+    ESYSTEM_EVENT_LEVEL_LOAD_START_PRELOADINGSCREEN,
+
+    // Description:
+    //   Sent before the loading last save
+    ESYSTEM_EVENT_LEVEL_LOAD_RESUME_GAME,
+
+    // Description:
+    //   Sent before starting level, before game rules initialization and before ESYSTEM_EVENT_LEVEL_LOAD_START event
+    //   Used mostly for level loading profiling
+    ESYSTEM_EVENT_LEVEL_LOAD_PREPARE,
+
+    // Description:
+    //   Sent to start the active loading screen rendering.
+    ESYSTEM_EVENT_LEVEL_LOAD_START_LOADINGSCREEN,
+
+    // Description:
+    //   Sent when loading screen is active
+    ESYSTEM_EVENT_LEVEL_LOAD_LOADINGSCREEN_ACTIVE,
+
+    // Description:
+    //   Sent before starting loading a new level.
+    //   Used for a more efficient resource management.
+    ESYSTEM_EVENT_LEVEL_LOAD_START,
+
+    // Description:
+    //   Sent after loading a level finished.
+    //   Used for a more efficient resource management.
+    ESYSTEM_EVENT_LEVEL_LOAD_END,
+
+    // Description:
+    //   Sent after trying to load a level failed.
+    //   Used for resetting the front end.
+    ESYSTEM_EVENT_LEVEL_LOAD_ERROR,
+
+    // Description:
+    //   Sent in case the level was requested to load, but it's not ready
+    //   Used in streaming install scenario for notifying the front end.
+    ESYSTEM_EVENT_LEVEL_NOT_READY,
+
+    // Description:
+    //   Sent after precaching of the streaming system has been done
+    ESYSTEM_EVENT_LEVEL_PRECACHE_START,
+
+    // Description:
+    //   Sent before object/texture precache stream requests are submitted
+    ESYSTEM_EVENT_LEVEL_PRECACHE_FIRST_FRAME,
+
+    // Description:
+    //  Sent when level loading is completely finished with no more onscreen
+    //  movie or info rendering, and when actual gameplay can start
+    ESYSTEM_EVENT_LEVEL_GAMEPLAY_START,
+
+    // Level is unloading.
+    ESYSTEM_EVENT_LEVEL_UNLOAD,
+
+    // Summary:
+    //   Sent after level have been unloaded. For cleanup code.
+    ESYSTEM_EVENT_LEVEL_POST_UNLOAD,
+
+    // Summary:
+    //   Called when the game framework has been initialized.
+    ESYSTEM_EVENT_GAME_POST_INIT,
+
+    // Summary:
+    //   Called when the game framework has been initialized, not loading should happen in this event.
+    ESYSTEM_EVENT_GAME_POST_INIT_DONE,
+
+    // Summary:
+    //   Sent when the system is doing a full shutdown.
+    ESYSTEM_EVENT_FULL_SHUTDOWN,
+
+    // Summary:
+    //   Sent when the system is doing a fast shutdown.
+    ESYSTEM_EVENT_FAST_SHUTDOWN,
+
+    // Summary:
+    //   When keyboard layout changed.
+    ESYSTEM_EVENT_LANGUAGE_CHANGE,
+
+    // Description:
+    //   Toggled fullscreen.
+    //   wparam is 1 means we switched to fullscreen, 0 if for windowed
+    ESYSTEM_EVENT_TOGGLE_FULLSCREEN,
+    ESYSTEM_EVENT_SHARE_SHADER_COMBINATIONS,
+
+    // Summary:
+    //   Start 3D post rendering
+    ESYSTEM_EVENT_3D_POST_RENDERING_START,
+
+    // Summary:
+    //   End 3D post rendering
+    ESYSTEM_EVENT_3D_POST_RENDERING_END,
+
+    // Summary:
+    //   Called before switching to level memory heap
+    ESYSTEM_EVENT_SWITCHING_TO_LEVEL_HEAP_DEPRECATED,
+
+    // Summary:
+    //   Called after switching to level memory heap
+    ESYSTEM_EVENT_SWITCHED_TO_LEVEL_HEAP_DEPRECATED,
+
+    // Summary:
+    //   Called before switching to global memory heap
+    ESYSTEM_EVENT_SWITCHING_TO_GLOBAL_HEAP_DEPRECATED,
+
+    // Summary:
+    //   Called after switching to global memory heap
+    ESYSTEM_EVENT_SWITCHED_TO_GLOBAL_HEAP_DEPRECATED,
+
+    // Description:
+    //   Sent after precaching of the streaming system has been done
+    ESYSTEM_EVENT_LEVEL_PRECACHE_END,
+
+    // Description:
+    //      Sent when game mode switch begins
+    ESYSTEM_EVENT_GAME_MODE_SWITCH_START,
+
+    // Description:
+    //      Sent when game mode switch ends
+    ESYSTEM_EVENT_GAME_MODE_SWITCH_END,
+
+    // Description:
+    //   Video notifications
+    //   wparam=[0/1/2/3] : [stop/play/pause/resume]
+    ESYSTEM_EVENT_VIDEO,
+
+    // Description:
+    //   Sent if the game is paused
+    ESYSTEM_EVENT_GAME_PAUSED,
+
+    // Description:
+    //   Sent if the game is resumed
+    ESYSTEM_EVENT_GAME_RESUMED,
+
+    // Description:
+    //      Sent when time of day is set
+    ESYSTEM_EVENT_TIME_OF_DAY_SET,
+
+    // Description:
+    //      Sent once the Editor finished initialization.
+    ESYSTEM_EVENT_EDITOR_ON_INIT,
+
+    // Description:
+    //      Sent when frontend is initialised
+    ESYSTEM_EVENT_FRONTEND_INITIALISED,
+
+    // Description:
+    //      Sent once the Editor switches between in-game and editing mode.
+    ESYSTEM_EVENT_EDITOR_GAME_MODE_CHANGED,
+
+    // Description:
+    //      Sent once the Editor switches simulation mode (AI/Physics).
+    ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_CHANGED,
+
+    // Description:
+    //      Sent when frontend is reloaded
+    ESYSTEM_EVENT_FRONTEND_RELOADED,
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_1
+    #include AZ_RESTRICTED_FILE(ISystem_h)
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_2
+    #include AZ_RESTRICTED_FILE(ISystem_h)
+#endif
+    ESYSTEM_EVENT_STREAMING_INSTALL_ERROR,
+
+    // Description:
+    //      Sent when the online services are initialized.
+    ESYSTEM_EVENT_ONLINE_SERVICES_INITIALISED,
+
+    // Description:
+    //      Sent when a new audio implementation is loaded
+    ESYSTEM_EVENT_AUDIO_IMPLEMENTATION_LOADED,
+
+    // Description:
+    //      Sent when simulation mode switch begins
+    ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_SWITCH_START,
+
+    // Description:
+    //      Sent when simluation mode switch ends
+    ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_SWITCH_END,
+
+    ESYSTEM_EVENT_USER = 0x1000,
+
+    ESYSTEM_BEAM_PLAYER_TO_CAMERA_POS
+};
+
+// Description:
+//   User defined callback, which can be passed to ISystem.
+struct ISystemUserCallback
+{
+    // <interfuscator:shuffle>
+    virtual ~ISystemUserCallback() {}
+    // Description:
+    //   This method is called at the earliest point the ISystem pointer can be used
+    //   the log might not be yet there.
+    virtual void OnSystemConnect([[maybe_unused]] ISystem* pSystem) {}
+
+    // Summary:
+    //   Signals to User that engine error occurred.
+    // Return Value:
+    //      True to Halt execution or false to ignore this error
+    virtual bool OnError(const char* szErrorString) = 0;
+
+    // Notes:
+    //   If working in Editor environment notify user that engine want to Save current document.
+    //   This happens if critical error have occurred and engine gives a user way to save data and not lose it
+    //   due to crash.
+    virtual bool OnSaveDocument() = 0;
+
+    // Notes:
+    //  If working in Editor environment and a critical error occurs notify the user to backup
+    //  the current document to prevent data loss due to crash.
+    virtual bool OnBackupDocument() = 0;
+
+    // Description:
+    //   Notifies user that system wants to switch out of current process.
+    // Example:
+    //  Called when pressing ESC in game mode to go to Menu.
+    virtual void OnProcessSwitch() = 0;
+
+    // Description:
+    //   Notifies user, usually editor, about initialization progress in system.
+    virtual void OnInitProgress(const char* sProgressMsg) = 0;
+
+    // Description:
+    //   Initialization callback.  This is called early in CSystem::Init(), before
+    //   any of the other callback methods is called.
+    // See also:
+    //   CSystem::Init()
+    virtual void OnInit(ISystem*) { }
+
+    // Summary:
+    //   Shutdown callback.
+    virtual void OnShutdown() { }
+
+    // Summary:
+    //   Quit callback.
+    // See also:
+    //   CSystem::Quit()
+    virtual void OnQuit() { }
+
+    // Description:
+    //   Notify user of an update iteration.  Called in the update loop.
+    virtual void OnUpdate() { }
+
+    // Description:
+    //   Show message by provider.
+    virtual int ShowMessage(const char* text, const char* caption, unsigned int uType) { return CryMessageBox(text, caption, uType); }
+
+    // Description:
+    //   Collects the memory information in the user program/application.
+    virtual void GetMemoryUsage(ICrySizer* pSizer) = 0;
+    // </interfuscator:shuffle>
+
+    //   Post console load, for cvar setting
+    virtual void OnConsoleCreated([[maybe_unused]] ::IConsole* pConsole) {}
+};
+
+// Description:
+//   Interface used for getting notified when a system event occurs.
+struct ISystemEventListener
+{
+    // <interfuscator:shuffle>
+    virtual ~ISystemEventListener() {}
+    virtual void OnSystemEventAnyThread([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam) {}
+    virtual void OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam) { }
+    // </interfuscator:shuffle>
+};
+
+// Description:
+//   Structure used for getting notified when a system event occurs.
+struct ISystemEventDispatcher
+{
+    // <interfuscator:shuffle>
+    virtual ~ISystemEventDispatcher() {}
+    virtual bool RegisterListener(ISystemEventListener* pListener) = 0;
+    virtual bool RemoveListener(ISystemEventListener* pListener) = 0;
+
+    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) = 0;
+    virtual void Update() = 0;
+
+    //virtual void OnLocaleChange() = 0;
+    // </interfuscator:shuffle>
+};
+
+struct IErrorObserver
+{
+    // <interfuscator:shuffle>
+    virtual ~IErrorObserver() {}
+    virtual void OnAssert(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber) = 0;
+    virtual void OnFatalError(const char* message) = 0;
+    // </interfuscator:shuffle>
+};
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_3
+    #include AZ_RESTRICTED_FILE(ISystem_h)
+#endif
+
+namespace AZ
+{
+    namespace Internal
+    {
+        class EnvironmentInterface;
+    } // namespace Internal
+} // namespace AZ
+
+typedef AZ::Internal::EnvironmentInterface SharedEnvironmentInstance;
+
+// Description:
+//  Structure passed to Init method of ISystem interface.
+struct SSystemInitParams
+{
+    void* hInstance;                                //
+    void* hWnd;                                     //
+
+    ILog* pLog;                                     // You can specify your own ILog to be used by System.
+    ILogCallback* pLogCallback;                     // You can specify your own ILogCallback to be added on log creation (used by Editor).
+    ISystemUserCallback* pUserCallback;
+    const char* sLogFileName;                       // File name to use for log.
+    bool autoBackupLogs;                            // if true, logs will be automatically backed up each startup
+    IOutputPrintSink* pPrintSync;               // Print Sync which can be used to catch all output from engine
+    char szSystemCmdLine[2048];                     // Command line.
+
+    bool bEditor;                                   // When running in Editor mode.
+    bool bPreview;                                  // When running in Preview mode (Minimal initialization).
+    bool bTestMode;                                 // When running in Automated testing mode.
+    bool bDedicatedServer;                          // When running a dedicated server.
+    bool bSkipConsole;                                  // Don't create console
+    bool bUnattendedMode;                           // When running as part of a build on build-machines: Prevent popping up of any dialog
+    bool bSkipMovie;            // Don't load movie
+
+    bool bToolMode;                                 // System is running inside a tool. Will not create USER directory or anything else that the game needs to do
+
+    ISystem* pSystem;                                           // Pointer to existing ISystem interface, it will be reused if not NULL.
+
+    SharedEnvironmentInstance* pSharedEnvironment;
+
+    // Summary:
+    //  Initialization defaults.
+    SSystemInitParams()
+    {
+        hInstance = NULL;
+        hWnd = NULL;
+
+        pLog = NULL;
+        pLogCallback = NULL;
+        pUserCallback = NULL;
+        sLogFileName = NULL;
+        autoBackupLogs = true;
+        pPrintSync = NULL;
+        memset(szSystemCmdLine, 0, sizeof(szSystemCmdLine));
+
+        bEditor = false;
+        bPreview = false;
+        bTestMode = false;
+        bDedicatedServer = false;
+        bSkipConsole = false;
+        bUnattendedMode = false;
+        bSkipMovie = false;
+        bToolMode = false;
+
+        pSystem = NULL;
+
+        pSharedEnvironment = nullptr;
+    }
+};
+
+// Notes:
+//   Can be used for LoadConfiguration().
+// See also:
+//   LoadConfiguration()
+struct ILoadConfigurationEntrySink
+{
+    // <interfuscator:shuffle>
+    virtual ~ILoadConfigurationEntrySink() {}
+    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup) = 0;
+    virtual void OnLoadConfigurationEntry_End() {}
+    // </interfuscator:shuffle>
+};
+
+struct SPlatformInfo
+{
+    unsigned int numCoresAvailableToProcess;
+    unsigned int numLogicalProcessors;
+
+#if defined(WIN32) || defined(WIN64)
+    enum EWinVersion
+    {
+        WinUndetected,
+        Win2000,
+        WinXP,
+        WinSrv2003,
+        WinVista,
+        Win7,
+        Win8,
+        Win81,
+        Win10
+    };
+
+    EWinVersion winVer;
+    bool win64Bit;
+    bool vistaKB940105Required;
+#endif
+};
+
+// Description:
+//  Holds info about system update stats over perior of time (cvar-tweakable)
+
+struct SSystemUpdateStats
+{
+    SSystemUpdateStats()
+        : avgUpdateTime(0.0f)
+        , minUpdateTime(0.0f)
+        , maxUpdateTime(0.0f) {}
+    float avgUpdateTime;
+    float minUpdateTime;
+    float maxUpdateTime;
+};
+
+// Description:
+//   Global environment.
+//   Contains pointers to all global often needed interfaces.
+//    This is a faster way to get interface pointer then calling ISystem interface to retrieve one.
+// Notes:
+//   Some pointers can be NULL, use with care.
+// See also:
+//   ISystem
+struct SSystemGlobalEnvironment
+{
+    AZ::IO::IArchive*          pCryPak;
+    AZ::IO::FileIOBase*        pFileIO;
+    ITimer*                    pTimer;
+    ICryFont*                  pCryFont;
+    ::IConsole*                  pConsole;
+    ISystem*                   pSystem = nullptr;
+    ILog*                      pLog;
+    IMovieSystem*              pMovieSystem;
+    INameTable*                pNameTable;
+    IRenderer*                 pRenderer;
+    ILyShine*                      pLyShine;
+    SharedEnvironmentInstance*      pSharedEnvironment;
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_4
+    #include AZ_RESTRICTED_FILE(ISystem_h)
+#endif
+
+    threadID                                 mMainThreadId;     //The main thread ID is used in multiple systems so should be stored globally
+
+    //////////////////////////////////////////////////////////////////////////
+    // Used by CRY_ASSERT
+    bool                                            bIgnoreAllAsserts;
+    bool                                            bNoAssertDialog;
+    //////////////////////////////////////////////////////////////////////////
+
+    bool                                            bToolMode;
+
+    int                                             retCode = 0;
+
+    ILINE const bool IsDedicated() const
+    {
+#if defined(CONSOLE)
+        return false;
+#else
+        return bDedicated;
+#endif
+    }
+
+#if !defined(CONSOLE)
+    ILINE void SetIsEditor(bool isEditor)
+    {
+        bEditor = isEditor;
+    }
+
+    ILINE void SetIsEditorGameMode(bool isEditorGameMode)
+    {
+        bEditorGameMode = isEditorGameMode;
+    }
+
+    ILINE void SetIsEditorSimulationMode(bool isEditorSimulationMode)
+    {
+        bEditorSimulationMode = isEditorSimulationMode;
+    }
+
+    ILINE void SetIsDedicated(bool isDedicated)
+    {
+        bDedicated = isDedicated;
+    }
+#endif
+
+    //this way the compiler can strip out code for consoles
+    ILINE const bool IsEditor() const
+    {
+#if defined(CONSOLE)
+        return false;
+#else
+        return bEditor;
+#endif
+    }
+
+    ILINE const bool IsEditorGameMode() const
+    {
+#if defined(CONSOLE)
+        return false;
+#else
+        return bEditorGameMode;
+#endif
+    }
+
+    ILINE const bool IsEditorSimulationMode() const
+    {
+#if defined(CONSOLE)
+        return false;
+#else
+        return bEditorSimulationMode;
+#endif
+    }
+
+    ILINE const bool IsEditing() const
+    {
+#if defined(CONSOLE)
+        return false;
+#else
+        return bEditor && !bEditorGameMode;
+#endif
+    }
+
+    ILINE bool IsInToolMode() const
+    {
+        return bToolMode;
+    }
+
+    ILINE void SetToolMode(bool bNewToolMode)
+    {
+        bToolMode = bNewToolMode;
+    }
+
+#if !defined(CONSOLE)
+private:
+    bool bEditor;          // Engine is running under editor.
+    bool bEditorGameMode;  // Engine is in editor game mode.
+    bool bEditorSimulationMode;  // Engine is in editor simulation mode.
+    bool bDedicated;             // Engine is in dedicated
+#endif
+
+public:
+    SSystemGlobalEnvironment()
+        : bToolMode(false)
+    {
+    };
+};
+
+// NOTE Nov 25, 2008: <pvl> the ISystem interface that follows has a member function
+// called 'GetUserName'.  If we don't #undef'ine the same-named Win32 symbol here
+// ISystem wouldn't even compile.
+// TODO Nov 25, 2008: <pvl> there might be a better place for this?
+#ifdef GetUserName
+#undef GetUserName
+#endif
+
+
+struct IProfilingSystem
+{
+    // <interfuscator:shuffle>
+    virtual ~IProfilingSystem() {}
+    //////////////////////////////////////////////////////////////////////////
+    // VTune Profiling interface.
+
+    // Summary:
+    //   Resumes vtune data collection.
+    virtual void VTuneResume() = 0;
+    // Summary:
+    //   Pauses vtune data collection.
+    virtual void VTunePause() = 0;
+    //////////////////////////////////////////////////////////////////////////
+    // </interfuscator:shuffle>
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+// Description:
+//   Main Engine Interface.
+//   Initialize and dispatch all engine's subsystems.
+struct ISystem
+{
+    // <interfuscator:shuffle>
+    virtual ~ISystem() {}
+    // Summary:
+    //   Releases ISystem.
+    virtual void Release() = 0;
+
+                                                                                  // Summary:
+                                                                                  //   Returns pointer to the global environment structure.
+    virtual SSystemGlobalEnvironment* GetGlobalEnvironment() = 0;
+
+    // Summary:
+    //   Updates all subsystems (including the ScriptSink() )
+    // Arguments:
+    //   flags      - One or more flags from ESystemUpdateFlags structure.
+    //   nPauseMode - 0=normal(no pause), 1=menu/pause, 2=cutscene
+    virtual bool UpdatePreTickBus(int updateFlags = 0, int nPauseMode = 0) = 0;
+
+    // Summary:
+    //   Updates all subsystems (including the ScriptSink() )
+    // Arguments:
+    //   flags      - One or more flags from ESystemUpdateFlags structure.
+    //   nPauseMode - 0=normal(no pause), 1=menu/pause, 2=cutscene
+    virtual bool UpdatePostTickBus(int updateFlags = 0, int nPauseMode = 0) = 0;
+
+    // Summary:
+    //   Updates only require components during loading
+    virtual bool UpdateLoadtime() = 0;
+
+    // Summary:
+    //   Retrieve the name of the user currently logged in to the computer.
+    virtual const char* GetUserName() = 0;
+
+    // Summary:
+    //   Quits the application.
+    virtual void    Quit() = 0;
+    // Summary:
+    //   Tells the system if it is relaunching or not.
+    virtual void    Relaunch(bool bRelaunch) = 0;
+    // Summary:
+    //   Returns true if the application is in the shutdown phase.
+    virtual bool    IsQuitting() const = 0;
+    // Summary:
+    //   Tells the system in which way we are using the serialization system.
+    virtual void  SerializingFile(int mode) = 0;
+    virtual int IsSerializingFile() const = 0;
+
+    virtual bool IsRelaunch() const = 0;
+
+    // Description:
+    //   Displays error message.
+    //   Logs it to console and file and error message box then terminates execution.
+    virtual void FatalError(const char* sFormat, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    // Description:
+    //   Reports a bug using the crash handler.
+    //   Logs an error to the console and launches the crash handler, then continues execution.
+    virtual void ReportBug(const char* sFormat, ...) PRINTF_PARAMS(2, 3) = 0;
+
+    // Description:
+    //   Report warning to current Validator object.
+    //   Doesn't terminate the execution.
+    //##@{
+    virtual void WarningV(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args) = 0;
+    virtual void Warning(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, ...) = 0;
+    //##@}
+
+    // 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;
+
+    // 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 INameTable* GetINameTable() = 0;
+    virtual ICmdLine* GetICmdLine() = 0;
+    virtual ILog* GetILog() = 0;
+    virtual AZ::IO::IArchive* GetIPak() = 0;
+    virtual ICryFont* GetICryFont() = 0;
+    virtual IMovieSystem* GetIMovieSystem() = 0;
+    virtual ::IConsole* GetIConsole() = 0;
+    virtual IRemoteConsole* GetIRemoteConsole() = 0;
+    virtual IProfilingSystem* GetIProfilingSystem() = 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;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // IXmlNode interface.
+    //////////////////////////////////////////////////////////////////////////
+
+    // Summary:
+    //   Creates new xml node.
+    virtual XmlNodeRef CreateXmlNode(const char* sNodeName = "", bool bReuseStrings = false, bool bIsProcessingInstruction = false) = 0;
+    // Summary:
+    //   Loads xml from memory buffer, returns 0 if load failed.
+    virtual XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings = false, bool bSuppressWarnings = false) = 0;
+    // Summary:
+    //   Loads xml file, returns 0 if load failed.
+    virtual XmlNodeRef LoadXmlFromFile(const char* sFilename, bool bReuseStrings = false) = 0;
+    // Summary:
+    //   Retrieves access to XML utilities interface.
+    virtual IXmlUtils* GetXmlUtils() = 0;
+
+    virtual void SetViewCamera(CCamera& Camera) = 0;
+    virtual CCamera& GetViewCamera() = 0;
+
+    // Description:
+    //   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;
+
+    //////////////////////////////////////////////////////////////////////////
+    // File version.
+    //////////////////////////////////////////////////////////////////////////
+
+    // Summary:
+    //   Gets file version.
+    virtual const SFileVersion& GetFileVersion() = 0;
+    // Summary:
+    //   Gets product version.
+    virtual const SFileVersion& GetProductVersion() = 0;
+    // Summary:
+    //   Gets build version.
+    virtual const SFileVersion& GetBuildVersion() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Configuration.
+    //////////////////////////////////////////////////////////////////////////
+
+    // Summary:
+    //   Loads configurations from CVarGroup directory recursively
+    //   If m_GraphicsSettingsMap is defined (in Graphics Settings Dialog box), fills in mapping based on sys_spec_Full
+    // Arguments:
+    //   sPath - e.g. "Game/Config/CVarGroups"
+    virtual void AddCVarGroupDirectory(const string& sPath) = 0;
+
+    // Summary:
+    //   Saves system configuration.
+    virtual void SaveConfiguration() = 0;
+
+    // Summary:
+    //   Loads system configuration
+    // Arguments:
+    //   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:
+    //   Retrieves current configuration platform
+    virtual ESystemConfigPlatform GetConfigPlatform() const = 0;
+
+    // Summary:
+    //   Changes current configuration platform.
+    virtual void SetConfigPlatform(ESystemConfigPlatform platform) = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    // Summary:
+    //   Query if system is now paused.
+    //   Pause flag is set when calling system update with pause mode.
+    virtual bool IsPaused() const = 0;
+
+    // Summary:
+    //   Retrieves localized strings manager interface.
+    virtual ILocalizationManager* GetLocalizationManager() = 0;
+
+    // Summary:
+    //   Retrieves the perlin noise singleton instance.
+    virtual CPNoise3* GetNoiseGen() = 0;
+
+    // Summary:
+    //   Retrieves system update counter.
+    virtual uint64 GetUpdateCounter() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Error callback handling
+
+    // Summary:
+    //  Registers listeners to CryAssert and error messages. (may not be called if asserts are disabled)
+    //  Each pointer can be registered only once. (stl::push_back_unique)
+    //  It will return false if the pointer is already registered. Returns true, otherwise.
+    virtual bool RegisterErrorObserver(IErrorObserver* errorObserver) = 0;
+
+    // Summary:
+    //  Unregisters listeners to CryAssert and error messages.
+    //  It will return false if the pointer is not registered. Otherwise, returns true.
+    virtual bool UnregisterErrorObserver(IErrorObserver* errorObserver) = 0;
+
+    // Summary:
+    //  Called after the processing of the assert message box on some platforms.
+    //  It will be called even when asserts are disabled by the console variables.
+    virtual void OnAssert(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber) = 0;
+
+    // Summary:
+    // Returns if the assert window from CryAssert is visible.
+    // OBS1: needed by the editor, as in some cases it can freeze if during an assert engine it will handle
+    // some events such as mouse movement in a CryPhysics assert.
+    // OBS2: it will always return false, if asserts are disabled or ignored.
+    virtual bool IsAssertDialogVisible() const = 0;
+
+    // Summary:
+    // Sets the AssertVisisble internal variable.
+    // Typically it should only be called by CryAssert.
+    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;
+
+    // Summary:
+    //   Get log index of the currently running Open 3D Engine application. (0 = first instance, 1 = second instance, etc)
+    virtual int GetApplicationLogInstance(const char* logFilePath) = 0;
+
+    // Summary:
+    //      Clear all currently logged and drawn on screen error messages
+    virtual void ClearErrorMessages() = 0;
+    //////////////////////////////////////////////////////////////////////////
+    // For debugging use only!, query current C++ call stack.
+    //////////////////////////////////////////////////////////////////////////
+
+    // Notes:
+    //   Pass nCount to indicate maximum number of functions to get.
+    //   For debugging use only, query current C++ call stack.
+    // Description:
+    //   Fills array of function pointers, nCount return number of functions.
+    virtual void debug_GetCallStack(const char** pFunctions, int& nCount) = 0;
+    // Summary:
+    //   Logs current callstack.
+    // Notes:
+    //   For debugging use only!, query current C++ call stack.
+    virtual void debug_LogCallStack(int nMaxFuncs = 32, int nFlags = 0) = 0;
+
+    // Description:
+    //   Execute command line arguments.
+    //   Should be after init game.
+    // Example:
+    //   +g_gametype ASSAULT +map "testy"
+    virtual void ExecuteCommandLine(bool deferred=true) = 0;
+
+    // Description:
+    //  GetSystemUpdate stats (all systems update without except console)
+    //  very useful on dedicated server as we throttle it to fixed frequency
+    //  returns zeroes if no updates happened yet
+    virtual void GetUpdateStats(SSystemUpdateStats& stats) = 0;
+
+    virtual ESystemGlobalState  GetSystemGlobalState(void) = 0;
+    virtual void SetSystemGlobalState(ESystemGlobalState systemGlobalState) = 0;
+
+#if !defined(_RELEASE)
+    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
+    virtual void RegisterWindowMessageHandler(IWindowMessageHandler* pHandler) = 0;
+
+    // Summary:
+    //      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
+    {
+    public:
+        virtual ~CrySystemNotifications() = default;
+
+        // Override to be notified right before the call to ISystem::Render
+        virtual void OnPreRender() {}
+
+        // Override to be notified right after the call to ISystem::Render (but before RenderEnd)
+        virtual void OnPostRender() {}
+    };
+    using CrySystemNotificationBus = AZ::EBus<CrySystemNotifications>;
+};
+
+#if defined(USE_DISK_PROFILER)
+
+struct DiskOperationInfo
+{
+    DiskOperationInfo()
+        : m_nSeeksCount(0)
+        , m_nFileOpenCount(0)
+        , m_nFileReadCount(0)
+        , m_dOperationSize(0.)
+        , m_dOperationTime(0.) {}
+    int m_nSeeksCount;
+    int m_nFileOpenCount;
+    int m_nFileReadCount;
+    double m_dOperationTime;
+    double m_dOperationSize;
+
+    DiskOperationInfo& operator -= (const DiskOperationInfo& rv)
+    {
+        m_nSeeksCount -= rv.m_nSeeksCount;
+        m_nFileOpenCount -= rv.m_nFileOpenCount;
+        m_nFileReadCount -= rv.m_nFileReadCount;
+        m_dOperationSize -= rv.m_dOperationSize;
+        m_dOperationTime -= rv.m_dOperationTime;
+        return *this;
+    }
+
+    DiskOperationInfo& operator += (const DiskOperationInfo& rv)
+    {
+        m_nSeeksCount += rv.m_nSeeksCount;
+        m_nFileOpenCount += rv.m_nFileOpenCount;
+        m_nFileReadCount += rv.m_nFileReadCount;
+        m_dOperationSize += rv.m_dOperationSize;
+        m_dOperationTime += rv.m_dOperationTime;
+        return *this;
+    }
+
+    DiskOperationInfo operator - (const DiskOperationInfo& rv)
+    {
+        DiskOperationInfo res(*this);
+        return res -= rv;
+    }
+
+    DiskOperationInfo operator + (const DiskOperationInfo& rv)
+    {
+        DiskOperationInfo res(*this);
+        return res += rv;
+    }
+};
+
+#endif
+
+#if defined(ENABLE_LOADING_PROFILER) && AZ_PROFILE_TELEMETRY
+
+#define LOADING_TIME_PROFILE_SECTION AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzCore)
+#define LOADING_TIME_PROFILE_SECTION_ARGS(...) AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::AzCore, __VA_ARGS__)
+#define LOADING_TIME_PROFILE_SECTION_NAMED(sectionName) AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzCore, sectionName)
+#define LOADING_TIME_PROFILE_SECTION_NAMED_ARGS(sectionName, ...) AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::AzCore, sectionName, __VA_ARGS__)
+
+#else
+
+#define LOADING_TIME_PROFILE_SECTION
+#define LOADING_TIME_PROFILE_SECTION_ARGS(...)
+#define LOADING_TIME_PROFILE_SECTION_NAMED(sectionName)
+#define LOADING_TIME_PROFILE_SECTION_NAMED_ARGS(sectionName, ...)
+
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// CrySystem DLL Exports.
+//////////////////////////////////////////////////////////////////////////
+typedef ISystem* (*PFNCREATESYSTEMINTERFACE)(SSystemInitParams& initParams);
+
+
+//////////////////////////////////////////////////////////////////////////
+// Global environment variable.
+//////////////////////////////////////////////////////////////////////////
+extern SSystemGlobalEnvironment* gEnv;
+
+
+// Summary:
+//   Gets the system interface.
+inline ISystem* GetISystem()
+{
+    // Some unit tests temporarily install and then uninstall ISystem* mocks.
+    // It is generally okay for runtime and tool systems which call this function to cache the returned pointer,
+    // because their lifetime is usually shorter than the lifetime of the ISystem* implementation.
+    // It is NOT safe for this function to cache it as a static itself, though, as the static it would cache
+    // it inside may outlive the the actual instance implementing ISystem* when unit tests are torn down and then restarted.
+    ISystem* systemInterface = gEnv ? gEnv->pSystem : nullptr;
+    if (!systemInterface)
+    {
+        CrySystemRequestBus::BroadcastResult(systemInterface, &CrySystemRequests::GetCrySystem);
+    }
+    return systemInterface;
+};
+//////////////////////////////////////////////////////////////////////////
+
+// Description:
+//   This function must be called once by each module at the beginning, to setup global pointers.
+extern "C" AZ_DLL_EXPORT void ModuleInitISystem(ISystem* pSystem, const char* moduleName);
+extern "C" AZ_DLL_EXPORT void ModuleShutdownISystem(ISystem* pSystem);
+extern "C" AZ_DLL_EXPORT void InjectEnvironment(void* env);
+extern "C" AZ_DLL_EXPORT void DetachEnvironment();
+
+void* GetModuleInitISystemSymbol();
+void* GetModuleShutdownISystemSymbol();
+void* GetInjectEnvironmentSymbol();
+void* GetDetachEnvironmentSymbol();
+
+#define PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING \
+    AZ_UNUSED(GetModuleInitISystemSymbol()); \
+    AZ_UNUSED(GetModuleShutdownISystemSymbol()); \
+    AZ_UNUSED(GetInjectEnvironmentSymbol()); \
+    AZ_UNUSED(GetDetachEnvironmentSymbol());
+
+
+extern bool g_bProfilerEnabled;
+
+// Summary:
+//   Interface of the DLL.
+extern "C"
+{
+    CRYSYSTEM_API ISystem* CreateSystemInterface(const SSystemInitParams& initParams);
+}
+
+// Description:
+//   Displays error message.
+//   Logs it to console and file and error message box.
+//   Then terminates execution.
+void CryFatalError(const char*, ...) PRINTF_PARAMS(1, 2);
+inline void CryFatalError(const char* format, ...)
+{
+    if (!gEnv || !gEnv->pSystem)
+    {
+        return;
+    }
+
+    va_list ArgList;
+    char szBuffer[MAX_WARNING_LENGTH];
+    va_start(ArgList, format);
+    int count = azvsnprintf(szBuffer, sizeof(szBuffer), format, ArgList);
+    if (count == -1 || count >= sizeof(szBuffer))
+    {
+        szBuffer[sizeof(szBuffer) - 1] = '\0';
+    }
+    va_end(ArgList);
+
+    gEnv->pSystem->FatalError("%s", szBuffer);
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+// Description:
+//   Displays warning message.
+//   Logs it to console and file and display a warning message box.
+//   Doesn't terminate execution.
+void CryWarning(EValidatorModule, EValidatorSeverity, const char*, ...) PRINTF_PARAMS(3, 4);
+inline void CryWarning(EValidatorModule module, EValidatorSeverity severity, const char* format, ...)
+{
+    if (!gEnv || !gEnv->pSystem || !format)
+    {
+        return;
+    }
+
+    va_list args;
+    va_start(args, format);
+    GetISystem()->WarningV(module, severity, 0, 0, format, args);
+    va_end(args);
+}
+
+#ifdef EXCLUDE_CVARHELP
+#define CVARHELP(_comment)  0
+#else
+#define CVARHELP(_comment)  _comment
+#endif
+
+//Provide macros for fixing cvars for release mode on consoles to enums to allow for code stripping
+//Do not enable for PC, apply VF_CHEAT there if required
+#if defined(CONSOLE)
+#define CONST_CVAR_FLAGS (VF_CHEAT)
+#else
+#define CONST_CVAR_FLAGS (VF_NULL)
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION ISYSTEM_H_SECTION_5
+    #include AZ_RESTRICTED_FILE(ISystem_h)
+#endif
+#if defined(_RELEASE) && defined(IS_CONSOLE_PLATFORM)
+#ifndef LOG_CONST_CVAR_ACCESS
+#error LOG_CONST_CVAR_ACCESS should be defined in ProjectDefines.h
+#endif
+
+#include "IConsole.h"
+namespace Detail
+{
+    template<typename T>
+    struct SQueryTypeEnum;
+    template<>
+    struct SQueryTypeEnum<int>
+    {
+        static const int type = CVAR_INT;
+        static int ParseString(const char* s) { return atoi(s); }
+    };
+    template<>
+    struct SQueryTypeEnum<float>
+    {
+        static const int type = CVAR_FLOAT;
+        static float ParseString(const char* s) { return (float)atof(s); }
+    };
+
+    template<typename T>
+    struct SDummyCVar
+        : ICVar
+    {
+        const T value;
+#if LOG_CONST_CVAR_ACCESS
+        mutable bool bWasRead;
+        mutable bool bWasChanged;
+        SDummyCVar(T val)
+            : value(val)
+            , bWasChanged(false)
+            , bWasRead(false) {}
+#else
+        SDummyCVar(T val)
+            : value(val) {}
+#endif
+
+        void WarnUse() const
+        {
+#if LOG_CONST_CVAR_ACCESS
+            if (!bWasRead)
+            {
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[CVAR] Read from const CVar '%s' via name look-up, this is non-optimal", GetName());
+                bWasRead = true;
+            }
+#endif
+        }
+
+        void InvalidAccess() const
+        {
+#if LOG_CONST_CVAR_ACCESS
+            if (!bWasChanged)
+            {
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "[CVAR] Write to const CVar '%s' with wrong value '%f' was ignored. This indicates a bug in code or a config file", GetName(), GetFVal());
+                bWasChanged = true;
+            }
+#endif
+        }
+
+        void Release() {}
+        int GetIVal() const { WarnUse(); return static_cast<int>(value); }
+        int64 GetI64Val() const { WarnUse(); return static_cast<int64>(value); }
+        float GetFVal() const { WarnUse(); return static_cast<float>(value); }
+        const char* GetString() const { return ""; }
+        const char* GetDataProbeString() const { return ""; }
+        void Set(const char* s)
+        {
+            if (SQueryTypeEnum<T>::ParseString(s) != value)
+            {
+                InvalidAccess();
+            }
+        }
+        void ForceSet(const char* s) { Set(s); }
+        void Set(const float f)
+        {
+            if (static_cast<T>(f) != value)
+            {
+                InvalidAccess();
+            }
+        }
+        void Set(const int i)
+        {
+            if (static_cast<T>(i) != value)
+            {
+                InvalidAccess();
+            }
+        }
+        void ClearFlags([[maybe_unused]] int flags) {}
+        int GetFlags() const { return VF_CONST_CVAR | VF_READONLY; }
+        int SetFlags([[maybe_unused]] int flags) { return 0; }
+        int GetType() { return SQueryTypeEnum<T>::type; }
+        const char* GetHelp() { return NULL; }
+        bool IsConstCVar() const { return true; }
+        void SetOnChangeCallback(ConsoleVarFunc pChangeFunc) { (void)pChangeFunc; }
+        uint64 AddOnChangeFunctor(const SFunctor& pChangeFunctor) { (void)pChangeFunctor; return 0; }
+        uint64 GetNumberOfOnChangeFunctors() const { return 0; }
+        const SFunctor& GetOnChangeFunctor([[maybe_unused]] uint64 nFunctorIndex) const { InvalidAccess(); SFunctor* pNull = nullptr; return *pNull; }
+        bool RemoveOnChangeFunctor([[maybe_unused]] const uint64 nElement) { return true; }
+        ConsoleVarFunc GetOnChangeCallback() const { InvalidAccess(); return NULL; }
+        void GetMemoryUsage([[maybe_unused]] class ICrySizer* pSizer) const {}
+        int GetRealIVal() const { return GetIVal(); }
+        void SetLimits([[maybe_unused]] float min, [[maybe_unused]] float max) { return; }
+        void GetLimits([[maybe_unused]] float& min, [[maybe_unused]] float& max) { return; }
+        bool HasCustomLimits() { return false; }
+        void SetDataProbeString([[maybe_unused]] const char* pDataProbeString) { InvalidAccess(); }
+    };
+}
+
+#define REGISTER_DUMMY_CVAR(type, name, value)                                           \
+    do {                                                                                 \
+        static struct DummyCVar                                                          \
+            : Detail::SDummyCVar<type>                                                   \
+        {                                                                                \
+            DummyCVar()                                                                  \
+                : Detail::SDummyCVar<type>(value) {}                                     \
+            const char* GetName() const { return name; }                                 \
+        } DummyStaticInstance;                                                           \
+        if (!(gEnv->pConsole != 0 ? gEnv->pConsole->Register(&DummyStaticInstance) : 0)) \
+        {                                                                                \
+            DEBUG_BREAK;                                                                 \
+            CryFatalError("Can not register dummy CVar");                                \
+        }                                                                                \
+    } while (0)
+
+# define CONSOLE_CONST_CVAR_MODE
+# define DeclareConstIntCVar(name, defaultValue) enum : int { name = (defaultValue) }
+# define DeclareStaticConstIntCVar(name, defaultValue) enum : int { name = (defaultValue) }
+
+# define DefineConstIntCVarName(strname, name, defaultValue, flags, help) { COMPILE_TIME_ASSERT((int)(defaultValue) == (int)(name)); REGISTER_DUMMY_CVAR(int, strname, defaultValue); }
+# define DefineConstIntCVar(name, defaultValue, flags, help) { COMPILE_TIME_ASSERT((int)(defaultValue) == (int)(name)); REGISTER_DUMMY_CVAR(int, (#name), defaultValue); }
+// DefineConstIntCVar2 is deprecated, any such instance can be converted to the 3 variant by removing the quotes around the first parameter
+# define DefineConstIntCVar3(name, _var_, defaultValue, flags, help) { COMPILE_TIME_ASSERT((int)(defaultValue) == (int)(_var_)); REGISTER_DUMMY_CVAR(int, name, defaultValue); }
+# define AllocateConstIntCVar(scope, name)
+
+# define DefineConstFloatCVar(name, flags, help) { REGISTER_DUMMY_CVAR(float, (#name), name ## Default); }
+# define DeclareConstFloatCVar(name)
+# define DeclareStaticConstFloatCVar(name)
+# define AllocateConstFloatCVar(scope, name)
+
+# define IsCVarConstAccess(expr) expr
+
+#else
+
+# define DeclareConstIntCVar(name, defaultValue) int name { defaultValue }
+# define DeclareStaticConstIntCVar(name, defaultValue) static int name
+# define DefineConstIntCVarName(strname, name, defaultValue, flags, help) \
+    (gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(strname, &name, defaultValue, flags | CONST_CVAR_FLAGS, CVARHELP(help)))
+# define DefineConstIntCVar(name, defaultValue, flags, help) \
+    (gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register((#name), &name, defaultValue, flags | CONST_CVAR_FLAGS, CVARHELP(help), 0, false))
+// DefineConstIntCVar2 is deprecated, any such instance can be converted to the 3 variant by removing the quotes around the first parameter
+# define DefineConstIntCVar3(_name, _var, _def_val, _flags, help) \
+    (gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, &(_var), (_def_val), (_flags) | CONST_CVAR_FLAGS, CVARHELP(help), 0, false))
+# define AllocateConstIntCVar(scope, name) int scope:: name
+
+# define DefineConstFloatCVar(name, flags, help) \
+    (gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register((#name), &name, name ## Default, flags | CONST_CVAR_FLAGS, CVARHELP(help), 0, false))
+# define DeclareConstFloatCVar(name) float name
+# define DeclareStaticConstFloatCVar(name) static float name
+# define AllocateConstFloatCVar(scope, name) float scope:: name
+
+# define IsCVarConstAccess(expr)
+
+#endif
+
+#if defined(USE_CRY_ASSERT)
+static void AssertConsoleExists(void)
+{
+    CRY_ASSERT(gEnv->pConsole != NULL);
+}
+#define ASSERT_CONSOLE_EXISTS AssertConsoleExists()
+#else
+#define ASSERT_CONSOLE_EXISTS 0
+#endif // defined(USE_CRY_ASSERT)
+
+// the following macros allow the help text to be easily stripped out
+
+// Summary:
+//   Preferred way to register a CVar
+#define REGISTER_CVAR(_var, _def_val, _flags, _comment)                                                            (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register((#_var), &(_var), (_def_val), (_flags), CVARHELP(_comment)))
+// Summary:
+//   Preferred way to register a CVar with a callback
+#define REGISTER_CVAR_CB(_var, _def_val, _flags, _comment, _onchangefunction)                   (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register((#_var), &(_var), (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
+// Summary:
+//   Preferred way to register a string CVar
+#define REGISTER_STRING(_name, _def_val, _flags, _comment)                                                     (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterString(_name, (_def_val), (_flags), CVARHELP(_comment)))
+// Summary:
+//   Preferred way to register a string CVar with a callback
+#define REGISTER_STRING_CB(_name, _def_val, _flags, _comment, _onchangefunction)            (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterString(_name, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
+// Summary:
+//   Preferred way to register an int CVar
+#define REGISTER_INT(_name, _def_val, _flags, _comment)                                                            (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterInt(_name, (_def_val), (_flags), CVARHELP(_comment)))
+// Summary:
+//   Preferred way to register an int CVar with a callback
+#define REGISTER_INT_CB(_name, _def_val, _flags, _comment, _onchangefunction)                   (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterInt(_name, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
+// Summary:
+//   Preferred way to register an int64 CVar
+#define REGISTER_INT64(_name, _def_val, _flags, _comment)                                                      (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterInt64(_name, (_def_val), (_flags), CVARHELP(_comment)))
+// Summary:
+//   Preferred way to register an int64 CVar with a callback
+#define REGISTER_INT64_CB(_name, _def_val, _flags, _comment, _onchangefunction)                                                     (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterInt64(_name, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
+// Summary:
+//   Preferred way to register a float CVar
+#define REGISTER_FLOAT(_name, _def_val, _flags, _comment)                                                      (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterFloat(_name, (_def_val), (_flags), CVARHELP(_comment)))
+// Summary:
+//   Preferred way to register a float CVar with a callback
+#define REGISTER_FLOAT_CB(_name, _def_val, _flags, _comment, _onchangefunction)                 (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->RegisterFloat(_name, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
+// Summary:
+//   Offers more flexibility but more code is required
+#define REGISTER_CVAR2(_name, _var, _def_val, _flags, _comment)                                             (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, _var, (_def_val), (_flags), CVARHELP(_comment)))
+// Summary:
+//   Offers more flexibility but more code is required
+#define REGISTER_CVAR2_CB(_name, _var, _def_val, _flags, _comment, _onchangefunction)    (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, _var, (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
+// Summary:
+//   Offers more flexibility but more code is required, explicit address taking of destination variable
+#define REGISTER_CVAR3(_name, _var, _def_val, _flags, _comment)                                             (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, &(_var), (_def_val), (_flags), CVARHELP(_comment)))
+// Summary:
+//   Offers more flexibility but more code is required, explicit address taking of destination variable
+#define REGISTER_CVAR3_CB(_name, _var, _def_val, _flags, _comment, _onchangefunction)    (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? 0 : gEnv->pConsole->Register(_name, &(_var), (_def_val), (_flags), CVARHELP(_comment), _onchangefunction))
+// Summary:
+//   Preferred way to register a console command
+#define REGISTER_COMMAND(_name, _func, _flags, _comment)                                                           (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? false : gEnv->pConsole->AddCommand(_name, _func, (_flags), CVARHELP(_comment)))
+// Summary:
+//   Preferred way to unregister a CVar
+#define UNREGISTER_CVAR(_name)                                                      (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? (void)0 : gEnv->pConsole->UnregisterVariable(_name))
+//   Preferred way to unregister a console command
+#define UNREGISTER_COMMAND(_name)                                                           (ASSERT_CONSOLE_EXISTS, gEnv->pConsole == 0 ? (void)0 : gEnv->pConsole->RemoveCommand(_name))
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Development only cvars
+//
+// N.B:
+// (1) Registered as real cvars *in non release builds only*.
+// (2) Can still be manipulated in release by the mapped variable, so not the same as const cvars.
+// (3) Any 'OnChanged' callback will need guarding against in release builds since the cvar won't exist
+// (4) Any code that tries to get ICVar* will need guarding against in release builds since the cvar won't exist
+//
+// ILLEGAL_DEV_FLAGS is a mask of all those flags which make no sense in a _DEV_ONLY or _DEDI_ONLY cvar since the
+// cvar potentially won't exist in a release build.
+//
+#define ILLEGAL_DEV_FLAGS (VF_NET_SYNCED | VF_CHEAT | VF_CHEAT_ALWAYS_CHECK | VF_CHEAT_NOCHECK | VF_READONLY | VF_CONST_CVAR)
+
+#if defined(_RELEASE)
+#define REGISTER_CVAR_DEV_ONLY(_var, _def_val, _flags, _comment)                                                               NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); _var = _def_val
+#define REGISTER_CVAR_CB_DEV_ONLY(_var, _def_val, _flags, _comment, _onchangefunction)                  NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); _var = _def_val /* _onchangefunction consumed; callback not available */
+#define REGISTER_STRING_DEV_ONLY(_name, _def_val, _flags, _comment)                                                        NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
+#define REGISTER_STRING_CB_DEV_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)               NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
+#define REGISTER_INT_DEV_ONLY(_name, _def_val, _flags, _comment)                                                               NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
+#define REGISTER_INT_CB_DEV_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)                  NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
+#define REGISTER_INT64_DEV_ONLY(_name, _def_val, _flags, _comment)                                                         NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
+#define REGISTER_FLOAT_DEV_ONLY(_name, _def_val, _flags, _comment)                                                         NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)                                  /* consumed; pure cvar not available */
+#define REGISTER_CVAR2_DEV_ONLY(_name, _var, _def_val, _flags, _comment)                                                NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); *(_var) = _def_val
+#define REGISTER_CVAR2_CB_DEV_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)       NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); *(_var) = _def_val
+#define REGISTER_CVAR3_DEV_ONLY(_name, _var, _def_val, _flags, _comment)                                                NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); _var = _def_val
+#define REGISTER_CVAR3_CB_DEV_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)       NULL; COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0); _var = _def_val
+#define REGISTER_COMMAND_DEV_ONLY(_name, _func, _flags, _comment)                                                  /* consumed; command not available */
+#else
+#define REGISTER_CVAR_DEV_ONLY(_var, _def_val, _flags, _comment)                                                               REGISTER_CVAR(_var, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR_CB_DEV_ONLY(_var, _def_val, _flags, _comment, _onchangefunction)                  REGISTER_CVAR_CB(_var, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_STRING_DEV_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_STRING(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_STRING_CB_DEV_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)               REGISTER_STRING_CB(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_INT_DEV_ONLY(_name, _def_val, _flags, _comment)                                                               REGISTER_INT(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_INT_CB_DEV_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)                  REGISTER_INT_CB(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_INT64_DEV_ONLY(_name, _def_val, _flags, _comment)                                                         REGISTER_INT64(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_FLOAT_DEV_ONLY(_name, _def_val, _flags, _comment)                                                         REGISTER_FLOAT(_name, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR2_DEV_ONLY(_name, _var, _def_val, _flags, _comment)                                                REGISTER_CVAR2(_name, _var, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR2_CB_DEV_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)       REGISTER_CVAR2_CB(_name, _var, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR3_DEV_ONLY(_name, _var, _def_val, _flags, _comment)                                                REGISTER_CVAR3(_name, _var, _def_val, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR3_CB_DEV_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)       REGISTER_CVAR3_CB(_name, _var, _def_val, ((_flags) | VF_DEV_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_COMMAND_DEV_ONLY(_name, _func, _flags, _comment)                                                          REGISTER_COMMAND(_name, _func, ((_flags) | VF_DEV_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#endif // defined(_RELEASE)
+//
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Dedicated server only cvars
+//
+// N.B:
+// (1) Registered as real cvars in all non release builds
+// (2) Registered as real cvars in release on dedi servers only, otherwise treated as DEV_ONLY type cvars (see above)
+//
+
+// TODO Registering all cvars for Dedicated server as well. Currently CrySystems have no concept of Dedicated server with cmake.
+// If we introduce server specific targets for CrySystems, we can add DEDICATED_SERVER flags to those and add the flag back in here.
+#if defined(_RELEASE)
+#define REGISTER_CVAR_DEDI_ONLY(_var, _def_val, _flags, _comment)                                                          REGISTER_CVAR(_var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR_CB_DEDI_ONLY(_var, _def_val, _flags, _comment, _onchangefunction)                 REGISTER_CVAR_CB(_var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_STRING_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                       REGISTER_STRING(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_STRING_CB_DEDI_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)          REGISTER_STRING_CB(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_INT_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                          REGISTER_INT(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_INT_CB_DEDI_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)                 REGISTER_INT_CB(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_INT64_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_INT64(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_FLOAT_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_FLOAT(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR2_DEDI_ONLY(_name, _var, _def_val, _flags, _comment)                                               REGISTER_CVAR2(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR2_CB_DEDI_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)  REGISTER_CVAR2_CB(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR3_DEDI_ONLY(_name, _var, _def_val, _flags, _comment)                                               REGISTER_CVAR3(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_CVAR3_CB_DEDI_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)  REGISTER_CVAR3_CB(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#define REGISTER_COMMAND_DEDI_ONLY(_name, _func, _flags, _comment)                                                         REGISTER_COMMAND(_name, _func, ((_flags) | VF_DEDI_ONLY), _comment); COMPILE_TIME_ASSERT(((_flags) & ILLEGAL_DEV_FLAGS) == 0)
+#else
+#define REGISTER_CVAR_DEDI_ONLY(_var, _def_val, _flags, _comment)                                                          REGISTER_CVAR_DEV_ONLY(_var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
+#define REGISTER_CVAR_CB_DEDI_ONLY(_var, _def_val, _flags, _comment, _onchangefunction)                 REGISTER_CVAR_CB_DEV_ONLY(_var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
+#define REGISTER_STRING_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                       REGISTER_STRING_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
+#define REGISTER_STRING_CB_DEDI_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)          REGISTER_STRING_CB_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
+#define REGISTER_INT_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                          REGISTER_INT_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
+#define REGISTER_INT_CB_DEDI_ONLY(_name, _def_val, _flags, _comment, _onchangefunction)                 REGISTER_INT_CB_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
+#define REGISTER_INT64_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_INT64_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
+#define REGISTER_FLOAT_DEDI_ONLY(_name, _def_val, _flags, _comment)                                                        REGISTER_FLOAT_DEV_ONLY(_name, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
+#define REGISTER_CVAR2_DEDI_ONLY(_name, _var, _def_val, _flags, _comment)                                               REGISTER_CVAR2_DEV_ONLY(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
+#define REGISTER_CVAR2_CB_DEDI_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)  REGISTER_CVAR2_CB_DEV_ONLY(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
+#define REGISTER_CVAR3_DEDI_ONLY(_name, _var, _def_val, _flags, _comment)                                               REGISTER_CVAR3_DEV_ONLY(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment)
+#define REGISTER_CVAR3_CB_DEDI_ONLY(_name, _var, _def_val, _flags, _comment, _onchangefunction)  REGISTER_CVAR3_CB_DEV_ONLY(_name, _var, _def_val, ((_flags) | VF_DEDI_ONLY), _comment, _onchangefunction)
+#define REGISTER_COMMAND_DEDI_ONLY(_name, _func, _flags, _comment)                                                         REGISTER_COMMAND_DEV_ONLY(_name, _func, ((_flags) | VF_DEDI_ONLY), _comment)
+#endif // defined(_RELEASE)
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifdef EXCLUDE_NORMAL_LOG               // setting this removes a lot of logging to reduced code size (useful for consoles)
+
+#define CryLog(...) ((void)0)
+#define CryComment(...) ((void)0)
+#define CryLogAlways(...) ((void)0)
+
+#else // EXCLUDE_NORMAL_LOG
+
+// Summary:
+//   Simple logs of data with low verbosity.
+void CryLog(const char*, ...) PRINTF_PARAMS(1, 2);
+inline void CryLog(const char* format, ...)
+{
+    // Fran: we need these guards for the testing framework to work
+    if (gEnv && gEnv->pSystem && gEnv->pLog)
+    {
+        va_list args;
+        va_start(args, format);
+        gEnv->pLog->LogV(ILog::eMessage, format, args);
+        va_end(args);
+    }
+}
+// Notes:
+//   Very rarely used log comment.
+void CryComment(const char*, ...) PRINTF_PARAMS(1, 2);
+inline void CryComment(const char* format, ...)
+{
+    // Fran: we need these guards for the testing framework to work
+    if (gEnv && gEnv->pSystem && gEnv->pLog)
+    {
+        va_list args;
+        va_start(args, format);
+        gEnv->pLog->LogV(ILog::eComment, format, args);
+        va_end(args);
+    }
+}
+// Summary:
+//   Logs important data that must be printed regardless verbosity.
+void CryLogAlways(const char*, ...) PRINTF_PARAMS(1, 2);
+inline void CryLogAlways(const char* format, ...)
+{
+    // log should not be used before system is ready
+    // error before system init should be handled explicitly
+
+    // Fran: we need these guards for the testing framework to work
+
+    if (gEnv && gEnv->pSystem && gEnv->pLog)
+    {
+        //      assert(gEnv);
+        //      assert(gEnv->pSystem);
+
+        va_list args;
+        va_start(args, format);
+        gEnv->pLog->LogV(ILog::eAlways, format, args);
+        va_end(args);
+    }
+}
+
+#endif // EXCLUDE_NORMAL_LOG
+
+//////////////////////////////////////////////////////////////////////////
+// Additional headers.
+//////////////////////////////////////////////////////////////////////////
+#include <FrameProfiler.h>
+
+#endif // CRYINCLUDE_CRYCOMMON_ISYSTEM_H
+
diff --git a/Code/Legacy/CryCommon/ITexture.h b/Code/Legacy/CryCommon/ITexture.h
new file mode 100644
index 0000000000..f079a56558
--- /dev/null
+++ b/Code/Legacy/CryCommon/ITexture.h
@@ -0,0 +1,422 @@
+/*
+ * 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_ITEXTURE_H
+#define CRYINCLUDE_CRYCOMMON_ITEXTURE_H
+#pragma once
+
+#include <AzCore/PlatformDef.h>
+
+#include "Cry_Math.h"
+#include "Cry_Color.h"
+#include "Tarray.h"
+#include <smartptr.h>
+class CTexture;
+
+#ifndef COMPILER_SUPPORTS_ENUM_SPECIFICATION
+# if defined(_MSC_VER)
+#  define COMPILER_SUPPORTS_ENUM_SPECIFICATION 1
+# else
+#  define COMPILER_SUPPORTS_ENUM_SPECIFICATION 0
+# endif
+#endif
+
+#if COMPILER_SUPPORTS_ENUM_SPECIFICATION
+enum ETEX_Type : uint8
+#else
+typedef uint8 ETEX_Type;
+enum eTEX_Type
+#endif
+{
+    eTT_1D = 0,
+    eTT_2D,
+    eTT_3D,
+    eTT_Cube,
+    eTT_CubeArray,
+    eTT_Dyn2D,
+    eTT_User,
+    eTT_NearestCube,
+
+    eTT_2DArray,
+    eTT_2DMS,
+
+    eTT_Auto2D,
+
+    eTT_MaxTexType,     // not used
+};
+
+
+// Texture formats
+#if COMPILER_SUPPORTS_ENUM_SPECIFICATION
+enum ETEX_Format : uint8
+#else
+typedef uint8 ETEX_Format;
+enum eTEX_Format
+#endif
+{
+    eTF_Unknown = 0,
+    eTF_R8G8B8A8S,
+    eTF_R8G8B8A8 = 2, // may be saved into file
+
+    eTF_A8 = 4,
+    eTF_R8,
+    eTF_R8S,
+    eTF_R16,
+    eTF_R16F,
+    eTF_R32F,
+    eTF_R8G8,
+    eTF_R8G8S,
+    eTF_R16G16,
+    eTF_R16G16S,
+    eTF_R16G16F,
+    eTF_R11G11B10F,
+    eTF_R10G10B10A2,
+    eTF_R16G16B16A16,
+    eTF_R16G16B16A16S,
+    eTF_R16G16B16A16F,
+    eTF_R32G32B32A32F,
+
+    eTF_CTX1,
+    eTF_BC1 = 22, // may be saved into file
+    eTF_BC2 = 23, // may be saved into file
+    eTF_BC3 = 24, // may be saved into file
+    eTF_BC4U,     // 3Dc+
+    eTF_BC4S,
+    eTF_BC5U,     // 3Dc
+    eTF_BC5S,
+    eTF_BC6UH,
+    eTF_BC6SH,
+    eTF_BC7,
+    eTF_R9G9B9E5,
+
+    // hardware depth buffers
+    eTF_D16,
+    eTF_D24S8,
+    eTF_D32F,
+    eTF_D32FS8,
+
+    // only available as hardware format under DX11.1 with DXGI 1.2
+    eTF_B5G6R5,
+    eTF_B5G5R5,
+    eTF_B4G4R4A4,
+
+    // only available as hardware format under OpenGL
+    eTF_EAC_R11,
+    eTF_EAC_RG11,
+    eTF_ETC2,
+    eTF_ETC2A,
+
+    // only available as hardware format under DX9
+    eTF_A8L8,
+    eTF_L8,
+    eTF_L8V8U8,
+    eTF_B8G8R8,
+    eTF_L8V8U8X8,
+    eTF_B8G8R8X8,
+    eTF_B8G8R8A8,
+
+    eTF_PVRTC2,
+    eTF_PVRTC4,
+
+    eTF_ASTC_4x4,
+    eTF_ASTC_5x4,
+    eTF_ASTC_5x5,
+    eTF_ASTC_6x5,
+    eTF_ASTC_6x6,
+    eTF_ASTC_8x5,
+    eTF_ASTC_8x6,
+    eTF_ASTC_8x8,
+    eTF_ASTC_10x5,
+    eTF_ASTC_10x6,
+    eTF_ASTC_10x8,
+    eTF_ASTC_10x10,
+    eTF_ASTC_12x10,
+    eTF_ASTC_12x12,
+
+    // add R16 unsigned int format for hardware that do not support float point rendering
+    eTF_R16U,
+    eTF_R16G16U,
+    eTF_R10G10B10A2UI,
+
+    eTF_MaxFormat               // unused, must be always the last in the list
+};
+
+#if COMPILER_SUPPORTS_ENUM_SPECIFICATION
+enum ETEX_TileMode : uint8
+#else
+typedef uint8 ETEX_TileMode;
+enum eTEX_TileMode
+#endif
+{
+    eTM_None = 0,
+    eTM_LinearPadded,
+    eTM_Optimal,
+};
+
+
+enum ETextureFlags
+{
+    FT_NOMIPS                  = 0x00000001,
+    FT_TEX_NORMAL_MAP          = 0x00000002,
+    FT_TEX_WAS_NOT_PRE_TILED   = 0x00000004,
+    FT_USAGE_DEPTHSTENCIL      = 0x00000008,
+    FT_USAGE_ALLOWREADSRGB     = 0x00000010,
+    FT_FILESINGLE              = 0x00000020, // suppress loading of additional files like _DDNDIF (faster, RC can tag the file for that)
+    FT_TEX_FONT                = 0x00000040,
+    FT_HAS_ATTACHED_ALPHA      = 0x00000080,
+    FT_USAGE_UNORDERED_ACCESS  = 0x00000100,
+    FT_USAGE_READBACK          = 0x00000200,
+    FT_USAGE_MSAA              = 0x00000400,
+    FT_FORCE_MIPS              = 0x00000800,
+    FT_USAGE_RENDERTARGET      = 0x00001000,
+    FT_USAGE_DYNAMIC           = 0x00002000,
+    FT_STAGE_READBACK          = 0x00004000,
+    FT_STAGE_UPLOAD            = 0x00008000,
+    FT_DONT_RELEASE            = 0x00010000,
+    FT_ASYNC_PREPARE           = 0x00020000,
+    FT_DONT_STREAM             = 0x00040000,
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #include AZ_RESTRICTED_FILE(ITexture_h)
+#endif
+
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+    #undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+#if defined(AZ_PLATFORM_IOS)
+    FT_USAGE_MEMORYLESS        = 0x00080000, //reusing an unused bit for ios
+#else
+    FT_USAGE_PREDICATED_TILING = 0x00080000, //unused
+#endif
+#endif
+    FT_FAILED                  = 0x00100000,
+    FT_FROMIMAGE               = 0x00200000,
+    FT_STATE_CLAMP             = 0x00400000,
+    FT_USAGE_ATLAS             = 0x00800000,
+    FT_ALPHA                   = 0x01000000,
+    FT_REPLICATE_TO_ALL_SIDES  = 0x02000000,
+    FT_KEEP_LOWRES_SYSCOPY     = 0x04000000, // keep low res copy in system memory for voxelization on CPU
+    FT_SPLITTED                = 0x08000000, // for split dds files
+    FT_USE_HTILE               = 0x10000000,
+    FT_IGNORE_PRECACHE         = 0x20000000,
+    FT_COMPOSITE               = 0x40000000,
+    FT_USAGE_UAV_RWTEXTURE     = 0x80000000,
+};
+
+struct SDepthTexture;
+
+struct STextureStreamingStats
+{
+    STextureStreamingStats(bool bComputeTexturesPerFrame)
+        : bComputeReuquiredTexturesPerFrame(bComputeTexturesPerFrame)
+    {
+        nMaxPoolSize = 0;
+        nCurrentPoolSize = 0;
+        nStreamedTexturesSize = 0;
+        nStaticTexturesSize = 0;
+        nThroughput = 0;
+        nNumTexturesPerFrame = 0;
+        nRequiredStreamedTexturesSize = 0;
+        nRequiredStreamedTexturesCount = 0;
+        bPoolOverflow = false;
+        bPoolOverflowTotally = false;
+        fPoolFragmentation = 0.0f;
+    }
+    size_t nMaxPoolSize;
+    size_t nCurrentPoolSize;
+    size_t nStreamedTexturesSize;
+    size_t nStaticTexturesSize;
+    uint32 nNumTexturesPerFrame;
+    size_t nThroughput;
+    size_t nRequiredStreamedTexturesSize;
+    uint32 nRequiredStreamedTexturesCount;
+    float fPoolFragmentation;
+    uint32 bPoolOverflow : 1;
+    uint32 bPoolOverflowTotally : 1;
+    const bool bComputeReuquiredTexturesPerFrame;
+};
+
+
+//////////////////////////////////////////////////////////////////////
+// Texture object interface
+class CDeviceTexture;
+class ITexture
+{
+protected:
+    virtual ~ITexture() {}
+public:
+
+    // <interfuscator:shuffle>
+    virtual int AddRef() = 0;
+    virtual int Release() = 0;
+    virtual int ReleaseForce() = 0;
+
+    virtual const ColorF& GetClearColor() const = 0;
+    virtual const ETEX_Format GetDstFormat() const = 0;
+    virtual const ETEX_Format GetSrcFormat() const = 0;
+    virtual const ETEX_Type GetTexType() const = 0;
+    virtual void ApplyTexture(int nTUnit, int nState = -1) = 0;
+    virtual const char* GetName() const = 0;
+    virtual const int GetWidth() const = 0;
+    virtual const int GetHeight() const = 0;
+    virtual const int GetDepth() const = 0;
+    virtual const int GetTextureID() const = 0;
+    virtual const uint32 GetFlags() const = 0;
+    virtual const int GetNumMips() const = 0;
+    virtual const int GetRequiredMip() const = 0;
+    virtual const int GetDeviceDataSize() const  = 0;
+    virtual const int GetDataSize() const = 0;
+    virtual const ETEX_Type GetTextureType() const = 0;
+    // Sets the texture type of the texture to be used before the texture is loaded.
+    // Once the texture is loaded the type from the file will overwrite whatever
+    // value was set here.
+    virtual void SetTextureType(ETEX_Type type) = 0;
+    virtual const bool IsTextureLoaded() const = 0;
+    virtual void PrecacheAsynchronously(float fMipFactor, int nFlags, int nUpdateId, int nCounter = 1) = 0;
+    virtual uint8* GetData32(int nSide = 0, int nLevel = 0, uint8* pDst = NULL, ETEX_Format eDstFormat = eTF_R8G8B8A8) = 0;
+    virtual bool SetFilter(int nFilter) = 0;   // FILTER_ flags
+    virtual void SetClamp(bool bEnable) = 0; // Texture addressing set
+    virtual float GetAvgBrightness() const = 0;
+
+    virtual int StreamCalculateMipsSigned(float fMipFactor) const = 0;
+    virtual int GetStreamableMipNumber() const = 0;
+    virtual int GetStreamableMemoryUsage(int nStartMip) const = 0;
+    virtual int GetMinLoadedMip() const = 0;
+
+    using StagingHook = AZStd::function<bool(void*, uint32, uint32)>;
+    virtual void Readback(AZ::u32 subresourceIndex, StagingHook callback) = 0;
+
+    virtual bool Reload() = 0;
+    // Used for debugging/profiling.
+    virtual const char* GetFormatName() const = 0;
+    virtual const char* GetTypeName() const = 0;
+    virtual const bool IsStreamedVirtual() const = 0;
+    virtual const bool IsShared() const = 0;
+    virtual const bool IsStreamable() const = 0;
+    virtual bool IsStreamedIn(const int nMinPrecacheRoundIds[2]) const = 0;
+    virtual const int GetAccessFrameId() const = 0;
+
+    virtual const ETEX_Format GetTextureDstFormat() const = 0;
+    virtual const ETEX_Format GetTextureSrcFormat() const = 0;
+
+    virtual bool IsPostponed() const = 0;
+    virtual const bool IsParticularMipStreamed(float fMipFactor) const = 0;
+
+    // get low res system memory (used for CPU voxelization)
+    virtual const ColorB* GetLowResSystemCopy([[maybe_unused]] uint16& nWidth, [[maybe_unused]] uint16& nHeight, [[maybe_unused]] int** ppLowResSystemCopyAtlasId) { return 0; }
+
+    // </interfuscator:shuffle>
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const
+    {
+        COMPILE_TIME_ASSERT(eTT_MaxTexType <= 255);
+        COMPILE_TIME_ASSERT(eTF_MaxFormat <= 255);
+        /*LATER*/
+    }
+
+    virtual void SetKeepSystemCopy(bool bKeepSystemCopy) = 0;
+    virtual void UpdateTextureRegion(const uint8_t* data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc) = 0;
+    virtual CDeviceTexture* GetDevTexture() const = 0;
+
+};
+
+struct STextureLoadData
+{
+    void*               m_pData;
+    size_t              m_DataSize;
+    int                 m_Width;
+    int                 m_Height;
+    ETEX_Format         m_Format;
+    int                 m_NumMips;
+    int                 m_nFlags;
+    ITexture*           m_pTexture;
+    STextureLoadData()
+        : m_pData(nullptr)
+        , m_Width(0)
+        , m_Height(0)
+        , m_Format(eTF_Unknown)
+        , m_NumMips(0)
+        , m_nFlags(0)
+        , m_pTexture(nullptr)
+    {
+    }
+    ~STextureLoadData()
+    {
+        if (m_pData)
+        {
+            CryModuleFree(m_pData);
+        }
+    }
+
+    static void* AllocateData(size_t dataSize)
+    {
+        return CryModuleMalloc(dataSize);
+    }
+};
+struct ITextureLoadHandler
+{
+    virtual ~ITextureLoadHandler() {}
+    virtual bool LoadTextureData(const char* path, STextureLoadData& loadData) = 0;
+    virtual bool SupportsExtension(const char* ext) const = 0;
+    virtual void Update() = 0;
+};
+
+//=========================================================================================
+
+class IDynTexture
+{
+public:
+    enum
+    {
+        fNeedRegenerate = 1ul << 0,
+    };
+    // <interfuscator:shuffle>
+    virtual ~IDynTexture(){}
+    virtual void Release() = 0;
+    virtual void GetSubImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight) = 0;
+    virtual void GetImageRect(uint32& nX, uint32& nY, uint32& nWidth, uint32& nHeight) = 0;
+    virtual int GetTextureID() = 0;
+    virtual void Lock() = 0;
+    virtual void UnLock() = 0;
+    virtual int GetWidth() = 0;
+    virtual int GetHeight() = 0;
+    virtual bool IsValid() = 0;
+    virtual uint8 GetFlags() const = 0;
+    virtual void SetFlags([[maybe_unused]] uint8 flags) {}
+    virtual bool Update(int nNewWidth, int nNewHeight) = 0;
+    virtual void Apply(int nTUnit, int nTS = -1) = 0;
+    virtual bool ClearRT() = 0;
+    virtual bool SetRT(int nRT, bool bPush, struct SDepthTexture* pDepthSurf, bool bScreenVP = false) = 0;
+    virtual bool SetRectStates() = 0;
+    virtual bool RestoreRT(int nRT, bool bPop) = 0;
+    virtual ITexture* GetTexture() = 0;
+    virtual void SetUpdateMask() = 0;
+    virtual void ResetUpdateMask() = 0;
+    virtual bool IsSecondFrame() = 0;
+    virtual bool GetImageData32([[maybe_unused]] uint8* pData, [[maybe_unused]] int nDataSize) { return 0; }
+    // </interfuscator:shuffle>
+};
+
+// Animating Texture sequence definition
+class ITexAnim
+{
+public:
+    virtual ~ITexAnim() {};
+    virtual void Release() = 0;
+    virtual void AddRef() = 0;
+};
+
+struct AZ_DEPRECATED(STexAnim, "STexAnim has been deprecated and replaced by the abstract interface ITexAnim above and CTexAnim in RenderDLL/Common/Textures/Texture.h. This was done to keep proper ref counting between CryRenderDLL and EditorLib.") {};
+
+struct STexComposition
+{
+    _smart_ptr<ITexture> pTexture;
+    uint16 nSrcSlice;
+    uint16 nDstSlice;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_ITEXTURE_H
diff --git a/Code/Legacy/CryCommon/ITimer.h b/Code/Legacy/CryCommon/ITimer.h
new file mode 100644
index 0000000000..4a89875348
--- /dev/null
+++ b/Code/Legacy/CryCommon/ITimer.h
@@ -0,0 +1,210 @@
+/*
+ * 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/IValidator.h b/Code/Legacy/CryCommon/IValidator.h
new file mode 100644
index 0000000000..f28e67ecc1
--- /dev/null
+++ b/Code/Legacy/CryCommon/IValidator.h
@@ -0,0 +1,104 @@
+/*
+ * 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 : IValidator interface used to check objects for warnings and errors
+//               Report missing resources or invalid files.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IVALIDATOR_H
+#define CRYINCLUDE_CRYCOMMON_IVALIDATOR_H
+#pragma once
+
+#   define MAX_WARNING_LENGTH   4096
+
+#if MAX_WARNING_LENGTH < 33
+#error "MAX_WARNING_LENGTH should be bigger than 32"
+#endif
+
+#define ERROR_CANT_FIND_CENTRAL_DIRECTORY "Cannot find Central Directory Record in pak. This is either not a pak file, or a pak file without Central Directory. It does not mean that the data is permanently lost, but it may be severely damaged. Please repair the file with external tools, there may be enough information left to recover the file completely."
+
+enum EValidatorSeverity
+{
+    VALIDATOR_ERROR,
+    VALIDATOR_ERROR_DBGBRK, // will __debugbreak() if sys_error_debugbreak is 1
+    VALIDATOR_WARNING,
+    VALIDATOR_COMMENT
+};
+
+enum EValidatorModule
+{
+    VALIDATOR_MODULE_UNKNOWN,
+    VALIDATOR_MODULE_RENDERER,
+    VALIDATOR_MODULE_3DENGINE,
+    VALIDATOR_MODULE_ASSETS,
+    VALIDATOR_MODULE_SYSTEM,
+    VALIDATOR_MODULE_AUDIO,
+    VALIDATOR_MODULE_MOVIE,
+    VALIDATOR_MODULE_EDITOR,
+    VALIDATOR_MODULE_NETWORK,
+    VALIDATOR_MODULE_PHYSICS,
+    VALIDATOR_MODULE_RESERVED, // formerly VALIDATOR_MODULE_FLOWGRAPH
+    VALIDATOR_MODULE_FEATURETESTS,
+    VALIDATOR_MODULE_ONLINE,
+    VALIDATOR_MODULE_SHINE,
+    VALIDATOR_MODULE_DRS,
+};
+
+enum EValidatorFlags
+{
+    VALIDATOR_FLAG_FILE             = 0x0001, // Indicate that required file was not found or file was invalid.
+    VALIDATOR_FLAG_TEXTURE          = 0x0002, // Problem with texture.
+    VALIDATOR_FLAG_SCRIPT           = 0x0004, // Problem with script.
+    VALIDATOR_FLAG_AUDIO            = 0x0008, // Problem with audio.
+    VALIDATOR_FLAG_AI               = 0x0010, // Problem with AI.
+    VALIDATOR_FLAG_LOG_ASSET_SCOPE  = 0x0020, // Log asset scope with the warning.
+    VALIDATOR_FLAG_IGNORE_IN_EDITOR = 0x0040, // Do not log this with the editor
+    VALIDATOR_FLAG_SKIP_VALIDATOR   = 0x0080, // Do not call validator's Report()
+};
+
+struct SValidatorRecord
+{
+    //! Severity of this error.
+    EValidatorSeverity severity;
+    //! In which module error occured.
+    EValidatorModule module;
+    //! Error Text.
+    const char* text;
+    //! File which is missing or causing problem.
+    const char* file;
+    //! Additional description for this error.
+    const char* description;
+    //! Asset scope sring
+    const char* assetScope;
+    //! Flags that suggest kind of error.
+    int flags;
+
+    //////////////////////////////////////////////////////////////////////////
+    SValidatorRecord()
+    {
+        module = VALIDATOR_MODULE_UNKNOWN;
+        text = NULL;
+        file = NULL;
+        assetScope = NULL;
+        description = NULL;
+        severity = VALIDATOR_WARNING;
+        flags = 0;
+    }
+};
+
+/*! This interface will be given to Validate methods of engine, for resources and objects validation.
+ */
+struct IValidator
+{
+    // <interfuscator:shuffle>
+    virtual ~IValidator(){}
+    virtual void Report(SValidatorRecord& record) = 0;
+    // </interfuscator:shuffle>
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_IVALIDATOR_H
diff --git a/Code/Legacy/CryCommon/IViewSystem.h b/Code/Legacy/CryCommon/IViewSystem.h
new file mode 100644
index 0000000000..716ea29f19
--- /dev/null
+++ b/Code/Legacy/CryCommon/IViewSystem.h
@@ -0,0 +1,305 @@
+/*
+ * 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.
+
+
+#ifndef CRYINCLUDE_CRYACTION_IVIEWSYSTEM_H
+#define CRYINCLUDE_CRYACTION_IVIEWSYSTEM_H
+#pragma once
+
+#include <ISerialize.h>
+#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 Serialize(TSerialize ser) = 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;
+    virtual void UpdateAudioListener(const Matrix34& rMatrix) = 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 Serialize(TSerialize ser) = 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 UpdateSoundListeners() = 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;
+};
+
+#endif // CRYINCLUDE_CRYACTION_IVIEWSYSTEM_H
diff --git a/Code/Legacy/CryCommon/IWindowMessageHandler.h b/Code/Legacy/CryCommon/IWindowMessageHandler.h
new file mode 100644
index 0000000000..afbc064db4
--- /dev/null
+++ b/Code/Legacy/CryCommon/IWindowMessageHandler.h
@@ -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
+ *
+ */
+
+
+#ifndef _CRY_WINDOW_MESSAGE_HANDLER_H_
+#define _CRY_WINDOW_MESSAGE_HANDLER_H_
+#include "platform.h"
+#if defined(WIN32)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
+// Summary:
+//      Window message handler for Windows OS
+struct IWindowMessageHandler
+{
+    // Summary:
+    //      The low-level pre-process message handler for Windows
+    //      This is called before TranslateMessage/DispatchMessage (which will eventually end up in the HandleMessage handler)
+    //      Typically, do not implement this function.
+    virtual void PreprocessMessage([[maybe_unused]] HWND hWnd, [[maybe_unused]] UINT uMsg, [[maybe_unused]] WPARAM wParam, [[maybe_unused]] LPARAM lParam) {}
+
+    // Summary:
+    //      The low-level window message handler for Windows
+    //      The return value specifies if the implementation wants to modify the message handling result
+    //      When returning true, the desired result value should be written through the pResult pointer
+    //      When returning false, the value stored through pResult (if any) is ignored
+    //      If more than one implementation write different results, the behavior is undefined
+    //      If none of the implementations write any result, the default OS result will be used instead
+    //      In general, return false if the handler doesn't care about the message, or only uses it for informational purposes
+    virtual bool HandleMessage([[maybe_unused]] HWND hWnd, [[maybe_unused]] UINT uMsg, [[maybe_unused]] WPARAM wParam, [[maybe_unused]] LPARAM lParam, [[maybe_unused]] LRESULT* pResult) { return false; }
+};
+#else
+// Summary:
+//      Dummy window message handler
+//      This is used for platforms that don't use window message handlers
+struct IWindowMessageHandler
+{
+};
+#endif
+#endif
diff --git a/Code/Legacy/CryCommon/IXml.h b/Code/Legacy/CryCommon/IXml.h
new file mode 100644
index 0000000000..9dda8077f9
--- /dev/null
+++ b/Code/Legacy/CryCommon/IXml.h
@@ -0,0 +1,950 @@
+/*
+ * 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_IXML_H
+#define CRYINCLUDE_CRYCOMMON_IXML_H
+#pragma once
+
+#include <platform.h>
+#include <Cry_Math.h>
+#include <AzCore/IO/FileIO.h>
+
+class ICrySizer;
+
+template <class T>
+struct Color_tpl;
+typedef Color_tpl<uint8> ColorB;
+
+template <typename F>
+struct Vec2_tpl;
+typedef Vec2_tpl<f32>   Vec2;
+typedef Vec2_tpl<f64>  Vec2d;
+
+template <typename F>
+struct Vec3_tpl;
+typedef Vec3_tpl<f32>   Vec3;
+typedef Vec3_tpl<f64>  Vec3d;
+
+template <typename F>
+struct Vec4_tpl;
+typedef Vec4_tpl<f32>   Vec4;
+typedef Vec4_tpl<f64>  Vec4d;
+
+template <typename F>
+struct Quat_tpl;
+typedef Quat_tpl<f32>  Quat;
+
+template <typename F>
+struct Ang3_tpl;
+typedef Ang3_tpl<f32>       Ang3;
+
+
+#if defined(QT_VERSION)
+#include <QColor>
+#include <QString>
+#elif defined(_AFX)
+#include "Util/GuidUtil.h"
+#endif
+
+#include <AzCore/Math/Guid.h>
+#include <AzCore/Math/Uuid.h>
+
+class QColor;
+class QString;
+
+class IXMLBinarySerializer;
+struct IReadWriteXMLSink;
+struct ISerialize;
+
+/*
+This is wrapper around expat library to provide DOM type of access for xml.
+Do not use IXmlNode class directly instead always use XmlNodeRef wrapper that
+takes care of memory management issues.
+
+Usage Example:
+-------------------------------------------------------
+void testXml(bool bReuseStrings)
+{
+    XmlParser xml(bReuseStrings);
+    XmlNodeRef root = xml.ParseFile("test.xml", true);
+
+    if (root)
+    {
+        for (int i = 0; i < root->getChildCount(); ++i)
+        {
+            XmlNodeRef child = root->getChild(i);
+            if (child->isTag("world"))
+            {
+                if (child->getAttr("name") == "blah")
+                {
+                    ....
+                }
+            }
+        }
+    }
+}
+*/
+
+// Summary:
+//   Special string wrapper for xml nodes.
+class XmlString
+    : public string
+{
+public:
+    XmlString() {};
+    XmlString(const char* str)
+        : string(str) {};
+
+    operator const char*() const {
+        return c_str();
+    }
+};
+
+// Summary:
+//   XML string data.
+struct IXmlStringData
+{
+    // <interfuscator:shuffle>
+    virtual ~IXmlStringData(){}
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+    virtual const char* GetString() = 0;
+    virtual size_t      GetStringLength() = 0;
+    // </interfuscator:shuffle>
+};
+
+class IXmlNode;
+
+// Summary:
+//   XmlNodeRef, wrapper class implementing reference counting for IXmlNode.
+// See also:
+//   IXmlNode
+class XmlNodeRef
+{
+private:
+    IXmlNode* p;
+public:
+    XmlNodeRef()
+        : p(NULL) {}
+    XmlNodeRef(IXmlNode* p_);
+    XmlNodeRef(const XmlNodeRef& p_);
+
+    ~XmlNodeRef();
+
+    operator IXmlNode*() const {
+        return p;
+    }
+
+    IXmlNode& operator*() const { return *p; }
+    IXmlNode* operator->(void) const { return p; }
+
+    XmlNodeRef&  operator=(IXmlNode* newp);
+    XmlNodeRef&  operator=(const XmlNodeRef& newp);
+
+#if !defined(RESOURCE_COMPILER)
+    template<typename Sizer >
+    void GetMemoryUsage(Sizer* pSizer) const
+    {
+        pSizer->AddObject(p);
+    }
+#endif
+
+    //Support for range based for, and stl algorithms.
+    class XmlNodeRefIterator begin();
+    class XmlNodeRefIterator end();
+};
+
+// Summary:
+//   IXmlNode class
+// Notes:
+//   Never use IXmlNode directly instead use reference counted XmlNodeRef.
+// See also:
+//   XmlNodeRef
+class IXmlNode
+{
+protected:
+    int m_nRefCount;
+
+protected:
+    // <interfuscator:shuffle>
+    virtual void DeleteThis() = 0;
+    virtual ~IXmlNode() {};
+    // </interfuscator:shuffle>
+
+public:
+
+    // <interfuscator:shuffle>
+    // Summary:
+    //   Creates new XML node.
+    virtual XmlNodeRef createNode(const char* tag) = 0;
+
+    // Notes:
+    // AddRef/Release need to be virtual to permit overloading from CXMLNodePool
+
+    // Summary:
+    //   Reference counting.
+    virtual void AddRef() { m_nRefCount++; };
+    // Notes:
+    //   When ref count reach zero XML node dies.
+    virtual void Release()
+    {
+        if (--m_nRefCount <= 0)
+        {
+            DeleteThis();
+        }
+    };
+    virtual int GetRefCount() const { return m_nRefCount; };
+
+    // Summary:
+    //   Gets XML node tag.
+    virtual const char* getTag() const = 0;
+    // Summary:
+    //   Sets XML node tag.
+    virtual void    setTag(const char* tag) = 0;
+
+    // Summary:
+    //   Returns true if a given tag equal to node tag.
+    virtual bool isTag(const char* tag) const = 0;
+
+    // Summary:
+    //   Gets XML Node attributes.
+    virtual int getNumAttributes() const = 0;
+    // Summary:
+    //   Returns attribute key and value by attribute index.
+    virtual bool getAttributeByIndex(int index, const char** key, const char** value) = 0;
+
+    // Summary:
+    //   Copies attributes to this node from a given node.
+    virtual void copyAttributes(XmlNodeRef fromNode) = 0;
+
+    // Summary:
+    //   Gets XML Node attribute for specified key.
+    // Return Value:
+    //   The value of the attribute if it exists, otherwise an empty string.
+    virtual const char* getAttr(const char* key) const = 0;
+
+    // Summary:
+    //  Gets XML Node attribute for specified key.
+    // Return Value:
+    //  True if the attribute exists, false otherwise.
+    virtual bool getAttr(const char* key, const char** value) const = 0;
+
+    // Summary:
+    //  Checks if attributes with specified key exist.
+    virtual bool haveAttr(const char* key) const = 0;
+
+    // Summary:
+    //   Adds new child node.
+    virtual void addChild(const XmlNodeRef& node) = 0;
+
+    // Summary:
+    //   Creates new xml node and add it to childs list.
+    virtual XmlNodeRef newChild(const char* tagName) = 0;
+
+    // Summary:
+    //   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;
+
+    // Summary:
+    //   Gets number of child XML nodes.
+    virtual int getChildCount() const = 0;
+
+    // Summary:
+    //   Gets XML Node child nodes.
+    virtual XmlNodeRef getChild(int i) const = 0;
+
+    // Summary:
+    //   Finds node with specified tag.
+    virtual XmlNodeRef findChild(const char* tag) const = 0;
+
+    // Summary:
+    //   Gets parent XML node.
+    virtual XmlNodeRef getParent() const = 0;
+
+    // Summary:
+    //   Sets parent XML node.
+    virtual void setParent(const XmlNodeRef& inRef) = 0;
+
+    // Summary:
+    //   Returns content of this node.
+    virtual const char* getContent() const = 0;
+    // Summary:
+    //   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;
+
+    // Summary:
+    //   Returns XML of this node and sub nodes.
+    // Notes:
+    //   IXmlStringData pointer must be release when string is not needed anymore.
+    // See also:
+    //   IXmlStringData
+    virtual IXmlStringData* getXMLData(int nReserveMem = 0) const = 0;
+    // Summary:
+    //   Returns XML of this node and sub nodes.
+    virtual XmlString getXML(int level = 0) const = 0;
+    virtual bool saveToFile(const char* fileName) = 0;
+
+    // Summary:
+    //   Sets new XML Node attribute (or override attribute with same key).
+    //##@{
+    virtual void setAttr(const char* key, const char* value) = 0;
+    virtual void setAttr(const char* key, int value) = 0;
+    virtual void setAttr(const char* key, unsigned int value) = 0;
+    virtual void setAttr(const char* key, int64 value) = 0;
+    virtual void setAttr(const char* key, uint64 value, bool useHexFormat = true) = 0;
+    virtual void setAttr(const char* key, float value) = 0;
+    virtual void setAttr(const char* key, double value) = 0;
+    virtual void setAttr(const char* key, const Vec2& value) = 0;
+    virtual void setAttr(const char* key, const Vec2d& value) = 0;
+    virtual void setAttr(const char* key, const Ang3& value) = 0;
+    virtual void setAttr(const char* key, const Vec3& value) = 0;
+    virtual void setAttr(const char* key, const Vec4& value) = 0;
+    virtual void setAttr(const char* key, const Vec3d& value) = 0;
+    virtual void setAttr(const char* key, const Quat& value) = 0;
+#if defined(LINUX64) || defined(APPLE)
+    // Compatibility functions, on Linux and Mac long int is the default int64_t
+    ILINE void setAttr(const char* key, unsigned long int value, bool useHexFormat = true)
+    {
+        setAttr(key, (uint64)value, useHexFormat);
+    }
+
+    ILINE void setAttr(const char* key, long int value)
+    {
+        setAttr(key, (int64)value);
+    }
+#endif
+
+    virtual void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const QColor& color)
+    {
+#if defined(QT_VERSION)
+        setAttr(key, static_cast<unsigned long>(color.red() | (color.green() << 8) | (color.blue() << 16)));
+#endif
+    }
+    //##@}
+
+    // Summary:
+    //   Inline Helpers.
+    //##@{
+    //##@}
+
+    // Summary:
+    //   Deletes attribute.
+    virtual void delAttr(const char* key) = 0;
+    // Summary:
+    //   Removes all node attributes.
+    virtual void removeAllAttributes() = 0;
+
+    // Summary:
+    //   Gets attribute value of node.
+    //##@{
+    virtual bool getAttr(const char* key, int& value) const = 0;
+    virtual bool getAttr(const char* key, unsigned int& value) const = 0;
+    virtual bool getAttr(const char* key, int64& value) const = 0;
+    virtual bool getAttr(const char* key, uint64& value, bool useHexFormat = true) const = 0;
+    virtual bool getAttr(const char* key, float& value) const = 0;
+    virtual bool getAttr(const char* key, double& value) const = 0;
+    virtual bool getAttr(const char* key, Vec2& value) const = 0;
+    virtual bool getAttr(const char* key, Vec2d& value) const = 0;
+    virtual bool getAttr(const char* key, Ang3& value) const = 0;
+    virtual bool getAttr(const char* key, Vec3& value) const = 0;
+    virtual bool getAttr(const char* key, Vec4& value) const = 0;
+    virtual bool getAttr(const char* key, Vec3d& value) const = 0;
+    virtual bool getAttr(const char* key, Quat& value) const = 0;
+    virtual bool getAttr(const char* key, bool& value) const = 0;
+    virtual bool getAttr(const char* key, XmlString& value) const = 0;
+    virtual bool getAttr(const char* key, ColorB& value) const = 0;
+
+#if defined(LINUX64) || defined(APPLE)
+    // Compatibility functions, on Linux and Mac long int is the default int64_t
+    ILINE bool getAttr(const char* key, unsigned long int& value, bool useHexFormat = true) const
+    {
+        return getAttr(key, (uint64&)value, useHexFormat);
+    }
+
+    ILINE bool getAttr(const char* key, long int& value) const
+    {
+        return getAttr(key, (int64&)value);
+    }
+#endif
+
+    // </interfuscator:shuffle>
+
+#if !defined(RESOURCE_COMPILER)
+    // <interfuscator:shuffle>
+    // Summary:
+    //   Collect all allocated memory
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+
+    // 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;
+    // </interfuscator:shuffle>
+#endif
+
+    //##@}
+
+    // Summary:
+    //   Inline Helpers.
+    //##@{
+#if !defined(LINUX64) && !defined(APPLE)
+    bool getAttr(const char* key, long& value) const
+    {
+        int v;
+        if (getAttr(key, v))
+        {
+            value = static_cast<long>(v);
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    bool getAttr(const char* key, unsigned long& value) const
+    {
+        int v;
+        if (getAttr(key, v))
+        {
+            value = static_cast<unsigned long>(v);
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    void setAttr(const char* key, unsigned long value) { setAttr(key, (unsigned int)value); };
+    void setAttr(const char* key, long value) { setAttr(key, (int)value); };
+#endif
+    bool getAttr(const char* key, unsigned short& value) const
+    {
+        int v;
+        if (getAttr(key, v))
+        {
+            value = static_cast<unsigned short>(v);
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    bool getAttr(const char* key, unsigned char& value) const
+    {
+        int v;
+        if (getAttr(key, v))
+        {
+            value = static_cast<unsigned char>(v);
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    bool getAttr(const char* key, short& value) const
+    {
+        int v;
+        if (getAttr(key, v))
+        {
+            value = static_cast<short>(v);
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    bool getAttr(const char* key, char& value) const
+    {
+        int v;
+        if (getAttr(key, v))
+        {
+            value = static_cast<char>(v);
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    //##@}
+
+    // Summary:
+    //   Gets QString attribute.
+    bool getAttr([[maybe_unused]] const char* key, [[maybe_unused]] QString& value) const
+    {
+#if defined(QT_VERSION)
+        if (!haveAttr(key))
+        {
+            return false;
+        }
+        value = getAttr(key);
+        return true;
+#else
+        return false;
+#endif
+    }
+
+    bool getAttr([[maybe_unused]] const char* key, [[maybe_unused]] QColor& color) const
+    {
+#if defined(QT_VERSION)
+        if (!haveAttr(key))
+        {
+            return false;
+        }
+        int v;
+        getAttr(key, v);
+        color = QColor(v & 0xff, (v >> 8) & 0xff, (v >> 16) & 0xff);
+        return true;
+#else
+        return false;
+#endif
+    }
+
+#if defined(QT_VERSION)
+    // Summary:
+    //   Sets GUID attribute.
+    void setAttr(const char* key, const GUID& value)
+    {
+        AZ::Uuid uuid;
+        uuid = value;
+        setAttr(key, uuid.ToString<AZStd::string>().c_str());
+    };
+
+    // Summary:
+    //   Gets GUID from attribute.
+    bool getAttr(const char* key, GUID& value) const
+    {
+        if (!haveAttr(key))
+        {
+            return false;
+        }
+        const char* guidStr = getAttr(key);
+        value = AZ::Uuid(guidStr);
+        if (value.Data1 == 0)
+        {
+            memset(&value, 0, sizeof(value));
+            // If bad GUID, use old guid system.
+            value.Data1 = atoi(guidStr);
+        }
+        return true;
+    }
+#elif defined(_AFX)
+    // Summary:
+    //   Sets GUID attribute.
+    void setAttr(const char* key, REFGUID value)
+    {
+        const char* str = GuidUtil::ToString(value);
+        setAttr(key, str);
+    };
+
+    // Summary:
+    //   Gets GUID from attribute.
+    bool getAttr(const char* key, GUID& value) const
+    {
+        if (!haveAttr(key))
+        {
+            return false;
+        }
+        const char* guidStr = getAttr(key);
+        value = GuidUtil::FromString(guidStr);
+        if (value.Data1 == 0)
+        {
+            memset(&value, 0, sizeof(value));
+            // If bad GUID, use old guid system.
+            value.Data1 = atoi(guidStr);
+        }
+        return true;
+    }
+#endif
+
+    // Summary:
+    //   Lets be friendly to him.
+    friend class XmlNodeRef;
+};
+
+/*
+// Summary:
+//   Inline Implementation of XmlNodeRef
+inline XmlNodeRef::XmlNodeRef(const char *tag, IXmlNode *node)
+{
+    if (node)
+    {
+        p = node->createNode(tag);
+    }
+    else
+    {
+        p = new XmlNode(tag);
+    }
+    p->AddRef();
+}
+*/
+
+//////////////////////////////////////////////////////////////////////////
+inline XmlNodeRef::XmlNodeRef(IXmlNode* p_)
+    : p(p_)
+{
+    if (p)
+    {
+        p->AddRef();
+    }
+}
+
+inline XmlNodeRef::XmlNodeRef(const XmlNodeRef& p_)
+    : p(p_.p)
+{
+    if (p)
+    {
+        p->AddRef();
+    }
+}
+
+inline XmlNodeRef::~XmlNodeRef()
+{
+    if (p)
+    {
+        p->Release();
+    }
+}
+
+inline XmlNodeRef&  XmlNodeRef::operator=(IXmlNode* newp)
+{
+    if (newp)
+    {
+        newp->AddRef();
+    }
+    if (p)
+    {
+        p->Release();
+    }
+    p = newp;
+    return *this;
+}
+
+inline XmlNodeRef&  XmlNodeRef::operator=(const XmlNodeRef& newp)
+{
+    if (newp.p)
+    {
+        newp.p->AddRef();
+    }
+    if (p)
+    {
+        p->Release();
+    }
+    p = newp.p;
+    return *this;
+}
+
+
+//XmlNodeRef can be treated as a container. Iterating through it, iterates through its children
+class XmlNodeRefIterator
+{
+public:
+    XmlNodeRefIterator()
+        : m_index(0)
+    {
+    }
+    XmlNodeRefIterator(XmlNodeRef& parentNode, std::size_t index)
+        : m_parentNode(parentNode)
+        , m_index(index)
+    {
+        Update();
+    }
+
+    XmlNodeRefIterator& operator=(const XmlNodeRefIterator& other) = default;
+
+    XmlNodeRefIterator& operator++() 
+    {
+        ++m_index;
+        Update();
+        return *this;
+    }
+    XmlNodeRefIterator operator++(int)
+    {
+        XmlNodeRefIterator ret = *this;
+        ++m_index;
+        Update();
+        return ret;
+    }
+
+    IXmlNode* operator*() const 
+    {
+        return m_currentChildNode;
+    }
+
+    XmlNodeRefIterator& operator--()
+    {
+        --m_index;
+        Update();
+        return *this;
+    }
+
+    XmlNodeRefIterator operator--(int)
+    {
+        XmlNodeRefIterator ret = *this;
+        --m_index;
+        Update();
+        return ret;
+    }
+
+    bool operator!=(const XmlNodeRefIterator& rhs) {
+        return m_index != rhs.m_index;
+    }
+
+private:
+    friend void swap(XmlNodeRefIterator& lhs, XmlNodeRefIterator& rhs);
+    friend bool operator==(const XmlNodeRefIterator& lhs, const XmlNodeRefIterator& rhs);
+    friend bool operator!=(const XmlNodeRefIterator& lhs, const XmlNodeRefIterator& rhs);
+
+    void Update()
+    {
+        if (m_index >= 0 && m_index < m_parentNode->getChildCount())
+        {
+            m_currentChildNode = m_parentNode->getChild(static_cast<int>(m_index));
+        }
+    }
+
+    XmlNodeRef m_parentNode;
+    XmlNodeRef m_currentChildNode;
+    std::size_t m_index; //default to first child, if no children then this will equal size which is what we use for the end iterator
+};
+
+inline void swap(XmlNodeRefIterator& lhs, XmlNodeRefIterator& rhs)
+{
+    AZStd::swap(lhs.m_parentNode, rhs.m_parentNode);
+    AZStd::swap(lhs.m_currentChildNode, rhs.m_currentChildNode);
+    AZStd::swap(lhs.m_index, rhs.m_index);
+}
+
+inline bool operator==(const XmlNodeRefIterator& lhs, const XmlNodeRefIterator& rhs)
+{
+    return lhs.m_index == rhs.m_index;
+}
+
+inline bool operator!=(const XmlNodeRefIterator& lhs, const XmlNodeRefIterator& rhs)
+{
+    return lhs.m_index != rhs.m_index;
+}
+
+inline XmlNodeRefIterator XmlNodeRef::begin()
+{
+    return XmlNodeRefIterator(*this, 0);
+}
+
+inline XmlNodeRefIterator XmlNodeRef::end()
+{
+    return XmlNodeRefIterator(*this, (*this)->getChildCount());
+}
+
+//////////////////////////////////////////////////////////////////////////
+struct IXmlSerializer
+{
+    // <interfuscator:shuffle>
+    virtual ~IXmlSerializer(){}
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+
+    virtual ISerialize* GetWriter(XmlNodeRef& node) = 0;
+    virtual ISerialize* GetReader(XmlNodeRef& node) = 0;
+    // </interfuscator:shuffle>
+#if !defined(RESOURCE_COMPILER)
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+#endif
+};
+
+#if !defined(RESOURCE_COMPILER)
+//////////////////////////////////////////////////////////////////////////
+// Summary:
+//   XML Parser interface.
+struct IXmlParser
+{
+    // <interfuscator:shuffle>
+    virtual ~IXmlParser(){}
+    virtual void AddRef() = 0;
+    virtual void Release() = 0;
+
+    // Summary:
+    //   Parses xml file.
+    virtual XmlNodeRef ParseFile(const char* filename, bool bCleanPools) = 0;
+
+    // Summary:
+    //   Parses xml from memory buffer.
+    virtual XmlNodeRef ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings = false) = 0;
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+    // </interfuscator:shuffle>
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Summary:
+//   XML Table Reader interface.
+//
+//   Can be used to read tables exported from Excel in .xml format. Supports
+//   reading CryEngine's version of those Excel .xml tables (produced by RC).
+//
+// Usage:
+//   p->Begin(rootNode);
+//   while (p->ReadRow(...))
+//   {
+//     while (p->ReadCell(...))
+//     {
+//       ...
+//     }
+//   }
+struct IXmlTableReader
+{
+    // <interfuscator:shuffle>
+    virtual ~IXmlTableReader(){}
+
+    virtual void Release() = 0;
+
+    // Returns false if XML tree is not in supported table format.
+    virtual bool Begin(XmlNodeRef rootNode) = 0;
+
+    // Returns estimated number of rows (estimated number of ReadRow() calls returning true).
+    // Returned number is equal *or greater* than real number, because it's impossible to
+    // know real number in advance in case of Excel XML.
+    virtual int GetEstimatedRowCount() = 0;
+
+    // Prepares next row for reading by ReadCell().
+    // Returns true and sets rowIndex if the row was prepared successfully.
+    // Note: empty rows are skipped sometimes, so use returned rowIndex if you need
+    // to know absolute row index.
+    // Returns false if no rows left.
+    virtual bool ReadRow(int& rowIndex) = 0;
+
+    // Reads next cell in the current row.
+    // Returns true and sets columnIndex, pContent, contenSize if the cell was read successfully.
+    // Note: empty cells are skipped sometimes, so use returned cellIndex if you need
+    // to know absolute cell index (i.e. column).
+    // Returns false if no cells left in the row.
+    virtual bool ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize) = 0;
+    virtual float GetCurrentRowHeight() = 0;
+    // </interfuscator:shuffle>
+};
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// Summary:
+//   IXmlUtils structure.
+struct IXmlUtils
+{
+    // <interfuscator:shuffle>
+    virtual ~IXmlUtils(){}
+
+    // Summary:
+    //   Loads xml file, returns 0 if load failed.
+    virtual XmlNodeRef LoadXmlFromFile(const char* sFilename, bool bReuseStrings = false, bool bEnablePatching = true) = 0;
+    // Summary:
+    //   Loads xml from memory buffer, returns 0 if load failed.
+    virtual XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings = false, bool bSuppressWarnings = false) = 0;
+
+    // Summary:
+    //   Creates an MD5 hash of an XML file
+    virtual const char* HashXml(XmlNodeRef node) = 0;
+
+    // Summary:
+    //   Gets an object that can read a xml into a IReadXMLSink
+    //   and writes a xml from a IWriteXMLSource
+    virtual IReadWriteXMLSink* GetIReadWriteXMLSink() = 0;
+
+    // Summary:
+    //   Creates XML Writer for ISerialize interface.
+    // See also:
+    //   IXmlSerializer
+    virtual IXmlSerializer* CreateXmlSerializer() = 0;
+    // </interfuscator:shuffle>
+
+#if !defined(RESOURCE_COMPILER)
+    // <interfuscator:shuffle>
+    // Summary:
+    //   Creates XML Parser.
+    // Notes:
+    //   WARNING!!!
+    //   IXmlParser does not normally support recursive XML loading, all nodes loaded by this parser are invalidated on loading new file.
+    //   This is a specialized interface for fast loading of many XMLs,
+    //   After use it must be released with call to Release method.
+    virtual IXmlParser* CreateXmlParser() = 0;
+
+    // Summary:
+    //   Creates XML to file in the binary form.
+    virtual bool SaveBinaryXmlFile(const char* sFilename, XmlNodeRef root) = 0;
+    // Summary:
+    //   Reads XML data from file in the binary form.
+    virtual XmlNodeRef LoadBinaryXmlFile(const char* sFilename, bool bEnablePatching = true) = 0;
+
+    // Summary:
+    //   Enables or disables checking for binary xml files.
+    // Return Value:
+    //   The previous status.
+    virtual bool EnableBinaryXmlLoading(bool bEnable) = 0;
+
+    // Summary:
+    //   Creates XML Table reader.
+    // Notes:
+    //   After use it must be released with call to Release method.
+    virtual IXmlTableReader* CreateXmlTableReader() = 0;
+
+    // Init xml stats nodes pool
+    virtual void InitStatsXmlNodePool(uint32 nPoolSize) = 0;
+
+    // Creates new xml node for statistics.
+    virtual XmlNodeRef CreateStatsXmlNode(const char* sNodeName) = 0;
+    // Set owner thread
+    virtual void SetStatsOwnerThread(threadID threadId) = 0;
+
+    // Free memory held on to by xml pool if empty
+    virtual void FlushStatsXmlNodePool() = 0;
+
+    // Sets the patch which is used to transform loaded XML files. the patch itself is encoded into XML
+    // Set to NULL to clear an existing transform and disable further patching
+    virtual void SetXMLPatcher(XmlNodeRef* pPatcher) = 0;
+    // </interfuscator:shuffle>
+#endif
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_IXML_H
diff --git a/Code/Legacy/CryCommon/LCGRandom.h b/Code/Legacy/CryCommon/LCGRandom.h
new file mode 100644
index 0000000000..43cee149d3
--- /dev/null
+++ b/Code/Legacy/CryCommon/LCGRandom.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_LCGRANDOM_H
+#define CRYINCLUDE_CRYCOMMON_LCGRANDOM_H
+#pragma once
+
+#include "BaseTypes.h"  // uint32, uint64
+#include "CryRandomInternal.h"  // CryRandom_Internal::BoundedRandom
+
+
+// A simple Linear Congruential Generator (LCG) of pseudo-randomized numbers.
+// NOTE: It should *not* be used for any encryption methods.
+//
+// We use Microsoft Visual/Quick C/C++ generator's settings (mul 214013, add 2531011)
+// (see http://en.wikipedia.org/wiki/Linear_congruential_generator), but our generator
+// returns results that are different from Microsoft's:
+// Microsoft's version returns 15-bit values (bits 30..16 of the 32-bit state),
+// our version returns 32-bit values (bits 47..16 of the 64-bit state).
+
+class CRndGen
+{
+public:
+    CRndGen()
+    {
+        Seed(5489UL);
+    }
+
+    CRndGen(uint32 seed)
+    {
+        Seed(seed);
+    }
+
+    // Initializes the generator using an unsigned 32-bit number.
+    void Seed(uint32 seed)
+    {
+        m_state = (uint64)seed;
+    }
+
+    // Generates a random number in the closed interval [0; max uint32].
+    uint32 GenerateUint32()
+    {
+        m_state = ((uint64)214013) * m_state + ((uint64)2531011);
+        return (uint32)(m_state >> 16);
+    }
+
+    // Generates a random number in the closed interval [0; max uint64].
+    uint64 GenerateUint64()
+    {
+        const uint32 a = GenerateUint32();
+        const uint32 b = GenerateUint32();
+        return ((uint64)b << 32) | (uint64)a;
+    }
+
+    // Generates a random number in the closed interval [0.0f; 1.0f].
+    float GenerateFloat()
+    {
+        return (float)GenerateUint32() * (1.0f / 4294967295.0f);
+    }
+
+    // Ranged function returns random value within the *inclusive* range
+    // between minValue and maxValue.
+    // Any orderings work correctly: minValue <= maxValue and
+    // minValue >= minValue.
+    template <class T>
+    T GetRandom(const T minValue, const T maxValue)
+    {
+        return CryRandom_Internal::BoundedRandom<CRndGen, T>::Get(*this, minValue, maxValue);
+    }
+
+    // Vector (Vec2, Vec3, Vec4) ranged function returns vector with
+    // every component within the *inclusive* ranges between minValue.component
+    // and maxValue.component.
+    // All orderings work correctly: minValue.component <= maxValue.component and
+    // minValue.component >= maxValue.component.
+    template <class T>
+    T GetRandomComponentwise(const T& minValue, const T& maxValue)
+    {
+        return CryRandom_Internal::BoundedRandomComponentwise<CRndGen, T>::Get(*this, minValue, maxValue);
+    }
+
+    // The function returns a random unit vector (Vec2, Vec3, Vec4).
+    template <class T>
+    T GetRandomUnitVector()
+    {
+        return CryRandom_Internal::GetRandomUnitVector<CRndGen, T>(*this);
+    }
+
+private:
+    uint64 m_state;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_LCGRANDOM_H
diff --git a/Code/Legacy/CryCommon/LegacyAllocator.h b/Code/Legacy/CryCommon/LegacyAllocator.h
new file mode 100644
index 0000000000..90e278197a
--- /dev/null
+++ b/Code/Legacy/CryCommon/LegacyAllocator.h
@@ -0,0 +1,188 @@
+/*
+ * 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/AllocatorBase.h>
+#include <AzCore/Memory/HphaSchema.h>
+
+#define AZCORE_SYS_ALLOCATOR_HPPA
+//#define AZCORE_SYS_ALLOCATOR_MALLOC
+
+#ifdef AZCORE_SYS_ALLOCATOR_HPPA
+#   include <AzCore/Memory/HphaSchema.h>
+#elif defined(AZCORE_SYS_ALLOCATOR_MALLOC)
+#   include <AzCore/Memory/MallocSchema.h>
+#else
+#   include <AzCore/Memory/HeapSchema.h>
+#endif
+
+namespace AZ
+{
+
+#ifdef AZCORE_SYS_ALLOCATOR_HPPA
+    typedef AZ::HphaSchema LegacyAllocatorSchema;
+#elif defined(AZCORE_SYS_ALLOCATOR_MALLOC)
+    typedef AZ::MallocSchema LegacyAllocatorSchema;
+#else
+    typedef AZ::HeapSchema LegacyAllocatorSchema;
+#endif
+
+    struct LegacyAllocatorDescriptor
+        : public LegacyAllocatorSchema::Descriptor
+    {
+        LegacyAllocatorDescriptor()
+        {
+            // pull 32MB from the OS at a time
+#ifdef AZCORE_SYS_ALLOCATOR_HPPA
+            m_systemChunkSize = 32 * 1024 * 1024;
+#endif
+        }
+    };
+
+    class LegacyAllocator
+        : public SimpleSchemaAllocator<AZ::HphaSchema, LegacyAllocatorDescriptor>
+    {
+    public:
+        AZ_TYPE_INFO(LegacyAllocator, "{17FC25A4-92D9-48C5-BB85-7F860FCA2C6F}");
+
+        using Descriptor = LegacyAllocatorDescriptor;
+        using Base = SimpleSchemaAllocator<AZ::HphaSchema, LegacyAllocatorDescriptor>;
+        
+        LegacyAllocator()
+            : Base("LegacyAllocator", "Allocator for Legacy CryEngine systems")
+        {
+        }
+
+        pointer_type Allocate(size_type byteSize, size_type alignment, int flags = 0, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override
+        {
+            if (alignment == 0)
+            {
+                // Some STL containers, like std::vector, are assuming a specific minimum alignment. seems to have a requirement
+                // Take a look at _Allocate_manually_vector_aligned in xmemory0
+                alignment = sizeof(void*) * 2; 
+            }
+
+            pointer_type ptr = m_schema->Allocate(byteSize, alignment, flags, name, fileName, lineNum, suppressStackRecord);
+            AZ_PROFILE_MEMORY_ALLOC_EX(AZ::Debug::ProfileCategory::MemoryReserved, fileName, lineNum, ptr, byteSize, name ? name : GetName());
+            AZ_MEMORY_PROFILE(ProfileAllocation(ptr, byteSize, alignment, name, fileName, lineNum, suppressStackRecord));
+            AZ_Assert(ptr || byteSize == 0, "OOM - Failed to allocate %zu bytes from LegacyAllocator", byteSize);
+            return ptr;
+        }
+
+        // DeAllocate with file/line, to track when allocs were freed from Cry
+        void DeAllocate(pointer_type ptr, [[maybe_unused]] const char* file, [[maybe_unused]] const int line, size_type byteSize = 0, size_type alignment = 0)
+        {
+            AZ_PROFILE_MEMORY_FREE_EX(AZ::Debug::ProfileCategory::MemoryReserved, file, line, ptr);
+            AZ_MEMORY_PROFILE(ProfileDeallocation(ptr, byteSize, alignment, nullptr));
+            m_schema->DeAllocate(ptr, byteSize, alignment);
+        }
+
+        // Realloc with file/line, because Cry uses realloc(nullptr) and realloc(ptr, 0) to mimic malloc/free
+        pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment, [[maybe_unused]] const char* file, [[maybe_unused]] const int line)
+        {
+            if (newAlignment == 0)
+            {
+                // Some STL containers, like std::vector, are assuming a specific minimum alignment. seems to have a requirement
+                // Take a look at _Allocate_manually_vector_aligned in xmemory0
+                newAlignment = sizeof(void*) * 2;
+            }
+
+            AZ_MEMORY_PROFILE(ProfileReallocationBegin(ptr, newSize));
+            AZ_PROFILE_MEMORY_FREE_EX(AZ::Debug::ProfileCategory::MemoryReserved, file, line, ptr);
+            pointer_type newPtr = m_schema->ReAllocate(ptr, newSize, newAlignment);
+            AZ_PROFILE_MEMORY_ALLOC_EX(AZ::Debug::ProfileCategory::MemoryReserved, file, line, newPtr, newSize, "LegacyAllocator Realloc");
+            AZ_MEMORY_PROFILE(ProfileReallocationEnd(ptr, newPtr, newSize, newAlignment));
+            AZ_Assert(newPtr || newSize == 0, "OOM - Failed to reallocate %zu bytes from LegacyAllocator", newSize);
+            return newPtr;
+        }
+
+        void DeAllocate(pointer_type ptr, size_type byteSize = 0, size_type alignment = 0) override
+        {
+            AZ_MEMORY_PROFILE(ProfileDeallocation(ptr, 0, 0, nullptr));
+            Base::DeAllocate(ptr, byteSize, alignment);
+        }
+
+        pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override
+        {
+            if (newAlignment == 0)
+            {
+                // Some STL containers, like std::vector, are assuming a specific minimum alignment. seems to have a requirement
+                // Take a look at _Allocate_manually_vector_aligned in xmemory0
+                newAlignment = sizeof(void*) * 2;
+            }
+
+            AZ_MEMORY_PROFILE(ProfileReallocationBegin(ptr, newSize));
+            pointer_type newPtr = Base::ReAllocate(ptr, newSize, newAlignment);
+            AZ_MEMORY_PROFILE(ProfileReallocationEnd(ptr, newPtr, newSize, newAlignment));
+            AZ_Assert(newPtr || newSize == 0, "OOM - Failed to reallocate %zu bytes from LegacyAllocator", newSize);
+            return newPtr;
+        }
+    };
+
+    using StdLegacyAllocator = AZStdAlloc<LegacyAllocator>;
+
+    // Specialize for the LegacyAllocator to provide one per module that does not use the
+    // environment for its storage
+    template <>
+    class AllocatorInstance<LegacyAllocator> : public Internal::AllocatorInstanceBase<LegacyAllocator>
+    {
+    };
+
+#if defined(AZ_PLATFORM_PROVO) || defined(AZ_PLATFORM_JASPER)
+    struct GlobalAllocatorDescriptor
+        : public AZ::HphaSchema::Descriptor
+    {
+        GlobalAllocatorDescriptor()
+        {
+            // pull 1MB from the OS at a time
+            m_systemChunkSize = 1024 * 1024;
+        }
+    };
+
+    class GlobalAllocator
+        : public SimpleSchemaAllocator<AZ::HphaSchema, GlobalAllocatorDescriptor>
+    {
+    public:
+        AZ_TYPE_INFO(GlobalAllocator, "{BC7861DA-AF7F-4FFD-A2F5-BAD89BDD77FD}");
+
+        using Descriptor = GlobalAllocatorDescriptor;
+        using Base = SimpleSchemaAllocator<AZ::HphaSchema, GlobalAllocatorDescriptor>;
+        
+        GlobalAllocator()
+            : Base("GlobalAllocator", "Allocator for untracked new/delete/malloc/free")
+        {
+        }
+
+        //---------------------------------------------------------------------
+        // IAllocatorAllocate
+        //---------------------------------------------------------------------
+        pointer_type Allocate(size_type byteSize, size_type alignment, int flags = 0, const char* name = 0, const char* fileName = 0, int lineNum = 0, unsigned int suppressStackRecord = 0) override
+        {
+            // Note: We cannot put the asserts in the AllocateBase class because various allocators depend on allocations failing from some heap classes.
+            pointer_type ptr = Base::Allocate(byteSize, alignment, flags, name, fileName, lineNum, suppressStackRecord);
+            AZ_Assert(ptr, "OOM - Failed to allocate %zu bytes from GlobalAllocator", byteSize);
+            return ptr;
+        }
+
+        pointer_type ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment) override
+        {
+            pointer_type newPtr = Base::ReAllocate(ptr, newSize, newAlignment);
+            AZ_Assert(newPtr, "OOM - Failed to reallocate %zu bytes from GlobalAllocator", newSize);
+            return newPtr;
+        }
+
+    };
+
+    // Specialize for the GlobalAllocator to provide one per module that does not use the
+    // environment for its storage
+    template <>
+    class AllocatorInstance<GlobalAllocator> : public Internal::AllocatorInstanceBase<GlobalAllocator, AllocatorStorage::ModuleStoragePolicy<GlobalAllocator, false>>
+    {
+    };
+#endif
+}
diff --git a/Code/Legacy/CryCommon/Linux32Specific.h b/Code/Legacy/CryCommon/Linux32Specific.h
new file mode 100644
index 0000000000..08dde1de4b
--- /dev/null
+++ b/Code/Legacy/CryCommon/Linux32Specific.h
@@ -0,0 +1,109 @@
+/*
+ * 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 : Specific to Linux declarations, inline functions etc.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_LINUX32SPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_LINUX32SPECIFIC_H
+#pragma once
+
+
+#define _CPU_X86
+//#define _CPU_SSE
+
+#define DEBUG_BREAK raise(SIGTRAP)
+#define RC_EXECUTABLE "rc"
+#define USE_CRT 1
+#define SIZEOF_PTR 4
+
+//////////////////////////////////////////////////////////////////////////
+// Standard includes.
+//////////////////////////////////////////////////////////////////////////
+#include <malloc.h>
+//#include <winbase.h>
+#include <stdint.h>
+#include <sys/dir.h>
+#include <sys/io.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <ctype.h>
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Define platform independent types.
+//////////////////////////////////////////////////////////////////////////
+#include "BaseTypes.h"
+
+typedef signed long long  INT64;
+
+typedef double real;
+
+typedef unsigned long       DWORD;
+typedef unsigned long*      LPDWORD;
+typedef DWORD               DWORD_PTR;
+typedef int INT_PTR, * PINT_PTR;
+typedef unsigned int UINT_PTR, * PUINT_PTR;
+typedef char* LPSTR, * PSTR;
+
+typedef long LONG_PTR, * PLONG_PTR, * PLONG;
+typedef unsigned long ULONG_PTR, * PULONG_PTR;
+
+typedef unsigned char       BYTE;
+typedef unsigned short      WORD;
+typedef void*               HWND;
+typedef UINT_PTR            WPARAM;
+typedef LONG_PTR            LPARAM;
+typedef LONG_PTR            LRESULT;
+#define PLARGE_INTEGER LARGE_INTEGER *
+typedef const char* LPCSTR, * PCSTR;
+typedef long long           LONGLONG;
+typedef ULONG_PTR           SIZE_T;
+typedef unsigned char       byte;
+
+#define __int64     long long
+
+#define ILINE __forceinline
+
+#define _A_RDONLY (0x01)
+#define _A_SUBDIR (0x10)
+
+//////////////////////////////////////////////////////////////////////////
+// Win32 FileAttributes.
+//////////////////////////////////////////////////////////////////////////
+#define FILE_ATTRIBUTE_READONLY             0x00000001
+#define FILE_ATTRIBUTE_HIDDEN               0x00000002
+#define FILE_ATTRIBUTE_SYSTEM               0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
+#define FILE_ATTRIBUTE_DEVICE               0x00000040
+#define FILE_ATTRIBUTE_NORMAL               0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
+#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
+#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
+#define FILE_ATTRIBUTE_COMPRESSED           0x00000800
+#define FILE_ATTRIBUTE_OFFLINE              0x00001000
+#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
+#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
+
+#define INVALID_FILE_ATTRIBUTES (-1)
+
+#define DEFINE_ALIGNED_DATA(type, name, alignment) \
+    type __attribute__ ((aligned(alignment))) name;
+#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) \
+    static type __attribute__ ((aligned(alignment))) name;
+#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) \
+    const type __attribute__ ((aligned(alignment))) name;
+
+#include "LinuxSpecific.h"
+
+#define TARGET_DEFAULT_ALIGN (0x4U)
+
+#endif // CRYINCLUDE_CRYCOMMON_LINUX32SPECIFIC_H
diff --git a/Code/Legacy/CryCommon/Linux64Specific.h b/Code/Legacy/CryCommon/Linux64Specific.h
new file mode 100644
index 0000000000..820ee78147
--- /dev/null
+++ b/Code/Legacy/CryCommon/Linux64Specific.h
@@ -0,0 +1,127 @@
+/*
+ * 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 : Specific to Linux declarations, inline functions etc.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_LINUX64SPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_LINUX64SPECIFIC_H
+#pragma once
+
+
+
+//#define _CPU_X86
+#define _CPU_AMD64
+#define _CPU_SSE
+
+#define DEBUG_BREAK ::raise(SIGTRAP)
+#define RC_EXECUTABLE "rc"
+#define USE_CRT 1
+#define SIZEOF_PTR 8
+
+//////////////////////////////////////////////////////////////////////////
+// Standard includes.
+//////////////////////////////////////////////////////////////////////////
+#include <malloc.h>
+#include <stdint.h>
+#include <sys/dir.h>
+#include <sys/io.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <ctype.h>
+
+#if defined(_CPU_SSE)
+#include <xmmintrin.h>
+#endif
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Define platform independent types.
+//////////////////////////////////////////////////////////////////////////
+#include "BaseTypes.h"
+
+typedef double real;
+
+typedef uint32      DWORD;
+typedef DWORD*      LPDWORD;
+typedef uint64      DWORD_PTR;
+typedef intptr_t INT_PTR, * PINT_PTR;
+typedef uintptr_t UINT_PTR, * PUINT_PTR;
+typedef char* LPSTR, * PSTR;
+typedef uint64      __uint64;
+#if !defined(__clang__)
+typedef int64       __int64;
+#endif
+typedef int64       INT64;
+typedef uint64      UINT64;
+
+typedef long LONG_PTR, * PLONG_PTR, * PLONG;
+typedef unsigned long ULONG_PTR, * PULONG_PTR;
+
+typedef uint8               BYTE;
+typedef uint16              WORD;
+typedef void*               HWND;
+typedef UINT_PTR            WPARAM;
+typedef LONG_PTR            LPARAM;
+typedef LONG_PTR            LRESULT;
+#define PLARGE_INTEGER LARGE_INTEGER *
+typedef const char* LPCSTR, * PCSTR;
+typedef long long           LONGLONG;
+typedef ULONG_PTR           SIZE_T;
+typedef uint8               byte;
+#define ILINE __forceinline
+#define _A_RDONLY (0x01)
+#define _A_SUBDIR (0x10)
+#define _A_HIDDEN (0x02)
+
+//////////////////////////////////////////////////////////////////////////
+// Win32 FileAttributes.
+//////////////////////////////////////////////////////////////////////////
+#define FILE_ATTRIBUTE_READONLY             0x00000001
+#define FILE_ATTRIBUTE_HIDDEN               0x00000002
+#define FILE_ATTRIBUTE_SYSTEM               0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
+#define FILE_ATTRIBUTE_DEVICE               0x00000040
+#define FILE_ATTRIBUTE_NORMAL               0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
+#define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
+#define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
+#define FILE_ATTRIBUTE_COMPRESSED           0x00000800
+#define FILE_ATTRIBUTE_OFFLINE              0x00001000
+#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
+#define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
+
+#define INVALID_FILE_ATTRIBUTES (-1)
+
+#define DEFINE_ALIGNED_DATA(type, name, alignment) \
+    type __attribute__ ((aligned(alignment))) name;
+#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) \
+    static type __attribute__ ((aligned(alignment))) name;
+#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) \
+    const type __attribute__ ((aligned(alignment))) name;
+
+#include "LinuxSpecific.h"
+
+#define TARGET_DEFAULT_ALIGN (0x8U)
+
+#define PLATFORM_64BIT
+
+#ifdef _RELEASE
+    #define __debugbreak()
+#else
+    #define __debugbreak() "_asm int 3"
+#endif
+
+#define __assume(x)
+
+#define _msize(p) malloc_usable_size(p)
+
+#endif // CRYINCLUDE_CRYCOMMON_LINUX64SPECIFIC_H
diff --git a/Code/Legacy/CryCommon/LinuxSpecific.h b/Code/Legacy/CryCommon/LinuxSpecific.h
new file mode 100644
index 0000000000..61f28947af
--- /dev/null
+++ b/Code/Legacy/CryCommon/LinuxSpecific.h
@@ -0,0 +1,593 @@
+/*
+ * 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 : Specific to Linux declarations, inline functions etc.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_LINUXSPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_LINUXSPECIFIC_H
+#pragma once
+
+
+#include <stdlib.h>
+#include <time.h>
+#include <pthread.h>
+#include <math.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+#include <algorithm>
+#include <signal.h>
+#ifndef __COUNTER__
+#define __COUNTER__ __LINE__
+#endif
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#if defined(APPLE)
+#include <dirent.h>
+#endif //defined(APPLE)
+#if !defined(SKIP_INET_INCLUDES)
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif // defined(SKIP_INET_INCLUDES)
+#include <vector>
+#include <string>
+
+#ifdef __FUNC__
+#undef __FUNC__
+#endif
+#if defined(__GNUC__) || defined(__clang__)
+#define __FUNC__ __func__
+#else
+#define __FUNC__                                             \
+    ({                                                       \
+         static char __f[sizeof(__PRETTY_FUNCTION__) + 1];   \
+         strcpy(__f, __PRETTY_FUNCTION__);                   \
+         char* __p = (char*)strchr(__f, '(');                \
+         *__p = 0;                                           \
+         while (*(__p) != ' ' && __p != (__f - 1)) {--__p; } \
+         (__p + 1);                                          \
+     })
+#endif
+
+typedef void*                               LPVOID;
+#define VOID                    void
+#define PVOID                               void*
+
+typedef unsigned int UINT;
+typedef char CHAR;
+typedef float FLOAT;
+
+#define PHYSICS_EXPORTS
+// MSVC compiler-specific keywords
+#define __forceinline inline
+#define _inline inline
+#define __cdecl
+#define _cdecl
+#define __stdcall
+#define _stdcall
+#define __fastcall
+#define _fastcall
+#define IN
+#define OUT
+
+#ifdef AZ_MONOLITHIC_BUILD
+#if !defined(USE_STATIC_NAME_TABLE)
+#define USE_STATIC_NAME_TABLE 1
+#endif
+#endif // AZ_MONOLITHIC_BUILD
+
+#if !defined(_STLP_HASH_MAP) && !defined(USING_STLPORT)
+#define _STLP_HASH_MAP 1
+#endif
+
+// Enable memory address tracing code.
+#if !defined(MM_TRACE_ADDRS) // && !defined(NDEBUG)
+#define MM_TRACE_ADDRS 1
+#endif
+
+#ifndef STDMETHODCALLTYPE_DEFINED
+#define STDMETHODCALLTYPE_DEFINED
+#define STDMETHODCALLTYPE
+#endif
+
+#define _ALIGN(num) \
+    __attribute__ ((aligned(num))) \
+    AZ_POP_DISABLE_WARNING
+
+#define _PACK __attribute__ ((packed))
+
+// Safe memory freeing
+#ifndef SAFE_DELETE
+#define SAFE_DELETE(p)          { if (p) { delete (p);       (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_DELETE_ARRAY
+#define SAFE_DELETE_ARRAY(p)    { if (p) { delete[] (p);     (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
+}
+#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))
+#define HIWORD(l)           ((WORD)((DWORD_PTR)(l) >> 16))
+#define LOBYTE(w)           ((BYTE)((DWORD_PTR)(w) & 0xff))
+#define HIBYTE(w)           ((BYTE)((DWORD_PTR)(w) >> 8))
+
+#define CALLBACK
+#define WINAPI
+
+#ifndef __cplusplus
+#ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#define TCHAR wchar_t;
+#define _WCHAR_T_DEFINED
+#endif
+#endif
+typedef wchar_t WCHAR;    // wc,   16-bit UNICODE character
+typedef WCHAR* PWCHAR;
+typedef WCHAR* LPWCH, * PWCH;
+typedef const WCHAR* LPCWCH, * PCWCH;
+typedef WCHAR* NWPSTR;
+typedef WCHAR* LPWSTR, * PWSTR;
+typedef WCHAR* LPUWSTR, * PUWSTR;
+
+typedef const WCHAR* LPCWSTR, * PCWSTR;
+typedef const WCHAR* LPCUWSTR, * PCUWSTR;
+
+#ifdef UNICODE
+typedef LPCWSTR LPCTSTR;
+typedef LPWSTR LPTSTR;
+#else
+typedef LPCSTR LPCTSTR;
+typedef LPSTR LPTSTR;
+#endif
+typedef char TCHAR;
+
+typedef DWORD COLORREF;
+#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
+
+#define GetRValue(rgb)  (LOBYTE(rgb))
+#define GetGValue(rgb)  (LOBYTE(((WORD)(rgb)) >> 8))
+#define GetBValue(rgb)  (LOBYTE((rgb)>>16))
+
+#define MAKEFOURCC(ch0, ch1, ch2, ch3)                \
+    ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
+     ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24))
+#define FILE_ATTRIBUTE_NORMAL               0x00000080
+
+typedef int                         BOOL;
+typedef int32_t                 LONG;
+typedef uint32_t            ULONG;
+typedef int                         HRESULT;
+
+#define BST_UNCHECKED   0x0000
+
+#ifndef MAXUINT
+#define MAXUINT ((uint) ~((uint)0))
+#endif
+
+#ifndef MAXINT
+#define MAXINT ((int)(MAXUINT >> 1))
+#endif
+
+#if !defined(__clang__)
+typedef int32 __int32;
+typedef uint32 __uint32;
+typedef int64 __int64;
+typedef uint64 __uint64;
+#endif
+
+#define THREADID_NULL -1
+typedef unsigned long int threadID;
+
+#define TRUE 1
+#define FALSE 0
+
+#ifndef MAX_PATH
+    #define MAX_PATH 256
+#endif
+#ifndef _MAX_PATH
+#define _MAX_PATH MAX_PATH
+#endif
+
+#define _PTRDIFF_T_DEFINED 1
+
+//#define __TIMESTAMP__ __DATE__" "__TIME__
+
+// function renaming
+#define _finite __finite
+#define _snprintf snprintf
+#define _isnan isnan
+#define stricmp strcasecmp
+#define _stricmp strcasecmp
+#define strnicmp strncasecmp
+#define _strnicmp strncasecmp
+#define wcsicmp wcscasecmp
+#define wcsnicmp wcsncasecmp
+
+
+#define _wtof(str) wcstod(str, 0)
+
+/*static unsigned char toupper(unsigned char c)
+{
+  return c & ~0x40;
+}
+*/
+typedef union _LARGE_INTEGER
+{
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    };
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    } u;
+    long long QuadPart;
+} LARGE_INTEGER;
+
+
+// stdlib.h stuff
+#define _MAX_DRIVE  3   // max. length of drive component
+#define _MAX_DIR    256 // max. length of path component
+#define _MAX_FNAME  256 // max. length of file name component
+#define _MAX_EXT    256 // max. length of extension component
+
+// fcntl.h
+#define _O_RDONLY       0x0000  /* open for reading only */
+#define _O_WRONLY       0x0001  /* open for writing only */
+#define _O_RDWR         0x0002  /* open for reading and writing */
+#define _O_APPEND       0x0008  /* writes done at eof */
+#define _O_CREAT        0x0100  /* create and open file */
+#define _O_TRUNC        0x0200  /* open and truncate */
+#define _O_EXCL         0x0400  /* open only if file doesn't already exist */
+#define _O_TEXT         0x4000  /* file mode is text (translated) */
+#define _O_BINARY       0x8000  /* file mode is binary (untranslated) */
+#define _O_RAW  _O_BINARY
+#define _O_NOINHERIT    0x0080  /* child process doesn't inherit file */
+#define _O_TEMPORARY    0x0040  /* temporary file bit */
+#define _O_SHORT_LIVED  0x1000  /* temporary storage file, try not to flush */
+#define _O_SEQUENTIAL   0x0020  /* file access is primarily sequential */
+#define _O_RANDOM       0x0010  /* file access is primarily random */
+
+// curses.h stubs for PDcurses keys
+#define PADENTER    KEY_MAX + 1
+#define CTL_HOME    KEY_MAX + 2
+#define CTL_END     KEY_MAX + 3
+#define CTL_PGDN    KEY_MAX + 4
+#define CTL_PGUP    KEY_MAX + 5
+
+// stubs for virtual keys, isn't used on Linux
+#define VK_UP               0
+#define VK_DOWN         0
+#define VK_RIGHT        0
+#define VK_LEFT         0
+#define VK_CONTROL  0
+#define VK_SCROLL       0
+
+enum
+{
+    IDOK        = 1,
+    IDCANCEL    = 2,
+    IDABORT     = 3,
+    IDRETRY     = 4,
+    IDIGNORE    = 5,
+    IDYES       = 6,
+    IDNO        = 7,
+    IDTRYAGAIN  = 10,
+    IDCONTINUE  = 11
+};
+
+#define ES_MULTILINE    0x0004L
+#define ES_AUTOVSCROLL  0x0040L
+#define ES_AUTOHSCROLL  0x0080L
+#define ES_WANTRETURN   0x1000L
+
+#define LB_ERR  (-1)
+
+#define LB_ADDSTRING    0x0180
+#define LB_GETCOUNT     0x018B
+#define LB_SETTOPINDEX  0x0197
+
+#define MB_OK                0x00000000L
+#define MB_OKCANCEL          0x00000001L
+#define MB_ABORTRETRYIGNORE  0x00000002L
+#define MB_YESNOCANCEL       0x00000003L
+#define MB_YESNO             0x00000004L
+#define MB_RETRYCANCEL       0x00000005L
+#define MB_CANCELTRYCONTINUE 0x00000006L
+
+#define MB_ICONQUESTION     0x00000020L
+#define MB_ICONEXCLAMATION  0x00000030L
+    
+#define MB_ICONERROR        0x00000010L
+#define MB_ICONWARNING      0x00000030L
+#define MB_ICONINFORMATION  0x00000040L
+
+#define MB_SETFOREGROUND    0x00010000L
+
+#define MB_APPLMODAL    0x00000000L
+
+#define MF_STRING   0x00000000L
+
+#define MK_LBUTTON  0x0001
+#define MK_RBUTTON  0x0002
+#define MK_SHIFT    0x0004
+#define MK_CONTROL  0x0008
+#define MK_MBUTTON  0x0010
+
+#define MK_ALT  ( 0x20 )
+
+#define SM_MOUSEPRESENT 0x00000000L
+
+#define SM_CMOUSEBUTTONS    43
+
+#define USER_TIMER_MINIMUM  0x0000000A
+
+#define VK_TAB      0x09
+#define VK_SHIFT    0x10
+#define VK_MENU     0x12
+#define VK_ESCAPE   0x1B
+#define VK_SPACE    0x20
+#define VK_DELETE   0x2E
+
+#define VK_NUMPAD1  0x61
+#define VK_NUMPAD2  0x62
+#define VK_NUMPAD3  0x63
+#define VK_NUMPAD4  0x64
+
+#define VK_OEM_COMMA    0xBC   // ',' any country
+#define VK_OEM_PERIOD   0xBE   // '.' any country
+#define VK_OEM_3        0xC0   // '`~' for US
+#define VK_OEM_4        0xDB  //  '[{' for US
+#define VK_OEM_6        0xDD  //  ']}' for US
+
+#define WAIT_TIMEOUT 258L    // dderror
+
+#define WM_MOVE 0x0003
+#define WM_USER 0x0400
+
+#define WHEEL_DELTA 120
+
+#define WS_CHILD    0x40000000L
+#define WS_VISIBLE  0x10000000L
+
+#define CB_ERR  (-1)
+
+// io.h stuff
+typedef unsigned int _fsize_t;
+
+#define _flushall()
+
+struct _OVERLAPPED;
+
+typedef void (* LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, struct _OVERLAPPED* lpOverlapped);
+
+typedef struct _OVERLAPPED
+{
+    void* pCaller;//this is orginally reserved for internal purpose, we store the Caller pointer here
+    LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine; ////this is orginally ULONG_PTR InternalHigh and reserved for internal purpose
+    union
+    {
+        struct
+        {
+            DWORD Offset;
+            DWORD OffsetHigh;
+        };
+        PVOID Pointer;
+    };
+    DWORD dwNumberOfBytesTransfered;        //additional member temporary speciying the number of bytes to be read
+    /*HANDLE*/ void*  hEvent;
+} OVERLAPPED, * LPOVERLAPPED;
+
+typedef struct _SECURITY_ATTRIBUTES
+{
+    DWORD nLength;
+    LPVOID lpSecurityDescriptor;
+    BOOL bInheritHandle;
+} SECURITY_ATTRIBUTES, * PSECURITY_ATTRIBUTES, * LPSECURITY_ATTRIBUTES;
+
+#ifdef __cplusplus
+extern bool QueryPerformanceCounter(LARGE_INTEGER*);
+extern bool QueryPerformanceFrequency(LARGE_INTEGER* frequency);
+
+static pthread_mutex_t mutex_t;
+template<typename T>
+const volatile T InterlockedIncrement(volatile T* pT)
+{
+    pthread_mutex_lock(&mutex_t);
+    ++(*pT);
+    pthread_mutex_unlock(&mutex_t);
+    return *pT;
+}
+
+template<typename T>
+const volatile T InterlockedDecrement(volatile T* pT)
+{
+    pthread_mutex_lock(&mutex_t);
+    --(*pT);
+    pthread_mutex_unlock(&mutex_t);
+    return *pT;
+}
+
+#if 0
+template<typename S, typename T>
+inline const S& min(const S& rS, const T& rT)
+{
+    return (rS <= rT) ? rS : rT;
+}
+
+template<typename S, typename T>
+inline const S& max(const S& rS, const T& rT)
+{
+    return (rS >= rT) ? rS : rT;
+}
+#endif
+
+template<typename S, typename T>
+inline S __min(const S& rS, const T& rT)
+{
+    return std::min(rS, rT);
+}
+
+template<typename S, typename T>
+inline S __max(const S& rS, const T& rT)
+{
+    return std::max(rS, rT);
+}
+
+
+typedef enum
+{
+    INVALID_HANDLE_VALUE = -1l
+}INVALID_HANDLE_VALUE_ENUM;
+//for compatibility reason we got to create a class which actually contains an int rather than a void* and make sure it does not get mistreated
+template <class T, T U>
+//U is default type for invalid handle value, T the encapsulated handle type to be used instead of void* (as under windows and never linux)
+class CHandle
+{
+public:
+    typedef T           HandleType;
+    typedef void* PointerType;      //for compatibility reason to encapsulate a void* as an int
+
+    static const HandleType sciInvalidHandleValue = U;
+
+    CHandle(const CHandle<T, U>& cHandle)
+        : m_Value(cHandle.m_Value){}
+    CHandle(const HandleType cHandle = U)
+        : m_Value(cHandle){}
+    CHandle(const PointerType cpHandle)
+        : m_Value(reinterpret_cast<HandleType>(cpHandle)){}
+    CHandle(INVALID_HANDLE_VALUE_ENUM)
+        : m_Value(U){}                                   //to be able to use a common value for all InvalidHandle - types
+#if defined(LINUX64) && !defined(__clang__)
+    //treat __null tyope also as invalid handle type
+    CHandle(__typeof__(__null))
+        : m_Value(U){}                            //to be able to use a common value for all InvalidHandle - types
+#endif
+    operator HandleType(){
+        return m_Value;
+    }
+    bool operator!() const{return m_Value == sciInvalidHandleValue; }
+    const CHandle& operator =(const CHandle& crHandle){m_Value = crHandle.m_Value; return *this; }
+    const CHandle& operator =(const PointerType cpHandle){m_Value = (HandleType) reinterpret_cast<UINT_PTR>(cpHandle); return *this; }
+    const bool operator ==(const CHandle& crHandle)     const{return m_Value == crHandle.m_Value; }
+    const bool operator ==(const HandleType cHandle)    const{return m_Value == cHandle; }
+    const bool operator ==(const PointerType cpHandle) const{return m_Value == (HandleType) reinterpret_cast<UINT_PTR>(cpHandle); }
+    const bool operator !=(const HandleType cHandle)    const{return m_Value != cHandle; }
+    const bool operator !=(const CHandle& crHandle)     const{return m_Value != crHandle.m_Value; }
+    const bool operator !=(const PointerType cpHandle) const{return m_Value != (HandleType) reinterpret_cast<UINT_PTR>(cpHandle); }
+    const bool operator <   (const CHandle& crHandle)       const{return m_Value < crHandle.m_Value; }
+    HandleType Handle() const{return m_Value; }
+
+private:
+    HandleType m_Value;     //the actual value, remember that file descriptors are ints under linux
+
+    typedef void    ReferenceType;    //for compatibility reason to encapsulate a void* as an int
+    //forbid these function which would actually not work on an int
+    PointerType operator->();
+    PointerType operator->() const;
+    ReferenceType operator*();
+    ReferenceType operator*() const;
+    operator PointerType();
+};
+
+typedef CHandle<int, (int) - 1l> HANDLE;
+
+typedef HANDLE EVENT_HANDLE;
+typedef pid_t THREAD_HANDLE;
+
+typedef HANDLE HKEY;
+// typedef HANDLE HDC;
+
+typedef HANDLE HBITMAP;
+
+typedef HANDLE HMENU;
+
+inline int64 CryGetTicks()
+{
+    LARGE_INTEGER counter;
+    QueryPerformanceCounter(&counter);
+    return counter.QuadPart;
+}
+
+inline int64 CryGetTicksPerSec()
+{
+    LARGE_INTEGER li;
+    QueryPerformanceFrequency(&li);
+    return li.QuadPart;
+}
+
+#endif //__cplusplus
+
+inline int _CrtCheckMemory() { return 1; };
+
+inline char* _fullpath(char* absPath, const char* relPath, size_t maxLength)
+{
+    char path[PATH_MAX];
+
+    if (realpath(relPath, path) == NULL)
+    {
+        return NULL;
+    }
+    const size_t len = std::min(strlen(path), maxLength - 1);
+    memcpy(absPath, path, len);
+    absPath[len] = 0;
+    return absPath;
+}
+
+typedef void* HGLRC;
+typedef void* HDC;
+typedef void* PROC;
+typedef void* PIXELFORMATDESCRIPTOR;
+
+#define SCOPED_ENABLE_FLOAT_EXCEPTIONS
+
+// Linux_Win32Wrapper.h now included directly by platform.h
+//#include "Linux_Win32Wrapper.h"
+
+#define closesocket close
+inline int WSAGetLastError()
+{
+    return errno;
+}
+
+template <typename T, size_t N>
+char (*RtlpNumberOf( T (&)[N] ))[N];
+
+#define RTL_NUMBER_OF_V2(A) (sizeof(*RtlpNumberOf(A)))
+
+#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A)
+
+#undef SUCCEEDED
+#define SUCCEEDED(x) ((x) >= 0)
+#undef FAILED
+#define FAILED(x) (!(SUCCEEDED(x)))
+
+#endif // CRYINCLUDE_CRYCOMMON_LINUXSPECIFIC_H
+
+// vim:ts=2:sw=2:tw=78
+
diff --git a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
new file mode 100644
index 0000000000..6fbe6e100b
--- /dev/null
+++ b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
@@ -0,0 +1,716 @@
+/*
+ * 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_LINUX_WIN32WRAPPER_H
+#define CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H
+#pragma once
+
+#include <CryAssert.h>
+#include <dirent.h>
+#include <vector>
+/* Memory block identification */
+#define _FREE_BLOCK      0
+#define _NORMAL_BLOCK    1
+#define _CRT_BLOCK       2
+#define _IGNORE_BLOCK    3
+#define _CLIENT_BLOCK    4
+#define _MAX_BLOCKS      5
+
+typedef void* HMODULE;
+
+typedef struct _MEMORYSTATUS
+{
+    DWORD dwLength;
+    DWORD dwMemoryLoad;
+    SIZE_T dwTotalPhys;
+    SIZE_T dwAvailPhys;
+    SIZE_T dwTotalPageFile;
+    SIZE_T dwAvailPageFile;
+    SIZE_T dwTotalVirtual;
+    SIZE_T dwAvailVirtual;
+} MEMORYSTATUS, * LPMEMORYSTATUS;
+
+extern void GlobalMemoryStatus(LPMEMORYSTATUS lpmem);
+
+#if defined(PLATFORM_64BIT)
+#   define MEMORY_ALLOCATION_ALIGNMENT 16
+#else
+#   define MEMORY_ALLOCATION_ALIGNMENT 8
+#endif
+
+#define S_OK 0
+#define THREAD_PRIORITY_NORMAL              0
+#define THREAD_PRIORITY_IDLE                    0
+#define THREAD_PRIORITY_LOWEST              0
+#define THREAD_PRIORITY_BELOW_NORMAL    0
+#define THREAD_PRIORITY_ABOVE_NORMAL    0
+#define THREAD_PRIORITY_HIGHEST             0
+#define THREAD_PRIORITY_TIME_CRITICAL   0
+#define MAX_COMPUTERNAME_LENGTH 15 // required by CryOnline module
+
+#if 0
+//for compatibility reason we got to create a class which actually contains an int rather than a void* and make sure it does not get mistreated
+template <class T, T U>
+//U is default type for invalid handle value, T the encapsulated handle type to be used instead of void* (as under windows and never linux)
+class CHandle
+{
+public:
+    typedef T           HandleType;
+    typedef void* PointerType;  //for compatibility reason to encapsulate a void* as an int
+
+    static const HandleType sciInvalidHandleValue = U;
+
+    CHandle(const CHandle<T, U>& cHandle)
+        : m_Value(cHandle.m_Value){}
+    CHandle(const HandleType cHandle = U)
+        : m_Value(cHandle){}
+    //CHandle(const PointerType cpHandle) : m_Value(reinterpret_cast<HandleType>(cpHandle)){}
+    //CHandle(INVALID_HANDLE_VALUE_ENUM) : m_Value(U){}//to be able to use a common value for all InvalidHandle - types
+
+    operator HandleType(){
+        return m_Value;
+    }
+    bool operator!() const{return m_Value == sciInvalidHandleValue; }
+    const CHandle& operator =(const CHandle& crHandle){m_Value = crHandle.m_Value; return *this; }
+    const CHandle& operator =(const PointerType cpHandle){m_Value = reinterpret_cast<HandleType>(cpHandle); return *this; }
+    const bool operator ==(const CHandle& crHandle)     const{return m_Value == crHandle.m_Value; }
+    const bool operator ==(const HandleType cHandle)    const{return m_Value == cHandle; }
+    //const bool operator ==(const PointerType cpHandle)const{return m_Value == reinterpret_cast<HandleType>(cpHandle);}
+    const bool operator !=(const HandleType cHandle)    const{return m_Value != cHandle; }
+    const bool operator !=(const CHandle& crHandle)     const{return m_Value != crHandle.m_Value; }
+    //const bool operator !=(const PointerType cpHandle)const{return m_Value != reinterpret_cast<HandleType>(cpHandle);}
+    const bool operator <   (const CHandle& crHandle)       const{return m_Value < crHandle.m_Value; }
+    HandleType Handle() const{return m_Value; }
+
+private:
+    HandleType m_Value; //the actual value, remember that file descriptors are ints under linux
+
+    typedef void    ReferenceType;//for compatibility reason to encapsulate a void* as an int
+    //forbid these function which would actually not work on an int
+    PointerType operator->();
+    PointerType operator->() const;
+    ReferenceType operator*();
+    ReferenceType operator*() const;
+    operator PointerType();
+};
+
+typedef CHandle<INT_PTR, (INT_PTR) 0> HANDLE;
+
+typedef HANDLE EVENT_HANDLE;
+typedef HANDLE THREAD_HANDLE;
+
+#define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1)
+#endif
+
+//#define __TIMESTAMP__ __DATE__" "__TIME__
+
+// stdlib.h stuff
+#define _MAX_DRIVE  3   // max. length of drive component
+#define _MAX_DIR    256 // max. length of path component
+#define _MAX_FNAME  256 // max. length of file name component
+#define _MAX_EXT    256 // max. length of extension component
+
+// fcntl.h
+#define _O_RDONLY       0x0000  /* open for reading only */
+#define _O_WRONLY       0x0001  /* open for writing only */
+#define _O_RDWR         0x0002  /* open for reading and writing */
+#define _O_APPEND       0x0008  /* writes done at eof */
+#define _O_CREAT        0x0100  /* create and open file */
+#define _O_TRUNC        0x0200  /* open and truncate */
+#define _O_EXCL         0x0400  /* open only if file doesn't already exist */
+#define _O_TEXT         0x4000  /* file mode is text (translated) */
+#define _O_BINARY       0x8000  /* file mode is binary (untranslated) */
+#define _O_RAW  _O_BINARY
+#define _O_NOINHERIT    0x0080  /* child process doesn't inherit file */
+#define _O_TEMPORARY    0x0040  /* temporary file bit */
+#define _O_SHORT_LIVED  0x1000  /* temporary storage file, try not to flush */
+#define _O_SEQUENTIAL   0x0020  /* file access is primarily sequential */
+#define _O_RANDOM       0x0010  /* file access is primarily random */
+
+inline void MemoryBarrier() {
+    __sync_synchronize();
+}
+// Memory barrier implementation taken from https://code.google.com/p/gperftools/
+//inline void MemoryBarrier() {
+//  __asm__ __volatile__("mfence" : : : "memory");
+//}
+
+#if !defined(_CPU_SSE)
+typedef int64 __m128;
+#endif
+
+#if defined(LINUX64) || defined(APPLE)
+unsigned char _InterlockedCompareExchange128(int64 volatile* dst, int64 exchangehigh, int64 exchangelow, int64* comperand);
+#endif
+//////////////////////////////////////////////////////////////////////////
+// io.h stuff
+#if !defined(ANDROID)
+extern int errno;
+#endif
+typedef unsigned int _fsize_t;
+
+struct _OVERLAPPED;
+typedef _OVERLAPPED* LPOVERLAPPED;
+
+typedef void (* LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, struct _OVERLAPPED* lpOverlapped);
+
+typedef struct tagRECT
+{
+    LONG    left;
+    LONG    top;
+    LONG    right;
+    LONG    bottom;
+} RECT, * PRECT;
+
+typedef struct tagPOINT
+{
+    LONG  x;
+    LONG  y;
+} POINT, * PPOINT;
+
+#ifndef _FILETIME_
+#define _FILETIME_
+typedef struct _FILETIME
+{
+    DWORD dwLowDateTime;
+    DWORD dwHighDateTime;
+} FILETIME, * PFILETIME, * LPFILETIME;
+#endif
+
+typedef union _ULARGE_INTEGER
+{
+    struct
+    {
+        DWORD LowPart;
+        DWORD HighPart;
+    };
+    unsigned long long QuadPart;
+} ULARGE_INTEGER;
+
+typedef ULARGE_INTEGER* PULARGE_INTEGER;
+
+#ifdef __cplusplus
+inline LONG CompareFileTime(const FILETIME* lpFileTime1, const FILETIME* lpFileTime2)
+#else
+static LONG CompareFileTime(const FILETIME* lpFileTime1, const FILETIME* lpFileTime2)
+#endif
+{
+    ULARGE_INTEGER u1, u2;
+    memcpy(&u1, lpFileTime1, sizeof u1);
+    memcpy(&u2, lpFileTime2, sizeof u2);
+    if (u1.QuadPart < u2.QuadPart)
+    {
+        return -1;
+    }
+    else
+    if (u1.QuadPart > u2.QuadPart)
+    {
+        return 1;
+    }
+    return 0;
+}
+
+typedef struct _SYSTEMTIME
+{
+    WORD wYear;
+    WORD wMonth;
+    WORD wDayOfWeek;
+    WORD wDay;
+    WORD wHour;
+    WORD wMinute;
+    WORD wSecond;
+    WORD wMilliseconds;
+} SYSTEMTIME, * PSYSTEMTIME, * LPSYSTEMTIME;
+
+typedef struct _TIME_FIELDS
+{
+    short Year;
+    short Month;
+    short Day;
+    short Hour;
+    short Minute;
+    short Second;
+    short Milliseconds;
+    short Weekday;
+} TIME_FIELDS, * PTIME_FIELDS;
+
+#define DAYSPERNORMALYEAR  365
+#define DAYSPERLEAPYEAR    366
+#define MONSPERYEAR        12
+
+inline void ZeroMemory(void* pPtr, int nSize)
+{
+    memset(pPtr, 0, nSize);
+}
+
+inline BOOL InflateRect(RECT* pRect, int dx, int dy)
+{
+    pRect->left -= dx;
+    pRect->right += dx;
+    pRect->top -= dy;
+    pRect->bottom += dy;
+    return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+extern BOOL SystemTimeToFileTime(const SYSTEMTIME* syst, LPFILETIME ft);
+//Win32API function declarations actually used
+extern bool IsBadReadPtr(void* ptr, unsigned int size);
+
+// Defined in the launcher.
+DLL_IMPORT void OutputDebugString(const char*);
+DLL_IMPORT void DebugBreak();
+
+/*
+//critical section stuff
+#define pthread_attr_default NULL
+
+typedef pthread_mutex_t CRITICAL_SECTION;
+#ifdef __cplusplus
+inline void InitializeCriticalSection(CRITICAL_SECTION *lpCriticalSection)
+{
+pthread_mutexattr_t pthread_mutexattr_def;
+pthread_mutexattr_settype(&pthread_mutexattr_def, PTHREAD_MUTEX_RECURSIVE_NP);
+pthread_mutex_init(lpCriticalSection, &pthread_mutexattr_def);
+}
+inline void EnterCriticalSection(CRITICAL_SECTION *lpCriticalSection){pthread_mutex_lock(lpCriticalSection);}
+inline void LeaveCriticalSection(CRITICAL_SECTION *lpCriticalSection){pthread_mutex_unlock(lpCriticalSection);}
+inline void DeleteCriticalSection(CRITICAL_SECTION *lpCriticalSection){}
+#else
+static void InitializeCriticalSection(CRITICAL_SECTION *lpCriticalSection)
+{
+pthread_mutexattr_t pthread_mutexattr_def;
+pthread_mutexattr_settype(&pthread_mutexattr_def, PTHREAD_MUTEX_RECURSIVE_NP);
+pthread_mutex_init(lpCriticalSection, &pthread_mutexattr_def);
+}
+static void EnterCriticalSection(CRITICAL_SECTION *lpCriticalSection){pthread_mutex_lock(lpCriticalSection);}
+static void LeaveCriticalSection(CRITICAL_SECTION *lpCriticalSection){pthread_mutex_unlock(lpCriticalSection);}
+static void DeleteCriticalSection(CRITICAL_SECTION *lpCriticalSection){}
+#endif
+*/
+
+extern bool QueryPerformanceCounter(LARGE_INTEGER* counter);
+extern bool QueryPerformanceFrequency(LARGE_INTEGER* frequency);
+#ifdef __cplusplus
+
+inline uint32 GetTickCount()
+{
+    LARGE_INTEGER count, freq;
+    QueryPerformanceCounter(&count);
+    QueryPerformanceFrequency(&freq);
+    return uint32(count.QuadPart * 1000 / freq.QuadPart);
+}
+
+#define IGNORE              0       // Ignore signal
+#define INFINITE            0xFFFFFFFF  // Infinite timeout
+#endif
+//begin--------------------------------findfirst/-next declaration/implementation----------------------------------------------------
+
+
+//////////////////////////////////////////////////////////////////////////
+// function renaming
+#define _TRUNCATE (size_t(-1))
+#define _chmod chmod
+#define _snprintf snprintf
+#define stricmp strcasecmp
+#define _stricmp strcasecmp
+#define strnicmp strncasecmp
+#define _strnicmp strncasecmp
+
+#define _strlwr strlwr
+#define _strlwr_s(BUF, SIZE) strlwr(BUF)
+#define _strups strupr
+
+#define _wtof(str) wcstod(str, 0)
+
+// Need to include this before using it's used in finddata, but after the strnicmp definition
+#include "CryString.h"
+
+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<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 GetFileAttributes(LPCSTR lpFileName);
+
+extern const bool GetFilenameNoCase(const char* file, char*, const bool cCreateNew = false);
+
+extern BOOL GetUserName(LPSTR lpBuffer, LPDWORD nSize);
+
+//error code stuff
+//not thread specific, just a coarse implementation for the main thread
+inline DWORD GetLastError() { return errno; }
+inline void SetLastError(DWORD dwErrCode) { errno = dwErrCode; }
+
+//////////////////////////////////////////////////////////////////////////
+#define GENERIC_READ                     (0x80000000L)
+#define GENERIC_WRITE                    (0x40000000L)
+#define GENERIC_EXECUTE                  (0x20000000L)
+#define GENERIC_ALL                      (0x10000000L)
+
+#define CREATE_NEW          1
+#define CREATE_ALWAYS       2
+#define OPEN_EXISTING       3
+#define OPEN_ALWAYS         4
+#define TRUNCATE_EXISTING   5
+
+#define FILE_SHARE_READ                     0x00000001
+#define FILE_SHARE_WRITE                    0x00000002
+#define OPEN_EXISTING                           3
+#define FILE_FLAG_OVERLAPPED            0x40000000
+#define INVALID_FILE_SIZE                   ((DWORD)0xFFFFFFFFl)
+#define FILE_BEGIN                              0
+#define FILE_CURRENT                            1
+#define FILE_END                                    2
+#define ERROR_NO_SYSTEM_RESOURCES 1450L
+#define ERROR_INVALID_USER_BUFFER   1784L
+#define ERROR_NOT_ENOUGH_MEMORY   8L
+#define ERROR_PATH_NOT_FOUND      3L
+#define FILE_FLAG_SEQUENTIAL_SCAN 0x08000000
+
+//////////////////////////////////////////////////////////////////////////
+extern threadID GetCurrentThreadId();
+
+//////////////////////////////////////////////////////////////////////////
+extern HANDLE CreateEvent(
+    LPSECURITY_ATTRIBUTES lpEventAttributes,
+    BOOL bManualReset,
+    BOOL bInitialState,
+    LPCSTR lpName
+    );
+
+//////////////////////////////////////////////////////////////////////////
+extern DWORD Sleep(DWORD dwMilliseconds);
+
+//////////////////////////////////////////////////////////////////////////
+extern DWORD SleepEx(DWORD dwMilliseconds, BOOL bAlertable);
+
+//////////////////////////////////////////////////////////////////////////
+extern DWORD WaitForSingleObjectEx(
+    HANDLE hHandle,
+    DWORD dwMilliseconds,
+    BOOL bAlertable);
+
+//////////////////////////////////////////////////////////////////////////
+extern DWORD WaitForMultipleObjectsEx(
+    DWORD nCount,
+    const HANDLE* lpHandles,
+    BOOL bWaitAll,
+    DWORD dwMilliseconds,
+    BOOL bAlertable);
+
+//////////////////////////////////////////////////////////////////////////
+extern DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds);
+
+//////////////////////////////////////////////////////////////////////////
+extern BOOL SetEvent(HANDLE hEvent);
+
+//////////////////////////////////////////////////////////////////////////
+extern BOOL ResetEvent(HANDLE hEvent);
+
+//////////////////////////////////////////////////////////////////////////
+extern HANDLE CreateMutex(
+    LPSECURITY_ATTRIBUTES lpMutexAttributes,
+    BOOL bInitialOwner,
+    LPCSTR lpName
+    );
+
+//////////////////////////////////////////////////////////////////////////
+extern BOOL ReleaseMutex(HANDLE hMutex);
+
+//////////////////////////////////////////////////////////////////////////
+typedef DWORD (* PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
+typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
+
+//////////////////////////////////////////////////////////////////////////
+extern HANDLE CreateThread(
+    LPSECURITY_ATTRIBUTES lpThreadAttributes,
+    SIZE_T dwStackSize,
+    LPTHREAD_START_ROUTINE lpStartAddress,
+    LPVOID lpParameter,
+    DWORD dwCreationFlags,
+    LPDWORD lpThreadId
+    );
+
+extern BOOL GetComputerName(LPSTR lpBuffer, LPDWORD lpnSize); //required for CryOnline
+extern DWORD GetCurrentProcessId(void);
+
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+#ifdef __cplusplus
+
+//helper function
+extern void adaptFilenameToLinux(char* rAdjustedFilename);
+extern const int comparePathNames(const char* cpFirst, const char* cpSecond, unsigned int len);//returns 0 if identical
+extern void replaceDoublePathFilename(char* szFileName);//removes "\.\" to "\" and "/./" to "/"
+
+//////////////////////////////////////////////////////////////////////////
+extern char* _fullpath(char* absPath, const char* relPath, size_t maxLength);
+//////////////////////////////////////////////////////////////////////////
+extern void _makepath(char* path, const char* drive, const char* dir, const char* filename, const char* ext);
+
+template <size_t size>
+void _makepath_s(char(&path)[size], const char *drive, const char *dir, const char *fname, const char *ext)
+{
+    _makepath(path, drive, dir, fname, ext);
+}
+
+extern void _splitpath(const char* inpath, char* drv, char* dir, char* fname, char* ext);
+
+template <size_t drivesize, size_t dirsize, size_t fnamesize, size_t extsize>
+void _splitpath_s(const char *path, char(&drive)[drivesize], char(&dir)[dirsize], char(&fname)[fnamesize], char(&ext)[extsize])
+{
+    _splitpath(path, drive, dir, fname, ext);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+extern int memicmp(LPCSTR s1, LPCSTR s2, DWORD len);
+
+extern "C" char* strlwr (char* str);
+extern "C" char* strupr(char* str);
+
+extern char* _ui64toa(unsigned long long value,    char* str, int radix);
+extern long long _atoi64(const char* str);
+
+extern int* _errno();
+
+template <size_t SIZE>
+int vsprintf_s(char (&dst)[SIZE], const char* format, va_list argptr)
+{
+    vsnprintf(dst, SIZE, format, argptr);
+    dst[SIZE - 1] = 0;
+    return 0;
+}
+
+inline int vsprintf_s(char* dst, size_t size, const char* format, va_list argptr)
+{
+    vsnprintf(dst, size, format, argptr);
+    dst[size - 1] = 0;
+    return 0;
+}
+
+//note that behaviour is different from strncpy.
+//this will not pad string with zeroes if length of src is less than 'size'
+
+inline int strncpy_s(char* dst, size_t buf_size, const char* src, size_t size)
+{
+    size_t to_copy = std::min(size, strlen(src));
+    size_t term = std::min(buf_size - 1, to_copy);//length of result
+    strncpy(dst, src, term);
+    dst[term] = 0;
+    return 0;
+}
+
+template <size_t SIZE>
+inline int strncpy_s(char(&dst)[SIZE], const char* src, size_t size)
+{
+    size_t to_copy = std::min(size, strlen(src));
+    size_t term = std::min(SIZE - 1, to_copy);//length of result
+    strncpy(dst, src, term);
+    dst[term] = 0;
+    return 0;
+}
+
+inline int strcat_s(char* dst, size_t size, const char* src)
+{
+    if (!dst || !src)
+    {
+        return EINVAL;
+    }
+    size_t len_dst = strlen(dst);
+    size_t len_src = strlen(src);
+    if (size == 0 || len_dst + len_src + 1 >= size)
+    {
+        return ERANGE;
+    }
+    memcpy(dst + len_dst, src, len_src);
+    dst[len_dst + len_src] = 0;
+    return 0;
+}
+
+template <size_t SIZE>
+int strcat_s(char(&dst)[SIZE], const char* src)
+{
+    return strcat_s(dst, SIZE, src);
+}
+
+
+template <size_t SIZE>
+int strcpy_s(char(&dst)[SIZE], const char* src)
+{
+    strncpy(dst, src, SIZE);
+    dst[SIZE - 1] = 0;
+    return 0;
+}
+
+inline int strcpy_s(char* dst, size_t size, const char* src)
+{
+    strncpy(dst, src, size);
+    dst[size - 1] = 0;
+    return 0;
+}
+
+inline int sprintf_s(char* buffer, size_t sizeOfBuffer, const char* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    int err = vsnprintf(buffer, sizeOfBuffer, format, args);
+    va_end(args);
+    return err;
+}
+
+template <size_t size>
+int sprintf_s(char (&buffer)[size], const char* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    int err = vsnprintf(buffer, size, format, args);
+    va_end(args);
+    return err;
+}
+
+#ifdef _isnan
+#undef _isnan
+template <typename T>
+bool _isnan(T value)
+{
+    return value != value;
+}
+#endif
+
+
+#define vsnprintf_s(BUF, SIZE, COUNT, FORMAT, ARGVLIST) vsnprintf(BUF, SIZE, FORMAT, ARGVLIST)
+#define _vsnwprintf_s(BUF, SIZE, COUNT, FORMAT, ARGVLIST) vswprintf(BUF, SIZE, FORMAT, ARGVLIST)
+#define fprintf_s fprintf
+#define sscanf_s sscanf
+#define fread_s(BUF, SIZE, NMEMB, MAX, HANDLE) fread(BUF, SIZE, NMEMB, HANDLE)
+
+//////////////////////////////////////////////////////////////////////////
+
+#ifndef __TRLTOA__
+#define __TRLTOA__
+extern char* ltoa (long i, char* a, int radix);
+#endif
+#define itoa ltoa
+
+//////////////////////////////////////////////////////////////////////////
+#if 0
+inline long int abs(long int x)
+{
+    return labs(x);
+}
+
+inline float abs(float x)
+{
+    return fabsf(x);
+}
+
+inline double abs(double x)
+{
+    return fabs(x);
+}
+
+inline float sqrt(float x)
+{
+    return sqrtf(x);
+}
+#else
+#include <cmath>
+using std::abs;
+using std::sqrt;
+using std::fabs;
+#endif
+
+extern char* _strtime(char* date);
+extern char* _strdate(char* date);
+
+#if !defined(_CPU_SSE)
+#define _MM_HINT_T0     (1)
+#define _MM_HINT_T1     (2)
+#define _MM_HINT_T2     (3)
+#define _MM_HINT_NTA    (0)
+inline void _mm_prefetch(const char*, int) { }
+#endif // !_CPU_SSE
+
+#endif //__cplusplus
+//////////////////////////////////////////////////////////////////////////
+// Byte Swapping functions
+
+inline unsigned short _byteswap_ushort(unsigned short input)
+{
+    return ((input & 0xff) << 8) | ((input & 0xff00) >> 8);
+}
+
+inline LONG _byteswap_ulong(LONG input)
+{
+    return (input & 0x000000ff) << 24 |
+           (input & 0x0000ff00) << 8 |
+           (input & 0x00ff0000) >> 8 |
+           (input & 0xff000000) >> 24;
+}
+
+inline unsigned long long   _byteswap_uint64(unsigned long long input)
+{
+    return (((input & 0xff00000000000000ull) >> 56) |
+            ((input & 0x00ff000000000000ull) >> 40) |
+            ((input & 0x0000ff0000000000ull) >> 24) |
+            ((input & 0x000000ff00000000ull) >> 8) |
+            ((input & 0x00000000ff000000ull) << 8) |
+            ((input & 0x0000000000ff0000ull) << 24) |
+            ((input & 0x000000000000ff00ull) << 40) |
+            ((input & 0x00000000000000ffull) << 56));
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H
+
+// vim:ts=2
+
diff --git a/Code/Legacy/CryCommon/LoadScreenBus.h b/Code/Legacy/CryCommon/LoadScreenBus.h
new file mode 100644
index 0000000000..4e285183ec
--- /dev/null
+++ b/Code/Legacy/CryCommon/LoadScreenBus.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#define AZ_LOADSCREENCOMPONENT_ENABLED      (1)
+
+#if AZ_LOADSCREENCOMPONENT_ENABLED
+
+#include <AzCore/Component/ComponentBus.h>
+
+class LoadScreenInterface
+    : public AZ::ComponentBus
+{
+public:
+    using MutexType = AZStd::recursive_mutex;
+
+    //! Invoked when the load screen should be updated and rendered. Single threaded loading only.
+    virtual void UpdateAndRender() = 0;
+
+    //! Invoked when the game load screen should become visible.
+    virtual void GameStart() = 0;
+
+    //! Invoked when the level load screen should become visible.
+    virtual void LevelStart() = 0;
+
+    //! Invoked when the load screen should be paused.
+    virtual void Pause() = 0;
+
+    //! Invoked when the load screen should be resumed.
+    virtual void Resume() = 0;
+
+    //! Invoked when the load screen should be stopped.
+    virtual void Stop() = 0;
+
+    //! Invoked to find out if loading screen is playing.
+    virtual bool IsPlaying() = 0;
+};
+using LoadScreenBus = AZ::EBus<LoadScreenInterface>;
+
+//! Interface for notifying load screen providers that specific load events are happening.
+//! This is meant to notify systems to connect/disconnect to the LoadScreenUpdateNotificationBus if necessary.
+struct LoadScreenNotifications
+    : public AZ::EBusTraits
+{
+    //! Invoked when the game/engine loading starts. Returns true if any provider handles this.
+    virtual bool NotifyGameLoadStart(bool usingLoadingThread) = 0;
+
+    //! Invoked when level loading starts. Returns true if any provider handles this.
+    virtual bool NotifyLevelLoadStart(bool usingLoadingThread) = 0;
+
+    //! Invoked when loading finishes.
+    virtual void NotifyLoadEnd() = 0;
+};
+using LoadScreenNotificationBus = AZ::EBus<LoadScreenNotifications>;
+
+//! Interface for triggering load screen updates and renders. Has different methods for single threaded vs multi threaded.
+//! This is a separate bus from the LoadScreenNotificationBus to avoid threading issues and to allow implementers to conditionally attach
+//! from inside LoadScreenNotificationBus::NotifyGameLoadStart/NotifyLevelLoadStart
+struct LoadScreenUpdateNotifications
+    : public AZ::EBusTraits
+{
+    //! Invoked when the load screen should be updated and rendered. Single threaded loading only.
+    virtual void UpdateAndRender(float deltaTimeInSeconds) = 0;
+
+    //! Invoked when the load screen should be updated. Multi-threaded loading only.
+    virtual void LoadThreadUpdate(float deltaTimeInSeconds) = 0;
+
+    //! Invoked when the load screen should be updated. Multi-threaded loading only.
+    virtual void LoadThreadRender() = 0;
+};
+using LoadScreenUpdateNotificationBus = AZ::EBus<LoadScreenUpdateNotifications>;
+
+#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
diff --git a/Code/Legacy/CryCommon/LocalizationManagerBus.h b/Code/Legacy/CryCommon/LocalizationManagerBus.h
new file mode 100644
index 0000000000..7fa4336a2d
--- /dev/null
+++ b/Code/Legacy/CryCommon/LocalizationManagerBus.h
@@ -0,0 +1,204 @@
+/*
+ * 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 <CrySizer.h>
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/string/conversions.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+// Forward declarations
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Localization Utility classes/functions.
+//////////////////////////////////////////////////////////////////////////
+
+template<typename... Args>
+AZStd::vector<AZStd::string> MakeLocKeyList(Args... args)
+{
+    return {args...};
+}
+
+// Helper functions for Localization and data-string substitution
+struct LocalizationHelpers
+{
+    // Returns the string version of any type convertible by std::to_string()
+    // otherwise throws a compile error.
+    template <typename T>
+    static AZStd::string DataToString(T t);
+
+    // Need a function to specifically handle std::string, since std::to_string() doesn't handle it.
+    static inline AZStd::string DataToString(AZStd::string str);
+
+    // Need a function to specifically handle const char*, since std::to_string() doesn't handle it.
+    static inline AZStd::string DataToString(const char* str);
+
+    // Base case of the recursive function to convert a data list to strings
+    template<typename T>
+    static void ConvertValuesToStrings(AZStd::vector<AZStd::string>& values, T t);
+
+    // Recursive function to convert a data list to strings
+    template<typename T, typename... Args>
+    static void ConvertValuesToStrings(AZStd::vector<AZStd::string>& values, T t, Args... args);
+
+    // Check if a key string is in a list of substitution strings
+    static inline bool IsKeyInList(const AZStd::vector<AZStd::string>& keys, const AZStd::string& target, int& index);
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Localization manager bus interface.
+//////////////////////////////////////////////////////////////////////////
+
+// Summary:
+//      Interface to the Localization Manager.
+class LocalizationManagerRequests
+    : public AZ::EBusTraits
+{
+public:
+    virtual bool SetLanguage(const char* sLanguage) = 0;
+    virtual const char* GetLanguage() = 0;
+
+    virtual int GetLocalizationFormat() const = 0;
+
+    // Get Localized subtitle file for current language
+    // Summary:
+    //  Provides the asset path of a video subtitle file based on the input video path name. Input localVideoPath
+    //  should contain the game-specific path after the current language folder. 
+    //  ex:
+    //      input: localVideoPath = "/VideoSubtitleSrt/100/101/101VT_01.bnk"
+    //      output: return "Localization/en-US/VideoSubtitleSrt/100/101/101VT_01.srt"
+    //
+    //  NOTE: System expects that video file has the same name as the subtitle file (other than the file extension).
+    virtual AZStd::string GetLocalizedSubtitleFilePath(const AZStd::string& localVideoPath, const AZStd::string& subtitleFileExtension) const = 0;
+
+    // Get the given xml for the current language
+    // Summary:
+    //  Provides the asset path of a localization xml file given the local path (e.g. the path starting from
+    //  your language folder).
+    virtual AZStd::string GetLocalizedLocXMLFilePath(const AZStd::string& localXmlPath) const = 0;
+
+    virtual bool LoadExcelXmlSpreadsheet(const char* sFileName, bool bReload = false) = 0;
+    virtual void ReloadData() = 0;
+
+    // Summary:
+    //   Translate a string into the currently selected language.
+    // Description:
+    //   Processes the input string and translates all labels contained into the currently selected language.
+    // Parameters:
+    //   sString             - String to be translated.
+    //   outLocalizedString  - Translated version of the string.
+    //   bEnglish            - if true, translates the string into the always present English language.
+    // Returns:
+    //   true if localization was successful, false otherwise
+    virtual bool LocalizeString_ch(const char* sString, string& outLocalizedString, bool bEnglish = false) = 0;
+
+    // Summary:
+    //   Same as LocalizeString( const char* sString, string& outLocalizedString, bool bEnglish=false )
+    //   but at the moment this is faster.
+    virtual bool LocalizeString_s(const string& sString, string& outLocalizedString, bool bEnglish = false) = 0;
+
+    // Set up system for passing in placeholder data for localized strings
+    // Summary:
+    //   Parse localized string and substitute data in for each key that is surrounded by curly braces
+    //   ie. {player_name}
+    virtual void LocalizeAndSubstituteInternal(AZStd::string& locString, const AZStd::vector<AZStd::string>& keys, const AZStd::vector<AZStd::string>& values) = 0;
+
+    // Summary:
+    //   Parse localized string and substitute data in for each key that is surrounded by curly braces. Number of arguments 
+    //   after 'const AZStd::vector<AZStd::string>& keys' should be equal to the number of strings in 'keys'.
+    //   ex:
+    //        float distance = GetWinDistance();
+    //        AZStd::string winState = IsPlayerFirstPlace() ? "won" : "lost";
+    //        LocalizationManagerRequests::Broadcast(&LocalizationManagerRequests::Events::LocalizeAndSubstitute<float, AZStd::string>
+    //                                          , "@QUICKRESULTS_DISTANCEDIFFERENCE, outLocalizedString
+    //                                          , MakeLocKeyString("race_result", "distance_ahead")
+    //                                          , winState, distance);
+    //
+    //  where "@QUICKRESULTS_DISTANCEDIFFERENCE" would be localized to "You {race_result} by {distance_ahead} meters!" and then 
+    //  "{race_result}" would be replaced by 'winState" and "{distance_ahead}" would be replaced by the 'distance' argument as a string.
+    template<typename T, typename... Args>
+    void LocalizeAndSubstitute(const AZStd::string& locString, AZStd::string& outLocalizedString, const AZStd::vector<AZStd::string>& keys, T t, Args... args);
+
+    // Summary:
+    //   Return the localized version corresponding to a label.
+    // Description:
+    //   A label has to start with '@' sign.
+    // Parameters:
+    //   sLabel              - Label to be translated, must start with '@' sign.
+    //   outLocalizedString  - Localized version of the label.
+    //   bEnglish            - if true, returns the always present English version of the label.
+    // Returns:
+    //   True if localization was successful, false otherwise.
+    virtual bool LocalizeLabel(const char* sLabel, string& outLocalizedString, bool bEnglish = false) = 0;
+
+    // Summary:
+    //   Return number of localization entries.
+    virtual int  GetLocalizedStringCount() = 0;
+
+    // Summary:
+    //   Get the english localization info structure corresponding to a key.
+    // Parameters:
+    //   sKey         - Key to be looked up. Key = Label without '@' sign.
+    //   sLocalizedString - Corresponding english language string.
+    // Returns:
+    //   True if successful, false otherwise (key not found).
+    virtual bool GetEnglishString(const char* sKey, string& sLocalizedString) = 0;
+
+    // Summary:
+    //   Get Subtitle for Key or Label .
+    // Parameters:
+    //   sKeyOrLabel    - Key or Label to be used for subtitle lookup. Key = Label without '@' sign.
+    //   outSubtitle    - Subtitle (untouched if Key/Label not found).
+    //   bForceSubtitle - If true, get subtitle (sLocalized or sEnglish) even if not specified in Data file.
+    // Returns:
+    //   True if subtitle found (and outSubtitle filled in), false otherwise.
+    virtual bool GetSubtitle(const char* sKeyOrLabel, string& outSubtitle, bool bForceSubtitle = false) = 0;
+
+    // Description:
+    //      These methods format outString depending on sString with ordered arguments
+    //      FormatStringMessage(outString, "This is %2 and this is %1", "second", "first");
+    // Arguments:
+    //      outString - This is first and this is second.
+    virtual void FormatStringMessage_List(string& outString, const string& sString, const char** sParams, int nParams) = 0;
+    virtual void FormatStringMessage(string& outString, const string& sString, const char* param1, const char* param2 = 0, const char* param3 = 0, const char* param4 = 0) = 0;
+
+    virtual void LocalizeTime(time_t t, bool bMakeLocalTime, bool bShowSeconds, string& outTimeString) = 0;
+    virtual void LocalizeDate(time_t t, bool bMakeLocalTime, bool bShort, bool bIncludeWeekday, string& outDateString) = 0;
+    virtual void LocalizeDuration(int seconds, string& outDurationString) = 0;
+    virtual void LocalizeNumber(int number, string& outNumberString) = 0;
+    virtual void LocalizeNumber_Decimal(float number, int decimals, string& outNumberString) = 0;
+
+    // Summary:
+    //   Returns true if the project has localization configured for use, false otherwise.
+    virtual bool ProjectUsesLocalization() const = 0;
+    // </interfuscator:shuffle>
+
+};
+using LocalizationManagerRequestBus = AZ::EBus<LocalizationManagerRequests>;
+
+// Summary:
+//      Simple bus that notifies listeners that the language (g_language) has changed.
+class LanguageChangeNotification
+    : public AZ::EBusTraits
+{
+public:
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+
+    virtual ~LanguageChangeNotification() = default;
+
+    virtual void LanguageChanged() = 0;
+};
+
+using LanguageChangeNotificationBus = AZ::EBus<LanguageChangeNotification>;
+
+// Set up system for passing in placeholder data for localized strings
+#include "LocalizationManagerBus.inl"
+
diff --git a/Code/Legacy/CryCommon/LocalizationManagerBus.inl b/Code/Legacy/CryCommon/LocalizationManagerBus.inl
new file mode 100644
index 0000000000..adc4167e78
--- /dev/null
+++ b/Code/Legacy/CryCommon/LocalizationManagerBus.inl
@@ -0,0 +1,81 @@
+/*
+ * 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
+ *
+ */
+
+
+
+// Returns the string version of any type convertible by AZStd::to_string()
+// otherwise throws a compile error.
+template <typename T>
+AZStd::string LocalizationHelpers::DataToString(T t)
+{
+    return AZStd::to_string(t);
+}
+
+// Need a function to specifically handle AZStd::string, since AZStd::to_string() doesn't handle it.
+AZStd::string LocalizationHelpers::DataToString(AZStd::string str)
+{
+    return str;
+}
+
+// Need a function to specifically handle const char*, since AZStd::to_string() doesn't handle it.
+AZStd::string LocalizationHelpers::DataToString(const char* str)
+{
+    return str;
+}
+
+// Base case of the recursive function to convert a data list to strings
+template<typename T>
+void LocalizationHelpers::ConvertValuesToStrings(AZStd::vector<AZStd::string>& values, T t)
+{
+    values.push_back(DataToString(t));
+}
+
+// Recursive function to convert a data list to strings
+template<typename T, typename... Args>
+void LocalizationHelpers::ConvertValuesToStrings(AZStd::vector<AZStd::string>& values, T t, Args... args)
+{
+    values.push_back(DataToString(t));
+    ConvertValuesToStrings(values, args...);
+}
+
+// Check if a key string is in a list of substitution strings
+bool LocalizationHelpers::IsKeyInList(const AZStd::vector<AZStd::string>& keys, const AZStd::string& target, int& index)
+{
+    for (index = 0; index < keys.size(); ++index)
+    {
+        if (keys[index] == target)
+        {
+            return true;
+        }
+    }
+
+    index = -1;
+    return false;
+}
+
+// Summary:
+//   Parse localized string and substitute data in for each key that is surrounded by curly braces. Number of arguments 
+//   after 'const AZStd::vector<AZStd::string>& keys' should be equal to the number of strings in 'keys'.
+//   ex:
+//        float distance = GetWinDistance();
+//        AZStd::string winState = IsPlayerFirstPlace() ? "won" : "lost";
+//        LocalizationManagerRequests::Broadcast(&LocalizationManagerRequests::Events::LocalizeAndSubstitute<float, AZStd::string>
+//                                          , "@QUICKRESULTS_DISTANCEDIFFERENCE, outLocalizedString
+//                                          , MakeLocKeyString("race_result", "distance_ahead")
+//                                          , winState, distance);
+//
+//  where "@QUICKRESULTS_DISTANCEDIFFERENCE" would be localized to "You {race_result} by {distance_ahead} meters!" and then 
+//  "{race_result}" would be replaced by 'winState" and "{distance_ahead}" would be replaced by the 'distance' argument as a string.
+template<typename T, typename... Args>
+void LocalizationManagerRequests::LocalizeAndSubstitute(const AZStd::string& locString, AZStd::string& outLocalizedString, const AZStd::vector<AZStd::string>& keys, T t, Args... args)
+{    
+    AZStd::vector<AZStd::string> values;
+    LocalizationHelpers::ConvertValuesToStrings(values, t, args...);
+
+    outLocalizedString = locString;
+    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::LocalizeAndSubstituteInternal, outLocalizedString, keys, values);
+}
diff --git a/Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h b/Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h
new file mode 100644
index 0000000000..21eba4c674
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h
@@ -0,0 +1,1324 @@
+/*
+ * 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 <Range.h>
+#include <AnimKey.h>
+#include <ITimer.h>
+#include <IPhysics.h>
+#include <VectorSet.h>
+#include <CryName.h>
+#include <LyShine/ILyShine.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/Math/Vector4.h>
+#include <AzCore/Math/Color.h>
+
+// forward declaration.
+struct IUiAnimTrack;
+struct IUiAnimNode;
+struct IUiAnimSequence;
+struct IUiAnimationSystem;
+struct IKey;
+class XmlNodeRef;
+struct ISplineInterpolator;
+
+namespace AZ
+{
+    class Component;
+    class Entity;
+    class SerializeContext;
+}
+
+#define MAX_ANIM_NAME_LENGTH 64
+
+#if !defined(CONSOLE)
+#define UI_ANIMATION_SYSTEM_SUPPORT_EDITING
+#endif
+
+typedef AZStd::vector<IUiAnimSequence*> UiAnimSequences;
+typedef AZStd::vector<AZStd::string> UiTrackEvents;
+
+//////////////////////////////////////////////////////////////////////////
+//! Node-Types
+//
+// You need to register new types in UiAnimationSystem.cpp/RegisterNodeTypes for serialization.
+// Note: Enums are serialized by string now, there is no need for specific IDs
+// anymore for new parameters. Values are for backward compatibility.
+enum EUiAnimNodeType
+{
+    eUiAnimNodeType_Invalid                 = 0x00,
+    eUiAnimNodeType_Entity                  = 0x01,
+    eUiAnimNodeType_Director                = 0x02,
+    eUiAnimNodeType_Camera                  = 0x03,
+    eUiAnimNodeType_CVar                    = 0x04,
+    eUiAnimNodeType_ScriptVar               = 0x05,
+    eUiAnimNodeType_Material                = 0x06,
+    eUiAnimNodeType_Event                   = 0x07,
+    eUiAnimNodeType_Group                   = 0x08,
+    eUiAnimNodeType_Layer                   = 0x09,
+    eUiAnimNodeType_Comment                 = 0x10,
+    eUiAnimNodeType_RadialBlur              = 0x11,
+    eUiAnimNodeType_ColorCorrection         = 0x12,
+    eUiAnimNodeType_DepthOfField            = 0x13,
+    eUiAnimNodeType_ScreenFader             = 0x14,
+    eUiAnimNodeType_Light                   = 0x15,
+    eUiAnimNodeType_HDRSetup                = 0x16,
+    eUiAnimNodeType_ShadowSetup             = 0x17,
+    eUiAnimNodeType_Alembic                 = 0x18, // Used in cinebox, added so nobody uses that number
+    eUiAnimNodeType_GeomCache               = 0x19,
+    eUiAnimNodeType_Environment,
+    eUiAnimNodeType_ScreenDropsSetup,
+    eUiAnimNodeType_AzEntity,
+    eUiAnimNodeType_Num
+};
+
+//! Flags that can be set on animation node.
+enum EUiAnimNodeFlags
+{
+    eUiAnimNodeFlags_Expanded               = BIT(0), //!< Deprecated, handled by sandbox now
+    eUiAnimNodeFlags_EntitySelected         = BIT(1), //!< Set if the referenced entity is selected in the editor
+    eUiAnimNodeFlags_CanChangeName          = BIT(2), //!< Set if this node allow changing of its name.
+    eUiAnimNodeFlags_Disabled               = BIT(3), //!< Disable this node.
+};
+
+// Static common parameters IDs of animation node.
+//
+// You need to register new params in UiAnimationSystem.cpp/RegisterParamTypes for serialization.
+// Note: Enums are serialized by string now, there is no need for specific IDs
+// anymore for new parameters. Values are for backward compatibility.
+//
+// If you want to expand UI Animation system to control new stuff this is probably  the enum you want to change.
+// For named params see eUiAnimParamType_ByString & CUiAnimParamType
+enum EUiAnimParamType : int
+{
+    eUiAnimParamType_AzComponentField,
+    eUiAnimParamType_Event,
+    eUiAnimParamType_TrackEvent,
+    eUiAnimParamType_Float,
+    eUiAnimParamType_ByString,
+    eUiAnimParamType_User                               = 100000, //!< User node params.
+
+    eUiAnimParamType_Invalid                            = -1
+};
+
+// Common parameters of animation node.
+class CUiAnimParamType
+{
+    friend class UiAnimationSystem;
+
+public:
+    AZ_TYPE_INFO(CUiAnimParamType, "{3D4ADD98-DFDD-4984-AC59-E59C5D718CFC}")
+
+    static const uint kParamTypeVersion = 8;
+
+    CUiAnimParamType()
+        : m_type(eUiAnimParamType_Invalid) {}
+
+    CUiAnimParamType(const string& name)
+    {
+        *this = name;
+    }
+
+    CUiAnimParamType(const EUiAnimParamType type)
+    {
+        *this = type;
+    }
+
+    // Convert from old enum or int
+    void operator =(const int type)
+    {
+        m_type = (EUiAnimParamType)type;
+    }
+
+    void operator =(const string& name)
+    {
+        m_type = eUiAnimParamType_ByString;
+        m_name = name;
+    }
+
+    void operator =(const AZStd::string& name)
+    {
+        m_type = eUiAnimParamType_ByString;
+        m_name = name.c_str();
+    }
+    // Convert to enum. This needs to be explicit,
+    // otherwise operator== will be ambiguous
+    EUiAnimParamType GetType() const { return m_type; }
+
+    // Get name
+    const char* GetName() const { return m_name.c_str(); }
+
+    bool operator ==(const CUiAnimParamType& animParamType) const
+    {
+        if (m_type == eUiAnimParamType_ByString && animParamType.m_type == eUiAnimParamType_ByString)
+        {
+            return m_name == animParamType.m_name;
+        }
+
+        return m_type == animParamType.m_type;
+    }
+
+    bool operator !=(const CUiAnimParamType& animParamType) const
+    {
+        return !(*this == animParamType);
+    }
+
+    bool operator <(const CUiAnimParamType& animParamType) const
+    {
+        if (m_type == eUiAnimParamType_ByString && animParamType.m_type == eUiAnimParamType_ByString)
+        {
+            return m_name < animParamType.m_name;
+        }
+        else if (m_type == eUiAnimParamType_ByString)
+        {
+            return false; // Always sort named params last
+        }
+        else if (animParamType.m_type == eUiAnimParamType_ByString)
+        {
+            return true; // Always sort named params last
+        }
+        if (m_type < animParamType.m_type)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    // Serialization. Defined in UiAnimationSystem.cpp
+    inline void Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading, const uint version = kParamTypeVersion);
+
+private:
+    EUiAnimParamType m_type;
+    CCryName m_name;
+};
+
+// The data required to identify a specific parameter/property on an AZ component on an AZ entity
+class UiAnimParamData
+{
+    friend class UiAnimationSystem;
+
+public:
+
+    AZ_TYPE_INFO(UiAnimParamData, "{B2E9F22C-8DB5-40FA-9DF1-276E91BA8B95}")
+
+    UiAnimParamData()
+        : m_componentId(AZ::InvalidComponentId)
+        , m_typeId(0)
+        , m_offset(0)
+    {}
+
+    UiAnimParamData(AZ::ComponentId componentId, const char* name, AZ::Uuid typeId, size_t offset)
+        : m_componentId(componentId)
+        , m_typeId(typeId)
+        , m_name(name)
+        , m_offset(offset)
+    {}
+
+    AZ::ComponentId GetComponentId() const
+    {
+        return m_componentId;
+    }
+
+    AZ::Uuid GetTypeId() const
+    {
+        return m_typeId;
+    }
+
+    const char* GetName() const
+    {
+        return m_name.c_str();
+    }
+
+    size_t GetOffset() const
+    {
+        return m_offset;
+    }
+
+    AZ::Component* GetComponent(AZ::Entity* entity) const
+    {
+        return entity->FindComponent(m_componentId);
+    }
+
+    bool operator ==(const UiAnimParamData& animParamData) const
+    {
+        return m_componentId == animParamData.m_componentId &&
+               m_typeId == animParamData.m_typeId &&
+               m_offset == animParamData.m_offset;
+    }
+
+    bool operator !=(const UiAnimParamData& animParamData) const
+    {
+        return !(*this == animParamData);
+    }
+
+    bool operator <(const UiAnimParamData& animParamData) const
+    {
+        if (m_componentId != animParamData.m_componentId)
+        {
+            return m_componentId < animParamData.m_componentId;
+        }
+        else if (m_name != animParamData.m_name)
+        {
+            return m_name < animParamData.m_name;
+        }
+        else if (m_typeId != animParamData.m_typeId)
+        {
+            return m_typeId < animParamData.m_typeId;
+        }
+        else
+        {
+            return m_offset < animParamData.m_offset;
+        }
+    }
+
+
+    // Serialization. Defined in UiAnimationSystem.cpp
+    inline void Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading);
+
+private:
+    AZ::ComponentId     m_componentId;  // unique within the owning entity
+    AZ::Uuid            m_typeId;
+    AZStd::string       m_name;     // the name of the element in serialization data
+    size_t              m_offset;
+};
+
+//! Types of animation track.
+// Do not change values! they are serialized
+//
+// Attention: This should only be expanded if you add a completely new way how tracks store data!
+// If you just want to control a new parameter of an entity etc. extend EParamType
+//
+// Note: TCB splines are only for backward compatibility, Bezier is the default
+//
+enum EUiAnimCurveType
+{
+    eUiAnimCurveType_TCBFloat           = 1,
+    eUiAnimCurveType_TCBVector          = 2,
+    eUiAnimCurveType_TCBQuat            = 3,
+    eUiAnimCurveType_BezierFloat        = 4,
+
+    eUiAnimCurveType_Unknown            = 0xFFFFFFFF
+};
+
+//! Values that animation track can hold.
+// Do not change values! they are serialized
+//
+// Attention: This should only be expanded if you add a completely new value type that tracks can control!
+// If you just want to control a new parameter of an entity etc. extend EParamType
+//
+// Note: If the param type of a track is known and valid these can be derived from the node.
+//       These are serialized in case the parameter got invalid (for example for material nodes)
+//
+enum EUiAnimValue
+{
+    eUiAnimValue_Float          = 0,
+    eUiAnimValue_Vector         = 1,
+    eUiAnimValue_Quat           = 2,
+    eUiAnimValue_Bool           = 3,
+    eUiAnimValue_Select         = 5,
+    eUiAnimValue_Vector2        = 13,
+    eUiAnimValue_Vector3        = 14,
+    eUiAnimValue_Vector4        = 15,
+    eUiAnimValue_DiscreteFloat  = 16,
+    eUiAnimValue_RGB            = 20,
+    eUiAnimValue_CharacterAnim  = 21,
+
+    eUiAnimValue_Unknown        = 0xFFFFFFFF
+};
+
+enum EUiTrackMask
+{
+    eUiTrackMask_MaskSound = 1 << 11, // Old: 1 << ATRACK_SOUND
+    eUiTrackMask_MaskMusic = 1 << 14, // Old: 1 << ATRACK_MUSIC
+};
+
+//! Structure passed to Animate function.
+struct SUiAnimContext
+{
+    SUiAnimContext()
+    {
+        bSingleFrame = false;
+        bForcePlay = false;
+        bResetting = false;
+        time = 0;
+        dt = 0;
+        fps = 0;
+        pSequence = NULL;
+        trackMask = 0;
+        startTime = 0;
+    }
+
+    float time;                     //!< Current time in seconds.
+    float   dt;                     //!< Delta of time from previous animation frame in seconds.
+    float   fps;                    //!< Last calculated frames per second value.
+    bool bSingleFrame;              //!< This is not a playing animation, more a single-frame update
+    bool bForcePlay;                //!< Set when force playing animation
+    bool bResetting;                //!< Set when animation sequence is resetted.
+
+    IUiAnimSequence* pSequence;     //!< Sequence in which animation performed.
+
+    // TODO: Replace trackMask with something more type safe
+    // TODO: Mask should be stored with dynamic length
+    uint32 trackMask;               //!< To update certain types of tracks only
+    float startTime;                //!< The start time of this playing sequence
+
+    void Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading);
+};
+
+/** Parameters for cut-scene cameras
+*/
+//! Callback-class
+struct IUiAnimationCallback
+{
+    //! Callback-reasons
+    enum ECallbackReason
+    {
+        CBR_CHANGENODE, // Node is changing.
+        CBR_CHANGETRACK // Track of the node is changing.
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IUiAnimationCallback(){}
+    // Called by UI animation system.
+    virtual void OnUiAnimationCallback(ECallbackReason reason, IUiAnimNode* pNode) = 0;
+    // </interfuscator:shuffle>
+};
+
+/** Interface of Animation Track.
+*/
+struct IUiAnimTrack
+{
+    AZ_RTTI(IUiAnimTrack, "{11C16CEC-4C03-4342-B4A7-62790E48CBD5}")
+
+    //! Flags that can be set on animation track.
+    enum EUiAnimTrackFlags
+    {
+        eUiAnimTrackFlags_Linear   = BIT(1), //!< Use only linear interpolation between keys.
+        eUiAnimTrackFlags_Loop     = BIT(2), //!< Play this track in a loop.
+        eUiAnimTrackFlags_Cycle    = BIT(3), //!< Cycle track.
+        eUiAnimTrackFlags_Disabled = BIT(4), //!< Disable this track.
+
+        //////////////////////////////////////////////////////////////////////////
+        // Used by editor.
+        //////////////////////////////////////////////////////////////////////////
+        eUiAnimTrackFlags_Hidden   = BIT(5), //!< Set when track is hidden in UI Animation editor.
+        eUiAnimTrackFlags_Muted    = BIT(8), //!< Mute this sound track. This only affects the playback in editor.
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IUiAnimTrack() {};
+
+    // for intrusive_ptr support
+    virtual void add_ref() = 0;
+    virtual void release() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual EUiAnimCurveType GetCurveType() = 0;
+    virtual EUiAnimValue     GetValueType() = 0;
+
+#ifdef UI_ANIMATION_SYSTEM_SUPPORT_EDITING
+    // This color is used for the editor.
+    virtual ColorB GetCustomColor() const = 0;
+    virtual void SetCustomColor(ColorB color) = 0;
+    virtual bool HasCustomColor() const = 0;
+    virtual void ClearCustomColor() = 0;
+#endif
+
+    // Return what parameter of the node, this track is attached to.
+    virtual const CUiAnimParamType& GetParameterType() const = 0;
+
+    // Assign node parameter ID for this track.
+    virtual void SetParameterType(CUiAnimParamType type) = 0;
+
+    virtual const UiAnimParamData& GetParamData() const = 0;
+
+    virtual void SetParamData(const UiAnimParamData& param) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Animation track can contain sub-tracks (Position XYZ anim track have sub-tracks for x,y,z)
+    // Get count of sub tracks.
+    virtual int GetSubTrackCount() const = 0;
+    // Retrieve pointer the specfied sub track.
+    virtual IUiAnimTrack* GetSubTrack(int nIndex) const = 0;
+    virtual const char* GetSubTrackName(int nIndex) const = 0;
+    virtual void SetSubTrackName(int nIndex, const char* name) = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual void GetKeyValueRange(float& fMin, float& fMax) const = 0;
+    virtual void SetKeyValueRange(float fMin, float fMax) = 0;
+
+    //! Return number of keys in track.
+    virtual int GetNumKeys() const = 0;
+
+    //! Return true if keys exists in this track
+    virtual bool HasKeys() const = 0;
+
+    //! Set number of keys in track.
+    //! If needed adds empty keys at end or remove keys from end.
+    virtual void SetNumKeys(int numKeys) = 0;
+
+    //! Remove specified key.
+    virtual void RemoveKey(int num) = 0;
+
+    //! Get key at specified location.
+    //! @param key Must be valid pointer to compatible key structure, to be filled with specified key location.
+    virtual void GetKey(int index, IKey* key) const = 0;
+
+    //! Get time of specified key.
+    //! @return key time.
+    virtual float GetKeyTime(int index) const = 0;
+
+    //! Find key at given time.
+    //! @return Index of found key, or -1 if key with this time not found.
+    virtual int FindKey(float time) = 0;
+
+    //! Get flags of specified key.
+    //! @return key time.
+    virtual int GetKeyFlags(int index) = 0;
+
+    //! Set key at specified location.
+    //! @param key Must be valid pointer to compatible key structure.
+    virtual void SetKey(int index, IKey* key) = 0;
+
+    //! Set time of specified key.
+    virtual void SetKeyTime(int index, float time) = 0;
+
+    //! Set flags of specified key.
+    virtual void SetKeyFlags(int index, int flags) = 0;
+
+    //! Sort keys in track (after time of keys was modified).
+    virtual void SortKeys() = 0;
+
+    //! Get track flags.
+    virtual int GetFlags() = 0;
+
+    //! Check if track is masked by mask
+    // TODO: Mask should be stored with dynamic length
+    virtual bool IsMasked(const uint32 mask) const = 0;
+
+    //! Set track flags.
+    virtual void SetFlags(int flags) = 0;
+
+    //! Create key at given time, and return its index.
+    //! @return Index of new key.
+    virtual int CreateKey(float time) = 0;
+
+    //! Clone key at specified index.
+    //! @retun Index of new key.
+    virtual int CloneKey(int key) = 0;
+
+    //! Clone key at specified index from another track of SAME TYPE.
+    //! @retun Index of new key.
+    virtual int CopyKey(IUiAnimTrack* pFromTrack, int nFromKey) = 0;
+
+    //! Get info about specified key.
+    //! @param Short human readable text description of this key.
+    //! @param duration of this key in seconds.
+    virtual void GetKeyInfo(int key, const char*& description, float& duration) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Get track value at specified time.
+    // Interpolates keys if needed.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void GetValue(float time, float& value) = 0;
+    virtual void GetValue(float time, Vec3& value) = 0;
+    virtual void GetValue(float time, Vec4& value) = 0;
+    virtual void GetValue(float time, Quat& value) = 0;
+    virtual void GetValue(float time, bool& value) = 0;
+    virtual void GetValue(float time, AZ::Vector2& value) = 0;
+    virtual void GetValue(float time, AZ::Vector3& value) = 0;
+    virtual void GetValue(float time, AZ::Vector4& value) = 0;
+    virtual void GetValue(float time, AZ::Color& value) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set track value at specified time.
+    // Adds new keys if required.
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetValue(float time, const float& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const Vec3& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const Vec4& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const Quat& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const bool& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const AZ::Vector2& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const AZ::Vector3& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const AZ::Vector4& value, bool bDefault = false) = 0;
+    virtual void SetValue(float time, const AZ::Color& value, bool bDefault = false) = 0;
+
+    // Only for position tracks, offset all track keys by this amount.
+    virtual void OffsetKeyPosition(const Vec3& value) = 0;
+
+    // Assign active time range for this track.
+    virtual void SetTimeRange(const Range& timeRange) = 0;
+
+    // Serialize this animation track to XML.
+    virtual bool Serialize(IUiAnimationSystem* uiAnimationSystem, XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks = true) = 0;
+    virtual bool SerializeSelection(XmlNodeRef& xmlNode, bool bLoading, bool bCopySelected = false, float fTimeOffset = 0) = 0;
+
+    virtual void InitPostLoad(IUiAnimSequence* /*sequence*/) {};
+
+    //! For custom track animate parameters.
+    virtual void Animate([[maybe_unused]] SUiAnimContext& ec) {};
+
+    // Get access to the internal spline of the track.
+    virtual ISplineInterpolator* GetSpline() const { return 0; };
+
+    virtual bool IsKeySelected([[maybe_unused]] int key) const { return false; }
+
+    virtual void SelectKey([[maybe_unused]] int key, [[maybe_unused]] bool select) {}
+
+    //! Return the index of the key which lies right after the given key in time.
+    //! @param key Index of of key.
+    //! @return Index of the next key in time. If the last key given, this returns -1.
+    // In case of keys sorted, it's just 'key+1', but if not sorted, it can be another value.
+    virtual int NextKeyByTime(int key) const
+    {
+        if (key + 1 < GetNumKeys())
+        {
+            return key + 1;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    //! Get the animation layer index assigned. (only for character/look-at tracks ATM)
+    virtual int GetAnimationLayerIndex() const { return -1; }
+    //! Set the animation layer index. (only for character/look-at tracks ATM)
+    virtual void SetAnimationLayerIndex([[maybe_unused]] int index) { }
+
+    // </interfuscator:shuffle>
+};
+
+
+/** Callback called by animation node when its animated.
+*/
+struct IUiAnimNodeOwner
+{
+    // <interfuscator:shuffle>
+    virtual ~IUiAnimNodeOwner(){}
+    virtual void OnNodeUiAnimated(IUiAnimNode* pNode) = 0;
+    virtual void OnNodeVisibilityChanged(IUiAnimNode* pNode, const bool bHidden) = 0;
+    virtual void OnNodeReset([[maybe_unused]] IUiAnimNode* pNode) {}
+
+    // </interfuscator:shuffle>
+};
+
+/** Base class for all Animation nodes,
+        can host multiple animation tracks, and execute them other time.
+        Animation node is reference counted.
+*/
+struct IUiAnimNode
+{
+public:
+    AZ_RTTI(IUiAnimNode, "{298180CC-B577-440C-8466-A01ABC8CC00A}")
+
+    //////////////////////////////////////////////////////////////////////////
+    // Supported params.
+    //////////////////////////////////////////////////////////////////////////
+    enum ESupportedParamFlags
+    {
+        eSupportedParamFlags_MultipleTracks = 0x01, // Set if parameter can be assigned multiple tracks.
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IUiAnimNode() {};
+
+    // for intrusive_ptr support
+    virtual void add_ref() = 0;
+    virtual void release() = 0;
+
+    //! Set node name.
+    virtual void SetName(const char* name) = 0;
+
+    //! Get node name.
+    virtual const char* GetName() = 0;
+
+    // Get Type of this node.
+    virtual EUiAnimNodeType GetType() const = 0;
+
+    // Return Animation Sequence that owns this node.
+    virtual IUiAnimSequence* GetSequence() const = 0;
+
+    // Set the Animation Sequence that owns this node.
+    virtual void SetSequence(IUiAnimSequence* sequence) = 0;
+
+    // Called when sequence is activated / deactivated
+    virtual void Activate(bool bActivate) = 0;
+
+    // Set AnimNode flags.
+    // @param flags One or more flags from EUiAnimNodeFlags.
+    // @see EUiAnimNodeFlags
+    virtual void SetFlags(int flags) = 0;
+
+    // Get AnimNode flags.
+    // @return flags set on node.
+    // @see EUiAnimNodeFlags
+    virtual int GetFlags() const = 0;
+
+    // Return animation system that created this node.
+    virtual IUiAnimationSystem* GetUiAnimationSystem() const = 0;
+
+    // General Set param.
+    // Set float/vec3/vec4 parameter at given time.
+    // @return true if parameter set, false if this parameter not exist in node.
+    virtual bool SetParamValue(float time, CUiAnimParamType param, float value) = 0;
+    virtual bool SetParamValue(float time, CUiAnimParamType param, const Vec3& value) = 0;
+    virtual bool SetParamValue(float time, CUiAnimParamType param, const Vec4& value) = 0;
+    // Get float/vec3/vec4 parameter at given time.
+    // @return true if parameter exist, false if this parameter not exist in node.
+    virtual bool GetParamValue(float time, CUiAnimParamType param, float& value) = 0;
+    virtual bool GetParamValue(float time, CUiAnimParamType param, Vec3& value) = 0;
+    virtual bool GetParamValue(float time, CUiAnimParamType param, Vec4& value) = 0;
+
+    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] float value) { return false; }
+    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] bool value) { return false; }
+    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] int value) { return false; }
+    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] unsigned int value) { return false; }
+    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] const AZ::Vector2& value) { return false; }
+    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] const AZ::Vector3& value) { return false; }
+    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] const AZ::Vector4& value) { return false; }
+    virtual bool SetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] const AZ::Color& value) { return false; }
+
+    virtual bool GetParamValueAz([[maybe_unused]] float time, [[maybe_unused]] const UiAnimParamData& param, [[maybe_unused]] float& value) { return false; }
+
+    //! Evaluate animation node while not playing animation.
+    virtual void StillUpdate() = 0;
+
+    //! Evaluate animation to the given time.
+    virtual void Animate(SUiAnimContext& ec) = 0;
+
+    // Description:
+    //      Returns number of supported parameters by this animation node (position,rotation,scale,etc..).
+    // Returns:
+    //      Number of supported parameters.
+    virtual unsigned int GetParamCount() const = 0;
+
+    // Description:
+    //      Returns the type of a param by index
+    // Arguments:
+    //      nIndex - parameter index in range 0 <= nIndex < GetSupportedParamCount()
+    virtual CUiAnimParamType GetParamType(unsigned int nIndex) const = 0;
+
+    // Description:
+    //      Check if parameter is supported by this node.
+    virtual bool IsParamValid(const CUiAnimParamType& paramType) const = 0;
+
+    // Description:
+    //      Returns name of supported parameter of this animation node or NULL if not available
+    // Arguments:
+    //          paramType - parameter id
+    virtual const char* GetParamName(const CUiAnimParamType& paramType) const = 0;
+
+    // Description:
+    //      Returns name of supported parameter of this animation node or NULL if not available
+    // Arguments:
+    //          paramType - parameter id
+    virtual const char* GetParamNameForTrack(const CUiAnimParamType& paramType, [[maybe_unused]] const IUiAnimTrack* track) const { return GetParamName(paramType); }
+
+    // Description:
+    //      Returns the params value type
+    virtual EUiAnimValue GetParamValueType(const CUiAnimParamType& paramType) const = 0;
+
+    // Description:
+    //      Returns the params value type
+    virtual ESupportedParamFlags GetParamFlags(const CUiAnimParamType& paramType) const = 0;
+
+    // Called node data is re-initialized, such as when changing the entity associated with it.
+    virtual void OnReset() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Working with Tracks.
+    //////////////////////////////////////////////////////////////////////////
+    virtual int GetTrackCount() const = 0;
+
+    // Return track assigned to the specified parameter.
+    virtual IUiAnimTrack* GetTrackByIndex(int nIndex) const = 0;
+
+    // Return first track assigned to the specified parameter.
+    virtual IUiAnimTrack* GetTrackForParameter(const CUiAnimParamType& paramType) const = 0;
+
+    // Return the i-th track assigned to the specified parameter in case of multiple tracks.
+    virtual IUiAnimTrack* GetTrackForParameter(const CUiAnimParamType& paramType, uint32 index) const = 0;
+
+    // Get the index of a given track among tracks with the same parameter type in this node.
+    virtual uint32 GetTrackParamIndex(const IUiAnimTrack* pTrack) const = 0;
+
+    // Creates a new track for given parameter.
+    virtual IUiAnimTrack* CreateTrack(const CUiAnimParamType& paramType) = 0;
+
+    // Return track assigned to the specified class element.
+    // Maybe we should pass nameCrc rather than a void*
+    virtual IUiAnimTrack* GetTrackForAzField(const UiAnimParamData& param) const = 0;
+
+    // Creates a new track for given parameter.
+    // Maybe we should pass nameCrc rather than a void*
+    virtual IUiAnimTrack* CreateTrackForAzField(const UiAnimParamData& param) = 0;
+
+    // Assign animation track to parameter.
+    // if track parameter is NULL track with parameter id param will be removed.
+    virtual void SetTrack(const CUiAnimParamType& paramType, IUiAnimTrack* track) = 0;
+
+    // Set time range for all tracks in this sequence.
+    virtual void SetTimeRange(Range timeRange) = 0;
+
+    // Remove track from anim node.
+    virtual void AddTrack(IUiAnimTrack* pTrack) = 0;
+
+    // Remove track from anim node.
+    virtual bool RemoveTrack(IUiAnimTrack* pTrack) = 0;
+
+    // Description:
+    //      Creates default set of tracks supported by this node.
+    virtual void CreateDefaultTracks() = 0;
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Callback for animation node used by editor.
+    // Register notification callback with animation node.
+    virtual void SetNodeOwner(IUiAnimNodeOwner* pOwner) = 0;
+    virtual IUiAnimNodeOwner* GetNodeOwner() = 0;
+
+    // Serialize this animation node to XML.
+    virtual void SerializeUiAnims(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks) = 0;
+    virtual void Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks) = 0;
+
+    // Sets up internal pointers post load from Sequence Component
+    virtual void InitPostLoad(IUiAnimSequence* pSequence, bool remapIds, LyShine::EntityIdMap* entityIdMap) = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // Groups interface
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SetParent(IUiAnimNode* pParent) = 0;
+    virtual IUiAnimNode* GetParent() const = 0;
+    virtual IUiAnimNode* HasDirectorAsParent() const = 0;
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual void Render() = 0;
+
+    virtual bool NeedToRender() const = 0;
+
+    // Called from editor if dynamic params need updating
+    virtual void UpdateDynamicParams() = 0;
+    // </interfuscator:shuffle>
+};
+
+//! Track event listener
+struct IUiTrackEventListener
+{
+    //! Reasons
+    enum ETrackEventReason
+    {
+        eTrackEventReason_Added,
+        eTrackEventReason_Removed,
+        eTrackEventReason_Renamed,
+        eTrackEventReason_Triggered,
+        eTrackEventReason_MovedUp,
+        eTrackEventReason_MovedDown,
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IUiTrackEventListener(){}
+    // Description:
+    //      Called when track event is updated
+    // Arguments:
+    //      pSeq - Animation sequence
+    //      reason - Reason for update (see EReason)
+    //      event - Track event added
+    //      pUserData - Data to accompany reason
+    virtual void OnTrackEvent(IUiAnimSequence* pSequence, int reason, const char* event, void* pUserData) = 0;
+    // </interfuscator:shuffle>
+};
+
+struct IUiAnimSequenceOwner
+{
+    // <interfuscator:shuffle>
+    virtual ~IUiAnimSequenceOwner() {}
+    virtual void OnModified() = 0;
+    // </interfuscator:shuffle>
+};
+
+struct IUiAnimStringTable
+{
+    AZ_RTTI(IUiAnimStringTable, "{5B60054D-0D67-4DB5-B867-9869DAB95B83}")
+    virtual ~IUiAnimStringTable() {}
+
+    // for intrusive_ptr support
+    virtual void add_ref() = 0;
+    virtual void release() = 0;
+
+    virtual const char* Add(const char* p) = 0;
+};
+
+/** Animation sequence, operates on animation nodes contained in it.
+ */
+struct IUiAnimSequence
+{
+    AZ_RTTI(IUiAnimSequence, "{74EFA085-7758-4275-98A1-4D40DC6F55B8}")
+
+    static const int kSequenceVersion = 3;
+
+    //! Flags used for SetFlags(),GetFlags(),SetParentFlags(),GetParentFlags() methods.
+    enum EUiAnimSequenceFlags
+    {
+        eSeqFlags_PlayOnReset          = BIT(0),   //!< Start playing this sequence immediately after reset of UI animation system(Level load).
+        eSeqFlags_OutOfRangeConstant   = BIT(1),   //!< Constant Out-Of-Range,time continues normally past sequence time range.
+        eSeqFlags_OutOfRangeLoop       = BIT(2),   //!< Loop Out-Of-Range,time wraps back to the start of range when reaching end of range.
+        eSeqFlags_CutScene             = BIT(3),   //!< Cut scene sequence.
+        eSeqFlags_NoHUD                = BIT(4),   //!< @deprecated - Don`t display HUD
+        eSeqFlags_NoPlayer             = BIT(5),   //!< Disable input and drawing of player
+        eSeqFlags_16To9                = BIT(8),   //!< 16:9 bars in sequence
+        eSeqFlags_NoGameSounds         = BIT(9),   //!< Suppress all game sounds.
+        eSeqFlags_NoSeek               = BIT(10),  //!< Cannot seek in sequence.
+        eSeqFlags_NoAbort              = BIT(11),  //!< Cutscene can not be aborted
+        eSeqFlags_NoSpeed              = BIT(13),  //!< Cannot modify sequence speed - TODO: add interface control if required
+     // eSeqFlags_CanWarpInFixedTime   = BIT(14),  //!< @deprecated - Timewarp by scaling a fixed time step - removed July 2017
+        eSeqFlags_EarlyAnimationUpdate = BIT(15),  //!< Turn the 'sys_earlyUiAnimationUpdate' on during the sequence.
+        eSeqFlags_LightAnimationSet    = BIT(16),  //!< A special unique sequence for light animations
+        eSeqFlags_NoMPSyncingNeeded    = BIT(17),  //!< this sequence doesn't require MP net syncing
+    };
+
+    virtual ~IUiAnimSequence() {};
+
+    // for intrusive_ptr support
+    virtual void add_ref() = 0;
+    virtual void release() = 0;
+
+    //! Set the animation system for the canvas containing this sequence
+    virtual IUiAnimationSystem* GetUiAnimationSystem() const = 0;
+
+    //! Set the name of this sequence. (ex. "Intro" in the same case as above)
+    virtual void SetName(const char* name) = 0;
+    //! Get the name of this sequence. (ex. "Intro" in the same case as above)
+    virtual const char* GetName() const = 0;
+    //! Get the ID (unique in a level and consistent across renaming) of this sequence.
+    virtual uint32 GetId () const = 0;
+
+    virtual void SetOwner(IUiAnimSequenceOwner* pOwner) = 0;
+    virtual IUiAnimSequenceOwner* GetOwner() const = 0;
+
+    //! Set the currently active director node.
+    virtual void SetActiveDirector(IUiAnimNode* pDirectorNode) = 0;
+    //! Get the currently active director node, if any.
+    virtual IUiAnimNode* GetActiveDirector() const = 0;
+
+    //! Set animation sequence flags
+    virtual void SetFlags(int flags) = 0;
+    //! Get animation sequence flags
+    virtual int GetFlags() const = 0;
+    //! Get cutscene related animation sequence flags
+    virtual int GetCutSceneFlags(const bool localFlags = false) const = 0;
+    //! Set parent animation sequence
+    virtual void SetParentSequence(IUiAnimSequence* pParentSequence) = 0;
+    //! Get parent animation sequence
+    virtual const IUiAnimSequence* GetParentSequence() const = 0;
+    //! Check whether this sequence has the given sequence as a descendant through one of its sequence tracks.
+    virtual bool IsAncestorOf(const IUiAnimSequence* sequence) const = 0;
+
+    //! Return number of animation nodes in sequence.
+    virtual int GetNodeCount() const = 0;
+    //! Get animation node at specified index.
+    virtual IUiAnimNode* GetNode(int index) const = 0;
+
+    //! Add animation node to sequence.
+    //! @return True if node added, same node will not be added 2 times.
+    virtual bool AddNode(IUiAnimNode* node) = 0;
+
+    // Reorders the array of nodes, so the specified node is placed after or before the given pivot node depending on the parameter 'next'.
+    virtual void ReorderNode(IUiAnimNode* node, IUiAnimNode* pPivotNode, bool next) = 0;
+
+    // Description:
+    //      Creates a new animation node with specified type.
+    // Arguments:
+    //      nodeType - Type of node, one of EUiAnimNodeType enums.
+    virtual IUiAnimNode* CreateNode(EUiAnimNodeType nodeType) = 0;
+
+    // Description:
+    //      Creates a new animation node from serialized node XML.
+    // Arguments:
+    //      node - Serialized form of node
+    virtual IUiAnimNode* CreateNode(XmlNodeRef node) = 0;
+
+    //! Remove animation node from sequence.
+    virtual void RemoveNode(IUiAnimNode* node) = 0;
+
+    // Finds node by name, can be slow.
+    // If the node belongs to a director, the director node also should be given
+    // since there can be multiple instances of the same node(i.e. the same name)
+    // across multiple director nodes.
+    virtual IUiAnimNode* FindNodeByName(const char* sNodeName, const IUiAnimNode* pParentDirector) = 0;
+
+    //! Remove all nodes from sequence.
+    virtual void RemoveAll() = 0;
+
+    // Activate sequence by binding sequence animations to nodes.
+    // must be called prior animating sequence.
+    virtual void Activate() = 0;
+
+    /** Check if sequence is activated
+    */
+    virtual bool IsActivated() const = 0;
+
+    // Deactivates sequence by unbinding sequence animations from nodes.
+    virtual void Deactivate() = 0;
+
+    // Pre-caches data associated with this anim sequence.
+    virtual void PrecacheData(float startTime = 0.0f) = 0;
+
+    // Update sequence while not playing animation.
+    virtual void StillUpdate() = 0;
+
+    // Render function call for some special node.
+    virtual void Render() = 0;
+
+    // Evaluate animations of all nodes in sequence.
+    // Sequence must be activated before animating.
+    virtual void Animate(const SUiAnimContext& ec) = 0;
+
+    //! Set time range of this sequence.
+    virtual void SetTimeRange(Range timeRange) = 0;
+
+    //! Get time range of this sequence.
+    virtual Range GetTimeRange() = 0;
+
+    //! Resets the sequence
+    virtual void Reset(bool bSeekToStart) = 0;
+
+    //! This can have more time-consuming tasks performed additional to tasks of the usual 'Reset()' method.
+    virtual void ResetHard() = 0;
+
+    // Called to pause sequence.
+    virtual void Pause() = 0;
+
+    // Called to resume sequence.
+    virtual void Resume() = 0;
+
+    /** Called to check if sequence is paused.
+    */
+    virtual bool IsPaused() const = 0;
+
+    /** Called when a sequence is looped.
+    */
+    virtual void OnLoop() = 0;
+
+    /** Move/Scale all keys in tracks from previous time range to new time range.
+    */
+    virtual void AdjustKeysToTimeRange(const Range& timeRange) = 0;
+
+    // Serialize this sequence to XML.
+    virtual void Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks = true, uint32 overrideId = 0, bool bUndo = false) = 0;
+    virtual void InitPostLoad(IUiAnimationSystem* pUiAnimationSystem, bool remapIds, LyShine::EntityIdMap* entityIdMap) = 0;
+
+    // Copy some nodes of this sequence to XML.
+    virtual void CopyNodes(XmlNodeRef& xmlNode, IUiAnimNode** pSelectedNodes, uint32 count) = 0;
+
+    // Paste nodes given by the XML to this sequence.
+    virtual void PasteNodes(const XmlNodeRef& xmlNode, IUiAnimNode* pParent) = 0;
+
+    // Summary:
+    //  Adds/removes track events in sequence.
+    virtual bool AddTrackEvent(const char* szEvent) = 0;
+    virtual bool RemoveTrackEvent(const char* szEvent) = 0;
+    virtual bool RenameTrackEvent(const char* szEvent, const char* szNewEvent) = 0;
+    virtual bool MoveUpTrackEvent(const char* szEvent) = 0;
+    virtual bool MoveDownTrackEvent(const char* szEvent) = 0;
+    virtual void ClearTrackEvents() = 0;
+
+    // Summary:
+    //  Gets the track events in the sequence.
+    virtual int GetTrackEventsCount() const = 0;
+    // Summary:
+    //  Gets the specified track event in the sequence.
+    virtual char const* GetTrackEvent(int iIndex) const = 0;
+
+    virtual IUiAnimStringTable* GetTrackEventStringTable() = 0;
+
+    // Summary:
+    //   Called to trigger a track event.
+    virtual void TriggerTrackEvent(const char* event, const char* param = NULL) = 0;
+
+    //! Track event listener
+    virtual void AddTrackEventListener(IUiTrackEventListener* pListener) = 0;
+    virtual void RemoveTrackEventListener(IUiTrackEventListener* pListener) = 0;
+
+    // </interfuscator:shuffle>
+};
+
+/** UI animation Listener interface.
+    Register at UI animation system to get notified about UI animation events
+*/
+struct IUiAnimationListener
+{
+    enum EUiAnimationEvent
+    {
+        eUiAnimationEvent_Started = 0,   // fired when sequence is started
+        eUiAnimationEvent_Stopped,       // fired when sequence ended normally
+        eUiAnimationEvent_Aborted,       // fired when sequence was aborted before normal end (STOP and ABORTED event are mutually exclusive!)
+        eUiAnimationEvent_Updated,       // fired after sequence time or playback speed was updated
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IUiAnimationListener(){}
+    //! callback on UI animation events
+    virtual void OnUiAnimationEvent(EUiAnimationEvent uiAnimationEvent, IUiAnimSequence* pAnimSequence) = 0;
+    virtual void OnUiTrackEvent(AZStd::string eventName, AZStd::string valueName, [[maybe_unused]] IUiAnimSequence* pAnimSequence) {}
+    // </interfuscator:shuffle>
+};
+
+/** UI Animation System interface.
+        Main entrance point to UI Animation capability.
+        Enumerate available UI Animation sequences, update all UI Animation sequences, create animation nodes and tracks.
+ */
+struct IUiAnimationSystem
+{
+    AZ_RTTI(IUiAnimationSystem, "{26D795DD-6732-4A2F-81A5-B17B53A3ADAA}")
+
+    enum ESequenceStopBehavior
+    {
+        eSSB_LeaveTime = 0,         // When sequence is stopped it remains in last played time.
+        eSSB_GotoEndTime = 1,       // Default behavior in game, sequence is animated at end time before stop.
+        eSSB_GotoStartTime = 2, // Default behavior in editor, sequence is animated at start time before stop.
+    };
+
+    // <interfuscator:shuffle>
+    virtual ~IUiAnimationSystem(){}
+
+    //! Release UI animation system.
+    virtual void Release() = 0;
+    //! Loads all nodes and sequences from a specific file (should be called when the level is loaded).
+    virtual bool Load(const char* pszFile, const char* pszMission) = 0;
+
+    // Description:
+    //      Creates a new animation track with specified type.
+    // Arguments:
+    //      type - Type of track, one of EUiAnimTrackType enums.
+    virtual IUiAnimTrack* CreateTrack(EUiAnimCurveType type) = 0;
+
+    virtual IUiAnimSequence* CreateSequence(const char* sequence, bool bLoad = false, uint32 id = 0) = 0;
+    virtual IUiAnimSequence* LoadSequence(XmlNodeRef& xmlNode, bool bLoadEmpty = true) = 0;
+    virtual void AddSequence(IUiAnimSequence* pSequence) = 0;
+    virtual void RemoveSequence(IUiAnimSequence* pSequence) = 0;
+    virtual IUiAnimSequence* FindSequence(const char* sequence) const = 0;
+    virtual IUiAnimSequence* FindSequenceById(uint32 id) const = 0;
+    virtual IUiAnimSequence* GetSequence(int i) const = 0;
+    virtual int GetNumSequences() const = 0;
+    virtual IUiAnimSequence* GetPlayingSequence(int i) const = 0;
+    virtual int GetNumPlayingSequences() const = 0;
+    virtual bool IsCutScenePlaying() const = 0;
+
+    virtual uint32 GrabNextSequenceId() = 0;
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // If the name of a sequence changes, the keys that refer it in the
+    // sequence track of the director node should be properly updated also.
+    //
+    // @param   before The old name of the sequence.
+    // @param   after The new name of the sequence.
+    // @return  Number of modified sequence keys.
+    //
+    //////////////////////////////////////////////////////////////////////////
+    virtual int OnSequenceRenamed(const char* before, const char* after) = 0;
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // If the name of a camera changes, the keys that refer it in the
+    // camera track of the director node should be properly updated also.
+    // This updates the name of the corresponding camera node also, if any.
+    //
+    // @param   before The old name of the camera.
+    // @param   after The new name of the camera.
+    // @return  Number of modified camera keys.
+    //
+    //////////////////////////////////////////////////////////////////////////
+    virtual int OnCameraRenamed(const char* before, const char* after) = 0;
+
+    // Adds a listener to a sequence
+    // @param pSequence Pointer to sequence
+    // @param pListener Pointer to an IUiAnimationListener
+    // @return true on successful add, false otherwise
+    virtual bool AddUiAnimationListener(IUiAnimSequence* pSequence, IUiAnimationListener* pListener) = 0;
+
+    // Removes a listener from a sequence
+    // @param pSequence Pointer to sequence
+    // @param pListener Pointer to an IUiAnimationListener
+    // @return true on successful removal, false otherwise
+    virtual bool RemoveUiAnimationListener(IUiAnimSequence* pSequence, IUiAnimationListener* pListener) = 0;
+
+    virtual ISystem* GetSystem() = 0;
+
+    // Remove all sequences from UI animation system.
+    virtual void RemoveAllSequences() = 0;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Sequence playback.
+    //////////////////////////////////////////////////////////////////////////
+    // Start playing sequence.
+    // Call ignored if sequence is already playing.
+    // @param sequence Name of sequence to play.
+    virtual void PlaySequence(const char* pSequenceName, IUiAnimSequence* pParentSeq, bool bResetFX, bool bTrackedSequence, float startTime = -FLT_MAX, float endTime = -FLT_MAX) = 0;
+
+    // Start playing sequence.
+    // Call ignored if sequence is already playing.
+    // @param sequence Pointer to Valid sequence to play.
+    virtual void PlaySequence(IUiAnimSequence* pSequence, IUiAnimSequence* pParentSeq, bool bResetFX, bool bTrackedSequence, float startTime = -FLT_MAX, float endTime = -FLT_MAX) = 0;
+
+    // Stops currently playing sequence.
+    // Ignored if sequence is not playing.
+    // Returns true if sequence has been stopped. false otherwise
+    // @param sequence Name of playing sequence to stop.
+    virtual bool StopSequence(const char* pSequenceName) = 0;
+
+    // Stop's currently playing sequence.
+    // Ignored if sequence is not playing.
+    // Returns true if sequence has been stopped. false otherwise
+    // @param sequence Pointer to Valid sequence to stop.
+    virtual bool StopSequence(IUiAnimSequence* pSequence) = 0;
+
+    /** Aborts a currently playing sequence.
+            Ignored if sequence is not playing.
+            Calls IUiAnimationListener with aborted event (done event is NOT called)
+            Returns true if sequence has been aborted. false otherwise
+            @param sequence Pointer to Valid sequence to stop.
+            @param bLeaveTime If false, uses default stop behavior, otherwise leaves the sequence at time
+    */
+    virtual bool AbortSequence(IUiAnimSequence* pSequence, bool bLeaveTime = false) = 0;
+
+    // Stops all currently playing sequences.
+    virtual void StopAllSequences() = 0;
+
+    // Stops all playing cut-scene sequences.
+    // This will not stop all sequences, but only those with CUT_SCENE flag set.
+    virtual void StopAllCutScenes() = 0;
+
+    // Checks if specified sequence is playing.
+    virtual bool IsPlaying(IUiAnimSequence* seq) const = 0;
+
+    /** Resets playback state of UI animation system,
+            usually called after loading of level,
+    */
+    virtual void Reset(bool bPlayOnReset, bool bSeekToStart) = 0;
+
+    // Sequences with PLAY_ONRESET flag will start playing after this call.
+    virtual void PlayOnLoadSequences() = 0;
+
+    // Update UI animation system while not playing animation.
+    virtual void StillUpdate() = 0;
+
+    // Updates UI animation system every frame before the entity system to animate all playing sequences.
+    virtual void PreUpdate(const float dt) = 0;
+
+    // Updates UI animation system every frame after the entity system to animate all playing sequences.
+    virtual void PostUpdate(const float dt) = 0;
+
+    // Render function call of some special node.
+    virtual void Render() = 0;
+
+    // Set UI animation system into recording mode,
+    // While in recording mode any changes made to node will be added as keys to tracks.
+    virtual void SetRecording(bool recording) = 0;
+    virtual bool IsRecording() const = 0;
+
+    // Pause any playing sequences.
+    virtual void Pause() = 0;
+
+    // Resume playing sequences.
+    virtual void Resume() = 0;
+
+    // Callback when animation-data changes
+    virtual void SetCallback(IUiAnimationCallback* pCallback) = 0;
+
+    virtual IUiAnimationCallback* GetCallback() = 0;
+
+    // Serialize to XML.
+    virtual void Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bRemoveOldNodes = false, bool bLoadEmpty = true) = 0;
+    virtual void InitPostLoad(bool remapIds, LyShine::EntityIdMap* entityIdMap) = 0;
+
+    // Gets the float time value for a sequence that is already playing
+    virtual float GetPlayingTime(IUiAnimSequence* pSeq) = 0;
+    virtual float GetPlayingSpeed(IUiAnimSequence* pSeq) = 0;
+    // Sets the time progression of an already playing cutscene.
+    // If IUiAnimSequence:NO_SEEK flag is set on pSeq, this call is ignored.
+    virtual bool SetPlayingTime(IUiAnimSequence* pSeq, float fTime) = 0;
+    virtual bool SetPlayingSpeed(IUiAnimSequence* pSeq, float fSpeed) = 0;
+    // Set behavior pattern for stopping sequences.
+    virtual void SetSequenceStopBehavior(ESequenceStopBehavior behavior) = 0;
+
+    // Set the start and end time of an already playing cutscene.
+    virtual bool GetStartEndTime(IUiAnimSequence* pSeq, float& fStartTime, float& fEndTime) = 0;
+    virtual bool SetStartEndTime(IUiAnimSequence* pSeq, const float fStartTime, const float fEndTime) = 0;
+
+    // Make the specified sequence go to a given frame time.
+    // @param seqName A sequence name.
+    // @param targetFrame A target frame to go to in time.
+    virtual void GoToFrame(const char* seqName, float targetFrame) = 0;
+
+    // Get behavior pattern for stopping sequences.
+    virtual IUiAnimationSystem::ESequenceStopBehavior GetSequenceStopBehavior() = 0;
+
+    // Should only be called from CUiAnimParamType
+    virtual void SerializeParamType(CUiAnimParamType& animParamType, XmlNodeRef& xmlNode, bool bLoading, const uint version) = 0;
+
+    // Should only be called from UiAnimParamData
+    virtual void SerializeParamData(UiAnimParamData& animParamData, XmlNodeRef& xmlNode, bool bLoading) = 0;
+
+    // Called by a sequence whenever a track event is triggered
+    virtual void NotifyTrackEventListeners(const char* eventName, const char* valueName, IUiAnimSequence* pSequence) = 0;
+
+#ifdef UI_ANIMATION_SYSTEM_SUPPORT_EDITING
+    virtual EUiAnimNodeType GetNodeTypeFromString(const char* pString) const = 0;
+    virtual CUiAnimParamType GetParamTypeFromString(const char* pString) const = 0;
+#endif
+
+    // </interfuscator:shuffle>
+};
+
+inline void SUiAnimContext::Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading)
+{
+    if (bLoading)
+    {
+        XmlString name;
+        if (xmlNode->getAttr("sequence", name))
+        {
+            pSequence = animationSystem->FindSequence(name.c_str());
+        }
+        xmlNode->getAttr("dt", dt);
+        xmlNode->getAttr("fps", fps);
+        xmlNode->getAttr("time", time);
+        xmlNode->getAttr("bSingleFrame", bSingleFrame);
+        xmlNode->getAttr("bResetting", bResetting);
+        xmlNode->getAttr("trackMask", trackMask);
+        xmlNode->getAttr("startTime", startTime);
+    }
+    else
+    {
+        if (pSequence)
+        {
+            string fullname = pSequence->GetName();
+            xmlNode->setAttr("sequence", fullname.c_str());
+        }
+        xmlNode->setAttr("dt", dt);
+        xmlNode->setAttr("fps", fps);
+        xmlNode->setAttr("time", time);
+        xmlNode->setAttr("bSingleFrame", bSingleFrame);
+        xmlNode->setAttr("bResetting", bResetting);
+        xmlNode->setAttr("trackMask", trackMask);
+        xmlNode->setAttr("startTime", startTime);
+    }
+}
+
+void CUiAnimParamType::Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading, const uint version)
+{
+    animationSystem->SerializeParamType(*this, xmlNode, bLoading, version);
+}
+
+void UiAnimParamData::Serialize(IUiAnimationSystem* animationSystem, XmlNodeRef& xmlNode, bool bLoading)
+{
+    animationSystem->SerializeParamData(*this, xmlNode, bLoading);
+}
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h b/Code/Legacy/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h
new file mode 100644
index 0000000000..e6d46d38d2
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/Sprite/UiSpriteBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+// Forward declarations
+class ISprite;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to be notified of changes to the sprite settings
+class UiSpriteSettingsChangeNotification
+    : public AZ::EBusTraits
+{
+public:
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    /**
+        * Overrides the default AZ::EBusTraits address policy so that the bus
+        * has multiple addresses at which to receive messages. This bus is 
+        * identified by Sprite pointer. Messages addressed to an ID are received by 
+        * handlers connected to that ID.
+        */
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+    /**
+        * Overrides the default AZ::EBusTraits ID type so that Sprite pointers are 
+        * used to access the addresses of the bus.
+        */
+    typedef ISprite* BusIdType;
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual ~UiSpriteSettingsChangeNotification() {}
+
+    //! Called when the sprite settings such as number of cells etc change
+    virtual void OnSpriteSettingsChanged() = 0;
+};
+
+typedef AZ::EBus<UiSpriteSettingsChangeNotification> UiSpriteSettingsChangeNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Notify listeners when sprite image sources change.
+class UiSpriteSourceNotificationInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiSpriteSourceNotificationInterface() {}
+
+    //! A sprite image (or sequence of images) has changed file sources.
+    virtual void OnSpriteSourceChanged() = 0;
+};
+
+typedef AZ::EBus<UiSpriteSourceNotificationInterface> UiSpriteSourceNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h b/Code/Legacy/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h
new file mode 100644
index 0000000000..88cff6509a
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/Tools/UiSystemToolsBus.h
@@ -0,0 +1,74 @@
+/*
+ * 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/Component.h>
+#include <AzCore/Slice/SliceComponent.h>
+#include <AzCore/Serialization/ObjectStream.h>
+
+namespace AZ
+{
+    namespace IO
+    {
+        class FileIOStream;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus interface for tools to talk to the LyShine system
+//! It is valid to use this bus from resource compilers or the UI Editor
+class UiSystemToolsInterface
+    : public AZ::EBusTraits
+{
+public: // types
+
+    class CanvasAssetHandle
+    {
+    public:
+        virtual ~CanvasAssetHandle() {};
+    };
+
+public:
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+
+    using MutexType = AZStd::recursive_mutex;
+
+    // Public functions
+
+    //! Load a canvas but do not init or activate the entities
+    //! The CanvasAssetHandle is an opaque pointer only valid to be passed to the
+    //! methods below.
+    virtual CanvasAssetHandle* LoadCanvasFromStream(AZ::IO::GenericStream& stream, const AZ::ObjectStream::FilterDescriptor& filterDesc) = 0;
+
+    //! Save a canvas to a stream
+    virtual void SaveCanvasToStream(CanvasAssetHandle* canvas, AZ::IO::FileIOStream& stream) = 0;
+
+    //! Get the slice component for a loaded canvas
+    virtual AZ::SliceComponent* GetRootSliceSliceComponent(CanvasAssetHandle* canvas) = 0;
+
+    //! Get the slice entity for a loaded canvas
+    virtual AZ::Entity* GetRootSliceEntity(CanvasAssetHandle* canvas) = 0;
+
+    //! Get the canvas entity for a loaded canvas
+    virtual AZ::Entity* GetCanvasEntity(CanvasAssetHandle* canvas) = 0;
+
+    //! Replace the slice component with a new one. The old slice component is not deleted.
+    //! The client is responsible for that.
+    virtual void ReplaceRootSliceSliceComponent(CanvasAssetHandle* canvas, AZ::SliceComponent* newSliceComponent) = 0;
+
+    //! Replace the canvas entity with a new one. The old canvas entity is not deleted.
+    //! The client is responsible for that.
+    virtual void ReplaceCanvasEntity(CanvasAssetHandle* canvas, AZ::Entity* newCanvasEntity) = 0;
+    
+    //! Delete the canvas file object and its canvas entity and slice entity.
+    virtual void DestroyCanvas(CanvasAssetHandle* canvas) = 0;
+};
+
+using UiSystemToolsBus = AZ::EBus<UiSystemToolsInterface>;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiAnimateEntityBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiAnimateEntityBus.h
new file mode 100644
index 0000000000..b382cca8f2
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiAnimateEntityBus.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/Component/ComponentBus.h>
+
+// Forward declarations
+class ISprite;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiAnimateEntityInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiAnimateEntityInterface() {}
+
+    //! Called when the animation system has updated the data members of an entity's components
+    virtual void PropertyValuesChanged() = 0;
+
+public: // static member data
+
+    //! More than one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+};
+
+typedef AZ::EBus<UiAnimateEntityInterface> UiAnimateEntityBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiAnimationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiAnimationBus.h
new file mode 100644
index 0000000000..9297984e6a
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiAnimationBus.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+#include <LyShine/Animation/IUiAnimation.h>
+
+struct IUiAnimNode;
+
+namespace AZ
+{
+    class Entity;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiAnimNodeInterface
+    : public AZ::EBusTraits
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+    typedef IUiAnimNode* BusIdType;
+    //! Only one implementation for an IAnimNode* can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiAnimNodeInterface() {}
+
+    virtual AZ::EntityId GetAzEntityId() = 0;
+    virtual void SetAzEntity(AZ::Entity* entity) = 0;
+};
+
+typedef AZ::EBus<UiAnimNodeInterface> UiAnimNodeBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiAnimationInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiAnimationInterface() {}
+
+    //! Start a sequence
+    virtual void StartSequence(const AZStd::string& sequenceName) = 0;
+
+    //! Play a sequence from startTime to endTime
+    virtual void PlaySequenceRange(const AZStd::string& sequenceName, float startTime, float endTime) = 0;
+
+    //! Stop a sequence
+    virtual void StopSequence(const AZStd::string& sequenceName) = 0;
+
+    //! Abort a sequence
+    virtual void AbortSequence(const AZStd::string& sequenceName) = 0;
+
+    //! Pause a sequence
+    virtual void PauseSequence(const AZStd::string& sequenceName) = 0;
+
+    //! Resume a sequence
+    virtual void ResumeSequence(const AZStd::string& sequenceName) = 0;
+
+    //! Reset a sequence
+    virtual void ResetSequence(const AZStd::string& sequenceName) = 0;
+
+    //! Get the speed of a sequence
+    virtual float GetSequencePlayingSpeed(const AZStd::string& sequenceName) = 0;
+
+    //! Set the speed of a sequence
+    virtual void SetSequencePlayingSpeed(const AZStd::string& sequenceName, float speed) = 0;
+
+    //! Get the current time of a sequence
+    virtual float GetSequencePlayingTime(const AZStd::string& sequenceName) = 0;
+
+    //! Get whether a sequence is currently playing
+    virtual bool IsSequencePlaying(const AZStd::string& sequenceName) = 0;
+    
+    //! Get the length of a sequence in seconds
+    virtual float GetSequenceLength(const AZStd::string& sequenceName) = 0;
+
+    //! Set the behavior a sequence will exhibit when it stops playing
+    virtual void SetSequenceStopBehavior(IUiAnimationSystem::ESequenceStopBehavior stopBehavior) = 0;
+    
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiAnimationInterface> UiAnimationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiAnimationNotifications
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiAnimationNotifications(){}
+
+    //! Called on an animation event
+    virtual void OnUiAnimationEvent(IUiAnimationListener::EUiAnimationEvent uiAnimationEvent, AZStd::string animSequenceName) = 0;
+
+    //! Called on animation track event triggered
+    virtual void OnUiTrackEvent(AZStd::string eventName, AZStd::string valueName, AZStd::string animSequenceName) {}
+};
+
+typedef AZ::EBus<UiAnimationNotifications> UiAnimationNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiButtonBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiButtonBus.h
new file mode 100644
index 0000000000..ab69348b97
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiButtonBus.h
@@ -0,0 +1,66 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/UiBase.h>
+
+class ISprite;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiButtonInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    typedef AZStd::function<void(AZ::EntityId, AZ::Vector2)> OnClickCallback;
+
+public: // member functions
+
+    virtual ~UiButtonInterface() {}
+
+    //! Get the on-click callback
+    virtual OnClickCallback GetOnClickCallback() = 0;
+
+    //! Set the on-click callback
+    virtual void SetOnClickCallback(OnClickCallback onClick) = 0;
+
+    //! Get the action name
+    virtual const LyShine::ActionName& GetOnClickActionName() = 0;
+
+    //! Set the action name
+    virtual void SetOnClickActionName(const LyShine::ActionName& actionName) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiButtonInterface> UiButtonBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiButtonNotifications
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiButtonNotifications() {}
+
+    //! Notify listeners that the button was clicked
+    virtual void OnButtonClick() {}
+};
+
+typedef AZ::EBus<UiButtonNotifications> UiButtonNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasBus.h
new file mode 100644
index 0000000000..894f97c9fe
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasBus.h
@@ -0,0 +1,507 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Matrix4x4.h>
+#include <AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h>
+#include <AzFramework/Input/User/LocalUserId.h>
+#include <LyShine/UiBase.h>
+
+// Forward declarations
+struct IUiAnimationSystem;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiCanvasInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    enum class ErrorCode
+    {
+        NoError,
+        PrefabContainsExternalEntityRefs
+    };
+
+public: // member functions
+
+    //! Deleting a canvas will delete all its child elements recursively and all of their components
+    virtual ~UiCanvasInterface() {}
+
+    //! Get the asset ID path name of this canvas. If not loaded or saved yet this will be ""
+    virtual const AZStd::string& GetPathname() = 0;
+
+    //! Get the ID of this canvas. This will remain the same while this canvas is loaded.
+    virtual LyShine::CanvasId GetCanvasId() = 0;
+
+    //! Get the unique ID of this canvas
+    virtual AZ::u64 GetUniqueCanvasId() = 0;
+
+    //! Get the draw order of this canvas. Rendering is back-to-front, so higher numbers render in front of lower numbers.
+    virtual int GetDrawOrder() = 0;
+
+    //! Set the draw order of this canvas. Rendering is back-to-front, so higher numbers render in front of lower numbers.
+    virtual void SetDrawOrder(int drawOrder) = 0;
+
+    //! Get the flag indicating if this canvas will stay loaded through a level unload.
+    virtual bool GetKeepLoadedOnLevelUnload() = 0;
+
+    //! Set the flag indicating if this canvas will stay loaded through a level unload.
+    virtual void SetKeepLoadedOnLevelUnload(bool keepLoaded) = 0;
+
+    //! Force a layout recompute. Layouts marked for a recompute are handled on the canvas update,
+    //! so this can be used if an immediate recompute is desired
+    virtual void RecomputeChangedLayouts() = 0;
+
+    //! Get the number child elements of this canvas
+    virtual int GetNumChildElements() = 0;
+
+    //! Get the specified child element, index must be less than GetNumChildElements()
+    virtual AZ::Entity* GetChildElement(int index) = 0;
+
+    //! Get the specified child entity Id, index must be less than GetNumChildElements()
+    virtual AZ::EntityId GetChildElementEntityId(int index) = 0;
+
+    //! Get the child elements of this canvas
+    virtual LyShine::EntityArray GetChildElements() = 0;
+
+    //! Get the child entity Ids of this canvas
+    virtual AZStd::vector<AZ::EntityId> GetChildElementEntityIds() = 0;
+
+    //! Create a new element that is a child of the canvas, the canvas has ownership of the child
+    virtual AZ::Entity* CreateChildElement(const LyShine::NameType& name) = 0;
+
+    //! Return the element on this canvas with the given id or nullptr if no match
+    virtual AZ::Entity* FindElementById(LyShine::ElementId id) = 0;
+
+    //! Return the first element on this canvas with the given name or nullptr if no match
+    virtual AZ::Entity* FindElementByName(const LyShine::NameType& name) = 0;
+
+    //! Return the first element on this canvas with the given name or nullptr if no match
+    virtual AZ::EntityId FindElementEntityIdByName(const LyShine::NameType& name) = 0;
+
+    //! Find all elements on this canvas with the given name
+    virtual void FindElementsByName(const LyShine::NameType& name, LyShine::EntityArray& result) = 0;
+
+    //! Return the element with the given hierarchical name or nullptr if no match
+    //! \param name, a hierarchical name relative to the root with '/' as the separator
+    virtual AZ::Entity* FindElementByHierarchicalName(const LyShine::NameType& name) = 0;
+
+    //! Find all elements on this canvas matching the predicate
+    virtual void FindElements(AZStd::function<bool(const AZ::Entity*)> predicate, LyShine::EntityArray& result) = 0;
+
+    //! Get the front-most element whose bounds include the given point in canvas space
+    //! \return nullptr if no match
+    virtual AZ::Entity* PickElement(AZ::Vector2 point) = 0;
+
+    //! Get all element whose bounds intersect with the given box in canvas space
+    //! \return empty EntityArray if no match
+    virtual LyShine::EntityArray PickElements(const AZ::Vector2& bound0, const AZ::Vector2& bound1) = 0;
+
+    //! Look for an entity with interactable component to handle an event at given point
+    virtual AZ::EntityId FindInteractableToHandleEvent(AZ::Vector2 point) = 0;
+
+    //! Save this canvas to the given path in XML
+    //! \return true if no error
+    virtual bool SaveToXml(const string& assetIdPathname, const string& sourceAssetPathname) = 0;
+
+    //! Save the given UI element entity to the given path as a prefab
+    //! \param pathname the path to save the prefab to
+    //! \param entity   pointer to the entity to save as a prefab
+    //! \return true if no error
+    virtual bool SaveAsPrefab(const string& pathname, AZ::Entity* entity) = 0;
+
+    //! Check if it is OK to save the given UI element entity to the given path as a prefab
+    //! \param entity   pointer to the entity to save as a prefab
+    //! \return errorCode which is NoError if OK to save
+    virtual ErrorCode CheckElementValidToSaveAsPrefab(AZ::Entity* entity) = 0;
+
+    //! Load a prefab element from the given file and optionally insert as child of given entity
+    //! \return the top level entity created
+    virtual AZ::Entity* LoadFromPrefab(const string& pathname,
+        bool makeUniqueName,
+        AZ::Entity* optionalInsertionPoint) = 0;
+
+    //! Initialize a set of entities that have been added to the canvas
+    //! Used when instantiating a slice or for undo/redo, copy/paste
+    //! \param topLevelEntities - The elements that were created
+    //! \param makeUniqueNamesAndIds If false the entity names and ElementIds in the string are kept, else unique ones are generated
+    //! \param insertionPoint The parent element for the created elements, if nullptr the root element is the parent
+    virtual void FixupCreatedEntities(LyShine::EntityArray topLevelEntities, bool makeUniqueNamesAndIds, AZ::Entity* optionalInsertionPoint) = 0;
+
+    //! Add an existing entity to the canvas (only for internal use from editor)
+    //! \param element      The newly created element to add to the canvas
+    //! \param parent       The parent element for the created element, if nullptr the root element is the parent
+    //! \param insertBefore The sibling element to place this element before, if nullptr then add as last child
+    virtual void AddElement(AZ::Entity* element, AZ::Entity* parent, AZ::Entity* insertBefore) = 0;
+
+    //! Go through all elements in the canvas and reinitialize them
+    //! This is done whenever a slice asset changes and the entity context is rebuilt from the root slice asset
+    virtual void ReinitializeElements() = 0;
+
+    //! Save this canvas to an XML string
+    //! \return the resulting string
+    virtual AZStd::string SaveToXmlString() = 0;
+
+    //! Get an element name that is unique to the children of the specified parent and to an optional array of elements
+    //! \param parentEntityId   The entityId of the parent who's children's names must not match the returned name
+    //! \param baseName         The name to append a unique identifier to
+    //! \param includedChildren An array of any other elements who's names must not match the returned name
+    //! \return Unique name that does not match the specified parent's children or the optional array of children
+    virtual AZStd::string GetUniqueChildName(AZ::EntityId parentEntityId, AZStd::string baseName, const LyShine::EntityArray* includeChildren) = 0;
+
+    //! Clone an element and add it to this canvas as a child of the given parent element
+    //! The entity and all its components/children are cloned and new IDs are generated
+    //! NOTE: Only state that is persistent/reflected is cloned
+    //! \param sourceEntity The entity to clone
+    //! \param parentEntity The parent element for the created elements, if nullptr the root element is the parent
+    //! \return The new entity
+    virtual AZ::Entity* CloneElement(AZ::Entity* sourceEntity, AZ::Entity* parentEntity) = 0;
+
+    //! Clone an element and add it to this canvas as a child of the given parent element
+    //! The entity and all its components/children are cloned and new IDs are generated
+    //! NOTE: Only state that is persistent/reflected is cloned
+    //! \param sourceEntity The entity to clone (may be from a different canvas)
+    //! \param parentEntity The parent element for the created elements, if invalid the root element is the parent
+    //! \param insertBefore The child of the parent element that the new element should be inserted before, if invalid the new element is the last child element
+    //! \return The new entity
+    virtual AZ::EntityId CloneElementEntityId(AZ::EntityId sourceEntity, AZ::EntityId parentEntity, AZ::EntityId insertBefore) = 0;
+
+    //! Create a clone of this canvas entity
+    //! \param canvasSize The resolution to display the canvas at
+    virtual AZ::Entity* CloneCanvas(const AZ::Vector2& canvasSize) = 0;
+
+    //! Set the transformation from canvas space to viewport space
+    virtual void SetCanvasToViewportMatrix(const AZ::Matrix4x4& matrix) = 0;
+
+    //! Get the transformation from canvas space to viewport space
+    virtual const AZ::Matrix4x4& GetCanvasToViewportMatrix() = 0;
+
+    //! Get the transformation from viewport space to canvas space
+    virtual void GetViewportToCanvasMatrix(AZ::Matrix4x4& matrix) = 0;
+
+    //! Returns the "target" size of the canvas (in pixels)
+    //
+    //! The target canvas size changes depending on whether you're running in
+    //! the UI Editor or in-game. While in-game, we assume that the canvas size
+    //! fills the screen, so the target canvas size is the size of the viewport.
+    //
+    //! When using the editor, however, the target size is the "authored" size of
+    //! the canvas. The canvas is authored in one resolution, but it may be
+    //! displayed by the game at whatever the game resolution is set to.
+    virtual AZ::Vector2 GetCanvasSize() = 0;
+
+    //! Set the authored size of the canvas (in pixels)
+    virtual void SetCanvasSize(const AZ::Vector2& canvasSize) = 0;
+
+    //! Set the target size of the canvas (in pixels)
+    //!
+    //! This should be called before the UpdateCanvas and RenderCanvas methods.
+    //! When running in game in full screen mode the target canvas size should be set to the viewport size
+    virtual void SetTargetCanvasSize(bool isInGame, const AZ::Vector2& targetCanvasSize) = 0;
+
+    //! Get scale to adjust for the difference between canvas size (authored size)
+    //! and the viewport size (target canvas size) when running on current device
+    virtual AZ::Vector2 GetDeviceScale() = 0;
+
+    //! Get flag that indicates whether visual element's vertices should snap to the nearest pixel
+    virtual bool GetIsPixelAligned() = 0;
+
+    //! Set flag that indicates whether visual element's vertices should snap to the nearest pixel
+    virtual void SetIsPixelAligned(bool isPixelAligned) = 0;
+
+    //! Get flag that indicates whether text should snap to the nearest pixel
+    virtual bool GetIsTextPixelAligned() = 0;
+
+    //! Set flag that indicates whether text should snap to the nearest pixel
+    virtual void SetIsTextPixelAligned(bool isTextPixelAligned) = 0;
+
+    //! Get the animation system for this canvas
+    virtual IUiAnimationSystem* GetAnimationSystem() = 0;
+
+    //! Get flag that governs whether the canvas is enabled
+    //
+    //! A canvas that's enabled will be updated and rendered each frame.
+    virtual bool GetEnabled() = 0;
+
+    //! Set flag that governs whether the canvas is enabled
+    //
+    //! A canvas that's enabled will be updated and rendered each frame.
+    virtual void SetEnabled(bool enabled) = 0;
+
+    //! Get flag that controls whether the canvas is rendering to a texture
+    virtual bool GetIsRenderToTexture() = 0;
+
+    //! Set flag that controls whether the canvas is rendering to a texture
+    virtual void SetIsRenderToTexture(bool isRenderToTexture) = 0;
+
+    //! Get the render target name that this canvas will render to
+    virtual AZStd::string GetRenderTargetName() = 0;
+
+    //! Set the render target name that this canvas will render to
+    virtual void SetRenderTargetName(const AZStd::string& name) = 0;
+
+    //! Get flag that controls whether this canvas automatically handles positional input (mouse/touch)
+    virtual bool GetIsPositionalInputSupported() = 0;
+
+    //! Set flag that controls whether this canvas automatically handles positional input (mouse/touch)
+    virtual void SetIsPositionalInputSupported(bool isSupported) = 0;
+
+    //! Get flag that controls whether this canvas consumes all input events while it is enabled
+    virtual bool GetIsConsumingAllInputEvents() = 0;
+
+    //! Set flag that controls whether this canvas consumes all input events while it is enabled
+    virtual void SetIsConsumingAllInputEvents(bool isConsuming) = 0;
+
+    //! Get flag that controls whether this canvas automatically handles multi-touch input
+    virtual bool GetIsMultiTouchSupported() = 0;
+
+    //! Set flag that controls whether this canvas automatically handles multi-touch input
+    virtual void SetIsMultiTouchSupported(bool isSupported) = 0;
+
+    //! Get flag that controls whether this canvas automatically handles navigation input (via keyboard/gamepad)
+    virtual bool GetIsNavigationSupported() = 0;
+
+    //! Set flag that controls whether this canvas automatically handles navigation input (via keyboard/gamepad)
+    virtual void SetIsNavigationSupported(bool isSupported) = 0;
+
+    //! Get the analog (eg. thumb-stick) input value that must be exceeded before a navigation command will be processed
+    virtual float GetNavigationThreshold() = 0;
+
+    //! Set the analog (eg. thumb-stick) input value that must be exceeded before a navigation command will be processed
+    virtual void SetNavigationThreshold(float navigationThreshold) = 0;
+
+    //! Get the delay (milliseconds) before a held navigation command will begin repeating
+    virtual AZ::u64 GetNavigationRepeatDelay() = 0;
+
+    //! Set the delay (milliseconds) before a held navigation command will begin repeating
+    virtual void SetNavigationRepeatDelay(AZ::u64 navigationRepeatDelay) = 0;
+
+    //! Get the delay (milliseconds) before a held navigation command will continue repeating
+    virtual AZ::u64 GetNavigationRepeatPeriod() = 0;
+
+    //! Set the delay (milliseconds) before a held navigation command will continue repeating
+    virtual void SetNavigationRepeatPeriod(AZ::u64 navigationRepeatPeriod) = 0;
+
+    //! Get the local user id that is being used to filter incoming input events
+    virtual AzFramework::LocalUserId GetLocalUserIdInputFilter() = 0;
+
+    //! Set the local user id that will be used to filter incoming input events
+    virtual void SetLocalUserIdInputFilter(AzFramework::LocalUserId localUserId) = 0;
+
+    //! Handle an input event for the canvas
+    virtual bool HandleInputEvent(const AzFramework::InputChannel::Snapshot& inputSnapshot,
+        const AZ::Vector2* viewportPos = nullptr,
+        AzFramework::ModifierKeyMask activeModifierKeys = AzFramework::ModifierKeyMask::None) = 0;
+
+    //! Handle a unicode text event for the canvas
+    virtual bool HandleTextEvent(const AZStd::string& textUTF8) = 0;
+
+    //! Handle a positional input event for the canvas, this could come from
+    //! a ray cast intersection for example
+    virtual bool HandleInputPositionalEvent(const AzFramework::InputChannel::Snapshot& inputSnapshot, AZ::Vector2 viewportPos) = 0;
+
+    //! Get the mouse position of the last input event
+    virtual AZ::Vector2 GetMousePosition() = 0;
+
+    //! Get the element to be displayed when hovering over an interactable
+    virtual AZ::EntityId GetTooltipDisplayElement() = 0;
+
+    //! Set the element to be displayed when hovering over an interactable
+    virtual void SetTooltipDisplayElement(AZ::EntityId entityId) = 0;
+
+    //! Force the active interactable for the canvas to be the given one,
+    //! also force AutoActivation of interactable,
+    //! intended for internal use by UI components
+    virtual void ForceFocusInteractable(AZ::EntityId interactableId) = 0;
+
+    //! Force the active interactable for the canvas to be the given one,
+    //! also set last mouse pos to point,
+    //! intended for internal use by UI components
+    virtual void ForceActiveInteractable(AZ::EntityId interactableId, bool shouldStayActive, AZ::Vector2 point) = 0;
+
+    //! Get the hover interactable
+    virtual AZ::EntityId GetHoverInteractable() = 0;
+
+    //! Force the hover interactable for the canvas to be the given one, this can be useful when using
+    //! keyboard/gamepad navigation and the current hover interactable is deleted by a script and the script
+    //! wants to specify the new hover interactable
+    virtual void ForceHoverInteractable(AZ::EntityId interactableId) = 0;
+
+    //! Clear all active interactables, and all hover interactables if last input was positional (mouse/touch).
+    //! This is intended for internal use by UI components
+    virtual void ClearAllInteractables() = 0;
+
+    //! Generate Enter pressed/released input events on an interactable.
+    //! Useful for automated testing to simulate button clicks
+    virtual void ForceEnterInputEventOnInteractable(AZ::EntityId interactableId) = 0;
+
+public: // static member data
+
+    //! Only one component on an entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiCanvasInterface> UiCanvasBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! The canvas component implements this bus and it is provided for C++ implementations of
+//! UI components to use to talk to the canvas
+class UiCanvasComponentImplementationInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiCanvasComponentImplementationInterface() {}
+
+    //! Mark the render graph for the canvas as dirty. This will cause the render graph to get
+    //! cleared and rebuilt on the next render.
+    virtual void MarkRenderGraphDirty() = 0;
+
+public: // static member data
+
+    //! Only one component on an entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiCanvasComponentImplementationInterface> UiCanvasComponentImplementationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to be notified of canvas actions
+class UiCanvasActionNotification
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiCanvasActionNotification(){}
+
+    //! Called when the canvas sends an action to the listener
+    virtual void OnAction(AZ::EntityId entityId, const LyShine::ActionName& actionName) = 0;
+};
+
+typedef AZ::EBus<UiCanvasActionNotification> UiCanvasNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to be notified when the draw order of any
+//! canvas changes
+class UiCanvasOrderNotification
+    : public AZ::EBusTraits
+{
+public: // member functions
+
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+
+    virtual ~UiCanvasOrderNotification(){}
+
+    //! Called when the draw order setting for a canvas changes
+    //! Note this is used to update the order in the UiCanvasManager so that
+    //! order has not been updated when this fires.
+    virtual void OnCanvasDrawOrderChanged(AZ::EntityId canvasEntityId) = 0;
+};
+
+typedef AZ::EBus<UiCanvasOrderNotification> UiCanvasOrderNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to be notified when any canvas has been
+//! enabled or disabled
+class UiCanvasEnabledStateNotification
+    : public AZ::EBusTraits
+{
+public: // member functions
+
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+
+    virtual ~UiCanvasEnabledStateNotification() {}
+
+    //! Called when the canvas was enabled or disabled
+    virtual void OnCanvasEnabledStateChanged(AZ::EntityId canvasEntityId, bool enabled) = 0;
+};
+
+typedef AZ::EBus<UiCanvasEnabledStateNotification> UiCanvasEnabledStateNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to be notified of canvas size or scale changes
+class UiCanvasSizeNotification
+    : public AZ::EBusTraits
+{
+public:
+    virtual ~UiCanvasSizeNotification() {}
+
+    //! Called when the target canvas size or uniform device scale changes.
+    virtual void OnCanvasSizeOrScaleChange(AZ::EntityId canvasEntityId) = 0;
+};
+
+typedef AZ::EBus<UiCanvasSizeNotification> UiCanvasSizeNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to be notified of changes to the canvas
+//! pixel alignment settings
+class UiCanvasPixelAlignmentNotification
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiCanvasPixelAlignmentNotification() {}
+
+    //! Called when the pixel alignment setting for the canvas changes
+    virtual void OnCanvasPixelAlignmentChange() {}
+
+    //! Called when the text pixel alignment setting for the canvas changes
+    virtual void OnCanvasTextPixelAlignmentChange() {}
+};
+
+typedef AZ::EBus<UiCanvasPixelAlignmentNotification> UiCanvasPixelAlignmentNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to be notified of canvas input.
+//! Note that interactables already get methods called on them when they themselves are interacted
+//! with. This notification bus is intended for other entities or Lua to know when some other
+//! entities are interacted with.
+class UiCanvasInputNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiCanvasInputNotifications() {}
+
+    //! Called when an element is pressed. Will return an invalid entity id if no interactable was
+    //! pressed.
+    virtual void OnCanvasPrimaryPressed([[maybe_unused]] AZ::EntityId entityId) {};
+
+    //! Called when an element is released. The released entity that is sent is the entity that was
+    //! active (if any).
+    virtual void OnCanvasPrimaryReleased([[maybe_unused]] AZ::EntityId entityId) {};
+
+    //! Called when an element is pressed. Will be an invalid entity id if no interactable was
+    //! pressed.
+    virtual void OnCanvasMultiTouchPressed([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int multiTouchIndex) {};
+
+    //! Called when an element is released. The released entity that is sent is the entity that was
+    //! active (if any).
+    virtual void OnCanvasMultiTouchReleased([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int multiTouchIndex) {};
+
+    //! Called when an element starts being hovered
+    virtual void OnCanvasHoverStart([[maybe_unused]] AZ::EntityId entityId) {};
+
+    //! Called when an element ends being hovered
+    virtual void OnCanvasHoverEnd([[maybe_unused]] AZ::EntityId entityId) {};
+
+    //! Called when the enter key is pressed
+    virtual void OnCanvasEnterPressed([[maybe_unused]] AZ::EntityId entityId) {};
+
+    //! Called when the enter key is released
+    virtual void OnCanvasEnterReleased([[maybe_unused]] AZ::EntityId entityId) {};
+};
+
+typedef AZ::EBus<UiCanvasInputNotifications> UiCanvasInputNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasManagerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasManagerBus.h
new file mode 100644
index 0000000000..f42a5f4daf
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasManagerBus.h
@@ -0,0 +1,66 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzFramework/Input/User/LocalUserId.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiCanvasManagerInterface
+    : public AZ::EBusTraits
+{
+public: // types
+
+    typedef std::vector<AZ::EntityId> CanvasEntityList;
+
+public:
+    //! Create a canvas
+    virtual AZ::EntityId CreateCanvas() = 0;
+
+    //! Load a canvas
+    virtual AZ::EntityId LoadCanvas(const AZStd::string& canvasPathname) = 0;
+
+    //! Unload a canvas
+    virtual void UnloadCanvas(AZ::EntityId canvasEntityId) = 0;
+
+    //! Find a canvas by path, optionally load the canvas if it was not found
+    virtual AZ::EntityId FindLoadedCanvasByPathName(const AZStd::string& canvasPathname, bool loadIfNotFound = false) = 0;
+
+    //! Get a list of canvases that are loaded in game, this is sorted by draw order
+    virtual CanvasEntityList GetLoadedCanvases() = 0;
+
+    //! Set the local user id that will be used to filter incoming input events for all canvases.
+    //! Can be overriden for an individual canvas using UiCanvasInterface::SetLocalUserIdInputFilter.
+    virtual void SetLocalUserIdInputFilterForAllCanvases(AzFramework::LocalUserId localUserId) = 0;
+};
+typedef AZ::EBus<UiCanvasManagerInterface> UiCanvasManagerBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to be notified of canvas manager changes
+class UiCanvasManagerNotification
+    : public AZ::EBusTraits
+{
+public:
+    //////////////////////////////////////////////////////////////////////////
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual ~UiCanvasManagerNotification() {}
+
+    //! Called when a canvas has been loaded
+    virtual void OnCanvasLoaded([[maybe_unused]] AZ::EntityId canvasEntityId) {}
+
+    //! Called when a canvas has been unloaded/destroyed
+    virtual void OnCanvasUnloaded([[maybe_unused]] AZ::EntityId canvasEntityId) {}
+
+    //! Called when a canvas has been reloaded (due to hot-loading)
+    //! For a hot-load, the OnCanvasLoaded/OnCanvasUnloaded notifications are not sent - only this one is
+    virtual void OnCanvasReloaded([[maybe_unused]] AZ::EntityId canvasEntityId) {}
+};
+
+typedef AZ::EBus<UiCanvasManagerNotification> UiCanvasManagerNotificationBus;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h
new file mode 100644
index 0000000000..e17f8e90b0
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiCanvasUpdateNotificationBus.h
@@ -0,0 +1,36 @@
+/*
+ * 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/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Elements that require update notifications should connect to this bus using the entity id of their
+//! containing canvas.
+class UiCanvasUpdateNotification
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiCanvasUpdateNotification() {}
+
+    //! Update the component. This is called when the game is running.
+    //! It is different from the TickBus in that it is called only when the canvas is updated.
+    //! So it is not called if the canvas is disabled.
+    virtual void Update(float deltaTime) = 0;
+
+    //! Update the component while in the editor.
+    //! This is called every frame when in the editor and the game is NOT running.
+    virtual void UpdateInEditor(float /*deltaTime*/) {}
+
+public: // static member data
+
+    //! Multiple components on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+};
+
+typedef AZ::EBus<UiCanvasUpdateNotification> UiCanvasUpdateNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiCheckboxBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCheckboxBus.h
new file mode 100644
index 0000000000..ceaa5d08ea
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiCheckboxBus.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiCheckboxInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! params: sending entity id, new state
+    typedef AZStd::function<void(AZ::EntityId, AZ::Vector2, bool)> StateChangeCallback;
+
+public: // member functions
+
+    virtual ~UiCheckboxInterface() {}
+
+    //! Query the state of the checkbox
+    //! \return     The current state for the checkbox.
+    virtual bool GetState() = 0;
+
+    //! Manually override the state of the checkbox
+    //! \param isOn     The new desired state of the checkbox.
+    virtual void SetState(bool checked) = 0;
+
+    //! Toggle the state of the checkbox
+    //! \return     The new state of the checkbox.
+    virtual bool ToggleState() = 0;
+
+    //! Get the state change callback
+    virtual StateChangeCallback GetStateChangeCallback() = 0;
+
+    //! Set the state change callback
+    virtual void SetStateChangeCallback(StateChangeCallback onChange) = 0;
+
+    //! Set the optional checked (ON) entity
+    virtual void SetCheckedEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional checked (ON) entity
+    virtual AZ::EntityId GetCheckedEntity() = 0;
+
+    //! Set the optional unchecked (OFF) entity
+    virtual void SetUncheckedEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional unchecked (OFF) entity
+    virtual AZ::EntityId GetUncheckedEntity() = 0;
+
+    //! Get the action triggered when turned on
+    virtual const LyShine::ActionName& GetTurnOnActionName() = 0;
+
+    //! Set the action triggered when turned on
+    virtual void SetTurnOnActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the action triggered when turned off
+    virtual const LyShine::ActionName& GetTurnOffActionName() = 0;
+
+    //! Set the action triggered when turned off
+    virtual void SetTurnOffActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the action triggered when changed
+    virtual const LyShine::ActionName& GetChangedActionName() = 0;
+
+    //! Set the action triggered when changed
+    virtual void SetChangedActionName(const LyShine::ActionName& actionName) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiCheckboxInterface> UiCheckboxBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiCheckboxNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiCheckboxNotifications() {}
+
+    //! Notify listeners that the checkbox state has changed
+    virtual void OnCheckboxStateChange([[maybe_unused]] bool checked) {}
+};
+
+typedef AZ::EBus<UiCheckboxNotifications> UiCheckboxNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiCursorBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiCursorBus.h
new file mode 100644
index 0000000000..24a05a6c41
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiCursorBus.h
@@ -0,0 +1,42 @@
+/*
+ * 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/Math/Vector2.h>
+
+class UiCursorInterface
+    : public AZ::EBusTraits
+{
+public:
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+
+    // Public functions
+
+    //! Increment the UI Cursor visible counter.
+    //! Should be paired with a call to DecrementVisibleCounter.
+    virtual void IncrementVisibleCounter() = 0;
+
+    //! Decrement the UI Cursor visible counter.
+    //! Should be paired with a call to IncrementVisibleCounter.
+    virtual void DecrementVisibleCounter() = 0;
+
+    //! Query whether the UI Cursor is currently visible
+    virtual bool IsUiCursorVisible() = 0;
+
+    //! Set the UI cursor image.
+    virtual void SetUiCursor(const char* cursorImagePath) = 0;
+
+    //! Get the UI cursor position (in pixels) relative
+    //! to the top-left corner of the UI overlay viewport
+    virtual AZ::Vector2 GetUiCursorPosition() = 0;
+};
+
+using UiCursorBus = AZ::EBus<UiCursorInterface>;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiDraggableBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDraggableBus.h
new file mode 100644
index 0000000000..808ba513a4
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiDraggableBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiDraggableInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! States that the component can be in during a drag. Lua scripts can switch the state to alert the user
+    enum class DragState
+    {
+        Normal,
+        Valid,
+        Invalid
+    };
+
+public: // member functions
+
+    virtual ~UiDraggableInterface() {}
+
+    //! Get the state of the drag
+    virtual DragState GetDragState() = 0;
+
+    //! Set the state of the drag. This is only relevant during a drag.
+    //! The state affects the visual state of the draggable and can be used to indicate when it is
+    //! over a valid drop target.
+    virtual void SetDragState(DragState dragState) = 0;
+
+    //! Redo the drag, this is not usually needed but if a UiDraggableNotificationBus handler causes
+    //! drop targets to move, and keyboard or console navigation is being used, it can be needed.
+    //! In that case the handler should call this method after moving drop targets.
+    virtual void RedoDrag(AZ::Vector2 point) = 0;
+
+    //! Set this draggable element to be a proxy for another draggable element and start a drag on
+    //! this draggable element at the specified point
+    virtual void SetAsProxy(AZ::EntityId originalDraggableId, AZ::Vector2 point) = 0;
+
+    //! Conclude the drag of a proxy. This should be called from the OnDragEnd callback of the proxy and
+    //! will result in calling OnDragEnd on the draggable element that this is a proxy for
+    virtual void ProxyDragEnd(AZ::Vector2 point) = 0;
+        
+    //! Check if this draggable element is a proxy
+    virtual bool IsProxy() = 0;
+
+    //! Get the original draggable element that this element is a proxy for
+    //! Returns an invalid entity id if this is not a proxy
+    virtual AZ::EntityId GetOriginalFromProxy() = 0;
+
+    //! Get the flag that indicates if this draggable can be dropped on any canvas
+    virtual bool GetCanDropOnAnyCanvas() = 0;
+
+    //! Set the flag that indicates if this draggable can be dropped on any canvas
+    virtual void SetCanDropOnAnyCanvas(bool anyCanvas) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiDraggableInterface> UiDraggableBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiDraggableNotifications
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiDraggableNotifications() {}
+
+    //! Called on drag start
+    virtual void OnDragStart(AZ::Vector2 position) = 0;
+
+    //! Called on position change during drag
+    virtual void OnDrag(AZ::Vector2 position) = 0;
+
+    //! Called on drag end
+    virtual void OnDragEnd(AZ::Vector2 position) = 0;
+};
+
+typedef AZ::EBus<UiDraggableNotifications> UiDraggableNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiDropTargetBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDropTargetBus.h
new file mode 100644
index 0000000000..2d125d7594
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiDropTargetBus.h
@@ -0,0 +1,88 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiDropTargetInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    using DropState = int;
+    enum
+    {
+        DropStateNormal = 0,
+        DropStateValid,
+        DropStateInvalid,
+
+        NumDropStates
+    };
+
+public: // member functions
+
+    virtual ~UiDropTargetInterface() {}
+
+    //! Get the OnDrop action name
+    virtual const LyShine::ActionName& GetOnDropActionName() = 0;
+
+    //! Set the OnDrop action name
+    virtual void SetOnDropActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Called when mouse/touch enters the bounds of this drop target while dragging a UiDraggableComponent
+    virtual void HandleDropHoverStart(AZ::EntityId draggable) = 0;
+
+    //! Called on the currently drop hovered drop target component when mouse/touch moves outside of bounds
+    virtual void HandleDropHoverEnd(AZ::EntityId draggable) = 0;
+
+    //! Called when a draggable is dropped on this drop target
+    virtual void HandleDrop(AZ::EntityId draggable) = 0;
+
+    //! Get the state of the drop
+    virtual DropState GetDropState() = 0;
+
+    //! Set the state of the drop target.
+    //! The state affects the visual state of the drop target and can be used to indicate when it has
+    //! a valid draggable hovering over it.
+    virtual void SetDropState(DropState dropState) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiDropTargetInterface> UiDropTargetBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiDropTargetNotifications
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiDropTargetNotifications() {}
+
+    //! Called on starting hovering over a drop target
+    virtual void OnDropHoverStart(AZ::EntityId draggable) = 0;
+
+    //! Called on ending hovering over a drop target
+    virtual void OnDropHoverEnd(AZ::EntityId draggable) = 0;
+
+    //! Called on drop
+    virtual void OnDrop(AZ::EntityId draggable) = 0;
+};
+
+typedef AZ::EBus<UiDropTargetNotifications> UiDropTargetNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiDropdownBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDropdownBus.h
new file mode 100644
index 0000000000..80a6730956
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiDropdownBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! The UI Dropdown Component is an interactable component which displays a list of options when clicked.
+//! In its default state, the dropdown display a simple button, next to an arrow indicating the dropdown
+//! functionality. When the arrow / option is clicked, the dropdown list appears, displaying the options available.
+//! If the list is too long to be displayed, a scrollbar can be added to scroll up and down the list of options.
+class UiDropdownInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiDropdownInterface() {}
+
+    //! Get the currently selected option
+    virtual AZ::EntityId GetValue() = 0;
+
+    //! Set the currently selected option manually
+    virtual void SetValue(AZ::EntityId value) = 0;
+
+    //! Get the content element this dropdown will expand
+    virtual AZ::EntityId GetContent() = 0;
+
+    //! Set the content element this dropdown will expand
+    virtual void SetContent(AZ::EntityId content) = 0;
+
+    //! Get whether this dropdown should expand automatically on hover
+    virtual bool GetExpandOnHover() = 0;
+
+    //! Set whether this dropdown should expand automatically on hover
+    virtual void SetExpandOnHover(bool expandOnHover) = 0;
+
+    //! Get how long to wait before expanding upon hover / collapsing upon exit
+    virtual float GetWaitTime() = 0;
+
+    //! Set how long to wait before expanding upon hover / collapsing upon exit
+    virtual void SetWaitTime(float waitTime) = 0;
+
+    //! Get whether this dropdown should collapse when the user clicks outside
+    virtual bool GetCollapseOnOutsideClick() = 0;
+
+    //! Set whether this dropdown should collapse when the user clicks outside
+    virtual void SetCollapseOnOutsideClick(bool collapseOnOutsideClick) = 0;
+
+    //! Get the element the dropdown content will parent to when expanded (the canvas by default)
+    virtual AZ::EntityId GetExpandedParentId() = 0;
+
+    //! Set the element the dropdown content will parent to when expanded
+    virtual void SetExpandedParentId(AZ::EntityId expandedParentId) = 0;
+
+    //! Get the text element to display to show the currently selected option
+    virtual AZ::EntityId GetTextElement() = 0;
+
+    //! Set the text element to display to show the currently selected option
+    virtual void SetTextElement(AZ::EntityId textElement) = 0;
+
+    //! Get the icon element to display to show the currently selected option
+    virtual AZ::EntityId GetIconElement() = 0;
+
+    //! Set the icon element to display to show the currently selected option
+    virtual void SetIconElement(AZ::EntityId iconElement) = 0;
+
+    //! Expand the dropdown
+    virtual void Expand() = 0;
+
+    //! Collapse the dropdown
+    virtual void Collapse() = 0;
+
+    //! Get the name of the action that is sent when the dropdown is expanded
+    virtual const LyShine::ActionName& GetExpandedActionName() = 0;
+
+    //! Set the name of the action that is sent when the dropdown is expanded
+    virtual void SetExpandedActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the name of the action that is sent when the dropdown is collapsed
+    virtual const LyShine::ActionName& GetCollapsedActionName() = 0;
+
+    //! Set the name of the action that is sent when the dropdown is collapsed
+    virtual void SetCollapsedActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the name of the action that is sent when the dropdown value is changed
+    virtual const LyShine::ActionName& GetOptionSelectedActionName() = 0;
+
+    //! Set the name of the action that is sent when the dropdown value is changed
+    virtual void SetOptionSelectedActionName(const LyShine::ActionName& actionName) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiDropdownInterface> UiDropdownBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiDropdownNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiDropdownNotifications() {}
+
+    //! Notify listeners that the dropdown was expanded
+    virtual void OnDropdownExpanded() {}
+
+    //! Notify listeners that the dropdown was collapsed
+    virtual void OnDropdownCollapsed() {}
+
+    //! Notify listeners that an option was selected
+    virtual void OnDropdownValueChanged([[maybe_unused]] AZ::EntityId option) {}
+};
+
+typedef AZ::EBus<UiDropdownNotifications> UiDropdownNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiDropdownOptionBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDropdownOptionBus.h
new file mode 100644
index 0000000000..f62288741d
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiDropdownOptionBus.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! The UiDropdownOptionComponent is a component that is designed to work in conjunction with the
+//! UiDropdownComponent. It represents any option of that dropdown that the user should be able to
+//! select to update the value of the dropdown.
+class UiDropdownOptionInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiDropdownOptionInterface() {}
+
+    //! Get the owning dropdown of this option
+    virtual AZ::EntityId GetOwningDropdown() = 0;
+
+    //! Set the owning dropdown of this option
+    virtual void SetOwningDropdown(AZ::EntityId owningDropdown) = 0;
+
+    //! Get the text element of this option
+    virtual AZ::EntityId GetTextElement() = 0;
+
+    //! Set the text element of this option
+    virtual void SetTextElement(AZ::EntityId textElement) = 0;
+
+    //! Get the icon element of this option
+    virtual AZ::EntityId GetIconElement() = 0;
+
+    //! Set the icon element of this option
+    virtual void SetIconElement(AZ::EntityId iconElement) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiDropdownOptionInterface> UiDropdownOptionBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiDropdownOptionNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiDropdownOptionNotifications() {}
+
+    //! Notify listeners that the dropdown option was selected
+    virtual void OnDropdownOptionSelected() {}
+};
+
+typedef AZ::EBus<UiDropdownOptionNotifications> UiDropdownOptionNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDynamicLayoutBus.h
new file mode 100644
index 0000000000..d8e5763de8
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiDynamicLayoutBus.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/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a dynamic layout component needs to implement. A dynamic layout component
+//! clones a prototype element to achieve the desired number of children. The parent is resized
+//! accordingly
+class UiDynamicLayoutInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiDynamicLayoutInterface() {}
+
+    //! Clone a prototype element or remove cloned elements to end up with the specified number of children
+    virtual void SetNumChildElements(int numChildren) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiDynamicLayoutInterface> UiDynamicLayoutBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h
new file mode 100644
index 0000000000..f677e85304
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiDynamicScrollBoxBus.h
@@ -0,0 +1,232 @@
+/*
+ * 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/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a dynamic scrollbox component needs to implement. A dynamic scrollbox
+//! component sets up scrollbox content as a horizontal or vertical list of elements that are
+//! cloned from prototype entities. Only the minimum number of entities are created for efficient
+//! scrolling
+class UiDynamicScrollBoxInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiDynamicScrollBoxInterface() {}
+
+    //! Refresh the content. Should be called when list size or element content has changed.
+    //! This will reset any cached information such as element sizes, so it is recommended
+    //! to use AddElementsToEnd and RemoveElementsFromFront if possible when elements vary
+    //! in size. AddElementsToEnd and RemoveElementsFromFront will also ensure that the
+    //! scroll offset is adjusted to keep the visible elements in place
+    virtual void RefreshContent() = 0;
+
+    //! Add elements to the end of the list.
+    //! Used with lists that are not divided into sections
+    virtual void AddElementsToEnd(int numElementsToAdd, bool scrollToEndIfWasAtEnd) = 0;
+
+    //! Remove elements from the front of the list.
+    //! Used with lists that are not divided into sections
+    virtual void RemoveElementsFromFront(int numElementsToRemove) = 0;
+
+    //! Scroll to the end of the list
+    virtual void ScrollToEnd() = 0;
+
+    //! Get the element index of the specified child element. Returns -1 if not found.
+    //! If the list is divided into sections, the index is local to the section
+    virtual int GetElementIndexOfChild(AZ::EntityId childElement) = 0;
+
+    //! Get the section index of the specified child element. Returns -1 if not found.
+    //! Used with lists that are divided into sections
+    virtual int GetSectionIndexOfChild(AZ::EntityId childElement) = 0;
+
+    //! Get the child element at the specified element index.
+    //! Used with lists that are not divided into sections
+    virtual AZ::EntityId GetChildAtElementIndex(int index) = 0;
+
+    //! Get the child element at the specified section index and element index.
+    //! Used with lists that are divided into sections
+    virtual AZ::EntityId GetChildAtSectionAndElementIndex(int sectionIndex, int index) = 0;
+
+    //! Get whether the list should automatically prepare and refresh its content post activation
+    virtual bool GetAutoRefreshOnPostActivate() = 0;
+
+    //! Set whether the list should automatically prepare and refresh its content post activation
+    virtual void SetAutoRefreshOnPostActivate(bool autoRefresh) = 0;
+
+    //! Get the prototype entity used for the elements
+    virtual AZ::EntityId GetPrototypeElement() = 0;
+
+    //! Set the prototype entity used for the elements
+    virtual void SetPrototypeElement(AZ::EntityId prototypeElement) = 0;
+
+    //! Get whether the elements vary in size
+    virtual bool GetElementsVaryInSize() = 0;
+
+    //! Set whether the elements vary in size
+    virtual void SetElementsVaryInSize(bool varyInSize) = 0;
+
+    //! Get whether to auto calculate the elements when they vary in size
+    virtual bool GetAutoCalculateVariableElementSize() = 0;
+
+    //! Set whether to auto calculate the elements when they vary in size
+    virtual void SetAutoCalculateVariableElementSize(bool autoCalculateSize) = 0;
+
+    //! Get the estimated size for the variable elements. If set to 0, then element sizes
+    //! are calculated up front rather than when becoming visible
+    virtual float GetEstimatedVariableElementSize() = 0;
+
+    //! Set the estimated size for the variable elements. If set to 0, then element sizes
+    //! are calculated up front rather than when becoming visible
+    virtual void SetEstimatedVariableElementSize(float estimatedSize) = 0;
+
+    //! Get whether the list is divided into sections with headers
+    virtual bool GetSectionsEnabled() = 0;
+
+    //! Set whether the list is divided into sections with headers
+    virtual void SetSectionsEnabled(bool enabled) = 0;
+
+    //! Get the prototype entity used for the headers
+    virtual AZ::EntityId GetPrototypeHeader() = 0;
+
+    //! Set the prototype entity used for the headers
+    virtual void SetPrototypeHeader(AZ::EntityId prototypeHeader) = 0;
+
+    //! Get whether headers stick to the beginning of the visible list area
+    virtual bool GetHeadersSticky() = 0;
+
+    //! Set whether headers stick to the beginning of the visible list area
+    virtual void SetHeadersSticky(bool stickyHeaders) = 0;
+
+    //! Get whether the headers vary in size
+    virtual bool GetHeadersVaryInSize() = 0;
+
+    //! Set whether the headers vary in size
+    virtual void SetHeadersVaryInSize(bool varyInSize) = 0;
+
+    //! Get whether to auto calculate the headers when they vary in size
+    virtual bool GetAutoCalculateVariableHeaderSize() = 0;
+
+    //! Set whether to auto calculate the headers when they vary in size
+    virtual void SetAutoCalculateVariableHeaderSize(bool autoCalculateSize) = 0;
+
+    //! Get the estimated size for the variable headers. If set to 0, then header sizes
+    //! are calculated up front rather than when becoming visible
+    virtual float GetEstimatedVariableHeaderSize() = 0;
+
+    //! Set the estimated size for the variable headers. If set to 0, then header sizes
+    //! are calculated up front rather than when becoming visible
+    virtual void SetEstimatedVariableHeaderSize(float estimatedSize) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiDynamicScrollBoxInterface> UiDynamicScrollBoxBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that provides data needed to display a list of elements
+class UiDynamicScrollBoxDataInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiDynamicScrollBoxDataInterface() {}
+
+    //! Returns 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 explicitely).
+    //! Used with lists that are not divided into sections
+    virtual int GetNumElements() { return 0; }
+
+    //! Returns the width of an element at the specified index.
+    //! Called when a horizontal list contains elements of varying size, and the element's "auto calculate size" option is disabled.
+    //! Used with lists that are not divided into sections
+    virtual float GetElementWidth([[maybe_unused]] int index) { return 0.0f; }
+
+    //! Returns the height of an element at the specified index.
+    //! Called when a vertical list contains elements of varying size, and the element's "auto calculate size" option is disabled.
+    //! Used with lists that are not divided into sections
+    virtual float GetElementHeight([[maybe_unused]] int index) { return 0.0f; }
+
+    //! Returns 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 explicitely).
+    //! Used with lists that are divided into sections
+    virtual int GetNumSections() { return 0; }
+
+    //! Returns 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 explicitely).
+    //! Used with lists that are divided into sections
+    virtual int GetNumElementsInSection([[maybe_unused]] int sectionIndex) { return 0; }
+
+    //! Returns the width of an element at the specified section.
+    //! Called when a horizontal list contains elements of varying size, and the element's "auto calculate size" option is disabled.
+    //! Used with lists that are divided into sections
+    virtual float GetElementInSectionWidth([[maybe_unused]] int sectionIndex, [[maybe_unused]] int elementindex) { return 0.0f; }
+
+    //! Returns the height of an element at the specified section.
+    //! Called when a vertical list contains elements of varying size, and the element's "auto calculate size" option is disabled.
+    //! Used with lists that are divided into sections
+    virtual float GetElementInSectionHeight([[maybe_unused]] int sectionIndex, [[maybe_unused]] int elementindex) { return 0.0f; }
+
+    //! Returns the width of a header at the specified section.
+    //! Called when a horizontal list contains headers of varying size, and the header's "auto calculate size" option is disabled.
+    //! Used with lists that are divided into sections
+    virtual float GetSectionHeaderWidth([[maybe_unused]] int sectionIndex) { return 0.0f; }
+
+    //! Returns the height of a header at the specified section.
+    //! Called when a vertical list contains elements of varying size, and the header's "auto calculate size" option is disabled.
+    //! Used with lists that are divided into sections
+    virtual float GetSectionHeaderHeight([[maybe_unused]] int sectionIndex) { return 0.0f; }
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiDynamicScrollBoxDataInterface> UiDynamicScrollBoxDataBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to receive notifications of element state
+//! changes, such as when an element is about to scroll into view
+class UiDynamicScrollBoxElementNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiDynamicScrollBoxElementNotifications(){}
+
+    //! Called when an element is about to become visible. Used to populate the element with data for display.
+    //! Used with lists that are not divided into sections
+    virtual void OnElementBecomingVisible([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int index) {}
+
+    //! Called when elements have variable sizes and are set to auto calculate.
+    //! Used with lists that are not divided into sections
+    virtual void OnPrepareElementForSizeCalculation([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int index) {}
+
+    //! Called 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
+    virtual void OnElementInSectionBecomingVisible([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int sectionIndex, [[maybe_unused]] int index) {}
+
+    //! Called when elements in sections have variable sizes and are set to auto calculate
+    //! Used with lists that are divided into sections
+    virtual void OnPrepareElementInSectionForSizeCalculation([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int sectionIndex, [[maybe_unused]] int index) {}
+
+    //! Called 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
+    virtual void OnSectionHeaderBecomingVisible([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int sectionIndex) {}
+
+    //! Called when headers have variable sizes and are set to auto calculate.
+    //! Used with lists that are divided into sections
+    virtual void OnPrepareSectionHeaderForSizeCalculation([[maybe_unused]] AZ::EntityId entityId, [[maybe_unused]] int sectionIndex) {}
+};
+
+typedef AZ::EBus<UiDynamicScrollBoxElementNotifications> UiDynamicScrollBoxElementNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiEditorBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorBus.h
new file mode 100644
index 0000000000..7f3bc94bed
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiEditorInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiEditorInterface() {}
+
+    //! Test if this entity should be visible in the Ui Canvas Editor
+    virtual bool GetIsVisible() = 0;
+
+    //! Set whether this entity should be visible in the Ui Canvas Editor
+    virtual void SetIsVisible(bool isVisible) = 0;
+
+    //! Test if this entity is selectable in the UI Canvas Editor
+    virtual bool GetIsSelectable() = 0;
+
+    //! Set whether this entity is selectable in the UI Canvas Editor
+    virtual void SetIsSelectable(bool isSelectable) = 0;
+
+    //! Test if this entity is currently selected in the UI Canvas Editor
+    virtual bool GetIsSelected() = 0;
+
+    //! Set whether this entity is currently selected in the UI Canvas Editor
+    virtual void SetIsSelected(bool isSelected) = 0;
+
+    //! Test if this entity is currently expanded in the UI Canvas Editor
+    virtual bool GetIsExpanded() = 0;
+
+    //! Set whether this entity is currently expanded in the UI Canvas Editor
+    virtual void SetIsExpanded(bool isExpanded) = 0;
+
+    //! Test if all the parents of this UI element are visible in the editor
+    virtual bool AreAllAncestorsVisible() = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiEditorInterface> UiEditorBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiEditorCanvasBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorCanvasBus.h
new file mode 100644
index 0000000000..138d7ea8f1
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorCanvasBus.h
@@ -0,0 +1,101 @@
+/*
+ * 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/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiEditorCanvasInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiEditorCanvasInterface() {}
+
+    //! Get the snap state.
+    virtual bool GetIsSnapEnabled() = 0;
+
+    //! Set the snap state.
+    virtual void SetIsSnapEnabled(bool enabled) = 0;
+
+    //! Get the translation distance to snap to
+    virtual float GetSnapDistance() = 0;
+
+    //! Set the translation distance to snap to
+    virtual void SetSnapDistance(float distance) = 0;
+
+    //! Get the degrees of rotation to snap to
+    virtual float GetSnapRotationDegrees() = 0;
+
+    //! Set the degrees of rotation to snap to
+    virtual void SetSnapRotationDegrees(float degrees) = 0;
+
+    //! Get the positions of the horizontal guide lines (along y-axis in canvas pixels)
+    virtual AZStd::vector<float> GetHorizontalGuidePositions() = 0;
+
+    //! Add a horizontal guide line
+    virtual void AddHorizontalGuide(float position) = 0;
+
+    //! Remove the horizontal guide line at the given index
+    virtual void RemoveHorizontalGuide(int index) = 0;
+
+    //! Set the position of the horizontal guide line at the given index
+    virtual void SetHorizontalGuidePosition(int index, float position) = 0;
+
+    //! Get the positions of the vertical guide lines (along x-axis in canvas pixels)
+    virtual AZStd::vector<float> GetVerticalGuidePositions() = 0;
+
+    //! Add a vertical guide line
+    virtual void AddVerticalGuide(float position) = 0;
+
+    //! Remove the vertical guide line at the given index
+    virtual void RemoveVerticalGuide(int index) = 0;
+
+    //! Set the position of the vertical guide line at the given index
+    virtual void SetVerticalGuidePosition(int index, float position) = 0;
+
+    //! Remove all of the guides
+    virtual void RemoveAllGuides() = 0;
+
+    //! Get the color to draw the guide lines on this canvas
+    virtual AZ::Color GetGuideColor() = 0;
+
+    //! Set the color to draw the guide lines on this canvas
+    virtual void SetGuideColor(const AZ::Color& color) = 0;
+
+    //! Get whether the guides on this canvas are locked
+    virtual bool GetGuidesAreLocked() = 0;
+
+    //! Set whether the guides on this canvas are locked
+    virtual void SetGuidesAreLocked(bool areLocked) = 0;
+
+    //! Check the canvas for any orphaned elements. These are elements not referenced as a child by the canvas or any of its descendant elements.
+    virtual bool CheckForOrphanedElements() = 0;
+
+    //! Recover any orphaned elements in the canvas by placing them under a special top-level element.
+    virtual void RecoverOrphanedElements() = 0;
+
+    //! Remove any orphaned elements in the canvas.
+    virtual void RemoveOrphanedElements() = 0;
+
+    //! Update the canvas from the UI Editor
+    //! \param deltaTime the amount of time in seconds since the last call to this function
+    //! \param isInGame, true if canvas being updated in preview mode, false if being updated in edit mode
+    virtual void UpdateCanvasInEditorViewport(float deltaTime, bool isInGame) = 0;
+
+    //! Render the canvas in the UI Editor
+    //! \param isInGame, true if canvas being rendered in preview mode, false if being rendered in edit mode
+    //! \param viewportSize, this is the size of the viewport that the canvas is being rendered to
+    virtual void RenderCanvasInEditorViewport(bool isInGame, AZ::Vector2 viewportSize) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiEditorCanvasInterface> UiEditorCanvasBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h
new file mode 100644
index 0000000000..a1615be297
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiEditorChangeNotificationBus.h
@@ -0,0 +1,42 @@
+/*
+ * 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/EntityId.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiEditorChangeNotificationInterface
+    : public AZ::EBusTraits
+{
+public: // member functions
+
+    virtual ~UiEditorChangeNotificationInterface() {}
+
+    //! Called when the transform properties in the UI editor need to be refreshed
+    virtual void OnEditorTransformPropertiesNeedRefresh() = 0;
+
+    //! Forces a refresh of the entire properties tree in the UI Editor.
+    virtual void OnEditorPropertiesRefreshEntireTree() = 0;
+};
+
+typedef AZ::EBus<UiEditorChangeNotificationInterface> UiEditorChangeNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Notify components who store directories as properties when directory contents change.
+class UiEditorRefreshDirectoryNotificationInterface
+    : public AZ::EBusTraits
+{
+public: // member functions
+
+    virtual ~UiEditorRefreshDirectoryNotificationInterface() {}
+
+    //! Notify directory properties that they should refresh their contents
+    virtual void OnRefreshDirectory() = 0;
+};
+
+typedef AZ::EBus<UiEditorRefreshDirectoryNotificationInterface> UiEditorRefreshDirectoryNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiElementBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiElementBus.h
new file mode 100644
index 0000000000..2a182a9dfc
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiElementBus.h
@@ -0,0 +1,198 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/UiBase.h>
+
+namespace LyShine
+{
+    class IRenderGraph;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiElementInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    //! Deleting an element will remove it from its parent and delete its child elements and components
+    virtual ~UiElementInterface() {}
+
+    //! Render the element and its child elements and components, this is done by adding primitives to the render graph
+    //! \param renderGraph, the render graph being added to
+    //! \param isInGame, true if element being rendered in game (or preview), false if being render in edit mode
+    virtual void RenderElement(LyShine::IRenderGraph* renderGraph, bool isInGame) = 0;
+
+    //! Retrieves the identifier of this element.
+    virtual LyShine::ElementId GetElementId() = 0;
+
+    //! Get the name of this element
+    virtual LyShine::NameType GetName() = 0;
+
+    //! Get the canvas that contains this element (returns AZ::InvalidEntityId if element has no canvas)
+    virtual AZ::EntityId GetCanvasEntityId() = 0;
+
+    //! Get the parent element of this element (returns nullptr if element has no parent)
+    virtual AZ::Entity* GetParent() = 0;
+
+    //! Get the parent entity Id of this element (returns invalid Id if element has no parent)
+    virtual AZ::EntityId GetParentEntityId() = 0;
+
+    //! Get the number child elements of this element
+    virtual int GetNumChildElements() = 0;
+
+    //! Get the specified child element, index must be less than GetNumChildElements()
+    virtual AZ::Entity* GetChildElement(int index) = 0;
+
+    //! Get the specified child entity Id, index must be less than GetNumChildElements()
+    virtual AZ::EntityId GetChildEntityId(int index) = 0;
+
+    //! Get the specified child's UiElementInterface, index must be less than GetNumChildElements()
+    //! and the element must be fully initialized
+    virtual UiElementInterface* GetChildElementInterface(int index) = 0;
+
+    //! Get the index of the specified child element
+    virtual int GetIndexOfChild(const AZ::Entity* child) = 0;
+
+    //! Get the index of the specified child element
+    virtual int GetIndexOfChildByEntityId(AZ::EntityId childId) = 0;
+
+    //! Get the child elements of this element
+    virtual LyShine::EntityArray GetChildElements() = 0;
+
+    //! Get the child entity Ids of this element
+    virtual AZStd::vector<AZ::EntityId> GetChildEntityIds() = 0;
+
+    //! Create a new element that is a child of this element, this element (the parent) has ownership of the child
+    //! The new entity will have a UiElementComponent added but will not yet be initialized or activated
+    virtual AZ::Entity* CreateChildElement(const LyShine::NameType& name) = 0;
+
+    //! Destroy this element
+    virtual void DestroyElement() = 0;
+
+    //! Queue up element for destruction at end of frame
+    virtual void DestroyElementOnFrameEnd() = 0;
+
+    //! Re-parent this element to move it in the hierarchy
+    //! \param newParent New parent element. If null then the canvas is the parent
+    //! \param nextElement  Element to insert this element before. If null element is put at end of child list
+    virtual void Reparent(AZ::Entity* newParent, AZ::Entity* insertBefore = nullptr) = 0;
+
+    //! Re-parent this element to move it in the hierarchy
+    //! \param newParent New parent element. If InvalidEntityId then the canvas is the parent
+    //! \param nextElement  Element to insert this element before. If InvalidEntityId then element is put at end of child list
+    virtual void ReparentByEntityId(AZ::EntityId newParent, AZ::EntityId insertBefore) = 0;
+
+    //! Add this element as a child of the specified parent
+    //! \param newParent New parent element. If null then the canvas is the parent
+    //! \param index  Child index where element is inserted. If -1 element is put at end of child list
+    virtual void AddToParentAtIndex(AZ::Entity* newParent, int index = -1) = 0;
+
+    //! Remove this element from its parent
+    virtual void RemoveFromParent() = 0;
+
+    //! Get the front-most child element whose bounds include the given point in canvas space
+    //! \return nullptr if no match
+    virtual AZ::Entity* FindFrontmostChildContainingPoint(AZ::Vector2 point, bool isInGame) = 0;
+
+    //! Get all the children whose bounds intersect with the given rect in canvas space
+    //! \return Empty EntityArray if no match
+    virtual LyShine::EntityArray FindAllChildrenIntersectingRect(const AZ::Vector2& bound0, const AZ::Vector2& bound1, bool isInGame) = 0;
+
+    //! Look for an entity with interactable component to handle an event at given point
+    virtual AZ::EntityId FindInteractableToHandleEvent(AZ::Vector2 point) = 0;
+
+    //! Look for a parent (ancestor) entity with interactable component to handle dragging starting at given point
+    virtual AZ::EntityId FindParentInteractableSupportingDrag(AZ::Vector2 point) = 0;
+
+    //! Return the first immediate child element with the given name or nullptr if no match
+    virtual AZ::Entity* FindChildByName(const LyShine::NameType& name) = 0;
+
+    //! Return the first descendant element with the given name or nullptr if no match
+    virtual AZ::Entity* FindDescendantByName(const LyShine::NameType& name) = 0;
+
+    //! Return the first immediate child entity Id with the given name or invalid Id if no match
+    virtual AZ::EntityId FindChildEntityIdByName(const LyShine::NameType& name) = 0;
+
+    //! Return the first descendant entity Id with the given name or invalid Id if no match
+    virtual AZ::EntityId FindDescendantEntityIdByName(const LyShine::NameType& name) = 0;
+
+    //! Return the first immediate child element with the given id or nullptr if no match
+    virtual AZ::Entity* FindChildByEntityId(AZ::EntityId id) = 0;
+
+    //! Return the descendant element with the given id or nullptr if no match
+    virtual AZ::Entity* FindDescendantById(LyShine::ElementId id) = 0;
+
+    //! recursively find descendant elements matching a predicate
+    //! \param result, any matching elements will be added to this array
+    virtual void FindDescendantElements(AZStd::function<bool(const AZ::Entity*)> predicate, LyShine::EntityArray& result) = 0;
+
+    //! recursively visit descendant elements and call the given function on them
+    //! The function is called first on the element and then on its children
+    virtual void CallOnDescendantElements(AZStd::function<void(const AZ::EntityId)> callFunction) = 0;
+
+    //! Return whether a given element is an ancestor of this element
+    virtual bool IsAncestor(AZ::EntityId id) = 0;
+
+    //! Enabled/disabled
+    virtual bool IsEnabled() = 0;
+    virtual void SetIsEnabled(bool isEnabled) = 0;
+    virtual bool GetAreElementAndAncestorsEnabled() = 0;
+
+    //! This can be used to disable the render without disabling the update/interaction.
+    //! This is used internally by components that temporarily disable rendering of other elements (though they preserve the existing value).
+    virtual bool IsRenderEnabled() = 0;
+    virtual void SetIsRenderEnabled(bool isRenderEnabled) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiElementInterface> UiElementBus;
+
+// UI_ANIMATION_REVISIT This may be a temporary location
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiElementChangeNotification
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiElementChangeNotification() {}
+
+    //! Notify listeners that a property has change on this entity
+    virtual void UiElementPropertyChanged() {}
+};
+
+typedef AZ::EBus<UiElementChangeNotification> UiElementChangeNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiElementNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiElementNotifications() {}
+
+    //! Notify listeners that the element is being destroyed
+    virtual void OnUiElementBeingDestroyed() {}
+
+    //! Notify listeners that the element has been fixed up (canvas and parent for the element have been set)
+    virtual void OnUiElementFixup(AZ::EntityId /*canvasEntityId*/, AZ::EntityId /*parentEntityId*/) {}
+
+    //! Notify listeners that the element has been enabled or disabled (the flag on this element was changed)
+    virtual void OnUiElementEnabledChanged(bool /*isEnabled*/) {}
+
+    //! Notify listeners that the element has been enabled or disabled either directly or to a change to an ancestors enabled flag
+    virtual void OnUiElementAndAncestorsEnabledChanged(bool /*areElementAndAncestorsEnabled*/) {}
+};
+
+typedef AZ::EBus<UiElementNotifications> UiElementNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiEntityContextBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiEntityContextBus.h
new file mode 100644
index 0000000000..febb8cc4d2
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiEntityContextBus.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/Math/Uuid.h>
+#include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/Serialization/ObjectStream.h>
+#include <AzCore/Slice/SliceComponent.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzFramework/Entity/EntityContextBus.h>
+#include <AzFramework/Entity/EntityContext.h>
+
+// Forward declarations
+namespace AZ
+{
+    class Entity;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus for making requests to the UI entity context.
+//! There is one UiEntityContext per UI canvas.
+class UiEntityContextRequests
+    : public AZ::EBusTraits
+{
+public:
+
+    virtual ~UiEntityContextRequests() {}
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides. Accessed by EntityContextId
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+    typedef AzFramework::EntityContextId BusIdType;
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+    //////////////////////////////////////////////////////////////////////////
+
+    //! Creates an entity in a UI context.
+    //! \return a new entity
+    virtual AZ::Entity* CreateUiEntity(const char* name) = 0;
+
+    //! Registers an existing entity with a UI context.
+    virtual void AddUiEntity(AZ::Entity* entity) = 0;
+
+    //! Registers an existing set of entities with a UI context.
+    virtual void AddUiEntities(const AzFramework::EntityList& entities) = 0;
+
+    //! Destroys an entity in a UI context.
+    //! \return whether or not the entity was destroyed. A false return value signifies the entity did not belong to the UI context.
+    virtual bool DestroyUiEntity(AZ::EntityId entityId) = 0;
+
+    //! Clones a set of entities.
+    //! \param sourceEntities - the source set of entities to clone
+    //! \param resultEntities - the set of entities cloned from the source
+    virtual bool CloneUiEntities(const AZStd::vector<AZ::EntityId>& sourceEntities, AzFramework::EntityList& resultEntities) = 0;
+
+};
+
+using UiEntityContextRequestBus = AZ::EBus<UiEntityContextRequests>;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus for receiving events/notifications from the UI entity context
+class UiEntityContextNotification
+    : public AZ::EBusTraits
+{
+public:
+
+    virtual ~UiEntityContextNotification() {};
+
+    //! Fired when the context is being reset.
+    virtual void OnContextReset() {}
+
+    //! Fired when a slice has been successfully instantiated.
+    virtual void OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/, const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
+
+    //! Fired when a slice has failed to instantiate.
+    virtual void OnSliceInstantiationFailed(const AZ::Data::AssetId& /*sliceAssetId*/, const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
+
+    //! Fired when the entity stream has been successfully loaded.
+    virtual void OnEntityStreamLoadSuccess() {}
+
+    //! Fired when the entity stream load has failed
+    virtual void OnEntityStreamLoadFailed() {}
+};
+
+using UiEntityContextNotificationBus = AZ::EBus<UiEntityContextNotification>;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiFaderBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiFaderBus.h
new file mode 100644
index 0000000000..dceac27a90
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiFaderBus.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Math/Color.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiFaderInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiFaderInterface() {}
+
+    //! Get the fade value. This is a float between 0 and 1. 1 means no fade. 0 means complete fade to invisible.
+    virtual float GetFadeValue() = 0;
+
+    //! Set the fade value
+    virtual void SetFadeValue(float fade) = 0;
+
+    //! Trigger a fade animation.
+    //! \param targetValue The value to end the fade at [0,1]
+    //! \param speed       Speed measured in full fade amount per second; 0 means instant
+    //! \param listener    The listener to notify when the fade is completed or interrupted
+    virtual void Fade(float targetValue, float speed) = 0;
+
+    //! Get whether a fade animation is taking place
+    virtual bool IsFading() = 0;
+
+    //! Get the flag that indicates whether the fader should use render to texture
+    virtual bool GetUseRenderToTexture() = 0;
+
+    //! Set the flag that indicates whether the fader should use render to texture
+    virtual void SetUseRenderToTexture(bool useRenderToTexture) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiFaderInterface> UiFaderBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement
+class UiFaderNotifications
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiFaderNotifications(){}
+
+    //! Called when the animation triggered by UiFaderInterface::Fade() is done.
+    //! The listener is automatically removed from the fader component after this is called.
+    virtual void OnFadeComplete() = 0;
+
+    //! Called when the animation triggered by UiFaderInterface::Fade() is interrupted.
+    //! The listener is automatically removed from the fader component after this is called.
+    virtual void OnFadeInterrupted() = 0;
+
+    //! Called when the fader component is destroyed
+    virtual void OnFaderDestroyed() = 0;
+};
+
+typedef AZ::EBus<UiFaderNotifications> UiFaderNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h
new file mode 100644
index 0000000000..ba39817066
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiFlipbookAnimationBus.h
@@ -0,0 +1,171 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzFramework/Entity/EntityContextBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus that defines the interface for flipbook animations.
+//!
+//! A flipbook animation component exists on an entity that has an image component
+//! and interacts with the image bus to achieve its functionality (such as by
+//! manipulating sprite-sheet indices).
+class UiFlipbookAnimationInterface
+    : public AZ::ComponentBus
+{
+public: // Types
+
+    //! Defines the looping behavior when playing back a flipbook animation.
+    enum class LoopType
+    {
+        None,       //!< No looping behavior
+        
+        Linear,     //!< When end frame is reached, next frame will be the loop start frame
+
+        PingPong    //!< When end frame is reached, next frame will be the previous frame, 
+                    //!< continuing in reverse until the start frame is reached.
+    };
+
+    //! Units of speed for framerate
+    enum class FramerateUnits
+    {
+        FPS,                //!< Framerate of animation
+
+        SecondsPerFrame,    //!< Number of seconds to wait before playing next frame
+    };
+
+public:
+    virtual ~UiFlipbookAnimationInterface() {}
+
+    //! Start the animation sequence, beginning at the start frame.
+    //!
+    //! If a LoopType other than None has been set, the animation won't stop
+    //! unless explicitly done so (or the image is unloaded/destroyed).
+    virtual void Start() = 0;
+
+    //! Stops animation playback.
+    virtual void Stop() = 0;
+
+    //! \return True if the flipbook animation is currently playing, false otherwise.
+    virtual bool IsPlaying() = 0;
+
+    //! \return The starting frame of the animation.
+    virtual AZ::u32 GetStartFrame() = 0;
+
+    //! Sets the starting frame of the animation.
+    virtual void SetStartFrame(AZ::u32 startFrame) = 0;
+
+    //! \return End frame of the animation.
+    virtual AZ::u32 GetEndFrame() = 0;
+
+    //! Sets the ending frame of the animation.
+    virtual void SetEndFrame(AZ::u32 endFrame) = 0;
+
+    //! \return The current frame of the animation that's being rendered.
+    virtual AZ::u32 GetCurrentFrame() = 0;
+
+    //! Sets the current frame of the animation to render.
+    //!
+    //! If the animation is currently playing, this will effectively "skip"
+    //! to the given frame.
+    virtual void SetCurrentFrame(AZ::u32 currentFrame) = 0;
+
+    //! This frame is distinct from the start frame and allows a "lead in"
+    //! seqence of frames to play leading up to the looping animation. The
+    //! frames that occur prior to the loop start frame will only play once.
+    //!
+    //! \return The frame to start the loop from.
+    virtual AZ::u32 GetLoopStartFrame() = 0;
+
+    //! Sets the starting frame for looping sequences.
+    virtual void SetLoopStartFrame(AZ::u32 loopStartFrame) = 0;
+
+    //! \return The LoopType of the flipbook animation.
+    virtual LoopType GetLoopType() = 0;
+
+    //! Sets the LoopType of the flipbook animation.
+    virtual void SetLoopType(LoopType loopType) = 0;
+    
+    //! Gets the speed used to determine when to transition to the next frame.
+    //!
+    //! Framerate is defined relative to unit of time, specified by FramerateUnits.
+    //!
+    //! See GetFramerateUnit, SetFramerateUnit.
+    virtual float GetFramerate() = 0;
+
+    //! Sets the speed used to determine when to transition to the next frame.
+    //!
+    //! Framerate is defined relative to unit of time, specified by FramerateUnits.
+    //!
+    //! See GetFramerateUnit, SetFramerateUnit.
+    virtual void SetFramerate(float framerate) = 0;
+
+    //! Gets the framerate unit.
+    virtual FramerateUnits GetFramerateUnit() = 0;
+
+    //! Sets the framerate unit.
+    virtual void SetFramerateUnit(FramerateUnits framerateUnit) = 0;
+
+    //! Gets the delay (in seconds) before playing the flipbook (applied only once during playback).
+    virtual float GetStartDelay() = 0;
+
+    //! Sets the delay (in seconds) before playing the flipbook (applied only once during playback).
+    virtual void SetStartDelay(float startDelay) = 0;
+    
+    //! Gets the delay (in seconds) before playing the loop sequence.
+    virtual float GetLoopDelay() = 0;
+
+    //! Sets the delay (in seconds) before playing the loop sequence.
+    virtual void SetLoopDelay(float loopDelay) = 0;
+
+    //! Gets the delay (in seconds) before playing the reverse loop sequence (PingPong loop types only).
+    virtual float GetReverseDelay() = 0;
+
+    //! Sets the delay (in seconds) before playing the reverse loop sequence (PingPong loop types only).
+    virtual void SetReverseDelay(float reverseDelay) = 0;
+
+    //! Returns true if the animation will begin playing when the component activates, false otherwise.
+    virtual bool GetIsAutoPlay() = 0;
+
+    //! Sets whether the animation will automatically begin playing.
+    //!
+    //! This flag is ignored after the component has activated.
+    virtual void SetIsAutoPlay(bool isAutoPlay) = 0;
+};
+
+using UiFlipbookAnimationBus = AZ::EBus<UiFlipbookAnimationInterface>;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Allows listeners to be aware of events, like loop completion, occurring.
+class UiFlipbookAnimationNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiFlipbookAnimationNotifications() {}
+
+    //! Notify listeners when the animation starts
+    virtual void OnAnimationStarted() {}
+
+    //! Notify listeners when the animation stops
+    virtual void OnAnimationStopped() {}
+
+    //! Notify listeners when the current loop sequence has completed
+    //!
+    //! This will only trigger for LoopType sequences other than None.
+    //!
+    //! For Linear LoopType, this will trigger on the last frame of the last
+    //! frame of the loop.
+    //!
+    //! For PingPong LoopType, this will trigger on the last frame of the
+    //! loop sequence before reversing the loop direction.
+    virtual void OnLoopSequenceCompleted() {}
+};
+
+typedef AZ::EBus<UiFlipbookAnimationNotifications> UiFlipbookAnimationNotificationsBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiGameEntityContextBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiGameEntityContextBus.h
new file mode 100644
index 0000000000..4570481ec2
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiGameEntityContextBus.h
@@ -0,0 +1,105 @@
+/*
+ * 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/Math/Uuid.h>
+#include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/Serialization/ObjectStream.h>
+#include <AzCore/Serialization/IdUtils.h>
+#include <AzCore/Slice/SliceComponent.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzFramework/Entity/EntityContextBus.h>
+#include <AzFramework/Entity/EntityContext.h>
+
+// Forward declarations
+namespace AZ
+{
+    class Entity;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus for making requests to the UI game entity context.
+class UiGameEntityContextRequests
+    : public AZ::EBusTraits
+{
+public:
+
+    virtual ~UiGameEntityContextRequests() {}
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides. Accessed by EntityContextId
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+    typedef AzFramework::EntityContextId BusIdType;
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+    //////////////////////////////////////////////////////////////////////////
+
+    //! Instantiates a dynamic slice asynchronously.
+    //! \return a ticket identifying the spawn request.
+    //!         Callers can immediately subscribe to the SliceInstantiationResultBus for this ticket
+    //!         to receive result for this specific request.
+    virtual AzFramework::SliceInstantiationTicket InstantiateDynamicSlice(
+        const AZ::Data::Asset<AZ::Data::AssetData>& /*sliceAsset*/,
+        const AZ::Vector2& /*position*/,
+        bool /*isViewportPosition*/,
+        AZ::Entity* /*parent*/,
+        const AZ::IdUtils::Remapper<AZ::EntityId>::IdMapper& /*customIdMapper*/)
+    { return AzFramework::SliceInstantiationTicket(); }
+};
+
+using UiGameEntityContextBus = AZ::EBus<UiGameEntityContextRequests>;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus for receiving notifications from the UI game entity context component.
+class UiGameEntityContextNotifications
+    : public AZ::EBusTraits
+{
+public:
+
+    virtual ~UiGameEntityContextNotifications() = default;
+
+    /// Fired when a slice has been successfully instantiated.
+    virtual void OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/,
+        const AZ::SliceComponent::SliceInstanceAddress& /*instance*/,
+        const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
+
+    /// Fired when a slice asset could not be instantiated.
+    virtual void OnSliceInstantiationFailed(const AZ::Data::AssetId& /*sliceAssetId*/,
+        const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
+};
+
+using UiGameEntityContextNotificationBus = AZ::EBus<UiGameEntityContextNotifications>;
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus for receiving notifications from the UI game entity context component. This bus is used
+//! by the UiSpawnerComponent that depends on the UiGameEntityContext fixing entities up before
+//! it sends out notifications to listeners on the UiSpawnerNotificationBus
+class UiGameEntityContextSliceInstantiationResults
+    : public AZ::EBusTraits
+{
+public:
+
+    virtual ~UiGameEntityContextSliceInstantiationResults() = default;
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides. Addressed by SliceInstantiationTicket
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+    typedef AzFramework::SliceInstantiationTicket BusIdType;
+    //////////////////////////////////////////////////////////////////////////
+
+    //! Signals that a slice was successfully instantiated prior to entity registration.
+    virtual void OnEntityContextSlicePreInstantiate(const AZ::Data::AssetId& /*sliceAssetId*/, const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/) {}
+
+    //! Signals that a slice was successfully instantiated after entity registration.
+    virtual void OnEntityContextSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/) {}
+
+    //! Signals that a slice could not be instantiated.
+    virtual void OnEntityContextSliceInstantiationFailed(const AZ::Data::AssetId& /*sliceAssetId*/) {}
+};
+
+using UiGameEntityContextSliceInstantiationResultsBus = AZ::EBus<UiGameEntityContextSliceInstantiationResults>;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiImageBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiImageBus.h
new file mode 100644
index 0000000000..2e5058cb61
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiImageBus.h
@@ -0,0 +1,167 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Color.h>
+
+class ISprite;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiImageInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    enum class ImageType : int32_t
+    {
+        Stretched,      //!< the texture is stretched to fit the rect without maintaining aspect ratio
+        Sliced,         //!< the texture is sliced such that center stretches and the edges do not
+        Fixed,          //!< the texture is not stretched at all
+        Tiled,          //!< the texture is tiled (repeated)
+        StretchedToFit, //!< the texture is scaled to fit the rect while maintaining aspect ratio
+        StretchedToFill //!< the texture is scaled to fill the rect while maintaining aspect ratio
+    };
+
+    enum class SpriteType : int32_t
+    {
+        SpriteAsset,
+        RenderTarget,
+    };
+
+    enum class FillType : int32_t
+    {
+        None,           //!< the image is displayed fully filled
+        Linear,         //!< the image is filled linearly from one edge to the opposing edge
+        Radial,         //!< the image is filled radially around the center
+        RadialCorner,   //!< the image is filled radially around a corner
+        RadialEdge,     //!< the image is filled radially around the midpoint of an edge
+    };
+
+    enum class FillCornerOrigin : int32_t
+    {
+        TopLeft,
+        TopRight,
+        BottomRight,
+        BottomLeft,
+    };
+
+    enum class FillEdgeOrigin : int32_t
+    {
+        Left,
+        Top,
+        Right,
+        Bottom,
+    };
+
+public: // member functions
+
+    virtual ~UiImageInterface() {}
+
+    //! Gets the image color tint
+    virtual AZ::Color GetColor() = 0;
+
+    //! Sets the image color tint
+    virtual void SetColor(const AZ::Color& color) = 0;
+
+    //! Gets the image color alpha
+    virtual float GetAlpha() = 0;
+
+    //! Sets the image color alpha
+    virtual void SetAlpha(float color) = 0;
+
+    //! Gets the sprite for this element
+    virtual ISprite* GetSprite() = 0;
+
+    //! Sets the sprite for this element
+    virtual void SetSprite(ISprite* sprite) = 0;
+
+    //! Gets the source location of the image to be displayed by the element
+    virtual AZStd::string GetSpritePathname() = 0;
+    
+    //! Sets the source location of the image to be displayed by the element
+    virtual void SetSpritePathname(AZStd::string spritePath) = 0;
+
+    //! Sets the source location of the image to be displayed by the element only
+    //! if the sprite asset exists. Otherwise, the current sprite remains unchanged.
+    //! Returns whether the sprite changed
+    virtual bool SetSpritePathnameIfExists(AZStd::string spritePath) = 0;
+
+    //! Gets the name of the render target
+    virtual AZStd::string GetRenderTargetName() = 0;
+
+    //! Sets the name of the render target
+    virtual void SetRenderTargetName(AZStd::string renderTargetName) = 0;
+
+    //! Gets whether the render target is in sRGB color space
+    virtual bool GetIsRenderTargetSRGB() = 0;
+
+    //! Sets whether the render target is in sRGB color space
+    virtual void SetIsRenderTargetSRGB(bool isSRGB) = 0;
+
+    //! Gets the type of the sprite
+    virtual SpriteType GetSpriteType() = 0;
+
+    //! Sets the type of the sprite
+    virtual void SetSpriteType(SpriteType spriteType) = 0;
+
+    //! Gets the type of the image
+    virtual ImageType GetImageType() = 0;
+
+    //! Sets the type of the image
+    virtual void SetImageType(ImageType imageType) = 0;
+    
+    //! Gets the fill type for the image
+    virtual FillType GetFillType() = 0;
+
+    //! Sets the fill type for the image
+    virtual void SetFillType(FillType fillType) = 0;
+
+    //! Gets the fill amount for the image in the range [0,1]
+    virtual float GetFillAmount() = 0;
+
+    //! Sets the fill amount for the image in the range [0,1]
+    virtual void SetFillAmount(float fillAmount) = 0;
+
+    //! Gets the start angle for radial fill, measured clockwise in degrees from straight up
+    virtual float GetRadialFillStartAngle() = 0;
+
+    //! Sets the start angle for radial fill, measured clockwise in degrees from straight up
+    virtual void SetRadialFillStartAngle(float radialFillStartAngle) = 0;
+
+    //! Gets the corner fill origin
+    virtual FillCornerOrigin GetCornerFillOrigin() = 0;
+
+    //! Sets the corner fill origin
+    virtual void SetCornerFillOrigin(FillCornerOrigin cornerOrigin) = 0;
+
+    //! Gets the edge fill origin
+    virtual FillEdgeOrigin GetEdgeFillOrigin() = 0;
+
+    //! Sets the edge fill origin
+    virtual void SetEdgeFillOrigin(FillEdgeOrigin edgeOrigin) = 0;
+
+    //! Gets whether the image is filled clockwise
+    virtual bool GetFillClockwise() = 0;
+
+    //! Sets whether the image is filled clockwise
+    virtual void SetFillClockwise(bool fillClockwise) = 0;
+
+    //! Gets whether the center of a sliced image is filled
+    virtual bool GetFillCenter() = 0;
+
+    //! Sets whether the center of a sliced image is filled
+    virtual void SetFillCenter(bool fillCenter) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiImageInterface> UiImageBus;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiImageSequenceBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiImageSequenceBus.h
new file mode 100644
index 0000000000..79a7707799
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiImageSequenceBus.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiImageSequenceInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    enum class ImageType : int32_t
+    {
+        Stretched,      //!< the texture is stretched to fit the rect without maintaining aspect ratio
+        Fixed,          //!< the texture is not stretched at all
+        StretchedToFit, //!< the texture is scaled to fit the rect while maintaining aspect ratio
+        StretchedToFill //!< the texture is scaled to fill the rect while maintaining aspect ratio
+    };
+
+public: // member functions
+
+    virtual ~UiImageSequenceInterface() {}
+
+    //! Gets the type of the image
+    virtual ImageType GetImageType() = 0;
+
+    //! Sets the type of the image
+    virtual void SetImageType(ImageType imageType) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiImageSequenceInterface> UiImageSequenceBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiIndexableImageBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiIndexableImageBus.h
new file mode 100644
index 0000000000..2c768b68ae
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiIndexableImageBus.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 <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Defines an interface for working with indexable image types, such as sprite-sheets or image sequences.
+class UiIndexableImageInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiIndexableImageInterface() {}
+    
+    //! Sets the index of the image to display
+    virtual void SetImageIndex(AZ::u32 index) = 0;
+
+    //! Gets the index of the image to display
+    virtual const AZ::u32 GetImageIndex() = 0;
+
+    //! Gets the number of indices for this image.
+    virtual const AZ::u32 GetImageIndexCount() = 0;    
+
+    //! Given an index, return its alias (if defined)
+    virtual AZStd::string GetImageIndexAlias(AZ::u32 index) = 0;
+
+    //! Given an index, set an alias for it
+    virtual void SetImageIndexAlias(AZ::u32 index, const AZStd::string& alias) = 0;
+
+    //! Given an alias, return the index that corresponds to it
+    virtual AZ::u32 GetImageIndexFromAlias(const AZStd::string& alias) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiIndexableImageInterface> UiIndexableImageBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiInitializationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInitializationBus.h
new file mode 100644
index 0000000000..6dbb798fb7
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiInitializationBus.h
@@ -0,0 +1,36 @@
+/*
+ * 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/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiInitializationInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiInitializationInterface() {}
+
+    //! Initialize the component after it has been created as part of a set of entities.
+    //! I.e. After a group of entities has been created and activated from a load or clone operation
+    //! in the game (not in the UI Editor) this is called on each created element.
+    //! This allows the component to perform operations that rely on related entities being
+    //! activated.
+    virtual void InGamePostActivate() = 0;
+
+public: // static member functions
+
+    static const char* GetUniqueName() { return "UiInitializationInterface"; }
+
+public: // static member data
+
+    //! Multiple components on an entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+};
+
+typedef AZ::EBus<UiInitializationInterface> UiInitializationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableActionsBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableActionsBus.h
new file mode 100644
index 0000000000..1049dad134
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableActionsBus.h
@@ -0,0 +1,84 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// This bus allows the get/set of properties for a group of actions that many interactable components
+// implement.
+// It is separate from UiInteractableBus because UiInteractableBus is part of a core system for how
+// the UI canvas communincates with any UI element that wants user input. Sometimes UI components
+// want input because they are part of a 2D puzzle for example but they do not always want to have
+// to support the standard action changes.
+class UiInteractableActionsInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    typedef AZStd::function<void(AZ::EntityId)> OnActionCallback;
+
+public: // member functions
+
+    virtual ~UiInteractableActionsInterface() {}
+
+    //! Get the hover start action name
+    virtual const LyShine::ActionName& GetHoverStartActionName() = 0;
+
+    //! Set the hover start action name
+    virtual void SetHoverStartActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the hover end action name
+    virtual const LyShine::ActionName& GetHoverEndActionName() = 0;
+
+    //! Set the hover end action name
+    virtual void SetHoverEndActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the pressed action name
+    virtual const LyShine::ActionName& GetPressedActionName() = 0;
+
+    //! Set the pressed action name
+    virtual void SetPressedActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the released action name
+    virtual const LyShine::ActionName& GetReleasedActionName() = 0;
+
+    //! Set the released action name
+    virtual void SetReleasedActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the hover start callback
+    virtual OnActionCallback GetHoverStartActionCallback() = 0;
+
+    //! Set the hover start callback
+    virtual void SetHoverStartActionCallback(OnActionCallback onActionCallback) = 0;
+
+    //! Get the hover end callback
+    virtual OnActionCallback GetHoverEndActionCallback() = 0;
+
+    //! Set the hover end callback
+    virtual void SetHoverEndActionCallback(OnActionCallback onActionCallback) = 0;
+
+    //! Get the pressed callback
+    virtual OnActionCallback GetPressedActionCallback() = 0;
+
+    //! Set the pressed callback
+    virtual void SetPressedActionCallback(OnActionCallback onActionCallback) = 0;
+
+    //! Get the release callback
+    virtual OnActionCallback GetReleasedActionCallback() = 0;
+
+    //! Set the release callback
+    virtual void SetReleasedActionCallback(OnActionCallback onActionCallback) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiInteractableActionsInterface> UiInteractableActionsBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableBus.h
new file mode 100644
index 0000000000..81e321f821
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableBus.h
@@ -0,0 +1,179 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiInteractableInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiInteractableInterface() {}
+
+    //! Check whether this component can handle the event at the given location
+    virtual bool CanHandleEvent(AZ::Vector2 point) = 0;
+
+    //! Called on an interactable component when a pressed event is received over it
+    //! \param point, the point at which the event occurred (viewport space)
+    //! \param shouldStayActive, output - true if the interactable wants to become the active element for the canvas
+    //! \return true if the interactable handled the event
+    virtual bool HandlePressed(AZ::Vector2 point, bool& shouldStayActive) = 0;
+
+    //! Called on the currently pressed interactable component when a release event is received
+    //! \param point, the point at which the event occurred (viewport space)
+    //! \return true if the interactable handled the event
+    virtual bool HandleReleased(AZ::Vector2 point) = 0;
+
+    //! Called on an interactable component when a multi-touch pressed event is received over it
+    //! \param point, the point at which the event occurred (viewport space)
+    //! \param multiTouchIndex, the index of the multi-touch (the 'primary' touch with index 0 is sent to HandlePressed)
+    //! \return true if the interactable handled the event
+    virtual bool HandleMultiTouchPressed(AZ::Vector2 point, int multiTouchIndex) = 0;
+
+    //! Called on the currently pressed interactable component when a multi-touch release event is received
+    //! \param point, the point at which the event occurred (viewport space)
+    //! \param multiTouchIndex, the index of the multi-touch (the 'primary' touch with index 0 is sent to HandlePressed)
+    //! \return true if the interactable handled the event
+    virtual bool HandleMultiTouchReleased(AZ::Vector2 point, int multiTouchIndex) = 0;
+
+    //! Called on an interactable component when an enter pressed event is received
+    //! \param shouldStayActive, output - true if the interactable wants to become the active element for the canvas
+    //! \return true if the interactable handled the event
+    virtual bool HandleEnterPressed([[maybe_unused]] bool& shouldStayActive) { return false; }
+
+    //! Called on the currently pressed interactable component when an enter released event is received
+    //! \return true if the interactable handled the event
+    virtual bool HandleEnterReleased() { return false; }
+
+    //! Called when the interactable was navigated to via gamepad/keyboard, and auto activation is enabled on the interactable
+    //! \return true if the interactable handled the event
+    virtual bool HandleAutoActivation() { return false; }
+
+    //! Called on the currently active interactable component when text input is received
+    //! \return true if the interactable handled the event
+    virtual bool HandleTextInput([[maybe_unused]] const AZStd::string& textUTF8) { return false; };
+
+    //! Called on the currently active interactable component when input is received
+    //! \return true if the interactable handled the event
+    virtual bool HandleKeyInputBegan([[maybe_unused]] const AzFramework::InputChannel::Snapshot& inputSnapshot, [[maybe_unused]] AzFramework::ModifierKeyMask activeModifierKeys) { return false; }
+
+    //! Called on the currently active interactable component when a mouse/touch position event is received
+    //! \param point, the current mouse/touch position (viewport space)
+    virtual void InputPositionUpdate([[maybe_unused]] AZ::Vector2 point) {};
+
+    //! Called on the currently pressed interactable component when a multi-touch position event is received
+    //! \param point, the current mouse/touch position (viewport space)
+    //! \param multiTouchIndex, the index of the multi-touch (the 'primary' touch with index 0 is sent to HandlePressed)
+    virtual void MultiTouchPositionUpdate([[maybe_unused]] AZ::Vector2 point, [[maybe_unused]] int multiTouchIndex) {};
+
+    //! Returns true if this interactable supports taking active status when a drag is started on a child
+    //! interactble AND the given drag startPoint would be a valid drag start point
+    //! \param point, the start point of the drag (which would be on a child interactable) (viewport space)
+    virtual bool DoesSupportDragHandOff([[maybe_unused]] AZ::Vector2 startPoint) { return false; }
+
+    //! Called on a parent of the currently active interactable element to allow interactables that
+    //! contain other interactables to support drags that start on the child.
+    //! If this return true the hand-off occured and the caller will no longer be considered the
+    //! active interactable by the canvas.
+    //! \param currentActiveInteractable, the child element that is the currently active interactable
+    //! \param startPoint, the start point of the potential drag (viewport space)
+    //! \param currentPoint, the current points of the potential drag (viewport space)
+    virtual bool OfferDragHandOff([[maybe_unused]] AZ::EntityId currentActiveInteractable, [[maybe_unused]] AZ::Vector2 startPoint, [[maybe_unused]] AZ::Vector2 currentPoint, [[maybe_unused]] float dragThreshold) { return false; };
+
+    //! Called on the currently active interactable component when the active interactable changes
+    virtual void LostActiveStatus() {};
+
+    //! Called when mouse/touch enters the bounds of this interactable
+    virtual void HandleHoverStart() = 0;
+
+    //! Called on the currently hovered interactable component when mouse/touch moves outside of bounds
+    virtual void HandleHoverEnd() = 0;
+
+    //! Called when a descendant of the interactable becomes the hover interactable by being navigated to
+    virtual void HandleDescendantReceivedHoverByNavigation([[maybe_unused]] AZ::EntityId descendantEntityId) {};
+
+    //! Called when the interactable becomes the hover interactable by being navigated to from one of its descendants
+    virtual void HandleReceivedHoverByNavigatingFromDescendant([[maybe_unused]] AZ::EntityId descendantEntityId) {};
+
+    //! Query whether the interactable is currently pressed
+    virtual bool IsPressed() { return false; }
+
+    //! Enable/disable event handling
+    virtual bool IsHandlingEvents() { return true; }
+    virtual void SetIsHandlingEvents([[maybe_unused]] bool isHandlingEvents) {}
+
+    //! Enable/disable multi-touch event handling
+    virtual bool IsHandlingMultiTouchEvents() { return true; }
+    virtual void SetIsHandlingMultiTouchEvents([[maybe_unused]] bool isHandlingMultiTouchEvents) {}
+
+    //! Get/set whether the interactable automatically becomes active when navigated to via gamepad/keyboard
+    virtual bool GetIsAutoActivationEnabled() = 0;
+    virtual void SetIsAutoActivationEnabled(bool isEnabled) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiInteractableInterface> UiInteractableBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiInteractableActiveNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiInteractableActiveNotifications() {}
+
+    //! Notify listener that this interactable is no longer active
+    virtual void ActiveCancelled() {}
+
+    //! Notify listener that this interactable has given up active status to a new interactable
+    virtual void ActiveChanged([[maybe_unused]] AZ::EntityId m_newActiveInteractable, [[maybe_unused]] bool shouldStayActive) {}
+};
+
+typedef AZ::EBus<UiInteractableActiveNotifications> UiInteractableActiveNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement in order to get notifications when actions are
+//! triggered
+class UiInteractableNotifications
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiInteractableNotifications(){}
+
+    //! Called on hover start
+    virtual void OnHoverStart() {};
+
+    //! Called on hover end
+    virtual void OnHoverEnd() {};
+
+    //! Called on pressed
+    virtual void OnPressed() {};
+
+    //! Called on released
+    virtual void OnReleased() {};
+
+    //! Called on receiving hover by being navigated to from a descendant
+    virtual void OnReceivedHoverByNavigatingFromDescendant([[maybe_unused]] AZ::EntityId descendantEntityId) {};
+};
+
+typedef AZ::EBus<UiInteractableNotifications> UiInteractableNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableStatesBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableStatesBus.h
new file mode 100644
index 0000000000..6a91035270
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractableStatesBus.h
@@ -0,0 +1,110 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/UiBase.h>
+#include <AzCore/Math/Color.h>
+
+class ISprite;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// This bus allows the get/set of properties for a group of states that many interactable components
+// implement.
+// It is separate from UiInteractableBus because UiInteractableBus is part of a core system for how
+// the UI canvas communincates with any UI element that wants user input. Sometimes UI components
+// want input because they are part of a 2D puzzle for example but they do not always want to have
+// to support the standard state changes.
+class UiInteractableStatesInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! The different visual states that an interactable can be in. An enum class is avoided so that 
+    //! derived components of UiInteractableComponent can extend with additional states.
+    using State = int;
+    enum
+    {
+        StateNormal = 0,
+        StateHover,
+        StatePressed,
+        StateDisabled,
+        NumStates
+    };
+
+public: // member functions
+
+    virtual ~UiInteractableStatesInterface() {}
+
+    //! Set the color to be used for the given target when the interactable is in the given state
+    //! If the interactable already has a color action for this state/target combination then replaces it
+    virtual void SetStateColor(State state, AZ::EntityId target, const AZ::Color& color) = 0;
+
+    //! Get the color to be used for the given target when the interactable is in the given state
+    //! \return the color to be used for the given target when the interactable is in the given state
+    virtual AZ::Color GetStateColor(State state, AZ::EntityId target) = 0;
+
+    //! Get whether the interactable has a color action for this state/target combination
+    //! \return true if the interactable has a color action for this state/target combination
+    virtual bool HasStateColor(State state, AZ::EntityId target) = 0;
+
+    //! Set the alpha to be used for the given target when the interactable is in the given state
+    //! If the interactable already has an alpha action for this state/target combination then replaces it
+    virtual void SetStateAlpha(State state, AZ::EntityId target, float alpha) = 0;
+
+    //! Get the alpha to be used for the given target when the interactable is in the given state
+    //! \return the alpha to be used for the given target when the interactable is in the given state
+    virtual float GetStateAlpha(State state, AZ::EntityId target) = 0;
+
+    //! Get whether the interactable has an alpha action for this state/target combination
+    //! \return true if the interactable has an alpha action for this state/target combination
+    virtual bool HasStateAlpha(State state, AZ::EntityId target) = 0;
+
+    //! Set the sprite to be used for the given target when the interactable is in the given state
+    //! If the interactable already has a sprite action for this state/target combination then replaces it
+    virtual void SetStateSprite(State state, AZ::EntityId target, ISprite* sprite) = 0;
+
+    //! Get the sprite to be used for the given target when the interactable is in the given state
+    //! \return the sprite to be used for the given target when the interactable is in the given state
+    virtual ISprite* GetStateSprite(State state, AZ::EntityId target) = 0;
+
+    //! Set the sprite path to be used for the given target when the interactable is in the given state
+    //! If the interactable already has a sprite action for this state/target combination then replaces it
+    virtual void SetStateSpritePathname(State state, AZ::EntityId target, const AZStd::string& spritePath) = 0;
+
+    //! Get the sprite path to be used for the given target when the interactable is in the given state
+    //! \return the sprite path to be used for the given target when the interactable is in the given state
+    virtual AZStd::string GetStateSpritePathname(State state, AZ::EntityId target) = 0;
+
+    //! Get whether the interactable has a sprite action for this state/target combination
+    //! \return true if the interactable has a sprite action for this state/target combination
+    virtual bool HasStateSprite(State state, AZ::EntityId target) = 0;
+
+    //! Set the font to be used for the given target when the interactable is in the given state
+    //! If the interactable already has a font action for this state/target combination then replaces it
+    virtual void SetStateFont(State state, AZ::EntityId target, const AZStd::string& fontPathname, unsigned int fontEffectIndex) = 0;
+
+    //! Get the font path to be used for the given target when the interactable is in the given state
+    //! \return the font path to be used for the given target when the interactable is in the given state
+    virtual AZStd::string GetStateFontPathname(State state, AZ::EntityId target) = 0;
+
+    //! Get the font effect to be used for the given target when the interactable is in the given state
+    //! \return the font effect to be used for the given target when the interactable is in the given state
+    virtual unsigned int GetStateFontEffectIndex(State state, AZ::EntityId target) = 0;
+
+    //! Get whether the interactable has a font action for this state/target combination
+    //! \return true if the interactable has a font action for this state/target combination
+    virtual bool HasStateFont(State state, AZ::EntityId target) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiInteractableStatesInterface> UiInteractableStatesBus;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiInteractionMaskBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractionMaskBus.h
new file mode 100644
index 0000000000..9279c0deda
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiInteractionMaskBus.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiInteractionMaskInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiInteractionMaskInterface() {}
+
+    //! Check whether this element is masking the given point
+    virtual bool IsPointMasked(AZ::Vector2 point) = 0;
+
+public: // static member functions
+
+    static const char* GetUniqueName() { return "UIInteractionMaskInterface"; }
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiInteractionMaskInterface> UiInteractionMaskBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutBus.h
new file mode 100644
index 0000000000..c12340901d
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutBus.h
@@ -0,0 +1,88 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/Bus/UiTransformBus.h>
+#include <LyShine/IDraw2d.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiLayoutInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! Horizontal order used by layout components
+    enum class HorizontalOrder
+    {
+        LeftToRight,
+        RightToLeft
+    };
+
+    //! Vertical order used by layout components
+    enum class VerticalOrder
+    {
+        TopToBottom,
+        BottomToTop
+    };
+
+    //! Padding (in pixels) inside the edges of an element
+    struct Padding
+    {
+        AZ_TYPE_INFO(Padding, "{DE5C18B0-4214-4A37-B590-8D45CC450A96}")
+
+        Padding()
+            : m_left(0)
+            , m_top(0)
+            , m_right(0)
+            , m_bottom(0) {}
+
+        int m_left;
+        int m_right;
+        int m_top;
+        int m_bottom;
+    };
+
+public: // member functions
+
+    virtual ~UiLayoutInterface() {}
+
+    //! Get whether this layout component uses layout cells to calculate its layout
+    virtual bool IsUsingLayoutCellsToCalculateLayout() = 0;
+
+    //! Get whether this layout component should bypass the default layout cell values calculated by its children
+    virtual bool GetIgnoreDefaultLayoutCells() = 0;
+
+    //! Set whether this layout component should bypass the default layout cell values calculated by its children
+    virtual void SetIgnoreDefaultLayoutCells(bool ignoreDefaultLayoutCells) = 0;
+
+    //! Get the horizontal child alignment
+    virtual IDraw2d::HAlign GetHorizontalChildAlignment() = 0;
+
+    //! Set the horizontal child alignment
+    virtual void SetHorizontalChildAlignment(IDraw2d::HAlign alignment) = 0;
+
+    //! Get the vertical child alignment
+    virtual IDraw2d::VAlign GetVerticalChildAlignment() = 0;
+
+    //! Set the vertical child alignment
+    virtual void SetVerticalChildAlignment(IDraw2d::VAlign alignment) = 0;
+
+    //! Find out whether this layout component is currently overriding the transform of the specified element.
+    virtual bool IsControllingChild(AZ::EntityId childId) = 0;
+
+    //! Get the size the element needs to be to fit a specified number of child elements of a certain size
+    virtual AZ::Vector2 GetSizeToFitChildElements(const AZ::Vector2& childElementSize, int numChildElements) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiLayoutInterface> UiLayoutBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellBus.h
new file mode 100644
index 0000000000..e842748cea
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellBus.h
@@ -0,0 +1,74 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/UiLayoutCellBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiLayoutCellInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiLayoutCellInterface() {}
+
+    //! Get the overridden min width. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
+    virtual float GetMinWidth() = 0;
+
+    //! Set the overridden min width. LyShine::UiLayoutCellUnspecifiedSize means don't override
+    virtual void SetMinWidth(float width) = 0;
+
+    //! Get the overridden min height. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
+    virtual float GetMinHeight() = 0;
+
+    //! Set the overridden min height. LyShine::UiLayoutCellUnspecifiedSize means don't override
+    virtual void SetMinHeight(float height) = 0;
+
+    //! Get the overridden target width. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
+    virtual float GetTargetWidth() = 0;
+
+    //! Set the overridden target width. LyShine::UiLayoutCellUnspecifiedSize means don't override
+    virtual void SetTargetWidth(float width) = 0;
+
+    //! Get the overridden target height. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
+    virtual float GetTargetHeight() = 0;
+
+    //! Set the overridden target height. LyShine::UiLayoutCellUnspecifiedSize means don't override
+    virtual void SetTargetHeight(float height) = 0;
+
+    //! Get the overridden max width. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
+    virtual float GetMaxWidth() = 0;
+
+    //! Set the overridden max width. LyShine::UiLayoutCellUnspecifiedSize means don't override
+    virtual void SetMaxWidth(float width) = 0;
+
+    //! Get the overridden max height. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
+    virtual float GetMaxHeight() = 0;
+
+    //! Set the overridden max height. LyShine::UiLayoutCellUnspecifiedSize means don't override
+    virtual void SetMaxHeight(float height) = 0;
+
+    //! Get the overridden extra width ratio. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
+    virtual float GetExtraWidthRatio() = 0;
+
+    //! Set the overridden extra width ratio. LyShine::UiLayoutCellUnspecifiedSize means don't override
+    virtual void SetExtraWidthRatio(float width) = 0;
+
+    //! Get the overridden extra height ratio. LyShine::UiLayoutCellUnspecifiedSize means it has not been overridden
+    virtual float GetExtraHeightRatio() = 0;
+
+    //! Set the overridden extra height ratio. LyShine::UiLayoutCellUnspecifiedSize means don't override
+    virtual void SetExtraHeightRatio(float height) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiLayoutCellInterface> UiLayoutCellBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h
new file mode 100644
index 0000000000..63abfdcc23
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutCellDefaultBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <LyShine/UiLayoutCellBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiLayoutCellDefaultInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiLayoutCellDefaultInterface() {}
+
+    //! Get the minimum width
+    virtual float GetMinWidth() = 0;
+
+    //! Get the minimum height
+    virtual float GetMinHeight() = 0;
+
+    //! Get the target width
+    //! \param maxWidth A width that the element will not surpass. LyShine::UiLayoutCellUnspecifiedSize means no max 
+    virtual float GetTargetWidth(float maxWidth) = 0;
+
+    //! Get the target height
+    //! \param maxHeight A height that the element will not surpass. LyShine::UiLayoutCellUnspecifiedSize means no max
+    virtual float GetTargetHeight(float maxHeight) = 0;
+
+    //! Get the extra width ratio
+    virtual float GetExtraWidthRatio() = 0;
+
+    //! Get the extra height ratio
+    virtual float GetExtraHeightRatio() = 0;
+
+public: // static member data
+
+    //! Multiple components on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+};
+
+typedef AZ::EBus<UiLayoutCellDefaultInterface> UiLayoutCellDefaultBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutColumnBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutColumnBus.h
new file mode 100644
index 0000000000..01f0b1df59
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutColumnBus.h
@@ -0,0 +1,45 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/Bus/UiLayoutBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiLayoutColumnInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiLayoutColumnInterface() {}
+
+    //! Get the padding (in pixels) inside the edges of the element
+    virtual UiLayoutInterface::Padding GetPadding() = 0;
+
+    //! Set the padding (in pixels) inside the edges of the element
+    virtual void SetPadding(UiLayoutInterface::Padding padding) = 0;
+
+    //! Get the spacing (in pixels) between child elements
+    virtual float GetSpacing() = 0;
+
+    //! Set the spacing (in pixels) between child elements
+    virtual void SetSpacing(float spacing) = 0;
+
+    //! Get the vertical order for this layout
+    virtual UiLayoutInterface::VerticalOrder GetOrder() = 0;
+
+    //! Set the vertical order for this layout
+    virtual void SetOrder(UiLayoutInterface::VerticalOrder order) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiLayoutColumnInterface> UiLayoutColumnBus;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutControllerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutControllerBus.h
new file mode 100644
index 0000000000..bcc7afbb72
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutControllerBus.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 <AzCore/Component/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! This interface can to be implemented by any component that wants to modify transform properties
+//! of elements are runtime using the Layout system. The methods in this interface will be called
+//! by the LayoutManager whenever the element is told to recompute its layout. Because an element
+//! might have multiple components that implement this interface, the handlers will be sorted by
+//! priority (lower priority number gets called earlier).
+class UiLayoutControllerInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiLayoutControllerInterface() {}
+
+    //! Set elements' width transform properties
+    virtual void ApplyLayoutWidth() = 0;
+
+    //! Set elements' height transform properties
+    virtual void ApplyLayoutHeight() = 0;
+
+public: // static member data
+
+    //! Events are ordered, each handler may set its priority
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::MultipleAndOrdered;
+
+    //! Priority will be used for ordering, lower priority number means it gets called earlier
+    struct BusHandlerOrderCompare
+    {
+        AZ_FORCE_INLINE bool operator()(const UiLayoutControllerInterface* left, const UiLayoutControllerInterface* right) const { return left->GetPriority() < right->GetPriority(); }
+    };
+
+protected: // member data
+
+    static const unsigned int k_defaultPriority = 100;  // Default is 100, make it lower to get called earlier, higher to get called later
+    virtual unsigned int GetPriority() const { return k_defaultPriority; }
+};
+
+typedef AZ::EBus<UiLayoutControllerInterface> UiLayoutControllerBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutFitterBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutFitterBus.h
new file mode 100644
index 0000000000..1da85c965e
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutFitterBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! This component resizes its element to fit its content. It uses cell sizing information given to
+//! it by other Layout components, Text component, or Image component (fixed type).
+class UiLayoutFitterInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! Fit type indicating enabled fits
+    enum class FitType
+    {
+        None,
+        HorizontalOnly,
+        VerticalOnly,
+        HorizontalAndVertical
+    };
+
+public: // member functions
+
+    virtual ~UiLayoutFitterInterface() {}
+
+    //! Get whether to resize the element horizontally
+    virtual bool GetHorizontalFit() = 0;
+
+    //! Set whether to resize the element horizontally
+    virtual void SetHorizontalFit(bool horizontalFit) = 0;
+
+    //! Get whether to resize the element vertically
+    virtual bool GetVerticalFit() = 0;
+
+    //! Set whether to resize the element vertically
+    virtual void SetVerticalFit(bool verticalFit) = 0;
+
+    //! Get the fit type
+    virtual FitType GetFitType() = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiLayoutFitterInterface> UiLayoutFitterBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutGridBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutGridBus.h
new file mode 100644
index 0000000000..4a9fb131f7
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutGridBus.h
@@ -0,0 +1,73 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/Bus/UiLayoutBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiLayoutGridInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! Used to determine which direction to start the layout with
+    enum class StartingDirection
+    {
+        HorizontalOrder,
+        VerticalOrder
+    };
+
+public: // member functions
+
+    virtual ~UiLayoutGridInterface() {}
+
+    //! Get the padding (in pixels) inside the edges of the element
+    virtual UiLayoutInterface::Padding GetPadding() = 0;
+
+    //! Set the padding (in pixels) inside the edges of the element
+    virtual void SetPadding(UiLayoutInterface::Padding padding) = 0;
+
+    //! Get the spacing (in pixels) between child elements
+    virtual AZ::Vector2 GetSpacing() = 0;
+
+    //! Set the spacing (in pixels) between child elements
+    virtual void SetSpacing(AZ::Vector2 spacing) = 0;
+
+    //! Get the size (in pixels) of a child element in this layout
+    virtual AZ::Vector2 GetCellSize() = 0;
+
+    //! Set the size (in pixels) of a child element in this layout
+    virtual void SetCellSize(AZ::Vector2 size) = 0;
+
+    //! Get the horizontal order for this layout
+    virtual UiLayoutInterface::HorizontalOrder GetHorizontalOrder() = 0;
+
+    //! Set the horizontal order for this layout
+    virtual void SetHorizontalOrder(UiLayoutInterface::HorizontalOrder order) = 0;
+
+    //! Get the vertical order for this layout
+    virtual UiLayoutInterface::VerticalOrder GetVerticalOrder() = 0;
+
+    //! Set the vertical order for this layout
+    virtual void SetVerticalOrder(UiLayoutInterface::VerticalOrder order) = 0;
+
+    //! Get the starting direction for this layout
+    virtual StartingDirection GetStartingDirection() = 0;
+
+    //! Set the starting direction for this layout
+    virtual void SetStartingDirection(StartingDirection direction) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiLayoutGridInterface> UiLayoutGridBus;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutManagerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutManagerBus.h
new file mode 100644
index 0000000000..1b7ad0662b
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutManagerBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiLayoutManagerInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiLayoutManagerInterface() {}
+
+public: // static member data
+
+    //! Mark an element to recompute its layout. This is called when something that affects the layout
+    //! has been modified. (ex. layout element size changed, layout element property changed, layout
+    //! element child count changed.)
+    virtual void MarkToRecomputeLayout(AZ::EntityId entityId) = 0;
+
+    //! Mark the specified element's parent to recompute its layout. The parent uses its child's layout
+    //! cell values to calculate its layout, so this is called when something that affects the
+    //! child's layout cell values has been modified. (ex. child's layout cell property changed.)
+    //! Since a child's layout cell values may affect its parent's layout cell values, the top level parent
+    //! is marked
+    virtual void MarkToRecomputeLayoutsAffectedByLayoutCellChange(AZ::EntityId entityId, bool isDefaultLayoutCell) = 0;
+
+    //! Unmark all elements from needing to recompute their layouts
+    virtual void UnmarkAllLayouts() = 0;
+
+    //! Recompute layouts of marked elements and clear the marked layout list
+    virtual void RecomputeMarkedLayouts() = 0;
+
+    //! Compute the layout for the specified element and its descendants
+    virtual void ComputeLayoutForElementAndDescendants(AZ::EntityId entityId) = 0;
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiLayoutManagerInterface> UiLayoutManagerBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutRowBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutRowBus.h
new file mode 100644
index 0000000000..094e89695a
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiLayoutRowBus.h
@@ -0,0 +1,45 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/Bus/UiLayoutBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiLayoutRowInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiLayoutRowInterface() {}
+
+    //! Get the padding (in pixels) inside the edges of the element
+    virtual UiLayoutInterface::Padding GetPadding() = 0;
+
+    //! Set the padding (in pixels) inside the edges of the element
+    virtual void SetPadding(UiLayoutInterface::Padding padding) = 0;
+
+    //! Get the spacing (in pixels) between child elements
+    virtual float GetSpacing() = 0;
+
+    //! Set the spacing (in pixels) between child elements
+    virtual void SetSpacing(float spacing) = 0;
+
+    //! Get the horizontal order for this layout
+    virtual UiLayoutInterface::HorizontalOrder GetOrder() = 0;
+
+    //! Set the horizontal order for this layout
+    virtual void SetOrder(UiLayoutInterface::HorizontalOrder order) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiLayoutRowInterface> UiLayoutRowBus;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiMarkupButtonBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiMarkupButtonBus.h
new file mode 100644
index 0000000000..8d6bb0a457
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiMarkupButtonBus.h
@@ -0,0 +1,70 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Color.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! A markup button allows for button-like behavior on markup text.
+//!
+//! The markup itself is contained within a text component. The markup button
+//! handles interaction with the text, and can also apply styling (such as
+//! coloring for button/clickable text).
+//!
+//! Markup button behavior is only intended for mouse interactions.
+class UiMarkupButtonInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiMarkupButtonInterface() {}
+
+    //! Get the link color
+    virtual AZ::Color GetLinkColor() = 0;
+
+    //! Set the link color
+    virtual void SetLinkColor(const AZ::Color& linkColor) = 0;
+
+    //! Get the link hover color
+    virtual AZ::Color GetLinkHoverColor() = 0;
+
+    //! Set the link hover color
+    virtual void SetLinkHoverColor(const AZ::Color& linkHoverColor) = 0;
+
+public: // static member data
+
+        //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiMarkupButtonInterface> UiMarkupButtonBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiMarkupButtonNotifications
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiMarkupButtonNotifications() {}
+
+    virtual void OnHoverStart(int id, const AZStd::string& action, const AZStd::string& data) = 0;
+    virtual void OnHoverEnd(int id, const AZStd::string& action, const AZStd::string& data) = 0;
+    virtual void OnPressed(int id, const AZStd::string& action, const AZStd::string& data) = 0;
+    virtual void OnReleased(int id, const AZStd::string& action, const AZStd::string& data) = 0;
+    virtual void OnClick(int id, const AZStd::string& action, const AZStd::string& data) = 0;
+};
+
+typedef AZ::EBus<UiMarkupButtonNotifications> UiMarkupButtonNotificationsBus;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiMaskBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiMaskBus.h
new file mode 100644
index 0000000000..0e70a436db
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiMaskBus.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiMaskInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiMaskInterface() {}
+
+    //! Get whether masking is enabled
+    virtual bool GetIsMaskingEnabled() = 0;
+
+    //! Set whether masking is enabled
+    virtual void SetIsMaskingEnabled(bool enableMasking) = 0;
+
+    //! Get whether interaction masking is enabled
+    virtual bool GetIsInteractionMaskingEnabled() = 0;
+
+    //! Set whether interaction masking is enabled
+    virtual void SetIsInteractionMaskingEnabled(bool enableInteractionMasking) = 0;
+
+    //! Get whether mask visual is drawn to color buffer behind child elements
+    virtual bool GetDrawBehind() = 0;
+
+    //! Set whether mask visual is drawn to color buffer behind child elements
+    virtual void SetDrawBehind(bool drawMaskVisualBehindChildren) = 0;
+
+    //! Get whether mask visual is drawn to color buffer in front of child elements
+    virtual bool GetDrawInFront() = 0;
+
+    //! Set whether mask visual is drawn to color buffer in front of child elements
+    virtual void SetDrawInFront(bool drawMaskVisualInFrontOfChildren) = 0;
+
+    //! Get whether to use alpha test when drawing mask visual to stencil
+    virtual bool GetUseAlphaTest() = 0;
+
+    //! Set whether to use alpha test when drawing mask visual to stencil
+    virtual void SetUseAlphaTest(bool useAlphaTest) = 0;
+
+    //! Get the flag that indicates whether the mask should use render to texture
+    virtual bool GetUseRenderToTexture() = 0;
+
+    //! Set the flag that indicates whether the mask should use render to texture
+    virtual void SetUseRenderToTexture(bool useRenderToTexture) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiMaskInterface> UiMaskBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiNavigationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiNavigationBus.h
new file mode 100644
index 0000000000..6a99ba1948
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiNavigationBus.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiNavigationInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    enum class NavigationMode
+    {
+        Automatic,
+        Custom,
+        None
+    };
+
+public: // member functions
+
+    virtual ~UiNavigationInterface() {}
+
+    //! Get the navigation mode
+    virtual NavigationMode GetNavigationMode() = 0;
+
+    //! Set the navigation mode
+    virtual void SetNavigationMode(NavigationMode navigationMode) = 0;
+
+    //! Get the entity to receive focus when up is pressed
+    virtual AZ::EntityId GetOnUpEntity() = 0;
+
+    //! Set the entity to receive focus when up is pressed
+    virtual void SetOnUpEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the entity to receive focus when down is pressed
+    virtual AZ::EntityId GetOnDownEntity() = 0;
+
+    //! Set the entity to receive focus when down is pressed
+    virtual void SetOnDownEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the entity to receive focus when left is pressed
+    virtual AZ::EntityId GetOnLeftEntity() = 0;
+
+    //! Set the entity to receive focus when left is pressed
+    virtual void SetOnLeftEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the entity to receive focus when right is pressed
+    virtual AZ::EntityId GetOnRightEntity() = 0;
+
+    //! Set the entity to receive focus when right is pressed
+    virtual void SetOnRightEntity(AZ::EntityId entityId) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiNavigationInterface> UiNavigationBus;
+
+
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiParticleEmitterBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiParticleEmitterBus.h
new file mode 100644
index 0000000000..0c90d1a1e4
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiParticleEmitterBus.h
@@ -0,0 +1,392 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Color.h>
+#include <AzFramework/Entity/EntityContextBus.h>
+
+class ISprite;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus for making requests to the UiParticleEmitterComponent
+class UiParticleEmitterInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    enum class EmitShape
+    {
+        Point,      //!< particles are emitted from the emitter position along the given angle
+        Circle,     //!< particles are emitted from a circle whose radius is the minimum of the element width and height
+        Quad        //!< particles are emitted from the quad with the same size as the element width and height
+    };
+
+    enum class ParticleCoordinateType
+    {
+        Cartesian,  //!< particles move using X,Y co-ordinates
+        Polar       //!< particles move using X: radial speed, Y: angular speed
+    };
+
+    enum class ParticleInitialDirectionType
+    {
+        RelativeToEmitAngle,    //!< particle initial direction is based on the emit angle
+        RelativeToEmitterCenter //!< particle initial direction is directed away from the emitter shape center
+    };
+
+    enum class ParticleKeyframeTangentType
+    {
+        EaseIn,     //!< A zero/flat tangent, a keyframe with ease in + ease out would act like an x^3 curve at the origin
+        EaseOut,    //!< A zero/flat tangent, a keyframe with ease in + ease out would act like an x^3 curve at the origin
+        Linear,     //!< The curve moves linearly from this keyframe towards the next/previous keyframe
+        Step        //!< The curve jumps from the current keyframe value to the next/previous keyframe value
+    };
+
+    struct ParticleFloatKeyframe
+    {
+        AZ_TYPE_INFO(ParticleFloatKeyframe, "{85DF04FE-F614-47C1-B88A-A9F7D4826F6F}");
+
+        float time = 0.0f;
+        float multiplier = 1.0f;
+        ParticleKeyframeTangentType inTangent = ParticleKeyframeTangentType::EaseIn;
+        ParticleKeyframeTangentType outTangent = ParticleKeyframeTangentType::EaseOut;
+    };
+
+    struct ParticleColorKeyframe
+    {
+        AZ_TYPE_INFO(ParticleColorKeyframe, "{22B0CBC0-21A5-44E3-90C5-9BFEF6E4E3C5}");
+
+        float time = 0.0f;
+        AZ::Color color = AZ::Color(1.0f, 1.0f, 1.0f, 1.0f);
+        ParticleKeyframeTangentType inTangent = ParticleKeyframeTangentType::EaseIn;
+        ParticleKeyframeTangentType outTangent = ParticleKeyframeTangentType::EaseOut;
+    };
+
+public: // member functions
+
+    virtual ~UiParticleEmitterInterface() {}
+
+    //! Gets whether the emitter is emitting particles
+    virtual bool GetIsEmitting() = 0;
+
+    //! Sets whether the emitter is emitting particles
+    virtual void SetIsEmitting(bool emitParticles) = 0;
+
+    //! Gets whether the emitter uses a fixed random seed
+    virtual bool GetIsRandomSeedFixed() = 0;
+
+    //! Sets whether the emitter uses a fixed random seed
+    virtual void SetIsRandomSeedFixed(bool randomSeedFixed) = 0;
+
+    //! Gets the emitter random seed
+    virtual int GetRandomSeed() = 0;
+
+    //! Sets the emitter random seed
+    virtual void SetRandomSeed(int randomSeed) = 0;
+
+    //! Gets whether the particles move relative to the emitter position
+    virtual bool GetIsParticlePositionRelativeToEmitter() = 0;
+
+    //! Sets whether the particles move relative to the emitter position
+    virtual void SetIsParticlePositionRelativeToEmitter(bool relativeToEmitter) = 0;
+
+    //! Gets the amount of particles emitted per second
+    virtual float GetParticleEmitRate() = 0;
+
+    //! Sets the amount of particles emitted per second
+    virtual void SetParticleEmitRate(float particleEmitRate) = 0;
+
+    //! Gets whether the emitter starts emitting on activate
+    virtual bool GetIsEmitOnActivate() = 0;
+
+    //! Sets whether the emitter starts emitting on activate
+    virtual void SetIsEmitOnActivate(bool emitOnActivate) = 0;
+
+    //! Gets whether the average particle count is reached as soon as the emitter starts emitting
+    virtual bool GetIsHitParticleCountOnActivate() = 0;
+
+    //! Sets whether the average particle count is reached as soon as the emitter starts emitting
+    virtual void SetIsHitParticleCountOnActivate(bool hitParticleCountOnActivate) = 0;
+
+    //! Gets whether the emitter lifetime is infinite
+    virtual bool GetIsEmitterLifetimeInfinite() = 0;
+
+    //! Sets whether the emitter lifetime is infinite
+    virtual void SetIsEmitterLifetimeInfinite(bool emitterLifetimeInfinite) = 0;
+
+    //! Gets the lifetime of the emitter (in seconds)
+    virtual float GetEmitterLifetime() = 0;
+
+    //! Sets the lifetime of the emitter (in seconds)
+    virtual void SetEmitterLifetime(float emitterLifetime) = 0;
+
+    //! Gets whether there is a cap on the amount of active particles
+    virtual bool GetIsParticleCountLimited() = 0;
+
+    //! Sets whether there is a cap on the amount of active particles
+    virtual void SetIsParticleCountLimited(bool particleCountLimited) = 0;
+
+    //! Gets the maximum amount of active particles
+    virtual AZ::u32 GetMaxParticles() = 0;
+
+    //! Sets the maximum amount of active particles
+    virtual void SetMaxParticles(AZ::u32 maxParticles) = 0;
+
+    //! Gets the shape of the emitter
+    virtual EmitShape GetEmitterShape() = 0;
+
+    //! Sets the shape of the emitter
+    virtual void SetEmitterShape(EmitShape emitterShape) = 0;
+
+    //! Gets whether the particles are emitted on the edge of the emitter shape
+    virtual bool GetIsEmitOnEdge() = 0;
+
+    //! Sets whether the particles are emitted on the edge of the emitter shape
+    virtual void SetIsEmitOnEdge(bool emitOnEdge) = 0;
+
+    //! Gets the inside distance from the emitter shape edge that particles should emit from
+    virtual float GetInsideEmitDistance() = 0;
+
+    //! Sets the inside distance from the emitter shape edge that particles should emit from
+    virtual void SetInsideEmitDistance(float insideEmitDistance) = 0;
+
+    //! Gets the outside distance from the emitter shape edge that particles should emit from
+    virtual float GetOutsideEmitDistance() = 0;
+
+    //! Sets the outside distance from the emitter shape edge that particles should emit from
+    virtual void SetOutsideEmitDistance(float outsideEmitDistance) = 0;
+
+    //! Gets how the initial direction is calculated for Cartesian movement.
+    virtual ParticleInitialDirectionType GetParticleInitialDirectionType() = 0;
+
+    //! Sets how the initial direction is calculated for Cartesian movement.
+    virtual void SetParticleInitialDirectionType(ParticleInitialDirectionType initialDirectionType) = 0;
+
+    //! Gets the angle that particles are emitted from (in degrees clockwise measured from straight up)
+    virtual float GetEmitAngle() = 0;
+
+    //! Sets the angle that particles are emitted from (in degrees clockwise measured from straight up)
+    virtual void SetEmitAngle(float emitAngle) = 0;
+
+    //! Gets the variation in the angle that particles are emitted from (in degrees, with 10 degrees variation being +/- 10 degrees about the emit angle)
+    virtual float GetEmitAngleVariation() = 0;
+
+    //! Sets the variation in the angle that particles are emitted from (in degrees, with 10 degrees variation being +/- 10 degrees about the emit angle)
+    virtual void SetEmitAngleVariation(float emitAngleVariation) = 0;
+
+    //! Gets whether the particle lifetime is infinite
+    virtual bool GetIsParticleLifetimeInfinite() = 0;
+
+    //! Sets whether the particle lifetime is infinite
+    virtual void SetIsParticleLifetimeInfinite(bool infiniteLifetime) = 0;
+
+    //! Gets the particle life time (in seconds)
+    virtual float GetParticleLifetime() = 0;
+
+    //! Sets the particle life time (in seconds)
+    virtual void SetParticleLifetime(float lifetime) = 0;
+
+    //! Gets the particle life time variation (in seconds, 1 second variation being up to +/- 1 second about the lifetime)
+    virtual float GetParticleLifetimeVariation() = 0;
+
+    //! Sets the particle life time variation (in seconds, 1 second variation being up to +/- 1 second about the lifetime)
+    virtual void SetParticleLifetimeVariation(float lifetimeVariation) = 0;
+
+    //! Gets the sprite to be used by the particles
+    virtual ISprite* GetSprite() = 0;
+
+    //! Sets the sprite to be used by the particles
+    virtual void SetSprite(ISprite* sprite) = 0;
+
+    //! Gets the source location of the image to be displayed by the particles
+    virtual AZStd::string GetSpritePathname() = 0;
+
+    //! Sets the source location of the image to be displayed by the particles
+    virtual void SetSpritePathname(AZStd::string spritePath) = 0;
+
+    //! Gets whether the sprite-sheet cell index changes over time
+    virtual bool GetIsSpriteSheetAnimated() = 0;
+
+    //! Sets whether the sprite-sheet cell index changes over time
+    virtual void SetIsSpriteSheetAnimated(bool isSpriteSheetAnimated) = 0;
+
+    //! Gets whether the sprite-sheet cell animation is looped
+    virtual bool GetIsSpriteSheetAnimationLooped() = 0;
+
+    //! Sets whether the sprite-sheet cell animation is looped
+    virtual void SetIsSpriteSheetAnimationLooped(bool isSpriteSheetAnimationLooped) = 0;
+
+    //! Gets whether the sprite-sheet cell (starting) index is random
+    virtual bool GetIsSpriteSheetIndexRandom() = 0;
+
+    //! Sets whether the sprite-sheet cell (starting) index is random
+    virtual void SetIsSpriteSheetIndexRandom(bool isSpriteSheetIndexRandom) = 0;
+
+    //! Gets the sprite-sheet cell (starting) index
+    virtual int GetSpriteSheetCellIndex() = 0;
+
+    //! Sets the sprite-sheet cell (starting) index
+    virtual void SetSpriteSheetCellIndex(int spriteSheetIndex) = 0;
+
+    //! Gets the sprite-sheet cell end index
+    virtual int GetSpriteSheetCellEndIndex() = 0;
+
+    //! Sets the sprite-sheet cell end index
+    virtual void SetSpriteSheetCellEndIndex(int spriteSheetEndIndex) = 0;
+
+    //! Gets the sprite-sheet cell frame delay (in seconds)
+    virtual float GetSpriteSheetFrameDelay() = 0;
+
+    //! Sets the sprite-sheet cell frame delay (in seconds)
+    virtual void SetSpriteSheetFrameDelay(float spriteSheetFrameDelay) = 0;
+
+    //! Gets whether the aspect ratio of the particles is locked
+    virtual bool GetIsParticleAspectRatioLocked() = 0;
+
+    //! Sets whether the aspect ratio of the particles is locked
+    virtual void SetIsParticleAspectRatioLocked(bool aspectRatioLocked) = 0;
+
+    //! Gets the particle pivot (where 0,0 is the top left of the particle and 1,1 is the bottom right of the particle)
+    virtual AZ::Vector2 GetParticlePivot() = 0;
+
+    //! Sets the particle pivot (where 0,0 is the top left of the particle and 1,1 is the bottom right of the particle)
+    virtual void SetParticlePivot(AZ::Vector2 particlePivot) = 0;
+
+    //! Gets the particle size
+    virtual AZ::Vector2 GetParticleSize() = 0;
+
+    //! Sets the particle size
+    virtual void SetParticleSize(AZ::Vector2 particleSize) = 0;
+
+    //! Gets the particle width
+    virtual float GetParticleWidth() = 0;
+
+    //! Sets the particle width
+    virtual void SetParticleWidth(float width) = 0;
+
+    //! Gets the particle width variation (a variation of 1 being up to 1 either side of the given width)
+    virtual float GetParticleWidthVariation() = 0;
+
+    //! Sets the particle width variation (a variation of 1 being up to 1 either side of the given width)
+    virtual void SetParticleWidthVariation(float widthVariation) = 0;
+
+    //! Gets the particle height
+    virtual float GetParticleHeight() = 0;
+
+    //! Sets the particle height
+    virtual void SetParticleHeight(float height) = 0;
+
+    //! Gets the particle height variation (a variation of 5 being up to 5 either side of the given height)
+    virtual float GetParticleHeightVariation() = 0;
+
+    //! Sets the particle height variation (a variation of 5 being up to 5 either side of the given height)
+    virtual void SetParticleHeightVariation(float heightVariation) = 0;
+
+    //! Gets the particle movement co-ordinate type
+    virtual ParticleCoordinateType GetParticleMovementCoordinateType() = 0;
+
+    //! Sets the particle movement co-ordinate type
+    virtual void SetParticleMovementCoordinateType(ParticleCoordinateType particleMovementCoordinateType) = 0;
+
+    //! Gets the particle acceleration co-ordinate type
+    virtual ParticleCoordinateType GetParticleAccelerationCoordinateType() = 0;
+
+    //! Sets the particle acceleration co-ordinate type
+    virtual void SetParticleAccelerationCoordinateType(ParticleCoordinateType particleAccelerationCoordinateType) = 0;
+
+    //! Gets the particle initial velocity for Polar movement
+    virtual AZ::Vector2 GetParticleInitialVelocity() = 0;
+
+    //! Sets the particle initial velocity for Polar movement
+    virtual void SetParticleInitialVelocity(AZ::Vector2 initialVelocity) = 0;
+
+    //! Gets the particle initial velocity variation for Polar movement (a variation of (1,2) being up to (1,2) either side of the initial velocity)
+    virtual AZ::Vector2 GetParticleInitialVelocityVariation() = 0;
+
+    //! Sets the particle initial velocity variation for Polar movement (a variation of (1,2) being up to (1,2) either side of the initial velocity)
+    virtual void SetParticleInitialVelocityVariation(AZ::Vector2 initialVelocityVariation) = 0;
+
+    //! Gets the particle speed for particles with a random initial direction for Cartesian movement
+    virtual float GetParticleSpeed() = 0;
+
+    //! Sets the particle speed for particles with a random initial direction for Cartesian movement
+    virtual void SetParticleSpeed(float speed) = 0;
+
+    //! Gets the particle speed variation for particles with a random initial direction for Cartesian movement (a variation of 1 being up to 1 either side of the given speed)
+    virtual float GetParticleSpeedVariation() = 0;
+
+    //! Sets the particle speed variation for particles with a random initial direction for Cartesian movement (a variation of 1 being up to 1 either side of the given speed)
+    virtual void SetParticleSpeedVariation(float speedVariation) = 0;
+
+    //! Gets the particle acceleration
+    virtual AZ::Vector2 GetParticleAcceleration() = 0;
+
+    //! Sets the particle acceleration
+    virtual void SetParticleAcceleration(AZ::Vector2 acceleration) = 0;
+
+    //! Gets whether the particle rotation is based on the current velocity
+    virtual bool GetIsParticleRotationFromVelocity() = 0;
+
+    //! Sets whether the particle rotation is based on the current velocity
+    virtual void SetIsParticleRotationFromVelocity(bool rotationFromVelocity) = 0;
+
+    //! Gets whether the particle initial rotation is based on the initial velocity
+    virtual bool GetIsParticleInitialRotationFromInitialVelocity() = 0;
+
+    //! Sets whether the particle initial rotation is based on the initial velocity
+    virtual void SetIsParticleInitialRotationFromInitialVelocity(bool rotationFromVelocity) = 0;
+
+    //! Gets the particle initial rotation (in degrees)
+    virtual float GetParticleInitialRotation() = 0;
+
+    //! Sets the particle initial rotation (in degrees)
+    virtual void SetParticleInitialRotation(float initialRotation) = 0;
+
+    //! Gets the particle initial rotation variation (in degrees, a variation of 10 being up to 10 degrees either side of the initial rotation)
+    virtual float GetParticleInitialRotationVariation() = 0;
+
+    //! Sets the particle initial rotation variation (in degrees, a variation of 10 being up to 10 degrees either side of the initial rotation)
+    virtual void SetParticleInitialRotationVariation(float initialRotationVariation) = 0;
+
+    //! Gets the particle rotation speed (in degrees per second)
+    virtual float GetParticleRotationSpeed() = 0;
+
+    //! Sets the particle rotation speed (in degrees per second)
+    virtual void SetParticleRotationSpeed(float rotationSpeed) = 0;
+
+    //! Gets the particle rotation speed variation (in degrees, a variation of 5 being up to 5 either side of the rotation speed)
+    virtual float GetParticleRotationSpeedVariation() = 0;
+
+    //! Sets the particle rotation speed variation (in degrees, a variation of 5 being up to 5 either side of the rotation speed)
+    virtual void SetParticleRotationSpeedVariation(float rotationSpeedVariation) = 0;
+
+    //! Gets the particle color tint
+    virtual AZ::Color GetParticleColor() = 0;
+
+    //! Sets the particle color tint
+    virtual void SetParticleColor(AZ::Color color) = 0;
+
+    //! Gets the particle color brightness variation (from 0-1, 0 being no variation, 1 being random variation from the original color down to black)
+    virtual float GetParticleColorBrightnessVariation() = 0;
+
+    //! Sets the particle color brightness variation (from 0-1, 0 being no variation, 1 being random variation from the original color down to black)
+    virtual void SetParticleColorBrightnessVariation(float brightnessVariation) = 0;
+
+    //! Gets the particle color tint variation
+    virtual float GetParticleColorTintVariation() = 0;
+
+    //! Sets the particle color tint variation
+    virtual void SetParticleColorTintVariation(float tintVariation) = 0;
+
+    //! Gets the particle alpha
+    virtual float GetParticleAlpha() = 0;
+
+    //! Sets the particle alpha
+    virtual void SetParticleAlpha(float alpha) = 0;
+};
+
+using UiParticleEmitterBus = AZ::EBus<UiParticleEmitterInterface>;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonBus.h
new file mode 100644
index 0000000000..d209341461
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonBus.h
@@ -0,0 +1,81 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a radio button component needs to implement. A radio button component
+//! provides functionality for a button that can be turned on or off and is dependent on the other
+//! radio buttons in the same radio button group. This interface is designed to be used in
+//! conjunction with the UiRadioButtonGroupInterface, which describes the group for radio buttons.
+class UiRadioButtonInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiRadioButtonInterface() {}
+
+    //! Query the state of the radio button
+    //! \return     The current state for the radio button.
+    virtual bool GetState() = 0;
+
+    //! Get the radio button group
+    virtual AZ::EntityId GetGroup() = 0;
+
+    //! Get the optional checked (ON) entity
+    virtual AZ::EntityId GetCheckedEntity() = 0;
+
+    //! Set the optional checked (ON) entity
+    virtual void SetCheckedEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional unchecked (OFF) entity
+    virtual AZ::EntityId GetUncheckedEntity() = 0;
+
+    //! Set the optional unchecked (OFF) entity
+    virtual void SetUncheckedEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the action triggered when turned on
+    virtual const LyShine::ActionName& GetTurnOnActionName() = 0;
+
+    //! Set the action triggered when turned on
+    virtual void SetTurnOnActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the action triggered when turned off
+    virtual const LyShine::ActionName& GetTurnOffActionName() = 0;
+
+    //! Set the action triggered when turned off
+    virtual void SetTurnOffActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the action triggered when changed
+    virtual const LyShine::ActionName& GetChangedActionName() = 0;
+
+    //! Set the action triggered when changed
+    virtual void SetChangedActionName(const LyShine::ActionName& actionName) = 0;
+
+public: // static member data
+
+        //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiRadioButtonInterface> UiRadioButtonBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiRadioButtonNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiRadioButtonNotifications() {}
+
+    //! Notify listeners that the radio button state has changed
+    virtual void OnRadioButtonStateChange([[maybe_unused]] bool checked) {}
+};
+
+typedef AZ::EBus<UiRadioButtonNotifications> UiRadioButtonNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h
new file mode 100644
index 0000000000..53d3d7f121
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h
@@ -0,0 +1,36 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a radio button component needs to implement. This interface allows the
+//! radio button group to communicate with the radio button itself
+class UiRadioButtonCommunicationInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiRadioButtonCommunicationInterface() {}
+
+    //! Used by the group to set the state of the radio button
+    //! \param     The new desired state of the radio button.
+    //! \param     Whether the button should inform listeners that it was changed.
+    virtual void SetState(bool isOn, bool sendNotifications) = 0;
+
+    //! Set the radio button group
+    virtual void SetGroup(AZ::EntityId group) = 0;
+
+public: // static member data
+
+    //! Only one component on an entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiRadioButtonCommunicationInterface> UiRadioButtonCommunicationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h
new file mode 100644
index 0000000000..046fe24a1c
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h
@@ -0,0 +1,73 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a radio button group component needs to implement. A radio button group
+//! component provides functionality to manage a group of radio buttons. A group of radio buttons
+//! allows users to choose one of a predefined set of mutually exclusive options. No more than one
+//! item may be selected.
+class UiRadioButtonGroupInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiRadioButtonGroupInterface() {}
+
+    //! Query the state of the radio button group
+    //! \return     The currently checked radio button.
+    virtual AZ::EntityId GetCheckedRadioButton() = 0;
+
+    //! Set a radio button to a desired state
+    virtual void SetState(AZ::EntityId radioButton, bool isOn) = 0;
+
+    //! Get the allow uncheck flag
+    virtual bool GetAllowUncheck() = 0;
+
+    //! Set the allow uncheck flag
+    virtual void SetAllowUncheck(bool allowUncheck) = 0;
+
+    //! Add a new radio button to the group
+    virtual void AddRadioButton(AZ::EntityId radioButton) = 0;
+
+    //! Remove a radio button from the group
+    virtual void RemoveRadioButton(AZ::EntityId radioButton) = 0;
+
+    //! Query whether a radio button is in the group or not
+    virtual bool ContainsRadioButton(AZ::EntityId radioButton) = 0;
+
+    //! Get the action triggered when changed
+    virtual const LyShine::ActionName& GetChangedActionName() = 0;
+
+    //! Set the action triggered when changed
+    virtual void SetChangedActionName(const LyShine::ActionName& actionName) = 0;
+
+public: // static member data
+
+        //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiRadioButtonGroupInterface> UiRadioButtonGroupBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiRadioButtonGroupNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiRadioButtonGroupNotifications() {}
+
+    //! Notify listeners that the radio button group state has changed
+    virtual void OnRadioButtonGroupStateChange([[maybe_unused]] AZ::EntityId checkedRadioButton) {}
+};
+
+typedef AZ::EBus<UiRadioButtonGroupNotifications> UiRadioButtonGroupNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
new file mode 100644
index 0000000000..34edb4e364
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
@@ -0,0 +1,42 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a radio button group component needs to implement. This interface allows
+//! a radio button to communicate with the radio button group itself
+class UiRadioButtonGroupCommunicationInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiRadioButtonGroupCommunicationInterface() {}
+
+    //! Registers a radio button within a group
+    //! \param      The radio button to add
+    //! \return     Whether the radio button was successfully added to the group or not
+    virtual bool RegisterRadioButton(AZ::EntityId radioButton) = 0;
+
+    //! Unregisters a radio button within a group
+    //! \param      The radio button to remove
+    virtual void UnregisterRadioButton(AZ::EntityId radioButton) = 0;
+
+    //! Called when a radio button wants to change state due to user action (i.e. by clicking it)
+    //! \param      The radio button to change the state of
+    //! \param      The new radio button state
+    virtual void RequestRadioButtonStateChange(AZ::EntityId radioButton, bool newState) = 0;
+
+public: // static member data
+
+    //! Only one component on an entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiRadioButtonGroupCommunicationInterface> UiRadioButtonGroupCommunicationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiRenderBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRenderBus.h
new file mode 100644
index 0000000000..b55af091eb
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiRenderBus.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+namespace LyShine
+{
+    class IRenderGraph;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiRenderInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiRenderInterface() {}
+
+    //! Render the component into the render graph
+    virtual void Render(LyShine::IRenderGraph* renderGraph) = 0;
+
+public: // static member data
+
+    //! Multiple components on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+};
+
+typedef AZ::EBus<UiRenderInterface> UiRenderBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiRenderControlBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiRenderControlBus.h
new file mode 100644
index 0000000000..5bba959897
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiRenderControlBus.h
@@ -0,0 +1,55 @@
+/*
+ * 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/ComponentBus.h>
+
+namespace LyShine
+{
+    class IRenderGraph;
+}
+
+class UiElementInterface;
+class UiRenderInterface;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! The UiRenderControlBus is used for controlling the rendering of elements that affect the rendering
+//! of their children.
+//! An example use is a mask component that needs to setup stencil write before rendering its
+//! components to increment the stencil buffer, switch to stencil test before rendering the child
+//! elements and then do a second pass to decrement the stencil buffer.
+//! The interface is designed to be flexible and could also be used for setting up scissoring or
+//! rendering to a texture.
+class UiRenderControlInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiRenderControlInterface() {}
+
+    //! This renders this element plus its children. It allows the RenderControl element to control
+    //! the order in which the element's component and children are rendered and to change state
+    //! at any point while rendering them.
+    //! \param renderGraph, the render graph being added to
+    //! \param elementInterface, pointer to the element interface for this element (for performance)
+    //! \param renderInterface, pointer to the render interface for this element (for performance)
+    //! \param numChildren, the number of child elements of this element
+    //! \param isInGame, true if element being rendered in game (or preview), false if being render in edit mode
+    virtual void Render(
+        LyShine::IRenderGraph* renderGraph,
+        UiElementInterface* elementInterface,
+        UiRenderInterface* renderInterface,
+        int numChildren,
+        bool isInGame) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiRenderControlInterface> UiRenderControlBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiScrollBarBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollBarBus.h
new file mode 100644
index 0000000000..941fc8100d
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollBarBus.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiScrollBarInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiScrollBarInterface() {}
+
+    //! Get the size of the handle relative to the scrollbar (0 - 1)
+    virtual float GetHandleSize() = 0;
+
+    //! Set the size of the handle relative to the scrollbar (0 - 1)
+    virtual void SetHandleSize(float size) = 0;
+
+    //! Get the minimum size of the handle in pixels
+    virtual float GetMinHandlePixelSize() = 0;
+
+    //! Set the minimum size of the handle in pixels
+    virtual void SetMinHandlePixelSize(float size) = 0;
+
+    //! Get the handle entity
+    virtual AZ::EntityId GetHandleEntity() = 0;
+
+    //! Set the handle entity
+    virtual void SetHandleEntity(AZ::EntityId entityId) = 0;
+
+    //! Get auto fade
+    virtual bool IsAutoFadeEnabled() = 0;
+
+    //! Set auto fade
+    virtual void SetAutoFadeEnabled(bool isAutoFadeEnabled) = 0;
+
+    //! Get the delay in seconds before the scrollbar will fade if unused
+    virtual float GetAutoFadeDelay() = 0;
+
+    //! Set the fade delay in seconds
+    virtual void SetAutoFadeDelay(float delay) = 0;
+
+    //! Get the speed in seconds that it will take for the scrollbar to fade to transparent
+    virtual float GetAutoFadeSpeed() = 0;
+
+    //! Set the fade speed in seconds
+    virtual void SetAutoFadeSpeed(float speed) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiScrollBarInterface> UiScrollBarBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiScrollBoxBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollBoxBus.h
new file mode 100644
index 0000000000..4411630339
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollBoxBus.h
@@ -0,0 +1,183 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/UiBase.h>
+#include <functional>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiScrollBoxInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! Callback for when box is scrolled
+    typedef AZStd::function<void(AZ::EntityId sendingEntityId, AZ::Vector2 newScrollOffset)> ScrollOffsetChangeCallback;
+
+    enum class SnapMode
+    {
+        None,
+        Children,
+        Grid
+    };
+
+    enum class ScrollBarVisibility
+    {
+        AlwaysShow,
+        AutoHide,
+        AutoHideAndResizeViewport
+    };
+
+public: // member functions
+
+    virtual ~UiScrollBoxInterface() {}
+
+    //! Query the current scroll offset of the scroll box
+    //! \return     The current scroll offset for the scroll box.
+    //!
+    //! The scroll offset is the offset from the content element's anchor point to
+    //! the content element's pivot.
+    //! If the content element's anchor points are split it is the offset from
+    //! their center to the pivot.
+    //! So if the mouse is dragged left, the content moves to the left, so the offset
+    //! X has the X drag amount subtracted from it.
+    //! Using the offset from the anchor to the pivot allows the offset to be center
+    //! to center or top-left to top-left, or any combination of the possible
+    //! anchor and pivot positions
+    virtual AZ::Vector2 GetScrollOffset() = 0;
+
+    //! Set the scroll offset of the scroll box
+    //! \param isOn     The new desired scroll offset of the scroll box.
+    virtual void SetScrollOffset(AZ::Vector2 scrollOffset) = 0;
+
+    //! Get the scroll value from 0 - 1
+    virtual AZ::Vector2 GetNormalizedScrollValue() = 0;
+
+    //! Change content size and scroll offset, and handle the changes
+    virtual void ChangeContentSizeAndScrollOffset(AZ::Vector2 contentSize, AZ::Vector2 scrollOffset) = 0;
+
+    //! Get whether there is content to scroll horizontally
+    virtual bool HasHorizontalContentToScroll() = 0;
+
+    //! Get whether there is content to scroll vertically
+    virtual bool HasVerticalContentToScroll() = 0;
+
+    //! Get whether horizontal scrolling interaction is enabled
+    virtual bool GetIsHorizontalScrollingEnabled() = 0;
+
+    //! Set whether horizontal scrolling interaction is enabled
+    virtual void SetIsHorizontalScrollingEnabled(bool isEnabled) = 0;
+
+    //! Get whether vertical scrolling interaction is enabled
+    virtual bool GetIsVerticalScrollingEnabled() = 0;
+
+    //! Set whether vertical scrolling interaction is enabled
+    virtual void SetIsVerticalScrollingEnabled(bool isEnabled) = 0;
+
+    //! Get whether scrolling interaction is constrained to the content area
+    virtual bool GetIsScrollingConstrained() = 0;
+
+    //! Set whether vertical scrolling interaction is constrained to the content area
+    virtual void SetIsScrollingConstrained(bool isConstrained) = 0;
+
+    //! Get snap mode
+    virtual SnapMode GetSnapMode() = 0;
+
+    //! Set snap mode
+    virtual void SetSnapMode(SnapMode snapMode) = 0;
+
+    //! Get snap grid
+    virtual AZ::Vector2 GetSnapGrid() = 0;
+
+    //! Set snap grid
+    virtual void SetSnapGrid(AZ::Vector2 snapGrid) = 0;
+
+    //! Get horizontal scrollbar visibility behavior
+    virtual ScrollBarVisibility GetHorizontalScrollBarVisibility() = 0;
+
+    //! Set horizontal scrollbar visibility behavior
+    virtual void SetHorizontalScrollBarVisibility(ScrollBarVisibility visibility) = 0;
+
+    //! Get vertical scrollbar visibility behavior
+    virtual ScrollBarVisibility GetVerticalScrollBarVisibility() = 0;
+
+    //! Set vertical scrollbar visibility behavior
+    virtual void SetVerticalScrollBarVisibility(ScrollBarVisibility visibility) = 0;
+
+    //! Get the callback invoked while the scroll offset is changing
+    virtual ScrollOffsetChangeCallback GetScrollOffsetChangingCallback() = 0;
+
+    //! Set the callback invoked while the scroll offset is changing
+    virtual void SetScrollOffsetChangingCallback(ScrollOffsetChangeCallback onChange) = 0;
+
+    //! Get the action triggered while the scroll offset is changing
+    virtual const LyShine::ActionName& GetScrollOffsetChangingActionName() = 0;
+
+    //! Set the action triggered while the scroll offset is changing
+    virtual void SetScrollOffsetChangingActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the callback invoked when the scroll offset is done changing
+    virtual ScrollOffsetChangeCallback GetScrollOffsetChangedCallback() = 0;
+
+    //! Set the callback invoked when the scroll offset is done changing
+    virtual void SetScrollOffsetChangedCallback(ScrollOffsetChangeCallback onChange) = 0;
+
+    //! Get the action triggered when the scroll offset is done changing
+    virtual const LyShine::ActionName& GetScrollOffsetChangedActionName() = 0;
+
+    //! Set the action triggered when the scroll offset is done changing
+    virtual void SetScrollOffsetChangedActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Set the optional content entity, if none is specified then nothing gets scrolled
+    virtual void SetContentEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional content entity
+    virtual AZ::EntityId GetContentEntity() = 0;
+
+    //! Set the optional horizontal scrollbar entity
+    virtual void SetHorizontalScrollBarEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional horizontal scrollbar entity
+    virtual AZ::EntityId GetHorizontalScrollBarEntity() = 0;
+
+    //! Set the optional vertical scrollbar entity
+    virtual void SetVerticalScrollBarEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional vertical scrollbar entity
+    virtual AZ::EntityId GetVerticalScrollBarEntity() = 0;
+
+    //! Find the child of the content element that is closest to the content anchors
+    //! at the current scroll offset. i.e. what is the currently "selected" child
+    virtual AZ::EntityId FindClosestContentChildElement() = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiScrollBoxInterface> UiScrollBoxBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement to receive scroll box change notifications
+class UiScrollBoxNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiScrollBoxNotifications(){}
+
+    //! Called when the scroll offset is changing
+    virtual void OnScrollOffsetChanging(AZ::Vector2 newScrollOffset) = 0;
+
+    //! Called when the scroll offset is done changing
+    virtual void OnScrollOffsetChanged(AZ::Vector2 newScrollOffset) = 0;
+};
+
+typedef AZ::EBus<UiScrollBoxNotifications> UiScrollBoxNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiScrollableBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollableBus.h
new file mode 100644
index 0000000000..5ebc6e279a
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollableBus.h
@@ -0,0 +1,73 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a scrollable component needs to implement. A scrollable component is one
+//! that provides functionality to scroll its content
+//! (e.g. UiScrollBoxComponent)
+class UiScrollableInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiScrollableInterface() {}
+
+    //! Get the ratio between the scrollable content size and the size of its parent
+    virtual bool GetScrollableParentToContentRatio(AZ::Vector2& ratioOut) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiScrollableInterface> UiScrollableBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement in order to get notifications when values of the
+//! scrollable change
+class UiScrollableNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiScrollableNotifications(){}
+
+    //! Called when the scroll value (0 - 1) is changing
+    virtual void OnScrollableValueChanging(AZ::Vector2 value) = 0;
+
+    //! Called when the scroll value (0 - 1) has been changed
+    virtual void OnScrollableValueChanged(AZ::Vector2 value) = 0;
+};
+
+typedef AZ::EBus<UiScrollableNotifications> UiScrollableNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that scrollers need to implement in order to get notifications of changes
+//! created by the scrollable
+class UiScrollableToScrollerNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiScrollableToScrollerNotifications(){}
+
+    //! Called when the scrollable is changing the scroll value (0 - 1)
+    virtual void OnValueChangingByScrollable(AZ::Vector2 value) = 0;
+
+    //! Called when the scrollable is done changing the scroll value (0 - 1)
+    virtual void OnValueChangedByScrollable(AZ::Vector2 value) = 0;
+
+    //! Called when the content size or content parent size has been changed
+    virtual void OnScrollableParentToContentRatioChanged(AZ::Vector2 parentToContentRatio) = 0;
+};
+
+typedef AZ::EBus<UiScrollableToScrollerNotifications> UiScrollableToScrollerNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiScrollerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollerBus.h
new file mode 100644
index 0000000000..d02e0f2df4
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiScrollerBus.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a scroller component needs to implement. A scroller component provides
+//! functionality to control the scrolling of scrollable content
+//! (e.g. UiScrollBarComponent)
+class UiScrollerInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! params: sending entity id, newValue, newPosition
+    typedef AZStd::function<void(AZ::EntityId, float)> ValueChangeCallback;
+
+    //! Scroller orientation
+    enum class Orientation
+    {
+        Horizontal,
+        Vertical
+    };
+
+public: // member functions
+
+    virtual ~UiScrollerInterface() {}
+
+    //! Get the current value for the scrollbar (0 - 1)
+    virtual float GetValue() = 0;
+
+    //! Set the value of the scrollbar (0 - 1)
+    virtual void SetValue(float value) = 0;
+
+    //! Get the orientation of the scroller
+    virtual Orientation GetOrientation() = 0;
+
+    //! Set the orientation of the scroller
+    virtual void SetOrientation(Orientation orientation) = 0;
+
+    //! Get the scrollable entity
+    virtual AZ::EntityId GetScrollableEntity() = 0;
+
+    //! Set the scrollable entity
+    virtual void SetScrollableEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the callback invoked while the value is changing
+    virtual ValueChangeCallback GetValueChangingCallback() = 0;
+
+    //! Set the callback invoked while the value is changing
+    virtual void SetValueChangingCallback(ValueChangeCallback onChange) = 0;
+
+    //! Get the callback invoked when the value is done changing
+    virtual ValueChangeCallback GetValueChangedCallback() = 0;
+
+    //! Set the callback invoked when the value is done changing
+    virtual void SetValueChangedCallback(ValueChangeCallback onChange) = 0;
+
+    //! Get the action triggered while the value is changing
+    virtual const LyShine::ActionName& GetValueChangingActionName() = 0;
+
+    //! Set the action triggered while the value is changing
+    virtual void SetValueChangingActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the action triggered when the value is done changing
+    virtual const LyShine::ActionName& GetValueChangedActionName() = 0;
+
+    //! Set the action triggered when the value is done changing
+    virtual void SetValueChangedActionName(const LyShine::ActionName& actionName) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiScrollerInterface> UiScrollerBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement in order to get notifications when values of the
+//! scroller change
+class UiScrollerNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiScrollerNotifications(){}
+
+    //! Called when the scroller value (0 - 1) is changing
+    virtual void OnScrollerValueChanging(float value) = 0;
+
+    //! Called when the scroller value (0 - 1) has been changed
+    virtual void OnScrollerValueChanged(float value) = 0;
+};
+
+typedef AZ::EBus<UiScrollerNotifications> UiScrollerNotificationBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that scrollables need to implement in order to get notifications when the scroller
+//! changes the value
+class UiScrollerToScrollableNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiScrollerToScrollableNotifications(){}
+
+    //! Called when the scroller is changing the scroll value (0 - 1)
+    virtual void OnValueChangingByScroller(float value) = 0;
+
+    //! Called when the scroller is done changing the scroll value (0 - 1)
+    virtual void OnValueChangedByScroller(float value) = 0;
+};
+
+typedef AZ::EBus<UiScrollerToScrollableNotifications> UiScrollerToScrollableNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiSliderBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiSliderBus.h
new file mode 100644
index 0000000000..97819d099b
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiSliderBus.h
@@ -0,0 +1,105 @@
+/*
+ * 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/ComponentBus.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiSliderInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! params: sending entity id, newValue, newPosition
+    typedef AZStd::function<void(AZ::EntityId, float)> ValueChangeCallback;
+
+public: // member functions
+
+    virtual ~UiSliderInterface() {}
+
+    //! Query the value of the slider
+    //! \return     The current value for the slider.
+    virtual float GetValue() = 0;
+
+    //! Manually override the value of the slider
+    //! \param isOn     The new desired value of the slider.
+    virtual void SetValue(float value) = 0;
+
+    virtual float GetMinValue() = 0;
+    virtual void SetMinValue(float value) = 0;
+    virtual float GetMaxValue() = 0;
+    virtual void SetMaxValue(float value) = 0;
+    virtual float GetStepValue() = 0;
+    virtual void SetStepValue(float step) = 0;
+
+    //! Get the callback invoked while the value is changing
+    virtual ValueChangeCallback GetValueChangingCallback() = 0;
+
+    //! Set the callback invoked while the value is changing
+    virtual void SetValueChangingCallback(ValueChangeCallback onChange) = 0;
+
+    //! Get the action triggered while the value is changing
+    virtual const LyShine::ActionName& GetValueChangingActionName() = 0;
+
+    //! Set the action triggered while the value is changing
+    virtual void SetValueChangingActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the callback invoked when the value is done changing
+    virtual ValueChangeCallback GetValueChangedCallback() = 0;
+
+    //! Set the callback invoked when the value is done changing
+    virtual void SetValueChangedCallback(ValueChangeCallback onChange) = 0;
+
+    //! Get the action triggered when the value is done changing
+    virtual const LyShine::ActionName& GetValueChangedActionName() = 0;
+
+    //! Set the action triggered when the value is done changing
+    virtual void SetValueChangedActionName(const LyShine::ActionName& actionName) = 0;
+
+    //! Set the optional track entity
+    virtual void SetTrackEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional track entity
+    virtual AZ::EntityId GetTrackEntity() = 0;
+
+    //! Set the optional fill entity
+    virtual void SetFillEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional fill entity
+    virtual AZ::EntityId GetFillEntity() = 0;
+
+    //! Set the optional manipulator entity
+    virtual void SetManipulatorEntity(AZ::EntityId entityId) = 0;
+
+    //! Get the optional manipulator entity
+    virtual AZ::EntityId GetManipulatorEntity() = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiSliderInterface> UiSliderBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiSliderNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiSliderNotifications() {}
+
+    //! Notify listeners that the slider value is changing
+    virtual void OnSliderValueChanging([[maybe_unused]] float value) {}
+
+    //! Notify listeners that the slider value is done changing
+    virtual void OnSliderValueChanged([[maybe_unused]] float value) {}
+};
+
+typedef AZ::EBus<UiSliderNotifications> UiSliderNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiSpawnerBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiSpawnerBus.h
new file mode 100644
index 0000000000..1fe619f416
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiSpawnerBus.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/Component/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzFramework/Entity/EntityContextBus.h>
+#include <AzFramework/Slice/SliceInstantiationTicket.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus for making requests to the UiSpawnerComponent
+class UiSpawnerInterface
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiSpawnerInterface() {}
+
+    //! Spawn the selected slice at the entity's location
+    virtual AzFramework::SliceInstantiationTicket Spawn() = 0;
+
+    //! Spawn the selected slice at the entity's location with the provided relative offset
+    virtual AzFramework::SliceInstantiationTicket SpawnRelative(const AZ::Vector2& relative) = 0;
+
+    //! Spawn the selected slice at the specified viewport position
+    virtual AzFramework::SliceInstantiationTicket SpawnViewport(const AZ::Vector2& pos) { (void)pos; return AzFramework::SliceInstantiationTicket(); };
+
+    //! Spawn the provided slice at the entity's location
+    virtual AzFramework::SliceInstantiationTicket SpawnSlice(const AZ::Data::Asset<AZ::Data::AssetData>& slice) { (void)slice; return AzFramework::SliceInstantiationTicket(); };
+
+    //! Spawn the provided slice at the entity's location with the provided relative offset
+    virtual AzFramework::SliceInstantiationTicket SpawnSliceRelative(const AZ::Data::Asset<AZ::Data::AssetData>& slice, const AZ::Vector2& relative) { (void)slice; (void)relative; return AzFramework::SliceInstantiationTicket(); };
+
+    //! Spawn the provided slice at the specified viewport position
+    virtual AzFramework::SliceInstantiationTicket SpawnSliceViewport(const AZ::Data::Asset<AZ::Data::AssetData>& slice, const AZ::Vector2& pos) { (void)slice; (void)pos; return AzFramework::SliceInstantiationTicket(); };
+};
+
+using UiSpawnerBus = AZ::EBus<UiSpawnerInterface>;
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Bus for notifications dispatched by the UiSpawnerComponent
+//! Whenever one of the "Spawn" calls in UiSpawnerInterface is called then a listener connected
+//! on this bus with the spawner entity ID will either get:
+//! 1. This sequence of notifications:
+//!    OnSpawnBegin
+//!    N x OnEntitySpawned
+//!    OnEntitiesSpawned
+//!    OnTopLevelEntitiesSpawned
+//!    OnSpawnEnd
+//! 2. In the case of a spawn error just this notification:
+//!    OnSpawnFailed
+class UiSpawnerNotifications
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiSpawnerNotifications() {}
+
+    //! Notify that slice has been spawned, but entities have not yet been activated.
+    //! OnEntitySpawned events are about to be dispatched.
+    virtual void OnSpawnBegin(const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
+
+    //! Notify that an entity has spawned, will be called once for each entity spawned in a slice.
+    virtual void OnEntitySpawned(const AzFramework::SliceInstantiationTicket& /*ticket*/, const AZ::EntityId& /*spawnedEntity*/) {}
+
+    //! Single event notification for an entire slice spawn, providing a list of all resulting entity Ids.
+    virtual void OnEntitiesSpawned(const AzFramework::SliceInstantiationTicket& /*ticket*/, const AZStd::vector<AZ::EntityId>& /*spawnedEntities*/) {}
+
+    //! Single event notification for an entire slice spawn, providing a list of all resulting top-level entity Ids.
+    //! Top-level entities are ones that are not the child of any other entity in the slice
+    virtual void OnTopLevelEntitiesSpawned(const AzFramework::SliceInstantiationTicket& /*ticket*/, const AZStd::vector<AZ::EntityId>& /*spawnedEntities*/) {}
+
+    //! Notify that a spawn has been completed. All spawn notifications for this ticket have been dispatched.
+    virtual void OnSpawnEnd(const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
+
+    //! Notify that slice has failed to be spawned.
+    virtual void OnSpawnFailed(const AzFramework::SliceInstantiationTicket& /*ticket*/) {}
+};
+
+using UiSpawnerNotificationBus = AZ::EBus<UiSpawnerNotifications>;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiSystemBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiSystemBus.h
new file mode 100644
index 0000000000..61ed8d177e
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiSystemBus.h
@@ -0,0 +1,38 @@
+/*
+ * 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/Component.h>
+
+class UiSystemInterface
+    : public AZ::EBusTraits
+{
+public:
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+
+    // Public functions
+
+    //! Register a component type with the UI system.
+    //! The order in which component types are registered is the order that they show up in
+    //! the add component and in the properties pane.
+    //! This will go away once there is a system that orders things the way we want based
+    //! on the existing component registration.
+    virtual void RegisterComponentTypeForMenuOrdering([[maybe_unused]] const AZ::Uuid& typeUuid) {}
+
+    //! Get the UI component types registered with the UI system
+    //! This is a short-term solution until there is a way to get the registered components
+    //! from the framework in an order that we want for the menus and the properties pane
+    virtual const AZStd::vector<AZ::Uuid>* GetComponentTypesForMenuOrdering() = 0;
+
+    //! We use this for metrics to find out which components are part of the LyShine Gem
+    virtual const AZStd::list<AZ::ComponentDescriptor*>* GetLyShineComponentDescriptors() = 0;
+};
+
+using UiSystemBus = AZ::EBus<UiSystemInterface>;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTextBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTextBus.h
new file mode 100644
index 0000000000..35e04079db
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTextBus.h
@@ -0,0 +1,291 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Color.h>
+#include <LyShine/UiBase.h>
+#include <LyShine/Bus/UiTransformBus.h>
+#include <LyShine/IDraw2d.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiTextInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! Callback type for retrieving displayed text.
+    typedef AZStd::function<AZStd::string(const AZStd::string&)> DisplayedTextFunction;
+
+    //! Determines how text overflow should behave
+    enum class OverflowMode
+    {
+        OverflowText,   //!< text contents aren't impacted by element size (and vice versa)
+        ClipText,       //!< clips text contents to fit width of element
+        Ellipsis        //!< truncates displayed text to fit element and appends ellipsis to the text
+    };
+
+    //! Provides values for determining whether text is wrapped or not
+    enum class WrapTextSetting
+    {
+        NoWrap,
+        Wrap
+    };
+
+    //! Controls whether text should shrink (scale down) to prevent overflowing.
+    //!
+    //! The amount of scale applied to text can be limited by minimum shrink scale.
+    enum class ShrinkToFit
+    {
+        None,       //!< No shrinking is applied to text
+        Uniform,    //!< Shrink text uniformly along X/Y dimension (maintains aspect ratio)
+        WidthOnly   //!< Only scales text along X axis (width)
+    };
+
+    //! Determines what processing should be performed on text before returning
+    enum GetTextFlags
+    {
+        GetAsIs         = 0,
+        GetLocalized    = 1 << 0
+    };
+
+    //! Determines how text should be assigned
+    enum SetTextFlags
+    {
+        SetAsIs         = 0,
+        SetEscapeMarkup = 1 << 0,
+        SetLocalized    = 1 << 1
+    };
+
+public: // member functions
+
+    virtual ~UiTextInterface() {}
+
+    //! Returns the unaltered contents of the string contained within the text component.
+    //! \return Unaltered string contents of this text component
+    virtual AZStd::string GetText() = 0;
+    virtual void SetText(const AZStd::string& text) = 0;
+
+    virtual AZStd::string GetTextWithFlags(GetTextFlags flags = GetAsIs) = 0;
+    virtual void SetTextWithFlags(const AZStd::string& text, SetTextFlags flags = SetAsIs) = 0;
+
+    virtual AZ::Color GetColor() = 0;
+    virtual void SetColor(const AZ::Color& color) = 0;
+
+    //! Returns font object used by the displayed text.
+    virtual LyShine::PathnameType GetFont() = 0;
+    virtual void SetFont(const LyShine::PathnameType& fontPath) = 0;
+
+    virtual int GetFontEffect() = 0;
+    virtual void SetFontEffect(int effectIndex) = 0;
+
+    virtual AZStd::string GetFontEffectName(int effectIndex) = 0;
+    virtual void SetFontEffectByName(const AZStd::string& effectName) = 0;
+
+    virtual float GetFontSize() = 0;
+    virtual void SetFontSize(float size) = 0;
+
+    virtual void GetTextAlignment(IDraw2d::HAlign& horizontalAlignment,
+        IDraw2d::VAlign& verticalAlignment) = 0;
+    virtual void SetTextAlignment(IDraw2d::HAlign horizontalAlignment,
+        IDraw2d::VAlign verticalAlignment) = 0;
+
+    virtual IDraw2d::HAlign GetHorizontalTextAlignment() = 0;
+    virtual void SetHorizontalTextAlignment(IDraw2d::HAlign alignment) = 0;
+    virtual IDraw2d::VAlign GetVerticalTextAlignment() = 0;
+    virtual void SetVerticalTextAlignment(IDraw2d::VAlign alignment) = 0;
+
+    virtual float GetCharacterSpacing() = 0;
+    virtual void SetCharacterSpacing(float characterSpacing) = 0;
+    virtual float GetLineSpacing() = 0;
+    virtual void SetLineSpacing(float lineSpacing) = 0;
+
+    //! Given a point in viewport space, return the character index in the string
+    //! \param point a point in viewport space
+    //! \param mustBeInBoundingBox if true the given point be be contained in the bounding box of
+    //!  actual text characters (not the element). If false it can be anywhere (even outside the element)
+    //!  and is projected onto a text position (for drag select for example).
+    //! \return -1 if second param is true and point is outside box
+    //!  0 if to left of first char, 1 if between first and second char,
+    //!  length of string if to right of last char
+    virtual int GetCharIndexFromPoint(AZ::Vector2 point, bool mustBeInBoundingBox) = 0;
+
+    //! Given a point in untransformed canvas space, return the character index in the string
+    //! \param point a point in untransformed canvas space
+    //! \param mustBeInBoundingBox if true the given point be be contained in the bounding box of
+    //!  actual text characters (not the element). If false it can be anywhere (even outside the element)
+    //!  and is projected onto a text position (for drag select for example).
+    //! \return -1 if second param is true and point is outside box
+    //!  0 if to left of first char, 1 if between first and second char,
+    //!  length of string if to right of last char
+    virtual int GetCharIndexFromCanvasSpacePoint(AZ::Vector2 point, bool mustBeInBoundingBox) = 0;
+
+    //! Returns the XY coord of the rendered character position at a given index.
+    //! Imagining a rect encompassing the character width and line height,
+    //! the returned coordinate is the upper-left corner of the rect.
+    //! \param index Index into displayed string.
+    virtual AZ::Vector2 GetPointFromCharIndex(int index) = 0;
+
+    virtual AZ::Color GetSelectionColor() = 0;
+    virtual void GetSelectionRange(int& startIndex, int& endIndex) = 0;
+
+    //! Set a range of the text string to be shown as selected
+    //!
+    //! If startIndex and endIndex are the same then a one pixel wide vertical bar is highlighted.
+    //!
+    //! The provided start and end indices are "character" indices into a UTF8 string. For
+    //! example, an index of 1 could actually be mapped at buffer index 2 if the first character
+    //! in the UTF8 string is a multi-byte character of size 2.
+    //!
+    //! \param startIndex 0 means starting at the left edge first character
+    //! \param endIndex if equal to UTF8 text string length that means up to the right edge of the last char
+    //! \param selectionColor the selection color (for box drawn behind text)
+    virtual void SetSelectionRange(int startIndex, int endIndex, const AZ::Color& selectionColor) = 0;
+
+    //! Clear any text selection range that has been applied to this text
+    virtual void ClearSelectionRange() = 0;
+
+    //! Get the width and height of the text
+    virtual AZ::Vector2 GetTextSize() = 0;
+
+    //! Get the width of the text
+    virtual float GetTextWidth() = 0;
+
+    //! Get the height of the text
+    virtual float GetTextHeight() = 0;
+
+    //! Get the bounding box (in viewport space, so it can be rotated) of the given text range
+    //! If startIndex and endIndex are the same then a rect is still returned that is one pixel wide
+    //! \param startIndex 0 means starting at the first character
+    //! \param endIndex if equal to text string length that means including the last char
+    //! \param rectPoints Output parameter that gets populated with up to three RectPoints for multi-line text selection geometry.
+    virtual void GetTextBoundingBox(int startIndex, int endIndex, UiTransformInterface::RectPointsArray& rectPoints) = 0;
+
+    //! Returns the function object used to manipulate a given string to condition it for rendering.
+    //! The default displayed text function for a UiTextComponent is pass-through (the passed string
+    //! is returned as-is).
+    virtual DisplayedTextFunction GetDisplayedTextFunction() const = 0;
+
+    //! Allows setting a DisplayedTextFunction object to be called prior to rendering.
+    //! The string contents of a UiTextComponent can be modified for rendering without
+    //! changing the actual contents of the text component (GetText()). This functionality
+    //! is useful in some situations, like password hiding, where the displayed text should
+    //! be different from the stored text.
+    virtual void SetDisplayedTextFunction(const DisplayedTextFunction& displayedTextFunction) = 0;
+
+    //! Gets the overflow behavior of this component
+    virtual OverflowMode GetOverflowMode() = 0;
+
+    //! Sets the overflow setting of this component.
+    virtual void SetOverflowMode(OverflowMode overflowMode) = 0;
+
+    //! Gets the text wrapping setting of this component
+    virtual WrapTextSetting GetWrapText() = 0;
+
+    //! Sets the text wrapping setting of this component
+    virtual void SetWrapText(WrapTextSetting wrapSetting) = 0;
+
+    //! Gets the "shrink-to-fit" value of this component
+    virtual ShrinkToFit GetShrinkToFit() = 0;
+
+    //! Sets the "shrink-to-fit" value of this component
+    virtual void SetShrinkToFit(ShrinkToFit shrinkToFit) = 0;
+
+    //! Typically triggered when input mechanism (keyboard vs. mouse) changes/alternates.
+    virtual void ResetCursorLineHint() = 0;
+
+    //! Get whether markup is enabled. If true then the text string is parsed for XML markup.
+    virtual bool GetIsMarkupEnabled() = 0;
+
+    //! Set whether markup is enabled. If true then the text string is parsed for XML markup.
+    virtual void SetIsMarkupEnabled(bool isEnabled) = 0;
+
+    //! Gets the minimum shrink scale when using ShrinkToFit.
+    virtual float GetMinimumShrinkScale() = 0;
+
+    //! Sets the minimum shrink scale when using ShrinkToFit.
+    virtual void SetMinimumShrinkScale(float minShrinkScale) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiTextInterface> UiTextBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface that describes "clickable" areas of text for a text component.
+//!
+//! Text components can contain anchor tags that allow user interaction with text.
+//! These anchor tags define clickable areas that can be stylized (via color) and
+//! provide information to listeners regarding the text.
+class UiClickableTextInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! Defines an area of interaction for clickable text, along with metadata.
+    struct ClickableTextRect
+    {
+        UiTransformInterface::Rect rect; //!< "Click area" for text.
+
+        AZStd::string action; //!< "action" string from markup.
+
+        AZStd::string data; //!< "data" string from markup.
+
+        int id; //!< Identifier that uniquely identifies clickable text from
+                //!< a single anchor tag. The clickable text from markup can
+                //!< be word-wrapped to subsequent lines, in which case the
+                //!< identifier will identify all clickable text coming from
+                //!< a single anchor tag. This allows word-wrapped clickable
+                //!< text to be treated as a single clickable link, 
+                //!< especially useful for hover/color styling.
+    };
+
+    using ClickableTextRects = AZStd::vector<ClickableTextRect>;
+
+public: // member functions
+
+    virtual ~UiClickableTextInterface() {}
+
+    //! Populates given clickable text rects for a text component.
+    virtual void GetClickableTextRects(UiClickableTextInterface::ClickableTextRects& clickableTextRects) = 0;
+
+    //! Sets the drawbatch color for clickable text, given by the ID.
+    virtual void SetClickableTextColor(int id, const AZ::Color& color) = 0;
+
+public: // static member data
+
+    //! Only one component on an entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiClickableTextInterface> UiClickableTextBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiClickableTextNotifications
+    : public AZ::ComponentBus
+{
+public:
+
+    //////////////////////////////////////////////////////////////////////////
+    // EBusTraits overrides
+    static const bool EnableEventQueue = true;
+    //////////////////////////////////////////////////////////////////////////
+
+public: // member functions
+
+    virtual ~UiClickableTextNotifications() {}
+
+    //! Notify listeners that the text has been prepared for render.
+    virtual void OnClickableTextChanged() {}
+};
+
+typedef AZ::EBus<UiClickableTextNotifications> UiClickableTextNotificationsBus;
+
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTextInputBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTextInputBus.h
new file mode 100644
index 0000000000..0a7863de1a
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTextInputBus.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Math/Color.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiTextInputInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    typedef AZStd::function<void(AZ::EntityId, const AZStd::string&)> TextInputCallback;
+
+public: // member functions
+
+    virtual ~UiTextInputInterface() {}
+
+    //! Get the color to be used for the text background when it is selected
+    virtual AZ::Color GetTextSelectionColor() = 0;
+
+    //! Set the color to be used for the text background when it is selected
+    virtual void SetTextSelectionColor(const AZ::Color& color) = 0;
+
+    //! Get the color to be used for the text cursor
+    virtual AZ::Color GetTextCursorColor() = 0;
+
+    //! Set the color to be used for the text cursor
+    virtual void SetTextCursorColor(const AZ::Color& color) = 0;
+
+    //! Get the cursor blink interval
+    virtual float GetCursorBlinkInterval() = 0;
+
+    //! Set the cursor blink interval, 0 means no blink
+    virtual void SetCursorBlinkInterval(float interval) = 0;
+
+    //! Get the maximum number of character allowed in the edited string
+    virtual int GetMaxStringLength() = 0;
+
+    //! Set the maximum number of character allowed in the edited string
+    //! \param maxCharacters, a value of 0 means none allowed, -1 means no limit
+    virtual void SetMaxStringLength(int maxCharacters) = 0;
+
+    //! Get the on-change callback (called when a character added/removed/changed)
+    virtual TextInputCallback GetOnChangeCallback() = 0;
+
+    //! Set the on-change callback (called when a character added/removed/changed)
+    virtual void SetOnChangeCallback(TextInputCallback callbackFunction) = 0;
+
+    //! Get the on-end-edit callback (called when edit of text is completed)
+    virtual TextInputCallback GetOnEndEditCallback() = 0;
+
+    //! Set the on-end-edit callback (called when edit of text is completed)
+    virtual void SetOnEndEditCallback(TextInputCallback callbackFunction) = 0;
+
+    //! Get the on-enter callback (called when Enter is pressed on keyboard)
+    virtual TextInputCallback GetOnEnterCallback() = 0;
+
+    //! Set the on-enter callback (called when Enter is pressed on keyboard)
+    virtual void SetOnEnterCallback(TextInputCallback callbackFunction) = 0;
+
+    //! Get the "change" action name, the action is sent to canvas listeners when text is changed
+    virtual const LyShine::ActionName& GetChangeAction() = 0;
+
+    //! Set the "change" action name
+    virtual void SetChangeAction(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the "end edit" action name, the action is sent to canvas listeners when the
+    //! editing of the text is finished - i.e. when the text input component is no longer active
+    virtual const LyShine::ActionName& GetEndEditAction() = 0;
+
+    //! Set the "end edit" action name
+    virtual void SetEndEditAction(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the "enter" action name, the action is sent to canvas listeners when enter is pressed
+    virtual const LyShine::ActionName& GetEnterAction() = 0;
+
+    //! Set the "enter" action name
+    virtual void SetEnterAction(const LyShine::ActionName& actionName) = 0;
+
+    //! Get the entity id for the text element being edited by this component
+    virtual AZ::EntityId GetTextEntity() = 0;
+
+    //! Set the entity id for the text element being edited by this component
+    //! This must be a child of this entity
+    virtual void SetTextEntity(AZ::EntityId textEntity) = 0;
+
+    //! Get the text string being edited by this component (from the text element)
+    virtual AZStd::string GetText() = 0;
+
+    virtual void SetText(const AZStd::string& text) = 0;
+
+    //! Get the entity id for the placeholder text element for this component
+    virtual AZ::EntityId GetPlaceHolderTextEntity() = 0;
+
+    //! Set the entity id for the placeholder text element for this component
+    //! This must be a child of this entity
+    virtual void SetPlaceHolderTextEntity(AZ::EntityId textEntity) = 0;
+
+    //! True if this text input is configured as a password field, false otherwise
+    //!
+    //! Password fields will render the displayed text with all of the characters
+    //! of the input string replaced with a character.
+    virtual bool GetIsPasswordField() = 0;
+
+    //! Allows this text input to be configured as a password field.
+    virtual void SetIsPasswordField(bool passwordField) = 0;
+
+    //! Returns the UTF8 character to be used to display password fields
+    //
+    //! Note that having a replacement character configured doesn't determine
+    //! whether this input is configured as a password field (see GetIsPasswordField).
+    virtual uint32_t GetReplacementCharacter() = 0;
+
+    //! Sets the UTF8 character that should be used for displaying text in password fields.
+    //
+    //! Note that setting a replacement character doesn't determine whether this
+    //! text input will be used as a password field (see GetIsPasswordField).
+    virtual void SetReplacementCharacter(uint32_t replacementChar) = 0;
+
+    //! True if copy/cut/paste should be supported, false otherwise
+    virtual bool GetIsClipboardEnabled() = 0;
+
+    //! Allows copy/cut/paste support for this text input
+    virtual void SetIsClipboardEnabled(bool enableClipboard) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiTextInputInterface> UiTextInputBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiTextInputNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiTextInputNotifications() {}
+
+    //! Called when a character added/removed/change
+    virtual void OnTextInputChange([[maybe_unused]] const AZStd::string& textString) {}
+
+    //! Called when edit of text is completed
+    virtual void OnTextInputEndEdit([[maybe_unused]] const AZStd::string& textString) {}
+
+    //! Called when Enter is pressed on keyboard
+    virtual void OnTextInputEnter([[maybe_unused]] const AZStd::string& textString) {}
+};
+
+typedef AZ::EBus<UiTextInputNotifications> UiTextInputNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipBus.h
new file mode 100644
index 0000000000..3063b29eb0
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipBus.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a tooltip component needs to implement. A tooltip component provides
+//! data that is assigned to a tooltip display element
+class UiTooltipInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiTooltipInterface() {}
+
+    //! Get the tooltip text
+    virtual AZStd::string GetText() = 0;
+
+    //! Set the tooltip text
+    virtual void SetText(const AZStd::string& text) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiTooltipInterface> UiTooltipBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h
new file mode 100644
index 0000000000..bf6e3e686d
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDataPopulatorBus.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a tooltip component needs to implement. A tooltip component populates
+//! a tooltip display element with data
+class UiTooltipDataPopulatorInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiTooltipDataPopulatorInterface() {}
+
+    //! Assign data to the specified tooltip display element
+    virtual void PushDataToDisplayElement(AZ::EntityId displayEntityId) = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiTooltipDataPopulatorInterface> UiTooltipDataPopulatorBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h
new file mode 100644
index 0000000000..ba114eabc5
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTooltipDisplayBus.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that a tooltip display component needs to implement. A tooltip display
+//! component is responsible for displaying an element as a tooltip given sizing and positioning
+//! properties
+class UiTooltipDisplayInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    enum class AutoPositionMode
+    {
+        OffsetFromMouse,
+        OffsetFromElement
+    };
+
+    enum class TriggerMode
+    {
+        OnHover,
+        OnPress,
+        OnClick
+    };
+
+public: // member functions
+
+    virtual ~UiTooltipDisplayInterface() {}
+
+    //! Get the way the tooltip is triggered to display
+    virtual TriggerMode GetTriggerMode() = 0;
+
+    //! Set the way the tooltip is triggered to display
+    virtual void SetTriggerMode(TriggerMode triggerMode) = 0;
+
+    //! Get whether the tooltip display element will be auto positioned
+    virtual bool GetAutoPosition() = 0;
+
+    //! Set whether the tooltip display element will be auto positioned
+    virtual void SetAutoPosition(bool autoPosition) = 0;
+
+    //! Get auto position mode
+    virtual AutoPositionMode GetAutoPositionMode() = 0;
+
+    //! Set auto position mode
+    virtual void SetAutoPositionMode(AutoPositionMode autoPositionMode) = 0;
+
+    //! Get the offset from the tooltip display element's pivot to the mouse position
+    virtual const AZ::Vector2& GetOffset() = 0;
+
+    //! Set the offset from the tooltip display element's pivot to the mouse position
+    virtual void SetOffset(const AZ::Vector2& offset) = 0;
+
+    //! Get whether the tooltip display element should be resized so that the text element
+    //! size matches the size of the string
+    virtual bool GetAutoSize() = 0;
+
+    //! Set whether the tooltip display element should be resized so that the text element
+    //! size matches the size of the string
+    virtual void SetAutoSize(bool autoSize) = 0;
+
+    //! Get the entity id of the text element that is used for resizing
+    virtual AZ::EntityId GetTextEntity() = 0;
+
+    //! Set the entity id of the text element that is used for resizing
+    //! This must be a child of this entity
+    virtual void SetTextEntity(AZ::EntityId textEntity) = 0;
+
+    //! Get the amount of time to wait before showing the tooltip display element after hover start
+    virtual float GetDelayTime() = 0;
+
+    //! Set the amount of time to wait before showing the tooltip display element after hover start
+    virtual void SetDelayTime(float delayTime) = 0;
+
+    //! Get the amount of time the tooltip display element is to remain visible
+    virtual float GetDisplayTime() = 0;
+
+    //! Set the amount of time the tooltip display element is to remain visible
+    virtual void SetDisplayTime(float displayTime) = 0;
+
+    //! Show the tooltip display element
+    virtual void PrepareToShow(AZ::EntityId tooltipElement) = 0;
+
+    //! Hide the tooltip display element
+    virtual void Hide() = 0;
+
+    //! Update the tooltip display element
+    virtual void Update() = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiTooltipDisplayInterface> UiTooltipDisplayBus;
+
+//! Interface class that listeners need to implement to be notified of tooltip display events
+class UiTooltipDisplayNotifications
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiTooltipDisplayNotifications() {}
+
+    //! Called on tooltip display state changes
+    virtual void OnShowing() {};
+    virtual void OnShown() {};
+    virtual void OnHiding() {};
+    virtual void OnHidden() {};
+};
+
+typedef AZ::EBus<UiTooltipDisplayNotifications> UiTooltipDisplayNotificationBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h
new file mode 100644
index 0000000000..49591cbc5f
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h
@@ -0,0 +1,184 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/Bus/UiTransformBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiTransform2dInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    // Anchors members are always in range 0-1, they are normalized positions within the parent elements bounds
+    struct Anchors
+    {
+        AZ_TYPE_INFO(Anchors, "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}")
+
+        Anchors()
+            : m_left(0.5f)
+            , m_top(0.5f)
+            , m_right(0.5f)
+            , m_bottom(0.5f) {}
+
+        Anchors(float left, float top, float right, float bottom)
+            : m_left(left)
+            , m_top(top)
+            , m_right(right)
+            , m_bottom(bottom) {}
+
+        float   m_left;
+        float   m_top;
+        float   m_right;
+        float   m_bottom;
+
+        void UnitClamp()
+        {
+            m_left = FClamp(m_left, 0.0f, 1.0f);
+            m_top = FClamp(m_top, 0.0f, 1.0f);
+            m_right = FClamp(m_right, 0.0f, 1.0f);
+            m_bottom = FClamp(m_bottom, 0.0f, 1.0f);
+        }
+
+        bool operator==(const Anchors& rhs) const
+        {
+            return (m_left == rhs.m_left &&
+                    m_right == rhs.m_right &&
+                    m_top == rhs.m_top &&
+                    m_bottom == rhs.m_bottom);
+        }
+
+        bool operator!=(const Anchors& rhs) const
+        {
+            return !(*this == rhs);
+        }
+    };
+
+    // Offsets are in pixels or physical units and are offsets from the anchors
+    // The left offset is the offset from the left anchor to the left edge of this UiElement
+    struct Offsets
+    {
+        AZ_TYPE_INFO(Offsets, "{F681BA9D-245C-4630-B20E-05DD752FAD57}")
+
+        Offsets()
+            : m_left(-50)
+            , m_top(-50)
+            , m_right(50)
+            , m_bottom(50) {}
+
+        Offsets(float left, float top, float right, float bottom)
+            : m_left(left)
+            , m_top(top)
+            , m_right(right)
+            , m_bottom(bottom) {}
+
+        float   m_left;
+        float   m_top;
+        float   m_right;
+        float   m_bottom;
+
+        Offsets& operator+=(const UiTransformInterface::RectPoints& rhs)
+        {
+            m_left += rhs.TopLeft().GetX();
+            m_right += rhs.BottomRight().GetX();
+            m_top += rhs.TopLeft().GetY();
+            m_bottom += rhs.BottomRight().GetY();
+
+            return *this;
+        }
+
+        Offsets operator+(const UiTransformInterface::RectPoints& rhs) const
+        {
+            Offsets result(*this);
+
+            result.m_left += rhs.TopLeft().GetX();
+            result.m_right += rhs.BottomRight().GetX();
+            result.m_top += rhs.TopLeft().GetY();
+            result.m_bottom += rhs.BottomRight().GetY();
+
+            return result;
+        }
+
+        Offsets& operator+=(const AZ::Vector2& rhs)
+        {
+            m_left += rhs.GetX();
+            m_right += rhs.GetX();
+            m_top += rhs.GetY();
+            m_bottom += rhs.GetY();
+
+            return *this;
+        }
+
+        Offsets operator+(const AZ::Vector2& rhs) const
+        {
+            Offsets result(*this);
+
+            result.m_left += rhs.GetX();
+            result.m_right += rhs.GetX();
+            result.m_top += rhs.GetY();
+            result.m_bottom += rhs.GetY();
+
+            return result;
+        }
+
+        bool operator==(const Offsets& rhs) const
+        {
+            return (m_left == rhs.m_left &&
+                    m_right == rhs.m_right &&
+                    m_top == rhs.m_top &&
+                    m_bottom == rhs.m_bottom);
+        }
+
+        bool operator!=(const Offsets& rhs) const
+        {
+            return !(*this == rhs);
+        }
+    };
+
+public: // member functions
+
+    virtual ~UiTransform2dInterface() {}
+
+    //! Get the anchors for the element
+    virtual Anchors GetAnchors() = 0;
+
+    //! Set the anchors for the element
+    //! \param adjustOffsets    If true the offsets are adjusted to keep the rect in the same position
+    //! \param allowPush        Only has effect if the anchors are invalid. If true changing an anchor
+    //                          to overlap its opposite anchor, will move the opposite anchor
+    virtual void SetAnchors(Anchors anchors, bool adjustOffsets, bool allowPush) = 0;
+
+    //! Get the offsets for the element
+    virtual Offsets GetOffsets() = 0;
+
+    //! Set the offsets for the element
+    virtual void SetOffsets(Offsets offsets) = 0;
+
+    //! Set the pivot and adjust the offsets to stay in same place
+    virtual void SetPivotAndAdjustOffsets(AZ::Vector2 pivot) = 0;
+
+    //! Modify left and right offsets relative the element's anchors
+    virtual void SetLocalWidth(float width) = 0;
+
+    //! Get the height of the element based off it's offsets
+    virtual float GetLocalWidth() = 0;
+
+    //! Modify top and bottom offsets relative the element's anchors
+    virtual void SetLocalHeight(float height) = 0;
+
+    //! Get the height of the element based off it's offsets
+    virtual float GetLocalHeight() = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiTransform2dInterface> UiTransform2dBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h
new file mode 100644
index 0000000000..05ae14c22c
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h
@@ -0,0 +1,549 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/Math/MathUtils.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/Math/Matrix4x4.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// The UiTransformInterface provides an abstract bus interface for UI components that define the
+// position and size of a UI element.
+class UiTransformInterface
+    : public AZ::ComponentBus
+{
+public: // types
+
+    //! Struct that stores the 4 points of a (transformed) rectangle and provides access either as an array or via access functions
+    struct RectPoints
+    {
+        enum Corner     // can be used as an index into RectPoints pt array but access via member functions preferred
+        {
+            Corner_TopLeft,
+            Corner_TopRight,
+            Corner_BottomRight,
+            Corner_BottomLeft,
+
+            Corner_Count
+        };
+
+        AZ::Vector2    pt[Corner_Count];  // in clockwise order: top left, top right, bottom right, bottom left
+
+        RectPoints();
+        RectPoints(float left, float right, float top, float bottom);
+
+        AZ::Vector2& TopLeft();
+        const AZ::Vector2& TopLeft() const;
+
+        AZ::Vector2& TopRight();
+        const AZ::Vector2& TopRight() const;
+
+        AZ::Vector2& BottomRight();
+        const AZ::Vector2& BottomRight() const;
+
+        AZ::Vector2& BottomLeft();
+        const AZ::Vector2& BottomLeft() const;
+
+        AZ::Vector2 GetCenter() const;
+
+        AZ::Vector2 GetAxisAlignedSize() const;
+        AZ::Vector2 GetAxisAlignedTopLeft() const;
+        AZ::Vector2 GetAxisAlignedTopRight() const;
+        AZ::Vector2 GetAxisAlignedBottomRight() const;
+        AZ::Vector2 GetAxisAlignedBottomLeft() const;
+        void SetAxisAligned(float left, float right, float top, float bottom);
+
+        RectPoints Transform(AZ::Matrix4x4& transform) const;
+        RectPoints operator-(const RectPoints& rhs) const;
+    };
+
+    using RectPointsArray = AZStd::vector < UiTransformInterface::RectPoints >;
+
+    //! Struct that stores the bounds of an axis-aligned rectangle
+    struct Rect
+    {
+        float left;
+        float right;
+        float top;
+        float bottom;
+
+        void Set(float l, float r, float t, float b);
+
+        float GetWidth() const;
+        float GetHeight() const;
+
+        float GetCenterX();
+        float GetCenterY();
+
+        AZ::Vector2 GetSize() const;
+        AZ::Vector2 GetCenter();
+
+        void MoveBy(AZ::Vector2 offset);
+
+        RectPoints GetPoints();
+
+        bool operator==(const Rect& rhs) const;
+
+        bool operator!=(const Rect& rhs) const;
+    };
+
+    //! Enum used as a parameter to SetRecomputeFlags
+    enum class Recompute
+    {
+        RectOnly,               //!< Only the rect (offsets or anchors for example) changed (this may affect transform if local scale or rotation)
+        TransformOnly,          //!< Only the transform changed (canvas and viewport transforms must be recomputed)
+        ViewportTransformOnly,  //!< Only the viewport transform changed (viewport transform must be recomputed)
+        RectAndTransform        //!< Both rect and transform changed (all cached data must be recomputed)
+    };
+
+    //! Enum used as a parameter to SetScaleToDeviceMode
+    //! The value determines how an element is scaled when the canvas reference size and actual size are different
+    //! The comments below reference the canvas's "deviceScale". The deviceScale is target (actual) canvas size divided the reference canvas size
+    enum class ScaleToDeviceMode
+    {
+        None,               //!< Default, this element is not affected by device resolution changes
+        UniformScaleToFit,  //!< Apply a uniform scale which is the minimum of deviceScale.x and deviceScale.y
+        UniformScaleToFill, //!< Apply a uniform scale which is the maximum of deviceScale.x and deviceScale.y
+        UniformScaleToFitX, //!< Apply a uniform scale of deviceScale.x
+        UniformScaleToFitY, //!< Apply a uniform scale of deviceScale.y
+        NonUniformScale,    //!< Apply a non-uniform scale which is simply deviceScale
+        ScaleXOnly,         //!< Scale the element only in the X dimension by deviceScale.x
+        ScaleYOnly          //!< Scale the element only in the Y dimension by deviceScale.y
+    };
+
+public: // member functions
+
+    virtual ~UiTransformInterface() {}
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Methods to get and set the properties of the transform component
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Get the rotation about the Z axis
+    virtual float GetZRotation() = 0;
+
+    //! Set the rotation about the Z axis
+    virtual void SetZRotation(float rotation) = 0;
+
+    //! Get the scale
+    virtual AZ::Vector2 GetScale() = 0;
+
+    //! Set the scale
+    virtual void SetScale(AZ::Vector2 scale) = 0;
+
+    //! Get the scale X
+    virtual float GetScaleX() = 0;
+
+    //! Set the scale X
+    virtual void SetScaleX(float scale) = 0;
+
+    //! Get the scale Y
+    virtual float GetScaleY() = 0;
+
+    //! Set the scale Y
+    virtual void SetScaleY(float scale) = 0;
+
+    //! Get the pivot point for the element
+    virtual AZ::Vector2 GetPivot() = 0;
+
+    //! Set the pivot point for the element
+    virtual void SetPivot(AZ::Vector2 pivot) = 0;
+
+    //! Get the pivot point for the element
+    virtual float GetPivotX() = 0;
+
+    //! Set the pivot point for the element
+    virtual void SetPivotX(float pivot) = 0;
+
+    //! Get the pivot point for the element
+    virtual float GetPivotY() = 0;
+
+    //! Set the pivot point for the element
+    virtual void SetPivotY(float pivot) = 0;
+
+    //! Get how the element and all its children will be scaled to allow for the difference
+    //! between the authored canvas size and the actual viewport size.
+    virtual ScaleToDeviceMode GetScaleToDeviceMode() = 0;
+
+    //! Set how the element and all its children will be scaled to allow for the difference
+    //! between the authored canvas size and the actual viewport size.
+    virtual void SetScaleToDeviceMode(ScaleToDeviceMode scaleToDeviceMode) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Methods to get data in viewport space
+    //
+    // Viewport space is a 1-1 mapping to whatever viewport the UI canvas is being rendered to.
+    // A position in viewport space is an offset in pixels from the top left of the viewport.
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Get the four points defining the rectangle of this element, in viewport space pixel coords
+    virtual void GetViewportSpacePoints(RectPoints& points) = 0;
+
+    //! Get the pivot for this element in viewport space
+    virtual AZ::Vector2 GetViewportSpacePivot() = 0;
+
+    //! Get the transform matrix to transform from canvas (noScaleRotate) space to viewport space
+    virtual void GetTransformToViewport(AZ::Matrix4x4& mat) = 0;
+
+    //! Get the transform matrix to transform from viewport space to canvas (noScaleRotate) space
+    virtual void GetTransformFromViewport(AZ::Matrix4x4& mat) = 0;
+
+    //! Apply the "to viewport" transform to the given points
+    virtual void RotateAndScalePoints(RectPoints& points) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Methods to get data in canvas space
+    //
+    // Often canvas space and viewport space are the same thing. For example if a canvas is being
+    // displayed full screen.
+    // However, in other cases they are different. For example in the UI editor when Zoom and Pan allow
+    // the canvas to be moved around in the viewport. In that case an offset of 1 does not mean 1 pixel
+    // in the viewport. Canvas space is defined by the canvas size stored in the canvas.
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Get the four points defining the rectangle of this element, in canvas space coords
+    virtual void GetCanvasSpacePoints(RectPoints& points) = 0;
+
+    //! Get the pivot for this element in canvas space
+    virtual AZ::Vector2 GetCanvasSpacePivot() = 0;
+
+    //! Get the transform matrix to transform from canvasNoScaleRotate space to canvas space
+    virtual void GetTransformToCanvasSpace(AZ::Matrix4x4& mat) = 0;
+    
+    //! Get the transform matrix to transform from canvas space to canvasNoScaleRotate space
+    virtual void GetTransformFromCanvasSpace(AZ::Matrix4x4& mat) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Methods to get data in unrotated and unscaled canvas space (CanvasNoScaleRotate space)
+    //
+    // CanvasNoScaleRotate space is like canvas space but without any of the rotation or scaling in
+    // any of the elments applied. So if none of the elements in the canvas have scale or rotation
+    // the two are the same.
+    //
+    // CanvasNoScaleRotate space is like local space for an element but it does include all of the
+    // parent's anchor and offset calculations so it is not really local space.
+    //
+    // This is a useful space to do calculations in because all elements are axis aligned and their
+    // rectangle can be represented by a Rect struct rather requiring a RectPoints struct.
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Get the axis-aligned rect for the element without accounting for rotation or scale
+    virtual void GetCanvasSpaceRectNoScaleRotate(Rect& rect) = 0;
+
+    //! Get the rect points for the element without accounting for rotation or scale
+    virtual void GetCanvasSpacePointsNoScaleRotate(RectPoints& points) = 0;
+
+    //! Get the size for the element without accounting for rotation or scale
+    virtual AZ::Vector2 GetCanvasSpaceSizeNoScaleRotate() = 0;
+
+    //! Get the pivot for the element without accounting for rotation or scale
+    virtual AZ::Vector2 GetCanvasSpacePivotNoScaleRotate() = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Methods to get data in/about local space
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Get the transform matrix to apply this element's rotation and scale about pivot
+    virtual void GetLocalTransform(AZ::Matrix4x4& mat) = 0;
+
+    //! Get the transform matrix to apply the inverse of this element's rotation and scale about pivot
+    virtual void GetLocalInverseTransform(AZ::Matrix4x4& mat) = 0;
+
+    //! Test whether this transform component has any scale or rotation
+    virtual bool HasScaleOrRotation() = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Methods to get/set the element's position
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Get the position for this element in viewport space (same as GetViewportSpacePivot)
+    virtual AZ::Vector2 GetViewportPosition() = 0;
+
+    //! Set the position for this element in viewport space
+    virtual void SetViewportPosition(const AZ::Vector2& position) = 0;
+
+    //! Get the position for this element in canvas space (same as GetCanvasSpacePivot)
+    virtual AZ::Vector2 GetCanvasPosition() = 0;
+
+    //! Set the position for this element in canvas space
+    virtual void SetCanvasPosition(const AZ::Vector2& position) = 0;
+
+    //! Get the position for this element relative to the center of the element's anchors
+    virtual AZ::Vector2 GetLocalPosition() = 0;
+
+    //! Set the position for this element relative to the center of the element's anchors
+    virtual void SetLocalPosition(const AZ::Vector2& position) = 0;
+
+    //! Get the X position for this element relative to the center of the element's anchors
+    virtual float GetLocalPositionX() = 0;
+
+    //! Set the X position for this element relative to the center of the element's anchors
+    virtual void SetLocalPositionX(float position) = 0;
+
+    //! Get the Y position for this element relative to the center of the element's anchors
+    virtual float GetLocalPositionY() = 0;
+
+    //! Set the Y position for this element relative to the center of the element's anchors
+    virtual void SetLocalPositionY(float position) = 0;
+
+    //! Move this element in viewport space
+    virtual void MoveViewportPositionBy(const AZ::Vector2& offset) = 0;
+
+    //! Move this element in canvas space
+    virtual void MoveCanvasPositionBy(const AZ::Vector2& offset) = 0;
+
+    //! Move this element relative to the center of the element's anchors
+    virtual void MoveLocalPositionBy(const AZ::Vector2& offset) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Query functions
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Test if the given point (in viewport space) is in the rectangle of this element
+    virtual bool IsPointInRect(AZ::Vector2 point) = 0;
+
+    //! Test if the given rect (in viewport space) is in the rectangle of this element
+    virtual bool BoundsAreOverlappingRect(const AZ::Vector2& bound0, const AZ::Vector2& bound1) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Optimization and caching
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Set the required dirty flags for the cached transforms and rect on this element and all its children
+    virtual void SetRecomputeFlags(Recompute recompute) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Canvas space rect change
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    //! Get whether the canvas space rect has changed since the last call to NotifyAndResetCanvasSpaceRectChange.
+    //! May trigger a recompute of the rect if the recompute flag is dirty
+    virtual bool HasCanvasSpaceRectChanged() = 0;
+
+    //! Get whether the canvas space size has changed since the last call to NotifyAndResetCanvasSpaceRectChange.
+    //! May trigger a recompute of the rect if the recompute flag is dirty
+    virtual bool HasCanvasSpaceSizeChanged() = 0;
+
+    //! Get whether the canvas space rect was changed due to initialization
+    virtual bool HasCanvasSpaceRectChangedByInitialization() = 0;
+
+    //! Send notification of canvas space rect change and reset to unchanged
+    virtual void NotifyAndResetCanvasSpaceRectChange() = 0;
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiTransformInterface> UiTransformBus;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Interface class that listeners need to implement
+class UiTransformChangeNotification
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiTransformChangeNotification(){}
+
+    //! Called when an entity's transform (canvas space) has been modified
+    virtual void OnCanvasSpaceRectChanged(AZ::EntityId entityId, const UiTransformInterface::Rect& oldRect, const UiTransformInterface::Rect& newRect) = 0;
+
+    //! Called when an entity's transform (viewport space) has been modified
+    virtual void OnTransformToViewportChanged() {}
+};
+
+typedef AZ::EBus<UiTransformChangeNotification> UiTransformChangeNotificationBus;
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// RectPoints inline methods
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+inline UiTransformInterface::RectPoints::RectPoints()
+{
+}
+
+inline UiTransformInterface::RectPoints::RectPoints(float left, float right, float top, float bottom)
+{
+    SetAxisAligned(left, right, top, bottom);
+}
+
+inline AZ::Vector2& UiTransformInterface::RectPoints::TopLeft()
+{
+    return pt[Corner_TopLeft];
+}
+
+inline const AZ::Vector2& UiTransformInterface::RectPoints::TopLeft() const
+{
+    return pt[Corner_TopLeft];
+}
+
+inline AZ::Vector2& UiTransformInterface::RectPoints::TopRight()
+{
+    return pt[Corner_TopRight];
+}
+
+inline const AZ::Vector2& UiTransformInterface::RectPoints::TopRight() const
+{
+    return pt[Corner_TopRight];
+}
+
+inline AZ::Vector2& UiTransformInterface::RectPoints::BottomRight()
+{
+    return pt[Corner_BottomRight];
+}
+
+inline const AZ::Vector2& UiTransformInterface::RectPoints::BottomRight() const
+{
+    return pt[Corner_BottomRight];
+}
+
+inline AZ::Vector2& UiTransformInterface::RectPoints::BottomLeft()
+{
+    return pt[Corner_BottomLeft];
+}
+
+inline const AZ::Vector2& UiTransformInterface::RectPoints::BottomLeft() const
+{
+    return pt[Corner_BottomLeft];
+}
+
+inline AZ::Vector2 UiTransformInterface::RectPoints::GetCenter() const
+{
+    return ((GetAxisAlignedTopLeft() + GetAxisAlignedBottomRight()) * 0.5f);
+}
+
+inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedSize() const
+{
+    return AZ::Vector2(BottomRight().GetX() - TopLeft().GetX(), BottomRight().GetY() - TopLeft().GetY());
+}
+
+inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedTopLeft() const
+{
+    return AZ::Vector2(min(min(min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        min(min(min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+}
+
+inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedTopRight() const
+{
+    return AZ::Vector2(max(max(max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        min(min(min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+}
+
+inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedBottomRight() const
+{
+    return AZ::Vector2(max(max(max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        max(max(max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+}
+
+inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedBottomLeft() const
+{
+    return AZ::Vector2(min(min(min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        max(max(max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+}
+
+inline void UiTransformInterface::RectPoints::SetAxisAligned(float left, float right, float top, float bottom)
+{
+    pt[Corner_TopLeft] = AZ::Vector2(left, top);
+    pt[Corner_TopRight] = AZ::Vector2(right, top);
+    pt[Corner_BottomRight] = AZ::Vector2(right, bottom);
+    pt[Corner_BottomLeft] = AZ::Vector2(left, bottom);
+}
+
+inline UiTransformInterface::RectPoints UiTransformInterface::RectPoints::Transform(AZ::Matrix4x4& transform) const
+{
+    RectPoints result;
+    for (int i = 0; i < Corner_Count; ++i)
+    {
+        AZ::Vector3 point3(pt[i].GetX(), pt[i].GetY(), 0.0f);
+        point3 = transform * point3;
+        result.pt[i] = AZ::Vector2(point3.GetX(), point3.GetY());
+    }
+    return result;
+}
+
+inline UiTransformInterface::RectPoints UiTransformInterface::RectPoints::operator-(const RectPoints& rhs) const
+{
+    RectPoints result(*this);
+    for (int i = 0; i < Corner_Count; ++i)
+    {
+        result.pt[i] -= rhs.pt[i];
+    }
+    return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Rect inline methods
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+inline void UiTransformInterface::Rect::Set(float l, float r, float t, float b)
+{
+    left = l;
+    right = r;
+    top = t;
+    bottom = b;
+}
+
+inline float UiTransformInterface::Rect::GetWidth() const
+{
+    return right - left;
+}
+
+inline float UiTransformInterface::Rect::GetHeight() const
+{
+    return bottom - top;
+}
+
+inline float UiTransformInterface::Rect::GetCenterX()
+{
+    return (left + right) * 0.5f;
+}
+
+inline float UiTransformInterface::Rect::GetCenterY()
+{
+    return (top + bottom) * 0.5f;
+}
+
+inline AZ::Vector2 UiTransformInterface::Rect::GetSize() const
+{
+    return AZ::Vector2(GetWidth(), GetHeight());
+}
+
+inline AZ::Vector2 UiTransformInterface::Rect::GetCenter()
+{
+    return AZ::Vector2(GetCenterX(), GetCenterY());
+}
+
+inline void UiTransformInterface::Rect::MoveBy(AZ::Vector2 offset)
+{
+    left += offset.GetX();
+    right += offset.GetX();
+    top += offset.GetY();
+    bottom += offset.GetY();
+}
+
+inline UiTransformInterface::RectPoints UiTransformInterface::Rect::GetPoints()
+{
+    return UiTransformInterface::RectPoints(left, right, top, bottom);
+}
+
+inline bool UiTransformInterface::Rect::operator==(const Rect& rhs) const
+{
+    return left == rhs.left
+            && right == rhs.right
+            && top == rhs.top
+            && bottom == rhs.bottom;
+}
+
+inline bool UiTransformInterface::Rect::operator!=(const Rect& rhs) const
+{
+    return !(*this == rhs);
+}
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiVisualBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiVisualBus.h
new file mode 100644
index 0000000000..22c9a37bf1
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiVisualBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <LyShine/Bus/UiImageBus.h>
+#include <AzCore/Math/Color.h>
+#include <IFont.h>
+
+// Forward declarations
+class ISprite;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+class UiVisualInterface
+    : public AZ::ComponentBus
+{
+public: // member functions
+
+    virtual ~UiVisualInterface() {}
+
+    //! Reset the overrides, used when setting interactable states
+    virtual void ResetOverrides() = 0;
+
+    //! Set the override color, used for interactable states
+    virtual void SetOverrideColor(const AZ::Color& color) = 0;
+
+    //! Set the override alpha, used for interactable states
+    virtual void SetOverrideAlpha(float alpha) = 0;
+
+    //! Set the override sprite, if this visual component uses a sprite this will override it
+    //! \param sprite   If null the sprite on the visual component will not be overridden
+    //! \param cellIndex This value will be ignored if the given sprite isn't a sprite-sheet spritetype.
+    virtual void SetOverrideSprite([[maybe_unused]] ISprite* sprite, [[maybe_unused]] AZ::u32 cellIndex) {};
+
+    //! Set the override font, if this visual component uses a font this will override it
+    //! \param font   If null the font on the visual component will not be overridden
+    virtual void SetOverrideFont(FontFamilyPtr fontFamily) {};
+
+    //! Set the override font effect, if this visual component uses a font this will override it
+    virtual void SetOverrideFontEffect([[maybe_unused]] unsigned int fontEffectIndex) {};
+
+public: // static member data
+
+    //! Only one component on a entity can implement the events
+    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+};
+
+typedef AZ::EBus<UiVisualInterface> UiVisualBus;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h b/Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h
new file mode 100644
index 0000000000..6f77265d47
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasOnMeshBus.h
@@ -0,0 +1,38 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzFramework/Input/Channels/InputChannel.h>
+#include <Cry_Math.h>
+
+struct ray_hit;
+
+namespace AzFramework
+{
+    namespace RenderGeometry
+    {
+        struct RayResult;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// UiCanvasOnMeshBus
+class UiCanvasOnMeshInterface
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiCanvasOnMeshInterface() {}
+
+
+    //! Convert the input ray collision into a canvas space position and pass the event and that position
+    //! to the UI canvas to handle as a positional input event
+    //! \return true if the event was handled
+    virtual bool ProcessHitInputEvent(const AzFramework::InputChannel::Snapshot& inputSnapshot, const AzFramework::RenderGeometry::RayResult& rayResult) = 0;
+};
+
+using UiCanvasOnMeshBus = AZ::EBus<UiCanvasOnMeshInterface>;
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h b/Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasRefBus.h
new file mode 100644
index 0000000000..9086ced09c
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/Bus/World/UiCanvasRefBus.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/Component/ComponentBus.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! UiCanvasRefBus
+//! Allows a reference to a UI Canvas entity (which is loaded from a .uicanvas asset file) to 
+//! associated with a component entity in the level.
+//! This is used for convenience by flow graph nodes and also for supprting rendering UI
+//! canvases in the 3D world on a component entity.
+class UiCanvasRefInterface
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiCanvasRefInterface() {}
+
+    //! Get the UI canvas associated with this entity
+    virtual AZ::EntityId GetCanvas() = 0;
+};
+
+using UiCanvasRefBus = AZ::EBus<UiCanvasRefInterface>;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! UiCanvasRefNotificationBus
+//! Clients can connect to this bus to receive notifications of when the canvas reference
+//! in a UiCanvasRef changes to a different canvas
+class UiCanvasRefNotifications
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiCanvasRefNotifications() {}
+
+    //! Called when the canvas referenced by a canvas ref component changes
+    //! This can happen through a load, unload or set
+    virtual void OnCanvasRefChanged([[maybe_unused]] AZ::EntityId uiCanvasRefEntity, [[maybe_unused]] AZ::EntityId uiCanvasEntity) {}
+};
+
+using UiCanvasRefNotificationBus = AZ::EBus<UiCanvasRefNotifications>;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! UiCanvasAssetRefBus
+//! Allows loading and unloading of a UI canvas asset using a pathname stored in a component on
+//! an entity in the level.
+class UiCanvasAssetRefInterface
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiCanvasAssetRefInterface() {}
+
+    //! Get the canvas pathname. This is the pathname of the canvas that this component
+    //! will load (either on activate or when told to load by the LoadCanvas method)
+    //! The Canvas pathname can be empty and the associated canvas can be set via SetCanvas
+    virtual AZStd::string GetCanvasPathname() = 0;
+
+    //! Set the canvas pathname
+    virtual void SetCanvasPathname(const AZStd::string& pathname) = 0;
+
+    //! Get the flag indicating whether this component will automatically load the canvas
+    virtual bool GetIsAutoLoad() = 0;
+
+    //! Set the flag indicating whether this component will automatically load the canvas
+    virtual void SetIsAutoLoad(bool isAutoLoad) = 0;
+
+    //! Get the flag indicating whether the canvas should be loaded in a disabled state
+    virtual bool GetShouldLoadDisabled() = 0;
+
+    //! Set the flag indicating whether the canvas should be loaded in a disabled state
+    virtual void SetShouldLoadDisabled(bool shouldLoadDisabled) = 0;
+
+    //! Load the UI canvas using the stored asset ref
+    virtual AZ::EntityId LoadCanvas() = 0;
+
+    //! Unload the UI canvas using the stored asset ref (if it is owned by this component)
+    virtual void UnloadCanvas() = 0;
+};
+
+using UiCanvasAssetRefBus = AZ::EBus<UiCanvasAssetRefInterface>;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! UiCanvasAssetRefNotificationBus
+//! Clients can connect to this bus to receive notifications of when a canvas is loaded into
+//! a canvas ref component on an entity
+class UiCanvasAssetRefNotifications
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiCanvasAssetRefNotifications() {}
+
+    //! Called when the canvas ref loads a UI canvas
+    virtual void OnCanvasLoadedIntoEntity([[maybe_unused]] AZ::EntityId uiCanvasEntity) {}
+};
+
+using UiCanvasAssetRefNotificationBus = AZ::EBus<UiCanvasAssetRefNotifications>;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! UiCanvasProxyRefBus
+//! Allows an entity in a level to share a reference to a UI canvas that was loaded into another
+//! UiCanvasRef.
+//! This bus is only needed to allow two entities in the world to use the same instance of a
+//! UI canvas asset.
+class UiCanvasProxyRefInterface
+    : public AZ::ComponentBus
+{
+public:
+    virtual ~UiCanvasProxyRefInterface() {}
+
+    //! Set the entity that is managing the UI canvas for this proxy
+    //! This will cause the OnCanvasRefChanged event to be sent to any UiCanvasRefNotifications
+    virtual void SetCanvasRefEntity(AZ::EntityId canvasAssetRefEntity) = 0;
+};
+
+using UiCanvasProxyRefBus = AZ::EBus<UiCanvasProxyRefInterface>;
+
diff --git a/Code/Legacy/CryCommon/LyShine/IDraw2d.h b/Code/Legacy/CryCommon/LyShine/IDraw2d.h
new file mode 100644
index 0000000000..c45f7d1000
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/IDraw2d.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/Math/Color.h>
+
+// Forward declarations
+struct IFFont;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Class for 2D drawing in screen space
+//
+//! The IDraw2d interface allows drawing images and text in 2D.
+//! Positions and sizes are specified in pixels in the current 2D viewport.
+//! The BeginDraw2d method should be called before calling the Draw methods to enter 2D mode
+//! and the EndDraw2d method should be called after calling the Draw methods to exit 2D mode.
+//! There is a helper class Draw2dHelper that encapsulates this in its constructor and destructor.
+class IDraw2d
+{
+public: // types
+
+    //! Horizontal alignment can be used for both text and image drawing
+    enum class HAlign
+    {
+        Left,
+        Center,
+        Right,
+    };
+
+    //! Vertical alignment can be used for both text and image drawing
+    enum class VAlign
+    {
+        Top,
+        Center,
+        Bottom,
+    };
+
+    //! Used for specifying how to round positions to an exact pixel position for pixel-perfect rendering
+    enum class Rounding
+    {
+        None,
+        Nearest,
+        Down,
+        Up
+    };
+
+    enum
+    {
+        //! Limit imposed by FFont. This is the max number of characters including the null terminator.
+        MAX_TEXT_STRING_LENGTH = 1024,
+    };
+
+    enum : int
+    {
+        //! Constant that indicates the built-in default value should be used
+        UseDefault = -1
+    };
+
+    //! Struct used to pass additional image options.
+    //
+    //! If this is not passed then the defaults below are used
+    struct ImageOptions
+    {
+        int         blendMode;      //!< default is GS_BLSRC_SRCALPHA|GS_BLDST_ONEMINUSSRCALPHA
+        AZ::Vector3 color;          //!< default is (1,1,1)
+        Rounding    pixelRounding;  //!< default is Rounding::Nearest
+        int         baseState;      //!< Additional flags for SetState. Default is GS_NODEPTHTEST
+    };
+
+    //! Struct used to pass additional text options - mostly ones that do not change from call to call.
+    //
+    //! If this is not passed then the defaults below are used
+    struct TextOptions
+    {
+        AZStd::string   fontName;               //!< default is "default"
+        unsigned int    effectIndex;            //!< default is 0
+        AZ::Vector3     color;                  //!< default is (1,1,1)
+        HAlign          horizontalAlignment;    //!< default is HAlign::Left
+        VAlign          verticalAlignment;      //!< default is VAlign::Top
+        AZ::Vector2     dropShadowOffset;       //!< default is (0,0), zero offset means no drop shadow is drawn
+        AZ::Color       dropShadowColor;        //!< default is (0,0,0,0), zero alpha means no drop shadow is drawn
+        float           rotation;               //!< default is 0
+        int             baseState;              //!< Additional flags for SetState. Default is GS_NODEPTHTEST
+    };
+
+    //! Used to pass in arrays of vertices (e.g. to DrawQuad)
+    struct VertexPosColUV
+    {
+        VertexPosColUV(){}
+        VertexPosColUV(const AZ::Vector2& inPos, const AZ::Color& inColor, const AZ::Vector2& inUV)
+        {
+            position = inPos;
+            color = inColor;
+            uv = inUV;
+        }
+
+        AZ::Vector2         position;   //!< 2D position of vertex
+        AZ::Color           color;      //!< Float color
+        AZ::Vector2         uv;         //!< Texture coordinate
+    };
+
+public: // member functions
+
+    //! Implement virtual destructor just for safety.
+    virtual ~IDraw2d() {}
+};
diff --git a/Code/Legacy/CryCommon/LyShine/ILyShine.h b/Code/Legacy/CryCommon/LyShine/ILyShine.h
new file mode 100644
index 0000000000..84c61d561a
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/ILyShine.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Math/Vector2.h>
+#include <LyShine/UiBase.h>
+
+class IDraw2d;
+class ISprite;
+struct IUiAnimationSystem;
+class UiEntityContext;
+
+// The following ifdef block is the standard way of creating macros which make exporting
+// from a DLL simpler. All files within this DLL are compiled with the LYSHINE_EXPORTS
+// symbol defined in the StdAfx.h. this symbol should not be defined on any project
+// that uses this DLL. This way any other project whose source files include this file see
+// LYSHINE_API functions as being imported from a DLL, whereas this DLL sees symbols
+// defined with this macro as being exported.
+#ifdef LYSHINE_EXPORTS
+    #define LYSHINE_API DLL_EXPORT
+#else
+    #define LYSHINE_API DLL_IMPORT
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! The ILyShine interface provides access to the other interfaces provided by the UI module
+class ILyShine
+{
+public:
+    virtual ~ILyShine(){}
+
+    //! Delete this object
+    virtual void Release() = 0;
+
+    //! Gets the IDraw2d interface
+    virtual IDraw2d* GetDraw2d() = 0;
+
+    //! Create an empty UI Canvas (in game)
+    //
+    //! The system keeps track of all the loaded canvases and unloads them on game exit.
+    virtual AZ::EntityId CreateCanvas() = 0;
+
+    //! Load a UI Canvas from in-game
+    virtual AZ::EntityId LoadCanvas(const string& assetIdPathname) = 0;
+
+    //! Create an empty UI Canvas (for the UI editor)
+    //
+    //! The editor keeps track of the canvases it has open.
+    virtual AZ::EntityId CreateCanvasInEditor(UiEntityContext* entityContext) = 0;
+
+    //! Load a UI Canvas from the UI editor
+    virtual AZ::EntityId LoadCanvasInEditor(const string& assetIdPathname, const string& sourceAssetPathname, UiEntityContext* entityContext) = 0;
+
+    //! Reload a UI Canvas from xml. For use in the editor for the undo system only
+    virtual AZ::EntityId ReloadCanvasFromXml(const AZStd::string& xmlString, UiEntityContext* entityContext) = 0;
+
+    //! Get a loaded canvas by CanvasId
+    //! NOTE: this only searches canvases loaded in the game (not the editor)
+    virtual AZ::EntityId FindCanvasById(LyShine::CanvasId id) = 0;
+
+    //! Get a loaded canvas by path name
+    //! NOTE: this only searches canvases loaded in the game (not the editor)
+    virtual AZ::EntityId FindLoadedCanvasByPathName(const string& assetIdPathname) = 0;
+
+    //! Release a canvas from use either in-game or in editor, destroy UI Canvas if no longer used in either
+    virtual void ReleaseCanvas(AZ::EntityId canvas, bool forEditor = false) = 0;
+
+    //! Queue a canvas for release on the next tick (used in game mode)
+    virtual void ReleaseCanvasDeferred(AZ::EntityId canvas) = 0;
+
+    //! Load a sprite object.
+    virtual ISprite* LoadSprite(const string& pathname) = 0;
+
+    //! Create a sprite that references the specified render target
+    virtual ISprite* CreateSprite(const string& renderTargetName) = 0;
+
+    //! Check if a sprite's texture asset exists. The .sprite sidecar file is optional and is not checked
+    virtual bool DoesSpriteTextureAssetExist(const AZStd::string& pathname) = 0;
+
+    //! Perform post-initialization (script system will be available)
+    virtual void PostInit() = 0;
+
+    //! Set the current viewport size, this should be called before Update and Render are called
+    virtual void SetViewportSize(AZ::Vector2 viewportSize) = 0;
+
+    //! Update UI elements
+    //! \param deltaTimeInSeconds the amount of time in seconds since the last call to this function
+    virtual void Update(float deltaTimeInSeconds) = 0;
+
+    //! Render 2D and UI elements that should be rendered at end of frame
+    virtual void Render() = 0;
+
+    //! Execute events that were queued during a canvas update or input event handler
+    virtual void ExecuteQueuedEvents() = 0;
+
+    //! Reset the system (this happens at end of running game in Editor for example)
+    virtual void Reset() = 0;
+
+    //! Unload canvases that should be unloaded when a level is unloaded
+    virtual void OnLevelUnload() = 0;
+
+    //! Called when a load screen is finished displaying (when a level load is complete).
+    //! Used to mark all render graphs dirty in case the loaded canvases were already rendered before their textures
+    //! were done loading. This happens when a load screen is being rendered during a level load. When other canvases
+    //! associated with the level are loaded, they also get rendered by the UiLoadScreenComponent, but their texture
+    //! loading is delayed until further down the level load process. Once a canvas is rendered, its render graph's
+    //! dirty flag is cleared, so the render graph needs to be marked dirty again after the textures are loaded
+    virtual void OnLoadScreenUnloaded() = 0;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LYSHINE_API ILyShine* CreateLyShineInterface(ISystem* system);
+
+#ifdef __cplusplus
+};
+#endif
+
diff --git a/Code/Legacy/CryCommon/LyShine/IRenderGraph.h b/Code/Legacy/CryCommon/LyShine/IRenderGraph.h
new file mode 100644
index 0000000000..a16890a1c8
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/IRenderGraph.h
@@ -0,0 +1,87 @@
+/*
+ * 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 <IRenderer.h>
+#include <LyShine/UiBase.h>
+
+namespace AZ
+{
+    class Color;
+    class Vector2;
+}
+
+namespace LyShine
+{
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // UI visual components use this interface to add primitives to the render graph, which is how the
+    // UI gets rendered.
+    // There is one render graph per UI canvas. The render graph (like a display list) is rebuilt when
+    // any visual change occurs on the canvas.
+    class IRenderGraph
+    {
+    public:
+
+        //! Virtual destructor
+        virtual ~IRenderGraph() {}
+
+        //---- Functions for creating and adding primitives to the render graph ----
+
+        //! Begin the setup of a mask render node, primitives added between this call and StartChildrenForMask define the mask
+        virtual void BeginMask(bool isMaskingEnabled, bool useAlphaTest, bool drawBehind, bool drawInFront) = 0;
+
+        //! Start defining the children (masked primitives) of a mask
+        virtual void StartChildrenForMask() = 0;
+
+        //! End the setup of a mask render node, this marks the end of adding child primitives
+        virtual void EndMask() = 0;
+
+        //! Begin rendering to a texture
+        virtual void BeginRenderToTexture(int renderTargetHandle, SDepthTexture* renderTargetDepthSurface,
+            const AZ::Vector2& viewportTopLeft, const AZ::Vector2& viewportSize, const AZ::Color& clearColor) = 0;
+
+        //! End rendering to a texture
+        virtual void EndRenderToTexture() = 0;
+
+        //! Add an indexed triangle list primitive to the render graph with given render state
+        virtual void AddPrimitive(IRenderer::DynUiPrimitive* primitive, ITexture* texture,
+            bool isClampTextureMode, bool isTextureSRGB, bool isTexturePremultipliedAlpha, BlendMode blendMode) = 0;
+        
+        //! Add an indexed triangle list primitive to the render graph which will use maskTexture as an alpha (gradient) mask
+        virtual void AddAlphaMaskPrimitive(IRenderer::DynUiPrimitive* primitive,
+            ITexture* texture, ITexture* maskTexture,
+            bool isClampTextureMode, bool isTextureSRGB, bool isTexturePremultipliedAlpha, BlendMode blendMode) = 0;
+        
+        //! Get a dynamic quad primitive that can be added as an image primitive to the render graph
+        //! The graph handles the allocation of this DynUiPrimitive and deletes it when the graph is reset
+        //! This can be used if the UI component doesn't want to own the storage of the primitive. Used infrequently,
+        //! e.g. for the selection rect on a text component.
+        virtual IRenderer::DynUiPrimitive* GetDynamicQuadPrimitive(const AZ::Vector2* positions, uint32 packedColor) = 0;
+
+        //---- Functions for supporting masking (used during creation of the graph, not rendering ) ----
+
+        //! Get flag that indicates we are rendering into a mask. Used to avoid masks on child mask elements.
+        virtual bool IsRenderingToMask() const = 0;
+
+        //! Set flag that we are rendering into a mask. Used to avoid masks on child mask elements.
+        virtual void SetIsRenderingToMask(bool isRenderingToMask) = 0;
+
+        //---- Functions for supporting fading  (used during creation of the graph, not rendering ) ----
+
+        //! Push an alpha fade, this is multiplied with any existing alpha fade from parents
+        virtual void PushAlphaFade(float alphaFadeValue) = 0;
+
+        //! Push a new alpha fade value, this replaces any existing alpha fade
+        virtual void PushOverrideAlphaFade(float alphaFadeValue) = 0;
+
+        //! Pop an alpha fade off the stack
+        virtual void PopAlphaFade() = 0;
+
+        //! Get the current alpha fade value
+        virtual float GetAlphaFade() const = 0;
+    };
+}
diff --git a/Code/Legacy/CryCommon/LyShine/ISprite.h b/Code/Legacy/CryCommon/LyShine/ISprite.h
new file mode 100644
index 0000000000..8d456383d3
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/ISprite.h
@@ -0,0 +1,138 @@
+/*
+ * 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 <SerializeFwd.h>
+#include <smartptr.h>
+#include <LyShine/Bus/UiTransformBus.h>
+#include <AzCore/Math/Vector2.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! A sprite is a texture with extra information about how it behaves for 2D drawing
+//! Currently a sprite exists on disk as a side car file next to the texture file.
+class ISprite
+    : public _i_reference_target<int>
+{
+public: // types
+
+    // The borders define the areas of the sprite that stretch
+    // Border's members are always in range 0-1, they are normalized positions within the texture bounds
+    struct Borders
+    {
+        Borders()
+            : m_left(0.0f)
+            , m_right(1.0f)
+            , m_top(0.0f)
+            , m_bottom(1.0f) {}
+
+        Borders(float left, float right, float top, float bottom)
+            : m_left(left)
+            , m_right(right)
+            , m_top(top)
+            , m_bottom(bottom) {}
+
+        float   m_left;
+        float   m_right;
+        float   m_top;
+        float   m_bottom;
+    };
+
+    //! \brief Defines the UV-extents of a particular "cell" in a sprite-sheet.
+    //! 9-slice information for the cell is also stored.
+    struct SpriteSheetCell
+    {
+        AZStd::string alias;
+        UiTransformInterface::RectPoints uvCellCoords;
+        Borders borders;
+    };
+
+    using SpriteSheetCellContainer = AZStd::vector<SpriteSheetCell>;
+
+public: // member functions
+
+    //! Deleting a sprite will release its texture
+    virtual ~ISprite() {}
+
+    //! Get the pathname of this sprite
+    virtual const string& GetPathname() const = 0;
+
+    //! Get the pathname of the texture of this sprite
+    virtual const string& GetTexturePathname() const = 0;
+
+    //! Get the borders of this sprite
+    virtual Borders GetBorders() const = 0;
+
+    //! Set the borders of this sprite
+    virtual void SetBorders(Borders borders) = 0;
+
+    //! Set the borders of a given cell within the sprite-sheet.
+    virtual void SetCellBorders(int cellIndex, Borders borders) = 0;
+
+    //! Serialize this object for save/load
+    virtual void Serialize(TSerialize ser) = 0;
+
+    //! Save this sprite data to disk
+    virtual bool SaveToXml(const string& pathname) = 0;
+
+    //! Test if this sprite has any borders
+    virtual bool AreBordersZeroWidth() const = 0;
+
+    //! Tests if the sprite-sheet cell has borders
+    virtual bool AreCellBordersZeroWidth(int cellIndex) const = 0;
+
+    //! Get the dimensions of the sprite
+    virtual AZ::Vector2 GetSize() = 0;
+
+    //! Gets the dimensions of a specific cell texture within a sprite-sheet
+    virtual AZ::Vector2 GetCellSize(int cellIndex) = 0;
+
+    //! Gets cell info for each of the cells within the sprite-sheet.
+    virtual const SpriteSheetCellContainer& GetSpriteSheetCells() const = 0;
+
+    //! Sets the sprite's sprite-sheet cells.
+    virtual void SetSpriteSheetCells(const SpriteSheetCellContainer& cells) = 0;
+
+    //! Removes all sprite-sheet cell info for this sprite.
+    virtual void ClearSpriteSheetCells() = 0;
+
+    //! Defines a new SpriteSheetCell for this sprite.
+    virtual void AddSpriteSheetCell(const SpriteSheetCell& spriteSheetCell) = 0;
+
+    //! Gets the dimensions of a specific cell (in a sprite-sheet) in UV coords (UV range).
+    virtual AZ::Vector2 GetCellUvSize(int cellIndex) const = 0;
+
+    //! Gets the UV coords associated for a given cell in a sprite-sheet.
+    virtual UiTransformInterface::RectPoints GetCellUvCoords(int cellIndex) const = 0;
+
+    //! Gets the UV coords associated for a given cell in a sprite-sheet in a way that ignores texture atlases
+    virtual UiTransformInterface::RectPoints GetSourceCellUvCoords(int cellIndex) const = 0;
+
+    //! Gets the sliced border info for a given cell within a sprite-sheet.
+    //!
+    //! The returned UV borders are in "cell space" relative to the given indexed spell. For example,
+    //! a top-left border of (0.5, 0.5) would be the center of the given cell.
+    virtual Borders GetCellUvBorders(int cellIndex) const = 0;
+
+    //! Gets the sliced border UV coordinates in texture space for a given cell within a sprite-sheet.
+    //!
+    //! The returned UV border coordinates are in texture space. For example, a top-left border of (0.5, 0.5) 
+    //! would be the center of the sprite-sheet.
+    virtual Borders GetTextureSpaceCellUvBorders(int cellIndex) const = 0;
+
+    //! Gets the string alias associated with the given cell in a sprite-sheet.
+    virtual const AZStd::string& GetCellAlias(int cellIndex) const = 0;
+
+    //! Sets the string alias associated with the given cell in a sprite-sheet.
+    virtual void SetCellAlias(int cellIndex, const AZStd::string& cellAlias) = 0;
+
+    //! Returns the sprite-sheet cell index that corresponds to the given string alias.
+    virtual int GetCellIndexFromAlias(const AZStd::string& cellAlias) const = 0;
+    
+    //! Returns true if this sprite is configured as a sprite-sheet, false otherwise
+    virtual bool IsSpriteSheet() const = 0;
+};
+
diff --git a/Code/Legacy/CryCommon/LyShine/UiAssetTypes.h b/Code/Legacy/CryCommon/LyShine/UiAssetTypes.h
new file mode 100644
index 0000000000..1cfca97562
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/UiAssetTypes.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/RTTI/TypeInfo.h>
+#include <AzFramework/Asset/SimpleAsset.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+namespace LyShine
+{
+    class FontAsset
+    {
+    public:
+        AZ_TYPE_INFO(FontAsset, "{57767D37-0EBE-43BE-8F60-AB36D2056EF8}")
+        static const char* GetFileFilter()
+        {
+            return "*.xml;*.font;*.fontfamily";
+        }
+    };
+
+    class CanvasAsset
+    {
+    public:
+        AZ_TYPE_INFO(CanvasAsset, "{E48DDAC8-1F1E-4183-AAAB-37424BCC254B}")
+        static const char* GetFileFilter()
+        {
+            return "*.uicanvas";
+        }
+    };
+}
diff --git a/Code/Legacy/CryCommon/LyShine/UiBase.h b/Code/Legacy/CryCommon/LyShine/UiBase.h
new file mode 100644
index 0000000000..26619291e0
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/UiBase.h
@@ -0,0 +1,69 @@
+/*
+ * 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 <platform.h>
+#include <algorithm>
+#include <Cry_Math.h>
+#include <Cry_Color.h>
+#include <ISystem.h>
+
+#include <AzCore/std/string/string.h>
+#include <AzCore/Component/Entity.h>
+#include <AzCore/std/containers/unordered_map.h>
+
+// This is a workaround for AZCore including WinUser.h which defines DrawText to be DrawTextA
+#ifdef DrawText
+    #undef DrawText
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Common types used across the LyShine UI system
+namespace LyShine
+{
+    //! used for UI element names and canvas names, should be the same as the AZ::Entity name type
+    typedef AZStd::string NameType;
+
+    //! Used for pathnames for UI canvas and prefab files
+    typedef AZStd::string PathnameType;
+
+    //! USed for our 32-bit id's for canvases and elements. Only used so FlowGraph can reference these things
+    //! These should go away once FlowGraph can used AZ::EntityIds
+    typedef unsigned int CanvasId;
+    typedef unsigned int ElementId;
+
+    //! Used for UI action names
+    typedef AZStd::string ActionName;
+
+    //! Used for test strings in  UI text elements
+    typedef AZStd::string StringType;    // not yet decided if we should use wchar_t or UTF8
+
+    //! Used for passing lists of entities
+    typedef DynArray<AZ::Entity*> EntityArray;
+
+    enum class BlendMode
+    {
+        Normal,     //!< interpolate from dest color to source color according to source alpha
+        Add,        //!< source color * source alpha is added to dest color (Linear Dodge)
+        Screen,     //!< as close as we can get to Photoshop Screen
+        Darken,     //!< like Photoshop darken
+        Lighten,    //!< like Photoshop lighten
+    };
+
+    // used to map old EntityId's to new EntityId's when generating new ids for a paste or prefab
+    typedef AZStd::unordered_map<AZ::EntityId, AZ::EntityId> EntityIdMap;
+};
+
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(ColorF, "{63782551-A309-463B-A301-3A360800DF1E}");
+    AZ_TYPE_INFO_SPECIALIZE(ColorB, "{6F0CC2C0-0CC6-4DBF-9297-B043F270E6A4}");
+    AZ_TYPE_INFO_SPECIALIZE(Vec4, "{CAC9510C-8C00-41D4-BC4D-2C6A8136EB30}");
+    AZ_TYPE_INFO_SPECIALIZE(CryStringT<char>, "{835199FB-292B-4DB3-BC7C-366E356300FA}");
+} // namespace AZ
+
diff --git a/Code/Legacy/CryCommon/LyShine/UiComponentTypes.h b/Code/Legacy/CryCommon/LyShine/UiComponentTypes.h
new file mode 100644
index 0000000000..f5b78ffccd
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/UiComponentTypes.h
@@ -0,0 +1,51 @@
+/*
+ * 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
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Common types used across the LyShine UI system
+namespace LyShine
+{
+    // Uuid strings for all component types define by LyShine.
+    // This can be used to create components at runtime. E.g.:
+    //     entity->CreateComponent(LyShine::UiTransform2dComponentUuid);
+    const char* const UiButtonComponentUuid =           "{7329DFE8-0F3C-4629-B395-78B2CF646B96}";
+    const char* const UiCanvasComponentUuid =           "{50B8CF6C-B19A-4D86-AFE9-96EFB820D422}";
+    const char* const UiCheckboxComponentUuid =         "{68D62281-B360-4426-AACA-E8BDE8BFEB3A}";
+    const char* const UiDraggableComponentUuid =        "{C96B1EEF-033A-479B-829B-ED3555D0F33A}";
+    const char* const UiDropTargetComponentUuid =       "{E4B8ACE0-FCE7-42D8-9836-942F910168B4}";
+    const char* const UiDropdownComponentUuid =         "{BFC4D5A3-2F7C-4079-B19C-C2A06E93F343}";
+    const char* const UiDropdownOptionComponentUuid =   "{554E16E4-CBA1-4E57-B326-9731AA963BAA}";
+    const char* const UiDynamicLayoutComponentUuid =    "{690BEC14-3642-4247-BD96-FE414CCB7DE7}";
+    const char* const UiDynamicScrollBoxComponentUuid = "{6982C200-4D32-43CC-A7F6-F54FA50FCFF5}";
+    const char* const UiElementComponentUuid =          "{4A97D63E-CE7A-45B6-AAE4-102DB4334688}";
+    const char* const UiFaderComponentUuid =            "{CD01FF77-2249-4ED8-BFFB-33A66A47E17C}";
+    const char* const UiFlipbookAnimationComponentUuid ="{AACCFFA1-B694-4F8B-A289-391A56404E0C}";
+    const char* const UiImageComponentUuid =            "{BDBEFD23-DBB4-4726-A32D-4FEAC24E51F6}";
+    const char* const UiImageSequenceComponentUuid =    "{BFAC7909-3A56-4980-AF7C-261A99D6371B}";
+    const char* const UiLayoutColumnComponentUuid =     "{4BC2E786-360B-4426-8D9C-9B254C5EA21F}";
+    const char* const UiLayoutCellComponentUuid =       "{A0568E58-4382-47F8-8B88-77C64B99AC80}";
+    const char* const UiLayoutFitterComponentUuid =     "{96C55390-9D03-4C47-BB0D-17D3BD5219E3}";
+    const char* const UiLayoutGridComponentUuid =       "{ADDA3AE5-B9AB-44B7-A462-8B89B398A837}";
+    const char* const UiLayoutRowComponentUuid =        "{7B2820C4-7FC7-4F02-B777-6727EB4BAC13}";
+    const char* const UiMarkupButtonComponentUuid =     "{D7EB1706-75E8-4C94-A266-61913F42431B}";
+    const char* const UiMaskComponentUuid =             "{2279AA38-271D-4D4F-A472-E42B984088AC}";
+    const char* const UiParticleEmitterComponentUuid =  "{E8B1288C-CB49-4CAD-B366-AF1B40C47E74}";
+    const char* const UiRadioButtonComponentUuid =      "{773A0F4B-F9F9-4B82-9951-BBD73A737DE4}";
+    const char* const UiRadioButtonGroupComponentUuid = "{F89D5EF2-37C4-4CA7-9AA2-23DC3867EC9D}";
+    const char* const UiScrollBarComponentUuid =        "{6B283F90-3519-47DA-A1DD-65A79CE119CF}";
+    const char* const UiScrollBoxComponentUuid =        "{2F539588-AEAB-4341-A6A6-AF645D129693}";
+    const char* const UiSliderComponentUuid =           "{2913D76B-36A0-45E0-A104-33C668EB612D}";
+    const char* const UiTextComponentUuid =             "{5B3FB2A7-5DC4-4033-A970-001CEC85B6C4}";
+    const char* const UiTextInputComponentUuid =        "{2CB3872B-D2B4-4DDB-B39A-97492310AE11}";
+    const char* const UiTooltipComponentUuid =          "{493EBF89-C299-4722-829D-4DFAB926795B}";
+    const char* const UiTooltipDisplayComponentUuid =   "{18CEE6A7-3CBC-4638-9F4D-87E8D53DDF1A}";
+    const char* const UiTransform2dComponentUuid =      "{2751A5A5-3291-4A4D-9FC0-9CB0EB8D1DE6}";
+
+    // The Uuid of the LyShine system component. Can be used from tools to activate this component.
+    const char* const lyShineSystemComponentUuid =      "{B0C78B8D-1E5B-47D7-95D0-EC69C0513804}";
+};
diff --git a/Code/Legacy/CryCommon/LyShine/UiEntityContext.h b/Code/Legacy/CryCommon/LyShine/UiEntityContext.h
new file mode 100644
index 0000000000..1ec969e912
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/UiEntityContext.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Math/Uuid.h>
+#include <AzCore/Component/Component.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/Slice/SliceComponent.h>
+
+#include <AzFramework/Entity/EntityContext.h>
+#include <AzFramework/Asset/AssetCatalogBus.h>
+
+#include <LyShine/Bus/UiEntityContextBus.h>
+
+namespace AZ
+{
+    class SerializeContext;
+}
+
+namespace AzFramework
+{
+    class EntityContext;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! The UI Entity Context stores the prefab asset for the root slice of a UI canvas
+//! So all of the UI element entities in a canvas are owned indirectly by the context and managed
+//! by the entity context.
+class UiEntityContext
+    : public AzFramework::EntityContext
+    , public UiEntityContextRequestBus::Handler
+{
+public: // member functions
+
+    //! Initialize the entity context and instantiate the root slice
+    virtual void InitUiContext() = 0;
+
+    //! Destroy the Entity Context
+    virtual void DestroyUiContext() = 0;
+
+    //! Saves the context's slice root to the specified buffer. If necessary
+    //! entities undergo conversion for game: editor -> game components.
+    //! \return true if successfully saved. Failure is only possible if serialization data is corrupt.
+    virtual bool SaveToStreamForGame(AZ::IO::GenericStream& stream, AZ::DataStream::StreamType streamType) = 0;
+
+    //! Saves the given canvas entity to the specified buffer. If necessary
+    //! the entity undergoes conversion for game: editor -> game components.
+    //! \return true if successfully saved. Failure is only possible if serialization data is corrupt.
+    //! This is needed because the canvas entity is not part of the root slice. It is here in the entity
+    //! context because that allows us to get to the ToolsFramework functionality.
+    virtual bool SaveCanvasEntityToStreamForGame(AZ::Entity* canvasEntity, AZ::IO::GenericStream& stream, AZ::DataStream::StreamType streamType) = 0;
+};
diff --git a/Code/Legacy/CryCommon/LyShine/UiLayoutCellBase.h b/Code/Legacy/CryCommon/LyShine/UiLayoutCellBase.h
new file mode 100644
index 0000000000..29bb764cc1
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/UiLayoutCellBase.h
@@ -0,0 +1,19 @@
+/*
+ * 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
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//! Common types used across the LyShine UI layout cell system
+namespace LyShine
+{
+    const float UiLayoutCellUnspecifiedSize = -1.0f;
+
+    inline bool IsUiLayoutCellSizeSpecified(float size)
+    {
+        return size >= 0.0f;
+    }
+};
diff --git a/Code/Legacy/CryCommon/LyShine/UiSerializeHelpers.h b/Code/Legacy/CryCommon/LyShine/UiSerializeHelpers.h
new file mode 100644
index 0000000000..e203f6fb54
--- /dev/null
+++ b/Code/Legacy/CryCommon/LyShine/UiSerializeHelpers.h
@@ -0,0 +1,670 @@
+/*
+ * 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/Math/Crc.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/Math/Color.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Math/Sfmt.h>
+#include <AzCore/Component/Entity.h>
+
+#include <LyShine/UiAssetTypes.h>
+#include <LyShine/UiBase.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+namespace LyShine
+{
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert a CryString field to an AZStd::String
+    // Inline to avoid DLL linkage issues
+    inline bool ConvertSubElementFromCryStringToAzString(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* subElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(subElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            CryStringT<char> oldData;
+
+            if (!elementNode.GetData(oldData))
+            {
+                // Error, old subElement was not a string or not valid
+                AZ_Error("Serialization", false, "Cannot get string data for element %s.", subElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add a new element for the new data.
+            int newElementIndex = classElement.AddElement<AZStd::string>(context, subElementName);
+            if (newElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element %s", subElementName);
+                return false;
+            }
+
+            AZStd::string newData(oldData.c_str());
+            classElement.GetSubElement(newElementIndex).SetData(context, newData);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert a CryString field to a char
+    // Inline to avoid DLL linkage issues
+    inline bool ConvertSubElementFromCryStringToChar(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* subElementName,
+        char defaultValue)
+    {
+        int index = classElement.FindElement(AZ_CRC(subElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            CryStringT<char> oldData;
+
+            if (!elementNode.GetData(oldData))
+            {
+                // Error, old subElement was not a CryString
+                AZ_Error("Serialization", false, "Element %s is not a CryString.", subElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add a new element for the new data.
+            int newElementIndex = classElement.AddElement<char>(context, subElementName);
+            if (newElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element %s", subElementName);
+                return false;
+            }
+
+            char newData = (oldData.empty()) ? defaultValue : oldData[0];
+            classElement.GetSubElement(newElementIndex).SetData(context, newData);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert a CryString field to a simple asset reference
+    // Inline to avoid DLL linkage issues
+    template<typename T>
+    inline bool ConvertSubElementFromCryStringToAssetRef(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* subElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(subElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            CryStringT<char> oldData;
+
+            if (!elementNode.GetData(oldData))
+            {
+                // Error, old subElement was not a CryString
+                AZ_Error("Serialization", false, "Element %s is not a CryString.", subElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add a new element for the new data.
+            int simpleAssetRefIndex = classElement.AddElement<AzFramework::SimpleAssetReference<T> >(context, subElementName);
+            if (simpleAssetRefIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for simpleAssetRefIndex %s", subElementName);
+                return false;
+            }
+
+            // add a sub element for the SimpleAssetReferenceBase within the SimpleAssetReference
+            AZ::SerializeContext::DataElementNode& simpleAssetRefNode = classElement.GetSubElement(simpleAssetRefIndex);
+            int simpleAssetRefBaseIndex = simpleAssetRefNode.AddElement<AzFramework::SimpleAssetReferenceBase>(context, "BaseClass1");
+            if (simpleAssetRefBaseIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element BaseClass1");
+                return false;
+            }
+
+            // add a sub element for the AssetPath within the SimpleAssetReference
+            AZ::SerializeContext::DataElementNode& simpleAssetRefBaseNode = simpleAssetRefNode.GetSubElement(simpleAssetRefBaseIndex);
+            int assetPathElementIndex = simpleAssetRefBaseNode.AddElement<AZStd::string>(context, "AssetPath");
+            if (assetPathElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element AssetPath");
+                return false;
+            }
+
+            AZStd::string newData(oldData.c_str());
+            simpleAssetRefBaseNode.GetSubElement(assetPathElementIndex).SetData(context, newData);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert an AZStd::string field to a simple asset reference
+    // Inline to avoid DLL linkage issues
+    template<typename T>
+    inline bool ConvertSubElementFromAzStringToAssetRef(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* subElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(subElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            AZStd::string oldData;
+
+            if (!elementNode.GetData(oldData))
+            {
+                // Error, old subElement was not a string or not valid
+                AZ_Error("Serialization", false, "Cannot get string data for element %s.", subElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add a new element for the new data.
+            int simpleAssetRefIndex = classElement.AddElement<AzFramework::SimpleAssetReference<T> >(context, subElementName);
+            if (simpleAssetRefIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for simpleAssetRefIndex %s", subElementName);
+                return false;
+            }
+
+            // add a sub element for the SimpleAssetReferenceBase within the SimpleAssetReference
+            AZ::SerializeContext::DataElementNode& simpleAssetRefNode = classElement.GetSubElement(simpleAssetRefIndex);
+            int simpleAssetRefBaseIndex = simpleAssetRefNode.AddElement<AzFramework::SimpleAssetReferenceBase>(context, "BaseClass1");
+            if (simpleAssetRefBaseIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element BaseClass1");
+                return false;
+            }
+
+            // add a sub element for the AssetPath within the SimpleAssetReference
+            AZ::SerializeContext::DataElementNode& simpleAssetRefBaseNode = simpleAssetRefNode.GetSubElement(simpleAssetRefBaseIndex);
+            int assetPathElementIndex = simpleAssetRefBaseNode.AddElement<AZStd::string>(context, "AssetPath");
+            if (assetPathElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element AssetPath");
+                return false;
+            }
+
+            AZStd::string newData(oldData.c_str());
+            simpleAssetRefBaseNode.GetSubElement(assetPathElementIndex).SetData(context, newData);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert a char to a uint32_t
+    // Inline to avoid DLL linkage issues
+    inline bool ConvertSubElementFromCharToUInt32(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* subElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(subElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            char oldData;
+
+            if (!elementNode.GetData(oldData))
+            {
+                // Error, old subElement was not a CryString
+                AZ_Error("Serialization", false, "Element %s is not a char.", subElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add a new element for the new data.
+            int newElementIndex = classElement.AddElement<uint32_t>(context, subElementName);
+            if (newElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element %s", subElementName);
+                return false;
+            }
+
+            uint32_t newData = oldData;
+            classElement.GetSubElement(newElementIndex).SetData(context, newData);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to get the value for a named sub element
+    template<typename T>
+    inline bool GetSubElementValue(
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* elementName, T& value)
+    {
+        int index = classElement.FindElement(AZ_CRC(elementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+            if (!elementNode.GetData(value))
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to make a ColorF out of an RGB color and an alpha
+    inline ColorF MakeColorF(AZ::Vector3 color, float alpha)
+    {
+        return ColorF(color.GetX(), color.GetY(), color.GetZ(), alpha);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to make an AZ::Vector3 from the rgb elements of a ColorF
+    inline AZ::Vector3 MakeColorVector3(ColorF color)
+    {
+        return AZ::Vector3(color.r, color.g, color.b);
+    }
+
+    // Helper function to make an AZ::Color from a ColorF
+    inline AZ::Color MakeColorAZColor(ColorF color)
+    {
+        return AZ::Color(color.r, color.g, color.b, color.a);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert a ColorF field to a Vector3 color and a float
+    // alpha.
+    // Inline to avoid DLL linkage issues
+    inline bool ConvertSubElementFromColorToColorPlusAlpha(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* colorElementName,
+        const char* alphaElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(colorElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            ColorF oldData;
+
+            if (!(GetSubElementValue(elementNode, "r", oldData.r) &&
+                  GetSubElementValue(elementNode, "g", oldData.g) &&
+                  GetSubElementValue(elementNode, "b", oldData.b) &&
+                  GetSubElementValue(elementNode, "a", oldData.a)))
+            {
+                // Error, old subElement was not a ColorF
+                AZ_Error("Serialization", false, "Element %s is not a ColorF.", colorElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add new elements for the new data.
+
+            int newColorElementIndex = classElement.AddElement<AZ::Vector3>(context, colorElementName);
+            if (newColorElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element %s", colorElementName);
+                return false;
+            }
+
+            int newAlphaElementIndex = classElement.AddElement<float>(context, alphaElementName);
+            if (newAlphaElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element %s", alphaElementName);
+                return false;
+            }
+
+            AZ::Vector3 newColorData(oldData.r, oldData.g, oldData.b);
+            classElement.GetSubElement(newColorElementIndex).SetData(context, newColorData);
+
+            float newAlphaData(oldData.a);
+            classElement.GetSubElement(newAlphaElementIndex).SetData(context, newAlphaData);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert a AZ::Vector3 field to a AZ::Color
+    // Inline to avoid DLL linkage issues
+    inline bool ConvertSubElementFromVector3ToAzColor(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* colorElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(colorElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            AZ::Vector3 oldData;
+
+            if (!elementNode.GetData(oldData))
+            {
+                // Error, old subElement was not a Vector3 or not valid
+                AZ_Error("Serialization", false, "Cannot get Vector3 data for element %s.", colorElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add new elements for the new data.
+
+            int newColorElementIndex = classElement.AddElement<AZ::Color>(context, colorElementName);
+            if (newColorElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element %s", colorElementName);
+                return false;
+            }
+
+            AZ::Color newColorData = AZ::Color::CreateFromVector3(oldData);
+            classElement.GetSubElement(newColorElementIndex).SetData(context, newColorData);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert a ColorF field to a AZ::Color
+    // Inline to avoid DLL linkage issues
+    inline bool ConvertSubElementFromColorFToAzColor(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* colorElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(colorElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            ColorF oldData;
+
+            if (!(GetSubElementValue(elementNode, "r", oldData.r) &&
+                  GetSubElementValue(elementNode, "g", oldData.g) &&
+                  GetSubElementValue(elementNode, "b", oldData.b) &&
+                  GetSubElementValue(elementNode, "a", oldData.a)))
+            {
+                // Error, old subElement was not a ColorF
+                AZ_Error("Serialization", false, "Element %s is not a ColorF.", colorElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add new elements for the new data.
+
+            int newColorElementIndex = classElement.AddElement<AZ::Color>(context, colorElementName);
+            if (newColorElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element %s", colorElementName);
+                return false;
+            }
+
+            classElement.GetSubElement(newColorElementIndex).SetData(context, MakeColorAZColor(oldData));
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to convert a Vec2 field to a AZ::Vector2.
+    // Inline to avoid DLL linkage issues
+    inline bool ConvertSubElementFromVec2ToVector2(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* vec2ElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(vec2ElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(index);
+
+            Vec2 oldData;
+
+            if (!(GetSubElementValue(elementNode, "x", oldData.x) &&
+                GetSubElementValue(elementNode, "y", oldData.y)))
+            {
+                // Error, old subElement was not a Vec2
+                AZ_Error("Serialization", false, "Element %s is not a Vec2.", vec2ElementName);
+                return false;
+            }
+
+            // Remove old version.
+            classElement.RemoveElement(index);
+
+            // Add new elements for the new data.
+
+            int newVector2ElementIndex = classElement.AddElement<AZ::Vector2>(context, vec2ElementName);
+            if (newVector2ElementIndex == -1)
+            {
+                // Error adding the new sub element
+                AZ_Error("Serialization", false, "AddElement failed for converted element %s", vec2ElementName);
+                return false;
+            }
+
+            AZ::Vector2 newVector2Data(oldData.x, oldData.y);
+            classElement.GetSubElement(newVector2ElementIndex).SetData(context, newVector2Data);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to move a sub-element from one DataElementNode to another
+    // DataElementNode and rename it
+    inline bool MoveElement(
+        [[maybe_unused]] AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& srcElement,
+        AZ::SerializeContext::DataElementNode& dstElement,
+        const char* srcSubElementName,
+        const char* dstSubElementName)
+    {
+        // find the sub-element (the field we will move)
+        int srcSubElementIndex = srcElement.FindElement(AZ_CRC(srcSubElementName));
+        if (srcSubElementIndex != -1)
+        {
+            // add a copy of the sub-element into the base class
+            AZ::SerializeContext::DataElementNode subElementNode = srcElement.GetSubElement(srcSubElementIndex);
+            subElementNode.SetName(dstSubElementName);
+            dstElement.AddElement(subElementNode);
+
+            // remove the sub-element from its original location
+            srcElement.RemoveElement(srcSubElementIndex);
+        }
+
+        // if the field did not exist then we do not report an error
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to VersionConverter to remove leading forward slashes from asset path
+    inline bool RemoveLeadingForwardSlashesFromAssetPath(
+        AZ::SerializeContext& context,
+        AZ::SerializeContext::DataElementNode& classElement,
+        const char* simpleAssetRefSubElementName)
+    {
+        int index = classElement.FindElement(AZ_CRC(simpleAssetRefSubElementName));
+        if (index != -1)
+        {
+            AZ::SerializeContext::DataElementNode& simpleAssetRefNode = classElement.GetSubElement(index);
+            index = simpleAssetRefNode.FindElement(AZ_CRC("BaseClass1", 0xd4925735));
+
+            if (index != -1)
+            {
+                AZ::SerializeContext::DataElementNode& baseClassNode = simpleAssetRefNode.GetSubElement(index);
+                index = baseClassNode.FindElement(AZ_CRC("AssetPath", 0x2c355179));
+
+                if (index != -1)
+                {
+                    AZ::SerializeContext::DataElementNode& assetPathNode = baseClassNode.GetSubElement(index);
+                    AZStd::string assetPath;
+
+                    if (!assetPathNode.GetData(assetPath))
+                    {
+                        AZ_Error("Serialization", false, "Element AssetPath is not a AZStd::string.");
+                        return false;
+                    }
+
+                    // Count leading forward slashes
+                    int i = 0;
+                    while ((i < assetPath.length()) && (assetPath[i] == '/'))
+                    {
+                        i++;
+                    }
+                    if (i > 0)
+                    {
+                        // Remove leading forward slashes
+                        assetPath.erase(0, i);
+
+                        if (!assetPathNode.SetData(context, assetPath))
+                        {
+                            AZ_Error("Serialization", false, "Unable to set AssetPath data.");
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to find a component with the given UUID in an entity
+    inline AZ::SerializeContext::DataElementNode* FindComponentNode(AZ::SerializeContext::DataElementNode& entityNode, const AZ::Uuid& uuid)
+    {
+        // get the component vector node
+        int componentsIndex = entityNode.FindElement(AZ_CRC("Components", 0xee48f5fd));
+        if (componentsIndex == -1)
+        {
+            return nullptr;
+        }
+        AZ::SerializeContext::DataElementNode& componentsNode = entityNode.GetSubElement(componentsIndex);
+
+        // search the components vector for the first component with the given ID
+        int numComponents = componentsNode.GetNumSubElements();
+        for (int compIndex = 0; compIndex < numComponents; ++compIndex)
+        {
+            AZ::SerializeContext::DataElementNode& componentNode = componentsNode.GetSubElement(compIndex);
+
+            if (componentNode.GetId() == uuid)
+            {
+                return &componentNode;
+            }
+        }
+
+        return nullptr;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to create an EntityId node for a newly created entity node
+    inline bool CreateEntityIdNode(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& entityNode)
+    {
+        // Generate a new EntityId and extract the raw u64
+        AZ::EntityId newEntityId = AZ::Entity::MakeId();
+        AZ::u64 rawId = static_cast<AZ::u64>(newEntityId);
+
+        // Create the EntityId node within this entity
+        int entityIdIndex = entityNode.AddElement<AZ::EntityId>(context, "Id");
+        if (entityIdIndex == -1)
+        {
+            return false;
+        }
+        AZ::SerializeContext::DataElementNode& elementIdNode = entityNode.GetSubElement(entityIdIndex);
+
+        // Create the sub node of the EntityID that actually stores the u64
+        int u64Index = elementIdNode.AddElementWithData(context, "id", rawId);
+        if (u64Index == -1)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Helper function to create the AZ::Component base class for a newly created component
+    inline bool CreateComponentBaseClassNode(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& componentNode)
+    {
+        // Generate a new component ID (using same technique that the AZ::Component uses)
+        AZ::ComponentId compId = AZ::Sfmt::GetInstance().Rand64();
+
+        // Create the base class node within this component node
+        int baseClassIndex = componentNode.AddElement<AZ::Component>(context, "BaseClass1");
+        if (baseClassIndex == -1)
+        {
+            return false;
+        }
+        AZ::SerializeContext::DataElementNode& baseClassNode = componentNode.GetSubElement(baseClassIndex);
+
+        // Create the sub node of the component base class that stores the u64 component id
+        int u64Index = baseClassNode.AddElementWithData(context, "Id", compId);
+        if (u64Index == -1)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+}
diff --git a/Code/Legacy/CryCommon/MTPseudoRandom.cpp b/Code/Legacy/CryCommon/MTPseudoRandom.cpp
new file mode 100644
index 0000000000..e86320860a
--- /dev/null
+++ b/Code/Legacy/CryCommon/MTPseudoRandom.cpp
@@ -0,0 +1,74 @@
+/*
+ * 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 : Marsenne Twister PRNG. See MT.h for more info.
+
+#include "MTPseudoRandom.h"
+// non-inline function definitions and static member definitions cannot
+// reside in header file because of the risk of multiple declarations
+
+void CMTRand_int32::gen_state()   // generate new m_nState vector
+{
+    for (int i = 0; i < (n - m); ++i)
+    {
+        m_nState[i] = m_nState[i + m] ^ twiddle(m_nState[i], m_nState[i + 1]);
+    }
+    for (int i = n - m; i < (n - 1); ++i)
+    {
+        m_nState[i] = m_nState[i + m - n] ^ twiddle(m_nState[i], m_nState[i + 1]);
+    }
+    m_nState[n - 1] = m_nState[m - 1] ^ twiddle(m_nState[n - 1], m_nState[0]);
+    p = 0; // reset position
+}
+
+void CMTRand_int32::seed(uint32 s)    // init by 32 bit seed
+{   //if (s == 0)
+    //m_nRandom = 1;
+    for (int i = 0; i < n; ++i)
+    {
+        m_nState[i] = 0x0UL;
+    }
+    m_nState[0] = s;
+    for (int i = 1; i < n; ++i)
+    {
+        m_nState[i] = 1812433253UL * (m_nState[i - 1] ^ (m_nState[i - 1] >> 30)) + i;
+        // see Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier
+        // in the previous versions, MSBs of the seed affect only MSBs of the array m_nState
+        // 2002/01/09 modified by Makoto Matsumoto
+    }
+    p = n; // force gen_state() to be called for next random number
+}
+
+void CMTRand_int32::seed(const uint32* array, int size)   // init by array
+{
+    seed(19650218UL);
+    int i = 1, j = 0;
+    for (int k = ((n > size) ? n : size); k; --k)
+    {
+        m_nState[i] = (m_nState[i] ^ ((m_nState[i - 1] ^ (m_nState[i - 1] >> 30)) * 1664525UL))
+            + array[j] + j; // non linear
+        ++j;
+        j %= size;
+        if ((++i) == n)
+        {
+            m_nState[0] = m_nState[n - 1];
+            i = 1;
+        }
+    }
+    for (int k = n - 1; k; --k)
+    {
+        PREFAST_SUPPRESS_WARNING(6385)  PREFAST_SUPPRESS_WARNING(6386)  m_nState[i] = (m_nState[i] ^ ((m_nState[i - 1] ^ (m_nState[i - 1] >> 30)) * 1566083941UL)) - i;
+        if ((++i) == n)
+        {
+            m_nState[0] = m_nState[n - 1];
+            i = 1;
+        }
+    }
+    m_nState[0] = 0x80000000UL; // MSB is 1; assuring non-zero initial array
+    p = n; // force gen_state() to be called for next random number
+}
diff --git a/Code/Legacy/CryCommon/MTPseudoRandom.h b/Code/Legacy/CryCommon/MTPseudoRandom.h
new file mode 100644
index 0000000000..c1ed7694a5
--- /dev/null
+++ b/Code/Legacy/CryCommon/MTPseudoRandom.h
@@ -0,0 +1,166 @@
+// mtrand.h
+// C++ include file for MT19937, with initialization improved 2002/1/26.
+// Coded by Takuji Nishimura and Makoto Matsumoto.
+// Ported to C++ by Jasper Bedaux 2003/1/1 (see http://www.bedaux.net/mtrand/).
+// The generators returning floating point numbers are based on
+// a version by Isaku Wada, 2002/01/09
+// Static shared data converted to per-instance, 2008-11-13 by JSP.
+//
+// Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// 3. The names of its contributors may not be used to endorse or promote
+//    products derived from this software without specific prior written
+//    permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Any feedback is very welcome.
+// http://www.math.keio.ac.jp/matumoto/emt.html
+// email: matumoto@math.keio.ac.jp
+//
+// Feedback about the C++ port should be sent to Jasper Bedaux,
+// see http://www.bedaux.net/mtrand/ for e-mail address and info.
+
+//-------------------------------------------------------------------------
+// History:
+// - 28:7:2005: File created and minor changes by Marco Corbetta
+//
+//*************************************************************************/
+// Modified from original
+
+#ifndef CRYINCLUDE_CRYCOMMON_MTPSEUDORANDOM_H
+#define CRYINCLUDE_CRYCOMMON_MTPSEUDORANDOM_H
+#pragma once
+
+#include <CryRandomInternal.h>
+
+//////////////////////////////////////////////////////////////////////////
+class CMTRand_int32 
+{ 
+    // Mersenne Twister random number generator
+
+public:
+    // default constructor
+    CMTRand_int32() { seed(5489UL); }
+    // constructor with 32 bit int as seed
+    CMTRand_int32(uint32 seed_value) { seed(seed_value); }
+    // constructor with array of 32 bit integers as seed
+    CMTRand_int32(const uint32* array, int size) { seed(array, size); }
+    // seeds with 32 bit integer
+    void seed(uint32 seed_value);
+    // seeds with array
+    void seed(const uint32*, int size);
+    // overloaded operator() to make this a generator (functor)
+    //uint32 operator()() { return rand_int32(); }
+
+    ~CMTRand_int32() {}
+
+    // Functions with PascalCase names were added for
+    // interchangeability with CRndGen (see LCGRandom.h).
+
+    void Seed(uint32 seed_value)
+    {
+        seed(seed_value);
+    }
+
+    uint32 GenerateUint32()
+    {
+        return rand_int32();
+    }
+
+    uint64 GenerateUint64()
+    {
+        const uint32 a = GenerateUint32();
+        const uint32 b = GenerateUint32();
+        return ((uint64)b << 32) | (uint64)a;
+    }
+
+    float GenerateFloat()
+    {
+        return (float)GenerateUint32() * (1.0f / 4294967295.0f);
+    }
+
+    // Ranged function returns random value within the *inclusive* range
+    // between minValue and maxValue.
+    // Any orderings work correctly: minValue <= maxValue and 
+    // minValue >= minValue.
+    template <class T>
+    T GetRandom(const T minValue, const T maxValue)
+    {
+        return CryRandom_Internal::BoundedRandom<CMTRand_int32, T>::Get(*this, minValue, maxValue);
+    }
+
+    // Vector (Vec2, Vec3, Vec4) ranged function returns vector    with 
+    // every component within the *inclusive* ranges between minValue.component
+    // and maxValue.component.
+    // All orderings work correctly: minValue.component <= maxValue.component and
+    // minValue.component >= maxValue.component.
+    template <class T>
+    T GetRandomComponentwise(const T& minValue, const T& maxValue)
+    {
+        return CryRandom_Internal::BoundedRandomComponentwise<CMTRand_int32, T>::Get(*this, minValue, maxValue);
+    }
+
+    // The function returns a random unit vector (Vec2, Vec3, Vec4).
+    template <class T>
+    T GetRandomUnitVector()
+    {
+        return CryRandom_Internal::GetRandomUnitVector<CMTRand_int32, T>(*this);
+    }
+
+protected: // used by derived classes, otherwise not accessible; use the ()-operator
+    // generates 32 bit random int
+    uint32 rand_int32() 
+    { 
+        if (p >= n) gen_state(); // new m_nState vector needed
+        // gen_state() is split off to be non-inline, because it is only called once
+        // in every 624 calls and otherwise irand() would become too big to get inlined
+        uint32 x = m_nState[p++];
+        x ^= (x >> 11);
+        x ^= (x << 7) & 0x9D2C5680UL;
+        x ^= (x << 15) & 0xEFC60000UL;
+        return x ^ (x >> 18);
+    }
+
+private:
+    static const int n = 624, m = 397; // compile time constants
+
+    // the variables below are static (no duplicates can exist)
+    uint32 m_nState[n+1]; // m_nState vector array
+    int p; // position in m_nState array
+    // private functions used to generate the pseudo random numbers
+    uint32 twiddle(uint32 u, uint32 v) 
+    {
+        return (((u & 0x80000000UL) | (v & 0x7FFFFFFFUL)) >> 1)
+            ^ ((v & 1UL) ? 0x9908B0DFUL : 0x0UL);
+    }
+    void gen_state(); // generate new m_nState
+    // make copy constructor and assignment operator unavailable, they don't make sense
+    CMTRand_int32(const CMTRand_int32&); // copy constructor not defined
+    void operator=(const CMTRand_int32&); // assignment operator not defined
+};
+
+
+#endif // CRYINCLUDE_CRYCOMMON_MTPSEUDORANDOM_H
diff --git a/Code/Legacy/CryCommon/MacSpecific.h b/Code/Legacy/CryCommon/MacSpecific.h
new file mode 100644
index 0000000000..196c42b3bf
--- /dev/null
+++ b/Code/Legacy/CryCommon/MacSpecific.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Mac declarations
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H
+#pragma once
+
+
+#include "AppleSpecific.h"
+#include <cstddef>
+#include <cfloat>
+#include <xmmintrin.h>
+//#define _CPU_X86
+#define _CPU_AMD64
+#define _CPU_SSE
+#define PLATFORM_64BIT
+
+#define USE_CRT 1
+#define SIZEOF_PTR 8
+
+typedef uint64_t threadID;
+
+
+// curses.h stubs for PDcurses keys
+#define PADENTER    KEY_MAX + 1
+#define CTL_HOME    KEY_MAX + 2
+#define CTL_END     KEY_MAX + 3
+#define CTL_PGDN    KEY_MAX + 4
+#define CTL_PGUP    KEY_MAX + 5
+
+// stubs for virtual keys, isn't used on Mac
+#define VK_UP               0
+#define VK_DOWN         0
+#define VK_RIGHT        0
+#define VK_LEFT         0
+#define VK_CONTROL  0
+#define VK_SCROLL       0
+
+#define MAC_NOT_IMPLEMENTED assert(false);
+
+
+typedef enum
+{
+    eDAContinue,
+    eDAIgnore,
+    eDAIgnoreAll,
+    eDABreak,
+    eDAStop,
+    eDAReportAsBug
+} EDialogAction;
+
+extern EDialogAction MacOSXHandleAssert(const char* condition, const char* file, int line, const char* reason, bool);
+
+#endif // CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H
diff --git a/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.h
new file mode 100644
index 0000000000..2e2ca13cd7
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceAgentComponentBus.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/Component/ComponentBus.h>
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/std/string/string.h>
+#include <Maestro/Bus/SequenceComponentBus.h>
+#include <Maestro/Bus/SequenceAgentComponentBus.h>
+#include <IMovieSystem.h>
+
+#include "SequenceAgentComponentBus.h"
+
+namespace Maestro
+{
+    /*!
+    * EditorSequenceAgentComponentRequests EBus Interface
+    * Messages serviced by EditorSequenceAgentComponents.
+    *
+    * The EBus is Id'ed on a pair of SequenceEntityId, SequenceAgentEntityId 
+    */
+
+    class EditorSequenceAgentComponentBus
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~EditorSequenceAgentComponentBus() = default;
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        using BusIdType = SequenceAgentEventBusId;
+        //////////////////////////////////////////////////////////////////////////
+    };
+
+    class EditorSequenceAgentComponentRequests
+        : public EditorSequenceAgentComponentBus
+    {
+    public:
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides - application is a singleton
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;  // Only one component on a entity can implement the events
+        //////////////////////////////////////////////////////////////////////////
+
+        //! Returns a list of all animatable properties for a given componentId on the entity which holds the SequenceAgent Component
+        virtual void GetAllAnimatableProperties(IAnimNode::AnimParamInfos& propertyNames, AZ::ComponentId componentId) = 0;
+
+        //! Append all animatable components on the entity which holds the SequenceAgent Component
+        virtual void GetAnimatableComponents(AZStd::vector<AZ::ComponentId>& animatableComponentIds) = 0;
+    };
+
+    using EditorSequenceAgentComponentRequestBus = AZ::EBus<EditorSequenceAgentComponentRequests>;
+
+    /**
+    * Notifications from the Editor Sequence Agent Component
+    */
+    class EditorSequenceAgentComponentNotification
+        : public AZ::EBusTraits
+    {
+    public:
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        using BusIdType = AZ::EntityId;
+        //////////////////////////////////////////////////////////////////////////
+
+        virtual ~EditorSequenceAgentComponentNotification() {}
+
+        /**
+        * Called when a Sequence Agent has been connected to a Sequence.
+        */
+        virtual void OnSequenceAgentConnected() {}
+    };
+
+    using EditorSequenceAgentComponentNotificationBus = AZ::EBus<EditorSequenceAgentComponentNotification>;
+
+} // namespace Maestro
diff --git a/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceBus.h b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceBus.h
new file mode 100644
index 0000000000..c00ebdea22
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceBus.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/EBus/EBus.h>
+
+namespace Maestro
+{
+    /**
+    * Global Notifications from the Editor Sequences
+    */
+    class EditorSequenceNotification
+        : public AZ::EBusTraits
+    {
+    public:
+
+        /**
+        * Called when a Sequence has been selected in Track View.
+        */
+        virtual void OnSequenceSelected([[maybe_unused]] const AZ::EntityId& sequenceEntityId) {}
+    };
+
+    using EditorSequenceNotificationBus = AZ::EBus<EditorSequenceNotification>;
+
+} // namespace Maestro
diff --git a/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h
new file mode 100644
index 0000000000..3bbfcd9080
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h
@@ -0,0 +1,55 @@
+/*
+ * 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/ComponentBus.h>
+#include <AzCore/std/string/string.h>
+#include <IMovieSystem.h>
+
+#include "SequenceComponentBus.h"
+enum class AnimValueType;
+
+namespace Maestro
+{
+    /*!
+    * EditorSequenceComponentRequests EBus Interface
+    * Messages serviced by DirectorComponents.
+    */
+    class EditorSequenceComponentRequests
+        : public AZ::ComponentBus
+    {
+    public:
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides - application is a singleton
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;  // Only one component on a entity can implement the events
+        //////////////////////////////////////////////////////////////////////////
+
+        //! Adds an entity to be animated
+        virtual void AddEntityToAnimate(AZ::EntityId entityToAnimate) = 0;
+
+        //! Remove EntityToAnimate
+        virtual void RemoveEntityToAnimate(AZ::EntityId removedEntityId) = 0;
+
+        //! Marks the entity as dirty in the Editor. Returns true if the entity was marked as dirty, false otherwise.
+        virtual bool MarkEntityAsDirty() const = 0;
+
+        //! Fills in a list of all animatable properites for a given component on a given entity.
+        virtual void GetAllAnimatablePropertiesForComponent(IAnimNode::AnimParamInfos& addressList, AZ::EntityId id, AZ::ComponentId componentId) = 0;
+
+        //! Fills in a list of all animatable component ids for the given entity.
+        virtual void GetAnimatableComponents(AZStd::vector<AZ::ComponentId>& componentIds, AZ::EntityId id) = 0;
+
+        //! Return the AnimValueType type for the given address
+        virtual AnimValueType GetValueType(const AZStd::string& animatableAddress) = 0;
+    };
+
+    using EditorSequenceComponentRequestBus = AZ::EBus<EditorSequenceComponentRequests>;
+
+// defined in the bus header so we can refer to it in the Editor code
+#define EditorSequenceComponentTypeId "{C02DC0E2-D0F3-488B-B9EE-98E28077EC56}"
+
+} // namespace Maestro
diff --git a/Code/Legacy/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h b/Code/Legacy/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h
new file mode 100644
index 0000000000..d4b340f434
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/std/string/string.h>
+#include <Maestro/Bus/SequenceComponentBus.h>
+
+namespace Maestro
+{
+    /*!
+    * SequenceAgentComponentRequests EBus Interface
+    * Messages serviced by SequenceAgentComponents.
+    *
+    * The EBus is Id'ed on a pair of SequenceEntityId, SequenceAgentEntityId 
+    */
+
+    //
+    // SequenceComponents broadcast to SequenceAgentComponents via a pair of Ids:
+    //     sequenceEntityId, sequenceAgentEntityId
+    using SequenceAgentEventBusId = AZStd::pair<AZ::EntityId, AZ::EntityId>;        // SequenceComponenet Entity Id, SequenceAgent EntityId
+
+    class SequenceAgentComponentBus
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~SequenceAgentComponentBus() = default;
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        typedef SequenceAgentEventBusId BusIdType;
+        //////////////////////////////////////////////////////////////////////////
+    };
+
+    class SequenceAgentComponentRequests
+        : public SequenceAgentComponentBus
+    {
+    public:
+        using AnimatablePropertyAddress = Maestro::SequenceComponentRequests::AnimatablePropertyAddress;
+        using AnimatedValue = Maestro::SequenceComponentRequests::AnimatedValue;
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides - application is a singleton
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;  // Only one component on a entity can implement the events
+        //////////////////////////////////////////////////////////////////////////
+
+        //! Called when a SequenceComponent is connected
+        virtual void ConnectSequence(const AZ::EntityId& sequenceEntityId) = 0;
+
+        //! Called when a SequenceComponent is disconnected
+        virtual void DisconnectSequence() = 0;
+
+        //! Get the value for an animated float property at the given address on the same entity as the agent.
+        //! @param returnValue holds the value to get - this must be instance of one of the concrete subclasses of AnimatedValue, corresponding to the type of the property referenced by the animatedAdresss
+        //! @param animatedAddress identifies the component and property to be set
+        virtual void GetAnimatedPropertyValue(AnimatedValue& returnValue, const AnimatablePropertyAddress& animatableAddress) = 0;
+
+        //! Set the value for an animated property at the given address on the same entity as the agent
+        //! @param animatedAddress identifies the component and property to be set
+        //! @param value the value to set - this must be instance of one of the concrete subclasses of AnimatedValue, corresponding to the type of the property referenced by the animatedAdresss
+        //! @return true if the value was changed.
+        virtual bool SetAnimatedPropertyValue(const AnimatablePropertyAddress& animatableAddress, const AnimatedValue& value) = 0;
+
+        //! Returns the Uuid of the type that the 'getter' returns for this animatableAddress
+        virtual AZ::Uuid GetAnimatedAddressTypeId(const Maestro::SequenceComponentRequests::AnimatablePropertyAddress& animatableAddress) = 0;
+
+        //! Track View will expect some components (those using AZ::Data::AssetBlends as a virtual property) to supply a GetAssetDuration event
+        //! so Track View can query the duration of an asset (like a motion) without having any knowledge of that that asset is.
+        virtual void GetAssetDuration(AnimatedValue& returnValue, AZ::ComponentId componentId, const AZ::Data::AssetId& assetId) = 0;
+    };
+
+    using SequenceAgentComponentRequestBus = AZ::EBus<SequenceAgentComponentRequests>;
+
+} // namespace Maestro
+
+namespace AZStd
+{
+    template <>
+    struct hash < Maestro::SequenceAgentEventBusId >
+    {
+        inline size_t operator()(const Maestro::SequenceAgentEventBusId& eventBusId) const
+        {
+            AZStd::hash<AZ::EntityId> entityIdHasher;
+            size_t retVal = entityIdHasher(eventBusId.first);
+            AZStd::hash_combine(retVal, eventBusId.second);
+            return retVal;
+        }
+    };
+}
diff --git a/Code/Legacy/CryCommon/Maestro/Bus/SequenceComponentBus.h b/Code/Legacy/CryCommon/Maestro/Bus/SequenceComponentBus.h
new file mode 100644
index 0000000000..1246eccc4a
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Bus/SequenceComponentBus.h
@@ -0,0 +1,842 @@
+/*
+ * 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/Math/Quaternion.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Component/Entity.h>
+#include <AzCore/Component/ComponentBus.h>
+#include <AzCore/std/string/string.h>
+
+namespace Maestro
+{
+    /*!
+    * SequenceComponentRequests EBus Interface
+    * Messages serviced by SequenceComponents.
+    */
+    class SequenceComponentRequests
+        : public AZ::ComponentBus
+    {
+    public:
+        /**
+         * helper class to define an animatable property address
+         */
+        class AnimatablePropertyAddress
+        {
+        public:
+            AZ_TYPE_INFO(AnimatablePropertyAddress, "{CEE14802-F1E8-4C0A-9750-64C59C39ECE9}");
+
+            AnimatablePropertyAddress(AZ::ComponentId componentId, const AZStd::string& virtualPropertyName)
+                : m_componentId(componentId)
+                , m_virtualPropertyName(virtualPropertyName) {}
+
+            AnimatablePropertyAddress()
+                : m_componentId(AZ::InvalidComponentId) {}
+
+            const AZStd::string& GetVirtualPropertyName() const { return m_virtualPropertyName; }
+            AZ::ComponentId      GetComponentId() const { return m_componentId; }
+
+            bool operator== (const AnimatablePropertyAddress& rhs) const 
+            { 
+                return (m_componentId == rhs.m_componentId && m_virtualPropertyName == rhs.m_virtualPropertyName); 
+            }
+
+        private:
+            AZ::ComponentId m_componentId;                  // componentId of the component being animated on the sequenceAgent's entity
+            AZStd::string   m_virtualPropertyName;          // EBus virtual property name being animated on the component
+        };
+
+        /**
+         * Interface for an animated value to abstract the type (i.e. float/Vector3/Bool) of the value.
+         *
+         * Inherited concrete subclasses determines the actual type of the animatedValue and fills in get/set methods
+         * for casting to other types
+         */
+        // forward declarations
+        class AnimatedFloatValue;
+        class AnimatedVector3Value;
+        class AnimatedBoolValue;
+        class AnimatedQuaternionValue;
+        class AnimatedAssetIdValue;
+
+        class AnimatedValue
+        {
+        public:
+            AZ_TYPE_INFO(AnimatedValue, "{5C4BBDD6-8F80-4510-B5B8-8FA0FBD101A6}");
+
+            virtual ~AnimatedValue() {};
+
+            // Query the type of the value
+            virtual const AZ::Uuid& GetTypeId() const = 0;
+
+            void GetValue(AZ::Vector3& vector3Value) const
+            {
+                vector3Value = GetVector3Value();
+            }
+            void GetValue(AZ::Quaternion& quaternionValue) const
+            {
+                quaternionValue = GetQuaternionValue();
+            }
+            void GetValue(float& floatValue) const
+            {
+                floatValue = GetFloatValue();
+            }
+            void GetValue(bool& boolValue) const
+            {
+                boolValue = GetBoolValue();
+            }
+            void GetValue(AZ::s32& s32Value) const
+            {
+                s32Value = GetS32Value();
+            }
+            void GetValue(AZ::u32& u32Value) const
+            {
+                u32Value = GetU32Value();
+            }
+            void GetValue(AZ::Data::AssetId& assetIdValue) const
+            {
+                assetIdValue = GetAssetIdValue();
+            }
+
+            // same as above but returning the value
+            virtual AZ::Quaternion GetQuaternionValue() const = 0;
+            virtual AZ::Vector3 GetVector3Value() const = 0;
+            virtual float       GetFloatValue() const = 0;
+            virtual bool        GetBoolValue() const = 0;
+            virtual AZ::s32     GetS32Value() const = 0;
+            virtual AZ::u32     GetU32Value() const = 0;
+            virtual const AZ::Data::AssetId& GetAssetIdValue() const = 0;
+
+            // Set the value to the given arg. Returns true if the arg is the 'native' type of the concrete animated value
+            virtual bool SetValue(const AZ::Vector3& vector3Value) = 0;
+            virtual bool SetValue(const AZ::Quaternion& quaternionValue) = 0;
+            virtual bool SetValue(float floatValue) = 0;
+            virtual bool SetValue(bool boolValue) = 0;
+            virtual bool SetValue(AZ::s32 s32Value) = 0;
+            virtual bool SetValue(AZ::u32 u32Value) = 0;
+            virtual bool SetValue(const AZ::Data::AssetId& assetIdValue) = 0;
+
+            virtual bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
+            virtual bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
+            virtual bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
+            virtual bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
+            virtual bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const = 0;
+
+        protected:
+            AnimatedValue() {}     // protected constructor as the interface should never be constructed directly - it's an abstract class
+        };
+
+        class AnimatedFloatValue
+            : public AnimatedValue
+        {
+        public:
+            AZ_TYPE_INFO(AnimatedFloatValue, "{2C90BCBB-1DF2-47C8-8193-18EFE1C70E20}");
+
+            AnimatedFloatValue(float value = .0f) { m_value = value; }
+            ~AnimatedFloatValue() {}
+
+            const AZ::Uuid& GetTypeId() const override
+            {
+                return AZ::AzTypeInfo<float>::Uuid();
+            }
+
+            AZ::Vector3 GetVector3Value() const override
+            {
+                return AZ::Vector3(m_value);
+            }
+            AZ::Quaternion GetQuaternionValue() const override
+            {
+                return AZ::Quaternion(m_value);
+            }
+            float GetFloatValue() const override
+            {
+                return m_value;
+            }
+            bool GetBoolValue() const override
+            {
+                return (!AZ::IsClose(m_value, .0f, FLT_EPSILON));
+            }
+            AZ::s32 GetS32Value() const override
+            {
+                return static_cast<AZ::s32>(m_value);
+            }
+            AZ::u32 GetU32Value() const override
+            {
+                return static_cast<AZ::u32>(m_value);
+            }
+            const AZ::Data::AssetId& GetAssetIdValue() const override
+            {
+                AZ_Assert(0, "Not expected to be used.");
+                static AZ::Data::AssetId assetId;
+                return assetId;
+            }
+
+            bool SetValue(const AZ::Vector3& vector3Value) override
+            {
+                m_value = vector3Value.GetX();
+                return false;
+            }
+            bool SetValue(const AZ::Quaternion& quaternionValue) override
+            {
+                m_value = quaternionValue.GetLength();
+                return false;
+            }
+            bool SetValue(float floatValue) override
+            {
+                m_value = floatValue;
+                return true;
+            }
+            bool SetValue(bool boolValue) override
+            {
+                m_value = boolValue ? 1.0f : .0f;
+                return false;
+            }
+            bool SetValue(AZ::s32 s32Value) override
+            {
+                m_value = static_cast<float>(s32Value);
+                return false;
+            }
+            bool SetValue(AZ::u32 u32Value) override
+            {
+                m_value = static_cast<float>(u32Value);
+                return false;
+            }
+            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
+            {
+                AZ_UNUSED(assetIdValue);
+                return true;
+            }
+
+            bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
+            {
+                return AZ::IsClose(m_value, rhs.GetFloatValue(), tolerance);
+            }
+            bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return AZ::IsClose(m_value, rhs.GetFloatValue(), tolerance);
+            }
+            bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return AZ::IsClose(m_value, rhs.GetFloatValue(), tolerance);
+            }
+            bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return rhs.GetBoolValue() == (!AZ::IsClose(m_value, .0f, tolerance));
+            }
+            bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                AZ_Assert(0, "Shouldnt be used.");
+                AZ_UNUSED(rhs);
+                AZ_UNUSED(tolerance);
+                return false;
+            }
+
+        private:
+            float m_value;
+        };
+
+        class AnimatedVector3Value
+            : public AnimatedValue
+        {
+        public:
+            AZ_TYPE_INFO(AnimatedVector3Value, "{B8CDD566-9D55-47B2-BF91-162E428B237E}");
+
+            AnimatedVector3Value(const AZ::Vector3& value) { m_value = value; }
+            ~AnimatedVector3Value() {}
+
+            const AZ::Uuid& GetTypeId() const override
+            {
+                return AZ::Vector3::TYPEINFO_Uuid();
+            }
+
+            AZ::Vector3 GetVector3Value() const override
+            {
+                return m_value;
+            }
+            AZ::Quaternion GetQuaternionValue() const override
+            {
+                // treat m_value as Euler Angles in degrees
+                return AZ::ConvertEulerDegreesToQuaternion(m_value);
+            }
+            float GetFloatValue() const override
+            {
+                return m_value.GetX(); // return the first component
+            }
+            bool GetBoolValue() const override
+            {
+                return !m_value.IsClose(AZ::Vector3::CreateZero());
+            }
+            AZ::s32 GetS32Value() const override
+            {
+                return static_cast<AZ::s32>(m_value.GetX());
+            }
+            AZ::u32 GetU32Value() const override
+            {
+                return static_cast<AZ::u32>(m_value.GetX());
+            }
+            const AZ::Data::AssetId& GetAssetIdValue() const override
+            {
+                AZ_Assert(0, "Not expected to be used.");
+                static AZ::Data::AssetId assetId;
+                return assetId;
+            }
+
+            bool SetValue(const AZ::Vector3& vector3Value) override
+            {
+                m_value = vector3Value;
+                return true;
+            }
+            bool SetValue(const AZ::Quaternion& quaternionValue) override
+            {
+                m_value = AZ::ConvertQuaternionToEulerDegrees(quaternionValue);
+                return true;
+            }
+            bool SetValue(float floatValue) override
+            {
+                m_value.Set(floatValue);    // sets vector components to floatValue
+                return false;
+            }
+            bool SetValue(bool boolValue) override
+            {
+                m_value = boolValue ? AZ::Vector3::CreateOne() : AZ::Vector3::CreateZero();
+                return false;
+            }
+            bool SetValue(AZ::s32 s32Value) override
+            {
+                m_value.Set(static_cast<float>(s32Value));
+                return false;
+            }
+            bool SetValue(AZ::u32 u32Value) override
+            {
+                m_value.Set(static_cast<float>(u32Value));
+                return false;
+            }
+            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
+            {
+                AZ_UNUSED(assetIdValue);
+                return true;
+            }
+
+            bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
+            {
+                return m_value.IsClose(rhs.GetVector3Value(), tolerance);
+            }
+            bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return m_value.IsClose(rhs.GetVector3Value(), tolerance);
+            }
+            bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return m_value.IsClose(rhs.GetVector3Value(), tolerance);
+            }
+            bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return rhs.GetBoolValue() == (!m_value.IsClose(AZ::Vector3::CreateZero(), tolerance));
+            }
+            bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                AZ_Assert(0, "Shouldn't be used.");
+                AZ_UNUSED(rhs);
+                AZ_UNUSED(tolerance);
+                return false;
+            }
+
+        private:
+            AZ::Vector3 m_value;
+        };
+
+        class AnimatedQuaternionValue
+            : public AnimatedValue
+        {
+        public:
+            AZ_TYPE_INFO(AnimatedQuaternionValue, "{572E640B-9375-4E16-8F3A-5DCA1734B820}");
+
+            AnimatedQuaternionValue(const AZ::Quaternion value) { m_value = value; }
+            ~AnimatedQuaternionValue() {}
+
+            const AZ::Uuid& GetTypeId() const override
+            {
+                return AZ::Quaternion::TYPEINFO_Uuid();
+            }
+
+            AZ::Vector3 GetVector3Value() const override
+            {
+                // convert Quaternion to Euler angles
+                return AZ::ConvertQuaternionToEulerDegrees(m_value);
+            }
+            AZ::Quaternion GetQuaternionValue() const override
+            {
+                return m_value;
+            }
+            float GetFloatValue() const override
+            {
+                // return the length of the quat
+                return m_value.GetLength(); 
+            }
+            bool GetBoolValue() const override
+            {
+                return !m_value.IsZero();
+            }
+            AZ::s32 GetS32Value() const override
+            {
+                return static_cast<AZ::s32>(m_value.GetLength());
+            }
+            AZ::u32 GetU32Value() const override
+            {
+                return static_cast<AZ::u32>(m_value.GetLength());
+            }
+            const AZ::Data::AssetId& GetAssetIdValue() const override
+            {
+                AZ_Assert(0, "Not expected to be used.");
+                static AZ::Data::AssetId assetId;
+                return assetId;
+            }
+
+            bool SetValue(const AZ::Vector3& vector3Value) override
+            {
+                // convert from Euler angles
+                m_value = AZ::ConvertEulerRadiansToQuaternion(vector3Value);
+                return false;
+            }
+            bool SetValue(const AZ::Quaternion& quaternionValue) override
+            {
+                m_value = quaternionValue;
+                return true;
+            }
+            bool SetValue(float floatValue) override
+            {
+                m_value.Set(floatValue);    // sets quat with all components set to floatValue
+                return false;
+            }
+            bool SetValue(bool boolValue) override
+            {
+                m_value = boolValue ? AZ::Quaternion::CreateIdentity() : AZ::Quaternion::CreateZero();
+                return false;
+            }
+            bool SetValue(AZ::s32 s32Value) override
+            {
+                m_value.Set(static_cast<float>(s32Value));
+                return false;
+            }
+            bool SetValue(AZ::u32 u32Value) override
+            {
+                m_value.Set(static_cast<float>(u32Value));
+                return false;
+            }
+            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
+            {
+                AZ_UNUSED(assetIdValue);
+                return true;
+            }
+
+            bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
+            {
+                return m_value.IsClose(rhs.GetQuaternionValue(), tolerance);
+            }
+            bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return m_value.IsClose(rhs.GetQuaternionValue(), tolerance);
+            }
+            bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return m_value.IsClose(rhs.m_value, tolerance);
+            }
+            bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return rhs.GetBoolValue() == (!m_value.IsZero(tolerance));
+            }
+            bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                AZ_Assert(0, "Shouldn't be used.");
+                AZ_UNUSED(rhs);
+                AZ_UNUSED(tolerance);
+                return false;
+            }
+
+        private:
+            AZ::Quaternion m_value;
+        };
+
+        class AnimatedBoolValue
+            : public AnimatedValue
+        {
+        public:
+            AZ_TYPE_INFO(AnimatedBoolValue, "{5FF422AD-20E7-4109-A2EA-4AACE8213860}");
+
+            AnimatedBoolValue(bool value) { m_value = value; }
+            ~AnimatedBoolValue() {}
+
+            const AZ::Uuid& GetTypeId() const override
+            {
+                return AZ::AzTypeInfo<bool>::Uuid();
+            }
+
+            AZ::Vector3 GetVector3Value() const override
+            {
+                return m_value ? AZ::Vector3::CreateOne() : AZ::Vector3::CreateZero();;
+            }
+            AZ::Quaternion GetQuaternionValue() const override
+            {
+                return m_value ? AZ::Quaternion::CreateIdentity() : AZ::Quaternion::CreateZero();;
+            }
+            float GetFloatValue() const override
+            {
+                return m_value ? 1.0f : .0f;
+            }
+            bool GetBoolValue() const override
+            {
+                return m_value;
+            }
+            AZ::s32 GetS32Value() const override
+            {
+                return m_value ? 1 : 0;
+            }
+            AZ::u32 GetU32Value() const override
+            {
+                return m_value ? 1 : 0;
+            }
+            const AZ::Data::AssetId& GetAssetIdValue() const override
+            {
+                AZ_Assert(0, "Not expected to be used.");
+                static AZ::Data::AssetId assetId;
+                return assetId;
+            }
+
+            bool SetValue(const AZ::Vector3& vector3Value) override
+            {
+                m_value = !vector3Value.IsClose(AZ::Vector3::CreateZero());
+                return false;
+            }
+            bool SetValue(const AZ::Quaternion& quaternionValue) override
+            {
+                m_value = !quaternionValue.IsZero();
+                return false;
+            }
+            bool SetValue(float floatValue) override
+            {
+                m_value = !AZ::IsClose(floatValue, .0f, FLT_EPSILON);
+                return false;
+            }
+            bool SetValue(bool boolValue) override
+            {
+                m_value = boolValue;
+                return true;
+            }
+            bool SetValue(AZ::s32 s32Value) override
+            {
+                m_value = s32Value != 0;
+                return false;
+            }
+            bool SetValue(AZ::u32 u32Value) override
+            {
+                m_value = u32Value != 0;
+                return false;
+            }
+            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
+            {
+                AZ_UNUSED(assetIdValue);
+                return true;
+            }
+
+            bool IsClose(const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
+            {
+                return m_value == (!AZ::IsClose(rhs.GetFloatValue(), .0f, tolerance));
+            }
+            bool IsClose(const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return m_value == (!rhs.GetVector3Value().IsClose(AZ::Vector3::CreateZero(), tolerance));
+            }
+            bool IsClose(const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return m_value == (!rhs.GetQuaternionValue().IsZero(tolerance));
+            }
+            bool IsClose(const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                (void)tolerance;                    // avoid compiler warning for unused variable
+                return m_value == rhs.m_value;
+            }
+            bool IsClose(const AnimatedAssetIdValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                AZ_Assert(0, "Shouldn't be used.");
+                AZ_UNUSED(rhs);
+                AZ_UNUSED(tolerance);
+                return false;
+            }
+
+        private:
+            bool m_value;
+        };
+
+        class AnimatedAssetIdValue
+            : public AnimatedValue
+        {
+        public:
+            AZ_TYPE_INFO(AnimatedAssetIdValue, "{BA8AFA84-44C7-4358-AB35-775AF2B8A109}");
+
+            AnimatedAssetIdValue() { m_value.SetInvalid(); }
+            AnimatedAssetIdValue(const AZ::Data::AssetId& value) { m_value = value; }
+
+            const AZ::Uuid& GetTypeId() const override
+            {
+                return AZ::AzTypeInfo<AZ::Data::AssetId>::Uuid();
+            }
+
+            AZ::Vector3 GetVector3Value() const override
+            {
+                return AZ::Vector3::CreateZero();;
+            }
+            AZ::Quaternion GetQuaternionValue() const override
+            {
+                return AZ::Quaternion::CreateZero();;
+            }
+            float GetFloatValue() const override
+            {
+                return 0.0f;
+            }
+            bool GetBoolValue() const override
+            {
+                return false;
+            }
+            AZ::s32 GetS32Value() const override
+            {
+                return 0;
+            }
+            AZ::u32 GetU32Value() const override
+            {
+                return 0;
+            }
+            const AZ::Data::AssetId& GetAssetIdValue() const override
+            {
+                return m_value;
+            }
+
+            bool SetValue(const AZ::Vector3& vector3Value) override
+            {
+                AZ_UNUSED(vector3Value);
+                return false;
+            }
+            bool SetValue(const AZ::Quaternion& quaternionValue) override
+            {
+                AZ_UNUSED(quaternionValue);
+                return false;
+            }
+            bool SetValue(float floatValue) override
+            {
+                AZ_UNUSED(floatValue);
+                return false;
+            }
+            bool SetValue(bool boolValue) override
+            {
+                AZ_UNUSED(boolValue);
+                return true;
+            }
+            bool SetValue(AZ::s32 s32Value) override
+            {
+                AZ_UNUSED(s32Value);
+                return false;
+            }
+            bool SetValue(AZ::u32 u32Value) override
+            {
+                AZ_UNUSED(u32Value);
+                return false;
+            }
+            bool SetValue(const AZ::Data::AssetId& assetIdValue) override
+            {
+                m_value = assetIdValue;
+                return true;
+            }
+
+            bool IsClose([[maybe_unused]] const AnimatedFloatValue& rhs, float tolerance = AZ::Constants::FloatEpsilon) const override
+            {
+                AZ_UNUSED(tolerance);
+                return false;
+            }
+            bool IsClose([[maybe_unused]] const AnimatedVector3Value& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                AZ_UNUSED(tolerance);
+                return false;
+            }
+            bool IsClose([[maybe_unused]] const AnimatedQuaternionValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                AZ_UNUSED(tolerance);
+                return false;
+            }
+            bool IsClose([[maybe_unused]] const AnimatedBoolValue& rhs, float tolerance = AZ::Constants::Tolerance) const override
+            {
+                AZ_UNUSED(tolerance);
+                return false;
+            }
+            bool IsClose(const AnimatedAssetIdValue& rhs, [[maybe_unused]] float tolerance = AZ::Constants::Tolerance) const override
+            {
+                return m_value == rhs.m_value;
+            }
+
+        private:
+            AZ::Data::AssetId m_value;
+        };
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides - application is a singleton
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;  // Only one component on a entity can implement the events
+        //////////////////////////////////////////////////////////////////////////
+
+        /** 
+         * Set a value for an animated property at the given address on the given entity.
+         * @param animatedEntityId the entity Id of the entity containing the animatedAddress
+         * @param animatedAddress identifies the component and property to be set
+         * @param value the value to set - this must be instance of one of the concrete subclasses of AnimatedValue, corresponding to the type of the property referenced by the animatedAdresss
+         * @return true if the value was changed.
+         */
+        virtual bool SetAnimatedPropertyValue(const AZ::EntityId& animatedEntityId, const AnimatablePropertyAddress& animatableAddress, const AnimatedValue& value) = 0;
+
+        /**
+         * Get the current value for a property
+         * @param returnValue holds the value to get - this must be instance of one of the concrete subclasses of AnimatedValue, corresponding to the type of the property referenced by the animatedAdresss
+         * @param animatedEntityId the entity Id of the entity containing the animatedAddress
+         * @param animatedAddress identifies the component and property to be set
+         */
+        virtual void GetAnimatedPropertyValue(AnimatedValue& returnValue, const AZ::EntityId& animatedEntityId, const AnimatablePropertyAddress& animatableAddress) = 0;
+
+        /** Returns the Uuid of the type for the property at the animatableAddress on the given entityId
+        */
+        virtual AZ::Uuid GetAnimatedAddressTypeId(const AZ::EntityId& enityId, const Maestro::SequenceComponentRequests::AnimatablePropertyAddress& animatableAddress) = 0;
+
+        /**
+         * Track View will expect some components to supply a GetAssetDuration event so Track View can query the duration of an asset (like a motion)
+         * without having any knowledge of that that asset is.
+         */
+        virtual void GetAssetDuration(AnimatedValue& returnValue, const AZ::EntityId& animatedEntityId, AZ::ComponentId componentId, const AZ::Data::AssetId& assetId) = 0;
+
+        //////////////////////////////////////////////////////////////////////////
+        // Behaviors
+        /**
+        * Play sequence from the start to end times set the sequence
+        */
+        virtual void Play() {}
+        /**
+        * Play sequence between the start to end times, outside of which the sequence behaves according to its 'Out of Range' time setting
+        * @param startTime                     Sequence start time in seconds
+        * @param endTime                       Sequence end time in seconds
+        */
+        virtual void PlayBetweenTimes(float startTime, float endTime) {(void)startTime; (void)endTime;}
+        /**
+         * Stop the sequence. Stopping the sequence jumps the play time to the end of the sequence.
+         */
+        virtual void Stop() {}
+        /**
+        * Pause the sequence. Sequence must be playing for pause to have an effect. Pausing leaves the play time at its current position.
+        */
+        virtual void Pause() {}
+        /**
+        * Resume the sequence. Resume essentially 'unpauses' a sequence. It must have been playing before the pause for playback to start again.
+        */
+        virtual void Resume() {}
+        /**
+        * Set the play speed
+        * @param newSpeed speed multiplier (1.0 is normal speed, less is slower, more is faster).
+        */
+        virtual void SetPlaySpeed(float newSpeed) {(void)newSpeed;}
+        /**
+         * Move the Playhead to the given time
+         * @param time time to move the play head to, in seconds, clamped to be between the start and end times of the sequence
+         */
+        virtual void JumpToTime(float newTime) {(void)newTime;}
+        /**
+        * Move the Playhead to the end of the sequence
+        */
+        virtual void JumpToEnd() {}
+        /**
+        * Move the Playhead to the beginning of the sequence
+        */
+        virtual void JumpToBeginning() {}
+        /**
+         * Returns the current play time in seconds
+         */
+        virtual float GetCurrentPlayTime() { return .0f; }
+        /**
+        * Returns the current play back speed as a multiplier (1.0 is normal speed, less is slower, more is faster).
+        */
+        virtual float GetPlaySpeed() { return 1.0f; }
+        //////////////////////////////////////////////////////////////////////////
+    };
+    using SequenceComponentRequestBus = AZ::EBus<SequenceComponentRequests>;
+
+    /**
+    * Notifications from the Sequence Component
+    */
+    class SequenceComponentNotification
+        : public AZ::ComponentBus
+    {
+    public:
+        ////////////////////////////////////////////////////////////////////////
+        // EBusTraits
+        // multiple handlers (addressed by AZ::EntityId inherited from AZ::ComponentBus)
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        ////////////////////////////////////////////////////////////////////////
+
+        virtual ~SequenceComponentNotification() {}
+
+        /**
+        * Called when Sequence starts
+        * @param startTime Time when sequence starts, in seconds
+        */
+        virtual void OnStart(float startTime) { (void)startTime; }
+        /**
+        * Called when Sequence stops
+        * @param stopTime Time when the sequence stops, in seconds
+        */
+        virtual void OnStop(float stopTime) { (void)stopTime; }
+        /**
+        * Called when Sequence pauses
+        */
+        virtual void OnPause() {}
+        /**
+        * Called when Sequence resumes
+        */
+        virtual void OnResume() {}
+        /**
+        * Called when Sequence is aborted
+        * @param abortTime Time when the sequence aborts, in seconds
+        */
+        virtual void OnAbort(float abortTime) { (void)abortTime; }
+        /**
+        * Called when Sequence is updated. That is, when the current play time changes, or the playback speed changes.
+        * @param updateTime Time when the sequence updates, in seconds
+        */
+        virtual void OnUpdate(float updateTime) { (void)updateTime; }
+        /**
+        * Called when a Sequence Event is triggered.
+        * @param paramValue The Event Key's Value parameter as a string
+        */
+        virtual void OnTrackEventTriggered(const char* eventName, const char* eventValue) { (void)eventName;  (void)eventValue; }
+        /**
+        * Called when a Sequence changes camera during playback in Track View.
+        * @param cameraEntityId entityId of the new camera.
+        */
+        virtual void OnCameraChanged([[maybe_unused]] const AZ::EntityId& oldCameraEntityId, [[maybe_unused]] const AZ::EntityId& newCameraEntityId) {}
+    };
+
+    using SequenceComponentNotificationBus = AZ::EBus<SequenceComponentNotification>;
+} // namespace Maestro
+
+namespace AZStd
+{
+    template <>
+    struct hash < Maestro::SequenceComponentRequests::AnimatablePropertyAddress >
+    {
+        inline size_t operator()(const Maestro::SequenceComponentRequests::AnimatablePropertyAddress& animatablePropertyAddress) const
+        {
+            AZStd::hash<AZ::ComponentId> componentIdHasher;
+            size_t retVal = componentIdHasher(animatablePropertyAddress.GetComponentId());
+            AZStd::hash_combine(retVal, animatablePropertyAddress.GetVirtualPropertyName());
+            return retVal;
+        }
+    };
+}  // namespace AZStd
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h
new file mode 100644
index 0000000000..192af7381f
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h
@@ -0,0 +1,50 @@
+/*
+ * 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_MAESTRO_TYPES_ANIMNODETYPE_H
+#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
+#pragma once
+
+// **NOTE**: Do not include into the precompiled header hierarchy!
+
+//////////////////////////////////////////////////////////////////////////
+//! Node-Types
+//
+// You need to register new types in Movie.cpp/RegisterNodeTypes for serialization.
+// Note: Enums are serialized by string now, there is no need for specific IDs
+// anymore for new parameters. Values are for backward compatibility.
+enum class AnimNodeType
+{
+    Invalid                   = 0x00,
+    Entity                    = 0x01,       // Legacy Cry Entities (CE is AzEntity)
+    Director                  = 0x02,
+    Camera                    = 0x03,       // Legacy Cry Camera Object
+    CVar                      = 0x04,
+    ScriptVar                 = 0x05,
+    Material                  = 0x06,
+    Event                     = 0x07,
+    Group                     = 0x08,
+    Layer                     = 0x09,
+    Comment                   = 0x10,
+    RadialBlur                = 0x11,
+    ColorCorrection           = 0x12,
+    DepthOfField              = 0x13,
+    ScreenFader               = 0x14,
+    Light                     = 0x15,       // Legacy Cry Light
+    // HDRSetup               = 0x16,       // deprecated Jan 2016
+    ShadowSetup               = 0x17,
+    Alembic                   = 0x18,       // Used in cinebox, added so nobody uses that number
+    GeomCache                 = 0x19,
+    Environment,
+    ScreenDropsSetup,                       // deprecated Jan 2016
+    AzEntity,
+    Component,
+    Num
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h
new file mode 100644
index 0000000000..96533510ca
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMPARAMTYPE_H
+#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMPARAMTYPE_H
+#pragma once
+
+// **NOTES**: Do not include into the precompiled header hierarchy!
+//            There are a couple legacy defines in IMovieSystem.h that
+//            correspond to these values. ByString and Invalid.
+
+// Static common parameters IDs of animation node.
+//
+// You need to register new params in Movie.cpp/RegisterParamTypes for serialization.
+// Note: Enums are serialized by string now, there is no need for specific IDs
+// anymore for new parameters. Values are for backward compatibility.
+//
+// If you want to expand CryMovie to control new stuff this is probably  the enum you want to change.
+// For named params see AnimParamType::ByString & CAnimParamType
+enum class AnimParamType
+{
+    // Parameter is specified by string. See CAnimParamType
+    ByString                         = 8,
+
+    FOV                              = 0,
+    Position                         = 1,
+    Rotation                         = 2,
+    Scale                            = 3,
+    Event                            = 4,
+    Visibility                       = 5,
+    Camera                           = 6,
+    Animation                        = 7,
+    Sound                            = 10,
+    Sequence                         = 13,
+    // Expression                    = 14,       ///@deprecated Jan 2016
+    Console                          = 17,
+    Music                            = 18,       ///@deprecated in 1.11, July 2017 - left in for legacy serialization
+    Float                            = 19,
+    // FaceSequence                  = 20,       ///@deprecated Jan 2016
+    LookAt                           = 21,
+    TrackEvent                       = 22,
+
+    ShakeAmplitudeA                  = 23,
+    ShakeAmplitudeB                  = 24,
+    ShakeFrequencyA                  = 25,
+    ShakeFrequencyB                  = 26,
+    ShakeMultiplier                  = 27,
+    ShakeNoise                       = 28,
+    ShakeWorking                     = 29,
+    ShakeAmpAMult                    = 61,
+    ShakeAmpBMult                    = 62,
+    ShakeFreqAMult                   = 63,
+    ShakeFreqBMult                   = 64,
+
+    DepthOfField                     = 30,
+    FocusDistance                    = 31,
+    FocusRange                       = 32,
+    BlurAmount                       = 33,
+
+    Capture                          = 34,
+    TransformNoise                   = 35,
+    TimeWarp                         = 36,
+    FixedTimeStep                    = 37,
+    NearZ                            = 38,
+    Goto                             = 39,
+
+    PositionX                        = 51,
+    PositionY                        = 52,
+    PositionZ                        = 53,
+
+    RotationX                        = 54,
+    RotationY                        = 55,
+    RotationZ                        = 56,
+
+    ScaleX                           = 57,
+    ScaleY                           = 58,
+    ScaleZ                           = 59,
+
+    ColorR                           = 82,
+    ColorG                           = 83,
+    ColorB                           = 84,
+
+    CommentText                      = 70,
+    ScreenFader                      = 71,
+
+    LightDiffuse                     = 81,
+    LightRadius                      = 85,
+    LightDiffuseMult                 = 86,
+    LightHDRDynamic                  = 87,
+    LightSpecularMult                = 88,
+    LightSpecPercentage              = 89,
+
+    MaterialDiffuse          = 90,
+    MaterialSpecular         = 91,
+    MaterialEmissive         = 92,
+    // MaterialEmissiveIntensity = 99,   // declared below to keep enumerations in order
+    MaterialOpacity          = 93,
+    MaterialSmoothness       = 94,
+
+    TimeRanges               = 95, //!< Generic track with keys that have time ranges
+
+    Physics                  = 96,   //! Not used anymore, see Physicalize & PhysicsDriven
+
+    ProceduralEyes           = 97,
+
+    Unused                   = 98, //!< Mannequin parameter that was removed.
+
+    MaterialEmissiveIntensity = 99,
+
+    // Add new param types without explicit ID here:
+    // NOTE: don't forget to register in Movie.cpp
+
+    GSMCache,
+
+    ShutterSpeed,
+
+    Physicalize,
+    PhysicsDriven,
+
+    SunLongitude,
+    SunLatitude,
+    MoonLongitude,
+    MoonLatitude,
+
+    User                        = 100000, //!< User node params.
+
+    Invalid                     = static_cast<int>(0xFFFFFFFF)
+};
+
+static const int OLD_APARAM_USER = 100;
+
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMPARAMTYPE_H
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AnimValue.h b/Code/Legacy/CryCommon/Maestro/Types/AnimValue.h
new file mode 100644
index 0000000000..54e5f0c21d
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Types/AnimValue.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
+#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
+#pragma once
+
+// **NOTE**: Do not include into the precompiled header hierarchy!
+
+//! Values that animation track can hold.
+// Do not change values! they are serialized
+//
+// Attention: This should only be expanded if you add a completely new value type that tracks can control!
+// If you just want to control a new parameter of an entity etc. extend EParamType
+//
+// Note: If the param type of a track is known and valid these can be derived from the node.
+//       These are serialized in case the parameter got invalid (for example for material nodes)
+//
+enum class AnimValue
+{
+    Float = 0,
+    Vector = 1,
+    Quat = 2,
+    Bool = 3,
+    Select = 5,
+    Vector4 = 15,
+    DiscreteFloat = 16,
+    RGB = 20,
+    CharacterAnim = 21,
+
+    Unknown = static_cast<int>(0xFFFFFFFF)
+};
+
+
+#endif CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h
new file mode 100644
index 0000000000..526212261a
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Types/AnimValueType.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
+#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
+#pragma once
+
+// **NOTES**: Do not include into the precompiled header hierarchy!
+//            There are a couple legacy defines in IMovieSystem.h that
+//            correspond to these values. Unknown and Float.
+
+//! Values that animation track can hold.
+// Do not change values! they are serialized
+//
+// Attention: This should only be expanded if you add a completely new value type that tracks can control!
+// If you just want to control a new parameter of an entity etc. extend EParamType
+//
+// Note: If the param type of a track is known and valid these can be derived from the node.
+//       These are serialized in case the parameter got invalid (for example for material nodes)
+//
+enum class AnimValueType
+{
+    Float = 0,
+    Vector = 1,
+    Quat = 2,
+    Bool = 3,
+    Select = 5,
+    Vector4 = 15,
+    DiscreteFloat = 16,
+    RGB = 20,
+    CharacterAnim = 21,
+    AssetBlend = 22,
+
+    Unknown = static_cast<int>(0xFFFFFFFF)
+};
+
+
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AssetBlendKey.h b/Code/Legacy/CryCommon/Maestro/Types/AssetBlendKey.h
new file mode 100644
index 0000000000..f6ff3b1382
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Types/AssetBlendKey.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Asset/AssetCommon.h>
+
+namespace AZ
+{
+
+/** IAssetBlendKey used in AssetBlend animation track.
+*/
+struct IAssetBlendKey
+    : public ITimeRangeKey
+{
+    AZ::Data::AssetId m_assetId;    //!< Asset Id
+    AZStd::string m_description;    //!< Description (filename part of path)
+    float m_blendInTime;            //!< Blend in time in seconds;
+    float m_blendOutTime;            //!< Blend in time in seconds;
+
+    IAssetBlendKey()
+        : ITimeRangeKey()
+        , m_blendInTime(0.0f)
+        , m_blendOutTime(0.0f)
+    {
+    }
+};
+
+    AZ_TYPE_INFO_SPECIALIZE(IAssetBlendKey, "{15B82C3A-6DB8-466F-AF7F-18298FCD25FD}");
+}
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AssetBlends.h b/Code/Legacy/CryCommon/Maestro/Types/AssetBlends.h
new file mode 100644
index 0000000000..5ed8b125f8
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Types/AssetBlends.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#pragma once
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Asset/AssetCommon.h>
+
+namespace Maestro
+{
+    /**
+    * AssetBlend type
+    */
+    struct AssetBlend
+    {
+        AZ_TYPE_INFO(AssetBlend, "{90EB921C-456C-4CD8-A487-414219CF123B}");
+
+        AssetBlend()
+            : m_time(0.0f)
+            , m_blendInTime(0.0f)
+            , m_blendOutTime(0.0f)
+        {
+            m_assetId.SetInvalid();
+        }
+
+        AssetBlend(const AZ::Data::AssetId& assetId, float time, float blendInTime, float blendOutTime)
+            : m_assetId(assetId)
+            , m_time(time)
+            , m_blendInTime(blendInTime)
+            , m_blendOutTime(blendOutTime)
+        {
+        }
+
+        bool IsClose(const AssetBlend& rhs, float tolerance) const
+        {
+            return m_assetId == rhs.m_assetId
+                && (fabsf(m_time - rhs.m_time) <= tolerance)
+                && (fabsf(m_blendInTime - rhs.m_blendInTime) <= tolerance)
+                && (fabsf(m_blendOutTime - rhs.m_blendOutTime) <= tolerance);
+        }
+
+        AZ::Data::AssetId m_assetId;
+        float m_time;
+        float m_blendInTime;
+        float m_blendOutTime;
+    };
+
+    /**
+    * AssetBlends type
+    */
+    template<typename AssetType>
+    struct AssetBlends
+    {
+        AZ_TYPE_INFO(AssetBlends<AssetType>, "{636A51DA-48E8-4AF9-8310-541E735F2703}");
+        AZStd::vector<AssetBlend> m_assetBlends;
+
+        bool IsClose(const AssetBlends& rhs, float tolerance) const
+        {
+            bool result = m_assetBlends.size() == rhs.m_assetBlends.size();
+
+            for (int x = 0; result && (x < m_assetBlends.size()); x++)
+            {
+                result = m_assetBlends[x].IsClose(rhs.m_assetBlends[x], tolerance);
+            }
+
+            return result;
+        }
+    };
+
+} // namespace Maestro
diff --git a/Code/Legacy/CryCommon/Maestro/Types/SequenceType.h b/Code/Legacy/CryCommon/Maestro/Types/SequenceType.h
new file mode 100644
index 0000000000..eb9ef09847
--- /dev/null
+++ b/Code/Legacy/CryCommon/Maestro/Types/SequenceType.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
+#define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
+#pragma once
+
+// **NOTES**: Do not include into the precompiled header hierarchy!
+//            There is a legacy define in IMovieSystem.h that
+//            correspond to a value, Legacy.
+
+enum class SequenceType
+{
+    Legacy                = 0,        // legacy CryEntity Sequence Object
+    SequenceComponent     = 1         // Sequence Component on an AZ::Entity
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
diff --git a/Code/Legacy/CryCommon/MainThreadRenderRequestBus.h b/Code/Legacy/CryCommon/MainThreadRenderRequestBus.h
new file mode 100644
index 0000000000..2558356102
--- /dev/null
+++ b/Code/Legacy/CryCommon/MainThreadRenderRequestBus.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/Component/ComponentBus.h>
+#include <AzCore/std/parallel/mutex.h>
+
+namespace AZ
+{
+    /**
+     * Used to queue render commands to be safely executed on the main thread
+     */
+    class MainThreadRenderQueueEvents
+        : public AZ::EBusTraits
+    {
+    public:
+
+        virtual ~MainThreadRenderQueueEvents() {}
+
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = EBusHandlerPolicy::Single;
+        static const bool EnableEventQueue = true;
+        typedef AZStd::mutex EventQueueMutexType;
+    };
+
+    using MainThreadRenderRequestBus = AZ::EBus<MainThreadRenderQueueEvents>;
+}
diff --git a/Code/Legacy/CryCommon/MathConversion.h b/Code/Legacy/CryCommon/MathConversion.h
new file mode 100644
index 0000000000..39a017d599
--- /dev/null
+++ b/Code/Legacy/CryCommon/MathConversion.h
@@ -0,0 +1,224 @@
+/*
+ * 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/Math/Aabb.h>
+#include <AzCore/Math/Obb.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/Math/Vector4.h>
+#include <AzCore/Math/Color.h>
+#include <AzCore/Math/Transform.h>
+#include <AzCore/Math/Matrix3x3.h>
+#include <AzCore/Math/Matrix3x4.h>
+#include <AzCore/Math/Quaternion.h>
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/Math/Plane.h>
+#include <Cry_Math.h>
+#include <Cry_Geo.h>
+#include <Cry_Color.h>
+
+inline AZ::Vector2 LYVec2ToAZVec2(const Vec2& source)
+{
+    return AZ::Vector2(source.x, source.y);
+}
+
+inline Vec2 AZVec2ToLYVec2(const AZ::Vector2& source)
+{
+    return Vec2(source.GetX(), source.GetY());
+}
+
+inline AZ::Vector3 LYVec3ToAZVec3(const Vec3& source)
+{
+    return AZ::Vector3(source.x, source.y, source.z);
+}
+
+inline Vec3 AZVec3ToLYVec3(const AZ::Vector3& source)
+{
+    return Vec3(source.GetX(), source.GetY(), source.GetZ());
+}
+
+inline AZ::Vector4 LYVec4ToAZVec4(const Vec4& source)
+{
+    return AZ::Vector4(source.x, source.y, source.z, source.w);
+}
+
+inline Vec4 AZVec4ToLYVec4(const AZ::Vector4& source)
+{
+    return Vec4(source.GetX(), source.GetY(), source.GetZ(), source.GetW());
+}
+
+inline AZ::Color LYVec3ToAZColor(const Vec3& source)
+{
+    return AZ::Color(source.x, source.y, source.z, 1.0f);
+}
+
+inline Vec3 AZColorToLYVec3(const AZ::Color& source)
+{
+    return Vec3(source.GetR(), source.GetG(), source.GetB());
+}
+
+inline Vec4 AZColorToLYVec4(const AZ::Color& source)
+{
+    return Vec4(source.GetR(), source.GetG(), source.GetB(), source.GetA());
+}
+
+inline ColorF AZColorToLYColorF(const AZ::Color& source)
+{
+    return ColorF(source.ToU32());
+}
+
+inline AZ::Color LYColorFToAZColor(const ColorF& source)
+{
+    return AZ::Color(source.r, source.g, source.b, source.a);
+}
+
+inline ColorB AZColorToLYColorB(const AZ::Color& source)
+{
+    return ColorB(source.ToU32());
+}
+
+inline AZ::Color LYColorBToAZColor(const ColorB& source)
+{
+    return AZ::Color(source.r, source.g, source.b, source.a);
+}
+
+
+inline AZ::Quaternion LYQuaternionToAZQuaternion(const Quat& source)
+{
+    const float f4[4] = { source.v.x, source.v.y, source.v.z, source.w };
+    return AZ::Quaternion::CreateFromFloat4(f4);
+}
+
+inline Quat AZQuaternionToLYQuaternion(const AZ::Quaternion& source)
+{
+    float f4[4];
+    source.StoreToFloat4(f4);
+    return Quat(f4[3], f4[0], f4[1], f4[2]);
+}
+
+inline Matrix34 AZTransformToLYTransform(const AZ::Transform& source)
+{
+    return Matrix34::CreateFromVectors(
+        AZVec3ToLYVec3(source.GetBasisX()),
+        AZVec3ToLYVec3(source.GetBasisY()),
+        AZVec3ToLYVec3(source.GetBasisZ()),
+        AZVec3ToLYVec3(source.GetTranslation()));
+}
+
+inline Matrix33 AZMatrix3x3ToLYMatrix3x3(const AZ::Matrix3x3& source)
+{
+    return Matrix33::CreateFromVectors(
+        AZVec3ToLYVec3(source.GetColumn(0)),
+        AZVec3ToLYVec3(source.GetColumn(1)),
+        AZVec3ToLYVec3(source.GetColumn(2)));
+}
+
+inline AZ::Matrix3x3 LyMatrix3x3ToAzMatrix3x3(const Matrix33& source)
+{
+    return AZ::Matrix3x3::CreateFromColumns(
+        LYVec3ToAZVec3(source.GetColumn(0)),
+        LYVec3ToAZVec3(source.GetColumn(1)),
+        LYVec3ToAZVec3(source.GetColumn(2)));
+}
+
+inline Matrix34 AZMatrix3x4ToLYMatrix3x4(const AZ::Matrix3x4& source)
+{
+    AZ::Vector3 col0;
+    AZ::Vector3 col1;
+    AZ::Vector3 col2;
+    AZ::Vector3 col3;
+    source.GetBasisAndTranslation(&col0, &col1, &col2, &col3);
+
+    return Matrix34(
+        col0.GetX(), col1.GetX(), col2.GetX(), col3.GetX(),
+        col0.GetY(), col1.GetY(), col2.GetY(), col3.GetY(),
+        col0.GetZ(), col1.GetZ(), col2.GetZ(), col3.GetZ());
+}
+
+inline AZ::Transform LYTransformToAZTransform(const Matrix34& source)
+{
+    const AZ::Matrix3x4 matrix3x4 = AZ::Matrix3x4::CreateFromRowMajorFloat12(source.GetData());
+    return AZ::Transform::CreateFromMatrix3x4(matrix3x4);
+}
+
+inline AZ::Matrix3x4 LYTransformToAZMatrix3x4(const Matrix34& source)
+{
+    return AZ::Matrix3x4::CreateFromRowMajorFloat12(source.GetData());
+}
+
+inline AZ::Transform LYQuatTToAZTransform(const QuatT& source)
+{
+    return AZ::Transform::CreateFromQuaternionAndTranslation(
+        LYQuaternionToAZQuaternion(source.q),
+        LYVec3ToAZVec3(source.t));
+}
+
+inline QuatT AZTransformToLYQuatT(const AZ::Transform& source)
+{
+    return QuatT(
+        AZQuaternionToLYQuaternion(source.GetRotation()),
+        AZVec3ToLYVec3(source.GetTranslation()));
+}
+
+inline QuatT AZMatrix3x4ToLYQuatT(const AZ::Matrix3x4& source)
+{
+    AZ::Matrix3x4 sourceNoScale(source);
+    sourceNoScale.ExtractScale();
+
+    return QuatT(
+        AZQuaternionToLYQuaternion(AZ::Quaternion::CreateFromMatrix3x4(sourceNoScale)),
+        AZVec3ToLYVec3(source.GetTranslation()));
+}
+
+inline DualQuat AZMatrix3x4ToLYDualQuat(const AZ::Matrix3x4& matrix3x4)
+{
+    return DualQuat(AZMatrix3x4ToLYMatrix3x4(matrix3x4));
+}
+
+inline AABB AZAabbToLyAABB(const AZ::Aabb& source)
+{
+    return AABB(AZVec3ToLYVec3(source.GetMin()), AZVec3ToLYVec3(source.GetMax()));
+}
+
+inline AZ::Aabb LyAABBToAZAabb(const AABB& source)
+{
+    return AZ::Aabb::CreateFromMinMax(LYVec3ToAZVec3(source.min), LYVec3ToAZVec3(source.max));
+}
+
+inline AZ::Obb LyOBBtoAZObb(const OBB& source)
+{
+    const AZ::Vector3 position = LYVec3ToAZVec3(source.c);
+    const AZ::Quaternion rotation = AZ::Quaternion::CreateFromMatrix3x3(LyMatrix3x3ToAzMatrix3x3(source.m33));
+    const AZ::Vector3 halfLengths(source.h.x, source.h.y, source.h.z);
+    return AZ::Obb::CreateFromPositionRotationAndHalfLengths(position, rotation, halfLengths);
+}
+
+inline OBB AZObbToLyOBB(const AZ::Obb& source)
+{
+    return OBB::CreateOBB(
+        Matrix33::CreateFromVectors(
+            AZVec3ToLYVec3(source.GetAxisX()),
+            AZVec3ToLYVec3(source.GetAxisY()),
+            AZVec3ToLYVec3(source.GetAxisZ())),
+        Vec3(source.GetHalfLengthX(), source.GetHalfLengthY(), source.GetHalfLengthZ()),
+        AZVec3ToLYVec3(source.GetPosition()));
+}
+
+inline AZ::Plane LyPlaneToAZPlane(const ::Plane& source)
+{
+    return AZ::Plane::CreateFromNormalAndDistance(LYVec3ToAZVec3(source.n), source.d);
+}
+
+inline ::Plane AZPlaneToLyPlane(const AZ::Plane& source)
+{
+    ::Plane resultPlane;
+    resultPlane.Set(AZVec3ToLYVec3(source.GetNormal()), source.GetDistance());
+
+    return resultPlane;
+}
diff --git a/Code/Legacy/CryCommon/MemoryAccess.h b/Code/Legacy/CryCommon/MemoryAccess.h
new file mode 100644
index 0000000000..a6c42f0444
--- /dev/null
+++ b/Code/Legacy/CryCommon/MemoryAccess.h
@@ -0,0 +1,566 @@
+/*
+ * 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 : Misc mathematical functions
+
+#pragma once
+
+
+#include <platform.h>
+
+// Section dictionary
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define MEMORYACCESS_H_SECTION_TRAITS 1
+#define MEMORYACCESS_H_SECTION_CRYPREFETCH 2
+#endif
+
+// Traits
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MEMORYACCESS_H_SECTION_TRAITS
+    #include AZ_RESTRICTED_FILE(MemoryAccess_h)
+#else
+#define MEMORYACCESS_H_TRAIT_USE_LEGACY_PREFETCHLINE 1
+#endif
+
+#if MEMORYACCESS_H_TRAIT_USE_LEGACY_PREFETCHLINE
+#define PrefetchLine(ptr, off) cryPrefetchT0SSE((void*)((UINT_PTR)ptr + off))
+#else
+#define PrefetchLine(ptr, off) (void)(0)
+#endif
+#define ResetLine128(ptr, off) (void)(0)
+#define FlushLine128(ptr, off) (void)(0)
+
+
+
+//========================================================================================
+
+// cryMemcpy flags
+#define MC_CPU_TO_GPU 0x10
+#define MC_GPU_TO_CPU 0x20
+#define MC_CPU_TO_CPU 0x40
+
+extern int g_CpuFlags;
+
+//
+#define CPUF_SSE   0x01
+#define CPUF_SSE2  0x02
+#define CPUF_3DNOW 0x04
+#define CPUF_MMX   0x08
+#define CPUF_SSE3  0x10
+#define CPUF_F16C  0x20
+#define CPUF_SSE41 0x40
+
+#ifdef _CPU_SSE
+
+#ifdef _CPU_X86
+#include <xmmintrin.h>
+#endif
+
+#define _MM_PREFETCH(MemPtr, Hint) _mm_prefetch((MemPtr), (Hint));
+#define _MM_PREFETCH_LOOP(nCount, MemPtr, Hint) { for (int p = 0; p < nCount; p += 64) { _mm_prefetch((const char*)(MemPtr) + p, Hint); } \
+}
+#else //_CPU_SSE
+#define _MM_PREFETCH(MemPtr, Hint)
+#define _MM_PREFETCH_LOOP(nCount, MemPtr, Hint)
+#endif //_CPU_SSE
+
+void cryMemcpy(void* Dst, const void* Src, int Count);
+#if defined(LINUX) || defined(APPLE)
+// Define this for Mac and Linux since it is used with the pthread sources
+  #define mymemcpy16 memcpy
+#endif
+
+
+//==========================================================================================
+// 3DNow! optimizations
+
+#if defined _CPU_X86 && !defined(LINUX) && !defined(APPLE)
+// ***************************************************************************
+inline void cryPrecacheSSE(const void* src, int nbytes)
+{
+    _asm
+    {
+        mov esi, src
+        mov ecx, nbytes
+        // 64 bytes per pass
+        shr ecx, 6
+        jz endLabel
+
+loopMemToL1:
+        prefetchnta 64[ESI] // Prefetch next loop, non-temporal
+        prefetchnta 96[ESI]
+
+        movq mm1,  0[ESI]// Read in source data
+        movq mm2,  8[ESI]
+        movq mm3, 16[ESI]
+        movq mm4, 24[ESI]
+        movq mm5, 32[ESI]
+        movq mm6, 40[ESI]
+        movq mm7, 48[ESI]
+        movq mm0, 56[ESI]
+
+        add esi, 64
+        dec ecx
+        jnz loopMemToL1
+
+        emms
+
+endLabel:
+    }
+}
+
+
+#endif
+
+
+
+ILINE void cryPrefetchT0SSE(const void* src)
+{
+#if defined(WIN32) && !defined(WIN64)
+    _asm
+    {
+        mov esi, src
+            prefetchT0 [ESI] // Prefetch
+    }
+#else
+    _MM_PREFETCH((char*)src, _MM_HINT_T0);
+#endif
+}
+
+//=================================================================================
+
+// Very optimized memcpy() routine for AMD Athlon and Duron family.
+// This code uses any of FOUR different basic copy methods, depending
+// on the transfer size.
+// NOTE:  Since this code uses MOVNTQ (also known as "Non-Temporal MOV" or
+// "Streaming Store"), and also uses the software prefetch instructions,
+// be sure you're running on Athlon/Duron or other recent CPU before calling!
+
+#define TINY_BLOCK_COPY 64       // Upper limit for movsd type copy.
+// The smallest copy uses the X86 "movsd" instruction, in an optimized
+// form which is an "unrolled loop".
+
+#define IN_CACHE_COPY 64 * 1024  // Upper limit for movq/movq copy w/SW prefetch.
+// Next is a copy that uses the MMX registers to copy 8 bytes at a time,
+// also using the "unrolled loop" optimization.   This code uses
+// the software prefetch instruction to get the data into the cache.
+
+#define UNCACHED_COPY 197 * 1024 // Upper limit for movq/movntq w/SW prefetch.
+// For larger blocks, which will spill beyond the cache, it's faster to
+// use the Streaming Store instruction MOVNTQ.   This write instruction
+// bypasses the cache and writes straight to main memory.  This code also
+// uses the software prefetch instruction to pre-read the data.
+// USE 64 * 1024 FOR THIS VALUE IF YOU'RE ALWAYS FILLING A "CLEAN CACHE".
+
+#define BLOCK_PREFETCH_COPY  infinity // No limit for movq/movntq w/block prefetch.
+#define CACHEBLOCK 80h // Number of 64-byte blocks (cache lines) for block prefetch.
+// For the largest size blocks, a special technique called Block Prefetch
+// can be used to accelerate the read operations.   Block Prefetch reads
+// one address per cache line, for a series of cache lines, in a short loop.
+// This is faster than using software prefetch.  The technique is great for
+// getting maximum read bandwidth, especially in DDR memory systems.
+
+
+#if defined _CPU_X86 && !defined(LINUX) && !defined(APPLE)
+// Inline assembly syntax for use with Visual C++
+inline void cryMemcpy(void* Dst, const void* Src, int Count)
+{
+    if (g_CpuFlags & CPUF_SSE)
+    {
+        __asm
+        {
+            mov       ecx, [Count];
+            number of bytes to copy
+            mov       edi, [Dst];
+            destination
+            mov       esi, [Src];
+            source
+            mov       ebx, ecx;
+            keep a copy of count
+
+            cld
+            cmp       ecx, TINY_BLOCK_COPY
+            jb        $memcpy_ic_3;
+            tiny ? skip mmx copy
+
+            cmp       ecx, 32 * 1024;
+            dont align between 32k - 64k because
+            jbe       $memcpy_do_align;
+            it appears to be slower
+            cmp       ecx, 64*1024
+            jbe       $memcpy_align_done
+                      $memcpy_do_align :
+            mov       ecx, 8;
+            a trick thats faster than rep movsb ...
+            sub       ecx, edi;
+            align destination to qword
+            and       ecx, 111b;
+            get the low bits
+            sub       ebx, ecx;
+            update copy count
+            neg       ecx;
+            set up to jump into the array
+            add       ecx, offset $memcpy_align_done
+            jmp       ecx;
+            jump to array of movsbs
+
+                align 4
+            movsb
+            movsb
+            movsb
+            movsb
+            movsb
+            movsb
+            movsb
+            movsb
+
+$memcpy_align_done:;
+            destination is dword aligned
+            mov       ecx, ebx;
+            number of bytes left to copy
+            shr       ecx, 6;
+            get 64 - byte block count
+            jz        $memcpy_ic_2;
+            finish the last few bytes
+
+            cmp       ecx, IN_CACHE_COPY / 64;
+            too big 4 cache ? use uncached copy
+            jae       $memcpy_uc_test
+
+            // This is small block copy that uses the MMX registers to copy 8 bytes
+            // at a time.  It uses the "unrolled loop" optimization, and also uses
+            // the software prefetch instruction to get the data into the cache.
+                align 16
+            $memcpy_ic_1 :;
+            64 - byte block copies, in - cache copy
+
+            prefetchnta [esi + (200 * 64 / 34 + 192)];
+            start reading ahead
+
+            movq  mm0, [esi + 0];
+            read 64 bits
+            movq  mm1, [esi + 8]
+            movq  [edi + 0], mm0;
+            write 64 bits
+            movq  [edi + 8], mm1;
+note:  the normal movq writes the
+            movq  mm2, [esi + 16];
+            data to cache;
+            a cache line will be
+            movq  mm3, [esi + 24];
+            allocated as needed, to store the data
+                         movq  [edi + 16], mm2
+                         movq  [edi + 24], mm3
+            movq  mm0, [esi + 32]
+            movq  mm1, [esi + 40]
+            movq  [edi + 32], mm0
+                         movq  [edi + 40], mm1
+            movq  mm2, [esi + 48]
+            movq  mm3, [esi + 56]
+            movq  [edi + 48], mm2
+                         movq  [edi + 56], mm3
+
+            add       esi, 64;
+            update source pointer
+            add       edi, 64;
+            update destination pointer
+            dec       ecx;
+            count down
+            jnz       $memcpy_ic_1;
+            last 64 - byte block ?
+
+            $memcpy_ic_2 :
+            mov       ecx, ebx;
+            has valid low 6 bits of the byte count
+$memcpy_ic_3:
+            shr       ecx, 2;
+            dword count
+            and       ecx, 1111b;
+            only look at the "remainder" bits
+            neg       ecx;
+            set up to jump into the array
+            add       ecx, offset $memcpy_last_few
+            jmp       ecx;
+            jump to array of movsds
+
+$memcpy_uc_test:
+            cmp       ecx, UNCACHED_COPY / 64;
+            big enough ? use block prefetch copy
+            jae       $memcpy_bp_1
+
+                $memcpy_64_test :
+            or        ecx, ecx;
+            tail end of block prefetch will jump here
+            jz        $memcpy_ic_2;
+            no more 64 - byte blocks left
+
+            // For larger blocks, which will spill beyond the cache, it's faster to
+            // use the Streaming Store instruction MOVNTQ.   This write instruction
+            // bypasses the cache and writes straight to main memory.  This code also
+            // uses the software prefetch instruction to pre-read the data.
+               align 16
+$memcpy_uc_1:;
+            64 - byte blocks, uncached copy
+
+            prefetchnta [esi + (200 * 64 / 34 + 192)];
+            start reading ahead
+
+            movq  mm0, [esi + 0];
+            read 64 bits
+            add       edi, 64;
+            update destination pointer
+            movq  mm1, [esi + 8]
+            add       esi, 64;
+            update source pointer
+            movq  mm2, [esi - 48]
+            movntq    [edi - 64], mm0;
+            write 64 bits, bypassing the cache
+            movq  mm0, [esi - 40];
+note: movntq also prevents the CPU
+            movntq    [edi - 56], mm1;
+            from READING the destination address
+            movq  mm1, [esi - 32];
+            into the cache, only to be over - written
+                     movntq    [edi - 48], mm2;
+            so that also helps performance
+            movq  mm2, [esi - 24]
+            movntq    [edi - 40], mm0
+            movq  mm0, [esi - 16]
+            movntq    [edi - 32], mm1
+            movq  mm1, [esi - 8]
+            movntq    [edi - 24], mm2
+                  movntq    [edi - 16], mm0
+            dec       ecx
+                  movntq    [edi - 8], mm1
+            jnz       $memcpy_uc_1;
+            last 64 - byte block ?
+
+            jmp       $memcpy_ic_2;
+            almost done
+
+            // For the largest size blocks, a special technique called Block Prefetch
+            // can be used to accelerate the read operations.   Block Prefetch reads
+            // one address per cache line, for a series of cache lines, in a short loop.
+            // This is faster than using software prefetch.  The technique is great for
+            // getting maximum read bandwidth, especially in DDR memory systems.
+                $memcpy_bp_1 :;
+            large blocks, block prefetch copy
+
+            cmp       ecx, CACHEBLOCK;
+            big enough to run another prefetch loop ?
+            jl        $memcpy_64_test;
+            no, back to regular uncached copy
+
+            mov       eax, CACHEBLOCK / 2;
+            block prefetch loop, unrolled 2X
+            add       esi, CACHEBLOCK* 64;
+            move to the top of the block
+                align 16
+            $memcpy_bp_2 :
+            mov       edx, [esi - 64];
+            grab one address per cache line
+            mov       edx, [esi - 128];
+            grab one address per cache line
+            sub       esi, 128;
+            go reverse order to suppress HW prefetcher
+            dec       eax;
+            count down the cache lines
+            jnz       $memcpy_bp_2;
+            keep grabbing more lines into cache
+
+            mov       eax, CACHEBLOCK;
+            now that its in cache, do
+            {
+                the copy
+                            align 16
+$memcpy_bp_3:
+                movq  mm0, [esi   ];
+            } read 64 bits
+            movq  mm1, [esi + 8]
+            movq  mm2, [esi + 16]
+            movq  mm3, [esi + 24]
+            movq  mm4, [esi + 32]
+            movq  mm5, [esi + 40]
+            movq  mm6, [esi + 48]
+            movq  mm7, [esi + 56]
+            add       esi, 64;
+            update source pointer
+                movntq    [edi   ], mm0;
+            write 64 bits, bypassing cache
+            movntq    [edi + 8], mm1;
+note: movntq also prevents the CPU
+            movntq    [edi + 16], mm2;
+            from READING the destination address
+                movntq    [edi + 24], mm3;
+            into the cache, only to be over - written,
+                     movntq    [edi + 32], mm4;
+            so that also helps performance
+                movntq    [edi + 40], mm5
+                movntq    [edi + 48], mm6
+                movntq    [edi + 56], mm7
+            add       edi, 64;
+            update dest pointer
+
+            dec       eax;
+            count down
+
+            jnz       $memcpy_bp_3;
+            keep copying
+            sub       ecx, CACHEBLOCK;
+            update the 64 - byte block count
+            jmp       $memcpy_bp_1;
+            keep processing chunks
+
+            // The smallest copy uses the X86 "movsd" instruction, in an optimized
+            // form which is an "unrolled loop".   Then it handles the last few bytes.
+                align 4
+            movsd
+                movsd;
+            perform last 1 - 15 dword copies
+            movsd
+            movsd
+            movsd
+            movsd
+            movsd
+            movsd
+            movsd
+                    movsd;
+            perform last 1 - 7 dword copies
+            movsd
+            movsd
+            movsd
+            movsd
+            movsd
+            movsd
+
+$memcpy_last_few:;
+            dword aligned from before movsds
+            mov       ecx, ebx;
+            has valid low 2 bits of the byte count
+            and       ecx, 11b;
+            the last few cows must come home
+            jz        $memcpy_final;
+            no more, lets leave
+            rep       movsb;
+            the last 1, 2, or 3 bytes
+
+$memcpy_final:
+            emms;
+            clean up the MMX state
+                sfence;
+            flush the write buffer
+            //  mov     eax, [dest] ; ret value = destination pointer
+        }
+    }
+    else
+    {
+        memcpy(Dst, Src, Count);
+    }
+}
+
+inline void cryPrefetch(const void* Src, int nCount)
+{
+    nCount >>= 6;
+    if (nCount > 0)
+    {
+        _asm
+        {
+            mov esi, Src;
+            mov ecx, nCount;
+mPr0:
+            align 16
+            dec ecx;
+            mov eax, [esi];
+            mov eax, 0;
+            lea esi, [esi + 40h];
+            jne mPr0;
+        }
+    }
+    else
+    {
+        _asm
+        {
+            mov esi, Src;
+            mov ecx, nCount;
+mPr1:
+            align 16
+            inc ecx;
+            mov eax, [esi];
+            mov eax, 0;
+            lea esi, [esi - 40h];
+            jne mPr1;
+        }
+    }
+}
+
+inline void cryMemcpy (void* inDst, const void* inSrc, int nCount, int nFlags)
+{
+    cryMemcpy(inDst, inSrc, nCount);
+}
+
+//==========================================================================================
+// SSE optimizations
+
+
+#else
+
+const int PREFNTA_BLOCK = 0x4000;
+
+ILINE void cryMemcpy(void* Dst, const void* Src, int n)
+{
+    char* dst = (char*)Dst;
+    char* src = (char*)Src;
+    while (n > PREFNTA_BLOCK)
+    {
+        _MM_PREFETCH_LOOP(PREFNTA_BLOCK, src, _MM_HINT_NTA);
+
+        memcpy(dst, src, PREFNTA_BLOCK);
+        src += PREFNTA_BLOCK;
+        dst += PREFNTA_BLOCK;
+        n -= PREFNTA_BLOCK;
+    }
+    _MM_PREFETCH_LOOP(n, src, _MM_HINT_NTA);
+    memcpy(dst, src, n);
+}
+
+ILINE void cryMemcpy(void* Dst, const void* Src, int n, [[maybe_unused]] int nFlags)
+{
+    char* dst = (char*)Dst;
+    char* src = (char*)Src;
+    while (n > PREFNTA_BLOCK)
+    {
+        _MM_PREFETCH_LOOP(PREFNTA_BLOCK, src, _MM_HINT_NTA);
+        memcpy(dst, src, PREFNTA_BLOCK);
+        src += PREFNTA_BLOCK;
+        dst += PREFNTA_BLOCK;
+        n -= PREFNTA_BLOCK;
+    }
+    _MM_PREFETCH_LOOP(n, src, _MM_HINT_NTA);
+    memcpy(dst, src, n);
+}
+
+
+#endif
+
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MEMORYACCESS_H_SECTION_CRYPREFETCH
+    #include AZ_RESTRICTED_FILE(MemoryAccess_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+//implement something usual to bring one memory location into L1 data cache
+ILINE void CryPrefetch(const void* const cpSrc)
+{
+    cryPrefetchT0SSE(cpSrc);
+}
+#endif
+
+#define CryPrefetchInl CryPrefetch
diff --git a/Code/Legacy/CryCommon/MetaUtils.h b/Code/Legacy/CryCommon/MetaUtils.h
new file mode 100644
index 0000000000..aec3104604
--- /dev/null
+++ b/Code/Legacy/CryCommon/MetaUtils.h
@@ -0,0 +1,134 @@
+/*
+ * 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_METAUTILS_H
+#define CRYINCLUDE_CRYCOMMON_METAUTILS_H
+#pragma once
+
+
+
+namespace metautils
+{
+    // select
+
+    template<bool Condition, typename Ty1, typename Ty2>
+    struct select;
+
+    template<typename Ty1, typename Ty2>
+    struct select<true, Ty1, Ty2>
+    {
+        typedef Ty1 type;
+    };
+
+    template<typename Ty1, typename Ty2>
+    struct select<false, Ty1, Ty2>
+    {
+        typedef Ty2 type;
+    };
+
+    // is_same
+    // Identifies whether types Ty1 and Ty2 are the same including const & volatile.
+
+    template<typename Ty1, typename Ty2>
+    struct is_same;
+
+    template<typename Ty1>
+    struct is_same<Ty1, Ty1>
+    {
+        enum
+        {
+            value = true,
+        };
+    };
+
+    template<typename Ty1, typename Ty2>
+    struct is_same
+    {
+        enum
+        {
+            value = false,
+        };
+    };
+
+    // remove_const
+    // Removes top level const qualifier.
+
+    template<class Ty>
+    struct remove_const
+    {
+        typedef Ty type;
+    };
+
+    template<class Ty>
+    struct remove_const<const Ty>
+    {
+        typedef Ty type;
+    };
+
+    template<class Ty>
+    struct remove_const<const Ty[]>
+    {
+        typedef Ty type[];
+    };
+
+    template<class Ty, unsigned int N>
+    struct remove_const<const Ty[N]>
+    {
+        typedef Ty type[N];
+    };
+
+    // is_const
+    // Determines whether type Ty is const qualified.
+
+    template <typename Ty>
+    struct is_const
+    {
+        enum
+        {
+            value = false
+        };
+    };
+
+    template <typename Ty>
+    struct is_const<const Ty>
+    {
+        enum
+        {
+            value = true
+        };
+    };
+
+    template<class Ty, unsigned int N>
+    struct is_const<Ty[N]>
+    {
+        enum
+        {
+            value = false
+        };
+    };
+
+    template<class Ty, unsigned int N>
+    struct is_const<const Ty[N]>
+    {
+        enum
+        {
+            value = true
+        };
+    };
+
+    template<class Ty>
+    struct is_const<Ty&>
+    {
+        enum
+        {
+            value = false
+        };
+    };
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_METAUTILS_H
diff --git a/Code/Legacy/CryCommon/MicrophoneBus.h b/Code/Legacy/CryCommon/MicrophoneBus.h
new file mode 100644
index 0000000000..0695fb7504
--- /dev/null
+++ b/Code/Legacy/CryCommon/MicrophoneBus.h
@@ -0,0 +1,86 @@
+/*
+ * 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 <IAudioInterfacesCommonData.h>
+
+namespace Audio
+{
+    /**
+     * Interface for connecting with a hardware Microphone device.
+     * The pattern that should be used is as follows:
+     * 
+     * InitializeDevice
+     *  StartSession
+     *   (Capturing Mic Data...)
+     *  EndSession
+     *  ...
+     *  (optional: additional StartSession/EndSession pairs)
+     *  ...
+     * ShutdownDevice
+     */
+    class MicrophoneRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        /**
+         * EBus Traits
+         */
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        using MutexType = AZStd::recursive_mutex;
+
+        /**
+         * Initialize a hardware Microphone input device with the OS.
+         * @return True if the Microphone was initialized without errors, false otherwise.
+         */
+        virtual bool InitializeDevice() = 0;
+
+        /**
+         * Shutdown the connection to the Microphone device.
+         */
+        virtual void ShutdownDevice() = 0;
+
+        /**
+         * Start capturing Microphone data.
+         * @return True if the Microphone capturing session was started without errors, false otherwise.
+         */
+        virtual bool StartSession() = 0;
+
+        /**
+         * Stop capturing Microphone data.
+         */
+        virtual void EndSession() = 0;
+
+        /**
+         * Check if the Microphone is actively capturing data.
+         * @return True if a capturing session has started and is running, false otherwise.
+         */
+        virtual bool IsCapturing() = 0;
+
+        /**
+         * Obtain the format set up for the mic capture session.
+         * @return Configuration of the Microphone.
+         */
+        virtual SAudioInputConfig GetFormatConfig() const = 0;
+
+        /**
+         * Consume a number of sample frames from the captured data.
+         * @param outputData Where the data will be copied to.
+         * @param numFrames The number of sample frames requested.
+         * @param targetConfig The configuration of the data sink (sample rate, channels, sample type, etc).
+         * @param shouldDeinterleave Ask for a deinterleaved copy when in stereo: [LRLRLRLR] --> [LLLL, RRRR]
+         * @return The number of sample frames obtained.
+         */
+        virtual AZStd::size_t GetData(void** outputData, AZStd::size_t numFrames, const SAudioInputConfig& targetConfig, bool shouldDeinterleave) = 0;
+    };
+
+    using MicrophoneRequestBus = AZ::EBus<MicrophoneRequests>;
+
+} // namespace Audio
diff --git a/Code/Legacy/CryCommon/MiniQueue.h b/Code/Legacy/CryCommon/MiniQueue.h
new file mode 100644
index 0000000000..24063b8a0f
--- /dev/null
+++ b/Code/Legacy/CryCommon/MiniQueue.h
@@ -0,0 +1,295 @@
+/*
+ * 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 : a small memory overhead, fixed size, efficient, iterable
+//               queue class  used for CContextView  SObjectClone
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_MINIQUEUE_H
+#define CRYINCLUDE_CRYCOMMON_MINIQUEUE_H
+#pragma once
+
+
+// this class implements a very small queue of plain-old-data
+template <typename T, uint8 N>
+struct MiniQueue
+{
+public:
+    MiniQueue()
+        : m_nValues(0)
+        , m_nOffset(0) {}
+
+    MiniQueue(const MiniQueue& mq)
+    {
+        m_nValues = mq.m_nValues;
+        m_nOffset = 0;
+        for (int i = 0; i < m_nValues; i++)
+        {
+            m_vValues[i] = mq[i];
+        }
+    }
+
+    bool Empty() const
+    {
+        return m_nValues == 0;
+    }
+    bool Full() const
+    {
+        return m_nValues == N;
+    }
+    uint8 Size() const
+    {
+        return m_nValues;
+    }
+    uint8 Capacity() const
+    {
+        return N;
+    }
+    ILINE void Push(T nValue)
+    {
+        assert(!Full());
+        m_vValues[(m_nOffset + m_nValues) % N] = nValue;
+        m_nValues++;
+    }
+    // push, but if the queue is full, then pop first
+    void CyclePush(T nValue)
+    {
+        if (Full())
+        {
+            Pop();
+        }
+        Push(nValue);
+    }
+    void PushFront(T nValue)
+    {
+        assert(!Full());
+        m_nOffset = (m_nOffset + (N - 1)) % N;
+        m_vValues[m_nOffset] = nValue;
+        m_nValues++;
+    }
+    T Front() const
+    {
+        assert(!Empty());
+        return m_vValues[m_nOffset];
+    }
+    T& Front()
+    {
+        assert(!Empty());
+        return m_vValues[m_nOffset];
+    }
+    T& operator[](int i)
+    {
+        return m_vValues[(m_nOffset + i) % N];
+    }
+    T operator[](int i) const
+    {
+        return m_vValues[(m_nOffset + i) % N];
+    }
+    T Back() const
+    {
+        assert(!Empty());
+        return m_vValues[(m_nOffset + m_nValues - 1) % N];
+    }
+    T& Back()
+    {
+        assert(!Empty());
+        return m_vValues[(m_nOffset + m_nValues - 1) % N];
+    }
+    void Pop()
+    {
+        assert(!Empty());
+        m_nOffset = (m_nOffset + 1) % N;
+        m_nValues--;
+    }
+    void PopBack()
+    {
+        assert(!Empty());
+        m_nValues--;
+    }
+    void Clear()
+    {
+        m_nOffset = m_nValues = 0;
+    }
+
+    struct SIterator
+    {
+    public:
+        SIterator() {}
+        SIterator(T* pValues, uint8 nOffset)
+            : m_pValues(pValues)
+            , m_nOffset(nOffset) {}
+        T& operator*()
+        {
+            return m_pValues[m_nOffset % N];
+        }
+        T* operator->()
+        {
+            return &m_pValues[m_nOffset % N];
+        }
+        SIterator& operator++()
+        {
+            m_nOffset++;
+            return *this;
+        }
+        SIterator operator++(int)
+        {
+            SIterator itor = *this;
+            ++m_nOffset;
+            return itor;
+        }
+        SIterator& operator--()
+        {
+            m_nOffset--;
+            return *this;
+        }
+        SIterator& operator+=(uint8 delta)
+        {
+            m_nOffset += delta;
+            return *this;
+        }
+        SIterator& operator-=(uint8 delta)
+        {
+            m_nOffset -= delta;
+            return *this;
+        }
+
+        friend bool operator!=(const SIterator& a, const SIterator& b)
+        {
+            assert(a.m_pValues == b.m_pValues);
+            return a.m_nOffset != b.m_nOffset;
+        }
+        friend bool operator==(const SIterator& a, const SIterator& b)
+        {
+            assert(a.m_pValues == b.m_pValues);
+            return a.m_nOffset == b.m_nOffset;
+        }
+
+        friend int operator-(const SIterator& a, const SIterator& b)
+        {
+            assert(a.m_pValues == b.m_pValues);
+            int diff = int(a.m_nOffset) - int(b.m_nOffset);
+            return diff;
+        }
+
+        uint8 Offset() { return m_nOffset; }
+
+    private:
+        T* m_pValues;
+        uint8 m_nOffset;
+    };
+
+    SIterator Begin() { return SIterator(m_vValues, m_nOffset); }
+    SIterator End() { return SIterator(m_vValues, m_nOffset + m_nValues); }
+
+    SIterator RBegin() { return SIterator(m_vValues, m_nOffset + m_nValues - 1); }
+    SIterator REnd() { return SIterator(m_vValues, m_nOffset - 1); }
+
+    struct SConstIterator
+    {
+    public:
+        SConstIterator() {}
+        SConstIterator(const T* pValues, uint8 nOffset)
+            : m_pValues(pValues)
+            , m_nOffset(nOffset) {}
+        const T& operator*()
+        {
+            return m_pValues[m_nOffset % N];
+        }
+        const T* operator->()
+        {
+            return &m_pValues[m_nOffset % N];
+        }
+        SConstIterator& operator++()
+        {
+            m_nOffset++;
+            return *this;
+        }
+        SConstIterator& operator--()
+        {
+            m_nOffset--;
+            return *this;
+        }
+        SConstIterator& operator+=(uint8 delta)
+        {
+            m_nOffset += delta;
+            return *this;
+        }
+        SConstIterator& operator-=(uint8 delta)
+        {
+            m_nOffset -= delta;
+            return *this;
+        }
+        friend bool operator!=(const SConstIterator& a, const SConstIterator& b)
+        {
+            assert(a.m_pValues == b.m_pValues);
+            return a.m_nOffset != b.m_nOffset;
+        }
+        friend bool operator==(const SConstIterator& a, const SConstIterator& b)
+        {
+            assert(a.m_pValues == b.m_pValues);
+            return a.m_nOffset == b.m_nOffset;
+        }
+
+        friend int operator-(const SConstIterator& a, const SConstIterator& b)
+        {
+            assert(a.m_pValues == b.m_pValues);
+            int diff = int(a.m_nOffset) - int(b.m_nOffset);
+            return diff;
+        }
+
+        uint8 Offset() { return m_nOffset; }
+
+    private:
+        const T* m_pValues;
+        uint8 m_nOffset;
+    };
+
+    SConstIterator Begin() const { return SConstIterator(m_vValues, m_nOffset); }
+    SConstIterator End() const { return SConstIterator(m_vValues, m_nOffset + m_nValues); }
+
+    SConstIterator RBegin() const { return SConstIterator(m_vValues, m_nOffset + m_nValues - 1); }
+    SConstIterator REnd() const { return SConstIterator(m_vValues, m_nOffset - 1); }
+
+    void Erase(SIterator where)
+    {
+        assert(where.Offset() >= m_nOffset);
+        assert(where.Offset() < m_nOffset + m_nValues);
+        for (size_t offset = where.Offset(); offset < (size_t)(m_nOffset + m_nValues - 1); offset++)
+        {
+            m_vValues[offset % N] = m_vValues[(offset + 1) % N];
+        }
+        m_nValues--;
+    }
+
+    void Erase(SIterator first, SIterator last)
+    {
+        int num = last - first;
+        if (num == 0)
+        {
+            return;
+        }
+        assert(num > 0);
+        assert(num <= Size());
+        assert(first.Offset() >= m_nOffset);
+        assert(first.Offset() < m_nOffset + m_nValues);
+        assert(last.Offset() >= m_nOffset);
+        assert(last.Offset() <= m_nOffset + m_nValues);
+        for (int offset = (int)first.Offset(); offset < m_nOffset + m_nValues - 1; offset++)
+        {
+            m_vValues[offset % N] = m_vValues[(offset + num) % N];
+        }
+        m_nValues -= num;
+    }
+
+private:
+    uint8 m_nValues;
+    uint8 m_nOffset;
+    T m_vValues[N];
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_MINIQUEUE_H
diff --git a/Code/Legacy/CryCommon/Mocks/IAudioSystemMock.h b/Code/Legacy/CryCommon/Mocks/IAudioSystemMock.h
new file mode 100644
index 0000000000..fbeb6c89ce
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/IAudioSystemMock.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#include <IAudioSystem.h>
+
+namespace Audio
+{
+    struct AudioProxyMock
+        : public IAudioProxy
+    {
+        MOCK_METHOD2(Initialize, void(const char* const sObjectName, bool bInitAsync /* = true */));
+        MOCK_METHOD0(Release, void());
+        MOCK_METHOD0(Reset, void());
+        MOCK_METHOD1(StopTrigger, void(TAudioControlID nTriggerID));
+        MOCK_METHOD2(SetSwitchState, void(TAudioControlID nSwitchID, TAudioSwitchStateID nStateID));
+        MOCK_METHOD2(SetRtpcValue, void(TAudioControlID nRtpcID, float fValue));
+        MOCK_METHOD1(SetObstructionCalcType, void(EAudioObjectObstructionCalcType eObstructionType));
+        MOCK_METHOD1(SetPosition, void(const SATLWorldPosition& rPosition));
+        MOCK_METHOD1(SetPosition, void(const AZ::Vector3& rPosition));
+        MOCK_METHOD2(SetEnvironmentAmount, void(TAudioEnvironmentID nEnvironmentID, float fAmount));
+        MOCK_METHOD0(SetCurrentEnvironments, void());
+        MOCK_CONST_METHOD0(GetAudioObjectID, TAudioObjectID());
+    };
+
+    struct AudioSystemMock
+        : public IAudioSystem
+    {
+        MOCK_METHOD0(Initialize, bool());
+        MOCK_METHOD0(Release, void());
+        MOCK_METHOD1(PushRequest, void(const SAudioRequest& rAudioRequestData));
+        MOCK_METHOD4(AddRequestListener, void(AudioRequestCallbackType func, void* pObjectToListenTo, EAudioRequestType requestType /* = eART_AUDIO_ALL_REQUESTS */, TATLEnumFlagsType specificRequestMask /* = ALL_AUDIO_REQUEST_SPECIFIC_TYPE_FLAGS */));
+        MOCK_METHOD2(RemoveRequestListener, void(AudioRequestCallbackType func, void* pObjectToListenTo));
+        MOCK_METHOD0(ExternalUpdate, void());
+        MOCK_CONST_METHOD1(GetAudioTriggerID, TAudioControlID(const char* sAudioTriggerName));
+        MOCK_CONST_METHOD1(GetAudioRtpcID, TAudioControlID(const char* sAudioRtpcName));
+        MOCK_CONST_METHOD1(GetAudioSwitchID, TAudioControlID(const char* sAudioSwitchName));
+        MOCK_CONST_METHOD2(GetAudioSwitchStateID, TAudioSwitchStateID(const TAudioControlID nSwitchID, const char* sAudioStateName));
+        MOCK_CONST_METHOD1(GetAudioPreloadRequestID, TAudioPreloadRequestID(const char* sAudioPreloadRequestName));
+        MOCK_CONST_METHOD1(GetAudioEnvironmentID, TAudioEnvironmentID(const char* sAudioEnvironmentName));
+        MOCK_METHOD1(ReserveAudioListenerID, bool(TAudioObjectID& rAudioListenerID));
+        MOCK_METHOD1(ReleaseAudioListenerID, bool(TAudioObjectID nAudioObjectID));
+        MOCK_METHOD1(OnCVarChanged, void(ICVar* const pCVar));
+        MOCK_METHOD1(GetInfo, void(SAudioSystemInfo& rAudioSystemInfo));
+        MOCK_CONST_METHOD0(GetControlsPath, const char*());
+        MOCK_METHOD0(UpdateControlsPath, void());
+        MOCK_METHOD0(GetFreeAudioProxy, IAudioProxy*());
+        MOCK_METHOD1(FreeAudioProxy, void(IAudioProxy* pIAudioProxy));
+        MOCK_CONST_METHOD2(GetAudioControlName, const char*(EAudioControlType eAudioEntityType, TATLIDType nAudioEntityID));
+        MOCK_CONST_METHOD2(GetAudioSwitchStateName, const char*(TAudioControlID switchID, TAudioSwitchStateID stateID));
+    };
+
+} // namespace Audio
diff --git a/Code/Legacy/CryCommon/Mocks/ICVarMock.h b/Code/Legacy/CryCommon/Mocks/ICVarMock.h
new file mode 100644
index 0000000000..791fd32bd3
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/ICVarMock.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 <IConsole.h>
+#include <AzTest/AzTest.h>
+
+#include <SFunctor.h>
+
+class CVarMock
+    : public ICVar
+{
+public:
+    MOCK_METHOD0(Release, void());
+    MOCK_CONST_METHOD0(GetIVal, int());
+    MOCK_CONST_METHOD0(GetI64Val, int64());
+    MOCK_CONST_METHOD0(GetFVal, float());
+    MOCK_CONST_METHOD0(GetString, const char*());
+    MOCK_CONST_METHOD0(GetDataProbeString, const char*());
+    MOCK_METHOD1(Set, void(const char*));
+    MOCK_METHOD1(ForceSet, void(const char*));
+    MOCK_METHOD1(Set, void(float));
+    MOCK_METHOD1(Set, void(int));
+    MOCK_METHOD1(ClearFlags, void(const int));
+    MOCK_CONST_METHOD0(GetFlags, int());
+    MOCK_METHOD1(SetFlags, int(const int));
+    MOCK_METHOD0(GetType, int());
+    MOCK_CONST_METHOD0(GetName, const char*());
+    MOCK_METHOD0(GetHelp, const char*());
+    MOCK_CONST_METHOD0(IsConstCVar, bool());
+    MOCK_METHOD1(SetOnChangeCallback, void(ConsoleVarFunc));
+    MOCK_METHOD1(AddOnChangeFunctor, uint64(const SFunctor& pChangeFunctor));
+    MOCK_CONST_METHOD0(GetNumberOfOnChangeFunctors, uint64());
+    MOCK_CONST_METHOD1(GetOnChangeFunctor, const SFunctor&(uint64));
+    MOCK_METHOD1(RemoveOnChangeFunctor, bool(uint64));
+    MOCK_CONST_METHOD0(GetOnChangeCallback, ConsoleVarFunc());
+    MOCK_CONST_METHOD1(GetMemoryUsage, void(class ICrySizer* pSizer));
+    MOCK_CONST_METHOD0(GetRealIVal, int());
+    MOCK_METHOD2(SetLimits, void(float, float));
+    MOCK_METHOD2(GetLimits, void(float&, float&));
+    MOCK_METHOD0(HasCustomLimits, bool());
+    MOCK_METHOD1(SetDataProbeString, void(const char*));
+};
diff --git a/Code/Legacy/CryCommon/Mocks/IConsoleMock.h b/Code/Legacy/CryCommon/Mocks/IConsoleMock.h
new file mode 100644
index 0000000000..7527ced07a
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/IConsoleMock.h
@@ -0,0 +1,90 @@
+/*
+ * 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_ICONSOLEMOCK_H
+#define CRYINCLUDE_CRYCOMMON_ICONSOLEMOCK_H
+#pragma once
+
+#include <IConsole.h>
+#include <AzTest/AzTest.h>
+
+// Implements the Console interface
+class ConsoleMock
+    : public ::IConsole
+{
+public:
+    MOCK_METHOD0(Release, void());
+    MOCK_METHOD1(Init, void(ISystem * pSystem));
+    MOCK_METHOD5(RegisterString, ICVar * (const char* sName, const char* sValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc));
+    MOCK_METHOD5(RegisterInt, ICVar * (const char* sName, int iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc));
+    MOCK_METHOD5(RegisterInt64, ICVar * (const char* sName, int64 iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc));
+    MOCK_METHOD5(RegisterFloat, ICVar * (const char* sName, float fValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc));
+    MOCK_METHOD7(Register, ICVar * (const char* name, float* src, float defaultvalue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify));
+    MOCK_METHOD7(Register, ICVar * (const char* name, int* src, int defaultvalue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify));
+    MOCK_METHOD7(Register, ICVar * (const char* name, const char** src, const char* defaultvalue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify));
+    MOCK_METHOD1(Register, ICVar * (ICVar * pVar));
+    MOCK_METHOD2(UnregisterVariable, void(const char* sVarName, bool bDelete ));
+    MOCK_METHOD1(SetScrollMax, void(int value));
+    MOCK_METHOD1(AddOutputPrintSink, void(IOutputPrintSink * inpSink));
+    MOCK_METHOD1(RemoveOutputPrintSink, void(IOutputPrintSink * inpSink));
+    MOCK_METHOD2(ShowConsole, void(bool show, int iRequestScrollMax));
+    MOCK_METHOD2(DumpCVars, void(ICVarDumpSink * pCallback, unsigned int nFlagsFilter));
+    MOCK_METHOD2(CreateKeyBind, void(const char* sCmd, const char* sRes));
+    MOCK_METHOD2(SetImage, void (ITexture * pImage, bool bDeleteCurrent));
+    MOCK_METHOD0(GetImage, ITexture * ());
+    MOCK_METHOD1(StaticBackground, void (bool bStatic));
+    MOCK_METHOD1(SetLoadingImage, void(const char* szFilename));
+    MOCK_CONST_METHOD3(GetLineNo, bool(int indwLineNo, char* outszBuffer, int indwBufferSize));
+    MOCK_CONST_METHOD0(GetLineCount, int ());
+    MOCK_METHOD1(GetCVar, ICVar * (const char* name));
+    MOCK_METHOD3(GetVariable, char*(const char* szVarName, const char* szFileName, const char* def_val));
+    MOCK_METHOD3(GetVariable, float (const char* szVarName, const char* szFileName, float def_val));
+    MOCK_METHOD1(PrintLine, void (const char* s));
+    MOCK_METHOD1(PrintLinePlus, void (const char* s));
+    MOCK_METHOD0(GetStatus, bool());
+    MOCK_METHOD0(Clear, void());
+    MOCK_METHOD0(Update, void());
+    MOCK_METHOD0(Draw, void());
+    MOCK_METHOD4(AddCommand, bool (const char* sCommand, ConsoleCommandFunc func, int nFlags, const char* sHelp));
+    MOCK_METHOD4(AddCommand, bool (const char* sName, const char* sScriptFunc, int nFlags, const char* sHelp));
+    MOCK_METHOD1(RemoveCommand, void (const char* sName));
+    MOCK_METHOD3(ExecuteString, void (const char* command, bool bSilentMode, bool bDeferExecution ));
+    MOCK_METHOD0(IsOpened, bool ());
+    MOCK_METHOD0(GetNumVars, int());
+    MOCK_METHOD0(GetNumVisibleVars, int());
+    MOCK_METHOD3(GetSortedVars, size_t (const char** pszArray, size_t numItems, const char* szPrefix));
+    MOCK_METHOD1(AutoComplete, const char*(const char* substr));
+    MOCK_METHOD1(AutoCompletePrev, const char*(const char* substr));
+    MOCK_METHOD1(ProcessCompletion, const char*(const char* szInputBuffer));
+    MOCK_METHOD2(RegisterAutoComplete, void (const char* sVarOrCommand, IConsoleArgumentAutoComplete * pArgAutoComplete));
+    MOCK_METHOD1(UnRegisterAutoComplete, void (const char* sVarOrCommand));
+    MOCK_METHOD0(ResetAutoCompletion, void ());
+    MOCK_CONST_METHOD1(GetMemoryUsage, void (ICrySizer * pSizer));
+    MOCK_METHOD1(ResetProgressBar, void (int nProgressRange));
+    MOCK_METHOD0(TickProgressBar, void ());
+    MOCK_METHOD1(SetInputLine, void (const char* szLine));
+    MOCK_METHOD1(DumpKeyBinds, void (IKeyBindDumpSink * pCallback));
+    MOCK_CONST_METHOD1(FindKeyBind, const char*(const char* sCmd));
+    MOCK_METHOD0(GetNumCheatVars, int ());
+    MOCK_METHOD2(SetCheatVarHashRange, void (size_t firstVar, size_t lastVar));
+    MOCK_METHOD0(CalcCheatVarHash, void ());
+    MOCK_METHOD0(IsHashCalculated, bool ());
+    MOCK_METHOD0(GetCheatVarHash, uint64 ());
+    MOCK_METHOD1(PrintCheatVars, void (bool bUseLastHashRange));
+    MOCK_METHOD1(GetCheatVarAt, char* (uint32 nOffset));
+    MOCK_METHOD1(AddConsoleVarSink, void (IConsoleVarSink * pSink));
+    MOCK_METHOD1(RemoveConsoleVarSink, void (IConsoleVarSink * pSink));
+    MOCK_METHOD1(GetHistoryElement, const char*(bool bUpOrDown));
+    MOCK_METHOD1(AddCommandToHistory, void (const char* szCommand));
+    MOCK_METHOD2(LoadConfigVar, void (const char* sVariable, const char* sValue));
+    MOCK_METHOD1(EnableActivationKey, void (bool bEnable));
+    MOCK_METHOD2(SetClientDataProbeString, void (const char* pName, const char* pValue));
+
+    // can't mock variadic methods, so just override here.
+    void Exit([[maybe_unused]] const char* command, ...) override {};
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_ICONSOLEMOCK_H
diff --git a/Code/Legacy/CryCommon/Mocks/ICryPakMock.h b/Code/Legacy/CryCommon/Mocks/ICryPakMock.h
new file mode 100644
index 0000000000..77665ae502
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/ICryPakMock.h
@@ -0,0 +1,102 @@
+/*
+ * 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 <AzTest/AzTest.h>
+#include <AzCore/IO/FileIO.h>
+#include <AzFramework/Archive/INestedArchive.h>
+#include <AzFramework/Archive/IArchive.h>
+
+
+struct CryPakMock
+    : AZ::IO::IArchive
+{
+    MOCK_METHOD5(AdjustFileName, const char*(AZStd::string_view src, char* dst, size_t dstSize, uint32_t nFlags, bool skipMods));
+    MOCK_METHOD1(Init, bool(AZStd::string_view szBasePath));
+    MOCK_METHOD0(Release, void());
+    MOCK_CONST_METHOD1(IsInstalledToHDD, bool(AZStd::string_view acFilePath));
+
+    MOCK_METHOD5(OpenPack, bool(AZStd::string_view, uint32_t, AZStd::intrusive_ptr<AZ::IO::MemoryBlock>, AZStd::fixed_string<AZ::IO::IArchive::MaxPath>*, bool));
+    MOCK_METHOD6(OpenPack, bool(AZStd::string_view, AZStd::string_view, uint32_t, AZStd::intrusive_ptr<AZ::IO::MemoryBlock>, AZStd::fixed_string<AZ::IO::IArchive::MaxPath>*, bool));
+    MOCK_METHOD3(OpenPacks, bool(AZStd::string_view pWildcard, uint32_t nFlags, AZStd::vector<AZStd::fixed_string<AZ::IO::IArchive::MaxPath>>* pFullPaths));
+    MOCK_METHOD4(OpenPacks, bool(AZStd::string_view pBindingRoot, AZStd::string_view pWildcard, uint32_t nFlags, AZStd::vector<AZStd::fixed_string<AZ::IO::IArchive::MaxPath>>* pFullPaths));
+    MOCK_METHOD2(ClosePack, bool(AZStd::string_view pName, uint32_t nFlags));
+    MOCK_METHOD2(ClosePacks, bool(AZStd::string_view pWildcard, uint32_t nFlags));
+    MOCK_METHOD1(FindPacks, bool(AZStd::string_view pWildcardIn));
+    MOCK_METHOD3(SetPacksAccessible, bool(bool bAccessible, AZStd::string_view pWildcard, uint32_t nFlags));
+    MOCK_METHOD3(SetPackAccessible, bool(bool bAccessible, AZStd::string_view pName, uint32_t nFlags));
+    MOCK_METHOD3(LoadPakToMemory, bool(AZStd::string_view pName, EInMemoryArchiveLocation eLoadToMemory, AZStd::intrusive_ptr<AZ::IO::MemoryBlock> pMemoryBlock));
+    MOCK_METHOD2(LoadPaksToMemory, void(int nMaxPakSize, bool bLoadToMemory));
+    MOCK_METHOD1(GetMod, const char*(int index));
+    MOCK_METHOD1(ParseAliases, void(AZStd::string_view szCommandLine));
+    MOCK_METHOD3(SetAlias, void(AZStd::string_view szName, AZStd::string_view szAlias, bool bAdd));
+    MOCK_METHOD2(GetAlias, const char*(AZStd::string_view szName, bool bReturnSame));
+    MOCK_METHOD0(Lock, void());
+    MOCK_METHOD0(Unlock, void());
+    MOCK_METHOD1(SetLocalizationFolder, void(AZStd::string_view sLocalizationFolder));
+    MOCK_CONST_METHOD0(GetLocalizationFolder, const char*());
+    MOCK_CONST_METHOD0(GetLocalizationRoot, const char*());
+    MOCK_METHOD3(FOpen, AZ::IO::HandleType(AZStd::string_view pName, const char* mode, uint32_t nFlags));
+    MOCK_METHOD4(FReadRaw, size_t(void* data, size_t length, size_t elems, AZ::IO::HandleType handle));
+    MOCK_METHOD3(FReadRawAll, size_t(void* data, size_t nFileSize, AZ::IO::HandleType handle));
+    MOCK_METHOD2(FGetCachedFileData, void*(AZ::IO::HandleType handle, size_t & nFileSize));
+    MOCK_METHOD4(FWrite, size_t(const void* data, size_t length, size_t elems, AZ::IO::HandleType handle));
+    MOCK_METHOD3(FGets, char*(char*, int, AZ::IO::HandleType));
+    MOCK_METHOD1(Getc, int(AZ::IO::HandleType));
+    MOCK_METHOD1(FGetSize, size_t(AZ::IO::HandleType f));
+    MOCK_METHOD2(FGetSize, size_t(AZStd::string_view pName, bool bAllowUseFileSystem));
+    MOCK_METHOD1(IsInPak, bool(AZ::IO::HandleType handle));
+    MOCK_METHOD1(RemoveFile, bool(AZStd::string_view pName));
+    MOCK_METHOD1(RemoveDir, bool(AZStd::string_view pName));
+    MOCK_METHOD1(IsAbsPath, bool(AZStd::string_view pPath));
+    MOCK_METHOD3(FSeek, size_t(AZ::IO::HandleType handle, uint64_t seek, int mode));
+    MOCK_METHOD1(FTell, uint64_t(AZ::IO::HandleType handle));
+    MOCK_METHOD1(FClose, int(AZ::IO::HandleType handle));
+    MOCK_METHOD1(FEof, int(AZ::IO::HandleType handle));
+    MOCK_METHOD1(FFlush, int(AZ::IO::HandleType handle));
+    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_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_METHOD1(IsFolder, bool(AZStd::string_view sPath));
+    MOCK_METHOD1(GetFileSizeOnDisk, AZ::IO::IArchive::SignedFileSize(AZStd::string_view filename));
+    MOCK_METHOD2(MakeDir, bool(AZStd::string_view szPath, bool bGamePathMapping));
+    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));
+    MOCK_METHOD1(GetFileArchivePath, const char* (AZ::IO::HandleType f));
+    MOCK_METHOD5(RawCompress, int(const void* pUncompressed, size_t* pDestSize, void* pCompressed, size_t nSrcSize, int nLevel));
+    MOCK_METHOD4(RawUncompress, int(void* pUncompressed, size_t* pDestSize, const void* pCompressed, size_t nSrcSize));
+    MOCK_METHOD1(RecordFileOpen, void(ERecordFileOpenList eList));
+    MOCK_METHOD2(RecordFile, void(AZ::IO::HandleType in, AZStd::string_view szFilename));
+    MOCK_METHOD1(GetResourceList, AZ::IO::IResourceList * (ERecordFileOpenList eList));
+    MOCK_METHOD2(SetResourceList, void(ERecordFileOpenList eList, AZ::IO::IResourceList * pResourceList));
+    MOCK_METHOD0(GetRecordFileOpenList, AZ::IO::IArchive::ERecordFileOpenList());
+    MOCK_METHOD2(ComputeCRC, uint32_t(AZStd::string_view szPath, uint32_t nFileOpenFlags));
+    MOCK_METHOD4(ComputeMD5, bool(AZStd::string_view szPath, uint8_t* md5, uint32_t nFileOpenFlags, bool useDirectAccess));
+    MOCK_METHOD1(RegisterFileAccessSink, void(AZ::IO::IArchiveFileAccessSink * pSink));
+    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_METHOD2(CheckFileAccessDisabled, bool(AZStd::string_view name, const char* mode));
+    MOCK_METHOD1(SetRenderThreadId, void(AZStd::thread_id renderThreadId));
+    MOCK_CONST_METHOD0(GetPakPriority, AZ::IO::ArchiveLocationPriority());
+    MOCK_CONST_METHOD1(GetFileOffsetOnMedia, uint64_t(AZStd::string_view szName));
+    MOCK_CONST_METHOD1(GetFileMediaType, EStreamSourceMediaType(AZStd::string_view szName));
+    MOCK_METHOD0(GetLevelPackOpenEvent, auto()->LevelPackOpenEvent*);
+    MOCK_METHOD0(GetLevelPackCloseEvent, auto()->LevelPackCloseEvent*);
+
+    // Implementations required for variadic functions
+    virtual int FPrintf([[maybe_unused]] AZ::IO::HandleType handle, [[maybe_unused]] const char* format, ...) PRINTF_PARAMS(3, 4)
+    {
+        return 0;
+    }
+};
+
diff --git a/Code/Legacy/CryCommon/Mocks/ILogMock.h b/Code/Legacy/CryCommon/Mocks/ILogMock.h
new file mode 100644
index 0000000000..88f5ab17ec
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/ILogMock.h
@@ -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
+ *
+ */
+#pragma once
+#include <ILog.h>
+
+class LogMock
+    : public ILog
+{
+public:
+    MOCK_METHOD3(LogV,
+        void(ELogType nType, const char* szFormat, va_list args));
+    MOCK_METHOD4(LogV,
+        void(ELogType nType, int flags, const char* szFormat, va_list args));
+    MOCK_METHOD0(Release,
+        void());
+    MOCK_METHOD2(SetFileName,
+        bool(const char* fileNameOrFullPath, bool doBackups));
+    MOCK_METHOD0(GetFileName,
+        const char*());
+    MOCK_METHOD0(GetBackupFileName,
+        const char*());
+
+    virtual void Log([[maybe_unused]] const char* szCommand, ...) override {}
+    virtual void LogWarning([[maybe_unused]] const char* szCommand, ...) override {}
+    virtual void LogError([[maybe_unused]] const char* szCommand, ...) override {}
+    virtual void LogAlways([[maybe_unused]] const char* szCommand, ...) override {}
+    virtual void LogPlus([[maybe_unused]] const char* command, ...) override {}
+    virtual void LogToFile([[maybe_unused]] const char* command, ...) override {}
+    virtual void LogToFilePlus([[maybe_unused]] const char* command, ...) override {}
+    virtual void LogToConsole([[maybe_unused]] const char* command, ...) override {}
+    virtual void LogToConsolePlus([[maybe_unused]] const char* command, ...) override {}
+    virtual void UpdateLoadingScreen([[maybe_unused]] const char* command, ...) override {}
+
+    MOCK_METHOD1(SetVerbosity,
+        void(int verbosity));
+    MOCK_METHOD0(GetVerbosityLevel,
+        int());
+    MOCK_METHOD1(AddCallback,
+        void(ILogCallback * pCallback));
+    MOCK_METHOD1(RemoveCallback,
+        void(ILogCallback * pCallback));
+    MOCK_METHOD0(Update,
+        void());
+    MOCK_METHOD0(GetModuleFilter,
+        const char*());
+    MOCK_CONST_METHOD1(GetMemoryUsage,
+        void(ICrySizer * pSizer));
+    MOCK_METHOD1(Indent,
+        void(class CLogIndenter * indenter));
+    MOCK_METHOD1(Unindent,
+        void(class CLogIndenter * indenter));
+    MOCK_METHOD0(FlushAndClose,
+        void());
+};
diff --git a/Code/Legacy/CryCommon/Mocks/IRemoteConsoleMock.h b/Code/Legacy/CryCommon/Mocks/IRemoteConsoleMock.h
new file mode 100644
index 0000000000..a15eb9b687
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/IRemoteConsoleMock.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
+
+#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/IRendererMock.h b/Code/Legacy/CryCommon/Mocks/IRendererMock.h
new file mode 100644
index 0000000000..d82d69fcab
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/IRendererMock.h
@@ -0,0 +1,853 @@
+/*
+ * 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 <IRenderer.h>
+#include <gmock/gmock.h>
+
+struct SRendItemSorter {};
+struct SRenderingPassInfo {};
+struct SClipVolumeBlendInfo {};
+struct SFogVolumeData {};
+
+// the following was generated using google's python script to autogenerate mocks.
+// however, it needed some hand-editing to make it work, so if you add functions to IRenderer,
+// it will probably be better to just manually add them here than try to run the script again
+// hand-edits are marked with 'hand-edit'.  Everything else was autogenerated.
+
+class IRendererMock
+    : public IRenderer
+{
+public:
+    MOCK_METHOD1(AddRenderDebugListener,
+        void(IRenderDebugListener * pRenderDebugListener));
+    MOCK_METHOD1(RemoveRenderDebugListener,
+        void(IRenderDebugListener * pRenderDebugListener));
+    MOCK_CONST_METHOD0(GetRenderType,
+        ERenderType());
+
+    // Hand-edit: Googlemock cannot handle 14 param functions.
+    WIN_HWND Init(int, int, int, int, unsigned int, int, int, bool, bool, WIN_HINSTANCE, WIN_HWND = 0,
+        bool = false, const SCustomRenderInitArgs*  = 0, bool = false) override { return nullptr; }
+
+    MOCK_METHOD0(PostInit,
+        void());
+    MOCK_CONST_METHOD0(IsPost3DRendererEnabled,
+        bool());
+    MOCK_METHOD0(GetFeatures,
+        int());
+
+    // Hand-edit: Googlemock doesn't like 'const void' as a return type:
+    const void SetApiVersion(const AZStd::string&) override {}
+    const void SetAdapterDescription(const AZStd::string&) override {}
+
+    MOCK_CONST_METHOD0(GetApiVersion,
+        const AZStd::string& ());
+    MOCK_CONST_METHOD0(GetAdapterDescription,
+        const AZStd::string& ());
+    MOCK_METHOD3(GetVideoMemoryUsageStats,
+        void(size_t&, size_t&, bool));
+    MOCK_CONST_METHOD0(GetNumGeomInstances,
+        int());
+    MOCK_CONST_METHOD0(GetNumGeomInstanceDrawCalls,
+        int());
+    MOCK_CONST_METHOD0(GetCurrentNumberOfDrawCalls,
+        int());
+    MOCK_CONST_METHOD2(GetCurrentNumberOfDrawCalls,
+        void(int& nGeneral, int& nShadowGen));
+    MOCK_CONST_METHOD1(GetCurrentNumberOfDrawCalls,
+        int(uint32 EFSListMask));
+    MOCK_CONST_METHOD1(GetCurrentDrawCallRTTimes,
+        float(uint32 EFSListMask));
+    MOCK_METHOD1(SetDebugRenderNode,
+        void(IRenderNode * pRenderNode));
+    MOCK_CONST_METHOD1(IsDebugRenderNode,
+        bool(IRenderNode * pRenderNode));
+    MOCK_METHOD1(DeleteContext,
+        bool(WIN_HWND hWnd));
+    MOCK_METHOD4(CreateContext,
+        bool(WIN_HWND, bool, int, int));
+    MOCK_METHOD1(SetCurrentContext,
+        bool(WIN_HWND hWnd));
+    MOCK_METHOD0(MakeMainContextActive,
+        void());
+    MOCK_METHOD0(GetCurrentContextHWND,
+        WIN_HWND());
+    MOCK_METHOD0(IsCurrentContextMainVP,
+        bool());
+    MOCK_CONST_METHOD0(GetCurrentContextViewportHeight,
+        int());
+    MOCK_CONST_METHOD0(GetCurrentContextViewportWidth,
+        int());
+    MOCK_METHOD1(ShutDown,
+        void(bool));
+    MOCK_METHOD0(ShutDownFast,
+        void());
+    MOCK_METHOD1(EnumDisplayFormats,
+        int(SDispFormat * Formats));
+    MOCK_METHOD1(EnumAAFormats,
+        int(SAAFormat * Formats));
+    MOCK_METHOD6(ChangeResolution,
+        bool(int nNewWidth, int nNewHeight, int nNewColDepth, int nNewRefreshHZ, bool bFullScreen, bool bForceReset));
+    MOCK_METHOD0(BeginFrame,
+        void());
+    MOCK_METHOD1(InitSystemResources,
+        void(int nFlags));
+    MOCK_METHOD0(InitTexturesSemantics,
+        void());
+    MOCK_METHOD1(FreeResources,
+        void(int nFlags));
+    MOCK_METHOD0(Release,
+        void());
+    MOCK_METHOD1(RenderDebug,
+        void(bool));
+    MOCK_METHOD0(EndFrame,
+        void());
+    MOCK_METHOD0(ForceSwapBuffers,
+        void());
+    MOCK_METHOD0(TryFlush,
+        void());
+    MOCK_CONST_METHOD4(GetViewport,
+        void(int* x, int* y, int* width, int* height));
+    MOCK_METHOD5(SetViewport,
+        void(int, int, int, int, int));
+    MOCK_METHOD4(SetRenderTile,
+        void(f32, f32, f32, f32));
+    MOCK_METHOD4(SetScissor,
+        void(int, int, int, int));
+    MOCK_METHOD0(GetViewProjectionMatrix,
+        Matrix44A & ());
+    MOCK_METHOD1(SetTranspOrigCameraProjMatrix,
+        void(Matrix44A & matrix));
+    MOCK_METHOD2(GetScreenAspect,
+        EScreenAspectRatio(int nWidth, int nHeight));
+    MOCK_METHOD2(SetViewportDownscale,
+        Vec2(float xscale, float yscale));
+    MOCK_METHOD1(SetViewParameters,
+        void(const CameraViewParameters& viewParameters));
+    MOCK_METHOD1(ApplyViewParameters,
+        void(const CameraViewParameters& viewParameters));
+    MOCK_METHOD5(DrawDynVB,
+        void(SVF_P3F_C4B_T2F * pBuf, uint16 * pInds, int nVerts, int nInds, PublicRenderPrimitiveType nPrimType));
+
+    // Hand-edit: google mock has issues with DynUiPrimitiveList
+    void DrawDynUiPrimitiveList([[maybe_unused]] DynUiPrimitiveList& primitives, [[maybe_unused]] int totalNumVertices, [[maybe_unused]] int totalNumIndices) override { return; }
+
+    MOCK_METHOD1(SetCamera,
+        void(const CCamera& cam));
+    MOCK_METHOD0(GetCamera,
+        const CCamera& ());
+    MOCK_METHOD1(GetRenderViewForThread,
+        CRenderView * (int nThreadID));
+    MOCK_METHOD1(SetGammaDelta,
+        bool(float fGamma));
+    MOCK_METHOD0(RestoreGamma,
+        void(void));
+    MOCK_METHOD3(ChangeDisplay,
+        bool(unsigned int width, unsigned int height, unsigned int cbpp));
+    MOCK_METHOD7(ChangeViewport,
+        void(unsigned int, unsigned int, unsigned int, unsigned int, bool, float, float));
+    MOCK_CONST_METHOD6(SaveTga,
+        bool(unsigned char* sourcedata, int sourceformat, int w, int h, const char* filename, bool flip));
+    MOCK_METHOD1(SetTexture,
+        void(int tnum));
+    MOCK_METHOD2(SetTexture,
+        void(int tnum, int nUnit));
+    MOCK_METHOD0(SetWhiteTexture,
+        void());
+    MOCK_CONST_METHOD0(GetWhiteTextureId,
+        int());
+    MOCK_CONST_METHOD0(GetBlackTextureId,
+        int());
+
+    // Hand-edit: google mock can only do up to 10 parameters
+    void Draw2dImage(float, float, float, float, int, float, float, float, float, float, float, float, float, float, float) override {};
+    MOCK_METHOD1(Draw2dImageStretchMode,
+        void(bool stretch));
+
+    // Hand-edit: google mock can only do up to 10 parameters
+    void Push2dImage(float, float, float, float, int, float, float, float, float, float, float, float, float, float, float, float) override {};
+
+    MOCK_METHOD0(Draw2dImageList,
+        void());
+
+    // Hand-edit:  Hand-edit: google mock can only do up to 10 parameters
+    void DrawImage(float, float, float, float, int, float, float, float, float, float, float, float, float, bool) override {}
+
+    // Hand-edit: google mock can only do up to 10 parameters
+    void DrawImageWithUV(float, float, float, float, float, int, float*, float*, float, float, float, float, bool) override {}
+
+    MOCK_METHOD1(PushWireframeMode,
+        void(int mode));
+    MOCK_METHOD0(PopWireframeMode,
+        void());
+    MOCK_CONST_METHOD0(GetHeight,
+        int());
+    MOCK_CONST_METHOD0(GetWidth,
+        int());
+    MOCK_CONST_METHOD0(GetPixelAspectRatio,
+        float());
+    MOCK_CONST_METHOD0(GetOverlayHeight,
+        int());
+    MOCK_CONST_METHOD0(GetOverlayWidth,
+        int());
+    MOCK_CONST_METHOD0(GetMaxSquareRasterDimension,
+        int());
+    MOCK_METHOD0(SwitchToNativeResolutionBackbuffer,
+        void());
+    MOCK_METHOD1(GetMemoryUsage,
+        void(ICrySizer * Sizer));
+    MOCK_METHOD1(GetBandwidthStats,
+        void(float* fBandwidthRequested));
+    MOCK_METHOD1(SetTextureStreamListener,
+        void(ITextureStreamListener * pListener));
+    MOCK_METHOD2(GetOcclusionBuffer,
+        int(uint16 * pOutOcclBuffer, Matrix44 * pmCamBuffer));
+    MOCK_METHOD2(ScreenShot,
+        bool(const char*, int));
+    MOCK_METHOD0(GetColorBpp,
+        int());
+    MOCK_METHOD0(GetDepthBpp,
+        int());
+    MOCK_METHOD0(GetStencilBpp,
+        int());
+    MOCK_CONST_METHOD0(IsStereoEnabled,
+        bool());
+    MOCK_CONST_METHOD0(GetNearestRangeMax,
+        float());
+    MOCK_METHOD0(GetPerInstanceConstantBufferPoolPointer,
+        PerInstanceConstantBufferPool * ());
+    MOCK_METHOD6(ProjectToScreen,
+        bool(float ptx, float pty, float ptz, float* sx, float* sy, float* sz));
+    MOCK_METHOD9(UnProject,
+        int(float sx, float sy, float sz, float* px, float* py, float* pz, const float modelMatrix[16], const float projMatrix[16], const int viewport[4]));
+    MOCK_METHOD6(UnProjectFromScreen,
+        int(float sx, float sy, float sz, float* px, float* py, float* pz));
+    MOCK_METHOD1(GetModelViewMatrix,
+        void(float* mat));
+    MOCK_METHOD1(GetProjectionMatrix,
+        void(float* mat));
+    MOCK_METHOD7(WriteDDS,
+        bool(const byte * dat, int wdt, int hgt, int Size, const char* name, ETEX_Format eF, int NumMips));
+    MOCK_METHOD6(WriteTGA,
+        bool(const byte * dat, int wdt, int hgt, const char* name, int src_bits_per_pixel, int dest_bits_per_pixel));
+    MOCK_METHOD6(WriteJPG,
+        bool(const byte*, int, int, char*, int, int));
+    MOCK_METHOD6(FontCreateTexture,
+        int(int, int, byte*, ETEX_Format, bool, const char*));
+    MOCK_METHOD6(FontUpdateTexture,
+        bool(int nTexId, int X, int Y, int USize, int VSize, byte * pData));
+    MOCK_METHOD2(FontSetTexture,
+        void(int nTexId, int nFilterMode));
+    MOCK_METHOD2(FontSetRenderingState,
+        void(bool overrideViewProjMatrices, TransformationMatrices & backupMatrices));
+    MOCK_METHOD3(FontSetBlending,
+        void(int src, int dst, int baseState));
+    MOCK_METHOD2(FontRestoreRenderingState,
+        void(bool overrideViewProjMatrices, const TransformationMatrices& restoringMatrices));
+    MOCK_METHOD3(FlushRTCommands,
+        bool(bool bWait, bool bImmediatelly, bool bForce));
+    MOCK_CONST_METHOD7(DrawStringU,
+        void(IFFont_RenderProxy * pFont, float x, float y, float z, const char* pStr, bool asciiMultiLine, const STextDrawContext& ctx));
+    MOCK_METHOD0(RT_CurThreadList,
+        int());
+    MOCK_METHOD6(EF_PrecacheResource,
+        bool(SShaderItem*, float, float, int, int, int));
+    MOCK_METHOD4(EF_PrecacheResource,
+        bool(IShader * pSH, float fMipFactor, float fTimeToReady, int Flags));
+    MOCK_METHOD6(EF_PrecacheResource,
+        bool(ITexture*, float, float, int, int, int));
+    MOCK_METHOD6(EF_PrecacheResource,
+        bool(IRenderMesh * pPB, _smart_ptr<IMaterial> pMaterial, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId));
+    MOCK_METHOD5(EF_PrecacheResource,
+        bool(CDLight * pLS, float fMipFactor, float fTimeToReady, int Flags, int nUpdateId));
+
+    // Hand-edit: google mock can only do up to 10 parameters
+    ITexture* EF_CreateCompositeTexture([[maybe_unused]] int type, [[maybe_unused]] const char* szName, [[maybe_unused]] int nWidth, [[maybe_unused]] int nHeight, [[maybe_unused]] int nDepth, [[maybe_unused]] int nMips, [[maybe_unused]] int nFlags, [[maybe_unused]] ETEX_Format eTF, [[maybe_unused]] const STexComposition* pCompositions, [[maybe_unused]] size_t nCompositions, [[maybe_unused]] int8 nPriority = -1) override { return nullptr; }
+
+    MOCK_METHOD0(PostLevelLoading,
+        void());
+    MOCK_METHOD0(PostLevelUnload,
+        void());
+    MOCK_METHOD10(EF_AddPolygonToScene,
+        CRenderObject * (SShaderItem & si, int numPts, const SVF_P3F_C4B_T2F * verts, const SPipTangents * tangs, CRenderObject * obj, const SRenderingPassInfo& passInfo, uint16 * inds, int ninds, int nAW, const SRendItemSorter& rendItemSorter));
+    MOCK_METHOD10(EF_AddPolygonToScene,
+        CRenderObject * (SShaderItem & si, CRenderObject * obj, const SRenderingPassInfo& passInfo, int numPts, int ninds, SVF_P3F_C4B_T2F * &verts, SPipTangents * &tangs, uint16 * &inds, int nAW, const SRendItemSorter& rendItemSorter));
+    MOCK_METHOD0(ForceUpdateGlobalShaderParameters,
+        void());
+    MOCK_METHOD0(EF_GetShaderMissLogPath,
+        const char*());
+    MOCK_METHOD1(EF_GetShaderNames,
+        string * (int& nNumShaders));
+    MOCK_METHOD1(EF_ReloadFile,
+        bool(const char* szFileName));
+    MOCK_METHOD1(EF_ReloadFile_Request,
+        bool(const char* szFileName));
+    MOCK_METHOD3(EF_GetRemapedShaderMaskGen,
+        uint64(const char*, uint64, bool));
+    MOCK_METHOD3(EF_GetShaderGlobalMaskGenFromString,
+        uint64(const char*, const char*, uint64));
+    MOCK_METHOD2(EF_GetStringFromShaderGlobalMaskGen,
+        AZStd::string(const char*, uint64));
+    MOCK_CONST_METHOD1(GetShaderProfile,
+        const SShaderProfile& (EShaderType eST));
+    MOCK_METHOD2(EF_SetShaderQuality,
+        void(EShaderType eST, EShaderQuality eSQ));
+    MOCK_CONST_METHOD0(EF_GetRenderQuality,
+        ERenderQuality());
+    MOCK_METHOD1(EF_GetShaderQuality,
+        EShaderQuality(EShaderType eST));
+    MOCK_METHOD5(EF_LoadShaderItem,
+        SShaderItem(const char*, bool, int, SInputShaderResources*, uint64));
+    MOCK_METHOD3(EF_LoadShader,
+        IShader * (const char*, int, uint64));
+    MOCK_METHOD1(EF_ReloadShaderFiles,
+        void(int nCategory));
+    MOCK_METHOD0(EF_ReloadTextures,
+        void());
+    MOCK_METHOD1(EF_GetTextureByID,
+        ITexture * (int Id));
+    MOCK_METHOD2(EF_GetTextureByName,
+        ITexture * (const char*, uint32));
+    MOCK_METHOD2(EF_LoadTexture,
+        ITexture * (const char*, uint32));
+    MOCK_METHOD2(EF_LoadCubemapTexture,
+        ITexture * (const char*, uint32));
+    MOCK_METHOD1(EF_LoadDefaultTexture,
+        ITexture * (const char* nameTex));
+    MOCK_METHOD1(EF_LoadLightmap,
+        int(const char* name));
+    MOCK_METHOD1(EF_StartEf,
+        void(const SRenderingPassInfo& passInfo));
+    MOCK_METHOD3(EF_GetObjData,
+        SRenderObjData * (CRenderObject * pObj, bool bCreate, int nThreadID));
+    MOCK_METHOD1(EF_GetObject_Temp,
+        CRenderObject * (int nThreadID));
+    MOCK_METHOD2(EF_DuplicateRO,
+        CRenderObject * (CRenderObject * pObj, const SRenderingPassInfo& passInfo));
+    MOCK_METHOD7(EF_AddEf,
+        void(IRenderElement * pRE, SShaderItem & pSH, CRenderObject * pObj, const SRenderingPassInfo& passInfo, int nList, int nAW, const SRendItemSorter& rendItemSorter));
+    MOCK_METHOD4(EF_EndEf3D,
+        void(int nFlags, int nPrecacheUpdateId, int nNearPrecacheUpdateId, const SRenderingPassInfo& passInfo));
+    MOCK_METHOD1(EF_InvokeShadowMapRenderJobs,
+        void(int nFlags));
+    MOCK_METHOD1(EF_IsFakeDLight,
+        bool(const CDLight * Source));
+    MOCK_METHOD2(EF_ADDDlight,
+        void(CDLight * Source, const SRenderingPassInfo& passInfo));
+    MOCK_METHOD1(EF_UpdateDLight,
+        bool(SRenderLight * pDL));
+    MOCK_METHOD1(EF_AddDeferredDecal,
+        bool(const SDeferredDecal& rDecal));
+    MOCK_METHOD4(EF_AddDeferredLight,
+        int(const CDLight& pLight, float fMult, const SRenderingPassInfo& passInfo, const SRendItemSorter& rendItemSorter));
+    MOCK_METHOD1(EF_GetDeferredLightsNum,
+        uint32(eDeferredLightType));
+    MOCK_METHOD0(EF_ClearDeferredLightsList,
+        void());
+    MOCK_METHOD1(EF_AddDeferredClipVolume,
+        uint8(const IClipVolume * pClipVolume));
+    MOCK_METHOD2(EF_SetDeferredClipVolumeBlendData,
+        bool(const IClipVolume * pClipVolume, const SClipVolumeBlendInfo& blendInfo));
+    MOCK_METHOD0(EF_ClearDeferredClipVolumesList,
+        void());
+    MOCK_METHOD0(EF_ReleaseDeferredData,
+        void());
+    MOCK_METHOD1(EF_ReleaseInputShaderResource,
+        void(SInputShaderResources * pRes));
+    MOCK_METHOD3(EF_SetPostEffectParam,
+        void(const char*, float, bool));
+    MOCK_METHOD3(EF_SetPostEffectParamVec4,
+        void(const char*, const Vec4&, bool));
+    MOCK_METHOD2(EF_SetPostEffectParamString,
+        void(const char* pParam, const char* pszArg));
+    MOCK_METHOD2(EF_GetPostEffectParam,
+        void(const char* pParam, float& fValue));
+    MOCK_METHOD2(EF_GetPostEffectParamVec4,
+        void(const char* pParam, Vec4 & pValue));
+    MOCK_METHOD2(EF_GetPostEffectParamString,
+        void(const char* pParam, const char* & pszArg));
+    MOCK_METHOD1(EF_GetPostEffectID,
+        int32(const char* pPostEffectName));
+    MOCK_METHOD1(EF_ResetPostEffects,
+        void(bool));
+    MOCK_METHOD0(SyncPostEffects,
+        void());
+    MOCK_METHOD0(EF_DisableTemporalEffects,
+        void());
+    MOCK_METHOD3(EF_AddWaterSimHit,
+        void(const Vec3& vPos, float scale, float strength));
+    MOCK_METHOD0(EF_DrawWaterSimHits,
+        void());
+    MOCK_METHOD1(EF_EndEf2D,
+        void(bool bSort));
+    MOCK_METHOD0(ForceGC,
+        void());
+    MOCK_CONST_METHOD0(GetPolyCount,
+        int());
+    MOCK_CONST_METHOD2(GetPolyCount,
+        void(int& nPolygons, int& nShadowVolPolys));
+    MOCK_METHOD1(SetClearColor,
+        void(const Vec3& vColor));
+    MOCK_METHOD1(SetClearBackground,
+        void(bool bClearBackground));
+    MOCK_METHOD4(CreateRenderMesh,
+        _smart_ptr<IRenderMesh>(const char*, const char*, IRenderMesh::SInitParamerers*, ERenderMeshType));
+
+    // Hand-edit: google mock can only do up to 10 parameters
+    virtual _smart_ptr<IRenderMesh> CreateRenderMeshInitialized(
+        const void*, int, const AZ::Vertex::Format&, const vtx_idx*, int, const PublicRenderPrimitiveType,
+        const char*, const char*, ERenderMeshType = eRMT_Static, int = 1, int = 0,
+        [[maybe_unused]] bool (*PrepareBufferCallback)(IRenderMesh*, bool) = nullptr, void* = nullptr, bool = false, bool = true,
+        const SPipTangents* = nullptr, bool = false, Vec3* = nullptr)
+    {
+        return _smart_ptr<IRenderMesh>();
+    }
+
+    MOCK_METHOD1(GetFrameID,
+        int(bool));
+    MOCK_CONST_METHOD0(GetCameraFrameID,
+        int());
+    MOCK_CONST_METHOD0(IsRenderToTextureActive,
+        bool());
+    MOCK_METHOD4(MakeMatrix,
+        void(const Vec3& pos, const Vec3& angles, const Vec3& scale, Matrix34 * mat));
+    MOCK_METHOD4(DrawTextQueued,
+        void(Vec3 pos, SDrawTextInfo & ti, const char* format, va_list args));
+    MOCK_METHOD3(DrawTextQueued,
+        void(Vec3 pos, SDrawTextInfo & ti, const char* text));
+    MOCK_CONST_METHOD1(ScaleCoordX,
+        float(float value));
+    MOCK_CONST_METHOD1(ScaleCoordY,
+        float(float value));
+    MOCK_CONST_METHOD2(ScaleCoord,
+        void(float& x, float& y));
+    MOCK_METHOD2(SetState,
+        void(int, int));
+    MOCK_METHOD1(SetCullMode,
+        void(int));
+    MOCK_METHOD5(SetStencilState,
+        void(int, uint32, uint32, uint32, bool));
+    MOCK_METHOD1(PushProfileMarker,
+        void(const char* label));
+    MOCK_METHOD1(PopProfileMarker,
+        void(const char* label));
+    MOCK_METHOD1(EnableFog,
+        bool(bool enable));
+    MOCK_METHOD1(SetFogColor,
+        void(const ColorF& color));
+    MOCK_METHOD4(SetColorOp,
+        void(byte eCo, byte eAo, byte eCa, byte eAa));
+    MOCK_METHOD1(SetSrgbWrite,
+        void(bool srgbWrite));
+    MOCK_METHOD1(RequestFlushAllPendingTextureStreamingJobs,
+        void(int nFrames));
+    MOCK_METHOD1(SetTexturesStreamingGlobalMipFactor,
+        void(float fFactor));
+    MOCK_METHOD1(GetIRenderAuxGeom,
+        IRenderAuxGeom * (void*));
+    MOCK_METHOD0(GetISvoRenderer,
+        ISvoRenderer * ());
+    MOCK_METHOD0(GetIColorGradingController,
+        IColorGradingController * ());
+    MOCK_METHOD0(GetIStereoRenderer,
+        IStereoRenderer * ());
+    MOCK_METHOD7(Create2DTexture,
+        ITexture * (const char* name, int width, int height, int numMips, int flags, unsigned char* data, ETEX_Format format));
+
+    void TextToScreen([[maybe_unused]] float x, [[maybe_unused]] float y, [[maybe_unused]] const char* format, ...) override {}
+    void TextToScreenColor([[maybe_unused]] int x, [[maybe_unused]] int y, [[maybe_unused]] float r, [[maybe_unused]] float g, [[maybe_unused]] float b, [[maybe_unused]] float a, [[maybe_unused]] const char* format, ...) override {}
+
+    MOCK_METHOD0(ResetToDefault,
+        void());
+    MOCK_METHOD4(SetMaterialColor,
+        void(float r, float g, float b, float a));
+    MOCK_METHOD0(SetDefaultRenderStates,
+        void());
+    MOCK_METHOD10(Graph,
+        void(byte * g, int x, int y, int wdt, int hgt, int nC, int type, const char* text, ColorF & color, float fScale));
+    MOCK_METHOD0(EF_RenderTextMessages,
+        void());
+    MOCK_METHOD1(ClearTargetsImmediately,
+        void(uint32 nFlags));
+    MOCK_METHOD3(ClearTargetsImmediately,
+        void(uint32 nFlags, const ColorF& Colors, float fDepth));
+    MOCK_METHOD2(ClearTargetsImmediately,
+        void(uint32 nFlags, const ColorF& Colors));
+    MOCK_METHOD2(ClearTargetsImmediately,
+        void(uint32 nFlags, float fDepth));
+    MOCK_METHOD1(ClearTargetsLater,
+        void(uint32 nFlags));
+    MOCK_METHOD3(ClearTargetsLater,
+        void(uint32 nFlags, const ColorF& Colors, float fDepth));
+    MOCK_METHOD2(ClearTargetsLater,
+        void(uint32 nFlags, const ColorF& Colors));
+    MOCK_METHOD2(ClearTargetsLater,
+        void(uint32 nFlags, float fDepth));
+    MOCK_METHOD8(ReadFrameBuffer,
+        void(unsigned char*, int, int, int, ERB_Type, bool, int, int));
+    MOCK_METHOD4(ReadFrameBufferFast,
+        void(uint32*, int, int, bool));
+    MOCK_METHOD1(EnableVSync,
+        void(bool enable));
+    MOCK_METHOD1(CreateResourceAsync,
+        void(SResourceAsync * Resource));
+    MOCK_METHOD1(ReleaseResourceAsync,
+        void(SResourceAsync * Resource));
+    MOCK_METHOD1(ReleaseResourceAsync,
+        void(AZStd::unique_ptr<SResourceAsync> Resource));
+
+    // Hand-edit: google mock can only do up to 10 parameters
+    unsigned int DownLoadToVideoMemory(const byte*, int, int, ETEX_Format, ETEX_Format, int, bool  = true,
+        int  = FILTER_BILINEAR, int  = 0, const char*  = nullptr, int  = 0, EEndian  = eLittleEndian,
+        RectI*  = nullptr, bool  = false) override { return 0; }
+
+    unsigned int DownLoadToVideoMemory3D(const byte*, int, int, [[maybe_unused]] int d, ETEX_Format, ETEX_Format, int, bool  = true,
+        int  = FILTER_BILINEAR, int  = 0, const char*  = nullptr, int  = 0, EEndian  = eLittleEndian,
+        RectI*  = nullptr, bool  = false) override { return 0; }
+
+    unsigned int DownLoadToVideoMemoryCube(const byte*, int, int, ETEX_Format, ETEX_Format, int, bool  = true,
+        int  = FILTER_BILINEAR, int  = 0, const char*  = nullptr, int  = 0, EEndian  = eLittleEndian,
+        RectI*  = nullptr, bool  = false) override { return 0; }
+
+    MOCK_METHOD9(UpdateTextureInVideoMemory,
+        void(uint32, const byte*, int, int, int, int, ETEX_Format, int, int));
+    MOCK_METHOD8(DXTCompress,
+        bool(const byte * raw_data, int nWidth, int nHeight, ETEX_Format eTF, bool bUseHW, bool bGenMips, int nSrcBytesPerPix, MIPDXTcallback callback));
+    MOCK_METHOD9(DXTDecompress,
+        bool(const byte * srcData, size_t srcFileSize, byte * dstData, int nWidth, int nHeight, int nMips, ETEX_Format eSrcTF, bool bUseHW, int nDstBytesPerPix));
+    MOCK_METHOD1(RemoveTexture,
+        void(unsigned int TextureId));
+    MOCK_METHOD1(DeleteFont,
+        void(IFFont * font));
+    MOCK_METHOD3(CaptureFrameBufferFast,
+        bool(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight));
+    MOCK_METHOD3(CopyFrameBufferFast,
+        bool(unsigned char* pDstRGBA8, int destinationWidth, int destinationHeight));
+    MOCK_METHOD1(RegisterCaptureFrame,
+        bool(ICaptureFrameListener * pCapture));
+    MOCK_METHOD1(UnRegisterCaptureFrame,
+        bool(ICaptureFrameListener * pCapture));
+    MOCK_METHOD2(InitCaptureFrameBufferFast,
+        bool(uint32, uint32));
+    MOCK_METHOD0(CloseCaptureFrameBufferFast,
+        void(void));
+    MOCK_METHOD0(CaptureFrameBufferCallBack,
+        void(void));
+    MOCK_METHOD1(RegisterSyncWithMainListener,
+        void(ISyncMainWithRenderListener * pListener));
+    MOCK_METHOD1(RemoveSyncWithMainListener,
+        void(const ISyncMainWithRenderListener * pListener));
+    MOCK_METHOD5(Set2DMode,
+        void(uint32, uint32, TransformationMatrices&, float, float));
+    MOCK_METHOD1(Unset2DMode,
+        void(const TransformationMatrices& restoringMatrices));
+    MOCK_METHOD7(Set2DModeNonZeroTopLeft,
+        void(float, float, float, float, TransformationMatrices&, float, float));
+    MOCK_METHOD1(ScreenToTexture,
+        int(int nTexID));
+    MOCK_METHOD1(EnableSwapBuffers,
+        void(bool bEnable));
+    MOCK_METHOD0(GetHWND,
+        WIN_HWND());
+    MOCK_METHOD1(SetWindowIcon,
+        bool(const char* path));
+    MOCK_METHOD1(OnEntityDeleted,
+        void(struct IRenderNode* pRenderNode));
+    MOCK_METHOD5(CreateRenderTarget,
+        int(const char* name, int nWidth, int nHeight, const ColorF& clearColor, ETEX_Format eTF));
+    MOCK_METHOD1(DestroyRenderTarget,
+        bool(int nHandle));
+    MOCK_METHOD3(ResizeRenderTarget,
+        bool(int nHandle, int nWidth, int nHeight));
+    MOCK_METHOD2(SetRenderTarget,
+        bool(int, SDepthTexture*));
+    MOCK_METHOD3(CreateDepthSurface,
+        SDepthTexture * (int, int, bool));
+    MOCK_METHOD1(DestroyDepthSurface,
+        void(SDepthTexture * pDepthSurf));
+    MOCK_METHOD1(PauseTimer,
+        void(bool bPause));
+    MOCK_METHOD0(CreateShaderPublicParams,
+        IShaderPublicParams * ());
+    MOCK_CONST_METHOD2(GetThreadIDs,
+        void(threadID & mainThreadID, threadID & renderThreadID));
+    MOCK_METHOD1(EnableGPUTimers2,
+        void(bool bEnabled));
+    MOCK_METHOD1(AllowGPUTimers2,
+        void(bool bAllow));
+    MOCK_CONST_METHOD2(GetRPPStats,
+        const RPProfilerStats * (ERenderPipelineProfilerStats, bool));
+    MOCK_CONST_METHOD1(GetRPPStatsArray,
+        const RPProfilerStats * (bool));
+    MOCK_METHOD4(GetPolygonCountByType,
+        int(uint32, EVertexCostTypes, uint32, bool));
+    MOCK_METHOD5(SetCloudShadowsParams,
+        void(int nTexID, const Vec3& speed, float tiling, bool invert, float brightness));
+    MOCK_METHOD2(PushFogVolumeContribution,
+        uint16(const SFogVolumeData& fogVolData, const SRenderingPassInfo& passInfo));
+    MOCK_METHOD2(PushFogVolume,
+        void(class CREFogVolume * pFogVolume, const SRenderingPassInfo& passInfo));
+    MOCK_METHOD0(GetMaxTextureSize,
+        int());
+    MOCK_METHOD1(GetTextureFormatName,
+        const char*(ETEX_Format eTF));
+    MOCK_METHOD5(GetTextureFormatDataSize,
+        int(int nWidth, int nHeight, int nDepth, int nMips, ETEX_Format eTF));
+    MOCK_METHOD2(SetDefaultMaterials,
+        void(_smart_ptr<IMaterial> pDefMat, _smart_ptr<IMaterial> pTerrainDefMat));
+    MOCK_CONST_METHOD0(GetGPUParticleEngine,
+        IGPUParticleEngine * ());
+    MOCK_CONST_METHOD0(GetActiveGPUCount,
+        uint32());
+    MOCK_METHOD0(GetShadowFrustumMGPUCache,
+        ShadowFrustumMGPUCache * ());
+
+    MOCK_CONST_METHOD0(GetCachedShadowsResolution,
+        const StaticArray<int, MAX_GSM_LODS_NUM>&());
+
+    MOCK_METHOD1(SetCachedShadowsResolution,
+        void(const StaticArray<int, MAX_GSM_LODS_NUM>&arrResolutions));
+    MOCK_CONST_METHOD1(UpdateCachedShadowsLodCount,
+        void(int nGsmLods));
+    MOCK_METHOD1(SetTexturePrecaching,
+        void(bool stat));
+    MOCK_METHOD2(RT_InsertGpuCallback,
+        void(uint32 context, GpuCallbackFunc callback));
+    MOCK_METHOD1(EnablePipelineProfiler,
+        void(bool bEnable));
+    MOCK_METHOD1(GetRenderTimes,
+        void(SRenderTimes & outTimes));
+    MOCK_METHOD0(GetGPUFrameTime,
+        float());
+    MOCK_METHOD1(EnableBatchMode,
+        void(bool enable));
+    MOCK_METHOD1(EnableLevelUnloading,
+        void(bool enable));
+    MOCK_METHOD0(OnLevelLoadFailed,
+        void());
+#if !defined(_RELEASE)
+    MOCK_METHOD1(GetDrawCallsInfoPerMesh,
+        RNDrawcallsMapMesh & (bool));
+    MOCK_METHOD1(GetDrawCallsInfoPerMeshPreviousFrame,
+        RNDrawcallsMapMesh & (bool));
+    MOCK_METHOD1(GetDrawCallsInfoPerNodePreviousFrame,
+        RNDrawcallsMapNode & (bool));
+    MOCK_METHOD1(GetDrawCallsPerNode,
+        int(IRenderNode * pRenderNode));
+    MOCK_METHOD1(ForceRemoveNodeFromDrawCallsMap,
+        void(IRenderNode * pNode));
+#endif
+    MOCK_METHOD1(CollectDrawCallsInfo,
+        void(bool status));
+    MOCK_METHOD1(CollectDrawCallsInfoPerNode,
+        void(bool status));
+    MOCK_METHOD0(HasLoadedDefaultResources,
+        bool());
+    MOCK_METHOD3(EF_CreateSkinningData,
+        SSkinningData * (uint32, bool, bool));
+    MOCK_METHOD4(EF_CreateRemappedSkinningData,
+        SSkinningData * (uint32 nNumBones, SSkinningData * pSourceSkinningData, uint32 nCustomDataSize, uint32 pairGuid));
+    MOCK_METHOD0(EF_ClearSkinningDataPool,
+        void());
+    MOCK_METHOD0(EF_GetSkinningPoolID,
+        int());
+    MOCK_METHOD1(ClearShaderItem,
+        void(SShaderItem * pShaderItem));
+    MOCK_METHOD2(UpdateShaderItem,
+        void(SShaderItem * pShaderItem, _smart_ptr<IMaterial> pMaterial));
+    MOCK_METHOD2(ForceUpdateShaderItem,
+        void(SShaderItem * pShaderItem, _smart_ptr<IMaterial> pMaterial));
+    MOCK_METHOD2(RefreshShaderResourceConstants,
+        void(SShaderItem * pShaderItem, IMaterial * pMaterial));
+    MOCK_METHOD0(IsStereoModeChangePending,
+        bool());
+    MOCK_METHOD1(LockParticleVideoMemory,
+        void(uint32 nId));
+    MOCK_METHOD1(UnLockParticleVideoMemory,
+        void(uint32 nId));
+    MOCK_METHOD1(BeginSpawningGeneratingRendItemJobs,
+        void(int nThreadID));
+    MOCK_METHOD1(BeginSpawningShadowGeneratingRendItemJobs,
+        void(int nThreadID));
+    MOCK_METHOD0(EndSpawningGeneratingRendItemJobs,
+        void());
+    MOCK_METHOD1(StartLoadtimePlayback,
+        void(ILoadtimeCallback* pCallback));
+    MOCK_METHOD0(StopLoadtimePlayback,
+        void());
+
+    MOCK_METHOD0(GetGenerateRendItemJobExecutor,
+        AZ::LegacyJobExecutor*());
+    MOCK_METHOD0(GetGenerateShadowRendItemJobExecutor,
+        AZ::LegacyJobExecutor*());
+    MOCK_METHOD0(GetGenerateRendItemJobExecutorPreProcess,
+        AZ::LegacyJobExecutor*());
+    MOCK_METHOD1(GetFinalizeRendItemJobExecutor,
+        AZ::LegacyJobExecutor*(int nThreadID));
+    MOCK_METHOD1(GetFinalizeShadowRendItemJobExecutor,
+        AZ::LegacyJobExecutor*(int nThreadID));
+    MOCK_METHOD0(FlushPendingTextureTasks,
+        void());
+    MOCK_METHOD1(SetShadowJittering,
+        void(float fShadowJittering));
+    MOCK_CONST_METHOD0(GetShadowJittering,
+        float());
+    MOCK_METHOD0(LoadShaderStartupCache,
+        bool());
+    MOCK_METHOD0(UnloadShaderStartupCache,
+        void());
+    MOCK_METHOD0(LoadShaderLevelCache,
+        bool());
+    MOCK_METHOD0(UnloadShaderLevelCache,
+        void());
+    MOCK_METHOD1(StartScreenShot,
+        void(int e_ScreenShot));
+    MOCK_METHOD1(EndScreenShot,
+        void(int e_ScreenShot));
+    MOCK_METHOD3(SetRendererCVar,
+        void(ICVar*, const char*, bool));
+    MOCK_METHOD0(GetRenderPipeline,
+        SRenderPipeline * ());
+    MOCK_METHOD0(GetShaderManager,
+        CShaderMan * ());
+    MOCK_METHOD0(GetRenderThread,
+        SRenderThread * ());
+    MOCK_METHOD0(GetWhiteTexture,
+        ITexture * ());
+    MOCK_METHOD3(GetTextureForName,
+        ITexture * (const char* name, uint32 nFlags, ETEX_Format eFormat));
+    MOCK_METHOD0(GetViewParameters,
+        const CameraViewParameters& ());
+    MOCK_METHOD0(GetFrameReset,
+        uint32());
+    MOCK_METHOD0(GetDepthBufferOrig,
+        SDepthTexture * ());
+    MOCK_METHOD0(GetBackBufferWidth,
+        uint32());
+    MOCK_METHOD0(GetBackBufferHeight,
+        uint32());
+    MOCK_METHOD0(GetDeviceBufferManager,
+        CDeviceBufferManager * ());
+    MOCK_CONST_METHOD0(GetRenderTileInfo,
+        const SRenderTileInfo * ());
+    MOCK_METHOD0(GetIdentityMatrix,
+        Matrix44A());
+    MOCK_CONST_METHOD0(RT_GetCurrGpuID,
+        int32());
+    MOCK_METHOD0(GenerateTextureId,
+        int());
+    MOCK_METHOD2(SetCull,
+        void(ECull, bool));
+    MOCK_METHOD10(DrawQuad,
+        void(float x0, float y0, float x1, float y1, const ColorF& color, float z, float s0, float t0, float s1, float t1));
+    MOCK_METHOD9(DrawQuad3D,
+        void(const Vec3& v0, const Vec3& v1, const Vec3& v2, const Vec3& v3, const ColorF& color, float ftx0, float fty0, float ftx1, float fty1));
+    MOCK_METHOD0(FX_ResetPipe,
+        void());
+    MOCK_METHOD4(FX_GetDepthSurface,
+        SDepthTexture * (int, int, bool, bool));
+    MOCK_METHOD5(FX_CheckOverflow,
+        void(int, int, IRenderElement*, int*, int*));
+    MOCK_METHOD1(FX_PreRender,
+        void(int Stage));
+    MOCK_METHOD0(FX_PostRender,
+        void());
+    MOCK_METHOD3(FX_SetState,
+        void(int, int, int));
+    MOCK_METHOD3(FX_CommitStates,
+        void(const SShaderTechnique * pTech, const SShaderPass * pPass, bool bUseMaterialState));
+    MOCK_METHOD1(FX_Commit,
+        void(bool));
+    MOCK_METHOD2(FX_SetVertexDeclaration,
+        long(int StreamMask, const AZ::Vertex::Format& vertexFormat));
+    MOCK_METHOD7(FX_DrawIndexedPrimitive,
+        void(eRenderPrimitiveType, int, int, int, int, int, bool));
+    MOCK_METHOD3(FX_SetIStream,
+        long(const void* pB, uint32 nOffs, RenderIndexType idxType));
+    MOCK_METHOD5(FX_SetVStream,
+        long(int, const void*, uint32, uint32, uint32));
+    MOCK_METHOD4(FX_DrawPrimitive,
+        void(eRenderPrimitiveType, int, int, int));
+    MOCK_METHOD1(FX_ClearTarget,
+        void(ITexture * pTex));
+    MOCK_METHOD1(FX_ClearTarget,
+        void(SDepthTexture * pTex));
+    MOCK_METHOD4(FX_SetRenderTarget,
+        bool(int, void*, SDepthTexture*, uint32));
+    MOCK_METHOD4(FX_PushRenderTarget,
+        bool(int, void*, SDepthTexture*, uint32));
+    MOCK_METHOD7(FX_SetRenderTarget,
+        bool(int, CTexture*, SDepthTexture*, bool, int, bool, uint32));
+    MOCK_METHOD6(FX_PushRenderTarget,
+        bool(int, CTexture*, SDepthTexture*, int, bool, uint32));
+    MOCK_METHOD1(FX_RestoreRenderTarget,
+        bool(int nTarget));
+    MOCK_METHOD1(FX_PopRenderTarget,
+        bool(int nTarget));
+    MOCK_METHOD1(FX_SetActiveRenderTargets,
+        void(bool bAllowDIP));
+    MOCK_METHOD4(FX_Start,
+        void(CShader * ef, int nTech, CShaderResources * Res, IRenderElement * re));
+    MOCK_METHOD1(RT_PopRenderTarget,
+        void(int nTarget));
+    MOCK_METHOD5(RT_SetViewport,
+        void(int, int, int, int, int));
+    MOCK_METHOD4(RT_PushRenderTarget,
+        void(int nTarget, CTexture * pTex, SDepthTexture * pDS, int nS));
+    MOCK_METHOD5(EF_Scissor,
+        void(bool bEnable, int sX, int sY, int sWdt, int sHgt));
+
+#ifdef SUPPORT_HW_MOUSE_CURSOR
+    MOCK_METHOD0(GetIHWMouseCursor,
+        IHWMouseCursor * ());
+#endif
+
+    MOCK_METHOD0(GetRecursionLevel,
+        int());
+    MOCK_METHOD2(GetIntegerConfigurationValue,
+        int(const char* varName, int defaultValue));
+    MOCK_METHOD2(GetFloatConfigurationValue,
+        float(const char* varName, float defaultValue));
+    MOCK_METHOD2(GetBooleanConfigurationValue,
+        bool(const char* varName, bool defaultValue));
+    MOCK_METHOD3(ApplyDepthTextureState,
+        void(int unit, int nFilter, bool clamp));
+    MOCK_METHOD0(GetZTargetTexture,
+        ITexture * ());
+    MOCK_METHOD1(GetTextureState,
+        int(const STexState& TS));
+    MOCK_METHOD7(TextureDataSize,
+        uint32(uint32, uint32, uint32, uint32, uint32, ETEX_Format, ETEX_TileMode));
+    MOCK_METHOD6(ApplyForID,
+        void(int nID, int nTUnit, int nTState, int nTexMaterialSlot, int nSUnit, bool useWhiteDefault));
+    MOCK_METHOD9(Create3DTexture,
+        ITexture * (const char* szName, int nWidth, int nHeight, int nDepth, int nMips, int nFlags, const byte * pData, ETEX_Format eTFSrc, ETEX_Format eTFDst));
+    MOCK_METHOD1(IsTextureExist,
+        bool(const ITexture * pTex));
+    MOCK_METHOD1(NameForTextureFormat,
+        const char*(ETEX_Format eTF));
+    MOCK_METHOD1(NameForTextureType,
+        const char*(ETEX_Type eTT));
+    MOCK_METHOD0(IsVideoThreadModeEnabled,
+        bool());
+    MOCK_METHOD5(CreateDynTexture2,
+        IDynTexture * (uint32 nWidth, uint32 nHeight, uint32 nTexFlags, const char* szSource, ETexPool eTexPool));
+    MOCK_METHOD0(GetCurrentTextureAtlasSize,
+        uint32());
+    MOCK_METHOD2(BeginProfilerSection,
+        void(const char*, uint32));
+    MOCK_METHOD1(EndProfilerSection,
+        void(const char*));
+    MOCK_METHOD1(AddProfilerLabel,
+        void(const char*));
+
+    MOCK_METHOD5(EF_QueryImpl,
+        void(ERenderQueryTypes eQuery, void* pInOut0, uint32 nInOutSize0, void* pInOut1, uint32 nInOutSize1));
+};
+
+
diff --git a/Code/Legacy/CryCommon/Mocks/ISystemMock.h b/Code/Legacy/CryCommon/Mocks/ISystemMock.h
new file mode 100644
index 0000000000..6769d964ba
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/ISystemMock.h
@@ -0,0 +1,192 @@
+/*
+ * 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 <Cry_Camera.h>
+
+#ifdef GetUserName
+#undef GetUserName
+#endif
+
+class SystemMock
+    : public ISystem
+{
+public:
+    MOCK_METHOD0(Release,
+        void());
+    MOCK_METHOD0(GetGlobalEnvironment,
+        SSystemGlobalEnvironment * ());
+    MOCK_METHOD2(UpdatePreTickBus,
+        bool(int, int));
+    MOCK_METHOD2(UpdatePostTickBus,
+        bool(int, int));
+    MOCK_METHOD0(UpdateLoadtime,
+        bool());
+    MOCK_METHOD0(RenderStatistics,
+        void());
+    MOCK_METHOD0(GetUserName,
+        const char*());
+    MOCK_METHOD0(Quit,
+        void());
+    MOCK_METHOD1(Relaunch,
+        void(bool bRelaunch));
+    MOCK_CONST_METHOD0(IsQuitting,
+        bool());
+    MOCK_METHOD1(SerializingFile,
+        void(int mode));
+    MOCK_CONST_METHOD0(IsSerializingFile,
+        int());
+    MOCK_CONST_METHOD0(IsRelaunch,
+        bool());
+
+    void FatalError([[maybe_unused]] const char* sFormat, ...) override {}
+    void ReportBug([[maybe_unused]] const char* sFormat, ...) override {}
+
+    MOCK_METHOD6(WarningV,
+        void(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args));
+
+    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));
+    MOCK_METHOD1(CheckLogVerbosity,
+        bool(int verbosity));
+    MOCK_METHOD0(GetIViewSystem,
+        IViewSystem * ());
+    MOCK_METHOD0(GetILevelSystem,
+        ILevelSystem * ());
+    MOCK_METHOD0(GetINameTable,
+        INameTable * ());
+    MOCK_METHOD0(GetICmdLine,
+        ICmdLine * ());
+    MOCK_METHOD0(GetILog,
+        ILog * ());
+    MOCK_METHOD0(GetIPak,
+        AZ::IO::IArchive * ());
+    MOCK_METHOD0(GetICryFont,
+        ICryFont * ());
+    MOCK_METHOD0(GetIMovieSystem,
+        IMovieSystem * ());
+    MOCK_METHOD0(GetIAudioSystem,
+        Audio::IAudioSystem * ());
+    MOCK_METHOD0(GetIConsole,
+        ::IConsole * ());
+    MOCK_METHOD0(GetIRemoteConsole,
+        IRemoteConsole * ());
+    MOCK_METHOD0(GetIProfilingSystem,
+        IProfilingSystem * ());
+    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,
+        XmlNodeRef(const char*, bool, bool));
+    MOCK_METHOD4(LoadXmlFromBuffer,
+        XmlNodeRef(const char*, size_t, bool, bool));
+    MOCK_METHOD2(LoadXmlFromFile,
+        XmlNodeRef(const char*, bool));
+    MOCK_METHOD0(GetXmlUtils,
+        IXmlUtils * ());
+    MOCK_METHOD1(SetViewCamera,
+        void(CCamera & Camera));
+    MOCK_METHOD0(GetViewCamera,
+        CCamera & ());
+    MOCK_METHOD1(IgnoreUpdates,
+        void(bool bIgnore));
+    MOCK_METHOD1(SetIProcess,
+        void(IProcess * process));
+    MOCK_METHOD0(GetIProcess,
+        IProcess * ());
+    MOCK_CONST_METHOD0(IsTestMode,
+        bool());
+    MOCK_METHOD3(SetFrameProfiler,
+        void(bool on, bool display, char* prefix));
+    MOCK_METHOD0(GetFileVersion,
+        const SFileVersion&());
+    MOCK_METHOD0(GetProductVersion,
+        const SFileVersion&());
+    MOCK_METHOD0(GetBuildVersion,
+        const SFileVersion&());
+
+    MOCK_METHOD1(AddCVarGroupDirectory,
+        void(const string&));
+    MOCK_METHOD0(SaveConfiguration,
+        void());
+    MOCK_METHOD3(LoadConfiguration,
+        void(const char*, ILoadConfigurationEntrySink*, bool));
+
+    MOCK_CONST_METHOD0(GetMaxConfigSpec,
+        ESystemConfigSpec());
+    MOCK_CONST_METHOD0(GetConfigPlatform,
+        ESystemConfigPlatform());
+    MOCK_METHOD1(SetConfigPlatform,
+        void(ESystemConfigPlatform platform));
+    MOCK_CONST_METHOD0(IsPaused,
+        bool());
+    MOCK_METHOD0(GetLocalizationManager,
+        ILocalizationManager * ());
+    MOCK_METHOD0(GetNoiseGen,
+        CPNoise3 * ());
+    MOCK_METHOD0(GetUpdateCounter,
+        uint64());
+    MOCK_METHOD1(RegisterErrorObserver,
+        bool(IErrorObserver * errorObserver));
+    MOCK_METHOD1(UnregisterErrorObserver,
+        bool(IErrorObserver * errorObserver));
+    MOCK_METHOD4(OnAssert,
+        void(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber));
+    MOCK_CONST_METHOD0(IsAssertDialogVisible,
+        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,
+        int(const char* logFilePath));
+    MOCK_METHOD0(ClearErrorMessages,
+        void());
+    MOCK_METHOD2(debug_GetCallStack,
+        void(const char** pFunctions, int& nCount));
+    MOCK_METHOD2(debug_LogCallStack,
+        void(int, int));
+    MOCK_METHOD1(ExecuteCommandLine,
+        void(bool));
+    MOCK_METHOD1(GetUpdateStats,
+        void(SSystemUpdateStats & stats));
+    MOCK_METHOD0(GetSystemGlobalState,
+        ESystemGlobalState(void));
+    MOCK_METHOD1(SetSystemGlobalState,
+        void(ESystemGlobalState systemGlobalState));
+
+#if !defined(_RELEASE)
+    MOCK_CONST_METHOD0(IsSavingResourceList,
+        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
new file mode 100644
index 0000000000..aba9412930
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/ITextureMock.h
@@ -0,0 +1,172 @@
+/*
+ * 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(GetClearColor,
+        const ColorF& ());
+    MOCK_CONST_METHOD0(GetDstFormat,
+        const ETEX_Format());
+    MOCK_CONST_METHOD0(GetSrcFormat,
+        const ETEX_Format());
+    MOCK_CONST_METHOD0(GetTexType,
+        const ETEX_Type());
+    MOCK_METHOD2(ApplyTexture,
+        void(int, int));
+    MOCK_CONST_METHOD0(GetName,
+        const char*());
+    MOCK_CONST_METHOD0(GetWidth,
+        const int());
+    MOCK_CONST_METHOD0(GetHeight,
+        const int());
+    MOCK_CONST_METHOD0(GetDepth,
+        const int());
+    MOCK_CONST_METHOD0(GetTextureID,
+        const int());
+    MOCK_CONST_METHOD0(GetFlags,
+        const uint32());
+    MOCK_CONST_METHOD0(GetNumMips,
+        const int());
+    MOCK_CONST_METHOD0(GetRequiredMip,
+        const int());
+    MOCK_CONST_METHOD0(GetDeviceDataSize,
+        const int());
+    MOCK_CONST_METHOD0(GetDataSize,
+        const int());
+    MOCK_CONST_METHOD0(GetTextureType,
+        const ETEX_Type());
+    MOCK_METHOD1(SetTextureType,
+        void(ETEX_Type type));
+    MOCK_CONST_METHOD0(IsTextureLoaded,
+        const bool());
+    MOCK_METHOD4(PrecacheAsynchronously,
+        void(float, int, int, int));
+    MOCK_METHOD4(GetData32,
+        uint8 * (int nSide, int nLevel, uint8 * pDst, ETEX_Format eDstFormat));
+    MOCK_METHOD1(SetFilter,
+        bool(int nFilter));
+    MOCK_METHOD1(SetClamp,
+        void(bool bEnable));
+    MOCK_CONST_METHOD0(GetAvgBrightness,
+        float());
+    MOCK_CONST_METHOD1(StreamCalculateMipsSigned,
+        int(float fMipFactor));
+    MOCK_CONST_METHOD0(GetStreamableMipNumber,
+        int());
+    MOCK_CONST_METHOD1(GetStreamableMemoryUsage,
+        int(int nStartMip));
+    MOCK_CONST_METHOD0(GetMinLoadedMip,
+        int());
+    MOCK_METHOD2(Readback,
+        void(AZ::u32 subresourceIndex, StagingHook callback));
+    MOCK_METHOD0(Reload,
+        bool());
+    MOCK_CONST_METHOD0(GetFormatName,
+        const char*());
+    MOCK_CONST_METHOD0(GetTypeName,
+        const char*());
+    MOCK_CONST_METHOD0(IsStreamedVirtual,
+        const bool());
+    MOCK_CONST_METHOD0(IsShared,
+        const bool());
+    MOCK_CONST_METHOD0(IsStreamable,
+        const bool());
+    MOCK_CONST_METHOD1(IsStreamedIn,
+        bool(const int nMinPrecacheRoundIds[2]));
+    MOCK_CONST_METHOD0(GetAccessFrameId,
+        const int());
+    MOCK_CONST_METHOD0(GetTextureDstFormat,
+        const ETEX_Format());
+    MOCK_CONST_METHOD0(GetTextureSrcFormat,
+        const ETEX_Format());
+    MOCK_CONST_METHOD0(IsPostponed,
+        bool());
+    MOCK_CONST_METHOD1(IsParticularMipStreamed,
+        const bool(float fMipFactor));
+    MOCK_METHOD3(GetLowResSystemCopy,
+        const ColorB * (uint16 & nWidth, uint16 & nHeight, int** ppLowResSystemCopyAtlasId));
+    MOCK_METHOD1(SetKeepSystemCopy,
+        void(bool bKeepSystemCopy));
+    MOCK_METHOD8(UpdateTextureRegion,
+        void(const uint8_t * data, int nX, int nY, int nZ, int USize, int VSize, int ZSize, ETEX_Format eTFSrc));
+    MOCK_CONST_METHOD0(GetDevTexture,
+        CDeviceTexture * ());
+};
+
+class ITextureLoadHandlerMock
+    : public ITextureLoadHandler
+{
+public:
+    MOCK_METHOD2(LoadTextureData,
+        bool(const char* path, STextureLoadData & loadData));
+    MOCK_CONST_METHOD1(SupportsExtension,
+        bool(const char* ext));
+    MOCK_METHOD0(Update,
+        void());
+};
+
+class IDynTextureMock
+    : public IDynTexture
+{
+public:
+    MOCK_METHOD0(Release,
+        void());
+    MOCK_METHOD4(GetSubImageRect,
+        void(uint32 & nX, uint32 & nY, uint32 & nWidth, uint32 & nHeight));
+    MOCK_METHOD4(GetImageRect,
+        void(uint32 & nX, uint32 & nY, uint32 & nWidth, uint32 & nHeight));
+    MOCK_METHOD0(GetTextureID,
+        int());
+    MOCK_METHOD0(Lock,
+        void());
+    MOCK_METHOD0(UnLock,
+        void());
+    MOCK_METHOD0(GetWidth,
+        int());
+    MOCK_METHOD0(GetHeight,
+        int());
+    MOCK_METHOD0(IsValid,
+        bool());
+    MOCK_CONST_METHOD0(GetFlags,
+        uint8());
+    MOCK_METHOD1(SetFlags,
+        void(uint8 flags));
+    MOCK_METHOD2(Update,
+        bool(int nNewWidth, int nNewHeight));
+    MOCK_METHOD2(Apply,
+        void(int, int));
+    MOCK_METHOD0(ClearRT,
+        bool());
+    MOCK_METHOD4(SetRT,
+        bool(int nRT, bool bPush, struct SDepthTexture* pDepthSurf, bool bScreenVP));
+    MOCK_METHOD0(SetRectStates,
+        bool());
+    MOCK_METHOD2(RestoreRT,
+        bool(int nRT, bool bPop));
+    MOCK_METHOD0(GetTexture,
+        ITexture * ());
+    MOCK_METHOD0(SetUpdateMask,
+        void());
+    MOCK_METHOD0(ResetUpdateMask,
+        void());
+    MOCK_METHOD0(IsSecondFrame,
+        bool());
+    MOCK_METHOD2(GetImageData32,
+        bool(uint8 * pData, int nDataSize));
+};
diff --git a/Code/Legacy/CryCommon/Mocks/ITimerMock.h b/Code/Legacy/CryCommon/Mocks/ITimerMock.h
new file mode 100644
index 0000000000..780fea5a2f
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/ITimerMock.h
@@ -0,0 +1,50 @@
+/*
+ * 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
new file mode 100644
index 0000000000..5ed509caf9
--- /dev/null
+++ b/Code/Legacy/CryCommon/Mocks/StubTimer.h
@@ -0,0 +1,110 @@
+/*
+ * 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 <ITimer.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/MultiThread.h b/Code/Legacy/CryCommon/MultiThread.h
new file mode 100644
index 0000000000..a7354bb04b
--- /dev/null
+++ b/Code/Legacy/CryCommon/MultiThread.h
@@ -0,0 +1,602 @@
+/*
+ * 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(APPLE) || defined(LINUX)
+#include <sched.h>
+#endif
+
+#include <AzCore/std/parallel/mutex.h>
+
+#include "CryAssert.h"
+
+// Section dictionary
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define MULTITHREAD_H_SECTION_TRAITS 1
+#define MULTITHREAD_H_SECTION_DEFINE_CRYINTERLOCKEXCHANGE 2
+#define MULTITHREAD_H_SECTION_IMPLEMENT_CRYSPINLOCK 3
+#define MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDADD 4
+#define MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDADDSIZE 5
+#define MULTITHREAD_H_SECTION_CRYINTERLOCKEDFLUSHSLIST_PT1 6
+#define MULTITHREAD_H_SECTION_CRYINTERLOCKEDFLUSHSLIST_PT2 7
+#define MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDCOMPAREEXCHANGE64 8
+#endif
+
+#define THREAD_NAME_LENGTH_MAX 64
+
+#define WRITE_LOCK_VAL (1 << 16)
+
+// Traits
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_TRAITS
+    #include AZ_RESTRICTED_FILE(MultiThread_h)
+#else
+#define MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_ATTRIBUTE_ALIGN_16 0
+#if defined(WIN64)
+#define MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_MSALIGN_16 1
+#endif
+#if defined(APPLE) || defined(LINUX)
+#define MULTITHREAD_H_TRAIT_USE_SALTED_LINKEDLISTHEADER 1
+#endif
+#endif
+
+//as PowerPC operates via cache line reservation, lock variables should reside ion their own cache line
+template <class T>
+struct SAtomicVar
+{
+    T val;
+
+    inline operator T() const{return val; }
+    inline operator T() volatile const{return val; }
+    inline SAtomicVar& operator =(const T& rV){val = rV; return *this; }
+    inline void Assign(const T& rV){val = rV; }
+    inline void Assign(const T& rV) volatile{val = rV; }
+    inline T* Addr() {return &val; }
+    inline volatile T* Addr() volatile {return &val; }
+
+    inline bool operator<(const T& v) const{return val < v; }
+    inline bool operator<(const SAtomicVar<T>& v) const{return val < v.val; }
+    inline bool operator>(const T& v) const{return val > v; }
+    inline bool operator>(const SAtomicVar<T>& v) const{return val > v.val; }
+    inline bool operator<=(const T& v) const{return val <= v; }
+    inline bool operator<=(const SAtomicVar<T>& v) const{return val <= v.val; }
+    inline bool operator>=(const T& v) const{return val >= v; }
+    inline bool operator>=(const SAtomicVar<T>& v) const{return val >= v.val; }
+    inline bool operator==(const T& v) const{return val == v; }
+    inline bool operator==(const SAtomicVar<T>& v) const{return val == v.val; }
+    inline bool operator!=(const T& v) const{return val != v; }
+    inline bool operator!=(const SAtomicVar<T>& v) const{return val != v.val; }
+    inline T operator*(const T& v) const{return val * v; }
+    inline T operator/(const T& v) const{return val / v; }
+    inline T operator+(const T& v) const{return val + v; }
+    inline T operator-(const T& v) const{return val - v; }
+
+    inline bool operator<(const T& v) volatile const{return val < v; }
+    inline bool operator<(const SAtomicVar<T>& v) volatile const{return val < v.val; }
+    inline bool operator>(const T& v) volatile const{return val > v; }
+    inline bool operator>(const SAtomicVar<T>& v) volatile const{return val > v.val; }
+    inline bool operator<=(const T& v) volatile const{return val <= v; }
+    inline bool operator<=(const SAtomicVar<T>& v) volatile const{return val <= v.val; }
+    inline bool operator>=(const T& v) volatile const{return val >= v; }
+    inline bool operator>=(const SAtomicVar<T>& v) volatile const{return val >= v.val; }
+    inline bool operator==(const T& v) volatile const{return val == v; }
+    inline bool operator==(const SAtomicVar<T>& v) volatile const{return val == v.val; }
+    inline bool operator!=(const T& v) volatile const{return val != v; }
+    inline bool operator!=(const SAtomicVar<T>& v) volatile const{return val != v.val; }
+    inline T operator*(const T& v) volatile const{return val * v; }
+    inline T operator/(const T& v) volatile const{return val / v; }
+    inline T operator+(const T& v) volatile const{return val + v; }
+    inline T operator-(const T& v) volatile const{return val - v; }
+};
+
+typedef SAtomicVar<int> TIntAtomic;
+typedef SAtomicVar<unsigned int> TUIntAtomic;
+typedef SAtomicVar<float> TFloatAtomic;
+
+#define __add_db16cycl__ NIntrinsics::YieldFor16Cycles();
+
+void CrySpinLock(volatile int* pLock, int checkVal, int setVal);
+void CryReleaseSpinLock   (volatile int*, int);
+
+LONG   CryInterlockedIncrement(int volatile* lpAddend);
+LONG   CryInterlockedDecrement(int volatile* lpAddend);
+LONG   CryInterlockedOr(LONG volatile* Destination, LONG Value);
+LONG   CryInterlockedExchangeAdd(LONG volatile* lpAddend, LONG Value);
+LONG     CryInterlockedCompareExchange(LONG volatile* dst, LONG exchange, LONG comperand);
+void*    CryInterlockedCompareExchangePointer(void* volatile* dst, void* exchange, void* comperand);
+void*  CryInterlockedExchangePointer       (void* volatile* dst, void* exchange);
+
+void*  CryCreateCriticalSection();
+void   CryCreateCriticalSectionInplace(void*);
+void   CryDeleteCriticalSection(void* cs);
+void   CryDeleteCriticalSectionInplace(void* cs);
+void   CryEnterCriticalSection(void* cs);
+bool   CryTryCriticalSection(void* cs);
+void   CryLeaveCriticalSection(void* cs);
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_DEFINE_CRYINTERLOCKEXCHANGE
+    #include AZ_RESTRICTED_FILE(MultiThread_h)
+#endif
+
+ILINE void CrySpinLock(volatile int* pLock, int checkVal, int setVal)
+{
+#ifdef _CPU_X86
+# ifdef __GNUC__
+    int val;
+    __asm__ __volatile__ (
+        "0:     mov %[checkVal], %%eax\n"
+        "       lock cmpxchg %[setVal], (%[pLock])\n"
+        "       jnz 0b"
+        : "=m" (*pLock)
+        : [pLock] "r" (pLock), "m" (*pLock),
+        [checkVal] "m" (checkVal),
+        [setVal] "r" (setVal)
+        : "eax", "cc", "memory"
+        );
+# else //!__GNUC__
+    __asm
+    {
+        mov edx, setVal
+        mov ecx, pLock
+Spin:
+        // Trick from Intel Optimizations guide
+#ifdef _CPU_SSE
+            pause
+#endif
+        mov eax, checkVal
+        lock cmpxchg [ecx], edx
+        jnz Spin
+    }
+# endif //!__GNUC__
+#else // !_CPU_X86
+# if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_IMPLEMENT_CRYSPINLOCK
+    #include AZ_RESTRICTED_FILE(MultiThread_h)
+# endif
+# if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#  undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+# elif defined(APPLE) || defined(LINUX)
+    //    register int val;
+    //  __asm__ __volatile__ (
+    //      "0:     mov %[checkVal], %%eax\n"
+    //      "       lock cmpxchg %[setVal], (%[pLock])\n"
+    //      "       jnz 0b"
+    //      : "=m" (*pLock)
+    //      : [pLock] "r" (pLock), "m" (*pLock),
+    //        [checkVal] "m" (checkVal),
+    //        [setVal] "r" (setVal)
+    //      : "eax", "cc", "memory"
+    //      );
+    //while(CryInterlockedCompareExchange((volatile long*)pLock,setVal,checkVal)!=checkVal) ;
+    uint loops = 0;
+    while (__sync_val_compare_and_swap((volatile int32_t*)pLock, (int32_t)checkVal, (int32_t)setVal) != checkVal)
+    {
+#   if !defined (ANDROID) && !defined(IOS)
+        _mm_pause();
+#   endif
+
+        if (!(++loops & 0x7F))
+        {
+            usleep(1); // give threads with other prio chance to run
+        }
+        else if (!(loops & 0x3F))
+        {
+            sched_yield(); // give threads with same prio chance to run
+        }
+    }
+# else
+    // NOTE: The code below will fail on 64bit architectures!
+    while (_InterlockedCompareExchange((volatile LONG*)pLock, setVal, checkVal) != checkVal)
+    {
+        _mm_pause();
+    }
+# endif
+#endif
+}
+
+ILINE void CryReleaseSpinLock(volatile int* pLock, int setVal)
+{
+    *pLock = setVal;
+}
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(APPLE) || defined(LINUX64)
+// Fixes undefined reference to CryInterlockedAdd(unsigned long volatile*, long) on
+// Mac and linux.
+ILINE void CryInterLockedAdd(volatile LONG* pVal, LONG iAdd)
+{
+    (void) CryInterlockedExchangeAdd(pVal, iAdd);
+}
+
+
+/*
+ILINE void CryInterLockedAdd(volatile unsigned long *pVal, long iAdd)
+{
+    long r;
+    __asm__ __volatile__ (
+    #if defined(LINUX64) || defined(MAC)  // long is 64 bits on amd64.
+        "lock ; xaddq %0, (%1) \n\t"
+    #else
+        "lock ; xaddl %0, (%1) \n\t"
+    #endif
+        : "=r" (r)
+        : "r" (pVal), "0" (iAdd)
+        : "memory"
+    );
+    (void) r;
+}*/
+/*ILINE void CryInterlockedAdd(volatile size_t *pVal, ptrdiff_t iAdd) {
+   //(void)CryInterlockedExchangeAdd((volatile long*)pVal,(long)iAdd);
+    (void) __sync_fetch_and_add(pVal,iAdd);
+}*/
+
+#endif
+ILINE void CryInterlockedAdd(volatile int* pVal, int iAdd)
+{
+#ifdef _CPU_X86
+# ifdef __GNUC__
+    __asm__ __volatile__ (
+        "        lock add %[iAdd], (%[pVal])\n"
+        : "=m" (*pVal)
+        : [pVal] "r" (pVal), "m" (*pVal), [iAdd] "r" (iAdd)
+        );
+# else
+    __asm
+    {
+        mov edx, pVal
+        mov eax, iAdd
+        lock add [edx], eax
+    }
+# endif
+#else
+    // NOTE: The code below will fail on 64bit architectures!
+#if defined(_WIN64)
+    _InterlockedExchangeAdd((volatile LONG*)pVal, iAdd);
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDADD
+    #include AZ_RESTRICTED_FILE(MultiThread_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(APPLE) || defined(LINUX)
+    CryInterlockedExchangeAdd((volatile LONG*)pVal, iAdd);
+#elif defined(APPLE)
+    OSAtomicAdd32(iAdd, (volatile LONG*)pVal);
+#else
+    InterlockedExchangeAdd((volatile LONG*)pVal, iAdd);
+#endif
+
+#endif
+}
+
+ILINE void CryInterlockedAddSize(volatile size_t* pVal, ptrdiff_t iAdd)
+{
+#if defined(PLATFORM_64BIT)
+#if defined(_WIN64)
+    _InterlockedExchangeAdd64((volatile __int64*)pVal, iAdd);
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDADDSIZE
+    #include AZ_RESTRICTED_FILE(MultiThread_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(WIN32)
+    InterlockedExchangeAdd64((volatile LONG64*)pVal, iAdd);
+#elif defined(APPLE) || defined(LINUX)
+    (void)__sync_fetch_and_add((int64_t*)pVal, (int64_t)iAdd);
+#else
+    int64 x, n;
+    do
+    {
+        x = (int64) * pVal;
+        n = x + iAdd;
+    }
+    while (CryInterlockedCompareExchange64((volatile int64*)pVal, n, x) != x);
+#endif
+#else
+    CryInterlockedAdd((volatile int*)pVal, (int)iAdd);
+#endif
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+// CryInterlocked*SList Function, these are specialized C-A-S
+// functions for single-linked lists which prevent the A-B-A problem there
+// there are implemented in the platform specific CryThread_*.h files
+// TODO clean up the interlocked function the same was the CryThread_* header are
+
+//TODO somehow get their real size on WIN (without including windows.h...)
+//NOTE: The sizes are verifyed at compile-time in the implementation functions, but this is still ugly
+#if MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_MSALIGN_16
+_MS_ALIGN(16)
+#elif defined(WIN32)
+_MS_ALIGN(8)
+#endif
+struct SLockFreeSingleLinkedListEntry
+{
+    SLockFreeSingleLinkedListEntry* volatile pNext;
+}
+#if MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_ATTRIBUTE_ALIGN_16
+__attribute__ ((aligned(16)))
+#elif defined(LINUX32)
+_ALIGN(8)
+#elif defined(APPLE) || defined(LINUX64)
+_ALIGN(16)
+#endif
+;
+
+#if MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_MSALIGN_16
+_MS_ALIGN(16)
+#elif defined(WIN32)
+_MS_ALIGN(8)
+#endif
+struct SLockFreeSingleLinkedListHeader
+{
+    SLockFreeSingleLinkedListEntry* volatile pNext;
+#if defined(INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED)
+    // arm64 processors do not provide a cmpxchg16b (or equivalent) instruction,
+    // so _InterlockedCompareExchange128 is not implemented on arm64 platforms,
+    // and we have to use a mutex to ensure thread safety.
+    AZStd::mutex mutex;
+#elif MULTITHREAD_H_TRAIT_USE_SALTED_LINKEDLISTHEADER
+    // If pointers 32bit, salt should be as well.  Otherwise we get 4 bytes of padding between pNext and salt and CAS operations fail
+#if defined(PLATFORM_64BIT)
+    volatile uint64 salt;
+#else
+    volatile uint32 salt;
+#endif
+#endif
+}
+#if MULTITHREAD_H_TRAIT_SLOCKFREESINGLELINKEDLISTENTRY_ATTRIBUTE_ALIGN_16
+__attribute__ ((aligned(16)))
+#elif defined(LINUX32)
+_ALIGN(8)
+#elif defined(APPLE) || defined(LINUX64)
+_ALIGN(16)
+#endif
+;
+
+
+// push a element atomically onto a single linked list
+void CryInterlockedPushEntrySList(SLockFreeSingleLinkedListHeader& list, SLockFreeSingleLinkedListEntry& element);
+
+// push a element atomically from a single linked list
+void* CryInterlockedPopEntrySList(SLockFreeSingleLinkedListHeader& list);
+
+// initialzied the lock-free single linked list
+void CryInitializeSListHead(SLockFreeSingleLinkedListHeader& list);
+
+// flush the whole list
+void* CryInterlockedFlushSList(SLockFreeSingleLinkedListHeader& list);
+
+ILINE void CryReadLock(volatile int* rw, bool yield)
+{
+    CryInterlockedAdd(rw, 1);
+#ifdef NEED_ENDIAN_SWAP
+    volatile char* pw = (volatile char*)rw + 1;
+#else
+    volatile char* pw = (volatile char*)rw + 2;
+#endif
+
+    uint64 loops = 0;
+    for (; *pw; )
+    {
+        if (yield)
+        {
+#   if !defined(ANDROID) && !defined(IOS) && !defined(MULTITHREAD_H_TRAIT_NO_MM_PAUSE)
+            _mm_pause();
+#   endif
+
+            if (!(++loops & 0x7F))
+            {
+                // give other threads with other prio right to run
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_CRYINTERLOCKEDFLUSHSLIST_PT1
+    #include AZ_RESTRICTED_FILE(MultiThread_h)
+#elif defined (LINUX)
+                usleep(1);
+#endif
+            }
+            else if (!(loops & 0x3F))
+            {
+                // give threads with same prio chance to run
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_CRYINTERLOCKEDFLUSHSLIST_PT2
+    #include AZ_RESTRICTED_FILE(MultiThread_h)
+#elif defined (LINUX)
+                sched_yield();
+#endif
+            }
+        }
+    }
+}
+
+ILINE void CryReleaseReadLock(volatile int* rw)
+{
+    CryInterlockedAdd(rw, -1);
+}
+
+ILINE void CryWriteLock(volatile int* rw)
+{
+    CrySpinLock(rw, 0, WRITE_LOCK_VAL);
+}
+
+ILINE void CryReleaseWriteLock(volatile int* rw)
+{
+    CryInterlockedAdd(rw, -WRITE_LOCK_VAL);
+}
+
+//////////////////////////////////////////////////////////////////////////
+struct ReadLock
+{
+    ILINE ReadLock(volatile int& rw)
+    {
+        CryInterlockedAdd(prw = &rw, 1);
+#ifdef NEED_ENDIAN_SWAP
+        volatile char* pw = (volatile char*)&rw + 1;
+        for (; * pw; )
+        {
+            ;
+        }
+#else
+        volatile char* pw = (volatile char*)&rw + 2;
+        for (; * pw; )
+        {
+            ;
+        }
+#endif
+    }
+    ILINE ReadLock(volatile int& rw, bool yield)
+    {
+        CryReadLock(prw = &rw, yield);
+    }
+    ~ReadLock()
+    {
+        CryReleaseReadLock(prw);
+    }
+private:
+    volatile int* prw;
+};
+
+struct ReadLockCond
+{
+    ILINE ReadLockCond(volatile int& rw, int bActive)
+    {
+        if (bActive)
+        {
+            CryInterlockedAdd(&rw, 1);
+            bActivated = 1;
+#ifdef NEED_ENDIAN_SWAP
+            volatile char* pw = (volatile char*)&rw + 1;
+            for (; * pw; )
+            {
+                ;
+            }
+#else
+            volatile char* pw = (volatile char*)&rw + 2;
+            for (; * pw; )
+            {
+                ;
+            }
+#endif
+        }
+        else
+        {
+            bActivated = 0;
+        }
+        prw = &rw;
+    }
+    void SetActive(int bActive = 1) { bActivated = bActive; }
+    void Release() { CryInterlockedAdd(prw, -bActivated); }
+    ~ReadLockCond()
+    {
+        CryInterlockedAdd(prw, -bActivated);
+    }
+
+private:
+    volatile int* prw;
+    int bActivated;
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct WriteLock
+{
+    ILINE WriteLock(volatile int& rw) { CryWriteLock(&rw); prw = &rw; }
+    ~WriteLock() { CryReleaseWriteLock(prw); }
+private:
+    volatile int* prw;
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct WriteAfterReadLock
+{
+    ILINE WriteAfterReadLock(volatile int& rw) { CrySpinLock(&rw, 1, WRITE_LOCK_VAL + 1); prw = &rw; }
+    ~WriteAfterReadLock() { CryInterlockedAdd(prw, -WRITE_LOCK_VAL); }
+private:
+    volatile int* prw;
+};
+
+//////////////////////////////////////////////////////////////////////////
+struct WriteLockCond
+{
+    ILINE WriteLockCond(volatile int& rw, int bActive = 1)
+    {
+        if (bActive)
+        {
+            CrySpinLock(&rw, 0, iActive = WRITE_LOCK_VAL);
+        }
+        else
+        {
+            iActive = 0;
+        }
+        prw = &rw;
+    }
+    ILINE WriteLockCond() { prw = &(iActive = 0); }
+    ~WriteLockCond()
+    {
+        CryInterlockedAdd(prw, -iActive);
+    }
+    void SetActive(int bActive = 1) { iActive = -bActive & WRITE_LOCK_VAL; }
+    void Release() { CryInterlockedAdd(prw, -iActive); }
+    volatile int* prw;
+    int iActive;
+};
+
+
+#if defined(LINUX) || defined(APPLE)
+ILINE int64 CryInterlockedCompareExchange64(volatile int64* addr, int64 exchange, int64 comperand)
+{
+    return __sync_val_compare_and_swap(addr, comperand, exchange);
+    // This is OK, because long is signed int64 on Linux x86_64
+    //return CryInterlockedCompareExchange((volatile long*)addr, (long)exchange, (long)comperand);
+}
+
+ILINE int64 CryInterlockedExchange64(volatile int64* addr, int64 exchange)
+{
+    __sync_synchronize();
+    return __sync_lock_test_and_set(addr, exchange);
+}
+#else
+ILINE int64 CryInterlockedCompareExchange64(volatile int64* addr, int64 exchange, int64 compare)
+{
+    // forward to system call
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION MULTITHREAD_H_SECTION_IMPLEMENT_CRYINTERLOCKEDCOMPAREEXCHANGE64
+    #include AZ_RESTRICTED_FILE(MultiThread_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    return _InterlockedCompareExchange64((volatile int64*)addr, exchange, compare);
+#endif
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(EXCLUDE_PHYSICS_THREAD)
+ILINE void SpinLock(volatile int* pLock, int checkVal, int setVal) { *(int*)pLock = setVal; }
+ILINE void AtomicAdd(volatile int* pVal, int iAdd) {   *(int*)pVal += iAdd; }
+ILINE void AtomicAdd(volatile unsigned int* pVal, int iAdd) { *(unsigned int*)pVal += iAdd; }
+
+ILINE void JobSpinLock(volatile int* pLock, int checkVal, int setVal) { CrySpinLock(pLock, checkVal, setVal); }
+#else
+ILINE void SpinLock(volatile int* pLock, int checkVal, int setVal) { CrySpinLock(pLock, checkVal, setVal); }
+ILINE void AtomicAdd(volatile int* pVal, int iAdd) {    CryInterlockedAdd(pVal, iAdd); }
+ILINE void AtomicAdd(volatile unsigned int* pVal, int iAdd) { CryInterlockedAdd((volatile int*)pVal, iAdd); }
+
+ILINE void JobSpinLock(volatile int* pLock, int checkVal, int setVal) { SpinLock(pLock, checkVal, setVal); }
+#endif
+
+ILINE void JobAtomicAdd(volatile int* pVal, int iAdd) { CryInterlockedAdd(pVal, iAdd); }
+ILINE void JobAtomicAdd(volatile unsigned int* pVal, int iAdd) { CryInterlockedAdd((volatile int*)pVal, iAdd); }
diff --git a/Code/Legacy/CryCommon/MultiThread_Containers.h b/Code/Legacy/CryCommon/MultiThread_Containers.h
new file mode 100644
index 0000000000..9aa98bfbe8
--- /dev/null
+++ b/Code/Legacy/CryCommon/MultiThread_Containers.h
@@ -0,0 +1,423 @@
+/*
+ * 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_MULTITHREAD_CONTAINERS_H
+#define CRYINCLUDE_CRYCOMMON_MULTITHREAD_CONTAINERS_H
+#pragma once
+
+#include "StlUtils.h"
+#include "BitFiddling.h"
+
+#include <queue>
+#include <set>
+#include <algorithm>
+
+
+namespace CryMT
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Thread Safe wrappers on the standard STL containers.
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Multi-Thread safe queue container, can be used instead of std::vector.
+    //////////////////////////////////////////////////////////////////////////
+    template <class T, class Alloc = std::allocator<T> >
+    class queue
+    {
+    public:
+        typedef T   value_type;
+        typedef std::vector<T, Alloc>   container_type;
+        typedef CryAutoCriticalSection AutoLock;
+
+        //////////////////////////////////////////////////////////////////////////
+        // std::queue interface
+        //////////////////////////////////////////////////////////////////////////
+        const T& front() const      { AutoLock lock(m_cs); return v.front(); };
+        const T& back() const { AutoLock lock(m_cs);    return v.back(); }
+        void    push(const T& x)    { AutoLock lock(m_cs); return v.push_back(x); };
+        void reserve(const size_t n) { AutoLock lock(m_cs); v.reserve(n); };
+        // classic pop function of queue should not be used for thread safety, use try_pop instead
+        //void  pop()                           { AutoLock lock(m_cs); return v.erase(v.begin()); };
+
+        CryCriticalSection& get_lock() const { return m_cs; }
+
+        bool   empty() const { AutoLock lock(m_cs); return v.empty(); }
+        int    size() const  { AutoLock lock(m_cs); return v.size(); }
+        void   clear() { AutoLock lock(m_cs); v.clear(); }
+        void   free_memory() { AutoLock lock(m_cs); stl::free_container(v); }
+
+        template <class Func>
+        void   sort(const Func& compare_less) { AutoLock lock(m_cs); std::sort(v.begin(), v.end(), compare_less); }
+
+        //////////////////////////////////////////////////////////////////////////
+        bool try_pop(T& returnValue)
+        {
+            AutoLock lock(m_cs);
+            if (!v.empty())
+            {
+                returnValue = v.front();
+                v.erase(v.begin());
+                return true;
+            }
+            return false;
+        };
+
+        //////////////////////////////////////////////////////////////////////////
+        bool try_remove(const T& value)
+        {
+            AutoLock lock(m_cs);
+            if (!v.empty())
+            {
+                typename container_type::iterator it = std::find(v.begin(), v.end(), value);
+                if (it != v.end())
+                {
+                    v.erase(it);
+                    return true;
+                }
+            }
+            return false;
+        };
+
+        template<typename Sizer>
+        void GetMemoryUsage(Sizer* pSizer) const
+        {
+            pSizer->AddObject(v);
+        }
+    private:
+        container_type v;
+        mutable CryCriticalSection m_cs;
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Multi-Thread safe vector container, can be used instead of std::vector.
+    //////////////////////////////////////////////////////////////////////////
+    template <class T>
+    class vector
+    {
+    public:
+        typedef T   value_type;
+        typedef CryAutoCriticalSection AutoLock;
+
+        CryCriticalSection& get_lock() const { return m_cs; }
+
+        void free_memory() { AutoLock lock(m_cs); stl::free_container(v); }
+
+        //////////////////////////////////////////////////////////////////////////
+        // std::vector interface
+        //////////////////////////////////////////////////////////////////////////
+        bool   empty() const { AutoLock lock(m_cs); return v.empty(); }
+        int    size() const  { AutoLock lock(m_cs); return v.size(); }
+        void   resize(int sz) { AutoLock lock(m_cs); v.resize(sz); }
+        void   reserve(int sz) { AutoLock lock(m_cs); v.reserve(sz); }
+        size_t capacity() const { AutoLock lock(m_cs); return v.size(); }
+        void   clear() { AutoLock lock(m_cs); v.clear(); }
+        T&     operator[](size_t pos) { AutoLock lock(m_cs); return v[pos]; }
+        const T& operator[](size_t pos) const { AutoLock lock(m_cs); return v[pos]; }
+        const T& front() const { AutoLock lock(m_cs); return v.front(); }
+        const T& back() const { AutoLock lock(m_cs);    return v.back(); }
+        T& back() { AutoLock lock(m_cs);    return v.back(); }
+
+        void push_back(const T& x) { AutoLock lock(m_cs); return v.push_back(x); }
+        void pop_back() { AutoLock lock(m_cs);  return v.pop_back(); }
+        //////////////////////////////////////////////////////////////////////////
+
+        template <class Func>
+        void sort(const Func& compare_less) { AutoLock lock(m_cs); std::sort(v.begin(), v.end(), compare_less); }
+
+        template <class Iter>
+        void append(const Iter& startRange, const Iter& endRange) { AutoLock lock(m_cs); v.insert(v.end(), startRange, endRange); }
+
+        void swap(std::vector<T>& vec) { AutoLock lock(m_cs); v.swap(vec); }
+
+        //////////////////////////////////////////////////////////////////////////
+        bool try_pop_front(T& returnValue)
+        {
+            AutoLock lock(m_cs);
+            if (!v.empty())
+            {
+                returnValue = v.front();
+                v.erase(v.begin());
+                return true;
+            }
+            return false;
+        };
+        bool try_pop_back(T& returnValue)
+        {
+            AutoLock lock(m_cs);
+            if (!v.empty())
+            {
+                returnValue = v.back();
+                v.pop_back();
+                return true;
+            }
+            return false;
+        };
+
+        //////////////////////////////////////////////////////////////////////////
+        template <typename FindFunction, typename KeyType>
+        bool find_and_copy(FindFunction findFunc, const KeyType& key, T& foundValue) const
+        {
+            AutoLock lock(m_cs);
+            if (!v.empty())
+            {
+                typename std::vector<T>::const_iterator it;
+                for (it = v.begin(); it != v.end(); ++it)
+                {
+                    if (findFunc(key, *it))
+                    {
+                        foundValue = *it;
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        bool try_remove(const T& value)
+        {
+            AutoLock lock(m_cs);
+            if (!v.empty())
+            {
+                typename std::vector<T>::iterator it = std::find(v.begin(), v.end(), value);
+                if (it != v.end())
+                {
+                    v.erase(it);
+                    return true;
+                }
+            }
+            return false;
+        };
+
+        //////////////////////////////////////////////////////////////////////////
+        template <typename Predicate>
+        bool try_remove_and_erase_if(Predicate predicateFunction)
+        {
+            AutoLock lock(m_cs);
+            if (!v.empty())
+            {
+                typename std::vector<T>::iterator it = std::remove_if(v.begin(), v.end(), predicateFunction);
+                if (it != v.end())
+                {
+                    v.erase(it, v.end());
+                    return true;
+                }
+            }
+            return false;
+        };
+
+
+        //////////////////////////////////////////////////////////////////////////
+        bool try_remove_at(size_t idx)
+        {
+            AutoLock lock(m_cs);
+            if (idx < v.size())
+            {
+                v.erase(v.begin() + idx);
+                return true;
+            }
+            return false;
+        }
+
+
+        //////////////////////////////////////////////////////////////////////////
+        //Fast remove - just move last elem over deleted element - order is not preserved
+        bool try_remove_unordered(const T& value)
+        {
+            AutoLock lock(m_cs);
+            if (!v.empty())
+            {
+                typename std::vector<T>::iterator it = std::find(v.begin(), v.end(), value);
+                if (it != v.end())
+                {
+                    if (v.size() > 1)
+                    {
+                        typename std::vector<T>::iterator it_back = v.end() - 1;
+
+                        if (it != it_back)
+                        {
+                            *it = *it_back;
+                        }
+
+                        v.erase(it_back);
+                    }
+                    else
+                    {
+                        v.erase(it);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        };
+
+        vector() {}
+
+        vector(const vector<T>& rOther)
+        {
+            AutoLock lock1(m_cs);
+            AutoLock lock2(rOther.m_cs);
+
+            v = rOther.v;
+        }
+
+        vector& operator=(const vector<T>& rOther)
+        {
+            if (this == &rOther)
+            {
+                return *this;
+            }
+
+            AutoLock lock1(m_cs);
+            AutoLock lock2(rOther.m_cs);
+
+            v = rOther.v;
+
+            return *this;
+        }
+    private:
+        std::vector<T> v;
+        mutable CryCriticalSection m_cs;
+    };
+
+
+    //////////////////////////////////////////////////////////////////////////
+    // Multi-Thread safe set container, can be used instead of std::set.
+    // It has limited functionality, but most of it is there.
+    //////////////////////////////////////////////////////////////////////////
+    template <class T>
+    class set
+    {
+    public:
+        typedef T   value_type;
+        typedef T Key;
+        typedef typename std::set<T>::size_type size_type;
+        typedef CryAutoCriticalSection  AutoLock;
+
+        //////////////////////////////////////////////////////////////////////////
+        // Methods
+        //////////////////////////////////////////////////////////////////////////
+        void                                clear()                                                                         { AutoLock lock(m_cs); s.clear(); }
+        size_type                       count(const Key& _Key) const                                { AutoLock lock(m_cs); return s.count(_Key); }
+        bool                                empty() const                                                               { AutoLock lock(m_cs); return s.empty(); }
+        size_type                       erase(const Key& _Key)                                          { AutoLock lock(m_cs); return s.erase(_Key); }
+
+        bool                                find(const Key& _Key)                                               { AutoLock lock(m_cs); return (s.find(_Key) != s.end()); }
+
+        bool                                pop_front(value_type&   rFrontElement)
+        {
+            AutoLock lock(m_cs);
+            if (s.empty())
+            {
+                return false;
+            }
+            rFrontElement = *s.begin();
+            s.erase(s.begin());
+            return true;
+        }
+        bool                                pop_front()
+        {
+            AutoLock lock(m_cs);
+            if (s.empty())
+            {
+                return false;
+            }
+            s.erase(s.begin());
+            return true;
+        }
+
+        bool                                front(value_type&   rFrontElement)
+        {
+            AutoLock lock(m_cs);
+            if (s.empty())
+            {
+                return false;
+            }
+            rFrontElement = *s.begin();
+            return true;
+        }
+
+        bool                                insert(const value_type& _Val)                          { AutoLock lock(m_cs); return s.insert(_Val).second; }
+        size_type                       max_size() const                                                        { AutoLock lock(m_cs); return s.max_size(); }
+        size_type                       size() const                                                                { AutoLock lock(m_cs); return s.size(); }
+        void                                swap(set& _Right)                                                       { AutoLock lock(m_cs); s.swap(_Right); }
+
+        CryCriticalSection& get_lock()                                                                  { return m_cs; }
+
+    private:
+        std::set<value_type>                s;
+        mutable CryCriticalSection  m_cs;
+    };
+
+
+    ///////////////////////////////////////////////////////////////////////////////
+    //
+    // Multi-thread safe lock-less FIFO queue container for passing pointers between threads.
+    // The queue only stores pointers to T, it does not copy the contents of T.
+    //
+    //////////////////////////////////////////////////////////////////////////
+    template <class T, class Alloc = std::allocator<T> >
+    class CLocklessPointerQueue
+    {
+    public:
+        explicit CLocklessPointerQueue(size_t reserve = 32) { m_lockFreeQueue.reserve(reserve); };
+        ~CLocklessPointerQueue() {};
+
+        // Check's if queue is empty.
+        bool    empty() const;
+
+        // Pushes item to the queue, only pointer is stored, T contents are not copied.
+        void    push(T* ptr);
+        // pop can return NULL, always check for it before use.
+        T*    pop();
+
+    private:
+        queue<T*, typename std::allocator_traits<Alloc>::template rebind_alloc<T*>> m_lockFreeQueue;
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    template <class T, class Alloc>
+    inline bool CLocklessPointerQueue<T, Alloc>::empty() const
+    {
+        return m_lockFreeQueue.empty();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    template <class T, class Alloc>
+    inline void CLocklessPointerQueue<T, Alloc>::push(T* ptr)
+    {
+        m_lockFreeQueue.push(ptr);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    template <class T, class Alloc>
+    inline T* CLocklessPointerQueue<T, Alloc>::pop()
+    {
+        T* val = NULL;
+        m_lockFreeQueue.try_pop(val);
+        return val;
+    }
+}; // namespace CryMT
+
+namespace stl
+{
+    template <typename T>
+    void free_container(CryMT::vector<T>& v)
+    {
+        v.free_memory();
+    }
+    template <typename T>
+    void free_container(CryMT::queue<T>& v)
+    {
+        v.free_memory();
+    }
+}
+
+
+#endif // CRYINCLUDE_CRYCOMMON_MULTITHREAD_CONTAINERS_H
diff --git a/Code/Legacy/CryCommon/NullAudioSystem.h b/Code/Legacy/CryCommon/NullAudioSystem.h
new file mode 100644
index 0000000000..d30f3efaf3
--- /dev/null
+++ b/Code/Legacy/CryCommon/NullAudioSystem.h
@@ -0,0 +1,100 @@
+/*
+ * 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 <IAudioSystem.h>
+
+namespace Audio
+{
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    class NullAudioProxy
+        : public IAudioProxy
+    {
+    public:
+        NullAudioProxy() {}
+        ~NullAudioProxy() override {}
+
+        void Initialize(const char* const, const bool = true) override {}
+        void Release() override {}
+        void Reset() override {}
+        void ExecuteSourceTrigger([[maybe_unused]] TAudioControlID nTriggerID, [[maybe_unused]] const SAudioSourceInfo& rSourceInfo, [[maybe_unused]] const SAudioCallBackInfos & rCallbackInfos = SAudioCallBackInfos::GetEmptyObject()) override {}
+        void ExecuteTrigger(const TAudioControlID, [[maybe_unused]] const SAudioCallBackInfos& rCallbackInfos = SAudioCallBackInfos::GetEmptyObject()) override {}
+        void StopAllTriggers() override {}
+        void StopTrigger(const TAudioControlID) override {}
+        void SetSwitchState(const TAudioControlID, const TAudioSwitchStateID) override {}
+        void SetRtpcValue(const TAudioControlID, const float) override {}
+        void SetObstructionCalcType(const EAudioObjectObstructionCalcType) override {}
+        void SetPosition(const SATLWorldPosition&) override {}
+        void SetPosition(const AZ::Vector3&) override {}
+        void SetMultiplePositions([[maybe_unused]] const MultiPositionParams& positions) override {}
+        void SetEnvironmentAmount(const TAudioEnvironmentID, const float) override {}
+        void SetCurrentEnvironments() override {}
+        void ResetRtpcValues() override {}
+        TAudioObjectID GetAudioObjectID() const override { return INVALID_AUDIO_OBJECT_ID; }
+    };
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    class NullAudioSystem
+        : public IAudioSystem
+    {
+    public:
+        AZ_CLASS_ALLOCATOR(Audio::NullAudioSystem, AZ::SystemAllocator, 0)
+
+        NullAudioSystem()
+        {
+            AudioSystemRequestBus::Handler::BusConnect();
+            AudioSystemThreadSafeRequestBus::Handler::BusConnect();
+            AZ_TracePrintf(AZ::Debug::Trace::GetDefaultSystemWindow(), "<Audio>: Running with Null Audio System!\n");
+        }
+        ~NullAudioSystem() override
+        {
+            AudioSystemRequestBus::Handler::BusDisconnect();
+            AudioSystemThreadSafeRequestBus::Handler::BusDisconnect();
+        }
+
+        bool Initialize() override { return true; }
+        void Release() override {}
+        void ExternalUpdate() override {}
+
+        void PushRequest(const SAudioRequest&) override {}
+        void PushRequestBlocking(const SAudioRequest&) override {}
+        void PushRequestThreadSafe(const SAudioRequest&) override {}
+        void AddRequestListener(AudioRequestCallbackType, void* const, const EAudioRequestType, const TATLEnumFlagsType) override {}
+        void RemoveRequestListener(AudioRequestCallbackType, void* const) override {}
+
+        TAudioControlID GetAudioTriggerID(const char* const) const override { return INVALID_AUDIO_CONTROL_ID; }
+        TAudioControlID GetAudioRtpcID(const char* const) const override { return INVALID_AUDIO_CONTROL_ID; }
+        TAudioControlID GetAudioSwitchID(const char* const) const override { return INVALID_AUDIO_CONTROL_ID; }
+        TAudioSwitchStateID GetAudioSwitchStateID(const TAudioControlID, const char* const) const override { return INVALID_AUDIO_SWITCH_STATE_ID; }
+        TAudioPreloadRequestID GetAudioPreloadRequestID(const char* const) const override { return INVALID_AUDIO_PRELOAD_REQUEST_ID; }
+        TAudioEnvironmentID GetAudioEnvironmentID(const char* const) const override { return INVALID_AUDIO_ENVIRONMENT_ID; }
+
+        bool ReserveAudioListenerID(TAudioObjectID& rAudioObjectID) override { rAudioObjectID = INVALID_AUDIO_OBJECT_ID; return true; }
+        bool ReleaseAudioListenerID(const TAudioObjectID) override { return true; }
+        bool SetAudioListenerOverrideID(const TAudioObjectID) override { return true; }
+
+        void GetInfo(SAudioSystemInfo&) override {}
+        const char* GetControlsPath() const override { return ""; }
+        void UpdateControlsPath() override {}
+        void RefreshAudioSystem(const char* const) override {}
+
+        IAudioProxy* GetFreeAudioProxy() override { return static_cast<IAudioProxy*>(&m_nullAudioProxy); }
+        void FreeAudioProxy(IAudioProxy* const) override {}
+
+        TAudioSourceId CreateAudioSource([[maybe_unused]] const SAudioInputConfig& sourceConfig) override { return INVALID_AUDIO_SOURCE_ID; }
+        void DestroyAudioSource([[maybe_unused]] TAudioSourceId sourceId) override {}
+
+        const char* GetAudioControlName([[maybe_unused]] const EAudioControlType controlType, [[maybe_unused]] const TATLIDType atlID) const override { return nullptr; }
+        const char* GetAudioSwitchStateName([[maybe_unused]] const TAudioControlID switchID, [[maybe_unused]] const TAudioSwitchStateID stateID) const override { return nullptr; }
+
+    private:
+        NullAudioProxy m_nullAudioProxy;
+    };
+
+} // namespace Audio
diff --git a/Code/Legacy/CryCommon/Options.h b/Code/Legacy/CryCommon/Options.h
new file mode 100644
index 0000000000..ee60d482c8
--- /dev/null
+++ b/Code/Legacy/CryCommon/Options.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Facilities for defining and combining general-purpose or specific options, for functions or structs.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_OPTIONS_H
+#define CRYINCLUDE_CRYCOMMON_OPTIONS_H
+#pragma once
+
+
+// Facilities for collecting options in a struct, and quickly constructing them.
+// Used, for example, as construction argument. Safer and more informative than bool arguments.
+//
+// Example:
+//      struct FObjectOpts;
+//      struct CObject { CObject(FObjectOpts = ZERO); };
+//      CObject object_def();
+//      CObject object( FObjectOpts().Size(8).AllowGrowth(true) );
+
+template<class TOpt, class T, class TContainer, int NInit = 0>
+struct TOptVar
+{
+    typedef T   TValue;
+
+    TOptVar()
+        : _val(T(NInit))
+    {
+        offset(this);
+    }
+    TOptVar(T val)
+        : _val(val) {}
+
+    operator T () const
+    {
+        return _val;
+    }
+    T operator ()() const
+    { return _val; }
+    T operator +() const
+    { return _val; }
+    bool operator !() const
+    { return !_val; }
+
+    TContainer& operator()(T val)
+    {
+        _val = val;
+        return *(TContainer*)((char*)this - offset());
+    }
+
+private:
+    T       _val;
+
+    static size_t offset(void* self = 0)
+    {
+        static size_t _offset = TContainer::static_offset(self);
+        return _offset;
+    }
+};
+
+#define OPT_STRUCT(TOpts)                                                                                    \
+    typedef TOpts TThis; typedef uint TInt;                                                                  \
+    static size_t static_offset(void* var) { static void* _first = var; return (char*)var - (char*)_first; } \
+    TOpts([[maybe_unused]] void* p = 0) {}                                                                   \
+    TOpts operator()() const { return TOpts(*this); }                                                        \
+
+#define OPT_VAR(Type, Var)                            \
+    enum E##Var {}; TOptVar<E##Var, Type, TThis> Var; \
+
+#define OPT_VAR_INIT(Type, Var, init)                       \
+    enum E##Var {}; TOptVar<E##Var, Type, TThis, init> Var; \
+
+#define BIT_STRUCT(Struc, Int)                                                                  \
+    typedef Struc TThis; typedef Int TInt;                                                      \
+    TInt Mask() const { return *(const TInt*)this; }                                            \
+    TInt& Mask() { return *(TInt*)this; }                                                       \
+    Struc(TInt init = 0) { COMPILE_TIME_ASSERT(sizeof(TThis) == sizeof(TInt)); Mask() = init; } \
+
+#define BIT_VAR(Var)                                     \
+    TInt _##Var : 1;                                     \
+    bool Var() const { return _##Var; }                  \
+    TThis& Var(bool val) { _##Var = val; return *this; } \
+
+#endif // CRYINCLUDE_CRYCOMMON_OPTIONS_H
diff --git a/Code/CryEngine/CryCommon/PNoise3.h b/Code/Legacy/CryCommon/PNoise3.h
similarity index 100%
rename from Code/CryEngine/CryCommon/PNoise3.h
rename to Code/Legacy/CryCommon/PNoise3.h
diff --git a/Code/Legacy/CryCommon/PoolAllocator.h b/Code/Legacy/CryCommon/PoolAllocator.h
new file mode 100644
index 0000000000..4fbfeea4d9
--- /dev/null
+++ b/Code/Legacy/CryCommon/PoolAllocator.h
@@ -0,0 +1,506 @@
+/*
+ * 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_POOLALLOCATOR_H
+#define CRYINCLUDE_CRYCOMMON_POOLALLOCATOR_H
+#pragma once
+
+
+//---------------------------------------------------------------------------
+// Memory allocation class. Allocates, frees, and reuses fixed-size blocks of
+// memory, a scheme sometimes known as Simple Segregated Memory.
+//
+// Allocation is amortized constant time. The normal case is very fast -
+// basically just a couple of dereferences. If many blocks are allocated,
+// the system may occasionally need to allocate a further bucket of blocks
+// for itself. Deallocation is strictly fast constant time.
+//
+// Each PoolAllocator allocates blocks of a single size and alignment, specified
+// by template arguments. There is no per-block space overhead, except for
+// alignment. The free list mechanism uses the memory of the block itself
+// when it is deallocated.
+//
+// In this implementation memory claimed by the system is never deallocated,
+// until the entire allocator is deallocated. This is to ensure fast
+// allocation/deallocation - reference counting the bucket quickly would
+// require a pointer to the bucket be stored, whereas now no memory is used
+// while the block is allocated.
+//
+// The class can optionally support multi-threading, using the second
+// template parameter. By default it is multithread-safe.
+// See Synchronization.h.
+//
+// The class is implemented using a HeapAllocator.
+//---------------------------------------------------------------------------
+
+#include "HeapAllocator.h"
+
+namespace stl
+{
+    //////////////////////////////////////////////////////////////////////////
+    // Fixed-size pool allocator, using a shared heap.
+    template <typename THeap>
+    class SharedSizePoolAllocator
+    {
+        template <typename T>
+        friend struct PoolCommonAllocator;
+    protected:
+
+        using_type(THeap, Lock);
+
+        struct ObjectNode
+        {
+            ObjectNode* pNext;
+        };
+
+        static size_t AllocSize(size_t nSize)
+        {
+            return max<size_t>(nSize, sizeof(ObjectNode));
+        }
+        static size_t AllocAlign(size_t nSize, size_t nAlign)
+        {
+            return nAlign > 0 ? nAlign : min<size_t>(nSize, alignof(void*));
+        }
+
+    public:
+
+        SharedSizePoolAllocator(THeap& heap, size_t nSize, size_t nAlign = 0)
+            : _pHeap(&heap)
+            , _nAllocSize(AllocSize(nSize))
+            , _nAllocAlign(AllocAlign(nSize, nAlign))
+            , _pFreeList(0)
+        {
+        }
+
+        ~SharedSizePoolAllocator()
+        {
+            // All allocated objects should be freed by now.
+            Lock lock(*_pHeap);
+            Validate(lock);
+            for (ObjectNode* pFree = _pFreeList; pFree; )
+            {
+                ObjectNode* pNext = pFree->pNext;
+                _pHeap->Deallocate(lock, pFree, _nAllocSize);
+                pFree = pNext;
+            }
+        }
+
+        // Raw allocation.
+        void* Allocate()
+        {
+            Lock lock(*_pHeap);
+            if (_pFreeList)
+            {
+                ObjectNode* pFree = _pFreeList;
+                _pFreeList = _pFreeList->pNext;
+                Validate(lock);
+                _Counts.nUsed++;
+                return pFree;
+            }
+
+            // No free pointer, allocate a new one.
+            void* pNewMemory = _pHeap->Allocate(lock, _nAllocSize, _nAllocAlign);
+            if (pNewMemory)
+            {
+                _Counts.nUsed++;
+                _Counts.nAlloc++;
+                Validate(lock);
+            }
+            return pNewMemory;
+        }
+
+        void Deallocate(void* pObject)
+        {
+            Deallocate(Lock(*_pHeap), pObject);
+        }
+
+        SMemoryUsage GetCounts() const
+        {
+            Lock lock(*_pHeap);
+            return _Counts;
+        }
+        SMemoryUsage GetTotalMemory(const Lock&) const
+        {
+            return SMemoryUsage(_Counts.nAlloc * _nAllocSize, _Counts.nUsed * _nAllocSize);
+        }
+
+    protected:
+
+        void Deallocate(const Lock& lock, void* pObject)
+        {
+            if (pObject)
+            {
+                assert(_pHeap->CheckPtr(lock, pObject));
+
+                ObjectNode* pNode = static_cast<ObjectNode*>(pObject);
+
+                // Add the object to the front of the free list.
+                pNode->pNext = _pFreeList;
+                _pFreeList = pNode;
+                _Counts.nUsed--;
+                Validate(lock);
+            }
+        }
+
+        void Validate(const Lock& lock) const
+        {
+            _pHeap->Validate(lock);
+            _Counts.Validate();
+            assert(_Counts.nAlloc * _nAllocSize <= _pHeap->GetTotalMemory(lock).nUsed);
+        }
+
+        void Reset(const Lock&, [[maybe_unused]] bool bForce = false)
+        {
+            assert(bForce || _Counts.nUsed == 0);
+            _Counts.Clear();
+            _pFreeList = 0;
+        }
+
+    protected:
+        const size_t            _nAllocSize, _nAllocAlign;
+        SMemoryUsage            _Counts;
+
+        THeap*                      _pHeap;
+        ObjectNode*             _pFreeList;
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    struct SPoolMemoryUsage
+        : SMemoryUsage
+    {
+        size_t nPool;
+
+        SPoolMemoryUsage(size_t _nAlloc = 0, size_t _nPool = 0, size_t _nUsed = 0)
+            : SMemoryUsage(_nAlloc, _nUsed)
+            , nPool(_nPool)
+        {
+            // These values are pulled from 3 atomic variables and not guaranteed to be a perfect "snapshot"
+            // Of the current state of the pool memory usage (e.g. Used may be > max, etc)
+            // Patch the values so that they make sense (it won't be wrong, just mildly out of date)
+            // This is done to prevent sticking expensive mutexes or potentially forever blocking semaphores in the pool
+            if (nUsed > nPool)
+            {
+                nPool = nUsed;
+            }
+
+            assert(nPool <= nAlloc);
+        }
+
+        size_t nPoolFree() const
+        {
+            return nPool - nUsed;
+        }
+        size_t nNonPoolFree() const
+        {
+            return nAlloc - nPool;
+        }
+
+        void Clear()
+        {
+            nAlloc = nUsed = nPool = 0;
+        }
+
+        void operator += (SPoolMemoryUsage const& op)
+        {
+            nAlloc += op.nAlloc;
+            nPool += op.nPool;
+            nUsed += op.nUsed;
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // SizePoolAllocator with owned heap
+    template <typename THeap>
+    class SizePoolAllocator
+        : protected THeap
+        , public SharedSizePoolAllocator<THeap>
+    {
+        typedef SharedSizePoolAllocator<THeap> TPool;
+
+        using_type(THeap, Lock);
+        using_type(THeap, FreeMemLock);
+        using TPool::AllocSize;
+        using TPool::_Counts;
+        using TPool::_nAllocSize;
+
+    public:
+
+        SizePoolAllocator(size_t nSize, size_t nAlign = 0, FHeap opts = 0)
+            : THeap(opts.PageSize(opts.PageSize * AllocSize(nSize)))
+            , TPool(*this, nSize, nAlign)
+        {
+        }
+
+        using TPool::Allocate;
+        using THeap::GetMemoryUsage;
+
+        void Deallocate(void* pObject)
+        {
+            FreeMemLock lock(*this);
+            TPool::Deallocate(lock, pObject);
+            if (THeap::FreeWhenEmpty && _Counts.nUsed == 0)
+            {
+                TPool::Reset(lock);
+                THeap::Clear(lock);
+            }
+        }
+
+        void FreeMemoryIfEmpty()
+        {
+            FreeMemLock lock(*this);
+            if (_Counts.nUsed == 0)
+            {
+                TPool::Reset(lock);
+                THeap::Clear(lock);
+            }
+        }
+
+        void ResetMemory()
+        {
+            FreeMemLock lock(*this);
+            TPool::Reset(lock);
+            THeap::Reset(lock);
+        }
+
+        void FreeMemory()
+        {
+            FreeMemLock lock(*this);
+            TPool::Reset(lock);
+            THeap::Clear(lock);
+        }
+
+
+        void FreeMemoryForce()
+        {
+            FreeMemLock lock(*this);
+            TPool::Reset(lock, true);
+            THeap::Clear(lock);
+        }
+
+        SPoolMemoryUsage GetTotalMemory()
+        {
+            Lock lock(*this);
+            return SPoolMemoryUsage(THeap::GetTotalMemory(lock).nAlloc, _Counts.nAlloc * _nAllocSize, _Counts.nUsed * _nAllocSize);
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Templated size version of SizePoolAllocator
+    template <int S, typename L = PSyncMultiThread, int A = 0>
+    class PoolAllocator
+        : public SizePoolAllocator< HeapAllocator<L> >
+    {
+    public:
+        PoolAllocator(FHeap opts = 0)
+            :   SizePoolAllocator< HeapAllocator<L> >(S, A, opts)
+        {
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    template <int S, int A = 0>
+    class PoolAllocatorNoMT
+        : public SizePoolAllocator< HeapAllocator<PSyncNone> >
+    {
+    public:
+        PoolAllocatorNoMT(FHeap opts = 0)
+            :   SizePoolAllocator< HeapAllocator<PSyncNone> >(S, A, opts)
+        {
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    template<typename T, typename L = PSyncMultiThread, size_t A = 0>
+    class TPoolAllocator
+        : public SizePoolAllocator< HeapAllocator<L> >
+    {
+        typedef SizePoolAllocator< HeapAllocator<L> > TSizePool;
+
+    public:
+
+        using TSizePool::Allocate;
+        using TSizePool::Deallocate;
+
+        TPoolAllocator(FHeap opts = 0)
+            : TSizePool(sizeof(T), max<size_t>(alignof(T), A), opts)
+        {}
+
+        T* New()
+        {
+            return new(Allocate())T();
+        }
+
+        template<class I>
+        T* New(const I& init)
+        {
+            return new(Allocate())T(init);
+        }
+
+        void Delete(T* ptr)
+        {
+            if (ptr)
+            {
+                ptr->~T();
+                Deallocate(ptr);
+            }
+        }
+    };
+
+    // Legacy verbose typedefs.
+    typedef PSyncNone PoolAllocatorSynchronizationSinglethreaded;
+    typedef PSyncMultiThread PoolAllocatorSynchronizationMultithreaded;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Allocator maintaining multiple type-specific pools, sharing a common heap source.
+    template<typename THeap>
+    struct PoolCommonAllocator
+        : protected THeap
+    {
+        typedef SharedSizePoolAllocator<THeap> TPool;
+
+        using_type(THeap, Lock);
+        using_type(THeap, FreeMemLock);
+
+        struct TPoolNode
+            : SharedSizePoolAllocator<THeap>
+        {
+            TPoolNode* pNext;
+
+            TPoolNode(THeap& heap, TPoolNode*& pList, size_t nSize, size_t nAlign)
+                : SharedSizePoolAllocator<THeap>(heap, nSize, nAlign)
+            {
+                pNext = pList;
+                pList = this;
+            }
+        };
+
+    public:
+
+        PoolCommonAllocator()
+            : _pPoolList(0)
+        {
+        }
+        ~PoolCommonAllocator()
+        {
+            TPoolNode* pPool = _pPoolList;
+            while (pPool)
+            {
+                TPoolNode* pNextPool = pPool->pNext;
+                delete pPool;
+                pPool = pNextPool;
+            }
+        }
+
+        TPool* CreatePool(size_t nSize, size_t nAlign = 0)
+        {
+            return new TPoolNode(*this, _pPoolList, nSize, nAlign);
+        }
+
+        SPoolMemoryUsage GetTotalMemory()
+        {
+            Lock lock(*this);
+            SMemoryUsage mem;
+            for (TPoolNode* pPool = _pPoolList; pPool; pPool = pPool->pNext)
+            {
+                mem += pPool->GetTotalMemory(lock);
+            }
+            return SPoolMemoryUsage(THeap::GetTotalMemory(lock).nAlloc, mem.nAlloc, mem.nUsed);
+        }
+
+        bool FreeMemory(bool bDeallocate = true)
+        {
+            FreeMemLock lock(*this);
+            for (TPoolNode* pPool = _pPoolList; pPool; pPool = pPool->pNext)
+            {
+                if (pPool->GetTotalMemory(lock).nUsed)
+                {
+                    return false;
+                }
+            }
+
+            for (TPoolNode* pPool = _pPoolList; pPool; pPool = pPool->pNext)
+            {
+                pPool->Reset(lock);
+            }
+
+            if (bDeallocate)
+            {
+                THeap::Clear(lock);
+            }
+            else
+            {
+                THeap::Reset(lock);
+            }
+            return true;
+        }
+
+    protected:
+        TPoolNode*  _pPoolList;
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // The additional TInstancer type provides a way of instantiating multiple instances
+    // of this class, without static variables.
+    template<typename THeap, typename TInstancer = int>
+    struct StaticPoolCommonAllocator
+    {
+        ILINE static PoolCommonAllocator<THeap>& StaticAllocator()
+        {
+            static PoolCommonAllocator<THeap> s_Allocator;
+            return s_Allocator;
+        }
+
+        typedef SharedSizePoolAllocator<THeap> TPool;
+
+        template<class T>
+        ILINE static TPool& TypeAllocator()
+        {
+            static TPool* sp_Pool = CreatePoolOnGlobalHeap(sizeof(T), alignof(T));
+            return *sp_Pool;
+        }
+
+        template<class T>
+        ILINE static void* Allocate(T*& p)
+        { return p = (T*)TypeAllocator<T>().Allocate(); }
+
+        template<class T>
+        ILINE static void Deallocate(T* p)
+        { return TypeAllocator<T>().Deallocate(p); }
+
+        template<class T>
+        static T* New()
+        { return new(TypeAllocator<T>().Allocate())T(); }
+
+        template<class T, class I>
+        static T* New(const I& init)
+        { return new(TypeAllocator<T>().Allocate())T(init); }
+
+        template<class T>
+        static void Delete(T* ptr)
+        {
+            if (ptr)
+            {
+                ptr->~T();
+                TypeAllocator<T>().Deallocate(ptr);
+            }
+        }
+
+        static SPoolMemoryUsage GetTotalMemory()
+        { return StaticAllocator().GetTotalMemory(); }
+
+    private:
+
+        ILINE static TPool* CreatePoolOnGlobalHeap(size_t nSize, size_t nAlign = 0)
+        {            
+            return StaticAllocator().CreatePool(nSize, nAlign);
+        }
+    };
+};
+
+
+#endif // CRYINCLUDE_CRYCOMMON_POOLALLOCATOR_H
diff --git a/Code/Legacy/CryCommon/ProjectDefines.h b/Code/Legacy/CryCommon/ProjectDefines.h
new file mode 100644
index 0000000000..6c6ff3bb7e
--- /dev/null
+++ b/Code/Legacy/CryCommon/ProjectDefines.h
@@ -0,0 +1,262 @@
+/*
+ * 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 : to get some defines available in every CryEngine project
+
+
+#pragma once
+
+
+#include "BaseTypes.h"
+#include <AzCore/PlatformDef.h>
+
+#if defined(_RELEASE) && !defined(RELEASE)
+    #define RELEASE
+#endif
+
+// Section dictionary
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define PROJECTDEFINES_H_SECTION_STATS_AGENT 1
+#define PROJECTDEFINES_H_SECTION_TRAITS 2
+#define PROJECTDEFINES_H_SECTION_VTX_IDX 3
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_STATS_AGENT
+    #include AZ_RESTRICTED_FILE(ProjectDefines_h)
+#elif defined(WIN32) || defined(WIN64)
+#if !defined(_RELEASE) || defined(PERFORMANCE_BUILD)
+#define ENABLE_STATS_AGENT
+#endif
+#endif
+
+// The following definitions are used by Sandbox and RC to determine which platform support is needed
+#define TOOLS_SUPPORT_POWERVR
+#define TOOLS_SUPPORT_ETC2COMP
+
+// Type used for vertex indices
+// WARNING: If you change this typedef, you need to update AssetProcessorPlatformConfig.ini to convert cgf and abc files to the proper index format.
+#if defined(RESOURCE_COMPILER)
+typedef uint32 vtx_idx;
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(MOBILE)
+typedef uint16 vtx_idx;
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_VTX_IDX
+    #include AZ_RESTRICTED_FILE(ProjectDefines_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+// Uncomment one of the two following typedefs:
+typedef uint32 vtx_idx;
+//typedef uint16 vtx_idx;
+#endif
+
+
+// 0=off, 1=on
+#define TERRAIN_USE_CIE_COLORSPACE 0
+
+// When non-zero, const cvar accesses (by name) are logged in release-mode on consoles.
+// This can be used to find non-optimal usage scenario's, where the constant should be used directly instead.
+// Since read accesses tend to be used in flow-control logic, constants allow for better optimization by the compiler.
+#define LOG_CONST_CVAR_ACCESS 0
+
+#if defined(WIN32) || defined(WIN64) || LOG_CONST_CVAR_ACCESS
+#define RELEASE_LOGGING
+#endif
+
+#if defined(_RELEASE) && !defined(RELEASE_LOGGING)
+#define EXCLUDE_NORMAL_LOG
+#endif
+
+// Add the "REMOTE_ASSET_PROCESSOR" define except in release
+// this makes it so that asset processor functions.  Without this, all assets must be present and on local media
+// with this, the asset processor can be used to remotely process assets.
+#if !defined(_RELEASE)
+#   define REMOTE_ASSET_PROCESSOR
+#endif
+
+#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD))
+    #define USE_HTTP_WEBSOCKETS 0
+#endif
+
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_TRAITS
+    #include AZ_RESTRICTED_FILE(ProjectDefines_h)
+#else
+#define PROJECTDEFINES_H_TRAIT_DISABLE_MONOLITHIC_PROFILING_MARKERS 1
+#if !defined(LINUX) && !defined(APPLE)
+#define PROJECTDEFINES_H_TRAIT_ENABLE_SOFTCODE_SYSTEM 1
+#endif
+#if defined(WIN32) || defined(WIN64) || defined(LINUX) || defined(APPLE)
+#define PROJECTDEFINES_H_TRAIT_USE_GPU_PARTICLES 1
+#endif
+#define PROJECTDEFINES_H_TRAIT_USE_MESH_TESSELLATION 1
+#if defined(WIN32)
+#define PROJECTDEFINES_H_TRAIT_USE_SVO_GI 1
+#endif
+#if defined(APPLE) || defined(LINUX)
+#define AZ_LEGACY_CRYCOMMON_TRAIT_USE_PTHREADS 1
+#define AZ_LEGACY_CRYCOMMON_TRAIT_USE_UNIX_PATHS 1
+#endif
+#endif
+
+#define USE_GLOBAL_BUCKET_ALLOCATOR
+
+#ifdef IS_PROSDK
+#   define USING_TAGES_SECURITY                 // Wrapper for TGVM security
+# if defined(LINUX) || defined(APPLE)
+#   error LINUX and Mac does not support evaluation version
+# endif
+#endif
+
+#ifdef USING_TAGES_SECURITY
+#   define TAGES_EXPORT __declspec(dllexport)
+#else
+#   define TAGES_EXPORT
+#endif // USING_TAGES_SECURITY
+// test -------------------------------------
+
+#define _DATAPROBE
+
+
+
+//This feature allows automatic crash submission to JIRA, but does not work outside of O3DE
+//Note: This #define will be commented out during code export
+#define ENABLE_CRASH_HANDLER
+
+#if !defined(PHYSICS_STACK_SIZE)
+# define PHYSICS_STACK_SIZE (128U << 10)
+#endif
+
+#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD)) && !defined(RESOURCE_COMPILER)
+#ifndef ENABLE_PROFILING_CODE
+    #define ENABLE_PROFILING_CODE
+#endif
+#if !(defined(SANDBOX_EXPORTS) || defined(PLUGIN_EXPORTS) || (defined(AZ_MONOLITHIC_BUILD) && PROJECTDEFINES_H_TRAIT_DISABLE_MONOLITHIC_PROFILING_MARKERS))
+    #define ENABLE_PROFILING_MARKERS
+#endif
+
+//lightweight profilers, disable for submissions, disables displayinfo inside 3dengine as well
+#ifndef ENABLE_LW_PROFILERS
+    #define ENABLE_LW_PROFILERS
+#endif
+#endif
+
+#if defined(ENABLE_PROFILING_CODE)
+#define ENABLE_ART_RT_TIME_ESTIMATE
+#endif
+
+#if defined(ENABLE_PROFILING_CODE) && !defined(_RELEASE)
+    #define FMOD_STREAMING_DEBUGGING 1
+#endif
+
+#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(AZ_PLATFORM_LINUX)
+#define FLARES_SUPPORT_EDITING
+#endif
+
+// Reflect texture slot information - only used in the editor
+#if defined(WIN32) || defined(WIN64) || defined(AZ_PLATFORM_MAC)
+#define SHADER_REFLECT_TEXTURE_SLOTS 1
+#else
+#define SHADER_REFLECT_TEXTURE_SLOTS 0
+#endif
+
+// these enable and disable certain net features to give compatibility between PCs and consoles / profile and performance builds
+#define PC_CONSOLE_NET_COMPATIBLE 0
+#define PROFILE_PERFORMANCE_NET_COMPATIBLE 0
+
+#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD)) && !PROFILE_PERFORMANCE_NET_COMPATIBLE
+#define USE_LAGOMETER (1)
+#else
+#define USE_LAGOMETER (0)
+#endif
+
+// enable this in order to support old style material names in old data ("engine/material.mtl" or "mygame/material.mtl" as opposed to just "material.mtl")
+// previously, material names could have the game folder in it, but this is not necessary anymore and would not work with things like gems
+// note that if you use any older projects such as GameSDK this should remain enabled
+#define SUPPORT_LEGACY_MATERIAL_NAMES
+
+// Enable additional structures and code for sprite motion blur. Currently non-functional and disabled
+// #define PARTICLE_MOTION_BLUR
+
+// a special ticker thread to run during load and unload of levels
+#define USE_NETWORK_STALL_TICKER_THREAD
+
+#if !defined(MOBILE)
+//---------------------------------------------------------------------
+// Enable Tessellation Features
+// (displacement mapping, subdivision, water tessellation)
+//---------------------------------------------------------------------
+// Modules   : 3DEngine, Renderer
+// Depends on: DX11
+
+// Global tessellation feature flag
+    #define TESSELLATION
+    #ifdef TESSELLATION
+// Specific features flags
+        #define WATER_TESSELLATION
+        #define PARTICLES_TESSELLATION
+
+        #if PROJECTDEFINES_H_TRAIT_USE_MESH_TESSELLATION
+// Mesh tessellation (displacement, smoothing, subd)
+            #define MESH_TESSELLATION
+// Mesh tessellation also in motion blur passes
+            #define MOTIONBLUR_TESSELLATION
+        #endif
+
+// Dependencies
+        #ifdef MESH_TESSELLATION
+            #define MESH_TESSELLATION_ENGINE
+        #endif
+            #ifndef NULL_RENDERER
+            #ifdef WATER_TESSELLATION
+                #define WATER_TESSELLATION_RENDERER
+            #endif
+            #ifdef PARTICLES_TESSELLATION
+                #define PARTICLES_TESSELLATION_RENDERER
+            #endif
+            #ifdef MESH_TESSELLATION_ENGINE
+                #define MESH_TESSELLATION_RENDERER
+            #endif
+
+            #if defined(WATER_TESSELLATION_RENDERER) || defined(PARTICLES_TESSELLATION_RENDERER) || defined(MESH_TESSELLATION_RENDERER)
+// Common tessellation flag enabling tessellation stages in renderer
+                #define TESSELLATION_RENDERER
+            #endif
+        #endif // !NULL_RENDERER
+    #endif // TESSELLATION
+#endif // !defined(MOBILE)
+
+//------------------------------------------------------
+// SVO GI
+//------------------------------------------------------
+// Modules   : Renderer, Engine
+// Platform  : DX11
+#if !defined(RENDERNODES_LEAN_AND_MEAN)
+    #if PROJECTDEFINES_H_TRAIT_USE_SVO_GI
+        #define FEATURE_SVO_GI
+    #endif
+#endif
+
+#if defined(ENABLE_PROFILING_CODE)
+#   define USE_DISK_PROFILER
+#   define ENABLE_LOADING_PROFILER  // requires AZ_PROFILE_TELEMETRY to also be defined
+#endif
+
+#if PROJECTDEFINES_H_TRAIT_USE_GPU_PARTICLES && !defined(NULL_RENDERER)
+    #define GPU_PARTICLES 1
+#else
+    #define GPU_PARTICLES 0
+#endif
+
+// The maximum number of joints in an animation
+#define MAX_JOINT_AMOUNT 1024
diff --git a/Code/Legacy/CryCommon/Random.h b/Code/Legacy/CryCommon/Random.h
new file mode 100644
index 0000000000..d3624be46b
--- /dev/null
+++ b/Code/Legacy/CryCommon/Random.h
@@ -0,0 +1,68 @@
+/*
+ * 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_RANDOM_H
+#define CRYINCLUDE_CRYCOMMON_RANDOM_H
+#pragma once
+
+#include "BaseTypes.h"
+#include "LCGRandom.h"
+
+namespace CryRandom_Internal
+{
+    // Private access point to the global random number generator.
+    extern CRndGen g_random_generator;
+}
+
+
+// Seed the global random number generator.
+inline void cry_random_seed(const uint32 nSeed)
+{
+    CryRandom_Internal::g_random_generator.Seed(nSeed);
+}
+
+inline uint32 cry_random_uint32()
+{
+    return CryRandom_Internal::g_random_generator.GenerateUint32();
+}
+
+inline float cry_frand()
+{
+    return CryRandom_Internal::g_random_generator.GenerateFloat();
+}
+
+// Ranged function returns random value within the *inclusive* range
+// between minValue and maxValue.
+// Any orderings work correctly: minValue <= maxValue and
+// minValue >= minValue.
+template <class T>
+inline T cry_random(const T minValue, const T maxValue)
+{
+    return CryRandom_Internal::g_random_generator.GetRandom(minValue, maxValue);
+}
+
+// Vector (Vec2, Vec3, Vec4) ranged function returns vector with
+// every component within the *inclusive* ranges between minValue.component
+// and maxValue.component.
+// All orderings work correctly: minValue.component <= maxValue.component and
+// minValue.component >= maxValue.component.
+template <class T>
+inline T cry_random_componentwise(const T& minValue, const T& maxValue)
+{
+    return CryRandom_Internal::g_random_generator.GetRandomComponentwise(minValue, maxValue);
+}
+
+// The function returns a random unit vector (Vec2, Vec3, Vec4).
+template <class T>
+inline T cry_random_unit_vector()
+{
+    return CryRandom_Internal::g_random_generator.GetRandomUnitVector<T>();
+}
+
+// eof
+#endif // CRYINCLUDE_CRYCOMMON_RANDOM_H
diff --git a/Code/Legacy/CryCommon/Range.h b/Code/Legacy/CryCommon/Range.h
new file mode 100644
index 0000000000..43626baa05
--- /dev/null
+++ b/Code/Legacy/CryCommon/Range.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : Time TRange class.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_RANGE_H
+#define CRYINCLUDE_CRYCOMMON_RANGE_H
+
+#pragma once
+
+#include <AzCore/RTTI/TypeInfo.h>
+
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+/*!
+        Class TRange, can represent anything that is range between two values, mostly used for time ranges.
+ */
+template <class T>
+class TRange
+{
+public:
+    T start;
+    T end;
+
+    TRange()    { start = T(0); end = T(0); };
+    TRange(const TRange& r) { start = r.start; end = r.end; };
+    TRange(T s, T e) { start = s; end = e; };
+
+    void Set(T s, T e) { start = s; end = e; };
+    void Clear() { start = 0; end = 0; };
+
+    //! Get length of range.
+    T   Length() const { return end - start; };
+    //! Check if range is empty.
+    bool IsEmpty()  const { return (start == 0 && end == 0); }
+
+    //! Check if value is inside range.
+    bool IsInside(T val) { return val >= start && val <= end; };
+
+    void ClipValue(T& val) const
+    {
+        if (val < start)
+        {
+            val = start;
+        }
+        if (val > end)
+        {
+            val = end;
+        }
+    }
+
+    //! Compare two ranges.
+    bool    operator == (const TRange& r) const
+    {
+        return start == r.start && end == r.end;
+    }
+
+    bool  operator != (const TRange& r) const
+    {
+        return !(*this == r);
+    }
+    //! Assign operator.
+    TRange& operator =(const TRange& r)
+    {
+        start = r.start;
+        end = r.end;
+        return *this;
+    }
+    //! Interect two ranges.
+    TRange  operator & (const TRange& r) const
+    {
+        return TRange(MAX(start, r.start), MIN(end, r.end));
+    }
+    TRange& operator &= (const TRange& r)
+    {
+        return (*this = (*this & r));
+    }
+    //! Concatent two ranges.
+    TRange  operator | (const TRange& r) const
+    {
+        return TRange(MIN(start, r.start), MAX(end, r.end));
+    }
+    TRange& operator |= (const TRange& r)
+    {
+        return (*this = (*this | r));
+    }
+    //! Add new value to range.
+    TRange  operator + (T v) const
+    {
+        T s = start, e = end;
+        if (v < start)
+        {
+            s = v;
+        }
+        if (v > end)
+        {
+            e = v;
+        }
+        return TRange(s, e);
+    }
+    //! Add new value to range.
+    TRange& operator += (T v) const
+    {
+        if (v < start)
+        {
+            start = v;
+        }
+        if (v > end)
+        {
+            end = v;
+        }
+        return *this;
+    }
+};
+
+//! CRange if just TRange for floats..
+typedef TRange<float> Range;
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(Range, "{515CF4CF-4992-4139-BDE5-42A887432B45}");
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_RANGE_H
diff --git a/Code/Legacy/CryCommon/RenderBus.h b/Code/Legacy/CryCommon/RenderBus.h
new file mode 100644
index 0000000000..3c192a3019
--- /dev/null
+++ b/Code/Legacy/CryCommon/RenderBus.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+namespace AZ
+{
+    /**
+    * This bus serves as a way for non-rendering systems to react to events
+    * that occur inside the renderer. For now these events will probably be implemented by
+    * things like CSystem and CryAction. In the future the idea is that these can be implemented
+    * by a user's GameComponent.
+    */
+    class RenderNotifications
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~RenderNotifications() = default;
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        //////////////////////////////////////////////////////////////////////////
+
+        /**
+        * This event gets posted at the beginning of CD3D9Renderer's FreeResources method, before the resources have been freed.
+        */
+        virtual void OnRendererFreeResources([[maybe_unused]] int flags) {};
+    };
+
+    using RenderNotificationsBus = AZ::EBus<RenderNotifications>;
+
+    /**
+    * This bus is used for renderer notifications that occur directly from the render thread
+    * while scene rendering is occurring.  (In contrast, the RenderNotificationsBus above runs on the
+    * main thread while the renderer is preparing the scene.)
+    */
+    class RenderThreadEvents
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~RenderThreadEvents() = default;
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        //////////////////////////////////////////////////////////////////////////
+
+        /*
+        * This hook enables per-frame render work at the beginning of the frame.
+        *
+        * This event is triggered when RT_RenderScene is called at the beginning of a frame.
+        * The event will only be triggered on the render thread, if multithreaded rendering
+        * is enabled.  And, it will only be triggered on a non-recursive scene render.
+        */
+        virtual void OnRenderThreadRenderSceneBegin() {}
+    };
+
+    using RenderThreadEventsBus = AZ::EBus<RenderThreadEvents>;
+
+    /**
+    * This bus is used for firing screenshot request to any rendering system.
+    * The rendering system should implement its own screenshot function.
+    */
+    class RenderScreenshotRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        static const EBusHandlerPolicy HandlerPolicy = EBusHandlerPolicy::Single; ///< EBusTraits overrides
+        static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::Single; ///< EBusTraits overrides
+
+        /** Take a screenshot and save it to a file.
+        @param filepath the path where a the screenshot is saved.
+        */
+        virtual void WriteScreenshotToFile(const char* filepath) = 0;
+
+        /** Take a screenshot and preserve it within a buffer
+        */
+        virtual void WriteScreenshotToBuffer() = 0;
+
+        /** Fill a provided buffer with the render buffer
+        @param imageBuffer The provided buffer to be filled
+        */
+        virtual bool CopyScreenshotToBuffer(unsigned char* imageBuffer, unsigned int width, unsigned int height) = 0;
+
+    };
+
+    using RenderScreenshotRequestBus = AZ::EBus<RenderScreenshotRequests>;
+
+    class RenderScreenshotNotifications
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual ~RenderScreenshotNotifications() = default;
+
+        static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::Single; ///< EBusTraits overrides
+
+        /** Notify waiting components that the requested screenshot is ready
+        */
+        virtual void OnScreenshotReady() = 0;
+    };
+
+    using RenderScreenshotNotificationBus = AZ::EBus<RenderScreenshotNotifications>;
+}
diff --git a/Code/Legacy/CryCommon/SFunctor.h b/Code/Legacy/CryCommon/SFunctor.h
new file mode 100644
index 0000000000..4f493f42a5
--- /dev/null
+++ b/Code/Legacy/CryCommon/SFunctor.h
@@ -0,0 +1,111 @@
+/*
+ * 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 : User header for multi DLL functors.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_SFUNCTOR_H
+#define CRYINCLUDE_CRYCOMMON_SFUNCTOR_H
+#pragma once
+
+
+#include "FunctorBaseFunction.h"
+#include "FunctorBaseMember.h"
+
+// Needed for CryFont to compile.
+// Maybe for others too.
+#include "smartptr.h"
+
+
+struct SFunctor
+{
+public:
+    // Calls the functor method.
+    // returns true, if a functor is registered, false otherwise.
+    bool Call()
+    {
+        if (!m_pFunctor)
+        {
+            return false;
+        }
+
+        m_pFunctor->Call();
+
+        return true;
+    }
+
+    // Sets a new functor, common function, void return type, no arguments.
+    // Parameters: the function pointer.
+    template<typename tCallback>
+    void Set(tCallback pCallback)
+    {
+        typedef TFunctor<tCallback> TType;
+        m_pFunctor = new TType(pCallback);
+    }
+
+    // Sets a new functor, common function, void return type, 1 argument.
+    // Parameters: the function pointer, the argument to be passed to the function.
+    template<typename tCallback, typename tArgument1>
+    void Set(tCallback pCallback, const tArgument1& Argument1)
+    {
+        typedef TFunctor<tCallback> TType;
+        m_pFunctor = new TType(pCallback, Argument1);
+    }
+
+    // Sets a new functor, common function, void return type, 2 arguments.
+    // Parameters: the function pointer, the 2 arguments to be passed to the function.
+    template<typename tCallback, typename tArgument1, typename tArgument2>
+    void Set(tCallback pCallback, const tArgument1& Argument1, const tArgument2& Argument2)
+    {
+        typedef TFunctor<tCallback> TType;
+        m_pFunctor = new TType(pCallback, Argument1, Argument2);
+    }
+
+    // Sets a new functor, common function, void return type, no arguments.
+    // Parameters: the function pointer, the 2 arguments to be passed to the function.
+    template<typename tCallee>
+    void Set(tCallee* pCallee, void (tCallee::* pCallback)())
+    {
+        typedef TFunctor<void (tCallee::*)()> TType;
+        m_pFunctor = new TType(pCallee, pCallback);
+    }
+
+    // Sets a new functor, common function, void return type, 1 argument.
+    // Parameters: the function pointer, the 2 arguments to be passed to the function, the argument.
+    template<typename tCallee, typename tArgument1>
+    void Set(tCallee* pCallee, void (tCallee::* pCallback)(tArgument1), const tArgument1& Argument1)
+    {
+        typedef TFunctor<void (tCallee::*)(tArgument1)> TType;
+        m_pFunctor = new TType(pCallee, pCallback, Argument1);
+    }
+
+    // Sets a new functor, common function, void return type, 2 arguments.
+    // Parameters: the function pointer, the 2 arguments to be passed to the function, the 2 arguments.
+    template<typename tCallee, typename tArgument1, typename tArgument2>
+    void Set(tCallee* pCallee, void (tCallee::* pCallback)(tArgument1, tArgument2), const tArgument1& Argument1, const tArgument2& Argument2)
+    {
+        typedef TFunctor<void (tCallee::*)(tArgument1, tArgument2)> TType;
+        m_pFunctor = new TType(pCallee, pCallback, Argument1, Argument2);
+    }
+
+    // Used to compare equality between 2 IFunctors.
+    bool operator==(const SFunctor& rOther)
+    {
+        return m_pFunctor == rOther.m_pFunctor;
+    }
+
+    // Used order to IFunctors (needed for some containers, like map).
+    bool operator<(const SFunctor& rOther)
+    {
+        return m_pFunctor < rOther.m_pFunctor;
+    }
+protected:
+    _smart_ptr<IFunctorBase>    m_pFunctor;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_SFUNCTOR_H
diff --git a/Code/Legacy/CryCommon/ScopedVariableSetter.h b/Code/Legacy/CryCommon/ScopedVariableSetter.h
new file mode 100644
index 0000000000..f781552214
--- /dev/null
+++ b/Code/Legacy/CryCommon/ScopedVariableSetter.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_SCOPEDVARIABLESETTER_H
+#define CRYINCLUDE_CRYCOMMON_SCOPEDVARIABLESETTER_H
+#pragma once
+
+
+// The idea of this class is to set the value of a variable in its constructor,
+// and then in the destructor to reset it to its initial value.
+template <typename T>
+class CScopedVariableSetter
+{
+public:
+    typedef T Value;
+
+    CScopedVariableSetter(Value& variable, const Value& temporaryValue)
+        :   m_oldValue(variable)
+        , m_variable(variable)
+    {
+        m_variable = temporaryValue;
+    }
+
+    ~CScopedVariableSetter()
+    {
+        m_variable = m_oldValue;
+    }
+
+private:
+    Value m_oldValue;
+    Value& m_variable;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_SCOPEDVARIABLESETTER_H
diff --git a/Code/Legacy/CryCommon/SerializationTypes.h b/Code/Legacy/CryCommon/SerializationTypes.h
new file mode 100644
index 0000000000..f9bcf528cb
--- /dev/null
+++ b/Code/Legacy/CryCommon/SerializationTypes.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
+ *
+ */
+
+// this file is included anywhere that we need a complete list of primitive serializable types
+
+SERIALIZATION_TYPE(bool)
+SERIALIZATION_TYPE(float)
+SERIALIZATION_TYPE(double)
+SERIALIZATION_TYPE(Vec2)
+SERIALIZATION_TYPE(Vec3)
+SERIALIZATION_TYPE(Quat)
+SERIALIZATION_TYPE(Ang3)
+SERIALIZATION_TYPE(int8)
+SERIALIZATION_TYPE(int16)
+SERIALIZATION_TYPE(int32)
+SERIALIZATION_TYPE(int64)
+SERIALIZATION_TYPE(uint8)
+SERIALIZATION_TYPE(uint16)
+SERIALIZATION_TYPE(uint32)
+SERIALIZATION_TYPE(uint64)
+SERIALIZATION_TYPE(CTimeValue)
+SERIALIZATION_TYPE(SNetObjectID)
+SERIALIZATION_TYPE(XmlNodeRef) // not for network - only for save games
diff --git a/Code/Legacy/CryCommon/SerializeFwd.h b/Code/Legacy/CryCommon/SerializeFwd.h
new file mode 100644
index 0000000000..a4e8c018bc
--- /dev/null
+++ b/Code/Legacy/CryCommon/SerializeFwd.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
+ *
+ */
+
+
+// Description : forward declaration of TSerialize
+
+#ifndef CRYINCLUDE_CRYCOMMON_SERIALIZEFWD_H
+#define CRYINCLUDE_CRYCOMMON_SERIALIZEFWD_H
+#pragma once
+
+
+
+template <class T>
+class CSerializeWrapper;
+struct ISerialize;
+typedef CSerializeWrapper<ISerialize> TSerialize;
+
+#endif // CRYINCLUDE_CRYCOMMON_SERIALIZEFWD_H
diff --git a/Code/Legacy/CryCommon/SimpleSerialize.h b/Code/Legacy/CryCommon/SimpleSerialize.h
new file mode 100644
index 0000000000..b14788d7ee
--- /dev/null
+++ b/Code/Legacy/CryCommon/SimpleSerialize.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_SIMPLESERIALIZE_H
+#define CRYINCLUDE_CRYCOMMON_SIMPLESERIALIZE_H
+#pragma once
+
+
+#include <ISerialize.h> // <> required for Interfuscator
+#include "TimeValue.h"
+
+template <bool READING>
+class CSimpleSerializeImpl_Reading;
+
+template <>
+class CSimpleSerializeImpl_Reading<true>
+{
+public:
+    CSimpleSerializeImpl_Reading()
+        : m_bCommit(true) {}
+    ILINE bool IsReading() const
+    {
+        return true;
+    }
+    ILINE bool ShouldCommitValues() const
+    {
+        return m_bCommit;
+    }
+    ILINE void Update(ISerializeUpdateFunction* pFunc)
+    {
+        if (m_bCommit)
+        {
+            pFunc->Execute();
+        }
+    }
+protected:
+    bool m_bCommit;
+};
+
+template <>
+class CSimpleSerializeImpl_Reading<false>
+{
+public:
+    ILINE bool IsReading() const
+    {
+        return false;
+    }
+    ILINE bool ShouldCommitValues() const
+    {
+        return true;
+    }
+    ILINE void Update(ISerializeUpdateFunction*)
+    {
+    }
+};
+
+template <bool READING, ESerializationTarget TARGET>
+class CSimpleSerializeImpl
+    : public CSimpleSerializeImpl_Reading<READING>
+{
+public:
+    CSimpleSerializeImpl()
+        : m_failed(false) {}
+    ILINE void BeginGroup(const char* szName)
+    {
+    }
+    ILINE void EndGroup()
+    {
+    }
+    ILINE ESerializationTarget GetSerializationTarget() const
+    {
+        return TARGET;
+    }
+    ILINE void FlagPartialRead() {}
+
+    ILINE bool Ok() const
+    {
+        return !m_failed;
+    }
+
+protected:
+    ILINE void Failed()
+    {
+        m_failed = true;
+    }
+
+private:
+    bool m_failed;
+};
+
+template <class Impl>
+class CSimpleSerialize
+    : public ISerialize
+{
+public:
+    ILINE CSimpleSerialize(Impl& impl)
+        : m_impl(impl)
+    {
+    }
+
+    void Update(ISerializeUpdateFunction* pFunc)
+    {
+        m_impl.Update(pFunc);
+    }
+
+    void BeginGroup(const char* szName)
+    {
+        m_impl.BeginGroup(szName);
+    }
+
+    bool BeginOptionalGroup(const char* szName, bool condition)
+    {
+        return m_impl.BeginOptionalGroup(szName, condition);
+    }
+
+    void EndGroup()
+    {
+        m_impl.EndGroup();
+    }
+
+    bool IsReading() const
+    {
+        return m_impl.IsReading();
+    }
+
+    bool ShouldCommitValues() const
+    {
+        return m_impl.ShouldCommitValues();
+    }
+
+    ESerializationTarget GetSerializationTarget() const
+    {
+        return m_impl.GetSerializationTarget();
+    }
+
+    void WriteStringValue(const char* name, SSerializeString& value, uint32 policy)
+    {
+        m_impl.Value(name, value, policy);
+    }
+    void ReadStringValue(const char* name, SSerializeString& curValue, uint32 policy)
+    {
+        m_impl.Value(name, curValue, policy);
+    }
+
+    bool Ok() const
+    {
+        return m_impl.Ok();
+    }
+
+    void FlagPartialRead()
+    {
+        m_impl.FlagPartialRead();
+    }
+
+#define SERIALIZATION_TYPE(T) \
+    virtual void Value(const char* name, T & x, uint32 policy) { m_impl.Value(name, x, policy); }
+#include "SerializationTypes.h"
+#undef SERIALIZATION_TYPE
+
+#define SERIALIZATION_TYPE(T) \
+    virtual void ValueWithDefault([[maybe_unused]] const char* name, [[maybe_unused]] T & x, [[maybe_unused]] const T&defaultValue) { assert(0); }
+#include "SerializationTypes.h"
+    SERIALIZATION_TYPE(SSerializeString)
+#undef SERIALIZATION_TYPE
+
+    Impl * GetInnerImpl() {
+        return &m_impl;
+    }
+
+protected:
+    Impl& m_impl;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Support serialization with default values,
+// Require Implementation serialization stub to have Value() method returning boolean.
+//////////////////////////////////////////////////////////////////////////
+template <class Impl>
+class CSimpleSerializeWithDefaults
+    : public CSimpleSerialize<Impl>
+{
+public:
+    ILINE CSimpleSerializeWithDefaults(Impl& impl)
+        : CSimpleSerialize<Impl>(impl) {}
+
+#define SERIALIZATION_TYPE(T)                                                      \
+    virtual void ValueWithDefault(const char* name, T & x, const T&defaultValue) { \
+        if (CSimpleSerialize<Impl>::m_impl.IsReading()) {                          \
+            if (!CSimpleSerialize<Impl>::m_impl.Value(name, x, 0)) {               \
+                x = defaultValue; }                                                \
+        }                                                                          \
+        else if (x != defaultValue) {                                              \
+            CSimpleSerialize<Impl>::m_impl.Value(name, x, 0); }                    \
+    }
+#include "SerializationTypes.h"
+    SERIALIZATION_TYPE(SSerializeString)
+#undef SERIALIZATION_TYPE
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_SIMPLESERIALIZE_H
diff --git a/Code/Legacy/CryCommon/StatObjBus.h b/Code/Legacy/CryCommon/StatObjBus.h
new file mode 100644
index 0000000000..81f8d94036
--- /dev/null
+++ b/Code/Legacy/CryCommon/StatObjBus.h
@@ -0,0 +1,70 @@
+/*
+ * 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_STATOBJBUS_H
+#define CRYINCLUDE_CRYCOMMON_STATOBJBUS_H
+
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/std/containers/unordered_set.h>
+
+struct IStatObj;
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Ebus support for handling unique IDs between IStatInstGroup instances.
+//
+//////////////////////////////////////////////////////////////////////////
+using StatInstGroupId = int;
+
+class StatInstGroupEvents
+    : public AZ::EBusTraits
+{
+public:
+    const static StatInstGroupId s_InvalidStatInstGroupId = -1;
+
+    virtual ~StatInstGroupEvents() = 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 StatInstGroupId GenerateStatInstGroupId() = 0;
+    virtual void ReleaseStatInstGroupId(StatInstGroupId statInstGroupId) = 0;
+    virtual void ReleaseStatInstGroupIdSet(const AZStd::unordered_set<StatInstGroupId>& statInstGroupIdSet) = 0;
+    virtual void ReserveStatInstGroupIdRange(StatInstGroupId from, StatInstGroupId to) = 0;
+};
+
+using StatInstGroupEventBus = AZ::EBus<StatInstGroupEvents>;
+
+//////////////////////////////////////////////////////////////////////////
+//
+// 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>;
+
+#endif // CRYINCLUDE_CRYCOMMON_STATOBJBUS_H
+#pragma once
diff --git a/Code/Legacy/CryCommon/StaticInstance.h b/Code/Legacy/CryCommon/StaticInstance.h
new file mode 100644
index 0000000000..cae98e866d
--- /dev/null
+++ b/Code/Legacy/CryCommon/StaticInstance.h
@@ -0,0 +1,683 @@
+/*
+ * 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
+
+template <class T>
+class StaticInstanceSpecialization
+{
+};
+
+// Specializations for std::vector and std::map which allows us to modify the 
+// least amount of legacy code by mirroring the std APIs that are in use
+// These are not intended to be complete, just enough to shim existing legacy code
+template <typename U, class A>
+class StaticInstanceSpecialization<std::vector<U, A>>
+{
+public:
+    using Container = std::vector<U, A>;
+    using reference = typename Container::reference;
+    using const_reference = typename Container::const_reference;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using pointer = typename Container::pointer;
+    using const_pointer = typename Container::const_pointer;
+    using size_type = typename Container::size_type;
+
+    template <class Integral>
+    AZ_FORCE_INLINE 
+    typename AZStd::enable_if<AZStd::is_integral<Integral>::value, reference>::type
+    operator[](Integral index)
+    {
+        return get()[size_type(index)];
+    }
+
+    template <class Integral>
+    AZ_FORCE_INLINE
+    typename AZStd::enable_if<AZStd::is_integral<Integral>::value, const_reference>::type
+    operator[](Integral index) const
+    {
+        return get()[size_type(index)];
+    }
+
+    AZ_FORCE_INLINE iterator begin()
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE const_iterator begin() const
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE iterator end()
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE const_iterator end() const
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE iterator erase(iterator it)
+    {
+        return get().erase(it);
+    }
+
+    AZ_FORCE_INLINE iterator erase(iterator first, iterator last)
+    {
+        return get().erase(first, last);
+    }
+
+    AZ_FORCE_INLINE void resize(size_t size)
+    {
+        get().resize(size);
+    }
+
+    AZ_FORCE_INLINE void reserve(size_t size)
+    {
+        get().reserve(size);
+    }
+
+    AZ_FORCE_INLINE void clear()
+    {
+        get().clear();
+    }
+
+    AZ_FORCE_INLINE size_type size()
+    {
+        return get().size();
+    }
+
+    AZ_FORCE_INLINE void push_back(U&& val)
+    {
+        get().push_back(val);
+    }
+
+    AZ_FORCE_INLINE void push_back(const U& val)
+    {
+        get().push_back(val);
+    }
+
+    AZ_FORCE_INLINE bool empty() const
+    {
+        return get().empty();
+    }
+
+    AZ_FORCE_INLINE iterator insert(U&& val)
+    {
+        return get().insert(val);
+    }
+
+    AZ_FORCE_INLINE iterator insert(iterator it, U&& val)
+    {
+        return get().insert(it, val);
+    }
+
+    AZ_FORCE_INLINE reference front()
+    {
+        return get().front();
+    }
+
+    AZ_FORCE_INLINE const_reference front() const
+    {
+        return get().front();
+    }
+
+    AZ_FORCE_INLINE reference back()
+    {
+        return get().back();
+    }
+
+    AZ_FORCE_INLINE const_reference back() const
+    {
+        return get().back();
+    }
+
+    AZ_FORCE_INLINE void pop_back()
+    {
+        get().pop_back();
+    }
+
+    AZ_FORCE_INLINE pointer data()
+    {
+        return get().data();
+    }
+
+    AZ_FORCE_INLINE const_pointer data() const
+    {
+        return get().data();
+    }
+
+    void swap(Container& other)
+    {
+        get().swap(other);
+    }
+
+private:
+    Container& get() const;
+};
+
+
+template <typename U, class A>
+class StaticInstanceSpecialization<std::list<U, A>>
+{
+public:
+    using Container = std::list<U, A>;
+    using reference = typename Container::reference;
+    using const_reference = typename Container::const_reference;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using pointer = typename Container::pointer;
+    using const_pointer = typename Container::const_pointer;
+    using size_type = typename Container::size_type;
+
+    AZ_FORCE_INLINE iterator begin()
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE const_iterator begin() const
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE iterator end()
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE const_iterator end() const
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE iterator erase(iterator it)
+    {
+        return get().erase(it);
+    }
+
+    AZ_FORCE_INLINE iterator erase(iterator first, iterator last)
+    {
+        return get().erase(first, last);
+    }
+
+    AZ_FORCE_INLINE void resize(size_t size)
+    {
+        get().resize(size);
+    }
+
+    AZ_FORCE_INLINE void reserve(size_t size)
+    {
+        get().reserve(size);
+    }
+
+    AZ_FORCE_INLINE void clear()
+    {
+        get().clear();
+    }
+
+    AZ_FORCE_INLINE size_type size()
+    {
+        return get().size();
+    }
+
+    AZ_FORCE_INLINE void push_back(U&& val)
+    {
+        get().push_back(val);
+    }
+
+    AZ_FORCE_INLINE void push_back(const U& val)
+    {
+        get().push_back(val);
+    }
+
+    AZ_FORCE_INLINE void push_front(U&& val)
+    {
+        get().push_front(val);
+    }
+
+    AZ_FORCE_INLINE void push_front(const U& val)
+    {
+        get().push_front(val);
+    }
+
+    AZ_FORCE_INLINE bool empty() const
+    {
+        return get().empty();
+    }
+
+    AZ_FORCE_INLINE iterator insert(U&& val)
+    {
+        return get().insert(val);
+    }
+
+    AZ_FORCE_INLINE iterator insert(iterator it, U&& val)
+    {
+        return get().insert(it, val);
+    }
+
+    AZ_FORCE_INLINE reference front()
+    {
+        return get().front();
+    }
+
+    AZ_FORCE_INLINE const_reference front() const
+    {
+        return get().front();
+    }
+
+    AZ_FORCE_INLINE reference back()
+    {
+        return get().back();
+    }
+
+    AZ_FORCE_INLINE const_reference back() const
+    {
+        return get().back();
+    }
+
+    AZ_FORCE_INLINE void pop_back()
+    {
+        get().pop_back();
+    }
+
+    AZ_FORCE_INLINE pointer data()
+    {
+        return get().data();
+    }
+
+    AZ_FORCE_INLINE const_pointer data() const
+    {
+        return get().data();
+    }
+
+    void swap(Container& other)
+    {
+        get().swap(other);
+    }
+
+private:
+    Container& get() const;
+};
+
+template <class K, class V, class Less, class Allocator>
+class StaticInstanceSpecialization<std::map<K, V, Less, Allocator>>
+{
+public:
+    using Container = std::map<K, V, Less, Allocator>;
+    using reference = typename Container::reference;
+    using const_reference = typename Container::const_reference;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using key_type = typename Container::key_type;
+    using mapped_type = typename Container::mapped_type;
+    using value_type = typename Container::value_type;
+    using size_type = typename Container::size_type;
+
+    using pair_iter_bool = std::pair<iterator, bool>;
+    
+
+    AZ_FORCE_INLINE iterator begin()
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE const_iterator begin() const
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE iterator end()
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE const_iterator end() const
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE iterator erase(iterator it)
+    {
+        return get().erase(it);
+    }
+
+    AZ_FORCE_INLINE size_t erase(const key_type& key)
+    {
+        return get().erase(key);
+    }
+
+    AZ_FORCE_INLINE mapped_type& operator[](const key_type& key)
+    {
+        return get()[key];
+    }
+
+    template <class K2>
+    AZ_FORCE_INLINE 
+    typename AZStd::enable_if<AZStd::is_constructible<key_type, K2>::value, mapped_type&>::type
+    operator[](const K2& keylike)
+    {
+        return get()[key_type(keylike)];
+    }
+
+    AZ_FORCE_INLINE iterator find(const key_type& key)
+    {
+        return get().find(key);
+    }
+
+    AZ_FORCE_INLINE const_iterator find(const key_type& key) const
+    {
+        return get().find(key);
+    }
+
+    AZ_FORCE_INLINE void clear()
+    {
+        get().clear();
+    }
+
+    AZ_FORCE_INLINE bool empty() const
+    {
+        return get().empty();
+    }
+
+    AZ_FORCE_INLINE iterator insert(iterator hint, const value_type& kv)
+    {
+        return get().insert(hint, kv);
+    }
+
+    AZ_FORCE_INLINE pair_iter_bool insert(const value_type& kv)
+    {
+        return get().insert(kv);
+    }
+
+    AZ_FORCE_INLINE size_type size() const
+    {
+        return get().size();
+    }
+
+    void swap(Container& cont)
+    {
+        get().swap(cont);
+    }
+
+private:
+    Container& get() const;
+};
+
+template <class K, class V, class Less, class Allocator>
+class StaticInstanceSpecialization<std::multimap<K, V, Less, Allocator>>
+{
+public:
+    using Container = std::multimap<K, V, Less, Allocator>;
+    using reference = typename Container::reference;
+    using const_reference = typename Container::const_reference;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using key_type = typename Container::key_type;
+    using mapped_type = typename Container::mapped_type;
+    using value_type = typename Container::value_type;
+    using size_type = typename Container::size_type;
+
+    AZ_FORCE_INLINE iterator begin()
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE const_iterator begin() const
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE iterator end()
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE const_iterator end() const
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE iterator erase(iterator it)
+    {
+        return get().erase(it);
+    }
+
+    AZ_FORCE_INLINE size_t erase(const key_type& key)
+    {
+        return get().erase(key);
+    }
+
+    AZ_FORCE_INLINE iterator find(const key_type& key)
+    {
+        return get().find(key);
+    }
+
+    AZ_FORCE_INLINE const_iterator find(const key_type& key) const
+    {
+        return get().find(key);
+    }
+
+    AZ_FORCE_INLINE void clear()
+    {
+        get().clear();
+    }
+
+    AZ_FORCE_INLINE bool empty() const
+    {
+        return get().empty();
+    }
+
+    AZ_FORCE_INLINE iterator insert(value_type&& kv)
+    {
+        return get().insert(kv);
+    }
+
+    AZ_FORCE_INLINE iterator insert(const value_type& kv)
+    {
+        return get().insert(kv);
+    }
+
+    AZ_FORCE_INLINE size_type size() const
+    {
+        return get().size();
+    }
+
+private:
+    Container& get() const;
+};
+
+template <class T, class Less, class Allocator>
+class StaticInstanceSpecialization<std::set<T, Less, Allocator>>
+{
+public:
+    using Container = std::set<T, Less, Allocator>;
+    using reference = typename Container::reference;
+    using const_reference = typename Container::const_reference;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using value_type = typename Container::value_type;
+    using size_type = typename Container::size_type;
+
+    using pair_iter_bool = std::pair<iterator, bool>;
+
+    AZ_FORCE_INLINE iterator begin()
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE const_iterator begin() const
+    {
+        return get().begin();
+    }
+
+    AZ_FORCE_INLINE iterator end()
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE const_iterator end() const
+    {
+        return get().end();
+    }
+
+    AZ_FORCE_INLINE iterator erase(iterator it)
+    {
+        return get().erase(it);
+    }
+
+    AZ_FORCE_INLINE size_t erase(const value_type& key)
+    {
+        return get().erase(key);
+    }
+
+    AZ_FORCE_INLINE iterator find(const value_type& key)
+    {
+        return get().find(key);
+    }
+
+    AZ_FORCE_INLINE const_iterator find(const value_type& key) const
+    {
+        return get().find(key);
+    }
+
+    AZ_FORCE_INLINE void clear()
+    {
+        get().clear();
+    }
+
+    AZ_FORCE_INLINE bool empty() const
+    {
+        return get().empty();
+    }
+
+    AZ_FORCE_INLINE pair_iter_bool insert(value_type&& kv)
+    {
+        return get().insert(kv);
+    }
+
+    AZ_FORCE_INLINE pair_iter_bool insert(const value_type& kv)
+    {
+        return get().insert(kv);
+    }
+
+    AZ_FORCE_INLINE size_type size() const
+    {
+        return get().size();
+    }
+
+private:
+    Container& get() const;
+};
+
+// This is a non-thread safe version of AZStd::static_storage, used purely to lazy
+// initialize various Cry DLL statics/singletons. They are created on first access.
+template <class T, class Destructor=AZStd::default_destruct<T>>
+class StaticInstance
+    : public StaticInstanceSpecialization<T>
+{
+public:
+    template <class ...Args>
+    StaticInstance(Args&& ...args)
+    {
+        // We need to pass args as a copy to avoid taking references to values that dont support it.
+        // For example, if an enum value is being passed in args, we would lost the value inside the lambda
+        m_ctor = [=]()
+        {
+            return Create(args...);
+        };
+    }
+
+    ~StaticInstance()
+    {
+        if (m_instance)
+        {
+            Destructor()(m_instance);
+        }
+    }
+
+    AZ_FORCE_INLINE T* operator->() const
+    {
+        return Get();
+    }
+
+    AZ_FORCE_INLINE operator T*() const
+    {
+        return Get();
+    }
+
+    AZ_FORCE_INLINE operator T&() const
+    {
+        return *Get();
+    }
+
+    AZ_FORCE_INLINE T* operator&() const
+    {
+        return Get();
+    }
+
+    AZ_FORCE_INLINE operator bool() const
+    {
+        return m_instance != nullptr;
+    }
+
+private:
+    StaticInstance(const StaticInstance&) = delete;
+    StaticInstance(StaticInstance&&) = delete;
+    StaticInstance& operator=(const StaticInstance&) = delete;
+
+    template <class ...Args>
+    T* Create(Args&& ...args) const
+    {
+        return new((void*)&m_storage) T(AZStd::forward<Args>(args)...);
+    }
+
+    T* Get() const
+    {
+        if (!m_instance)
+        {
+            m_instance = m_ctor();
+        }
+        return m_instance;
+    }
+
+    mutable T* m_instance = nullptr;
+    mutable typename AZStd::aligned_storage<sizeof(T), AZStd::alignment_of<T>::value>::type m_storage;
+    AZStd::function<T*()> m_ctor;
+};
+
+template <typename U, class A>
+std::vector<U, A>& StaticInstanceSpecialization<std::vector<U, A>>::get() const
+{
+    return *(*static_cast<const StaticInstance<std::vector<U, A>>*>(this));
+}
+
+template <typename U, class A>
+std::list<U, A>& StaticInstanceSpecialization<std::list<U, A>>::get() const
+{
+    return *(*static_cast<const StaticInstance<std::list<U, A>>*>(this));
+}
+
+template <class K, class V, class Less, class Allocator>
+std::map<K, V, Less, Allocator>& StaticInstanceSpecialization<std::map<K, V, Less, Allocator>>::get() const
+{
+    return *(*static_cast<const StaticInstance<std::map<K, V, Less, Allocator>>*>(this));
+}
+
+template <class K, class V, class Less, class Allocator>
+std::multimap<K, V, Less, Allocator>& StaticInstanceSpecialization<std::multimap<K, V, Less, Allocator>>::get() const
+{
+    return *(*static_cast<const StaticInstance<std::multimap<K, V, Less, Allocator>>*>(this));
+}
+
+template <class T, class Less, class Allocator>
+std::set<T, Less, Allocator>& StaticInstanceSpecialization<std::set<T, Less, Allocator>>::get() const
+{
+    return *(*static_cast<const StaticInstance<std::set<T, Less, Allocator>>*>(this));
+}
diff --git a/Code/Legacy/CryCommon/StereoRendererBus.h b/Code/Legacy/CryCommon/StereoRendererBus.h
new file mode 100644
index 0000000000..066be52c23
--- /dev/null
+++ b/Code/Legacy/CryCommon/StereoRendererBus.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+
+namespace AZ
+{
+    ///
+    /// The Stereo Renderer bus allows other systems to query various properties on the stereo renderer
+    ///
+    class StereoRendererBus
+        : public EBusTraits
+    {
+    public:
+
+        //////////////////////////////////////////////////////////////////////////
+        // EBus Traits
+        static const EBusHandlerPolicy HandlerPolicy = EBusHandlerPolicy::Multiple;
+        static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::Single;
+        using MutexType = AZStd::recursive_mutex;
+        //////////////////////////////////////////////////////////////////////////
+
+        virtual ~StereoRendererBus() {}
+
+        ///
+        /// Return whether the renderer is rendering to the HMD 
+        /// 
+        /// @return True if rendering to the HMD
+        ///
+        virtual bool IsRenderingToHMD() { return false; }
+
+    protected:
+    };
+
+    using StereoRendererRequestBus = EBus < StereoRendererBus >;
+}
diff --git a/Code/Legacy/CryCommon/StlUtils.h b/Code/Legacy/CryCommon/StlUtils.h
new file mode 100644
index 0000000000..077af3b75d
--- /dev/null
+++ b/Code/Legacy/CryCommon/StlUtils.h
@@ -0,0 +1,1030 @@
+/*
+ * 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 : Various convenience utility functions for STL and alike
+//               Used in Animation subsystem, and in some tools
+#ifndef CRYINCLUDE_CRYCOMMON_STLUTILS_H
+#define CRYINCLUDE_CRYCOMMON_STLUTILS_H
+#pragma once
+
+#include <unordered_map>
+#include <unordered_set>
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/std/containers/unordered_set.h>
+
+#if (defined(LINUX) || defined(APPLE))
+    #include "platform.h"
+#endif
+
+#define STATIC_ASSERT(condition, errMessage) static_assert(condition, errMessage)
+
+#include <map>
+#include <set>
+#include <algorithm>
+#include <deque>
+#include <vector>
+
+#undef std__hash_map
+#define std__hash_map AZStd::unordered_map
+#define std__unordered_set AZStd::unordered_set
+#define std__hash_multimap AZStd::unordered_multimap
+#define std__hash AZStd::hash
+#define std__unordered_map AZStd::unordered_map
+
+template <class T, class Destructor>
+class StaticInstance;
+
+// auto-cleaner: upon destruction, calls the clear() method
+template <class T>
+class CAutoClear
+{
+public:
+    CAutoClear (T* p)
+        : m_p(p) {}
+    ~CAutoClear () {m_p->clear(); }
+protected:
+    T* m_p;
+};
+
+
+template <class Container>
+unsigned sizeofArray (const Container& arr)
+{
+    return (unsigned)(sizeof(typename Container::value_type) * arr.size());
+}
+
+template <class Container>
+unsigned sizeofVector (const Container& arr)
+{
+    return (unsigned)(sizeof(typename Container::value_type) * arr.capacity());
+}
+
+template <class Container>
+unsigned sizeofArray (const Container& arr, unsigned nSize)
+{
+    return arr.empty() ? 0u : (unsigned)(sizeof(typename Container::value_type) * nSize);
+}
+
+template <class Container>
+unsigned capacityofArray (const Container& arr)
+{
+    return (unsigned)(arr.capacity() * sizeof(arr[0]));
+}
+
+template <class T>
+unsigned countElements (const std::vector<T>& arrT, const T& x)
+{
+    unsigned nSum = 0;
+    for (typename std::vector<T>::const_iterator iter = arrT.begin(); iter != arrT.end(); ++iter)
+    {
+        if (x == *iter)
+        {
+            ++nSum;
+        }
+    }
+    return nSum;
+}
+
+// [Timur]
+/** Contain extensions for STL library.
+*/
+namespace stl
+{
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Compare member of class/struct.
+    //
+    // e.g. Sort Vec3s by x component
+    //
+    //           std::sort(vec3s.begin(), vec3s.end(), stl::member_compare<Vec3, float, &Vec3::x>());
+    //
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    template <typename OWNER_TYPE, typename MEMBER_TYPE, MEMBER_TYPE OWNER_TYPE::* MEMBER_PTR, typename EQUALITY = std::less<MEMBER_TYPE> >
+    struct member_compare
+    {
+        inline bool operator () (const OWNER_TYPE& lhs, const OWNER_TYPE& rhs) const
+        {
+            return EQUALITY()(lhs.*MEMBER_PTR, rhs.*MEMBER_PTR);
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Compare member of class/struct against parameter.
+    //
+    // e.g. Find Vec3 with x component less than 1.0
+    //
+    //           std::find_if(vec3s.begin(), vec3s.end(), stl::member_compare_param<Vec3, float, &Vec3::x>(1.0f));
+    //
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    template <typename OWNER_TYPE, typename MEMBER_TYPE, MEMBER_TYPE OWNER_TYPE::* MEMBER_PTR, typename EQUALITY = std::less<MEMBER_TYPE> >
+    struct member_compare_param
+    {
+        inline member_compare_param(const MEMBER_TYPE& _value)
+            : value(_value)
+        {
+        }
+
+        inline bool operator () (const OWNER_TYPE& rhs) const
+        {
+            return EQUALITY()(rhs.*MEMBER_PTR, value);
+        }
+
+        const MEMBER_TYPE& value;
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Searches the given entry in the map by key, and if there is none, returns the default value
+    //////////////////////////////////////////////////////////////////////////
+    template <typename Map>
+    inline typename Map::mapped_type find_in_map(const Map& mapKeyToValue, const typename Map::key_type& key, typename Map::mapped_type valueDefault)
+    {
+        typename Map::const_iterator it = mapKeyToValue.find (key);
+        if (it == mapKeyToValue.end())
+        {
+            return valueDefault;
+        }
+        else
+        {
+            return it->second;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Inserts and returns a reference to the given value in the map, or returns the current one if it's already there.
+    //////////////////////////////////////////////////////////////////////////
+    template <typename Map>
+    inline typename Map::mapped_type& map_insert_or_get(Map& mapKeyToValue, const typename Map::key_type& key, const typename Map::mapped_type& defValue = typename Map::mapped_type())
+    {
+        auto&& iresult = mapKeyToValue.insert(typename Map::value_type(key, defValue));
+        return iresult.first->second;
+    }
+
+    // searches the given entry in the map by key, and if there is none, returns the default value
+    // The values are taken/returned in REFERENCEs rather than values
+    template <typename Key, typename mapped_type, typename Traits, typename Allocator>
+    inline mapped_type& find_in_map_ref(std::map<Key, mapped_type, Traits, Allocator>& mapKeyToValue, const Key& key, mapped_type& valueDefault)
+    {
+        typedef std::map<Key, mapped_type, Traits, Allocator> Map;
+        typename Map::iterator it = mapKeyToValue.find (key);
+        if (it == mapKeyToValue.end())
+        {
+            return valueDefault;
+        }
+        else
+        {
+            return it->second;
+        }
+    }
+
+    template <typename Key, typename mapped_type, typename Traits, typename Allocator>
+    inline const mapped_type& find_in_map_ref(const std::map<Key, mapped_type, Traits, Allocator>& mapKeyToValue, const Key& key, const mapped_type& valueDefault)
+    {
+        typedef std::map<Key, mapped_type, Traits, Allocator> Map;
+        typename Map::const_iterator it = mapKeyToValue.find (key);
+        if (it == mapKeyToValue.end())
+        {
+            return valueDefault;
+        }
+        else
+        {
+            return it->second;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Fills vector with contents of map.
+    //////////////////////////////////////////////////////////////////////////
+    template <class Map, class Vector>
+    inline void map_to_vector(const Map& theMap, Vector& array)
+    {
+        array.resize(0);
+        array.reserve(theMap.size());
+        for (typename Map::const_iterator it = theMap.begin(); it != theMap.end(); ++it)
+        {
+            array.push_back(it->second);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Fills vector with contents of set.
+    //////////////////////////////////////////////////////////////////////////
+    template <class Set, class Vector>
+    inline void set_to_vector(const Set& theSet, Vector& array)
+    {
+        array.resize(0);
+        array.reserve(theSet.size());
+        for (typename Set::const_iterator it = theSet.begin(); it != theSet.end(); ++it)
+        {
+            array.push_back(*it);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find and erase element from container.
+    // @return true if item was find and erased, false if item not found.
+    //////////////////////////////////////////////////////////////////////////
+    template <class Container, class Value>
+    inline bool find_and_erase(Container& container, const Value& value)
+    {
+        typename Container::iterator it = AZStd::find(container.begin(), container.end(), value);
+        if (it != container.end())
+        {
+            container.erase(it);
+            return true;
+        }
+        return false;
+    }
+
+    template <typename K, typename P, typename A>
+    inline bool find_and_erase(std::set<K, P, A>& container, const K& value)
+    {
+        return container.erase(value) > 0;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find and erase element from container.
+    // @return true if item was find and erased, false if item not found.
+    //////////////////////////////////////////////////////////////////////////
+    template <class CONTAINER, class PREDICATE>
+    inline bool find_and_erase_if(CONTAINER& container, const PREDICATE& predicate)
+    {
+        typename CONTAINER::iterator end = container.end(), i = std::find_if(container.begin(), end, predicate);
+
+        if (i != end)
+        {
+            container.erase(i);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find and erase all elements matching value from container.
+    // Assume that this will invalidate any exiting iterators.
+    // Commonly used for removing NULL pointers from collections.
+    //////////////////////////////////////////////////////////////////////////
+    template <class Container>
+    inline void find_and_erase_all(Container& container, const typename Container::value_type& value)
+    {
+        // Shuffles all elements != value to the front and returns the start of the removed elements.
+        typename Container::iterator endIter(container.end());
+        typename Container::iterator newEndIter(std::remove(container.begin(), endIter, value));
+
+        // Delete the removed range at the back of the container (low-cost for vector).
+        container.erase(newEndIter, endIter);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find and erase element from map.
+    // @return true if item was find and erased, false if item not found.
+    //////////////////////////////////////////////////////////////////////////
+    template <class Container, class Key>
+    inline bool member_find_and_erase(Container& container, const Key& key)
+    {
+        typename Container::iterator it = container.find (key);
+        if (it != container.end())
+        {
+            container.erase(it);
+            return true;
+        }
+        return false;
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Push back to container unique element.
+    // @return true if item added, false overwise.
+    template <class Container, class Value>
+    inline bool push_back_unique(Container& container, const Value& value)
+    {
+        if (AZStd::find(container.begin(), container.end(), value) == container.end())
+        {
+            container.push_back(value);
+            return true;
+        }
+        return false;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Push back to container unique element.
+    // @return true if item added, false overwise.
+    template <class CONTAINER, class PREDICATE, typename VALUE>
+    inline bool push_back_unique_if(CONTAINER& container, const PREDICATE& predicate, const VALUE& value)
+    {
+        typename CONTAINER::iterator    end = container.end();
+
+        if (AZStd::find_if(container.begin(), end, predicate) == end)
+        {
+            container.push_back(value);
+
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Push back to container contents of another container
+    template <class Container, class Iter>
+    inline void push_back_range(Container& container, Iter begin, Iter end)
+    {
+        for (Iter it = begin; it != end; ++it)
+        {
+            container.push_back(*it);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Push back to container contents of another container, if not already present
+    template <class Container, class Iter>
+    inline void push_back_range_unique(Container& container, Iter begin, Iter end)
+    {
+        for (Iter it = begin; it != end; ++it)
+        {
+            push_back_unique(container, *it);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find element in container.
+    // @return true if item found.
+    template <class Container, class Value>
+    inline bool find(Container& container, const Value& value)
+    {
+        return std::find(container.begin(), container.end(), value) != container.end();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find element in a sorted container using binary search with logarithmic efficiency.
+    //
+    template <class Iterator, class T>
+    inline Iterator binary_find(Iterator first, Iterator last, const T& value)
+    {
+        Iterator it = std::lower_bound(first, last, value);
+        return (it == last || value != *it) ? last : it;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Find element in a sorted container using binary search with logarithmic efficiency.
+    // @return true if item was inserted.
+    template <class Container, class Value>
+    inline bool binary_insert_unique(Container& container, const Value& value)
+    {
+        typename Container::iterator it = std::lower_bound(container.begin(), container.end(), value);
+        if (it != container.end())
+        {
+            if (*it == value)
+            {
+                return false;
+            }
+            container.insert(it, value);
+        }
+        else
+        {
+            container.insert(container.end(), value);
+        }
+        return true;
+    }
+    //////////////////////////////////////////////////////////////////////////
+    //! Find element in a sorted container using binary search with logarithmic efficiency.
+    // and erases if element found.
+    // @return true if item was erased.
+    template <class Container, class Value>
+    inline bool binary_erase(Container& container, const Value& value)
+    {
+        typename Container::iterator it = std::lower_bound(container.begin(), container.end(), value);
+        if (it != container.end() && *it == value)
+        {
+            container.erase(it);
+            return true;
+        }
+        return false;
+    }
+
+    template <typename ItT, typename Func>
+    ItT remove_from_heap(ItT begin, ItT end, ItT at, Func order)
+    {
+        using std::swap;
+
+        --end;
+        if (at == end)
+        {
+            return at;
+        }
+
+        size_t idx = std::distance(begin, at);
+        swap(*end, *at);
+
+        size_t length = std::distance(begin, end);
+        size_t parent, child;
+
+        if (idx > 0 && order(*(begin + idx / 2), *(begin + idx)))
+        {
+            do
+            {
+                parent = idx / 2;
+                swap(*(begin + idx), *(begin + parent));
+                idx = parent;
+
+                if (idx == 0 || order(*(begin + idx), *(begin + idx / 2)))
+                {
+                    return end;
+                }
+            }
+            while (true);
+        }
+        else
+        {
+            do
+            {
+                child = idx * 2 + 1;
+                if (child >= length)
+                {
+                    return end;
+                }
+
+                ItT left = begin + child;
+                ItT right = begin + child + 1;
+
+                if (right < end && order(*left, *right))
+                {
+                    ++child;
+                }
+
+                if (order(*(begin + child), *(begin + idx)))
+                {
+                    return end;
+                }
+
+                swap(*(begin + child), *(begin + idx));
+                idx = child;
+            }
+            while (true);
+        }
+
+        return end;
+    }
+
+    struct container_object_deleter
+    {
+        template<typename T>
+        void operator()(const T* ptr) const
+        {
+            delete ptr;
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Convert arbitary class to const char*
+    //////////////////////////////////////////////////////////////////////////
+    template <class Type>
+    inline const char* constchar_cast(const Type& type)
+    {
+        return type;
+    }
+
+    //! Specialization of string to const char cast.
+    template <>
+    inline const char* constchar_cast(const string& type)
+    {
+        return type.c_str();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Case sensetive less key for any type convertable to const char*.
+    //////////////////////////////////////////////////////////////////////////
+    template <class Type>
+    struct less_strcmp
+    {
+        bool operator()(const Type& left, const Type& right) const
+        {
+            return strcmp(constchar_cast(left), constchar_cast(right)) < 0;
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Case insensetive less key for any type convertable to const char*.
+    template <class Type>
+    struct less_stricmp
+    {
+        bool operator()(const Type& left, const Type& right) const
+        {
+            return _stricmp(constchar_cast(left), constchar_cast(right)) < 0;
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Hash map usage:
+    // typedef AZStd::unordered_map<string,int, stl::hash_string_insensitve<string>, stl::equality_string_insensitive<string> > StringToIntHash;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // useful when the key is already the result of an hash function
+    // key needs to be convertible to size_t
+    //////////////////////////////////////////////////////////////////////////
+    template <class Key>
+    class hash_simple
+    {
+    public:
+        enum    // parameters for hash table
+        {
+            bucket_size = 4,    // 0 < bucket_size
+            min_buckets = 8
+        };// min_buckets = 2 ^^ N, 0 < N
+
+        size_t operator()(const Key& key) const
+        {
+            return size_t(key);
+        };
+        bool operator()(const Key& key1, const Key& key2) const
+        {
+            return key1 < key2;
+        }
+    };
+
+    // simple hash class that has the avalanche property (a change in one bit affects all others)
+    // ... use this if you have uint32 key values!
+    class hash_uint32
+    {
+    public:
+        enum    // parameters for hash table
+        {
+            bucket_size = 4,    // 0 < bucket_size
+            min_buckets = 8  // min_buckets = 2 ^^ N, 0 < N
+        };
+
+        ILINE size_t operator()(uint32 a) const
+        {
+            a = (a + 0x7ed55d16) + (a << 12);
+            a = (a ^ 0xc761c23c) ^ (a >> 19);
+            a = (a + 0x165667b1) + (a << 5);
+            a = (a + 0xd3a2646c) ^ (a << 9);
+            a = (a + 0xfd7046c5) + (a << 3);
+            a = (a ^ 0xb55a4f09) ^ (a >> 16);
+            return a;
+        };
+        bool operator()(uint32 key1, uint32 key2) const
+        {
+            return key1 < key2;
+        }
+    };
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Case sensitive string hash
+    //////////////////////////////////////////////////////////////////////////
+    template <class Key>
+    class hash_string
+    {
+    public:
+        enum    // parameters for hash table
+        {
+            bucket_size = 4,    // 0 < bucket_size
+            min_buckets = 8
+        };// min_buckets = 2 ^^ N, 0 < N
+
+        size_t operator()(const Key& key) const
+        {
+            unsigned int h = 0;
+            const char* s = constchar_cast(key);
+            for (; *s; ++s)
+            {
+                h = 5 * h + *(unsigned char*)s;
+            }
+            return size_t(h);
+        };
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Case sensitive string equality
+    //////////////////////////////////////////////////////////////////////////
+    template <class Key>
+    class equality_string
+    {
+    public:
+        bool operator()(const Key& key1, const Key& key2) const
+        {
+            return strcmp(constchar_cast(key1), constchar_cast(key2)) == 0;
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Case insensitive string hasher
+    //////////////////////////////////////////////////////////////////////////
+    template <class Key>
+    class hash_string_caseless
+    {
+    public:
+        enum    // parameters for hash table
+        {
+            bucket_size = 4,    // 0 < bucket_size
+            min_buckets = 8
+        };// min_buckets = 2 ^^ N, 0 < N
+
+        size_t operator()(const Key& key) const
+        {
+            unsigned int h = 0;
+            const char* s = constchar_cast(key);
+            for (; *s; ++s)
+            {
+                h = 5 * h + tolower(*(unsigned char*)s);
+            }
+            return size_t(h);
+        };
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    //! Case insensitive string comparer
+    //////////////////////////////////////////////////////////////////////////
+    template <class Key>
+    class equality_string_caseless
+    {
+    public:
+        bool operator()(const Key& key1, const Key& key2) const
+        {
+            return _stricmp(constchar_cast(key1), constchar_cast(key2)) == 0;
+        }
+    };
+
+
+    // Support for both Microsoft and SGI kind of hash_map.
+
+#if defined(_STLP_HASH_MAP) || defined(APPLE) || defined(LINUX)
+    // STL Port
+    template <class _Key, class _Predicate = std::less<_Key> >
+    struct hash_compare
+    {
+        enum
+        {   // parameters for hash table
+            bucket_size = 4,    // 0 < bucket_size
+            min_buckets = 8   // min_buckets = 2 ^^ N, 0 < N
+        };
+
+        size_t operator()(const _Key& _Keyval) const
+        {
+            // return hash value.
+            uint32 a = _Keyval;
+            a = (a + 0x7ed55d16) + (a << 12);
+            a = (a ^ 0xc761c23c) ^ (a >> 19);
+            a = (a + 0x165667b1) + (a << 5);
+            a = (a + 0xd3a2646c) ^ (a << 9);
+            a = (a + 0xfd7046c5) + (a << 3);
+            a = (a ^ 0xb55a4f09) ^ (a >> 16);
+            return a;
+        }
+
+        // Less then function.
+        bool operator()(const _Key& _Keyval1, const _Key& _Keyval2) const
+        {   // test if _Keyval1 ordered before _Keyval2
+            _Predicate comp;
+            return (comp(_Keyval1, _Keyval2));
+        }
+    };
+
+    template <class Key, class HashFunc>
+    struct stlport_hash_equal
+    {
+        // Equal function.
+        bool operator()(const Key& k1, const Key& k2) const
+        {
+            HashFunc less;
+            // !(k1 < k2) && !(k2 < k1)
+            return !less(k1, k2) && !less(k2, k1);
+        }
+    };
+
+    template <class Key, class Value, class HashFunc = hash_compare<Key>, class Alloc = std::allocator< std::pair<const Key, Value> > >
+    struct hash_map
+        : public std__hash_map<Key, Value, HashFunc, stlport_hash_equal<Key, HashFunc>, Alloc>
+    {
+        hash_map()
+            : std__hash_map<Key, Value, HashFunc, stlport_hash_equal<Key, HashFunc>, Alloc>(HashFunc::min_buckets) {}
+    };
+
+    template <class Key, class Value, class HashFunc = hash_compare<Key>, class Alloc = std::allocator< std::pair<const Key, Value> > >
+    struct hash_multimap
+        : public std__hash_multimap<Key, Value, HashFunc, stlport_hash_equal<Key, HashFunc>, Alloc>
+    {
+        hash_multimap()
+            : std__hash_multimap<Key, Value, HashFunc, stlport_hash_equal<Key, HashFunc>, Alloc>(HashFunc::min_buckets) {}
+    };
+#endif
+
+    //////////////////////////////////////////////////////////////////////////
+    template<class T>
+    class intrusive_linked_list_node
+    {
+    public:
+        intrusive_linked_list_node()  { link_to_intrusive_list(static_cast<T*>(this)); }
+        // Not virtual by design
+        ~intrusive_linked_list_node() { unlink_from_intrusive_list(static_cast<T*>(this)); }
+
+        static T* get_intrusive_list_root() { return m_root_intrusive; };
+
+        static void link_to_intrusive_list(T* pNode)
+        {
+            if (m_root_intrusive)
+            {
+                // Add to the beginning of the list.
+                T* head = m_root_intrusive;
+                pNode->m_prev_intrusive = 0;
+                pNode->m_next_intrusive = head;
+                head->m_prev_intrusive = pNode;
+                m_root_intrusive = pNode;
+            }
+            else
+            {
+                m_root_intrusive = pNode;
+                pNode->m_prev_intrusive = 0;
+                pNode->m_next_intrusive = 0;
+            }
+        }
+        static void unlink_from_intrusive_list(T* pNode)
+        {
+            if (pNode == m_root_intrusive) // if head of list.
+            {
+                m_root_intrusive = pNode->m_next_intrusive;
+                if (m_root_intrusive)
+                {
+                    m_root_intrusive->m_prev_intrusive = 0;
+                }
+            }
+            else
+            {
+                if (pNode->m_prev_intrusive)
+                {
+                    pNode->m_prev_intrusive->m_next_intrusive = pNode->m_next_intrusive;
+                }
+                if (pNode->m_next_intrusive)
+                {
+                    pNode->m_next_intrusive->m_prev_intrusive = pNode->m_prev_intrusive;
+                }
+            }
+            pNode->m_next_intrusive = 0;
+            pNode->m_prev_intrusive = 0;
+        }
+
+    public:
+        static T* m_root_intrusive;
+        T* m_next_intrusive;
+        T* m_prev_intrusive;
+    };
+
+    template <class T>
+    inline void reconstruct(T& t)
+    {
+        t.~T();
+        new(&t)T;
+    }
+
+    template <class T, class D>
+    inline void reconstruct(StaticInstance<T, D>& instance)
+    {
+        reconstruct(*instance);
+    }
+
+    template <typename T, typename A1>
+    inline void reconstruct(T& t, const A1& a1)
+    {
+        t.~T();
+        new (&t)T(a1);
+    }
+
+    template <typename T, typename A1, typename A2>
+    inline void reconstruct(T& t, const A1& a1, const A2& a2)
+    {
+        t.~T();
+        new (&t)T(a1, a2);
+    }
+
+    template <typename T, typename A1, typename A2, typename A3>
+    inline void reconstruct(T& t, const A1& a1, const A2& a2, const A3& a3)
+    {
+        t.~T();
+        new (&t)T(a1, a2, a3);
+    }
+
+    template <typename T, typename A1, typename A2, typename A3, typename A4>
+    inline void reconstruct(T& t, const A1& a1, const A2& a2, const A3& a3, const A4& a4)
+    {
+        t.~T();
+        new (&t)T(a1, a2, a3, a4);
+    }
+
+    template <typename T, typename A1, typename A2, typename A3, typename A4, typename A5>
+    inline void reconstruct(T& t, const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5)
+    {
+        t.~T();
+        new (&t)T(a1, a2, a3, a4, a5);
+    }
+
+    template <class T>
+    inline void free_container(T& t)
+    {
+        reconstruct(t);
+    }
+
+    template <class T, class A>
+    inline void free_container(std::deque<T, A>& t)
+    {
+        reconstruct(t);
+    }
+
+    template <class K, class D, class H, class A>
+    inline void free_container(std__hash_map<K, D, H, A>& t)
+    {
+        reconstruct(t);
+    }
+
+    template <class T, class D>
+    inline void free_container(StaticInstance<T, D>& instance)
+    {
+        reconstruct(*instance);
+    }
+
+    struct container_freer
+    {
+        template <typename T>
+        void operator () (T& container) const
+        {
+            stl::free_container(container);
+        }
+    };
+
+    template <typename T>
+    struct scoped_set
+    {
+        scoped_set(T& ref, T val)
+            : m_ref(&ref)
+            , m_oldVal(ref)
+        {
+            ref = val;
+        }
+
+        ~scoped_set()
+        {
+            (*m_ref) = m_oldVal;
+        }
+
+    private:
+        scoped_set(const scoped_set<T>& other);
+        scoped_set<T>& operator = (const scoped_set<T>& other);
+
+    private:
+        T* m_ref;
+        T m_oldVal;
+    };
+
+    template <typename T, size_t Length, typename Func>
+    inline void for_each_array(T (&buffer)[Length], Func func)
+    {
+        std::for_each(&buffer[0], &buffer[Length], func);
+    }
+
+    template <typename T, typename D, size_t Length, typename Func>
+    inline void for_each_array(StaticInstance<T, D>(&buffer)[Length], Func func)
+    {
+        for (size_t idx = 0; idx < Length; ++idx)
+        {
+            func(*buffer[idx]);
+        }
+    }
+
+    template <typename T>
+    inline void destruct(T* p)
+    {
+        p->~T();
+    }
+}
+
+#define DEFINE_INTRUSIVE_LINKED_LIST(Class) \
+    template<>                              \
+    Class * stl::intrusive_linked_list_node<Class>::m_root_intrusive = nullptr;
+
+
+// Performs a less-than compare on a serial sequence space, such that earlier values compare less-than later values.
+// Unlike a normal integral value, this accounts for overflowing the limit of the underlying type.
+// For example, assuming a 2-bit unsigned underlying type (with possible values 0, 1, 2 and 3), the following will hold: 0 < 1 && 1 < 2 && 2 < 3 && 3 < 0
+// Assuming two equal values V1 and V2, V2 can be incremented up to "(2 ^ (bits - 1) - 1)" times and V1 < V2 will continue to hold.
+// See also RFC-1982 that documents this http://tools.ietf.org/html/rfc1982
+template<typename T>
+struct SSerialCompare
+{
+    static_assert(std::is_integral<T>::value && std::is_unsigned<T>::value, "T must be an unsigned integral type");
+
+    static const T limit = (T(1) << (sizeof(T) * 8 - 1));
+
+    bool operator()(T lhs, T rhs)
+    {
+        return ((lhs < rhs) && (rhs - lhs < limit)) || ((lhs > rhs) && (lhs - rhs > limit));
+    }
+};
+
+template <class Container>
+unsigned sizeOfVP(Container& arr)
+{
+    int i;
+    unsigned size = 0;
+    for (i = 0; i < (int)arr.size(); i++)
+    {
+        typename Container::value_type& T = arr[i];
+        size += T->Size();
+    }
+    size += (arr.capacity() - arr.size()) * sizeof(typename Container::value_type);
+    return size;
+}
+
+template <class Container>
+unsigned sizeOfV(Container& arr)
+{
+    int i;
+    unsigned size = 0;
+    for (i = 0; i < (int)arr.size(); i++)
+    {
+        typename Container::value_type& T = arr[i];
+        size += T.Size();
+    }
+    size += (arr.capacity() - arr.size()) * sizeof(typename Container::value_type);
+    return size;
+}
+template <class Container>
+unsigned sizeOfA(Container& arr)
+{
+    int i;
+    unsigned size = 0;
+    for (i = 0; i < arr.size(); i++)
+    {
+        typename Container::value_type& T = arr[i];
+        size += T.Size();
+    }
+    return size;
+}
+// define the maplikestruct, used to approximate the memory requirements for a map node
+namespace stl
+{
+    struct MapLikeStruct
+    {
+        bool color;
+        void* parent;
+        void* left;
+        void* right;
+    };
+}
+template <class Map>
+unsigned sizeOfMap(Map& map)
+{
+    unsigned size = 0;
+    for (typename Map::iterator it = map.begin(); it != map.end(); it++)
+    {
+        typename Map::mapped_type& T = it->second;
+        size += T.Size();
+    }
+    size += map.size() * sizeof(stl::MapLikeStruct);
+    return size;
+}
+template <class Map>
+unsigned sizeOfMapStr(Map& map)
+{
+    unsigned size = 0;
+    for (typename Map::iterator it = map.begin(); it != map.end(); it++)
+    {
+        typename Map::mapped_type& T = it->second;
+        size += T.capacity();
+    }
+    size += map.size() * sizeof(stl::MapLikeStruct);
+    return size;
+}
+template <class Map>
+unsigned sizeOfMapP(Map& map)
+{
+    unsigned size = 0;
+    for (typename Map::iterator it = map.begin(); it != map.end(); it++)
+    {
+        typename Map::mapped_type& T = it->second;
+        size += T->Size();
+    }
+    size += map.size() * sizeof(stl::MapLikeStruct);
+    return size;
+}
+template <class Map>
+unsigned sizeOfMapS(Map& map)
+{
+    unsigned size = 0;
+    for (typename Map::iterator it = map.begin(); it != map.end(); it++)
+    {
+        typename Map::mapped_type& T = it->second;
+        size += sizeof(T);
+    }
+    size += map.size() * sizeof(stl::MapLikeStruct);
+    return size;
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_STLUTILS_H
diff --git a/Code/Legacy/CryCommon/StringUtils.h b/Code/Legacy/CryCommon/StringUtils.h
new file mode 100644
index 0000000000..dc7e6092f6
--- /dev/null
+++ b/Code/Legacy/CryCommon/StringUtils.h
@@ -0,0 +1,1357 @@
+/*
+ * 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 _CRY_ENGINE_STRING_UTILS_HDR_
+#define _CRY_ENGINE_STRING_UTILS_HDR_
+
+#pragma once
+
+#include "CryString.h"
+#include <ISystem.h>
+#include <algorithm>  // std::replace, std::min
+#include "UnicodeFunctions.h"
+#include "UnicodeIterator.h"
+#include <set>
+
+#if !defined(RESOURCE_COMPILER)
+#   include "CryCrc32.h"
+#endif
+
+#if defined(LINUX) || defined(APPLE)
+#   include <ctype.h>
+#endif
+
+namespace CryStringUtils
+{
+    // Convert a single ASCII character to lower case, this is compatible with the standard "C" locale (ie, only A-Z).
+    inline char toLowerAscii(char c)
+    {
+        return (c >= 'A' && c <= 'Z') ? (c - 'A' + 'a') : c;
+    }
+
+    // Convert a single ASCII character to upper case, this is compatible with the standard "C" locale (ie, only A-Z).
+    inline char toUpperAscii(char c)
+    {
+        return (c >= 'a' && c <= 'z') ? (c - 'a' + 'A') : c;
+    }
+}
+
+// cry_strXXX() and CryStringUtils_Internal::strXXX():
+//
+// The functions copy characters from src to dst one by one until any of
+// the following conditions is met:
+//   1) the end of the destination buffer (minus one character) is reached.
+//   2) the end of the source buffer is reached.
+//   3) zero character is found in the source buffer.
+//
+// When any of 1), 2), 3) happens, the functions write the terminating zero
+// character to the destination buffer and return.
+//
+// The functions guarantee writing the terminating zero character to the
+// destination buffer (if the buffer can fit at least one character).
+//
+// The functions return false when a null pointer is passed or when
+// clamping happened (i.e. when the end of the destination buffer is
+// reached but the source has some characters left).
+
+namespace CryStringUtils_Internal
+{
+    template <class TChar>
+    inline bool strcpy_with_clamp(TChar* const dst, size_t const dst_size_in_bytes, const TChar* const src, size_t const src_size_in_bytes)
+    {
+        COMPILE_TIME_ASSERT(sizeof(TChar) == sizeof(char) || sizeof(TChar) == sizeof(wchar_t));
+
+        if (!dst || dst_size_in_bytes < sizeof(TChar))
+        {
+            return false;
+        }
+
+        if (!src || src_size_in_bytes < sizeof(TChar))
+        {
+            dst[0] = 0;
+            return src != 0;  // we return true for non-null src without characters
+        }
+
+        const size_t src_n = src_size_in_bytes / sizeof(TChar);
+        const size_t n = (std::min)(dst_size_in_bytes / sizeof(TChar) - 1, src_n);
+
+        for (size_t i = 0; i < n; ++i)
+        {
+            dst[i] = src[i];
+            if (!src[i])
+            {
+                return true;
+            }
+        }
+
+        dst[n] = 0;
+        return n >= src_n || src[n] == 0;
+    }
+
+    template <class TChar>
+    inline bool strcat_with_clamp(TChar* const dst, size_t const dst_size_in_bytes, const TChar* const src, size_t const src_size_in_bytes)
+    {
+        COMPILE_TIME_ASSERT(sizeof(TChar) == sizeof(char) || sizeof(TChar) == sizeof(wchar_t));
+
+        if (!dst || dst_size_in_bytes < sizeof(TChar))
+        {
+            return false;
+        }
+
+        const size_t dst_n = dst_size_in_bytes / sizeof(TChar) - 1;
+
+        size_t dst_len = 0;
+        while (dst_len < dst_n && dst[dst_len])
+        {
+            ++dst_len;
+        }
+
+        if (!src || src_size_in_bytes < sizeof(TChar))
+        {
+            dst[dst_len] = 0;
+            return src != 0;  // we return true for non-null src without characters
+        }
+
+        const size_t src_n = src_size_in_bytes / sizeof(TChar);
+        const size_t n = (std::min)(dst_n - dst_len, src_n);
+        TChar* dst_ptr = &dst[dst_len];
+
+        for (size_t i = 0; i < n; ++i)
+        {
+            *dst_ptr++ = src[i];
+            if (!src[i])
+            {
+                return true;
+            }
+        }
+
+        *dst_ptr = 0;
+        return n >= src_n || src[n] == 0;
+    }
+
+    // Compares characters as case-sensitive, locale agnostic.
+    template<class CharType>
+    struct SCharComparatorCaseSensitive
+    {
+        static bool IsEqual(CharType a, CharType b)
+        {
+            return a == b;
+        }
+    };
+
+    // Compares characters as case-insensitive, uses the standard "C" locale.
+    template<class CharType>
+    struct SCharComparatorCaseInsensitive
+    {
+        static bool IsEqual(CharType a, CharType b)
+        {
+            if (a < 0x80 && b < 0x80)
+            {
+                a = (CharType)CryStringUtils::toLowerAscii(char(a));
+                b = (CharType)CryStringUtils::toLowerAscii(char(b));
+            }
+            return a == b;
+        }
+    };
+
+    // Template for wildcard matching, UCS code-point aware.
+    // Can be used for ASCII and Unicode (UTF-8/UTF-16/UTF-32), but not for ANSI.
+    // ? will match exactly one code-point.
+    // * will match zero or more code-points.
+    template <template<class> class CharComparator, class CharType>
+    inline bool MatchesWildcards_Tpl(const CharType* pStr, const CharType* pWild)
+    {
+        const CharType* savedStr = 0;
+        const CharType* savedWild = 0;
+
+        while ((*pStr) && (*pWild != '*'))
+        {
+            if (!CharComparator<CharType>::IsEqual(*pWild, *pStr) && (*pWild != '?'))
+            {
+                return false;
+            }
+
+            // We need special handling of '?' for Unicode
+            if (*pWild == '?' && *pStr > 127)
+            {
+                Unicode::CIterator<const CharType*> utf(pStr, pStr + 4);
+                if (utf.IsAtValidCodepoint())
+                {
+                    pStr = (++utf).GetPosition();
+                    --pStr;
+                }
+            }
+
+            ++pWild;
+            ++pStr;
+        }
+
+        while (*pStr)
+        {
+            if (*pWild == '*')
+            {
+                if (!*++pWild)
+                {
+                    return true;
+                }
+                savedWild = pWild;
+                savedStr = pStr + 1;
+            }
+            else if (CharComparator<CharType>::IsEqual(*pWild, *pStr) || (*pWild == '?'))
+            {
+                // We need special handling of '?' for Unicode
+                if (*pWild == '?' && *pStr > 127)
+                {
+                    Unicode::CIterator<const CharType*> utf(pStr, pStr + 4);
+                    if (utf.IsAtValidCodepoint())
+                    {
+                        pStr = (++utf).GetPosition();
+                        --pStr;
+                    }
+                }
+
+                ++pWild;
+                ++pStr;
+            }
+            else
+            {
+                pWild = savedWild;
+                pStr = savedStr++;
+            }
+        }
+
+        while (*pWild == '*')
+        {
+            ++pWild;
+        }
+
+        return *pWild == 0;
+    }
+} // namespace CryStringUtils_Internal
+
+
+inline bool cry_strcpy(char* const dst, size_t const dst_size_in_bytes, const char* const src)
+{
+    return CryStringUtils_Internal::strcpy_with_clamp<char>(dst, dst_size_in_bytes, src, (size_t)-1);
+}
+
+inline bool cry_strcpy(char* const dst, size_t const dst_size_in_bytes, const char* const src, size_t const src_size_in_bytes)
+{
+    return CryStringUtils_Internal::strcpy_with_clamp<char>(dst, dst_size_in_bytes, src, src_size_in_bytes);
+}
+
+template <size_t SIZE_IN_CHARS>
+inline bool cry_strcpy(char(&dst)[SIZE_IN_CHARS], const char* const src)
+{
+    return CryStringUtils_Internal::strcpy_with_clamp<char>(dst, SIZE_IN_CHARS, src, (size_t)-1);
+}
+
+template <size_t SIZE_IN_CHARS>
+inline bool cry_strcpy(char(&dst)[SIZE_IN_CHARS], const char* const src, size_t const src_size_in_bytes)
+{
+    return CryStringUtils_Internal::strcpy_with_clamp<char>(dst, SIZE_IN_CHARS, src, src_size_in_bytes);
+}
+
+
+inline bool cry_wstrcpy(wchar_t* const dst, size_t const dst_size_in_bytes, const wchar_t* const src)
+{
+    return CryStringUtils_Internal::strcpy_with_clamp<wchar_t>(dst, dst_size_in_bytes, src, (size_t)-1);
+}
+
+inline bool cry_wstrcpy(wchar_t* const dst, size_t const dst_size_in_bytes, const wchar_t* const src, size_t const src_size_in_bytes)
+{
+    return CryStringUtils_Internal::strcpy_with_clamp<wchar_t>(dst, dst_size_in_bytes, src, src_size_in_bytes);
+}
+
+template <size_t SIZE_IN_WCHARS>
+inline bool cry_wstrcpy(wchar_t(&dst)[SIZE_IN_WCHARS], const wchar_t* const src)
+{
+    return CryStringUtils_Internal::strcpy_with_clamp<wchar_t>(dst, SIZE_IN_WCHARS * sizeof(wchar_t), src, (size_t)-1);
+}
+
+template <size_t SIZE_IN_WCHARS>
+inline bool cry_wstrcpy(wchar_t(&dst)[SIZE_IN_WCHARS], const wchar_t* const src, size_t const src_size_in_bytes)
+{
+    return CryStringUtils_Internal::strcpy_with_clamp<wchar_t>(dst, SIZE_IN_WCHARS * sizeof(wchar_t), src, src_size_in_bytes);
+}
+
+
+inline bool cry_strcat(char* const dst, size_t const dst_size_in_bytes, const char* const src)
+{
+    return CryStringUtils_Internal::strcat_with_clamp<char>(dst, dst_size_in_bytes, src, (size_t)-1);
+}
+
+inline bool cry_strcat(char* const dst, size_t const dst_size_in_bytes, const char* const src, size_t const src_size_in_bytes)
+{
+    return CryStringUtils_Internal::strcat_with_clamp<char>(dst, dst_size_in_bytes, src, src_size_in_bytes);
+}
+
+template <size_t SIZE_IN_CHARS>
+inline bool cry_strcat(char(&dst)[SIZE_IN_CHARS], const char* const src)
+{
+    return CryStringUtils_Internal::strcat_with_clamp<char>(dst, SIZE_IN_CHARS, src, (size_t)-1);
+}
+
+template <size_t SIZE_IN_CHARS>
+inline bool cry_strcat(char(&dst)[SIZE_IN_CHARS], const char* const src, size_t const src_size_in_bytes)
+{
+    return CryStringUtils_Internal::strcat_with_clamp<char>(dst, SIZE_IN_CHARS, src, src_size_in_bytes);
+}
+
+
+inline bool cry_wstrcat(wchar_t* const dst, size_t const dst_size_in_bytes, const wchar_t* const src)
+{
+    return CryStringUtils_Internal::strcat_with_clamp<wchar_t>(dst, dst_size_in_bytes, src, (size_t)-1);
+}
+
+inline bool cry_wstrcat(wchar_t* const dst, size_t const dst_size_in_bytes, const wchar_t* const src, size_t const src_size_in_bytes)
+{
+    return CryStringUtils_Internal::strcat_with_clamp<wchar_t>(dst, dst_size_in_bytes, src, src_size_in_bytes);
+}
+
+template <size_t SIZE_IN_WCHARS>
+inline bool cry_wstrcat(wchar_t(&dst)[SIZE_IN_WCHARS], const wchar_t* const src)
+{
+    return CryStringUtils_Internal::strcat_with_clamp<wchar_t>(dst, SIZE_IN_WCHARS * sizeof(wchar_t), src, (size_t)-1);
+}
+
+template <size_t SIZE_IN_WCHARS>
+inline bool cry_wstrcat(wchar_t(&dst)[SIZE_IN_WCHARS], const wchar_t* const src, size_t const src_size_in_bytes)
+{
+    return CryStringUtils_Internal::strcat_with_clamp<wchar_t>(dst, SIZE_IN_WCHARS * sizeof(wchar_t), src, src_size_in_bytes);
+}
+
+
+namespace CryStringUtils
+{
+    enum
+    {
+        CRY_DEFAULT_HASH_SEED = 40503, // This is a large 16 bit prime number (perfect for seeding)
+        CRY_EMPTY_STR_HASH = 3350499166U, // HashString("")
+    };
+
+    // removes the extension from the file path
+    // \param szFilePath the source path
+    inline char* StripFileExtension(char* szFilePath)
+    {
+        for (char* p = szFilePath + (int)strlen(szFilePath) - 1; p >= szFilePath; --p)
+        {
+            switch (*p)
+            {
+            case ':':
+            case '/':
+            case '\\':
+                // we've reached a path separator - it means there's no extension in this name
+                return nullptr;
+            case '.':
+                // there's an extension in this file name
+                *p = '\0';
+                return p + 1;
+            }
+        }
+        // it seems the file name is a pure name, without path or extension
+        return nullptr;
+    }
+
+
+    // returns the parent directory of the given file or directory.
+    // the returned path is WITHOUT the trailing slash
+    // if the input path has a trailing slash, it's ignored
+    // nGeneration - is the number of parents to scan up
+    // Note: A drive specifier (if any) will always be kept (Windows-specific).
+    template <class StringCls>
+    StringCls GetParentDirectory(const StringCls& strFilePath, int nGeneration = 1)
+    {
+        for (const char* p = strFilePath.c_str() + strFilePath.length() - 2; // -2 is for the possible trailing slash: there always must be some trailing symbol which is the file/directory name for which we should get the parent
+             p >= strFilePath.c_str();
+             --p)
+        {
+            switch (*p)
+            {
+            case ':':
+                return StringCls(strFilePath.c_str(), p);
+                break;
+            case '/':
+            case '\\':
+                // we've reached a path separator - return everything before it.
+                if (!--nGeneration)
+                {
+                    return StringCls(strFilePath.c_str(), p);
+                }
+                break;
+            }
+        }
+        ;
+        // the file name is a pure name, without path or extension
+        return StringCls();
+    }
+
+    /*!
+    // converts all chars to lower case
+    */
+    inline string ToLower(const string& str)
+    {
+        string temp = str;
+
+#ifndef NOT_USE_CRY_STRING
+        temp.MakeLower();
+#else
+        std::transform(temp.begin(), temp.end(), temp.begin(), toLowerAscii); // STL MakeLower
+#endif
+
+        return temp;
+    }
+
+    /// Converts the single character to lower case.
+    /*!
+    \param c source character to convert to lower case if possible
+    \return the lower case character equivalent if possible
+    */
+    inline char ToLower(char c)
+    {
+        return ((c <= 'Z') && (c >= 'A')) ? c + ('a' - 'A') : c;
+    }
+
+    /// Converts the specified character into lowercase.
+    /*!
+    \param c the character to convert to lowercase
+    \return the lowercase character
+    */
+    // Converts all ASCII characters to upper case.
+    // Note: Any non-ASCII characters are left unchanged.
+    // This function is ASCII-only and locale agnostic.
+    inline string toUpper (const string& str)
+    {
+        string temp = str;
+
+#ifndef NOT_USE_CRY_STRING
+        temp.MakeUpper();
+#else
+        std::transform(temp.begin(), temp.end(), temp.begin(), toUpperAscii); // STL MakeLower
+#endif
+
+        return temp;
+    }
+
+    // searches and returns the pointer to the extension of the given file
+    /*!
+    \param szFileName source filename to search
+    // This function is Unicode agnostic and locale agnostic.
+    */
+    inline const char* FindExtension(const char* szFileName)
+    {
+        const char* szEnd = szFileName + (int)strlen(szFileName);
+        for (const char* p = szEnd - 1; p >= szFileName; --p)
+        {
+            if (*p == '.')
+            {
+                return p + 1;
+            }
+        }
+
+        return szEnd;
+    }
+
+    // searches and returns the pointer to the file name in the given file path
+    /*!
+    \param szFilePath source path to search
+    */
+    inline const char* FindFileNameInPath(const char* szFilePath)
+    {
+        for (const char* p = szFilePath + (int)strlen(szFilePath) - 1; p >= szFilePath; --p)
+        {
+            if (*p == '\\' || *p == '/')
+            {
+                return p + 1;
+            }
+        }
+        return szFilePath;
+    }
+
+    // works like strstr, but is case-insensitive
+    /*!
+    \param szString the source string
+    \param szSubstring the sub-string to look for
+    */
+    inline const char* stristr(const char* szString, const char* szSubstring)
+    {
+        int nSuperstringLength = (int)strlen(szString);
+        int nSubstringLength = (int)strlen(szSubstring);
+
+        for (int nSubstringPos = 0; nSubstringPos <= nSuperstringLength - nSubstringLength; ++nSubstringPos)
+        {
+            if (_strnicmp(szString + nSubstringPos, szSubstring, nSubstringLength) == 0)
+            {
+                return szString + nSubstringPos;
+            }
+        }
+        return nullptr;
+    }
+
+
+#ifndef NOT_USE_CRY_STRING
+
+    /*
+    \param strPath the path to "unify"
+    */
+    inline void UnifyFilePath(stack_string& strPath)
+    {
+        strPath.replace('\\', '/');
+        strPath.MakeLower();
+    }
+
+    template<size_t SIZE>
+    inline void UnifyFilePath(CryStackStringT<char, SIZE>& strPath)
+    {
+        strPath.replace('\\', '/');
+        strPath.MakeLower();
+    }
+
+    /// Replaces backslashes with forward slashes and transforms string to lowercase.
+    /*!
+    \param strPath the path to "unify"
+    */
+    inline void UnifyFilePath(string& strPath)
+    {
+        strPath.replace('\\', '/');
+        strPath.MakeLower();
+    }
+
+#endif
+
+    // converts the number to a string
+    /*
+    \param nNumber an unsigned number
+    \return the unsigned number as a string
+    */
+    inline string ToString(unsigned nNumber)
+    {
+        char szNumber[16];
+        sprintf_s(szNumber, "%u", nNumber);
+        return szNumber;
+    }
+
+    /// Converts the number to a string.
+    /*!
+    \param nNumber an signed integer
+    \return the signed integer as a string
+    */
+    inline string ToString(signed int nNumber)
+    {
+        char szNumber[16];
+        sprintf_s(szNumber, "%d", nNumber);
+        return szNumber;
+    }
+
+    /// Converts the floating point number to a string.
+    /*!
+    \param nNumber a floating point number
+    \return the floating point number as a string
+    */
+    inline string ToString(float nNumber)
+    {
+        char szNumber[128];
+        sprintf_s(szNumber, "%f", nNumber);
+        return szNumber;
+    }
+
+    /// Converts the boolean value to a string ("0" or "1").
+    /*!
+    \param nNumber an unsigned number
+    \return the bool as a string (either "1" or "0")
+    */
+    inline string ToString(bool nNumber)
+    {
+        char szNumber[4];
+        sprintf_s(szNumber, "%i", (int)nNumber);
+        return szNumber;
+    }
+
+#ifdef CRYINCLUDE_CRYCOMMON_CRY_MATRIX44_H
+    /// Converts a Matrix44 to a string.
+    /*!
+    \param m A matrix of type Matrix44
+    \return the matrix in the format {0,0,0,0}{0,0,0,0}{0,0,0,0}{0,0,0,0}
+    */
+    inline string ToString(const Matrix44& m)
+    {
+        char szBuf[0x200];
+        sprintf_s(szBuf, "{%g,%g,%g,%g}{%g,%g,%g,%g}{%g,%g,%g,%g}{%g,%g,%g,%g}",
+            m(0, 0), m(0, 1), m(0, 2), m(0, 3),
+            m(1, 0), m(1, 1), m(1, 2), m(1, 3),
+            m(2, 0), m(2, 1), m(2, 2), m(2, 3),
+            m(3, 0), m(3, 1), m(3, 2), m(3, 3));
+        return szBuf;
+    }
+#endif
+
+#ifdef CRYINCLUDE_CRYCOMMON_CRY_QUAT_H
+    /// Converts a CryQuat to a string.
+    /*!
+    \param m A quaternion of type CryQuat
+    \return the quaternion in the format {0,{0,0,0,0}}
+    */
+    inline string ToString (const CryQuat& q)
+    {
+        char szBuf[0x100];
+        sprintf_s(szBuf, "{%g,{%g,%g,%g}}", q.w, q.v.x, q.v.y, q.v.z);
+        return szBuf;
+    }
+#endif
+
+#ifdef CRYINCLUDE_CRYCOMMON_CRY_VECTOR3_H
+    /// Converts a Vec3 to a string.
+    /*!
+    \param m A vector of type Vec3
+    \return the vector in the format {0,0,0}
+    */
+    inline string ToString (const Vec3& v)
+    {
+        char szBuf[0x80];
+        sprintf_s(szBuf, "{%g,%g,%g}", v.x, v.y, v.z);
+        return szBuf;
+    }
+#endif
+
+    /// This function only exists to allow ToString to compile if it is ever used with an unsupported type.
+    /*!
+    \param unknownType
+    \return a string that reads "unknown"
+    */
+    template<class T>
+    inline string ToString(T& unknownType)
+    {
+        char szValue[8];
+        sprintf_s(szValue, "%s", "unknown");
+        return szValue;
+    }
+
+    // does the same as strstr, but the szString is allowed to be no more than the specified size
+    /*!
+    \param szString the source string
+    \param szSubstring the sub-string to look for
+    \param nSuperstringLength the maximum size of szString
+    */
+    inline const char* strnstr(const char* szString, const char* szSubstring, int nSuperstringLength)
+    {
+        int nSubstringLength = (int)strlen(szSubstring);
+        if (!nSubstringLength)
+        {
+            return szString;
+        }
+
+        for (int nSubstringPos = 0; szString[nSubstringPos] && nSubstringPos < nSuperstringLength - nSubstringLength; ++nSubstringPos)
+        {
+            if (strncmp(szString + nSubstringPos, szSubstring, nSubstringLength) == 0)
+            {
+                return szString + nSubstringPos;
+            }
+        }
+        return nullptr;
+    }
+
+
+    // Finds the string in the array of strings.
+    // Returns its 0-based index or -1 if not found.
+    // Comparison is case-sensitive.
+    // The string array end is demarked by the NULL value.
+    // This function is Unicode agnostic (but no Unicode collation is performed for equality test) and locale agnostic.
+    inline int findString(const char* szString, const char* arrStringList[])
+    {
+        for (const char** p = arrStringList; *p; ++p)
+        {
+            if (0 == strcmp(*p, szString))
+            {
+                return (int)(p - arrStringList);
+            }
+        }
+        return -1; // string was not found
+    }
+
+    /// Finds the string in the array of strings.
+    /*!
+    \param szString the string to look for
+    \param arrStringList array of strings
+    \remark comparison is case-sensitive
+    \remark The string array end is delimited by the nullptr value
+    \return its 0-based index or -1 if not found
+    */
+    inline int FindString(const char* szString, const char* arrStringList[])
+    {
+        for (const char** p = arrStringList; *p; ++p)
+        {
+            if (0 == strcmp(*p, szString))
+            {
+                return (int)(p - arrStringList);
+            }
+        }
+        return -1; // string was not found
+    }
+
+    /// Used for printing out sets of objects of string type.
+    /*!
+    \remark just forms the comma-delimited string where each string in the set is presented as a formatted substring
+    \param setStrings set of strings to print
+    \return a formatted string
+    */
+    inline string ToString(const std::set<string>& setStrings)
+    {
+        string strResult;
+        if (!setStrings.empty())
+        {
+            strResult += "{";
+            for (std::set<string>::const_iterator it = setStrings.begin(); it != setStrings.end(); ++it)
+            {
+                if (it != setStrings.begin())
+                {
+                    strResult += ", ";
+                }
+                strResult += "\"";
+                strResult += *it;
+                strResult += "\"";
+            }
+            strResult += "}";
+        }
+        return strResult;
+    }
+
+    // Cuts the string and adds leading ... if it's longer than specified maximum length.
+    // This function is ASCII-only and locale agnostic.
+    inline string cutString(const string& strPath, unsigned nMaxLength)
+    {
+        if (strPath.length() > nMaxLength && nMaxLength > 3)
+        {
+            return string("...") + string(strPath.c_str() + strPath.length() - (nMaxLength - 3));
+        }
+        else
+        {
+            return strPath;
+        }
+    }
+
+    /// Cuts the string and adds leading ... if it's longer than specified maximum length.
+    /*!
+    \param str the string to cut
+    \param nMaxLength the allowed length of the string before its cut.
+    \return a shortened string starting in ellipses or the source string if it's smaller than nMaxLength
+    */
+    inline string CutString(const string& str, unsigned nMaxLength)
+    {
+        if (str.length() > nMaxLength && nMaxLength > 3)
+        {
+            return string("...") + string(str.c_str() + str.length() - (nMaxLength - 3));
+        }
+        else
+        {
+            return str;
+        }
+    }
+
+    /// Converts the given set of NUMBERS into the string.
+    /*!
+    \param setMtlms A numeric set to convert into a string
+    \param szFormat
+    \param szPostfix
+    */
+    template <typename T>
+    string ToString(const std::set<T>& setMtls, const char* szFormat, const char* szPostfix = "")
+    {
+        string strResult;
+        char szBuffer[64];
+        if (!setMtls.empty())
+        {
+            strResult += strResult.empty() ? "(" : " (";
+            for (typename std::set<T>::const_iterator it = setMtls.begin(); it != setMtls.end(); )
+            {
+                if (it != setMtls.begin())
+                {
+                    strResult += ", ";
+                }
+                sprintf_s(szBuffer, szFormat, *it);
+                strResult += szBuffer;
+                T nStart = *it;
+
+                ++it;
+
+                if (it != setMtls.end() && *it == nStart + 1)
+                {
+                    T nPrev = *it;
+                    // we've got a region
+                    while (++it != setMtls.end() && *it == nPrev + 1)
+                    {
+                        nPrev = *it;
+                    }
+                    if (nPrev == nStart + 1)
+                    {
+                        // special case - range of length 1
+                        strResult += ",";
+                    }
+                    else
+                    {
+                        strResult += "..";
+                    }
+                    sprintf_s(szBuffer, szFormat, nPrev);
+                    strResult += szBuffer;
+                }
+            }
+            strResult += ")";
+        }
+        return szPostfix[0] ? strResult + szPostfix : strResult;
+    }
+
+
+    // Attempts to find a matching wildcard in a string.
+    /*!
+    \param szString source string
+    \param szWildcard the wildcard, supports * and ?
+    // returns true if the string matches the wildcard
+    // Note: ANSI input is not supported, ASCII is fine since it's a subset of UTF-8.
+    */
+    inline bool MatchWildcard(const char* szString, const char* szWildcard)
+    {
+        return CryStringUtils_Internal::MatchesWildcards_Tpl<CryStringUtils_Internal::SCharComparatorCaseSensitive>(szString, szWildcard);
+    }
+
+    // Returns true if the string matches the wildcard.
+    // Supports wildcard ? (matches one code-point) and * (matches zero or more code-points).
+    // This function is Unicode aware and uses the "C" locale for case comparison.
+    // Note: ANSI input is not supported, ASCII is fine since it's a subset of UTF-8.
+    inline bool MatchWildcardIgnoreCase(const char* szString, const char* szWildcard)
+    {
+        return CryStringUtils_Internal::MatchesWildcards_Tpl<CryStringUtils_Internal::SCharComparatorCaseInsensitive>(szString, szWildcard);
+    }
+
+#if !defined(RESOURCE_COMPILER)
+
+    // calculates a hash value for a given string
+    inline uint32 CalculateHash(const char* str)
+    {
+        return CCrc32::Compute(str);
+    }
+
+    // calculates a hash value for the lower case version of a given string
+    inline uint32 CalculateHashLowerCase(const char* str)
+    {
+        return CCrc32::ComputeLowercase(str);
+    }
+
+    // This function is Unicode agnostic and locale agnostic.
+    inline uint32 HashStringSeed(const char* string, const uint32 seed)
+    {
+        // A string hash taken from the FRD/Crysis2 (game) code with low probability of clashes
+        // Recommend you use the CRY_DEFAULT_HASH_SEED (see HashString)
+        const char*     p;
+        uint32 hash = seed;
+        for (p = string; *p != '\0'; p++)
+        {
+            hash += *p;
+            hash += (hash << 10);
+            hash ^= (hash >> 6);
+        }
+        hash += (hash << 3);
+        hash ^= (hash >> 11);
+        hash += (hash << 15);
+        return hash;
+    }
+
+    // This function is ASCII-only and uses the standard "C" locale for case conversion.
+    inline uint32 HashStringLowerSeed(const char* string, const uint32 seed)
+    {
+        // computes the hash of 'string' converted to lower case
+        // also see the comment in HashStringSeed
+        const char*     p;
+        uint32 hash = seed;
+        for (p = string; *p != '\0'; p++)
+        {
+            hash += toLowerAscii(*p);
+            hash += (hash << 10);
+            hash ^= (hash >> 6);
+        }
+        hash += (hash << 3);
+        hash ^= (hash >> 11);
+        hash += (hash << 15);
+        return hash;
+    }
+
+    // This function is Unicode agnostic and locale agnostic.
+    inline uint32 HashString(const char* string)
+    {
+        return HashStringSeed(string, CRY_DEFAULT_HASH_SEED);
+    }
+
+    // This function is ASCII-only and uses the standard "C" locale for case conversion.
+    inline uint32 HashStringLower(const char* string)
+    {
+        return HashStringLowerSeed(string, CRY_DEFAULT_HASH_SEED);
+    }
+#endif
+
+    // converts all chars to lower case - avoids memory allocation
+    /*!
+    \param str Reference to string to convert into lowercase.
+    */
+    inline void ToLowerInplace(string& str)
+    {
+#ifndef NOT_USE_CRY_STRING
+        str.MakeLower();
+#else
+        std::transform(str.begin(), str.end(), str.begin(), toLowerAscii); // STL MakeLower
+#endif
+    }
+
+    /// Converts all chars to lower case - avoids memory allocation
+    /*!
+    \param str Reference to string to convert into lowercase.
+    */
+    inline void ToLowerInplace(char* str)
+    {
+        if (str == nullptr)
+        {
+            return;
+        }
+
+        for (char* s = str; *s != '\0'; s++)
+        {
+            *s = toLowerAscii(*s);
+        }
+    }
+
+
+#ifndef NOT_USE_CRY_STRING
+
+    // Converts a wide string (can be UTF-16 or UTF-32 depending on platform) to UTF-8.
+    // This function is Unicode aware and locale agnostic.
+    /// Converts a wide string to a UTF8 string.
+    /*!
+    \param str The wide string to convert.
+    \return dstr The wide string converted into the specified UTF8 type.
+    */
+    template <typename T>
+    inline void WStrToUTF8(const wchar_t* str, T& dstr)
+    {
+        string utf8;
+        Unicode::Convert(utf8, str);
+
+        // Note: This function expects T to have assign(ptr, len) function
+        dstr.assign(utf8.c_str(), utf8.length());
+    }
+
+    // Converts a wide string (can be UTF-16 or UTF-32 depending on platform) to UTF-8.
+    // This function is Unicode aware and locale agnostic.
+    /// Converts a wide string to UTF8.
+    /*!
+    \param str The wchar_t string to convert.
+    \return The UTF8 string.
+    */
+    inline string WStrToUTF8(const wchar_t* str)
+    {
+        return Unicode::Convert<string>(str);
+    }
+
+    /// Converts a UTF8 string to a wide string.
+    /*!
+    \param str The UTF8 string to convert.
+    \return dstr The UTF8 string converted into the specified type.
+    */
+    template <typename T>
+    inline void UTF8ToWStr(const char* str, T& dstr)
+    {
+        wstring wide;
+        Unicode::Convert(wide, str);
+
+        // Note: This function expects T to have assign(ptr, len) function
+        dstr.assign(wide.c_str(), wide.length());
+    }
+
+    // Converts an UTF-8 string to wide string (can be UTF-16 or UTF-32 depending on platform).
+    // This function is Unicode aware and locale agnostic.
+    /*!
+    \param str The UTF8 string to convert.
+    \return str as converted to wstring.
+    */
+    inline wstring UTF8ToWStr(const char* str)
+    {
+        return Unicode::Convert<wstring>(str);
+    }
+
+    /// Converts a string to a wide character string
+    /*!
+    \param str Source string.
+    \param dstr Destination wstring.
+    */
+    inline void StrToWstr(const char* str, wstring& dstr)
+    {
+        CryStackStringT<wchar_t, 64> tmp;
+        tmp.resize(strlen(str));
+        tmp.clear();
+
+        while (const wchar_t c = (wchar_t)(*str++))
+        {
+            tmp.append(1, c);
+        }
+
+        dstr.assign(tmp.data(), tmp.length());
+    }
+
+#endif // NOT_USE_CRY_STRING
+
+    /// The type used to parse a yes/no string
+#if defined(_DISALLOW_ENUM_CLASS)
+    enum YesNoType
+#else
+    enum class YesNoType
+#endif
+    {
+        Yes,
+        No,
+        Invalid
+    };
+
+    // parse the yes/no string
+    /*!
+    \param szString any of the following strings: yes, enable, true, 1, no, disable, false, 0
+    \return YesNoType::Yes if szString is yes/enable/true/1, YesNoType::No if szString is no, disable, false, 0 and YesNoType::Invalid if the string is not one of the expected values.
+    */
+    inline YesNoType ToYesNoType(const char* szString)
+    {
+        if (!_stricmp(szString, "yes")
+            || !_stricmp(szString, "enable")
+            || !_stricmp(szString, "true")
+            || !_stricmp(szString, "1"))
+#if defined(_DISALLOW_ENUM_CLASS)
+        {
+            return Yes;
+        }
+#else
+        {
+            return YesNoType::Yes;
+        }
+#endif
+        if (!_stricmp(szString, "no")
+            || !_stricmp(szString, "disable")
+            || !_stricmp(szString, "false")
+            || !_stricmp(szString, "0"))
+#if defined(_DISALLOW_ENUM_CLASS)
+        {
+            return No;
+        }
+#else
+        {
+            return YesNoType::No;
+        }
+#endif
+
+#if defined(_DISALLOW_ENUM_CLASS)
+        return Invalid;
+#else
+        return YesNoType::Invalid;
+#endif
+    }
+
+    /// Verifies if the filename provided only contains the accepted characters.
+    /*!
+    \param fileName the filename to verify
+    \return true if the filename only contains alphanumeric values and/or dot, dash and underscores.
+    */
+    inline bool IsValidFileName(const char* fileName)
+    {
+        size_t i = 0;
+        for (;; )
+        {
+            const char c = fileName[i++];
+            if (c == 0)
+            {
+                return true;
+            }
+            if (!((c >= '0' && c <= '9')
+                  || (c >= 'A' && c <= 'Z')
+                  || (c >= 'a' && c <= 'z')
+                  || c == '.' || c == '-' || c == '_'))
+            {
+                return false;
+            }
+        }
+    }
+
+
+    /**************************************************************************
+    *void _makepath() - build path name from components
+    *
+    *Purpose:
+    *       create a path name from its individual components
+    *
+    *Entry:
+    *       char *path  - pointer to buffer for constructed path
+    *       char *drive - pointer to drive component, may or may not contain trailing ':'
+    *       char *dir   - pointer to subdirectory component, may or may not include leading and/or trailing '/' or '\' characters
+    *       char *fname - pointer to file base name component
+    *       char *ext   - pointer to extension component, may or may not contain a leading '.'.
+    *
+    *Exit:
+    *       path - pointer to constructed path name
+    *
+    *******************************************************************************/
+    ILINE void portable_makepath(char path[_MAX_PATH], const char* drive, const char* dir, const char* fname, const char* ext)
+    {
+        const char* p;
+
+        /* we assume that the arguments are in the following form (although we
+        * do not diagnose invalid arguments or illegal filenames (such as
+        * names longer than 8.3 or with illegal characters in them)
+        *
+        *  drive:
+        *      A           ; or
+        *      A:
+        *  dir:
+        *      \top\next\last\     ; or
+        *      /top/next/last/     ; or
+        *      either of the above forms with either/both the leading
+        *      and trailing / or \ removed.  Mixed use of '/' and '\' is
+        *      also tolerated
+        *  fname:
+        *      any valid file name
+        *  ext:
+        *      any valid extension (none if empty or null )
+        */
+
+        /* copy drive */
+
+        if (drive && *drive)
+        {
+            *path++ = *drive;
+            *path++ = (':');
+        }
+
+        /* copy dir */
+
+        if ((p = dir) && *p)
+        {
+            do
+            {
+                *path++ = *p++;
+            } while (*p);
+            if (*(p - 1) != '/' && *(p - 1) != ('\\'))
+            {
+                *path++ = ('\\');
+            }
+        }
+
+        /* copy fname */
+
+        if (p = fname)
+        {
+            while (*p)
+            {
+                *path++ = *p++;
+            }
+        }
+
+        /* copy ext, including 0-terminator - check to see if a '.' needs
+        * to be inserted.
+        */
+
+        if (p = ext)
+        {
+            if (*p && *p != ('.'))
+            {
+                *path++ = ('.');
+            }
+            while (*path++ = *p++)
+            {
+                ;
+            }
+        }
+        else
+        {
+            /* better add the 0-terminator */
+            *path = ('\0');
+        }
+    }
+
+    /// Create a path name from its individual components.
+    /*!
+    \param char *path  pointer to buffer for constructed path
+    \param char *drive pointer to drive component, may or may not contain trailing ':'
+    \param char *dir   pointer to subdirectory component, may or may not include leading and/or trailing '/' or '\' characters
+    \param char *fname pointer to file base name component
+    \param char *ext   pointer to extension component, may or may not contain a leading '.'.
+    \return path pointer to constructed path name
+    */
+    inline void MakePath(char path[_MAX_PATH], const char* drive, const char* dir, const char* fname, const char* ext)
+    {
+        const char* p;
+
+        // we assume that the arguments are in the following form (although we
+        // do not diagnose invalid arguments or illegal filenames (such as
+        // names longer than 8.3 or with illegal characters in them)
+        //
+        // drive:
+        //     A           ; or
+        //     A:
+        // dir:
+        //     \top\next\last\     ; or
+        //     /top/next/last/     ; or
+        //     either of the above forms with either/both the leading
+        //     and trailing / or \ removed.  Mixed use of '/' and '\' is
+        //     also tolerated
+        // fname:
+        //     any valid file name
+        // ext:
+        //     any valid extension (none if empty or null )
+        //
+
+        // copy drive
+        if (drive && *drive)
+        {
+            *path++ = *drive;
+            *path++ = (':');
+        }
+
+        // copy dir
+        if ((p = dir) && *p)
+        {
+            do
+            {
+                *path++ = *p++;
+            } while (*p);
+            if (*(p - 1) != '/' && *(p - 1) != ('\\'))
+            {
+                *path++ = ('\\');
+            }
+        }
+
+        // copy fname
+        if (p = fname)
+        {
+            while (*p)
+            {
+                *path++ = *p++;
+            }
+        }
+
+        // copy ext, including 0-terminator - check to see if a '.' needs
+        // to be inserted.
+        if (p = ext)
+        {
+            if (*p && *p != ('.'))
+            {
+                *path++ = ('.');
+            }
+            while (*path++ = *p++)
+            {
+                ;
+            }
+        }
+        else
+        {
+            // better add the 0-terminator
+            *path = ('\0');
+        }
+    }
+
+    // Copies characters from a string.
+    /*!
+    \param destination Pointer to the destination array where the content is to be copied.
+    \param source C string to be copied.
+    \param num Maximum number of characters to be copied from source.
+    \remark Parameter order is the same as strncpy; Copies only up to num characters from source to destination.
+    \return true if entirety of source was copied into destination.
+    */
+    inline bool strncpy(char* destination, const char* source, size_t num)
+    {
+        bool reply = false;
+
+#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
+        CRY_ASSERT(destination);
+        CRY_ASSERT(source);
+#endif
+
+        if (num)
+        {
+            size_t i;
+            for (i = 0; source[i] && (i + 1) < num; ++i)
+            {
+                destination[i] = source[i];
+            }
+            destination[i] = '\0';
+            reply = (source[i] == '\0');
+        }
+
+#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
+        CRY_ASSERT_MESSAGE(reply, string().Format("String '%s' is too big to fit into a buffer of length %u", source, (unsigned int)num));
+#endif
+        return reply;
+    }
+
+    // Copies wide characters from a wide string.
+    /*!
+    \param destination Pointer to the destination wchar_t array where the content is to be copied.
+    \param source C wide string to be copied.
+    \param num Maximum number of characters to be copied from source.
+    \remark Parameter order is the same as strncpy; Copies only up to num characters from source to destination.
+    \return true if entirety of source was copied into destination.
+    */
+    inline bool wstrncpy(wchar_t* destination, const wchar_t* source, size_t bufferLength)
+    {
+        bool reply = false;
+
+#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
+        CRY_ASSERT(destination);
+        CRY_ASSERT(source);
+#endif
+
+        if (bufferLength)
+        {
+            size_t i;
+            for (i = 0; source[i] && (i + 1) < bufferLength; ++i)
+            {
+                destination[i] = source[i];
+            }
+            destination[i] = '\0';
+            reply = (source[i] == '\0');
+        }
+
+#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
+        CRY_ASSERT_MESSAGE(reply, string().Format("String '%ls' is too big to fit into a buffer of length %u", source, (unsigned int)bufferLength));
+#endif
+        return reply;
+    }
+
+    // Copies a C string into a destination buffer up to a specified delimiter or null terminator.
+    /*!
+    \param destination Pointer to a buffer where the resulting C-string is stored.
+    \param source C string to be copied.
+    \param num Maximum number of characters to be copied from source.
+    \param delimiter Delimiter character up to which the string will be copied.
+    \return Number of bytes written into destination (including null terminator) or 0 if delimiter is not found within the first num bytes of source.
+    */
+    inline size_t CopyStringUntilFindChar(char* destination, const char* source, size_t num, char delimiter)
+    {
+        size_t reply = 0;
+
+#if CRY_STRING_ASSERTS && !defined(RESOURCE_COMPILER)
+        CRY_ASSERT(destination);
+        CRY_ASSERT(source);
+#endif
+
+        if (num)
+        {
+            size_t i;
+            for (i = 0; source[i] && source[i] != delimiter && (i + 1) < num; ++i)
+            {
+                destination[i] = source[i];
+            }
+            destination[i] = '\0';
+            reply = (source[i] == delimiter) ? (i + 1) : 0;
+        }
+
+        return reply;
+    }
+} // namespace CryStringUtils
+
+#endif // CRYINCLUDE_CRYCOMMON_STRINGUTILS_H
diff --git a/Code/Legacy/CryCommon/Synchronization.h b/Code/Legacy/CryCommon/Synchronization.h
new file mode 100644
index 0000000000..82fb789d66
--- /dev/null
+++ b/Code/Legacy/CryCommon/Synchronization.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_SYNCHRONIZATION_H
+#define CRYINCLUDE_CRYCOMMON_SYNCHRONIZATION_H
+#pragma once
+
+
+//---------------------------------------------------------------------------
+// Synchronization policies, for classes (e.g. containers, allocators) that may
+// or may not be multithread-safe.
+//
+// Policies should be used as a template argument to such classes,
+// and these class implementations should then utilise the policy, as a base-class or member.
+//
+//---------------------------------------------------------------------------
+
+#include "MultiThread.h"
+#include "CryThread.h"
+
+namespace stl
+{
+    template<class Sync>
+    struct AutoLock
+    {
+        ILINE AutoLock(Sync& sync)
+            : _sync(sync)
+        {
+            sync.Lock();
+        }
+        ILINE ~AutoLock()
+        {
+            _sync.Unlock();
+        }
+
+    private:
+        Sync& _sync;
+    };
+
+
+    struct PSyncNone
+    {
+        void Lock() {}
+        void Unlock() {}
+    };
+
+    struct PSyncMultiThread
+    {
+        PSyncMultiThread()
+            : _Semaphore(0) {}
+
+        void Lock()
+        {
+            CryWriteLock(&_Semaphore);
+        }
+        void Unlock()
+        {
+            CryReleaseWriteLock(&_Semaphore);
+        }
+        int IsLocked() const volatile
+        {
+            return _Semaphore;
+        }
+
+    private:
+        volatile int _Semaphore;
+    };
+
+#ifdef _DEBUG
+
+    struct PSyncDebug
+        : public PSyncMultiThread
+    {
+        void Lock()
+        {
+            assert(!IsLocked());
+            PSyncMultiThread::Lock();
+        }
+    };
+
+#else
+
+    typedef PSyncNone PSyncDebug;
+
+#endif
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_SYNCHRONIZATION_H
diff --git a/Code/Legacy/CryCommon/Tarray.h b/Code/Legacy/CryCommon/Tarray.h
new file mode 100644
index 0000000000..5a34b7d7e0
--- /dev/null
+++ b/Code/Legacy/CryCommon/Tarray.h
@@ -0,0 +1,55 @@
+/*
+ * 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_TARRAY_H
+#define CRYINCLUDE_CRYCOMMON_TARRAY_H
+#pragma once
+
+
+#include <ILog.h>
+#include <Cry_Math.h>
+#include <AzCore/IO/FileIO.h>
+
+#ifndef CLAMP
+#define CLAMP(X, mn, mx) ((X) < (mn) ? (mn) : ((X) < (mx) ? (X) : (mx)))
+#endif
+
+#ifndef SATURATE
+#define SATURATE(X) clamp_tpl(X, 0.f, 1.f)
+#endif
+
+#ifndef SATURATEB
+#define SATURATEB(X) CLAMP(X, 0, 255)
+#endif
+
+#ifndef LERP
+#define LERP(A, B, Alpha) ((A) + (Alpha) * ((B)-(A)))
+#endif
+
+// Safe memory freeing
+#ifndef SAFE_DELETE
+#define SAFE_DELETE(p)          { if (p) { delete (p);       (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_DELETE_ARRAY
+#define SAFE_DELETE_ARRAY(p)    { if (p) { delete[] (p);     (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_RELEASE_FORCE
+#define SAFE_RELEASE_FORCE(p)           { if (p) { (p)->ReleaseForce();  (p) = NULL; } \
+}
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_TARRAY_H
diff --git a/Code/Legacy/CryCommon/TimeValue.h b/Code/Legacy/CryCommon/TimeValue.h
new file mode 100644
index 0000000000..af0950d7ea
--- /dev/null
+++ b/Code/Legacy/CryCommon/TimeValue.h
@@ -0,0 +1,176 @@
+/*
+ * 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_TIMEVALUE_H
+#define CRYINCLUDE_CRYCOMMON_TIMEVALUE_H
+
+#pragma once
+
+
+class CTimeValue
+{
+public:
+    static const int64      TIMEVALUE_PRECISION = 100000;         // one second
+
+public:
+    void GetMemoryUsage(class ICrySizer*) const { /*nothing*/}
+
+    // Default constructor.
+    ILINE CTimeValue()
+    {
+        m_lValue = 0;
+    }
+
+    // Constructor.
+    ILINE CTimeValue(const float fSeconds)
+    {
+        SetSeconds(fSeconds);
+    }
+
+    ILINE CTimeValue(const double fSeconds)
+    {
+        SetSeconds(fSeconds);
+    }
+
+    // Constructor.
+    // Arguments:
+    //      inllValue - positive negative, absolute or relative in 1 second= TIMEVALUE_PRECISION units.
+    ILINE CTimeValue(const int64 inllValue)
+    {
+        m_lValue = inllValue;
+    }
+
+    // Copy constructor.
+    ILINE CTimeValue(const CTimeValue& inValue)
+    {
+        m_lValue = inValue.m_lValue;
+    }
+
+    // Destructor.
+    ILINE ~CTimeValue() {}
+
+    // Description:
+    //      Assignment operator.
+    // Arguments:
+    //      inRhs - Right side.
+    ILINE CTimeValue& operator=(const CTimeValue& inRhs)
+    {
+        m_lValue = inRhs.m_lValue;
+        return *this;
+    };
+
+    // Use only for relative value, absolute values suffer a lot from precision loss.
+    ILINE float GetSeconds() const
+    {
+        return m_lValue * (1.f / TIMEVALUE_PRECISION);
+    }
+
+    // Get relative time difference in seconds - call on the endTime object:  endTime.GetDifferenceInSeconds( startTime );
+    ILINE float GetDifferenceInSeconds(const CTimeValue& startTime) const
+    {
+        return (m_lValue - startTime.m_lValue) * (1.f / TIMEVALUE_PRECISION);
+    }
+
+    //
+    ILINE void SetSeconds(const float infSec)
+    {
+        m_lValue = (int64)(infSec * TIMEVALUE_PRECISION);
+    }
+
+    //
+    ILINE void SetSeconds(const double infSec)
+    {
+        m_lValue = (int64)(infSec * TIMEVALUE_PRECISION);
+    }
+
+    //
+    ILINE void SetSeconds(const int64 indwSec)
+    {
+        m_lValue = indwSec * TIMEVALUE_PRECISION;
+    }
+
+    //
+    ILINE void SetMilliSeconds(const int64 indwMilliSec)
+    {
+        m_lValue = indwMilliSec * (TIMEVALUE_PRECISION / 1000);
+    }
+
+    // Use only for relative value, absolute values suffer a lot from precision loss.
+    ILINE float GetMilliSeconds() const
+    {
+        return m_lValue * (1000.f / TIMEVALUE_PRECISION);
+    }
+
+    ILINE int64 GetMilliSecondsAsInt64() const
+    {
+        return m_lValue * 1000 / TIMEVALUE_PRECISION;
+    }
+
+    ILINE int64 GetMicroSecondsAsInt64() const
+    {
+        return m_lValue * (1000 * 1000) / TIMEVALUE_PRECISION;
+    }
+
+    ILINE int64 GetValue() const
+    {
+        return m_lValue;
+    }
+
+    ILINE void SetValue(int64 val)
+    {
+        m_lValue = val;
+    }
+
+    // Description:
+    //      Useful for periodic events (e.g. water wave, blinking).
+    //      Changing TimePeriod can results in heavy changes in the returned value.
+    // Return Value:
+    //   [0..1[
+    float GetPeriodicFraction(const CTimeValue TimePeriod) const
+    {
+        // todo: change float implement to int64 for more precision
+        float fAbs = GetSeconds() / TimePeriod.GetSeconds();
+        return fAbs - (int)(fAbs);
+    }
+
+    // math operations -----------------------
+
+    // Minus.
+    ILINE CTimeValue operator-(const CTimeValue& inRhs) const {   CTimeValue ret; ret.m_lValue = m_lValue - inRhs.m_lValue; return ret; };
+    // Plus.
+    ILINE CTimeValue operator+(const CTimeValue& inRhs) const {   CTimeValue ret; ret.m_lValue = m_lValue + inRhs.m_lValue; return ret;    };
+    // Unary minus.
+    ILINE CTimeValue operator-() const { CTimeValue ret; ret.m_lValue = -m_lValue; return ret; };
+
+    ILINE CTimeValue& operator+=(const CTimeValue& inRhs) { m_lValue += inRhs.m_lValue; return *this; }
+    ILINE CTimeValue& operator-=(const CTimeValue& inRhs) { m_lValue -= inRhs.m_lValue; return *this; }
+
+    ILINE CTimeValue& operator/=(int inRhs) { m_lValue /= inRhs; return *this; }
+
+    // comparison -----------------------
+
+    ILINE bool operator<(const CTimeValue& inRhs) const { return m_lValue < inRhs.m_lValue; };
+    ILINE bool operator>(const CTimeValue& inRhs) const { return m_lValue > inRhs.m_lValue;   };
+    ILINE bool operator>=(const CTimeValue& inRhs) const { return m_lValue >= inRhs.m_lValue; };
+    ILINE bool operator<=(const CTimeValue& inRhs) const { return m_lValue <= inRhs.m_lValue; };
+    ILINE bool operator==(const CTimeValue& inRhs) const { return m_lValue == inRhs.m_lValue; };
+    ILINE bool operator!=(const CTimeValue& inRhs) const { return m_lValue != inRhs.m_lValue; };
+
+    AUTO_STRUCT_INFO
+
+    void GetMemoryStatistics(class ICrySizer*) const { /*nothing*/}
+
+private: // ----------------------------------------------------------
+
+    int64                                   m_lValue;                                               // absolute or relative value in 1/TIMEVALUE_PRECISION, might be negative
+
+
+    friend class CTimer;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_TIMEVALUE_H
diff --git a/Code/Legacy/CryCommon/TimeValue_info.h b/Code/Legacy/CryCommon/TimeValue_info.h
new file mode 100644
index 0000000000..c8267f02cc
--- /dev/null
+++ b/Code/Legacy/CryCommon/TimeValue_info.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_TIMEVALUE_INFO_H
+#define CRYINCLUDE_CRYCOMMON_TIMEVALUE_INFO_H
+#pragma once
+
+#include "TimeValue.h"
+
+STRUCT_INFO_BEGIN(CTimeValue)
+STRUCT_VAR_INFO(m_lValue, TYPE_INFO(int64))
+STRUCT_INFO_END(CTimeValue)
+
+
+#endif // CRYINCLUDE_CRYCOMMON_TIMEVALUE_INFO_H
diff --git a/Code/Legacy/CryCommon/Timer.h b/Code/Legacy/CryCommon/Timer.h
new file mode 100644
index 0000000000..5f2793d697
--- /dev/null
+++ b/Code/Legacy/CryCommon/Timer.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#pragma once
+#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/TypeInfo_decl.h b/Code/Legacy/CryCommon/TypeInfo_decl.h
new file mode 100644
index 0000000000..30b5cc9b1f
--- /dev/null
+++ b/Code/Legacy/CryCommon/TypeInfo_decl.h
@@ -0,0 +1,118 @@
+/*
+ * 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 : Macros and other definitions needed for TypeInfo declarations.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_TYPEINFO_DECL_H
+#define CRYINCLUDE_CRYCOMMON_TYPEINFO_DECL_H
+#pragma once
+
+#include <AzCore/Math/Uuid.h>
+
+//////////////////////////////////////////////////////////////////////////
+// Meta-type support.
+//////////////////////////////////////////////////////////////////////////
+
+// Currently enable type info for all platforms.
+#if !defined(ENABLE_TYPE_INFO)
+#define ENABLE_TYPE_INFO
+#endif
+#ifdef ENABLE_TYPE_INFO
+
+struct CTypeInfo;
+
+// If TypeInfo exists for T, it is accessed via TypeInfo(T*).
+// Default TypeInfo() is implemented by a struct member function.
+template<class T>
+inline const CTypeInfo& TypeInfo(const T* t)
+{
+    return t->TypeInfo();
+}
+
+// Declare a class's TypeInfo member
+#define STRUCT_INFO \
+    const CTypeInfo&TypeInfo() const;
+
+#define NULL_STRUCT_INFO \
+    const CTypeInfo&TypeInfo() const   { return *(CTypeInfo*)0; }
+
+// Declare an override for a type without TypeInfo() member (e.g. basic type)
+#define DECLARE_TYPE_INFO(Type) \
+    template<>                  \
+    const CTypeInfo&TypeInfo(const Type*);
+
+// Template version.
+#define DECLARE_TYPE_INFO_T(Type) \
+    template<class T>             \
+    const CTypeInfo&TypeInfo(const Type<T>*);
+
+// Type info declaration, with additional prototypes for string conversions.
+#define BASIC_TYPE_INFO(Type)                   \
+    string ToString(Type const & val);          \
+    bool FromString(Type & val, const char* s); \
+    DECLARE_TYPE_INFO(Type)
+
+#define CUSTOM_STRUCT_INFO(Struct)   \
+    const CTypeInfo&TypeInfo() const \
+    { static Struct Info; return Info; }
+
+#else // ENABLE_TYPE_INFO
+
+#define STRUCT_INFO
+#define NULL_STRUCT_INFO
+#define DECLARE_TYPE_INFO(Type)
+#define DECLARE_TYPE_INFO_T(Type)
+#define BASIC_TYPE_INFO(T)
+
+#endif // ENABLE_TYPE_INFO
+
+// Specify automatic tool generation of TypeInfo bodies.
+#define AUTO_STRUCT_INFO                            STRUCT_INFO
+#define AUTO_TYPE_INFO                              DECLARE_TYPE_INFO
+#define AUTO_TYPE_INFO_T                            DECLARE_TYPE_INFO_T
+
+// Obsolete "LOCAL" versions (all infos now generated in local files).
+#define AUTO_STRUCT_INFO_LOCAL              STRUCT_INFO
+#define AUTO_TYPE_INFO_LOCAL                    DECLARE_TYPE_INFO
+#define AUTO_TYPE_INFO_LOCAL_T              DECLARE_TYPE_INFO_T
+
+// Overrides for basic types.
+DECLARE_TYPE_INFO(void)
+
+BASIC_TYPE_INFO(bool)
+BASIC_TYPE_INFO(char)
+BASIC_TYPE_INFO(wchar_t)
+BASIC_TYPE_INFO(signed char)
+BASIC_TYPE_INFO(unsigned char)
+BASIC_TYPE_INFO(short)
+BASIC_TYPE_INFO(unsigned short)
+BASIC_TYPE_INFO(int)
+BASIC_TYPE_INFO(unsigned int)
+BASIC_TYPE_INFO(long)
+BASIC_TYPE_INFO(unsigned long)
+BASIC_TYPE_INFO(int64)
+BASIC_TYPE_INFO(uint64)
+
+BASIC_TYPE_INFO(float)
+BASIC_TYPE_INFO(double)
+
+BASIC_TYPE_INFO(AZ::Uuid)
+
+DECLARE_TYPE_INFO(string)
+
+// All pointers share same TypeInfo.
+const CTypeInfo&PtrTypeInfo();
+template<class T>
+inline const CTypeInfo& TypeInfo([[maybe_unused]] T** t)
+{
+    return PtrTypeInfo();
+}
+
+
+#endif // CRYINCLUDE_CRYCOMMON_TYPEINFO_DECL_H
diff --git a/Code/Legacy/CryCommon/TypeInfo_impl.h b/Code/Legacy/CryCommon/TypeInfo_impl.h
new file mode 100644
index 0000000000..1a45ca430f
--- /dev/null
+++ b/Code/Legacy/CryCommon/TypeInfo_impl.h
@@ -0,0 +1,212 @@
+/*
+ * 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 : Declaration of CTypeInfo, and other things to access meta-type info.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_TYPEINFO_IMPL_H
+#define CRYINCLUDE_CRYCOMMON_TYPEINFO_IMPL_H
+#pragma once
+
+
+#include "CryCustomTypes.h"
+
+#define ENABLE_TYPE_INFO_NAMES 1
+
+//---------------------------------------------------------------------------
+// DECLARATION MACROS
+// Used to construct meta TypeInfo objects in AutoTypeInfo files.
+// Two possible levels of TypeInfo: default, with size and offset info only, allowing Endian conversion;
+// and full, with string, attr, and enum info, allowing UI and serialisation.
+// The full version is selected by the ENABLE_TYPE_INFO_NAMES macro.
+
+#ifdef ENABLE_TYPE_INFO
+
+    #ifndef ENABLE_TYPE_INFO_NAMES
+// This symbol must be defined only once per module.
+        #define ENABLE_TYPE_INFO_NAMES 0
+    #endif
+
+    #if ENABLE_TYPE_INFO_NAMES
+        #define TYPE_INFO_NAME(n)                           #n
+    #else
+        #define TYPE_INFO_NAME(n)                           ""
+    #endif
+    #define TYPE_INFO_NAME_T(n)                         #n "<>"
+
+// Set of template functions for automatically returning the base element type for any scalar or array variable.
+
+template<class T>
+inline T& ElemType(T* at)
+{ return *at; }
+
+template<class T, size_t N>
+inline T& ElemType(T (*at)[N])
+{ return **at; }
+
+template<class T, size_t N, size_t N2>
+inline T& ElemType(T (*at)[N][N2])
+{ return ***at; }
+
+template<class T, size_t N, size_t N2, size_t N3>
+inline T& ElemType(T (*at)[N][N2][N3])
+{ return ****at; }
+
+template<class T>
+inline T& ValType([[maybe_unused]] T t)
+{ static T _t; return _t; }
+
+//---------------------------------------------------------------------------
+// Macros for constructing StructInfos (invoked by AutoTypeInfo.h)
+
+    #define DEFINE_TYPE_INFO(T, Type, Args) \
+    template<>                              \
+    const CTypeInfo&TypeInfo(const T*)      \
+    { static Type Info Args; return Info; } \
+
+    #define STRUCT_INFO_EMPTY_BODY(T)                       \
+    {                                                       \
+        static CStructInfo Info(#T, sizeof(T), alignof(T)); \
+        return Info;                                        \
+    }                                                       \
+
+    #define STRUCT_INFO_EMPTY(T)        \
+    const CTypeInfo&T::TypeInfo() const \
+    STRUCT_INFO_EMPTY_BODY(T)           \
+
+    #define STRUCT_INFO_T_EMPTY(T, Key, Arg) \
+    template<Key Arg>                        \
+    STRUCT_INFO_EMPTY(T<Arg>)
+
+    #define STRUCT_INFO_TYPE_EMPTY(T) \
+    DEFINE_TYPE_INFO(T, CStructInfo, (#T, sizeof(T), alignof(T)))
+
+    #define STRUCT_INFO_TYPE_T_EMPTY(T, TArgs, TDecl)       \
+    template TDecl const CTypeInfo&TypeInfo(const T TArgs*) \
+    STRUCT_INFO_EMPTY_BODY(T TArgs)                         \
+
+// Define TypeInfo for a primitive type, without string conversion.
+    #define TYPE_INFO_PLAIN(T)                                              DEFINE_TYPE_INFO(T, CTypeInfo, (#T, sizeof(T), alignof(T)))
+
+// Define TypeInfo for a basic type (undecomposable as far as TypeInfo cares), with external string converters.
+    #define TYPE_INFO_BASIC(T)                                              DEFINE_TYPE_INFO(T, TTypeInfo<T>, (#T))
+
+// Variant for int types, allowing conversion between sizes.
+    #define TYPE_INFO_INT(T)                                                    DEFINE_TYPE_INFO(T, TIntTypeInfo<T>, (#T))
+
+    #define STRUCT_INFO_BEGIN(T)                \
+    const CTypeInfo&T::TypeInfo() const {       \
+        static CStructInfo::CVarInfo Vars[] = { \
+
+    #define STRUCT_INFO_END(T)                                           \
+    };                                                                   \
+    static CStructInfo Info(#T, sizeof(T), alignof(T), ARRAY_VAR(Vars)); \
+    return Info;                                                         \
+    }
+
+    #define BASE_INFO_ATTRS(BaseType, Attrs) \
+    { ::TypeInfo((const BaseType*)this), "", Attrs, uint32((char*)static_cast<const BaseType*>(this) - (char*)this), 1, 1, 0, 0, 0 },
+
+    #define BASE_INFO(BaseType) BASE_INFO_ATTRS(BaseType, "")
+
+    #define ALIAS_INFO_ATTRS(AliasName, VarName, Attrs) \
+    { ::TypeInfo(&ElemType(&VarName)), TYPE_INFO_NAME(AliasName), Attrs, uint32((char*)&VarName - (char*)this), sizeof(VarName) / sizeof(ElemType(&VarName)), 0, 0, 0, 0 },
+
+    #define ALIAS_INFO_STRINGNAME_ATTR(AliasStringName, VarName, Attrs) \
+    { ::TypeInfo(&ElemType(&VarName)), AliasStringName, Attrs, uint32((char*)&VarName - (char*)this), sizeof(VarName) / sizeof(ElemType(&VarName)), 0, 0, 0, 0 },
+
+    #define VAR_INFO_ATTRS(VarName, Attrs) \
+    ALIAS_INFO_ATTRS(VarName, VarName, Attrs)
+
+    #define VAR_INFO(VarName) \
+    VAR_INFO_ATTRS(VarName, "")
+
+    #define ALIAS_INFO(AliasName, VarName) \
+    ALIAS_INFO_ATTRS(AliasName, VarName, "")
+
+    #define ATTRS_INFO(Attrs) \
+    { ::TypeInfo((void*)0), "", Attrs, 0, 0, 0, 0, 0, 0 },
+
+    #define BITFIELD_INFO(VarName, Bits) \
+    { ::TypeInfo(&ValType(VarName)), TYPE_INFO_NAME(VarName), "", 0, Bits, 0, 1, 0, 0 },
+
+// Conversion macros for older system.
+    #define STRUCT_BASE_INFO(BaseType)                                      BASE_INFO(BaseType)
+    #define STRUCT_VAR_INFO(VarName, InfoName)                      VAR_INFO(VarName)
+    #define STRUCT_BITFIELD_INFO(VarName, VarType, Bits)    BITFIELD_INFO(VarName, Bits)
+
+// Template versions
+
+template<class T>
+Array<CTypeInfo const*> TypeInfoArray1(T const* pt)
+{
+    static CTypeInfo const* s_info = &::TypeInfo(pt);
+    return ArrayT(&s_info, 1);
+}
+
+    #define STRUCT_INFO_T_BEGIN(T, Key, Arg) \
+    template<Key Arg>                        \
+    STRUCT_INFO_BEGIN(T<Arg>)
+
+    #define STRUCT_INFO_T_END(T, Key, Arg)                                                                       \
+    };                                                                                                           \
+    static CStructInfo Info(#T "<>", sizeof(T<Arg>), alignof(T<Arg>), ARRAY_VAR(Vars), TypeInfoArray1((Arg*)0)); \
+    return Info;                                                                                                 \
+    }
+
+    #define STRUCT_INFO_T2_BEGIN(T, Key1, Arg1, Key2, Arg2) \
+    template<Key1 Arg1, Key2 Arg2>                          \
+    const CTypeInfo&T<Arg1, Arg2>::TypeInfo() const {       \
+        typedef T<Arg1, Arg2> TThis;                        \
+        static CStructInfo::CVarInfo Vars[] = {             \
+
+    #define STRUCT_INFO_T2_END(T, Key1, Arg1, Key2, Arg2)                                                        \
+    };                                                                                                           \
+    static CTypeInfo const* TemplateTypes[] = { &::TypeInfo((Arg1*)0), &::TypeInfo((Arg2*)0) };                  \
+    static CStructInfo Info(#T "<,>", sizeof(TThis), alignof(TThis), ARRAY_VAR(Vars), ARRAY_VAR(TemplateTypes)); \
+    return Info;                                                                                                 \
+    }
+
+    #define STRUCT_INFO_T_INSTANTIATE(T, TArgs) \
+    template const CTypeInfo& T<TArgs>::TypeInfo() const;
+
+//---------------------------------------------------------------------------
+// Enum type info
+
+    #if ENABLE_TYPE_INFO_NAMES
+
+// Enums represented as full CEnumInfo types, with string conversion.
+        #define ENUM_INFO_BEGIN(T)         \
+    template<>                             \
+    const CTypeInfo&TypeInfo(const T*) {   \
+        static CEnumDef::SElem Elems[] = { \
+
+        #define ENUM_INFO_END(T)                       \
+    };                                                 \
+    typedef TIntType<sizeof(T)>::TType TInt;           \
+    static CEnumInfo<TInt> Info(#T, ARRAY_VAR(Elems)); \
+    return Info;                                       \
+    }                                                  \
+
+        #define ENUM_ELEM_INFO(Scope, Elem) \
+    { Scope Elem, #Elem },
+
+    #else // ENABLE_TYPE_INFO_NAMES
+
+// Enums represented as simple types, with no elements or string conversion.
+        #define ENUM_INFO_BEGIN(T) \
+    TYPE_INFO_PLAIN(T)             \
+
+        #define ENUM_INFO_END(T)
+        #define ENUM_ELEM_INFO(Scope, Elem)
+
+    #endif // ENABLE_TYPE_INFO_NAMES
+
+#endif // ENABLE_TYPE_INFO
+
+#endif // CRYINCLUDE_CRYCOMMON_TYPEINFO_IMPL_H
diff --git a/Code/Legacy/CryCommon/UnicodeBinding.h b/Code/Legacy/CryCommon/UnicodeBinding.h
new file mode 100644
index 0000000000..cbfc4122aa
--- /dev/null
+++ b/Code/Legacy/CryCommon/UnicodeBinding.h
@@ -0,0 +1,985 @@
+/*
+ * 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
+ *
+ */
+
+
+// Note: The utilities in this file should typically not be used directly,
+// consider including UnicodeFunctions.h or UnicodeIterator.h instead.
+//
+// (At least) the following string types can be bound with these helper functions:
+// Types                                            Input  Output Null-Terminator
+// CryStringT<T>, (::string, ::wstring):            yes    yes    implied by type (also Stack and Fixed variants)
+// std::basic_string<T>, std::string, std::wstring: yes    yes    implied by type
+// QString:                                         yes    yes    implied by type
+// std::vector<T>, std::list<T>, std::deque<T>:     yes    yes    not present
+// T[] (fixed-length buffer):                       yes    yes    guaranteed to be emitted on output, accepted on input
+// T * and size_t (user-specified-size buffer):     no     yes    guaranteed to be emitted on output
+// const T * (null-terminated string):              yes    no     expected
+// const T[] (literal):                             yes    no     implied as the last item in the array
+// pair of iterators over T:                        yes    no     should not be included in the range
+// uint32 (single UCS code-point):                  yes    no     not present
+// If some other string type is not listed, you can still use it for input easily by passing begin/end iterators.
+// Note: For all types, T can be any 8-bit, 16-bit or 32-bit integral or character type.
+// Further T types may be processed by explicitly passing InputEncoding and OutputEncoding.
+// We never actively tested such scenario's, so no guarantees on floating and user-defined types as code-units.
+
+
+#pragma once
+
+#ifndef assert
+// Some tools use CRT's assert, most engine and game modules use CryAssert.h (via platform.h maybe).
+// We don't want to force a choice upon all code that uses Unicode utilities, so we just assume assert is defined.
+#error This header uses assert macro, please provide an applicable definition before including UnicodeXXX.h
+#endif
+
+#include "UnicodeEncoding.h"
+#include <string.h>                 // For str(n)len and memcpy.
+#include <wchar.h>                  // For wcs(n)len.
+#include <stddef.h>                 // For size_t and ptrdiff_t.
+#include <iterator>                 // For std::iterator_traits.
+#include <string>                   // For std::basic_string.
+#include <vector>                   // For std::vector.
+#include <list>                     // For std::list.
+#include <deque>                    // For std::deque.
+#include <type_traits>              // ... standard type-traits (as of C++11).
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define UNICODEBINDING_H_SECTION_1 1
+#define UNICODEBINDING_H_SECTION_2 2
+#endif
+
+// Forward declare the supported types.
+// Before actually instantiating a binding however, you need to have the full definition included.
+// Also, this allows us to work with QChar/QString as declared names without a dependency on Qt.
+template<typename T, size_t S>
+class CryStackStringT;
+template<size_t S>
+class CryFixedStringT;
+template<size_t S>
+class CryFixedWStringT;
+template<typename T>
+class CryStringLocalT;
+template<typename T>
+class CryStringT;
+class QChar;
+class QString;
+namespace Unicode
+{
+    namespace Detail
+    {
+        // Import standard type traits.
+        // This requires C++11 compiler support.
+        using std::add_const;
+        using std::conditional;
+        using std::extent;
+        using std::integral_constant;
+        using std::is_arithmetic;
+        using std::is_array;
+        using std::is_base_of;
+        using std::is_const;
+        using std::is_convertible;
+        using std::is_integral;
+        using std::is_pointer;
+        using std::is_same;
+        using std::make_unsigned;
+        using std::remove_cv;
+        using std::remove_extent;
+        using std::remove_pointer;
+
+        // SVoid<T>:
+        // Result type will be void if T is well-formed.
+        // Note: This is mostly used to test the presence of member types at compile-time.
+        template<typename T>
+        struct SVoid
+        {
+            typedef void type;
+        };
+
+        // SValidChar<T, InferEncoding, Input>:
+        // Determine if T is a valid character type in the given compile-time context.
+        // The InferEncoding flag is set if the encoding has to be detected automatically.
+        // The Input flag is set if the type is used for input (and not set if the type is used for output).
+        template<typename T, bool InferEncoding, bool Input>
+        struct SValidChar
+        {
+            typedef typename remove_cv<T>::type BaseType;
+            static const bool isArithmeticType = is_arithmetic<BaseType>::value;
+            static const bool isQChar = is_same<BaseType, QChar>::value;
+            static const bool isUsable = isArithmeticType || isQChar;
+            static const bool isValidQualified = !is_const<T>::value || Input;
+            static const bool isKnownSize = sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4;
+            static const bool isValidInferred = isKnownSize || !InferEncoding;
+            static const bool value = isUsable && isValidQualified && isValidInferred;
+        };
+
+        // SPackedIterators<T>:
+        // A pair of iterators over some range.
+        // Note: Packing iterators into a single object allows us to pass them as a single argument like all other types.
+        template<typename T>
+        struct SPackedIterators
+        {
+            const T begin, end;
+            SPackedIterators(const T& _begin, const T& _end)
+                : begin(_begin)
+                , end(_end) {}
+        };
+
+        // SPackedBuffer<T>:
+        // A buffer-pointer/length tuple.
+        // Note: Packing them into a single object allows us to pass them as a single argument like all other types.
+        template<typename T>
+        struct SPackedBuffer
+        {
+            T buffer;
+            size_t size;
+            SPackedBuffer(T _buffer, size_t _size)
+                : buffer(_buffer)
+                , size(_size) {}
+        };
+
+        // SDependentType<T, X>:
+        // Makes the name of type T dependent on X (which is otherwise meaningless).
+        // Note: This is used to force two-phase lookup so we don't need the definition of T until instantiation.
+        // This way we can convince standards-compliant compilers Clang and GCC to not require definition of forward-declared types.
+        // Specifically, we forward-declare Qt's QString and QChar, for which the definition will never be available outside Editor.
+        template<typename T, int X>
+        struct SDependentType
+        {
+            typedef T type;
+        };
+
+        // EBind:
+        // Methods of binding a type for input and/or output.
+        // Note: These are used for tag-dispatch by binding functions, and are private to the implementation.
+        enum EBind
+        {                          // Input Output Description
+            eBind_Impossible,      // No    No     Can't bind this type.
+            eBind_Iterators,       // Yes   Yes    Bind by using begin() and end() member functions.
+            eBind_Data,            // Yes   Yes    Bind by using data() and size() member functions.
+            eBind_Literal,         // Yes   No     Bind a fixed size buffer (const element, aka string literal).
+            eBind_Buffer,          // Yes   No     Bind a fixed size buffer (non-const element) that may be null-terminated.
+            eBind_PackedBuffer,    // No    Yes    Bind a user-specified size buffer (non-const element).
+            eBind_NullTerminated,  // Yes   No     Bind a null-terminated buffer of unknown length (C string).
+            eBind_CodePoint,       // Yes   No     Bind a single code-point value.
+        };
+
+        // SBindIterator<T, InferEncoding>:
+        // Find the EBind for input from iterator pair of type T at compile-time.
+        // If the type is not supported, the resulting value will be eBind_Impossible
+        template<typename T, bool InferEncoding, typename HasValueType = void, typename HasIteratorCategory = void>
+        struct SBindIterator
+        {
+            typedef const void CharType;
+            static const EBind value = eBind_Impossible;
+        };
+        template<typename T, bool InferEncoding, typename HasValueType, typename HasIteratorCategory>
+        struct SBindIterator<T*, InferEncoding, HasValueType, HasIteratorCategory>
+        {
+            typedef typename add_const<T>::type CharType;
+            static const bool isValid = SValidChar<CharType, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
+        };
+        template<typename T, bool InferEncoding>
+        struct SBindIterator<T, InferEncoding,
+            typename SVoid<typename T::value_type>::type,
+            typename SVoid<typename T::iterator_category>::type
+            >
+        {
+            typedef typename add_const<typename T::value_type>::type CharType;
+            typedef typename T::iterator_category IteratorCategory;
+            static const bool isInputIterator = is_base_of<std::input_iterator_tag, IteratorCategory>::value;
+            static const bool isValid = SValidChar<CharType, InferEncoding, true>::value;
+            static const EBind value = isValid && isInputIterator ? eBind_Iterators : eBind_Impossible;
+        };
+
+        // SBindObject<T, InferEncoding>:
+        // Find the EBind for input from object of type T at compile-time.
+        // If the type is not supported, the resulting value will be eBind_Impossible.
+        template<typename T, bool InferEncoding>
+        struct SBindObject
+        {
+            typedef typename add_const<
+                typename conditional<
+                    is_array<T>::value,
+                    typename remove_extent<T>::type,
+                    typename remove_pointer<T>::type
+                    >::type
+                >::type CharType;
+            static const size_t FixedSize = extent<T>::value;
+            COMPILE_TIME_ASSERT(!is_array<T>::value || FixedSize > 0);
+            static const bool isConstArray = is_array<T>::value && is_const<typename remove_extent<T>::type>::value;
+            static const bool isBufferArray = is_array<T>::value && !isConstArray;
+            static const bool isPointer = is_pointer<T>::value;
+            static const bool isCodePoint = is_integral<T>::value;
+            static const bool isValidChar = SValidChar<CharType, InferEncoding, true>::value;
+            static const EBind value =
+                !isValidChar ? eBind_Impossible :
+                isConstArray ? eBind_Literal :
+                isBufferArray ? eBind_Buffer :
+                isPointer ? eBind_NullTerminated :
+                isCodePoint ? eBind_CodePoint :
+                eBind_Impossible;
+        };
+        template<typename CharT, typename Traits, typename Allocator, bool InferEncoding>
+        struct SBindObject<std::basic_string<CharT, Traits, Allocator>, InferEncoding>
+        {
+            typedef typename add_const<CharT>::type CharType;
+            static const bool isValid = SValidChar<CharT, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<typename T, typename Allocator, bool InferEncoding>
+        struct SBindObject<std::vector<T, Allocator>, InferEncoding>
+        {
+            typedef typename add_const<T>::type CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<typename T, typename Allocator, bool InferEncoding>
+        struct SBindObject<std::list<T, Allocator>, InferEncoding>
+        {
+            typedef typename add_const<T>::type CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
+        };
+        template<typename T, typename Allocator, bool InferEncoding>
+        struct SBindObject<std::deque<T, Allocator>, InferEncoding>
+        {
+            typedef typename add_const<T>::type CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
+        };
+        template<typename T, bool InferEncoding>
+        struct SBindObject<CryStringT<T>, InferEncoding>
+        {
+            typedef typename add_const<T>::type CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<typename T, bool InferEncoding>
+        struct SBindObject<CryStringLocalT<T>, InferEncoding>
+        {
+            typedef typename add_const<T>::type CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<typename T, size_t S, bool InferEncoding>
+        struct SBindObject<CryStackStringT<T, S>, InferEncoding>
+        {
+            typedef typename add_const<T>::type CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<size_t S, bool InferEncoding>
+        struct SBindObject<CryFixedStringT<S>, InferEncoding>
+        {
+            typedef char CharType;
+            static const bool isValid = SValidChar<CharType, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<size_t S, bool InferEncoding>
+        struct SBindObject<CryFixedWStringT<S>, InferEncoding>
+        {
+            typedef wchar_t CharType;
+            static const bool isValid = SValidChar<CharType, InferEncoding, true>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<bool InferEncoding>
+        struct SBindObject<QString, InferEncoding>
+        {
+            typedef const QChar CharType;
+            static const EBind value = eBind_Data;
+        };
+        template<typename T, bool InferEncoding>
+        struct SBindObject<SPackedIterators<T>, InferEncoding>
+        {
+            typedef typename SBindIterator<T, InferEncoding>::CharType CharType;
+            static const EBind value = eBind_Iterators;
+        };
+
+        // SBindOutput<T, InferEncoding>:
+        // Find the EBind for output to object of type T at compile-time.
+        // If the type is not supported, the resulting value will be eBind_Impossible.
+        template<typename T, bool InferEncoding>
+        struct SBindOutput
+        {
+            typedef typename remove_extent<T>::type CharType;
+            static const size_t FixedSize = extent<T>::value;
+            static const bool isArray = is_array<T>::value;
+            static const bool isValid = SValidChar<typename remove_extent<T>::type, InferEncoding, false>::value;
+            static const EBind value = isArray && isValid ? eBind_Buffer : eBind_Impossible;
+        };
+        template<typename OutputCharType, bool InferEncoding>
+        struct SBindOutput<SPackedBuffer<OutputCharType*>, InferEncoding>
+        {
+            typedef OutputCharType CharType;
+            static const bool isValid = SValidChar<CharType, InferEncoding, false>::value;
+            static const EBind value = isValid ? eBind_PackedBuffer : eBind_Impossible;
+        };
+        template<typename CharT, typename Traits, typename Allocator, bool InferEncoding>
+        struct SBindOutput<std::basic_string<CharT, Traits, Allocator>, InferEncoding>
+        {
+            typedef CharT CharType;
+            static const bool isValid = SValidChar<CharT, InferEncoding, false>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<typename T, typename Allocator, bool InferEncoding>
+        struct SBindOutput<std::vector<T, Allocator>, InferEncoding>
+        {
+            typedef T CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<typename T, typename Allocator, bool InferEncoding>
+        struct SBindOutput<std::list<T, Allocator>, InferEncoding>
+        {
+            typedef T CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
+            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
+        };
+        template<typename T, typename Allocator, bool InferEncoding>
+        struct SBindOutput<std::deque<T, Allocator>, InferEncoding>
+        {
+            typedef T CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
+            static const EBind value = isValid ? eBind_Iterators : eBind_Impossible;
+        };
+        template<typename T, bool InferEncoding>
+        struct SBindOutput<CryStringT<T>, InferEncoding>
+        {
+            typedef T CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<typename T, bool InferEncoding>
+        struct SBindOutput<CryStringLocalT<T>, InferEncoding>
+        {
+            typedef T CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<typename T, size_t S, bool InferEncoding>
+        struct SBindOutput<CryStackStringT<T, S>, InferEncoding>
+        {
+            typedef T CharType;
+            static const bool isValid = SValidChar<T, InferEncoding, false>::value;
+            static const EBind value = isValid ? eBind_Data : eBind_Impossible;
+        };
+        template<bool InferEncoding>
+        struct SBindOutput<QString, InferEncoding>
+        {
+            typedef QChar CharType;
+            static const EBind value = eBind_Data;
+        };
+
+        // SInferEncoding<T>:
+        // Infers the encoding of the given character type.
+        // Note: This will always pick an UTF encoding type based on the size of the element type.
+        template<typename T, bool Input>
+        struct SInferEncoding
+        {
+            typedef SBindObject<T, true> ObjectType;
+            typedef SBindIterator<T, true> IteratorType;
+            typedef typename conditional<
+                IteratorType::value != eBind_Impossible,
+                typename IteratorType::CharType,
+                typename ObjectType::CharType
+                >::type CharType;
+            static const EEncoding value =
+                sizeof(CharType) == 1 ? eEncoding_UTF8 :
+                sizeof(CharType) == 2 ? eEncoding_UTF16 :
+                eEncoding_UTF32;
+            COMPILE_TIME_ASSERT(value != eEncoding_UTF32 || sizeof(CharType) == 4);
+        };
+
+        // SBindCharacter<T, Input>:
+        // Pick the base character type to use during input or output with this element type.
+        template<typename T, bool Input, bool Integral = is_integral<T>::value, bool IsQChar = is_same<QChar, typename remove_cv<T>::type>::value>
+        struct SBindCharacter
+        {
+            typedef typename make_unsigned<T>::type BaseType; // The standard doesn't define if a character type is signed or unsigned.
+            typedef typename remove_cv<BaseType>::type UnqualifiedType;
+            typedef typename conditional<Input, const UnqualifiedType, UnqualifiedType>::type type;
+        };
+        template<typename T, bool Input>
+        struct SBindCharacter<T, Input, false, false>
+        {
+            COMPILE_TIME_ASSERT(is_arithmetic<T>::value);
+            typedef typename remove_cv<T>::type UnqualifiedType;
+            typedef typename conditional<Input, const UnqualifiedType, UnqualifiedType>::type type;
+        };
+        template<typename T, bool Input>
+        struct SBindCharacter<T, Input, false, true>
+        {
+            typedef typename conditional<Input, const uint16, uint16>::type type;
+            typedef typename SDependentType<QChar, Input>::type ActuallyQChar; // Force two-phase name lookup on QChar.
+            COMPILE_TIME_ASSERT(sizeof(ActuallyQChar) == sizeof(type)); // In case Qt ever changes QChar.
+        };
+
+        // SBindPointer<T, Input>:
+        // Pick the pointer type to use during input or output with buffers (potentially inside string types).
+        template<typename T, bool Input>
+        struct SBindPointer
+        {
+            COMPILE_TIME_ASSERT(is_pointer<T>::value || is_array<T>::value);
+            typedef typename conditional<
+                is_pointer<T>::value,
+                typename remove_pointer<T>::type,
+                typename remove_extent<T>::type
+                >::type UnboundCharType;
+            typedef typename SBindCharacter<UnboundCharType, Input>::type BoundCharType;
+            typedef BoundCharType* type;
+        };
+
+        // SAutomaticallyDeduced:
+        // Placeholder type that is never defined, used by SRequire for SFINAE overloading.
+        struct SAutomaticallyDeduced;
+
+        // SRequire<Expr, T>:
+        // Helper for SFINAE overloading.
+        // Similar to C++11's std::enable_if, which is not in boost (with that exact name anyway).
+        template<bool SFINAE, typename T = SAutomaticallyDeduced>
+        struct SRequire
+        {
+            typedef T type;
+        };
+        template<typename T>
+        struct SRequire<false, T> {};
+
+        // SafeCast<T, SourceChar>:
+        // Cast a pointer to type T, but only allowing safe casts.
+        // This guards against bad code in other functions since it prevents unintended casts.
+        template<typename T, typename SourceChar>
+        inline T SafeCast(SourceChar* ptr, typename SRequire<is_integral<SourceChar>::value>::type* = 0)
+        {
+            // Allow casts from pointer-to-integral to unrelated pointer-to-integral, provided they are of the same size.
+            typedef typename remove_pointer<T>::type TargetChar;
+            COMPILE_TIME_ASSERT(is_integral<SourceChar>::value && is_integral<TargetChar>::value);
+            COMPILE_TIME_ASSERT(sizeof(SourceChar) == sizeof(TargetChar));
+            return reinterpret_cast<T>(ptr);
+        }
+        template<typename T, typename SourceChar>
+        inline T SafeCast(SourceChar* ptr, typename SRequire<is_same<typename remove_cv<SourceChar>::type, QChar>::value>::type* = 0)
+        {
+            // Allow casts from pointer-to-QChar to unrelated pointer-to-integral, provided they are of the same size.
+            typedef typename remove_pointer<T>::type TargetChar;
+            COMPILE_TIME_ASSERT(is_integral<TargetChar>::value);
+            COMPILE_TIME_ASSERT(sizeof(SourceChar) == sizeof(TargetChar));
+            return reinterpret_cast<T>(ptr);
+        }
+        template<typename T, typename SourceChar>
+        inline T SafeCast(SourceChar* ptr, typename SRequire<!is_integral<SourceChar>::value&& !is_same<typename remove_cv<SourceChar>::type, QChar>::value>::type* = 0)
+        {
+            // Any other casts that are allowed by C++.
+            return static_cast<T>(ptr);
+        }
+
+        // SCharacterTrait<T>:
+        // Exposes some basic traits for a given character.
+        // Note: Map to (hopefully optimized) CRT functions where possible.
+        template<typename T, size_t Size = sizeof(T)* is_integral<T>::value>
+        struct SCharacterTrait
+        {
+            static size_t StrLen(const T* nts) // Fall-back strlen.
+            {
+                size_t result = 0;
+                while (*nts != 0)
+                {
+                    ++nts;
+                    ++result;
+                }
+                return result;
+            }
+            static size_t StrNLen(const T* ptr, size_t len) // Fall-back strnlen.
+            {
+                size_t result = 0;
+                while (*ptr != 0 && result != len)
+                {
+                    ++ptr;
+                    ++result;
+                }
+                return result;
+            }
+        };
+        template<typename T>
+        struct SCharacterTrait<T, sizeof(char)>
+        {
+            static size_t StrLen(const T* nts) // Narrow CRT strlen.
+            {
+                return ::strlen(SafeCast<const char*>(nts));
+            }
+            static size_t StrNLen(const T* ptr, size_t len) // Narrow CRT strnlen.
+            {
+                return ::strnlen(SafeCast<const char*>(ptr), len);
+            }
+        };
+        template<typename T>
+        struct SCharacterTrait<T, sizeof(wchar_t)>
+        {
+            static size_t StrLen(const T* nts) // Wide CRT strlen.
+            {
+                return ::wcslen(SafeCast<const wchar_t*>(nts));
+            }
+            static size_t StrNLen(const T* ptr, size_t len) // Wide CRT strnlen.
+            {
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION UNICODEBINDING_H_SECTION_1
+    #include AZ_RESTRICTED_FILE(UnicodeBinding_h) 
+#endif
+                return ::wcsnlen(SafeCast<const wchar_t*>(ptr), len);
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION UNICODEBINDING_H_SECTION_2
+    #include AZ_RESTRICTED_FILE(UnicodeBinding_h)
+#endif
+            }
+        };
+
+        // void Feed(const SPackedIterators<InputIteratorType> &its, Sink &out, tag):
+        // Feeds the provided sink from provided packed iterator-range.
+        template<typename InputIteratorType, typename Sink>
+        inline void Feed(const SPackedIterators<InputIteratorType>& its, Sink& out, integral_constant<EBind, eBind_Iterators>)
+        {
+            typedef typename std::iterator_traits<InputIteratorType>::value_type UnboundCharType;
+            typedef typename SBindCharacter<UnboundCharType, true>::type BoundCharType;
+            for (InputIteratorType it = its.begin; it != its.end; ++it)
+            {
+                const UnboundCharType unbound = *it;
+                const BoundCharType bound = static_cast<BoundCharType>(unbound);
+                const uint32 item = static_cast<uint32>(bound);
+                out(item);
+            }
+        }
+
+        // void Feed(const SPackedIterators<const InputCharType *> &its, Sink &out, tag):
+        // Feeds the provided sink from provided packed pointer-range.
+        // This is slightly better code-generation than using generic iterators.
+        template<typename InputCharType, typename Sink>
+        inline void Feed(const SPackedIterators<const InputCharType*>& its, Sink& out, integral_constant<EBind, eBind_Iterators>)
+        {
+            typedef typename SBindPointer<const InputCharType*, true>::type PointerType;
+            assert(reinterpret_cast<size_t>(its.begin) <= reinterpret_cast<size_t>(its.end) && "Invalid range specified");
+            const size_t length = its.end - its.begin;
+            PointerType ptr = SafeCast<PointerType>(its.begin);
+            assert((ptr || !length) && "Passed a non-empty range containing a null-pointer");
+            for (size_t i = 0; i < length; ++i, ++ptr)
+            {
+                const uint32 item = static_cast<uint32>(*ptr);
+                out(item);
+            }
+        }
+
+        // void Feed(const InputStringType &in, Sink &out, tag):
+        // Feeds the provided sink from a container, using it's iterators.
+        // Note: Dispatches to one of the packed-range overloads.
+        template<typename InputStringType, typename Sink>
+        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_Iterators> tag)
+        {
+            typedef typename InputStringType::const_iterator IteratorType;
+            Detail::SPackedIterators<IteratorType> its(in.begin(), in.end());
+            Feed(its, out, tag);
+        }
+
+        // void Feed(const InputStringType &in, Sink &out, tag):
+        // Feeds the provided sink from a string-object's buffer.
+        template<typename InputStringType, typename Sink>
+        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_Data>)
+        {
+            typedef typename InputStringType::size_type SizeType;
+            typedef typename InputStringType::value_type ValueType;
+            typedef typename SBindPointer<const ValueType*, true>::type PointerType;
+            const SizeType length = in.size();
+            if (length)
+            {
+                PointerType ptr = SafeCast<PointerType>(in.data());
+                for (SizeType i = 0; i < length; ++i, ++ptr)
+                {
+                    const uint32 item = static_cast<uint32>(*ptr);
+                    out(item);
+                }
+            }
+        }
+
+        // void Feed(const InputStringType &in, Sink &out, tag):
+        // Feeds the provided sink from a string-literal.
+        // Note: The literal is assumed to be null-terminated.
+        // It's possible that a const-element fixed-size-buffer is mistaken as a literal.
+        // However, we expect no-one uses such buffers that are not null-terminated already.
+        // If somehow this use-case is desired, either terminate the buffer, or remove const from the buffer, or pass iterators.
+        template<typename InputStringType, typename Sink>
+        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_Literal>)
+        {
+            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
+            typedef typename SBindPointer<InputStringType, true>::type PointerType;
+            const size_t length = extent<InputStringType>::value - 1;
+            PointerType ptr = SafeCast<PointerType>(in);
+            assert(ptr[length] == 0 && "Literal is not null-terminated");
+            for (size_t i = 0; i < length; ++i, ++ptr)
+            {
+                const uint32 item = static_cast<uint32>(*ptr);
+                out(item);
+            }
+        }
+
+        // void Feed(const InputStringType &in, Sink &out, tag):
+        // Feeds the provided sink from a non-const-element fixed-size buffer.
+        // Note: The buffer is allowed to be null-terminated, but it's not required.
+        template<typename InputStringType, typename Sink>
+        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_Buffer>)
+        {
+            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
+            typedef typename SBindPointer<InputStringType, true>::type PointerType;
+            typedef typename SBindPointer<InputStringType, true>::BoundCharType CharType;
+            const size_t length = extent<InputStringType>::value;
+            PointerType ptr = SafeCast<PointerType>(in);
+            for (size_t i = 0; i < length; ++i, ++ptr)
+            {
+                const CharType unbound = *ptr;
+                if (unbound == 0)
+                {
+                    break;
+                }
+                const uint32 item = static_cast<uint32>(unbound);
+                out(item);
+            }
+        }
+
+        // void Feed(const InputStringType &in, Sink &out, tag):
+        // Feeds the provided sink from a null-terminated C-style string.
+        template<typename InputStringType, typename Sink>
+        inline void Feed(const InputStringType& in, Sink& out, integral_constant<EBind, eBind_NullTerminated>)
+        {
+            COMPILE_TIME_ASSERT(is_pointer<InputStringType>::value);
+            typedef typename SBindPointer<InputStringType, true>::type PointerType;
+            typedef typename SBindPointer<InputStringType, true>::BoundCharType CharType;
+            PointerType ptr = SafeCast<PointerType>(in);
+            if (ptr)
+            {
+                while (true)
+                {
+                    const CharType unbound = *ptr;
+                    ++ptr;
+                    if (unbound == 0)
+                    {
+                        break;
+                    }
+                    const uint32 item = static_cast<uint32>(unbound);
+                    out(item);
+                }
+            }
+        }
+
+        // void Feed(const InputCharType &in, Sink &out, tag):
+        // Feeds the provided sink from a single value (interpreted as an UCS code-point).
+        template<typename InputCharType, typename Sink>
+        inline void Feed(const InputCharType& in, Sink& out, integral_constant<EBind, eBind_CodePoint>)
+        {
+            COMPILE_TIME_ASSERT(is_arithmetic<InputCharType>::value);
+            const uint32 item = static_cast<uint32>(in);
+            out(item);
+        }
+
+        // size_t EncodedLength(const SPackedIterators<InputIteratorType> &its, tag):
+        // Determines the length of the input sequence in a range of iterators.
+        template<typename InputIteratorType>
+        inline size_t EncodedLength(const SPackedIterators<InputIteratorType>& its, integral_constant<EBind, eBind_Iterators>)
+        {
+            return std::distance(its.begin, its.end); // std::distance will pick optimal implementation depending on iterator category.
+        }
+
+        // size_t EncodedLength(const InputStringType &in, tag):
+        // Determines the length of an input container, which would otherwise be enumerated with iterators.
+        template<typename InputStringType>
+        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_Iterators>)
+        {
+            return in.size(); // Can there be a container without size()? At the very least, not in the supported types.
+        }
+
+        // size_t EncodedLength(const InputStringType &in, tag):
+        // Determines the length of the input container. The container uses contiguous element layout.
+        template<typename InputStringType>
+        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_Data>)
+        {
+            return in.size();
+        }
+
+        // size_t EncodedLength(const InputStringType &in, tag):
+        // Determines the length of the input string-literal. This is a compile-time constant.
+        template<typename InputStringType>
+        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_Literal>)
+        {
+            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
+            return extent<InputStringType>::value - 1;
+        }
+
+        // size_t EncodedLength(const InputStringType &in, tag):
+        // Determines the length of the input fixed-size-buffer. We look for an (optional) null-terminator in the buffer.
+        template<typename InputStringType>
+        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_Buffer>)
+        {
+            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
+            typedef typename remove_extent<InputStringType>::type CharType;
+            return SCharacterTrait<CharType>::StrNLen(in, extent<InputStringType>::value);
+        }
+
+        // size_t EncodedLength(const InputStringType &in, tag):
+        // Determines the length of the input used-specified buffer. We look for an (optional) null-terminator in the buffer.
+        template<typename InputCharType>
+        inline size_t EncodedLength(const SPackedBuffer<InputCharType*>& in, integral_constant<EBind, eBind_PackedBuffer>)
+        {
+            return in.buffer ? SCharacterTrait<InputCharType>::StrNLen(in.buffer, in.size) : 0;
+        }
+
+        // size_t EncodedLength(const InputStringType &in, tag):
+        // Determines the length of the input null-terminated c-style string. We just use strlen() if available.
+        template<typename InputStringType>
+        inline size_t EncodedLength(const InputStringType& in, integral_constant<EBind, eBind_NullTerminated>)
+        {
+            COMPILE_TIME_ASSERT(is_pointer<InputStringType>::value);
+            typedef typename remove_pointer<InputStringType>::type CharType;
+            return in ? SCharacterTrait<CharType>::StrLen(in) : 0;
+        }
+
+        // size_t EncodedLength(const InputCharType &in, tag):
+        // Determines the length of a single UCS code-point. This is always 1.
+        template<typename InputCharType>
+        inline size_t EncodedLength([[maybe_unused]] const InputCharType& in, integral_constant<EBind, eBind_CodePoint>)
+        {
+            COMPILE_TIME_ASSERT(is_arithmetic<InputCharType>::value);
+            return 1;
+        }
+
+        // const void *EncodedPointer(const SPackedIterators<const InputCharType *> &its, tag):
+        // Get a pointer to contiguous storage for an iterator range.
+        // Note: This can only work if the iterators are pointers, or the storage won't be guaranteed contiguous.
+        template<typename InputCharType>
+        inline const void* EncodedPointer(const SPackedIterators<const InputCharType*>& its, integral_constant<EBind, eBind_Iterators>)
+        {
+            return its.begin;
+        }
+
+        // const void *EncodedPointer(const InputStringType &in, tag):
+        // Get a pointer to contiguous storage for string/vector object.
+        // Note: This can only work for containers that actually use contiguous storage, which is determined by the SBindXXX helpers.
+        template<typename InputStringType>
+        inline const void* EncodedPointer(const InputStringType& in, integral_constant<EBind, eBind_Data>)
+        {
+            return in.data();
+        }
+
+        // const void *EncodedPointer(const InputStringType &in, tag):
+        // Get a pointer to contiguous storage for a string-literal.
+        template<typename InputStringType>
+        inline const void* EncodedPointer(const InputStringType& in, integral_constant<EBind, eBind_Literal>)
+        {
+            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
+            return in; // We can just let the array type decay to a pointer.
+        }
+
+        // const void *EncodedPointer(const InputStringType &in, tag):
+        // Get a pointer to contiguous storage for a fixed-size-buffer.
+        template<typename InputStringType>
+        inline const void* EncodedPointer(const InputStringType& in, integral_constant<EBind, eBind_Buffer>)
+        {
+            COMPILE_TIME_ASSERT(is_array<InputStringType>::value && extent<InputStringType>::value > 0);
+            return in; // We can just let the array type decay to a pointer.
+        }
+
+        // const void *EncodedPointer(const InputStringType &in, tag):
+        // Get a pointer to contiguous storage for a null-terminated c-style-string.
+        template<typename InputStringType>
+        inline const void* EncodedPointer(const InputStringType& in, integral_constant<EBind, eBind_NullTerminated>)
+        {
+            COMPILE_TIME_ASSERT(is_pointer<InputStringType>::value);
+            return in; // Implied
+        }
+
+        // const void *EncodedPointer(const InputCharType &in, tag):
+        // Get a pointer to contiguous storage for a single UCS code-point.
+        template<typename InputCharType>
+        inline const void* EncodedPointer(const InputCharType& in, integral_constant<EBind, eBind_CodePoint>)
+        {
+            COMPILE_TIME_ASSERT(is_arithmetic<InputCharType>::value);
+            return &in; // Take the address of the parameter (which is kept on the stack of the caller).
+        }
+
+        // SWriteSink<T, Append, BindMethod>:
+        // A helper that performs writing to the type T and can be passed as Sink type to a trans-coder helper.
+        template<typename T, bool Append, EBind>
+        struct SWriteSink;
+        template<typename T, bool Append>
+        struct SWriteSink<T, Append, eBind_Iterators>
+        {
+            typedef typename T::value_type OutputCharType;
+            T& out;
+            SWriteSink(T& _out, size_t)
+                : out(_out)
+            {
+                if (!Append)
+                {
+                    // If not appending, clear the object beforehand.
+                    out.clear();
+                }
+            }
+            void operator()(uint32 item)
+            {
+                const OutputCharType bound = static_cast<OutputCharType>(item);
+                out.push_back(bound); // We assume this can't fail and STL container takes care of memory.
+            }
+            void operator()(const void*, size_t);  // Not implemented.
+            void HintSequence(uint32 length) {} // Don't care about sequences.
+            bool CanWrite() const { return true; } // Always writable
+        };
+        template<typename T, bool Append>
+        struct SWriteSink<T, Append, eBind_Data>
+        {
+            typedef SBindPointer<typename T::value_type*, false> BindHelper;
+            typedef typename BindHelper::UnboundCharType CharType;
+            CharType* ptr;
+            SWriteSink(T& out, size_t length)
+            {
+                const size_t offset = Append ? out.size() : 0;
+                length += offset;
+                out.resize(length); // resize() can't fail without exceptions, so assert instead.
+                assert((out.size() == length) && "Buffer resize failed (out-of-memory?)");
+                const CharType* base = length ? out.data() : 0;
+                ptr = const_cast<CharType*>(base + offset);
+            }
+            void operator()(uint32 item)
+            {
+                *SafeCast<typename BindHelper::type>(ptr) = static_cast<typename BindHelper::BoundCharType>(item);
+                ++ptr;
+            }
+            void operator()(const void* src, size_t length)
+            {
+                ::memcpy(ptr, src, length * sizeof(CharType));
+                ptr += length;
+            }
+            void HintSequence([[maybe_unused]] uint32 length) {} // Don't care about sequences.
+            bool CanWrite() const { return true; } // Always writable
+        };
+        template<typename P, bool Append>
+        struct SWriteSink<SPackedBuffer<P>, Append, eBind_PackedBuffer>
+        {
+            typedef typename remove_pointer<P>::type ElementType;
+            typedef SBindPointer<ElementType*, false> BindHelper;
+            typedef typename BindHelper::UnboundCharType CharType;
+            CharType* ptr;
+            CharType* const terminator;
+            SWriteSink(CharType* _terminator)
+                : terminator(_terminator) {}
+            SWriteSink(SPackedBuffer<P>& out, size_t)
+                : terminator(out.size && out.buffer ? out.buffer + out.size - 1 : 0)
+            {
+                const size_t offset = Append
+                    ? EncodedLength(out, integral_constant<EBind, eBind_PackedBuffer>())
+                    : 0;
+                const size_t fixedOffset = Append && offset >= out.size
+                    ? out.size - 1 // In case the buffer is already full and not terminated.
+                    : offset;
+                CharType* base = static_cast<CharType*>(out.buffer);
+                ptr = terminator ? base + fixedOffset : 0;
+            }
+            ~SWriteSink()
+            {
+                if (ptr)
+                {
+                    *ptr = 0; // Guarantees that the output is null-terminated.
+                }
+            }
+            void operator()(uint32 item)
+            {
+                if (ptr != terminator) // Guarantees we don't overflow the buffer.
+                {
+                    *SafeCast<typename BindHelper::type>(ptr) = static_cast<typename BindHelper::BoundCharType>(item);
+                    ++ptr;
+                }
+            }
+            void operator()(const void* src, size_t length)
+            {
+                const size_t maxLength = terminator - ptr;
+                if (length > maxLength)
+                {
+                    length = maxLength;
+                }
+                ::memcpy(ptr, src, length * sizeof(CharType));
+                ptr += length;
+            }
+            void HintSequence(uint32 length)
+            {
+                if (terminator && (ptr + length >= terminator))
+                {
+                    // This sequence will overflow the buffer.
+                    // In this case, we prefer to not generate any part of the sequence.
+                    // Terminate at the current position and flag as full.
+                    *ptr = 0;
+                    ptr = terminator;
+                }
+            }
+            bool CanWrite() const
+            {
+                return terminator != ptr;
+            }
+        };
+        template<typename T, bool Append>
+        struct SWriteSink<T, Append, eBind_Buffer> // Uses above implementation with specialized constructor
+            : SWriteSink<SPackedBuffer<typename remove_extent<T>::type*>, Append, eBind_PackedBuffer>
+        {
+            typedef typename remove_extent<T>::type ElementType;
+            typedef SWriteSink<SPackedBuffer<ElementType*>, Append, eBind_PackedBuffer> Super;
+            typedef SBindPointer<ElementType*, false> BindHelper;
+            typedef typename BindHelper::UnboundCharType CharType;
+            SWriteSink(T& out, size_t)
+                : Super(out + extent<T>::value - 1)
+            {
+                const size_t offset = Append
+                    ? EncodedLength(out, integral_constant<EBind, eBind_Buffer>())
+                    : 0;
+                const size_t fixedOffset = Append && offset >= extent<T>::value
+                    ? extent<T>::value - 1 // In case the buffer is already full and not terminated.
+                    : offset;
+                Super::ptr = out + fixedOffset; // Qualification for Super required for two-phase lookup.
+            }
+        };
+
+        // SIsBlockCopyable<InputType, OutputType>:
+        // Check if block-copy optimization is possible for these types.
+        // InputType should be an instantiation of SBindObject or SBindIterator.
+        // OutputType should be an instantiation of SBindOutput.
+        // Note: This doesn't take into account safe/unsafe conversions, just if the underlying storage types are compatible.
+        template<typename InputType, typename OutputType>
+        struct SIsBlockCopyable
+        {
+            template<EBind M>
+            struct SIsContiguous
+            {
+                static const bool value =
+                    M == eBind_Data ||
+                    M == eBind_Literal ||
+                    M == eBind_Buffer ||
+                    M == eBind_PackedBuffer ||
+                    M == eBind_NullTerminated ||
+                    M == eBind_CodePoint;
+            };
+            template<typename T>
+            struct SIsPointers
+            {
+                static const bool value = false;
+            };
+            template<typename T>
+            struct SIsPointers<SPackedIterators<T*> >
+            {
+                static const bool value = true;
+            };
+            typedef typename SBindCharacter<typename InputType::CharType, true>::type InputCharType;
+            typedef typename SBindCharacter<typename OutputType::CharType, false>::type OutputCharType;
+            static const bool isIntegral = is_integral<InputCharType>::value && is_integral<OutputCharType>::value;
+            static const bool isSameSize = sizeof(InputCharType) == sizeof(OutputCharType);
+            static const bool isInputContiguous = (SIsContiguous<InputType::value>::value || SIsPointers<InputType>::value);
+            static const bool isOutputContiguous = (SIsContiguous<OutputType::value>::value || SIsPointers<OutputType>::value);
+            static const bool value = isIntegral && isSameSize && isInputContiguous && isOutputContiguous;
+        };
+    }
+}
diff --git a/Code/Legacy/CryCommon/UnicodeEncoding.h b/Code/Legacy/CryCommon/UnicodeEncoding.h
new file mode 100644
index 0000000000..01ad081f9b
--- /dev/null
+++ b/Code/Legacy/CryCommon/UnicodeEncoding.h
@@ -0,0 +1,766 @@
+/*
+ * 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 : Generic Unicode encoding helpers.
+//
+// Defines encoding and decoding functions used by the higher-level functions.
+// These are used by the various conversion functions in UnicodeFunctions.h and UnicodeIterator.h.
+// Note: You can use these functions manually for low-level functionality, but we don't recommend that.
+// In that case, you probably want to check inside the nested Detail namespace for the elementary bits.
+
+
+#pragma once
+#include "BaseTypes.h" // For uint8, uint16, uint32
+#include "CompileTimeAssert.h" // For COMPILE_TIME_ASSERT macro
+namespace Unicode
+{
+    // Supported encoding/conversion types.
+    enum EEncoding
+    {
+        // UTF-8 encoding, see http://www.unicode.org/resources/utf8.html.
+        // Input and output are supported.
+        // Note: This format maps the entire UCS, where each code-point can take [1, 4] 8-bit code-units.
+        // Note: This is a strict super-set of Latin1/ISO-885901 as well as ASCII.
+        eEncoding_UTF8,
+
+        // UTF-16 encoding, see http://tools.ietf.org/html/rfc2781.
+        // Input and output are supported.
+        // Note: This format maps the entire UCS, where each code-point can take [1, 2] 16-bit code-units.
+        eEncoding_UTF16,
+
+        // UTF-32 encoding, see http://www.unicode.org/reports/tr17/.
+        // Input and output are supported.
+        // Note: This format maps the entire UCS, each code-point is stored in a single 32-bit code-unit.
+        eEncoding_UTF32,
+
+        // ASCII encoding, see http://en.wikipedia.org/wiki/ASCII.
+        // Input and output are supported (any output UCS values out of supported range are mapped to question mark).
+        // Note: Only values [U+0000, U+007F] can be mapped.
+        eEncoding_ASCII,
+
+        // Latin1, aka ISO-8859-1 encoding, see http://en.wikipedia.org/wiki/ISO/IEC_8859-1.
+        // Only input is supported.
+        // Note: This is a strict super-set of ASCII, it additionally maps [U+00A0, U+00FF].
+        eEncoding_Latin1,
+
+        // Windows ANSI codepage 1252, see http://en.wikipedia.org/wiki/Windows-1252.
+        // Only input is supported.
+        // Note: This is a strict super-set of ASCII and Latin1/ISO-8859-1, it maps some code-units from [0x80, 0x9F].
+        eEncoding_Win1252,
+    };
+
+    // Methods of recovery from invalid encoded sequences.
+    enum EErrorRecovery
+    {
+        // No attempt to detect invalid encoding is performed, the input is assumed to be valid.
+        // If the input is not valid, the output is undefined (in debug, this condition will cause an assert to trigger).
+        eErrorRecovery_None,
+
+        // When an invalidly encoded sequence is detected, the sequence is discarded (will not be part of the output).
+        // Typically used for logic/hashing purposes when the input is almost certainly valid.
+        eErrorRecovery_Discard,
+
+        // When an invalidly encoded sequence is detected, the sequence is replaced with the replacement-character (U+FFFD).
+        // Typically used when the output sequence is used for UI display purposes.
+        eErrorRecovery_Replace,
+
+        // When an invalidly encoded sequence is detected, the sequence is replaced with the eEncoding_Latin1 equivalent.
+        // If the sequence is also not valid Latin1 encoded, the sequence is discarded.
+        // Typically used when reading generic text files with 1-byte code-units.
+        // Note: This recovery method can only be used when decoding UTF-8.
+        eErrorRecovery_FallbackLatin1ThenDiscard,
+
+        // When an invalidly encoded sequence is detected, the sequence is replaced with the eEncoding_Win1252 equivalent.
+        // If the sequence is also not valid codepage 1252 encoded, the sequence is discarded.
+        // Typically used when reading text files generated on Windows with 1-byte code-units.
+        // Note: This recovery method can only be used when decoding UTF-8.
+        eErrorRecovery_FallbackWin1252ThenDiscard,
+
+        // When an invalidly encoded sequence is detected, the sequence is replaced with the eEncoding_Latin1 equivalent.
+        // If the sequence is also not valid Latin1 encoded, it is replaced with the replacement-character (U+FFFD).
+        // Typically used when reading generic text files with 1-byte code-units.
+        // Note: This recovery method can only be used when decoding UTF-8.
+        eErrorRecovery_FallbackLatin1ThenReplace,
+
+        // When an invalidly encoded sequence is detected, the sequence is replaced with the eEncoding_Win1252 equivalent.
+        // If the sequence is also not valid codepage 1252 encoded, it is replaced with the replacement-character (U+FFFD).
+        // Typically used when reading text files generated on Windows with 1-byte code-units.
+        // Note: This recovery method can only be used when decoding UTF-8.
+        eErrorRecovery_FallbackWin1252ThenReplace,
+    };
+
+    namespace Detail
+    {
+        // Decode<Encoding, Safe>(state, unit): Decodes a single code-unit of an encoding into an UCS code-point.
+        // When Safe flag is set, encoding errors are detected so a fall-back encoding or other recovery method can be used.
+        // Interpret return value as follows:
+        // <  0x001FFFFF: Decoded codepoint (== return value), call again with next code-unit and clear state.
+        // <  0x80000000: Intermediate state returned, call again with next code-unit and the returned state.
+        // >= 0x80000000: Bad encoding detected, up to 16 bits (UTF-16) or 24 bits (UTF-8, last in lower bits)
+        //                contain previous consumed values (does not happen if Safe == false).
+        template<EEncoding InputEncoding, bool Safe>
+        inline uint32 Decode(uint32 state, uint32 unit);
+
+        // Some constant values used when encoding/decoding.
+        enum
+        {
+            cDecodeShiftRemaining = 26,                               // Where to store the remaining count in the state.
+            cDecodeOneRemaining = 1 << cDecodeShiftRemaining,         // Remaining value of one.
+            cDecodeMaskRemaining = 3 << cDecodeShiftRemaining,        // All possible remaining bits that can be used.
+            cDecodeLeadBit = 1 << 22,                                 // All bits up to and including this one are reserved.
+            cDecodeErrorBit = 1 << 31,                                // Set if an error occurs during decoding.
+            cDecodeOverlongBit = 1 << 30,                             // Set if overlong sequence was used.
+            cDecodeSurrogateBit = 1 << 29,                            // Set if surrogate code-point decoded in UTF-8.
+            cDecodeInvalidBit = 1 << 28,                              // Set if invalid code-point decoded (U+FFFE/FFFF).
+            cDecodeSuccess = 0,                                       // Placeholder to indicate no error occurred.
+            cCodepointMax = 0x10FFFF,                                 // The maximum value of an UCS code-point.
+            cLeadSurrogateFirst = 0xD800,                             // The first valid UTF-16 lead-surrogate value.
+            cLeadSurrogateLast = 0xDBFF,                              // The last valid UTF-16 lead-surrogate value.
+            cTrailSurrogateFirst = 0xDC00,                            // The first valid UTF-16 trail-surrogate value.
+            cTrailSurrogateLast = 0xDFFF,                             // The last valid UTF-16 trail-surrogate value.
+            cReplacementCharacter = 0xFFFD,                           // The default replacement character.
+        };
+
+        // Validate the UTF-8 state of a multi-byte sequence.
+        // The safe decoder of UTF-8 will call this function when a full potential code-point has been decoded.
+        // This function is (at most) called for 50% of the decoded UTF-8 code-units, but likely at much lower frequency.
+        inline uint32 DecodeValidate8(uint32 state)
+        {
+            uint32 errorbits = (state >> 8) | cDecodeErrorBit;
+            state ^= (state & 0x400000) >> 1; // For 3-byte sequences, bit 5 of the lead byte needs to be cleared.
+            const uint32 cp =
+                (state & 0x3F) |
+                ((state & 0x3F00) >> 2) |
+                ((state & 0x3F0000) >> 4) |
+                ((state & 0x07000000) >> 6);
+            if (cp <= cCodepointMax)
+            {
+                if (cp >= cLeadSurrogateFirst && cp <= cTrailSurrogateLast)
+                {
+                    errorbits += cDecodeSurrogateBit; // CESU-8 encoding might have been used.
+                }
+                else
+                {
+                    uint32 minval = 0x80;
+                    minval += (0x00400000 & state) ? 0x800 - 0x80 : 0;
+                    minval += (0x40000000 & state) ? 0x10000 - 0x80 : 0;
+                    if (cp >= minval)
+                    {
+                        if ((cp & 0xFFFFFFFEU) != 0xFFFEU)
+                        {
+                            return cp; // Valid code-point.
+                        }
+                        errorbits += cDecodeInvalidBit; // Invalid character used.
+                    }
+                    errorbits += cDecodeOverlongBit; // Overlong encoding used.
+                }
+            }
+            return errorbits;
+        }
+
+        // Decode UTF-8, unsafe.
+        template<>
+        inline uint32 Decode<eEncoding_UTF8, false>(uint32 state, uint32 unit)
+        {
+            if (state == 0) // First byte.
+            {
+                unit = unit & 0xFF;
+                if (unit < 0xC0)
+                {
+                    return unit;              // Single-unit (ASCII).
+                }
+                uint32 remaining = (unit >> 4) - 0xC;
+                remaining += (remaining == 0);
+                return (unit & 0x1F) + (remaining << cDecodeShiftRemaining); // Lead byte of multi-byte.
+            }
+            state = (state << 6) + (unit & 0x3F) + (state & cDecodeMaskRemaining) - cDecodeOneRemaining; // Apply c-byte.
+            return state & ~cDecodeLeadBit; // Mask off the lead bits of a 4-byte sequence.
+        }
+
+        // Decode UTF-8, safe
+        template<>
+        inline uint32 Decode<eEncoding_UTF8, true>(uint32 state, uint32 unit)
+        {
+            if (unit <= 0xF4) // Discard out-of-range values immediately.
+            {
+                if (state == 0) // First byte.
+                {
+                    if (unit < 0x80)
+                    {
+                        return unit;              // Single-byte.
+                    }
+                    if (unit < 0xC2)
+                    {
+                        return cDecodeErrorBit;              // Invalid continuation byte (or illegal 0xC0/0xC1).
+                    }
+                    uint32 remaining = (unit >> 4) - 0xC;
+                    remaining += (remaining == 0);
+                    return unit + (remaining << cDecodeShiftRemaining); // Multi-byte.
+                }
+                if ((unit & 0xC0) == 0x80)
+                {
+                    const uint32 remaining = (state & cDecodeMaskRemaining) - cDecodeOneRemaining;
+                    state = (state << 8) + unit;
+                    if (remaining != 0)
+                    {
+                        return state | remaining;                 // Intermediate byte of a multi-byte sequence.
+                    }
+                    return DecodeValidate8(state); // Final byte of a multi-byte sequence.
+                }
+            }
+            return cDecodeErrorBit | state;
+        }
+
+        // Decode UTF-16, unsafe.
+        template<>
+        inline uint32 Decode<eEncoding_UTF16, false>(uint32 state, uint32 unit)
+        {
+            const bool bLead = (unit >= cLeadSurrogateFirst) && (unit <= cLeadSurrogateLast);
+            const uint32 initial = unit + (bLead << cDecodeShiftRemaining);
+            const uint32 pair = 0x10000 + ((state & 0x3FF) << 10) + (unit & 0x3FF);
+            return state == 0 ? initial : pair;
+        }
+
+        // Decode UTF-16, safe.
+        template<>
+        inline uint32 Decode<eEncoding_UTF16, true>(uint32 state, uint32 unit)
+        {
+            const bool bTrail = (unit >= cTrailSurrogateFirst) && (unit <= cTrailSurrogateLast);
+            if (state != 0 && !bTrail)
+            {
+                return cDecodeErrorBit + (state & 0xFFFF);                        // Lead surrogate without trail surrogate
+            }
+            uint32 result = Decode<eEncoding_UTF16, false>(state, unit);
+            bool bValid = (result & 0xFFFFFFFEU) != 0xFFFEU;
+            return bValid ? result : result + cDecodeErrorBit + cDecodeInvalidBit;
+        }
+
+        // Decode UTF-32, unsafe.
+        template<>
+        inline uint32 Decode<eEncoding_UTF32, false>([[maybe_unused]] uint32 state, uint32 unit)
+        {
+            return unit;
+        }
+
+        // Decode UTF-32, safe.
+        template<>
+        inline uint32 Decode<eEncoding_UTF32, true>([[maybe_unused]] uint32 state, uint32 unit)
+        {
+            if (unit > cCodepointMax)
+            {
+                return cDecodeErrorBit;
+            }
+            if (unit >= cLeadSurrogateFirst && unit <= cTrailSurrogateLast)
+            {
+                return cDecodeErrorBit | cDecodeSurrogateBit;
+            }
+            if ((unit & 0xFFFEU) == 0xFFFEU)
+            {
+                return cDecodeErrorBit | cDecodeInvalidBit;
+            }
+            return unit;
+        }
+
+        // Decode ASCII, unsafe.
+        template<>
+        inline uint32 Decode<eEncoding_ASCII, false>([[maybe_unused]] uint32 state, uint32 unit)
+        {
+            return unit;
+        }
+
+        // Decode ASCII, safe.
+        template<>
+        inline uint32 Decode<eEncoding_ASCII, true>([[maybe_unused]] uint32 state, uint32 unit)
+        {
+            if (unit > 0x7F)
+            {
+                return cDecodeErrorBit;
+            }
+            return unit;
+        }
+
+        // Decode Latin1, unsafe.
+        template<>
+        inline uint32 Decode<eEncoding_Latin1, false>([[maybe_unused]] uint32 state, uint32 unit)
+        {
+            return unit;
+        }
+
+        // Decode Latin1, safe.
+        template<>
+        inline uint32 Decode<eEncoding_Latin1, true>([[maybe_unused]] uint32 state, uint32 unit)
+        {
+            if ((unit >= 0x80 && unit <= 0x9F) || (unit > 0xFF))
+            {
+                return cDecodeErrorBit;
+            }
+            return unit;
+        }
+
+        // Decode Windows CP-1252, unsafe.
+        template<>
+        inline uint32 Decode<eEncoding_Win1252, false>([[maybe_unused]] uint32 state, uint32 unit)
+        {
+            static const uint16 cp1252[] =
+            {
+                0x20AC, 0x0081, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+                0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008D, 0x017D, 0x008F,
+                0x0090, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+                0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x009D, 0x017E, 0x0178,
+            };
+            return (unit < 0x80 || unit > 0x9F) ? unit : cp1252[unit - 0x80];
+        }
+
+        // Decode Windows CP-1252, safe.
+        template<>
+        inline uint32 Decode<eEncoding_Win1252, true>(uint32 state, uint32 unit)
+        {
+            if (unit > 0xFF)
+            {
+                return cDecodeErrorBit;
+            }
+            uint32 result = Decode<eEncoding_Win1252, false>(state, unit);
+            if (!(unit < 0x80 || unit > 0x9F) && (result == unit))
+            {
+                return cDecodeErrorBit;                                                    // Not defined in codepage 1252.
+            }
+            return result;
+        }
+
+        // SBase<T>:
+        // Utility to apply empty-base-optimization on type T.
+        // Will fall back to a member if T is a reference type.
+        template<typename T, int Tag = 0>
+        struct SBase
+            : T
+        {
+            SBase(T base)
+                : T(base) {}
+            T& GetBase() { return *this; }
+            const T& GetBase() const { return *this; }
+        };
+        template<typename T, int Tag>
+        struct SBase<T&, Tag>
+        {
+            T& base;
+            SBase(T& b)
+                : base(b) {}
+            T& GetBase() { return base; }
+            const T& GetBase() const { return base; }
+        };
+
+        // SDecoder<Encoding, Sink, Recovery>:
+        // Functor to decode UCS code-points from an input range.
+        // Recovery functor will be invoked as a fall-back if decoding fails.
+        // This allows ensuring all the output is valid (even if the input isn't).
+        // Note: The destructor will automatically flush any remaining (erroneous) state, you can also call Finalize().
+        template<EEncoding InputEncoding, typename Sink, typename Recovery = void>
+        struct SDecoder
+            : SBase<Sink, 1>
+            , SBase<Recovery, 2>
+        {
+            uint32 state;
+            SDecoder(Sink sink, Recovery recovery = Recovery())
+                : SBase<Sink, 1>(sink)
+                , SBase<Recovery, 2>(recovery)
+                , state(0) {}
+            SDecoder() { Finalize(); }
+            Recovery& recovery() { return SBase<Recovery, 2>::GetBase(); }
+            Sink& sink() { return SBase<Sink, 1>::GetBase(); }
+            void operator()(uint32 unit)
+            {
+                state = Detail::Decode<InputEncoding, true>(state, unit);
+                if (state <= 0x1FFFFF)
+                {
+                    sink()(state);
+                    state = 0;
+                }
+                else if (state & Detail::cDecodeErrorBit)
+                {
+                    recovery()(sink(), state, unit);
+                    state = 0;
+                }
+            }
+            void Finalize()
+            {
+                if (state)
+                {
+                    recovery()(sink(), state, 0);
+                    state = 0;
+                }
+            }
+        };
+
+        // SDecoder<Encoding, Sink>:
+        // Functor to decode to UCS code-points from an input range.
+        // No attempt to discover or recover from encoding errors is made, can only safely be used with known-valid input.
+        template<EEncoding InputEncoding, typename Sink>
+        struct SDecoder<InputEncoding, Sink, void>
+            : SBase<Sink>
+        {
+            uint32 state;
+            SDecoder(Sink sink)
+                : SBase<Sink>(sink)
+                , state(0) {}
+            Sink& sink() { return SBase<Sink>::GetBase(); }
+            void operator()(uint32 unit)
+            {
+                state = Detail::Decode<InputEncoding, false>(state, unit);
+                if (state <= 0x1FFFFF)
+                {
+                    sink()(state);
+                    state = 0;
+                }
+            }
+            void Finalize() {}
+        };
+
+        // SEncoder<Encoding, Sink>:
+        // Generic Unicode encoder functor.
+        // Encoding must be one an encoding type for which output is supported.
+        // The Sink type must have HintSequence member for UTF-8 and UTF-16 (although it may be a no-op).
+        // In general, you feed operator() with UCS code-points and it will emit code-units.
+        template<EEncoding OutputEncoding, typename Sink>
+        struct SEncoder
+        {
+            static const bool value = false;
+        };
+
+        // SEncoder<Encoding, Sink>:
+        // Specialization of ASCII encoder functor.
+        // Note: Any out-of-range character is mapped to question mark.
+        template<typename Sink>
+        struct SEncoder<eEncoding_ASCII, Sink>
+            : SBase<Sink>
+        {
+            static const bool value = true;
+            typedef uint8 value_type;
+            SEncoder(Sink sink)
+                : SBase<Sink>(sink) {}
+            void operator()(uint32 cp)
+            {
+                cp = cp < 0x80 ? cp : (uint32)'?';
+                SBase<Sink>::GetBase()(value_type(cp));
+            }
+        };
+
+        // SEncoder<Encoding, Sink>:
+        // Specialization of UTF-8 encoder functor.
+        template<typename Sink>
+        struct SEncoder<eEncoding_UTF8, Sink>
+            : SBase<Sink>
+        {
+            static const bool value = true;
+            typedef uint8 value_type;
+            SEncoder(Sink sink)
+                : SBase<Sink>(sink) {}
+            Sink& sink() { return SBase<Sink>::GetBase(); }
+            void operator()(uint32 cp)
+            {
+                if (cp < 0x80)
+                {
+                    // Single byte sequence.
+                    sink()(value_type(cp));
+                }
+                else
+                {
+                    // Expand 21-bit value to 32-bit.
+                    uint32 bits =
+                        (cp & 0x00003F) +
+                        ((cp & 0x000FC0) << 2) +
+                        ((cp & 0x03F000) << 4) +
+                        ((cp & 0x1C0000) << 6);
+
+                    // Type of sequence.
+                    const bool bSeq4 = (cp >= 0x10000);
+                    const bool bSeq3 = (cp >= 0x800);
+
+                    // Mask lead-bytes and continuation-bytes.
+                    uint32 mask = 0xEFE0C080;
+                    mask ^= (bSeq3 << 14);
+                    mask += (bSeq4 ? 0xA00000 : 0);
+                    bits |= mask;
+
+                    // Length of the sequence.
+                    const uint32 length = (uint32)bSeq4 + (uint32)bSeq3 + 1;
+                    sink().HintSequence(length);
+
+                    // Sink the multi-byte sequence.
+                    if (bSeq4)
+                    {
+                        sink()(value_type(bits >> 24));
+                    }
+                    if (bSeq3)
+                    {
+                        sink()(value_type(bits >> 16));
+                    }
+                    sink()(value_type(bits >> 8));
+                    sink()(value_type(bits));
+                }
+            }
+        };
+
+        // SEncoder<Encoding, Sink>:
+        // Specialization of UTF-16 encoder functor.
+        template<typename Sink>
+        struct SEncoder<eEncoding_UTF16, Sink>
+            : SBase<Sink>
+        {
+            static const bool value = true;
+            typedef uint16 value_type;
+            SEncoder(Sink sink)
+                : SBase<Sink>(sink) {}
+            Sink& sink() { return SBase<Sink>::GetBase(); }
+            void operator()(uint32 cp)
+            {
+                if (cp < 0x10000)
+                {
+                    // Single unit
+                    sink()(value_type(cp));
+                }
+                else
+                {
+                    // We will generate two-element sequence
+                    sink().HintSequence(2);
+
+                    // Surrogate pair
+                    cp -= 0x10000;
+                    uint32 lead = ((cp >> 10) & 0x3FF) + Detail::cLeadSurrogateFirst;
+                    uint32 trail = (cp & 0x3FF) + Detail::cTrailSurrogateFirst;
+                    sink()(value_type(lead));
+                    sink()(value_type(trail));
+                }
+            }
+        };
+
+        // SEncoder<Encoding, Sink>:
+        // Specialization of UTF-32 encoder functor.
+        // Note: This is a no-op, but we want to be able to express UTF-32 just like the other encodings.
+        template<typename Sink>
+        struct SEncoder<eEncoding_UTF32, Sink>
+            : SBase<Sink>
+        {
+            static const bool value = true;
+            typedef uint32 value_type;
+            SEncoder(Sink sink)
+                : SBase<Sink>(sink) {}
+            void operator()(uint32 cp)
+            {
+                SBase<Sink>::GetBase()(value_type(cp));
+            }
+        };
+
+        // SDecoder<Encoding, SEncoder<Encoding>, void>:
+        // Specialization for unsafe no-op trans-coding.
+        // Since the conversion is a no-op, no need to keep any state or do any computation.
+        // Note: For a decoding with a fallback, this is not possible since we can't guarantee the input is valid.
+        template<EEncoding SameEncoding, typename Sink>
+        struct SDecoder<SameEncoding, SEncoder<SameEncoding, Sink>, void>
+        {
+            Sink sink;
+            SDecoder(Sink s)
+                : sink(s) {}
+            void operator()(uint32 unit)
+            {
+                sink(unit);
+            }
+            void Finalize() {}
+        };
+
+        // SRecoveryDiscard<Sink>:
+        // Recovery handler that, on encoding error, discards the offending sequence.
+        template<typename Sink>
+        struct SRecoveryDiscard
+        {
+            SRecoveryDiscard() {}
+            void operator()([[maybe_unused]] Sink& sink, [[maybe_unused]] uint32 error, [[maybe_unused]] uint32 unit) {}
+        };
+
+        // SRecoveryReplace<Sink>:
+        // Recovery handler that, on encoding error, replaces the sequence with replacement-character (U+FFFD).
+        // Note: This implementation matches a whole invalid sequence, it could be changed to emit for every code-unit.
+        template<typename Sink>
+        struct SRecoveryReplace
+        {
+            SRecoveryReplace() {}
+            void operator()(Sink& sink, uint32 error, uint32 unit) { sink(cReplacementCharacter); }
+        };
+
+        // SRecoveryFallback<Sink>:
+        // Recovery handler that, on encoding error, falls back to another encoding.
+        // The fallback encoding must be stateless (ie: ASCII, Latin1 or Win1252).
+        // This type assumes an 8-bit primary encoding since the only viable fallback encodings are 8-bit.
+        template<typename Sink, EEncoding FallbackEncoding, typename NextFallback>
+        struct SRecoveryFallback
+            : NextFallback
+        {
+            SRecoveryFallback()
+                : NextFallback() {}
+            void operator()(Sink& sink, uint32 error, uint32 unit)
+            {
+                SDecoder<FallbackEncoding, Sink&, NextFallback&> fallback(sink, *static_cast<NextFallback*>(this));
+                uint8 byte1(error >> 16);
+                uint8 byte2(error >> 8);
+                uint8 byte3(error);
+                uint8 byte4(unit);
+                if (byte1)
+                {
+                    fallback(byte1);
+                }
+                if (byte1 | byte2)
+                {
+                    fallback(byte2);
+                }
+                if (byte1 | byte2 | byte3)
+                {
+                    fallback(byte3);
+                }
+                fallback(byte4);
+            }
+        };
+
+        // SRecoveryFallbackHelper<Sink, RecoveryMethod>:
+        // Helper to pick a SRecoveryFallback instantiation based on RecoveryMethod.
+        template<EEncoding OutputEncoding, typename Sink, EErrorRecovery RecoveryMethod>
+        struct SRecoveryFallbackHelper
+        {
+            // A compilation error here means RecoveryMethod value was unexpected here
+            COMPILE_TIME_ASSERT(
+                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenDiscard ||
+                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenReplace ||
+                RecoveryMethod == eErrorRecovery_FallbackWin1252ThenDiscard ||
+                RecoveryMethod == eErrorRecovery_FallbackWin1252ThenReplace);
+            typedef SEncoder<OutputEncoding, Sink> SinkType;
+            static const EEncoding FallbackEncoding =
+                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenDiscard ||
+                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenReplace
+                ? eEncoding_Latin1 : eEncoding_Win1252;
+            template<typename Dummy, bool WithDiscard>
+            struct Pick
+            {
+                typedef SRecoveryDiscard<SinkType> type;
+            };
+            template<typename Dummy>
+            struct Pick<Dummy, false>
+            {
+                typedef SRecoveryReplace<SinkType> type;
+            };
+            typedef typename Pick<Sink,
+                RecoveryMethod == eErrorRecovery_FallbackLatin1ThenDiscard ||
+                RecoveryMethod == eErrorRecovery_FallbackWin1252ThenDiscard>::type NextFallback;
+            typedef SRecoveryFallback<SinkType, FallbackEncoding, NextFallback> RecoveryType;
+            typedef SDecoder<eEncoding_UTF8, SinkType, RecoveryType> FullType;
+        };
+
+        // STranscoderSelect<InputEncoding, OutputEncoding, Sink, RecoveryMethod>:
+        // Derives a chained decoder/encoder pair that performs code-unit -> code-unit transform.
+        // The RecoveryMethod template parameter determines the behavior during encoding.
+        // This is the basic way to perform trans-coding, and is the type instantiated by the higher-level functions.
+        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename Sink, EErrorRecovery RecoveryMethod>
+        struct STranscoderSelect;
+        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename Sink>
+        struct STranscoderSelect<InputEncoding, OutputEncoding, Sink, eErrorRecovery_None>
+            : SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, void>
+        {
+            typedef SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, void> TranscoderType;
+            STranscoderSelect(Sink sink)
+                : TranscoderType(sink) {}
+        };
+        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename Sink>
+        struct STranscoderSelect<InputEncoding, OutputEncoding, Sink, eErrorRecovery_Discard>
+            : SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, SRecoveryDiscard<SEncoder<OutputEncoding, Sink> > >
+        {
+            typedef SRecoveryDiscard<SEncoder<OutputEncoding, Sink> > RecoveryType;
+            typedef SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, RecoveryType> TranscoderType;
+            STranscoderSelect(Sink sink)
+                : TranscoderType(sink) {}
+        };
+        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename Sink>
+        struct STranscoderSelect<InputEncoding, OutputEncoding, Sink, eErrorRecovery_Replace>
+            : SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, SRecoveryReplace<SEncoder<OutputEncoding, Sink> > >
+        {
+            typedef SRecoveryReplace<SEncoder<OutputEncoding, Sink> > RecoveryType;
+            typedef SDecoder<InputEncoding, SEncoder<OutputEncoding, Sink>, RecoveryType> TranscoderType;
+            STranscoderSelect(Sink sink)
+                : TranscoderType(sink) {}
+        };
+        template<EEncoding OutputEncoding, typename Sink>
+        struct STranscoderSelect<eEncoding_UTF8, OutputEncoding, Sink, eErrorRecovery_FallbackLatin1ThenDiscard>
+            : SRecoveryFallbackHelper<OutputEncoding, Sink, eErrorRecovery_FallbackLatin1ThenDiscard>::FullType
+        {
+            static const EErrorRecovery RecoveryMethod = eErrorRecovery_FallbackLatin1ThenDiscard;
+            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::RecoveryType RecoveryType;
+            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::FullType TranscoderType;
+            STranscoderSelect(Sink sink)
+                : TranscoderType(sink) {}
+        };
+        template<EEncoding OutputEncoding, typename Sink>
+        struct STranscoderSelect<eEncoding_UTF8, OutputEncoding, Sink, eErrorRecovery_FallbackLatin1ThenReplace>
+            : SRecoveryFallbackHelper<OutputEncoding, Sink, eErrorRecovery_FallbackLatin1ThenReplace>::FullType
+        {
+            static const EErrorRecovery RecoveryMethod = eErrorRecovery_FallbackLatin1ThenReplace;
+            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::RecoveryType RecoveryType;
+            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::FullType TranscoderType;
+            STranscoderSelect(Sink sink)
+                : TranscoderType(sink) {}
+        };
+        template<EEncoding OutputEncoding, typename Sink>
+        struct STranscoderSelect<eEncoding_UTF8, OutputEncoding, Sink, eErrorRecovery_FallbackWin1252ThenDiscard>
+            : SRecoveryFallbackHelper<OutputEncoding, Sink, eErrorRecovery_FallbackWin1252ThenDiscard>::FullType
+        {
+            static const EErrorRecovery RecoveryMethod = eErrorRecovery_FallbackWin1252ThenDiscard;
+            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::RecoveryType RecoveryType;
+            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::FullType TranscoderType;
+            STranscoderSelect(Sink sink)
+                : TranscoderType(sink) {}
+        };
+        template<EEncoding OutputEncoding, typename Sink>
+        struct STranscoderSelect<eEncoding_UTF8, OutputEncoding, Sink, eErrorRecovery_FallbackWin1252ThenReplace>
+            : SRecoveryFallbackHelper<OutputEncoding, Sink, eErrorRecovery_FallbackWin1252ThenReplace>::FullType
+        {
+            static const EErrorRecovery RecoveryMethod = eErrorRecovery_FallbackWin1252ThenReplace;
+            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::RecoveryType RecoveryType;
+            typedef typename SRecoveryFallbackHelper<OutputEncoding, Sink, RecoveryMethod>::FullType TranscoderType;
+            STranscoderSelect(Sink sink)
+                : TranscoderType(sink) {}
+        };
+
+        // SIsSafeEncoding<R>:
+        // Check if the given recovery mode is safe.
+        // This is used for SFINAE checks in higher-level functions.
+        template<EErrorRecovery R>
+        struct SIsSafeEncoding
+        {
+            static const bool value =
+                R == eErrorRecovery_Discard ||
+                R == eErrorRecovery_Replace ||
+                R == eErrorRecovery_FallbackLatin1ThenDiscard ||
+                R == eErrorRecovery_FallbackLatin1ThenReplace ||
+                R == eErrorRecovery_FallbackWin1252ThenDiscard ||
+                R == eErrorRecovery_FallbackWin1252ThenReplace;
+        };
+
+        // SIsCopyableEncoding<I, O>:
+        // Check if data in one encoding can be copied directly to another encoding.
+        // This is the basis for block-copy and string-assign optimizations in un-safe conversion functions.
+        // Note: There are more valid combinations, they are left out since those can't occur with the output encodings supported.
+        // Note: Only used for un-safe functions since it doesn't account for potential invalid sequences (they would be copied over).
+        template<EEncoding InputEncoding, EEncoding OutputEncoding>
+        struct SIsCopyableEncoding
+        {
+            static const bool value =
+                InputEncoding == eEncoding_ASCII || // ASCII and Latin1 values don't change in any encoding.
+                (InputEncoding == eEncoding_Latin1 && OutputEncoding != eEncoding_ASCII); // Except Latin1 -> ASCII is lossy.
+        };
+        template<EEncoding SameEncoding>
+        struct SIsCopyableEncoding<SameEncoding, SameEncoding>
+        {
+            static const bool value = true; // If the input and output encodings are the same, then it's copyable.
+        };
+    }
+}
diff --git a/Code/Legacy/CryCommon/UnicodeFunctions.h b/Code/Legacy/CryCommon/UnicodeFunctions.h
new file mode 100644
index 0000000000..e0c148ea48
--- /dev/null
+++ b/Code/Legacy/CryCommon/UnicodeFunctions.h
@@ -0,0 +1,1264 @@
+/*
+ * 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
+ *
+ */
+
+
+// Generic Unicode string functions.
+//
+// Implements the following functions:
+// Analyze: Reports all information on the input string, (length for all encodings, validity- and non-ASCII flags).
+// Validate: Checks if the input string is valid encoded.
+// Length: Reports the encoded length of some known-valid input, as-if it was encoded in the given output encoding.
+// LengthSafe: Reports the encoded length of some input, as-if it was encoded in the given output encoding/recovery.
+// Convert: Converts input from a known-valid string type/encoding to another string type/encoding.
+// ConvertSafe: Converts and recovers encoding errors from one string type/encoding to another string type/encoding.
+// Append: Appends input from a known-valid string type/encoding to another string type/encoding.
+// AppendSafe: Appends and recovers encoding errors from one string type/encoding to another string type/encoding.
+//
+// Note: Ideally the safe functions should be used only once when accepting input from the user or from a file.
+// Afterwards, the content is known-safe and the unsafe functions can be used for optimal performance.
+// Using ConvertSafe once with a reasonable fall-back (depending on the where the input is from) should be the goal.
+//
+// Each function has several overloads:
+// - One variant to handle a string object / buffer / pointer (1 arg), and one to handle iterators (2 args).
+// - One variant with automatic encoding (picks UTF encoding depending on character size), and one for specific encoding.
+// - One variant that returns a new string, and one that takes an existing string to overwrite (Convert(Safe) only).
+// Each function takes one default argument that employs SFINAE to pick the correct overload depending on the arguments.
+
+
+#pragma once
+#include "UnicodeBinding.h"
+namespace Unicode
+{
+    // Results of analysis of an input range of code-units (in any encoding).
+    // This is returned by calling Analyze() function.
+    struct SAnalysisResult
+    {
+        // The type to use for counting units.
+        // Can be changed to uint64_t for dealing with 4GB+ of string data.
+        typedef uint32 size_type;
+
+        size_type inputUnits;     // The number of input units analyzed.
+        size_type outputUnits8;   // The number of output units when encoded with UTF-8.
+        size_type outputUnits16;  // The number of output units when encoded with UTF-16.
+        size_type outputUnits32;  // The number of output units when encoded with UTF-32 (aka number of UCS code-points).
+        size_type cpNonAscii;     // The number of non-ASCII UCS code-points encountered.
+        size_type cpInvalid;      // The number of invalid UCS code-point encountered (or 0xFFFFFFFF if not available).
+
+        // Default constructor, initialize everything to zero.
+        SAnalysisResult()
+            : inputUnits(0)
+            , outputUnits8(0)
+            , outputUnits16(0)
+            , outputUnits32(0)
+            , cpInvalid(0)
+            , cpNonAscii(0) {}
+
+        // Check if the input range was empty.
+        bool IsEmpty() const { return inputUnits == 0; }
+
+        // Check if the input range only contained ASCII characters.
+        bool IsAscii() const { return cpNonAscii == 0; }
+
+        // Check if the input range was valid (has no encoding errors).
+        // Note: This returns false if an unsafe decoder was used for analysis.
+        bool IsValid() const { return cpInvalid == 0; }
+
+        // Get the length of the input range, in source code-units.
+        size_type LengthInSourceUnits() const { return inputUnits; }
+
+        // Get the length of the input range, in UCS code-points.
+        size_type LengthInUCS() const { return outputUnits32; }
+
+        // Get the length of the input range when encoded with the given encoding, in code-units.
+        // Note: If the encoding is not supported for output, the function returns 0.
+        size_type LengthInEncodingUnits(EEncoding encoding) const
+        {
+            switch (encoding)
+            {
+            case eEncoding_ASCII:
+            case eEncoding_UTF32:
+                return outputUnits32;
+            case eEncoding_UTF16:
+                return outputUnits16;
+            case eEncoding_UTF8:
+                return outputUnits8;
+            default:
+                return 0;
+            }
+        }
+
+        // Get the length of the input range when encoded with the given encoding, in bytes.
+        // Note: If the encoding is not supported for output, the function returns 0.
+        size_type LengthInEncodingBytes(EEncoding encoding) const
+        {
+            size_type units = LengthInEncodingUnits(encoding);
+            switch (encoding)
+            {
+            case eEncoding_UTF32:
+                return units << 2;
+            case eEncoding_UTF16:
+                return units << 1;
+            default:
+                return units;
+            }
+        }
+    };
+
+    namespace Detail
+    {
+        // SDummySink:
+        // A sink implementation that does nothing.
+        struct SDummySink
+        {
+            void operator()([[maybe_unused]] uint32 unit) {}
+            void HintSequence([[maybe_unused]] uint32 length) {}
+        };
+
+        // SCountingSink:
+        // A sink that counts the number of units of output.
+        struct SCountingSink
+        {
+            size_t result;
+
+            SCountingSink()
+                : result(0) {}
+            void operator()([[maybe_unused]] uint32 unit) { ++result; }
+            void HintSequence([[maybe_unused]] uint32 length) {}
+        };
+
+        // SAnalysisSink:
+        // A sink that updates analysis statistics.
+        struct SAnalysisSink
+        {
+            SAnalysisResult& result;
+
+            SAnalysisSink(SAnalysisResult& _result)
+                : result(_result) {}
+            void operator()(uint32 cp)
+            {
+                const bool isCat2 = cp >= 0x80;
+                const bool isCat3 = cp >= 0x800;
+                const bool isCat4 = cp >= 0x10000;
+                result.outputUnits32 += 1;
+                result.outputUnits16 += (1 + isCat4);
+                result.outputUnits8 += (1 + isCat4 + isCat3 + isCat2);
+                result.cpNonAscii += isCat2;
+            }
+            void HintSequence([[maybe_unused]] uint32 length) {}
+        };
+
+        // SAnalysisRecovery:
+        // A recovery helper for analysis that counts invalid sequences.
+        struct SAnalysisRecovery
+        {
+            SAnalysisRecovery() {}
+            void operator()(SAnalysisSink& sink, [[maybe_unused]] uint32 error, [[maybe_unused]] uint32 unit)
+            {
+                sink.result.cpInvalid += 1;
+            }
+        };
+
+        // SValidationRecovery:
+        // A recovery helper for validation, it tracks if there is any invalid sequence.
+        struct SValidationRecovery
+        {
+            bool isValid;
+
+            SValidationRecovery()
+                : isValid(true) {}
+            void operator()([[maybe_unused]] SDummySink& sink, [[maybe_unused]] uint32 error, [[maybe_unused]] uint32 unit)
+            {
+                isValid = false;
+            }
+        };
+
+        // SAnalyzer<InputEncoding>:
+        // Helper to perform analysis, counts the input for a given encoding.
+        template<EEncoding InputEncoding>
+        struct SAnalyzer
+        {
+            SDecoder<InputEncoding, SAnalysisSink, SAnalysisRecovery> decoder;
+
+            SAnalyzer(SAnalysisResult& result)
+                : decoder(result) {}
+            void operator()(uint32 item)
+            {
+                decoder.sink().result.inputUnits += 1;
+                decoder(item);
+            }
+        };
+
+        // Analyze<InputEncoding>(target, source):
+        // Analyze string and store analysis result.
+        // This is the generic function called by other Analyze overloads.
+        template<EEncoding InputEncoding, typename InputStringType>
+        inline void Analyze(SAnalysisResult& target, const InputStringType& source)
+        {
+            // Bind methods.
+            const EBind bindMethod = SBindObject<InputStringType, false>::value;
+            integral_constant<EBind, bindMethod> tag;
+
+            // Analyze using helper.
+            SAnalyzer<InputEncoding> analyzer(target);
+            Feed(source, analyzer, tag);
+        }
+
+        // Validate<InputEncoding>(source):
+        // Tests that the string is valid encoding.
+        // This is the generic function called by other Validate overloads.
+        template<EEncoding InputEncoding, typename InputStringType>
+        inline bool Validate(const InputStringType& source)
+        {
+            // Bind methods.
+            const EBind bindMethod = SBindObject<InputStringType, false>::value;
+            integral_constant<EBind, bindMethod> tag;
+
+            // Validate using helper.
+            SDummySink sink;
+            SDecoder<InputEncoding, SDummySink, SValidationRecovery> validator(sink);
+            Feed(source, validator, tag);
+            return validator.recovery().isValid;
+        }
+
+        // Length<InputEncoding, OutputEncoding>(str):
+        // Find length of a string (in code-units) after trans-coding from InputEncoding to OutputEncoding.
+        // This is the generic function called by the other Length overloads.
+        template<EEncoding InputEncoding, EEncoding OutputEncoding, typename InputStringType>
+        inline size_t Length(const InputStringType& source)
+        {
+            // If this assert hits, consider using LengthSafe.
+            assert((Detail::Validate<InputEncoding, InputStringType>(source)) && "Length was used with non-safe input");
+
+            // Bind methods.
+            const EBind bindMethod = SBindObject<InputStringType, false>::value;
+            integral_constant<EBind, bindMethod> tag;
+
+            // All copyable encodings have the property that the number of input encoding units equals the output units.
+            // In addition, this also holds for UTF-32 (always 1) -> ASCII (always 1), even though it's lossy.
+            const bool isCopyable = SIsCopyableEncoding<InputEncoding, OutputEncoding>::value;
+            const bool isCountable = isCopyable || (InputEncoding == eEncoding_UTF32 && OutputEncoding == eEncoding_ASCII);
+
+            if (isCountable)
+            {
+                // Optimization: The number of input units is equal to the number of output units.
+                return EncodedLength(source, tag);
+            }
+            else
+            {
+                // We need to perform the conversion.
+                SCountingSink sink;
+                STranscoderSelect<InputEncoding, OutputEncoding, SCountingSink&, eErrorRecovery_None> transcoder(sink);
+                Feed(source, transcoder, tag);
+                return sink.result;
+            }
+        }
+
+        // LengthSafe<InputEncoding, OutputEncoding, Recovery>(str):
+        // Find length of a string (in code-units) after trans-coding from InputEncoding to OutputEncoding.
+        // Note: The Recovery type used during conversion may influence the result, so this needs to match if you use the length information.
+        // This is the generic function called by the other LengthSafe overloads.
+        template<EEncoding InputEncoding, EEncoding OutputEncoding, EErrorRecovery Recovery, typename InputStringType>
+        inline size_t LengthSafe(const InputStringType& source)
+        {
+            // SRequire a safe recovery method.
+            COMPILE_TIME_ASSERT(SIsSafeEncoding<Recovery>::value);
+
+            // Bind methods.
+            const EBind bindMethod = SBindObject<InputStringType, false>::value;
+            integral_constant<EBind, bindMethod> tag;
+
+            // We can't optimize here, since we cannot assume the input is validly encoded
+            SCountingSink sink;
+            STranscoderSelect<InputEncoding, OutputEncoding, SCountingSink&, Recovery> transcoder(sink);
+            Feed(source, transcoder, tag);
+            return sink.result;
+        }
+
+        // SBlockCopy<Enable, SinkType, Append, OutputMethod, InputStringType, OutputStringType>:
+        // Helper for block-copying entire string at once (as an optimization)
+        // This optimization will effectively try to memcpy or assign the whole string at once.
+        // Note: We need to do some partial specialization here to find out if the optimization is valid, so we can't use a function in C++98.
+        template<bool Enable, typename SinkType, bool Append, EBind OutputMethod, typename InputStringType, typename OutputStringType>
+        struct SBlockCopy
+        {
+            static const EBind bindMethod = SBindObject<InputStringType, false>::value;
+            typedef integral_constant<EBind, bindMethod> TagType;
+            size_t operator()(OutputStringType& target, const InputStringType& source)
+            {
+                // Optimization: Use block copying for these types.
+                TagType tag;
+                const size_t length = EncodedLength(source, tag);
+                SinkType sink(target, length);
+                if (sink.CanWrite())
+                {
+                    const void* const dataPtr = EncodedPointer(source, tag);
+                    sink(dataPtr, length);
+                }
+                return length;
+            }
+        };
+
+        // SBlockCopy<Enable, SinkType, Append, OutputMethod, InputStringType, OutputStringType>:
+        // Specialization that will use direct string assignment.
+        // Note: This optimization is not selected when appending, this could be a future optimization if this is common.
+        // Reason for this is that the += operator is not present on all supported types (ie, std::vector)
+        template<typename SinkType, typename SameStringType>
+        struct SBlockCopy<true, SinkType, false, eBind_Data, SameStringType, SameStringType>
+        {
+            size_t operator()(SameStringType& target, const SameStringType& source)
+            {
+                // Optimization: Use copy assignment.
+                target = source;
+                return source.size();
+            }
+        };
+
+        // SBlockCopy<Enable, SinkType, Append, OutputMethod, InputStringType, OutputStringType>:
+        // Fall-back specialization for Enable == false.
+        // Note: This specialization has to exist for the linker, but should never be called (and optimized away).
+        template<typename SinkType, bool Append, EBind OutputMethod, typename InputStringType, typename OutputStringType>
+        struct SBlockCopy<false, SinkType, Append, OutputMethod, InputStringType, OutputStringType>
+        {
+            size_t operator()([[maybe_unused]] OutputStringType& target, [[maybe_unused]] const InputStringType& source)
+            {
+                assert(false && "Should never be called");
+                return 0;
+            }
+        };
+
+        // Convert<InputEncoding, OutputEncoding, Append>(target, source):
+        // Trans-code a string from InputEncoding to OutputEncoding.
+        // This is the generic function that is called by Convert and Append overloads.
+        // Returns the number of code-units required for full output (excluding any terminators)
+        template<EEncoding InputEncoding, EEncoding OutputEncoding, bool Append, typename InputStringType, typename OutputStringType>
+        inline size_t Convert(OutputStringType& target, const InputStringType& source)
+        {
+            // If this assert hits, consider using ConvertSafe.
+            assert((Detail::Validate<InputEncoding, InputStringType>(source)) && "Convert was used with non-safe input");
+
+            // Bind methods.
+            const EBind inputBindMethod = SBindObject<InputStringType, false>::value;
+            const EBind outputBindMethod = SBindOutput<OutputStringType, false>::value;
+            integral_constant<EBind, inputBindMethod> tag;
+            typedef SWriteSink<OutputStringType, Append, outputBindMethod> SinkType;
+
+            // Check if we can optimize this.
+            const bool isCopyable = SIsCopyableEncoding<InputEncoding, OutputEncoding>::value;
+            const bool isBlocks = SIsBlockCopyable<SBindObject<InputStringType, false>, SBindOutput<OutputStringType, false> >::value;
+            const bool useBlockCopy = isCopyable && isBlocks;
+            size_t length;
+            if (useBlockCopy)
+            {
+                // Use optimized path.
+                SBlockCopy<useBlockCopy, SinkType, Append, outputBindMethod, InputStringType, OutputStringType> blockCopy;
+                length = blockCopy(target, source);
+            }
+            else
+            {
+                // We need to perform the conversion code-unit by code-unit.
+                length = Detail::Length<InputEncoding, OutputEncoding, InputStringType>(source);
+                SinkType sink(target, length);
+                if (sink.CanWrite())
+                {
+                    STranscoderSelect<InputEncoding, OutputEncoding, SinkType&, eErrorRecovery_None> transcoder(sink);
+                    Feed(source, transcoder, tag);
+                }
+            }
+            return length;
+        }
+
+        // ConvertSafe<InputEncoding, OutputEncoding, Append, Recovery>(target, source):
+        // Safely trans-code a string from InputEncoding to OutputEncoding using the specified Recovery to handle encoding errors.
+        // This is the generic function called by ConvertSafe and AppendSafe overloads.
+        template<EEncoding InputEncoding, EEncoding OutputEncoding, bool Append, EErrorRecovery Recovery, typename InputStringType, typename OutputStringType>
+        inline size_t ConvertSafe(OutputStringType& target, const InputStringType& source)
+        {
+            // SRequire a safe recovery method.
+            COMPILE_TIME_ASSERT(SIsSafeEncoding<Recovery>::value);
+
+            // Bind methods.
+            const EBind inputBindMethod = SBindObject<InputStringType, false>::value;
+            const EBind outputBindMethod = SBindOutput<OutputStringType, false>::value;
+            integral_constant<EBind, inputBindMethod> tag;
+            typedef SWriteSink<OutputStringType, Append, outputBindMethod> SinkType;
+
+            // We can't optimize with block-copy here, since we cannot assume the input is validly encoded.
+            const size_t length = Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(source);
+            SinkType sink(target, length);
+            if (sink.CanWrite())
+            {
+                STranscoderSelect<InputEncoding, OutputEncoding, SinkType&, Recovery> transcoder(sink);
+                Feed(source, transcoder, tag);
+            }
+            return length;
+        }
+
+        // SReqAutoObj<T>:
+        // Require that T is usable as input object, with automatic encoding.
+        // This is used as a SFINAE argument for overload resolution of the main functions.
+        template<typename T, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
+        struct SReqAutoObj
+            : SRequire<
+                SBindObject<T, true>::value != eBind_Impossible&&
+                SEncoder<E, SDummySink>::value&&
+                SIsSafeEncoding<R>::value
+                > {};
+
+        // SReqAutoIts<T>:
+        // Require that T is usable as input iterator, with automatic encoding.
+        // This is used as a SFINAE argument for overload resolution of the main functions.
+        template<typename T, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
+        struct SReqAutoIts
+            : SRequire<
+                SBindIterator<T, true>::value != eBind_Impossible&&
+                SEncoder<E, SDummySink>::value&&
+                SIsSafeEncoding<R>::value
+                > {};
+
+        // SReqAnyObj<T>:
+        // Require that T is usable as input object, with user-specified encoding.
+        // This is used as a SFINAE argument for overload resolution of the main functions.
+        template<typename T, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
+        struct SReqAnyObj
+            : SRequire<
+                SBindObject<T, false>::value != eBind_Impossible&&
+                SEncoder<E, SDummySink>::value&&
+                SIsSafeEncoding<R>::value
+                > {};
+
+        // SReqAnyIts<T>:
+        // Require that T is usable as input iterator, with user-specified encoding.
+        // This is used as a SFINAE argument for overload resolution of the main functions.
+        template<typename T, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
+        struct SReqAnyIts
+            : SRequire<
+                SBindIterator<T, false>::value != eBind_Impossible&&
+                SEncoder<E, SDummySink>::value&&
+                SIsSafeEncoding<R>::value
+                > {};
+
+        // SReqAutoObjOut<I, O>:
+        // Require that I is usable as input object, and O as output object, with automatic encoding.
+        // This is used as a SFINAE argument for overload resolution of the main functions.
+        template<typename I, typename O, bool S, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
+        struct SReqAutoObjOut
+            : SRequire<
+                SBindObject<I, true>::value != eBind_Impossible&&
+                SBindOutput<typename conditional<S, SPackedBuffer<O>, O>::type, true>::value != eBind_Impossible&&
+                SEncoder<E, SDummySink>::value&&
+                SIsSafeEncoding<R>::value
+                > {};
+
+        // SReqAutoItsOut<I, O>:
+        // Require that I is usable as input iterator, and O as output object, with automatic encoding.
+        // This is used as a SFINAE argument for overload resolution of the main functions.
+        template<typename I, typename O, bool S, EEncoding E = eEncoding_UTF8, EErrorRecovery R = eErrorRecovery_Discard>
+        struct SReqAutoItsOut
+            : SRequire<
+                SBindIterator<I, true>::value != eBind_Impossible&&
+                SBindOutput<typename conditional<S, SPackedBuffer<O>, O>::type, true>::value != eBind_Impossible&&
+                SEncoder<E, SDummySink>::value&&
+                SIsSafeEncoding<R>::value
+                > {};
+
+        // SReqAnyObjOut<I, O>:
+        // Require that I is usable as input object, and O as output object, with user-specified encoding.
+        // This is used as a SFINAE argument for overload resolution of the main functions.
+        template<typename I, typename O, bool S, EEncoding E, EErrorRecovery R = eErrorRecovery_Discard>
+        struct SReqAnyObjOut
+            : SRequire<
+                SBindObject<I, false>::value != eBind_Impossible&&
+                SBindOutput<typename conditional<S, SPackedBuffer<O>, O>::type, false>::value != eBind_Impossible&&
+                SEncoder<E, SDummySink>::value&&
+                SIsSafeEncoding<R>::value
+                > {};
+
+        // SReqAnyItsOut<I, O>:
+        // Require that I is usable as input object, and O as output object, with user-specified encoding.
+        // This is used as a SFINAE argument for overload resolution of the main functions.
+        template<typename I, typename O, bool S, EEncoding E, EErrorRecovery R = eErrorRecovery_Discard>
+        struct SReqAnyItsOut
+            : SRequire<
+                SBindIterator<I, false>::value != eBind_Impossible&&
+                SBindOutput<typename conditional<S, SPackedBuffer<O>, O>::type, false>::value != eBind_Impossible&&
+                SEncoder<E, SDummySink>::value&&
+                SIsSafeEncoding<R>::value
+                > {};
+    }
+
+    // SAnalysisResult Analyze<InputEncoding>(str):
+    // Analyze the given string with the given encoding, providing information on validity and encoding length.
+    template<EEncoding InputEncoding, typename InputStringType>
+    inline SAnalysisResult Analyze(const InputStringType& str,
+        typename Detail::SReqAnyObj<InputStringType>::type* = 0)
+    {
+        SAnalysisResult result;
+        Detail::Analyze<InputEncoding, InputStringType>(result, str);
+        return result;
+    }
+
+    // SAnalysisResult Analyze(str):
+    // Analyze the (assumed) Unicode string input, providing information on validity and encoding length.
+    // The Unicode encoding is picked automatically depending on the input type.
+    template<typename InputStringType>
+    inline SAnalysisResult Analyze(const InputStringType& str,
+        typename Detail::SReqAutoObj<InputStringType>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        SAnalysisResult result;
+        Detail::Analyze<InputEncoding, InputStringType>(result, str);
+        return result;
+    }
+
+    // SAnalysisResult Analyze<InputEncoding>(begin, end):
+    // Analyze the given range with the given encoding, providing information on validity and encoding length.
+    template<EEncoding InputEncoding, typename InputIteratorType>
+    inline SAnalysisResult Analyze(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyIts<InputIteratorType>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        SAnalysisResult result;
+        Detail::Analyze<InputEncoding, InputStringType>(result, its);
+        return result;
+    }
+
+    // SAnalysisResult Analyze(begin, end):
+    // Analyze the given (assumed) Unicode range, providing information on validity and encoding length.
+    // The Unicode encoding is picked automatically depending on the input type.
+    template<typename InputIteratorType>
+    inline SAnalysisResult Analyze(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoIts<InputIteratorType>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        SAnalysisResult result;
+        Detail::Analyze<InputEncoding, InputStringType>(result, its);
+        return result;
+    }
+
+    // bool Validate<InputEncoding>(str):
+    // Checks if the given string is valid in the given encoding.
+    template<EEncoding InputEncoding, typename InputStringType>
+    inline bool Validate(const InputStringType& str,
+        typename Detail::SReqAnyObj<InputStringType>::type* = 0)
+    {
+        return Detail::Validate<InputEncoding, InputStringType>(str);
+    }
+
+    // bool Validate(str):
+    // Checks if the given string is a valid Unicode string.
+    // The Unicode encoding is picked automatically depending on the input type.
+    template<typename InputStringType>
+    inline bool Validate(const InputStringType& str,
+        typename Detail::SReqAutoObj<InputStringType>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        return Detail::Validate<InputEncoding, InputStringType>(str);
+    }
+
+    // bool Validate<InputEncoding>(begin, end):
+    // Checks if the given range is valid in the given encoding.
+    template<EEncoding InputEncoding, typename InputIteratorType>
+    inline bool Validate(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyIts<InputIteratorType>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        return Detail::Validate<InputEncoding, InputStringType>(its);
+    }
+
+    // bool Validate(begin, end):
+    // Checks if the given range is valid Unicode.
+    // The Unicode encoding is picked automatically depending on the input type.
+    template<typename InputIteratorType>
+    inline bool Validate(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoIts<InputIteratorType>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        return Detail::Validate<InputEncoding, InputStringType>(its);
+    }
+
+    // size_t Length<OutputEncoding, InputEncoding>(str):
+    // Get the length (in OutputEncoding) of the given known-valid string with the given InputEncoding.
+    // Note: Length assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use LengthSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename InputStringType>
+    inline size_t Length(const InputStringType& str,
+        typename Detail::SReqAnyObj<InputStringType, OutputEncoding>::type* = 0)
+    {
+        return Detail::Length<InputEncoding, OutputEncoding, InputStringType>(str);
+    }
+
+    // size_t Length<OutputEncoding>(str):
+    // Get the length (in OutputEncoding) of the given known-valid Unicode string.
+    // The Unicode encoding is picked automatically depending on the input type.
+    // Note: Length assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use LengthSafe.
+    template<EEncoding OutputEncoding, typename InputStringType>
+    inline size_t Length(const InputStringType& str,
+        typename Detail::SReqAutoObj<InputStringType, OutputEncoding>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        return Detail::Length<InputEncoding, OutputEncoding, InputStringType>(str);
+    }
+
+    // size_t Length<OutputEncoding, InputEncoding>(begin, end):
+    // Get the length (in OutputEncoding) of the known-valid range with the given InputEncoding.
+    // Note: Length assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use LengthSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename InputIteratorType>
+    inline size_t Length(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyIts<InputIteratorType, OutputEncoding>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        return Detail::Length<InputEncoding, OutputEncoding, InputStringType>(its);
+    }
+
+    // size_t Length<OutputEncoding>(begin, end):
+    // Get the length (in OutputEncoding) of the known-valid Unicode range.
+    // The Unicode encoding is picked automatically depending on the input type.
+    // Note: Length assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use LengthSafe.
+    template<EEncoding OutputEncoding, typename InputIteratorType>
+    inline size_t Length(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoIts<InputIteratorType>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        return Detail::Length<InputEncoding, OutputEncoding, InputStringType>(its);
+    }
+
+    // size_t LengthSafe<Recovery, OutputEncoding, InputEncoding>(str):
+    // Get the length (in OutputEncoding) of the given string with the given InputEncoding.
+    // Note: LengthSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Length.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputStringType>
+    inline size_t LengthSafe(const InputStringType& str,
+        typename Detail::SReqAnyObj<InputStringType, OutputEncoding, Recovery>::type* = 0)
+    {
+        return Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(str);
+    }
+
+    // size_t LengthSafe<Recovery, OutputEncoding>(str):
+    // Get the length (in OutputEncoding) of the given Unicode string.
+    // The Unicode encoding is picked automatically depending on the input type.
+    // Note: LengthSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Length.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, typename InputStringType>
+    inline size_t LengthSafe(const InputStringType& str,
+        typename Detail::SReqAutoObj<InputStringType, OutputEncoding, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        return Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(str);
+    }
+
+    // size_t LengthSafe<Recovery, OutputEncoding, InputEncoding>(begin, end):
+    // Get the length (in OutputEncoding) of the range with the given InputEncoding.
+    // Note: LengthSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Length.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputIteratorType>
+    inline size_t LengthSafe(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyIts<InputIteratorType, OutputEncoding, Recovery>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        return Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(its);
+    }
+
+    // size_t LengthSafe<Recovery, OutputEncoding>(begin, end):
+    // Get the length (in OutputEncoding) of the Unicode range.
+    // The Unicode encoding is picked automatically depending on the input type.
+    // Note: LengthSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Length.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, typename InputIteratorType>
+    inline size_t LengthSafe(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoIts<InputIteratorType, OutputEncoding, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        return Detail::LengthSafe<InputEncoding, OutputEncoding, Recovery, InputStringType>(its);
+    }
+
+    // OutputStringType &Convert<OutputEncoding, InputEncoding>(result, str):
+    // Converts the given string in the given input encoding and stores into the result string with the given output encoding.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputStringType>
+    inline OutputStringType& Convert(OutputStringType& result, const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding>::type* = 0)
+    {
+        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType &Convert(result, str):
+    // Converts the (assumed) Unicode string input and stores into the result Unicode string.
+    // The Unicode encodings are picked automatically depending on the input type and output type.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<typename OutputStringType, typename InputStringType>
+    inline OutputStringType& Convert(OutputStringType& result, const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType &Convert<OutputEncoding, InputEncoding>(result, begin, end):
+    // Converts the given range in the given input encoding and stores into the result string with the given output encoding.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType& Convert(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // OutputStringType &Convert(result, begin, end):
+    // Converts the (assumed) Unicode range and stores into the result Unicode string.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType& Convert(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // size_t Convert<OutputEncoding, InputEncoding>(buffer, length, str):
+    // Converts the given string in the given input encoding and stores into the result buffer with the given output encoding.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputStringType>
+    inline size_t Convert(OutputCharType* buffer, size_t length, const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputCharType*, true, OutputEncoding>::type* = 0)
+    {
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str) + 1;
+    }
+
+    // size_t Convert(buffer, length, str):
+    // Converts the (assumed) Unicode string input and stores into the result Unicode buffer.
+    // The Unicode encodings are picked automatically depending on the buffer type and output type.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<typename OutputCharType, typename InputStringType>
+    inline size_t Convert(OutputCharType* buffer, size_t length, const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputCharType*, true>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str) + 1;
+    }
+
+    // size_t Convert<OutputEncoding, InputEncoding>(buffer, length, begin, end):
+    // Converts the given range in the given input encoding and stores into the result buffer with the given output encoding.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputIteratorType>
+    inline size_t Convert(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputCharType*, true, OutputEncoding>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its) + 1;
+    }
+
+    // size_t Convert(buffer, length, begin, end):
+    // Converts the (assumed) Unicode range and stores into the result Unicode buffer.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<typename OutputCharType, typename InputIteratorType>
+    inline size_t Convert(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputCharType*, true>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its) + 1;
+    }
+
+    // OutputStringType Convert<OutputStringType, OutputEncoding, InputEncoding>(str):
+    // Converts the given string in the given input encoding to a new string of the given type and output encoding.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<typename OutputStringType, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputStringType>
+    inline OutputStringType Convert(const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding>::type* = 0)
+    {
+        OutputStringType result;
+        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType Convert<OutputStringType>(str):
+    // Converts the (assumed) Unicode string input to a new Unicode string of the given type.
+    // The Unicode encodings are picked automatically depending on the input type and output type.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<typename OutputStringType, typename InputStringType>
+    inline OutputStringType Convert(const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        OutputStringType result;
+        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType Convert<OutputStringType, OutputEncoding, InputEncoding>(begin, end):
+    // Converts the given range in the given input encoding to a new string of the given type and output encoding.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<typename OutputStringType, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputIteratorType>
+    inline OutputStringType Convert(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result;
+        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // OutputStringType Convert<OutputStringType>(begin, end):
+    // Converts the (assumed) Unicode range to a new Unicode string of the given type.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Note: Convert assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use ConvertSafe.
+    template<typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType Convert(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result;
+        Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // OutputStringType &ConvertSafe<Recovery, OutputEncoding, InputEncoding>(result, str):
+    // Converts the given string in the given input encoding and stores into the result string with the given output encoding.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputStringType>
+    inline OutputStringType& ConvertSafe(OutputStringType& result, const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
+    {
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType &ConvertSafe<Recovery>(result, str):
+    // Converts the (assumed) Unicode string input and stores into the result Unicode string.
+    // The Unicode encodings are picked automatically depending on the input type and output type.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, typename OutputStringType, typename InputStringType>
+    inline OutputStringType& ConvertSafe(OutputStringType& result, const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType &ConvertSafe<Recovery, OutputEncoding, InputEncoding>(result, begin, end):
+    // Converts the given range in the given input encoding and stores into the result string with the given output encoding.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType& ConvertSafe(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // OutputStringType &ConvertSafe<Recovery>(result, begin, end):
+    // Converts the (assumed) Unicode range and stores into the result Unicode string.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType& ConvertSafe(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // size_t ConvertSafe<Recovery, OutputEncoding, InputEncoding>(buffer, length, str):
+    // Converts the given string in the given input encoding and stores into the result buffer with the given output encoding.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputStringType>
+    inline size_t ConvertSafe(OutputCharType* buffer, size_t length, const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputCharType*, true, OutputEncoding, Recovery>::type* = 0)
+    {
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        OutputStringType result(buffer, length);
+        return Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str) + 1;
+    }
+
+    // size_t ConvertSafe<Recovery>(buffer, length, str):
+    // Converts the (assumed) Unicode string input and stores into the result Unicode buffer.
+    // The Unicode encodings are picked automatically depending on the buffer type and output type.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, typename OutputCharType, typename InputStringType>
+    inline size_t ConvertSafe(OutputCharType* buffer, size_t length, const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputCharType*, true, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        OutputStringType result(buffer, length);
+        return Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str) + 1;
+    }
+
+    // size_t ConvertSafe<Recovery, OutputEncoding, InputEncoding>(buffer, length, begin, end):
+    // Converts the given range in the given input encoding and stores into the result buffer with the given output encoding.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputIteratorType>
+    inline size_t ConvertSafe(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputCharType*, true, OutputEncoding, Recovery>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result(buffer, length);
+        return Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its) + 1;
+    }
+
+    // size_t ConvertSafe<Recovery>(buffer, length, begin, end):
+    // Converts the (assumed) Unicode range and stores into the result Unicode buffer.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, typename OutputCharType, typename InputIteratorType>
+    inline size_t ConvertSafe(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputCharType*, true, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, false, InputStringType, OutputStringType>(result, its) + 1;
+    }
+
+    // OutputStringType ConvertSafe<Recovery, OutputStringType, OutputEncoding, InputEncoding>(str):
+    // Converts the given string in the given input encoding to a new string of the given type and output encoding.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, typename OutputStringType, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputStringType>
+    inline OutputStringType ConvertSafe(const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
+    {
+        OutputStringType result;
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType ConvertSafe<Recovery, OutputStringType>(str):
+    // Converts the (assumed) Unicode string input to a new Unicode string of the given type.
+    // The Unicode encodings are picked automatically depending on the input type and output type.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, typename OutputStringType, typename InputStringType>
+    inline OutputStringType ConvertSafe(const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        OutputStringType result;
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType ConvertSafe<Recovery, OutputStringType, OutputEncoding, InputEncoding>(begin, end):
+    // Converts the given range in the given input encoding to a new string of the given type and output encoding.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, typename OutputStringType, EEncoding OutputEncoding, EEncoding InputEncoding, typename InputIteratorType>
+    inline OutputStringType ConvertSafe(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result;
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // OutputStringType ConvertSafe<Recovery, OutputStringType>(begin, end):
+    // Converts the (assumed) Unicode range to a new Unicode string of the given type.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Note: ConvertSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Convert.
+    template<EErrorRecovery Recovery, typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType ConvertSafe(InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result;
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, false, Recovery, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // OutputStringType &Append<OutputEncoding, InputEncoding>(result, str):
+    // Appends the given string in the given input encoding and stores at the end of the result string with the given output encoding.
+    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputStringType>
+    inline OutputStringType& Append(OutputStringType& result, const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding>::type* = 0)
+    {
+        Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType &Append(result, str):
+    // Appends the (assumed) Unicode string input and stores at the end of the result Unicode string.
+    // The Unicode encodings are picked automatically depending on the input type and output type.
+    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
+    template<typename OutputStringType, typename InputStringType>
+    inline OutputStringType& Append(OutputStringType& result, const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType &Append<OutputEncoding, InputEncoding>(result, begin, end):
+    // Appends the given range in the given input encoding and stores at the end of the result string with the given output encoding.
+    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType& Append(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // OutputStringType &Append(result, begin, end):
+    // Appends the (assumed) Unicode range and stores at the end of the result Unicode string.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
+    template<typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType& Append(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // size_t Append<OutputEncoding, InputEncoding>(buffer, length, str):
+    // Appends the given string in the given input encoding to the result buffer with the given output encoding.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputStringType>
+    inline size_t Append(OutputCharType* buffer, size_t length, const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputCharType*, true, OutputEncoding>::type* = 0)
+    {
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, str) + 1;
+    }
+
+    // size_t Append(buffer, length, str):
+    // Appends the (assumed) Unicode string input to the result Unicode buffer.
+    // The Unicode encodings are picked automatically depending on the buffer type and output type.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
+    template<typename OutputCharType, typename InputStringType>
+    inline size_t Append(OutputCharType* buffer, size_t length, const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputCharType*, true>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, str) + 1;
+    }
+
+    // size_t Append<OutputEncoding, InputEncoding>(buffer, length, begin, end):
+    // Appends the given range in the given input encoding to the result buffer with the given output encoding.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
+    template<EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputIteratorType>
+    inline size_t Append(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputCharType*, true, OutputEncoding>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its) + 1;
+    }
+
+    // size_t Append(buffer, length, begin, end):
+    // Appends the (assumed) Unicode range to the result Unicode buffer.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: Append assumes the input is valid encoded, if this is not guaranteed (ie, user-input), use AppendSafe.
+    template<typename OutputCharType, typename InputIteratorType>
+    inline size_t Append(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputCharType*, true>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its) + 1;
+    }
+
+    // OutputStringType &AppendSafe<Recovery, OutputEncoding, InputEncoding>(result, str):
+    // Appends the given string in the given input encoding and stores at the end of the result string with the given output encoding.
+    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputStringType>
+    inline OutputStringType& AppendSafe(OutputStringType& result, const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
+    {
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType &AppendSafe<Recovery>(result, str):
+    // Appends the (assumed) Unicode string input and stores at the end of the result Unicode string.
+    // The Unicode encodings are picked automatically depending on the input type and output type.
+    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
+    template<EErrorRecovery Recovery, typename OutputStringType, typename InputStringType>
+    inline OutputStringType& AppendSafe(OutputStringType& result, const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, str);
+        return result;
+    }
+
+    // OutputStringType &AppendSafe<Recovery, OutputEncoding, InputEncoding>(result, begin, end):
+    // Appends the given range in the given input encoding and stores at the end of the result string with the given output encoding.
+    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType& AppendSafe(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputStringType, false, OutputEncoding, Recovery>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // OutputStringType &AppendSafe<Recovery>(result, begin, end):
+    // Appends the (assumed) Unicode range and stores at the end of the result Unicode string.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
+    template<EErrorRecovery Recovery, typename OutputStringType, typename InputIteratorType>
+    inline OutputStringType& AppendSafe(OutputStringType& result, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputStringType, false, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputStringType, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        const InputStringType its(begin, end);
+        Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, its);
+        return result;
+    }
+
+    // size_t AppendSafe<Recovery, OutputEncoding, InputEncoding>(buffer, length, str):
+    // Appends the given string in the given input encoding to the result buffer with the given output encoding.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputStringType>
+    inline size_t AppendSafe(OutputCharType* buffer, size_t length, const InputStringType& str,
+        typename Detail::SReqAnyObjOut<InputStringType, OutputCharType*, true, OutputEncoding, Recovery>::type* = 0)
+    {
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        OutputStringType result(buffer, length);
+        return Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, str) + 1;
+    }
+
+    // size_t AppendSafe<Recovery>(buffer, length, str):
+    // Appends the (assumed) Unicode string input to the result Unicode buffer.
+    // The Unicode encodings are picked automatically depending on the buffer type and output type.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
+    template<EErrorRecovery Recovery, typename OutputCharType, typename InputStringType>
+    inline size_t AppendSafe(OutputCharType* buffer, size_t length, const InputStringType& str,
+        typename Detail::SReqAutoObjOut<InputStringType, OutputCharType*, true, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputStringType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        OutputStringType result(buffer, length);
+        return Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, str) + 1;
+    }
+
+    // size_t AppendSafe<Recovery, OutputEncoding, InputEncoding>(buffer, length, begin, end):
+    // Appends the given range in the given input encoding to the result buffer with the given output encoding.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
+    template<EErrorRecovery Recovery, EEncoding OutputEncoding, EEncoding InputEncoding, typename OutputCharType, typename InputIteratorType>
+    inline size_t AppendSafe(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAnyItsOut<InputIteratorType, OutputCharType*, true, OutputEncoding, Recovery>::type* = 0)
+    {
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result(buffer, length);
+        return Detail::ConvertSafe<InputEncoding, OutputEncoding, true, Recovery, InputStringType, OutputStringType>(result, its) + 1;
+    }
+
+    // size_t AppendSafe<Recovery>(buffer, length, begin, end):
+    // Appends the (assumed) Unicode range to the result Unicode buffer.
+    // The Unicode encodings are picked automatically depending on the range type and output type.
+    // Returns the required length of the output buffer, in code-units, including the null-terminator.
+    // Note: AppendSafe uses the specified Recovery parameter to fix encoding errors, if the input is known-valid, use Append.
+    template<EErrorRecovery Recovery, typename OutputCharType, typename InputIteratorType>
+    inline size_t AppendSafe(OutputCharType* buffer, size_t length, InputIteratorType begin, InputIteratorType end,
+        typename Detail::SReqAutoItsOut<InputIteratorType, OutputCharType*, true, eEncoding_UTF8, Recovery>::type* = 0)
+    {
+        const EEncoding InputEncoding = Detail::SInferEncoding<InputIteratorType, true>::value;
+        const EEncoding OutputEncoding = Detail::SInferEncoding<OutputCharType*, false>::value;
+        typedef Detail::SPackedIterators<InputIteratorType> InputStringType;
+        typedef Detail::SPackedBuffer<OutputCharType*> OutputStringType;
+        const InputStringType its(begin, end);
+        OutputStringType result(buffer, length);
+        return Detail::Convert<InputEncoding, OutputEncoding, true, InputStringType, OutputStringType>(result, its) + 1;
+    }
+}
diff --git a/Code/Legacy/CryCommon/UnicodeIterator.h b/Code/Legacy/CryCommon/UnicodeIterator.h
new file mode 100644
index 0000000000..da21a74916
--- /dev/null
+++ b/Code/Legacy/CryCommon/UnicodeIterator.h
@@ -0,0 +1,614 @@
+/*
+ * 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 : Encoded Unicode sequence iteration.
+//
+// For lower level accessing of encoded text, an STL compatible iterator wrapper is provided.
+// This iterator will decode the underlying sequence, abstracting it to a sequence of UCS code-points.
+// Using the iterator wrapper, you can find where in an encoded string code-points (or encoding errors) are located.
+// Note: The iterator is an input-only iterator, you cannot write to the underlying sequence.
+
+
+#pragma once
+#include "UnicodeBinding.h"
+namespace Unicode
+{
+    namespace Detail
+    {
+        // MoveNext(it, checker, tag):
+        // Moves the iterator to the next UCS code-point in the encoded sequence.
+        // Non-specialized version (for 1:1 code-unit to code-point).
+        template<typename BaseIterator, typename BoundsChecker, EEncoding Encoding>
+        inline void MoveNext(BaseIterator& it, const BoundsChecker& checker, const integral_constant<EEncoding, Encoding>)
+        {
+            COMPILE_TIME_ASSERT(
+                Encoding == eEncoding_ASCII ||
+                Encoding == eEncoding_UTF32 ||
+                Encoding == eEncoding_Latin1 ||
+                Encoding == eEncoding_Win1252);
+            assert(!checker.IsEnd(it) && "Attempt to iterate past the end of the sequence");
+
+            // All of these encodings use a single code-unit for each code-point.
+            ++it;
+        }
+
+        // MoveNext(it, checker, tag):
+        // Moves the iterator to the next UCS code-point in the encoded sequence.
+        // Specialized for UTF-8.
+        template<typename BaseIterator, typename BoundsChecker>
+        inline void MoveNext(BaseIterator& it, const BoundsChecker& checker, integral_constant<EEncoding, eEncoding_UTF8>)
+        {
+            assert(!checker.IsEnd(it) && "Attempt to iterate past the end of the sequence");
+
+            // UTF-8: just need to skip up to 3 continuation bytes.
+            for (int i = 0; i < 4; ++i)
+            {
+                ++it;
+                if (checker.IsEnd(it))  // :WARN: always returns false if "safe" bool is false!
+                {
+                    break;
+                }
+                uint32 val = static_cast<uint32>(*it);
+                if ((val & 0xC0) != 0x80)
+                {
+                    break;
+                }
+            }
+        }
+
+        // MoveNext(it, checker, tag):
+        // Moves the iterator to the next UCS code-point in the encoded sequence.
+        // Specialized for UTF-16.
+        template<typename BaseIterator, typename BoundsChecker>
+        inline void MoveNext(BaseIterator& it, const BoundsChecker& checker, integral_constant<EEncoding, eEncoding_UTF16>)
+        {
+            assert(!checker.IsEnd(it) && "Attempt to iterate past the end of the sequence");
+
+            // UTF-16: just need to skip one lead surrogate.
+            ++it;
+            uint32 val = static_cast<uint32>(*it);
+            if (val >= cLeadSurrogateFirst && val <= cLeadSurrogateLast)
+            {
+                if (!checker.IsEnd(it))
+                {
+                    ++it;
+                }
+            }
+        }
+
+        // MovePrev(it, checker, tag):
+        // Moves the iterator to the previous UCS code-point in the encoded sequence.
+        // Non-specialized version (for 1:1 code-unit to code-point).
+        template<typename BaseIterator, typename BoundsChecker, EEncoding Encoding>
+        inline void MovePrev(BaseIterator& it, const BoundsChecker& checker, const integral_constant<EEncoding, Encoding>)
+        {
+            COMPILE_TIME_ASSERT(
+                Encoding == eEncoding_ASCII ||
+                Encoding == eEncoding_UTF32 ||
+                Encoding == eEncoding_Latin1 ||
+                Encoding == eEncoding_Win1252);
+            assert(!checker.IsBegin(it) && "Attempt to iterate past the beginning of the sequence");
+
+            // All of these encodings use a single code-unit for each code-point.
+            --it;
+        }
+
+        // MovePrev(it, checker, tag):
+        // Moves the iterator to the previous UCS code-point in the encoded sequence.
+        // Specialized for UTF-8.
+        template<typename BaseIterator, typename BoundsChecker>
+        inline void MovePrev(BaseIterator& it, const BoundsChecker& checker, integral_constant<EEncoding, eEncoding_UTF8>)
+        {
+            assert(!checker.IsBegin(it) && "Attempt to iterate past the beginning of the sequence");
+
+            // UTF-8: just need to skip up to 3 continuation bytes.
+            for (int i = 0; i < 4; ++i)
+            {
+                --it;
+                if (checker.IsBegin(it))
+                {
+                    break;
+                }
+                uint32 val = static_cast<uint32>(*it);
+                if ((val & 0xC0) != 0x80)
+                {
+                    break;
+                }
+            }
+        }
+
+        // MovePrev(it, checker, tag):
+        // Moves the iterator to the previous UCS code-point in the encoded sequence.
+        // Specialized for UTF-16.
+        template<typename BaseIterator, typename BoundsChecker>
+        inline void MovePrev(BaseIterator& it, const BoundsChecker& checker, integral_constant<EEncoding, eEncoding_UTF16>)
+        {
+            assert(!checker.IsBegin(it) && "Attempt to iterate past the beginning of the sequence");
+
+            // UTF-16: just need to skip one lead surrogate.
+            --it;
+            uint32 val = static_cast<uint32>(*it);
+            if (val >= cLeadSurrogateFirst && val <= cLeadSurrogateLast)
+            {
+                if (!checker.IsBegin(it))
+                {
+                    --it;
+                }
+            }
+        }
+
+        // SBaseIterators<BaseIterator, BoundsChecked>:
+        // Utility to access base iterators properties from CIterator.
+        // This is the bounds-checked specialization, the range information is kept to defend against malformed sequences.
+        template<typename BaseIterator, bool BoundsChecked>
+        struct SBaseIterators
+        {
+            typedef BaseIterator type;
+            type begin, end;
+            type it;
+
+            SBaseIterators(const BaseIterator& _begin, const BaseIterator& _end)
+                : begin(_begin)
+                , end(_end)
+                , it(_begin) {}
+
+            SBaseIterators(const SBaseIterators& other)
+                : begin(other.begin)
+                , end(other.end)
+                , it(other.it) {}
+
+            SBaseIterators& operator =(const SBaseIterators& other)
+            {
+                begin = other.begin;
+                end = other.end;
+                it = other.it;
+                return *this;
+            }
+
+            bool IsBegin(const BaseIterator& _it) const
+            {
+                return begin == _it;
+            }
+
+            bool IsEnd(const BaseIterator& _it) const
+            {
+                return end == _it;
+            }
+
+            bool IsEqual(const SBaseIterators& other) const
+            {
+                return it == other.it
+                       && begin == other.begin
+                       && end == other.end;
+            }
+
+            // Note: Only called inside assert.
+            // O(N) version; works with any forward-iterator (or better)
+            bool IsInRange(const BaseIterator& _it, std::forward_iterator_tag) const
+            {
+                for (BaseIterator i = begin; i != end; ++i)
+                {
+                    if (_it == i)
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            // Note: Only called inside assert.
+            // O(1) version; requires random-access-iterator.
+            bool IsInRange(const BaseIterator& _it, std::random_access_iterator_tag) const
+            {
+                return (begin <= _it && _it < end);
+            }
+
+            // Note: Only called inside assert.
+            // Dispatches to the O(1) version if a random-access iterator is used (common case).
+            bool IsInRange(const BaseIterator& _it) const
+            {
+                return IsInRange(_it, typename std::iterator_traits<BaseIterator>::iterator_category());
+            }
+        };
+
+        // SBaseIterators<BaseIterator, BoundsChecked>:
+        // Utility to access base iterators properties from CIterator.
+        // This is the un-checked specialization for known-safe sequences.
+        template<typename BaseIterator>
+        struct SBaseIterators<BaseIterator, false>
+        {
+            typedef BaseIterator type;
+            type it;
+
+            explicit SBaseIterators(const BaseIterator& begin)
+                : it(begin) {}
+
+            SBaseIterators(const BaseIterator& begin, const BaseIterator& end)
+                : it(begin) {}
+
+            SBaseIterators(const SBaseIterators& other)
+                : it(other.it) {}
+
+            SBaseIterators& operator =(const SBaseIterators& other)
+            {
+                it = other.it;
+                return *this;
+            }
+
+            bool IsBegin(const BaseIterator&) const
+            {
+                return false;
+            }
+
+            bool IsEnd(const BaseIterator&) const
+            {
+                return false;
+            }
+
+            bool IsEqual(const SBaseIterators& other) const
+            {
+                return it == other.it;
+            }
+
+            bool IsInRange(const BaseIterator&) const
+            {
+                return true;
+            }
+        };
+
+        // SIteratorSink<Safe>:
+        // Helper to store the last code-point and error bit that was decoded.
+        // This is the safe specialization for potentially malformed sequences.
+        template<bool Safe>
+        struct SIteratorSink
+        {
+            static const uint32 cEmpty = 0xFFFFFFFFU;
+            uint32 value;
+            bool error;
+
+            void Clear()
+            {
+                value = cEmpty;
+                error = false;
+            }
+
+            bool IsEmpty() const
+            {
+                return value == cEmpty;
+            }
+
+            bool IsError() const
+            {
+                return error;
+            }
+
+            const uint32& GetValue() const
+            {
+                return value;
+            }
+
+            void MarkDecodingError()
+            {
+                value = cReplacementCharacter;
+                error = true;
+            }
+
+            template<EEncoding Encoding, typename BaseIterator, bool BoundsChecked>
+            void Decode(const SBaseIterators<BaseIterator, BoundsChecked>& its, integral_constant<EEncoding, Encoding>)
+            {
+                typedef SDecoder<Encoding, SIteratorSink&, SIteratorSink&> DecoderType;
+                DecoderType decoder(*this, *this);
+                Clear();
+                for (BaseIterator it = its.it; IsEmpty(); ++it)
+                {
+                    uint32 val = static_cast<uint32>(*it);
+                    decoder(val);
+                    if (its.IsEnd(it))
+                    {
+                        break;
+                    }
+                }
+                if (IsEmpty())
+                {
+                    // If we still have neither a new value or an error flag, just treat as error.
+                    // This can happen if we reached the end of the sequence, but it ends in an incomplete code-sequence.
+                    MarkDecodingError();
+                }
+            }
+
+            template<EEncoding Encoding, typename BaseIterator, bool BoundsChecked>
+            void DecodeIfEmpty(const SBaseIterators<BaseIterator, BoundsChecked>& its, integral_constant<EEncoding, Encoding> tag)
+            {
+                if (IsEmpty())
+                {
+                    Decode(its, tag);
+                }
+            }
+
+            void operator()(uint32 unit)
+            {
+                value = unit;
+            }
+
+            void operator()(SIteratorSink&, uint32, uint32)
+            {
+                MarkDecodingError();
+            }
+        };
+
+        // SIteratorSink<Safe>:
+        // Helper to store the last code-point that was decoded.
+        // This is the un-safe specialization for known-valid sequences.
+        // Note: No error-state is tracked since we won't handle that regardless for un-safe CIterator.
+        template<>
+        struct SIteratorSink<false>
+        {
+            static const uint32 cEmpty = 0xFFFFFFFFU;
+            uint32 value;
+
+            void Clear()
+            {
+                value = cEmpty;
+            }
+
+            bool IsEmpty() const
+            {
+                return value == cEmpty;
+            }
+
+            bool IsError() const
+            {
+                return false;
+            }
+
+            const uint32& GetValue() const
+            {
+                return value;
+            }
+
+            template<EEncoding Encoding, typename BaseIterator, bool BoundsChecked>
+            void Decode(const SBaseIterators<BaseIterator, BoundsChecked>& its, integral_constant<EEncoding, Encoding>)
+            {
+                typedef SDecoder<Encoding, SIteratorSink&, void> DecoderType;
+                DecoderType decoder(*this);
+                for (BaseIterator it = its.it; IsEmpty(); ++it)
+                {
+                    uint32 val = static_cast<uint32>(*it);
+                    decoder(val);
+                }
+            }
+
+            template<EEncoding Encoding, typename BaseIterator, bool BoundsChecked>
+            void DecodeIfEmpty(const SBaseIterators<BaseIterator, BoundsChecked>& its, integral_constant<EEncoding, Encoding> tag)
+            {
+                if (IsEmpty())
+                {
+                    Decode(its, tag);
+                }
+            }
+
+            void operator()(uint32 unit)
+            {
+                value = unit;
+            }
+        };
+    }
+
+    // CIterator<BaseIterator [, Safe, Encoding]>:
+    // Helper class that can iterate over an encoded text sequence and read the underlying UCS code-points.
+    // If the Safe flag is set, bounds checking is performed inside multi-unit sequences to guard against decoding errors.
+    // This requires the user to know where the sequence ends (use the constructor taking two parameters).
+    // Note: The BaseIterator must be forward-iterator or better when Safe flag is set.
+    // If the Safe flag is not set, you must guarantee the sequence is validly encoded, and allows the use of the single argument constructor.
+    // In the case of unsafe iterator used for C-style string pointer, look for a U+0000 dereferenced value to end the iteration.
+    // Regardless of the Safe flag, the user must ensure that the iterator is never moved past the beginning or end of the range (just like any other STL iterator).
+    // Example of typical usage:
+    // string utf8 = "foo"; // UTF-8
+    // for (Unicode::CIterator<string::const_iterator> it(utf8.begin(), utf8.end()); it != utf8.end(); ++it)
+    // {
+    //     uint32 codepoint = *it; // 32-bit UCS code-point
+    // }
+    // Example unsafe usage: (for known-valid encoded C-style strings):
+    // const char *pValid = "foo"; // UTF-8
+    // for (Unicode::CIterator<const char *, false> it = pValid; *it != 0; ++it)
+    // {
+    //     uint32 codepoint = *it; // 32-bit UCS code-point
+    // }
+    template<typename BaseIterator, bool Safe = true, EEncoding Encoding = Detail::SInferEncoding<BaseIterator, true>::value>
+    class CIterator
+    {
+        // The iterator value in the encoded sequence.
+        // Optionally provides bounds-checking.
+        Detail::SBaseIterators<BaseIterator, Safe> its;
+
+        // The cached UCS code-point at the current position.
+        // Mutable because dereferencing is conceptually const, but does cache some state in this case.
+        mutable Detail::SIteratorSink<Safe> sink;
+
+    public:
+        // Types for compatibility with STL bidirectional iterator requirements.
+        typedef const uint32 value_type;
+        typedef const uint32& reference;
+        typedef const uint32* pointer;
+        typedef const ptrdiff_t difference_type;
+        typedef std::bidirectional_iterator_tag iterator_category;
+
+        // Construct an iterator for the given range.
+        // The initial position of the iterator as at the beginning of the range.
+        CIterator(const BaseIterator& begin, const BaseIterator& end)
+            : its(begin, end)
+        {
+            sink.Clear();
+        }
+
+        // Construct an iterator from a single iterator (typically C-style string pointer).
+        // This can only be used for unsafe iterators.
+        template<typename IteratorType>
+        CIterator(const IteratorType& it, typename Detail::SRequire<!Safe&& Detail::is_convertible<IteratorType, BaseIterator>::value, IteratorType>::type* = 0)
+            : its(static_cast<const BaseIterator&>(it))
+        {
+            sink.Clear();
+        }
+
+        // Copy-construct an iterator.
+        CIterator(const CIterator& other)
+            : its(other.its)
+            , sink(other.sink) {}
+
+        // Copy-assign an iterator.
+        CIterator& operator =(const CIterator& other)
+        {
+            its = other.its;
+            sink = other.sink;
+            return *this;
+        }
+
+        // Test if the iterator points at an encoding error in the underlying encoded sequence.
+        // If so, the function returns false.
+        // When using an un-safe iterator, this function always returns true, if a sequence can contain encoding errors, you must use the safe variant.
+        // Note: This requires the underlying iterator to be dereferenced, so you cannot use it only while the iterator is inside the valid range.
+        bool IsAtValidCodepoint() const
+        {
+            assert(!its.IsEnd(its.it) && "Attempt to dereference the past-the-end iterator");
+            Detail::integral_constant<EEncoding, Encoding> tag;
+            sink.DecodeIfEmpty(its, tag);
+            return !sink.IsError();
+        }
+
+        // Gets the current position in the underlying encoded sequence.
+        // If the iterator points to an invalidly encoded sequence (ie, IsError() returns true), the direction of iteration is significant.
+        // In that case the returned position is approximated; to work around this: move all iterators of which the position is compared in the same direction.
+        const BaseIterator& GetPosition() const
+        {
+            return its.it;
+        }
+
+        // Sets the current position in the underlying encoded sequence.
+        // You may not set the position outside the range for which this iterator was constructed.
+        void SetPosition(const BaseIterator& it)
+        {
+            assert(its.IsInRange(it) && "Attempt to set the underlying iterator outside of the supported range");
+            its.it = it;
+        }
+
+        // Test if this iterator is equal to another iterator instance.
+        // Note: In the presence of an invalidly encoded sequence (ie, IsError() returns true), the direction of iteration is significant.
+        // To work around this, you can either:
+        // 1) Move all iterators that will be compared in the same direction; or
+        // 2) Compare the dereferenced iterator value(s) instead (if applicable).
+        bool operator ==(const CIterator& other) const
+        {
+            return its.IsEqual(other.its);
+        }
+
+        // Test if this iterator is equal to another base iterator.
+        // Note: If the provided iterator does not point to the the first code-unit of an UCS code-point, the behavior is undefined.
+        bool operator ==(const BaseIterator& other) const
+        {
+            return its.it == other;
+        }
+
+        // Test if this iterator is equal to another iterator instance.
+        // Note: In the presence of an invalidly encoded sequence (ie, IsError() returns true), the direction of iteration is significant.
+        // To work around this, you can either:
+        // 1) Move all iterators that will be compared in the same direction; or
+        // 2) Compare the dereferenced iterator value(s) instead (if applicable).
+        bool operator !=(const CIterator& other) const
+        {
+            return !its.IsEqual(other.its);
+        }
+
+        // Test if this iterator is equal to another base iterator.
+        // Note: If the provided iterator does not point to the the first code-unit of an UCS code-point, the behavior is undefined.
+        bool operator !=(const BaseIterator& other) const
+        {
+            return its.it != other;
+        }
+
+        // Get the decoded UCS code-point at the current position in the sequence.
+        // If the iterator points to an invalidly encoded sequence (ie, IsError() returns true) the function returns U+FFFD (replacement character).
+        reference operator *() const
+        {
+            assert(!its.IsEnd(its.it) && "Attempt to dereference the past-the-end iterator");
+            Detail::integral_constant<EEncoding, Encoding> tag;
+            sink.DecodeIfEmpty(its, tag);
+            return sink.GetValue();
+        }
+
+        // Advance the iterator to the next UCS code-point.
+        // Note: You must make sure the iterator is not at the end of the sequence, even in Safe mode.
+        // However, in Safe mode, the iterator will never move past the end of the sequence in the presence of encoding errors.
+        CIterator& operator ++()
+        {
+            Detail::integral_constant<EEncoding, Encoding> tag;
+            Detail::MoveNext(its.it, its, tag);
+            sink.Clear();
+            return *this;
+        }
+
+        // Go back to the previous UCS code-point.
+        // Note: You must make sure the iterator is not at the beginning of the sequence, even in Safe mode.
+        // However, in Safe mode, the iterators will never move past the beginning of the sequence in the presence of encoding errors.
+        CIterator& operator --()
+        {
+            Detail::integral_constant<EEncoding, Encoding> tag;
+            Detail::MovePrev(its.it, its, tag);
+            sink.Clear();
+            return *this;
+        }
+
+        // Advance the iterator to the next UCS code-point, return a copy of the iterator position before advancing.
+        // Note: You must make sure the iterator is not at the end of the sequence, even in Safe mode.
+        // However, in Safe mode, the iterator will never move past the end of the sequence in the presence of encoding errors.
+        CIterator operator ++(int)
+        {
+            CIterator result = *this;
+            ++*this;
+            return result;
+        }
+
+        // Go back to the previous UCS code-point, return a copy of the iterator position before going back.
+        // Note: You must make sure the iterator is not at the beginning of the sequence, even in Safe mode.
+        // However, in Safe mode, the iterators will never move past the beginning of the sequence in the presence of encoding errors.
+        CIterator operator --(int)
+        {
+            CIterator result = *this;
+            --*this;
+            return result;
+        }
+    };
+
+    namespace Detail
+    {
+        // SIteratorSpecializer<T>:
+        // Specializes the CIterator template to use for a given string type.
+        // Note: The reason we use this is because MSVC doesn't want to deduce this on the MakeIterator declaration.
+        template<typename StringType>
+        struct SIteratorSpecializer
+        {
+            typedef CIterator<typename StringType::const_iterator> type;
+        };
+    }
+
+    // MakeIterator(const StringType &str):
+    // Helper function to make an UCS code-point iterator given an Unicode string.
+    // Example usage:
+    // string utf8 = "foo"; // UTF-8
+    // auto it = Unicode::MakeIterator(utf8);
+    // while (it != utf8.end())
+    // {
+    //     uint32 codepoint = *it; // 32-bit UCS code-point
+    // }
+    // Or, in a for-loop:
+    // for (auto it = Unicode::MakeIterator(utf8); it != utf8.end(); ++it) {}
+    template<typename StringType>
+    inline typename Detail::SIteratorSpecializer<StringType>::type MakeIterator(const StringType& str)
+    {
+        return typename Detail::SIteratorSpecializer<StringType>::type(str.begin(), str.end());
+    }
+}
diff --git a/Code/Legacy/CryCommon/VRCommon.h b/Code/Legacy/CryCommon/VRCommon.h
new file mode 100644
index 0000000000..767b94cfc5
--- /dev/null
+++ b/Code/Legacy/CryCommon/VRCommon.h
@@ -0,0 +1,254 @@
+/*
+ * 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/VectorMap.h b/Code/Legacy/CryCommon/VectorMap.h
new file mode 100644
index 0000000000..e9e57a7397
--- /dev/null
+++ b/Code/Legacy/CryCommon/VectorMap.h
@@ -0,0 +1,537 @@
+/*
+ * 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 : std::map replacement implemented using sorted vector.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_VECTORMAP_H
+#define CRYINCLUDE_CRYCOMMON_VECTORMAP_H
+#pragma once
+
+
+//--------------------------------------------------------------------------
+// VectorMap
+//
+// Usage Notes:
+// This class is designed to be an (almost, see below) drop-in replacement
+// for std::map. It features an almost identical interface, but it is
+// implemented using a sorted vector rather than a tree. This is in most
+// cases more efficient, as there is less dynamic memory allocation and
+// pointer dereferencing.
+//
+// *************************************************************************
+// PLEASE NOTE: There is one vital difference between std::map and VectorMap
+// that you will need to note before trying to replace std::map. Since
+// VectorMap is implemented using a vector, iterators can and will be
+// invalidated by many operations, such as insertions and deletions, and
+// due to sorting potentially even normal lookups. Please Please PLEASE make
+// sure that you are not storing any iterators to this class.
+// *************************************************************************
+//
+// The class varies from the std::set API in that two of the erase methods
+// methods are not of void return type but return an iterator - this is
+// required in practice because they invalidate iterators, as noted above.
+//
+// * iterator erase(iterator where);
+// * iterator erase(iterator first, iterator last);
+//
+//
+// Performance Notes:
+//
+// This class uses the empty base optimization hack to allow comparison
+// predicate objects that have no state to take up no space in the object.
+// As a result the size of the overall VectorMap instance is the same as
+// that of the std::vector it uses to store the elements.
+//
+// In addition to the normal map interface, this class provides the
+// following members that can be used to manage memory requirements:
+//
+// * void reserve(size_type count);
+//   Allocate enough space for count elements (see vector::reserve()).
+//
+// * size_type capacity() const;
+//   Report how many elements can be stored without reallocating (see
+//   vector::capacity()).
+//
+//--------------------------------------------------------------------------
+
+template <typename K, typename V, typename T = std::less<K>, typename A = std::allocator<std::pair <K, V> > >
+class VectorMap
+    : private T             // Empty base optimization
+{
+public:
+    typedef K key_type;
+    typedef V mapped_type;
+    typedef A allocator_type;
+
+    typedef std::pair</*const */ key_type, mapped_type> value_type;
+
+    typedef T key_compare;
+
+    class FirstLess
+    {
+    public:
+        FirstLess(const key_compare& comp)
+            : m_comp(comp) {}
+
+        bool operator()(const value_type& left, const value_type& right) const
+        {
+            return m_comp(left.first, right.first);
+        }
+
+    private:
+        const key_compare& m_comp;
+    };
+
+    typedef std::vector<value_type, allocator_type> container_type;
+    typedef typename container_type::iterator iterator;
+    typedef typename container_type::const_iterator const_iterator;
+    typedef typename container_type::reverse_iterator reverse_iterator;
+    typedef typename container_type::const_reverse_iterator const_reverse_iterator;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef typename std::allocator_traits<allocator_type>::size_type size_type;
+
+    VectorMap();
+    explicit VectorMap(const key_compare& comp);
+    explicit VectorMap(const key_compare& comp, const allocator_type& alloc);
+    VectorMap(const VectorMap& right);
+    template <class InputIterator>
+    VectorMap(InputIterator first, InputIterator last);
+    template <class InputIterator>
+    VectorMap(InputIterator first, InputIterator last, const key_compare& comp);
+    template <class InputIterator>
+    VectorMap(InputIterator first, InputIterator last, const key_compare& comp, const allocator_type& alloc);
+    void SwapElementsWithVector(container_type& elementVector);
+    iterator begin();
+    const_iterator begin() const;
+    size_type capacity() const;
+    void clear();
+    void clearAndFreeMemory();
+    size_type count(const key_type& key) const;
+    bool empty() const;
+    iterator end();
+    const_iterator end() const;
+    std::pair<iterator, iterator> equal_range(const key_type& key);
+    std::pair<const_iterator, const_iterator> equal_range(const key_type& key) const;
+    iterator erase(iterator where);                 // See documentation above
+    iterator erase(iterator first, iterator last);  // See documentation above
+    void erase(const key_type& key);
+    template <typename Predicate>
+    void erase_if(const Predicate& predicate);
+    iterator find(const key_type& key);
+    const_iterator find(const key_type& key) const;
+    allocator_type get_allocator() const;
+    std::pair<iterator, bool> insert(const value_type& val);
+    iterator insert(iterator where, const value_type& val);
+    template <class InputIterator>
+    void insert(InputIterator first, InputIterator last);
+    key_compare key_comp() const;
+    iterator lower_bound(const key_type& key);
+    const_iterator lower_bound(const key_type& key) const;
+    size_type max_size() const;
+    reverse_iterator rbegin();
+    const_reverse_iterator rbegin() const;
+    reverse_iterator rend();
+    const_reverse_iterator rend() const;
+    void reserve(size_type count);
+    size_type size() const;
+    void swap(VectorMap& other);
+    iterator upper_bound(const key_type& key);
+    const_iterator upper_bound(const key_type& key) const;
+    mapped_type& operator[](const key_type& key);
+
+    template<typename Sizer>
+    void GetMemoryUsage(Sizer* pSizer) const
+    {
+        pSizer->AddObject(m_entries);
+    }
+private:
+    container_type m_entries;
+};
+
+template <typename K, typename V, typename T, typename A>
+VectorMap<K, V, T, A>::VectorMap()
+{
+}
+
+template <typename K, typename V, typename T, typename A>
+VectorMap<K, V, T, A>::VectorMap(const key_compare& comp)
+    :   key_compare(comp)
+{
+}
+
+template <typename K, typename V, typename T, typename A>
+VectorMap<K, V, T, A>::VectorMap(const key_compare& comp, const allocator_type& alloc)
+    :   key_compare(comp)
+    , m_entries(alloc)
+{
+}
+
+template <typename K, typename V, typename T, typename A>
+VectorMap<K, V, T, A>::VectorMap(const VectorMap& right)
+    :   key_compare(right)
+    , m_entries(right.m_entries)
+{
+}
+
+template <typename K, typename V, typename T, typename A>
+template <class InputIterator>
+VectorMap<K, V, T, A>::VectorMap(InputIterator first, InputIterator last)
+{
+    for (; first != last; ++first)
+    {
+        m_entries.push_back(*first);
+    }
+    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
+}
+
+template <typename K, typename V, typename T, typename A>
+template <class InputIterator>
+VectorMap<K, V, T, A>::VectorMap(InputIterator first, InputIterator last, const key_compare& comp)
+    :   key_compare(comp)
+{
+    for (; first != last; ++first)
+    {
+        m_entries.push_back(*first);
+    }
+    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
+}
+
+template <typename K, typename V, typename T, typename A>
+template <class InputIterator>
+VectorMap<K, V, T, A>::VectorMap(InputIterator first, InputIterator last, const key_compare& comp, const allocator_type& alloc)
+    :   key_compare(comp)
+    , m_entries(alloc)
+{
+    for (; first != last; ++first)
+    {
+        m_entries.push_back(*first);
+    }
+    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
+}
+
+template <typename K, typename V, typename T, typename A>
+void VectorMap<K, V, T, A>::SwapElementsWithVector(typename VectorMap<K, V, T, A>::container_type& elementVector)
+{
+    m_entries.swap(elementVector);
+    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::begin()
+{
+    return m_entries.begin();
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::begin() const
+{
+    return m_entries.begin();
+}
+
+template <typename K, typename V, typename T, typename A>
+void VectorMap<K, V, T, A>::clear()
+{
+    m_entries.resize(0);
+}
+
+template <typename K, typename V, typename T, typename A>
+void VectorMap<K, V, T, A>::clearAndFreeMemory()
+{
+    stl::free_container(m_entries);
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::size_type VectorMap<K, V, T, A>::capacity() const
+{
+    return m_entries.capacity();
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::size_type VectorMap<K, V, T, A>::count(const key_type& key) const
+{
+    return size_type(std::binary_search(m_entries.begin(), m_entries.end(), value_type(key, mapped_type()), static_cast<key_compare>(*this)));
+}
+
+template <typename K, typename V, typename T, typename A>
+bool VectorMap<K, V, T, A>::empty() const
+{
+    return m_entries.empty();
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::end()
+{
+    return m_entries.end();
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::end() const
+{
+    return m_entries.end();
+}
+
+template <typename K, typename V, typename T, typename A>
+std::pair<typename VectorMap<K, V, T, A>::iterator, typename VectorMap<K, V, T, A>::iterator> VectorMap<K, V, T, A>::equal_range(const key_type& key)
+{
+    iterator lower = lower_bound(key);
+    if (lower != m_entries.end() && key_compare::operator()(key, (*lower).first))
+    {
+        lower = m_entries.end();
+    }
+    iterator upper = lower;
+    if (upper != m_entries.end())
+    {
+        ++upper;
+    }
+    return std::make_pair(lower, upper);
+}
+
+template <typename K, typename V, typename T, typename A>
+std::pair<typename VectorMap<K, V, T, A>::const_iterator, typename VectorMap<K, V, T, A>::const_iterator> VectorMap<K, V, T, A>::equal_range(const key_type& key) const
+{
+    const_iterator lower = lower_bound(key);
+    if (lower != m_entries.end() && key_compare::operator()(key, (*lower).first))
+    {
+        lower = m_entries.end();
+    }
+    const_iterator upper = lower;
+    if (upper != m_entries.end())
+    {
+        ++upper;
+    }
+    return std::make_pair(lower, upper);
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::erase(iterator where)
+{
+    return m_entries.erase(where);
+}
+
+template <typename K, typename V, typename T, typename A>
+template <typename Predicate>
+void VectorMap<K, V, T, A>::erase_if(const Predicate& predicate)
+{
+    m_entries.erase(std::remove_if(m_entries.begin(), m_entries.end(), predicate), m_entries.end());
+    std::sort(m_entries.begin(), m_entries.end(), FirstLess(static_cast<key_compare>(*this)));
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::erase(iterator first, iterator last)
+{
+    return m_entries.erase(first, last);
+}
+
+template <typename K, typename V, typename T, typename A>
+void VectorMap<K, V, T, A>::erase(const key_type& key)
+{
+    iterator where = find(key);
+
+    if (where != m_entries.end())
+    {
+        m_entries.erase(where);
+    }
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::find(const key_type& key)
+{
+    iterator it = lower_bound(key);
+    if (it != m_entries.end() && key_compare::operator()(key, (*it).first))
+    {
+        it = m_entries.end();
+    }
+    return it;
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::find(const key_type& key) const
+{
+    const_iterator it = lower_bound(key);
+    if (it != m_entries.end() && key_compare::operator()(key, (*it).first))
+    {
+        it = m_entries.end();
+    }
+    return it;
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::allocator_type VectorMap<K, V, T, A>::get_allocator() const
+{
+    return m_entries.get_allocator();
+}
+
+template <typename K, typename V, typename T, typename A>
+std::pair<typename VectorMap<K, V, T, A>::iterator, bool> VectorMap<K, V, T, A>::insert(const value_type& val)
+{
+    iterator it = lower_bound(val.first);
+    bool insertionMade = false;
+    if (it == m_entries.end() || key_compare::operator()(val.first, (*it).first))
+    {
+        it = m_entries.insert(it, val), insertionMade = true;
+    }
+    return std::make_pair(it, insertionMade);
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::insert(iterator where, const value_type& val)
+{
+    return insert(val);
+}
+
+template <typename K, typename V, typename T, typename A>
+template <class InputIterator>
+void VectorMap<K, V, T, A>::insert(InputIterator first, InputIterator last)
+{
+    for (; first != last; ++first)
+    {
+        insert(*first);
+    }
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::key_compare VectorMap<K, V, T, A>::key_comp() const
+{
+    return static_cast<key_compare>(*this);
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::lower_bound(const key_type& key)
+{
+    int count = 0;
+    count = m_entries.size();
+    iterator first = m_entries.begin();
+    iterator last = m_entries.end();
+    for (; 0 < count; )
+    {   // divide and conquer, find half that contains answer
+        int count2 = count / 2;
+        iterator mid = first + count2;
+
+        if (key_compare::operator()(mid->first, key))
+        {
+            first = ++mid, count -= count2 + 1;
+        }
+        else
+        {
+            count = count2;
+        }
+    }
+    return first;
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::lower_bound(const key_type& key) const
+{
+    int count = 0;
+    count = m_entries.size();
+    const_iterator first = m_entries.begin();
+    const_iterator last = m_entries.end();
+    for (; 0 < count; )
+    {   // divide and conquer, find half that contains answer
+        int count2 = count / 2;
+        const_iterator mid = first + count2;
+
+        if (key_compare::operator()(mid->first, key))
+        {
+            first = ++mid, count -= count2 + 1;
+        }
+        else
+        {
+            count = count2;
+        }
+    }
+    return first;
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::size_type VectorMap<K, V, T, A>::max_size() const
+{
+    return m_entries.max_size();
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::reverse_iterator VectorMap<K, V, T, A>::rbegin()
+{
+    return m_entries.rbegin();
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::const_reverse_iterator VectorMap<K, V, T, A>::rbegin() const
+{
+    return m_entries.rbegin();
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::reverse_iterator VectorMap<K, V, T, A>::rend()
+{
+    return m_entries.rend();
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::const_reverse_iterator VectorMap<K, V, T, A>::rend() const
+{
+    return m_entries.rend();
+}
+
+template <typename K, typename V, typename T, typename A>
+void VectorMap<K, V, T, A>::reserve(size_type count)
+{
+    m_entries.reserve(count);
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::size_type VectorMap<K, V, T, A>::size() const
+{
+    return m_entries.size();
+}
+
+template <typename K, typename V, typename T, typename A>
+void VectorMap<K, V, T, A>::swap(VectorMap& other)
+{
+    m_entries.swap(other.m_entries);
+    std::swap(static_cast<key_compare&>(*this), static_cast<key_compare&>(other));
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::iterator VectorMap<K, V, T, A>::upper_bound(const key_type& key)
+{
+    iterator upper = lower_bound(key);
+    if (upper != m_entries.end() && !key_compare::operator()(key, (*upper).first))
+    {
+        ++upper;
+    }
+    return upper;
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::const_iterator VectorMap<K, V, T, A>::upper_bound(const key_type& key) const
+{
+    iterator upper = lower_bound(key);
+    if (upper != m_entries.end() && !key_compare::operator()(key, (*upper).first))
+    {
+        ++upper;
+    }
+    return upper;
+}
+
+template <typename K, typename V, typename T, typename A>
+typename VectorMap<K, V, T, A>::mapped_type& VectorMap<K, V, T, A>::operator[](const key_type& key)
+{
+    iterator it = find(key);
+    if (it == m_entries.end())
+    {
+        it = insert(value_type(key, mapped_type())).first;
+    }
+    return (*it).second;
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_VECTORMAP_H
diff --git a/Code/Legacy/CryCommon/VectorSet.h b/Code/Legacy/CryCommon/VectorSet.h
new file mode 100644
index 0000000000..9771c64c0a
--- /dev/null
+++ b/Code/Legacy/CryCommon/VectorSet.h
@@ -0,0 +1,491 @@
+/*
+ * 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 : std::set replacement implemented using sorted vector.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_VECTORSET_H
+#define CRYINCLUDE_CRYCOMMON_VECTORSET_H
+#pragma once
+
+
+//--------------------------------------------------------------------------
+// VectorSet
+//
+// Usage Notes:
+// This class is designed to be an (almost, see below) drop-in replacement
+// for std::set. It features an almost identical interface, but it is
+// implemented using a sorted vector rather than a tree. This is in most
+// cases more efficient, as there is less dynamic memory allocation and
+// pointer dereferencing.
+//
+// *************************************************************************
+// PLEASE NOTE: There is one vital difference between std::set and VectorSet
+// that you will need to note before trying to replace std::set. Since
+// VectorSet is implemented using a vector, iterators can and will be
+// invalidated by many operations, such as insertions and deletions, and
+// due to sorting potentially even normal lookups. Please Please PLEASE make
+// sure that you are not storing any iterators to this class.
+// *************************************************************************
+//
+// The class varies from the std::set API in that two of the erase methods
+// methods are not of void return type but return an iterator - this is
+// required in practice because they invalidate iterators, as noted above.
+//
+// * iterator erase(iterator where);
+// * iterator erase(iterator first, iterator last);
+//
+// It also adds operator[] to the API.
+//
+//
+// Performance Notes:
+//
+// This class uses the empty base optimization hack to allow comparison
+// predicate objects that have no state to take up no space in the object.
+// As a result the size of the overall VectorMap instance is the same as
+// that of the std::vector it uses to store the elements.
+//
+// In addition to the normal map interface, this class provides the
+// following members that can be used to manage memory requirements:
+//
+// * void reserve(size_type count);
+//   Allocate enough space for count elements (see vector::reserve()).
+//
+// * size_type capacity() const;
+//   Report how many elements can be stored without reallocating (see
+//   vector::capacity()).
+//
+// * void resize(size_type new_size, const_reference x=key_type());
+//   see vector::resize()).
+//
+//--------------------------------------------------------------------------
+
+template <typename K, typename T = AZStd::less<K>, typename A = AZ::StdLegacyAllocator >
+class VectorSet
+    : private T             // Empty base optimization
+{
+public:
+    typedef K key_type;
+    typedef A allocator_type;
+    typedef T key_compare;
+    typedef T value_compare;
+    typedef AZStd::vector<key_type, allocator_type> container_type;
+    typedef typename container_type::iterator iterator;
+    typedef typename container_type::const_iterator const_iterator;
+    typedef typename container_type::reverse_iterator reverse_iterator;
+    typedef typename container_type::const_reverse_iterator const_reverse_iterator;
+    typedef typename container_type::size_type size_type;
+    typedef typename container_type::difference_type difference_type;
+    typedef key_type& reference;
+    typedef const key_type& const_reference;
+    typedef key_type* pointer;
+    typedef const key_type* const_pointer;
+
+    VectorSet();
+    explicit VectorSet(const key_compare& comp);
+    explicit VectorSet(const key_compare& comp, const allocator_type& allocator);
+    VectorSet(const VectorSet<K, T, A>& right);
+    template <class InputIterator>
+    VectorSet(InputIterator first, InputIterator last);
+    template <class InputIterator>
+    VectorSet(InputIterator first, InputIterator last, const key_compare& comp);
+    template <class InputIterator>
+    VectorSet(InputIterator first, InputIterator last, const key_compare& comp, const allocator_type& allocator);
+    void SwapElementsWithVector(container_type& elementVector);
+    const_iterator begin() const;
+    iterator begin();
+    size_type capacity() const;
+    void resize(size_type __new_size, const_reference __x = key_type());
+    void clear();
+    size_type count(const_reference key) const;
+    bool empty() const;
+    const_iterator end() const;
+    iterator end();
+    std::pair<const_iterator, const_iterator> equal_range(const_reference key) const;
+    std::pair<iterator, iterator> equal_range(const_reference key);
+    iterator erase(iterator where);                                 // See documentation above
+    iterator erase(iterator first, iterator last);  // See documentation above
+    size_t erase(const_reference key);
+    iterator find(const_reference key);
+    const_iterator find(const_reference key) const;
+    allocator_type get_allocator() const;
+    std::pair<iterator, bool> insert(const_reference value);
+    iterator insert(iterator _Where, const_reference value);
+    template<class InputIterator>
+    void insert(InputIterator first, InputIterator last);
+    key_compare key_comp() const;
+    const_iterator lower_bound(const_reference key) const;
+    iterator lower_bound(const_reference key);
+    size_type max_size() const;
+    const_reverse_iterator rbegin() const;
+    reverse_iterator rbegin();
+    const_reverse_iterator rend() const;
+    reverse_iterator rend();
+    void reserve(size_type count);
+    size_type size() const;
+    void swap(VectorSet& right);
+    const_iterator upper_bound(const_reference key) const;
+    iterator upper_bound(const_reference key);
+    value_compare value_comp() const;
+    reference operator[](int index);              // See documentation above
+    const_reference operator[](int index) const;              // See documentation above
+
+    template<typename Sizer>
+    void GetMemoryUsage(Sizer* pSizer) const
+    {
+        pSizer->AddObject(m_entries);
+    }
+private:
+    container_type m_entries;
+};
+
+template <typename K, typename T, typename A>
+VectorSet<K, T, A>::VectorSet()
+{
+}
+
+template <typename K, typename T, typename A>
+VectorSet<K, T, A>::VectorSet(const key_compare& comp)
+    :   key_compare(comp)
+{
+}
+
+template <typename K, typename T, typename A>
+VectorSet<K, T, A>::VectorSet(const key_compare& comp, const allocator_type& allocator)
+    :   key_compare(comp)
+    , m_entries(allocator)
+{
+}
+
+template <typename K, typename T, typename A>
+VectorSet<K, T, A>::VectorSet(const VectorSet<K, T, A>& right)
+    :   key_compare(right)
+    , m_entries(right.m_entries)
+{
+}
+
+template <typename K, typename T, typename A>
+template <class InputIterator>
+VectorSet<K, T, A>::VectorSet(InputIterator first, InputIterator last)
+{
+    for (; first != last; ++first)
+    {
+        m_entries.push_back(*first);
+    }
+    std::sort(m_entries.begin(), m_entries.end(), static_cast<key_compare>(*this));
+}
+
+template <typename K, typename T, typename A>
+template <class InputIterator>
+VectorSet<K, T, A>::VectorSet(InputIterator first, InputIterator last, const key_compare& comp)
+    :   key_compare(comp)
+{
+    for (; first != last; ++first)
+    {
+        m_entries.push_back(*first);
+    }
+    std::sort(m_entries.begin(), m_entries.end(), static_cast<key_compare>(*this));
+}
+
+template <typename K, typename T, typename A>
+template <class InputIterator>
+VectorSet<K, T, A>::VectorSet(InputIterator first, InputIterator last, const key_compare& comp, const allocator_type& allocator)
+    :   key_compare(comp)
+    , m_entries(allocator)
+{
+    for (; first != last; ++first)
+    {
+        m_entries.push_back(*first);
+    }
+    std::sort(m_entries.begin(), m_entries.end(), static_cast<key_compare>(*this));
+}
+
+template <typename K, typename T, typename A>
+void VectorSet<K, T, A>::SwapElementsWithVector(container_type& elementVector)
+{
+    m_entries.swap(elementVector);
+    std::sort(m_entries.begin(), m_entries.end(), static_cast<key_compare>(*this));
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::begin() const
+{
+    return m_entries.begin();
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::begin()
+{
+    return m_entries.begin();
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::size_type VectorSet<K, T, A>::capacity() const
+{
+    return m_entries.capacity();
+}
+
+template <typename K, typename T, typename A>
+void VectorSet<K, T, A>::clear()
+{
+    m_entries.clear();
+}
+
+template <typename K, typename T, typename A>
+void VectorSet<K, T, A>::resize(size_type __new_size, const_reference __x)
+{
+    m_entries.resize(__new_size, __x);
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::size_type VectorSet<K, T, A>::count(const_reference key) const
+{
+    return size_type(std::binary_search(m_entries.begin(), m_entries.end(), key, static_cast<key_compare>(*this)));
+}
+
+template <typename K, typename T, typename A>
+bool VectorSet<K, T, A>::empty() const
+{
+    return m_entries.empty();
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::end() const
+{
+    return m_entries.end();
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::end()
+{
+    return m_entries.end();
+}
+
+template <typename K, typename T, typename A>
+std::pair<typename VectorSet<K, T, A>::const_iterator, typename VectorSet<K, T, A>::const_iterator> VectorSet<K, T, A>::equal_range(const_reference key) const
+{
+    const_iterator lower = lower_bound(key);
+    if (lower != m_entries.end() && key_compare::operator()(key, *lower))
+    {
+        lower = m_entries.end();
+    }
+    const_iterator upper = lower;
+    if (upper != m_entries.end())
+    {
+        ++upper;
+    }
+    return std::make_pair(lower, upper);
+}
+
+template <typename K, typename T, typename A>
+std::pair<typename VectorSet<K, T, A>::iterator, typename VectorSet<K, T, A>::iterator> VectorSet<K, T, A>::equal_range(const_reference key)
+{
+    iterator lower = lower_bound(key);
+    if (lower != m_entries.end() && key_compare::operator()(key, *lower))
+    {
+        lower = m_entries.end();
+    }
+    iterator upper = lower;
+    if (upper != m_entries.end())
+    {
+        ++upper;
+    }
+    return std::make_pair(lower, upper);
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::erase(iterator where)
+{
+    return m_entries.erase(where);
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::erase(iterator first, iterator last)
+{
+    return m_entries.erase(first, last);
+}
+
+template <typename K, typename T, typename A>
+size_t VectorSet<K, T, A>::erase(const_reference key)
+{
+    iterator where = find(key);
+
+    if (where != m_entries.end())
+    {
+        // Note erasing entries does not invalidate the sort - no need to trigger a re-sort.
+        m_entries.erase(where);
+        return 1;
+    }
+
+    return 0;
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::find(const_reference key)
+{
+    iterator it = lower_bound(key);
+    if (it != m_entries.end() && key_compare::operator()(key, *it))
+    {
+        it = m_entries.end();
+    }
+    return it;
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::find(const_reference key) const
+{
+    const_iterator it = lower_bound(key);
+    if (it != m_entries.end() && key_compare::operator()(key, *it))
+    {
+        it = m_entries.end();
+    }
+    return it;
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::allocator_type VectorSet<K, T, A>::get_allocator() const
+{
+    return m_entries.get_allocator();
+}
+
+template <typename K, typename T, typename A>
+std::pair<typename VectorSet<K, T, A>::iterator, bool> VectorSet<K, T, A>::insert(const_reference value)
+{
+    iterator it = lower_bound(value);
+    bool insertionMade = false;
+    if (it == m_entries.end() || key_compare::operator()(value, (*it)))
+    {
+        it = m_entries.insert(it, value), insertionMade = true;
+    }
+    return std::make_pair(it, insertionMade);
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::insert(iterator where, const_reference value)
+{
+    return insert(value);
+}
+
+template <typename K, typename T, typename A>
+template<class InputIterator>
+void VectorSet<K, T, A>::insert(InputIterator first, InputIterator last)
+{
+    for (; first != last; ++first)
+    {
+        insert(*first);
+    }
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::key_compare VectorSet<K, T, A>::key_comp() const
+{
+    return static_cast<key_compare>(*this);
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::lower_bound(const_reference key) const
+{
+    return std::lower_bound(m_entries.begin(), m_entries.end(), key, static_cast<key_compare>(*this));
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::lower_bound(const_reference key)
+{
+    return std::lower_bound(m_entries.begin(), m_entries.end(), key, static_cast<key_compare>(*this));
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::size_type VectorSet<K, T, A>::max_size() const
+{
+    return m_entries.max_size();
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::const_reverse_iterator VectorSet<K, T, A>::rbegin() const
+{
+    return m_entries.rbegin();
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::reverse_iterator VectorSet<K, T, A>::rbegin()
+{
+    return m_entries.rbegin();
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::const_reverse_iterator VectorSet<K, T, A>::rend() const
+{
+    return m_entries.rend();
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::reverse_iterator VectorSet<K, T, A>::rend()
+{
+    return m_entries.rend();
+}
+
+template <typename K, typename T, typename A>
+void VectorSet<K, T, A>::reserve(size_type count)
+{
+    m_entries.reserve(count);
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::size_type VectorSet<K, T, A>::size() const
+{
+    return m_entries.size();
+}
+
+template <typename K, typename T, typename A>
+void VectorSet<K, T, A>::swap(VectorSet& other)
+{
+    m_entries.swap(other.m_entries);
+    std::swap(static_cast<key_compare&>(*this), static_cast<key_compare&>(other));
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::const_iterator VectorSet<K, T, A>::upper_bound(const_reference key) const
+{
+    const_iterator upper = lower_bound(key);
+    if (upper != m_entries.end() && !key_compare::operator()(key, *upper))
+    {
+        ++upper;
+    }
+    return upper;
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::iterator VectorSet<K, T, A>::upper_bound(const_reference key)
+{
+    iterator upper = lower_bound(key);
+    if (upper != m_entries.end() && !key_compare::operator()(key, *upper))
+    {
+        ++upper;
+    }
+    return upper;
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::value_compare VectorSet<K, T, A>::value_comp() const
+{
+    return static_cast<key_compare>(*this);
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::reference VectorSet<K, T, A>::operator[](int index)
+{
+    return m_entries[index];
+}
+
+template <typename K, typename T, typename A>
+typename VectorSet<K, T, A>::const_reference VectorSet<K, T, A>::operator[](int index) const
+{
+    return m_entries[index];
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_VECTORSET_H
diff --git a/Code/Legacy/CryCommon/Vertex.h b/Code/Legacy/CryCommon/Vertex.h
new file mode 100644
index 0000000000..f00d93b198
--- /dev/null
+++ b/Code/Legacy/CryCommon/Vertex.h
@@ -0,0 +1,1088 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/array.h>
+namespace AZ
+{
+    namespace Vertex
+    {
+        const uint32_t VERTEX_BUFFER_ALIGNMENT = 4;
+        // This enum must only have 8 entries because only 3 bits are used to store usage.
+        enum class AttributeUsage : uint8
+        {
+            Position,
+            Color,
+            Normal,
+            TexCoord,
+            Weights,
+            Indices,
+            Tangent,
+            BiTangent,
+            NumUsages
+        };
+
+        struct AttributeUsageData
+        {
+            AZStd::string friendlyName;
+            AZStd::string semanticName;
+        };
+
+        static AttributeUsageData AttributeUsageDataTable[(uint)AttributeUsage::NumUsages] =
+        {
+            // {friendlyName, semanticName}
+            { "Position", "POSITION" },
+            { "Color", "COLOR" },
+            { "Normal", "NORMAL" },
+            { "TexCoord", "TEXCOORD" },
+            { "Weights", "BLENDWEIGHT" },
+            { "Indices", "BLENDINDICES" },
+            { "Tangent", "TEXCOORD" },
+            { "BiTangent", "TEXCOORD" }
+        };
+
+        // This enum must have 32 or less entries as 5 bits are used to store type.
+        enum class AttributeType : uint8
+        {
+            Float16_1 = 0,
+            Float16_2,
+            Float16_4,
+
+            Float32_1,
+            Float32_2,
+            Float32_3,
+            Float32_4,
+
+            Byte_1,
+            Byte_2,
+            Byte_4,
+
+            Short_1,
+            Short_2,
+            Short_4,
+
+            UInt16_1,
+            UInt16_2,
+            UInt16_4,
+
+            UInt32_1,
+            UInt32_2,
+            UInt32_3,
+            UInt32_4,
+
+            NumTypes
+        };    
+
+        struct AttributeTypeData
+        {
+            AZStd::string friendlyName;
+            uint8 byteSize;
+        };
+
+        static AttributeTypeData AttributeTypeDataTable[(unsigned int)AZ::Vertex::AttributeType::NumTypes] =
+        {
+            { "Float16_1", 2 },
+            { "Float16_2", 4 },
+            { "Float16_4", 8 },
+
+            { "Float32_1", 4 },
+            { "Float32_2", 8 },
+            { "Float32_3", 12 },
+            { "Float32_4", 16 },
+
+            { "Byte_1", 1 },
+            { "Byte_2", 2 },
+            { "Byte_4", 4 },
+
+            { "Short_1", 2 },
+            { "Short_2", 4 },
+            { "Short_4", 8 },
+
+            { "UInt16_1", 2 },
+            { "UInt16_2", 4 },
+            { "UInt16_4", 8 },
+
+            { "UInt32_1", 4 },
+            { "UInt32_2", 8 },
+            { "UInt32_3", 12 },
+            { "UInt32_4", 16 },
+        };
+
+        //! Stores the usage, type, and byte length of an individual vertex attribute
+        class Attribute
+        {
+        public:
+            // Usage stored in the 3 lower bits and Type stored in the 5 upper bits.
+            static const uint8 kUsageBitCount = 3;
+            static const uint8 kUsageMask = 0x07;
+            static const uint8 kTypeMask = 0xf8;
+            static uint8 CreateAttribute(AttributeUsage usage, AttributeType type)
+            {
+                return (static_cast<uint8>(type) << kUsageBitCount) | static_cast<uint8>(usage);
+            }
+            static AttributeUsage GetUsage(const uint8 attribute)
+            { 
+                return static_cast<AttributeUsage>(attribute & kUsageMask);
+            }
+            static AttributeType GetType(const uint8 attribute)
+            { 
+                return static_cast<AttributeType>((attribute & kTypeMask) >> kUsageBitCount);
+            }
+            static uint8 GetByteLength(const uint8 attribute)
+            { 
+                return AttributeTypeDataTable[(uint)GetType(attribute)].byteSize;
+            }
+            static const AZStd::string& GetSemanticName(uint8 attribute)
+            {
+                return AttributeUsageDataTable[(uint)GetUsage(attribute)].semanticName;
+            }
+        };
+
+        //! Flexible vertex format class
+        class Format
+        {
+        public:
+            Format(){};
+
+
+            //! Conversion from old hard-coded EVertexFormat enum to new, flexible vertex class
+            Format(EVertexFormat format)
+            {
+                m_enum = eVF_Unknown;
+                m_numAttributes = 0;
+                switch (format)
+                {
+                case eVF_Unknown:
+                    m_enum = eVF_Unknown;
+                    break;
+                case eVF_P3F_C4B_T2F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    m_enum = eVF_P3F_C4B_T2F;
+                    break;
+                case eVF_P3F_C4B_T2F_T2F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    m_enum = eVF_P3F_C4B_T2F_T2F;
+                    break;
+                case eVF_P3S_C4B_T2S:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float16_4));// vec3f16 is backed by a CryHalf4
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
+                    m_enum = eVF_P3S_C4B_T2S;
+                    break;
+                case eVF_P3S_C4B_T2S_T2S:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float16_4));// vec3f16 is backed by a CryHalf4
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
+                    m_enum = eVF_P3S_C4B_T2S_T2S;
+                    break;
+                case eVF_P3S_N4B_C4B_T2S:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float16_4));// vec3f16 is backed by a CryHalf4
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Normal, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
+                    m_enum = eVF_P3S_N4B_C4B_T2S;
+                    break;
+                case eVF_P3F_C4B_T4B_N3F2:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Tangent, AttributeType::Float32_3));//x-axis
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::BiTangent, AttributeType::Float32_3));//y-axis
+#ifdef PARTICLE_MOTION_BLUR // Nonfunctional and disabled.
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));//prevPos
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Tangent, AttributeType::Float32_3));//prevXTan
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::BiTangent, AttributeType::Float32_3));//prevYTan
+#endif
+                    m_enum = eVF_P3F_C4B_T4B_N3F2;// Particles.
+                    break;
+                case eVF_TP3F_C4B_T2F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    m_enum = eVF_TP3F_C4B_T2F;// Fonts (28 bytes).
+                    break;
+                case eVF_TP3F_T2F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_TP3F_T2F_T3F;
+                    break;
+                case eVF_P3F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_T3F; // Miscellaneus.
+                    break;
+                case eVF_P3F_T2F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_T2F_T3F;
+                    break;
+                // Additional streams
+                case eVF_T2F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    m_enum = eVF_T2F; // Light maps TC (8 bytes).
+                    break;
+                case eVF_W4B_I4S:// Skinned weights/indices stream.
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Weights, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Indices, AttributeType::UInt16_4));
+                    m_enum = eVF_W4B_I4S;
+                    break;
+                case eVF_C4B_C4B:// SH coefficients.
+                    // We use the "Weights" usage since sh coefs use an unknown usage of 4 bytes.
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Weights, AttributeType::Byte_4));    //coef0
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Weights, AttributeType::Byte_4));    //coef1
+                    m_enum = eVF_C4B_C4B;
+                    break;
+                case eVF_P3F_P3F_I4B:// Shape deformation stream.
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));    //thin
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));    //fat
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Indices, AttributeType::Byte_4));
+                    m_enum = eVF_P3F_P3F_I4B;
+                    break;
+                case eVF_P3F:// Velocity stream.
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    m_enum = eVF_P3F;
+                    break;
+                case eVF_C4B_T2S:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
+                    m_enum = eVF_C4B_T2S;// General (Position is merged with Tangent stream)
+                    break;
+                case eVF_P2F_T4F_C4F: // Lens effects simulation
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    m_enum = eVF_P2F_T4F_C4F;
+                    break;
+                case eVF_P2F_T4F_T4F_C4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    m_enum = eVF_P2F_T4F_T4F_C4F;
+                    break;
+                case eVF_P2S_N4B_C4B_T1F:// terrain
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float16_2));// xy-coordinates in terrain
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Normal, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));// z-coordinate in terrain
+                    m_enum = eVF_P2S_N4B_C4B_T1F;
+                    break;
+                case eVF_P3F_C4B_T2S:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float16_2));
+                    m_enum = eVF_P3F_C4B_T2S;
+                    break;
+                case eVF_P2F_C4B_T2F_F4B:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Indices, AttributeType::UInt16_2));
+                    m_enum = eVF_P2F_C4B_T2F_F4B;
+                    break;
+                case eVF_P3F_C4B:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Byte_4));
+                    m_enum = eVF_P3F_C4B;
+                    break;
+                case eVF_P3F_C4F_T2F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    m_enum = eVF_P3F_C4F_T2F;
+                    break;
+                case eVF_P3F_C4F_T2F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T2F_T3F;
+                    break;
+                case eVF_P3F_C4F_T2F_T3F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T2F_T3F_T3F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    m_enum = eVF_P3F_C4F_T2F_T1F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F_T3F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T3F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    m_enum = eVF_P3F_C4F_T4F_T2F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T3F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T3F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F;
+                    break;
+                case eVF_P4F_T2F_C4F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P4F_T2F_C4F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T3F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T3F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T1F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F;
+                    break;
+                case eVF_P4F_T2F_C4F_T4F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P4F_T2F_C4F_T4F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T1F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F;
+                    break;
+                case eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_1));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_3));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F;
+                    break;
+                case eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F:
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Position, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_2));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::Color, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    AddAttribute(Attribute::CreateAttribute(AttributeUsage::TexCoord, AttributeType::Float32_4));
+                    m_enum = eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F;
+                    break;
+                case eVF_Max:
+                default:
+                    AZ_Error("VF", false, "Invalid vertex format");
+                    m_enum = eVF_Unknown;
+                }
+                CalculateStrideAndUsageCounts();
+            }
+
+            //! Get the equivalent old-style EVertexFormat enum
+            uint GetEnum() const { return m_enum; }
+
+            static const uint8 kHas16BitFloatPosition  = 0x4;
+            static const uint8 kHas16BitFloatTexCoords = 0x2;
+            static const uint8 kHas32BitFloatTexCoords = 0x1;
+
+            
+            //! Helper function to check to see if the vertex format has a position attribute that uses 16 bit floats for the underlying type
+            bool Has16BitFloatPosition() const
+            {
+                return (m_flags & kHas16BitFloatPosition) != 0x0;
+            }
+            
+            //! Helper function to check to see if the vertex format has a texture coordinate attribute that uses 16 bit floats for the underlying type
+            bool Has16BitFloatTextureCoordinates() const
+            {
+                return (m_flags & kHas16BitFloatTexCoords) != 0x0;
+            }
+
+            //! Helper function to check to see if the vertex format has a texture coordinate attribute that uses 32 bit floats for the underlying type
+            bool Has32BitFloatTextureCoordinates() const
+            {
+                return (m_flags & kHas32BitFloatTexCoords) != 0x0;
+            }
+
+
+            uint32 GetAttributeUsageCount(AttributeUsage usage) const
+            {
+                return (uint32)m_attributeUsageCounts[(uint)usage];
+            }
+
+            bool TryGetAttributeOffsetAndType(AttributeUsage usage, uint32 index, uint& outOffset, AttributeType& outType) const
+            {
+                outOffset = 0;
+                outType = AttributeType::NumTypes;
+                for (uint ii=0; ii < m_numAttributes; ++ii)
+                {
+                    uint8 attribute = m_vertexAttributes[ii];
+                    if (Attribute::GetUsage(attribute) == usage)
+                    {
+                        if (index == 0)
+                        {
+                            outType = Attribute::GetType(attribute);
+                            return true;
+                        }
+                        else
+                        {
+                            --index;
+                        }
+                    }
+                    outOffset += Attribute::GetByteLength(attribute);
+                }
+                return false;
+            }
+
+            uint8 GetAttributeByteLength(AttributeUsage usage) const
+            {
+                for (uint ii = 0; ii < m_numAttributes; ++ii)
+                {
+                    uint8 attribute = m_vertexAttributes[ii];
+                    if (Attribute::GetUsage(attribute) == usage)
+                    {
+                        return Attribute::GetByteLength(attribute);
+                    }
+                }
+                return 0;
+            }
+
+
+            const uint8* GetAttributes( uint32 &outCount) const
+            {
+                outCount = m_numAttributes;
+                return m_vertexAttributes;
+            }
+
+            //! Return true if the vertex format is a superset of the input
+            bool IsSupersetOf(const AZ::Vertex::Format& input) const
+            {
+                uint32 count = 0;
+                const uint8* attributes = input.GetAttributes(count);
+                for ( uint8 ii=0; ii<count; ++ii)
+                {
+                    const uint8 attribute = attributes[ii];
+                    if (GetAttributeUsageCount(Attribute::GetUsage(attribute)) < input.GetAttributeUsageCount(Attribute::GetUsage(attribute)))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            uint GetStride(void) const { return m_stride; }
+            
+            //! Returns the true if an attribute with the given usage is found, false otherwise
+            bool TryCalculateOffset(uint& offset, AttributeUsage usage, uint index = 0) const
+            {
+                offset = 0;
+                for (uint ii = 0; ii < m_numAttributes; ++ii)
+                {
+                    uint8 attribute = m_vertexAttributes[ii];
+                    if (Attribute::GetUsage(attribute) == usage)
+                    {
+                        if (index == 0)
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            --index;
+                        }
+                    }
+                    offset += Attribute::GetByteLength(attribute);
+                }
+                return false;
+            }
+
+            // Quick comparison operators.
+            bool operator==(const Format& other) const
+            {
+                return m_enum == other.m_enum;
+            }
+            bool operator!=(const Format& other) const
+            {
+                return !(*this == other);
+            }
+            bool operator==(const EVertexFormat& other) const
+            {
+                return m_enum == other;
+            }
+            // Used in RendermeshMerger.cpp
+            // CHWShader_D3D::mfUpdateFXVertexFormat and CHWShader_D3D::mfVertexFormat want the max between two vertex formats...why? It seems like a bad guess of which vertex format to use since there's no particular order to EVertexFormats...other than the more specialized EVertexFormats come after the base EVertexFormats
+            bool operator<(const Format& other) const
+            {
+                return m_enum < other.m_enum;
+            }
+            bool operator<=(const Format& other) const
+            {
+                return (*this == other || *this < other);
+            }
+            bool operator>(const Format& other) const
+            {
+                return !(*this <= other);
+            }
+            bool operator>=(const Format& other) const
+            {
+                return (*this == other || *this > other);
+            }
+        private:
+            void AddAttribute(uint8 attribute)
+            {
+                AZ_Assert(m_numAttributes < kMaxAttributes, "Too many attributes added.  Change the size of kMaxAttributes");
+                m_vertexAttributes[m_numAttributes++] = attribute;
+
+                // Update the flags.
+                AttributeUsage usage = Attribute::GetUsage(attribute);
+                AttributeType type = Attribute::GetType(attribute);
+                if (usage == AttributeUsage::TexCoord)
+                {
+                    if (type == AttributeType::Float16_2) {
+                        m_flags |= kHas16BitFloatTexCoords;
+                    }
+                    else if (type == AttributeType::Float32_2 || type == AttributeType::Float32_3 || type == AttributeType::Float32_4) {
+                        m_flags |= kHas32BitFloatTexCoords;
+                    }
+                }
+                else if (usage == AttributeUsage::Position && type == AttributeType::Float16_4) {
+                    m_flags |= kHas16BitFloatPosition;
+                }
+            }
+
+            //! Calculates the sum of the size in bytes of all attributes that make up this format
+            void CalculateStrideAndUsageCounts()
+            {
+                static_assert((uint32)AttributeUsage::NumUsages <= 8, "We use 3 bits to represent usage so we only support 8 usages for a vertex format attribute.");
+                static_assert((uint32)AttributeType::NumTypes <= 32, "We use 5 bits to represent type so we only support up to 32 types for a vertex format attribute.");
+
+                for (uint index = 0; index < (uint)AttributeUsage::NumUsages; ++index)
+                {
+                    m_attributeUsageCounts[index] = 0;
+                }
+                uint32 stride = 0;
+                for (uint ii = 0; ii < m_numAttributes; ++ii)
+                {
+                    uint8 attribute = m_vertexAttributes[ii];
+                    stride += Attribute::GetByteLength(attribute);
+                    m_attributeUsageCounts[(uint)Attribute::GetUsage(attribute)]++;
+                }
+                AZ_Assert(stride < (0x1 << (sizeof(m_stride) * 8)), "Vertex stride is larger than the maximum supported, update the type for m_stride in Vertex.h");
+
+                m_stride = stride;
+            }
+            
+
+
+#ifdef PARTICLE_MOTION_BLUR
+            static const uint32_t kMaxAttributes = 8;
+#else
+            static const uint32_t kMaxAttributes = 10;
+#endif
+            uint8 m_vertexAttributes[kMaxAttributes] = { 0 };
+
+            uint8 m_attributeUsageCounts[(uint)AttributeUsage::NumUsages] = { 0 };
+            uint8 m_numAttributes = 0;
+            uint8 m_enum = eVF_Unknown;
+            uint8 m_stride = 0;
+            uint8 m_flags = 0x0;
+        };
+
+
+        // bNeedNormals=1 - float normals; bNeedNormals=2 - byte normals //waltont TODO (this was copied as is from vertexformats.h) this comment is out of date and the function does not even use all the parameters. This should be replaceable with the new vertex class, and should be replaced when refactoring CHWShader_D3D::mfVertexFormat which handles the shader parsing/serialization
+        _inline Format VertFormatForComponents([[maybe_unused]] bool bNeedCol, [[maybe_unused]] bool bHasTC, bool bHasTC2, bool bHasPS, bool bHasNormal)
+        {
+            AZ::Vertex::Format RequestedVertFormat;
+
+            if (bHasPS)
+            {
+                RequestedVertFormat = AZ::Vertex::Format(eVF_P3F_C4B_T4B_N3F2);
+            }
+            else
+            if (bHasNormal)
+            {
+                RequestedVertFormat = AZ::Vertex::Format(eVF_P3S_N4B_C4B_T2S);
+            }
+            else
+            {
+                if (!bHasTC2)
+                {
+                    RequestedVertFormat = AZ::Vertex::Format(eVF_P3S_C4B_T2S);
+                }
+                else
+                {
+                    RequestedVertFormat = AZ::Vertex::Format(eVF_P3F_C4B_T2F_T2F);
+                }
+            }
+
+            return RequestedVertFormat;
+        }
+    }
+}
diff --git a/Code/Legacy/CryCommon/VertexFormats.h b/Code/Legacy/CryCommon/VertexFormats.h
new file mode 100644
index 0000000000..9f230c47c7
--- /dev/null
+++ b/Code/Legacy/CryCommon/VertexFormats.h
@@ -0,0 +1,1386 @@
+/*
+ * 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_VERTEXFORMATS_H
+#define CRYINCLUDE_CRYCOMMON_VERTEXFORMATS_H
+
+#pragma once
+
+#include <CryArray.h>
+// Stream Configuration options
+#define ENABLE_NORMALSTREAM_SUPPORT 1
+
+enum EVertexFormat : uint8
+{
+    eVF_Unknown,
+
+    // Base stream
+    eVF_P3F_C4B_T2F,
+    eVF_P3F_C4B_T2F_T2F,
+    eVF_P3S_C4B_T2S,
+    eVF_P3S_C4B_T2S_T2S, // For UV2 support
+    eVF_P3S_N4B_C4B_T2S,
+
+    eVF_P3F_C4B_T4B_N3F2, // Particles.
+    eVF_TP3F_C4B_T2F, // Fonts (28 bytes).
+    eVF_TP3F_T2F_T3F,  // Miscellaneus.
+    eVF_P3F_T3F,       // Miscellaneus. (AuxGeom)
+    eVF_P3F_T2F_T3F,   // Miscellaneus.
+
+    // Additional streams
+    eVF_T2F,           // Light maps TC (8 bytes).
+    eVF_W4B_I4S,  // Skinned weights/indices stream.
+    eVF_C4B_C4B,      // SH coefficients.
+    eVF_P3F_P3F_I4B,  // Shape deformation stream.
+    eVF_P3F,       // Velocity stream.
+
+    eVF_C4B_T2S,     // General (Position is merged with Tangent stream)
+
+    // Lens effects simulation
+    eVF_P2F_T4F_C4F,  // primary
+    eVF_P2F_T4F_T4F_C4F,
+
+    eVF_P2S_N4B_C4B_T1F,
+    eVF_P3F_C4B_T2S,
+    eVF_P2F_C4B_T2F_F4B, // UI
+    eVF_P3F_C4B,// Auxiliary geometry
+
+
+    eVF_P3F_C4F_T2F,  //numbering for tracking the new vertex formats and for comparison with testing 23
+    eVF_P3F_C4F_T2F_T3F,
+    eVF_P3F_C4F_T2F_T3F_T3F,
+    eVF_P3F_C4F_T2F_T1F,
+    eVF_P3F_C4F_T2F_T1F_T3F,
+    eVF_P3F_C4F_T2F_T1F_T3F_T3F,
+    eVF_P3F_C4F_T4F_T2F,
+    eVF_P3F_C4F_T4F_T2F_T3F,  //30
+    eVF_P3F_C4F_T4F_T2F_T3F_T3F,
+    eVF_P3F_C4F_T4F_T2F_T1F,
+    eVF_P3F_C4F_T4F_T2F_T1F_T3F,
+    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F,
+    eVF_P3F_C4F_T2F_T2F_T1F,  //35
+    eVF_P3F_C4F_T2F_T2F_T1F_T3F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F,  //40
+    eVF_P4F_T2F_C4F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T4F,
+    eVF_P3F_C4F_T2F_T3F_T4F,
+    eVF_P3F_C4F_T2F_T3F_T3F_T4F,
+    eVF_P3F_C4F_T2F_T1F_T4F,  //45
+    eVF_P3F_C4F_T2F_T1F_T3F_T4F,
+    eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T3F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F,  //50
+    eVF_P3F_C4F_T4F_T2F_T1F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F,  //55
+    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F,
+    eVF_P4F_T2F_C4F_T4F_T4F_T4F,  //60
+    eVF_P3F_C4F_T2F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T1F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F,  //65
+    eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T4F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F,  //70
+    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F,  //75
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F,
+    eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F,
+    eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F,
+
+    eVF_Max,
+};
+
+
+typedef Vec4_tpl<int16> Vec4sf;     // Used for tangents only.
+
+struct UCol
+{
+    union
+    {
+        uint32 dcolor;
+        uint8  bcolor[4];
+
+        struct
+        {
+            uint8 b, g, r, a;
+        };
+        struct
+        {
+            uint8 z, y, x, w;
+        };
+    };
+
+    // get normal vector from unsigned 8bit integers (can't point up/down and is not normal)
+    ILINE Vec3 GetN()
+    {
+        return Vec3
+               (
+            (bcolor[0] - 128.0f) / 127.5f,
+            (bcolor[1] - 128.0f) / 127.5f,
+            (bcolor[2] - 128.0f) / 127.5f
+               );
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+struct Vec3f16
+    : public CryHalf4
+{
+    _inline Vec3f16()
+    {
+    }
+    _inline Vec3f16(f32 _x, f32 _y, f32 _z)
+    {
+        x = CryConvertFloatToHalf(_x);
+        y = CryConvertFloatToHalf(_y);
+        z = CryConvertFloatToHalf(_z);
+        w = CryConvertFloatToHalf(1.0f);
+    }
+    float operator[](int i) const
+    {
+        assert(i <= 3);
+        return CryConvertHalfToFloat(((CryHalf*)this)[i]);
+    }
+    _inline Vec3f16& operator = (const Vec3& sl)
+    {
+        x = CryConvertFloatToHalf(sl.x);
+        y = CryConvertFloatToHalf(sl.y);
+        z = CryConvertFloatToHalf(sl.z);
+        w = CryConvertFloatToHalf(1.0f);
+        return *this;
+    }
+    _inline Vec3f16& operator = (const Vec4A& sl)
+    {
+        x = CryConvertFloatToHalf(sl.x);
+        y = CryConvertFloatToHalf(sl.y);
+        z = CryConvertFloatToHalf(sl.z);
+        w = CryConvertFloatToHalf(sl.w);
+        return *this;
+    }
+    _inline Vec3 ToVec3() const
+    {
+        Vec3 v;
+        v.x = CryConvertHalfToFloat(x);
+        v.y = CryConvertHalfToFloat(y);
+        v.z = CryConvertHalfToFloat(z);
+        return v;
+    }
+};
+
+struct Vec2f16
+    : public CryHalf2
+{
+    _inline Vec2f16()
+    {
+    }
+    _inline Vec2f16(f32 _x, f32 _y)
+    {
+        x = CryConvertFloatToHalf(_x);
+        y = CryConvertFloatToHalf(_y);
+    }
+    Vec2f16& operator = (const Vec2f16& sl)
+    {
+        x = sl.x;
+        y = sl.y;
+        return *this;
+    }
+    Vec2f16& operator = (const Vec2& sl)
+    {
+        x = CryConvertFloatToHalf(sl.x);
+        y = CryConvertFloatToHalf(sl.y);
+        return *this;
+    }
+    float operator[](int i) const
+    {
+        assert(i <= 1);
+        return CryConvertHalfToFloat(((CryHalf*)this)[i]);
+    }
+    _inline Vec2 ToVec2() const
+    {
+        Vec2 v;
+        v.x = CryConvertHalfToFloat(x);
+        v.y = CryConvertHalfToFloat(y);
+        return v;
+    }
+};
+
+
+struct SVF_P3F_C4B
+{
+    Vec3 xyz;
+    UCol color;
+};
+
+struct SVF_P3F_C4B_T2F
+{
+    Vec3 xyz;
+    UCol color;
+    Vec2 st;
+};
+
+struct SVF_P3F_C4B_T2F_T2F
+{
+    Vec3 xyz;
+    UCol color;
+    Vec2 st;
+    Vec2 st2;
+};
+
+struct SVF_P2F_C4B_T2F_F4B
+{
+    Vec2 xy;
+    UCol color;
+    Vec2 st;
+    uint8 texIndex;
+    uint8 texHasColorChannel;
+    uint8 texIndex2;
+    uint8 pad;
+};
+
+struct SVF_TP3F_C4B_T2F //Fonts
+{
+    Vec4 pos;
+    UCol color;
+    Vec2 st;
+};
+struct SVF_P3S_C4B_T2S
+{
+    Vec3f16 xyz;
+    UCol color;
+    Vec2f16 st;
+
+    AUTO_STRUCT_INFO
+};
+
+struct SVF_P3S_C4B_T2S_T2S
+{
+    Vec3f16 xyz;
+    UCol color;
+    Vec2f16 st;
+    Vec2f16 st2;
+
+    AUTO_STRUCT_INFO
+};
+
+struct SVF_P3F_C4B_T2S
+{
+    Vec3 xyz;
+    UCol color;
+    Vec2f16 st;
+};
+
+struct SVF_P3S_N4B_C4B_T2S
+{
+    Vec3f16 xyz;
+    UCol normal;
+    UCol color;
+    Vec2f16 st;
+};
+
+struct SVF_P2S_N4B_C4B_T1F
+{
+    CryHalf2 xy;
+    UCol normal;
+    UCol color;
+    float z;
+};
+
+struct SVF_T2F
+{
+    Vec2 st;
+};
+struct SVF_W4B_I4S
+{
+    UCol weights;
+    uint16 indices[4];
+};
+struct SVF_C4B_C4B
+{
+    UCol coef0;
+    UCol coef1;
+};
+struct SVF_P3F_P3F_I4B
+{
+    Vec3 thin;
+    Vec3 fat;
+    UCol index;
+};
+struct SVF_P3F
+{
+    Vec3 xyz;
+};
+struct SVF_P3F_T3F
+{
+    Vec3 p;
+    Vec3 st;
+};
+struct SVF_P3F_T2F_T3F
+{
+    Vec3 p;
+    Vec2 st0;
+    Vec3 st1;
+};
+struct SVF_TP3F_T2F_T3F
+{
+    Vec4 p;
+    Vec2 st0;
+    Vec3 st1;
+};
+struct SVF_P2F_T4F_C4F
+{
+    Vec2 p;
+    Vec4 st;
+    Vec4 color;
+};
+
+struct SVF_P2F_T4F_T4F_C4F
+{
+    Vec2 p;
+    Vec4 st;
+    Vec4 st2;
+    Vec4 color;
+};
+
+struct SVF_P3F_C4B_I4B_PS4F
+{
+    Vec3 xyz;
+    Vec2 prevXaxis;
+    Vec2 prevYaxis;
+    UCol color;
+    Vec3 prevPos;
+    struct SpriteInfo
+    {
+        uint8       tex_x, tex_y, tex_z, backlight;     // xyzw
+    } info;
+    Vec2 xaxis;
+    Vec2 yaxis;
+};
+
+struct SVF_P3F_C4B_T4B_N3F2
+{
+    Vec3 xyz;
+    UCol color;
+    UCol st; // st is used as a color, even though st usually refers to a TexCoord
+    Vec3 xaxis;
+    Vec3 yaxis;
+#ifdef PARTICLE_MOTION_BLUR
+    Vec3 prevPos;
+    Vec3 prevXTan;
+    Vec3 prevYTan;
+#endif
+};
+
+struct SVF_C4B_T2S
+{
+    UCol color;
+    Vec2f16 st;
+};
+
+struct SVF_P3F_C4F_T2F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st;
+};
+
+struct SVF_P3F_C4F_T2F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec3 st1;
+};
+
+struct SVF_P3F_C4F_T2F_T3F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec3 st1;
+    Vec3 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T1F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st;
+    float z;
+};
+
+struct SVF_P3F_C4F_T2F_T1F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    float z;
+    Vec3 st1;
+};
+
+struct SVF_P3F_C4F_T2F_T1F_T3F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    float z;
+    Vec3 st1;
+    Vec3 st2;
+};
+
+
+struct SVF_P3F_C4F_T4F_T2F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    Vec3 st2;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T3F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    Vec3 st2;
+    Vec3 st3;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec3 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec3 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+    Vec3 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+    Vec3 st2;
+    Vec3 st3;
+};
+
+struct SVF_P4F_T2F_C4F_T4F_T4F
+{
+    Vec4 xyzw;
+    Vec2 st0;
+    Vec4 color;
+    Vec4 st1;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec4 st1;
+};
+
+struct SVF_P3F_C4F_T2F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec3 st1;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T3F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec3 st1;
+    Vec3 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T1F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    float z;
+    Vec4 st1;
+};
+
+struct SVF_P3F_C4F_T2F_T1F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    float z;
+    Vec3 st1;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    float z;
+    Vec3 st1;
+    Vec3 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    Vec3 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    Vec3 st2;
+    Vec3 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec3 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec3 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+    Vec3 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+    Vec3 st2;
+    Vec3 st3;
+    Vec4 st4;
+};
+
+struct SVF_P4F_T2F_C4F_T4F_T4F_T4F
+{
+    Vec4 xyzw;
+    Vec2 st0;
+    Vec4 color;
+    Vec4 st1;
+    Vec4 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec4 st1;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec3 st1;
+    Vec4 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec3 st1;
+    Vec3 st2;
+    Vec4 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T2F_T1F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    float z;
+    Vec4 st1;
+    Vec4 st2;
+};
+
+struct SVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    float z;
+    Vec3 st1;
+    Vec4 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    float z;
+    Vec3 st1;
+    Vec3 st2;
+    Vec4 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    Vec4 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    Vec3 st2;
+    Vec4 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    Vec3 st2;
+    Vec3 st3;
+    Vec4 st4;
+    Vec4 st5;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+    Vec4 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec4 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec4 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec3 st3;
+    Vec4 st4;
+    Vec4 st5;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+    Vec4 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec4 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z;
+    Vec3 st2;
+    Vec3 st3;
+    Vec4 st4;
+    Vec4 st5;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+    Vec4 st2;
+    Vec4 st3;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+    Vec3 st2;
+    Vec4 st3;
+    Vec4 st4;
+};
+
+struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F
+{
+    Vec3 xyz;
+    Vec4 color;
+    Vec2 st0;
+    Vec2 st1;
+    float z0;
+    float z1;
+    Vec3 st2;
+    Vec3 st3;
+    Vec4 st4;
+    Vec4 st5;
+};
+
+struct SVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F
+{
+    Vec4 xyzw;
+    Vec2 st0;
+    Vec4 color;
+    Vec4 st1;
+    Vec4 st2;
+    Vec4 st3;
+    Vec4 st4;
+};
+
+
+//=============================================================
+// Signed norm value packing [-1,+1]
+
+namespace PackingSNorm
+{
+    ILINE int16 tPackF2B(const float f)
+    {
+        return (int16)(f * 32767.0f);
+    }
+
+    ILINE int16 tPackS2B(const int16 s)
+    {
+        return (int16)(s * 32767);
+    }
+
+    ILINE float tPackB2F(const int16 i)
+    {
+        return (float)((float)i / 32767.0f);
+    }
+
+    ILINE int16 tPackB2S(const int16 s)
+    {
+        // OPT: "(s >> 15) + !(s >> 15)" works as well
+        return (int16)(s / 32767);
+    }
+
+    ILINE Vec4sf tPackF2Bv(const Vec4& v)
+    {
+        Vec4sf vs;
+
+        vs.x = tPackF2B(v.x);
+        vs.y = tPackF2B(v.y);
+        vs.z = tPackF2B(v.z);
+        vs.w = tPackF2B(v.w);
+
+        return vs;
+    }
+
+    ILINE Vec4sf tPackF2Bv(const Vec3& v)
+    {
+        Vec4sf vs;
+
+        vs.x = tPackF2B(v.x);
+        vs.y = tPackF2B(v.y);
+        vs.z = tPackF2B(v.z);
+        vs.w = tPackF2B(1.0f);
+
+        return vs;
+    }
+
+    ILINE Vec4 tPackB2F(const Vec4sf& v)
+    {
+        Vec4 vs;
+
+        vs.x = tPackB2F(v.x);
+        vs.y = tPackB2F(v.y);
+        vs.z = tPackB2F(v.z);
+        vs.w = tPackB2F(v.w);
+
+        return vs;
+    }
+
+    ILINE void tPackB2F(const Vec4sf& v, Vec4& vDst)
+    {
+        vDst.x = tPackB2F(v.x);
+        vDst.y = tPackB2F(v.y);
+        vDst.z = tPackB2F(v.z);
+        vDst.w = 1.0f;
+    }
+
+    ILINE void tPackB2FScale(const Vec4sf& v, Vec4& vDst, const Vec3& vScale)
+    {
+        vDst.x = (float)v.x * vScale.x;
+        vDst.y = (float)v.y * vScale.y;
+        vDst.z = (float)v.z * vScale.z;
+        vDst.w = 1.0f;
+    }
+
+    ILINE void tPackB2FScale(const Vec4sf& v, Vec3& vDst, const Vec3& vScale)
+    {
+        vDst.x = (float)v.x * vScale.x;
+        vDst.y = (float)v.y * vScale.y;
+        vDst.z = (float)v.z * vScale.z;
+    }
+
+    ILINE void tPackB2F(const Vec4sf& v, Vec3& vDst)
+    {
+        vDst.x = tPackB2F(v.x);
+        vDst.y = tPackB2F(v.y);
+        vDst.z = tPackB2F(v.z);
+    }
+};
+
+//=============================================================
+// Pip => Graphics Pipeline structures, used for inputs for the GPU's Input Assembler
+// These structures are optimized for fast decoding (ALU and bandwidth) and
+// might be slow to encode on-the-fly
+
+struct SPipTangents
+{
+    SPipTangents() {}
+
+private:
+    Vec4sf Tangent;
+    Vec4sf Bitangent;
+
+public:
+    explicit SPipTangents(const Vec4sf& othert, const Vec4sf& otherb, const int16& othersign)
+    {
+        using namespace PackingSNorm;
+        Tangent   = othert;
+        Tangent.w   = PackingSNorm::tPackS2B(othersign);
+        Bitangent = otherb;
+        Bitangent.w = PackingSNorm::tPackS2B(othersign);
+    }
+
+    explicit SPipTangents(const Vec4sf& othert, const Vec4sf& otherb, const SPipTangents& othersign)
+    {
+        Tangent   = othert;
+        Tangent.w   = othersign.Tangent.w;
+        Bitangent = otherb;
+        Bitangent.w = othersign.Bitangent.w;
+    }
+
+    explicit SPipTangents(const Vec4sf& othert, const Vec4sf& otherb)
+    {
+        Tangent   = othert;
+        Bitangent = otherb;
+    }
+
+    explicit SPipTangents(const Vec3& othert, const Vec3& otherb, const int16& othersign)
+    {
+        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), PackingSNorm::tPackS2B(othersign));
+        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), PackingSNorm::tPackS2B(othersign));
+    }
+
+    explicit SPipTangents(const Vec3& othert, const Vec3& otherb, const SPipTangents& othersign)
+    {
+        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), othersign.Tangent.w);
+        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), othersign.Bitangent.w);
+    }
+
+    explicit SPipTangents(const Quat& other, const int16& othersign)
+    {
+        Vec3 othert = other.GetColumn0();
+        Vec3 otherb = other.GetColumn1();
+
+        Tangent   = Vec4sf(PackingSNorm::tPackF2B(othert.x), PackingSNorm::tPackF2B(othert.y), PackingSNorm::tPackF2B(othert.z), PackingSNorm::tPackS2B(othersign));
+        Bitangent = Vec4sf(PackingSNorm::tPackF2B(otherb.x), PackingSNorm::tPackF2B(otherb.y), PackingSNorm::tPackF2B(otherb.z), PackingSNorm::tPackS2B(othersign));
+    }
+
+    void ExportTo(Vec4sf& othert, Vec4sf& otherb) const
+    {
+        othert = Tangent;
+        otherb = Bitangent;
+    }
+
+    // get normal tangent and bitangent vectors
+    void GetTB(Vec4& othert, Vec4& otherb) const
+    {
+        othert = PackingSNorm::tPackB2F(Tangent);
+        otherb = PackingSNorm::tPackB2F(Bitangent);
+    }
+
+    // get normal vector (perpendicular to tangent and bitangent plane)
+    ILINE Vec3 GetN() const
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z),
+        btg3(btg.x, btg.y, btg.z);
+
+        // assumes w 1 or -1
+        return tng3.Cross(btg3) * tng.w;
+    }
+
+    // get normal vector (perpendicular to tangent and bitangent plane)
+    void GetN(Vec3& othern) const
+    {
+        othern = GetN();
+    }
+
+    // get the tangent-space basis as individual normal vectors (tangent, bitangent and normal)
+    void GetTBN(Vec3& othert, Vec3& otherb, Vec3& othern) const
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z),
+        btg3(btg.x, btg.y, btg.z);
+
+        // assumes w 1 or -1
+        othert = tng3;
+        otherb = btg3;
+        othern = tng3.Cross(btg3) * tng.w;
+    }
+
+    // get normal vector sign (reflection)
+    ILINE int16 GetR() const
+    {
+        return PackingSNorm::tPackB2S(Tangent.w);
+    }
+
+    // get normal vector sign (reflection)
+    void GetR(int16& sign) const
+    {
+        sign = GetR();
+    }
+
+    void TransformBy(const Matrix34& trn)
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z),
+        btg3(btg.x, btg.y, btg.z);
+
+        tng3 = trn.TransformVector(tng3);
+        btg3 = trn.TransformVector(btg3);
+
+        *this = SPipTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
+    }
+
+    void TransformSafelyBy(const Matrix34& trn)
+    {
+        Vec4 tng, btg;
+        GetTB(tng, btg);
+
+        Vec3 tng3(tng.x, tng.y, tng.z),
+        btg3(btg.x, btg.y, btg.z);
+
+        tng3 = trn.TransformVector(tng3);
+        btg3 = trn.TransformVector(btg3);
+
+        // normalize in case "trn" wasn't length-preserving
+        tng3.Normalize();
+        btg3.Normalize();
+
+        *this = SPipTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
+    }
+
+    friend struct SMeshTangents;
+};
+
+struct SPipQTangents
+{
+    SPipQTangents() {}
+
+private:
+    Vec4sf QTangent;
+
+public:
+    explicit SPipQTangents(const Vec4sf& other)
+    {
+        QTangent = other;
+    }
+
+    bool operator ==(const SPipQTangents& other) const
+    {
+        return
+            QTangent[0] == other.QTangent[0] ||
+            QTangent[1] == other.QTangent[1] ||
+            QTangent[2] == other.QTangent[2] ||
+            QTangent[3] == other.QTangent[3];
+    }
+
+    bool operator !=(const SPipQTangents& other) const
+    {
+        return !(*this == other);
+    }
+
+    // get quaternion
+    ILINE Quat GetQ() const
+    {
+        Quat q;
+
+        q.v.x = PackingSNorm::tPackB2F(QTangent.x);
+        q.v.y = PackingSNorm::tPackB2F(QTangent.y);
+        q.v.z = PackingSNorm::tPackB2F(QTangent.z);
+        q.w   = PackingSNorm::tPackB2F(QTangent.w);
+
+        return q;
+    }
+
+    // get normal vector from quaternion
+    ILINE Vec3 GetN() const
+    {
+        const Quat q = GetQ();
+        return q.GetColumn2() * (q.w < 0.0f ? -1.0f : +1.0f);
+    }
+
+    friend struct SMeshQTangents;
+};
+
+struct SPipNormal
+    : public Vec3
+{
+    SPipNormal() {}
+
+    explicit SPipNormal(const Vec3& othern)
+    {
+        x = othern.x;
+        y = othern.y;
+        z = othern.z;
+    }
+
+    // get normal vector
+    ILINE Vec3 GetN() const
+    {
+        return *this;
+    }
+
+    // get normal vector
+    void GetN(Vec3& othern) const
+    {
+        othern = GetN();
+    }
+
+    void TransformBy(const Matrix34& trn)
+    {
+        *this = SPipNormal(trn.TransformVector(*this));
+    }
+
+    void TransformSafelyBy(const Matrix34& trn)
+    {
+        // normalize in case "trn" wasn't length-preserving
+        *this = SPipNormal(trn.TransformVector(*this).normalize());
+    }
+
+    friend struct SMeshNormal;
+};
+
+//==================================================================================================
+
+typedef SVF_P3F_C4B_T2F SAuxVertex;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Vertex Sizes
+//extern const int m_VertexSize[];
+
+//============================================================================
+// Custom vertex streams definitions
+// NOTE: If you add new stream ID also include vertex declarations creating in
+//       CD3D9Renderer::EF_InitD3DVertexDeclarations (D3DRendPipeline.cpp)
+
+// Stream IDs
+enum EStreamIDs
+{
+    VSF_GENERAL,                 // General vertex buffer
+    VSF_TANGENTS,                // Tangents buffer
+    VSF_QTANGENTS,               // Tangents buffer
+    VSF_HWSKIN_INFO,             // HW skinning buffer
+    VSF_VERTEX_VELOCITY,                // Velocity buffer
+# if ENABLE_NORMALSTREAM_SUPPORT
+    VSF_NORMALS,                 // Normals, used for skinning
+#endif
+    // <- Insert new stream IDs here
+    VSF_NUM,                     // Number of vertex streams
+
+    VSF_MORPHBUDDY = 8,          // Morphing (from m_pMorphBuddy)
+    VSF_INSTANCED = 9,           // Data is for instance stream
+    VSF_MORPHBUDDY_WEIGHTS = 15, // Morphing weights
+};
+
+// Stream Masks (Used during updating)
+enum EStreamMasks
+{
+    VSM_GENERAL    = 1 << VSF_GENERAL,
+    VSM_TANGENTS   = ((1 << VSF_TANGENTS) | (1 << VSF_QTANGENTS)),
+    VSM_HWSKIN     = 1 << VSF_HWSKIN_INFO,
+    VSM_VERTEX_VELOCITY   = 1 << VSF_VERTEX_VELOCITY,
+# if ENABLE_NORMALSTREAM_SUPPORT
+    VSM_NORMALS    = 1 << VSF_NORMALS,
+#endif
+
+    VSM_MORPHBUDDY = 1 << VSF_MORPHBUDDY,
+    VSM_INSTANCED  = 1 << VSF_INSTANCED,
+
+    VSM_MASK       = ((1 << VSF_NUM) - 1),
+};
+
+//==================================================================================================================
+
+#endif // CRYINCLUDE_CRYCOMMON_VERTEXFORMATS_H
+
diff --git a/Code/Legacy/CryCommon/Win32specific.h b/Code/Legacy/CryCommon/Win32specific.h
new file mode 100644
index 0000000000..84b734202d
--- /dev/null
+++ b/Code/Legacy/CryCommon/Win32specific.h
@@ -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
+ *
+ */
+
+
+// Description : Specific to Win32 declarations, inline functions etc.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_WIN32SPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_WIN32SPECIFIC_H
+#pragma once
+
+
+#define _CPU_X86
+#define _CPU_SSE
+#ifdef _DEBUG
+#define ILINE _inline
+#else
+#define ILINE __forceinline
+#endif
+
+#define DEBUG_BREAK _asm { int 3 }
+#define RC_EXECUTABLE "rc.exe"
+#define DEPRECATED __declspec(deprecated)
+#define TYPENAME(x) typeid(x).name()
+#define SIZEOF_PTR 4
+
+#ifndef _WIN32_WINNT
+# define _WIN32_WINNT 0x501
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// Standard includes.
+//////////////////////////////////////////////////////////////////////////
+#include <malloc.h>
+#include <io.h>
+#include <new.h>
+#include <direct.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+//////////////////////////////////////////////////////////////////////////
+
+// Special intrinsics
+#include <intrin.h> // moved here to prevent assert from being redefined when included elsewhere
+
+
+//////////////////////////////////////////////////////////////////////////
+// Define platform independent types.
+//////////////////////////////////////////////////////////////////////////
+#include "BaseTypes.h"
+
+#define THREADID_NULL -1
+
+typedef unsigned char BYTE;
+typedef unsigned int threadID;
+typedef unsigned long DWORD;
+typedef double        real;  // biggest float-type on this machine
+typedef long          LONG;
+
+#if defined(_WIN64)
+typedef __int64 INT_PTR, * PINT_PTR;
+typedef unsigned __int64 UINT_PTR, * PUINT_PTR;
+
+typedef __int64 LONG_PTR, * PLONG_PTR;
+typedef unsigned __int64 ULONG_PTR, * PULONG_PTR;
+
+typedef ULONG_PTR DWORD_PTR, * PDWORD_PTR;
+#else
+typedef __w64 int INT_PTR, * PINT_PTR;
+typedef __w64 unsigned int UINT_PTR, * PUINT_PTR;
+
+typedef __w64 long LONG_PTR, * PLONG_PTR;
+typedef __w64 unsigned long ULONG_PTR, * PULONG_PTR;
+
+typedef ULONG_PTR DWORD_PTR, * PDWORD_PTR;
+#endif
+
+typedef void* THREAD_HANDLE;
+typedef void* EVENT_HANDLE;
+
+//////////////////////////////////////////////////////////////////////////
+// Multi platform Hi resolution ticks function, should only be used for profiling.
+//////////////////////////////////////////////////////////////////////////
+
+
+int64 CryGetTicks();
+int64 CryGetTicksPerSec();
+
+#ifndef SAFE_DELETE
+#define SAFE_DELETE(p) { if (p) { delete (p); (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_DELETE_ARRAY
+#define SAFE_DELETE_ARRAY(p) { if (p) { delete [] (p); (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p) = NULL; } \
+}
+#endif
+
+#define _MS_ALIGN(num) \
+    AZ_PUSH_DISABLE_WARNING(4324, "-Wunknown-warning-option") \
+    __declspec(align(num))
+
+#define DEFINE_ALIGNED_DATA(type, name, alignment) _declspec(align(alignment)) type name;
+#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) static _declspec(align(alignment)) type name;
+#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) const _declspec(align(alignment)) type name;
+
+#ifndef FILE_ATTRIBUTE_NORMAL
+    #define FILE_ATTRIBUTE_NORMAL 0x00000080
+#endif
+
+#define FP16_TERRAIN
+#define TARGET_DEFAULT_ALIGN (0x4U)
+
+
+#endif // CRYINCLUDE_CRYCOMMON_WIN32SPECIFIC_H
diff --git a/Code/Legacy/CryCommon/Win64specific.h b/Code/Legacy/CryCommon/Win64specific.h
new file mode 100644
index 0000000000..a2e45e8b53
--- /dev/null
+++ b/Code/Legacy/CryCommon/Win64specific.h
@@ -0,0 +1,109 @@
+/*
+ * 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 : Specific to Win32 declarations, inline functions etc.
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_WIN64SPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_WIN64SPECIFIC_H
+#pragma once
+
+
+#define _CPU_AMD64
+#define _CPU_SSE
+#define ILINE __forceinline
+
+#define DEBUG_BREAK CryDebugBreak()
+#define RC_EXECUTABLE "rc.exe"
+#define DEPRECATED __declspec(deprecated)
+#define TYPENAME(x) typeid(x).name()
+#define SIZEOF_PTR 8
+
+#ifndef _WIN32_WINNT
+# define _WIN32_WINNT 0x501
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// Standard includes.
+//////////////////////////////////////////////////////////////////////////
+#include <stdexcept>
+#include <malloc.h>
+#include <io.h>
+#include <new.h>
+#include <direct.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+//////////////////////////////////////////////////////////////////////////
+
+// Special intrinsics
+#include <math.h> // Should be included before intrin.h
+#include <intrin.h>
+
+//////////////////////////////////////////////////////////////////////////
+// Define platform independent types.
+//////////////////////////////////////////////////////////////////////////
+#include "BaseTypes.h"
+
+#define THREADID_NULL -1
+typedef long LONG;
+typedef unsigned char BYTE;
+typedef unsigned long threadID;
+typedef unsigned long DWORD;
+typedef double        real;  //biggest float-type on this machine
+typedef long          LONG;
+
+typedef void* THREAD_HANDLE;
+typedef void* EVENT_HANDLE;
+
+typedef __int64 INT_PTR, * PINT_PTR;
+typedef unsigned __int64 UINT_PTR, * PUINT_PTR;
+
+typedef __int64 LONG_PTR, * PLONG_PTR;
+typedef unsigned __int64 ULONG_PTR, * PULONG_PTR;
+
+typedef ULONG_PTR DWORD_PTR, * PDWORD_PTR;
+
+int64 CryGetTicks();
+int64 CryGetTicksPerSec();
+
+#ifndef SAFE_DELETE
+#define SAFE_DELETE(p) { if (p) { delete (p); (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_DELETE_ARRAY
+#define SAFE_DELETE_ARRAY(p) { if (p) { delete [] (p); (p) = NULL; } \
+}
+#endif
+
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p) = NULL; } \
+}
+#endif
+
+#define _MS_ALIGN(num) \
+    AZ_PUSH_DISABLE_WARNING(4324, "-Wunknown-warning-option") \
+    __declspec(align(num))
+
+#define DEFINE_ALIGNED_DATA(type, name, alignment) _declspec(align(alignment)) type name;
+#define DEFINE_ALIGNED_DATA_STATIC(type, name, alignment) static _declspec(align(alignment)) type name;
+#define DEFINE_ALIGNED_DATA_CONST(type, name, alignment) const _declspec(align(alignment)) type name;
+
+#define SIZEOF_PTR 8
+
+#ifndef FILE_ATTRIBUTE_NORMAL
+    #define FILE_ATTRIBUTE_NORMAL 0x00000080
+#endif
+
+#define TARGET_DEFAULT_ALIGN (0x8U)
+
+#define PLATFORM_64BIT
+
+#endif // CRYINCLUDE_CRYCOMMON_WIN64SPECIFIC_H
diff --git a/Code/Legacy/CryCommon/WinBase.cpp b/Code/Legacy/CryCommon/WinBase.cpp
new file mode 100644
index 0000000000..e1e37b0e73
--- /dev/null
+++ b/Code/Legacy/CryCommon/WinBase.cpp
@@ -0,0 +1,1667 @@
+/*
+ * 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 : Linux/Mac port support for Win32API calls
+#if !defined(WIN32)
+
+#include "platform.h" // Note: This should be first to get consistent debugging definitions
+
+#include <CryAssert.h>
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define WINBASE_CPP_SECTION_1 1
+#define WINBASE_CPP_SECTION_2 2
+#define WINBASE_CPP_SECTION_3 3
+#define WINBASE_CPP_SECTION_4 4
+#define WINBASE_CPP_SECTION_5 5
+#define WINBASE_CPP_SECTION_6 6
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_1
+    #include AZ_RESTRICTED_FILE(WinBase_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    #include <signal.h>
+#endif
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <AzCore/IO/SystemFile.h>
+
+#ifdef APPLE
+#include <mach/mach.h>
+#include <mach/mach_time.h>
+#include <sys/sysctl.h>                     // for total physical memory on Mac
+#include <CoreFoundation/CoreFoundation.h>  // for CryMessageBox
+#include <mach/vm_statistics.h>             // host_statistics
+#include <mach/mach_types.h>
+#include <mach/mach_init.h>
+#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>
+#include <utime.h>
+#include <dirent.h>
+#include "CryLibrary.h"
+#endif
+
+#if defined(APPLE)
+    #include <AzFramework/Utils/SystemUtilsApple.h>
+#endif
+
+#include "StringUtils.h"
+
+#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
+static const int FS_O_RDWR = O_RDWR;
+static const int FS_O_RDONLY = O_RDONLY;
+static const int FS_O_WRONLY = O_WRONLY;
+static const FS_ERRNO_TYPE FS_EISDIR = EISDIR;
+
+#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
+    return ptr ? false : true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+char* _strtime(char* date)
+{
+    azstrcpy(date, AZ_ARRAY_SIZE(date), "0:0:0");
+    return date;
+}
+
+//////////////////////////////////////////////////////////////////////////
+char* _strdate(char* date)
+{
+    azstrcpy(date, AZ_ARRAY_SIZE(date), "0");
+    return date;
+}
+
+//////////////////////////////////////////////////////////////////////////
+char* strlwr (char* str)
+{
+    char* cp;             /* traverses string for C locale conversion */
+
+    for (cp = str; *cp; ++cp)
+    {
+        if ('A' <= *cp && *cp <= 'Z')
+        {
+            *cp += 'a' - 'A';
+        }
+    }
+    return str;
+}
+
+char* strupr (char* str)
+{
+    char* cp;             /* traverses string for C locale conversion */
+
+    for (cp = str; *cp; ++cp)
+    {
+        if ('a' <= *cp && *cp <= 'z')
+        {
+            *cp += 'A' - 'a';
+        }
+    }
+    return str;
+}
+
+char* ltoa (long i, char* a, int radix)
+{
+    if (a == NULL)
+    {
+        return NULL;
+    }
+    strcpy (a, "0");
+    if (i && radix > 1 && radix < 37)
+    {
+        char buf[35];
+        unsigned long u = i, p = 34;
+        buf[p] = 0;
+        if (i < 0 && radix == 10)
+        {
+            u = -i;
+        }
+        while (u)
+        {
+            unsigned int d = u % radix;
+            buf[--p] = d < 10 ? '0' + d : 'a' + d - 10;
+            u /= radix;
+        }
+        if (i < 0 && radix == 10)
+        {
+            buf[--p] = '-';
+        }
+        strcpy (a, buf + p);
+    }
+    return a;
+}
+
+
+#if AZ_TRAIT_COMPILER_DEFINE_WCSICMP
+// For Linux it's redefined to wcscasecmp and wcsncasecmp'
+int wcsicmp (const wchar_t* s1, const wchar_t* s2)
+{
+    wint_t c1, c2;
+
+    if (s1 == s2)
+    {
+        return 0;
+    }
+
+    do
+    {
+        c1 = towlower(*s1++);
+        c2 = towlower(*s2++);
+    }
+    while (c1 && c1 == c2);
+
+    return (int) (c1 - c2);
+}
+
+int wcsnicmp (const wchar_t* s1, const wchar_t* s2, size_t count)
+{
+    wint_t c1, c2;
+    if (s1 == s2 || count == 0)
+    {
+        return 0;
+    }
+
+    do
+    {
+        c1 = towlower(*s1++);
+        c2 = towlower(*s2++);
+    }
+    while ((--count) && c1 && (c1 == c2));
+    return (int) (c1 - c2);
+}
+#endif
+
+#if defined(ANDROID)
+// not defined in android-19 or prior
+size_t wcsnlen(const wchar_t* str, size_t maxLen)
+{
+    size_t length;
+    for (length = 0; length < maxLen; ++length, ++str)
+    {
+        if (!*str)
+        {
+            break;
+        }
+    }
+    return length;
+}
+
+char* stpcpy(char* dest, const char* str)
+{
+    while (*str != '\0')
+    {
+        *dest++ = *str++;
+    }
+    *dest = '\0';
+
+    return dest;
+}
+#endif
+
+void _makepath(char* path, const char* drive, const char* dir, const char* filename, const char* ext)
+{
+    char ch;
+    char tmp[MAX_PATH];
+    if (!path)
+    {
+        return;
+    }
+    tmp[0] = '\0';
+    if (drive && drive[0])
+    {
+        tmp[0] = drive[0];
+        tmp[1] = ':';
+        tmp[2] = 0;
+    }
+    if (dir && dir[0])
+    {
+        cry_strcat(tmp, dir);
+        ch = tmp[strlen(tmp) - 1];
+        if (ch != '/' && ch != '\\')
+        {
+            cry_strcat(tmp, "\\");
+        }
+    }
+    if (filename && filename[0])
+    {
+        cry_strcat(tmp, filename);
+        if (ext && ext[0])
+        {
+            if (ext[0] != '.')
+            {
+                cry_strcat(tmp, ".");
+            }
+            cry_strcat(tmp, ext);
+        }
+    }
+    azstrcpy(path, strlen(tmp) + 1, tmp);
+}
+
+char* _ui64toa(unsigned long long value,   char* str, int radix)
+{
+    if (str == 0)
+    {
+        return 0;
+    }
+
+    char buffer[65];
+    char* pos;
+    int digit;
+
+    pos = &buffer[64];
+    *pos = '\0';
+
+    do
+    {
+        digit = value % radix;
+        value = value / radix;
+        if (digit < 10)
+        {
+            *--pos = '0' + digit;
+        }
+        else
+        {
+            *--pos = 'a' + digit - 10;
+        } /* if */
+    } while (value != 0L);
+
+    memcpy(str, pos, &buffer[64] - pos + 1);
+    return str;
+}
+
+long long _atoi64(const char* str)
+{
+    if (str == 0)
+    {
+        return -1;
+    }
+    unsigned long long RunningTotal = 0;
+    char bMinus = 0;
+    while (*str == ' ' || (*str >= '\011' && *str <= '\015'))
+    {
+        str++;
+    } /* while */
+    if (*str == '+')
+    {
+        str++;
+    }
+    else if (*str == '-')
+    {
+        bMinus = 1;
+        str++;
+    } /* if */
+    while (*str >= '0' && *str <= '9')
+    {
+        RunningTotal = RunningTotal * 10 + *str - '0';
+        str++;
+    } /* while */
+    return bMinus ? ((long long)-RunningTotal) : (long long)RunningTotal;
+}
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_2
+    #include AZ_RESTRICTED_FILE(WinBase_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+bool QueryPerformanceCounter(LARGE_INTEGER* counter)
+{
+#if defined(LINUX)
+    // replaced gettimeofday
+    // http://fixunix.com/kernel/378888-gettimeofday-resolution-linux.html
+    timespec tv;
+    clock_gettime(CLOCK_MONOTONIC, &tv);
+    counter->QuadPart = (uint64)tv.tv_sec * 1000000 + tv.tv_nsec / 1000;
+    return true;
+#elif defined(APPLE)
+    counter->QuadPart = mach_absolute_time();
+    return true;
+#else
+    return false;
+#endif
+}
+
+bool QueryPerformanceFrequency(LARGE_INTEGER* frequency)
+{
+#if defined(LINUX)
+    // On Linux we'll use gettimeofday().  The API resolution is microseconds,
+    // so we'll report that to the caller.
+    frequency->u.LowPart  = 1000000;
+    frequency->u.HighPart = 0;
+    return true;
+#elif defined(APPLE)
+    static mach_timebase_info_data_t s_kTimeBaseInfoData;
+    if (s_kTimeBaseInfoData.denom == 0)
+    {
+        mach_timebase_info(&s_kTimeBaseInfoData);
+    }
+    // mach_timebase_info_data_t expresses the tick period in nanoseconds
+    frequency->QuadPart = 1e+9 * (uint64_t)s_kTimeBaseInfoData.denom / (uint64_t)s_kTimeBaseInfoData.numer;
+    return true;
+#else
+    return false;
+#endif
+}
+#endif
+
+void _splitpath(const char* inpath, char* drv, char* dir, char* fname, char* ext)
+{
+    if (drv)
+    {
+        drv[0] = 0;
+    }
+
+    typedef CryStackStringT<char, AZ_MAX_PATH_LEN> path_stack_string;
+
+    const path_stack_string inPath(inpath);
+    string::size_type s = inPath.rfind('/', inPath.size());//position of last /
+    path_stack_string fName;
+    if (s == string::npos)
+    {
+        if (dir)
+        {
+            dir[0] = 0;
+        }
+        fName = inpath; //assign complete string as rest
+    }
+    else
+    {
+        if (dir)
+        {
+            azstrcpy(dir, AZ_MAX_PATH_LEN, (inPath.substr((string::size_type)0, (string::size_type)(s + 1))).c_str());    //assign directory
+        }
+        fName = inPath.substr((string::size_type)(s + 1));                    //assign remaining string as rest
+    }
+    if (fName.size() == 0)
+    {
+        if (ext)
+        {
+            ext[0] = 0;
+        }
+        if (fname)
+        {
+            fname[0] = 0;
+        }
+    }
+    else
+    {
+        //dir and drive are now set
+        s = fName.find(".", (string::size_type)0);//position of first .
+        if (s == string::npos)
+        {
+            if (ext)
+            {
+                ext[0] = 0;
+            }
+            if (fname)
+            {
+                azstrcpy(fname, fName.size() + 1, fName.c_str());   //assign filename
+            }
+        }
+        else
+        {
+            if (ext)
+            {
+                azstrcpy(ext, AZ_MAX_PATH_LEN, (fName.substr(s)).c_str());     //assign extension including .
+            }
+            if (fname)
+            {
+                if (s == 0)
+                {
+                    fname[0] = 0;
+                }
+                else
+                {
+                    azstrcpy(fname, AZ_MAX_PATH_LEN, (fName.substr((string::size_type)0, s)).c_str());  //assign filename
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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)
+{
+    //not complete implementation
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_3
+    #include AZ_RESTRICTED_FILE(WinBase_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(APPLE)
+
+    // Retrieve dwTotalPhys
+    int kMIB[] = {CTL_HW, HW_MEMSIZE};
+    uint64_t dwTotalPhys;
+    size_t ulength = sizeof(dwTotalPhys);
+    if (sysctl(kMIB, 2, &dwTotalPhys, &ulength, NULL, 0) != 0)
+    {
+        gEnv->pLog->LogError("sysctl failed\n");
+    }
+    else
+    {
+        lpmem->dwTotalPhys = static_cast<SIZE_T>(dwTotalPhys);
+    }
+
+    // Get the page size
+    mach_port_t kHost(mach_host_self());
+    vm_size_t uPageSize;
+    if (host_page_size(kHost, &uPageSize) != 0)
+    {
+        gEnv->pLog->LogError("host_page_size failed\n");
+    }
+    else
+    {
+        // Get memory statistics
+        vm_statistics_data_t kVMStats;
+        mach_msg_type_number_t uCount(sizeof(kVMStats) / sizeof(natural_t));
+        if (host_statistics(kHost, HOST_VM_INFO, (host_info_t)&kVMStats, &uCount) != 0)
+        {
+            gEnv->pLog->LogError("host_statistics failed\n");
+        }
+        else
+        {
+            // Calculate dwAvailPhys
+            lpmem->dwAvailPhys = uPageSize * kVMStats.free_count;
+        }
+    }
+#else
+    FILE* f;
+    lpmem->dwMemoryLoad    = 0;
+    lpmem->dwTotalPhys     = 16 * 1024 * 1024;
+    lpmem->dwAvailPhys     = 16 * 1024 * 1024;
+    lpmem->dwTotalPageFile = 16 * 1024 * 1024;
+    lpmem->dwAvailPageFile = 16 * 1024 * 1024;
+    azfopen(&f, "/proc/meminfo", "r");
+    if (f)
+    {
+        char buffer[256];
+        memset(buffer, '0', 256);
+        int total, used, free, shared, buffers, cached;
+
+        lpmem->dwLength = sizeof(MEMORYSTATUS);
+        lpmem->dwTotalPhys = lpmem->dwAvailPhys = 0;
+        lpmem->dwTotalPageFile = lpmem->dwAvailPageFile = 0;
+        while (fgets(buffer, sizeof(buffer), f))
+        {
+            if (azsscanf(buffer, "Mem: %d %d %d %d %d %d", &total, &used, &free, &shared, &buffers, &cached))
+            {
+                lpmem->dwTotalPhys += total;
+                lpmem->dwAvailPhys += free + buffers + cached;
+            }
+            if (azsscanf(buffer, "Swap: %d %d %d", &total, &used, &free))
+            {
+                lpmem->dwTotalPageFile += total;
+                lpmem->dwAvailPageFile += free;
+            }
+            if (azsscanf(buffer, "MemTotal: %d", &total))
+            {
+                lpmem->dwTotalPhys = total * 1024;
+            }
+            if (azsscanf(buffer, "MemFree: %d", &free))
+            {
+                lpmem->dwAvailPhys = free * 1024;
+            }
+            if (azsscanf(buffer, "SwapTotal: %d", &total))
+            {
+                lpmem->dwTotalPageFile = total * 1024;
+            }
+            if (azsscanf(buffer, "SwapFree: %d", &free))
+            {
+                lpmem->dwAvailPageFile = free * 1024;
+            }
+            if (azsscanf(buffer, "Buffers: %d", &buffers))
+            {
+                lpmem->dwAvailPhys += buffers * 1024;
+            }
+            if (azsscanf(buffer, "Cached: %d", &cached))
+            {
+                lpmem->dwAvailPhys += cached * 1024;
+            }
+        }
+        fclose(f);
+        if (lpmem->dwTotalPhys)
+        {
+            DWORD TotalPhysical = lpmem->dwTotalPhys + lpmem->dwTotalPageFile;
+            DWORD AvailPhysical = lpmem->dwAvailPhys + lpmem->dwAvailPageFile;
+            lpmem->dwMemoryLoad = (TotalPhysical - AvailPhysical)  / (TotalPhysical / 100);
+        }
+    }
+#endif
+}
+
+static const int YearLengths[2] = {DAYSPERNORMALYEAR, DAYSPERLEAPYEAR};
+static const int MonthLengths[2][MONSPERYEAR] =
+{
+    { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
+    { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
+};
+
+static int IsLeapYear(int Year)
+{
+    return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0;
+}
+
+static void NormalizeTimeFields(short* FieldToNormalize, short* CarryField, int Modulus)
+{
+    *FieldToNormalize = (short) (*FieldToNormalize - Modulus);
+    *CarryField = (short) (*CarryField + 1);
+}
+
+bool TimeFieldsToTime(PTIME_FIELDS tfTimeFields, PLARGE_INTEGER Time)
+{
+    #define SECSPERMIN         60
+    #define MINSPERHOUR        60
+    #define HOURSPERDAY        24
+    #define MONSPERYEAR        12
+
+    #define EPOCHYEAR          1601
+
+    #define SECSPERDAY         86400
+    #define TICKSPERMSEC       10000
+    #define TICKSPERSEC        10000000
+    #define SECSPERHOUR        3600
+
+    int CurYear, CurMonth;
+    LONGLONG rcTime;
+    TIME_FIELDS TimeFields = *tfTimeFields;
+
+    rcTime = 0;
+    while (TimeFields.Second >= SECSPERMIN)
+    {
+        NormalizeTimeFields(&TimeFields.Second, &TimeFields.Minute, SECSPERMIN);
+    }
+    while (TimeFields.Minute >= MINSPERHOUR)
+    {
+        NormalizeTimeFields(&TimeFields.Minute, &TimeFields.Hour, MINSPERHOUR);
+    }
+    while (TimeFields.Hour >= HOURSPERDAY)
+    {
+        NormalizeTimeFields(&TimeFields.Hour, &TimeFields.Day, HOURSPERDAY);
+    }
+    while (TimeFields.Day > MonthLengths[IsLeapYear(TimeFields.Year)][TimeFields.Month - 1])
+    {
+        NormalizeTimeFields(&TimeFields.Day, &TimeFields.Month, SECSPERMIN);
+    }
+    while (TimeFields.Month > MONSPERYEAR)
+    {
+        NormalizeTimeFields(&TimeFields.Month, &TimeFields.Year, MONSPERYEAR);
+    }
+    for (CurYear = EPOCHYEAR; CurYear < TimeFields.Year; CurYear++)
+    {
+        rcTime += YearLengths[IsLeapYear(CurYear)];
+    }
+    for (CurMonth = 1; CurMonth < TimeFields.Month; CurMonth++)
+    {
+        rcTime += MonthLengths[IsLeapYear(CurYear)][CurMonth - 1];
+    }
+    rcTime += TimeFields.Day - 1;
+    rcTime *= SECSPERDAY;
+    rcTime += TimeFields.Hour * SECSPERHOUR + TimeFields.Minute * SECSPERMIN + TimeFields.Second;
+
+    rcTime *= TICKSPERSEC;
+    rcTime += TimeFields.Milliseconds * TICKSPERMSEC;
+
+    Time->QuadPart = rcTime;
+
+    return true;
+}
+
+BOOL SystemTimeToFileTime(const SYSTEMTIME* syst, LPFILETIME ft)
+{
+    TIME_FIELDS tf;
+    LARGE_INTEGER t;
+
+    tf.Year = syst->wYear;
+    tf.Month = syst->wMonth;
+    tf.Day = syst->wDay;
+    tf.Hour = syst->wHour;
+    tf.Minute = syst->wMinute;
+    tf.Second = syst->wSecond;
+    tf.Milliseconds = syst->wMilliseconds;
+
+    TimeFieldsToTime(&tf, &t);
+    ft->dwLowDateTime = t.u.LowPart;
+    ft->dwHighDateTime = t.u.HighPart;
+    return TRUE;
+}
+
+void adaptFilenameToLinux(string& rAdjustedFilename)
+{
+    //first replace all \\ by /
+    string::size_type loc = 0;
+    while ((loc = rAdjustedFilename.find("\\", loc)) != string::npos)
+    {
+        rAdjustedFilename.replace(loc, 1, "/");
+    }
+    loc = 0;
+    //remove /./
+    while ((loc = rAdjustedFilename.find("/./", loc)) != string::npos)
+    {
+        rAdjustedFilename.replace(loc, 3, "/");
+    }
+}
+
+void replaceDoublePathFilename(char* szFileName)
+{
+    //replace "\.\" by "\"
+    string s(szFileName);
+    string::size_type loc = 0;
+    //remove /./
+    while ((loc = s.find("/./", loc)) != string::npos)
+    {
+        s.replace(loc, 3, "/");
+    }
+    loc = 0;
+    //remove "\.\"
+    while ((loc = s.find("\\.\\", loc)) != string::npos)
+    {
+        s.replace(loc, 3, "\\");
+    }
+    azstrcpy((char*)szFileName, AZ_MAX_PATH_LEN, s.c_str());
+}
+
+const int comparePathNames(const char* cpFirst, const char* cpSecond, unsigned int len)
+{
+    //create two strings and replace the \\ by / and /./ by /
+    string first(cpFirst);
+    string second(cpSecond);
+    adaptFilenameToLinux(first);
+    adaptFilenameToLinux(second);
+    if (strlen(cpFirst) < len || strlen(cpSecond) < len)
+    {
+        return -1;
+    }
+    unsigned int length = std::min(std::min(first.size(), second.size()), (size_t)len);    //make sure not to access invalid memory
+    return memicmp(first.c_str(), second.c_str(), length);
+}
+
+#if defined(LINUX) || defined(APPLE) || defined(DEFINE_FIX_ONE_PATH_ELEMENT)
+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)))
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_4
+    #include AZ_RESTRICTED_FILE(WinBase_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+threadID GetCurrentThreadId()
+{
+    return threadID(pthread_self());
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+HANDLE CreateEvent
+(
+    LPSECURITY_ATTRIBUTES lpEventAttributes,
+    BOOL bManualReset,
+    BOOL bInitialState,
+    LPCSTR lpName
+)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "CreateEvent not implemented yet");
+    return 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+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);
+    }
+
+    return 0;
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_5
+    #include AZ_RESTRICTED_FILE(WinBase_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    timeval tv, start, now;
+    uint64 tStart;
+
+    memset(&tv, 0, sizeof tv);
+    memset(&start, 0, sizeof start);
+    memset(&now, 0, sizeof now);
+    gettimeofday(&now, NULL);
+    start = now;
+    tStart = (uint64)start.tv_sec * 1000000 + start.tv_usec;
+    while (true)
+    {
+        uint64 tNow, timePassed, timeRemaining;
+        tNow = (uint64)now.tv_sec * 1000000 + now.tv_usec;
+        timePassed = tNow - tStart;
+        if (timePassed >= dwMilliseconds)
+        {
+            break;
+        }
+        timeRemaining = dwMilliseconds * 1000 - timePassed;
+        tv.tv_sec = timeRemaining / 1000000;
+        tv.tv_usec = timeRemaining % 1000000;
+        select(1, NULL, NULL, NULL, &tv);
+        gettimeofday(&now, NULL);
+    }
+    return 0;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+DWORD SleepEx(DWORD dwMilliseconds, BOOL bAlertable)
+{
+    //TODO: implement
+    //  CRY_ASSERT_MESSAGE(0, "SleepEx not implemented yet");
+    printf("SleepEx not properly implemented yet\n");
+    Sleep(dwMilliseconds);
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+DWORD WaitForSingleObjectEx(HANDLE hHandle, DWORD dwMilliseconds,   BOOL bAlertable)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "WaitForSingleObjectEx not implemented yet");
+    return 0;
+}
+
+#if 0
+//////////////////////////////////////////////////////////////////////////
+DWORD WaitForMultipleObjectsEx(
+    DWORD nCount,
+    const HANDLE* lpHandles,
+    BOOL bWaitAll,
+    DWORD dwMilliseconds,
+    BOOL bAlertable)
+{
+    //TODO: implement
+    return 0;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "WaitForSingleObject not implemented yet");
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+BOOL SetEvent(HANDLE hEvent)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "SetEvent not implemented yet");
+    return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+BOOL ResetEvent(HANDLE hEvent)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "ResetEvent not implemented yet");
+    return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+HANDLE CreateMutex
+(
+    LPSECURITY_ATTRIBUTES lpMutexAttributes,
+    BOOL bInitialOwner,
+    LPCSTR lpName
+)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "CreateMutex not implemented yet");
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+BOOL ReleaseMutex(HANDLE hMutex)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "ReleaseMutex not implemented yet");
+    return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+
+typedef DWORD (* PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
+typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
+
+//////////////////////////////////////////////////////////////////////////
+HANDLE CreateThread
+(
+    LPSECURITY_ATTRIBUTES lpThreadAttributes,
+    SIZE_T dwStackSize,
+    LPTHREAD_START_ROUTINE lpStartAddress,
+    LPVOID lpParameter,
+    DWORD dwCreationFlags,
+    LPDWORD lpThreadId
+)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "CreateThread not implemented yet");
+    return 0;
+}
+
+#if defined(LINUX) || defined(APPLE)
+BOOL GetComputerName(LPSTR lpBuffer, LPDWORD lpnSize)
+{
+    if (!lpBuffer || !lpnSize)
+    {
+        return FALSE;
+    }
+
+    int err = gethostname(lpBuffer, *lpnSize);
+
+    if (-1 == err)
+    {
+        CryLog("GetComputerName falied [%d]\n", errno);
+        return FALSE;
+    }
+    return TRUE;
+}
+#endif
+
+#if AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID
+DWORD GetCurrentProcessId(void)
+{
+    return (DWORD)getpid();
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+void CrySleep(unsigned int dwMilliseconds)
+{
+    Sleep(dwMilliseconds);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryLowLatencySleep(unsigned int dwMilliseconds)
+{
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION WINBASE_CPP_SECTION_6
+    #include AZ_RESTRICTED_FILE(WinBase_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    CrySleep(dwMilliseconds);
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+int CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType)
+{
+#ifdef WIN32
+#   error WIN32 is defined in WinBase.cpp (it is a non-Windows file)
+#elif defined(MAC)
+    CFStringRef strText = CFStringCreateWithCString(NULL, lpText, kCFStringEncodingMacRoman);
+    CFStringRef strCaption = CFStringCreateWithCString(NULL, lpCaption, kCFStringEncodingMacRoman);
+
+    CFStringRef strOk = CFSTR("OK");
+    CFStringRef strCancel = CFSTR("Cancel");
+    CFStringRef strRetry = CFSTR("Retry");
+    CFStringRef strYes = CFSTR("Yes");
+    CFStringRef strNo = CFSTR("No");
+    CFStringRef strAbort = CFSTR("Abort");
+    CFStringRef strIgnore = CFSTR("Ignore");
+    CFStringRef strTryAgain = CFSTR("Try Again");
+    CFStringRef strContinue = CFSTR("Continue");
+
+    CFStringRef defaultButton = nullptr;
+    CFStringRef alternativeButton = nullptr;
+    CFStringRef otherButton = nullptr;
+
+    switch (uType & 0xf)
+    {
+        case MB_OKCANCEL:
+            defaultButton = strOk;
+            alternativeButton = strCancel;
+            break;
+        case MB_ABORTRETRYIGNORE:
+            defaultButton = strAbort;
+            alternativeButton = strRetry;
+            otherButton = strIgnore;
+            break;
+        case MB_YESNOCANCEL:
+            defaultButton = strYes;
+            alternativeButton = strNo;
+            otherButton = strCancel;
+            break;
+        case MB_YESNO:
+            defaultButton = strYes;
+            alternativeButton = strNo;
+            break;
+        case MB_RETRYCANCEL:
+            defaultButton = strRetry;
+            alternativeButton = strCancel;
+            break;
+        case MB_CANCELTRYCONTINUE:
+            defaultButton = strCancel;
+            alternativeButton = strTryAgain;
+            otherButton = strContinue;
+            break;
+        case MB_OK:
+        default:
+            defaultButton = strOk;
+            break;
+    }
+
+    CFOptionFlags kResult;
+    CFUserNotificationDisplayAlert(
+        0,                                 // no timeout
+        kCFUserNotificationNoteAlertLevel, //change it depending message_type flags ( MB_ICONASTERISK.... etc.)
+        NULL,                              //icon url, use default, you can change it depending message_type flags
+        NULL,                              //not used
+        NULL,                              //localization of strings
+        strText,                           //header text
+        strCaption,                        //message text
+        defaultButton,                     //default "ok" text in button
+        alternativeButton,                 //alternate button title
+        otherButton,                       //other button title, null--> no other button
+        &kResult                           //response flags
+    );
+
+    if (strCaption)
+    {
+        CFRelease(strCaption);
+    }
+    if (strText)
+    {
+        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
+}
+
+//////////////////////////////////////////////////////////////////////////
+short CryGetAsyncKeyState(int vKey)
+{
+    //TODO: implement
+    CRY_ASSERT_MESSAGE(0, "CryGetAsyncKeyState not implemented yet");
+    return 0;
+}
+
+#if defined(LINUX) || defined(APPLE) || defined(DEFINE_CRY_INTERLOCKED_INCREMENT)
+//[K01]: http://www.memoryhole.net/kyle/2007/05/atomic_incrementing.html
+//http://forums.devx.com/archive/index.php/t-160558.html
+//////////////////////////////////////////////////////////////////////////
+DLL_EXPORT LONG  CryInterlockedIncrement(LONG volatile* lpAddend)
+{
+    /*int r;
+    __asm__ __volatile__ (
+        "lock ; xaddl %0, (%1) \n\t"
+        : "=r" (r)
+        : "r" (lpAddend), "0" (1)
+        : "memory"
+    );
+    return (LONG) (r + 1); */// add, since we get the original value back.
+    return __sync_fetch_and_add(lpAddend, 1) + 1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+DLL_EXPORT LONG  CryInterlockedDecrement(LONG volatile* lpAddend)
+{
+    /*int r;
+    __asm__ __volatile__ (
+        "lock ; xaddl %0, (%1) \n\t"
+        : "=r" (r)
+        : "r" (lpAddend), "0" (-1)
+        : "memory"
+    );
+    return (LONG) (r - 1);  */// subtract, since we get the original value back.
+    return __sync_fetch_and_sub(lpAddend, 1) - 1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+DLL_EXPORT LONG      CryInterlockedExchangeAdd(LONG  volatile* lpAddend, LONG  Value)
+{
+    /*  LONG r;
+        __asm__ __volatile__ (
+        #if defined(LINUX64) || defined(APPLE)  // long is 64 bits on amd64.
+            "lock ; xaddq %0, (%1) \n\t"
+        #else
+            "lock ; xaddl %0, (%1) \n\t"
+        #endif
+            : "=r" (r)
+            : "r" (lpAddend), "0" (Value)
+            : "memory"
+        );
+        return r;*/
+    return __sync_fetch_and_add(lpAddend, Value);
+}
+
+DLL_EXPORT LONG     CryInterlockedOr(LONG volatile* Destination, LONG Value)
+{
+    return __sync_fetch_and_or(Destination, Value);
+}
+
+DLL_EXPORT LONG     CryInterlockedCompareExchange(LONG  volatile* dst, LONG  exchange, LONG comperand)
+{
+    return __sync_val_compare_and_swap(dst, comperand, exchange);
+    /*LONG r;
+    __asm__ __volatile__ (
+    #if defined(LINUX64) || defined(APPLE)  // long is 64 bits on amd64.
+        "lock ; cmpxchgq %2, (%1) \n\t"
+    #else
+        "lock ; cmpxchgl %2, (%1) \n\t"
+    #endif
+        : "=a" (r)
+        : "r" (dst), "r" (exchange), "0" (comperand)
+        : "memory"
+    );
+    return r;*/
+}
+
+
+DLL_EXPORT void*     CryInterlockedCompareExchangePointer(void* volatile* dst, void* exchange, void* comperand)
+{
+    return __sync_val_compare_and_swap(dst, comperand, exchange);
+    //return (void*)CryInterlockedCompareExchange((long volatile*)dst, (long)exchange, (long)comperand);
+}
+
+DLL_EXPORT void*     CryInterlockedExchangePointer(void* volatile* dst, void* exchange)
+{
+    __sync_synchronize();
+    return __sync_lock_test_and_set(dst, exchange);
+    //return (void*)CryInterlockedCompareExchange((long volatile*)dst, (long)exchange, (long)comperand);
+}
+
+#if (defined(LINUX64) && !defined(ANDROID)) || defined(MAC) || defined(IOS_SIMULATOR)
+DLL_EXPORT unsigned char _InterlockedCompareExchange128(int64 volatile* dst, int64 exchangehigh, int64 exchangelow, int64* comperand)
+{
+    bool bEquals;
+    __asm__ __volatile__
+    (
+        "lock cmpxchg16b %1\n\t"
+        "setz %0"
+        : "=q" (bEquals), "+m" (*dst), "+d" (comperand[1]), "+a" (comperand[0])
+        : "c" (exchangehigh), "b" (exchangelow)
+        : "cc"
+    );
+    return (char)bEquals;
+}
+#elif defined(INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED)
+    // arm64 processors do not provide a cmpxchg16b (or equivalent) instruction,
+    // so _InterlockedCompareExchange128 is not implemented on arm64 platforms.
+#endif
+
+threadID CryGetCurrentThreadId()
+{
+    return GetCurrentThreadId();
+}
+
+void CryDebugBreak()
+{
+    __builtin_trap();
+}
+#endif//LINUX APPLE
+
+#if defined(APPLE) || defined(LINUX)
+// WinAPI debug functions.
+DLL_EXPORT void OutputDebugString(const char* outputString)
+{
+#if !defined(_RELEASE)
+    // Emulates dev tools output in Xcode and cmd line launch with idevicedebug.
+    fprintf(stdout, "%s", outputString);
+#endif
+}
+
+DLL_EXPORT void DebugBreak()
+{
+    CryDebugBreak();
+}
+
+#endif
+
+// 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_ERRNO_TYPE FS_EINVAL = EINVAL;
+static const FS_DIR_TYPE FS_DIR_NULL = NULL;
+static const unsigned char FS_TYPE_DIRECTORY = DT_DIR;
+
+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
+    printf("CrySetFileAttributes not properly implemented yet\n");
+    return false;
+}
+
+
+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;
+    FS_ERRNO_TYPE fsErr = 0;
+    FS_DIRENT_TYPE dirent;
+    uint64_t direntSize = 0;
+    FS_DIR_TYPE fd = FS_DIR_NULL;
+
+    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.
+    bool found = false;
+    bool skipScan = false;
+
+    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(LPCSTR lpFileName)
+{
+    struct stat fileStats;
+    const int success = stat(lpFileName, &fileStats);
+    if (success == -1)
+    {
+        char adjustedFilename[MAX_PATH];
+        GetFilenameNoCase(lpFileName, 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
+}
+
+uint32 CryGetFileAttributes(const char* lpFileName)
+{
+    
+    string fn = lpFileName;
+    adaptFilenameToLinux(fn);
+    const char* buffer = fn.c_str();
+    return GetFileAttributes(buffer);
+    
+}
+
+__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 // !defined(WIN32)
diff --git a/Code/Legacy/CryCommon/XMLBinaryHeaders.h b/Code/Legacy/CryCommon/XMLBinaryHeaders.h
new file mode 100644
index 0000000000..08701465b5
--- /dev/null
+++ b/Code/Legacy/CryCommon/XMLBinaryHeaders.h
@@ -0,0 +1,79 @@
+/*
+ * 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_XMLBINARYHEADERS_H
+#define CRYINCLUDE_CRYCOMMON_XMLBINARYHEADERS_H
+#pragma once
+
+
+namespace XMLBinary
+{
+    class IDataWriter
+    {
+    public:
+        virtual ~IDataWriter() {}
+        virtual void Write(const void* pData, size_t size) = 0;
+    };
+
+    class IFilter
+    {
+    public:
+        enum EType
+        {
+            eType_ElementName,
+            eType_AttributeName
+        };
+        virtual ~IFilter() {}
+        virtual bool IsAccepted(EType type, const char* pName) const = 0;
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    typedef uint32 NodeIndex;            // note: only uint32 or uint16 are supported
+
+    template<int size>
+    struct Pad
+    {
+        char pad[size];
+    };
+    template<>
+    struct Pad<0> { };
+
+    struct Node
+    {
+        uint32 nTagStringOffset;         // offset in CBinaryXmlData::pStringData
+        uint32 nContentStringOffset;     // offset in CBinaryXmlData::pStringData
+        uint16 nAttributeCount;
+        uint16 nChildCount;
+        NodeIndex nParentIndex;
+        NodeIndex nFirstAttributeIndex;
+        NodeIndex nFirstChildIndex;
+        Pad<sizeof(uint32) - sizeof(NodeIndex)> reserved_for_alignment;
+    };
+
+    struct Attribute
+    {
+        uint32 nKeyStringOffset;         // offset in CBinaryXmlData::pStringData
+        uint32 nValueStringOffset;       // offset in CBinaryXmlData::pStringData
+    };
+
+    struct BinaryFileHeader
+    {
+        char szSignature[8];
+        uint32 nXMLSize;
+        uint32 nNodeTablePosition;
+        uint32 nNodeCount;
+        uint32 nAttributeTablePosition;
+        uint32 nAttributeCount;
+        uint32 nChildTablePosition;
+        uint32 nChildCount;
+        uint32 nStringDataPosition;
+        uint32 nStringDataSize;
+    };
+}
+
+#endif // CRYINCLUDE_CRYCOMMON_XMLBINARYHEADERS_H
diff --git a/Code/Legacy/CryCommon/crycommon_files.cmake b/Code/Legacy/CryCommon/crycommon_files.cmake
new file mode 100644
index 0000000000..e461112f00
--- /dev/null
+++ b/Code/Legacy/CryCommon/crycommon_files.cmake
@@ -0,0 +1,271 @@
+#
+# 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
+    CryCommon.cpp
+    IAudioInterfacesCommonData.h
+    IAudioSystem.h
+    ICmdLine.h
+    IConsole.h
+    IEntityRenderState.h
+    IEntityRenderState_info.cpp
+    IFont.h
+    IFunctorBase.h
+    IGem.h
+    IIndexedMesh.h
+    IIndexedMesh_info.cpp
+    ILevelSystem.h
+    ILocalizationManager.h
+    LocalizationManagerBus.h
+    LocalizationManagerBus.inl
+    ILog.h
+    IMaterial.h
+    IMiniLog.h
+    IMovieSystem.h
+    IPhysics.h
+    IPostEffectGroup.h
+    IProcess.h
+    IReadWriteXMLSink.h
+    IRenderAuxGeom.h
+    IRenderer.h
+    IRenderMesh.h
+    ISerialize.h
+    IShader.h
+    ISplines.h
+    IStatObj.h
+    StatObjBus.h
+    IStereoRenderer.h
+    ISurfaceType.h
+    ISystem.h
+    ITexture.h
+    ITimer.h
+    IValidator.h
+    IViewSystem.h
+    IWindowMessageHandler.h
+    IXml.h
+    MicrophoneBus.h
+    physinterface.h
+    HMDBus.h
+    VRCommon.h
+    StereoRendererBus.h
+    HeightmapUpdateNotificationBus.h
+    INavigationSystem.h
+    IMNM.h
+    SFunctor.h
+    FunctorBaseFunction.h
+    FunctorBaseMember.h
+    stridedptr.h
+    Options.h
+    SerializationTypes.h
+    CryEndian.h
+    CryRandomInternal.h
+    Random.h
+    LCGRandom.h
+    CryTypeInfo.cpp
+    BaseTypes.h
+    CompileTimeAssert.h
+    MemoryAccess.h
+    AnimKey.h
+    BitFiddling.h
+    Common_TypeInfo.cpp
+    CryArray.h
+    CryAssert.h
+    CryCrc32.h
+    CryCustomTypes.h
+    CryFile.h
+    CryFixedString.h
+    CryHeaders.h
+    CryHeaders_info.cpp
+    CryListenerSet.h
+    CryLegacyAllocator.h
+    CryName.h
+    CryPath.h
+    CryPodArray.h
+    CrySizer.h
+    CryString.h
+    CrySystemBus.h
+    CryThread.h
+    CryThreadImpl.h
+    CryTypeInfo.h
+    CryVersion.h
+    FrameProfiler.h
+    HeapAllocator.h
+    LegacyAllocator.h
+    MetaUtils.h
+    MiniQueue.h
+    MultiThread.h
+    MultiThread_Containers.h
+    NullAudioSystem.h
+    PNoise3.h
+    PoolAllocator.h
+    primitives.h
+    ProjectDefines.h
+    Range.h
+    ScopedVariableSetter.h
+    SerializeFwd.h
+    SimpleSerialize.h
+    smartptr.h
+    StlUtils.h
+    StringUtils.h
+    Synchronization.h
+    Tarray.h
+    Timer.h
+    TimeValue.h
+    TimeValue_info.h
+    TypeInfo_decl.h
+    TypeInfo_impl.h
+    UnicodeBinding.h
+    UnicodeEncoding.h
+    UnicodeFunctions.h
+    UnicodeIterator.h
+    VectorMap.h
+    VectorSet.h
+    VertexFormats.h
+    XMLBinaryHeaders.h
+    RenderBus.h
+    MainThreadRenderRequestBus.h
+    Cry_Matrix33.h
+    Cry_Matrix34.h
+    Cry_Matrix44.h
+    Cry_MatrixDiag.h
+    Cry_Vector4.h
+    Cry_Camera.h
+    Cry_Color.h
+    Cry_Geo.h
+    Cry_GeoDistance.h
+    Cry_GeoIntersect.h
+    Cry_GeoOverlap.h
+    Cry_Math.h
+    Cry_Quat.h
+    Cry_ValidNumber.h
+    Cry_Vector2.h
+    Cry_Vector3.h
+    Cry_XOptimise.h
+    CryHalf_info.h
+    CryHalf.inl
+    MathConversion.h
+    Cry_HWMatrix.h
+    Cry_HWVector3.h
+    AndroidSpecific.h
+    AppleSpecific.h
+    CryAssert_Android.h
+    CryAssert_impl.h
+    CryAssert_iOS.h
+    CryAssert_Linux.h
+    CryAssert_Mac.h
+    CryLibrary.cpp
+    CryLibrary.h
+    CryThread_dummy.h
+    CryThread_pthreads.h
+    CryThread_windows.h
+    CryThreadImpl_pthreads.h
+    CryThreadImpl_windows.h
+    CryWindows.h
+    Linux32Specific.h
+    Linux64Specific.h
+    Linux_Win32Wrapper.h
+    LinuxSpecific.h
+    LoadScreenBus.h
+    MacSpecific.h
+    platform.h
+    platform_impl.cpp
+    Win32specific.h
+    Win64specific.h
+    LyShine/IDraw2d.h
+    LyShine/ILyShine.h
+    LyShine/ISprite.h
+    LyShine/IRenderGraph.h
+    LyShine/UiAssetTypes.h
+    LyShine/UiComponentTypes.h
+    LyShine/UiBase.h
+    LyShine/UiEntityContext.h
+    LyShine/UiLayoutCellBase.h
+    LyShine/UiSerializeHelpers.h
+    LyShine/Animation/IUiAnimation.h
+    LyShine/Bus/UiAnimateEntityBus.h
+    LyShine/Bus/UiAnimationBus.h
+    LyShine/Bus/UiButtonBus.h
+    LyShine/Bus/UiCanvasBus.h
+    LyShine/Bus/UiCanvasManagerBus.h
+    LyShine/Bus/UiCanvasUpdateNotificationBus.h
+    LyShine/Bus/UiCheckboxBus.h
+    LyShine/Bus/UiCursorBus.h
+    LyShine/Bus/UiDraggableBus.h
+    LyShine/Bus/UiDropdownBus.h
+    LyShine/Bus/UiDropdownOptionBus.h
+    LyShine/Bus/UiDropTargetBus.h
+    LyShine/Bus/UiDynamicLayoutBus.h
+    LyShine/Bus/UiDynamicScrollBoxBus.h
+    LyShine/Bus/UiEditorBus.h
+    LyShine/Bus/UiEditorCanvasBus.h
+    LyShine/Bus/UiEditorChangeNotificationBus.h
+    LyShine/Bus/UiElementBus.h
+    LyShine/Bus/UiEntityContextBus.h
+    LyShine/Bus/UiFaderBus.h
+    LyShine/Bus/UiFlipbookAnimationBus.h
+    LyShine/Bus/UiGameEntityContextBus.h
+    LyShine/Bus/UiImageBus.h
+    LyShine/Bus/UiImageSequenceBus.h
+    LyShine/Bus/UiIndexableImageBus.h
+    LyShine/Bus/UiInitializationBus.h
+    LyShine/Bus/UiInteractableActionsBus.h
+    LyShine/Bus/UiInteractableBus.h
+    LyShine/Bus/UiInteractableStatesBus.h
+    LyShine/Bus/UiInteractionMaskBus.h
+    LyShine/Bus/UiLayoutBus.h
+    LyShine/Bus/UiLayoutCellBus.h
+    LyShine/Bus/UiLayoutCellDefaultBus.h
+    LyShine/Bus/UiLayoutColumnBus.h
+    LyShine/Bus/UiLayoutControllerBus.h
+    LyShine/Bus/UiLayoutFitterBus.h
+    LyShine/Bus/UiLayoutGridBus.h
+    LyShine/Bus/UiLayoutManagerBus.h
+    LyShine/Bus/UiLayoutRowBus.h
+    LyShine/Bus/UiMarkupButtonBus.h
+    LyShine/Bus/UiMaskBus.h
+    LyShine/Bus/UiNavigationBus.h
+    LyShine/Bus/UiParticleEmitterBus.h
+    LyShine/Bus/UiRadioButtonBus.h
+    LyShine/Bus/UiRadioButtonCommunicationBus.h
+    LyShine/Bus/UiRadioButtonGroupBus.h
+    LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
+    LyShine/Bus/UiRenderBus.h
+    LyShine/Bus/UiRenderControlBus.h
+    LyShine/Bus/UiScrollableBus.h
+    LyShine/Bus/UiScrollBarBus.h
+    LyShine/Bus/UiScrollBoxBus.h
+    LyShine/Bus/UiScrollerBus.h
+    LyShine/Bus/UiSliderBus.h
+    LyShine/Bus/UiSpawnerBus.h
+    LyShine/Bus/UiSystemBus.h
+    LyShine/Bus/UiTextBus.h
+    LyShine/Bus/UiTextInputBus.h
+    LyShine/Bus/UiTooltipBus.h
+    LyShine/Bus/UiTooltipDataPopulatorBus.h
+    LyShine/Bus/UiTooltipDisplayBus.h
+    LyShine/Bus/UiTransform2dBus.h
+    LyShine/Bus/UiTransformBus.h
+    LyShine/Bus/UiVisualBus.h
+    LyShine/Bus/Sprite/UiSpriteBus.h
+    LyShine/Bus/World/UiCanvasOnMeshBus.h
+    LyShine/Bus/World/UiCanvasRefBus.h
+    LyShine/Bus/Tools/UiSystemToolsBus.h
+    Maestro/Bus/EditorSequenceAgentComponentBus.h
+    Maestro/Bus/EditorSequenceBus.h
+    Maestro/Bus/EditorSequenceComponentBus.h
+    Maestro/Bus/SequenceComponentBus.h
+    Maestro/Bus/SequenceAgentComponentBus.h
+    Maestro/Types/AnimNodeType.h
+    Maestro/Types/AnimParamType.h
+    Maestro/Types/AnimValue.h
+    Maestro/Types/AnimValueType.h
+    Maestro/Types/AssetBlendKey.h
+    Maestro/Types/AssetBlends.h
+    Maestro/Types/SequenceType.h
+    StaticInstance.h
+    WinBase.cpp
+)
diff --git a/Code/Legacy/CryCommon/crycommon_testing_files.cmake b/Code/Legacy/CryCommon/crycommon_testing_files.cmake
new file mode 100644
index 0000000000..64bc0a81fb
--- /dev/null
+++ b/Code/Legacy/CryCommon/crycommon_testing_files.cmake
@@ -0,0 +1,19 @@
+#
+# 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/IAudioSystemMock.h
+    Mocks/IConsoleMock.h
+    Mocks/ICryPakMock.h
+    Mocks/ILogMock.h
+    Mocks/ISystemMock.h
+    Mocks/ITimerMock.h
+    Mocks/ICVarMock.h
+    Mocks/IRendererMock.h
+    Mocks/ITextureMock.h
+    Mocks/IRemoteConsoleMock.h
+)
diff --git a/Code/Legacy/CryCommon/iOSSpecific.h b/Code/Legacy/CryCommon/iOSSpecific.h
new file mode 100644
index 0000000000..0bf8c6452a
--- /dev/null
+++ b/Code/Legacy/CryCommon/iOSSpecific.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+// Description : iOS specific declarations
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_IOSSPECIFIC_H
+#define CRYINCLUDE_CRYCOMMON_IOSSPECIFIC_H
+#pragma once
+
+
+#include "AppleSpecific.h"
+#include <float.h>
+#include <TargetConditionals.h>
+
+#if TARGET_IPHONE_SIMULATOR
+#define IOS_SIMULATOR
+#include <xmmintrin.h>
+#define _CPU_AMD64
+#define _CPU_SSE
+#else
+#define _CPU_ARM
+#define _CPU_NEON
+#endif
+
+// detect 64bit iOS
+#if defined(__LP64__)
+#define PLATFORM_64BIT
+#endif
+
+#if defined(_CPU_ARM) && defined(PLATFORM_64BIT)
+#   define INTERLOCKED_COMPARE_EXCHANGE_128_NOT_SUPPORTED
+#endif // defined(_CPU_ARM) && defined(PLATFORM_64BIT)
+
+#ifndef MOBILE
+#define MOBILE
+#endif
+
+// stubs for virtual keys, isn't used on iOS
+#define VK_UP               0
+#define VK_DOWN         0
+#define VK_RIGHT        0
+#define VK_LEFT         0
+#define VK_CONTROL  0
+#define VK_SCROLL       0
+
+
+//#define USE_CRT 1
+#if !defined(PLATFORM_64BIT)
+#error "IOS build only supports the 64bit architecture"
+#else
+#define SIZEOF_PTR 8
+typedef uint64_t threadID;
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_IOSSPECIFIC_H
diff --git a/Code/Legacy/CryCommon/physinterface.h b/Code/Legacy/CryCommon/physinterface.h
new file mode 100644
index 0000000000..0ad0f149ff
--- /dev/null
+++ b/Code/Legacy/CryCommon/physinterface.h
@@ -0,0 +1,3676 @@
+/*
+ * 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 : declarations of all physics interfaces and structures
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_PHYSINTERFACE_H
+#define CRYINCLUDE_CRYCOMMON_PHYSINTERFACE_H
+#pragma once
+
+
+#include <SerializeFwd.h>
+
+#include "Cry_Geo.h"
+#include "stridedptr.h"
+#include "primitives.h"
+#ifdef NEED_ENDIAN_SWAP
+    #include "CryEndian.h"
+#endif
+
+#include <ISystem.h>
+
+//////////////////////////////////////////////////////////////////////////
+// Physics defines.
+//////////////////////////////////////////////////////////////////////////
+
+enum EPE_Params
+{
+    ePE_params_pos = 0,
+    ePE_player_dimensions = 1,
+    ePE_params_car = 2,
+    ePE_params_particle = 3,
+    ePE_player_dynamics = 4,
+    ePE_params_joint = 5,
+    ePE_params_part = 6,
+    ePE_params_sensors = 7,
+    ePE_params_articulated_body = 8,
+    ePE_params_outer_entity = 9,
+    ePE_simulation_params = 10,
+    ePE_params_foreign_data = 11,
+    ePE_params_buoyancy = 12,
+    ePE_params_rope = 13,
+    ePE_params_bbox = 14,
+    ePE_params_flags = 15,
+    ePE_params_wheel = 16,
+    ePE_params_softbody = 17,
+    ePE_params_area = 18,
+    ePE_tetrlattice_params = 19,
+    ePE_params_ground_plane = 20,
+    ePE_params_structural_joint = 21,
+    ePE_params_waterman = 22,
+    ePE_params_timeout = 23,
+    ePE_params_skeleton = 24,
+    ePE_params_structural_initial_velocity = 25,
+    ePE_params_collision_class  = 26,
+
+    ePE_Params_Count
+};
+
+enum EPE_Action
+{
+    ePE_action_move = 1,
+    ePE_action_impulse = 2,
+    ePE_action_drive = 3,
+    ePE_action_reset = 4,
+    ePE_action_add_constraint = 5,
+    ePE_action_update_constraint = 6,
+    ePE_action_register_coll_event = 7,
+    ePE_action_awake = 8,
+    ePE_action_remove_all_parts = 9,
+    ePE_action_set_velocity = 10,
+    ePE_action_attach_points = 11,
+    ePE_action_target_vtx = 12,
+    ePE_action_reset_part_mtx = 13,
+    ePE_action_notify = 14,
+    ePE_action_auto_part_detachment = 15,
+    ePE_action_move_parts = 16,
+    ePE_action_batch_parts_update = 17,
+    ePE_action_slice = 18,
+    pPE_action_syncliving = 19,
+
+    ePE_Action_Count
+};
+
+enum EPE_GeomParams
+{
+    ePE_geomparams = 0,
+    ePE_cargeomparams = 1,
+    ePE_articgeomparams = 2,
+
+    ePE_GeomParams_Count
+};
+
+enum EPE_Status
+{
+    ePE_status_pos = 1,
+    ePE_status_living = 2,
+    ePE_status_vehicle = 4,
+    ePE_status_wheel = 5,
+    ePE_status_joint = 6,
+    ePE_status_awake = 7,
+    ePE_status_dynamics = 8,
+    ePE_status_collisions = 9,
+    ePE_status_id = 10,
+    ePE_status_timeslices = 11,
+    ePE_status_nparts = 12,
+    ePE_status_contains_point = 13,
+    ePE_status_rope = 14,
+    ePE_status_vehicle_abilities = 15,
+    ePE_status_placeholder = 16,
+    ePE_status_softvtx = 17,
+    ePE_status_sensors = 18,
+    ePE_status_sample_contact_area = 19,
+    ePE_status_caps = 20,
+    ePE_status_check_stance = 21,
+    ePE_status_waterman = 22,
+    ePE_status_area = 23,
+    ePE_status_extent = 24,
+    ePE_status_random = 25,
+    ePE_status_constraint = 26,
+    ePE_status_netpos = 27,
+
+    ePE_Status_Count
+};
+
+enum pe_type
+{
+    PE_NONE = 0, PE_STATIC = 1, PE_RIGID = 2, PE_WHEELEDVEHICLE = 3, PE_LIVING = 4, PE_PARTICLE = 5, PE_ARTICULATED = 6, PE_ROPE = 7, PE_SOFT = 8, PE_AREA = 9
+};
+enum sim_class
+{
+    SC_STATIC = 0, SC_SLEEPING_RIGID = 1, SC_ACTIVE_RIGID = 2, SC_LIVING = 3, SC_INDEPENDENT = 4, SC_TRIGGER = 6, SC_DELETED = 7
+};
+struct IGeometry;
+struct IPhysicalEntity;
+struct IGeomManager;
+struct IPhysRenderer;
+class ICrySizer;
+struct IDeferredPhysicsEvent;
+struct ILog;
+IPhysicalEntity* const WORLD_ENTITY = (IPhysicalEntity*)-10;
+
+#ifndef USE_IMPROVED_RIGID_ENTITY_SYNCHRONISATION
+#   define USE_IMPROVED_RIGID_ENTITY_SYNCHRONISATION 1
+#endif
+
+/**
+ * 64-bit wrapper for foreign data on physical entities.
+ * Int and pointer values are regularly stored in foreign data, but we now also support
+ * 64-bit unsigned integers (AZ::EntityId).
+ * - Supports implicit two-way conversion as integer, pointer, int, or 64-bit unsigned integer.
+ * - Supports casting to typed pointers for compatibility with original void* foreign data.
+ */
+class PhysicsForeignData final
+{
+public:
+
+    PhysicsForeignData()
+        : m_data(0) {}
+
+    /// Explicit or implicit creation from pointer, int, or unsigned int types.
+    PhysicsForeignData(void* data)
+        : m_data(reinterpret_cast<uint64>(data)) {}
+    PhysicsForeignData(int data)
+        : m_data(static_cast<uint64>(data)) {}
+    PhysicsForeignData(uint64 data)
+        : m_data(static_cast<uint64>(data)) {}
+
+    /// Comparison operators.
+    bool operator==(const PhysicsForeignData& rhs) const
+    {
+        return m_data == rhs.m_data;
+    }
+
+    bool operator!=(const PhysicsForeignData& rhs) const
+    {
+        return m_data != rhs.m_data;
+    }
+
+    template<typename T>
+    bool operator==(T* data) const
+    {
+        return reinterpret_cast<T*>(m_data) == data;
+    }
+
+    template<typename T>
+    bool operator==(const T* data) const
+    {
+        return reinterpret_cast<const T*>(m_data) == data;
+    }
+
+    bool operator==(int data) const
+    {
+        return static_cast<int>(m_data) == data;
+    }
+
+    bool operator==(uint64 data) const
+    {
+        return m_data == data;
+    }
+
+    /// Using CryPhysics' existing pattern for marking fields as unused.
+    void MarkUnused()
+    {
+        m_data = uint64(1 << 31);
+    }
+
+    bool IsUnused() const
+    {
+        return m_data == uint64(1 << 31);
+    }
+
+    /// Bool operator for: if (foreignData)
+    operator bool() const
+    {
+        return m_data != 0;
+    }
+
+    /// Void* cast conversion
+    operator void*() const
+    {
+        return reinterpret_cast<void*>(m_data);
+    }
+
+    /// int cast conversion
+    operator int() const
+    {
+        return static_cast<int>(m_data);
+    }
+
+    /// 64-bit unsigned int cast conversion
+    operator uint64() const
+    {
+        return m_data;
+    }
+
+    /// Cast conversion to pointers or arbitrary types.
+    template<typename T>
+    operator T*() const
+    {
+        return reinterpret_cast<T*>(m_data);
+    }
+
+private:
+
+    uint64 m_data;  ///< Underlying 64-bit storage.
+};
+
+/////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////// IPhysicsStreamer Interface /////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+
+// this is a callback interface for on-demand physicalization, physics gets a pointer to an implementation
+struct IPhysicsStreamer
+{
+    // <interfuscator:shuffle>
+    virtual ~IPhysicsStreamer(){}
+    // called whenever a placeholder (created through CreatePhysicalPlaceholder) requests a full entity
+    virtual int CreatePhysicalEntity(PhysicsForeignData foreignData, int iForeignData, int iForeignFlags) = 0;
+    // called whenever a placeholder-owned entity expires
+    virtual int DestroyPhysicalEntity(IPhysicalEntity* pent) = 0;
+    // called when on-demand entities in a box need to be physicalized
+    // (the grid is activated once RegisterBBoxInPODGrid is called)
+    virtual int CreatePhysicalEntitiesInBox(const Vec3& boxMin, const Vec3& boxMax) = 0;
+    // called when on-demand physicalized box expires.
+    // the streamer is expected to delete those that have a 0 refcounter, and keep the rest
+    virtual int DestroyPhysicalEntitiesInBox(const Vec3& boxMin, const Vec3& boxMax) = 0;
+    // </interfuscator:shuffle>
+};
+
+/////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////// IPhysRenderer Interface /////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+
+// this is a callback interface for debug rendering, physics gets a pointer to an implementation
+struct IPhysRenderer
+{
+    // <interfuscator:shuffle>
+    virtual ~IPhysRenderer(){}
+    // draws helpers for the specified geometry (idxColor is in 0..7 range)
+    virtual void DrawGeometry(IGeometry* pGeom, struct geom_world_data* pgwd, int idxColor = 0, int bSlowFadein = 0, const Vec3& sweepDir = Vec3(0)) = 0;
+    // draws a line for wireframe helpers
+    virtual void DrawLine(const Vec3& pt0, const Vec3& pt1, int idxColor = 0, int bSlowFadein = 0) = 0;
+    // gets a descriptive name of the phys entity's owner (used solely for debug output)
+    virtual const char* GetForeignName(PhysicsForeignData foreignData, int iForeignData, int iForeignFlags) = 0;
+    // draws a text line (stauration is 0..1 and is currently used to represent stress level on a breakable joint)
+    virtual void DrawText(const Vec3& pt, const char* txt, int idxColor, float saturation = 0) = 0;
+    // sets an offset that is to be added to all subsequent draw requests
+    virtual Vec3 SetOffset(const Vec3& offs = Vec3(ZERO)) = 0;
+    // draw a frame or a partial frame using a scale for the axes.
+    // pnt is the world space position
+    // axes are the 3 axes normalized
+    // scale is a scale applied on the axes
+    // limits are the x, y, z radians for the Y, Z, X plane. If the pointer is not null, limits will be drawn in form of arcs.
+    // bitfield for what axes are locked
+    virtual void DrawFrame(const Vec3& pnt, const Vec3* axes, const float scale, const Vec3* limits, const int axes_locked) = 0;
+    // </interfuscator:shuffle>
+};
+
+class CMemStream
+{ // For "fastload" serialization
+public:
+
+    ILINE CMemStream(bool swap)
+    {
+        Prealloc();
+        m_iPos = 0;
+        bDeleteBuf = true;
+        bSwapEndian = swap;
+        bMeasureOnly = 0;
+    }
+
+    ILINE CMemStream(void* pbuf, int sz, bool swap)
+    {
+        m_pBuf = (char*)pbuf;
+        m_nSize = sz;
+        m_iPos = 0;
+        bDeleteBuf = false;
+        bSwapEndian = swap;
+        bMeasureOnly = 0;
+    }
+    ILINE CMemStream()
+    {
+        m_pBuf = (char*)m_dummyBuf;
+        m_iPos = 0;
+        m_nSize = 0;
+        bDeleteBuf = false;
+        bSwapEndian = false;
+        bMeasureOnly = -1;
+    }
+
+    virtual ~CMemStream()
+    {
+        if (bDeleteBuf)
+        {
+            CryModuleFree(m_pBuf);
+        }
+    }
+    virtual void Prealloc()
+    {
+        m_pBuf = (char*)CryModuleMalloc(m_nSize = 0x1000);
+    }
+
+    ILINE void* GetBuf() { return m_pBuf; }
+    ILINE int GetUsedSize() { return m_iPos; }
+    ILINE int GetAllocatedSize() { return m_nSize; }
+
+    template<class ftype>
+    ILINE void Write(const ftype& op) { Write(&op, sizeof(op)); }
+    ILINE void Write(const void* pbuf, int sz)
+    {
+#if defined(MEMSTREAM_DEBUG)
+        if (bMeasureOnly <= 0 && m_nSize && m_iPos + sz > m_nSize)
+        {
+            printf("overflow: %d + %d >= %d\n", m_iPos, sz, m_nSize);
+        }
+#endif
+        if (!bMeasureOnly)
+        {
+            if (m_iPos + sz > m_nSize)
+            {
+                GrowBuf(sz);
+            }
+            memcpy(m_pBuf + m_iPos, pbuf, (unsigned int)sz);
+        }
+        m_iPos += sz;
+    }
+
+    virtual void GrowBuf(int sz)
+    {
+        int prevsz = m_nSize;
+        char* prevbuf = m_pBuf;
+        m_pBuf = (char*)CryModuleMalloc(m_nSize = (m_iPos + sz - 1 & ~0xFFF) + 0x1000);
+        memcpy(m_pBuf, prevbuf, (unsigned int)prevsz);
+        CryModuleFree(prevbuf);
+    }
+
+    template<class ftype>
+    ILINE void Read(ftype& op)
+    {
+        ReadRaw(&op, sizeof(op));
+#if defined (NEED_ENDIAN_SWAP)
+        if (bSwapEndian)
+        {
+            SwapEndian(op);
+        }
+#endif
+    }
+
+    template<class ftype>
+    ILINE ftype Read()
+    {
+        ftype val;
+        Read(val);
+        return val;
+    }
+    template<class ftype>
+    ILINE void ReadType(ftype* op, int count = 1)
+    {
+        ReadRaw(op, sizeof(*op) * count);
+#if defined (NEED_ENDIAN_SWAP)
+        if (bSwapEndian)
+        {
+            while (count-- > 0)
+            {
+                SwapEndian(*op++);
+            }
+        }
+#endif
+    }
+    ILINE void ReadRaw(void* pbuf, int sz)
+    {
+#if defined(MEMSTREAM_DEBUG)
+        if (bMeasureOnly <= 0 && m_nSize && m_iPos + sz > m_nSize)
+        {
+            printf("overflow: %d + %d >= %d\n", m_iPos, sz, m_nSize);
+        }
+#endif
+        memcpy(pbuf, (m_pBuf + m_iPos), (unsigned int)sz);
+        m_iPos += sz;
+    }
+
+    char* m_pBuf, m_dummyBuf[4];
+    int m_iPos, m_nSize;
+    bool bDeleteBuf;
+    bool bSwapEndian;
+    int bMeasureOnly;
+};
+
+
+// Workaround for bug in GCC 4.8. The kind of access patterns here leads to an internal
+// compiler error in GCC 4.8 when optimizing with debug symbols. Two possible solutions
+// are available, compile in Profile mode without debug symbols or remove optimizations
+// in the code where the bug occurs
+// see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59776
+#if defined(_PROFILE) && !defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
+// Cannot use #pragma GCC optimize("O0") because it causes a system crash when using
+// the gcc compiler for another platform
+#define CRY_GCC48_AVOID_OPTIMIZE __attribute__((optimize("-O0")))
+#else
+#define CRY_GCC48_AVOID_OPTIMIZE
+#endif
+// unused_marker deliberately fills a variable with invalid data,
+// so that later is_unused() can check whether it was initialized
+// (this is used in all physics params/status/action structures)
+class unused_marker
+{
+public:
+    union f2i
+    {
+        float f;
+        uint32 i;
+    };
+    union d2i
+    {
+        double d;
+        uint32 i[2];
+    };
+    unused_marker() {}
+    unused_marker& operator,(float& x) CRY_GCC48_AVOID_OPTIMIZE;
+    unused_marker& operator,(double& x) CRY_GCC48_AVOID_OPTIMIZE;
+    unused_marker& operator,(int& x) CRY_GCC48_AVOID_OPTIMIZE;
+    unused_marker& operator,(unsigned int& x) CRY_GCC48_AVOID_OPTIMIZE;
+    unused_marker& operator,(PhysicsForeignData& x) CRY_GCC48_AVOID_OPTIMIZE;
+    template<class ref>
+    unused_marker& operator,(ref*& x) { x = (ref*)-1; return *this; }
+    template<class F>
+    unused_marker& operator,(Vec3_tpl<F>& x) { return *this, x.x; }
+    template<class F>
+    unused_marker& operator,(Quat_tpl<F>& x) { return *this, x.w; }
+    template<class F>
+    unused_marker& operator,(strided_pointer<F>& x) { return *this, x.data; }
+};
+inline unused_marker& unused_marker::operator,(float& x) { *alias_cast<int*>(&x) = 0xFFBFFFFF; return *this; }
+inline unused_marker& unused_marker::operator,(double& x) { (alias_cast<int*>(&x))[false ? 1 : 0] = 0xFFF7FFFF; return *this; }
+inline unused_marker& unused_marker::operator,(int& x) { x = 1 << 31; return *this; }
+inline unused_marker& unused_marker::operator,(unsigned int& x) { x = 1u << 31; return *this; }
+inline unused_marker& unused_marker::operator,(PhysicsForeignData& x) { x.MarkUnused(); return *this; }
+
+#undef CRY_GCC48_AVOID_OPTIMIZE
+
+inline bool is_unused(const float& x) { unused_marker::f2i u; u.f = x; return (u.i & 0xFFA00000) == 0xFFA00000; }
+
+inline bool is_unused(int x) { return x == 1 << 31; }
+inline bool is_unused(unsigned int x) { return x == 1u << 31; }
+inline bool is_unused(const PhysicsForeignData& x) { return x.IsUnused(); }
+template<class ref>
+bool is_unused(ref* x) { return x == (ref*)-1; }
+template<class ref>
+bool is_unused(strided_pointer<ref> x) { return is_unused(x.data); }
+template<class F>
+bool is_unused(const Ang3_tpl<F>& x) { return is_unused(x.x); }
+template<class F>
+bool is_unused(const Vec3_tpl<F>& x) { return is_unused(x.x); }
+template<class F>
+bool is_unused(const Quat_tpl<F>& x) { return is_unused(x.w); }
+inline bool is_unused(const double& x) { unused_marker::d2i u; u.d = x; return (u.i[eLittleEndian ? 1 : 0] & 0xFFF40000) == 0xFFF40000; }
+#define MARK_UNUSED unused_marker(),
+
+
+// validators do nothing in the interface, but inside the physics they are redefined
+// so that they check the input for consistency and report errors
+#if !defined(VALIDATOR_LOG)
+#define VALIDATOR_LOG(pLog, str)
+#define VALIDATORS_START
+#define VALIDATOR(member)
+#define VALIDATOR_NORM(member)
+#define VALIDATOR_NORM_MSG(member, msg, member1)
+#define VALIDATOR_RANGE(member, minval, maxval)
+#define VALIDATOR_RANGE2(member, minval, maxval)
+#define VALIDATORS_END
+#endif
+
+
+
+////////// physics entity collision filtering class enums /////////////////
+
+enum pe_collision_class
+{
+    /// reserved basic collision classes
+    collision_class_terrain = 1 << 0,
+    collision_class_wheeled = 1 << 1,
+    collision_class_living = 1 << 2,
+    collision_class_articulated = 1 << 3,
+    collision_class_soft = 1 << 4,
+    collision_class_rope = 1 << 5,
+    collision_class_particle = 1 << 6,
+    // begin game specific ones from this enum
+    collision_class_game = 1 << 10,
+};
+
+struct SCollisionClass
+{
+    uint32 type;     // collision_class flags to identify the enity
+    uint32 ignore;   // another entity will be ignored if *any* of these bits are set in its type
+
+    SCollisionClass() {}
+
+    SCollisionClass(uint32 t, uint32 i)
+    {
+        type = t;
+        ignore = i;
+    }
+};
+
+ILINE int IgnoreCollision(const SCollisionClass& a, const SCollisionClass& b)
+{
+    return (a.type & b.ignore) | (b.type & a.ignore);
+}
+
+
+
+// in physics interface [almost] all parameters are passed via structures
+// this allows having stable interface methods and flexible default arguments system
+
+////////////////////////// Params structures /////////////////////
+
+////////// common params
+struct pe_params
+{
+    int type;
+};
+
+struct pe_params_pos
+    : pe_params                    //   Sets position and orientation of entity
+{
+    enum entype
+    {
+        type_id = ePE_params_pos
+    };
+    pe_params_pos()
+    {
+        type = type_id;
+        MARK_UNUSED pos, scale, q, iSimClass;
+        pMtx3x4 = 0;
+        pMtx3x3 = 0;
+        bRecalcBounds = 1;
+        bEntGridUseOBB = 0;
+    }
+
+    Vec3 pos;
+    quaternionf q;
+    float scale; // note that since there's no per-entity scale, it gets 'baked' into individual parts' scales
+    Matrix34* pMtx3x4; // optional position+orientation
+    Matrix33* pMtx3x3;  // optional orientation via 3x3 matrix
+    int iSimClass; // see the sim_class enum
+    int bRecalcBounds; // tells to recompute the bounding boxes
+    bool bEntGridUseOBB; // whether or not to use part OBBs rather than object AABB when registering in the entity grid
+
+    VALIDATORS_START
+        VALIDATOR(pos)
+        VALIDATOR_NORM_MSG(q, "(perhaps non-uniform scaling was used?)", pos)
+        VALIDATOR(scale)
+    VALIDATORS_END
+};
+
+struct pe_params_bbox
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_bbox
+    };
+    pe_params_bbox() { type = type_id; MARK_UNUSED BBox[0], BBox[1]; }
+    Vec3 BBox[2]; // force this bounding box (note that if the entity recomputes it later, it'll override this)
+
+    VALIDATORS_START
+        VALIDATOR(BBox[0])
+        VALIDATOR(BBox[1])
+    VALIDATORS_END
+};
+
+struct pe_params_outer_entity
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_outer_entity
+    };
+    pe_params_outer_entity() { type = type_id; pOuterEntity = 0; pBoundingGeometry = 0; }
+
+    IPhysicalEntity* pOuterEntity; //   outer entity is used to group together SC_INDEPENDENT entities (example: ropes on a tree trunk)
+    IGeometry* pBoundingGeometry;   // optional geometry to test containment (used in pe_status_contains_point)
+};
+
+struct ITetrLattice;
+
+struct pe_params_part
+    : pe_params                     // Sets geometrical parameters of entity part
+{
+    enum entype
+    {
+        type_id = ePE_params_part
+    };
+    pe_params_part()
+    {
+        type = type_id;
+        MARK_UNUSED pos, q, scale, partid, ipart, mass, density, pPhysGeom, pPhysGeomProxy, idmatBreakable, pLattice, pMatMapping, minContactDist, flagsCond, idSkeleton, invTimeStep, idParent;
+        pMtx3x4 = 0;
+        pMtx3x3 = 0;
+        bRecalcBBox = 1;
+        bAddrefGeoms = 0;
+        flagsOR = flagsColliderOR = 0;
+        flagsAND = flagsColliderAND = (unsigned)-1;
+    }
+
+    int partid; // partid identifier of part
+    int ipart; // optionally, internal part slot number
+    int bRecalcBBox; // whether entity's bounding box should be recalculated
+    Vec3 pos;
+    quaternionf q;
+    float scale;
+    Matrix34* pMtx3x4; // optional position+orientation
+    Matrix33* pMtx3x3; // optional orientation via 3x3 matrix
+    unsigned int flagsCond; // if partid and ipart are not specified, check for parts with flagsCond set
+    unsigned int flagsOR, flagsAND; // new flags = (flags & flagsAND) | flagsOR
+    unsigned int flagsColliderOR, flagsColliderAND;
+    float mass; // either mass of density should be set; mass = density*volume
+    float density;
+    float minContactDist; // threshold for contact points generation
+    struct phys_geometry* pPhysGeom, * pPhysGeomProxy; // if present and different from pPhysGeomProxy, pPhysGeom is used for raytracing
+    int idmatBreakable; // if >=0, the part is procedurally breakable with this mat_id (see AddExplosionShape)
+    ITetrLattice* pLattice; // lattice is used for soft bodies and procedural structural breaking
+    int idSkeleton; // part with this id becomes this part's deformation skeleton
+    int* pMatMapping;   // material mapping table for this part
+    int nMats; // number of pMatMapping entries
+    float invTimeStep; // 1.0f/time_step, ragdolls will compute joint's velocity if this and position is set
+    int bAddrefGeoms;   // AddRef returned geometries if used in GetParams
+    int idParent; // parent for hierarchical breaking; it hides all children until at least one of them breaks off
+
+    VALIDATORS_START
+        VALIDATOR(pos)
+        VALIDATOR_NORM_MSG(q, "(perhaps non-uniform scaling was used in the asset?)", pt)
+        VALIDATOR(scale)
+    VALIDATORS_END
+};
+
+struct pe_params_sensors
+    : pe_params                        // Attaches optional ray sensors to an entity; only living entities support it
+{
+    enum entype
+    {
+        type_id = ePE_params_sensors
+    };
+    pe_params_sensors() { type = type_id; nSensors = 0; pOrigins = 0; pDirections = 0; }
+
+    int nSensors;   // nSensors number of sensors
+    const Vec3* pOrigins; // pOrigins sensors origins in entity CS
+    const Vec3* pDirections;    // pDirections sensors directions (dir*ray length) in entity CS
+};
+
+struct pe_simulation_params
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_simulation_params
+    };
+    pe_simulation_params()
+    {
+        type = type_id;
+        MARK_UNUSED maxTimeStep, gravity, minEnergy, damping, iSimClass,
+                    dampingFreefall, gravityFreefall, mass, density, maxLoggedCollisions, maxRotVel, disablePreCG, maxFriction, collTypes;
+    }
+
+    int iSimClass;
+    float maxTimeStep; // maximum time step that entity can accept (larger steps will be split)
+    float minEnergy; // minimun of kinetic energy below which entity falls asleep (divided by mass)
+    float damping; // damped velocity = oridinal velocity * (1 - damping*time interval)
+    Vec3 gravity;   // per-entity gravity (note that if there are any phys areas with gravity, they will override it unless pef_ignore_areas is set
+    float dampingFreefall; // damping and gravity used when there are no collisions,
+    Vec3 gravityFreefall; // NOTE: if left unused, gravity value will be substituted (if provided)
+    float maxRotVel; // rotational velocity is clamped to this value
+    float mass; // either mass of density should be set; mass = density*volume
+    float density;
+    int maxLoggedCollisions; // maximum EventPhysCollisions reported per frame (only supported by rigid bodies/ragdolls/vehicles)
+    int disablePreCG; // disables Pre-CG solver for the group this body is in (recommended for balls)
+    float maxFriction; // sets upper friction limit for this object and all objects it's currently in contact with
+    int collTypes; // collision types (a combination of ent_xxx flags)
+};
+
+struct pe_params_foreign_data
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_foreign_data
+    };
+    pe_params_foreign_data() { type = type_id; MARK_UNUSED pForeignData, iForeignData, iForeignFlags; iForeignFlagsAND = -1; iForeignFlagsOR = 0; }
+
+    PhysicsForeignData pForeignData; // foreign data is an arbitrary pointer used to associate physical entity with its owner object
+    int iForeignData; // foreign data types (defined in IPhysics.h)
+    int iForeignFlags; // any flags the owner wants to store
+    int iForeignFlagsAND, iForeignFlagsOR; // when setting, flagsNew = flags & flagsAND | flagsOR
+};
+
+struct pe_params_buoyancy
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_buoyancy
+    };
+    pe_params_buoyancy()
+    {
+        type = type_id;
+        iMedium = 0;
+        MARK_UNUSED waterDensity, kwaterDensity, waterDamping,
+                    waterPlane.n, waterPlane.origin, waterEmin, waterResistance, kwaterResistance, waterFlow, flowVariance;
+    };
+
+    float waterDensity; // overrides water density from the current water volume for an entity; sets for water areas
+    float kwaterDensity; // scales water density from the current water volume (used for entities only)
+    // NOTE: for entities , waterDensity override is stored as kwaterDensity relative to the global area's density
+    float waterDamping; // uniform damping while submerged, will be scaled with submerged fraction
+    float waterResistance, kwaterResistance; // water's medium resistance; same comments on water and kwater.. apply
+    Vec3 waterFlow; // flow's movement vector; can only be set for a water area
+    float flowVariance; // not yet supported
+    primitives::plane waterPlane;   // positive normal = above the water surface
+    float waterEmin; // sleep energy while floating with no contacts (see minEnergy in pe_simulation_params)
+    int iMedium; // 0 for water, 1 for air
+};
+
+enum phentity_flags
+{
+    // PE_PARTICLE-specific flags
+    particle_single_contact = 0x01, // full stop after first contact
+    particle_constant_orientation = 0x02, // forces constant orientation
+    particle_no_roll = 0x04, // 'sliding' mode; entity's 'normal' vector axis will be alinged with the ground normal
+    particle_no_path_alignment = 0x08, // unless set, entity's y axis will be aligned along the movement trajectory
+    particle_no_spin = 0x10, // disables spinning while flying
+    particle_no_self_collisions = 0x100, // disables collisions with other particles
+    particle_no_impulse = 0x200, // particle will not add hit impulse (expecting that some other system will)
+
+    // PE_LIVING-specific flags
+    lef_push_objects = 0x01, lef_push_players = 0x02,   // push objects and players during contacts
+    lef_snap_velocities = 0x04,   // quantizes velocities after each step (was ised in MP for precise deterministic sync)
+    lef_loosen_stuck_checks = 0x08, // don't do additional intersection checks after each step (recommended for NPCs to improve performance)
+    lef_report_sliding_contacts = 0x10,   // unless set, 'grazing' contacts are not reported
+
+    // PE_ROPE-specific flags
+    rope_findiff_attached_vel = 0x01, // approximate velocity of the parent object as v = (pos1-pos0)/time_interval
+    rope_no_solver = 0x02, // no velocity solver; will rely on stiffness (if set) and positional length enforcement
+    rope_ignore_attachments = 0x4, // no collisions with objects the rope is attached to
+    rope_target_vtx_rel0 = 0x08, rope_target_vtx_rel1 = 0x10, // whether target vertices are set in the parent entity's frame
+    rope_subdivide_segs = 0x100, // turns on 'dynamic subdivision' mode (only in this mode contacts in a strained state are handled correctly)
+    rope_no_tears = 0x200, // rope will not tear when it reaches its force limit, but stretch
+    rope_collides = 0x200000, // rope will collide with objects other than the terrain
+    rope_collides_with_terrain = 0x400000, // rope will collide with the terrain
+    rope_collides_with_attachment = 0x80, // rope will collide with the objects it's attached to even if the other collision flags are not set
+    rope_no_stiffness_when_colliding = 0x10000000, // rope will use stiffness 0 if it has contacts
+
+    // PE_SOFT-specific flags
+    se_skip_longest_edges = 0x01, // the longest edge in each triangle with not participate in the solver
+    se_rigid_core = 0x02, // soft body will have an additional rigid body core
+
+    // PE_RIGID-specific flags (note that PE_ARTICULATED and PE_WHEELEDVEHICLE are derived from it)
+    ref_use_simple_solver = 0x01, // use penalty-based solver (obsolete)
+    ref_no_splashes = 0x04, // will not generate EventPhysCollisions when contacting water
+    ref_checksum_received = 0x04, ref_checksum_outofsync = 0x08, // obsolete
+    ref_small_and_fast = 0x100, // entity will trace rays against alive characters; set internally unless overriden
+
+    // PE_ARTICULATED-specific flags
+    aef_recorded_physics = 0x02, // specifies a an entity that contains pre-baked physics simulation
+
+    // PE_WHEELEDVEHICLE-specific flags
+    wwef_fake_inner_wheels = 0x08, // exclude wheels between the first and the last one from the solver
+    // (only wheels with non-0 suspension are considered)
+
+    // general flags
+    pef_parts_traceable = 0x10, // each entity part will be registered separately in the entity grid
+    pef_disabled = 0x20, // entity will not be simulated
+    pef_never_break = 0x40, // entity will not break or deform other objects
+    pef_deforming = 0x80, // entity undergoes a dynamic breaking/deforming
+    pef_pushable_by_players = 0x200, // entity can be pushed by playerd
+    pef_traceable = 0x400, particle_traceable = 0x400, rope_traceable = 0x400, // entity is registered in the entity grid
+    pef_update = 0x800, // only entities with this flag are updated if ent_flagged_only is used in TimeStep()
+    pef_monitor_state_changes = 0x1000, // generate immediate events for simulation class changed (typically rigid bodies falling asleep)
+    pef_monitor_collisions = 0x2000, // generate immediate events for collisions
+    pef_monitor_env_changes = 0x4000, // generate immediate events when something breaks nearby
+    pef_never_affect_triggers = 0x8000,   // don't generate events when moving through triggers
+    pef_invisible = 0x10000, // will apply certain optimizations for invisible entities
+    pef_ignore_ocean = 0x20000, // entity will ignore global water area
+    pef_fixed_damping = 0x40000,  // entity will force its damping onto the entire group
+    pef_monitor_poststep = 0x80000, // entity will generate immediate post step events
+    pef_always_notify_on_deletion = 0x100000, // when deleted, entity will awake objects around it even if it's not referenced (has refcount 0)
+    pef_override_impulse_scale = 0x200000, // entity will ignore breakImpulseScale in PhysVars
+    pef_players_can_break = 0x400000, // playes can break the entiy by bumping into it
+    pef_cannot_squash_players = 0x10000000,   // entity will never trigger 'squashed' state when colliding with players
+    pef_ignore_areas = 0x800000, // entity will ignore phys areas (gravity and water)
+    pef_log_state_changes = 0x1000000, // entity will log simulation class change events
+    pef_log_collisions = 0x2000000, // entity will log collision events
+    pef_log_env_changes = 0x4000000, // entity will log EventPhysEnvChange when something breaks nearby
+    pef_log_poststep = 0x8000000, // entity will log EventPhysPostStep events
+};
+
+struct pe_params_flags
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_flags
+    };
+    pe_params_flags() { type = type_id; MARK_UNUSED flags, flagsOR, flagsAND; }
+    unsigned int flags;
+    unsigned int flagsOR;   // when setting, flagsNew = (flags set ? flags:flagsOld) & flagsAND | flagsOR
+    unsigned int flagsAND; // when getting, only flags is filled
+};
+
+
+struct pe_params_collision_class
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_collision_class
+    };
+    pe_params_collision_class() { type = type_id; collisionClassOR.type = collisionClassOR.ignore = 0; collisionClassAND.type = collisionClassAND.ignore = (unsigned)-1; }
+    SCollisionClass collisionClassOR;   // When getting both collisionClassOR and collisionClassAND are filled out
+    SCollisionClass collisionClassAND;  // When setting first collisionClassAND is applied to mask bits, then collisionClassOR is applied to turn on collision bits
+};
+
+struct pe_params_ground_plane
+    : pe_params
+{
+    // used for breakable objects; pieces that are below ground (at least partially) stay in the entity
+    enum entype
+    {
+        type_id = ePE_params_ground_plane
+    };
+    pe_params_ground_plane() { type = type_id; iPlane = 0; MARK_UNUSED ground.origin, ground.n; }
+    int iPlane; // index of the plane to be set (-1 removes existing planes)
+    primitives::plane ground;
+};
+
+enum special_joint_ids
+{
+    joint_impulse = 1000000
+};
+struct pe_params_structural_joint
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_structural_joint
+    };
+    pe_params_structural_joint()
+    {
+        type = type_id;
+        id = 0;
+        bReplaceExisting = 0;
+        MARK_UNUSED idx, partid[0], partid[1], pt, n, maxForcePush, maxForcePull, maxForceShift, maxTorqueBend, maxTorqueTwist, damageAccum, damageAccumThresh,
+                    bBreakable, szSensor, bBroken, partidEpicenter, axisx, limitConstraint, bConstraintWillIgnoreCollisions, dampingConstraint;
+    }
+
+    int id; // joint's 'foreign' identifier
+    int idx; // joint's internal index
+    int bReplaceExisting;   // if not set, SetParams will add a new joint even if id is already used
+    int partid[2]; // ids of the parts this joint connects (-1 for ground)
+    Vec3 pt; // point in entity space
+    Vec3 n; // push/pull direction in entity space
+    Vec3 axisx; // x axis in entity frame; only used for joints that can become dynamic constraints
+    float maxForcePush, maxForcePull, maxForceShift; // linear force limits
+    float maxTorqueBend, maxTorqueTwist; // angular force (torque) limits
+    float damageAccum, damageAccumThresh; // fraction of tension that gets accumulated, can be used to emulate an health system
+    Vec3 limitConstraint; // x=min angle, y=max angle, z=force limit
+    int bBreakable; // joint is at all breakable
+    int bConstraintWillIgnoreCollisions; // dynamic constraints will have constraint_ignore_buddy flag
+    int bDirectBreaksOnly; // joint can only be broken by direct impulses to one of the parts it connects
+    float dampingConstraint; // dynamic constraint's damping
+    float szSensor; // sensor geometry size; used to re-attach the joint when parts break off
+    int bBroken; // joint is broken
+    int partidEpicenter; // tension recomputation will start from this part (used for network playback, for instance)
+};
+
+struct pe_params_structural_initial_velocity
+    : pe_params
+{
+    // Setting of initial velocities of parts before breaking joints on clients through pe_params_structural_joint
+    enum entype
+    {
+        type_id = ePE_params_structural_initial_velocity
+    };
+    pe_params_structural_initial_velocity() { type = type_id; }
+
+    int partid; // id of the part to prepare for breakage
+    Vec3 v; // Initial velocity
+    Vec3 w; // Initial ang velocity
+};
+
+
+struct pe_params_timeout
+    : pe_params
+{
+    // entities can be forced to go to sleep after some time without external impulses
+    enum entype
+    {
+        type_id = ePE_params_timeout
+    };
+    pe_params_timeout() { type = type_id; MARK_UNUSED timeIdle, maxTimeIdle; }
+    float timeIdle; // current 'idle' time (time without any 'prods' from outside)
+    float maxTimeIdle; // sleep when timeIdle>maxTimeIdle; 0 turns this feature off
+};
+
+struct pe_params_skeleton
+    : pe_params
+{
+    // skeleton is a hidden mesh that uses cloth simulation to skin the main physics geometry
+    enum entype
+    {
+        type_id = ePE_params_skeleton
+    };
+    pe_params_skeleton() { type = type_id; MARK_UNUSED partid, ipart, stiffness, thickness, maxStretch, maxImpulse, timeStep, nSteps, hardness, explosionScale, bReset; }
+
+    int partid; // id of the skinned part
+    int ipart; // ..or its internal index
+    float stiffness; // skeleton's hardness against bending and shearing
+    float thickness; // skeleton's thickness for collisions
+    float maxStretch;   // skeleton's maximal stretching
+    float maxImpulse;   // skeleton impulse cap
+    float timeStep; // time step, used to simulate the skeleton (typically small)
+    int nSteps; // number of skeleton sub-steps per each structure update
+    float hardness; // skeleton's hardness against stretching
+    float explosionScale;   // skeleton's explosion impulse scale
+    int bReset; // resets the skeleton to its original pose
+};
+
+
+////////// articulated entity params
+enum joint_flags
+{
+    angle0_locked = 1, all_angles_locked = 7, angle0_limit_reached = 010, angle0_auto_kd = 0100, joint_no_gravity = 01000,
+    joint_isolated_accelerations = 02000, joint_expand_hinge = 04000, angle0_gimbal_locked = 010000,
+    joint_dashpot_reached = 0100000, joint_ignore_impulses = 0200000
+};
+
+struct pe_params_joint
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_joint
+    };
+    pe_params_joint()
+    {
+        type = type_id;
+        for (int i = 0; i < 3; i++)
+        {
+            MARK_UNUSED limits[0][i], limits[1][i], qdashpot[i], kdashpot[i], bounciness[i], q[i], qext[i], ks[i], kd[i], qtarget[i];
+        }
+        bNoUpdate = 0;
+        pMtx0 = 0;
+        flagsPivot = 3;
+        MARK_UNUSED flags, q0, pivot, ranimationTimeStep, nSelfCollidingParts, animationTimeStep, op[0];
+    }
+
+    unsigned int flags; // should be a combination of angle0,1,2_locked, angle0,1,2_auto_kd, joint_no_gravity
+    int flagsPivot; // if bit 0 is set, update pivot point in parent frame, if bit 1 - in child
+    Vec3 pivot; // joint pivot in entity CS
+    quaternionf q0; // orientation of child in parent coordinates that corresponds to angles (0,0,0)
+    Matrix33* pMtx0; // same as q0
+    Vec3 limits[2]; // limits for each angle
+    Vec3 bounciness; // bounciness for each angle (applied when limit is reached)
+    Vec3 ks, kd; // stiffness and damping koefficients for each angle angular spring
+    Vec3 qdashpot; // limit vicinity where joints starts resisting movement
+    Vec3 kdashpot; // when dashpot is activated, this is roughly the angular speed, stopped in 2 sec
+    Ang3 q; // angles values
+    Ang3 qext; // additional angles values (angle[i] = q[i]+qext[i]; only q[i] is taken into account
+    // while calculating spring torque
+    Ang3 qtarget;
+    int op[2]; // body identifiers of parent (optional) and child respectively
+    int nSelfCollidingParts, * pSelfCollidingParts; // part ids of only parts that should be checked for self-collision
+    int bNoUpdate; // omit recalculation of body parameters after changing this joint
+    float animationTimeStep; // used to calculate joint velocities of animation
+    float ranimationTimeStep;   // 1/animation time step, can be not specified (specifying just saves extra division operation)
+
+    VALIDATORS_START
+        VALIDATOR(pivot)
+        VALIDATOR_NORM(q0)
+        VALIDATOR(q)
+        VALIDATOR(qext)
+    VALIDATORS_END
+};
+
+struct pe_params_articulated_body
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_articulated_body
+    };
+    pe_params_articulated_body()
+    {
+        type = type_id;
+        MARK_UNUSED bGrounded, bInheritVel, bCheckCollisions, bCollisionResp, nJointsAlloc;
+        MARK_UNUSED bGrounded, bInheritVel, bCheckCollisions, bCollisionResp, a, wa, w, v, pivot, scaleBounceResponse, posHostPivot, qHostPivot;
+        MARK_UNUSED bAwake, pHost, nCollLyingMode, gravityLyingMode, dampingLyingMode, minEnergyLyingMode, iSimType, iSimTypeLyingMode, nRoots;
+        bApply_dqext = 0;
+        bRecalcJoints = 1;
+    }
+
+    int bGrounded; // whether body's pivot is firmly attached to something or free
+    int bCheckCollisions;   // only works with bCollisionResp set
+    int bCollisionResp; // when on, uses 'ragdoll' simulation mode, when off - 'skeleton' (for hit simulation on alive actors)
+    Vec3 pivot; // attachment position for grounded entities
+    Vec3 a; // acceleration of the ground for grounded entities
+    Vec3 wa; // angular acceleration of the ground for grounded entities
+    Vec3 w; // angular velocity of the ground for grounded entities
+    Vec3 v; // linear velocity of the ground for grounded entities
+    float scaleBounceResponse; // scales impulsive torque that is applied at a joint that has just reached its limit
+    int bApply_dqext;   // adds current dqext to joints velocities. dqext is the speed of external animation and is calculated each time
+    // qext is set for joint (as difference between new value and current value, multiplied by inverse of animation timestep)
+    int bAwake; // current state
+
+    IPhysicalEntity* pHost; // 'ground' entity
+    Vec3 posHostPivot; // attachment position inside pHost
+    quaternionf qHostPivot;
+    int bInheritVel; // take pHost velocity into account during the simulation
+
+    int nCollLyingMode; // number of contacts that triggers 'lying mode'
+    Vec3 gravityLyingMode; // gravity override in lying mode
+    float dampingLyingMode; // damping override
+    float minEnergyLyingMode;   // sleep speed override
+    int iSimType;   // simulation type: 0-'joint-based', 1-'body-based'; fast motion forces joint-based mode automatically
+    int iSimTypeLyingMode; // simulation type override
+    int nRoots; // only used in GetParams
+    int nJointsAlloc; // pre-allocates this amount of joints and parts
+
+    int bRecalcJoints; // re-build geometry positions from joint agnles
+};
+
+////////// living entity params
+
+struct pe_player_dimensions
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_player_dimensions
+    };
+    pe_player_dimensions()
+        : dirUnproj(0, 0, 1)
+        , maxUnproj(0)
+    {
+        type = type_id;
+        MARK_UNUSED sizeCollider, heightPivot, heightCollider, heightEye, heightHead, headRadius, bUseCapsule, groundContactEps;
+    }
+
+    float heightPivot; // offset from central ground position that is considered entity center
+    float heightEye; // vertical offset of camera
+    Vec3 sizeCollider; // collision cylinder dimensions
+    float heightCollider;   // vertical offset of collision geometry center
+    float headRadius;   // radius of the 'head' geometry (used for camera offset)
+    float heightHead;   // center.z of the head geometry
+    Vec3 dirUnproj; // unprojection direction to test in case the new position overlaps with the environment (can be 0 for 'auto')
+    float maxUnproj; // maximum allowed unprojection
+    int bUseCapsule; // switches between capsule and cylinder collider geometry
+    float groundContactEps; // the amount that the living needs to move upwards before ground contact is lost. defaults to which ever is greater 0.004, or 0.01*geometryHeight
+
+    VALIDATORS_START
+        VALIDATOR(heightPivot)
+        VALIDATOR(heightEye)
+        VALIDATOR_RANGE2(sizeCollider, 0, 100)
+    VALIDATORS_END
+};
+
+struct pe_player_dynamics
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_player_dynamics
+    };
+    pe_player_dynamics()
+    {
+        type = type_id;
+        MARK_UNUSED kInertia, kInertiaAccel, kAirControl, gravity, gravity.z, nodSpeed, mass, bSwimming, surface_idx, bActive, collTypes, pLivingEntToIgnore;
+        MARK_UNUSED minSlideAngle, maxClimbAngle, maxJumpAngle, minFallAngle, kAirResistance, maxVelGround, timeImpulseRecover, bReleaseGroundColliderWhenNotActive;
+    }
+
+    float kInertia; // inertia koefficient, the more it is, the less inertia is; 0 means no inertia
+    float kInertiaAccel; // inertia on acceleration
+    float kAirControl; // air control coefficient 0..1, 1 - special value (total control of movement)
+    float kAirResistance;   // standard air resistance
+    Vec3 gravity; // gravity vector
+    float nodSpeed; // vertical camera shake speed after landings
+    int bSwimming; // whether entity is swimming (is not bound to ground plane)
+    float mass; // mass (in kg)
+    int surface_idx; // surface identifier for collisions
+    float minSlideAngle; // if surface slope is more than this angle, player starts sliding (angle is in degrees)
+    float maxClimbAngle; // player cannot climb surface which slope is steeper than this angle (angle is in degrees)
+    float maxJumpAngle; // player is not allowed to jump towards ground if this angle is exceeded (angle is in degrees)
+    float minFallAngle; // player starts falling when slope is steeper than this (angle is in degrees)
+    float maxVelGround; // player cannot stand on surfaces that are moving faster than this
+    float timeImpulseRecover; // forcefully turns on inertia for that duration after receiving an impulse
+    int collTypes; // entity types to check collisions against
+    IPhysicalEntity* pLivingEntToIgnore; // ignore collisions with this *living entity* (doesn't work with other entity types)
+    int bActive; // 0 disables all simulation for the character, apart from moving along the requested velocity
+    int bReleaseGroundColliderWhenNotActive; // when not 0, if the living entity is not active, the ground collider, if any, will be explicitly released during the simulation step.
+};
+
+////////// particle entity params
+
+struct pe_params_particle
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_particle
+    };
+    pe_params_particle()
+    {
+        type = type_id;
+        MARK_UNUSED mass, size, thickness, wspin, accThrust, kAirResistance, kWaterResistance, velocity, heading, accLift, accThrust, gravity, waterGravity;
+        MARK_UNUSED surface_idx, normal, q0, minBounceVel, rollAxis, flags, pColliderToIgnore, iPierceability, areaCheckPeriod, minVel, collTypes, dontPlayHitEffect;
+    }
+
+    unsigned int flags; // see entity flags
+    float mass;
+    float size; // pseudo-radius
+    float thickness; // thickness when lying on a surface (if left unused, size will be used)
+    Vec3 heading; // direction of movement
+    float velocity; // velocity along "heading"
+    float kAirResistance; // air resistance koefficient, F = kv
+    float kWaterResistance; // same for water
+    float accThrust; // acceleration along direction of movement
+    float accLift; // acceleration that lifts particle with the current speed
+    int surface_idx;
+    Vec3 wspin; // angular velocity
+    Vec3 gravity;   // stores this gravity and uses it if the current area's gravity is equal to the global gravity
+    Vec3 waterGravity; // gravity when underwater
+    Vec3 normal; // aligns this direction with the surface normal when sliding
+    Vec3 rollAxis; // aligns this directon with the roll axis when rolling (0,0,0 to disable alignment)
+    quaternionf q0; // initial orientation (zero means x along direction of movement, z up)
+    float minBounceVel; // velocity threshold for bouncing->sliding switch
+    float minVel;   // sleep speed threshold
+    IPhysicalEntity* pColliderToIgnore; // physical entity to ignore during collisions
+    int iPierceability; // pierceability for ray tests; pierceble hits slow the particle down, but don't stop it
+    int collTypes; // 'objtype' passed to RayWorldntersection
+    int areaCheckPeriod; // how often (in frames) world area checks are made
+    int dontPlayHitEffect; // prevent playing of material FX from now on
+
+    VALIDATORS_START
+        VALIDATOR(mass)
+        VALIDATOR(size)
+        VALIDATOR(thickness)
+        VALIDATOR_NORM(heading)
+        VALIDATOR_NORM(q0)
+    VALIDATORS_END
+};
+
+////////// vehicle entity params
+
+struct pe_params_car
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_car
+    };
+    pe_params_car()
+    {
+        type = type_id;
+        MARK_UNUSED engineMaxRPM, iIntegrationType, axleFriction, enginePower, maxSteer, maxTimeStep, minEnergy, damping, brakeTorque;
+        MARK_UNUSED engineMinRPM, engineShiftUpRPM, engineShiftDownRPM, engineIdleRPM, engineStartRPM, clutchSpeed, nGears, gearRatios, kStabilizer;
+        MARK_UNUSED slipThreshold, gearDirSwitchRPM, kDynFriction, minBrakingFriction, maxBrakingFriction, steerTrackNeutralTurn, maxGear, minGear, pullTilt;
+        MARK_UNUSED maxTilt, bKeepTractionWhenTilted;
+    }
+
+    float axleFriction; // friction torque at axes divided by mass of vehicle
+    float enginePower; // power of engine (about 10,000 - 100,000)
+    float maxSteer; // maximum steering angle
+    float engineMaxRPM; // engine torque decreases to 0 after reaching this rotation speed
+    float brakeTorque; // torque applied when breaking using the engine
+    int iIntegrationType; // for suspensions; 0-explicit Euler, 1-implicit Euler
+    float maxTimeStep; // maximum time step when vehicle has only wheel contacts
+    float minEnergy; // minimum awake energy when vehicle has only wheel contacts
+    float damping; // damping when vehicle has only wheel contacts
+    float minBrakingFriction; // limits the the tire friction when handbraked
+    float maxBrakingFriction; // limits the the tire friction when handbraked
+    float kStabilizer; // stabilizer force, as a multiplier for kStiffness of respective suspensions
+    int nWheels; // the number of wheels
+    float engineMinRPM; // disengages the clutch when falling behind this limit, if braking with the engine
+    float engineShiftUpRPM; // RPM threshold for for automatic gear switching
+    float engineShiftDownRPM;
+    float engineIdleRPM; // RPM for idle state
+    float engineStartRPM;   // sets this RPM when activating the engine
+    float clutchSpeed; // clutch engagement/disengagement speed
+    int nGears;
+    float* gearRatios; // assumes 0-backward gear, 1-neutral, 2 and above - forward
+    int maxGear, minGear; // additional gear index clamping
+    float slipThreshold; // lateral speed threshold for switchig a wheel to a 'slipping' mode
+    float gearDirSwitchRPM; // RPM threshold for switching back and forward gears
+    float kDynFriction; // friction modifier for sliping wheels
+    float steerTrackNeutralTurn; // for tracked vehicles, steering angle that causes equal but opposite forces on tracks
+    float pullTilt; // for tracked vehicles, tilt angle of pulling force towards ground
+    float maxTilt; // maximum wheel contact normal tilt (left or right) after which it acts as a locked part of the hull; it's a cosine of the angle
+    int bKeepTractionWhenTilted; // keeps wheel traction in tilted mode
+};
+
+struct pe_params_wheel
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_wheel
+    };
+    pe_params_wheel()
+    {
+        type = type_id;
+        iWheel = 0;
+        MARK_UNUSED bDriving, iAxle, suspLenMax, suspLenInitial, minFriction, maxFriction, surface_idx, bCanBrake, bBlocked,
+                    bRayCast, kStiffness, kDamping, kLatFriction, Tscale, w, bCanSteer, kStiffnessWeight;
+    }
+
+    int iWheel;
+    int bDriving;
+    int iAxle; // wheels on the same axle align their coordinates (if only slightly misaligned)
+               // and apply stabilizer force (if set); axle<0 means the wheel does not affect the physics
+    int bCanBrake; // handbrake applies
+    int bBlocked; // locks the wheel (acts like a forced handbrake)
+    int bCanSteer; // can this wheel steer, 0 or 1
+    float suspLenMax;   // full suspension length (relaxed)
+    float suspLenInitial;   // length in the initial state (used for automatic computations)
+    float minFriction; // surface friction is cropped to this min-max range
+    float maxFriction;
+    int surface_idx;
+    int bRayCast; // uses raycasts instead of cylinders
+    float kStiffness;   // if 0, will be computed based on mass distribution, lenMax, and lenInitial
+    float kStiffnessWeight; // When autocalculating stiffness use this weight for this wheel. Note weights for wheels in front of the centre of mass do not influence the weights of wheels behind the centre of mass
+                            // By default all weights are 1.0 and the sum doesn't have to add up to 1.0!
+                            // Also a <=0 weight will leave the wheel out of the autocalculation. It will be get a stiffness of weight*mass*gravity/defaultLength/numWheels. weight=-1 is a good starting point for these wheels
+    float kDamping; // absolute value if >=0, otherwise -(fraction of 0-oscillation damping)
+    float kLatFriction; // lateral friction scale (doesn't apply when on handbrake)
+    float Tscale;   // optional driving torque scale
+    float w; // rotational velocity; it's computed automatically, but can be overriden if needed
+};
+
+////////// rope entity params
+
+struct pe_params_rope
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_rope
+    };
+    pe_params_rope()
+    {
+        type = type_id;
+        //START: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
+        MARK_UNUSED length, mass, collDist, surface_idx, friction, nSegments, pPoints.data, pVelocities.data, pDamping, pStiffness, pThickness;
+        //END: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
+        MARK_UNUSED pEntTiedTo[0], ptTiedTo[0], idPartTiedTo[0], pEntTiedTo[1], ptTiedTo[1], idPartTiedTo[1], stiffnessAnim, maxForce,
+                    flagsCollider, nMaxSubVtx, stiffnessDecayAnim, dampingAnim, bTargetPoseActive, wind, windVariance, airResistance, waterResistance, density, collTypes,
+                    jointLimit, jointLimitDecay, sensorRadius, frictionPull, stiffness, collisionBBox[0], penaltyScale, maxIters, attachmentZone, minSegLen, unprojLimit, noCollDist, hingeAxis;
+        bLocalPtTied = 0;
+    }
+
+    float length;   // 'target' length; 0 is allowed for ropes with dynamic subdivision
+    float mass;
+    float collDist; // thickness for collisions
+    int surface_idx; // for collision reports; friction is overriden
+    float friction; // friction for free state and lateral friction in strained state
+    float frictionPull; // friction in pull direction in strained state
+    float stiffness; // stiffness against stretching (used in the solver; it's *not* a spring, though)
+    float stiffnessAnim; // shape-preservation stiffness
+    float stiffnessDecayAnim;   // the final shape stiffness will be interpolated from full to full*(1-decay) at the end
+    float dampingAnim; // damping for shape preservation forces
+    int bTargetPoseActive; // 0-no target pose (no shape-preservation stiffness),
+                           // 1-simplified target pose (vertices are pulled directly to targets)
+    // 2-physically correct target pose (the rope applies penalty torques at joints)
+    Vec3 wind; // local wind in addition to one from phys areas
+    float windVariance; // wariance (applied to local only)
+    float airResistance; // needs to be >0 in order to be affetcted by the wind
+    float waterResistance; // medium resistance when underwater
+    float density; // used only to compute buoyancy
+    float jointLimit;   // joint rotation limit (doesn't work when both ends are tied)
+    float jointLimitDecay; // joint limit change (0..1) towards the unattached rope end; can be positive or negative
+    float sensorRadius; // size of the sensor used to re-attach the rope if the host entity breaks
+    float maxForce; // force limit; when breached, the rope will detach itself unless rope_no_tears is set
+    float penaltyScale; // for the solver in strained state with subdivision on
+    float attachmentZone;   // don't register solver contacts within this distance around attachment points (subdivision mode)
+    float minSegLen; // delete segments below this length in subdivision mode
+    float unprojLimit; // rotational unprojection limit per frame (no-subdivision mode)
+    float noCollDist;   // fraction of the segment near the attachment point that doesn't collide (no-subdivision mode)
+    int maxIters;   // tweak for the internal vertex solver
+    int nSegments; // segment count, changin will reset vertex positions
+    int flagsCollider; // only collide with entity parts flagged this way
+    int collTypes; // a selection of ent_xxx flags to collide against
+    int nMaxSubVtx; // maximum internal vertices per segment in subdivision mode
+    Vec3 collisionBBox[2]; // bbox for entity proximity query in host's space
+    // (used make all ropes belonging to one host share the same box, to automatically reuse the query results)
+    Vec3 hingeAxis; // only allow rotation around this axis (in parent's frame if rope_target_vtx_rel is set)
+    strided_pointer<Vec3> pPoints;
+    strided_pointer<Vec3> pVelocities;
+
+    IPhysicalEntity* pEntTiedTo[2];
+    int bLocalPtTied;   // ptTiedTo is in tied part's local coordinates
+    Vec3 ptTiedTo[2];
+    int idPartTiedTo[2];
+    //START: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
+    float* pDamping;
+    float* pStiffness;
+    float* pThickness;
+    //END: Per bone UDP for stiffness, damping and thickness for touch bending vegetation
+};
+
+////////// soft entity params
+
+struct pe_params_softbody
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_softbody
+    };
+    pe_params_softbody()
+    {
+        type = type_id;
+        MARK_UNUSED thickness, maxSafeStep, ks, kdRatio, airResistance, wind, windVariance, nMaxIters,
+                    accuracy, friction, impulseScale, explosionScale, collisionImpulseScale, maxCollisionImpulse, collTypes, waterResistance, massDecay,
+                    shapeStiffnessNorm, shapeStiffnessTang, stiffnessAnim, stiffnessDecayAnim, dampingAnim, maxDistAnim, hostSpaceSim;
+    }
+
+    float thickness; // thickness for collisions
+    float maxSafeStep; // time step cap
+    float ks;   // stiffness against stretching (for soft bodies, <0 means fraction of maximum stable)
+    float kdRatio; // damping in stretch direction, in fractions of 0-oscillation damping
+    float friction; // overrides material friction
+    float waterResistance;
+    float airResistance;
+    Vec3 wind; // wind in addition to phys area wind
+    float windVariance; // wind variance, in fractions of 1 (currently changes 4 times/sec)
+    int nMaxIters; // tweak for the solver (complexity = O(nMaxIters*numVertices))
+    float accuracy; // accuracy for the solver (velocity)
+    float impulseScale; // scale general incoming impulses
+    float explosionScale;   // scale impulses from explosions
+    float collisionImpulseScale; // not used
+    float maxCollisionImpulse; // not used
+    int collTypes; // combination of ent_... flags
+    float massDecay; // decreases mass from attached points to free ends; mass_free = mass_attached/(1+decay) (can impove stability)
+    float shapeStiffnessNorm;   // resistance to bending
+    float shapeStiffnessTang;   // resistance to shearing
+    float stiffnessAnim; // strength of linear target pose pull
+    float stiffnessDecayAnim; // decay of stiffnessAnim
+    float dampingAnim; // damping for target pose pull
+    float maxDistAnim; // max deviation from the target pose at the rim; uses stiffnessDecalAnim to scale down closer to attached vtx
+    float hostSpaceSim; // 0 - world-space simulation, 1 - fully host-space simulation
+};
+
+/////////// area params
+
+struct params_wavesim
+{
+    params_wavesim() { MARK_UNUSED timeStep, waveSpeed, dampingCenter, dampingRim, minhSpread, minVel, simDepth, heightLimit, resistance;   }
+    float timeStep; // fixed timestep used for the simulation
+    float waveSpeed; // wave propagation speed
+    float simDepth; // assumed height of moving water layer (relative to cell size)
+    float heightLimit; // hard limit on height changes (relative to cell size)
+    float resistance; // rate of velocity transfer from floating objects
+    float dampingCenter; // damping in the central tile
+    float dampingRim;   // damping in the outer tiles
+    float minhSpread;   // minimum height perturbation that activates a neighbouring tile
+    float minVel;   // sleep speed threshold
+};
+
+struct pe_params_area
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_params_area
+    };
+    pe_params_area() { type = type_id; MARK_UNUSED gravity, bUniform, damping, falloff0, bUseCallback, pGeom, volume, borderPad, bConvexBorder, objectVolumeThreshold, cellSize, growthReserve, volumeAccuracy; }
+    // water/air area params are set through pe_params_buoyancy
+
+    Vec3 gravity;   // see also bUniform
+    float falloff0; // parametric distance (0..1) where falloff starts
+    int bUniform; // gravity has same direction in every point or always points to the center
+    int bUseCallback;   // will generate immediate EventPhysArea when needs to apply params to an entity
+    float damping; // uniform damping
+    IGeometry* pGeom;   // phys geometry used in the area
+    float volume; // the area will try to maintain this volume by adjusting water level
+    float volumeAccuracy; // accuracy of level computation based on volume (in fractions of the volume)
+    float borderPad; // after adjusting level, expand the border by this distance
+    int   bConvexBorder; // forces convex border after water level adjustments
+    float objectVolumeThreshold; // only consider entities larger than this for level adjustment (set in fractions of area volume)
+    float cellSize; // cell size for wave simulation
+    params_wavesim waveSim;
+    float growthReserve; // assume this area increase during level adjustment (only used for wave simulation)
+};
+
+
+////////// water manager params
+
+struct pe_params_waterman
+    : pe_params
+    , params_wavesim
+{
+    enum entype
+    {
+        type_id = ePE_params_waterman
+    };
+    pe_params_waterman()
+    {
+        type = type_id;
+        MARK_UNUSED posViewer, nExtraTiles, nCells, tileSize, timeStep, waveSpeed,
+                    dampingCenter, dampingRim, minhSpread, minVel, simDepth, heightLimit, resistance;
+    }
+
+    Vec3 posViewer; // water will only be simulated around this point
+    int nExtraTiles; // number of additional tiles in each direction around the one below posViewer (so total = (nExtarTiles*2+1)^2)
+    int nCells; // number of cells in each tile
+    float tileSize;
+};
+
+
+////////////////////////// Action structures /////////////////////
+
+////////// common actions
+struct pe_action
+{
+    int type;
+};
+
+struct pe_action_impulse
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_impulse
+    };
+    pe_action_impulse() { type = type_id; impulse.Set(0, 0, 0); MARK_UNUSED point, angImpulse, partid, ipart; iApplyTime = 2; iSource = 0; }
+
+    Vec3 impulse;
+    Vec3 angImpulse;    // optional
+    Vec3 point; // point of application, in world CS, optional
+    int partid; // receiver part identifier
+    int ipart; // alternatively, part index can be used
+    int iApplyTime; // 0-apply immediately, 1-apply before the next time step, 2-apply after the next time step
+    int iSource; // reserved for internal use
+
+    VALIDATORS_START
+        VALIDATOR_RANGE2(impulse, 0, 1E12f)
+        VALIDATOR_RANGE2(angImpulse, 0, 1E8f)
+        VALIDATOR_RANGE2(point, 0, 1E6f)
+        VALIDATOR_RANGE(ipart, 0, 10000)
+    VALIDATORS_END
+};
+
+struct pe_action_reset
+    : pe_action                      // Resets dynamic state of an entity
+{
+    enum entype
+    {
+        type_id = ePE_action_reset
+    };
+    pe_action_reset() { type = type_id; bClearContacts = 1; }
+    int bClearContacts;
+};
+
+enum constrflags   // see pe_action_add_constraint
+{
+    local_frames = 1, // pt and qframe are in respective entities' coordinate frames
+    world_frames = 2, // pt and qframe are in the world frame
+    local_frames_part = 4, // pt and qframe are if respective entity parts' coordinate frames
+    constraint_inactive = 0x100, // constraint does nothing, except applying _ignore_buddy if set
+    constraint_ignore_buddy = 0x200, // disables collisions between the constrained entities
+    constraint_line = 0x400, // position if constrained to a line
+    constraint_plane = 0x800, // position is constrained to a plane
+    constraint_free_position = 0x1000, // position is unconstrained
+    constraint_no_rotation = 0x2000, // relative rotation is fully constrained
+    constraint_no_enforcement = 0x4000, // disables positional enforcement during fast movement (currently disabled unconditionally)
+    constraint_no_tears = 0x8000 // constraint is not deleted when force limit is reached
+};
+
+struct pe_action_add_constraint
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_add_constraint
+    };
+    pe_action_add_constraint()
+    {
+        type = type_id;
+        pBuddy = 0;
+        flags = world_frames;
+        MARK_UNUSED id, pt[0], pt[1], partid[0], partid[1], qframe[0], qframe[1], xlimits[0], yzlimits[0],
+                    pConstraintEntity, damping, sensorRadius, maxPullForce, maxBendTorque;
+    }
+    int id; // if not set, will be auto-assigned; return value of Action()
+    IPhysicalEntity* pBuddy; // the second constrained entity; can be WORLD_ENTITY for static attachments
+    Vec3 pt[2]; // pt[0] must be set; if pt[1] is not set, assumed to be equal to pt[1]
+    int partid[2]; // if not set, the first part is assumed
+    quaternionf qframe[2]; // constraint frames for constraint angles computation; if not set, identity in the specified frame is assumed
+    float xlimits[2];   // rotation limits around x axis ("twist"); if xlimits[0]>=[1], x axis is locked
+    float yzlimits[2]; // combined yz-rotation - "bending" of x axis; yzlimits[0] is ignored and assumed to be 0 during simulation
+    unsigned int flags; // see enum constrflags
+    float damping; // internal constraint damping
+    float sensorRadius; // used for sampling environment and re-attaching the constraint when something breaks
+    float maxPullForce, maxBendTorque;   // positional and rotational force limits
+    IPhysicalEntity* pConstraintEntity; // used internally for creating dynamic rope constraints
+};
+
+struct pe_action_update_constraint
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_update_constraint
+    };
+    pe_action_update_constraint()
+    {
+        type = type_id;
+        MARK_UNUSED idConstraint, pt[0], pt[1], qframe[0], qframe[1], maxPullForce, maxBendTorque, damping;
+        flagsOR = 0;
+        flagsAND = (unsigned int)-1;
+        bRemove = 0;
+        flags = world_frames;
+    }
+    int idConstraint;   // doesn't have to be unique - can update several constraints with one id; if not set, updates all constraints
+    unsigned int flagsOR;
+    unsigned int flagsAND;
+    int bRemove; // permanently delete the constraint
+    Vec3 pt[2]; // local_frames_part is not supported currently
+    quaternionf qframe[2]; // update to constraint frames
+    float maxPullForce, maxBendTorque;
+    float damping;
+    int flags; // generally it's better to use flagsOR and/or flagsAND
+};
+
+struct pe_action_register_coll_event
+    : pe_action
+{
+    // this can be used to ask an entity to post a fake collision event to the log
+    enum entype
+    {
+        type_id = ePE_action_register_coll_event
+    };
+    pe_action_register_coll_event() { type = type_id; MARK_UNUSED vSelf; }
+
+    Vec3 pt; // collision point
+    Vec3 n; // collision normal
+    Vec3 v; // collider's velocity at pt
+    Vec3 vSelf; // optional override for the current entity's velocity at pt
+    float collMass; // collider's mass
+    IPhysicalEntity* pCollider; // collider entity
+    int partid[2];
+    int idmat[2];
+    short iPrim[2];
+};
+
+struct pe_action_awake
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_awake
+    };
+    pe_action_awake() { type = type_id; bAwake = 1; MARK_UNUSED minAwakeTime; }
+    int bAwake;
+    float minAwakeTime; // minimum time to stay awake after executing the action; supported only by some entity types
+};
+
+struct pe_action_remove_all_parts
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_remove_all_parts
+    };
+    pe_action_remove_all_parts() { type = type_id; }
+};
+
+struct pe_action_reset_part_mtx
+    : pe_action
+{
+    // this will bake the part's matrix into the entity's matrix and clear the former
+    enum entype
+    {
+        type_id = ePE_action_reset_part_mtx
+    };
+    pe_action_reset_part_mtx() { type = type_id; MARK_UNUSED ipart, partid; }
+    int ipart;
+    int partid;
+};
+
+struct pe_action_set_velocity
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_set_velocity
+    };
+    pe_action_set_velocity() { type = type_id; MARK_UNUSED ipart, partid, v, w; bRotationAroundPivot = 0; }
+    int ipart; // if part is not set, vel is applied to the whole entity; the distinction makes sense only for ragdolls
+    int partid;
+    Vec3 v, w;
+    int bRotationAroundPivot;   // if set, w is rotation around the entity's pivot, otherwise around its center of mass
+
+    VALIDATORS_START
+        VALIDATOR_RANGE2(v, 0, 1E5f)
+        VALIDATOR_RANGE2(w, 0, 1E5f)
+    VALIDATORS_END
+};
+
+struct pe_action_notify
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_notify
+    };
+    enum encodes
+    {
+        ParentChange = 0
+    };                               // the entity this one is attached to moved; only ropes handle it ATM, by immediately enforcing length
+    pe_action_notify() { type = type_id; iCode = ParentChange; }
+    int iCode;
+};
+
+struct pe_action_auto_part_detachment
+    : pe_action
+{
+    // this is used to PE_ARTICULATED entities with pre-baked physics simulation
+    enum entype
+    {
+        type_id = ePE_action_auto_part_detachment
+    };
+    pe_action_auto_part_detachment() { type = type_id; MARK_UNUSED threshold, autoDetachmentDist; }
+    float threshold; // each part will receive a breakable joint with this force limit (which is assumed to be set in fractions of gravity)
+    float autoDetachmentDist;   // additionally, a part will auto-detach itself once it's farther than that from the entity's pivot
+};
+
+struct pe_action_move_parts
+    : pe_action
+{
+    // this will move parts from one entity to another
+    enum entype
+    {
+        type_id = ePE_action_move_parts
+    };
+    int idStart, idEnd;
+    int idOffset;   // added once parts are in the new entity
+    IPhysicalEntity* pTarget;
+    Matrix34 mtxRel; // mtxInNewEntity = mtxRel*mtxCurrent
+    pe_action_move_parts() { type = type_id; idStart = 0; idEnd = 1 << 30; idOffset = 0; mtxRel.SetIdentity(); pTarget = 0; }
+};
+
+struct pe_action_batch_parts_update
+    : pe_action
+{
+    // updates positions of all parts from arrays
+    enum entype
+    {
+        type_id = ePE_action_batch_parts_update
+    };
+    pe_action_batch_parts_update() { type = type_id; qOffs.SetIdentity(); posOffs.zero(); numParts = 0; pnumParts = 0; pIds = 0; pValidator = 0; }
+    int* pIds;
+    strided_pointer<quaternionf> qParts;
+    strided_pointer<Vec3> posParts;
+    int numParts;
+    int* pnumParts;
+    quaternionf qOffs; // extra rotation
+    Vec3 posOffs;   // extra offset
+    struct Validator
+    {
+        virtual ~Validator() {}
+        virtual bool Lock() = 0;
+        virtual void Unlock() = 0;
+    }* pValidator;
+};
+
+struct pe_action_slice
+    : pe_action
+{
+    // slices entity's geometry with a shape
+    enum entype
+    {
+        type_id = ePE_action_slice
+    };
+    pe_action_slice() { type = type_id; MARK_UNUSED ipart, partid; npt = 3; }
+    int ipart;
+    int partid;
+    Vec3* pt;
+    int npt; // only 3 is supported currently
+};
+
+////////// living entity actions
+
+struct pe_action_move
+    : pe_action                     // movement request for living entities
+{
+    enum entype
+    {
+        type_id = ePE_action_move
+    };
+    pe_action_move() { type = type_id; iJump = 0; dt = 0; MARK_UNUSED dir; }
+
+    Vec3 dir; // requested velocity vector
+    int iJump; // jump mode - 1-instant velocity change, 2-just adds to current velocity
+    float dt;   // time interval for this action (doesn't need to be set normally)
+
+    VALIDATORS_START
+        VALIDATOR_RANGE2(dir, 0, 1000)
+        VALIDATOR_RANGE(dt, 0, 2)
+    VALIDATORS_END
+};
+
+struct pe_action_syncliving
+    : pe_action                           // syncing living entity physics
+{
+    enum entype
+    {
+        type_id = pPE_action_syncliving
+    };
+    pe_action_syncliving() { type = type_id; pos.zero(); vel.zero(); velRequested.zero(); }
+    Vec3 pos;
+    Vec3 vel;
+    Vec3 velRequested;
+};
+
+////////// vehicle entity actions
+
+struct pe_action_drive
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_drive
+    };
+    pe_action_drive() { type = type_id; MARK_UNUSED pedal, dpedal, steer, dsteer, bHandBrake, clutch, iGear; ackermanOffset = 0.f; }
+
+    float pedal; // engine pedal absolute value; active pedal always awakes the entity
+    float dpedal; // engine pedal delta
+    float steer; // steering angle absolute value
+    float ackermanOffset; // apply ackerman steering, 0.0 -> normal driving front wheels steer, back fixed. 1.0 -> front fixed, back steer. 0.5 -> both front and back steer
+    float dsteer; // steering angle delta
+    float clutch;   // forces clutch; 0..1
+    int bHandBrake; // removing handbrake will automatically awaken the vehicle if it's sleeping
+    int iGear; // 0-back; 1-neutral; 2+-forward
+};
+
+////////// rope entity actions
+
+struct pe_action_target_vtx
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_target_vtx
+    };
+    pe_action_target_vtx() { type = type_id; MARK_UNUSED points, nPoints; posHost.zero(); qHost.SetIdentity(); }
+
+    int nPoints;
+    Vec3* points;   // coordinate frame is world, unless the rope has one of rope_target_vtx_rel flags
+    Vec3 posHost; // world position of the host the vertices are attached to
+    Quat qHost;
+};
+
+////////// soft entity actions
+
+struct pe_action_attach_points
+    : pe_action
+{
+    enum entype
+    {
+        type_id = ePE_action_attach_points
+    };
+    pe_action_attach_points() { type = type_id; MARK_UNUSED partid, points; nPoints = 1; pEntity = WORLD_ENTITY; bLocal = 0; }
+
+    IPhysicalEntity* pEntity;
+    int partid;
+    int* piVtx; // vertex indices to be attached to pEntity.partid
+    Vec3* points;   // can set the desired attachment points; if not set, current positions are fixed in the target's frame
+    int nPoints;
+    int bLocal; // if true, points are in the attached part's CS
+};
+
+////////////////////////// Status structures /////////////////////
+
+////////// common statuses
+struct pe_status
+{
+    int type;
+};
+
+enum status_pos_flags
+{
+    status_local = 1, status_thread_safe = 2, status_addref_geoms = 4
+};
+
+struct pe_status_pos
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_pos
+    };
+    pe_status_pos() { type = type_id; ipart = partid = -1; flags = 0; pMtx3x4 = 0; pMtx3x3 = 0; iSimClass = 0; timeBack = 0; }
+
+    int partid; // part identifier, -1 for entire entity
+    int ipart; // optionally, part slot index
+    unsigned int flags; // status_local if part coordinates should be returned in entity CS rather than world CS
+    unsigned int flagsOR; // boolean OR for all parts flags of the object (or just flags for the selected part)
+    unsigned int flagsAND; // boolean AND for all parts flags of the object (or just flags for the selected part)
+    Vec3 pos; // position of center
+    Vec3 BBox[2]; // bounding box relative to pos (bbox[0]-min, bbox[1]-max)
+    quaternionf q;
+    float scale;
+    int iSimClass;
+    Matrix34* pMtx3x4; // optional 3x4 transformation matrix
+    Matrix33* pMtx3x3;  // optional 3x3 rotation+scale matrix
+    IGeometry* pGeom, * pGeomProxy;
+    float timeBack; // can retrieve previous position; only supported by rigid entities; pos and q; one step back
+};
+
+// Only works when USE_IMPROVED_RIGID_ENTITY_SYNCHRONISATION is 1
+struct pe_status_netpos
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_netpos
+    };
+    pe_status_netpos() { type = type_id; }
+
+    Vec3 pos;
+    quaternionf rot;
+    Vec3 vel;
+    Vec3 angvel;
+    float timeOffset;
+};
+
+struct pe_status_extent
+    : pe_status                         // Caches eForm extent of entity in pGeo
+{
+    enum entype
+    {
+        type_id = ePE_status_extent
+    };
+    pe_status_extent() { type = type_id; eForm = EGeomForm(-1); extent = 0; }
+
+    EGeomForm eForm;
+    float extent;
+};
+
+struct pe_status_random
+    : pe_status_extent                          // Generates random pos on entity, also caches extent
+{
+    enum entype
+    {
+        type_id = ePE_status_random
+    };
+    pe_status_random() { type = type_id; ran.vPos.zero(); ran.vNorm.zero(); }
+    PosNorm ran;
+};
+
+struct pe_status_sensors
+    : pe_status                        // Requests status of attached to the entity sensors
+{
+    enum entype
+    {
+        type_id = ePE_status_sensors
+    };
+    pe_status_sensors() { type = type_id; }
+
+    Vec3* pPoints;  // pointer to array of points where sensors touch environment (assigned by physical entity)
+    Vec3* pNormals; // pointer to array of surface normals at points where sensors touch environment
+    unsigned int flags; // bitmask of flags, bit==1 - sensor touched environment
+};
+
+struct pe_status_dynamics
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_dynamics
+    };
+    pe_status_dynamics()
+        : v(ZERO)
+        , w(ZERO)
+        , a(ZERO)
+        , wa(ZERO)
+        , centerOfMass(ZERO)
+    {
+        MARK_UNUSED partid, ipart;
+        type = type_id;
+        mass = energy = 0;
+        nContacts = 0;
+        time_interval = 0;
+        submergedFraction = 0;
+    }
+
+    int partid;
+    int ipart;
+    Vec3 v; // velocity
+    Vec3 w; // angular velocity
+    Vec3 a; // linear acceleration
+    Vec3 wa; // angular acceleration
+    Vec3 centerOfMass;
+    float submergedFraction; // percentage of the entity that is underwater; 0..1. not supported for individual parts
+    float mass; // entity's or part's mass
+    float energy;   // kinetic energy; only supported by PE_ARTICULATED currently
+    int nContacts;
+    float time_interval; // not used
+};
+
+struct coll_history_item
+{
+    Vec3 pt; // collision area center
+    Vec3 n; // collision normal in entity CS
+    Vec3 v[2]; // velocities of contacting bodies at the point of impact
+    float mass[2]; // masses of contacting bodies
+    float age; // age of collision event
+    int idCollider; // id of collider (not a pointer, since collider can be destroyed before history item is queried)
+    int partid[2];
+    int idmat[2];   // 0-this body material, 1-collider material
+};
+
+struct pe_status_collisions
+    : pe_status
+{
+    // obsolete, replaced with EventPhysCollision events
+    enum entype
+    {
+        type_id = ePE_status_collisions
+    };
+    pe_status_collisions() { type = type_id; age = 0; len = 1; pHistory = 0; bClearHistory = 0; }
+
+    coll_history_item* pHistory; // pointer to a user-provided array of history items
+    int len; // length of this array
+    float age; // maximum age of collision events (older events are ignored)
+    int bClearHistory;
+};
+
+struct pe_status_id
+    : pe_status
+{
+    // retrives surface id from geometry
+    enum entype
+    {
+        type_id = ePE_status_id
+    };
+    pe_status_id() { type = type_id; ipart = partid = -1; bUseProxy = 1; }
+
+    int ipart;
+    int partid;
+    int iPrim; // primitive index (only makes sense for meshes)
+    int iFeature;   // feature id inside the primitive; doesn't affect the result currently
+    int bUseProxy; // use pPhysGeomProxy or pPhysGeom
+    int id; // surface id
+};
+
+struct pe_status_timeslices
+    : pe_status
+{
+    // only implemented for PE_LIVING and is obsolete, although still supported
+    enum entype
+    {
+        type_id = ePE_status_timeslices
+    };
+    pe_status_timeslices() { type = type_id; pTimeSlices = 0; sz = 1; precision = 0.0001f; MARK_UNUSED time_interval; }
+
+    float* pTimeSlices;
+    int sz;
+    float precision; // time surplus below this threshhold will be discarded
+    float time_interval; // if unused, time elapsed since the last action will be used
+};
+
+struct pe_status_nparts
+    : pe_status                         // GetStuts will return the number of parts
+{
+    enum entype
+    {
+        type_id = ePE_status_nparts
+    };
+    pe_status_nparts() { type = type_id; }
+};
+
+struct pe_status_awake
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_awake
+    };
+    pe_status_awake() { type = type_id; lag = 0; }
+    int lag; // GetStatus returns 1 ("awake") if the entity fell asleep later than this amount of frames before
+};
+
+struct pe_status_contains_point
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_contains_point
+    };
+    pe_status_contains_point() { type = type_id; }
+    Vec3 pt;
+};
+
+struct pe_status_placeholder
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_placeholder
+    };
+    pe_status_placeholder() { type = type_id; }
+    IPhysicalEntity* pFullEntity;   // if called on a placeholder, returns the corresponding full entity
+};
+
+struct pe_status_sample_contact_area
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_sample_contact_area
+    };
+    pe_status_sample_contact_area() { type = type_id; }
+    Vec3 ptTest; // checks if ptTest, projected along dirTest falls inside the convex hull of this entity's contacts
+    Vec3 dirTest;
+};
+
+struct pe_status_caps
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_caps
+    };
+    pe_status_caps() { type = type_id; }
+    unsigned int bCanAlterOrientation; // the entity can change orientation that is explicitly set from outside (by baking it into parts/geometries)
+};
+
+struct pe_status_constraint
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_constraint
+    };
+    pe_status_constraint() { type = type_id; idx = -1; }
+    int id;
+    int idx;
+    int flags;
+    Vec3 pt[2];
+    Vec3 n;
+    IPhysicalEntity* pBuddyEntity;
+    IPhysicalEntity* pConstraintEntity;
+};
+
+////////// area status
+
+struct pe_status_area
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_area
+    };
+    pe_status_area() { type = type_id; bUniformOnly = false; ctr.zero(); size.zero(); vel.zero(); MARK_UNUSED gravity; pLockUpdate = 0; pSurface = 0; }
+
+    // inputs.
+    Vec3 ctr, size;                         // query bounds
+    Vec3 vel;
+    bool bUniformOnly;
+
+    // outputs.
+    Vec3 gravity;
+    pe_params_buoyancy pb;
+    volatile int* pLockUpdate;
+    IGeometry* pSurface;
+};
+
+////////// living entity statuses
+
+struct pe_status_living
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_living
+    };
+    pe_status_living() { type = type_id; }
+
+    int bFlying; // whether entity has no contact with ground
+    float timeFlying; // for how long the entity was flying
+    Vec3 camOffset; // camera offset
+    Vec3 vel; // actual velocity (as rate of position change)
+    Vec3 velUnconstrained; // 'physical' movement velocity
+    Vec3 velRequested;  // velocity requested in the last action
+    Vec3 velGround; // velocity of the object entity is standing on
+    float groundHeight; // position where the last contact with the ground occured
+    Vec3 groundSlope;
+    int groundSurfaceIdx;
+    int groundSurfaceIdxAux; // contact with the ground that also has default collision flags
+    IPhysicalEntity* pGroundCollider;   // only returns an actual entity if the ground collider is not static
+    int iGroundColliderPart;
+    float timeSinceStanceChange;
+    //int bOnStairs; // tries to detect repeated abrupt ground height changes
+    int bStuck; // tries to detect cases when the entity cannot move as before because of collisions
+    volatile int* pLockStep; // internal timestepping lock
+    int iCurTime; // quantised time
+    int bSquashed; // entity is being pushed by heavy objects from opposite directions
+};
+
+struct pe_status_check_stance
+    : pe_status
+{
+    // checks whether new dimensions cause collisions; params have the same meaning as in pe_player_dimensions
+    enum entype
+    {
+        type_id = ePE_status_check_stance
+    };
+    pe_status_check_stance()
+        : dirUnproj(0, 0, 1)
+        , unproj(0) { type = type_id; MARK_UNUSED pos, q, sizeCollider, heightCollider, bUseCapsule; }
+
+    Vec3 pos;
+    quaternionf q;
+    Vec3 sizeCollider;
+    float heightCollider;
+    Vec3 dirUnproj;
+    float unproj;
+    int bUseCapsule;
+};
+
+////////// vehicle entity statuses
+
+struct pe_status_vehicle
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_vehicle
+    };
+    pe_status_vehicle() { type = type_id; }
+
+    float steer; // current steering angle
+    float pedal; // current engine pedal
+    int bHandBrake; // nonzero if handbrake is on
+    float footbrake; // nonzero if footbrake is pressed (range 0..1)
+    Vec3 vel;
+    int bWheelContact; // nonzero if at least one wheel touches ground
+    int iCurGear;
+    float engineRPM;
+    float clutch;
+    float drivingTorque;
+    int nActiveColliders;   // number of non-static contacting entities
+};
+
+struct pe_status_wheel
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_wheel
+    };
+    pe_status_wheel() { type = type_id; iWheel = 0; MARK_UNUSED partid; }
+    int iWheel;
+    int partid;
+
+    int bContact;   // nonzero if wheel touches ground
+    Vec3 ptContact; // point where wheel touches ground
+    Vec3 normContact; // contact normal
+    float w; // rotation speed
+    int bSlip;
+    Vec3 velSlip; // slip velocity
+    int contactSurfaceIdx;
+    float friction; // current friction applied
+    float suspLen; // current suspension spring length
+    float suspLenFull; // relaxed suspension spring length
+    float suspLen0; // initial suspension spring length
+    float r; // wheel radius
+    float torque; // driving torque
+    float steer; // current streeing angle
+    IPhysicalEntity* pCollider;
+};
+
+struct pe_status_vehicle_abilities
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_vehicle_abilities
+    };
+    pe_status_vehicle_abilities() { type = type_id; MARK_UNUSED steer; }
+
+    float steer; // should be set to requested steering angle
+    Vec3 rotPivot;  // returns turning circle center
+    float maxVelocity; // calculates maximum velocity of forward movement along a plane (steer is ignored)
+};
+
+////////// articulated entity statuses
+
+struct pe_status_joint
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_joint
+    };
+    pe_status_joint() { type = type_id; MARK_UNUSED partid, idChildBody; }
+
+    int idChildBody; // requested joint is identified by child body id
+    int partid; // ..or, alternatively, by any of parts that belong to it
+    unsigned int flags; // joint flags
+    Ang3 q; // current joint angles (controlled by physics)
+    Ang3 qext; // external angles (from animation)
+    Ang3 dq; // current joint angular velocities
+    quaternionf quat0; // orientation of child inside parent that corresponds to 0 angles
+};
+
+////////// rope entity statuses
+
+struct pe_status_rope
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_rope
+    };
+    pe_status_rope()
+        : pContactEnts(0)
+    {
+        type = type_id;
+        pPoints = pVelocities = pVtx = pContactNorms = 0;
+        nCollStat = nCollDyn = bTargetPoseActive = bStrained = 0;
+        stiffnessAnim = timeLastActive = 0;
+        nVtx = 0;
+        lock = 0;
+    }
+
+    int nSegments;
+    Vec3* pPoints; // expects the caller to provide an array of nSegments+1, if 0, no points are returned
+    Vec3* pVelocities; // expects the caller to provide an array of nSegments+1, if 0, no velocities are returned
+    int nCollStat, nCollDyn; // number of rope contacts with static and dynamic objects
+    int bTargetPoseActive; // current traget pose mode (0, 1, or 2)
+    float stiffnessAnim; // current target pose stiffness
+    int bStrained; // whether the rope is strained, either along a line or wrapped around objects
+    strided_pointer<IPhysicalEntity*> pContactEnts; // returns a pointer to internal data, the caller doesn't need to provide it
+    int nVtx;   // current number of vertices, used for ropes with dynamic subdivision
+    Vec3* pVtx; // expects the caller to provide the array
+    Vec3* pContactNorms; // normals for points (not vertices), expects a pointer from the caller
+    float timeLastActive;   // physics time when the rope was last active (not asleep)
+    Vec3 posHost;   // host (the entity part it's attached to) position that corresponds to the returned state
+    quaternionf qHost; // host's orientation
+    int lock; // for subdivided ropes: +1 to leave read-locked, -1 to release from a previously read-locked state; 0 - local locking only
+};
+
+////////// soft entity statuses
+
+enum ESSVFlags
+{
+    eSSV_LockPos = 1, // locks vertices (soft entity won't be able to update them until released)
+    eSSV_UnlockPos = 2    // release the vertices
+};
+
+struct pe_status_softvtx
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_softvtx
+    };
+    pe_status_softvtx()
+        : pVtx(0)
+        , pNormals(0) { type = type_id; pVtxMap = 0; flags = 0; }
+
+    int nVtx;
+    strided_pointer<Vec3> pVtx; // a pointer to an internal data; doesn't need to be filled
+    strided_pointer<Vec3> pNormals; // a pointer to an internal data; doesn't need to be filled
+    int* pVtxMap;   // mapping table mesh vertex->simulated vertex (can be 0)
+    IGeometry* pMesh; // phys mesh that reflects the simulated data
+    int flags; // see ESSVFlags
+    quaternionf qHost; // host's orientation
+    Vec3 posHost; // host (the entity part it's attached to) position that corresponds to the returned state
+    Vec3 pos;   // entity position that corresponds to the returned state
+    quaternionf q; // entity's orientation
+};
+
+////////// waterman statuses
+
+struct SWaterTileBase
+{
+    int bActive;
+    float* ph; // heights
+    Vec3* pvel; // velocities
+};
+
+struct pe_status_waterman
+    : pe_status
+{
+    enum entype
+    {
+        type_id = ePE_status_waterman
+    };
+    pe_status_waterman() { type = type_id; }
+
+    int bActive;
+    Matrix33 R;
+    Vec3 origin;
+    int nTiles, nCells; // number of tiles and cells in one dimension
+    SWaterTileBase** pTiles; // nTiles^2 entries
+};
+
+////////////////////////// Geometry structures /////////////////////
+
+////////// common geometries
+enum geom_flags
+{
+    // collisions between parts are checked if (part0->flagsCollider & part1->flags) !=0
+    geom_colltype0 = 0x0001, geom_colltype1 = 0x0002, geom_colltype2 = 0x0004, geom_colltype3 = 0x0008, geom_colltype4 = 0x0010,
+    geom_colltype5 = 0x0020, geom_colltype6 = 0x0040, geom_colltype7 = 0x0080, geom_colltype8 = 0x0100, geom_colltype9 = 0x0200,
+    geom_colltype10 = 0x0400, geom_colltype11 = 0x0800, geom_colltype12 = 0x1000, geom_colltype13 = 0x2000, geom_colltype14 = 0x4000,
+    geom_colltype_ray = 0x8000, // special colltype used by raytracing by default
+    geom_floats = 0x10000, // colltype required to apply buoyancy
+    geom_proxy = 0x20000, // only used in AddGeometry to specify that this geometry should go to pPhysGeomProxy
+    geom_structure_changes = 0x40000, // part is breaking/deforming
+    geom_can_modify = 0x80000, // geometry is cloned and is used in this entity only
+    geom_squashy = 0x100000, // part has 'soft' collisions (used for tree foliage proxy)
+    geom_log_interactions = 0x200000, // part will post EventPhysBBoxOverlap whenever something happens inside its bbox
+    geom_monitor_contacts = 0x400000, // part needs collision callback from the solver (used internally)
+    geom_manually_breakable = 0x800000,   // part is breakable outside the physics
+    geom_no_coll_response = 0x1000000, // collisions are detected and reported, but not processed
+    geom_mat_substitutor = 0x2000000, // geometry is used to change other collision's material id if the collision point is inside it
+    geom_break_approximation = 0x4000000, // applies capsule approximation after breaking (used for tree trunks)
+    geom_no_particle_impulse = 0x8000000, // phys particles don't apply impulses to this part; should be used in flagsCollider
+    geom_destroyed_on_break = 0x2000000, // should be used in flagsCollider
+    // mnemonic group names
+    geom_colltype_player = geom_colltype1, geom_colltype_explosion = geom_colltype2,
+    geom_colltype_vehicle = geom_colltype3, geom_colltype_foliage = geom_colltype4, geom_colltype_debris = geom_colltype5,
+    geom_colltype_foliage_proxy = geom_colltype13, geom_colltype_obstruct = geom_colltype14,
+    geom_colltype_solid = 0x0FFF & ~geom_colltype_explosion, geom_collides = 0xFFFF
+};
+
+
+
+struct pe_geomparams
+{
+    enum entype
+    {
+        type_id = ePE_geomparams
+    };
+    pe_geomparams()
+    {
+        type = type_id;
+        density = mass = 0;
+        pos.Set(0, 0, 0);
+        q.SetIdentity();
+        bRecalcBBox = 1;
+        flags = geom_colltype_solid | geom_colltype_ray | geom_floats | geom_colltype_explosion;
+        flagsCollider = geom_colltype0;
+        pMtx3x4 = 0;
+        pMtx3x3 = 0;
+        scale = 1.0f;
+        pLattice = 0;
+        pMatMapping = 0;
+        nMats = 0;
+        MARK_UNUSED surface_idx, minContactDist, idmatBreakable;
+    }
+
+    int type;
+    float density; // 0 if mass is used
+    float mass; // 0 if density is used
+    Vec3 pos; // offset from object's geometrical pivot
+    quaternionf q; // orientation relative to object
+    float scale;
+    Matrix34* pMtx3x4; // optional full transform matrix
+    Matrix33* pMtx3x3;  // optional 3x3 orintation+scale matrix
+    int surface_idx; // surface identifier (used if corresponding CGeometry does not contain materials)
+    unsigned int flags, flagsCollider;
+    float minContactDist;   // contacts closer then this threshold are merged
+    int idmatBreakable; // index for procedural (boolean) breakability
+    ITetrLattice* pLattice; // optional tetrahedral lattice (for lattice breaking and soft bodies)
+    int* pMatMapping;   // mapping of mat ids from geometry to final mat ids
+    int nMats;
+    int bRecalcBBox; // recalculate all bbox info after the part is added
+
+    VALIDATORS_START
+        VALIDATOR_RANGE(density, -1E8, 1E8)
+        VALIDATOR_RANGE(mass, -1E8, 1E8)
+        VALIDATOR(pos)
+        VALIDATOR_NORM_MSG(q, "(perhaps non-uniform scaling was used in the asset?)", pt)
+    VALIDATORS_END
+};
+
+////////// articulated entity geometries
+
+struct pe_articgeomparams
+    : pe_geomparams
+{
+    enum entype
+    {
+        type_id = ePE_articgeomparams
+    };
+    pe_articgeomparams() { type = type_id; idbody = 0; }
+    pe_articgeomparams(pe_geomparams& src)
+    {
+        type = type_id;
+        density = src.density;
+        mass = src.mass;
+        pos = src.pos;
+        q = src.q;
+        scale = src.scale;
+        surface_idx = src.surface_idx;
+        pLattice = src.pLattice;
+        pMatMapping = src.pMatMapping;
+        nMats = src.nMats;
+        pMtx3x4 = src.pMtx3x4;
+        pMtx3x3 = src.pMtx3x3;
+        flags = src.flags;
+        flagsCollider = src.flagsCollider;
+        idbody = 0;
+        idmatBreakable = src.idmatBreakable;
+        bRecalcBBox = src.bRecalcBBox;
+        if (!is_unused(src.minContactDist))
+        {
+            minContactDist = src.minContactDist;
+        }
+        else
+        {
+            MARK_UNUSED minContactDist;
+        }
+    }
+    int idbody; // id of the subbody this geometry is attached to, the 1st add geometry specifies frame CS of this subbody
+};
+
+////////// vehicle entity geometries
+
+const int NMAXWHEELS = 30;
+struct pe_cargeomparams
+    : pe_geomparams
+{
+    enum entype
+    {
+        type_id = ePE_cargeomparams
+    };
+    pe_cargeomparams()
+        : pe_geomparams() { type = type_id; MARK_UNUSED bDriving, minFriction, maxFriction, bRayCast, kLatFriction; bCanBrake = 1; bCanSteer = 1; kStiffnessWeight = 1.f; }
+    pe_cargeomparams(pe_geomparams& src)
+    {
+        type = type_id;
+        density = src.density;
+        mass = src.mass;
+        pos = src.pos;
+        q = src.q;
+        surface_idx = src.surface_idx;
+        idmatBreakable = src.idmatBreakable;
+        pLattice = src.pLattice;
+        pMatMapping = src.pMatMapping;
+        nMats = src.nMats;
+        pMtx3x4 = src.pMtx3x4;
+        pMtx3x3 = src.pMtx3x3;
+        flags = src.flags;
+        flagsCollider = src.flagsCollider;
+        MARK_UNUSED bDriving, minFriction, maxFriction, bRayCast;
+        bCanBrake = 1, bCanSteer = 1;
+        kStiffnessWeight = 1.f;
+    }
+    int bDriving;   // whether wheel is driving, -1 - geometry os not a wheel
+    int iAxle; // wheel axle, currently not used
+    int bCanBrake; // whether the wheel is locked during handbrakes
+    int bRayCast;   // whether the wheel use simple raycasting instead of geometry sweep check
+    int bCanSteer; // wheel the wheel can steer
+    Vec3 pivot; // upper suspension point in vehicle CS
+    float lenMax;   // relaxed suspension length
+    float lenInitial; // current suspension length (assumed to be length in rest state)
+    float kStiffness; // suspension stiffness, if 0 - calculate from lenMax, lenInitial, and vehicle mass and geometry
+    float kStiffnessWeight; // When autocalculating stiffness use this weight for this wheel. Note weights for wheels in front of the centre of mass do not influence the weights of wheels behind the centre of mass
+    float kDamping; // suspension damping, if <0 - calculate as -kdamping*(approximate zero oscillations damping)
+    float minFriction, maxFriction; // additional friction limits for tire friction
+    float kLatFriction; // coefficient for lateral friction
+};
+
+///////////////// tetrahedra lattice params ////////////////////////
+
+struct pe_tetrlattice_params
+    : pe_params
+{
+    enum entype
+    {
+        type_id = ePE_tetrlattice_params
+    };
+    pe_tetrlattice_params()
+    {
+        type = type_id;
+        MARK_UNUSED nMaxCracks, maxForcePush, maxForcePull, maxForceShift, maxTorqueTwist, maxTorqueBend, crackWeaken, density;
+    }
+
+    int nMaxCracks; // maximum cracks per update
+    float maxForcePush, maxForcePull, maxForceShift; // linear force limits
+    float maxTorqueTwist, maxTorqueBend; // angular force limits
+    float crackWeaken; // weakens faces neighbouring a newly generated crack (0..1)
+    float density; // also affects all force limits
+};
+
+/////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////// IGeometry Interface ////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+
+struct geom_world_data   // geometry orientation for Intersect() requests
+{
+    geom_world_data()
+    {
+        v.Set(0, 0, 0);
+        w.Set(0, 0, 0);
+        offset.Set(0, 0, 0);
+        R.SetIdentity();
+        centerOfMass.Set(0, 0, 0);
+        scale = 1.0f;
+        iStartNode = 0;
+    }
+    Vec3 offset;
+    Matrix33 R;
+    float scale;
+    Vec3 v, w;   // used to give hints about unprojection direction
+    Vec3 centerOfMass; // w is rotation around this point
+    int iStartNode; // for warm-starting (checks collisions in this node first)
+};
+
+struct intersection_params
+{
+    intersection_params()
+    {
+        iUnprojectionMode = 0;
+        vrel_min = 1E-6f;
+        time_interval = 100.0f;
+        maxSurfaceGapAngle = 1.0f * float(g_PI / 180);
+        pGlobalContacts = 0;
+        minAxisDist = 0;
+        bSweepTest = false;
+        centerOfRotation.Set(0, 0, 0);
+        axisContactNormal.Set(0, 0, 1);
+        unprojectionPlaneNormal.Set(0, 0, 0);
+        axisOfRotation.Set(0, 0, 0);
+        bKeepPrevContacts = false;
+        bStopAtFirstTri = false;
+        ptOutsidePivot[0].Set(1E11f, 1E11f, 1E11f);
+        ptOutsidePivot[1].Set(1E11f, 1E11f, 1E11f);
+        maxUnproj = 1E10f;
+        bNoAreaContacts = false;
+        bNoBorder = false;
+        bNoIntersection = 0;
+        bExactBorder = 0;
+        bThreadSafe = bThreadSafeMesh = 0;
+    }
+    int iUnprojectionMode; // 0-angular, 1-rotational
+    Vec3 centerOfRotation; // for mode 1 only
+    Vec3 axisOfRotation; // if left 0, will be set based on collision area normal
+    float time_interval; // used to set unprojection limits
+    float vrel_min; // if local relative velocity in contact area is above this, unprojects along its derection; otherwise along area normal
+    float maxSurfaceGapAngle;   // theshold for generating area contacts
+    float minAxisDist; // disables rotational unprojection if contact point is closer than this to the axis
+    Vec3 unprojectionPlaneNormal; // restrict linear unprojection to this plane
+    Vec3 axisContactNormal; // a mild hint about possible contact normal
+    float maxUnproj; // unprojections longer than this are discarded
+    Vec3 ptOutsidePivot[2]; // discard contacts that are not facing outward wrt this point
+    bool bSweepTest; // requests a linear sweep test along v*time_interval (v from geom_world_data)
+    bool bKeepPrevContacts; // append results to existing contact buffer
+    bool bStopAtFirstTri;   // stop after the first collision is detected
+    bool bNoAreaContacts;   // don't try to detect contact areas
+    bool bNoBorder; // don't trace contact border
+    int bExactBorder; // always tries to return a consequtive border (useful for boolean ops)
+    int bNoIntersection; // don't find all intersection points (only applies to primitive-primitive collisions)
+    int bBothConvex; // (output) both operands were convex
+    int bThreadSafe; // set if it's known that no other thread will contend for the internal intersection data (only used in PrimitiveWorldIntersection now)
+    int bThreadSafeMesh; // set if it's known that no other thread will try to modify the colliding geometry
+    geom_contact* pGlobalContacts; // pointer to thread's global contact buffer
+};
+
+struct phys_geometry
+{
+    IGeometry* pGeom;
+    Vec3 Ibody; // tensor of inertia in body frame
+    quaternionf q; // body frame
+    Vec3 origin;
+    float V; // volume
+    int nRefCount;
+    int surface_idx; // used for primitives and meshes without per-face ids
+    int* pMatMapping;   // mat mapping; can later be overridden inside entity part
+    int nMats;
+    PhysicsForeignData pForeignData;    // any external pointer to be associated with phys geometry
+};
+
+struct bop_newvtx
+{
+    int idx;             // vertex index in the resulting A phys mesh
+    int iBvtx;     // -1 if intersection vertex, >=0 if B vertex
+    int idxTri[2]; // intersecting triangles' foreign indices
+};
+
+struct bop_newtri
+{
+    int idxNew;  // a newly generated foreign index (can be remapped later)
+    int iop;     // triangle source 0=A, 1=B
+    int idxOrg;  // original (triangulated) triangle's foreign index
+    int iVtx[3]; // for each vertex, existing vertex index if >=0, -(new vertex index+1) if <0
+    float areaOrg; // original triangle's area
+    Vec3 area[3]; // areas of compementary triangles for each vertex (divide by original tri area to get barycentric coords)
+};
+
+struct bop_vtxweld
+{
+    void set(int _ivtxDst, int _ivtxWelded) { ivtxDst = _ivtxDst; ivtxWelded = _ivtxWelded; }
+    int ivtxDst : 16; // ivtxWelded is getting replaced with ivtxDst
+    int ivtxWelded : 16;
+};
+
+struct bop_TJfix
+{
+    void set(int _iACJ, int _iAC, int _iABC, int _iCA, int _iTJvtx) { iACJ = _iACJ; iAC = _iAC; iABC = _iABC; iCA = _iCA; iTJvtx = _iTJvtx; }
+    // A _____J____ C    (ACJ is a thin triangle on top of ABC; J is 'the junction vertex')
+    //   \      .     /      in ABC: set A->Jnew
+    //       \  . /          in ACJ: set J->Jnew, A -> A from original ABC, C -> B from original ABC
+    //           \/
+    //           B
+    int iABC; // big triangle's foreign idx
+    int iACJ; // small triangle's foreign idx
+    int iCA; // CA edge number in ABC
+    int iAC; // AC edge number in ACJ
+    int iTJvtx; // J vertex index
+};
+
+struct bop_meshupdate_thunk
+{
+    bop_meshupdate_thunk() { prevRef = nextRef = this; }
+    virtual ~bop_meshupdate_thunk() { prevRef->nextRef = nextRef; nextRef->prevRef = prevRef; prevRef = nextRef = this; }
+    bop_meshupdate_thunk* prevRef, * nextRef;
+};
+
+struct bop_meshupdate
+    : bop_meshupdate_thunk
+{
+    bop_meshupdate() { Reset(); }
+    virtual ~bop_meshupdate();
+
+    void Reset()
+    {
+        pRemovedVtx = 0;
+        pRemovedTri = 0;
+        pNewVtx = 0;
+        pNewTri = 0;
+        pWeldedVtx = 0;
+        pTJFixes = 0;
+        pMovedBoxes = 0;
+        nRemovedVtx = nRemovedTri = nNewVtx = nNewTri = nWeldedVtx = nTJFixes = nMovedBoxes = 0;
+        next = 0;
+        pMesh[0] = pMesh[1] = 0;
+        relScale = 1.0f;
+    }
+
+    IGeometry* pMesh[2]; // 0-dst (A), 1-src (B)
+    int* pRemovedVtx;
+    int nRemovedVtx;
+    int* pRemovedTri;
+    int nRemovedTri;
+    bop_newvtx* pNewVtx;
+    int nNewVtx;
+    bop_newtri* pNewTri;
+    int nNewTri;
+    bop_vtxweld* pWeldedVtx;
+    int nWeldedVtx;
+    bop_TJfix* pTJFixes;
+    int nTJFixes;
+    bop_meshupdate* next;
+    primitives::box* pMovedBoxes;
+    int nMovedBoxes;
+    float relScale;
+};
+
+struct trinfo
+{
+    trinfo& operator=(trinfo& src) { ibuddy[0] = src.ibuddy[0]; ibuddy[1] = src.ibuddy[1]; ibuddy[2] = src.ibuddy[2]; return *this; }
+    index_t ibuddy[3];
+};
+
+struct mesh_island   // mesh island is a connected group of trinagles
+{
+    int itri;   // first triangle
+    int nTris; // trinagle count
+    int iParent; // outer island is V<0
+    int iChild; // first islands inside it with V<0
+    int iNext; // maintains a linked list of iChild's inside iParent
+    float V; // can be negative (means it represents an inner surface)
+    Vec3 center; // geometrical center
+    int bProcessed; // for internal use
+};
+
+struct tri2isle     // maintains a linked triangle list inside an island
+{
+    unsigned int inext : 16;
+    unsigned int isle    : 15;
+    unsigned int bFree : 1;
+};
+
+struct mesh_data
+    : primitives::primitive
+{
+    index_t* pIndices;
+    char* pMats;
+    int* pForeignIdx;   // an int associated with each face
+    strided_pointer<Vec3> pVertices;
+    Vec3* pNormals;
+    int* pVtxMap;   // original vertex index->merged vertex index
+    trinfo* pTopology; // neighbours for each triangle's edge
+    int nTris, nVertices;
+    mesh_island* pIslands;
+    int nIslands;
+    tri2isle* pTri2Island;
+    int flags;
+};
+
+const int BOP_NEWIDX0 = 0x8000000;
+
+enum geomtypes
+{
+    GEOM_TRIMESH = primitives::triangle::type, GEOM_HEIGHTFIELD = primitives::heightfield::type, GEOM_CYLINDER = primitives::cylinder::type,
+    GEOM_CAPSULE = primitives::capsule::type, GEOM_RAY = primitives::ray::type, GEOM_SPHERE = primitives::sphere::type,
+    GEOM_BOX = primitives::box::type, GEOM_VOXELGRID = primitives::voxelgrid::type
+};
+enum foreigntypes
+{
+    DATA_OWNED_OBJECT = 1, DATA_MESHUPDATE = -1, DATA_UNUSED = -2
+};
+
+enum meshflags
+{
+    // mesh_shared_... flags mean that the mesh will not attempt to free the corresponding array upon deletion
+    mesh_shared_vtx = 1, mesh_shared_idx = 2, mesh_shared_mats = 4, mesh_shared_foreign_idx = 8,    mesh_shared_normals = 0x10,
+    // bounding volume flags (if several are specified in CreateMesh(), the best fitting one will be used)
+    mesh_OBB = 0x20, mesh_AABB = 0x40, mesh_SingleBB = 0x80, mesh_AABB_rotated = 0x40000, mesh_VoxelGrid = 0x80000,
+    // mesh_multicontact is a hint on how many contacts per node to expect; 0-one contact, 2-no limit, 1-balanced
+    mesh_multicontact0 = 0x100, mesh_multicontact1 = 0x200, mesh_multicontact2 = 0x400,
+    // mesh_approx flags are used in CreateMesh to specify which primitive approximations to try
+    mesh_approx_cylinder = 0x800, mesh_approx_box = 0x1000, mesh_approx_sphere = 0x2000, mesh_approx_capsule = 0x200000,
+    mesh_keep_vtxmap = 0x8000, // keeps vertex map after adjacent vertices were merged
+    mesh_keep_vtxmap_for_saving = 0x10000, // deletes vertex map after loading
+    mesh_no_vtx_merge = 0x20000, // does not attempt to merge adjacent vertices
+    mesh_always_static = 0x100000, // simplifies phys mass properties calculation if by just setting them to 0
+    mesh_full_serialization = 0x400000, // mesh will save all data to stream unconditionally
+    mesh_transient = 0x800000, // all mesh allocations will go to a flushable pool
+    mesh_no_booleans = 0x1000000, // disables boolean operations on the mesh
+    mesh_AABB_plane_optimise = 0x4000, // aabb generation is faster since it assumes the tri's are in a plane and distributed uniformly
+    mesh_no_filter = 0x2000000 // doesn't attempt to filter away degenerate triangles
+};
+enum meshAuxData
+{
+    mesh_data_materials = 1, mesh_data_foreign_idx = 2, mesh_data_vtxmap = 4
+};                                                                                       // used in DestroyAuxiliaryMeshData
+
+struct IOwnedObject
+{
+    // <interfuscator:shuffle>
+    virtual ~IOwnedObject(){}
+    virtual int Release() = 0;
+    // </interfuscator:shuffle>
+};
+
+struct SOcclusionCubeMap;
+
+struct IGeometry
+{
+    struct SBoxificationParams
+    {
+        SBoxificationParams() { minFaceArea = sqr(0.4f); distFilter = 0.2f; voxResolution = 100; maxFaceTiltAngle = DEG2RAD(10); minLayerFilling = 0.5f; maxLayerReusage = 0.8f; maxVoxIslandConnections = 0.5f; }
+        float minFaceArea; // ignore patches smaller than this in the box growing process
+        float distFilter;   // smooth away details smaller than this (in terms of linear size)
+        int voxResolution; // resolution of the grid in the longest direction
+        float maxFaceTiltAngle; // tolerance for patch alignment with box faces
+        float minLayerFilling; // stop growing boxes once layer fill percentage falls below this
+        float maxLayerReusage; // stop growing a box if it goes through already used cells (> than this percentage)
+        float maxVoxIslandConnections; // ignore isolated voxel islands that have more than this amount of connections to the used ones
+    };
+    // <interfuscator:shuffle>
+    virtual ~IGeometry(){}
+    virtual int GetType() = 0; // see enum geomtypes
+    virtual int AddRef() = 0;
+    virtual void Release() = 0;
+    virtual void Lock(int bWrite = 1) = 0; // locks the geometry for reading or writing
+    virtual void Unlock(int bWrite = 1) = 0; // bWrite should match the preceding Lock
+    virtual void GetBBox(primitives::box* pbox) = 0; // possibly oriented bbox (depends on BV tree type)
+    virtual int CalcPhysicalProperties(phys_geometry* pgeom) = 0;   // O(num_triangles) for meshes, unless mesh_always_static is set
+    virtual int PointInsideStatus(const Vec3& pt) = 0; // for meshes, will create an auxiliary hashgrid for acceleration
+    // IntersectLocked - the main function for geomtries. pdata1,pdata2,pparams can be 0 - defaults will be assumed.
+    // returns a pointer to an internal thread-specific contact buffer, locked with the lock argument
+    virtual int IntersectLocked(IGeometry* pCollider, geom_world_data* pdata1, geom_world_data* pdata2, intersection_params* pparams, geom_contact*& pcontacts,  WriteLockCond& lock) = 0;
+    virtual int IntersectLocked(IGeometry* pCollider, geom_world_data* pdata1, geom_world_data* pdata2, intersection_params* pparams, geom_contact*& pcontacts, WriteLockCond& lock, int iCaller) = 0;
+    // Intersect - same as Intersect, but doesn't lock pcontacts
+    virtual int Intersect(IGeometry* pCollider, geom_world_data* pdata1, geom_world_data* pdata2, intersection_params* pparams, geom_contact*& pcontacts) = 0;
+    // FindClosestPoint - for non-convex meshes only does local search, doesn't guarantee global minimum
+    // iFeature's format: (feature type: 2-face, 1-edge, 0-vertex)<<9 | feature index
+    // if ptdst0 and ptdst1 are different, searches for a closest point on a line segment
+    // ptres[0] is the closest point on the geometry, ptres[1] - on the test line segment
+    virtual int FindClosestPoint(geom_world_data* pgwd, int& iPrim, int& iFeature, const Vec3& ptdst0, const Vec3& ptdst1, Vec3* ptres, int nMaxIters = 10) = 0;
+    // CalcVolumetricPressure: a fairly correct computation of volumetric pressure with inverse-quadratic falloff (ex: explosions)
+    // for a surface fragment dS, impulse is: k*dS*cos(surface_normal,direction to epicenter) / max(rmin, distance to epicenter)^2
+    // returns integral impulse and angular impulse
+    virtual void CalcVolumetricPressure(geom_world_data* gwd, const Vec3& epicenter, float k, float rmin, const Vec3& centerOfMass, Vec3& P, Vec3& L) = 0;
+    // CalculateBuoyancy: computes the submerged volume (return value) and the mass center of the submerged part
+    virtual float CalculateBuoyancy(const primitives::plane* pplane, const geom_world_data* pgwd, Vec3& submergedMassCenter) = 0;
+    // CalculateMediumResistance: computes medium resistance integral of the surface; self flow of the medium should be baked into pgwd
+    // for a surface fragment dS with normal n and velocity v impulse is: -n*max(0,n*v) (can be scaled by the medium resistance coeff. later)
+    virtual void CalculateMediumResistance(const primitives::plane* pplane, const geom_world_data* pgwd, Vec3& dPres, Vec3& dLres) = 0;
+    // DrawWireframe: draws physics helpers; iLevel>0 will draaw a level in the bounding volume tree
+    virtual void DrawWireframe(IPhysRenderer* pRenderer, geom_world_data* gwd, int iLevel, int idxColor) = 0;
+    virtual int GetPrimitiveId(int iPrim, int iFeature) = 0; // get material id for a primitive (iFeature is ignored currently)
+    // GetPrimitive: expects a valid pprim pointer, type depends on GetType; meshes return primitives::triangle
+    virtual int GetPrimitive(int iPrim, primitives::primitive* pprim) = 0;
+    virtual int GetForeignIdx(int iPrim) = 0;   // only works for meshes
+    virtual Vec3 GetNormal(int iPrim, const Vec3& pt) = 0; // only implemented for meshes currently; pt is ignored
+    virtual int GetFeature(int iPrim, int iFeature, Vec3* pt) = 0; // returns vertices of face, edge, or vertex; only for boxes and meshes currently
+    virtual int IsConvex(float tolerance) = 0;
+    // PrepareForRayTest: creates an auxiliary hash structure for short rays test acceleration
+    virtual void PrepareForRayTest(float raylen) = 0;   // raylen - 'expected' ray length to optimize the hash for
+    // BuildOcclusionCubemap: cubemap projection-based occlusion (used for explosions); pGrids are 6 [nRes^2] arrays
+    // iMode: 0 - update cubemap in pGrid0; 1 - build cubemap in pGrid1, grow edges by nGrow cells, and compare with pGrid0
+    // all geometry closer than rmin is ignored (to avoid large projection scale); same if farther than rmax
+    virtual float BuildOcclusionCubemap(geom_world_data* pgwd, int iMode, SOcclusionCubeMap* cubemap0, SOcclusionCubeMap* cubemap1, int nGrow) = 0;
+    virtual void GetMemoryStatistics(ICrySizer* pSizer) = 0;
+    virtual void Save(CMemStream& stm) = 0;
+    virtual void Load(CMemStream& stm) = 0;
+    // Load: meshes can avoid storing vertex, index, and mat id data, in this case same arrays should be provided during loading
+    virtual void Load(CMemStream& stm, strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pIds) = 0;
+    virtual int GetPrimitiveCount() = 0;
+    virtual const primitives::primitive* GetData() = 0; // returns an pointer to an internal structure; for meshes returns mesh_data
+    virtual void SetData(const primitives::primitive*) = 0; // not supported by meshes
+    virtual float GetVolume() = 0;
+    virtual Vec3 GetCenter() = 0;
+    // Subtract: performs boolean subtraction; if bLogUpdates==1, will create bop_meshupdate inside the mesh
+    virtual int Subtract(IGeometry* pGeom, geom_world_data* pdata1, geom_world_data* pdata2, int bLogUpdates = 1) = 0;
+    virtual int GetSubtractionsCount() = 0; // number of Subtract()s the mesh has survived so far
+    // GetForeignData: returns a pointer associated with the geometry
+    // special: GetForeignData(DATA_MESHUPDATE) returns the internal bop_meshupdate list (does not interfere with the main foreign pointer)
+    virtual PhysicsForeignData GetForeignData(int iForeignData = 0) = 0;
+    virtual int GetiForeignData() = 0; // foreign data type
+    virtual void SetForeignData(PhysicsForeignData pForeignData, int iForeignData) = 0;
+    virtual int GetErrorCount() = 0; // for meshes, the number of edges that don't belong to exactly 2 triangles
+    virtual void DestroyAuxilaryMeshData(int idata) = 0; // see meshAuxData enum
+    virtual void RemapForeignIdx(int* pCurForeignIdx, int* pNewForeignIdx, int nTris) = 0; // used in rendermesh-physics sync after boolean ops
+    virtual void AppendVertices(Vec3* pVtx, int* pVtxMap, int nVtx) = 0; // used in rendermesh-physics sync after boolean ops
+    virtual float GetExtent(EGeomForm eForm) const = 0;
+    virtual void GetRandomPos(PosNorm& ran, EGeomForm eForm) const = 0;
+    virtual void CompactMemory() = 0; // used only by non-breakable meshes to compact non-shared vertices into same contingous block of memory
+    // Boxify: attempts to build a set of boxes covering the geometry's volume (only supported by trimeshes)
+    virtual int Boxify(primitives::box* pboxes, int nMaxBoxes, const SBoxificationParams& params) = 0;
+    // Sanity check the geometry. i.e. its tree doesn't have an excessive depth. returns 0 if fails
+    virtual int SanityCheck() = 0;
+    // </interfuscator:shuffle>
+};
+
+
+/////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////// IGeometryManager Interface /////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+
+struct SMeshBVParams {};
+
+struct SBVTreeParams
+    : SMeshBVParams
+{
+    int nMinTrisPerNode; // if a split creates a node with <nMinTris triangles, another split is attempted
+    int nMaxTrisPerNode; // nodes are split until they have more triangles than this
+    float favorAABB; // when several BV trees are requested in CreateMesh, it selects the one with the smallest volume; favorAABB scales AABB's volume down
+};
+
+struct SVoxGridParams
+    : SMeshBVParams                     // voxel grid is a regular 3d grid collision test acceleration structure
+{
+    Vec3 origin;
+    Vec3 step;
+    Vec3i size;
+};
+
+struct ITetrLattice
+{
+    // <interfuscator:shuffle>
+    virtual ~ITetrLattice(){}
+    virtual int SetParams(const pe_params*) = 0;  // only accepts pe_tetrlattice_params
+    virtual int GetParams(pe_params*) = 0;
+    virtual void DrawWireframe(IPhysRenderer* pRenderer, geom_world_data* gwd, int idxColor) = 0;
+    virtual IGeometry* CreateSkinMesh(int nMaxTrisPerBVNode = 8) = 0; // builds triangle mesh for exterior faces
+    virtual int CheckPoint(const Vec3& pt, int* idx, float* w) = 0; // check if a point is inside any tetrahedron, fills barycentric weights[4]
+    virtual void Release() = 0;
+    // </interfuscator:shuffle>
+};
+
+struct IBreakableGrid2d
+{
+    // <interfuscator:shuffle>
+    virtual ~IBreakableGrid2d(){}
+    // BreakIntoChunks: emulates fracure in the grid around pt with dimensions r x ry
+    // ptout receives a pointer to a vertex array
+    // return value is an allocated array of indices, 3 per triangle, -1 marks contour end, -2 array end
+    // maxPatchTris tells to unite broken trianges into patches of up to this size; 0 means broken triangles are discarded
+    // jointhresh (0..1) affects the way triangles unite into patches
+    // seed bootsraps the RNG if >=0
+    // hole edges are filtered to removes corners sharper than filterAng (except those that are formed by several joined triangles)
+    virtual int* BreakIntoChunks(const vector2df& pt, float r, vector2df*& ptout, int maxPatchTris, float jointhresh, int seed = -1, float filterAng = 0.0f, float ry = 0.0f) = 0;
+    virtual primitives::grid* GetGridData() = 0;
+    virtual bool IsEmpty() = 0;
+    virtual void Release() = 0;
+    virtual float GetFracture() = 0; // destroyed percentage so far
+    virtual void GetMemoryStatistics(ICrySizer* pSizer) const = 0;
+    // </interfuscator:shuffle>
+};
+
+
+struct IGeomManager
+{
+    // <interfuscator:shuffle>
+    virtual ~IGeomManager(){}
+    virtual void InitGeoman() = 0;
+    virtual void ShutDownGeoman() = 0;
+
+    // CreateMesh - depending on flags (see enum meshflags) can create either a mesh or a primitive that approximates
+    // approx_tolerance is the approximation tolerance in relative units
+    // pMats are per-face material ids (which can later be mapped via pMatMapping)
+    // pForeignIdx store any user data per face (internally indices might be sorted when building BV structure, pForegnIdx will reflect that)
+    virtual IGeometry* CreateMesh(strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pMats, int* pForeignIdx, int nTris, int flags, float approx_tolerance = 0.05f, int nMinTrisPerNode = 2, int nMaxTrisPerNode = 4, float favorAABB = 1.0f) = 0;
+    virtual IGeometry* CreateMesh(strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pMats, int* pForeignIdx, int nTris, int flags, float approx_tolerance, SMeshBVParams* pParams) = 0;  // this version can take SVoxGridParams in pParams, if mesh_VoxelGrid is set
+    virtual IGeometry* CreatePrimitive(int type, const primitives::primitive* pprim) = 0; // used to create primitives explicitly
+    virtual void DestroyGeometry(IGeometry* pGeom) = 0; // just calls Release() on pGeom
+
+    // RegisterGeometry: creates a phys_geometry structure for IGeometry, computes mass properties
+    // phys_geometries are managed in pools internally; the new structure has nRefCount 1
+    // defSurfaceIdx will be used (until overwritten in entity part) if the geometry doesn't have per-face materials
+    virtual phys_geometry* RegisterGeometry(IGeometry* pGeom, int defSurfaceIdx = 0, int* pMatMapping = 0, int nMats = 0) = 0;
+    virtual int AddRefGeometry(phys_geometry* pgeom) = 0;
+    virtual int UnregisterGeometry(phys_geometry* pgeom) = 0;   // decreases nRefCount, frees the pool slot if <=0
+    virtual void SetGeomMatMapping(phys_geometry* pgeom, int* pMatMapping, int nMats) = 0;
+
+    virtual void SaveGeometry(CMemStream& stm, IGeometry* pGeom) = 0;
+    virtual IGeometry* LoadGeometry(CMemStream& stm, strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pMats) = 0;
+    virtual void SavePhysGeometry(CMemStream& stm, phys_geometry* pgeom) = 0;
+    virtual phys_geometry* LoadPhysGeometry(CMemStream& stm, strided_pointer<const Vec3> pVertices, strided_pointer<unsigned short> pIndices, char* pIds) = 0;
+    virtual IGeometry* CloneGeometry(IGeometry* pGeom) = 0;
+
+    virtual ITetrLattice* CreateTetrLattice(const Vec3* pt, int npt, const int* pTets, int nTets) = 0;
+    // RegisterCrack: cracks are used for ITertLattice-induced breaking to subtract a shape whenever a tetrahedral face breaks
+    // pVtx specify 3 control vertices; when applying, they are affinely stretched to match the broken face's corners
+    // idmat is breakability index
+    virtual int RegisterCrack(IGeometry* pGeom, Vec3* pVtx, int idmat) = 0;
+    virtual void UnregisterCrack(int id) = 0;
+    virtual void UnregisterAllCracks(void (* OnRemoveGeom)(IGeometry* pGeom) = 0) = 0;
+    // GetCrackGeom - creates a stretched crack based on the three corner vertices (pt[3])
+    // pgwd receives it world transformation
+    virtual IGeometry* GetCrackGeom(const Vec3* pt, int idmat, geom_world_data* pgwd) = 0;
+
+    // GenerateBreakebleGrid - creates a perturbed regular grid of points
+    // ptsrc's bbox is split into a nCells grid (with an additional border)
+    // vertices are randomly perturbed up to 0.4 cell size (seed can bootstrap the randomizer)
+    // ptsrc is "painted" into the grid, snapping the closest grid vertices to ptsrc (but no new ones are created at this stage)
+    // bStatic is ignored currently
+    virtual IBreakableGrid2d* GenerateBreakableGrid(vector2df* ptsrc, int npt, const vector2di& nCells, int bStatic = 1, int seed = -1) = 0;
+
+    virtual void ReleaseGeomsImmediately(bool bReleaseImmediately) = 0;
+    // </interfuscator:shuffle>
+};
+
+
+/////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////// IPhysUtils Interface /////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+
+typedef void* (* qhullmalloc)(size_t);
+
+struct IPhysUtils
+{
+    // <interfuscator:shuffle>
+    virtual ~IPhysUtils(){}
+    // CoverPolygonWithCircles - attempts to fits circles to roughly cover a polygon (can used to generate round spalshes over an area)
+    // bConsecutive is false, uses convex hull of the points
+    // center is a pre-calculated geometrical center of pt's
+    // outputs data into centers and radii arrays, which use global buffers; returns the number of circles
+    virtual int CoverPolygonWithCircles(strided_pointer<vector2df> pt, int npt, bool bConsecutive, const vector2df& center, vector2df*& centers, float*& radii, float minCircleRadius) = 0;
+    virtual int qhull(strided_pointer<Vec3> pts, int npts, index_t*& pTris, qhullmalloc qmalloc = 0) = 0;
+    virtual void DeletePointer(void* pdata) = 0; // should be used to free data allocated in physics
+    virtual int TriangulatePoly(vector2df* pVtx, int nVtx, int* pTris, int szTriBuf) = 0;
+    // </interfuscator:shuffle>
+};
+
+/////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////// IPhysicalEntity Interface //////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+
+enum snapshot_flags
+{
+    ssf_compensate_time_diff = 1, ssf_checksum_only = 2, ssf_no_update = 4
+};
+
+struct IPhysicalEntity
+{
+    // <interfuscator:shuffle>
+    virtual ~IPhysicalEntity(){}
+    virtual pe_type GetType() const = 0; // returns pe_type
+
+    virtual int AddRef() = 0;
+    virtual int Release() = 0;
+
+    // SetParams - changes parameters; can be queued and executed later if the physics is busy (unless bThreadSafe is flagged)
+    // returns !0 if successful
+    virtual int SetParams(const pe_params* params, int bThreadSafe = 0) = 0;
+    virtual int GetParams(pe_params* params) const = 0; // uses the same structures as SetParams; returns !0 if successful
+    virtual int GetStatus(pe_status* status) const = 0; // generally returns >0 if successful, but some pe_status'es have special meaning
+    virtual int Action(const pe_action*, int bThreadSafe = 0) = 0; // like SetParams, can get queued
+
+    // AddGeometry - add a new entity part, containing pgeom; request can get queued
+    // params can be specialized depending on the entity type
+    // id is a requested geometry id (expected to be unique), if -1 - assign automatically
+    // returns geometry id (0..some number), -1 means error
+    virtual int AddGeometry(phys_geometry* pgeom, pe_geomparams* params, int id = -1, int bThreadSafe = 0) = 0;
+    virtual void RemoveGeometry(int id, int bThreadSafe = 0) = 0; // returns !0 if successful; can get queued
+
+    virtual PhysicsForeignData GetForeignData(int itype = 0) const = 0; // returns entity's pForeignData if itype matches iForeignData, 0 otherwise
+    virtual int GetiForeignData() const = 0; // returns entity's iForegnData
+
+    virtual int GetStateSnapshot(class CStream& stm, float time_back = 0, int flags = 0) = 0;   // obsolete, was used in Far Cry
+    virtual int GetStateSnapshot(TSerialize ser, float time_back = 0, int flags = 0) = 0;
+    virtual int SetStateFromSnapshot(class CStream& stm, int flags = 0) = 0; // obsolete
+    virtual int PostSetStateFromSnapshot() = 0; // obsolete
+    virtual unsigned int GetStateChecksum() = 0; // obsolete
+    virtual void SetNetworkAuthority(int authoritive = -1, int paused = -1) = 0;     // -1 dont change, 0 - set to false, 1 - set to true
+
+    virtual int SetStateFromSnapshot(TSerialize ser, int flags = 0) = 0;
+    virtual int SetStateFromTypedSnapshot(TSerialize ser, int type, int flags = 0) = 0;
+    virtual int GetStateSnapshotTxt(char* txtbuf, int szbuf, float time_back = 0) = 0; // packs state into ASCII text
+    virtual void SetStateFromSnapshotTxt(const char* txtbuf, int szbuf) = 0;
+
+    // DoStep: evolves entity in time. Normally this is called from PhysicalWorld::TimeStep
+    virtual int DoStep(float time_interval) = 0;
+    virtual int DoStep(float time_interval, int iCaller) = 0;
+    virtual void StartStep(float time_interval) = 0; // must be called before DoStep
+    virtual void StepBack(float time_interval) = 0;
+
+    virtual void GetMemoryStatistics(ICrySizer* pSizer) const = 0;
+    // </interfuscator:shuffle>
+};
+
+
+/////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////// IPhysicsEventClient Interface //////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+
+struct IPhysicsEventClient   // obsolete, replaced with event system (EventPhys...)
+{   // <interfuscator:shuffle>
+    virtual ~IPhysicsEventClient(){}
+    virtual void OnBBoxOverlap(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, IPhysicalEntity* pCollider, void* pColliderForeignData, int iColliderForeignData) = 0;
+    virtual void OnStateChange(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, int iOldSimClass, int iNewSimClass) = 0;
+    virtual void OnCollision(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, coll_history_item* pCollision) = 0;
+    virtual int OnImpulse(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, pe_action_impulse* impulse) = 0;
+    virtual void OnPostStep(IPhysicalEntity* pEntity, PhysicsForeignData pForeignData, int iForeignData, float dt) = 0;
+    // </interfuscator:shuffle>
+};
+
+/////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////// IPhysicalWorld Interface //////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+
+enum draw_helper_flags
+{
+    pe_helper_collisions = 1, pe_helper_geometry = 2, pe_helper_bbox = 4, pe_helper_lattice = 8
+};
+enum surface_flags
+{
+    sf_pierceable_mask = 0x0F, sf_max_pierceable = 0x0F, sf_important = 0x200, sf_manually_breakable = 0x400, sf_matbreakable_bit = 16
+};
+#define sf_pierceability(i) (i)
+#define sf_matbreakable(i) (((i) + 1) << sf_matbreakable_bit)
+enum rwi_flags   // see RayWorldIntersection
+{
+    rwi_ignore_terrain_holes = 0x20, rwi_ignore_noncolliding = 0x40, rwi_ignore_back_faces = 0x80, rwi_ignore_solid_back_faces = 0x100,
+    rwi_pierceability_mask = 0x0F, rwi_pierceability0 = 0, rwi_stop_at_pierceable = 0x0F,
+    rwi_separate_important_hits = sf_important,   // among pierceble hits, materials with sf_important will have priority
+    rwi_colltype_bit = 16, // used to manually specify collision geometry types (default is geom_colltype_ray)
+    rwi_colltype_any = 0x400, // if several colltype flag are specified, switches between requiring all or any of them in a geometry
+    rwi_queue = 0x800, // queues the RWI request, when done it'll generate EventPhysRWIResult
+    rwi_force_pierceable_noncoll = 0x1000, // non-colliding geometries will be treated as pierceable regardless of the actual material
+    rwi_update_last_hit = 0x4000, // update phitLast with the current hit results (should be set if the last hit should be reused for a "warm" start)
+    rwi_any_hit = 0x8000 // returns the first found hit for meshes, not necessarily the closets
+};
+#define rwi_pierceability(pty) (pty)
+#define rwi_colltype_all(colltypes) ((colltypes) << rwi_colltype_bit)
+#define rwi_colltype_any(colltypes) ((colltypes) << rwi_colltype_bit | rwi_colltype_any)
+enum entity_query_flags   // see GetEntitiesInBox and RayWorldIntersection
+{
+    ent_static = 1, ent_sleeping_rigid = 2, ent_rigid = 4, ent_living = 8, ent_independent = 16, ent_deleted = 128, ent_terrain = 0x100,
+    ent_all = ent_static | ent_sleeping_rigid | ent_rigid | ent_living | ent_independent | ent_terrain,
+    ent_flagged_only = pef_update, ent_skip_flagged = pef_update * 2, // "flagged" meas has pef_update set
+    ent_areas = 32, ent_triggers = 64,
+    ent_ignore_noncolliding = 0x10000,
+    ent_sort_by_mass = 0x20000, // sort by mass in ascending order
+    ent_allocate_list = 0x40000, // if not set, the function will return an internal pointer
+    ent_addref_results = 0x100000, // will call AddRef on each entity in the list (expecting the caller call Release)
+    ent_water = 0x200, // can only be used in RayWorldIntersection
+    ent_no_ondemand_activation = 0x80000, // can only be used in RayWorldIntersection
+    ent_delayed_deformations = 0x80000 // queues procedural breakage requests; can only be used in SimulateExplosion
+};
+enum phys_locks
+{
+    PLOCK_WORLD_STEP = 1, PLOCK_CALLER0, PLOCK_CALLER1, PLOCK_QUEUE, PLOCK_AREAS
+};
+
+struct phys_profile_info
+{
+    IPhysicalEntity* pEntity;
+    int nTicks, nCalls;
+    int nTicksLast, nCallsLast;
+    int nTicksAvg;
+    float nCallsAvg;
+    int nTicksPeak, nCallsPeak, peakAge;
+    int nTicksStep;
+    int id;
+    const char* pName;
+};
+
+struct phys_job_info
+{
+    int jobType;
+    int nInvocations;
+    int nFallbacks;
+    int64 nTicks, nLatency, nLatencyAbs;
+    int64 nTicksPeak, nLatencyPeak, nLatencyAbsPeak, peakAge;
+    const char* pName;
+};
+
+struct SolverSettings
+{
+    int nMaxStackSizeMC;                            // def 8
+    float maxMassRatioMC;                           // def 50
+    int nMaxMCiters;                                    // def 1400
+    int nMinMCiters;                  // def 4
+    int nMaxMCitersHopeless;                    // def 400
+    float accuracyMC;                                   // def 0.005
+    float accuracyLCPCG;                            // def 0.005
+    int nMaxContacts;                                   // def 150
+    int nMaxPlaneContacts;            // def 7
+    int nMaxPlaneContactsDistress;      // def 4
+    int nMaxLCPCGsubiters;                      // def 120
+    int nMaxLCPCGsubitersFinal;             // def 250
+    int nMaxLCPCGmicroiters;
+    int nMaxLCPCGmicroitersFinal;
+    int nMaxLCPCGiters;                             // def 5
+    float minLCPCGimprovement;        // def 0.1
+    int nMaxLCPCGFruitlessIters;            // def 4
+    float accuracyLCPCGnoimprovement;   // def 0.05
+    float minSeparationSpeed;                   // def 0.02
+    float maxvCG;
+    float maxwCG;
+    float maxvUnproj;
+    int bCGUnprojVel;
+    float maxMCMassRatio;
+    float maxMCVel;
+    int maxLCPCGContacts;
+};
+
+enum entity_out_of_bounds_flags
+{
+    raycast_out_of_bounds = 1,        // Affects ray casts. NB, ray casting out of bounds entities can cause performance issues
+    get_entities_out_of_bounds = 2,   // Affects GetEntitiesAround.
+};
+
+struct PhysicsVars
+    : SolverSettings
+{
+    int bFlyMode;
+    int iCollisionMode;
+    int bSingleStepMode;
+    int bDoStep;
+    float fixedTimestep;
+    float timeGranularity;
+    float maxWorldStep;
+    int iDrawHelpers;
+    int iOutOfBounds;
+    float maxContactGap;
+    float maxContactGapPlayer;
+    float minBounceSpeed;
+    int bProhibitUnprojection;
+    int bUseDistanceContacts;
+    float unprojVelScale;
+    float maxUnprojVel;
+    float maxUnprojVelRope;
+    int bEnforceContacts;
+    int nMaxSubsteps;
+    int nMaxSurfaces;
+    Vec3 gravity;
+    int nGroupDamping;
+    float groupDamping;
+    int nMaxSubstepsLargeGroup;
+    int nBodiesLargeGroup;
+    int bBreakOnValidation;
+    int bLogActiveObjects;
+    int bProfileEntities;
+    int bProfileFunx;
+    int bProfileGroups;
+    int nGEBMaxCells;
+    int nMaxEntityCells;
+    int nMaxAreaCells;
+    float maxVel;
+    float maxVelPlayers;
+    float maxVelBones;
+    float maxContactGapSimple;
+    float penaltyScale;
+    int bSkipRedundantColldet;
+    int bLimitSimpleSolverEnergy;
+    int nMaxEntityContacts;
+    int bLogLatticeTension;
+    int nMaxLatticeIters;
+    int bLogStructureChanges;
+    float tickBreakable;
+    float approxCapsLen;
+    int nMaxApproxCaps;
+    int bPlayersCanBreak;
+    float lastTimeStep;
+    int bMultithreaded;
+    float breakImpulseScale;
+    float rtimeGranularity;
+    float massLimitDebris;
+    int flagsColliderDebris;
+    int flagsANDDebris;
+    int maxRopeColliderSize;
+    int maxSplashesPerObj;
+    float splashDist0, minSplashForce0, minSplashVel0;
+    float splashDist1, minSplashForce1, minSplashVel1;
+    int bDebugExplosions;
+    float jointGravityStep;
+    float   jointDmgAccum;
+    float   jointDmgAccumThresh;
+    float timeScalePlayers;
+    float threadLag;
+    int numThreads;
+    int physCPU;
+    int physWorkerCPU;
+    Vec3 helperOffset;
+    int64 ticksPerSecond;
+    // net-synchronization related
+#if USE_IMPROVED_RIGID_ENTITY_SYNCHRONISATION
+    float netInterpTime;
+    float netExtrapMaxTime;
+    int netSequenceFrequency;
+    int netDebugDraw;
+#else
+    float netMinSnapDist;
+    float netVelSnapMul;
+    float netMinSnapDot;
+    float netAngSnapMul;
+    float netSmoothTime;
+#endif
+
+    int bEntGridUseOBB;
+    int nStartupOverloadChecks;
+    float breakageMinAxisInertia;   // For procedural breaking, each axis must have a minium inertia compared to the axis with the largest inertia (0.01-1.00)
+
+    int bForceSyncPhysics;
+};
+
+struct ray_hit
+{
+    float dist;
+    IPhysicalEntity* pCollider;
+    int ipart;
+    int partid;
+    short surface_idx;
+    short idmatOrg; // original material index, not mapped with material mapping
+    int foreignIdx;
+    int iNode; // BV tree node that had the intersection; can be used for "warm start" next time
+    Vec3 pt;
+    Vec3 n; // surface normal
+    int bTerrain;   // global terrain hit
+    int iPrim; // hit triangle index
+    ray_hit* next; // reserved for internal use, do not change
+};
+
+struct ray_hit_cached   // used in conjunction with rwi_reuse_last_hit
+{
+    ray_hit_cached() { pCollider = 0; ipart = 0; }
+    ray_hit_cached(const ray_hit& hit) { pCollider = hit.pCollider; ipart = hit.ipart; iNode = hit.iNode; }
+    ray_hit_cached& operator=(const ray_hit& hit) { pCollider = hit.pCollider; ipart = hit.ipart; iNode = hit.iNode; return *this; }
+
+    IPhysicalEntity* pCollider;
+    int ipart;
+    int iNode;
+};
+
+#ifndef PWI_NAME_TAG
+#define PWI_NAME_TAG "PrimitiveWorldIntersection"
+#endif
+#ifndef RWI_NAME_TAG
+#define RWI_NAME_TAG "RayWorldIntersection"
+#endif
+
+struct pe_explosion     // see SimulateExplosion
+{
+    pe_explosion() { nOccRes = 0; nGrow = 0; rminOcc = 0.1f; holeSize = 0; explDir.Set(0, 0, 1); iholeType = 0; forceDeformEntities = false; }
+    Vec3 epicenter; // epicenter for the occlusion computation
+    Vec3 epicenterImp; // epicenter for impulse computation
+    // the impulse a surface fragment with area dS and normal n gets is: dS*k*n*max(0,n*dir_to_epicenter)/max(rmin, dist_to_epicenter)^2
+    // k is selected in such way that at impulsivePressureAtR = k/r^2
+    float rmin, rmax, r;
+    float impulsivePressureAtR;
+    int nOccRes; // resolution of the occlusion map (0 disables)
+    int nGrow; // grow occlusion projections by this amount of cells to allow explosion to reach around corners a bit
+    float rminOcc; // ignores geometry closer than this for occlusion computations
+    float holeSize; // explosion shape for iholeType will be scaled by this holeSize / shape's declared size
+    Vec3 explDir;   // hit direction, for aligning the explosion boolean shape
+    int iholeType; // breakability index for the explosion (<0 disables)
+    bool forceDeformEntities; // force deformation even if breakImpulseScale is zero
+    // filled as results
+    IPhysicalEntity** pAffectedEnts;
+    float* pAffectedEntsExposure;   // 0..1 exposure, computed from the occlusion map
+    int nAffectedEnts;
+};
+
+// Physics events can be logged or immediate. The former are posted to the event queue and the client handler is called
+// during PumpLoggedEvents function. The latter are call client handlers immediately when they happen, which is likely
+// to be inside the physics thread, so the handler must be thread-safe.
+// In most cases, in order to generate events the entity must have the corresponding flag set
+// Important Note: Please keep event ids contigous in respect to being stereo or mono events
+struct EventPhys
+{
+    EventPhys* next;
+    int idval;
+};
+
+struct EventPhysStereo
+    : EventPhys                      // base for two-entity events, ids 0-2
+{
+    IPhysicalEntity* pEntity[2];
+    PhysicsForeignData pForeignData[2];
+    int iForeignData[2];
+};
+
+struct EventPhysMono
+    : EventPhys                    // base for one-entity events, ids 3-16
+{
+    IPhysicalEntity* pEntity;
+    PhysicsForeignData pForeignData;
+    int iForeignData;
+};
+
+struct EventPhysBBoxOverlap
+    : EventPhysStereo                           // generated by triggers and parts with geom_log_interactions
+{
+    enum entype
+    {
+        id = 0, flagsCall = 0, flagsLog = 0
+    };
+    EventPhysBBoxOverlap() { idval = id; }
+};
+
+enum EventPhysCollisionState
+{
+    EPC_DEFERRED_INITIAL, EPC_DEFERRED_REQUEUE, EPC_DEFERRED_FINISHED
+};
+
+struct EventPhysCollision
+    : EventPhysStereo
+{
+    enum entype
+    {
+        id = 2, flagsCall = pef_monitor_collisions, flagsLog = pef_log_collisions
+    };
+    EventPhysCollision() { idval = id; pEntContact = 0; iPrim[0] = iPrim[1] = -1; deferredState = EPC_DEFERRED_INITIAL; fDecalPlacementTestMaxSize = 1000.f; }
+    int idCollider; // in addition to pEntity[1]
+    Vec3 pt; // contact point in world coordinates
+    Vec3 n; // contact normal
+    Vec3 vloc[2];   // velocities at the contact point
+    float mass[2];
+    int partid[2];
+    short idmat[2];
+    short iPrim[2];
+    float penetration; // contact's penetration depth
+    float normImpulse; // impulse applied by the solver to resolve the collision
+    float radius;   // some characteristic size of the contact area
+    void* pEntContact; // reserved for internal use
+    char deferredState; // EventPhysCollisionState
+    char deferredResult; // stores the result returned by the deferred event
+    float fDecalPlacementTestMaxSize; // maximum allowed size of decals caused by this collision
+};
+
+struct EventPhysStateChange
+    : EventPhysMono                             // triggered by simclass changes, even those caused by SetParams
+{
+    enum entype
+    {
+        id = 8, flagsCall = pef_monitor_state_changes, flagsLog = pef_log_state_changes
+    };
+    EventPhysStateChange() { idval = id; }
+    int iSimClass[2];
+    float timeIdle; // how long the entity stayed without external activation (such as impulses)
+    Vec3 BBoxOld[2];
+    Vec3 BBoxNew[2];
+};
+
+struct EventPhysEnvChange
+    : EventPhysMono                         // called when something around the entityy breaks
+{
+    enum entype
+    {
+        id = 3, flagsCall = pef_monitor_env_changes, flagsLog = pef_log_env_changes
+    };
+    enum encode
+    {
+        EntStructureChange = 0
+    };
+    EventPhysEnvChange() { idval = id; }
+    int iCode;
+    IPhysicalEntity* pentSrc;   // entity that broke
+    IPhysicalEntity* pentNew;   // new entity that broke off the original one
+};
+
+struct EventPhysPostStep
+    : EventPhysMono                        // entity has just completed its step
+{
+    enum entype
+    {
+        id = 4, flagsCall = pef_monitor_poststep, flagsLog = pef_log_poststep
+    };
+    EventPhysPostStep() { idval = id; }
+    float dt;
+    Vec3 pos;
+    quaternionf q;
+    int idStep; // world's internal step count
+};
+
+struct EventPhysUpdateMesh
+    : EventPhysMono                          // physics mesh changed
+{
+    enum entype
+    {
+        id = 5, flagsCall = 1, flagsLog = 2
+    };
+    enum reason
+    {
+        ReasonExplosion, ReasonFracture, ReasonRequest, ReasonDeform
+    };
+    EventPhysUpdateMesh() { idval = id; idx = -1; pMesh = 0; }
+    int partid;
+    int bInvalid;
+    int iReason; // see enum reason
+    IGeometry* pMesh;   // ->GetForeignData(DATA_MESHUPDATE) returns a list of bop_meshupdates
+    bop_meshupdate* pLastUpdate; // the last mesh update for at moment when the event was generated
+    Matrix34 mtxSkelToMesh; // skeleton's frame -> mesh's frame transform
+    IGeometry* pMeshSkel;   // for deformable bodies
+    int idx; // used for event deferring by listeners
+};
+
+struct EventPhysCreateEntityPart
+    : EventPhysMono                                // a part broke off an existing entity
+{
+    enum entype
+    {
+        id = 6, flagsCall = 1, flagsLog = 2
+    };
+    enum reason
+    {
+        ReasonMeshSplit, ReasonJointsBroken
+    };
+    EventPhysCreateEntityPart() { idval = id; idx = -1; }
+    IPhysicalEntity* pEntNew;   // new physical entity (has type PE_RIGID)
+    int partidSrc; // original part id
+    int partidNew; // part id assigned to it in the new entity
+    int nTotParts; // total number of parts that broke off during this update (each will have its own event)
+    int bInvalid; // generated mesh was invalid (degenerate or flipped)
+    int iReason;
+    Vec3 breakImpulse; // impulse that initiated the breaking
+    Vec3 breakAngImpulse;
+    Vec3 v; // initial vel of ejected product
+    Vec3 w; // initial ang vel of ejected product
+    float breakSize; // if caused by an explosion, the explosion's rmin
+    float cutRadius; // if updated mesh was successfully approximated with capsules, this is their cross section at the point of breakage
+    Vec3 cutPtLoc[2];   // the cut's center in both entities' frames
+    Vec3 cutDirLoc[2]; // the cut area's normal
+    IGeometry* pMeshNew; // new mesh if was caused by boolean breaking, 0 if by joint breaking (i.e. no new mesh was created)
+    bop_meshupdate* pLastUpdate; // last meshupdate for the moment the event was reported
+    int idx; // used for event deferring by listeners
+};
+
+struct EventPhysRemoveEntityParts
+    : EventPhysMono
+{
+    enum entype
+    {
+        id = 7, flagsCall = 1, flagsLog = 2
+    };
+    EventPhysRemoveEntityParts() { idval = id; idOffs = 0; }
+    unsigned int partIds[4]; // remove parts with ids corresponding to the set bits in partIds[], +idOffs
+    int idOffs;
+    float massOrg; // entity's mass before the parts were removed
+};
+
+struct EventPhysRevealEntityPart
+    : EventPhysMono
+{
+    enum entype
+    {
+        id = 13, flagsCall = 1, flagsLog = 2
+    };
+    EventPhysRevealEntityPart() { idval = id; }
+    int partId; // id of a part that was hidden due to hierarchical breakability, but should be revealed now
+};
+
+struct EventPhysJointBroken
+    : EventPhysStereo
+{
+    enum entype
+    {
+        id = 1, flagsCall = 1, flagsLog = 2
+    };
+    EventPhysJointBroken() { idval = id; }
+    int idJoint;
+    int bJoint; // structural joint if 1, dynamics constraint if 0
+    int partidEpicenter; // the "seed" part during the update
+    Vec3 pt; // joint's position in the entity frame
+    Vec3 n; // joint's z axis
+    int partid[2];
+    int partmat[2]; // material id from the parts' first primitive
+    IPhysicalEntity* pNewEntity[2]; // only set for broken constraints
+};
+
+struct EventPhysRWIResult
+    : EventPhysMono
+{
+    enum entype
+    {
+        id = 9, flagsCall = 0, flagsLog = 0
+    };
+    EventPhysRWIResult() { idval = id; }
+    int (* OnEvent)(const EventPhysRWIResult*);
+    ray_hit* pHits;
+    int nHits, nMaxHits;
+    int bHitsFromPool; // 1 if hits reside in the internal physics hits pool
+};
+
+struct EventPhysPWIResult
+    : EventPhysMono
+{
+    enum entype
+    {
+        id = 10, flagsCall = 0, flagsLog = 0
+    };
+    EventPhysPWIResult() { idval = id; }
+    int (* OnEvent)(const EventPhysPWIResult*);
+    float dist;
+    Vec3 pt;
+    Vec3 n;
+    int idxMat;
+    int partId;
+};
+
+struct EventPhysArea
+    : EventPhysMono                    // for callback phys areas
+{
+    enum entype
+    {
+        id = 11, flagsCall = 0, flagsLog = 0
+    };
+    EventPhysArea() { idval = id; }
+
+    Vec3 pt; // entity's center
+    Vec3 ptref; // for splines - closest point on spline to pt; for normal areas - area's world position
+    Vec3 dirref; // for splines, calculated force direction
+    pe_params_buoyancy pb; // can be filled by the caller
+    Vec3 gravity;   // can be filled by the caller
+    IPhysicalEntity* pent; // the entity that entered the area and caused this event
+};
+
+struct EventPhysAreaChange
+    : EventPhysMono
+{
+    enum entype
+    {
+        id = 12, flagsCall = 0, flagsLog = 0
+    };
+    EventPhysAreaChange() { idval = id; pContainer = 0; }
+
+    Vec3 boxAffected[2];
+    quaternion q;
+    Vec3 pos;
+    float depth;
+    IPhysicalEntity* pContainer;
+    quaternion qContainer;
+    Vec3 posContainer;
+};
+
+struct EventPhysEntityDeleted
+    : EventPhysMono
+{
+    enum entype
+    {
+        id = 14, flagsCall = 0, flagsLog = 0
+    };
+    EventPhysEntityDeleted() { idval = id; }
+    int mode;
+};
+
+struct EventPhysPostPump
+    : EventPhys
+{
+    enum entype
+    {
+        id = 15, flagsCall = 0, flagsLog = 0
+    };
+    EventPhysPostPump() { idval = id; }
+};
+
+const int EVENT_TYPES_NUM = 16;
+
+// Physical entity iterator interface. This interface is used to traverse trough all the physical entities in an physical world. In a way,
+//  this iterator works a lot like a stl iterator.
+struct IPhysicalEntityIt
+{
+    // <interfuscator:shuffle>
+    virtual ~IPhysicalEntityIt(){}
+    virtual void AddRef() = 0;
+    virtual void Release() = 0; // Deletes this iterator and frees any memory it might have allocated.
+
+    virtual bool IsEnd() = 0;   // Check whether current iterator position is the end position.
+    virtual IPhysicalEntity* Next() = 0; // returns the entity that the iterator points to before it goes to the next
+    virtual IPhysicalEntity* This() = 0; // returns the entity that the iterator points to
+    virtual void MoveFirst() = 0;   // positions the iterator at the begining of the entity list
+    // </interfuscator:shuffle>
+};
+
+
+
+#endif // CRYINCLUDE_CRYCOMMON_PHYSINTERFACE_H
diff --git a/Code/Legacy/CryCommon/platform.h b/Code/Legacy/CryCommon/platform.h
new file mode 100644
index 0000000000..51433da1d4
--- /dev/null
+++ b/Code/Legacy/CryCommon/platform.h
@@ -0,0 +1,816 @@
+/*
+ * 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 : Platform dependend stuff.
+//               Include this file instead of windows h
+
+#pragma once
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define PLATFORM_H_SECTION_1 1
+#define PLATFORM_H_SECTION_2 2
+#define PLATFORM_H_SECTION_3 3
+#define PLATFORM_H_SECTION_4 4
+#define PLATFORM_H_SECTION_5 5
+#define PLATFORM_H_SECTION_6 6
+#define PLATFORM_H_SECTION_7 7
+#define PLATFORM_H_SECTION_8 8
+#define PLATFORM_H_SECTION_9 9
+#define PLATFORM_H_SECTION_10 10
+#define PLATFORM_H_SECTION_11 11
+#define PLATFORM_H_SECTION_12 12
+#define PLATFORM_H_SECTION_13 13
+#define PLATFORM_H_SECTION_14 14
+#define PLATFORM_H_SECTION_15 15
+#endif
+
+// certain C++ features are not available in some compiler versions
+// turn them off here:
+// #define _ALLOW_KEYWORD_MACROS
+// #define _DISALLOW_INITIALIZER_LISTS
+// #define _DISALLOW_ENUM_CLASS
+
+#if defined(_MSC_VER)
+    #define _ALLOW_KEYWORD_MACROS
+
+    #define alignof _alignof
+    #if !defined(_HAS_EXCEPTIONS)
+        #define _HAS_EXCEPTIONS 0
+    #endif
+#elif defined(__GNUC__)
+    #define alignof __alignof__
+#endif
+
+// Alignment|InitializerList support.
+#define _ALLOW_INITIALIZER_LISTS
+
+#if (defined(LINUX) && !defined(ANDROID)) || defined(APPLE)
+#define _FILE_OFFSET_BITS 64 // define large file support > 2GB
+#endif
+
+#include <AzCore/PlatformIncl.h>
+
+#include <cstring>
+
+#if defined(_MSC_VER) // We want the class name to be included, but __FUNCTION__ doesn't contain that on GCC/clang
+    #define __FUNC__ __FUNCTION__
+#else
+    #define __FUNC__ __PRETTY_FUNCTION__
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_1
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(_DEBUG) && !defined(LINUX) && !defined(APPLE)
+    #include <crtdbg.h>
+#endif
+
+#define RESTRICT_POINTER __restrict
+
+// we have to use it because of VS doesn't support restrict reference variables
+#if defined(APPLE) || defined(LINUX)
+    #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+        #define GCC411_OR_LATER
+    #endif
+    #define RESTRICT_REFERENCE __restrict
+#else
+    #define RESTRICT_REFERENCE
+#endif
+
+
+#ifndef CHECK_REFERENCE_COUNTS //define that in your StdAfx.h to override per-project
+# define CHECK_REFERENCE_COUNTS 0 //default value
+#endif
+
+#if CHECK_REFERENCE_COUNTS
+# define CHECK_REFCOUNT_CRASH(x) { if (!(x)) {*((int*)0) = 0; } \
+}
+#else
+# define CHECK_REFCOUNT_CRASH(x)
+#endif
+
+#ifndef GARBAGE_MEMORY_ON_FREE //define that in your StdAfx.h to override per-project
+# define GARBAGE_MEMORY_ON_FREE 0 //default value
+#endif
+
+#if GARBAGE_MEMORY_ON_FREE
+# ifndef GARBAGE_MEMORY_RANDOM          //define that in your StdAfx.h to override per-project
+#  define GARBAGE_MEMORY_RANDOM 1   //0 to change it to progressive pattern
+# endif
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// Available predefined compiler macros for Visual C++.
+//      _MSC_VER                                        // Indicates MS Visual C compiler version
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_2
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+//      _WIN32, _WIN64       // Indicates target OS
+#endif
+//      _M_IX86, _M_PPC                         // Indicates target processor
+//      _DEBUG                                          // Building in Debug mode
+//      _DLL                                                // Linking with DLL runtime libs
+//      _MT                                                 // Linking with multi-threaded runtime libs
+//////////////////////////////////////////////////////////////////////////
+
+//
+// Translate some predefined macros.
+//
+
+// NDEBUG disables std asserts, etc.
+// Define it automatically if not compiling with Debug libs, or with ADEBUG flag.
+#if !defined(_DEBUG) && !defined(ADEBUG) && !defined(NDEBUG)
+    #define NDEBUG
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_3
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(MOBILE)
+    #define CONSOLE
+#endif
+
+//render thread settings, as this is accessed inside 3dengine and renderer and needs to be compile time defined, we need to do it here
+//enable this macro to strip out the overhead for render thread
+//  #define STRIP_RENDER_THREAD
+#ifdef STRIP_RENDER_THREAD
+    #define RT_COMMAND_BUF_COUNT 1
+#else
+//can be enhanced to triple buffering, FlushFrame needs to be adjusted and RenderObj would become 132 bytes
+    #define RT_COMMAND_BUF_COUNT 2
+#endif
+
+
+// We use WIN macros without _.
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_4
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+#if defined(_WIN32) && !defined(LINUX32) && !defined(LINUX64) && !defined(APPLE) && !defined(WIN32)
+    #define WIN32
+#endif
+#if defined(_WIN64) && !defined(WIN64)
+    #define WIN64
+#endif
+#endif
+
+// In Win32 Release we use static linkage
+#ifdef WIN32
+    #if !defined(_RELEASE) || defined(RESOURCE_COMPILER) || defined(EDITOR) || defined(_FORCEDLL)
+// All windows targets not in Release built as DLLs.
+        #ifndef _USRDLL
+            #define _USRDLL
+        #endif
+    #endif
+
+#endif //WIN32
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_5
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(LINUX) || defined(APPLE)
+    #define __STDC_FORMAT_MACROS
+    #include <inttypes.h>
+    #if defined(APPLE) || defined(LINUX64)
+    // int64 is not the same type as the operating system's int64_t
+        #undef PRIX64
+        #undef PRIx64
+        #undef PRId64
+        #undef PRIu64
+        #define PRIX64 "llX"
+        #define PRIx64 "llx"
+        #define PRId64 "lld"
+        #define PRIu64 "llu"
+    #endif
+    #define PLATFORM_I64(x) x##ll
+#else
+    #include <inttypes.h>
+    #define PLATFORM_I64(x) x##i64
+#endif
+
+#if !defined(PRISIZE_T)
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_6
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+    #elif defined(WIN64)
+        #define PRISIZE_T "I64u" //size_t defined as unsigned __int64
+    #elif defined(WIN32) || defined(LINUX32)
+        #define PRISIZE_T "u"
+    #elif defined(MAC) || defined(LINUX64) || defined(IOS)
+        #define PRISIZE_T "lu"
+    #else
+        #error "Please defined PRISIZE_T for this platform"
+    #endif
+#endif
+#if !defined(PRI_THREADID)
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_7
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+    #elif defined(MAC) || defined(IOS) && defined(__LP64__) && defined(__LP64__)
+        #define PRI_THREADID "lld"
+    #elif defined(LINUX64) || defined(ANDROID)
+        #define PRI_THREADID "ld"
+    #else
+        #define PRI_THREADID "d"
+    #endif
+#endif
+#include "ProjectDefines.h"                         // to get some defines available in every CryEngine project
+
+// Function attribute for printf/scanf-style parameters.
+// This enables extended argument checking by GCC.
+//
+// Usage:
+// Put this after the function or method declaration (not the definition!),
+// between the final closing parenthesis and the semicolon.
+// The first parameter indicates the 1-based index of the format string
+// parameter, the second parameter indicates the 1-based index of the first
+// variable parameter.  Example:
+//   void foobar(int a, const char *fmt, ...) PRINTF_PARAMS(2, 3);
+//
+// For va_list based printf style functions, specfy 0 as the second parameter.
+// Example:
+//   void foobarv(int a, const char *fmt, va_list ap) PRINTF_PARAMS(2, 0);
+//
+// Note that 'this' is counted as a method argument. For non-static methods,
+// add 1 to the indices.
+//
+// Use PRINTF_EMPTY_STRING when you want to format an empty string using
+// a function defined with PRINTF_PARAMS to avoid zero length format string
+// warnings when these checks are enabled.
+
+#if defined(__GNUC__) && !defined(_RELEASE)
+  #define PRINTF_PARAMS(...) __attribute__ ((format (printf, __VA_ARGS__)))
+  #define SCANF_PARAMS(...) __attribute__ ((format (scanf, __VA_ARGS__)))
+  #define PRINTF_EMPTY_FORMAT "%s", ""
+#else
+  #define PRINTF_PARAMS(...)
+    #define SCANF_PARAMS(...)
+  #define PRINTF_EMPTY_FORMAT ""
+#endif
+
+#if defined(IOS)
+#define USE_PTHREAD_TLS
+#endif
+
+// Storage class modifier for thread local storage.
+// THEADLOCAL should NOT be defined to empty because that creates some
+// really hard to find issues.
+#if !defined(USE_PTHREAD_TLS)
+#   define THREADLOCAL AZ_TRAIT_COMPILER_THREAD_LOCAL
+#endif //!defined(USE_PTHREAD_TLS)
+
+
+
+//////////////////////////////////////////////////////////////////////////
+// define Read Write Barrier macro needed for lockless programming
+//////////////////////////////////////////////////////////////////////////
+#if   defined(__arm__)
+/**
+ * (ARMv7) Full memory barriar.
+ *
+ * None of GCC 4.6/4.8 or clang 3.3/3.4 have a builtin intrinsic for ARM's ldrex/strex or dmb
+ * instructions.  This is a placeholder until supplied by the toolchain.
+ */
+inline void  __dmb()
+{
+    // The linux kernel uses "dmb ish" to only sync with local monitor (arch/arm/include/asm/barrier.h):
+    //#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")
+    //#define smp_mb()        dmb(ish)
+    __asm__ __volatile__ ("dmb ish" : : : "memory");
+}
+
+#define READ_WRITE_BARRIER {__dmb(); }
+#else
+    #define READ_WRITE_BARRIER
+#endif
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// define macro to prevent memory reoderings of reads/and writes
+//TODO implement for all GCC platforms, else there are potential crashes with strict aliasing
+    #define MEMORY_RW_REORDERING_BARRIER do { /*not implemented*/} while (0)
+
+//default stack size for threads, currently only used on pthread platforms
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_8
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(LINUX) || defined(APPLE)
+    #if !defined(_DEBUG)
+        #define SIMPLE_THREAD_STACK_SIZE_KB (256)
+    #else
+        #define SIMPLE_THREAD_STACK_SIZE_KB (256 * 4)
+    #endif
+#else
+    #define SIMPLE_THREAD_STACK_SIZE_KB (32)
+#endif
+
+#include <AzCore/PlatformDef.h>
+
+#if defined(AZ_MONOLITHIC_BUILD)
+    #define DLL_EXPORT
+    #define DLL_IMPORT
+#else // AZ_MONOLITHIC_BUILD
+    #define DLL_EXPORT AZ_DLL_EXPORT
+    #define DLL_IMPORT AZ_DLL_IMPORT
+#endif // AZ_MONOLITHIC_BUILD
+
+
+//////////////////////////////////////////////////////////////////////////
+// Define BIT macro for use in enums and bit masks.
+#define BIT(x) (1 << (x))
+#define BIT64(x) (1ll << (x))
+#define TYPED_BIT(type, x) (type(1) << (x))
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Help message, all help text in code must be wrapped in this define.
+// Only include these in non RELEASE builds
+#if !defined(_RELEASE)
+    #define _HELP(x) x
+#else
+    #define _HELP(x) ""
+#endif
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// Globally Used Defines.
+//////////////////////////////////////////////////////////////////////////
+// CPU Types: _CPU_X86,_CPU_AMD64,_CPU_G5
+// Platform: WIN23,WIN64,LINUX32,LINUX64,MAC
+// CPU supported functionality: _CPU_SSE
+//////////////////////////////////////////////////////////////////////////
+
+
+  #if defined(_MSC_VER)
+    #define PREFAST_SUPPRESS_WARNING(W) __pragma(warning(suppress: W))
+  #else
+    #define PREFAST_SUPPRESS_WARNING(W)
+  #endif
+
+#ifdef _PREFAST_
+#   define PREFAST_ASSUME(cond) __analysis_assume(cond)
+#else
+#   define PREFAST_ASSUME(cond)
+#endif
+
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_9
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    #if defined(WIN32) && !defined(WIN64)
+        #include "Win32specific.h"
+    #endif
+
+    #if defined(WIN64)
+        #include "Win64specific.h"
+    #endif
+#endif
+
+#if defined(LINUX64) && !defined(ANDROID)
+#include "Linux64Specific.h"
+#endif
+
+#if defined(LINUX32) && !defined(ANDROID)
+#include "Linux32Specific.h"
+#endif
+
+#if defined(ANDROID)
+#include "AndroidSpecific.h"
+#endif
+
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_10
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+
+#if defined(MAC)
+#include "MacSpecific.h"
+#endif
+
+#if defined(IOS)
+#include "iOSSpecific.h"
+#endif
+
+
+#if !defined(TARGET_DEFAULT_ALIGN)
+# error "No default alignment specified for target architecture"
+#endif
+
+// Indicates potentially dangerous cast on 64bit machines
+typedef UINT_PTR TRUNCATE_PTR;
+typedef UINT_PTR EXPAND_PTR;
+
+// Use static branch prediction to improve the generated assembly when possible.
+// This feature has an indirect effect on runtime performance, as it ensures assembly code
+// which is more likely needed (the programmer has to decide this), is directly after the if
+//
+// For reference, as far as i am aware, all compilers use the following heuristic for static branch prediction
+// if branches are always taken
+// forward jumps are not taken
+// backwards jumps are taken (eg. jumping back to the beginning of a loop)
+#if defined(__clang__) || defined(__GNUC__)
+#   define IF(condition, hint)          if (__builtin_expect(!!(condition), hint))
+#   define WHILE(condition, hint)   while (__builtin_expect(!!(condition), hint))
+#   define IF_UNLIKELY(condition)   if (__builtin_expect(!!(condition), 0))
+#   define IF_LIKELY(condition)     if (__builtin_expect(!!(condition), 1))
+#else
+// Fallback for compilers which don't support static branch prediction (like MSVC)
+#   define IF(condition, hint)          if ((condition))
+#   define WHILE(condition, hint)   while ((condition))
+#   define IF_UNLIKELY(condition)   if ((condition))
+#   define IF_LIKELY(condition)     if ((condition))
+#endif // !defined(__clang__) || defined(__GNUC__)
+
+#include <stdio.h>
+
+
+//////////////////////////////////////////////////////////////////////////
+// Provide special cast function which mirrors C++ style casts to support aliasing correct type punning casts in gcc with strict-aliasing enabled
+template<typename DestinationType, typename SourceType>
+ILINE DestinationType alias_cast(SourceType pPtr)
+{
+    union
+    {
+        SourceType pSrc;
+        DestinationType pDst;
+    } conv_union;
+    conv_union.pSrc = pPtr;
+    return conv_union.pDst;
+}
+
+#include "CryLegacyAllocator.h"
+
+//////////////////////////////////////////////////////////////////////////
+#ifndef DEPRECATED
+#define DEPRECATED
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// compile time error stuff
+//////////////////////////////////////////////////////////////////////////
+#undef STATIC_CHECK
+#define STATIC_CHECK(expr, msg) static_assert(expr, #msg)
+
+// Assert dialog box macros
+#include "CryAssert.h"
+
+// Replace standard assert calls by our custom one
+// Works only ifdef USE_CRY_ASSERT && _DEBUG && WIN32
+#ifndef assert
+#define assert CRY_ASSERT
+#endif
+
+#include "CompileTimeAssert.h"
+//////////////////////////////////////////////////////////////////////////
+// Platform dependent functions that emulate Win32 API.
+// Mostly used only for debugging!
+//////////////////////////////////////////////////////////////////////////
+void   CryDebugBreak();
+void   CrySleep(unsigned int dwMilliseconds);
+void   CryLowLatencySleep(unsigned int dwMilliseconds);
+int    CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType);
+short  CryGetAsyncKeyState(int vKey);
+unsigned int CryGetFileAttributes(const char* lpFileName);
+
+inline void CryHeapCheck()
+{
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_11
+    #include AZ_RESTRICTED_FILE(platform_h)
+#elif !defined(LINUX) && !defined(APPLE) // todo: this might be readded with later xdks?
+#if !defined(NDEBUG)
+    int Result =
+#endif
+        _heapchk();
+    assert(Result != _HEAPBADBEGIN);
+    assert(Result != _HEAPBADNODE);
+    assert(Result != _HEAPBADPTR);
+    assert(Result != _HEAPEMPTY);
+    assert(Result == _HEAPOK);
+#endif
+}
+
+//---------------------------------------------------------------------------
+// Useful function to clean the structure.
+template <class T>
+inline void ZeroStruct(T& t)
+{ memset(static_cast<void*>(&t), 0, sizeof(t)); }
+
+// Useful functions to init and destroy objects.
+template<class T>
+inline void Construct(T& t)
+{ new(&t)T(); }
+
+template<class T, class U>
+inline void Construct(T& t, U const& u)
+{   new(&t)T(u); }
+
+template<class T>
+inline void Destruct(T& t)
+{ t.~T(); }
+
+// Cast one type to another, asserting there is no conversion loss.
+// Usage: DestType dest = check_cast<DestType>(src);
+template<class D, class S>
+inline D check_cast(S const& s)
+{
+    D d = D(s);
+    assert(S(d) == s);
+    return d;
+}
+
+// Convert one type to another, asserting there is no conversion loss.
+// Usage: DestType dest;  check_convert(dest, src);
+template<class D, class S>
+inline D& check_convert(D& d, S const& s)
+{
+    d = D(s);
+    assert(S(d) == s);
+    return d;
+}
+
+// Convert one type to another, asserting there is no conversion loss.
+// Usage: DestType dest;  check_convert(dest) = src;
+template<class D>
+struct CheckConvert
+{
+    CheckConvert(D& d)
+        : dest(&d) {}
+
+    template<class S>
+    D& operator=(S const& s)
+    {
+        return check_convert(*dest, s);
+    }
+
+protected:
+    D*  dest;
+};
+
+template<class D>
+inline CheckConvert<D> check_convert(D& d)
+{
+    return d;
+}
+
+//---------------------------------------------------------------------------
+// Use NoCopy as a base class to easily prevent copy init & assign for any class.
+struct NoCopy
+{
+    NoCopy() {}
+private:
+    NoCopy(const NoCopy&);
+    NoCopy& operator =(const NoCopy&);
+};
+
+//---------------------------------------------------------------------------
+// ZeroInit: base class to zero the memory of the derived class before initialization, so local objects initialize the same as static.
+// Usage:
+//      class MyClass: ZeroInit<MyClass> {...}
+//      class MyChild: public MyClass, ZeroInit<MyChild> {...}      // ZeroInit must be the last base class
+
+template<class TDerived>
+struct ZeroInit
+{
+#if defined(__clang__) || defined(__GNUC__)
+    bool __dummy;                           // Dummy var to create non-zero size, ensuring proper placement in TDerived
+#endif
+
+    ZeroInit(bool bZero = true)
+    {
+        // Optional bool arg to selectively disable zeroing.
+        if (bZero)
+        {
+            // Infer offset of this base class by static casting to derived class.
+            // Zero only the additional memory of the derived class.
+            TDerived* struct_end = static_cast<TDerived*>(this) + 1;
+            size_t memory_size = (char*)struct_end - (char*)this;
+            memset(this, 0, memory_size);
+        }
+    }
+};
+
+//---------------------------------------------------------------------------
+// Quick const-manipulation macros
+
+// Declare a const and variable version of a function simultaneously.
+#define CONST_VAR_FUNCTION(head, body) \
+    inline head body                   \
+    inline const head const body
+
+template<class T>
+inline
+T& non_const(const T& t)
+{ return const_cast<T&>(t); }
+
+#define using_type(super, type) \
+    typedef typename super::type type;
+
+typedef unsigned char   uchar;
+typedef unsigned int uint;
+typedef const char* cstr;
+
+//---------------------------------------------------------------------------
+// Align function works on integer or pointer values.
+// Only support power-of-two alignment.
+template<typename T>
+inline
+T Align(T nData, size_t nAlign)
+{
+    assert((nAlign & (nAlign - 1)) == 0);
+    size_t size = ((size_t)nData + (nAlign - 1)) & ~(nAlign - 1);
+    return T(size);
+}
+
+template<typename T>
+inline
+bool IsAligned(T nData, size_t nAlign)
+{
+    assert((nAlign & (nAlign - 1)) == 0);
+    return (size_t(nData) & (nAlign - 1)) == 0;
+}
+
+template<typename T, typename U>
+inline
+void SetFlags(T& dest, U flags, bool b)
+{
+    if (b)
+    {
+        dest |= flags;
+    }
+    else
+    {
+        dest &= ~flags;
+    }
+}
+
+// Wrapper code for non-windows builds.
+#if defined(LINUX) || defined(APPLE)
+    #include "Linux_Win32Wrapper.h"
+#elif defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_12
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+
+// Platform wrappers must be included before CryString.h
+#   include "CryString.h"
+
+// Include support for meta-type data.
+#include "TypeInfo_decl.h"
+
+// Include array.
+#include <CryArray.h>
+
+bool   CrySetFileAttributes(const char* lpFileName, uint32 dwFileAttributes);
+threadID CryGetCurrentThreadId();
+
+#if !defined(NOT_USE_CRY_STRING)
+// Fixed-Sized (stack based string)
+// put after the platform wrappers because of missing wcsicmp/wcsnicmp functions
+    #include "CryFixedString.h"
+#endif
+
+// need this in a common header file and any other file would be too misleading
+enum ETriState
+{
+    eTS_false,
+    eTS_true,
+    eTS_maybe
+};
+
+    #ifdef __GNUC__
+        #define NO_INLINE __attribute__ ((noinline))
+#   define NO_INLINE_WEAK __attribute__ ((noinline)) __attribute__((weak)) // marks a function as no_inline, but also as weak to prevent multiple-defined errors
+
+#   define __PACKED __attribute__ ((packed))
+    #else
+        #define NO_INLINE _declspec(noinline)
+#   define NO_INLINE_WEAK _declspec(noinline) inline
+
+#   define __PACKED
+    #endif
+
+// Fallback for Alignment macro of GCC/CLANG (must be after the class definition)
+#if !defined(_ALIGN)
+        #define _ALIGN(num) AZ_POP_DISABLE_WARNING
+#endif
+
+// Fallback for Alignment macro of MSVC (must be before the class definition)
+#if !defined(_MS_ALIGN)
+        #define _MS_ALIGN(num) AZ_PUSH_DISABLE_WARNING(4324, "-Wunknown-warning-option")
+#endif
+
+#if defined(WIN32) || defined(WIN64)
+extern "C" {
+__declspec(dllimport) unsigned long __stdcall TlsAlloc();
+__declspec(dllimport) void* __stdcall TlsGetValue(unsigned long dwTlsIndex);
+__declspec(dllimport) int __stdcall TlsSetValue(unsigned long dwTlsIndex, void* lpTlsValue);
+}
+
+    #define TLS_DECLARE(type, var) extern int var##idx;
+    #define TLS_DEFINE(type, var)              \
+    int var##idx;                              \
+    struct Init##var {                         \
+        Init##var() { var##idx = TlsAlloc(); } \
+    };                                         \
+    Init##var g_init##var;
+    #define TLS_DEFINE_DEFAULT_VALUE(type, var, value)                                \
+    int var##idx;                                                                     \
+    struct Init##var {                                                                \
+        Init##var() { var##idx = TlsAlloc(); TlsSetValue(var##idx, reinterpret_cast<void*>(value)); } \
+    };                                                                                \
+    Init##var g_init##var;
+    #define TLS_GET(type, var) (type)TlsGetValue(var##idx)
+    #define TLS_SET(var, val) TlsSetValue(var##idx, reinterpret_cast<void*>(val))
+#elif defined(USE_PTHREAD_TLS)
+    #define TLS_DECLARE(_TYPE, _VAR) extern SCryPthreadTLS<_TYPE> _VAR##TLSKey;
+    #define TLS_DEFINE(_TYPE, _VAR) SCryPthreadTLS<_TYPE> _VAR##TLSKey;
+    #define TLS_DEFINE_DEFAULT_VALUE(_TYPE, _VAR, _DEFAULT) SCryPthreadTLS<_TYPE> _VAR##TLSKey = _DEFAULT;
+    #define TLS_GET(_TYPE, _VAR) _VAR##TLSKey.Get()
+    #define TLS_SET(_VAR, _VALUE) _VAR##TLSKey.Set(_VALUE)
+#elif defined(THREADLOCAL)
+    #define TLS_DECLARE(type, var) extern THREADLOCAL type var;
+#if defined(LINUX) || defined(MAC)
+    #define TLS_DEFINE(type, var) THREADLOCAL type var = 0;
+#else
+    #define TLS_DEFINE(type, var) THREADLOCAL type var;
+#endif // defined(LINUX) || defined(MAC)
+    #define TLS_DEFINE_DEFAULT_VALUE(type, var, value) THREADLOCAL type var = value;
+    #define TLS_GET(type, var) (var)
+    #define TLS_SET(var, val) (var = (val))
+#else // defined(THREADLOCAL)
+    #error "There's no support for thread local storage"
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_13
+    #include AZ_RESTRICTED_FILE(platform_h)
+#elif !defined(LINUX) && !defined(APPLE)
+typedef int socklen_t;
+#endif
+
+
+// Include MultiThreading support.
+#include "CryThread.h"
+#include "MultiThread.h"
+
+// In RELEASE disable printf and fprintf
+#if defined(_RELEASE) && !defined(RELEASE_LOGGING)
+    #if defined(AZ_RESTRICTED_PLATFORM)
+        #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_14
+        #include AZ_RESTRICTED_FILE(platform_h)
+    #endif
+#endif
+
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_15
+    #include AZ_RESTRICTED_FILE(platform_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(WIN32) || defined(WIN64)
+    #define MESSAGE(msg) message(__FILE__ "(" STRINGIFY(__LINE__) "): " msg)
+#else
+    #define MESSAGE(msg)
+#endif
+
+void InitRootDir(char szExeFileName[] = nullptr, uint nExeSize = 0, char szExeRootName[] = nullptr, uint nRootSize = 0);
diff --git a/Code/Legacy/CryCommon/platform_impl.cpp b/Code/Legacy/CryCommon/platform_impl.cpp
new file mode 100644
index 0000000000..5496b6554c
--- /dev/null
+++ b/Code/Legacy/CryCommon/platform_impl.cpp
@@ -0,0 +1,575 @@
+/*
+ * 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 <platform.h>
+#include <StringUtils.h>
+#include <ISystem.h>
+#include <Random.h>
+#include <UnicodeFunctions.h>
+#include <IConsole.h>
+
+#include <AzCore/Debug/Profiler.h>
+#include <AzCore/Debug/ProfileModuleInit.h>
+#include <AzCore/Memory/AllocatorManager.h>
+#include <AzCore/Module/Environment.h>
+
+// Section dictionary
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define PLATFORM_IMPL_H_SECTION_TRAITS 1
+#define PLATFORM_IMPL_H_SECTION_CRYLOWLATENCYSLEEP 2
+#define PLATFORM_IMPL_H_SECTION_CRYGETFILEATTRIBUTES 3
+#define PLATFORM_IMPL_H_SECTION_CRYSETFILEATTRIBUTES 4
+#define PLATFORM_IMPL_H_SECTION_CRY_FILE_ATTRIBUTE_STUBS 5
+#define PLATFORM_IMPL_H_SECTION_CRY_SYSTEM_FUNCTIONS 6
+#define PLATFORM_IMPL_H_SECTION_VIRTUAL_ALLOCATORS 7
+#endif
+
+struct SSystemGlobalEnvironment* gEnv = nullptr;
+
+// Traits
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_TRAITS
+    #include AZ_RESTRICTED_FILE(platform_impl_h)
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// If not in static library.
+#include <CryThreadImpl.h>
+
+#if defined(WIN32) || defined(WIN64)
+void CryPureCallHandler()
+{
+    CryFatalError("Pure function call");
+}
+
+void CryInvalidParameterHandler(
+    [[maybe_unused]] const wchar_t* expression,
+    [[maybe_unused]] const wchar_t* function,
+    [[maybe_unused]] const wchar_t* file,
+    [[maybe_unused]] unsigned int line,
+    [[maybe_unused]] uintptr_t pReserved)
+{
+    //size_t i;
+    //char sFunc[128];
+    //char sExpression[128];
+    //char sFile[128];
+    //wcstombs_s( &i,sFunc,sizeof(sFunc),function,_TRUNCATE );
+    //wcstombs_s( &i,sExpression,sizeof(sExpression),expression,_TRUNCATE );
+    //wcstombs_s( &i,sFile,sizeof(sFile),file,_TRUNCATE );
+    //CryFatalError( "Invalid parameter detected in function %s. File: %s Line: %d, Expression: %s",sFunc,sFile,line,sExpression );
+    CryFatalError("Invalid parameter detected in CRT function\n");
+}
+
+void InitCRTHandlers()
+{
+    _set_purecall_handler(CryPureCallHandler);
+    _set_invalid_parameter_handler(CryInvalidParameterHandler);
+}
+#else
+void InitCRTHandlers() {}
+#endif
+
+#ifndef SOFTCODE
+//////////////////////////////////////////////////////////////////////////
+// This is an entry to DLL initialization function that must be called for each loaded module
+//////////////////////////////////////////////////////////////////////////
+extern "C" AZ_DLL_EXPORT void ModuleInitISystem(ISystem* pSystem, [[maybe_unused]] const char* moduleName)
+{
+    if (gEnv) // Already registered.
+    {
+        return;
+    }
+
+    InitCRTHandlers();
+
+    if (pSystem) // DONT REMOVE THIS. ITS FOR RESOURCE COMPILER!!!!
+    {
+        gEnv = pSystem->GetGlobalEnvironment();
+        assert(gEnv);
+        
+        if (!AZ::Environment::IsReady() || (AZ::Environment::GetInstance() != gEnv->pSharedEnvironment))
+        {
+            AZ::Environment::Attach(gEnv->pSharedEnvironment);
+            AZ::AllocatorManager::Instance();  // Force the AllocatorManager to instantiate and register any allocators defined in data sections
+        }
+        AZ::Debug::ProfileModuleInit();
+    } // if pSystem
+}
+
+extern "C" AZ_DLL_EXPORT void ModuleShutdownISystem([[maybe_unused]] ISystem* pSystem)
+{
+    // Unregister with AZ environment.
+    AZ::Environment::Detach();
+}
+
+extern "C" AZ_DLL_EXPORT void InjectEnvironment(void* env)
+{
+    static bool injected = false;
+    if (!injected)
+    {
+        AZ::Environment::Attach(reinterpret_cast<AZ::EnvironmentInstance>(env));
+        AZ::AllocatorManager::Instance();  // Force the AllocatorManager to instantiate and register any allocators defined in data sections
+        injected = true;
+    }
+}
+
+extern "C" AZ_DLL_EXPORT void DetachEnvironment()
+{
+    AZ::Environment::Detach();
+}
+
+void* GetModuleInitISystemSymbol()
+{
+    return reinterpret_cast<void*>(&ModuleInitISystem);
+}
+void* GetModuleShutdownISystemSymbol()
+{
+    return reinterpret_cast<void*>(&ModuleShutdownISystem);
+}
+void* GetInjectEnvironmentSymbol()
+{
+    return reinterpret_cast<void*>(&InjectEnvironment);
+}
+void* GetDetachEnvironmentSymbol()
+{
+    return reinterpret_cast<void*>(&DetachEnvironment);
+}
+
+#endif // !defined(SOFTCODE)
+
+bool g_bProfilerEnabled = false;
+
+//////////////////////////////////////////////////////////////////////////
+// global random number generator used by cry_random functions
+CRndGen CryRandom_Internal::g_random_generator;
+
+
+//////////////////////////////////////////////////////////////////////////
+
+// when using STL Port _STLP_DEBUG and _STLP_DEBUG_TERMINATE - avoid actually
+// crashing (default terminator seems to kill the thread, which isn't nice).
+#ifdef _STLP_DEBUG_TERMINATE
+
+# ifdef __stl_debug_terminate
+#  undef __stl_debug_terminate
+# endif
+
+void __stl_debug_terminate(void)
+{
+    assert(0 && "STL Debug Error");
+}
+#endif
+
+#ifdef _STLP_DEBUG_MESSAGE
+
+# ifdef __stl_debug_message
+#  undef __stl_debug_message
+# endif
+
+void __stl_debug_message(const char* format_str, ...)
+{
+    va_list __args;
+    va_start(__args, format_str);
+#ifdef WIN32
+    char __buffer [4096];
+    azvsnprintf(__buffer, sizeof(__buffer) / sizeof(char), format_str, __args);
+    OutputDebugStringA(__buffer);
+#endif
+    gEnv->pLog->LogV(ILog::eErrorAlways, format_str, __args);
+    va_end(__args);
+}
+#endif //_STLP_DEBUG_MESSAGE
+
+
+#if defined(WIN32) || defined(WIN64)
+#include <intrin.h>
+#endif
+
+#if defined(APPLE) || defined(LINUX)
+#include "CryAssert_impl.h"
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRY_SYSTEM_FUNCTIONS
+    #include AZ_RESTRICTED_FILE(platform_impl_h)
+#endif
+
+#if defined (_WIN32)
+
+#include "CryAssert_impl.h"
+
+//////////////////////////////////////////////////////////////////////////
+void CryDebugBreak()
+{
+#if defined(WIN32) && !defined(RELEASE)
+    if (IsDebuggerPresent())
+#endif
+    {
+        DebugBreak();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CrySleep(unsigned int dwMilliseconds)
+{
+    AZ_PROFILE_FUNCTION_IDLE(AZ::Debug::ProfileCategory::System);
+    Sleep(dwMilliseconds);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CryLowLatencySleep(unsigned int dwMilliseconds)
+{
+    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::System);
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRYLOWLATENCYSLEEP
+    #include AZ_RESTRICTED_FILE(platform_impl_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    CrySleep(dwMilliseconds);
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CryMessageBox([[maybe_unused]] const char* lpText, [[maybe_unused]] const char* lpCaption, [[maybe_unused]] unsigned int uType)
+{
+#ifdef WIN32
+#if !defined(RESOURCE_COMPILER)
+    ICVar* const pCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_crash_dialog") : NULL;
+    if ((pCVar && pCVar->GetIVal() != 0) || (gEnv && gEnv->bNoAssertDialog))
+    {
+        return 0;
+    }
+#endif
+    wstring wideText, wideCaption;
+    Unicode::Convert(wideText, lpText);
+    Unicode::Convert(wideCaption, lpCaption);
+    return MessageBoxW(NULL, wideText.c_str(), wideCaption.c_str(), uType);
+#else
+    return 0;
+#endif
+}
+
+// Initializes root folder of the game, optionally returns exe and path name.
+void InitRootDir(char szExeFileName[], uint nExeSize, char szExeRootName[], [[maybe_unused]] uint nRootSize)
+{
+    WCHAR szPath[_MAX_PATH];
+    size_t nLen = GetModuleFileNameW(GetModuleHandle(NULL), szPath, _MAX_PATH);
+    assert(nLen < _MAX_PATH && "The path to the current executable exceeds the expected length");
+
+    // Find path above exe name and deepest folder.
+    bool firstIteration = true;
+    for (size_t n = nLen - 1; n > 0; n--)
+    {
+        if (szPath[n] == '\\')
+        {
+            szPath[n] = 0;
+
+            if (firstIteration)
+            {
+                // Return exe path
+                if (szExeRootName)
+                {
+                    Unicode::Convert(szExeRootName, n+1, szPath);
+                }
+
+                // Return exe name
+                if (szExeFileName)
+                {
+                    Unicode::Convert(szExeFileName, nExeSize, szPath + n);
+                }
+                firstIteration = false;
+            }
+            // Check if the engineroot exists
+            wcscat_s(szPath, L"\\engine.json");
+            WIN32_FILE_ATTRIBUTE_DATA data;
+            BOOL res = GetFileAttributesExW(szPath, GetFileExInfoStandard, &data);
+            if (res != 0 && data.dwFileAttributes != INVALID_FILE_ATTRIBUTES)
+            {
+                // Found file
+                szPath[n] = 0;
+                SetCurrentDirectoryW(szPath);
+                break;
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+short CryGetAsyncKeyState([[maybe_unused]] int vKey)
+{
+#ifdef WIN32
+    return GetAsyncKeyState(vKey);
+#else
+    return 0;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+LONG  CryInterlockedIncrement(int volatile* lpAddend)
+{
+    return InterlockedIncrement((volatile LONG*)lpAddend);
+}
+
+//////////////////////////////////////////////////////////////////////////
+LONG  CryInterlockedDecrement(int volatile* lpAddend)
+{
+    return InterlockedDecrement((volatile LONG*)lpAddend);
+}
+
+//////////////////////////////////////////////////////////////////////////
+LONG  CryInterlockedExchangeAdd(LONG volatile* lpAddend, LONG Value)
+{
+    return InterlockedExchangeAdd(lpAddend, Value);
+}
+
+LONG  CryInterlockedOr(LONG volatile* Destination, LONG Value)
+{
+    return InterlockedOr(Destination, Value);
+}
+
+LONG  CryInterlockedCompareExchange(LONG volatile* dst, LONG exchange, LONG comperand)
+{
+    return InterlockedCompareExchange(dst, exchange, comperand);
+}
+
+void* CryInterlockedCompareExchangePointer(void* volatile* dst, void* exchange, void* comperand)
+{
+    return InterlockedCompareExchangePointer(dst, exchange, comperand);
+}
+
+void* CryInterlockedExchangePointer(void* volatile* dst, void* exchange)
+{
+    return InterlockedExchangePointer(dst, exchange);
+}
+
+void CryInterlockedAdd(volatile size_t* pVal, ptrdiff_t iAdd)
+{
+#if defined (PLATFORM_64BIT)
+#if !defined(NDEBUG)
+    size_t v = (size_t)
+#endif
+        InterlockedAdd64((volatile int64*)pVal, iAdd);
+#else
+    size_t v = (size_t)CryInterlockedExchangeAdd((volatile long*)pVal, (long)iAdd);
+    v += iAdd;
+#endif
+    assert((iAdd == 0) || (iAdd < 0 && v < v - (size_t)iAdd) || (iAdd > 0 && v > v - (size_t)iAdd));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void* CryCreateCriticalSection()
+{
+    CRITICAL_SECTION* pCS = new CRITICAL_SECTION;
+    InitializeCriticalSection(pCS);
+    return pCS;
+}
+
+void  CryCreateCriticalSectionInplace(void* pCS)
+{
+    InitializeCriticalSection((CRITICAL_SECTION*)pCS);
+}
+//////////////////////////////////////////////////////////////////////////
+void  CryDeleteCriticalSection(void* cs)
+{
+    CRITICAL_SECTION* pCS = (CRITICAL_SECTION*)cs;
+    if (pCS->LockCount >= 0)
+    {
+        CryFatalError("Critical Section hanging lock");
+    }
+    DeleteCriticalSection(pCS);
+    delete pCS;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void  CryDeleteCriticalSectionInplace(void* cs)
+{
+    CRITICAL_SECTION* pCS = (CRITICAL_SECTION*)cs;
+    if (pCS->LockCount >= 0)
+    {
+        CryFatalError("Critical Section hanging lock");
+    }
+    DeleteCriticalSection(pCS);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void  CryEnterCriticalSection(void* cs)
+{
+    EnterCriticalSection((CRITICAL_SECTION*)cs);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool  CryTryCriticalSection(void* cs)
+{
+    return TryEnterCriticalSection((CRITICAL_SECTION*)cs) != 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void  CryLeaveCriticalSection(void* cs)
+{
+    LeaveCriticalSection((CRITICAL_SECTION*)cs);
+}
+
+//////////////////////////////////////////////////////////////////////////
+uint32 CryGetFileAttributes(const char* lpFileName)
+{
+    WIN32_FILE_ATTRIBUTE_DATA data;
+    BOOL res;
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRYGETFILEATTRIBUTES
+    #include AZ_RESTRICTED_FILE(platform_impl_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    res = GetFileAttributesEx(lpFileName, GetFileExInfoStandard, &data);
+#endif
+    return res ? data.dwFileAttributes : -1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CrySetFileAttributes(const char* lpFileName, uint32 dwFileAttributes)
+{
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRYSETFILEATTRIBUTES
+    #include AZ_RESTRICTED_FILE(platform_impl_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    return SetFileAttributes(lpFileName, dwFileAttributes) != 0;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+threadID CryGetCurrentThreadId()
+{
+    return GetCurrentThreadId();
+}
+
+#endif // _WIN32
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_CRY_FILE_ATTRIBUTE_STUBS
+    #include AZ_RESTRICTED_FILE(platform_impl_h)
+#endif
+
+#if defined(AZ_PLATFORM_WINDOWS)
+int64 CryGetTicks()
+{
+    LARGE_INTEGER li;
+    QueryPerformanceCounter(&li);
+    return li.QuadPart;
+}
+
+int64 CryGetTicksPerSec()
+{
+    LARGE_INTEGER li;
+    QueryPerformanceFrequency(&li);
+    return li.QuadPart;
+}
+#endif
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Threads implementation. For static linking it must be declared inline otherwise creating multiple symbols
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#define THR_INLINE inline
+
+//////////////////////////////////////////////////////////////////////////
+inline void CryDebugStr([[maybe_unused]] const char* format, ...)
+{
+    /*
+     #ifdef CRYSYSTEM_EXPORTS
+     va_list    ArgList;
+     char       szBuffer[65535];
+     va_start(ArgList, format);
+     azvsnprintf(szBuffer,sizeof(szBuffer)-1, format, ArgList);
+     va_end(ArgList);
+     cry_strcat(szBuffer,"\n");
+     OutputDebugString(szBuffer);
+     #endif
+     */
+}
+
+_MS_ALIGN(64) uint32  BoxSides[0x40 * 8] = {
+    0, 0, 0, 0, 0, 0, 0, 0, //00
+    0, 4, 6, 2, 0, 0, 0, 4, //01
+    7, 5, 1, 3, 0, 0, 0, 4, //02
+    0, 0, 0, 0, 0, 0, 0, 0, //03
+    0, 1, 5, 4, 0, 0, 0, 4, //04
+    0, 1, 5, 4, 6, 2, 0, 6, //05
+    7, 5, 4, 0, 1, 3, 0, 6, //06
+    0, 0, 0, 0, 0, 0, 0, 0, //07
+    7, 3, 2, 6, 0, 0, 0, 4, //08
+    0, 4, 6, 7, 3, 2, 0, 6, //09
+    7, 5, 1, 3, 2, 6, 0, 6, //0a
+    0, 0, 0, 0, 0, 0, 0, 0, //0b
+    0, 0, 0, 0, 0, 0, 0, 0, //0c
+    0, 0, 0, 0, 0, 0, 0, 0, //0d
+    0, 0, 0, 0, 0, 0, 0, 0, //0e
+    0, 0, 0, 0, 0, 0, 0, 0, //0f
+    0, 2, 3, 1, 0, 0, 0, 4, //10
+    0, 4, 6, 2, 3, 1, 0, 6, //11
+    7, 5, 1, 0, 2, 3, 0, 6, //12
+    0, 0, 0, 0, 0, 0, 0, 0, //13
+    0, 2, 3, 1, 5, 4, 0, 6, //14
+    1, 5, 4, 6, 2, 3, 0, 6, //15
+    7, 5, 4, 0, 2, 3, 0, 6, //16
+    0, 0, 0, 0, 0, 0, 0, 0, //17
+    0, 2, 6, 7, 3, 1, 0, 6, //18
+    0, 4, 6, 7, 3, 1, 0, 6, //19
+    7, 5, 1, 0, 2, 6, 0, 6, //1a
+    0, 0, 0, 0, 0, 0, 0, 0, //1b
+    0, 0, 0, 0, 0, 0, 0, 0, //1c
+    0, 0, 0, 0, 0, 0, 0, 0, //1d
+    0, 0, 0, 0, 0, 0, 0, 0, //1e
+    0, 0, 0, 0, 0, 0, 0, 0, //1f
+    7, 6, 4, 5, 0, 0, 0, 4, //20
+    0, 4, 5, 7, 6, 2, 0, 6, //21
+    7, 6, 4, 5, 1, 3, 0, 6, //22
+    0, 0, 0, 0, 0, 0, 0, 0, //23
+    7, 6, 4, 0, 1, 5, 0, 6, //24
+    0, 1, 5, 7, 6, 2, 0, 6, //25
+    7, 6, 4, 0, 1, 3, 0, 6, //26
+    0, 0, 0, 0, 0, 0, 0, 0, //27
+    7, 3, 2, 6, 4, 5, 0, 6, //28
+    0, 4, 5, 7, 3, 2, 0, 6, //29
+    6, 4, 5, 1, 3, 2, 0, 6, //2a
+    0, 0, 0, 0, 0, 0, 0, 0, //2b
+    0, 0, 0, 0, 0, 0, 0, 0, //2c
+    0, 0, 0, 0, 0, 0, 0, 0, //2d
+    0, 0, 0, 0, 0, 0, 0, 0, //2e
+    0, 0, 0, 0, 0, 0, 0, 0, //2f
+    0, 0, 0, 0, 0, 0, 0, 0, //30
+    0, 0, 0, 0, 0, 0, 0, 0, //31
+    0, 0, 0, 0, 0, 0, 0, 0, //32
+    0, 0, 0, 0, 0, 0, 0, 0, //33
+    0, 0, 0, 0, 0, 0, 0, 0, //34
+    0, 0, 0, 0, 0, 0, 0, 0, //35
+    0, 0, 0, 0, 0, 0, 0, 0, //36
+    0, 0, 0, 0, 0, 0, 0, 0, //37
+    0, 0, 0, 0, 0, 0, 0, 0, //38
+    0, 0, 0, 0, 0, 0, 0, 0, //39
+    0, 0, 0, 0, 0, 0, 0, 0, //3a
+    0, 0, 0, 0, 0, 0, 0, 0, //3b
+    0, 0, 0, 0, 0, 0, 0, 0, //3c
+    0, 0, 0, 0, 0, 0, 0, 0, //3d
+    0, 0, 0, 0, 0, 0, 0, 0, //3e
+    0, 0, 0, 0, 0, 0, 0, 0, //3f
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#if defined(AZ_RESTRICTED_PLATFORM)
+    #define AZ_RESTRICTED_SECTION PLATFORM_IMPL_H_SECTION_VIRTUAL_ALLOCATORS
+    #include AZ_RESTRICTED_FILE(platform_impl_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#endif
diff --git a/Code/Legacy/CryCommon/primitives.h b/Code/Legacy/CryCommon/primitives.h
new file mode 100644
index 0000000000..8455fcfa39
--- /dev/null
+++ b/Code/Legacy/CryCommon/primitives.h
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYCOMMON_PRIMITIVES_H
+#define CRYINCLUDE_CRYCOMMON_PRIMITIVES_H
+#pragma once
+
+
+
+typedef int index_t;
+enum
+{
+    PHYS_MAX_INDICES = 1 << 30
+};
+
+#include "stridedptr.h"
+
+namespace primitives {
+    ////////////////////////// primitives //////////////////////
+
+    struct primitive
+    {
+    };
+
+    struct box
+        : primitive
+    {
+        enum entype
+        {
+            type = 0
+        };
+        Matrix33 Basis; // v_box = Basis*v_world; Basis = Rotation.T()
+        int bOriented;
+        Vec3 center;
+        Vec3 size;
+        AUTO_STRUCT_INFO
+    };
+
+    struct triangle
+        : primitive
+    {
+        enum entype
+        {
+            type = 1
+        };
+        Vec3 pt[3];
+        Vec3 n;
+        AUTO_STRUCT_INFO
+    };
+
+    struct indexed_triangle
+        : triangle
+    {
+        int idx;
+        AUTO_STRUCT_INFO
+    };
+
+    typedef float (* getHeightCallback)(int ix, int iy);
+    typedef unsigned char (* getSurfTypeCallback)(int ix, int iy);
+
+    struct grid
+        : primitive
+    {
+        Matrix33 Basis;
+        int bOriented;
+        Vec3 origin;
+        vector2df step, stepr;
+        vector2di size;
+        vector2di stride;
+        int bCyclic;
+        grid() { bCyclic = 0; }
+        int inrange(int ix, int iy) {   return bCyclic | -((ix - size.x & - 1 - ix & iy - size.y & - 1 - iy) >> 31); }
+        int getcell_safe(int ix, int iy) { int mask = -inrange(ix, iy); return (iy & size.y - 1) * stride.y + (ix & size.x - 1) * stride.x & mask | size.x * size.y & ~mask; }
+        int crop(int i, int icoord, int bAllowBorder = 1) { int brd = bAllowBorder + (1 << 30 & - bCyclic); return max(-brd, min(size[icoord] - 1 + brd, i)); }
+        vector2di cropxy(const vector2di& ic, int bAllowBorder = 1) { int brd = bAllowBorder + (1 << 30 & - bCyclic); return vector2di(max(-brd, min(size.x - 1 + brd, ic.x)), max(-brd, min(size.y - 1 + brd, ic.y))); }
+        int iscyclic() { return bCyclic; }
+        AUTO_STRUCT_INFO
+    };
+
+    struct heightfield
+        : grid
+    {
+        enum entype
+        {
+            type = 2
+        };
+        heightfield& operator=(const heightfield& src)
+        {
+            step = src.step;
+            stepr = src.stepr;
+            size = src.size;
+            stride = src.stride;
+            heightscale = src.heightscale;
+            typemask = src.typemask;
+            typehole = src.typehole;
+            typepower = src.typepower;
+            fpGetHeightCallback = src.fpGetHeightCallback;
+            fpGetSurfTypeCallback = src.fpGetSurfTypeCallback;
+            return *this;
+        }
+
+        ILINE float getheight(int ix, int iy) const
+        {
+            float result = (*fpGetHeightCallback)(ix, iy);
+            return result * heightscale;
+        }
+        ILINE int gettype(int ix, int iy) const
+        {
+            int itype = (((*fpGetSurfTypeCallback)(ix, iy)) & typemask) >> typepower, idelta = itype - typehole;
+            return itype | ((idelta - 1) >> 31 ^ idelta >> 31);
+        }
+
+        float heightscale;
+        unsigned short typemask;
+        int typehole;
+        int typepower;
+        getHeightCallback fpGetHeightCallback;
+        getSurfTypeCallback fpGetSurfTypeCallback;
+    };
+
+    struct ray
+        : primitive
+    {
+        enum entype
+        {
+            type = 3
+        };
+        Vec3 origin;
+        Vec3 dir;
+        AUTO_STRUCT_INFO
+    };
+
+    struct sphere
+        : primitive
+    {
+        enum entype
+        {
+            type = 4
+        };
+        Vec3 center;
+        float r;
+        AUTO_STRUCT_INFO
+    };
+
+    struct cylinder
+        : primitive
+    {
+        enum entype
+        {
+            type = 5
+        };
+        Vec3 center;
+        Vec3 axis;
+        float r, hh;
+        AUTO_STRUCT_INFO
+    };
+
+    struct capsule
+        : cylinder
+    {
+        enum entype
+        {
+            type = 6
+        };
+        AUTO_STRUCT_INFO
+    };
+
+    struct grid3d
+        : primitive
+    {
+        Matrix33 Basis;
+        int bOriented;
+        Vec3 origin;
+        Vec3 step, stepr;
+        Vec3i size;
+        Vec3i stride;
+    };
+
+    struct voxelgrid
+        : grid3d
+    {
+        enum entype
+        {
+            type = 7
+        };
+        Matrix33 R;
+        Vec3 offset;
+        float scale, rscale;
+        strided_pointer<Vec3> pVtx;
+        index_t* pIndices;
+        Vec3* pNormals;
+        char* pIds;
+        int* pCellTris;
+        int* pTriBuf;
+    };
+
+    struct plane
+        : primitive
+    {
+        enum entype
+        {
+            type = 8
+        };
+        Vec3 n;
+        Vec3 origin;
+        AUTO_STRUCT_INFO
+    };
+
+    struct coord_plane
+        : plane
+    {
+        Vec3 axes[2];
+        AUTO_STRUCT_INFO
+    };
+}
+
+AUTO_TYPE_INFO(primitives::getHeightCallback)
+AUTO_TYPE_INFO(primitives::getSurfTypeCallback)
+
+struct prim_inters
+{
+    prim_inters() { minPtDist2 = 0.0f; ptbest.zero(); }
+    Vec3 pt[2];
+    Vec3 n;
+    unsigned char iFeature[2][2];
+    float minPtDist2;
+    short id[2];
+    int iNode[2];
+    Vec3* ptborder;
+    int nborderpt, nbordersz;
+    Vec3 ptbest;
+    int nBestPtVal;
+};
+
+struct contact
+{
+    real t, taux;
+    Vec3 pt;
+    Vec3 n;
+    unsigned int iFeature[2];
+};
+
+const int NPRIMS = 8;   // since plane is currently not supported in collision checks
+
+///////////////////// geometry contact structures ///////////////////
+
+struct geom_contact_area
+{
+    enum entype
+    {
+        polygon, polyline
+    };
+    int type;
+    int npt;
+    int nmaxpt;
+    float minedge;
+    int* piPrim[2];
+    int* piFeature[2];
+    Vec3* pt;
+    Vec3 n1; // normal of other object surface (or edge)
+};
+
+const int IFEAT_LOG2 = 23;
+const int IDXMASK = ~(0xFF << IFEAT_LOG2);
+const int TRIEND = 0x80 << IFEAT_LOG2;
+
+struct geom_contact
+{
+    real t;
+    Vec3 pt;
+    Vec3 n;
+    Vec3 dir; // unprojection direction
+    int iUnprojMode;
+    float vel; // original velocity along this direction, <0 if least squares normal was used
+    int id[2]; // external ids for colliding geometry parts
+    int iPrim[2];
+    int iFeature[2];
+    int iNode[2]; // BV-tree nodes of contacting primitives
+    Vec3* ptborder; // intersection border
+    int (*idxborder)[2]; // primitive index | primitive's feature's id << IFEAT_LOG2
+    int nborderpt;
+    int bClosed;
+    Vec3 center;
+    bool bBorderConsecutive;
+    geom_contact_area* parea;
+};
+
+#endif // CRYINCLUDE_CRYCOMMON_PRIMITIVES_H
diff --git a/Code/Legacy/CryCommon/smartptr.h b/Code/Legacy/CryCommon/smartptr.h
new file mode 100644
index 0000000000..9b5ff3f046
--- /dev/null
+++ b/Code/Legacy/CryCommon/smartptr.h
@@ -0,0 +1,443 @@
+/*
+ * 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_SMARTPTR_H
+#define CRYINCLUDE_CRYCOMMON_SMARTPTR_H
+#pragma once
+
+#include <platform.h>
+#include <type_traits>
+
+void CryFatalError(const char*, ...) PRINTF_PARAMS(1, 2);
+#if defined(APPLE)
+    #include <cstddef>
+#endif
+//////////////////////////////////////////////////////////////////
+// SMART POINTER
+//////////////////////////////////////////////////////////////////
+template <class _I>
+class _smart_ptr
+{
+private:
+    _I* p;
+public:
+    _smart_ptr()
+        : p(NULL) {}
+    _smart_ptr(_I* p_)
+    {
+        p = p_;
+        if (p)
+        {
+            p->AddRef();
+        }
+    }
+
+    _smart_ptr(const _smart_ptr& p_)
+    {
+        p = p_.p;
+        if (p)
+        {
+            p->AddRef();
+        }
+    }
+
+    template <typename _Y>
+    _smart_ptr(const _smart_ptr<_Y>& p_)
+    {
+        p = p_.get();
+        if (p)
+        {
+            p->AddRef();
+        }
+    }
+
+    ~_smart_ptr()
+    {
+        if (p)
+        {
+            p->Release();
+        }
+    }
+    operator _I*() const {
+        return p;
+    }
+
+    _I& operator*() const { return *p; }
+    _I* operator->(void) const { return p; }
+    _I* get() const { return p; }
+    _smart_ptr&  operator=(_I* newp)
+    {
+        if (newp)
+        {
+            newp->AddRef();
+        }
+        if (p)
+        {
+            p->Release();
+        }
+        p = newp;
+        return *this;
+    }
+
+    void reset()
+    {
+        _smart_ptr<_I>().swap(*this);
+    }
+
+    void reset(_I* ptr)
+    {
+        _smart_ptr<_I>(ptr).swap(*this);
+    }
+
+    void attach(_I* p_)
+    {
+        p = p_;
+    }
+
+    _smart_ptr&  operator=(const _smart_ptr& newp)
+    {
+        if (newp.p)
+        {
+            newp.p->AddRef();
+        }
+        if (p)
+        {
+            p->Release();
+        }
+        p = newp.p;
+        return *this;
+    }
+
+    template <typename _Y>
+    _smart_ptr&  operator=(const _smart_ptr<_Y>& newp)
+    {
+        _I* const p2 = newp.get();
+        if (p2)
+        {
+            p2->AddRef();
+        }
+        if (p)
+        {
+            p->Release();
+        }
+        p = p2;
+        return *this;
+    }
+
+    // set our contained pointer to null, but don't call Release()
+    // useful for when we want to do that ourselves, or when we know that
+    // the contained pointer is invalid
+    friend _I* ReleaseOwnership(_smart_ptr<_I>& ptr)
+    {
+        _I* ret = ptr.p;
+        ptr.p = 0;
+        return ret;
+    }
+    void swap(_smart_ptr<_I>& other)
+    {
+        std::swap(p, other.p);
+    }
+
+    AUTO_STRUCT_INFO
+};
+
+template <typename T>
+ILINE void swap(_smart_ptr<T>& a, _smart_ptr<T>& b)
+{
+    a.swap(b);
+}
+
+// reference target without vtable for smart pointer
+// implements AddRef() and Release() strategy using reference counter of the specified type
+template <typename TDerived, typename Counter = int>
+class _reference_target_no_vtable
+{
+public:
+    _reference_target_no_vtable()
+        : m_nRefCounter (0)
+    {
+    }
+
+    ~_reference_target_no_vtable()
+    {
+        //assert (!m_nRefCounter);
+    }
+
+    void AddRef()
+    {
+        CHECK_REFCOUNT_CRASH(m_nRefCounter >= 0);
+        ++m_nRefCounter;
+    }
+
+    void Release()
+    {
+        CHECK_REFCOUNT_CRASH(m_nRefCounter > 0);
+        if (--m_nRefCounter == 0)
+        {
+            delete static_cast<TDerived*>(this);
+        }
+        else if (m_nRefCounter < 0)
+        {
+            assert(0);
+            CryFatalError("Deleting Reference Counted Object Twice");
+        }
+    }
+    // Warning: use for debugging/statistics purposes only!
+    Counter NumRefs()
+    {
+        return m_nRefCounter;
+    }
+protected:
+    Counter m_nRefCounter;
+};
+
+// reference target with vtable for smart pointer
+// implements AddRef() and Release() strategy using reference counter of the specified type
+template <typename Counter>
+class _reference_target
+{
+public:
+    _reference_target()
+        : m_nRefCounter (0)
+    {
+    }
+
+    virtual ~_reference_target()
+    {
+        //assert (!m_nRefCounter);
+    }
+
+    void AddRef()
+    {
+        CHECK_REFCOUNT_CRASH(m_nRefCounter >= 0);
+        ++m_nRefCounter;
+    }
+
+    void Release()
+    {
+        CHECK_REFCOUNT_CRASH(m_nRefCounter > 0);
+        if (--m_nRefCounter == 0)
+        {
+            delete this;
+        }
+        else if (m_nRefCounter < 0)
+        {
+            assert(0);
+            CryFatalError("Deleting Reference Counted Object Twice");
+        }
+    }
+    // Warning: use for debugging/statistics purposes only!
+    Counter NumRefs()
+    {
+        return m_nRefCounter;
+    }
+protected:
+    Counter m_nRefCounter;
+};
+
+// default implementation is int counter - for better alignment
+typedef _reference_target<int> _reference_target_t;
+
+
+// reference target for smart pointer with configurable destruct function
+// implements AddRef() and Release() strategy using reference counter of the specified type
+template <typename T, typename Counter = int>
+class _cfg_reference_target
+{
+public:
+
+    typedef void (* DeleteFncPtr)(void*);
+
+    _cfg_reference_target()
+        : m_nRefCounter (0)
+        , m_pDeleteFnc(operator delete)
+    {
+    }
+
+    explicit _cfg_reference_target(DeleteFncPtr pDeleteFnc)
+        : m_nRefCounter (0)
+        , m_pDeleteFnc(pDeleteFnc)
+    {
+    }
+
+    virtual ~_cfg_reference_target()
+    {
+    }
+
+    void AddRef()
+    {
+        CHECK_REFCOUNT_CRASH(m_nRefCounter >= 0);
+        ++m_nRefCounter;
+    }
+
+    void Release()
+    {
+        CHECK_REFCOUNT_CRASH(m_nRefCounter > 0);
+        if (--m_nRefCounter == 0)
+        {
+            assert(m_pDeleteFnc);
+            static_cast<T*>(this)->~T();
+            m_pDeleteFnc(this);
+        }
+        else if (m_nRefCounter < 0)
+        {
+            assert(0);
+            CryFatalError("Deleting Reference Counted Object Twice");
+        }
+    }
+
+    // Sets the delete function with which this object is supposed to be deleted
+    void SetDeleteFnc(DeleteFncPtr pDeleteFnc) { m_pDeleteFnc = pDeleteFnc; }
+
+    // Warning: use for debugging/statistics purposes only!
+    Counter NumRefs()
+    {
+        return m_nRefCounter;
+    }
+protected:
+    Counter m_nRefCounter;
+    DeleteFncPtr m_pDeleteFnc;
+};
+
+
+// base class for interfaces implementing reference counting
+// derive your interface from this class and the descendants won't have to implement
+// the reference counting logic
+template <typename Counter>
+class _i_reference_target
+{
+public:
+    _i_reference_target()
+        : m_nRefCounter (0)
+    {
+    }
+
+    virtual ~_i_reference_target()
+    {
+    }
+
+    virtual void AddRef()
+    {
+        ++m_nRefCounter;
+    }
+
+    virtual void Release()
+    {
+        if (--m_nRefCounter == 0)
+        {
+            delete this;
+        }
+        else if (m_nRefCounter < 0)
+        {
+            assert(0);
+            CryFatalError("Deleting Reference Counted Object Twice");
+        }
+    }
+
+    // Warning: use for debugging/statistics purposes only!
+    Counter NumRefs()   const
+    {
+        return m_nRefCounter;
+    }
+protected:
+    Counter m_nRefCounter;
+};
+
+class CMultiThreadRefCount
+{
+public:
+    CMultiThreadRefCount()
+        : m_cnt(0) {}
+    virtual ~CMultiThreadRefCount() {}
+
+    inline int AddRef()
+    {
+        return CryInterlockedIncrement(&m_cnt);
+    }
+    inline int Release()
+    {
+        const int nCount = CryInterlockedDecrement(&m_cnt);
+        assert(nCount >= 0);
+        if (nCount == 0)
+        {
+            delete this;
+        }
+        else if (nCount < 0)
+        {
+            assert(0);
+            CryFatalError("Deleting Reference Counted Object Twice");
+        }
+        return nCount;
+    }
+
+    inline int GetRefCount()    const { return m_cnt; }
+
+protected:
+    // Allows the memory for the object to be deallocated in the dynamic module where it was originally constructed, as it may use different memory manager (Debug/Release configurations)
+    virtual void DeleteThis() { delete this; }
+
+private:
+    volatile int m_cnt;
+};
+
+// base class for interfaces implementing reference counting that needs to be thread-safe
+// derive your interface from this class and the descendants won't have to implement
+// the reference counting logic
+template <typename Counter>
+class _i_multithread_reference_target
+{
+public:
+    _i_multithread_reference_target()
+        : m_nRefCounter(0)
+    {
+    }
+
+    virtual ~_i_multithread_reference_target()
+    {
+    }
+
+    virtual void AddRef()
+    {
+        CryInterlockedIncrement(&m_nRefCounter);
+    }
+
+    virtual void Release()
+    {
+        const int nCount = CryInterlockedDecrement(&m_nRefCounter);
+        assert(nCount >= 0);
+        if (nCount == 0)
+        {
+            delete this;
+        }
+        else if (nCount < 0)
+        {
+            assert(0);
+            CryFatalError("Deleting Reference Counted Object Twice");
+        }
+    }
+
+    Counter NumRefs()   const { return m_nRefCounter; }
+
+protected:
+
+    volatile Counter m_nRefCounter;
+};
+
+typedef _i_reference_target<int> _i_reference_target_t;
+typedef _i_multithread_reference_target<int> _i_multithread_reference_target_t;
+
+// TYPEDEF_AUTOPTR macro, declares Class_AutoPtr, which is the smart pointer to the given class,
+// and Class_AutoArray, which is the array(STL vector) of autopointers
+#ifdef ENABLE_NAIIVE_AUTOPTR
+// naiive autopointer makes it easier for Visual Assist to parse the declaration and sometimes is easier for debug
+#define TYPEDEF_AUTOPTR(T) typedef T* T##_AutoPtr; typedef std::vector<T##_AutoPtr> T##_AutoArray;
+#else
+#define TYPEDEF_AUTOPTR(T) typedef _smart_ptr<T> T##_AutoPtr; typedef std::vector<T##_AutoPtr> T##_AutoArray;
+#endif
+
+#endif // CRYINCLUDE_CRYCOMMON_SMARTPTR_H
diff --git a/Code/Legacy/CryCommon/stridedptr.h b/Code/Legacy/CryCommon/stridedptr.h
new file mode 100644
index 0000000000..6ddb4439d8
--- /dev/null
+++ b/Code/Legacy/CryCommon/stridedptr.h
@@ -0,0 +1,113 @@
+/*
+ * 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_STRIDEDPTR_H
+#define CRYINCLUDE_CRYCOMMON_STRIDEDPTR_H
+#pragma once
+
+#include <CryCommon/platform.h>
+#include <CryCommon/CryEndian.h>
+
+template<class dtype>
+class strided_pointer
+{
+public:
+    strided_pointer()
+        : data(0)
+        , iStride(sizeof(dtype))
+    {
+    }
+
+    strided_pointer(dtype* pdata, int32 stride = sizeof(dtype))
+        : data(pdata)
+        , iStride(stride)
+    {
+    }
+
+    template<typename dtype1>
+    strided_pointer(dtype1* pdata)
+    {
+        set(pdata, sizeof(dtype1));
+    }
+
+    template<typename dtype1>
+    strided_pointer(const strided_pointer<dtype1>& src)
+    {
+        set(src.data, src.iStride);
+    }
+
+    template<typename dtype1>
+    ILINE strided_pointer& operator=(const strided_pointer<dtype1>& src)
+    {
+        set(src.data, src.iStride);
+        return *this;
+    }
+
+    ILINE dtype& operator[](int32 idx) { return *(dtype*)((char*)data + idx * iStride); }
+    ILINE const dtype& operator[](int32 idx) const { return *(const dtype*)((const char*)data + idx * iStride); }
+    ILINE strided_pointer<dtype> operator+(int32 idx) const { return strided_pointer<dtype>((dtype*)((char*)data + idx * iStride), iStride); }
+    ILINE strided_pointer<dtype> operator-(int32 idx) const { return strided_pointer<dtype>((dtype*)((char*)data - idx * iStride), iStride); }
+
+    ILINE operator bool() const
+    {
+        return data != 0;
+    }
+
+private:
+    template<typename dtype1>
+    ILINE void set(dtype1* pdata, int32 stride)
+    {
+#       if !defined(eLittleEndian)
+#           error eLittleEndian is not defined, please include CryEndian.h.
+#       endif
+        COMPILE_TIME_ASSERT(metautils::is_const<dtype>::value || !metautils::is_const<dtype1>::value);
+        // note: we allow xint32 -> xint16 converting
+        COMPILE_TIME_ASSERT(
+            (metautils::is_same<typename metautils::remove_const<dtype1>::type, typename metautils::remove_const<dtype>::type>::value ||
+             ((metautils::is_same<typename metautils::remove_const<dtype1>::type, sint32>::value ||
+               metautils::is_same<typename metautils::remove_const<dtype1>::type, uint32>::value ||
+               metautils::is_same<typename metautils::remove_const<dtype1>::type, sint16>::value ||
+               metautils::is_same<typename metautils::remove_const<dtype1>::type, uint16>::value) &&
+              (metautils::is_same<typename metautils::remove_const<dtype>::type, sint16>::value ||
+               metautils::is_same<typename metautils::remove_const<dtype>::type, uint16>::value))));
+        data = (dtype*)pdata + (sizeof(dtype1) / sizeof(dtype) - 1) * (int)eLittleEndian;
+        iStride = stride;
+    }
+
+private:
+    // Prevents assignment of a structure member's address by mistake:
+    //   stridedPtrObject = &myStruct.member;
+    // Use explicit constructor instead:
+    //   stridedPtrObject = strided_pointer<baseType>(&myStruct.member, sizeof(myStruct));
+    //
+    // Keep it private and non-implemented.
+    strided_pointer& operator=(dtype* pdata);
+
+    // Prevents using the address directly by mistake:
+    //   memcpy(destination, stridedPtrObject, sizeof(baseType) * n);
+    // Use address of the first element instead:
+    //   memcpy(destination, &stridedPtrObject[0], stridedPtrObject.iStride * n);
+    //
+    // Keep it private and non-implemented.
+    operator void*() const;
+
+    // Prevents direct dereferencing to avoid confusing it with "normal" pointers:
+    //   val = *stridedPtrObject;
+    // Use operator [] instead:
+    //   val = stridedPtrObject[0];
+    //
+    // Keep it private and non-implemented.
+    dtype& operator*() const;
+
+public:
+    dtype* data;
+    int32 iStride;
+};
+
+
+#endif // CRYINCLUDE_CRYCOMMON_STRIDEDPTR_H
diff --git a/Code/Legacy/CrySystem/AZCoreLogSink.h b/Code/Legacy/CrySystem/AZCoreLogSink.h
new file mode 100644
index 0000000000..0aa193b04c
--- /dev/null
+++ b/Code/Legacy/CrySystem/AZCoreLogSink.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Math/Crc.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/Console/IConsole.h>
+
+#include <CryAssert.h>
+
+namespace AZ
+{
+    AZ_CVAR_EXTERNED(int, bg_traceLogLevel);
+}
+
+/**
+ * Hook Trace bus so we can funnel AZ asserts, warnings, etc to CryEngine.
+ *
+ * Note: This is currently owned by CrySystem, because CrySystem owns
+ * the logging mechanism for which it is relevant.
+ */
+class AZCoreLogSink
+    : public AZ::Debug::TraceMessageBus::Handler
+{
+public:
+    inline static void Connect()
+    {
+        GetInstance().m_ignoredAsserts = new IgnoredAssertMap();
+        GetInstance().BusConnect();
+    }
+
+    inline static void Disconnect()
+    {
+        GetInstance().BusDisconnect();
+        delete GetInstance().m_ignoredAsserts;
+    }
+
+    static AZCoreLogSink& GetInstance()
+    {
+        static AZCoreLogSink s_sink;
+        return s_sink;
+    }
+
+    static bool IsCryLogReady()
+    {
+        static bool hasSetCVar = false;
+        bool ready = gEnv && gEnv->pSystem && gEnv->pLog;
+
+#ifdef _RELEASE
+        if(!hasSetCVar && ready)
+        {
+            // AZ logging only has a concept of 3 levels (error, warning, info) but cry logging has 4 levels (..., messaging).  If info level is set, we'll turn on messaging as well
+            int logLevel = AZ::bg_traceLogLevel == AZ::Debug::LogLevel::Info ? 4 : AZ::bg_traceLogLevel;
+
+            gEnv->pConsole->GetCVar("log_WriteToFileVerbosity")->Set(logLevel);
+            hasSetCVar = true;
+        }
+#endif
+
+        return ready;
+    }
+
+    bool OnPreAssert(const char* fileName, int line, const char* func, const char* message) override
+    {
+#if defined(USE_CRY_ASSERT) && AZ_LEGACY_CRYSYSTEM_TRAIT_DO_PREASSERT
+        AZ::Crc32 crc;
+        crc.Add(&line, sizeof(line));
+        if (fileName)
+        {
+            crc.Add(fileName, strlen(fileName));
+        }
+
+        bool* ignore = nullptr;
+        auto foundIter = m_ignoredAsserts->find(crc);
+        if (foundIter == m_ignoredAsserts->end())
+        {
+            ignore = &((*m_ignoredAsserts)[crc]);
+            *ignore = false;
+        }
+        else
+        {
+            ignore = &((*m_ignoredAsserts)[crc]);
+        }
+
+        if (!(*ignore))
+        {
+            using namespace AZ::Debug;
+
+            Trace::Output(nullptr, "\n==================================================================\n");
+            AZ::OSString outputMsg = AZ::OSString::format("Trace::Assert\n %s(%d): '%s'\n%s\n", fileName, line, func, message);
+            Trace::Output(nullptr, outputMsg.c_str());
+
+            // Suppress 3 in stack depth - this function, the bus broadcast that got us here, and Trace::Assert
+            Trace::Output(nullptr, "------------------------------------------------\n");
+            Trace::PrintCallstack(nullptr, 3);
+            Trace::Output(nullptr, "\n==================================================================\n");
+
+            AZ::EnvironmentVariable<bool> inEditorBatchMode = AZ::Environment::FindVariable<bool>("InEditorBatchMode");
+            if (!inEditorBatchMode.IsConstructed() || !inEditorBatchMode.Get())
+            {
+                // Note - CryAssertTrace doesn't actually print any info to logging
+                // it just stores the message internally for the message box in CryAssert to use
+                CryAssertTrace("%s", message);
+                if (CryAssert("Assertion failed", fileName, line, ignore) || Trace::IsDebuggerPresent())
+                {
+                    Trace::Break();
+                }
+            }
+        }
+        else
+        {
+            CryLogAlways("%s", message);
+        }
+
+        return true; // suppress default AzCore behavior.
+#else
+        AZ_UNUSED(fileName);
+        AZ_UNUSED(line);
+        AZ_UNUSED(func);
+        AZ_UNUSED(message);
+        return false; // allow AZCore to do its default behavior.   This usually results in an application shutdown.
+#endif
+    }
+
+    bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message) override
+    {
+        AZ_UNUSED(fileName);
+        AZ_UNUSED(line);
+        AZ_UNUSED(func);
+        if (!IsCryLogReady())
+        {
+            return false; // allow AZCore to do its default behavior.
+        }
+        gEnv->pLog->LogError("(%s) - %s", window, message);
+        return true; // suppress default AzCore behavior.
+    }
+
+    bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override
+    {
+        AZ_UNUSED(fileName);
+        AZ_UNUSED(line);
+        AZ_UNUSED(func);
+
+        if (!IsCryLogReady())
+        {
+            return false; // allow AZCore to do its default behavior.
+        }
+
+        CryWarning(VALIDATOR_MODULE_UNKNOWN, VALIDATOR_WARNING, "(%s) - %s", window, message);
+        return true; // suppress default AzCore behavior.
+    }
+
+    bool OnOutput(const char* window, const char* message)  override
+    {
+        if (!IsCryLogReady())
+        {
+            return false; // allow AZCore to do its default behavior.
+        }
+
+        if (window == AZ::Debug::Trace::GetDefaultSystemWindow())
+        {
+            CryLogAlways("%s", message);
+        }
+        else
+        {
+            CryLog("(%s) - %s", window, message);
+        }
+
+        return true; // suppress default AzCore behavior.
+    }
+
+private:
+
+    using IgnoredAssertMap = AZStd::unordered_map<AZ::Crc32, bool, AZStd::hash<AZ::Crc32>, AZStd::equal_to<AZ::Crc32>, AZ::OSStdAllocator>;
+    IgnoredAssertMap* m_ignoredAsserts;
+};
diff --git a/Code/Legacy/CrySystem/AZCrySystemInitLogSink.cpp b/Code/Legacy/CrySystem/AZCrySystemInitLogSink.cpp
new file mode 100644
index 0000000000..fbd510122e
--- /dev/null
+++ b/Code/Legacy/CrySystem/AZCrySystemInitLogSink.cpp
@@ -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
+ *
+ */
+
+#include "CrySystem_precompiled.h"
+#include <AZCrySystemInitLogSink.h>
+
+#include <AzCore/NativeUI/NativeUIRequests.h>
+#include <AzCore/std/string/osstring.h>
+
+#include <ISystem.h>
+
+namespace AZ
+{
+    namespace Debug
+    {
+        void CrySystemInitLogSink::SetFatalMessageBox(bool enable)
+        {
+            m_isMessageBoxFatal = enable;
+        }
+
+        void CrySystemInitLogSink::DisplayCollectedErrorStrings() const
+        {
+            if (m_errorStringsCollected.empty())
+            {
+                return;
+            }
+
+            AZ::OSString msgBoxMessage;
+            msgBoxMessage.append("O3DE could not initialize correctly for the following reason(s):");
+
+            for (const AZ::OSString& errMsg : m_errorStringsCollected)
+            {
+                msgBoxMessage.append("\n");
+                msgBoxMessage.append(errMsg.c_str());
+            }
+
+            Trace::Output(nullptr, "\n==================================================================\n");
+            Trace::Output(nullptr, msgBoxMessage.c_str());
+            Trace::Output(nullptr, "\n==================================================================\n");
+
+            EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "O3DE Initialization Failed", msgBoxMessage.c_str(), false);
+        }
+    } // namespace Debug
+} // namespace AZ
diff --git a/Code/Legacy/CrySystem/AZCrySystemInitLogSink.h b/Code/Legacy/CrySystem/AZCrySystemInitLogSink.h
new file mode 100644
index 0000000000..bca2ca04bc
--- /dev/null
+++ b/Code/Legacy/CrySystem/AZCrySystemInitLogSink.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 <AzFramework/Logging/StartupLogSinkReporter.h>
+
+namespace AZ
+{
+    namespace Debug
+    {
+        /**
+        * A handler for the TraceMessageBus which is meant to collect errors and asserts during CrySystem::Init to display them to the user.
+        * It will also elevate all output to CryLogAlways while it is in scope.
+        * As such, it assumes that it is being used within the CrySystem library and gEnv and gEnv->pSystem are valid.
+        */
+        class CrySystemInitLogSink
+            : public StartupLogSink
+        {
+        public:
+            CrySystemInitLogSink() = default;
+
+            /**
+            * Enables or disables the fatal flags to send to the platform specific message box
+            */
+            void SetFatalMessageBox(bool enable = true);
+
+            /**
+            * Formats the collected error messages into a platform specific message box to display to the user.
+            * This expects that a valid gEnv->pSystem exists, and the IOSPlatform has been initialzied.
+            * Will also log output messages to whatever medium is possible for OnOutput messages on TraceMessageBus (ex. debug output, logs).
+            */
+            void DisplayCollectedErrorStrings() const override;
+
+        protected:
+            bool m_isMessageBoxFatal = false;
+        };
+    } // namespace Debug
+} // namespace AZ
+
diff --git a/Code/Legacy/CrySystem/CMakeLists.txt b/Code/Legacy/CrySystem/CMakeLists.txt
new file mode 100644
index 0000000000..0e0337a59c
--- /dev/null
+++ b/Code/Legacy/CrySystem/CMakeLists.txt
@@ -0,0 +1,51 @@
+#
+# 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
+#
+#
+
+add_subdirectory(XML)
+
+ly_add_target(
+    NAME CrySystem.Static STATIC
+    NAMESPACE Legacy
+    FILES_CMAKE
+        crysystem_files.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+    BUILD_DEPENDENCIES
+        PRIVATE
+            3rdParty::expat
+            3rdParty::lz4
+            3rdParty::md5
+            3rdParty::tiff
+            3rdParty::zlib
+            3rdParty::zstd
+            Legacy::CryCommon
+            Legacy::CrySystem.XMLBinary
+            Legacy::RemoteConsoleCore
+            AZ::AzFramework
+)
+
+ly_add_source_properties(
+    SOURCES SystemInit.cpp
+    PROPERTY COMPILE_DEFINITIONS 
+    VALUES ${LY_PAL_TOOLS_DEFINES}
+)
+
+ly_add_target(
+    NAME CrySystem ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
+    NAMESPACE Legacy
+    FILES_CMAKE
+        crysystem_shared_files.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+    BUILD_DEPENDENCIES
+        PRIVATE
+            Legacy::CrySystem.Static
+            AZ::AzCore
+            Legacy::CryCommon
+)
diff --git a/Code/Legacy/CrySystem/CmdLine.cpp b/Code/Legacy/CrySystem/CmdLine.cpp
new file mode 100644
index 0000000000..ad371626d4
--- /dev/null
+++ b/Code/Legacy/CrySystem/CmdLine.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 "CrySystem_precompiled.h"
+#include "CmdLine.h"
+
+
+void CCmdLine::PushCommand(const string& sCommand, const string& sParameter)
+{
+    if (sCommand.empty())
+    {
+        return;
+    }
+
+    ECmdLineArgType type = eCLAT_Normal;
+    const char* szCommand = sCommand.c_str();
+
+    if (sCommand[0] == '-')
+    {
+        type = eCLAT_Pre;
+        ++szCommand;
+
+        // Handle cmd line parameters that use -- properly
+        if (szCommand[0] == '-')
+        {
+            ++szCommand;
+        }
+    }
+    else if (sCommand[0] == '+')
+    {
+        type = eCLAT_Post;
+        ++szCommand;
+    }
+
+    m_args.push_back(CCmdLineArg(szCommand, sParameter.c_str(), type));
+}
+
+CCmdLine::CCmdLine(const char* commandLine)
+{
+    m_sCmdLine = commandLine;
+
+    char* src = (char*)commandLine;
+
+    string command, parameter;
+
+    for (;; )
+    {
+        if (*src == '\0')
+        {
+            break;
+        }
+
+        string arg = Next(src);
+
+        if (m_args.empty())
+        {
+            // this is the filename, convert backslash to forward slash
+            arg.replace('\\', '/');
+            m_args.push_back(CCmdLineArg("filename", arg.c_str(), eCLAT_Executable));
+        }
+        else
+        {
+            bool bSecondCharIsNumber = false;
+
+            if (arg[0] && arg[1] >= '0' && arg[1] <= '9')
+            {
+                bSecondCharIsNumber = true;
+            }
+
+            if ((arg[0] == '-' && !bSecondCharIsNumber)
+                || (arg[0] == '+' && !bSecondCharIsNumber)
+                || command.empty())                                             // separator or first parameter
+            {
+                PushCommand(command, parameter);
+
+                command = arg;
+                parameter = "";
+            }
+            else
+            {
+                if (parameter.empty())
+                {
+                    parameter = arg;
+                }
+                else
+                {
+                    parameter += string(" ") + arg;
+                }
+            }
+        }
+    }
+
+    PushCommand(command, parameter);
+}
+
+CCmdLine::~CCmdLine()
+{
+}
+
+const ICmdLineArg* CCmdLine::GetArg(int n) const
+{
+    if ((n >= 0) && (n < (int)m_args.size()))
+    {
+        return &m_args[n];
+    }
+
+    return 0;
+}
+
+int CCmdLine::GetArgCount() const
+{
+    return (int)m_args.size();
+}
+
+const ICmdLineArg* CCmdLine::FindArg(const ECmdLineArgType ArgType, const char* name, bool caseSensitive) const
+{
+    if (caseSensitive)
+    {
+        for (std::vector<CCmdLineArg>::const_iterator it = m_args.begin(); it != m_args.end(); ++it)
+        {
+            if (it->GetType() == ArgType)
+            {
+                if (!strcmp(it->GetName(), name))
+                {
+                    return &(*it);
+                }
+            }
+        }
+    }
+    else
+    {
+        for (std::vector<CCmdLineArg>::const_iterator it = m_args.begin(); it != m_args.end(); ++it)
+        {
+            if (it->GetType() == ArgType)
+            {
+                if (!_stricmp(it->GetName(), name))
+                {
+                    return &(*it);
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+string CCmdLine::Next(char*& src)
+{
+    char ch = 0;
+    char* org = src;
+
+    ch = *src++;
+    while (ch)
+    {
+        switch (ch)
+        {
+        case '\'':
+        case '\"':
+            org = src;
+
+            while ((*src++ != ch) && *src)
+            {
+                ;
+            }
+
+            return string(org, src - 1);
+
+        case '[':
+            org = src;
+            while ((*src++ != ']') && *src)
+            {
+                ;
+            }
+            return string(org, src - 1);
+
+        case ' ':
+            ch = *src++;
+            continue;
+        default:
+            org = src - 1;
+            for (; *src != ' ' && *src != '\t' && *src; ++src)
+            {
+                ;
+            }
+
+            return string(org, src);
+        }
+        ch = *src++;
+    }
+
+    return string();
+}
+
+
diff --git a/Code/Legacy/CrySystem/CmdLine.h b/Code/Legacy/CrySystem/CmdLine.h
new file mode 100644
index 0000000000..b382216918
--- /dev/null
+++ b/Code/Legacy/CrySystem/CmdLine.h
@@ -0,0 +1,42 @@
+/*
+ * 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 : Implements the command line interface ICmdLine.
+
+#ifndef CRYINCLUDE_CRYSYSTEM_CMDLINE_H
+#define CRYINCLUDE_CRYSYSTEM_CMDLINE_H
+
+#pragma once
+
+
+#include <ICmdLine.h>
+#include "CmdLineArg.h"
+
+
+class CCmdLine
+    : public ICmdLine
+{
+public:
+    CCmdLine(const char* commandLine);
+    virtual ~CCmdLine();
+
+    virtual const ICmdLineArg* GetArg(int n) const;
+    virtual int GetArgCount() const;
+    virtual const ICmdLineArg* FindArg(const ECmdLineArgType ArgType, const char* name, bool caseSensitive = false) const;
+    virtual const char* GetCommandLine() const { return m_sCmdLine; };
+
+private:
+    void PushCommand(const string& sCommand, const string& sParameter);
+    string Next(char*& str);
+
+    string m_sCmdLine;
+    std::vector<CCmdLineArg>    m_args;
+};
+
+
+#endif // CRYINCLUDE_CRYSYSTEM_CMDLINE_H
diff --git a/Code/Legacy/CrySystem/CmdLineArg.cpp b/Code/Legacy/CrySystem/CmdLineArg.cpp
new file mode 100644
index 0000000000..20526b2727
--- /dev/null
+++ b/Code/Legacy/CrySystem/CmdLineArg.cpp
@@ -0,0 +1,45 @@
+/*
+ * 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 "CmdLineArg.h"
+
+
+CCmdLineArg::CCmdLineArg(const char* name, const char* value, ECmdLineArgType type)
+{
+    m_name = name;
+    m_value = value;
+    m_type = type;
+}
+
+CCmdLineArg::~CCmdLineArg()
+{
+}
+
+const char* CCmdLineArg::GetName() const
+{
+    return m_name.c_str();
+}
+const char* CCmdLineArg::GetValue() const
+{
+    return m_value.c_str();
+}
+const ECmdLineArgType CCmdLineArg::GetType() const
+{
+    return m_type;
+}
+const float CCmdLineArg::GetFValue() const
+{
+    return (float)atof(m_value.c_str());
+}
+const int CCmdLineArg::GetIValue() const
+{
+    return atoi(m_value.c_str());
+}
+
+
diff --git a/Code/Legacy/CrySystem/CmdLineArg.h b/Code/Legacy/CrySystem/CmdLineArg.h
new file mode 100644
index 0000000000..7c9deae826
--- /dev/null
+++ b/Code/Legacy/CrySystem/CmdLineArg.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
+ *
+ */
+
+
+// Description : Implements the command line argument interface ICmdLineArg.
+
+
+#ifndef CRYINCLUDE_CRYSYSTEM_CMDLINEARG_H
+#define CRYINCLUDE_CRYSYSTEM_CMDLINEARG_H
+
+#pragma once
+
+#include <ICmdLine.h>
+
+
+class CCmdLineArg
+    : public ICmdLineArg
+{
+public:
+    CCmdLineArg(const char* name, const char* value, ECmdLineArgType type);
+    virtual ~CCmdLineArg();
+
+    const char* GetName() const;
+    const char* GetValue() const;
+    const ECmdLineArgType GetType() const;
+    const float GetFValue() const;
+    const int GetIValue() const;
+
+private:
+
+    ECmdLineArgType m_type;
+    string          m_name;
+    string          m_value;
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_CMDLINEARG_H
diff --git a/Code/Legacy/CrySystem/ConsoleBatchFile.cpp b/Code/Legacy/CrySystem/ConsoleBatchFile.cpp
new file mode 100644
index 0000000000..97d6b582f4
--- /dev/null
+++ b/Code/Legacy/CrySystem/ConsoleBatchFile.cpp
@@ -0,0 +1,178 @@
+/*
+ * 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 : Executes an ASCII batch file of console commands...
+
+
+#include "CrySystem_precompiled.h"
+#include "ConsoleBatchFile.h"
+#include "IConsole.h"
+#include "ISystem.h"
+#include "XConsole.h"
+#include <CryPath.h>
+#include <stdio.h>
+#include "System.h"
+#include <AzCore/IO/FileIO.h>
+
+IConsole* CConsoleBatchFile::m_pConsole = NULL;
+
+void CConsoleBatchFile::Init()
+{
+    m_pConsole = gEnv->pConsole;
+    REGISTER_COMMAND("exec", (ConsoleCommandFunc)ExecuteFileCmdFunc, 0, "executes a batch file of console commands");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CConsoleBatchFile::ExecuteFileCmdFunc(IConsoleCmdArgs* args)
+{
+    if (!m_pConsole)
+    {
+        Init();
+    }
+
+    if (!args->GetArg(1))
+    {
+        return;
+    }
+
+    ExecuteConfigFile(args->GetArg(1));
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CConsoleBatchFile::ExecuteConfigFile(const char* sFilename)
+{
+    if (!sFilename)
+    {
+        return false;
+    }
+
+    if (!m_pConsole)
+    {
+        Init();
+    }
+
+    string filename;
+
+    if (sFilename[0] != '@') // console config files are actually by default in @root@ instead of @assets@
+    {
+        // However, if we've passed in a relative or absolute path that matches an existing file name,
+        // don't change it.  Only change it to "@root@/filename" and strip off any relative paths
+        // if the given pattern *didn't* match a file.
+        if (AZ::IO::FileIOBase::GetDirectInstance()->Exists(sFilename))
+        {
+            filename = sFilename;
+        }
+        else
+        {
+            filename = PathUtil::Make("@root@", PathUtil::GetFile(sFilename));
+        }
+    }
+    else
+    {
+        filename = sFilename;
+    }
+
+    if (strlen(PathUtil::GetExt(filename)) == 0)
+    {
+        filename = PathUtil::ReplaceExtension(filename, "cfg");
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    CCryFile file;
+
+    {
+        const char* szLog = "Executing console batch file (try game,config,root):";
+        string filenameLog;
+        string sfn = PathUtil::GetFile(filename);
+
+        if (file.Open(filename, "rb", AZ::IO::IArchive::FOPEN_HINT_QUIET | AZ::IO::IArchive::FOPEN_ONDISK))
+        {
+            filenameLog = string("game/") + sfn;
+        }
+        else if (file.Open(string("config/") + sfn, "rb", AZ::IO::IArchive::FOPEN_HINT_QUIET | AZ::IO::IArchive::FOPEN_ONDISK))
+        {
+            filenameLog = string("game/config/") + sfn;
+        }
+        else if (file.Open(string("./") + sfn, "rb", AZ::IO::IArchive::FOPEN_HINT_QUIET | AZ::IO::IArchive::FOPEN_ONDISK))
+        {
+            filenameLog = string("./") + sfn;
+        }
+        else
+        {
+            CryLog("%s \"%s\" not found!", szLog, filename.c_str());
+            return false;
+        }
+
+        CryLog("%s \"%s\" found in %s ...", szLog, PathUtil::GetFile(filenameLog.c_str()), PathUtil::GetPath(filenameLog).c_str());
+    }
+
+    int nLen = file.GetLength();
+    char* sAllText = new char [nLen + 16];
+    file.ReadRaw(sAllText, nLen);
+    sAllText[nLen] = '\0';
+    sAllText[nLen + 1] = '\0';
+
+    /*
+        This can't work properly as ShowConsole() can be called during the execution of the scripts,
+        which means bConsoleStatus is outdated and must not be set at the end of the function
+
+        bool bConsoleStatus = ((CXConsole*)m_pConsole)->GetStatus();
+        ((CXConsole*)m_pConsole)->SetStatus(false);
+    */
+
+    char* strLast = sAllText + nLen;
+    char* str = sAllText;
+    while (str < strLast)
+    {
+        char* s = str;
+        while (str < strLast && *str != '\n' && *str != '\r')
+        {
+            str++;
+        }
+        *str = '\0';
+        str++;
+        while (str < strLast && (*str == '\n' || *str == '\r'))
+        {
+            str++;
+        }
+
+        string strLine = s;
+
+
+        //trim all whitespace characters at the beginning and the end of the current line and store its size
+        strLine.Trim();
+        size_t strLineSize = strLine.size();
+
+        //skip comments, comments start with ";" or "--" but may have preceding whitespace characters
+        if (strLineSize > 0)
+        {
+            if (strLine[0] == ';')
+            {
+                continue;
+            }
+            else if (strLine.find("--") == 0)
+            {
+                continue;
+            }
+        }
+        //skip empty lines
+        else
+        {
+            continue;
+        }
+
+        {
+            m_pConsole->ExecuteString(strLine);
+        }
+    }
+    // See above
+    //  ((CXConsole*)m_pConsole)->SetStatus(bConsoleStatus);
+
+    delete []sAllText;
+    return true;
+}
diff --git a/Code/Legacy/CrySystem/ConsoleBatchFile.h b/Code/Legacy/CrySystem/ConsoleBatchFile.h
new file mode 100644
index 0000000000..0651c36187
--- /dev/null
+++ b/Code/Legacy/CrySystem/ConsoleBatchFile.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
+ *
+ */
+
+
+// Description : Executes an ASCII batch file of console commands...
+
+
+#ifndef CRYINCLUDE_CRYSYSTEM_CONSOLEBATCHFILE_H
+#define CRYINCLUDE_CRYSYSTEM_CONSOLEBATCHFILE_H
+
+#pragma once
+
+struct IConsoleCmdArgs;
+struct IConsole;
+
+class CConsoleBatchFile
+{
+public:
+    static void Init();
+    static bool ExecuteConfigFile(const char* filename);
+
+private:
+    static void ExecuteFileCmdFunc(IConsoleCmdArgs* args);
+    static IConsole*        m_pConsole;
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_CONSOLEBATCHFILE_H
diff --git a/Code/Legacy/CrySystem/ConsoleHelpGen.cpp b/Code/Legacy/CrySystem/ConsoleHelpGen.cpp
new file mode 100644
index 0000000000..35be83b4ed
--- /dev/null
+++ b/Code/Legacy/CrySystem/ConsoleHelpGen.cpp
@@ -0,0 +1,942 @@
+/*
+ * 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"
+
+#if defined(WIN32) || defined(WIN64)
+
+#include "ConsoleHelpGen.h"
+#include "System.h"
+
+
+
+// remove bad characters, toupper, not very fast
+string CConsoleHelpGen::FixAnchorName(const char* szName)
+{
+    string ret;
+
+    const char* p = szName;
+
+    while (*p)
+    {
+        if ((*p >= 'a' && *p <= 'z')
+            || (*p >= 'A' && *p <= 'Z')
+            || (*p >= '0' && *p <= '9'))
+        {
+            if (*p >= 'a' && *p <= 'z')
+            {
+                ret += *p - 'a' + 'A';
+            }
+            else
+            {
+                ret += *p;
+            }
+        }
+
+        ++p;
+    }
+
+    return ret;
+}
+
+string CConsoleHelpGen::GetCleanPrefix(const char* p)
+{
+    string sRet;
+
+    while (*p != '_' && *p != 0)
+    {
+        sRet += *p++;
+    }
+
+    return sRet;
+}
+
+
+string CConsoleHelpGen::SplitPrefixString_Part1(const char* p)
+{
+    string sRet;
+
+    while (*p != 10 && *p != 13 && *p != 0)
+    {
+        sRet += *p++;
+    }
+
+    return sRet;
+}
+
+const char* CConsoleHelpGen::SplitPrefixString_Part2(const char* p)
+{
+    while (*p != 10 && *p != 13 && *p != 0)
+    {
+        p++;
+    }
+
+    while (*p == 10 || *p == 13)
+    {
+        p++;
+    }
+
+    return p;
+}
+
+void CConsoleHelpGen::StartPage(FILE* f, const char* szPageName, const char* szPageDescription) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<HTML><HEAD><TITLE>%s</TITLE><META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=iso-8859-1\">", szPageName);
+        fprintf(f, "<META NAME=\"DESCRIPTION\" CONTENT=\"%s\">", szPageDescription);
+        fprintf(f, "<META NAME=\"author\" content=\"Contributors to the Open 3D Engine Project\">");
+        fprintf(f, "<META NAME=\"copyright\" CONTENT=\"Contributors to the Open 3D Engine Project\">");
+        fprintf(f, "<META NAME=\"KEYWORDS\" CONTENT=\"O3DE\">");
+        fprintf(f, "<META NAME=\"distribution\" CONTENT=\"Contributors to the Open 3D Engine Project\">");
+        fprintf(f, "<META NAME=\"revisit-after\" CONTENT=\"10 days\">");
+        fprintf(f, "<META NAME=\"robots\" CONTENT=\"INDEX, NOFOLLOW\">");
+        fprintf(f, "</HEAD><BODY bgcolor=#ffffff leftmargin=0 topmargin=0 alink=#0000ff link=#0000ff vlink=#0000ff text=#000000>");
+    }
+}
+
+void CConsoleHelpGen::EndPage(FILE* f) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<P></P></BODY></HTML>");
+    }
+}
+
+
+void CConsoleHelpGen::KeyValue(FILE* f, const char* szKey, const char* szValue) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<b>%s:</b> %s<br>\n", szKey, szValue);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        //      fprintf(f,"*%s:* %s\n",szKey,szValue);
+        fprintf(f, "| *%s:* | %s |\n", szKey, szValue);
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+void CConsoleHelpGen::LogVersion(FILE* f) const
+{
+    char s[1024];
+
+    {
+        GetModuleFileName(NULL, s, sizeof(s));
+
+        char fdir[_MAX_PATH];
+        char fdrive[_MAX_PATH];
+        char file[_MAX_PATH];
+        char fext[_MAX_PATH];
+        _splitpath_s(s, fdrive, fdir, file, fext);
+
+        KeyValue(f, "Executable", (string(file) + fext).c_str());
+    }
+
+    {
+        time_t ltime;
+
+        time(&ltime);
+        tm today;
+        localtime_s(&today, &ltime);
+
+        strftime(s, 128, "%c", &today);
+        KeyValue(f, "Date(MM/DD/YY) Time", s);
+    }
+
+    {
+        const SFileVersion& ver = gEnv->pSystem->GetFileVersion();
+        ver.ToString(s, sizeof(s));
+
+        KeyValue(f, "FileVersion", s);
+    }
+
+    {
+        const SFileVersion& ver = gEnv->pSystem->GetProductVersion();
+        ver.ToString(s, sizeof(s));
+
+        KeyValue(f, "ProductVersion", s);
+    }
+
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<br>\n");
+    }
+}
+
+void CConsoleHelpGen::StartH1(FILE* f, const char* szName) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<h1>%s</h1>\n", szName);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        fprintf(f, "h1. %s\n", szName);
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+void CConsoleHelpGen::EndH1(FILE* f) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<br>\n");
+    }
+}
+
+void CConsoleHelpGen::StartH3(FILE* f, const char* szName) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<h3>%s</h3><ul>\n", szName);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        fprintf(f, "\nh3. %s\n", szName);
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+void CConsoleHelpGen::EndH3(FILE* f) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "</ul>\n");
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+
+
+void CConsoleHelpGen::StartCVar(FILE* f, const char* szName) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<h3>%s</h3><ul>\n", szName);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        //      fprintf(f,"\nh3. %s\n",szName);
+        fprintf(f, "\n<div class=\"panel\" style=\"border-style: none;border-width: 1px;\"><div class=\"panelContent\"><p><b>%s</b><br/>\n", szName);
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+void CConsoleHelpGen::EndCVar(FILE* f) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "</ul>\n");
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        fprintf(f, "</div></div>\n\n");
+    }
+    else
+    {
+        assert(0);
+    }
+}
+void CConsoleHelpGen::SingleLinePrefix(FILE* f, const char* szPrefix, const char* szPrefixDesc, const char* szLink) const
+{
+    // group within the list of all groups (no elements)
+
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<li><a href=\"%s\">%s_ %s</a></li>\n", szLink, szPrefix, szPrefixDesc);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        string sPrefix;
+
+        if (*szPrefix)
+        {
+            sPrefix = string(szPrefix) + "_";
+        }
+
+        //      fprintf(f,"| %s | [%s|%s] |\n",sPrefix.c_str(),szPrefixDesc,szLink);        // e.g. "" "CL_" "CC_" "I_" "T_"
+        fprintf(f, "{section:border=false}\n"
+            "{column:width=50px}{align:right}%s{align}{column}\n"
+            "{column:width=10px}{column}\n"
+            "{column}{align:left}[%s|%s]{align}{column}\n"
+            "{section}\n",
+            sPrefix.c_str(), szPrefixDesc, szLink);                     // e.g. "" "CL_" "CC_" "I_" "T_"
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+void CConsoleHelpGen::StartPrefix(FILE* f, const char* szPrefix, const char* szPrefixDesc, const char* szLink) const
+{
+    // group before all the group elements
+
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<li><a href=\"%s\">%s_ %s</li></a><ul>\n", szLink, szPrefix, szPrefixDesc);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        if (*szPrefix)
+        {
+            fprintf(f, "* [%s %s|%s]\n", szPrefix, szPrefixDesc, szLink);
+        }
+        else
+        {
+            fprintf(f, "* [%s|%s]\n", szPrefixDesc, szLink);
+        }
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+void CConsoleHelpGen::EndPrefix(FILE* f) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "</ul>\n");
+    }
+}
+
+void CConsoleHelpGen::SingleLineEntry_InGlobal(FILE* f, const char* szName, const char* szLink) const
+{
+    // element within a group
+
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<li><a href=\"%s\">%s</a></li>\n", szLink, szName);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        fprintf(f, "** [%s|%s]\n", szName, szLink);
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+
+void CConsoleHelpGen::SingleLineEntry_InGroup(FILE* f, const char* szName, const char* szLink) const
+{
+    // element within a group
+
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<li><a href=\"%s\">%s</a></li>\n", szLink, szName);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        fprintf(f, "* [%s|%s]\n", szName, szLink);
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+// szName without #
+void CConsoleHelpGen::Anchor(FILE* f, const char* szName) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<a name=\"%s\"></a>\n", szName);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        fprintf(f, "{anchor:%s}", szName);
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+void CConsoleHelpGen::InsertConsoleVars(std::set<const char*, string_nocase_lt>& setCmdAndVars, const char* szLocalPrefix) const
+{
+    CXConsole::ConsoleVariablesMap::const_iterator itrVar, itrVarEnd = m_rParent.m_mapVariables.end();
+
+    for (itrVar = m_rParent.m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
+    {
+        ICVar* var = itrVar->second;
+
+        if (_strnicmp(var->GetName(), szLocalPrefix, strlen(szLocalPrefix)) == 0)
+        {
+            setCmdAndVars.insert(var->GetName());
+        }
+    }
+}
+
+
+
+void CConsoleHelpGen::InsertConsoleCommands(std::set<const char*, string_nocase_lt>& setCmdAndVars, const char* szLocalPrefix) const
+{
+    CXConsole::ConsoleCommandsMap::const_iterator itrCmd, itrCmdEnd = m_rParent.m_mapCommands.end();
+
+    for (itrCmd = m_rParent.m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
+    {
+        const CConsoleCommand& cmd = itrCmd->second;
+
+        if (_strnicmp(cmd.m_sName, szLocalPrefix, strlen(szLocalPrefix)) == 0)
+        {
+            setCmdAndVars.insert(cmd.m_sName.c_str());
+        }
+    }
+}
+
+
+
+void CConsoleHelpGen::InsertConsoleVars(std::set<const char*, string_nocase_lt>& setCmdAndVars, std::map<string, const char*> mapPrefix) const
+{
+    CXConsole::ConsoleVariablesMap::const_iterator itrVar, itrVarEnd = m_rParent.m_mapVariables.end();
+
+    for (itrVar = m_rParent.m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
+    {
+        ICVar* var = itrVar->second;
+        bool bInsert = true;
+
+        {
+            std::map<string, const char*>::const_iterator it2, end = mapPrefix.end();
+
+            for (it2 = mapPrefix.begin(); it2 != end; ++it2)
+            {
+                if (it2->first != "___" && _strnicmp(var->GetName(), it2->first, it2->first.size()) == 0)
+                {
+                    bInsert = false;
+                    break;
+                }
+            }
+        }
+
+        if (bInsert)
+        {
+            setCmdAndVars.insert(var->GetName());
+        }
+    }
+}
+
+
+
+void CConsoleHelpGen::InsertConsoleCommands(std::set<const char*, string_nocase_lt>& setCmdAndVars, std::map<string, const char*> mapPrefix) const
+{
+    CXConsole::ConsoleCommandsMap::const_iterator itrCmd, itrCmdEnd = m_rParent.m_mapCommands.end();
+
+    for (itrCmd = m_rParent.m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
+    {
+        const CConsoleCommand& cmd = itrCmd->second;
+        bool bInsert = true;
+
+        {
+            std::map<string, const char*>::const_iterator it2, end = mapPrefix.end();
+
+            for (it2 = mapPrefix.begin(); it2 != end; ++it2)
+            {
+                if (it2->first != "___" && _strnicmp(cmd.m_sName, it2->first, it2->first.size()) == 0)
+                {
+                    bInsert = false;
+                    break;
+                }
+            }
+        }
+
+        if (bInsert)
+        {
+            setCmdAndVars.insert(cmd.m_sName.c_str());
+        }
+    }
+}
+
+void CConsoleHelpGen::CreateSingleEntryFile(const char* szName) const
+{
+    assert(m_eWorkMode == eWM_Confluence);    // only needed for confluence
+
+    FILE* f3 = nullptr;
+    azfopen(&f3, (string(GetFolderName()) + GetFileExtension() + "/" + FixAnchorName(szName)).c_str(), "w");
+
+    if (!f3)
+    {
+        assert(0);
+        return;         // error
+    }
+
+    //  StartPage(f3,szName,"");        // HTML style
+
+    IncludeSingleEntry(f3, szName);
+
+    //  EndPage(f3);        // HTML style
+
+    fclose(f3);
+}
+
+const CConsoleCommand* CConsoleHelpGen::FindConsoleCommand(const char* szName) const
+{
+    CXConsole::ConsoleCommandsMap::const_iterator itrCmd, itrCmdEnd = m_rParent.m_mapCommands.end();
+
+    for (itrCmd = m_rParent.m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
+    {
+        const CConsoleCommand& cmd = itrCmd->second;
+
+        if (strcmp(cmd.m_sName.c_str(), szName) == 0)
+        {
+            return &cmd;
+        }
+    }
+
+    return 0;
+}
+
+
+void CConsoleHelpGen::IncludeSingleEntry(FILE* f, const char* szName) const
+{
+    StartCVar(f, szName);
+
+    uint32 dwFlags = 0;
+    const char* szHelp = "";
+
+    // slow but good for simpler code
+    if (ICVar* pVar = gEnv->pConsole->GetCVar(szName))
+    {
+        dwFlags = pVar->GetFlags();
+        szHelp = pVar->GetHelp();
+    }
+    else if (const CConsoleCommand* pCommand = FindConsoleCommand(szName))
+    {
+        dwFlags = pCommand->m_nFlags;
+        szHelp = pCommand->m_sHelp.c_str();
+    }
+    else
+    {
+        assert(0);      // internal error
+    }
+    const char* szFlags = CXConsole::GetFlagsString(dwFlags);
+
+    if (*szFlags)
+    {
+        //      fprintf(f3,"%%GRAY%% %s %%ENDCOLOR%%<br>\n",szFlags);       // twiki style
+        if (m_eWorkMode == eWM_HTML)
+        {
+            fprintf(f, "%s<br>\n", szFlags);          // simple HTML style
+        }
+        else if (m_eWorkMode == eWM_Confluence)
+        {
+            fprintf(f, "<font color=\"#808080\">%s</font></p>\n", szFlags);
+        }
+        else
+        {
+            assert(0);
+        }
+    }
+
+    if (*szHelp == 0)
+    {
+        //      fprintf(f,"%%TODO%%\n");    // wiki style, in our wiki %TODO% is defined as <img src=\"%%ICONURL{todo}%%\" width=\"37\" height=\"16\" alt=\"TODO\" border=\"0\" />
+        if (m_eWorkMode == eWM_HTML)
+        {
+            fprintf(f, "<blockquote></b>*TODO*</b></blockquote>\n"); // HTML style
+        }
+        else if (m_eWorkMode == eWM_Confluence)
+        {
+            fprintf(f, "{warning}TODO{warning}\n");          // Confluence style
+        }
+        else
+        {
+            assert(0);
+        }
+    }
+    else
+    {
+        if (m_eWorkMode == eWM_HTML)
+        {
+            fprintf(f, "<blockquote><pre><verbatim><tt>\n%s\n</tt></verbatim></pre></blockquote>\n", szHelp);        // HTML style, <tt> to get fixed with font (layout in code is often making the assumption the forn is fixed width)
+        }
+        else if (m_eWorkMode == eWM_Confluence)
+        {
+            fprintf(f, "<pre>\n");
+
+            string sHelp = szHelp;
+
+            // currently not required as the {noformat} is used
+            //          sHelp.replace("[","\\[");       sHelp.replace("]","\\]");
+            //          sHelp.replace("{","\\{");       sHelp.replace("}","\\}");
+            //          sHelp.replace("(","\\(");       sHelp.replace(")","\\)");
+
+            fprintf(f, "%s\n", sHelp.c_str());       // Confluence style
+
+            fprintf(f, "</pre>");
+        }
+        else
+        {
+            assert(0);
+        }
+    }
+
+    EndCVar(f);
+}
+
+void CConsoleHelpGen::Work()
+{
+    //  string sEngineFolder = string("@user@/")+GetFolderName();
+    //  gEnv->pCryPak->RemoveDir(sEngineFolder.c_str());            // todo: check if that works
+    //  gEnv->pFileIO->CreatePath(sEngineFolder.c_str());
+
+    m_eWorkMode = eWM_HTML;
+    CreateMainPages();
+
+    m_eWorkMode = eWM_Confluence;
+    CreateMainPages();
+    CreateFileForEachEntry();
+
+    m_eWorkMode = eWM_None;
+}
+
+
+
+void CConsoleHelpGen::CreateFileForEachEntry()
+{
+    assert(m_eWorkMode == eWM_Confluence);    // only needed for confluence
+
+    // generate a single file for each console command
+    {
+        CXConsole::ConsoleCommandsMap::const_iterator itrCmd, itrCmdEnd = m_rParent.m_mapCommands.end();
+
+        for (itrCmd = m_rParent.m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
+        {
+            const CConsoleCommand& cmd = itrCmd->second;
+
+            CreateSingleEntryFile(cmd.m_sName.c_str());
+        }
+    }
+
+    // generate a single file for each console variable
+    {
+        CXConsole::ConsoleVariablesMap::iterator itrVar, itrVarEnd = m_rParent.m_mapVariables.end();
+
+        for (itrVar = m_rParent.m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
+        {
+            ICVar* var = itrVar->second;
+
+            CreateSingleEntryFile(var->GetName());
+        }
+    }
+}
+
+void CConsoleHelpGen::CreateMainPages()
+{
+    gEnv->pFileIO->CreatePath(GetFolderName());
+
+    std::map<string, const char*> mapPrefix;
+
+    // order here doesn't matter, after the name some help can be added (after the first return)
+    mapPrefix[     "AI_"] = "Artificial Intelligence";
+    mapPrefix[    "NET_"] = "Network";
+    mapPrefix[     "ED_"] = "Editor";
+    mapPrefix[     "ES_"] = "Entity System";
+    mapPrefix[    "CON_"] = "Console";
+    mapPrefix[     "AG_"] = "Animation Graph"               "\n"    "High level animation logic, describes animation selection and flow, matches animation state to current game logical state.";
+    mapPrefix[     "AC_"] = "Animated Character"            "\n"    "Better name would be 'Character Movement'.\nBridges game controlled movement and animation controlled movement.";
+    mapPrefix[     "CA_"] = "Character Animation"           "\n"    "Motion synthesize and playback, parameterization through blending and inversed kinematics.";
+    mapPrefix[      "E_"] = "3DEngine";
+    mapPrefix[      "I_"] = "Input";
+    mapPrefix[     "FG_"] = "Flow Graph"                    "\n"    "hyper graph: game logic";
+    mapPrefix[      "P_"] = "Physics";
+    mapPrefix[      "R_"] = "Renderer";
+    mapPrefix[      "S_"] = "Sound";
+    mapPrefix[      "G_"] = "Game"                          "\n"    "game specific, not part of CryEngine";
+    mapPrefix[    "SYS_"] = "System";
+    mapPrefix[      "V_"] = "Vehicle";
+    mapPrefix[     "FT_"] = "Feature Test";
+    mapPrefix[   "DEMO_"] = "Time Demo";
+    mapPrefix[     "FT_"] = "Feature Test";
+    mapPrefix[     "GL_"] = "Game Lobby";
+    mapPrefix[    "HUD_"] = "Heads Up Display";
+    mapPrefix[     "KC_"] = "Kill Cam";
+    mapPrefix[     "PL_"] = "Player";
+    mapPrefix[     "PP_"] = "Player Progression";
+    mapPrefix[    "AIM_"] = "Aiming";
+    mapPrefix["CAPTURE_"] = "Capture";
+    mapPrefix[     "DS_"] = "Dialog Scripts";
+    mapPrefix[     "GT_"] = "Game Token";
+    mapPrefix[    "LOG_"] = "Logging";
+    mapPrefix[    "MOV_"] = "Movie Sequences";
+    mapPrefix[    "OSM_"] = "Overload Scene Manager";
+    mapPrefix["PROFILE_"] = "Profiling";
+    mapPrefix[   "STAP_"] = "Screen-space Torso Aim Pose";
+    mapPrefix[    "LUA_"] = "Lua"                           "\n"    "scripting system";
+    mapPrefix[     "SV_"] = "Server";
+    mapPrefix[    "MFX_"] = "Material Effects";
+    mapPrefix[      "M_"] = "Multi threading";
+    mapPrefix[     "CC_"] = "Character Customization";
+    mapPrefix[     "CL_"] = "Client";
+    mapPrefix[      "Q_"] = "Quality"                       "\n"    "usually shader quality";
+    mapPrefix[      "T_"] = "Timer";
+    mapPrefix[     "___"] = "Remaining";            // key defined to get it sorted in the end
+
+    FILE* f1 = nullptr;
+    azfopen(&f1, (string(GetFolderName()) + "/index" + GetFileExtension()).c_str(), "w");
+    if (!f1)
+    {
+        return;
+    }
+
+    StartPage(f1, "CryEngine ConsoleHTMLHelp", "main page");
+
+    StartH1(f1, "Console Commands and Variables");
+
+    LogVersion(f1);
+
+
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f1, "This list was exported from the engine by using the <b>DumpCommandsVars</b> console command.<br>\n\n");
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        fprintf(f1, "This list was exported from the engine by using the *DumpCommandsVars* console command.\n\n");
+    }
+    else
+    {
+        assert(0);
+    }
+
+    // show all registered Prefix with one line
+    {
+        std::map<string, const char*>::const_iterator it, end = mapPrefix.end();
+
+        StartH3(f1, "Registered Prefixes");
+
+        for (it = mapPrefix.begin(); it != end; ++it)
+        {
+            const char* szLocalPrefix = it->first.c_str();      // can be 0 for remaining ones
+            string sCleanPrefix = GetCleanPrefix(szLocalPrefix);
+            string sPrefixName = SplitPrefixString_Part1(it->second);
+
+            SingleLinePrefix(f1, sCleanPrefix.c_str(), sPrefixName.c_str(), (string("CONSOLEPREFIX") + FixAnchorName(sCleanPrefix.c_str()) + GetFileExtension()).c_str());
+            //          fprintf(f1,"   * [[CONSOLEPREFIX%s][%s_ %s]]\n",FixAnchorName(sCleanPrefix.c_str()).c_str(),sCleanPrefix.c_str(),sPrefixName.c_str());
+        }
+
+        EndH3(f1);  // Registered prefixes
+    }
+
+
+
+
+    {
+        std::map<string, const char*>::const_iterator it, it2, end = mapPrefix.end();
+
+        StartH3(f1, "Console Commands and Variables Sorted by Prefix");
+
+        for (it = mapPrefix.begin(); it != end; ++it)
+        {
+            const char* szLocalPrefix = it->first.c_str();      // can be 0 for remaining ones
+            string sCleanPrefix = GetCleanPrefix(szLocalPrefix);
+            string sPrefixName = SplitPrefixString_Part1(it->second);
+
+            std::set<const char*, string_nocase_lt> setCmdAndVars;      // to get console variables and commands sorted together
+
+            if (strcmp("___", szLocalPrefix) != 0)
+            {
+                // insert all starting with the prefix
+                InsertConsoleVars(setCmdAndVars, szLocalPrefix);
+                InsertConsoleCommands(setCmdAndVars, szLocalPrefix);
+            }
+            else
+            {
+                // insert all not starting with any of the prefix
+                InsertConsoleVars(setCmdAndVars, mapPrefix);
+                InsertConsoleCommands(setCmdAndVars, mapPrefix);
+            }
+
+            // -------------------------------
+
+            string sSubName = string("CONSOLEPREFIX") + sCleanPrefix;
+
+            StartPrefix(f1, sCleanPrefix.c_str(), sPrefixName.c_str(), (sSubName + GetFileExtension()).c_str());
+
+            string sFileOut = string(GetFolderName()) + "/" + sSubName + GetFileExtension();
+            FILE* f2 = nullptr;
+            azfopen(&f2, sFileOut.c_str(), "w");
+            if (!f2)
+            {
+                fclose(f1);
+                return;
+            }
+
+            // headline
+            {
+                string sHeadline;
+
+                if (sCleanPrefix.empty())
+                {
+                    sHeadline = "Console Commands and Variables Without Special Prefix";
+                }
+                else
+                {
+                    sHeadline = string("Console Commands and Variables with Prefix ") + sCleanPrefix + "_";
+                }
+
+                StartH1(f2, sHeadline.c_str());
+            }
+
+            Explanation(f2, SplitPrefixString_Part2(it->second));
+
+            KeyValue(f2, "Possible Flags", CXConsole::GetFlagsString(0xffffffff));
+            //          fprintf(f2,"<b>Possible Flags:</b><br>\n");
+            //          fprintf(f2,"     <blockquote>%s</blockquote>",CXConsole::GetFlagsString(0xffffffff));
+
+            // log console variables and commands
+            {
+                StartH3(f2, "Alphabetically Sorted");
+
+                std::set<const char*, string_nocase_lt>::const_iterator itI, endI = setCmdAndVars.end();
+
+                for (itI = setCmdAndVars.begin(); itI != endI; ++itI)
+                {
+                    SingleLineEntry_InGlobal(f1, *itI, (sSubName + GetFileExtension() + "#Anchor" + FixAnchorName(*itI)).c_str());
+                    SingleLineEntry_InGroup(f2, *itI, (string("#Anchor") + FixAnchorName(*itI)).c_str());
+                }
+
+                EndH3(f2);
+            }
+
+            {
+                StartH3(f2, "Console Variables and Commands");
+
+                bool bFirst = true;
+                {
+                    std::set<const char*, string_nocase_lt>::const_iterator itI, endI = setCmdAndVars.end();
+
+                    for (itI = setCmdAndVars.begin(); itI != endI; ++itI)
+                    {
+                        if (!bFirst)
+                        {
+                            Separator(f2);
+                        }
+                        bFirst = false;
+
+                        Anchor(f2, (string("Anchor") + FixAnchorName(*itI)).c_str());      // anchor
+
+                        IncludeSingleEntry(f2, *itI);
+                    }
+                }
+                EndH3(f2);
+            }
+
+            EndH1(f2);  // Console Commands and Variables ...
+
+            fclose(f2);
+            f2 = 0;
+
+            EndPrefix(f1);
+        }
+
+        EndH3(f1);  // Console commands and variables sorted by prefix
+    }
+
+    EndH1(f1);
+    EndPage(f1);
+
+    fclose(f1);
+
+    m_rParent.ConsoleLogInputResponse("successfully wrote directory %s", GetFolderName());
+}
+
+void CConsoleHelpGen::Separator(FILE* f) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<hr>\n");
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        //      fprintf(f,"----\n");
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+
+void CConsoleHelpGen::Explanation(FILE* f, const char* szText) const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        fprintf(f, "<blockquote>%s</blockquote><br>\n<br>\n", szText);
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        //      fprintf(f,"{quote}%s{quote}\n\n",szText);
+        fprintf(f, "%s\n\n", szText);
+    }
+    else
+    {
+        assert(0);
+    }
+}
+
+const char* CConsoleHelpGen::GetFileExtension() const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        return ".html";
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+    }
+    else
+    {
+        assert(0);
+    }
+
+    return "";
+}
+
+const char* CConsoleHelpGen::GetFolderName() const
+{
+    if (m_eWorkMode == eWM_HTML)
+    {
+        return "ConsoleHTMLHelp";
+    }
+    else if (m_eWorkMode == eWM_Confluence)
+    {
+        return "ConsoleHTMLHelp/CRYAUTOGEN";
+    }
+    else
+    {
+        assert(0);
+    }
+
+    return 0;
+}
+
+
+#endif  // defined(WIN32) || defined(WIN64)
+
diff --git a/Code/Legacy/CrySystem/ConsoleHelpGen.h b/Code/Legacy/CrySystem/ConsoleHelpGen.h
new file mode 100644
index 0000000000..6dae022580
--- /dev/null
+++ b/Code/Legacy/CrySystem/ConsoleHelpGen.h
@@ -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
+ *
+ */
+
+
+#pragma once
+#ifndef CRYINCLUDE_CRYSYSTEM_CONSOLEHELPGEN_H
+#define CRYINCLUDE_CRYSYSTEM_CONSOLEHELPGEN_H
+
+#if defined(WIN32) || defined(WIN64)
+
+#include "XConsole.h"           // CXConsole, struct string_nocase_lt
+
+
+// extract consoel variable and command help
+// in some HTML pages and many small files that can be included in Confluence wiki
+// pages (so maintain the documentation only in one place)
+//
+// Possible improvements/Known issues:
+//   - Nicer HTML layout (CSS?)
+//   - Searching in the content of the cvars is tricky (main page doesn't have help content)
+//   - %TODO% (was wiki image, should look good in confluence and HTML)
+//   - many small files should be stored in some extra folder for clearity
+//   - before generating the data the older directoy should be cleaned
+//   - file should be generated in the user folder
+//   - "wb" should be used instead of "w", to get the same result in unix
+class CConsoleHelpGen
+{
+public:
+    CConsoleHelpGen(CXConsole& rParent)
+        : m_rParent(rParent)
+        , m_eWorkMode(eWM_None)
+    {
+    }
+
+    void Work();
+
+private: // --------------------------------------------------------
+
+    enum EWorkMode
+    {
+        eWM_None,
+        eWM_HTML,
+        eWM_Confluence
+    };
+
+    //
+    void CreateMainPages();
+
+    // to create one file for for each cvar/command in confluence style
+    void CreateFileForEachEntry();
+
+    // insert if the name starts with the with prefix
+    void InsertConsoleVars(std::set<const char*, string_nocase_lt>& setCmdAndVars, const char* szPrefix) const;
+    // insert if the name starts with the with prefix
+    void InsertConsoleCommands(std::set<const char*, string_nocase_lt>& setCmdAndVars, const char* szPrefix) const;
+    // insert if the name does not start with any of the prefix in the map
+    void InsertConsoleVars(std::set<const char*, string_nocase_lt>& setCmdAndVars, std::map<string, const char*> mapPrefix) const;
+    // insert if the name does not start with any of the prefix in the map
+    void InsertConsoleCommands(std::set<const char*, string_nocase_lt>& setCmdAndVars, std::map<string, const char*> mapPrefix) const;
+
+    // a single file for the entry is generate
+    void CreateSingleEntryFile(const char* szName) const;
+
+    void IncludeSingleEntry(FILE* f, const char* szName) const;
+
+    static string FixAnchorName(const char* szName);
+    static string GetCleanPrefix(const char* p);
+    // split before "|" (to get the prefix itself)
+    static string SplitPrefixString_Part1(const char* p);
+    // split string after "|" (to get the optional help)
+    static const char* SplitPrefixString_Part2(const char* p);
+
+    void StartPage(FILE* f, const char* szPageName, const char* szPageDescription) const;
+    void EndPage(FILE* f) const;
+    void StartH1(FILE* f, const char* szName) const;
+    void EndH1(FILE* f) const;
+    void StartH3(FILE* f, const char* szName) const;
+    void EndH3(FILE* f) const;
+    void StartCVar(FILE* f, const char* szName) const;
+    void EndCVar(FILE* f) const;
+    void SingleLinePrefix(FILE* f, const char* szPrefix, const char* szPrefixDesc, const char* szLink) const;
+    void StartPrefix(FILE* f, const char* szPrefix, const char* szPrefixDesc, const char* szLink) const;
+    void EndPrefix(FILE* f) const;
+    void SingleLineEntry_InGlobal(FILE* f, const char* szName, const char* szLink) const;
+    void SingleLineEntry_InGroup(FILE* f, const char* szName, const char* szLink) const;
+    void Anchor(FILE* f, const char* szName) const;
+
+    // to log some inital stats like date or application name
+    void KeyValue(FILE* f, const char* szKey, const char* szValue) const;
+
+    // prefix explanation and indention for following text
+    void Explanation(FILE* f, const char* szText) const;
+
+    void Separator(FILE* f) const;
+
+    void LogVersion(FILE* f) const;
+
+    // case senstive
+    // Returns
+    //   0 if not found
+    const CConsoleCommand* FindConsoleCommand(const char* szName) const;
+
+    // ----------------------------------------------
+
+    //
+    const char* GetFolderName() const;
+    //
+    const char* GetFileExtension() const;
+
+    // ----------------------------------------------
+
+    CXConsole&                           m_rParent;
+    EWorkMode                               m_eWorkMode;                // during Work() thise true:HTML and false:Confluence at some point
+};
+
+
+#endif  // defined(WIN32) || defined(WIN64)
+#endif // CRYINCLUDE_CRYSYSTEM_CONSOLEHELPGEN_H
diff --git a/Code/Legacy/CrySystem/CrySystem_precompiled.h b/Code/Legacy/CrySystem/CrySystem_precompiled.h
new file mode 100644
index 0000000000..279cbef9fd
--- /dev/null
+++ b/Code/Legacy/CrySystem/CrySystem_precompiled.h
@@ -0,0 +1,130 @@
+/*
+ * 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 : Precompiled Header.
+
+
+#pragma once
+
+#include <AzCore/PlatformIncl.h>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <fcntl.h>
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define STDAFX_H_SECTION_1 1
+#define STDAFX_H_SECTION_2 2
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION STDAFX_H_SECTION_1
+#include AZ_RESTRICTED_FILE(CrySystem_precompiled_h)
+#elif defined(LINUX) // Scrubber friendly negated define pattern
+#elif !defined(APPLE)
+    #include <memory.h>
+    #include <malloc.h>
+#endif
+
+//on mac the precompiled header is auto included in every .c and .cpp file, no include line necessary.
+//.c files don't like the cpp things in here
+#ifdef __cplusplus
+
+#include <vector>
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION STDAFX_H_SECTION_2
+#include AZ_RESTRICTED_FILE(CrySystem_precompiled_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(APPLE) // Scrubber friendly negated define pattern
+#elif defined(ANDROID) // Scrubber friendly negated define pattern
+#elif defined(LINUX)
+    #   include <sys/io.h>
+#else
+    #   include <io.h>
+#endif
+
+//#define DEFINE_MODULE_NAME "CrySystem"
+
+#define CRYSYSTEM_EXPORTS
+
+#include <platform.h>
+
+#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX)
+#if defined(DEDICATED_SERVER)
+// enable/disable map load slicing functionality from the build
+#define MAP_LOADING_SLICING
+#endif
+#endif
+
+#ifdef WIN32
+#include <CryWindows.h>
+#include <tlhelp32.h>
+#undef GetCharWidth
+#undef GetUserName
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CRY Stuff ////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+#include "Cry_Math.h"
+#include <Cry_Camera.h>
+#include <smartptr.h>
+#include <Range.h>
+#include <CrySizer.h>
+#include <StlUtils.h>
+
+
+inline int RoundToClosestMB(size_t memSize)
+{
+    // add half a MB and shift down to get closest MB
+    return((int) ((memSize + (1 << 19)) >> 20));
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// For faster compilation
+//////////////////////////////////////////////////////////////////////////
+#include <IRenderer.h>
+#include <CryFile.h>
+#include <ISystem.h>
+#include <ITimer.h>
+#include <IPhysics.h>
+#include <IXml.h>
+#include <ICmdLine.h>
+#include <IConsole.h>
+#include <ILog.h>
+
+/////////////////////////////////////////////////////////////////////////////
+//forward declarations for common Interfaces.
+/////////////////////////////////////////////////////////////////////////////
+class ITexture;
+struct IRenderer;
+struct ISystem;
+struct ITimer;
+struct IFFont;
+struct ICVar;
+struct IConsole;
+struct IProcess;
+namespace AZ::IO
+{
+    struct IArchive;
+}
+struct ICryFont;
+struct IMovieSystem;
+struct IAudioSystem;
+struct IPhysicalWorld;
+
+#endif //__cplusplus
+
+
+
diff --git a/Code/Legacy/CrySystem/DebugCallStack.cpp b/Code/Legacy/CrySystem/DebugCallStack.cpp
new file mode 100644
index 0000000000..f518c19d44
--- /dev/null
+++ b/Code/Legacy/CrySystem/DebugCallStack.cpp
@@ -0,0 +1,895 @@
+/*
+ * 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 "DebugCallStack.h"
+
+#if defined(WIN32) || defined(WIN64)
+
+#include <IConsole.h>
+#include <CryPath.h>
+#include "System.h"
+
+#include <AzCore/Debug/StackTracer.h>
+#include <AzCore/Debug/EventTraceDrillerBus.h>
+
+#define VS_VERSION_INFO                 1
+#define IDD_CRITICAL_ERROR              101
+#define IDB_CONFIRM_SAVE                102
+#define IDB_DONT_SAVE                   103
+#define IDD_CONFIRM_SAVE_LEVEL          127
+#define IDB_CRASH_FACE                  128
+#define IDD_EXCEPTION                   245
+#define IDC_CALLSTACK                   1001
+#define IDC_EXCEPTION_CODE              1002
+#define IDC_EXCEPTION_ADDRESS           1003
+#define IDC_EXCEPTION_MODULE            1004
+#define IDC_EXCEPTION_DESC              1005
+#define IDB_EXIT                        1008
+#define IDB_IGNORE                      1010
+__pragma(comment(lib, "version.lib"))
+
+//! Needs one external of DLL handle.
+extern HMODULE gDLLHandle;
+
+#include <DbgHelp.h>
+
+#define MAX_PATH_LENGTH 1024
+#define MAX_SYMBOL_LENGTH 512
+
+static HWND hwndException = 0;
+static bool g_bUserDialog = true;         // true=on crash show dialog box, false=supress user interaction
+
+static int  PrintException(EXCEPTION_POINTERS* pex);
+
+static bool IsFloatingPointException(EXCEPTION_POINTERS* pex);
+
+extern LONG WINAPI CryEngineExceptionFilterWER(struct _EXCEPTION_POINTERS* pExceptionPointers);
+extern LONG WINAPI CryEngineExceptionFilterMiniDump(struct _EXCEPTION_POINTERS* pExceptionPointers, const char* szDumpPath, MINIDUMP_TYPE mdumpValue);
+
+//=============================================================================
+CONTEXT CaptureCurrentContext()
+{
+    CONTEXT context;
+    memset(&context, 0, sizeof(context));
+    context.ContextFlags = CONTEXT_FULL;
+    RtlCaptureContext(&context);
+
+    return context;
+}
+
+LONG __stdcall CryUnhandledExceptionHandler(EXCEPTION_POINTERS* pex)
+{
+    return DebugCallStack::instance()->handleException(pex);
+}
+
+
+BOOL CALLBACK EnumModules(
+    PCSTR   ModuleName,
+    DWORD64 BaseOfDll,
+    PVOID   UserContext)
+{
+    DebugCallStack::TModules& modules = *static_cast<DebugCallStack::TModules*>(UserContext);
+    modules[(void*)BaseOfDll] = ModuleName;
+
+    return TRUE;
+}
+//=============================================================================
+// Class Statics
+//=============================================================================
+
+// Return single instance of class.
+IDebugCallStack* IDebugCallStack::instance()
+{
+    static DebugCallStack sInstance;
+    return &sInstance;
+}
+
+//------------------------------------------------------------------------------------------------------------------------
+// Sets up the symbols for functions in the debug file.
+//------------------------------------------------------------------------------------------------------------------------
+DebugCallStack::DebugCallStack()
+    : prevExceptionHandler(0)
+    , m_pSystem(0)
+    , m_nSkipNumFunctions(0)
+    , m_bCrash(false)
+    , m_szBugMessage(NULL)
+{
+}
+
+DebugCallStack::~DebugCallStack()
+{
+}
+
+void DebugCallStack::RemoveOldFiles()
+{
+    RemoveFile("error.log");
+    RemoveFile("error.bmp");
+    RemoveFile("error.dmp");
+}
+
+void DebugCallStack::RemoveFile(const char* szFileName)
+{
+    FILE* pFile = nullptr;
+    azfopen(&pFile, szFileName, "r");
+    const bool bFileExists = (pFile != NULL);
+
+    if (bFileExists)
+    {
+        fclose(pFile);
+
+        WriteLineToLog("Removing file \"%s\"...", szFileName);
+        if (remove(szFileName) == 0)
+        {
+            WriteLineToLog("File successfully removed.");
+        }
+        else
+        {
+            WriteLineToLog("Couldn't remove file!");
+        }
+    }
+}
+
+void DebugCallStack::installErrorHandler(ISystem* pSystem)
+{
+    m_pSystem = pSystem;
+    prevExceptionHandler = (void*)SetUnhandledExceptionFilter(CryUnhandledExceptionHandler);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void DebugCallStack::SetUserDialogEnable(const bool bUserDialogEnable)
+{
+    g_bUserDialog = bUserDialogEnable;
+}
+
+
+DWORD g_idDebugThreads[10];
+const char* g_nameDebugThreads[10];
+int g_nDebugThreads = 0;
+volatile int g_lockThreadDumpList = 0;
+
+void MarkThisThreadForDebugging(const char* name)
+{
+    EBUS_EVENT(AZ::Debug::EventTraceDrillerSetupBus, SetThreadName, AZStd::this_thread::get_id(), name);
+
+    WriteLock lock(g_lockThreadDumpList);
+    DWORD id = GetCurrentThreadId();
+    if (g_nDebugThreads == sizeof(g_idDebugThreads) / sizeof(g_idDebugThreads[0]))
+    {
+        return;
+    }
+    for (int i = 0; i < g_nDebugThreads; i++)
+    {
+        if (g_idDebugThreads[i] == id)
+        {
+            return;
+        }
+    }
+    g_nameDebugThreads[g_nDebugThreads] = name;
+    g_idDebugThreads[g_nDebugThreads++] = id;
+    ((CSystem*)gEnv->pSystem)->EnableFloatExceptions(g_cvars.sys_float_exceptions);
+}
+
+void UnmarkThisThreadFromDebugging()
+{
+    WriteLock lock(g_lockThreadDumpList);
+    DWORD id = GetCurrentThreadId();
+    for (int i = g_nDebugThreads - 1; i >= 0; i--)
+    {
+        if (g_idDebugThreads[i] == id)
+        {
+            memmove(g_idDebugThreads + i, g_idDebugThreads + i + 1, (g_nDebugThreads - 1 - i) * sizeof(g_idDebugThreads[0]));
+            memmove(g_nameDebugThreads + i, g_nameDebugThreads + i + 1, (g_nDebugThreads - 1 - i) * sizeof(g_nameDebugThreads[0]));
+            --g_nDebugThreads;
+        }
+    }
+}
+
+extern int prev_sys_float_exceptions;
+void UpdateFPExceptionsMaskForThreads()
+{
+    int mask = -iszero(g_cvars.sys_float_exceptions);
+    CONTEXT ctx;
+    for (int i = 0; i < g_nDebugThreads; i++)
+    {
+        if (g_idDebugThreads[i] != GetCurrentThreadId())
+        {
+            HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, TRUE, g_idDebugThreads[i]);
+            ctx.ContextFlags = CONTEXT_ALL;
+            SuspendThread(hThread);
+            GetThreadContext(hThread, &ctx);
+#ifndef WIN64
+            (ctx.FloatSave.ControlWord |= 7) &= ~5 | mask;
+            (*(WORD*)(ctx.ExtendedRegisters + 24) |= 0x280) &= ~0x280 | mask;
+#else
+            (ctx.FltSave.ControlWord |= 7) &= ~5 | mask;
+            (ctx.FltSave.MxCsr |= 0x280) &= ~0x280  | mask;
+#endif
+            SetThreadContext(hThread, &ctx);
+            ResumeThread(hThread);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+int DebugCallStack::handleException(EXCEPTION_POINTERS* exception_pointer)
+{
+    if (gEnv == NULL)
+    {
+        return EXCEPTION_EXECUTE_HANDLER;
+    }
+
+    ResetFPU(exception_pointer);
+
+    prev_sys_float_exceptions = 0;
+    const int cached_sys_float_exceptions = g_cvars.sys_float_exceptions;
+
+    ((CSystem*)gEnv->pSystem)->EnableFloatExceptions(0);
+
+    if (g_cvars.sys_WER)
+    {
+        gEnv->pLog->FlushAndClose();
+        return CryEngineExceptionFilterWER(exception_pointer);
+    }
+
+    if (g_cvars.sys_no_crash_dialog)
+    {
+        DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX);
+        SetErrorMode(dwMode | SEM_NOGPFAULTERRORBOX);
+    }
+
+    m_bCrash = true;
+
+    if (g_cvars.sys_no_crash_dialog)
+    {
+        DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX);
+        SetErrorMode(dwMode | SEM_NOGPFAULTERRORBOX);
+    }
+
+    static bool firstTime = true;
+
+    if (g_cvars.sys_dump_aux_threads)
+    {
+        for (int i = 0; i < g_nDebugThreads; i++)
+        {
+            if (g_idDebugThreads[i] != GetCurrentThreadId())
+            {
+                SuspendThread(OpenThread(THREAD_ALL_ACCESS, TRUE, g_idDebugThreads[i]));
+            }
+        }
+    }
+
+    // uninstall our exception handler.
+    SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER)prevExceptionHandler);
+
+    if (!firstTime)
+    {
+        WriteLineToLog("Critical Exception! Called Multiple Times!");
+        gEnv->pLog->FlushAndClose();
+        // Exception called more then once.
+        return EXCEPTION_EXECUTE_HANDLER;
+    }
+
+    // Print exception info:
+    {
+        char excCode[80];
+        char excAddr[80];
+        WriteLineToLog("<CRITICAL EXCEPTION>");
+        sprintf_s(excAddr, "0x%04X:0x%p", exception_pointer->ContextRecord->SegCs, exception_pointer->ExceptionRecord->ExceptionAddress);
+        sprintf_s(excCode, "0x%08X", exception_pointer->ExceptionRecord->ExceptionCode);
+        WriteLineToLog("Exception: %s, at Address: %s", excCode, excAddr);
+    }
+
+    firstTime = false;
+
+    const int ret = SubmitBug(exception_pointer);
+
+    if (ret != IDB_IGNORE)
+    {
+        CryEngineExceptionFilterWER(exception_pointer);
+    }
+
+    gEnv->pLog->FlushAndClose();
+
+    if (exception_pointer->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
+    {
+        // This is non continuable exception. abort application now.
+        exit(exception_pointer->ExceptionRecord->ExceptionCode);
+    }
+
+    //typedef long (__stdcall *ExceptionFunc)(EXCEPTION_POINTERS*);
+    //ExceptionFunc prevFunc = (ExceptionFunc)prevExceptionHandler;
+    //return prevFunc( (EXCEPTION_POINTERS*)exception_pointer );
+    if (ret == IDB_EXIT)
+    {
+        // Immediate exit.
+        // on windows, exit() and _exit() do all sorts of things, unfortuantely
+        // TerminateProcess is the only way to die.
+        TerminateProcess(GetCurrentProcess(), exception_pointer->ExceptionRecord->ExceptionCode);  // we crashed, so don't return a zero exit code!
+        // on linux based systems, _exit will not call ATEXIT and other things, which makes it more suitable for termination in an emergency such
+        // as an unhandled exception.
+        // however, this function is a windows exception handler.
+    }
+    else if (ret == IDB_IGNORE)
+    {
+#ifndef WIN64
+        exception_pointer->ContextRecord->FloatSave.StatusWord &= ~31;
+        exception_pointer->ContextRecord->FloatSave.ControlWord |= 7;
+        (*(WORD*)(exception_pointer->ContextRecord->ExtendedRegisters + 24) &= 31) |= 0x1F80;
+#else
+        exception_pointer->ContextRecord->FltSave.StatusWord &= ~31;
+        exception_pointer->ContextRecord->FltSave.ControlWord |= 7;
+        (exception_pointer->ContextRecord->FltSave.MxCsr &= 31) |= 0x1F80;
+#endif
+        firstTime = true;
+        prevExceptionHandler = (void*)SetUnhandledExceptionFilter(CryUnhandledExceptionHandler);
+        g_cvars.sys_float_exceptions = cached_sys_float_exceptions;
+        ((CSystem*)gEnv->pSystem)->EnableFloatExceptions(g_cvars.sys_float_exceptions);
+        return EXCEPTION_CONTINUE_EXECUTION;
+    }
+
+    // Continue;
+    return EXCEPTION_EXECUTE_HANDLER;
+}
+
+void DebugCallStack::ReportBug(const char* szErrorMessage)
+{
+    WriteLineToLog("Reporting bug: %s", szErrorMessage);
+
+    m_szBugMessage = szErrorMessage;
+    m_context = CaptureCurrentContext();
+    SubmitBug(NULL);
+    m_szBugMessage = NULL;
+}
+
+void DebugCallStack::dumpCallStack(std::vector<string>& funcs)
+{
+    WriteLineToLog("=============================================================================");
+    int len = (int)funcs.size();
+    for (int i = 0; i < len; i++)
+    {
+        const char* str = funcs[i].c_str();
+        WriteLineToLog("%2d) %s", len - i, str);
+    }
+    WriteLineToLog("=============================================================================");
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void DebugCallStack::LogExceptionInfo(EXCEPTION_POINTERS* pex)
+{
+    string path("");
+    if ((gEnv) && (gEnv->pFileIO))
+    {
+        const char* logAlias = gEnv->pFileIO->GetAlias("@log@");
+        if (!logAlias)
+        {
+            logAlias = gEnv->pFileIO->GetAlias("@root@");
+        }
+        if (logAlias)
+        {
+            path = logAlias;
+            path += "/";
+        }
+    }
+
+    string fileName = path;
+    fileName += "error.log";
+
+    struct stat fileInfo;
+    string timeStamp;
+    string backupPath;
+    if (gEnv->IsDedicated())
+    {
+        backupPath = PathUtil::ToUnixPath(PathUtil::AddSlash(path + "DumpBackups"));
+        gEnv->pFileIO->CreatePath(backupPath.c_str());
+
+        if (stat(fileName.c_str(), &fileInfo) == 0)
+        {
+            // Backup log
+            tm creationTime;
+            localtime_s(&creationTime, &fileInfo.st_mtime);
+            char tempBuffer[32];
+            strftime(tempBuffer, sizeof(tempBuffer), "%d %b %Y (%H %M %S)", &creationTime);
+            timeStamp = tempBuffer;
+
+            string backupFileName = backupPath + timeStamp + " error.log";
+            CopyFile(fileName.c_str(), backupFileName.c_str(), true);
+        }
+    }
+
+    FILE* f = nullptr;
+    azfopen(&f, fileName.c_str(), "wt");
+
+    static char errorString[s_iCallStackSize];
+    errorString[0] = 0;
+
+    // Time and Version.
+    char versionbuf[1024];
+    azstrcpy(versionbuf, AZ_ARRAY_SIZE(versionbuf), "");
+    PutVersion(versionbuf, AZ_ARRAY_SIZE(versionbuf));
+    cry_strcat(errorString, versionbuf);
+    cry_strcat(errorString, "\n");
+
+    char excCode[MAX_WARNING_LENGTH];
+    char excAddr[80];
+    char desc[1024];
+    char excDesc[MAX_WARNING_LENGTH];
+
+    // make sure the mouse cursor is visible
+    ShowCursor(TRUE);
+
+    const char* excName;
+    if (m_bIsFatalError || !pex)
+    {
+        const char* const szMessage = m_bIsFatalError ? s_szFatalErrorCode : m_szBugMessage;
+        excName = szMessage;
+        cry_strcpy(excCode, szMessage);
+        cry_strcpy(excAddr, "");
+        cry_strcpy(desc, "");
+        cry_strcpy(m_excModule, "");
+        cry_strcpy(excDesc, szMessage);
+    }
+    else
+    {
+        sprintf_s(excAddr, "0x%04X:0x%p", pex->ContextRecord->SegCs, pex->ExceptionRecord->ExceptionAddress);
+        sprintf_s(excCode, "0x%08X", pex->ExceptionRecord->ExceptionCode);
+        excName = TranslateExceptionCode(pex->ExceptionRecord->ExceptionCode);
+        cry_strcpy(desc, "");
+        sprintf_s(excDesc, "%s\r\n%s", excName, desc);
+
+
+        if (pex->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
+        {
+            if (pex->ExceptionRecord->NumberParameters > 1)
+            {
+                ULONG_PTR iswrite = pex->ExceptionRecord->ExceptionInformation[0];
+                DWORD64 accessAddr = pex->ExceptionRecord->ExceptionInformation[1];
+                if (iswrite)
+                {
+                    sprintf_s(desc, "Attempt to write data to address 0x%08llu\r\nThe memory could not be \"written\"", accessAddr);
+                }
+                else
+                {
+                    sprintf_s(desc, "Attempt to read from address 0x%08llu\r\nThe memory could not be \"read\"", accessAddr);
+                }
+            }
+        }
+    }
+
+
+    WriteLineToLog("Exception Code: %s", excCode);
+    WriteLineToLog("Exception Addr: %s", excAddr);
+    WriteLineToLog("Exception Module: %s", m_excModule);
+    WriteLineToLog("Exception Name  : %s", excName);
+    WriteLineToLog("Exception Description: %s", desc);
+
+
+    cry_strcpy(m_excDesc, excDesc);
+    cry_strcpy(m_excAddr, excAddr);
+    cry_strcpy(m_excCode, excCode);
+
+
+    char errs[32768];
+    sprintf_s(errs, "Exception Code: %s\nException Addr: %s\nException Module: %s\nException Description: %s, %s\n",
+        excCode, excAddr, m_excModule, excName, desc);
+
+
+    cry_strcat(errs, "\nCall Stack Trace:\n");
+
+    std::vector<string> funcs;
+    {
+        AZ::Debug::StackFrame frames[25];
+        AZ::Debug::SymbolStorage::StackLine lines[AZ_ARRAY_SIZE(frames)];
+        unsigned int numFrames = AZ::Debug::StackRecorder::Record(frames, AZ_ARRAY_SIZE(frames), 3);
+        if (numFrames)
+        {
+            AZ::Debug::SymbolStorage::DecodeFrames(frames, numFrames, lines);
+            for (unsigned int i = 0; i < numFrames; i++)
+            {
+                funcs.push_back(lines[i]);
+            }
+        }
+        dumpCallStack(funcs);
+        // Fill call stack.
+        char str[s_iCallStackSize];
+        cry_strcpy(str, "");
+        for (unsigned int i = 0; i < funcs.size(); i++)
+        {
+            char temp[s_iCallStackSize];
+            sprintf_s(temp, "%2zd) %s", funcs.size() - i, (const char*)funcs[i].c_str());
+            cry_strcat(str, temp);
+            cry_strcat(str, "\r\n");
+            cry_strcat(errs, temp);
+            cry_strcat(errs, "\n");
+        }
+        cry_strcpy(m_excCallstack, str);
+    }
+
+    cry_strcat(errorString, errs);
+
+    if (f)
+    {
+        fwrite(errorString, strlen(errorString), 1, f);
+        {
+            if (g_cvars.sys_dump_aux_threads)
+            {
+                for (int i = 0; i < g_nDebugThreads; i++)
+                {
+                    if (g_idDebugThreads[i] != GetCurrentThreadId())
+                    {
+                        fprintf(f, "\n\nSuspended thread (%s):\n", g_nameDebugThreads[i]);
+                        HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, TRUE, g_idDebugThreads[i]);
+
+                        // mirrors the AZ::Debug::Trace::PrintCallstack() functionality, but prints to a file
+                        {
+                            AZ::Debug::StackFrame frames[10];
+
+                            // Without StackFrame explicit alignment frames array is aligned to 4 bytes
+                            // which causes the stack tracing to fail.
+                            AZ::Debug::SymbolStorage::StackLine lines[AZ_ARRAY_SIZE(frames)];
+
+                            unsigned int numFrames = AZ::Debug::StackRecorder::Record(frames, AZ_ARRAY_SIZE(frames), 0, hThread);
+                            if (numFrames)
+                            {
+                                AZ::Debug::SymbolStorage::DecodeFrames(frames, numFrames, lines);
+                                for (unsigned int i2 = 0; i2 < numFrames; ++i2)
+                                {
+                                    fprintf(f, "%2d) %s\n", numFrames - i2, lines[i2]);
+                                }
+                            }
+                        }
+
+                        ResumeThread(hThread);
+                    }
+                }
+            }
+        }
+        fflush(f);
+        fclose(f);
+    }
+
+    if (pex)
+    {
+        MINIDUMP_TYPE mdumpValue = MiniDumpNormal;
+        bool bDump = true;
+        switch (g_cvars.sys_dump_type)
+        {
+        case 0:
+            bDump = false;
+            break;
+        case 1:
+            mdumpValue = MiniDumpNormal;
+            break;
+        case 2:
+            mdumpValue = (MINIDUMP_TYPE)(MiniDumpWithIndirectlyReferencedMemory | MiniDumpWithDataSegs);
+            break;
+        case 3:
+            mdumpValue = MiniDumpWithFullMemory;
+            break;
+        default:
+            mdumpValue = (MINIDUMP_TYPE)g_cvars.sys_dump_type;
+            break;
+        }
+        if (bDump)
+        {
+            fileName = path + "error.dmp";
+
+            if (gEnv->IsDedicated() && stat(fileName.c_str(), &fileInfo) == 0)
+            {
+                // Backup dump (use timestamp from error.log if available)
+                if (timeStamp.empty())
+                {
+                    tm creationTime;
+                    localtime_s(&creationTime, &fileInfo.st_mtime);
+                    char tempBuffer[32];
+                    strftime(tempBuffer, sizeof(tempBuffer), "%d %b %Y (%H %M %S)", &creationTime);
+                    timeStamp = tempBuffer;
+                }
+
+                string backupFileName = backupPath + timeStamp + " error.dmp";
+                CopyFile(fileName.c_str(), backupFileName.c_str(), true);
+            }
+
+            CryEngineExceptionFilterMiniDump(pex, fileName.c_str(), mdumpValue);
+        }
+    }
+
+    //if no crash dialog don't even submit the bug
+    if (m_postBackupProcess && g_cvars.sys_no_crash_dialog == 0 && g_bUserDialog)
+    {
+        m_postBackupProcess();
+    }
+    else
+    {
+        // lawsonn: Disabling the JIRA-based crash reporter for now
+        // we'll need to deal with it our own way, pending QA.
+        // if you're customizing the engine this is also your opportunity to deal with it.
+        if (g_cvars.sys_no_crash_dialog != 0 || !g_bUserDialog)
+        {
+            // ------------ place custom crash handler here ---------------------
+            // it should launch an executable!
+            /// by  this time, error.bmp will be in the engine root folder
+            // error.log and error.dmp will also be present in the engine root folder
+            // if your error dumper wants those, it should zip them up and send them or offer to do so.
+            // ------------------------------------------------------------------
+        }
+    }
+    const bool bQuitting = !gEnv || !gEnv->pSystem || gEnv->pSystem->IsQuitting();
+
+    //[AlexMcC|16.04.10] When the engine is shutting down, MessageBox doesn't display a box
+    // and immediately returns IDYES. Avoid this by just not trying to save if we're quitting.
+    // Don't ask to save if this isn't a real crash (a real crash has exception pointers)
+    if (g_cvars.sys_no_crash_dialog == 0 && g_bUserDialog && gEnv->IsEditor() && !bQuitting && pex)
+    {
+        BackupCurrentLevel();
+
+        const INT_PTR res = DialogBoxParam(gDLLHandle, MAKEINTRESOURCE(IDD_CONFIRM_SAVE_LEVEL), NULL, DebugCallStack::ConfirmSaveDialogProc, NULL);
+        if (res == IDB_CONFIRM_SAVE)
+        {
+            if (SaveCurrentLevel())
+            {
+                MessageBox(NULL, "Level has been successfully saved!\r\nPress Ok to terminate Editor.", "Save", MB_OK);
+            }
+            else
+            {
+                MessageBox(NULL, "Error saving level.\r\nPress Ok to terminate Editor.", "Save", MB_OK | MB_ICONWARNING);
+            }
+        }
+    }
+
+    if (g_cvars.sys_no_crash_dialog != 0 || !g_bUserDialog)
+    {
+        // terminate immediately - since we're in a crash, there is no point unwinding stack, we've already done access violation or worse.
+        // calling exit will only cause further death down the line...
+        TerminateProcess(GetCurrentProcess(), pex->ExceptionRecord->ExceptionCode);
+    }
+}
+
+
+INT_PTR CALLBACK DebugCallStack::ExceptionDialogProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    static EXCEPTION_POINTERS* pex;
+
+    static char errorString[32768] = "";
+
+    switch (message)
+    {
+    case WM_INITDIALOG:
+    {
+        pex = (EXCEPTION_POINTERS*)lParam;
+        HWND h;
+
+        if (pex->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
+        {
+            // Disable continue button for non continuable exceptions.
+            //h = GetDlgItem( hwndDlg,IDB_CONTINUE );
+            //if (h) EnableWindow( h,FALSE );
+        }
+
+        DebugCallStack* pDCS = static_cast<DebugCallStack*>(DebugCallStack::instance());
+
+        h = GetDlgItem(hwndDlg, IDC_EXCEPTION_DESC);
+        if (h)
+        {
+            SendMessage(h, EM_REPLACESEL, FALSE, (LONG_PTR)pDCS->m_excDesc);
+        }
+
+        h = GetDlgItem(hwndDlg, IDC_EXCEPTION_CODE);
+        if (h)
+        {
+            SendMessage(h, EM_REPLACESEL, FALSE, (LONG_PTR)pDCS->m_excCode);
+        }
+
+        h = GetDlgItem(hwndDlg, IDC_EXCEPTION_MODULE);
+        if (h)
+        {
+            SendMessage(h, EM_REPLACESEL, FALSE, (LONG_PTR)pDCS->m_excModule);
+        }
+
+        h = GetDlgItem(hwndDlg, IDC_EXCEPTION_ADDRESS);
+        if (h)
+        {
+            SendMessage(h, EM_REPLACESEL, FALSE, (LONG_PTR)pDCS->m_excAddr);
+        }
+
+        // Fill call stack.
+        HWND callStack = GetDlgItem(hwndDlg, IDC_CALLSTACK);
+        if (callStack)
+        {
+            SendMessage(callStack, WM_SETTEXT, FALSE, (LPARAM)pDCS->m_excCallstack);
+        }
+
+        if (hwndException)
+        {
+            DestroyWindow(hwndException);
+            hwndException = 0;
+        }
+
+        if (IsFloatingPointException(pex))
+        {
+            EnableWindow(GetDlgItem(hwndDlg, IDB_IGNORE), TRUE);
+        }
+    }
+    break;
+
+    case WM_COMMAND:
+        switch (LOWORD(wParam))
+        {
+        case IDB_EXIT:
+        case IDB_IGNORE:
+            // Fall through.
+
+            EndDialog(hwndDlg, wParam);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+INT_PTR CALLBACK DebugCallStack::ConfirmSaveDialogProc(HWND hwndDlg, UINT message, WPARAM wParam, [[maybe_unused]] LPARAM lParam)
+{
+    switch (message)
+    {
+    case WM_INITDIALOG:
+    {
+        // The user might be holding down the spacebar while the engine crashes.
+        // If we don't remove keyboard focus from this dialog, the keypress will
+        // press the default button before the dialog actually appears, even if
+        // the user has already released the key, which is bad.
+        SetFocus(NULL);
+    } break;
+    case WM_COMMAND:
+    {
+        switch (LOWORD(wParam))
+        {
+        case IDB_CONFIRM_SAVE:         // Fall through
+        case IDB_DONT_SAVE:
+        {
+            EndDialog(hwndDlg, wParam);
+            return TRUE;
+        }
+        }
+    } break;
+    }
+
+    return FALSE;
+}
+
+bool DebugCallStack::BackupCurrentLevel()
+{
+    CSystem* pSystem = static_cast<CSystem*>(m_pSystem);
+    if (pSystem && pSystem->GetUserCallback())
+    {
+        return pSystem->GetUserCallback()->OnBackupDocument();
+    }
+
+    return false;
+}
+
+bool DebugCallStack::SaveCurrentLevel()
+{
+    CSystem* pSystem = static_cast<CSystem*>(m_pSystem);
+    if (pSystem && pSystem->GetUserCallback())
+    {
+        return pSystem->GetUserCallback()->OnSaveDocument();
+    }
+
+    return false;
+}
+
+int DebugCallStack::SubmitBug(EXCEPTION_POINTERS* exception_pointer)
+{
+    int ret = IDB_EXIT;
+
+    assert(!hwndException);
+
+    RemoveOldFiles();
+
+    AZ::Debug::Trace::PrintCallstack("", 2);
+
+    LogExceptionInfo(exception_pointer);
+
+    if (IsFloatingPointException(exception_pointer))
+    {
+        //! Print exception dialog.
+        ret = PrintException(exception_pointer);
+    }
+
+    return ret;
+}
+
+void DebugCallStack::ResetFPU(EXCEPTION_POINTERS* pex)
+{
+    if (IsFloatingPointException(pex))
+    {
+        // How to reset FPU: http://www.experts-exchange.com/Programming/System/Windows__Programming/Q_10310953.html
+        _clearfp();
+#ifndef WIN64
+        pex->ContextRecord->FloatSave.ControlWord |= 0x2F;
+        pex->ContextRecord->FloatSave.StatusWord &= ~0x8080;
+#endif
+    }
+}
+
+string DebugCallStack::GetModuleNameForAddr(void* addr)
+{
+    if (m_modules.empty())
+    {
+        return "[unknown]";
+    }
+
+    if (addr < m_modules.begin()->first)
+    {
+        return "[unknown]";
+    }
+
+    TModules::const_iterator it = m_modules.begin();
+    TModules::const_iterator end = m_modules.end();
+    for (; ++it != end; )
+    {
+        if (addr < it->first)
+        {
+            return (--it)->second;
+        }
+    }
+
+    //if address is higher than the last module, we simply assume it is in the last module.
+    return m_modules.rbegin()->second;
+}
+
+void DebugCallStack::GetProcNameForAddr(void* addr, string& procName, void*& baseAddr, string& filename, int& line)
+{
+    AZ::Debug::SymbolStorage::StackLine func, file, module;
+    AZ::Debug::SymbolStorage::FindFunctionFromIP(addr, &func, &file, &module, line, baseAddr);
+    procName = func;
+    filename = file;
+}
+
+string DebugCallStack::GetCurrentFilename()
+{
+    char fullpath[MAX_PATH_LENGTH + 1];
+    GetModuleFileName(NULL, fullpath, MAX_PATH_LENGTH);
+    return fullpath;
+}
+
+static bool IsFloatingPointException(EXCEPTION_POINTERS* pex)
+{
+    if (!pex)
+    {
+        return false;
+    }
+
+    DWORD exceptionCode = pex->ExceptionRecord->ExceptionCode;
+    switch (exceptionCode)
+    {
+    case EXCEPTION_FLT_DENORMAL_OPERAND:
+    case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+    case EXCEPTION_FLT_INEXACT_RESULT:
+    case EXCEPTION_FLT_INVALID_OPERATION:
+    case EXCEPTION_FLT_OVERFLOW:
+    case EXCEPTION_FLT_UNDERFLOW:
+    case STATUS_FLOAT_MULTIPLE_FAULTS:
+    case STATUS_FLOAT_MULTIPLE_TRAPS:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
+int DebugCallStack::PrintException(EXCEPTION_POINTERS* exception_pointer)
+{
+    return (int)DialogBoxParam(gDLLHandle, MAKEINTRESOURCE(IDD_CRITICAL_ERROR), NULL, DebugCallStack::ExceptionDialogProc, (LPARAM)exception_pointer);
+}
+
+#else
+void MarkThisThreadForDebugging(const char*) {}
+void UnmarkThisThreadFromDebugging() {}
+void UpdateFPExceptionsMaskForThreads() {}
+#endif //WIN32
diff --git a/Code/Legacy/CrySystem/DebugCallStack.h b/Code/Legacy/CrySystem/DebugCallStack.h
new file mode 100644
index 0000000000..20eb78035f
--- /dev/null
+++ b/Code/Legacy/CrySystem/DebugCallStack.h
@@ -0,0 +1,90 @@
+/*
+ * 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_DEBUGCALLSTACK_H
+#define CRYINCLUDE_CRYSYSTEM_DEBUGCALLSTACK_H
+#pragma once
+
+
+#include "IDebugCallStack.h"
+
+#if defined (WIN32) || defined (WIN64)
+
+//! Limits the maximal number of functions in call stack.
+const int MAX_DEBUG_STACK_ENTRIES_FILE_DUMP = 12;
+
+struct ISystem;
+
+//!============================================================================
+//!
+//! DebugCallStack class, capture call stack information from symbol files.
+//!
+//!============================================================================
+class DebugCallStack
+    : public IDebugCallStack
+{
+public:
+    DebugCallStack();
+    virtual ~DebugCallStack();
+
+    ISystem* GetSystem() { return m_pSystem; };
+
+    virtual string GetModuleNameForAddr(void* addr);
+    virtual void GetProcNameForAddr(void* addr, string& procName, void*& baseAddr, string& filename, int& line);
+    virtual string GetCurrentFilename();
+
+    void installErrorHandler(ISystem* pSystem);
+    virtual int handleException(EXCEPTION_POINTERS* exception_pointer);
+
+    virtual void ReportBug(const char*);
+
+    void dumpCallStack(std::vector<string>& functions);
+
+    void SetUserDialogEnable(const bool bUserDialogEnable);
+
+    typedef std::map<void*, string> TModules;
+protected:
+    static void RemoveOldFiles();
+    static void RemoveFile(const char* szFileName);
+
+    static int PrintException(EXCEPTION_POINTERS* exception_pointer);
+    static INT_PTR CALLBACK ExceptionDialogProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam);
+    static INT_PTR CALLBACK ConfirmSaveDialogProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
+    void LogExceptionInfo(EXCEPTION_POINTERS* exception_pointer);
+    bool BackupCurrentLevel();
+    bool SaveCurrentLevel();
+    int SubmitBug(EXCEPTION_POINTERS* exception_pointer);
+    void ResetFPU(EXCEPTION_POINTERS* pex);
+
+    static const int s_iCallStackSize = 32768;
+
+    char m_excLine[256];
+    char m_excModule[128];
+
+    char m_excDesc[MAX_WARNING_LENGTH];
+    char m_excCode[MAX_WARNING_LENGTH];
+    char m_excAddr[80];
+    char m_excCallstack[s_iCallStackSize];
+
+    void* prevExceptionHandler;
+
+    bool m_bCrash;
+    const char* m_szBugMessage;
+
+    ISystem* m_pSystem;
+
+    int m_nSkipNumFunctions;
+    CONTEXT  m_context;
+
+    TModules m_modules;
+};
+
+#endif //WIN32
+
+#endif // CRYINCLUDE_CRYSYSTEM_DEBUGCALLSTACK_H
diff --git a/Code/Legacy/CrySystem/DllMain.cpp b/Code/Legacy/CrySystem/DllMain.cpp
new file mode 100644
index 0000000000..24391c07fa
--- /dev/null
+++ b/Code/Legacy/CrySystem/DllMain.cpp
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "CrySystem_precompiled.h"
+#include "System.h"
+#include <AZCrySystemInitLogSink.h>
+#include "DebugCallStack.h"
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define DLLMAIN_CPP_SECTION_1 1
+#define DLLMAIN_CPP_SECTION_2 2
+#define DLLMAIN_CPP_SECTION_3 3
+#define DLLMAIN_CPP_SECTION_4 4
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION DLLMAIN_CPP_SECTION_1
+#include AZ_RESTRICTED_FILE(DllMain_cpp)
+#endif
+
+// For lua debugger
+//#include <malloc.h>
+
+HMODULE gDLLHandle = NULL;
+
+#if !defined(AZ_MONOLITHIC_BUILD) && defined(AZ_HAS_DLL_SUPPORT) && AZ_TRAIT_LEGACY_CRYSYSTEM_DEFINE_DLLMAIN
+AZ_PUSH_DISABLE_WARNING(4447, "-Wunknown-warning-option")
+BOOL APIENTRY DllMain(HANDLE hModule,
+    DWORD  ul_reason_for_call,
+    [[maybe_unused]] LPVOID lpReserved
+    )
+AZ_POP_DISABLE_WARNING
+{
+    PREVENT_MODULE_AND_ENVIRONMENT_SYMBOL_STRIPPING
+
+    gDLLHandle = (HMODULE)hModule;
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+        break;
+    case DLL_THREAD_ATTACH:
+
+
+        break;
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    //  int sbh = _set_sbh_threshold(1016);
+
+    return TRUE;
+}
+#endif
+
+extern "C"
+{
+CRYSYSTEM_API ISystem* CreateSystemInterface(const SSystemInitParams& startupParams)
+{
+    CSystem* pSystem = NULL;
+
+    // We must attach to the environment prior to allocating CSystem, as opposed to waiting
+    // for ModuleInitISystem(), because the log message sink uses buses.
+    // Environment should have been attached via InjectEnvironment
+    AZ_Assert(AZ::Environment::IsReady(), "Environment is not attached, must be attached before CreateSystemInterface can be called");
+
+    pSystem = new CSystem(startupParams.pSharedEnvironment);
+    ModuleInitISystem(pSystem, "CrySystem");
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION DLLMAIN_CPP_SECTION_2
+#include AZ_RESTRICTED_FILE(DllMain_cpp)
+#endif
+
+       // the earliest point the system exists - w2e tell the callback
+    if (startupParams.pUserCallback)
+    {
+        startupParams.pUserCallback->OnSystemConnect(pSystem);
+    }
+
+#if defined(WIN32)
+    // Environment Variable to signal we don't want to override our exception handler - our crash report system will set this
+    auto envVar = AZ::Environment::FindVariable<bool>("ExceptionHandlerIsSet");
+    const bool handlerIsSet = (envVar && *envVar);
+    if (!handlerIsSet)
+    {
+        ((DebugCallStack*)IDebugCallStack::instance())->installErrorHandler(pSystem);
+    }
+#endif
+
+    bool retVal = false;
+    {
+        AZ::Debug::StartupLogSinkReporter<AZ::Debug::CrySystemInitLogSink> initLogSink;
+        retVal = pSystem->Init(startupParams);
+        if (!retVal)
+        {
+            initLogSink.GetContainedLogSink().SetFatalMessageBox();
+        }
+    }
+    if (!retVal)
+    {
+        delete pSystem;
+        gEnv = nullptr;
+
+        return 0;
+    }
+
+    return pSystem;
+}
+};
+
diff --git a/Code/Legacy/CrySystem/Huffman.cpp b/Code/Legacy/CrySystem/Huffman.cpp
new file mode 100644
index 0000000000..9fa32ad3a4
--- /dev/null
+++ b/Code/Legacy/CrySystem/Huffman.cpp
@@ -0,0 +1,462 @@
+/*
+ * 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 "Huffman.h"
+
+
+void HuffmanCoder::BitStreamBuilder::AddBits(uint32 value, uint32 numBits)
+{
+    if (numBits > 24)
+    {
+        AddBits(static_cast<uint8>((value >> 24) & 0x000000ff), numBits - 24);
+        numBits = 24;
+    }
+    if (numBits > 16)
+    {
+        AddBits(static_cast<uint8>((value >> 16) & 0x000000ff), numBits - 16);
+        numBits = 16;
+    }
+    if (numBits > 8)
+    {
+        AddBits(static_cast<uint8>((value >> 8) & 0x000000ff), numBits - 8);
+        numBits = 8;
+    }
+    AddBits(static_cast<uint8>(value & 0x000000ff), numBits);
+}
+
+void HuffmanCoder::BitStreamBuilder::AddBits(uint8 value, uint32 numBits)
+{
+    if (m_mode != eM_WRITE)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Trying to write to a read only BitStreamBuilder");
+        return;
+    }
+    uint8 mask;
+    mask = (uint8)(1 << (numBits - 1));
+    while (mask != 0)
+    {
+        //CryLogAlways("mask is %u", mask);
+        if (mask & value)
+        {
+            //CryLogAlways("Buffer value was %u", *m_pBufferCursor.ptr);
+            *(m_pBufferCursor.ptr) |= m_mask;
+            //CryLogAlways("Buffer value now %u", *m_pBufferCursor.ptr);
+        }
+        //CryLogAlways("m_mask was %u", m_mask);
+        m_mask = m_mask >> 1;
+        //CryLogAlways("m_mask now %u", m_mask);
+        if (m_mask == 0)
+        {
+            if (m_pBufferCursor.ptr == m_pBufferEnd.ptr)
+            {
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Bit Stream has consumed the last byte of the buffer and is requesting another. This stream will be truncated here.");
+                return;
+            }
+            //CryLogAlways("Buffer cursor was %u (%p)", *m_pBufferCursor.ptr, m_pBufferCursor.ptr);
+            m_pBufferCursor.ptr++;
+            //CryLogAlways("Buffer cursor now %u (%p)", *m_pBufferCursor.ptr, m_pBufferCursor.ptr);
+            m_mask = 0x80;
+        }
+        mask = mask >> 1L;
+    }
+}
+
+//Returns 1 or 0 for valid values. Returns 2 if the buffer has run out or is the wrong type of builder.
+uint8 HuffmanCoder::BitStreamBuilder::GetBit()
+{
+    if (m_mode != eM_READ)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Trying to read from a write only BitStreamBuilder");
+        return 2;
+    }
+    uint8 value = 0;
+
+    if (m_mask == 0)
+    {
+        if (m_pBufferCursor.const_ptr == m_pBufferEnd.const_ptr)
+        {
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Bit Stream has consumed the last byte of the buffer and is requesting another. This stream will be truncated here.");
+            return 2;
+        }
+        //CryLogAlways("Buffer cursor was %u (%p)", *m_pBufferCursor.const_ptr, m_pBufferCursor.const_ptr);
+        m_pBufferCursor.const_ptr++;
+        //CryLogAlways("Buffer cursor now %u (%p)", *m_pBufferCursor.const_ptr, m_pBufferCursor.const_ptr);
+        m_mask = 0x80;
+    }
+    if (m_mask & *(m_pBufferCursor.const_ptr))
+    {
+        value = 1;
+    }
+    //CryLogAlways("m_mask was %u", m_mask);
+    m_mask = m_mask >> 1;
+    //CryLogAlways("m_mask now %u", m_mask);
+
+    return value;
+}
+
+void HuffmanCoder::Init()
+{
+    SAFE_DELETE_ARRAY(m_TreeNodes);
+    SAFE_DELETE_ARRAY(m_Codes);
+    m_Counts = new uint32[MAX_NUM_SYMBOLS];
+    memset(m_Counts, 0, sizeof(uint32) * MAX_NUM_SYMBOLS);
+    m_State = eHCS_OPEN;
+}
+
+//Adds the values of an array of chars to the counts
+void HuffmanCoder::Update(const uint8* const pSource, const size_t numBytes)
+{
+    if (m_State != eHCS_OPEN)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Trying to update a Huffman Coder that has not been initialized, or has been finalized");
+        return;
+    }
+
+    size_t i;
+    for (i = 0; i < numBytes; i++)
+    {
+        const int symbol = pSource[i];
+        m_Counts[symbol]++;
+    }
+}
+
+void HuffmanCoder::Finalize()
+{
+    if (m_State != eHCS_OPEN)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_ERROR, "Trying to finalize a Huffman Coder that has not been initialized, or has been finalized");
+        return;
+    }
+
+    //Construct the tree
+    m_TreeNodes = new HuffmanTreeNode[MAX_NUM_NODES];
+    memset(m_TreeNodes, 0, sizeof(HuffmanTreeNode) * MAX_NUM_NODES);
+    m_Codes = new HuffmanSymbolCode[MAX_NUM_CODES];
+    memset(m_Codes, 0, sizeof(HuffmanSymbolCode) * MAX_NUM_CODES);
+
+    ScaleCountsAndUpdateNodes();
+    m_RootNode = BuildTree();
+    ConvertTreeToCode(m_TreeNodes, m_Codes, 0, 0, m_RootNode);
+
+    //Finalize the coder so that it won't accept any more strings
+    m_State = eHCS_FINAL;
+
+    //Counts are no longer needed
+    SAFE_DELETE_ARRAY(m_Counts);
+}
+
+void HuffmanCoder::CompressInput(const uint8* const pInput, const size_t numBytes, uint8* const pOutput, size_t* const outputSize)
+{
+    BitStreamBuilder streamBuilder(pOutput, pOutput + (*outputSize));
+    for (size_t i = 0; i < numBytes; i++)
+    {
+        const int symbol = pInput[i];
+        const uint32 value = m_Codes[symbol].value;
+        const uint32 numBits = m_Codes[symbol].numBits;
+        /*char szBits[33];
+        memset(szBits, '0', 33);
+        for( uint32 j = 0; j < numBits; j++ )
+        {
+            if( (value & (uint32)(1<<j)) != 0 )
+            {
+                szBits[31-j] = '1';
+            }
+            else
+            {
+                szBits[31-j] = '0';
+            }
+        }
+        szBits[32] = 0;
+        CryLogAlways("%c - %s (%u)", value, szBits, numBits);*/
+        streamBuilder.AddBits(value, numBits);
+    }
+    streamBuilder.AddBits(m_Codes[END_OF_STREAM].value, m_Codes[END_OF_STREAM].numBits);
+    *outputSize = (streamBuilder.m_pBufferCursor.ptr - streamBuilder.m_pBufferStart.ptr) + 1;
+}
+
+size_t HuffmanCoder::UncompressInput(const uint8* const pInput, const size_t numBytes, uint8* const pOutput, const size_t maxOutputSize)
+{
+    size_t numOutputBytes = 0;
+    BitStreamBuilder streamBuilder(pInput, pInput + numBytes);
+
+    while (1)
+    {
+        int code;
+        int node = m_RootNode;
+        do
+        {
+            uint8 bitValue = streamBuilder.GetBit();
+#if 0
+            CryLogAlways("bit=%ld\n", bitValue);
+#endif
+
+            if (bitValue == 0)
+            {
+                node = m_TreeNodes[node].child0;
+            }
+            else
+            {
+                node = m_TreeNodes[node].child1;
+            }
+        } while (node > END_OF_STREAM);
+
+        if (node == END_OF_STREAM)
+        {
+            pOutput[numOutputBytes] = '\0';
+            break;
+        }
+        code = node;
+#if 0
+        {
+            CryLogAlways("%c", code);
+            if (code == '\0')
+            {
+                CryLogAlways("EOM");
+            }
+        }
+#endif
+        pOutput[numOutputBytes] = (char)code;
+        numOutputBytes++;
+        if (numOutputBytes >= maxOutputSize)
+        {
+            pOutput[maxOutputSize - 1] = '\0';
+            break;
+        }
+    }
+
+    return numOutputBytes;
+}
+
+//Private functions
+
+void HuffmanCoder::ScaleCountsAndUpdateNodes()
+{
+    unsigned long maxCount = 0;
+    int i;
+
+    for (i = 0; i < MAX_NUM_SYMBOLS; i++)
+    {
+        const unsigned long count = m_Counts[i];
+        if (count > maxCount)
+        {
+            maxCount = count;
+        }
+    }
+    if (maxCount == 0)
+    {
+        m_Counts[0] = 1;
+        maxCount = 1;
+    }
+    maxCount = maxCount / MAX_NUM_SYMBOLS;
+    maxCount = maxCount + 1;
+    for (i = 0; i < MAX_NUM_SYMBOLS; i++)
+    {
+        const unsigned long count = m_Counts[i];
+        unsigned int scaledCount = (unsigned int)(count / maxCount);
+        if ((scaledCount == 0) && (count != 0))
+        {
+            scaledCount = 1;
+        }
+        m_TreeNodes[i].count = scaledCount;
+        m_TreeNodes[i].child0 = END_OF_STREAM;
+        m_TreeNodes[i].child1 = END_OF_STREAM;
+    }
+    m_TreeNodes[END_OF_STREAM].count = 1;
+    m_TreeNodes[END_OF_STREAM].child0 = END_OF_STREAM;
+    m_TreeNodes[END_OF_STREAM].child1 = END_OF_STREAM;
+}
+
+//Jake's file IO code. Kept in case we make the compression and table generation an offline task
+/* Format is: startSymbol, stopSymbol, count0, count1, count2, ... countN, ..., 0 */
+/* When finding the start, stop symbols only break out if find more than 3 0's in the counts */
+/*static void outputCounts(FILE* const pFile, const HuffmanTreeNode* const pNodes)
+{
+    int first = 0;
+    int last;
+    int next;
+
+    while ((first < MAX_NUM_SYMBOLS) && (pNodes[first].count == 0))
+    {
+        first++;
+    }
+    last = first;
+    next = first;
+    for (; first < MAX_NUM_SYMBOLS; first = next)
+    {
+        int i;
+        last = first+1;
+        while (1)
+        {
+            for (; last < MAX_NUM_SYMBOLS; last++)
+            {
+                if (pNodes[last].count == 0)
+                {
+                    break;
+                }
+            }
+            last--;
+            for (next = last+1; next < MAX_NUM_SYMBOLS; next++)
+            {
+                if (pNodes[next].count != 0)
+                {
+                    break;
+                }
+            }
+            if (next == MAX_NUM_SYMBOLS)
+            {
+                break;
+            }
+            if ((next-last) > 3)
+            {
+                break;
+            }
+            last = next;
+        }
+        putc(first, pFile);
+        putc(last, pFile);
+        for (i = first; i <= last; i++)
+        {
+            const unsigned int count = pNodes[i].count;
+            putc((int)count, pFile);
+        }
+    }
+    putc(0xFF, pFile);
+    putc(0xFF, pFile);
+    putc((int)(pNodes[0xFF].count), pFile);
+}*/
+
+/*static void inputCounts(FILE* const pFile, HuffmanTreeNode* const pNodes)
+{
+    while (1)
+    {
+        int i;
+        const int first = getc(pFile);
+        const int last = getc(pFile);
+        for (i = first; i <= last; i++)
+        {
+            const int count = getc(pFile);
+            pNodes[i].count = (size_t)count;
+            pNodes[i].child0 = END_OF_STREAM;
+            pNodes[i].child1 = END_OF_STREAM;
+        }
+        if ((first == last) && (first == 0xFF))
+        {
+            break;
+        }
+    }
+    pNodes[END_OF_STREAM].count = 1;
+    pNodes[END_OF_STREAM].child0 = END_OF_STREAM;
+    pNodes[END_OF_STREAM].child1 = END_OF_STREAM;
+}*/
+
+int HuffmanCoder::BuildTree()
+{
+    int min1;
+    int min2;
+    int nextFree;
+
+    m_TreeNodes[MAX_NODE].count = 0xFFFFFFF;
+    for (nextFree = END_OF_STREAM + 1;; nextFree++)
+    {
+        int i;
+        min1 = MAX_NODE;
+        min2 = MAX_NODE;
+        for (i = 0; i < nextFree; i++)
+        {
+            const unsigned int count = m_TreeNodes[i].count;
+            if (count != 0)
+            {
+                if (count < m_TreeNodes[min1].count)
+                {
+                    min2 = min1;
+                    min1 = i;
+                }
+                else if (count < m_TreeNodes[min2].count)
+                {
+                    min2 = i;
+                }
+            }
+        }
+        if (min2 == MAX_NODE)
+        {
+            break;
+        }
+        m_TreeNodes[nextFree].count = m_TreeNodes[min1].count + m_TreeNodes[min2].count;
+
+        m_TreeNodes[min1].savedCount = m_TreeNodes[min1].count;
+        m_TreeNodes[min1].count = 0;
+
+        m_TreeNodes[min2].savedCount = m_TreeNodes[min2].count;
+        m_TreeNodes[min2].count = 0;
+
+        m_TreeNodes[nextFree].child0 = min1;
+        m_TreeNodes[nextFree].child1 = min2;
+        m_TreeNodes[nextFree].savedCount = 0;
+    }
+
+    nextFree--;
+    m_TreeNodes[nextFree].savedCount = m_TreeNodes[nextFree].count;
+
+    return nextFree;
+}
+
+void HuffmanCoder::ConvertTreeToCode(const HuffmanTreeNode* const pNodes, HuffmanSymbolCode* const pCodes,
+    const unsigned int value, const unsigned int numBits, const int node)
+{
+    unsigned int nextValue;
+    unsigned int nextNumBits;
+    if (node <= END_OF_STREAM)
+    {
+        pCodes[node].value = value;
+        pCodes[node].numBits = numBits;
+        return;
+    }
+    nextValue = value << 1;
+    nextNumBits = numBits + 1;
+    ConvertTreeToCode(pNodes, pCodes, nextValue, nextNumBits, pNodes[node].child0);
+    nextValue = nextValue | 0x1;
+    ConvertTreeToCode(pNodes, pCodes, nextValue, nextNumBits, pNodes[node].child1);
+}
+
+/*static void printChar(const int c)
+{
+    if (c >= ' ' && c < 127)
+    {
+        printf("'%c'", c);
+    }
+    else
+    {
+        printf("0x%03X", c);
+    }
+}
+
+static void printModel(const HuffmanTreeNode* const pNodes, const HuffmanSymbolCode* const pCodes)
+{
+    int i;
+    for (i = 0; i < MAX_NODE; i++)
+    {
+        const unsigned int count = pNodes[i].savedCount;
+        if (count != 0)
+        {
+            printf("node=");
+            printChar(i);
+            printf(" count=%3d", count);
+            printf(" child0=");
+            printChar(pNodes[i].child0);
+            printf(" child1=");
+            printChar(pNodes[i].child1);
+            if (pCodes && (i <= END_OF_STREAM))
+            {
+                printf(" Huffman code=");
+                binaryFilePrint(stdout, pCodes[i].value, pCodes[i].numBits);
+            }
+            printf("\n");
+        }
+    }
+}*/
diff --git a/Code/Legacy/CrySystem/Huffman.h b/Code/Legacy/CrySystem/Huffman.h
new file mode 100644
index 0000000000..d002ee79b5
--- /dev/null
+++ b/Code/Legacy/CrySystem/Huffman.h
@@ -0,0 +1,148 @@
+/*
+ * 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_HUFFMAN_H
+#define CRYINCLUDE_CRYSYSTEM_HUFFMAN_H
+#pragma once
+
+
+class HuffmanCoder
+{
+private:
+    struct HuffmanTreeNode
+    {
+        uint32 count;
+        uint32 savedCount;
+        int child0;
+        int child1;
+    };
+
+    struct HuffmanSymbolCode
+    {
+        uint32 value;
+        uint32 numBits;
+    };
+
+    struct BitStreamBuilder
+    {
+        enum EModes
+        {
+            eM_WRITE,
+            eM_READ
+        };
+        union buf_ptr
+        {
+            uint8* ptr;
+            const uint8* const_ptr;
+        };
+        EModes m_mode;
+        uint8 m_mask;
+        buf_ptr m_pBufferStart;
+        buf_ptr m_pBufferCursor;
+        buf_ptr m_pBufferEnd;       //Pointer to the last byte in the buffer
+
+        BitStreamBuilder(uint8* pBufferStart, uint8* pBufferEnd)
+            : m_mode(eM_WRITE)
+            , m_mask(0x80)
+        {
+            m_pBufferStart.ptr = pBufferStart;
+            m_pBufferCursor.ptr = pBufferStart;
+            m_pBufferEnd.ptr = pBufferEnd;
+        }
+        BitStreamBuilder(const uint8* pBufferStart, const uint8* pBufferEnd)
+            : m_mode(eM_READ)
+            , m_mask(0x80)
+        {
+            m_pBufferStart.const_ptr = pBufferStart;
+            m_pBufferCursor.const_ptr = pBufferStart;
+            m_pBufferEnd.const_ptr = pBufferEnd;
+        }
+
+        void AddBits(uint32 value, uint32 numBits);
+        void AddBits(uint8 value, uint32 numBits);
+        //Returns 1 or 0 for valid values. Returns 2 if the buffer has run out or is the wrong type of builder.
+        uint8 GetBit();
+    };
+
+    const static int MAX_SYMBOL_VALUE = (255);
+    const static int MAX_NUM_SYMBOLS = (MAX_SYMBOL_VALUE + 1);
+    const static int END_OF_STREAM = (MAX_NUM_SYMBOLS);
+    const static int MAX_NUM_CODES = (MAX_NUM_SYMBOLS + 1);
+    const static int MAX_NUM_NODES = (MAX_NUM_CODES * 2);
+    const static int MAX_NODE = (MAX_NUM_NODES - 1);
+
+    enum EHuffmanCoderState
+    {
+        eHCS_NEW,       //Has been created, Init not called
+        eHCS_OPEN,      //Init has been called, tree not yet constructed. Can accept new data.
+        eHCS_FINAL      //Finalize has been called. Can no longer accept data, but can encode/decode.
+    };
+
+    HuffmanTreeNode* m_TreeNodes;
+    HuffmanSymbolCode* m_Codes;
+    uint32* m_Counts;
+    int m_RootNode;
+    uint32 m_RefCount;
+    EHuffmanCoderState m_State;
+
+public:
+    HuffmanCoder()
+        : m_TreeNodes(NULL)
+        , m_Codes(NULL)
+        , m_Counts(NULL)
+        , m_State(eHCS_NEW)
+        , m_RootNode(0)
+        , m_RefCount(0) {}
+    ~HuffmanCoder()
+    {
+        SAFE_DELETE_ARRAY(m_TreeNodes);
+        SAFE_DELETE_ARRAY(m_Codes);
+        SAFE_DELETE_ARRAY(m_Counts);
+    }
+
+    //A bit like an MD5 generator, has three phases.
+    //Clears the existing data
+    void Init();
+    //Adds the values of an array of chars to the counts
+    void Update(const uint8* const pSource, const size_t numBytes);
+    //Construct the coding tree using the counts
+    void Finalize();
+
+    //We typically create a Huffman Coder per localized string table loaded. Since we can and do unload strings at runtime, it's useful to keep a ref count of each coder.
+    inline void AddRef() { m_RefCount++; }
+    inline void DecRef() { m_RefCount = m_RefCount > 0 ? m_RefCount - 1 : 0; }
+    inline uint32 RefCount() { return m_RefCount; }
+
+    void CompressInput(const uint8* const pInput, const size_t numBytes, uint8* const pOutput, size_t* const outputSize);
+    size_t UncompressInput(const uint8* const pInput, const size_t numBytes, uint8* const pOutput, const size_t maxOutputSize);
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(this, sizeof(*this));
+
+        if (m_Counts != NULL)
+        {
+            pSizer->AddObject(m_Counts, sizeof(uint32), MAX_NUM_SYMBOLS);
+        }
+        if (m_TreeNodes != NULL)
+        {
+            pSizer->AddObject(m_TreeNodes, sizeof(HuffmanTreeNode), MAX_NUM_NODES);
+        }
+        if (m_Codes != NULL)
+        {
+            pSizer->AddObject(m_Codes, sizeof(HuffmanSymbolCode), MAX_NUM_CODES);
+        }
+    }
+
+private:
+    void ScaleCountsAndUpdateNodes();
+    int BuildTree();
+    void ConvertTreeToCode(const HuffmanTreeNode* const pNodes, HuffmanSymbolCode* const pCodes, const unsigned int value, const unsigned int numBits, const int node);
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_HUFFMAN_H
diff --git a/Code/Legacy/CrySystem/IDebugCallStack.cpp b/Code/Legacy/CrySystem/IDebugCallStack.cpp
new file mode 100644
index 0000000000..823342464d
--- /dev/null
+++ b/Code/Legacy/CrySystem/IDebugCallStack.cpp
@@ -0,0 +1,270 @@
+/*
+ * 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 : A multiplatform base class for handling errors and collecting call stacks
+
+
+#include "CrySystem_precompiled.h"
+#include "IDebugCallStack.h"
+#include "System.h"
+#include <AzFramework/IO/FileOperations.h>
+#include <AzCore/NativeUI/NativeUIRequests.h>
+#include <AzCore/StringFunc/StringFunc.h>
+#include <AzCore/Utils/Utils.h>
+//#if !defined(LINUX)
+
+#include <ISystem.h>
+
+const char* const IDebugCallStack::s_szFatalErrorCode = "FATAL_ERROR";
+
+IDebugCallStack::IDebugCallStack()
+    : m_bIsFatalError(false)
+    , m_postBackupProcess(0)
+    , m_memAllocFileHandle(AZ::IO::InvalidHandle)
+{
+}
+
+IDebugCallStack::~IDebugCallStack()
+{
+    StopMemLog();
+}
+
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_SINGLETON
+IDebugCallStack* IDebugCallStack::instance()
+{
+    static IDebugCallStack sInstance;
+    return &sInstance;
+}
+#endif
+
+void IDebugCallStack::FileCreationCallback(void (* postBackupProcess)())
+{
+    m_postBackupProcess = postBackupProcess;
+}
+//////////////////////////////////////////////////////////////////////////
+void IDebugCallStack::LogCallstack()
+{
+    AZ::Debug::Trace::PrintCallstack("", 2);
+}
+
+const char* IDebugCallStack::TranslateExceptionCode(DWORD dwExcept)
+{
+    switch (dwExcept)
+    {
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_TRANSLATE
+    case EXCEPTION_ACCESS_VIOLATION:
+        return "EXCEPTION_ACCESS_VIOLATION";
+        break;
+    case EXCEPTION_DATATYPE_MISALIGNMENT:
+        return "EXCEPTION_DATATYPE_MISALIGNMENT";
+        break;
+    case EXCEPTION_BREAKPOINT:
+        return "EXCEPTION_BREAKPOINT";
+        break;
+    case EXCEPTION_SINGLE_STEP:
+        return "EXCEPTION_SINGLE_STEP";
+        break;
+    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+        return "EXCEPTION_ARRAY_BOUNDS_EXCEEDED";
+        break;
+    case EXCEPTION_FLT_DENORMAL_OPERAND:
+        return "EXCEPTION_FLT_DENORMAL_OPERAND";
+        break;
+    case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+        return "EXCEPTION_FLT_DIVIDE_BY_ZERO";
+        break;
+    case EXCEPTION_FLT_INEXACT_RESULT:
+        return "EXCEPTION_FLT_INEXACT_RESULT";
+        break;
+    case EXCEPTION_FLT_INVALID_OPERATION:
+        return "EXCEPTION_FLT_INVALID_OPERATION";
+        break;
+    case EXCEPTION_FLT_OVERFLOW:
+        return "EXCEPTION_FLT_OVERFLOW";
+        break;
+    case EXCEPTION_FLT_STACK_CHECK:
+        return "EXCEPTION_FLT_STACK_CHECK";
+        break;
+    case EXCEPTION_FLT_UNDERFLOW:
+        return "EXCEPTION_FLT_UNDERFLOW";
+        break;
+    case EXCEPTION_INT_DIVIDE_BY_ZERO:
+        return "EXCEPTION_INT_DIVIDE_BY_ZERO";
+        break;
+    case EXCEPTION_INT_OVERFLOW:
+        return "EXCEPTION_INT_OVERFLOW";
+        break;
+    case EXCEPTION_PRIV_INSTRUCTION:
+        return "EXCEPTION_PRIV_INSTRUCTION";
+        break;
+    case EXCEPTION_IN_PAGE_ERROR:
+        return "EXCEPTION_IN_PAGE_ERROR";
+        break;
+    case EXCEPTION_ILLEGAL_INSTRUCTION:
+        return "EXCEPTION_ILLEGAL_INSTRUCTION";
+        break;
+    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
+        return "EXCEPTION_NONCONTINUABLE_EXCEPTION";
+        break;
+    case EXCEPTION_STACK_OVERFLOW:
+        return "EXCEPTION_STACK_OVERFLOW";
+        break;
+    case EXCEPTION_INVALID_DISPOSITION:
+        return "EXCEPTION_INVALID_DISPOSITION";
+        break;
+    case EXCEPTION_GUARD_PAGE:
+        return "EXCEPTION_GUARD_PAGE";
+        break;
+    case EXCEPTION_INVALID_HANDLE:
+        return "EXCEPTION_INVALID_HANDLE";
+        break;
+    //case EXCEPTION_POSSIBLE_DEADLOCK: return "EXCEPTION_POSSIBLE_DEADLOCK";   break ;
+
+    case STATUS_FLOAT_MULTIPLE_FAULTS:
+        return "STATUS_FLOAT_MULTIPLE_FAULTS";
+        break;
+    case STATUS_FLOAT_MULTIPLE_TRAPS:
+        return "STATUS_FLOAT_MULTIPLE_TRAPS";
+        break;
+
+
+#endif
+    default:
+        return "Unknown";
+        break;
+    }
+}
+
+void IDebugCallStack::PutVersion(char* str, size_t length)
+{
+AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
+
+    if (!gEnv || !gEnv->pSystem)
+    {
+        return;
+    }
+
+    char sFileVersion[128];
+    gEnv->pSystem->GetFileVersion().ToString(sFileVersion, sizeof(sFileVersion));
+
+    char sProductVersion[128];
+    gEnv->pSystem->GetProductVersion().ToString(sProductVersion, sizeof(sFileVersion));
+
+
+    //! Get time.
+    time_t ltime;
+    time(&ltime);
+    tm* today = localtime(&ltime);
+
+    char s[1024];
+    //! Use strftime to build a customized time string.
+    strftime(s, 128, "Logged at %#c\n", today);
+    azstrcat(str, length, s);
+    sprintf_s(s, "FileVersion: %s\n", sFileVersion);
+    azstrcat(str, length, s);
+    sprintf_s(s, "ProductVersion: %s\n", sProductVersion);
+    azstrcat(str, length, s);
+
+    if (gEnv->pLog)
+    {
+        const char* logfile = gEnv->pLog->GetFileName();
+        if (logfile)
+        {
+            sprintf (s, "LogFile: %s\n", logfile);
+            azstrcat(str, length, s);
+        }
+    }
+
+    AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
+    azstrcat(str, length, "ProjectDir: ");
+    azstrcat(str, length, projectPath.c_str());
+    azstrcat(str, length, "\n");
+
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_APPEND_MODULENAME
+    GetModuleFileNameA(NULL, s, sizeof(s));
+    
+    // Log EXE filename only if possible (not full EXE path which could contain sensitive info)
+    AZStd::string exeName;
+    if (AZ::StringFunc::Path::GetFullFileName(s, exeName))
+    {
+        azstrcat(str, length, "Executable: ");
+        azstrcat(str, length, exeName.c_str());
+
+#   ifdef AZ_DEBUG_BUILD
+        azstrcat(str, length, " (debug: yes");
+#   else
+        azstrcat(str, length, " (debug: no");
+#   endif
+    }
+#endif
+AZ_POP_DISABLE_WARNING
+}
+
+
+//Crash the application, in this way the debug callstack routine will be called and it will create all the necessary files (error.log, dump, and eventually screenshot)
+void IDebugCallStack::FatalError(const char* description)
+{
+    m_bIsFatalError = true;
+    WriteLineToLog(description);
+
+#ifndef _RELEASE
+    bool bShowDebugScreen = g_cvars.sys_no_crash_dialog == 0;
+    // showing the debug screen is not safe when not called from mainthread
+    // it normally leads to a infinity recursion followed by a stack overflow, preventing
+    // useful call stacks, thus they are disabled
+    bShowDebugScreen = bShowDebugScreen && gEnv->mMainThreadId == CryGetCurrentThreadId();
+    if (bShowDebugScreen)
+    {
+        EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "Open 3D Engine Fatal Error", description, false);
+    }
+#endif
+
+#if defined(WIN32) || !defined(_RELEASE)
+    int* p = 0x0;
+    PREFAST_SUPPRESS_WARNING(6011) * p = 1; // we're intentionally crashing here
+#endif
+}
+
+void IDebugCallStack::WriteLineToLog(const char* format, ...)
+{
+    va_list ArgList;
+    char        szBuffer[MAX_WARNING_LENGTH];
+    va_start(ArgList, format);
+    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, format, ArgList);
+    cry_strcat(szBuffer, "\n");
+    szBuffer[sizeof(szBuffer) - 1] = '\0';
+    va_end(ArgList);
+
+    AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
+    AZ::IO::FileIOBase::GetDirectInstance()->Open("@Log@\\error.log", AZ::IO::GetOpenModeFromStringMode("a+t"), fileHandle);
+    if (fileHandle != AZ::IO::InvalidHandle)
+    {
+        AZ::IO::FileIOBase::GetDirectInstance()->Write(fileHandle, szBuffer, strlen(szBuffer));
+        AZ::IO::FileIOBase::GetDirectInstance()->Flush(fileHandle);
+        AZ::IO::FileIOBase::GetDirectInstance()->Close(fileHandle);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void IDebugCallStack::StartMemLog()
+{
+    AZ::IO::FileIOBase::GetDirectInstance()->Open("@Log@\\memallocfile.log", AZ::IO::OpenMode::ModeWrite, m_memAllocFileHandle);
+
+    assert(m_memAllocFileHandle != AZ::IO::InvalidHandle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void IDebugCallStack::StopMemLog()
+{
+    if (m_memAllocFileHandle != AZ::IO::InvalidHandle)
+    {
+        AZ::IO::FileIOBase::GetDirectInstance()->Close(m_memAllocFileHandle);
+        m_memAllocFileHandle = AZ::IO::InvalidHandle;
+    }
+}
+//#endif //!defined(LINUX)
diff --git a/Code/Legacy/CrySystem/IDebugCallStack.h b/Code/Legacy/CrySystem/IDebugCallStack.h
new file mode 100644
index 0000000000..4b8e66baa6
--- /dev/null
+++ b/Code/Legacy/CrySystem/IDebugCallStack.h
@@ -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
+ *
+ */
+
+
+// Description : A multiplatform base class for handling errors and collecting call stacks
+
+#ifndef CRYINCLUDE_CRYSYSTEM_IDEBUGCALLSTACK_H
+#define CRYINCLUDE_CRYSYSTEM_IDEBUGCALLSTACK_H
+#pragma once
+
+#include "System.h"
+
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_FORWARD_EXCEPTION_POINTERS
+struct EXCEPTION_POINTERS;
+#endif
+//! Limits the maximal number of functions in call stack.
+enum
+{
+    MAX_DEBUG_STACK_ENTRIES = 80
+};
+
+class IDebugCallStack
+{
+public:
+    // Returns single instance of DebugStack
+    static IDebugCallStack* instance();
+
+    virtual int handleException([[maybe_unused]] EXCEPTION_POINTERS* exception_pointer){return 0; }
+
+    // returns the module name of a given address
+    virtual string GetModuleNameForAddr([[maybe_unused]] void* addr) { return "[unknown]"; }
+
+    // returns the function name of a given address together with source file and line number (if available) of a given address
+    virtual void GetProcNameForAddr(void* addr, string& procName, void*& baseAddr, string& filename, int& line)
+    {
+        filename = "[unknown]";
+        line = 0;
+        baseAddr = addr;
+#if defined(PLATFORM_64BIT)
+        procName.Format("[%016llX]", addr);
+#else
+        procName.Format("[%08X]", addr);
+#endif
+    }
+
+    // returns current filename
+    virtual string GetCurrentFilename()  { return "[unknown]"; }
+
+    //! Dumps Current Call Stack to log.
+    virtual void LogCallstack();
+    //triggers a fatal error, so the DebugCallstack can create the error.log and terminate the application
+    void FatalError(const char*);
+
+    //Reports a bug and continues execution
+    virtual void ReportBug(const char*) {}
+
+    virtual void FileCreationCallback(void (* postBackupProcess)());
+
+    static void WriteLineToLog(const char* format, ...);
+
+    virtual void StartMemLog();
+    virtual void StopMemLog();
+
+protected:
+    IDebugCallStack();
+    virtual ~IDebugCallStack();
+
+    static const char* TranslateExceptionCode(DWORD dwExcept);
+    static void PutVersion(char* str, size_t length);
+
+    bool m_bIsFatalError;
+    static const char* const s_szFatalErrorCode;
+
+    void (* m_postBackupProcess)();
+
+    AZ::IO::HandleType m_memAllocFileHandle;
+};
+
+
+
+#endif // CRYINCLUDE_CRYSYSTEM_IDEBUGCALLSTACK_H
diff --git a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
new file mode 100644
index 0000000000..1775939d07
--- /dev/null
+++ b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
@@ -0,0 +1,994 @@
+/*
+ * 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
+ *
+ */
+
+
+// [LYN-2376] Remove the entire file once legacy slice support is removed
+
+#include "CrySystem_precompiled.h"
+#include "LevelSystem.h"
+#include <IAudioSystem.h>
+#include "IMovieSystem.h"
+#include <ILocalizationManager.h>
+#include "CryPath.h"
+
+#include <LoadScreenBus.h>
+
+#include <AzCore/Debug/AssetTracking.h>
+#include <AzFramework/API/ApplicationAPI.h>
+#include <AzFramework/IO/FileOperations.h>
+#include <AzFramework/Entity/GameEntityContextBus.h>
+#include <AzFramework/Input/Buses/Requests/InputChannelRequestBus.h>
+#include <AzFramework/Spawnable/RootSpawnableInterface.h>
+
+#include "MainThreadRenderRequestBus.h"
+#include <LyShine/ILyShine.h>
+#include <AzCore/Component/TickBus.h>
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/StringFunc/StringFunc.h>
+
+#include <AzCore/Script/ScriptSystemBus.h>
+
+#ifdef WIN32
+#include <CryWindows.h>
+#endif
+
+namespace LegacyLevelSystem
+{
+static constexpr const char* ArchiveExtension = ".pak";
+
+void CLevelInfo::GetMemoryUsage(ICrySizer* pSizer) const
+{
+    pSizer->AddObject(m_levelName);
+    pSizer->AddObject(m_levelPath);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLevelInfo::OpenLevelPak()
+{
+    LOADING_TIME_PROFILE_SECTION;
+
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+    // The prefab system doesn't use level.pak
+    if (usePrefabSystemForLevels)
+    {
+        return false;
+    }
+
+    AZStd::string levelpak(m_levelPath);
+    levelpak += "/level.pak";
+    AZStd::fixed_string<AZ::IO::IArchive::MaxPath> fullLevelPakPath;
+    bool bOk = gEnv->pCryPak->OpenPack(
+        levelpak.c_str(), m_isPak ? AZ::IO::IArchive::FLAGS_LEVEL_PAK_INSIDE_PAK : (unsigned)0, NULL, &fullLevelPakPath, false);
+    m_levelPakFullPath.assign(fullLevelPakPath.c_str());
+    return bOk;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLevelInfo::CloseLevelPak()
+{
+    LOADING_TIME_PROFILE_SECTION;
+
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+    // The prefab system doesn't use level.pak
+    if (usePrefabSystemForLevels)
+    {
+        return;
+    }
+
+    if (!m_levelPakFullPath.empty())
+    {
+        gEnv->pCryPak->ClosePack(m_levelPakFullPath.c_str(), AZ::IO::IArchive::FLAGS_PATH_REAL);
+        m_levelPakFullPath.clear();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLevelInfo::ReadInfo()
+{
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+    // Set up a default game type for legacy code.
+    m_defaultGameTypeName = "Mission0";
+
+    if (usePrefabSystemForLevels)
+    {
+        return true;
+    }
+
+
+    AZStd::string levelPath(m_levelPath);
+    AZStd::string xmlFile(levelPath);
+    xmlFile += "/LevelInfo.xml";
+    XmlNodeRef rootNode = GetISystem()->LoadXmlFromFile(xmlFile.c_str());
+
+    if (rootNode)
+    {
+        AZStd::string dataFile(levelPath);
+        dataFile += "/LevelDataAction.xml";
+        XmlNodeRef dataNode = GetISystem()->LoadXmlFromFile(dataFile.c_str());
+        if (!dataNode)
+        {
+            dataFile = levelPath + "/LevelData.xml";
+            dataNode = GetISystem()->LoadXmlFromFile(dataFile.c_str());
+        }
+
+        if (dataNode)
+        {
+            XmlNodeRef gameTypesNode = dataNode->findChild("Missions");
+
+            if ((gameTypesNode != 0) && (gameTypesNode->getChildCount() > 0))
+            {
+                m_defaultGameTypeName.clear();
+
+                for (int i = 0; i < gameTypesNode->getChildCount(); i++)
+                {
+                    XmlNodeRef gameTypeNode = gameTypesNode->getChild(i);
+
+                    if (gameTypeNode->isTag("Mission"))
+                    {
+                        const char* gameTypeName = gameTypeNode->getAttr("Name");
+
+                        if (gameTypeName)
+                        {
+                            m_defaultGameTypeName = gameTypeName;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return rootNode != 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+/// Used by console auto completion.
+struct SLevelNameAutoComplete
+    : public IConsoleArgumentAutoComplete
+{
+    AZStd::vector<AZStd::string> levels;
+    virtual int GetCount() const { return levels.size(); };
+    virtual const char* GetValue(int nIndex) const { return levels[nIndex].c_str(); };
+};
+// definition and declaration must be separated for devirtualization
+static StaticInstance<SLevelNameAutoComplete, AZStd::no_destruct<SLevelNameAutoComplete>> g_LevelNameAutoComplete;
+
+//------------------------------------------------------------------------
+static void LoadMap(IConsoleCmdArgs* args)
+{
+    if (gEnv->pSystem && gEnv->pSystem->GetILevelSystem() && !gEnv->IsEditor())
+    {
+        if (args->GetArgCount() > 1)
+        {
+            gEnv->pSystem->GetILevelSystem()->UnloadLevel();
+            gEnv->pSystem->GetILevelSystem()->LoadLevel(args->GetArg(1));
+        }
+    }
+}
+
+//------------------------------------------------------------------------
+static void UnloadMap([[maybe_unused]] IConsoleCmdArgs* args)
+{
+    if (gEnv->pSystem && gEnv->pSystem->GetILevelSystem() && !gEnv->IsEditor())
+    {
+        gEnv->pSystem->GetILevelSystem()->UnloadLevel();
+    }
+}
+
+//------------------------------------------------------------------------
+CLevelSystem::CLevelSystem(ISystem* pSystem, const char* levelsFolder)
+    : m_pSystem(pSystem)
+    , m_pCurrentLevel(0)
+    , m_pLoadingLevelInfo(0)
+{
+    LOADING_TIME_PROFILE_SECTION;
+    CRY_ASSERT(pSystem);
+
+    //if (!gEnv->IsEditor())
+    Rescan(levelsFolder);
+
+    m_fLastLevelLoadTime = 0;
+    m_fLastTime = 0;
+    m_bLevelLoaded = false;
+
+    m_levelLoadStartTime.SetValue(0);
+
+    m_nLoadedLevelsCount = 0;
+
+    REGISTER_COMMAND("map", LoadMap, VF_BLOCKFRAME, "Load a map");
+    REGISTER_COMMAND("unload", UnloadMap, 0, "Unload current map");
+    gEnv->pConsole->RegisterAutoComplete("map", &(*g_LevelNameAutoComplete));
+
+    AZ_Assert(gEnv && gEnv->pCryPak, "gEnv and CryPak must be initialized for loading levels.");
+    if (!gEnv || !gEnv->pCryPak)
+    {
+        return;
+    }
+    auto pPak = gEnv->pCryPak;
+
+    if (AZ::IO::IArchive::LevelPackOpenEvent* levelPakOpenEvent = pPak->GetLevelPackOpenEvent())
+    {
+        m_levelPackOpenHandler = AZ::IO::IArchive::LevelPackOpenEvent::Handler([this](const AZStd::vector<AZStd::string>& levelDirs)
+        {
+            for (AZStd::string dir : 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);
+            }
+        });
+        m_levelPackOpenHandler.Connect(*levelPakOpenEvent);
+    }
+
+    if (AZ::IO::IArchive::LevelPackCloseEvent* levelPakCloseEvent = pPak->GetLevelPackCloseEvent())
+    {
+        m_levelPackCloseHandler = AZ::IO::IArchive::LevelPackCloseEvent::Handler([this](AZStd::string_view)
+        {
+            Rescan(ILevelSystem::LevelsDirectoryName);
+        });
+        m_levelPackCloseHandler.Connect(*levelPakCloseEvent);
+    }
+}
+
+//------------------------------------------------------------------------
+CLevelSystem::~CLevelSystem()
+{
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::Rescan(const char* levelsFolder)
+{
+    if (levelsFolder)
+    {
+        m_levelsFolder = levelsFolder;
+    }
+
+    CRY_ASSERT(!m_levelsFolder.empty());
+    m_levelInfos.clear();
+    m_levelInfos.reserve(64);
+    ScanFolder(0, false);
+
+    g_LevelNameAutoComplete->levels.clear();
+    for (int i = 0; i < (int)m_levelInfos.size(); i++)
+    {
+        g_LevelNameAutoComplete->levels.push_back(AZStd::string(PathUtil::GetFileName(m_levelInfos[i].GetName()).c_str()));
+    }
+}
+
+//-----------------------------------------------------------------------
+void CLevelSystem::ScanFolder(const char* subfolder, bool modFolder)
+{
+    AZStd::string folder;
+    if (subfolder && subfolder[0])
+    {
+        folder = subfolder;
+    }
+
+    AZStd::string search(m_levelsFolder);
+    if (!folder.empty())
+    {
+        if (AZ::StringFunc::StartsWith(folder.c_str(), m_levelsFolder.c_str()))
+        {
+            search = folder;
+        }
+        else
+        {
+            search += "/" + folder;
+        }
+    }
+    search += "/*";
+
+    AZ_Assert(gEnv && gEnv->pCryPak, "gEnv and must be initialized for loading levels.");
+    if (!gEnv || !gEnv->pCryPak)
+    {
+        return;
+    }
+    auto pPak = gEnv->pCryPak;
+
+    AZStd::unordered_set<AZStd::string> pakList;
+
+    const bool allowFileSystem = true;
+    const uint32_t skipPakFiles = 1;
+    AZ::IO::ArchiveFileIterator handle = pPak->FindFirst(search.c_str(), AZ::IO::IArchive::eFileSearchType_AllowOnDiskOnly);
+
+    if (handle)
+    {
+        do
+        {
+            AZStd::string extension;
+            AZStd::string levelName;
+            AZ::StringFunc::Path::Split(handle.m_filename.data(), nullptr, nullptr, &levelName, &extension);
+            if (extension == ArchiveExtension)
+            {
+                if (AZ::StringFunc::Equal(handle.m_filename.data(), LevelPakName))
+                {
+                    // level folder contain pak files like 'level.pak'
+                    // which we only want to load during level loading.
+                    continue;
+                }
+
+                AZStd::string levelContainerPakPath;
+                AZ::StringFunc::Path::Join("@assets@", m_levelsFolder.c_str(), levelContainerPakPath);
+                if (subfolder && subfolder[0])
+                {
+                    AZ::StringFunc::Path::Join(levelContainerPakPath.c_str(), subfolder, levelContainerPakPath);
+                }
+                AZ::StringFunc::Path::Join(levelContainerPakPath.c_str(), handle.m_filename.data(), levelContainerPakPath);
+                pakList.emplace(levelContainerPakPath);
+                continue;
+            }
+        } while (handle = pPak->FindNext(handle));
+
+        pPak->FindClose(handle);
+    }
+
+    // Open all the available paks found in the levels folder
+    for (auto iter = pakList.begin(); iter != pakList.end(); iter++)
+    {
+        AZStd::fixed_string<AZ::IO::IArchive::MaxPath> fullLevelPakPath;
+        gEnv->pCryPak->OpenPack(iter->c_str(), (unsigned)0, nullptr, &fullLevelPakPath, false);
+    }
+
+    // Levels in bundles now take priority over levels outside of bundles.
+    PopulateLevels(search, folder, pPak, modFolder, false);
+    // Load levels outside of the bundles to maintain backward compatibility.
+    PopulateLevels(search, folder, pPak, modFolder, true);
+
+}
+
+void CLevelSystem::PopulateLevels(
+    AZStd::string searchPattern, 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(), AZ::IO::IArchive::eFileSearchType_AllowOnDiskOnly);
+
+        if (handle)
+        {
+            do
+            {
+                if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) != AZ::IO::FileDesc::Attribute::Subdirectory ||
+                    handle.m_filename == "." || handle.m_filename == "..")
+                {
+                    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 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::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);
+        }
+    }
+}
+
+//------------------------------------------------------------------------
+int CLevelSystem::GetLevelCount()
+{
+    return (int)m_levelInfos.size();
+}
+
+//------------------------------------------------------------------------
+ILevelInfo* CLevelSystem::GetLevelInfo(int level)
+{
+    return GetLevelInfoInternal(level);
+}
+
+//------------------------------------------------------------------------
+CLevelInfo* CLevelSystem::GetLevelInfoInternal(int level)
+{
+    if ((level >= 0) && (level < GetLevelCount()))
+    {
+        return &m_levelInfos[level];
+    }
+
+    return 0;
+}
+
+//------------------------------------------------------------------------
+ILevelInfo* CLevelSystem::GetLevelInfo(const char* levelName)
+{
+    return GetLevelInfoInternal(levelName);
+}
+
+//------------------------------------------------------------------------
+CLevelInfo* CLevelSystem::GetLevelInfoInternal(const AZStd::string& levelName)
+{
+    // If level not found by full name try comparing with only filename
+    for (AZStd::vector<CLevelInfo>::iterator it = m_levelInfos.begin(); it != m_levelInfos.end(); ++it)
+    {
+        if (!azstricmp(it->GetName(), levelName.c_str()))
+        {
+            return &(*it);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    for (AZStd::vector<CLevelInfo>::iterator it = m_levelInfos.begin(); it != m_levelInfos.end(); ++it)
+    {
+        {
+            if (!azstricmp(PathUtil::GetFileName(it->GetName()), levelName.c_str()))
+            {
+                return &(*it);
+            }
+        }
+    }
+
+    // Try stripping out the folder to find the raw filename
+    AZStd::string sLevelName(levelName);
+    size_t lastSlash = sLevelName.find_last_of('\\');
+    if (lastSlash == AZStd::string::npos)
+    {
+        lastSlash = sLevelName.find_last_of('/');
+    }
+    if (lastSlash != AZStd::string::npos)
+    {
+        sLevelName = sLevelName.substr(lastSlash + 1, sLevelName.size() - lastSlash - 1);
+        return GetLevelInfoInternal(sLevelName.c_str());
+    }
+
+    return 0;
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::AddListener(ILevelSystemListener* pListener)
+{
+    AZStd::vector<ILevelSystemListener*>::iterator it = AZStd::find(m_listeners.begin(), m_listeners.end(), pListener);
+
+    if (it == m_listeners.end())
+    {
+        m_listeners.reserve(12);
+        m_listeners.push_back(pListener);
+    }
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::RemoveListener(ILevelSystemListener* pListener)
+{
+    AZStd::vector<ILevelSystemListener*>::iterator it = AZStd::find(m_listeners.begin(), m_listeners.end(), pListener);
+
+    if (it != m_listeners.end())
+    {
+        m_listeners.erase(it);
+
+        if (m_listeners.empty())
+        {
+            m_listeners.shrink_to_fit();
+        }
+    }
+}
+
+//------------------------------------------------------------------------
+bool CLevelSystem::LoadLevel(const char* _levelName)
+{
+    if (gEnv->IsEditor())
+    {
+        AZ_TracePrintf("CrySystem::CLevelSystem", "LoadLevel for %s was called in the editor - not actually loading.\n", _levelName);
+        return false;
+    }
+
+    // If a level is currently loaded, unload it before loading the next one.
+    if (IsLevelLoaded())
+    {
+        UnloadLevel();
+    }
+
+    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_PREPARE, 0, 0);
+    PrepareNextLevel(_levelName);
+
+    ILevel* level = LoadLevelInternal(_levelName);
+    if (level)
+    {
+        OnLoadingComplete(_levelName);
+    }
+
+    return (level != nullptr);
+}
+//------------------------------------------------------------------------
+ILevel* CLevelSystem::LoadLevelInternal(const char* _levelName)
+{
+    gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START);
+    AZ_ASSET_NAMED_SCOPE("Level: %s", _levelName);
+
+    CryLog ("Level system is loading \"%s\"", _levelName);
+    INDENT_LOG_DURING_SCOPE();
+
+    char levelName[256];
+    cry_strcpy(levelName, _levelName);
+
+    // Not remove a scope!!!
+    {
+        LOADING_TIME_PROFILE_SECTION;
+
+        //m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
+
+        CLevelInfo* pLevelInfo = GetLevelInfoInternal(levelName);
+
+        if (!pLevelInfo)
+        {
+            // alert the listener
+            OnLevelNotFound(levelName);
+
+            return 0;
+        }
+
+        m_bLevelLoaded = false;
+
+        const bool bLoadingSameLevel = azstricmp(m_lastLevelName.c_str(), levelName) == 0;
+        m_lastLevelName = levelName;
+
+        delete m_pCurrentLevel;
+        CLevel* pLevel = new CLevel();
+        pLevel->m_levelInfo = *pLevelInfo;
+        m_pCurrentLevel = pLevel;
+
+        //////////////////////////////////////////////////////////////////////////
+        // Read main level info.
+        if (!pLevelInfo->ReadInfo())
+        {
+            OnLoadingError(levelName, "Failed to read level info (level.pak might be corrupted)!");
+            return 0;
+        }
+        //[AlexMcC|19.04.10]: Update the level's LevelInfo
+        pLevel->m_levelInfo = *pLevelInfo;
+        //////////////////////////////////////////////////////////////////////////
+
+        gEnv->pConsole->SetScrollMax(600);
+        ICVar* con_showonload = gEnv->pConsole->GetCVar("con_showonload");
+        if (con_showonload && con_showonload->GetIVal() != 0)
+        {
+            gEnv->pConsole->ShowConsole(true);
+            ICVar* g_enableloadingscreen = gEnv->pConsole->GetCVar("g_enableloadingscreen");
+            if (g_enableloadingscreen)
+            {
+                g_enableloadingscreen->Set(0);
+            }
+        }
+
+        // Reset the camera to (1,1,1) (not (0,0,0) which is the invalid/uninitialised state,
+        // to avoid the hack in the renderer to not show anything if the camera is at the origin).
+        CCamera defaultCam;
+        defaultCam.SetPosition(Vec3(1.0f));
+        m_pSystem->SetViewCamera(defaultCam);
+
+        m_pLoadingLevelInfo = pLevelInfo;
+        OnLoadingStart(levelName);
+
+
+        auto pPak = gEnv->pCryPak;
+
+        AZStd::string levelPath(pLevelInfo->GetPath());
+
+        ICVar* pSpamDelay = gEnv->pConsole->GetCVar("log_SpamDelay");
+        float spamDelay = 0.0f;
+        if (pSpamDelay)
+        {
+            spamDelay = pSpamDelay->GetFVal();
+            pSpamDelay->Set(0.0f);
+        }
+
+        // Parse level specific config data.
+        AZStd::string const sLevelNameOnly(PathUtil::GetFileName(levelName));
+
+        if (!sLevelNameOnly.empty())
+        {
+            const char* controlsPath = nullptr;
+            Audio::AudioSystemRequestBus::BroadcastResult(controlsPath, &Audio::AudioSystemRequestBus::Events::GetControlsPath);
+            if (controlsPath)
+            {
+                AZStd::string sAudioLevelPath(controlsPath);
+                sAudioLevelPath.append("levels/");
+                sAudioLevelPath += sLevelNameOnly;
+
+                Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_CONTROLS_DATA> oAMData(sAudioLevelPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
+                Audio::SAudioRequest oAudioRequestData;
+                oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING); // Needs to be blocking so data is available for next preloading request!
+                oAudioRequestData.pData = &oAMData;
+                Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+                Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_PRELOADS_DATA> oAMData2(sAudioLevelPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
+                oAudioRequestData.pData = &oAMData2;
+                Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+                Audio::TAudioPreloadRequestID nPreloadRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID;
+
+                Audio::AudioSystemRequestBus::BroadcastResult(nPreloadRequestID, &Audio::AudioSystemRequestBus::Events::GetAudioPreloadRequestID, sLevelNameOnly.c_str());
+                if (nPreloadRequestID != INVALID_AUDIO_PRELOAD_REQUEST_ID)
+                {
+                    Audio::SAudioManagerRequestData<Audio::eAMRT_PRELOAD_SINGLE_REQUEST> requestData(nPreloadRequestID, true);
+                    oAudioRequestData.pData = &requestData;
+                    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+                }
+            }
+        }
+
+        {
+            AZStd::string missionXml("Mission_");
+            missionXml += pLevelInfo->m_defaultGameTypeName;
+            missionXml += ".xml";
+            AZStd::string xmlFile(pLevelInfo->GetPath());
+            xmlFile += "/";
+            xmlFile += missionXml;
+
+            if (!gEnv->IsEditor())
+            {
+                AZStd::string entitiesFilename =
+                    AZStd::string::format("%s/%s.entities_xml", pLevelInfo->GetPath(), pLevelInfo->m_defaultGameTypeName.c_str());
+                AZStd::vector<char> fileBuffer;
+                CCryFile entitiesFile;
+                if (entitiesFile.Open(entitiesFilename.c_str(), "rt"))
+                {
+                    fileBuffer.resize(entitiesFile.GetLength());
+
+                    if (fileBuffer.size() == entitiesFile.ReadRaw(fileBuffer.begin(), fileBuffer.size()))
+                    {
+                        AZ::IO::ByteContainerStream<AZStd::vector<char>> fileStream(&fileBuffer);
+                        EBUS_EVENT(AzFramework::GameEntityContextRequestBus, LoadFromStream, fileStream, false);
+                    }
+                }
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        // Movie system must be reset after entities.
+        //////////////////////////////////////////////////////////////////////////
+        IMovieSystem* movieSys = gEnv->pMovieSystem;
+        if (movieSys != NULL)
+        {
+            // bSeekAllToStart needs to be false here as it's only of interest in the editor
+            movieSys->Reset(true, false);
+        }
+
+        gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE);
+
+        //////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////
+        gEnv->pConsole->SetScrollMax(600 / 2);
+
+        pPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Clear();
+
+        if (pSpamDelay)
+        {
+            pSpamDelay->Set(spamDelay);
+        }
+
+        m_bLevelLoaded = true;
+        gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END);
+    }
+
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
+
+    if (auto cvar = gEnv->pConsole->GetCVar("sv_map"); cvar)
+    {
+        cvar->Set(levelName);
+    }
+
+    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_START, 0, 0);
+
+    return m_pCurrentLevel;
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::PrepareNextLevel(const char* levelName)
+{
+    CLevelInfo* pLevelInfo = GetLevelInfoInternal(levelName);
+    if (!pLevelInfo)
+    {
+        // alert the listener
+        OnLevelNotFound(levelName);
+        return;
+    }
+
+    // This work not required in-editor.
+    if (!gEnv || !gEnv->IsEditor())
+    {
+        m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
+
+        // Open pak file for a new level.
+        pLevelInfo->OpenLevelPak();
+
+        // 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);
+        gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE);
+    }
+
+    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        (*it)->OnPrepareNextLevel(pLevelInfo->GetName());
+    }
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::OnLevelNotFound(const char* levelName)
+{
+    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        (*it)->OnLevelNotFound(levelName);
+    }
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::OnLoadingStart(const char* levelName)
+{
+    if (gEnv->pCryPak->GetRecordFileOpenList() == AZ::IO::IArchive::RFOM_EngineStartup)
+    {
+        gEnv->pCryPak->RecordFileOpen(AZ::IO::IArchive::RFOM_Level);
+    }
+
+    m_fLastTime = gEnv->pTimer->GetAsyncCurTime();
+
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_START, 0, 0);
+
+    LOADING_TIME_PROFILE_SECTION(gEnv->pSystem);
+
+    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        (*it)->OnLoadingStart(levelName);
+    }
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::OnLoadingError(const char* levelName, const char* error)
+{
+    ILevelInfo* pLevelInfo = m_pLoadingLevelInfo;
+    if (!pLevelInfo)
+    {
+        CRY_ASSERT(false);
+        return;
+    }
+
+    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        (*it)->OnLoadingError(levelName, error);
+    }
+
+    ((CLevelInfo*)pLevelInfo)->CloseLevelPak();
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::OnLoadingComplete(const char* levelName)
+{
+    CTimeValue t = gEnv->pTimer->GetAsyncTime();
+    m_fLastLevelLoadTime = (t - m_levelLoadStartTime).GetSeconds();
+
+    LogLoadingTime();
+
+    m_nLoadedLevelsCount++;
+
+    // Hide console after loading.
+    gEnv->pConsole->ShowConsole(false);
+
+    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        (*it)->OnLoadingComplete(levelName);
+    }
+
+#if AZ_LOADSCREENCOMPONENT_ENABLED
+    EBUS_EVENT(LoadScreenBus, Stop);
+#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::OnLoadingProgress(const char* levelName, int progressAmount)
+{
+    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        (*it)->OnLoadingProgress(levelName, progressAmount);
+    }
+}
+
+//------------------------------------------------------------------------
+void CLevelSystem::OnUnloadComplete(const char* levelName)
+{
+    for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    {
+        (*it)->OnUnloadComplete(levelName);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLevelSystem::LogLoadingTime()
+{
+    if (gEnv->IsEditor())
+    {
+        return;
+    }
+
+    if (!GetISystem()->IsDevMode())
+    {
+        return;
+    }
+
+    char vers[128];
+    GetISystem()->GetFileVersion().ToString(vers, sizeof(vers));
+
+    const char* sChain = "";
+    if (m_nLoadedLevelsCount > 0)
+    {
+        sChain = " (Chained)";
+    }
+
+    AZStd::string text;
+    text.format("Game Level Load Time: [%s] Level %s loaded in %.2f seconds%s", vers, m_lastLevelName.c_str(), m_fLastLevelLoadTime, sChain);
+    gEnv->pLog->Log(text.c_str());
+}
+
+void CLevelSystem::GetMemoryUsage(ICrySizer* pSizer) const
+{
+    pSizer->AddObject(this, sizeof(*this));
+    pSizer->AddObject(m_levelInfos);
+    pSizer->AddObject(m_levelsFolder);
+    pSizer->AddObject(m_listeners);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLevelSystem::UnloadLevel()
+{
+    if (gEnv->IsEditor())
+    {
+        return;
+    }
+    if (!m_pLoadingLevelInfo)
+    {
+        return;
+    }
+
+    CryLog("UnloadLevel Start");
+    INDENT_LOG_DURING_SCOPE();
+
+    // Flush core buses. We're about to unload Cry modules and need to ensure we don't have module-owned functions left behind.
+    AZ::Data::AssetBus::ExecuteQueuedEvents();
+    AZ::TickBus::ExecuteQueuedEvents();
+    AZ::MainThreadRenderRequestBus::ExecuteQueuedEvents();
+
+    if (gEnv && gEnv->pSystem)
+    {
+        // clear all error messages to prevent stalling due to runtime file access check during chainloading
+        gEnv->pSystem->ClearErrorMessages();
+    }
+
+    if (gEnv && gEnv->pCryPak)
+    {
+        gEnv->pCryPak->DisableRuntimeFileAccess(false);
+    }
+
+    CTimeValue tBegin = gEnv->pTimer->GetAsyncTime();
+
+    // Clear level entities and prefab instances.
+    EBUS_EVENT(AzFramework::GameEntityContextRequestBus, ResetGameContext);
+
+    if (gEnv->pMovieSystem)
+    {
+        gEnv->pMovieSystem->Reset(false, false);
+        gEnv->pMovieSystem->RemoveAllSequences();
+    }
+
+    // Unload level specific audio binary data.
+    Audio::SAudioManagerRequestData<Audio::eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE> oAMData(Audio::eADS_LEVEL_SPECIFIC);
+    Audio::SAudioRequest oAudioRequestData;
+    oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING);
+    oAudioRequestData.pData = &oAMData;
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+    // Now unload level specific audio config data.
+    Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_CONTROLS_DATA> oAMData2(Audio::eADS_LEVEL_SPECIFIC);
+    oAudioRequestData.pData = &oAMData2;
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+    Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_PRELOADS_DATA> oAMData3(Audio::eADS_LEVEL_SPECIFIC);
+    oAudioRequestData.pData = &oAMData3;
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+    // Reset the camera to (0,0,0) which is the invalid/uninitialised state
+    CCamera defaultCam;
+    m_pSystem->SetViewCamera(defaultCam);
+
+    OnUnloadComplete(m_lastLevelName.c_str());
+
+    // -- kenzo: this will close all pack files for this level
+    // (even the ones which were not added through here, if this is not desired,
+    // then change code to close only level.pak)
+    if (m_pLoadingLevelInfo)
+    {
+        ((CLevelInfo*)m_pLoadingLevelInfo)->CloseLevelPak();
+        m_pLoadingLevelInfo = NULL;
+    }
+
+    m_lastLevelName.clear();
+
+    SAFE_RELEASE(m_pCurrentLevel);
+
+    // Force Lua garbage collection (may no longer be needed now the legacy renderer has been removed).
+    // Normally the GC step is triggered at the end of this method (by the ESYSTEM_EVENT_LEVEL_POST_UNLOAD event).
+    EBUS_EVENT(AZ::ScriptSystemRequestBus, GarbageCollect);
+
+    // Perform level unload procedures for the LyShine UI system
+    if (gEnv && gEnv->pLyShine)
+    {
+        gEnv->pLyShine->OnLevelUnload();
+    }
+
+    m_bLevelLoaded = false;
+
+    CTimeValue tUnloadTime = gEnv->pTimer->GetAsyncTime() - tBegin;
+    CryLog("UnloadLevel End: %.1f sec", tUnloadTime.GetSeconds());
+
+    // Must be sent last.
+    // Cleanup all containers
+    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_POST_UNLOAD, 0, 0);
+    AzFramework::InputChannelRequestBus::Broadcast(&AzFramework::InputChannelRequests::ResetState);
+}
+
+} // namespace LegacyLevelSystem
diff --git a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.h b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.h
new file mode 100644
index 0000000000..afe7ae998e
--- /dev/null
+++ b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.h
@@ -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
+ *
+ */
+
+
+#pragma once
+
+#include "ILevelSystem.h"
+#include <AzFramework/Archive/IArchive.h>
+
+// [LYN-2376] Remove the entire file once legacy slice support is removed
+
+namespace LegacyLevelSystem
+{
+
+class CLevelInfo
+    : public ILevelInfo
+{
+    friend class CLevelSystem;
+public:
+    CLevelInfo() = default;
+
+    // ILevelInfo
+    virtual const char* GetName() const { return m_levelName.c_str(); }
+    virtual const char* GetPath() const { return m_levelPath.c_str(); }
+    virtual const char* GetAssetName() const { return m_levelAssetName.c_str(); }
+    // ~ILevelInfo
+
+
+    void GetMemoryUsage(ICrySizer*) const;
+
+private:
+    bool ReadInfo();
+
+    bool OpenLevelPak();
+    void CloseLevelPak();
+
+    AZStd::string m_defaultGameTypeName;
+    AZStd::string m_levelName;
+    AZStd::string m_levelPath;
+    AZStd::string m_levelAssetName;
+
+    AZStd::string m_levelPakFullPath;
+
+    bool          m_isPak = false;
+};
+
+struct ILevel
+{
+    virtual ~ILevel() = default;
+    virtual void Release() = 0;
+    virtual ILevelInfo* GetLevelInfo() = 0;
+};
+
+class CLevel
+    : public ILevel
+{
+    friend class CLevelSystem;
+public:
+    CLevel() {}
+    virtual ~CLevel() = default;
+
+    virtual void Release() { delete this; }
+
+    virtual ILevelInfo* GetLevelInfo() { return &m_levelInfo; }
+
+private:
+    CLevelInfo m_levelInfo;
+};
+
+class CLevelSystem
+    : public ILevelSystem
+{
+public:
+    CLevelSystem(ISystem* pSystem, const char* levelsFolder);
+    virtual ~CLevelSystem();
+
+    void Release() { delete this; };
+
+    // ILevelSystem
+    virtual void Rescan(const char* levelsFolder);
+    virtual int GetLevelCount();
+    virtual ILevelInfo* GetLevelInfo(int level);
+    virtual ILevelInfo* GetLevelInfo(const char* levelName);
+
+    virtual void AddListener(ILevelSystemListener* pListener);
+    virtual void RemoveListener(ILevelSystemListener* pListener);
+
+    virtual bool LoadLevel(const char* levelName);
+    virtual void UnloadLevel();
+    virtual bool IsLevelLoaded() { return m_bLevelLoaded; }
+    const char* GetCurrentLevelName() const override
+    {
+        if (m_pCurrentLevel && m_pCurrentLevel->GetLevelInfo())
+        {
+            return m_pCurrentLevel->GetLevelInfo()->GetName();
+        }
+        else
+        {
+            return "";
+        }
+    }
+
+    // If the level load failed then we need to have a different shutdown procedure vs when a level is naturally unloaded
+    virtual void SetLevelLoadFailed(bool loadFailed) { m_levelLoadFailed = loadFailed; }
+    virtual bool GetLevelLoadFailed() { return m_levelLoadFailed; }
+
+    // Unsupported by legacy level system.
+    virtual AZ::Data::AssetType GetLevelAssetType() const { return {}; }
+
+    // ~ILevelSystem
+
+    void GetMemoryUsage(ICrySizer* s) const;
+
+private:
+
+    float GetLastLevelLoadTime() { return m_fLastLevelLoadTime; }
+
+    void ScanFolder(const char* subfolder, bool modFolder);
+    void PopulateLevels(
+        AZStd::string searchPattern, AZStd::string& folder, AZ::IO::IArchive* pPak, bool& modFolder, bool fromFileSystemOnly);
+    void PrepareNextLevel(const char* levelName);
+    ILevel* LoadLevelInternal(const char* _levelName);
+
+    // Methods to notify ILevelSystemListener
+    void OnLevelNotFound(const char* levelName);
+    void OnLoadingStart(const char* levelName);
+    void OnLoadingComplete(const char* levelName);
+    void OnLoadingError(const char* levelName, const char* error);
+    void OnLoadingProgress(const char* levelName, int progressAmount);
+    void OnUnloadComplete(const char* levelName);
+
+    void LogLoadingTime();
+    bool LoadLevelInfo(CLevelInfo& levelInfo);
+
+    // internal get functions for the level infos ... they preserve the type and don't
+    // directly cast to the interface
+    CLevelInfo* GetLevelInfoInternal(int level);
+    CLevelInfo* GetLevelInfoInternal(const AZStd::string& levelName);
+
+    ISystem* m_pSystem;
+    AZStd::vector<CLevelInfo> m_levelInfos;
+    AZStd::string m_levelsFolder;
+    ILevel* m_pCurrentLevel;
+    ILevelInfo* m_pLoadingLevelInfo;
+
+    AZStd::string m_lastLevelName;
+    float                   m_fLastLevelLoadTime;
+    float                   m_fLastTime;
+
+    bool                    m_bLevelLoaded;
+    bool                    m_levelLoadFailed = false;
+
+    int                     m_nLoadedLevelsCount;
+
+    CTimeValue              m_levelLoadStartTime;
+
+    AZStd::vector<ILevelSystemListener*> m_listeners;
+
+    AZ::IO::IArchive::LevelPackOpenEvent::Handler m_levelPackOpenHandler;
+    AZ::IO::IArchive::LevelPackCloseEvent::Handler m_levelPackCloseHandler;
+
+    static constexpr const char* LevelPakName = "level.pak";
+};
+
+} // namespace LegacyLevelSystem
diff --git a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
new file mode 100644
index 0000000000..9181793366
--- /dev/null
+++ b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
@@ -0,0 +1,595 @@
+/*
+ * 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 "SpawnableLevelSystem.h"
+#include <IAudioSystem.h>
+#include "IMovieSystem.h"
+
+#include <LoadScreenBus.h>
+
+#include <AzCore/Debug/AssetTracking.h>
+#include <AzFramework/API/ApplicationAPI.h>
+#include <AzFramework/IO/FileOperations.h>
+#include <AzFramework/Entity/GameEntityContextBus.h>
+#include <AzFramework/Input/Buses/Requests/InputChannelRequestBus.h>
+
+#include "MainThreadRenderRequestBus.h"
+#include <LyShine/ILyShine.h>
+#include <AzCore/Component/TickBus.h>
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/StringFunc/StringFunc.h>
+
+#include <AzCore/Script/ScriptSystemBus.h>
+
+namespace LegacyLevelSystem
+{
+    //------------------------------------------------------------------------
+    static void LoadLevel(const AZ::ConsoleCommandContainer& arguments)
+    {
+        AZ_Error("SpawnableLevelSystem", !arguments.empty(), "LoadLevel requires a level file name to be provided.");
+        AZ_Error("SpawnableLevelSystem", arguments.size() == 1, "LoadLevel requires a single level file name to be provided.");
+
+        if (!arguments.empty() && gEnv->pSystem && gEnv->pSystem->GetILevelSystem() && !gEnv->IsEditor())
+        {
+            gEnv->pSystem->GetILevelSystem()->LoadLevel(arguments[0].data());
+        }
+    }
+
+    //------------------------------------------------------------------------
+    static void UnloadLevel([[maybe_unused]] const AZ::ConsoleCommandContainer& arguments)
+    {
+        AZ_Warning("SpawnableLevelSystem", !arguments.empty(), "UnloadLevel doesn't use any arguments.");
+
+        if (gEnv->pSystem && gEnv->pSystem->GetILevelSystem() && !gEnv->IsEditor())
+        {
+            gEnv->pSystem->GetILevelSystem()->UnloadLevel();
+        }
+    }
+
+    AZ_CONSOLEFREEFUNC(LoadLevel, AZ::ConsoleFunctorFlags::Null, "Unloads the current level and loads a new one with the given asset name");
+    AZ_CONSOLEFREEFUNC(UnloadLevel, AZ::ConsoleFunctorFlags::Null, "Unloads the current level");
+
+    //------------------------------------------------------------------------
+    SpawnableLevelSystem::SpawnableLevelSystem(ISystem* pSystem)
+        : m_pSystem(pSystem)
+    {
+        LOADING_TIME_PROFILE_SECTION;
+        CRY_ASSERT(pSystem);
+
+        m_fLastLevelLoadTime = 0;
+        m_fLastTime = 0;
+        m_bLevelLoaded = false;
+
+        m_levelLoadStartTime.SetValue(0);
+        m_nLoadedLevelsCount = 0;
+
+        AZ_Assert(gEnv && gEnv->pCryPak, "gEnv and CryPak must be initialized for loading levels.");
+        if (!gEnv || !gEnv->pCryPak)
+        {
+            return;
+        }
+
+        AzFramework::RootSpawnableNotificationBus::Handler::BusConnect();
+    }
+
+    //------------------------------------------------------------------------
+    SpawnableLevelSystem::~SpawnableLevelSystem()
+    {
+        AzFramework::RootSpawnableNotificationBus::Handler::BusDisconnect();
+    }
+
+    void SpawnableLevelSystem::Release()
+    {
+        delete this;
+    }
+
+    bool SpawnableLevelSystem::IsLevelLoaded()
+    {
+        return m_bLevelLoaded;
+    }
+
+    const char* SpawnableLevelSystem::GetCurrentLevelName() const
+    {
+        return m_bLevelLoaded ? m_lastLevelName.c_str() : "";
+    }
+
+    // If the level load failed then we need to have a different shutdown procedure vs when a level is naturally unloaded
+    void SpawnableLevelSystem::SetLevelLoadFailed(bool loadFailed)
+    {
+        m_levelLoadFailed = loadFailed;
+    }
+
+    bool SpawnableLevelSystem::GetLevelLoadFailed()
+    {
+        return m_levelLoadFailed;
+    }
+
+    AZ::Data::AssetType SpawnableLevelSystem::GetLevelAssetType() const
+    {
+        return azrtti_typeid<AzFramework::Spawnable>();
+    }
+
+    // The following methods are deprecated from ILevelSystem and will be removed once slice support is removed.
+
+    // [LYN-2376] Remove once legacy slice support is removed
+    void SpawnableLevelSystem::Rescan([[maybe_unused]] const char* levelsFolder)
+    {
+        AZ_Assert(false, "Rescan - No longer supported.");
+    }
+
+    // [LYN-2376] Remove once legacy slice support is removed
+    int SpawnableLevelSystem::GetLevelCount()
+    {
+        AZ_Assert(false, "GetLevelCount - No longer supported.");
+        return 0;
+    }
+
+    // [LYN-2376] Remove once legacy slice support is removed
+    ILevelInfo* SpawnableLevelSystem::GetLevelInfo([[maybe_unused]] int level)
+    {
+        AZ_Assert(false, "GetLevelInfo - No longer supported.");
+        return nullptr;
+    }
+
+    // [LYN-2376] Remove once legacy slice support is removed
+    ILevelInfo* SpawnableLevelSystem::GetLevelInfo([[maybe_unused]] const char* levelName)
+    {
+        AZ_Assert(false, "GetLevelInfo - No longer supported.");
+        return nullptr;
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::AddListener(ILevelSystemListener* pListener)
+    {
+        AZStd::vector<ILevelSystemListener*>::iterator it = AZStd::find(m_listeners.begin(), m_listeners.end(), pListener);
+
+        if (it == m_listeners.end())
+        {
+            m_listeners.push_back(pListener);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::RemoveListener(ILevelSystemListener* pListener)
+    {
+        AZStd::vector<ILevelSystemListener*>::iterator it = AZStd::find(m_listeners.begin(), m_listeners.end(), pListener);
+
+        if (it != m_listeners.end())
+        {
+            m_listeners.erase(it);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    bool SpawnableLevelSystem::LoadLevel(const char* levelName)
+    {
+        if (gEnv->IsEditor())
+        {
+            AZ_TracePrintf("CrySystem::CLevelSystem", "LoadLevel for %s was called in the editor - not actually loading.\n", levelName);
+            return false;
+        }
+
+        // If a level is currently loaded, unload it before loading the next one.
+        if (IsLevelLoaded())
+        {
+            UnloadLevel();
+        }
+
+        gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_PREPARE, 0, 0);
+        PrepareNextLevel(levelName);
+
+        bool result = LoadLevelInternal(levelName);
+        if (result)
+        {
+            OnLoadingComplete(levelName);
+        }
+
+        return result;
+    }
+
+    //------------------------------------------------------------------------
+    bool SpawnableLevelSystem::LoadLevelInternal(const char* levelName)
+    {
+        gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START);
+        AZ_ASSET_NAMED_SCOPE("Level: %s", levelName);
+
+        INDENT_LOG_DURING_SCOPE();
+
+        AZ::Data::AssetId rootSpawnableAssetId;
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            rootSpawnableAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, levelName, nullptr, false);
+        if (!rootSpawnableAssetId.IsValid())
+        {
+            OnLoadingError(levelName, "AssetCatalog has no entry for the requested level.");
+
+            return false;
+        }
+
+        // This scope is specifically used for marking a loading time profile section
+        {
+            LOADING_TIME_PROFILE_SECTION;
+
+            m_bLevelLoaded = false;
+            m_lastLevelName = levelName;
+            gEnv->pConsole->SetScrollMax(600);
+            ICVar* con_showonload = gEnv->pConsole->GetCVar("con_showonload");
+            if (con_showonload && con_showonload->GetIVal() != 0)
+            {
+                gEnv->pConsole->ShowConsole(true);
+                ICVar* g_enableloadingscreen = gEnv->pConsole->GetCVar("g_enableloadingscreen");
+                if (g_enableloadingscreen)
+                {
+                    g_enableloadingscreen->Set(0);
+                }
+            }
+
+            // This is a workaround until the replacement for GameEntityContext is done
+            AzFramework::GameEntityContextEventBus::Broadcast(&AzFramework::GameEntityContextEventBus::Events::OnPreGameEntitiesStarted);
+
+            // Reset the camera to (1,1,1) (not (0,0,0) which is the invalid/uninitialised state,
+            // to avoid the hack in the renderer to not show anything if the camera is at the origin).
+            CCamera defaultCam;
+            defaultCam.SetPosition(Vec3(1.0f));
+            m_pSystem->SetViewCamera(defaultCam);
+
+            OnLoadingStart(levelName);
+
+            auto pPak = gEnv->pCryPak;
+
+            ICVar* pSpamDelay = gEnv->pConsole->GetCVar("log_SpamDelay");
+            float spamDelay = 0.0f;
+            if (pSpamDelay)
+            {
+                spamDelay = pSpamDelay->GetFVal();
+                pSpamDelay->Set(0.0f);
+            }
+
+            // Parse level specific config data.
+            AZStd::string const sLevelNameOnly(PathUtil::GetFileName(levelName));
+
+            if (!sLevelNameOnly.empty())
+            {
+                const char* controlsPath = nullptr;
+                Audio::AudioSystemRequestBus::BroadcastResult(controlsPath, &Audio::AudioSystemRequestBus::Events::GetControlsPath);
+                if (controlsPath)
+                {
+                    AZStd::string sAudioLevelPath(controlsPath);
+                    sAudioLevelPath.append("levels/");
+                    sAudioLevelPath += sLevelNameOnly;
+
+                    Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_CONTROLS_DATA> oAMData(
+                        sAudioLevelPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
+                    Audio::SAudioRequest oAudioRequestData;
+                    oAudioRequestData.nFlags =
+                        (Audio::eARF_PRIORITY_HIGH |
+                         Audio::eARF_EXECUTE_BLOCKING); // Needs to be blocking so data is available for next preloading request!
+                    oAudioRequestData.pData = &oAMData;
+                    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+                    Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_PRELOADS_DATA> oAMData2(
+                        sAudioLevelPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
+                    oAudioRequestData.pData = &oAMData2;
+                    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+                    Audio::TAudioPreloadRequestID nPreloadRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID;
+
+                    Audio::AudioSystemRequestBus::BroadcastResult(
+                        nPreloadRequestID, &Audio::AudioSystemRequestBus::Events::GetAudioPreloadRequestID, sLevelNameOnly.c_str());
+                    if (nPreloadRequestID != INVALID_AUDIO_PRELOAD_REQUEST_ID)
+                    {
+                        Audio::SAudioManagerRequestData<Audio::eAMRT_PRELOAD_SINGLE_REQUEST> requestData(nPreloadRequestID, true);
+                        oAudioRequestData.pData = &requestData;
+                        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+                    }
+                }
+            }
+
+
+            AZ::Data::Asset<AzFramework::Spawnable> rootSpawnable(
+                rootSpawnableAssetId, azrtti_typeid<AzFramework::Spawnable>(), levelName);
+
+            m_rootSpawnableId = rootSpawnableAssetId;
+            m_rootSpawnableGeneration = AzFramework::RootSpawnableInterface::Get()->AssignRootSpawnable(rootSpawnable);
+
+            // This is a workaround until the replacement for GameEntityContext is done
+            AzFramework::GameEntityContextEventBus::Broadcast(&AzFramework::GameEntityContextEventBus::Events::OnGameEntitiesStarted);
+
+            //////////////////////////////////////////////////////////////////////////
+            // Movie system must be reset after entities.
+            //////////////////////////////////////////////////////////////////////////
+            IMovieSystem* movieSys = gEnv->pMovieSystem;
+            if (movieSys != NULL)
+            {
+                // bSeekAllToStart needs to be false here as it's only of interest in the editor
+                movieSys->Reset(true, false);
+            }
+
+            gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE);
+
+            //////////////////////////////////////////////////////////////////////////
+            //////////////////////////////////////////////////////////////////////////
+            gEnv->pConsole->SetScrollMax(600 / 2);
+
+            pPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Clear();
+
+            if (pSpamDelay)
+            {
+                pSpamDelay->Set(spamDelay);
+            }
+
+            m_bLevelLoaded = true;
+            gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END);
+        }
+
+        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
+
+        if (auto cvar = gEnv->pConsole->GetCVar("sv_map"); cvar)
+        {
+            cvar->Set(levelName);
+        }
+
+        gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_START, 0, 0);
+
+        return true;
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::PrepareNextLevel(const char* levelName)
+    {
+        AZ::Data::AssetId rootSpawnableAssetId;
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            rootSpawnableAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, levelName, nullptr, false);
+        if (!rootSpawnableAssetId.IsValid())
+        {
+            // alert the listener
+            OnLevelNotFound(levelName);
+            return;
+        }
+
+        // This work not required in-editor.
+        if (!gEnv || !gEnv->IsEditor())
+        {
+            m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
+
+            // 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);
+            gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE);
+        }
+
+        OnPrepareNextLevel(levelName);
+    }
+
+    void SpawnableLevelSystem::OnPrepareNextLevel(const char* levelName)
+    {
+        AZ_TracePrintf("LevelSystem", "Level system is preparing to load '%s'\n", levelName);
+
+        for (auto& listener : m_listeners)
+        {
+            listener->OnPrepareNextLevel(levelName);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::OnLevelNotFound(const char* levelName)
+    {
+        AZ_Error("LevelSystem", false, "Requested level not found: '%s'\n", levelName);
+
+        for (auto& listener : m_listeners)
+        {
+            listener->OnLevelNotFound(levelName);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::OnLoadingStart(const char* levelName)
+    {
+        AZ_TracePrintf("LevelSystem", "Level system is loading '%s'\n", levelName);
+
+        if (gEnv->pCryPak->GetRecordFileOpenList() == AZ::IO::IArchive::RFOM_EngineStartup)
+        {
+            gEnv->pCryPak->RecordFileOpen(AZ::IO::IArchive::RFOM_Level);
+        }
+
+        m_fLastTime = gEnv->pTimer->GetAsyncCurTime();
+
+        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_START, 0, 0);
+
+        LOADING_TIME_PROFILE_SECTION(gEnv->pSystem);
+
+        for (auto& listener : m_listeners)
+        {
+            listener->OnLoadingStart(levelName);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::OnLoadingError(const char* levelName, const char* error)
+    {
+        AZ_Error("LevelSystem", false, "Error loading level '%s': %s\n", levelName, error);
+
+        for (auto& listener : m_listeners)
+        {
+            listener->OnLoadingError(levelName, error);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::OnLoadingComplete(const char* levelName)
+    {
+        CTimeValue t = gEnv->pTimer->GetAsyncTime();
+        m_fLastLevelLoadTime = (t - m_levelLoadStartTime).GetSeconds();
+
+        LogLoadingTime();
+
+        m_nLoadedLevelsCount++;
+
+        // Hide console after loading.
+        gEnv->pConsole->ShowConsole(false);
+
+        for (auto& listener : m_listeners)
+        {
+            listener->OnLoadingComplete(levelName);
+        }
+
+    #if AZ_LOADSCREENCOMPONENT_ENABLED
+        EBUS_EVENT(LoadScreenBus, Stop);
+    #endif // if AZ_LOADSCREENCOMPONENT_ENABLED
+
+        AZ_TracePrintf("LevelSystem", "Level load complete: '%s'\n", levelName);
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::OnLoadingProgress(const char* levelName, int progressAmount)
+    {
+        for (auto& listener : m_listeners)
+        {
+            listener->OnLoadingProgress(levelName, progressAmount);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    void SpawnableLevelSystem::OnUnloadComplete(const char* levelName)
+    {
+        for (auto& listener : m_listeners)
+        {
+            listener->OnUnloadComplete(levelName);
+        }
+
+        AZ_TracePrintf("LevelSystem", "Level unload complete: '%s'\n", levelName);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void SpawnableLevelSystem::LogLoadingTime()
+    {
+        if (gEnv->IsEditor())
+        {
+            return;
+        }
+
+        if (!GetISystem()->IsDevMode())
+        {
+            return;
+        }
+
+        char vers[128];
+        GetISystem()->GetFileVersion().ToString(vers, sizeof(vers));
+
+        const char* sChain = "";
+        if (m_nLoadedLevelsCount > 0)
+        {
+            sChain = " (Chained)";
+        }
+
+        AZStd::string text;
+        text.format(
+            "Game Level Load Time: [%s] Level %s loaded in %.2f seconds%s", vers, m_lastLevelName.c_str(), m_fLastLevelLoadTime, sChain);
+        gEnv->pLog->Log(text.c_str());
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    void SpawnableLevelSystem::UnloadLevel()
+    {
+        if (gEnv->IsEditor())
+        {
+            return;
+        }
+
+        if (m_lastLevelName.empty())
+        {
+            return;
+        }
+
+        AZ_TracePrintf("LevelSystem", "UnloadLevel Start\n");
+        INDENT_LOG_DURING_SCOPE();
+
+        // Flush core buses. We're about to unload Cry modules and need to ensure we don't have module-owned functions left behind.
+        AZ::Data::AssetBus::ExecuteQueuedEvents();
+        AZ::TickBus::ExecuteQueuedEvents();
+        AZ::MainThreadRenderRequestBus::ExecuteQueuedEvents();
+
+        if (gEnv && gEnv->pSystem)
+        {
+            // clear all error messages to prevent stalling due to runtime file access check during chainloading
+            gEnv->pSystem->ClearErrorMessages();
+        }
+
+        if (gEnv && gEnv->pCryPak)
+        {
+            gEnv->pCryPak->DisableRuntimeFileAccess(false);
+        }
+
+        CTimeValue tBegin = gEnv->pTimer->GetAsyncTime();
+
+        // Clear level entities and prefab instances.
+        EBUS_EVENT(AzFramework::GameEntityContextRequestBus, ResetGameContext);
+
+        if (gEnv->pMovieSystem)
+        {
+            gEnv->pMovieSystem->Reset(false, false);
+            gEnv->pMovieSystem->RemoveAllSequences();
+        }
+
+        // Unload level specific audio binary data.
+        Audio::SAudioManagerRequestData<Audio::eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE> oAMData(Audio::eADS_LEVEL_SPECIFIC);
+        Audio::SAudioRequest oAudioRequestData;
+        oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING);
+        oAudioRequestData.pData = &oAMData;
+        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+        // Now unload level specific audio config data.
+        Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_CONTROLS_DATA> oAMData2(Audio::eADS_LEVEL_SPECIFIC);
+        oAudioRequestData.pData = &oAMData2;
+        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+        Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_PRELOADS_DATA> oAMData3(Audio::eADS_LEVEL_SPECIFIC);
+        oAudioRequestData.pData = &oAMData3;
+        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+
+        // Reset the camera to (0,0,0) which is the invalid/uninitialised state
+        CCamera defaultCam;
+        m_pSystem->SetViewCamera(defaultCam);
+
+        OnUnloadComplete(m_lastLevelName.c_str());
+
+        AzFramework::RootSpawnableInterface::Get()->ReleaseRootSpawnable();
+
+        m_lastLevelName.clear();
+
+        // Force Lua garbage collection (may no longer be needed now the legacy renderer has been removed).
+        // Normally the GC step is triggered at the end of this method (by the ESYSTEM_EVENT_LEVEL_POST_UNLOAD event).
+        EBUS_EVENT(AZ::ScriptSystemRequestBus, GarbageCollect);
+
+        // Perform level unload procedures for the LyShine UI system
+        if (gEnv && gEnv->pLyShine)
+        {
+            gEnv->pLyShine->OnLevelUnload();
+        }
+
+        m_bLevelLoaded = false;
+
+        CTimeValue tUnloadTime = gEnv->pTimer->GetAsyncTime() - tBegin;
+        AZ_TracePrintf("LevelSystem", "UnloadLevel End: %.1f sec\n", tUnloadTime.GetSeconds());
+
+        // Must be sent last.
+        // Cleanup all containers
+        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_POST_UNLOAD, 0, 0);
+        AzFramework::InputChannelRequestBus::Broadcast(&AzFramework::InputChannelRequests::ResetState);
+
+        AzFramework::GameEntityContextEventBus::Broadcast(&AzFramework::GameEntityContextEventBus::Events::OnGameEntitiesReset);
+    }
+
+    void SpawnableLevelSystem::OnRootSpawnableAssigned(
+        [[maybe_unused]] AZ::Data::Asset<AzFramework::Spawnable> rootSpawnable, [[maybe_unused]] uint32_t generation)
+    {
+    }
+
+    void SpawnableLevelSystem::OnRootSpawnableReleased([[maybe_unused]] uint32_t generation)
+    {
+    }
+
+} // namespace LegacyLevelSystem
diff --git a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h
new file mode 100644
index 0000000000..3b97a3ba9c
--- /dev/null
+++ b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h
@@ -0,0 +1,88 @@
+/*
+ * 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 "ILevelSystem.h"
+#include <AzCore/Console/IConsole.h>
+#include <AzFramework/Archive/IArchive.h>
+#include <AzFramework/Spawnable/RootSpawnableInterface.h>
+
+namespace LegacyLevelSystem
+{
+
+class SpawnableLevelSystem
+        : public ILevelSystem
+        , public AzFramework::RootSpawnableNotificationBus::Handler
+    {
+    public:
+        explicit SpawnableLevelSystem(ISystem* pSystem);
+        ~SpawnableLevelSystem() override;
+
+        // ILevelSystem
+        void Release() override;
+
+        void AddListener(ILevelSystemListener* pListener) override;
+        void RemoveListener(ILevelSystemListener* pListener) override;
+
+        bool LoadLevel(const char* levelName) override;
+        void UnloadLevel() override;
+        bool IsLevelLoaded() override;
+        const char* GetCurrentLevelName() const override;
+
+        // If the level load failed then we need to have a different shutdown procedure vs when a level is naturally unloaded
+        void SetLevelLoadFailed(bool loadFailed) override;
+        bool GetLevelLoadFailed() override;
+        AZ::Data::AssetType GetLevelAssetType() const override;
+
+        // The following methods are deprecated from ILevelSystem and will be removed once slice support is removed.
+
+        // [LYN-2376] Remove once legacy slice support is removed
+        void Rescan([[maybe_unused]] const char* levelsFolder) override;
+        int GetLevelCount() override;
+        ILevelInfo* GetLevelInfo([[maybe_unused]] int level) override;
+        ILevelInfo* GetLevelInfo([[maybe_unused]] const char* levelName) override;
+
+    private:
+        void OnRootSpawnableAssigned(AZ::Data::Asset<AzFramework::Spawnable> rootSpawnable, uint32_t generation) override;
+        void OnRootSpawnableReleased(uint32_t generation) override;
+
+        void PrepareNextLevel(const char* levelName);
+        bool LoadLevelInternal(const char* levelName);
+
+        // Methods to notify ILevelSystemListener
+        void OnPrepareNextLevel(const char* levelName);
+        void OnLevelNotFound(const char* levelName);
+        void OnLoadingStart(const char* levelName);
+        void OnLoadingComplete(const char* levelName);
+        void OnLoadingError(const char* levelName, const char* error);
+        void OnLoadingProgress(const char* levelName, int progressAmount);
+        void OnUnloadComplete(const char* levelName);
+
+        void LogLoadingTime();
+
+        ISystem* m_pSystem{nullptr};
+
+        AZStd::string m_lastLevelName;
+        float m_fLastLevelLoadTime{0.0f};
+        float m_fLastTime{0.0f};
+
+        bool m_bLevelLoaded{false};
+        bool m_levelLoadFailed{false};
+
+        int m_nLoadedLevelsCount{0};
+
+        CTimeValue m_levelLoadStartTime;
+
+        AZStd::vector<ILevelSystemListener*> m_listeners;
+
+        // Information about the currently-loaded root spawnable, used for tracking loads and unloads.
+        uint64_t m_rootSpawnableGeneration{0};
+        AZ::Data::AssetId m_rootSpawnableId{};
+    };
+
+} // namespace LegacyLevelSystem
diff --git a/Code/Legacy/CrySystem/LocalizedStringManager.cpp b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
new file mode 100644
index 0000000000..2a9b4c9409
--- /dev/null
+++ b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
@@ -0,0 +1,2771 @@
+/*
+ * 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 "LocalizedStringManager.h"
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define LOCALIZEDSTRINGMANAGER_CPP_SECTION_1 1
+#endif
+
+#include <ISystem.h>
+#include "System.h" // to access InitLocalization()
+#include <CryPath.h>
+#include <IConsole.h>
+#include <StringUtils.h>
+#include <locale.h>
+#include <time.h>
+
+#include <AzCore/std/string/conversions.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+
+#define MAX_CELL_COUNT 32
+
+// CVAR names
+const char c_sys_localization_debug[] = "sys_localization_debug";
+const char c_sys_localization_encode[] = "sys_localization_encode";
+#define LOC_WINDOW "Localization"
+const char c_sys_localization_format[] = "sys_localization_format";
+
+enum ELocalizedXmlColumns
+{
+    ELOCALIZED_COLUMN_SKIP  = 0,
+    ELOCALIZED_COLUMN_KEY,
+    ELOCALIZED_COLUMN_AUDIOFILE,
+    ELOCALIZED_COLUMN_CHARACTER_NAME,
+    ELOCALIZED_COLUMN_SUBTITLE_TEXT,
+    ELOCALIZED_COLUMN_ACTOR_LINE,
+    ELOCALIZED_COLUMN_USE_SUBTITLE,
+    ELOCALIZED_COLUMN_VOLUME,
+    ELOCALIZED_COLUMN_SOUNDEVENT,
+    ELOCALIZED_COLUMN_RADIO_RATIO,
+    ELOCALIZED_COLUMN_EVENTPARAMETER,
+    ELOCALIZED_COLUMN_SOUNDMOOD,
+    ELOCALIZED_COLUMN_IS_DIRECT_RADIO,
+    // legacy names
+    ELOCALIZED_COLUMN_LEGACY_PERSON,
+    ELOCALIZED_COLUMN_LEGACY_CHARACTERNAME,
+    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_CHARACTERNAME,
+    ELOCALIZED_COLUMN_LEGACY_ENGLISH_DIALOGUE,
+    ELOCALIZED_COLUMN_LEGACY_TRANSLATION,
+    ELOCALIZED_COLUMN_LEGACY_YOUR_TRANSLATION,
+    ELOCALIZED_COLUMN_LEGACY_ENGLISH_SUBTITLE,
+    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_SUBTITLE,
+    ELOCALIZED_COLUMN_LEGACY_ORIGINAL_CHARACTER_NAME,
+    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_CHARACTER_NAME,
+    ELOCALIZED_COLUMN_LEGACY_ORIGINAL_TEXT,
+    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_TEXT,
+    ELOCALIZED_COLUMN_LEGACY_ORIGINAL_ACTOR_LINE,
+    ELOCALIZED_COLUMN_LEGACY_TRANSLATED_ACTOR_LINE,
+    ELOCALIZED_COLUMN_LAST,
+};
+
+// The order must match to the order of the ELocalizedXmlColumns
+static const char* sLocalizedColumnNames[] =
+{
+    // everyhing read by the file will be convert to lower cases
+    "skip",
+    "key",
+    "audio_filename",
+    "character name",
+    "subtitle text",
+    "actor line",
+    "use subtitle",
+    "volume",
+    "prototype event",
+    "radio ratio",
+    "eventparameter",
+    "soundmood",
+    "is direct radio",
+    // legacy names
+    "person",
+    "character name",
+    "translated character name",
+    "english dialogue",
+    "translation",
+    "your translation",
+    "english subtitle",
+    "translated subtitle",
+    "original character name",
+    "translated character name",
+    "original text",
+    "translated text",
+    "original actor line",
+    "translated actor line",
+};
+
+//Please ensure that this array matches the contents of EPlatformIndependentLanguageID in ILocalizationManager.h
+static const char* PLATFORM_INDEPENDENT_LANGUAGE_NAMES[ ILocalizationManager::ePILID_MAX_OR_INVALID ] =
+{
+    "en-US",  // English (USA)
+    "en-GB",  // English (UK)
+    "de-DE",  // German
+    "ru-RU",  // Russian (Russia)
+    "pl-PL",  // Polish
+    "tr-TR",  // Turkish
+    "es-ES",  // Spanish (Spain)
+    "es-MX",  // Spanish (Mexico)
+    "fr-FR",  // French (France)
+    "fr-CA",  // French (Canada)
+    "it-IT",  // Italian
+    "pt-PT",  // Portugese (Portugal)
+    "pt-BR",  // Portugese (Brazil)
+    "ja-JP",  // Japanese
+    "ko-KR",  // Korean
+    "zh-CHT", // Traditional Chinese
+    "zh-CHS", // Simplified Chinese
+    "nl-NL",  // Dutch (The Netherlands)
+    "fi-FI",  // Finnish
+    "sv-SE",  // Swedish
+    "cs-CZ",  // Czech
+    "no-NO",  // Norwegian
+    "ar-SA",   // Arabic (Saudi Arabia)
+    "da-DK"   // Danish (Denmark)
+};
+
+//////////////////////////////////////////////////////////////////////////
+#if !defined(_RELEASE)
+static void ReloadDialogData([[maybe_unused]] IConsoleCmdArgs* pArgs)
+{
+    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::ReloadData);
+    //CSystem *pSystem = (CSystem*) gEnv->pSystem;
+    //pSystem->InitLocalization();
+    //pSystem->OpenBasicPaks();
+}
+#endif //#if !defined(_RELEASE)
+
+//////////////////////////////////////////////////////////////////////////
+#if !defined(_RELEASE)
+static void TestFormatMessage ([[maybe_unused]] IConsoleCmdArgs* pArgs)
+{
+    string fmt1 ("abc %1 def % gh%2i %");
+    string fmt2 ("abc %[action:abc] %2 def % gh%1i %1");
+    string out1, out2;
+    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::FormatStringMessage, out1, fmt1, "first", "second", "third", nullptr);
+    CryLogAlways("%s", out1.c_str());
+    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::FormatStringMessage, out2, fmt2, "second", nullptr, nullptr, nullptr);
+    CryLogAlways("%s", out2.c_str());
+}
+#endif //#if !defined(_RELEASE)
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////
+CLocalizedStringsManager::CLocalizedStringsManager(ISystem* pSystem)
+    : m_cvarLocalizationDebug(0)
+    , m_cvarLocalizationEncode(1)
+    , m_availableLocalizations(0)
+{
+    m_pSystem = pSystem;
+    m_pSystem->GetISystemEventDispatcher()->RegisterListener(this);
+
+    m_languages.reserve(4);
+    m_pLanguage = 0;
+
+#if !defined(_RELEASE)
+    m_haveWarnedAboutAtLeastOneLabel = false;
+
+    REGISTER_COMMAND("ReloadDialogData", ReloadDialogData, VF_NULL,
+        "Reloads all localization dependent XML sheets for the currently set language.");
+
+    REGISTER_COMMAND("_TestFormatMessage", TestFormatMessage, VF_NULL, "");
+
+    REGISTER_CVAR2(c_sys_localization_debug, &m_cvarLocalizationDebug, m_cvarLocalizationDebug, VF_CHEAT,
+        "Toggles debugging of the Localization Manager.\n"
+        "Usage: sys_localization_debug [0..3]\n"
+        "1: outputs warnings\n"
+        "2: outputs extended information and warnings\n"
+        "3: outputs CRC32 hashes and strings to help detect clashes\n"
+        "Default is 0 (off).");
+
+    REGISTER_CVAR2(c_sys_localization_encode, &m_cvarLocalizationEncode, m_cvarLocalizationEncode, VF_REQUIRE_APP_RESTART,
+        "Toggles encoding of translated text to save memory. REQUIRES RESTART.\n"
+        "Usage: sys_localization_encode [0..1]\n"
+        "0: No encoding, store as wide strings\n"
+        "1: Huffman encode translated text, saves approx 30% with a small runtime performance cost\n"
+        "Default is 1.");
+#endif //#if !defined(_RELEASE)
+
+    REGISTER_CVAR2(c_sys_localization_format, &m_cvarLocalizationFormat, 1, VF_NULL,
+        "Usage: sys_localization_format [0..1]\n"
+        "    0: O3DE Legacy Localization (Excel 2003)\n"
+        "    1: AGS XML\n"
+        "Default is 1 (AGS Xml)");
+    //Check that someone hasn't added a language ID without a language name
+    assert(PLATFORM_INDEPENDENT_LANGUAGE_NAMES[ ILocalizationManager::ePILID_MAX_OR_INVALID - 1 ] != 0);
+
+    // Populate available languages by scanning the localization directory for paks
+    // Default to US English if language is not supported
+    string sPath;
+    const string sLocalizationFolder(PathUtil::GetLocalizationFolder());
+    ILocalizationManager::TLocalizationBitfield availableLanguages = 0;
+    
+    AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
+    // test language name against supported languages
+    for (int i = 0; i < ILocalizationManager::ePILID_MAX_OR_INVALID; i++)
+    {
+        string sCurrentLanguage = LangNameFromPILID((ILocalizationManager::EPlatformIndependentLanguageID)i);  
+        sPath = sLocalizationFolder.c_str() + sCurrentLanguage;
+        sPath.MakeLower();
+        if (fileIO && fileIO->IsDirectory(sPath))
+        {
+            availableLanguages |= ILocalizationManager::LocalizationBitfieldFromPILID((ILocalizationManager::EPlatformIndependentLanguageID)i);
+            if (m_cvarLocalizationDebug >= 2)
+            {
+                AZ_TracePrintf("Localization", "Detected language support for %s (id %d)", sCurrentLanguage.c_str(), i);
+            }
+        }
+    }
+
+    AZ_Warning("Localization", !(m_cvarLocalizationFormat == 0 && availableLanguages == 0 && ProjectUsesLocalization()), "No localization files found!");
+
+    SetAvailableLocalizationsBitfield(availableLanguages);
+    LocalizationManagerRequestBus::Handler::BusConnect();
+}
+
+//////////////////////////////////////////////////////////////////////
+CLocalizedStringsManager::~CLocalizedStringsManager()
+{
+    FreeData();
+    LocalizationManagerRequestBus::Handler::BusDisconnect();
+}
+
+//////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::GetLoadedTags(TLocalizationTagVec& tagVec)
+{
+    TTagFileNames::const_iterator end = m_tagFileNames.end();
+    for (TTagFileNames::const_iterator it = m_tagFileNames.begin(); it != end; ++it)
+    {
+        if (it->second.loaded)
+        {
+            tagVec.push_back(it->first);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::FreeLocalizationData()
+{
+    AutoLock lock(m_cs);    //Make sure to lock, as this is a modifying operation
+    ListAndClearProblemLabels();
+
+    for (uint32 i = 0; i < m_languages.size(); i++)
+    {
+        if (m_cvarLocalizationEncode == 1)
+        {
+            auto pLanguage = m_languages[i];
+            for (uint8 iEncoder = 0; iEncoder < pLanguage->m_vEncoders.size(); iEncoder++)
+            {
+                SAFE_DELETE(pLanguage->m_vEncoders[iEncoder]);
+            }
+        }
+        std::for_each(m_languages[i]->m_vLocalizedStrings.begin(), m_languages[i]->m_vLocalizedStrings.end(), stl::container_object_deleter());
+        m_languages[i]->m_keysMap.clear();
+        m_languages[i]->m_vLocalizedStrings.clear();
+    }
+    m_loadedTables.clear();
+}
+
+//////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::FreeData()
+{
+    FreeLocalizationData();
+
+    for (uint32 i = 0; i < m_languages.size(); i++)
+    {
+        delete m_languages[i];
+    }
+    m_languages.resize(0);
+    m_loadedTables.clear();
+
+    m_pLanguage = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CLocalizedStringsManager::LangNameFromPILID(const ILocalizationManager::EPlatformIndependentLanguageID id)
+{
+    assert(id >= 0 && id < ILocalizationManager::ePILID_MAX_OR_INVALID);
+    return PLATFORM_INDEPENDENT_LANGUAGE_NAMES[ id ];
+}
+
+//////////////////////////////////////////////////////////////////////////
+ILocalizationManager::EPlatformIndependentLanguageID CLocalizedStringsManager::PILIDFromLangName(AZStd::string langName)
+{
+    for (int i = 0; i < ILocalizationManager::ePILID_MAX_OR_INVALID; i++)
+    {
+        if (!_stricmp(langName.c_str(), PLATFORM_INDEPENDENT_LANGUAGE_NAMES[i]))
+        {
+            return (ILocalizationManager::EPlatformIndependentLanguageID)i;
+        }
+    }
+    return ILocalizationManager::ePILID_MAX_OR_INVALID;
+}
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION LOCALIZEDSTRINGMANAGER_CPP_SECTION_1
+#include AZ_RESTRICTED_FILE(LocalizedStringManager_cpp)
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#endif // AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+//////////////////////////////////////////////////////////////////////////
+ILocalizationManager::EPlatformIndependentLanguageID CLocalizedStringsManager::GetSystemLanguage()
+{
+
+    return ILocalizationManager::EPlatformIndependentLanguageID::ePILID_English_US;
+}
+#endif // defined(AZ_RESTRICTED_PLATFORM)
+
+//Uses bitwise operations to compare the localizations we provide in this SKU and the languages that the platform supports.
+//Returns !0 if we provide more localizations than are available as system languages
+ILocalizationManager::TLocalizationBitfield CLocalizedStringsManager::MaskSystemLanguagesFromSupportedLocalizations(const ILocalizationManager::TLocalizationBitfield systemLanguages)
+{
+    return (~systemLanguages) & m_availableLocalizations;
+}
+
+//Returns !0 if the language is supported.
+ILocalizationManager::TLocalizationBitfield CLocalizedStringsManager::IsLanguageSupported(const ILocalizationManager::EPlatformIndependentLanguageID id)
+{
+    return m_availableLocalizations & (1 << id);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::SetAvailableLocalizationsBitfield(const ILocalizationManager::TLocalizationBitfield availableLocalizations)
+{
+    m_availableLocalizations = availableLocalizations;
+}
+
+//////////////////////////////////////////////////////////////////////
+const char* CLocalizedStringsManager::GetLanguage()
+{
+    if (m_pLanguage == 0)
+    {
+        return "";
+    }
+    return m_pLanguage->sLanguage.c_str();
+}
+
+//////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::SetLanguage(const char* sLanguage)
+{
+    if (m_cvarLocalizationDebug >= 2)
+    {
+        CryLog("<Localization> Set language to %s", sLanguage);
+    }
+
+    // Check if already language loaded.
+    for (uint32 i = 0; i < m_languages.size(); i++)
+    {
+        if (_stricmp(sLanguage, m_languages[i]->sLanguage) == 0)
+        {
+            InternalSetCurrentLanguage(m_languages[i]);
+            return true;
+        }
+    }
+
+    SLanguage* pLanguage = new SLanguage;
+    m_languages.push_back(pLanguage);
+
+    if (m_cvarLocalizationDebug >= 2)
+    {
+        CryLog("<Localization> Insert new language to %s", sLanguage);
+    }
+
+    pLanguage->sLanguage = sLanguage;
+    InternalSetCurrentLanguage(pLanguage);
+
+    //-------------------------------------------------------------------------------------------------
+    // input localization
+    //-------------------------------------------------------------------------------------------------
+    // keyboard
+    for (int i = 0; i <= 0x80; i++)
+    {
+        AddControl(i);
+    }
+
+    // mouse
+    for (int i = 1; i <= 0x0f; i++)
+    {
+        AddControl(i * 0x10000);
+    }
+
+    return (true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CLocalizedStringsManager::GetLocalizationFormat() const
+{
+    return m_cvarLocalizationFormat;
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZStd::string CLocalizedStringsManager::GetLocalizedSubtitleFilePath(const AZStd::string& localVideoPath, const AZStd::string& subtitleFileExtension) const
+{
+    AZStd::string sLocalizationFolder(PathUtil::GetLocalizationFolder().c_str());
+    size_t backSlashIdx = sLocalizationFolder.find_first_of("\\", 0);
+    if (backSlashIdx != AZStd::string::npos)
+    {
+        sLocalizationFolder.replace(backSlashIdx, 2, "/");
+    }
+    AZStd::string filePath(m_pLanguage->sLanguage.c_str());
+    filePath = sLocalizationFolder.c_str() + filePath + "/" + localVideoPath;
+    return filePath.substr(0, filePath.find_last_of('.')).append(subtitleFileExtension);
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZStd::string CLocalizedStringsManager::GetLocalizedLocXMLFilePath(const AZStd::string & localXmlPath) const
+{
+    AZStd::string sLocalizationFolder(PathUtil::GetLocalizationFolder().c_str());
+    size_t backSlashIdx = sLocalizationFolder.find_first_of("\\", 0);
+    if (backSlashIdx != AZStd::string::npos)
+    {
+        sLocalizationFolder.replace(backSlashIdx, 2, "/");
+    }
+    const AZStd::string& filePath = AZStd::string::format("%s%s/%s", sLocalizationFolder.c_str(), m_pLanguage->sLanguage.c_str(), localXmlPath.c_str());
+    return filePath.substr(0, filePath.find_last_of('.')).append(".loc.xml");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::AddControl([[maybe_unused]] int nKey)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::ParseFirstLine(IXmlTableReader* pXmlTableReader, char* nCellIndexToType, std::map<int, string>& SoundMoodIndex, std::map<int, string>& EventParameterIndex)
+{
+    string sCellContent;
+
+    for (;; )
+    {
+        int nCellIndex = 0;
+        const char* pContent = 0;
+        size_t contentSize = 0;
+        if (!pXmlTableReader->ReadCell(nCellIndex, pContent, contentSize))
+        {
+            break;
+        }
+
+        if (nCellIndex >= MAX_CELL_COUNT)
+        {
+            break;
+        }
+
+        if (contentSize <= 0)
+        {
+            continue;
+        }
+
+        sCellContent.assign(pContent, contentSize);
+        sCellContent.MakeLower();
+
+        for (int i = 0; i < sizeof(sLocalizedColumnNames) / sizeof(sLocalizedColumnNames[0]); ++i)
+        {
+            const char* pFind = strstr(sCellContent.c_str(), sLocalizedColumnNames[i]);
+            if (pFind != 0)
+            {
+                nCellIndexToType[nCellIndex] = i;
+
+                // find SoundMood
+                if (i == ELOCALIZED_COLUMN_SOUNDMOOD)
+                {
+                    const char* pSoundMoodName = pFind + strlen(sLocalizedColumnNames[i]) + 1;
+                    int nSoundMoodNameLength = sCellContent.length() - strlen(sLocalizedColumnNames[i]) - 1;
+                    if (nSoundMoodNameLength > 0)
+                    {
+                        SoundMoodIndex[nCellIndex] = pSoundMoodName;
+                    }
+                }
+
+                // find EventParameter
+                if (i == ELOCALIZED_COLUMN_EVENTPARAMETER)
+                {
+                    const char* pParameterName = pFind + strlen(sLocalizedColumnNames[i]) + 1;
+                    int nParameterNameLength = sCellContent.length() - strlen(sLocalizedColumnNames[i]) - 1;
+                    if (nParameterNameLength > 0)
+                    {
+                        EventParameterIndex[nCellIndex] = pParameterName;
+                    }
+                }
+
+                break;
+            }
+            // HACK until all columns are renamed to "Translation"
+            //if (_stricmp(sCellContent, "Your Translation") == 0)
+            //{
+            //  nCellIndexToType[nCellIndex] = ELOCALIZED_COLUMN_TRANSLATED_ACTOR_LINE;
+            //  break;
+            //}
+        }
+    }
+}
+
+// copy characters to lower-case 0-terminated buffer
+static void CopyLowercase(char* dst, size_t dstSize, const char* src, size_t srcCount)
+{
+    if (dstSize > 0)
+    {
+        if (srcCount > dstSize - 1)
+        {
+            srcCount = dstSize - 1;
+        }
+        while (srcCount--)
+        {
+            const char c = *src++;
+            *dst++ = (c <= 'Z' && c >= 'A') ? c + ('a' - 'A') : c;
+        }
+        *dst = '\0';
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void ReplaceEndOfLine(CryFixedStringT<CLocalizedStringsManager::LOADING_FIXED_STRING_LENGTH>& s)
+{
+    const string oldSubstr("\\n");
+    const string newSubstr(" \n");
+    size_t pos = 0;
+    for (;; )
+    {
+        pos = s.find(oldSubstr, pos);
+        if (pos == CryFixedStringT<CLocalizedStringsManager::LOADING_FIXED_STRING_LENGTH>::npos)
+        {
+            return;
+        }
+        s.replace(pos, oldSubstr.length(), newSubstr);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+void CLocalizedStringsManager::OnSystemEvent(
+    ESystemEvent eEvent, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
+{
+    // might want to add an event which tells us that we are loading the main menu
+    // so everything can be unloaded and init files reloaded so safe some memory
+    switch (eEvent)
+    {
+    case ESYSTEM_EVENT_LEVEL_LOAD_START:
+    {
+        // This event is here not of interest while we're in the Editor.
+        if (!gEnv->IsEditor())
+        {
+            if (m_cvarLocalizationDebug >= 2)
+            {
+                CryLog("<Localization> Loading Requested Tags");
+            }
+
+            for (TStringVec::iterator it = m_tagLoadRequests.begin(); it != m_tagLoadRequests.end(); ++it)
+            {
+                LoadLocalizationDataByTag(*it);
+            }
+        }
+
+        m_tagLoadRequests.clear();
+        break;
+    }
+    case ESYSTEM_EVENT_EDITOR_ON_INIT:
+    {
+        // Load all tags after the Editor has finished initialization.
+        for (TTagFileNames::iterator it = m_tagFileNames.begin(); it != m_tagFileNames.end(); ++it)
+        {
+            LoadLocalizationDataByTag(it->first);
+        }
+
+        break;
+    }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::InitLocalizationData(
+    const char* sFileName, [[maybe_unused]] bool bReload)
+{
+    XmlNodeRef root = m_pSystem->LoadXmlFromFile(sFileName);
+
+    if (!root)
+    {
+        CryLog("Loading Localization File %s failed!", sFileName);
+        return false;
+    }
+
+    for (int i = 0; i < root->getChildCount(); i++)
+    {
+        XmlNodeRef typeNode = root->getChild(i);
+        string sType = typeNode->getTag();
+
+        // tags should be unique
+        if (m_tagFileNames.find(sType) != m_tagFileNames.end())
+        {
+            continue;
+        }
+
+        TStringVec vEntries;
+        for (int j = 0; j < typeNode->getChildCount(); j++)
+        {
+            XmlNodeRef entry = typeNode->getChild(j);
+            if (!entry->isTag("entry"))
+            {
+                continue;
+            }
+
+            vEntries.push_back(entry->getContent());
+        }
+
+        CRY_ASSERT(m_tagFileNames.size() < 255);
+
+        uint8 curNumTags = m_tagFileNames.size();
+
+        m_tagFileNames[sType].filenames = vEntries;
+        m_tagFileNames[sType].id                = curNumTags + 1;
+        m_tagFileNames[sType].loaded        = false;
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::RequestLoadLocalizationDataByTag(const char* sTag)
+{
+    TTagFileNames::iterator it = m_tagFileNames.find(sTag);
+    if (it == m_tagFileNames.end())
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] RequestLoadLocalizationDataByTag - Localization tag '%s' not found", sTag);
+        return false;
+    }
+
+    if (m_cvarLocalizationDebug >= 2)
+    {
+        CryLog("<Localization> RequestLoadLocalizationDataByTag %s", sTag);
+    }
+
+    m_tagLoadRequests.push_back(sTag);
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::LoadLocalizationDataByTag(
+    const char* sTag, bool bReload)
+{
+    TTagFileNames::iterator it = m_tagFileNames.find(sTag);
+    if (it == m_tagFileNames.end())
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] LoadLocalizationDataByTag - Localization tag '%s' not found", sTag);
+        return false;
+    }
+
+    if (it->second.loaded)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] LoadLocalizationDataByTag - Already loaded tag '%s'", sTag);
+        return true;
+    }
+
+    bool bResult = true;
+
+    stack_string const sLocalizationFolder(PathUtil::GetLocalizationFolder());
+
+    LoadFunc loadFunction = GetLoadFunction();
+    TStringVec& vEntries = it->second.filenames;
+    for (TStringVec::iterator it2 = vEntries.begin(); it2 != vEntries.end(); ++it2)
+    {
+        //Only load files of the correct type for the configured format
+        if ((m_cvarLocalizationFormat == 0 && strstr(*it2, ".xml")) || (m_cvarLocalizationFormat == 1 && strstr(*it2, ".agsxml")))
+        {
+            bResult &= (this->*loadFunction)(*it2, it->second.id, bReload);
+        }
+    }
+
+    if (m_cvarLocalizationDebug >= 2)
+    {
+        CryLog("<Localization> LoadLocalizationDataByTag %s with result %d", sTag, bResult);
+    }
+
+    it->second.loaded = true;
+
+    return bResult;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::ReleaseLocalizationDataByTag(
+    const char* sTag)
+{
+    INDENT_LOG_DURING_SCOPE(true, "Releasing localization data with the tag '%s'", sTag);
+    ListAndClearProblemLabels();
+
+    TTagFileNames::iterator it = m_tagFileNames.find(sTag);
+    if (it == m_tagFileNames.end())
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] ReleaseLocalizationDataByTag - Localization tag '%s' not found", sTag);
+        return false;
+    }
+
+    if (it->second.loaded == false)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] ReleaseLocalizationDataByTag - tag '%s' not loaded", sTag);
+        return false;
+    }
+
+    const uint8 nTagID = it->second.id;
+
+    tmapFilenames newLoadedTables;
+    for (tmapFilenames::iterator iter = m_loadedTables.begin(); iter != m_loadedTables.end(); iter++)
+    {
+        if (iter->second.nTagID != nTagID)
+        {
+            newLoadedTables[iter->first] = iter->second;
+        }
+    }
+    m_loadedTables = newLoadedTables;
+
+    if (m_pLanguage)
+    {
+        //LARGE_INTEGER liStart;
+        //QueryPerformanceCounter(&liStart);
+        AutoLock lock(m_cs);    //Make sure to lock, as this is a modifying operation
+
+        bool bMapEntryErased = false;
+        //First, remove entries from the map
+        for (StringsKeyMap::iterator keyMapIt = m_pLanguage->m_keysMap.begin(); keyMapIt != m_pLanguage->m_keysMap.end(); )
+        {
+            if (keyMapIt->second->nTagID == nTagID)
+            {
+                //VECTORMAP ONLY
+                keyMapIt = m_pLanguage->m_keysMap.erase(keyMapIt);
+                bMapEntryErased = true;
+            }
+            else
+            {
+                keyMapIt++;
+            }
+        }
+
+        if (bMapEntryErased == true)
+        {
+            StringsKeyMap newMap = m_pLanguage->m_keysMap;
+            m_pLanguage->m_keysMap.clearAndFreeMemory();
+            m_pLanguage->m_keysMap = newMap;
+        }
+
+        bool bVecEntryErased = false;
+        //Then remove the entries in the storage vector
+        const uint32 numEntries = m_pLanguage->m_vLocalizedStrings.size();
+        for (int32 i = numEntries - 1; i >= 0; i--)
+        {
+            SLocalizedStringEntry* entry = m_pLanguage->m_vLocalizedStrings[i];
+            PREFAST_ASSUME(entry);
+            if (entry->nTagID == nTagID)
+            {
+                if (m_cvarLocalizationEncode == 1)
+                {
+                    if (entry->huffmanTreeIndex != -1)
+                    {
+                        HuffmanCoder* pCoder = m_pLanguage->m_vEncoders[entry->huffmanTreeIndex];
+                        if (pCoder != NULL)
+                        {
+                            pCoder->DecRef();
+                            if (pCoder->RefCount() == 0)
+                            {
+                                if (m_cvarLocalizationDebug >= 2)
+                                {
+                                    CryLog("<Localization> Releasing coder %u as it no longer has associated strings", entry->huffmanTreeIndex);
+                                }
+                                //This coding table no longer needed, it has no more associated strings
+                                SAFE_DELETE(m_pLanguage->m_vEncoders[entry->huffmanTreeIndex]);
+                            }
+                        }
+                    }
+                }
+                bVecEntryErased = true;
+                delete(entry);
+                m_pLanguage->m_vLocalizedStrings.erase(m_pLanguage->m_vLocalizedStrings.begin() + i);
+            }
+        }
+
+        //Shrink the vector if necessary
+        if (bVecEntryErased == true)
+        {
+            SLanguage::TLocalizedStringEntries newVec = m_pLanguage->m_vLocalizedStrings;
+            m_pLanguage->m_vLocalizedStrings.clear();
+            m_pLanguage->m_vLocalizedStrings = newVec;
+        }
+
+        /*LARGE_INTEGER liEnd, liFreq;
+        QueryPerformanceCounter(&liEnd);
+        QueryPerformanceFrequency(&liFreq);
+
+        CTimeValue lockTime = CTimeValue((liEnd.QuadPart - liStart.QuadPart) * CTimeValue::TIMEVALUE_PRECISION / liFreq.QuadPart);
+        if (m_cvarLocalizationDebug >= 2)
+        {
+            CryLog("<Localization> ReleaseLocalizationDataByTag %s lock time %fMS", sTag, lockTime.GetMilliSeconds());
+        }*/
+    }
+
+    if (m_cvarLocalizationDebug >= 2)
+    {
+        CryLog("<Localization> ReleaseLocalizationDataByTag %s", sTag);
+    }
+
+    it->second.loaded = false;
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::LoadAllLocalizationData(bool bReload)
+{
+    for (TTagFileNames::iterator it = m_tagFileNames.begin(); it != m_tagFileNames.end(); ++it)
+    {
+        if(!LoadLocalizationDataByTag(it->first, bReload))
+            return false;
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::LoadExcelXmlSpreadsheet(const char* sFileName, bool bReload)
+{
+    LoadFunc loadFunction = GetLoadFunction();
+    return (this->*loadFunction)(sFileName, 0, bReload);
+}
+
+//////////////////////////////////////////////////////////////////////
+// Loads a string-table from a Excel XML Spreadsheet file.
+bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName, uint8 nTagID, bool bReload)
+{
+    LOADING_TIME_PROFILE_SECTION_ARGS(sFileName)
+    if (!m_pLanguage)
+    {
+        return false;
+    }
+
+    //check if this table has already been loaded
+    if (!bReload)
+    {
+        if (m_loadedTables.find(CONST_TEMP_STRING(sFileName)) != m_loadedTables.end())
+        {
+            return (true);
+        }
+    }
+
+    ListAndClearProblemLabels();
+
+    IXmlTableReader* const pXmlTableReader = m_pSystem->GetXmlUtils()->CreateXmlTableReader();
+    if (!pXmlTableReader)
+    {
+        CryLog("Loading Localization File %s failed (XML system failure)!", sFileName);
+        return false;
+    }
+
+    XmlNodeRef root;
+    string sPath;
+    {
+        const string sLocalizationFolder(PathUtil::GetLocalizationRoot());
+        const string& languageFolder = m_pLanguage->sLanguage;
+        sPath = sLocalizationFolder.c_str() + languageFolder + PathUtil::GetSlash() + sFileName;
+        root = m_pSystem->LoadXmlFromFile(sPath);
+        if (!root)
+        {
+            CryLog("Loading Localization File %s failed!", sPath.c_str());
+            pXmlTableReader->Release();
+            return false;
+        }
+    }
+
+    // bug search, re-export to a file to compare it
+    //string sReExport = sFileName;
+    //sReExport += ".re";
+    //root->saveToFile(sReExport.c_str());
+
+    CryLog("Loading Localization File %s", sFileName);
+    INDENT_LOG_DURING_SCOPE();
+
+    //Create a huffman coding table for these strings - if they're going to be encoded or compressed
+    HuffmanCoder* pEncoder = NULL;
+    uint8 iEncoder = 0;
+    size_t startOfStringsToCompress = 0;
+    if (m_cvarLocalizationEncode == 1)
+    {
+        {
+            for (iEncoder = 0; iEncoder < m_pLanguage->m_vEncoders.size(); iEncoder++)
+            {
+                if (m_pLanguage->m_vEncoders[iEncoder] == NULL)
+                {
+                    m_pLanguage->m_vEncoders[iEncoder] = pEncoder = new HuffmanCoder();
+                    break;
+                }
+            }
+            if (iEncoder == m_pLanguage->m_vEncoders.size())
+            {
+                pEncoder = new HuffmanCoder();
+                m_pLanguage->m_vEncoders.push_back(pEncoder);
+            }
+            //Make a note of the current end of the loc strings array, as encoding is done in two passes.
+            //One pass to build the code table, another to apply it
+            pEncoder->Init();
+        }
+        startOfStringsToCompress = m_pLanguage->m_vLocalizedStrings.size();
+    }
+
+    {
+        if (!pXmlTableReader->Begin(root))
+        {
+            CryLog("Loading Localization File %s failed! The file is in an unsupported format.", sPath.c_str());
+            pXmlTableReader->Release();
+            return false;
+        }
+    }
+
+    int rowCount = pXmlTableReader->GetEstimatedRowCount();
+    {
+        AutoLock lock(m_cs);    //Make sure to lock, as this is a modifying operation
+        m_pLanguage->m_vLocalizedStrings.reserve(m_pLanguage->m_vLocalizedStrings.size() + rowCount);
+    }
+    {
+        AutoLock lock(m_cs);    //Make sure to lock, as this is a modifying operation
+        //VectorMap only, not applicable to std::map
+        m_pLanguage->m_keysMap.reserve(m_pLanguage->m_keysMap.size() + rowCount);
+    }
+
+    {
+        pairFileName sNewFile;
+        sNewFile.first = sFileName;
+        sNewFile.second.bDataStripping = false; // this is off for now
+        sNewFile.second.nTagID = nTagID;
+        m_loadedTables.insert(sNewFile);
+    }
+
+    // Cell Index
+    char nCellIndexToType[MAX_CELL_COUNT];
+    memset(nCellIndexToType, 0, sizeof(nCellIndexToType));
+
+    // SoundMood Index
+    std::map<int, string> SoundMoodIndex;
+
+    // EventParameter Index
+    std::map<int, string> EventParameterIndex;
+
+    bool bFirstRow = true;
+
+    CryFixedStringT<LOADING_FIXED_STRING_LENGTH> sTmp;
+
+    // lower case event name
+    char szLowerCaseEvent[128];
+    // lower case key
+    char szLowerCaseKey[1024];
+    // key CRC
+    uint32 keyCRC;
+
+    size_t nMemSize = 0;
+
+    for (;; )
+    {
+        int nRowIndex = -1;
+        {
+            if (!pXmlTableReader->ReadRow(nRowIndex))
+            {
+                break;
+            }
+        }
+
+        if (bFirstRow)
+        {
+            bFirstRow = false;
+            ParseFirstLine(pXmlTableReader, nCellIndexToType, SoundMoodIndex, EventParameterIndex);
+            // Skip first row, it contains description only.
+            continue;
+        }
+
+        bool bValidKey = false;
+        bool bValidTranslatedText = false;
+        bool bValidTranslatedCharacterName = false;
+        bool bValidTranslatedActorLine = false;
+        bool bUseSubtitle = true;
+        bool bIsDirectRadio = false;
+        bool bIsIntercepted = false;
+
+        struct CConstCharArray
+        {
+            const char* ptr;
+            size_t count;
+
+            CConstCharArray()
+            {
+                clear();
+            }
+            void clear()
+            {
+                ptr = "";
+                count = 0;
+            }
+            bool empty() const
+            {
+                return count == 0;
+            }
+        };
+
+        CConstCharArray sKeyString;
+        CConstCharArray sCharacterName;
+        CConstCharArray sTranslatedCharacterName; // Legacy, to be removed some day...
+        CConstCharArray sSubtitleText;
+        CConstCharArray sTranslatedText; // Legacy, to be removed some day...
+        CConstCharArray sActorLine;
+        CConstCharArray sTranslatedActorLine; // Legacy, to be removed some day...
+        CConstCharArray sSoundEvent;
+
+        float fVolume = 1.0f;
+        float fRadioRatio = 1.0f;
+        float fEventParameterValue = 0.0f;
+        float fSoundMoodValue = 0.0f;
+
+        int nItems = 0;
+        std::map<int, float> SoundMoodValues;
+        std::map<int, float> EventParameterValues;
+
+        for (;; )
+        {
+            int nCellIndex = -1;
+            CConstCharArray cell;
+
+            {
+                if (!pXmlTableReader->ReadCell(nCellIndex, cell.ptr, cell.count))
+                {
+                    break;
+                }
+            }
+
+            if (nCellIndex >= MAX_CELL_COUNT)
+            {
+                break;
+            }
+
+            // skip empty cells
+            if (cell.count <= 0)
+            {
+                continue;
+            }
+
+            const char nCellType = nCellIndexToType[nCellIndex];
+
+            switch (nCellType)
+            {
+            case ELOCALIZED_COLUMN_SKIP:
+                break;
+            case ELOCALIZED_COLUMN_KEY:
+                sKeyString = cell;
+                bValidKey = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_AUDIOFILE:
+                sKeyString = cell;
+                bValidKey = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_CHARACTER_NAME:
+                sCharacterName = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_SUBTITLE_TEXT:
+                sSubtitleText = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_ACTOR_LINE:
+                sActorLine = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_USE_SUBTITLE:
+                sTmp.assign(cell.ptr, cell.count);
+                bUseSubtitle = CryStringUtils::ToYesNoType(sTmp.c_str()) == CryStringUtils::YesNoType::No ? false : true; // favor yes (yes and invalid -> yes)
+                break;
+            case ELOCALIZED_COLUMN_VOLUME:
+                sTmp.assign(cell.ptr, cell.count);
+                fVolume = (float)atof(sTmp.c_str());
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_SOUNDEVENT:
+                sSoundEvent = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_RADIO_RATIO:
+                sTmp.assign(cell.ptr, cell.count);
+                fRadioRatio = (float)atof(sTmp.c_str());
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_EVENTPARAMETER:
+                sTmp.assign(cell.ptr, cell.count);
+                fEventParameterValue = (float)atof(sTmp.c_str());
+                {
+                    EventParameterValues[nCellIndex] = fEventParameterValue;
+                }
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_SOUNDMOOD:
+                sTmp.assign(cell.ptr, cell.count);
+                fSoundMoodValue = (float)atof(sTmp.c_str());
+                {
+                    SoundMoodValues[nCellIndex] = fSoundMoodValue;
+                }
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_IS_DIRECT_RADIO:
+                sTmp.assign(cell.ptr, cell.count);
+                if (!_stricmp(sTmp.c_str(), "intercept"))
+                {
+                    bIsIntercepted = true;
+                }
+                bIsDirectRadio = bIsIntercepted || (CryStringUtils::ToYesNoType(sTmp.c_str()) == CryStringUtils::YesNoType::Yes ? true : false); // favor no (no and invalid -> no)
+                ++nItems;
+                break;
+            // legacy names
+            case ELOCALIZED_COLUMN_LEGACY_PERSON:
+                // old file often only have content in this column
+                if (!cell.empty())
+                {
+                    sCharacterName = cell;
+                    sTranslatedCharacterName = cell;
+                    bValidTranslatedCharacterName = true;
+                }
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_CHARACTERNAME:
+                sCharacterName = cell;
+                sTranslatedCharacterName = cell;
+                bValidTranslatedCharacterName = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_CHARACTERNAME:
+                sTranslatedCharacterName = cell;
+                bValidTranslatedCharacterName = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_ENGLISH_DIALOGUE:
+                // old file often only have content in this column
+                sActorLine = cell;
+                sSubtitleText = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_TRANSLATION:
+                sTranslatedActorLine = cell;
+                sTranslatedText = cell;
+                bValidTranslatedText = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_YOUR_TRANSLATION:
+                sTranslatedActorLine = cell;
+                sTranslatedText = cell;
+                bValidTranslatedText = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_ENGLISH_SUBTITLE:
+                sSubtitleText = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_SUBTITLE:
+                sTranslatedText = cell;
+                sTranslatedActorLine = cell;
+                bValidTranslatedText = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_ORIGINAL_CHARACTER_NAME:
+                sCharacterName = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_CHARACTER_NAME:
+                sTranslatedCharacterName = cell;
+                bValidTranslatedCharacterName = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_ORIGINAL_TEXT:
+                sSubtitleText = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_TEXT:
+                sTranslatedText = cell;
+                bValidTranslatedText = true;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_ORIGINAL_ACTOR_LINE:
+                sActorLine = cell;
+                ++nItems;
+                break;
+            case ELOCALIZED_COLUMN_LEGACY_TRANSLATED_ACTOR_LINE:
+                sTranslatedActorLine = cell;
+                bValidTranslatedActorLine = true;
+                ++nItems;
+                break;
+            }
+        }
+
+        if (!bValidKey)
+        {
+            continue;
+        }
+
+        if (!bValidTranslatedText)
+        {
+            // if this is a dialog entry with a soundevent and with subtitles then a warning should be issued
+            if (m_cvarLocalizationDebug && !sSoundEvent.empty() && bUseSubtitle)
+            {
+                sTmp.assign(sKeyString.ptr, sKeyString.count);
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] Key '%s' in file <%s> has no translated text", sTmp.c_str(), sFileName);
+            }
+
+            // use translated actor line entry if available before falling back to original entry
+            if (!sTranslatedActorLine.empty())
+            {
+                sTranslatedText = sTranslatedActorLine;
+            }
+            else
+            {
+                sTranslatedText = sSubtitleText;
+            }
+        }
+
+        if (!bValidTranslatedActorLine)
+        {
+            // if this is a dialog entry with a soundevent then a warning should be issued
+            if (m_cvarLocalizationDebug && !sSoundEvent.empty())
+            {
+                sTmp.assign(sKeyString.ptr, sKeyString.count);
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] Key '%s' in file <%s> has no translated actor line", sTmp.c_str(), sFileName);
+            }
+
+            // use translated text entry if available before falling back to original entry
+            if (!sTranslatedText.empty())
+            {
+                sTranslatedActorLine = sTranslatedText;
+            }
+            else
+            {
+                sTranslatedActorLine = sSubtitleText;
+            }
+        }
+
+        if (!sSoundEvent.empty() && !bValidTranslatedCharacterName)
+        {
+            if (m_cvarLocalizationDebug)
+            {
+                sTmp.assign(sKeyString.ptr, sKeyString.count);
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] Key '%s' in file <%s> has no translated character name", sTmp.c_str(), sFileName);
+            }
+
+            sTranslatedCharacterName = sCharacterName;
+        }
+
+        if (nItems == 1) // skip lines which contain just one item in the key
+        {
+            continue;
+        }
+
+        // reject to store text if line was marked with no subtitles in game mode
+        if (!gEnv->IsEditor())
+        {
+            if (!bUseSubtitle)
+            {
+                sSubtitleText.clear();
+                sTranslatedText.clear();
+            }
+        }
+
+        // Skip @ character in the key string.
+        if (!sKeyString.empty() && sKeyString.ptr[0] == '@')
+        {
+            sKeyString.ptr++;
+            sKeyString.count--;
+        }
+
+        {
+            CopyLowercase(szLowerCaseEvent, sizeof(szLowerCaseEvent), sSoundEvent.ptr, sSoundEvent.count);
+            CopyLowercase(szLowerCaseKey, sizeof(szLowerCaseKey), sKeyString.ptr, sKeyString.count);
+        }
+
+        //Compute the CRC32 of the key
+        keyCRC = CCrc32::Compute(szLowerCaseKey);
+        if (m_cvarLocalizationDebug >= 3)
+        {
+            CryLogAlways("<Localization dupe/clash detection> CRC32: 0x%8X, Key: %s", keyCRC, szLowerCaseKey);
+        }
+
+        if (m_pLanguage->m_keysMap.find(keyCRC) != m_pLanguage->m_keysMap.end())
+        {
+            sTmp.assign(sKeyString.ptr, sKeyString.count);
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "[LocError] Localized String '%s' Already Loaded for Language %s OR there is a CRC hash clash", sTmp.c_str(), m_pLanguage->sLanguage.c_str());
+            continue;
+        }
+
+        SLocalizedStringEntry* pEntry = new SLocalizedStringEntry();
+        pEntry->flags = 0;
+
+        if (bUseSubtitle == true)
+        {
+            pEntry->flags |= SLocalizedStringEntry::USE_SUBTITLE;
+        }
+        pEntry->nTagID = nTagID;
+
+        if (gEnv->IsEditor())
+        {
+            pEntry->pEditorExtension = new SLocalizedStringEntryEditorExtension();
+
+            pEntry->pEditorExtension->sKey = szLowerCaseKey;
+
+            pEntry->pEditorExtension->nRow = nRowIndex;
+
+            if (!sActorLine.empty())
+            {
+                sTmp.assign(sActorLine.ptr, sActorLine.count);
+                ReplaceEndOfLine(sTmp);
+                pEntry->pEditorExtension->sOriginalActorLine.assign(sTmp.c_str());
+            }
+            if (!sTranslatedActorLine.empty())
+            {
+                sTmp.assign(sTranslatedActorLine.ptr, sTranslatedActorLine.count);
+                ReplaceEndOfLine(sTmp);
+                pEntry->pEditorExtension->sUtf8TranslatedActorLine.append(sTmp.c_str());
+            }
+            if (bUseSubtitle && !sSubtitleText.empty())
+            {
+                sTmp.assign(sSubtitleText.ptr, sSubtitleText.count);
+                ReplaceEndOfLine(sTmp);
+                pEntry->pEditorExtension->sOriginalText.assign(sTmp.c_str());
+            }
+            // only use the translated character name
+            {
+                pEntry->pEditorExtension->sOriginalCharacterName.assign(sCharacterName.ptr, sCharacterName.count);
+            }
+        }
+
+        if (bUseSubtitle && !sTranslatedText.empty())
+        {
+            sTmp.assign(sTranslatedText.ptr, sTranslatedText.count);
+            ReplaceEndOfLine(sTmp);
+            if (m_cvarLocalizationEncode == 1)
+            {
+                pEncoder->Update((const uint8*)(sTmp.c_str()), sTmp.length());
+                //CryLogAlways("%u Storing %s (%u)", m_pLanguage->m_vLocalizedStrings.size(), sTmp.c_str(), sTmp.length());
+                pEntry->TranslatedText.szCompressed = new uint8[sTmp.length() + 1];
+                pEntry->flags |= SLocalizedStringEntry::IS_COMPRESSED;
+                //Store the raw string. It'll be compressed later
+                memcpy(pEntry->TranslatedText.szCompressed, sTmp.c_str(), sTmp.length());
+                pEntry->TranslatedText.szCompressed[sTmp.length()] = '\0';  //Null terminate
+            }
+            else
+            {
+                pEntry->TranslatedText.psUtf8Uncompressed = new string(sTmp.c_str(), sTmp.c_str() + sTmp.length());
+            }
+        }
+
+        // the following is used to cleverly assign strings
+        // we store all known string into the m_prototypeEvents set and assign known entries from there
+        // the CryString makes sure, that only the ref-count is increment on assignment
+        if (*szLowerCaseEvent)
+        {
+            PrototypeSoundEvents::iterator it = m_prototypeEvents.find(CONST_TEMP_STRING(szLowerCaseEvent));
+            if (it != m_prototypeEvents.end())
+            {
+                pEntry->sPrototypeSoundEvent = *it;
+            }
+            else
+            {
+                pEntry->sPrototypeSoundEvent = szLowerCaseEvent;
+                m_prototypeEvents.insert(pEntry->sPrototypeSoundEvent);
+            }
+        }
+
+        const CConstCharArray sWho = sTranslatedCharacterName.empty() ? sCharacterName : sTranslatedCharacterName;
+        if (!sWho.empty())
+        {
+            sTmp.assign(sWho.ptr, sWho.count);
+            ReplaceEndOfLine(sTmp);
+            sTmp.replace(" ", "_");
+            string tmp;
+            {
+                tmp = sTmp.c_str();
+            }
+            CharacterNameSet::iterator it = m_characterNameSet.find(tmp);
+            if (it != m_characterNameSet.end())
+            {
+                pEntry->sCharacterName = *it;
+            }
+            else
+            {
+                pEntry->sCharacterName = tmp;
+                m_characterNameSet.insert(pEntry->sCharacterName);
+            }
+        }
+
+        pEntry->fVolume = CryConvertFloatToHalf(fVolume);
+
+        // SoundMood Entries
+        {
+            pEntry->SoundMoods.resize(SoundMoodValues.size());
+            if (SoundMoodValues.size() > 0)
+            {
+                std::map<int, float>::const_iterator itEnd = SoundMoodValues.end();
+                int nSoundMoodCount = 0;
+                for (std::map<int, float>::const_iterator it = SoundMoodValues.begin(); it != itEnd; ++it)
+                {
+                    pEntry->SoundMoods[nSoundMoodCount].fValue = (*it).second;
+                    pEntry->SoundMoods[nSoundMoodCount].sName = SoundMoodIndex[(*it).first];
+                    ++nSoundMoodCount;
+                }
+            }
+        }
+
+        // EventParameter Entries
+        {
+            pEntry->EventParameters.resize(EventParameterValues.size());
+            if (EventParameterValues.size() > 0)
+            {
+                std::map<int, float>::const_iterator itEnd = EventParameterValues.end();
+                int nEventParameterCount = 0;
+                for (std::map<int, float>::const_iterator it = EventParameterValues.begin(); it != itEnd; ++it)
+                {
+                    pEntry->EventParameters[nEventParameterCount].fValue = (*it).second;
+                    pEntry->EventParameters[nEventParameterCount].sName = EventParameterIndex[(*it).first];
+                    ++nEventParameterCount;
+                }
+            }
+        }
+
+        pEntry->fRadioRatio = CryConvertFloatToHalf(fRadioRatio);
+
+        if (bIsDirectRadio == true)
+        {
+            pEntry->flags |= SLocalizedStringEntry::IS_DIRECTED_RADIO;
+        }
+        if (bIsIntercepted == true)
+        {
+            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);
+    }
+
+    if (m_cvarLocalizationEncode == 1)
+    {
+        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];
+                if (pStringToCompress->TranslatedText.szCompressed != NULL)
+                {
+                    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();
+
+    return true;
+}
+
+bool CLocalizedStringsManager::DoLoadAGSXmlDocument(const char* sFileName, uint8 nTagID, bool bReload)
+{
+    if (!sFileName)
+    {
+        return false;
+    }
+    if (!m_pLanguage)
+    {
+        return false;
+    }
+    if (!bReload)
+    {
+        if (m_loadedTables.find(CONST_TEMP_STRING(sFileName)) != m_loadedTables.end())
+        {
+            return true;
+        }
+    }
+    ListAndClearProblemLabels();
+    XmlNodeRef root;
+    string sPath;
+    {
+        const string sLocalizationFolder(PathUtil::GetLocalizationRoot());
+        const string& languageFolder = m_pLanguage->sLanguage;
+        sPath = sLocalizationFolder.c_str() + languageFolder + PathUtil::GetSlash() + sFileName;
+        root = m_pSystem->LoadXmlFromFile(sPath);
+        if (!root)
+        {
+            AZ_TracePrintf(LOC_WINDOW, "Loading Localization File %s failed!", sPath.c_str());
+            return false;
+        }
+    }
+    AZ_TracePrintf(LOC_WINDOW, "Loading Localization File %s", sPath.c_str());
+    HuffmanCoder* pEncoder = nullptr;
+    uint8 iEncoder = 0;
+    size_t startOfStringsToCompress = 0;
+    if (m_cvarLocalizationEncode == 1)
+    {
+        {
+            for (iEncoder = 0; iEncoder < m_pLanguage->m_vEncoders.size(); iEncoder++)
+            {
+                if (m_pLanguage->m_vEncoders[iEncoder] == nullptr)
+                {
+                    pEncoder = new HuffmanCoder();
+                    m_pLanguage->m_vEncoders[iEncoder] = pEncoder;
+                    break;
+                }
+            }
+            if (iEncoder == m_pLanguage->m_vEncoders.size())
+            {
+                pEncoder = new HuffmanCoder();
+                m_pLanguage->m_vEncoders.push_back(pEncoder);
+            }
+            pEncoder->Init();
+        }
+        startOfStringsToCompress = m_pLanguage->m_vLocalizedStrings.size();
+    }
+    int rowCount = 0;
+    {
+        AutoLock lock(m_cs);    // Make sure to lock, as this is a modifying operation
+        rowCount = root->getChildCount();
+        {
+            m_pLanguage->m_vLocalizedStrings.reserve(m_pLanguage->m_vLocalizedStrings.size() + rowCount);
+        }
+        m_pLanguage->m_keysMap.reserve(m_pLanguage->m_keysMap.size() + rowCount);
+    }
+    {
+        pairFileName sNewFile;
+        sNewFile.first = sFileName;
+        sNewFile.second.bDataStripping = false; // this is off for now
+        sNewFile.second.nTagID = nTagID;
+        m_loadedTables.insert(sNewFile);
+    }
+    const char* key = nullptr;
+    AZStd::string keyString;
+    AZStd::string lowerKey;
+    AZStd::string textValue;
+    uint32 keyCRC=0;
+    for (int i = 0; i < rowCount; ++i)
+    {
+        XmlNodeRef childNode = root->getChild(i);
+        if (azstricmp(childNode->getTag(), "string") || !childNode->getAttr("key", &key))
+        {
+            continue;
+        }
+        keyString = key;
+        textValue = childNode->getContent();
+        if (textValue.empty())
+        {
+            continue;
+        }
+        AzFramework::StringFunc::Replace(textValue, "\\n", " \n");      // carried over from helper func ReplaceEndOfLine(CryFixedStringT<>& s)
+        if (keyString[0] == '@')
+        {
+            AzFramework::StringFunc::LChop(keyString, 1);
+        }
+        lowerKey = keyString;
+        AZStd::to_lower(lowerKey.begin(), lowerKey.end());
+        keyCRC = CCrc32::Compute(lowerKey.c_str());
+        if (m_cvarLocalizationDebug >= 3)
+        {
+            CryLogAlways("<Localization dupe/clash detection> CRC32: 0%8X, Key: %s", keyCRC, lowerKey.c_str());
+        }
+        if (m_pLanguage->m_keysMap.find(keyCRC) != m_pLanguage->m_keysMap.end())
+        {
+            AZ_Warning(LOC_WINDOW, false, "Localized String '%s' Already Loaded for Language %s OR there is a CRC hash clash", keyString.c_str(), m_pLanguage->sLanguage.c_str());
+            continue;
+        }
+        SLocalizedStringEntry* pEntry = new SLocalizedStringEntry;
+        pEntry->flags = SLocalizedStringEntry::USE_SUBTITLE;
+        pEntry->nTagID = nTagID;
+        if (gEnv->IsEditor())
+        {
+            pEntry->pEditorExtension = new SLocalizedStringEntryEditorExtension();
+            pEntry->pEditorExtension->sKey = lowerKey.c_str();
+            pEntry->pEditorExtension->nRow = i;
+            {
+                pEntry->pEditorExtension->sUtf8TranslatedActorLine.append(textValue.c_str());
+            }
+            {
+                pEntry->pEditorExtension->sOriginalText.assign(textValue.c_str());
+            }
+        }
+        {
+            const char* textString = textValue.c_str();
+            size_t textLength = textValue.length();
+            if (m_cvarLocalizationEncode == 1)
+            {
+                pEncoder->Update((const uint8*)(textString), textLength);
+                pEntry->TranslatedText.szCompressed = new uint8[textLength + 1];
+                pEntry->flags |= SLocalizedStringEntry::IS_COMPRESSED;
+                memcpy(pEntry->TranslatedText.szCompressed, textString, textLength);
+                pEntry->TranslatedText.szCompressed[textLength] = '\0';  //Null terminate
+            }
+            else
+            {
+                pEntry->TranslatedText.psUtf8Uncompressed = new string(textString, textString + textLength);
+            }
+        }
+        {
+            AddLocalizedString(m_pLanguage, pEntry, keyCRC);
+        }
+    }
+    if (m_cvarLocalizationEncode == 1)
+    {
+        {
+            pEncoder->Finalize();
+        }
+        {
+            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];
+                if (pStringToCompress->TranslatedText.szCompressed != nullptr)
+                {
+                    size_t compBufSize = COMPRESSION_FIXED_BUFFER_LENGTH;
+                    memset(compressionBuffer, 0, COMPRESSION_FIXED_BUFFER_LENGTH);
+                    size_t inputStringLength = strnlen((const char*)(pStringToCompress->TranslatedText.szCompressed), COMPRESSION_FIXED_BUFFER_LENGTH);
+                    pEncoder->CompressInput(pStringToCompress->TranslatedText.szCompressed, inputStringLength, compressionBuffer, &compBufSize);
+                    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);
+                    pStringToCompress->TranslatedText.szCompressed = szCompressedString;
+                }
+            }
+        }
+    }
+    return true;
+}
+//////////////////////////////////////////////////////////////////////////
+CLocalizedStringsManager::LoadFunc CLocalizedStringsManager::GetLoadFunction() const
+{
+    CRY_ASSERT_MESSAGE(gEnv && gEnv->pConsole, "System environment or console missing!");
+    if (gEnv && gEnv->pConsole)
+    {
+        if(m_cvarLocalizationFormat == 1)
+        {
+            return &CLocalizedStringsManager::DoLoadAGSXmlDocument;
+        }
+    }
+    return &CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet;
+}
+void CLocalizedStringsManager::ReloadData()
+{
+    tmapFilenames temp = m_loadedTables;
+
+    LoadFunc loadFunction = GetLoadFunction();
+    FreeLocalizationData();
+    for (tmapFilenames::iterator it = temp.begin(); it != temp.end(); it++)
+    {
+        (this->*loadFunction)((*it).first, (*it).second.nTagID, true);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::AddLocalizedString(SLanguage* pLanguage, SLocalizedStringEntry* pEntry, const uint32 keyCRC32)
+{
+    pLanguage->m_vLocalizedStrings.push_back(pEntry);
+    int nId = (int)pLanguage->m_vLocalizedStrings.size() - 1;
+    pLanguage->m_keysMap[keyCRC32] = pEntry;
+    
+    if (m_cvarLocalizationDebug >= 2)
+    {
+        CryLog("<Localization> Add new string <%u> with ID %d to <%s>", keyCRC32, nId, pLanguage->sLanguage.c_str());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::LocalizeString_ch(const char* sString, string& outLocalizedString, bool bEnglish)
+{
+    return LocalizeStringInternal(sString, strlen(sString), outLocalizedString, bEnglish);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::LocalizeString_s(const string& sString, string& outLocalizedString, bool bEnglish)
+{
+    return LocalizeStringInternal(sString.c_str(), sString.length(), outLocalizedString, bEnglish);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::LocalizeStringInternal(const char* pStr, size_t len, string& outLocalizedString, bool bEnglish)
+{
+    assert (m_pLanguage);
+    if (m_pLanguage == 0)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "LocalizeString: No language set.");
+        outLocalizedString.assign(pStr, pStr + len);
+        return false;
+    }
+
+    // note: we don't write directly to outLocalizedString, in case it aliases pStr
+    string out;
+
+    // scan the string
+    const char* pPos = pStr;
+    const char* pEnd = pStr + len;
+    while (true)
+    {
+        const char* pLabel = strchr(pPos, '@');
+        if (!pLabel)
+        {
+            break;
+        }
+        // found an occurrence
+
+        // we have skipped a few characters, so copy them over
+        if (pLabel != pPos)
+        {
+            out.append(pPos, pLabel);
+        }
+
+        // Search label for first occurence of any label terminating character
+        const char* pLabelEnd = strpbrk(pLabel, " !\"#$%&\'()*+,./:;<=>\?[\\]^`{|}~\n\t\r");
+        if (!pLabelEnd)
+        {
+            pLabelEnd = pEnd;
+        }
+
+        // localize token
+        string token(pLabel, pLabelEnd);
+        string sLocalizedToken;
+        if (bEnglish)
+        {
+            GetEnglishString(token.c_str(), sLocalizedToken);
+        }
+        else
+        {
+            LocalizeLabel(token.c_str(), sLocalizedToken);
+        }
+        out.append(sLocalizedToken);
+        pPos = pLabelEnd;
+    }
+    out.append(pPos, pEnd);
+    out.swap(outLocalizedString);
+    return true;
+}
+
+void CLocalizedStringsManager::LocalizeAndSubstituteInternal(AZStd::string& locString, const AZStd::vector<AZStd::string>& keys, const AZStd::vector<AZStd::string>& values)
+{
+    string outString;
+    LocalizeString_ch(locString.c_str(), outString);
+    locString = outString .c_str();
+    if (values.size() != keys.size())
+    {
+        AZ_Warning("game", false, "Localization Error: LocalizeAndSubstitute was given %u keys and %u values to replace. These numbers must be equal.", keys.size(), values.size());
+        return;
+    }
+    size_t startIndex = locString.find('{');
+    size_t endIndex = locString.find('}', startIndex);
+    while (startIndex != AZStd::string::npos && endIndex != AZStd::string::npos)
+    {
+        const size_t subLength = endIndex - startIndex - 1;
+        AZStd::string substituteOut = locString.substr(startIndex + 1, subLength).c_str();
+        int index = 0;
+        if (LocalizationHelpers::IsKeyInList(keys, substituteOut, index))
+        {
+            const char* value = values[index].c_str();
+            locString.replace(startIndex, subLength + 2, value);
+            startIndex += strlen(value);
+        }
+        else
+        {
+            AZ_Warning("game", false, "Localization Error: Localized string '%s' contains a key '%s' that is not mapped to a data element.", locString.c_str(), substituteOut.c_str());
+            startIndex += substituteOut.length();
+        }
+        startIndex = locString.find_first_of('{', startIndex);
+        endIndex = locString.find_first_of('}', startIndex); 
+    }
+}
+#if defined(LOG_DECOMP_TIMES)
+static double g_fSecondsPerTick = 0.0;
+static FILE* pDecompLog = NULL;
+// engine independent game timer since gEnv/pSystem isn't available yet
+static void LogDecompTimer(__int64 nTotalTicks, __int64 nDecompTicks, __int64 nAllocTicks)
+{
+    if (g_fSecondsPerTick == 0.0)
+    {
+        __int64 nPerfFreq;
+        QueryPerformanceFrequency((LARGE_INTEGER*)&nPerfFreq);
+        g_fSecondsPerTick = 1.0 / (double)nPerfFreq;
+    }
+
+    if (!pDecompLog)
+    {
+        char szFilenameBuffer[MAX_PATH];
+        time_t rawTime;
+        time(&rawTime);
+        struct tm* pTimeInfo = localtime(&rawTime);
+
+        CreateDirectory("TestResults\\", 0);
+        strftime(szFilenameBuffer, sizeof(szFilenameBuffer), "TestResults\\Decomp_%Y_%m_%d-%H_%M_%S.csv", pTimeInfo);
+        pDecompLog = fopen(szFilenameBuffer, "wb");
+        fprintf(pDecompLog, "Total,Decomp,Alloc\n");
+    }
+    float nTotalMillis = float( g_fSecondsPerTick * 1000.0 * nTotalTicks );
+    float nDecompMillis = float( g_fSecondsPerTick * 1000.0 * nDecompTicks );
+    float nAllocMillis = float( g_fSecondsPerTick * 1000.0 * nAllocTicks );
+    fprintf(pDecompLog, "%f,%f,%f\n", nTotalMillis, nDecompMillis, nAllocMillis);
+    fflush(pDecompLog);
+}
+#endif
+
+string CLocalizedStringsManager::SLocalizedStringEntry::GetTranslatedText(const SLanguage* pLanguage) const
+{
+    FUNCTION_PROFILER_FAST(GetISystem(), PROFILE_SYSTEM, g_bProfilerEnabled);
+    if ((flags & IS_COMPRESSED) != 0)
+    {
+#if defined(LOG_DECOMP_TIMES)
+        __int64 nTotalTicks, nDecompTicks, nAllocTicks;
+        nTotalTicks = CryGetTicks();
+#endif  //LOG_DECOMP_TIMES
+
+        string outputString;
+        if (TranslatedText.szCompressed != NULL)
+        {
+            uint8 decompressionBuffer[COMPRESSION_FIXED_BUFFER_LENGTH];
+            HuffmanCoder* pEncoder = pLanguage->m_vEncoders[huffmanTreeIndex];
+
+#if defined(LOG_DECOMP_TIMES)
+            nDecompTicks = CryGetTicks();
+#endif  //LOG_DECOMP_TIMES
+
+            //We don't actually know how much memory was allocated for this string, but the maximum compression buffer size is known
+            size_t decompBufSize = pEncoder->UncompressInput(TranslatedText.szCompressed, COMPRESSION_FIXED_BUFFER_LENGTH, decompressionBuffer, COMPRESSION_FIXED_BUFFER_LENGTH);
+            assert(decompBufSize < COMPRESSION_FIXED_BUFFER_LENGTH && "Buffer overflow");
+
+#if defined(LOG_DECOMP_TIMES)
+            nDecompTicks = CryGetTicks() - nDecompTicks;
+#endif  //LOG_DECOMP_TIMES
+
+#if !defined(NDEBUG)
+            size_t len =
+#endif
+                strnlen((const char*)decompressionBuffer, COMPRESSION_FIXED_BUFFER_LENGTH);
+            assert(len < COMPRESSION_FIXED_BUFFER_LENGTH && "Buffer not null-terminated");
+
+
+#if defined(LOG_DECOMP_TIMES)
+            nAllocTicks = CryGetTicks();
+#endif  //LOG_DECOMP_TIMES
+
+            outputString.assign((const char*)decompressionBuffer, (const char*)decompressionBuffer + decompBufSize);
+
+#if defined(LOG_DECOMP_TIMES)
+            nAllocTicks = CryGetTicks() - nAllocTicks;
+            nTotalTicks = CryGetTicks() - nTotalTicks;
+            LogDecompTimer(nTotalTicks, nDecompTicks, nAllocTicks);
+#endif  //LOG_DECOMP_TIMES
+        }
+        return outputString;
+    }
+    else
+    {
+        if (TranslatedText.psUtf8Uncompressed != NULL)
+        {
+            return *TranslatedText.psUtf8Uncompressed;
+        }
+        else
+        {
+            string emptyOutputString;
+            return emptyOutputString;
+        }
+    }
+}
+
+#ifndef _RELEASE
+//////////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::LocalizedStringsManagerWarning(const char* label, const char* message)
+{
+    if (!m_warnedAboutLabels[label])
+    {
+        CryWarning (VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Failed to localize label '%s' - %s", label, message);
+        m_warnedAboutLabels[label] = true;
+        m_haveWarnedAboutAtLeastOneLabel = true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::ListAndClearProblemLabels()
+{
+    if (m_haveWarnedAboutAtLeastOneLabel)
+    {
+        CryLog ("These labels caused localization problems:");
+        INDENT_LOG_DURING_SCOPE();
+
+        for (std::map<string, bool>::iterator iter = m_warnedAboutLabels.begin(); iter != m_warnedAboutLabels.end(); iter++)
+        {
+            CryLog ("%s", iter->first.c_str());
+        }
+
+        m_warnedAboutLabels.clear();
+        m_haveWarnedAboutAtLeastOneLabel = false;
+    }
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::LocalizeLabel(const char* sLabel, string& outLocalString, bool bEnglish)
+{
+    assert(sLabel);
+    if (!m_pLanguage || !sLabel)
+    {
+        return false;
+    }
+
+    // Label sign.
+    if (sLabel[0] == '@')
+    {
+        uint32 labelCRC32 = CCrc32::ComputeLowercase(sLabel + 1);   // skip @ character.
+        {
+            AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
+            SLocalizedStringEntry* entry = stl::find_in_map(m_pLanguage->m_keysMap, labelCRC32, NULL);
+
+            if (entry != NULL)
+            {
+                
+                string translatedText = entry->GetTranslatedText(m_pLanguage);
+                if ((bEnglish || translatedText.empty()) && entry->pEditorExtension != NULL)
+                {
+                    //assert(!"No Localization Text available!");
+                    outLocalString.assign(entry->pEditorExtension->sOriginalText);
+                    return true;
+                }
+                else
+                {
+                    outLocalString.swap(translatedText);
+                }
+                return true;
+            }
+            else
+            {
+                LocalizedStringsManagerWarning(sLabel, "entry not found in string table");
+            }
+        }
+    }
+    else
+    {
+        LocalizedStringsManagerWarning(sLabel, "must start with @ symbol");
+    }
+
+    outLocalString.assign(sLabel);
+
+    return false;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::GetEnglishString(const char* sKey, string& sLocalizedString)
+{
+    assert(sKey);
+    if (!m_pLanguage || !sKey)
+    {
+        return false;
+    }
+
+    // Label sign.
+    if (sKey[0] == '@')
+    {
+        uint32 keyCRC32 = CCrc32::ComputeLowercase(sKey + 1);
+        {
+            AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
+            SLocalizedStringEntry* entry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);   // skip @ character.
+            if (entry != NULL && entry->pEditorExtension != NULL)
+            {
+                sLocalizedString = entry->pEditorExtension->sOriginalText;
+                return true;
+            }
+            else
+            {
+                keyCRC32 = CCrc32::ComputeLowercase(sKey);
+                entry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
+                if (entry != NULL && entry->pEditorExtension != NULL)
+                {
+                    sLocalizedString = entry->pEditorExtension->sOriginalText;
+                    return true;
+                }
+                else
+                {
+                    // CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"Localized string for Label <%s> not found", sKey );
+                    sLocalizedString = sKey;
+                    return false;
+                }
+            }
+        }
+    }
+    else
+    {
+        // CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"Not a valid localized string Label <%s>, must start with @ symbol", sKey );
+    }
+
+    sLocalizedString = sKey;
+    return false;
+}
+
+bool CLocalizedStringsManager::IsLocalizedInfoFound(const char* sKey)
+{
+    if (!m_pLanguage)
+    {
+        return false;
+    }
+    uint32 keyCRC32 = CCrc32::ComputeLowercase(sKey);
+    {
+        AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
+        const SLocalizedStringEntry* entry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
+        return (entry != NULL);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::GetLocalizedInfoByKey(const char* sKey, SLocalizedInfoGame& outGameInfo)
+{
+    if (!m_pLanguage)
+    {
+        return false;
+    }
+
+    uint32 keyCRC32 = CCrc32::ComputeLowercase(sKey);
+    {
+        AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
+        const SLocalizedStringEntry* entry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
+        if (entry != NULL)
+        {
+            outGameInfo.szCharacterName = entry->sCharacterName;
+            outGameInfo.sUtf8TranslatedText = entry->GetTranslatedText(m_pLanguage);
+
+            outGameInfo.bUseSubtitle = (entry->flags & SLocalizedStringEntry::USE_SUBTITLE);
+
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::GetLocalizedInfoByKey(const char* sKey, SLocalizedSoundInfoGame* pOutSoundInfo)
+{
+    assert(sKey);
+    if (!m_pLanguage || !sKey || !pOutSoundInfo)
+    {
+        return false;
+    }
+
+    bool bResult = false;
+
+    uint32 keyCRC32 = CCrc32::ComputeLowercase(sKey);
+    {
+        AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
+        const SLocalizedStringEntry* pEntry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
+        if (pEntry != NULL)
+        {
+            bResult = true;
+
+            pOutSoundInfo->szCharacterName = pEntry->sCharacterName;
+            pOutSoundInfo->sUtf8TranslatedText = pEntry->GetTranslatedText(m_pLanguage);
+
+            //pOutSoundInfo->sOriginalActorLine = pEntry->sOriginalActorLine.c_str();
+            //pOutSoundInfo->sTranslatedActorLine = pEntry->swTranslatedActorLine.c_str();
+            //pOutSoundInfo->sOriginalText = pEntry->sOriginalText;
+            // original Character
+
+            pOutSoundInfo->sSoundEvent = pEntry->sPrototypeSoundEvent.c_str();
+            pOutSoundInfo->fVolume = CryConvertHalfToFloat(pEntry->fVolume);
+            pOutSoundInfo->fRadioRatio = CryConvertHalfToFloat(pEntry->fRadioRatio);
+            pOutSoundInfo->bUseSubtitle = (pEntry->flags & SLocalizedStringEntry::USE_SUBTITLE) != 0;
+            pOutSoundInfo->bIsDirectRadio = (pEntry->flags & SLocalizedStringEntry::IS_DIRECTED_RADIO) != 0;
+            pOutSoundInfo->bIsIntercepted = (pEntry->flags & SLocalizedStringEntry::IS_INTERCEPTED) != 0;
+
+            //SoundMoods
+            if (pOutSoundInfo->nNumSoundMoods >= pEntry->SoundMoods.size())
+            {
+                // enough space to copy data
+                int i = 0;
+                for (; i < pEntry->SoundMoods.size(); ++i)
+                {
+                    pOutSoundInfo->pSoundMoods[i].sName = pEntry->SoundMoods[i].sName;
+                    pOutSoundInfo->pSoundMoods[i].fValue = pEntry->SoundMoods[i].fValue;
+                }
+                // if mode is available fill it with default
+                for (; i < pOutSoundInfo->nNumSoundMoods; ++i)
+                {
+                    pOutSoundInfo->pSoundMoods[i].sName = "";
+                    pOutSoundInfo->pSoundMoods[i].fValue = 0.0f;
+                }
+                pOutSoundInfo->nNumSoundMoods = pEntry->SoundMoods.size();
+            }
+            else
+            {
+                // not enough memory, say what is needed
+                pOutSoundInfo->nNumSoundMoods = pEntry->SoundMoods.size();
+                bResult = (pOutSoundInfo->pSoundMoods == NULL); // only report error if memory was provided but is too small
+            }
+
+            //EventParameters
+            if (pOutSoundInfo->nNumEventParameters >= pEntry->EventParameters.size())
+            {
+                // enough space to copy data
+                int i = 0;
+                for (; i < pEntry->EventParameters.size(); ++i)
+                {
+                    pOutSoundInfo->pEventParameters[i].sName = pEntry->EventParameters[i].sName;
+                    pOutSoundInfo->pEventParameters[i].fValue = pEntry->EventParameters[i].fValue;
+                }
+                // if mode is available fill it with default
+                for (; i < pOutSoundInfo->nNumEventParameters; ++i)
+                {
+                    pOutSoundInfo->pEventParameters[i].sName = "";
+                    pOutSoundInfo->pEventParameters[i].fValue = 0.0f;
+                }
+                pOutSoundInfo->nNumEventParameters = pEntry->EventParameters.size();
+            }
+            else
+            {
+                // not enough memory, say what is needed
+                pOutSoundInfo->nNumEventParameters = pEntry->EventParameters.size();
+                bResult = (pOutSoundInfo->pSoundMoods == NULL); // only report error if memory was provided but is too small
+            }
+        }
+    }
+
+    return bResult;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CLocalizedStringsManager::GetLocalizedStringCount()
+{
+    if (!m_pLanguage)
+    {
+        return 0;
+    }
+    return m_pLanguage->m_vLocalizedStrings.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoGame& outGameInfo)
+{
+    if (!m_pLanguage)
+    {
+        return false;
+    }
+    const std::vector<SLocalizedStringEntry*>& entryVec = m_pLanguage->m_vLocalizedStrings;
+    if (nIndex < 0 || nIndex >= (int)entryVec.size())
+    {
+        return false;
+    }
+    const SLocalizedStringEntry* pEntry = entryVec[nIndex];
+
+    outGameInfo.szCharacterName = pEntry->sCharacterName;
+    outGameInfo.sUtf8TranslatedText = pEntry->GetTranslatedText(m_pLanguage);
+
+    outGameInfo.bUseSubtitle = (pEntry->flags & SLocalizedStringEntry::USE_SUBTITLE);
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoEditor& outEditorInfo)
+{
+    if (!m_pLanguage)
+    {
+        return false;
+    }
+    const std::vector<SLocalizedStringEntry*>& entryVec = m_pLanguage->m_vLocalizedStrings;
+    if (nIndex < 0 || nIndex >= (int)entryVec.size())
+    {
+        return false;
+    }
+    const SLocalizedStringEntry* pEntry = entryVec[nIndex];
+    outEditorInfo.szCharacterName = pEntry->sCharacterName;
+    outEditorInfo.sUtf8TranslatedText = pEntry->GetTranslatedText(m_pLanguage);
+
+    assert(pEntry->pEditorExtension != NULL);
+
+    outEditorInfo.sKey = pEntry->pEditorExtension->sKey;
+
+    outEditorInfo.sOriginalActorLine = pEntry->pEditorExtension->sOriginalActorLine;
+    outEditorInfo.sUtf8TranslatedActorLine = pEntry->pEditorExtension->sUtf8TranslatedActorLine;
+
+    //outEditorInfo.sOriginalText = pEntry->sOriginalText;
+    outEditorInfo.sOriginalCharacterName = pEntry->pEditorExtension->sOriginalCharacterName;
+
+    outEditorInfo.nRow = pEntry->pEditorExtension->nRow;
+    outEditorInfo.bUseSubtitle = (pEntry->flags & SLocalizedStringEntry::USE_SUBTITLE);
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLocalizedStringsManager::GetSubtitle(const char* sKeyOrLabel, string& outSubtitle, bool bForceSubtitle)
+{
+    assert(sKeyOrLabel);
+    if (!m_pLanguage || !sKeyOrLabel || !*sKeyOrLabel)
+    {
+        return false;
+    }
+    if (*sKeyOrLabel == '@')
+    {
+        ++sKeyOrLabel;
+    }
+
+    uint32 keyCRC32 = CCrc32::ComputeLowercase(sKeyOrLabel);
+    {
+        AutoLock lock(m_cs);    //Lock here, to prevent strings etc being modified underneath this lookup
+        const SLocalizedStringEntry* pEntry = stl::find_in_map(m_pLanguage->m_keysMap, keyCRC32, NULL);
+        if (pEntry != NULL)
+        {
+            if ((pEntry->flags & SLocalizedStringEntry::USE_SUBTITLE) == false && !bForceSubtitle)
+            {
+                return false;
+            }
+
+            // TODO verify that no fallback is needed
+
+            outSubtitle = pEntry->GetTranslatedText(m_pLanguage);
+
+            if (outSubtitle.empty() == true)
+            {
+                if (pEntry->pEditorExtension != NULL && pEntry->pEditorExtension->sUtf8TranslatedActorLine.empty() == false)
+                {
+                    outSubtitle = pEntry->pEditorExtension->sUtf8TranslatedActorLine;
+                }
+                else if (pEntry->pEditorExtension != NULL && pEntry->pEditorExtension->sOriginalText.empty() == false)
+                {
+                    outSubtitle = pEntry->pEditorExtension->sOriginalText;
+                }
+                else if (pEntry->pEditorExtension != NULL && pEntry->pEditorExtension->sOriginalActorLine.empty() == false)
+                {
+                    outSubtitle = pEntry->pEditorExtension->sOriginalActorLine;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}
+
+template<typename StringClass, typename CharType>
+void InternalFormatStringMessage(StringClass& outString, const StringClass& sString, const CharType** sParams, int nParams)
+{
+    static const CharType token = (CharType) '%';
+    static const CharType tokens1[2] = { token, (CharType) '\0' };
+    static const CharType tokens2[3] = { token, token, (CharType) '\0' };
+
+    int maxArgUsed = 0;
+    int lastPos = 0;
+    int curPos = 0;
+    const int sourceLen = sString.length();
+    while (true)
+    {
+        int foundPos = sString.find(token, curPos);
+        if (foundPos != string::npos)
+        {
+            if (foundPos + 1 < sourceLen)
+            {
+                const int nArg = sString[foundPos + 1] - '1';
+                if (nArg >= 0 && nArg <= 9)
+                {
+                    if (nArg < nParams)
+                    {
+                        outString.append(sString, lastPos, foundPos - lastPos);
+                        outString.append(sParams[nArg]);
+                        curPos = foundPos + 2;
+                        lastPos = curPos;
+                        maxArgUsed = std::max(maxArgUsed, nArg);
+                    }
+                    else
+                    {
+                        StringClass tmp (sString);
+                        tmp.replace(tokens1, tokens2);
+                        if constexpr (sizeof(*tmp.c_str()) == sizeof(char))
+                        {
+                            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Parameter for argument %d is missing. [%s]", nArg + 1, (const char*)tmp.c_str());
+                        }
+                        else
+                        {
+                            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Parameter for argument %d is missing. [%S]", nArg + 1, (const wchar_t*)tmp.c_str());
+                        }
+                        curPos = foundPos + 1;
+                    }
+                }
+                else
+                {
+                    curPos = foundPos + 1;
+                }
+            }
+            else
+            {
+                curPos = foundPos + 1;
+            }
+        }
+        else
+        {
+            outString.append(sString, lastPos, sourceLen - lastPos);
+            break;
+        }
+    }
+}
+
+template<typename StringClass, typename CharType>
+void InternalFormatStringMessage(StringClass& outString, const StringClass& sString, const CharType* param1, const CharType* param2 = 0, const CharType* param3 = 0, const CharType* param4 = 0)
+{
+    static const int MAX_PARAMS = 4;
+    const CharType* params[MAX_PARAMS] = { param1, param2, param3, param4 };
+    int nParams = 0;
+    while (nParams < MAX_PARAMS && params[nParams])
+    {
+        ++nParams;
+    }
+    InternalFormatStringMessage(outString, sString, params, nParams);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::FormatStringMessage_List(string& outString, const string& sString, const char** sParams, int nParams)
+{
+    InternalFormatStringMessage(outString, sString, sParams, nParams);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLocalizedStringsManager::FormatStringMessage(string& outString, const string& sString, const char* param1, const char* param2, const char* param3, const char* param4)
+{
+    InternalFormatStringMessage(outString, sString, param1, param2, param3, param4);
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CLocalizedStringsManager::GetMemoryUsage(ICrySizer* pSizer)
+{
+    pSizer->AddObject(this, sizeof(*this));
+    pSizer->AddObject(m_languages);
+    pSizer->AddObject(m_prototypeEvents);
+    pSizer->AddObject(m_characterNameSet);
+    pSizer->AddObject(m_pLanguage);
+
+    return 0;
+}
+
+#if defined (WIN32) || defined(WIN64)
+namespace
+{
+    struct LanguageID
+    {
+        const char*   language;
+        unsigned long lcID;
+    };
+
+    LanguageID languageIDArray[] =
+    {
+        { "en-US", 0x0409 },  // English (USA)
+        { "en-GB", 0x0809 },  // English (UK)
+        { "de-DE", 0x0407 },  // German
+        { "ru-RU", 0x0419 },  // Russian (Russia)
+        { "pl-PL", 0x0415 },  // Polish
+        { "tr-TR", 0x041f },  // Turkish
+        { "es-ES", 0x0c0a },  // Spanish (Spain)
+        { "es-MX", 0x080a },  // Spanish (Mexico)
+        { "fr-FR", 0x040c },  // French (France)
+        { "fr-CA", 0x0c0c },  // French (Canada)
+        { "it-IT", 0x0410 },  // Italian
+        { "pt-PT", 0x0816 },  // Portugese (Portugal)
+        { "pt-BR", 0x0416 },  // Portugese (Brazil)
+        { "ja-JP", 0x0411 },  // Japanese
+        { "ko-KR", 0x0412 },  // Korean
+        { "zh-CHT", 0x0804 }, // Traditional Chinese
+        { "zh-CHS", 0x0804 }, // Simplified Chinese
+        { "nl-NL", 0x0413 },  // Dutch (The Netherlands)
+        { "fi-FI", 0x040b },  // Finnish
+        { "sv-SE", 0x041d },  // Swedish
+        { "cs-CZ", 0x0405 },  // Czech 
+        { "no-NO", 0x0414 },  // Norwegian (Norway)
+        { "ar-SA", 0x0401 },  // Arabic (Saudi Arabia)
+        { "da-DK", 0x0406 },  // Danish (Denmark)
+    };
+
+    const size_t numLanguagesIDs = sizeof(languageIDArray) / sizeof(languageIDArray[0]);
+
+    LanguageID GetLanguageID(const char* language)
+    {
+        // default is English (US)
+        const LanguageID defaultLanguage = { "en-US", 0x0409 };
+        for (int i = 0; i < numLanguagesIDs; ++i)
+        {
+            if (_stricmp(language, languageIDArray[i].language) == 0)
+            {
+                return languageIDArray[i];
+            }
+        }
+        return defaultLanguage;
+    }
+
+    LanguageID g_currentLanguageID = { 0, 0 };
+};
+#endif
+
+void CLocalizedStringsManager::InternalSetCurrentLanguage(CLocalizedStringsManager::SLanguage* pLanguage)
+{
+    m_pLanguage = pLanguage;
+#if defined (WIN32) || defined(WIN64)
+    if (m_pLanguage != 0)
+    {
+        g_currentLanguageID = GetLanguageID(m_pLanguage->sLanguage);
+    }
+    else
+    {
+        g_currentLanguageID.language = 0;
+        g_currentLanguageID.lcID = 0;
+    }
+#endif
+    // TODO: on Linux based systems we should now set the locale
+    // Enabling this on windows something seems to get corrupted...
+    // on Windows we always use Windows Platform Functions, which use the lcid
+#if 0
+    if (g_currentLanguageID.language)
+    {
+        const char* currentLocale = setlocale(LC_ALL, 0);
+        if (0 == setlocale(LC_ALL, g_currentLanguageID.language))
+        {
+            setlocale(LC_ALL, currentLocale);
+        }
+    }
+    else
+    {
+        setlocale(LC_ALL, "C");
+    }
+#endif
+    ReloadData();
+    if (gEnv->pCryFont)
+    {
+        gEnv->pCryFont->OnLanguageChanged();
+    }
+}
+
+void CLocalizedStringsManager::LocalizeDuration(int seconds, string& outDurationString)
+{
+    int s = seconds;
+    int d, h, m;
+    d  = s / 86400;
+    s -= d * 86400;
+    h = s / 3600;
+    s -= h * 3600;
+    m = s / 60;
+    s = s - m * 60;
+    string str;
+    if (d > 1)
+    {
+        str.Format("%d @ui_days %02d:%02d:%02d", d, h, m, s);
+    }
+    else if (d > 0)
+    {
+        str.Format("%d @ui_day %02d:%02d:%02d", d, h, m, s);
+    }
+    else if (h > 0)
+    {
+        str.Format("%02d:%02d:%02d", h, m, s);
+    }
+    else
+    {
+        str.Format("%02d:%02d", m, s);
+    }
+    LocalizeString_s(str, outDurationString);
+}
+
+void CLocalizedStringsManager::LocalizeNumber(int number, string& outNumberString)
+{
+    if (number == 0)
+    {
+        outNumberString.assign("0");
+        return;
+    }
+
+    outNumberString.assign("");
+
+    int n = abs(number);
+    string separator;
+    CryFixedStringT<64> tmp;
+    LocalizeString_ch("@ui_thousand_separator", separator);
+    while (n > 0)
+    {
+        int a = n / 1000;
+        int b = n - (a * 1000);
+        if (a > 0)
+        {
+            tmp.Format("%s%03d%s", separator.c_str(), b, tmp.c_str());
+        }
+        else
+        {
+            tmp.Format("%d%s", b, tmp.c_str());
+        }
+        n = a;
+    }
+
+    if (number < 0)
+    {
+        tmp.Format("-%s", tmp.c_str());
+    }
+
+    outNumberString.assign(tmp.c_str());
+}
+
+void CLocalizedStringsManager::LocalizeNumber_Decimal(float number, int decimals, string& outNumberString)
+{
+    if (number == 0.0f)
+    {
+        CryFixedStringT<64> tmp;
+        tmp.Format("%.*f", decimals, number);
+        outNumberString.assign(tmp.c_str());
+        return;
+    }
+
+    outNumberString.assign("");
+
+    string commaSeparator;
+    LocalizeString_ch("@ui_decimal_separator", commaSeparator);
+    float f = number > 0.0f ? number : -number;
+    int d = (int)f;
+
+    string intPart;
+    LocalizeNumber(d, intPart);
+
+    float decimalsOnly = f - (float)d;
+
+    int decimalsAsInt = aznumeric_cast<int>(int_round(decimalsOnly * pow(10.0f, decimals)));
+
+    CryFixedStringT<64> tmp;
+    tmp.Format("%s%s%0*d", intPart.c_str(), commaSeparator.c_str(), decimals, decimalsAsInt);
+
+    outNumberString.assign(tmp.c_str());
+}
+
+bool CLocalizedStringsManager::ProjectUsesLocalization() const
+{
+    ICVar* pCVar = gEnv->pConsole->GetCVar("sys_localization_folder");
+    CRY_ASSERT_MESSAGE(pCVar,
+        "Console variable 'sys_localization_folder' not defined! "
+        "This was previously defined at startup in CSystem::CreateSystemVars.");
+
+    // If game.cfg didn't provide a sys_localization_folder, we'll assume that
+    // the project doesn't want to use localization features.
+    return (pCVar->GetFlags() & VF_WASINCONFIG) != 0;
+}
+
+#if defined (WIN32) || defined(WIN64)
+namespace
+{
+    void UnixTimeToFileTime(time_t unixtime, FILETIME* filetime)
+    {
+        LONGLONG longlong = Int32x32To64(unixtime, 10000000) + 116444736000000000;
+        filetime->dwLowDateTime = (DWORD) longlong;
+        filetime->dwHighDateTime = (DWORD)(longlong >> 32);
+    }
+
+    void UnixTimeToSystemTime(time_t unixtime, SYSTEMTIME* systemtime)
+    {
+        FILETIME filetime;
+        UnixTimeToFileTime(unixtime, &filetime);
+        FileTimeToSystemTime(&filetime, systemtime);
+    }
+
+    time_t UnixTimeFromFileTime(const FILETIME* filetime)
+    {
+        LONGLONG longlong = filetime->dwHighDateTime;
+        longlong <<= 32;
+        longlong |= filetime->dwLowDateTime;
+        longlong -= 116444736000000000;
+        return longlong / 10000000;
+    }
+
+    time_t UnixTimeFromSystemTime(const SYSTEMTIME* systemtime)
+    {
+        // convert systemtime to filetime
+        FILETIME filetime;
+        SystemTimeToFileTime(systemtime, &filetime);
+        // convert filetime to unixtime
+        time_t unixtime = UnixTimeFromFileTime(&filetime);
+        return unixtime;
+    }
+};
+
+void CLocalizedStringsManager::LocalizeTime(time_t t, bool bMakeLocalTime, bool bShowSeconds, string& outTimeString)
+{
+    if (bMakeLocalTime)
+    {
+        struct tm thetime;
+        localtime_s(&thetime, &t);
+        t = gEnv->pTimer->DateToSecondsUTC(thetime);
+    }
+    outTimeString.resize(0);
+    LCID lcID = g_currentLanguageID.lcID ? g_currentLanguageID.lcID : LOCALE_USER_DEFAULT;
+    DWORD flags = bShowSeconds == false ? TIME_NOSECONDS : 0;
+    SYSTEMTIME systemTime;
+    UnixTimeToSystemTime(t, &systemTime);
+    int len = ::GetTimeFormatW(lcID, flags, &systemTime, 0, 0, 0);
+    if (len > 0)
+    {
+        // len includes terminating null!
+        CryFixedWStringT<256> tmpString;
+        tmpString.resize(len);
+        ::GetTimeFormatW(lcID, flags, &systemTime, 0, (wchar_t*) tmpString.c_str(), len);
+        Unicode::Convert(outTimeString, tmpString);
+    }
+}
+
+void CLocalizedStringsManager::LocalizeDate(time_t t, bool bMakeLocalTime, bool bShort, bool bIncludeWeekday, string& outDateString)
+{
+    if (bMakeLocalTime)
+    {
+        struct tm thetime;
+        localtime_s(&thetime, &t);
+        t = gEnv->pTimer->DateToSecondsUTC(thetime);
+    }
+    outDateString.resize(0);
+    LCID lcID = g_currentLanguageID.lcID ? g_currentLanguageID.lcID : LOCALE_USER_DEFAULT;
+    SYSTEMTIME systemTime;
+    UnixTimeToSystemTime(t, &systemTime);
+
+    // len includes terminating null!
+    CryFixedWStringT<256> tmpString;
+
+    if (bIncludeWeekday)
+    {
+        // Get name of day
+        int len = ::GetDateFormatW(lcID, 0, &systemTime, L"ddd", 0, 0);
+        if (len > 0)
+        {
+            // len includes terminating null!
+            tmpString.resize(len);
+            ::GetDateFormatW(lcID, 0, &systemTime, L"ddd", (wchar_t*) tmpString.c_str(), len);
+            string utf8;
+            Unicode::Convert(utf8, tmpString);
+            outDateString.append(utf8);
+            outDateString.append(" ");
+        }
+    }
+    DWORD flags = bShort ? DATE_SHORTDATE : DATE_LONGDATE;
+    int len = ::GetDateFormatW(lcID, flags, &systemTime, 0, 0, 0);
+    if (len > 0)
+    {
+        // len includes terminating null!
+        tmpString.resize(len);
+        ::GetDateFormatW(lcID, flags, &systemTime, 0, (wchar_t*) tmpString.c_str(), len);
+        string utf8;
+        Unicode::Convert(utf8, tmpString);
+        outDateString.append(utf8);
+    }
+}
+
+#else // #if defined (WIN32) || defined(WIN64)
+
+void CLocalizedStringsManager::LocalizeTime(time_t t, bool bMakeLocalTime, bool bShowSeconds, string& outTimeString)
+{
+    struct tm theTime;
+    if (bMakeLocalTime)
+    {
+#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
+        localtime_s(&theTime, &t);
+#else
+        theTime = *localtime(&t);
+#endif
+    }
+    else
+    {
+#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
+        gmtime_s(&theTime, &t);
+#else
+        theTime = *gmtime(&t);
+#endif
+    }
+
+    wchar_t buf[256];
+    const size_t bufSize = sizeof(buf) / sizeof(buf[0]);
+    wcsftime(buf, bufSize, bShowSeconds ? L"%#X" : L"%X", &theTime);
+    buf[bufSize - 1] = 0;
+    Unicode::Convert(outTimeString, buf);
+}
+
+void CLocalizedStringsManager::LocalizeDate(time_t t, bool bMakeLocalTime, bool bShort, bool bIncludeWeekday, string& outDateString)
+{
+    struct tm theTime;
+    if (bMakeLocalTime)
+    {
+#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
+        localtime_s(&theTime, &t);
+#else
+        theTime = *localtime(&t);
+#endif
+    }
+    else
+    {
+#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
+        gmtime_s(&theTime, &t);
+#else
+        theTime = *gmtime(&t);
+#endif
+    }
+
+    wchar_t buf[256];
+    const size_t bufSize = sizeof(buf) / sizeof(buf[0]);
+    const wchar_t* format = bShort ? (bIncludeWeekday ? L"%a %x" : L"%x") : L"%#x"; // long format always contains Weekday name
+    wcsftime(buf, bufSize, format, &theTime);
+    buf[bufSize - 1] = 0;
+    Unicode::Convert(outDateString, buf);
+}
+
+
+
+#endif
+
+
diff --git a/Code/Legacy/CrySystem/LocalizedStringManager.h b/Code/Legacy/CrySystem/LocalizedStringManager.h
new file mode 100644
index 0000000000..a0ceaf5fbd
--- /dev/null
+++ b/Code/Legacy/CrySystem/LocalizedStringManager.h
@@ -0,0 +1,315 @@
+/*
+ * 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 <ILocalizationManager.h>
+#include <StlUtils.h>
+#include <VectorMap.h>
+#include <AzCore/std/containers/map.h>
+
+#include "Huffman.h"
+
+//////////////////////////////////////////////////////////////////////////
+/*
+    Manage Localization Data
+*/
+class CLocalizedStringsManager
+    : public ILocalizationManager
+    , public ISystemEventListener
+{
+public:
+    typedef std::vector<string> TLocalizationTagVec;
+
+    constexpr const static size_t LOADING_FIXED_STRING_LENGTH = 2048;
+    constexpr const static size_t COMPRESSION_FIXED_BUFFER_LENGTH = 6144;
+
+    CLocalizedStringsManager(ISystem* pSystem);
+    virtual ~CLocalizedStringsManager();
+
+    // ILocalizationManager
+    const char* LangNameFromPILID(const ILocalizationManager::EPlatformIndependentLanguageID id);
+    ILocalizationManager::EPlatformIndependentLanguageID PILIDFromLangName(AZStd::string langName) override;
+    ILocalizationManager::EPlatformIndependentLanguageID GetSystemLanguage() override;
+    ILocalizationManager::TLocalizationBitfield MaskSystemLanguagesFromSupportedLocalizations(const ILocalizationManager::TLocalizationBitfield systemLanguages);
+    ILocalizationManager::TLocalizationBitfield IsLanguageSupported(const ILocalizationManager::EPlatformIndependentLanguageID id);
+
+    const char* GetLanguage() override;
+    bool SetLanguage(const char* sLanguage) override;
+
+    int GetLocalizationFormat() const override;
+    virtual AZStd::string GetLocalizedSubtitleFilePath(const AZStd::string& localVideoPath, const AZStd::string& subtitleFileExtension) const override;
+    virtual AZStd::string GetLocalizedLocXMLFilePath(const AZStd::string& localXmlPath) const override;
+    bool InitLocalizationData(const char* sFileName, bool bReload = false);
+    bool RequestLoadLocalizationDataByTag(const char* sTag);
+    bool LoadLocalizationDataByTag(const char* sTag, bool bReload = false);
+    bool ReleaseLocalizationDataByTag(const char* sTag);
+
+    bool LoadAllLocalizationData(bool bReload = false) override;
+    bool LoadExcelXmlSpreadsheet(const char* sFileName, bool bReload = false) override;
+    void ReloadData() override;
+    void FreeData();
+
+    bool LocalizeString_s(const string& sString, string& outLocalizedString, bool bEnglish = false) override;
+    bool LocalizeString_ch(const char* sString, string& outLocalizedString, bool bEnglish = false) override;
+
+    void LocalizeAndSubstituteInternal(AZStd::string& locString, const AZStd::vector<AZStd::string>& keys, const AZStd::vector<AZStd::string>& values) override;
+    bool LocalizeLabel(const char* sLabel, string& outLocalizedString, bool bEnglish = false) override;
+    bool IsLocalizedInfoFound(const char* sKey);
+    bool GetLocalizedInfoByKey(const char* sKey, SLocalizedInfoGame& outGameInfo);
+    bool GetLocalizedInfoByKey(const char* sKey, SLocalizedSoundInfoGame* pOutSoundInfoGame);
+    int  GetLocalizedStringCount();
+    bool GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoGame& outGameInfo);
+    bool GetLocalizedInfoByIndex(int nIndex, SLocalizedInfoEditor& outEditorInfo);
+
+    bool GetEnglishString(const char* sKey, string& sLocalizedString) override;
+    bool GetSubtitle(const char* sKeyOrLabel, string& outSubtitle, bool bForceSubtitle = false) override;
+
+    void FormatStringMessage_List(string& outString, const string& sString, const char** sParams, int nParams) override;
+    void FormatStringMessage(string& outString, const string& sString, const char* param1, const char* param2 = 0, const char* param3 = 0, const char* param4 = 0) override;
+
+    void LocalizeTime(time_t t, bool bMakeLocalTime, bool bShowSeconds, string& outTimeString) override;
+    void LocalizeDate(time_t t, bool bMakeLocalTime, bool bShort, bool bIncludeWeekday, string& outDateString) override;
+    void LocalizeDuration(int seconds, string& outDurationString) override;
+    void LocalizeNumber(int number, string& outNumberString) override;
+    void LocalizeNumber_Decimal(float number, int decimals, string& outNumberString) override;
+
+    bool ProjectUsesLocalization() const override;
+    // ~ILocalizationManager
+
+    // ISystemEventManager
+    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
+    // ~ISystemEventManager
+
+    int GetMemoryUsage(ICrySizer* pSizer);
+
+    void GetLoadedTags(TLocalizationTagVec& tagVec);
+    void FreeLocalizationData();
+
+private:
+    void SetAvailableLocalizationsBitfield(const ILocalizationManager::TLocalizationBitfield availableLocalizations);
+
+    bool LocalizeStringInternal(const char* pStr, size_t len, string& outLocalizedString, bool bEnglish);
+
+    bool DoLoadExcelXmlSpreadsheet(const char* sFileName, uint8 tagID, bool bReload);
+    typedef bool(CLocalizedStringsManager::*LoadFunc)(const char*, uint8, bool);
+    bool DoLoadAGSXmlDocument(const char* sFileName, uint8 tagID, bool bReload);
+    LoadFunc GetLoadFunction() const;
+
+    struct SLocalizedStringEntryEditorExtension
+    {
+        string  sKey;                                           // Map key text equivalent (without @)
+        string  sOriginalActorLine;             // english text
+        string  sUtf8TranslatedActorLine;       // localized text
+        string  sOriginalText;                      // subtitle. if empty, uses English text
+        string  sOriginalCharacterName;     // english character name speaking via XML asset
+
+        unsigned int nRow;                              // Number of row in XML file
+
+        void GetMemoryUsage(ICrySizer* pSizer) const
+        {
+            pSizer->AddObject(this, sizeof(*this));
+
+            pSizer->AddObject(sKey);
+            pSizer->AddObject(sOriginalActorLine);
+            pSizer->AddObject(sUtf8TranslatedActorLine);
+            pSizer->AddObject(sOriginalText);
+            pSizer->AddObject(sOriginalCharacterName);
+        }
+    };
+
+    struct SLanguage;
+
+    //#define LOG_DECOMP_TIMES              //If defined, will log decompression times to a file
+
+    struct SLocalizedStringEntry
+    {
+        //Flags
+        enum
+        {
+            USE_SUBTITLE        = BIT(0),       //should a subtitle displayed for this key?
+            IS_DIRECTED_RADIO   = BIT(1), //should the radio receiving hud be displayed?
+            IS_INTERCEPTED      = BIT(2), //should the radio receiving hud show the interception display?
+            IS_COMPRESSED           = BIT(3),   //Translated text is compressed
+        };
+
+        union trans_text
+        {
+            string*     psUtf8Uncompressed;
+            uint8*      szCompressed;       // Note that no size information is stored. This is for struct size optimization and unfortunately renders the size info inaccurate.
+        };
+
+        string sCharacterName;  // character name speaking via XML asset
+        trans_text TranslatedText;  // Subtitle of this line
+
+        // audio specific part
+        string      sPrototypeSoundEvent;           // associated sound event prototype (radio, ...)
+        CryHalf     fVolume;
+        CryHalf     fRadioRatio;
+        // SoundMoods
+        DynArray<SLocalizedAdvancesSoundEntry> SoundMoods;
+        // EventParameters
+        DynArray<SLocalizedAdvancesSoundEntry> EventParameters;
+        // ~audio specific part
+
+        // subtitle & radio flags
+        uint8       flags;
+
+        // Index of Huffman tree for translated text. -1 = no tree assigned (error)
+        int8        huffmanTreeIndex;
+
+        uint8       nTagID;
+
+        // bool    bDependentTranslation; // if the english/localized text contains other localization labels
+
+        //Additional information for Sandbox. Null in game
+        SLocalizedStringEntryEditorExtension* pEditorExtension;
+
+        SLocalizedStringEntry()
+            : flags(0)
+            , huffmanTreeIndex(-1)
+            , pEditorExtension(NULL)
+        {
+            TranslatedText.psUtf8Uncompressed = NULL;
+        };
+        ~SLocalizedStringEntry()
+        {
+            SAFE_DELETE(pEditorExtension);
+            if ((flags & IS_COMPRESSED) == 0)
+            {
+                SAFE_DELETE(TranslatedText.psUtf8Uncompressed);
+            }
+            else
+            {
+                SAFE_DELETE_ARRAY(TranslatedText.szCompressed);
+            }
+        };
+
+        string GetTranslatedText(const SLanguage* pLanguage) const;
+
+        void GetMemoryUsage(ICrySizer* pSizer) const
+        {
+            pSizer->AddObject(this, sizeof(*this));
+
+            pSizer->AddObject(sCharacterName);
+
+            if ((flags & IS_COMPRESSED) == 0 && TranslatedText.psUtf8Uncompressed != NULL)   //Number of bytes stored for compressed text is unknown, which throws this GetMemoryUsage off
+            {
+                pSizer->AddObject(*TranslatedText.psUtf8Uncompressed);
+            }
+
+            pSizer->AddObject(sPrototypeSoundEvent);
+
+            pSizer->AddObject(SoundMoods);
+            pSizer->AddObject(EventParameters);
+
+            if (pEditorExtension != NULL)
+            {
+                pEditorExtension->GetMemoryUsage(pSizer);
+            }
+        }
+    };
+
+    //Keys as CRC32. Strings previously, but these proved too large
+    typedef VectorMap<uint32, SLocalizedStringEntry*>   StringsKeyMap;
+
+    struct SLanguage
+    {
+        typedef std::vector<SLocalizedStringEntry*> TLocalizedStringEntries;
+        typedef std::vector<HuffmanCoder*> THuffmanCoders;
+
+        string sLanguage;
+        StringsKeyMap m_keysMap;
+        TLocalizedStringEntries m_vLocalizedStrings;
+        THuffmanCoders m_vEncoders;
+
+        void GetMemoryUsage(ICrySizer* pSizer) const
+        {
+            pSizer->AddObject(this, sizeof(*this));
+            pSizer->AddObject(sLanguage);
+            pSizer->AddObject(m_vLocalizedStrings);
+            pSizer->AddObject(m_keysMap);
+            pSizer->AddObject(m_vEncoders);
+        }
+    };
+
+    struct SFileInfo
+    {
+        bool    bDataStripping;
+        uint8 nTagID;
+    };
+
+#ifndef _RELEASE
+    std::map<string, bool> m_warnedAboutLabels;
+    bool m_haveWarnedAboutAtLeastOneLabel;
+
+    void LocalizedStringsManagerWarning(const char* label, const char* message);
+    void ListAndClearProblemLabels();
+#else
+    inline void LocalizedStringsManagerWarning(...) {};
+    inline void ListAndClearProblemLabels() {};
+#endif
+
+    void AddLocalizedString(SLanguage* pLanguage, SLocalizedStringEntry* pEntry, const uint32 keyCRC32);
+    void AddControl(int nKey);
+    //////////////////////////////////////////////////////////////////////////
+    void ParseFirstLine(IXmlTableReader* pXmlTableReader, char* nCellIndexToType, std::map<int, string>& SoundMoodIndex, std::map<int, string>& EventParameterIndex);
+    void InternalSetCurrentLanguage(SLanguage* pLanguage);
+    ISystem* m_pSystem;
+    // Pointer to the current language.
+    SLanguage* m_pLanguage;
+
+    // all loaded Localization Files
+    typedef std::pair<string, SFileInfo> pairFileName;
+    typedef std::map<string, SFileInfo> tmapFilenames;
+    tmapFilenames m_loadedTables;
+
+
+    // filenames per tag
+    typedef std::vector<string> TStringVec;
+    struct STag
+    {
+        TStringVec  filenames;
+        uint8               id;
+        bool                loaded;
+    };
+    typedef std::map<string, STag> TTagFileNames;
+    TTagFileNames m_tagFileNames;
+    TStringVec m_tagLoadRequests;
+
+    // Array of loaded languages.
+    std::vector<SLanguage*> m_languages;
+
+    typedef std::set<string> PrototypeSoundEvents;
+    PrototypeSoundEvents m_prototypeEvents;  // this set is purely used for clever string/string assigning to save memory
+
+    struct less_strcmp
+    {
+        bool operator()(const string& left, const string& right) const
+        {
+            return strcmp(left.c_str(), right.c_str()) < 0;
+        }
+    };
+
+    typedef std::set<string, less_strcmp> CharacterNameSet;
+    CharacterNameSet m_characterNameSet; // this set is purely used for clever string/string assigning to save memory
+
+    // CVARs
+    int m_cvarLocalizationDebug;
+    int m_cvarLocalizationEncode;   //Encode/Compress translated text to save memory
+    int m_cvarLocalizationFormat;
+
+    //The localizations that are available for this SKU. Used for determining what to show on a language select screen or whether to show one at all
+    TLocalizationBitfield m_availableLocalizations;
+
+    //Lock for
+    mutable CryCriticalSection m_cs;
+    typedef CryAutoCriticalSection AutoLock;
+};
+
+
diff --git a/Code/Legacy/CrySystem/Log.cpp b/Code/Legacy/CrySystem/Log.cpp
new file mode 100644
index 0000000000..360b050753
--- /dev/null
+++ b/Code/Legacy/CrySystem/Log.cpp
@@ -0,0 +1,1546 @@
+/*
+ * 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 : Log related functions
+
+
+#include "CrySystem_precompiled.h"
+#include "Log.h"
+
+//this should not be included here
+#include <IConsole.h>
+#include <ISystem.h>
+#include "System.h"
+#include "CryPath.h"                    // PathUtil::ReplaceExtension()
+#include "UnicodeFunctions.h"
+
+#include <AzFramework/IO/FileOperations.h>
+#include <AzCore/IO/FileIO.h>
+#include <AzCore/IO/Path/Path.h>
+
+#ifdef WIN32
+#include <time.h>
+#endif
+
+#if defined(LINUX) || defined(APPLE)
+#include <syslog.h>
+#endif
+
+
+// Only accept logging from the main thread.
+#ifdef WIN32
+
+#define THREAD_SAFE_LOG
+//#define THREAD_SAFE_LOG  CryAutoCriticalSection scope_lock(m_logCriticalSection);
+
+#else
+#define THREAD_SAFE_LOG
+#endif //WIN32
+
+#define LOG_BACKUP_PATH "@log@/LogBackups"
+
+#if defined(IOS)
+#include <AzFramework/Utils/SystemUtilsApple.h>
+#endif
+
+//////////////////////////////////////////////////////////////////////
+namespace LogCVars
+{
+    float s_log_tick = 0;
+    int max_backup_directory_size_mb = 200; //200MB default
+};
+
+#ifndef _RELEASE
+static CLog::LogStringType indentString ("    ");
+#endif
+
+//////////////////////////////////////////////////////////////////////
+CLog::CLog(ISystem* pSystem)
+{
+    memset(m_szFilename, 0, MAX_FILENAME_SIZE);
+    memset(m_sBackupFilename, 0, MAX_FILENAME_SIZE);
+    //memset(m_szTemp,0,MAX_TEMP_LENGTH_SIZE);
+    m_pSystem = pSystem;
+    m_pLogVerbosity = 0;
+    m_pLogWriteToFile = 0;
+    m_pLogWriteToFileVerbosity = 0;
+    m_pLogVerbosityOverridesWriteToFile = 0;
+    m_pLogIncludeTime = 0;
+    m_pLogSpamDelay = 0;
+    m_pLogModule = 0;
+    m_fLastLoadingUpdateTime = -1.f;    // for streaming engine update
+    m_backupLogs = true;
+
+#if defined(SUPPORT_LOG_IDENTER)
+    m_indentation = 0;
+    BuildIndentString();
+    m_topIndenter = NULL;
+#endif
+
+    m_nMainThreadId = CryGetCurrentThreadId();
+
+#if defined(KEEP_LOG_FILE_OPEN)
+    m_bFirstLine = true;
+#endif
+
+    m_iLastHistoryItem = 0;
+    memset(m_history, 0, sizeof(m_history));
+
+    CheckAndPruneBackupLogs();
+
+}
+
+void CLog::RegisterConsoleVariables()
+{
+    IConsole* console = m_pSystem->GetIConsole();
+
+#ifdef  _RELEASE
+    #if defined(RELEASE_LOGGING)
+        #define DEFAULT_VERBOSITY 0
+    #else
+        #define DEFAULT_VERBOSITY -1
+    #endif
+#else
+    #define DEFAULT_VERBOSITY 3
+#endif
+
+    if (console)
+    {
+        m_pLogVerbosity = REGISTER_INT("log_Verbosity", DEFAULT_VERBOSITY, VF_DUMPTODISK,
+                "defines the verbosity level for log messages written to console\n"
+                "-1=suppress all logs (including eAlways)\n"
+                "0=suppress all logs(except eAlways)\n"
+                "1=additional errors\n"
+                "2=additional warnings\n"
+                "3=additional messages\n"
+                "4=additional comments");
+
+        //writing to game.log during game play causes stalls on consoles
+        m_pLogWriteToFile = REGISTER_INT("log_WriteToFile", 1, VF_DUMPTODISK, "toggle whether to write log to file (game.log)");
+
+        m_pLogWriteToFileVerbosity = REGISTER_INT("log_WriteToFileVerbosity", DEFAULT_VERBOSITY, VF_DUMPTODISK,
+                "defines the verbosity level for log messages written to files\n"
+                "-1=suppress all logs (including eAlways)\n"
+                "0=suppress all logs(except eAlways)\n"
+                "1=additional errors\n"
+                "2=additional warnings\n"
+                "3=additional messages\n"
+                "4=additional comments");
+        m_pLogVerbosityOverridesWriteToFile = REGISTER_INT("log_VerbosityOverridesWriteToFile", 1, VF_DUMPTODISK, "when enabled, setting log_verbosity to 0 will stop all logging including writing to file");
+
+        // put time into begin of the string if requested by cvar
+        m_pLogIncludeTime = REGISTER_INT("log_IncludeTime", 0, 0,
+                "Toggles time stamping of log entries.\n"
+                "Usage: log_IncludeTime [0/1/2/3/4/5]\n"
+                "  0=off (default)\n"
+                "  1=current time\n"
+                "  2=relative time\n"
+                "  3=current+relative time\n"
+                "  4=absolute time in seconds since this mode was started\n"
+                "  5=current time+server time"
+                "  6=current date+current time");
+
+        m_pLogSpamDelay = REGISTER_FLOAT("log_SpamDelay", 0.0f, 0, "Sets the minimum time interval between messages classified as spam");
+
+        m_pLogModule = REGISTER_STRING("log_Module", "", VF_NULL, "Only show warnings from specified module");
+
+        REGISTER_CVAR2("log_tick", &LogCVars::s_log_tick, LogCVars::s_log_tick, 0, "When not 0, writes tick log entry into the log file, every N seconds");
+
+        REGISTER_CVAR2("max_log_backup_mb", &LogCVars::max_backup_directory_size_mb, LogCVars::max_backup_directory_size_mb, 0, "Maximum size of backup logs to keep on disk (in MB)");
+
+#if defined(KEEP_LOG_FILE_OPEN)
+        REGISTER_COMMAND("log_flush", &LogFlushFile, 0, "Flush the log file");
+#endif
+    }
+    #undef DEFAULT_VERBOSITY
+}
+
+//////////////////////////////////////////////////////////////////////
+CLog::~CLog()
+{
+#if defined(SUPPORT_LOG_IDENTER)
+    while (m_topIndenter)
+    {
+        m_topIndenter->Enable(false);
+    }
+
+    assert (m_indentation == 0);
+#endif
+
+    CreateBackupFile();
+
+    UnregisterConsoleVariables();
+
+    CloseLogFile();
+}
+
+void CLog::UnregisterConsoleVariables()
+{
+    m_pLogVerbosity = 0;
+    m_pLogWriteToFile = 0;
+    m_pLogWriteToFileVerbosity = 0;
+    m_pLogVerbosityOverridesWriteToFile = 0;
+    m_pLogIncludeTime = 0;
+    m_pLogSpamDelay = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::CloseLogFile()
+{
+    m_logFileHandle.Close();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CLog::OpenLogFile(const char* filename, int mode)
+{
+    if (m_logFileHandle.IsOpen())
+    {
+        // Can only AZ_Assert if a file is open, otherwise the AZ_Assert
+        // would eventually lead to OpenLogFile being opened up again
+        AZ_Assert(false, "Attempt to open log file when one is already open.  This would lead to a handle leak.");
+        return false;
+    }
+    
+    if (filename == nullptr || filename[0] == '\0')
+    {
+        return false;
+    }
+
+    // it is assumed that @log@ points at the appropriate place (so for apple, to the user profile dir)
+    AZ::IO::FileIOBase* fileSystem = AZ::IO::FileIOBase::GetDirectInstance();
+    if (AZ::IO::FixedMaxPath logFilePath; fileSystem->ReplaceAlias(logFilePath, filename))
+    {
+        logFilePath = logFilePath.LexicallyNormal();
+        m_logFileHandle.Open(logFilePath.c_str(), mode);
+    }
+
+    if (m_logFileHandle.IsOpen())
+    {
+#if defined(KEEP_LOG_FILE_OPEN)
+        m_bFirstLine = true;
+#endif
+    }
+    else
+    {
+#if defined(LINUX) || defined(APPLE)
+        syslog(LOG_NOTICE, "Failed to open log file [%s], mode [%d]", filename, mode);
+#endif
+    }
+
+    return m_logFileHandle.IsOpen();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::SetVerbosity(int verbosity)
+{
+    if (m_pLogVerbosity)
+    {
+        m_pLogVerbosity->Set(verbosity);
+    }
+}
+
+bool CLog::CheckLogFormatter(const char* formatter)
+{
+    if (!formatter)
+    {
+        AZ_Assert(false, "code problem - A message was sent to the log system with nullptr as the formatting string.");
+        return false;
+    }
+
+    if (formatter[0] == 0)
+    {
+        // if there's nothing to log, we don't log anything.  Blank lines at least contain a carriage return or something.
+        return false;
+    }
+    return true;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+#if !defined(EXCLUDE_NORMAL_LOG)
+void CLog::LogWarning(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    va_list ArgList;
+    char        szBuffer[MAX_WARNING_LENGTH];
+    va_start(ArgList, szFormat);
+    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, szFormat, ArgList);
+    szBuffer[sizeof(szBuffer) - 1] = '\0';
+    va_end(ArgList);
+
+    va_start(ArgList, szFormat);
+    LogV(eWarning, szFormat, ArgList);
+    va_end(ArgList);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::LogError(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    va_list ArgList;
+    char        szBuffer[MAX_WARNING_LENGTH];
+    va_start(ArgList, szFormat);
+    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, szFormat, ArgList);
+    szBuffer[sizeof(szBuffer) - 1] = '\0';
+    va_end(ArgList);
+
+    va_start(ArgList, szFormat);
+    LogV(eError, szFormat, ArgList);
+    va_end(ArgList);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::Log(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    va_list arg;
+    va_start(arg, szFormat);
+    LogV (eMessage, szFormat, arg);
+    va_end(arg);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::LogAlways(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+   
+    va_list arg;
+    va_start(arg, szFormat);
+    LogV (eAlways, szFormat, arg);
+    va_end(arg);
+}
+#endif // !defined(EXCLUDE_NORMAL_LOG)
+
+int MatchStrings(const char* str0, const char* str1)
+{
+    const char* str[] = { str0, str1 };
+    int i, bSkipWord, bAlpha[2], bWS[2], bStop = 0, nDiffs = 0, nWordDiffs, len = 0;
+    do
+    {
+        for (i = 0; i < 2; i++) // skip the spaces, stop at 0
+        {
+            while (*str[i] == ' ')
+            {
+                if (!*str[i]++)
+                {
+                    goto break2;
+                }
+            }
+        }
+        bWS[0] = bWS[1] = nWordDiffs = bSkipWord = 0;
+        do
+        {
+            for (i = bAlpha[0] = bAlpha[1] = 0; i < 2; i++)
+            {
+                if (!bWS[i])
+                {
+                    do
+                    {
+                        int chr = *str[i]++;
+                        bSkipWord |= iszero(chr - '\\') | iszero(chr - '/') | iszero(chr - '_'); // ignore different words with \,_,/
+                        bAlpha[i] = inrange(chr, 'A' - 1, 'Z' + 1) | inrange(chr, 'a' - 1, 'z' + 1);
+                        bWS[i] = iszero(chr - ' ');
+                        bStop |= iszero(chr);
+                    } while (!(bAlpha[i] | bWS[i] | bStop)); // wait for a letter or a space in each input string
+                }
+            }
+            len += bAlpha[0] & bAlpha[1];
+            nWordDiffs += 1 - iszero((int)(*str[0] - *str[1])) & - (bAlpha[0] & bAlpha[1]);   // count diffs in this word
+        } while ((1 - bWS[0] | 1 - bWS[1]) & 1 - bStop); // wait for space (word end) in both strings
+        nDiffs += nWordDiffs & ~-bSkipWord;
+    } while (!bStop);
+break2:
+    return nDiffs * 10 < len;
+}
+
+//will log the text both to file and console
+//////////////////////////////////////////////////////////////////////
+void CLog::LogV(const ELogType type, const char* szFormat, va_list args)
+{
+    // this is here in case someone called LogV directly, with an invalid formatter.
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    LogV(type, 0, szFormat, args);
+}
+
+void CLog::LogV(const ELogType type, [[maybe_unused]]int flags, const char* szFormat, va_list args)
+{
+    // this is here in case someone called LogV directly, with an invalid formatter.
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+
+    }
+    if (!szFormat)
+    {
+        return;
+    }
+
+    if (m_pLogVerbosityOverridesWriteToFile && m_pLogVerbosityOverridesWriteToFile->GetIVal())
+    {
+        if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
+        {
+            return;
+        }
+    }
+
+    FUNCTION_PROFILER(GetISystem(), PROFILE_SYSTEM);
+    LOADING_TIME_PROFILE_SECTION(GetISystem());
+
+    bool bfile = false, bconsole = false;
+    const char* szCommand = szFormat;
+
+    uint8 DefaultVerbosity = 0;   // 0 == Always log (except for special -1 verbosity overrides)
+
+    switch (type)
+    {
+    case eAlways:
+        DefaultVerbosity = 0;
+        break;
+    case eWarningAlways:
+        DefaultVerbosity = 0;
+        break;
+    case eErrorAlways:
+        DefaultVerbosity = 0;
+        break;
+    case eInput:
+        DefaultVerbosity = 0;
+        break;
+    case eInputResponse:
+        DefaultVerbosity = 0;
+        break;
+    case eError:
+        DefaultVerbosity = 1;
+        break;
+    case eWarning:
+        DefaultVerbosity = 2;
+        break;
+    case eMessage:
+        DefaultVerbosity = 3;
+        break;
+    case eComment:
+        DefaultVerbosity = 4;
+        break;
+
+    default:
+        assert(0);
+    }
+
+    szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole, DefaultVerbosity);
+    if (!bfile && !bconsole)
+    {
+        return;
+    }
+
+    LogStringType tempString;
+
+    char szBuffer[MAX_WARNING_LENGTH + 32];
+    char* szString = szBuffer;
+    char* szAfterColour = szString;
+    size_t prefixSize = 0;
+    switch (type)
+    {
+    case eWarning:
+    case eWarningAlways:
+        cry_strcpy(szString, MAX_WARNING_LENGTH, "$6[Warning] ");
+        szString += 12;     // strlen("$6[Warning] ");
+        szAfterColour += 2;
+        prefixSize = 12;
+        break;
+
+    case eError:
+    case eErrorAlways:
+        cry_strcpy(szString, MAX_WARNING_LENGTH, "$4[Error] ");
+        szString += 10;     // strlen("$4[Error] ");
+        szAfterColour += 2;
+        prefixSize = 10;
+        break;
+
+    default:
+        break;
+    }
+
+    int bufferlen = sizeof(szBuffer) - prefixSize;
+    if (bufferlen > 0)
+    {
+#if defined(AZ_RESTRICTED_PLATFORM)
+#include AZ_RESTRICTED_FILE(Log_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+        int count = vsnprintf_s(szString, bufferlen, bufferlen - 1, szCommand, args);
+#endif
+        if (count == -1 || count >= bufferlen)
+        {
+            szBuffer[sizeof(szBuffer) - 1] = '\0';
+        }
+    }
+
+    if (type == eWarningAlways || type == eWarning || type == eError || type == eErrorAlways)
+    {
+        const char* sAssetScope = GetAssetScopeString();
+        if (*sAssetScope)
+        {
+            stack_string s = szBuffer;
+            s += "\t<Scope> ";
+            s += sAssetScope;
+            cry_strcpy(szBuffer, s.c_str());
+        }
+    }
+
+    float dt;
+    const char* szSpamCheck = *szFormat == '%' ? szString : szFormat;
+    if (m_pLogSpamDelay && (dt = m_pLogSpamDelay->GetFVal()) > 0.0f && type != eAlways && type != eInputResponse)
+    {
+        const int sz = sizeof(m_history) / sizeof(m_history[0]);
+        int i, j;
+        float time = m_pSystem->GetITimer()->GetCurrTime();
+        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)
+            {
+                continue;
+            }
+            if (m_history[i].ptr == szSpamCheck && *(int*)m_history[i].str == *(int*)szFormat || MatchStrings(m_history[i].str, szSpamCheck))
+            {
+                return;
+            }
+        }
+        i = m_iLastHistoryItem = m_iLastHistoryItem + 1 & sz - 1;
+        cry_strcpy(m_history[i].str, m_history[i].ptr = szSpamCheck);
+        m_history[i].type = type;
+        m_history[i].time = time;
+    }
+
+    LogString(szAfterColour, type);
+    if (bfile)
+    {
+        LogStringToFile(szAfterColour, type, false, MessageQueueState::NotQueued);
+    }
+    if (bconsole)
+    {
+        LogStringToConsole(szBuffer, ELogType::eAlways, false);
+    }
+
+    switch (type)
+    {
+    case eAlways:
+    case eInput:
+    case eInputResponse:
+    case eComment:
+    case eMessage:
+        GetISystem()->GetIRemoteConsole()->AddLogMessage(szString);
+        break;
+    case eWarning:
+    case eWarningAlways:
+        GetISystem()->GetIRemoteConsole()->AddLogWarning(szString);
+        break;
+    case eError:
+    case eErrorAlways:
+        GetISystem()->GetIRemoteConsole()->AddLogError(szString);
+        break;
+    }
+}
+
+//will log the text both to the end of file and console
+//////////////////////////////////////////////////////////////////////
+#if !defined(EXCLUDE_NORMAL_LOG)
+void CLog::LogPlus(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
+    {
+        return;
+    }
+
+    if (m_pLogSpamDelay && m_pLogSpamDelay->GetFVal())
+    { // Vlad: SpamDelay does not work correctly with LogPlus
+        return;
+    }
+
+    LOADING_TIME_PROFILE_SECTION(GetISystem());
+
+    if (!szFormat)
+    {
+        return;
+    }
+
+    bool bfile = false, bconsole = false;
+    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
+    if (!bfile && !bconsole)
+    {
+        return;
+    }
+
+    va_list     arglist;
+
+    char szTemp[MAX_TEMP_LENGTH_SIZE];
+    va_start(arglist, szFormat);
+    vsnprintf_s(szTemp, sizeof(szTemp), sizeof(szTemp) - 1, szCommand, arglist);
+    szTemp[sizeof(szTemp) - 1] = 0;
+    va_end(arglist);
+
+    if (bfile)
+    {
+        LogToFilePlus(szTemp);
+    }
+    if (bconsole)
+    {
+        LogToConsolePlus(szTemp);
+    }
+}
+
+//log to console only
+//////////////////////////////////////////////////////////////////////
+void CLog::LogStringToConsole(const char* szString, ELogType logType, bool bAdd)
+{
+    #if defined(_RELEASE) && defined(EXCLUDE_NORMAL_LOG) // no console logging in release
+    return;
+    #endif
+
+
+    if (LogToMainThread(szString, logType, bAdd, SLogMsg::Destination::Console))
+    {
+        return;
+    }
+
+    if (!szString)
+    {
+        return;
+    }
+
+    if (!m_pSystem)
+    {
+        return;
+    }
+    IConsole* console = m_pSystem->GetIConsole();
+    if (!console)
+    {
+        return;
+    }
+
+
+    LogStringType tempString;
+    tempString = szString;
+    if (tempString.length() > MAX_TEMP_LENGTH_SIZE)
+    {
+        tempString.erase(MAX_TEMP_LENGTH_SIZE);
+    }
+    // add \n at end.
+    if (tempString.length() > 0 && tempString[tempString.length() - 1] != '\n')
+    {
+        tempString += '\n';
+    }
+
+    if (bAdd)
+    {
+        console->PrintLinePlus(tempString.c_str());
+    }
+    else
+    {
+        console->PrintLine(tempString.c_str());
+    }
+
+    // Call callback function.
+    if (!m_callbacks.empty())
+    {
+        for (Callbacks::iterator it = m_callbacks.begin(); it != m_callbacks.end(); ++it)
+        {
+            (*it)->OnWriteToConsole(tempString.c_str(), !bAdd);
+        }
+    }
+}
+
+//log to console only
+//////////////////////////////////////////////////////////////////////
+void CLog::LogToConsole(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
+    {
+        return;
+    }
+
+    if (!szFormat)
+    {
+        return;
+    }
+
+    bool bfile = false, bconsole = false;
+    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
+    if (!bconsole)
+    {
+        return;
+    }
+
+    va_list     arglist;
+
+    char szBuffer[MAX_WARNING_LENGTH];
+    va_start(arglist, szFormat);
+    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, szCommand, arglist);
+    szBuffer[sizeof(szBuffer) - 1] = 0;
+    va_end(arglist);
+
+    LogStringToConsole(szBuffer, ELogType::eAlways, false);
+}
+
+//////////////////////////////////////////////////////////////////////
+void CLog::LogToConsolePlus(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
+    {
+        return;
+    }
+
+    if (!szFormat)
+    {
+        return;
+    }
+
+    bool bfile = false, bconsole = false;
+    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
+    if (!bconsole)
+    {
+        return;
+    }
+
+    va_list     arglist;
+
+    char szTemp[MAX_TEMP_LENGTH_SIZE];
+    va_start(arglist, szFormat);
+    vsnprintf_s(szTemp, sizeof(szTemp), sizeof(szTemp) - 1, szCommand, arglist);
+    szTemp[sizeof(szTemp) - 1] = 0;
+    va_end(arglist);
+
+    if (!m_pSystem)
+    {
+        return;
+    }
+
+    LogStringToConsole(szTemp, ELogType::eAlways, true);
+}
+#endif // !defined(EXCLUDE_NORMAL_LOG)
+
+
+
+//////////////////////////////////////////////////////////////////////
+static void RemoveColorCodeInPlace(CLog::LogStringType& rStr)
+{
+    char* s = (char*)rStr.c_str();
+    char* d = s;
+
+    while (*s != 0)
+    {
+        if (*s == '$' && *(s + 1) >= '0' && *(s + 1) <= '9')
+        {
+            s += 2;
+            continue;
+        }
+
+        *d++ = *s++;
+    }
+    *d = 0;
+
+    rStr.resize(d - rStr.c_str());
+}
+
+#if defined(SUPPORT_LOG_IDENTER)
+//////////////////////////////////////////////////////////////////////
+void CLog::BuildIndentString()
+{
+    m_indentWithString = "";
+
+    for (uint8 i = 0; i < m_indentation; ++i)
+    {
+        m_indentWithString = indentString + m_indentWithString;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+void CLog::Indent(CLogIndenter* indenter)
+{
+    indenter->SetNextIndenter(m_topIndenter);
+    m_topIndenter = indenter;
+    ++m_indentation;
+    BuildIndentString();
+}
+
+//////////////////////////////////////////////////////////////////////
+void CLog::Unindent(CLogIndenter* indenter)
+{
+    assert (indenter == m_topIndenter);
+    assert (m_indentation);
+    m_topIndenter = m_topIndenter->GetNextIndenter();
+    --m_indentation;
+    BuildIndentString();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::PushAssetScopeName(const char* sAssetType, const char* sName)
+{
+    assert(sAssetType);
+    assert(sName);
+
+    SAssetScopeInfo as;
+    as.sType = sAssetType;
+    as.sName = sName;
+    CryAutoCriticalSection scope_lock(m_assetScopeQueueLock);
+    m_assetScopeQueue.push_back(as);
+}
+
+void CLog::PopAssetScopeName()
+{
+    CryAutoCriticalSection scope_lock(m_assetScopeQueueLock);
+    assert(!m_assetScopeQueue.empty());
+    if (!m_assetScopeQueue.empty())
+    {
+        m_assetScopeQueue.pop_back();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CLog::GetAssetScopeString()
+{
+    CryAutoCriticalSection scope_lock(m_assetScopeQueueLock);
+
+    m_assetScopeString.clear();
+    for (size_t i = 0; i < m_assetScopeQueue.size(); i++)
+    {
+        m_assetScopeString += "[";
+        m_assetScopeString += m_assetScopeQueue[i].sType;
+        m_assetScopeString += "]";
+        m_assetScopeString += m_assetScopeQueue[i].sName;
+        if (i <  m_assetScopeQueue.size() - 1)
+        {
+            m_assetScopeString += " > ";
+        }
+    }
+    return m_assetScopeString.c_str();
+};
+#endif
+
+bool CLog::LogToMainThread(const char* szString, ELogType logType, bool bAdd, SLogMsg::Destination destination)
+{
+    if (CryGetCurrentThreadId() != m_nMainThreadId)
+    {
+        // When logging from other thread then main, push all log strings to queue.
+        SLogMsg msg;
+        cry_strcpy(msg.msg, szString);
+        msg.bAdd = bAdd;
+        msg.destination = destination;
+        msg.logType = logType;
+        m_threadSafeMsgQueue.push(msg);
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////
+#if !defined(EXCLUDE_NORMAL_LOG)
+void CLog::LogStringToFile(const char* szString, ELogType logType, bool bAdd, [[maybe_unused]] MessageQueueState queueState)
+{
+#if defined(_RELEASE) && defined(EXCLUDE_NORMAL_LOG) // no file logging in release
+    return;
+#endif
+
+    if (!szString)
+    {
+        return;
+    }
+
+    if (!m_pSystem)
+    {
+        return;
+    }
+
+    LogStringType tempString;
+    tempString = szString;
+
+    // this is a temp timeStr, it is reused in many branches(moved here to reduce stack usage)
+    LogStringType timeStr;
+
+    // Skip any non character.
+    if (tempString.length() > 0 && tempString.at(0) < 32)
+    {
+        tempString.erase(0, 1);
+    }
+
+    RemoveColorCodeInPlace(tempString);
+
+    bool bIsMainThread = LogToMainThread(szString, logType, bAdd, SLogMsg::Destination::File) == false;
+
+#if defined(_RELEASE)
+    if (!bIsMainThread)
+    {
+        return;
+    }
+#endif
+
+#if defined(SUPPORT_LOG_IDENTER)
+    if (bIsMainThread)
+    {
+        if (m_topIndenter)
+        {
+            m_topIndenter->DisplaySectionText();
+        }
+        tempString = m_indentWithString + tempString;
+    }
+#endif
+
+    if (m_pLogIncludeTime && gEnv && gEnv->pTimer)
+    {
+        uint32 dwCVarState = m_pLogIncludeTime->GetIVal();
+        //      char szTemp[MAX_TEMP_LENGTH_SIZE];
+
+        if (dwCVarState == 1)              // Log_IncludeTime
+        {
+            char sTime[128];
+            time_t ltime;
+            time(&ltime);
+#ifdef AZ_COMPILER_MSVC
+            struct tm today;
+            localtime_s(&today, &ltime);
+            strftime(sTime, 20, "<%H:%M:%S> ", &today);
+#else
+            auto today = localtime(&ltime);
+            strftime(sTime, 20, "<%H:%M:%S> ", today);
+#endif
+
+            timeStr.clear();
+            timeStr.assign(sTime);
+            tempString = timeStr + tempString;
+        }
+        else if (dwCVarState == 2)     // Log_IncludeTime
+        {
+            static CTimeValue lasttime;
+            CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
+            if (lasttime != CTimeValue())
+            {
+                timeStr.clear();
+                uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
+                timeStr.Format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
+                tempString = timeStr + tempString;
+            }
+            lasttime = currenttime;
+        }
+        else if (dwCVarState == 3)     // Log_IncludeTime
+        {
+            char sTime[128];
+            time_t ltime;
+            time(&ltime);
+
+#ifdef AZ_COMPILER_MSVC
+            struct tm today;
+            localtime_s(&today, &ltime);
+            strftime(sTime, 20, "<%H:%M:%S> ", &today);
+#else
+            auto today = localtime(&ltime);
+            strftime(sTime, 20, "<%H:%M:%S> ", today);
+#endif
+            tempString = LogStringType(sTime) + tempString;
+
+            static CTimeValue lasttime;
+            CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
+            if (lasttime != CTimeValue())
+            {
+                timeStr.clear();
+                uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
+                timeStr.Format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
+                tempString = timeStr + tempString;
+            }
+            lasttime = currenttime;
+        }
+        else if (dwCVarState == 4)             // Log_IncludeTime
+        {
+            static bool bFirst = true;
+
+            if (gEnv->pTimer)
+            {
+                static CTimeValue lasttime;
+                CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
+                if (lasttime != CTimeValue())
+                {
+                    timeStr.clear();
+                    uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
+                    timeStr.Format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
+                    tempString = timeStr + tempString;
+                }
+                if (bFirst)
+                {
+                    lasttime = currenttime;
+                    bFirst = false;
+                }
+            }
+        }
+        else if (dwCVarState == 5)             // Log_IncludeTime
+        {
+            char sTime[128];
+            time_t ltime;
+            time(&ltime);
+
+#ifdef AZ_COMPILER_MSVC
+            struct tm today;
+            localtime_s(&today, &ltime);
+            strftime(sTime, 20, "<%H:%M:%S> ", &today);
+#else
+            auto today = localtime(&ltime);
+            strftime(sTime, 20, "<%H:%M:%S> ", today);
+#endif
+            tempString = LogStringType(sTime) + tempString;
+        }
+        else if (dwCVarState == 6)              // Log_IncludeTime
+        {
+            char sTime[128];
+            time_t ltime;
+            time(&ltime);
+#ifdef AZ_COMPILER_MSVC
+            struct tm today;
+            localtime_s(&today, &ltime);
+            strftime(sTime, 40, "<%Y-%m-%d %H:%M:%S> ", &today);
+#else
+            auto today = localtime(&ltime);
+            strftime(sTime, 40, "<%Y-%m-%d %H:%M:%S> ", today);
+#endif
+            tempString = LogStringType(sTime) + tempString;
+        }
+    }
+
+    if (tempString.empty() || tempString[tempString.length() - 1] != '\n')
+    {
+        tempString += '\n';
+    }
+
+    // do not OutputDebugString in release.
+#if !defined(_RELEASE)
+    if (queueState == MessageQueueState::NotQueued)
+    {
+        // Note: OutputDebugString(A) only accepts current ANSI code-page, and the W variant will call the A variant internally.
+        // Here we replace non-ASCII characters with '?', which is the same as OutputDebugStringW will do for non-ANSI.
+        // Thus, we discard slightly more characters (ie, those inside the current ANSI code-page, but outside ASCII).
+        // In exchange, we save double-converting that would have happened otherwise (UTF-8 -> UTF-16 -> ANSI).
+        LogStringType asciiString;
+        Unicode::ConvertSafe<Unicode::EErrorRecovery::eErrorRecovery_FallbackLatin1ThenDiscard, Unicode::eEncoding_ASCII, Unicode::eEncoding_UTF8>(asciiString, tempString);
+        OutputDebugString(asciiString.c_str());
+    }
+
+    if (!bIsMainThread)
+    {
+        return;
+    }
+#endif // !defined(_RELEASE)
+
+
+    //////////////////////////////////////////////////////////////////////////
+    // Call callback function.
+    if (!m_callbacks.empty())
+    {
+        for (Callbacks::iterator it = m_callbacks.begin(); it != m_callbacks.end(); ++it)
+        {
+            (*it)->OnWriteToFile(tempString.c_str(), !bAdd);
+        }
+    }
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Write to file.
+    //////////////////////////////////////////////////////////////////////////
+    int logToFile = m_pLogWriteToFile ? m_pLogWriteToFile->GetIVal() : 1;
+
+    if (logToFile)
+    {
+        if (!m_logFileHandle.IsOpen())
+        {
+            constexpr auto openMode = AZ::IO::SystemFile::OpenMode::SF_OPEN_APPEND
+                | AZ::IO::SystemFile::OpenMode::SF_OPEN_CREATE
+                | AZ::IO::SystemFile::OpenMode::SF_OPEN_WRITE_ONLY;
+            OpenLogFile(m_szFilename, openMode);
+        }
+
+        if (m_logFileHandle.IsOpen())
+        {
+#if defined(KEEP_LOG_FILE_OPEN)
+            if (m_bFirstLine)
+            {
+                m_bFirstLine = false;
+            }
+#endif
+            if (bAdd)
+            {
+                // if adding to a prior line erase the \n at the end.
+                m_logFileHandle.Seek(-2, AZ::IO::SystemFile::SeekMode::SF_SEEK_END);
+            }
+            m_logFileHandle.Write(tempString.c_str(), tempString.size());
+#if !defined(KEEP_LOG_FILE_OPEN)
+            CloseLogFile();
+#endif
+            // do not use FLUSH on log files.  Doing so will slow the engine down greatly when logging.
+            // (the log is flushed automatically when an unhandled exception occurs)
+        }
+    }
+}
+
+void CLog::LogString(const char* szString, ELogType logType)
+{
+    if (LogToMainThread(szString, logType, false, SLogMsg::Destination::Default))
+    {
+        return;
+    }
+
+    for (auto callback : m_callbacks)
+    {
+        callback->OnWrite(szString, logType);
+    }
+}
+
+//same as above but to a file
+//////////////////////////////////////////////////////////////////////
+void CLog::LogToFilePlus(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
+    {
+        return;
+    }
+
+    if (!m_szFilename[0] || !szFormat)
+    {
+        return;
+    }
+
+    bool bfile = false, bconsole = false;
+    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
+    if (!bfile)
+    {
+        return;
+    }
+
+    char szTemp[MAX_TEMP_LENGTH_SIZE];
+    va_list     arglist;
+    va_start(arglist, szFormat);
+    vsnprintf_s(szTemp, sizeof(szTemp), sizeof(szTemp) - 1, szCommand, arglist);
+    szTemp[sizeof(szTemp) - 1] = 0;
+    va_end(arglist);
+
+    LogStringToFile(szTemp, ELogType::eAlways, true, MessageQueueState::NotQueued);
+}
+
+//log to the file specified in setfilename
+//////////////////////////////////////////////////////////////////////
+void CLog::LogToFile(const char* szFormat, ...)
+{
+    if (!CheckLogFormatter(szFormat))
+    {
+        return;
+    }
+
+    if (m_pLogVerbosity && m_pLogVerbosity->GetIVal() < 0)
+    {
+        return;
+    }
+
+    if (!m_szFilename[0] || !szFormat)
+    {
+        return;
+    }
+
+    bool bfile = false, bconsole = false;
+    const char* szCommand = CheckAgainstVerbosity(szFormat, bfile, bconsole);
+    if (!bfile)
+    {
+        return;
+    }
+
+    char szTemp[MAX_TEMP_LENGTH_SIZE];
+    va_list     arglist;
+    va_start(arglist, szFormat);
+    vsnprintf_s(szTemp, sizeof(szTemp), sizeof(szTemp) - 1, szCommand, arglist);
+    szTemp[sizeof(szTemp) - 1] = 0;
+    va_end(arglist);
+
+    LogStringToFile(szTemp, ELogType::eAlways, false, MessageQueueState::NotQueued);
+}
+#endif // !defined(EXCLUDE_NORMAL_LOG)
+
+//////////////////////////////////////////////////////////////////////
+void CLog::CreateBackupFile() const
+{
+    LOADING_TIME_PROFILE_SECTION;
+    if (!m_backupLogs)
+    {
+        return;
+    }
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_ALLOW_CREATE_BACKUP_LOG_FILE
+    // simple:
+    //      string bakpath = PathUtil::ReplaceExtension(m_szFilename,"bak");
+    //      CopyFile(m_szFilename,bakpath.c_str(),false);
+
+    // boswej: only create a backup if logging to the engine root, otherwise the
+    // log output has been overridden and the user is responsible
+    string logDir = PathUtil::RemoveSlash(PathUtil::ToUnixPath(PathUtil::GetParentDirectory(m_szFilename)));
+
+    string sExt = PathUtil::GetExt(m_szFilename);
+    string sFileWithoutExt = PathUtil::GetFileName(m_szFilename);
+
+    {
+        assert(::strstr(sFileWithoutExt, ":") == 0);
+        assert(::strstr(sFileWithoutExt, "\\") == 0);
+    }
+
+    PathUtil::RemoveExtension(sFileWithoutExt);
+
+    AZ::IO::FileIOBase* fileSystem = AZ::IO::FileIOBase::GetDirectInstance();
+    AZ::IO::HandleType inFileHandle = AZ::IO::InvalidHandle;
+    fileSystem->Open(m_szFilename, AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, inFileHandle);
+
+    string sBackupNameAttachment;
+
+    // parse backup name attachment
+    // e.g. BackupNameAttachment="attachment name"
+    if (inFileHandle != AZ::IO::InvalidHandle)
+    {
+        bool bKeyFound = false;
+        string sName;
+
+        while (!fileSystem->Eof(inFileHandle))
+        {
+            uint8 c = AZ::IO::GetC(inFileHandle);
+
+            if (c == '\"')
+            {
+                if (!bKeyFound)
+                {
+                    bKeyFound = true;
+
+                    if (sName.find("BackupNameAttachment=") == string::npos)
+                    {
+#ifdef WIN32
+                        OutputDebugString("Log::CreateBackupFile ERROR '");
+                        OutputDebugString(sName.c_str());
+                        OutputDebugString("' not recognized \n");
+#endif
+                        assert(0);      // broken log file? - first line should include this name - written by LogVersion()
+                        return;
+                    }
+                    sName.clear();
+                }
+                else
+                {
+                    sBackupNameAttachment = sName;
+                    break;
+                }
+                continue;
+            }
+            if (c >= ' ')
+            {
+                sName += c;
+            }
+            else
+            {
+                break;
+            }
+        }
+        fileSystem->Close(inFileHandle);
+    }
+
+    string bakdest = PathUtil::Make(LOG_BACKUP_PATH, sFileWithoutExt + sBackupNameAttachment + "." + sExt);
+    fileSystem->CreatePath(LOG_BACKUP_PATH);
+    cry_strcpy(m_sBackupFilename, bakdest.c_str());
+    // Remove any existing backup file with the same name first since the copy will fail otherwise.
+    fileSystem->Remove(m_sBackupFilename);
+    fileSystem->Copy(m_szFilename, bakdest);
+#endif // AZ_LEGACY_CRYSYSTEM_TRAIT_ALLOW_CREATE_BACKUP_LOG_FILE
+}
+
+void CLog::CheckAndPruneBackupLogs() const
+{
+    AZ::IO::FileIOBase* fileSystem = AZ::IO::FileIOBase::GetDirectInstance();
+
+    AZ::u64 totalBackupDirectorySize = 0;
+
+    struct fileInfo
+    {
+        time_t modTime;
+        AZStd::string filename;
+        AZ::u64 filesize;
+
+        fileInfo(time_t _modTime, const char* _name, AZ::u64 _size)
+        {
+            modTime = _modTime;
+            filename = _name;
+            filesize = _size;
+        }
+    };
+
+    AZStd::list<fileInfo> fileInfoList;
+
+    // Now that we've copied the new log over, lets check the size of the backup folder and trim it as necessary to keep it within appropriate limits
+    AZ::IO::Result res = fileSystem->FindFiles(LOG_BACKUP_PATH, "*",
+        [&totalBackupDirectorySize, &fileSystem, &fileInfoList](const char* fileName)
+    {
+        AZ::u64 size;
+        fileSystem->Size(fileName, size);
+        AZ::u64 modTime = fileSystem->ModificationTime(fileName);
+        fileInfoList.push_back(fileInfo(modTime, fileName, size));
+
+        totalBackupDirectorySize += size;
+        return true;
+    });
+
+    AZ::u64 max_size = LogCVars::max_backup_directory_size_mb;
+    max_size = max_size << 20;  // Convert from MB to bytes
+
+    if (totalBackupDirectorySize > max_size)
+    {
+        // Sort the list from lowest to highest modtime (oldest to newest logs)
+        fileInfoList.sort([](const fileInfo &a, const fileInfo&b) { return a.modTime < b.modTime; });
+
+        while (totalBackupDirectorySize > max_size && fileInfoList.size() > 0)
+        {
+            fileSystem->Remove(fileInfoList.front().filename.c_str());
+            totalBackupDirectorySize -= fileInfoList.front().filesize;
+            fileInfoList.pop_front();
+        }
+    }
+}
+
+//set the file used to log to disk
+//////////////////////////////////////////////////////////////////////
+bool CLog::SetFileName(const char* fileNameOrAbsolutePath, bool backupLogs)
+{
+    m_backupLogs = backupLogs;
+    if (!fileNameOrAbsolutePath)
+    {
+        return false;
+    }
+    azstrncpy(m_szFilename, AZ_ARRAY_SIZE(m_szFilename), fileNameOrAbsolutePath, sizeof(m_szFilename));
+
+    CreateBackupFile();
+
+    AZ::IO::FileIOBase* fileSystem = AZ::IO::FileIOBase::GetDirectInstance();
+    AZ::IO::FixedMaxPath newLogFilePath;
+    if (fileSystem->ReplaceAlias(newLogFilePath, m_szFilename))
+    {
+        newLogFilePath = newLogFilePath.LexicallyNormal();
+    }
+    if (m_logFileHandle.IsOpen() && newLogFilePath != m_logFileHandle.Name())
+    {
+        constexpr auto openMode = AZ::IO::SystemFile::OpenMode::SF_OPEN_APPEND
+            | AZ::IO::SystemFile::OpenMode::SF_OPEN_CREATE
+            | AZ::IO::SystemFile::OpenMode::SF_OPEN_WRITE_ONLY;
+        if(AZ::IO::SystemFile newLogFile; newLogFile.Open(m_szFilename, openMode))
+        {
+            m_logFileHandle = AZStd::move(newLogFile);
+        }
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CLog::GetFileName()
+{
+    return m_szFilename;
+}
+
+const char* CLog::GetBackupFileName()
+{
+    return m_sBackupFilename;
+}
+
+//////////////////////////////////////////////////////////////////////
+void CLog::UpdateLoadingScreen(const char* szFormat, ...)
+{
+#if !defined(EXCLUDE_NORMAL_LOG)
+    if (szFormat)
+    {
+        // This function is OK to call with nullptr, but then it does not log anything.
+        va_list args;
+        va_start(args, szFormat);
+
+        LogV(ILog::eMessage, szFormat, args);
+
+        va_end(args);
+    }
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CLog::GetVerbosityLevel()
+{
+    if (m_pLogVerbosity)
+    {
+        return (m_pLogVerbosity->GetIVal());
+    }
+
+    return (0);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// Checks the verbosity of the message and returns NULL if the message must NOT be
+// logged, or the pointer to the part of the message that should be logged
+// NOTE:
+//    Normally, this is either the pText pointer itself, or the pText+1, meaning
+//    the first verbosity character may be cut off)
+//    This is done in order to avoid modification of const char*, which may cause GPF
+//    sometimes, or kill the verbosity qualifier in the text that's gonna be passed next time.
+const char* CLog::CheckAgainstVerbosity(const char* pText, bool& logtofile, bool& logtoconsole, const uint8 DefaultVerbosity)
+{
+    // the max verbosity (most detailed level)
+#if defined(RELEASE)
+    const unsigned char nMaxVerbosity = 0;
+#else // #if defined(RELEASE)
+    const unsigned char nMaxVerbosity = 8;
+#endif // #if defined(RELEASE)
+
+    // the current verbosity of the log
+    int nLogVerbosityConsole = m_pLogVerbosity ? m_pLogVerbosity->GetIVal() : nMaxVerbosity;
+    int nLogVerbosityFile = m_pLogWriteToFileVerbosity ? m_pLogWriteToFileVerbosity->GetIVal() : nMaxVerbosity;
+
+    logtoconsole = (nLogVerbosityConsole >= DefaultVerbosity);
+
+    //to preserve logging to TTY, logWriteToFile logic has been moved to inside logStringToFile
+    //int logToFileCVar = m_pLogWriteToFile ? m_pLogWriteToFile->GetIVal() : 1;
+
+    logtofile = (nLogVerbosityFile >= DefaultVerbosity);
+
+    return pText;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::AddCallback(ILogCallback* pCallback)
+{
+    stl::push_back_unique(m_callbacks, pCallback);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::RemoveCallback(ILogCallback* pCallback)
+{
+    m_callbacks.remove(pCallback);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CLog::Update()
+{
+    FUNCTION_PROFILER_FAST(m_pSystem, PROFILE_SYSTEM, g_bProfilerEnabled);
+
+    if (CryGetCurrentThreadId() == m_nMainThreadId)
+    {
+        if (!m_threadSafeMsgQueue.empty())
+        {
+            CryAutoCriticalSection lock(m_threadSafeMsgQueue.get_lock());   // Get the lock and hold onto it until we clear the entire queue (prevents other threads adding more things in while we clear it)
+            // Must be called from main thread
+            SLogMsg msg;
+            while (m_threadSafeMsgQueue.try_pop(msg))
+            {
+                if (msg.destination == SLogMsg::Destination::Console)
+                {
+                    LogStringToConsole(msg.msg, msg.logType, msg.bAdd);
+                }
+                else if (msg.destination == SLogMsg::Destination::File)
+                {
+                    LogStringToFile(msg.msg, msg.logType, msg.bAdd, MessageQueueState::Queued);
+                }
+                else
+                {
+                    LogString(msg.msg, msg.logType);
+                }
+            }
+            stl::free_container(m_threadSafeMsgQueue);
+        }
+
+        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)
+            {
+                t0 = t1;
+
+                char sTime[128];
+                time_t ltime;
+                time(&ltime);
+#ifdef AZ_COMPILER_MSVC
+                struct tm today;
+                localtime_s(&today, &ltime);
+                strftime(sTime, sizeof(sTime) - 1, "<%H:%M:%S> ", &today);
+#else
+                auto today = localtime(&ltime);
+                strftime(sTime, sizeof(sTime) - 1, "<%H:%M:%S> ", today);
+#endif
+                LogAlways("<tick> %s", sTime);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CLog::GetModuleFilter()
+{
+    if (m_pLogModule)
+    {
+        return m_pLogModule->GetString();
+    }
+    return "";
+}
+
+void CLog::FlushAndClose()
+{
+#if defined(KEEP_LOG_FILE_OPEN)
+    if (m_logFileHandle.IsOpen())
+    {
+        CloseLogFile();
+    }
+#endif
+}
+
+#if defined(KEEP_LOG_FILE_OPEN)
+void CLog::LogFlushFile([[maybe_unused]] IConsoleCmdArgs* pArgs)
+{
+    if ((gEnv) && (gEnv->pLog))
+    {
+        gEnv->pLog->FlushAndClose();
+    }
+}
+#endif
diff --git a/Code/Legacy/CrySystem/Log.h b/Code/Legacy/CrySystem/Log.h
new file mode 100644
index 0000000000..25d063426b
--- /dev/null
+++ b/Code/Legacy/CrySystem/Log.h
@@ -0,0 +1,227 @@
+/*
+ * 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 <ILog.h>
+#include <CryThread.h>
+#include <MultiThread.h>
+#include <MultiThread_Containers.h>
+
+//////////////////////////////////////////////////////////////////////
+#if defined(ANDROID) || defined(AZ_PLATFORM_MAC)
+    #define MAX_TEMP_LENGTH_SIZE    4098
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+#include AZ_RESTRICTED_FILE(Log_h)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    #define MAX_TEMP_LENGTH_SIZE    8196
+#endif
+#define MAX_FILENAME_SIZE           256
+
+#define KEEP_LOG_FILE_OPEN
+
+
+//////////////////////////////////////////////////////////////////////
+class CLog
+    : public ILog
+{
+public:
+    typedef std::list<ILogCallback*> Callbacks;
+    typedef CryStackStringT<char, MAX_TEMP_LENGTH_SIZE> LogStringType;
+
+    // constructor
+    CLog(ISystem* pSystem);
+    // destructor
+    ~CLog();
+
+
+    // interface ILog, IMiniLog -------------------------------------------------
+
+    virtual void Release() { delete this; };
+    virtual bool SetFileName(const char* fileNameOrAbsolutePath, bool backupLogs);
+    virtual const char* GetFileName();
+    virtual const char* GetBackupFileName();
+#if !defined(EXCLUDE_NORMAL_LOG)
+    virtual void Log(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void LogAlways(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void LogWarning(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void LogError(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void LogPlus(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void LogToFile  (const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void LogToFilePlus(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void LogToConsole(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void LogToConsolePlus(const char* command, ...) PRINTF_PARAMS(2, 3);
+#else
+    virtual void Log(const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+    virtual void LogAlways(const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+    virtual void LogWarning(const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+    virtual void LogError(const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+    virtual void LogPlus(const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+    virtual void LogToFile  (const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+    virtual void LogToFilePlus(const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+    virtual void LogToConsole(const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+    virtual void LogToConsolePlus(const char* command, ...) PRINTF_PARAMS(2, 3) {
+    };
+#endif // !defined(EXCLUDE_NORMAL_LOG)
+    virtual void UpdateLoadingScreen(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual void SetVerbosity(int verbosity);
+    virtual int  GetVerbosityLevel();
+    virtual void RegisterConsoleVariables();
+    virtual void UnregisterConsoleVariables();
+    virtual void AddCallback(ILogCallback* pCallback);
+    virtual void RemoveCallback(ILogCallback* pCallback);
+    virtual void LogV(ELogType ineType, int flags, const char* szFormat, va_list args);
+    virtual void LogV(ELogType ineType, const char* szFormat, va_list args);
+    virtual void Update();
+    virtual const char* GetModuleFilter();
+    virtual void FlushAndClose();
+
+private: // -------------------------------------------------------------------
+    struct SLogMsg
+    {
+        enum class Destination
+        {
+            Default, //LogString, sends OnWrite to anycallback registered with AddCallback
+            Console,
+            File
+        };
+        char msg[512];
+        ELogType logType;
+        bool bAdd;
+        Destination destination;
+        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const {}
+    };
+
+    void CheckAndPruneBackupLogs() const;
+
+    bool IsError(ELogType logType) const { return logType == ELogType::eError || logType == ELogType::eErrorAlways || logType == ELogType::eWarning || logType == ELogType::eWarningAlways; }
+
+    //helper function to pass calls to LogString... to the main thread, returns false if you are on the main thread already, in which case just process the work.
+    bool LogToMainThread(const char* szString, ELogType logType, bool bAdd, SLogMsg::Destination destination);
+
+    enum class MessageQueueState
+    {
+        NotQueued,
+        Queued
+    };
+
+#if !defined(EXCLUDE_NORMAL_LOG)
+    void LogString(const char* szString, ELogType logType);
+    void LogStringToFile(const char* szString, ELogType logType, bool bAdd, MessageQueueState queueState);
+    void LogStringToConsole(const char* szString, ELogType logType, bool bAdd);
+#else
+    void LogString(const char* szString, ELogType logType) {}
+    void LogStringToFile(const char* szString, ELogType logType, bool bAdd, MessageQueueState queueState) {}
+    void LogStringToConsole(const char* szString, ELogType logType, bool bAdd) {}
+#endif // !defined(EXCLUDE_NORMAL_LOG)
+
+    bool OpenLogFile(const char* filename, int mode);
+    void CloseLogFile();
+
+    // will format the message into m_szTemp
+    void FormatMessage(const char* szCommand, ...) PRINTF_PARAMS(2, 3);
+
+#if defined(SUPPORT_LOG_IDENTER)
+    void Indent(CLogIndenter* indenter);
+    void Unindent(CLogIndenter* indenter);
+    void BuildIndentString();
+    virtual void PushAssetScopeName(const char* sAssetType, const char* sName);
+    virtual void PopAssetScopeName();
+    virtual const char* GetAssetScopeString();
+#endif
+
+    ISystem* m_pSystem;                                                       //
+    float m_fLastLoadingUpdateTime;                           // for non-frequent streamingEngine update
+    char m_szFilename[MAX_FILENAME_SIZE];            // can be with path
+    mutable char m_sBackupFilename[MAX_FILENAME_SIZE];   // can be with path
+    AZ::IO::SystemFile m_logFileHandle;
+
+    bool m_backupLogs;
+
+#if defined(SUPPORT_LOG_IDENTER)
+    uint8                   m_indentation;
+    LogStringType           m_indentWithString;
+    class CLogIndenter* m_topIndenter;
+
+    struct SAssetScopeInfo
+    {
+        string sType;
+        string sName;
+    };
+
+    std::vector<SAssetScopeInfo> m_assetScopeQueue;
+    CryCriticalSection m_assetScopeQueueLock;
+    string m_assetScopeString;
+#endif
+
+    ICVar*                 m_pLogIncludeTime;                                       //
+
+    IConsole*          m_pConsole;                                                      //
+
+    CryCriticalSection m_logCriticalSection;
+
+    struct SLogHistoryItem
+    {
+        char str[MAX_WARNING_LENGTH];
+        const char* ptr;
+        ELogType type;
+        float time;
+    };
+    SLogHistoryItem m_history[16];
+    int m_iLastHistoryItem;
+
+    static bool CheckLogFormatter(const char* formatter);
+
+#if defined(KEEP_LOG_FILE_OPEN)
+    static void LogFlushFile(IConsoleCmdArgs* pArgs);
+
+    bool m_bFirstLine;
+#endif
+
+public: // -------------------------------------------------------------------
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(this, sizeof(*this));
+        pSizer->AddObject(m_pLogVerbosity);
+        pSizer->AddObject(m_pLogWriteToFile);
+        pSizer->AddObject(m_pLogWriteToFileVerbosity);
+        pSizer->AddObject(m_pLogVerbosityOverridesWriteToFile);
+        pSizer->AddObject(m_pLogSpamDelay);
+        pSizer->AddObject(m_threadSafeMsgQueue);
+    }
+    // checks the verbosity of the message and returns NULL if the message must NOT be
+    // logged, or the pointer to the part of the message that should be logged
+    const char* CheckAgainstVerbosity(const char* pText, bool& logtofile, bool& logtoconsole, const uint8 DefaultVerbosity = 2);
+
+    // create backup of log file, useful behavior - only on development platform
+    void CreateBackupFile() const;
+
+    ICVar*                 m_pLogVerbosity;                                             //
+    ICVar*                 m_pLogWriteToFile;                                       //
+    ICVar*                 m_pLogWriteToFileVerbosity;                      //
+    ICVar*                 m_pLogVerbosityOverridesWriteToFile;     //
+    ICVar*                 m_pLogSpamDelay;                       //
+    ICVar*                 m_pLogModule;                                                    // Module filter for log
+    Callbacks               m_callbacks;                                                    //
+
+    threadID m_nMainThreadId;
+    CryMT::queue<SLogMsg> m_threadSafeMsgQueue;
+};
diff --git a/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.cpp b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.cpp
new file mode 100644
index 0000000000..4a06e1f635
--- /dev/null
+++ b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.cpp
@@ -0,0 +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
+ *
+ */
+
+
+#include "CrySystem_precompiled.h"
+#include "RemoteConsole.h"
+
+#ifdef USE_REMOTE_CONSOLE
+    #include "RemoteConsole_impl.inl"
+#else
+    #include "RemoteConsole_none.inl"
+#endif
diff --git a/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.h b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.h
new file mode 100644
index 0000000000..259a12dfeb
--- /dev/null
+++ b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.h
@@ -0,0 +1,73 @@
+/*
+ * 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_REMOTECONSOLE_REMOTECONSOLE_H
+#define CRYINCLUDE_CRYSYSTEM_REMOTECONSOLE_REMOTECONSOLE_H
+#pragma once
+
+#include <IConsole.h>
+#include <CryListenerSet.h>
+
+#if !defined(RELEASE) || defined(RELEASE_LOGGING) || defined(ENABLE_PROFILING_CODE)
+    #define USE_REMOTE_CONSOLE
+
+    struct SRemoteServer;
+#endif
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+// CRemoteConsole
+//
+// IRemoteConsole implementation
+//
+/////////////////////////////////////////////////////////////////////////////////////////////
+class CRemoteConsole
+    : public IRemoteConsole
+{
+public:
+    static CRemoteConsole* GetInst() 
+    { 
+        static StaticInstance<CRemoteConsole, AZStd::no_destruct<CRemoteConsole>> inst;
+        return &inst; 
+    }
+
+    virtual void RegisterConsoleVariables();
+    virtual void UnregisterConsoleVariables();
+
+    virtual void Start();
+    virtual void Stop();
+    virtual bool IsStarted() const { return m_running; }
+
+    virtual void AddLogMessage(const char* log);
+    virtual void AddLogWarning(const char* log);
+    virtual void AddLogError(const char* log);
+
+    virtual void Update();
+
+    virtual void RegisterListener(IRemoteConsoleListener* pListener, const char* name);
+    virtual void UnregisterListener(IRemoteConsoleListener* pListener);
+
+    typedef CListenerSet<IRemoteConsoleListener*> TListener;
+
+
+    CRemoteConsole();
+    virtual ~CRemoteConsole();
+
+    TListener m_listener;
+    int m_lastPortValue = 0;
+    volatile bool m_running;
+
+#if defined(USE_REMOTE_CONSOLE)
+    SRemoteServer* m_pServer;
+    ICVar* m_pLogEnableRemoteConsole = nullptr;
+    ICVar* m_remoteConsoleAllowedHostList = nullptr;
+    ICVar* m_remoteConsolePort = nullptr;
+#endif
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_REMOTECONSOLE_REMOTECONSOLE_H
diff --git a/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_impl.inl b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_impl.inl
new file mode 100644
index 0000000000..a0e4a8e537
--- /dev/null
+++ b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_impl.inl
@@ -0,0 +1,180 @@
+/*
+ * 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 <RemoteConsoleCore.h>
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////
+CRemoteConsole::CRemoteConsole()
+    : m_listener(1)
+    , m_lastPortValue(0)
+    , m_running(false)
+
+    , m_pServer(nullptr)
+    , m_pLogEnableRemoteConsole(nullptr)
+    , m_remoteConsoleAllowedHostList(nullptr)
+    , m_remoteConsolePort(nullptr)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+CRemoteConsole::~CRemoteConsole()
+{
+    Stop();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::RegisterConsoleVariables()
+{
+    m_pLogEnableRemoteConsole = REGISTER_INT("log_EnableRemoteConsole", 1, VF_DUMPTODISK, "enables/disables the remote console");
+    m_remoteConsoleAllowedHostList = REGISTER_STRING("log_RemoteConsoleAllowedAddresses", "", VF_DUMPTODISK, "COMMA separated list of allowed hosts or IP addresses which can connect");
+    m_remoteConsolePort = REGISTER_INT("log_RemoteConsolePort", defaultRemoteConsolePort, VF_DUMPTODISK, "Base port (4600 for example) for remote console to listen on.  It will start there and continue upwards until an unused one is found.");
+    m_lastPortValue = 0;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::UnregisterConsoleVariables()
+{
+    m_pLogEnableRemoteConsole = nullptr;
+    m_remoteConsoleAllowedHostList = nullptr;
+    m_remoteConsolePort = nullptr;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::Start()
+{
+    if (!IsStarted())
+    {
+        m_pServer = new SRemoteServer;
+
+        m_pServer->StartServer();
+        m_running = true;
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::Stop()
+{
+    // make sure we don't stop if we never started the remote console in the first place
+    if (IsStarted())
+    {
+        m_running = false;
+        m_pServer->StopServer();
+        m_pServer->WaitForThread();
+
+        delete m_pServer;
+        m_pServer = nullptr;
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::AddLogMessage(const char* log)
+{
+    if (!IsStarted())
+    {
+        return;
+    }
+
+    IRemoteEvent* pEvent = new SStringEvent<eCET_LogMessage>(log);
+    m_pServer->AddEvent(pEvent);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::AddLogWarning(const char* log)
+{
+    if (!IsStarted())
+    {
+        return;
+    }
+
+    IRemoteEvent* pEvent = new SStringEvent<eCET_LogWarning>(log);
+    m_pServer->AddEvent(pEvent);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::AddLogError(const char* log)
+{
+    if (!IsStarted())
+    {
+        return;
+    }
+
+    IRemoteEvent* pEvent = new SStringEvent<eCET_LogError>(log);
+    m_pServer->AddEvent(pEvent);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::Update()
+{
+    if (m_pLogEnableRemoteConsole)
+    {
+        // we disable the remote console in the editor, since there is no reason to remote into it and we don't want it eating up that port
+        // number anyway and preventing the game from using it.
+        bool isEditor = gEnv && gEnv->IsEditor();
+        bool isEnabled = (!isEditor) && (m_pLogEnableRemoteConsole->GetIVal());
+        bool isStarted = IsStarted();
+
+        int newPortValue = m_remoteConsolePort->GetIVal();
+
+        // the editor never allows remote control.
+        if ((isEnabled) && (!isStarted))
+        {
+            Start();
+        }
+        else if (isStarted)
+        {
+            if ((!isEnabled) || (newPortValue != m_lastPortValue))
+            {
+                Stop();
+            }
+        }
+
+        m_lastPortValue = newPortValue;
+
+    }
+
+    if (m_pServer)
+    {
+        TEventBuffer events;
+        m_pServer->GetEvents(events);
+        for (TEventBuffer::iterator it = events.begin(), end = events.end(); it != end; ++it)
+        {
+            IRemoteEvent* pEvent = *it;
+            switch (pEvent->GetType())
+            {
+            case eCET_ConsoleCommand:
+                for (TListener::Notifier notifier(m_listener); notifier.IsValid(); notifier.Next())
+                {
+                    notifier->OnConsoleCommand(((SStringEvent<eCET_ConsoleCommand>*)pEvent)->GetData());
+                }
+                break;
+            case eCET_GameplayEvent:
+                for (TListener::Notifier notifier(m_listener); notifier.IsValid(); notifier.Next())
+                {
+                    notifier->OnGameplayCommand(((SStringEvent<eCET_GameplayEvent>*)pEvent)->GetData());
+                }
+                break;
+            }
+            delete *it;
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const char* name)
+{
+    m_listener.Add(pListener, name);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
+{
+    m_listener.Remove(pListener);
+}
diff --git a/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_none.inl b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_none.inl
new file mode 100644
index 0000000000..82595defea
--- /dev/null
+++ b/Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_none.inl
@@ -0,0 +1,70 @@
+/*
+ * 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
+ *
+ */
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+CRemoteConsole::CRemoteConsole()
+    : m_listener(1)
+    , m_lastPortValue(0)
+    , m_running(false)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+CRemoteConsole::~CRemoteConsole()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::RegisterConsoleVariables()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::UnregisterConsoleVariables()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::Start()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::Stop()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::AddLogMessage(const char* log)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::AddLogWarning(const char* log)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::AddLogError(const char* log)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::Update()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const char* name)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
+{
+}
diff --git a/Code/Legacy/CrySystem/SimpleStringPool.h b/Code/Legacy/CrySystem/SimpleStringPool.h
new file mode 100644
index 0000000000..a8b7d7d06c
--- /dev/null
+++ b/Code/Legacy/CrySystem/SimpleStringPool.h
@@ -0,0 +1,373 @@
+/*
+ * 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_SIMPLESTRINGPOOL_H
+#define CRYINCLUDE_CRYSYSTEM_SIMPLESTRINGPOOL_H
+#pragma once
+
+#include "ISystem.h"
+
+#include <StlUtils.h>
+
+//TODO: Pull most of this into a cpp file!
+
+
+struct SStringData
+{
+    SStringData(const char* szString, int nStrLen)
+        : m_szString(szString)
+        , m_nStrLen(nStrLen)
+    {
+    }
+
+    const char* m_szString;
+    int m_nStrLen;
+    bool operator==(const SStringData& other) const
+    {
+        if (m_nStrLen != other.m_nStrLen)
+        {
+            return false;
+        }
+
+        return strcmp(m_szString, other.m_szString) == 0;
+    }
+private:
+};
+
+template<>
+inline const char* stl::constchar_cast(const SStringData& in)
+{
+    return in.m_szString;
+}
+
+
+/////////////////////////////////////////////////////////////////////
+// String pool implementation.
+// Inspired by expat implementation.
+/////////////////////////////////////////////////////////////////////
+class CSimpleStringPool
+{
+public:
+    enum
+    {
+        STD_BLOCK_SIZE = 1u << 16
+    };
+    struct BLOCK
+    {
+        BLOCK* next;
+        int size;
+        char s[1];
+    };
+    unsigned int m_blockSize;
+    BLOCK* m_blocks;
+    BLOCK* m_free_blocks;
+    const char* m_end;
+    char* m_ptr;
+    char* m_start;
+    int nUsedSpace;
+    int nUsedBlocks;
+    bool m_reuseStrings;
+
+    typedef AZStd::unordered_map<SStringData, char*, stl::hash_string<SStringData> > TStringToExistingStringMap;
+    TStringToExistingStringMap m_stringToExistingStringMap;
+
+    static size_t g_nTotalAllocInXmlStringPools;
+
+    CSimpleStringPool()
+    {
+        m_blockSize = STD_BLOCK_SIZE  - offsetof(BLOCK, s);
+        m_blocks = 0;
+        m_start = 0;
+        m_ptr = 0;
+        m_end = 0;
+        nUsedSpace = 0;
+        nUsedBlocks = 0;
+        m_free_blocks = 0;
+        m_reuseStrings = false;
+    }
+
+    explicit CSimpleStringPool(bool reuseStrings)
+        : m_blockSize(STD_BLOCK_SIZE - offsetof(BLOCK, s))
+        , m_blocks(NULL)
+        , m_free_blocks(NULL)
+        , m_end(0)
+        , m_ptr(0)
+        , m_start(0)
+        , nUsedSpace(0)
+        , nUsedBlocks(0)
+        , m_reuseStrings(reuseStrings)
+    {
+    }
+
+    ~CSimpleStringPool()
+    {
+        BLOCK* pBlock = m_blocks;
+        while (pBlock)
+        {
+            BLOCK* temp = pBlock->next;
+            g_nTotalAllocInXmlStringPools -= (offsetof(BLOCK, s) + pBlock->size * sizeof(char));
+            CryModuleFree(pBlock);
+            pBlock = temp;
+        }
+        pBlock = m_free_blocks;
+        while (pBlock)
+        {
+            BLOCK* temp = pBlock->next;
+            g_nTotalAllocInXmlStringPools -= (offsetof(BLOCK, s) + pBlock->size * sizeof(char));
+            CryModuleFree(pBlock);
+            pBlock = temp;
+        }
+        m_blocks = 0;
+        m_ptr = 0;
+        m_start = 0;
+        m_end = 0;
+    }
+    void SetBlockSize(unsigned int nBlockSize)
+    {
+        if (nBlockSize > 1024 * 1024)
+        {
+            nBlockSize = 1024 * 1024;
+        }
+        unsigned int size = 512;
+        while (size < nBlockSize)
+        {
+            size *= 2;
+        }
+
+        m_blockSize = size - offsetof(BLOCK, s);
+    }
+    void Clear()
+    {
+        BLOCK* pLast = m_free_blocks;
+        if (pLast)
+        {
+            while (pLast->next)
+            {
+                pLast = pLast->next;
+            }
+
+            pLast->next = m_blocks;
+        }
+        else
+        {
+            m_free_blocks = m_blocks;
+        }
+
+        m_blocks = 0;
+        m_start = 0;
+        m_ptr = 0;
+        m_end = 0;
+        nUsedSpace = 0;
+        if (m_reuseStrings)
+        {
+            m_stringToExistingStringMap.clear();
+        }
+    }
+    char* Append(const char* ptr, int nStrLen)
+    {
+        // If a string does not fit within the remainder of the string pool, a new pool will be allocated with at least
+        // nStrLen + 1 size, which means this code does take care of incredibly large strings.
+
+        if (m_reuseStrings)
+        {
+            if (char* existingString = FindExistingString(ptr, nStrLen))
+            {
+                return existingString;
+            }
+        }
+
+        char* ret = m_ptr;
+        if (m_ptr && nStrLen + 1 < (m_end - m_ptr))
+        {
+            memcpy(m_ptr, ptr, nStrLen);
+            m_ptr = m_ptr + nStrLen;
+            *m_ptr++ = 0; // add null termination.
+        }
+        else
+        {
+            int nNewBlockSize = std::max(nStrLen + 1, (int)m_blockSize);
+            AllocBlock(nNewBlockSize, nStrLen + 1);
+            PREFAST_ASSUME(m_ptr);
+            memcpy(m_ptr, ptr, nStrLen);
+            m_ptr = m_ptr + nStrLen;
+            *m_ptr++ = 0; // add null termination.
+            ret = m_start;
+        }
+
+        if (m_reuseStrings)
+        {
+            assert(!FindExistingString(ptr, nStrLen));
+            m_stringToExistingStringMap[SStringData(ret, nStrLen)] = ret;
+        }
+
+        nUsedSpace += nStrLen;
+        return ret;
+    }
+    char* ReplaceString(const char* str1, const char* str2)
+    {
+        if (m_reuseStrings)
+        {
+            CryFatalError("Can't replace strings in an xml node that reuses strings");
+        }
+
+        int nStrLen1 = strlen(str1);
+        int nStrLen2 = strlen(str2);
+
+        // undo ptr1 add.
+        if (m_ptr != m_start)
+        {
+            m_ptr = m_ptr - nStrLen1 - 1;
+        }
+
+        assert(m_ptr == str1);
+
+        int nStrLen = nStrLen1 + nStrLen2;
+
+        char* ret = m_ptr;
+        if (m_ptr && nStrLen + 1 < (m_end - m_ptr))
+        {
+            if (m_ptr != str1)
+            {
+                memcpy(m_ptr, str1, nStrLen1);
+            }
+            memcpy(m_ptr + nStrLen1, str2, nStrLen2);
+            m_ptr = m_ptr + nStrLen;
+            *m_ptr++ = 0; // add null termination.
+        }
+        else
+        {
+            int nNewBlockSize = std::max(nStrLen + 1, (int)m_blockSize);
+            if (m_ptr == m_start)
+            {
+                ReallocBlock(nNewBlockSize * 2); // Reallocate current block.
+                PREFAST_ASSUME(m_ptr);
+                memcpy(m_ptr + nStrLen1, str2, nStrLen2);
+            }
+            else
+            {
+                AllocBlock(nNewBlockSize, nStrLen + 1);
+                PREFAST_ASSUME(m_ptr);
+                memcpy(m_ptr, str1, nStrLen1);
+                memcpy(m_ptr + nStrLen1, str2, nStrLen2);
+            }
+
+            m_ptr = m_ptr + nStrLen;
+            *m_ptr++ = 0; // add null termination.
+            ret = m_start;
+        }
+        nUsedSpace += nStrLen;
+        return ret;
+    }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        BLOCK* pBlock = m_blocks;
+        while (pBlock)
+        {
+            pSizer->AddObject(pBlock, offsetof(BLOCK, s) + pBlock->size * sizeof(char));
+            pBlock = pBlock->next;
+        }
+
+        pBlock = m_free_blocks;
+        while (pBlock)
+        {
+            pSizer->AddObject(pBlock, offsetof(BLOCK, s) + pBlock->size * sizeof(char));
+            pBlock = pBlock->next;
+        }
+    }
+
+private:
+    CSimpleStringPool(const CSimpleStringPool&);
+    CSimpleStringPool& operator = (const CSimpleStringPool&);
+
+private:
+    void AllocBlock(int blockSize, int nMinBlockSize)
+    {
+        if (m_free_blocks)
+        {
+            BLOCK* pBlock = m_free_blocks;
+            BLOCK* pPrev = 0;
+            while (pBlock)
+            {
+                if (pBlock->size >= nMinBlockSize)
+                {
+                    // Reuse free block
+                    if (pPrev)
+                    {
+                        pPrev->next = pBlock->next;
+                    }
+                    else
+                    {
+                        m_free_blocks = pBlock->next;
+                    }
+
+                    pBlock->next = m_blocks;
+                    m_blocks = pBlock;
+                    m_ptr = pBlock->s;
+                    m_start = pBlock->s;
+                    m_end = pBlock->s + pBlock->size;
+                    return;
+                }
+                pPrev = pBlock;
+                pBlock = pBlock->next;
+            }
+        }
+        size_t nMallocSize = offsetof(BLOCK, s) + blockSize * sizeof(char);
+        g_nTotalAllocInXmlStringPools += nMallocSize;
+
+        BLOCK* pBlock = (BLOCK*)CryModuleMalloc(nMallocSize);
+        ;
+        assert(pBlock);
+        pBlock->size = blockSize;
+        pBlock->next = m_blocks;
+        m_blocks = pBlock;
+        m_ptr = pBlock->s;
+        m_start = pBlock->s;
+        m_end = pBlock->s + blockSize;
+        nUsedBlocks++;
+    }
+    void ReallocBlock(int blockSize)
+    {
+        if (m_reuseStrings)
+        {
+            CryFatalError("Can't replace strings in an xml node that reuses strings");
+        }
+
+        BLOCK* pThisBlock = m_blocks;
+        BLOCK* pPrevBlock = m_blocks->next;
+        m_blocks = pPrevBlock;
+
+        size_t nMallocSize = offsetof(BLOCK, s) + blockSize * sizeof(char);
+        if (pThisBlock)
+        {
+            g_nTotalAllocInXmlStringPools -= (offsetof(BLOCK, s) + pThisBlock->size * sizeof(char));
+        }
+        g_nTotalAllocInXmlStringPools += nMallocSize;
+
+
+        BLOCK* pBlock = (BLOCK*)CryModuleRealloc(pThisBlock, nMallocSize);
+        assert(pBlock);
+        pBlock->size = blockSize;
+        pBlock->next = m_blocks;
+        m_blocks = pBlock;
+        m_ptr = pBlock->s;
+        m_start = pBlock->s;
+        m_end = pBlock->s + blockSize;
+    }
+
+    char* FindExistingString(const char* szString, int nStrLen)
+    {
+        SStringData testData(szString, nStrLen);
+        char* szResult = stl::find_in_map(m_stringToExistingStringMap, testData, NULL);
+        assert(!szResult || !_stricmp(szResult, szString));
+        return szResult;
+    }
+};
+
+
+#endif // CRYINCLUDE_CRYSYSTEM_SIMPLESTRINGPOOL_H
diff --git a/Code/Legacy/CrySystem/System.cpp b/Code/Legacy/CrySystem/System.cpp
new file mode 100644
index 0000000000..f28a540209
--- /dev/null
+++ b/Code/Legacy/CrySystem/System.cpp
@@ -0,0 +1,1811 @@
+/*
+ * 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 : CryENGINE system core-handle all subsystems
+
+
+#include "CrySystem_precompiled.h"
+#include "System.h"
+#include <time.h>
+#include <AzCore/Console/Console.h>
+#include <AzCore/IO/IStreamer.h>
+#include <AzCore/IO/SystemFile.h>
+#include "CryLibrary.h"
+#include <CryPath.h>
+#include <CrySystemBus.h>
+#include <AzFramework/API/ApplicationAPI.h>
+#include <AzFramework/API/ApplicationAPI_Platform.h>
+#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
+#include <AzCore/Debug/Trace.h>
+#include <AzCore/Debug/IEventLogger.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzFramework/Logging/MissingAssetLogger.h>
+#include <AzFramework/Entity/EntityDebugDisplayBus.h>
+#include <AzCore/Interface/Interface.h>
+
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define SYSTEM_CPP_SECTION_1 1
+#define SYSTEM_CPP_SECTION_2 2
+#define SYSTEM_CPP_SECTION_3 3
+#define SYSTEM_CPP_SECTION_4 4
+#define SYSTEM_CPP_SECTION_5 5
+#define SYSTEM_CPP_SECTION_6 6
+#define SYSTEM_CPP_SECTION_7 7
+#define SYSTEM_CPP_SECTION_8 8
+#define SYSTEM_CPP_SECTION_9 9
+#endif
+
+#if defined(_RELEASE) && AZ_LEGACY_CRYSYSTEM_TRAIT_USE_EXCLUDEUPDATE_ON_CONSOLE
+//exclude some not needed functionality for release console builds
+#define EXCLUDE_UPDATE_ON_CONSOLE
+#endif
+
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+// If app hasn't chosen, set to work with Windows 98, Windows Me, Windows 2000, Windows XP and beyond
+#include <windows.h>
+
+LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    CSystem* pSystem = 0;
+    if (gEnv)
+    {
+        pSystem = static_cast<CSystem*>(gEnv->pSystem);
+    }
+    if (pSystem && !pSystem->IsQuitting())
+    {
+        LRESULT result = 0;
+        bool bAny = false;
+        for (std::vector<IWindowMessageHandler*>::const_iterator it = pSystem->m_windowMessageHandlers.begin(); it != pSystem->m_windowMessageHandlers.end(); ++it)
+        {
+            IWindowMessageHandler* pHandler = *it;
+            LRESULT maybeResult = 0xDEADDEAD;
+            if (pHandler->HandleMessage(hWnd, uMsg, wParam, lParam, &maybeResult))
+            {
+                assert(maybeResult != 0xDEADDEAD && "Message handler indicated a resulting value, but no value was written");
+                if (bAny)
+                {
+                    assert(result == maybeResult && "Two window message handlers tried to return different result values");
+                }
+                else
+                {
+                    bAny = true;
+                    result = maybeResult;
+                }
+            }
+        }
+        if (bAny)
+        {
+            // One of the registered handlers returned something
+            return result;
+        }
+    }
+
+    // Handle with the default procedure
+#if defined(UNICODE) || defined(_UNICODE)
+    assert(IsWindowUnicode(hWnd) && "Window should be Unicode when compiling with UNICODE");
+#else
+    if (!IsWindowUnicode(hWnd))
+    {
+        return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+    }
+#endif
+    return DefWindowProcW(hWnd, uMsg, wParam, lParam);
+}
+#endif
+
+#if defined(LINUX) && !defined(ANDROID)
+#include <execinfo.h> // for backtrace
+#endif
+
+#if defined(ANDROID)
+#include <unwind.h>  // for _Unwind_Backtrace and _Unwind_GetIP
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_1
+#include AZ_RESTRICTED_FILE(System_cpp)
+#endif
+
+#include <IRenderer.h>
+#include <IMovieSystem.h>
+#include <ILog.h>
+#include <IAudioSystem.h>
+#include <IProcess.h>
+#include <LyShine/ILyShine.h>
+
+#include <LoadScreenBus.h>
+
+#include <AzFramework/Archive/Archive.h>
+#include "XConsole.h"
+#include "Log.h"
+
+#include "XML/xml.h"
+#include "XML/ReadWriteXMLSink.h"
+
+#include "LocalizedStringManager.h"
+#include "XML/XmlUtils.h"
+#include "SystemEventDispatcher.h"
+#include "HMDBus.h"
+
+#include "zlib.h"
+#include "RemoteConsole/RemoteConsole.h"
+
+#include <PNoise3.h>
+#include <StringUtils.h>
+
+#include <LyShine/Bus/UiCursorBus.h>
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include <AzFramework/Input/Buses/Requests/InputSystemRequestBus.h>
+
+#ifdef WIN32
+
+#include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
+
+// To enable profiling with vtune (https://software.intel.com/en-us/intel-vtune-amplifier-xe), make sure the line below is not commented out
+//#define  PROFILE_WITH_VTUNE
+
+#include <process.h>
+#include <malloc.h>
+#endif
+
+#include <ILevelSystem.h>
+
+#include <AzFramework/IO/LocalFileIO.h>
+
+// profilers api.
+VTuneFunction VTResume = NULL;
+VTuneFunction VTPause = NULL;
+
+// Define global cvars.
+SSystemCVars g_cvars;
+
+#include <IViewSystem.h>
+
+#include <AzCore/Module/Environment.h>
+#include <AzCore/Component/ComponentApplication.h>
+#include "AZCoreLogSink.h"
+
+#if defined(ANDROID)
+namespace
+{
+    struct Callstack
+    {
+        Callstack()
+            : addrs(NULL)
+            , ignore(0)
+            , count(0)
+        {
+        }
+        Callstack(void** addrs, size_t ignore, size_t count)
+        {
+            this->addrs = addrs;
+            this->ignore = ignore;
+            this->count = count;
+        }
+        void** addrs;
+        size_t ignore;
+        size_t count;
+    };
+
+    static _Unwind_Reason_Code trace_func(struct _Unwind_Context* context, void* arg)
+    {
+        Callstack* cs = static_cast<Callstack*>(arg);
+        if (cs->count)
+        {
+            void* ip = (void*) _Unwind_GetIP(context);
+            if (ip)
+            {
+                if (cs->ignore)
+                {
+                    cs->ignore--;
+                }
+                else
+                {
+                    cs->addrs[0] = ip;
+                    cs->addrs++;
+                    cs->count--;
+                }
+            }
+        }
+        return _URC_NO_REASON;
+    }
+
+    static int Backtrace(void** addrs, size_t ignore, size_t size)
+    {
+        Callstack cs(addrs, ignore, size);
+        _Unwind_Backtrace(trace_func, (void*) &cs);
+        return size - cs.count;
+    }
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////////////////
+// System Implementation.
+//////////////////////////////////////////////////////////////////////////
+CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
+{
+    CrySystemRequestBus::Handler::BusConnect();
+
+    if (!pSharedEnvironment)
+    {
+        CryFatalError("No shared environment instance provided. "
+            "Cross-module sharing of EBuses and allocators "
+            "is not possible.");
+    }
+
+    m_systemGlobalState = ESYSTEM_GLOBAL_STATE_UNKNOWN;
+    m_iHeight = 0;
+    m_iWidth = 0;
+    m_iColorBits = 0;
+    // CRT ALLOCATION threshold
+
+    m_bIsAsserting = false;
+    m_pSystemEventDispatcher = new CSystemEventDispatcher(); // Must be first.
+
+    if (m_pSystemEventDispatcher)
+    {
+        m_pSystemEventDispatcher->RegisterListener(this);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Clear environment.
+    //////////////////////////////////////////////////////////////////////////
+    memset(&m_env, 0, sizeof(m_env));
+
+    //////////////////////////////////////////////////////////////////////////
+    // Initialize global environment interface pointers.
+    m_env.pSystem = this;
+    m_env.pTimer = &m_Time;
+    m_env.pNameTable = &m_nameTable;
+    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;
+
+    m_bInitializedSuccessfully = false;
+    m_bRelaunch = false;
+    m_iLoadingMode = 0;
+    m_bTestMode = false;
+    m_bEditor = false;
+    m_bPreviewMode = false;
+    m_bIgnoreUpdates = false;
+    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;
+
+
+    m_pXMLUtils = new CXmlUtils(this);
+
+    if (!AZ::AllocatorInstance<AZ::OSAllocator>::IsReady())
+    {
+        m_initedOSAllocator = true;
+        AZ::AllocatorInstance<AZ::OSAllocator>::Create();
+    }
+    if (!AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
+    {
+        m_initedSysAllocator = true;
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
+        AZ::Debug::Trace::Instance().Init();
+    }
+
+    m_eRuntimeState = ESYSTEM_EVENT_LEVEL_UNLOAD;
+
+    m_bHasRenderedErrorMessage = false;
+
+    m_pDataProbe = nullptr;
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
+    RegisterWindowMessageHandler(this);
+#endif
+
+    m_ConfigPlatform = CONFIG_INVALID_PLATFORM;
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
+CSystem::~CSystem()
+{
+    ShutDown();
+
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
+    UnregisterWindowMessageHandler(this);
+#endif
+
+    CRY_ASSERT(m_windowMessageHandlers.empty() && "There exists a dangling window message handler somewhere");
+
+    SAFE_DELETE(m_pXMLUtils);
+    SAFE_DELETE(m_pSystemEventDispatcher);
+
+    AZCoreLogSink::Disconnect();
+    if (m_initedSysAllocator)
+    {
+        AZ::Debug::Trace::Instance().Destroy();
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
+    }
+    if (m_initedOSAllocator)
+    {
+        AZ::AllocatorInstance<AZ::OSAllocator>::Destroy();
+    }
+
+    AZ::Environment::Detach();
+
+    m_env.pSystem = 0;
+    gEnv = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::Release()
+{
+    //Disconnect the render bus
+    AZ::RenderNotificationsBus::Handler::BusDisconnect();
+
+    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;
+}
+
+
+///////////////////////////////////////////////////
+void CSystem::ShutDown()
+{
+    CryLogAlways("System Shutdown");
+
+    // don't broadcast OnCrySystemShutdown unless
+    // we'd previously broadcast OnCrySystemInitialized
+    if (m_bInitializedSuccessfully)
+    {
+        EBUS_EVENT(CrySystemEventBus, OnCrySystemShutdown, *this);
+    }
+
+    if (m_pUserCallback)
+    {
+        m_pUserCallback->OnShutdown();
+    }
+
+    if (GetIRemoteConsole()->IsStarted())
+    {
+        GetIRemoteConsole()->Stop();
+    }
+
+    if (m_sys_firstlaunch)
+    {
+        m_sys_firstlaunch->Set("0");
+    }
+
+    if ((m_bEditor) && (m_env.pConsole))
+    {
+        // restore the old saved cvars
+        if (m_env.pConsole->GetCVar("r_Width"))
+        {
+            m_env.pConsole->GetCVar("r_Width")->Set(m_iWidth);
+        }
+        if (m_env.pConsole->GetCVar("r_Height"))
+        {
+            m_env.pConsole->GetCVar("r_Height")->Set(m_iHeight);
+        }
+        if (m_env.pConsole->GetCVar("r_ColorBits"))
+        {
+            m_env.pConsole->GetCVar("r_ColorBits")->Set(m_iColorBits);
+        }
+    }
+
+    if (m_bEditor && !m_bRelaunch)
+    {
+        SaveConfiguration();
+    }
+
+    // Dispatch the full-shutdown event in case this is not a fast-shutdown.
+    if (m_pSystemEventDispatcher != NULL)
+    {
+        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();
+        gEnv->pLyShine = nullptr;
+    }
+
+    SAFE_RELEASE(m_env.pMovieSystem);
+    SAFE_RELEASE(m_env.pLyShine);
+    SAFE_RELEASE(m_env.pCryFont);
+    if (m_env.pConsole)
+    {
+        ((CXConsole*)m_env.pConsole)->FreeRenderResources();
+    }
+    SAFE_RELEASE(m_pViewSystem);
+    SAFE_RELEASE(m_pLevelSystem);
+
+    if (m_env.pLog)
+    {
+        m_env.pLog->UnregisterConsoleVariables();
+    }
+
+    GetIRemoteConsole()->UnregisterConsoleVariables();
+
+    // 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;
+    m_pCmdLine = 0;
+
+    // Audio System Shutdown!
+    // Shut down audio as late as possible but before the streaming system and console get released!
+    Audio::Gem::AudioSystemGemRequestBus::Broadcast(&Audio::Gem::AudioSystemGemRequestBus::Events::Release);
+
+    // Shut down console as late as possible and after audio!
+    SAFE_RELEASE(m_env.pConsole);
+
+    // Log must be last thing released.
+    if (m_env.pLog)
+    {
+        m_env.pLog->FlushAndClose();
+    }
+    SAFE_RELEASE(m_env.pLog);   // creates log backup
+
+    ShutdownFileSystem();
+
+    ShutdownModuleLibraries();
+
+    EBUS_EVENT(CrySystemEventBus, OnCrySystemPostShutdown);
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
+void CSystem::Quit()
+{
+    CryLogAlways("CSystem::Quit invoked from thread %" PRI_THREADID " (main is %" PRI_THREADID ")", GetCurrentThreadId(), gEnv->mMainThreadId);
+
+    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::ExitMainLoop);
+
+    // If this was set from anywhere but the main thread, bail and let the main thread handle shutdown
+    if (GetCurrentThreadId() != gEnv->mMainThreadId)
+    {
+        return;
+    }
+
+    if (m_pUserCallback)
+    {
+        m_pUserCallback->OnQuit();
+    }
+
+    gEnv->pLog->FlushAndClose();
+
+    // Latest possible place to flush any pending messages to disk before the forceful termination.
+    if (auto logger = AZ::Interface<AZ::Debug::IEventLogger>::Get(); logger)
+    {
+        logger->Flush();
+    }
+
+    /*
+    * TODO: This call to _exit, _Exit, TerminateProcess etc. needs to
+    * eventually be removed. This causes an extremely early exit before we
+    * actually perform cleanup. When this gets called most managers are
+    * simply never deleted and we leave it to the OS to clean up our mess
+    * which is just really bad practice. However there are LOTS of issues
+    * with shutdown at the moment. Removing this will simply cause
+    * a crash when either the Editor or Launcher initiate shutdown. Both
+    * applications crash differently too. Bugs will be logged about those
+    * issues.
+    */
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_4
+#include AZ_RESTRICTED_FILE(System_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(WIN32) || defined(WIN64)
+    TerminateProcess(GetCurrentProcess(), m_env.retCode);
+#else
+    exit(m_env.retCode);
+#endif
+
+#ifdef WIN32
+    //Post a WM_QUIT message to the Win32 api which causes the message loop to END
+    //This is not the same as handling a WM_DESTROY event which destroys a window
+    //but keeps the message loop alive.
+    PostQuitMessage(0);
+#endif
+}
+/////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
+bool CSystem::IsQuitting() const
+{
+    bool wasExitMainLoopRequested = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(wasExitMainLoopRequested, &AzFramework::ApplicationRequests::WasExitMainLoopRequested);
+    return wasExitMainLoopRequested;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::SetIProcess(IProcess* process)
+{
+    m_pProcess = process;
+    //if (m_pProcess)
+    //m_pProcess->SetPMessage("");
+}
+
+//////////////////////////////////////////////////////////////////////////
+ISystem* CSystem::GetCrySystem()
+{
+    return this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::SleepIfNeeded()
+{
+    FUNCTION_PROFILER_FAST(this, PROFILE_SYSTEM, g_bProfilerEnabled);
+
+    ITimer* const pTimer = gEnv->pTimer;
+    static bool firstCall = true;
+
+    typedef MiniQueue<CTimeValue, 32> PrevNow;
+    static PrevNow prevNow;
+    if (firstCall)
+    {
+        m_lastTickTime = pTimer->GetAsyncTime();
+        prevNow.Push(m_lastTickTime);
+        firstCall = false;
+        return;
+    }
+
+    const float maxRate = m_svDedicatedMaxRate->GetFVal();
+    const float minTime = 1.0f / maxRate;
+    CTimeValue now = pTimer->GetAsyncTime();
+    float elapsed = (now - m_lastTickTime).GetSeconds();
+
+    if (prevNow.Full())
+    {
+        prevNow.Pop();
+    }
+    prevNow.Push(now);
+
+    static bool allowStallCatchup = true;
+    if (elapsed > minTime && allowStallCatchup)
+    {
+        allowStallCatchup = false;
+        m_lastTickTime = pTimer->GetAsyncTime();
+        return;
+    }
+    allowStallCatchup = true;
+
+    float totalElapsed = (now - prevNow.Front()).GetSeconds();
+    float wantSleepTime = CLAMP(minTime * (prevNow.Size() - 1) - totalElapsed, 0, (minTime - elapsed) * 0.9f);
+    static float sleepTime = 0;
+    sleepTime = (15 * sleepTime + wantSleepTime) / 16;
+    int sleepMS = (int)(1000.0f * sleepTime + 0.5f);
+    if (sleepMS > 0)
+    {
+        AZ_PROFILE_FUNCTION_IDLE(AZ::Debug::ProfileCategory::System);
+        Sleep(sleepMS);
+    }
+
+    m_lastTickTime = pTimer->GetAsyncTime();
+}
+
+extern DWORD g_idDebugThreads[];
+extern int g_nDebugThreads;
+int prev_sys_float_exceptions = -1;
+
+//////////////////////////////////////////////////////////////////////
+bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
+{
+    // If we detect the quit flag at the start of Update, that means it was set
+    // from another thread, and we should quit immediately. Otherwise, it will
+    // be set by game logic or the console during Update and we will quit later
+    if (IsQuitting())
+    {
+        Quit();
+        return false;
+    }
+
+#ifndef EXCLUDE_UPDATE_ON_CONSOLE
+    // do the dedicated sleep earlier than the frame profiler to avoid having it counted
+    if (gEnv->IsDedicated())
+    {
+        SleepIfNeeded();
+    }
+#endif //EXCLUDE_UPDATE_ON_CONSOLE
+
+#ifdef WIN32
+    // enable/disable SSE fp exceptions (#nan and /0)
+    // need to do it each frame since sometimes they are being reset
+    _mm_setcsr(_mm_getcsr() & ~0x280 | (g_cvars.sys_float_exceptions > 0 ? 0 : 0x280));
+#endif //WIN32
+
+    FUNCTION_PROFILER_LEGACYONLY(GetISystem(), PROFILE_SYSTEM);
+    AZ_TRACE_METHOD();
+
+    m_nUpdateCounter++;
+#ifndef EXCLUDE_UPDATE_ON_CONSOLE
+    if (m_pUserCallback)
+    {
+        m_pUserCallback->OnUpdate();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Enable/Disable floating exceptions.
+    //////////////////////////////////////////////////////////////////////////
+    prev_sys_float_exceptions += 1 + g_cvars.sys_float_exceptions & prev_sys_float_exceptions >> 31;
+    if (prev_sys_float_exceptions != g_cvars.sys_float_exceptions)
+    {
+        prev_sys_float_exceptions = g_cvars.sys_float_exceptions;
+
+        EnableFloatExceptions(g_cvars.sys_float_exceptions);
+    }
+#endif //EXCLUDE_UPDATE_ON_CONSOLE
+       //////////////////////////////////////////////////////////////////////////
+
+    if (m_env.pLog)
+    {
+        m_env.pLog->Update();
+    }
+
+#ifdef USE_REMOTE_CONSOLE
+    GetIRemoteConsole()->Update();
+#endif
+    if (nPauseMode != 0)
+    {
+        m_bPaused = true;
+    }
+    else
+    {
+        m_bPaused = false;
+    }
+
+#ifdef PROFILE_WITH_VTUNE
+    if (m_bInDevMode)
+    {
+        if (VTPause != NULL && VTResume != NULL)
+        {
+            static bool bVtunePaused = true;
+
+            const AzFramework::InputChannel* inputChannelScrollLock = AzFramework::InputChannelRequests::FindInputChannel(AzFramework::InputDeviceKeyboard::Key::WindowsSystemScrollLock);
+            const bool bPaused = (inputChannelScrollLock ? inputChannelScrollLock->IsActive() : false);
+
+            {
+                if (bVtunePaused && !bPaused)
+                {
+                    GetIProfilingSystem()->VTuneResume();
+                }
+                if (!bVtunePaused && bPaused)
+                {
+                    GetIProfilingSystem()->VTunePause();
+                }
+                bVtunePaused = bPaused;
+            }
+        }
+    }
+#endif //PROFILE_WITH_VTUNE
+
+#ifndef EXCLUDE_UPDATE_ON_CONSOLE
+    if (m_bIgnoreUpdates)
+    {
+        return true;
+    }
+#endif //EXCLUDE_UPDATE_ON_CONSOLE
+
+    //static bool sbPause = false;
+    //bool bPause = false;
+    bool bNoUpdate = false;
+#ifndef EXCLUDE_UPDATE_ON_CONSOLE
+    if (m_sysNoUpdate && m_sysNoUpdate->GetIVal())
+    {
+        bNoUpdate = true;
+    }
+
+    m_bNoUpdate = bNoUpdate;
+#endif //EXCLUDE_UPDATE_ON_CONSOLE
+
+    //check if we are quitting from the game
+    if (IsQuitting())
+    {
+        Quit();
+        return (false);
+    }
+
+    //limit frame rate if vsync is turned off
+    //for consoles this is done inside renderthread to be vsync dependent
+    {
+        FRAME_PROFILER_LEGACYONLY("FRAME_CAP", gEnv->pSystem, PROFILE_SYSTEM);
+        AZ_TRACE_METHOD_NAME("FrameLimiter");
+        static ICVar* pSysMaxFPS = NULL;
+        static ICVar* pVSync = NULL;
+
+        if (pSysMaxFPS == NULL && gEnv && gEnv->pConsole)
+        {
+            pSysMaxFPS = gEnv->pConsole->GetCVar("sys_MaxFPS");
+        }
+        if (pVSync == NULL && gEnv && gEnv->pConsole)
+        {
+            pVSync = gEnv->pConsole->GetCVar("r_Vsync");
+        }
+
+        if (pSysMaxFPS && pVSync)
+        {
+            int32 maxFPS = pSysMaxFPS->GetIVal();
+            uint32 vSync = pVSync->GetIVal();
+
+            if (maxFPS == 0 && vSync == 0)
+            {
+                ILevelSystem* pLvlSys = GetILevelSystem();
+                const bool inLevel = pLvlSys && pLvlSys->IsLevelLoaded();
+                maxFPS = !inLevel || IsPaused() ? 60 : 0;
+            }
+
+            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())
+                {
+                    CrySleep(0);
+                }
+                sTimeLast = gEnv->pTimer->GetAsyncTime();
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    //update time subsystem
+    m_Time.UpdateOnFrameStart();
+
+    //////////////////////////////////////////////////////////////////////
+    //update console system
+    if (m_env.pConsole)
+    {
+        FRAME_PROFILER("SysUpdate:Console", this, PROFILE_SYSTEM);
+        m_env.pConsole->Update();
+    }
+
+    if (IsQuitting())
+    {
+        Quit();
+        return false;
+    }
+
+       //////////////////////////////////////////////////////////////////////
+       //update sound system Part 1 if in Editor / in Game Mode Viewsystem updates the Listeners
+    if (!m_env.IsEditorGameMode())
+    {
+        if ((updateFlags & ESYSUPDATE_EDITOR) != 0 && !bNoUpdate && nPauseMode != 1)
+        {
+            // updating the Listener Position in a first separate step.
+            // Updating all views here is a bit of a workaround, since we need
+            // to ensure that sound listeners owned by inactive views are also
+            // marked as inactive. Ideally that should happen when exiting game mode.
+            if (GetIViewSystem())
+            {
+                FRAME_PROFILER("SysUpdate:UpdateSoundListeners", this, PROFILE_SYSTEM);
+                GetIViewSystem()->UpdateSoundListeners();
+            }
+        }
+    }
+
+    // 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)
+    {
+        FRAME_PROFILER("SysUpdate:UpdateMovieSystem", this, PROFILE_SYSTEM);
+        UpdateMovieSystem(updateFlags, fMovieFrameTime, true);
+    }
+
+    return !IsQuitting();
+}
+
+//////////////////////////////////////////////////////////////////////
+bool CSystem::UpdatePostTickBus(int updateFlags, int /*nPauseMode*/)
+{
+    CTimeValue updateStart = gEnv->pTimer->GetAsyncTime();
+
+    // Run movie system post-update
+    if (!m_bNoUpdate)
+    {
+        const float fMovieFrameTime = m_Time.GetFrameTime(ITimer::ETIMER_UI);
+        FRAME_PROFILER("SysUpdate:UpdateMovieSystem", this, PROFILE_SYSTEM);
+        UpdateMovieSystem(updateFlags, fMovieFrameTime, false);
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    // Update sound system
+    if (!m_bNoUpdate)
+    {
+        FRAME_PROFILER("SysUpdate:UpdateAudioSystems", this, PROFILE_SYSTEM);
+        UpdateAudioSystems();
+    }
+
+    //Now update frame statistics
+    CTimeValue cur_time = gEnv->pTimer->GetAsyncTime();
+
+    CTimeValue a_second(g_cvars.sys_update_profile_time);
+    std::vector< std::pair<CTimeValue, float> >::iterator it = m_updateTimes.begin();
+    for (std::vector< std::pair<CTimeValue, float> >::iterator eit = m_updateTimes.end(); it != eit; ++it)
+    {
+        if ((cur_time - it->first) < a_second)
+        {
+            break;
+        }
+    }
+
+    {
+        if (it != m_updateTimes.begin())
+        {
+            m_updateTimes.erase(m_updateTimes.begin(), it);
+        }
+
+        float updateTime = (cur_time - updateStart).GetMilliSeconds();
+        m_updateTimes.push_back(std::make_pair(cur_time, updateTime));
+    }
+
+    {
+        FRAME_PROFILER("SysUpdate - SystemEventDispatcher::Update", this, PROFILE_SYSTEM);
+        m_pSystemEventDispatcher->Update();
+    }
+
+    if (!gEnv->IsEditing() && m_eRuntimeState == ESYSTEM_EVENT_LEVEL_GAMEPLAY_START)
+    {
+        gEnv->pCryPak->DisableRuntimeFileAccess(true);
+    }
+
+    // Also broadcast for anyone else that needs to draw global debug to do so now
+    AzFramework::DebugDisplayEventBus::Broadcast(&AzFramework::DebugDisplayEvents::DrawGlobalDebugInfo);
+
+    return !IsQuitting();
+}
+
+
+bool CSystem::UpdateLoadtime()
+{
+    return !IsQuitting();
+}
+
+void CSystem::UpdateAudioSystems()
+{
+    AZ_TRACE_METHOD();
+    FRAME_PROFILER_LEGACYONLY("SysUpdate:Audio", this, PROFILE_SYSTEM);
+    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::ExternalUpdate);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::GetUpdateStats(SSystemUpdateStats& stats)
+{
+    if (m_updateTimes.empty())
+    {
+        stats = SSystemUpdateStats();
+    }
+    else
+    {
+        stats.avgUpdateTime = 0;
+        stats.maxUpdateTime = -FLT_MAX;
+        stats.minUpdateTime = +FLT_MAX;
+        for (std::vector< std::pair<CTimeValue, float> >::const_iterator it = m_updateTimes.begin(), eit = m_updateTimes.end(); it != eit; ++it)
+        {
+            const float t = it->second;
+            stats.avgUpdateTime += t;
+            stats.maxUpdateTime = max(stats.maxUpdateTime, t);
+            stats.minUpdateTime = min(stats.minUpdateTime, t);
+        }
+        stats.avgUpdateTime /= m_updateTimes.size();
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::UpdateMovieSystem(const int updateFlags, const float fFrameTime, const bool bPreUpdate)
+{
+    if (m_env.pMovieSystem && !(updateFlags & ESYSUPDATE_EDITOR) && g_cvars.sys_trackview)
+    {
+        float fMovieFrameTime = fFrameTime;
+
+        if (fMovieFrameTime > g_cvars.sys_maxTimeStepForMovieSystem)
+        {
+            fMovieFrameTime = g_cvars.sys_maxTimeStepForMovieSystem;
+        }
+
+        if (bPreUpdate)
+        {
+            m_env.pMovieSystem->PreUpdate(fMovieFrameTime);
+        }
+        else
+        {
+            m_env.pMovieSystem->PostUpdate(fMovieFrameTime);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// XML stuff
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CSystem::CreateXmlNode(const char* sNodeName, bool bReuseStrings, bool bIsProcessingInstruction)
+{
+    return new CXmlNode(sNodeName, bReuseStrings, bIsProcessingInstruction);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IXmlUtils* CSystem::GetXmlUtils()
+{
+    return m_pXMLUtils;
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CSystem::LoadXmlFromFile(const char* sFilename, bool bReuseStrings)
+{
+    LOADING_TIME_PROFILE_SECTION_ARGS(sFilename);
+
+    return m_pXMLUtils->LoadXmlFromFile(sFilename, bReuseStrings);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CSystem::LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings, bool bSuppressWarnings)
+{
+    LOADING_TIME_PROFILE_SECTION
+    return m_pXMLUtils->LoadXmlFromBuffer(buffer, size, bReuseStrings, bSuppressWarnings);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSystem::CheckLogVerbosity(int verbosity)
+{
+    if (verbosity <= m_env.pLog->GetVerbosityLevel())
+    {
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::Warning(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    WarningV(module, severity, flags, file, format, args);
+    va_end(args);
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CSystem::ShowMessage(const char* text, const char* caption, unsigned int uType)
+{
+    if (m_pUserCallback)
+    {
+        return m_pUserCallback->ShowMessage(text, caption, uType);
+    }
+    return CryMessageBox(text, caption, uType);
+}
+
+inline const char* ValidatorModuleToString(EValidatorModule module)
+{
+    switch (module)
+    {
+    case VALIDATOR_MODULE_RENDERER:
+        return "Renderer";
+    case VALIDATOR_MODULE_3DENGINE:
+        return "3DEngine";
+    case VALIDATOR_MODULE_ASSETS:
+        return "Assets";
+    case VALIDATOR_MODULE_SYSTEM:
+        return "System";
+    case VALIDATOR_MODULE_AUDIO:
+        return "Audio";
+    case VALIDATOR_MODULE_MOVIE:
+        return "Movie";
+    case VALIDATOR_MODULE_EDITOR:
+        return "Editor";
+    case VALIDATOR_MODULE_NETWORK:
+        return "Network";
+    case VALIDATOR_MODULE_PHYSICS:
+        return "Physics";
+    case VALIDATOR_MODULE_ONLINE:
+        return "Online";
+    case VALIDATOR_MODULE_FEATURETESTS:
+        return "FeatureTests";
+    case VALIDATOR_MODULE_SHINE:
+        return "UI";
+    }
+    return "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::WarningV(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args)
+{
+    // Fran: No logging in a testing environment
+    if (m_env.pLog == 0)
+    {
+        return;
+    }
+
+    const char* sModuleFilter = m_env.pLog->GetModuleFilter();
+    if (sModuleFilter && *sModuleFilter != 0)
+    {
+        const char* sModule = ValidatorModuleToString(module);
+        if (strlen(sModule) > 1 || CryStringUtils::stristr(sModule, sModuleFilter) == 0)
+        {
+            // Filter out warnings from other modules.
+            return;
+        }
+    }
+
+    bool bDbgBreak = false;
+    if (severity == VALIDATOR_ERROR_DBGBRK)
+    {
+        bDbgBreak = true;
+        severity = VALIDATOR_ERROR; // change it to a standard VALIDATOR_ERROR for simplicity in the rest of the system
+    }
+
+    IMiniLog::ELogType ltype = ILog::eComment;
+    switch (severity)
+    {
+    case    VALIDATOR_ERROR:
+        ltype = ILog::eError;
+        break;
+    case    VALIDATOR_WARNING:
+        ltype = ILog::eWarning;
+        break;
+    case    VALIDATOR_COMMENT:
+        ltype = ILog::eComment;
+        break;
+    default:
+        break;
+    }
+    char szBuffer[MAX_WARNING_LENGTH];
+    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, format, args);
+
+    if (file && *file)
+    {
+        CryFixedStringT<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);
+    }
+
+    if (bDbgBreak && g_cvars.sys_error_debugbreak)
+    {
+        AZ::Debug::Trace::Break();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::GetLocalizedPath(const char* sLanguage, string& sLocalizedPath)
+{
+    // Omit the trailing slash!
+    string sLocalizationFolder(string().assign(PathUtil::GetLocalizationFolder(), 0, PathUtil::GetLocalizationFolder().size() - 1));
+
+    int locFormat = 0;
+    LocalizationManagerRequestBus::BroadcastResult(locFormat, &LocalizationManagerRequestBus::Events::GetLocalizationFormat);
+    if(locFormat == 1)
+    {
+        sLocalizedPath = sLocalizationFolder + "/" + sLanguage + ".loc.agsxml";
+    }
+    else
+    {
+    if (sLocalizationFolder.compareNoCase("Languages") != 0)
+    {
+        sLocalizedPath = sLocalizationFolder + "/" + sLanguage + "_xml.pak";
+    }
+    else
+    {
+        sLocalizedPath = string("Localized/") + sLanguage + "_xml.pak";
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::GetLocalizedAudioPath(const char* sLanguage, string& sLocalizedPath)
+{
+    // Omit the trailing slash!
+    string sLocalizationFolder(string().assign(PathUtil::GetLocalizationFolder(), 0, PathUtil::GetLocalizationFolder().size() - 1));
+
+    if (sLocalizationFolder.compareNoCase("Languages") != 0)
+    {
+        sLocalizedPath = sLocalizationFolder + "/" + sLanguage + ".pak";
+    }
+    else
+    {
+        sLocalizedPath = string("Localized/") + sLanguage + ".pak";
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::CloseLanguagePak(const char* sLanguage)
+{
+    string sLocalizedPath;
+    GetLocalizedPath(sLanguage, sLocalizedPath);
+    m_env.pCryPak->ClosePacks({ sLocalizedPath.c_str(), sLocalizedPath.size() });
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::CloseLanguageAudioPak(const char* sLanguage)
+{
+    string sLocalizedPath;
+    GetLocalizedAudioPath(sLanguage, sLocalizedPath);
+    m_env.pCryPak->ClosePacks({ sLocalizedPath.c_str(), sLocalizedPath.size() });
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::Relaunch(bool bRelaunch)
+{
+    if (m_sys_firstlaunch)
+    {
+        m_sys_firstlaunch->Set("0");
+    }
+
+    m_bRelaunch = bRelaunch;
+    SaveConfiguration();
+}
+
+//////////////////////////////////////////////////////////////////////////
+ILocalizationManager* CSystem::GetLocalizationManager()
+{
+    return m_pLocalizationManager;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::debug_GetCallStackRaw(void** callstack, uint32& callstackLength)
+{
+    uint32 callstackCapacity = callstackLength;
+    uint32 nNumStackFramesToSkip = 1;
+
+    memset(callstack, 0, sizeof(void*) * callstackLength);
+
+#if !defined(ANDROID)
+    callstackLength = 0;
+#endif
+
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_CAPTURESTACK
+    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)
+{
+    if (m_executedCommandLine)
+    {
+        return;
+    }
+
+    m_executedCommandLine = true;
+
+    // execute command line arguments e.g. +g_gametype ASSAULT +map "testy"
+
+    ICmdLine* pCmdLine = GetICmdLine();
+    assert(pCmdLine);
+
+    const int iCnt = pCmdLine->GetArgCount();
+    for (int i = 0; i < iCnt; ++i)
+    {
+        const ICmdLineArg* pCmd = pCmdLine->GetArg(i);
+
+        if (pCmd->GetType() == eCLAT_Post)
+        {
+            string sLine = pCmd->GetName();
+            {
+                if (pCmd->GetValue())
+                {
+                    sLine += string(" ") + pCmd->GetValue();
+                }
+
+                GetILog()->Log("Executing command from command line: \n%s\n", sLine.c_str()); // - the actual command might be executed much later (e.g. level load pause)
+                GetIConsole()->ExecuteString(sLine.c_str(), false, 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)
+{
+    m_ConfigPlatform = platform;
+}
+
+//////////////////////////////////////////////////////////////////////////
+ESystemConfigPlatform CSystem::GetConfigPlatform() const
+{
+    return m_ConfigPlatform;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CPNoise3* CSystem::GetNoiseGen()
+{
+    static CPNoise3 m_pNoiseGen;
+    return &m_pNoiseGen;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CProfilingSystem::VTuneResume()
+{
+#ifdef PROFILE_WITH_VTUNE
+    if (VTResume)
+    {
+        CryLogAlways("VTune Resume");
+        VTResume();
+    }
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CProfilingSystem::VTunePause()
+{
+#ifdef PROFILE_WITH_VTUNE
+    if (VTPause)
+    {
+        VTPause();
+        CryLogAlways("VTune Pause");
+    }
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////
+void CSystem::OnLanguageCVarChanged(ICVar* language)
+{
+    if (language && language->GetType() == CVAR_STRING)
+    {
+        CSystem* pSys = static_cast<CSystem*>(gEnv->pSystem);
+        if (pSys && pSys->GetLocalizationManager())
+        {
+            const char* lang = language->GetString();
+
+            // Hook up Localization initialization
+            int locFormat = 0;
+            LocalizationManagerRequestBus::BroadcastResult(locFormat, &LocalizationManagerRequestBus::Events::GetLocalizationFormat);
+            if (locFormat == 0)
+            {
+                const char* locLanguage = nullptr;
+                LocalizationManagerRequestBus::BroadcastResult(locLanguage, &LocalizationManagerRequestBus::Events::GetLanguage);
+            pSys->OpenLanguagePak(lang);
+            }
+
+            LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::SetLanguage, lang);
+            LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::ReloadData);
+
+            if (gEnv->pCryFont)
+            {
+                gEnv->pCryFont->OnLanguageChanged();
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+void CSystem::OnLanguageAudioCVarChanged(ICVar* language)
+{
+    static Audio::SAudioRequest oLanguageRequest;
+    static Audio::SAudioManagerRequestData<Audio::eAMRT_CHANGE_LANGUAGE> oLanguageRequestData;
+
+    if (language && (language->GetType() == CVAR_STRING))
+    {
+        oLanguageRequest.pData = &oLanguageRequestData;
+        oLanguageRequest.nFlags = Audio::eARF_PRIORITY_HIGH;
+        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, oLanguageRequest);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::OnLocalizationFolderCVarChanged(ICVar* const pLocalizationFolder)
+{
+    if (pLocalizationFolder && pLocalizationFolder->GetType() == CVAR_STRING)
+    {
+        CSystem* const pSystem = static_cast<CSystem* const>(gEnv->pSystem);
+
+        if (pSystem != NULL && gEnv->pCryPak != NULL)
+        {
+            CLocalizedStringsManager* const pLocalizationManager = static_cast<CLocalizedStringsManager* const>(pSystem->GetLocalizationManager());
+
+            if (pLocalizationManager)
+            {
+                // Get what is currently loaded
+                CLocalizedStringsManager::TLocalizationTagVec tagVec;
+                pLocalizationManager->GetLoadedTags(tagVec);
+
+                // Release the old localization data.
+                CLocalizedStringsManager::TLocalizationTagVec::const_iterator end = tagVec.end();
+                for (CLocalizedStringsManager::TLocalizationTagVec::const_iterator it = tagVec.begin(); it != end; ++it)
+                {
+                    pLocalizationManager->ReleaseLocalizationDataByTag(it->c_str());
+                }
+
+                // Close the paks situated in the previous localization folder.
+                pSystem->CloseLanguagePak(pLocalizationManager->GetLanguage());
+                pSystem->CloseLanguageAudioPak(pSystem->m_currentLanguageAudio.c_str());
+
+                // Set the new localization folder.
+                gEnv->pCryPak->SetLocalizationFolder(pLocalizationFolder->GetString());
+
+                // Now open the paks situated in the new localization folder.
+                pSystem->OpenLanguagePak(pLocalizationManager->GetLanguage());
+                pSystem->OpenLanguageAudioPak(pSystem->m_currentLanguageAudio.c_str());
+
+                // And load the new data.
+                for (CLocalizedStringsManager::TLocalizationTagVec::const_iterator it = tagVec.begin(); it != end; ++it)
+                {
+                    pLocalizationManager->LoadLocalizationDataByTag(it->c_str());
+                }
+            }
+        }
+    }
+}
+
+// Catch changes to assert verbosity and update the global used to track it
+void CSystem::SetAssertLevel(int _assertlevel)
+{
+    AZ::EnvironmentVariable<int> assertVerbosityLevel = AZ::Environment::FindVariable<int>("assertVerbosityLevel");
+    if (assertVerbosityLevel)
+    {
+        assertVerbosityLevel.Set(_assertlevel);
+    }
+}
+
+void CSystem::OnAssertLevelCvarChanged(ICVar* pArgs)
+{
+    SetAssertLevel(pArgs->GetIVal());
+}
+
+void CSystem::SetLogLevel(int _loglevel)
+{
+    AZ::EnvironmentVariable<int> logVerbosityLevel = AZ::Environment::FindVariable<int>("sys_LogLevel");
+    if (logVerbosityLevel.IsConstructed())
+    {
+        logVerbosityLevel.Set(_loglevel);
+    }
+}
+
+void CSystem::OnLogLevelCvarChanged(ICVar* pArgs)
+{
+    if (pArgs)
+    {
+        SetLogLevel(pArgs->GetIVal());
+    }
+}
+
+
+void CSystem::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
+{
+    switch (event)
+    {
+    case ESYSTEM_EVENT_LEVEL_LOAD_START_LOADINGSCREEN:
+    case ESYSTEM_EVENT_LEVEL_UNLOAD:
+        gEnv->pCryPak->DisableRuntimeFileAccess(false);
+    case ESYSTEM_EVENT_LEVEL_GAMEPLAY_START:
+        m_eRuntimeState = event;
+        break;
+    }
+}
+
+ESystemGlobalState CSystem::GetSystemGlobalState(void)
+{
+    return m_systemGlobalState;
+}
+
+const char* CSystem::GetSystemGlobalStateName(const ESystemGlobalState systemGlobalState)
+{
+    static const char* const s_systemGlobalStateNames[] = {
+        "UNKNOWN",                  // ESYSTEM_GLOBAL_STATE_UNKNOWN,
+        "INIT",                     // ESYSTEM_GLOBAL_STATE_INIT,
+        "RUNNING",                  // ESYSTEM_GLOBAL_STATE_RUNNING,
+        "LEVEL_LOAD_PREPARE",       // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE,
+        "LEVEL_LOAD_START",         // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START,
+        "LEVEL_LOAD_MATERIALS",     // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_MATERIALS,
+        "LEVEL_LOAD_OBJECTS",       // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_OBJECTS,
+        "LEVEL_LOAD_STATIC_WORLD",  // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_STATIC_WORLD,
+        "LEVEL_LOAD_PRECACHE",      // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE,
+        "LEVEL_LOAD_TEXTURES",      // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_TEXTURES,
+        "LEVEL_LOAD_END",           // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_END,
+        "LEVEL_LOAD_COMPLETE"       // ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE
+    };
+    const size_t numElements = sizeof(s_systemGlobalStateNames) / sizeof(s_systemGlobalStateNames[0]);
+    const size_t index = (size_t)systemGlobalState;
+    if (index >= numElements)
+    {
+        return "INVALID INDEX";
+    }
+    return s_systemGlobalStateNames[index];
+}
+
+void CSystem::SetSystemGlobalState(const ESystemGlobalState systemGlobalState)
+{
+    static CTimeValue s_startTime = CTimeValue();
+    if (systemGlobalState != m_systemGlobalState)
+    {
+        if (gEnv && gEnv->pTimer)
+        {
+            const CTimeValue endTime = gEnv->pTimer->GetAsyncTime();
+            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();
+        }
+    }
+    m_systemGlobalState = systemGlobalState;
+
+#if AZ_LOADSCREENCOMPONENT_ENABLED
+    if (m_systemGlobalState == ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_COMPLETE)
+    {
+        EBUS_EVENT(LoadScreenBus, Stop);
+    }
+#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)
+{
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
+    assert(pHandler && !stl::find(m_windowMessageHandlers, pHandler) && "This IWindowMessageHandler is already registered");
+    m_windowMessageHandlers.push_back(pHandler);
+#else
+    CRY_ASSERT(false && "This platform does not support window message handlers");
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::UnregisterWindowMessageHandler(IWindowMessageHandler* pHandler)
+{
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
+#if !defined(NDEBUG)
+    bool bRemoved =
+#endif
+        stl::find_and_erase(m_windowMessageHandlers, pHandler);
+    assert(pHandler && bRemoved && "This IWindowMessageHandler was not registered");
+#else
+    CRY_ASSERT(false && "This platform does not support window message handlers");
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(WIN32)
+bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+{
+    static bool sbInSizingModalLoop;
+    int x = LOWORD(lParam);
+    int y = HIWORD(lParam);
+    *pResult = 0;
+    switch (uMsg)
+    {
+    // System event translation
+    case WM_CLOSE:
+        /*
+            Trigger CSystem to call Quit() the next time
+            it calls Update(). HandleMessages can get messages
+            pumped to it from SyncMainWithRender which would
+            be called recurively by Quit(). Doing so would
+            cause the render thread to deadlock and the main
+            thread to spin in SRenderThread::WaitFlushFinishedCond.
+        */
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::ExitMainLoop);
+        return false;
+    case WM_MOVE:
+        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_MOVE, x, y);
+        return false;
+    case WM_SIZE:
+        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, x, y);
+        switch (wParam)
+        {
+        case SIZE_MINIMIZED:
+            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnMinimized);
+            break;
+        case SIZE_MAXIMIZED:
+            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnMaximized);
+            break;
+        case SIZE_RESTORED:
+            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnRestored);
+            break;
+        }
+        return false;
+    case WM_WINDOWPOSCHANGED:
+        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_POS_CHANGED, 1, 0);
+        return false;
+    case WM_STYLECHANGED:
+        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_STYLE_CHANGED, 1, 0);
+        return false;
+    case WM_ACTIVATE:
+        // Pass HIWORD(wParam) as well to indicate whether this window is minimized or not
+        // HIWORD(wParam) != 0 is minimized, HIWORD(wParam) == 0 is not minimized
+        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_ACTIVATE, LOWORD(wParam) != WA_INACTIVE, HIWORD(wParam));
+        return true;
+    case WM_SETFOCUS:
+        EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnSetFocus);
+        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_CHANGE_FOCUS, 1, 0);
+        return false;
+    case WM_KILLFOCUS:
+        EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnKillFocus);
+        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_CHANGE_FOCUS, 0, 0);
+        return false;
+    case WM_INPUTLANGCHANGE:
+        GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LANGUAGE_CHANGE, wParam, lParam);
+        return false;
+
+    case WM_SYSCOMMAND:
+        if ((wParam & 0xFFF0) == SC_SCREENSAVE)
+        {
+            // Check if screen saver is allowed
+            IConsole* const pConsole = gEnv->pConsole;
+            const ICVar* const pVar = pConsole ? pConsole->GetCVar("sys_screensaver_allowed") : 0;
+            return pVar && pVar->GetIVal() == 0;
+        }
+        return false;
+
+    // Mouse activation
+    case WM_MOUSEACTIVATE:
+        *pResult = MA_ACTIVATEANDEAT;
+        return true;
+
+    // Hardware mouse counters
+    case WM_ENTERSIZEMOVE:
+        sbInSizingModalLoop = true;
+    // Fall through intended
+    case WM_ENTERMENULOOP:
+    {
+        UiCursorBus::Broadcast(&UiCursorInterface::IncrementVisibleCounter);
+        return true;
+    }
+    case WM_CAPTURECHANGED:
+    // If WM_CAPTURECHANGED is received after WM_ENTERSIZEMOVE (ie, moving/resizing begins).
+    // but no matching WM_EXITSIZEMOVE is received (this can happen if the window is not actually moved).
+    // we still need to decrement the hardware mouse counter that was incremented when WM_ENTERSIZEMOVE was seen.
+    // So in this case, we effectively treat WM_CAPTURECHANGED as if it was the WM_EXITSIZEMOVE message.
+    // This behavior has only been reproduced the window is deactivated during the modal loop (ie, breakpoint triggered and focus moves to VS).
+    case WM_EXITSIZEMOVE:
+        if (!sbInSizingModalLoop)
+        {
+            return false;
+        }
+        sbInSizingModalLoop = false;
+    // Fall through intended
+    case WM_EXITMENULOOP:
+    {
+        UiCursorBus::Broadcast(&UiCursorInterface::DecrementVisibleCounter);
+        return (uMsg != WM_CAPTURECHANGED);
+    }
+    case WM_SYSKEYUP:
+    case WM_SYSKEYDOWN:
+    {
+        const bool bAlt = (lParam & (1 << 29)) != 0;
+        if (bAlt && wParam == VK_F4)
+        {
+            return false;     // Pass though ALT+F4
+        }
+        // Prevent game from entering menu loop!  Editor does allow menu loop.
+        return !m_bEditor;
+    }
+    case WM_INPUT:
+    {
+        UINT rawInputSize;
+        const UINT rawInputHeaderSize = sizeof(RAWINPUTHEADER);
+        GetRawInputData((HRAWINPUT)lParam, RID_INPUT, NULL, &rawInputSize, rawInputHeaderSize);
+
+        AZStd::array<BYTE, sizeof(RAWINPUT)> rawInputBytesArray;
+        LPBYTE rawInputBytes = rawInputBytesArray.data();
+
+        const UINT bytesCopied = GetRawInputData((HRAWINPUT)lParam, RID_INPUT, rawInputBytes, &rawInputSize, rawInputHeaderSize);
+        CRY_ASSERT(bytesCopied == rawInputSize);
+
+        RAWINPUT* rawInput = (RAWINPUT*)rawInputBytes;
+        CRY_ASSERT(rawInput);
+
+        AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputEvent, *rawInput);
+
+        return false;
+    }
+    case WM_DEVICECHANGE:
+    {
+        if (wParam == 0x0007) // DBT_DEVNODES_CHANGED
+        {
+            AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputDeviceChangeEvent);
+        }
+        return true;
+    }
+    case WM_CHAR:
+    {
+        const unsigned short codeUnitUTF16 = static_cast<unsigned short>(wParam);
+        AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputCodeUnitUTF16Event, codeUnitUTF16);
+        return true;
+    }
+
+    // Any other event doesn't interest us
+    default:
+        return false;
+    }
+}
+
+#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;
+}
+
+#undef EXCLUDE_UPDATE_ON_CONSOLE
+
diff --git a/Code/Legacy/CrySystem/System.h b/Code/Legacy/CrySystem/System.h
new file mode 100644
index 0000000000..0aecbbd799
--- /dev/null
+++ b/Code/Legacy/CrySystem/System.h
@@ -0,0 +1,743 @@
+/*
+ * 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 <IRenderer.h>
+#include <IPhysics.h>
+#include <IWindowMessageHandler.h>
+
+#include "Timer.h"
+#include <CryVersion.h>
+#include "CmdLine.h"
+#include "CryName.h"
+
+#include <AzFramework/Archive/ArchiveVars.h>
+#include "RenderBus.h"
+
+#include <LoadScreenBus.h>
+
+#include <AzCore/Module/DynamicModuleHandle.h>
+
+namespace AzFramework
+{
+    class MissingAssetLogger;
+}
+
+struct IConsoleCmdArgs;
+class CWatchdogThread;
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define SYSTEM_H_SECTION_1 1
+#define SYSTEM_H_SECTION_2 2
+#define SYSTEM_H_SECTION_3 3
+#define SYSTEM_H_SECTION_4 4
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEM_H_SECTION_1
+#include AZ_RESTRICTED_FILE(System_h)
+#else
+#if defined(WIN32) || defined(LINUX) || defined(APPLE)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_ALLOW_CREATE_BACKUP_LOG_FILE 1
+#endif
+#if defined(WIN32) || (defined(LINUX) && !defined(ANDROID)) || defined(MAC)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_DEFINE_DETECT_PROCESSOR 1
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(WIN32) || defined(APPLE) || defined(LINUX)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_DO_PREASSERT 1
+#endif
+#if defined(MAC) || (defined(LINUX) && !defined(ANDROID))
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_ASM_VOLATILE_CPUID 1
+#endif
+#if (defined(WIN32) && !defined(WIN64)) || (defined(LINUX) && !defined(ANDROID) && !defined(LINUX64))
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_HAS64BITEXT 1
+#endif
+#if defined(WIN32) || (defined(LINUX) && !defined(ANDROID)) || defined(MAC)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_HTSUPPORTED 1
+#endif
+#if defined(WIN32) || (defined(LINUX) && !defined(ANDROID)) || defined(MAC)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_HASCPUID 1
+#endif
+#if defined(WIN32)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_HASAFFINITYMASK 1
+#endif
+
+#if defined(LINUX) || defined(APPLE)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_CRYPAK_POSIX 1
+#endif
+
+#if defined(WIN64)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_BIT64 1
+#endif
+
+#if defined(WIN32)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_PACKED_PEHEADER 1
+#endif
+#if defined(WIN32) || defined(LINUX)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_RENDERMEMORY_INFO 1
+#endif
+
+#if defined(WIN32)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_HANDLER_SYNC_AFFINITY 1
+#endif
+
+#if defined(LINUX) || defined(APPLE)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_FORWARD_EXCEPTION_POINTERS 1
+#endif
+
+#if !defined(_WIN32)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_SINGLETON 1
+#endif
+#if !defined(LINUX) && !defined(APPLE)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_TRANSLATE 1
+#endif
+#if !defined(LINUX) && !defined(APPLE)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_DEBUGCALLSTACK_APPEND_MODULENAME 1
+#endif
+
+#if !(defined(ANDROID) || defined(IOS) || defined(LINUX))
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_IMAGEHANDLER_TIFFIO 1
+#endif
+
+#if 1
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_JOBMANAGER_SIXWORKERTHREADS 0
+#endif
+
+#if defined(WIN32)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_MEMADDRESSRANGE_WINDOWS_STYLE 1
+#endif
+
+#if 1
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_EXCLUDEUPDATE_ON_CONSOLE 0
+#endif
+#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
+
+#if !defined(LINUX) && !defined(APPLE)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_SYSTEMCFG_MODULENAME 1
+#endif
+
+#if defined(WIN32) || defined(WIN64)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_THREADINFO_WINDOWS_STYLE 1
+#endif
+
+#if defined(WIN32)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_THREADTASK_EXCEPTIONS 1
+#endif
+//////////////////////////////////////////////////////////////////////////
+
+#if defined(APPLE) || defined(LINUX)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_FACTORY_REGISTRY_USE_PRINTF_FOR_FATAL 1
+#endif
+
+#if defined(LINUX) || defined(APPLE)
+#define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_FTELL_NOT_FTELLI64 1
+#endif
+
+#endif
+
+#if defined(USE_UNIXCONSOLE) || defined(USE_ANDROIDCONSOLE) || defined(USE_WINDOWSCONSOLE) || defined(USE_IOSCONSOLE) || defined(USE_NULLCONSOLE)
+#define USE_DEDICATED_SERVER_CONSOLE
+#endif
+
+#if defined(LINUX)
+    #include "CryLibrary.h"
+#endif
+
+#ifdef WIN32
+typedef void* WIN_HMODULE;
+#else
+typedef void* WIN_HMODULE;
+#endif
+
+//forward declarations
+namespace Audio
+{
+    struct IAudioSystem;
+    struct IMusicSystem;
+} // namespace Audio
+struct IDataProbe;
+
+#define PHSYICS_OBJECT_ENTITY 0
+
+typedef void (__cdecl * VTuneFunction)(void);
+extern VTuneFunction VTResume;
+extern VTuneFunction VTPause;
+
+#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;
+    int sys_no_error_report_window;
+    int sys_dump_aux_threads;
+    int sys_WER;
+    int sys_dump_type;
+    int sys_ai;
+    int sys_entitysystem;
+    int sys_trackview;
+    int sys_vtune;
+    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;
+
+class CSystem;
+
+struct CProfilingSystem
+    : public IProfilingSystem
+{
+    //////////////////////////////////////////////////////////////////////////
+    // VTune Profiling interface.
+
+    // Summary:
+    //   Resumes vtune data collection.
+    virtual void VTuneResume();
+    // Summary:
+    //   Pauses vtune data collection.
+    virtual void VTunePause();
+    //////////////////////////////////////////////////////////////////////////
+};
+
+class AssetSystem;
+
+/*
+===========================================
+The System interface Class
+===========================================
+*/
+class CXConsole;
+
+//////////////////////////////////////////////////////////////////////
+//! ISystem implementation
+class CSystem
+    : public ISystem
+    , public ILoadConfigurationEntrySink
+    , public ISystemEventListener
+    , public IWindowMessageHandler
+    , public AZ::RenderNotificationsBus::Handler
+    , public CrySystemRequestBus::Handler
+{
+public:
+    CSystem(SharedEnvironmentInstance* pSharedEnvironment);
+    ~CSystem();
+
+    static void OnLanguageCVarChanged(ICVar* language);
+    static void OnLanguageAudioCVarChanged(ICVar* language);
+    static void OnLocalizationFolderCVarChanged(ICVar* const pLocalizationFolder);
+    // adding CVAR to toggle assert verbosity level
+    static void OnAssertLevelCvarChanged(ICVar* pArgs);
+    static void SetAssertLevel(int _assertlevel);
+    static void OnLogLevelCvarChanged(ICVar* pArgs);
+    static void SetLogLevel(int _logLevel);
+
+    // interface ILoadConfigurationEntrySink ----------------------------------
+
+    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup);
+
+    // ISystemEventListener
+    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
+
+    ///////////////////////////////////////////////////////////////////////////
+    //! @name ISystem implementation
+    //@{
+    virtual bool Init(const SSystemInitParams& startupParams);
+    virtual void Release();
+
+    virtual SSystemGlobalEnvironment* GetGlobalEnvironment() { return &m_env; }
+
+    virtual bool UpdatePreTickBus(int updateFlags = 0, int nPauseMode = 0);
+    virtual bool UpdatePostTickBus(int updateFlags = 0, int nPauseMode = 0);
+    virtual bool UpdateLoadtime();
+
+    ////////////////////////////////////////////////////////////////////////
+    // CrySystemRequestBus interface implementation
+    ISystem* GetCrySystem() override;
+    ////////////////////////////////////////////////////////////////////////
+
+    void Relaunch(bool bRelaunch);
+    bool IsRelaunch() const { return m_bRelaunch; };
+
+    void SerializingFile(int mode) { m_iLoadingMode = mode; }
+    int  IsSerializingFile() const { return m_iLoadingMode; }
+    void Quit();
+    bool IsQuitting() const;
+    void ShutdownFileSystem(); // used to cleanup any file resources, such as cache handle.
+    void SetAffinity();
+    virtual const char* GetUserName();
+    virtual int GetApplicationInstance();
+    int GetApplicationLogInstance(const char* logFilePath) override;
+
+    ITimer* GetITimer(){ return m_env.pTimer; }
+    AZ::IO::IArchive* GetIPak() { return m_env.pCryPak; };
+    IConsole* GetIConsole() { return m_env.pConsole; };
+    IRemoteConsole* GetIRemoteConsole();
+    IMovieSystem* GetIMovieSystem() { return m_env.pMovieSystem; };
+    ICryFont* GetICryFont(){ return m_env.pCryFont; }
+    ILog* GetILog(){ return m_env.pLog; }
+    ICmdLine* GetICmdLine(){ return m_pCmdLine; }
+    INameTable* GetINameTable() { return m_env.pNameTable; };
+    IViewSystem* GetIViewSystem();
+    ILevelSystem* GetILevelSystem();
+    ISystemEventDispatcher* GetISystemEventDispatcher() { return m_pSystemEventDispatcher; }
+    IProfilingSystem* GetIProfilingSystem() { return &m_ProfilingSystem; }
+    //////////////////////////////////////////////////////////////////////////
+    // retrieves the perlin noise singleton instance
+    CPNoise3* GetNoiseGen();
+    virtual uint64 GetUpdateCounter() { return m_nUpdateCounter; };
+
+    void        DetectGameFolderAccessRights();
+
+    virtual void ExecuteCommandLine(bool deferred=true);
+
+    virtual void GetUpdateStats(SSystemUpdateStats& stats);
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual XmlNodeRef CreateXmlNode(const char* sNodeName = "", bool bReuseStrings = false, bool bIsProcessingInstruction = false);
+    virtual XmlNodeRef LoadXmlFromFile(const char* sFilename, bool bReuseStrings = false);
+    virtual XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings = false, bool bSuppressWarnings = false);
+    virtual IXmlUtils* GetXmlUtils();
+    //////////////////////////////////////////////////////////////////////////
+
+    void SetViewCamera(CCamera& Camera){ m_ViewCamera = Camera; }
+    CCamera& GetViewCamera() { return m_ViewCamera; }
+
+    void IgnoreUpdates(bool bIgnore) { m_bIgnoreUpdates = bIgnore; };
+
+    void SetIProcess(IProcess* process);
+    IProcess* GetIProcess(){ return m_pProcess; }
+
+    bool IsTestMode() const { return m_bTestMode; }
+    //@}
+
+    void SleepIfNeeded();
+
+    virtual void FatalError(const char* format, ...) PRINTF_PARAMS(2, 3);
+    virtual void ReportBug(const char* format, ...) PRINTF_PARAMS(2, 3);
+    // Validator Warning.
+    void WarningV(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args);
+    void Warning(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, ...);
+    virtual int ShowMessage(const char* text, const char* caption, unsigned int uType);
+    bool CheckLogVerbosity(int verbosity);
+
+    //! Return pointer to user defined callback.
+    ISystemUserCallback* GetUserCallback() const { return m_pUserCallback; };
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void SaveConfiguration();
+    virtual void LoadConfiguration(const char* sFilename, ILoadConfigurationEntrySink* pSink = 0, bool warnIfMissing = true);
+    virtual ESystemConfigSpec GetMaxConfigSpec() const;
+    virtual ESystemConfigPlatform GetConfigPlatform() const;
+    virtual void SetConfigPlatform(ESystemConfigPlatform platform);
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual bool IsPaused() const { return m_bPaused; };
+
+    virtual ILocalizationManager* GetLocalizationManager();
+    virtual void debug_GetCallStack(const char** pFunctions, int& nCount);
+    virtual void debug_LogCallStack(int nMaxFuncs = 32, int nFlags = 0);
+    // 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)
+    void SetVersionInfo(const char* const szVersion);
+#endif
+
+    void ShutdownModuleLibraries();
+
+#if defined(WIN32)
+    friend LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+#endif
+    virtual void* GetRootWindowMessageHandler();
+    virtual void RegisterWindowMessageHandler(IWindowMessageHandler* pHandler);
+    virtual void UnregisterWindowMessageHandler(IWindowMessageHandler* pHandler);
+
+    // IWindowMessageHandler
+#if defined(WIN32)
+    virtual bool HandleMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pResult);
+#endif
+    // ~IWindowMessageHandler
+
+private:
+
+    // Release all resources.
+    void ShutDown();
+
+    bool LoadEngineDLLs();
+
+    //! @name Initialization routines
+    //@{
+    bool InitConsole();
+    bool InitFileSystem();
+    bool InitFileSystem_LoadEngineFolders(const SSystemInitParams& initParams);
+    bool InitAudioSystem(const SSystemInitParams& initParams);
+
+    //@}
+
+    //////////////////////////////////////////////////////////////////////////
+    // Helper functions.
+    //////////////////////////////////////////////////////////////////////////
+    void CreateSystemVars();
+    void CreateAudioVars();
+
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> LoadDLL(const char* dllName);
+
+    void FreeLib(AZStd::unique_ptr<AZ::DynamicModuleHandle>& hLibModule);
+
+    bool UnloadDLL(const char* dllName);
+    void QueryVersionInfo();
+    void LogVersion();
+    void LogBuildInfo();
+    void SetDevMode(bool bEnable);
+
+#ifndef _RELEASE
+    static void SystemVersionChanged(ICVar* pCVar);
+#endif // #ifndef _RELEASE
+
+    bool ReLaunchMediaCenter();
+    void UpdateAudioSystems();
+
+    void AddCVarGroupDirectory(const string& sPath);
+
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> LoadDynamiclibrary(const char* dllName) const;
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEM_H_SECTION_3
+#include AZ_RESTRICTED_FILE(System_h)
+#elif defined(WIN32)
+    bool GetWinGameFolder(char* szMyDocumentsPath, int maxPathSize);
+#endif
+
+public:
+    void EnableFloatExceptions(int type);
+
+    // interface ISystem -------------------------------------------
+    virtual IDataProbe* GetIDataProbe() { return m_pDataProbe; };
+    virtual void SetForceNonDevMode(bool bValue);
+    virtual bool GetForceNonDevMode() const;
+    virtual bool WasInDevMode() const { return m_bWasInDevMode; };
+    virtual bool IsDevMode() const { return m_bInDevMode && !GetForceNonDevMode(); }
+
+    virtual void SetConsoleDrawEnabled(bool enabled) { m_bDrawConsole = enabled; }
+    virtual void SetUIDrawEnabled(bool enabled) { m_bDrawUI = enabled; }
+
+    // -------------------------------------------------------------
+
+    //! attaches the given variable to the given container;
+    //! recreates the variable if necessary
+    ICVar* attachVariable (const char* szVarName, int* pContainer, const char* szComment, int dwFlags = 0);
+
+    const CTimeValue& GetLastTickTime(void) const { return m_lastTickTime; }
+    const ICVar* GetDedicatedMaxRate(void) const { return m_svDedicatedMaxRate; }
+
+    std::shared_ptr<AZ::IO::FileIOBase> CreateLocalFileIO();
+
+private: // ------------------------------------------------------
+
+    // System environment.
+    SSystemGlobalEnvironment m_env;
+
+    CTimer                              m_Time;                             //!<
+    CCamera                             m_ViewCamera;                   //!<
+    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.
+
+
+    std::map<CCryNameCRC, AZStd::unique_ptr<AZ::DynamicModuleHandle> > m_moduleDLLHandles;
+
+    //! current active process
+    IProcess* m_pProcess;
+
+    CCamera m_PhysRendererCamera;
+    ICVar* m_p_draw_helpers_str;
+    int m_iJumpToPhysProfileEnt;
+
+    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;
+
+    int m_iApplicationInstance;
+
+    //! to hold the values stored in system.cfg
+    //! because editor uses it's own values,
+    //! and then saves them to file, overwriting the user's resolution.
+    int m_iHeight;
+    int m_iWidth;
+    int m_iColorBits;
+
+    // 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;
+    ICVar* m_game_load_screen_sequence_to_auto_play;
+    ICVar* m_level_load_screen_sequence_to_auto_play;
+    ICVar* m_game_load_screen_sequence_fixed_fps;
+    ICVar* m_level_load_screen_sequence_fixed_fps;
+    ICVar* m_game_load_screen_max_fps;
+    ICVar* m_level_load_screen_max_fps;
+    ICVar* m_game_load_screen_minimum_time{};
+    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)
+#define AZ_RESTRICTED_SECTION SYSTEM_H_SECTION_4
+#include AZ_RESTRICTED_FILE(System_h)
+#endif
+
+    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;
+
+    string  m_sSavedRDriver;                                //!< to restore the driver when quitting the dedicated server
+
+    //////////////////////////////////////////////////////////////////////////
+    //! User define callback for system events.
+    ISystemUserCallback* m_pUserCallback;
+
+    SFileVersion m_fileVersion;
+    SFileVersion m_productVersion;
+    SFileVersion m_buildVersion;
+    IDataProbe* m_pDataProbe;
+
+    class CLocalizedStringsManager* m_pLocalizationManager;
+
+    // Name table.
+    CNameTable m_nameTable;
+
+    ESystemConfigSpec m_nServerConfigSpec;
+    ESystemConfigSpec m_nMaxConfigSpec;
+    ESystemConfigPlatform m_ConfigPlatform;
+
+    CProfilingSystem m_ProfilingSystem;
+
+    // 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.
+    //////////////////////////////////////////////////////////////////////////
+    virtual const SFileVersion& GetFileVersion();
+    virtual const SFileVersion& GetProductVersion();
+    virtual const SFileVersion& GetBuildVersion();
+
+    bool InitVTuneProfiler();
+
+    void OpenBasicPaks();
+    void OpenLanguagePak(const char* sLanguage);
+    void OpenLanguageAudioPak(const char* sLanguage);
+    void GetLocalizedPath(const char* sLanguage, string& sLocalizedPath);
+    void GetLocalizedAudioPath(const char* sLanguage, string& sLocalizedPath);
+    void CloseLanguagePak(const char* sLanguage);
+    void CloseLanguageAudioPak(const char* sLanguage);
+    void UpdateMovieSystem(const int updateFlags, const float fFrameTime, const bool bPreUpdate);
+
+    //////////////////////////////////////////////////////////////////////////
+    // CryAssert and error related.
+    virtual bool RegisterErrorObserver(IErrorObserver* errorObserver);
+    bool UnregisterErrorObserver(IErrorObserver* errorObserver);
+    virtual void OnAssert(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber);
+    void OnFatalError(const char* message);
+
+    bool IsAssertDialogVisible() const;
+    void SetAssertVisible(bool bAssertVisble);
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual void ClearErrorMessages()
+    {
+        m_ErrorMessages.clear();
+    }
+
+    bool IsLoading()
+    {
+        return m_eRuntimeState == ESYSTEM_EVENT_LEVEL_LOAD_START_LOADINGSCREEN;
+    }
+
+    virtual ESystemGlobalState  GetSystemGlobalState(void);
+    virtual void SetSystemGlobalState(ESystemGlobalState systemGlobalState);
+
+#if !defined(_RELEASE)
+    virtual bool IsSavingResourceList() const { return (g_cvars.archiveVars.nSaveLevelResourceList != 0); }
+#endif
+
+private:
+    std::vector<IErrorObserver*> m_errorObservers;
+    ESystemGlobalState m_systemGlobalState;
+    static const char* GetSystemGlobalStateName(const ESystemGlobalState systemGlobalState);
+
+public:
+    void InitLocalization();
+
+protected: // -------------------------------------------------------------
+
+    CCmdLine*                                      m_pCmdLine;
+
+    string  m_currentLanguageAudio;
+    string  m_systemConfigName; // computed from system_(hardwareplatform)_(assetsPlatform) - eg, system_android_android.cfg or system_windows_pc.cfg
+
+    std::vector< std::pair<CTimeValue, float> > m_updateTimes;
+
+    struct SErrorMessage
+    {
+        string m_Message;
+        float m_fTimeToShow;
+        float m_Color[4];
+        bool m_HardFailure;
+    };
+    typedef std::list<SErrorMessage> TErrorMessages;
+    TErrorMessages m_ErrorMessages;
+    bool m_bHasRenderedErrorMessage;
+
+    ESystemEvent m_eRuntimeState;
+    bool m_bIsAsserting;
+
+    std::vector<IWindowMessageHandler*> m_windowMessageHandlers;
+    bool m_initedOSAllocator = false;
+    bool m_initedSysAllocator = false;
+};
diff --git a/Code/Legacy/CrySystem/SystemCFG.cpp b/Code/Legacy/CrySystem/SystemCFG.cpp
new file mode 100644
index 0000000000..0fd62b1f79
--- /dev/null
+++ b/Code/Legacy/CrySystem/SystemCFG.cpp
@@ -0,0 +1,577 @@
+/*
+ * 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 : handles system cfg
+
+
+#include "CrySystem_precompiled.h"
+#include "System.h"
+#include <time.h>
+#include "XConsole.h"
+#include "CryFile.h"
+#include "CryPath.h"
+
+#include <AzCore/Console/IConsole.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Utils/Utils.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+
+#include "SystemCFG.h"
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define SYSTEMCFG_CPP_SECTION_1 1
+#define SYSTEMCFG_CPP_SECTION_2 2
+#define SYSTEMCFG_CPP_SECTION_3 3
+#endif
+
+#if defined(LINUX) || defined(APPLE)
+#include "ILog.h"
+
+#endif
+
+#ifndef EXE_VERSION_INFO_0
+#define EXE_VERSION_INFO_0 1
+#endif
+
+#ifndef EXE_VERSION_INFO_1
+#define EXE_VERSION_INFO_1 0
+#endif
+
+#ifndef EXE_VERSION_INFO_2
+#define EXE_VERSION_INFO_2 0
+#endif
+
+#ifndef EXE_VERSION_INFO_3
+#define EXE_VERSION_INFO_3 1
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMCFG_CPP_SECTION_1
+#include AZ_RESTRICTED_FILE(SystemCFG_cpp)
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+const SFileVersion& CSystem::GetFileVersion()
+{
+    return m_fileVersion;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const SFileVersion& CSystem::GetProductVersion()
+{
+    return m_productVersion;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const SFileVersion& CSystem::GetBuildVersion()
+{
+    return m_buildVersion;
+}
+
+//////////////////////////////////////////////////////////////////////////
+#ifndef _RELEASE
+void CSystem::SystemVersionChanged(ICVar* pCVar)
+{
+    if (CSystem* pThis = static_cast<CSystem*>(gEnv->pSystem))
+    {
+        pThis->SetVersionInfo(pCVar->GetString());
+    }
+}
+
+void CSystem::SetVersionInfo(const char* const szVersion)
+{
+    m_fileVersion.Set(szVersion);
+    m_productVersion.Set(szVersion);
+    m_buildVersion.Set(szVersion);
+    CryLog("SetVersionInfo '%s'", szVersion);
+    CryLog("FileVersion: %d.%d.%d.%d", m_fileVersion.v[3], m_fileVersion.v[2], m_fileVersion.v[1], m_fileVersion.v[0]);
+    CryLog("ProductVersion: %d.%d.%d.%d", m_productVersion.v[3], m_productVersion.v[2], m_productVersion.v[1], m_productVersion.v[0]);
+    CryLog("BuildVersion: %d.%d.%d.%d", m_buildVersion.v[3], m_buildVersion.v[2], m_buildVersion.v[1], m_buildVersion.v[0]);
+}
+#endif // #ifndef _RELEASE
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::QueryVersionInfo()
+{
+#ifndef WIN32
+    //do we need some other values here?
+    m_fileVersion.v[0] = m_productVersion.v[0] = EXE_VERSION_INFO_3;
+    m_fileVersion.v[1] = m_productVersion.v[1] = EXE_VERSION_INFO_2;
+    m_fileVersion.v[2] = m_productVersion.v[2] = EXE_VERSION_INFO_1;
+    m_fileVersion.v[3] = m_productVersion.v[3] = EXE_VERSION_INFO_0;
+    m_buildVersion = m_fileVersion;
+#else  //WIN32
+    char moduleName[_MAX_PATH];
+    DWORD dwHandle;
+    UINT len;
+
+    char ver[1024 * 8];
+
+    GetModuleFileName(NULL, moduleName, _MAX_PATH);  //retrieves the PATH for the current module
+
+#ifdef AZ_MONOLITHIC_BUILD
+    GetModuleFileName(NULL, moduleName, _MAX_PATH);  //retrieves the PATH for the current module
+#else // AZ_MONOLITHIC_BUILD
+    azstrcpy(moduleName, AZ_ARRAY_SIZE(moduleName), "CrySystem.dll"); // we want to version from the system dll
+#endif // AZ_MONOLITHIC_BUILD
+
+    int verSize = GetFileVersionInfoSize(moduleName, &dwHandle);
+    if (verSize > 0)
+    {
+        GetFileVersionInfo(moduleName, dwHandle, 1024 * 8, ver);
+        VS_FIXEDFILEINFO* vinfo;
+        VerQueryValue(ver, "\\", (void**)&vinfo, &len);
+
+        const uint32 verIndices[4] = {0, 1, 2, 3};
+        m_fileVersion.v[verIndices[0]] = m_productVersion.v[verIndices[0]] = vinfo->dwFileVersionLS & 0xFFFF;
+        m_fileVersion.v[verIndices[1]] = m_productVersion.v[verIndices[1]] = vinfo->dwFileVersionLS >> 16;
+        m_fileVersion.v[verIndices[2]] = m_productVersion.v[verIndices[2]] = vinfo->dwFileVersionMS & 0xFFFF;
+        m_fileVersion.v[verIndices[3]] = m_productVersion.v[verIndices[3]] = vinfo->dwFileVersionMS >> 16;
+        m_buildVersion = m_fileVersion;
+
+        struct LANGANDCODEPAGE
+        {
+            WORD wLanguage;
+            WORD wCodePage;
+        }* lpTranslate;
+
+        UINT count = 0;
+        char path[256];
+        char* version = NULL;
+
+        VerQueryValue(ver, "\\VarFileInfo\\Translation", (LPVOID*)&lpTranslate, &count);
+        if (lpTranslate != NULL)
+        {
+            azsnprintf(path, sizeof(path), "\\StringFileInfo\\%04x%04x\\InternalName", lpTranslate[0].wLanguage, lpTranslate[0].wCodePage);
+            VerQueryValue(ver, path, (LPVOID*)&version, &count);
+            if (version)
+            {
+                m_buildVersion.Set(version);
+            }
+        }
+    }
+#endif //WIN32
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::LogVersion()
+{
+    // Get time.
+    time_t ltime;
+    time(&ltime);
+
+#ifdef AZ_COMPILER_MSVC
+    tm today;
+    localtime_s(&today, &ltime);
+    char s[1024];
+    strftime(s, 128, "%d %b %y (%H %M %S)", &today);
+#else
+    char s[1024];
+    auto today = localtime(&ltime);
+    strftime(s, 128, "%d %b %y (%H %M %S)", today);
+#endif
+
+    const SFileVersion& ver = GetFileVersion();
+
+    CryLogAlways("BackupNameAttachment=\" Build(%d) %s\"  -- used by backup system\n", ver.v[0], s);          // read by CreateBackupFile()
+
+    // Use strftime to build a customized time string.
+#ifdef AZ_COMPILER_MSVC
+    strftime(s, 128, "Log Started at %c", &today);
+#else
+    strftime(s, 128, "Log Started at %c", today);
+#endif
+    CryLogAlways(s);
+
+    CryLogAlways("Built on " __DATE__ " " __TIME__);
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMCFG_CPP_SECTION_2
+#include AZ_RESTRICTED_FILE(SystemCFG_cpp)
+#elif defined(ANDROID)
+    CryLogAlways("Running 32 bit Android version API VER:%d", __ANDROID_API__);
+#elif defined(IOS)
+    CryLogAlways("Running 64 bit iOS version");
+#elif defined(WIN64)
+    CryLogAlways("Running 64 bit Windows version");
+#elif defined(WIN32)
+    CryLogAlways("Running 32 bit Windows version");
+#elif defined(LINUX64)
+    CryLogAlways("Running 64 bit Linux version");
+#elif defined(LINUX32)
+    CryLogAlways("Running 32 bit Linux version");
+#elif defined(MAC)
+    CryLogAlways("Running 64 bit Mac version");
+#endif
+#if AZ_LEGACY_CRYSYSTEM_TRAIT_SYSTEMCFG_MODULENAME
+    GetModuleFileName(NULL, s, sizeof(s));
+
+    // Log EXE filename only if possible (not full EXE path which could contain sensitive info)
+    AZStd::string exeName;
+    if (AzFramework::StringFunc::Path::GetFullFileName(s, exeName)) {
+        CryLogAlways("Executable: %s", exeName.c_str());
+    }
+#endif
+
+    CryLogAlways("FileVersion: %d.%d.%d.%d", m_fileVersion.v[3], m_fileVersion.v[2], m_fileVersion.v[1], m_fileVersion.v[0]);
+#if defined(LY_BUILD)
+    CryLogAlways("ProductVersion: %d.%d.%d.%d - Build %d", m_productVersion.v[3], m_productVersion.v[2], m_productVersion.v[1], m_productVersion.v[0], LY_BUILD);
+#else // defined(LY_BUILD)
+    CryLogAlways("ProductVersion: %d.%d.%d.%d", m_productVersion.v[3], m_productVersion.v[2], m_productVersion.v[1], m_productVersion.v[0]);
+#endif // defined(LY_BUILD)
+
+
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMCFG_CPP_SECTION_3
+#include AZ_RESTRICTED_FILE(SystemCFG_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(_MSC_VER)
+    CryLogAlways("Using Microsoft (tm) C++ Standard Library implementation\n");
+#elif defined(__clang__)
+    CryLogAlways("Using CLANG C++ Standard Library implementation\n");
+#elif defined(__GNUC__)
+    CryLogAlways("Using GNU C++ Standard Library implementation\n");
+#else
+#error "Please specify C++ STL library"
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::LogBuildInfo()
+{
+    auto projectName = AZ::Utils::GetProjectName();
+    CryLogAlways("GameName: %s", projectName.c_str());
+    CryLogAlways("BuildTime: " __DATE__ " " __TIME__);
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////
+class CCVarSaveDump
+    : public ICVarDumpSink
+{
+public:
+
+    CCVarSaveDump(FILE* pFile)
+    {
+        m_pFile = pFile;
+    }
+
+    virtual void OnElementFound(ICVar* pCVar)
+    {
+        if (!pCVar)
+        {
+            return;
+        }
+        int nFlags = pCVar->GetFlags();
+        if (((nFlags & VF_DUMPTODISK) && (nFlags & VF_MODIFIED)) || (nFlags & VF_WASINCONFIG))
+        {
+            string szValue = pCVar->GetString();
+            int pos;
+
+            pos = 1;
+            for (;; )
+            {
+                pos = szValue.find_first_of("\\", pos);
+
+                if (pos == string::npos)
+                {
+                    break;
+                }
+
+                szValue.replace(pos, 1, "\\\\", 2);
+                pos += 2;
+            }
+
+            // replace " with \"
+            pos = 1;
+            for (;; )
+            {
+                pos = szValue.find_first_of("\"", pos);
+
+                if (pos == string::npos)
+                {
+                    break;
+                }
+
+                szValue.replace(pos, 1, "\\\"", 2);
+                pos += 2;
+            }
+
+            string szLine = pCVar->GetName();
+
+            if (pCVar->GetType() == CVAR_STRING)
+            {
+                szLine += " = \"" + szValue + "\"\r\n";
+            }
+            else
+            {
+                szLine += " = " + szValue + "\r\n";
+            }
+
+            if (pCVar->GetFlags() & VF_WARNING_NOTUSED)
+            {
+                fputs("-- REMARK: the following was not assigned to a console variable\r\n", m_pFile);
+            }
+
+            fputs(szLine.c_str(), m_pFile);
+        }
+    }
+
+private: // --------------------------------------------------------
+
+    FILE*              m_pFile;                     //
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::SaveConfiguration()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+// system cfg
+//////////////////////////////////////////////////////////////////////////
+CSystemConfiguration::CSystemConfiguration(const string& strSysConfigFilePath, CSystem* pSystem, ILoadConfigurationEntrySink* pSink, bool warnIfMissing)
+    : m_strSysConfigFilePath(strSysConfigFilePath)
+    , m_bError(false)
+    , m_pSink(pSink)
+    , m_warnIfMissing(warnIfMissing)
+{
+    assert(pSink);
+
+    m_pSystem = pSystem;
+    m_bError = !ParseSystemConfig();
+}
+
+//////////////////////////////////////////////////////////////////////////
+CSystemConfiguration::~CSystemConfiguration()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSystemConfiguration::ParseSystemConfig()
+{
+    string filename = m_strSysConfigFilePath;
+    if (strlen(PathUtil::GetExt(filename)) == 0)
+    {
+        filename = PathUtil::ReplaceExtension(filename, "cfg");
+    }
+
+    CCryFile file;
+    string filenameLog;
+    {
+        int flags = AZ::IO::IArchive::FOPEN_HINT_QUIET | AZ::IO::IArchive::FOPEN_ONDISK;
+
+        if (filename[0] == '@')
+        {
+            // this is used when theres a very specific file to read, like @user@/game.cfg which is read
+            // IN ADDITION to the one in the game folder, and afterwards to override values in it.
+            // if the file is missing and its already prefixed with an alias, there is no need to look any further.
+            if (!(file.Open(filename, "rb", flags)))
+            {
+                if (m_warnIfMissing)
+                {
+                    CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Config file %s not found!", filename.c_str());
+                }
+                return false;
+            }
+        }
+        else
+        {
+            // otherwise, if the file isn't prefixed with an alias, then its likely one of the convenience mappings
+            // to either root or assets/config.  this is done so that code can just request a simple file name and get its data
+            if (
+                !(file.Open(filename, "rb", flags)) &&
+                !(file.Open(string("@root@/") + filename, "rb", flags)) &&
+                !(file.Open(string("@assets@/") + filename, "rb", flags)) &&
+                !(file.Open(string("@assets@/config/") + filename, "rb", flags)) &&
+                !(file.Open(string("@assets@/config/spec/") + filename, "rb", flags))
+                )
+            {
+                if (m_warnIfMissing)
+                {
+                    CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Config file %s not found!", filename.c_str());
+                }
+                return false;
+            }
+        }
+
+        filenameLog = file.GetAdjustedFilename();
+    }
+
+    INDENT_LOG_DURING_SCOPE();
+
+    int nLen = file.GetLength();
+    if (nLen == 0)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Couldn't get length for Config file %s", filename.c_str());
+        return false;
+    }
+    char* sAllText = new char [nLen + 16];
+    if (file.ReadRaw(sAllText, nLen) < (size_t)nLen)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Couldn't read Config file %s", filename.c_str());
+        return false;
+    }
+    sAllText[nLen] = '\0';
+    sAllText[nLen + 1] = '\0';
+
+    string strGroup;            // current group e.g. "[General]"
+
+    char* strLast = sAllText + nLen;
+    char* str = sAllText;
+    while (str < strLast)
+    {
+        char* s = str;
+        while (str < strLast && *str != '\n' && *str != '\r')
+        {
+            str++;
+        }
+        *str = '\0';
+        str++;
+        while (str < strLast && (*str == '\n' || *str == '\r'))
+        {
+            str++;
+        }
+
+        string strLine = s;
+
+        // detect groups e.g. "[General]"   should set strGroup="General"
+        {
+            string strTrimmedLine(RemoveWhiteSpaces(strLine));
+            size_t size = strTrimmedLine.size();
+
+            if (size >= 3)
+            {
+                if (strTrimmedLine[0] == '[' && strTrimmedLine[size - 1] == ']')       // currently no comments are allowed to be behind groups
+                {
+                    strGroup = &strTrimmedLine[1];
+                    strGroup.resize(size - 2);                                  // remove [ and ]
+                    continue;                                       // next line
+                }
+            }
+        }
+
+        //trim all whitespace characters at the beginning and the end of the current line and store its size
+        strLine.Trim();
+        size_t strLineSize = strLine.size();
+
+        //skip comments, comments start with ";" or "--" but may have preceding whitespace characters
+        if (strLineSize > 0)
+        {
+            if (strLine[0] == ';')
+            {
+                continue;
+            }
+            else if (strLine.find("--") == 0)
+            {
+                continue;
+            }
+        }
+        //skip empty lines
+        else
+        {
+            continue;
+        }
+
+        //if line contains a '=' try to read and assign console variable
+        string::size_type posEq(strLine.find("=", 0));
+        if (string::npos != posEq)
+        {
+            string stemp(strLine, 0, posEq);
+            string strKey(RemoveWhiteSpaces(stemp));
+
+            {
+                // extract value
+                string::size_type posValueStart(strLine.find("\"", posEq + 1) + 1);
+                string::size_type posValueEnd(strLine.rfind('\"'));
+
+                string strValue;
+
+                if (string::npos != posValueStart && string::npos != posValueEnd)
+                {
+                    strValue = string(strLine, posValueStart, posValueEnd - posValueStart);
+                }
+                else
+                {
+                    string strTmp(strLine, posEq + 1, strLine.size() - (posEq + 1));
+                    strValue = RemoveWhiteSpaces(strTmp);
+                }
+
+                {
+                    // replace '\\\\' with '\\' and '\\\"' with '\"'
+                    strValue.replace("\\\\", "\\");
+                    strValue.replace("\\\"", "\"");
+                    
+                    m_pSink->OnLoadConfigurationEntry(strKey, strValue, strGroup);
+                }
+            }
+        }
+        else
+        {
+            gEnv->pLog->LogWithType(ILog::eWarning, "%s -> invalid configuration line: %s", filename.c_str(), strLine.c_str());
+        }
+    }
+
+    delete []sAllText;
+
+    CryLog("Loading Config file %s (%s)", filename.c_str(), filenameLog.c_str());
+
+    m_pSink->OnLoadConfigurationEntry_End();
+
+    return true;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::OnLoadConfigurationEntry(const char* szKey, const char* szValue, [[maybe_unused]] const char* szGroup)
+{
+    bool azConsoleProcessed = false;
+    auto console = AZ::Interface<AZ::IConsole>::Get();
+    if (console)
+    {
+        AZStd::string command(AZStd::string::format("%s %s", szKey, szValue));
+
+        azConsoleProcessed = console->PerformCommand(command.c_str());
+    }
+
+    if (!azConsoleProcessed)
+    {
+        if (!gEnv->pConsole)
+        {
+            return;
+        }
+
+        if (*szKey != 0)
+        {
+            gEnv->pConsole->LoadConfigVar(szKey, szValue);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::LoadConfiguration(const char* sFilename, ILoadConfigurationEntrySink* pSink, bool warnIfMissing)
+{
+    if (sFilename && strlen(sFilename) > 0)
+    {
+        if (!pSink)
+        {
+            pSink = this;
+        }
+
+        CSystemConfiguration tempConfig(sFilename, this, pSink, warnIfMissing);
+    }
+}
+
diff --git a/Code/Legacy/CrySystem/SystemCFG.h b/Code/Legacy/CrySystem/SystemCFG.h
new file mode 100644
index 0000000000..5f35f5e3bc
--- /dev/null
+++ b/Code/Legacy/CrySystem/SystemCFG.h
@@ -0,0 +1,49 @@
+/*
+ * 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_SYSTEMCFG_H
+#define CRYINCLUDE_CRYSYSTEM_SYSTEMCFG_H
+
+#pragma once
+
+#include <math.h>
+#include <map>
+
+typedef string SysConfigKey;
+typedef string SysConfigValue;
+
+//////////////////////////////////////////////////////////////////////////
+class CSystemConfiguration
+{
+public:
+    CSystemConfiguration(const string& strSysConfigFilePath, CSystem* pSystem, ILoadConfigurationEntrySink* pSink, bool warnIfMissing = true);
+    ~CSystemConfiguration();
+
+    string RemoveWhiteSpaces(string& s)
+    {
+        s.Trim();
+        return s;
+    }
+
+    bool IsError() const { return m_bError; }
+
+private: // ----------------------------------------
+
+    // Returns:
+    //   success
+    bool ParseSystemConfig();
+
+    CSystem*                                               m_pSystem;
+    string                                                  m_strSysConfigFilePath;
+    bool                                                        m_bError;
+    ILoadConfigurationEntrySink*       m_pSink;                                         // never 0
+    bool m_warnIfMissing;
+};
+
+
+#endif // CRYINCLUDE_CRYSYSTEM_SYSTEMCFG_H
diff --git a/Code/Legacy/CrySystem/SystemEventDispatcher.cpp b/Code/Legacy/CrySystem/SystemEventDispatcher.cpp
new file mode 100644
index 0000000000..3e39987ee2
--- /dev/null
+++ b/Code/Legacy/CrySystem/SystemEventDispatcher.cpp
@@ -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
+ *
+ */
+
+
+#include "CrySystem_precompiled.h"
+#include "SystemEventDispatcher.h"
+
+CSystemEventDispatcher::CSystemEventDispatcher()
+    : m_listeners(0)
+{
+}
+
+bool CSystemEventDispatcher::RegisterListener(ISystemEventListener* pListener)
+{
+    m_listenerRegistrationLock.Lock();
+    bool ret = m_listeners.Add(pListener);
+    m_listenerRegistrationLock.Unlock();
+    return ret;
+}
+
+bool CSystemEventDispatcher::RemoveListener(ISystemEventListener* pListener)
+{
+    m_listenerRegistrationLock.Lock();
+    m_listeners.Remove(pListener);
+    m_listenerRegistrationLock.Unlock();
+    return true;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CSystemEventDispatcher::OnSystemEventAnyThread(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam)
+{
+    m_listenerRegistrationLock.Lock();
+    for (TSystemEventListeners::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
+    {
+        notifier->OnSystemEventAnyThread(event, wparam, lparam);
+    }
+    m_listenerRegistrationLock.Unlock();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CSystemEventDispatcher::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam)
+{
+    if (gEnv && gEnv->mMainThreadId == CryGetCurrentThreadId())
+    {
+        for (TSystemEventListeners::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
+        {
+            notifier->OnSystemEvent(event, wparam, lparam);
+        }
+    }
+    else
+    {
+        SEventParams params;
+        params.event = event;
+        params.wparam = wparam;
+        params.lparam = lparam;
+        m_systemEventQueue.push(params);
+    }
+
+    // Also dispatch the event on this thread. This technically means the event
+    //  will be sent twice (thru different OnSystemEventXX functions), therefore it is up to listeners which one they react to.
+    OnSystemEventAnyThread(event, wparam, lparam);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystemEventDispatcher::Update()
+{
+    AZ_TRACE_METHOD();
+    assert(gEnv && gEnv->mMainThreadId == CryGetCurrentThreadId());
+
+    SEventParams params;
+    while (m_systemEventQueue.try_pop(params))
+    {
+        OnSystemEvent(params.event, params.wparam, params.lparam);
+    }
+}
+
+
+
+
diff --git a/Code/Legacy/CrySystem/SystemEventDispatcher.h b/Code/Legacy/CrySystem/SystemEventDispatcher.h
new file mode 100644
index 0000000000..5536d32a4b
--- /dev/null
+++ b/Code/Legacy/CrySystem/SystemEventDispatcher.h
@@ -0,0 +1,51 @@
+/*
+ * 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_SYSTEMEVENTDISPATCHER_H
+#define CRYINCLUDE_CRYSYSTEM_SYSTEMEVENTDISPATCHER_H
+#pragma once
+
+
+#include <ISystem.h>
+#include <CryListenerSet.h>
+
+class CSystemEventDispatcher
+    : public ISystemEventDispatcher
+{
+public:
+    CSystemEventDispatcher();
+    virtual ~CSystemEventDispatcher(){}
+
+    // ISystemEventDispatcher
+    virtual bool RegisterListener(ISystemEventListener* pListener);
+    virtual bool RemoveListener(ISystemEventListener* pListener);
+
+    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
+    virtual void Update();
+
+    // ~ISystemEventDispatcher
+private:
+    void OnSystemEventAnyThread(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
+
+    typedef CListenerSet<ISystemEventListener*> TSystemEventListeners;
+    TSystemEventListeners   m_listeners;
+
+    // for the events coming from other threads
+    struct SEventParams
+    {
+        ESystemEvent event;
+        UINT_PTR wparam;
+        UINT_PTR lparam;
+    };
+
+    typedef CryMT::queue<SEventParams> TSystemEventQueue;
+    TSystemEventQueue m_systemEventQueue;
+    CryCriticalSection m_listenerRegistrationLock;
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_SYSTEMEVENTDISPATCHER_H
diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp
new file mode 100644
index 0000000000..7602ed05aa
--- /dev/null
+++ b/Code/Legacy/CrySystem/SystemInit.cpp
@@ -0,0 +1,2213 @@
+/*
+ * 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 "System.h"
+
+#if defined(AZ_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
+#undef AZ_RESTRICTED_SECTION
+#define SYSTEMINIT_CPP_SECTION_1 1
+#define SYSTEMINIT_CPP_SECTION_2 2
+#define SYSTEMINIT_CPP_SECTION_3 3
+#define SYSTEMINIT_CPP_SECTION_4 4
+#define SYSTEMINIT_CPP_SECTION_5 5
+#define SYSTEMINIT_CPP_SECTION_6 6
+#define SYSTEMINIT_CPP_SECTION_7 7
+#define SYSTEMINIT_CPP_SECTION_8 8
+#define SYSTEMINIT_CPP_SECTION_9 9
+#define SYSTEMINIT_CPP_SECTION_10 10
+#define SYSTEMINIT_CPP_SECTION_11 11
+#define SYSTEMINIT_CPP_SECTION_12 12
+#define SYSTEMINIT_CPP_SECTION_13 13
+#define SYSTEMINIT_CPP_SECTION_14 14
+#define SYSTEMINIT_CPP_SECTION_15 15
+#define SYSTEMINIT_CPP_SECTION_16 16
+#define SYSTEMINIT_CPP_SECTION_17 17
+#endif
+
+#include "CryLibrary.h"
+#include "CryPath.h"
+#include <StringUtils.h>
+
+#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
+#include <AzFramework/IO/LocalFileIO.h>
+
+#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
+#include <AzCore/IO/Streamer/Streamer.h>
+#include <AzCore/IO/Streamer/StreamerComponent.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzFramework/API/ApplicationAPI.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzFramework/Asset/AssetProcessorMessages.h>
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include <AzFramework/Asset/AssetCatalogBus.h>
+#include <AzFramework/API/ApplicationAPI.h>
+#include "AZCoreLogSink.h"
+#include <AzCore/Math/MathUtils.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzFramework/Archive/INestedArchive.h>
+#include <AzFramework/Archive/ArchiveFileIO.h>
+
+#include <LoadScreenBus.h>
+#include <LyShine/Bus/UiSystemBus.h>
+#include <AzFramework/Logging/MissingAssetLogger.h>
+#include <AzFramework/Platform/PlatformDefaults.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Utils/Utils.h>
+
+#if defined(APPLE) || defined(LINUX)
+#include <dlfcn.h>
+#include <cstdlib>
+#endif
+
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
+#include <float.h>
+
+// To enable profiling with vtune (https://software.intel.com/en-us/intel-vtune-amplifier-xe), make sure the line below is not commented out
+//#define  PROFILE_WITH_VTUNE
+
+#endif //WIN32
+
+#include <IRenderer.h>
+#include <AzCore/IO/FileIO.h>
+#include <IMovieSystem.h>
+#include <ILog.h>
+#include <IAudioSystem.h>
+#include <ICmdLine.h>
+#include <IProcess.h>
+#include <LyShine/ILyShine.h>
+#include <HMDBus.h>
+
+#include <AzFramework/Archive/Archive.h>
+#include "XConsole.h"
+#include "Log.h"
+#include "XML/xml.h"
+#include "LocalizedStringManager.h"
+#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>
+#include <AzFramework/Driller/DrillerConsoleAPI.h>
+
+#if defined(ANDROID)
+    #include <AzCore/Android/Utils.h>
+#endif
+
+#if defined(EXTERNAL_CRASH_REPORTING)
+#include <CrashHandler.h>
+#endif
+
+// select the asset processor based on cvars and defines.
+// uncomment the following and edit the path where it is instantiated if you'd like to use the test file client
+//#define USE_TEST_FILE_CLIENT
+
+#if defined(REMOTE_ASSET_PROCESSOR)
+// Over here, we'd put the header to the Remote Asset Processor interface (as opposed to the Local built in version  below)
+#   include <AzFramework/Network/AssetProcessorConnection.h>
+#endif
+
+#ifdef WIN32
+extern LONG WINAPI CryEngineExceptionFilterWER(struct _EXCEPTION_POINTERS* pExceptionPointers);
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_14
+#include AZ_RESTRICTED_FILE(SystemInit_cpp)
+#endif
+
+#if AZ_TRAIT_USE_CRY_SIGNAL_HANDLER
+
+#include <execinfo.h>
+#include <signal.h>
+void CryEngineSignalHandler(int signal)
+{
+    char resolvedPath[_MAX_PATH];
+
+    // it is assumed that @log@ points at the appropriate place (so for apple, to the user profile dir)
+    if (AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath("@log@/crash.log", resolvedPath, _MAX_PATH))
+    {
+        fprintf(stderr, "Crash Signal Handler - logged to %s\n", resolvedPath);
+        FILE* file = fopen(resolvedPath, "a");
+        if (file)
+        {
+            char sTime[128];
+            time_t ltime;
+            time(&ltime);
+            struct tm* today = localtime(&ltime);
+            strftime(sTime, 40, "<%Y-%m-%d %H:%M:%S> ", today);
+            fprintf(file, "%s: Error: signal %s:\n", sTime, strsignal(signal));
+            fflush(file);
+            void* array[100];
+            int s = backtrace(array, 100);
+            backtrace_symbols_fd(array, s, fileno(file));
+            fclose(file);
+            CryLogAlways("Successfully recorded crash file:  '%s'", resolvedPath);
+            abort();
+        }
+    }
+
+    CryLogAlways("Could not record crash file...");
+    abort();
+}
+
+#endif // AZ_TRAIT_USE_CRY_SIGNAL_HANDLER
+
+//////////////////////////////////////////////////////////////////////////
+#define DEFAULT_LOG_FILENAME "@log@/Log.txt"
+
+#define CRYENGINE_ENGINE_FOLDER "Engine"
+
+//////////////////////////////////////////////////////////////////////////
+#define CRYENGINE_DEFAULT_LOCALIZATION_LANG "en-US"
+
+#define LOCALIZATION_TRANSLATIONS_LIST_FILE_NAME "Libs/Localization/localization.xml"
+
+//////////////////////////////////////////////////////////////////////////
+#if defined(WIN32) || defined(LINUX) || defined(APPLE)
+#   define DLL_MODULE_INIT_ISYSTEM "ModuleInitISystem"
+#   define DLL_MODULE_SHUTDOWN_ISYSTEM "ModuleShutdownISystem"
+#   define DLL_INITFUNC_RENDERER "PackageRenderConstructor"
+#   define DLL_INITFUNC_SOUND "CreateSoundSystem"
+#   define DLL_INITFUNC_FONT "CreateCryFontInterface"
+#   define DLL_INITFUNC_3DENGINE "CreateCry3DEngine"
+#   define DLL_INITFUNC_UI "CreateLyShineInterface"
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_1
+#include AZ_RESTRICTED_FILE(SystemInit_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+#   define DLL_MODULE_INIT_ISYSTEM (LPCSTR)2
+#   define DLL_MODULE_SHUTDOWN_ISYSTEM (LPCSTR)3
+#   define DLL_INITFUNC_RENDERER  (LPCSTR)1
+#   define DLL_INITFUNC_RENDERER  (LPCSTR)1
+#   define DLL_INITFUNC_SOUND     (LPCSTR)1
+#   define DLL_INITFUNC_PHYSIC    (LPCSTR)1
+#   define DLL_INITFUNC_FONT      (LPCSTR)1
+#   define DLL_INITFUNC_3DENGINE  (LPCSTR)1
+#   define DLL_INITFUNC_UI        (LPCSTR)1
+#endif
+
+#define AZ_TRACE_SYSTEM_WINDOW AZ::Debug::Trace::GetDefaultSystemWindow()
+
+#ifdef WIN32
+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;
+
+struct SCVarsClientConfigSink
+    : public ILoadConfigurationEntrySink
+{
+    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, [[maybe_unused]] const char* szGroup)
+    {
+        gEnv->pConsole->SetClientDataProbeString(szKey, szValue);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+static inline void InlineInitializationProcessing([[maybe_unused]] const char* sDescription)
+{
+    if (gEnv->pLog)
+    {
+        gEnv->pLog->UpdateLoadingScreen(0);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZ_PUSH_DISABLE_WARNING(4723, "-Wunknown-warning-option") // potential divide by 0 (needs to wrap the function)
+static void CmdCrashTest(IConsoleCmdArgs* pArgs)
+{
+    assert(pArgs);
+
+    if (pArgs->GetArgCount() == 2)
+    {
+        //This method intentionally crashes, a lot.
+
+        int crashType = atoi(pArgs->GetArg(1));
+        switch (crashType)
+        {
+        case 1:
+        {
+            int* p = 0;
+            PREFAST_SUPPRESS_WARNING(6011) * p = 0xABCD;
+        }
+        break;
+        case 2:
+        {
+            float a = 1.0f;
+            memset(&a, 0, sizeof(a));
+            float* b = &a;
+            float c = 3;
+            CryLog("%f", (c / *b));
+        }
+        break;
+        case 3:
+            while (true)
+            {
+                new char[10240];
+            }
+            break;
+        case 4:
+            CryFatalError("sys_crashtest 4");
+            break;
+        case 5:
+            while (true)
+            {
+                new char[128];     //testing the crash handler an exception in the cry memory allocation occurred
+            }
+        case 6:
+        {
+            AZ_Assert(false, "Testing assert for testing crashes");
+        }
+        break;
+        case 7:
+            __debugbreak();
+            break;
+        case 8:
+            CrySleep(1000 * 60 * 10);
+            break;
+        }
+    }
+}
+AZ_POP_DISABLE_WARNING
+
+//////////////////////////////////////////////////////////////////////////
+struct SysSpecOverrideSink
+    : public ILoadConfigurationEntrySink
+{
+    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup)
+    {
+        ICVar* pCvar = gEnv->pConsole->GetCVar(szKey);
+
+        if (pCvar)
+        {
+            const bool wasNotInConfig = ((pCvar->GetFlags() & VF_WASINCONFIG) == 0);
+            bool applyCvar = wasNotInConfig;
+            if (applyCvar == false)
+            {
+                // Special handling for sys_spec_full
+                if (azstricmp(szKey, "sys_spec_full") == 0)
+                {
+                    // If it is set to 0 then ignore this request to set to something else
+                    // If it is set to 0 then the user wants to changes system spec settings in system.cfg
+                    if (pCvar->GetIVal() != 0)
+                    {
+                        applyCvar = true;
+                    }
+                }
+                else
+                {
+                    // This could bypass the restricted cvar checks that exist elsewhere depending on
+                    // the calling code so we also need check here before setting.
+                    bool isConst = pCvar->IsConstCVar();
+                    bool isCheat = ((pCvar->GetFlags() & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0);
+                    bool isReadOnly = ((pCvar->GetFlags() & VF_READONLY) != 0);
+                    bool isDeprecated = ((pCvar->GetFlags() & VF_DEPRECATED) != 0);
+                    bool allowApplyCvar = true;
+
+                    if ((isConst || isCheat || isReadOnly) || isDeprecated)
+                    {
+                        allowApplyCvar = !isDeprecated && (gEnv->pSystem->IsDevMode()) || (gEnv->IsEditor());
+                    }
+
+                    if ((allowApplyCvar) || ALLOW_CONST_CVAR_MODIFICATIONS)
+                    {
+                        applyCvar = true;
+                    }
+                }
+            }
+
+            if (applyCvar)
+            {
+                pCvar->Set(szValue);
+            }
+            else
+            {
+                CryLogAlways("NOT VF_WASINCONFIG Ignoring cvar '%s' new value '%s' old value '%s' group '%s'", szKey, szValue, pCvar->GetString(), szGroup);
+            }
+        }
+        else
+        {
+            CryLogAlways("Can't find cvar '%s' value '%s' group '%s'", szKey, szValue, szGroup);
+        }
+    }
+};
+
+#if !defined(CONSOLE)
+struct SysSpecOverrideSinkConsole
+    : public ILoadConfigurationEntrySink
+{
+    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup)
+    {
+        // Ignore platform-specific cvars that should just be executed on the console
+        if (azstricmp(szGroup, "Platform") == 0)
+        {
+            return;
+        }
+
+        ICVar* pCvar = gEnv->pConsole->GetCVar(szKey);
+        if (pCvar)
+        {
+            pCvar->Set(szValue);
+        }
+        else
+        {
+            // If the cvar doesn't exist, calling this function only saves the value in case it's registered later where
+            // at that point it will be set from the stored value. This is required because otherwise registering the
+            // cvar bypasses any callbacks and uses values directly from the cvar group files.
+            gEnv->pConsole->LoadConfigVar(szKey, szValue);
+        }
+    }
+};
+#endif
+
+static ESystemConfigPlatform GetDevicePlatform()
+{
+#if defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
+    return CONFIG_PC;
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_2
+#include AZ_RESTRICTED_FILE(SystemInit_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_PLATFORM_ANDROID)
+    return CONFIG_ANDROID;
+#elif defined(AZ_PLATFORM_IOS)
+    return CONFIG_IOS;
+#elif defined(AZ_PLATFORM_MAC)
+    return CONFIG_OSX_METAL;
+#else
+    AZ_Assert(false, "Platform not supported");
+    return CONFIG_INVALID_PLATFORM;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+#if !defined(AZ_MONOLITHIC_BUILD)
+
+AZStd::unique_ptr<AZ::DynamicModuleHandle> CSystem::LoadDynamiclibrary(const char* dllName) const
+{
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> handle = AZ::DynamicModuleHandle::Create(dllName);
+
+    bool libraryLoaded = handle->Load(false);
+    // We need to inject the environment first thing so that allocators are available immediately
+    InjectEnvironmentFunction injectEnv = handle->GetFunction<InjectEnvironmentFunction>(INJECT_ENVIRONMENT_FUNCTION);
+    if (injectEnv)
+    {
+        auto env = AZ::Environment::GetInstance();
+        injectEnv(env);
+    }
+
+    if (!libraryLoaded)
+    {
+        handle.release();
+    }
+    return handle;
+}
+
+//////////////////////////////////////////////////////////////////////////
+AZStd::unique_ptr<AZ::DynamicModuleHandle> CSystem::LoadDLL(const char* dllName)
+{
+    LOADING_TIME_PROFILE_SECTION(GetISystem());
+
+    AZ_TracePrintf(AZ_TRACE_SYSTEM_WINDOW, "Loading DLL: %s", dllName);
+
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> handle = LoadDynamiclibrary(dllName);
+
+    if (!handle)
+    {
+#if defined(LINUX) || defined(APPLE)
+        AZ_Assert(false, "Error loading dylib: %s, error :  %s\n", dllName, dlerror());
+#else
+        AZ_Assert(false, "Error loading dll: %s, error code %d", dllName, GetLastError());
+#endif
+        return handle;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // After loading DLL initialize it by calling ModuleInitISystem
+    //////////////////////////////////////////////////////////////////////////
+    string moduleName = PathUtil::GetFileName(dllName);
+
+    typedef void*(*PtrFunc_ModuleInitISystem)(ISystem* pSystem, const char* moduleName);
+    PtrFunc_ModuleInitISystem pfnModuleInitISystem = handle->GetFunction<PtrFunc_ModuleInitISystem>(DLL_MODULE_INIT_ISYSTEM);
+    if (pfnModuleInitISystem)
+    {
+        pfnModuleInitISystem(this, moduleName.c_str());
+    }
+
+    return handle;
+}
+
+// TODO:DLL  #endif //#if defined(AZ_HAS_DLL_SUPPORT) && !defined(AZ_MONOLITHIC_BUILD)
+#endif //if !defined(AZ_MONOLITHIC_BUILD)
+//////////////////////////////////////////////////////////////////////////
+bool CSystem::LoadEngineDLLs()
+{
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSystem::UnloadDLL(const char* dllName)
+{
+    bool isSuccess = false;
+
+    CCryNameCRC key(dllName);
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> empty;
+    AZStd::unique_ptr<AZ::DynamicModuleHandle>& hModule = stl::find_in_map_ref(m_moduleDLLHandles, key, empty);
+    if ((hModule) && (hModule->IsLoaded()))
+    {
+        DetachEnvironmentFunction detachEnv = hModule->GetFunction<DetachEnvironmentFunction>(DETACH_ENVIRONMENT_FUNCTION);
+        if (detachEnv)
+        {
+            detachEnv();
+        }
+
+        isSuccess = hModule->Unload();
+        hModule.release();
+    }
+
+    return isSuccess;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::ShutdownModuleLibraries()
+{
+#if !defined(AZ_MONOLITHIC_BUILD)
+    for (auto iterator = m_moduleDLLHandles.begin(); iterator != m_moduleDLLHandles.end(); ++iterator)
+    {
+        typedef void*( * PtrFunc_ModuleShutdownISystem )(ISystem* pSystem);
+
+        PtrFunc_ModuleShutdownISystem pfnModuleShutdownISystem = iterator->second->GetFunction<PtrFunc_ModuleShutdownISystem>(DLL_MODULE_SHUTDOWN_ISYSTEM);
+        if (pfnModuleShutdownISystem)
+        {
+            pfnModuleShutdownISystem(this);
+        }
+        if (iterator->second->IsLoaded())
+        {
+            iterator->second->Unload();
+        }
+        iterator->second.release();
+    }
+
+    m_moduleDLLHandles.clear();
+
+#endif // !defined(AZ_MONOLITHIC_BUILD)
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
+
+#if defined(WIN32) || defined(WIN64)
+wstring GetErrorStringUnsupportedGPU(const char* gpuName, unsigned int gpuVendorId, unsigned int gpuDeviceId)
+{
+    const size_t fullLangID = (size_t) GetKeyboardLayout(0);
+    const size_t primLangID = fullLangID & 0x3FF;
+
+    const wchar_t* pFmt = L"Unsupported video card detected! Continuing to run might lead to unexpected results or crashes. "
+        L"Please check the manual for further information on hardware requirements.\n\n\"%S\" [vendor id = 0x%.4x, device id = 0x%.4x]";
+
+    switch (primLangID)
+    {
+    case 0x04: // Chinese
+    {
+        static const wchar_t fmt[] = {0x5075, 0x6E2C, 0x5230, 0x4E0D, 0x652F, 0x63F4, 0x7684, 0x986F, 0x793A, 0x5361, 0xFF01, 0x7E7C, 0x7E8C, 0x57F7, 0x884C, 0x53EF, 0x80FD, 0x5C0E, 0x81F4, 0x7121, 0x6CD5, 0x9810, 0x671F, 0x7684, 0x7D50, 0x679C, 0x6216, 0x7576, 0x6A5F, 0x3002, 0x8ACB, 0x6AA2, 0x67E5, 0x8AAA, 0x660E, 0x66F8, 0x4E0A, 0x7684, 0x786C, 0x9AD4, 0x9700, 0x6C42, 0x4EE5, 0x53D6, 0x5F97, 0x66F4, 0x591A, 0x76F8, 0x95DC, 0x8CC7, 0x8A0A, 0x3002, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x5EE0, 0x5546, 0x7DE8, 0x865F, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x88DD, 0x7F6E, 0x7DE8, 0x865F, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x05: // Czech
+    {
+        static const wchar_t fmt[] = {0x0042, 0x0079, 0x006C, 0x0061, 0x0020, 0x0064, 0x0065, 0x0074, 0x0065, 0x006B, 0x006F, 0x0076, 0x00E1, 0x006E, 0x0061, 0x0020, 0x0067, 0x0072, 0x0061, 0x0066, 0x0069, 0x0063, 0x006B, 0x00E1, 0x0020, 0x006B, 0x0061, 0x0072, 0x0074, 0x0061, 0x002C, 0x0020, 0x006B, 0x0074, 0x0065, 0x0072, 0x00E1, 0x0020, 0x006E, 0x0065, 0x006E, 0x00ED, 0x0020, 0x0070, 0x006F, 0x0064, 0x0070, 0x006F, 0x0072, 0x006F, 0x0076, 0x00E1, 0x006E, 0x0061, 0x002E, 0x0020, 0x0050, 0x006F, 0x006B, 0x0072, 0x0061, 0x010D, 0x006F, 0x0076, 0x00E1, 0x006E, 0x00ED, 0x0020, 0x006D, 0x016F, 0x017E, 0x0065, 0x0020, 0x0076, 0x00E9, 0x0073, 0x0074, 0x0020, 0x006B, 0x0065, 0x0020, 0x006B, 0x0072, 0x0069, 0x0074, 0x0069, 0x0063, 0x006B, 0x00FD, 0x006D, 0x0020, 0x0063, 0x0068, 0x0079, 0x0062, 0x00E1, 0x006D, 0x0020, 0x006E, 0x0065, 0x0062, 0x006F, 0x0020, 0x006E, 0x0065, 0x0073, 0x0074, 0x0061, 0x0062, 0x0069, 0x006C, 0x0069, 0x0074, 0x011B, 0x0020, 0x0073, 0x0079, 0x0073, 0x0074, 0x00E9, 0x006D, 0x0075, 0x002E, 0x0020, 0x0050, 0x0159, 0x0065, 0x010D, 0x0074, 0x011B, 0x0074, 0x0065, 0x0020, 0x0073, 0x0069, 0x0020, 0x0070, 0x0072, 0x006F, 0x0073, 0x00ED, 0x006D, 0x0020, 0x0075, 0x017E, 0x0069, 0x0076, 0x0061, 0x0074, 0x0065, 0x006C, 0x0073, 0x006B, 0x006F, 0x0075, 0x0020, 0x0070, 0x0159, 0x00ED, 0x0072, 0x0075, 0x010D, 0x006B, 0x0075, 0x0020, 0x0070, 0x0072, 0x006F, 0x0020, 0x0070, 0x006F, 0x0064, 0x0072, 0x006F, 0x0062, 0x006E, 0x00E9, 0x0020, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0063, 0x0065, 0x0020, 0x006F, 0x0020, 0x0073, 0x0079, 0x0073, 0x0074, 0x00E9, 0x006D, 0x006F, 0x0076, 0x00FD, 0x0063, 0x0068, 0x0020, 0x0070, 0x006F, 0x017E, 0x0061, 0x0064, 0x0061, 0x0076, 0x0063, 0x00ED, 0x0063, 0x0068, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x07: // German
+    {
+        static const wchar_t fmt[] = {0x004E, 0x0069, 0x0063, 0x0068, 0x0074, 0x002D, 0x0075, 0x006E, 0x0074, 0x0065, 0x0072, 0x0073, 0x0074, 0x00FC, 0x0074, 0x007A, 0x0074, 0x0065, 0x0020, 0x0056, 0x0069, 0x0064, 0x0065, 0x006F, 0x006B, 0x0061, 0x0072, 0x0074, 0x0065, 0x0020, 0x0067, 0x0065, 0x0066, 0x0075, 0x006E, 0x0064, 0x0065, 0x006E, 0x0021, 0x0020, 0x0046, 0x006F, 0x0072, 0x0074, 0x0066, 0x0061, 0x0068, 0x0072, 0x0065, 0x006E, 0x0020, 0x006B, 0x0061, 0x006E, 0x006E, 0x0020, 0x007A, 0x0075, 0x0020, 0x0075, 0x006E, 0x0065, 0x0072, 0x0077, 0x0061, 0x0072, 0x0074, 0x0065, 0x0074, 0x0065, 0x006E, 0x0020, 0x0045, 0x0072, 0x0067, 0x0065, 0x0062, 0x006E, 0x0069, 0x0073, 0x0073, 0x0065, 0x006E, 0x0020, 0x006F, 0x0064, 0x0065, 0x0072, 0x0020, 0x0041, 0x0062, 0x0073, 0x0074, 0x00FC, 0x0072, 0x007A, 0x0065, 0x006E, 0x0020, 0x0066, 0x00FC, 0x0068, 0x0072, 0x0065, 0x006E, 0x002E, 0x0020, 0x0042, 0x0069, 0x0074, 0x0074, 0x0065, 0x0020, 0x006C, 0x0069, 0x0065, 0x0073, 0x0020, 0x0064, 0x0061, 0x0073, 0x0020, 0x004D, 0x0061, 0x006E, 0x0075, 0x0061, 0x006C, 0x0020, 0x0066, 0x00FC, 0x0072, 0x0020, 0x0077, 0x0065, 0x0069, 0x0074, 0x0065, 0x0072, 0x0065, 0x0020, 0x0049, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0074, 0x0069, 0x006F, 0x006E, 0x0065, 0x006E, 0x0020, 0x007A, 0x0075, 0x0020, 0x0048, 0x0061, 0x0072, 0x0064, 0x0077, 0x0061, 0x0072, 0x0065, 0x002D, 0x0041, 0x006E, 0x0066, 0x006F, 0x0072, 0x0064, 0x0065, 0x0072, 0x0075, 0x006E, 0x0067, 0x0065, 0x006E, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x0a: // Spanish
+    {
+        static const wchar_t fmt[] = {0x0053, 0x0065, 0x0020, 0x0068, 0x0061, 0x0020, 0x0064, 0x0065, 0x0074, 0x0065, 0x0063, 0x0074, 0x0061, 0x0064, 0x006F, 0x0020, 0x0075, 0x006E, 0x0061, 0x0020, 0x0074, 0x0061, 0x0072, 0x006A, 0x0065, 0x0074, 0x0061, 0x0020, 0x0067, 0x0072, 0x00E1, 0x0066, 0x0069, 0x0063, 0x0061, 0x0020, 0x006E, 0x006F, 0x0020, 0x0063, 0x006F, 0x006D, 0x0070, 0x0061, 0x0074, 0x0069, 0x0062, 0x006C, 0x0065, 0x002E, 0x0020, 0x0053, 0x0069, 0x0020, 0x0073, 0x0069, 0x0067, 0x0075, 0x0065, 0x0073, 0x0020, 0x0065, 0x006A, 0x0065, 0x0063, 0x0075, 0x0074, 0x0061, 0x006E, 0x0064, 0x006F, 0x0020, 0x0065, 0x006C, 0x0020, 0x006A, 0x0075, 0x0065, 0x0067, 0x006F, 0x002C, 0x0020, 0x0065, 0x0073, 0x0020, 0x0070, 0x006F, 0x0073, 0x0069, 0x0062, 0x006C, 0x0065, 0x0020, 0x0071, 0x0075, 0x0065, 0x0020, 0x0073, 0x0065, 0x0020, 0x0070, 0x0072, 0x006F, 0x0064, 0x0075, 0x007A, 0x0063, 0x0061, 0x006E, 0x0020, 0x0065, 0x0066, 0x0065, 0x0063, 0x0074, 0x006F, 0x0073, 0x0020, 0x0069, 0x006E, 0x0065, 0x0073, 0x0070, 0x0065, 0x0072, 0x0061, 0x0064, 0x006F, 0x0073, 0x0020, 0x006F, 0x0020, 0x0071, 0x0075, 0x0065, 0x0020, 0x0065, 0x006C, 0x0020, 0x0070, 0x0072, 0x006F, 0x0067, 0x0072, 0x0061, 0x006D, 0x0061, 0x0020, 0x0064, 0x0065, 0x006A, 0x0065, 0x0020, 0x0064, 0x0065, 0x0020, 0x0066, 0x0075, 0x006E, 0x0063, 0x0069, 0x006F, 0x006E, 0x0061, 0x0072, 0x002E, 0x0020, 0x0050, 0x006F, 0x0072, 0x0020, 0x0066, 0x0061, 0x0076, 0x006F, 0x0072, 0x002C, 0x0020, 0x0063, 0x006F, 0x006D, 0x0070, 0x0072, 0x0075, 0x0065, 0x0062, 0x0061, 0x0020, 0x0065, 0x006C, 0x0020, 0x006D, 0x0061, 0x006E, 0x0075, 0x0061, 0x006C, 0x0020, 0x0070, 0x0061, 0x0072, 0x0061, 0x0020, 0x006F, 0x0062, 0x0074, 0x0065, 0x006E, 0x0065, 0x0072, 0x0020, 0x006D, 0x00E1, 0x0073, 0x0020, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0063, 0x0069, 0x00F3, 0x006E, 0x0020, 0x0061, 0x0063, 0x0065, 0x0072, 0x0063, 0x0061, 0x0020, 0x0064, 0x0065, 0x0020, 0x006C, 0x006F, 0x0073, 0x0020, 0x0072, 0x0065, 0x0071, 0x0075, 0x0069, 0x0073, 0x0069, 0x0074, 0x006F, 0x0073, 0x0020, 0x0064, 0x0065, 0x006C, 0x0020, 0x0073, 0x0069, 0x0073, 0x0074, 0x0065, 0x006D, 0x0061, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x0c: // French
+    {
+        static const wchar_t fmt[] = {0x0041, 0x0074, 0x0074, 0x0065, 0x006E, 0x0074, 0x0069, 0x006F, 0x006E, 0x002C, 0x0020, 0x006C, 0x0061, 0x0020, 0x0063, 0x0061, 0x0072, 0x0074, 0x0065, 0x0020, 0x0076, 0x0069, 0x0064, 0x00E9, 0x006F, 0x0020, 0x0064, 0x00E9, 0x0074, 0x0065, 0x0063, 0x0074, 0x00E9, 0x0065, 0x0020, 0x006E, 0x2019, 0x0065, 0x0073, 0x0074, 0x0020, 0x0070, 0x0061, 0x0073, 0x0020, 0x0073, 0x0075, 0x0070, 0x0070, 0x006F, 0x0072, 0x0074, 0x00E9, 0x0065, 0x0020, 0x0021, 0x0020, 0x0050, 0x006F, 0x0075, 0x0072, 0x0073, 0x0075, 0x0069, 0x0076, 0x0072, 0x0065, 0x0020, 0x006C, 0x2019, 0x0061, 0x0070, 0x0070, 0x006C, 0x0069, 0x0063, 0x0061, 0x0074, 0x0069, 0x006F, 0x006E, 0x0020, 0x0070, 0x006F, 0x0075, 0x0072, 0x0072, 0x0061, 0x0069, 0x0074, 0x0020, 0x0065, 0x006E, 0x0067, 0x0065, 0x006E, 0x0064, 0x0072, 0x0065, 0x0072, 0x0020, 0x0064, 0x0065, 0x0073, 0x0020, 0x0069, 0x006E, 0x0073, 0x0074, 0x0061, 0x0062, 0x0069, 0x006C, 0x0069, 0x0074, 0x00E9, 0x0073, 0x0020, 0x006F, 0x0075, 0x0020, 0x0064, 0x0065, 0x0073, 0x0020, 0x0063, 0x0072, 0x0061, 0x0073, 0x0068, 0x0073, 0x002E, 0x0020, 0x0056, 0x0065, 0x0075, 0x0069, 0x006C, 0x006C, 0x0065, 0x007A, 0x0020, 0x0076, 0x006F, 0x0075, 0x0073, 0x0020, 0x0072, 0x0065, 0x0070, 0x006F, 0x0072, 0x0074, 0x0065, 0x0072, 0x0020, 0x0061, 0x0075, 0x0020, 0x006D, 0x0061, 0x006E, 0x0075, 0x0065, 0x006C, 0x0020, 0x0070, 0x006F, 0x0075, 0x0072, 0x0020, 0x0070, 0x006C, 0x0075, 0x0073, 0x0020, 0x0064, 0x2019, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0074, 0x0069, 0x006F, 0x006E, 0x0073, 0x0020, 0x0073, 0x0075, 0x0072, 0x0020, 0x006C, 0x0065, 0x0073, 0x0020, 0x0070, 0x0072, 0x00E9, 0x002D, 0x0072, 0x0065, 0x0071, 0x0075, 0x0069, 0x0073, 0x0020, 0x006D, 0x0061, 0x0074, 0x00E9, 0x0072, 0x0069, 0x0065, 0x006C, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x10: // Italian
+    {
+        static const wchar_t fmt[] = {0x00C8, 0x0020, 0x0073, 0x0074, 0x0061, 0x0074, 0x0061, 0x0020, 0x0072, 0x0069, 0x006C, 0x0065, 0x0076, 0x0061, 0x0074, 0x0061, 0x0020, 0x0075, 0x006E, 0x0061, 0x0020, 0x0073, 0x0063, 0x0068, 0x0065, 0x0064, 0x0061, 0x0020, 0x0067, 0x0072, 0x0061, 0x0066, 0x0069, 0x0063, 0x0061, 0x0020, 0x006E, 0x006F, 0x006E, 0x0020, 0x0073, 0x0075, 0x0070, 0x0070, 0x006F, 0x0072, 0x0074, 0x0061, 0x0074, 0x0061, 0x0021, 0x0020, 0x0053, 0x0065, 0x0020, 0x0073, 0x0069, 0x0020, 0x0063, 0x006F, 0x006E, 0x0074, 0x0069, 0x006E, 0x0075, 0x0061, 0x002C, 0x0020, 0x0073, 0x0069, 0x0020, 0x0070, 0x006F, 0x0074, 0x0072, 0x0065, 0x0062, 0x0062, 0x0065, 0x0072, 0x006F, 0x0020, 0x0076, 0x0065, 0x0072, 0x0069, 0x0066, 0x0069, 0x0063, 0x0061, 0x0072, 0x0065, 0x0020, 0x0072, 0x0069, 0x0073, 0x0075, 0x006C, 0x0074, 0x0061, 0x0074, 0x0069, 0x0020, 0x0069, 0x006E, 0x0061, 0x0074, 0x0074, 0x0065, 0x0073, 0x0069, 0x0020, 0x006F, 0x0020, 0x0063, 0x0072, 0x0061, 0x0073, 0x0068, 0x002E, 0x0020, 0x0043, 0x006F, 0x006E, 0x0073, 0x0075, 0x006C, 0x0074, 0x0061, 0x0020, 0x0069, 0x006C, 0x0020, 0x006D, 0x0061, 0x006E, 0x0075, 0x0061, 0x006C, 0x0065, 0x0020, 0x0070, 0x0065, 0x0072, 0x0020, 0x0075, 0x006C, 0x0074, 0x0065, 0x0072, 0x0069, 0x006F, 0x0072, 0x0069, 0x0020, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x007A, 0x0069, 0x006F, 0x006E, 0x0069, 0x0020, 0x0073, 0x0075, 0x0069, 0x0020, 0x0072, 0x0065, 0x0071, 0x0075, 0x0069, 0x0073, 0x0069, 0x0074, 0x0069, 0x0020, 0x0064, 0x0069, 0x0020, 0x0073, 0x0069, 0x0073, 0x0074, 0x0065, 0x006D, 0x0061, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x11: // Japanese
+    {
+        static const wchar_t fmt[] = {0x30B5, 0x30DD, 0x30FC, 0x30C8, 0x3055, 0x308C, 0x3066, 0x3044, 0x306A, 0x3044, 0x30D3, 0x30C7, 0x30AA, 0x30AB, 0x30FC, 0x30C9, 0x304C, 0x691C, 0x51FA, 0x3055, 0x308C, 0x307E, 0x3057, 0x305F, 0xFF01, 0x0020, 0x3053, 0x306E, 0x307E, 0x307E, 0x7D9A, 0x3051, 0x308B, 0x3068, 0x4E88, 0x671F, 0x3057, 0x306A, 0x3044, 0x7D50, 0x679C, 0x3084, 0x30AF, 0x30E9, 0x30C3, 0x30B7, 0x30E5, 0x306E, 0x6050, 0x308C, 0x304C, 0x3042, 0x308A, 0x307E, 0x3059, 0x3002, 0x0020, 0x30DE, 0x30CB, 0x30E5, 0x30A2, 0x30EB, 0x306E, 0x5FC5, 0x8981, 0x52D5, 0x4F5C, 0x74B0, 0x5883, 0x3092, 0x3054, 0x78BA, 0x8A8D, 0x304F, 0x3060, 0x3055, 0x3044, 0x3002, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x30D9, 0x30F3, 0x30C0, 0x30FC, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x30C7, 0x30D0, 0x30A4, 0x30B9, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x15: // Polish
+    {
+        static const wchar_t fmt[] = {0x0057, 0x0079, 0x006B, 0x0072, 0x0079, 0x0074, 0x006F, 0x0020, 0x006E, 0x0069, 0x0065, 0x006F, 0x0062, 0x0073, 0x0142, 0x0075, 0x0067, 0x0069, 0x0077, 0x0061, 0x006E, 0x0105, 0x0020, 0x006B, 0x0061, 0x0072, 0x0074, 0x0119, 0x0020, 0x0067, 0x0072, 0x0061, 0x0066, 0x0069, 0x0063, 0x007A, 0x006E, 0x0105, 0x0021, 0x0020, 0x0044, 0x0061, 0x006C, 0x0073, 0x007A, 0x0065, 0x0020, 0x006B, 0x006F, 0x0072, 0x007A, 0x0079, 0x0073, 0x0074, 0x0061, 0x006E, 0x0069, 0x0065, 0x0020, 0x007A, 0x0020, 0x0070, 0x0072, 0x006F, 0x0064, 0x0075, 0x006B, 0x0074, 0x0075, 0x0020, 0x006D, 0x006F, 0x017C, 0x0065, 0x0020, 0x0073, 0x0070, 0x006F, 0x0077, 0x006F, 0x0064, 0x006F, 0x0077, 0x0061, 0x0107, 0x0020, 0x006E, 0x0069, 0x0065, 0x0070, 0x006F, 0x017C, 0x0105, 0x0064, 0x0061, 0x006E, 0x0065, 0x0020, 0x007A, 0x0061, 0x0063, 0x0068, 0x006F, 0x0077, 0x0061, 0x006E, 0x0069, 0x0065, 0x0020, 0x006C, 0x0075, 0x0062, 0x0020, 0x0077, 0x0073, 0x0074, 0x0072, 0x007A, 0x0079, 0x006D, 0x0061, 0x006E, 0x0069, 0x0065, 0x0020, 0x0070, 0x0072, 0x006F, 0x0067, 0x0072, 0x0061, 0x006D, 0x0075, 0x002E, 0x0020, 0x0041, 0x0062, 0x0079, 0x0020, 0x0075, 0x007A, 0x0079, 0x0073, 0x006B, 0x0061, 0x0107, 0x0020, 0x0077, 0x0069, 0x0119, 0x0063, 0x0065, 0x006A, 0x0020, 0x0069, 0x006E, 0x0066, 0x006F, 0x0072, 0x006D, 0x0061, 0x0063, 0x006A, 0x0069, 0x002C, 0x0020, 0x0073, 0x006B, 0x006F, 0x006E, 0x0073, 0x0075, 0x006C, 0x0074, 0x0075, 0x006A, 0x0020, 0x0073, 0x0069, 0x0119, 0x0020, 0x007A, 0x0020, 0x0069, 0x006E, 0x0073, 0x0074, 0x0072, 0x0075, 0x006B, 0x0063, 0x006A, 0x0105, 0x0020, 0x006F, 0x0062, 0x0073, 0x0142, 0x0075, 0x0067, 0x0069, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x19: // Russian
+    {
+        static const wchar_t fmt[] = {0x0412, 0x0430, 0x0448, 0x0430, 0x0020, 0x0432, 0x0438, 0x0434, 0x0435, 0x043E, 0x0020, 0x043A, 0x0430, 0x0440, 0x0442, 0x0430, 0x0020, 0x043D, 0x0435, 0x0020, 0x043F, 0x043E, 0x0434, 0x0434, 0x0435, 0x0440, 0x0436, 0x0438, 0x0432, 0x0430, 0x0435, 0x0442, 0x0441, 0x044F, 0x0021, 0x0020, 0x042D, 0x0442, 0x043E, 0x0020, 0x043C, 0x043E, 0x0436, 0x0435, 0x0442, 0x0020, 0x043F, 0x0440, 0x0438, 0x0432, 0x0435, 0x0441, 0x0442, 0x0438, 0x0020, 0x043A, 0x0020, 0x043D, 0x0435, 0x043F, 0x0440, 0x0435, 0x0434, 0x0441, 0x043A, 0x0430, 0x0437, 0x0443, 0x0435, 0x043C, 0x043E, 0x043C, 0x0443, 0x0020, 0x043F, 0x043E, 0x0432, 0x0435, 0x0434, 0x0435, 0x043D, 0x0438, 0x044E, 0x0020, 0x0438, 0x0020, 0x0437, 0x0430, 0x0432, 0x0438, 0x0441, 0x0430, 0x043D, 0x0438, 0x044E, 0x0020, 0x0438, 0x0433, 0x0440, 0x044B, 0x002E, 0x0020, 0x0414, 0x043B, 0x044F, 0x0020, 0x043F, 0x043E, 0x043B, 0x0443, 0x0447, 0x0435, 0x043D, 0x0438, 0x044F, 0x0020, 0x0438, 0x043D, 0x0444, 0x043E, 0x0440, 0x043C, 0x0430, 0x0446, 0x0438, 0x0438, 0x0020, 0x043E, 0x0020, 0x0441, 0x0438, 0x0441, 0x0442, 0x0435, 0x043C, 0x043D, 0x044B, 0x0445, 0x0020, 0x0442, 0x0440, 0x0435, 0x0431, 0x043E, 0x0432, 0x0430, 0x043D, 0x0438, 0x044F, 0x0445, 0x0020, 0x043E, 0x0431, 0x0440, 0x0430, 0x0442, 0x0438, 0x0442, 0x0435, 0x0441, 0x044C, 0x0020, 0x043A, 0x0020, 0x0440, 0x0443, 0x043A, 0x043E, 0x0432, 0x043E, 0x0434, 0x0441, 0x0442, 0x0432, 0x0443, 0x0020, 0x043F, 0x043E, 0x043B, 0x044C, 0x0437, 0x043E, 0x0432, 0x0430, 0x0442, 0x0435, 0x043B, 0x044F, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+    case 0x1f: // Turkish
+    {
+        static const wchar_t fmt[] = {0x0044, 0x0065, 0x0073, 0x0074, 0x0065, 0x006B, 0x006C, 0x0065, 0x006E, 0x006D, 0x0065, 0x0079, 0x0065, 0x006E, 0x0020, 0x0062, 0x0069, 0x0072, 0x0020, 0x0065, 0x006B, 0x0072, 0x0061, 0x006E, 0x0020, 0x006B, 0x0061, 0x0072, 0x0074, 0x0131, 0x0020, 0x0061, 0x006C, 0x0067, 0x0131, 0x006C, 0x0061, 0x006E, 0x0064, 0x0131, 0x0021, 0x0020, 0x0044, 0x0065, 0x0076, 0x0061, 0x006D, 0x0020, 0x0065, 0x0074, 0x006D, 0x0065, 0x006B, 0x0020, 0x0062, 0x0065, 0x006B, 0x006C, 0x0065, 0x006E, 0x006D, 0x0065, 0x0064, 0x0069, 0x006B, 0x0020, 0x0073, 0x006F, 0x006E, 0x0075, 0x00E7, 0x006C, 0x0061, 0x0072, 0x0061, 0x0020, 0x0076, 0x0065, 0x0020, 0x00E7, 0x00F6, 0x006B, 0x006D, 0x0065, 0x006C, 0x0065, 0x0072, 0x0065, 0x0020, 0x0079, 0x006F, 0x006C, 0x0020, 0x0061, 0x00E7, 0x0061, 0x0062, 0x0069, 0x006C, 0x0069, 0x0072, 0x002E, 0x0020, 0x0044, 0x006F, 0x006E, 0x0061, 0x006E, 0x0131, 0x006D, 0x0020, 0x0067, 0x0065, 0x0072, 0x0065, 0x006B, 0x006C, 0x0069, 0x006C, 0x0069, 0x006B, 0x006C, 0x0065, 0x0072, 0x0069, 0x0020, 0x0069, 0x00E7, 0x0069, 0x006E, 0x0020, 0x006C, 0x00FC, 0x0074, 0x0066, 0x0065, 0x006E, 0x0020, 0x0072, 0x0065, 0x0068, 0x0062, 0x0065, 0x0072, 0x0069, 0x006E, 0x0069, 0x007A, 0x0065, 0x0020, 0x0062, 0x0061, 0x015F, 0x0076, 0x0075, 0x0072, 0x0075, 0x006E, 0x002E, 0x000A, 0x000A, 0x0022, 0x0025, 0x0053, 0x0022, 0x0020, 0x005B, 0x0076, 0x0065, 0x006E, 0x0064, 0x006F, 0x0072, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x002C, 0x0020, 0x0064, 0x0065, 0x0076, 0x0069, 0x0063, 0x0065, 0x0020, 0x0069, 0x0064, 0x0020, 0x003D, 0x0020, 0x0030, 0x0078, 0x0025, 0x002E, 0x0034, 0x0078, 0x005D, 0};
+        pFmt = fmt;
+        break;
+    }
+
+    case 0x09: // English
+    default:
+        break;
+    }
+
+    wchar_t msg[1024];
+    msg[0] = L'\0';
+    msg[sizeof(msg) / sizeof(msg[0]) - 1] = L'\0';
+    azsnwprintf(msg, sizeof(msg) / sizeof(msg[0]) - 1, pFmt, gpuName, gpuVendorId, gpuDeviceId);
+
+    return msg;
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
+bool CSystem::InitConsole()
+{
+    LOADING_TIME_PROFILE_SECTION(GetISystem());
+
+    if (m_env.pConsole)
+    {
+        m_env.pConsole->Init(this);
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// attaches the given variable to the given container;
+// recreates the variable if necessary
+ICVar* CSystem::attachVariable (const char* szVarName, int* pContainer, const char* szComment, int dwFlags)
+{
+    IConsole* pConsole = GetIConsole();
+
+    ICVar* pOldVar = pConsole->GetCVar (szVarName);
+    int nDefault = 0;
+    if (pOldVar)
+    {
+        nDefault = pOldVar->GetIVal();
+        pConsole->UnregisterVariable(szVarName, true);
+    }
+
+    // NOTE: maybe we should preserve the actual value of the variable across the registration,
+    // because of the strange architecture of IConsole that converts int->float->int
+
+    REGISTER_CVAR2(szVarName, pContainer, *pContainer, dwFlags, szComment);
+
+    ICVar* pVar = pConsole->GetCVar(szVarName);
+
+#ifdef _DEBUG
+    // test if the variable really has this container
+    assert (*pContainer == pVar->GetIVal());
+    ++*pContainer;
+    assert (*pContainer == pVar->GetIVal());
+    --*pContainer;
+#endif
+
+    if (pOldVar)
+    {
+        // carry on the default value from the old variable anyway
+        pVar->Set(nDefault);
+    }
+    return pVar;
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+bool CSystem::InitFileSystem()
+{
+    LOADING_TIME_PROFILE_SECTION;
+    using namespace AzFramework::AssetSystem;
+
+    if (m_pUserCallback)
+    {
+        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");
+    AZ_Assert(m_env.pFileIO, "FileIOBase has not been initialized");
+
+    if (m_bEditor)
+    {
+        m_env.pCryPak->RecordFileOpen(AZ::IO::IArchive::RFOM_EngineStartup);
+    }
+
+    //init crypak
+    if (m_env.pCryPak->Init(""))
+    {
+#if !defined(_RELEASE)
+        const ICmdLineArg* pakalias = m_pCmdLine->FindArg(eCLAT_Pre, "pakalias");
+#else
+        const ICmdLineArg* pakalias = nullptr;
+#endif // !defined(_RELEASE)
+        if (pakalias && strlen(pakalias->GetValue()) > 0)
+        {
+            m_env.pCryPak->ParseAliases(pakalias->GetValue());
+        }
+    }
+    else
+    {
+        AZ_Assert(false, "Failed to initialize CryPak.");
+        return false;
+    }
+
+    // Now that file systems are init, we will clear any events that have arrived
+    // during file system init, so that systems do not reload assets that were already compiled in the
+    // critical compilation section.
+
+    AzFramework::LegacyAssetEventBus::ClearQueuedEvents();
+
+    //we are good to go
+    return true;
+}
+
+
+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;
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+bool CSystem::InitFileSystem_LoadEngineFolders(const SSystemInitParams&)
+{
+    LOADING_TIME_PROFILE_SECTION;
+    {
+        LoadConfiguration(m_systemConfigName.c_str());
+        AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Loading system configuration from %s...", m_systemConfigName.c_str());
+    }
+
+#if defined(AZ_PLATFORM_ANDROID)
+    AZ::Android::Utils::SetLoadFilesToMemory(m_sys_load_files_to_memory->GetString());
+#endif
+
+    GetISystem()->SetConfigPlatform(GetDevicePlatform());
+
+    auto projectPath = AZ::Utils::GetProjectPath();
+    AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Project Path: %s\n", projectPath.empty() ? "None specified" : projectPath.c_str());
+
+    auto projectName = AZ::Utils::GetProjectName();
+    AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Project Name: %s\n", projectName.empty() ? "None specified" : projectName.c_str());
+
+    OpenBasicPaks();
+
+    // Load game-specific folder.
+    LoadConfiguration("game.cfg");
+    // Load the client/sever-specific configuration
+    static const char* g_additionalConfig = gEnv->IsDedicated() ? "server_cfg" : "client_cfg";
+    LoadConfiguration(g_additionalConfig, nullptr, false);
+
+    // We do not use CVar groups on the consoles
+    AddCVarGroupDirectory("Config/CVarGroups");
+
+    return (true);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSystem::InitAudioSystem(const SSystemInitParams& initParams)
+{
+    LOADING_TIME_PROFILE_SECTION(GetISystem());
+
+    if (!Audio::Gem::AudioSystemGemRequestBus::HasHandlers())
+    {
+        // AudioSystem Gem has not been enabled for this project.
+        // This should not generate an error, but calling scope will warn.
+        return false;
+    }
+
+    bool useRealAudioSystem = false;
+    if (!initParams.bPreview
+        && !m_bDedicatedServer
+        && m_sys_audio_disable->GetIVal() == 0)
+    {
+        useRealAudioSystem = true;
+    }
+
+    bool result = false;
+    if (useRealAudioSystem)
+    {
+        Audio::Gem::AudioSystemGemRequestBus::BroadcastResult(result, &Audio::Gem::AudioSystemGemRequestBus::Events::Initialize, &initParams);
+    }
+    else
+    {
+        Audio::Gem::AudioSystemGemRequestBus::BroadcastResult(result, &Audio::Gem::AudioSystemGemRequestBus::Events::Initialize, nullptr);
+    }
+
+    if (result)
+    {
+        AZ_Assert(Audio::AudioSystemRequestBus::HasHandlers(),
+            "Initialization of the Audio System succeeded, but the Audio System EBus is not connected!\n");
+    }
+    else
+    {
+        AZ_Error(AZ_TRACE_SYSTEM_WINDOW, result, "The Audio System did not initialize correctly!\n");
+    }
+
+    return result;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSystem::InitVTuneProfiler()
+{
+    LOADING_TIME_PROFILE_SECTION(GetISystem());
+
+#ifdef PROFILE_WITH_VTUNE
+
+    WIN_HMODULE hModule = LoadDLL("VTuneApi.dll");
+    if (!hModule)
+    {
+        return false;
+    }
+
+        VTPause = (VTuneFunction) CryGetProcAddress(hModule, "VTPause");
+        VTResume = (VTuneFunction) CryGetProcAddress(hModule, "VTResume");
+        if (!VTPause || !VTResume)
+        {
+        AZ_Assert(false, "VTune did not initialize correctly.")
+        return false;
+    }
+    else
+    {
+        AZ_TracePrintf(AZ_TRACE_SYSTEM_WINDOW, "VTune API Initialized");
+    }
+#endif //PROFILE_WITH_VTUNE
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::InitLocalization()
+{
+    LOADING_TIME_PROFILE_SECTION(GetISystem());
+    // Set the localization folder
+    ICVar* pCVar = m_env.pConsole != 0 ? m_env.pConsole->GetCVar("sys_localization_folder") : 0;
+    if (pCVar)
+    {
+        static_cast<AZ::IO::Archive* const>(m_env.pCryPak)->SetLocalizationFolder(g_cvars.sys_localization_folder->GetString());
+    }
+
+    // Removed line that assigned language based on a #define
+
+    if (m_pLocalizationManager == nullptr)
+    {
+        m_pLocalizationManager = new CLocalizedStringsManager(this);
+    }
+
+    // Platform-specific implementation of getting the system language
+    ILocalizationManager::EPlatformIndependentLanguageID languageID = m_pLocalizationManager->GetSystemLanguage();
+    if (!m_pLocalizationManager->IsLanguageSupported(languageID))
+    {
+        languageID = ILocalizationManager::EPlatformIndependentLanguageID::ePILID_English_US;
+    }
+
+    string language = m_pLocalizationManager->LangNameFromPILID(languageID);
+    m_pLocalizationManager->SetLanguage(language.c_str());
+    if (m_pLocalizationManager->GetLocalizationFormat() == 1)
+    {
+        string translationsListXML = LOCALIZATION_TRANSLATIONS_LIST_FILE_NAME;
+        m_pLocalizationManager->InitLocalizationData(translationsListXML);
+
+        m_pLocalizationManager->LoadAllLocalizationData();
+    }
+    else
+    {
+        // if the language value cannot be found, let's default to the english pak
+        OpenLanguagePak(language);
+    }
+
+    pCVar = m_env.pConsole != 0 ? m_env.pConsole->GetCVar("g_languageAudio") : 0;
+    if (pCVar)
+    {
+        if (strlen(pCVar->GetString()) == 0)
+        {
+            pCVar->Set(language);
+        }
+        else
+        {
+            language = pCVar->GetString();
+        }
+    }
+    OpenLanguageAudioPak(language);
+}
+
+void CSystem::OpenBasicPaks()
+{
+    static bool bBasicPaksLoaded = false;
+    if (bBasicPaksLoaded)
+    {
+        return;
+    }
+    bBasicPaksLoaded = true;
+
+    LOADING_TIME_PROFILE_SECTION;
+
+    // open pak files
+    constexpr AZStd::string_view paksFolder = "@assets@/*.pak"; // (@assets@ assumed)
+    m_env.pCryPak->OpenPacks(paksFolder);
+
+    InlineInitializationProcessing("CSystem::OpenBasicPaks OpenPacks( paksFolder.c_str() )");
+
+    //////////////////////////////////////////////////////////////////////////
+    // Open engine packs
+    //////////////////////////////////////////////////////////////////////////
+
+    const char* const assetsDir = "@assets@";
+
+    // After game paks to have same search order as with files on disk
+    m_env.pCryPak->OpenPack(assetsDir, "Engine.pak");
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_15
+#include AZ_RESTRICTED_FILE(SystemInit_cpp)
+#endif
+
+#ifdef AZ_PLATFORM_ANDROID
+    // Load Android Obb files if available
+    const char* obbStorage = AZ::Android::Utils::GetObbStoragePath();
+    AZStd::string mainObbPath = AZStd::move(AZStd::string::format("%s/%s", obbStorage, AZ::Android::Utils::GetObbFileName(true)));
+    AZStd::string patchObbPath = AZStd::move(AZStd::string::format("%s/%s", obbStorage, AZ::Android::Utils::GetObbFileName(false)));
+    m_env.pCryPak->OpenPack(assetsDir, mainObbPath.c_str());
+    m_env.pCryPak->OpenPack(assetsDir, patchObbPath.c_str());
+#endif //AZ_PLATFORM_ANDROID
+
+    InlineInitializationProcessing("CSystem::OpenBasicPaks OpenPacks( Engine... )");
+
+    // Load paks required for game init to mem
+    gEnv->pCryPak->LoadPakToMemory("Engine.pak", AZ::IO::IArchive::eInMemoryPakLocale_GPU);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::OpenLanguagePak(const char* sLanguage)
+{
+    // Don't attempt to open a language PAK file if the game doesn't have a
+    // loc folder configured.
+    bool projUsesLocalization = false;
+    LocalizationManagerRequestBus::BroadcastResult(projUsesLocalization, &LocalizationManagerRequestBus::Events::ProjectUsesLocalization);
+    if (!projUsesLocalization)
+    {
+        return;
+    }
+
+    // Initialize languages.
+
+    // Omit the trailing slash!
+    string sLocalizationFolder = PathUtil::GetLocalizationFolder();
+
+    // load xml pak with full filenames to perform wildcard searches.
+    string sLocalizedPath;
+    GetLocalizedPath(sLanguage, sLocalizedPath);
+    if (!m_env.pCryPak->OpenPacks({ sLocalizationFolder.c_str(), sLocalizationFolder.size() }, { sLocalizedPath.c_str(), sLocalizedPath.size() }, 0))
+    {
+        // make sure the localized language is found - not really necessary, for TC
+        AZ_Printf("Localization", "Localized language content(%s) not available or modified from the original installation.", sLanguage);
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::OpenLanguageAudioPak([[maybe_unused]] const char* sLanguage)
+{
+    // Don't attempt to open a language PAK file if the game doesn't have a
+    // loc folder configured.
+    bool projUsesLocalization = false;
+    LocalizationManagerRequestBus::BroadcastResult(projUsesLocalization, &LocalizationManagerRequestBus::Events::ProjectUsesLocalization);
+    if (!projUsesLocalization)
+    {
+        return;
+    }
+
+    // Initialize languages.
+
+    int nPakFlags = 0;
+
+    // Omit the trailing slash!
+    string sLocalizationFolder(string().assign(PathUtil::GetLocalizationFolder(), 0, PathUtil::GetLocalizationFolder().size() - 1));
+
+    if (sLocalizationFolder.compareNoCase("Languages") == 0)
+    {
+        sLocalizationFolder = "@assets@";
+    }
+
+    // load localized pak with crc32 filenames on consoles to save memory.
+    string sLocalizedPath = "loc.pak";
+
+    if (!m_env.pCryPak->OpenPacks(sLocalizationFolder.c_str(), sLocalizedPath.c_str(), nPakFlags))
+    {
+        // make sure the localized language is found - not really necessary, for TC
+        AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "Localized language content(%s) not available or modified from the original installation.", sLanguage);
+    }
+}
+
+
+string GetUniqueLogFileName(string logFileName)
+{
+    string logFileNamePrefix = logFileName;
+    if ((logFileNamePrefix[0] != '@') && (AzFramework::StringFunc::Path::IsRelative(logFileNamePrefix)))
+    {
+        logFileNamePrefix = "@log@/";
+        logFileNamePrefix += logFileName;
+    }
+
+    char resolvedLogFilePathBuffer[AZ_MAX_PATH_LEN] = { 0 };
+    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(logFileNamePrefix.c_str(), resolvedLogFilePathBuffer, AZ_MAX_PATH_LEN);
+
+    int instance = gEnv->pSystem->GetApplicationLogInstance(resolvedLogFilePathBuffer);
+
+    if (instance == 0)
+    {
+        return logFileNamePrefix;
+    }
+
+    string logFileExtension;
+    size_t extensionIndex = logFileName.find_last_of('.');
+    if (extensionIndex != string::npos)
+    {
+        logFileExtension = logFileName.substr(extensionIndex, logFileName.length() - extensionIndex);
+        logFileNamePrefix = logFileName.substr(0, extensionIndex);
+    }
+
+    logFileName.Format("%s(%d)%s", logFileNamePrefix.c_str(), instance, logFileExtension.c_str());
+
+    return logFileName;
+}
+
+class AzConsoleToCryConsoleBinder final
+{
+public:
+    static void OnInvoke(IConsoleCmdArgs* args)
+    {
+        std::string command = args->GetCommandLine();
+        const size_t delim = command.find_first_of('=');
+        if (delim != std::string::npos)
+        {
+            // All Cry executed cfg files will come in through this pathway in addition to regular commands
+            // We strip out the = sign at this layer to maintain compatibility with cvars that use the '=' as a separator
+            // Swap the '=' character for a space
+            command[delim] = ' ';
+        }
+
+        AZ::Interface<AZ::IConsole>::Get()->PerformCommand(command.c_str(), AZ::ConsoleSilentMode::Silent, AZ::ConsoleInvokedFrom::CryBinding);
+    }
+
+    static void OnVarChanged(ICVar* cvar)
+    {
+        AZ::CVarFixedString command = AZ::CVarFixedString::format("%s %s", cvar->GetName(), cvar->GetString());
+        AZ::Interface<AZ::IConsole>::Get()->PerformCommand(command.c_str(), AZ::ConsoleSilentMode::Silent, AZ::ConsoleInvokedFrom::CryBinding);
+    }
+
+    static void Visit(AZ::ConsoleFunctorBase* functor)
+    {
+        if (gEnv->pConsole == nullptr)
+        {
+            AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Cry console was NULL while attempting to register Az CVars and CFuncs.\n");
+            return;
+        }
+
+        int32_t cryFlags = VF_NET_SYNCED;
+        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::DontReplicate) != AZ::ConsoleFunctorFlags::Null)
+        {
+            cryFlags = VF_NULL;
+        }
+        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::ServerOnly) != AZ::ConsoleFunctorFlags::Null)
+        {
+            cryFlags |= VF_DEDI_ONLY;
+        }
+        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::ReadOnly) != AZ::ConsoleFunctorFlags::Null)
+        {
+            cryFlags |= VF_READONLY;
+        }
+        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::IsCheat) != AZ::ConsoleFunctorFlags::Null)
+        {
+            cryFlags |= VF_CHEAT;
+        }
+        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::IsInvisible) != AZ::ConsoleFunctorFlags::Null)
+        {
+            cryFlags |= VF_INVISIBLE;
+        }
+        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::IsDeprecated) != AZ::ConsoleFunctorFlags::Null)
+        {
+            cryFlags |= VF_DEPRECATED;
+        }
+        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::NeedsReload) != AZ::ConsoleFunctorFlags::Null)
+        {
+            cryFlags |= VF_REQUIRE_APP_RESTART;
+        }
+        if ((functor->GetFlags() & AZ::ConsoleFunctorFlags::AllowClientSet) != AZ::ConsoleFunctorFlags::Null)
+        {
+            cryFlags |= VF_DEV_ONLY;
+        }
+
+        gEnv->pConsole->RemoveCommand(functor->GetName());
+        if (functor->GetTypeId() != AZ::TypeId::CreateNull())
+        {
+            AZ::CVarFixedString value;
+            functor->GetValue(value);
+            gEnv->pConsole->RegisterString(functor->GetName(), value.c_str(), cryFlags, functor->GetDesc(), AzConsoleToCryConsoleBinder::OnVarChanged);
+        }
+        else
+        {
+            gEnv->pConsole->AddCommand(functor->GetName(), AzConsoleToCryConsoleBinder::OnInvoke, cryFlags, functor->GetDesc());
+        }
+    }
+
+    using CommandRegisteredHandler = AZ::IConsole::ConsoleCommandRegisteredEvent::Handler;
+    static inline CommandRegisteredHandler s_commandRegisteredHandler = CommandRegisteredHandler([](AZ::ConsoleFunctorBase* functor) { Visit(functor); });
+};
+
+// System initialization
+/////////////////////////////////////////////////////////////////////////////////
+// INIT
+/////////////////////////////////////////////////////////////////////////////////
+bool CSystem::Init(const SSystemInitParams& startupParams)
+{
+#if AZ_TRAIT_USE_CRY_SIGNAL_HANDLER
+    signal(SIGSEGV, CryEngineSignalHandler);
+    signal(SIGTRAP, CryEngineSignalHandler);
+    signal(SIGILL, CryEngineSignalHandler);
+#endif // AZ_TRAIT_USE_CRY_SIGNAL_HANDLER
+
+    // Temporary Fix for an issue accessing gEnv from this object instance. The gEnv is not resolving to the
+    // global gEnv, instead its resolving an some uninitialized gEnv elsewhere (NULL). Since gEnv is
+    // initialized to this instance's SSystemGlobalEnvironment (m_env), we will force set it again here
+    // to m_env
+    if (!gEnv)
+    {
+        gEnv = &m_env;
+    }
+
+    LOADING_TIME_PROFILE_SECTION;
+
+    SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_INIT);
+    gEnv->mMainThreadId = GetCurrentThreadId();         //Set this ASAP on startup
+
+    InlineInitializationProcessing("CSystem::Init start");
+
+    m_env.bNoAssertDialog = false;
+
+    m_bNoCrashDialog = gEnv->IsDedicated();
+
+    if (startupParams.bUnattendedMode)
+    {
+        m_bNoCrashDialog = true;
+        m_env.bNoAssertDialog = true; //this also suppresses CryMessageBox
+        g_cvars.sys_no_crash_dialog = true;
+    }
+
+#if defined(AZ_PLATFORM_LINUX)
+    // Linux is all console for now and so no room for dialog boxes!
+    m_env.bNoAssertDialog = true;
+#endif
+
+    m_pCmdLine = new CCmdLine(startupParams.szSystemCmdLine);
+
+    AZCoreLogSink::Connect();
+
+    // Registers all AZ Console Variables functors specified within CrySystem
+    if (auto azConsole = AZ::Interface<AZ::IConsole>::Get(); azConsole)
+    {
+        azConsole->LinkDeferredFunctors(AZ::ConsoleFunctorBase::GetDeferredHead());
+    }
+    
+    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry)
+    {
+        AZ::SettingsRegistryInterface::FixedValueString assetPlatform;
+        if (!AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, assetPlatform,
+            AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, "assets"))
+        {
+            assetPlatform = AzFramework::OSPlatformToDefaultAssetPlatform(AZ_TRAIT_OS_PLATFORM_CODENAME);
+            AZ_Warning(AZ_TRACE_SYSTEM_WINDOW, false, R"(A valid asset platform is missing in "%s/assets" key in the SettingsRegistry.)""\n"
+                R"(This typically done by setting the "assets" field within a .setreg file)""\n"
+                R"(A fallback of %s will be used.)",
+                AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey,
+                assetPlatform.c_str());
+        }
+
+        m_systemConfigName = "system_" AZ_TRAIT_OS_PLATFORM_CODENAME_LOWER "_";
+        m_systemConfigName += assetPlatform.c_str();
+        m_systemConfigName += ".cfg";
+    }
+
+#if defined(WIN32) || defined(WIN64)
+    // check OS version - we only want to run on XP or higher - talk to Martin Mittring if you want to change this
+    {
+        OSVERSIONINFO osvi;
+
+        osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
+        GetVersionExA(&osvi);
+AZ_POP_DISABLE_WARNING
+
+        bool bIsWindowsXPorLater = osvi.dwMajorVersion > 5 || (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion >= 1);
+
+        if (!bIsWindowsXPorLater)
+        {
+            AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "Open 3D Engine requires an OS version of Windows XP or later.");
+            return false;
+        }
+    }
+#endif
+
+    // Get file version information.
+    QueryVersionInfo();
+    DetectGameFolderAccessRights();
+
+    m_bEditor = startupParams.bEditor;
+    m_bPreviewMode = startupParams.bPreview;
+    m_bTestMode = startupParams.bTestMode;
+    m_pUserCallback = startupParams.pUserCallback;
+
+    m_bDedicatedServer = startupParams.bDedicatedServer;
+    m_currentLanguageAudio = "";
+
+#if !defined(CONSOLE)
+    m_env.SetIsEditor(m_bEditor);
+    m_env.SetIsEditorGameMode(false);
+    m_env.SetIsEditorSimulationMode(false);
+#endif
+
+    m_env.SetToolMode(startupParams.bToolMode);
+
+    if (m_bEditor)
+    {
+        m_bInDevMode = true;
+    }
+
+    if (!gEnv->IsDedicated())
+    {
+        const ICmdLineArg* crashdialog = m_pCmdLine->FindArg(eCLAT_Post, "sys_no_crash_dialog");
+        if (crashdialog)
+        {
+            m_bNoCrashDialog = true;
+        }
+    }
+
+#if !defined(_RELEASE)
+    if (!m_bDedicatedServer)
+    {
+        const ICmdLineArg* dedicated = m_pCmdLine->FindArg(eCLAT_Pre, "dedicated");
+        if (dedicated)
+        {
+            m_bDedicatedServer = true;
+        }
+    }
+#endif // !defined(_RELEASE)
+
+#if !defined(CONSOLE)
+    gEnv->SetIsDedicated(m_bDedicatedServer);
+#endif
+
+    {
+        EBUS_EVENT(CrySystemEventBus, OnCrySystemPreInitialize, *this, startupParams);
+
+        //////////////////////////////////////////////////////////////////////////
+        // File system, must be very early
+        //////////////////////////////////////////////////////////////////////////
+        if (!InitFileSystem())
+        {
+            return false;
+        }
+        //////////////////////////////////////////////////////////////////////////
+        InlineInitializationProcessing("CSystem::Init InitFileSystem");
+
+        m_missingAssetLogger = AZStd::make_unique<AzFramework::MissingAssetLogger>();
+
+        //////////////////////////////////////////////////////////////////////////
+        // Logging is only available after file system initialization.
+        //////////////////////////////////////////////////////////////////////////
+        if (!startupParams.pLog)
+        {
+            m_env.pLog = new CLog(this);
+            if (startupParams.pLogCallback)
+            {
+                m_env.pLog->AddCallback(startupParams.pLogCallback);
+            }
+
+            const ICmdLineArg* logfile = m_pCmdLine->FindArg(eCLAT_Pre, "logfile"); //see if the user specified a log name, if so use it
+            if (logfile && strlen(logfile->GetValue()) > 0)
+            {
+                m_env.pLog->SetFileName(logfile->GetValue(), startupParams.autoBackupLogs);
+            }
+            else if (startupParams.sLogFileName)    //otherwise see if the startup params has a log file name, if so use it
+            {
+                const string sUniqueLogFileName = GetUniqueLogFileName(startupParams.sLogFileName);
+                m_env.pLog->SetFileName(sUniqueLogFileName.c_str(), startupParams.autoBackupLogs);
+            }
+            else//use the default log name
+            {
+                m_env.pLog->SetFileName(DEFAULT_LOG_FILENAME, startupParams.autoBackupLogs);
+            }
+        }
+        else
+        {
+            m_env.pLog = startupParams.pLog;
+        }
+
+        // The log backup system expects the version number to be the first line of the log
+        // so we log this immediately after setting the log filename
+        LogVersion();
+
+        bool devModeEnable = true;
+
+#if defined(_RELEASE)
+        // disable devmode by default in release builds outside the editor
+        devModeEnable = m_bEditor;
+#endif
+
+        // disable devmode in launcher if someone really wants to (even in non release builds)
+        if (!m_bEditor && m_pCmdLine->FindArg(eCLAT_Pre, "nodevmode"))
+        {
+            devModeEnable = false;
+        }
+
+        SetDevMode(devModeEnable);
+
+        //////////////////////////////////////////////////////////////////////////
+        // CREATE CONSOLE
+        //////////////////////////////////////////////////////////////////////////
+        if (!startupParams.bSkipConsole)
+        {
+            m_env.pConsole = new CXConsole;
+
+            if (startupParams.pPrintSync)
+            {
+                m_env.pConsole->AddOutputPrintSink(startupParams.pPrintSync);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+
+        if (m_pUserCallback)
+        {
+            m_pUserCallback->OnInit(this);
+        }
+
+        m_env.pLog->RegisterConsoleVariables();
+
+        GetIRemoteConsole()->RegisterConsoleVariables();
+
+        if (!startupParams.bSkipConsole)
+        {
+            // Register system console variables.
+            CreateSystemVars();
+
+            // Register Audio-related system CVars
+            CreateAudioVars();
+
+            // Register any AZ CVar commands created above with the AZ Console system.
+            AZ::ConsoleFunctorBase*& deferredHead = AZ::ConsoleFunctorBase::GetDeferredHead();
+            AZ::Interface<AZ::IConsole>::Get()->LinkDeferredFunctors(deferredHead);
+
+            // Callback
+            if (m_pUserCallback && m_env.pConsole)
+            {
+                m_pUserCallback->OnConsoleCreated(m_env.pConsole);
+            }
+
+            // Let listeners know its safe to register cvars
+            EBUS_EVENT(CrySystemEventBus, OnCrySystemCVarRegistry);
+        }
+
+
+        // Set this as soon as the system cvars got initialized.
+        static_cast<AZ::IO::Archive* const>(m_env.pCryPak)->SetLocalizationFolder(g_cvars.sys_localization_folder->GetString());
+
+        InlineInitializationProcessing("CSystem::Init Create console");
+
+        // Need to load the engine.pak that includes the config files needed during initialization
+        m_env.pCryPak->OpenPack("@assets@", "Engine.pak");
+
+        InitFileSystem_LoadEngineFolders(startupParams);
+
+#if !defined(RELEASE) || defined(RELEASE_LOGGING)
+        // now that the system cfgs have been loaded, we can start the remote console
+        GetIRemoteConsole()->Update();
+#endif
+
+        InlineInitializationProcessing("CSystem::Init Load Engine Folders");
+
+        //////////////////////////////////////////////////////////////////////////
+        //Load config files
+        //////////////////////////////////////////////////////////////////////////
+
+        int curSpecVal = 0;
+        ICVar* pSysSpecCVar = gEnv->pConsole->GetCVar("r_GraphicsQuality");
+        if (gEnv->pSystem->IsDevMode())
+        {
+            if (pSysSpecCVar && pSysSpecCVar->GetFlags() & VF_WASINCONFIG)
+            {
+                curSpecVal = pSysSpecCVar->GetIVal();
+                pSysSpecCVar->SetFlags(pSysSpecCVar->GetFlags() | VF_SYSSPEC_OVERWRITE);
+            }
+        }
+
+        // tools may not interact with @user@
+        if (!gEnv->IsInToolMode())
+        {
+            if (m_pCmdLine->FindArg(eCLAT_Pre, "ResetProfile") == 0)
+            {
+                LoadConfiguration("@user@/game.cfg", 0, false);
+            }
+        }
+
+        // If sys spec variable was specified, is not 0, and we are in devmode restore the value from before loading game.cfg
+        // This enables setting of a specific sys_spec outside menu and game.cfg
+        if (gEnv->pSystem->IsDevMode())
+        {
+            if (pSysSpecCVar && curSpecVal && curSpecVal != pSysSpecCVar->GetIVal())
+            {
+                pSysSpecCVar->Set(curSpecVal);
+            }
+        }
+
+        {
+            // We have to load this file again since first time we did it without devmode
+            LoadConfiguration(m_systemConfigName.c_str());
+            // Optional user defined overrides
+            LoadConfiguration("user.cfg");
+
+#if defined(ENABLE_STATS_AGENT)
+            if (m_pCmdLine->FindArg(eCLAT_Pre, "useamblecfg"))
+            {
+                LoadConfiguration("amble.cfg");
+            }
+#endif
+        }
+
+#if defined(PERFORMANCE_BUILD)
+        LoadConfiguration("performance.cfg");
+#endif
+
+        //////////////////////////////////////////////////////////////////////////
+        if (g_cvars.sys_asserts == 0)
+        {
+            gEnv->bIgnoreAllAsserts = true;
+        }
+        if (g_cvars.sys_asserts == 2)
+        {
+            gEnv->bNoAssertDialog = true;
+        }
+
+        LogBuildInfo();
+
+        InlineInitializationProcessing("CSystem::Init LoadConfigurations");
+
+#ifdef WIN32
+        if (g_cvars.sys_WER)
+        {
+            SetUnhandledExceptionFilter(CryEngineExceptionFilterWER);
+        }
+#endif
+
+        //////////////////////////////////////////////////////////////////////////
+        // Localization
+        //////////////////////////////////////////////////////////////////////////
+        {
+            InitLocalization();
+        }
+        InlineInitializationProcessing("CSystem::Init InitLocalizations");
+
+        //////////////////////////////////////////////////////////////////////////
+        // Open basic pak files after intro movie playback started
+        //////////////////////////////////////////////////////////////////////////
+        OpenBasicPaks();
+
+        //////////////////////////////////////////////////////////////////////////
+        // AUDIO
+        //////////////////////////////////////////////////////////////////////////
+        {
+            if (InitAudioSystem(startupParams))
+            {
+                // Pump the Log - Audio initialization happened on a non-main thread, there may be log messages queued up.
+                gEnv->pLog->Update();
+            }
+            else
+            {
+                // Failure to initialize audio system is no longer a fatal or an error.  A warning is sufficient.
+                AZ_Warning(AZ_TRACE_SYSTEM_WINDOW, false, "<Audio>: Running without any AudioSystem!");
+            }
+        }
+
+
+        // Compiling the default system textures can be the lengthiest portion of
+        // editor initialization, so it is useful to inform users that they are waiting on
+        // the necessary default textures to compile.
+        if (m_pUserCallback)
+        {
+            m_pUserCallback->OnInitProgress("First time asset processing - may take a minute...");
+        }
+
+        //////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////
+        // System cursor
+        //////////////////////////////////////////////////////////////////////////
+        // - Dedicated server is in console mode by default (system cursor is always shown when console is)
+        // - System cursor is always visible by default in Editor (we never start directly in Game Mode)
+        // - System cursor has to be enabled manually by the Game if needed; the custom UiCursor will typically be used instead
+
+        if (!gEnv->IsDedicated() &&
+            !gEnv->IsEditor())
+        {
+            AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+                                                            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+                                                            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())
+        {
+            return false;
+        }
+
+        if (m_pUserCallback)
+        {
+            m_pUserCallback->OnInitProgress("Initializing additional systems...");
+        }
+        AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Initializing additional systems");
+
+
+        InlineInitializationProcessing("CSystem::Init AIInit");
+
+        //////////////////////////////////////////////////////////////////////////
+        // LEVEL SYSTEM
+        bool usePrefabSystemForLevels = false;
+        AzFramework::ApplicationRequests::Bus::BroadcastResult(
+            usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+        if (usePrefabSystemForLevels)
+        {
+            m_pLevelSystem = new LegacyLevelSystem::SpawnableLevelSystem(this);
+        }
+        else
+        {
+            // [LYN-2376] Remove once legacy slice support is removed
+            m_pLevelSystem = new LegacyLevelSystem::CLevelSystem(this, ILevelSystem::GetLevelsDirectoryName());
+        }
+
+        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();
+        }
+
+        InlineInitializationProcessing("CSystem::Init InitLmbrAWS");
+
+        // Az to Cry console binding
+        AZ::Interface<AZ::IConsole>::Get()->VisitRegisteredFunctors([](AZ::ConsoleFunctorBase* functor) { AzConsoleToCryConsoleBinder::Visit(functor); });
+        AzConsoleToCryConsoleBinder::s_commandRegisteredHandler.Connect(AZ::Interface<AZ::IConsole>::Get()->GetConsoleCommandRegisteredEvent());
+
+        if (g_cvars.sys_float_exceptions > 0)
+        {
+            if (g_cvars.sys_float_exceptions == 3 && gEnv->IsEditor()) // Turn off float exceptions in editor if sys_float_exceptions = 3
+            {
+                g_cvars.sys_float_exceptions = 0;
+            }
+            if (g_cvars.sys_float_exceptions > 0)
+            {
+                AZ_TracePrintf(AZ_TRACE_SYSTEM_WINDOW, "Enabled float exceptions(sys_float_exceptions %d). This makes the performance slower.", g_cvars.sys_float_exceptions);
+            }
+        }
+        EnableFloatExceptions(g_cvars.sys_float_exceptions);
+    }
+
+    InlineInitializationProcessing("CSystem::Init End");
+
+#if defined(IS_PROSDK)
+    SDKEvaluation::InitSDKEvaluation(gEnv, &m_pUserCallback);
+#endif
+
+    InlineInitializationProcessing("CSystem::Init End");
+
+    if (gEnv->IsDedicated())
+    {
+        SCVarsClientConfigSink CVarsClientConfigSink;
+        LoadConfiguration("client.cfg", &CVarsClientConfigSink);
+    }
+
+    //Connect to the render bus
+    AZ::RenderNotificationsBus::Handler::BusConnect();
+
+    // Send out EBus event
+    EBUS_EVENT(CrySystemEventBus, OnCrySystemInitialized, *this, startupParams);
+
+    // Verify that the Maestro Gem initialized the movie system correctly. This can be removed if and when Maestro is not a required Gem
+    if (gEnv->IsEditor() && !gEnv->pMovieSystem)
+    {
+        AZ_Assert(false, "Error initializing the Cinematic System. Please check that the Maestro Gem is enabled for this project.");
+        return false;
+    }
+
+    if (ISystemEventDispatcher* systemEventDispatcher = GetISystemEventDispatcher())
+    {
+        systemEventDispatcher->OnSystemEvent(ESYSTEM_EVENT_GAME_POST_INIT, 0, 0);
+        systemEventDispatcher->OnSystemEvent(ESYSTEM_EVENT_GAME_POST_INIT_DONE, 0, 0);
+    }
+
+    m_bInitializedSuccessfully = true;
+
+    return (true);
+}
+
+
+static void LoadConfigurationCmd(IConsoleCmdArgs* pParams)
+{
+    assert(pParams);
+
+    if (pParams->GetArgCount() != 2)
+    {
+        gEnv->pLog->LogError("LoadConfiguration failed, one parameter needed");
+        return;
+    }
+
+    GetISystem()->LoadConfiguration(string("Config/") + pParams->GetArg(1));
+}
+
+
+// --------------------------------------------------------------------------------------------------------------------------
+
+static string ConcatPath(const char* szPart1, const char* szPart2)
+{
+    if (szPart1[0] == 0)
+    {
+        return szPart2;
+    }
+
+    string ret;
+
+    ret.reserve(strlen(szPart1) + 1 + strlen(szPart2));
+
+    ret = szPart1;
+    ret += "/";
+    ret += 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 CmdDrillToFile(IConsoleCmdArgs* pArgs)
+{
+    if (azstricmp(pArgs->GetArg(0), "DrillerStop") == 0)
+    {
+        EBUS_EVENT(AzFramework::DrillerConsoleCommandBus, StopDrillerSession, AZ::Crc32("DefaultDrillerSession"));
+    }
+    else
+    {
+        if (pArgs->GetArgCount() > 1)
+        {
+            AZ::Debug::DrillerManager::DrillerListType drillersToEnable;
+            for (int iArg = 1; iArg < pArgs->GetArgCount(); ++iArg)
+            {
+                if (azstricmp(pArgs->GetArg(iArg), "Replica") == 0)
+                {
+                    drillersToEnable.push_back();
+                    drillersToEnable.back().id = AZ::Crc32("ReplicaDriller");
+                }
+                else if (azstricmp(pArgs->GetArg(iArg), "Carrier") == 0)
+                {
+                    drillersToEnable.push_back();
+                    drillersToEnable.back().id = AZ::Crc32("CarrierDriller");
+                }
+                else
+                {
+                    CryLogAlways("Driller %s not supported.", pArgs->GetArg(iArg));
+                }
+            }
+            EBUS_EVENT(AzFramework::DrillerConsoleCommandBus, StartDrillerSession, drillersToEnable, AZ::Crc32("DefaultDrillerSession"));
+        }
+        else
+        {
+            CryLogAlways("Syntax: DrillerStart [Driller1] [Driller2] [...]");
+            CryLogAlways("Supported Drillers:");
+            CryLogAlways("    Carrier");
+            CryLogAlways("    Replica");
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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.");
+    m_game_load_screen_sequence_to_auto_play = REGISTER_STRING("game_load_screen_sequence_to_auto_play", "", 0, "Game load screen UiCanvas animation sequence to play on load.");
+    m_level_load_screen_sequence_to_auto_play = REGISTER_STRING("level_load_screen_sequence_to_auto_play", "", 0, "Level load screen UiCanvas animation sequence to play on load.");
+    m_game_load_screen_sequence_fixed_fps = REGISTER_FLOAT("game_load_screen_sequence_fixed_fps", 60.0f, 0, "Fixed frame rate fed to updates of the game load screen sequence.");
+    m_level_load_screen_sequence_fixed_fps = REGISTER_FLOAT("level_load_screen_sequence_fixed_fps", 60.0f, 0, "Fixed frame rate fed to updates of the level load screen sequence.");
+    m_game_load_screen_max_fps = REGISTER_FLOAT("game_load_screen_max_fps", 30.0f, 0, "Max frame rate to update the game load screen sequence.");
+    m_level_load_screen_max_fps = REGISTER_FLOAT("level_load_screen_max_fps", 30.0f, 0, "Max frame rate to update the level load screen sequence.");
+    m_game_load_screen_minimum_time = REGISTER_FLOAT("game_load_screen_minimum_time", 0.0f, 0, "Minimum amount of time to show the game load screen. Important to prevent short loads from flashing the load screen. 0 means there is no limit.");
+    m_level_load_screen_minimum_time = REGISTER_FLOAT("level_load_screen_minimum_time", 0.0f, 0, "Minimum amount of time to show the level load screen. Important to prevent short loads from flashing the load screen. 0 means there is no limit.");
+#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
+
+    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
+    (
+        "quit",
+        "Quit/Shutdown the engine",
+        AZ::ConsoleFunctorFlags::AllowClientSet | AZ::ConsoleFunctorFlags::DontReplicate,
+        AZ::TypeId::CreateNull(),
+        []([[maybe_unused]] const AZ::ConsoleCommandContainer& params) { GetISystem()->Quit(); }
+    );
+
+    m_sys_load_files_to_memory = REGISTER_STRING("sys_load_files_to_memory", "shadercache.pak", 0,
+            "Specify comma separated list of filenames that need to be loaded to memory.\n"
+            "Partial names also work. Eg. \"shader\" will load:\n"
+            "shaders.pak, shadercache.pak, and shadercachestartup.pak");
+
+#ifndef _RELEASE
+    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
+    {
+        e_sysKeyboardDefault = 0
+    };
+#else
+    enum
+    {
+        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"
+            "Usage: sv_DedicatedMaxRate [5..500]\n"
+            "Default is 30.");
+
+    REGISTER_FLOAT("sv_DedicatedCPUPercent", 0.0f, 0,
+        "Sets the target CPU usage when running as a dedicated server, or disable this feature if it's zero.\n"
+        "Usage: sv_DedicatedCPUPercent [0..100]\n"
+        "Default is 0 (disabled).");
+    REGISTER_FLOAT("sv_DedicatedCPUVariance", 10.0f, 0,
+        "Sets how much the CPU can vary from sv_DedicateCPU (up or down) without adjusting the framerate.\n"
+        "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)");
+
+#if defined(WIN32) || defined(WIN64)
+    const uint32 nJobSystemDefaultCoreNumber = 8;
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_11
+#include AZ_RESTRICTED_FILE(SystemInit_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    const uint32 nJobSystemDefaultCoreNumber = 4;
+#endif
+
+    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");
+
+    REGISTER_CVAR2("sys_vtune", &g_cvars.sys_vtune, 0, VF_NULL, "");
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_17
+#include AZ_RESTRICTED_FILE(SystemInit_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+#   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,
+            "Sets the folder where to look for localized data.\n"
+            "This cvar allows for backwards compatibility so localized data under the game folder can still be found.\n"
+            "Usage: sys_localization_folder <folder name>\n"
+            "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.
+    REGISTER_CVAR2("sys_float_exceptions", &g_cvars.sys_float_exceptions, 0, 0, "Use or not use floating point exceptions.");
+#endif
+
+    REGISTER_CVAR2("sys_update_profile_time", &g_cvars.sys_update_profile_time, 1.0f, 0, "Time to keep updates timings history for.");
+    REGISTER_CVAR2("sys_no_crash_dialog", &g_cvars.sys_no_crash_dialog, m_bNoCrashDialog, VF_NULL, "Whether to disable the crash dialog window");
+    REGISTER_CVAR2("sys_no_error_report_window", &g_cvars.sys_no_error_report_window, m_bNoErrorReportWindow, VF_NULL, "Whether to disable the error report list");
+#if defined(_RELEASE)
+    if (!gEnv->IsDedicated())
+    {
+        REGISTER_CVAR2("sys_WER", &g_cvars.sys_WER, 1, 0, "Enables Windows Error Reporting");
+    }
+#else
+    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,
+        "Specifies type of crash dump to create - see MINIDUMP_TYPE in dbghelp.h for full list of values\n"
+        "0: Do not create a minidump\n"
+        "1: Create a small minidump (stacktrace)\n"
+        "2: Create a medium minidump (+ some variables)\n"
+        "3: Create a full minidump (+ all memory)\n"
+        );
+    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
+    const int DEFAULT_SYS_MAX_FPS = -1;
+#endif
+    REGISTER_CVAR2("sys_MaxFPS", &g_cvars.sys_MaxFPS, DEFAULT_SYS_MAX_FPS, VF_NULL, "Limits the frame rate to specified number n (if n>0 and if vsync is disabled).\n"
+        " 0 = on PC if vsync is off auto throttles fps while in menu or game is paused (default)\n"
+        "-1 = off");
+
+    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"
+        "2=floating point exception\n"
+        "3=memory allocation exception\n"
+        "4=cry fatal error is called\n"
+        "5=memory allocation for small blocks\n"
+        "6=assert\n"
+        "7=debugbreak\n"
+        "8=10min sleep"
+        );
+
+    REGISTER_FLOAT("sys_scale3DMouseTranslation", 0.2f, 0, "Scales translation speed of supported 3DMouse devices.");
+    REGISTER_FLOAT("sys_Scale3DMouseYPR", 0.05f, 0, "Scales rotation speed of supported 3DMouse devices.");
+
+    REGISTER_INT("capture_frames", 0, 0, "Enables capturing of frames. 0=off, 1=on");
+    REGISTER_STRING("capture_folder", "CaptureOutput", 0, "Specifies sub folder to write captured frames.");
+    REGISTER_INT("capture_frame_once", 0, 0, "Makes capture single frame only");
+    REGISTER_STRING("capture_file_name", "", 0, "If set, specifies the path and name to use for the captured frame");
+    REGISTER_STRING("capture_file_prefix", "", 0, "If set, specifies the prefix to use for the captured frame instead of the default 'Frame'.");
+
+    m_gpu_particle_physics = REGISTER_INT("gpu_particle_physics", 0, VF_REQUIRE_APP_RESTART, "Enable GPU physics if available (0=off / 1=enabled).");
+    assert(m_gpu_particle_physics);
+
+    REGISTER_COMMAND("LoadConfig", &LoadConfigurationCmd, 0,
+        "Load .cfg file from disk (from the {Game}/Config directory)\n"
+        "e.g. LoadConfig lowspec.cfg\n"
+        "Usage: LoadConfig <filename>");
+    assert(m_env.pConsole);
+    m_env.pConsole->CreateKeyBind("alt_keyboard_key_function_F12", "Screenshot");
+    m_env.pConsole->CreateKeyBind("alt_keyboard_key_function_F11", "RecordClip");
+
+    /*
+        // experimental feature? - needs to be created very early
+        m_sys_filecache = REGISTER_INT("sys_FileCache",0,0,
+            "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);
+    REGISTER_STRING_CB("g_languageAudio", "", VF_NULL, "Will automatically match g_language setting unless specified otherwise", CSystem::OnLanguageAudioCVarChanged);
+
+#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,
+        "0 = Suppress Asserts\n"
+        "1 = Log Asserts\n"
+        "2 = Show Assert Dialog\n"
+        "3 = Crashes the Application on Assert\n"
+        "Note: when set to '0 = Suppress Asserts', assert expressions are still evaluated. To turn asserts into a no-op, undefine AZ_ENABLE_TRACING and recompile.",
+        OnAssertLevelCvarChanged);
+    CSystem::SetAssertLevel(defaultAssertValue);
+
+    REGISTER_CVAR2("sys_error_debugbreak", &g_cvars.sys_error_debugbreak, 0, VF_CHEAT, "__debugbreak() if a VALIDATOR_ERROR_DBGBREAK message is hit");
+
+    REGISTER_STRING("dlc_directory", "", 0, "Holds the path to the directory where DLC should be installed to and read from");
+
+#if defined(WIN32) || defined(WIN64)
+    REGISTER_INT("sys_screensaver_allowed", 0, VF_NULL, "Specifies if screen saver is allowed to start up while the game is running.");
+#endif
+
+    // 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_DEV_ONLY("DrillerStart", CmdDrillToFile, VF_DEV_ONLY, "Start a driller capture.");
+    REGISTER_COMMAND_DEV_ONLY("DrillerStop", CmdDrillToFile, VF_DEV_ONLY, "Stop a driller capture.");
+
+    REGISTER_COMMAND("sys_SetLogLevel", CmdSetAwsLogLevel, 0, "Set AWS log level [0 - 6].");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::CreateAudioVars()
+{
+    assert(gEnv);
+    assert(gEnv->pConsole);
+
+    m_sys_audio_disable = REGISTER_INT("sys_audio_disable", 0, VF_REQUIRE_APP_RESTART,
+            "Specifies whether to use the NULLAudioSystem in place of the regular AudioSystem\n"
+            "Usage: sys_audio_disable [0/1]\n"
+            "0: use regular AudioSystem.\n"
+            "1: use NullAudioSystem (disable all audio functionality).\n"
+            "Default: 0 (enable audio functionality)");
+}
+
+/////////////////////////////////////////////////////////////////////
+void CSystem::AddCVarGroupDirectory(const string& sPath)
+{
+    CryLog("creating CVarGroups from directory '%s' ...", sPath.c_str());
+    INDENT_LOG_DURING_SCOPE();
+
+    AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst(ConcatPath(sPath, "*.cfg").c_str());
+
+    if (!handle)
+    {
+        return;
+    }
+
+    do
+    {
+        if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
+        {
+            if (handle.m_filename != "." && handle.m_filename != "..")
+            {
+                AddCVarGroupDirectory(ConcatPath(sPath, handle.m_filename.data()));
+            }
+        }
+        else
+        {
+            string sFilePath = ConcatPath(sPath, handle.m_filename.data());
+
+            string sCVarName = sFilePath;
+            PathUtil::RemoveExtension(sCVarName);
+        }
+    } while (handle = gEnv->pCryPak->FindNext(handle));
+
+    gEnv->pCryPak->FindClose(handle);
+}
+
+bool CSystem::RegisterErrorObserver(IErrorObserver* errorObserver)
+{
+    return stl::push_back_unique(m_errorObservers, errorObserver);
+}
+
+bool CSystem::UnregisterErrorObserver(IErrorObserver* errorObserver)
+{
+    return stl::find_and_erase(m_errorObservers, errorObserver);
+}
+
+void CSystem::OnAssert(const char* condition, const char* message, const char* fileName, unsigned int fileLineNumber)
+{
+    if (g_cvars.sys_asserts == 0)
+    {
+        return;
+    }
+
+    std::vector<IErrorObserver*>::const_iterator end = m_errorObservers.end();
+    for (std::vector<IErrorObserver*>::const_iterator it = m_errorObservers.begin(); it != end; ++it)
+    {
+        (*it)->OnAssert(condition, message, fileName, fileLineNumber);
+    }
+    if (g_cvars.sys_asserts > 1)
+    {
+        CryFatalError("<assert> %s\r\n%s\r\n%s (%d)\r\n", condition, message, fileName, fileLineNumber);
+    }
+}
+
+void CSystem::OnFatalError(const char* message)
+{
+    std::vector<IErrorObserver*>::const_iterator end = m_errorObservers.end();
+    for (std::vector<IErrorObserver*>::const_iterator it = m_errorObservers.begin(); it != end; ++it)
+    {
+        (*it)->OnFatalError(message);
+    }
+}
+
+bool CSystem::IsAssertDialogVisible() const
+{
+    return m_bIsAsserting;
+}
+
+void CSystem::SetAssertVisible(bool bAssertVisble)
+{
+    m_bIsAsserting = bAssertVisble;
+}
diff --git a/Code/Legacy/CrySystem/SystemWin32.cpp b/Code/Legacy/CrySystem/SystemWin32.cpp
new file mode 100644
index 0000000000..7c33dd13f8
--- /dev/null
+++ b/Code/Legacy/CrySystem/SystemWin32.cpp
@@ -0,0 +1,653 @@
+/*
+ * 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 "System.h"
+#include <time.h>
+
+#include <IRenderer.h>
+#include <IMovieSystem.h>
+#include <ILog.h>
+#include <CryLibrary.h>
+#include <StringUtils.h>
+#include <AzCore/Debug/StackTracer.h>
+#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
+#include <AzCore/std/allocator_stack.h>
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#undef AZ_RESTRICTED_SECTION
+#define SYSTEMWIN32_CPP_SECTION_1 1
+#define SYSTEMWIN32_CPP_SECTION_2 2
+#define SYSTEMWIN32_CPP_SECTION_3 3
+#endif
+
+#if defined(LINUX) || defined(APPLE)
+#include <unistd.h>
+#endif
+
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
+#include <float.h>
+#include <shellapi.h> // Needed for ShellExecute.
+#include <Psapi.h>
+#include <Aclapi.h>
+
+#include <shlobj.h>
+#endif
+
+#include "IDebugCallStack.h"
+
+#if defined(APPLE) || defined(LINUX)
+#include <pwd.h>
+#endif
+
+#include "XConsole.h"
+#include "LocalizedStringManager.h"
+#include "XML/XmlUtils.h"
+
+#if defined(WIN32)
+__pragma(comment(lib, "wininet.lib"))
+__pragma(comment(lib, "Winmm.lib"))
+#endif
+
+#if defined(APPLE)
+#include <AzFramework/Utils/SystemUtilsApple.h>
+#endif
+
+// this is the list of modules that can be loaded into the game process
+// Each array element contains 2 strings: the name of the module (case-insensitive)
+// and the name of the group the module belongs to
+//////////////////////////////////////////////////////////////////////////
+const char g_szGroupCore[] = "CryEngine";
+const char* g_szModuleGroups[][2] = {
+    {"Editor.exe", g_szGroupCore},
+    {"CrySystem.dll", g_szGroupCore}
+};
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::SetAffinity()
+{
+    // the following code is only for Windows
+#ifdef WIN32
+    // set the process affinity
+    ICVar* pcvAffinityMask = GetIConsole()->GetCVar("sys_affinity");
+    if (!pcvAffinityMask)
+    {
+        pcvAffinityMask = REGISTER_INT("sys_affinity", 0, VF_NULL, "");
+    }
+
+    if (pcvAffinityMask)
+    {
+        unsigned nAffinity = pcvAffinityMask->GetIVal();
+        if (nAffinity)
+        {
+            typedef BOOL (WINAPI * FnSetProcessAffinityMask)(IN HANDLE hProcess, IN DWORD_PTR dwProcessAffinityMask);
+            HMODULE hKernel = CryLoadLibrary ("kernel32.dll");
+            if (hKernel)
+            {
+                FnSetProcessAffinityMask SetProcessAffinityMask = (FnSetProcessAffinityMask)GetProcAddress(hKernel, "SetProcessAffinityMask");
+                if (SetProcessAffinityMask && !SetProcessAffinityMask(GetCurrentProcess(), nAffinity))
+                {
+                    GetILog()->LogError("Error: Cannot set affinity mask %d, error code %d", nAffinity, GetLastError());
+                }
+                FreeLibrary (hKernel);
+            }
+        }
+    }
+#endif
+}
+
+#if defined(WIN32)
+#pragma pack(push,1)
+struct PEHeader_DLL
+{
+    DWORD signature;
+    IMAGE_FILE_HEADER _head;
+    IMAGE_OPTIONAL_HEADER opt_head;
+    IMAGE_SECTION_HEADER* section_header;  // actual number in NumberOfSections
+};
+#pragma pack(pop)
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+const char* CSystem::GetUserName()
+{
+#if defined(WIN32) || defined(WIN64)
+    static const int iNameBufferSize = 1024;
+    static char szNameBuffer[iNameBufferSize];
+    memset(szNameBuffer, 0, iNameBufferSize);
+
+    DWORD dwSize = iNameBufferSize;
+    wchar_t nameW[iNameBufferSize];
+    ::GetUserNameW(nameW, &dwSize);
+    cry_strcpy(szNameBuffer, CryStringUtils::WStrToUTF8(nameW));
+    return szNameBuffer;
+#else
+#if defined(LINUX)
+    static uid_t uid = geteuid ();
+    static struct passwd* pw = getpwuid (uid);
+    if (pw)
+    {
+        return  (pw->pw_name);
+    }
+    else
+    {
+        return NULL;
+    }
+#elif defined(APPLE)
+    static const int iNameBufferSize = 1024;
+    static char szNameBuffer[iNameBufferSize];
+    if(SystemUtilsApple::GetUserName(szNameBuffer, iNameBufferSize))
+    {
+        return szNameBuffer;
+    }
+    else
+    {
+        return "";
+    }
+#else
+    return "";
+#endif
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CSystem::GetApplicationInstance()
+{
+#ifdef WIN32
+    // tools that declare themselves as in "tool mode" may not access @user@ and may also not lock it
+    if (gEnv->IsInToolMode())
+    {
+        return 0;
+    }
+
+    // this code below essentially "locks" an instance of the USER folder to a specific running application
+    if (m_iApplicationInstance == -1)
+    {
+        string suffix;
+        for (int instance = 0;; ++instance)
+        {
+            suffix.Format("(%d)", instance);
+
+            CreateMutex(NULL, TRUE, "LumberyardApplication" + suffix);
+            // search for duplicates
+            if (GetLastError() != ERROR_ALREADY_EXISTS)
+            {
+                m_iApplicationInstance = instance;
+                break;
+            }
+        }
+    }
+
+    return m_iApplicationInstance;
+#else
+    return 0;
+#endif
+}
+
+int CSystem::GetApplicationLogInstance([[maybe_unused]] const char* logFilePath)
+{
+#if AZ_TRAIT_OS_USE_WINDOWS_MUTEX
+    string suffix;
+    int instance = 0;
+    for (;; ++instance)
+    {
+        suffix.Format("(%d)", instance);
+
+        CreateMutex(NULL, TRUE, logFilePath + suffix);
+        if (GetLastError() != ERROR_ALREADY_EXISTS)
+        {
+            break;
+        }
+    }
+    return instance;
+#else
+    return 0;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+struct CryDbgModule
+{
+    HANDLE heap;
+    WIN_HMODULE handle;
+    string name;
+    DWORD dwSize;
+};
+
+#ifdef WIN32
+//////////////////////////////////////////////////////////////////////////
+class CStringOrder
+{
+public:
+    bool operator () (const char* szLeft, const char* szRight) const {return azstricmp(szLeft, szRight) < 0; }
+};
+typedef std::map<const char*, unsigned, CStringOrder> StringToSizeMap;
+void AddSize (StringToSizeMap& mapSS, const char* szString, unsigned nSize)
+{
+    StringToSizeMap::iterator it = mapSS.find (szString);
+    if (it == mapSS.end())
+    {
+        mapSS.insert (StringToSizeMap::value_type(szString, nSize));
+    }
+    else
+    {
+        it->second += nSize;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* GetModuleGroup (const char* szString)
+{
+    for (unsigned i = 0; i < sizeof(g_szModuleGroups) / sizeof(g_szModuleGroups[0]); ++i)
+    {
+        if (azstricmp(szString, g_szModuleGroups[i][0]) == 0)
+        {
+            return g_szModuleGroups[i][1];
+        }
+    }
+    return "Other";
+}
+
+#endif
+
+// Make system error message string
+//////////////////////////////////////////////////////////////////////////
+//! \return pointer to the null terminated error string or 0
+static const char* GetLastSystemErrorMessage()
+{
+#ifdef WIN32
+    DWORD dwError = GetLastError();
+
+    static char szBuffer[512]; // function will return pointer to this buffer
+
+    if (dwError)
+    {
+        LPVOID lpMsgBuf = 0;
+
+        if (FormatMessage(
+                FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                FORMAT_MESSAGE_FROM_SYSTEM |
+                FORMAT_MESSAGE_IGNORE_INSERTS,
+                NULL,
+                GetLastError(),
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+                (LPTSTR) &lpMsgBuf,
+                0,
+                NULL))
+        {
+            cry_strcpy(szBuffer, (char*)lpMsgBuf);
+            LocalFree(lpMsgBuf);
+        }
+        else
+        {
+            return 0;
+        }
+
+        return szBuffer;
+    }
+#else
+    return 0;
+
+#endif //WIN32
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::FatalError(const char* format, ...)
+{
+    // Guard against reentrancy - out of memory fatal errors can become reentrant since logging can try to alloc.
+    static bool currentlyReportingError = false;
+    if (currentlyReportingError == true)
+    {
+        return;
+    }
+    currentlyReportingError = true;
+
+    // format message
+    va_list ArgList;
+    char szBuffer[MAX_WARNING_LENGTH];
+    const char* sPrefix = "";
+    azstrcpy(szBuffer, MAX_WARNING_LENGTH, sPrefix);
+    va_start(ArgList, format);
+    azvsnprintf(szBuffer + strlen(sPrefix), MAX_WARNING_LENGTH - strlen(sPrefix), format, ArgList);
+    va_end(ArgList);
+
+    // get system error message before any attempt to write into log
+    const char* szSysErrorMessage = GetLastSystemErrorMessage();
+
+    CryLogAlways("=============================================================================");
+    CryLogAlways("*ERROR");
+    CryLogAlways("=============================================================================");
+    // write both messages into log
+    CryLogAlways("%s", szBuffer);
+
+    if (szSysErrorMessage)
+    {
+        CryLogAlways("Last System Error: %s", szSysErrorMessage);
+    }
+
+    if (GetUserCallback())
+    {
+        GetUserCallback()->OnError(szBuffer);
+    }
+
+    assert(szBuffer[0] >= ' ');
+    //  strcpy(szBuffer,szBuffer+1);    // remove verbosity tag since it is not supported by ::MessageBox
+
+    OutputDebugString(szBuffer);
+#ifdef WIN32
+    OnFatalError(szBuffer);
+    if (!g_cvars.sys_no_crash_dialog)
+    {
+        ::MessageBox(NULL, szBuffer, "Open 3D Engine Error", MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
+    }
+
+    // Dump callstack.
+    IDebugCallStack::instance()->FatalError(szBuffer);
+#endif
+
+    CryDebugBreak();
+
+    // app can not continue
+#ifdef _DEBUG
+
+#if defined(WIN32) && !defined(WIN64)
+    DEBUG_BREAK;
+#endif
+
+#else
+
+#if defined(WIN32) || defined(WIN64)
+    _flushall();
+    // on windows, _exit does all sorts of things which can cause cleanup to fail during a crash, we need to terminate instead.
+    TerminateProcess(GetCurrentProcess(), 1);
+#endif
+
+#if defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMWIN32_CPP_SECTION_2
+#include AZ_RESTRICTED_FILE(SystemWin32_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    _exit(1);
+#endif
+#endif
+}
+
+void CSystem::ReportBug([[maybe_unused]] const char* format, ...)
+{
+#if defined (WIN32)
+    va_list ArgList;
+    char szBuffer[MAX_WARNING_LENGTH];
+    const char* sPrefix = "";
+    azstrcpy(szBuffer, MAX_WARNING_LENGTH, sPrefix);
+    va_start(ArgList, format);
+    azvsnprintf(szBuffer + strlen(sPrefix), MAX_WARNING_LENGTH - strlen(sPrefix), format, ArgList);
+    va_end(ArgList);
+
+    IDebugCallStack::instance()->ReportBug(szBuffer);
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::debug_GetCallStack(const char** pFunctions, int& nCount)
+{
+#if defined(WIN32)
+    using namespace AZ::Debug;
+
+    int nMaxCount = nCount;
+    StackFrame* frames = (StackFrame*)AZ_ALLOCA(sizeof(StackFrame)*nMaxCount);
+    unsigned int numFrames = StackRecorder::Record(frames, nMaxCount, 1);
+    SymbolStorage::StackLine* textLines = (SymbolStorage::StackLine*)AZ_ALLOCA(sizeof(SymbolStorage::StackLine)*nMaxCount);
+    SymbolStorage::DecodeFrames(frames, numFrames, textLines);
+    for (int i = 0; i < numFrames; i++)
+    {
+        pFunctions[i] = textLines[i];
+    }
+    nCount = numFrames;
+#define AZ_RESTRICTED_SECTION_IMPLEMENTED
+#elif defined(AZ_RESTRICTED_PLATFORM)
+#define AZ_RESTRICTED_SECTION SYSTEMWIN32_CPP_SECTION_3
+#include AZ_RESTRICTED_FILE(SystemWin32_cpp)
+#endif
+#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
+#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
+#else
+    AZ_UNUSED(pFunctions);
+    nCount = 0;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::debug_LogCallStack(int nMaxFuncs, [[maybe_unused]] int nFlags)
+{
+    if (nMaxFuncs > 32)
+    {
+        nMaxFuncs = 32;
+    }
+    // Print call stack for each find.
+    const char* funcs[32];
+    int nCount = nMaxFuncs;
+    GetISystem()->debug_GetCallStack(funcs, nCount);
+    for (int i = 1; i < nCount; i++) // start from 1 to skip this function.
+    {
+        CryLogAlways("    %02d) %s", i, funcs[i]);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// 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
+    char szExpandedPath[AZ_MAX_PATH_LEN];
+    if (!ExpandEnvironmentStrings("%SystemRoot%\\ehome\\ehshell.exe", szExpandedPath, AZ_MAX_PATH_LEN))
+    {
+        return false;
+    }
+
+    // Skip if ehshell.exe doesn't exist
+    if (GetFileAttributes(szExpandedPath) == 0xFFFFFFFF)
+    {
+        return false;
+    }
+
+    // Launch ehshell.exe
+    INT_PTR result = (INT_PTR)ShellExecute(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)
+{
+    bool bSucceeded  = false;
+    // check Vista and later OS first
+
+    HMODULE shell32 = LoadLibraryA("Shell32.dll");
+    if (shell32)
+    {
+        typedef long (__stdcall * T_SHGetKnownFolderPath)(REFKNOWNFOLDERID rfid, unsigned long dwFlags, void* hToken, wchar_t** ppszPath);
+        T_SHGetKnownFolderPath SHGetKnownFolderPath = (T_SHGetKnownFolderPath)GetProcAddress(shell32, "SHGetKnownFolderPath");
+        if (SHGetKnownFolderPath)
+        {
+            // We must be running Vista or newer
+            wchar_t* wMyDocumentsPath;
+            HRESULT hr = SHGetKnownFolderPath(FOLDERID_SavedGames, KF_FLAG_CREATE | KF_FLAG_DONT_UNEXPAND, NULL, &wMyDocumentsPath);
+            bSucceeded = SUCCEEDED(hr);
+            if (bSucceeded)
+            {
+                // Convert from UNICODE to UTF-8
+                cry_strcpy(szMyDocumentsPath, maxPathSize, CryStringUtils::WStrToUTF8(wMyDocumentsPath));
+                CoTaskMemFree(wMyDocumentsPath);
+            }
+        }
+        FreeLibrary(shell32);
+    }
+
+    if (!bSucceeded)
+    {
+        // check pre-vista OS if not succeeded before
+        wchar_t wMyDocumentsPath[AZ_MAX_PATH_LEN];
+        bSucceeded = SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, NULL, 0, wMyDocumentsPath));
+        if (bSucceeded)
+        {
+            cry_strcpy(szMyDocumentsPath, maxPathSize, CryStringUtils::WStrToUTF8(wMyDocumentsPath));
+        }
+    }
+
+    return bSucceeded;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+void CSystem::DetectGameFolderAccessRights()
+{
+    // This code is trying to figure out if the current folder we are now running under have write access.
+    // By default assume folder is not writable.
+    // If folder is writable game.log is saved there, otherwise it is saved in user documents folder.
+
+#if defined(WIN32)
+
+    DWORD DesiredAccess = FILE_GENERIC_WRITE;
+    DWORD GrantedAccess = 0;
+    DWORD dwRes = 0;
+    PACL pDACL = NULL;
+    PSECURITY_DESCRIPTOR pSD = NULL;
+    HANDLE hClientToken = 0;
+    PRIVILEGE_SET PrivilegeSet;
+    DWORD PrivilegeSetLength = sizeof(PrivilegeSet);
+    BOOL bAccessStatus = FALSE;
+
+    // Get a pointer to the existing DACL.
+    dwRes = GetNamedSecurityInfo(".", SE_FILE_OBJECT,
+            DACL_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION,
+            NULL, NULL, &pDACL, NULL, &pSD);
+
+    if (ERROR_SUCCESS != dwRes)
+    {
+        //
+        assert(0);
+    }
+
+    if (!ImpersonateSelf(SecurityIdentification))
+    {
+        return;
+    }
+    if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &hClientToken) && hClientToken != 0)
+    {
+        return;
+    }
+
+    GENERIC_MAPPING GenMap;
+    GenMap.GenericRead = FILE_GENERIC_READ;
+    GenMap.GenericWrite = FILE_GENERIC_WRITE;
+    GenMap.GenericExecute = FILE_GENERIC_EXECUTE;
+    GenMap.GenericAll = FILE_ALL_ACCESS;
+
+    MapGenericMask(&DesiredAccess, &GenMap);
+    if (!AccessCheck(pSD, hClientToken, DesiredAccess, &GenMap, &PrivilegeSet, &PrivilegeSetLength, &GrantedAccess, &bAccessStatus))
+    {
+        RevertToSelf();
+        CloseHandle(hClientToken);
+        return;
+    }
+    CloseHandle(hClientToken);
+    RevertToSelf();
+
+    if (bAccessStatus)
+    {
+        m_bGameFolderWritable = true;
+    }
+#elif defined(MOBILE)
+    char cwd[AZ_MAX_PATH_LEN];
+
+    if (getcwd(cwd, AZ_MAX_PATH_LEN) != NULL)
+    {
+        if (0 == access(cwd, W_OK))
+        {
+            m_bGameFolderWritable = true;
+        }
+    }
+#endif //WIN32
+}
+
+/////////////////////////////////`/////////////////////////////////////////
+void CSystem::EnableFloatExceptions([[maybe_unused]] int type)
+{
+#ifndef _RELEASE
+
+#if defined(WIN32)
+
+#if defined(WIN32) && !defined(WIN64)
+
+    // Optimization
+    // Enable DAZ/FZ
+    // Denormals Are Zeros
+    // Flush-to-Zero
+
+    _controlfp(_DN_FLUSH, _MCW_DN);
+
+#endif //#if defined(WIN32) && !defined(WIN64)
+
+AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
+    _controlfp(_DN_FLUSH, _MCW_DN);
+
+    if (type == 0)
+    {
+        // mask all floating exceptions off.
+        _controlfp(_EM_INEXACT | _EM_UNDERFLOW | _EM_OVERFLOW | _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE, _MCW_EM);
+    }
+    else
+    {
+        // Clear pending exceptions
+        _fpreset();
+
+        if (type == 1)
+        {
+            // enable just the most important fp-exceptions.
+            _controlfp(_EM_INEXACT | _EM_UNDERFLOW | _EM_OVERFLOW, _MCW_EM); // Enable floating point exceptions.
+        }
+
+        if (type == 2)
+        {
+            // enable ALL floating point exceptions.
+            _controlfp(_EM_INEXACT, _MCW_EM);
+        }
+    }
+AZ_POP_DISABLE_WARNING
+
+#endif //#if defined(WIN32) && !defined(WIN64)
+
+#ifdef WIN32
+    _mm_setcsr(_mm_getcsr() & ~0x280 | (type > 0 ? 0 : 0x280));
+#endif
+
+    #endif //_RELEASE
+}
diff --git a/Code/Legacy/CrySystem/Timer.cpp b/Code/Legacy/CrySystem/Timer.cpp
new file mode 100644
index 0000000000..3d8585a6ea
--- /dev/null
+++ b/Code/Legacy/CrySystem/Timer.cpp
@@ -0,0 +1,724 @@
+/*
+ * 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)
+        {
+            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)
+{
+    const int64 previousOffset = m_lOffsetTime;
+    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
new file mode 100644
index 0000000000..9441aa8740
--- /dev/null
+++ b/Code/Legacy/CrySystem/Timer.h
@@ -0,0 +1,165 @@
+/*
+ * 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() {};
+
+    bool Init();
+
+    // interface ITimer ----------------------------------------------------------
+
+    // TODO: Review m_time usage in System.cpp
+    //       if it wants Game Time / UI Time or a new Render Time?
+
+    virtual void ResetTimer();
+    virtual void UpdateOnFrameStart();
+    virtual float GetCurrTime(ETimer which = ETIMER_GAME) const;
+    virtual CTimeValue GetAsyncTime() const;
+    virtual float GetAsyncCurTime(); // retrieve the actual wall clock time passed since the game started, in seconds
+    virtual float GetFrameTime(ETimer which = ETIMER_GAME) const;
+    virtual float GetRealFrameTime() const;
+    virtual float GetTimeScale() const;
+    virtual float GetTimeScale(uint32 channel) const;
+    virtual void SetTimeScale(float scale, uint32 channel = 0);
+    virtual void ClearTimeScales();
+    virtual void EnableTimer(bool bEnable);
+    virtual float GetFrameRate();
+    virtual float GetProfileFrameBlending(float* pfBlendTime = 0, int* piBlendMode = 0);
+    virtual void Serialize(TSerialize ser);
+    virtual bool IsTimerEnabled() const;
+
+    //! try to pause/unpause a timer
+    //  returns true if successfully paused/unpaused, false otherwise
+    virtual bool PauseTimer(ETimer which, bool bPause);
+
+    //! determine if a timer is paused
+    //  returns true if paused, false otherwise
+    virtual bool IsTimerPaused(ETimer which);
+
+    //! try to set a timer
+    //  return true if successful, false otherwise
+    virtual bool SetTimer(ETimer which, float timeInSeconds);
+
+    //! make a tm struct from a time_t in UTC (like gmtime)
+    virtual void SecondsToDateUTC(time_t time, struct tm& outDateUTC);
+
+    //! make a UTC time from a tm (like timegm, but not available on all platforms)
+    virtual time_t DateToSecondsUTC(struct tm& timePtr);
+
+    //! Convert from Tics to Seconds
+    virtual float TicksToSeconds(int64 ticks)
+    {
+        return float((double)ticks * m_fSecsPerTick);
+    }
+
+    //! Get number of ticks per second
+    virtual int64 GetTicksPerSecond()
+    {
+        return m_lTicksPerSec;
+    }
+
+    virtual const CTimeValue& GetFrameStartTime(ETimer which = ETIMER_GAME) const { return m_CurrTime[(int)which]; }
+    virtual ITimer* CreateNewTimer();
+
+    virtual 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
new file mode 100644
index 0000000000..59149b1b39
--- /dev/null
+++ b/Code/Legacy/CrySystem/ViewSystem/DebugCamera.cpp
@@ -0,0 +1,345 @@
+/*
+ * 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 = gEnv->pSystem->GetViewCamera().GetPosition();
+    m_moveInput = Vec3_Zero;
+
+    Ang3 cameraAngles = Ang3(gEnv->pSystem->GetViewCamera().GetMatrix());
+    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);
+
+    // update the listener of the active view
+    if (IView* view = gEnv->pSystem->GetIViewSystem()->GetActiveView())
+    {
+        view->UpdateAudioListener(Matrix34(m_view, m_position));
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void DebugCamera::PostUpdate()
+{
+    if (m_cameraMode == DebugCamera::ModeOff)
+    {
+        return;
+    }
+
+    CCamera& camera = gEnv->pSystem->GetViewCamera();
+    camera.SetMatrix(Matrix34(m_view, m_position));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+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
new file mode 100644
index 0000000000..083c96cee1
--- /dev/null
+++ b/Code/Legacy/CrySystem/ViewSystem/DebugCamera.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 <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
new file mode 100644
index 0000000000..1d7d1d1502
--- /dev/null
+++ b/Code/Legacy/CrySystem/ViewSystem/View.cpp
@@ -0,0 +1,635 @@
+/*
+ * 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 <IStereoRenderer.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(float frameTime, bool isActive)
+{
+    //FIXME:some cameras may need to be updated always
+    if (!isActive)
+    {
+        return;
+    }
+
+    if (m_azEntity)
+    {
+        m_viewParams.SaveLast();
+
+        CCamera* pSysCam = &m_pSystem->GetViewCamera();
+
+        //process screen shaking
+        ProcessShaking(frameTime);
+
+        //FIXME:to let the updateView implementation use the correct shakeVector
+        m_viewParams.currentShakeShift = m_viewParams.rotation * m_viewParams.currentShakeShift;
+
+        m_viewParams.frameTime = frameTime;
+        //update view position/rotation
+        if (m_azEntity != nullptr)
+        {
+            auto entityTransform = m_azEntity->GetTransform();
+            if (entityTransform != nullptr)
+            {
+                AZ::Transform transform = entityTransform->GetWorldTM();
+                m_viewParams.position = AZVec3ToLYVec3(transform.GetTranslation());
+                m_viewParams.rotation = AZQuaternionToLYQuaternion(transform.GetRotation());
+            }
+        }
+
+        ApplyFrameAdditiveAngles(m_viewParams.rotation);
+
+        const float fNearZ = gEnv->pSystem->GetIViewSystem()->GetDefaultZNear();
+
+        //see if the view have to use a custom near clipping plane
+        const float nearPlane = (m_viewParams.nearplane >= CAMERA_MIN_NEAR) ? (m_viewParams.nearplane) : fNearZ;
+        const float farPlane = (m_viewParams.farplane > 0.f) ? m_viewParams.farplane : DEFAULT_FAR;
+        float fov = (m_viewParams.fov < 0.001f) ? DEFAULT_FOV : m_viewParams.fov;
+
+        m_camera.SetFrustum(pSysCam->GetViewSurfaceX(), pSysCam->GetViewSurfaceZ(), fov, nearPlane, farPlane, pSysCam->GetPixelAspectRatio());
+
+        //apply shake & set the view matrix
+        m_viewParams.rotation *= m_viewParams.currentShakeQuat;
+        m_viewParams.rotation.NormalizeSafe();
+        m_viewParams.position += m_viewParams.currentShakeShift;
+
+        // Blending between cameras needs to happen after Camera space rendering calculations have been applied
+        // so that the m_viewParams.position is in World Space again
+        m_viewParams.UpdateBlending(frameTime);
+
+        // [VR] specific
+        // Add HMD's pose tracking on top of current camera pose
+        // Each game-title can decide whether to keep this functionality here or (most likely)
+        // move it somewhere else.
+
+        Quat q = m_viewParams.rotation;
+        Vec3 pos = m_viewParams.position;
+        Vec3 p = Vec3(ZERO);
+
+        Matrix34 viewMtx(q);
+        viewMtx.SetTranslation(pos + p);
+        m_camera.SetMatrix(viewMtx);
+
+        m_camera.SetEntityRotation(m_viewParams.rotation);
+        m_camera.SetEntityPos(pos);
+    }
+    else
+    {
+        m_linkedTo = AZ::EntityId(0);
+    }
+}
+
+//-----------------------------------------------------------------------
+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(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(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 = 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::GetMemoryUsage(ICrySizer* s) const
+{
+    s->AddObject(this, sizeof(*this));
+    s->AddObject(m_shakes);
+}
+
+void CView::Serialize(TSerialize ser)
+{
+    if (ser.IsReading())
+    {
+        ResetShaking();
+    }
+}
+
+void CView::PostSerialize()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CView::UpdateAudioListener([[maybe_unused]] Matrix34 const& rMatrix)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+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
new file mode 100644
index 0000000000..070d1dd0c6
--- /dev/null
+++ b/Code/Legacy/CrySystem/ViewSystem/View.h
@@ -0,0 +1,156 @@
+/*
+ * 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;
+
+namespace LegacyViewSystem
+{
+
+class CView
+    : public IView
+{
+public:
+
+    CView(ISystem* pSystem);
+    virtual ~CView();
+
+    //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;
+        }
+
+        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
+    };
+
+
+    // IView
+    virtual void Release();
+    virtual void Update(float frameTime, bool isActive);
+    virtual void ProcessShaking(float frameTime);
+    virtual void ProcessShake(SShake* pShake, float frameTime);
+    virtual void ResetShaking();
+    virtual void ResetBlending() { m_viewParams.ResetBlending(); }
+    virtual void LinkTo(AZ::Entity* follow);
+    virtual void Unlink();
+    virtual AZ::EntityId GetLinkedId() {return m_linkedTo; };
+    virtual void SetCurrentParams(SViewParams& params) { m_viewParams = params; };
+    virtual const SViewParams* GetCurrentParams() {return &m_viewParams; }
+    virtual void SetViewShake(Ang3 shakeAngle, Vec3 shakeShift, float duration, float frequency, float randomness, int shakeID, bool bFlipVec = true, bool bUpdateOnly = false, bool bGroundOnly = false);
+    virtual void SetViewShakeEx(const SShakeParams& params);
+    virtual void StopShake(int shakeID);
+    virtual void SetFrameAdditiveCameraAngles(const Ang3& addFrameAngles);
+    virtual void SetScale(const float scale);
+    virtual void SetZoomedScale(const float scale);
+    virtual void SetActive(const bool bActive);
+    // ~IView
+
+    void Serialize(TSerialize ser) override;
+    void PostSerialize() override;
+    CCamera& GetCamera() override { return m_camera; }
+    const CCamera& GetCamera() const override { return m_camera; }
+    void UpdateAudioListener(const Matrix34& rMatrix) override;
+
+    void GetMemoryUsage(ICrySizer* s) const;
+
+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
new file mode 100644
index 0000000000..7896d63715
--- /dev/null
+++ b/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
@@ -0,0 +1,684 @@
+/*
+ * 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*);                                            \
+            PREFAST_SUPPRESS_WARNING(6255) 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) && !defined(DEDICATED_SERVER)
+    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);
+    }
+}
+
+//------------------------------------------------------------------------
+void CViewSystem::Update(float frameTime)
+{
+    FUNCTION_PROFILER(GetISystem(), PROFILE_ACTION);
+
+    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 (!s_debugCamera || !s_debugCamera->IsEnabled())
+            {
+                pView->UpdateAudioListener(rCamera.GetMatrix());
+            }
+
+            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);
+                }
+            }
+
+            m_pSystem->SetViewCamera(rCamera);
+        }
+    }
+
+    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 = ~0;
+    }
+
+    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::UpdateSoundListeners()
+{
+    assert(gEnv->IsEditor() && !gEnv->IsEditorGameMode());
+
+    // In Editor we may want to control global listeners outside of the game view.
+    if (m_bControlsAudioListeners)
+    {
+        IView* const pActiveView = static_cast<IView*>(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);
+            CCamera const& rCamera = bIsActive ? gEnv->pSystem->GetViewCamera() : pView->GetCamera();
+            pView->UpdateAudioListener(rCamera.GetMatrix());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////
+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::GetMemoryUsage(ICrySizer* s) const
+{
+    SIZER_SUBCOMPONENT_NAME(s, "ViewSystem");
+    s->Add(*this);
+    s->AddContainer(m_views);
+}
+
+void CViewSystem::Serialize(TSerialize ser)
+{
+    TViewMap::iterator iter = m_views.begin();
+    TViewMap::iterator iterEnd = m_views.end();
+    while (iter != iterEnd)
+    {
+        iter->second->Serialize(ser);
+        ++iter;
+    }
+}
+
+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
new file mode 100644
index 0000000000..89d0117d9d
--- /dev/null
+++ b/Code/Legacy/CrySystem/ViewSystem/ViewSystem.h
@@ -0,0 +1,155 @@
+/*
+ * 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:
+
+    typedef std::map<unsigned int, IView*> TViewMap;
+    typedef std::vector<unsigned int> TViewIdVector;
+
+public:
+
+    //IViewSystem
+    virtual IView* CreateView();
+    virtual unsigned int AddView(IView* pView) override;
+    virtual void RemoveView(IView* pView);
+    virtual void RemoveView(unsigned int viewId);
+
+    virtual void SetActiveView(IView* pView);
+    virtual void SetActiveView(unsigned int viewId);
+
+    //CameraSystemRequestBus
+    AZ::EntityId GetActiveCamera() override { return m_activeViewId ? GetActiveView()->GetLinkedId() : AZ::EntityId(); }
+
+    //utility functions
+    virtual IView* GetView(unsigned int viewId);
+    virtual IView* GetActiveView();
+
+    virtual unsigned int GetViewId(IView* pView);
+    virtual unsigned int GetActiveViewId();
+
+    virtual void Serialize(TSerialize ser);
+    virtual void PostSerialize();
+
+    virtual IView* GetViewByEntityId(const AZ::EntityId& id, bool forceCreate);
+
+    virtual float GetDefaultZNear() { return m_fDefaultCameraNearZ; };
+    virtual void SetBlendParams(float fBlendPosSpeed, float fBlendRotSpeed, bool performBlendOut) { m_fBlendInPosSpeed = fBlendPosSpeed; m_fBlendInRotSpeed = fBlendRotSpeed; m_bPerformBlendOut = performBlendOut; };
+    virtual void SetOverrideCameraRotation(bool bOverride, Quat rotation);
+    virtual bool IsPlayingCutScene() const
+    {
+        return m_cutsceneCount > 0;
+    }
+    virtual void UpdateSoundListeners();
+
+    virtual void SetDeferredViewSystemUpdate(bool const bDeferred){ m_useDeferredViewSystemUpdate = bDeferred; }
+    virtual bool UseDeferredViewSystemUpdate() const { return m_useDeferredViewSystemUpdate; }
+    virtual void SetControlAudioListeners(bool const bActive);
+    //~IViewSystem
+
+    //IMovieUser
+    virtual void SetActiveCamera(const SCameraParams& Params);
+    virtual void BeginCutScene(IAnimSequence* pSeq, unsigned long dwFlags, bool bResetFX);
+    virtual void EndCutScene(IAnimSequence* pSeq, unsigned long dwFlags);
+    virtual void SendGlobalEvent(const char* pszEvent);
+    //~IMovieUser
+
+    // ILevelSystemListener
+    virtual void OnLevelNotFound([[maybe_unused]] const char* levelName) {};
+    virtual void OnLoadingStart([[maybe_unused]] const char* levelName);
+    virtual void OnLoadingComplete([[maybe_unused]] const char* levelName){};
+    virtual void OnLoadingError([[maybe_unused]] const char* levelName, [[maybe_unused]] const char* error){};
+    virtual void OnLoadingProgress([[maybe_unused]] const char* levelName, [[maybe_unused]] int progressAmount){};
+    virtual void OnUnloadComplete([[maybe_unused]] const char* levelName);
+    //~ILevelSystemListener
+
+    CViewSystem(ISystem* pSystem);
+    ~CViewSystem();
+
+    void Release() override { delete this; };
+    void Update(float frameTime) override;
+
+    virtual void ForceUpdate(float elapsed) { Update(elapsed); }
+
+    //void RegisterViewClass(const char *name, IView *(*func)());
+
+    bool AddListener(IViewSystemListener* pListener)
+    {
+        return stl::push_back_unique(m_listeners, pListener);
+    }
+
+    bool RemoveListener(IViewSystemListener* pListener)
+    {
+        return stl::find_and_erase(m_listeners, pListener);
+    }
+
+    void GetMemoryUsage(ICrySizer* s) const;
+
+    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/WindowsErrorReporting.cpp b/Code/Legacy/CrySystem/WindowsErrorReporting.cpp
new file mode 100644
index 0000000000..b0fdeebfa4
--- /dev/null
+++ b/Code/Legacy/CrySystem/WindowsErrorReporting.cpp
@@ -0,0 +1,132 @@
+/*
+ * 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 : Support for Windows Error Reporting (WER)
+
+
+#include "CrySystem_precompiled.h"
+
+#ifdef WIN32
+
+#include "System.h"
+#include <windows.h>
+#include <tchar.h>
+#include "errorrep.h"
+#include "ISystem.h"
+
+#include <DbgHelp.h>
+
+static WCHAR szPath[MAX_PATH + 1];
+static WCHAR szFR[] = L"\\System32\\FaultRep.dll";
+
+WCHAR* GetFullPathToFaultrepDll(void)
+{
+    UINT rc = GetSystemWindowsDirectoryW(szPath, ARRAYSIZE(szPath));
+    if (rc == 0 || rc > ARRAYSIZE(szPath) - ARRAYSIZE(szFR) - 1)
+    {
+        return NULL;
+    }
+
+    wcscat_s(szPath, szFR);
+    return szPath;
+}
+
+
+typedef BOOL (WINAPI * MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType,
+    CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+    CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+    CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam
+    );
+
+//////////////////////////////////////////////////////////////////////////
+LONG WINAPI CryEngineExceptionFilterMiniDump(struct _EXCEPTION_POINTERS* pExceptionPointers, const char* szDumpPath, MINIDUMP_TYPE DumpType)
+{
+    // note:  In debug mode, this dll is loaded on startup anyway, so this should not incur an additional load unless it crashes
+    // very early during startup.
+
+    fflush(nullptr); // according to MSDN on fflush, calling fflush on null flushes all buffers.
+    HMODULE hndDBGHelpDLL = LoadLibraryA("DBGHELP.DLL");
+
+    if (!hndDBGHelpDLL)
+    {
+        CryLogAlways("Failed to record DMP file: Could not open DBGHELP.DLL");
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    MINIDUMPWRITEDUMP dumpFnPtr = (MINIDUMPWRITEDUMP)::GetProcAddress(hndDBGHelpDLL, "MiniDumpWriteDump");
+    if (!dumpFnPtr)
+    {
+        CryLogAlways("Failed to record DMP file: Unable to find MiniDumpWriteDump in DBGHELP.DLL");
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    HANDLE hFile = ::CreateFile(szDumpPath, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        CryLogAlways("Failed to record DMP file: could not open file '%s' for writing - error code: %d", szDumpPath, GetLastError());
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    _MINIDUMP_EXCEPTION_INFORMATION ExInfo;
+    ExInfo.ThreadId = ::GetCurrentThreadId();
+    ExInfo.ExceptionPointers = pExceptionPointers;
+    ExInfo.ClientPointers = NULL;
+
+    BOOL bOK = dumpFnPtr(GetCurrentProcess(), GetCurrentProcessId(), hFile, DumpType, &ExInfo, NULL, NULL);
+    ::CloseHandle(hFile);
+
+    if (bOK)
+    {
+        CryLogAlways("Successfully recorded DMP file:  '%s'", szDumpPath);
+        return EXCEPTION_EXECUTE_HANDLER; // SUCCESS!  you can execute your handlers now
+    }
+    else
+    {
+        CryLogAlways("Failed to record DMP file: '%s' - error code: %d", szDumpPath, GetLastError());
+    }
+
+    return EXCEPTION_CONTINUE_SEARCH;
+}
+
+//////////////////////////////////////////////////////////////////////////
+LONG WINAPI CryEngineExceptionFilterWER(struct _EXCEPTION_POINTERS* pExceptionPointers)
+{
+    if (g_cvars.sys_WER > 1)
+    {
+        char szScratch [_MAX_PATH];
+        const char* szDumpPath = gEnv->pCryPak->AdjustFileName("@log@/CE2Dump.dmp", szScratch, AZ_ARRAY_SIZE(szScratch), 0);
+
+        MINIDUMP_TYPE mdumpValue = (MINIDUMP_TYPE)(MiniDumpNormal);
+        if (g_cvars.sys_WER > 1)
+        {
+            mdumpValue = (MINIDUMP_TYPE)(g_cvars.sys_WER - 2);
+        }
+
+        return CryEngineExceptionFilterMiniDump(pExceptionPointers, szDumpPath, mdumpValue);
+    }
+
+    LONG lRet = EXCEPTION_CONTINUE_SEARCH;
+    WCHAR* psz = GetFullPathToFaultrepDll();
+    if (psz)
+    {
+        HMODULE hFaultRepDll = LoadLibraryW(psz);
+        if (hFaultRepDll)
+        {
+            pfn_REPORTFAULT pfn = (pfn_REPORTFAULT)GetProcAddress(hFaultRepDll, "ReportFault");
+            if (pfn)
+            {
+                pfn(pExceptionPointers, 0);
+                lRet = EXCEPTION_EXECUTE_HANDLER;
+            }
+            FreeLibrary(hFaultRepDll);
+        }
+    }
+    return lRet;
+}
+
+#endif // WIN32
diff --git a/Code/Legacy/CrySystem/XConsole.cpp b/Code/Legacy/CrySystem/XConsole.cpp
new file mode 100644
index 0000000000..9f75eea429
--- /dev/null
+++ b/Code/Legacy/CrySystem/XConsole.cpp
@@ -0,0 +1,3627 @@
+/*
+ * 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 : implementation of the CXConsole class.
+
+
+#include "CrySystem_precompiled.h"
+#include "XConsole.h"
+#include "XConsoleVariable.h"
+#include "System.h"
+#include "ConsoleBatchFile.h"
+#include "StringUtils.h"
+#include "UnicodeFunctions.h"
+#include "UnicodeIterator.h"
+
+#include <ITimer.h>
+#include <IRenderer.h>
+#include <ISystem.h>
+#include <ILog.h>
+#include <IProcess.h>
+#include <IRenderAuxGeom.h>
+#include "ConsoleHelpGen.h"         // CConsoleHelpGen
+
+#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
+#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzCore/std/algorithm.h>
+
+#include <LyShine/Bus/UiCursorBus.h>
+//#define DEFENCE_CVAR_HASH_LOGGING
+
+static inline void AssertName([[maybe_unused]] const char* szName)
+{
+#ifdef _DEBUG
+    assert(szName);
+
+    // test for good console variable / command name
+    const char* p = szName;
+    bool bFirstChar = true;
+
+    while (*p)
+    {
+        assert((*p >= 'a' && *p <= 'z')
+            || (*p >= 'A' && *p <= 'Z')
+            || (*p >= '0' && *p <= '9' && !bFirstChar)
+            || *p == '_'
+            || *p == '.');
+
+        ++p;
+        bFirstChar = false;
+    }
+#endif
+}
+
+void ResetCVars(IConsoleCmdArgs*)
+{
+    if (gEnv->pSystem)
+    {
+        CXConsole* pConsole = static_cast<CXConsole*>(gEnv->pSystem->GetIConsole());
+        if (pConsole)
+        {
+            pConsole->ResetCVarsToDefaults();
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// user defined comparison - for nicer printout
+inline int GetCharPrio(char x)
+{
+    if (x >= 'a' && x <= 'z')
+    {
+        x += 'A' - 'a';                 // make upper case
+    }
+    if (x == '_')
+    {
+        return 300;
+    }
+    else
+    {
+        return x;
+    }
+}
+// case sensitive
+inline bool less_CVar(const char* left, const char* right)
+{
+    for (;; )
+    {
+        uint32 l = GetCharPrio(*left), r = GetCharPrio(*right);
+
+        if (l < r)
+        {
+            return true;
+        }
+        if (l > r)
+        {
+            return false;
+        }
+
+        if (*left == 0 || *right == 0)
+        {
+            break;
+        }
+
+        ++left;
+        ++right;
+    }
+
+    return false;
+}
+
+void Command_SetWaitSeconds(IConsoleCmdArgs* pCmd)
+{
+    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
+
+    if (pCmd->GetArgCount() > 1)
+    {
+        pConsole->m_waitSeconds.SetSeconds(atof(pCmd->GetArg(1)));
+        pConsole->m_waitSeconds += gEnv->pTimer->GetFrameStartTime();
+    }
+}
+
+void Command_SetWaitFrames(IConsoleCmdArgs* pCmd)
+{
+    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
+
+    if (pCmd->GetArgCount() > 1)
+    {
+        pConsole->m_waitFrames = max(0, atoi(pCmd->GetArg(1)));
+    }
+}
+
+void ConsoleShow(IConsoleCmdArgs*)
+{
+    gEnv->pConsole->ShowConsole(true);
+}
+void ConsoleHide(IConsoleCmdArgs*)
+{
+    gEnv->pConsole->ShowConsole(false);
+}
+
+void Bind(IConsoleCmdArgs* cmdArgs)
+{
+    if (cmdArgs->GetArgCount() >= 3)
+    {
+        string arg;
+        for (int i = 2; i < cmdArgs->GetArgCount(); ++i)
+        {
+            arg += cmdArgs->GetArg(i);
+            arg += " ";
+        }
+        gEnv->pConsole->CreateKeyBind(cmdArgs->GetArg(1), arg.c_str());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CXConsole::con_display_last_messages = 0;
+int CXConsole::con_line_buffer_size = 500;
+int CXConsole::con_showonload = 0;
+int CXConsole::con_debug = 0;
+int CXConsole::con_restricted = 0;
+
+namespace
+{
+    const AzFramework::InputChannelId s_nullRepeatEventId("xconsole_null_repeat_event_id");
+}
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+CXConsole::CXConsole()
+    : AzFramework::InputChannelEventListener(AzFramework::InputChannelEventListener::GetPriorityDebug())
+    , AzFramework::InputTextEventListener(AzFramework::InputTextEventListener::GetPriorityDebug())
+    , m_nRepeatEventId(s_nullRepeatEventId)
+{
+    m_fRepeatTimer = 0;
+    m_pSysDeactivateConsole = 0;
+    m_pFont = NULL;
+    m_pImage = NULL;
+    m_nCursorPos = 0;
+    m_nScrollPos = 0;
+    m_nScrollMax = 300;
+    m_nTempScrollMax = m_nScrollMax;
+    m_nScrollLine = 0;
+    m_nHistoryPos = -1;
+    m_nTabCount = 0;
+    m_bConsoleActive = false;
+    m_bActivationKeyEnable = true;
+    m_bIsProcessingGroup = false;
+    m_bIsConsoleKeyPressed = false;
+    m_sdScrollDir = sdNONE;
+    m_pSystem = NULL;
+    m_bDrawCursor = true;
+    m_fCursorBlinkTimer = 0;
+
+    m_nCheatHashRangeFirst = 0;
+    m_nCheatHashRangeLast = 0;
+    m_bCheatHashDirty = false;
+    m_nCheatHash = 0;
+
+    m_bStaticBackground = false;
+    m_nProgress = 0;
+    m_nProgressRange = 0;
+    m_nLoadingBackTexID = 0;
+
+    m_deferredExecution = false;
+    m_waitFrames = 0;
+    m_waitSeconds = 0.0f;
+    m_blockCounter = 0;
+
+    AzFramework::ConsoleRequestBus::Handler::BusConnect();
+    AzFramework::CommandRegistrationBus::Handler::BusConnect();
+
+    AddCommand("resetcvars", (ConsoleCommandFunc)ResetCVars, 0, "Resets all cvars to their initial values");
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CXConsole::~CXConsole()
+{
+    AzFramework::ConsoleRequestBus::Handler::BusDisconnect();
+    AzFramework::CommandRegistrationBus::Handler::BusDisconnect();
+
+    if (gEnv->pSystem)
+    {
+        gEnv->pSystem->GetIRemoteConsole()->UnregisterListener(this);
+    }
+
+    if (!m_mapVariables.empty())
+    {
+        while (!m_mapVariables.empty())
+        {
+            m_mapVariables.begin()->second->Release();
+        }
+
+        m_mapVariables.clear();
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::FreeRenderResources()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::Release()
+{
+    delete this;
+}
+
+
+#if ALLOW_AUDIT_CVARS
+void Command_AuditCVars(IConsoleCmdArgs* pArg)
+{
+    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
+    if (pConsole != NULL)
+    {
+        pConsole->AuditCVars(pArg);
+    }
+}
+#endif // ALLOW_AUDIT_CVARS
+
+
+
+#if !defined(_RELEASE) && !defined(LINUX) && !defined(APPLE)
+void Command_DumpCommandsVars(IConsoleCmdArgs* Cmd)
+{
+    const char* arg = "";
+
+    if (Cmd->GetArgCount() > 1)
+    {
+        arg = Cmd->GetArg(1);
+    }
+
+    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
+
+    // txt
+    pConsole->DumpCommandsVarsTxt(arg);
+
+#if defined(WIN32) || defined(WIN64)
+    // HTML
+    {
+        CConsoleHelpGen Generator(*pConsole);
+
+        Generator.Work();
+    }
+#endif
+}
+
+void Command_DumpVars(IConsoleCmdArgs* Cmd)
+{
+    bool includeCheat = false;
+
+    if (Cmd->GetArgCount() > 1)
+    {
+        const char* arg = Cmd->GetArg(1);
+        int incCheat = atoi(arg);
+        if (incCheat == 1)
+        {
+            includeCheat = true;
+        }
+    }
+
+    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
+
+    // txt
+    pConsole->DumpVarsTxt(includeCheat);
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::Init(ISystem* pSystem)
+{
+    m_pSystem = static_cast<CSystem*>(pSystem);
+    if (pSystem->GetICryFont())
+    {
+        m_pFont = pSystem->GetICryFont()->GetFont("default");
+    }
+    m_pTimer = pSystem->GetITimer();
+
+    AzFramework::InputChannelEventListener::Connect();
+    AzFramework::InputTextEventListener::Connect();
+
+#if defined(_RELEASE) && !defined(PERFORMANCE_BUILD)
+    static const int kDeactivateConsoleDefault = 1;
+#else
+    static const int kDeactivateConsoleDefault = 0;
+#endif
+    m_pSysDeactivateConsole = REGISTER_INT("sys_DeactivateConsole", kDeactivateConsoleDefault, 0,
+            "0: normal console behavior\n"
+            "1: hide the console");
+
+    REGISTER_CVAR(con_display_last_messages, 0, VF_NULL, "");  // keep default at 1, needed for gameplay
+    REGISTER_CVAR(con_line_buffer_size, 1000, VF_NULL, "");
+    REGISTER_CVAR(con_showonload, 0, VF_NULL, "Show console on level loading");
+    REGISTER_CVAR(con_debug, 0, VF_CHEAT, "Log call stack on every GetCVar call");
+    REGISTER_CVAR(con_restricted, con_restricted, VF_RESTRICTEDMODE, "0=normal mode / 1=restricted access to the console");                // later on VF_RESTRICTEDMODE should be removed (to 0)
+
+    if (m_pSystem->IsDevMode()       // unrestricted console for -DEVMODE
+        || gEnv->IsDedicated())     // unrestricted console for dedicated server
+    {
+        con_restricted = 0;
+    }
+
+    // test cases -----------------------------------------------
+    assert(GetCVar("con_debug") != 0);        // should be registered a few lines above
+    assert(GetCVar("Con_Debug") == GetCVar("con_debug"));     // different case
+
+    // editor
+    assert(strcmp(AutoComplete("con_"), "con_debug") == 0);
+    assert(strcmp(AutoComplete("CON_"), "con_debug") == 0);
+    assert(strcmp(AutoComplete("con_debug"), "con_display_last_messages") == 0);       // actually we should reconsider this behavior
+    assert(strcmp(AutoComplete("Con_Debug"), "con_display_last_messages") == 0);       // actually we should reconsider this behavior
+
+    // game
+    assert(strcmp(ProcessCompletion("con_"), "con_debug ") == 0);
+    ResetAutoCompletion();
+    assert(strcmp(ProcessCompletion("CON_"), "con_debug ") == 0);
+    ResetAutoCompletion();
+    assert(strcmp(ProcessCompletion("con_debug"), "con_debug ") == 0);
+    ResetAutoCompletion();
+    assert(strcmp(ProcessCompletion("Con_Debug"), "con_debug ") == 0);
+    ResetAutoCompletion();
+
+    // ----------------------------------------------------------
+
+    m_nLoadingBackTexID = -1;
+
+    if (gEnv->IsDedicated())
+    {
+        m_bConsoleActive = true;
+    }
+
+    REGISTER_COMMAND("ConsoleShow", &ConsoleShow, VF_NULL, "Opens the console");
+    REGISTER_COMMAND("ConsoleHide", &ConsoleHide, VF_NULL, "Closes the console");
+
+#if ALLOW_AUDIT_CVARS
+    REGISTER_COMMAND("audit_cvars", &Command_AuditCVars, VF_NULL, "Logs all console commands and cvars");
+#endif // ALLOW_AUDIT_CVARS
+
+#if !defined(_RELEASE) && !defined(LINUX) && !defined(APPLE)
+    REGISTER_COMMAND("DumpCommandsVars", &Command_DumpCommandsVars, VF_NULL,
+        "This console command dumps all console variables and commands to disk\n"
+        "DumpCommandsVars [prefix]");
+    REGISTER_COMMAND("DumpVars", &Command_DumpVars, VF_NULL,
+        "This console command dumps all console variables to disk\n"
+        "DumpVars [IncludeCheatCvars]");
+#endif
+
+    REGISTER_COMMAND("Bind", &Bind, VF_NULL, "");
+    REGISTER_COMMAND("wait_seconds", &Command_SetWaitSeconds, VF_BLOCKFRAME,
+        "Forces the console to wait for a given number of seconds before the next deferred command is processed\n"
+        "Works only in deferred command mode");
+    REGISTER_COMMAND("wait_frames", &Command_SetWaitFrames, VF_BLOCKFRAME,
+        "Forces the console to wait for a given number of frames before the next deferred command is processed\n"
+        "Works only in deferred command mode");
+
+    CConsoleBatchFile::Init();
+
+    if (con_showonload)
+    {
+        ShowConsole(true);
+    }
+
+    pSystem->GetIRemoteConsole()->RegisterListener(this, "CXConsole");
+}
+
+void CXConsole::LogChangeMessage(const char* name, const bool isConst, const bool isCheat, const bool isReadOnly, const bool isDeprecated,
+    const char* oldValue, const char* newValue, [[maybe_unused]] const bool isProcessingGroup, const bool allowChange)
+{
+    string logMessage;
+
+    logMessage.Format
+        ("[CVARS]: [%s] variable [%s] from [%s] to [%s]%s; Marked as%s%s%s%s",
+        (allowChange) ? "CHANGED" : "IGNORED CHANGE",
+        name,
+        oldValue,
+        newValue,
+        (m_bIsProcessingGroup) ? " as part of a cvar group" : "",
+        (isConst) ? " [VF_CONST_CVAR]" : "",
+        (isCheat) ? " [VF_CHEAT]" : "",
+        (isReadOnly) ? " [VF_READONLY]" : "",
+        (isDeprecated) ? " [VF_DEPRECATED]" : "");
+
+    if (allowChange)
+    {
+        gEnv->pLog->LogWarning(logMessage.c_str());
+        gEnv->pLog->LogWarning("Modifying marked variables will not be allowed in Release mode!");
+    }
+    else
+    {
+        gEnv->pLog->LogError(logMessage.c_str());
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::RegisterVar(ICVar* pCVar, ConsoleVarFunc pChangeFunc)
+{
+    // first register callback so setting the value from m_configVars
+    // is calling pChangeFunc         (that would be more correct but to not introduce new problems this code was not changed)
+    //  if (pChangeFunc)
+    //      pCVar->SetOnChangeCallback(pChangeFunc);
+
+    bool isConst = pCVar->IsConstCVar();
+    bool isCheat = ((pCVar->GetFlags() & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0);
+    bool isReadOnly = ((pCVar->GetFlags() & VF_READONLY) != 0);
+    bool isDeprecated = ((pCVar->GetFlags() & VF_DEPRECATED) != 0);
+
+    ConfigVars::iterator it = m_configVars.find(CONST_TEMP_STRING(pCVar->GetName()));
+    if (it != m_configVars.end())
+    {
+        SConfigVar& var = it->second;
+        bool allowChange = true;
+        bool wasProcessingGroup = GetIsProcessingGroup();
+        SetProcessingGroup(var.m_partOfGroup);
+
+        if (
+#if CVAR_GROUPS_ARE_PRIVILEGED
+            !m_bIsProcessingGroup &&
+#endif // !CVAR_GROUPS_ARE_PRIVILEGED
+            (isConst || isCheat || isReadOnly || isDeprecated))
+        {
+            allowChange = !isDeprecated && ((gEnv->pSystem->IsDevMode()) || (gEnv->IsEditor()));
+            if ((strcmp(pCVar->GetString(), var.m_value.c_str()) != 0) && (!(gEnv->IsEditor()) || isDeprecated))
+            {
+#if LOG_CVAR_INFRACTIONS
+                LogChangeMessage(pCVar->GetName(), isConst, isCheat,
+                    isReadOnly, isDeprecated, pCVar->GetString(), var.m_value.c_str(), m_bIsProcessingGroup, allowChange);
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+                gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+#endif // LOG_CVAR_INFRACTIONS
+            }
+        }
+
+        if (allowChange || ALLOW_CONST_CVAR_MODIFICATIONS)
+        {
+            pCVar->Set(var.m_value.c_str());
+            pCVar->SetFlags(pCVar->GetFlags() | VF_WASINCONFIG);
+        }
+
+        SetProcessingGroup(wasProcessingGroup);
+    }
+    else
+    {
+        // Variable is not modified when just registered.
+        pCVar->ClearFlags(VF_MODIFIED);
+    }
+
+    if (pChangeFunc)
+    {
+        pCVar->SetOnChangeCallback(pChangeFunc);
+    }
+
+    ConsoleVariablesMapItor::value_type value = ConsoleVariablesMapItor::value_type(pCVar->GetName(), pCVar);
+
+    m_mapVariables.insert(value);
+
+    int flags = pCVar->GetFlags();
+
+    if (flags & VF_CHEAT_ALWAYS_CHECK)
+    {
+        AddCheckedCVar(m_alwaysCheckedVariables, value);
+    }
+    else if ((flags & (VF_CHEAT | VF_CHEAT_NOCHECK)) == VF_CHEAT)
+    {
+        AddCheckedCVar(m_randomCheckedVariables, value);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::AddCheckedCVar(ConsoleVariablesVector& vector, const ConsoleVariablesVector::value_type& value)
+{
+    ConsoleVariablesVector::iterator it = std::lower_bound(vector.begin(), vector.end(), value, CVarNameLess);
+
+    if ((it == vector.end()) || strcmp(it->first, value.first))
+    {
+        vector.insert(it, value);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::CVarNameLess(const std::pair<const char*, ICVar*>& lhs, const std::pair<const char*, ICVar*>& rhs)
+{
+    return strcmp(lhs.first, rhs.first) < 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::LoadConfigVar(const char* sVariable, const char* sValue)
+{
+    ICVar* pCVar = GetCVar(sVariable);
+    if (pCVar)
+    {
+        bool isConst = pCVar->IsConstCVar();
+        bool isCheat = ((pCVar->GetFlags() & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0);
+        bool isReadOnly = ((pCVar->GetFlags() & VF_READONLY) != 0);
+        bool isDeprecated = ((pCVar->GetFlags() & VF_DEPRECATED) != 0);
+        bool allowChange = true;
+
+        if (
+#if CVAR_GROUPS_ARE_PRIVILEGED
+            !m_bIsProcessingGroup &&
+#endif // !CVAR_GROUPS_ARE_PRIVILEGED
+            (isConst || isCheat || isReadOnly) || isDeprecated)
+        {
+            allowChange = !isDeprecated && (gEnv->pSystem->IsDevMode()) || (gEnv->IsEditor());
+            if (!(gEnv->IsEditor()) || isDeprecated)
+            {
+#if LOG_CVAR_INFRACTIONS
+                LogChangeMessage(pCVar->GetName(), isConst, isCheat,
+                    isReadOnly, isDeprecated, pCVar->GetString(), sValue, m_bIsProcessingGroup, allowChange);
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+                gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+#endif // LOG_CVAR_INFRACTIONS
+            }
+        }
+
+        if (allowChange || ALLOW_CONST_CVAR_MODIFICATIONS)
+        {
+            pCVar->Set(sValue);
+            pCVar->SetFlags(pCVar->GetFlags() | VF_WASINCONFIG);
+        }
+        return;
+    }
+
+    SConfigVar temp;
+    temp.m_value = sValue;
+    temp.m_partOfGroup = m_bIsProcessingGroup;
+
+    m_configVars[sVariable] = temp;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::EnableActivationKey(bool bEnable)
+{
+    m_bActivationKeyEnable = bEnable;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::SetClientDataProbeString(const char* pName, const char* pValue)
+{
+    ICVar*                  pCVar = GetCVar(pName);
+
+    if (pCVar)
+    {
+        pCVar->SetDataProbeString(pValue);
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::Register(const char* sName, int* src, int iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify)
+{
+    AssertName(sName);
+
+    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
+    if (pCVar)
+    {
+        gEnv->pLog->LogError("[CVARS]: [DUPLICATE] CXConsole::Register(int): variable [%s] is already registered", pCVar->GetName());
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+        return pCVar;
+    }
+
+    if (!allowModify)
+    {
+        nFlags |= VF_CONST_CVAR;
+    }
+    pCVar = new CXConsoleVariableIntRef(this, sName, src, nFlags, help);
+    *src = iValue;
+    RegisterVar(pCVar, pChangeFunc);
+    return pCVar;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::RegisterCVarGroup(const char* szName, const char* szFileName)
+{
+    AssertName(szName);
+    assert(szFileName);
+
+    // suppress cvars not starting with sys_spec_ as
+    // cheaters might create cvars before we created ours
+    if (_strnicmp(szName, "sys_spec_", 9) != 0)
+    {
+        return 0;
+    }
+
+    ICVar* pCVar = stl::find_in_map(m_mapVariables, szName, NULL);
+    if (pCVar)
+    {
+        AZ_Error("System", false, "CVar groups should only be registered once");
+        return pCVar;
+    }
+
+    CXConsoleVariableCVarGroup* pCVarGroup = new CXConsoleVariableCVarGroup(this, szName, szFileName, VF_COPYNAME);
+
+    pCVar = pCVarGroup;
+
+    RegisterVar(pCVar, CXConsoleVariableCVarGroup::OnCVarChangeFunc);
+
+    return pCVar;
+}
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::Register(const char* sName, float* src, float fValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify)
+{
+    AssertName(sName);
+
+    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
+    if (pCVar)
+    {
+        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::Register(float): variable [%s] is already registered", pCVar->GetName());
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+        return pCVar;
+    }
+    if (!allowModify)
+    {
+        nFlags |= VF_CONST_CVAR;
+    }
+    pCVar = new CXConsoleVariableFloatRef(this, sName, src, nFlags, help);
+    *src = fValue;
+    RegisterVar(pCVar, pChangeFunc);
+    return pCVar;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::Register(const char* sName, const char** src, const char* defaultValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc, bool allowModify)
+{
+    AssertName(sName);
+
+    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
+    if (pCVar)
+    {
+        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::Register(const char*): variable [%s] is already registered", pCVar->GetName());
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+        return pCVar;
+    }
+    if (!allowModify)
+    {
+        nFlags |= VF_CONST_CVAR;
+    }
+    pCVar = new CXConsoleVariableStringRef(this, sName, src, defaultValue, nFlags, help);
+    RegisterVar(pCVar, pChangeFunc);
+    return pCVar;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::RegisterString(const char* sName, const char* sValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc)
+{
+    AssertName(sName);
+
+    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
+    if (pCVar)
+    {
+        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::RegisterString(const char*): variable [%s] is already registered", pCVar->GetName());
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+        return pCVar;
+    }
+
+    pCVar = new CXConsoleVariableString(this, sName, sValue, nFlags, help);
+    RegisterVar(pCVar, pChangeFunc);
+    return pCVar;
+}
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::RegisterFloat(const char* sName, float fValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc)
+{
+    AssertName(sName);
+
+    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
+    if (pCVar)
+    {
+        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::RegisterFloat(): variable [%s] is already registered", pCVar->GetName());
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+        return pCVar;
+    }
+
+    pCVar = new CXConsoleVariableFloat(this, sName, fValue, nFlags, help);
+    RegisterVar(pCVar, pChangeFunc);
+    return pCVar;
+}
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::RegisterInt(const char* sName, int iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc)
+{
+    AssertName(sName);
+
+    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
+    if (pCVar)
+    {
+        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::RegisterInt(): variable [%s] is already registered", pCVar->GetName());
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+        return pCVar;
+    }
+
+    pCVar = new CXConsoleVariableInt(this, sName, iValue, nFlags, help);
+    RegisterVar(pCVar, pChangeFunc);
+    return pCVar;
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::RegisterInt64(const char* sName, int64 iValue, int nFlags, const char* help, ConsoleVarFunc pChangeFunc)
+{
+    AssertName(sName);
+
+    ICVar* pCVar = stl::find_in_map(m_mapVariables, sName, NULL);
+    if (pCVar)
+    {
+        gEnv->pLog->Log("[CVARS]: [DUPLICATE] CXConsole::RegisterInt64(): variable [%s] is already registered", pCVar->GetName());
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+        return pCVar;
+    }
+
+    pCVar = new CXConsoleVariableInt64(this, sName, iValue, nFlags, help);
+    RegisterVar(pCVar, pChangeFunc);
+    return pCVar;
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::UnregisterVariable(const char* sVarName, [[maybe_unused]] bool bDelete)
+{
+    ConsoleVariablesMapItor itor;
+    itor = m_mapVariables.find(sVarName);
+
+    if (itor == m_mapVariables.end())
+    {
+        return;
+    }
+
+    ICVar* pCVar = itor->second;
+
+    int32 flags = pCVar->GetFlags();
+
+    if (flags & VF_CHEAT_ALWAYS_CHECK)
+    {
+        RemoveCheckedCVar(m_alwaysCheckedVariables, *itor);
+    }
+    else if ((flags & (VF_CHEAT | VF_CHEAT_NOCHECK)) == VF_CHEAT)
+    {
+        RemoveCheckedCVar(m_randomCheckedVariables, *itor);
+    }
+
+    m_mapVariables.erase(sVarName);
+
+    delete pCVar;
+}
+
+void CXConsole::RemoveCheckedCVar(ConsoleVariablesVector& vector, const ConsoleVariablesVector::value_type& value)
+{
+    ConsoleVariablesVector::iterator it = std::lower_bound(vector.begin(), vector.end(), value, CVarNameLess);
+
+    if ((it != vector.end()) && !strcmp(it->first, value.first))
+    {
+        vector.erase(it);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::SetScrollMax(int value)
+{
+    m_nScrollMax = value;
+    m_nTempScrollMax = m_nScrollMax;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void CXConsole::SetImage(ITexture* pImage, bool bDeleteCurrent)
+{
+    if (bDeleteCurrent)
+    {
+        pImage->Release();
+    }
+
+    m_pImage = pImage;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void    CXConsole::ShowConsole(bool show, const int iRequestScrollMax)
+{
+    if (m_pSysDeactivateConsole->GetIVal())
+    {
+        show = false;
+    }
+
+    if (show && !m_bConsoleActive)
+    {
+        UiCursorBus::Broadcast(&UiCursorBus::Events::IncrementVisibleCounter);
+
+        AzFramework::InputSystemCursorRequestBus::EventResult(m_previousSystemCursorState,
+            AzFramework::InputDeviceMouse::Id,
+            &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
+        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+            AzFramework::SystemCursorState::UnconstrainedAndVisible);
+    }
+    else if (!show && m_bConsoleActive)
+    {
+        UiCursorBus::Broadcast(&UiCursorBus::Events::DecrementVisibleCounter);
+
+        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
+            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
+            m_previousSystemCursorState);
+    }
+
+    SetStatus(show);
+
+    if (iRequestScrollMax > 0)
+    {
+        m_nTempScrollMax = iRequestScrollMax;         // temporary user request
+    }
+    else
+    {
+        m_nTempScrollMax = m_nScrollMax;                  // reset
+    }
+    if (m_bConsoleActive)
+    {
+        m_sdScrollDir = sdDOWN;
+    }
+    else
+    {
+        m_sdScrollDir = sdUP;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::CreateKeyBind(const char* sCmd, const char* sRes)
+{
+    m_mapBinds.insert(ConsoleBindsMapItor::value_type(sCmd, sRes));
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::DumpKeyBinds(IKeyBindDumpSink* pCallback)
+{
+    for (ConsoleBindsMap::iterator it = m_mapBinds.begin(); it != m_mapBinds.end(); ++it)
+    {
+        pCallback->OnKeyBindFound(it->first.c_str(), it->second.c_str());
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+const char* CXConsole::FindKeyBind(const char* sCmd) const
+{
+    ConsoleBindsMap::const_iterator it = m_mapBinds.find(CONST_TEMP_STRING(sCmd));
+
+    if (it != m_mapBinds.end())
+    {
+        return it->second.c_str();
+    }
+
+    return 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::DumpCVars(ICVarDumpSink* pCallback, unsigned int nFlagsFilter)
+{
+    ConsoleVariablesMapItor It = m_mapVariables.begin();
+
+    while (It != m_mapVariables.end())
+    {
+        if ((nFlagsFilter == 0) || ((nFlagsFilter != 0) && (It->second->GetFlags() & nFlagsFilter)))
+        {
+            pCallback->OnElementFound(It->second);
+        }
+        ++It;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+ICVar* CXConsole::GetCVar(const char* sName)
+{
+    assert(this);
+    assert(sName);
+
+    if (con_debug)
+    {
+        // Log call stack on get cvar.
+        CryLog("GetCVar(\"%s\") called", sName);
+        m_pSystem->debug_LogCallStack();
+    }
+
+    // Fast map lookup for case-sensitive match.
+    ConsoleVariablesMapItor it;
+
+    it = m_mapVariables.find(sName);
+    if (it != m_mapVariables.end())
+    {
+        return it->second;
+    }
+
+    /*
+        if(!bCaseSensitive)
+        {
+            // Much slower but allows names with wrong case (use only where performance doesn't matter).
+            for(it=m_mapVariables.begin(); it!=m_mapVariables.end(); ++it)
+            {
+                if(azstricmp(it->first,sName)==0)
+                    return it->second;
+            }
+        }
+        test else
+        {
+            for(it=m_mapVariables.begin(); it!=m_mapVariables.end(); ++it)
+            {
+                if(azstricmp(it->first,sName)==0)
+                {
+                    CryFatalError("Error: Wrong case for '%s','%s'",it->first,sName);
+                }
+            }
+        }
+    */
+
+    return NULL;        // haven't found this name
+}
+
+//////////////////////////////////////////////////////////////////////////
+char* CXConsole::GetVariable([[maybe_unused]] const char* szVarName, [[maybe_unused]] const char* szFileName, [[maybe_unused]] const char* def_val)
+{
+    assert(m_pSystem);
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+float CXConsole::GetVariable([[maybe_unused]] const char* szVarName, [[maybe_unused]] const char* szFileName, [[maybe_unused]] float def_val)
+{
+    assert(m_pSystem);
+    return 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::GetStatus()
+{
+    return m_bConsoleActive;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::Clear()
+{
+    m_dqConsoleBuffer.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::Update()
+{
+    if (!m_pSystem)
+    {
+        return;
+    }
+
+    if (m_bIsConsoleKeyPressed)
+    {
+        m_sInputBuffer.clear();
+        m_nCursorPos = 0;
+        m_bIsConsoleKeyPressed = false;
+    }
+
+    // Execute the deferred commands
+    ExecuteDeferredCommands();
+
+    if (!m_bConsoleActive)
+    {
+        m_nRepeatEventId = s_nullRepeatEventId;
+    }
+
+    // Process Key press repeat (backspace and cursor on PC)
+    if (m_nRepeatEventId != s_nullRepeatEventId)
+    {
+        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
+
+        if (m_fRepeatTimer <= 0.0f)
+        {
+            if (m_fRepeatTimer < -fHitchDelay)
+            {
+                // bad framerate or hitch
+                m_nRepeatEventId = s_nullRepeatEventId;
+            }
+            else
+            {
+                const AzFramework::InputChannel* repeatInputChannel = AzFramework::InputChannelRequests::FindInputChannel(m_nRepeatEventId);
+                if (repeatInputChannel)
+                {
+                    ProcessInput(*repeatInputChannel);
+                }
+                m_fRepeatTimer = fRepeatDelay;            // next repeat even in .. sec
+            }
+        }
+    }
+}
+
+//enable this for now, we need it for profiling etc
+//MUST DISABLE FOR TCG BUILDS
+#   define PROCESS_XCONSOLE_INPUT
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::OnInputChannelEventFiltered(const AzFramework::InputChannel& inputChannel)
+{
+#ifdef PROCESS_XCONSOLE_INPUT
+    const AzFramework::InputDeviceId& deviceId = inputChannel.GetInputDevice().GetInputDeviceId();
+    if (!AzFramework::InputDeviceKeyboard::IsKeyboardDevice(deviceId))
+    {
+        // Don't consume non-keyboard events
+        return false;
+    }
+
+    if (inputChannel.IsStateEnded() && m_bConsoleActive)
+    {
+        m_nRepeatEventId = s_nullRepeatEventId;
+    }
+
+    if (!inputChannel.IsStateBegan())
+    {
+        // Consume keyboard events if the console is active
+        return m_bConsoleActive;
+    }
+
+    const AzFramework::InputChannelId& channelId = inputChannel.GetInputChannelId();
+    const AzFramework::ModifierKeyStates* customData = inputChannel.GetCustomData<AzFramework::ModifierKeyStates>();
+    const AzFramework::ModifierKeyStates modifierKeyStates = customData ? *customData : AzFramework::ModifierKeyStates();
+
+    // restart cursor blinking
+    m_fCursorBlinkTimer = 0.0f;
+    m_bDrawCursor = true;
+
+    // key repeat
+    const float fStartRepeatDelay = 0.5f;                       // in sec (similar to Windows default but might differ from actual setting)
+    m_nRepeatEventId = channelId;
+    m_fRepeatTimer = fStartRepeatDelay;
+
+    //execute Binds
+    if (!m_bConsoleActive)
+    {
+        const char* cmd = 0;
+
+        if (modifierKeyStates.GetActiveModifierKeys() == AzFramework::ModifierKeyMask::None)
+        {
+            // fast
+            cmd = FindKeyBind(channelId.GetName());
+        }
+        else
+        {
+            // slower
+            char szCombinedName[255];
+            int iLen = 0;
+
+            if (modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::CtrlAny))
+            {
+                azstrcpy(szCombinedName, AZ_ARRAY_SIZE(szCombinedName), "ctrl_");
+                iLen += 5;
+            }
+            if (modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::ShiftAny))
+            {
+                azstrcpy(&szCombinedName[iLen], AZ_ARRAY_SIZE(szCombinedName) - iLen, "shift_");
+                iLen += 6;
+            }
+            if (modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::AltAny))
+            {
+                azstrcpy(&szCombinedName[iLen], AZ_ARRAY_SIZE(szCombinedName) - iLen, "alt_");
+                iLen += 4;
+            }
+            if (modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::SuperAny))
+            {
+                azstrcpy(&szCombinedName[iLen], AZ_ARRAY_SIZE(szCombinedName) - iLen, "win_");
+                iLen += 4;
+            }
+
+            assert(sizeof(szCombinedName) > (iLen + strlen(channelId.GetName()) + 1));
+            azstrcpy(&szCombinedName[iLen], AZ_ARRAY_SIZE(szCombinedName) - iLen, channelId.GetName());
+
+            cmd = FindKeyBind(szCombinedName);
+        }
+
+        if (cmd)
+        {
+            SetInputLine("");
+            ExecuteStringInternal(cmd, true);        // keybinds are treated as they would come from console
+        }
+    }
+    else
+    {
+        if (channelId != AzFramework::InputDeviceKeyboard::Key::EditTab)
+        {
+            ResetAutoCompletion();
+        }
+
+        if (channelId == AzFramework::InputDeviceKeyboard::Key::AlphanumericC &&
+            modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::CtrlAny))
+        {
+            Copy();
+
+            // Consume keyboard events if the console is active, which it will be if we get here
+            return true;
+        }
+        else if (channelId == AzFramework::InputDeviceKeyboard::Key::AlphanumericV &&
+            modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::CtrlAny))
+        {
+            Paste();
+            return true;
+        }
+    }
+
+    if (channelId == AzFramework::InputDeviceKeyboard::Key::PunctuationTilde)
+    {
+        if (m_bActivationKeyEnable)
+        {
+            ShowConsole(!GetStatus());
+            m_nRepeatEventId = s_nullRepeatEventId;
+            m_bIsConsoleKeyPressed = true;
+            return true;
+        }
+    }
+    if (channelId == AzFramework::InputDeviceKeyboard::Key::Escape)
+    {
+        // hide console if it's active
+        if (GetStatus())
+        {
+            ShowConsole(false);
+            m_bIsConsoleKeyPressed = true;
+            return true;
+        }
+
+        //switch process or page or other things
+        if (m_pSystem)
+        {
+            ISystemUserCallback* pCallback = ((CSystem*)m_pSystem)->GetUserCallback();
+            if (pCallback)
+            {
+                pCallback->OnProcessSwitch();
+                m_bIsConsoleKeyPressed = true;
+                // Mark this input as handled. Pressing escape here is used in the editor to exit game mode, and return to edit mode.
+                // If AI/Physics mode was enabled before entering game mode, when returning to edit mode it will be enabled again.
+                // When it is enabled, it will reset input. If this returns false, then other handlers on the ebus would continue to process
+                // input events after the input had been reset. By returning true, the input is marked as handled.
+                return true;
+            }
+        }
+    }
+
+    return ProcessInput(inputChannel);
+
+#else
+
+    return false;
+
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::OnInputTextEventFiltered(const AZStd::string& textUTF8)
+{
+#ifdef PROCESS_XCONSOLE_INPUT
+    // Ignore tilde/accent/power of two character since it is reserved for toggling the console
+    const bool isTilde = (textUTF8 == "~" || textUTF8 == "`" || textUTF8 == "\xC2\xB2");
+    if (m_bConsoleActive && !isTilde)
+    {
+        AddInputUTF8(textUTF8);
+    }
+#endif
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::ProcessInput(const AzFramework::InputChannel& inputChannel)
+{
+#ifdef PROCESS_XCONSOLE_INPUT
+
+    if (!m_bConsoleActive)
+    {
+        return false;
+    }
+
+    const AzFramework::InputChannelId& channelId = inputChannel.GetInputChannelId();
+    const AzFramework::ModifierKeyStates* customData = inputChannel.GetCustomData<AzFramework::ModifierKeyStates>();
+    const AzFramework::ModifierKeyStates modifierKeyStates = customData ? *customData : AzFramework::ModifierKeyStates();
+
+    const bool isAltModifierActive = modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::AltAny);
+    const bool isCtrlModifierActive = modifierKeyStates.IsActive(AzFramework::ModifierKeyMask::CtrlAny);
+
+    if (channelId == AzFramework::InputDeviceKeyboard::Key::EditEnter ||
+        channelId == AzFramework::InputDeviceKeyboard::Key::NumPadEnter)
+    {
+        ExecuteInputBuffer();
+        m_nScrollLine = 0;
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::EditBackspace)
+    {
+        RemoveInputChar(true);
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationArrowLeft)
+    {
+        if (m_nCursorPos)
+        {
+            const char* pCursor = m_sInputBuffer.c_str() + m_nCursorPos;
+            Unicode::CIterator<const char*, false> pUnicode(pCursor);
+            --pUnicode; // Note: This moves back one UCS code-point, but doesn't necessarily match one displayed character (ie, combining diacritics)
+            pCursor = pUnicode.GetPosition();
+            m_nCursorPos = pCursor - m_sInputBuffer.c_str();
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationArrowRight)
+    {
+        if (m_nCursorPos < (int)(m_sInputBuffer.length()))
+        {
+            const char* pCursor = m_sInputBuffer.c_str() + m_nCursorPos;
+            Unicode::CIterator<const char*, false> pUnicode(pCursor);
+            ++pUnicode; // Note: This moves forward one UCS code-point, but doesn't necessarily match one displayed character (ie, combining diacritics)
+            pCursor = pUnicode.GetPosition();
+            m_nCursorPos = pCursor - m_sInputBuffer.c_str();
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationArrowUp)
+    {
+        const char* szHistoryLine = GetHistoryElement(true);      // true=UP
+
+        if (szHistoryLine)
+        {
+            m_sInputBuffer = szHistoryLine;
+            m_nCursorPos = (int)m_sInputBuffer.size();
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationArrowDown)
+    {
+        const char* szHistoryLine = GetHistoryElement(false);     // false=DOWN
+
+        if (szHistoryLine)
+        {
+            m_sInputBuffer = szHistoryLine;
+            m_nCursorPos = (int)m_sInputBuffer.size();
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::EditTab)
+    {
+        if (!isAltModifierActive)
+        {
+            m_sInputBuffer = ProcessCompletion(m_sInputBuffer.c_str());
+            m_nCursorPos = m_sInputBuffer.size();
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationPageUp)
+    {
+        if (isCtrlModifierActive)
+        {
+            m_nScrollLine = min((int)(m_dqConsoleBuffer.size() - 1), m_nScrollLine + 21);
+        }
+        else
+        {
+            m_nScrollLine = min((int)(m_dqConsoleBuffer.size() - 1), m_nScrollLine + 1);
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationPageDown)
+    {
+        if (isCtrlModifierActive)
+        {
+            m_nScrollLine = max(0, m_nScrollLine - 21);
+        }
+        else
+        {
+            m_nScrollLine = max(0, m_nScrollLine - 1);
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationHome)
+    {
+        if (isCtrlModifierActive)
+        {
+            m_nScrollLine = m_dqConsoleBuffer.size() - 1;
+        }
+        else
+        {
+            m_nCursorPos = 0;
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationEnd)
+    {
+        if (isCtrlModifierActive)
+        {
+            m_nScrollLine = 0;
+        }
+        else
+        {
+            m_nCursorPos = (int)m_sInputBuffer.length();
+        }
+        return true;
+    }
+    else if (channelId == AzFramework::InputDeviceKeyboard::Key::NavigationDelete)
+    {
+        RemoveInputChar(false);
+        return true;
+    }
+
+#endif
+
+    // Consume keyboard events if the console is active, which it will be if we get here
+    return true;
+}
+
+#ifdef PROCESS_XCONSOLE_INPUT
+#   undef PROCESS_XCONSOLE_INPUT
+#endif
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void CXConsole::OnConsoleCommand(const char* cmd)
+{
+    ExecuteString(cmd, false);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+const char* CXConsole::GetHistoryElement(const bool bUpOrDown)
+{
+    if (bUpOrDown)
+    {
+        if (!m_dqHistory.empty())
+        {
+            if (m_nHistoryPos < (int)(m_dqHistory.size() - 1))
+            {
+                m_nHistoryPos++;
+                m_sReturnString = m_dqHistory[m_nHistoryPos];
+                return m_sReturnString.c_str();
+            }
+        }
+    }
+    else
+    {
+        if (m_nHistoryPos > 0)
+        {
+            m_nHistoryPos--;
+            m_sReturnString = m_dqHistory[m_nHistoryPos];
+            return m_sReturnString.c_str();
+        }
+    }
+
+    return 0;
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::Draw()
+{
+}
+
+void CXConsole::DrawBuffer(int, const char*)
+{
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::GetLineNo(const int indwLineNo, char* outszBuffer, const int indwBufferSize) const
+{
+    assert(outszBuffer);
+    assert(indwBufferSize > 0);
+
+    outszBuffer[0] = 0;
+
+    ConsoleBuffer::const_reverse_iterator ritor = m_dqConsoleBuffer.rbegin();
+
+    ritor += indwLineNo;
+
+    if (indwLineNo >= (int)m_dqConsoleBuffer.size())
+    {
+        return false;
+    }
+
+    const char* buf = ritor->c_str();// GetBuf(k);
+
+    if (*buf > 0 && *buf < 32)
+    {
+        buf++;                          // to jump over verbosity level character
+    }
+    cry_strcpy(outszBuffer, indwBufferSize, buf);
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CXConsole::GetLineCount() const
+{
+    return m_dqConsoleBuffer.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ScrollConsole()
+{
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::AddCommand(const char* sCommand, ConsoleCommandFunc func, int nFlags, const char* sHelp)
+{
+    AssertName(sCommand);
+
+    if (m_mapCommands.find(sCommand) == m_mapCommands.end())
+    {
+        CConsoleCommand cmd;
+        cmd.m_sName = sCommand;
+        cmd.m_func = func;
+        if (sHelp)
+        {
+            cmd.m_sHelp = sHelp;
+        }
+        cmd.m_nFlags = nFlags;
+        m_mapCommands.insert(std::make_pair(cmd.m_sName, cmd));
+
+        return true;
+    }
+    else
+    {
+        gEnv->pLog->LogError("[CVARS]: [DUPLICATE] CXConsole::AddCommand(): console command [%s] is already registered", sCommand);
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+
+        return false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::AddCommand(const char* sCommand, const char* sScriptFunc, int nFlags, const char* sHelp)
+{
+    AssertName(sCommand);
+
+    if (m_mapCommands.find(sCommand) == m_mapCommands.end())
+    {
+        CConsoleCommand cmd;
+        cmd.m_sName = sCommand;
+        cmd.m_sCommand = sScriptFunc;
+        if (sHelp)
+        {
+            cmd.m_sHelp = sHelp;
+        }
+        cmd.m_nFlags = nFlags;
+        m_mapCommands.insert(std::make_pair(cmd.m_sName, cmd));
+
+        return true;
+    }
+    else
+    {
+        gEnv->pLog->LogError("[CVARS]: [DUPLICATE] CXConsole::AddCommand(): script command [%s] is already registered", sCommand);
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+        gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+
+        return false;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::RemoveCommand(const char* sName)
+{
+    ConsoleCommandsMap::iterator ite = m_mapCommands.find(sName);
+    if (ite != m_mapCommands.end())
+    {
+        m_mapCommands.erase(ite);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline bool hasprefix(const char* s, const char* prefix)
+{
+    while (*prefix)
+    {
+        if (*prefix++ != *s++)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CXConsole::GetFlagsString(const uint32 dwFlags)
+{
+    static char sFlags[256];
+
+    // hiding this makes it a bit more difficult for cheaters
+    //  if(dwFlags&VF_CHEAT)                  cry_strcat( sFlags,"CHEAT, ");
+
+    cry_strcpy(sFlags, "");
+
+    if (dwFlags & VF_READONLY)
+    {
+        cry_strcat(sFlags, "READONLY, ");
+    }
+    if (dwFlags & VF_DEPRECATED)
+    {
+        cry_strcat(sFlags, "DEPRECATED, ");
+    }
+    if (dwFlags & VF_DUMPTODISK)
+    {
+        cry_strcat(sFlags, "DUMPTODISK, ");
+    }
+    if (dwFlags & VF_REQUIRE_LEVEL_RELOAD)
+    {
+        cry_strcat(sFlags, "REQUIRE_LEVEL_RELOAD, ");
+    }
+    if (dwFlags & VF_REQUIRE_APP_RESTART)
+    {
+        cry_strcat(sFlags, "REQUIRE_APP_RESTART, ");
+    }
+    if (dwFlags & VF_RESTRICTEDMODE)
+    {
+        cry_strcat(sFlags, "RESTRICTEDMODE, ");
+    }
+
+    if (sFlags[0] != 0)
+    {
+        sFlags[strlen(sFlags) - 2] = 0;  // remove ending ", "
+    }
+    return sFlags;
+}
+
+#if ALLOW_AUDIT_CVARS
+void CXConsole::AuditCVars(IConsoleCmdArgs* pArg)
+{
+    int numArgs = pArg->GetArgCount();
+    int cheatMask = VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK;
+    int constMask = VF_CONST_CVAR;
+    int readOnlyMask = VF_READONLY;
+    int devOnlyMask = VF_DEV_ONLY;
+    int dediOnlyMask = VF_DEDI_ONLY;
+    int excludeMask = cheatMask | constMask | readOnlyMask | devOnlyMask | dediOnlyMask;
+
+    if (numArgs > 1)
+    {
+        while (numArgs > 1)
+        {
+            const char* arg = pArg->GetArg(numArgs - 1);
+
+            if (azstricmp(arg, "cheat") == 0)
+            {
+                excludeMask &= ~cheatMask;
+            }
+
+            if (azstricmp(arg, "const") == 0)
+            {
+                excludeMask &= ~constMask;
+            }
+
+            if (azstricmp(arg, "readonly") == 0)
+            {
+                excludeMask &= ~readOnlyMask;
+            }
+
+            if (azstricmp(arg, "dev") == 0)
+            {
+                excludeMask &= ~devOnlyMask;
+            }
+
+            if (azstricmp(arg, "dedi") == 0)
+            {
+                excludeMask &= ~dediOnlyMask;
+            }
+
+            --numArgs;
+        }
+    }
+
+    int commandCount = 0;
+    int cvarCount = 0;
+
+    CryLogAlways("[CVARS]: [BEGIN AUDIT]");
+
+    for (ConsoleCommandsMapItor it = m_mapCommands.begin(); it != m_mapCommands.end(); ++it)
+    {
+        CConsoleCommand& command = it->second;
+
+        int cheatFlags = (command.m_nFlags & cheatMask);
+        int devOnlyFlags = (command.m_nFlags & devOnlyMask);
+        int dediOnlyFlags = (command.m_nFlags & dediOnlyMask);
+        bool shouldLog = ((cheatFlags | devOnlyFlags | dediOnlyFlags) == 0) || (((cheatFlags | devOnlyFlags | dediOnlyFlags) & ~excludeMask) != 0);
+        if (shouldLog)
+        {
+            CryLogAlways("[CVARS]: [COMMAND] %s%s%s%s%s",
+                command.m_sName.c_str(),
+                (cheatFlags != 0) ? " [VF_CHEAT]" : "",
+                (devOnlyFlags != 0) ? " [VF_DEV_ONLY]" : "",
+                (dediOnlyFlags != 0) ? " [VF_DEDI_ONLY]" : "",
+                ""
+                );
+            ++commandCount;
+        }
+    }
+
+    for (ConsoleVariablesMapItor it = m_mapVariables.begin(); it != m_mapVariables.end(); ++it)
+    {
+        ICVar* pVariable = it->second;
+        int flags = pVariable->GetFlags();
+
+        int cheatFlags = (flags & cheatMask);
+        int constFlags = (flags & constMask);
+        int readOnlyFlags = (flags & readOnlyMask);
+        int devOnlyFlags = (flags & devOnlyMask);
+        int dediOnlyFlags = (flags & dediOnlyMask);
+        bool shouldLog = ((cheatFlags | constFlags | readOnlyFlags | devOnlyFlags | dediOnlyFlags) == 0) || (((cheatFlags | constFlags | readOnlyFlags | devOnlyFlags | dediOnlyFlags) & ~excludeMask) != 0);
+        if (shouldLog)
+        {
+            CryLogAlways("[CVARS]: [VARIABLE] %s%s%s%s%s%s%s",
+                pVariable->GetName(),
+                (cheatFlags != 0) ? " [VF_CHEAT]" : "",
+                (constFlags != 0) ? " [VF_CONST_CVAR]" : "",
+                (readOnlyFlags != 0) ? " [VF_READONLY]" : "",
+                (devOnlyFlags != 0) ? " [VF_DEV_ONLY]" : "",
+                (dediOnlyFlags != 0) ? " [VF_DEDI_ONLY]" : "",
+                ""
+                );
+            ++cvarCount;
+        }
+    }
+
+    CryLogAlways("[CVARS]: [END AUDIT] (commands %d/%" PRISIZE_T "; variables %d/%" PRISIZE_T ")", commandCount, m_mapCommands.size(), cvarCount, m_mapVariables.size());
+}
+#endif // ALLOW_AUDIT_CVARS
+
+//////////////////////////////////////////////////////////////////////////
+#ifndef _RELEASE
+void CXConsole::DumpCommandsVarsTxt(const char* prefix)
+{
+    FILE* f0 = nullptr;
+    azfopen(&f0, "consolecommandsandvars.txt", "w");
+
+    if (!f0)
+    {
+        return;
+    }
+
+    ConsoleCommandsMapItor itrCmd, itrCmdEnd = m_mapCommands.end();
+    ConsoleVariablesMapItor itrVar, itrVarEnd = m_mapVariables.end();
+
+    fprintf(f0, " CHEAT: stays in the default value if cheats are not disabled\n");
+    fprintf(f0, " REQUIRE_NET_SYNC: cannot be changed on client and when connecting it's sent to the client\n");
+    fprintf(f0, " SAVEGAME: stored when saving a savegame\n");
+    fprintf(f0, " READONLY: can not be changed by the user\n");
+    fprintf(f0, "-------------------------\n");
+    fprintf(f0, "\n");
+
+    for (itrCmd = m_mapCommands.begin(); itrCmd != itrCmdEnd; ++itrCmd)
+    {
+        CConsoleCommand& cmd = itrCmd->second;
+
+        if (hasprefix(cmd.m_sName.c_str(), prefix))
+        {
+            const char* sFlags = GetFlagsString(cmd.m_nFlags);
+
+            fprintf(f0, "Command: %s %s\nscript: %s\nhelp: %s\n\n", cmd.m_sName.c_str(), sFlags, cmd.m_sCommand.c_str(), cmd.m_sHelp.c_str());
+        }
+    }
+
+    for (itrVar = m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
+    {
+        ICVar* var = itrVar->second;
+        const char* types[] = { "?", "int", "float", "string", "?" };
+
+        var->GetRealIVal();         // assert inside checks consistency for all cvars
+
+        if (hasprefix(var->GetName(), prefix))
+        {
+            const char* sFlags = GetFlagsString(var->GetFlags());
+
+            fprintf(f0, "variable: %s %s\ntype: %s\ncurrent: %s\nhelp: %s\n\n", var->GetName(), sFlags, types[var->GetType()], var->GetString(), var->GetHelp());
+        }
+    }
+
+    fclose(f0);
+
+    ConsoleLogInputResponse("successfully wrote consolecommandsandvars.txt");
+}
+
+void CXConsole::DumpVarsTxt(const bool includeCheat)
+{
+    FILE* f0 = nullptr;
+    azfopen(&f0, "consolevars.txt", "w");
+    if (!f0)
+    {
+        return;
+    }
+
+    ConsoleVariablesMapItor itrVar, itrVarEnd = m_mapVariables.end();
+
+    fprintf(f0, " REQUIRE_NET_SYNC: cannot be changed on client and when connecting it's sent to the client\n");
+    fprintf(f0, " SAVEGAME: stored when saving a savegame\n");
+    fprintf(f0, " READONLY: can not be changed by the user\n");
+    fprintf(f0, "-------------------------\n");
+    fprintf(f0, "\n");
+
+    for (itrVar = m_mapVariables.begin(); itrVar != itrVarEnd; ++itrVar)
+    {
+        ICVar* var = itrVar->second;
+        const char* types[] = { "?", "int", "float", "string", "?" };
+
+        var->GetRealIVal();         // assert inside checks consistency for all cvars
+        const int flags = var->GetFlags();
+
+        if ((includeCheat == true) || (flags & VF_CHEAT) == 0)
+        {
+            const char* sFlags = GetFlagsString(flags);
+            fprintf(f0, "variable: %s %s\ntype: %s\ncurrent: %s\nhelp: %s\n\n", var->GetName(), sFlags, types[var->GetType()], var->GetString(), var->GetHelp());
+        }
+    }
+
+    fclose(f0);
+
+    ConsoleLogInputResponse("successfully wrote consolevars.txt");
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::DisplayHelp(const char* help, const char* name)
+{
+    if (help == 0 || *help == 0)
+    {
+        ConsoleLogInputResponse("No help available for $3%s", name);
+    }
+    else
+    {
+        char* start, * pos;
+        for (pos = strstr((char*)help, "\n"), start = (char*)help; pos; start = ++pos)
+        {
+            string s = start;
+            s.resize(pos - start);
+            ConsoleLogInputResponse("    $3%s", s.c_str());
+            pos = strstr(pos, "\n");
+        }
+        ConsoleLogInputResponse("    $3%s", start);
+    }
+}
+
+
+void CXConsole::ExecuteString(const char* command, const bool bSilentMode, const bool bDeferExecution)
+{
+    if (!m_deferredExecution && !bDeferExecution)
+    {
+        // This is a regular mode
+        ExecuteStringInternal(command, false, bSilentMode);     // not from console
+
+        return;
+    }
+
+    // Store the string commands into a list and defer the execution for later.
+    // The commands will be processed in CXConsole::Update()
+    string str(command);
+    str.TrimLeft();
+
+    // Unroll the exec command
+    bool unroll = (0 == str.Left(strlen("exec")).compareNoCase("exec"));
+
+    if (unroll)
+    {
+        bool oldDeferredExecution = m_deferredExecution;
+
+        // Make sure that the unrolled commands are processed with deferred mode on
+        m_deferredExecution = true;
+        ExecuteStringInternal(str.c_str(), false, bSilentMode);
+
+        // Restore to the previous setting
+        m_deferredExecution = oldDeferredExecution;
+    }
+    else
+    {
+        m_deferredCommands.push_back(SDeferredCommand(str.c_str(), bSilentMode));
+    }
+}
+
+// This method is used by the ConsoleRequestBus to allow executing of console commands
+// This can be used from anywhere in code or via script since the bus is relected to the behavior context
+void CXConsole::ExecuteConsoleCommand(const char* command)
+{
+    ExecuteString(command, true, true);
+}
+
+void CXConsole::ResetCVarsToDefaults()
+{
+    ConsoleVariablesMapItor It = m_mapVariables.begin();
+
+    while (It != m_mapVariables.end())
+    {
+        It->second->Reset();
+        ++It;
+    }
+
+}
+
+void CXConsole::SplitCommands(const char* line, std::list<string>& split)
+{
+    const char* start = line;
+    string working;
+
+    while (true)
+    {
+        char ch = *line++;
+        switch (ch)
+        {
+        case '\'':
+        case '\"':
+            while ((*line++ != ch) && *line)
+            {
+                ;
+            }
+            break;
+        case '\n':
+        case '\r':
+        case ';':
+        case '\0':
+        {
+            working.assign(start, line - 1);
+            working.Trim();
+
+            if (!working.empty())
+            {
+                split.push_back(working);
+            }
+            start = line;
+
+            if (ch == '\0')
+            {
+                return;
+            }
+        }
+        break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ExecuteStringInternal(const char* command, const bool bFromConsole, const bool bSilentMode)
+{
+    AzFramework::ConsoleNotificationBus::Broadcast(&AzFramework::ConsoleNotificationBus::Events::OnConsoleCommandExecuted, command);
+
+    assert(command);
+    assert(command[0] != '\\');           // caller should remove leading "\\"
+
+    ///////////////////////////
+    //Execute as string
+    if (command[0] == '#' || command[0] == '@')
+    {
+        if (!con_restricted || !bFromConsole)            // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
+        {
+            AddLine(command);
+
+            if (m_pSystem->IsDevMode())
+            {
+                m_bDrawCursor = 0;
+            }
+            else
+            {
+                // Warning.
+                // No Cheat warnings. ConsoleWarning("Console execution is cheat protected");
+            }
+            return;
+        }
+    }
+
+    ConsoleCommandsMapItor itrCmd;
+    ConsoleVariablesMapItor itrVar;
+
+    std::list<string> lineCommands;
+    SplitCommands(command, lineCommands);
+
+    string sTemp;
+    string sCommand, sLineCommand;
+
+    while (!lineCommands.empty())
+    {
+        string::size_type nPos;
+
+        {
+            sTemp = lineCommands.front();
+            sCommand = lineCommands.front();
+            sLineCommand = sCommand;
+            lineCommands.pop_front();
+
+            if (!bSilentMode)
+            {
+                if (GetStatus())
+                {
+                    AddLine(sTemp);
+                }
+            }
+
+            nPos = sTemp.find_first_of('=');
+
+            if (nPos != string::npos)
+            {
+                sCommand = sTemp.substr(0, nPos);
+            }
+            else if ((nPos = sTemp.find_first_of(' ')) != string::npos)
+            {
+                sCommand = sTemp.substr(0, nPos);
+            }
+            else
+            {
+                sCommand = sTemp;
+            }
+
+            sCommand.Trim();
+
+            //////////////////////////////////////////
+            // Search for CVars
+            if (sCommand.length() > 1 && sCommand[0] == '?')
+            {
+                sTemp = sCommand.substr(1);
+                FindVar(sTemp.c_str());
+                continue;
+            }
+        }
+
+        //////////////////////////////////////////
+        //Check if is a command
+        itrCmd = m_mapCommands.find(sCommand);
+        if (itrCmd != m_mapCommands.end())
+        {
+            if (((itrCmd->second).m_nFlags & VF_RESTRICTEDMODE) || !con_restricted || !bFromConsole)           // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
+            {
+                if (itrCmd->second.m_nFlags & VF_BLOCKFRAME)
+                {
+                    m_blockCounter++;
+                }
+
+                {
+                    sTemp = sLineCommand;
+                }
+                ExecuteCommand((itrCmd->second), sTemp);
+
+                continue;
+            }
+        }
+
+        //////////////////////////////////////////
+        //Check  if is a variable
+        itrVar = m_mapVariables.find(sCommand);
+        if (itrVar != m_mapVariables.end())
+        {
+            ICVar* pCVar = itrVar->second;
+
+            if ((pCVar->GetFlags() & VF_RESTRICTEDMODE) || !con_restricted || !bFromConsole)           // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
+            {
+                if (pCVar->GetFlags() & VF_BLOCKFRAME)
+                {
+                    m_blockCounter++;
+                }
+
+                if (nPos != string::npos)
+                {
+                    sTemp = sTemp.substr(nPos + 1);     // remove the command from sTemp
+                    sTemp.Trim(" \t\r\n\"\'");
+
+                    if (sTemp == "?")
+                    {
+                        ICVar* v = itrVar->second;
+                        DisplayHelp(v->GetHelp(), sCommand.c_str());
+                        return;
+                    }
+
+                    if (!sTemp.empty() || (pCVar->GetType() == CVAR_STRING))
+                    {
+                        pCVar->Set(sTemp.c_str());
+                    }
+                }
+
+                // the following line calls AddLine() indirectly
+                if (!bSilentMode)
+                {
+                    DisplayVarValue(pCVar);
+                }
+                //ConsoleLogInputResponse("%s=%s",pCVar->GetName(),pCVar->GetString());
+                continue;
+            }
+        }
+
+        if (!bSilentMode)
+        {
+            ConsoleWarning("Unknown command: %s", sCommand.c_str());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ExecuteDeferredCommands()
+{
+    TDeferredCommandList::iterator it;
+
+    if (m_waitFrames)
+    {
+        --m_waitFrames;
+        return;
+    }
+
+    if (m_waitSeconds.GetValue())
+    {
+        if (m_waitSeconds > gEnv->pTimer->GetFrameStartTime())
+        {
+            return;
+        }
+
+        // Help to avoid overflow problems
+        m_waitSeconds.SetValue(0);
+    }
+
+    const int blockCounter = m_blockCounter;
+
+    // Signal the console that we executing a deferred command
+    //m_deferredExecution = true;
+
+    while (!m_deferredCommands.empty())
+    {
+        it = m_deferredCommands.begin();
+        ExecuteStringInternal(it->command.c_str(), false, it->silentMode);
+        m_deferredCommands.pop_front();
+
+        // A blocker command was executed
+        if (m_blockCounter != blockCounter)
+        {
+            break;
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ExecuteCommand(CConsoleCommand& cmd, string& str, bool bIgnoreDevMode)
+{
+    CryLog ("[CONSOLE] Executing console command '%s'", str.c_str());
+    INDENT_LOG_DURING_SCOPE();
+
+    std::vector<string> args;
+    size_t t;
+
+    {
+        t = 1;
+
+        const char* start = str.c_str();
+        const char* commandLine = start;
+        while (char ch = *commandLine++)
+        {
+            switch (ch)
+            {
+            case '\'':
+            case '\"':
+            {
+                while ((*commandLine++ != ch) && *commandLine)
+                {
+                    ;
+                }
+                args.push_back(string(start + 1, commandLine - 1));
+                start = commandLine;
+                break;
+            }
+            case ' ':
+                start = commandLine;
+                break;
+            default:
+            {
+                if ((*commandLine == ' ') || !*commandLine)
+                {
+                    args.push_back(string(start, commandLine));
+                    start = commandLine + 1;
+                }
+            }
+            break;
+            }
+        }
+
+        if (args.size() >= 2 && args[1] == "?")
+        {
+            DisplayHelp(cmd.m_sHelp, cmd.m_sName.c_str());
+            return;
+        }
+
+        if (((cmd.m_nFlags & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0) && !(gEnv->IsEditor()))
+        {
+#if LOG_CVAR_INFRACTIONS
+            gEnv->pLog->LogError("[CVARS]: [EXECUTE] command %s is marked [VF_CHEAT]", cmd.m_sName.c_str());
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+            gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+#endif // LOG_CVAR_INFRACTIONS
+            if (!(gEnv->IsEditor()) && !(m_pSystem->IsDevMode()) && !bIgnoreDevMode)
+            {
+                return;
+            }
+        }
+    }
+
+    if (cmd.m_func)
+    {
+        // This is function command, execute it with a list of parameters.
+        CConsoleCommandArgs cmdArgs(str, args);
+        cmd.m_func(&cmdArgs);
+        return;
+    }
+
+    string buf;
+    {
+        // only do this for commands with script implementation
+        for (;; )
+        {
+            t = str.find_first_of("\\", t);
+            if (t == string::npos)
+            {
+                break;
+            }
+            str.replace(t, 1, "\\\\", 2);
+            t += 2;
+        }
+
+        for (t = 1;; )
+        {
+            t = str.find_first_of("\"", t);
+            if (t == string::npos)
+            {
+                break;
+            }
+            str.replace(t, 1, "\\\"", 2);
+            t += 2;
+        }
+
+        buf = cmd.m_sCommand;
+
+        size_t pp = buf.find("%%");
+        if (pp != string::npos)
+        {
+            string list = "";
+            for (unsigned int i = 1; i < args.size(); i++)
+            {
+                list += "\"" + args[i] + "\"";
+                if (i < args.size() - 1)
+                {
+                    list += ",";
+                }
+            }
+            buf.replace(pp, 2, list);
+        }
+        else if ((pp = buf.find("%line")) != string::npos)
+        {
+            string tmp = "\"" + str.substr(str.find(" ") + 1) + "\"";
+            if (args.size() > 1)
+            {
+                buf.replace(pp, 5, tmp);
+            }
+            else
+            {
+                buf.replace(pp, 5, "");
+            }
+        }
+        else
+        {
+            for (unsigned int i = 1; i <= args.size(); i++)
+            {
+                char pat[10];
+                azsprintf(pat, "%%%d", i);
+                size_t pos = buf.find(pat);
+                if (pos == string::npos)
+                {
+                    if (i != args.size())
+                    {
+                        ConsoleWarning("Too many arguments for: %s", cmd.m_sName.c_str());
+                        return;
+                    }
+                }
+                else
+                {
+                    if (i == args.size())
+                    {
+                        ConsoleWarning("Not enough arguments for: %s", cmd.m_sName.c_str());
+                        return;
+                    }
+                    string arg = "\"" + args[i] + "\"";
+                    buf.replace(pos, strlen(pat), arg);
+                }
+            }
+        }
+    }
+
+    m_bDrawCursor = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::Exit(const char* szExitComments, ...)
+{
+    char sResultMessageText[1024] = "";
+
+    if (szExitComments)
+    {
+        // make result string
+        va_list     arglist;
+        va_start(arglist, szExitComments);
+        vsprintf_s(sResultMessageText, szExitComments, arglist);
+        va_end(arglist);
+    }
+    else
+    {
+        azstrcpy(sResultMessageText, AZ_ARRAY_SIZE(sResultMessageText), "No comments from application");
+    }
+
+    CryFatalError("%s", sResultMessageText);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::RegisterAutoComplete(const char* sVarOrCommand, IConsoleArgumentAutoComplete* pArgAutoComplete)
+{
+    m_mapArgumentAutoComplete[sVarOrCommand] = pArgAutoComplete;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::UnRegisterAutoComplete(const char* sVarOrCommand)
+{
+    ArgumentAutoCompleteMap::iterator it;
+    it = m_mapArgumentAutoComplete.find(sVarOrCommand);
+    if (it != m_mapArgumentAutoComplete.end())
+    {
+        m_mapArgumentAutoComplete.erase(it);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ResetAutoCompletion()
+{
+    m_nTabCount = 0;
+    m_sPrevTab = "";
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CXConsole::ProcessCompletion(const char* szInputBuffer)
+{
+    m_sInputBuffer = szInputBuffer;
+
+    int offset = (szInputBuffer[0] == '\\' ? 1 : 0);        // legacy support
+
+    if ((m_sPrevTab.size() > strlen(szInputBuffer + offset)) || _strnicmp(m_sPrevTab.c_str(), (szInputBuffer + offset), m_sPrevTab.size()))
+    {
+        m_nTabCount = 0;
+        m_sPrevTab = "";
+    }
+
+    if (m_sInputBuffer.empty())
+    {
+        return (char*)m_sInputBuffer.c_str();
+    }
+
+    int nMatch = 0;
+    ConsoleCommandsMapItor itrCmds;
+    ConsoleVariablesMapItor itrVars;
+    bool showlist = !m_nTabCount && m_sPrevTab == "";
+
+    if (m_nTabCount == 0)
+    {
+        if (m_sInputBuffer.size() > 0)
+        {
+            if (m_sInputBuffer[0] == '\\')
+            {
+                m_sPrevTab = &m_sInputBuffer.c_str()[1];      // legacy support
+            }
+            else
+            {
+                m_sPrevTab = m_sInputBuffer;
+            }
+        }
+
+        else
+        {
+            m_sPrevTab = "";
+        }
+    }
+    //try to search in command list
+    bool bArgumentAutoComplete = false;
+    std::vector<string> matches;
+
+    if (m_sPrevTab.find(' ') != string::npos)
+    {
+        bool bProcessAutoCompl = true;
+
+        // Find command.
+        string sVar = m_sPrevTab.substr(0, m_sPrevTab.find(' '));
+        ICVar* pCVar = GetCVar(sVar);
+        if (pCVar)
+        {
+            if (!(pCVar->GetFlags() & VF_RESTRICTEDMODE) && con_restricted)            // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
+            {
+                bProcessAutoCompl = false;
+            }
+        }
+
+        ConsoleCommandsMap::iterator it = m_mapCommands.find(sVar);
+        if (it != m_mapCommands.end())
+        {
+            CConsoleCommand& ccmd = it->second;
+
+            if (!(ccmd.m_nFlags & VF_RESTRICTEDMODE) && con_restricted)            // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
+            {
+                bProcessAutoCompl = false;
+            }
+        }
+
+        if (bProcessAutoCompl)
+        {
+            IConsoleArgumentAutoComplete* pArgumentAutoComplete = stl::find_in_map(m_mapArgumentAutoComplete, sVar, 0);
+            if (pArgumentAutoComplete)
+            {
+                int nMatches = pArgumentAutoComplete->GetCount();
+                for (int i = 0; i < nMatches; i++)
+                {
+                    string cmd = string(sVar) + " " + pArgumentAutoComplete->GetValue(i);
+                    if (_strnicmp(m_sPrevTab.c_str(), cmd.c_str(), m_sPrevTab.length()) == 0)
+                    {
+                        {
+                            bArgumentAutoComplete = true;
+                            matches.push_back(cmd);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (!bArgumentAutoComplete)
+    {
+        itrCmds = m_mapCommands.begin();
+        while (itrCmds != m_mapCommands.end())
+        {
+            CConsoleCommand& cmd = itrCmds->second;
+
+            if ((cmd.m_nFlags & VF_RESTRICTEDMODE) || !con_restricted)         // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
+            {
+                if (_strnicmp(m_sPrevTab.c_str(), itrCmds->first.c_str(), m_sPrevTab.length()) == 0)
+                {
+                    {
+                        matches.push_back((char* const)itrCmds->first.c_str());
+                    }
+                }
+            }
+            ++itrCmds;
+        }
+
+        // try to search in console variables
+
+        itrVars = m_mapVariables.begin();
+        while (itrVars != m_mapVariables.end())
+        {
+            ICVar* pVar = itrVars->second;
+
+            if ((pVar->GetFlags() & VF_RESTRICTEDMODE) || !con_restricted)         // in restricted mode we allow only VF_RESTRICTEDMODE CVars&CCmd
+            {//if(itrVars->first.compare(0,m_sPrevTab.length(),m_sPrevTab)==0)
+                if (_strnicmp(m_sPrevTab.c_str(), itrVars->first, m_sPrevTab.length()) == 0)
+                {
+                    {
+                        matches.push_back((char* const)itrVars->first);
+                    }
+                }
+            }
+            ++itrVars;
+        }
+    }
+
+    if (!matches.empty())
+    {
+        std::sort(matches.begin(), matches.end(), less_CVar);       // to sort commands with variables
+    }
+    if (showlist && !matches.empty())
+    {
+        ConsoleLogInput(" ");       // empty line before auto completion
+
+        for (std::vector<string>::iterator i = matches.begin(); i != matches.end(); ++i)
+        {
+            // List matching variables
+            const char* sVar = *i;
+            ICVar* pVar = GetCVar(sVar);
+
+            if (pVar)
+            {
+                DisplayVarValue(pVar);
+            }
+            else
+            {
+                ConsoleLogInputResponse("    $3%s $6(Command)", sVar);
+            }
+        }
+    }
+
+    for (std::vector<string>::iterator i = matches.begin(); i != matches.end(); ++i)
+    {
+        if (m_nTabCount <= nMatch)
+        {
+            m_sInputBuffer = *i;
+            m_sInputBuffer += " ";
+            m_nTabCount = nMatch + 1;
+            return (char*)m_sInputBuffer.c_str();
+        }
+        nMatch++;
+    }
+
+    if (m_nTabCount > 0)
+    {
+        m_nTabCount = 0;
+        m_sInputBuffer = m_sPrevTab;
+        m_sInputBuffer = ProcessCompletion(m_sInputBuffer.c_str());
+    }
+
+    return (char*)m_sInputBuffer.c_str();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::DisplayVarValue(ICVar* pVar)
+{
+    if (!pVar)
+    {
+        return;
+    }
+
+    const char* sFlagsString = GetFlagsString(pVar->GetFlags());
+
+    string sValue = (pVar->GetFlags() & VF_INVISIBLE) ? "" : pVar->GetString();
+    string sVar = pVar->GetName();
+
+    char szRealState[40] = "";
+
+    if (pVar->GetType() == CVAR_INT)
+    {
+        int iRealState = pVar->GetRealIVal();
+
+        if (iRealState != pVar->GetIVal())
+        {
+            if (iRealState == -1)
+            {
+                azstrcpy(szRealState, AZ_ARRAY_SIZE(szRealState), " RealState=Custom");
+            }
+            else
+            {
+                sprintf_s(szRealState, " RealState=%d", iRealState);
+            }
+        }
+    }
+
+    if (pVar->GetFlags() & VF_BITFIELD)
+    {
+        uint64 val64 = pVar->GetI64Val();
+        uint64 alphaBits = val64 & ~63LL;
+        uint32 nonAlphaBits = val64 & 63;
+
+        if (alphaBits != 0)
+        {
+            // the bottom 6 bits can't be set by char entry, so show them separately
+            char alphaChars[65];    // 1 char per bit + '\0'
+            BitsAlpha64(alphaBits, alphaChars);
+            sValue += " (";
+            if (nonAlphaBits != 0)
+            {
+                char nonAlphaChars[3];  // 1..63 + '\0'
+                sValue += azitoa(nonAlphaBits, nonAlphaChars, AZ_ARRAY_SIZE(nonAlphaChars), 10);
+                sValue += ", ";
+            }
+            sValue += alphaChars;
+            sValue += ")";
+        }
+    }
+
+    if (gEnv->IsEditor())
+    {
+        ConsoleLogInputResponse("%s=%s [ %s ]%s", sVar.c_str(), sValue.c_str(), sFlagsString, szRealState);
+    }
+    else
+    {
+        ConsoleLogInputResponse("    $3%s = $6%s $5[%s]$4%s", sVar.c_str(), sValue.c_str(), sFlagsString, szRealState);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::IsOpened()
+{
+    return m_nScrollPos == m_nTempScrollMax;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::PrintLine(const char* s)
+{
+    AddLine(s);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::PrintLinePlus(const char* s)
+{
+    AddLinePlus(s);
+}
+
+static const char* FindNextEndOfLineCharacter(const char* str, size_t length)
+{
+    size_t index = 0;
+    while (index < length)
+    {
+        if ((str[index] == '\r') || (str[index] == '\n'))
+        {
+            return (str + index);
+        }
+
+        index++;
+    }
+
+    return nullptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::AddLine(const char* inputStr)
+{
+    if ((inputStr == nullptr) || (inputStr[0] == 0))
+    {
+        return;
+    }
+
+    size_t totalLen = strlen(inputStr);
+
+    // strip trailing \n or \r.
+    while ((totalLen > 0) && (inputStr[totalLen - 1] == '\n') || (inputStr[totalLen - 1] == '\r'))
+    {
+        totalLen--;
+    }
+
+    // split out each line in a memory efficient way
+    size_t remainingLength = totalLen;
+    const char* lastLine = inputStr;
+    const char* cursor = FindNextEndOfLineCharacter(inputStr, remainingLength);
+    while (cursor != nullptr)
+    {
+        size_t subStrLength = (cursor - lastLine);
+
+        PostLine(lastLine, subStrLength);
+
+        // bump us up to the cursor + 1 to move past the end of line character
+        remainingLength = remainingLength - (subStrLength + 1);
+        lastLine = (cursor + 1);
+
+        // Find the next non-end of line character
+        while ((remainingLength > 0) && ((*lastLine == '\n') || (*lastLine == '\r')))
+        {
+            remainingLength--;
+            lastLine++;
+        }
+
+        cursor = FindNextEndOfLineCharacter(lastLine, remainingLength);
+    }
+
+    // check for leftover
+    if (remainingLength > 0)
+    {
+        PostLine(lastLine, remainingLength);
+    }
+}
+
+void CXConsole::PostLine(const char* lineOfText, size_t len)
+{
+    string line;
+
+    {
+        line = string(lineOfText, len);
+        m_dqConsoleBuffer.push_back(line);
+    }
+
+    int nBufferSize = con_line_buffer_size;
+
+    while (((int)(m_dqConsoleBuffer.size())) > nBufferSize)
+    {
+        m_dqConsoleBuffer.pop_front();
+    }
+
+    // tell everyone who is interested (e.g. dedicated server printout)
+    {
+        std::vector<IOutputPrintSink*>::iterator it;
+
+        for (it = m_OutputSinks.begin(); it != m_OutputSinks.end(); ++it)
+        {
+            (*it)->Print(line.c_str());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ResetProgressBar(int)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::TickProgressBar()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::SetLoadingImage(const char*)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::AddOutputPrintSink(IOutputPrintSink* inpSink)
+{
+    assert(inpSink);
+    m_OutputSinks.push_back(inpSink);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::RemoveOutputPrintSink(IOutputPrintSink* inpSink)
+{
+    assert(inpSink);
+
+    int nCount = m_OutputSinks.size();
+
+    for (int i = 0; i < nCount; i++)
+    {
+        if (m_OutputSinks[i] == inpSink)
+        {
+            if (nCount <= 1)
+            {
+                m_OutputSinks.clear();
+            }
+            else
+            {
+                m_OutputSinks[i] = m_OutputSinks.back();
+                m_OutputSinks.pop_back();
+            }
+            return;
+        }
+    }
+
+    assert(0);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::AddLinePlus(const char* inputStr)
+{
+    string str, tmpStr;
+
+    {
+        if (!m_dqConsoleBuffer.size())
+        {
+            return;
+        }
+
+        str = inputStr;
+
+        // strip trailing \n or \r.
+        if (!str.empty() && (str[str.size() - 1] == '\n' || str[str.size() - 1] == '\r'))
+        {
+            str.resize(str.size() - 1);
+        }
+
+        string::size_type nPos;
+        while ((nPos = str.find('\n')) != string::npos)
+        {
+            str.replace(nPos, 1, 1, ' ');
+        }
+
+        while ((nPos = str.find('\r')) != string::npos)
+        {
+            str.replace(nPos, 1, 1, ' ');
+        }
+
+        tmpStr = m_dqConsoleBuffer.back();// += str;
+
+        m_dqConsoleBuffer.pop_back();
+
+        if (tmpStr.size() < 256)
+        {
+            m_dqConsoleBuffer.push_back(tmpStr + str);
+        }
+        else
+        {
+            m_dqConsoleBuffer.push_back(tmpStr);
+        }
+    }
+
+    // tell everyone who is interested (e.g. dedicated server printout)
+    {
+        std::vector<IOutputPrintSink*>::iterator it;
+
+        for (it = m_OutputSinks.begin(); it != m_OutputSinks.end(); ++it)
+        {
+            (*it)->Print((tmpStr + str).c_str());
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::AddInputUTF8(const AZStd::string& textUTF8)
+{
+    // Ignore control characters like backspace and tab
+    AZStd::string textUTF8ToInsert;
+    for (int i = 0; i < textUTF8.length(); ++i)
+    {
+        const char charToInsert = textUTF8.at(i);
+        if (!AZStd::is_cntrl(charToInsert))
+        {
+            textUTF8ToInsert += charToInsert;
+        }
+    }
+
+    const char* utf8_buf = textUTF8ToInsert.c_str();
+
+    if (m_nCursorPos < (int)(m_sInputBuffer.length()))
+    {
+        m_sInputBuffer.insert(m_nCursorPos, utf8_buf);
+    }
+    else
+    {
+        m_sInputBuffer = m_sInputBuffer + utf8_buf;
+    }
+    m_nCursorPos += strlen(utf8_buf);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ExecuteInputBuffer()
+{
+    string sTemp = m_sInputBuffer;
+    if (m_sInputBuffer.empty())
+    {
+        return;
+    }
+    m_sInputBuffer = "";
+
+    AddCommandToHistory(sTemp.c_str());
+
+    {
+        ExecuteStringInternal(sTemp.c_str(), true);     // from console
+    }
+
+    m_nCursorPos = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::RemoveInputChar(bool bBackSpace)
+{
+    if (m_sInputBuffer.empty())
+    {
+        return;
+    }
+
+    if (bBackSpace)
+    {
+        if (m_nCursorPos > 0)
+        {
+            const char* const pBase = m_sInputBuffer.c_str();
+            const char* pCursor = pBase + m_nCursorPos;
+            const char* const pEnd = pCursor;
+            Unicode::CIterator<const char*, false> pUnicode(pCursor);
+            pUnicode--; // Remove one UCS code-point, doesn't account for combining diacritics
+            pCursor = pUnicode.GetPosition();
+            size_t length = pEnd - pCursor;
+            m_sInputBuffer.erase(pCursor - pBase, length);
+            m_nCursorPos -= length;
+        }
+    }
+    else
+    {
+        if (m_nCursorPos < (int)(m_sInputBuffer.length()))
+        {
+            const char* const pBase = m_sInputBuffer.c_str();
+            const char* pCursor = pBase + m_nCursorPos;
+            const char* const pBegin = pCursor;
+            Unicode::CIterator<const char*, false> pUnicode(pCursor);
+            pUnicode--; // Remove one UCS code-point, doesn't account for combining diacritics
+            pCursor = pUnicode.GetPosition();
+            size_t length = pCursor - pBegin;
+            m_sInputBuffer.erase(pBegin - pBase, length);
+        }
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::AddCommandToHistory(const char* szCommand)
+{
+    assert(szCommand);
+
+    m_nHistoryPos = -1;
+
+    if (!m_dqHistory.empty())
+    {
+        // add only if the command is != than the last
+        if (m_dqHistory.front() != szCommand)
+        {
+            m_dqHistory.push_front(szCommand);
+        }
+    }
+    else
+    {
+        m_dqHistory.push_front(szCommand);
+    }
+
+    while (m_dqHistory.size() > MAX_HISTORY_ENTRIES)
+    {
+        m_dqHistory.pop_back();
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::Copy()
+{
+#ifdef AZ_PLATFORM_WINDOWS
+    if (m_sInputBuffer.empty())
+    {
+        return;
+    }
+
+    if (!OpenClipboard(NULL))
+    {
+        return;
+    }
+
+    size_t stringLength = m_sInputBuffer.length();
+    size_t requiredBufferSize = stringLength + 1; // for the null
+
+    if (HGLOBAL hGlobal = GlobalAlloc(GHND, requiredBufferSize))
+    {
+        if (LPVOID  pGlobal = GlobalLock(hGlobal))
+        {
+            azstrcpy((char*)pGlobal, requiredBufferSize, m_sInputBuffer.c_str());
+            GlobalUnlock(hGlobal);
+            EmptyClipboard();
+            SetClipboardData(CF_TEXT, hGlobal);
+            CloseClipboard();
+        }
+    }
+
+    return;
+#endif //AZ_PLATFORM_WINDOWS
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::Paste()
+{
+#if defined(AZ_PLATFORM_WINDOWS)
+    if (OpenClipboard(NULL) != 0)
+    {
+        wstring data;
+        const HANDLE wideData = GetClipboardData(CF_UNICODETEXT);
+        if (wideData)
+        {
+            const LPCWSTR pWideData = (LPCWSTR)GlobalLock(wideData);
+            if (pWideData)
+            {
+                // Note: This conversion is just to make sure we discard malicious or malformed data
+                Unicode::ConvertSafe<Unicode::eErrorRecovery_Discard>(data, pWideData);
+                GlobalUnlock(wideData);
+            }
+        }
+        CloseClipboard();
+
+        for (Unicode::CIterator<wstring::const_iterator> it(data.begin(), data.end()); it != data.end(); ++it)
+        {
+            const uint32 cp = *it;
+            if (cp != '\r')
+            {
+                // Convert UCS code-point into UTF-8 string
+                char utf8_buf[5];
+                Unicode::Convert(utf8_buf, cp);
+                AddInputUTF8(utf8_buf);
+            }
+        }
+    }
+#endif //AZ_PLATFORM_WINDOWS
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+int CXConsole::GetNumVars()
+{
+    return (int)m_mapVariables.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CXConsole::GetNumVisibleVars()
+{
+    int numVars = 0;
+
+    for (auto& v : m_mapVariables)
+    {
+        if ((v.second->GetFlags() & VF_INVISIBLE) == 0)
+            ++numVars;
+    }
+
+    return numVars;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::IsHashCalculated()
+{
+    return m_bCheatHashDirty == false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CXConsole::GetNumCheatVars()
+{
+    return m_randomCheckedVariables.size();
+}
+
+//////////////////////////////////////////////////////////////////////////
+uint64 CXConsole::GetCheatVarHash()
+{
+    return m_nCheatHash;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::SetCheatVarHashRange(size_t firstVar, size_t lastVar)
+{
+    // check inputs are sane
+#if !defined(NDEBUG)
+    size_t numVars = GetNumCheatVars();
+    assert(firstVar < numVars && lastVar < numVars && lastVar >= firstVar);
+#endif
+
+#if defined(DEFENCE_CVAR_HASH_LOGGING)
+    if (m_bCheatHashDirty)
+    {
+        CryLog("HASHING: WARNING - trying to set up new cvar hash range while existing hash still calculating!");
+    }
+#endif
+
+    m_nCheatHashRangeFirst = firstVar;
+    m_nCheatHashRangeLast = lastVar;
+    m_bCheatHashDirty = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::CalcCheatVarHash()
+{
+    if (!m_bCheatHashDirty)
+    {
+        return;
+    }
+
+    CCrc32 runningNameCrc32;
+    CCrc32 runningNameValueCrc32;
+
+    AddCVarsToHash(m_randomCheckedVariables.begin() + m_nCheatHashRangeFirst, m_randomCheckedVariables.begin() + m_nCheatHashRangeLast, runningNameCrc32, runningNameValueCrc32);
+    AddCVarsToHash(m_alwaysCheckedVariables.begin(), m_alwaysCheckedVariables.end() - 1, runningNameCrc32, runningNameValueCrc32);
+
+    // store hash
+    m_nCheatHash = (((uint64)runningNameCrc32.Get()) << 32) | runningNameValueCrc32.Get();
+    m_bCheatHashDirty = false;
+
+#if defined(DEFENCE_CVAR_HASH_LOGGING)
+    if (!gEnv->IsDedicated())
+    {
+        CryLog("HASHING: Range %d->%d = %llx(%x,%x), max cvars = %d", m_nCheatHashRangeFirst, m_nCheatHashRangeLast,
+            m_nCheatHash, runningNameCrc32.Get(), runningNameValueCrc32.Get(),
+            GetNumCheatVars());
+        PrintCheatVars(true);
+    }
+#endif
+}
+
+void CXConsole::AddCVarsToHash(ConsoleVariablesVector::const_iterator begin, ConsoleVariablesVector::const_iterator end, CCrc32& runningNameCrc32, CCrc32& runningNameValueCrc32)
+{
+    for (ConsoleVariablesVector::const_iterator it = begin; it <= end; ++it)
+    {
+        // add name & variable to string. We add both since adding only the value could cause
+        // many collisions with variables all having value 0 or all 1.
+        string hashStr = it->first;
+
+        runningNameCrc32.Add(hashStr.c_str(), hashStr.length());
+        hashStr += it->second->GetDataProbeString();
+        runningNameValueCrc32.Add(hashStr.c_str(), hashStr.length());
+    }
+}
+
+void CXConsole::CmdDumpAllAnticheatVars([[maybe_unused]] IConsoleCmdArgs* pArgs)
+{
+#if defined(DEFENCE_CVAR_HASH_LOGGING)
+    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
+
+    if (pConsole->IsHashCalculated())
+    {
+        CryLog("HASHING: Displaying Full Anticheat Cvar list:");
+        pConsole->PrintCheatVars(false);
+    }
+    else
+    {
+        CryLogAlways("DumpAllAnticheatVars - cannot complete, cheat vars are in a state of flux, please retry.");
+    }
+#endif
+}
+
+void CXConsole::CmdDumpLastHashedAnticheatVars([[maybe_unused]] IConsoleCmdArgs* pArgs)
+{
+#if defined(DEFENCE_CVAR_HASH_LOGGING)
+    CXConsole* pConsole = (CXConsole*)gEnv->pConsole;
+
+    if (pConsole->IsHashCalculated())
+    {
+        CryLog("HASHING: Displaying Last Hashed Anticheat Cvar list:");
+        pConsole->PrintCheatVars(true);
+    }
+    else
+    {
+        CryLogAlways("DumpLastHashedAnticheatVars - cannot complete, cheat vars are in a state of flux, please retry.");
+    }
+#endif
+}
+
+void CXConsole::PrintCheatVars([[maybe_unused]] bool bUseLastHashRange)
+{
+#if defined(DEFENCE_CVAR_HASH_LOGGING)
+    if (m_bCheatHashDirty)
+    {
+        return;
+    }
+
+    size_t i = 0;
+    char floatFormatBuf[64];
+
+    size_t nStart = 0;
+    size_t nEnd = m_mapVariables.size();
+
+    if (bUseLastHashRange)
+    {
+        nStart = m_nCheatHashRangeFirst;
+        nEnd = m_nCheatHashRangeLast;
+    }
+
+    // iterate over all const cvars in our range
+    // then hash the string.
+    CryLog("VF_CHEAT & ~VF_CHEAT_NOCHECK list:");
+
+    ConsoleVariablesMap::const_iterator it, end = m_mapVariables.end();
+    for (it = m_mapVariables.begin(); it != end; ++it)
+    {
+        // only count cheat cvars
+        if ((it->second->GetFlags() & VF_CHEAT) == 0 ||
+            (it->second->GetFlags() & VF_CHEAT_NOCHECK) != 0)
+        {
+            continue;
+        }
+
+        // count up
+        i++;
+
+        // if we haven't reached the first var, or have passed the last var, break out
+        if (i - 1 < nStart)
+        {
+            continue;
+        }
+        if (i - 1 > nEnd)
+        {
+            break;
+        }
+
+        // add name & variable to string. We add both since adding only the value could cause
+        // many collisions with variables all having value 0 or all 1.
+        string hashStr = it->first;
+        if (it->second->GetType() == CVAR_FLOAT)
+        {
+            sprintf(floatFormatBuf, "%.1g", it->second->GetFVal());
+            hashStr += floatFormatBuf;
+        }
+        else
+        {
+            hashStr += it->second->GetString();
+        }
+
+        CryLog("%s", hashStr.c_str());
+    }
+
+    // iterate over any must-check variables
+    CryLog("VF_CHEAT_ALWAYS_CHECK list:");
+
+    for (it = m_mapVariables.begin(); it != end; ++it)
+    {
+        // only count cheat cvars
+        if ((it->second->GetFlags() & VF_CHEAT_ALWAYS_CHECK) == 0)
+        {
+            continue;
+        }
+
+        // add name & variable to string. We add both since adding only the value could cause
+        // many collisions with variables all having value 0 or all 1.
+        string hashStr = it->first;
+        hashStr += it->second->GetString();
+
+        CryLog("%s", hashStr.c_str());
+    }
+#endif
+}
+
+char* CXConsole::GetCheatVarAt(uint32 nOffset)
+{
+    if (m_bCheatHashDirty)
+    {
+        return NULL;
+    }
+
+    size_t i = 0;
+    size_t nStart = nOffset;
+
+    // iterate over all const cvars in our range
+    // then hash the string.
+    ConsoleVariablesMap::const_iterator it, end = m_mapVariables.end();
+    for (it = m_mapVariables.begin(); it != end; ++it)
+    {
+        // only count cheat cvars
+        if ((it->second->GetFlags() & VF_CHEAT) == 0 ||
+            (it->second->GetFlags() & VF_CHEAT_NOCHECK) != 0)
+        {
+            continue;
+        }
+
+        // count up
+        i++;
+
+        // if we haven't reached the first var continue
+        if (i - 1 < nStart)
+        {
+            continue;
+        }
+
+        return (char*)it->first;
+    }
+
+    return NULL;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+size_t CXConsole::GetSortedVars(const char** pszArray, size_t numItems, const char* szPrefix)
+{
+    size_t i = 0;
+    size_t iPrefixLen = szPrefix ? strlen(szPrefix) : 0;
+
+    // variables
+    {
+        ConsoleVariablesMap::const_iterator it, end = m_mapVariables.end();
+        for (it = m_mapVariables.begin(); it != end; ++it)
+        {
+            if (pszArray && i >= numItems)
+            {
+                break;
+            }
+
+            if (szPrefix)
+            {
+                if (_strnicmp(it->first, szPrefix, iPrefixLen) != 0)
+                {
+                    continue;
+                }
+            }
+
+            if (it->second->GetFlags() & VF_INVISIBLE)
+            {
+                continue;
+            }
+
+            if (pszArray)
+            {
+                pszArray[i] = it->first;
+            }
+
+            i++;
+        }
+    }
+
+    // commands
+    {
+        ConsoleCommandsMap::iterator it, end = m_mapCommands.end();
+        for (it = m_mapCommands.begin(); it != end; ++it)
+        {
+            if (pszArray && i >= numItems)
+            {
+                break;
+            }
+
+            if (szPrefix)
+            {
+                if (_strnicmp(it->first.c_str(), szPrefix, iPrefixLen) != 0)
+                {
+                    continue;
+                }
+            }
+
+            if (it->second.m_nFlags & VF_INVISIBLE)
+            {
+                continue;
+            }
+
+            if (pszArray)
+            {
+                pszArray[i] = it->first.c_str();
+            }
+
+            i++;
+        }
+    }
+
+    if (i != 0 && pszArray)
+    {
+        std::sort(pszArray, pszArray + i, less_CVar);
+    }
+
+    return i;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::FindVar(const char* substr)
+{
+    std::vector<const char*> cmds;
+    cmds.resize(GetNumVars() + m_mapCommands.size());
+    size_t cmdCount = GetSortedVars(&cmds[0], cmds.size());
+
+    for (size_t i = 0; i < cmdCount; i++)
+    {
+        if (CryStringUtils::stristr(cmds[i], substr))
+        {
+            ICVar* pCvar = gEnv->pConsole->GetCVar(cmds[i]);
+            if (pCvar)
+            {
+                DisplayVarValue(pCvar);
+            }
+            else
+            {
+                ConsoleLogInputResponse("    $3%s $6(Command)", cmds[i]);
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CXConsole::AutoComplete(const char* substr)
+{
+    // following code can be optimized
+
+    std::vector<const char*> cmds;
+    cmds.resize(GetNumVars() + m_mapCommands.size());
+    size_t cmdCount = GetSortedVars(&cmds[0], cmds.size());
+
+    size_t substrLen = strlen(substr);
+
+    // If substring is empty return first command.
+    if (substrLen == 0 && cmdCount > 0)
+    {
+        return cmds[0];
+    }
+
+    // find next
+    for (size_t i = 0; i < cmdCount; i++)
+    {
+        const char* szCmd = cmds[i];
+        size_t cmdlen = strlen(szCmd);
+        if (cmdlen >= substrLen && memcmp(szCmd, substr, substrLen) == 0)
+        {
+            if (substrLen == cmdlen)
+            {
+                i++;
+                if (i < cmdCount)
+                {
+                    return cmds[i];
+                }
+                return cmds[i - 1];
+            }
+            return cmds[i];
+        }
+    }
+
+    // then first matching case insensitive
+    for (size_t i = 0; i < cmdCount; i++)
+    {
+        const char* szCmd = cmds[i];
+
+        size_t cmdlen = strlen(szCmd);
+        if (cmdlen >= substrLen && azmemicmp(szCmd, substr, substrLen) == 0)
+        {
+            if (substrLen == cmdlen)
+            {
+                i++;
+                if (i < cmdCount)
+                {
+                    return cmds[i];
+                }
+                return cmds[i - 1];
+            }
+            return cmds[i];
+        }
+    }
+
+    // Not found.
+    return "";
+}
+
+void CXConsole::SetInputLine(const char* szLine)
+{
+    assert(szLine);
+
+    m_sInputBuffer = szLine;
+    m_nCursorPos = m_sInputBuffer.size();
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+const char* CXConsole::AutoCompletePrev(const char* substr)
+{
+    std::vector<const char*> cmds;
+    cmds.resize(GetNumVars() + m_mapCommands.size());
+    size_t cmdCount = GetSortedVars(&cmds[0], cmds.size());
+
+    // If substring is empty return last command.
+    if (strlen(substr) == 0 && cmds.size() > 0)
+    {
+        return cmds[cmdCount - 1];
+    }
+
+    for (unsigned int i = 0; i < cmdCount; i++)
+    {
+        if (azstricmp(substr, cmds[i]) == 0)
+        {
+            if (i > 0)
+            {
+                return cmds[i - 1];
+            }
+            else
+            {
+                return cmds[0];
+            }
+        }
+    }
+    return AutoComplete(substr);
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline size_t sizeOf (const string& str)
+{
+    return str.capacity() + 1;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline size_t sizeOf (const char* sz)
+{
+    return sz ? strlen(sz) + 1 : 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::GetMemoryUsage (class ICrySizer* pSizer) const
+{
+    pSizer->AddObject(this, sizeof(*this));
+    pSizer->AddObject(m_sInputBuffer);
+    pSizer->AddObject(m_sPrevTab);
+    pSizer->AddObject(m_dqConsoleBuffer);
+    pSizer->AddObject(m_dqHistory);
+    pSizer->AddObject(m_mapCommands);
+    pSizer->AddObject(m_mapBinds);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ConsoleLogInputResponse(const char* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    gEnv->pLog->LogV(ILog::eInputResponse, format, args);
+    va_end(args);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ConsoleLogInput(const char* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    gEnv->pLog->LogV(ILog::eInput, format, args);
+    va_end(args);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ConsoleWarning(const char* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    gEnv->pLog->LogV(ILog::eWarningAlways, format, args);
+    va_end(args);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::OnBeforeVarChange(ICVar* pVar, const char* sNewValue)
+{
+    bool isConst = pVar->IsConstCVar();
+    bool isCheat = ((pVar->GetFlags() & (VF_CHEAT | VF_CHEAT_NOCHECK | VF_CHEAT_ALWAYS_CHECK)) != 0);
+    bool isReadOnly = ((pVar->GetFlags() & VF_READONLY) != 0);
+    bool isDeprecated = ((pVar->GetFlags() & VF_DEPRECATED) != 0);
+
+    if (
+#if CVAR_GROUPS_ARE_PRIVILEGED
+        !m_bIsProcessingGroup &&
+#endif // !CVAR_GROUPS_ARE_PRIVILEGED
+        (isConst || isCheat || isReadOnly || isDeprecated))
+    {
+        bool allowChange = !isDeprecated && ((gEnv->pSystem->IsDevMode()) || (gEnv->IsEditor()));
+        if (!(gEnv->IsEditor()) || isDeprecated)
+        {
+#if LOG_CVAR_INFRACTIONS
+            LogChangeMessage(pVar->GetName(), isConst, isCheat,
+                isReadOnly, isDeprecated, pVar->GetString(), sNewValue, m_bIsProcessingGroup, allowChange);
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+            gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+#endif // LOG_CVAR_INFRACTIONS
+        }
+
+        if (!allowChange && !ALLOW_CONST_CVAR_MODIFICATIONS)
+        {
+            return false;
+        }
+    }
+
+    if (!m_consoleVarSinks.empty())
+    {
+        ConsoleVarSinks::iterator it, next;
+        for (it = m_consoleVarSinks.begin(); it != m_consoleVarSinks.end(); it = next)
+        {
+            next = it;
+            next++;
+            if (!(*it)->OnBeforeVarChange(pVar, sNewValue))
+            {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::OnAfterVarChange(ICVar* pVar)
+{
+    if (!m_consoleVarSinks.empty())
+    {
+        ConsoleVarSinks::iterator it, next;
+        for (it = m_consoleVarSinks.begin(); it != m_consoleVarSinks.end(); it = next)
+        {
+            next = it;
+            next++;
+            (*it)->OnAfterVarChange(pVar);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole_ExecuteCommandTrampoline(IConsoleCmdArgs* args)
+{
+    if (gEnv && gEnv->pSystem && gEnv->pSystem->GetIConsole())
+    {
+        CXConsole* pConsole = static_cast<CXConsole*>(gEnv->pSystem->GetIConsole());
+        pConsole->ExecuteRegisteredCommand(args);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::ExecuteRegisteredCommand(IConsoleCmdArgs* args)
+{
+    if (args->GetArgCount() == 0)
+    {
+        AZ_Error("console", false, "Invalid number of args sent");
+        return;
+    }
+
+    const char* commandIdentifier = args->GetArg(0);
+    auto itCommandEntry = m_commandRegistrationMap.find(commandIdentifier);
+    if (itCommandEntry == m_commandRegistrationMap.end())
+    {
+        AZ_Error("console", false, "Command %s not found in the command registry", commandIdentifier);
+        return;
+    }
+
+    AZStd::vector<AZStd::string_view> input;
+    input.reserve(args->GetArgCount());
+    for (int i = 0; i < args->GetArgCount(); ++i)
+    {
+        input.push_back(args->GetArg(i));
+    }
+
+    CommandRegistrationEntry& entry = itCommandEntry->second;
+    const AzFramework::CommandResult output = entry.m_callback(input);
+    if (output != AzFramework::CommandResult::Success)
+    {
+        if (output == AzFramework::CommandResult::ErrorWrongNumberOfArguments)
+        {
+            AZ_Warning("console", false, "Command does not have the right number of arguments (send = %d)", input.size());
+        }
+        else
+        {
+            AZ_Warning("console", false, "Command returned a generic error");
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::RegisterCommand(AZStd::string_view identifier, AZStd::string_view helpText, AZ::u32 commandFlags, AzFramework::CommandFunction callback)
+{
+    if (identifier.empty())
+    {
+        AZ_Error("console", false, "RegisterCommand() requires a valid identifier");
+        return false;
+    }
+
+    if (!callback)
+    {
+        AZ_Error("console", false, "RegisterCommand() requires a valid callback");
+        return false;
+    }
+
+    if (m_commandRegistrationMap.find(identifier) != m_commandRegistrationMap.end())
+    {
+        AZ_Warning("console", false, "Command '%.*s' already found in the command registry.", static_cast<int>(identifier.size()), identifier.data());
+        return false;
+    }
+
+    // command flags should match "enum EVarFlags" values
+    const int flags = static_cast<int>(commandFlags);
+
+    CommandRegistrationEntry entry;
+    entry.m_callback = callback;
+    entry.m_id = identifier;
+    if (!helpText.empty())
+    {
+        entry.m_helpText = helpText;
+    }
+
+    if (!AddCommand(entry.m_id.c_str(), CXConsole_ExecuteCommandTrampoline, flags, entry.m_helpText.empty() ? nullptr : entry.m_helpText.c_str()))
+    {
+        AZ_Warning("console", false, "Command %s already found in the command registry.", entry.m_id.c_str());
+        return false;
+    }
+
+    m_commandRegistrationMap.insert(AZStd::make_pair(entry.m_id, entry));
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXConsole::UnregisterCommand(AZStd::string_view identifier)
+{
+    if (m_commandRegistrationMap.erase(identifier) == 1)
+    {
+        RemoveCommand(identifier.data());
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::AddConsoleVarSink(IConsoleVarSink* pSink)
+{
+    m_consoleVarSinks.push_back(pSink);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsole::RemoveConsoleVarSink(IConsoleVarSink* pSink)
+{
+    m_consoleVarSinks.remove(pSink);
+}
diff --git a/Code/Legacy/CrySystem/XConsole.h b/Code/Legacy/CrySystem/XConsole.h
new file mode 100644
index 0000000000..7f6bbe97a3
--- /dev/null
+++ b/Code/Legacy/CrySystem/XConsole.h
@@ -0,0 +1,436 @@
+/*
+ * 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_XCONSOLE_H
+#define CRYINCLUDE_CRYSYSTEM_XCONSOLE_H
+
+#pragma once
+
+#include <IConsole.h>
+#include <CryCrc32.h>
+#include "Timer.h"
+#include <AzFramework/Components/ConsoleBus.h>
+#include <AzFramework/CommandLine/CommandRegistrationBus.h>
+
+#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
+#include <AzFramework/Input/Events/InputChannelEventListener.h>
+#include <AzFramework/Input/Events/InputTextEventListener.h>
+
+//forward declaration
+struct INetwork;
+class CSystem;
+
+
+#define MAX_HISTORY_ENTRIES 50
+#define LINE_BORDER 10
+
+enum ScrollDir
+{
+    sdDOWN,
+    sdUP,
+    sdNONE
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Console command holds information about commands registered to console.
+//////////////////////////////////////////////////////////////////////////
+struct CConsoleCommand
+{
+    string m_sName;            // Console command name
+    string m_sCommand;         // lua code that is executed when this command is invoked
+    string m_sHelp;            // optional help string - can be shown in the console with "<commandname> ?"
+    int    m_nFlags;           // bitmask consist of flag starting with VF_ e.g. VF_CHEAT
+    ConsoleCommandFunc m_func; // Pointer to console command.
+
+    //////////////////////////////////////////////////////////////////////////
+    CConsoleCommand()
+        : m_func(0)
+        , m_nFlags(0) {}
+    size_t sizeofThis () const {return sizeof(*this) + m_sName.capacity() + 1 + m_sCommand.capacity() + 1; }
+    void GetMemoryUsage (class ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(m_sName);
+        pSizer->AddObject(m_sCommand);
+        pSizer->AddObject(m_sHelp);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////
+// Implements IConsoleCmdArgs.
+//////////////////////////////////////////////////////////////////////////
+struct CConsoleCommandArgs
+    : public IConsoleCmdArgs
+{
+    CConsoleCommandArgs(string& line, std::vector<string>& args)
+        : m_line(line)
+        , m_args(args) {};
+    virtual int GetArgCount() const { return m_args.size(); };
+    // Get argument by index, nIndex must be in 0 <= nIndex < GetArgCount()
+    virtual const char* GetArg(int nIndex) const
+    {
+        assert(nIndex >= 0 && nIndex < GetArgCount());
+        if (!(nIndex >= 0 && nIndex < GetArgCount()))
+        {
+            return NULL;
+        }
+        return m_args[nIndex].c_str();
+    }
+    virtual const char* GetCommandLine() const
+    {
+        return m_line.c_str();
+    }
+
+private:
+    std::vector<string>& m_args;
+    string& m_line;
+};
+
+
+
+struct string_nocase_lt
+{
+    bool operator()(const char* s1, const char* s2) const
+    {
+        return azstricmp(s1, s2) < 0;
+    }
+};
+
+/* - very dangerous to use with STL containers
+struct string_nocase_lt
+{
+    bool operator()( const char *s1,const char *s2 ) const
+    {
+        return _stricmp(s1,s2) < 0;
+    }
+    bool operator()( const string &s1,const string &s2 ) const
+    {
+        return _stricmp(s1.c_str(),s2.c_str()) < 0;
+    }
+};
+*/
+
+//forward declarations
+class ITexture;
+struct IRenderer;
+
+
+/*! engine console implementation
+    @see IConsole
+*/
+class CXConsole
+    : public IConsole
+    , public AzFramework::InputChannelEventListener
+    , public AzFramework::InputTextEventListener
+    , public IRemoteConsoleListener
+    , public AzFramework::ConsoleRequestBus::Handler
+    , public AzFramework::CommandRegistrationBus::Handler
+{
+public:
+    typedef std::deque<string> ConsoleBuffer;
+    typedef ConsoleBuffer::iterator ConsoleBufferItor;
+    typedef ConsoleBuffer::reverse_iterator ConsoleBufferRItor;
+
+    // constructor
+    CXConsole();
+    // destructor
+    virtual ~CXConsole();
+
+    void SetStatus(bool bActive){ m_bConsoleActive = bActive; }
+    bool GetStatus() const { return m_bConsoleActive; }
+    //
+    void FreeRenderResources();
+    //
+    void Copy();
+    void Paste();
+
+    // interface IConsole ---------------------------------------------------------
+    virtual void Release();
+
+    virtual void Init(ISystem* pSystem);
+    virtual ICVar* RegisterString(const char* sName, const char* sValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0);
+    virtual ICVar* RegisterInt(const char* sName, int iValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0);
+    virtual ICVar* RegisterInt64(const char* sName, int64 iValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0);
+    virtual ICVar* RegisterFloat(const char* sName, float fValue, int nFlags, const char* help = "", ConsoleVarFunc pChangeFunc = 0);
+    virtual ICVar* Register(const char* name, float* src, float defaultvalue, int flags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true);
+    virtual ICVar* Register(const char* name, int* src, int defaultvalue, int flags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true);
+    virtual ICVar* Register(const char* name, const char** src, const char* defaultvalue, int flags = 0, const char* help = "", ConsoleVarFunc pChangeFunc = 0, bool allowModify = true);
+    virtual ICVar* Register(ICVar* pVar) { RegisterVar(pVar); return pVar; }
+
+    virtual void UnregisterVariable(const char* sVarName, bool bDelete = false);
+    virtual void SetScrollMax(int value);
+    virtual void AddOutputPrintSink(IOutputPrintSink* inpSink);
+    virtual void RemoveOutputPrintSink(IOutputPrintSink* inpSink);
+    virtual void ShowConsole(bool show, int iRequestScrollMax = -1);
+    virtual void DumpCVars(ICVarDumpSink* pCallback, unsigned int nFlagsFilter = 0);
+    virtual void DumpKeyBinds(IKeyBindDumpSink* pCallback);
+    virtual void CreateKeyBind(const char* sCmd, const char* sRes);
+    virtual const char* FindKeyBind(const char* sCmd) const;
+    virtual void    SetImage(ITexture* pImage, bool bDeleteCurrent);
+    virtual inline ITexture* GetImage() { return m_pImage; }
+    virtual void StaticBackground(bool bStatic) { m_bStaticBackground = bStatic; }
+    virtual bool GetLineNo(int indwLineNo, char* outszBuffer, int indwBufferSize) const;
+    virtual int GetLineCount() const;
+    virtual ICVar* GetCVar(const char* name);
+    virtual char* GetVariable(const char* szVarName, const char* szFileName, const char* def_val);
+    virtual float GetVariable(const char* szVarName, const char* szFileName, float def_val);
+    virtual void PrintLine(const char* s);
+    virtual void PrintLinePlus(const char* s);
+    virtual bool GetStatus();
+    virtual void Clear();
+    virtual void Update();
+    virtual void Draw();
+    virtual bool AddCommand(const char* sCommand, ConsoleCommandFunc func, int nFlags = 0, const char* sHelp = NULL);
+    virtual bool AddCommand(const char* sName, const char* sScriptFunc, int nFlags = 0, const char* sHelp = NULL);
+    virtual void RemoveCommand(const char* sName);
+    virtual void ExecuteString(const char* command, bool bSilentMode, bool bDeferExecution = false);
+    virtual void ExecuteConsoleCommand(const char* command) override;
+    virtual void ResetCVarsToDefaults() override;
+    virtual void Exit(const char* command, ...) PRINTF_PARAMS(2, 3);
+    virtual bool IsOpened();
+    virtual int GetNumVars();
+    virtual int GetNumVisibleVars();
+    virtual size_t GetSortedVars(const char** pszArray, size_t numItems, const char* szPrefix = 0);
+    virtual int GetNumCheatVars();
+    virtual void SetCheatVarHashRange(size_t firstVar, size_t lastVar);
+    virtual void CalcCheatVarHash();
+    virtual bool IsHashCalculated();
+    virtual uint64 GetCheatVarHash();
+    virtual void FindVar(const char* substr);
+    virtual const char* AutoComplete(const char* substr);
+    virtual const char* AutoCompletePrev(const char* substr);
+    virtual const char* ProcessCompletion(const char* szInputBuffer);
+    virtual void RegisterAutoComplete(const char* sVarOrCommand, IConsoleArgumentAutoComplete* pArgAutoComplete);
+    virtual void UnRegisterAutoComplete(const char* sVarOrCommand);
+    virtual void ResetAutoCompletion();
+    virtual void GetMemoryUsage (ICrySizer* pSizer) const;
+    virtual void ResetProgressBar(int nProgressRange);
+    virtual void TickProgressBar();
+    virtual void SetLoadingImage(const char* szFilename);
+    virtual void AddConsoleVarSink(IConsoleVarSink* pSink);
+    virtual void RemoveConsoleVarSink(IConsoleVarSink* pSink);
+    virtual const char* GetHistoryElement(bool bUpOrDown);
+    virtual void AddCommandToHistory(const char* szCommand);
+    virtual void SetInputLine(const char* szLine);
+    virtual void LoadConfigVar(const char* sVariable, const char* sValue);
+    virtual void EnableActivationKey(bool bEnable);
+    virtual void SetClientDataProbeString(const char* pName, const char* pValue);
+
+    // InputChannelEventListener / InputTextEventListener
+    bool OnInputChannelEventFiltered(const AzFramework::InputChannel& inputChannel) override;
+    bool OnInputTextEventFiltered(const AZStd::string& textUTF8) override;
+
+    // interface IRemoteConsoleListener ------------------------------------------------------------------
+
+    virtual void OnConsoleCommand(const char* cmd);
+
+    // interface IConsoleVarSink ----------------------------------------------------------------------
+
+    virtual bool OnBeforeVarChange(ICVar* pVar, const char* sNewValue);
+    virtual void OnAfterVarChange(ICVar* pVar);
+
+    // interface CommandRegistration --------------------------------------------------------------------
+    bool RegisterCommand(AZStd::string_view identifier, AZStd::string_view helpText, AZ::u32 commandFlags, AzFramework::CommandFunction callback) override;
+    bool UnregisterCommand(AZStd::string_view identifier) override;
+    void ExecuteRegisteredCommand(IConsoleCmdArgs* pArg);
+
+    //////////////////////////////////////////////////////////////////////////
+
+    // Returns
+    //   0 if the operation failed
+    ICVar* RegisterCVarGroup(const char* sName, const char* szFileName);
+
+    virtual void PrintCheatVars(bool bUseLastHashRange);
+    virtual char* GetCheatVarAt(uint32 nOffset);
+
+    void SetProcessingGroup(bool isGroup) { m_bIsProcessingGroup = isGroup; }
+    bool GetIsProcessingGroup(void) const { return m_bIsProcessingGroup; }
+
+protected: // ----------------------------------------------------------------------------------------
+    void DrawBuffer(int nScrollPos, const char* szEffect);
+
+    void RegisterVar(ICVar* pCVar, ConsoleVarFunc pChangeFunc = 0);
+
+    bool ProcessInput(const AzFramework::InputChannel& inputChannel);
+    void AddLine(const char* inputStr);
+    void AddLinePlus(const char* inputStr);
+    void AddInputUTF8(const AZStd::string& textUTF8);
+    void RemoveInputChar(bool bBackSpace);
+    void ExecuteInputBuffer();
+    void ExecuteCommand(CConsoleCommand& cmd, string& params, bool bIgnoreDevMode = false);
+
+    void ScrollConsole();
+
+    // CommandRegistration usage
+    struct CommandRegistrationEntry
+    {
+        AzFramework::CommandFunction m_callback;
+        AZStd::string m_id;
+        AZStd::string m_helpText;
+    };
+    AZStd::unordered_map<AZStd::string, CommandRegistrationEntry> m_commandRegistrationMap;
+
+#if ALLOW_AUDIT_CVARS
+    void AuditCVars(IConsoleCmdArgs* pArg);
+#endif // ALLOW_AUDIT_CVARS
+
+#ifndef _RELEASE
+    // will be removed once the HTML version is good enough
+    void DumpCommandsVarsTxt(const char* prefix);
+    void DumpVarsTxt(const bool includeCheat);
+#endif
+
+    void ConsoleLogInputResponse(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
+    void ConsoleLogInput(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
+    void ConsoleWarning(const char* szFormat, ...) PRINTF_PARAMS(2, 3);
+
+    void DisplayHelp(const char* help, const char* name);
+    void DisplayVarValue(ICVar* pVar);
+
+    // Arguments:
+    //   bFromConsole - true=from console, false=from outside
+    void SplitCommands(const char* line, std::list<string>& split);
+    void ExecuteStringInternal(const char* command, const bool bFromConsole, const bool bSilentMode = false);
+    void ExecuteDeferredCommands();
+
+    static const char* GetFlagsString(const uint32 dwFlags);
+
+    static void CmdDumpAllAnticheatVars(IConsoleCmdArgs* pArgs);
+    static void CmdDumpLastHashedAnticheatVars(IConsoleCmdArgs* pArgs);
+
+private: // ----------------------------------------------------------
+
+    typedef std::map<const char*, ICVar*, string_nocase_lt> ConsoleVariablesMap;        // key points into string stored in ICVar or in .exe/.dll
+    typedef ConsoleVariablesMap::iterator ConsoleVariablesMapItor;
+
+    typedef std::vector<std::pair<const char*, ICVar*> > ConsoleVariablesVector;
+
+    void LogChangeMessage(const char* name, const bool isConst, const bool isCheat, const bool isReadOnly, const bool isDeprecated,
+        const char* oldValue, const char* newValue, const bool isProcessingGroup, const bool allowChange);
+
+    void AddCheckedCVar(ConsoleVariablesVector& vector, const ConsoleVariablesVector::value_type& value);
+    void RemoveCheckedCVar(ConsoleVariablesVector& vector, const ConsoleVariablesVector::value_type& value);
+    static void AddCVarsToHash(ConsoleVariablesVector::const_iterator begin, ConsoleVariablesVector::const_iterator end, CCrc32& runningNameCrc32, CCrc32& runningNameValueCrc32);
+    static bool CVarNameLess(const std::pair<const char*, ICVar*>& lhs, const std::pair<const char*, ICVar*>& rhs);
+
+    void PostLine(const char* lineOfText, size_t len);
+
+    typedef std::map<string, CConsoleCommand, string_nocase_lt> ConsoleCommandsMap;
+    typedef ConsoleCommandsMap::iterator ConsoleCommandsMapItor;
+
+    typedef std::map<string, string> ConsoleBindsMap;
+    typedef ConsoleBindsMap::iterator ConsoleBindsMapItor;
+
+    typedef std::map<string, IConsoleArgumentAutoComplete*, stl::less_stricmp<string> > ArgumentAutoCompleteMap;
+
+    struct SConfigVar
+    {
+        string m_value;
+        bool m_partOfGroup;
+    };
+    typedef std::map<string, SConfigVar, string_nocase_lt> ConfigVars;
+
+    struct SDeferredCommand
+    {
+        string  command;
+        bool        silentMode;
+
+        SDeferredCommand(const string& _command, bool _silentMode)
+            : command(_command)
+            , silentMode(_silentMode)
+        {}
+    };
+    typedef std::list<SDeferredCommand> TDeferredCommandList;
+
+    typedef std::list<IConsoleVarSink*> ConsoleVarSinks;
+
+    // --------------------------------------------------------------------------------
+
+    ConsoleBuffer                                       m_dqConsoleBuffer;
+    ConsoleBuffer                                       m_dqHistory;
+
+    bool                                                        m_bStaticBackground;
+    int                                                         m_nLoadingBackTexID;
+    int                                                         m_nProgress;
+    int                                                         m_nProgressRange;
+
+    string                                                  m_sInputBuffer;
+    string                          m_sReturnString;
+
+    string                                                  m_sPrevTab;
+    int                                                         m_nTabCount;
+
+    ConsoleCommandsMap                          m_mapCommands;                      //
+    ConsoleBindsMap                                 m_mapBinds;                             //
+    ConsoleVariablesMap                         m_mapVariables;                     //
+    ConsoleVariablesVector          m_randomCheckedVariables;
+    ConsoleVariablesVector          m_alwaysCheckedVariables;
+    std::vector<IOutputPrintSink*> m_OutputSinks;                       // objects in this vector are not released
+
+    TDeferredCommandList                        m_deferredCommands;             // A fifo of deferred commands
+    bool                                                        m_deferredExecution;            // True when deferred commands are processed
+    int                                                         m_waitFrames;                           // A counter which is used by wait_frames command
+    CTimeValue                                          m_waitSeconds;                      // An absolute timestamp which is used by wait_seconds command
+    int                                                         m_blockCounter;                     // This counter is incremented whenever a blocker command (VF_BLOCKFRAME) is executed.
+
+    ArgumentAutoCompleteMap         m_mapArgumentAutoComplete;
+
+    ConsoleVarSinks                                 m_consoleVarSinks;
+
+    ConfigVars                                          m_configVars;                           // temporary data of cvars that haven't been created yet
+
+    int                                                         m_nScrollPos;
+    int                                                         m_nTempScrollMax;                   // for currently opened console, reset to m_nScrollMax
+    int                                                         m_nScrollMax;                           //
+    int                                                         m_nScrollLine;
+    int                                                         m_nHistoryPos;
+    size_t                                                      m_nCursorPos;                           // x position in characters
+    ITexture*                                               m_pImage;
+
+    float                                                       m_fRepeatTimer;                     // relative, next repeat even in .. decreses over time, repeats when 0, only valid if m_nRepeatEvent.keyId != eKI_Unknown
+    AzFramework::InputChannelId                                 m_nRepeatEventId;                     // event that will be repeated
+
+    float                                                       m_fCursorBlinkTimer;            // relative, increases over time,
+    bool                                                        m_bDrawCursor;
+
+    ScrollDir                                               m_sdScrollDir;
+
+
+    AzFramework::SystemCursorState                              m_previousSystemCursorState;
+    bool                                                        m_bConsoleActive;
+    bool                                                        m_bActivationKeyEnable;
+    bool                                                        m_bIsProcessingGroup;
+    bool m_bIsConsoleKeyPressed;
+
+    size_t                          m_nCheatHashRangeFirst;
+    size_t                          m_nCheatHashRangeLast;
+    bool                            m_bCheatHashDirty;
+    uint64                          m_nCheatHash;
+
+    CSystem*                                               m_pSystem;
+    IFFont*                                                m_pFont;
+    ITimer*                                                m_pTimer;
+
+    ICVar*                                                 m_pSysDeactivateConsole;
+
+    static int con_display_last_messages;
+    static int con_line_buffer_size;
+    static int con_showonload;
+    static int con_debug;
+    static int con_restricted;
+
+    friend void Command_SetWaitSeconds(IConsoleCmdArgs* Cmd);
+    friend void Command_SetWaitFrames(IConsoleCmdArgs* Cmd);
+#if ALLOW_AUDIT_CVARS
+    friend void Command_AuditCVars(IConsoleCmdArgs* pArg);
+#endif // ALLOW_AUDIT_CVARS
+    friend void Command_DumpCommandsVars(IConsoleCmdArgs* Cmd);
+    friend void Command_DumpVars(IConsoleCmdArgs* Cmd);
+    friend class CConsoleHelpGen;
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_XCONSOLE_H
diff --git a/Code/Legacy/CrySystem/XConsoleVariable.cpp b/Code/Legacy/CrySystem/XConsoleVariable.cpp
new file mode 100644
index 0000000000..79c674c9a8
--- /dev/null
+++ b/Code/Legacy/CrySystem/XConsoleVariable.cpp
@@ -0,0 +1,735 @@
+/*
+ * 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 : implementation of the CXConsoleVariable class.
+
+
+#include "CrySystem_precompiled.h"
+#include "XConsole.h"
+#include "XConsoleVariable.h"
+
+#include <IConsole.h>
+#include <ISystem.h>
+
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+CXConsoleVariableBase::CXConsoleVariableBase(CXConsole* pConsole, const char* sName, int nFlags, const char* help)
+    : m_valueMin(0.0f)
+    , m_valueMax(100.0f)
+    , m_hasCustomLimits(false)
+{
+    assert(pConsole);
+
+    m_psHelp = (char*)help;
+    m_pChangeFunc = NULL;
+
+    m_pConsole = pConsole;
+
+    m_nFlags = nFlags;
+
+    if (nFlags & VF_COPYNAME)
+    {
+        m_szName = new char[strlen(sName) + 1];
+        azstrcpy(m_szName, strlen(sName) + 1, sName);
+    }
+    else
+    {
+        m_szName = (char*)sName;
+    }
+
+    if (gEnv->IsDedicated())
+    {
+        m_pDataProbeString = NULL;
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CXConsoleVariableBase::~CXConsoleVariableBase()
+{
+    if (m_nFlags & VF_COPYNAME)
+    {
+        delete[] m_szName;
+    }
+
+    if (gEnv->IsDedicated() && m_pDataProbeString)
+    {
+        delete[] m_pDataProbeString;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsoleVariableBase::ForceSet(const char* s)
+{
+    int excludeFlags = (VF_CHEAT | VF_READONLY | VF_NET_SYNCED);
+    int oldFlags = (m_nFlags & excludeFlags);
+    m_nFlags &= ~(excludeFlags);
+    Set(s);
+    m_nFlags |= oldFlags;
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+void CXConsoleVariableBase::ClearFlags (int flags)
+{
+    m_nFlags &= ~flags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CXConsoleVariableBase::GetFlags() const
+{
+    return m_nFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CXConsoleVariableBase::SetFlags(int flags)
+{
+    m_nFlags = flags;
+    return m_nFlags;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CXConsoleVariableBase::GetName() const
+{
+    return m_szName;
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CXConsoleVariableBase::GetHelp()
+{
+    return m_psHelp;
+}
+
+void CXConsoleVariableBase::Release()
+{
+    m_pConsole->UnregisterVariable(m_szName);
+}
+
+void CXConsoleVariableBase::SetOnChangeCallback(ConsoleVarFunc pChangeFunc)
+{
+    m_pChangeFunc = pChangeFunc;
+}
+
+uint64 CXConsoleVariableBase::AddOnChangeFunctor(const SFunctor& pChangeFunctor)
+{
+    static int uniqueIdGenerator = 0;
+    int newId = uniqueIdGenerator++;
+    m_changeFunctors.push_back(std::make_pair(newId, pChangeFunctor));
+    return newId;
+}
+
+uint64 CXConsoleVariableBase::GetNumberOfOnChangeFunctors() const
+{
+    return m_changeFunctors.size();
+}
+
+const SFunctor& CXConsoleVariableBase::GetOnChangeFunctor(uint64 nFunctorId) const
+{
+    auto predicate = [nFunctorId](const std::pair<int, SFunctor>& entry) -> bool { return entry.first == nFunctorId; };
+    auto changeFunctor = std::find_if(m_changeFunctors.begin(), m_changeFunctors.end(), predicate);
+    if (changeFunctor != m_changeFunctors.end())
+    {
+        return (*changeFunctor).second;
+    }
+
+    static SFunctor sDummyFunctor;
+    assert(false && "[CXConsoleVariableBase::GetOnChangeFunctor] Trying to get a functor for an id that does not exist.");
+
+    return sDummyFunctor;
+}
+
+bool CXConsoleVariableBase::RemoveOnChangeFunctor(const uint64 nFunctorId)
+{
+    auto predicate = [nFunctorId](const std::pair<int, SFunctor>& entry) -> bool { return entry.first == nFunctorId; };
+    auto changeFunctor = std::find_if(m_changeFunctors.begin(), m_changeFunctors.end(), predicate);
+
+    if (changeFunctor != m_changeFunctors.end())
+    {
+        m_changeFunctors.erase(changeFunctor);
+        return true;
+    }
+
+    return false;
+}
+
+ConsoleVarFunc CXConsoleVariableBase::GetOnChangeCallback() const
+{
+    return m_pChangeFunc;
+}
+
+void CXConsoleVariableBase::CallOnChangeFunctions()
+{
+    if (m_pChangeFunc)
+    {
+        m_pChangeFunc(this);
+    }
+
+    const size_t nTotal(m_changeFunctors.size());
+    for (size_t nCount = 0; nCount < nTotal; ++nCount)
+    {
+        m_changeFunctors[nCount].second.Call();
+    }
+}
+
+void CXConsoleVariableBase::SetLimits(float min, float max)
+{
+    m_valueMin = min;
+    m_valueMax = max;
+
+    // Flag to determine when this variable has custom limits set
+    m_hasCustomLimits = true;
+}
+
+void CXConsoleVariableBase::GetLimits(float& min, float& max)
+{
+    min = m_valueMin;
+    max = m_valueMax;
+}
+
+bool CXConsoleVariableBase::HasCustomLimits()
+{
+    return m_hasCustomLimits;
+}
+
+void CXConsoleVariableCVarGroup::OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup)
+{
+    assert(szGroup);
+    assert(szKey);
+    assert(szValue);
+
+    bool bCheckIfInDefault = false;
+
+    SCVarGroup* pGrp = 0;
+
+    if (azstricmp(szGroup, "default") == 0)              // needs to be before the other groups
+    {
+        pGrp = &m_CVarGroupDefault;
+
+        //      if(azstricmp(GetName(),szKey)==0)
+        if (*szKey == 0)
+        {
+            m_sDefaultValue = szValue;
+            int iGrpValue = atoi(szValue);
+
+            // if default state is not part of the mentioned states generate this state, so GetIRealVal() can return this state as well
+            if (m_CVarGroupStates.find(iGrpValue) == m_CVarGroupStates.end())
+            {
+                m_CVarGroupStates[iGrpValue] = new SCVarGroup;
+            }
+
+            return;
+        }
+    }
+    else
+    {
+        int iGrp;
+
+        if (azsscanf(szGroup, "%d", &iGrp) == 1)
+        {
+            if (m_CVarGroupStates.find(iGrp) == m_CVarGroupStates.end())
+            {
+                m_CVarGroupStates[iGrp] = new SCVarGroup;
+            }
+
+            pGrp = m_CVarGroupStates[iGrp];
+        }
+        else
+        {
+            gEnv->pLog->LogError("[CVARS]: [MISSING] [%s] is not a registered console variable group", szGroup);
+#if LOG_CVAR_INFRACTIONS_CALLSTACK
+            gEnv->pSystem->debug_LogCallStack();
+#endif // LOG_CVAR_INFRACTIONS_CALLSTACK
+            return;
+        }
+
+        if (*szKey == 0)
+        {
+            assert(0);          // =%d only expected in default section
+            return;
+        }
+    }
+
+
+    if (pGrp)
+    {
+        if (pGrp->m_KeyValuePair.find(szKey) != pGrp->m_KeyValuePair.end())
+        {
+            gEnv->pLog->LogError("[CVARS]: [DUPLICATE] [%s] specified multiple times in console variable group [%s] = [%s]", szKey, GetName(), szGroup);
+            bCheckIfInDefault = true;
+        }
+
+        pGrp->m_KeyValuePair[szKey] = szValue;
+
+        if (bCheckIfInDefault)
+        {
+            if (m_CVarGroupDefault.m_KeyValuePair.find(szKey) == m_CVarGroupDefault.m_KeyValuePair.end())
+            {
+                gEnv->pLog->LogError("[CVARS]: [MISSING] [%s] specified in console variable group [%s] = [%s], but missing from default group", szKey, GetName(), szGroup);
+            }
+        }
+    }
+}
+
+
+void CXConsoleVariableCVarGroup::OnLoadConfigurationEntry_End()
+{
+    if (!m_sDefaultValue.empty())
+    {
+        gEnv->pConsole->LoadConfigVar(GetName(), m_sDefaultValue);
+        m_sDefaultValue.clear();
+    }
+}
+
+
+CXConsoleVariableCVarGroup::CXConsoleVariableCVarGroup(CXConsole* pConsole, const char* sName, const char* szFileName, int nFlags)
+    : CXConsoleVariableInt(pConsole, sName, 0, nFlags, 0)
+{
+    gEnv->pSystem->LoadConfiguration(szFileName, this);
+}
+
+
+string CXConsoleVariableCVarGroup::GetDetailedInfo() const
+{
+    string sRet = GetName();
+
+    sRet += " [";
+
+    {
+        TCVarGroupStateMap::const_iterator it, end = m_CVarGroupStates.end();
+
+        for (it = m_CVarGroupStates.begin(); it != end; ++it)
+        {
+            if (it != m_CVarGroupStates.begin())
+            {
+                sRet += "/";
+            }
+
+            char szNum[10];
+
+            azsprintf(szNum, "%d", it->first);
+
+            sRet += szNum;
+        }
+    }
+
+    sRet += "/default] [current]:\n";
+
+
+    std::map<string, string>::const_iterator it, end = m_CVarGroupDefault.m_KeyValuePair.end();
+
+    for (it = m_CVarGroupDefault.m_KeyValuePair.begin(); it != end; ++it)
+    {
+        const string& rKey = it->first;
+
+        sRet += " ... ";
+        sRet += rKey;
+        sRet += " = ";
+
+        TCVarGroupStateMap::const_iterator it2, end2 = m_CVarGroupStates.end();
+
+        for (it2 = m_CVarGroupStates.begin(); it2 != end2; ++it2)
+        {
+            sRet += GetValueSpec(rKey, &(it2->first));
+            sRet += "/";
+        }
+        sRet += GetValueSpec(rKey);
+        ICVar* pCVar = gEnv->pConsole->GetCVar(rKey);
+        if (pCVar)
+        {
+            sRet += " [";
+            sRet += pCVar->GetString();
+            sRet += "]";
+        }
+
+        sRet += "\n";
+    }
+
+    return sRet;
+}
+
+
+
+const char* CXConsoleVariableCVarGroup::GetHelp()
+{
+    if (m_psHelp)
+    {
+        delete m_psHelp;
+        m_psHelp = NULL;
+    }
+
+    // create help on demand
+    string sRet = "Console variable group to apply settings to multiple variables\n\n";
+
+    sRet += GetDetailedInfo();
+
+    m_psHelp = new char[sRet.size() + 1];
+    azstrcpy(m_psHelp, sRet.size() + 1, &sRet[0]);
+
+    return m_psHelp;
+}
+
+
+
+void CXConsoleVariableCVarGroup::DebugLog(const int iExpectedValue, const ICVar::EConsoleLogMode mode) const
+{
+    TCVarGroupStateMap::const_iterator it, end = m_CVarGroupStates.end();
+
+    SCVarGroup* pCurrentGrp = 0;
+    {
+        TCVarGroupStateMap::const_iterator itCurrentGrp = m_CVarGroupStates.find(iExpectedValue);
+
+        if (itCurrentGrp != end)
+        {
+            pCurrentGrp = itCurrentGrp->second;
+        }
+    }
+
+    // try the current state
+    if (TestCVars(pCurrentGrp, mode))
+    {
+        return;
+    }
+}
+
+
+int CXConsoleVariableCVarGroup::GetRealIVal() const
+{
+    TCVarGroupStateMap::const_iterator it, end = m_CVarGroupStates.end();
+
+    int iValue = GetIVal();
+
+    SCVarGroup* pCurrentGrp = 0;
+    {
+        TCVarGroupStateMap::const_iterator itCurrentGrp = m_CVarGroupStates.find(iValue);
+
+        if (itCurrentGrp != end)
+        {
+            pCurrentGrp = itCurrentGrp->second;
+        }
+    }
+
+    // first try the current state
+    if (TestCVars(pCurrentGrp))
+    {
+        return iValue;
+    }
+
+    // then all other
+    for (it = m_CVarGroupStates.begin(); it != end; ++it)
+    {
+        SCVarGroup* pLocalGrp = it->second;
+
+        if (pLocalGrp == pCurrentGrp)
+        {
+            continue;
+        }
+
+        int iLocalState = it->first;
+
+        if (TestCVars(pLocalGrp))
+        {
+            return iLocalState;
+        }
+    }
+
+    return -1;      // no state found that represent the current one
+}
+
+void CXConsoleVariableCVarGroup::Set(const int i)
+{
+    if (i == m_iValue)
+    {
+        SCVarGroup* pCurrentGrp = 0;
+        TCVarGroupStateMap::const_iterator itCurrentGrp = m_CVarGroupStates.find(m_iValue);
+
+        if (itCurrentGrp != m_CVarGroupStates.end())
+        {
+            pCurrentGrp = itCurrentGrp->second;
+        }
+
+        if (TestCVars(pCurrentGrp))
+        {
+            // All cvars in this group match the current state - no further action is necessary
+            return;
+        }
+    }
+
+    char sTemp[128];
+    azsprintf(sTemp, "%d", i);
+
+    bool wasProcessingGroup = m_pConsole->GetIsProcessingGroup();
+    m_pConsole->SetProcessingGroup(true);
+    if (m_pConsole->OnBeforeVarChange(this, sTemp))
+    {
+        m_nFlags |= VF_MODIFIED;
+        m_iValue = i;
+
+        CallOnChangeFunctions();
+        m_pConsole->OnAfterVarChange(this);
+    }
+    m_pConsole->SetProcessingGroup(wasProcessingGroup);
+
+    // Useful for debugging cvar groups
+    //CryLogAlways("[CVARS]: CXConsoleVariableCVarGroup::Set() Group %s in state %d (wanted %d)", GetName(), m_iValue, i);
+}
+
+
+CXConsoleVariableCVarGroup::~CXConsoleVariableCVarGroup()
+{
+    TCVarGroupStateMap::iterator it, end = m_CVarGroupStates.end();
+
+    for (it = m_CVarGroupStates.begin(); it != end; ++it)
+    {
+        SCVarGroup* pGrp = it->second;
+
+        delete pGrp;
+    }
+
+    delete m_psHelp;
+}
+
+
+void CXConsoleVariableCVarGroup::OnCVarChangeFunc(ICVar* pVar)
+{
+    CXConsoleVariableCVarGroup* pThis = (CXConsoleVariableCVarGroup*)pVar;
+
+    int iValue = pThis->GetIVal();
+
+    TCVarGroupStateMap::const_iterator itGrp = pThis->m_CVarGroupStates.find(iValue);
+
+    SCVarGroup* pGrp = 0;
+
+    if (itGrp != pThis->m_CVarGroupStates.end())
+    {
+        pGrp = itGrp->second;
+    }
+
+    if (pGrp)
+    {
+        pThis->ApplyCVars(*pGrp);
+    }
+
+    pThis->ApplyCVars(pThis->m_CVarGroupDefault, pGrp);
+}
+
+
+bool CXConsoleVariableCVarGroup::TestCVars(const SCVarGroup* pGroup, const ICVar::EConsoleLogMode mode) const
+{
+    if (pGroup)
+    {
+        if (!TestCVars(*pGroup, mode))
+        {
+            return false;
+        }
+    }
+
+    if (!TestCVars(m_CVarGroupDefault, mode, pGroup))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool CXConsoleVariableCVarGroup::TestCVars(const SCVarGroup& rGroup, const ICVar::EConsoleLogMode mode, const SCVarGroup* pExclude) const
+{
+    bool bRet = true;
+    std::map<string, string>::const_iterator it, end = rGroup.m_KeyValuePair.end();
+
+    for (it = rGroup.m_KeyValuePair.begin(); it != end; ++it)
+    {
+        const string& rKey = it->first;
+        const string& rValue = it->second;
+
+        if (pExclude)
+        {
+            if (pExclude->m_KeyValuePair.find(rKey) != pExclude->m_KeyValuePair.end())
+            {
+                continue;
+            }
+        }
+
+        ICVar* pVar = gEnv->pConsole->GetCVar(rKey.c_str());
+
+        if (pVar)
+        {
+            if (pVar->GetFlags() & VF_CVARGRP_IGNOREINREALVAL) // Ignore the cvars which change often and shouldn't be used to determine state
+            {
+                continue;
+            }
+
+            bool bOk = true;
+
+            // compare exact type,
+            // simple string comparison would fail on some comparisons e.g. 2.0 == 2
+            // and GetString() for int and float return pointer to shared array so this
+            // can cause problems
+            switch (pVar->GetType())
+            {
+            case CVAR_INT:
+            {
+                int iVal;
+                if (azsscanf(rValue.c_str(), "%d", &iVal) == 1)
+                {
+                    if (pVar->GetIVal() != atoi(rValue.c_str()))
+                    {
+                        bOk = false;
+                        break;
+                    }
+                }
+
+                if (pVar->GetIVal() != pVar->GetRealIVal())
+                {
+                    bOk = false;
+                    break;
+                }
+            }
+            break;
+            case CVAR_FLOAT:
+            {
+                float fVal;
+                if (azsscanf(rValue.c_str(), "%f", &fVal) == 1)
+                {
+                    if (pVar->GetFVal() != fVal)
+                    {
+                        bOk = false;
+                        break;
+                    }
+                }
+            }
+            break;
+            case CVAR_STRING:
+                if (rValue != pVar->GetString())
+                {
+                    bOk = false;
+                    break;
+                }
+                break;
+            default:
+                assert(0);
+            }
+
+            if (!bOk)
+            {
+                if (mode == ICVar::eCLM_Off)
+                {
+                    return false;       // exit as early as possible
+                }
+                bRet = false;             // exit with same return code but log all differences
+
+                if (strcmp(pVar->GetString(), rValue.c_str()) != 0)
+                {
+                    switch (mode)
+                    {
+                    case ICVar::eCLM_ConsoleAndFile:
+                        CryLog("[CVARS]: $3[FAIL] [%s] = $6[%s] $4(expected [%s] in group [%s] = [%s])", rKey.c_str(), pVar->GetString(), rValue.c_str(), GetName(), GetString());
+                        break;
+
+                    case ICVar::eCLM_FileOnly:
+                    case ICVar::eCLM_FullInfo:
+                        gEnv->pLog->LogToFile("[CVARS]: [FAIL] [%s] = [%s] (expected [%s] in group [%s] = [%s])", rKey.c_str(), pVar->GetString(), rValue.c_str(), GetName(), GetString());
+                        break;
+
+                    default:
+                        assert(0);
+                    }
+                }
+                else if (mode == ICVar::eCLM_FullInfo)
+                {
+                    gEnv->pLog->LogToFile("[CVARS]: [FAIL] [%s] = [%s] (expected [%s] in group [%s] = [%s])", rKey.c_str(), pVar->GetString(), rValue.c_str(), GetName(), GetString());
+                }
+
+                pVar->DebugLog(pVar->GetIVal(), mode);       // recursion
+            }
+
+            if (pVar->GetFlags() & (VF_CHEAT | VF_CHEAT_ALWAYS_CHECK | VF_CHEAT_NOCHECK))
+            {
+                // either VF_CHEAT should be removed or the var should be not part of the CVarGroup
+                gEnv->pLog->LogError("[CVARS]: [%s] is cheat protected; referenced in console variable group [%s] = [%s] ", rKey.c_str(), GetName(), GetString());
+            }
+        }
+        else
+        {
+            // Do not warn about D3D registered cvars, which carry the prefix "q_", as they are not actually registered with the cvar system.
+            if (strcmp(rKey.c_str(), "q") == -1)
+            {
+                gEnv->pLog->LogError("[CVARS]: [MISSING] [%s] is not a registered console variable; referenced when testing console variable group [%s] = [%s]", rKey.c_str(), GetName(), GetString());
+            }
+        }
+    }
+
+    return bRet;
+}
+
+
+
+string CXConsoleVariableCVarGroup::GetValueSpec(const string& sKey, const int* pSpec) const
+{
+    if (pSpec)
+    {
+        TCVarGroupStateMap::const_iterator itGrp = m_CVarGroupStates.find(*pSpec);
+
+        if (itGrp != m_CVarGroupStates.end())
+        {
+            const SCVarGroup* pGrp = itGrp->second;
+
+            // check in spec
+            std::map<string, string>::const_iterator it = pGrp->m_KeyValuePair.find(sKey);
+
+            if (it != pGrp->m_KeyValuePair.end())
+            {
+                return it->second;
+            }
+        }
+    }
+
+    // check in default
+    std::map<string, string>::const_iterator it = m_CVarGroupDefault.m_KeyValuePair.find(sKey);
+
+    if (it != m_CVarGroupDefault.m_KeyValuePair.end())
+    {
+        return it->second;
+    }
+
+    assert(0);      // internal error
+    return "";
+}
+
+void CXConsoleVariableCVarGroup::ApplyCVars(const SCVarGroup& rGroup, const SCVarGroup* pExclude)
+{
+    std::map<string, string>::const_iterator it, end = rGroup.m_KeyValuePair.end();
+
+    bool wasProcessingGroup = m_pConsole->GetIsProcessingGroup();
+    m_pConsole->SetProcessingGroup(true);
+
+    for (it = rGroup.m_KeyValuePair.begin(); it != end; ++it)
+    {
+        const string& rKey = it->first;
+
+        if (pExclude)
+        {
+            if (pExclude->m_KeyValuePair.find(rKey) != pExclude->m_KeyValuePair.end())
+            {
+                continue;
+            }
+        }
+
+        // Useful for debugging cvar groups
+        //CryLogAlways("[CVARS]: [APPLY] ([%s]) [%s] = [%s]", GetName(), rKey.c_str(), it->second.c_str());
+
+        m_pConsole->LoadConfigVar(rKey, it->second);
+    }
+
+    m_pConsole->SetProcessingGroup(wasProcessingGroup);
+}
+
diff --git a/Code/Legacy/CrySystem/XConsoleVariable.h b/Code/Legacy/CrySystem/XConsoleVariable.h
new file mode 100644
index 0000000000..3405cea482
--- /dev/null
+++ b/Code/Legacy/CrySystem/XConsoleVariable.h
@@ -0,0 +1,842 @@
+/*
+ * 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_XCONSOLEVARIABLE_H
+#define CRYINCLUDE_CRYSYSTEM_XCONSOLEVARIABLE_H
+#pragma once
+
+#include <ISystem.h>
+#include "BitFiddling.h"
+#include "SFunctor.h"
+
+class CXConsole;
+
+inline int64 TextToInt64(const char* s, int64 nCurrent, bool bBitfield)
+{
+    int64 nValue = 0;
+    if (s)
+    {
+        char* e;
+        if (bBitfield)
+        {
+            // Bit manipulation.
+            if (*s == '^')
+            // Bit number
+#if defined(_MSC_VER)
+            {
+                nValue = 1LL << _strtoi64(++s, &e, 10);
+            }
+#else
+            {
+                nValue = 1LL << strtoll(++s, &e, 10);
+            }
+#endif
+            else
+            // Full number
+#if defined(_MSC_VER)
+            {
+                nValue = _strtoi64(s, &e, 10);
+            }
+#else
+            {
+                nValue = strtoll(s, &e, 10);
+            }
+#endif
+            // Check letter codes.
+            for (; (*e >= 'a' && *e <= 'z') || (*e >= 'A' && *e <= 'Z'); e++)
+            {
+                nValue |= AlphaBit64(*e);
+            }
+
+            if (*e == '+')
+            {
+                nValue = nCurrent | nValue;
+            }
+            else if (*e == '-')
+            {
+                nValue = nCurrent & ~nValue;
+            }
+            else if (*e == '^')
+            {
+                nValue = nCurrent ^ nValue;
+            }
+        }
+        else
+#if defined(_MSC_VER)
+        {
+            nValue = _strtoi64(s, &e, 10);
+        }
+#else
+        {
+            nValue = strtoll(s, &e, 10);
+        }
+#endif
+    }
+    return nValue;
+}
+
+inline int TextToInt(const char* s, int nCurrent, bool bBitfield)
+{
+    return (int)TextToInt64(s, nCurrent, bBitfield);
+}
+
+class CXConsoleVariableBase
+    : public ICVar
+{
+public:
+    //! constructor
+    //! \param pConsole must not be 0
+    CXConsoleVariableBase(CXConsole* pConsole, const char* sName, int nFlags, const char* help);
+    //! destructor
+    virtual ~CXConsoleVariableBase();
+
+    // interface ICVar --------------------------------------------------------------------------------------
+
+    virtual void ClearFlags(int flags);
+    virtual int GetFlags() const;
+    virtual int SetFlags(int flags);
+    virtual const char* GetName() const;
+    virtual const char* GetHelp();
+    virtual void Release();
+    virtual void ForceSet(const char* s);
+    virtual void SetOnChangeCallback(ConsoleVarFunc pChangeFunc);
+    virtual uint64 AddOnChangeFunctor(const SFunctor& pChangeFunctor) override;
+    virtual bool RemoveOnChangeFunctor(const uint64 nFunctorId) override;
+    virtual uint64 GetNumberOfOnChangeFunctors() const;
+    virtual const SFunctor& GetOnChangeFunctor(uint64 nFunctorId) const override;
+    virtual ConsoleVarFunc GetOnChangeCallback() const;
+
+    virtual bool ShouldReset() const { return (m_nFlags & VF_RESETTABLE) != 0; }
+    virtual void Reset() override
+    {
+        if (ShouldReset())
+        {
+            ResetImpl();
+        }
+    }
+
+    virtual void ResetImpl() = 0;
+
+    virtual void SetLimits(float min, float max) override;
+    virtual void GetLimits(float& min, float& max) override;
+    virtual bool HasCustomLimits() override;
+
+    virtual int GetRealIVal() const { return GetIVal(); }
+    virtual bool IsConstCVar() const {return (m_nFlags & VF_CONST_CVAR) != 0; }
+    virtual void SetDataProbeString(const char* pDataProbeString)
+    {
+        CRY_ASSERT(m_pDataProbeString == NULL);
+        m_pDataProbeString = new char[ strlen(pDataProbeString) + 1 ];
+        azstrcpy(m_pDataProbeString, strlen(pDataProbeString) + 1, pDataProbeString);
+    }
+    virtual const char* GetDataProbeString() const
+    {
+        if (gEnv->IsDedicated() && m_pDataProbeString)
+        {
+            return m_pDataProbeString;
+        }
+        return GetOwnDataProbeString();
+    }
+
+protected: // ------------------------------------------------------------------------------------------
+
+    virtual const char* GetOwnDataProbeString() const
+    {
+        return GetString();
+    }
+
+    void CallOnChangeFunctions();
+
+    char*                      m_szName;                                            // if VF_COPYNAME then this data need to be deleteed, otherwise it's pointer to .dll/.exe
+
+    char*                      m_psHelp;                                            // pointer to the help string, might be 0
+    char*            m_pDataProbeString;            // value client is required to have for data probes
+    int                             m_nFlags;                                           // e.g. VF_CHEAT, ...
+
+    typedef std::vector<std::pair<int, SFunctor> > ChangeFunctorContainer;
+    ChangeFunctorContainer m_changeFunctors;
+    ConsoleVarFunc    m_pChangeFunc;                // Callback function that is called when this variable changes.
+    CXConsole*             m_pConsole;                                      // used for the callback OnBeforeVarChange()
+
+    float m_valueMin;
+    float m_valueMax;
+    bool m_hasCustomLimits;
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CXConsoleVariableString
+    : public CXConsoleVariableBase
+{
+public:
+    // constructor
+    CXConsoleVariableString(CXConsole* pConsole, const char* sName, const char* szDefault, int nFlags, const char* help)
+        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
+    {
+        m_sValue = szDefault;
+        m_sDefault = szDefault;
+    }
+
+    // interface ICVar --------------------------------------------------------------------------------------
+
+    virtual int GetIVal() const { return atoi(m_sValue); }
+    virtual int64 GetI64Val() const { return _atoi64(m_sValue); }
+    virtual float GetFVal() const { return (float)atof(m_sValue); }
+    virtual const char* GetString() const { return m_sValue; }
+    virtual void ResetImpl()
+    {
+        Set(m_sDefault);
+    }
+    virtual void Set(const char* s)
+    {
+        if (!s)
+        {
+            return;
+        }
+
+        if ((m_sValue == s) && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        if (m_pConsole->OnBeforeVarChange(this, s))
+        {
+            m_nFlags |= VF_MODIFIED;
+            {
+                m_sValue = s;
+            }
+
+            CallOnChangeFunctions();
+
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+
+    virtual void Set(float f)
+    {
+        stack_string s;
+        s.Format("%g", f);
+
+        if ((m_sValue == s.c_str()) && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        m_nFlags |= VF_MODIFIED;
+        Set(s.c_str());
+    }
+
+    virtual void Set(int i)
+    {
+        stack_string s;
+        s.Format("%d", i);
+
+        if ((m_sValue == s.c_str()) && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        m_nFlags |= VF_MODIFIED;
+        Set(s.c_str());
+    }
+    virtual int GetType() { return CVAR_STRING; }
+
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
+private: // --------------------------------------------------------------------------------------------
+    string m_sValue;                                            
+    string m_sDefault;                                                                              //!<
+};
+
+
+
+class CXConsoleVariableInt
+    : public CXConsoleVariableBase
+{
+public:
+    // constructor
+    CXConsoleVariableInt(CXConsole* pConsole, const char* sName, const int iDefault, int nFlags, const char* help)
+        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
+        , m_iValue(iDefault)
+        , m_iDefault(iDefault)
+    {
+    }
+
+    // interface ICVar --------------------------------------------------------------------------------------
+
+    virtual int GetIVal() const { return m_iValue; }
+    virtual int64 GetI64Val() const { return m_iValue; }
+    virtual float GetFVal() const { return (float)GetIVal(); }
+    virtual const char* GetString() const
+    {
+        static char szReturnString[256];
+
+        sprintf_s(szReturnString, "%d", GetIVal());
+        return szReturnString;
+    }
+    virtual void ResetImpl() { Set(m_iDefault); }
+    virtual void Set(const char* s)
+    {
+        int nValue = TextToInt(s, m_iValue, (m_nFlags & VF_BITFIELD) != 0);
+
+        Set(nValue);
+    }
+    virtual void Set(float f)
+    {
+        Set((int)f);
+    }
+    virtual void Set(int i)
+    {
+        if (i == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        stack_string s;
+        s.Format("%d", i);
+
+        if (m_pConsole->OnBeforeVarChange(this, s.c_str()))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_iValue = i;
+
+            CallOnChangeFunctions();
+
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual int GetType() { return CVAR_INT; }
+
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
+protected: // --------------------------------------------------------------------------------------------
+
+    int                             m_iValue;                                           
+    int                             m_iDefault;                                 //!<
+};
+
+
+class CXConsoleVariableInt64
+    : public CXConsoleVariableBase
+{
+public:
+    // constructor
+    CXConsoleVariableInt64(CXConsole* pConsole, const char* sName, const int64 iDefault, int nFlags, const char* help)
+        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
+        , m_iValue(iDefault)
+        , m_iDefault(iDefault)
+    {
+    }
+
+    // interface ICVar --------------------------------------------------------------------------------------
+
+    virtual int GetIVal() const { return (int)m_iValue; }
+    virtual int64 GetI64Val() const { return m_iValue; }
+    virtual float GetFVal() const { return (float)GetIVal(); }
+    virtual const char* GetString() const
+    {
+        static char szReturnString[256];
+        sprintf_s(szReturnString, "%lld", GetI64Val());
+        return szReturnString;
+    }
+    virtual void ResetImpl() { Set(m_iDefault); }
+    virtual void Set(const char* s)
+    {
+        int64 nValue = TextToInt64(s, m_iValue, (m_nFlags & VF_BITFIELD) != 0);
+
+        Set(nValue);
+    }
+    virtual void Set(float f)
+    {
+        Set((int)f);
+    }
+    virtual void Set(int i)
+    {
+        Set((int64)i);
+    }
+    virtual void Set(int64 i)
+    {
+        if (i == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        stack_string s;
+        s.Format("%lld", i);
+
+        if (m_pConsole->OnBeforeVarChange(this, s.c_str()))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_iValue = i;
+
+            CallOnChangeFunctions();
+
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual int GetType() { return CVAR_INT; }
+
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
+protected: // --------------------------------------------------------------------------------------------
+
+    int64                           m_iValue;                                           
+    int64                           m_iDefault;                                 //!<
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CXConsoleVariableFloat
+    : public CXConsoleVariableBase
+{
+public:
+    // constructor
+    CXConsoleVariableFloat(CXConsole* pConsole, const char* sName, const float fDefault, int nFlags, const char* help)
+        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
+        , m_fValue(fDefault)
+        , m_fDefault(fDefault)
+    {
+    }
+
+    // interface ICVar --------------------------------------------------------------------------------------
+
+    virtual int GetIVal() const { return (int)m_fValue; }
+    virtual int64 GetI64Val() const { return (int64)m_fValue; }
+    virtual float GetFVal() const { return m_fValue; }
+    virtual const char* GetString() const
+    {
+        static char szReturnString[256];
+
+        sprintf_s(szReturnString, "%g", m_fValue);        // %g -> "2.01",   %f -> "2.01000"
+        return szReturnString;
+    }
+    virtual void ResetImpl() { Set(m_fDefault); }
+    virtual void Set(const char* s)
+    {
+        float fValue = 0;
+        if (s)
+        {
+            fValue = (float)atof(s);
+        }
+
+        if (fValue == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        if (m_pConsole->OnBeforeVarChange(this, s))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_fValue = fValue;
+
+            CallOnChangeFunctions();
+
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual void Set(float f)
+    {
+        if (f == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        stack_string s;
+        s.Format("%g", f);
+
+        if (m_pConsole->OnBeforeVarChange(this, s.c_str()))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_fValue = f;
+
+            CallOnChangeFunctions();
+
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual void Set(int i)
+    {
+        if ((float)i == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        char sTemp[128];
+        sprintf_s(sTemp, "%d", i);
+
+        if (m_pConsole->OnBeforeVarChange(this, sTemp))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_fValue = (float)i;
+            CallOnChangeFunctions();
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual int GetType() { return CVAR_FLOAT; }
+
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
+
+protected:
+
+    virtual const char* GetOwnDataProbeString() const
+    {
+        static char szReturnString[8];
+
+        sprintf_s(szReturnString, "%.1g", m_fValue);
+        return szReturnString;
+    }
+
+private: // --------------------------------------------------------------------------------------------
+
+    float                           m_fValue;                                           
+    float                           m_fDefault;                             //!<
+};
+
+
+class CXConsoleVariableIntRef
+    : public CXConsoleVariableBase
+{
+public:
+    //! constructor
+    //!\param pVar must not be 0
+    CXConsoleVariableIntRef(CXConsole* pConsole, const char* sName, int32* pVar, int nFlags, const char* help)
+        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
+        , m_iValue(*pVar)
+        , m_iDefault(*pVar)
+    {
+        assert(pVar);
+    }
+
+    // interface ICVar --------------------------------------------------------------------------------------
+
+    virtual int GetIVal() const { return m_iValue; }
+    virtual int64 GetI64Val() const { return m_iValue; }
+    virtual float GetFVal() const { return (float)m_iValue; }
+    virtual const char* GetString() const
+    {
+        static char szReturnString[256];
+
+        sprintf_s(szReturnString, "%d", m_iValue);
+        return szReturnString;
+    }
+    virtual void ResetImpl() { Set(m_iDefault); }
+    virtual void Set(const char* s)
+    {
+        int nValue = TextToInt(s, m_iValue, (m_nFlags & VF_BITFIELD) != 0);
+        if (nValue == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        if (m_pConsole->OnBeforeVarChange(this, s))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_iValue = nValue;
+
+            CallOnChangeFunctions();
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual void Set(float f)
+    {
+        if ((int)f == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        char sTemp[128];
+        sprintf_s(sTemp, "%g", f);
+
+        if (m_pConsole->OnBeforeVarChange(this, sTemp))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_iValue = (int)f;
+            CallOnChangeFunctions();
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual void Set(int i)
+    {
+        if (i == m_iValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        char sTemp[128];
+        sprintf_s(sTemp, "%d", i);
+
+        if (m_pConsole->OnBeforeVarChange(this, sTemp))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_iValue = i;
+            CallOnChangeFunctions();
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual int GetType() { return CVAR_INT; }
+
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
+private: // --------------------------------------------------------------------------------------------
+
+    int&                           m_iValue;                                            
+    int                            m_iDefault;                                  //!<
+};
+
+
+
+
+
+class CXConsoleVariableFloatRef
+    : public CXConsoleVariableBase
+{
+public:
+    //! constructor
+    //!\param pVar must not be 0
+    CXConsoleVariableFloatRef(CXConsole* pConsole, const char* sName, float* pVar, int nFlags, const char* help)
+        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
+        , m_fValue(*pVar)
+        , m_fDefault(*pVar)
+    {
+        assert(pVar);
+    }
+
+    // interface ICVar --------------------------------------------------------------------------------------
+
+    virtual int GetIVal() const { return (int)m_fValue; }
+    virtual int64 GetI64Val() const { return (int64)m_fValue; }
+    virtual float GetFVal() const { return m_fValue; }
+    virtual const char* GetString() const
+    {
+        static char szReturnString[256];
+
+        sprintf_s(szReturnString, "%g", m_fValue);
+        return szReturnString;
+    }
+    virtual void ResetImpl() { Set(m_fDefault); }
+    virtual void Set(const char* s)
+    {
+        float fValue = 0;
+        if (s)
+        {
+            fValue = (float)atof(s);
+        }
+        if (fValue == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        if (m_pConsole->OnBeforeVarChange(this, s))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_fValue = fValue;
+
+            CallOnChangeFunctions();
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual void Set(float f)
+    {
+        if (f == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        char sTemp[128];
+        sprintf_s(sTemp, "%g", f);
+
+        if (m_pConsole->OnBeforeVarChange(this, sTemp))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_fValue = f;
+            CallOnChangeFunctions();
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual void Set(int i)
+    {
+        if ((float)i == m_fValue && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        char sTemp[128];
+        sprintf_s(sTemp, "%d", i);
+
+        if (m_pConsole->OnBeforeVarChange(this, sTemp))
+        {
+            m_nFlags |= VF_MODIFIED;
+            m_fValue = (float)i;
+            CallOnChangeFunctions();
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual int GetType() { return CVAR_FLOAT; }
+
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
+
+protected:
+
+    virtual const char* GetOwnDataProbeString() const
+    {
+        static char szReturnString[8];
+
+        sprintf_s(szReturnString, "%.1g", m_fValue);
+        return szReturnString;
+    }
+
+private: // --------------------------------------------------------------------------------------------
+
+    float&                         m_fValue;
+    float                          m_fDefault;                                  //!<
+};
+
+
+
+class CXConsoleVariableStringRef
+    : public CXConsoleVariableBase
+{
+public:
+    //! constructor
+    //!\param userBuf must not be 0
+    CXConsoleVariableStringRef(CXConsole* pConsole, const char* sName, const char** userBuf, const char* defaultValue, int nFlags, const char* help)
+        : CXConsoleVariableBase(pConsole, sName, nFlags, help)
+        , m_sValue(defaultValue)
+        , m_sDefault(defaultValue)
+        , m_userPtr(*userBuf)
+    {
+        m_userPtr = m_sValue.c_str();
+        assert(userBuf);
+    }
+
+    // interface ICVar --------------------------------------------------------------------------------------
+
+    virtual int GetIVal() const { return atoi(m_sValue.c_str()); }
+    virtual int64 GetI64Val() const { return _atoi64(m_sValue.c_str()); }
+    virtual float GetFVal() const { return (float)atof(m_sValue.c_str()); }
+    virtual const char* GetString() const
+    {
+        return m_sValue.c_str();
+    }
+    virtual void ResetImpl() { Set(m_sDefault); }
+    virtual void Set(const char* s)
+    {
+        if ((m_sValue == s) && (m_nFlags & VF_ALWAYSONCHANGE) == 0)
+        {
+            return;
+        }
+
+        if (m_pConsole->OnBeforeVarChange(this, s))
+        {
+            m_nFlags |= VF_MODIFIED;
+            {
+                m_sValue = s;
+                m_userPtr = m_sValue.c_str();
+            }
+
+            CallOnChangeFunctions();
+            m_pConsole->OnAfterVarChange(this);
+        }
+    }
+    virtual void Set(float f)
+    {
+        stack_string s;
+        s.Format("%g", f);
+        Set(s.c_str());
+    }
+    virtual void Set(int i)
+    {
+        stack_string s;
+        s.Format("%d", i);
+        Set(s.c_str());
+    }
+    virtual int GetType() { return CVAR_STRING; }
+
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const { pSizer->AddObject(this, sizeof(*this)); }
+private: // --------------------------------------------------------------------------------------------
+
+    string m_sValue;
+    string m_sDefault;
+    const char*& m_userPtr;                                         //!<
+};
+
+
+
+// works like CXConsoleVariableInt but when changing it sets other console variables
+// getting the value returns the last value it was set to - if that is still what was applied
+// to the cvars can be tested with GetRealIVal()
+class CXConsoleVariableCVarGroup
+    : public CXConsoleVariableInt
+    , public ILoadConfigurationEntrySink
+{
+public:
+    // constructor
+    CXConsoleVariableCVarGroup(CXConsole* pConsole, const char* sName, const char* szFileName, int nFlags);
+
+    // destructor
+    ~CXConsoleVariableCVarGroup();
+
+    // Returns:
+    //   part of the help string - useful to log out detailed description without additional help text
+    string GetDetailedInfo() const;
+
+    // interface ICVar -----------------------------------------------------------------------------------
+
+    virtual const char* GetHelp();
+
+    virtual int GetRealIVal() const;
+
+    virtual void DebugLog(const int iExpectedValue, const ICVar::EConsoleLogMode mode) const;
+
+    virtual void Set(int i);
+
+    // ConsoleVarFunc ------------------------------------------------------------------------------------
+
+    static void OnCVarChangeFunc(ICVar* pVar);
+
+    // interface ILoadConfigurationEntrySink -------------------------------------------------------------
+
+    virtual void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup);
+    virtual void OnLoadConfigurationEntry_End();
+
+    virtual void GetMemoryUsage(class ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(this, sizeof(*this));
+        pSizer->AddObject(m_sDefaultValue);
+        pSizer->AddObject(m_CVarGroupStates);
+    }
+private: // --------------------------------------------------------------------------------------------
+
+    struct SCVarGroup
+    {
+        std::map<string, string>                         m_KeyValuePair;                 // e.g. m_KeyValuePair["r_fullscreen"]="0"
+        void GetMemoryUsage(class ICrySizer* pSizer) const
+        {
+            pSizer->AddObject(m_KeyValuePair);
+        }
+    };
+
+    SCVarGroup                                                      m_CVarGroupDefault;
+    typedef std::map<int, SCVarGroup*>      TCVarGroupStateMap;
+    TCVarGroupStateMap                                      m_CVarGroupStates;
+    string                                                              m_sDefaultValue;                // used by OnLoadConfigurationEntry_End()
+
+    void ApplyCVars(const SCVarGroup& rGroup, const SCVarGroup* pExclude = 0);
+
+    // Arguments:
+    //   sKey - must exist, at least in default
+    //   pSpec - can be 0
+    string GetValueSpec(const string& sKey, const int* pSpec = 0) const;
+
+    // should only be used by TestCVars()
+    // Returns:
+    //   true=all console variables match the state (excluding default state), false otherwise
+    bool TestCVars(const SCVarGroup& rGroup, const ICVar::EConsoleLogMode mode, const SCVarGroup* pExclude = 0) const;
+
+    // Arguments:
+    //   pGroup - can be 0 to test if the default state is set
+    // Returns:
+    //   true=all console variables match the state (including default state), false otherwise
+    bool TestCVars(const SCVarGroup* pGroup, const ICVar::EConsoleLogMode mode = ICVar::eCLM_Off) const;
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_XCONSOLEVARIABLE_H
diff --git a/Code/Legacy/CrySystem/XML/CMakeLists.txt b/Code/Legacy/CrySystem/XML/CMakeLists.txt
new file mode 100644
index 0000000000..e96d54cab9
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/CMakeLists.txt
@@ -0,0 +1,19 @@
+#
+# 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
+#
+#
+
+ly_add_target(
+    NAME CrySystem.XMLBinary STATIC
+    NAMESPACE Legacy
+    FILES_CMAKE
+        crysystem_xmlbinary_files.cmake
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            .
+    BUILD_DEPENDENCIES
+        PUBLIC
+            Legacy::CryCommon
+)
diff --git a/Code/CryEngine/CrySystem/XML/Expat/COPYING.txt b/Code/Legacy/CrySystem/XML/Expat/COPYING.txt
similarity index 100%
rename from Code/CryEngine/CrySystem/XML/Expat/COPYING.txt
rename to Code/Legacy/CrySystem/XML/Expat/COPYING.txt
diff --git a/Code/Legacy/CrySystem/XML/ReadWriteXMLSink.h b/Code/Legacy/CrySystem/XML/ReadWriteXMLSink.h
new file mode 100644
index 0000000000..7db2feb4e7
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/ReadWriteXMLSink.h
@@ -0,0 +1,42 @@
+/*
+ * 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_XML_READWRITEXMLSINK_H
+#define CRYINCLUDE_CRYSYSTEM_XML_READWRITEXMLSINK_H
+#pragma once
+
+
+#include <ISystem.h>
+#include <IReadWriteXMLSink.h>
+
+class CReadWriteXMLSink
+    : public IReadWriteXMLSink
+{
+public:
+    bool ReadXML(const char* definitionFile, const char* dataFile, IReadXMLSink* pSink);
+    bool ReadXML(const char* definitionFile, XmlNodeRef node, IReadXMLSink* pSink);
+    bool ReadXML(XmlNodeRef definition, const char* dataFile, IReadXMLSink* pSink);
+    bool ReadXML(XmlNodeRef definition, XmlNodeRef node, IReadXMLSink* pSink);
+
+    XmlNodeRef CreateXMLFromSource(const char* definitionFile, IWriteXMLSource* pSource);
+    bool WriteXML(const char* definitionFile, const char* dataFile, IWriteXMLSource* pSource);
+};
+
+
+// helper to define the if/else chain that we need in a few locations...
+// types must match IReadXMLSink::TValueTypes
+#define XML_SET_PROPERTY_HELPER(ELSE_LOAD_PROPERTY) \
+    if (false) {; }                                 \
+    ELSE_LOAD_PROPERTY(Vec3);                       \
+    ELSE_LOAD_PROPERTY(int);                        \
+    ELSE_LOAD_PROPERTY(float);                      \
+    ELSE_LOAD_PROPERTY(string);                     \
+    ELSE_LOAD_PROPERTY(bool);
+
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_READWRITEXMLSINK_H
diff --git a/Code/Legacy/CrySystem/XML/ReadXMLSink.cpp b/Code/Legacy/CrySystem/XML/ReadXMLSink.cpp
new file mode 100644
index 0000000000..a0c54aeeac
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/ReadXMLSink.cpp
@@ -0,0 +1,681 @@
+/*
+ * 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 "ReadWriteXMLSink.h"
+
+#include <ISystem.h>
+#include <stack>
+
+typedef std::map<string, XmlNodeRef> IdTable;
+struct SParseParams
+{
+    IdTable idTable;
+    XmlNodeRef useAlways;
+    bool strict;
+
+    SParseParams()
+    {
+        strict = true;
+    }
+};
+
+static XmlNodeRef Clone(XmlNodeRef source);
+static void CopyAttributes(const XmlNodeRef& source, XmlNodeRef& dest);
+static bool IsOptionalReadXML(const SParseParams& parseParams, XmlNodeRef& definition);
+static bool CheckEnum(const SParseParams& parseParams, const char* name, XmlNodeRef& definition, XmlNodeRef& data);
+
+static bool LoadTableInner(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
+static bool LoadArray(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
+static bool LoadProperty(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
+static bool LoadTable(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
+static bool LoadReferencedId(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
+static bool LoadSomething(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
+static bool LoadArraySetValueTable(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem);
+
+typedef bool (* LoadArraySetValue)(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem);
+typedef bool (* LoadDefinitionFunction)(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink);
+
+
+template <class T>
+struct ReadPropertyTyped;
+
+template <class T>
+struct ReadPropertyTyped
+{
+    static bool Load(const SParseParams& parseParams, const char* name, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
+    {
+        T value;
+        memset(&value, 0, sizeof(T));
+
+        if (!pSink->IsCreationMode())
+        {
+            if (!data->haveAttr(name))
+            {
+                return false;
+            }
+            if (!data->getAttr(name, value))
+            {
+                return false;
+            }
+            if (!CheckEnum(parseParams, name, definition, data))
+            {
+                return false;
+            }
+        }
+
+        IReadXMLSink::TValue vvalue(value);
+        pSink->SetValue(name, vvalue, definition);
+        return true;
+    }
+    static bool LoadArray([[maybe_unused]] const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem)
+    {
+        T value;
+        memset(&value, 0, sizeof(T));
+
+        if (!pSink->IsCreationMode())
+        {
+            if (!data->haveAttr("value"))
+            {
+                return false;
+            }
+            if (!data->getAttr("value", value))
+            {
+                return false;
+            }
+        }
+
+        IReadXMLSink::TValue vvalue(value);
+        pSink->SetAt(elem, vvalue, definition);
+        return true;
+    }
+};
+
+template <>
+struct ReadPropertyTyped<string>
+{
+    static bool Load(const SParseParams& parseParams, const char* name, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
+    {
+        const char* value = 0;
+
+        if (!pSink->IsCreationMode())
+        {
+            if (!data->haveAttr(name))
+            {
+                return false;
+            }
+            if (!CheckEnum(parseParams, name, definition, data))
+            {
+                return false;
+            }
+
+            value = data->getAttr(name);
+        }
+
+        IReadXMLSink::TValue vvalue(value);
+        pSink->SetValue(name, vvalue, definition);
+        return true;
+    }
+    static bool LoadArray([[maybe_unused]] const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem)
+    {
+        const char* value = 0;
+
+        if (!pSink->IsCreationMode())
+        {
+            if (!data->haveAttr("value"))
+            {
+                return false;
+            }
+
+            value = data->getAttr("value");
+        }
+
+        IReadXMLSink::TValue vvalue(value);
+        pSink->SetAt(elem, vvalue, definition);
+        return true;
+    }
+};
+
+XmlNodeRef Clone(XmlNodeRef source)
+{
+    assert(source != (IXmlNode*)NULL);
+
+    // Can't use clone() on XmlNodeRef objects since they can contain a CXMLBinaryNode, which doesn't support
+    // clone(). Instead we just create a regular xml node and manually copy content, tag, attributes and children
+    XmlNodeRef cloned = GetISystem()->CreateXmlNode(source->getTag());
+    cloned->setContent(source->getContent());
+    CopyAttributes(source, cloned);
+    const int iChildCount = source->getChildCount();
+    for (int i = 0; i < iChildCount; ++i)
+    {
+        cloned->addChild(Clone(source->getChild(i)));
+    }
+
+    return cloned;
+}
+
+void CopyAttributes(const XmlNodeRef& source, XmlNodeRef& dest)
+{
+    // Not as fast as CXmlNode::copyAttributes(), but that method will have undefined behavior if the XmlNodeRef contains
+    // a CBinaryXmlNode object
+    int nNumAttributes = source->getNumAttributes();
+    for (int i = 0; i < nNumAttributes; ++i)
+    {
+        const char* key = NULL;
+        const char* value = NULL;
+        if (source->getAttributeByIndex(i, &key, &value))
+        {
+            dest->setAttr(key, value);
+        }
+    }
+}
+
+bool IsOptionalReadXML(const SParseParams& parseParams, XmlNodeRef& definition)
+{
+    // If strict mode is off, then everything is optional
+    if (parseParams.strict == false)
+    {
+        return true;
+    }
+
+    bool optional = false;
+    definition->getAttr("optional", optional);
+    return optional;
+}
+
+bool CheckEnum([[maybe_unused]] const SParseParams& parseParams, [[maybe_unused]] const char* name, XmlNodeRef& definition, [[maybe_unused]] XmlNodeRef& data)
+{
+    if (XmlNodeRef enumNode = definition->findChild("Enum"))
+    {
+        // If strict mode is off, then no need to check the enum value
+        return true;
+    }
+    return true;
+}
+
+bool LoadProperty(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
+{
+    const char* name = definition->getAttr("name");
+    if (0 == strlen(name))
+    {
+        CryLog("Property has no name");
+        return false;
+    }
+
+    const char* type = definition->getAttr("type");
+    if (0 == strlen(type))
+    {
+        CryLog("Property '%s' has no type", type);
+        return false;
+    }
+
+    XmlNodeRef dataToRead = data;
+    if (!pSink->IsCreationMode())
+    {
+        // This check is done so the data xml can specify child elements instead of attributes if desired,
+        // since the rest of the code assume only attributes
+        if (XmlNodeRef childRef = data->findChild(name))
+        {
+            if (data->haveAttr(name))
+            {
+                CryLog("Duplicate definition (attribute and element) for %s", name);
+                return false;
+            }
+            if (childRef->getChildCount())
+            {
+                CryLog("Property-style elements can not have children (property was %s)", name);
+                return false;
+            }
+
+            dataToRead = GetISystem()->CreateXmlNode(data->getTag());
+
+            string content = childRef->getContent();
+            dataToRead->setAttr(name, content.Trim().c_str());
+        }
+
+        if (!dataToRead->haveAttr(name))
+        {
+            if (!IsOptionalReadXML(parseParams, definition))
+            {
+                CryLog("Failed to load property %s", name);
+                return false;
+            }
+            return true;
+        }
+    }
+
+    bool ok = false;
+#define LOAD_PROPERTY(whichType) else if (0 == strcmp(type, #whichType)) ok = ReadPropertyTyped<whichType>::Load(parseParams, name, definition, dataToRead, pSink)
+    XML_SET_PROPERTY_HELPER(LOAD_PROPERTY);
+#undef LOAD_PROPERTY
+
+    if (!ok)
+    {
+        CryLog("Failed loading attribute %s of type %s", name, type);
+    }
+
+    return ok;
+}
+
+bool LoadArraySetValueTable(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink, int elem)
+{
+    IReadXMLSinkPtr pChildSink = pSink->BeginTableAt(elem, definition);
+
+    if (pSink->IsCreationMode() && definition->haveAttr("type"))
+    {
+        if (!LoadSomething(parseParams, definition, data, &*pChildSink))
+        {
+            return false;
+        }
+    }
+    else
+    {
+        if (!LoadTableInner(parseParams, definition, data, &*pChildSink))
+        {
+            return false;
+        }
+    }
+
+    if (!pChildSink->EndTableAt(elem))
+    {
+        CryLog("Failed to finish table at element %d", elem);
+        return false;
+    }
+
+    return true;
+}
+
+bool LoadArray(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
+{
+    const char* name = definition->getAttr("name");
+    if (0 == strlen(name))
+    {
+        CryLog("Array has no name");
+        return false;
+    }
+
+    const char* elementName = definition->getAttr("elementName");
+    if (0 == strlen(elementName))
+    {
+        elementName = "element";
+    }
+
+    bool validateArray = true;
+    if (definition->haveAttr(elementName))
+    {
+        definition->getAttr("validate", validateArray);
+    }
+
+
+    XmlNodeRef childData;
+
+    if (!pSink->IsCreationMode())
+    {
+        childData = data->findChild(name);
+        if (!childData)
+        {
+            bool ok = IsOptionalReadXML(parseParams, definition);
+            if (!ok)
+            {
+                CryLog("Failed to load child table %s", name);
+            }
+            return ok;
+        }
+    }
+
+    IReadXMLSinkPtr childSink = pSink->BeginArray(name, definition);
+    if (!childSink)
+    {
+        CryLog("Failed to begin array named %s", name);
+        return false;
+    }
+
+    LoadArraySetValue setter = NULL;
+    if (definition->haveAttr("type"))
+    {
+        setter = NULL;
+        const char* type = definition->getAttr("type");
+#define SETTER_PROPERTY(whichType) else if (0 == strcmp(type, #whichType)) setter = ReadPropertyTyped<whichType>::LoadArray
+        XML_SET_PROPERTY_HELPER(SETTER_PROPERTY);
+#undef SETTER_PROPERTY
+        if (!setter)
+        {
+            CryLog("Unknown type %s in array %s", type, name);
+            return false;
+        }
+    }
+    else
+    {
+        setter = LoadArraySetValueTable;
+    }
+
+    if (!pSink->IsCreationMode())
+    {
+        int numElems = childData->getChildCount();
+        int elem = 1;
+        for (int i = 0; i < numElems; i++)
+        {
+            XmlNodeRef elemData = childData->getChild(i);
+            if (0 == strcmp(elemData->getTag(), elementName))
+            {
+                int increment = 1;
+                if (elemData->haveAttr("_index"))
+                {
+                    if (!elemData->getAttr("_index", elem))
+                    {
+                        CryLog("_index is not an integer in array %s (pos hint=%d)", name, elem);
+                        return false;
+                    }
+                }
+                if (!setter(parseParams, definition, elemData, &*childSink, elem))
+                {
+                    CryLog("Failed loading element %d of array %s", elem, name);
+                    return false;
+                }
+                elem += increment;
+            }
+            else if (validateArray)
+            {
+                CryLog("Invalid node %s in array %s", elemData->getTag(), name);
+                return false;
+            }
+        }
+    }
+    else
+    {
+        // only process array content for the array being created
+        if (0 == strcmp(name, pSink->GetCreationNode()->getAttr("name")))
+        {
+            if (!setter(parseParams, definition, data, &*childSink, 1))
+            {
+                CryLog("[ReadXML CreationMode]: Failed loading element %d of array %s", 1, name);
+                return false;
+            }
+        }
+    }
+
+    if (!pSink->EndArray(name))
+    {
+        CryLog("Failed to finish array named %s", name);
+        return false;
+    }
+
+    return true;
+}
+
+bool LoadTable(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
+{
+    const char* name = definition->getAttr("name");
+    if (0 == strlen(name))
+    {
+        CryLog("Child-table has no name");
+        return false;
+    }
+
+    XmlNodeRef childData;
+
+    if (!pSink->IsCreationMode())
+    {
+        childData = data->findChild(name);
+        if (!childData)
+        {
+            bool ok = IsOptionalReadXML(parseParams, definition);
+            if (!ok)
+            {
+                CryLog("Failed to load child table %s", name);
+            }
+            return ok;
+        }
+    }
+
+    IReadXMLSinkPtr childSink = pSink->BeginTable(name, definition);
+    if (!childSink)
+    {
+        CryLog("Sink creation failed for table %s", name);
+        return false;
+    }
+
+
+    if (!LoadTableInner(parseParams, definition, childData, childSink))
+    {
+        CryLog("Failed to load data for child table %s", name);
+        return false;
+    }
+
+    if (!pSink->EndTable(name))
+    {
+        CryLog("Table %s failed to complete in sink", name);
+        return false;
+    }
+
+    return true;
+}
+
+bool LoadSomething(const SParseParams& parseParams, XmlNodeRef& nodeDefinition, XmlNodeRef& data, IReadXMLSink* pSink)
+{
+    // Ignore if it's the useAlways array
+    if (parseParams.useAlways == nodeDefinition)
+    {
+        return true;
+    }
+
+    static struct
+    {
+        const char* name;
+        LoadDefinitionFunction loader;
+    } loaderTypes[] = {
+        {"Property", &LoadProperty},
+        {"Array", &LoadArray},
+        {"Table", &LoadTable},
+        {"Use", &LoadReferencedId},
+    };
+    static const int numLoaderTypes = sizeof(loaderTypes) / sizeof(*loaderTypes);
+
+    const char* nodeDefinitionTag = nodeDefinition->getTag();
+    bool ok = false;
+    int i;
+
+    for (i = 0; i < numLoaderTypes; i++)
+    {
+        if (0 == strcmp(loaderTypes[i].name, nodeDefinitionTag))
+        {
+            ok = loaderTypes[i].loader(parseParams, nodeDefinition, data, pSink);
+            break;
+        }
+    }
+
+    if (0 == _stricmp("Settings", nodeDefinitionTag))
+    {
+        return true;
+    }
+
+    if (!ok)
+    {
+        if (i == numLoaderTypes)
+        {
+            CryLog("Invalid definition node type %s, line %d", nodeDefinitionTag, nodeDefinition->getLine());
+        }
+    }
+    return ok;
+}
+
+bool LoadReferencedId(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
+{
+    IdTable::const_iterator iter = parseParams.idTable.find(definition->getAttr("id"));
+    if (iter == parseParams.idTable.end())
+    {
+        CryLog("No definition with id '%s'", definition->getAttr("id"));
+        return false;
+    }
+    XmlNodeRef useDefinition = Clone(iter->second);
+    CopyAttributes(definition, useDefinition);
+
+    return LoadSomething(parseParams, useDefinition, data, pSink);
+}
+
+bool LoadTableInner(const SParseParams& parseParams, XmlNodeRef& definition, XmlNodeRef& data, IReadXMLSink* pSink)
+{
+    const int nChildrenDefinition = definition->getChildCount();
+
+    for (int nChildDefinition = 0; nChildDefinition < nChildrenDefinition; nChildDefinition++)
+    {
+        XmlNodeRef nodeDefinition = definition->getChild(nChildDefinition);
+
+        if (!LoadSomething(parseParams, nodeDefinition, data, pSink))
+        {
+            return false;
+        }
+    }
+
+    if (parseParams.useAlways != (IXmlNode*)NULL)
+    {
+        assert(!definition->haveAttr("type"));
+
+        const int nUseAlwaysDefCount = parseParams.useAlways->getChildCount();
+        for (int i = 0; i < nUseAlwaysDefCount; ++i)
+        {
+            XmlNodeRef nodeDefinition = parseParams.useAlways->getChild(i);
+
+            // Don't continue loading useAlways nodes in creation mode
+            if (!pSink->IsCreationMode())
+            {
+                if (!LoadSomething(parseParams, nodeDefinition, data, pSink))
+                {
+                    return false;
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+bool CReadWriteXMLSink::ReadXML(XmlNodeRef rootDefinition, XmlNodeRef rootData, IReadXMLSink* pSink)
+{
+    if (!pSink->IsCreationMode())
+    {
+        if (0 == rootData)
+        {
+            return false;
+        }
+
+        if (0 != strcmp(rootDefinition->getTag(), "Definition"))
+        {
+            CryLog("Root tag of definition file was %s; expected Definition", rootDefinition->getTag());
+            return false;
+        }
+        if (rootDefinition->haveAttr("root"))
+        {
+            if (0 != strcmp(rootDefinition->getAttr("root"), rootData->getTag()))
+            {
+                CryLog("Root data has wrong tag; was %s expected %s", rootData->getTag(), rootDefinition->getAttr("root"));
+                return false;
+            }
+        }
+    }
+
+    SParseParams parseParams;
+    parseParams.useAlways = rootDefinition->findChild("AllowAlways");
+
+    if (XmlNodeRef settingsParams = rootDefinition->findChild("Settings"))
+    {
+        settingsParams->getAttr("strict", parseParams.strict);
+    }
+
+    // scan for id's in the structure (for the Use member)
+    std::stack<XmlNodeRef> scanStack;
+    scanStack.push(rootDefinition);
+    while (!scanStack.empty())
+    {
+        XmlNodeRef refNode = scanStack.top();
+        scanStack.pop();
+
+        int numChildren = refNode->getChildCount();
+        const char* tag = refNode->getTag();
+
+        for (int i = 0; i < numChildren; i++)
+        {
+            const XmlNodeRef& childNodeRef = refNode->getChild(i);
+            if (parseParams.useAlways != childNodeRef)
+            {
+                scanStack.push(childNodeRef);
+            }
+        }
+
+        // If the element has an attribute id="" and is not a "<Use>" element add it to the idTable map
+        if (refNode->haveAttr("id") && 0 != strcmp("Use", tag))
+        {
+            parseParams.idTable[refNode->getAttr("id")] = refNode;
+        }
+    }
+
+    if (pSink->IsCreationMode() && rootDefinition->haveAttr("type"))
+    {
+        // if creating from a 0-child definition node, load itself
+        if (!LoadSomething(parseParams, rootDefinition, rootData, pSink))
+        {
+            return false;
+        }
+    }
+    else
+    {
+        // load content
+        if (!LoadTableInner(parseParams, rootDefinition, rootData, pSink))
+        {
+            return false;
+        }
+    }
+
+    bool ok = pSink->Complete();
+    if (!ok)
+    {
+        CryLog("Warning: sink failed to complete reading");
+    }
+
+    return ok;
+}
+
+bool CReadWriteXMLSink::ReadXML(XmlNodeRef definition, const char* dataFile, IReadXMLSink* pSink)
+{
+    XmlNodeRef rootData = GetISystem()->LoadXmlFromFile(dataFile);
+    if (!rootData)
+    {
+        CryLog("Unable to load XML-Lua data file: %s", dataFile);
+        return false;
+    }
+    return ReadXML(definition, rootData, pSink);
+}
+
+bool CReadWriteXMLSink::ReadXML(const char* definitionFile, XmlNodeRef rootData, IReadXMLSink* pSink)
+{
+    XmlNodeRef rootDefinition = GetISystem()->LoadXmlFromFile(definitionFile);
+    if (!rootDefinition)
+    {
+        CryLog("Unable to load XML-Lua definition file: %s", definitionFile);
+        return false;
+    }
+    return ReadXML(rootDefinition, rootData, pSink);
+}
+
+bool CReadWriteXMLSink::ReadXML(const char* definitionFile, const char* dataFile, IReadXMLSink* pSink)
+{
+    XmlNodeRef rootData = GetISystem()->LoadXmlFromFile(dataFile);
+    if (!rootData)
+    {
+        CryLog("Unable to load XML-Lua data file: %s", dataFile);
+        return false;
+    }
+    if (!ReadXML(definitionFile, rootData, pSink))
+    {
+        CryLog("Unable to load file %s", dataFile);
+        return false;
+    }
+    return true;
+}
+
+
diff --git a/Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp b/Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp
new file mode 100644
index 0000000000..96c222a7a2
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp
@@ -0,0 +1,204 @@
+/*
+ * 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 "SerializeXMLReader.h"
+#include <ISystem.h>
+
+#define TAG_SCRIPT_VALUE "v"
+#define TAG_SCRIPT_TYPE "t"
+#define TAG_SCRIPT_NAME "n"
+
+//#define LOG_SERIALIZE_STACK(tag,szName) CryLogAlways( "<%s> %s/%s",tag,GetStackInfo(),szName );
+#define LOG_SERIALIZE_STACK(tag, szName)
+
+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);
+}
+
+bool CSerializeXMLReaderImpl::Value(const char* name, int8& value)
+{
+    DefaultValue(value); // Set input value to default.
+    if (m_nErrors)
+    {
+        return false;
+    }
+    int temp;
+    bool bResult = Value(name, temp);
+    if (temp < -128 || temp > 127)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Attribute %s is out of range (%d)", name, temp);
+        Failed();
+        bResult = false;
+    }
+    else
+    {
+        value = temp;
+    }
+    return bResult;
+}
+
+bool CSerializeXMLReaderImpl::Value(const char* name, string& value)
+{
+    DefaultValue(value); // Set input value to default.
+    if (m_nErrors)
+    {
+        return false;
+    }
+    if (!CurNode()->haveAttr(name))
+    {
+        //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"No such attribute %s (invalid type?)", name);
+        //Failed();
+        return false;
+    }
+    else
+    {
+        value = CurNode()->getAttr(name);
+    }
+    return true;
+}
+
+bool CSerializeXMLReaderImpl::Value(const char* name, CTimeValue& value)
+{
+    DefaultValue(value); // Set input value to default.
+    if (m_nErrors)
+    {
+        return false;
+    }
+    XmlNodeRef nodeRef = CurNode();
+    if (!nodeRef)
+    {
+        return false;
+    }
+    if (0 == strcmp("zero", nodeRef->getAttr(name)))
+    {
+        value = CTimeValue(0.0f);
+    }
+    else
+    {
+        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)
+            // 0.0 means current time, whereas "zero" really means CTimeValue(0.0), see above
+            return false;
+        }
+        else
+        {
+            value = CTimeValue(gEnv->pTimer->GetFrameStartTime() + delta);
+        }
+    }
+    return true;
+}
+
+bool CSerializeXMLReaderImpl::Value(const char* name, XmlNodeRef& value)
+{
+    DefaultValue(value); // Set input value to default.
+    if (m_nErrors)
+    {
+        return false;
+    }
+
+    if (BeginOptionalGroup(name, true))
+    {
+        value = CurNode()->getChild(0);
+        EndGroup();
+    }
+
+    return true;
+}
+
+void CSerializeXMLReaderImpl::BeginGroup(const char* szName)
+{
+    if (m_nErrors)
+    {
+        //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"BeginGroup %s called on non-existant group", szName);
+        m_nErrors++;
+    }
+    else if (XmlNodeRef node = NextOf(szName))
+    {
+        m_nodeStack.push_back(CParseState());
+        m_nodeStack.back().Init(node);
+        LOG_SERIALIZE_STACK("BeginGroup:ok", szName);
+    }
+    else
+    {
+        LOG_SERIALIZE_STACK("BeginGroup:fail", szName);
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!BeginGroup( %s ) not found", szName);
+        m_nErrors++;
+    }
+}
+
+bool CSerializeXMLReaderImpl::BeginOptionalGroup(const char* szName, [[maybe_unused]] bool condition)
+{
+    if (m_nErrors)
+    {
+        //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"BeginOptionalGroup %s called on non-existant group", szName);
+        m_nErrors++;
+    }
+    else if (XmlNodeRef node = NextOf(szName))
+    {
+        m_nodeStack.push_back(CParseState());
+        m_nodeStack.back().Init(node);
+        LOG_SERIALIZE_STACK("BeginOptionalGroup:ok", szName);
+        return true;
+    }
+    LOG_SERIALIZE_STACK("BeginOptionalGroup:fail", szName);
+    return false;
+}
+
+void CSerializeXMLReaderImpl::EndGroup()
+{
+    if (m_nErrors)
+    {
+        m_nErrors--;
+    }
+    else
+    {
+        LOG_SERIALIZE_STACK("EndGroup", "");
+        m_nodeStack.pop_back();
+    }
+    assert(!m_nodeStack.empty());
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CSerializeXMLReaderImpl::GetStackInfo() const
+{
+    static string str;
+    str.assign("");
+    for (int i = 0; i < (int)m_nodeStack.size(); i++)
+    {
+        const char* name = m_nodeStack[i].m_node->getAttr(TAG_SCRIPT_NAME);
+        if (name && name[0])
+        {
+            str += name;
+        }
+        else
+        {
+            str += m_nodeStack[i].m_node->getTag();
+        }
+        if (i != m_nodeStack.size() - 1)
+        {
+            str += "/";
+        }
+    }
+    return str.c_str();
+}
+
+void CSerializeXMLReaderImpl::GetMemoryUsage(ICrySizer* pSizer) const
+{
+    pSizer->Add(*this);
+    pSizer->AddContainer(m_nodeStack);
+}
diff --git a/Code/Legacy/CrySystem/XML/SerializeXMLReader.h b/Code/Legacy/CrySystem/XML/SerializeXMLReader.h
new file mode 100644
index 0000000000..85ec08cb6c
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/SerializeXMLReader.h
@@ -0,0 +1,182 @@
+/*
+ * 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_XML_SERIALIZEXMLREADER_H
+#define CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLREADER_H
+#pragma once
+
+
+#include "SimpleSerialize.h"
+#include <stack>
+#include <IXml.h>
+#include <ITimer.h>
+#include <IValidator.h>
+#include <ISystem.h>
+#include "xml.h"
+
+class CSerializeXMLReaderImpl
+    : public CSimpleSerializeImpl<true, eST_SaveGame>
+{
+public:
+    CSerializeXMLReaderImpl(const XmlNodeRef& nodeRef);
+
+    template <class T_Value>
+    ILINE bool GetAttr(const XmlNodeRef& node, const char* name, T_Value& value)
+    {
+        XmlStrCmpFunc pPrevCmpFunc = g_pXmlStrCmp;
+        g_pXmlStrCmp = &strcmp; // Do case-sensitive compare
+        bool bReturn = node->getAttr(name, value);
+        g_pXmlStrCmp = pPrevCmpFunc;
+        return bReturn;
+    }
+    ILINE bool GetAttr(const XmlNodeRef& node, const char* name, SSerializeString& value)
+    {
+        XmlStrCmpFunc pPrevCmpFunc = g_pXmlStrCmp;
+        g_pXmlStrCmp = &strcmp; // Do case-sensitive compare
+        bool bReturn = node->haveAttr(name);
+        if (bReturn)
+        {            
+            value = node->getAttr(name);
+        }
+        g_pXmlStrCmp = pPrevCmpFunc;
+        return bReturn;
+    }
+    ILINE bool GetAttr([[maybe_unused]] XmlNodeRef& node, [[maybe_unused]] const char* name, [[maybe_unused]] const string& value)
+    {
+        return false;
+    }
+    ILINE bool GetAttr([[maybe_unused]] const XmlNodeRef& node, [[maybe_unused]] const char* name, [[maybe_unused]] SNetObjectID& value)
+    {
+        return false;
+    }
+
+    template <class T_Value>
+    bool Value(const char* name, T_Value& value)
+    {
+        DefaultValue(value); // Set input value to default.
+        if (m_nErrors)
+        {
+            return false;
+        }
+
+        if (!GetAttr(CurNode(), name, value))
+        {
+            //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"Unable to read attribute %s (invalid type?)", name);
+            //Failed();
+            return false;
+        }
+        return true;
+    }
+
+    bool Value(const char* name, int8& value);
+    bool Value(const char* name, string& value);
+    bool Value(const char* name, CTimeValue& value);
+    bool Value(const char* name, XmlNodeRef& value);
+
+    template <class T_Value, class T_Policy>
+    bool Value(const char* name, T_Value& value, [[maybe_unused]] const T_Policy& policy)
+    {
+        return Value(name, value);
+    }
+
+    void BeginGroup(const char* szName);
+    bool BeginOptionalGroup(const char* szName, bool condition);
+    void EndGroup();
+    const char* GetStackInfo() const;
+
+    void GetMemoryUsage(ICrySizer* pSizer) const;
+
+private:
+    //CTimeValue m_curTime;
+    XmlNodeRef CurNode() { return m_nodeStack.back().m_node; }
+    XmlNodeRef NextOf(const char* name)
+    {
+        XmlStrCmpFunc pPrevCmpFunc = g_pXmlStrCmp;
+        g_pXmlStrCmp = &strcmp; // Do case-sensitive compare
+        assert(!m_nodeStack.empty());
+        CParseState& ps = m_nodeStack.back();
+        XmlNodeRef node = ps.GetNext(name);
+        g_pXmlStrCmp = pPrevCmpFunc;
+        return node;
+    }
+
+    class CParseState
+    {
+    public:
+        CParseState() {}
+        void Init(const XmlNodeRef& node)
+        {
+            m_node = node;
+            m_nCurrent = 0;
+        }
+
+        XmlNodeRef GetNext(const char* name)
+        {
+            int i;
+            int num = m_node->getChildCount();
+            for (i = m_nCurrent; i < num; i++)
+            {
+                XmlNodeRef child = m_node->getChild(i);
+                if (strcmp(child->getTag(), name) == 0)
+                {
+                    m_nCurrent = i + 1;
+                    return child;
+                }
+            }
+            int ncount = min(m_nCurrent, num);
+            // Try searching from begining.
+            for (i = 0; i < ncount; i++)
+            {
+                XmlNodeRef child = m_node->getChild(i);
+                if (strcmp(child->getTag(), name) == 0)
+                {
+                    m_nCurrent = i + 1;
+                    return child;
+                }
+            }
+            return XmlNodeRef();
+        }
+
+    public:
+        // TODO: make this much more efficient
+        int m_nCurrent;
+        XmlNodeRef m_node;
+    };
+
+    int m_nErrors;
+    std::vector<CParseState> m_nodeStack;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set Defaults.
+    //////////////////////////////////////////////////////////////////////////
+    void DefaultValue(bool& v) const { v = false; }
+    void DefaultValue(float& v) const { v = 0; }
+    void DefaultValue(double& v) const { v = 0; }
+    void DefaultValue(int8& v) const { v = 0; }
+    void DefaultValue(uint8& v) const { v = 0; }
+    void DefaultValue(int16& v) const { v = 0; }
+    void DefaultValue(uint16& v) const { v = 0; }
+    void DefaultValue(int32& v) const { v = 0; }
+    void DefaultValue(uint32& v) const { v = 0; }
+    void DefaultValue(int64& v) const { v = 0; }
+    void DefaultValue(uint64& v) const { v = 0; }
+    void DefaultValue(Vec2& v) const { v.x = 0; v.y = 0; }
+    void DefaultValue(Vec3& v) const { v.x = 0; v.y = 0; v.z = 0; }
+    void DefaultValue(Ang3& v) const { v.x = 0; v.y = 0; v.z = 0; }
+    void DefaultValue(Quat& v) const { v.w = 1.0f; v.v.x = 0; v.v.y = 0; v.v.z = 0; }
+    void DefaultValue(CTimeValue& v) const { v.SetValue(0); }
+    //void DefaultValue( char *str ) const { if (str) str[0] = 0; }
+    void DefaultValue(string& str) const { str = ""; }
+    void DefaultValue([[maybe_unused]] const string& str) const {}
+    void DefaultValue([[maybe_unused]] SNetObjectID& id) const {}
+    void DefaultValue([[maybe_unused]] SSerializeString& str) const {}
+    void DefaultValue(XmlNodeRef& ref) const { ref = NULL; }
+    //////////////////////////////////////////////////////////////////////////
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLREADER_H
diff --git a/Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp
new file mode 100644
index 0000000000..d5e5340d22
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp
@@ -0,0 +1,152 @@
+/*
+ * 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 "SerializeXMLWriter.h"
+
+static const size_t MAX_NODE_STACK_DEPTH = 40;
+
+#define TAG_SCRIPT_VALUE "v"
+#define TAG_SCRIPT_TYPE "t"
+#define TAG_SCRIPT_NAME "n"
+
+CSerializeXMLWriterImpl::CSerializeXMLWriterImpl(const XmlNodeRef& nodeRef)
+{
+    m_curTime = gEnv->pTimer->GetFrameStartTime();
+    assert(!!nodeRef);
+    m_nodeStack.push_back(nodeRef);
+
+    m_luaSaveStack.reserve(10);
+}
+
+//////////////////////////////////////////////////////////////////////////
+CSerializeXMLWriterImpl::~CSerializeXMLWriterImpl()
+{
+    if (m_nodeStack.size() != 1)
+    {
+        // Node stack is incorrect.
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!BeginGroup/EndGroup mismatch in SaveGame");
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CSerializeXMLWriterImpl::Value(const char* name, CTimeValue value)
+{
+    if (value == CTimeValue(0.0f))
+    {
+        AddValue(name, "zero");
+    }
+    else
+    {
+        AddValue(name, (value - m_curTime).GetSeconds());
+    }
+    return true;
+}
+
+bool CSerializeXMLWriterImpl::Value(const char* name, XmlNodeRef& value)
+{
+    if (BeginOptionalGroup(name, value != NULL))
+    {
+        CurNode()->addChild(value);
+        EndGroup();
+    }
+    return true;
+}
+
+void CSerializeXMLWriterImpl::BeginGroup(const char* szName)
+{
+    if (strchr(szName, ' ') != 0)
+    {
+        assert(0 && "Spaces in group name not supported");
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Spaces in group name not supported: %s/%s", GetStackInfo(), szName);
+    }
+    XmlNodeRef node = CreateNodeNamed(szName);
+    CurNode()->addChild(node);
+    m_nodeStack.push_back(node);
+    if (m_nodeStack.size() > MAX_NODE_STACK_DEPTH)
+    {
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Too Deep Node Stack:\r\n%s", GetStackInfo());
+    }
+}
+
+bool CSerializeXMLWriterImpl::BeginOptionalGroup(const char* szName, bool condition)
+{
+    if (condition)
+    {
+        BeginGroup(szName);
+        return true;
+    }
+
+    return condition;
+}
+
+XmlNodeRef CSerializeXMLWriterImpl::CreateNodeNamed(const char* name)
+{
+    XmlNodeRef newNode = CurNode()->createNode(name);
+    return newNode;
+}
+
+void CSerializeXMLWriterImpl::EndGroup()
+{
+    if (m_nodeStack.size() == 1)
+    {
+        //
+        CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Misplaced EndGroup() for BeginGroup(%s)", CurNode()->getTag());
+    }
+    assert(!m_nodeStack.empty());
+    m_nodeStack.pop_back();
+    assert(!m_nodeStack.empty());
+}
+
+void CSerializeXMLWriterImpl::GetMemoryUsage(ICrySizer* pSizer) const
+{
+    pSizer->Add(*this);
+    pSizer->AddObject(m_nodeStack);
+    pSizer->AddContainer(m_luaSaveStack);
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CSerializeXMLWriterImpl::GetStackInfo() const
+{
+    static string str;
+    str.assign("");
+    for (int i = 0; i < (int)m_nodeStack.size(); i++)
+    {
+        const char* name = m_nodeStack[i]->getAttr(TAG_SCRIPT_NAME);
+        if (name && name[0])
+        {
+            str += name;
+        }
+        else
+        {
+            str += m_nodeStack[i]->getTag();
+        }
+        if (i != m_nodeStack.size() - 1)
+        {
+            str += "/";
+        }
+    }
+    return str.c_str();
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CSerializeXMLWriterImpl::GetLuaStackInfo() const
+{
+    static string str;
+    str.assign("");
+    for (int i = 0; i < (int)m_luaSaveStack.size(); i++)
+    {
+        const char* name = m_luaSaveStack[i];
+        str += name;
+        if (i != m_luaSaveStack.size() - 1)
+        {
+            str += ".";
+        }
+    }
+    return str.c_str();
+}
diff --git a/Code/Legacy/CrySystem/XML/SerializeXMLWriter.h b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.h
new file mode 100644
index 0000000000..b40467db03
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.h
@@ -0,0 +1,151 @@
+/*
+ * 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_XML_SERIALIZEXMLWRITER_H
+#define CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLWRITER_H
+#pragma once
+
+
+#include <ISystem.h>
+#include <ITimer.h>
+#include <IXml.h>
+#include "IValidator.h"
+#include "SimpleSerialize.h"
+
+class CSerializeXMLWriterImpl
+    : public CSimpleSerializeImpl<false, eST_SaveGame>
+{
+public:
+    CSerializeXMLWriterImpl(const XmlNodeRef& nodeRef);
+    ~CSerializeXMLWriterImpl();
+
+    template <class T_Value>
+    bool Value(const char* name, T_Value& value)
+    {
+        AddValue(name, value);
+        return true;
+    }
+
+    template <class T_Value, class T_Policy>
+    bool Value(const char* name, T_Value& value, [[maybe_unused]] const T_Policy& policy)
+    {
+        return Value(name, value);
+    }
+
+    bool Value(const char* name, CTimeValue value);
+    bool Value(const char* name, XmlNodeRef& value);
+
+    void BeginGroup(const char* szName);
+    bool BeginOptionalGroup(const char* szName, bool condition);
+    void EndGroup();
+
+    void GetMemoryUsage(ICrySizer* pSizer) const;
+
+private:
+    //////////////////////////////////////////////////////////////////////////
+    // Vars.
+    //////////////////////////////////////////////////////////////////////////
+    CTimeValue m_curTime;
+
+    std::vector<XmlNodeRef> m_nodeStack;
+    std::vector<const char*> m_luaSaveStack;
+    //////////////////////////////////////////////////////////////////////////
+
+
+    ILINE const XmlNodeRef& CurNode()
+    {
+        assert(!m_nodeStack.empty());
+        if (m_nodeStack.empty())
+        {
+            static XmlNodeRef temp = GetISystem()->CreateXmlNode("Error");
+            return temp;
+        }
+        return m_nodeStack.back();
+    }
+
+    XmlNodeRef CreateNodeNamed(const char* name);
+
+    template <class T>
+    void AddValue(const char* name, const T& value)
+    {
+        if (strchr(name, ' ') != 0)
+        {
+            assert(0 && "Spaces in Value name not supported");
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Spaces in Value name not supported: %s in Group %s", name, GetStackInfo());
+            return;
+        }
+        if (GetISystem()->IsDevMode() && CurNode())
+        {
+            // Check if this attribute already added.
+            if (CurNode()->haveAttr(name))
+            {
+                assert(0);
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "!Duplicate tag Value( \"%s\" ) in Group %s", name, GetStackInfo());
+            }
+        }
+
+        if (!IsDefaultValue(value))
+        {
+            CurNode()->setAttr(name, value);
+        }
+    }
+    void AddValue(const char* name, const SSerializeString& value)
+    {
+        AddValue(name, value.c_str());
+    }
+    void AddValue([[maybe_unused]] const char* name, [[maybe_unused]] const SNetObjectID& value)
+    {
+        assert(false);
+    }
+    template <class T>
+    void AddTypedValue(const char* name, const T& value, const char* type)
+    {
+        if (!IsDefaultValue(value))
+        {
+            XmlNodeRef newNode = CreateNodeNamed(name);
+            newNode->setAttr("v", value);
+            newNode->setAttr("t", type);
+        }
+    }
+
+    // Used for printing currebnt stack info for warnings.
+    const char* GetStackInfo() const;
+    const char* GetLuaStackInfo() const;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Check For Defaults.
+    //////////////////////////////////////////////////////////////////////////
+    bool IsDefaultValue(bool v) const { return v == false; };
+    bool IsDefaultValue(float v) const { return v == 0; };
+    bool IsDefaultValue(double v) const { return v == 0; };
+    bool IsDefaultValue(int8 v) const { return v == 0; };
+    bool IsDefaultValue(uint8 v) const { return v == 0; };
+    bool IsDefaultValue(int16 v) const { return v == 0; };
+    bool IsDefaultValue(uint16 v) const { return v == 0; };
+    bool IsDefaultValue(int32 v) const { return v == 0; };
+    bool IsDefaultValue(uint32 v) const { return v == 0; };
+    bool IsDefaultValue(int64 v) const { return v == 0; };
+    bool IsDefaultValue(uint64 v) const { return v == 0; };
+    bool IsDefaultValue(const Vec2& v) const { return v.x == 0 && v.y == 0; };
+    bool IsDefaultValue(const Vec3& v) const { return v.x == 0 && v.y == 0 && v.z == 0; };
+    bool IsDefaultValue(const Ang3& v) const { return v.x == 0 && v.y == 0 && v.z == 0; };
+    bool IsDefaultValue(const Quat& v) const { return v.w == 1.0f && v.v.x == 0 && v.v.y == 0 && v.v.z == 0; };
+    bool IsDefaultValue(const CTimeValue& v) const { return v.GetValue() == 0; };
+    bool IsDefaultValue(const char* str) const { return !str || !*str; };
+    bool IsDefaultValue(const string& str) const { return str.empty(); };
+    bool IsDefaultValue(const SSerializeString& str) const { return str.empty(); };
+    //////////////////////////////////////////////////////////////////////////
+
+    /*
+
+    template <class T>
+    bool IsDefaultValue( const T& v ) const { return false; };
+    */
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_SERIALIZEXMLWRITER_H
diff --git a/Code/Legacy/CrySystem/XML/WriteXMLSource.cpp b/Code/Legacy/CrySystem/XML/WriteXMLSource.cpp
new file mode 100644
index 0000000000..ff86bfcc92
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/WriteXMLSource.cpp
@@ -0,0 +1,430 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include "CrySystem_precompiled.h"
+#include "ReadWriteXMLSink.h"
+
+#include <stack>
+
+typedef std::map<string, XmlNodeRef> IdTable;
+
+static bool IsOptionalWriteXML(XmlNodeRef& definition);
+
+static bool SaveTableInner(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
+static bool SaveReferencedId(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
+static bool SaveSomething(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
+static bool SaveArray(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
+static bool SaveProperty(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
+static bool SaveTable(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
+static bool SaveArraySetValueTable(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource, int elem);
+
+typedef bool (* SaveArraySetValue)(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource, int elem);
+typedef bool (* SaveDefinitionFunction)(const IdTable&, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource);
+
+template <class T>
+struct WritePropertyTyped;
+
+template <class T>
+struct WritePropertyTyped
+{
+    static bool Save(const char* name, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
+    {
+        IWriteXMLSource::TValue vvalue((T()));
+        if (!pSource->GetValue(name, vvalue, definition))
+        {
+            return false;
+        }
+        T* pValue = AZStd::get_if<T>(&vvalue);
+        if (!pValue)
+        {
+            return false;
+        }
+        data->setAttr(name, *pValue);
+        return true;
+    }
+    static bool SaveArray([[maybe_unused]] const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource, int elem)
+    {
+        IWriteXMLSource::TValue vvalue((T()));
+        if (!pSource->GetAt(elem, vvalue, definition))
+        {
+            return false;
+        }
+        T* pValue = AZStd::get_if<T>(&vvalue);
+        if (!pValue)
+        {
+            return false;
+        }
+        data->setAttr("value", *pValue);
+        return true;
+    }
+};
+
+template <>
+struct WritePropertyTyped<string>
+    : public WritePropertyTyped<const char*>
+{
+};
+
+bool IsOptionalWriteXML(XmlNodeRef& definition)
+{
+    bool optional = false;
+    definition->getAttr("optional", optional);
+    return optional;
+}
+
+bool SaveProperty([[maybe_unused]] const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
+{
+    const char* name = definition->getAttr("name");
+    if (0 == strlen(name))
+    {
+        CryLog("Property has no name");
+        return false;
+    }
+
+    const char* type = definition->getAttr("type");
+    if (0 == strlen(type))
+    {
+        CryLog("Property '%s' has no type", type);
+        return false;
+    }
+
+    if (IsOptionalWriteXML(definition) && !pSource->HaveValue(name))
+    {
+        return true;
+    }
+
+    bool ok = false;
+#define SAVE_PROPERTY(whichType) else if (0 == strcmp(type, #whichType)) ok = WritePropertyTyped<whichType>::Save(name, definition, data, pSource)
+    XML_SET_PROPERTY_HELPER(SAVE_PROPERTY);
+#undef SAVE_PROPERTY
+
+    if (!ok)
+    {
+        CryLog("Failed loading attribute %s of type %s", name, type);
+    }
+
+    return ok;
+}
+
+bool SaveArraySetValueTable(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource, int elem)
+{
+    IWriteXMLSourcePtr pChildSource = pSource->BeginTableAt(elem);
+    if (!pChildSource)
+    {
+        CryLog("Failed to find source table at %d", elem);
+        return false;
+    }
+
+    if (!SaveTableInner(idTable, definition, data, &*pChildSource))
+    {
+        return false;
+    }
+
+    if (!pChildSource->EndTableAt(elem))
+    {
+        CryLog("Failed to finish table at element %d", elem);
+        return false;
+    }
+
+    return true;
+}
+
+bool SaveArray(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
+{
+    const char* name = definition->getAttr("name");
+    if (0 == strlen(name))
+    {
+        CryLog("Array has no name");
+        return false;
+    }
+
+    const char* elementName = definition->getAttr("elementName");
+    if (0 == strlen(elementName))
+    {
+        elementName = "element";
+    }
+
+    bool validateArray = true;
+    if (definition->haveAttr(elementName))
+    {
+        definition->getAttr("validate", validateArray);
+    }
+
+    size_t numElems = 0;
+    IWriteXMLSourcePtr childSource = pSource->BeginArray(name, &numElems, definition);
+    if (!childSource)
+    {
+        bool ok = IsOptionalWriteXML(definition);
+        if (!ok)
+        {
+            CryLog("Failed to begin array named %s", name);
+        }
+        return ok;
+    }
+
+    XmlNodeRef childData = data->createNode(name);
+
+    SaveArraySetValue setter = NULL;
+    if (definition->haveAttr("type"))
+    {
+        setter = NULL;
+        const char* type = definition->getAttr("type");
+#define SETTER_PROPERTY(whichType) else if (0 == strcmp(type, #whichType)) setter = WritePropertyTyped<whichType>::SaveArray
+        XML_SET_PROPERTY_HELPER(SETTER_PROPERTY);
+#undef SETTER_PROPERTY
+        if (!setter)
+        {
+            CryLog("Unknown type %s in array %s", type, name);
+            return false;
+        }
+    }
+    else
+    {
+        setter = SaveArraySetValueTable;
+    }
+
+    bool needIndex = false;
+    for (size_t i = 1; i <= numElems; i++)
+    {
+        if (!childSource->HaveElemAt(i))
+        {
+            needIndex = true;
+        }
+        else
+        {
+            XmlNodeRef elemData = childData->createNode(elementName);
+            if (needIndex)
+            {
+                elemData->setAttr("_index", i);
+            }
+            needIndex = false;
+
+            if (!setter(idTable, definition, elemData, &*childSource, i))
+            {
+                CryLog("Failed saving element %d of array %s", int(i), name);
+                return false;
+            }
+
+            childData->addChild(elemData);
+        }
+    }
+
+    if (!pSource->EndArray(name))
+    {
+        CryLog("Failed to finish array named %s", name);
+        return false;
+    }
+
+    data->addChild(childData);
+
+    return true;
+}
+
+bool SaveTable(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
+{
+    const char* name = definition->getAttr("name");
+    if (0 == strlen(name))
+    {
+        CryLog("Child-table has no name");
+        return false;
+    }
+
+    IWriteXMLSourcePtr childSource = pSource->BeginTable(name);
+    if (!childSource)
+    {
+        bool ok = IsOptionalWriteXML(definition);
+        if (!ok)
+        {
+            CryLog("Source creation failed for table %s", name);
+        }
+        return ok;
+    }
+
+    XmlNodeRef childData = data->createNode(name);
+
+    if (!SaveTableInner(idTable, definition, childData, childSource))
+    {
+        CryLog("Failed to load data for child table %s", name);
+        return false;
+    }
+
+    if (!pSource->EndTable(name))
+    {
+        CryLog("Table %s failed to complete in sink", name);
+        return false;
+    }
+
+    data->addChild(childData);
+
+    return true;
+}
+
+bool SaveSomething(const IdTable& idTable, XmlNodeRef& nodeDefinition, XmlNodeRef& data, IWriteXMLSource* pSource)
+{
+    static struct
+    {
+        const char* name;
+        SaveDefinitionFunction saver;
+    } saverTypes[] = {
+        {"Property", &SaveProperty},
+        {"Array", &SaveArray},
+        {"Table", &SaveTable},
+        {"Use", &SaveReferencedId},
+    };
+    static const int numSaverTypes = sizeof(saverTypes) / sizeof(*saverTypes);
+
+    const char* nodeDefinitionTag = nodeDefinition->getTag();
+    bool ok = false;
+    int i;
+    for (i = 0; i < numSaverTypes; i++)
+    {
+        if (0 == strcmp(saverTypes[i].name, nodeDefinitionTag))
+        {
+            ok = saverTypes[i].saver(idTable, nodeDefinition, data, pSource);
+            break;
+        }
+    }
+    if (!ok)
+    {
+        if (i == numSaverTypes)
+        {
+            CryLog("Invalid definition node type %s", nodeDefinitionTag);
+        }
+    }
+    return ok;
+}
+
+bool SaveReferencedId(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
+{
+    IdTable::const_iterator iter = idTable.find(definition->getAttr("id"));
+    if (iter == idTable.end())
+    {
+        CryLog("No definition with id '%s'", definition->getAttr("id"));
+        return false;
+    }
+    XmlNodeRef useDefinition = iter->second;
+    useDefinition = useDefinition->clone();
+    int numAttrs = definition->getNumAttributes();
+    for (int i = 0; i < numAttrs; i++)
+    {
+        const char* key, * value;
+        definition->getAttributeByIndex(i, &key, &value);
+        useDefinition->setAttr(key, value);
+    }
+    return SaveSomething(idTable, useDefinition, data, pSource);
+}
+
+bool SaveTableInner(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data, IWriteXMLSource* pSource)
+{
+    const int nChildrenDefinition = definition->getChildCount();
+    for (int nChildDefinition = 0; nChildDefinition < nChildrenDefinition; nChildDefinition++)
+    {
+        XmlNodeRef nodeDefinition = definition->getChild(nChildDefinition);
+
+        if (!SaveSomething(idTable, nodeDefinition, data, pSource))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+XmlNodeRef CReadWriteXMLSink::CreateXMLFromSource(const char* definitionFile, IWriteXMLSource* pSource)
+{
+    XmlNodeRef rootDefinition = GetISystem()->LoadXmlFromFile(definitionFile);
+    if (!rootDefinition)
+    {
+        CryLog("Unable to load XML-Lua definition file: %s", definitionFile);
+        return 0;
+    }
+    if (0 != strcmp(rootDefinition->getTag(), "Definition"))
+    {
+        CryLog("Root tag of definition file was %s; expected Definition", rootDefinition->getTag());
+        return 0;
+    }
+    const char* rootNode = "Root";
+    if (rootDefinition->haveAttr("root"))
+    {
+        rootNode = rootDefinition->getAttr("root");
+    }
+    XmlNodeRef rootData = GetISystem()->CreateXmlNode(rootNode);
+
+    XmlNodeRef allowAlways = rootDefinition->findChild("AllowAlways");
+    if (allowAlways != 0)
+    {
+        rootDefinition->removeChild(allowAlways);
+    }
+
+    XmlNodeRef settingsParams = rootDefinition->findChild("Settings");
+    if (settingsParams != 0)
+    {
+        rootDefinition->removeChild(settingsParams);
+    }
+
+    // scan for id's in the structure (for the Use member)
+    IdTable idTable;
+    std::stack<XmlNodeRef> scanStack;
+    scanStack.push(rootDefinition);
+    while (!scanStack.empty())
+    {
+        XmlNodeRef refNode = scanStack.top();
+        scanStack.pop();
+
+        int numChildren = refNode->getChildCount();
+        const char* tag = refNode->getTag();
+
+        for (int i = 0; i < numChildren; i++)
+        {
+            scanStack.push(refNode->getChild(i));
+        }
+
+        if (refNode->haveAttr("id") && 0 != strcmp("Use", tag))
+        {
+            idTable[refNode->getAttr("id")] = refNode;
+        }
+
+        if (allowAlways != 0 && (!strcmp("Table", tag) || !strcmp("Array", tag)))
+        {
+            for (int i = 0; i < allowAlways->getChildCount(); ++i)
+            {
+                refNode->addChild(allowAlways->getChild(i)->clone());
+            }
+        }
+    }
+
+    if (!SaveTableInner(idTable, rootDefinition, rootData, pSource))
+    {
+        CryLog("Error createing xml using definition %s", definitionFile);
+        return 0;
+    }
+
+    bool ok = pSource->Complete();
+    if (!ok)
+    {
+        CryLog("Warning: sink failed to complete writing");
+        return 0;
+    }
+
+    return rootData;
+}
+
+bool CReadWriteXMLSink::WriteXML(const char* definitionFile, const char* dataFile, IWriteXMLSource* pSource)
+{
+    XmlNodeRef data = CreateXMLFromSource(definitionFile, pSource);
+    if (!data)
+    {
+        CryLog("Failed creating %s", dataFile);
+        return false;
+    }
+    if (!data->saveToFile(dataFile))
+    {
+        CryLog("Failed saving %s", dataFile);
+        return false;
+    }
+    return true;
+}
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
new file mode 100644
index 0000000000..56ae764b61
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
@@ -0,0 +1,381 @@
+/*
+ * 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 <platform.h>
+#include "XMLBinaryNode.h"
+#include <CrySizer.h>
+
+//////////////////////////////////////////////////////////////////////////
+CBinaryXmlData::CBinaryXmlData()
+    : pNodes(0)
+    , pAttributes(0)
+    , pChildIndices(0)
+    , pStringData(0)
+    , pFileContents(0)
+    , nFileSize(0)
+    , bOwnsFileContentsMemory(true)
+    , pBinaryNodes(0)
+    , nRefCount(0)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CBinaryXmlData::~CBinaryXmlData()
+{
+    if (bOwnsFileContentsMemory)
+    {
+        delete [] pFileContents;
+    }
+    pFileContents = 0;
+
+    delete [] pBinaryNodes;
+    pBinaryNodes = 0;
+}
+
+void CBinaryXmlData::GetMemoryUsage(ICrySizer* pSizer) const
+{
+    pSizer->AddObject(pFileContents, nFileSize);
+    const XMLBinary::BinaryFileHeader* pHeader = reinterpret_cast<const XMLBinary::BinaryFileHeader*>(pFileContents);
+    pSizer->AddObject(pBinaryNodes, sizeof(CBinaryXmlNode) * pHeader->nNodeCount);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CBinaryXmlNode implementation.
+//////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////
+// collect allocated memory  informations
+void CBinaryXmlNode::GetMemoryUsage(ICrySizer* pSizer) const
+{
+    pSizer->AddObject(m_pData);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CBinaryXmlNode::getParent() const
+{
+    const XMLBinary::Node* const pNode = _node();
+    if (pNode->nParentIndex != (XMLBinary::NodeIndex)-1)
+    {
+        return &m_pData->pBinaryNodes[pNode->nParentIndex];
+    }
+    return XmlNodeRef();
+}
+
+XmlNodeRef CBinaryXmlNode::createNode([[maybe_unused]] const char* tag)
+{
+    assert(0);
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::isTag(const char* tag) const
+{
+    return g_pXmlStrCmp(tag, getTag()) == 0;
+}
+
+const char* CBinaryXmlNode::getAttr(const char* key) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        return svalue;
+    }
+    return "";
+}
+
+bool CBinaryXmlNode::getAttr(const char* key, const char** value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        *value = svalue;
+        return true;
+    }
+    else
+    {
+        *value = "";
+        return false;
+    }
+}
+
+
+bool CBinaryXmlNode::haveAttr(const char* key) const
+{
+    return (GetValue(key) != 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, int& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = atoi(svalue);
+        return true;
+    }
+    return false;
+}
+
+bool CBinaryXmlNode::getAttr(const char* key, unsigned int& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = strtoul(svalue, NULL, 10);
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, int64& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        azsscanf(svalue, "%" PRId64, &value);
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, uint64& value, bool useHexFormat) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        if (useHexFormat)
+        {
+            azsscanf(svalue, "%" PRIX64, &value);
+        }
+        else
+        {
+            azsscanf(svalue, "%" PRIu64, &value);
+        }
+        return true;
+    }
+    return false;
+}
+
+bool CBinaryXmlNode::getAttr(const char* key, bool& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = atoi(svalue) != 0;
+        return true;
+    }
+    return false;
+}
+
+bool CBinaryXmlNode::getAttr(const char* key, float& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = (float)atof(svalue);
+        return true;
+    }
+    return false;
+}
+
+bool CBinaryXmlNode::getAttr(const char* key, double& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = atof(svalue);
+        return true;
+    }
+    return false;
+}
+
+bool CBinaryXmlNode::getAttr(const char* key, Ang3& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        float x, y, z;
+        if (azsscanf(svalue, "%f,%f,%f", &x, &y, &z) == 3)
+        {
+            value(x, y, z);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, Vec3& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        float x, y, z;
+        if (azsscanf(svalue, "%f,%f,%f", &x, &y, &z) == 3)
+        {
+            value = Vec3(x, y, z);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, Vec4& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        float x, y, z, w;
+        if (azsscanf(svalue, "%f,%f,%f,%f", &x, &y, &z, &w) == 4)
+        {
+            value = Vec4(x, y, z, w);
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CBinaryXmlNode::getAttr(const char* key, Vec3d& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        double x, y, z;
+        if (azsscanf(svalue, "%lf,%lf,%lf", &x, &y, &z) == 3)
+        {
+            value = Vec3d(x, y, z);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, Vec2& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        float x, y;
+        if (azsscanf(svalue, "%f,%f", &x, &y) == 2)
+        {
+            value = Vec2(x, y);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, Vec2d& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        double x, y;
+        if (azsscanf(svalue, "%lf,%lf", &x, &y) == 2)
+        {
+            value = Vec2d(x, y);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, Quat& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        float w, x, y, z;
+        if (azsscanf(svalue, "%f,%f,%f,%f", &w, &x, &y, &z) == 4)
+        {
+            value = Quat(w, x, y, z);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttr(const char* key, ColorB& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        unsigned int r, g, b, a = 255;
+        int numFound = azsscanf(svalue, "%u,%u,%u,%u", &r, &g, &b, &a);
+        if (numFound == 3 || numFound == 4)
+        {
+            // If we only found 3 values, a should be unchanged, and still be 255
+            if (r < 256 && g < 256 && b < 256 && a < 256)
+            {
+                value = ColorB(r, g, b, a);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+
+XmlNodeRef CBinaryXmlNode::findChild(const char* tag) const
+{
+    const XMLBinary::Node* const pNode = _node();
+    const uint32 nFirst = pNode->nFirstChildIndex;
+    const uint32 nAfterLast = pNode->nFirstChildIndex + pNode->nChildCount;
+    for (uint32 i = nFirst; i < nAfterLast; ++i)
+    {
+        const char* sChildTag = m_pData->pStringData + m_pData->pNodes[m_pData->pChildIndices[i]].nTagStringOffset;
+        if (g_pXmlStrCmp(tag, sChildTag) == 0)
+        {
+            return m_pData->pBinaryNodes + m_pData->pChildIndices[i];
+        }
+    }
+    return 0;
+}
+
+//! Get XML Node child nodes.
+XmlNodeRef CBinaryXmlNode::getChild(int i) const
+{
+    const XMLBinary::Node* const pNode = _node();
+    assert(i >= 0 && i < (int)pNode->nChildCount);
+    return m_pData->pBinaryNodes + m_pData->pChildIndices[pNode->nFirstChildIndex + i];
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttributeByIndex(int index, const char** key, const char** value)
+{
+    const XMLBinary::Node* const pNode = _node();
+    if (index >= 0 && index < pNode->nAttributeCount)
+    {
+        const XMLBinary::Attribute& attr = m_pData->pAttributes[pNode->nFirstAttributeIndex + index];
+        *key = _string(attr.nKeyStringOffset);
+        *value = _string(attr.nValueStringOffset);
+        return true;
+    }
+    return false;
+}
+//////////////////////////////////////////////////////////////////////////
+bool CBinaryXmlNode::getAttributeByIndex(int index, XmlString& key, XmlString& value)
+{
+    const XMLBinary::Node* const pNode = _node();
+    if (index >= 0 && index < pNode->nAttributeCount)
+    {
+        const XMLBinary::Attribute& attr = m_pData->pAttributes[pNode->nFirstAttributeIndex + index];
+        key = _string(attr.nKeyStringOffset);
+        value = _string(attr.nValueStringOffset);
+        return true;
+    }
+    return false;
+}
+//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryNode.h b/Code/Legacy/CrySystem/XML/XMLBinaryNode.h
new file mode 100644
index 0000000000..cc686fdbde
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryNode.h
@@ -0,0 +1,238 @@
+/*
+ * 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_XML_XMLBINARYNODE_H
+#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H
+#pragma once
+
+
+#include <algorithm>
+#include "IXml.h"
+#include "XMLBinaryHeaders.h"
+
+// Compare function for string comparison, can be strcmp or _stricmp
+typedef int (__cdecl * XmlStrCmpFunc)(const char* str1, const char* str2);
+extern XmlStrCmpFunc g_pXmlStrCmp;
+
+class CBinaryXmlNode;
+
+//////////////////////////////////////////////////////////////////////////
+class CBinaryXmlData
+{
+public:
+    const XMLBinary::Node*       pNodes;
+    const XMLBinary::Attribute*  pAttributes;
+    const XMLBinary::NodeIndex*  pChildIndices;
+    const char*                  pStringData;
+
+    const char*                  pFileContents;
+    size_t                       nFileSize;
+    bool                         bOwnsFileContentsMemory;
+
+    CBinaryXmlNode*              pBinaryNodes;
+
+    int                          nRefCount;
+
+    CBinaryXmlData();
+    ~CBinaryXmlData();
+
+    void GetMemoryUsage(ICrySizer* pSizer) const;
+};
+
+// forward declaration
+namespace XMLBinary
+{
+    class XMLBinaryReader;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// CBinaryXmlNode class only used for fast read only binary XML import
+//////////////////////////////////////////////////////////////////////////
+class CBinaryXmlNode
+    : public IXmlNode
+{
+public:
+
+    // collect allocated memory  informations
+    void GetMemoryUsage(ICrySizer* pSizer) const;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Custom new/delete with pool allocator.
+    //////////////////////////////////////////////////////////////////////////
+    //void* operator new( size_t nSize );
+    //void operator delete( void *ptr );
+
+    virtual void DeleteThis() { }
+
+    //! Create new XML node.
+    XmlNodeRef createNode(const char* tag);
+
+    // Summary:
+    //   Reference counting.
+    virtual void AddRef() { ++m_pData->nRefCount; };
+    // Notes:
+    //   When ref count reach zero XML node dies.
+    virtual void Release()
+    {
+        if (--m_pData->nRefCount <= 0)
+        {
+            delete m_pData;
+        }
+    };
+
+    //! Get XML node tag.
+    const char* getTag() const { return _string(_node()->nTagStringOffset); };
+    void    setTag([[maybe_unused]] const char* tag) { assert(0); };
+
+    //! Return true if given tag is equal to node tag.
+    bool isTag(const char* tag) const;
+
+    //! Get XML Node attributes.
+    virtual int getNumAttributes() const { return (int)_node()->nAttributeCount; };
+    //! Return attribute key and value by attribute index.
+    virtual bool getAttributeByIndex(int index, const char** key, const char** value);
+    //! Return attribute key and value by attribute index, string version.
+    virtual bool getAttributeByIndex(int index, XmlString& key, XmlString& value);
+
+
+    virtual void shareChildren([[maybe_unused]] const XmlNodeRef& fromNode) { assert(0); };
+    virtual void copyAttributes(XmlNodeRef fromNode) { assert(0); };
+
+    //! Get XML Node attribute for specified key.
+    const char* getAttr(const char* key) const;
+
+    //! Get XML Node attribute for specified key.
+    // Returns true if the attribute exists, false otherwise.
+    bool getAttr(const char* key, const char** value) const;
+
+    //! Check if attributes with specified key exist.
+    bool haveAttr(const char* key) const;
+
+    XmlNodeRef newChild([[maybe_unused]] const char* tagName) { assert(0); return 0; };
+    void replaceChild([[maybe_unused]] int inChild, [[maybe_unused]] const XmlNodeRef& node) { assert(0); };
+    void insertChild([[maybe_unused]] int inChild, [[maybe_unused]] const XmlNodeRef& node) { assert(0); };
+    void addChild([[maybe_unused]] const XmlNodeRef& node) { assert(0); };
+    void removeChild([[maybe_unused]] const XmlNodeRef& node) { assert(0); };
+
+    //! Remove all child nodes.
+    void removeAllChilds() { assert(0); };
+
+    //! Get number of child XML nodes.
+    int getChildCount() const { return (int)_node()->nChildCount; };
+
+    //! Get XML Node child nodes.
+    XmlNodeRef getChild(int i) const;
+
+    //! Find node with specified tag.
+    XmlNodeRef findChild(const char* tag) const;
+    void deleteChild([[maybe_unused]] const char* tag) { assert(0); };
+    void deleteChildAt([[maybe_unused]] int nIndex) { assert(0); };
+
+    //! Get parent XML node.
+    XmlNodeRef  getParent() const;
+
+    //! Returns content of this node.
+    const char* getContent() const { return _string(_node()->nContentStringOffset); };
+    void setContent([[maybe_unused]] const char* str) { assert(0); };
+
+    XmlNodeRef  clone()  { assert(0); return 0; };
+
+    //! Returns line number for XML tag.
+    int getLine() const { return 0; };
+    //! Set line number in xml.
+    void setLine([[maybe_unused]] int line) { assert(0); };
+
+    //! Returns XML of this node and sub nodes.
+    virtual IXmlStringData* getXMLData([[maybe_unused]] int nReserveMem = 0) const { assert(0); return 0; };
+    XmlString getXML([[maybe_unused]] int level = 0) const { assert(0); return ""; };
+    bool saveToFile([[maybe_unused]] const char* fileName) { assert(0); return false; };   // saves in one huge chunk
+    bool saveToFile([[maybe_unused]] const char* fileName, [[maybe_unused]] size_t chunkSizeBytes, [[maybe_unused]] AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle) { assert(0); return false; };   // save in small memory chunks
+
+    //! Set new XML Node attribute (or override attribute with same key).
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const char* value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] int value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] unsigned int value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] int64 value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] uint64 value, [[maybe_unused]] bool useHexFormat = true /* ignored */) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] float value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] f64 value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec2& value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec2d& value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Ang3& value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec3& value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec4& value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Vec3d& value) { assert(0); };
+    void setAttr([[maybe_unused]] const char* key, [[maybe_unused]] const Quat& value) { assert(0); };
+    void delAttr([[maybe_unused]] const char* key) { assert(0); };
+    void removeAllAttributes() { assert(0); };
+
+    //! 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, f64& value) const;
+    bool getAttr(const char* key, bool& value) const;
+    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, Vec2& value) const;
+    bool getAttr(const char* key, Vec2d& 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, Vec3d& value) const;
+    bool getAttr(const char* key, Quat& value) const;
+    bool getAttr(const char* key, ColorB& value) const;
+    //  bool getAttr( const char *key,CString &value ) const { XmlString v; if (getAttr(key,v)) { value = (const char*)v; return true; } else return false; }
+
+
+private:
+    //////////////////////////////////////////////////////////////////////////
+    // INTERNAL METHODS
+    //////////////////////////////////////////////////////////////////////////
+    const char* GetValue(const char* key) const
+    {
+        const XMLBinary::Attribute* const pAttributes = m_pData->pAttributes;
+        const char* const pStringData = m_pData->pStringData;
+
+        const int nFirst = _node()->nFirstAttributeIndex;
+        const int nLast = nFirst + _node()->nAttributeCount;
+        for (int i = nFirst; i < nLast; i++)
+        {
+            const char* const attrKey = pStringData + pAttributes[i].nKeyStringOffset;
+            if (g_pXmlStrCmp(key, attrKey) == 0)
+            {
+                const char* attrValue = pStringData + pAttributes[i].nValueStringOffset;
+                return attrValue;
+            }
+        }
+        return 0;
+    }
+
+    // Return current node in binary data.
+    const XMLBinary::Node* _node() const
+    {
+        return &m_pData->pNodes[this - m_pData->pBinaryNodes];
+    }
+
+    const char* _string(int nIndex) const
+    {
+        return m_pData->pStringData + nIndex;
+    }
+
+protected:
+    virtual void setParent([[maybe_unused]] const XmlNodeRef& inRef)     { assert(0); }
+
+    //////////////////////////////////////////////////////////////////////////
+private:
+    CBinaryXmlData* m_pData;
+
+    friend class XMLBinary::XMLBinaryReader;
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryReader.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryReader.cpp
new file mode 100644
index 0000000000..5c4a6742a1
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryReader.cpp
@@ -0,0 +1,271 @@
+/*
+ * 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 <platform.h>
+#include "XMLBinaryReader.h"
+#include "XMLBinaryNode.h"
+#include "CryPath.h"
+
+
+XMLBinary::XMLBinaryReader::XMLBinaryReader()
+{
+    m_errorDescription[0] = 0;
+}
+
+
+XMLBinary::XMLBinaryReader::~XMLBinaryReader()
+{
+}
+
+
+const char* XMLBinary::XMLBinaryReader::GetErrorDescription() const
+{
+    return &m_errorDescription[0];
+}
+
+
+void XMLBinary::XMLBinaryReader::SetErrorDescription(const char* text)
+{
+    cry_strcpy(m_errorDescription, text);
+}
+
+
+XmlNodeRef XMLBinary::XMLBinaryReader::LoadFromFile(
+    const char* filename,
+    XMLBinary::XMLBinaryReader::EResult& result)
+{
+    m_errorDescription[0] = 0;
+    result = eResult_Error;
+
+    CCryFile xmlFile;
+
+    if (!xmlFile.Open(filename, "rb"))
+    {
+        SetErrorDescription("Can't open file.");
+        return 0;
+    }
+
+    const size_t fileSize = xmlFile.GetLength();
+    if (fileSize < sizeof(BinaryFileHeader))
+    {
+        result = eResult_NotBinXml;
+        SetErrorDescription("File is not a binary XML file (file size is too small).");
+        return 0;
+    }
+
+    // Read in the entire file - this buffer will not be deallocated immediately, since the nodes
+    // will contain pointers directly into it. It will be deleted once the reference count on the
+    // CBinaryXmlData object reaches 0 again.
+
+    char* const pFileContents = new char[fileSize];
+
+    if (!pFileContents)
+    {
+        SetErrorDescription("Can't allocate memory for binary XML file contents.");
+        return 0;
+    }
+
+    if (xmlFile.ReadRaw(pFileContents, fileSize) != fileSize)
+    {
+        delete [] pFileContents;
+        SetErrorDescription("Failed to read binary XML file, the file is corrupt.");
+        return 0;
+    }
+
+    Check(pFileContents, fileSize, result);
+
+    if (result != eResult_Success)
+    {
+        delete [] pFileContents;
+        return 0;
+    }
+
+    CBinaryXmlData* const pData = Create(pFileContents, fileSize, result);
+
+    if (result != eResult_Success)
+    {
+        assert(pData == 0);
+        delete [] pFileContents;
+        return 0;
+    }
+
+    assert(pData);
+    pData->bOwnsFileContentsMemory = true;
+
+    // Return first node
+    return &pData->pBinaryNodes[0];
+}
+
+
+XmlNodeRef XMLBinary::XMLBinaryReader::LoadFromBuffer(
+    EBufferMemoryHandling bufferMemoryHandling,
+    const char* buffer,
+    size_t size,
+    XMLBinary::XMLBinaryReader::EResult& result)
+{
+    m_errorDescription[0] = 0;
+    result = eResult_Error;
+
+    Check(buffer, size, result);
+
+    if (result != eResult_Success)
+    {
+        return 0;
+    }
+
+    CBinaryXmlData* pData = 0;
+
+    if (bufferMemoryHandling == eBufferMemoryHandling_MakeCopy)
+    {
+        char* ownBuffer = new char[size];
+        if (!ownBuffer)
+        {
+            SetErrorDescription("Can't allocate memory for binary XML data.");
+            return 0;
+        }
+        memcpy(ownBuffer, buffer, size);
+
+        pData = Create(ownBuffer, size, result);
+
+        if (result != eResult_Success)
+        {
+            assert(pData == 0);
+            delete [] ownBuffer;
+            return 0;
+        }
+    }
+    else
+    {
+        assert(bufferMemoryHandling == eBufferMemoryHandling_TakeOwnership);
+
+        pData = Create(buffer, size, result);
+
+        if (result != eResult_Success)
+        {
+            assert(pData == 0);
+            return 0;
+        }
+    }
+
+    assert(pData);
+    pData->bOwnsFileContentsMemory = true;
+
+    // Return first node
+    return &pData->pBinaryNodes[0];
+}
+
+
+void XMLBinary::XMLBinaryReader::Check(const char* buffer, size_t size, EResult& result)
+{
+    m_errorDescription[0] = 0;
+    result = eResult_Error;
+
+    if (buffer == 0)
+    {
+        SetErrorDescription("Buffer is null.");
+        return;
+    }
+
+    if (size < sizeof(BinaryFileHeader))
+    {
+        result = eResult_NotBinXml;
+        SetErrorDescription("Not a binary XML - data size is too small.");
+        return;
+    }
+
+    const BinaryFileHeader& header = *(reinterpret_cast<const BinaryFileHeader*>(buffer));
+
+    CheckHeader(header, size, result);
+}
+
+
+void XMLBinary::XMLBinaryReader::CheckHeader(const BinaryFileHeader& header, size_t size, EResult& result)
+{
+    assert(size >= sizeof(BinaryFileHeader));
+
+    m_errorDescription[0] = 0;
+
+    // Check the signature of the file to make sure that it is a binary XML file.
+    {
+        static const char signature[] = "CryXmlB";
+        COMPILE_TIME_ASSERT(sizeof(signature) == sizeof(header.szSignature));
+        if (memcmp(header.szSignature, signature, sizeof(header.szSignature)) != 0)
+        {
+            result = eResult_NotBinXml;
+            SetErrorDescription("Not a binary XML - has no signature.");
+            return;
+        }
+    }
+
+    // Check contents of the file header.
+    const uint32 nNodeTableEnd = header.nNodeTablePosition + header.nNodeCount * sizeof(Node);
+    const uint32 nChildTableEnd = header.nChildTablePosition + header.nChildCount * sizeof(NodeIndex);
+    const uint32 nAttributeTableEnd = header.nAttributeTablePosition + header.nAttributeCount * sizeof(Attribute);
+    const uint32 nStringDataEnd = header.nStringDataPosition + header.nStringDataSize;
+
+    bool bCorrupt = false;
+    bCorrupt = bCorrupt || header.nXMLSize > size;
+    bCorrupt = bCorrupt || nNodeTableEnd > header.nChildTablePosition;
+    bCorrupt = bCorrupt || nChildTableEnd > header.nAttributeTablePosition;
+    bCorrupt = bCorrupt || nAttributeTableEnd > header.nStringDataPosition;
+    bCorrupt = bCorrupt || nStringDataEnd > header.nXMLSize;
+    if (bCorrupt)
+    {
+        result = eResult_Error;
+        SetErrorDescription("Binary XML data is corrupt.");
+        return;
+    }
+
+    result = eResult_Success;
+}
+
+
+CBinaryXmlData* XMLBinary::XMLBinaryReader::Create(const char* buffer, size_t size, EResult& result)
+{
+    assert((buffer != 0) && (size >= sizeof(BinaryFileHeader)));
+
+    m_errorDescription[0] = 0;
+    result = eResult_Error;
+
+    CBinaryXmlData* const pData = new CBinaryXmlData;
+    if (!pData)
+    {
+        SetErrorDescription("Can't allocate memory for binary XML object.");
+        return 0;
+    }
+
+    pData->pFileContents = buffer;
+    pData->nFileSize = size;
+    pData->bOwnsFileContentsMemory = false;
+
+    const BinaryFileHeader& header = *(reinterpret_cast<const BinaryFileHeader*>(buffer));
+
+    // Create nodes
+    pData->pBinaryNodes = new CBinaryXmlNode[header.nNodeCount];
+    if (!pData->pBinaryNodes)
+    {
+        delete pData;
+        SetErrorDescription("Can't allocate memory for binary XML nodes.");
+        return 0;
+    }
+
+    pData->pAttributes   = reinterpret_cast<const Attribute*>(buffer + header.nAttributeTablePosition);
+    pData->pChildIndices = reinterpret_cast<const NodeIndex*>(buffer + header.nChildTablePosition);
+    pData->pNodes        = reinterpret_cast<const Node*>(buffer + header.nNodeTablePosition);
+    pData->pStringData   = buffer + header.nStringDataPosition;
+
+    for (uint32 nNode = 0; nNode < header.nNodeCount; ++nNode)
+    {
+        CBinaryXmlNode* const pNode = &pData->pBinaryNodes[nNode];
+        pNode->m_nRefCount = 0;
+        pNode->m_pData = pData;
+    }
+
+    result = eResult_Success;
+    return pData;
+}
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryReader.h b/Code/Legacy/CrySystem/XML/XMLBinaryReader.h
new file mode 100644
index 0000000000..e6939df686
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryReader.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYREADER_H
+#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYREADER_H
+#pragma once
+
+
+#include "XMLBinaryHeaders.h"
+#include "IXml.h"
+#include "CryFile.h"
+
+class CBinaryXmlData;
+
+namespace XMLBinary
+{
+    class XMLBinaryReader
+    {
+    public:
+        enum EResult
+        {
+            eResult_Success,
+            eResult_NotBinXml,
+            eResult_Error
+        };
+
+        enum EBufferMemoryHandling
+        {
+            eBufferMemoryHandling_MakeCopy,
+            eBufferMemoryHandling_TakeOwnership
+        };
+
+    public:
+        XMLBinaryReader();
+        ~XMLBinaryReader();
+
+        XmlNodeRef LoadFromFile(const char* filename, EResult& result);
+
+        // Note: if bufferMemoryHandling == eBufferMemoryHandling_TakeOwnership and
+        // returned result is eResult_Success, then buffer's memory is owned and
+        // will be released by XMLBinaryReader (by a 'delete[] buffer' call).
+        // Otherwise, the caller is responsible for releasing buffer's memory.
+        XmlNodeRef LoadFromBuffer(EBufferMemoryHandling bufferMemoryHandling, const char* buffer, size_t size, EResult& result);
+
+        const char* GetErrorDescription() const;
+
+    private:
+        void Check(const char* buffer, size_t size, EResult& result);
+        void CheckHeader(const BinaryFileHeader& layout, size_t size, EResult& result);
+        CBinaryXmlData* Create(const char* buffer, size_t size, EResult& result);
+        void SetErrorDescription(const char* text);
+
+    private:
+        char m_errorDescription[64];
+    };
+}
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYREADER_H
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp
new file mode 100644
index 0000000000..4b552b0b82
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp
@@ -0,0 +1,335 @@
+/*
+ * 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 <platform.h>
+#include "XMLBinaryWriter.h"
+#include "CryEndian.h"
+#include <string.h>  // memcpy()
+
+//////////////////////////////////////////////////////////////////////////
+namespace XMLBinary
+{
+    void SwapEndianness_Node(Node& t)
+    {
+        SwapEndian(t.nTagStringOffset, true);
+        SwapEndian(t.nContentStringOffset, true);
+        SwapEndian(t.nAttributeCount, true);
+        SwapEndian(t.nChildCount, true);
+        SwapEndian(t.nParentIndex, true);
+        SwapEndian(t.nFirstAttributeIndex, true);
+        SwapEndian(t.nFirstChildIndex, true);
+    }
+
+    void SwapEndianness_Attribute(Attribute& t)
+    {
+        SwapEndian(t.nKeyStringOffset, true);
+        SwapEndian(t.nValueStringOffset, true);
+    }
+
+    void SwapEndianness_Header(BinaryFileHeader& t)
+    {
+        SwapEndian(t.nXMLSize, true);
+        SwapEndian(t.nNodeTablePosition, true);
+        SwapEndian(t.nNodeCount, true);
+        SwapEndian(t.nAttributeTablePosition, true);
+        SwapEndian(t.nAttributeCount, true);
+        SwapEndian(t.nChildTablePosition, true);
+        SwapEndian(t.nChildCount, true);
+        SwapEndian(t.nStringDataPosition, true);
+        SwapEndian(t.nStringDataSize, true);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+XMLBinary::CXMLBinaryWriter::CXMLBinaryWriter()
+{
+    m_nStringDataSize = 0;
+}
+
+static void align(size_t& nPosition, const size_t nAlignment)
+{
+    const size_t nPadSize = ((nPosition + (nAlignment - 1)) & ~(nAlignment - 1)) - nPosition;
+    nPosition += nPadSize;
+}
+
+static void alignWrite(XMLBinary::IDataWriter* const pFile, size_t& nPosition, const size_t nAlignment)
+{
+    size_t nPadSize = ((nPosition + (nAlignment - 1)) & ~(nAlignment - 1)) - nPosition;
+
+    if (nPadSize > 0)
+    {
+        nPosition += nPadSize;
+
+        static const char zeroes[32] = { 0 };
+
+        while (nPadSize > 0)
+        {
+            const size_t n = (nPadSize <= sizeof(zeroes)) ? nPadSize : sizeof(zeroes);
+            nPadSize -= n;
+            pFile->Write(zeroes, n);
+        }
+    }
+}
+
+static void write(XMLBinary::IDataWriter* const pFile, size_t& nPosition, const void* const pData, const size_t nDataSize)
+{
+    pFile->Write(pData, nDataSize);
+    nPosition += nDataSize;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool XMLBinary::CXMLBinaryWriter::WriteNode(IDataWriter* pFile, XmlNodeRef node, bool bNeedSwapEndian, XMLBinary::IFilter* pFilter, string& error)
+{
+    error = "";
+
+    // Scan the node tree, building a flat node list, attribute list and string table.
+    m_nStringDataSize = 0;
+
+    if (!CompileTables(node, pFilter, error))
+    {
+        return false;
+    }
+
+    static const uint nMaxNodeCount = (NodeIndex) ~0;
+    if (m_nodes.size() > nMaxNodeCount)
+    {
+        error.Format("XMLBinary: Too many nodes: %d (max is %i)", m_nodes.size(), nMaxNodeCount);
+        return false;
+    }
+
+    // Initialize the file header.
+    size_t nTheoreticalPosition = 0;
+    static const size_t nAlignment = sizeof(uint32);
+
+    BinaryFileHeader header;
+    static const char signature[] = "CryXmlB";
+    COMPILE_TIME_ASSERT(sizeof(signature) == sizeof(header.szSignature));
+    memcpy(header.szSignature, signature, sizeof(header.szSignature));
+    nTheoreticalPosition += sizeof(header);
+    align(nTheoreticalPosition, nAlignment);
+
+    header.nNodeTablePosition = nTheoreticalPosition;
+    header.nNodeCount = int(m_nodes.size());
+    nTheoreticalPosition += header.nNodeCount * sizeof(Node);
+    align(nTheoreticalPosition, nAlignment);
+
+    header.nChildTablePosition = nTheoreticalPosition;
+    header.nChildCount = int(m_childs.size());
+    nTheoreticalPosition += header.nChildCount * sizeof(NodeIndex);
+    align(nTheoreticalPosition, nAlignment);
+
+    header.nAttributeTablePosition = nTheoreticalPosition;
+    header.nAttributeCount = int(m_attributes.size());
+    nTheoreticalPosition += header.nAttributeCount * sizeof(Attribute);
+    align(nTheoreticalPosition, nAlignment);
+
+    header.nStringDataPosition = nTheoreticalPosition;
+    header.nStringDataSize = m_nStringDataSize;
+    nTheoreticalPosition += header.nStringDataSize;
+
+    header.nXMLSize = nTheoreticalPosition;
+
+    // Swap endianness of the data structures
+    if (bNeedSwapEndian)
+    {
+        SwapEndianness_Header(header);
+        for (size_t i = 0, iCount = m_nodes.size(); i < iCount; ++i)
+        {
+            SwapEndianness_Node(m_nodes[i]);
+        }
+        for (size_t i = 0, iCount = m_attributes.size(); i < iCount; ++i)
+        {
+            SwapEndianness_Attribute(m_attributes[i]);
+        }
+        for (size_t i = 0, iCount = m_childs.size(); i < iCount; ++i)
+        {
+            SwapEndian(m_childs[i], true);
+        }
+    }
+
+    // Write file
+    {
+        nTheoreticalPosition = 0;
+
+        // Write out the file header.
+        write(pFile, nTheoreticalPosition, &header, sizeof(header));
+        alignWrite(pFile, nTheoreticalPosition, nAlignment);
+
+        // Write out the node table.
+        if (!m_nodes.empty())
+        {
+            write(pFile, nTheoreticalPosition, &m_nodes[0], sizeof(m_nodes[0]) * m_nodes.size());
+            alignWrite(pFile, nTheoreticalPosition, nAlignment);
+        }
+
+        // Write out the children table.
+        if (!m_childs.empty())
+        {
+            write(pFile, nTheoreticalPosition, &m_childs[0], sizeof(m_childs[0]) * m_childs.size());
+            alignWrite(pFile, nTheoreticalPosition, nAlignment);
+        }
+
+        // Write out the attribute table.
+        if (!m_attributes.empty())
+        {
+            write(pFile, nTheoreticalPosition, &m_attributes[0], sizeof(m_attributes[0]) * m_attributes.size());
+            alignWrite(pFile, nTheoreticalPosition, nAlignment);
+        }
+
+        // Write out the data of all the m_strings.
+        for (size_t nString = 0; nString < m_strings.size(); ++nString)
+        {
+            pFile->Write(m_strings[nString].c_str(), m_strings[nString].size() + 1);
+        }
+    }
+
+    return true;
+}
+
+bool XMLBinary::CXMLBinaryWriter::CompileTables(XmlNodeRef node, XMLBinary::IFilter* pFilter, string& error)
+{
+    bool ok = CompileTablesForNode(node, -1, pFilter, error);
+    ok = ok && CompileChildTable(node, pFilter, error);
+    return ok;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool XMLBinary::CXMLBinaryWriter::CompileTablesForNode(XmlNodeRef node, int nParentIndex, XMLBinary::IFilter* pFilter, string& error)
+{
+    // Add the tag to the string table.
+    int nTagStringOffset = AddString(node->getTag());
+
+    // Add the content string to the string table.
+    int nContentStringOffset = AddString(node->getContent());
+
+    // Add all the attributes to the attributes table.
+    const char* szKey;
+    const char* szValue;
+    const int nFirstAttributeIndex = int(m_attributes.size());
+    for (int i = 0, attrCount = node->getNumAttributes(); i < attrCount; ++i)
+    {
+        if (node->getAttributeByIndex(i, &szKey, &szValue) &&
+            (!pFilter || pFilter->IsAccepted(IFilter::eType_AttributeName, szKey)))
+        {
+            // Add the key and the value to the string table.
+            Attribute attribute;
+            attribute.nKeyStringOffset = AddString(szKey);
+            attribute.nValueStringOffset = AddString(szValue);
+
+            // Add the attribute to the attribute table.
+            m_attributes.push_back(attribute);
+        }
+    }
+    const int nAttributeCount = int(m_attributes.size()) - nFirstAttributeIndex;
+
+    static const int nMaxAttributeCount = (uint16) ~0;
+    if (nAttributeCount > nMaxAttributeCount)
+    {
+        error.Format("XMLBinary: Too many attributes in a node: %d (max is %i)", nAttributeCount, nMaxAttributeCount);
+        return false;
+    }
+
+    // Add ourselves to the node list.
+    const int nIndex = int(m_nodes.size());
+    {
+        Node nd;
+        memset(&nd, 0, sizeof(nd));
+        nd.nTagStringOffset = nTagStringOffset;
+        nd.nContentStringOffset = nContentStringOffset;
+        nd.nParentIndex = nParentIndex;
+        nd.nFirstAttributeIndex = nFirstAttributeIndex;
+        nd.nAttributeCount = nAttributeCount;
+
+        m_nodes.push_back(nd);
+    }
+
+    m_nodesMap.insert(NodesMap::value_type(node, nIndex));
+
+    // Recurse to the child nodes.
+    int nChildCount = 0;
+    static const int nMaxChildCount = (uint16) ~0;
+    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
+    {
+        XmlNodeRef childNode = node->getChild(nChild);
+        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
+        {
+            if (++nChildCount > nMaxChildCount)
+            {
+                error.Format("XMLBinary: Too many children in node '%s': %d (max is %i)", childNode->getTag(), nChildCount, nMaxChildCount);
+                return false;
+            }
+            if (!CompileTablesForNode(childNode, nIndex, pFilter, error))
+            {
+                return false;
+            }
+        }
+    }
+
+    m_nodes[nIndex].nChildCount = nChildCount;
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool XMLBinary::CXMLBinaryWriter::CompileChildTable(XmlNodeRef node, XMLBinary::IFilter* pFilter, string& error)
+{
+    const int nIndex = m_nodesMap.find(node)->second; // Assume node always exist in map.
+    const int nFirstChildIndex = (int)m_childs.size();
+
+    Node& nd = m_nodes[nIndex];
+    nd.nFirstChildIndex = nFirstChildIndex;
+
+    int nChildCount = 0;
+    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
+    {
+        XmlNodeRef childNode = node->getChild(nChild);
+        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
+        {
+            ++nChildCount;
+            const int nChildIndex = m_nodesMap.find(childNode)->second; // Assume node always exist in map.
+            m_childs.push_back(nChildIndex);
+        }
+    }
+    if (nChildCount != nd.nChildCount)
+    {
+        error.Format("XMLBinary: Internal error in CompileChildTable()");
+        return false;
+    }
+
+    // Recurse to the child nodes.
+    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
+    {
+        XmlNodeRef childNode = node->getChild(nChild);
+        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
+        {
+            if (!CompileChildTable(childNode, pFilter, error))
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+int XMLBinary::CXMLBinaryWriter::AddString(const XmlString& sString)
+{
+    // If we have such string already, then we will re-use its data.
+    StringMap::const_iterator itStringEntry = m_stringMap.find(sString);
+    if (itStringEntry == m_stringMap.end())
+    {
+        // We don't have such string yet, so we should add it to the tables.
+        m_strings.push_back(sString);
+        itStringEntry = m_stringMap.insert(StringMap::value_type(sString, m_nStringDataSize)).first;
+        m_nStringDataSize += sString.length() + 1;
+    }
+
+    // Return offset of the string in the string data buffer.
+    return (*itStringEntry).second;
+}
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryWriter.h b/Code/Legacy/CrySystem/XML/XMLBinaryWriter.h
new file mode 100644
index 0000000000..f04c9a3ebe
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryWriter.h
@@ -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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H
+#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H
+#pragma once
+
+
+#include "IXml.h"
+#include "XMLBinaryHeaders.h"
+#include <vector>
+#include <map>
+
+class IXMLDataSink;
+
+namespace XMLBinary
+{
+    class CXMLBinaryWriter
+    {
+    public:
+        CXMLBinaryWriter();
+        bool WriteNode(IDataWriter* pFile, XmlNodeRef node, bool bNeedSwapEndian, XMLBinary::IFilter* pFilter, string& error);
+
+    private:
+        bool CompileTables(XmlNodeRef node, XMLBinary::IFilter* pFilter, string& error);
+
+        bool CompileTablesForNode(XmlNodeRef node, int nParentIndex, XMLBinary::IFilter* pFilter, string& error);
+        bool CompileChildTable(XmlNodeRef node, XMLBinary::IFilter* pFilter, string& error);
+        int AddString(const XmlString& sString);
+
+    private:
+        // tables.
+        typedef std::map<IXmlNode*, int> NodesMap;
+        typedef std::map<string, uint> StringMap;
+
+        std::vector<Node> m_nodes;
+        NodesMap m_nodesMap;
+        std::vector<Attribute> m_attributes;
+        std::vector<NodeIndex> m_childs;
+        std::vector<string> m_strings;
+        StringMap m_stringMap;
+
+        uint m_nStringDataSize;
+    };
+}
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H
diff --git a/Code/Legacy/CrySystem/XML/XMLPatcher.cpp b/Code/Legacy/CrySystem/XML/XMLPatcher.cpp
new file mode 100644
index 0000000000..797f025ba2
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XMLPatcher.cpp
@@ -0,0 +1,423 @@
+/*
+ * 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 "XMLPatcher.h"
+#include "StringUtils.h"
+
+CXMLPatcher::CXMLPatcher(XmlNodeRef& patchXML)
+{
+    m_patchXML = patchXML;
+
+#if DATA_PATCH_DEBUG
+    m_pDumpFilesCVar = REGISTER_INT("g_datapatcher_dumpfiles", 0, NULL, "will dump a copy of every file data patched, before and after patching");
+#endif
+}
+
+CXMLPatcher::~CXMLPatcher()
+{
+#if DATA_PATCH_DEBUG
+    if (IConsole* pIC = gEnv->pConsole)
+    {
+        pIC->UnregisterVariable(m_pDumpFilesCVar->GetName());
+    }
+#endif
+}
+
+XmlNodeRef CXMLPatcher::DuplicateForPatching(
+    const XmlNodeRef& inOrig,
+    bool                                        inShareChildren)
+{
+    XmlNodeRef                          newNode(0);
+
+    if (m_patchXML)
+    {
+        newNode = m_patchXML->createNode(inOrig->getTag());
+        if (newNode)
+        {
+            // copy attributes in a safe way, copyAttributes() itself assumes the node being copied from is of the same type
+            int         numAttr = inOrig->getNumAttributes();
+
+            for (int i = 0; i < numAttr; i++)
+            {
+                const char* pKey, * pValue;
+                if (inOrig->getAttributeByIndex(i, &pKey, &pValue))
+                {
+                    newNode->setAttr(pKey, pValue);
+                }
+            }
+
+            if (inShareChildren)
+            {
+                newNode->shareChildren(inOrig);
+            }
+        }
+    }
+
+    return newNode;
+}
+
+void CXMLPatcher::PatchFail(
+    const char* pInReason)
+{
+    CryLogAlways("Failed to apply data patch for file '%s' - reason '%s'", m_pFileBeingPatched, pInReason);
+}
+
+XmlNodeRef CXMLPatcher::FindPatchForFile(
+    const char* pInFileToPatch)
+{
+    XmlNodeRef              result;
+
+    if (m_patchXML)
+    {
+        for (int i = 0, m = m_patchXML->getChildCount(); i < m; i++)
+        {
+            XmlNodeRef      child = m_patchXML->getChild(i);
+
+            if (child->isTag("patch"))
+            {
+                const char* pForFile = child->getAttr("forfile");
+
+                if (pForFile && CryStringUtils::stristr(pForFile, pInFileToPatch) != 0)
+                {
+                    result = child;
+                    break;
+                }
+            }
+        }
+    }
+
+    return result;
+}
+
+XmlNodeRef CXMLPatcher::ApplyPatchToNode(
+    const XmlNodeRef& inNode,
+    const XmlNodeRef& inPatch)
+{
+    XmlNodeRef                          result = inNode;
+
+    for (int i = 0, m = inPatch->getChildCount(); i < m; i++)
+    {
+        XmlNodeRef                      patchNode = inPatch->getChild(i);
+        if (!patchNode || _stricmp(patchNode->getTag(), "patchnode") != 0)
+        {
+            continue;
+        }
+
+        int                                     indexToPatch;
+        if (!patchNode->getAttr("index", indexToPatch))
+        {
+            PatchFail("found patchnode missing index");
+            continue;
+        }
+
+        int                                     maxChildren = result->getChildCount();
+
+        if ((indexToPatch < 0 || indexToPatch >= maxChildren) && indexToPatch != -1)
+        {
+            PatchFail("patchnode index out of valid range");
+            continue;
+        }
+
+        XmlNodeRef                      childToPatch = (indexToPatch != -1) ? result->getChild(indexToPatch) : XmlNodeRef(0);
+        XmlNodeRef                      matchTag = GetMatchTag(patchNode);
+
+        if (childToPatch && matchTag && !CompareTags(matchTag, childToPatch))
+        {
+            PatchFail("patch failed to apply, data did not match what was expected");
+            continue;
+        }
+
+        // we need to apply a patch to this child, make it patchable by duplicating the node
+
+        if (inNode == result)
+        {
+            // make parent patchable if not already
+            result = DuplicateForPatching(inNode, true);
+        }
+
+        if (XmlNodeRef insertTag = GetInsertTag(patchNode))
+        {
+            // insert a new child after this node
+            XmlNodeRef              newChild = DuplicateForPatching(insertTag, true);               // have to duplicate it as we don't have an 'insert shared child' function
+            result->insertChild(indexToPatch + 1, newChild);
+        }
+        else
+        {
+            if (indexToPatch == -1)
+            {
+                PatchFail("child indices of -1 can only be used when inserting new nodes");
+                continue;
+            }
+        }
+
+        bool shouldReplaceChildren = false;
+
+        if (XmlNodeRef replaceTag = GetReplaceTag(patchNode, &shouldReplaceChildren))
+        {
+            XmlNodeRef      newChild = DuplicateForPatching(replaceTag, false);
+
+            if (!shouldReplaceChildren)
+            {
+                newChild->shareChildren(childToPatch);
+            }
+            else
+            {
+                // note: this is inserting children that belong to the data patcher into the data being patched
+                // this is fine to do, as long as the caller doesn't make any permanent changes to the xml tree
+                // returned. if they did they would alter the patcher's nodes and thus affect future patches
+                // applied using the same patch
+                // as most callers are working with binary xmls they don't try and modify them - as this is not
+                // a supported operation
+                // note, if a second patch was applied to this patched tree containing the patch nodes, it
+                // wouldn't mess up the patch, as patching a tree never modifies it, it always returns a new tree
+                // that may share parts of the original tree
+                newChild->shareChildren(replaceTag);
+            }
+
+            result->replaceChild(indexToPatch, newChild);
+
+            childToPatch = newChild;
+        }
+
+        if (XmlNodeRef deleteTag = GetDeleteTag(patchNode))
+        {
+            result->deleteChildAt(indexToPatch);
+            childToPatch = 0;       // deleted - don't recurse into it
+        }
+
+        if (childToPatch)
+        {
+            // Apply recursively
+            XmlNodeRef      newChild = ApplyPatchToNode(childToPatch, patchNode);
+
+            // child has been patched, insert new child into parent
+            if (newChild != childToPatch)
+            {
+                result->replaceChild(indexToPatch, newChild);
+            }
+        }
+    }
+
+    return result;
+}
+
+XmlNodeRef CXMLPatcher::ApplyXMLDataPatch(
+    const XmlNodeRef& inNode,
+    const char* pInXMLFileName)
+{
+    XmlNodeRef                          result = inNode;
+
+    if (m_patchingEnabled)
+    {
+        if (m_patchXML)
+        {
+            XmlNodeRef                      patchForFile = FindPatchForFile(pInXMLFileName);
+            if (patchForFile)
+            {
+                m_pFileBeingPatched = pInXMLFileName;
+                CryLog("Applying game data patch to %s", pInXMLFileName);
+                XmlNodeRef      containerNode = m_patchXML->createNode("");
+                containerNode->addChild(inNode);
+                containerNode = ApplyPatchToNode(containerNode, patchForFile);
+                result = containerNode->getChild(0);
+                m_pFileBeingPatched = NULL;
+
+#if DATA_PATCH_DEBUG
+                if (inNode != result)
+                {
+                    DumpFiles(pInXMLFileName, inNode, result);
+                }
+#endif
+            }
+        }
+    }
+
+    return result;
+}
+
+XmlNodeRef CXMLPatcher::GetMatchTag(
+    const XmlNodeRef& inNode)
+{
+    XmlNodeRef      result;
+    XmlNodeRef      nr = inNode->findChild("match");
+    if (nr && nr->getChildCount() == 1)
+    {
+        result = nr->getChild(0);
+    }
+    return result;
+}
+
+XmlNodeRef CXMLPatcher::GetReplaceTag(
+    const XmlNodeRef& inNode,
+    bool* outShouldReplaceChildren)
+{
+    XmlNodeRef      result;
+    XmlNodeRef      nr = inNode->findChild("replacewith");
+    if (nr && nr->getChildCount() == 1)
+    {
+        if (!nr->getAttr("replaceChildren", *outShouldReplaceChildren))
+        {
+            *outShouldReplaceChildren = false;
+        }
+        result = nr->getChild(0);
+    }
+    return result;
+}
+
+
+XmlNodeRef CXMLPatcher::GetInsertTag(
+    const XmlNodeRef& inNode)
+{
+    XmlNodeRef      result;
+    XmlNodeRef      nr = inNode->findChild("insertAfter");
+    if (nr && nr->getChildCount() == 1)
+    {
+        result = nr->getChild(0);
+    }
+    return result;
+}
+
+XmlNodeRef CXMLPatcher::GetDeleteTag(
+    const XmlNodeRef& inNode)
+{
+    XmlNodeRef      result = inNode->findChild("delete");
+    return result;
+}
+
+// compares the two tags for equality of tag and attributes
+// used to ensure the source data being patched meets the patches expectations
+// only compares tag and attribs, doesn't do deep compare of children
+bool CXMLPatcher::CompareTags(
+    const XmlNodeRef& inA,
+    const XmlNodeRef& inB)
+{
+    bool        result = true;
+
+    if (inA != inB)
+    {
+        result = false;
+
+        if (_stricmp(inA->getTag(), inB->getTag()) == 0)
+        {
+            if (inA->getNumAttributes() == inB->getNumAttributes())
+            {
+                result = true;
+
+                for (int i = 0, m = inA->getNumAttributes(); i < m; i++)
+                {
+                    const char* pAKey, * pBKey;
+                    const char* pAValue, * pBValue;
+
+                    inA->getAttributeByIndex(i, &pAKey, &pAValue);
+                    inB->getAttributeByIndex(i, &pBKey, &pBValue);
+
+                    if (_stricmp(pAKey, pBKey) || _stricmp(pAValue, pBValue))
+                    {
+                        result = false;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    return result;
+}
+
+#if DATA_PATCH_DEBUG
+
+static const char* k_lotsOfTabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+
+#define INDENT()                                            \
+    if (inIndent > 0)                                       \
+    {                                                       \
+        pPak->FWrite(k_lotsOfTabs, inIndent, inFileHandle); \
+    }
+
+void CXMLPatcher::DumpXMLNodes(
+    AZ::IO::HandleType inFileHandle,
+    int inIndent,
+    const XmlNodeRef& inNode,
+    CryFixedStringT<512>* ioTempString)
+{
+    auto pPak = gEnv->pCryPak;
+
+    inIndent = min(inIndent, int(sizeof(k_lotsOfTabs) - 1));
+
+    INDENT();
+
+    ioTempString->Format("<%s ", inNode->getTag());
+
+    pPak->FWrite(ioTempString->c_str(), ioTempString->length(), inFileHandle);
+
+    for (int i = 0, m = inNode->getNumAttributes(); i < m; i++)
+    {
+        const char* pKey, * pVal;
+        inNode->getAttributeByIndex(i, &pKey, &pVal);
+        ioTempString->Format("%s=\"%s\" ", pKey, pVal);
+        pPak->FWrite(ioTempString->c_str(), ioTempString->length(), inFileHandle);
+    }
+    pPak->FWrite(">\n", 2, inFileHandle);
+
+    for (int i = 0, m = inNode->getChildCount(); i < m; i++)
+    {
+        DumpXMLNodes(inFileHandle, inIndent + 1, inNode->getChild(i), ioTempString);
+    }
+
+    INDENT();
+    ioTempString->Format("</%s>\n", inNode->getTag());
+    pPak->FWrite(ioTempString->c_str(), ioTempString->length(), inFileHandle);
+}
+
+
+void CXMLPatcher::DumpFiles(
+    const char* pInXMLFileName,
+    const XmlNodeRef& inBefore,
+    const XmlNodeRef& inAfter)
+{
+    if (m_pDumpFilesCVar->GetIVal())
+    {
+        CryLog("Dumping before and after data files for '%s'", pInXMLFileName);
+
+        const char* pOrigFileName = strrchr(pInXMLFileName, '/');
+        if (pOrigFileName)
+        {
+            pOrigFileName++;
+
+            DumpXMLFile(string().Format("PATCH_%s", pOrigFileName), inBefore);
+
+            CryFixedStringT<128>        newFileName(pOrigFileName);
+            newFileName.replace(".xml", "_patched.xml");
+
+            DumpXMLFile(string().Format("PATCH_%s", newFileName.c_str()), inAfter);
+        }
+        else
+        {
+            CryLog("Couldn't determine file name for path '%s' can't output diffs", pInXMLFileName);
+        }
+    }
+}
+
+void CXMLPatcher::DumpXMLFile(
+    const char* pInFilePath,
+    const XmlNodeRef& inNode)
+{
+    auto pIPak = GetISystem()->GetIPak();
+    AZ::IO::HandleType fileHandle = pIPak->FOpen(pInFilePath, "wb");
+
+    if (fileHandle != AZ::IO::InvalidHandle)
+    {
+        CryFixedStringT<512>        tempStr;
+
+        DumpXMLNodes(fileHandle, 0, inNode, &tempStr);
+
+        pIPak->FClose(fileHandle);
+    }
+}
+#endif
diff --git a/Code/Legacy/CrySystem/XML/XMLPatcher.h b/Code/Legacy/CrySystem/XML/XMLPatcher.h
new file mode 100644
index 0000000000..233957d081
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XMLPatcher.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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLPATCHER_H
+#define CRYINCLUDE_CRYSYSTEM_XML_XMLPATCHER_H
+#pragma once
+
+
+#if defined(WIN32) && !defined(_RELEASE)
+#define DATA_PATCH_DEBUG    1
+#else
+#define DATA_PATCH_DEBUG    0
+#endif
+
+class CXMLPatcher
+{
+protected:
+#if DATA_PATCH_DEBUG
+    ICVar                                               * m_pDumpFilesCVar;
+#endif
+
+    XmlNodeRef                                  m_patchXML;
+    const char* m_pFileBeingPatched;
+    bool                                                m_patchingEnabled;
+
+    void                                                PatchFail(
+        const char* pInReason);
+    XmlNodeRef                                  ApplyPatchToNode(
+        const XmlNodeRef& inNode,
+        const XmlNodeRef& inPatch);
+
+    XmlNodeRef                                  DuplicateForPatching(
+        const XmlNodeRef& inOrig,
+        bool                                                inShareChildren);
+
+    bool                                                CompareTags(
+        const XmlNodeRef& inA,
+        const XmlNodeRef& inB);
+    XmlNodeRef                                  GetMatchTag(
+        const XmlNodeRef& inNode);
+    XmlNodeRef                                  GetReplaceTag(
+        const XmlNodeRef& inNode,
+        bool* outShouldReplaceChildren);
+    XmlNodeRef                                  GetInsertTag(
+        const XmlNodeRef& inNode);
+    XmlNodeRef                                  GetDeleteTag(
+        const XmlNodeRef& inNode);
+    XmlNodeRef                                  FindPatchForFile(
+        const char* pInFileToPatch);
+
+#if DATA_PATCH_DEBUG
+    void                                                DumpXMLNodes(
+        AZ::IO::HandleType                                  inFileHandle,
+        int                                                 inIndent,
+        const XmlNodeRef& inNode,
+        CryFixedStringT<512>* ioTempString);
+    void                                                DumpFiles(
+        const char* pInXMLFileName,
+        const XmlNodeRef& inBefore,
+        const XmlNodeRef& inAfter);
+    void                                                DumpXMLFile(
+        const char* pInFilePath,
+        const XmlNodeRef& inNode);
+#endif
+
+public:
+    CXMLPatcher(XmlNodeRef& patchXML);
+    ~CXMLPatcher();
+
+    XmlNodeRef                                  ApplyXMLDataPatch(
+        const XmlNodeRef& inNode,
+        const char* pInXMLFileName);
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLPATCHER_H
diff --git a/Code/Legacy/CrySystem/XML/XmlUtils.cpp b/Code/Legacy/CrySystem/XML/XmlUtils.cpp
new file mode 100644
index 0000000000..cdb0e68b77
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XmlUtils.cpp
@@ -0,0 +1,712 @@
+/*
+ * 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 <IXml.h>
+#include "xml.h"
+#include "XmlUtils.h"
+#include "ReadWriteXMLSink.h"
+
+#include "../SimpleStringPool.h"
+#include "SerializeXMLReader.h"
+#include "SerializeXMLWriter.h"
+
+#include "XMLBinaryWriter.h"
+#include "XMLBinaryReader.h"
+
+#include "XMLPatcher.h"
+#include <md5.h>
+
+//////////////////////////////////////////////////////////////////////////
+CXmlNode_PoolAlloc* g_pCXmlNode_PoolAlloc = 0;
+#ifdef CRY_COLLECT_XML_NODE_STATS
+SXmlNodeStats* g_pCXmlNode_Stats = 0;
+#endif
+
+extern bool g_bEnableBinaryXmlLoading;
+
+//////////////////////////////////////////////////////////////////////////
+CXmlUtils::CXmlUtils(ISystem* pSystem)
+{
+    m_pSystem = pSystem;
+    m_pSystem->GetISystemEventDispatcher()->RegisterListener(this);
+
+    // create IReadWriteXMLSink object
+    m_pReadWriteXMLSink = new CReadWriteXMLSink();
+    g_pCXmlNode_PoolAlloc = new CXmlNode_PoolAlloc;
+#ifdef CRY_COLLECT_XML_NODE_STATS
+    g_pCXmlNode_Stats = new SXmlNodeStats();
+#endif
+    m_pStatsXmlNodePool = 0;
+#ifndef _RELEASE
+    m_statsThreadOwner = CryGetCurrentThreadId();
+#endif
+    m_pXMLPatcher = NULL;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CXmlUtils::~CXmlUtils()
+{
+    m_pSystem->GetISystemEventDispatcher()->RemoveListener(this);
+    delete g_pCXmlNode_PoolAlloc;
+#ifdef CRY_COLLECT_XML_NODE_STATS
+    delete g_pCXmlNode_Stats;
+#endif
+    SAFE_DELETE(m_pStatsXmlNodePool);
+    SAFE_DELETE(m_pXMLPatcher);
+}
+
+//////////////////////////////////////////////////////////////////////////
+IXmlParser* CXmlUtils::CreateXmlParser()
+{
+    const bool bReuseStrings = false; //TODO: do we ever want to reuse strings here?
+    return new XmlParser(bReuseStrings);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CXmlUtils::LoadXmlFromFile(const char* sFilename, bool bReuseStrings, bool bEnablePatching)
+{
+    XmlParser parser(bReuseStrings);
+    XmlNodeRef node = parser.ParseFile(sFilename, true);
+
+    // XmlParser is supposed to log warnings and errors (if any),
+    // so we don't need to call parser.getErrorString(),
+    // CryLog() etc here.
+
+    if (node && bEnablePatching && m_pXMLPatcher)
+    {
+        node = m_pXMLPatcher->ApplyXMLDataPatch(node, sFilename);
+    }
+
+    return node;
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CXmlUtils::LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings, bool bSuppressWarnings)
+{
+    XmlParser parser(bReuseStrings);
+    XmlNodeRef node = parser.ParseBuffer(buffer, size, true, bSuppressWarnings);
+    return node;
+}
+
+
+void GetMD5(const char* pSrcBuffer, int nSrcSize, char signatureMD5[16])
+{
+    MD5Context md5c;
+    MD5Init(&md5c);
+    MD5Update(&md5c, (unsigned char*)pSrcBuffer, nSrcSize);
+    MD5Final((unsigned char*)signatureMD5, &md5c);
+}
+
+//////////////////////////////////////////////////////////////////////////
+const char* CXmlUtils::HashXml(XmlNodeRef node)
+{
+    static char signature[16 * 2 + 1];
+    static char temp[16];
+    static const char* hex = "0123456789abcdef";
+    XmlString str = node->getXML();
+    GetMD5(str.data(), str.length(), temp);
+    for (int i = 0; i < 16; i++)
+    {
+        signature[2 * i + 0] = hex[((uint8)temp[i]) >> 4];
+        signature[2 * i + 1] = hex[((uint8)temp[i]) & 0xf];
+    }
+    signature[16 * 2] = 0;
+    return signature;
+}
+
+//////////////////////////////////////////////////////////////////////////
+IReadWriteXMLSink* CXmlUtils::GetIReadWriteXMLSink()
+{
+    return m_pReadWriteXMLSink;
+}
+
+//////////////////////////////////////////////////////////////////////////
+class CXmlSerializer
+    : public IXmlSerializer
+{
+public:
+    CXmlSerializer()
+        : m_nRefCount(0)
+        , m_pReaderImpl(NULL)
+        , m_pReaderSer(NULL)
+        , m_pWriterSer(NULL)
+        , m_pWriterImpl(NULL)
+    {
+    }
+    ~CXmlSerializer()
+    {
+        ClearAll();
+    }
+    void ClearAll()
+    {
+        SAFE_DELETE(m_pReaderSer);
+        SAFE_DELETE(m_pReaderImpl);
+        SAFE_DELETE(m_pWriterSer);
+        SAFE_DELETE(m_pWriterImpl);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void AddRef() { ++m_nRefCount; }
+    virtual void Release()
+    {
+        if (--m_nRefCount <= 0)
+        {
+            delete this;
+        }
+    }
+
+    virtual ISerialize* GetWriter(XmlNodeRef& node)
+    {
+        ClearAll();
+        m_pWriterImpl = new CSerializeXMLWriterImpl(node);
+        m_pWriterSer = new CSimpleSerializeWithDefaults<CSerializeXMLWriterImpl>(*m_pWriterImpl);
+        return m_pWriterSer;
+    }
+    virtual ISerialize* GetReader(XmlNodeRef& node)
+    {
+        ClearAll();
+        m_pReaderImpl = new CSerializeXMLReaderImpl(node);
+        m_pReaderSer = new CSimpleSerializeWithDefaults<CSerializeXMLReaderImpl>(*m_pReaderImpl);
+        return m_pReaderSer;
+    }
+
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->Add(*this);
+        pSizer->AddObject(m_pReaderImpl);
+        pSizer->AddObject(m_pWriterImpl);
+    }
+    //////////////////////////////////////////////////////////////////////////
+private:
+    int m_nRefCount;
+    CSerializeXMLReaderImpl* m_pReaderImpl;
+    CSimpleSerializeWithDefaults<CSerializeXMLReaderImpl>* m_pReaderSer;
+
+    CSerializeXMLWriterImpl* m_pWriterImpl;
+    CSimpleSerializeWithDefaults<CSerializeXMLWriterImpl>* m_pWriterSer;
+};
+
+//////////////////////////////////////////////////////////////////////////
+IXmlSerializer* CXmlUtils::CreateXmlSerializer()
+{
+    return new CXmlSerializer;
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlUtils::GetMemoryUsage(ICrySizer* pSizer)
+{
+    {
+        SIZER_COMPONENT_NAME(pSizer, "Nodes");
+        g_pCXmlNode_PoolAlloc->GetMemoryUsage(pSizer);
+    }
+
+#ifdef CRY_COLLECT_XML_NODE_STATS
+    // yes, slow
+    std::vector<const CXmlNode*> rootNodes;
+    {
+        TXmlNodeSet::const_iterator iter = g_pCXmlNode_Stats->nodeSet.begin();
+        TXmlNodeSet::const_iterator iterEnd = g_pCXmlNode_Stats->nodeSet.end();
+        while (iter != iterEnd)
+        {
+            const CXmlNode* pNode = *iter;
+            if (pNode->getParent() == 0)
+            {
+                rootNodes.push_back(pNode);
+            }
+            ++iter;
+        }
+    }
+
+    // use the following to log to console
+#if 0
+    CryLogAlways("NumXMLRootNodes=%d NumXMLNodes=%d TotalAllocs=%d TotalFrees=%d",
+        rootNodes.size(), g_pCXmlNode_Stats->nodeSet.size(),
+        g_pCXmlNode_Stats->nAllocs, g_pCXmlNode_Stats->nFrees);
+#endif
+
+
+    // use the following to debug the nodes in the system
+#if 0
+    {
+        std::vector<const CXmlNode*>::const_iterator iter = rootNodes.begin();
+        std::vector<const CXmlNode*>::const_iterator iterEnd = rootNodes.end();
+        while (iter != iterEnd)
+        {
+            const CXmlNode* pNode = *iter;
+            CryLogAlways("Node 0x%p Tag='%s'", pNode, pNode->getTag());
+            ++iter;
+        }
+    }
+#endif
+
+    // only for debugging, add it as pseudo numbers to the CrySizer.
+    // shift it by 10, so we get the actual number
+    {
+        SIZER_COMPONENT_NAME(pSizer, "#NumTotalNodes");
+        pSizer->Add("#NumTotalNodes", g_pCXmlNode_Stats->nodeSet.size() << 10);
+    }
+
+    {
+        SIZER_COMPONENT_NAME(pSizer, "#NumRootNodes");
+        pSizer->Add("#NumRootNodes", rootNodes.size() << 10);
+    }
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlUtils::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
+{
+    switch (event)
+    {
+    case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
+    case ESYSTEM_EVENT_LEVEL_LOAD_END:
+        g_pCXmlNode_PoolAlloc->FreeMemoryIfEmpty();
+        break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+class CXmlBinaryDataWriterFile
+    : public XMLBinary::IDataWriter
+{
+public:
+    CXmlBinaryDataWriterFile(const char* file)
+    {
+        m_fileHandle = gEnv->pCryPak->FOpen(file, "wb");
+    }
+    ~CXmlBinaryDataWriterFile()
+    {
+        if (m_fileHandle != AZ::IO::InvalidHandle)
+        {
+            gEnv->pCryPak->FClose(m_fileHandle);
+        }
+    };
+    virtual bool IsOk()
+    {
+        return m_fileHandle != AZ::IO::InvalidHandle;
+    }
+    ;
+    virtual void Write(const void* pData, size_t size)
+    {
+        if (m_fileHandle != AZ::IO::InvalidHandle)
+        {
+            gEnv->pCryPak->FWrite(pData, size, 1, m_fileHandle);
+        }
+    }
+private:
+    AZ::IO::HandleType m_fileHandle;
+};
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlUtils::SaveBinaryXmlFile(const char* filename, XmlNodeRef root)
+{
+    CXmlBinaryDataWriterFile fileSink(filename);
+    if (!fileSink.IsOk())
+    {
+        return false;
+    }
+    XMLBinary::CXMLBinaryWriter writer;
+    string error;
+    return writer.WriteNode(&fileSink, root, false, 0, error);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CXmlUtils::LoadBinaryXmlFile(const char* filename, bool bEnablePatching)
+{
+    XMLBinary::XMLBinaryReader reader;
+    XMLBinary::XMLBinaryReader::EResult result;
+    XmlNodeRef root = reader.LoadFromFile(filename, result);
+
+    if (result == XMLBinary::XMLBinaryReader::eResult_Success && bEnablePatching == true && m_pXMLPatcher != NULL)
+    {
+        root = m_pXMLPatcher->ApplyXMLDataPatch(root, filename);
+    }
+
+    return root;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlUtils::EnableBinaryXmlLoading(bool bEnable)
+{
+    bool bPrev = g_bEnableBinaryXmlLoading;
+    g_bEnableBinaryXmlLoading = bEnable;
+    return bPrev;
+}
+
+//////////////////////////////////////////////////////////////////////////
+class CXmlTableReader
+    : public IXmlTableReader
+{
+public:
+    CXmlTableReader();
+    virtual ~CXmlTableReader();
+
+    virtual void Release();
+
+    virtual bool Begin(XmlNodeRef rootNode);
+    virtual int  GetEstimatedRowCount();
+    virtual bool ReadRow(int& rowIndex);
+    virtual bool ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize);
+    float GetCurrentRowHeight() override;
+
+private:
+    bool m_bExcel;
+
+    XmlNodeRef m_tableNode;
+
+    XmlNodeRef m_rowNode;
+
+    float m_currentRowHeight;
+    int m_rowNodeIndex;
+    int m_row;
+
+    int m_columnNodeIndex;  // used if m_bExcel == true
+    int m_column;
+
+    size_t m_rowTextSize;   // used if m_bExcel == false
+    size_t m_rowTextPos;    // used if m_bExcel == false
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+CXmlTableReader::CXmlTableReader()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+CXmlTableReader::~CXmlTableReader()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlTableReader::Release()
+{
+    delete this;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlTableReader::Begin(XmlNodeRef rootNode)
+{
+    m_tableNode = 0;
+
+    if (!rootNode)
+    {
+        return false;
+    }
+
+    XmlNodeRef worksheetNode = rootNode->findChild("Worksheet");
+    if (worksheetNode)
+    {
+        m_bExcel = true;
+        m_tableNode = worksheetNode->findChild("Table");
+    }
+    else
+    {
+        m_bExcel = false;
+        m_tableNode = rootNode->findChild("Table");
+    }
+
+    m_rowNode = 0;
+    m_rowNodeIndex = -1;
+    m_row = -1;
+
+    return (m_tableNode != 0);
+}
+
+//////////////////////////////////////////////////////////////////////////
+int CXmlTableReader::GetEstimatedRowCount()
+{
+    if (!m_tableNode)
+    {
+        return -1;
+    }
+    return m_tableNode->getChildCount();
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlTableReader::ReadRow(int& rowIndex)
+{
+    m_currentRowHeight = 0.0f;
+    if (!m_tableNode)
+    {
+        return false;
+    }
+
+    m_columnNodeIndex = -1;
+    m_column = -1;
+
+    const int rowNodeCount = m_tableNode->getChildCount();
+
+    if (m_bExcel)
+    {
+        for (;; )
+        {
+            if (++m_rowNodeIndex >= rowNodeCount)
+            {
+                m_rowNodeIndex = rowNodeCount;
+                return false;
+            }
+
+            m_rowNode = m_tableNode->getChild(m_rowNodeIndex);
+            if (!m_rowNode)
+            {
+                m_rowNodeIndex = rowNodeCount;
+                return false;
+            }
+
+            if (!m_rowNode->isTag("Row"))
+            {
+                m_rowNode = 0;
+                continue;
+            }
+
+            ++m_row;
+
+            int index = 0;
+            if (m_rowNode->getAttr("ss:Index", index))
+            {
+                --index;  // one-based -> zero-based
+                if (index < m_row)
+                {
+                    m_rowNodeIndex = rowNodeCount;
+                    m_rowNode = 0;
+                    return false;
+                }
+                m_row = index;
+            }
+            float height;
+            if (m_rowNode->getAttr("ss:Height", height))
+            {
+                m_currentRowHeight = height;
+            }
+
+            rowIndex = m_row;
+            return true;
+        }
+    }
+
+    {
+        m_rowTextSize = 0;
+        m_rowTextPos = 0;
+
+        if (++m_rowNodeIndex >= rowNodeCount)
+        {
+            m_rowNodeIndex = rowNodeCount;
+            return false;
+        }
+
+        m_rowNode = m_tableNode->getChild(m_rowNodeIndex);
+        if (!m_rowNode)
+        {
+            m_rowNodeIndex = rowNodeCount;
+            return false;
+        }
+
+        const char* const pContent = m_rowNode->getContent();
+        if (pContent)
+        {
+            m_rowTextSize = strlen(pContent);
+        }
+
+        m_row = m_rowNodeIndex;
+        rowIndex = m_rowNodeIndex;
+        return true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlTableReader::ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize)
+{
+    pContent = 0;
+    contentSize = 0;
+
+    if (!m_tableNode)
+    {
+        return false;
+    }
+
+    if (!m_rowNode)
+    {
+        return false;
+    }
+
+    if (m_bExcel)
+    {
+        const int columnNodeCount = m_rowNode->getChildCount();
+
+        for (;; )
+        {
+            if (++m_columnNodeIndex >= columnNodeCount)
+            {
+                m_columnNodeIndex = columnNodeCount;
+                return false;
+            }
+
+            XmlNodeRef columnNode = m_rowNode->getChild(m_columnNodeIndex);
+            if (!columnNode)
+            {
+                m_columnNodeIndex = columnNodeCount;
+                return false;
+            }
+
+            if (!columnNode->isTag("Cell"))
+            {
+                continue;
+            }
+
+            ++m_column;
+
+            int index = 0;
+            if (columnNode->getAttr("ss:Index", index))
+            {
+                --index;  // one-based -> zero-based
+                if (index < m_column)
+                {
+                    m_columnNodeIndex = columnNodeCount;
+                    return false;
+                }
+                m_column = index;
+            }
+            columnIndex = m_column;
+
+            XmlNodeRef dataNode = columnNode->findChild("Data");
+            if (dataNode)
+            {
+                pContent = dataNode->getContent();
+                if (pContent)
+                {
+                    contentSize = strlen(pContent);
+                }
+            }
+            return true;
+        }
+    }
+
+    {
+        if (m_rowTextPos >= m_rowTextSize)
+        {
+            return false;
+        }
+
+        const char* const pRowContent = m_rowNode->getContent();
+        if (!pRowContent)
+        {
+            m_rowTextPos = m_rowTextSize;
+            return false;
+        }
+        pContent = &pRowContent[m_rowTextPos];
+
+        columnIndex = ++m_column;
+
+        for (;; )
+        {
+            char c = pRowContent[m_rowTextPos++];
+
+            if ((c == '\n') || (c == '\0'))
+            {
+                return true;
+            }
+
+            if (c == '\r')
+            {
+                // ignore all '\r' chars
+                for (;; )
+                {
+                    c = pRowContent[m_rowTextPos++];
+                    if ((c == '\n') || (c == '\0'))
+                    {
+                        return true;
+                    }
+                    if (c != '\r')
+                    {
+                        // broken data. '\r' expected to be followed by '\n' or '\0'.
+                        contentSize = 0;
+                        m_rowTextPos = m_rowTextSize;
+                        return false;
+                    }
+                }
+            }
+
+            ++contentSize;
+        }
+    }
+}
+
+float CXmlTableReader::GetCurrentRowHeight()
+{
+    return m_currentRowHeight;
+}
+//////////////////////////////////////////////////////////////////////////
+IXmlTableReader* CXmlUtils::CreateXmlTableReader()
+{
+    return new CXmlTableReader;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Init xml stats nodes pool
+void CXmlUtils::InitStatsXmlNodePool(uint32 nPoolSize)
+{
+    CHECK_STATS_THREAD_OWNERSHIP();
+    if (0 == m_pStatsXmlNodePool)
+    {
+        // create special xml node pools for game statistics
+
+        const bool bReuseStrings = true;    // TODO parameterise?
+        m_pStatsXmlNodePool = new CXmlNodePool(nPoolSize, bReuseStrings);
+        assert(m_pStatsXmlNodePool);
+    }
+    else
+    {
+        CryLog("[CXmlNodePool]: Xml stats nodes pool already initialized");
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Creates new xml node for statistics.
+XmlNodeRef CXmlUtils::CreateStatsXmlNode(const char* sNodeName)
+{
+    CHECK_STATS_THREAD_OWNERSHIP();
+    if (0 == m_pStatsXmlNodePool)
+    {
+        CryLog("[CXmlNodePool]: Xml stats nodes pool isn't initialized. Perform default initialization.");
+        InitStatsXmlNodePool();
+    }
+    return m_pStatsXmlNodePool->GetXmlNode(sNodeName);
+}
+
+void CXmlUtils::SetStatsOwnerThread([[maybe_unused]] threadID threadId)
+{
+#ifndef _RELEASE
+    m_statsThreadOwner = threadId;
+#endif
+}
+
+void CXmlUtils::FlushStatsXmlNodePool()
+{
+    CHECK_STATS_THREAD_OWNERSHIP();
+    if (m_pStatsXmlNodePool)
+    {
+        if (m_pStatsXmlNodePool->empty())
+        {
+            SAFE_DELETE(m_pStatsXmlNodePool);
+        }
+    }
+}
+
+void CXmlUtils::SetXMLPatcher(XmlNodeRef* pPatcher)
+{
+    SAFE_DELETE(m_pXMLPatcher);
+
+    if (pPatcher != NULL)
+    {
+        m_pXMLPatcher = new CXMLPatcher(*pPatcher);
+    }
+}
+
+
diff --git a/Code/Legacy/CrySystem/XML/XmlUtils.h b/Code/Legacy/CrySystem/XML/XmlUtils.h
new file mode 100644
index 0000000000..492a552940
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/XmlUtils.h
@@ -0,0 +1,101 @@
+/*
+ * 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_XML_XMLUTILS_H
+#define CRYINCLUDE_CRYSYSTEM_XML_XMLUTILS_H
+#pragma once
+
+#include "ISystem.h"
+
+#ifdef _RELEASE
+#define CHECK_STATS_THREAD_OWNERSHIP()
+#else
+#define CHECK_STATS_THREAD_OWNERSHIP() if (m_statsThreadOwner != CryGetCurrentThreadId()) {__debugbreak(); }
+#endif
+
+class CXmlNodePool;
+class CXMLPatcher;
+
+//////////////////////////////////////////////////////////////////////////
+// Implements IXmlUtils interface.
+//////////////////////////////////////////////////////////////////////////
+class CXmlUtils
+    : public IXmlUtils
+    , public ISystemEventListener
+{
+public:
+    CXmlUtils(ISystem* pSystem);
+    virtual ~CXmlUtils();
+
+    //////////////////////////////////////////////////////////////////////////
+    // IXmlUtils
+    //////////////////////////////////////////////////////////////////////////
+
+    virtual IXmlParser* CreateXmlParser();
+
+    // Load xml from file, returns 0 if load failed.
+    virtual XmlNodeRef LoadXmlFromFile(const char* sFilename, bool bReuseStrings = false, bool bEnablePatching = true);
+    // Load xml from memory buffer, returns 0 if load failed.
+    virtual XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings = false, bool bSuppressWarnings = false);
+
+    // create an MD5 hash of an XML file
+    virtual const char* HashXml(XmlNodeRef node);
+
+    // Get an object that can read a xml into a IReadXMLSink
+    // and write a xml from a IWriteXMLSource
+    virtual IReadWriteXMLSink* GetIReadWriteXMLSink();
+
+    virtual IXmlSerializer* CreateXmlSerializer();
+
+    virtual bool SaveBinaryXmlFile(const char* sFilename, XmlNodeRef root);
+    virtual XmlNodeRef LoadBinaryXmlFile(const char* sFilename, bool bEnablePatching = true);
+
+    virtual bool EnableBinaryXmlLoading(bool bEnable);
+
+    // Create XML Table reader.
+    virtual IXmlTableReader* CreateXmlTableReader();
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // ISystemEventListener
+    //////////////////////////////////////////////////////////////////////////
+    virtual void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam);
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    virtual void GetMemoryUsage(ICrySizer* pSizer);
+
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // Init xml stats nodes pool
+    virtual void InitStatsXmlNodePool(uint32 nPoolSize = 1024*1024);
+
+    // Create new xml node for statistics
+    virtual XmlNodeRef CreateStatsXmlNode(const char* sNodeName = "");
+
+    // Set owner thread
+    virtual void SetStatsOwnerThread(threadID threadId);
+
+    // Free memory if stats xml node pool is empty
+    virtual void FlushStatsXmlNodePool();
+
+    // Set the XML Patcher. This is an XML object that modifies named XML files as they are loaded
+    // EXCEPT for xml files loaded from a buffer, for which names aren't passed in
+    virtual void SetXMLPatcher(XmlNodeRef* pPatcher);
+
+private:
+    ISystem* m_pSystem;
+    IReadWriteXMLSink*    m_pReadWriteXMLSink;
+    CXmlNodePool*                   m_pStatsXmlNodePool;
+    CXMLPatcher*                    m_pXMLPatcher;              //If set, applies data patches to any XML file that is loaded by this class
+#ifndef _RELEASE
+    threadID m_statsThreadOwner;
+#endif
+};
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLUTILS_H
diff --git a/Code/Legacy/CrySystem/XML/crysystem_xmlbinary_files.cmake b/Code/Legacy/CrySystem/XML/crysystem_xmlbinary_files.cmake
new file mode 100644
index 0000000000..aa69dad759
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/crysystem_xmlbinary_files.cmake
@@ -0,0 +1,15 @@
+#
+# 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
+    XMLBinaryNode.cpp
+    XMLBinaryNode.h
+    XMLBinaryReader.cpp
+    XMLBinaryReader.h
+    XMLBinaryWriter.cpp
+    XMLBinaryWriter.h
+)
diff --git a/Code/Legacy/CrySystem/XML/xml.cpp b/Code/Legacy/CrySystem/XML/xml.cpp
new file mode 100644
index 0000000000..be9b1d8787
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/xml.cpp
@@ -0,0 +1,1959 @@
+/*
+ * 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"
+
+//#define _CRT_SECURE_NO_DEPRECATE 1
+//#define _CRT_NONSTDC_NO_DEPRECATE
+#include <stdlib.h>
+
+#define XML_STATIC // Alternative to defining this here would be setting it project-wide
+#include <expat.h>
+#include "xml.h"
+#include <algorithm>
+#include <stdio.h>
+#include <AzFramework/Archive/IArchive.h>
+#include "XMLBinaryReader.h"
+
+#define FLOAT_FMT   "%.8g"
+#define DOUBLE_FMT  "%.17g"
+
+#include "../SimpleStringPool.h"
+
+#include "System.h"
+
+#if AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
+#include <clocale>
+#include <locale>
+
+class LocaleResetter
+{
+public:
+    LocaleResetter()
+    {
+        m_oldLocale = std::setlocale(LC_NUMERIC, "C");
+    }
+    ~LocaleResetter()
+    {
+        std::setlocale(LC_NUMERIC, m_oldLocale);
+    }
+
+private:
+    char* m_oldLocale;
+};
+#define SCOPED_LOCALE_RESETTER LocaleResetter l
+#else
+// noop on Windows
+#define SCOPED_LOCALE_RESETTER
+#endif
+
+// Global counter for memory allocated in XML string pools.
+size_t CSimpleStringPool::g_nTotalAllocInXmlStringPools = 0;
+
+//////////////////////////////////////////////////////////////////////////
+static int __cdecl ascii_stricmp(const char* dst, const char* src)
+{
+    int f, l;
+    do
+    {
+        if (((f = (unsigned char)(*(dst++))) >= 'A') && (f <= 'Z'))
+        {
+            f -= 'A' - 'a';
+        }
+        if (((l = (unsigned char)(*(src++))) >= 'A') && (l <= 'Z'))
+        {
+            l -= 'A' - 'a';
+        }
+    }
+    while (f && (f == l));
+    return(f - l);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlStrCmpFunc g_pXmlStrCmp = &ascii_stricmp;
+bool g_bEnableBinaryXmlLoading = true;
+
+//////////////////////////////////////////////////////////////////////////
+class CXmlStringData
+    : public IXmlStringData
+{
+public:
+    int m_nRefCount;
+    XmlString m_string;
+
+    CXmlStringData() { m_nRefCount = 0; }
+    virtual void AddRef() { ++m_nRefCount; }
+    virtual void Release()
+    {
+        if (--m_nRefCount <= 0)
+        {
+            delete this;
+        }
+    }
+
+    virtual const char* GetString() { return m_string.c_str(); };
+    virtual size_t GetStringLength() { return m_string.size(); };
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CXmlStringPool
+    : public IXmlStringPool
+{
+public:
+    explicit CXmlStringPool(bool bReuseStrings)
+        : m_stringPool(bReuseStrings) {}
+
+    const char* AddString(const char* str) { return m_stringPool.Append(str, (int)strlen(str)); }
+    void Clear() { m_stringPool.Clear(); }
+    void SetBlockSize(unsigned int nBlockSize) { m_stringPool.SetBlockSize(nBlockSize); }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(m_stringPool);
+    }
+private:
+    CSimpleStringPool m_stringPool;
+};
+
+//xml_node_allocator XmlDynArrayAlloc::allocator;
+//size_t XmlDynArrayAlloc::m_iAllocated = 0;
+/**
+******************************************************************************
+* CXmlNode implementation.
+******************************************************************************
+*/
+
+void CXmlNode::DeleteThis()
+{
+    delete this;
+}
+
+CXmlNode::~CXmlNode()
+{
+    m_nRefCount = 1;      // removeAllChildsImpl can make an XmlNodeRef to this node whilst it is deleting the children
+    // doing this will cause the ref count to be increment and decremented and cause delete to be called again,
+    // leading to a recursion crash. upping the ref count here once destruction has started avoids this problem
+    removeAllChildsImpl();
+
+    SAFE_DELETE(m_pAttributes);
+
+    m_pStringPool->Release();
+}
+
+CXmlNode::CXmlNode()
+    : m_pStringPool(NULL) // must be changed later.
+    , m_tag("")
+    , m_content("")
+    , m_parent(NULL)
+    , m_pChilds(NULL)
+    , m_pAttributes(NULL)
+    , m_line(0)
+    , m_isProcessingInstruction(false)
+{
+    m_nRefCount = 0; //TODO: move initialization to IXmlNode constructor
+}
+
+CXmlNode::CXmlNode(const char* tag, bool bReuseStrings, bool bIsProcessingInstruction)
+    : m_content("")
+    , m_parent(NULL)
+    , m_pChilds(NULL)
+    , m_pAttributes(NULL)
+    , m_line(0)
+    , m_isProcessingInstruction(bIsProcessingInstruction)
+{
+    m_nRefCount = 0; //TODO: move initialization to IXmlNode constructor
+
+    m_pStringPool = new CXmlStringPool(bReuseStrings);
+    m_pStringPool->AddRef();
+    m_tag = m_pStringPool->AddString(tag);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// collect allocated memory  informations
+void CXmlNode::GetMemoryUsage(ICrySizer* pSizer) const
+{
+    pSizer->AddObject(this, sizeof(*this));
+    pSizer->AddObject(m_pStringPool);
+
+    if (m_pChilds)
+    {
+        pSizer->AddObject(*m_pChilds);
+    }
+    if (m_pAttributes)
+    {
+        pSizer->AddContainer(*m_pAttributes);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef CXmlNode::createNode(const char* tag)
+{
+    CXmlNode* pNewNode = new CXmlNode;
+    pNewNode->m_pStringPool = m_pStringPool;
+    m_pStringPool->AddRef();
+    pNewNode->m_tag = m_pStringPool->AddString(tag);
+    return XmlNodeRef(pNewNode);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlNode::setTag(const char* tag)
+{
+    m_tag = m_pStringPool->AddString(tag);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlNode::setContent(const char* str)
+{
+    m_content = m_pStringPool->AddString(str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::isTag(const char* tag) const
+{
+    return g_pXmlStrCmp(tag, m_tag) == 0;
+}
+
+const char* CXmlNode::getAttr(const char* key) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        return svalue;
+    }
+    return "";
+}
+
+bool    CXmlNode::getAttr(const char* key, const char** value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        *value = svalue;
+        return true;
+    }
+    else
+    {
+        *value = "";
+        return false;
+    }
+}
+
+bool CXmlNode::haveAttr(const char* key) const
+{
+    if (m_pAttributes)
+    {
+        XmlAttrConstIter it = GetAttrConstIterator(key);
+        if (it != m_pAttributes->end())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+void CXmlNode::delAttr(const char* key)
+{
+    if (m_pAttributes)
+    {
+        XmlAttrIter it = GetAttrIterator(key);
+        if (it != m_pAttributes->end())
+        {
+            m_pAttributes->erase(it);
+        }
+    }
+}
+
+void CXmlNode::removeAllAttributes()
+{
+    if (m_pAttributes)
+    {
+        m_pAttributes->clear();
+        SAFE_DELETE(m_pAttributes);
+    }
+}
+
+void CXmlNode::setAttr(const char* key, const char* value)
+{
+    if (!m_pAttributes)
+    {
+        m_pAttributes = new XmlAttributes;
+    }
+    assert(m_pAttributes);
+
+    XmlAttrIter it = GetAttrIterator(key);
+    if (it == m_pAttributes->end())
+    {
+        XmlAttribute tempAttr;
+        tempAttr.key = m_pStringPool->AddString(key);
+        tempAttr.value = m_pStringPool->AddString(value);
+        m_pAttributes->push_back(tempAttr);
+        // Sort attributes.
+        //std::sort( m_pAttributes->begin(),m_pAttributes->end() );
+    }
+    else
+    {
+        // If already exist, override this member.
+        it->value = m_pStringPool->AddString(value);
+    }
+}
+
+void CXmlNode::setAttr(const char* key, int value)
+{
+    char str[128];
+    azitoa(value, str, AZ_ARRAY_SIZE(str), 10);
+    setAttr(key, str);
+}
+
+void CXmlNode::setAttr(const char* key, unsigned int value)
+{
+    char str[128];
+    azui64toa(value, str, AZ_ARRAY_SIZE(str), 10);
+    setAttr(key, str);
+}
+
+void CXmlNode::setAttr(const char* key, float value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, FLOAT_FMT, value);
+    setAttr(key, str);
+}
+
+void CXmlNode::setAttr(const char* key, double value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, DOUBLE_FMT, value);
+    setAttr(key, str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlNode::setAttr(const char* key, int64 value)
+{
+    char str[32];
+    sprintf_s(str, "%" PRId64, value);
+    setAttr(key, str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlNode::setAttr(const char* key, uint64 value, bool useHexFormat)
+{
+    char str[32];
+    if (useHexFormat)
+    {
+        sprintf_s(str, "%" PRIX64, value);
+    }
+    else
+    {
+        sprintf_s(str, "%" PRIu64, value);
+    }
+    setAttr(key, str);
+}
+
+void CXmlNode::setAttr(const char* key, const Ang3& value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT, value.x, value.y, value.z);
+    setAttr(key, str);
+}
+void CXmlNode::setAttr(const char* key, const Vec3& value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT, value.x, value.y, value.z);
+    setAttr(key, str);
+}
+void CXmlNode::setAttr(const char* key, const Vec4& value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT, value.x, value.y, value.z, value.w);
+    setAttr(key, str);
+}
+
+void CXmlNode::setAttr(const char* key, const Vec3d& value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, DOUBLE_FMT "," DOUBLE_FMT "," DOUBLE_FMT, value.x, value.y, value.z);
+    setAttr(key, str);
+}
+void CXmlNode::setAttr(const char* key, const Vec2& value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT, value.x, value.y);
+    setAttr(key, str);
+}
+void CXmlNode::setAttr(const char* key, const Vec2d& value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, DOUBLE_FMT "," DOUBLE_FMT, value.x, value.y);
+    setAttr(key, str);
+}
+
+void CXmlNode::setAttr(const char* key, const Quat& value)
+{
+    char str[128];
+    SCOPED_LOCALE_RESETTER;
+    sprintf_s(str, FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT "," FLOAT_FMT, value.w, value.v.x, value.v.y, value.v.z);
+    setAttr(key, str);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttr(const char* key, int& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = atoi(svalue);
+        return true;
+    }
+    return false;
+}
+
+bool CXmlNode::getAttr(const char* key, unsigned int& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = strtoul(svalue, NULL, 10);
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttr(const char* key, int64& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        azsscanf(svalue, "%" PRId64, &value);
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttr(const char* key, uint64& value, bool useHexFormat) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        if (useHexFormat)
+        {
+            azsscanf(svalue, "%" PRIX64, &value);
+        }
+        else
+        {
+            azsscanf(svalue, "%" PRIu64, &value);
+        }
+        return true;
+    }
+    return false;
+}
+
+bool CXmlNode::getAttr(const char* key, bool& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        if (azstricmp(svalue, "true") == 0)
+        {
+            value = true;
+        }
+        else if (azstricmp(svalue, "false") == 0)
+        {
+            value = false;
+        }
+        else
+        {
+            value = atoi(svalue) != 0;
+        }
+        return true;
+    }
+    return false;
+}
+
+bool CXmlNode::getAttr(const char* key, float& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = (float)atof(svalue);
+        return true;
+    }
+    return false;
+}
+
+bool CXmlNode::getAttr(const char* key, double& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        value = atof(svalue);
+        return true;
+    }
+    return false;
+}
+
+bool CXmlNode::getAttr(const char* key, Ang3& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        SCOPED_LOCALE_RESETTER;
+        float x, y, z;
+        if (azsscanf(svalue, "%f,%f,%f", &x, &y, &z) == 3)
+        {
+            value(x, y, z);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttr(const char* key, Vec3& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        SCOPED_LOCALE_RESETTER;
+        float x, y, z;
+        if (azsscanf(svalue, "%f,%f,%f", &x, &y, &z) == 3)
+        {
+            value = Vec3(x, y, z);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttr(const char* key, Vec4& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        SCOPED_LOCALE_RESETTER;
+        float x, y, z, w;
+        if (azsscanf(svalue, "%f,%f,%f,%f", &x, &y, &z, &w) == 4)
+        {
+            value = Vec4(x, y, z, w);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool CXmlNode::getAttr(const char* key, Vec3d& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        SCOPED_LOCALE_RESETTER;
+        double x, y, z;
+        if (azsscanf(svalue, "%lf,%lf,%lf", &x, &y, &z) == 3)
+        {
+            value = Vec3d(x, y, z);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttr(const char* key, Vec2& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        SCOPED_LOCALE_RESETTER;
+        float x, y;
+        if (azsscanf(svalue, "%f,%f", &x, &y) == 2)
+        {
+            value = Vec2(x, y);
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CXmlNode::getAttr(const char* key, Vec2d& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        SCOPED_LOCALE_RESETTER;
+        double x, y;
+        if (azsscanf(svalue, "%lf,%lf", &x, &y) == 2)
+        {
+            value = Vec2d(x, y);
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttr(const char* key, Quat& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        SCOPED_LOCALE_RESETTER;
+        float w, x, y, z;
+        if (azsscanf(svalue, "%f,%f,%f,%f", &w, &x, &y, &z) == 4)
+        {
+            if (fabs(w) > VEC_EPSILON || fabs(x) > VEC_EPSILON || fabs(y) > VEC_EPSILON || fabs(z) > VEC_EPSILON)
+            {
+                //[AlexMcC|02.03.10] directly assign to members to avoid triggering the assert in Quat() with data from bad assets
+                value.w = w;
+                value.v = Vec3(x, y, z);
+                return value.IsValid();
+            }
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttr(const char* key, ColorB& value) const
+{
+    const char* svalue = GetValue(key);
+    if (svalue)
+    {
+        unsigned int r, g, b, a = 255;
+        int numFound = azsscanf(svalue, "%u,%u,%u,%u", &r, &g, &b, &a);
+        if (numFound == 3 || numFound == 4)
+        {
+            // If we only found 3 values, a should be unchanged, and still be 255
+            if (r < 256 && g < 256 && b < 256 && a < 256)
+            {
+                value = ColorB(r, g, b, a);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+
+XmlNodeRef CXmlNode::findChild(const char* tag) const
+{
+    if (m_pChilds)
+    {
+        XmlNodes& childs = *m_pChilds;
+        for (int i = 0, num = childs.size(); i < num; ++i)
+        {
+            if (childs[i]->isTag(tag))
+            {
+                return childs[i];
+            }
+        }
+    }
+    return 0;
+}
+
+void CXmlNode::removeChild(const XmlNodeRef& node)
+{
+    if (m_pChilds)
+    {
+        XmlNodes::iterator it = std::find(m_pChilds->begin(), m_pChilds->end(), (IXmlNode*)node);
+        if (it != m_pChilds->end())
+        {
+            ReleaseChild(*it);
+            m_pChilds->erase(it);
+        }
+    }
+}
+
+void CXmlNode::removeAllChilds()
+{
+    removeAllChildsImpl();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlNode::deleteChild(const char* tag)
+{
+    if (m_pChilds)
+    {
+        XmlNodes& childs = *m_pChilds;
+        for (int i = 0, num = childs.size(); i < num; ++i)
+        {
+            if (childs[i]->isTag(tag))
+            {
+                ReleaseChild(childs[i]);
+                childs.erase(childs.begin() + i);
+                return;
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+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)
+{
+    if (!m_pChilds)
+    {
+        m_pChilds = new XmlNodes;
+    }
+
+    assert(node != 0);
+    IXmlNode* pNode = ((IXmlNode*)node);
+    pNode->AddRef();
+    m_pChilds->push_back(pNode);
+    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);
+    addChild(node);
+    return node;
+}
+
+//! Get XML Node child nodes.
+XmlNodeRef CXmlNode::getChild(int i) const
+{
+    assert(m_pChilds);
+    XmlNodes& childs = *m_pChilds;
+    assert(i >= 0 && i < (int)childs.size());
+    return childs[i];
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlNode::copyAttributes(XmlNodeRef fromNode)
+{
+    IXmlNode* inode = fromNode;
+    CXmlNode* n = (CXmlNode*)inode;
+    assert(n);
+    PREFAST_ASSUME(n);
+
+    if (n != this)
+    {
+        if (n->m_pAttributes)
+        {
+            if (!m_pAttributes)
+            {
+                m_pAttributes = new XmlAttributes;
+            }
+
+            if (n->m_pStringPool == m_pStringPool)
+            {
+                *m_pAttributes = *(n->m_pAttributes);
+            }
+            else
+            {
+                XmlAttributes& lhs = *m_pAttributes;
+                const XmlAttributes& rhs = *(n->m_pAttributes);
+                lhs.resize(rhs.size());
+                for (size_t i = 0; i < rhs.size(); ++i)
+                {
+                    lhs[i].key = m_pStringPool->AddString(rhs[i].key);
+                    lhs[i].value = m_pStringPool->AddString(rhs[i].value);
+                }
+            }
+        }
+        else
+        {
+            SAFE_DELETE(m_pAttributes);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttributeByIndex(int index, const char** key, const char** value)
+{
+    if (m_pAttributes)
+    {
+        XmlAttributes::iterator it = m_pAttributes->begin();
+        if (it != m_pAttributes->end())
+        {
+            std::advance(it, index);
+            if (it != m_pAttributes->end())
+            {
+                *key = it->key;
+                *value = it->value;
+                return true;
+            }
+        }
+    }
+    return false;
+}
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::getAttributeByIndex(int index, XmlString& key, XmlString& value)
+{
+    if (m_pAttributes)
+    {
+        XmlAttributes::iterator it = m_pAttributes->begin();
+        if (it != m_pAttributes->end())
+        {
+            std::advance(it, index);
+            if (it != m_pAttributes->end())
+            {
+                key = it->key;
+                value = it->value;
+                return true;
+            }
+        }
+    }
+    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 = childs.size(); i < num; ++i)
+        {
+            node->addChild(childs[i]->clone());
+        }
+    }
+
+    return result;
+}
+
+//////////////////////////////////////////////////////////////////////////
+static void AddTabsToString(XmlString& xml, int level)
+{
+    static const char* tabs[] = {
+        "",
+        " ",
+        "  ",
+        "   ",
+        "    ",
+        "     ",
+        "      ",
+        "       ",
+        "        ",
+        "         ",
+        "          ",
+        "           ",
+    };
+    // Add tabs.
+    if (level < sizeof(tabs) / sizeof(tabs[0]))
+    {
+        xml += tabs[level];
+    }
+    else
+    {
+        for (int i = 0; i < level; i++)
+        {
+            xml += "  ";
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CXmlNode::IsValidXmlString(const char* str) const
+{
+    int len = strlen(str);
+
+    {
+        // Prevents invalid characters not from standard ASCII set to propagate to xml.
+        // A bit of hack for efficiency, fixes input string in place.
+        char* s = const_cast<char*>(str);
+        for (int i = 0; i < len; i++)
+        {
+            if ((unsigned char)s[i] > 0x7F)
+            {
+                s[i] = ' ';
+            }
+        }
+    }
+
+    if (strcspn(str, "\"\'&><") == len)
+    {
+        return true;
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlString CXmlNode::MakeValidXmlString(const XmlString& instr) const
+{
+    XmlString str = instr;
+
+    // check if str contains any invalid characters
+    str.replace("&", "&amp;");
+    str.replace("\"", "&quot;");
+    str.replace("\'", "&apos;");
+    str.replace("<", "&lt;");
+    str.replace(">", "&gt;");
+    str.replace("...", "&gt;");
+    str.replace("\n", "&#10;");
+
+    return str;
+}
+
+void CXmlNode::ReleaseChild(IXmlNode* pChild)
+{
+    if (pChild)
+    {
+        if (pChild->getParent() == this)      // if check to handle shared children which are supported by the CXmlNode impl
+        {
+            pChild->setParent(NULL);
+        }
+        pChild->Release();
+    }
+}
+
+void CXmlNode::removeAllChildsImpl()
+{
+    if (m_pChilds)
+    {
+        for (XmlNodes::iterator iter = m_pChilds->begin(), endIter = m_pChilds->end(); iter != endIter; ++iter)
+        {
+            ReleaseChild(*iter);
+        }
+        SAFE_DELETE(m_pChilds);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CXmlNode::AddToXmlString(XmlString& xml, int level, AZ::IO::HandleType fileHandle, size_t chunkSize) const
+{
+    if (fileHandle != AZ::IO::InvalidHandle && chunkSize > 0)
+    {
+        size_t len = xml.length();
+        if (len >= chunkSize)
+        {
+            gEnv->pCryPak->FWrite(xml.c_str(), len, 1, fileHandle);
+            xml.assign (""); // should not free memory and does not!
+        }
+    }
+
+    AddTabsToString(xml, level);
+
+    const bool bHasChildren = (m_pChilds && !m_pChilds->empty());
+
+    // Begin Tag
+    if (!m_pAttributes || m_pAttributes->empty())
+    {
+        xml += "<";
+        if (m_isProcessingInstruction)
+        {
+            xml += "?";
+        }
+        xml += m_tag;
+        if (*m_content == 0 && !bHasChildren)
+        {
+            if (m_isProcessingInstruction)
+            {
+                xml += "?>\n";
+            }
+            else
+            {
+            // Compact tag form.
+            xml += " />\n";
+            }
+            return;
+        }
+        xml += ">";
+    }
+    else
+    {
+        xml += "<";
+        if (m_isProcessingInstruction)
+        {
+            xml += "?";
+        }
+        xml += m_tag;
+        xml += " ";
+
+        // Put attributes.
+        for (XmlAttributes::const_iterator it = m_pAttributes->begin(); it != m_pAttributes->end(); )
+        {
+            xml += it->key;
+            xml += "=\"";
+            if (IsValidXmlString(it->value))
+            {
+                xml += it->value;
+            }
+            else
+            {
+                xml += MakeValidXmlString(it->value);
+            }
+            ++it;
+            if (it != m_pAttributes->end())
+            {
+                xml += "\" ";
+            }
+            else
+            {
+                xml += "\"";
+            }
+        }
+        if (*m_content == 0 && !bHasChildren)
+        {
+            if (m_isProcessingInstruction)
+            {
+                xml += "?>\n";
+            }
+            else
+            {
+            // Compact tag form.
+            xml += "/>\n";
+            }
+            return;
+        }
+        xml += ">";
+    }
+
+    // Put node content.
+    if (IsValidXmlString(m_content))
+    {
+        xml += m_content;
+    }
+    else
+    {
+        xml += MakeValidXmlString(m_content);
+    }
+
+    if (!bHasChildren)
+    {
+        xml += "</";
+        xml += m_tag;
+        xml += ">\n";
+        return;
+    }
+
+    xml += "\n";
+
+    // Add sub nodes.
+    for (XmlNodes::iterator it = m_pChilds->begin(), itEnd = m_pChilds->end(); it != itEnd; ++it)
+    {
+        IXmlNode* node = *it;
+        ((CXmlNode*)node)->AddToXmlString(xml, level + 1, fileHandle, chunkSize);
+    }
+
+    // Add tabs.
+    AddTabsToString(xml, level);
+    xml += "</";
+    xml += m_tag;
+    xml += ">\n";
+}
+
+#if !defined(APPLE) && !defined(LINUX) && !defined(AZ_LEGACY_CRYSYSTEM_TRAIT_HASSTPCPY)
+ILINE static char* stpcpy(char* dst, const char* src)
+{
+    while (src[0])
+    {
+        dst[0] = src[0];
+        dst++;
+        src++;
+    }
+    return dst;
+}
+#endif
+
+char* CXmlNode::AddToXmlStringUnsafe(char* xml, int level, char* endPtr, AZ::IO::HandleType fileHandle, size_t chunkSize) const
+{
+    const bool bHasChildren = (m_pChilds && !m_pChilds->empty());
+
+    for (int i = 0; i < level; i++)
+    {
+        *(xml++) = ' ';
+        *(xml++) = ' ';
+    }
+
+    // Begin Tag
+    if (!m_pAttributes || m_pAttributes->empty())
+    {
+        *(xml++) = '<';
+        xml = stpcpy(xml, m_tag);
+        if (*m_content == 0 && !bHasChildren)
+        {
+            *(xml++) = '/';
+            *(xml++) = '>';
+            *(xml++) = '\n';
+            return xml;
+        }
+        *(xml++) = '>';
+    }
+    else
+    {
+        *(xml++) = '<';
+        xml = stpcpy(xml, m_tag);
+        *(xml++) = ' ';
+
+        // Put attributes.
+        for (XmlAttributes::const_iterator it = m_pAttributes->begin(); it != m_pAttributes->end(); )
+        {
+            xml = stpcpy(xml, it->key);
+            *(xml++) = '=';
+            *(xml++) = '\"';
+#ifndef _RELEASE
+            if (it->value[strcspn(it->value, "\"\'&><")])
+            {
+                __debugbreak();
+            }
+#endif
+            xml = stpcpy(xml, it->value);
+            ++it;
+            *(xml++) = '\"';
+            if (it != m_pAttributes->end())
+            {
+                *(xml++) = ' ';
+            }
+        }
+        if (*m_content == 0 && !bHasChildren)
+        {
+            // Compact tag form.
+            *(xml++) = '/';
+            *(xml++) = '>';
+            *(xml++) = '\n';
+            return xml;
+        }
+        *(xml++) = '>';
+    }
+
+#ifndef _RELEASE
+    if (m_content[strcspn(m_content, "\"\'&><")])
+    {
+        __debugbreak();
+    }
+#endif
+    xml = stpcpy(xml, m_content);
+
+    if (!bHasChildren)
+    {
+        *(xml++) = '<';
+        *(xml++) = '/';
+        xml = stpcpy(xml, m_tag);
+        *(xml++) = '>';
+        *(xml++) = '\n';
+        return xml;
+    }
+
+    *(xml++) = '\n';
+
+    // Add sub nodes.
+    for (XmlNodes::iterator it = m_pChilds->begin(), itEnd = m_pChilds->end(); it != itEnd; ++it)
+    {
+        IXmlNode* node = *it;
+        xml = ((CXmlNode*)node)->AddToXmlStringUnsafe(xml, level + 1, endPtr, fileHandle, chunkSize);
+    }
+
+    for (int i = 0; i < level; i++)
+    {
+        *(xml++) = ' ';
+        *(xml++) = ' ';
+    }
+    *(xml++) = '<';
+    *(xml++) = '/';
+    xml = stpcpy(xml, m_tag);
+    *(xml++) = '>';
+    *(xml++) = '\n';
+
+    assert(xml < endPtr);
+
+    return xml;
+}
+
+//////////////////////////////////////////////////////////////////////////
+IXmlStringData* CXmlNode::getXMLData(int nReserveMem) const
+{
+    CXmlStringData* pStrData = new CXmlStringData;
+    pStrData->m_string.reserve(nReserveMem);
+    AddToXmlString(pStrData->m_string, 0);
+    return pStrData;
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlString CXmlNode::getXML(int level) const
+{
+    XmlString xml;
+    xml = "";
+    xml.reserve(1024);
+
+    AddToXmlString(xml, level);
+    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)
+{
+    const size_t chunkSizeBytes = (15 * 1024);
+    if (!fileName)
+    {
+        return false;
+    }
+
+    {
+        AZ::IO::HandleType fileHandle = gEnv->pCryPak->FOpen(fileName, "wt");
+        if (fileHandle != AZ::IO::InvalidHandle)
+        {
+#ifdef WIN32
+            XmlString xml = getXML();   // this would not work in consoles because the size limits in strings
+            const char* sxml = (const char*)xml;
+            gEnv->pCryPak->FWrite(sxml, xml.length(), fileHandle);
+            gEnv->pCryPak->FClose(fileHandle);
+            return true;
+#else
+            bool ret = saveToFile(fileName, chunkSizeBytes, fileHandle);
+            gEnv->pCryPak->FClose(fileHandle);
+            return ret;
+#endif
+        }
+        return false;
+    }
+}
+
+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
+
+    if (chunkSize < 256 * 1024)   // make at least 256k
+    {
+        chunkSize = 256 * 1024;
+    }
+
+
+    XmlString xml;
+    xml.assign ("");
+    xml.reserve(chunkSize * 2); // we reserve double memory, as writing in chunks is not really writing in fixed blocks but a bit fuzzy
+    auto pCryPak = gEnv->pCryPak;
+    if (fileHandle == AZ::IO::InvalidHandle)
+    {
+        return false;
+    }
+    AddToXmlString(xml, 0, fileHandle, chunkSize);
+    size_t len = xml.length();
+    if (len > 0)
+    {
+        pCryPak->FWrite(xml.c_str(), len, 1, fileHandle);
+    }
+    xml.clear(); // xml.resize(0) would not reclaim memory
+    return true;
+}
+
+
+/**
+******************************************************************************
+* XmlParserImp class.
+******************************************************************************
+*/
+class XmlParserImp
+    : public IXmlStringPool
+{
+public:
+    explicit XmlParserImp(bool bReuseStrings);
+    ~XmlParserImp();
+
+    void ParseBegin(bool bCleanPools);
+    XmlNodeRef ParseFile(const char* filename, XmlString& errorString, bool bCleanPools);
+    XmlNodeRef ParseBuffer(const char* buffer, size_t bufLen, XmlString& errorString, bool bCleanPools, bool bSuppressWarnings = false);
+    void ParseEnd();
+
+    // Add new string to pool.
+    const char* AddString(const char* str) { return m_stringPool.Append(str, (int)strlen(str)); }
+    //char* AddString( const char *str ) { return (char*)str; }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const
+    {
+        pSizer->AddObject(this, sizeof(*this));
+        pSizer->AddObject(m_stringPool);
+        pSizer->AddObject(m_nodeStack);
+    }
+protected:
+    void    onStartElement(const char* tagName, const char** atts);
+    void    onEndElement(const char* tagName);
+    void    onRawData(const char* data);
+
+    static void startElement(void* userData, const char* name, const char** atts)
+    {
+        ((XmlParserImp*)userData)->onStartElement(name, atts);
+    }
+    static void endElement(void* userData, const char* name)
+    {
+        ((XmlParserImp*)userData)->onEndElement(name);
+    }
+    static void characterData(void* userData, const char* s, int len) PREFAST_SUPPRESS_WARNING(6262)
+    {
+        char str[32700];
+        if (len > sizeof(str) - 1)
+        {
+            assert(0);
+            len = sizeof(str) - 1;
+        }
+        // Note that XML buffer userData has no terminating '\0'.
+        memcpy(str, s, len);
+        str[len] = 0;
+        ((XmlParserImp*)userData)->onRawData(str);
+    }
+
+    void CleanStack();
+
+    struct SStackEntity
+    {
+        XmlNodeRef node;
+        std::vector<IXmlNode*> childs; //TODO: is it worth lazily initializing this, like CXmlNode::m_pChilds?
+
+        void GetMemoryUsage(ICrySizer* pSizer) const
+        {
+            pSizer->AddObject(node);
+            pSizer->AddObject(childs);
+        }
+    };
+
+    // First node will become root node.
+    std::vector<SStackEntity> m_nodeStack;
+    int m_nNodeStackTop;
+
+    XmlNodeRef m_root;
+
+    XML_Parser m_parser;
+    CSimpleStringPool m_stringPool;
+};
+
+//////////////////////////////////////////////////////////////////////////
+void XmlParserImp::CleanStack()
+{
+    m_nNodeStackTop = 0;
+    for (int i = 0, num = m_nodeStack.size(); i < num; i++)
+    {
+        m_nodeStack[i].node = 0;
+        m_nodeStack[i].childs.resize(0);
+    }
+}
+
+/**
+******************************************************************************
+* XmlParserImp
+******************************************************************************
+*/
+void    XmlParserImp::onStartElement(const char* tagName, const char** atts)
+{
+    CXmlNode* pCNode = new CXmlNode;
+    pCNode->m_pStringPool = this;
+    pCNode->m_pStringPool->AddRef();
+    pCNode->m_tag = AddString(tagName);
+
+    XmlNodeRef node = pCNode;
+
+    m_nNodeStackTop++;
+    if (m_nNodeStackTop >= (int)m_nodeStack.size())
+    {
+        m_nodeStack.resize(m_nodeStack.size() * 2);
+    }
+
+    m_nodeStack[m_nNodeStackTop].node = pCNode;
+    m_nodeStack[m_nNodeStackTop - 1].childs.push_back(pCNode);
+
+    if (!m_root)
+    {
+        m_root = node;
+    }
+    else
+    {
+        pCNode->m_parent = (IXmlNode*)m_nodeStack[m_nNodeStackTop - 1].node;
+        node->AddRef(); // Childs need to be add refed.
+    }
+
+    node->setLine(XML_GetCurrentLineNumber((XML_Parser)m_parser));
+
+    // Call start element callback.
+    int i = 0;
+    int numAttrs = 0;
+    while (atts[i] != 0)
+    {
+        numAttrs++;
+        i += 2;
+    }
+    if (numAttrs > 0)
+    {
+        i = 0;
+        if (!pCNode->m_pAttributes)
+        {
+            pCNode->m_pAttributes = new XmlAttributes;
+        }
+
+        XmlAttributes& nodeAtts = *(pCNode->m_pAttributes);
+        nodeAtts.resize(numAttrs);
+        int nAttr = 0;
+        while (atts[i] != 0)
+        {
+            nodeAtts[nAttr].key = AddString(atts[i]);
+            nodeAtts[nAttr].value = AddString(atts[i + 1]);
+            nAttr++;
+            i += 2;
+        }
+        // Sort attributes.
+        //std::sort( pCNode->m_attributes.begin(),pCNode->m_attributes.end() );
+    }
+}
+
+void    XmlParserImp::onEndElement([[maybe_unused]] const char* tagName)
+{
+    assert(m_nNodeStackTop > 0);
+
+    if (m_nNodeStackTop > 0)
+    {
+        // Copy current childs to the parent.
+        SStackEntity& entry = m_nodeStack[m_nNodeStackTop];
+        CXmlNode* currNode = static_cast<CXmlNode*>(static_cast<IXmlNode*>(entry.node));
+        if (!entry.childs.empty())
+        {
+            if (!currNode->m_pChilds)
+            {
+                currNode->m_pChilds = new CXmlNode::XmlNodes;
+            }
+            *currNode->m_pChilds = entry.childs;
+        }
+        entry.childs.resize(0);
+        entry.node = NULL;
+    }
+    m_nNodeStackTop--;
+}
+
+void    XmlParserImp::onRawData(const char* data)
+{
+    assert(m_nNodeStackTop >= 0);
+    if (m_nNodeStackTop >= 0)
+    {
+        size_t len = strlen(data);
+        if (len > 0)
+        {
+            if (strspn(data, "\r\n\t ") != len)
+            {
+                CXmlNode* node = (CXmlNode*)(IXmlNode*)m_nodeStack[m_nNodeStackTop].node;
+                if (*node->m_content != '\0')
+                {
+                    node->m_content = m_stringPool.ReplaceString(node->m_content, data);
+                }
+                else
+                {
+                    node->m_content = AddString(data);
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlParserImp::XmlParserImp(bool bReuseStrings)
+    : m_nNodeStackTop(0)
+    , m_parser(NULL)
+    , m_stringPool(bReuseStrings)
+{
+    m_nodeStack.resize(32);
+    CleanStack();
+}
+
+XmlParserImp::~XmlParserImp()
+{
+    ParseEnd();
+}
+
+namespace
+{
+    void* custom_xml_malloc(size_t nSize)
+    {
+        return CryModuleMalloc(nSize);
+    }
+    void* custom_xml_realloc(void* p, size_t nSize)
+    {
+        return CryModuleRealloc(p, nSize);
+    }
+    void custom_xml_free(void* p)
+    {
+        CryModuleFree(p);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void XmlParserImp::ParseBegin(bool bCleanPools)
+{
+    m_root = 0;
+    CleanStack();
+
+    if (bCleanPools)
+    {
+        m_stringPool.Clear();
+    }
+
+    XML_Memory_Handling_Suite memHandler;
+    memHandler.malloc_fcn = custom_xml_malloc;
+    memHandler.realloc_fcn = custom_xml_realloc;
+    memHandler.free_fcn = custom_xml_free;
+
+    m_parser = XML_ParserCreate_MM(NULL, &memHandler, NULL);
+
+    XML_SetUserData(m_parser, this);
+    XML_SetElementHandler(m_parser, startElement, endElement);
+    XML_SetCharacterDataHandler(m_parser, characterData);
+    XML_SetEncoding(m_parser, "utf-8");
+}
+
+//////////////////////////////////////////////////////////////////////////
+void XmlParserImp::ParseEnd()
+{
+    if (m_parser)
+    {
+        XML_ParserFree(m_parser);
+    }
+    m_parser = 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef XmlParserImp::ParseBuffer(const char* buffer, size_t bufLen, XmlString& errorString, bool bCleanPools, bool bSuppressWarnings)
+{
+    static const char* const errorPrefix = "XML parser: ";
+
+    XmlNodeRef root = 0;
+
+    // Let's try to parse the buffer as binary XML
+    {
+        XMLBinary::XMLBinaryReader reader;
+        XMLBinary::XMLBinaryReader::EResult result;
+        root = reader.LoadFromBuffer(XMLBinary::XMLBinaryReader::eBufferMemoryHandling_MakeCopy, buffer, bufLen, result);
+        if (root)
+        {
+            return root;
+        }
+        if (result != XMLBinary::XMLBinaryReader::eResult_NotBinXml)
+        {
+            const char* const str = reader.GetErrorDescription();
+            errorString = str;
+            if (!bSuppressWarnings)
+            {
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s%s (data size: %u)", errorPrefix, str, static_cast<unsigned>(bufLen));
+            }
+            return 0;
+        }
+    }
+
+    // This is not binary XML, so let's use text XML parser.
+    {
+        ParseBegin(bCleanPools);
+        m_stringPool.SetBlockSize(static_cast<unsigned>(bufLen) / 16);
+
+        if (XML_Parse(m_parser, buffer, static_cast<int>(bufLen), 1))
+        {
+            root = m_root;
+        }
+        else
+        {
+            char str[1024];
+            sprintf_s(str, "%s%s at line %d", errorPrefix, XML_ErrorString(XML_GetErrorCode(m_parser)), (int)XML_GetCurrentLineNumber(m_parser));
+            errorString = str;
+            if (!bSuppressWarnings)
+            {
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
+            }
+        }
+
+        m_root = 0;
+        ParseEnd();
+    }
+
+    return root;
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef XmlParserImp::ParseFile(const char* filename, XmlString& errorString, bool bCleanPools)
+{
+    LOADING_TIME_PROFILE_SECTION(GetISystem());
+
+    if (!filename)
+    {
+        return 0;
+    }
+
+    static const char* const errorPrefix = "XML reader: ";
+
+    XmlNodeRef root = 0;
+
+    char* pFileContents = 0;
+    size_t fileSize = 0;
+
+    char str[1024];
+
+    CryStackStringT<char, 256> adjustedFilename;
+    CryStackStringT<char, 256> pakPath;
+    if (fileSize <= 0)
+    {
+        CCryFile xmlFile;
+
+        if (!xmlFile.Open(filename, "rb"))
+        {
+            sprintf_s(str, "%sCan't open file (%s)", errorPrefix, filename);
+            errorString = str;
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
+            return 0;
+        }
+
+        fileSize = xmlFile.GetLength();
+        if (fileSize <= 0)
+        {
+            sprintf_s(str, "%sFile is empty (%s)", errorPrefix, filename);
+            errorString = str;
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
+            return 0;
+        }
+
+        pFileContents = new char[fileSize];
+        if (!pFileContents)
+        {
+            sprintf_s(str, "%sCan't allocate %u bytes of memory (%s)", errorPrefix, static_cast<unsigned>(fileSize), filename);
+            errorString = str;
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
+            return 0;
+        }
+
+        if (xmlFile.ReadRaw(pFileContents, fileSize) != fileSize)
+        {
+            delete [] pFileContents;
+            sprintf_s(str, "%sCan't read file (%s)", errorPrefix, filename);
+            errorString = str;
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
+            return 0;
+        }
+        adjustedFilename = xmlFile.GetAdjustedFilename();
+        adjustedFilename.replace('\\', '/');
+        pakPath = xmlFile.GetPakPath();
+        pakPath.replace('\\', '/');
+    }
+
+    if (g_bEnableBinaryXmlLoading)
+    {
+        LOADING_TIME_PROFILE_SECTION_NAMED("XMLBinaryReader::Parse");
+
+        XMLBinary::XMLBinaryReader reader;
+        XMLBinary::XMLBinaryReader::EResult result;
+        root = reader.LoadFromBuffer(XMLBinary::XMLBinaryReader::eBufferMemoryHandling_TakeOwnership, pFileContents, fileSize, result);
+        if (root)
+        {
+            return root;
+        }
+        if (result != XMLBinary::XMLBinaryReader::eResult_NotBinXml)
+        {
+            delete [] pFileContents;
+            sprintf_s(str, "%s%s (%s)", errorPrefix, reader.GetErrorDescription(), filename);
+            errorString = str;
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
+            return 0;
+        }
+        else
+        {
+            // not binary XML - refuse to load if in scripts dir and not in bin xml to help reduce hacking
+            // wish we could compile the text xml parser out, but too much work to get everything moved over
+            static const char SCRIPTS_DIR[] = "Scripts/";
+            CryFixedStringT<32> strScripts("S");
+            strScripts += "c";
+            strScripts += "r";
+            strScripts += "i";
+            strScripts += "p";
+            strScripts += "t";
+            strScripts += "s";
+            strScripts += "/";
+            // exclude files and PAKs from Mods folder
+            CryFixedStringT<8> modsStr("M");
+            modsStr += "o";
+            modsStr += "d";
+            modsStr += "s";
+            modsStr += "/";
+            if (_strnicmp(filename, strScripts.c_str(), strScripts.length()) == 0 &&
+                _strnicmp(adjustedFilename.c_str(), modsStr.c_str(), modsStr.length()) != 0 &&
+                _strnicmp(pakPath.c_str(), modsStr.c_str(), modsStr.length()) != 0)
+            {
+#ifdef _RELEASE
+                CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Non binary XML found in scripts dir (%s)", filename);
+#endif
+            }
+        }
+    }
+
+    {
+        ParseBegin(bCleanPools);
+        m_stringPool.SetBlockSize(static_cast<unsigned>(fileSize / 16));
+
+        if (XML_Parse(m_parser, pFileContents, static_cast<int>(fileSize), 1))
+        {
+            root = m_root;
+        }
+        else
+        {
+            sprintf_s(str, "%s%s at line %d (%s)", errorPrefix, XML_ErrorString(XML_GetErrorCode(m_parser)), (int)XML_GetCurrentLineNumber(m_parser), filename);
+            errorString = str;
+            CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "%s", str);
+        }
+
+        m_root = 0;
+        ParseEnd();
+    }
+
+    delete [] pFileContents;
+
+    return root;
+}
+
+XmlParser::XmlParser(bool bReuseStrings)
+{
+    m_nRefCount = 0;
+    m_pImpl = new XmlParserImp(bReuseStrings);
+    m_pImpl->AddRef();
+}
+
+XmlParser::~XmlParser()
+{
+    m_pImpl->Release();
+}
+
+void XmlParser::GetMemoryUsage(ICrySizer* pSizer) const
+{
+    pSizer->AddObject(this, sizeof(*this));
+    pSizer->AddObject(m_pImpl);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef XmlParser::ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings)
+{
+    m_errorString = "";
+    return m_pImpl->ParseBuffer(buffer, nBufLen, m_errorString, bCleanPools, bSuppressWarnings);
+}
+
+//////////////////////////////////////////////////////////////////////////
+XmlNodeRef XmlParser::ParseFile(const char* filename, bool bCleanPools)
+{
+    m_errorString = "";
+    return m_pImpl->ParseFile(filename, m_errorString, bCleanPools);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Implements special reusable XmlNode for XmlNode pool
+//
+//////////////////////////////////////////////////////////////////////////
+CXmlNodeReuse::CXmlNodeReuse(const char* tag, CXmlNodePool* pPool)
+    : m_pPool(pPool)
+{
+    SAFE_RELEASE(m_pStringPool);
+    m_pStringPool = m_pPool->GetStringPool();
+    m_pStringPool->AddRef();
+    m_tag = m_pStringPool->AddString(tag);
+}
+
+void CXmlNodeReuse::Release()
+{
+    m_pPool->OnRelease(m_nRefCount, this);
+    CXmlNode::Release();
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Pool of reusable XML nodes with shared string pool
+//
+//////////////////////////////////////////////////////////////////////////
+CXmlNodePool::CXmlNodePool(unsigned int nBlockSize, bool bReuseStrings)
+{
+    m_pStringPool = new CXmlStringPool(bReuseStrings);
+    assert(m_pStringPool != 0);
+
+    // in order to avoid memory fragmentation
+    // allocates 1Mb buffer for shared string pool
+    static_cast<CXmlStringPool*>(m_pStringPool)->SetBlockSize(nBlockSize);
+    m_pStringPool->AddRef();
+    m_nAllocated = 0;
+}
+
+CXmlNodePool::~CXmlNodePool()
+{
+    while (!m_pNodePool.empty())
+    {
+        CXmlNodeReuse* pNode = m_pNodePool.top();
+        m_pNodePool.pop();
+        pNode->Release();
+    }
+    m_pStringPool->Release();
+}
+
+XmlNodeRef CXmlNodePool::GetXmlNode(const char* sNodeName)
+{
+    CXmlNodeReuse* pNode = 0;
+
+    // NOTE: at the moment xml node pool is dedicated for statistics nodes only
+
+    // first at all check if we have already free node
+    if (!m_pNodePool.empty())
+    {
+        pNode = m_pNodePool.top();
+        m_pNodePool.pop();
+
+        // init it to new node name
+        pNode->setTag(sNodeName);
+
+        m_nAllocated++;
+        //if (0 == m_nAllocated % 1000)
+        //CryLog("[CXmlNodePool]: already reused nodes [%d]", m_nAllocated);
+    }
+    else
+    {
+        // there is no free nodes so create new one
+        // later it will be reused as soon as no external references left
+        pNode = new CXmlNodeReuse(sNodeName, this);
+        assert(pNode != 0);
+
+        // increase ref counter for reusing node later
+        pNode->AddRef();
+
+        m_nAllocated++;
+        //if (0 == m_nAllocated % 1000)
+        //CryLog("[CXmlNodePool]: already allocated nodes [%d]", m_nAllocated);
+    }
+    return pNode;
+}
+
+void CXmlNodePool::OnRelease(int iRefCount, void* pThis)
+{
+    // each reusable node call OnRelease before parent release
+    // since we keep reference on xml node so when ref count equals
+    // to 2 means that it is last external object releases reference
+    // to reusable node and it can be save for reuse later
+    if (2 == iRefCount)
+    {
+        CXmlNodeReuse* pNode = static_cast<CXmlNodeReuse*>(pThis);
+
+        pNode->removeAllChilds();
+        pNode->removeAllAttributes();
+
+        m_pNodePool.push(pNode);
+
+        // decrease totally allocated by xml node pool counter
+        // when counter equals to zero it means that all external
+        // objects do not have references to allocated reusable node
+        // at that point it is safe to clear shared string pool
+        m_nAllocated--;
+
+        if (0 == m_nAllocated)
+        {
+            //CryLog("[CXmlNodePool]: clear shared string pool");
+            static_cast<CXmlStringPool*>(m_pStringPool)->Clear();
+        }
+    }
+}
+
+#undef SCOPED_LOCALE_RESETTER
+
+
diff --git a/Code/Legacy/CrySystem/XML/xml.h b/Code/Legacy/CrySystem/XML/xml.h
new file mode 100644
index 0000000000..5253095c0b
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/xml.h
@@ -0,0 +1,438 @@
+/*
+ * 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_XML_XML_H
+#define CRYINCLUDE_CRYSYSTEM_XML_XML_H
+#pragma once
+
+
+#include <algorithm>
+#include <PoolAllocator.h>
+#include <stack>
+
+#include "IXml.h"
+
+// track some XML stats. only to find persistent XML nodes in the system
+// slow, so disable by default
+//#define CRY_COLLECT_XML_NODE_STATS
+//#undef CRY_COLLECT_XML_NODE_STATS
+
+
+struct IXmlStringPool
+{
+public:
+    IXmlStringPool() { m_refCount = 0; }
+    virtual ~IXmlStringPool() {};
+    void AddRef() { m_refCount++; };
+    void Release()
+    {
+        if (--m_refCount <= 0)
+        {
+            delete this;
+        }
+    };
+    virtual const char* AddString(const char* str) = 0;
+    virtual void GetMemoryUsage(ICrySizer* pSizer) const = 0;
+private:
+    int m_refCount;
+};
+
+/************************************************************************/
+/* XmlParser class, Parse xml and return root xml node if success.      */
+/************************************************************************/
+class XmlParser
+    : public IXmlParser
+{
+public:
+    explicit XmlParser(bool bReuseStrings);
+    ~XmlParser();
+
+    void AddRef()
+    {
+        ++m_nRefCount;
+    }
+
+    void Release()
+    {
+        if (--m_nRefCount <= 0)
+        {
+            delete this;
+        }
+    }
+
+    virtual XmlNodeRef ParseFile(const char* filename, bool bCleanPools);
+
+    virtual XmlNodeRef ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings = false);
+
+    const char* getErrorString() const { return m_errorString; }
+
+    void GetMemoryUsage(ICrySizer* pSizer) const;
+
+private:
+    int m_nRefCount;
+    XmlString m_errorString;
+    class XmlParserImp* m_pImpl;
+};
+
+// Compare function for string comparasion, can be strcmp or _stricmp
+typedef int (__cdecl * XmlStrCmpFunc)(const char* str1, const char* str2);
+extern XmlStrCmpFunc g_pXmlStrCmp;
+
+//////////////////////////////////////////////////////////////////////////
+// XmlAttribute class
+//////////////////////////////////////////////////////////////////////////
+struct XmlAttribute
+{
+    const char* key;
+    const char* value;
+
+    void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const{}
+
+    bool operator<(const XmlAttribute& attr) const { return g_pXmlStrCmp(key, attr.key) < 0; }
+    bool operator>(const XmlAttribute& attr) const { return g_pXmlStrCmp(key, attr.key) > 0; }
+    bool operator==(const XmlAttribute& attr) const { return g_pXmlStrCmp(key, attr.key) == 0; }
+    bool operator!=(const XmlAttribute& attr) const { return g_pXmlStrCmp(key, attr.key) != 0; }
+};
+
+//! Xml node attributes class.
+
+typedef std::vector<XmlAttribute>   XmlAttributes;
+typedef XmlAttributes::iterator XmlAttrIter;
+typedef XmlAttributes::const_iterator XmlAttrConstIter;
+
+/**
+******************************************************************************
+* CXmlNode class
+* Never use CXmlNode directly instead use reference counted XmlNodeRef.
+******************************************************************************
+*/
+
+class CXmlNode
+    : public IXmlNode
+{
+public:
+    //! Constructor.
+    CXmlNode();
+    CXmlNode(const char* tag, bool bReuseStrings, bool bIsProcessingInstruction = false);
+    //! Destructor.
+    ~CXmlNode();
+
+    // collect allocated memory  informations
+    void GetMemoryUsage(ICrySizer* pSizer) const;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Custom new/delete with pool allocator.
+    //////////////////////////////////////////////////////////////////////////
+    //void* operator new( size_t nSize );
+    //void operator delete( void *ptr );
+
+    virtual void DeleteThis();
+
+    //! Create new XML node.
+    XmlNodeRef createNode(const char* tag);
+
+    //! Get XML node tag.
+    const char* getTag() const { return m_tag; };
+    void    setTag(const char* tag);
+
+    //! Return true if given tag equal to node tag.
+    bool isTag(const char* tag) const;
+
+    //! Get XML Node attributes.
+    virtual int getNumAttributes() const { 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);
+
+    //! 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);
+
+    //! Get XML Node attribute for specified key.
+    const char* getAttr(const char* key) const;
+
+    //! Get XML Node attribute for specified key.
+    // Returns true if the attribute existes, alse otherwise.
+    bool                getAttr(const char* key, const char** value) const;
+
+    //! Check if attributes with specified key exist.
+    bool haveAttr(const char* key) const;
+
+    //! Creates new xml node and add it to childs list.
+    XmlNodeRef newChild(const char* tagName);
+
+    //! Adds new child node.
+    void addChild(const XmlNodeRef& node);
+    //! Remove child node.
+    void removeChild(const XmlNodeRef& node);
+
+    void insertChild(int nIndex, const XmlNodeRef& node);
+    void replaceChild(int nIndex, const XmlNodeRef& node);
+
+    //! Remove all child nodes.
+    void removeAllChilds();
+
+    //! Get number of child XML nodes.
+    int getChildCount() const { return m_pChilds ? (int)m_pChilds->size() : 0; };
+
+    //! Get XML Node child nodes.
+    XmlNodeRef getChild(int i) const;
+
+    //! Find node with specified tag.
+    XmlNodeRef findChild(const char* tag) const;
+    void deleteChild(const char* tag);
+    void deleteChildAt(int nIndex);
+
+    //! Get parent XML node.
+    XmlNodeRef  getParent() const { return m_parent; }
+    void                setParent(const XmlNodeRef& inRef);
+
+
+    //! Returns content of this node.
+    const char* getContent() const { return m_content; };
+    void setContent(const char* str);
+
+    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; };
+
+    //! 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
+
+    //! Set new XML Node attribute (or override attribute with same key).
+    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 Vec2d& 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 Vec3d& value);
+    void setAttr(const char* key, const Quat& value);
+
+    //! Delete attrbute.
+    void delAttr(const char* key);
+    //! Remove all node attributes.
+    void removeAllAttributes();
+
+    //! 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, XmlString& value) const  {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, Vec2d& 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, Vec3d& value) const;
+    bool getAttr(const char* key, Quat& value) const;
+    bool getAttr(const char* key, ColorB& value) const;
+
+protected:
+
+private:
+    CXmlNode(const CXmlNode&);
+    CXmlNode& operator = (const CXmlNode&);
+
+private:
+    void ReleaseChild(IXmlNode* pChild);
+    void removeAllChildsImpl();
+
+    void AddToXmlString(XmlString& xml, int level, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle, size_t chunkSizeBytes = 0) const;
+    char* AddToXmlStringUnsafe(char* xml, int level, char* endPtr, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle, size_t chunkSizeBytes = 0) const;
+    XmlString MakeValidXmlString(const XmlString& xml) const;
+    bool IsValidXmlString(const char* str) const;
+    XmlAttrConstIter GetAttrConstIterator(const char* key) const
+    {
+        assert(m_pAttributes);
+
+        XmlAttribute tempAttr;
+        tempAttr.key = key;
+
+        XmlAttributes::const_iterator it = std::find(m_pAttributes->begin(), m_pAttributes->end(), tempAttr);
+        return it;
+
+        /*
+        XmlAttributes::const_iterator it = std::lower_bound( m_attributes.begin(),m_attributes.end(),tempAttr );
+        if (it != m_attributes.end() && _stricmp(it->key,key) == 0)
+        return it;
+        return m_attributes.end();
+        */
+    }
+    XmlAttrIter GetAttrIterator(const char* key)
+    {
+        assert(m_pAttributes);
+
+        XmlAttribute tempAttr;
+        tempAttr.key = key;
+
+        XmlAttributes::iterator it = std::find(m_pAttributes->begin(), m_pAttributes->end(), tempAttr);
+        return it;
+
+        //      XmlAttributes::iterator it = std::lower_bound( m_attributes.begin(),m_attributes.end(),tempAttr );
+        //if (it != m_attributes.end() && _stricmp(it->key,key) == 0)
+        //return it;
+        //return m_attributes.end();
+    }
+    const char* GetValue(const char* key) const
+    {
+        if (m_pAttributes)
+        {
+            XmlAttrConstIter it = GetAttrConstIterator(key);
+            if (it != m_pAttributes->end())
+            {
+                return it->value;
+            }
+        }
+        return 0;
+    }
+
+protected:
+    // String pool used by this node.
+    IXmlStringPool* m_pStringPool;
+
+    //! Tag of XML node.
+    const char* m_tag;
+
+private:
+
+    //! Content of XML node.
+    const char* m_content;
+    //! Parent XML node.
+    IXmlNode* m_parent;
+
+    //typedef DynArray<CXmlNode*,XmlDynArrayAlloc>  XmlNodes;
+    typedef std::vector<IXmlNode*>  XmlNodes;
+    //XmlNodes m_childs;
+    XmlNodes* m_pChilds;
+
+    //! Xml node attributes.
+    //XmlAttributes m_attributes;
+    XmlAttributes* m_pAttributes;
+
+    //! Line in XML file where this node firstly appeared (useful for debugging).
+    int m_line;
+
+    bool m_isProcessingInstruction;
+    friend class XmlParserImp;
+};
+
+typedef stl::PoolAllocatorNoMT<sizeof(CXmlNode)> CXmlNode_PoolAlloc;
+extern CXmlNode_PoolAlloc* g_pCXmlNode_PoolAlloc;
+
+#ifdef CRY_COLLECT_XML_NODE_STATS
+typedef std::set<CXmlNode*> TXmlNodeSet; // yes, slow, but really only for one-shot debugging
+struct SXmlNodeStats
+{
+    SXmlNodeStats()
+        : nAllocs(0)
+        , nFrees(0) {}
+    TXmlNodeSet nodeSet;
+    uint32 nAllocs;
+    uint32 nFrees;
+};
+extern SXmlNodeStats* g_pCXmlNode_Stats;
+#endif
+
+/*
+//////////////////////////////////////////////////////////////////////////
+inline void* CXmlNode::operator new( size_t nSize )
+{
+    void *ptr = g_pCXmlNode_PoolAlloc->Allocate();
+    if (ptr)
+    {
+        memset( ptr,0,nSize ); // Clear objects memory.
+#ifdef CRY_COLLECT_XML_NODE_STATS
+        g_pCXmlNode_Stats->nodeSet.insert(reinterpret_cast<CXmlNode*> (ptr));
+        ++g_pCXmlNode_Stats->nAllocs;
+#endif
+    }
+    return ptr;
+}
+
+//////////////////////////////////////////////////////////////////////////
+inline void CXmlNode::operator delete( void *ptr )
+{
+    if (ptr)
+    {
+        g_pCXmlNode_PoolAlloc->Deallocate(ptr);
+#ifdef CRY_COLLECT_XML_NODE_STATS
+        g_pCXmlNode_Stats->nodeSet.erase(reinterpret_cast<CXmlNode*> (ptr));
+        ++g_pCXmlNode_Stats->nFrees;
+#endif
+    }
+}
+*/
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Reusable XmlNode for XmlNode pool with shared xml string pool
+//
+//////////////////////////////////////////////////////////////////////////
+class CXmlNodePool;
+
+class CXmlNodeReuse
+    : public CXmlNode
+{
+public:
+    CXmlNodeReuse(const char* tag, CXmlNodePool* pPool);
+    virtual void Release();
+
+protected:
+    CXmlNodePool* m_pPool;
+};
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Pool of reusable XML nodes with shared string pool
+//
+//////////////////////////////////////////////////////////////////////////
+class CXmlNodePool
+{
+public:
+    CXmlNodePool(unsigned int nBlockSize, bool bReuseStrings);
+    virtual ~CXmlNodePool();
+
+    XmlNodeRef GetXmlNode(const char* sNodeName);
+    bool empty() const { return (m_nAllocated == 0); }
+
+protected:
+    virtual void OnRelease(int iRefCount, void* pThis);
+    IXmlStringPool* GetStringPool() { return m_pStringPool; }
+
+private:
+    friend class CXmlNodeReuse;
+
+    IXmlStringPool* m_pStringPool;
+    unsigned int m_nAllocated;
+    std::stack<CXmlNodeReuse*> m_pNodePool;
+};
+
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_XML_H
diff --git a/Code/Legacy/CrySystem/XML/xml_string.h b/Code/Legacy/CrySystem/XML/xml_string.h
new file mode 100644
index 0000000000..463314bb5e
--- /dev/null
+++ b/Code/Legacy/CrySystem/XML/xml_string.h
@@ -0,0 +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
+ *
+ */
+
+
+#ifndef CRYINCLUDE_CRYSYSTEM_XML_XML_STRING_H
+#define CRYINCLUDE_CRYSYSTEM_XML_XML_STRING_H
+#pragma once
+
+
+typedef string xml_string;
+
+#endif // CRYINCLUDE_CRYSYSTEM_XML_XML_STRING_H
diff --git a/Code/Legacy/CrySystem/crysystem_files.cmake b/Code/Legacy/CrySystem/crysystem_files.cmake
new file mode 100644
index 0000000000..91a8f9fab8
--- /dev/null
+++ b/Code/Legacy/CrySystem/crysystem_files.cmake
@@ -0,0 +1,75 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    AZCrySystemInitLogSink.cpp
+    CmdLine.cpp
+    CmdLineArg.cpp
+    ConsoleBatchFile.cpp
+    ConsoleHelpGen.cpp
+    DebugCallStack.cpp
+    IDebugCallStack.cpp
+    Log.cpp
+    System.cpp
+    SystemCFG.cpp
+    SystemEventDispatcher.cpp
+    SystemInit.cpp
+    SystemWin32.cpp
+    Timer.cpp
+    XConsole.cpp
+    XConsoleVariable.cpp
+    XML/ReadWriteXMLSink.h
+    AZCrySystemInitLogSink.h
+    AZCoreLogSink.h
+    CmdLine.h
+    CmdLineArg.h
+    ConsoleBatchFile.h
+    ConsoleHelpGen.h
+    DebugCallStack.h
+    IDebugCallStack.h
+    Log.h
+    SimpleStringPool.h
+    CrySystem_precompiled.h
+    System.h
+    SystemCFG.h
+    SystemEventDispatcher.h
+    Timer.h
+    XConsole.h
+    XConsoleVariable.h
+    XML/SerializeXMLReader.cpp
+    XML/SerializeXMLWriter.cpp
+    XML/xml.cpp
+    XML/XMLPatcher.cpp
+    XML/XmlUtils.cpp
+    XML/SerializeXMLReader.h
+    XML/SerializeXMLWriter.h
+    XML/xml.h
+    XML/XMLPatcher.h
+    XML/xml_string.h
+    XML/XmlUtils.h
+    XML/ReadXMLSink.cpp
+    XML/WriteXMLSource.cpp
+    LocalizedStringManager.cpp
+    LocalizedStringManager.h
+    Huffman.cpp
+    Huffman.h
+    RemoteConsole/RemoteConsole.cpp
+    RemoteConsole/RemoteConsole.h
+    RemoteConsole/RemoteConsole_impl.inl
+    RemoteConsole/RemoteConsole_none.inl
+    LevelSystem/LevelSystem.cpp
+    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/Legacy/CrySystem/crysystem_shared_files.cmake b/Code/Legacy/CrySystem/crysystem_shared_files.cmake
new file mode 100644
index 0000000000..2bb8abacff
--- /dev/null
+++ b/Code/Legacy/CrySystem/crysystem_shared_files.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
+#
+#
+
+set(FILES
+    DllMain.cpp
+)
diff --git a/Code/Sandbox/CMakeLists.txt b/Code/Sandbox/CMakeLists.txt
deleted file mode 100644
index 5b420c10fe..0000000000
--- a/Code/Sandbox/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-# Plugins should be processed before because we are going to generate the list of plugins 
-# that the editor should load
-add_subdirectory(Plugins)
-add_subdirectory(Editor)
diff --git a/Code/Sandbox/Editor/2DViewport.cpp b/Code/Sandbox/Editor/2DViewport.cpp
deleted file mode 100644
index 999baddf95..0000000000
--- a/Code/Sandbox/Editor/2DViewport.cpp
+++ /dev/null
@@ -1,1185 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// Qt
-#include <QTimer>
-
-// Editor
-#include "2DViewport.h"
-#include "CryEditDoc.h"
-#include "DisplaySettings.h"
-#include "GameEngine.h"
-#include "Settings.h"
-#include "ViewManager.h"
-#include "Include/IObjectManager.h"
-#include "Include/HitContext.h"
-#include "Objects/SelectionGroup.h"
-
-
-#define MARKER_SIZE 6.0f
-#define MARKER_DIR_SIZE 10.0f
-#define SELECTION_RADIUS 30.0f
-
-#define GL_RGBA 0x1908
-#define GL_BGRA 0x80E1
-
-#define BACKGROUND_COLOR Vec3(1.0f, 1.0f, 1.0f)
-#define SELECTION_RECT_COLOR Vec3(0.8f, 0.8f, 0.8f)
-#define MINOR_GRID_COLOR    Vec3(0.55f, 0.55f, 0.55f)
-#define MAJOR_GRID_COLOR    Vec3(0.6f, 0.6f, 0.6f)
-#define AXIS_GRID_COLOR     Vec3(0, 0, 0)
-#define GRID_TEXT_COLOR     Vec3(0, 0, 1.0f)
-
-#define MAX_WORLD_SIZE 10000
-
-enum Viewport2dTitleMenuCommands
-{
-    ID_SHOW_LABELS,
-    ID_SHOW_GRID
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-static void OnMenuLabels()
-{
-    GetIEditor()->GetDisplaySettings()->DisplayLabels(!GetIEditor()->GetDisplaySettings()->IsDisplayLabels());
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void OnMenuGrid()
-{
-    CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
-    if (pViewport)
-    {
-        if (Q2DViewport* p2DViewport = viewport_cast<Q2DViewport*>(pViewport))
-        {
-            p2DViewport->SetShowGrid(!p2DViewport->GetShowGrid());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline Vec3 SnapToSize(Vec3 v, double size)
-{
-    Vec3 snapped;
-    snapped.x = floor((v.x / size) + 0.5) * size;
-    snapped.y = floor((v.y / size) + 0.5) * size;
-    snapped.z = floor((v.z / size) + 0.5) * size;
-    return snapped;
-}
-
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-Q2DViewport::Q2DViewport(QWidget* parent)
-    : QtViewport(parent)
-{
-    // Scroll offset equals origin
-    m_rcSelect.setRect(0, 0, 0, 0);
-
-    m_viewType = ET_ViewportXY;
-    m_axis = VPA_XY;
-
-    m_bShowTerrain = true;
-    m_bShowGrid = true;
-    m_bShowObjectsInfo = true;
-    m_bShowMinorGridLines = true;
-    m_bShowMajorGridLines = true;
-    m_bShowNumbers = true;
-    m_bAutoAdjustGrids = true;
-    m_gridAlpha = 1;
-
-    m_origin2D.Set(0, 0, 0);
-
-    m_colorGridText = QColor(220, 220, 220);
-    m_colorAxisText = QColor(220, 220, 220);
-    m_colorBackground = QColor(128, 128, 128);
-
-    m_screenTM.SetIdentity();
-    m_screenTM_Inverted.SetIdentity();
-
-    m_fZoomFactor = 1;
-    m_bContentValid = false;
-
-    m_bShowViewMarker = true;
-
-    m_displayContext.pIconManager = GetIEditor()->GetIconManager();
-
-    /*
-       In MFC OnCreate was delayed behind the scenes, being called at some time
-       after the constructor but just before the window is shown for the first
-       time. Using QTimer is simple way to accomplish the same thing. 
-       
-       QTimer relies on the event loop, so by calling QTimer::singleShot with 0
-       timeout, the constructor will finish immediately, followed by a call to
-       OnCreate shortly after, once Qt's event loop is up and running. 
-    */
-    QTimer::singleShot(0, [&]() { OnCreate(); });
-}
-
-//////////////////////////////////////////////////////////////////////////
-Q2DViewport::~Q2DViewport()
-{
-    OnDestroy();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::SetType(EViewportType type)
-{
-    m_viewType = type;
-
-    switch (m_viewType)
-    {
-    case ET_ViewportXY:
-        m_axis = VPA_XY;
-        break;
-    case ET_ViewportXZ:
-        m_axis = VPA_XZ;
-        break;
-    case ET_ViewportYZ:
-        m_axis = VPA_YZ;
-        break;
-    }
-    ;
-
-    SetAxis(m_axis);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::SetAxis(EViewportAxis axis)
-{
-    m_axis = axis;
-    switch (m_axis)
-    {
-    case VPA_XY:
-        m_cullAxis = 2;
-        break;
-    case VPA_YX:
-        m_cullAxis = 2;
-        break;
-    case VPA_XZ:
-        m_cullAxis = 1;
-        break;
-    case VPA_YZ:
-        m_cullAxis = 0;
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::CalculateViewTM()
-{
-    Matrix34 viewTM;
-    Matrix34 tm;
-    tm.SetIdentity();
-    viewTM.SetIdentity();
-    float fScale = GetZoomFactor();
-    Vec3 origin = GetOrigin2D();
-
-    float height = m_rcClient.height() / fScale;
-
-    Vec3 v1;
-    switch (m_axis)
-    {
-    case VPA_XY:
-        tm = Matrix33::CreateScale(Vec3(fScale, -fScale, fScale)) * tm; // No fScale for Z
-        tm.SetTranslation(Vec3(-origin.x, height + origin.y, 0) * fScale);
-        break;
-    case VPA_YX:
-        tm.SetFromVectors(Vec3(0, 1, 0) * fScale, Vec3(1, 0, 0) * fScale, Vec3(0, 0, 1) * fScale, Vec3(0, 0, 0));
-        tm.SetTranslation(Vec3(-origin.x, height + origin.y, 0) * fScale);
-        break;
-    case VPA_XZ:
-        viewTM.SetFromVectors(Vec3(1, 0, 0), Vec3(0, 0, 1), Vec3(0, 1, 0), Vec3(0, 0, 0));
-        tm.SetFromVectors(Vec3(1, 0, 0) * fScale, Vec3(0, 0, 1) * fScale, Vec3(0, -1, 0) * fScale, Vec3(0, 0, 0));
-        tm.SetTranslation(Vec3(-origin.x, height + origin.z, 0) * fScale);
-        break;
-
-    case VPA_YZ:
-        viewTM.SetFromVectors(Vec3(0, 1, 0), Vec3(0, 0, 1), Vec3(1, 0, 0), Vec3(0, 0, 0));
-        tm.SetFromVectors(Vec3(0, 0, 1) * fScale, Vec3(1, 0, 0) * fScale, Vec3(0, -1, 0) * fScale, Vec3(0, 0, 0)); // No fScale for Z
-        tm.SetTranslation(Vec3(-origin.y, height + origin.z, 0) * fScale);
-        break;
-    }
-    SetViewTM(viewTM);
-    m_screenTM = tm;
-    m_screenTM_Inverted = m_screenTM.GetInverted();
-
-    SetConstructionMatrix(COORDS_VIEW, GetViewTM());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::ResetContent()
-{
-    QtViewport::ResetContent();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::UpdateContent(int flags)
-{
-    QtViewport::UpdateContent(flags);
-    if (flags & eUpdateObjects)
-    {
-        m_bContentValid = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    if (GetIEditor()->IsInGameMode())
-    {
-        return;
-    }
-
-    if (!hasFocus())
-    {
-        setFocus();
-    }
-
-    // Check Edit Tool.
-    MouseCallback(eMouseRDown, point, modifiers);
-
-    SetCurrentCursor(STD_CURSOR_MOVE, QString());
-
-    // Save the mouse down position
-    m_RMouseDownPos = point;
-
-    m_prevZoomFactor = GetZoomFactor();
-    //m_prevScrollOffset = m_cScrollOffset;
-
-    CaptureMouse();
-    SetViewMode(ScrollZoomMode);
-
-    m_bContentValid = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnRButtonUp([[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
-{
-    ReleaseMouse();
-    SetViewMode(NothingMode);
-
-    GetViewManager()->UpdateViews(eUpdateObjects);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnMButtonDown(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;
-
-    SetCurrentCursor(STD_CURSOR_MOVE, QString());
-
-    // Save the mouse down position
-    m_RMouseDownPos = point;
-
-    m_prevZoomFactor = GetZoomFactor();
-
-    SetViewMode(ScrollZoomMode);
-
-    m_bContentValid = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    // Check Edit Tool.
-    if (MouseCallback(eMouseMUp, point, modifiers))
-    {
-        return;
-    }
-
-    SetViewMode(NothingMode);
-
-    ReleaseMouse();
-    m_bContentValid = false;
-    GetViewManager()->UpdateViews(eUpdateObjects);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    ////////////////////////////////////////////////////////////////////////
-    // User pressed the left mouse button
-    ////////////////////////////////////////////////////////////////////////
-    if (GetViewMode() != NothingMode)
-    {
-        return;
-    }
-
-    m_cMouseDownPos = point;
-    m_prevZoomFactor = GetZoomFactor();
-    //m_prevScrollOffset = m_cScrollOffset;
-
-    QtViewport::OnLButtonDown(modifiers, point);
-    m_bContentValid = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Process the various events depending on the selection and the view
-    // mode
-    ////////////////////////////////////////////////////////////////////////
-    QtViewport::OnLButtonUp(modifiers, point);
-
-    GetViewManager()->UpdateViews(eUpdateObjects);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnMouseWheel(Qt::KeyboardModifiers, short zDelta, [[maybe_unused]] const QPoint& pt)
-{
-    float z = GetZoomFactor();
-    float scale = 1.2f * fabs(zDelta / 120.0f);
-    if (zDelta >= 0)
-    {
-        z = z * scale;
-    }
-    else
-    {
-        z = z / scale;
-    }
-    SetZoom(z, m_cMousePos);
-
-    GetViewManager()->UpdateViews(eUpdateObjects);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point)
-{
-    m_cMousePos = point;
-
-    if (GetViewMode() == ScrollZoomMode)
-    {
-        // Capture the mouse after the user has moved a bit, otherwise the
-        // right click context menu won't popup
-        if (!m_mouseCaptured && ((point - m_RMouseDownPos).manhattanLength() > QApplication::startDragDistance()))
-        {
-            CaptureMouse();
-        }
-
-        // You can only scroll while the middle mouse button is down
-        if (buttons & Qt::RightButton || buttons & Qt::MiddleButton)
-        {
-            if (modifiers & Qt::ShiftModifier)
-            {
-                // Zoom to mouse position.
-                float z = m_prevZoomFactor + (point.y() - m_RMouseDownPos.y()) * 0.02f;
-                SetZoom(z, m_RMouseDownPos);
-            }
-            else
-            {
-                // Set the new scrolled coordinates
-                float fScale = GetZoomFactor();
-                float ofsx, ofsy;
-                GetScrollOffset(ofsx, ofsy);
-                ofsx -= (point.x() - m_RMouseDownPos.x()) / fScale;
-                ofsy += (point.y() - m_RMouseDownPos.y()) / fScale;
-                SetScrollOffset(ofsx, ofsy);
-                m_RMouseDownPos = point;
-            }
-        }
-        return;
-    }
-
-    QtViewport::OnMouseMove(modifiers, buttons, point);
-
-    m_bContentValid = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::SetScrollOffset(float x, float y, [[maybe_unused]] bool bLimits)
-{
-    Vec3 org = GetOrigin2D();
-    switch (m_axis)
-    {
-    case VPA_XY:
-    case VPA_YX:
-        org.x = x;
-        org.y = y;
-        break;
-    case VPA_XZ:
-        org.x = x;
-        org.z = y;
-        break;
-    case VPA_YZ:
-        org.y = x;
-        org.z = y;
-        break;
-    }
-
-    SetOrigin2D(org);
-
-    CalculateViewTM();
-    //GetViewManager()->UpdateViews(eUpdateObjects);
-    m_bContentValid = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::GetScrollOffset(float& x, float& y)
-{
-    Vec3 origin = GetOrigin2D();
-    switch (m_axis)
-    {
-    case VPA_XY:
-    case VPA_YX:
-        x = origin.x;
-        y = origin.y;
-        break;
-    case VPA_XZ:
-        x = origin.x;
-        y = origin.z;
-        break;
-    case VPA_YZ:
-        x = origin.y;
-        y = origin.z;
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::SetZoom(float fZoomFactor, const QPoint& center)
-{
-    if (fZoomFactor < m_minZoom)
-    {
-        fZoomFactor = m_minZoom;
-    }
-    else if (fZoomFactor > m_maxZoom)
-    {
-        fZoomFactor = m_maxZoom;
-    }
-
-    // Zoom to mouse position.
-    float ofsx, ofsy;
-    GetScrollOffset(ofsx, ofsy);
-
-    float s1 = GetZoomFactor();
-    float s2 = fZoomFactor;
-
-    SetZoomFactor(fZoomFactor);
-
-    // Calculate new offset to center zoom on mouse.
-    float x2 = center.x();
-    float y2 = m_rcClient.height() - center.y();
-    ofsx = -(x2 / s2 - x2 / s1 - ofsx);
-    ofsy = -(y2 / s2 - y2 / s1 - ofsy);
-    SetScrollOffset(ofsx, ofsy, true);
-
-    CalculateViewTM();
-
-    m_bContentValid = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::resizeEvent(QResizeEvent* event)
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Re-evaluate the zoom / scroll offset values
-    // TODO: Restore the zoom rectangle instead of resetting it
-    ////////////////////////////////////////////////////////////////////////
-
-    QtViewport::resizeEvent(event);
-
-    m_rcClient = rect();
-    CalculateViewTM();
-    m_bContentValid = false;
-}
-
-void Q2DViewport::showEvent(QShowEvent* event)
-{
-    QtViewport::showEvent(event);
-    m_bContentValid = false;
-    QMetaObject::invokeMethod(this, "Update", Qt::QueuedConnection);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::paintEvent([[maybe_unused]] QPaintEvent* event)
-{
-    // nothing to draw here, Render() draws on the overlay widget which has no updates enabled to avoid flicker
-    CGameEngine* ge = GetIEditor()->GetGameEngine();
-    setRenderOverlayVisible(ge ? ge->IsLevelLoaded() : false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int Q2DViewport::OnCreate()
-{
-    // Calculate the View transformation matrix.
-    CalculateViewTM();
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::Update()
-{
-    if (!m_bContentValid)
-    {
-        Render();
-    }
-    m_bContentValid = true;
-    QtViewport::Update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint Q2DViewport::WorldToView(const Vec3& wp) const
-{
-    Vec3 sp = m_screenTM.TransformPoint(wp);
-    QPoint p = QPoint(sp.x, 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(sp.x, 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
-{
-    Vec3 wp = m_screenTM_Inverted.TransformPoint(Vec3(vp.x(), vp.y(), 0));
-    switch (m_axis)
-    {
-    case VPA_XY:
-    case VPA_YX:
-        wp.z = 0;
-        break;
-    case VPA_XZ:
-        wp.y = 0;
-        break;
-    case VPA_YZ:
-        wp.x = 0;
-        break;
-    }
-    return wp;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void    Q2DViewport::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const
-{
-    raySrc = ViewToWorld(vp);
-    switch (m_axis)
-    {
-    case VPA_XY:
-    case VPA_YX:
-        raySrc.z = MAX_WORLD_SIZE;
-        rayDir(0, 0, -1);
-        break;
-    case VPA_XZ:
-        raySrc.y = MAX_WORLD_SIZE;
-        rayDir(0, -1, 0);
-        break;
-    case VPA_YZ:
-        raySrc.x = MAX_WORLD_SIZE;
-        rayDir(-1, 0, 0);
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float Q2DViewport::GetScreenScaleFactor([[maybe_unused]] const Vec3& worldPoint) const
-{
-    return 400.0f / GetZoomFactor();
-    //return 100.0f / ;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnTitleMenu(QMenu* menu)
-{
-    bool bShowGrid = true;
-    if (Q2DViewport* p2DViewport = viewport_cast<Q2DViewport*>(GetIEditor()->GetViewManager()->GetSelectedViewport()))
-    {
-        bShowGrid = p2DViewport->GetShowGrid();
-    }
-
-    QAction* action = menu->addAction(tr("Labels"));
-    action->setCheckable(true);
-    action->setChecked(GetIEditor()->GetDisplaySettings()->IsDisplayLabels());
-    connect(action, &QAction::triggered, this, OnMenuLabels);
-
-    action = menu->addAction(tr("Grid"));
-    action->setCheckable(true);
-    action->setChecked(bShowGrid);
-    connect(action, &QAction::triggered, this, OnMenuGrid);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnDestroy()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::Render()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::Draw(DisplayContext& dc)
-{
-    dc.DepthTestOff();
-    dc.DepthWriteOff();
-    if (m_bShowGrid)
-    {
-        DrawGrid(dc);
-    }
-
-    DrawObjects(dc);
-    DrawSelection(dc);
-    if (m_bShowViewMarker)
-    {
-        DrawViewerMarker(dc);
-    }
-    DrawAxis(dc);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::DrawGrid(DisplayContext& dc, bool bNoXNumbers)
-{
-    float gridSize = 1.0f;
-    if (gridSize < 0.00001f)
-    {
-        return;
-    }
-
-    float fZ = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    float fScale = GetZoomFactor();
-
-    int width = m_rcClient.width();
-    int height = m_rcClient.height();
-
-    float origin[2];
-    GetScrollOffset(origin[0], origin[1]);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Draw Minor grid lines.
-    //////////////////////////////////////////////////////////////////////////
-
-    float pixelsPerGrid = gridSize * fScale;
-
-    m_fGridZoom = 1.0f;
-
-    if (m_bAutoAdjustGrids)
-    {
-        int griditers = 0;
-        pixelsPerGrid = gridSize * fScale;
-        while (pixelsPerGrid <= 5 && griditers++ < 20)
-        {
-            pixelsPerGrid = gridSize * fScale;
-        }
-    }
-
-    Matrix34 viewTM = GetViewTM().GetInverted() * m_screenTM_Inverted;
-    Matrix34 viewTM_Inv = m_screenTM * GetViewTM();
-
-    Vec3 viewP0 = viewTM.TransformPoint(Vec3(0, 0, 0));
-    Vec3 viewP1 = viewTM.TransformPoint(Vec3(m_rcClient.width(), m_rcClient.height(), 0));
-
-    Vec3 viewP_Text = viewTM.TransformPoint(Vec3(0, m_rcClient.height(), 0));
-
-    if (m_bShowMinorGridLines && (!m_bAutoAdjustGrids || pixelsPerGrid > 5))
-    {
-        //////////////////////////////////////////////////////////////////////////
-        // Draw Minor grid lines.
-        //////////////////////////////////////////////////////////////////////////
-
-        Vec3 vec0 = SnapToSize(viewP0, gridSize);
-        Vec3 vec1 = SnapToSize(viewP1, gridSize);
-        if (vec0.x > vec1.x)
-        {
-            std::swap(vec0.x, vec1.x);
-        }
-        if (vec0.y > vec1.y)
-        {
-            std::swap(vec0.y, vec1.y);
-        }
-
-        dc.SetColor(MINOR_GRID_COLOR, m_gridAlpha);
-        for (float dy = vec0.y; dy < vec1.y; dy += gridSize)
-        {
-            Vec3 p0 = viewTM_Inv.TransformPoint(Vec3(viewP0.x, dy, 0));
-            Vec3 p1 = viewTM_Inv.TransformPoint(Vec3(viewP1.x, dy, 0));
-            dc.DrawLine(Vec3(p0.x, p0.y, fZ), Vec3(p1.x, p1.y, fZ));
-        }
-        for (float dx = vec0.x; dx < vec1.x; dx += gridSize)
-        {
-            Vec3 p0 = viewTM_Inv.TransformPoint(Vec3(dx, viewP0.y, 0));
-            Vec3 p1 = viewTM_Inv.TransformPoint(Vec3(dx, viewP1.y, 0));
-            dc.DrawLine(Vec3(p0.x, p0.y, fZ), Vec3(p1.x, p1.y, fZ));
-        }
-    }
-    if (m_bShowMajorGridLines)
-    {
-        //////////////////////////////////////////////////////////////////////////
-        // Draw Major grid lines.
-        //////////////////////////////////////////////////////////////////////////
-        gridSize = gridSize * 1.0f;
-
-        if (m_bAutoAdjustGrids)
-        {
-            int iters = 0;
-            pixelsPerGrid = gridSize * fScale;
-            while (pixelsPerGrid < 20 && iters < 20)
-            {
-                gridSize = gridSize * 2;
-                pixelsPerGrid = gridSize * fScale;
-                iters++;
-            }
-        }
-        if (!m_bAutoAdjustGrids || pixelsPerGrid > 20)
-        {
-            Vec3 vec0 = SnapToSize(viewP0, gridSize);
-            Vec3 vec1 = SnapToSize(viewP1, gridSize);
-            if (vec0.x > vec1.x)
-            {
-                std::swap(vec0.x, vec1.x);
-            }
-            if (vec0.y > vec1.y)
-            {
-                std::swap(vec0.y, vec1.y);
-            }
-
-            dc.SetColor(MAJOR_GRID_COLOR, m_gridAlpha);
-
-            for (float dy = vec0.y; dy < vec1.y; dy += gridSize)
-            {
-                Vec3 p0 = viewTM_Inv.TransformPoint(Vec3(viewP0.x, dy, 0));
-                Vec3 p1 = viewTM_Inv.TransformPoint(Vec3(viewP1.x, dy, 0));
-                dc.DrawLine(Vec3(p0.x, p0.y, fZ), Vec3(p1.x, p1.y, fZ));
-            }
-            for (float dx = vec0.x; dx < vec1.x; dx += gridSize)
-            {
-                Vec3 p0 = viewTM_Inv.TransformPoint(Vec3(dx, viewP0.y, 0));
-                Vec3 p1 = viewTM_Inv.TransformPoint(Vec3(dx, viewP1.y, 0));
-                dc.DrawLine(Vec3(p0.x, p0.y, fZ), Vec3(p1.x, p1.y, fZ));
-            }
-
-            // Draw numbers.
-            if (m_bShowNumbers)
-            {
-                char text[64];
-                dc.SetColor(m_colorGridText);
-
-                if (!bNoXNumbers)
-                {
-                    // Draw horizontal grid text.
-                    for (float dx = vec0.x; dx <= vec1.x; dx += gridSize)
-                    {
-                        Vec3 p = viewTM_Inv.TransformPoint(Vec3(dx, viewP_Text.y, 0));
-                        sprintf_s(text, "%i", (int)(dx));
-                        dc.Draw2dTextLabel(p.x - 8, p.y - 13, 1, text);
-                    }
-                }
-                for (float dy = vec0.y; dy <= vec1.y; dy += gridSize)
-                {
-                    Vec3 p = viewTM_Inv.TransformPoint(Vec3(viewP_Text.x, dy, 0));
-                    sprintf_s(text, "%i", (int)(dy));
-                    dc.Draw2dTextLabel(p.x + 3, p.y - 12, 1, text);
-                }
-            }
-        }
-    }
-
-    // Draw Main Axis.
-    {
-        Vec3 org = m_screenTM.TransformPoint(Vec3(0, 0, 0));
-        dc.SetColor(AXIS_GRID_COLOR);
-        dc.DrawLine(Vec3(org.x, 0, fZ), Vec3(org.x, height, fZ));
-        dc.DrawLine(Vec3(0, org.y, fZ), Vec3(width, org.y, fZ));
-    }
-    //////////////////////////////////////////////////////////////////////////
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::DrawAxis(DisplayContext& dc)
-{
-    float cl = 0.85f;
-    char xstr[2], ystr[2], zstr[2];
-    Vec3 colx, coly, colz;
-    Vec3 colorX(cl, 0, 0);
-    Vec3 colorY(0, cl, 0);
-    Vec3 colorZ(0, 0, cl);
-    switch (m_axis)
-    {
-    case VPA_XY:
-        azstrcpy(xstr, AZ_ARRAY_SIZE(xstr), "x");
-        azstrcpy(ystr, AZ_ARRAY_SIZE(ystr),  "y");
-        azstrcpy(zstr, AZ_ARRAY_SIZE(zstr),  "z");
-        colx = colorX;
-        coly = colorY;
-        colz = colorZ;
-        break;
-    case VPA_YX:
-        azstrcpy(xstr, AZ_ARRAY_SIZE(xstr), "x");
-        azstrcpy(ystr, AZ_ARRAY_SIZE(ystr), "y");
-        azstrcpy(zstr, AZ_ARRAY_SIZE(zstr), "z");
-        colx = colorY;
-        coly = colorX;
-        colz = colorZ;
-        break;
-    case VPA_XZ:
-        azstrcpy(xstr, AZ_ARRAY_SIZE(xstr), "x");
-        azstrcpy(ystr, AZ_ARRAY_SIZE(ystr), "z");
-        azstrcpy(zstr, AZ_ARRAY_SIZE(zstr), "y");
-        colx = colorX;
-        coly = colorZ;
-        colz = colorY;
-        break;
-    case VPA_YZ:
-        azstrcpy(xstr, AZ_ARRAY_SIZE(xstr), "y");
-        azstrcpy(ystr, AZ_ARRAY_SIZE(ystr), "z");
-        azstrcpy(zstr, AZ_ARRAY_SIZE(zstr), "x");
-        colx = colorY;
-        coly = colorZ;
-        colz = colorX;
-        break;
-    }
-
-    int height = m_rcClient.height();
-
-    int size = 25;
-    Vec3 pos(30, height - 15, 1);
-
-    dc.SetColor(colx.x, colx.y, colx.z, 1);
-    dc.DrawLine(pos, pos + Vec3(size, 0, 0));
-
-    dc.SetColor(coly.x, coly.y, coly.z, 1);
-    dc.DrawLine(pos, pos - Vec3(0, size, 0));
-
-    dc.SetColor(m_colorAxisText);
-    pos.x -= 3;
-    pos.y -= 4;
-    pos.z = 2;
-    dc.Draw2dTextLabel(pos.x + size + 4, pos.y - 2, 1, xstr);
-    dc.Draw2dTextLabel(pos.x + 3, pos.y - size, 1, ystr);
-    dc.Draw2dTextLabel(pos.x - 5, pos.y + 5, 1, zstr);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::DrawSelection(DisplayContext& dc)
-{
-    AABB box;
-    GetIEditor()->GetSelectedRegion(box);
-
-    if (!IsEquivalent(box.min, box.max, 0))
-    {
-        switch (m_axis)
-        {
-        case VPA_XY:
-        case VPA_YX:
-            box.min.z = box.max.z = 0;
-            break;
-        case VPA_XZ:
-            box.min.y = box.max.y = 0;
-            break;
-        case VPA_YZ:
-            box.min.x = box.max.x = 0;
-            break;
-        }
-
-        dc.PushMatrix(GetScreenTM());
-        dc.SetColor(SELECTION_RECT_COLOR.x, SELECTION_RECT_COLOR.y, SELECTION_RECT_COLOR.z, 1);
-        dc.DrawWireBox(box.min, box.max);
-        dc.PopMatrix();
-    }
-
-    if (!m_selectedRect.isEmpty())
-    {
-        dc.SetColor(SELECTION_RECT_COLOR.x, SELECTION_RECT_COLOR.y, SELECTION_RECT_COLOR.z, 1);
-        QPoint p1(m_selectedRect.left(), m_selectedRect.top());
-        QPoint p2(m_selectedRect.right() + 1, m_selectedRect.bottom() +1);
-        dc.DrawLine(Vec3(p1.x(), p1.y(), 0), Vec3(p2.x(), p1.y(), 0));
-        dc.DrawLine(Vec3(p1.x(), p2.y(), 0), Vec3(p2.x(), p2.y(), 0));
-        dc.DrawLine(Vec3(p1.x(), p1.y(), 0), Vec3(p1.x(), p2.y(), 0));
-        dc.DrawLine(Vec3(p2.x(), p1.y(), 0), Vec3(p2.x(), p2.y(), 0));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::DrawViewerMarker(DisplayContext& dc)
-{
-    float noScale = 1.0f / GetZoomFactor();
-
-    CViewport* pVP = GetViewManager()->GetGameViewport();
-    if (!pVP)
-    {
-        return;
-    }
-
-    Ang3 viewAngles = Ang3::GetAnglesXYZ(Matrix33(pVP->GetViewTM()));
-
-    Matrix34 tm;
-    switch (m_axis)
-    {
-    case VPA_XY:
-    case VPA_YX:
-        tm = Matrix34::CreateRotationXYZ(Ang3(0, 0, viewAngles.z));
-        break;
-    case VPA_XZ:
-        tm = Matrix34::CreateRotationXYZ(Ang3(viewAngles.x, viewAngles.y, viewAngles.z));
-        break;
-    case VPA_YZ:
-        tm = Matrix34::CreateRotationXYZ(Ang3(viewAngles.x, 0, viewAngles.z));
-        break;
-    }
-    tm.SetTranslation(pVP->GetViewTM().GetTranslation());
-
-    dc.PushMatrix(GetScreenTM() * tm);
-
-    Vec3 dim(MARKER_SIZE, MARKER_SIZE / 2, MARKER_SIZE);
-    dc.SetColor(QColor(0, 0, 255)); // blue
-    dc.DrawWireBox(-dim * noScale, dim * noScale);
-
-    float fov = GetIEditor()->GetSystem()->GetViewCamera().GetFov();
-
-    Vec3 q[4];
-    float dist = 30;
-    float ta = (float)tan(0.5f * fov);
-    float h = dist * ta;
-    float w = h * gSettings.viewports.fDefaultAspectRatio; //  ASPECT ??
-    //float h = w / GetAspect();
-    q[0] = Vec3(w, dist, h) * noScale;
-    q[1] = Vec3(-w, dist, h) * noScale;
-    q[2] = Vec3(-w, dist, -h) * noScale;
-    q[3] = Vec3(w, dist, -h) * noScale;
-
-    // Draw frustum.
-    dc.DrawLine(Vec3(0, 0, 0), q[0]);
-    dc.DrawLine(Vec3(0, 0, 0), q[1]);
-    dc.DrawLine(Vec3(0, 0, 0), q[2]);
-    dc.DrawLine(Vec3(0, 0, 0), q[3]);
-
-    // Draw quad.
-    dc.DrawPolyLine(q, 4);
-
-    dc.PopMatrix();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::DrawObjects(DisplayContext& dc)
-{
-    dc.PushMatrix(GetScreenTM());
-    if (m_bShowObjectsInfo)
-    {
-        GetIEditor()->GetObjectManager()->Display(dc);
-    }
-
-    dc.PopMatrix();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::MakeConstructionPlane([[maybe_unused]] int axis)
-{
-    m_constructionMatrix[COORDS_VIEW] = GetViewTM();
-
-    Vec3 p(0, 0, 0);
-
-    switch (m_axis)
-    {
-    case VPA_XY:
-        AssignConstructionPlane(p, p + Vec3(0, 1, 0), p + Vec3(1, 0, 0));
-        break;
-    case VPA_YX:
-        m_constructionPlane.SetPlane(p, p + Vec3(1, 0, 0), p + Vec3(0, 1, 0));
-        break;
-    case VPA_XZ:
-        AssignConstructionPlane(p, p + Vec3(0, 0, 1), p + Vec3(1, 0, 0));
-        break;
-    case VPA_YZ:
-        AssignConstructionPlane(p, p + Vec3(0, 0, 1), p + Vec3(0, 1, 0));
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Matrix34& Q2DViewport::GetConstructionMatrix(RefCoordSys coordSys)
-{
-    if (coordSys == COORDS_VIEW)
-    {
-        return GetViewTM();
-    }
-    return m_constructionMatrix[coordSys];
-}
-
-//////////////////////////////////////////////////////////////////////////
-AABB Q2DViewport::GetWorldBounds(const QPoint& pnt1, const QPoint& pnt2)
-{
-    Vec3 org;
-    AABB box;
-    box.Reset();
-    box.Add(ViewToWorld(pnt1));
-    box.Add(ViewToWorld(pnt2));
-
-    int maxSize = MAX_WORLD_SIZE;
-    switch (m_axis)
-    {
-    case VPA_XY:
-    case VPA_YX:
-        box.min.z = -maxSize;
-        box.max.z = maxSize;
-        break;
-    case VPA_XZ:
-        box.min.y = -maxSize;
-        box.max.y = maxSize;
-        break;
-    case VPA_YZ:
-        box.min.x = -maxSize;
-        box.max.x = maxSize;
-        break;
-    }
-    return box;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnDragSelectRectangle(const QRect &rect, [[maybe_unused]] bool bNormalizeRect)
-{
-    Vec3 org;
-    AABB box;
-    box.Reset();
-
-    Vec3 p1 = ViewToWorld(rect.topLeft());
-    Vec3 p2 = ViewToWorld(rect.bottomRight() + QPoint(1,1));
-    org = p1;
-
-    // Calculate selection volume.
-    box.Add(p1);
-    box.Add(p2);
-
-    int maxSize = MAX_WORLD_SIZE;
-
-    char szNewStatusText[512];
-    float w, h;
-
-    switch (m_axis)
-    {
-    case VPA_XY:
-        box.min.z = -maxSize;
-        box.max.z = maxSize;
-
-        w = box.max.x - box.min.x;
-        h = box.max.y - box.min.y;
-        sprintf_s(szNewStatusText, "X:%g Y:%g W:%g H:%g", org.x, org.y, w, h);
-        break;
-    case VPA_YX:
-        box.min.z = -maxSize;
-        box.max.z = maxSize;
-
-        w = box.max.y - box.min.y;
-        h = box.max.x - box.min.x;
-        sprintf_s(szNewStatusText, "X:%g Y:%g W:%g H:%g", org.x, org.y, w, h);
-        break;
-    case VPA_XZ:
-        box.min.y = -maxSize;
-        box.max.y = maxSize;
-
-        w = box.max.x - box.min.x;
-        h = box.max.z - box.min.z;
-        sprintf_s(szNewStatusText, "X:%g Z:%g  W:%g H:%g", org.x, org.z, w, h);
-        break;
-    case VPA_YZ:
-        box.min.x = -maxSize;
-        box.max.x = maxSize;
-
-        w = box.max.y - box.min.y;
-        h = box.max.z - box.min.z;
-        sprintf_s(szNewStatusText, "Y:%g Z:%g  W:%g H:%g", org.y, org.z, w, h);
-        break;
-    }
-
-    GetIEditor()->SetSelectedRegion(box);
-
-    // Show marker position in the status bar
-    GetIEditor()->SetStatusText(szNewStatusText);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Q2DViewport::HitTest(const QPoint& point, HitContext& hitInfo)
-{
-    hitInfo.bounds = &m_displayBounds;
-    return QtViewport::HitTest(point, hitInfo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-bool Q2DViewport::IsBoundsVisible(const AABB& box) const
-{
-    // If at least part of bbox is visible then its visible.
-    if (m_displayBounds.IsIntersectBox(box))
-    {
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::CenterOnSelection()
-{
-    CSelectionGroup* sel = GetIEditor()->GetSelection();
-    if (sel->IsEmpty())
-    {
-        return;
-    }
-
-    AABB bounds = sel->GetBounds();
-    CenterOnAABB(bounds);
-}
-
-void Q2DViewport::CenterOnAABB(const AABB& aabb)
-{
-    Vec3 selPos = aabb.GetCenter();
-
-    Vec3 v1 = ViewToWorld(m_rcClient.bottomLeft());
-    Vec3 v2 = ViewToWorld(m_rcClient.topRight());
-    Vec3 vofs = (v2 - v1) * 0.5f;
-    selPos -= vofs;
-    SetOrigin2D(selPos);
-
-    m_bContentValid = false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 Q2DViewport::GetOrigin2D() const
-{
-    if (gSettings.viewports.bSync2DViews)
-    {
-        return GetViewManager()->GetOrigin2D();
-    }
-    else
-    {
-        return m_origin2D;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void Q2DViewport::SetOrigin2D(const Vec3& org)
-{
-    m_origin2D = org;
-    if (gSettings.viewports.bSync2DViews)
-    {
-        GetViewManager()->SetOrigin2D(m_origin2D);
-    }
-}
-
-#include <moc_2DViewport.cpp>
diff --git a/Code/Sandbox/Editor/2DViewport.h b/Code/Sandbox/Editor/2DViewport.h
deleted file mode 100644
index 3196dc7c5d..0000000000
--- a/Code/Sandbox/Editor/2DViewport.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_2DVIEWPORT_H
-#define CRYINCLUDE_EDITOR_2DVIEWPORT_H
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "Viewport.h"
-#include "Objects/DisplayContext.h"
-#endif
-
-class QMenu;
-
-/** 2D Viewport used mostly for indoor editing, Front/Top/Left viewports.
-*/
-class Q2DViewport
-    : public QtViewport
-{
-    Q_OBJECT
-public:
-    enum ViewMode
-    {
-        NothingMode = 0,
-        ScrollZoomMode,
-    };
-
-    Q2DViewport(QWidget* parent = nullptr);
-    virtual ~Q2DViewport();
-
-    virtual void SetType(EViewportType type);
-    virtual EViewportType GetType() const { return m_viewType; }
-    virtual float GetAspectRatio() const { return 1.0f; };
-
-    virtual void ResetContent();
-    virtual void UpdateContent(int flags);
-
-public slots:
-    // Called every frame to update viewport.
-    virtual void Update();
-
-public:
-    //! Map world space position to viewport position.
-    virtual QPoint     WorldToView(const Vec3& wp) const;
-
-    virtual QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const; //Eric@conffx
-
-    //! Map viewport position to world space position.
-    virtual 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.
-    virtual void        ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const;
-
-    void OnTitleMenu(QMenu* menu) override;
-
-    virtual bool HitTest(const QPoint& point, HitContext& hitInfo) override;
-    virtual bool IsBoundsVisible(const AABB& box) const;
-
-    // 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;
-    void CenterOnSelection() override;
-    void CenterOnAABB(const AABB& aabb) override;
-
-    /** Get 2D viewports origin.
-    */
-    Vec3 GetOrigin2D() const;
-
-    /** Assign 2D viewports origin.
-    */
-    void SetOrigin2D(const Vec3& org);
-
-
-    void SetShowViewMarker(bool bEnable) { m_bShowViewMarker = bEnable; }
-
-    void SetShowGrid(bool bShowGrid) { m_bShowGrid = bShowGrid; }
-    bool GetShowGrid() const { return m_bShowGrid; };
-
-    void SetShowObjectsInfo(bool bShowObjectsInfo) { m_bShowObjectsInfo = bShowObjectsInfo; }
-    bool GetShowObjectsInfo() const { return m_bShowObjectsInfo; }
-
-    void SetGridLines(bool bShowMinor, bool bShowMajor) { m_bShowMinorGridLines = bShowMinor; m_bShowMajorGridLines = bShowMajor; }
-    void SetGridLineNumbers(bool bShowNumbers) { m_bShowNumbers = bShowNumbers; }
-    void SetAutoAdjust(bool bAuto) { m_bAutoAdjustGrids = bAuto; }
-
-
-protected:
-    enum EViewportAxis
-    {
-        VPA_XY,
-        VPA_XZ,
-        VPA_YZ,
-        VPA_YX,
-    };
-
-    void SetAxis(EViewportAxis axis);
-
-    // Scrolling / zooming related
-    virtual void SetScrollOffset(float x, float y, bool bLimits = true);
-    virtual void GetScrollOffset(float& x, float& y); // Only x and y components used.
-
-    virtual void SetZoom(float fZoomFactor, const QPoint& center);
-
-    // overrides from CViewport.
-    virtual void MakeConstructionPlane(int axis);
-    virtual const Matrix34& GetConstructionMatrix(RefCoordSys coordSys);
-
-    //! Calculate view transformation matrix.
-    virtual void CalculateViewTM();
-
-    virtual void SetViewMode(ViewMode eViewMode)    { m_eViewMode = eViewMode; };
-    ViewMode GetViewMode() { return m_eViewMode; };
-
-protected slots:
-    // Render
-    void Render();
-
-protected:
-    // Draw everything.
-    virtual void Draw(DisplayContext& dc);
-
-    // Draw elements of viewport.
-    void DrawGrid(DisplayContext& dc, bool bNoXNumbers = false);
-    void DrawAxis(DisplayContext& dc);
-    void DrawSelection(DisplayContext& dc);
-    void DrawObjects(DisplayContext& dc);
-    void DrawViewerMarker(DisplayContext& dc);
-
-    AABB GetWorldBounds(const QPoint& p1, const QPoint& p2);
-
-    void OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point) override;
-    void resizeEvent(QResizeEvent* event) override;
-    void showEvent(QShowEvent* event) override;
-    void paintEvent(QPaintEvent* event) override;
-    int OnCreate();
-    void OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta, const QPoint& pt);
-    void OnDestroy();
-
-protected:
-    //////////////////////////////////////////////////////////////////////////
-    // Variables.
-    //////////////////////////////////////////////////////////////////////////
-
-    //! XY/XZ/YZ mode of this 2D viewport.
-    EViewportType m_viewType;
-    EViewportAxis m_axis;
-
-    //! Axis to cull normals with in this Viewport.
-    int m_cullAxis;
-
-    // Viewport origin point.
-    Vec3 m_origin2D;
-
-    // Scrolling / zooming related
-    QPoint m_cMousePos;
-    QPoint m_RMouseDownPos;
-
-    float m_prevZoomFactor;
-    QSize m_prevScrollOffset;
-
-    QRect m_rcSelect;
-    QRect m_rcClient;
-
-    AABB m_displayBounds;
-
-    bool m_bShowTerrain;
-    bool m_bShowViewMarker;
-    bool m_bShowGrid;
-    bool m_bShowObjectsInfo;
-    bool m_bShowMinorGridLines;
-    bool m_bShowMajorGridLines;
-    bool m_bShowNumbers;
-    bool m_bAutoAdjustGrids;
-
-    Matrix34 m_screenTM_Inverted;
-
-    float m_gridAlpha;
-    QColor m_colorGridText;
-    QColor m_colorAxisText;
-    QColor m_colorBackground;
-    bool m_bContentValid;
-
-    DisplayContext m_displayContext;
-    ViewMode m_eViewMode = NothingMode;
-
-    //May be changed by parent classes of Q2DViewport
-    //CTopRendererWnd for example will change m_maxZoom to 250.0f
-    float m_minZoom = 0.01f;
-    float m_maxZoom = 500.0f;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class C2DViewport_XY
-    : public Q2DViewport
-{
-    Q_OBJECT
-public:
-    static const GUID& GetClassID()
-    {
-        return QtViewport::GetClassID<C2DViewport_XY>();
-    }
-
-    C2DViewport_XY(QWidget* parent = nullptr)
-        : Q2DViewport(parent) { SetType(ET_ViewportXY); }
-};
-
-//////////////////////////////////////////////////////////////////////////
-class C2DViewport_XZ
-    : public Q2DViewport
-{
-    Q_OBJECT
-public:
-    static const GUID& GetClassID()
-    {
-        return QtViewport::GetClassID<C2DViewport_XZ>();
-    }
-
-    C2DViewport_XZ(QWidget* parent = nullptr)
-        : Q2DViewport(parent) { SetType(ET_ViewportXZ); }
-};
-
-//////////////////////////////////////////////////////////////////////////
-class C2DViewport_YZ
-    : public Q2DViewport
-{
-    Q_OBJECT
-public:
-    static const GUID& GetClassID()
-    {
-        return QtViewport::GetClassID<C2DViewport_YZ>();
-    }
-
-    C2DViewport_YZ(QWidget* parent = nullptr)
-        : Q2DViewport(parent) { SetType(ET_ViewportYZ); }
-};
-
-#endif // CRYINCLUDE_EDITOR_2DVIEWPORT_H
diff --git a/Code/Sandbox/Editor/AboutDialog.cpp b/Code/Sandbox/Editor/AboutDialog.cpp
deleted file mode 100644
index e1ec7756c8..0000000000
--- a/Code/Sandbox/Editor/AboutDialog.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-#include "EditorDefs.h"
-
-#include "AboutDialog.h"
-
-// Qt
-#include <QPainter>
-#include <QDesktopServices>
-#include <QSvgWidget>
-
-// AzCore
-#include <AzCore/Casting/numeric_cast.h>    // for aznumeric_cast
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_AboutDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_ui(new Ui::CAboutDialog)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-    connect(m_ui->m_transparentAgreement, &QLabel::linkActivated, this, &CAboutDialog::OnCustomerAgreement);
-
-    m_ui->m_transparentTrademarks->setText(versionText);
-
-    m_ui->m_transparentAllRightReserved->setObjectName("copyrightNotice");
-    m_ui->m_transparentAllRightReserved->setTextFormat(Qt::RichText);
-    m_ui->m_transparentAllRightReserved->setText(richTextCopyrightNotice);
-
-    m_ui->m_transparentAgreement->setObjectName("link");
-
-    setStyleSheet( "CAboutDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; }\
-                    CAboutDialog > QLabel#link { text-decoration: underline; color: #00A1C9; }");
-
-    // Prepare background image
-    QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_1_27.png"));
-    m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-
-    // Draw the Open 3D Engine logo from svg
-    m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/o3de_logo.svg"));
-
-    // Prevent re-sizing
-    setFixedSize(m_enforcedWidth, m_enforcedHeight);
-}
-
-CAboutDialog::~CAboutDialog()
-{
-}
-
-void CAboutDialog::paintEvent(QPaintEvent*)
-{
-    QPainter painter(this);
-
-    QRect drawTarget = rect();
-    painter.drawPixmap(drawTarget, m_backgroundImage);
-}
-
-void CAboutDialog::mouseReleaseEvent(QMouseEvent* event)
-{
-    if (event->button() == Qt::LeftButton)
-    {
-        accept();
-    }
-
-    QDialog::mouseReleaseEvent(event);
-}
-
-void CAboutDialog::OnCustomerAgreement()
-{
-    QDesktopServices::openUrl(QUrl(QStringLiteral("https://www.o3debinaries.org/license")));
-}
-
-#include <moc_AboutDialog.cpp>
diff --git a/Code/Sandbox/Editor/AboutDialog.h b/Code/Sandbox/Editor/AboutDialog.h
deleted file mode 100644
index ee31020240..0000000000
--- a/Code/Sandbox/Editor/AboutDialog.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QString>
-#include <QPixmap>
-#endif
-
-namespace Ui {
-    class CAboutDialog;
-}
-
-class CAboutDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CAboutDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent = nullptr);
-    ~CAboutDialog();
-
-private:
-
-    void OnCustomerAgreement();
-
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void paintEvent(QPaintEvent* event) override;
-
-    QScopedPointer<Ui::CAboutDialog>    m_ui;
-    QPixmap                             m_backgroundImage;
-
-    int m_enforcedWidth = 600;
-    int m_enforcedHeight = 360;
-};
-
diff --git a/Code/Sandbox/Editor/AboutDialog.ui b/Code/Sandbox/Editor/AboutDialog.ui
deleted file mode 100644
index 48ec82da5c..0000000000
--- a/Code/Sandbox/Editor/AboutDialog.ui
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CAboutDialog</class>
- <widget class="QWidget" name="CAboutDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>600</width>
-    <height>360</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>600</width>
-    <height>360</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>600</width>
-    <height>360</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>About Open 3D Engine Editor</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">background-color: transparent</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <property name="sizeConstraint">
-    <enum>QLayout::SetFixedSize</enum>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="sizeConstraint">
-      <enum>QLayout::SetFixedSize</enum>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>22</number>
-       </property>
-       <property name="bottomMargin">
-        <number>5</number>
-       </property>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_42">
-         <property name="leftMargin">
-          <number>4</number>
-         </property>
-         <property name="topMargin">
-          <number>12</number>
-         </property>
-         <property name="bottomMargin">
-          <number>9</number>
-         </property>
-         <item>
-          <widget class="QSvgWidget" name="m_logo" native="true">
-           <property name="minimumSize">
-            <size>
-             <width>175</width>
-             <height>66</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>175</width>
-             <height>66</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_transparentVersion">
-         <property name="text">
-          <string>O3DE Editor</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_transparentDevelopedBy">
-         <property name="text">
-          <string>Developer Preview</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <widget class="QLabel" name="m_transparentCopyright">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>180</width>
-            <height>0</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-          </property>
-         </widget>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_transparentTrademarks">
-         <property name="text">
-          <string/>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>16</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="ClickableLabel" name="m_transparentAgreement">
-         <property name="text">
-          <string>Terms of Use</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="showDecoration" stdset="0">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>8</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_transparentAllRightReserved">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>260</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>260</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Specified in AboutDialog.cpp</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>300</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>QSvgWidget</class>
-   <extends>QWidget</extends>
-   <header>qsvgwidget.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ClickableLabel</class>
-   <extends>QLabel</extends>
-   <header>QtUI/ClickableLabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Sandbox/Editor/ActionManager.cpp b/Code/Sandbox/Editor/ActionManager.cpp
deleted file mode 100644
index b0e589df01..0000000000
--- a/Code/Sandbox/Editor/ActionManager.cpp
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ActionManager.h"
-
-// Qt
-#include <QSignalMapper>
-#include <QDebug>
-#include <QMenuBar>
-#include <QScopedValueRollback>
-
-// Editor
-#include "MainWindow.h"
-#include "QtViewPaneManager.h"
-#include "ShortcutDispatcher.h"
-#include "ToolbarManager.h"
-
-
-static const char* const s_reserved = "Reserved"; ///< "Reserved" property used for actions that cannot be overridden.
-                                                  ///< (e.g. KeySequences such as Ctrl+S and Ctrl+Z for Save/Undo etc.)
-
-static const char* const s_menuIdProperty = "MenuId"; ///< "MenuId" property used when adding top level menus to the
-                                                      ///<  menu bar so they can be uniquely identified with FindMenu()
-
-static const int s_invalidGuardActionId = -1;
-
-ActionManagerExecutionGuard::ActionManagerExecutionGuard(ActionManager* actionManager, QAction* action)
-    : m_actionManager(actionManager)
-    , m_actionId(s_invalidGuardActionId)
-    , m_canExecute(true)
-{
-    // both actionManager and action can be nullptr, and this is totally valid.
-    // the lambdas using this might be out of scope and their QPointers may have been cleared
-    if (actionManager && action)
-    {
-        m_actionId = action->data().toInt();
-        m_canExecute = actionManager->InsertActionExecuting(m_actionId);
-    }
-}
-
-ActionManagerExecutionGuard::ActionManagerExecutionGuard(ActionManager* actionManager, int actionId)
-    : m_actionManager(actionManager)
-    , m_actionId(actionId)
-    , m_canExecute(true)
-{
-    // both actionManager and action can be nullptr, and this is totally valid. The lambdas using this might be out of scope and
-    // their QPointers may have been cleared
-    if (actionManager)
-    {
-        m_canExecute = actionManager->InsertActionExecuting(m_actionId);
-    }
-}
-
-ActionManagerExecutionGuard::~ActionManagerExecutionGuard()
-{
-    // Only bother removing the action if it successfully inserted, indicated by m_canExecute.
-    // If during the insert, it was found that the action was already present, then there
-    // is no need to remove it, and doing so might cause problems because any it implies
-    // that something has already executed the action higher up the callstack and we don't
-    // want to remove the id so that future action triggers within the same callstack are prevented
-    // from executing.
-    if (m_canExecute && m_actionManager && (m_actionId != s_invalidGuardActionId))
-    {
-        m_actionManager->RemoveActionExecuting(m_actionId);
-    }
-}
-
-PatchedAction::PatchedAction(const QString& name, QObject* parent)
-    : QAction(name, parent)
-{
-}
-
-bool PatchedAction::event(QEvent* ev)
-{
-    // *Really* honor Qt::WindowShortcut. Floating dock widgets are a separate window (Qt::Window flag is set) even though they have a parent.
-
-    if (ev->type() == QEvent::Shortcut && shortcutContext() == Qt::WindowShortcut)
-    {
-        // This prevents shortcuts from firing while we're in a long running operation
-        // started by a shortcut
-        static bool reentranceLock = false;
-        if (reentranceLock)
-        {
-            return true;
-        }
-
-        QScopedValueRollback<bool> reset(reentranceLock, true);
-
-        QWidget* focusWidget = ShortcutDispatcher::focusWidget();
-        if (!focusWidget)
-        {
-            return QAction::event(ev);
-        }
-
-        for (QWidget* associatedWidget : associatedWidgets())
-        {
-            QWidget* associatedWindow = associatedWidget->window();
-            QWidget* focusWindow = focusWidget->window();
-            if (associatedWindow == focusWindow)
-            {
-                // Fair enough, we accept it.
-                return QAction::event(ev);
-            }
-            else if (associatedWindow && focusWindow)
-            {
-                /**
-                 * But do allow if the focused window is actually a floating dock widget.
-                 * For example, If Entity Outliner is floating, the gizmos (key 1, 2, 3 4) should still work.
-                 *
-                 * FIXME: But then why are those main toolbar actions using Qt::WindowShortcut instead of Qt::ApplicationShortcut ?
-                 * This block goes against what the original PatchedAction fixed.
-                 * Consider either removing it and using regular QActions, or using Qt::ApplicationShortcut
-                 * See also LY-35177
-                 */
-                QString focusWindowName = focusWindow->objectName();
-                if (focusWindowName.isEmpty())
-                {
-                    continue;
-                }
-
-                QWidget* child = associatedWindow->findChild<QWidget*>(focusWindowName);
-                if (child)
-                {
-                    // Also accept if the focus window is a child of the associated window
-                    return QAction::event(ev);
-                }
-            }
-        }
-
-        // Bug detected: Qt is propagating a shortcut with context Qt::WindowShortcut outside of window boundaries
-        // Consume the event instead of processing it.
-        qDebug() << "Discarding buggy shortcut";
-        return true;
-    }
-
-    return QAction::event(ev);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// ActionWrapper
-/////////////////////////////////////////////////////////////////////////////
-ActionManager::ActionWrapper& ActionManager::ActionWrapper::SetMenu(DynamicMenu* menu)
-{
-    menu->SetAction(m_action, m_actionManager);
-    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);
-    return *this;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// DynamicMenu
-/////////////////////////////////////////////////////////////////////////////
-DynamicMenu::DynamicMenu(QObject* parent)
-    : QObject(parent)
-    , m_action(nullptr)
-    , m_menu(nullptr)
-{
-    m_actionMapper = new QSignalMapper(this);
-    connect(m_actionMapper, SIGNAL(mapped(int)), this, SLOT(TriggerAction(int)));
-}
-
-void DynamicMenu::SetAction(QAction* action, ActionManager* am)
-{
-    Q_ASSERT(action);
-    Q_ASSERT(am);
-    m_action = action;
-    m_menu = new QMenu();
-    m_action->setMenu(m_menu);
-    connect(m_menu, &QMenu::aboutToShow, this, &DynamicMenu::ShowMenu);
-    m_actionManager = am;
-    setParent(m_action);
-}
-
-void DynamicMenu::SetParentMenu(QMenu* menu, ActionManager* am)
-{
-    Q_ASSERT(menu && !m_menu);
-    Q_ASSERT(!m_action);
-    m_menu = menu;
-    connect(m_menu, &QMenu::aboutToShow, this, &DynamicMenu::ShowMenu);
-    m_actionManager = am;
-}
-
-void DynamicMenu::AddAction(int id, QAction* action)
-{
-    Q_ASSERT(!m_actions.contains(id));
-    action->setData(id);
-    m_actions[id] = action;
-    m_menu->addAction(action);
-
-    connect(action, SIGNAL(triggered()), m_actionMapper, SLOT(map()));
-    m_actionMapper->setMapping(action, id);
-}
-
-void DynamicMenu::AddSeparator()
-{
-    Q_ASSERT(m_menu);
-    m_menu->addSeparator();
-}
-
-ActionManager::ActionWrapper DynamicMenu::AddAction(int id, const QString& name)
-{
-    QAction* action = new PatchedAction(name, this);
-    AddAction(id, action);
-    return ActionManager::ActionWrapper(action, m_actionManager);
-}
-
-void DynamicMenu::UpdateAllActions()
-{
-    for (auto action : m_menu->actions())
-    {
-        int id = action->data().toInt();
-        OnMenuUpdate(id, action);
-    }
-}
-
-void DynamicMenu::ShowMenu()
-{
-    if (m_actions.isEmpty())
-    {
-        CreateMenu();
-    }
-    UpdateAllActions();
-}
-
-void DynamicMenu::TriggerAction(int id)
-{
-    OnMenuChange(id, m_actions.value(id));
-    UpdateAllActions();
-}
-
-#include <QTimer>
-
-/////////////////////////////////////////////////////////////////////////////
-// ActionManager
-/////////////////////////////////////////////////////////////////////////////
-ActionManager::ActionManager(
-    MainWindow* parent, QtViewPaneManager* const qtViewPaneManager, ShortcutDispatcher* shortcutDispatcher)
-    : QObject(parent)
-    , m_mainWindow(parent)
-    , m_qtViewPaneManager(qtViewPaneManager)
-    , m_shortcutDispatcher(shortcutDispatcher)
-{
-    m_actionMapper = new QSignalMapper(this);
-    connect(m_actionMapper, SIGNAL(mapped(int)), this, SLOT(ActionTriggered(int)));
-
-    connect(m_qtViewPaneManager, &QtViewPaneManager::registeredPanesChanged, this, &ActionManager::RebuildRegisteredViewPaneIds);
-
-    // KDAB_TODO: This will be used later, particularly for the toolbars
-    //connect(QCoreApplication::eventDispatcher(), SIGNAL(aboutToBlock()),
-    //    this, SLOT(UpdateActions()));
-    // so long use a simple timer to make it work
-    QTimer* timer = new QTimer(this);
-    timer->setInterval(250);
-    connect(timer, &QTimer::timeout, this, &ActionManager::UpdateActions);
-    timer->start();
-
-    // connect to the Action Request Bus and notify other listeners this has happened
-    AzToolsFramework::EditorActionRequestBus::Handler::BusConnect();
-}
-
-ActionManager::~ActionManager()
-{
-    AzToolsFramework::EditorActionRequestBus::Handler::BusDisconnect();
-}
-
-void ActionManager::AddMenu(QMenu* menu)
-{
-    m_menus.push_back(menu);
-    connect(menu, &QMenu::aboutToShow, this, &ActionManager::UpdateMenu);
-}
-
-ActionManager::MenuWrapper ActionManager::AddMenu(const QString& title, const QString& menuId)
-{
-    const auto menu = new QMenu(title);
-
-    // set a unique identifier for this menu item so it
-    // can be looked up later using FindMenu()
-    if (!menuId.isEmpty())
-    {
-        menu->setProperty(s_menuIdProperty, menuId);
-    }
-
-    AddMenu(menu);
-
-    return MenuWrapper(menu, this);
-}
-
-ActionManager::MenuWrapper ActionManager::FindMenu(const QString& menuId)
-{
-    // attempt to find menu by menuId
-    auto menuIt = AZStd::find_if(m_menus.begin(), m_menus.end(), [&menuId](const QMenu* menu)
-    {
-        if (!menu->property(s_menuIdProperty).isNull())
-        {
-            return menu->property(s_menuIdProperty).toString() == menuId;
-        }
-
-        return false;
-    });
-
-    // return the menu with the matching name, if not found return nullptr
-    QMenu* menu = [this, menuIt, &menuId]() -> QMenu*
-    {
-        if (menuIt != m_menus.end())
-        {
-            return *menuIt;
-        }
-
-        AZ_Warning("ActionManager", false, "Did not find menu with menuId %s", menuId.toUtf8().data());
-        return nullptr;
-    }();
-
-    return MenuWrapper(menu, this);
-}
-
-void ActionManager::AddToolBar(QToolBar* toolBar)
-{
-    m_toolBars.push_back(toolBar);
-}
-
-ActionManager::ToolBarWrapper ActionManager::AddToolBar(int id)
-{
-    AmazonToolbar t = m_mainWindow->GetToolbarManager()->GetToolbar(id);
-    Q_ASSERT(t.IsInstantiated());
-
-    AddToolBar(t.Toolbar());
-    return ToolBarWrapper(t.Toolbar(), this);
-}
-
-bool ActionManager::eventFilter([[maybe_unused]] QObject* watched, QEvent* event)
-{
-    // if events are shortcut events, we don't want to filter out
-    if (event->type() == QEvent::Shortcut)
-    {
-        m_isShortcutEvent = true;
-    }
-
-    return false;
-}
-
-bool ActionManager::InsertActionExecuting(int id)
-{
-    // If the action handler puts up a modal dialog, the event queue will be pumped
-    // and double clicks on menu items will go through, in some cases.
-    // This is to guard against that.
-    if (m_executingIds.find(id) != m_executingIds.end())
-    {
-        return false;
-    }
-
-    m_executingIds.insert(id);
-    return true;
-}
-
-bool ActionManager::RemoveActionExecuting(int id)
-{
-    bool idWasInList = m_executingIds.remove(id);
-    Q_ASSERT(idWasInList);
-    return idWasInList;
-}
-
-
-void ActionManager::AddAction(int id, QAction* action)
-{
-    action->setData(id);
-    AddAction(action);
-}
-
-void ActionManager::AddAction(QAction* action)
-{
-    const int id = action->data().toInt();
-
-    if (m_actions.contains(id))
-    {
-        qWarning() << "ActionManager already contains action with id=" << id;
-        Q_ASSERT(false);
-    }
-
-    m_actions[id] = action;
-    connect(action, SIGNAL(triggered()), m_actionMapper, SLOT(map()));
-    m_actionMapper->setMapping(action, id);
-
-    action->installEventFilter(this);
-
-    // Add the action if the parent is a widget
-    auto widget = qobject_cast<QWidget*>(parent());
-    if (widget)
-    {
-        widget->addAction(action);
-    }
-}
-
-void ActionManager::RemoveAction(QAction* action)
-{
-    auto storedAction = m_actions.find(action->data().toInt());
-    if (storedAction != m_actions.end())
-    {
-        m_actions.remove(action->data().toInt());
-    }
-
-    action->removeEventFilter(this);
-    m_actionMapper->removeMappings(action);
-
-    if (auto widget = qobject_cast<QWidget*>(parent()))
-    {
-        widget->removeAction(action);
-    }
-}
-
-ActionManager::ActionWrapper ActionManager::AddAction(int id, const QString& name)
-{
-    QAction* action = ActionIsWidget(id) ? new WidgetAction(id, m_mainWindow, name, this)
-        : static_cast<QAction*>(new PatchedAction(name, this)); // static cast to base so ternary compiles
-    AddAction(id, action);
-    return ActionWrapper(action, this);
-}
-
-bool ActionManager::HasAction(QAction* action) const
-{
-    return action && HasAction(action->data().toInt());
-}
-
-bool ActionManager::HasAction(int id) const
-{
-    return m_actions.contains(id);
-}
-
-QAction* ActionManager::GetAction(int id) const
-{
-    auto it = m_actions.find(id);
-
-    if (it == m_actions.cend())
-    {
-        qWarning() << Q_FUNC_INFO << "Couldn't get action " << id;
-        Q_ASSERT(false);
-        return nullptr;
-    }
-    else
-    {
-        return *it;
-    }
-}
-
-void ActionManager::ActionTriggered(int id)
-{
-    if (m_mainWindow->menuBar()->isEnabled())
-    {
-        if (m_actionHandlers.contains(id))
-        {
-            ActionManagerExecutionGuard guard(this, id);
-
-            if (guard.CanExecute())
-            {
-                m_actionHandlers[id]();
-            }
-        }
-    }
-}
-
-void ActionManager::RebuildRegisteredViewPaneIds()
-{
-    QtViewPanes views = QtViewPaneManager::instance()->GetRegisteredPanes();
-
-    for (auto& view : views)
-    {
-        m_registeredViewPaneIds.insert(view.m_id);
-    }
-}
-
-// is this action suspended (allowed to respond or not)
-static bool ActionSuspended(const bool defaultActionsSuspended, const QAction* const action)
-{
-    // if default actions are suspended and this is not a reserved action, do not update
-    return defaultActionsSuspended && !action->property(s_reserved).toBool();
-}
-
-// for the menu that is about to be opened, visit each action (menu item) and
-// update callbacks for unsuspended actions.
-// recurse one level deep if the action is itself a menu, if all actions
-// in that menu are suspended, gray out the menu so it cannot be selected.
-static void UpdateMenus(
-    QMenu* menu, const bool defaultActionsSuspended,
-    QHash<int, std::function<void()>>& updateCallbacks,
-    QList<QAction*> topLevelMenuActions, int depth)
-{
-    const auto actions = menu->actions();
-    const int actionCount = actions.size();
-    int suspendedActionCounter =  0;
-
-    for (auto action : actions)
-    {
-        // if an action is itself a menu, we want to check its
-        // own menu actions (children), but only one level down
-        if (action->menu() && depth == 0)
-        {
-            UpdateMenus(
-                action->menu(), defaultActionsSuspended,
-                updateCallbacks, topLevelMenuActions, depth + 1);
-        }
-
-        if (ActionSuspended(defaultActionsSuspended, action))
-        {
-            suspendedActionCounter++;
-            continue;
-        }
-
-        // call all update callbacks for the given menu
-        // only do this at the level of the menu we clicked/hovered
-        const auto id = action->data().toInt();
-        if (updateCallbacks.contains(id) && depth == 0)
-        {
-            updateCallbacks.value(id)();
-        }
-    }
-
-    // check if we are a top level menu action
-    if (AZStd::find(
-        topLevelMenuActions.begin(), topLevelMenuActions.end(),
-        menu->menuAction()) == topLevelMenuActions.end())
-    {
-        // if we're not a top level menu action, we want to disable
-        // the sub menu if none of the child actions are active, otherwise
-        // ensure the menu is returned to an enabled state
-        menu->menuAction()->setEnabled(
-            defaultActionsSuspended
-                ? suspendedActionCounter != actionCount
-                : true);
-    }
-}
-
-void ActionManager::UpdateMenu()
-{
-    auto menu = qobject_cast<QMenu*>(sender());
-    AZ_Assert(menu, "sender() was not convertible to a QMenu*");
-
-    int depth = 0;
-    UpdateMenus(
-        menu, m_defaultActionsSuspended, m_updateCallbacks,
-        m_mainWindow->menuBar()->actions(), depth);
-}
-
-void ActionManager::UpdateActions()
-{
-    for (auto it = m_updateCallbacks.constBegin(); it != m_updateCallbacks.constEnd(); ++it)
-    {
-        if (ActionSuspended(m_defaultActionsSuspended, GetAction(it.key())))
-        {
-            continue;
-        }
-
-        it.value()();
-    }
-}
-
-QList<QAction*> ActionManager::GetActions() const
-{
-    return m_actions.values();
-}
-
-bool ActionManager::ActionIsWidget(int id) const
-{
-    return id >= ID_TOOLBAR_WIDGET_FIRST && id <= ID_TOOLBAR_WIDGET_LAST;
-}
-
-// either enable or disable all registered actions
-void SetDefaultActionsEnabled(
-    const QList<QAction*>& actions, const bool enabled)
-{
-    AZStd::for_each(
-        actions.begin(), actions.end(),
-        [enabled](QAction* action)
-    {
-        if (!action->property(s_reserved).toBool())
-        {
-            action->setEnabled(enabled);
-        }
-    });
-}
-
-void ActionManager::AddActionViaBus(int id, QAction* action)
-{
-    AddAction(id, action);
-}
-
-void ActionManager::RemoveActionViaBus(QAction* action)
-{
-    RemoveAction(action);
-}
-
-void ActionManager::EnableDefaultActions()
-{
-     SetDefaultActionsEnabled(GetActions(), true);
-     m_defaultActionsSuspended = false;
-}
-
-void ActionManager::DisableDefaultActions()
-{
-    SetDefaultActionsEnabled(GetActions(), false);
-    m_defaultActionsSuspended = true;
-}
-
-void ActionManager::AttachOverride(QWidget* object)
-{
-    m_shortcutDispatcher->AttachOverride(object);
-}
-
-void ActionManager::DetachOverride()
-{
-    m_shortcutDispatcher->DetachOverride();
-}
-
-WidgetAction::WidgetAction(int actionId, MainWindow* mainWindow, const QString& name, QObject* parent)
-    : QWidgetAction(parent)
-    , m_actionId(actionId)
-    , m_mainWindow(mainWindow)
-{
-    setText(name);
-}
-
-QWidget* WidgetAction::createWidget(QWidget* parent)
-{
-    QWidget* w = m_mainWindow->CreateToolbarWidget(m_actionId);
-    if (w)
-    {
-        w->setParent(parent);
-    }
-
-    return w;
-}
-
-#include <moc_ActionManager.cpp>
diff --git a/Code/Sandbox/Editor/ActionManager.h b/Code/Sandbox/Editor/ActionManager.h
deleted file mode 100644
index 01044c4b00..0000000000
--- a/Code/Sandbox/Editor/ActionManager.h
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#ifndef ACTIONMANAGER_H
-#define ACTIONMANAGER_H
-
-#if !defined(Q_MOC_RUN)
-#include <QObject>
-
-#include <QPointer>
-#include <QHash>
-#include <QVector>
-#include <QAction>
-#include <QMenu>
-#include <QToolBar>
-#include <QIcon>
-#include <QWidgetAction>
-
-#include <QSet>
-
-#include <functional>
-#include <utility>
-
-#include <AzToolsFramework/Viewport/ActionBus.h>
-#endif
-
-class QSignalMapper;
-class QPixmap;
-class QDockWidget;
-class DynamicMenu;
-class MainWindow;
-class QtViewPaneManager;
-class ShortcutDispatcher;
-
-class PatchedAction
-    : public QAction
-{
-    // PatchedAction is a workaround for the fact that Qt doesn't honour Qt::WindowShortcut context for floating dock widgets.
-
-    Q_OBJECT
-public:
-    explicit PatchedAction(const QString& name, QObject* parent = nullptr);
-    bool event(QEvent*) override;
-};
-
-
-class WidgetAction
-    : public QWidgetAction
-{
-    Q_OBJECT
-public:
-    explicit WidgetAction(int actionId, MainWindow* mainWindow, const QString& name, QObject* parent);
-protected:
-    QWidget* createWidget(QWidget* parent) override;
-private:
-    const int m_actionId;
-    MainWindow* const m_mainWindow;
-};
-
-class ActionManager;
-
-// If the action handler puts up a modal dialog, the event queue will be pumped
-// and double clicks on menu items will go through, in some cases.
-// This class can be used to guard against that.
-class ActionManagerExecutionGuard
-{
-public:
-    ActionManagerExecutionGuard(ActionManager* actionManager, QAction* action);
-    ActionManagerExecutionGuard(ActionManager* actionManager, int actionId);
-    ~ActionManagerExecutionGuard();
-
-    // Only execute the action of this returns true
-    bool CanExecute() const { return m_canExecute; }
-
-private:
-    QPointer<ActionManager> m_actionManager;
-    int m_actionId;
-    bool m_canExecute;
-};
-
-class ActionManager
-    : public QObject
-    , private AzToolsFramework::EditorActionRequestBus::Handler
-{
-    Q_OBJECT
-
-public:
-    class ActionWrapper
-    {
-    public:
-        ActionWrapper& SetText(const QString& text) { m_action->setText(text); return *this; }
-        ActionWrapper& SetIcon(const QIcon& icon) { m_action->setIcon(icon); return *this; }
-        ActionWrapper& SetIcon(const QPixmap& icon) { m_action->setIcon(QIcon(icon)); return *this; }
-        ActionWrapper& SetShortcut(const QString& shortcut) { m_action->setShortcut(shortcut); return *this; }
-        ActionWrapper& SetShortcut(const QKeySequence& shortcut) { m_action->setShortcut(shortcut); return *this; }
-        ActionWrapper& SetToolTip(const QString& toolTip) { m_action->setToolTip(toolTip); return *this; }
-        ActionWrapper& SetStatusTip(const QString& statusTip) { m_action->setStatusTip(statusTip); return *this; }
-        ActionWrapper& SetCheckable(bool value) { m_action->setCheckable(value); return *this; }
-        ActionWrapper& SetReserved(); // if reserved, the action should not be allowed to be disabled or overridden
-
-        //ActionWrapper &SetMenu(QMenu *menu) { m_action->setMenu(menu); return *this; }
-        //ActionWrapper &SetMenu(QMenu *menu) { m_action->setMenu(menu); return *this; }
-        template <typename Func1, typename Func2>
-        ActionWrapper& Connect(Func1 signal, Func2 slot)
-        {
-            // The ActionWrapper class is stack based usually so
-            // the lambda below can't use the this pointer.
-            // As a result, wrap the actionManager and the action in
-            // a QPointer, and capture them in the lambda
-            QPointer<ActionManager> actionManager = m_actionManager;
-            QPointer<QAction> action = m_action;
-
-            QObject::connect(m_action, signal, m_action, [action, actionManager, slot]()
-                {
-                    ActionManagerExecutionGuard guard(actionManager.data(), action.data());
-
-                    if (!GetIEditor()->IsInGameMode() && guard.CanExecute())
-                    {
-                        slot();
-                    }
-                });
-            return *this;
-        }
-
-        template <typename Func1, typename Object, typename Func2>
-        ActionWrapper& Connect(Func1 signal, Object* context, const Func2 slot, Qt::ConnectionType type = Qt::AutoConnection)
-        {
-            // The ActionWrapper class is stack based usually so
-            // the lambda below can't use the this pointer.
-            // As a result, wrap the actionManager and the action in
-            // a QPointer, and capture them in the lambda
-            QPointer<ActionManager> actionManager = m_actionManager;
-            QPointer<QAction> action = m_action;
-
-            QObject::connect(m_action, signal, context, [action, actionManager, context, slot]()
-                {
-                    ActionManagerExecutionGuard guard(actionManager.data(), action.data());
-
-                    if (!GetIEditor()->IsInGameMode() && guard.CanExecute())
-                    {
-                        (context->*slot)();
-                    }
-                }, type);
-
-            return *this;
-        }
-
-        ActionWrapper& SetMenu(DynamicMenu* menu);
-        ActionWrapper& SetApplyHoverEffect();
-
-        operator QAction*() const {
-            return m_action;
-        }
-        QAction* operator->() const { return m_action; }
-
-        template<typename T>
-        ActionWrapper& RegisterUpdateCallback(T* object, void (T::* method)(QAction*))
-        {
-            m_actionManager->RegisterUpdateCallback(m_action->data().toInt(), object, method);
-            return *this;
-        }
-
-        template<typename Fn>
-        ActionWrapper& RegisterUpdateCallback(Fn&& fn)
-        {
-            m_actionManager->RegisterUpdateCallback(m_action->data().toInt(), AZStd::forward<Fn>(fn));
-            return *this;
-        }
-
-    private:
-        friend ActionManager;
-        friend DynamicMenu;
-        ActionWrapper(QAction* action, ActionManager* am)
-            : m_action(action)
-            , m_actionManager(am) { Q_ASSERT(m_action); }
-
-        QAction* m_action;
-        ActionManager* m_actionManager;
-    };
-
-    class MenuWrapper
-    {
-    public:
-        MenuWrapper() = default;
-        MenuWrapper(QMenu* menu, ActionManager* am)
-            : m_menu(menu)
-            , m_actionManager(am) {}
-
-        MenuWrapper& SetTitle(const QString& text) { m_menu->setTitle(text); return *this; }
-        MenuWrapper& SetIcon(const QIcon& icon) { m_menu->setIcon(icon); return *this; }
-
-        QAction* AddAction(int id)
-        {
-            auto action = m_actionManager->GetAction(id);
-            Q_ASSERT(action);
-            m_menu->addAction(action);
-
-            return action;
-        }
-
-        QAction* AddSeparator()
-        {
-            return m_menu->addSeparator();
-        }
-
-        MenuWrapper AddMenu(const QString& name, const QString& menuId = QString())
-        {
-            auto menu = m_actionManager->AddMenu(name, menuId);
-            m_menu->addMenu(menu);
-            return menu;
-        }
-
-        bool isNull() const
-        {
-            return !m_menu;
-        }
-
-        operator QMenu*()
-        {
-            return m_menu;
-        }
-
-        QMenu* operator->()
-        {
-            return m_menu;
-        }
-
-        QMenu* Get()
-        {
-            return m_menu;
-        }
-
-    private:
-        friend ActionManager;
-
-        QPointer<QMenu> m_menu = nullptr;
-        ActionManager* m_actionManager = nullptr;
-    };
-
-    class ToolBarWrapper
-    {
-    public:
-        QAction* AddAction(int id)
-        {
-            auto action = m_actionManager->GetAction(id);
-            Q_ASSERT(action);
-            m_toolBar->addAction(action);
-
-            return action;
-        }
-
-        QAction* AddSeparator()
-        {
-            QAction* action = m_toolBar->addSeparator();
-
-            // For the Dnd to work:
-            action->setData(ID_TOOLBAR_SEPARATOR);
-            QWidget* w = m_toolBar->widgetForAction(action);
-            w->addAction(action);
-
-            return action;
-        }
-
-        void AddWidget(QWidget* widget)
-        {
-            m_toolBar->addWidget(widget);
-        }
-
-        operator QToolBar*() const {
-            return m_toolBar;
-        }
-        QToolBar* operator->() const { return m_toolBar; }
-
-    private:
-        friend ActionManager;
-        ToolBarWrapper(QToolBar* toolBar, ActionManager* am)
-            : m_toolBar(toolBar)
-            , m_actionManager(am) { Q_ASSERT(m_toolBar); }
-
-        QToolBar* m_toolBar;
-        ActionManager* m_actionManager;
-    };
-
-public:
-    explicit ActionManager(
-        MainWindow* parent, QtViewPaneManager* qtViewPaneManager,
-        ShortcutDispatcher* shortcutDispatcher);
-    ~ActionManager();
-    void AddMenu(QMenu* menu);
-    MenuWrapper AddMenu(const QString& title, const QString& menuId);
-    MenuWrapper FindMenu(const QString& menuId);
-    bool ActionIsWidget(int actionId) const;
-
-    void AddToolBar(QToolBar* toolBar);
-    ToolBarWrapper AddToolBar(int id);
-
-    void AddAction(QAction* action);
-    void AddAction(int id, QAction* action);
-    void RemoveAction(QAction* action);
-    ActionWrapper AddAction(int id, const QString& name);
-    bool HasAction(QAction*) const;
-    bool HasAction(int id) const;
-
-    QAction* GetAction(int id) const;
-    QList<QAction*> GetActions() const;
-
-    // AzToolsFramework::EditorActionRequests
-    void AddActionViaBus(int id, QAction* action) override;
-    void RemoveActionViaBus(QAction* action) override;
-    void EnableDefaultActions() override;
-    void DisableDefaultActions() override;
-    void AttachOverride(QWidget* object) override;
-    void DetachOverride() override;
-
-    template<typename T>
-    void RegisterUpdateCallback(int id, T* object, void (T::*method)(QAction*))
-    {
-        Q_ASSERT(m_actions.contains(id));
-        m_updateCallbacks[id] = [action = m_actions.value(id), object, method] { AZStd::invoke(method, object, action); };
-    }
-
-    template<typename Fn>
-    void RegisterUpdateCallback(int id, Fn&& fn)
-    {
-        Q_ASSERT(m_actions.contains(id));
-        m_updateCallbacks[id] = [action = m_actions.value(id), fn] { fn(action); };
-    }
-
-    template<typename T>
-    void RegisterActionHandler(int id, T method)
-    {
-        m_actionHandlers[id] = method;
-    }
-    template<typename T>
-    void RegisterActionHandler(int id, T* object, void (T::* method)())
-    {
-        m_actionHandlers[id] = std::bind(method, object);
-    }
-    template<typename T>
-    void RegisterActionHandler(int id, T* object, void (T::* method)(UINT))
-    {
-        m_actionHandlers[id] = std::bind(method, object, id);
-    }
-
-    bool eventFilter(QObject* watched, QEvent* event);
-
-    // returns false if the action was already inserted, indicating that the action should not be processed again
-    bool InsertActionExecuting(int id);
-
-    // returns true if the action was inserted with InsertActionExecuting previously
-    bool RemoveActionExecuting(int id);
-
-Q_SIGNALS:
-    void SendMetricsSignal(const char* viewPaneName, const char* openLocation);
-
-public slots:
-    void ActionTriggered(int id);
-
-private slots:
-    void UpdateMenu();
-    void UpdateActions();
-
-private:
-    QHash<int, QAction*> m_actions;
-    QVector<QMenu*> m_menus;
-    QVector<QToolBar*> m_toolBars;
-    QSignalMapper* m_actionMapper;
-    QHash<int, std::function<void()> > m_updateCallbacks;
-    QHash<int, std::function<void()> > m_actionHandlers;
-    MainWindow* const m_mainWindow;
-
-    QtViewPaneManager* m_qtViewPaneManager;
-    ShortcutDispatcher* m_shortcutDispatcher = nullptr;
-
-    // for sending shortcut metrics events
-    bool m_isShortcutEvent = false;
-
-    // for sending toolbar metrics events
-    QSet<int> m_editorToolbarIds;
-
-    // for sending main menu metrics events
-    QSet<int> m_registeredViewPaneIds;
-
-    // update the registered view pane Ids when the registered view pane list is modified
-    void RebuildRegisteredViewPaneIds();
-
-    // Guard against recursive actions being triggered by double clicks on menu items
-    // while modal dialogs are in the process of popping up
-    QSet<int> m_executingIds;
-
-    // have all default actions (not including reserved actions) been suspended
-    bool m_defaultActionsSuspended = false;
-};
-
-class DynamicMenu
-    : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit DynamicMenu(QObject* parent = nullptr);
-    void SetAction(QAction* action, ActionManager* am);
-    void SetParentMenu(QMenu* menu, ActionManager* am);
-
-protected:
-    virtual void CreateMenu() = 0;
-    virtual void OnMenuUpdate(int id, QAction* action) = 0;
-    virtual void OnMenuChange(int id, QAction* action) = 0;
-
-    void AddAction(int id, QAction* action);
-    ActionManager::ActionWrapper AddAction(int id, const QString& name);
-    void AddSeparator();
-
-    void UpdateAllActions();
-    ActionManager* m_actionManager;
-
-private slots:
-    void ShowMenu();
-    void TriggerAction(int id);
-
-private:
-    QAction* m_action;
-    QMenu* m_menu;
-    QSignalMapper* m_actionMapper;
-    QHash<int, QAction*> m_actions;
-};
-
-#endif // ACTIONMANAGER_H
diff --git a/Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.cpp b/Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.cpp
deleted file mode 100644
index 89be5ecaf1..0000000000
--- a/Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "AnimationBipedBoneNames.h"
-
-namespace EditorAnimationBones
-{
-    namespace Biped
-    {
-        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* 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* RightHeel = "Bip01 R Heel";
-        const char* RightToe[2] = { "Bip01 R Toe0", "Bip01 R Toe1" };
-    }
-}
diff --git a/Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.h b/Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.h
deleted file mode 100644
index e733a02e6e..0000000000
--- a/Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_ANIMATION_ANIMATIONBIPEDBONENAMES_H
-#define CRYINCLUDE_EDITOR_ANIMATION_ANIMATIONBIPEDBONENAMES_H
-#pragma once
-
-namespace EditorAnimationBones
-{
-    namespace Biped
-    {
-        extern const char* Pelvis;
-        extern const char* Head;
-        extern const char* Weapon;
-
-        extern const char* Spine[5];
-        extern const char* Neck[2];
-
-        extern const char* LeftEye;
-        extern const char* RightEye;
-
-        extern const char* LeftHeel;
-        extern const char* RightHeel;
-        extern const char* LeftToe[2];
-        extern const char* RightToe[2];
-    }
-}
-
-
-#endif // CRYINCLUDE_EDITOR_ANIMATION_ANIMATIONBIPEDBONENAMES_H
diff --git a/Code/Sandbox/Editor/Animation/SkeletonHierarchy.cpp b/Code/Sandbox/Editor/Animation/SkeletonHierarchy.cpp
deleted file mode 100644
index 67387d998b..0000000000
--- a/Code/Sandbox/Editor/Animation/SkeletonHierarchy.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-#include "SkeletonHierarchy.h"
-
-using namespace Skeleton;
-
-/*
-
-  CHierarchy
-
-*/
-
-CHierarchy::CHierarchy()
-{
-}
-
-CHierarchy::~CHierarchy()
-{
-}
-
-//
-
-uint32 CHierarchy::AddNode(const char* name, const QuatT& pose, int32 parent)
-{
-    int32 index = FindNodeIndexByName(name);
-
-    if (index < 0)
-    {
-        m_nodes.push_back(SNode());
-        index = int32(m_nodes.size() - 1);
-    }
-
-    m_nodes[index].name = name;
-    m_nodes[index].pose = pose;
-    m_nodes[index].parent = parent;
-    return uint32(index);
-}
-
-int32 CHierarchy::FindNodeIndexByName(const char* name) const
-{
-    uint32 count = uint32(m_nodes.size());
-    for (uint32 i = 0; i < count; ++i)
-    {
-        if (::_stricmp(m_nodes[i].name, name))
-        {
-            continue;
-        }
-
-        return i;
-    }
-
-    return -1;
-}
-
-const CHierarchy::SNode* CHierarchy::FindNode(const char* name) const
-{
-    int32 index = FindNodeIndexByName(name);
-    return index < 0 ? NULL : &m_nodes[index];
-}
-
-void CHierarchy::CreateFrom(IDefaultSkeleton* pIDefaultSkeleton)
-{
-    const uint32 jointCount = pIDefaultSkeleton->GetJointCount();
-
-    m_nodes.clear();
-    m_nodes.reserve(jointCount);
-    for (uint32 i = 0; i < jointCount; ++i)
-    {
-        m_nodes.push_back(SNode());
-
-        m_nodes.back().name = pIDefaultSkeleton->GetJointNameByID(int32(i));
-        m_nodes.back().pose = pIDefaultSkeleton->GetDefaultAbsJointByID(int32(i));
-
-        m_nodes.back().parent = pIDefaultSkeleton->GetJointParentIDByID(int32(i));
-    }
-
-    ValidateReferences();
-}
-
-void CHierarchy::ValidateReferences()
-{
-    uint32 nodeCount = m_nodes.size();
-    if (!nodeCount)
-    {
-        return;
-    }
-
-    for (uint32 i = 0; i < nodeCount; ++i)
-    {
-        if (m_nodes[i].parent < nodeCount)
-        {
-            continue;
-        }
-
-        m_nodes[i].parent = -1;
-    }
-}
-
-void CHierarchy::AbsoluteToRelative(const QuatT* pSource, QuatT* pDestination)
-{
-    uint32 count = uint32(m_nodes.size());
-    std::vector<QuatT> absolutes(count);
-    for (uint32 i = 0; i < count; ++i)
-    {
-        absolutes[i] = pSource[i];
-    }
-
-    for (uint32 i = 0; i < count; ++i)
-    {
-        int32 parent = m_nodes[i].parent;
-        if (parent < 0)
-        {
-            pDestination[i] = absolutes[i];
-            continue;
-        }
-
-        pDestination[i].t = (absolutes[i].t - absolutes[parent].t) * absolutes[parent].q;
-        pDestination[i].q = absolutes[parent].q.GetInverted() * absolutes[i].q;
-    }
-}
-
-bool CHierarchy::SerializeTo(XmlNodeRef& node)
-{
-    XmlNodeRef hierarchy = node->newChild("Hierarchy");
-
-    uint32 nodeCount = uint32(m_nodes.size());
-    std::vector<IXmlNode*> nodes(nodeCount);
-    for (uint32 i = 0; i < nodeCount; ++i)
-    {
-        XmlNodeRef parent = hierarchy;
-        if (m_nodes[i].parent > -1)
-        {
-            parent = nodes[m_nodes[i].parent];
-        }
-
-        nodes[i] = parent->newChild("Node");
-        nodes[i]->setAttr("name", m_nodes[i].name);
-    }
-
-    return true;
-}
diff --git a/Code/Sandbox/Editor/Animation/SkeletonHierarchy.h b/Code/Sandbox/Editor/Animation/SkeletonHierarchy.h
deleted file mode 100644
index 99f54e1b84..0000000000
--- a/Code/Sandbox/Editor/Animation/SkeletonHierarchy.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
-#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
-#pragma once
-
-namespace Skeleton {
-    class CHierarchy
-        : public _reference_target_t
-    {
-    public:
-        struct SNode
-        {
-            string name;
-            QuatT pose;
-
-            int32 parent;
-
-            /* TODO: Implement
-                    uint32 childrenIndex;
-                    uint32 childrenCount;
-            */
-        };
-
-    public:
-        CHierarchy();
-        ~CHierarchy();
-
-    public:
-        uint32 AddNode(const char* name, const QuatT& pose, int32 parent = -1);
-        uint32 GetNodeCount() const { return uint32(m_nodes.size()); }
-        SNode* GetNode(uint32 index) { return &m_nodes[index]; }
-        const SNode* GetNode(uint32 index) const { return &m_nodes[index]; }
-        int32 FindNodeIndexByName(const char* name) const;
-        const SNode* FindNode(const char* name) const;
-        void ClearNodes() { m_nodes.clear(); }
-
-        void CreateFrom(IDefaultSkeleton* rIDefaultSkeleton);
-        void ValidateReferences();
-
-        void AbsoluteToRelative(const QuatT* pSource, QuatT* pDestination);
-
-        bool SerializeTo(XmlNodeRef& node);
-
-    private:
-        std::vector<SNode> m_nodes;
-    };
-} // namespace Skeleton
-
-#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
diff --git a/Code/Sandbox/Editor/Animation/SkeletonMapper.cpp b/Code/Sandbox/Editor/Animation/SkeletonMapper.cpp
deleted file mode 100644
index 610e707a01..0000000000
--- a/Code/Sandbox/Editor/Animation/SkeletonMapper.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SkeletonMapper.h"
-
-using namespace Skeleton;
-
-/*
-
-  CMapper
-
-*/
-
-CMapper::CMapper()
-{
-}
-
-CMapper::~CMapper()
-{
-}
-
-//
-
-void CMapper::CreateFromHierarchy()
-{
-    m_nodes.clear();
-
-    uint32 nodeCount = m_hierarchy.GetNodeCount();
-    m_nodes.resize(nodeCount);
-}
-
-//
-
-uint32 CMapper::CreateLocation(const char* name)
-{
-    int32 index = FindLocation(name);
-    if (index < 1)
-    {
-        CMapperLocation* pLocation = new CMapperLocation();
-        pLocation->SetName(name);
-        m_locations.push_back(pLocation);
-    }
-    return uint32(m_locations.size() - 1);
-}
-
-void CMapper::ClearLocations()
-{
-    uint32 count = uint32(m_nodes.size());
-    for (uint32 i = 0; i < count; ++i)
-    {
-        m_nodes[i].position = NULL;
-        m_nodes[i].orientation = NULL;
-    }
-
-    m_locations.clear();
-}
-
-int32 CMapper::FindLocation(const char* name) const
-{
-    uint32 count = uint32(m_locations.size());
-    for (uint32 i = 0; i < count; ++i)
-    {
-        if (::_stricmp(m_locations[i]->GetName(), name))
-        {
-            continue;
-        }
-
-        return int32(i);
-    }
-
-    return -1;
-}
-
-void CMapper::SetLocation(CMapperLocation& location)
-{
-    int32 index = FindLocation(location.GetName());
-    if (index < 0)
-    {
-        m_locations.push_back(&location);
-        return;
-    }
-
-    m_locations[index] = &location;
-}
-
-//
-
-bool CMapper::CreateLocationsHierarchy(uint32 index, CHierarchy& hierarchy, int32 hierarchyParent)
-{
-    if (NodeHasLocation(index))
-    {
-        const CHierarchy::SNode* pNode = m_hierarchy.GetNode(index);
-        uint32 nodeIndex = hierarchy.AddNode(pNode->name, pNode->pose, hierarchyParent);
-        hierarchyParent = uint32(nodeIndex);
-    }
-
-    std::vector<uint32> children;
-    GetChildrenIndices(index, children);
-    uint32 childCount = uint32(children.size());
-    for (uint32 i = 0; i < childCount; ++i)
-    {
-        CreateLocationsHierarchy(children[i], hierarchy, hierarchyParent);
-    }
-
-    return hierarchy.GetNodeCount() != 0;
-}
-
-bool CMapper::CreateLocationsHierarchy(CHierarchy& hierarchy)
-{
-    hierarchy.ClearNodes();
-    if (!CreateLocationsHierarchy(0, hierarchy, -1))
-    {
-        return false;
-    }
-
-    hierarchy.ValidateReferences();
-    return true;
-}
-
-void CMapper::Map(QuatT* pResult)
-{
-    uint32 outputCount = m_hierarchy.GetNodeCount();
-    std::vector<Quat> absolutes(outputCount);
-    for (uint32 i = 0; i < outputCount; ++i)
-    {
-        pResult[i].SetIdentity();
-        absolutes[i].SetIdentity();
-
-        CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
-        if (!pNode)
-        {
-            continue;
-        }
-
-        CHierarchy::SNode* pParent = pNode->parent < 0 ?
-            NULL : m_hierarchy.GetNode(pNode->parent);
-        if (pParent)
-        {
-            pResult[i].t =
-                (pNode->pose.t - pParent->pose.t) * pParent->pose.q;
-        }
-
-        if (m_nodes[i].position)
-        {
-            pResult[i].t = m_nodes[i].position->Compute().t;
-        }
-
-        if (m_nodes[i].orientation)
-        {
-            absolutes[i] = m_nodes[i].orientation->Compute().q;
-        }
-        else if (pParent)
-        {
-            Quat relative = pParent->pose.q.GetInverted() * pNode->pose.q;
-            absolutes[i] = absolutes[pNode->parent] * relative;
-        }
-    }
-
-    for (uint32 i = 0; i < outputCount; ++i)
-    {
-        CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
-        if (!pNode)
-        {
-            continue;
-        }
-
-        CHierarchy::SNode* pParent = pNode->parent < 0 ?
-            NULL : m_hierarchy.GetNode(pNode->parent);
-        if (!pParent)
-        {
-            pResult[i].q = absolutes[i];
-            continue;
-        }
-
-        pResult[i].q = absolutes[i];
-        if (!m_nodes[i].position)
-        {
-            pResult[i].t = pResult[pNode->parent].t +
-                pResult[i].t * absolutes[pNode->parent].GetInverted();
-        }
-    }
-}
-
-//
-
-bool CMapper::NodeHasLocation(uint32 index)
-{
-    if (CMapperOperator* pOperator = m_nodes[index].position)
-    {
-        if (pOperator->IsOfClass("Location"))
-        {
-            return true;
-        }
-        if (pOperator->HasLinksOfClass("Location"))
-        {
-            return true;
-        }
-    }
-
-    if (CMapperOperator* pOperator = m_nodes[index].orientation)
-    {
-        if (pOperator->IsOfClass("Location"))
-        {
-            return true;
-        }
-        if (pOperator->HasLinksOfClass("Location"))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void CMapper::GetChildrenIndices(uint32 parent, std::vector<uint32>& children)
-{
-    uint32 nodeCount = m_hierarchy.GetNodeCount();
-    for (uint32 i = 0; i < nodeCount; ++i)
-    {
-        if (m_hierarchy.GetNode(i)->parent != parent)
-        {
-            continue;
-        }
-
-        children.push_back(i);
-    }
-}
-
-bool CMapper::ChildrenHaveLocation(uint32 index)
-{
-    std::vector<uint32> children;
-    GetChildrenIndices(index, children);
-
-    uint32 childrenCount = uint32(children.size());
-    for (uint32 i = 0; i < childrenCount; ++i)
-    {
-        if (ChildrenHaveLocation(children[i]))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool CMapper::NodeOrChildrenHaveLocation(uint32 index)
-{
-    if (NodeHasLocation(index))
-    {
-        return true;
-    }
-
-    std::vector<uint32> children;
-    GetChildrenIndices(index, children);
-
-    uint32 childrenCount = uint32(children.size());
-    for (uint32 i = 0; i < childrenCount; ++i)
-    {
-        if (NodeOrChildrenHaveLocation(children[i]))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool CMapper::SerializeTo(XmlNodeRef& node)
-{
-    XmlNodeRef hierarchy = node->newChild("Hierarchy");
-
-    uint32 nodeCount = GetNodeCount();
-    std::vector<IXmlNode*> nodes(nodeCount);
-    for (uint32 i = 0; i < nodeCount; ++i)
-    {
-        if (!NodeOrChildrenHaveLocation(i))
-        {
-            continue;
-        }
-
-        CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
-        if (!pNode)
-        {
-            return false;
-        }
-
-        XmlNodeRef xmlParent = hierarchy;
-        int32 parent = pNode->parent;
-        if (parent > -1)
-        {
-            xmlParent = nodes[parent];
-        }
-
-        nodes[i] = xmlParent->newChild("Node");
-        nodes[i]->setAttr("name", pNode->name);
-
-        if (CMapperOperator* pOperator = m_nodes[i].position)
-        {
-            XmlNodeRef position = nodes[i]->newChild("Position");
-            XmlNodeRef child = position->newChild("Operator");
-            if (!pOperator->SerializeWithLinksTo(child))
-            {
-                return false;
-            }
-        }
-
-        if (CMapperOperator* pOperator = m_nodes[i].orientation)
-        {
-            XmlNodeRef orientation = nodes[i]->newChild("Orientation");
-            XmlNodeRef child = orientation->newChild("Operator");
-            if (!pOperator->SerializeWithLinksTo(child))
-            {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-bool CMapper::SerializeFrom(XmlNodeRef& node, int32 parent)
-{
-    int childCount = uint32(node->getChildCount());
-    for (int i = 0; i < childCount; ++i)
-    {
-        XmlNodeRef child = node->getChild(i);
-        if (::_stricmp(child->getTag(), "Node"))
-        {
-            continue;
-        }
-
-        uint32 index = m_hierarchy.AddNode(child->getAttr("name"), QuatT(IDENTITY), parent);
-        if (!SerializeFrom(child, int32(index)))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool CMapper::SerializeFrom(XmlNodeRef& node)
-{
-    XmlNodeRef hierarchy = node->findChild("Hierarchy");
-    if (!hierarchy)
-    {
-        return false;
-    }
-
-    m_hierarchy.ClearNodes();
-
-    if (!SerializeFrom(hierarchy, -1))
-    {
-        return false;
-    }
-
-    m_nodes.resize(m_hierarchy.GetNodeCount());
-
-    return true;
-}
diff --git a/Code/Sandbox/Editor/Animation/SkeletonMapper.h b/Code/Sandbox/Editor/Animation/SkeletonMapper.h
deleted file mode 100644
index cc5a2ec69d..0000000000
--- a/Code/Sandbox/Editor/Animation/SkeletonMapper.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
-#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
-#pragma once
-
-
-#include "SkeletonHierarchy.h"
-#include "SkeletonMapperOperator.h"
-
-namespace Skeleton {
-    class CMapper
-    {
-    public:
-        struct SNode
-        {
-            _smart_ptr<CMapperOperator> position;
-            _smart_ptr<CMapperOperator> orientation;
-        };
-
-    public:
-        CMapper();
-        ~CMapper();
-
-    public:
-        CHierarchy& GetHierarchy() { return m_hierarchy; }
-        void CreateFromHierarchy();
-
-        uint32 GetNodeCount() const { return uint32(m_nodes.size()); }
-        SNode* GetNode(uint32 index) { return &m_nodes[index]; }
-        const SNode* GetNode(uint32 index) const { return &m_nodes[index]; }
-
-        uint32 CreateLocation(const char* name);
-        void ClearLocations();
-        int32 FindLocation(const char* name) const;
-
-        uint32 GetLocationCount() const { return uint32(m_locations.size()); }
-        void SetLocation(CMapperLocation& location);
-        CMapperLocation* GetLocation(uint32 index) { return m_locations[index]; }
-        const CMapperLocation* GetLocation(uint32 index)  const { return m_locations[index]; }
-
-        bool CreateLocationsHierarchy(CHierarchy& hierarchy);
-
-        void Map(QuatT* pResult);
-
-        bool SerializeTo(XmlNodeRef& node);
-        bool SerializeFrom(XmlNodeRef& node);
-
-    private:
-        bool NodeHasLocation(uint32 index);
-        bool ChildrenHaveLocation(uint32 index);
-        bool NodeOrChildrenHaveLocation(uint32 index);
-
-        bool SerializeFrom(XmlNodeRef& node, int32 parent);
-
-        bool CreateLocationsHierarchy(uint32 index, CHierarchy& hierarchy, int32 hierarchyParent = -1);
-
-        // TEMP
-        void GetChildrenIndices(uint32 parent, std::vector<uint32>& children);
-
-    private:
-        CHierarchy m_hierarchy;
-        std::vector<_smart_ptr<CMapperLocation> > m_locations;
-
-        std::vector<SNode> m_nodes;
-    };
-} // namespace Skeleton
-
-#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
diff --git a/Code/Sandbox/Editor/Animation/SkeletonMapperOperator.cpp b/Code/Sandbox/Editor/Animation/SkeletonMapperOperator.cpp
deleted file mode 100644
index f528d336c4..0000000000
--- a/Code/Sandbox/Editor/Animation/SkeletonMapperOperator.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SkeletonMapperOperator.h"
-
-using namespace Skeleton;
-
-/*
-
-  CMapperOperatorDesc
-
-*/
-
-std::vector<CMapperOperatorDesc*> CMapperOperatorDesc::s_descs;
-
-//
-
-CMapperOperatorDesc::CMapperOperatorDesc(const char* name)
-{
-    s_descs.push_back(this);
-}
-
-/*
-
-  CMapperOperator
-
-*/
-
-CMapperOperator::CMapperOperator(const char* className, uint32 positionCount, uint32 orientationCount)
-{
-    m_className = className;
-    m_position.resize(positionCount, NULL);
-    m_orientation.resize(orientationCount, NULL);
-}
-
-CMapperOperator::~CMapperOperator()
-{
-}
-
-//
-
-bool CMapperOperator::IsOfClass(const char* className)
-{
-    if (::_stricmp(m_className, className))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-uint32 CMapperOperator::HasLinksOfClass(const char* className)
-{
-    uint32 count = 0;
-
-    uint32 positionCount = m_position.size();
-    for (uint32 i = 0; i < positionCount; ++i)
-    {
-        CMapperOperator* pOperator = m_position[i];
-        if (!pOperator)
-        {
-            continue;
-        }
-
-        if (pOperator->IsOfClass(className))
-        {
-            ++count;
-        }
-    }
-
-    uint32 orientationCount = m_orientation.size();
-    for (uint32 i = 0; i < orientationCount; ++i)
-    {
-        CMapperOperator* pOperator = m_orientation[i];
-        if (!pOperator)
-        {
-            continue;
-        }
-
-        if (pOperator->IsOfClass(className))
-        {
-            ++count;
-        }
-    }
-
-    return count;
-}
-
-//
-
-bool CMapperOperator::SerializeTo(XmlNodeRef& node)
-{
-    node->setAttr("class", m_className);
-
-    uint32 parameterCount = uint32(m_parameters.size());
-    for (uint32 i = 0; i < parameterCount; ++i)
-    {
-        m_parameters[i]->Serialize(node, false);
-    }
-
-    return true;
-}
-
-bool CMapperOperator::SerializeFrom(XmlNodeRef& node)
-{
-    uint32 parameterCount = uint32(m_parameters.size());
-    for (uint32 i = 0; i < parameterCount; ++i)
-    {
-        m_parameters[i]->Serialize(node, true);
-    }
-
-    return true;
-}
-
-bool CMapperOperator::SerializeWithLinksTo(XmlNodeRef& node)
-{
-    if (!SerializeTo(node))
-    {
-        return false;
-    }
-
-    uint32 positionCount = uint32(m_position.size());
-    for (uint32 i = 0; i < positionCount; ++i)
-    {
-        CMapperOperator* pOperator = m_position[i];
-        if (!pOperator)
-        {
-            continue;
-        }
-
-        XmlNodeRef position = node->newChild("Position");
-        position->setAttr("index", i);
-
-        XmlNodeRef child = position->newChild("Operator");
-        if (!pOperator->SerializeWithLinksTo(child))
-        {
-            return false;
-        }
-    }
-
-    uint32 orientationCount = uint32(m_orientation.size());
-    for (uint32 i = 0; i < orientationCount; ++i)
-    {
-        CMapperOperator* pOperator = m_orientation[i];
-        if (!pOperator)
-        {
-            continue;
-        }
-
-        XmlNodeRef orientation = node->newChild("Orientation");
-        orientation->setAttr("index", i);
-
-        XmlNodeRef child = orientation->newChild("Operator");
-        if (!pOperator->SerializeWithLinksTo(child))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool CMapperOperator::SerializeWithLinksFrom(XmlNodeRef& node)
-{
-    if (!SerializeFrom(node))
-    {
-        return false;
-    }
-
-    return true;
-}
-/*
-
-  CMapperOperator_Transform
-
-*/
-
-class CMapperOperator_Transform
-    : public CMapperOperator
-{
-public:
-    CMapperOperator_Transform()
-        : CMapperOperator("Transform", 1, 1)
-    {
-        m_pAngles = new CVariable<Vec3>();
-        m_pAngles->SetName("rotation");
-        m_pAngles->Set(Vec3(0.0f, 0.0f, 0.0f));
-        m_pAngles->SetLimits(-180.0f, 180.0f);
-        AddParameter(*m_pAngles);
-
-        m_pVector = new CVariable<Vec3>();
-        m_pVector->SetName("vector");
-        m_pVector->Set(Vec3(0.0f, 0.0f, 0.0f));
-        AddParameter(*m_pVector);
-
-        m_pScale = new CVariable<Vec3>();
-        m_pScale->SetName("scale");
-        m_pScale->Set(Vec3(1.0f, 1.0f, 1.0f));
-        AddParameter(*m_pScale);
-    }
-
-    // CMapperOperator
-public:
-    virtual QuatT CMapperOperator_Transform::Compute()
-    {
-        QuatT result(IDENTITY);
-        m_pVector->Get(result.t);
-
-        Vec3 scale;
-        m_pScale->Get(scale);
-
-        Vec3 angles;
-        m_pAngles->Get(angles);
-
-        result.q = Quat::CreateRotationXYZ(
-                Ang3(DEG2RAD(angles.x), DEG2RAD(angles.y), DEG2RAD(angles.z)));
-
-        if (CMapperOperator* pOperator = GetPosition(0))
-        {
-            result.t = pOperator->Compute().t.CompMul(scale) + result.t;
-        }
-        if (CMapperOperator* pOperator = GetOrientation(0))
-        {
-            result.q = pOperator->Compute().q * result.q;
-        }
-        return result;
-    }
-
-private:
-    CVariable<Vec3>* m_pVector;
-    CVariable<Vec3>* m_pAngles;
-    CVariable<Vec3>* m_pScale;
-};
-
-SkeletonMapperOperatorRegister(Transform, CMapperOperator_Transform)
-
-class CMapperOperator_PositionsToOrientation
-    : public CMapperOperator
-{
-public:
-    CMapperOperator_PositionsToOrientation()
-        : CMapperOperator("PositionsToOrientation", 3, 0)
-    {
-    }
-
-    // CMapperOperator
-public:
-    virtual QuatT Compute()
-    {
-        CMapperOperator* pOperator0 = GetPosition(0);
-        CMapperOperator* pOperator1 = GetPosition(1);
-        CMapperOperator* pOperator2 = GetPosition(2);
-        if (!pOperator0 || !pOperator1 || !pOperator2)
-        {
-            return QuatT(IDENTITY);
-        }
-
-        Vec3 p0 = pOperator0->Compute().t;
-        Vec3 p1 = pOperator1->Compute().t;
-        Vec3 p2 = pOperator2->Compute().t;
-
-        Vec3 m = (p1 + p2) * 0.5f;
-        Vec3 y = (m - p0).GetNormalized();
-        Vec3 z = (p1 - p2).GetNormalized();
-        Vec3 x = y % z;
-        z = x % y;
-
-        Matrix33 m33;
-        m33.SetFromVectors(x, y, z);
-        QuatT result(IDENTITY);
-        result.q = Quat(m33);
-        return result;
-    }
-};
-
-SkeletonMapperOperatorRegister(PositionsToOrientation, CMapperOperator_PositionsToOrientation)
diff --git a/Code/Sandbox/Editor/Animation/SkeletonMapperOperator.h b/Code/Sandbox/Editor/Animation/SkeletonMapperOperator.h
deleted file mode 100644
index 42e979bcaf..0000000000
--- a/Code/Sandbox/Editor/Animation/SkeletonMapperOperator.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPEROPERATOR_H
-#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPEROPERATOR_H
-#pragma once
-
-
-#include "../Util/Variable.h"
-
-#undef GetClassName
-
-#define SkeletonMapperOperatorRegister(name, className)               \
-    class CMapperOperatorDesc_##name                                  \
-        : public CMapperOperatorDesc                                  \
-    {                                                                 \
-    public:                                                           \
-        CMapperOperatorDesc_##name()                                  \
-            : CMapperOperatorDesc(#name) { }                          \
-    protected:                                                        \
-        virtual const char* GetName() { return #name; }               \
-        virtual CMapperOperator* Create() { return new className(); } \
-    } mapperOperatorDesc__##name;
-
-namespace Skeleton {
-    class CMapperOperator;
-
-    class CMapperOperatorDesc
-    {
-    public:
-        static uint32 GetCount() { return uint32(s_descs.size()); }
-        static const char* GetName(uint32 index) { return s_descs[index]->GetName(); }
-        static CMapperOperator* Create(uint32 index) { return s_descs[index]->Create(); }
-
-    private:
-        static std::vector<CMapperOperatorDesc*> s_descs;
-
-    public:
-        CMapperOperatorDesc(const char* name);
-
-    protected:
-        virtual const char* GetName() = 0;
-        virtual CMapperOperator* Create() = 0;
-    };
-
-    class CMapperOperator
-        : public _reference_target_t
-    {
-    protected:
-        CMapperOperator(const char* className, uint32 positionCount, uint32 orientationCount);
-        ~CMapperOperator();
-
-    public:
-        const char* GetClassName() { return m_className; }
-
-        uint32 GetPositionCount() const { return uint32(m_position.size()); }
-        void SetPosition(uint32 index, CMapperOperator* pOperator) { m_position[index] = pOperator; }
-        CMapperOperator* GetPosition(uint32 index) { return m_position[index]; }
-
-        uint32 GetOrientationCount() const { return uint32(m_orientation.size()); }
-        void SetOrientation(uint32 index, CMapperOperator* pOperator) { m_orientation[index] = pOperator; }
-        CMapperOperator* GetOrientation(uint32 index) { return m_orientation[index]; }
-
-        uint32 GetParameterCount() { return uint32(m_parameters.size()); }
-        IVariable* GetParameter(uint32 index) { return m_parameters[index]; }
-
-        bool IsOfClass(const char* className);
-        uint32 HasLinksOfClass(const char* className);
-
-        bool SerializeTo(XmlNodeRef& node);
-        bool SerializeFrom(XmlNodeRef& node);
-
-        bool SerializeWithLinksTo(XmlNodeRef& node);
-        bool SerializeWithLinksFrom(XmlNodeRef& node);
-
-    protected:
-        void AddParameter(IVariable& variable) { m_parameters.push_back(&variable); }
-
-    public:
-        virtual QuatT Compute() = 0;
-
-    private:
-        const char* m_className;
-        std::vector<_smart_ptr<CMapperOperator> > m_position;
-        std::vector<_smart_ptr<CMapperOperator> > m_orientation;
-
-        std::vector<IVariablePtr> m_parameters;
-    };
-
-    class CMapperLocation
-        : public CMapperOperator
-    {
-    public:
-        CMapperLocation()
-            : CMapperOperator("Location", 0, 0)
-        {
-            m_pName = new CVariable<CString>();
-            m_pName->SetName("name");
-            m_pName->SetFlags(m_pName->GetFlags() | IVariable::UI_INVISIBLE);
-            AddParameter(*m_pName);
-
-            m_pAxis = new CVariable<Vec3>();
-            m_pAxis->SetName("axis");
-            m_pAxis->SetLimits(-3.0f, +3.0f);
-            m_pAxis->Set(Vec3(1.0f, 2.0f, 3.0f));
-            AddParameter(*m_pAxis);
-
-            m_location = QuatT(IDENTITY);
-        }
-
-    public:
-        void SetName(const char* name) { m_pName->Set(name); }
-        CString GetName() const { CString s; m_pName->Get(s); return s; }
-
-        void SetLocation(const QuatT& location) { m_location = location; }
-        const QuatT& GetLocation() const { return m_location; }
-
-        // CMapperOperator
-    public:
-        virtual QuatT Compute()
-        {
-            Vec3 axis;
-            m_pAxis->Get(axis);
-
-            uint32 x = fabs_tpl(axis.x);
-            uint32 y = fabs_tpl(axis.y);
-            uint32 z = fabs_tpl(axis.z);
-            if (x < 1 || y < 1 || z < 1 ||
-                x > 3 || y > 3 || y > 3 ||
-                x == y || x == z || y == z)
-            {
-                return QuatT(IDENTITY);
-            }
-
-            Matrix33 matrix;
-            matrix.SetFromVectors(
-                m_location.q.GetColumn(x - 1) * f32(::sgn(axis.x)),
-                m_location.q.GetColumn(y - 1) * f32(::sgn(axis.y)),
-                m_location.q.GetColumn(z - 1) * f32(::sgn(axis.z)));
-            if (!matrix.IsOrthonormalRH(0.01f))
-            {
-                return QuatT(IDENTITY);
-            }
-
-            QuatT result = m_location;
-            result.q = Quat(matrix);
-            return result;
-        }
-
-    private:
-        CVariable<CString>* m_pName;
-        CVariable<Vec3>* m_pAxis;
-
-        QuatT m_location;
-    };
-} // namespace Skeleton
-
-#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPEROPERATOR_H
diff --git a/Code/Sandbox/Editor/AnimationContext.cpp b/Code/Sandbox/Editor/AnimationContext.cpp
deleted file mode 100644
index 3d740fca2c..0000000000
--- a/Code/Sandbox/Editor/AnimationContext.cpp
+++ /dev/null
@@ -1,816 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "AnimationContext.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Bus/EditorSequenceBus.h>
-
-// Editor
-#include "TrackView/TrackViewDialog.h"
-#include "RenderViewport.h"
-#include "ViewManager.h"
-#include "Objects/SelectionGroup.h"
-#include "Include/IObjectManager.h"
-#include "Objects/EntityObject.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Movie Callback.
-//////////////////////////////////////////////////////////////////////////
-class CMovieCallback
-    : public IMovieCallback
-{
-protected:
-    virtual void OnMovieCallback(ECallbackReason reason, [[maybe_unused]] IAnimNode* pNode)
-    {
-        switch (reason)
-        {
-        case CBR_CHANGENODE:
-            // Invalidate nodes
-            break;
-        case CBR_CHANGETRACK:
-        {
-            // Invalidate tracks
-            CTrackViewDialog* pTrackViewDialog = CTrackViewDialog::GetCurrentInstance();
-            if (pTrackViewDialog)
-            {
-                pTrackViewDialog->InvalidateDopeSheet();
-            }
-        }
-        break;
-        }
-    }
-
-    void OnSetCamera(const SCameraParams& Params)
-    {
-        // Only switch camera when in Play mode.
-        GUID camObjId = GUID_NULL;
-        if (Params.cameraEntityId.IsValid())
-        {
-            // Find owner editor entity.
-            CEntityObject* pEditorEntity = CEntityObject::FindFromEntityId(Params.cameraEntityId);
-            if (pEditorEntity)
-            {
-                camObjId = pEditorEntity->GetId();
-            }
-
-            CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
-            if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(pViewport))
-            {
-                if (!rvp->IsSequenceCamera())
-                {
-                    return;
-                }
-            }
-        }
-
-        // Switch camera in active rendering view.
-        if (GetIEditor()->GetViewManager())
-        {
-            GetIEditor()->GetViewManager()->SetCameraObjectId(camObjId);
-        }
-    };
-
-    bool IsSequenceCamUsed() const
-    {
-        if (gEnv->IsEditorGameMode() == true)
-        {
-            return true;
-        }
-
-        if (GetIEditor()->GetViewManager() == NULL)
-        {
-            return false;
-        }
-
-        CViewport* pRendView = GetIEditor()->GetViewManager()->GetViewport(ET_ViewportCamera);
-        if (pRendView)
-        {
-            return pRendView->IsSequenceCamera();
-        }
-
-        return false;
-    }
-};
-
-static CMovieCallback s_movieCallback;
-
-//////////////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//!
-class CAnimationContextPostRender
-    : public IPostRenderer
-{
-public:
-    CAnimationContextPostRender(CAnimationContext* pAC)
-        : m_pAC(pAC){}
-
-    void OnPostRender() const { assert(m_pAC); m_pAC->OnPostRender(); }
-
-protected:
-    CAnimationContext* m_pAC;
-};
-
-//////////////////////////////////////////////////////////////////////////
-CAnimationContext::CAnimationContext()
-{
-    m_paused = 0;
-    m_playing = false;
-    m_recording = false;
-    m_bSavedRecordingState = false;
-    m_timeRange.Set(0, 0);
-    m_timeMarker.Set(0, 0);
-    m_currTime = 0.0f;
-    m_lastTimeChangedNotificationTime = .0f;
-    m_bForceUpdateInNextFrame = false;
-    m_fTimeScale = 1.0f;
-    m_pSequence = nullptr;
-    m_mostRecentSequenceId.SetInvalid();
-    m_mostRecentSequenceTime = 0.0f;
-    m_bLooping = false;
-    m_bAutoRecording = false;
-    m_fRecordingTimeStep = 0;
-    m_bSingleFrame = false;
-    m_bPostRenderRegistered = false;
-    m_bForcingAnimation = false;
-    GetIEditor()->GetUndoManager()->AddListener(this);
-    GetIEditor()->GetSequenceManager()->AddListener(this);
-    GetIEditor()->RegisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CAnimationContext::~CAnimationContext()
-{
-    GetIEditor()->GetSequenceManager()->RemoveListener(this);
-    GetIEditor()->GetUndoManager()->RemoveListener(this);
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::Init()
-{
-    gEnv->pMovieSystem->SetCallback(&s_movieCallback);
-
-    REGISTER_COMMAND("mov_goToFrameEditor", (ConsoleCommandFunc)GoToFrameCmd, 0, "Make a specified sequence go to a given frame time in the editor.");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::AddListener(IAnimationContextListener* pListener)
-{
-    stl::push_back_unique(m_contextListeners, pListener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::RemoveListener(IAnimationContextListener* pListener)
-{
-    stl::find_and_erase(m_contextListeners, pListener);
-}
-
-void CAnimationContext::NotifyTimeChangedListenersUsingCurrTime() const
-{
-    for (size_t i = 0; i < m_contextListeners.size(); ++i)
-    {
-        m_contextListeners[i]->OnTimeChanged(m_currTime);
-    }
-    m_lastTimeChangedNotificationTime = m_currTime;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::SetSequence(CTrackViewSequence* sequence, bool force, bool noNotify, bool user)
-{
-    float newSeqStartTime = .0f;
-    CTrackViewSequence* pCurrentSequence = m_pSequence;
-
-    if (!force && sequence == pCurrentSequence)
-    {
-        return;
-    }
-
-    // Prevent keys being created from time change
-    const bool bRecording = m_recording;
-    m_recording = false;
-    SetRecordingInternal(false);
-
-    if (sequence)
-    {
-        newSeqStartTime = sequence->GetTimeRange().start;
-    }
-
-    m_currTime = newSeqStartTime;
-    m_fRecordingCurrTime = newSeqStartTime;
-
-    if (!m_bPostRenderRegistered)
-    {
-        if (GetIEditor() && GetIEditor()->GetViewManager())
-        {
-            CViewport* pViewport = GetIEditor()->GetViewManager()->GetViewport(ET_ViewportCamera);
-            if (pViewport)
-            {
-                pViewport->AddPostRenderer(new CAnimationContextPostRender(this));
-                m_bPostRenderRegistered = true;
-            }
-        }
-    }
-
-    if (m_pSequence)
-    {
-        m_pSequence->Deactivate();
-        if (m_playing)
-        {
-            m_pSequence->EndCutScene();
-        }
-
-        m_pSequence->UnBindFromEditorObjects();
-    }
-    m_pSequence = sequence;
-    
-    // Notify a new sequence was just selected.
-    Maestro::EditorSequenceNotificationBus::Broadcast(&Maestro::EditorSequenceNotificationBus::Events::OnSequenceSelected, m_pSequence ? m_pSequence->GetSequenceComponentEntityId() : AZ::EntityId());
-
-    if (m_pSequence)
-    {
-        // Set the last valid sequence that was selected.
-        m_mostRecentSequenceId = m_pSequence->GetSequenceComponentEntityId();
-
-        if (m_playing)
-        {
-            m_pSequence->BeginCutScene(true);
-        }
-
-        m_timeRange = m_pSequence->GetTimeRange();
-        m_timeMarker = m_timeRange;
-
-        m_pSequence->Activate();
-        m_pSequence->PrecacheData(newSeqStartTime);
-
-        m_pSequence->BindToEditorObjects();
-    }
-    else if (user)
-    {
-        // If this was a sequence that was selected by the user in Track View
-        // and it was "No Sequence" clear the m_mostRecentSequenceId so the sequence
-        // will not be reselected at unwanted events like a slice reload or an undo operation.
-        m_mostRecentSequenceId.SetInvalid();
-    }
-
-    ForceAnimation();
-
-    if (!noNotify)
-    {
-        NotifyTimeChangedListenersUsingCurrTime();
-        for (size_t i = 0; i < m_contextListeners.size(); ++i)
-        {
-            m_contextListeners[i]->OnSequenceChanged(m_pSequence);
-        }
-    }
-
-    TimeChanged(newSeqStartTime);
-
-    m_recording = bRecording;
-    SetRecordingInternal(bRecording);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::UpdateTimeRange()
-{
-    if (m_pSequence)
-    {
-        m_timeRange = m_pSequence->GetTimeRange();
-
-        // reset the current time to make sure it is clamped
-        // to the new range.
-        SetTime(m_currTime);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::SetTime(float t)
-{
-    if (t < m_timeRange.start)
-    {
-        t = m_timeRange.start;
-    }
-
-    if (t > m_timeRange.end)
-    {
-        t = m_timeRange.end;
-    }
-
-    if (fabs(m_currTime - t) < 0.001f)
-    {
-        return;
-    }
-
-    m_currTime = t;
-    m_fRecordingCurrTime = t;
-    ForceAnimation();
-    UpdateAnimatedLights();
-
-    NotifyTimeChangedListenersUsingCurrTime();
-}
-
-void CAnimationContext::TimeChanged(float newTime)
-{
-    if (m_pSequence)
-    {
-        m_mostRecentSequenceTime = newTime;
-        m_pSequence->TimeChanged(newTime);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::OnSequenceActivated(AZ::EntityId entityId)
-{
-    // If nothing is selected and there is a valid most recent selected
-    // try to find that sequence by id and select it. This is useful
-    // for restoring the selected sequence during undo and redo.
-    if (m_pSequence == nullptr && m_mostRecentSequenceId.IsValid())
-    {
-        if (entityId == m_mostRecentSequenceId)
-        {
-            auto editor = GetIEditor();
-            if (editor != nullptr)
-            {
-                auto manager = editor->GetSequenceManager();
-                if (manager != nullptr)
-                {
-                    auto sequence = manager->GetSequenceByEntityId(m_mostRecentSequenceId);
-                    if (sequence != nullptr)
-                    {
-                        // Hang onto this because SetSequence() will reset it.
-                        float lastTime = m_mostRecentSequenceTime;
-                        
-                        SetSequence(sequence, false, false);
-
-                        // Restore the current time.
-                        SetTime(lastTime);
-
-                        // Notify time may have changed, use m_currTime incase it was clamped by SetTime()
-                        TimeChanged(m_currTime);
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::Pause()
-{
-    assert(m_paused >= 0);
-    m_paused++;
-
-    if (m_recording)
-    {
-        SetRecordingInternal(false);
-    }
-
-    GetIEditor()->GetMovieSystem()->Pause();
-    if (m_pSequence)
-    {
-        m_pSequence->Pause();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::Resume()
-{
-    assert(m_paused > 0);
-    m_paused--;
-    if (m_recording && m_paused == 0)
-    {
-        SetRecordingInternal(true);
-    }
-    GetIEditor()->GetMovieSystem()->Resume();
-
-    if (m_pSequence)
-    {
-        m_pSequence->Resume();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::SetRecording(bool recording)
-{
-    if (recording == m_recording)
-    {
-        return;
-    }
-    m_paused = 0;
-    m_recording = recording;
-    m_playing = false;
-
-    if (!recording && m_fRecordingTimeStep != 0)
-    {
-        SetAutoRecording(false, 0);
-    }
-
-    // If started recording, assume we have modified the document.
-    GetIEditor()->SetModifiedFlag();
-
-    SetRecordingInternal(recording);
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::SetPlaying(bool playing)
-{
-    if (playing == m_playing)
-    {
-        return;
-    }
-
-    m_paused = 0;
-    m_playing = playing;
-    m_recording = false;
-    SetRecordingInternal(false);
-
-    if (playing)
-    {
-        IMovieSystem* pMovieSystem = GetIEditor()->GetMovieSystem();
-
-        pMovieSystem->Resume();
-        if (m_pSequence)
-        {
-            m_pSequence->Resume();
-
-            IMovieUser* pMovieUser = pMovieSystem->GetUser();
-
-            if (pMovieUser)
-            {
-                m_pSequence->BeginCutScene(true);
-            }
-        }
-        pMovieSystem->ResumeCutScenes();
-    }
-    else
-    {
-        IMovieSystem* pMovieSystem = GetIEditor()->GetMovieSystem();
-
-        pMovieSystem->Pause();
-
-        if (m_pSequence)
-        {
-            m_pSequence->Pause();
-        }
-
-        pMovieSystem->PauseCutScenes();
-        if (m_pSequence)
-        {
-            IMovieUser* pMovieUser = pMovieSystem->GetUser();
-
-            if (pMovieUser)
-            {
-                m_pSequence->EndCutScene();
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::Update()
-{
-    if (m_bForceUpdateInNextFrame)
-    {
-        ForceAnimation();
-        m_bForceUpdateInNextFrame = false;
-    }
-
-    // If looking through camera object and recording animation, do not allow camera shake
-    if ((GetIEditor()->GetViewManager()->GetCameraObjectId() != GUID_NULL) && GetIEditor()->GetAnimation()->IsRecording())
-    {
-        GetIEditor()->GetMovieSystem()->EnableCameraShake(false);
-    }
-    else
-    {
-        GetIEditor()->GetMovieSystem()->EnableCameraShake(true);
-    }
-
-    if (m_paused > 0 || !(m_playing || m_bAutoRecording))
-    {
-        if (m_pSequence)
-        {
-            m_pSequence->StillUpdate();
-        }
-
-        if (!m_recording)
-        {
-            GetIEditor()->GetMovieSystem()->StillUpdate();
-        }
-
-        return;
-    }
-
-    ITimer* pTimer = GetIEditor()->GetSystem()->GetITimer();
-
-    if (!m_bAutoRecording)
-    {
-        AnimateActiveSequence();
-
-        float dt = pTimer->GetFrameTime();
-        m_currTime += dt * m_fTimeScale;
-
-        if (!m_recording)
-        {
-            GetIEditor()->GetMovieSystem()->PreUpdate(dt);
-            GetIEditor()->GetMovieSystem()->PostUpdate(dt);
-        }
-    }
-    else
-    {
-        float dt = pTimer->GetFrameTime();
-        m_fRecordingCurrTime += dt * m_fTimeScale;
-        if (fabs(m_fRecordingCurrTime - m_currTime) > m_fRecordingTimeStep)
-        {
-            m_currTime += m_fRecordingTimeStep;
-        }
-    }
-
-    if (m_currTime > m_timeMarker.end)
-    {
-        if (m_bAutoRecording)
-        {
-            SetAutoRecording(false, 0);
-        }
-        else
-        {
-            if (m_bLooping)
-            {
-                m_currTime = m_timeMarker.start;
-                if (m_pSequence)
-                {
-                    m_pSequence->OnLoop();
-                }
-            }
-            else
-            {
-                SetPlaying(false);
-                m_currTime = m_timeMarker.end;
-            }
-        }
-    }
-
-    if (m_bAutoRecording)
-    {
-        // This is auto recording mode.
-        // Send sync with physics event to all selected entities.
-        GetIEditor()->GetSelection()->SendEvent(EVENT_PHYSICS_GETSTATE);
-    }
-
-    if (fabs(m_lastTimeChangedNotificationTime - m_currTime) > 0.001f)
-    {
-        NotifyTimeChangedListenersUsingCurrTime();
-    }
-
-    UpdateAnimatedLights();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::ForceAnimation()
-{
-    if (m_bForcingAnimation)
-    {
-        // reentrant calls are possible when using subsequences
-        return;
-    }
-
-    m_bForcingAnimation = true;
-
-    // Before animating node, pause recording.
-    if (m_bAutoRecording)
-    {
-        Pause();
-    }
-
-    AnimateActiveSequence();
-    // Animate a second time to properly update camera DoF
-    AnimateActiveSequence();
-
-    if (m_bAutoRecording)
-    {
-        Resume();
-    }
-
-    m_bForcingAnimation = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::SetAutoRecording(bool bEnable, float fTimeStep)
-{
-    if (bEnable)
-    {
-        m_bAutoRecording = true;
-        m_fRecordingTimeStep = fTimeStep;
-        SetRecording(bEnable);
-    }
-    else
-    {
-        m_bAutoRecording = false;
-        m_fRecordingTimeStep = 0;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::GoToFrameCmd(IConsoleCmdArgs* pArgs)
-{
-    if (pArgs->GetArgCount() < 2)
-    {
-        gEnv->pLog->LogError("GoToFrame: You must provide a 'frame time' to go to");
-        return;
-    }
-
-    assert(GetIEditor()->GetAnimation());
-    CTrackViewSequence* pSeq = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSeq)
-    {
-        gEnv->pLog->LogError("GoToFrame: No active animation sequence");
-        return;
-    }
-
-    float targetFrame = (float)atof(pArgs->GetArg(1));
-    if (pSeq->GetTimeRange().start > targetFrame || targetFrame > pSeq->GetTimeRange().end)
-    {
-        gEnv->pLog->LogError("GoToFrame: requested time %f is outside the range of sequence %s (%f, %f)", targetFrame, pSeq->GetName(), pSeq->GetTimeRange().start, pSeq->GetTimeRange().end);
-        return;
-    }
-    GetIEditor()->GetAnimation()->m_currTime = targetFrame;
-    GetIEditor()->GetAnimation()->m_bSingleFrame = true;
-
-    GetIEditor()->GetAnimation()->ForceAnimation();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::OnPostRender()
-{
-    if (m_pSequence)
-    {
-        SAnimContext ac;
-        ac.dt = 0;
-        ac.fps = GetIEditor()->GetSystem()->GetITimer()->GetFrameRate();
-        ac.time = m_currTime;
-        ac.singleFrame = true;
-        ac.forcePlay = true;
-        m_pSequence->Render(ac);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::UpdateAnimatedLights()
-{
-    bool bLightAnimationSetActive = m_pSequence && (m_pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet);
-    if (bLightAnimationSetActive == false)
-    {
-        return;
-    }
-
-    std::vector<CBaseObject*> entityObjects;
-    GetIEditor()->GetObjectManager()->FindObjectsOfType(&CEntityObject::staticMetaObject, entityObjects);
-    std::for_each(std::begin(entityObjects), std::end(entityObjects),
-        [this](CBaseObject* pBaseObject)
-        {
-            CEntityObject* pEntityObject = static_cast<CEntityObject*>(pBaseObject);
-            bool bLight = pEntityObject && pEntityObject->GetEntityClass().compare("Light") == 0;
-            if (bLight)
-            {
-                bool bTimeScrubbing = pEntityObject->GetEntityPropertyBool("bTimeScrubbingInTrackView");
-                if (bTimeScrubbing)
-                {
-                    pEntityObject->SetEntityPropertyFloat("_fTimeScrubbed", m_currTime);
-                }
-            }
-        });
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::BeginUndoTransaction()
-{
-    m_bSavedRecordingState = m_recording;
-    SetRecordingInternal(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::EndUndoTransaction()
-{
-    if (m_pSequence)
-    {
-        m_pSequence->BindToEditorObjects();
-    }
-
-    SetRecordingInternal(m_bSavedRecordingState);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::TogglePlay()
-{
-    if (!IsPlaying())
-    {
-        SetPlaying(true);
-    }
-    else
-    {
-        SetPlaying(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::OnSequenceRemoved(CTrackViewSequence* pSequence)
-{
-    if (m_pSequence == pSequence)
-    {
-        SetSequence(nullptr, true, false);
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CAnimationContext::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnBeginGameMode:
-        if (m_pSequence)
-        {
-            m_pSequence->Resume();
-        }
-    case eNotify_OnBeginSceneSave:
-    case eNotify_OnBeginLayerExport:
-        if (m_pSequence)
-        {
-            m_sequenceToRestore = m_pSequence->GetSequenceComponentEntityId();
-        }
-        else
-        {
-            m_sequenceToRestore.SetInvalid();
-        }
-
-        m_sequenceRestoreTime = GetTime();
-
-        m_bSavedRecordingState = m_recording;
-        SetRecordingInternal(false);
-        SetSequence(nullptr, true, true);
-        break;
-
-    case eNotify_OnEndGameMode:
-    case eNotify_OnEndSceneSave:
-    case eNotify_OnEndLayerExport:
-        m_currTime = m_sequenceRestoreTime;
-        SetSequence(GetIEditor()->GetSequenceManager()->GetSequenceByEntityId(m_sequenceToRestore), true, true);
-        SetTime(m_sequenceRestoreTime);
-
-        SetRecordingInternal(m_bSavedRecordingState);
-        break;
-
-    case eNotify_OnQuit:
-    case eNotify_OnCloseScene:
-        SetSequence(nullptr, true, false);
-        break;
-
-    case eNotify_OnBeginNewScene:
-        SetSequence(nullptr, false, false);
-        break;
-
-    case eNotify_OnBeginLoad:
-        m_mostRecentSequenceId.SetInvalid();
-        m_mostRecentSequenceTime = 0.0f;
-        m_bSavedRecordingState = m_recording;
-        SetRecordingInternal(false);
-        GetIEditor()->GetAnimation()->SetSequence(nullptr, false, false);
-        break;
-
-    case eNotify_OnEndLoad:
-        SetRecordingInternal(m_bSavedRecordingState);
-        break;
-    }
-}
-
-void CAnimationContext::SetRecordingInternal(bool enableRecording)
-{
-    GetIEditor()->GetMovieSystem()->SetRecording(enableRecording);
-    if (m_pSequence)
-    {
-        m_pSequence->SetRecording(enableRecording);
-    }
-}
-
-void CAnimationContext::AnimateActiveSequence()
-{
-    if (!m_pSequence)
-    {
-        return;
-    }
-
-    SAnimContext ac;
-    ac.dt = 0;
-    ac.fps = GetIEditor()->GetSystem()->GetITimer()->GetFrameRate();
-    ac.time = m_currTime;
-    ac.singleFrame = true;
-    ac.forcePlay = true;
-
-    m_pSequence->Animate(ac);
-    m_pSequence->SyncToConsole(ac);
-}
diff --git a/Code/Sandbox/Editor/AnimationContext.h b/Code/Sandbox/Editor/AnimationContext.h
deleted file mode 100644
index 8abe061d1f..0000000000
--- a/Code/Sandbox/Editor/AnimationContext.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_ANIMATIONCONTEXT_H
-#define CRYINCLUDE_EDITOR_ANIMATIONCONTEXT_H
-
-#pragma once
-
-#include "Undo/Undo.h"
-#include "TrackView/TrackViewSequenceManager.h"
-#include <Range.h>
-#include <IMovieSystem.h>
-
-class CTrackViewSequence;
-
-/** CAnimationContext listener interface
-*/
-struct IAnimationContextListener
-{
-    virtual void OnSequenceChanged([[maybe_unused]] CTrackViewSequence* pNewSequence) {}
-    virtual void OnTimeChanged([[maybe_unused]] float newTime) {}
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-/** CAnimationContext stores information about current editable animation sequence.
-        Stores information about whenever animation is being recorded know,
-        current sequence, current time in sequence etc.
-*/
-class SANDBOX_API CAnimationContext
-    : public IEditorNotifyListener
-    , public IUndoManagerListener
-    , public ITrackViewSequenceManagerListener
-{
-    AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Constructors.
-    //////////////////////////////////////////////////////////////////////////
-    /** Constructor.
-    */
-    CAnimationContext();
-    ~CAnimationContext();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Accessors
-    //////////////////////////////////////////////////////////////////////////
-
-    void Init();
-
-    // Listeners
-    void AddListener(IAnimationContextListener* pListener);
-    void RemoveListener(IAnimationContextListener* pListener);
-
-    /** Return current animation time in active sequence.
-        @return Current time.
-    */
-    float GetTime() const { return m_currTime; };
-
-    float GetTimeScale() const { return m_fTimeScale; }
-    void SetTimeScale(float fScale) { m_fTimeScale = fScale; }
-
-    /** Set active editing sequence.
-        @param sequence New active sequence.
-        @param force Set to true to always run all of the new active sequence code including listeners even if the sequences is already selected.
-        @param noNotify Set to true to skip over notifying listeners when a new sequences is selected.
-        @param user Set to true if the new sequence is being selected by the user, false if set by internal system code.
-        */
-    void SetSequence(CTrackViewSequence* sequence, bool force, bool noNotify, bool user = false);
-
-    /** Get currently edited sequence.
-    */
-    CTrackViewSequence* GetSequence() const { return m_pSequence; };
-
-    /** Set time markers to play within.
-    */
-    void SetMarkers(Range Marker) { m_timeMarker = Marker; }
-
-    /** Get time markers to play within.
-    */
-    Range GetMarkers() { return m_timeMarker; }
-
-    /** Get time range of active animation sequence.
-    */
-    Range GetTimeRange() const { return m_timeRange; }
-
-    /** Returns true if editor is recording animations now.
-    */
-    bool IsRecording() const { return m_recording && m_paused == 0; };
-
-    /** Returns true if editor is playing animation now.
-    */
-    bool IsPlaying() const { return m_playing && m_paused == 0; };
-
-    /** Returns true if currently playing or recording is paused.
-    */
-    bool IsPaused() const { return m_paused > 0; }
-
-    /** Return if animation context is now in playing mode.
-            In difference from IsPlaying function this function not affected by pause state.
-    */
-    bool IsPlayMode() const { return m_playing; };
-
-    /** Return if animation context is now in recording mode.
-            In difference from IsRecording function this function not affected by pause state.
-    */
-    bool IsRecordMode() const { return m_recording; };
-
-    /** Returns true if currently looping as activated.
-    */
-    bool IsLoopMode() const { return m_bLooping; }
-
-    /** Enable/Disable looping.
-    */
-    void SetLoopMode(bool bLooping) { m_bLooping = bLooping; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Operators
-    //////////////////////////////////////////////////////////////////////////
-
-    /** Set current animation time in active sequence.
-        @param seq New active time.
-    */
-    void SetTime(float t);
-
-    /** Set time in active sequence for reset animation.
-        @param seq New active time.
-    */
-    void SetResetTime(float t) {m_resetTime = t; };
-
-    /** Start animation recorduing.
-        Automatically stop playing.
-        @param recording True to start recording, false to stop.
-    */
-    void SetRecording(bool playing);
-
-    /** Enables/Disables automatic recording, sets the time step for each recorded frame.
-    */
-    void SetAutoRecording(bool bEnable, float fTimeStep);
-
-    //! Check if auto recording enabled.
-    bool IsAutoRecording() const { return m_bAutoRecording; };
-
-    /** Start/Stop animation playing.
-        Automatically stop recording.
-        @param playing True to start playing, false to stop.
-    */
-    void SetPlaying(bool playing);
-
-    /** Pause animation playing/recording.
-    */
-    void Pause();
-
-    /** Toggle playback
-    */
-    void TogglePlay();
-
-    /** Resume animation playing/recording.
-    */
-    void Resume();
-
-    /** Called every frame to update all animations if animation should be playing.
-    */
-    void Update();
-
-    /** Force animation for current sequence.
-    */
-    void ForceAnimation();
-
-    void OnPostRender();
-    void UpdateTimeRange();
-
-    /** Notify after a time change is complete and time control is released to 'playback' controls, for example after
-     *  a timeline drag
-    */
-    void TimeChanged(float newTime);
-
-    /** Notify after a sequence has been activated, useful for Undo/Redo
-    */
-    void OnSequenceActivated(AZ::EntityId entityId);
-
-private:
-    static void GoToFrameCmd(IConsoleCmdArgs* pArgs);
-
-    // Updates the animation time of lights animated by the light animation set.
-    void UpdateAnimatedLights();
-
-    void NotifyTimeChangedListenersUsingCurrTime() const;
-
-    virtual void BeginUndoTransaction() override;
-    virtual void EndUndoTransaction() override;
-
-    virtual void OnSequenceRemoved(CTrackViewSequence* pSequence) override;
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
-    void AnimateActiveSequence();
-
-    void SetRecordingInternal(bool enableRecording);
-
-    //! Current time within active animation sequence.
-    float m_currTime;
-
-    //! Used to stash the time we send out OnTimeChanged notifications
-    mutable float m_lastTimeChangedNotificationTime;
-
-    //! Force update in next frame
-    bool m_bForceUpdateInNextFrame;
-
-    //! Time within active animation sequence while reset animation.
-    float m_resetTime;
-
-    float m_fTimeScale;
-
-    // Recording time step.
-    float m_fRecordingTimeStep;
-    float m_fRecordingCurrTime;
-
-    bool m_bAutoRecording;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //! Time range of active animation sequence.
-    Range m_timeRange;
-
-    Range m_timeMarker;
-
-    //! Currently active animation sequence.
-    CTrackViewSequence* m_pSequence;
-
-    //! Id of latest valid sequence that was selected. Useful for restoring the selected
-    //! sequence after undo has destroyed and recreated it.
-    AZ::EntityId m_mostRecentSequenceId;
-
-    //! The current time of the most recent selected sequence. It's very useful to restore this after an undo.
-    float m_mostRecentSequenceTime;
-
-    //! Id of active sequence to restore (for switching back from game mode and saving)
-    AZ::EntityId m_sequenceToRestore;
-
-    //! Time of active sequence (for switching back from game mode and saving)
-    float m_sequenceRestoreTime;
-
-    bool m_bLooping;
-
-    //! True if editor is recording animations now.
-    bool m_recording;
-    bool m_bSavedRecordingState;
-
-    //! True if editor is playing animation now.
-    bool m_playing;
-
-    //! Stores how many times animation have been paused prior to calling resume.
-    int m_paused;
-
-    bool m_bSingleFrame;
-
-    bool m_bPostRenderRegistered;
-    bool m_bForcingAnimation;
-
-    //! Listeners
-    std::vector<IAnimationContextListener*> m_contextListeners;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_ANIMATIONCONTEXT_H
diff --git a/Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp b/Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp
deleted file mode 100644
index 495b5e38e1..0000000000
--- a/Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "AssetDatabaseLocationListener.h"
-
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
-#include <AzToolsFramework/API/AssetDatabaseBus.h>
-
-namespace AssetDatabase
-{
-    AssetDatabaseLocationListener::AssetDatabaseLocationListener()
-    {
-        BusConnect();
-
-        m_assetDatabaseConnection = new AzToolsFramework::AssetDatabase::AssetDatabaseConnection();
-        m_assetDatabaseConnection->OpenDatabase();
-
-        AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotificationBus::Broadcast(&AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotifications::OnDatabaseInitialized);
-    }
-
-    AssetDatabaseLocationListener::~AssetDatabaseLocationListener()
-    {
-        BusDisconnect();
-
-        delete m_assetDatabaseConnection;
-        m_assetDatabaseConnection = nullptr;
-    }
-
-    AzToolsFramework::AssetDatabase::AssetDatabaseConnection* AssetDatabaseLocationListener::GetAssetDatabaseConnection() const
-    {
-        return m_assetDatabaseConnection;
-    }
-
-    bool AssetDatabaseLocationListener::GetAssetDatabaseLocation(AZStd::string& result)
-    {
-        if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr)
-        {
-            AZ::SettingsRegistryInterface::FixedValueString projectCacheRootValue;
-            if (registry->Get(projectCacheRootValue, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheProjectRootFolder);
-                !projectCacheRootValue.empty())
-            {
-                result = projectCacheRootValue;
-                result += "/assetdb.sqlite";
-                return true;
-            }
-        }
-
-        return false;
-    }
-}//namespace AssetDatabase
diff --git a/Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.h b/Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.h
deleted file mode 100644
index 7f3b5221b6..0000000000
--- a/Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/std/string/string.h>
-#include <AzToolsFramework/API/AssetDatabaseBus.h>
-#include <AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h>
-
-namespace AssetDatabase
-{
-    class AssetDatabaseLocationListener
-        : protected AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler
-    {
-    public:
-        AssetDatabaseLocationListener();
-        ~AssetDatabaseLocationListener();
-
-        AzToolsFramework::AssetDatabase::AssetDatabaseConnection* GetAssetDatabaseConnection() const;
-
-    protected:
-        //////////////////////////////////////////////////////////////////////////
-        //AzToolsFramework::AssetDatabase::AssetDatabaseRequests::Bus::Listener
-        bool GetAssetDatabaseLocation(AZStd::string& result) override;
-
-        //////////////////////////////////////////////////////////////////////////
-
-    private:
-
-        AzToolsFramework::AssetDatabase::AssetDatabaseConnection* m_assetDatabaseConnection = nullptr;
-    };
-}//namespace AssetDatabase
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.cpp b/Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.cpp
deleted file mode 100644
index 783f385294..0000000000
--- a/Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "AssetEditorRequestsHandler.h"
-
-// AzCore
-#include <AzCore/Asset/AssetManager.h>
-
-// Editor
-#include "AssetEditorWindow.h"
-#include "QtViewPaneManager.h"
-
-AssetEditorRequestsHandler::AssetEditorRequestsHandler()
-{
-    AzToolsFramework::AssetEditor::AssetEditorRequestsBus::Handler::BusConnect();
-    AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
-}
-
-AssetEditorRequestsHandler::~AssetEditorRequestsHandler()
-{
-    AzToolsFramework::AssetEditor::AssetEditorRequestsBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
-}
-
-void AssetEditorRequestsHandler::NotifyRegisterViews()
-{
-    using namespace AzToolsFramework::AssetEditor;
-    if (auto assetsWindowsToRestore = AZ::UserSettings::CreateFind<AssetEditorWindowSettings>(AZ::Crc32(AssetEditorWindowSettings::s_name), AZ::UserSettings::CT_GLOBAL))
-    {
-        //copy the current list and clear it since they will be re-added as we request to open them
-        auto windowsToOpen = assetsWindowsToRestore->m_openAssets;
-        assetsWindowsToRestore->m_openAssets.clear();
-        for (auto&& assetRef : windowsToOpen)
-        {
-            AssetEditorWindow::RegisterViewClass(assetRef);
-        }
-    }
-}
-
-void AssetEditorRequestsHandler::CreateNewAsset(const AZ::Data::AssetType& assetType)
-{
-    using namespace AzToolsFramework::AssetEditor;
-    AzToolsFramework::OpenViewPane(LyViewPane::AssetEditor);
-
-    AssetEditorWidgetRequestsBus::Broadcast(&AssetEditorWidgetRequests::CreateAsset, assetType);
-}
-
-void AssetEditorRequestsHandler::OpenAssetEditor(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-{
-    using namespace AzToolsFramework::AssetEditor;
-
-    // Open the AssetEditor if it isn't open already.
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetEditor, QtViewPane::OpenMode::RestoreLayout);
-
-    AssetEditorWidgetRequestsBus::Broadcast(&AssetEditorWidgetRequests::OpenAsset, asset);
-}
-
-void AssetEditorRequestsHandler::OpenAssetEditorById(const AZ::Data::AssetId assetId)
-{
-    AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::AssetManager::Instance().GetAsset<AZ::Data::AssetData>(assetId, AZ::Data::AssetLoadBehavior::NoLoad);
-    OpenAssetEditor(asset);
-}
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.h b/Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.h
deleted file mode 100644
index 0c7080b250..0000000000
--- a/Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzToolsFramework/AssetEditor/AssetEditorBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-class AssetEditorRequestsHandler 
-    : public AzToolsFramework::AssetEditor::AssetEditorRequestsBus::Handler
-    , public AzToolsFramework::EditorEvents::Bus::Handler
-{
-public:
-    AZ_CLASS_ALLOCATOR(AssetEditorRequestsHandler, AZ::SystemAllocator, 0);
-
-    AssetEditorRequestsHandler();
-    ~AssetEditorRequestsHandler() override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // AssetEditorRequests
-    //////////////////////////////////////////////////////////////////////////
-    void CreateNewAsset(const AZ::Data::AssetType& assetType) override;
-    void OpenAssetEditor(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-    void OpenAssetEditorById(const AZ::Data::AssetId assetId) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorEvents::Bus::Handler
-    //////////////////////////////////////////////////////////////////////////
-    void NotifyRegisterViews() override;
-};
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.cpp b/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.cpp
deleted file mode 100644
index 98cf12a1f9..0000000000
--- a/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "AssetEditorWindow.h"
-
-// Qt
-#include <QMessageBox>
-
-// AzCore
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzCore/Utils/Utils.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-
-// Editor
-#include "LyViewPaneNames.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <AssetEditor/ui_AssetEditorWindow.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-namespace AssetEditorUtils
-{
-    AssetEditorWindow* CreateAssetEditorWithAsset(const AZ::Data::Asset<AZ::Data::AssetData> assetRef)
-    {
-        AssetEditorWindow* assetEditorWindow = new AssetEditorWindow();
-        if (auto assetsWindowsToRestore = AZ::UserSettings::CreateFind<AzToolsFramework::AssetEditor::AssetEditorWindowSettings>(AZ::Crc32(AzToolsFramework::AssetEditor::AssetEditorWindowSettings::s_name), AZ::UserSettings::CT_GLOBAL))
-        {
-            assetsWindowsToRestore->m_openAssets.emplace(assetRef);
-        }
-
-        AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequestBus::Events::Save);
-
-        auto&& loadedAsset = AZ::Data::AssetManager::Instance().GetAsset(assetRef.GetId(), assetRef.GetType(), assetRef.GetAutoLoadBehavior());
-        loadedAsset.BlockUntilLoadComplete();
-        assetEditorWindow->OpenAsset(loadedAsset);
-        return assetEditorWindow;
-    }
-}
-
-AssetEditorWindow::AssetEditorWindow(QWidget* parent)
-    : QWidget(parent)
-    , m_ui(new Ui::AssetEditorWindowClass())
-{
-    using namespace AzToolsFramework::AssetEditor;
-
-    m_ui->setupUi(this);
-
-    connect(m_ui->m_assetEditorWidget, &AssetEditorWidget::OnAssetSaveFailedSignal, this, &AssetEditorWindow::OnAssetSaveFailed);
-    connect(m_ui->m_assetEditorWidget, &AssetEditorWidget::OnAssetOpenedSignal, this, &AssetEditorWindow::OnAssetOpened);
-
-    BusConnect();
-}
-
-AssetEditorWindow::~AssetEditorWindow()
-{
-    using namespace AzToolsFramework::AssetEditor;
-    BusDisconnect();
-}
-
-void AssetEditorWindow::RegisterViewClass(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-{
-    AzToolsFramework::ViewPaneOptions options;
-    options.showInMenu = false;
-    auto& assetName = asset.GetHint();
-    const char* paneName = assetName.c_str();
-    AzToolsFramework::RegisterViewPane<AssetEditorWindow>(paneName, LyViewPane::CategoryTools, options, [asset](QWidget*) {return AssetEditorUtils::CreateAssetEditorWithAsset(asset); });
-}
-
-void AssetEditorWindow::CreateAsset(const AZ::Data::AssetType& assetType)
-{
-    m_ui->m_assetEditorWidget->CreateAsset(assetType);
-}
-
-void AssetEditorWindow::OpenAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-{
-    m_ui->m_assetEditorWidget->OpenAsset(asset);
-}
-
-void AssetEditorWindow::OpenAssetById(const AZ::Data::AssetId assetId)
-{
-    AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::AssetManager::Instance().GetAsset<AZ::Data::AssetData>(assetId, AZ::Data::AssetLoadBehavior::NoLoad);
-    OpenAsset(asset);
-}
-
-void AssetEditorWindow::SaveAssetAs(const AZStd::string_view assetPath)
-{
-    if (assetPath.empty())
-    {
-        AZ_Warning("Asset Editor", false, "Could not save asset to empty path.");
-        return;
-    }
-
-    auto absoluteAssetPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / assetPath;
-
-    if (!m_ui->m_assetEditorWidget->SaveAssetToPath(absoluteAssetPath.Native()))
-    {
-        AZ_Warning("Asset Editor", false, "File was not saved correctly via SaveAssetAs.");
-    }
-}
-
-void AssetEditorWindow::RegisterViewClass()
-{
-    AzToolsFramework::ViewPaneOptions options;
-    options.preferedDockingArea = Qt::LeftDockWidgetArea;
-    options.showOnToolsToolbar = true;
-    options.toolbarIcon = ":/Menu/asset_editor.svg";
-    AzToolsFramework::RegisterViewPane<AssetEditorWindow>(LyViewPane::AssetEditor, LyViewPane::CategoryTools, options);
-}
-
-void AssetEditorWindow::OnAssetOpened(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-{
-    if (asset)
-    {
-        AZStd::string assetPath;
-        AZStd::string assetName;
-        AZStd::string extension;
-        AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetPath, &AZ::Data::AssetCatalogRequests::GetAssetPathById, asset.GetId());
-        AzFramework::StringFunc::Path::Split(assetPath.c_str(), nullptr, nullptr, &assetName, &extension);
-//        AZStd::string windowTitle = AZStd::string::format("Edit Asset: %s", (assetName + extension).c_str());
-
-        AZStd::string windowTitle = asset.GetHint();
-
-        qobject_cast<QWidget*>(parent())->setWindowTitle(tr(windowTitle.c_str()));
-    }
-    else
-    {
-        qobject_cast<QWidget*>(parent())->setWindowTitle(tr("Asset Editor"));
-    }
-}
-
-void AssetEditorWindow::closeEvent(QCloseEvent* event)
-{
-    if (m_ui->m_assetEditorWidget->WaitingToSave())
-    {
-        // Don't need to ask to save, as a save is already queued.
-        m_ui->m_assetEditorWidget->SetCloseAfterSave();
-        event->ignore();
-        return;
-    }
-
-    if (m_ui->m_assetEditorWidget->TrySave([this]() {  qobject_cast<QWidget*>(parent())->close(); }))
-    {
-        event->ignore();
-    }
-}
-
-void AssetEditorWindow::OnAssetSaveFailed(const AZStd::string& error)
-{
-    QMessageBox::warning(this, tr("Unable to Save Asset"),
-        tr(error.c_str()), QMessageBox::Ok, QMessageBox::Ok);
-}
-
-#include <AssetEditor/moc_AssetEditorWindow.cpp>
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.h b/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.h
deleted file mode 100644
index 8ae4413029..0000000000
--- a/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/UserSettings/UserSettings.h>
-#include <AzToolsFramework/AssetEditor/AssetEditorBus.h>
-#include <QWidget>
-#endif
-
-namespace Ui
-{
-    class AssetEditorWindowClass;
-}
-
-/**
-* Window pane wrapper for the Asset Editor widget.
-*/
-class AssetEditorWindow
-    : public QWidget
-    , AzToolsFramework::AssetEditor::AssetEditorWidgetRequestsBus::Handler
-{
-    Q_OBJECT
-
-public:
-    AZ_CLASS_ALLOCATOR(AssetEditorWindow, AZ::SystemAllocator, 0);
-
-    explicit AssetEditorWindow(QWidget* parent = nullptr);
-    ~AssetEditorWindow() override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // AssetEditorWindow
-    //////////////////////////////////////////////////////////////////////////
-    void CreateAsset(const AZ::Data::AssetType& assetType) override;
-    void OpenAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
-    void OpenAssetById(const AZ::Data::AssetId assetId) override;
-    void SaveAssetAs(const AZStd::string_view assetPath) override;
-
-    static void RegisterViewClass();
-    static void RegisterViewClass(const AZ::Data::Asset<AZ::Data::AssetData>& asset);
-
-protected Q_SLOTS:
-    void OnAssetSaveFailed(const AZStd::string& error);
-    void OnAssetOpened(const AZ::Data::Asset<AZ::Data::AssetData>& asset);
-
-protected:
-    void closeEvent(QCloseEvent* event) override;
-
-private:
-    QScopedPointer<Ui::AssetEditorWindowClass> m_ui;
-};
diff --git a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp b/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
deleted file mode 100644
index d476a0e0d0..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "AssetImporterDragAndDropHandler.h"
-
-// Qt
-#include <QMimeData>
-
-// AzToolsFramework
-#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-
-// AzQtComponents
-#include <AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h>
-
-// Editor
-#include "AssetImporter/AssetImporterManager/AssetImporterManager.h"
-
-bool AssetImporterDragAndDropHandler::m_dragAccepted = false;
-
-AssetImporterDragAndDropHandler::AssetImporterDragAndDropHandler(QObject* parent, AssetImporterManager* const assetImporterManager)
-    : QObject(parent)
-    , m_assetImporterManager(assetImporterManager)
-{
-    AzQtComponents::DragAndDropEventsBus::Handler::BusConnect(AzQtComponents::DragAndDropContexts::EditorMainWindow);
-
-    // They are used to prevent opening the Asset Importer by dragging and dropping files and folders to the Main Window when it is already running
-    connect(m_assetImporterManager, &AssetImporterManager::StartAssetImporter, this, &AssetImporterDragAndDropHandler::OnStartAssetImporter);
-    connect(m_assetImporterManager, &AssetImporterManager::StopAssetImporter, this, &AssetImporterDragAndDropHandler::OnStopAssetImporter);
-}
-
-AssetImporterDragAndDropHandler::~AssetImporterDragAndDropHandler()
-{
-    AzQtComponents::DragAndDropEventsBus::Handler::BusDisconnect(AzQtComponents::DragAndDropContexts::EditorMainWindow);
-}
-
-void AssetImporterDragAndDropHandler::DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& /*context*/)
-{
-    if (!m_isAssetImporterRunning)
-    {
-        ProcessDragEnter(event);
-    }
-}
-
-void AssetImporterDragAndDropHandler::Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& /*context*/)
-{
-    if (!m_dragAccepted)
-    {
-        return;
-    }
-
-    QStringList fileList = GetFileList(event);
-
-    if (!fileList.isEmpty())
-    {
-        Q_EMIT OpenAssetImporterManager(fileList);
-    }
-
-    // reset
-    m_dragAccepted = false;
-}
-
-void AssetImporterDragAndDropHandler::ProcessDragEnter(QDragEnterEvent* event)
-{
-    m_dragAccepted = false;
-
-    const QMimeData* mimeData = event->mimeData();
-
-    // if the event hasn't been accepted already and the mimeData hasUrls()
-    if (event->isAccepted() || !mimeData->hasUrls())
-    {
-        return;
-    }
-
-    // prevent users from dragging and dropping files from the Asset Browser
-    if (mimeData->hasFormat(AzToolsFramework::AssetBrowser::AssetBrowserEntry::GetMimeType()))
-    {
-        return;
-    }
-
-    QList<QUrl> urlList = mimeData->urls();
-    int urlListSize = urlList.size();
-
-    // runs through the file list first and checks for any "crate" files - if it finds ANY, return (and don't accept the event)
-    for (int i = 0; i < urlListSize; ++i)
-    {
-        QUrl currentUrl = urlList.at(i);
-
-        if (currentUrl.isLocalFile())
-        {
-            QString path = urlList.at(i).toLocalFile();
-
-            if (ContainCrateFiles(path))
-            {
-                return;
-            }
-        }
-    }
-
-    for (int i = 0; i < urlListSize; ++i)
-    {
-        // Get the local file path
-        QString path = urlList.at(i).toLocalFile();
-
-        QDir dir(path);
-        QString relativePath = dir.relativeFilePath(path);
-        QString absPath = dir.absolutePath();
-
-        // check if the files/folders are under the game root directory
-        QDir gameRoot(Path::GetEditingGameDataFolder().c_str());
-        QString gameRootAbsPath = gameRoot.absolutePath();
-
-        if (absPath.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
-        {
-            return;
-        }
-
-        QDirIterator it(absPath, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::Subdirectories);
-
-        QFileInfo info(absPath);
-        QString extension = info.completeSuffix();
-
-        // if it's not an empty folder directory or if it's a file,
-        // then allow the drag and drop process.
-        // Otherwise, prevent users from dragging and dropping empty folders
-        if (it.hasNext() || !extension.isEmpty())
-        {
-            // this is used in Drop()
-            m_dragAccepted = true;
-        }
-    }
-
-    // at this point, all files should be legal to be imported
-    // since they are not in the database
-    if (m_dragAccepted)
-    {
-        event->acceptProposedAction();
-    }
-}
-
-QStringList AssetImporterDragAndDropHandler::GetFileList(QDropEvent* event)
-{
-    QStringList fileList;
-    const QMimeData* mimeData = event->mimeData();
-
-    QList<QUrl> urlList = mimeData->urls();
-
-    for (int i = 0; i < urlList.size(); ++i)
-    {
-        QUrl currentUrl = urlList.at(i);
-
-        if (currentUrl.isLocalFile())
-        {
-            QString path = urlList.at(i).toLocalFile();
-
-            if (!ContainCrateFiles(path))
-            {
-                fileList.append(path);
-            }
-        }
-    }
-
-    return fileList;
-}
-
-void AssetImporterDragAndDropHandler::OnStartAssetImporter()
-{
-    m_isAssetImporterRunning = true;
-}
-
-void AssetImporterDragAndDropHandler::OnStopAssetImporter()
-{
-    m_isAssetImporterRunning = false;
-}
-
-
-bool AssetImporterDragAndDropHandler::ContainCrateFiles(QString path)
-{
-    QFileInfo fileInfo(path);
-
-    if (fileInfo.isFile())
-    {
-        return isCrateFile(fileInfo);
-    }
-    else
-    {
-        QDirIterator it(path, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::Subdirectories);
-
-        while (it.hasNext())
-        {
-            QString str = it.next();
-            QFileInfo info(str);
-
-            if (isCrateFile(info))
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-bool AssetImporterDragAndDropHandler::isCrateFile(QFileInfo fileInfo)
-{
-    return QStringLiteral("crate").compare(fileInfo.suffix(), Qt::CaseInsensitive) == 0;
-}
-
-#include <AssetImporter/AssetImporterManager/moc_AssetImporterDragAndDropHandler.cpp>
diff --git a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h b/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
deleted file mode 100644
index c3e4f3bd53..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-
-#include <QObject>
-#include <QFileInfo>
-#include <QString>
-
-#include <AzCore/EBus/EBus.h>
-#include <AzQtComponents/Buses/DragAndDrop.h>
-#include <AzToolsFramework/API/AssetDatabaseBus.h>
-#include <AzCore/std/smart_ptr/scoped_ptr.h>
-#endif
-
-class MainWindow;
-class AssetImporterManager;
-
-
-namespace AzToolsFramework
-{
-    namespace AssetDatabase
-    {
-        class AssetDatabaseConnection;
-    }
-}
-
-class AssetImporterDragAndDropHandler
-    : public QObject
-    , public AzQtComponents::DragAndDropEventsBus::Handler
-{
-    Q_OBJECT
-
-public:
-    explicit AssetImporterDragAndDropHandler(QObject* parent, AssetImporterManager* const assetImporterManager);
-    ~AssetImporterDragAndDropHandler();
-
-    void DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
-    void Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
-
-    static void ProcessDragEnter(QDragEnterEvent* event);
-    static QStringList GetFileList(QDropEvent* event);
-
-Q_SIGNALS:
-    void OpenAssetImporterManager(const QStringList& fileList);
-
-public Q_SLOTS:
-    void OnStartAssetImporter();
-    void OnStopAssetImporter();
-
-private:
-    bool m_isAssetImporterRunning = false;
-    AssetImporterManager* m_assetImporterManager;
-
-    static bool ContainCrateFiles(QString path);
-    static bool isCrateFile(QFileInfo fileInfo);
-
-    // it is used because MainWindow's dropEvent will ask the Ebus to call the Drop() function in AssetImporterDragAndDropHandler.
-    // That will cause the problem that even the crate objects are blocked by the DragEnter() in AssetImporterDragAndDropHandler,
-    // it will still open the Asset Importer
-    static bool m_dragAccepted;
-};
diff --git a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp b/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
deleted file mode 100644
index 4ef45c36c5..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
+++ /dev/null
@@ -1,811 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "AssetImporterManager.h"
-
-// Qt
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QSettings>
-#include <QStandardPaths>
-
-// AzFramework
-#include <AzFramework/Asset/AssetSystemBus.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-
-// Editor
-#include "AssetImporter/UI/FilesAlreadyExistDialog.h"
-#include "AssetImporter/UI/ProcessingAssetsDialog.h"
-
-namespace AssetImporterManagerPrivate
-{
-    const char* g_selectFilesPath = "AssetImporter/SelectFilesPath";
-    const char* g_selectDestinationFilesPath = "AssetImporter/SelectDestinationFilesPath";
-    const char* g_errorMessageBoxTitle = "File failed to process.";
-    const char* g_crateError = "Crate files cannot be imported.";
-    static const char* s_crateFileExtension = "crate";
-};
-
-AssetImporterManager::AssetImporterManager(QWidget* parent)
-    : QObject(parent)
-{
-}
-
-AssetImporterManager::~AssetImporterManager()
-{
-}
-
-void AssetImporterManager::Exec()
-{
-    // tell the AssetImporterDragAndDropHandler that the Asset Importer now is running
-    Q_EMIT StartAssetImporter();
-    bool success = OnBrowseFiles();
-
-    // prevent users from selecting crate files from the File Explorer and open the Asset Importer.
-    if (!success)
-    {
-        reject();
-    }
-    else
-    {
-        OnOpenSelectDestinationDialog();
-    }
-}
-
-void AssetImporterManager::Exec(const QStringList& dragAndDropFileList)
-{
-    // note: dragging and dropping an empty folder can also trigger this condition
-    if (!dragAndDropFileList.isEmpty())
-    {
-        OnDragAndDropFiles(&dragAndDropFileList);
-
-        // only open the Asset Importer when the folder contains correct type files
-        if (!m_pathMap.isEmpty())
-        {
-            // tell the AssetImporterDragAndDropHandler that the Asset Importer now is running
-            Q_EMIT StartAssetImporter();
-            OnOpenSelectDestinationDialog();
-        }
-        else
-        {
-            reject();
-        }
-    }
-}
-
-// used to cancel actions and close the dialog
-void AssetImporterManager::reject()
-{
-    m_pathMap.clear();
-    m_destinationRootDirectory = "";
-    Q_EMIT StopAssetImporter();
-}
-
-void AssetImporterManager::OnDragAndDropFiles(const QStringList* fileList)
-{
-    for (int i = 0; i < fileList->size(); ++i)
-    {
-        // if the list contains a crate file,
-        // the whole process should stop
-        if (!GetAndCheckAllFilesInFolder(fileList->at(i)))
-        {
-            QMessageBox::warning(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, AssetImporterManagerPrivate::g_crateError);
-            reject();
-            return;
-        }
-    }
-}
-
-bool AssetImporterManager::OnBrowseFiles()
-{
-    QFileDialog fileDialog;
-    fileDialog.setFileMode(QFileDialog::ExistingFiles);
-    fileDialog.setWindowModality(Qt::WindowModality::ApplicationModal);
-    fileDialog.setViewMode(QFileDialog::Detail);
-    fileDialog.setWindowTitle(tr("Select files to import"));
-    fileDialog.setLabelText(QFileDialog::Accept, "Select");
-
-    QSettings settings;
-    QString currentAbsolutePath = settings.value(AssetImporterManagerPrivate::g_selectFilesPath).toString();
-
-    QDir gameRoot(Path::GetEditingGameDataFolder().c_str());
-    QString gameRootAbsPath = gameRoot.absolutePath();
-
-    // Case 1: if currentAbsolutePath is empty at this point, that means this is the first time
-    //         users using the Asset Importer, set the default directory to be users' PC's desktop.
-    // Case 2: if the current folder directory stored in the registry doesn't exist anymore,
-    //         that means users have removed the directory already (deleted or use the Move feature).
-    // Case 3: if it's a directory under the game root folder, then in general,
-    //         users have modified the folder directory in the registry. It should not be happening.
-    if (currentAbsolutePath.isEmpty() || !QFile(currentAbsolutePath).exists() || currentAbsolutePath.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
-    {
-        currentAbsolutePath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
-    }
-
-    fileDialog.setDirectory(currentAbsolutePath);
-
-    if (!fileDialog.exec())
-    {
-        return false;
-    }
-
-    bool encounteredCrate = false;
-    QStringList invalidFiles;
-
-    for (QString path : fileDialog.selectedFiles())
-    {
-        QString fileName = GetFileName(path);
-        QFileInfo info(path);
-        QString extension = info.completeSuffix(); // extension without '.'
-
-        if (QString(AssetImporterManagerPrivate::s_crateFileExtension).compare(extension, Qt::CaseInsensitive) != 0)
-        {
-            // prevent users from importing files under the game root directory
-            if (path.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
-            {
-                invalidFiles << fileName;
-            }
-            else
-            {
-                // store paths into the map.
-                m_pathMap[path] = fileName;
-            }
-        }
-        else
-        {
-            encounteredCrate = true;
-        }
-    }
-
-    if (invalidFiles.size() > 0)
-    {
-        QString fileWarning = QString("Files cannot be imported into their own project. The following files will not be moved or copied:\n");
-        fileWarning.append(invalidFiles.join(", "));
-        fileWarning.append('.');
-        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, fileWarning);
-    }
-    if (encounteredCrate)
-    {
-        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, AssetImporterManagerPrivate::g_crateError);
-    }
-
-    currentAbsolutePath = fileDialog.directory().absolutePath();
-    settings.setValue(AssetImporterManagerPrivate::g_selectFilesPath, currentAbsolutePath);
-
-    // prevent users from selecting crate files from the File Explorer and open the Asset Importer.
-    return (m_pathMap.size() > 0);
-}
-
-void AssetImporterManager::OnBrowseDestinationFilePath(QLineEdit* destinationLineEdit)
-{
-    QFileDialog fileDialog;
-    fileDialog.setOption(QFileDialog::ShowDirsOnly, true);
-    fileDialog.setViewMode(QFileDialog::List);
-    fileDialog.setWindowModality(Qt::WindowModality::ApplicationModal);
-    fileDialog.setWindowTitle(tr("Select import destination"));
-
-    QSettings settings;
-    QString currentDestination = settings.value(AssetImporterManagerPrivate::g_selectDestinationFilesPath).toString();
-
-    QDir gameRoot(Path::GetEditingGameDataFolder().c_str());
-    QString gameRootAbsPath = gameRoot.absolutePath();
-
-    // Case 1: if currentDestination is empty at this point, that means this is the first time
-    //         users using the Asset Importer, set the default directory to be the current game project's root folder
-    // Case 2: if the current folder directory stored in the registry doesn't exist anymore,
-    //         that means users have removed the directory already (deleted or use the Move feature).
-    // Case 3: if it's a directory outside of the game root folder, then in general,
-    //         users have modified the folder directory in the registry. It should not be happening.
-    if (currentDestination.isEmpty() || !QDir(currentDestination).exists() || !currentDestination.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
-    {
-        currentDestination = gameRootAbsPath;
-    }
-
-    fileDialog.setDirectory(currentDestination);
-
-    // The default file path is the game project root folder.
-    // After that, the default file path will be the previous opened folder path.
-    connect(&fileDialog, &QFileDialog::directoryEntered, this, [&fileDialog, &gameRoot, &gameRootAbsPath](const QString& path)
-        {
-            // get current relative path
-            QString relativePath = gameRoot.relativeFilePath(path);
-
-            // Guard against navigating outside of the project folder. Lambda used as the dialog had to be captured.
-            // checking the directory and prevent users from changing the directory outside of the game root
-            if (!path.startsWith(gameRootAbsPath, Qt::CaseInsensitive) || (relativePath.length() > 2 && relativePath[0] == '.' && relativePath[1] == '.'))
-            {
-                fileDialog.setDirectory(gameRoot);
-            }
-        });
-
-    if (!fileDialog.exec())
-    {
-        return;
-    }
-
-    // users can only select one folder at a time, so the index is always 0.
-    // This fixes the issue that QFileDialog does not select the highlighted folder
-    QString destinationDirectory = fileDialog.selectedFiles().at(0);
-
-    OnSetDestinationDirectory(destinationDirectory);
-
-    destinationLineEdit->setText(destinationDirectory);
-}
-
-// Copy + Paste
-void AssetImporterManager::OnCopyFiles()
-{
-    m_importMethod = ImportFilesMethod::CopyFiles;
-    ProcessCopyFiles();
-}
-
-// Cut + Paste
-void AssetImporterManager::OnMoveFiles()
-{
-    m_importMethod = ImportFilesMethod::MoveFiles;
-    ProcessMoveFiles();
-}
-
-bool AssetImporterManager::OnOverwriteFiles(QString relativePath, QString oldAbsolutePath)
-{
-    // this is the absolute path in the destination folder
-    QString destinationAbsolutePath = GenerateAbsolutePath(relativePath);
-
-    return Overwrite(relativePath, oldAbsolutePath, destinationAbsolutePath);
-}
-
-bool AssetImporterManager::OnKeepBothFiles(QString relativePath, QString oldAbsolutePath)
-{
-    // this is the absolute path in the destination folder
-    QString destinationAbsolutePath = GenerateAbsolutePath(relativePath);
-
-    QString subPath = QFileInfo(destinationAbsolutePath).absoluteDir().absolutePath();
-
-    QFileInfo info(destinationAbsolutePath);
-    QString extension = info.completeSuffix(); // extension without '.'
-    QString fileName = info.baseName(); //file name without extension
-
-    int number = 1;
-    int index = destinationAbsolutePath.indexOf(extension);
-
-    QString newFileName = CreateFileNameWithNumber(number, fileName, index, extension);
-    QString newDestinationAbsolutePath = subPath + '/' + newFileName;
-
-    while (QFile(newDestinationAbsolutePath).exists())
-    {
-        number++;
-        newFileName = CreateFileNameWithNumber(number, fileName, index, extension);
-        newDestinationAbsolutePath = subPath + '/' + newFileName;
-    }
-
-    if (m_importMethod == ImportFilesMethod::CopyFiles)
-    {
-        return Copy(relativePath, oldAbsolutePath, newDestinationAbsolutePath);
-    }
-    else if (m_importMethod == ImportFilesMethod::MoveFiles)
-    {
-        return Move(relativePath, oldAbsolutePath, newDestinationAbsolutePath);
-    }
-
-    return false;
-}
-
-void AssetImporterManager::OnOpenLogDialog()
-{
-    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::ShowAssetProcessor);
-    reject();
-}
-
-void AssetImporterManager::OnSetDestinationDirectory(QString destinationDirectory)
-{
-    QSettings settings;
-    QString currentDestination = settings.value(AssetImporterManagerPrivate::g_selectDestinationFilesPath).toString();
-
-    m_destinationRootDirectory = (!destinationDirectory.isEmpty()) ? destinationDirectory : currentDestination;
-    settings.setValue(AssetImporterManagerPrivate::g_selectDestinationFilesPath, destinationDirectory);
-}
-
-void AssetImporterManager::OnOpenSelectDestinationDialog()
-{
-    QWidget* mainWindow = nullptr;
-    AzToolsFramework::EditorRequestBus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::GetMainWindow);
-
-    QString numberOfFilesMessage = m_pathMap.size() == 1 ? QString(tr("Importing 1 asset")) : QString(tr("Importing %1 assets").arg(m_pathMap.size()));
-
-    SelectDestinationDialog selectDestinationDialog(numberOfFilesMessage, mainWindow);
-
-    // Browse Destination File Path
-    connect(&selectDestinationDialog, &SelectDestinationDialog::BrowseDestinationPath, this, &AssetImporterManager::OnBrowseDestinationFilePath);
-    connect(&selectDestinationDialog, &SelectDestinationDialog::DoCopyFiles, this, &AssetImporterManager::OnCopyFiles);
-    connect(&selectDestinationDialog, &SelectDestinationDialog::DoMoveFiles, this, &AssetImporterManager::OnMoveFiles);
-    connect(&selectDestinationDialog, &SelectDestinationDialog::Cancel, this, &AssetImporterManager::reject);
-    connect(&selectDestinationDialog, &SelectDestinationDialog::SetDestinationDirectory, this, &AssetImporterManager::OnSetDestinationDirectory);
-    selectDestinationDialog.exec();
-}
-
-ProcessFilesMethod AssetImporterManager::OnOpenFilesAlreadyExistDialog(QString message, int numberOfFiles)
-{
-    ProcessFilesMethod processMethod = ProcessFilesMethod::Default;
-
-    // make sure the dialog is opened in front of the Editor main window
-    QWidget* mainWindow = nullptr;
-    AzToolsFramework::EditorRequestBus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::GetMainWindow);
-
-    FilesAlreadyExistDialog filesAlreadyExistDialog(message, numberOfFiles, mainWindow);
-
-    bool applyToAll = false;
-
-    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::ApplyActionToAllFiles, this, [&applyToAll](bool result)
-        {
-            applyToAll = result;
-        });
-
-    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::OverWriteFiles, this, [this, &processMethod, &applyToAll]()
-        {
-            processMethod = UpdateProcessFileMethod(ProcessFilesMethod::OverwriteFile, applyToAll);
-        });
-
-    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::KeepBothFiles, this, [this, &processMethod, &applyToAll]()
-        {
-            processMethod = UpdateProcessFileMethod(ProcessFilesMethod::KeepBothFile, applyToAll);
-        });
-
-    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::SkipCurrentProcess, this, [this, &processMethod, &applyToAll]()
-        {
-            processMethod = UpdateProcessFileMethod(ProcessFilesMethod::SkipProcessingFile, applyToAll);
-        });
-
-    connect(&filesAlreadyExistDialog, &FilesAlreadyExistDialog::CancelAllProcesses, this, [&processMethod]()
-        {
-            processMethod = ProcessFilesMethod::Cancel;
-        });
-
-    if (!applyToAll && processMethod != ProcessFilesMethod::Cancel)
-    {
-        filesAlreadyExistDialog.exec();
-    }
-
-    return processMethod;
-}
-
-ProcessFilesMethod AssetImporterManager::UpdateProcessFileMethod(ProcessFilesMethod processMethod, bool applyToAll)
-{
-    if (applyToAll)
-    {
-        switch (processMethod)
-        {
-        case ProcessFilesMethod::OverwriteFile:
-            processMethod = ProcessFilesMethod::OverwriteAllFiles;
-            break;
-        case ProcessFilesMethod::KeepBothFile:
-            processMethod = ProcessFilesMethod::KeepBothAllFiles;
-            break;
-        case ProcessFilesMethod::SkipProcessingFile:
-            processMethod = ProcessFilesMethod::SkipProcessingAllFiles;
-        }
-    }
-
-    return processMethod;
-}
-
-bool AssetImporterManager::ProcessFileMethod(ProcessFilesMethod processMethod, QString relativePath, QString oldAbsolutePath)
-{
-    switch (processMethod)
-    {
-    case ProcessFilesMethod::OverwriteFile:
-    case ProcessFilesMethod::OverwriteAllFiles:
-        return OnOverwriteFiles(relativePath, oldAbsolutePath);
-    case ProcessFilesMethod::KeepBothFile:
-    case ProcessFilesMethod::KeepBothAllFiles:
-        return OnKeepBothFiles(relativePath, oldAbsolutePath);
-    case ProcessFilesMethod::SkipProcessingAllFiles:
-        return false;
-    }
-
-    return false;
-}
-
-void AssetImporterManager::OnOpenProcessingAssetsDialog(int numberOfProcessedFiles)
-{
-    // make sure the dialog is opened in front of the Editor main window
-    QWidget* mainWindow = nullptr;
-    AzToolsFramework::EditorRequestBus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::GetMainWindow);
-
-    ProcessingAssetsDialog processingAssetsDialog(numberOfProcessedFiles, mainWindow);
-    connect(&processingAssetsDialog, &ProcessingAssetsDialog::OpenLogDialog, this, &AssetImporterManager::OnOpenLogDialog);
-    connect(&processingAssetsDialog, &ProcessingAssetsDialog::CloseProcessingAssetsDialog, this, &AssetImporterManager::reject);
-
-    processingAssetsDialog.exec();
-}
-
-void AssetImporterManager::ProcessCopyFiles()
-{
-    int numberOfFiles = m_pathMap.size();
-    int numberOfProcessedFiles = 0;
-
-    ProcessFilesMethod processMethod = ProcessFilesMethod::Default;
-
-    for (int i = 0; i < m_pathMap.size(); ++i)
-    {
-        QString relativePath = m_pathMap.values().at(i);
-        QString oldAbsolutePath = m_pathMap.keys().at(i);
-
-        // this is the absolute path in the destination folder
-        QString destinationAbsolutePath = GenerateAbsolutePath(relativePath);
-
-        // check if the file exists in the destination folder
-        if (!QFile::exists(destinationAbsolutePath))
-        {
-            if (Copy(relativePath, oldAbsolutePath, destinationAbsolutePath))
-            {
-                numberOfProcessedFiles++;
-            }
-        }
-        else
-        {
-            if (processMethod == ProcessFilesMethod::Default ||
-                processMethod == ProcessFilesMethod::OverwriteFile ||
-                processMethod == ProcessFilesMethod::KeepBothFile ||
-                processMethod == ProcessFilesMethod::SkipProcessingFile)
-            {
-                QString fileName = GetFileName(oldAbsolutePath);
-                QString message = QString("The destination already has a file named \"%1\". What would you like to do?").arg(fileName);
-
-                processMethod = OnOpenFilesAlreadyExistDialog(message, numberOfFiles);
-            }
-
-            if (ProcessFileMethod(processMethod, relativePath, oldAbsolutePath))
-            {
-                numberOfProcessedFiles++;
-            }
-        }
-
-        numberOfFiles--;
-    }
-
-    if (numberOfProcessedFiles > 0)
-    {
-        OnOpenProcessingAssetsDialog(numberOfProcessedFiles);
-    }
-    else
-    {
-        reject();
-    }
-}
-
-void AssetImporterManager::ProcessMoveFiles()
-{
-    int numberOfFiles = m_pathMap.size();
-    int numberOfProcessedFiles = 0;
-
-    ProcessFilesMethod processMethod = ProcessFilesMethod::Default;
-
-    for (int i = 0; i < m_pathMap.size(); ++i)
-    {
-        QString relativePath = m_pathMap.values().at(i);
-        QString oldAbsolutePath = m_pathMap.keys().at(i);
-
-        // this is the absolute path in the destination folder
-        QString destinationAbsolutePath = GenerateAbsolutePath(relativePath);
-
-        // check if the file exists in the destination folder
-        if (!QFile::exists(destinationAbsolutePath))
-        {
-            if (Move(relativePath, oldAbsolutePath, destinationAbsolutePath))
-            {
-                numberOfProcessedFiles++;
-            }
-        }
-        else
-        {
-            if (processMethod == ProcessFilesMethod::Default ||
-                processMethod == ProcessFilesMethod::OverwriteFile ||
-                processMethod == ProcessFilesMethod::KeepBothFile ||
-                processMethod == ProcessFilesMethod::SkipProcessingFile)
-            {
-                QString fileName = GetFileName(oldAbsolutePath);
-                QString message = QString("The destination already has a file named \"%1\". What would you like to do?").arg(fileName);
-
-                processMethod = OnOpenFilesAlreadyExistDialog(message, numberOfFiles);
-            }
-
-            if (ProcessFileMethod(processMethod, relativePath, oldAbsolutePath))
-            {
-                numberOfProcessedFiles++;
-            }
-        }
-
-        numberOfFiles--;
-    }
-
-    if (numberOfProcessedFiles > 0)
-    {
-        OnOpenProcessingAssetsDialog(numberOfProcessedFiles);
-    }
-    else
-    {
-        reject();
-    }
-}
-
-bool AssetImporterManager::Copy(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath)
-{
-    QString fileName = GetFileName(destinationAbsolutePath);
-    QString subPath = QFileInfo(destinationAbsolutePath).absoluteDir().absolutePath();
-    QDir dir;
-
-    bool directoryExistedAlready = QDir(subPath).exists();
-    if (!directoryExistedAlready)
-    {
-        dir.mkpath(subPath);
-    }
-
-    QString newDestinationAbsolutePath = subPath;
-    newDestinationAbsolutePath = newDestinationAbsolutePath.append('/' + fileName);
-
-    // Copy the file from the old path to the new path
-    if (!QFile::copy(oldAbsolutePath, newDestinationAbsolutePath))
-    {
-        QString reason = tr("an unknown issue occurred.");
-
-        if (!directoryExistedAlready)
-        {
-            dir.rmdir(subPath);
-        }
-
-        // if the original files got deleted at this condition
-        if (!QFile(oldAbsolutePath).exists())
-        {
-            reason = tr("%1 no longer exists.").arg(fileName);
-        }
-        // if users manually copy the file into the destination folder at this condition
-        if (QFile(newDestinationAbsolutePath).exists())
-        {
-            reason = tr("%1 already exists in the target directory.").arg(fileName);
-        }
-
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, QObject::tr("We're sorry, but the file failed to process because %1").arg(reason));
-        return false;
-    }
-
-    // set the destination file to be writable by user himself/herself if it's read-only
-    QFile destinationFile(newDestinationAbsolutePath);
-    SetDestinationFileWritable(destinationFile);
-
-    return true;
-}
-
-bool AssetImporterManager::Move(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath)
-{
-    QString fileName = GetFileName(destinationAbsolutePath);
-    QString subPath = QFileInfo(destinationAbsolutePath).absoluteDir().absolutePath();
-    QString newDestinationAbsolutePath = subPath;
-    QDir dir;
-
-    bool directoryExistedAlready = QDir(subPath).exists();
-    if (!directoryExistedAlready)
-    {
-        dir.mkpath(subPath);
-    }
-
-    if (QFile::rename(oldAbsolutePath, newDestinationAbsolutePath.append('/' + fileName)))
-    {
-        QString oldFileName = GetFileName(oldAbsolutePath);
-
-        // Only remove the old directory if the relative path is the file name itself.
-        // That also means users are dragging and dropping files, but not a folder containing those files.
-        if (oldFileName.compare(relativePath) != 0)
-        {
-            RemoveOldPath(oldAbsolutePath, relativePath);
-        }
-
-        // set the destination file to be writable by user himself/herself if it's read-only
-        QFile destinationFile(newDestinationAbsolutePath);
-        SetDestinationFileWritable(destinationFile);
-
-        return true;
-    }
-    else
-    {
-        QString reason = tr("an unknown issue occurred.");
-        QString oldFileName = GetFileName(oldAbsolutePath);
-
-        if (!directoryExistedAlready)
-        {
-            dir.rmdir(subPath);
-        }
-
-        // if the original files got deleted at this condition
-        if (!QFile(oldAbsolutePath).exists())
-        {
-            reason = tr("%1 no longer exists.").arg(oldFileName);
-        }
-        // if users manually copy the file into the destination folder at this condition
-        if (QFile(newDestinationAbsolutePath).exists())
-        {
-            reason = tr("%1 already exists in the target directory.").arg(oldFileName);
-        }
-
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, QObject::tr("We're sorry, but the file failed to process because %1").arg(reason));
-        return false;
-    }
-}
-
-bool AssetImporterManager::Overwrite(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath)
-{
-    QFile newFile(destinationAbsolutePath);
-    QFile oldFile(oldAbsolutePath);
-
-    // double check if paths are valid
-    if ((!oldFile.open(QIODevice::ReadOnly)))
-    {
-        QString fileName = GetFileName(oldAbsolutePath);
-        QString reason = tr("%1 no longer exists.").arg(fileName);
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, QObject::tr("We're sorry, but the file failed to process because %1").arg(reason));
-        return false;
-    }
-
-    if (!newFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-    {
-        QString reason = tr("We're sorry, but the file failed to process.");
-        QString fileName = GetFileName(destinationAbsolutePath);
-
-        if (!newFile.exists())
-        {
-            reason = tr("%1 from the destination directory is removed.").arg(fileName);
-        }
-        else
-        {
-            reason = tr("%1 from the destination directory cannot be overwritten.").arg(fileName);
-        }
-
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), AssetImporterManagerPrivate::g_errorMessageBoxTitle, QObject::tr("We're sorry, but the file failed to process because %1").arg(reason));
-        return false;
-    }
-
-    QDataStream dataStream(&oldFile);
-    QDataStream out(&newFile);
-
-    int bufferSize = 1024 * 1024;
-    char* buffer = new char[bufferSize];
-
-    while (!dataStream.atEnd())
-    {
-        int bytesRead = dataStream.readRawData(buffer, bufferSize);
-        out.writeRawData(buffer, bytesRead);
-    }
-
-    delete[] buffer;
-    oldFile.close();
-    newFile.close();
-
-    // if it's the move file method, got to remove the original files
-    if (m_importMethod == ImportFilesMethod::MoveFiles)
-    {
-        QString fileName = GetFileName(oldAbsolutePath);
-        QFile file(oldAbsolutePath);
-        QDir absoluteDir = QFileInfo(oldAbsolutePath).absoluteDir();
-
-        if (file.exists())
-        {
-            // if the original file is read-only,
-            // then it got to be writable in order to be deleted successfully
-            SetDestinationFileWritable(file);
-            absoluteDir.remove(fileName);
-        }
-
-        // Only remove the old directory if the relative path is the file name itself.
-        // That also means users are dragging and dropping files, but not a folder containing those files.
-        if (fileName.compare(relativePath) != 0)
-        {
-            RemoveOldPath(oldAbsolutePath, relativePath);
-        }
-    }
-
-    return true;
-}
-
-bool AssetImporterManager::GetAndCheckAllFilesInFolder(QString path)
-{
-    QString formattedPath = path;
-
-    // Paths ending with '/' return from QFileInfo().fileName() with a value of ""
-    // Strip a trailing slash so we can correctly get rootFolderName on all platforms
-    if (formattedPath.endsWith("/"))
-    {
-        formattedPath.truncate(formattedPath.lastIndexOf(QChar('/')));
-    }
-
-    QString rootFolderName = GetFileName(formattedPath);
-    QDirIterator it(formattedPath, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::Subdirectories);
-    QFileInfo info(formattedPath);
-
-    if (!info.isDir() && !it.hasNext() && info.exists())
-    {
-        m_pathMap[formattedPath] = rootFolderName;
-        return true;
-    }
-
-    // Get the index of the last sub folder name in the path
-    QStringList directoryNameList = formattedPath.split('/');
-    int lastFolderIndex = directoryNameList.size() - 1;
-
-    QString pathToBeRelativeTo = directoryNameList.mid(0, lastFolderIndex).join('/');
-
-    while (it.hasNext())
-    {
-        QString absolutePath = it.next();
-        QFileInfo absoluteInfo(absolutePath);
-        QString extension = absoluteInfo.completeSuffix();
-
-        if (QString(AssetImporterManagerPrivate::s_crateFileExtension).compare(extension, Qt::CaseInsensitive) == 0)
-        {
-            return false;
-        }
-
-        Q_ASSERT(absolutePath.startsWith(pathToBeRelativeTo));
-        QString relativePath = absolutePath.mid(pathToBeRelativeTo.size() + 1);
-        m_pathMap[absolutePath] = relativePath;
-    }
-
-    return true;
-}
-
-void AssetImporterManager::RemoveOldPath(QString oldAbsolutePath, QString oldRelativePath)
-{
-    QDir absoluteDir = QFileInfo(oldAbsolutePath).absoluteDir();
-    QStringList directoryList = oldRelativePath.split('/');
-
-    // remove each folder from the leave to the root, based on the relative path
-    for (int i = 0; i < directoryList.size(); ++i)
-    {
-        QString currentDir = absoluteDir.path();
-        absoluteDir.rmpath(currentDir);
-        absoluteDir.cdUp();
-    }
-}
-
-void AssetImporterManager::SetDestinationFileWritable(QFile& destinationFile)
-{
-    if (destinationFile.open(QIODevice::ReadOnly))
-    {
-        destinationFile.setPermissions(QFile::WriteOwner | destinationFile.permissions());
-    }
-
-    destinationFile.close();
-}
-
-QString AssetImporterManager::CreateFileNameWithNumber(int number, QString fileName, int index, QString extension)
-{
-    QString newFileName;
-
-    newFileName = fileName.isEmpty() ? fileName : fileName.left(index);
-
-    newFileName += "(" + QString::number(number) + ")";
-
-    if (extension.size() > 0)
-    {
-        newFileName += "." + extension;
-    }
-
-    return newFileName;
-}
-
-QString AssetImporterManager::GenerateAbsolutePath(QString relativePath)
-{
-    return QDir(m_destinationRootDirectory).absoluteFilePath(relativePath);
-}
-
-QString AssetImporterManager::GetFileName(QString path)
-{
-    return QFileInfo(path).fileName();
-}
-
-#include <AssetImporter/AssetImporterManager/moc_AssetImporterManager.cpp>
diff --git a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h b/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h
deleted file mode 100644
index b95db3d6e4..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QMainWindow>
-#include <AssetImporter/UI/SelectDestinationDialog.h>
-#endif
-
-class QStringList;
-class QFile;
-
-enum class ImportFilesMethod
-{
-    CopyFiles,
-    MoveFiles
-};
-
-enum class ProcessFilesMethod
-{
-    OverwriteFile,
-    KeepBothFile,
-    SkipProcessingFile,
-    OverwriteAllFiles,
-    KeepBothAllFiles,
-    SkipProcessingAllFiles,
-    Cancel,
-
-    Default
-};
-
-class AssetImporterManager
-    : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit AssetImporterManager(QWidget* parent = nullptr);
-    ~AssetImporterManager();
-
-    // Modal, but blocking.
-    void Exec(); // for browsing files
-    void Exec(const QStringList& dragAndDropFileList); // for drag and drop
-
-Q_SIGNALS:
-    void StartAssetImporter();
-    void StopAssetImporter();
-
-private Q_SLOTS:
-    void reject();
-    void OnDragAndDropFiles(const QStringList* fileList);
-    bool OnBrowseFiles();
-    void OnBrowseDestinationFilePath(QLineEdit* destinationLineEdit);
-    void OnCopyFiles();
-    void OnMoveFiles();
-    bool OnOverwriteFiles(QString relativePath, QString oldAbsolutePath);
-    bool OnKeepBothFiles(QString relativePath, QString oldAbsolutePath);
-    void OnOpenLogDialog();
-    void OnSetDestinationDirectory(QString destinationDirectory);
-
-private:
-    void OnOpenSelectDestinationDialog();
-
-    ProcessFilesMethod OnOpenFilesAlreadyExistDialog(QString message, int numberOfFiles);
-    ProcessFilesMethod UpdateProcessFileMethod(ProcessFilesMethod processMethod, bool applyToAll);
-    bool ProcessFileMethod(ProcessFilesMethod processMethod, QString relativePath, QString oldAbsolutePath);
-    
-    void OnOpenProcessingAssetsDialog(int numberOfProcessedFiles);
-
-    void ProcessCopyFiles();
-    void ProcessMoveFiles();
-
-    bool Copy(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath);
-    bool Move(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath);
-    bool Overwrite(QString relativePath, QString oldAbsolutePath, QString destinationAbsolutePath);
-
-    bool GetAndCheckAllFilesInFolder(QString path);
-    void RemoveOldPath(QString oldAbsolutePath, QString oldRelativePath);
-    void SetDestinationFileWritable(QFile& destinationFile);
-
-    QString CreateFileNameWithNumber(int number, QString fileName, int index, QString extension);
-    QString GenerateAbsolutePath(QString relativePath);
-    QString GetFileName(QString path);
-
-    ImportFilesMethod m_importMethod;
-
-    // Key = absolute path, Value = relative path
-    QMap<QString, QString> m_pathMap;
-    QString m_destinationRootDirectory;
-};
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp b/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp
deleted file mode 100644
index 9a1af081ac..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "FilesAlreadyExistDialog.h"
-
-// Qt
-#include <QPushButton>
-#include <QStyle>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <AssetImporter/UI/ui_FilesAlreadyExistDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-FilesAlreadyExistDialog::FilesAlreadyExistDialog(QString message ,int numberOfFiles, QWidget* parent)
-    : QDialog(parent)
-    , m_ui(new Ui::FilesAlreadyExistDialog)
-{
-    m_ui->setupUi(this);
-
-    UpdateMessage(message);
-    InitializeButtons();
-    UpdateCheckBoxState(numberOfFiles);
-}
-
-FilesAlreadyExistDialog::~FilesAlreadyExistDialog()
-{
-}
-
-void FilesAlreadyExistDialog::InitializeButtons()
-{
-    m_ui->buttonBox->setContentsMargins(0, 0, 16, 16);
-    QPushButton* overwriteButton = m_ui->buttonBox->addButton(tr("Overwrite"), QDialogButtonBox::AcceptRole);
-    QPushButton* keepBothButton = m_ui->buttonBox->addButton(tr("Keep Both"), QDialogButtonBox::AcceptRole);
-    QPushButton* skipButton = m_ui->buttonBox->addButton(tr("Skip"), QDialogButtonBox::AcceptRole);
-
-    overwriteButton->setProperty("class", "Primary");
-    overwriteButton->setDefault(true);
-
-    keepBothButton->setProperty("class", "AssetImporterLargerButton");
-    keepBothButton->style()->unpolish(keepBothButton);
-    keepBothButton->style()->polish(keepBothButton);
-    keepBothButton->update();
-
-    skipButton->setProperty("class", "AssetImporterButton");
-    skipButton->style()->unpolish(skipButton);
-    skipButton->style()->polish(skipButton);
-    skipButton->update();
-
-    connect(overwriteButton, &QPushButton::clicked, this, &FilesAlreadyExistDialog::DoOverwrite);
-    connect(keepBothButton, &QPushButton::clicked, this, &FilesAlreadyExistDialog::DoKeepBoth);
-    connect(skipButton, &QPushButton::clicked, this, &FilesAlreadyExistDialog::DoSkipCurrentProcess);
-}
-
-void FilesAlreadyExistDialog::UpdateMessage(QString message)
-{
-    m_ui->message->setText(message);
-}
-
-void FilesAlreadyExistDialog::DoSkipCurrentProcess()
-{
-    QDialog::accept();
-    Q_EMIT SkipCurrentProcess();
-}
-
-void FilesAlreadyExistDialog::DoOverwrite()
-{
-    QDialog::accept();
-    Q_EMIT OverWriteFiles();
-}
-
-void FilesAlreadyExistDialog::DoKeepBoth()
-{
-    QDialog::accept();
-    Q_EMIT KeepBothFiles();
-}
-
-void FilesAlreadyExistDialog::DoApplyActionToAllFiles()
-{
-    Q_EMIT ApplyActionToAllFiles(m_ui->applyToAllCheckBox->isChecked());
-}
-
-void FilesAlreadyExistDialog::UpdateCheckBoxState(int numberOfFiles)
-{
-    m_ui->applyToAllCheckBox->setVisible((numberOfFiles > 1));
-    connect(m_ui->applyToAllCheckBox, &QCheckBox::stateChanged, this, &FilesAlreadyExistDialog::DoApplyActionToAllFiles);
-}
-
-void FilesAlreadyExistDialog::closeEvent([[maybe_unused]] QCloseEvent* ev)
-{
-    QDialog::reject();
-    Q_EMIT CancelAllProcesses();
-}
-
-#include <AssetImporter/UI/moc_FilesAlreadyExistDialog.cpp>
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h b/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h
deleted file mode 100644
index 82380437b0..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-class QTreeView;
-
-namespace Ui {
-    class FilesAlreadyExistDialog;
-}
-
-class FilesAlreadyExistDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    FilesAlreadyExistDialog(QString message, int numberOfFiles, QWidget* parent = nullptr);
-    ~FilesAlreadyExistDialog();
-
-Q_SIGNALS:
-    void OverWriteFiles();
-    void KeepBothFiles();
-    void SkipCurrentProcess();
-    void CancelAllProcesses();
-    void ApplyActionToAllFiles(bool result);
-
-public Q_SLOTS:
-    void DoSkipCurrentProcess();
-    void DoOverwrite();
-    void DoKeepBoth();
-    void DoApplyActionToAllFiles();
-
-private:
-    void InitializeButtons();
-    void UpdateMessage(QString message);
-    void UpdateCheckBoxState(int numberOfFiles);
-    void closeEvent(QCloseEvent* ev) override;
-    QScopedPointer<Ui::FilesAlreadyExistDialog> m_ui;
-};
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp b/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp
deleted file mode 100644
index 9c2caee7ab..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ProcessingAssetsDialog.h"
-
-// Qt
-#include <QPushButton>
-#include <QStyle>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <AssetImporter/UI/ui_ProcessingAssetsDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-ProcessingAssetsDialog::ProcessingAssetsDialog(int numberOfProcessedFiles, QWidget* parent)
-    : QDialog(parent)
-    , m_ui(new Ui::ProcessingAssetsDialog)
-{
-    m_ui->setupUi(this);
-    UpdateTextsAndTitle(numberOfProcessedFiles);
-    InitializeButtons();
-}
-
-ProcessingAssetsDialog::~ProcessingAssetsDialog()
-{
-}
-
-void ProcessingAssetsDialog::InitializeButtons()
-{
-    QPushButton* viewStatusButton = m_ui->buttonBox->addButton(tr("View status"), QDialogButtonBox::AcceptRole);
-    QPushButton* closeButton = m_ui->buttonBox->addButton(tr("Close"), QDialogButtonBox::RejectRole);
-
-    viewStatusButton->setDefault(true);
-    viewStatusButton->setProperty("class", "AssetImporterLargerButton");
-    viewStatusButton->style()->unpolish(viewStatusButton);
-    viewStatusButton->style()->polish(viewStatusButton);
-    viewStatusButton->update();
-
-    closeButton->setProperty("class", "AssetImporterButton");
-    closeButton->style()->unpolish(closeButton);
-    closeButton->style()->polish(closeButton);
-    closeButton->update();
-
-    connect(viewStatusButton, &QPushButton::clicked, this, &ProcessingAssetsDialog::accept);
-    connect(closeButton, &QPushButton::clicked, this, &ProcessingAssetsDialog::reject); 
-}
-
-void ProcessingAssetsDialog::accept()
-{
-    Q_EMIT OpenLogDialog();
-    QDialog::accept();
-}
-
-void ProcessingAssetsDialog::reject()
-{
-    Q_EMIT CloseProcessingAssetsDialog();
-    QDialog::reject();
-}
-
-void ProcessingAssetsDialog::UpdateTextsAndTitle(int numberOfProcessedFiles)
-{
-    if (numberOfProcessedFiles > 1)
-    {
-        setWindowTitle("Processing assets");
-        m_ui->label->setText("The Asset Processor will process your assets and when they are finished they will appear in the Asset Browser. You can view the status of your assets in the Asset Processor.");
-    }
-    else
-    {
-        setWindowTitle("Processing asset");
-        m_ui->label->setText("The Asset Processor will process your asset and when it is finished it will appear in the Asset Browser. You can view the status of your asset in the Asset Processor.");
-    }   
-}
-
-#include <AssetImporter/UI/moc_ProcessingAssetsDialog.cpp>
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.h b/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.h
deleted file mode 100644
index 3d7cf0f592..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui {
-    class ProcessingAssetsDialog;
-}
-
-class ProcessingAssetsDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    ProcessingAssetsDialog(int numberOfProcessedFiles, QWidget* parent = nullptr);
-    ~ProcessingAssetsDialog();
-
-    void InitializeButtons();
-
-Q_SIGNALS:
-    void CloseProcessingAssetsDialog();
-    void OpenLogDialog();
-
-public Q_SLOTS:
-    void accept();
-    void reject();
-
-private:
-    void UpdateTextsAndTitle(int numberOfProcessedFiles);
-    QScopedPointer<Ui::ProcessingAssetsDialog> m_ui;
-};
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.cpp b/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
deleted file mode 100644
index 03c10e4e9b..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "SelectDestinationDialog.h"
-
-// Qt
-#include <QValidator>
-#include <QSettings>
-#include <QStyle>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <AssetImporter/UI/ui_SelectDestinationDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-static const char* g_assetProcessorLink = "<a href=\"https://o3de.org/docs/user-guide/assets/pipeline/processor-ui/\">Asset Processor</a>";
-static const char* g_copyFilesMessage = "The original file will remain outside of the project and the %1 will not monitor the file.";
-static const char* g_moveFilesMessage = "The original file will be moved inside of the project and the %1 will monitor the file for changes.";
-static const char* g_selectDestinationFilesPath = "AssetImporter/SelectDestinationFilesPath";
-
-static const char* g_toolTipInvalidRoot = "<p style='white-space:pre'> <span style=\"color:#cccccc;\">Invalid directory. Please choose a destination directory within your game project: %1.</span> </p>";
-static const char* g_toolTipPathMustExist = "<p style='white-space:pre'> <span style=\"color:#cccccc;\">Invalid directory. Please choose a destination directory that exists.</span> </p>";
-static const char* g_toolTipPathMustBeDirectory = "<p style='white-space:pre'> <span style=\"color:#cccccc;\">Invalid directory. Please choose a valid destination directory.</span> </p>";
-static const char* g_toolTipInvalidLength = "<p style='white-space:pre'> <span style=\"color:#cccccc;\">Invalid directory name length. Please choose a destination path that has fewer than %1 characters.</span> </p>";
-
-namespace
-{
-    static QString GetAbsoluteRootDirectoryPath()
-    {
-        QDir gameRoot(Path::GetEditingGameDataFolder().c_str());
-        return gameRoot.absolutePath();
-    }
-}
-
-class DestinationDialogValidator
-    : public QValidator
-{
-public:
-    DestinationDialogValidator(QObject* parent)
-        : QValidator(parent)
-        , m_gameRootAbsolutePath(GetAbsoluteRootDirectoryPath())
-    {
-    }
-
-    State validate(QString& input, [[maybe_unused]] int& pos) const override
-    {
-        m_toolTip = "";
-
-        if (input.isEmpty())
-        {
-            return QValidator::Acceptable;
-        }
-
-        // The underlying file system code can't cope with long file paths, regardless of platform
-        if (input.length() > (AZ_MAX_PATH_LEN - 1))
-        {
-            m_toolTip = QString(g_toolTipInvalidLength).arg(AZ_MAX_PATH_LEN);
-            return QValidator::Intermediate;
-        }
-
-        QString normalizedInput = QDir::fromNativeSeparators(input);
-
-        // Note: the check for the root directory is case insensitive.
-        // We check if the directory actually exists after this, and at that point,
-        // if the file path has to be case sensitive, the directory won't exist anyways
-        // and QFileInfo::exists() will tell us so this should still work even on
-        // case sensitive file systems (such as Mac and Linux)
-        if (!normalizedInput.startsWith(m_gameRootAbsolutePath, Qt::CaseInsensitive))
-        {
-            m_toolTip = QString(g_toolTipInvalidRoot).arg(m_gameRootAbsolutePath);
-            return QValidator::Intermediate;
-        }
-
-        QFileInfo fileInfo(normalizedInput);
-        if (!fileInfo.exists())
-        {
-            m_toolTip = g_toolTipPathMustExist;
-            return QValidator::Intermediate;
-        }
-
-        if (!fileInfo.isDir())
-        {
-            m_toolTip = g_toolTipPathMustBeDirectory;
-            return QValidator::Intermediate;
-        }
-
-        return QValidator::Acceptable;
-    }
-
-    QString infoToolTip() const
-    {
-        return m_toolTip;
-    }
-
-private:
-    QString m_gameRootAbsolutePath;
-    mutable QString m_toolTip;
-};
-
-SelectDestinationDialog::SelectDestinationDialog(QString message, QWidget* parent)
-    : QDialog(parent)
-    , m_ui(new Ui::SelectDestinationDialog)
-    , m_validator(new DestinationDialogValidator(this))
-{
-    m_ui->setupUi(this);
-
-    QString radioButtonMessage = QString(g_copyFilesMessage).arg(g_assetProcessorLink);
-    m_ui->RaidoButtonMessage->setText(radioButtonMessage);
-
-    SetPreviousDestinationDirectory();
-
-    m_ui->DestinationLineEdit->setValidator(m_validator);
-    m_ui->DestinationLineEdit->setAlignment(Qt::AlignVCenter);
-
-    // Based on the current code structure, in order to prevent texts from overlapping the 
-    // invalid icon, intentionally insert an empty icon at the end of the line edit field can do the trick.
-    m_ui->DestinationLineEdit->addAction(QIcon(""), QLineEdit::TrailingPosition);
-
-    connect(m_ui->DestinationLineEdit, &QLineEdit::textChanged, this, &SelectDestinationDialog::ValidatePath);
-    connect(m_ui->BrowseButton, &QPushButton::clicked, this, &SelectDestinationDialog::OnBrowseDestinationFilePath, Qt::UniqueConnection);
-    connect(m_ui->CopyFileRadioButton, &QRadioButton::toggled, this, &SelectDestinationDialog::ShowMessage);
-
-    UpdateMessage(message);
-    InitializeButtons();
-}
-
-SelectDestinationDialog::~SelectDestinationDialog()
-{
-}
-
-void SelectDestinationDialog::InitializeButtons()
-{
-    m_ui->CopyFileRadioButton->setChecked(true);
-
-    m_ui->buttonBox->setContentsMargins(0, 0, 16, 16);
-
-    QPushButton* importButton = m_ui->buttonBox->addButton(tr("Import"), QDialogButtonBox::AcceptRole);
-    QPushButton* cancelButton = m_ui->buttonBox->addButton(QDialogButtonBox::Cancel);
-
-    importButton->setProperty("class", "Primary");
-    importButton->setDefault(true);
-
-    cancelButton->setProperty("class", "AssetImporterButton");
-    cancelButton->style()->unpolish(cancelButton);
-    cancelButton->style()->polish(cancelButton);
-    cancelButton->update();
-
-    connect(importButton, &QPushButton::clicked, this, &SelectDestinationDialog::accept);
-    connect(cancelButton, &QPushButton::clicked, this, &SelectDestinationDialog::reject);
-    connect(this, &SelectDestinationDialog::UpdateImportButtonState, importButton, &QPushButton::setEnabled);
-
-    // To make sure the import button state is up to date
-    ValidatePath();
-    importButton->setAutoDefault(true);
-
-}
-
-void SelectDestinationDialog::SetPreviousDestinationDirectory()
-{
-    QString gameRootAbsPath = GetAbsoluteRootDirectoryPath();
-    QSettings settings;
-    QString previousDestination = settings.value(g_selectDestinationFilesPath).toString();
-
-    // Case 1: if currentDestination is empty at this point, that means this is the first time
-    //         users using the Asset Importer, set the default directory to be the current game project's root folder
-    // Case 2: if the current folder directory stored in the registry doesn't exist anymore,
-    //         that means users have removed the directory already (deleted or use the Move feature).
-    // Case 3: if it's a directory outside of the game root folder, then in general,
-    //         users have modified the folder directory in the registry. It should not be happening.
-    if (previousDestination.isEmpty() || !QDir(previousDestination).exists() || !previousDestination.startsWith(gameRootAbsPath, Qt::CaseInsensitive))
-    {
-        previousDestination = gameRootAbsPath;
-    }
-
-    m_ui->DestinationLineEdit->setText(QDir::toNativeSeparators(previousDestination));
-}
-
-void SelectDestinationDialog::accept()
-{
-    QDialog::accept();
-
-    // This prevent users from not editing the destination line edit (manually type the directory or browse for the directory)
-    Q_EMIT SetDestinationDirectory(DestinationDirectory());
-
-    if (m_ui->CopyFileRadioButton->isChecked())
-    {
-        Q_EMIT DoCopyFiles();
-    }
-    else if (m_ui->MoveFileRadioButton->isChecked())
-    {
-        Q_EMIT DoMoveFiles();
-    }
-}
-
-void SelectDestinationDialog::reject()
-{
-    Q_EMIT Cancel();
-    QDialog::reject();
-}
-
-void SelectDestinationDialog::ShowMessage()
-{
-    QString message = m_ui->CopyFileRadioButton->isChecked() ? g_copyFilesMessage : g_moveFilesMessage;
-    m_ui->RaidoButtonMessage->setText(message.arg(g_assetProcessorLink));
-}
-
-void SelectDestinationDialog::OnBrowseDestinationFilePath()
-{
-    Q_EMIT BrowseDestinationPath(m_ui->DestinationLineEdit);
-}
-
-void SelectDestinationDialog::UpdateMessage(QString message)
-{
-    m_ui->NumberOfFilesMessage->setText(message);
-}
-
-void SelectDestinationDialog::ValidatePath()
-{
-    if (!m_ui->DestinationLineEdit->hasAcceptableInput())
-    {
-        m_ui->DestinationLineEdit->setToolTip(m_validator->infoToolTip());
-        Q_EMIT UpdateImportButtonState(false);
-    }
-    else
-    {
-        QString destinationDirectory = DestinationDirectory();
-        int strLength = destinationDirectory.length();
-
-        // store the updated acceptable destination directory into the registry,
-        // so that when users manually modify the directory,
-        // the Asset Importer will remember it
-        Q_EMIT SetDestinationDirectory(destinationDirectory);
-
-        m_ui->DestinationLineEdit->setToolTip("");
-        Q_EMIT UpdateImportButtonState(strLength > 0);   
-    } 
-}
-
-QString SelectDestinationDialog::DestinationDirectory() const
-{
-    return QDir::fromNativeSeparators(m_ui->DestinationLineEdit->text());
-}
-
-#include <AssetImporter/UI/moc_SelectDestinationDialog.cpp>
-
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.h b/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.h
deleted file mode 100644
index ecb7c4f277..0000000000
--- a/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzQtComponents/Components/StyledLineEdit.h>
-#include <QLabel>
-#include <QDialog>
-#include <QDialogButtonBox>
-#endif
-
-class StyledLineEdit;
-class QValidator;
-
-class DestinationDialogValidator;
-
-namespace Ui {
-    class SelectDestinationDialog;
-}
-
-class SelectDestinationDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    SelectDestinationDialog(QString message, QWidget* parent = nullptr);
-    ~SelectDestinationDialog();
-    
-Q_SIGNALS:
-    void GoBack();
-    void DoCopyFiles();
-    void DoMoveFiles();
-    void BrowseDestinationPath(QLineEdit* destinationLineEdit);
-    void Cancel();
-    void UpdateImportButtonState(bool enabled);
-    void SetDestinationDirectory(QString destinationDirectory);
-
-public Q_SLOTS:
-    void accept();
-    void reject();
-    void ShowMessage();
-    void OnBrowseDestinationFilePath();
-    void ValidatePath();
-
-private:
-    void UpdateMessage(QString message);
-    void InitializeButtons();
-    void SetPreviousDestinationDirectory();
-    QString DestinationDirectory() const;
-
-    QScopedPointer<Ui::SelectDestinationDialog> m_ui;
-    DestinationDialogValidator* m_validator;
-};
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.cpp b/Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.cpp
deleted file mode 100644
index 452e30f762..0000000000
--- a/Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "AzAssetBrowserWindow.h"
-#include "AzAssetBrowser/ui_AssetBrowserWindow.h"
-
-#include <AzToolsFramework/AssetBrowser/UI/AssetTreeView.h>
-#include <AzToolsFramework/AssetBrowser/UI/SortFilterProxyModel.hxx>
-#include <AzToolsFramework/AssetBrowser/UI/AssetBrowserModel.h>
-#include <AzToolsFramework/AssetBrowser/AssetCache/AssetCacheBus.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserRequestBus.h>
-
-const char* ASSET_BROWSER_PREVIEW_NAME = "Asset Browser (PREVIEW)";
-
-AzAssetBrowserWindow::AzAssetBrowserWindow(const QString& name, QWidget* parent)
-        : QDialog(parent)
-        , m_ui(new Ui::AssetBrowserWindowClass())
-        , m_assetDatabaseSortFilterProxyModel(new AssetBrowser::UI::SortFilterProxyModel(parent))
-        , m_name(name)
-        , m_assetBrowser(new AssetBrowser::UI::AssetTreeView(name, this))
-    {
-        EBUS_EVENT_RESULT(m_assetBrowserModel, AssetBrowser::AssetCache::AssetCacheRequestsBus, GetAssetBrowserModel);
-        AZ_Assert(m_assetBrowserModel, "Failed to get filebrowser model");
-        m_assetDatabaseSortFilterProxyModel->setSourceModel(m_assetBrowserModel);
-
-        m_ui->setupUi(this);
-
-        connect(m_ui->searchCriteriaWidget,
-            &AzToolsFramework::SearchCriteriaWidget::SearchCriteriaChanged,
-            m_assetDatabaseSortFilterProxyModel.data(),
-            &AssetBrowser::UI::SortFilterProxyModel::OnSearchCriteriaChanged);
-
-        connect(m_assetBrowser, &QTreeView::customContextMenuRequested, this, &AzAssetBrowserWindow::OnContextMenu);
-    }
-
-    AzAssetBrowserWindow::~AzAssetBrowserWindow()
-    {
-        m_assetBrowser->SaveState();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    const AZ::Uuid& AzAssetBrowserWindow::GetClassID()
-    {
-        return AZ::AzTypeInfo<AzAssetBrowserWindow>::Uuid();
-    }
-
-    void AzAssetBrowserWindow::OnContextMenu(const QPoint& point)
-    {
-        (void)point;
-        //get the selected entries
-        QModelIndexList sourceIndexes;
-        for (const auto& index : m_assetBrowser->selectedIndexes())
-        {
-            sourceIndexes.push_back(m_assetDatabaseSortFilterProxyModel->mapToSource(index));
-        }
-        AZStd::vector<AssetBrowser::UI::Entry*> entries;
-        m_assetBrowserModel->SourceIndexesToAssetDatabaseEntries(sourceIndexes, entries);
-
-        if (entries.empty() || entries.size() > 1)
-        {
-            return;
-        }
-        auto entry = entries.front();
-
-        EBUS_EVENT(AssetBrowser::AssetBrowserRequestBus::Bus, OnItemContextMenu, this, entry);
-    }
-
-#include <AzAssetBrowser/moc_AzAssetBrowserWindow.cpp>
-
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.h b/Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.h
deleted file mode 100644
index fe0f58629d..0000000000
--- a/Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Math/Uuid.h>
-
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class AssetBrowserWindowClass;
-}
-
-namespace AssetBrowser
-{
-    namespace UI
-    {
-        class AssetTreeView;
-        class SortFilterProxyModel;
-        class AssetBrowserModel;
-    }
-}
-
-class AzAssetBrowserWindow
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(AzAssetBrowserWindow, AZ::SystemAllocator, 0);
-    AZ_TYPE_INFO(AzAssetBrowserWindow, "{20238D23-2670-44BC-9110-A51374C18B5A}");
-
-    explicit AzAssetBrowserWindow(const QString& name = "default", QWidget* parent = nullptr);
-    virtual ~AzAssetBrowserWindow();
-
-    static const AZ::Uuid& GetClassID();
-
-protected Q_SLOTS:
-    void OnContextMenu(const QPoint& point);
-
-private:
-    QScopedPointer<Ui::AssetBrowserWindowClass> m_ui;
-    QScopedPointer<AssetBrowser::UI::AssetBrowserModel> m_assetDatabaseModel;
-    QScopedPointer<AssetBrowser::UI::SortFilterProxyModel> m_assetDatabaseSortFilterProxyModel;
-    QString m_name;
-    AssetBrowser::UI::AssetTreeView* m_assetBrowser;
-    AssetBrowser::UI::AssetBrowserModel* m_assetBrowserModel;
-};
-
-extern const char* ASSET_BROWSER_PREVIEW_NAME;
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
deleted file mode 100644
index 4a604c3fd1..0000000000
--- a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
+++ /dev/null
@@ -1,718 +0,0 @@
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "AzAssetBrowserRequestHandler.h"
-
-// Qt
-#include <QMenu>
-#include <QDesktopServices>
-
-// AzCore
-#include <AzCore/std/string/wildcard.h>
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Asset/AssetTypeInfoBus.h>
-
-// AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/Asset/GenericAssetHandler.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/AssetBrowser/AssetBrowserSourceDropBus.h>
-#include <AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.h>
-#include <AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h>
-#include <AzToolsFramework/AssetEditor/AssetEditorBus.h>
-#include <AzToolsFramework/Commands/EntityStateCommand.h>
-#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
-#include <AzToolsFramework/Slice/SliceUtilities.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/ToolsComponents/EditorLayerComponent.h>
-#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
-#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
-#include <AzToolsFramework/UI/Slice/SliceRelationshipBus.h>
-
-// AzQtComponents
-#include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
-
-// Editor
-#include "IEditor.h"
-#include "Include/IObjectManager.h"
-#include "CryEditDoc.h"
-#include "QtViewPaneManager.h"
-
-namespace AzAssetBrowserRequestHandlerPrivate
-{
-    using namespace AzToolsFramework;
-    using namespace AzToolsFramework::AssetBrowser;
-    // return true ONLY if we can handle the drop request in the viewport.
-    bool CanSpawnEntityForProduct(const ProductAssetBrowserEntry* product,
-        AZStd::optional<const AZStd::vector<AZ::Data::AssetType>> optionalProductAssetTypes = AZStd::nullopt)
-    {
-        if (!product)
-        {
-            return false;
-        }
-
-        if (product->GetAssetType() == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
-        {
-            return true; // we can always spawn slices.
-        }
-
-        bool canCreateComponent = false;
-        AZ::AssetTypeInfoBus::EventResult(canCreateComponent, product->GetAssetType(), &AZ::AssetTypeInfo::CanCreateComponent, product->GetAssetId());
-        if (!canCreateComponent)
-        {
-            return false;
-        }
-
-        AZ::Uuid componentTypeId = AZ::Uuid::CreateNull();
-        AZ::AssetTypeInfoBus::EventResult(componentTypeId, product->GetAssetType(), &AZ::AssetTypeInfo::GetComponentTypeId);
-        if (componentTypeId.IsNull())
-        {
-            // we have a component type that handles this asset.
-            return false;
-        }
-
-        if (optionalProductAssetTypes.has_value())
-        {
-            bool hasConflictingProducts = false;
-            AZ::AssetTypeInfoBus::EventResult(hasConflictingProducts, product->GetAssetType(), &AZ::AssetTypeInfo::HasConflictingProducts, optionalProductAssetTypes.value());
-            if (hasConflictingProducts)
-            {
-                return false;
-            }
-        }
-
-        // additional operations can be added here.
-
-        return true;
-    }
-
-    void SpawnEntityAtPoint(const ProductAssetBrowserEntry* product, AzQtComponents::ViewportDragContext* viewportDragContext, EntityIdList& spawnList, AzFramework::SliceInstantiationTicket& spawnTicket)
-    {
-        // Calculate the drop location.
-        if ((!viewportDragContext) || (!product))
-        {
-            return;
-        }
-
-        const AZ::Transform worldTransform = AZ::Transform::CreateTranslation(viewportDragContext->m_hitLocation);
-
-        // Handle instantiation of slices.
-        if (product->GetAssetType() == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
-        {
-            // Instantiate the slice at the specified location.
-            AZ::Data::Asset<AZ::SliceAsset> asset = AZ::Data::AssetManager::Instance().FindOrCreateAsset<AZ::SliceAsset>(product->GetAssetId(), AZ::Data::AssetLoadBehavior::Default);
-            if (asset)
-            {
-                SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(spawnTicket,
-                    &SliceEditorEntityOwnershipServiceRequests::InstantiateEditorSlice, asset, worldTransform);
-            }
-        }
-        else
-        {
-            ScopedUndoBatch undo("Create entities from asset");
-
-            //  Add the component(s).
-            AZ::Uuid componentTypeId = AZ::Uuid::CreateNull();
-            AZ::AssetTypeInfoBus::EventResult(componentTypeId, product->GetAssetType(), &AZ::AssetTypeInfo::GetComponentTypeId);
-            if (!componentTypeId.IsNull())
-            {
-                AZStd::string entityName;
-
-                // If the entity is being created from an asset, name it after said asset.
-                const AZ::Data::AssetId assetId = product->GetAssetId();
-                AZStd::string assetPath;
-                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetPath, &AZ::Data::AssetCatalogRequests::GetAssetPathById, assetId);
-                if (!assetPath.empty())
-                {
-                    AzFramework::StringFunc::Path::GetFileName(assetPath.c_str(), entityName);
-                }
-
-                // If not sourced from an asset, generate a generic name.
-                if (entityName.empty())
-                {
-                    entityName = AZStd::string::format("Entity%d", GetIEditor()->GetObjectManager()->GetObjectCount());
-                }
-
-                AZ::EntityId targetEntityId;
-                EditorRequests::Bus::BroadcastResult(targetEntityId, &EditorRequests::CreateNewEntityAtPosition, worldTransform.GetTranslation(), AZ::EntityId());
-
-                AZ::Entity* newEntity = nullptr;
-                AZ::ComponentApplicationBus::BroadcastResult(newEntity, &AZ::ComponentApplicationRequests::FindEntity, targetEntityId);
-
-                if (newEntity == nullptr)
-                {
-                    return;
-                }
-
-                newEntity->SetName(entityName);
-
-                newEntity->Deactivate();
-
-                // Create component.
-                AZ::Component* newComponent = newEntity->CreateComponent(componentTypeId);
-                // If it's not an "editor component" then wrap it in a GenericComponentWrapper.
-                bool needsGenericWrapper = azrtti_cast<AzToolsFramework::Components::EditorComponentBase*>(newComponent) == nullptr;
-                if (needsGenericWrapper)
-                {
-                    newEntity->RemoveComponent(newComponent);
-                    newComponent = aznew AzToolsFramework::Components::GenericComponentWrapper(newComponent);
-                    newEntity->AddComponent(newComponent);
-                }
-
-                newEntity->Activate();
-
-                // set asset after components have been activated in AddEditorEntity method
-                if (newComponent)
-                {
-                    Components::EditorComponentBase* asEditorComponent =
-                        azrtti_cast<Components::EditorComponentBase*>(newComponent);
-
-                    if (asEditorComponent)
-                    {
-                        asEditorComponent->SetPrimaryAsset(assetId);
-                    }
-                }
-
-                bool isPrefabSystemEnabled = false;
-                AzFramework::ApplicationRequests::Bus::BroadcastResult(
-                    isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-                if (!isPrefabSystemEnabled)
-                {
-                    // Prepare undo command last so it captures the final state of the entity.
-                    EntityCreateCommand* command = aznew EntityCreateCommand(static_cast<AZ::u64>(newEntity->GetId()));
-                    command->Capture(newEntity);
-                    command->SetParent(undo.GetUndoBatch());
-                }
-
-                ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::AddDirtyEntity, newEntity->GetId());
-                spawnList.push_back(newEntity->GetId());
-            }
-        }
-    }
-
-    // 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()
-{
-    using namespace AzToolsFramework::AssetBrowser;
-
-    AssetBrowserInteractionNotificationBus::Handler::BusConnect();
-    AzQtComponents::DragAndDropEventsBus::Handler::BusConnect(AzQtComponents::DragAndDropContexts::EditorViewport);
-}
-
-AzAssetBrowserRequestHandler::~AzAssetBrowserRequestHandler()
-{
-    AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
-    AzQtComponents::DragAndDropEventsBus::Handler::BusDisconnect();
-}
-
-void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu* menu, const AZStd::vector<AzToolsFramework::AssetBrowser::AssetBrowserEntry*>& entries)
-{
-    using namespace AzToolsFramework::AssetBrowser;
-
-    AssetBrowserEntry* entry = entries.empty() ? nullptr : entries.front();
-    if (!entry)
-    {
-        return;
-    }
-
-    AZStd::string fullFileDirectory;
-    AZStd::string fullFilePath;
-    AZStd::string fileName;
-    AZStd::string extension;
-
-    switch (entry->GetEntryType())
-    {
-    case AssetBrowserEntry::AssetEntryType::Product:
-        // if its a product, we actually want to perform these operations on the source
-        // which will be the parent of the product.
-        entry = entry->GetParent();
-        if ((!entry) || (entry->GetEntryType() != AssetBrowserEntry::AssetEntryType::Source))
-        {
-            AZ_Assert(false, "Asset Browser entry product has a non-source parent?");
-            break;     // no valid parent.
-        }
-    // the fall through to the next case is intentional here.
-    case AssetBrowserEntry::AssetEntryType::Source:
-    {
-        AZ::Uuid sourceID = azrtti_cast<SourceAssetBrowserEntry*>(entry)->GetSourceUuid();
-        fullFilePath = entry->GetFullPath();
-        fullFileDirectory = fullFilePath.substr(0, fullFilePath.find_last_of(AZ_CORRECT_DATABASE_SEPARATOR));
-        fileName = entry->GetName();
-        AzFramework::StringFunc::Path::GetExtension(fullFilePath.c_str(), extension);
-
-        // Add the "Open" menu item.
-        // Note that source file openers are allowed to "veto" the showing of the "Open" menu if it is 100% known that they aren't openable!
-        // for example, custom data formats that are made by Open 3D Engine that can not have a program associated in the operating system to view them.
-        // If the only opener that can open that file has no m_opener, then it is not openable.
-        SourceFileOpenerList openers;
-        AssetBrowserInteractionNotificationBus::Broadcast(&AssetBrowserInteractionNotificationBus::Events::AddSourceFileOpeners, fullFilePath.c_str(), sourceID, openers);
-        bool validOpenersFound = false;
-        bool vetoOpenerFound = false;
-        for (const SourceFileOpenerDetails& openerDetails : openers)
-        {
-            if (openerDetails.m_opener) 
-            {
-                // we found a valid opener (non-null).  This means that the system is saying that it knows how to internally
-                // edit this source file and has a custom editor for it.
-                validOpenersFound = true;
-            }
-            else
-            {
-                // if we get here it means someone intentionally registered a callback with a null function pointer
-                // the API treats this as a 'veto' opener - meaning that the system wants us NOT to allow the operating system
-                // to open this source file as a default fallback.
-                vetoOpenerFound = true;
-            }
-        }
-
-        if (validOpenersFound)
-        {
-            // if we get here then there is an opener installed for this kind of asset
-            // and it is not null, meaning that it is not vetoing our ability to open the file.
-            for (const SourceFileOpenerDetails& openerDetails : openers)
-            {
-                // bind that function to the current loop element.
-                if (openerDetails.m_opener) // only VALID openers with an actual callback.
-                {
-                    menu->addAction(openerDetails.m_iconToUse, QObject::tr(openerDetails.m_displayText.c_str()), [sourceID, fullFilePath, openerDetails]()
-                    {
-                        openerDetails.m_opener(fullFilePath.c_str(), sourceID);
-                    });
-                }
-            }
-        }
-        
-        // we always add the default "open with your operating system" unless a veto opener is found
-        if (!vetoOpenerFound)
-        {
-            // if we found no valid openers and no veto openers then just allow it to be opened with the operating system itself.
-            menu->addAction(QObject::tr("Open with associated application..."), [this, fullFilePath]()
-            {
-                OpenWithOS(fullFilePath);
-            });
-        }
-
-        AZStd::vector<const ProductAssetBrowserEntry*> products;
-        entry->GetChildrenRecursively<ProductAssetBrowserEntry>(products);
-
-        // slice source files need to react by adding additional menu items, regardless of status of compile or presence of products.
-        if (AzFramework::StringFunc::Equal(extension.c_str(), AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str(), false))
-        {
-            AzToolsFramework::SliceUtilities::CreateSliceAssetContextMenu(menu, fullFilePath);
-
-            // SliceUtilities is in AZToolsFramework and can't open viewports, so add the relationship view open command here.
-            if (!products.empty())
-            {
-                const ProductAssetBrowserEntry* productEntry = products[0];
-                menu->addAction("Open in Slice Relationship View", [productEntry]()
-                {
-                    QtViewPaneManager::instance()->OpenPane(LyViewPane::SliceRelationships);
-
-                    const ProductAssetBrowserEntry* product = azrtti_cast<const ProductAssetBrowserEntry*>(productEntry);
-
-                    AzToolsFramework::SliceRelationshipRequestBus::Broadcast(&AzToolsFramework::SliceRelationshipRequests::OnSliceRelationshipViewRequested, product->GetAssetId());
-                });
-            }
-        }
-        else if (AzFramework::StringFunc::Equal(extension.c_str(), AzToolsFramework::Layers::EditorLayerComponent::GetLayerExtensionWithDot().c_str(), false))
-        {
-            QString levelPath = Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName());
-            AzToolsFramework::Layers::EditorLayerComponent::CreateLayerAssetContextMenu(menu, fullFilePath, levelPath);
-        }
-
-        if (products.empty())
-        {
-            if (entry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Source)
-            {
-                CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
-            }
-            return;
-        }
-      
-        CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
-    }
-    break;
-    case AssetBrowserEntry::AssetEntryType::Folder:
-    {
-        fullFileDirectory = entry->GetFullPath();
-        // we are sending an empty filename to indicate that it is a folder and not a file
-        CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
-    }
-    break;
-    default:
-        break;
-    }
-}
-
-bool AzAssetBrowserRequestHandler::CanAcceptDragAndDropEvent(
-    QDropEvent* event,
-    AzQtComponents::DragAndDropContextBase& context,
-    AZStd::optional<AZStd::vector<const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry*>*> outSources,
-    AZStd::optional<AZStd::vector<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>*> outProducts
-) const
-{
-    using namespace AzQtComponents;
-    using namespace AzToolsFramework;
-    using namespace AzToolsFramework::AssetBrowser;
-    using namespace AzAssetBrowserRequestHandlerPrivate;
-
-    // if a listener with a higher priority already claimed this event, do not touch it.
-    ViewportDragContext* viewportDragContext = azrtti_cast<ViewportDragContext*>(&context);
-    if ((!event) || (!event->mimeData()) || (event->isAccepted()) || (!viewportDragContext))
-    {
-        return false;
-    }
-
-    bool canAcceptEvent = false;
-
-    // Detects Source Asset Entries whose extensions are handled by a system
-    AzToolsFramework::AssetBrowser::AssetBrowserEntry::ForEachEntryInMimeData<SourceAssetBrowserEntry>(
-        event->mimeData(), [&](const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry* source) {
-            if (AssetBrowser::AssetBrowserSourceDropBus::HasHandlers(source->GetExtension()))
-            {
-                if (outSources.has_value())
-                {
-                    outSources.value()->push_back(source);
-                }
-                canAcceptEvent = true;
-            }
-        });
-
-    // Detects Product Assets that are dragged directly, or child Products of other entry types.
-    AzToolsFramework::AssetBrowser::AssetBrowserEntry::ForEachEntryInMimeData<ProductAssetBrowserEntry>(
-        event->mimeData(), [&](const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* product)
-    {
-        // Skip if this product is a child of a source file that is handled
-        if (outSources.has_value() && !outSources.value()->empty())
-        {
-            auto parent = azrtti_cast<const SourceAssetBrowserEntry*>(product->GetParent());
-            if (parent != nullptr && AZStd::find(outSources.value()->begin(), outSources.value()->end(), parent) != outSources.value()->end())
-            {
-                return;
-            }
-        }
-
-        if (CanSpawnEntityForProduct(product))
-        {
-            if (outProducts.has_value())
-            {
-                outProducts.value()->push_back(product);
-            }
-            canAcceptEvent = true;
-        }
-    });
-
-    return canAcceptEvent;
-}
-
-void AzAssetBrowserRequestHandler::DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context)
-{
-    if (CanAcceptDragAndDropEvent(event, context))
-    {
-        event->setDropAction(Qt::CopyAction);
-        event->setAccepted(true);
-    }
-}
-
-void AzAssetBrowserRequestHandler::DragMove(QDragMoveEvent* event, AzQtComponents::DragAndDropContextBase& context)
-{
-    if (CanAcceptDragAndDropEvent(event, context))
-    {
-        event->setDropAction(Qt::CopyAction);
-        event->setAccepted(true);
-    }
-}
-
-void AzAssetBrowserRequestHandler::DragLeave(QDragLeaveEvent* /*event*/)
-{
-    // opportunities to show ghosted entities or previews here.
-}
-
-void AzAssetBrowserRequestHandler::Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context)
-{
-    using namespace AzToolsFramework;
-    using namespace AzToolsFramework::AssetBrowser;
-    using namespace AzQtComponents;
-    using namespace AzAssetBrowserRequestHandlerPrivate;
-
-    AZStd::vector<const SourceAssetBrowserEntry*> sources;
-    AZStd::vector<const ProductAssetBrowserEntry*> products;
-
-    if (!CanAcceptDragAndDropEvent(event, context, &sources, &products))
-    {
-        // ALWAYS CHECK - you are not the only one connected to this bus, and someone else may have already
-        // handled the event or accepted the drop - it might not contain types relevant to you.
-        // you still get informed about the drop event in case you did some stuff in your gui and need to clean it up.
-        return;
-    }
-
-    //  we wouldn't reach this code if the following cast is null or the event was null or accepted was already true.
-    ViewportDragContext* viewportDragContext = azrtti_cast<ViewportDragContext*>(&context);
-
-    event->setDropAction(Qt::CopyAction);
-    event->setAccepted(true);
-
-    EntityIdList spawnedEntities;
-    AzFramework::SliceInstantiationTicket spawnTicket;
-
-    // Make a scoped undo that covers the ENTIRE operation.
-    ScopedUndoBatch undo("Create entities from asset");
-
-    // Handle sources
-    for (const SourceAssetBrowserEntry* source : sources)
-    {
-        AssetBrowser::AssetBrowserSourceDropBus::Event(
-            source->GetExtension(),
-            &AssetBrowser::AssetBrowserSourceDropEvents::HandleSourceFileType,
-            source->GetFullPath(),
-            AZ::EntityId(),
-            viewportDragContext->m_hitLocation
-        );
-    }
-
-    // Handle products
-    AZStd::vector<AZ::Data::AssetType> productAssetTypes;
-    productAssetTypes.reserve(products.size());
-    for (const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* entry : products)
-    {
-        productAssetTypes.emplace_back(entry->GetAssetType());
-    }
-
-    for (const ProductAssetBrowserEntry* product : products)
-    {
-        if (CanSpawnEntityForProduct(product, productAssetTypes))
-        {
-            SpawnEntityAtPoint(product, viewportDragContext, spawnedEntities, spawnTicket);
-        }
-    }
-
-    // Select the new entity (and deselect others).
-    if (!spawnedEntities.empty())
-    {
-        ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, spawnedEntities);
-    }
-}
-
-void AzAssetBrowserRequestHandler::AddSourceFileOpeners(const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers)
-{
-    using namespace AzToolsFramework;
-
-    //Get asset group to support a variety of file extensions
-    const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry* fullDetails =
-        AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry::GetSourceByUuid(sourceUUID);
-    if (!fullDetails)
-    {
-        return;
-    }
-    QString assetGroup;
-    AZ::AssetTypeInfoBus::EventResult(assetGroup, fullDetails->GetPrimaryAssetType(), &AZ::AssetTypeInfo::GetGroup);
-
-    if (AZStd::wildcard_match("*.lua", fullSourceFileName))
-    {
-        AZStd::string fullName(fullSourceFileName);
-        // LUA files can be opened with the O3DE LUA editor.
-        openers.push_back(
-            {
-                "O3DE_LUA_Editor",
-                "Open in Open 3D Engine LUA Editor...",
-                QIcon(),
-                [](const char* fullSourceFileNameInCallback, const AZ::Uuid& /*sourceUUID*/)
-                {
-                    // we know how to handle LUA files (open with the lua Editor.
-                    EditorRequestBus::Broadcast(&EditorRequests::LaunchLuaEditor, fullSourceFileNameInCallback);
-                }
-            });
-    }
-
-    if (!openers.empty())
-    {
-        return; // we found one
-    }
-    
-    // if we still havent found one, check to see if it is a default "generic" serializable asset
-    // and open the asset editor if so. Check whether the Generic Asset handler handles this kind of asset.
-    // to do so we need the actual type of that asset, which requires an asset type, not a source type.
-    AZ::Data::AssetManager& manager = AZ::Data::AssetManager::Instance();
-
-    // find a product type to query against.
-    AZStd::vector<const AssetBrowser::ProductAssetBrowserEntry*> candidates;
-    fullDetails->GetChildrenRecursively<AssetBrowser::ProductAssetBrowserEntry>(candidates);
-
-    // find the first one that is handled by something:
-    for (const AssetBrowser::ProductAssetBrowserEntry* productEntry : candidates)
-    {
-        // is there a Generic Asset Handler for it?
-        AZ::Data::AssetType productAssetType = productEntry->GetAssetType();
-        if ((productAssetType == AZ::Data::s_invalidAssetType) || (!productEntry->GetAssetId().IsValid()))
-        {
-            continue;
-        }
-
-        if (const AZ::Data::AssetHandler* assetHandler = manager.GetHandler(productAssetType))
-        {
-            if (!azrtti_istypeof<AzFramework::GenericAssetHandlerBase*>(assetHandler))
-            {
-                // it is not the generic asset handler.
-                continue;
-            }
-            
-            // yes, it is the generic asset handler, so install an opener that sends it to the Asset Editor.
-
-            AZ::Data::AssetId assetId = productEntry->GetAssetId();
-            AZ::Data::AssetType assetType = productEntry->GetAssetType();
-
-            openers.push_back(
-            {
-                "Open_In_Asset_Editor",
-                "Open in Asset Editor...",
-                QIcon(),
-                [assetId, assetType](const char* /*fullSourceFileNameInCallback*/, const AZ::Uuid& /*sourceUUID*/)
-            {
-                AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::AssetManager::Instance().FindOrCreateAsset(assetId, assetType, AZ::Data::AssetLoadBehavior::Default);
-                AzToolsFramework::AssetEditor::AssetEditorRequestsBus::Broadcast(&AzToolsFramework::AssetEditor::AssetEditorRequests::OpenAssetEditor, asset);
-            }
-            });
-            break; // no need to proceed further
-        }
-    }
-}
-
-void AzAssetBrowserRequestHandler::OpenAssetInAssociatedEditor(const AZ::Data::AssetId& assetId, bool& alreadyHandled)
-{
-    using namespace AzToolsFramework::AssetBrowser;
-    if (alreadyHandled)
-    {
-        // a higher priority listener has already taken this request.
-        return;
-    }
-    const SourceAssetBrowserEntry* source = SourceAssetBrowserEntry::GetSourceByUuid(assetId.m_guid);
-    if (!source)
-    {
-        return;
-    }
-
-    AZStd::string fullEntryPath = source->GetFullPath();
-    AZ::Uuid sourceID = source->GetSourceUuid();
-
-    if (fullEntryPath.empty())
-    {
-        return;
-    }
-
-    QWidget* mainWindow = nullptr;
-    AzToolsFramework::EditorRequestBus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::GetMainWindow);
-
-    SourceFileOpenerList openers;
-    AssetBrowserInteractionNotificationBus::Broadcast(&AssetBrowserInteractionNotificationBus::Events::AddSourceFileOpeners, fullEntryPath.c_str(), sourceID, openers);
-
-    // did anyone actually accept it?
-    if (!openers.empty())
-    {
-        // yes, call the opener and return.
-
-        // are there more than one opener(s)?
-        const SourceFileOpenerDetails* openerToUse = nullptr;
-        // a function which reassigns openerToUse to be the selected one.
-        AZStd::function<void(const SourceFileOpenerDetails*)> switchToOpener = [&openerToUse](const SourceFileOpenerDetails* switchTo)
-            {
-                openerToUse = switchTo;
-            };
-
-        // callers are allowed to add nullptr to openers.  So we only evaluate the valid ones.
-        // and if there is only one valid one, we use that one.
-        const SourceFileOpenerDetails* firstValidOpener = nullptr;
-        int numValidOpeners = 0;
-        QMenu menu(mainWindow);
-        for (const SourceFileOpenerDetails& openerDetails : openers)
-        {
-            // bind that function to the current loop element.
-            if (openerDetails.m_opener) // only VALID openers with an actual callback.
-            {
-                ++numValidOpeners;
-                if (!firstValidOpener)
-                {
-                    firstValidOpener = &openerDetails;
-                }
-                // bind a callback such that when the menu item is clicked, it sets that as the opener to use.
-                menu.addAction(openerDetails.m_iconToUse, QObject::tr(openerDetails.m_displayText.c_str()), mainWindow, AZStd::bind(switchToOpener, &openerDetails));
-            }
-        }
-
-        if (numValidOpeners > 1) // more than one option was added
-        {
-            menu.addSeparator();
-            menu.addAction(QObject::tr("Cancel"), AZStd::bind(switchToOpener, nullptr)); // just something to click on to avoid doing anything.
-            menu.exec(QCursor::pos());
-        }
-        else if (numValidOpeners == 1)
-        {
-            openerToUse = firstValidOpener;
-        }
-
-        // did we select one and did it have a function to call?
-        if ((openerToUse) && (openerToUse->m_opener))
-        {
-            openerToUse->m_opener(fullEntryPath.c_str(), sourceID);
-        }
-        alreadyHandled = true;
-        return; // an opener handled this, no need to proceed further.
-    }
-
-    // if we get here, nothing handled it, so try the operating system.
-    alreadyHandled = OpenWithOS(fullEntryPath);
-}
-
-bool AzAssetBrowserRequestHandler::OpenWithOS(const AZStd::string& fullEntryPath)
-{
-    bool openedSuccessfully = QDesktopServices::openUrl(QUrl::fromLocalFile(QString::fromUtf8(fullEntryPath.c_str())));
-    if (!openedSuccessfully)
-    {
-        AZ_Printf("Asset Browser", "Unable to open '%s' using the operating system.  There might be no editor associated with this kind of file.\n", fullEntryPath.c_str());
-    }
-
-    return openedSuccessfully;
-}
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h
deleted file mode 100644
index f7f7d54fb9..0000000000
--- a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzQtComponents/Buses/DragAndDrop.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
-#include <AzToolsFramework/AssetBrowser/Previewer/PreviewerBus.h>
-
-namespace AZ
-{
-    class Entity;
-}
-
-namespace AzQtComponents
-{
-    class DragAndDropContextBase;
-}
-
-namespace AzToolsFramework
-{
-    namespace AssetBrowser
-    {
-        class AssetBrowserEntry;
-        class PreviewerFactory;
-        class ProductAssetBrowserEntry;
-        class SourceAssetBrowserEntry;
-    }
-}
-
-class AzAssetBrowserRequestHandler
-    : protected AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
-    , protected AzQtComponents::DragAndDropEventsBus::Handler
-{
-public:
-    AzAssetBrowserRequestHandler();
-    ~AzAssetBrowserRequestHandler() override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // AssetBrowserInteractionNotificationBus
-    //////////////////////////////////////////////////////////////////////////
-    void AddContextMenuActions(QWidget* caller, QMenu* menu, const AZStd::vector<AzToolsFramework::AssetBrowser::AssetBrowserEntry*>& entries) override;
-    void AddSourceFileOpeners(const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers) override;
-    void OpenAssetInAssociatedEditor(const AZ::Data::AssetId& assetId, bool& alreadyHandled) override;
-
-    static bool OpenWithOS(const AZStd::string& fullEntryPath);
-protected:
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzQtComponents::DragAndDropEventsBus::Handler
-    //////////////////////////////////////////////////////////////////////////
-    void DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
-    void DragMove(QDragMoveEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
-    void DragLeave(QDragLeaveEvent* event) override;
-    void Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
-
-    bool CanAcceptDragAndDropEvent(
-        QDropEvent* event, AzQtComponents::DragAndDropContextBase& context,
-        AZStd::optional<AZStd::vector<const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry*>*> outSources = AZStd::nullopt,
-        AZStd::optional<AZStd::vector<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>*> outProducts = AZStd::nullopt) const;
-};
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
deleted file mode 100644
index 2a5f853e9b..0000000000
--- a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "AzAssetBrowserWindow.h"
-
-// AzToolsFramework
-#include <AzCore/Console/IConsole.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserModel.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserTableModel.h>
-
-// AzQtComponents
-#include <AzQtComponents/Utilities/QtWindowUtilities.h>
-
-// Editor
-#include "AzAssetBrowser/AzAssetBrowserRequestHandler.h"
-#include "LyViewPaneNames.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <AzAssetBrowser/ui_AzAssetBrowserWindow.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-AZ_CVAR_EXTERNED(bool, ed_useNewAssetBrowserTableView);
-
-class ListenerForShowAssetEditorEvent
-    : public QObject
-    , private AzToolsFramework::EditorEvents::Bus::Handler
-{
-public:
-    ListenerForShowAssetEditorEvent(QObject* parent = nullptr)
-        : QObject(parent)
-    {
-        AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
-    }
-
-    ~ListenerForShowAssetEditorEvent()
-    {
-        AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
-    }
-
-    void SelectAsset(const QString& assetPath) override
-    {
-        AzToolsFramework::OpenViewPane(LyViewPane::AssetBrowser);
-
-        AzAssetBrowserWindow* assetBrowser = AzToolsFramework::GetViewPaneWidget<AzAssetBrowserWindow>(LyViewPane::AssetBrowser);
-        if (assetBrowser)
-        {
-            AzQtComponents::bringWindowToTop(assetBrowser);
-
-            assetBrowser->SelectAsset(assetPath);
-        }
-    }
-};
-
-AzAssetBrowserWindow::AzAssetBrowserWindow(QWidget* parent)
-    : QWidget(parent)
-    , m_ui(new Ui::AzAssetBrowserWindowClass())
-    , m_filterModel(new AzToolsFramework::AssetBrowser::AssetBrowserFilterModel(parent))
-    , m_tableModel(new AzToolsFramework::AssetBrowser::AssetBrowserTableModel(parent))
-{
-    m_ui->setupUi(this);
-    m_ui->m_searchWidget->Setup(true, true);
-
-    namespace AzAssetBrowser = AzToolsFramework::AssetBrowser;
-
-    AzAssetBrowser::AssetBrowserComponentRequestBus::BroadcastResult(m_assetBrowserModel, &AzAssetBrowser::AssetBrowserComponentRequests::GetAssetBrowserModel);
-    AZ_Assert(m_assetBrowserModel, "Failed to get filebrowser model");
-    m_filterModel->setSourceModel(m_assetBrowserModel);
-    m_filterModel->SetFilter(m_ui->m_searchWidget->GetFilter());
-
-    m_ui->m_viewSwitcherCheckBox->setVisible(false);
-    m_ui->m_assetBrowserTableViewWidget->setVisible(false);
-    if (ed_useNewAssetBrowserTableView)
-    {
-        m_ui->m_viewSwitcherCheckBox->setVisible(true);
-        m_tableModel->setFilterRole(Qt::DisplayRole);
-        m_tableModel->setSourceModel(m_filterModel.data());
-        m_ui->m_assetBrowserTableViewWidget->setModel(m_tableModel.data());
-        connect(
-            m_filterModel.data(), &AzAssetBrowser::AssetBrowserFilterModel::filterChanged, this,
-            [this]()
-            {
-                if (!m_ui->m_searchWidget->GetFilterString().isEmpty())
-                {
-                    m_tableModel->UpdateTableModelMaps();
-                }
-            });
-        connect(
-            m_ui->m_assetBrowserTableViewWidget, &AzAssetBrowser::AssetBrowserTableView::selectionChangedSignal, this,
-            &AzAssetBrowserWindow::SelectionChangedSlot);
-        connect(
-            m_ui->m_assetBrowserTableViewWidget, &QAbstractItemView::doubleClicked, this,
-            &AzAssetBrowserWindow::DoubleClickedItem);
-        connect(
-            m_ui->m_assetBrowserTableViewWidget, &AzAssetBrowser::AssetBrowserTableView::ClearStringFilter, m_ui->m_searchWidget,
-            &AzAssetBrowser::SearchWidget::ClearStringFilter);
-        connect(
-            m_ui->m_assetBrowserTableViewWidget, &AzAssetBrowser::AssetBrowserTableView::ClearTypeFilter, m_ui->m_searchWidget,
-            &AzAssetBrowser::SearchWidget::ClearTypeFilter);
-
-        m_ui->m_assetBrowserTableViewWidget->SetName("AssetBrowserTableView_main");
-
-        connect(
-            m_filterModel.data(), &AzAssetBrowser::AssetBrowserFilterModel::filterChanged, this,
-            [this]()
-            {
-                const bool hasFilter = !m_ui->m_searchWidget->GetFilterString().isEmpty();
-                m_ui->m_assetBrowserTableViewWidget->setVisible(hasFilter);
-                m_ui->m_assetBrowserTreeViewWidget->setVisible(!hasFilter);
-            });
-        connect(
-            m_ui->m_viewSwitcherCheckBox, &QCheckBox::stateChanged, this,
-            [this](bool visible)
-            {
-                m_ui->m_assetBrowserTableViewWidget->setVisible(visible);
-                m_ui->m_assetBrowserTreeViewWidget->setVisible(!visible);
-            });
-    }
-
-    m_ui->m_assetBrowserTreeViewWidget->setModel(m_filterModel.data());
-
-    connect(
-        m_ui->m_searchWidget->GetFilter().data(), &AzAssetBrowser::AssetBrowserEntryFilter::updatedSignal, m_filterModel.data(),
-        &AzAssetBrowser::AssetBrowserFilterModel::filterUpdatedSlot);
-    connect(
-        m_filterModel.data(), &AzAssetBrowser::AssetBrowserFilterModel::filterChanged, this,
-        [this]()
-        {
-            const bool hasFilter = !m_ui->m_searchWidget->GetFilterString().isEmpty();
-            const bool selectFirstFilteredIndex = false;
-            m_ui->m_assetBrowserTreeViewWidget->UpdateAfterFilter(hasFilter, selectFirstFilteredIndex);
-        });
-
-    connect(
-        m_ui->m_assetBrowserTreeViewWidget, &AzAssetBrowser::AssetBrowserTreeView::selectionChangedSignal, this,
-        &AzAssetBrowserWindow::SelectionChangedSlot);
-
-    connect(m_ui->m_assetBrowserTreeViewWidget, &QAbstractItemView::doubleClicked, this, &AzAssetBrowserWindow::DoubleClickedItem);
-
-    connect(
-        m_ui->m_assetBrowserTreeViewWidget, &AzAssetBrowser::AssetBrowserTreeView::ClearStringFilter, m_ui->m_searchWidget,
-        &AzAssetBrowser::SearchWidget::ClearStringFilter);
-    connect(
-        m_ui->m_assetBrowserTreeViewWidget, &AzAssetBrowser::AssetBrowserTreeView::ClearTypeFilter, m_ui->m_searchWidget,
-        &AzAssetBrowser::SearchWidget::ClearTypeFilter);
-
-    m_ui->m_assetBrowserTreeViewWidget->SetName("AssetBrowserTreeView_main");
-}
-
-AzAssetBrowserWindow::~AzAssetBrowserWindow()
-{
-    m_ui->m_assetBrowserTreeViewWidget->SaveState();
-}
-
-void AzAssetBrowserWindow::RegisterViewClass()
-{
-    AzToolsFramework::ViewPaneOptions options;
-    options.preferedDockingArea = Qt::LeftDockWidgetArea;
-    AzToolsFramework::RegisterViewPane<AzAssetBrowserWindow>(LyViewPane::AssetBrowser, LyViewPane::CategoryTools, options);
-}
-
-QObject* AzAssetBrowserWindow::createListenerForShowAssetEditorEvent(QObject* parent)
-{
-    auto* listener = new ListenerForShowAssetEditorEvent(parent);
-
-    // the listener is attached to the parent and will get cleaned up then
-    return listener;
-}
-
-void AzAssetBrowserWindow::UpdatePreview() const
-{
-    const auto& selectedAssets = m_ui->m_assetBrowserTreeViewWidget->isVisible()
-        ? m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets()
-        : m_ui->m_assetBrowserTableViewWidget->GetSelectedAssets();
-
-    if (selectedAssets.size() != 1)
-    {
-        m_ui->m_previewerFrame->Clear();
-        return;
-    }
-
-    m_ui->m_previewerFrame->Display(selectedAssets.front());
-}
-
-static void ExpandTreeToIndex(QTreeView* treeView, const QModelIndex& index)
-{
-    treeView->collapseAll();
-
-    // Note that we deliberately don't expand the index passed in
-
-    // collapseAll above will close all but the top level nodes.
-    // treeView->expand(index) marks a node as expanded, but if it's parent isn't expanded,
-    // there won't be any paint updates because it doesn't expand parent nodes.
-    // So, to minimize paint updates, we expand everything in reverse order (leaf up to root), so that
-    // painting will only actually occur once the top level parent is expanded.
-    QModelIndex parentIndex = index.parent();
-    while (parentIndex.isValid())
-    {
-        treeView->expand(parentIndex);
-        parentIndex = parentIndex.parent();
-    }
-}
-
-void AzAssetBrowserWindow::SelectAsset(const QString& assetPath)
-{
-    QModelIndex index = m_assetBrowserModel->findIndex(assetPath);
-    if (index.isValid())
-    {
-        m_ui->m_searchWidget->ClearTextFilter();
-        m_ui->m_searchWidget->ClearTypeFilter();
-
-        // Queue the expand and select stuff, so that it doesn't get processed the same
-        // update as the search widget clearing - something with the search widget clearing
-        // interferes with the update from the select and expand, and if you don't
-        // queue it, the tree doesn't expand reliably.
-
-        QTimer::singleShot(
-            0, this,
-            [this, filteredIndex = index]
-            {
-                // the treeview has a filter model so we have to backwards go from that
-                QModelIndex index = m_filterModel->mapFromSource(filteredIndex);
-
-                QTreeView* treeView = m_ui->m_assetBrowserTreeViewWidget;
-                ExpandTreeToIndex(treeView, index);
-
-                treeView->scrollTo(index);
-                treeView->setCurrentIndex(index);
-
-                treeView->selectionModel()->select(index, QItemSelectionModel::ClearAndSelect);
-            });
-    }
-}
-
-void AzAssetBrowserWindow::SelectionChangedSlot(const QItemSelection& /*selected*/, const QItemSelection& /*deselected*/) const
-{
-    UpdatePreview();
-}
-
-// while its tempting to use Activated here, we dont actually want it to count as activation
-// just becuase on some OS clicking once is activation.
-void AzAssetBrowserWindow::DoubleClickedItem([[maybe_unused]] const QModelIndex& element)
-{
-    namespace AzAssetBrowser = AzToolsFramework::AssetBrowser;
-    
-    const auto& selectedAssets = m_ui->m_assetBrowserTreeViewWidget->isVisible()
-        ? m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets()
-        : m_ui->m_assetBrowserTableViewWidget->GetSelectedAssets();
-
-    for (const AzAssetBrowser::AssetBrowserEntry* entry : selectedAssets)
-    {
-        AZ::Data::AssetId assetIdToOpen;
-        AZStd::string fullFilePath;
-
-        if (const AzAssetBrowser::ProductAssetBrowserEntry* productEntry = azrtti_cast<const AzAssetBrowser::ProductAssetBrowserEntry*>(entry))
-        {
-            assetIdToOpen = productEntry->GetAssetId();
-            fullFilePath = entry->GetFullPath();
-        }
-        else if (const AzAssetBrowser::SourceAssetBrowserEntry* sourceEntry = azrtti_cast<const AzAssetBrowser::SourceAssetBrowserEntry*>(entry))
-        {
-            // manufacture an empty AssetID with the source's UUID
-            assetIdToOpen = AZ::Data::AssetId(sourceEntry->GetSourceUuid(), 0);
-            fullFilePath = entry->GetFullPath();
-        }
-
-        bool handledBySomeone = false;
-        if (assetIdToOpen.IsValid())
-        {
-            AzAssetBrowser::AssetBrowserInteractionNotificationBus::Broadcast(
-                &AzAssetBrowser::AssetBrowserInteractionNotifications::OpenAssetInAssociatedEditor, assetIdToOpen, handledBySomeone);
-        }
-
-        if (!handledBySomeone && !fullFilePath.empty())
-        {
-            AzAssetBrowserRequestHandler::OpenWithOS(fullFilePath);
-        }
-    }
-}
-
-#include <AzAssetBrowser/moc_AzAssetBrowserWindow.cpp>
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
deleted file mode 100644
index f9460fbd5c..0000000000
--- a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/Memory/SystemAllocator.h>
-
-#include <QWidget>
-#endif
-
-class QItemSelection;
-
-namespace Ui
-{
-    class AzAssetBrowserWindowClass;
-}
-
-namespace AzToolsFramework
-{
-    namespace AssetBrowser
-    {
-        class AssetBrowserFilterModel;
-        class AssetBrowserTableModel;
-        class AssetBrowserModel;
-        class AssetBrowserTableFilterModel;
-    }
-}
-
-class AzAssetBrowserWindow
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(AzAssetBrowserWindow, AZ::SystemAllocator, 0);
-
-    explicit AzAssetBrowserWindow(QWidget* parent = nullptr);
-    virtual ~AzAssetBrowserWindow();
-
-    void SelectAsset(const QString& assetPath);
-
-    static void RegisterViewClass();
-
-    static QObject* createListenerForShowAssetEditorEvent(QObject* parent);
-
-private:
-
-    QScopedPointer<Ui::AzAssetBrowserWindowClass> m_ui;
-    QScopedPointer<AzToolsFramework::AssetBrowser::AssetBrowserFilterModel> m_filterModel;
-    QScopedPointer<AzToolsFramework::AssetBrowser::AssetBrowserTableModel> m_tableModel;
-    AzToolsFramework::AssetBrowser::AssetBrowserModel* m_assetBrowserModel;
-    
-    void UpdatePreview() const;
-
-private Q_SLOTS:
-    void SelectionChangedSlot(const QItemSelection& selected, const QItemSelection& deselected) const;
-    void DoubleClickedItem(const QModelIndex& element);
-};
-
-extern const char* AZ_ASSET_BROWSER_PREVIEW_NAME;
diff --git a/Code/Sandbox/Editor/BaseLibrary.cpp b/Code/Sandbox/Editor/BaseLibrary.cpp
deleted file mode 100644
index 25e72e1604..0000000000
--- a/Code/Sandbox/Editor/BaseLibrary.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "BaseLibrary.h"
-#include "BaseLibraryItem.h"
-#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 = 0)
-        : m_pLib(pLib)
-        , m_description(description)
-        , m_redo(0)
-        , m_selectedItem(selectedItem)
-    {
-        assert(m_pLib);
-
-        m_undo = GetIEditor()->GetSystem()->CreateXmlNode("Undo");
-        m_pLib->Serialize(m_undo, false);
-    }
-
-    virtual QString GetEditorObjectName()
-    {
-        return m_selectedItem;
-    }
-
-protected:
-    virtual int GetSize() { return sizeof(CUndoBaseLibrary); }
-    virtual QString GetDescription() { return m_description; };
-
-    virtual void Undo(bool bUndo)
-    {
-        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);
-    }
-
-    virtual void Redo()
-    {
-        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.
-//////////////////////////////////////////////////////////////////////////
-CBaseLibrary::CBaseLibrary(IBaseLibraryManager* pManager)
-    : m_pManager(pManager)
-    , m_bModified(false)
-    , m_bLevelLib(false)
-    , m_bNewLibrary(true)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseLibrary::~CBaseLibrary()
-{
-    m_items.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-IBaseLibraryManager* CBaseLibrary::GetManager()
-{
-    return m_pManager;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibrary::RemoveAllItems()
-{
-    AddRef();
-    for (int i = 0; i < m_items.size(); i++)
-    {
-        // Unregister item in case it was registered.  It is ok if it wasn't.  This is still safe to call.
-        m_pManager->UnregisterItem(m_items[i]);
-        // Clear library item.
-        m_items[i]->m_library = NULL;
-    }
-    m_items.clear();
-    Release();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibrary::SetName(const QString& name)
-{
-    //the fullname of the items in the library will be changed due to library's name change
-    //so we need unregistered them and register them after their name changed.
-    for (int i = 0; i < m_items.size(); i++)
-    {
-        m_pManager->UnregisterItem(m_items[i]);
-    }
-
-    m_name = name;
-
-    for (int i = 0; i < m_items.size(); i++)
-    {
-        m_pManager->RegisterItem(m_items[i]);
-    }
-
-    SetModified();
-}
-
-//////////////////////////////////////////////////////////////////////////
-const QString& CBaseLibrary::GetName() const
-{
-    return m_name;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseLibrary::Save()
-{
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseLibrary::Load(const QString& filename)
-{
-    m_filename = filename;
-    SetModified(false);
-    m_bNewLibrary = false;
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibrary::SetModified(bool bModified)
-{
-    if (bModified != m_bModified)
-    {
-        m_bModified = bModified;
-        emit Modified(bModified);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibrary::AddItem(IDataBaseItem* item, bool bRegister)
-{
-
-    CBaseLibraryItem* pLibItem = (CBaseLibraryItem*)item;
-    // Check if item is already assigned to this library.
-    if (pLibItem->m_library != this)
-    {
-        pLibItem->m_library = this;
-        m_items.push_back(pLibItem);
-        SetModified();
-        if (bRegister)
-        {
-            m_pManager->RegisterItem(pLibItem);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibrary::GetItem(int index)
-{
-    assert(index >= 0 && index < m_items.size());
-    return m_items[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibrary::RemoveItem(IDataBaseItem* item)
-{
-
-    for (int i = 0; i < m_items.size(); i++)
-    {
-        if (m_items[i] == item)
-        {
-            // Unregister item in case it was registered.  It is ok if it wasn't.  This is still safe to call.
-            m_pManager->UnregisterItem(m_items[i]);
-            m_items.erase(m_items.begin() + i);
-            SetModified();
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibrary::FindItem(const QString& name)
-{
-    for (int i = 0; i < m_items.size(); i++)
-    {
-        if (QString::compare(m_items[i]->GetName(), name, Qt::CaseInsensitive) == 0)
-        {
-            return m_items[i];
-        }
-    }
-    return NULL;
-}
-
-bool CBaseLibrary::AddLibraryToSourceControl(const QString& fullPathName) const
-{
-    IEditor* pEditor = GetIEditor();
-    IFileUtil* pFileUtil = pEditor ? pEditor->GetFileUtil() : nullptr;
-    if (pFileUtil)
-    {
-        return pFileUtil->CheckoutFile(fullPathName.toUtf8().data(), nullptr);
-    }
-
-    return false;
-}
-
-bool CBaseLibrary::SaveLibrary(const char* name, bool saveEmptyLibrary)
-{
-    assert(name != NULL);
-    if (name == NULL)
-    {
-        CryFatalError("The library you are attempting to save has no name specified.");
-        return false;
-    }
-
-    QString fileName(GetFilename());
-    if (fileName.isEmpty() && !saveEmptyLibrary)
-    {
-        return false;
-    }
-
-    fileName = Path::GamePathToFullPath(fileName);
-
-    XmlNodeRef root = GetIEditor()->GetSystem()->CreateXmlNode(name);
-    Serialize(root, false);
-    bool bRes = XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), root, fileName.toUtf8().data());
-    if (m_bNewLibrary)
-    {
-        AddLibraryToSourceControl(fileName);
-        m_bNewLibrary = false;
-    }
-    if (!bRes)
-    {
-        string strMessage;
-        QByteArray filenameUtf8 = fileName.toUtf8();
-        strMessage.Format("The file %s is read-only and the save of the library couldn't be performed. Try to remove the \"read-only\" flag or check-out the file and then try again.", filenameUtf8.data());
-        CryMessageBox(strMessage.c_str(), "Saving Error", MB_OK | MB_ICONWARNING);
-    }
-    return bRes;
-}
-
-//CONFETTI BEGIN
-void CBaseLibrary::ChangeItemOrder(CBaseLibraryItem* item, unsigned int newLocation)
-{
-    std::vector<_smart_ptr<CBaseLibraryItem> > temp;
-    for (unsigned int i = 0; i < m_items.size(); i++)
-    {
-        if (i == newLocation)
-        {
-            temp.push_back(_smart_ptr<CBaseLibraryItem>(item));
-        }
-        if (m_items[i] != item)
-        {
-            temp.push_back(m_items[i]);
-        }
-    }
-    // If newLocation is greater than the original size, append the item to end of the list
-    if (newLocation >= m_items.size())
-    {
-        temp.push_back(_smart_ptr<CBaseLibraryItem>(item));
-    }
-    m_items = temp;
-}
-//CONFETTI END
-
-#include <moc_BaseLibrary.cpp>
diff --git a/Code/Sandbox/Editor/BaseLibrary.h b/Code/Sandbox/Editor/BaseLibrary.h
deleted file mode 100644
index ce18af55ee..0000000000
--- a/Code/Sandbox/Editor/BaseLibrary.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_BASELIBRARY_H
-#define CRYINCLUDE_EDITOR_BASELIBRARY_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "Include/IDataBaseLibrary.h"
-#include "Include/IBaseLibraryManager.h"
-#include "Include/EditorCoreAPI.h"
-#include "Util/TRefCountBase.h"
-
-#include <QObject>
-#endif
-
-// Ensure we don't try to dllimport when moc includes us
-#if defined(Q_MOC_BUILD) && !defined(EDITOR_CORE)
-#define EDITOR_CORE
-#endif
-
-/** This a base class for all Libraries used by Editor.
-*/
-class EDITOR_CORE_API CBaseLibrary
-    : public QObject
-    , public TRefCountBase<IDataBaseLibrary>
-{
-    Q_OBJECT
-
-public:
-    explicit CBaseLibrary(IBaseLibraryManager* pManager);
-    ~CBaseLibrary();
-
-    //! Set library name.
-    virtual void SetName(const QString& name);
-    //! Get library name.
-    const QString& GetName() const;
-
-    //! Set new filename for this library.
-    virtual bool SetFilename(const QString& filename, [[maybe_unused]] bool checkForUnique = true) { m_filename = filename.toLower(); return true; };
-    const QString& GetFilename() const { return m_filename; };
-
-    virtual bool Save() = 0;
-    virtual bool Load(const QString& filename) = 0;
-    virtual void Serialize(XmlNodeRef& node, bool bLoading) = 0;
-
-    //! Mark library as modified.
-    void SetModified(bool bModified = true);
-    //! Check if library was modified.
-    bool IsModified() const { return m_bModified; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Working with items.
-    //////////////////////////////////////////////////////////////////////////
-    //! Add a new prototype to library.
-    void AddItem(IDataBaseItem* item, bool bRegister = true);
-    //! Get number of known prototypes.
-    int GetItemCount() const { return static_cast<int>(m_items.size()); }
-    //! Get prototype by index.
-    IDataBaseItem* GetItem(int index);
-
-    //! Delete item by pointer of item.
-    void RemoveItem(IDataBaseItem* item);
-
-    //! Delete all items from library.
-    void RemoveAllItems();
-
-    //! Find library item by name.
-    //! Using linear search.
-    IDataBaseItem* FindItem(const QString& name);
-
-    //! Check if this library is local level library.
-    bool IsLevelLibrary() const { return m_bLevelLib; };
-
-    //! Set library to be level library.
-    void SetLevelLibrary(bool bEnable) { m_bLevelLib = bEnable; };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Return manager for this library.
-    IBaseLibraryManager* GetManager();
-
-    // Saves the library with the main tag defined by the parameter name
-    bool SaveLibrary(const char* name, bool saveEmptyLibrary = false);
-
-    //CONFETTI BEGIN
-    // Used to change the library item order
-    virtual void ChangeItemOrder(CBaseLibraryItem* item, unsigned int newLocation) override;
-    //CONFETTI END
-
-signals:
-    void Modified(bool bModified);
-
-private:
-    // Add the library to the source control
-    bool AddLibraryToSourceControl(const QString& fullPathName) const;
-
-protected:
-
-    //! Name of the library.
-    QString m_name;
-    //! Filename of the library.
-    QString m_filename;
-
-    //! Flag set when library was modified.
-    bool m_bModified;
-
-    // Flag set when the library is just created and it's not yet saved for the first time.
-    bool m_bNewLibrary;
-
-    //! Level library is saved within the level .ly file and is local for this level.
-    bool m_bLevelLib;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Manager.
-    IBaseLibraryManager* m_pManager;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    // Array of all our library items.
-    std::vector<_smart_ptr<CBaseLibraryItem> > m_items;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_BASELIBRARY_H
diff --git a/Code/Sandbox/Editor/BaseLibraryItem.cpp b/Code/Sandbox/Editor/BaseLibraryItem.cpp
deleted file mode 100644
index 65b46c2e8a..0000000000
--- a/Code/Sandbox/Editor/BaseLibraryItem.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "BaseLibraryItem.h"
-#include "BaseLibrary.h"
-#include "BaseLibraryManager.h"
-#include "Undo/IUndoObject.h"
-
-#include <AzCore/Math/Uuid.h>
-
-//undo object for multi-changes inside library item. such as set all variables to default values. 
-//For example: change particle emitter shape will lead to multiple variable changes
-class CUndoBaseLibraryItem
-    : public IUndoObject
-{
-public:
-    CUndoBaseLibraryItem(IBaseLibraryManager *libMgr, CBaseLibraryItem* libItem, bool ignoreChild)
-        : m_libMgr(libMgr)
-    {
-        assert(libItem);
-        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");
-        m_undoCtx.bIgnoreChilds = ignoreChild;
-        m_undoCtx.bLoading = false; //saving
-        m_undoCtx.bUniqName = false; //don't generate new name
-        m_undoCtx.bCopyPaste = true; //so it won't override guid
-        m_undoCtx.bUndo = true;
-        libItem->Serialize(m_undoCtx);
-
-        //evaluate size
-        XmlString xmlStr = m_undoCtx.node->getXML();
-        m_size = sizeof(CUndoBaseLibraryItem);
-        m_size += xmlStr.GetAllocatedMemory();
-        m_size += m_itemPath.length();
-        m_size += m_description.length();
-    }
-
-    QString GetEditorObjectName() override
-    {
-        return m_itemPath;
-    }
-
-protected:
-    virtual int GetSize() 
-    { 
-        return m_size;
-    }
-
-    QString GetDescription() override
-    { 
-        return m_description; 
-    }
-
-    virtual void Undo(bool bUndo)
-    {
-        //find the libItem
-        IDataBaseItem *libItem = m_libMgr->FindItemByName(m_itemPath);
-        if (libItem == nullptr)
-        {
-            //the undo stack is not reliable any more..
-            assert(false);  
-            return;
-        }
-
-        //save for redo
-        if (bUndo)
-        {
-            m_redoCtx.node = GetIEditor()->GetSystem()->CreateXmlNode("Redo");
-            m_redoCtx.bIgnoreChilds = m_undoCtx.bIgnoreChilds;
-            m_redoCtx.bLoading = false; //saving
-            m_redoCtx.bUniqName = false;
-            m_redoCtx.bCopyPaste = true;
-            m_redoCtx.bUndo = true;
-            libItem->Serialize(m_redoCtx);
-
-            XmlString xmlStr = m_redoCtx.node->getXML();
-            m_size += xmlStr.GetAllocatedMemory();
-        }
-
-        //load previous saved data
-        m_undoCtx.bLoading = true;
-        libItem->Serialize(m_undoCtx);
-    }
-
-    virtual void Redo()
-    {
-        //find the libItem
-        IDataBaseItem *libItem = m_libMgr->FindItemByName(m_itemPath);
-        if (libItem == nullptr || m_redoCtx.node == nullptr)
-        {
-            //the undo stack is not reliable any more..
-            assert(false);
-            return;
-        }
-
-        m_redoCtx.bLoading = true;
-        libItem->Serialize(m_redoCtx);
-    }
-
-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
-    IBaseLibraryManager* m_libMgr;
-    int m_size;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CBaseLibraryItem implementation.
-//////////////////////////////////////////////////////////////////////////
-CBaseLibraryItem::CBaseLibraryItem()
-{
-    m_library = 0;
-    GenerateId();
-    m_bModified = false;
-}
-
-CBaseLibraryItem::~CBaseLibraryItem()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CBaseLibraryItem::GetFullName() const
-{
-    QString name;
-    if (m_library)
-    {
-        name = m_library->GetName() + ".";
-    }
-    name += m_name;
-    return name;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CBaseLibraryItem::GetGroupName()
-{
-    QString str = GetName();
-    int p = str.lastIndexOf('.');
-    if (p >= 0)
-    {
-        return str.mid(0, p);
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CBaseLibraryItem::GetShortName()
-{
-    QString str = GetName();
-    int p = str.lastIndexOf('.');
-    if (p >= 0)
-    {
-        return str.mid(p + 1);
-    }
-    p = str.lastIndexOf('/');
-    if (p >= 0)
-    {
-        return str.mid(p + 1);
-    }
-    return str;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryItem::SetName(const QString& name)
-{
-    assert(m_library);
-    if (name == m_name)
-    {
-        return;
-    }
-    QString oldName = GetFullName();
-    m_name = name;
-    ((CBaseLibraryManager*)m_library->GetManager())->OnRenameItem(this, oldName);
-}
-
-//////////////////////////////////////////////////////////////////////////
-const QString& CBaseLibraryItem::GetName() const
-{
-    return m_name;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryItem::GenerateId()
-{
-    GUID guid = AZ::Uuid::CreateRandom();
-    SetGUID(guid);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryItem::SetGUID(REFGUID guid)
-{
-    if (m_library)
-    {
-        ((CBaseLibraryManager*)m_library->GetManager())->RegisterItem(this, guid);
-    }
-    m_guid = guid;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryItem::Serialize(SerializeContext& ctx)
-{
-    assert(m_library);
-
-    XmlNodeRef node = ctx.node;
-    if (ctx.bLoading)
-    {
-        QString name = m_name;
-        // Loading
-        node->getAttr("Name", name);
-
-        if (!ctx.bUniqName)
-        {
-            SetName(name);
-        }
-        else
-        {
-            SetName(GetLibrary()->GetManager()->MakeUniqueItemName(name));
-        }
-
-        if (!ctx.bCopyPaste)
-        {
-            GUID guid;
-            if (node->getAttr("Id", guid))
-            {
-                SetGUID(guid);
-            }
-        }
-    }
-    else
-    {
-        // Saving.
-        node->setAttr("Name", m_name.toUtf8().data());
-        node->setAttr("Id", m_guid);
-        node->setAttr("Library", GetLibrary()->GetName().toUtf8().data());
-    }
-    m_bModified = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseLibrary* CBaseLibraryItem::GetLibrary() const
-{
-    return m_library;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryItem::SetLibrary(CBaseLibrary* pLibrary)
-{
-    m_library = pLibrary;
-}
-
-//! Mark library as modified.
-void CBaseLibraryItem::SetModified(bool bModified)
-{
-    m_bModified = bModified;
-    if (m_bModified && m_library != NULL)
-    {
-        m_library->SetModified(bModified);
-    }
-}
diff --git a/Code/Sandbox/Editor/BaseLibraryItem.h b/Code/Sandbox/Editor/BaseLibraryItem.h
deleted file mode 100644
index 5579cea67f..0000000000
--- a/Code/Sandbox/Editor/BaseLibraryItem.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_BASELIBRARYITEM_H
-#define CRYINCLUDE_EDITOR_BASELIBRARYITEM_H
-#pragma once
-
-#include "Include/IDataBaseItem.h"
-#include "BaseLibrary.h"
-
-#include <QMetaType>
-
-class CBaseLibrary;
-
-//////////////////////////////////////////////////////////////////////////
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-/** Base class for all items contained in BaseLibraray.
-*/
-class EDITOR_CORE_API CBaseLibraryItem
-    : public TRefCountBase<IDataBaseItem>
-{
-    AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    CBaseLibraryItem();
-    ~CBaseLibraryItem();
-
-    //! Set item name.
-    //! Its virtual, in case you want to override it in derrived item.
-    virtual void SetName(const QString& name);
-    //! Get item name.
-    const QString& GetName() const;
-
-    //! Get full item name, including name of library.
-    //! Name formed by adding dot after name of library
-    //! eg. library Pickup and item PickupRL form full item name: "Pickups.PickupRL".
-    QString GetFullName() const;
-
-    //! Get only nameof group from prototype.
-    QString GetGroupName();
-    //! Get short name of prototype without group.
-    QString GetShortName();
-
-    //! Return Library this item are contained in.
-    //! Item can only be at one library.
-    IDataBaseLibrary* GetLibrary() const;
-    void SetLibrary(CBaseLibrary* pLibrary);
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Serialize library item to archive.
-    virtual void Serialize(SerializeContext& ctx);
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Generate new unique id for this item.
-    void GenerateId();
-    //! Returns GUID of this material.
-    const GUID& GetGUID() const { return m_guid; }
-
-    //! Mark library as modified.
-    void SetModified(bool bModified = true);
-    //! Check if library was modified.
-    bool IsModified() const { return m_bModified; };
-
-    //! Returns true if the item is registered, otherwise false
-    bool IsRegistered() const { return m_bRegistered; };
-
-    //! Validate item for errors.
-    virtual void Validate() {};
-
-    //! Get number of sub childs.
-    virtual int GetChildCount() const { return 0; }
-    //! Get sub child by index.
-    virtual CBaseLibraryItem* GetChild([[maybe_unused]] int index) const { return nullptr; }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Gathers resources by this item.
-    virtual void GatherUsedResources([[maybe_unused]] CUsedResources& resources) {};
-
-    //! Get if stored item is enabled
-    virtual bool GetIsEnabled() { return true; };
-
-
-    int IsParticleItem = -1;
-protected:
-    void SetGUID(REFGUID guid);
-    friend class CBaseLibrary;
-    friend class CBaseLibraryManager;
-    // Name of this prototype.
-    QString m_name;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //! Reference to prototype library who contains this prototype.
-    _smart_ptr<CBaseLibrary> m_library;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    //! Every base library item have unique id.
-    GUID m_guid;
-    // True when item modified by editor.
-    bool m_bModified;
-    // True when item registered in manager.
-    bool m_bRegistered = false;
-};
-
-Q_DECLARE_METATYPE(CBaseLibraryItem*);
-
-TYPEDEF_AUTOPTR(CBaseLibraryItem);
-
-
-#endif // CRYINCLUDE_EDITOR_BASELIBRARYITEM_H
diff --git a/Code/Sandbox/Editor/BaseLibraryManager.cpp b/Code/Sandbox/Editor/BaseLibraryManager.cpp
deleted file mode 100644
index 925bcd0868..0000000000
--- a/Code/Sandbox/Editor/BaseLibraryManager.cpp
+++ /dev/null
@@ -1,937 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-#include "EditorDefs.h"
-
-#include "BaseLibraryManager.h"
-
-// Editor
-#include "BaseLibraryItem.h"
-#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 = 0)
-        : m_pMngr(pMngr)
-        , m_description(description)
-        , m_editorObject(modifiedManager)
-    {
-        assert(m_pMngr);
-        SerializeTo(m_undos);
-    }
-
-    virtual QString GetEditorObjectName()
-    {
-        return m_editorObject;
-    }
-
-protected:
-    virtual int GetSize() { return sizeof(CUndoBaseLibraryManager); }
-    virtual QString GetDescription() { return m_description; };
-
-    virtual void Undo(bool bUndo)
-    {
-        if (bUndo)
-        {
-            SerializeTo(m_redos);
-        }
-        m_pMngr->ClearAll();
-        UnserializeFrom(m_undos);
-        GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
-    }
-
-    virtual void Redo()
-    {
-        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.
-//////////////////////////////////////////////////////////////////////////
-CBaseLibraryManager::CBaseLibraryManager()
-{
-    m_bUniqNameMap = false;
-    m_bUniqGuidMap = true;
-    GetIEditor()->RegisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseLibraryManager::~CBaseLibraryManager()
-{
-    ClearAll();
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::ClearAll()
-{
-    // Delete all items from all libraries.
-    for (int i = 0; i < m_libs.size(); i++)
-    {
-        m_libs[i]->RemoveAllItems();
-    }
-
-    // if we will not copy maps locally then destructors of the elements of
-    // the map will operate on the already invalid map object
-    // see:
-    //  CBaseLibraryManager::UnregisterItem()
-    //  CBaseLibraryManager::DeleteItem()
-    //  CMaterial::~CMaterial()
-
-    ItemsGUIDMap itemsGuidMap;
-    ItemsNameMap itemsNameMap;
-
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
-        std::swap(itemsGuidMap, m_itemsGuidMap);
-        std::swap(itemsNameMap, m_itemsNameMap);
-
-        m_libs.clear();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseLibrary* CBaseLibraryManager::FindLibrary(const QString& library)
-{
-    const int index = FindLibraryIndex(library);
-    return index == -1 ? nullptr : m_libs[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CBaseLibraryManager::FindLibraryIndex(const QString& library)
-{
-    QString lib = library;
-    lib.replace('\\', '/');
-    for (int i = 0; i < m_libs.size(); i++)
-    {
-        QString _lib = m_libs[i]->GetFilename();
-        _lib.replace('\\', '/');
-        if (QString::compare(lib, m_libs[i]->GetName(), Qt::CaseInsensitive) == 0 || QString::compare(lib, _lib, Qt::CaseInsensitive) == 0)
-        {
-            return i;
-        }
-    }
-    return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibraryManager::FindItem(REFGUID guid) const
-{
-    CBaseLibraryItem* pMtl = stl::find_in_map(m_itemsGuidMap, guid, (CBaseLibraryItem*)0);
-    return pMtl;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::SplitFullItemName(const QString& fullItemName, QString& libraryName, QString& itemName)
-{
-    int p;
-    p = fullItemName.indexOf('.');
-    if (p < 0 || !QString::compare(fullItemName.mid(p + 1), "mtl", Qt::CaseInsensitive))
-    {
-        libraryName = "";
-        itemName = fullItemName;
-        return;
-    }
-    libraryName = fullItemName.mid(0, p);
-    itemName = fullItemName.mid(p + 1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibraryManager::FindItemByName(const QString& fullItemName)
-{
-    AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
-    return stl::find_in_map(m_itemsNameMap, fullItemName, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibraryManager::LoadItemByName(const QString& fullItemName)
-{
-    QString libraryName, itemName;
-    SplitFullItemName(fullItemName, libraryName, itemName);
-
-    if (!FindLibrary(libraryName))
-    {
-        LoadLibrary(MakeFilename(libraryName));
-    }
-
-    return FindItemByName(fullItemName);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibraryManager::FindItemByName(const char* fullItemName)
-{
-    return FindItemByName(QString(fullItemName));
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibraryManager::LoadItemByName(const char* fullItemName)
-{
-    return LoadItemByName(QString(fullItemName));
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibraryManager::CreateItem(IDataBaseLibrary* pLibrary)
-{
-    assert(pLibrary);
-
-    // Add item to this library.
-    TSmartPtr<CBaseLibraryItem> pItem = MakeNewItem();
-    pLibrary->AddItem(pItem);
-    return pItem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::DeleteItem(IDataBaseItem* pItem)
-{
-    assert(pItem);
-
-    UnregisterItem((CBaseLibraryItem*)pItem);
-    if (pItem->GetLibrary())
-    {
-        pItem->GetLibrary()->RemoveItem(pItem);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseLibrary* CBaseLibraryManager::LoadLibrary(const QString& inFilename, [[maybe_unused]] bool bReload)
-{
-    if (auto lib = FindLibrary(inFilename))
-    {
-        return lib;
-    }
-
-    TSmartPtr<CBaseLibrary> pLib = MakeNewLibrary();
-    if (!pLib->Load(MakeFilename(inFilename)))
-    {
-        Error(QObject::tr("Failed to Load Item Library: %1").arg(inFilename).toUtf8().data());
-        return nullptr;
-    }
-
-    m_libs.push_back(pLib);
-    return pLib;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CBaseLibraryManager::GetModifiedLibraryCount() const
-{
-    int count = 0;
-    for (int i = 0; i < m_libs.size(); i++)
-    {
-        if (m_libs[i]->IsModified())
-        {
-            count++;
-        }
-    }
-    return count;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseLibrary* CBaseLibraryManager::AddLibrary(const QString& library, bool bIsLevelLibrary, bool bIsLoading)
-{
-    // Make a filename from name of library.
-    QString filename = library;
-
-    if (filename.indexOf(".xml") == -1) // if its already a filename, we don't do anything
-    {
-        filename.replace(' ', '_');
-        if (!bIsLevelLibrary)
-        {
-            filename = MakeFilename(library);
-        }
-        else
-        {
-            // if its the level library it gets saved in the level and should not be concatenated with any other file name
-            filename = filename + ".xml";
-        }
-    }
-
-    IDataBaseLibrary* pBaseLib = FindLibrary(library);  //library name
-    if (!pBaseLib)
-    {
-        pBaseLib = FindLibrary(filename); //library file name
-    }
-    if (pBaseLib)
-    {
-        return pBaseLib;
-    }
-
-    CBaseLibrary* lib = MakeNewLibrary();
-    lib->SetName(library);
-    lib->SetLevelLibrary(bIsLevelLibrary);
-    lib->SetFilename(filename, !bIsLoading);
-    // set modified to true, so even empty particle libraries get saved
-    lib->SetModified(true);
-
-    m_libs.push_back(lib);
-    return lib;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CBaseLibraryManager::MakeFilename(const QString& library)
-{
-    QString filename = library;
-    filename.replace(' ', '_');
-    filename.replace(".xml", "");
-
-    // make it contain the canonical libs path:
-    Path::ConvertBackSlashToSlash(filename);
-
-    QString LibsPath(GetLibsPath());
-    Path::ConvertBackSlashToSlash(LibsPath);
-
-    if (filename.left(LibsPath.length()).compare(LibsPath, Qt::CaseInsensitive) == 0)
-    {
-        filename = filename.mid(LibsPath.length());
-    }
-
-    return LibsPath + filename + ".xml";
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseLibraryManager::IsUniqueFilename(const QString& library)
-{
-    QString resultPath = MakeFilename(library);
-    CCryFile xmlFile;
-    // If we can find a file for the path
-    return !xmlFile.Open(resultPath.toUtf8().data(), "rb");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::DeleteLibrary(const QString& library, bool forceDeleteLevel)
-{
-    for (int i = 0; i < m_libs.size(); i++)
-    {
-        if (QString::compare(library, m_libs[i]->GetName(), Qt::CaseInsensitive) == 0)
-        {
-            CBaseLibrary* pLibrary = m_libs[i];
-            // Check if not level library, they cannot be deleted.
-            if (!pLibrary->IsLevelLibrary() || forceDeleteLevel)
-            {
-                for (int j = 0; j < pLibrary->GetItemCount(); j++)
-                {
-                    UnregisterItem((CBaseLibraryItem*)pLibrary->GetItem(j));
-                }
-                pLibrary->RemoveAllItems();
-                
-                if (pLibrary->IsLevelLibrary())
-                {
-                    m_pLevelLibrary = nullptr;
-                }
-                m_libs.erase(m_libs.begin() + i);
-            }
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseLibrary* CBaseLibraryManager::GetLibrary(int index) const
-{
-    assert(index >= 0 && index < m_libs.size());
-    return m_libs[index];
-};
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseLibrary* CBaseLibraryManager::GetLevelLibrary() const
-{
-    IDataBaseLibrary* pLevelLib = NULL;
-
-    for (int i = 0; i < GetLibraryCount(); i++)
-    {
-        if (GetLibrary(i)->IsLevelLibrary())
-        {
-            pLevelLib = GetLibrary(i);
-            break;
-        }
-    }
-
-
-    return pLevelLib;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::SaveAllLibs()
-{
-    for (int i = 0; i < GetLibraryCount(); i++)
-    {
-        // Check if library is modified.
-        IDataBaseLibrary* pLibrary = GetLibrary(i);
-
-        //Level library is saved when the level is saved
-        if (pLibrary->IsLevelLibrary())
-        {
-            continue;
-        }
-        if (pLibrary->IsModified())
-        {
-            if (pLibrary->Save())
-            {
-                pLibrary->SetModified(false);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::Serialize(XmlNodeRef& node, bool bLoading)
-{
-    static const char* const LEVEL_LIBRARY_TAG = "LevelLibrary";
-
-    QString rootNodeName = GetRootNodeName();
-    if (bLoading)
-    {
-        XmlNodeRef libs = node->findChild(rootNodeName.toUtf8().data());
-        if (libs)
-        {
-            for (int i = 0; i < libs->getChildCount(); i++)
-            {
-                // Load only library name.
-                XmlNodeRef libNode = libs->getChild(i);
-                if (strcmp(libNode->getTag(), LEVEL_LIBRARY_TAG) == 0)
-                {
-                    if (!m_pLevelLibrary)
-                    {
-                        QString libName;
-                        libNode->getAttr("Name", libName);
-                        m_pLevelLibrary = static_cast<CBaseLibrary*>(AddLibrary(libName, true));
-                    }
-                    m_pLevelLibrary->Serialize(libNode, bLoading);
-                }
-                else
-                {
-                    QString libName;
-                    if (libNode->getAttr("Name", libName))
-                    {
-                        // Load this library.
-                        if (!FindLibrary(libName))
-                        {
-                            LoadLibrary(MakeFilename(libName));
-                        }
-                    }
-                }
-            }
-        }
-    }
-    else
-    {
-        // Save all libraries.
-        XmlNodeRef libs = node->newChild(rootNodeName.toUtf8().data());
-        for (int i = 0; i < GetLibraryCount(); i++)
-        {
-            IDataBaseLibrary* pLib = GetLibrary(i);
-            if (pLib->IsLevelLibrary())
-            {
-                // Level libraries are saved in in level.
-                XmlNodeRef libNode = libs->newChild(LEVEL_LIBRARY_TAG);
-                pLib->Serialize(libNode, bLoading);
-            }
-            else
-            {
-                // Save only library name.
-                XmlNodeRef libNode = libs->newChild("Library");
-                libNode->setAttr("Name", pLib->GetName().toUtf8().data());
-            }
-        }
-        SaveAllLibs();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CBaseLibraryManager::MakeUniqueItemName(const QString& srcName, const QString& libName)
-{
-    // unlikely we'll ever encounter more than 16
-    std::vector<string> possibleDuplicates;
-    possibleDuplicates.reserve(16);
-
-    // search for strings in the database that might have a similar name (ignore case)
-    IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
-    for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
-    {
-        //Check if the item is in the target library first. 
-        IDataBaseLibrary* itemLibrary = pItem->GetLibrary();
-        QString itemLibraryName;
-        if (itemLibrary)
-        {
-            itemLibraryName = itemLibrary->GetName();
-        }
-
-        // Item is not in the library so there cannot be a naming conflict.
-        if (!libName.isEmpty() && !itemLibraryName.isEmpty() && itemLibraryName != libName)
-        {
-            continue;
-        }
-
-        const QString& name = pItem->GetName();
-        if (name.startsWith(srcName, Qt::CaseInsensitive))
-        {
-            possibleDuplicates.push_back(string(name.toUtf8().data()));
-        }
-    }
-    pEnum->Release();
-
-    if (possibleDuplicates.empty())
-    {
-        return srcName;
-    }
-
-    std::sort(possibleDuplicates.begin(), possibleDuplicates.end(), [](const string& strOne, const string& strTwo)
-        {
-            // I can assume size sorting since if the length is different, either one of the two strings doesn't
-            // closely match the string we are trying to duplicate, or it's a bigger number (X1 vs X10)
-            if (strOne.size() != strTwo.size())
-            {
-                return strOne.size() < strTwo.size();
-            }
-            else
-            {
-                return azstricmp(strOne.c_str(), strTwo.c_str()) < 0;
-            }
-        }
-        );
-
-    int num = 0;
-    QString returnValue = srcName;
-    while (num < possibleDuplicates.size() && QString::compare(possibleDuplicates[num].c_str(), returnValue, Qt::CaseInsensitive) == 0)
-    {
-        returnValue = QStringLiteral("%1%2%3").arg(srcName).arg("_").arg(num);
-        ++num;
-    }
-
-    return returnValue;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::Validate()
-{
-    IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
-    for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
-    {
-        pItem->Validate();
-    }
-    pEnum->Release();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid)
-{
-    assert(pItem);
-
-    bool bNotify = false;
-
-    if (m_bUniqGuidMap)
-    {
-        bool bNewItem = true;
-        REFGUID oldGuid = pItem->GetGUID();
-        if (!GuidUtil::IsEmpty(oldGuid))
-        {
-            bNewItem = false;
-            m_itemsGuidMap.erase(oldGuid);
-        }
-        if (GuidUtil::IsEmpty(newGuid))
-        {
-            return;
-        }
-        CBaseLibraryItem* pOldItem = stl::find_in_map(m_itemsGuidMap, newGuid, (CBaseLibraryItem*)0);
-        if (!pOldItem)
-        {
-            pItem->m_guid = newGuid;
-            m_itemsGuidMap[newGuid] = pItem;
-            pItem->m_bRegistered = true;
-            bNotify = true;
-        }
-        else
-        {
-            if (pOldItem != pItem)
-            {
-                ReportDuplicateItem(pItem, pOldItem);
-            }
-        }
-    }
-
-    if (m_bUniqNameMap)
-    {
-        QString fullName = pItem->GetFullName();
-        if (!pItem->GetName().isEmpty())
-        {
-            CBaseLibraryItem* pOldItem = static_cast<CBaseLibraryItem*>(FindItemByName(fullName));
-            if (!pOldItem)
-            {
-                AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
-                m_itemsNameMap[fullName] = pItem;
-                pItem->m_bRegistered = true;
-                bNotify = true;
-            }
-            else
-            {
-                if (pOldItem != pItem)
-                {
-                    ReportDuplicateItem(pItem, pOldItem);
-                }
-            }
-        }
-    }
-
-    // Notify listeners.
-    if (bNotify)
-    {
-        NotifyItemEvent(pItem, EDB_ITEM_EVENT_ADD);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem)
-{
-    assert(pItem);
-
-    bool bNotify = false;
-
-    if (m_bUniqGuidMap)
-    {
-        if (GuidUtil::IsEmpty(pItem->GetGUID()))
-        {
-            return;
-        }
-        CBaseLibraryItem* pOldItem = stl::find_in_map(m_itemsGuidMap, pItem->GetGUID(), (CBaseLibraryItem*)0);
-        if (!pOldItem)
-        {
-            m_itemsGuidMap[pItem->GetGUID()] = pItem;
-            pItem->m_bRegistered = true;
-            bNotify = true;
-        }
-        else
-        {
-            if (pOldItem != pItem)
-            {
-                ReportDuplicateItem(pItem, pOldItem);
-            }
-        }
-    }
-
-    if (m_bUniqNameMap)
-    {
-        QString fullName = pItem->GetFullName();
-        if (!fullName.isEmpty())
-        {
-            CBaseLibraryItem* pOldItem = static_cast<CBaseLibraryItem*>(FindItemByName(fullName));
-            if (!pOldItem)
-            {
-                AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
-                m_itemsNameMap[fullName] = pItem;
-                pItem->m_bRegistered = true;
-                bNotify = true;
-            }
-            else
-            {
-                if (pOldItem != pItem)
-                {
-                    ReportDuplicateItem(pItem, pOldItem);
-                }
-            }
-        }
-    }
-
-    // Notify listeners.
-    if (bNotify)
-    {
-        NotifyItemEvent(pItem, EDB_ITEM_EVENT_ADD);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::SetRegisteredFlag(CBaseLibraryItem* pItem, bool bFlag)
-{
-    pItem->m_bRegistered = bFlag;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::ReportDuplicateItem(CBaseLibraryItem* pItem, CBaseLibraryItem* pOldItem)
-{
-    QString sLibName;
-    if (pOldItem->GetLibrary())
-    {
-        sLibName = pOldItem->GetLibrary()->GetName();
-    }
-    CErrorRecord err;
-    err.pItem = pItem;
-    err.error = QStringLiteral("Item %1 with duplicate GUID to loaded item %2 ignored").arg(pItem->GetFullName(), pOldItem->GetFullName());
-    GetIEditor()->GetErrorReport()->ReportError(err);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::UnregisterItem(CBaseLibraryItem* pItem)
-{
-    // Notify listeners.
-    NotifyItemEvent(pItem, EDB_ITEM_EVENT_DELETE);
-
-    if (!pItem)
-    {
-        return;
-    }
-
-    if (m_bUniqGuidMap)
-    {
-        m_itemsGuidMap.erase(pItem->GetGUID());
-    }
-    if (m_bUniqNameMap && !pItem->GetFullName().isEmpty())
-    {
-        AZStd::lock_guard<AZStd::mutex> lock(m_itemsNameMapMutex);
-        auto findIter = m_itemsNameMap.find(pItem->GetFullName());
-        if (findIter != m_itemsNameMap.end())
-        {
-            _smart_ptr<CBaseLibraryItem> item = findIter->second;
-            m_itemsNameMap.erase(findIter);
-        }
-    }
-
-    pItem->m_bRegistered = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CBaseLibraryManager::MakeFullItemName(IDataBaseLibrary* pLibrary, const QString& group, const QString& itemName)
-{
-    assert(pLibrary);
-    QString name = pLibrary->GetName() + ".";
-    if (!group.isEmpty())
-    {
-        name += group + ".";
-    }
-    name += itemName;
-    return name;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::GatherUsedResources(CUsedResources& resources)
-{
-    IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
-    for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
-    {
-        pItem->GatherUsedResources(resources);
-    }
-    pEnum->Release();
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItemEnumerator* CBaseLibraryManager::GetItemEnumerator()
-{
-    if (m_bUniqNameMap)
-    {
-        return new CDataBaseItemEnumerator<ItemsNameMap>(&m_itemsNameMap);
-    }
-    else
-    {
-        return new CDataBaseItemEnumerator<ItemsGUIDMap>(&m_itemsGuidMap);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnBeginNewScene:
-        SetSelectedItem(0);
-        ClearAll();
-        break;
-    case eNotify_OnBeginSceneOpen:
-        SetSelectedItem(0);
-        ClearAll();
-        break;
-    case eNotify_OnCloseScene:
-        SetSelectedItem(0);
-        ClearAll();
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::OnRenameItem(CBaseLibraryItem* pItem, const QString& oldName)
-{
-    m_itemsNameMapMutex.lock();
-    if (!oldName.isEmpty())
-    {
-        m_itemsNameMap.erase(oldName);
-    }
-    if (!pItem->GetFullName().isEmpty())
-    {
-        m_itemsNameMap[pItem->GetFullName()] = pItem;
-    }
-    m_itemsNameMapMutex.unlock();
-
-    OnItemChanged(pItem);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::AddListener(IDataBaseManagerListener* pListener)
-{
-    stl::push_back_unique(m_listeners, pListener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::RemoveListener(IDataBaseManagerListener* pListener)
-{
-    stl::find_and_erase(m_listeners, pListener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::NotifyItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event)
-{
-    // Notify listeners.
-    if (!m_listeners.empty())
-    {
-        for (int i = 0; i < m_listeners.size(); i++)
-        {
-            m_listeners[i]->OnDataBaseItemEvent(pItem, event);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::OnItemChanged(IDataBaseItem* pItem)
-{
-    NotifyItemEvent(pItem, EDB_ITEM_EVENT_CHANGED);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::OnUpdateProperties(IDataBaseItem* pItem, bool bRefresh)
-{
-    NotifyItemEvent(pItem, bRefresh ? EDB_ITEM_EVENT_UPDATE_PROPERTIES
-        : EDB_ITEM_EVENT_UPDATE_PROPERTIES_NO_EDITOR_REFRESH);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseLibraryManager::SetSelectedItem(IDataBaseItem* pItem)
-{
-    if (m_pSelectedItem == pItem)
-    {
-        return;
-    }
-    m_pSelectedItem = (CBaseLibraryItem*)pItem;
-    NotifyItemEvent(m_pSelectedItem, EDB_ITEM_EVENT_SELECTED);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibraryManager::GetSelectedItem() const
-{
-    return m_pSelectedItem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-IDataBaseItem* CBaseLibraryManager::GetSelectedParentItem() const
-{
-    return m_pSelectedParent;
-}
-
-void CBaseLibraryManager::ChangeLibraryOrder(IDataBaseLibrary* lib, unsigned int newLocation)
-{
-    if (!lib || newLocation >= m_libs.size() || lib == m_libs[newLocation])
-    {
-        return;
-    }
-    
-    for (int i = 0; i < m_libs.size(); i++)
-    {
-        if (lib == m_libs[i])
-        {
-            _smart_ptr<CBaseLibrary> curLib = m_libs[i];
-            m_libs.erase(m_libs.begin() + i);
-            m_libs.insert(m_libs.begin() + newLocation, curLib);
-            return;
-        }
-    }
-}
-
-bool CBaseLibraryManager::SetLibraryName(CBaseLibrary* lib, const QString& name)
-{
-    // SetFilename will validate if the name is duplicate with exist libraries.
-    if (lib->SetFilename(MakeFilename(name)))
-    {
-        lib->SetName(name);
-        return true;
-    }
-    return false;
-}
diff --git a/Code/Sandbox/Editor/BaseLibraryManager.h b/Code/Sandbox/Editor/BaseLibraryManager.h
deleted file mode 100644
index 3ec3412d01..0000000000
--- a/Code/Sandbox/Editor/BaseLibraryManager.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-#ifndef CRYINCLUDE_EDITOR_BASELIBRARYMANAGER_H
-#define CRYINCLUDE_EDITOR_BASELIBRARYMANAGER_H
-#pragma once
-
-#include "Include/IBaseLibraryManager.h"
-#include "Include/IDataBaseItem.h"
-#include "Include/IDataBaseLibrary.h"
-#include "Include/IDataBaseManager.h"
-#include "Util/TRefCountBase.h"
-#include "Util/GuidUtil.h"
-#include "BaseLibrary.h"
-#include "Util/smartptr.h"
-#include <EditorDefs.h>
-#include <QtUtil.h>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-/** Manages all Libraries and Items.
-*/
-class SANDBOX_API  CBaseLibraryManager
-    : public IBaseLibraryManager
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    CBaseLibraryManager();
-    ~CBaseLibraryManager();
-
-    //! Clear all libraries.
-    virtual void ClearAll() override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // IDocListener implementation.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Library items.
-    //////////////////////////////////////////////////////////////////////////
-    //! Make a new item in specified library.
-    virtual IDataBaseItem* CreateItem(IDataBaseLibrary* pLibrary) override;
-    //! Delete item from library and manager.
-    virtual void DeleteItem(IDataBaseItem* pItem) override;
-
-    //! Find Item by its GUID.
-    virtual IDataBaseItem* FindItem(REFGUID guid) const;
-    virtual IDataBaseItem* FindItemByName(const QString& fullItemName);
-    virtual IDataBaseItem* LoadItemByName(const QString& fullItemName);
-    virtual IDataBaseItem* FindItemByName(const char* fullItemName);
-    virtual IDataBaseItem* LoadItemByName(const char* fullItemName);
-
-    virtual IDataBaseItemEnumerator* GetItemEnumerator() override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set item currently selected.
-    virtual void SetSelectedItem(IDataBaseItem* pItem) override;
-    // Get currently selected item.
-    virtual IDataBaseItem* GetSelectedItem() const override;
-    virtual IDataBaseItem* GetSelectedParentItem() const override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Libraries.
-    //////////////////////////////////////////////////////////////////////////
-    //! Add Item library.
-    virtual IDataBaseLibrary* AddLibrary(const QString& library, bool bIsLevelLibrary = false, bool bIsLoading = true) override;
-    virtual void DeleteLibrary(const QString& library, bool forceDeleteLevel = false) override;
-    //! Get number of libraries.
-    virtual int GetLibraryCount() const override { return m_libs.size(); };
-    //! Get number of modified libraries.
-    virtual int GetModifiedLibraryCount() const override;
-
-    //! Get Item library by index.
-    virtual IDataBaseLibrary* GetLibrary(int index) const override;
-
-    //! Get Level Item library.
-    virtual IDataBaseLibrary* GetLevelLibrary() const override;
-
-    //! Find Items Library by name.
-    virtual IDataBaseLibrary* FindLibrary(const QString& library) override;
-
-    //! Find Items Library's index by name.
-    int FindLibraryIndex(const QString& library) override;
-    
-    //! Load Items library.
-    virtual IDataBaseLibrary* LoadLibrary(const QString& filename, bool bReload = false) override;
-
-    //! Save all modified libraries.
-    virtual void SaveAllLibs() override;
-
-    //! Serialize property manager.
-    virtual void Serialize(XmlNodeRef& node, bool bLoading) override;
-
-    //! Export items to game.
-    virtual void Export([[maybe_unused]] XmlNodeRef& node) override {};
-
-    //! Returns unique name base on input name.
-    virtual QString MakeUniqueItemName(const QString& name, const QString& libName = "") override;
-    virtual QString MakeFullItemName(IDataBaseLibrary* pLibrary, const QString& group, const QString& itemName) override;
-
-    //! Root node where this library will be saved.
-    virtual QString GetRootNodeName() override = 0;
-    //! Path to libraries in this manager.
-    virtual QString GetLibsPath() override = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Validate library items for errors.
-    virtual void Validate() override;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void GatherUsedResources(CUsedResources& resources) override;
-
-    virtual void AddListener(IDataBaseManagerListener* pListener) override;
-    virtual void RemoveListener(IDataBaseManagerListener* pListener) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid) override;
-    virtual void RegisterItem(CBaseLibraryItem* pItem) override;
-    virtual void UnregisterItem(CBaseLibraryItem* pItem) override;
-
-    // Only Used internally.
-    virtual void OnRenameItem(CBaseLibraryItem* pItem, const QString& oldName) override;
-
-    // Called by items to indicated that they have been modified.
-    // Sends item changed event to listeners.
-    virtual void OnItemChanged(IDataBaseItem* pItem) override;
-    virtual void OnUpdateProperties(IDataBaseItem* pItem, bool bRefresh) override;
-
-    QString MakeFilename(const QString& library);
-    virtual bool IsUniqueFilename(const QString& library) override;
-
-    //CONFETTI BEGIN
-    // Used to change the library item order
-    virtual void ChangeLibraryOrder(IDataBaseLibrary* lib, unsigned int newLocation) override;
-
-    virtual bool SetLibraryName(CBaseLibrary* lib, const QString& name) override;
-
-protected:
-    void SplitFullItemName(const QString& fullItemName, QString& libraryName, QString& itemName);
-    void NotifyItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event);
-    void SetRegisteredFlag(CBaseLibraryItem* pItem, bool bFlag);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Must be overriden.
-    //! Makes a new Item.
-    virtual CBaseLibraryItem* MakeNewItem() = 0;
-    virtual CBaseLibrary* MakeNewLibrary() = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual void ReportDuplicateItem(CBaseLibraryItem* pItem, CBaseLibraryItem* pOldItem);
-
-protected:
-    bool m_bUniqGuidMap;
-    bool m_bUniqNameMap;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //! Array of all loaded entity items libraries.
-    std::vector<_smart_ptr<CBaseLibrary> > m_libs;
-
-    // There is always one current level library.
-    TSmartPtr<CBaseLibrary> m_pLevelLibrary;
-
-    // GUID to item map.
-    typedef std::map<GUID, _smart_ptr<CBaseLibraryItem>, guid_less_predicate> ItemsGUIDMap;
-    ItemsGUIDMap m_itemsGuidMap;
-
-    // Case insensitive name to items map.
-    typedef std::map<QString, _smart_ptr<CBaseLibraryItem>, stl::less_stricmp<QString>> ItemsNameMap;
-    ItemsNameMap m_itemsNameMap;
-    AZStd::mutex m_itemsNameMapMutex;
-
-    std::vector<IDataBaseManagerListener*> m_listeners;
-
-    // Currently selected item.
-    _smart_ptr<CBaseLibraryItem> m_pSelectedItem;
-    _smart_ptr<CBaseLibraryItem> m_pSelectedParent;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-//////////////////////////////////////////////////////////////////////////
-template <class TMap>
-class CDataBaseItemEnumerator
-    : public IDataBaseItemEnumerator
-{
-    TMap* m_pMap;
-    typename TMap::iterator m_iterator;
-
-public:
-    CDataBaseItemEnumerator(TMap* pMap)
-    {
-        assert(pMap);
-        m_pMap = pMap;
-        m_iterator = m_pMap->begin();
-    }
-    virtual void Release() { delete this; };
-    virtual IDataBaseItem* GetFirst()
-    {
-        m_iterator = m_pMap->begin();
-        if (m_iterator == m_pMap->end())
-        {
-            return 0;
-        }
-        return m_iterator->second;
-    }
-    virtual IDataBaseItem* GetNext()
-    {
-        if (m_iterator != m_pMap->end())
-        {
-            m_iterator++;
-        }
-        if (m_iterator == m_pMap->end())
-        {
-            return 0;
-        }
-        return m_iterator->second;
-    }
-};
-
-#endif // CRYINCLUDE_EDITOR_BASELIBRARYMANAGER_H
diff --git a/Code/Sandbox/Editor/CMakeLists.txt b/Code/Sandbox/Editor/CMakeLists.txt
deleted file mode 100644
index 06a73f06dc..0000000000
--- a/Code/Sandbox/Editor/CMakeLists.txt
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME EditorCore SHARED
-    NAMESPACE Legacy
-    AUTOMOC
-    AUTOUIC
-    FILES_CMAKE
-        editor_core_files.cmake
-        Platform/${PAL_PLATFORM_NAME}/editor_core_files_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            Include
-            .
-            ..
-    COMPILE_DEFINITIONS
-        PRIVATE
-            EDITOR_CORE
-        PUBLIC
-            EDITOR
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Legacy::CryCommon
-            3rdParty::zlib
-        PUBLIC
-            3rdParty::Qt::Core
-            3rdParty::Qt::Gui
-            3rdParty::Qt::Widgets
-            AZ::AzToolsFramework
-)
-
-# Header only target to prevent linkage against editor libraries when is not needed. Eventually the targets that depend
-# on editor headers should cleanup dependencies and interact with the editor through buses or other mechanisms
-ly_add_target(
-    NAME Editor.Headers HEADERONLY
-    NAMESPACE Legacy
-    FILES_CMAKE
-        editor_headers_files.cmake
-    INCLUDE_DIRECTORIES
-        INTERFACE
-            Include
-            .
-            ..
-    BUILD_DEPENDENCIES
-        INTERFACE
-            Legacy::EditorCommon.Headers
-)
-
-################################################################################
-# EditorLib
-################################################################################
-set(pal_cmake_files "")
-foreach(enabled_platform ${LY_PAL_TOOLS_ENABLED})
-    string(TOLOWER ${enabled_platform} enabled_platform_lowercase)
-    ly_get_list_relative_pal_filename(pal_cmake_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${enabled_platform})
-    list(APPEND pal_cmake_files ${pal_cmake_dir}/editor_lib_${enabled_platform_lowercase}_files.cmake)
-endforeach()
-
-ly_get_pal_tool_dirs(pal_tool_dirs ${CMAKE_CURRENT_LIST_DIR}/Platform)
-
-ly_add_target(
-    NAME EditorLib SHARED
-    NAMESPACE Legacy
-    AUTOMOC
-    AUTOUIC
-    AUTORCC
-    FILES_CMAKE
-        editor_lib_files.cmake
-        Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-    PLATFORM_INCLUDE_FILES
-        Platform/${PAL_PLATFORM_NAME}/editor_lib_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-        Platform/Common/${PAL_TRAIT_COMPILER_ID}/editor_lib_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
-        ${pal_cmake_files}
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            Include
-        PRIVATE
-            .
-            ..
-            AssetBrowser/AssetTypes/Character
-            ${pal_tool_dirs}
-    COMPILE_DEFINITIONS
-        PRIVATE
-            SANDBOX_EXPORTS
-            ${LY_LEGACY_TERRAIN_EDITOR_DEFINES}
-        INTERFACE
-            SANDBOX_IMPORTS
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Core
-            3rdParty::Qt::Gui
-            3rdParty::Qt::Widgets
-            3rdParty::Qt::Concurrent
-            3rdParty::tiff
-            3rdParty::squish-ccr
-            3rdParty::zlib
-            3rdParty::AWSNativeSDK::STS
-            Legacy::CryCommon
-            Legacy::EditorCommon
-            AZ::AzCore
-            AZ::AzToolsFramework
-            Gem::LmbrCentral.Static
-            Legacy::NewsShared
-            AZ::AWSNativeSDKInit
-            AZ::AtomCore
-            Gem::Atom_RPI.Edit
-            Gem::Atom_RPI.Public
-            Gem::Atom_Feature_Common.Static
-            Gem::AtomToolsFramework.Static
-            Gem::AtomViewportDisplayInfo
-            ${additional_dependencies}
-        PUBLIC
-            3rdParty::AWSNativeSDK::Core
-            3rdParty::Qt::Network
-            Legacy::EditorCore
-    RUNTIME_DEPENDENCIES
-        Gem::AtomViewportDisplayInfo
-        Legacy::EditorCommon
-)
-ly_add_source_properties(
-    SOURCES CryEdit.cpp
-    PROPERTY COMPILE_DEFINITIONS 
-    VALUES 
-        O3DE_COPYRIGHT_YEAR=${LY_VERSION_COPYRIGHT_YEAR}
-        LY_BUILD=${LY_VERSION_BUILD_NUMBER}
-        ${LY_PAL_TOOLS_DEFINES}
-)
-ly_add_source_properties(
-    SOURCES
-        Core/LevelEditorMenuHandler.cpp
-        GraphicsSettingsDialog.cpp
-        MainWindow.cpp
-    PROPERTY COMPILE_DEFINITIONS 
-    VALUES ${LY_PAL_TOOLS_DEFINES}
-)
-
-get_property(editor_plugins GLOBAL PROPERTY LY_EDITOR_PLUGINS)
-string (REPLACE ";" "," editor_plugins "${editor_plugins}")
-ly_add_source_properties(
-    SOURCES PluginManager.cpp
-    PROPERTY COMPILE_DEFINITIONS 
-    VALUES LY_EDITOR_PLUGINS="${editor_plugins}"
-)
-
-################################################################################
-# Editor
-################################################################################
-ly_add_target(
-    NAME Editor APPLICATION
-    NAMESPACE Legacy
-    AUTORCC
-    FILES_CMAKE
-        editor_files.cmake
-    PLATFORM_INCLUDE_FILES
-        Platform/${PAL_PLATFORM_NAME}/editor_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Core
-            Legacy::CryCommon
-    RUNTIME_DEPENDENCIES
-        Legacy::CrySystem
-        Legacy::EditorLib
-        ProjectManager
-)
-set_property(SOURCE
-    CryEdit.cpp
-    APPEND PROPERTY
-        COMPILE_DEFINITIONS LY_CMAKE_TARGET="Editor"
-)
-ly_add_translations(
-    TARGETS Editor
-    PREFIX Translations
-    FILES
-        Translations/editor_en-us.ts 
-        Translations/assetbrowser_en-us.ts 
-)
-ly_add_dependencies(Editor AssetProcessor)
-
-if(LY_DEFAULT_PROJECT_PATH)
-    set_property(TARGET Editor APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_DEFAULT_PROJECT_PATH}\"")
-endif()
-
-################################################################################
-# Tests
-################################################################################
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-    ly_add_target(
-        NAME EditorCore.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        AUTOMOC
-        FILES_CMAKE
-            editor_core_test_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzTest
-                3rdParty::Qt::Gui
-                3rdParty::Qt::Widgets
-                Legacy::EditorCore
-                Legacy::CryCommon
-                AZ::AzCore
-    )
-    ly_add_googletest(
-        NAME Legacy::EditorCore.Tests
-    )
-
-    ly_add_target(
-        NAME EditorLib.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        AUTOMOC
-        FILES_CMAKE
-            editor_lib_test_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Include
-                .
-        COMPILE_DEFINITIONS
-            PRIVATE
-                ${LY_LEGACY_TERRAIN_EDITOR_DEFINES}
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzTest
-                3rdParty::Qt::Core
-                3rdParty::Qt::Gui
-                3rdParty::Qt::Widgets
-                Legacy::CryCommon
-                AZ::AzToolsFramework
-                Legacy::EditorLib
-        RUNTIME_DEPENDENCIES
-            Gem::LmbrCentral
-    )
-    ly_add_googletest(
-        NAME Legacy::EditorLib.Tests
-    )
-endif()
diff --git a/Code/Sandbox/Editor/CVarMenu.cpp b/Code/Sandbox/Editor/CVarMenu.cpp
deleted file mode 100644
index 1e8da671f0..0000000000
--- a/Code/Sandbox/Editor/CVarMenu.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "CVarMenu.h"
-
-CVarMenu::CVarMenu(QWidget* parent)
-    : QMenu(parent)
-{
-}
-
-void CVarMenu::AddCVarToggleItem(CVarToggle cVarToggle)
-{
-    // Add CVar toggle action
-    QAction* action = addAction(cVarToggle.m_displayName);
-    connect(action, &QAction::triggered, [this, cVarToggle](bool checked)
-        {
-            // Update the CVar's value based on the action's new checked state
-            ICVar* cVar = gEnv->pConsole->GetCVar(cVarToggle.m_cVarName.toUtf8().data());
-            if (cVar)
-            {
-                SetCVar(cVar, checked ? cVarToggle.m_onValue : cVarToggle.m_offValue);
-            }
-        });
-    action->setCheckable(true);
-
-    // Initialize the action's checked state based on the associated CVar's value
-    ICVar* cVar = gEnv->pConsole->GetCVar(cVarToggle.m_cVarName.toUtf8().data());
-    bool checked = (cVar && cVar->GetFVal() == cVarToggle.m_onValue);
-    action->setChecked(checked);
-}
-
-void CVarMenu::AddCVarValuesItem(QString cVarName,
-    QString displayName,
-    CVarDisplayNameValuePairs availableCVarValues,
-    float offValue)
-{
-    // Add a submenu offering multiple values for one CVar
-    QMenu* menu = addMenu(displayName);
-    QActionGroup* group = new QActionGroup(menu);
-    group->setExclusive(true);
-
-    ICVar* cVar = gEnv->pConsole->GetCVar(cVarName.toUtf8().data());
-    float cVarValue = cVar ? cVar->GetFVal() : 0.0f;
-    for (const auto& availableCVarValue : availableCVarValues)
-    {
-        QAction* action = menu->addAction(availableCVarValue.first);
-        action->setCheckable(true);
-        group->addAction(action);
-
-        float availableOnValue = availableCVarValue.second;
-        connect(action, &QAction::triggered, [this, action, cVarName, availableOnValue, offValue](bool checked)
-            {
-                ICVar* cVar = gEnv->pConsole->GetCVar(cVarName.toUtf8().data());
-                if (cVar)
-                {
-                    if (!checked)
-                    {
-                        SetCVar(cVar, offValue);
-                    }
-                    else
-                    {
-                        // Toggle the CVar and update the action's checked state to
-                        // allow none of the items to be checked in the exclusive group.
-                        // Otherwise we could have just used the action's currently checked
-                        // state and updated the CVar's value only
-                        bool cVarOn = (cVar->GetFVal() == availableOnValue);
-                        checked = !cVarOn;
-                        SetCVar(cVar, checked ? availableOnValue : offValue);
-                        action->setChecked(checked);
-                    }
-                }
-            });
-
-        // Initialize the action's checked state based on the CVar's current value
-        bool checked = (cVarValue == availableOnValue);
-        action->setChecked(checked);
-    }
-}
-
-void CVarMenu::AddUniqueCVarsItem(QString displayName,
-    AZStd::vector<CVarToggle> availableCVars)
-{
-    // Add a submenu of actions offering values for unique CVars
-    QMenu* menu = addMenu(displayName);
-    QActionGroup* group = new QActionGroup(menu);
-    group->setExclusive(true);
-
-    for (const CVarToggle& availableCVar : availableCVars)
-    {
-        QAction* action = menu->addAction(availableCVar.m_displayName);
-        action->setCheckable(true);
-        group->addAction(action);
-
-        connect(action, &QAction::triggered, [this, action, availableCVar, availableCVars](bool checked)
-            {
-                ICVar* cVar = gEnv->pConsole->GetCVar(availableCVar.m_cVarName.toUtf8().data());
-                if (cVar)
-                {
-                    if (!checked)
-                    {
-                        SetCVar(cVar, availableCVar.m_offValue);
-                    }
-                    else
-                    {
-                        // Toggle the CVar and update the action's checked state to
-                        // allow none of the items to be checked in the exclusive group.
-                        // Otherwise we could have just used the action's currently checked
-                        // state and updated the CVar's value only
-                        bool cVarOn = (cVar->GetFVal() == availableCVar.m_onValue);
-                        bool cVarChecked = !cVarOn;
-                        SetCVar(cVar, cVarChecked ? availableCVar.m_onValue : availableCVar.m_offValue);
-                        action->setChecked(cVarChecked);
-                        if (cVarChecked)
-                        {
-                            // Set the rest of the CVars in the group to their off values
-                            SetCVarsToOffValue(availableCVars, availableCVar);
-                        }
-                    }
-                }
-            });
-
-        // Initialize the action's checked state based on its associated CVar's current value
-        ICVar* cVar = gEnv->pConsole->GetCVar(availableCVar.m_cVarName.toUtf8().data());
-        bool cVarChecked = (cVar && cVar->GetFVal() == availableCVar.m_onValue);
-        action->setChecked(cVarChecked);
-        if (cVarChecked)
-        {
-            // Set the rest of the CVars in the group to their off values
-            SetCVarsToOffValue(availableCVars, availableCVar);
-        }
-    }
-}
-
-void CVarMenu::AddResetCVarsItem()
-{
-    QAction* action = addAction(tr("Reset to Default"));
-    connect(action, &QAction::triggered, this, [this]()
-        {
-            for (auto it : m_originalCVarValues)
-            {
-                ICVar* cVar = gEnv->pConsole->GetCVar(it.first.c_str());
-                if (cVar)
-                {
-                    cVar->Set(it.second);
-                }
-            }
-        });
-}
-
-void CVarMenu::SetCVarsToOffValue(const AZStd::vector<CVarToggle>& cVarToggles, const CVarToggle& excludeCVarToggle)
-{
-    // Set all but the specified CVars to their off values
-    for (const CVarToggle& cVarToggle : cVarToggles)
-    {
-        if (cVarToggle.m_cVarName != excludeCVarToggle.m_cVarName
-            || cVarToggle.m_onValue != excludeCVarToggle.m_onValue)
-        {
-            ICVar* cVar = gEnv->pConsole->GetCVar(cVarToggle.m_cVarName.toUtf8().data());
-            if (cVar)
-            {
-                SetCVar(cVar, cVarToggle.m_offValue);
-            }
-        }
-    }
-}
-
-void CVarMenu::SetCVar(ICVar* cVar, float newValue)
-{
-    float oldValue = cVar->GetFVal();
-    cVar->Set(newValue);
-
-    // Store original value for CVar if not already in the list
-    m_originalCVarValues.emplace(AZStd::string(cVar->GetName()), oldValue);
-}
-
-void CVarMenu::AddSeparator()
-{
-    addSeparator();
-}
diff --git a/Code/Sandbox/Editor/CVarMenu.h b/Code/Sandbox/Editor/CVarMenu.h
deleted file mode 100644
index 24562e6d6d..0000000000
--- a/Code/Sandbox/Editor/CVarMenu.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <QMenu>
-#include <QString>
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/utils.h>
-
-class CVarMenu
-    : public QMenu
-{
-public:
-    // CVar that can be toggled on and off
-    struct CVarToggle
-    {
-        QString m_cVarName;
-        QString m_displayName;
-        float m_onValue;
-        float m_offValue;
-    };
-
-    // List of a CVar's available values and their descriptions
-    using CVarDisplayNameValuePairs = AZStd::vector<AZStd::pair<QString, float>>;
-
-    CVarMenu(QWidget* parent = nullptr);
-
-    // Add an action that turns a CVar on/off
-    void AddCVarToggleItem(CVarToggle cVarToggle);
-
-    // Add a submenu of actions for a CVar that offers multiple values for exclusive selection
-    void AddCVarValuesItem(QString cVarName,
-        QString displayName,
-        CVarDisplayNameValuePairs availableCVarValues,
-        float offValue);
-
-    // Add a submenu of actions for exclusively turning unique CVars on/off
-    void AddUniqueCVarsItem(QString displayName,
-        AZStd::vector<CVarToggle> availableCVars);
-
-    // Add an action to reset all CVars to their original values before they
-    // were modified by this menu
-    void AddResetCVarsItem();
-
-    void AddSeparator();
-
-private:
-    void SetCVarsToOffValue(const AZStd::vector<CVarToggle>& cVarToggles, const CVarToggle& excludeCVarToggle);
-    void SetCVar(ICVar* cVar, float newValue);
-
-    // Original CVar values before they were modified by this menu
-    AZStd::unordered_map<AZStd::string, float> m_originalCVarValues;
-};
diff --git a/Code/Sandbox/Editor/CheckOutDialog.cpp b/Code/Sandbox/Editor/CheckOutDialog.cpp
deleted file mode 100644
index 7af48b83c2..0000000000
--- a/Code/Sandbox/Editor/CheckOutDialog.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "CheckOutDialog.h"
-
-// Qt
-#include <QStyle>
-
-// AzToolsFramework
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h> // for AzToolsFramework::SourceControlConnectionRequestBus
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_CheckOutDialog.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-
-// CCheckOutDialog dialog
-int CCheckOutDialog::m_lastResult = CCheckOutDialog::CANCEL;
-
-CCheckOutDialog::CCheckOutDialog(const QString& file, QWidget* pParent)
-    : QDialog(pParent)
-    , m_ui(new Ui::CheckOutDialog)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-    m_file = file;
-
-    m_ui->icon->setPixmap(style()->standardIcon(QStyle::SP_MessageBoxQuestion).pixmap(m_ui->icon->width()));
-
-    OnInitDialog();
-
-    connect(m_ui->buttonCancel, &QPushButton::clicked, this, &CCheckOutDialog::OnBnClickedCancel);
-    connect(m_ui->buttonCheckout, &QPushButton::clicked, this, &CCheckOutDialog::OnBnClickedCheckout);
-    connect(m_ui->buttonOverwrite, &QPushButton::clicked, this, &CCheckOutDialog::OnBnClickedOverwrite);
-}
-
-CCheckOutDialog::~CCheckOutDialog()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCheckOutDialog::OnBnClickedCancel()
-{
-    // Cancel operation
-    HandleResult(CANCEL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CCheckOutDialog message handlers
-void CCheckOutDialog::OnBnClickedCheckout()
-{
-    // Check out this file.
-    HandleResult(CHECKOUT);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCheckOutDialog::OnBnClickedOverwrite()
-{
-    // Overwrite this file.
-    HandleResult(OVERWRITE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCheckOutDialog::HandleResult(int result)
-{
-    m_lastResult = result;
-    InstanceIsForAll() = m_ui->chkForAll->isChecked();
-    done(result);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCheckOutDialog::OnInitDialog()
-{
-    setWindowTitle(tr("Source Control"));
-
-    using namespace AzToolsFramework;
-    SourceControlState state = SourceControlState::Disabled;
-    SourceControlConnectionRequestBus::BroadcastResult(state, &SourceControlConnectionRequestBus::Events::GetSourceControlState);
-    bool sccAvailable = state == SourceControlState::Active ? true : false;
-
-    QString text(tr("%1\n\nis read-only, and needs to be writable to continue.").arg(m_file));
-
-    if (!sccAvailable)
-    {
-        text.append("\nEnable and connect to source control for more options.");
-    }
-
-    m_ui->m_text->setText(text);
-
-    m_ui->chkForAll->setEnabled(InstanceEnableForAll());
-    m_ui->chkForAll->setChecked(InstanceIsForAll());
-    m_ui->buttonCheckout->setEnabled(sccAvailable);
-
-    adjustSize();
-}
-
-//static ////////////////////////////////////////////////////////////////
-bool& CCheckOutDialog::InstanceEnableForAll()
-{
-    static bool isEnableForAll = false;
-    return isEnableForAll;
-}
-
-//static ////////////////////////////////////////////////////////////////
-bool& CCheckOutDialog::InstanceIsForAll()
-{
-    static bool isForAll = false;
-    return isForAll;
-}
-
-//static ////////////////////////////////////////////////////////////////
-bool CCheckOutDialog::EnableForAll(bool isEnable)
-{
-    bool bPrevEnable = InstanceEnableForAll();
-    InstanceEnableForAll() = isEnable;
-    if (!bPrevEnable || !isEnable)
-    {
-        InstanceIsForAll() = false;
-        m_lastResult = CANCEL;
-    }
-    return bPrevEnable;
-}
-
-#include <moc_CheckOutDialog.cpp>
diff --git a/Code/Sandbox/Editor/CheckOutDialog.h b/Code/Sandbox/Editor/CheckOutDialog.h
deleted file mode 100644
index ae6be16159..0000000000
--- a/Code/Sandbox/Editor/CheckOutDialog.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// CCheckOutDialog dialog
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class CheckOutDialog;
-}
-
-class CCheckOutDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    // Checkout dialog result.
-    enum EResult
-    {
-        CHECKOUT = QDialog::Accepted,
-        OVERWRITE,
-        CANCEL = QDialog::Rejected
-    };
-
-    CCheckOutDialog(const QString& file, QWidget* pParent = NULL);   // standard constructor
-    virtual ~CCheckOutDialog();
-
-    // Dialog Data
-    void OnInitDialog();
-
-    // Enable functionality For All. In the end call with false to return it in init state.
-    // Returns previous enable state
-    static bool EnableForAll(bool isEnable);
-    static bool IsForAll() { return InstanceIsForAll(); }
-
-    static int LastResult() { return m_lastResult; }
-
-protected:
-    void OnBnClickedCancel();
-    void OnBnClickedCheckout();
-    void OnBnClickedOverwrite();
-
-private:
-    static bool& InstanceEnableForAll();
-    static bool& InstanceIsForAll();
-
-    void HandleResult(int result);
-
-    QString m_file;
-    QScopedPointer<Ui::CheckOutDialog> m_ui;
-
-    static int m_lastResult;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CAutoCheckOutDialogEnableForAll
-{
-public:
-    CAutoCheckOutDialogEnableForAll()
-    {
-        m_bPrevState = CCheckOutDialog::EnableForAll(true);
-    }
-
-    ~CAutoCheckOutDialogEnableForAll()
-    {
-        CCheckOutDialog::EnableForAll(m_bPrevState);
-    }
-
-private:
-    bool m_bPrevState;
-};
diff --git a/Code/Sandbox/Editor/Clipboard.cpp b/Code/Sandbox/Editor/Clipboard.cpp
deleted file mode 100644
index 47be284c6d..0000000000
--- a/Code/Sandbox/Editor/Clipboard.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "Clipboard.h"
-
-#include "Util/Image.h"
-
-#include <QClipboard>
-#include <QMessageBox>
-#include <QVariant>
-
-XmlNodeRef CClipboard::m_node;
-QString CClipboard::m_title;
-QVariant CClipboard::s_pendingPut;
-
-//////////////////////////////////////////////////////////////////////////
-// Clipboard implementation.
-//////////////////////////////////////////////////////////////////////////
-CClipboard::CClipboard(QWidget* parent)
-    : m_parent(parent != nullptr ? parent : QApplication::activeWindow())
-{
-    m_putDebounce.setSingleShot(true);
-    m_putDebounce.setInterval(0);
-    // Wait one frame before setting clipboard contents, in case we're updated frequently
-    QObject::connect(&m_putDebounce, &QTimer::timeout, [this](){SendPendingPut();});
-}
-
-void CClipboard::Put(XmlNodeRef& node, const QString& title)
-{
-    m_title = title;
-    if (m_title.isEmpty())
-    {
-        m_title = node->getTag();
-    }
-    m_node = node;
-
-    PutString(m_node->getXML().c_str(), title);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CClipboard::Get() const
-{
-    QString str = GetString();
-    return XmlHelpers::LoadXmlFromBuffer(str.toUtf8().data(), str.toUtf8().length(), true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CClipboard::PutString(const QString& text, [[maybe_unused]] const QString& title /* = ""  */)
-{
-    s_pendingPut = text;
-    m_putDebounce.start();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CClipboard::GetString() const
-{
-    if (s_pendingPut.type() == QVariant::String)
-    {
-        return s_pendingPut.toString();
-    }
-    return QApplication::clipboard()->text();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CClipboard::IsEmpty() const
-{
-    return GetString().isEmpty();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CClipboard::PutImage(const CImageEx& img)
-{
-    QImage image(img.GetWidth(), img.GetHeight(), QImage::Format_RGBA8888);
-    s_pendingPut = image;
-    m_putDebounce.start();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CClipboard::GetImage(CImageEx& img)
-{
-    QImage image;
-    if (s_pendingPut.type() == QVariant::Image)
-    {
-        image = s_pendingPut.value<QImage>();
-    }
-    else
-    {
-        image = QApplication::clipboard()->image();
-    }
-
-    img.Allocate(image.width(), image.height());
-
-    unsigned char* pSrc = (unsigned char*)image.scanLine(0);
-    unsigned char* pDst = (unsigned char*)img.GetData();
-
-    int stSrc = (image.depth() == 24) ? 3 : 4;
-
-    for (int y = 0; y < image.height(); y++)
-    {
-        for (int x = 0; x < image.width(); x++)
-        {
-            pDst[x * 4 + (image.height() - y - 1) * image.width() * 4] = pSrc[x * stSrc + y * image.bytesPerLine()];
-            pDst[x * 4 + (image.height() - y - 1) * image.width() * 4 + 1] = pSrc[x * stSrc + y * image.bytesPerLine() + 1];
-            pDst[x * 4 + (image.height() - y - 1) * image.width() * 4 + 2] = pSrc[x * stSrc + y * image.bytesPerLine() + 2];
-            pDst[x * 4 + (image.height() - y - 1) * image.width() * 4 + 3] = 0;
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CClipboard::SendPendingPut()
-{
-    if (s_pendingPut.type() == QVariant::String)
-    {
-        QString text = s_pendingPut.toString();
-        QApplication::clipboard()->setText(text);
-    }
-    else if (s_pendingPut.type() == QVariant::Image)
-    {
-        QImage image = s_pendingPut.value<QImage>();
-        QApplication::clipboard()->setImage(image);
-    }
-    s_pendingPut = {};
-}
diff --git a/Code/Sandbox/Editor/Clipboard.h b/Code/Sandbox/Editor/Clipboard.h
deleted file mode 100644
index 6cf1fb1cc8..0000000000
--- a/Code/Sandbox/Editor/Clipboard.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CLIPBOARD_H
-#define CRYINCLUDE_EDITOR_CLIPBOARD_H
-
-#pragma once
-
-#include "Include/EditorCoreAPI.h"
-
-#include <QTimer>
-
-class CImageEx;
-class QVariant;
-class QWidget;
-
-/** Use this class to put and get stuff from windows clipboard.
-*/
-class EDITOR_CORE_API CClipboard
-{
-public:
-    CClipboard(QWidget* parent);
-
-    //! Put xml node into clipboard
-    void Put(XmlNodeRef& node, const QString& title = QString());
-    //! Get xml node to clipboard.
-    XmlNodeRef Get() const;
-
-    //! Put string into Windows clipboard.
-    void PutString(const QString& text, const QString& title = QString());
-    //! Get string from Windows clipboard.
-    QString GetString() const;
-
-    //! Return name of what is in clipboard now.
-    QString GetTitle() const { return m_title; };
-
-    //! Put image into Windows clipboard.
-    void PutImage(const CImageEx& img);
-
-    //! Get image from Windows clipboard.
-    bool GetImage(CImageEx& img);
-
-    //! Return true if clipboard is empty.
-    bool IsEmpty() const;
-private:
-    // Resolves the last request Put operation
-    void SendPendingPut();
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    static XmlNodeRef m_node;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    static QString m_title;
-
-    static QVariant s_pendingPut;
-
-    QWidget* m_parent;
-    QTimer m_putDebounce;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_CLIPBOARD_H
diff --git a/Code/Sandbox/Editor/Commands/CommandManager.cpp b/Code/Sandbox/Editor/Commands/CommandManager.cpp
deleted file mode 100644
index 1cef044afb..0000000000
--- a/Code/Sandbox/Editor/Commands/CommandManager.cpp
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "CommandManager.h"
-
-#include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
-
-// Editor
-#include "QtViewPaneManager.h"
-#include "Include/IIconManager.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
-
-CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pFirst = 0;
-CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pLast = 0;
-
-CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::GetFirst()
-{
-    return s_pFirst;
-}
-
-CAutoRegisterCommandHelper::CAutoRegisterCommandHelper(void(*registerFunc)(CEditorCommandManager &))
-{
-    m_registerFunc = registerFunc;
-    m_pNext = 0;
-
-    if (!s_pLast)
-    {
-        s_pFirst = this;
-    }
-    else
-    {
-        s_pLast->m_pNext = this;
-    }
-
-    s_pLast = this;
-}
-
-CEditorCommandManager::CEditorCommandManager()
-    : m_bWarnDuplicate(true) {}
-
-void CEditorCommandManager::RegisterAutoCommands()
-{
-    CAutoRegisterCommandHelper* pHelper = CAutoRegisterCommandHelper::GetFirst();
-
-    while (pHelper)
-    {
-        pHelper->m_registerFunc(*this);
-        pHelper = pHelper->m_pNext;
-    }
-}
-
-CEditorCommandManager::~CEditorCommandManager()
-{
-    CommandTable::const_iterator iter = m_commands.begin(), end = m_commands.end();
-
-    for (; iter != end; ++iter)
-    {
-        if (iter->second.deleter)
-        {
-            iter->second.deleter(iter->second.pCommand);
-        }
-        else
-        {
-            delete iter->second.pCommand;
-        }
-    }
-
-    m_commands.clear();
-    m_uiCommands.clear();
-}
-
-string CEditorCommandManager::GetFullCommandName(const string& module, const string& name)
-{
-    string fullName = module;
-    fullName += ".";
-    fullName += name;
-    return fullName;
-}
-
-bool CEditorCommandManager::AddCommand(CCommand* pCommand, TPfnDeleter deleter)
-{
-    assert(pCommand);
-
-    string module = pCommand->GetModule();
-    string name = pCommand->GetName();
-
-    if (IsRegistered(module, name) && m_bWarnDuplicate)
-    {
-        QString errMsg;
-
-        errMsg = QStringLiteral("Error: Command %1.%2 already registered!").arg(module.c_str(), name.c_str());
-        Warning(errMsg.toUtf8().data());
-
-        return false;
-    }
-
-    SCommandTableEntry entry;
-
-    entry.pCommand = pCommand;
-    entry.deleter = deleter;
-
-    m_commands.insert(
-        CommandTable::value_type(GetFullCommandName(module, name),
-            entry));
-
-    return true;
-}
-
-bool CEditorCommandManager::UnregisterCommand(const char* module, const char* name)
-{
-    string fullName = GetFullCommandName(module, name);
-    CommandTable::iterator itr = m_commands.find(fullName);
-
-    if (itr != m_commands.end())
-    {
-        if (itr->second.deleter)
-        {
-            itr->second.deleter(itr->second.pCommand);
-        }
-        else
-        {
-            delete itr->second.pCommand;
-        }
-
-        m_commands.erase(itr);
-
-        return true;
-    }
-    return false;
-}
-
-bool CEditorCommandManager::RegisterUICommand(
-    const char* module,
-    const char* name,
-    const char* description,
-    const char* example,
-    const AZStd::function<void()>& functor,
-    const CCommand0::SUIInfo& uiInfo)
-{
-    bool ok = CommandManagerHelper::RegisterCommand(this, module, name, description, example, functor);
-
-    if (ok == false)
-    {
-        return false;
-    }
-
-    return AttachUIInfo(GetFullCommandName(module, name), uiInfo);
-}
-
-bool CEditorCommandManager::AttachUIInfo(const char* fullCmdName, const CCommand0::SUIInfo& uiInfo)
-{
-    CommandTable::iterator iter = m_commands.find(fullCmdName);
-
-    if (iter == m_commands.end())
-    {
-        return false;
-    }
-
-    if (iter->second.pCommand->CanBeUICommand() == false)
-    {
-        return false;
-    }
-
-    CCommand0* pCommand = static_cast<CCommand0*>(iter->second.pCommand);
-
-    pCommand->m_uiInfo = uiInfo;
-
-    if (pCommand->m_uiInfo.commandId == 0)
-    {
-        pCommand->m_uiInfo.commandId = GenNewCommandId();
-    }
-
-    m_uiCommands.insert(UICommandTable::value_type(pCommand->m_uiInfo.commandId, pCommand));
-
-    if (uiInfo.iconFilename.empty() == false)
-    {
-        GetIEditor()->GetIconManager()->RegisterCommandIcon(uiInfo.iconFilename.c_str(), pCommand->m_uiInfo.commandId);
-    }
-
-    return true;
-}
-
-bool CEditorCommandManager::GetUIInfo(const string& module, const string& name, CCommand0::SUIInfo& uiInfo) const
-{
-    string fullName = GetFullCommandName(module, name);
-
-    return GetUIInfo(fullName, uiInfo);
-}
-
-bool CEditorCommandManager::GetUIInfo(const string& fullCmdName, CCommand0::SUIInfo& uiInfo) const
-{
-    CommandTable::const_iterator iter = m_commands.find(fullCmdName);
-
-    if (iter == m_commands.end())
-    {
-        return false;
-    }
-
-    if (iter->second.pCommand->CanBeUICommand() == false)
-    {
-        return false;
-    }
-
-    CCommand0* pCommand = static_cast<CCommand0*>(iter->second.pCommand);
-    uiInfo = pCommand->m_uiInfo;
-
-    return true;
-}
-
-int CEditorCommandManager::GenNewCommandId()
-{
-    static int uniqueId = CUSTOM_COMMAND_ID_FIRST;
-    return uniqueId++;
-}
-
-QString CEditorCommandManager::Execute(const string& module, const string& name, const CCommand::CArgs& args)
-{
-    string fullName = GetFullCommandName(module, name);
-    CommandTable::iterator iter = m_commands.find(fullName);
-
-    if (iter != m_commands.end())
-    {
-        LogCommand(fullName, args);
-
-        return ExecuteAndLogReturn(iter->second.pCommand, args);
-    }
-    else
-    {
-        QString errMsg;
-
-        errMsg = QStringLiteral("Error: Trying to execute a unknown command, '%1'!").arg(fullName.c_str());
-        CryLogAlways(errMsg.toUtf8().data());
-    }
-
-    return "";
-}
-
-QString CEditorCommandManager::Execute(const string& cmdLine)
-{
-    string cmdTxt, argsTxt;
-    size_t argStart = cmdLine.find_first_of(' ');
-
-    cmdTxt = cmdLine.substr(0, argStart);
-    argsTxt = "";
-
-    if (argStart != string::npos)
-    {
-        argsTxt = cmdLine.substr(argStart + 1);
-        argsTxt.Trim();
-    }
-
-    CommandTable::iterator itr = m_commands.find(cmdTxt);
-
-    if (itr != m_commands.end())
-    {
-        CCommand::CArgs argList;
-
-        GetArgsFromString(argsTxt, argList);
-        LogCommand(cmdTxt, argList);
-
-        return ExecuteAndLogReturn(itr->second.pCommand, argList);
-    }
-    else
-    {
-        QString errMsg;
-
-        errMsg = QStringLiteral("Error: Trying to execute a unknown command, '%1'!").arg(cmdLine.c_str());
-        CryLogAlways(errMsg.toUtf8().data());
-    }
-
-    return "";
-}
-
-void CEditorCommandManager::Execute(int commandId)
-{
-    UICommandTable::iterator iter = m_uiCommands.find(commandId);
-
-    if (iter != m_uiCommands.end())
-    {
-        LogCommand(
-            GetFullCommandName(iter->second->GetModule(), iter->second->GetName()),
-            CCommand::CArgs());
-        iter->second->Execute(CCommand::CArgs());
-    }
-    else
-    {
-        QString errMsg;
-
-        errMsg = QStringLiteral("Error: Trying to execute a unknown command of ID '%1'!").arg(commandId);
-        CryLogAlways(errMsg.toUtf8().data());
-    }
-}
-
-void CEditorCommandManager::GetCommandList(std::vector<string>& cmds) const
-{
-    cmds.clear();
-    cmds.reserve(m_commands.size());
-    CommandTable::const_iterator iter = m_commands.begin(), end = m_commands.end();
-
-    for (; iter != end; ++iter)
-    {
-        cmds.push_back(iter->first);
-    }
-
-    std::sort(cmds.begin(), cmds.end());
-}
-
-string CEditorCommandManager::AutoComplete(const string& substr) const
-{
-    std::vector<string> cmds;
-    GetCommandList(cmds);
-
-    // If substring is empty return first command.
-    if (substr.empty() && (cmds.empty() == false))
-    {
-        return cmds[0];
-    }
-
-    size_t substrLen = substr.length();
-
-    for (size_t i = 0; i < cmds.size(); ++i)
-    {
-        size_t cmdLen = cmds[i].length();
-
-        if (cmdLen >= substrLen && !strncmp(cmds[i].c_str(), substr.c_str(), substrLen))
-        {
-            if (substrLen == cmdLen)
-            {
-                ++i;
-
-                if (i < cmds.size())
-                {
-                    return cmds[i];
-                }
-                else
-                {
-                    return cmds[i - 1];
-                }
-            }
-
-            return cmds[i];
-        }
-    }
-
-    // Not found
-    return "";
-}
-
-bool CEditorCommandManager::IsRegistered(const char* module, const char* name) const
-{
-    string fullName = GetFullCommandName(module, name);
-    CommandTable::const_iterator iter = m_commands.find(fullName);
-
-    if (iter != m_commands.end())
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-bool CEditorCommandManager::IsRegistered(const char* cmdLine_) const
-{
-    string cmdTxt, argsTxt, cmdLine(cmdLine_);
-    size_t argStart = cmdLine.find_first_of(' ');
-    cmdTxt = cmdLine.substr(0, argStart);
-    CommandTable::const_iterator iter = m_commands.find(cmdTxt);
-
-    if (iter != m_commands.end())
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-bool CEditorCommandManager::IsRegistered(int commandId) const
-{
-    if (CUSTOM_COMMAND_ID_FIRST <= commandId && commandId < CUSTOM_COMMAND_ID_LAST)
-    {
-        UICommandTable::const_iterator iter = m_uiCommands.find(commandId);
-
-        if (iter != m_uiCommands.end())
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-void CEditorCommandManager::SetCommandAvailableInScripting(const string& module, const string& name)
-{
-    string fullName = GetFullCommandName(module, name);
-    CommandTable::iterator iter = m_commands.find(fullName);
-
-    if (iter != m_commands.end())
-    {
-        iter->second.pCommand->SetAvailableInScripting();
-    }
-}
-
-bool CEditorCommandManager::IsCommandAvailableInScripting(const string& fullCmdName) const
-{
-    CommandTable::const_iterator iter = m_commands.find(fullCmdName);
-
-    if (iter != m_commands.end())
-    {
-        return iter->second.pCommand->IsAvailableInScripting();
-    }
-
-    return false;
-}
-
-bool CEditorCommandManager::IsCommandAvailableInScripting(const string& module, const string& name) const
-{
-    string fullName = GetFullCommandName(module, name);
-
-    return IsCommandAvailableInScripting(fullName);
-}
-
-void CEditorCommandManager::LogCommand(const string& fullCmdName, const CCommand::CArgs& args) const
-{
-    string cmdLine = fullCmdName;
-
-    for (int i = 0; i < args.GetArgCount(); ++i)
-    {
-        cmdLine += " ";
-        bool bString = args.IsStringArg(i);
-
-        if (bString)
-        {
-            cmdLine += "'";
-        }
-
-        cmdLine += args.GetArg(i);
-
-        if (bString)
-        {
-            cmdLine += "'";
-        }
-    }
-
-    CLogFile::WriteLine(cmdLine.c_str());
-
-    if (IsCommandAvailableInScripting(fullCmdName) == false)
-    {
-        return;
-    }
-
-    /// If this same command is also available in the script system,
-    /// log this to the script terminal, too.
-
-    // First, recreate a command line to be compatible to the script system.
-    cmdLine = fullCmdName;
-    cmdLine += "(";
-
-    for (int i = 0; i < args.GetArgCount(); ++i)
-    {
-        bool bString = args.IsStringArg(i);
-
-        if (bString)
-        {
-            cmdLine += "\"";
-        }
-
-        cmdLine += args.GetArg(i);
-
-        if (bString)
-        {
-            cmdLine += "\"";
-        }
-
-        if (i < args.GetArgCount() - 1)
-        {
-            cmdLine += ",";
-        }
-    }
-
-    cmdLine += ")";
-
-    // If it's not SandBox main editor (one case is the standalone material editor triggered by 3ds Max exporter),
-    // we should not cast it into main editor for further operation.
-    if (GetIEditor()->IsInMatEditMode())
-    {
-        return;
-    }
-
-    // Then, register it to the terminal.
-    QtViewPane* scriptTermPane = QtViewPaneManager::instance()->GetPane(SCRIPT_TERM_WINDOW_NAME);
-    if (!scriptTermPane)
-    {
-        return;
-    }
-    AzToolsFramework::CScriptTermDialog* pScriptTermDialog = qobject_cast<AzToolsFramework::CScriptTermDialog*>(scriptTermPane->Widget());
-
-    if (pScriptTermDialog)
-    {
-        string text = "> ";
-        text += cmdLine;
-        text += "\r\n";
-        pScriptTermDialog->AppendText(text.c_str());
-    }
-}
-
-QString CEditorCommandManager::ExecuteAndLogReturn(CCommand* pCommand, const CCommand::CArgs& args)
-{
-    const QString result = pCommand->Execute(args);
-    const QString returnMsg = QString("Returned: %1").arg(result);
-
-    CLogFile::WriteLine(returnMsg.toUtf8().constData());
-
-    return result;
-}
-
-void CEditorCommandManager::GetArgsFromString(const string& argsTxt, CCommand::CArgs& argList)
-{
-    const char quoteSymbol = '\'';
-    int curPos = 0;
-    int prevPos = 0;
-    string arg = argsTxt.Tokenize(" ", curPos);
-
-    while (!arg.empty())
-    {
-        if (arg[0] == quoteSymbol)   // A special consideration for a quoted string
-        {
-            if (arg.length() < 2 || arg[arg.length() - 1] != quoteSymbol)
-            {
-                size_t openingQuotePos = argsTxt.find(quoteSymbol, prevPos);
-                size_t closingQuotePos = argsTxt.find(quoteSymbol, curPos);
-
-                if (closingQuotePos != string::npos)
-                {
-                    arg = argsTxt.substr(openingQuotePos + 1, closingQuotePos - openingQuotePos - 1);
-                    size_t nextArgPos = argsTxt.find(' ', closingQuotePos + 1);
-                    curPos = nextArgPos != string::npos ? nextArgPos + 1 : argsTxt.length();
-
-                    for (; curPos < argsTxt.length(); ++curPos)    // Skip spaces.
-                    {
-                        if (argsTxt[curPos] != ' ')
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                arg = arg.substr(1, arg.length() - 2);
-            }
-        }
-
-        argList.Add(arg.c_str());
-        prevPos = curPos;
-        arg = argsTxt.Tokenize(" ", curPos);
-    }
-}
diff --git a/Code/Sandbox/Editor/Commands/CommandManager.h b/Code/Sandbox/Editor/Commands/CommandManager.h
deleted file mode 100644
index 21ffc85d0f..0000000000
--- a/Code/Sandbox/Editor/Commands/CommandManager.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : the command manager
-
-
-#ifndef CRYINCLUDE_EDITOR_COMMANDS_COMMANDMANAGER_H
-#define CRYINCLUDE_EDITOR_COMMANDS_COMMANDMANAGER_H
-#pragma once
-
-#include "platform.h"
-
-#include <ISystem.h>
-
-#include "Include/SandboxAPI.h"
-#include "Include/ICommandManager.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class SANDBOX_API CEditorCommandManager
-    : public ICommandManager
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    enum
-    {
-        CUSTOM_COMMAND_ID_FIRST = 10000,
-        CUSTOM_COMMAND_ID_LAST  = 15000
-    };
-
-    CEditorCommandManager();
-    ~CEditorCommandManager();
-
-    void RegisterAutoCommands();
-
-    bool AddCommand(CCommand* pCommand, TPfnDeleter deleter = NULL);
-    bool UnregisterCommand(const char* module, const char* name);
-    bool RegisterUICommand(
-        const char* module,
-        const char* name,
-        const char* description,
-        const char* example,
-        const AZStd::function<void()>& functor,
-        const CCommand0::SUIInfo& uiInfo);
-    bool AttachUIInfo(const char* fullCmdName, const CCommand0::SUIInfo& uiInfo);
-    bool GetUIInfo(const string& module, const string& name, CCommand0::SUIInfo& uiInfo) const;
-    bool GetUIInfo(const string& fullCmdName, CCommand0::SUIInfo& uiInfo) const;
-    QString Execute(const string& cmdLine);
-    QString Execute(const string& module, const string& name, const CCommand::CArgs& args);
-    void Execute(int commandId);
-    void GetCommandList(std::vector<string>& cmds) const;
-    //! Used in the console dialog
-    string AutoComplete(const string& substr) const;
-    bool IsRegistered(const char* module, const char* name) const;
-    bool IsRegistered(const char* cmdLine) const;
-    bool IsRegistered(int commandId) const;
-    void SetCommandAvailableInScripting(const string& module, const string& name);
-    bool IsCommandAvailableInScripting(const string& module, const string& name) const;
-    bool IsCommandAvailableInScripting(const string& fullCmdName) const;
-    //! Turning off the warning is needed for reloading the ribbon bar.
-    void TurnDuplicateWarningOn() { m_bWarnDuplicate = true; }
-    void TurnDuplicateWarningOff() { m_bWarnDuplicate = false; }
-
-protected:
-    struct SCommandTableEntry
-    {
-        CCommand* pCommand;
-        TPfnDeleter deleter;
-    };
-
-    //! A full command name to an actual command mapping
-    typedef std::map<string, SCommandTableEntry> CommandTable;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    CommandTable m_commands;
-
-    //! A command ID to an actual UI command mapping
-    //! This table will contain a subset of commands among all registered to the above table.
-    typedef std::map<int, CCommand0*> UICommandTable;
-    UICommandTable m_uiCommands;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    bool m_bWarnDuplicate;
-
-    static int GenNewCommandId();
-    static string GetFullCommandName(const string& module, const string& name);
-    static void GetArgsFromString(const string& argsTxt, CCommand::CArgs& argList);
-    void LogCommand(const string& fullCmdName, const CCommand::CArgs& args) const;
-    QString ExecuteAndLogReturn(CCommand* pCommand, const CCommand::CArgs& args);
-};
-
-//! A helper class for an automatic command registration
-class SANDBOX_API CAutoRegisterCommandHelper
-{
-public:
-    static CAutoRegisterCommandHelper* GetFirst();
-
-    CAutoRegisterCommandHelper(void(*registerFunc)(CEditorCommandManager &));
-    void (* m_registerFunc)(CEditorCommandManager&);
-    CAutoRegisterCommandHelper* m_pNext;
-
-private:
-
-    static CAutoRegisterCommandHelper* s_pFirst;
-    static CAutoRegisterCommandHelper* s_pLast;
-};
-
-#define REGISTER_EDITOR_COMMAND(boundFunction, moduleName, functionName, description, example)                                  \
-    void RegisterCommand##moduleName##functionName(CEditorCommandManager & cmdMgr)                                              \
-    {                                                                                                                           \
-        CommandManagerHelper::RegisterCommand(&cmdMgr, #moduleName, #functionName, description, example, boundFunction);        \
-    }                                                                                                                           \
-    CAutoRegisterCommandHelper g_AutoRegCmdHelper##moduleName##functionName(RegisterCommand##moduleName##functionName)
-
-#endif // CRYINCLUDE_EDITOR_COMMANDS_COMMANDMANAGER_H
diff --git a/Code/Sandbox/Editor/Commands/CommandManagerBus.h b/Code/Sandbox/Editor/Commands/CommandManagerBus.h
deleted file mode 100644
index 6c37259c98..0000000000
--- a/Code/Sandbox/Editor/Commands/CommandManagerBus.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-class CommandManagerRequests : public AZ::EBusTraits
-{
-public:
-
-    struct CommandDetails
-    {
-        AZStd::string m_name;
-        AZStd::vector<AZStd::string> m_arguments;
-    };
-
-    virtual AZStd::vector<AZStd::string> GetCommands() const = 0;
-    virtual void ExecuteCommand(const AZStd::string& commandLine) {}
-
-    virtual void GetCommandDetails(AZStd::string commandName, CommandDetails& outArguments) const = 0;
-
-};
-
-using CommandManagerRequestBus = AZ::EBus<CommandManagerRequests>;
diff --git a/Code/Sandbox/Editor/ConfigGroup.cpp b/Code/Sandbox/Editor/ConfigGroup.cpp
deleted file mode 100644
index a802bb92a5..0000000000
--- a/Code/Sandbox/Editor/ConfigGroup.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ConfigGroup.h"
-
-namespace Config
-{
-    CConfigGroup::CConfigGroup()
-    {
-    }
-
-    CConfigGroup::~CConfigGroup()
-    {
-        for (TConfigVariables::const_iterator it = m_vars.begin();
-             it != m_vars.end(); ++it)
-        {
-            delete (*it);
-        }
-    }
-
-    void CConfigGroup::AddVar(IConfigVar* var)
-    {
-        m_vars.push_back(var);
-    }
-
-    uint32 CConfigGroup::GetVarCount()
-    {
-        return m_vars.size();
-    }
-
-    IConfigVar* CConfigGroup::GetVar(const char* szName)
-    {
-        for (TConfigVariables::const_iterator it = m_vars.begin();
-             it != m_vars.end(); ++it)
-        {
-            IConfigVar* var = (*it);
-            if (0 == _stricmp(szName, var->GetName().c_str()))
-            {
-                return var;
-            }
-        }
-
-        return NULL;
-    }
-
-    const IConfigVar* CConfigGroup::GetVar(const char* szName) const
-    {
-        for (TConfigVariables::const_iterator it = m_vars.begin();
-             it != m_vars.end(); ++it)
-        {
-            IConfigVar* var = (*it);
-            if (0 == _stricmp(szName, var->GetName().c_str()))
-            {
-                return var;
-            }
-        }
-
-        return NULL;
-    }
-
-    IConfigVar* CConfigGroup::GetVar(uint index)
-    {
-        if (index < m_vars.size())
-        {
-            return m_vars[index];
-        }
-
-        return NULL;
-    }
-
-    const IConfigVar* CConfigGroup::GetVar(uint index) const
-    {
-        if (index < m_vars.size())
-        {
-            return m_vars[index];
-        }
-
-        return NULL;
-    }
-
-    void CConfigGroup::SaveToXML(XmlNodeRef node)
-    {
-        // save only values that don't have default values
-        for (TConfigVariables::const_iterator it = m_vars.begin();
-             it != m_vars.end(); ++it)
-        {
-            IConfigVar* var = (*it);
-            if (!var->IsFlagSet(IConfigVar::eFlag_DoNotSave))
-            {
-                if (!var->IsDefault())
-                {
-                    const char* szName = var->GetName().c_str();
-
-                    switch (var->GetType())
-                    {
-                    case IConfigVar::eType_BOOL:
-                    {
-                        bool currentValue = false;
-                        var->Get(&currentValue);
-                        node->setAttr(szName, currentValue);
-                        break;
-                    }
-
-                    case IConfigVar::eType_INT:
-                    {
-                        int currentValue = 0;
-                        var->Get(&currentValue);
-                        node->setAttr(szName, currentValue);
-                        break;
-                    }
-
-                    case IConfigVar::eType_FLOAT:
-                    {
-                        float currentValue = 0;
-                        var->Get(&currentValue);
-                        node->setAttr(szName, currentValue);
-                        break;
-                    }
-
-                    case IConfigVar::eType_STRING:
-                    {
-                        string currentValue = 0;
-                        var->Get(&currentValue);
-                        node->setAttr(szName, currentValue);
-                        break;
-                    }
-                    }
-                }
-            }
-        }
-    }
-
-    void CConfigGroup::LoadFromXML(XmlNodeRef node)
-    {
-        // save only values that don't have default values
-        for (TConfigVariables::const_iterator it = m_vars.begin();
-             it != m_vars.end(); ++it)
-        {
-            IConfigVar* var = (*it);
-            if (!var->IsFlagSet(IConfigVar::eFlag_DoNotSave))
-            {
-                const char* szName = var->GetName().c_str();
-
-                switch (var->GetType())
-                {
-                case IConfigVar::eType_BOOL:
-                {
-                    bool currentValue = false;
-                    var->GetDefault(&currentValue);
-                    if (node->getAttr(szName, currentValue))
-                    {
-                        var->Set(&currentValue);
-                    }
-                    break;
-                }
-
-                case IConfigVar::eType_INT:
-                {
-                    int currentValue = 0;
-                    var->GetDefault(&currentValue);
-                    if (node->getAttr(szName, currentValue))
-                    {
-                        var->Set(&currentValue);
-                    }
-                    break;
-                }
-
-                case IConfigVar::eType_FLOAT:
-                {
-                    float currentValue = 0;
-                    var->GetDefault(&currentValue);
-                    if (node->getAttr(szName, currentValue))
-                    {
-                        var->Set(&currentValue);
-                    }
-                    break;
-                }
-
-                case IConfigVar::eType_STRING:
-                {
-                    string currentValue = 0;
-                    var->GetDefault(&currentValue);
-                    QString readValue(currentValue.c_str());
-                    if (node->getAttr(szName, readValue))
-                    {
-                        currentValue = readValue.toUtf8().data();
-                        var->Set(&currentValue);
-                    }
-                    break;
-                }
-                }
-            }
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/ConfigGroup.h b/Code/Sandbox/Editor/ConfigGroup.h
deleted file mode 100644
index 71d90cbfd0..0000000000
--- a/Code/Sandbox/Editor/ConfigGroup.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_EDITOR_CONFIGGROUP_H
-#define CRYINCLUDE_EDITOR_CONFIGGROUP_H
-
-namespace Config
-{
-    // Abstract configurable variable
-    struct IConfigVar
-    {
-    public:
-        enum EType
-        {
-            eType_BOOL,
-            eType_INT,
-            eType_FLOAT,
-            eType_STRING,
-        };
-
-        enum EFlags
-        {
-            eFlag_NoUI = 1 << 0,
-            eFlag_NoCVar = 1 << 1,
-            eFlag_DoNotSave = 1 << 2,
-        };
-
-        IConfigVar(const char* szName, const char* szDescription, EType varType, uint8 flags)
-            : m_name(szName)
-            , m_description(szDescription)
-            , m_type(varType)
-            , m_flags(flags)
-            , m_ptr(NULL)
-        {};
-
-        virtual ~IConfigVar() = default;
-        
-        ILINE EType GetType() const
-        {
-            return m_type;
-        }
-
-        ILINE const string& GetName() const
-        {
-            return m_name;
-        }
-
-        ILINE const string& GetDescription() const
-        {
-            return m_description;
-        }
-
-        ILINE bool IsFlagSet(EFlags flag) const
-        {
-            return 0 != (m_flags & flag);
-        }
-
-        virtual void Get(void* outPtr) const = 0;
-        virtual void Set(const void* ptr) = 0;
-        virtual bool IsDefault() const = 0;
-        virtual void GetDefault(void* outPtr) const = 0;
-        virtual void Reset() = 0;
-
-        static EType TranslateType(const bool&) { return eType_BOOL; }
-        static EType TranslateType(const int&) { return eType_INT; }
-        static EType TranslateType(const float&) { return eType_FLOAT; }
-        static EType TranslateType(const string&) { return eType_STRING; }
-
-    protected:
-        EType m_type;
-        uint8 m_flags;
-        string m_name;
-        string m_description;
-        void* m_ptr;
-        ICVar* m_pCVar;
-    };
-
-    // Typed wrapper for config variable
-    template<class T>
-    class TConfigVar
-        : public IConfigVar
-    {
-    private:
-        T m_default;
-
-    public:
-        TConfigVar(const char* szName, const char* szDescription, uint8 flags, T& ptr, const T& defaultValue)
-            : IConfigVar(szName, szDescription, IConfigVar::TranslateType(ptr), flags)
-            , m_default(defaultValue)
-        {
-            m_ptr = &ptr;
-
-            // reset to default value on initializations
-            ptr = defaultValue;
-        }
-
-        virtual void Get(void* outPtr) const
-        {
-            *reinterpret_cast<T*>(outPtr) = *reinterpret_cast<const T*>(m_ptr);
-        }
-
-        virtual void Set(const void* ptr)
-        {
-            *reinterpret_cast<T*>(m_ptr) = *reinterpret_cast<const T*>(ptr);
-        }
-
-        virtual void Reset()
-        {
-            *reinterpret_cast<T*>(m_ptr) = m_default;
-        }
-
-        virtual void GetDefault(void* outPtr) const
-        {
-            *reinterpret_cast<T*>(outPtr) = m_default;
-        }
-
-        virtual bool IsDefault() const
-        {
-            return *reinterpret_cast<const T*>(m_ptr) == m_default;
-        }
-    };
-
-    // Group of configuration variables with optional mapping to CVars
-    class CConfigGroup
-    {
-    private:
-        typedef std::vector<IConfigVar*> TConfigVariables;
-        TConfigVariables m_vars;
-
-        typedef std::vector<ICVar*> TConsoleVariables;
-        TConsoleVariables m_consoleVars;
-
-    public:
-        CConfigGroup();
-        virtual ~CConfigGroup();
-
-        void AddVar(IConfigVar* var);
-        uint32 GetVarCount();
-        IConfigVar* GetVar(const char* szName);
-        IConfigVar* GetVar(uint index);
-        const IConfigVar* GetVar(const char* szName) const;
-        const IConfigVar* GetVar(uint index) const;
-
-        void SaveToXML(XmlNodeRef node);
-        void LoadFromXML(XmlNodeRef node);
-
-        template<class T>
-        void AddVar(const char* szName, const char* szDescription, T& var, const T& defaultValue, uint8 flags = 0)
-        {
-            AddVar(new TConfigVar<T>(szName, szDescription, flags, var, defaultValue));
-        }
-    };
-};
-#endif // CRYINCLUDE_EDITOR_CONFIGGROUP_H
diff --git a/Code/Sandbox/Editor/ConsoleDialog.cpp b/Code/Sandbox/Editor/ConsoleDialog.cpp
deleted file mode 100644
index 1875ad2f4a..0000000000
--- a/Code/Sandbox/Editor/ConsoleDialog.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ConsoleDialog.h"
-
-// Qt
-#include <QVBoxLayout>
-
-// Editor
-#include "Controls/ConsoleSCB.h"    // For CConsoleSCB
-#include "LyViewPaneNames.h"        // for LyViewPane::
-
-
-CConsoleDialog::CConsoleDialog(QWidget* parent)
-    : QDialog(parent)
-    , m_consoleWidget(new CConsoleSCB(this))
-{
-    QVBoxLayout* outterLayout = new QVBoxLayout(this);
-    outterLayout->addWidget(m_consoleWidget);
-    outterLayout->setMargin(0);
-
-    setWindowTitle(LyViewPane::Console);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    resize(842, 480);
-}
-
-void CConsoleDialog::SetInfoText(const char* text)
-{
-    if (gEnv && gEnv->pLog)                             // before log system was initialized
-    {
-        CryLogAlways(text);
-    }
-}
-
-void CConsoleDialog::closeEvent(QCloseEvent* ev)
-{
-    if (GetISystem())
-    {
-        GetISystem()->Quit();
-    }
-    QDialog::closeEvent(ev);
-}
-
-#include <moc_ConsoleDialog.cpp>
diff --git a/Code/Sandbox/Editor/ConsoleDialog.h b/Code/Sandbox/Editor/ConsoleDialog.h
deleted file mode 100644
index 24bc78b677..0000000000
--- a/Code/Sandbox/Editor/ConsoleDialog.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONSOLEDIALOG_H
-#define CRYINCLUDE_EDITOR_CONSOLEDIALOG_H
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-class CConsoleSCB;
-
-class CConsoleDialog
-    : public QDialog
-    , public IInitializeUIInfo
-{
-    Q_OBJECT
-public:
-    explicit CConsoleDialog(QWidget* parent = nullptr);
-    void SetInfoText(const char* text) override;
-    void closeEvent(QCloseEvent*) override;
-
-private:
-    CConsoleSCB* const m_consoleWidget;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONSOLEDIALOG_H
diff --git a/Code/Sandbox/Editor/ControlMRU.cpp b/Code/Sandbox/Editor/ControlMRU.cpp
deleted file mode 100644
index 17ff481101..0000000000
--- a/Code/Sandbox/Editor/ControlMRU.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-#include "ControlMRU.h"
-
-IMPLEMENT_XTP_CONTROL(CControlMRU, CXTPControlRecentFileList)
-
-bool CControlMRU::DoesFileExist(CString& sFileName)
-{
-    return (_access(sFileName.GetBuffer(), 0) == 0);
-}
-
-void CControlMRU::OnCalcDynamicSize(DWORD dwMode)
-{
-    CRecentFileList* pRecentFileList = GetRecentFileList();
-
-    if (!pRecentFileList)
-    {
-        return;
-    }
-
-    CString* pArrNames = pRecentFileList->m_arrNames;
-
-    assert(pArrNames != NULL);
-    if (!pArrNames)
-    {
-        return;
-    }
-
-    while (m_nIndex + 1 < m_pControls->GetCount())
-    {
-        CXTPControl* pControl = m_pControls->GetAt(m_nIndex + 1);
-        assert(pControl);
-        if (pControl->GetID() >= GetFirstMruID()
-            && pControl->GetID() <= GetFirstMruID() + pRecentFileList->m_nSize)
-        {
-            m_pControls->Remove(pControl);
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    if (m_pParent->IsCustomizeMode())
-    {
-        m_dwHideFlags = 0;
-        SetEnabled(TRUE);
-        return;
-    }
-
-    if (pArrNames[0].IsEmpty())
-    {
-        SetCaption(CString(MAKEINTRESOURCE(IDS_NORECENTFILE_CAPTION)));
-        SetDescription("No recently opened files");
-        m_dwHideFlags = 0;
-        SetEnabled(FALSE);
-
-        return;
-    }
-    else
-    {
-        SetCaption(CString(MAKEINTRESOURCE(IDS_RECENTFILE_CAPTION)));
-        SetDescription("Open this document");
-    }
-
-    m_dwHideFlags |= xtpHideGeneric;
-
-    CString sCurDir = (Path::GetEditingGameDataFolder() + "\\").c_str();
-    int nCurDir = sCurDir.GetLength();
-
-    CString strName;
-    CString strTemp;
-    int iLastValidMRU = 0;
-
-    for (int iMRU = 0; iMRU < pRecentFileList->m_nSize; iMRU++)
-    {
-        if (!pRecentFileList->GetDisplayName(strName, iMRU, sCurDir.GetBuffer(), nCurDir))
-        {
-            break;
-        }
-
-        if (DoesFileExist(pArrNames[iMRU]))
-        {
-            CString sCurEntryDir = pArrNames[iMRU].Left(nCurDir);
-
-            if (sCurEntryDir.CompareNoCase(sCurDir) != 0)
-            {
-                //unavailable entry (wrong directory)
-                continue;
-            }
-        }
-        else
-        {
-            //invalid entry (not existing)
-            continue;
-        }
-
-        int nId = iMRU + GetFirstMruID();
-
-        CXTPControl* pControl = m_pControls->Add(xtpControlButton, nId, _T(""), m_nIndex + iLastValidMRU + 1, TRUE);
-        assert(pControl);
-
-        pControl->SetCaption(CXTPControlWindowList::ConstructCaption(strName, iLastValidMRU + 1));
-        pControl->SetFlags(xtpFlagManualUpdate);
-        pControl->SetBeginGroup(iLastValidMRU == 0 && m_nIndex != 0);
-        pControl->SetParameter(pArrNames[iMRU]);
-
-        CString sDescription = "Open file:  " + pArrNames[iMRU];
-        pControl->SetDescription(sDescription);
-
-        if ((GetFlags() & xtpFlagWrapRow) && iMRU == 0)
-        {
-            pControl->SetFlags(pControl->GetFlags() | xtpFlagWrapRow);
-        }
-
-        ++iLastValidMRU;
-    }
-
-    //if no entry was valid, treat as none would exist
-    if (iLastValidMRU == 0)
-    {
-        SetCaption(CString(MAKEINTRESOURCE(IDS_NORECENTFILE_CAPTION)));
-        SetDescription("No recently opened files");
-        m_dwHideFlags = 0;
-        SetEnabled(FALSE);
-    }
-}
diff --git a/Code/Sandbox/Editor/ControlMRU.h b/Code/Sandbox/Editor/ControlMRU.h
deleted file mode 100644
index 11fe5d08e8..0000000000
--- a/Code/Sandbox/Editor/ControlMRU.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_EDITOR_CONTROLMRU_H
-#define CRYINCLUDE_EDITOR_CONTROLMRU_H
-
-class CControlMRU
-    : public CXTPControlRecentFileList
-{
-protected:
-    virtual void OnCalcDynamicSize(DWORD dwMode);
-
-private:
-    DECLARE_XTP_CONTROL(CControlMRU)
-    bool DoesFileExist(CString& sFileName);
-};
-#endif // CRYINCLUDE_EDITOR_CONTROLMRU_H
diff --git a/Code/Sandbox/Editor/Controls/BitmapToolTip.cpp b/Code/Sandbox/Editor/Controls/BitmapToolTip.cpp
deleted file mode 100644
index 120d2106dd..0000000000
--- a/Code/Sandbox/Editor/Controls/BitmapToolTip.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Tooltip that displays bitmap.
-
-
-#include "EditorDefs.h"
-
-#include "BitmapToolTip.h"
-
-// Qt
-#include <QVBoxLayout>
-
-// Editor
-#include "Util/Image.h"
-#include "Util/ImageUtil.h"
-
-
-static const int STATIC_TEXT_C_HEIGHT = 42;
-static const int HISTOGRAM_C_HEIGHT = 130;
-
-/////////////////////////////////////////////////////////////////////////////
-// CBitmapToolTip
-CBitmapToolTip::CBitmapToolTip(QWidget* parent)
-    : QWidget(parent, Qt::ToolTip)
-    , m_staticBitmap(new QLabel(this))
-    , m_staticText(new QLabel(this))
-    , m_rgbaHistogram(new CImageHistogramCtrl(this))
-    , m_alphaChannelHistogram(new CImageHistogramCtrl(this))
-{
-    m_nTimer = 0;
-    m_hToolWnd = nullptr;
-    m_bShowHistogram = true;
-    m_bShowFullsize = false;
-    m_eShowMode = ESHOW_RGB;
-
-    connect(&m_timer, &QTimer::timeout, this, &CBitmapToolTip::OnTimer);
-
-    auto* layout = new QVBoxLayout(this);
-    layout->setSizeConstraint(QLayout::SetFixedSize);
-
-    layout->addWidget(m_staticBitmap);
-    layout->addWidget(m_staticText);
-
-    auto* histogramLayout = new QHBoxLayout();
-    histogramLayout->addWidget(m_rgbaHistogram);
-    histogramLayout->addWidget(m_alphaChannelHistogram);
-    m_alphaChannelHistogram->setVisible(false);
-
-    layout->addLayout(histogramLayout);
-
-    setLayout(layout);
-}
-
-CBitmapToolTip::~CBitmapToolTip()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBitmapToolTip::GetShowMode(EShowMode& eShowMode, bool& bShowInOriginalSize) const
-{
-    bShowInOriginalSize = CheckVirtualKey(Qt::Key_Space);
-    eShowMode = ESHOW_RGB;
-
-    if (m_bHasAlpha)
-    {
-        if (CheckVirtualKey(Qt::Key_Control))
-        {
-            eShowMode = ESHOW_RGB_ALPHA;
-        }
-        else if (CheckVirtualKey(Qt::Key_Alt))
-        {
-            eShowMode = ESHOW_ALPHA;
-        }
-        else if (CheckVirtualKey(Qt::Key_Shift))
-        {
-            eShowMode = ESHOW_RGBA;
-        }
-    }
-    else if (m_bIsLimitedHDR)
-    {
-        if (CheckVirtualKey(Qt::Key_Shift))
-        {
-            eShowMode = ESHOW_RGBE;
-        }
-    }
-}
-
-const char* CBitmapToolTip::GetShowModeDescription(EShowMode eShowMode, [[maybe_unused]] bool bShowInOriginalSize) const
-{
-    switch (eShowMode)
-    {
-    case ESHOW_RGB:
-        return "RGB";
-    case ESHOW_RGB_ALPHA:
-        return "RGB+A";
-    case ESHOW_ALPHA:
-        return "Alpha";
-    case ESHOW_RGBA:
-        return "RGBA";
-    case ESHOW_RGBE:
-        return "RGBExp";
-    }
-
-    return "";
-}
-
-void CBitmapToolTip::RefreshViewmode()
-{
-    LoadImage(m_filename);
-
-    if (m_eShowMode == ESHOW_RGB_ALPHA || m_eShowMode == ESHOW_RGBA)
-    {
-        m_rgbaHistogram->setVisible(true);
-        m_alphaChannelHistogram->setVisible(true);
-    }
-    else if (m_eShowMode == ESHOW_ALPHA)
-    {
-        m_rgbaHistogram->setVisible(false);
-        m_alphaChannelHistogram->setVisible(true);
-    }
-    else
-    {
-        m_rgbaHistogram->setVisible(true);
-        m_alphaChannelHistogram->setVisible(false);
-    }
-}
-
-bool CBitmapToolTip::LoadImage(const QString& imageFilename)
-{
-    EShowMode eShowMode = ESHOW_RGB;
-    const char* pShowModeDescription = "RGB";
-    bool bShowInOriginalSize = false;
-
-    GetShowMode(eShowMode, bShowInOriginalSize);
-    pShowModeDescription = GetShowModeDescription(eShowMode, bShowInOriginalSize);
-
-    QString convertedFileName = Path::GamePathToFullPath(Path::ReplaceExtension(imageFilename, ".dds"));
-
-    // We need to check against both the image filename and the converted filename as it is possible that the
-    // converted file existed but failed to load previously and we reverted to loading the source asset.
-    bool alreadyLoadedImage = ((m_filename == convertedFileName) || (m_filename == imageFilename));
-    if (alreadyLoadedImage && (m_eShowMode == eShowMode) && (m_bShowFullsize == bShowInOriginalSize))
-    {
-        return true;
-    }
-
-    CCryFile fileCheck;
-    if (!fileCheck.Open(convertedFileName.toUtf8().data(), "rb"))
-    {
-        // if we didn't find it, then default back to just using what we can find (if any)
-        convertedFileName = imageFilename;
-    }
-    else
-    {
-        fileCheck.Close();
-    }
-
-    m_eShowMode = eShowMode;
-    m_bShowFullsize = bShowInOriginalSize;
-
-    CImageEx image;
-    image.SetHistogramEqualization(CheckVirtualKey(Qt::Key_Shift));
-    bool loadedRequestedAsset = true;
-    if (!CImageUtil::LoadImage(convertedFileName, image))
-    {
-        //Failed to load the requested asset,  let's try loading the source asset if available.
-        loadedRequestedAsset = false;
-        if (!CImageUtil::LoadImage(imageFilename, image))
-        {
-            m_staticBitmap->clear();
-            return false;
-        }
-    }
-
-    QString imginfo;
-
-    m_filename = loadedRequestedAsset ? convertedFileName : imageFilename;
-    m_bHasAlpha = image.HasAlphaChannel();
-    m_bIsLimitedHDR = image.IsLimitedHDR();
-
-    GetShowMode(eShowMode, bShowInOriginalSize);
-    pShowModeDescription = GetShowModeDescription(eShowMode, bShowInOriginalSize);
-
-    if (m_bHasAlpha)
-    {
-        imginfo = tr("%1x%2 %3\nShowing %4 (ALT=Alpha, SHIFT=RGBA, CTRL=RGB+A, SPACE=see in original size)");
-    }
-    else if (m_bIsLimitedHDR)
-    {
-        imginfo = tr("%1x%2 %3\nShowing %4 (SHIFT=see hist.-equalized, SPACE=see in original size)");
-    }
-    else
-    {
-        imginfo = tr("%1x%2 %3\nShowing %4 (SPACE=see in original size)");
-    }
-
-    imginfo = imginfo.arg(image.GetWidth()).arg(image.GetHeight()).arg(image.GetFormatDescription()).arg(pShowModeDescription);
-
-    m_staticText->setText(imginfo);
-
-    int w = image.GetWidth();
-    int h = image.GetHeight();
-    int multiplier = (m_eShowMode == ESHOW_RGB_ALPHA ? 2 : 1);
-    int originalW = w * multiplier;
-    int originalH = h;
-
-    if (!bShowInOriginalSize || (w == 0))
-    {
-        w = 256;
-    }
-    if (!bShowInOriginalSize || (h == 0))
-    {
-        h = 256;
-    }
-
-    w *= multiplier;
-
-    resize(w + 4, h + 4 + STATIC_TEXT_C_HEIGHT + HISTOGRAM_C_HEIGHT);
-    setVisible(true);
-
-    CImageEx scaledImage;
-
-    if (bShowInOriginalSize && (originalW < w))
-    {
-        w = originalW;
-    }
-    if (bShowInOriginalSize && (originalH < h))
-    {
-        h = originalH;
-    }
-
-    scaledImage.Allocate(w, h);
-
-    if (m_eShowMode == ESHOW_RGB_ALPHA)
-    {
-        CImageUtil::ScaleToDoubleFit(image, scaledImage);
-    }
-    else
-    {
-        CImageUtil::ScaleToFit(image, scaledImage);
-    }
-
-    if (m_eShowMode == ESHOW_RGB || m_eShowMode == ESHOW_RGBE)
-    {
-        scaledImage.SwapRedAndBlue();
-        scaledImage.FillAlpha();
-    }
-    else if (m_eShowMode == ESHOW_ALPHA)
-    {
-        for (int hh = 0; hh < scaledImage.GetHeight(); hh++)
-        {
-            for (int ww = 0; ww < scaledImage.GetWidth(); ww++)
-            {
-                int a = scaledImage.ValueAt(ww, hh) >> 24;
-                scaledImage.ValueAt(ww, hh) = RGB(a, a, a);
-            }
-        }
-    }
-    else if (m_eShowMode == ESHOW_RGB_ALPHA)
-    {
-        int halfWidth = scaledImage.GetWidth() / 2;
-        for (int hh = 0; hh < scaledImage.GetHeight(); hh++)
-        {
-            for (int ww = 0; ww < halfWidth; ww++)
-            {
-                int r = GetRValue(scaledImage.ValueAt(ww, hh));
-                int g = GetGValue(scaledImage.ValueAt(ww, hh));
-                int b = GetBValue(scaledImage.ValueAt(ww, hh));
-                int a = scaledImage.ValueAt(ww, hh) >> 24;
-                scaledImage.ValueAt(ww, hh) = RGB(b, g, r);
-                scaledImage.ValueAt(ww + halfWidth, hh) = RGB(a, a, a);
-            }
-        }
-    }
-    else //if (m_showMode == ESHOW_RGBA)
-    {
-        scaledImage.SwapRedAndBlue();
-    }
-
-    QImage qImage(scaledImage.GetWidth(), scaledImage.GetHeight(), QImage::Format_RGB32);
-    memcpy(qImage.bits(), scaledImage.GetData(), qImage.sizeInBytes());
-    m_staticBitmap->setPixmap(QPixmap::fromImage(qImage));
-
-    if (m_bShowHistogram && scaledImage.GetData())
-    {
-        m_rgbaHistogram->ComputeHistogram(image, CImageHistogram::eImageFormat_32BPP_BGRA);
-        m_rgbaHistogram->setDrawMode(EHistogramDrawMode::OverlappedRGB);
-
-        m_alphaChannelHistogram->histogramDisplay()->CopyComputedDataFrom(m_rgbaHistogram->histogramDisplay());
-        m_alphaChannelHistogram->setDrawMode(EHistogramDrawMode::AlphaChannel);
-    }
-
-    return true;
-}
-
-void CBitmapToolTip::OnTimer()
-{
-    /*
-    if (IsWindowVisible())
-    {
-        if (m_bHaveAnythingToRender)
-            Invalidate();
-    }
-    */
-    if (m_hToolWnd)
-    {
-        QRect toolRc(m_toolRect);
-        QRect rc = geometry();
-        QPoint cursorPos = QCursor::pos();
-        toolRc.moveTopLeft(m_hToolWnd->mapToGlobal(toolRc.topLeft()));
-        if (!toolRc.contains(cursorPos) && !rc.contains(cursorPos))
-        {
-            setVisible(false);
-        }
-        else
-        {
-            RefreshViewmode();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBitmapToolTip::showEvent([[maybe_unused]] QShowEvent* event)
-{
-    QPoint cursorPos = QCursor::pos();
-    move(cursorPos);
-    m_timer.start(500);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBitmapToolTip::hideEvent([[maybe_unused]] QHideEvent* event)
-{
-    m_timer.stop();
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CBitmapToolTip::keyPressEvent(QKeyEvent* event)
-{
-    if (event->key() == Qt::Key_Control || event->key() == Qt::Key_Alt || event->key() == Qt::Key_Shift)
-    {
-        RefreshViewmode();
-    }
-}
-
-void CBitmapToolTip::keyReleaseEvent(QKeyEvent* event)
-{
-    if (event->key() == Qt::Key_Control || event->key() == Qt::Key_Alt || event->key() == Qt::Key_Shift)
-    {
-        RefreshViewmode();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBitmapToolTip::SetTool(QWidget* pWnd, const QRect& rect)
-{
-    assert(pWnd);
-    m_hToolWnd = pWnd;
-    m_toolRect = rect;
-}
-
-#include <Controls/moc_BitmapToolTip.cpp>
diff --git a/Code/Sandbox/Editor/Controls/BitmapToolTip.h b/Code/Sandbox/Editor/Controls/BitmapToolTip.h
deleted file mode 100644
index 917b459abf..0000000000
--- a/Code/Sandbox/Editor/Controls/BitmapToolTip.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Tooltip that displays bitmap.
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
-#define CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-#include "Controls/ImageHistogramCtrl.h"
-
-#include <QLabel>
-#include <QTimer>
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-class CBitmapToolTip
-    : public QWidget
-{
-    Q_OBJECT
-    // Construction
-public:
-
-    enum EShowMode
-    {
-        ESHOW_RGB = 0,
-        ESHOW_ALPHA,
-        ESHOW_RGBA,
-        ESHOW_RGB_ALPHA,
-        ESHOW_RGBE
-    };
-
-    CBitmapToolTip(QWidget* parent = nullptr);
-    virtual ~CBitmapToolTip();
-
-    BOOL Create(const RECT& rect);
-
-    // Attributes
-public:
-
-    // Operations
-public:
-    void RefreshViewmode();
-
-    bool LoadImage(const QString& imageFilename);
-    void SetTool(QWidget* pWnd, const QRect& rect);
-
-    // Generated message map functions
-protected:
-    void OnTimer();
-
-    void keyPressEvent(QKeyEvent* event) override;
-    void keyReleaseEvent(QKeyEvent* event) override;
-
-    void showEvent(QShowEvent* event) override;
-    void hideEvent(QHideEvent* event) override;
-
-private:
-    void GetShowMode(EShowMode& showMode, bool& showInOriginalSize) const;
-    const char* GetShowModeDescription(EShowMode showMode, bool showInOriginalSize) const;
-
-    QLabel* m_staticBitmap;
-    QLabel* m_staticText;
-    QString m_filename;
-    bool        m_bShowHistogram;
-    EShowMode m_eShowMode;
-    bool    m_bShowFullsize;
-    bool    m_bHasAlpha;
-    bool    m_bIsLimitedHDR;
-    CImageHistogramCtrl* m_rgbaHistogram;
-    CImageHistogramCtrl* m_alphaChannelHistogram;
-    int m_nTimer;
-    QWidget* m_hToolWnd;
-    QRect m_toolRect;
-    QTimer m_timer;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
diff --git a/Code/Sandbox/Editor/Controls/ColorGradientCtrl.cpp b/Code/Sandbox/Editor/Controls/ColorGradientCtrl.cpp
deleted file mode 100644
index be838eb5d3..0000000000
--- a/Code/Sandbox/Editor/Controls/ColorGradientCtrl.cpp
+++ /dev/null
@@ -1,927 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ColorGradientCtrl.h"
-
-// Qt
-#include <QPainter>
-#include <QToolTip>
-
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/ColorPicker.h>
-
-
-#define MIN_TIME_EPSILON 0.01f
-
-//////////////////////////////////////////////////////////////////////////
-CColorGradientCtrl::CColorGradientCtrl(QWidget* parent)
-    : QWidget(parent)
-{
-    m_nActiveKey = -1;
-    m_nHitKeyIndex = -1;
-    m_nKeyDrawRadius = 3;
-    m_bTracking = false;
-    m_pSpline = 0;
-    m_fMinTime = -1;
-    m_fMaxTime = 1;
-    m_fMinValue = -1;
-    m_fMaxValue = 1;
-    m_fTooltipScaleX = 1;
-    m_fTooltipScaleY = 1;
-    m_bNoTimeMarker = true;
-    m_bLockFirstLastKey = false;
-    m_bNoZoom = true;
-
-    ClearSelection();
-
-    m_bSelectedKeys.reserve(0);
-
-    m_fTimeMarker = -10;
-
-    m_grid.zoom.x = 100;
-
-    setMouseTracking(true);
-}
-
-CColorGradientCtrl::~CColorGradientCtrl()
-{
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// QColorGradientCtrl message handlers
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::resizeEvent(QResizeEvent* event)
-{
-    QWidget::resizeEvent(event);
-
-    QRect rc(QPoint(0, 0), event->size());
-    m_rcGradient = rc;
-    m_rcGradient.setHeight(m_rcGradient.height() - 11);
-    //m_rcGradient.DeflateRect(4,4);
-
-    m_grid.rect = m_rcGradient;
-    if (m_bNoZoom)
-    {
-        m_grid.zoom.x = m_grid.rect.width();
-    }
-
-    m_rcKeys = rc;
-    m_rcKeys.setTop(m_rcKeys.bottom() - 10);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::SetZoom(float fZoom)
-{
-    m_grid.zoom.x = fZoom;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::SetOrigin(float fOffset)
-{
-    m_grid.origin.x = fOffset;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint CColorGradientCtrl::KeyToPoint(int nKey)
-{
-    if (nKey >= 0)
-    {
-        return TimeToPoint(m_pSpline->GetKeyTime(nKey));
-    }
-    return QPoint(0, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint CColorGradientCtrl::TimeToPoint(float time)
-{
-    return QPoint(m_grid.WorldToClient(Vec2(time, 0)).x(), m_rcGradient.height() / 2);
-
-    QPoint point;
-    point.rx() = (time - m_fMinTime) * (m_rcGradient.width() / (m_fMaxTime - m_fMinTime)) + m_rcGradient.left();
-    point.ry() = m_rcGradient.height() / 2;
-    return point;
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZ::Color CColorGradientCtrl::TimeToColor(float time)
-{
-    ISplineInterpolator::ValueType val;
-    m_pSpline->Interpolate(time, val);
-    const AZ::Color col = ValueToColor(val);
-    return col;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::PointToTimeValue(QPoint point, float& time, ISplineInterpolator::ValueType& val)
-{
-    time = XOfsToTime(point.x());
-    ColorToValue(TimeToColor(time), val);
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CColorGradientCtrl::XOfsToTime(int x)
-{
-    return m_grid.ClientToWorld(QPoint(x, 0)).x;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint CColorGradientCtrl::XOfsToPoint(int x)
-{
-    return TimeToPoint(XOfsToTime(x));
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZ::Color CColorGradientCtrl::XOfsToColor(int x)
-{
-    return TimeToColor(XOfsToTime(x));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::paintEvent(QPaintEvent* e)
-{
-    QPainter painter(this);
-
-    QRect rcClient = rect();
-
-    if (m_pSpline)
-    {
-        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
-    }
-    {
-        if (!isEnabled())
-        {
-            painter.setBrush(palette().button());
-            painter.drawRect(rcClient);
-            return;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Fill keys backgound.
-        //////////////////////////////////////////////////////////////////////////
-        QRect rcKeys = m_rcKeys.intersected(e->rect());
-        painter.setBrush(palette().button());
-        painter.drawRect(rcKeys);
-        //////////////////////////////////////////////////////////////////////////
-
-        //Draw Keys and Curve
-        if (m_pSpline)
-        {
-            DrawGradient(e, &painter);
-            DrawKeys(e, &painter);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::DrawGradient(QPaintEvent* e, QPainter* painter)
-{
-    //Draw Curve
-    // create and select a thick, white pen
-    painter->setPen(QPen(QColor(128, 255, 128), 1, Qt::SolidLine));
-
-    const QRect rcClip = e->rect().intersected(m_rcGradient);
-    const int right = rcClip.left() + rcClip.width();
-    for (int x = rcClip.left(); x < right; x++)
-    {
-        const AZ::Color col = XOfsToColor(x);
-        QPen pen(QColor(col.GetR8(), col.GetG8(), col.GetR8(), col.GetA8()), 1, Qt::SolidLine);
-        painter->setPen(pen);
-        painter->drawLine(x, m_rcGradient.top(), x, m_rcGradient.top() + m_rcGradient.height());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::DrawKeys(QPaintEvent* e, QPainter* painter)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    // create and select a white pen
-    painter->setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
-
-    QRect rcClip = e->rect();
-
-    m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
-
-    for (int i = 0; i < m_pSpline->GetKeyCount(); i++)
-    {
-        float time = m_pSpline->GetKeyTime(i);
-        QPoint pt = TimeToPoint(time);
-
-        if (pt.x() < rcClip.left() - 8 || pt.x() > rcClip.left() + rcClip.width() + 8)
-        {
-            continue;
-        }
-
-        const AZ::Color clr = TimeToColor(time);
-        QBrush brush(QColor(clr.GetR8(), clr.GetG8(), clr.GetB8(), clr.GetA8()));
-        painter->setBrush(brush);
-
-        // Find the midpoints of the top, right, left, and bottom
-        // of the client area. They will be the vertices of our polygon.
-        QPoint pts[3];
-        pts[0].rx() = pt.x();
-        pts[0].ry() = m_rcKeys.top() + 1;
-        pts[1].rx() = pt.x() - 5;
-        pts[1].ry() = m_rcKeys.top() + 8;
-        pts[2].rx() = pt.x() + 5;
-        pts[2].ry() = m_rcKeys.top() + 8;
-        painter->drawPolygon(pts, 3);
-
-        if (m_bSelectedKeys[i])
-        {
-            QPen pen(QColor(200, 0, 0), 1, Qt::SolidLine);
-            QPen oldPen = painter->pen();
-            painter->setPen(pen);
-            painter->drawPolygon(pts, 3);
-            painter->setPen(oldPen);
-        }
-    }
-
-    if (!m_bNoTimeMarker)
-    {
-        QPen timePen(QColor(255, 0, 255), 1, Qt::SolidLine);
-        painter->setPen(timePen);
-        QPoint pt = TimeToPoint(m_fTimeMarker);
-        painter->drawLine(pt.x(), m_rcGradient.top() + 1, pt.x(), m_rcGradient.bottom() - 1);
-    }
-}
-
-void CColorGradientCtrl::UpdateTooltip(QPoint pos)
-{
-    if (m_nHitKeyIndex >= 0)
-    {
-        float time = m_pSpline->GetKeyTime(m_nHitKeyIndex);
-        ISplineInterpolator::ValueType val;
-        m_pSpline->GetKeyValue(m_nHitKeyIndex, val);
-
-        AZ::Color col = TimeToColor(time);
-        int cont_s = (m_pSpline->GetKeyFlags(m_nHitKeyIndex) >> SPLINE_KEY_TANGENT_IN_SHIFT) & SPLINE_KEY_TANGENT_LINEAR ? 1 : 2;
-        int cont_d = (m_pSpline->GetKeyFlags(m_nHitKeyIndex) >> SPLINE_KEY_TANGENT_OUT_SHIFT) & SPLINE_KEY_TANGENT_LINEAR ? 1 : 2;
-
-        QString tipText(tr("%1 : %2,%3,%4 [%5,%6]").arg(time * m_fTooltipScaleX, 0, 'f', 2).arg(col.GetR8()).arg(col.GetG8()).arg(col.GetB8()).arg(cont_s).arg(cont_d));
-        const QPoint globalPos = mapToGlobal(pos);
-        QToolTip::showText(mapToGlobal(pos), tipText, this, QRect(globalPos, QSize(1, 1)));
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-//Mouse Message Handlers
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::mousePressEvent(QMouseEvent* event)
-{
-    if (event->button() == Qt::LeftButton)
-    {
-        OnLButtonDown(event);
-    }
-    else if (event->button() == Qt::RightButton)
-    {
-        OnRButtonDown(event);
-    }
-}
-
-void CColorGradientCtrl::OnLButtonDown([[maybe_unused]] QMouseEvent* event)
-{
-    if (m_bTracking)
-    {
-        return;
-    }
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    setFocus();
-
-    switch (m_hitCode)
-    {
-    case HIT_KEY:
-        StartTracking();
-        SetActiveKey(m_nHitKeyIndex);
-        break;
-
-    /*
-    case HIT_SPLINE:
-    {
-        // Cycle the spline slope of the nearest key.
-        int flags = m_pSpline->GetKeyFlags(m_nHitKeyIndex);
-        if (m_nHitKeyDist < 0)
-            // Toggle left side.
-            flags ^= SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_IN_SHIFT;
-        if (m_nHitKeyDist > 0)
-            // Toggle right side.
-            flags ^= SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_OUT_SHIFT;
-        m_pSpline->SetKeyFlags(m_nHitKeyIndex, flags);
-        m_pSpline->Update();
-
-        SetActiveKey(-1);
-        SendNotifyEvent( CLRGRDN_CHANGE );
-        if (m_updateCallback)
-            m_updateCallback(this);
-        break;
-    }
-    */
-
-    case HIT_NOTHING:
-        SetActiveKey(-1);
-        break;
-    }
-    update();
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::OnRButtonDown([[maybe_unused]] QMouseEvent* event)
-{
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::mouseDoubleClickEvent(QMouseEvent* event)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    if (event->button() != Qt::LeftButton)
-    {
-        return;
-    }
-
-    switch (m_hitCode)
-    {
-    case HIT_SPLINE:
-    {
-        int iIndex = InsertKey(event->pos());
-        SetActiveKey(iIndex);
-        EditKey(iIndex);
-
-        update();
-    }
-    break;
-    case HIT_KEY:
-    {
-        EditKey(m_nHitKeyIndex);
-    }
-    break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::mouseMoveEvent(QMouseEvent* event)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    if (!m_bTracking)
-    {
-        switch (HitTest(event->pos()))
-        {
-        case HIT_SPLINE:
-        {
-            setCursor(CMFCUtils::LoadCursor(IDC_ARRWHITE));
-        } break;
-        case HIT_KEY:
-        {
-            setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCK));
-        } break;
-        default:
-            break;
-        }
-    }
-
-    if (m_bTracking)
-    {
-        TrackKey(event->pos());
-    }
-
-    if (m_bTracking || m_nHitKeyIndex >= 0)
-    {
-        UpdateTooltip(event->pos());
-    }
-    else
-    {
-        QToolTip::hideText();
-    }
-}
-
-void CColorGradientCtrl::mouseReleaseEvent(QMouseEvent* event)
-{
-    if (event->button() == Qt::LeftButton)
-    {
-        OnLButtonUp(event);
-    }
-    else if (event->button() == Qt::RightButton)
-    {
-        OnRButtonUp(event);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::OnLButtonUp(QMouseEvent* event)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    if (m_bTracking)
-    {
-        StopTracking(event->pos());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::OnRButtonUp([[maybe_unused]] QMouseEvent* event)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::SetActiveKey(int nIndex)
-{
-    ClearSelection();
-
-    //Activate New Key
-    if (nIndex >= 0)
-    {
-        m_bSelectedKeys[nIndex] = true;
-    }
-    m_nActiveKey = nIndex;
-    update();
-
-    SendNotifyEvent(CLRGRDN_ACTIVE_KEY_CHANGE);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw)
-{
-    if (pSpline != m_pSpline)
-    {
-        //if (pSpline && pSpline->GetNumDimensions() != 3)
-        //return;
-        m_pSpline = pSpline;
-        m_nActiveKey = -1;
-    }
-
-    ClearSelection();
-
-    if (bRedraw)
-    {
-        update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISplineInterpolator* CColorGradientCtrl::GetSpline()
-{
-    return m_pSpline;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::keyPressEvent(QKeyEvent* event)
-{
-    BOOL bProcessed = false;
-
-    if (m_nActiveKey != -1 && m_pSpline)
-    {
-        switch (event->key())
-        {
-        case Qt::Key_Delete:
-        {
-            RemoveKey(m_nActiveKey);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Up:
-        {
-            CUndo undo("Move Spline Key");
-            QPoint point = KeyToPoint(m_nActiveKey);
-            point.rx() -= 1;
-            SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
-            TrackKey(point);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Down:
-        {
-            CUndo undo("Move Spline Key");
-            QPoint point = KeyToPoint(m_nActiveKey);
-            point.rx() += 1;
-            SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
-            TrackKey(point);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Left:
-        {
-            CUndo undo("Move Spline Key");
-            QPoint point = KeyToPoint(m_nActiveKey);
-            point.rx() -= 1;
-            SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
-            TrackKey(point);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Right:
-        {
-            CUndo undo("Move Spline Key");
-            QPoint point = KeyToPoint(m_nActiveKey);
-            point.rx() += 1;
-            SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
-            TrackKey(point);
-            bProcessed = true;
-        } break;
-
-        default:
-            break; //do nothing
-        }
-
-        update();
-    }
-
-    event->setAccepted(bProcessed);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-CColorGradientCtrl::EHitCode CColorGradientCtrl::HitTest(QPoint point)
-{
-    if (!m_pSpline)
-    {
-        return HIT_NOTHING;
-    }
-
-    ISplineInterpolator::ValueType val;
-    float time;
-    PointToTimeValue(point, time, val);
-
-    QRect rc = rect();
-
-    m_nHitKeyIndex = -1;
-
-    if (rc.contains(point))
-    {
-        m_nHitKeyDist = 0xFFFF;
-        m_hitCode = HIT_SPLINE;
-
-        for (int i = 0; i < m_pSpline->GetKeyCount(); i++)
-        {
-            QPoint splinePt = TimeToPoint(m_pSpline->GetKeyTime(i));
-            if (abs(point.x() - splinePt.x()) < abs(m_nHitKeyDist))
-            {
-                m_nHitKeyIndex = i;
-                m_nHitKeyDist = point.x() - splinePt.x();
-            }
-        }
-        if (abs(m_nHitKeyDist) < 4)
-        {
-            m_hitCode = HIT_KEY;
-        }
-    }
-    else
-    {
-        m_hitCode = HIT_NOTHING;
-    }
-
-    return m_hitCode;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::StartTracking()
-{
-    m_bTracking = true;
-
-    GetIEditor()->BeginUndo();
-    SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
-
-    setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCKCROSS));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::TrackKey(QPoint point)
-{
-    if (point.x() < m_rcGradient.left() || point.y() > m_rcGradient.right())
-    {
-        return;
-    }
-
-    int nKey = m_nHitKeyIndex;
-
-    if (nKey >= 0)
-    {
-        ISplineInterpolator::ValueType val;
-        float time;
-        PointToTimeValue(point, time, val);
-
-        // Clamp to min/max time.
-        if (time < m_fMinTime || time > m_fMaxTime)
-        {
-            return;
-        }
-
-        int i;
-        for (i = 0; i < m_pSpline->GetKeyCount(); i++)
-        {
-            // Switch to next key.
-            if ((m_pSpline->GetKeyTime(i) < time && i > nKey) ||
-                (m_pSpline->GetKeyTime(i) > time && i < nKey))
-            {
-                m_pSpline->SetKeyTime(nKey, time);
-                m_pSpline->Update();
-                SetActiveKey(i);
-                m_nHitKeyIndex = i;
-                return;
-            }
-        }
-
-        if (!m_bLockFirstLastKey || (nKey != 0 && nKey != m_pSpline->GetKeyCount() - 1))
-        {
-            m_pSpline->SetKeyTime(nKey, time);
-            m_pSpline->Update();
-        }
-
-        SendNotifyEvent(CLRGRDN_CHANGE);
-        if (m_updateCallback)
-        {
-            m_updateCallback(this);
-        }
-
-        update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::StopTracking(QPoint point)
-{
-    if (!m_bTracking)
-    {
-        return;
-    }
-
-    GetIEditor()->AcceptUndo("Spline Move");
-
-    if (m_nHitKeyIndex >= 0)
-    {
-        QRect rc = rect();
-        rc = rc.marginsAdded(QMargins(100, 100, 100, 100));
-        if (!rc.contains(point))
-        {
-            RemoveKey(m_nHitKeyIndex);
-        }
-    }
-
-    m_bTracking = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::EditKey(int nKey)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    if (nKey < 0 || nKey >= m_pSpline->GetKeyCount())
-    {
-        return;
-    }
-
-    SetActiveKey(nKey);
-
-    ISplineInterpolator::ValueType val;
-    m_pSpline->GetKeyValue(nKey, val);
-
-    SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
-
-    AzQtComponents::ColorPicker dlg(AzQtComponents::ColorPicker::Configuration::RGB);
-    dlg.setCurrentColor(ValueToColor(val));
-    dlg.setSelectedColor(ValueToColor(val));
-    connect(&dlg, &AzQtComponents::ColorPicker::currentColorChanged, this, &CColorGradientCtrl::OnKeyColorChanged);
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        CUndo undo("Modify Gradient Color");
-        OnKeyColorChanged(dlg.selectedColor());
-    }
-    else
-    {
-        OnKeyColorChanged(ValueToColor(val));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::OnKeyColorChanged(const AZ::Color& color)
-{
-    int nKey = m_nActiveKey;
-    if (!m_pSpline)
-    {
-        return;
-    }
-    if (nKey < 0 || nKey >= m_pSpline->GetKeyCount())
-    {
-        return;
-    }
-
-    ISplineInterpolator::ValueType val;
-    ColorToValue(color, val);
-    m_pSpline->SetKeyValue(nKey, val);
-    update();
-
-    if (m_bLockFirstLastKey)
-    {
-        if (nKey == 0)
-        {
-            m_pSpline->SetKeyValue(m_pSpline->GetKeyCount() - 1, val);
-        }
-        else if (nKey == m_pSpline->GetKeyCount() - 1)
-        {
-            m_pSpline->SetKeyValue(0, val);
-        }
-    }
-    m_pSpline->Update();
-    SendNotifyEvent(CLRGRDN_CHANGE);
-    if (m_updateCallback)
-    {
-        m_updateCallback(this);
-    }
-
-    GetIEditor()->UpdateViews(eRedrawViewports);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::RemoveKey(int nKey)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-    if (m_bLockFirstLastKey)
-    {
-        if (nKey == 0 || nKey == m_pSpline->GetKeyCount() - 1)
-        {
-            return;
-        }
-    }
-
-    CUndo undo("Remove Spline Key");
-
-    SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
-    m_nActiveKey = -1;
-    m_nHitKeyIndex = -1;
-    if (m_pSpline)
-    {
-        m_pSpline->RemoveKey(nKey);
-        m_pSpline->Update();
-    }
-    SendNotifyEvent(CLRGRDN_CHANGE);
-    if (m_updateCallback)
-    {
-        m_updateCallback(this);
-    }
-
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CColorGradientCtrl::InsertKey(QPoint point)
-{
-    CUndo undo("Spline Insert Key");
-
-    ISplineInterpolator::ValueType val;
-
-    float time;
-    PointToTimeValue(point, time, val);
-
-    if (time < m_fMinTime || time > m_fMaxTime)
-    {
-        return -1;
-    }
-
-    int i;
-    for (i = 0; i < m_pSpline->GetKeyCount(); i++)
-    {
-        // Skip if any key already have time that is very close.
-        if (fabs(m_pSpline->GetKeyTime(i) - time) < MIN_TIME_EPSILON)
-        {
-            return i;
-        }
-    }
-
-    SendNotifyEvent(CLRGRDN_BEFORE_CHANGE);
-
-    m_pSpline->InsertKey(time, val);
-    m_pSpline->Interpolate(time, val);
-    ClearSelection();
-    update();
-
-    SendNotifyEvent(CLRGRDN_CHANGE);
-    if (m_updateCallback)
-    {
-        m_updateCallback(this);
-    }
-
-    for (i = 0; i < m_pSpline->GetKeyCount(); i++)
-    {
-        // Find key with added time.
-        if (m_pSpline->GetKeyTime(i) == time)
-        {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::ClearSelection()
-{
-    m_nActiveKey = -1;
-    if (m_pSpline)
-    {
-        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
-    }
-    for (int i = 0; i < (int)m_bSelectedKeys.size(); i++)
-    {
-        m_bSelectedKeys[i] = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::SetTimeMarker(float fTime)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    {
-        QPoint pt = TimeToPoint(m_fTimeMarker);
-        QRect rc = QRect(pt.x(), m_rcGradient.top(), 0, m_rcGradient.bottom() - m_rcGradient.top()).normalized();
-        rc += QMargins(1, 0, 1, 0);
-        update(rc);
-    }
-    {
-        QPoint pt = TimeToPoint(fTime);
-        QRect rc = QRect(pt.x(), m_rcGradient.top(), 0, m_rcGradient.bottom() - m_rcGradient.top()).normalized();
-        rc += QMargins(1, 0, 1, 0);
-        update(rc);
-    }
-    m_fTimeMarker = fTime;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::SendNotifyEvent(int nEvent)
-{
-    switch (nEvent)
-    {
-    case CLRGRDN_BEFORE_CHANGE:
-        emit beforeChange();
-        break;
-    case CLRGRDN_CHANGE:
-        emit change();
-        break;
-    case CLRGRDN_ACTIVE_KEY_CHANGE:
-        emit activeKeyChange();
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZ::Color CColorGradientCtrl::ValueToColor(ISplineInterpolator::ValueType val)
-{
-    const AZ::Color color(val[0], val[1], val[2], 1.0);
-    return color.LinearToGamma();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::ColorToValue(const AZ::Color& col, ISplineInterpolator::ValueType& val)
-{
-    const AZ::Color colLin = col.GammaToLinear();
-    val[0] = colLin.GetR();
-    val[1] = colLin.GetG();
-    val[2] = colLin.GetB();
-    val[3] = 0;
-}
-
-void CColorGradientCtrl::SetNoTimeMarker(bool noTimeMarker)
-{
-    m_bNoTimeMarker = noTimeMarker;
-    update();
-}
-
-
-#include <Controls/moc_ColorGradientCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ColorGradientCtrl.h b/Code/Sandbox/Editor/Controls/ColorGradientCtrl.h
deleted file mode 100644
index 7c11c639b1..0000000000
--- a/Code/Sandbox/Editor/Controls/ColorGradientCtrl.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_COLORGRADIENTCTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_COLORGRADIENTCTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <ISplines.h>
-#include "Controls/WndGridHelper.h"
-#endif
-
-namespace AZ
-{
-    class Color;
-}
-
-// Notify event sent when spline is being modified.
-#define CLRGRDN_CHANGE (0x0001)
-// Notify event sent just before when spline is modified.
-#define CLRGRDN_BEFORE_CHANGE (0x0002)
-// Notify event sent when the active key changes
-#define CLRGRDN_ACTIVE_KEY_CHANGE (0x0003)
-
-//////////////////////////////////////////////////////////////////////////
-// Spline control.
-//////////////////////////////////////////////////////////////////////////
-class CColorGradientCtrl
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    CColorGradientCtrl(QWidget* parent = nullptr);
-    virtual ~CColorGradientCtrl();
-
-    //Key functions
-    int  GetActiveKey() { return m_nActiveKey; };
-    void SetActiveKey(int nIndex);
-    int InsertKey(QPoint point);
-
-    // Turns on/off zooming and scroll support.
-    void SetNoZoom([[maybe_unused]] bool bNoZoom) { m_bNoZoom = false; };
-
-    void SetTimeRange(float tmin, float tmax) { m_fMinTime = tmin; m_fMaxTime = tmax; }
-    void SetValueRange(float tmin, float tmax) { m_fMinValue = tmin; m_fMaxValue = tmax; }
-    void SetTooltipValueScale(float x, float y) { m_fTooltipScaleX = x; m_fTooltipScaleY = y; };
-    // Lock value of first and last key to be the same.
-    void LockFirstAndLastKeys(bool bLock) { m_bLockFirstLastKey = bLock; }
-
-    void SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw = FALSE);
-    ISplineInterpolator* GetSpline();
-
-    void SetTimeMarker(float fTime);
-
-    // Zoom in pixels per time unit.
-    void SetZoom(float fZoom);
-    void SetOrigin(float fOffset);
-
-    typedef AZStd::function<void(CColorGradientCtrl*)> UpdateCallback;
-    void SetUpdateCallback(const UpdateCallback& cb) { m_updateCallback = cb; };
-
-    void SetNoTimeMarker(bool noTimeMarker);
-
-signals:
-    void change();
-    void beforeChange();
-    void activeKeyChange();
-
-protected:
-    enum EHitCode
-    {
-        HIT_NOTHING,
-        HIT_KEY,
-        HIT_SPLINE,
-    };
-
-    void paintEvent(QPaintEvent* e);
-    void resizeEvent(QResizeEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void OnLButtonDown(QMouseEvent* event);
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void OnLButtonUp(QMouseEvent* event);
-    void OnRButtonUp(QMouseEvent* event);
-    void mouseDoubleClickEvent(QMouseEvent* event) override;
-    void OnRButtonDown(QMouseEvent* event);
-    void keyPressEvent(QKeyEvent* event) override;
-
-    // Drawing functions
-    void DrawGradient(QPaintEvent* e, QPainter* painter);
-    void DrawKeys(QPaintEvent* e, QPainter* painter);
-    void UpdateTooltip(QPoint pos);
-
-    EHitCode HitTest(QPoint point);
-
-    //Tracking support helper functions
-    void StartTracking();
-    void TrackKey(QPoint point);
-    void StopTracking(QPoint point);
-    void RemoveKey(int nKey);
-    void EditKey(int nKey);
-
-    QPoint KeyToPoint(int nKey);
-    QPoint TimeToPoint(float time);
-    void PointToTimeValue(QPoint point, float& time, ISplineInterpolator::ValueType& val);
-    float  XOfsToTime(int x);
-    QPoint XOfsToPoint(int x);
-
-    AZ::Color XOfsToColor(int x);
-    AZ::Color TimeToColor(float time);
-
-    void ClearSelection();
-
-    void SendNotifyEvent(int nEvent);
-
-    AZ::Color ValueToColor(ISplineInterpolator::ValueType val);
-    void ColorToValue(const AZ::Color& col, ISplineInterpolator::ValueType& val);
-
-
-private:
-    void OnKeyColorChanged(const AZ::Color& color);
-
-private:
-    ISplineInterpolator* m_pSpline;
-
-    bool m_bAutoDelete;
-    bool m_bNoZoom;
-
-    QRect m_rcClipRect;
-    QRect m_rcGradient;
-    QRect m_rcKeys;
-
-    QPoint m_hitPoint;
-    EHitCode m_hitCode;
-    int    m_nHitKeyIndex;
-    int    m_nHitKeyDist;
-    QPoint m_curvePoint;
-
-    float m_fTimeMarker;
-
-    int m_nActiveKey;
-    int m_nKeyDrawRadius;
-
-    bool  m_bTracking;
-
-    float m_fMinTime, m_fMaxTime;
-    float m_fMinValue, m_fMaxValue;
-    float m_fTooltipScaleX, m_fTooltipScaleY;
-
-    bool m_bLockFirstLastKey;
-
-    bool m_bNoTimeMarker;
-
-    std::vector<int> m_bSelectedKeys;
-
-    UpdateCallback m_updateCallback;
-
-    CWndGridHelper m_grid;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_COLORGRADIENTCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCB.cpp b/Code/Sandbox/Editor/Controls/ConsoleSCB.cpp
deleted file mode 100644
index 98346e44d3..0000000000
--- a/Code/Sandbox/Editor/Controls/ConsoleSCB.cpp
+++ /dev/null
@@ -1,1354 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ConsoleSCB.h"
-
-// Qt
-#include <QHeaderView>
-#include <QSortFilterProxyModel>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QScrollBar>
-#include <QtWidgets/QTableView>
-#include <QtGui/QSyntaxHighlighter>
-
-// AzQtComponents
-#include <AzQtComponents/Components/StyledLineEdit.h>
-#include <AzQtComponents/Components/StyleManager.h>
-#include <AzQtComponents/Components/Widgets/LineEdit.h>
-#include <AzQtComponents/Components/Widgets/ScrollBar.h>
-#include <AzQtComponents/Components/Widgets/SliderCombo.h>
-
-// CryCommon
-#include <CryCommon/SFunctor.h>
-
-// Editor
-#include "QtViewPaneManager.h"
-#include "Core/QtEditorApplication.h"
-#include "Commands/CommandManager.h"
-#include "Util/Variable.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <Controls/ui_ConsoleSCB.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-class CConsoleSCB::SearchHighlighter : public QSyntaxHighlighter
-{
-public:
-    SearchHighlighter(QObject *parent)
-        : QSyntaxHighlighter(parent)
-    {
-
-    }
-
-    SearchHighlighter(QTextDocument *parent)
-        : QSyntaxHighlighter(parent)
-    {
-
-    }
-
-    void setSearchTerm(const QString &term)
-    {
-        m_searchTerm = term;
-        rehighlight();
-    }
-
-protected:
-    void highlightBlock(const QString &text)
-    {
-        auto pos = -1;
-        QTextCharFormat myClassFormat;
-        myClassFormat.setFontWeight(QFont::Bold);
-        myClassFormat.setBackground(Qt::yellow);
-
-        while (1)
-        {
-            pos = text.indexOf(m_searchTerm, pos+1, Qt::CaseInsensitive);
-
-            if (pos == -1)
-            {
-                break;
-            }
-
-            setFormat(pos, m_searchTerm.length(), myClassFormat);
-        }
-    }
-
-private:
-    QString m_searchTerm;
-};
-
-static CConsoleSCB* s_consoleSCB = nullptr;
-// Constant for the modified console variable color
-static const QColor g_modifiedConsoleVariableColor(243, 129, 29);
-
-namespace {
-    enum Column
-    {
-        ColumnType,
-        ColumnName,
-        ColumnValue,
-        ColumnCount // keep at end, for iteration purposes
-    };
-}
-
-static QString RemoveColorCode(const QString& text, int& iColorCode)
-{
-    QString cleanString;
-    cleanString.reserve(text.size());
-
-    const int textSize = text.size();
-    for (int i = 0; i < textSize; ++i)
-    {
-        QChar c = text.at(i);
-        bool isLast = i == textSize - 1;
-        if (c == '$' && !isLast && text.at(i + 1).isDigit())
-        {
-            if (iColorCode == 0)
-            {
-                iColorCode = text.at(i + 1).digitValue();
-            }
-            ++i;
-            continue;
-        }
-
-        // convert \r \n to just \n
-        if (c == '\r')
-        {
-            ++i;
-            continue;
-        }
-
-        cleanString.append(c);
-    }
-
-    return cleanString;
-}
-
-ConsoleLineEdit::ConsoleLineEdit(QWidget* parent)
-    : QLineEdit(parent)
-    , m_historyIndex(0)
-    , m_bReusedHistory(false)
-{
-}
-
-void ConsoleLineEdit::mouseDoubleClickEvent([[maybe_unused]] QMouseEvent* ev)
-{
-    Q_EMIT variableEditorRequested();
-}
-
-bool ConsoleLineEdit::event(QEvent* ev)
-{
-    // Tab key doesn't go to keyPressEvent(), must be processed here
-
-    if (ev->type() != QEvent::KeyPress)
-    {
-        return QLineEdit::event(ev);
-    }
-
-    QKeyEvent* ke = static_cast<QKeyEvent*>(ev);
-    if (ke->key() != Qt::Key_Tab)
-    {
-        return QLineEdit::event(ev);
-    }
-
-    QString inputStr = text();
-    QString newStr;
-
-    QStringList tokens = inputStr.split(" ");
-    inputStr = tokens.isEmpty() ? QString() : tokens.first();
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-
-    const bool ctrlPressed = ke->modifiers() & Qt::ControlModifier;
-    QString cstring = inputStr;
-    if (ctrlPressed)
-    {
-        newStr = console->AutoCompletePrev(cstring.toUtf8().data());
-    }
-    else
-    {
-        newStr = console->ProcessCompletion(cstring.toUtf8().data());
-        newStr = console->AutoComplete(cstring.toUtf8().data());
-
-        if (newStr.isEmpty())
-        {
-            newStr = GetIEditor()->GetCommandManager()->AutoComplete(cstring.toUtf8().data());
-        }
-    }
-
-    if (!newStr.isEmpty())
-    {
-        newStr += " ";
-        setText(newStr);
-    }
-
-    deselect();
-    return true;
-}
-
-void ConsoleLineEdit::keyPressEvent(QKeyEvent* ev)
-{
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-    auto commandManager = GetIEditor()->GetCommandManager();
-
-    console->ResetAutoCompletion();
-
-    switch (ev->key())
-    {
-    case Qt::Key_Enter:
-    case Qt::Key_Return:
-    {
-        QString str = text().trimmed();
-        if (!str.isEmpty())
-        {
-            if (commandManager->IsRegistered(str.toUtf8().data()))
-            {
-                commandManager->Execute(QtUtil::ToString(str));
-            }
-            else
-            {
-                CLogFile::WriteLine(str.toUtf8().data());
-                GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(str.toUtf8().data());
-            }
-
-            // If a history command was reused directly via up arrow enter, do not reset history index
-            if (m_history.size() > 0 && m_historyIndex < m_history.size() && m_history[m_historyIndex] == str)
-            {
-                m_bReusedHistory = true;
-            }
-            else
-            {
-                ResetHistoryIndex();
-            }
-
-            // Do not add the same string if it is the top of the stack, but allow duplicate entries otherwise
-            if (m_history.isEmpty() || m_history.back() != str)
-            {
-                m_history.push_back(str);
-                if (!m_bReusedHistory)
-                {
-                    ResetHistoryIndex();
-                }
-            }
-        }
-        else
-        {
-            ResetHistoryIndex();
-        }
-
-        setText(QString());
-        break;
-    }
-    case Qt::Key_AsciiTilde: // ~
-    case Qt::Key_Agrave: // `
-        // disable log.
-        GetIEditor()->ShowConsole(false);
-        setText(QString());
-        ResetHistoryIndex();
-        break;
-    case Qt::Key_Escape:
-        setText(QString());
-        ResetHistoryIndex();
-        break;
-    case Qt::Key_Up:
-        DisplayHistory(false /*bForward*/);
-        break;
-    case Qt::Key_Down:
-        DisplayHistory(true /*bForward*/);
-        break;
-    default:
-        QLineEdit::keyPressEvent(ev);
-    }
-}
-
-void ConsoleLineEdit::DisplayHistory(bool bForward)
-{
-    if (m_history.isEmpty())
-    {
-        return;
-    }
-
-    const int increment = bForward ? 1
-        : m_bReusedHistory ? 0 // Immediately after reusing a history entry, ensure up arrow re-displays command just used
-        : -1;
-    const int newHistoryIndex = static_cast<int>(m_historyIndex) + increment;
-
-    m_bReusedHistory = false;
-    m_historyIndex = static_cast<unsigned int>(clamp_tpl(newHistoryIndex, 0, m_history.size() - 1));
-
-    setText(m_history[m_historyIndex]);
-}
-
-void ConsoleLineEdit::ResetHistoryIndex()
-{
-    m_historyIndex = m_history.size();
-    m_bReusedHistory = false;
-}
-
-Lines CConsoleSCB::s_pendingLines;
-
-CConsoleSCB::CConsoleSCB(QWidget* parent)
-    : QWidget(parent)
-    , ui(new Ui::Console())
-    , m_richEditTextLength(0)
-    , m_backgroundTheme(gSettings.consoleBackgroundColorTheme)
-{
-    m_lines = s_pendingLines;
-    s_pendingLines.clear();
-    s_consoleSCB = this;
-    ui->setupUi(this);
-    m_highlighter = new SearchHighlighter(ui->textEdit);
-    m_highlighter->setDocument(ui->textEdit->document());
-
-    setMinimumHeight(120);
-
-    ui->findBar->setVisible(false);
-    ui->lineEditFind->setPlaceholderText(QObject::tr("Search..."));
-    ui->lineEditFind->setClearButtonEnabled(true);
-    AzQtComponents::LineEdit::applySearchStyle(ui->lineEditFind);
-
-    // Setup the color table for the default (light) theme
-    m_colorTable << QColor(0, 0, 0)
-        << QColor(0, 0, 0)
-        << QColor(0, 0, 200) // blue
-        << QColor(0, 200, 0) // green
-        << QColor(200, 0, 0) // red
-        << QColor(0, 200, 200) // cyan
-        << QColor(128, 112, 0) // yellow
-        << QColor(200, 0, 200) // red+blue
-        << QColor(0x000080ff)
-        << QColor(0x008f8f8f);
-    RefreshStyle();
-
-    auto findNextAction = new QAction(this);
-    findNextAction->setShortcut(QKeySequence::FindNext);
-    connect(findNextAction, &QAction::triggered, this, &CConsoleSCB::findNext);
-    ui->findNextButton->addAction(findNextAction);
-
-    auto findPreviousAction = new QAction(this);
-    findPreviousAction->setShortcut(QKeySequence::FindPrevious);
-    connect(findPreviousAction, &QAction::triggered, this, &CConsoleSCB::findPrevious);
-    ui->findPrevButton->addAction(findPreviousAction);
-
-    connect(ui->button, &QPushButton::clicked, this, &CConsoleSCB::showVariableEditor);
-    connect(ui->findButton, &QPushButton::clicked, this, &CConsoleSCB::toggleConsoleSearch);
-    connect(ui->textEdit, &ConsoleTextEdit::searchBarRequested, this, [this]
-    {
-        this->ui->findBar->setVisible(true);
-        this->ui->lineEditFind->setFocus();
-    });
-
-    connect(ui->lineEditFind, &QLineEdit::returnPressed, this, &CConsoleSCB::findNext);
-
-    connect(ui->closeButton, &QPushButton::clicked, [=]
-    {
-        ui->findBar->setVisible(false);
-    });
-
-    connect(ui->findPrevButton, &QPushButton::clicked, this, &CConsoleSCB::findPrevious);
-    connect(ui->findNextButton, &QPushButton::clicked, this, &CConsoleSCB::findNext);
-
-    connect(ui->lineEditFind, &QLineEdit::textChanged, [=](auto text)
-    {
-        m_highlighter->setSearchTerm(text);
-    });
-
-    connect(ui->lineEdit, &ConsoleLineEdit::variableEditorRequested, this, &CConsoleSCB::showVariableEditor);
-
-    if (GetIEditor()->IsInConsolewMode())
-    {
-        // Attach / register edit box
-        //CLogFile::AttachEditBox(m_edit.GetSafeHwnd()); // FIXME
-    }
-
-    AzToolsFramework::EditorPreferencesNotificationBus::Handler::BusConnect();
-}
-
-CConsoleSCB::~CConsoleSCB()
-{
-    AzToolsFramework::EditorPreferencesNotificationBus::Handler::BusDisconnect();
-
-    s_consoleSCB = nullptr;
-    CLogFile::AttachEditBox(nullptr);
-}
-
-void CConsoleSCB::RegisterViewClass()
-{
-    AzToolsFramework::ViewPaneOptions opts;
-    opts.preferedDockingArea = Qt::BottomDockWidgetArea;
-    opts.isDeletable = false;
-    opts.isStandard = true;
-    opts.showInMenu = true;
-    opts.builtInActionId = ID_VIEW_CONSOLEWINDOW;
-    opts.shortcut = QKeySequence(Qt::Key_QuoteLeft);
-    
-    AzToolsFramework::RegisterViewPane<CConsoleSCB>(LyViewPane::Console, LyViewPane::CategoryTools, opts);
-}
-
-void CConsoleSCB::OnEditorPreferencesChanged()
-{
-    RefreshStyle();
-}
-
-void CConsoleSCB::RefreshStyle()
-{
-    ui->button->setIcon(QIcon(QString(":/controls/img/cvar_dark.bmp")));
-    ui->findButton->setIcon(QIcon(QString(":/stylesheet/img/search.png")));
-    ui->closeButton->setIcon(QIcon(QString(":/stylesheet/img/lineedit-clear.png")));
-
-    // Set the debug/warning text colors appropriately for the background theme
-    // (e.g. not have black text on black background)
-    QColor textColor = Qt::black;
-    m_colorTable[4] = QColor(200, 0, 0);                // Error (Red)
-    m_colorTable[6] = QColor(128, 112, 0);              // Warning (Yellow)
-    m_backgroundTheme = gSettings.consoleBackgroundColorTheme;
-
-    if (m_backgroundTheme == AzToolsFramework::ConsoleColorTheme::Dark)
-    {
-        textColor = Qt::white;
-        m_colorTable[4] = QColor(0xfa, 0x27, 0x27);     // Error (Red)
-        m_colorTable[6] = QColor(0xff, 0xaa, 0x22);     // Warning (Yellow)
-    }
-
-    m_colorTable[0] = textColor;
-    m_colorTable[1] = textColor;
-
-    const bool uiAndDark = !GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == AzToolsFramework::ConsoleColorTheme::Dark;
-
-    QColor bgColor;
-    if (!GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == AzToolsFramework::ConsoleColorTheme::Dark)
-    {
-        bgColor = Qt::black;
-        AzQtComponents::ScrollBar::applyLightStyle(ui->textEdit);
-    }
-    else
-    {
-        bgColor = Qt::white;
-        AzQtComponents::ScrollBar::applyDarkStyle(ui->textEdit);
-    }
-    ui->textEdit->setBackgroundVisible(!uiAndDark);
-    ui->textEdit->setStyleSheet(uiAndDark ? QString() : QString("QPlainTextEdit{ background: %1 }").arg(bgColor.name(QColor::HexRgb)));
-
-    // Clear out the console text when we change our background color since
-    // some of the previous text colors may not be appropriate for the
-    // new background color
-    QString text = ui->textEdit->toPlainText();
-    ui->textEdit->clear();
-    m_lines.push_back({ text, false });
-    FlushText();
-}
-
-void CConsoleSCB::SetInputFocus()
-{
-    ui->lineEdit->setFocus();
-    ui->lineEdit->setText(QString());
-}
-
-void CConsoleSCB::AddToConsole(const QString& text, bool bNewLine)
-{
-    m_lines.push_back({ text, bNewLine });
-    FlushText();
-}
-
-void CConsoleSCB::FlushText()
-{
-    if (m_lines.empty())
-    {
-        return;
-    }
-
-    // Store our current cursor in case we need to restore it, and check if
-    // the user has scrolled the text edit away from the bottom
-    const QTextCursor oldCursor = ui->textEdit->textCursor();
-    QScrollBar* scrollBar = ui->textEdit->verticalScrollBar();
-    const int oldScrollValue = scrollBar->value();
-    bool scrolledOffBottom = oldScrollValue != scrollBar->maximum();
-
-    ui->textEdit->moveCursor(QTextCursor::End);
-    QTextCursor textCursor = ui->textEdit->textCursor();
-
-    while (!m_lines.empty())
-    {
-        ConsoleLine line = m_lines.front();
-        m_lines.pop_front();
-
-        int iColor = 0;
-        QString text = RemoveColorCode(line.text, iColor);
-        if (iColor < 0 || iColor >= m_colorTable.size())
-        {
-            iColor = 0;
-        }
-
-        if (line.newLine)
-        {
-            text = QtUtil::trimRight(text);
-            text = "\n" + text;
-        }
-
-        QTextCharFormat format;
-        const QColor color(m_colorTable[iColor]);
-        format.setForeground(color);
-
-        if (iColor != 0)
-        {
-            format.setFontWeight(QFont::Bold);
-        }
-
-        textCursor.setCharFormat(format);
-        textCursor.insertText(text);
-    }
-
-    // If the user has selected some text in the text edit area or has scrolled
-    // away from the bottom, then restore the previous cursor and keep the scroll
-    // bar in the same location
-    if (oldCursor.hasSelection() || scrolledOffBottom)
-    {
-        ui->textEdit->setTextCursor(oldCursor);
-        scrollBar->setValue(oldScrollValue);
-    }
-    // Otherwise scroll to the bottom so the latest text can be seen
-    else
-    {
-        scrollBar->setValue(scrollBar->maximum());
-        ui->textEdit->moveCursor(QTextCursor::StartOfLine);
-    }
-}
-
-QSize CConsoleSCB::minimumSizeHint() const
-{
-    return QSize(-1, -1);
-}
-
-QSize CConsoleSCB::sizeHint() const
-{
-    return QSize(100, 100);
-}
-
-/** static */
-void CConsoleSCB::AddToPendingLines(const QString& text, bool bNewLine)
-{
-    s_pendingLines.push_back({ text, bNewLine });
-}
-
-/**
- * When a CVar variable is updated, we need to tell alert our console variables
- * pane so it can update the corresponding row
- */
-static void OnVariableUpdated([[maybe_unused]] int row, ICVar* pCVar)
-{
-    QtViewPane* pane = QtViewPaneManager::instance()->GetPane(LyViewPane::ConsoleVariables);
-    if (!pane)
-    {
-        return;
-    }
-
-    ConsoleVariableEditor* variableEditor = qobject_cast<ConsoleVariableEditor*>(pane->Widget());
-    if (!variableEditor)
-    {
-        return;
-    }
-
-    variableEditor->HandleVariableRowUpdated(pCVar);
-}
-
-static CVarBlock* VarBlockFromConsoleVars()
-{
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-    std::vector<const char*> cmds;
-    cmds.resize(console->GetNumVars());
-    size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
-
-    CVarBlock* vb = new CVarBlock;
-    IVariable* pVariable = 0;
-    for (int i = 0; i < cmdCount; i++)
-    {
-        ICVar* pCVar = console->GetCVar(cmds[i]);
-        if (!pCVar)
-        {
-            continue;
-        }
-        int varType = pCVar->GetType();
-
-        switch (varType)
-        {
-        case CVAR_INT:
-            pVariable = new CVariable<int>();
-            pVariable->Set(pCVar->GetIVal());
-            break;
-        case CVAR_FLOAT:
-            pVariable = new CVariable<float>();
-            pVariable->Set(pCVar->GetFVal());
-            break;
-        case CVAR_STRING:
-            pVariable = new CVariable<QString>();
-            pVariable->Set(pCVar->GetString());
-            break;
-        default:
-            assert(0);
-        }
-
-        // Add our on change handler so we can update the CVariable created for
-        // the matching ICVar that has been modified
-        SFunctor onChange;
-        onChange.Set(OnVariableUpdated, i, pCVar);
-        pCVar->AddOnChangeFunctor(onChange);
-
-        pVariable->SetDescription(pCVar->GetHelp());
-        pVariable->SetName(cmds[i]);
-
-        // Transfer the custom limits have they have been set for this variable
-        if (pCVar->HasCustomLimits())
-        {
-            float min, max;
-            pCVar->GetLimits(min, max);
-            pVariable->SetLimits(min, max);
-        }
-
-        if (pVariable)
-        {
-            vb->AddVariable(pVariable);
-        }
-    }
-    return vb;
-}
-
-static void OnConsoleVariableUpdated(IVariable* pVar)
-{
-    if (!pVar)
-    {
-        return;
-    }
-    QString varName = pVar->GetName();
-    ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(varName.toUtf8().data());
-    if (!pCVar)
-    {
-        return;
-    }
-    if (pVar->GetType() == IVariable::INT)
-    {
-        int val;
-        pVar->Get(val);
-        pCVar->Set(val);
-    }
-    else if (pVar->GetType() == IVariable::FLOAT)
-    {
-        float val;
-        pVar->Get(val);
-        pCVar->Set(val);
-    }
-    else if (pVar->GetType() == IVariable::STRING)
-    {
-        QString val;
-        pVar->Get(val);
-        pCVar->Set(val.toUtf8().data());
-    }
-}
-
-ConsoleTextEdit::ConsoleTextEdit(QWidget* parent)
-    : QPlainTextEdit(parent)
-    , m_contextMenu(new QMenu(this))
-{
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(this, &QPlainTextEdit::customContextMenuRequested, this, &ConsoleTextEdit::showContextMenu);
-
-    // Make sure to add the actions to this widget, so that the ShortCutDispatcher picks them up properly
-
-    QAction* copyAction = m_contextMenu->addAction(tr("&Copy"));
-    copyAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    copyAction->setShortcut(QKeySequence::Copy);
-    copyAction->setEnabled(false);
-    connect(copyAction, &QAction::triggered, this, &QPlainTextEdit::copy);
-    addAction(copyAction);
-
-    QAction* selectAllAction = m_contextMenu->addAction(tr("Select &All"));
-    selectAllAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    selectAllAction->setShortcut(QKeySequence::SelectAll);
-    selectAllAction->setEnabled(false);
-    connect(selectAllAction, &QAction::triggered, this, &QPlainTextEdit::selectAll);
-    addAction(selectAllAction);
-
-    m_contextMenu->addSeparator();
-
-    QAction* deleteAction = m_contextMenu->addAction(tr("Delete"));
-    deleteAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    deleteAction->setShortcut(QKeySequence::Delete);
-    deleteAction->setEnabled(false);
-    connect(deleteAction, &QAction::triggered, this, [=]() { textCursor().removeSelectedText(); } );
-    addAction(deleteAction);
-
-    QAction* clearAction = m_contextMenu->addAction(tr("Clear"));
-    clearAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    clearAction->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_C);
-    clearAction->setEnabled(false);
-    connect(clearAction, &QAction::triggered, this, &QPlainTextEdit::clear);
-    addAction(clearAction);
-
-    QAction* findAction = m_contextMenu->addAction(tr("Find"));
-    findAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    findAction->setShortcut(QKeySequence::Find);
-    findAction->setEnabled(true);
-    connect(findAction, &QAction::triggered, this, &ConsoleTextEdit::searchBarRequested);
-    addAction(findAction);
-
-    connect(this, &QPlainTextEdit::copyAvailable, copyAction, &QAction::setEnabled);
-    connect(this, &QPlainTextEdit::copyAvailable, deleteAction, &QAction::setEnabled);
-    connect(this, &QPlainTextEdit::textChanged, selectAllAction, [=]
-        {
-            if (document() && !document()->isEmpty())
-            {
-                clearAction->setEnabled(true);
-                selectAllAction->setEnabled(true);
-            }
-            else
-            {
-                clearAction->setEnabled(false);
-                selectAllAction->setEnabled(false);
-            }
-        });
-}
-
-bool ConsoleTextEdit::event(QEvent* theEvent)
-{
-    if (theEvent->type() == QEvent::ShortcutOverride)
-    {
-        // ignore several possible key combinations to prevent them bubbling up to the main editor
-        QKeyEvent* shortcutEvent = static_cast<QKeyEvent*>(theEvent);
-
-        QKeySequence::StandardKey ignoredKeys[] = { QKeySequence::Backspace };
-
-        for (auto& currKey : ignoredKeys)
-        {
-            if (shortcutEvent->matches(currKey))
-            {
-                // these shortcuts are ignored. Accept them and do nothing.
-                theEvent->accept();
-                return true;
-            }
-        }
-    }
-
-    return QPlainTextEdit::event(theEvent);
-}
-
-void ConsoleTextEdit::showContextMenu(const QPoint &pt)
-{
-    m_contextMenu->exec(mapToGlobal(pt));
-}
-
-ConsoleVariableItemDelegate::ConsoleVariableItemDelegate(QObject* parent)
-    : QStyledItemDelegate(parent)
-    , m_varBlock(nullptr)
-{
-}
-
-/**
- * This method is called when after an editor widget has been created for an item
- * in the model to set its initial value
- */
-void ConsoleVariableItemDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
-{
-    if (auto* doubleEditor = qobject_cast<AzQtComponents::SliderDoubleCombo*>(editor))
-    {
-        // If this is a float variable, we need to set the decimal precision of
-        // our editor to fit the precision of the variable's default value
-        QVariant value = index.data();
-        IVariable* var = index.data(ConsoleVariableModel::VariableCustomRole).value<IVariable*>();
-        Q_ASSERT(var->GetType() == IVariable::FLOAT);
-
-        QString valStr = QString::number(value.toFloat());
-        int decimalIndex = valStr.indexOf('.');
-        if (decimalIndex != -1)
-        {
-            valStr.remove(0, decimalIndex + 1);
-            doubleEditor->setDecimals(valStr.size());
-        }
-
-        // Set the initial value to our editor
-        doubleEditor->setValue(value.toDouble());
-    }
-    else if (auto* intEditor = qobject_cast<AzQtComponents::SliderCombo*>(editor))
-    {
-        QVariant value = index.data();
-        IVariable* var = index.data(ConsoleVariableModel::VariableCustomRole).value<IVariable*>();
-        Q_ASSERT(var->GetType() == IVariable::INT);
-
-        // Set the initial value to our editor
-        intEditor->setValue(value.toInt());
-    }
-    // Otherwise the value is a string, so the editor will be our styled line edit
-    else
-    {
-        AzQtComponents::StyledLineEdit* lineEdit = qobject_cast<AzQtComponents::StyledLineEdit*>(editor);
-        if (!lineEdit)
-        {
-            return;
-        }
-
-        lineEdit->setText(index.data().toString());
-    }
-}
-
-/**
- * This method is called when the editor widget has triggered to write back a value to the model
- */
-void ConsoleVariableItemDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
-{
-    if (auto* doubleEditor = qobject_cast<AzQtComponents::SliderDoubleCombo*>(editor))
-    {
-        model->setData(index, doubleEditor->value());
-    }
-    else if (auto* intEditor = qobject_cast<AzQtComponents::SliderCombo*>(editor))
-    {
-        model->setData(index, intEditor->value());
-    }
-    else if (auto* lineEdit = qobject_cast<AzQtComponents::StyledLineEdit*>(editor))
-    {
-        model->setData(index, lineEdit->text());
-    }
-}
-
-template <typename EditorType>
-static void SetEditorRange(EditorType* editor, IVariable* var)
-{
-    // Retrieve the limits set for the variable
-    float min;
-    float max;
-    float step;
-    bool hardMin;
-    bool hardMax;
-    var->GetLimits(min, max, step, hardMin, hardMax);
-
-    // If this variable has custom limits set, then use that as the min/max
-    // Otherwise, the min/max for the input box will be bounded by the type
-    // limit, but the slider will be constricted to a smaller default range
-    static const double defaultMin = -100.0f;
-    static const double defaultMax = 100.0f;
-    if (var->HasCustomLimits())
-    {
-        editor->setRange(min, max);
-    }
-    else
-    {
-        editor->setSoftRange(defaultMin, defaultMax);
-    }
-
-    // Set the step size. The default variable step is 0, so if it's
-    // not set then set our step size to 0.1 for float variables.
-    // The default step size for our spin box is 1.0 so we can just
-    // use that for the int values
-    if (step > 0)
-    {
-        editor->spinbox()->setSingleStep(step);
-    }
-    else if (auto doubleSpinBox = qobject_cast<AzQtComponents::DoubleSpinBox*>(editor->spinbox()))
-    {
-        doubleSpinBox->setSingleStep(0.1);
-    }
-}
-
-/**
- * This method is called when the user tries to edit one of the values in the
- * table so that a widget can be created to use for editing the value
- */
-QWidget* ConsoleVariableItemDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-    // This shouldn't happen, but just in case this gets called before we've
-    // been given a var block, just let the item delegate create a default
-    // editor for the value
-    if (!m_varBlock)
-    {
-        return QStyledItemDelegate::createEditor(parent, option, index);
-    }
-
-    // Retrieve a reference to our IVariable for the specified index
-    IVariable* var = index.data(ConsoleVariableModel::VariableCustomRole).value<IVariable*>();
-    if (var)
-    {
-        // Create the proper editor for the int or float value
-        QWidget* editor = nullptr;
-        QVariant value = index.data();
-
-        // Use the IVariable type; it's more stable than Qt's
-        IVariable::EType type = var->GetType();
-        bool hasCustomLimits = var->HasCustomLimits();
-        if (type == IVariable::INT)
-        {
-            // We need to make sure this is casted to the regular StyledSpinBox
-            // instead of the StyledDoubleSpinBox base class because when we
-            // set the min/max it has overridden that method to update the validator
-            auto* intEditor = new AzQtComponents::SliderCombo(parent);
-            editor = intEditor;
-
-            // If this variable doesn't have custom limits set, use the type min/max
-            if (!hasCustomLimits)
-            {
-                intEditor->setMinimum(INT_MIN);
-                intEditor->setMaximum(INT_MAX);
-            }
-
-            SetEditorRange(intEditor, var);
-        }
-        else if (type == IVariable::FLOAT)
-        {
-            auto* doubleEditor = new AzQtComponents::SliderDoubleCombo(parent);
-            editor = doubleEditor;
-
-            // If this variable doesn't have custom limits set, use the integer
-            // type min/max because if we use the DBL_MIN/MAX the minimum will
-            // be interpreted as 0
-            if (!hasCustomLimits)
-            {
-                doubleEditor->setMinimum(INT_MIN);
-                doubleEditor->setMaximum(INT_MAX);
-            }
-
-            SetEditorRange(doubleEditor, var);
-        }
-
-        if (editor)
-        {
-            // Set the given geometry
-            editor->setGeometry(option.rect);
-            return editor;
-        }
-    }
-    
-    // If we get here, value being edited is a string, so use our styled line
-    // edit widget
-    AzQtComponents::StyledLineEdit* lineEdit = new AzQtComponents::StyledLineEdit(parent);
-    lineEdit->setGeometry(option.rect);
-    return lineEdit;
-}
-
-void ConsoleVariableItemDelegate::SetVarBlock(CVarBlock* varBlock)
-{
-    m_varBlock = varBlock;
-}
-
-ConsoleVariableModel::ConsoleVariableModel(QObject* parent)
-    : QAbstractTableModel(parent)
-    , m_varBlock(nullptr)
-{
-    qRegisterMetaType<IVariable*>("IVariable");
-}
-
-QVariant ConsoleVariableModel::data(const QModelIndex& index, int role) const
-{
-    if (index.row() < 0 || index.row() >= rowCount() || index.column() < 0 || index.column() >= ColumnCount)
-    {
-        return QVariant();
-    }
-
-    IVariable* var = m_varBlock->GetVariable(index.row());
-    if (!var)
-    {
-        return QVariant();
-    }
-
-    // Return data for the display and edit roles for when the table data is
-    // displayed and when a user is attempting to edit a value
-    const int col = index.column();
-    IVariable::EType type = var->GetType();
-    if (role == Qt::DisplayRole || role == Qt::EditRole)
-    {
-        switch (col)
-        {
-        case ColumnType:
-            if (type == IVariable::STRING)
-            {
-                return QString("ab");
-            }
-            else
-            {
-                return QString("n");
-            }
-        case ColumnName:
-            return QString(var->GetName());
-        case ColumnValue:
-            if (type == IVariable::INT)
-            {
-                int value;
-                var->Get(value);
-                return value;
-            }
-            else if (type == IVariable::FLOAT)
-            {
-                float value;
-                var->Get(value);
-                return value;
-            }
-            else // string
-            {
-                QString value;
-                var->Get(value);
-                return value;
-            }
-        }
-    }
-    // Set the tooltip role for the text to display when the mouse is hovered
-    // over a row in the table
-    else if (role == Qt::ToolTipRole)
-    {
-        QString typeName;
-        switch (type)
-        {
-        case IVariable::INT:
-            typeName = tr("Int");
-            break;
-        case IVariable::FLOAT:
-            typeName = tr("Float");
-            break;
-        case IVariable::STRING:
-            typeName = tr("String");
-            break;
-        }
-
-        QString toolTip = QString("[%1] %2 = %3\n%4").arg(type).arg(var->GetName()).arg(QString(var->GetDisplayValue())).arg(var->GetDescription());
-        return toolTip;
-    }
-    // Set a different text color for the row if its value has been modified
-    else if (role == Qt::ForegroundRole)
-    {
-        if (m_modifiedRows.indexOf(index.row()) != -1)
-        {
-            return g_modifiedConsoleVariableColor;
-        }
-    }
-    // Change the text alignment just for the type column to be right/center
-    // so that it looks cleaner (the name/value columns are left/center by default)
-    else if (role == Qt::TextAlignmentRole && col == ColumnType)
-    {
-        int alignment = Qt::AlignRight | Qt::AlignVCenter;
-        return alignment;
-    }
-    // Make the text in the type column bold
-    else if (role == Qt::FontRole && col == ColumnType)
-    {
-        QFont font;
-        font.setBold(true);
-        return font;
-    }
-    else if (role == VariableCustomRole)
-    {
-        return QVariant::fromValue(var);
-    }
-
-    return QVariant();
-}
-
-bool ConsoleVariableModel::setData(const QModelIndex& index, const QVariant& value, int role)
-{
-    // Don't continue if the index is invalid, we aren't in edit mode, or if the
-    // new value isn't different than the current value
-    if (!index.isValid() || role != Qt::EditRole || (index.data() == value))
-    {
-        return false;
-    }
-
-    const int row = index.row();
-    IVariable* var = m_varBlock->GetVariable(row);
-    if (!var)
-    {
-        return false;
-    }
-
-    // Attempt to set new values for our int/float/string variables
-    bool ok = false;
-    switch (var->GetType())
-    {
-    case IVariable::INT:
-    {
-        int intValue = value.toInt(&ok);
-        if (ok)
-        {
-            var->Set(intValue);
-        }
-        break;
-    }
-    case IVariable::FLOAT:
-    {
-        float floatValue = value.toFloat(&ok);
-        if (ok)
-        {
-            var->Set(floatValue);
-        }
-        break;
-    }
-    case IVariable::STRING:
-    {
-        ok = true;
-        QString strValue = value.toString();
-        var->Set(strValue);
-        break;
-    }
-    }
-
-    // Update our data if the variable set was successful
-    if (ok)
-    {
-        // Update the actual cvar
-        OnConsoleVariableUpdated(var);
-
-        // Emit this signal so the model knows to update
-        emit dataChanged(index, index);
-
-        // Add this row to our list of modified rows so we can change its text color
-        m_modifiedRows.append(row);
-        return true;
-    }
-
-    return false;
-}
-
-int ConsoleVariableModel::rowCount(const QModelIndex& parent) const
-{
-    if (parent.isValid() || !m_varBlock)
-    {
-        return 0;
-    }
-
-    return m_varBlock->GetNumVariables();
-}
-
-int ConsoleVariableModel::columnCount(const QModelIndex& parent) const
-{
-    if (parent.isValid())
-    {
-        return 0;
-    }
-
-    return ColumnCount;
-}
-
-Qt::ItemFlags ConsoleVariableModel::flags(const QModelIndex& index) const
-{
-    // Can select any row, but can only edit the value column
-    Qt::ItemFlags itemFlags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-    if (index.column() == ColumnValue)
-    {
-        itemFlags |= Qt::ItemIsEditable;
-    }
-
-    return itemFlags;
-}
-
-QVariant ConsoleVariableModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (section < 0 || section >= ColumnCount || orientation == Qt::Vertical)
-    {
-        return QVariant();
-    }
-
-    return QAbstractTableModel::headerData(section, orientation, role);
-}
-
-void ConsoleVariableModel::SetVarBlock(CVarBlock* varBlock)
-{
-    beginResetModel();
-
-    m_varBlock = varBlock;
-
-    endResetModel();
-}
-
-void ConsoleVariableModel::ClearModifiedRows()
-{
-    m_modifiedRows.clear();
-}
-
-ConsoleVariableEditor::ConsoleVariableEditor(QWidget* parent)
-    : QWidget(parent)
-    , m_tableView(new QTableView(this))
-    , m_model(new ConsoleVariableModel(this))
-    , m_itemDelegate(new ConsoleVariableItemDelegate(this))
-{
-    setWindowTitle(tr("Console Variables"));
-
-    // Setup our table view, don't show the actual headers
-    m_tableView->setEditTriggers(QAbstractItemView::SelectedClicked
-        | QAbstractItemView::DoubleClicked
-        | QAbstractItemView::EditKeyPressed
-        | QAbstractItemView::CurrentChanged);
-    m_tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    m_tableView->verticalHeader()->hide();
-    m_tableView->horizontalHeader()->hide();
-
-    // Setup a filter widget with a search label and line edit input for filtering
-    // the console variables
-    QWidget* m_filterWidget = new QWidget(this);
-    QLabel* label = new QLabel(tr("Search"), this);
-    QLineEdit* m_filterLineEdit = new QLineEdit(this);
-    QHBoxLayout* filterlayout = new QHBoxLayout(m_filterWidget);
-    filterlayout->addWidget(label);
-    filterlayout->addWidget(m_filterLineEdit);
-
-    // Setup our model to be filterable by the name column from our line edit
-    QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
-    proxyModel->setSourceModel(m_model);
-    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    proxyModel->setFilterKeyColumn(ColumnName);
-    m_tableView->setModel(proxyModel);
-    QObject::connect(m_filterLineEdit, &QLineEdit::textChanged, proxyModel, &QSortFilterProxyModel::setFilterWildcard);
-
-    // Set our value column to use our custom item delegate so we can inject
-    // our styled spin box for modifying the int/float values
-    m_tableView->setItemDelegateForColumn(ColumnValue, m_itemDelegate);
-
-    // Give our dialog a vertical layout with the search field on top and our
-    // table below it that will expand if the dialog is resized
-    QVBoxLayout* mainLayout = new QVBoxLayout(this);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-    mainLayout->addWidget(m_filterWidget);
-    mainLayout->addWidget(m_tableView, 1);
-
-    // Set the console variables
-    m_varBlock = VarBlockFromConsoleVars();
-    SetVarBlock(m_varBlock);
-}
-
-void ConsoleVariableEditor::SetVarBlock(CVarBlock* varBlock)
-{
-    // Send our item delegate the new cvar block so it can use it to pull the
-    // limits for the selected variable
-    m_itemDelegate->SetVarBlock(varBlock);
-
-    // Update our model with the new cvar block
-    m_model->SetVarBlock(varBlock);
-
-    // Size our type column to be fit to the contents and allow our name and value
-    // columns to be stretched
-    m_tableView->resizeColumnToContents(ColumnType);
-    m_tableView->horizontalHeader()->setSectionResizeMode(ColumnName, QHeaderView::Stretch);
-    m_tableView->horizontalHeader()->setSectionResizeMode(ColumnValue, QHeaderView::Stretch);
-
-    // Select the first row by default after setting the model, or else the table
-    // view will just select the first cell on the first row by default which looks
-    // weird, and the other API calls like clear selection don't seem to affect it
-    m_tableView->selectRow(0);
-}
-
-void ConsoleVariableEditor::RegisterViewClass()
-{
-    AzToolsFramework::ViewPaneOptions opts;
-    opts.paneRect = QRect(100, 100, 340, 500);
-    opts.isDeletable = false;
-
-    AzToolsFramework::RegisterViewPane<ConsoleVariableEditor>(LyViewPane::ConsoleVariables, LyViewPane::CategoryOther, opts);
-}
-
-/**
- * Update the IVariable in our var block when the corresponding ICVar has been
- * changed
- */
-void ConsoleVariableEditor::HandleVariableRowUpdated(ICVar* pCVar)
-{
-    const int varCount = m_varBlock->GetNumVariables();
-    for (int row = 0; row < varCount; ++row)
-    {
-        IVariable* var = m_varBlock->GetVariable(row);
-        if (var == nullptr)
-        {
-            continue;
-        }
-
-        if (var->GetName() == pCVar->GetName())
-        {
-            int varType = pCVar->GetType();
-            switch (varType)
-            {
-            case CVAR_INT:
-                var->Set(pCVar->GetIVal());
-                break;
-            case CVAR_FLOAT:
-                var->Set(pCVar->GetFVal());
-                break;
-            case CVAR_STRING:
-                var->Set(pCVar->GetString());
-                break;
-            }
-
-            // We need to let our model know that the underlying data has changed so
-            // that the view will be updated
-            QModelIndex index = m_model->index(row, ColumnValue);
-            Q_EMIT m_model->dataChanged(index, index);
-            return;
-        }
-    }
-}
-
-void ConsoleVariableEditor::showEvent(QShowEvent* event)
-{
-    // Clear out our list of modified rows whenever our view is re-shown
-    m_model->ClearModifiedRows();
-
-    QWidget::showEvent(event);
-}
-
-void CConsoleSCB::showVariableEditor()
-{
-    // Open the console variables pane
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::ConsoleVariables);
-}
-
-void CConsoleSCB::toggleConsoleSearch()
-{
-    if (!ui->findBar->isVisible())
-    {
-        ui->findBar->setVisible(true);
-        ui->lineEditFind->setFocus();
-    }
-    else
-    {
-        ui->findBar->setVisible(false);
-    }
-}
-
-void CConsoleSCB::findPrevious()
-{
-    const auto text = ui->lineEditFind->text();
-    auto found = ui->textEdit->find(text, QTextDocument::FindBackward);
-
-    if (!found)
-    {
-        auto prevCursor = ui->textEdit->textCursor();
-        ui->textEdit->moveCursor(QTextCursor::End);
-        found = ui->textEdit->find(text, QTextDocument::FindBackward);
-
-        if (!found)
-        {
-            ui->textEdit->setTextCursor(prevCursor);
-        }
-    }
-}
-
-void CConsoleSCB::findNext()
-{
-    const auto text = ui->lineEditFind->text();
-    auto found = ui->textEdit->find(text);
-
-    if (!found)
-    {
-        auto prevCursor = ui->textEdit->textCursor();
-        ui->textEdit->moveCursor(QTextCursor::Start);
-        found = ui->textEdit->find(text);
-
-        if (!found)
-        {
-            ui->textEdit->setTextCursor(prevCursor);
-        }
-    }
-}
-
-CConsoleSCB* CConsoleSCB::GetCreatedInstance()
-{
-    return s_consoleSCB;
-}
-
-#include <Controls/moc_ConsoleSCB.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCB.h b/Code/Sandbox/Editor/Controls/ConsoleSCB.h
deleted file mode 100644
index 2230495ac9..0000000000
--- a/Code/Sandbox/Editor/Controls/ConsoleSCB.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCB_H
-#define CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCB_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-
-#include "Settings.h"
-#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
-
-#include <QLineEdit>
-#include <QPlainTextEdit>
-
-#include <QAbstractTableModel>
-#include <QDialog>
-#include <QLineEdit>
-#include <QPlainTextEdit>
-#include <QPushButton>
-#include <QScopedPointer>
-#include <QStyledItemDelegate>
-#endif
-
-class QMenu;
-class ConsoleWidget;
-class QFocusEvent;
-class QTableView;
-class CVarBlock;
-
-namespace Ui {
-    class Console;
-}
-
-struct ConsoleLine
-{
-    QString text;
-    bool newLine;
-};
-typedef std::deque<ConsoleLine> Lines;
-
-
-class ConsoleLineEdit
-    : public QLineEdit
-{
-    Q_OBJECT
-public:
-    explicit ConsoleLineEdit(QWidget* parent = nullptr);
-
-protected:
-    void mouseDoubleClickEvent(QMouseEvent* ev) override;
-    void keyPressEvent(QKeyEvent* ev) override;
-    bool event(QEvent* ev) override;
-
-signals:
-    void variableEditorRequested();
-
-private:
-    void DisplayHistory(bool bForward);
-    void ResetHistoryIndex();
-
-    QStringList m_history;
-    unsigned int m_historyIndex;
-    bool m_bReusedHistory;
-};
-
-class ConsoleTextEdit
-    : public QPlainTextEdit
-{
-    Q_OBJECT
-public:
-    explicit ConsoleTextEdit(QWidget* parent = nullptr);
-    virtual bool event(QEvent* theEvent) override;
-
-signals:
-    void searchBarRequested();
-
-private:
-    void showContextMenu(const QPoint& pt);
-
-    QScopedPointer<QMenu> m_contextMenu;
-};
-
-class ConsoleVariableItemDelegate
-    : public QStyledItemDelegate
-{
-    Q_OBJECT
-public:
-    explicit ConsoleVariableItemDelegate(QObject* parent = nullptr);
-
-    // Item delegate overrides for creating the custom editor widget and
-    // setting/retrieving data to/from it
-    void setEditorData(QWidget* editor, const QModelIndex& index) const override;
-    void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
-    QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-
-    void SetVarBlock(CVarBlock* varBlock);
-
-private:
-    CVarBlock* m_varBlock;
-};
-
-class ConsoleVariableModel
-    : public QAbstractTableModel
-{
-    Q_OBJECT
-public:
-    enum CustomRoles
-    {
-        VariableCustomRole = Qt::UserRole
-    };
-
-    explicit ConsoleVariableModel(QObject* parent = nullptr);
-
-    // Table model overrides
-    QVariant data(const QModelIndex& index, int role) const override;
-    bool setData(const QModelIndex& index, const QVariant& value, int role) override;
-    int rowCount(const QModelIndex& = {}) const override;
-    int columnCount(const QModelIndex& = {}) const override;
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-
-    void SetVarBlock(CVarBlock* varBlock);
-    void ClearModifiedRows();
-
-private:
-    CVarBlock* m_varBlock;
-    QList<int> m_modifiedRows;
-};
-
-class ConsoleVariableEditor
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit ConsoleVariableEditor(QWidget* parent = nullptr);
-
-    static void RegisterViewClass();
-    void HandleVariableRowUpdated(ICVar* pCVar);
-
-protected:
-    void showEvent(QShowEvent* event) override;
-
-private:
-    void SetVarBlock(CVarBlock* varBlock);
-
-    QTableView* m_tableView;
-    ConsoleVariableModel* m_model;
-    ConsoleVariableItemDelegate* m_itemDelegate;
-    CVarBlock* m_varBlock;
-};
-
-class CConsoleSCB
-    : public QWidget
-    , private AzToolsFramework::EditorPreferencesNotificationBus::Handler
-{
-    Q_OBJECT
-public:
-    explicit CConsoleSCB(QWidget* parent = nullptr);
-    ~CConsoleSCB();
-
-    static void RegisterViewClass();
-    void SetInputFocus();
-    void AddToConsole(const QString& text, bool bNewLine);
-    void FlushText();
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
-    static CConsoleSCB* GetCreatedInstance();
-
-    static void AddToPendingLines(const QString& text, bool bNewLine);        // call this function instead of AddToConsole() until an instance of CConsoleSCB exists to prevent messages from getting lost
-
-    // EditorPreferencesNotificationBus...
-    void OnEditorPreferencesChanged() override;
-
-    void RefreshStyle();
-
-private Q_SLOTS:
-    void showVariableEditor();
-    void toggleConsoleSearch();
-    void findPrevious();
-    void findNext();
-
-private:
-    QScopedPointer<Ui::Console> ui;
-    int m_richEditTextLength;
-
-    Lines m_lines;
-    static Lines s_pendingLines;
-
-    QList<QColor> m_colorTable;
-    AzToolsFramework::ConsoleColorTheme m_backgroundTheme;
-
-    class SearchHighlighter;
-    SearchHighlighter* m_highlighter;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCB_H
-
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.cpp b/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.cpp
deleted file mode 100644
index 351e99190b..0000000000
--- a/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.cpp
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-#include "ConsoleSCBMFC.h"
-#include "PropertiesDialog.h"
-#include "QtViewPaneManager.h"
-#include "Core/QtEditorApplication.h"
-
-#include <Controls/ui_ConsoleSCBMFC.h>
-
-#include <QtUtil.h>
-#include <QtUtilWin.h>
-
-#include <QtCore/QStringList>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QPoint>
-#include <QtGui/QCursor>
-#include <QtGui/QMouseEvent>
-#include <QtWidgets/QStyle>
-#include <QtWidgets/QStyleFactory>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QScrollBar>
-#include <QtWidgets/QVBoxLayout>
-
-#include <vector>
-#include <iostream>
-
-namespace MFC
-{
-
-static CPropertiesDialog* gPropertiesDlg = nullptr;
-static CString mfc_popup_helper(HWND hwnd, int x, int y);
-static CConsoleSCB* s_consoleSCB = nullptr;
-
-static QString RemoveColorCode(const QString& text, int& iColorCode)
-{
-    QString cleanString;
-    cleanString.reserve(text.size());
-
-    const int textSize = text.size();
-    for (int i = 0; i < textSize; ++i)
-    {
-        QChar c = text.at(i);
-        bool isLast = i == textSize - 1;
-        if (c == '$' && !isLast && text.at(i + 1).isDigit())
-        {
-            if (iColorCode == 0)
-            {
-                iColorCode = text.at(i + 1).digitValue();
-            }
-            ++i;
-            continue;
-        }
-
-        if (c == '\r' || c == '\n')
-        {
-            ++i;
-            continue;
-        }
-
-        cleanString.append(c);
-    }
-
-    return cleanString;
-}
-
-ConsoleLineEdit::ConsoleLineEdit(QWidget* parent)
-    : QLineEdit(parent)
-    , m_historyIndex(0)
-    , m_bReusedHistory(false)
-{
-}
-
-void ConsoleLineEdit::mousePressEvent(QMouseEvent* ev)
-{
-    if (ev->type() == QEvent::MouseButtonPress && ev->button() & Qt::RightButton)
-    {
-        Q_EMIT variableEditorRequested();
-    }
-
-    QLineEdit::mousePressEvent(ev);
-}
-
-void ConsoleLineEdit::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-    Q_EMIT variableEditorRequested();
-}
-
-bool ConsoleLineEdit::event(QEvent* ev)
-{
-    // Tab key doesn't go to keyPressEvent(), must be processed here
-
-    if (ev->type() != QEvent::KeyPress)
-    {
-        return QLineEdit::event(ev);
-    }
-
-    QKeyEvent* ke = static_cast<QKeyEvent*>(ev);
-    if (ke->key() != Qt::Key_Tab)
-    {
-        return QLineEdit::event(ev);
-    }
-
-    QString inputStr = text();
-    QString newStr;
-
-    QStringList tokens = inputStr.split(" ");
-    inputStr = tokens.isEmpty() ? QString() : tokens.first();
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-
-    const bool ctrlPressed = ke->modifiers() & Qt::ControlModifier;
-    CString cstring = QtUtil::ToCString(inputStr); // TODO: Use QString once the backend stops using QString
-    if (ctrlPressed)
-    {
-        newStr = QtUtil::ToString(console->AutoCompletePrev(cstring));
-    }
-    else
-    {
-        newStr = QtUtil::ToString(console->ProcessCompletion(cstring));
-        newStr = QtUtil::ToString(console->AutoComplete(cstring));
-
-        if (newStr.isEmpty())
-        {
-            newStr = QtUtil::ToQString(GetIEditor()->GetCommandManager()->AutoComplete(QtUtil::ToString(newStr)));
-        }
-    }
-
-    if (!newStr.isEmpty())
-    {
-        newStr += " ";
-        setText(newStr);
-    }
-
-    deselect();
-    return true;
-}
-
-void ConsoleLineEdit::keyPressEvent(QKeyEvent* ev)
-{
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-    auto commandManager = GetIEditor()->GetCommandManager();
-
-    console->ResetAutoCompletion();
-
-    switch (ev->key())
-    {
-    case Qt::Key_Enter:
-    case Qt::Key_Return:
-    {
-        QString str = text().trimmed();
-        if (!str.isEmpty())
-        {
-            if (commandManager->IsRegistered(QtUtil::ToCString(str)))
-            {
-                commandManager->Execute(QtUtil::ToString(str));
-            }
-            else
-            {
-                CLogFile::WriteLine(QtUtil::ToCString(str));
-                GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(QtUtil::ToCString(str));
-            }
-
-            // If a history command was reused directly via up arrow enter, do not reset history index
-            if (m_history.size() > 0 && m_historyIndex < m_history.size() && m_history[m_historyIndex] == str)
-            {
-                m_bReusedHistory = true;
-            }
-            else
-            {
-                m_historyIndex = m_history.size();
-            }
-
-            // Do not add the same string if it is the top of the stack, but allow duplicate entries otherwise
-            if (m_history.isEmpty() || m_history.back() != str)
-            {
-                m_history.push_back(str);
-                if (!m_bReusedHistory)
-                {
-                    m_historyIndex = m_history.size();
-                }
-            }
-        }
-        else
-        {
-            m_historyIndex = m_history.size();
-        }
-
-        setText(QString());
-        break;
-    }
-    case Qt::Key_AsciiTilde: // ~
-    case Qt::Key_Agrave: // `
-        // disable log.
-        GetIEditor()->ShowConsole(false);
-        setText(QString());
-        m_historyIndex = m_history.size();
-        break;
-    case Qt::Key_Escape:
-        setText(QString());
-        m_historyIndex = m_history.size();
-        break;
-    case Qt::Key_Up:
-        DisplayHistory(false /*bForward*/);
-        break;
-    case Qt::Key_Down:
-        DisplayHistory(true /*bForward*/);
-        break;
-    default:
-        QLineEdit::keyPressEvent(ev);
-    }
-}
-
-void ConsoleLineEdit::DisplayHistory(bool bForward)
-{
-    if (m_history.isEmpty())
-    {
-        return;
-    }
-
-    // Immediately after reusing a history entry, ensure up arrow re-displays command just used
-    if (!m_bReusedHistory || bForward)
-    {
-        m_historyIndex = static_cast<unsigned int>(clamp_tpl(static_cast<int>(m_historyIndex) + (bForward ? 1 : -1), 0, m_history.size() - 1));
-    }
-    m_bReusedHistory = false;
-
-    setText(m_history[m_historyIndex]);
-}
-
-ConsoleTextEdit::ConsoleTextEdit(QWidget* parent)
-    : QTextEdit(parent)
-{
-}
-
-
-Lines CConsoleSCB::s_pendingLines;
-
-CConsoleSCB::CConsoleSCB(QWidget* parent)
-    : QWidget(parent)
-    , ui(new Ui::ConsoleMFC())
-    , m_richEditTextLength(0)
-    , m_backgroundTheme(gSettings.consoleBackgroundColorTheme)
-{
-    m_lines = s_pendingLines;
-    s_pendingLines.clear();
-    s_consoleSCB = this;
-    ui->setupUi(this);
-    setMinimumHeight(120);
-
-    // Setup the color table for the default (light) theme
-    m_colorTable << QColor(0, 0, 0)
-        << QColor(0, 0, 0)
-        << QColor(0, 0, 200) // blue
-        << QColor(0, 200, 0) // green
-        << QColor(200, 0, 0) // red
-        << QColor(0, 200, 200) // cyan
-        << QColor(128, 112, 0) // yellow
-        << QColor(200, 0, 200) // red+blue
-        << QColor(0x000080ff)
-        << QColor(0x008f8f8f);
-    OnStyleSettingsChanged();
-
-    connect(ui->button, &QPushButton::clicked, this, &CConsoleSCB::showVariableEditor);
-    connect(ui->lineEdit, &MFC::ConsoleLineEdit::variableEditorRequested, this, &MFC::CConsoleSCB::showVariableEditor);
-    connect(Editor::EditorQtApplication::instance(), &Editor::EditorQtApplication::skinChanged, this, &MFC::CConsoleSCB::OnStyleSettingsChanged);
-
-    if (GetIEditor()->IsInConsolewMode())
-    {
-        // Attach / register edit box
-        //CLogFile::AttachEditBox(m_edit.GetSafeHwnd()); // FIXME
-    }
-}
-
-CConsoleSCB::~CConsoleSCB()
-{
-    s_consoleSCB = nullptr;
-    delete gPropertiesDlg;
-    gPropertiesDlg = nullptr;
-    CLogFile::AttachEditBox(nullptr);
-}
-
-void CConsoleSCB::RegisterViewClass()
-{
-    QtViewOptions opts;
-    opts.preferedDockingArea = Qt::BottomDockWidgetArea;
-    opts.isDeletable = false;
-    opts.isStandard = true;
-    opts.showInMenu = true;
-    opts.builtInActionId = ID_VIEW_CONSOLEWINDOW;
-    opts.sendViewPaneNameBackToAmazonAnalyticsServers = true;
-    RegisterQtViewPane<CConsoleSCB>(GetIEditor(), LyViewPane::Console, LyViewPane::CategoryTools, opts);
-}
-
-void CConsoleSCB::OnStyleSettingsChanged()
-{
-    ui->button->setIcon(QIcon(QString(":/controls/img/cvar_dark.bmp")));
-
-    // Set the debug/warning text colors appropriately for the background theme
-    // (e.g. not have black text on black background)
-    QColor textColor = Qt::black;
-    m_backgroundTheme = gSettings.consoleBackgroundColorTheme;
-    if (m_backgroundTheme == SEditorSettings::ConsoleColorTheme::Dark)
-    {
-        textColor = Qt::white;
-    }
-    m_colorTable[0] = textColor;
-    m_colorTable[1] = textColor;
-
-    QColor bgColor;
-    if (!GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == SEditorSettings::ConsoleColorTheme::Dark)
-    {
-        bgColor = Qt::black;
-    }
-    else
-    {
-        bgColor = Qt::white;
-    }
-
-    ui->textEdit->setStyleSheet(QString("QTextEdit{ background: %1 }").arg(bgColor.name(QColor::HexRgb)));
-
-    // Clear out the console text when we change our background color since
-    // some of the previous text colors may not be appropriate for the
-    // new background color
-    ui->textEdit->clear();
-}
-
-void CConsoleSCB::showVariableEditor()
-{
-    const QPoint cursorPos = QCursor::pos();
-    CString str = mfc_popup_helper(0, cursorPos.x(), cursorPos.y());
-    if (!str.IsEmpty())
-    {
-        ui->lineEdit->setText(QtUtil::ToQString(str));
-    }
-}
-
-void CConsoleSCB::SetInputFocus()
-{
-    ui->lineEdit->setFocus();
-    ui->lineEdit->setText(QString());
-}
-
-void CConsoleSCB::AddToConsole(const QString& text, bool bNewLine)
-{
-    m_lines.push_back({ text, bNewLine });
-    FlushText();
-}
-
-void CConsoleSCB::FlushText()
-{
-    if (m_lines.empty())
-    {
-        return;
-    }
-
-    // Store our current cursor in case we need to restore it, and check if
-    // the user has scrolled the text edit away from the bottom
-    const QTextCursor oldCursor = ui->textEdit->textCursor();
-    QScrollBar* scrollBar = ui->textEdit->verticalScrollBar();
-    const int oldScrollValue = scrollBar->value();
-    bool scrolledOffBottom = oldScrollValue != scrollBar->maximum();
-
-    ui->textEdit->moveCursor(QTextCursor::End);
-    QTextCursor textCursor = ui->textEdit->textCursor();
-
-    while (!m_lines.empty())
-    {
-        ConsoleLine line = m_lines.front();
-        m_lines.pop_front();
-
-        int iColor = 0;
-        QString text = MFC::RemoveColorCode(line.text, iColor);
-        if (iColor < 0 || iColor >= m_colorTable.size())
-        {
-            iColor = 0;
-        }
-
-        if (line.newLine)
-        {
-            text = QtUtil::trimRight(text);
-            text = "\r\n" + text;
-        }
-
-        QTextCharFormat format;
-        const QColor color(m_colorTable[iColor]);
-        format.setForeground(color);
-
-        if (iColor != 0)
-        {
-            format.setFontWeight(QFont::Bold);
-        }
-
-        textCursor.setCharFormat(format);
-        textCursor.insertText(text);
-    }
-
-    // If the user has selected some text in the text edit area or has scrolled
-    // away from the bottom, then restore the previous cursor and keep the scroll
-    // bar in the same location
-    if (oldCursor.hasSelection() || scrolledOffBottom)
-    {
-        ui->textEdit->setTextCursor(oldCursor);
-        scrollBar->setValue(oldScrollValue);
-    }
-    // Otherwise scroll to the bottom so the latest text can be seen
-    else
-    {
-        scrollBar->setValue(scrollBar->maximum());
-    }
-}
-
-QSize CConsoleSCB::minimumSizeHint() const
-{
-    return QSize(-1, -1);
-}
-
-QSize CConsoleSCB::sizeHint() const
-{
-    return QSize(100, 100);
-}
-
-/** static */
-void CConsoleSCB::AddToPendingLines(const QString& text, bool bNewLine)
-{
-    s_pendingLines.push_back({ text, bNewLine });
-}
-
-static CVarBlock* VarBlockFromConsoleVars()
-{
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-    std::vector<const char*> cmds;
-    cmds.resize(console->GetNumVars());
-    size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
-
-    CVarBlock* vb = new CVarBlock;
-    IVariable* pVariable = 0;
-    for (int i = 0; i < cmdCount; i++)
-    {
-        ICVar* pCVar = console->GetCVar(cmds[i]);
-        if (!pCVar)
-        {
-            continue;
-        }
-        int varType = pCVar->GetType();
-
-        switch (varType)
-        {
-        case CVAR_INT:
-            pVariable = new CVariable<int>();
-            pVariable->Set(pCVar->GetIVal());
-            break;
-        case CVAR_FLOAT:
-            pVariable = new CVariable<float>();
-            pVariable->Set(pCVar->GetFVal());
-            break;
-        case CVAR_STRING:
-            pVariable = new CVariable<CString>();
-            pVariable->Set(pCVar->GetString());
-            break;
-        default:
-            assert(0);
-        }
-
-        pVariable->SetDescription(pCVar->GetHelp());
-        pVariable->SetName(cmds[i]);
-
-        if (pVariable)
-        {
-            vb->AddVariable(pVariable);
-        }
-    }
-    return vb;
-}
-
-static void OnConsoleVariableUpdated(IVariable* pVar)
-{
-    if (!pVar)
-    {
-        return;
-    }
-    CString varName = pVar->GetName();
-    ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(varName);
-    if (!pCVar)
-    {
-        return;
-    }
-    if (pVar->GetType() == IVariable::INT)
-    {
-        int val;
-        pVar->Get(val);
-        pCVar->Set(val);
-    }
-    else if (pVar->GetType() == IVariable::FLOAT)
-    {
-        float val;
-        pVar->Get(val);
-        pCVar->Set(val);
-    }
-    else if (pVar->GetType() == IVariable::STRING)
-    {
-        CString val;
-        pVar->Get(val);
-        pCVar->Set(val);
-    }
-}
-
-static CString mfc_popup_helper(HWND hwnd, int x, int y)
-{
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-
-    TSmartPtr<CVarBlock> vb = VarBlockFromConsoleVars();
-    XmlNodeRef node;
-    if (!gPropertiesDlg)
-    {
-        gPropertiesDlg = new CPropertiesDialog("Console Variables", node, AfxGetMainWnd(), true);
-    }
-    if (!gPropertiesDlg->m_hWnd)
-    {
-        gPropertiesDlg->Create(CPropertiesDialog::IDD, AfxGetMainWnd());
-        gPropertiesDlg->SetUpdateCallback(AZStd::bind(OnConsoleVariableUpdated, AZStd::placeholders::_1));
-    }
-    gPropertiesDlg->ShowWindow(SW_SHOW);
-    gPropertiesDlg->BringWindowToTop();
-    gPropertiesDlg->GetPropertyCtrl()->AddVarBlock(vb);
-
-    return "";
-}
-
-CConsoleSCB* CConsoleSCB::GetCreatedInstance()
-{
-    return s_consoleSCB;
-}
-
-} // namespace MFC
-
-#include <Controls/moc_ConsoleSCBMFC.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.h b/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.h
deleted file mode 100644
index 421e3a4e95..0000000000
--- a/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCBMFC_H
-#define CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCBMFC_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QTextEdit>
-#include <QtWidgets/QPushButton>
-
-#include "ConsoleSCB.h"
-#endif
-
-class QMenu;
-class ConsoleWidget;
-class QFocusEvent;
-
-namespace Ui {
-    class ConsoleMFC;
-}
-
-namespace MFC
-{
-
-struct ConsoleLine
-{
-    QString text;
-    bool newLine;
-};
-typedef std::deque<ConsoleLine> Lines;
-
-class ConsoleLineEdit
-    : public QLineEdit
-{
-    Q_OBJECT
-public:
-    explicit ConsoleLineEdit(QWidget* parent = nullptr);
-
-protected:
-    void mousePressEvent(QMouseEvent* ev) override;
-    void mouseDoubleClickEvent(QMouseEvent* ev) override;
-    void keyPressEvent(QKeyEvent* ev) override;
-    bool event(QEvent* ev) override;
-
-signals:
-    void variableEditorRequested();
-    void setWindowTitle(const QString&);
-
-private:
-    void DisplayHistory(bool bForward);
-    QStringList m_history;
-    unsigned int m_historyIndex;
-    bool m_bReusedHistory;
-};
-
-class ConsoleTextEdit
-    : public QTextEdit
-{
-    Q_OBJECT
-public:
-    explicit ConsoleTextEdit(QWidget* parent = nullptr);
-};
-
-class CConsoleSCB
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit CConsoleSCB(QWidget* parent = nullptr);
-    ~CConsoleSCB();
-
-    static void RegisterViewClass();
-    void SetInputFocus();
-    void AddToConsole(const QString& text, bool bNewLine);
-    void FlushText();
-    void showPopupAndSetTitle();
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
-    static CConsoleSCB* GetCreatedInstance();
-
-    static void AddToPendingLines(const QString& text, bool bNewLine);        // call this function instead of AddToConsole() until an instance of CConsoleSCB exists to prevent messages from getting lost
-
-public Q_SLOTS:
-    void OnStyleSettingsChanged();
-
-private Q_SLOTS:
-    void showVariableEditor();
-
-private:
-    QScopedPointer<Ui::ConsoleMFC> ui;
-    int m_richEditTextLength;
-
-    Lines m_lines;
-    static Lines s_pendingLines;
-
-    QList<QColor> m_colorTable;
-    SEditorSettings::ConsoleColorTheme m_backgroundTheme;
-};
-
-} // namespace MFC
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_CONSOLESCB_H
-
diff --git a/Code/Sandbox/Editor/Controls/FolderTreeCtrl.cpp b/Code/Sandbox/Editor/Controls/FolderTreeCtrl.cpp
deleted file mode 100644
index a53299c2fe..0000000000
--- a/Code/Sandbox/Editor/Controls/FolderTreeCtrl.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "FolderTreeCtrl.h"
-
-// Qt
-#include <QMenu>
-#include <QSortFilterProxyModel>
-#include <QStandardItemModel>
-
-// AzQtComponents
-#include <AzQtComponents/Utilities/DesktopUtilities.h>      // for AzQtComponents::ShowFileOnDesktop
-
-
-enum ETreeImage
-{
-    eTreeImage_Folder = 0,
-    eTreeImage_File = 2
-};
-
-enum CustomRoles
-{
-    IsFolderRole = Qt::UserRole
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CFolderTreeCtrl
-//////////////////////////////////////////////////////////////////////////
-CFolderTreeCtrl::CFolderTreeCtrl(const QStringList& folders, const QString& fileNameSpec,
-    const QString& rootName, bool bDisableMonitor, bool bFlatTree, QWidget* parent)
-    : QTreeView(parent)
-    , m_rootTreeItem(nullptr)
-    , m_folders(folders)
-    , m_fileNameSpec(fileNameSpec)
-    , m_rootName(rootName)
-    , m_bDisableMonitor(bDisableMonitor)
-    , m_bFlatStyle(bFlatTree)
-{
-    init(folders, fileNameSpec, rootName, bDisableMonitor, bFlatTree);
-}
-
-CFolderTreeCtrl::CFolderTreeCtrl(QWidget* parent)
-    : QTreeView(parent)
-    , m_rootTreeItem(nullptr)
-    , m_bDisableMonitor(false)
-    , m_bFlatStyle(true)
-
-{
-}
-
-
-void CFolderTreeCtrl::init(const QStringList& folders, const QString& fileNameSpec, const QString& rootName, bool bDisableMonitor /*= false*/, bool bFlatTree /*= true*/)
-{
-    m_model = new QStandardItemModel(this);
-    m_proxyModel = new QSortFilterProxyModel(this);
-    m_proxyModel->setRecursiveFilteringEnabled(true);
-
-    m_proxyModel->setSourceModel(m_model);
-    setModel(m_proxyModel);
-
-    m_folders = folders;
-    m_fileNameSpec = fileNameSpec;
-    m_rootName = rootName;
-    m_bDisableMonitor = bDisableMonitor;
-    m_bFlatStyle = bFlatTree;
-    m_fileIcon = QIcon(":/TreeView/default-icon.svg");
-    m_folderIcon = QIcon(":/TreeView/folder-icon.svg");
-
-    for (auto item = m_folders.begin(), end = m_folders.end(); item != end; ++item)
-    {
-        (*item) = Path::RemoveBackslash(Path::ToUnixPath((*item)));
-
-        if (CFileUtil::PathExists(*item))
-        {
-            m_foldersSegments.insert(std::make_pair((*item), Path::SplitIntoSegments((*item)).size()));
-        }
-        else if (Path::IsFolder((*item).toLocal8Bit().constData()))
-        {
-            m_foldersSegments.insert(std::make_pair((*item), Path::SplitIntoSegments((*item)).size()));
-        }
-        else
-        {
-            (*item).clear();
-        }
-    }
-
-    setHeaderHidden(true);
-
-    QObject::connect(this, &QTreeView::doubleClicked, this, &CFolderTreeCtrl::OnIndexDoubleClicked);
-
-    InitTree();
-
-    setSortingEnabled(true);
-}
-
-QString CFolderTreeCtrl::GetPath(QStandardItem* item) const
-{
-    CTreeItem* treeItem = static_cast<CTreeItem*>(item);
-
-    if (treeItem)
-    {
-        return treeItem->GetPath();
-    }
-
-    return "";
-}
-
-bool CFolderTreeCtrl::IsFolder(QStandardItem* item) const
-{
-    return item->data(IsFolderRole).toBool();
-}
-
-bool CFolderTreeCtrl::IsFile(QStandardItem* item) const
-{
-    return !IsFolder(item);
-}
-
-CFolderTreeCtrl::~CFolderTreeCtrl()
-{
-    // Obliterate tree items before destroying the controls
-    m_rootTreeItem.reset(nullptr);
-
-    // Unsubscribe from file change notifications
-    if (!m_bDisableMonitor)
-    {
-        CFileChangeMonitor::Instance()->Unsubscribe(this);
-    }
-}
-
-void CFolderTreeCtrl::OnIndexDoubleClicked(const QModelIndex& index)
-{
-    if (!m_proxyModel || !m_model)
-    {
-        return;
-    }
-
-    QStandardItem* item = GetSourceItemByIndex(index);
-    if (item)
-    {
-        Q_EMIT ItemDoubleClicked(item);
-    }
-}
-
-void CFolderTreeCtrl::OnFileMonitorChange(const SFileChangeInfo& rChange)
-{
-    const QString filePath = Path::ToUnixPath(Path::GetRelativePath(rChange.filename));
-    for (auto item = m_folders.begin(), end = m_folders.end(); item != end; ++item)
-    {
-        // Only look for changes in folder
-        if (filePath.indexOf((*item)) != 0)
-        {
-            return;
-        }
-
-        if (rChange.changeType == rChange.eChangeType_Created || rChange.changeType == rChange.eChangeType_RenamedNewName)
-        {
-            if (CFileUtil::PathExists(filePath))
-            {
-                LoadTreeRec(filePath);
-            }
-            else
-            {
-                AddItem(filePath);
-            }
-        }
-        else if (rChange.changeType == rChange.eChangeType_Deleted || rChange.changeType == rChange.eChangeType_RenamedOldName)
-        {
-            RemoveItem(filePath);
-        }
-    }
-}
-
-void CFolderTreeCtrl::contextMenuEvent(QContextMenuEvent* e)
-{
-    if (!m_model)
-    {
-        return;
-    }
-
-    auto index = indexAt(e->pos());
-    QStandardItem* item = GetSourceItemByIndex(index);
-
-    if (!item)
-    {
-        return;
-    }
-
-    const QString path = GetPath(item);
-
-    QMenu menu;
-    QAction* editAction = menu.addAction(tr("Edit"));
-    connect(editAction, &QAction::triggered, this, [=]()
-        {
-            this->Edit(path);
-        });
-    QAction* showInExplorerAction = menu.addAction(tr("Show In Explorer"));
-    connect(showInExplorerAction, &QAction::triggered, this, [=]()
-        {
-            this->ShowInExplorer(path);
-        });
-    menu.exec(QCursor::pos());
-}
-
-void CFolderTreeCtrl::InitTree()
-{
-    m_rootTreeItem.reset(new CTreeItem(*this, m_rootName));
-
-    for (auto item = m_folders.begin(), end = m_folders.end(); item != end; ++item)
-    {
-        if (!(*item).isEmpty())
-        {
-            LoadTreeRec((*item));
-        }
-    }
-
-    if (!m_bDisableMonitor)
-    {
-        CFileChangeMonitor::Instance()->Subscribe(this);
-    }
-
-
-    expandAll();
-}
-
-void CFolderTreeCtrl::LoadTreeRec(const QString& currentFolder)
-{
-    CFileEnum fileEnum;
-    QFileInfo fileData;
-
-    QString currentFolderSlash = Path::AddSlash(currentFolder);
-    QString targetFolder = currentFolder;
-
-    if (currentFolder.startsWith('@'))
-    {
-        char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
-        if (AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(currentFolder.toLocal8Bit().constData(), resolvedPath, AZ_MAX_PATH_LEN))
-        {
-            targetFolder = resolvedPath;
-        }
-
-        // update the base folder name
-        QStringList parts =  Path::SplitIntoSegments(currentFolderSlash);
-        if (parts.size() > 1)
-        {
-            parts.removeFirst();
-            currentFolderSlash = Path::AddSlash(parts.join(QDir::separator()));
-        }
-    }
-
-    for (bool bFoundFile = fileEnum.StartEnumeration(targetFolder, "*", &fileData);
-         bFoundFile; bFoundFile = fileEnum.GetNextFile(&fileData))
-    {
-        const QString fileName = fileData.fileName();
-
-        // Have we found a folder?
-        if (fileData.isDir())
-        {
-            // Skip the parent folder entries
-            if (fileName == "." || fileName == "..")
-            {
-                continue;
-            }
-
-            LoadTreeRec(currentFolderSlash + fileName);
-        }
-
-        AddItem(currentFolderSlash + fileName);
-    }
-}
-
-void CFolderTreeCtrl::AddItem(const QString& path)
-{
-    QString folder;
-    QString fileNameWithoutExtension;
-    QString ext;
-
-    Path::Split(path, folder, fileNameWithoutExtension, ext);
-
-    auto regex = QRegExp(m_fileNameSpec, Qt::CaseInsensitive, QRegExp::Wildcard);
-    if (regex.exactMatch(path))
-    {
-        CTreeItem* folderTreeItem = CreateFolderItems(folder);
-        folderTreeItem->AddChild(fileNameWithoutExtension, path, eTreeImage_File);
-    }
-}
-
-void CFolderTreeCtrl::RemoveItem(const QString& path)
-{
-    if (!CFileUtil::FileExists(path))
-    {
-        auto findIter = m_pathToTreeItem.find(path);
-
-        if (findIter != m_pathToTreeItem.end())
-        {
-            CTreeItem* foundItem = findIter->second;
-            foundItem->Remove();
-            RemoveEmptyFolderItems(Path::GetPath(path));
-        }
-    }
-}
-
-CFolderTreeCtrl::CTreeItem* CFolderTreeCtrl::GetItem(const QString& path)
-{
-    auto findIter = m_pathToTreeItem.find(path);
-
-    if (findIter == m_pathToTreeItem.end())
-    {
-        return nullptr;
-    }
-
-    return findIter->second;
-}
-
-QStandardItem* CFolderTreeCtrl::GetSourceItemByIndex(const QModelIndex& index) const
-{
-    if (!m_proxyModel || !m_model)
-    {
-        return nullptr;
-    }
-
-    // Since our tree view has a proxy model to handle the sorting/filtering, any index
-    // found on the tree view (e.g. the selected index) needs to be mapped back to the source
-    // model to find the actual item.
-    auto sourceIndex = m_proxyModel->mapToSource(index);
-    return m_model->itemFromIndex(sourceIndex);
-}
-
-QString CFolderTreeCtrl::CalculateFolderFullPath(const QStringList& splittedFolder, int idx)
-{
-    QString path;
-    for (int segIdx = 0; segIdx <= idx; ++segIdx)
-    {
-        if (segIdx != 0)
-        {
-            path.append(QLatin1Char('/'));
-        }
-        path.append(splittedFolder[segIdx]);
-    }
-    return path;
-}
-
-CFolderTreeCtrl::CTreeItem* CFolderTreeCtrl::CreateFolderItems(const QString& folder)
-{
-    QStringList splittedFolder = Path::SplitIntoSegments(folder);
-    CTreeItem* currentTreeItem = m_rootTreeItem.get();
-
-    if (!m_bFlatStyle)
-    {
-        QString currentFolder;
-        QString fullpath;
-        const int splittedFoldersCount = splittedFolder.size();
-        for (int idx = 0; idx < splittedFoldersCount; ++idx)
-        {
-            currentFolder = Path::RemoveBackslash(splittedFolder[idx]);
-            fullpath = CalculateFolderFullPath(splittedFolder, idx);
-
-            CTreeItem* folderItem = GetItem(fullpath);
-            if (!folderItem)
-            {
-                currentTreeItem = currentTreeItem->AddChild(currentFolder, fullpath, eTreeImage_Folder);
-            }
-            else
-            {
-                currentTreeItem = folderItem;
-            }
-        }
-    }
-
-    return currentTreeItem;
-}
-
-void CFolderTreeCtrl::RemoveEmptyFolderItems(const QString& folder)
-{
-    QStringList splittedFolder = Path::SplitIntoSegments(folder);
-    const int splittedFoldersCount = splittedFolder.size();
-    QString fullpath;
-    for (int idx = 0; idx < splittedFoldersCount; ++idx)
-    {
-        fullpath = CalculateFolderFullPath(splittedFolder, idx);
-        CTreeItem* folderItem = GetItem(fullpath);
-        if (!folderItem)
-        {
-            continue;
-        }
-
-        if (!folderItem->hasChildren())
-        {
-            folderItem->Remove();
-        }
-    }
-}
-
-void CFolderTreeCtrl::Edit(const QString& path)
-{
-    CFileUtil::EditTextFile(QtUtil::ToString(path), 0, IFileUtil::FILE_TYPE_SCRIPT);
-}
-
-void CFolderTreeCtrl::ShowInExplorer(const QString& path)
-{
-    QString absolutePath = QDir::currentPath();
-
-    CTreeItem* root = m_rootTreeItem.get();
-    CTreeItem* item = GetItem(path);
-
-    if (item != root)
-    {
-        absolutePath += QStringLiteral("/%1").arg(path);
-    }
-
-    AzQtComponents::ShowFileOnDesktop(absolutePath);
-}
-
-QIcon CFolderTreeCtrl::GetItemIcon(int image) const
-{
-    return image == eTreeImage_File ? m_fileIcon : m_folderIcon;
-}
-
-QList<QStandardItem*> CFolderTreeCtrl::GetSelectedItems() const
-{
-    QList<QStandardItem*> items;
-
-    for (auto index : selectedIndexes())
-    {
-        QStandardItem* item = GetSourceItemByIndex(index);
-        if (item)
-        {
-            items.append(item);
-        }
-    }
-
-    return items;
-}
-
-void CFolderTreeCtrl::SetSearchFilter(const QString& searchText)
-{
-    if (m_proxyModel)
-    {
-        m_proxyModel->setFilterFixedString(searchText);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// CFolderTreeCtrl::CTreeItem
-//////////////////////////////////////////////////////////////////////////
-CFolderTreeCtrl::CTreeItem::CTreeItem(CFolderTreeCtrl& folderTreeCtrl, const QString& path)
-    : QStandardItem(folderTreeCtrl.GetItemIcon(eTreeImage_Folder), folderTreeCtrl.m_rootName)
-    , m_folderTreeCtrl(folderTreeCtrl)
-    , m_path(path)
-{
-    setData(true, IsFolderRole);
-
-    m_folderTreeCtrl.m_model->invisibleRootItem()->appendRow(this);
-    m_folderTreeCtrl.m_pathToTreeItem[ m_path ] = this;
-}
-
-CFolderTreeCtrl::CTreeItem::CTreeItem(CFolderTreeCtrl& folderTreeCtrl, CFolderTreeCtrl::CTreeItem* parent,
-    const QString& name, const QString& path, const int image)
-    : QStandardItem(folderTreeCtrl.GetItemIcon(image), name)
-    , m_folderTreeCtrl(folderTreeCtrl)
-    , m_path(path)
-{
-    parent->appendRow(this);
-    setData(image == eTreeImage_Folder, IsFolderRole);
-
-    m_folderTreeCtrl.m_pathToTreeItem[ m_path ] = this;
-}
-
-CFolderTreeCtrl::CTreeItem::~CTreeItem()
-{
-    m_folderTreeCtrl.m_pathToTreeItem.erase(m_path);
-}
-
-void CFolderTreeCtrl::CTreeItem::Remove()
-{
-    // Root can't be deleted this way
-    if (auto parentItem = parent())
-    {
-        int numRows = parentItem->rowCount();
-        for (int i = 0; i < numRows; ++i)
-        {
-            if (parentItem->child(i) == this)
-            {
-                parentItem->removeRow(i);
-                break;
-            }
-        }
-    }
-}
-
-CFolderTreeCtrl::CTreeItem* CFolderTreeCtrl::CTreeItem::AddChild(const QString& name, const QString& path, const int image)
-{
-    CTreeItem* newItem = new CTreeItem(m_folderTreeCtrl, this, name, path, image);
-    return newItem;
-}
diff --git a/Code/Sandbox/Editor/Controls/FolderTreeCtrl.h b/Code/Sandbox/Editor/Controls/FolderTreeCtrl.h
deleted file mode 100644
index 886fd54885..0000000000
--- a/Code/Sandbox/Editor/Controls/FolderTreeCtrl.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_FOLDERTREECTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_FOLDERTREECTRL_H
-#pragma once
-
-#include "Util/FileChangeMonitor.h"
-#include <QList>
-#include <QStandardItem>
-#include <QTreeView>
-#include <QIcon>
-
-class QSortFilterProxyModel;
-class QStandardItemModel;
-
-//! Case insensetive less key for any type convertable to const char*.
-struct qstring_icmp
-{
-    bool operator()(const QString& left, const QString& right) const
-    {
-        return QString::compare(left, right, Qt::CaseInsensitive) < 0;
-    }
-};
-
-class CFolderTreeCtrl
-    : public QTreeView
-    , public CFileChangeMonitorListener
-{
-    Q_OBJECT // AUTOMOC
-
-    friend class CTreeItem;
-
-    class CTreeItem
-        : public QStandardItem
-    {
-        // Only allow destruction through std::unique_ptr
-        friend struct std::default_delete<CTreeItem>;
-
-    public:
-        explicit CTreeItem(CFolderTreeCtrl& folderTreeCtrl, const QString& path);
-        explicit CTreeItem(CFolderTreeCtrl& folderTreeCtrl, CTreeItem* parent,
-            const QString& name, const QString& path, const int image);
-
-        void Remove();
-        CTreeItem* AddChild(const QString& name, const QString& path, const int image);
-        QString GetPath() const { return m_path; }
-    private:
-        ~CTreeItem();
-
-        CFolderTreeCtrl& m_folderTreeCtrl;
-        QString m_path;
-    };
-
-public:
-    CFolderTreeCtrl(QWidget* parent = 0);
-    CFolderTreeCtrl(const QStringList& folders, const QString& fileNameSpec,
-        const QString& rootName, bool bDisableMonitor = false, bool bFlatTree = true, QWidget* parent = 0);
-    virtual ~CFolderTreeCtrl();
-
-    void init(const QStringList& folders, const QString& fileNameSpec,
-        const QString& rootName, bool bDisableMonitor = false, bool bFlatTree = true);
-
-    QString GetPath(QStandardItem* item) const;
-    bool IsFolder(QStandardItem* item) const;
-    bool IsFile(QStandardItem* item) const;
-
-    QIcon GetItemIcon(int image) const;
-    QList<QStandardItem*> GetSelectedItems() const;
-
-    void SetSearchFilter(const QString& searchText);
-
-Q_SIGNALS:
-    void ItemDoubleClicked(QStandardItem* item);
-
-protected Q_SLOTS:
-    void OnIndexDoubleClicked(const QModelIndex& index);
-
-protected:
-    virtual void OnFileMonitorChange(const SFileChangeInfo& rChange);
-    void contextMenuEvent(QContextMenuEvent* e) override;
-
-    void InitTree();
-    void LoadTreeRec(const QString& currentFolder);
-
-    void AddItem(const QString& path);
-    void RemoveItem(const QString& path);
-    CTreeItem* GetItem(const QString& path);
-
-    QStandardItem* GetSourceItemByIndex(const QModelIndex& index) const;
-
-    QString CalculateFolderFullPath(const QStringList& splittedFolder, int idx);
-    CTreeItem* CreateFolderItems(const QString& folder);
-    void RemoveEmptyFolderItems(const QString& folder);
-
-    void Edit(const QString& path);
-    void ShowInExplorer(const QString& path);
-
-    bool m_bDisableMonitor;
-    bool m_bFlatStyle;
-    std::unique_ptr< CTreeItem > m_rootTreeItem;
-    QString m_fileNameSpec;
-    QStringList m_folders;
-    QString m_rootName;
-    std::map<QString, unsigned int> m_foldersSegments;
-    QIcon m_folderIcon;
-    QIcon m_fileIcon;
-
-    QSortFilterProxyModel* m_proxyModel = nullptr;
-    QStandardItemModel* m_model = nullptr;
-    std::map< QString, CTreeItem*, qstring_icmp > m_pathToTreeItem;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_FOLDERTREECTRL_H
diff --git a/Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.cpp b/Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.cpp
deleted file mode 100644
index c85cacd0e8..0000000000
--- a/Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "HotTrackingTreeCtrl.h"
-
-// Qt
-#include <QMouseEvent>
-
-
-CHotTrackingTreeCtrl::CHotTrackingTreeCtrl(QWidget* parent)
-    : QTreeWidget(parent)
-{
-    setMouseTracking(true);
-    m_hHoverItem = NULL;
-}
-
-void CHotTrackingTreeCtrl::mouseMoveEvent(QMouseEvent* event)
-{
-    QTreeWidgetItem* hItem = itemAt(event->pos());
-
-    if (m_hHoverItem != NULL)
-    {
-        QFont font = m_hHoverItem->font(0);
-        font.setBold(false);
-        m_hHoverItem->setFont(0, font);
-        m_hHoverItem = NULL;
-    }
-
-    if (hItem != NULL)
-    {
-        QFont font = hItem->font(0);
-        font.setBold(true);
-        hItem->setFont(0, font);
-        m_hHoverItem = hItem;
-    }
-
-    QTreeWidget::mouseMoveEvent(event);
-}
-
-#include <Controls/moc_HotTrackingTreeCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.h b/Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.h
deleted file mode 100644
index fb29e1f843..0000000000
--- a/Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_HOTTRACKINGTREECTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_HOTTRACKINGTREECTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QTreeWidget>
-#endif
-
-class CHotTrackingTreeCtrl
-    : public QTreeWidget
-{
-    Q_OBJECT
-
-public:
-    CHotTrackingTreeCtrl(QWidget* parent = 0);
-    virtual ~CHotTrackingTreeCtrl(){};
-
-protected:
-    void mouseMoveEvent(QMouseEvent* event) override;
-
-private:
-    QTreeWidgetItem* m_hHoverItem;
-};
-#endif // CRYINCLUDE_EDITOR_CONTROLS_HOTTRACKINGTREECTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ImageHistogramCtrl.cpp b/Code/Sandbox/Editor/Controls/ImageHistogramCtrl.cpp
deleted file mode 100644
index 9ba0bcc001..0000000000
--- a/Code/Sandbox/Editor/Controls/ImageHistogramCtrl.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ImageHistogramCtrl.h"
-
-// Qt
-#include <QPainter>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QComboBox>
-
-
-// CImageHistogramCtrl
-
-// control tweak constants
-namespace ImageHistogram
-{
-    const float     kGraphHeightPercent = 0.7f;
-    const int       kGraphMargin = 4;
-    const QColor    kBackColor = QColor(100, 100, 100);
-    const QColor    kRedSectionColor = QColor(255, 220, 220);
-    const QColor    kGreenSectionColor = QColor(220, 255, 220);
-    const QColor    kBlueSectionColor = QColor(220, 220, 255);
-    const QColor    kSplitSeparatorColor = QColor(100, 100, 0);
-    const QColor    kButtonBackColor = QColor(20, 20, 20);
-    const QColor    kBtnLightColor(200, 200, 200);
-    const QColor    kBtnShadowColor(50, 50, 50);
-    const int       kButtonWidth = 40;
-    const QColor    kButtonTextColor(255, 255, 0);
-    const int       kTextLeftSpacing = 4;
-    const int       kTextFontSize = 70;
-    const char*     kTextFontFace = "Arial";
-    const QColor    kTextColor(255, 255, 255);
-};
-
-CImageHistogramCtrl::CImageHistogramCtrl(QWidget* parent)
-    : QWidget(parent)
-    , m_display(new CImageHistogramDisplay(this))
-    , m_drawMode(new QComboBox(this))
-    , m_infoText(new QLabel)
-{
-    setWindowTitle("Image Histogram");
-
-    m_drawMode->setFocusPolicy(Qt::NoFocus);
-    m_drawMode->addItem(tr("Luminosity"),
-                        QVariant::fromValue(EHistogramDrawMode::Luminosity));
-    m_drawMode->addItem(tr("Overlapped RGBA"),
-                        QVariant::fromValue(EHistogramDrawMode::OverlappedRGB));
-    m_drawMode->addItem(tr("Split RGB"),
-                        QVariant::fromValue(EHistogramDrawMode::SplitRGB));
-    m_drawMode->addItem(tr("Red Channel"),
-                        QVariant::fromValue(EHistogramDrawMode::RedChannel));
-    m_drawMode->addItem(tr("Green Channel"),
-                        QVariant::fromValue(EHistogramDrawMode::GreenChannel));
-    m_drawMode->addItem(tr("Blue Channel"),
-                        QVariant::fromValue(EHistogramDrawMode::BlueChannel));
-    m_drawMode->addItem(tr("Alpha Channel"),
-                        QVariant::fromValue(EHistogramDrawMode::AlphaChannel));
-
-    connect(m_drawMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
-            [=]([[maybe_unused]] int index){
-                auto mode = drawMode();
-                m_display->m_drawMode = mode;
-                m_display->update();
-            });
-
-    auto* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(m_drawMode);
-    layout->addWidget(m_display);
-    setLayout(layout);
-
-    setMinimumSize(200,150);
-}
-
-CImageHistogramCtrl::~CImageHistogramCtrl()
-{
-}
-
-EHistogramDrawMode CImageHistogramCtrl::drawMode() const
-{
-    return m_drawMode->currentData().value<EHistogramDrawMode>();
-}
-
-void CImageHistogramCtrl::setDrawMode(EHistogramDrawMode mode)
-{
-    auto index = m_drawMode->findData(QVariant::fromValue(mode));
-    if (index != -1)
-    {
-        m_drawMode->setCurrentIndex(index);
-    }
-}
-
-void CImageHistogramCtrl::ComputeHistogram(CImageEx& image, CImageHistogram::EImageFormat format)
-{
-    m_display->ComputeHistogram((BYTE*)image.GetData(), image.GetWidth(), image.GetHeight(), format);
-}
-
-
-CImageHistogramDisplay::CImageHistogramDisplay(QWidget* parent)
-    : QWidget(parent)
-{
-    m_graphMargin = ImageHistogram::kGraphMargin;
-    m_drawMode = EHistogramDrawMode::Luminosity;
-    m_backColor = ImageHistogram::kBackColor;
-    m_graphHeightPercent = ImageHistogram::kGraphHeightPercent;
-}
-
-CImageHistogramDisplay::~CImageHistogramDisplay()
-{}
-
-void CImageHistogramDisplay::paintEvent([[maybe_unused]] QPaintEvent* event)
-{
-    QPainter painter(this);
-
-    QColor   penColor;
-    QString  str, mode;
-    QRect    rc, rcGraph;
-    QPen     penSpikes;
-    QFont    fnt;
-    QPen     redPen, greenPen, bluePen, alphaPen;
-
-    redPen = QColor(255, 0, 0);
-    greenPen = QColor(0, 255, 0);
-    bluePen = QColor(0, 0, 255);
-    alphaPen = QColor(120, 120, 120);
-
-    rc = rect();
-
-    if (rc.isEmpty())
-    {
-        return;
-    }
-
-    painter.fillRect(rc, m_backColor);
-    penColor = QColor(0, 0, 0);
-
-    switch (m_drawMode)
-    {
-    case EHistogramDrawMode::Luminosity:
-        mode = "Lum";
-        break;
-    case EHistogramDrawMode::OverlappedRGB:
-        mode = "Overlap";
-        break;
-    case EHistogramDrawMode::SplitRGB:
-        mode = "R|G|B";
-        break;
-    case EHistogramDrawMode::RedChannel:
-        mode = "Red";
-        penColor = QColor(255, 0, 0);
-        break;
-    case EHistogramDrawMode::GreenChannel:
-        mode = "Green";
-        penColor = QColor(0, 255, 0);
-        break;
-    case EHistogramDrawMode::BlueChannel:
-        mode = "Blue";
-        penColor = QColor(0, 0, 255);
-        break;
-    case EHistogramDrawMode::AlphaChannel:
-        mode = "Alpha";
-        penColor = QColor(120, 120, 120);
-        break;
-    }
-
-    penSpikes = penColor;
-    painter.setPen(Qt::black);
-    painter.setBrush(Qt::white);
-    rcGraph = QRect(QPoint(m_graphMargin, m_graphMargin), QPoint(abs(rc.width() - m_graphMargin), abs(rc.height() * m_graphHeightPercent)));
-    painter.drawRect(rcGraph);
-    painter.setPen(penSpikes);
-
-    int i = 0;
-    int graphWidth = rcGraph.width() != 0 ? abs(rcGraph.width()) : 1;
-    int graphHeight = abs(rcGraph.height() - 1);
-    int graphBottom = abs(rcGraph.top() + rcGraph.height());
-
-    if (m_drawMode != EHistogramDrawMode::SplitRGB &&
-        m_drawMode != EHistogramDrawMode::OverlappedRGB)
-    {
-        int crtX = 0;
-
-        for (size_t x = 0, xCount = abs(rcGraph.width()); x < xCount; ++x)
-        {
-            float scale = 0;
-
-            i = ((float)x / graphWidth) * (kNumColorLevels - 1);
-            i = CLAMP(i, 0, kNumColorLevels - 1);
-
-            switch (m_drawMode)
-            {
-            case EHistogramDrawMode::Luminosity:
-            {
-                if (m_maxLumCount)
-                {
-                    scale = (float)m_lumCount[i] / m_maxLumCount;
-                }
-                break;
-            }
-
-            case EHistogramDrawMode::RedChannel:
-            {
-                if (m_maxCount[0])
-                {
-                    scale = (float)m_count[0][i] / m_maxCount[0];
-                }
-                break;
-            }
-
-            case EHistogramDrawMode::GreenChannel:
-            {
-                if (m_maxCount[1])
-                {
-                    scale = (float)m_count[1][i] / m_maxCount[1];
-                }
-                break;
-            }
-
-            case EHistogramDrawMode::BlueChannel:
-            {
-                if (m_maxCount[2])
-                {
-                    scale = (float)m_count[2][i] / m_maxCount[2];
-                }
-                break;
-            }
-
-            case EHistogramDrawMode::AlphaChannel:
-            {
-                if (m_maxCount[3])
-                {
-                    scale = (float)m_count[3][i] / m_maxCount[3];
-                }
-                break;
-            }
-            }
-
-            crtX = rcGraph.left() + x + 1;
-            painter.drawLine(crtX, graphBottom, crtX, graphBottom - scale * graphHeight);
-        }
-    }
-    else
-    if (m_drawMode == EHistogramDrawMode::OverlappedRGB)
-    {
-        int lastHeight[kNumChannels] = { INT_MAX, INT_MAX, INT_MAX, INT_MAX };
-        int heightR, heightG, heightB, heightA;
-        float scaleR, scaleG, scaleB, scaleA;
-        UINT crtX, prevX = INT_MAX;
-
-        for (size_t x = 0, xCount = abs(rcGraph.width()); x < xCount; ++x)
-        {
-            i = ((float)x / graphWidth) * (kNumColorLevels - 1);
-            i = CLAMP(i, 0, kNumColorLevels - 1);
-            crtX = rcGraph.left() + x + 1;
-            scaleR = scaleG = scaleB = scaleA = 0;
-
-            if (m_maxCount[0])
-            {
-                scaleR = (float)m_count[0][i] / m_maxCount[0];
-            }
-
-            if (m_maxCount[1])
-            {
-                scaleG = (float)m_count[1][i] / m_maxCount[1];
-            }
-
-            if (m_maxCount[2])
-            {
-                scaleB = (float)m_count[2][i] / m_maxCount[2];
-            }
-
-            if (m_maxCount[3])
-            {
-                scaleA = (float)m_count[3][i] / m_maxCount[3];
-            }
-
-            heightR = graphBottom - scaleR * graphHeight;
-            heightG = graphBottom - scaleG * graphHeight;
-            heightB = graphBottom - scaleB * graphHeight;
-            heightA = graphBottom - scaleA * graphHeight;
-
-            if (lastHeight[0] == INT_MAX)
-            {
-                lastHeight[0] = heightR;
-            }
-
-            if (lastHeight[1] == INT_MAX)
-            {
-                lastHeight[1] = heightG;
-            }
-
-            if (lastHeight[2] == INT_MAX)
-            {
-                lastHeight[2] = heightB;
-            }
-
-            if (lastHeight[3] == INT_MAX)
-            {
-                lastHeight[3] = heightA;
-            }
-
-            if (prevX == INT_MAX)
-            {
-                prevX = crtX;
-            }
-
-            painter.setPen(redPen);
-            painter.drawLine(prevX, lastHeight[0], crtX, heightR);
-
-            painter.setPen(greenPen);
-            painter.drawLine(prevX, lastHeight[1], crtX, heightG);
-
-            painter.setPen(bluePen);
-            painter.drawLine(prevX, lastHeight[2], crtX, heightB);
-
-            painter.setPen(alphaPen);
-            painter.drawLine(prevX, lastHeight[3], crtX, heightA);
-
-            lastHeight[0] = heightR;
-            lastHeight[1] = heightG;
-            lastHeight[2] = heightB;
-            lastHeight[3] = heightA;
-            prevX = crtX;
-        }
-    }
-    else
-    if (m_drawMode == EHistogramDrawMode::SplitRGB)
-    {
-        const float aThird = 1.0f / 3.0f;
-        const int aThirdOfNumColorLevels = kNumColorLevels / 3;
-        const int aThirdOfWidth = rcGraph.width() / 3;
-        QPen pPen;
-        float scale = 0, pos = 0;
-
-        // draw 3 blocks so we can see channel spaces
-        painter.fillRect(QRect(QPoint(rcGraph.left() + 1, rcGraph.top() + 1), QSize(aThirdOfWidth, rcGraph.height() - 2)), ImageHistogram::kRedSectionColor);
-        painter.fillRect(QRect(QPoint(rcGraph.left() + 1 + aThirdOfWidth, rcGraph.top() + 1), QSize(aThirdOfWidth, rcGraph.height() - 2)), ImageHistogram::kGreenSectionColor);
-        painter.fillRect(QRect(QPoint(rcGraph.left() + 1 + aThirdOfWidth * 2, rcGraph.top() + 1), QSize(aThirdOfWidth, rcGraph.height() - 2)), ImageHistogram::kBlueSectionColor);
-
-        // 3 split RGB channel histograms
-        for (size_t x = 0, xCount = abs(rcGraph.width()); x < xCount; ++x)
-        {
-            pos = (float)x / graphWidth;
-            i = (float)((int)(pos * kNumColorLevels) % aThirdOfNumColorLevels) / aThirdOfNumColorLevels * kNumColorLevels;
-            i = CLAMP(i, 0, kNumColorLevels - 1);
-            scale = 0;
-
-            // R
-            if (pos < aThird)
-            {
-                if (m_maxCount[0])
-                {
-                    scale = (float)m_count[0][i] / m_maxCount[0];
-                }
-                pPen = redPen;
-            }
-
-            // G
-            if (pos > aThird && pos < aThird * 2)
-            {
-                if (m_maxCount[1])
-                {
-                    scale = (float) m_count[1][i] / m_maxCount[1];
-                }
-                pPen = greenPen;
-            }
-
-            // B
-            if (pos > aThird * 2)
-            {
-                if (m_maxCount[2])
-                {
-                    scale = (float) m_count[2][i] / m_maxCount[2];
-                }
-                pPen = bluePen;
-            }
-
-            painter.setPen(pPen);
-            painter.drawLine(rcGraph.left() + x + 1, graphBottom, rcGraph.left() + x + 1, graphBottom - scale * graphHeight);
-        }
-
-        // then draw 3 lines so we separate the channels
-        QPen wallPen(ImageHistogram::kSplitSeparatorColor, 1, Qt::DotLine);
-        painter.setPen(wallPen);
-        painter.drawLine(rcGraph.left() + aThirdOfWidth, rcGraph.bottom(), rcGraph.left() + aThirdOfWidth, rcGraph.top());
-        painter.drawLine(rcGraph.left() + aThirdOfWidth * 2, rcGraph.bottom(), rcGraph.left() + aThirdOfWidth * 2, rcGraph.top());
-    }
-
-    QRect rcText;
-    rcText = QRect(QPoint(m_graphMargin, rcGraph.height() + m_graphMargin * 2),
-                   QPoint(rc.width(), rc.height() - m_graphMargin));
-
-    float mean = 0, stdDev = 0, median = 0;
-
-    switch (m_drawMode)
-    {
-    case EHistogramDrawMode::Luminosity:
-    case EHistogramDrawMode::SplitRGB:
-    case EHistogramDrawMode::OverlappedRGB:
-        mean = m_meanAvg;
-        stdDev = m_stdDevAvg;
-        median = m_medianAvg;
-        break;
-    case EHistogramDrawMode::RedChannel:
-        mean = m_mean[0];
-        stdDev = m_stdDev[0];
-        median = m_median[0];
-        break;
-    case EHistogramDrawMode::GreenChannel:
-        mean = m_mean[1];
-        stdDev = m_stdDev[1];
-        median = m_median[1];
-        break;
-    case EHistogramDrawMode::BlueChannel:
-        mean = m_mean[2];
-        stdDev = m_stdDev[2];
-        median = m_median[2];
-        break;
-    case EHistogramDrawMode::AlphaChannel:
-        mean = m_mean[3];
-        stdDev = m_stdDev[3];
-        median = m_median[3];
-        break;
-    }
-
-    str = tr("Mean: %1 StdDev: %2 Median: %3").arg(mean, 0, 'f', 2).arg(stdDev, 0, 'f', 2).arg(median, 0, 'f', 2);
-    fnt = QFont(ImageHistogram::kTextFontFace, ImageHistogram::kTextFontSize / 10);
-    painter.setFont(fnt);
-    painter.setPen(ImageHistogram::kTextColor);
-    painter.drawText(rcText, Qt::AlignCenter | Qt::TextSingleLine, painter.fontMetrics().elidedText(str, Qt::ElideRight, rcText.width(), Qt::TextSingleLine));
-}
-
-CImageHistogramDisplay* CImageHistogramCtrl::histogramDisplay() const
-{
-    return m_display;
-}
-
-#include <Controls/moc_ImageHistogramCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ImageHistogramCtrl.h b/Code/Sandbox/Editor/Controls/ImageHistogramCtrl.h
deleted file mode 100644
index 8a82225dac..0000000000
--- a/Code/Sandbox/Editor/Controls/ImageHistogramCtrl.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_IMAGEHISTOGRAMCTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_IMAGEHISTOGRAMCTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-
-#include "Util/Image.h"
-#include "Util/ImageHistogram.h"
-
-#include <QWidget>
-#endif
-
-class QComboBox;
-class QLabel;
-
-enum class EHistogramDrawMode
-{
-    Luminosity,
-    OverlappedRGB,
-    SplitRGB,
-    RedChannel,
-    GreenChannel,
-    BlueChannel,
-    AlphaChannel
-};
-Q_ENUMS(EHistogramDrawMode)
-Q_DECLARE_METATYPE(EHistogramDrawMode)
-
-
-class SANDBOX_API CImageHistogramDisplay
-    : public QWidget
-    , public CImageHistogram
-{
-    Q_OBJECT
-public:
-    CImageHistogramDisplay(QWidget* parent = nullptr);
-    virtual ~CImageHistogramDisplay();
-
-    void paintEvent(QPaintEvent* event) override;
-
-    EHistogramDrawMode  m_drawMode;
-    int                 m_graphMargin;
-    float               m_graphHeightPercent;
-    QColor              m_backColor;
-};
-
-class SANDBOX_API CImageHistogramCtrl
-    : public QWidget
-{
-    Q_OBJECT
-
-public:
-    CImageHistogramCtrl(QWidget* parent = nullptr);
-    virtual ~CImageHistogramCtrl();
-
-    EHistogramDrawMode drawMode() const;
-    void setDrawMode(EHistogramDrawMode drawMode);
-
-    void ComputeHistogram(CImageEx& img, CImageHistogram::EImageFormat format);
-
-    CImageHistogramDisplay* histogramDisplay() const;
-
-private:
-    CImageHistogramDisplay* m_display;
-    QComboBox*              m_drawMode;
-    QLabel*                 m_infoText;
-};
-
-
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_IMAGEHISTOGRAMCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ImageListCtrl.cpp b/Code/Sandbox/Editor/Controls/ImageListCtrl.cpp
deleted file mode 100644
index e550540697..0000000000
--- a/Code/Sandbox/Editor/Controls/ImageListCtrl.cpp
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ImageListCtrl.h"
-
-// Qt
-#include <QPainter>
-#include <QScrollBar>
-
-//////////////////////////////////////////////////////////////////////////
-CImageListCtrl::CImageListCtrl(QWidget* parent)
-    : QAbstractItemView(parent)
-    , m_itemSize(60, 60)
-    , m_borderSize(4, 4)
-    , m_style(DefaultStyle)
-{
-    setItemDelegate(new QImageListDelegate(this));
-    setAutoFillBackground(false);
-
-    QPalette p = palette();
-    p.setColor(QPalette::Highlight, QColor(255, 55, 50));
-    setPalette(p);
-
-    horizontalScrollBar()->setRange(0, 0);
-    verticalScrollBar()->setRange(0, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CImageListCtrl::~CImageListCtrl()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CImageListCtrl::ListStyle CImageListCtrl::Style() const
-{
-    return m_style;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageListCtrl::SetStyle(ListStyle style)
-{
-    m_style = style;
-    scheduleDelayedItemsLayout();
-}
-
-//////////////////////////////////////////////////////////////////////////
-const QSize& CImageListCtrl::ItemSize() const
-{
-    return m_itemSize;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageListCtrl::SetItemSize(QSize size)
-{
-    Q_ASSERT(size.isValid());
-    m_itemSize = size;
-    scheduleDelayedItemsLayout();
-}
-
-//////////////////////////////////////////////////////////////////////////
-const QSize& CImageListCtrl::BorderSize() const
-{
-    return m_borderSize;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageListCtrl::SetBorderSize(QSize size)
-{
-    Q_ASSERT(size.isValid());
-    m_borderSize = size;
-    scheduleDelayedItemsLayout();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QModelIndexList CImageListCtrl::ItemsInRect(const QRect& rect) const
-{
-    QModelIndexList list;
-
-    if (!model())
-    {
-        return list;
-    }
-
-    QHash<int, QRect>::const_iterator i;
-    QHash<int, QRect>::const_iterator c = m_geometry.cend();
-    for (i = m_geometry.cbegin(); i != c; ++i)
-    {
-        if (i.value().intersects(rect))
-        {
-            list << model()->index(i.key(), 0, rootIndex());
-        }
-    }
-
-    return list;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageListCtrl::paintEvent(QPaintEvent* event)
-{
-    QAbstractItemView::paintEvent(event);
-
-    if (!model())
-    {
-        return;
-    }
-
-    const int rowCount = model()->rowCount();
-
-    if (m_geometry.isEmpty() && rowCount)
-    {
-        updateGeometries();
-    }
-
-    QPainter painter(viewport());
-    painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
-    painter.setBackground(palette().window());
-    painter.setFont(font());
-
-    QStyleOptionViewItem option;
-    option.palette = palette();
-    option.font = font();
-    option.fontMetrics = fontMetrics();
-    option.decorationAlignment = Qt::AlignCenter;
-
-    const QRect visibleRect(QPoint(horizontalOffset(), verticalOffset()), viewport()->contentsRect().size());
-
-    painter.translate(-horizontalOffset(), -verticalOffset());
-
-    for (int r = 0; r < rowCount; ++r)
-    {
-        const QModelIndex& index = model()->index(r, 0, rootIndex());
-
-        option.rect = m_geometry.value(r);
-        if (!option.rect.intersects(visibleRect))
-        {
-            continue;
-        }
-
-        option.state = QStyle::State_None;
-
-        if (selectionModel()->isSelected(index))
-        {
-            option.state |= QStyle::State_Selected;
-        }
-
-        if (currentIndex() == index)
-        {
-            option.state |= QStyle::State_HasFocus;
-        }
-
-        QAbstractItemDelegate* idt = itemDelegate(index);
-        idt->paint(&painter, option, index);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageListCtrl::rowsInserted(const QModelIndex& parent, int start, int end)
-{
-    QAbstractItemView::rowsInserted(parent, start, end);
-
-    if (isVisible())
-    {
-        scheduleDelayedItemsLayout();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageListCtrl::updateGeometries()
-{
-    ClearItemGeometries();
-
-    if (!model())
-    {
-        return;
-    }
-
-    const int rowCount = model()->rowCount();
-
-    const int nPageHorz = viewport()->width();
-    const int nPageVert = viewport()->height();
-
-    if (nPageHorz == 0 || nPageVert == 0 || rowCount <= 0)
-    {
-        return;
-    }
-
-    int x = m_borderSize.width();
-    int y = m_borderSize.height();
-
-    const int nItemWidth = m_itemSize.width() + m_borderSize.width();
-
-    if (m_style == HorizontalStyle)
-    {
-        for (int row = 0; row < rowCount; ++row)
-        {
-            m_geometry.insert(row, QRect(QPoint(x, y), m_itemSize));
-            x += nItemWidth;
-        }
-
-        horizontalScrollBar()->setPageStep(viewport()->width());
-        horizontalScrollBar()->setRange(0, x - viewport()->width());
-    }
-    else
-    {
-        const int nTextHeight = fontMetrics().height();
-        const int nItemHeight = m_itemSize.height() + m_borderSize.height() + nTextHeight;
-
-        int nNumOfHorzItems = nPageHorz / nItemWidth;
-        if (nNumOfHorzItems <= 0)
-        {
-            nNumOfHorzItems = 1;
-        }
-
-        for (int row = 0; row < rowCount; ++row)
-        {
-            m_geometry.insert(row, QRect(QPoint(x, y), m_itemSize));
-
-            if ((row + 1) % nNumOfHorzItems == 0)
-            {
-                y += nItemHeight;
-                x = m_borderSize.width();
-            }
-            else
-            {
-                x += nItemWidth;
-            }
-        }
-
-        verticalScrollBar()->setPageStep(viewport()->height());
-        verticalScrollBar()->setRange(0, (y + nItemHeight) - viewport()->height());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QModelIndex CImageListCtrl::indexAt(const QPoint& point) const
-{
-    if (!model())
-    {
-        return QModelIndex();
-    }
-
-    const QPoint p = point +
-        QPoint(horizontalOffset(), verticalOffset());
-
-    QHash<int, QRect>::const_iterator i;
-    QHash<int, QRect>::const_iterator c = m_geometry.cend();
-    for (i = m_geometry.cbegin(); i != c; ++i)
-    {
-        if (i.value().contains(p))
-        {
-            return model()->index(i.key(), 0, rootIndex());
-        }
-    }
-
-    return QModelIndex();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageListCtrl::scrollTo(const QModelIndex& index, ScrollHint hint)
-{
-    if (!index.isValid())
-    {
-        return;
-    }
-
-    QRect rect = m_geometry.value(index.row());
-
-    switch (hint)
-    {
-    case EnsureVisible:
-        if (horizontalOffset() > rect.right())
-        {
-            horizontalScrollBar()->setValue(rect.left());
-        }
-        else if ((horizontalOffset() + viewport()->width()) < rect.left())
-        {
-            horizontalScrollBar()->setValue(rect.right() - viewport()->width());
-        }
-
-        if (verticalOffset() > rect.bottom())
-        {
-            verticalScrollBar()->setValue(rect.top());
-        }
-        else if ((verticalOffset() + viewport()->height()) < rect.top())
-        {
-            verticalScrollBar()->setValue(rect.bottom() - viewport()->height());
-        }
-        break;
-
-    case PositionAtTop:
-        horizontalScrollBar()->setValue(rect.left());
-        verticalScrollBar()->setValue(rect.top());
-        break;
-
-    case PositionAtBottom:
-        horizontalScrollBar()->setValue(rect.right() - viewport()->width());
-        verticalScrollBar()->setValue(rect.bottom() - viewport()->height());
-        break;
-
-    case PositionAtCenter:
-        horizontalScrollBar()->setValue(rect.center().x() - (viewport()->width() / 2));
-        verticalScrollBar()->setValue(rect.center().y() - (viewport()->height() / 2));
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QRect CImageListCtrl::visualRect(const QModelIndex& index) const
-{
-    if (!index.isValid())
-    {
-        return QRect();
-    }
-
-
-    if (!m_geometry.contains(index.row()))
-    {
-        return QRect();
-    }
-
-    return m_geometry.value(index.row())
-               .translated(-horizontalOffset(), -verticalOffset());
-}
-
-//////////////////////////////////////////////////////////////////////////
-QRect CImageListCtrl::ItemGeometry(const QModelIndex& index) const
-{
-    Q_ASSERT(index.model() == model());
-    Q_ASSERT(m_geometry.contains(index.row()));
-
-    return m_geometry.value(index.row());
-}
-
-void CImageListCtrl::SetItemGeometry(const QModelIndex& index, const QRect& rect)
-{
-    Q_ASSERT(index.model() == model());
-    m_geometry.insert(index.row(), rect);
-    update(rect);
-}
-
-void CImageListCtrl::ClearItemGeometries()
-{
-    m_geometry.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CImageListCtrl::horizontalOffset() const
-{
-    return horizontalScrollBar()->value();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CImageListCtrl::verticalOffset() const
-{
-    return verticalScrollBar()->value();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageListCtrl::isIndexHidden([[maybe_unused]] const QModelIndex& index) const
-{
-    return false; /* not supported */
-}
-
-//////////////////////////////////////////////////////////////////////////
-QModelIndex CImageListCtrl::moveCursor(CursorAction cursorAction, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
-{
-    if (!model())
-    {
-        return QModelIndex();
-    }
-
-    const int rowCount = model()->rowCount();
-
-    if (0 == rowCount)
-    {
-        return QModelIndex();
-    }
-
-    switch (cursorAction)
-    {
-    case MoveHome:
-        return model()->index(0, 0, rootIndex());
-
-    case MoveEnd:
-        return model()->index(rowCount - 1, 0, rootIndex());
-
-    case MovePrevious:
-    {
-        QModelIndex current = currentIndex();
-        if (current.isValid())
-        {
-            return model()->index((current.row() - 1) % rowCount, 0, rootIndex());
-        }
-    } break;
-
-    case MoveNext:
-    {
-        QModelIndex current = currentIndex();
-        if (current.isValid())
-        {
-            return model()->index((current.row() + 1) % rowCount, 0, rootIndex());
-        }
-    } break;
-
-    case MoveUp:
-    case MoveDown:
-    case MoveLeft:
-    case MoveRight:
-    case MovePageUp:
-    case MovePageDown:
-        /* TODO */
-        break;
-    }
-    return QModelIndex();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageListCtrl::setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags)
-{
-    if (!model())
-    {
-        return;
-    }
-
-    const QRect lrect =
-        rect.translated(horizontalOffset(), verticalOffset());
-
-    QHash<int, QRect>::const_iterator i;
-    QHash<int, QRect>::const_iterator c = m_geometry.cend();
-    for (i = m_geometry.cbegin(); i != c; ++i)
-    {
-        if (i.value().intersects(lrect))
-        {
-            selectionModel()->select(model()->index(i.key(), 0, rootIndex()), flags);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QRegion CImageListCtrl::visualRegionForSelection(const QItemSelection& selection) const
-{
-    QRegion region;
-
-    foreach(const QModelIndex &index, selection.indexes())
-    {
-        region += visualRect(index);
-    }
-
-    return region;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QImageListDelegate::QImageListDelegate(QObject* parent)
-    : QAbstractItemDelegate(parent)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QImageListDelegate::paint(QPainter* painter,
-    const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-    painter->save();
-
-    painter->setFont(option.font);
-
-    if (option.rect.isValid())
-    {
-        painter->setClipRect(option.rect);
-    }
-
-    QRect innerRect = option.rect.adjusted(1, 1, -1, -1);
-
-    QRect textRect(innerRect.left(), innerRect.bottom() - option.fontMetrics.height(),
-        innerRect.width(), option.fontMetrics.height() + 1);
-
-    /* fill item background */
-
-    painter->fillRect(option.rect, option.palette.color(QPalette::Base));
-
-    /* draw image */
-
-    if (index.data(Qt::DecorationRole).isValid())
-    {
-        const QPixmap& p = index.data(Qt::DecorationRole).value<QPixmap>();
-        if (p.isNull() || p.size() == QSize(1, 1))
-        {
-            emit InvalidPixmapGenerated(index);
-        }
-        else
-        {
-            painter->drawPixmap(innerRect, p);
-        }
-    }
-
-    /* draw text */
-
-    const QColor trColor = option.palette.color(QPalette::Shadow);
-    painter->fillRect(textRect, (option.state & QStyle::State_Selected) ?
-        trColor.lighter() : trColor);
-
-    if (option.state & QStyle::State_Selected)
-    {
-        painter->setPen(QPen(option.palette.color(QPalette::HighlightedText)));
-
-        QFont f = painter->font();
-        f.setBold(true);
-        painter->setFont(f);
-    }
-    else
-    {
-        painter->setPen(QPen(option.palette.color(QPalette::Text)));
-    }
-
-    painter->drawText(textRect, index.data(Qt::DisplayRole).toString(),
-        QTextOption(option.decorationAlignment));
-
-    painter->setPen(QPen(option.palette.color(QPalette::Shadow)));
-    painter->drawRect(textRect);
-
-    /* draw border */
-
-    if (option.state & QStyle::State_Selected)
-    {
-        QPen pen(option.palette.color(QPalette::Highlight));
-        pen.setWidth(2);
-        painter->setPen(pen);
-        painter->drawRect(innerRect);
-    }
-    else
-    {
-        painter->setPen(QPen(option.palette.color(QPalette::Shadow)));
-        painter->drawRect(option.rect);
-    }
-
-    if (option.state & QStyle::State_HasFocus)
-    {
-        QPen pen(Qt::DotLine);
-        pen.setColor(option.palette.color(QPalette::AlternateBase));
-        painter->setPen(pen);
-        painter->drawRect(option.rect);
-    }
-
-    painter->restore();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QSize QImageListDelegate::sizeHint(const QStyleOptionViewItem& option,
-    [[maybe_unused]] const QModelIndex& index) const
-{
-    return option.rect.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QVector<int> QImageListDelegate::paintingRoles() const
-{
-    return QVector<int>() << Qt::DecorationRole << Qt::DisplayRole;
-}
-
-#include <Controls/moc_ImageListCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ImageListCtrl.h b/Code/Sandbox/Editor/Controls/ImageListCtrl.h
deleted file mode 100644
index e62eea98be..0000000000
--- a/Code/Sandbox/Editor/Controls/ImageListCtrl.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_IMAGELISTCTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_IMAGELISTCTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QAbstractItemView>
-
-#include <QHash>
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Custom control to display list of images.
-//////////////////////////////////////////////////////////////////////////
-class CImageListCtrl
-    : public QAbstractItemView
-{
-    Q_OBJECT
-public:
-    enum ListStyle
-    {
-        DefaultStyle,
-        HorizontalStyle
-    };
-
-public:
-    CImageListCtrl(QWidget* parent = nullptr);
-    ~CImageListCtrl();
-
-    ListStyle Style() const;
-    void SetStyle(ListStyle style);
-
-    const QSize& ItemSize() const;
-    void SetItemSize(QSize size);
-
-    const QSize& BorderSize() const;
-    void SetBorderSize(QSize size);
-
-    // Get all items inside specified rectangle.
-    QModelIndexList ItemsInRect(const QRect& rect) const;
-
-    QModelIndex indexAt(const QPoint& point) const override;
-    void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible) override;
-    QRect visualRect(const QModelIndex& index) const override;
-
-protected:
-    QRect ItemGeometry(const QModelIndex& index) const;
-    void SetItemGeometry(const QModelIndex& index, const QRect& rect);
-    void ClearItemGeometries();
-
-    int horizontalOffset() const override;
-    int verticalOffset() const override;
-    bool isIndexHidden(const QModelIndex& index) const override;
-    QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override;
-    void setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags) override;
-    QRegion visualRegionForSelection(const QItemSelection& selection) const override;
-
-    void paintEvent(QPaintEvent* event) override;
-    void rowsInserted(const QModelIndex& parent, int start, int end) override;
-
-    void updateGeometries() override;
-
-private:
-    QHash<int, QRect> m_geometry;
-    QSize m_itemSize;
-    QSize m_borderSize;
-    ListStyle m_style;
-};
-
-class QImageListDelegate
-    : public QAbstractItemDelegate
-{
-    Q_OBJECT
-signals:
-    void InvalidPixmapGenerated(const QModelIndex& index) const;
-public:
-    QImageListDelegate(QObject* parent = nullptr);
-
-    void paint(QPainter* painter,
-        const QStyleOptionViewItem& option,
-        const QModelIndex& index) const override;
-
-    QSize sizeHint(const QStyleOptionViewItem& option,
-        const QModelIndex& index) const override;
-
-    QVector<int> paintingRoles() const override;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_IMAGELISTCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/MultiMonHelper.cpp b/Code/Sandbox/Editor/Controls/MultiMonHelper.cpp
deleted file mode 100644
index e093012488..0000000000
--- a/Code/Sandbox/Editor/Controls/MultiMonHelper.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "MultiMonHelper.h"
-
-// Qt
-#include <QScreen>
-
-////////////////////////////////////////////////////////////////////////////
-void ClipOrCenterRectToMonitor(QRect *prc, const UINT flags)
-{
-    const QScreen* currentScreen = nullptr;
-    QRect rc;
-
-    Q_ASSERT(prc);
-
-    const auto screens = qApp->screens();
-    for (auto screen : screens)
-    {
-        if (screen->geometry().contains(prc->center()))
-        {
-            currentScreen = screen;
-            break;
-        }
-    }
-
-    if (!currentScreen)
-    {
-        return;
-    }
-
-    const int w = prc->width();
-    const int h = prc->height();
-
-    if (flags & MONITOR_WORKAREA)
-    {
-        rc = currentScreen->availableGeometry();
-    }
-    else
-    {
-        rc = currentScreen->geometry();
-    }
-
-    // center or clip the passed rect to the monitor rect
-    if (flags & MONITOR_CENTER)
-    {
-        prc->setLeft(rc.left() + (rc.right()  - rc.left() - w) / 2);
-        prc->setTop(rc.top() + (rc.bottom() - rc.top() - h) / 2);
-        prc->setRight(prc->left() + w);
-        prc->setBottom(prc->top() + h);
-    }
-    else
-    {
-        prc->setLeft(qMax(rc.left(), qMin(rc.right() - w, prc->left())));
-        prc->setTop(qMax(rc.top(), qMin(rc.bottom() - h, prc->top())));
-        prc->setRight(prc->left() + w);
-        prc->setBottom(prc->top() + h);
-    }
-}
diff --git a/Code/Sandbox/Editor/Controls/MultiMonHelper.h b/Code/Sandbox/Editor/Controls/MultiMonHelper.h
deleted file mode 100644
index 1ff360cd72..0000000000
--- a/Code/Sandbox/Editor/Controls/MultiMonHelper.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_MULTIMONHELPER_H
-#define CRYINCLUDE_EDITOR_CONTROLS_MULTIMONHELPER_H
-#pragma once
-
-// Taken from: http://msdn.microsoft.com/en-us/library/dd162826(v=vs.85).aspx
-#define MONITOR_CENTER   0x0001        // center rect to monitor
-#define MONITOR_CLIP     0x0000        // clip rect to monitor
-#define MONITOR_WORKAREA 0x0002        // use monitor work area
-#define MONITOR_AREA     0x0000        // use monitor entire area
-
-//
-//  ClipOrCenterRectToMonitor
-//
-//  The most common problem apps have when running on a
-//  multimonitor system is that they "clip" or "pin" windows
-//  based on the SM_CXSCREEN and SM_CYSCREEN system metrics.
-//  Because of app compatibility reasons these system metrics
-//  return the size of the primary monitor.
-//
-//  This shows how you use the multi-monitor functions
-//  to do the same thing.
-//
-// params:
-// prc : pointer to QRect to modify
-// flags : some combination of the MONITOR_* flags above
-//
-// example:
-//
-//  ClipOrCenterRectToMonitor(&aRect, MONITOR_CLIP | MONITOR_WORKAREA);
-//
-//  Takes parameter pointer to RECT "aRect" and flags MONITOR_CLIP | MONITOR_WORKAREA
-//      This will modify aRect without resizing it so that it remains within the on-screen boundaries.
-void ClipOrCenterRectToMonitor(QRect *prc, const UINT flags);
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_MULTIMONHELPER_H
diff --git a/Code/Sandbox/Editor/Controls/NumberCtrl.cpp b/Code/Sandbox/Editor/Controls/NumberCtrl.cpp
deleted file mode 100644
index 90a6027424..0000000000
--- a/Code/Sandbox/Editor/Controls/NumberCtrl.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "NumberCtrl.h"
-
-
-QNumberCtrl::QNumberCtrl(QWidget* parent)
-    : QDoubleSpinBox(parent)
-    , m_bMouseDown(false)
-    , m_bDragged(false)
-    , m_bUndoEnabled(false)
-    , m_prevValue(0)
-{
-    connect(this, &QAbstractSpinBox::editingFinished, this, &QNumberCtrl::onEditingFinished);
-}
-
-void QNumberCtrl::changeEvent(QEvent* event)
-{
-    if (event->type() == QEvent::EnabledChange)
-    {
-        setButtonSymbols(isEnabled() ? UpDownArrows : NoButtons);
-    }
-
-    QDoubleSpinBox::changeEvent(event);
-}
-
-
-void QNumberCtrl::SetRange(double newMin, double newMax)
-{
-    // Avoid setting this value if its close to the current value, because otherwise qt will pump events into the queue to redraw/etc.
-    if ( (!AZ::IsClose(this->minimum(), newMin, DBL_EPSILON)) || (!AZ::IsClose(this->maximum(), newMax, DBL_EPSILON)) )
-    {
-        setRange(newMin, newMax);
-    }
-}
-
-
-void QNumberCtrl::mousePressEvent(QMouseEvent* event)
-{
-    if (event->button() == Qt::LeftButton)
-    {
-        emit mousePressed();
-
-        m_bMouseDown = true;
-        m_bDragged = false;
-        m_mousePos = event->pos();
-
-        if (m_bUndoEnabled && !CUndo::IsRecording())
-        {
-            GetIEditor()->BeginUndo();
-        }
-
-        emit dragStarted();
-
-        grabMouse();
-    }
-
-    QDoubleSpinBox::mousePressEvent(event);
-}
-
-void QNumberCtrl::mouseReleaseEvent(QMouseEvent* event)
-{
-    QDoubleSpinBox::mouseReleaseEvent(event);
-
-    if (event->button() == Qt::LeftButton)
-    {
-        m_bMouseDown = m_bDragged = false;
-
-        emit valueUpdated();
-        emit valueChanged();
-
-        if (m_bUndoEnabled && CUndo::IsRecording())
-        {
-            GetIEditor()->AcceptUndo(m_undoText);
-        }
-
-        emit dragFinished();
-
-        releaseMouse();
-
-        m_prevValue = value();
-
-        emit mouseReleased();
-    }
-}
-
-void QNumberCtrl::mouseMoveEvent(QMouseEvent* event)
-{
-    QDoubleSpinBox::mousePressEvent(event);
-
-    if (m_bMouseDown)
-    {
-        m_bDragged = true;
-
-        int dy = event->pos().y() - m_mousePos.y();
-        setValue(value() - singleStep() * dy);
-
-        emit valueUpdated();
-
-        m_mousePos = event->pos();
-    }
-}
-
-void QNumberCtrl::EnableUndo(const QString& undoText)
-{
-    m_undoText = undoText;
-    m_bUndoEnabled = true;
-}
-
-void QNumberCtrl::focusInEvent(QFocusEvent* event)
-{
-    m_prevValue = value();
-    QDoubleSpinBox::focusInEvent(event);
-}
-
-void QNumberCtrl::onEditingFinished()
-{
-    bool undo = m_bUndoEnabled && !CUndo::IsRecording() && m_prevValue != value();
-    if (undo)
-    {
-        GetIEditor()->BeginUndo();
-    }
-
-    emit valueUpdated();
-    emit valueChanged();
-
-    if (undo)
-    {
-        GetIEditor()->AcceptUndo(m_undoText);
-    }
-
-    m_prevValue = value();
-}
-
-#include <Controls/moc_NumberCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/NumberCtrl.h b/Code/Sandbox/Editor/Controls/NumberCtrl.h
deleted file mode 100644
index 7383a348d0..0000000000
--- a/Code/Sandbox/Editor/Controls/NumberCtrl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_NUMBERCTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_NUMBERCTRL_H
-#pragma once
-
-// NumberCtrl.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include <QDoubleSpinBox>
-#endif
-
-class QNumberCtrl
-    : public QDoubleSpinBox
-{
-    Q_OBJECT
-
-public:
-    QNumberCtrl(QWidget* parent = nullptr);
-
-    bool IsDragging() const { return m_bDragged; }
-
-    //! If called will enable undo with given text when control is modified.
-    void EnableUndo(const QString& undoText);
-    void SetRange(double newMin, double maxRange);
-
-Q_SIGNALS:
-    void dragStarted();
-    void dragFinished();
-
-    void valueUpdated();
-    void valueChanged();
-
-    void mouseReleased();
-    void mousePressed();
-
-protected:
-    void changeEvent(QEvent* event) override;
-    void focusInEvent(QFocusEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-
-private:
-    void onEditingFinished();
-    void onValueChanged(double d);
-
-    bool m_bMouseDown;
-    bool m_bDragged;
-    QPoint m_mousePos;
-    bool m_bUndoEnabled;
-    double m_prevValue;
-    QString m_undoText;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_NUMBERCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.cpp b/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.cpp
deleted file mode 100644
index cc4cfe45ab..0000000000
--- a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "QBitmapPreviewDialog.h"
-#include <Controls/ui_QBitmapPreviewDialog.h>
-
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QPainter>
-#include <QScreen>
-
-void QBitmapPreviewDialog::ImageData::setRgba8888(const void* buffer, const int& w, const int& h)
-{
-    const unsigned long bytes = w * h * 4;
-    m_buffer.resize(bytes);
-    memcpy(m_buffer.data(), buffer, bytes);
-    m_image = QImage((uchar*)m_buffer.constData(), w, h, QImage::Format::Format_RGBA8888);
-}
-
-static void fillChecker(int w, int h, unsigned int* dst)
-{
-    for (int y = 0; y < h; y++)
-    {
-        for (int x = 0; x < w; x++)
-        {
-            dst[y * w + x] = 0xFF000000 | (((x >> 2) + (y >> 2)) % 2 == 0 ? 0x007F7F7F : 0x00000000);
-        }
-    }
-}
-
-QBitmapPreviewDialog::QBitmapPreviewDialog(QWidget* parent)
-    : QWidget(parent)
-    , ui(new Ui::QBitmapTooltip)
-{
-    ui->setupUi(this);
-    setAttribute(Qt::WA_TranslucentBackground);
-    setAttribute(Qt::WA_ShowWithoutActivating);
-
-    // Clear label text
-    ui->m_placeholderBitmap->setText("");
-    ui->m_placeholderHistogram->setText("");
-
-    ui->m_bitmapSize->setProperty("tableRow", "Odd");
-    ui->m_Mips->setProperty("tableRow", "Even");
-    ui->m_Mean->setProperty("tableRow", "Odd");
-    ui->m_StdDev->setProperty("tableRow", "Even");
-    ui->m_Median->setProperty("tableRow", "Odd");
-    ui->m_labelForBitmapSize->setProperty("tooltipLabel", "content");
-    ui->m_labelForMean->setProperty("tooltipLabel", "content");
-    ui->m_labelForMedian->setProperty("tooltipLabel", "content");
-    ui->m_labelForMips->setProperty("tooltipLabel", "content");
-    ui->m_labelForStdDev->setProperty("tooltipLabel", "content");
-    ui->m_vBitmapSize->setProperty("tooltipLabel", "content");
-    ui->m_vMean->setProperty("tooltipLabel", "content");
-    ui->m_vMedian->setProperty("tooltipLabel", "content");
-    ui->m_vMips->setProperty("tooltipLabel", "content");
-    ui->m_vStdDev->setProperty("tooltipLabel", "content");
-
-    // Initialize placeholder images
-    const int w = 64;
-    const int h = 64;
-    QByteArray buffer;
-    buffer.resize(w * h * 4);
-    unsigned int* dst = (unsigned int*)buffer.data();
-    fillChecker(w, h, dst);
-    m_checker.setRgba8888(buffer.constData(), w, h);
-
-    m_initialSize = window()->window()->geometry().size();
-}
-
-QBitmapPreviewDialog::~QBitmapPreviewDialog()
-{
-    delete ui;
-}
-
-void QBitmapPreviewDialog::setImageRgba8888(const void* buffer, const int& w, const int& h, [[maybe_unused]] const QString& info)
-{
-    m_imageMain.setRgba8888(buffer, w, h);
-}
-
-
-QRect QBitmapPreviewDialog::getHistogramArea()
-{
-    return QRect(ui->m_placeholderHistogram->pos(), ui->m_placeholderHistogram->size());
-}
-
-void QBitmapPreviewDialog::setFullSize(const bool& fullSize)
-{
-    if (fullSize)
-    {
-        QSize desktop = QApplication::screenAt(ui->m_placeholderBitmap->pos())->availableGeometry().size();
-        QSize image = m_imageMain.m_image.size();
-        QPoint location = mapToGlobal(ui->m_placeholderBitmap->pos());
-        QSize finalSize;
-        finalSize.setWidth((image.width() < (desktop.width() - location.x())) ? image.width() : (desktop.width() - location.x()));
-        finalSize.setHeight((image.height() < (desktop.height() - location.y())) ? image.height() : (desktop.height() - location.y()));
-        float scale = (finalSize.width() < finalSize.height()) ? finalSize.width() / float(m_imageMain.m_image.width()) : finalSize.height() / float(m_imageMain.m_image.height());
-        ui->m_placeholderBitmap->setFixedSize(scale * m_imageMain.m_image.size());
-    }
-    else
-    {
-        ui->m_placeholderBitmap->setFixedSize(256, 256);
-    }
-
-    adjustSize();
-
-    update();
-}
-
-void QBitmapPreviewDialog::paintEvent(QPaintEvent* e)
-{
-    QWidget::paintEvent(e);
-    QRect rect(ui->m_placeholderBitmap->pos(), ui->m_placeholderBitmap->size());
-    drawImageData(rect, m_imageMain);
-}
-
-void QBitmapPreviewDialog::drawImageData(const QRect& rect, const ImageData& imgData)
-{
-    // Draw the
-    QPainter p(this);
-    p.drawImage(rect.topLeft(), m_checker.m_image.scaled(rect.size()));
-    p.drawImage(rect.topLeft(), imgData.m_image.scaled(rect.size()));
-
-    // Draw border
-    QPen pen;
-    pen.setColor(QColor(0, 0, 0));
-    p.drawRect(rect.top(), rect.left(), rect.width() - 1, rect.height());
-}
-
-void QBitmapPreviewDialog::setSize(QString _value)
-{
-    ui->m_vBitmapSize->setText(_value);
-}
-
-void QBitmapPreviewDialog::setMips(QString _value)
-{
-    ui->m_vMips->setText(_value);
-}
-
-void QBitmapPreviewDialog::setMean(QString _value)
-{
-    ui->m_vMean->setText(_value);
-}
-
-void QBitmapPreviewDialog::setMedian(QString _value)
-{
-    ui->m_vMedian->setText(_value);
-}
-
-void QBitmapPreviewDialog::setStdDev(QString _value)
-{
-    ui->m_vStdDev->setText(_value);
-}
-
-QSize QBitmapPreviewDialog::GetCurrentBitmapSize()
-{
-    return ui->m_placeholderBitmap->size();
-}
-
-QSize QBitmapPreviewDialog::GetOriginalImageSize()
-{
-    return m_imageMain.m_image.size();
-}
-
-
-#include <Controls/moc_QBitmapPreviewDialog.cpp>
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.h b/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.h
deleted file mode 100644
index a77c755ec8..0000000000
--- a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef QBITMAPPREVIEWDIALOG_H
-#define QBITMAPPREVIEWDIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <QPixmap>
-#include <QImage>
-#endif
-
-class QLabel;
-
-namespace Ui {
-    class QBitmapTooltip;
-}
-
-class QBitmapPreviewDialog
-    : public QWidget
-{
-    Q_OBJECT
-
-    struct ImageData
-    {
-        QByteArray  m_buffer;
-        QImage      m_image;
-
-        void setRgba8888(const void* buffer, const int& w, const int& h);
-    };
-
-public:
-    explicit QBitmapPreviewDialog(QWidget* parent = 0);
-    virtual ~QBitmapPreviewDialog();
-    QSize GetCurrentBitmapSize();
-    QSize GetOriginalImageSize();
-
-protected:
-    void setImageRgba8888(const void* buffer, const int& w, const int& h, const QString& info);
-    void setSize(QString _value);
-    void setMips(QString _value);
-    void setMean(QString _value);
-    void setMedian(QString _value);
-    void setStdDev(QString _value);
-    QRect getHistogramArea();
-    void setFullSize(const bool& fullSize);
-
-    void paintEvent(QPaintEvent* e) override;
-
-private:
-    void drawImageData(const QRect& rect, const ImageData& imgData);
-
-protected:
-    Ui::QBitmapTooltip* ui;
-    QSize       m_initialSize;
-    ImageData   m_checker;
-    ImageData   m_imageMain;
-};
-
-#endif // QBITMAPPREVIEWDIALOG_H
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.cpp b/Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.cpp
deleted file mode 100644
index 36502f21e6..0000000000
--- a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "QBitmapPreviewDialogImp.h"
-
-// Cry
-#include <ITexture.h>
-
-// EditorCore
-#include <Util/Image.h>
-#include <Include/IImageUtil.h>
-
-// QT
-AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: class '...' needs to have dll-interface to be used by clients of class '...'
-#include <QEvent>
-#include <QKeyEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <qmath.h>
-AZ_POP_DISABLE_WARNING
-
-#include <Controls/ui_QBitmapPreviewDialog.h>
-
-static const int kDefaultWidth  = 256;
-static const int kDefaultHeight = 256;
-
-QBitmapPreviewDialogImp::QBitmapPreviewDialogImp(QWidget* parent)
-    : QBitmapPreviewDialog(parent)
-    , m_image(new CImageEx())
-    , m_showOriginalSize(false)
-    , m_showMode(ESHOW_RGB)
-    , m_histrogramMode(eHistogramMode_OverlappedRGB)
-{
-    setMouseTracking(true);
-    setImage("");
-    ui->m_placeholderBitmap->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
-    ui->m_placeholderHistogram->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
-
-    ui->m_labelForBitmapSize->setProperty("tooltipLabel", "Content");
-    ui->m_labelForMean->setProperty("tooltipLabel", "Content");
-    ui->m_labelForMedian->setProperty("tooltipLabel", "Content");
-    ui->m_labelForMips->setProperty("tooltipLabel", "Content");
-    ui->m_labelForStdDev->setProperty("tooltipLabel", "Content");
-
-    ui->m_vBitmapSize->setProperty("tooltipLabel", "Content");
-    ui->m_vMean->setProperty("tooltipLabel", "Content");
-    ui->m_vMedian->setProperty("tooltipLabel", "Content");
-    ui->m_vMips->setProperty("tooltipLabel", "Content");
-    ui->m_vStdDev->setProperty("tooltipLabel", "Content");
-
-    setUIStyleMode(EUISTYLE_IMAGE_ONLY);
-}
-
-QBitmapPreviewDialogImp::~QBitmapPreviewDialogImp()
-{
-    SAFE_DELETE(m_image);
-}
-
-void QBitmapPreviewDialogImp::setImage(const QString path)
-{
-    if (path.isEmpty()
-        ||  m_path == path
-        ||  !GetIEditor()->GetImageUtil()->LoadImage(path.toUtf8().data(), *m_image))
-    {
-        return;
-    }
-    
-    m_showOriginalSize = isSizeSmallerThanDefault();
-    m_path = path;
-    refreshData();
-}
-
-void QBitmapPreviewDialogImp::setShowMode(EShowMode mode)
-{
-    if (mode == ESHOW_NumModes)
-    {
-        return;
-    }
-
-    m_showMode = mode;
-    refreshData();
-    update();
-}
-
-void QBitmapPreviewDialogImp::toggleShowMode()
-{
-    m_showMode = (EShowMode)(((int)m_showMode + 1) % ESHOW_NumModes);
-    refreshData();
-    update();
-}
-
-void QBitmapPreviewDialogImp::setUIStyleMode(EUIStyle mode)
-{
-    if (mode >= EUISTYLE_NumModes)
-    {
-        return;
-    }
-
-    m_uiStyle = mode;
-    if (m_uiStyle == EUISTYLE_IMAGE_ONLY)
-    {
-        ui->m_placeholderHistogram->hide();
-
-        ui->m_labelForBitmapSize->hide();
-        ui->m_labelForMean->hide();
-        ui->m_labelForMedian->hide();
-        ui->m_labelForMips->hide();
-        ui->m_labelForStdDev->hide();
-
-        ui->m_vBitmapSize->hide();
-        ui->m_vMean->hide();
-        ui->m_vMedian->hide();
-        ui->m_vMips->hide();
-        ui->m_vStdDev->hide();
-    }
-    else
-    {
-        ui->m_placeholderHistogram->show();
-
-        ui->m_labelForBitmapSize->show();
-        ui->m_labelForMean->show();
-        ui->m_labelForMedian->show();
-        ui->m_labelForMips->show();
-        ui->m_labelForStdDev->show();
-
-        ui->m_vBitmapSize->show();
-        ui->m_vMean->show();
-        ui->m_vMedian->show();
-        ui->m_vMips->show();
-        ui->m_vStdDev->show();
-    }
-}
-
-const QBitmapPreviewDialogImp::EShowMode& QBitmapPreviewDialogImp::getShowMode() const
-{
-    return m_showMode;
-}
-
-void QBitmapPreviewDialogImp::setHistogramMode(EHistogramMode mode)
-{
-    if (mode == eHistogramMode_NumModes)
-    {
-        return;
-    }
-
-    m_histrogramMode = mode;
-}
-
-void QBitmapPreviewDialogImp::toggleHistrogramMode()
-{
-    m_histrogramMode = (EHistogramMode)(((int)m_histrogramMode + 1) % eHistogramMode_NumModes);
-    update();
-}
-
-const QBitmapPreviewDialogImp::EHistogramMode& QBitmapPreviewDialogImp::getHistogramMode() const
-{
-    return m_histrogramMode;
-}
-
-void QBitmapPreviewDialogImp::toggleOriginalSize()
-{
-    m_showOriginalSize = !m_showOriginalSize;
-
-    refreshData();
-    update();
-}
-
-bool QBitmapPreviewDialogImp::isSizeSmallerThanDefault()
-{
-    return m_image->GetWidth() < kDefaultWidth && m_image->GetHeight() < kDefaultHeight;
-}
-
-void QBitmapPreviewDialogImp::setOriginalSize(bool value)
-{
-    m_showOriginalSize = value;
-
-    refreshData();
-    update();
-}
-
-
-const char* QBitmapPreviewDialogImp::GetShowModeDescription(EShowMode eShowMode, [[maybe_unused]] bool bShowInOriginalSize) const
-{
-    switch (eShowMode)
-    {
-    case ESHOW_RGB:
-        return "RGB";
-    case ESHOW_RGB_ALPHA:
-        return "RGB+A";
-    case ESHOW_ALPHA:
-        return "Alpha";
-    case ESHOW_RGBA:
-        return "RGBA";
-    case ESHOW_RGBE:
-        return "RGBExp";
-    }
-
-    return "";
-}
-
-const char* getHistrogramModeStr(QBitmapPreviewDialogImp::EHistogramMode mode, bool shortName)
-{
-    switch (mode)
-    {
-    case QBitmapPreviewDialogImp::eHistogramMode_Luminosity:
-        return shortName ? "Lum" : "Luminosity";
-    case QBitmapPreviewDialogImp::eHistogramMode_OverlappedRGB:
-        return shortName ? "Overlap" : "Overlapped RGBA";
-    case QBitmapPreviewDialogImp::eHistogramMode_SplitRGB:
-        return shortName ? "R|G|B" : "Split RGB";
-    case QBitmapPreviewDialogImp::eHistogramMode_RedChannel:
-        return shortName ? "Red" : "Red Channel";
-    case QBitmapPreviewDialogImp::eHistogramMode_GreenChannel:
-        return shortName ? "Green" : "Green Channel";
-    case QBitmapPreviewDialogImp::eHistogramMode_BlueChannel:
-        return shortName ? "Blue" : "Blue Channel";
-    case QBitmapPreviewDialogImp::eHistogramMode_AlphaChannel:
-        return shortName ? "Alpha" : "Alpha Channel";
-    default:
-        break;
-    }
-
-    return "";
-}
-
-void QBitmapPreviewDialogImp::refreshData()
-{
-    // Check if we have some usefull data loaded
-    if (m_image->GetWidth() * m_image->GetHeight() == 0)
-    {
-        return;
-    }
-
-    int w = m_image->GetWidth();
-    int h = m_image->GetHeight();
-
-    int multiplier = (m_showMode == ESHOW_RGB_ALPHA ? 2 : 1);
-    int originalW = w * multiplier;
-    int originalH = h;
-
-    if (!m_showOriginalSize || (w == 0))
-    {
-        w = kDefaultWidth;
-    }
-    if (!m_showOriginalSize || (h == 0))
-    {
-        h = kDefaultHeight;
-    }
-
-    w *= multiplier;
-
-    CImageEx scaledImage;
-
-    if (m_showOriginalSize && (originalW < w))
-    {
-        w = originalW;
-    }
-    if (m_showOriginalSize && (originalH < h))
-    {
-        h = originalH;
-    }
-
-    scaledImage.Allocate(w, h);
-
-    if (m_showMode == ESHOW_RGB_ALPHA)
-    {
-        GetIEditor()->GetImageUtil()->ScaleToDoubleFit(*m_image, scaledImage);
-    }
-    else
-    {
-        GetIEditor()->GetImageUtil()->ScaleToFit(*m_image, scaledImage);
-    }
-
-    if (m_showMode == ESHOW_RGB || m_showMode == ESHOW_RGBE)
-    {
-        scaledImage.FillAlpha();
-    }
-    else if (m_showMode == ESHOW_ALPHA)
-    {
-        for (int h2 = 0; h2 < scaledImage.GetHeight(); h2++)
-        {
-            for (int w2 = 0; w2 < scaledImage.GetWidth(); w2++)
-            {
-                int a = scaledImage.ValueAt(w2, h2) >> 24;
-                scaledImage.ValueAt(w2, h2) = RGB(a, a, a) | (a << 24);
-            }
-        }
-    }
-    else if (m_showMode == ESHOW_RGB_ALPHA)
-    {
-        int halfWidth = scaledImage.GetWidth() / 2;
-        for (int h2 = 0; h2 < scaledImage.GetHeight(); h2++)
-        {
-            for (int w2 = 0; w2 < halfWidth; w2++)
-            {
-                int r = GetRValue(scaledImage.ValueAt(w2, h2));
-                int g = GetGValue(scaledImage.ValueAt(w2, h2));
-                int b = GetBValue(scaledImage.ValueAt(w2, h2));
-                int a = scaledImage.ValueAt(w2, h2) >> 24;
-                scaledImage.ValueAt(w2, h2) = RGB(r, g, b) | (a << 24);
-                scaledImage.ValueAt(w2 + halfWidth, h2) = RGB(a, a, a) | (a << 24);
-            }
-        }
-    }
-
-
-    setImageRgba8888(scaledImage.GetData(), w, h, "");
-    setSize(QString().asprintf("%d x %d", m_image->GetWidth(), m_image->GetHeight()));
-    setMips(QString().asprintf("%d", m_image->GetNumberOfMipMaps()));
-
-    setFullSize(m_showOriginalSize);
-
-    // Compute histogram
-    m_histogram.ComputeHistogram((BYTE*)scaledImage.GetData(), w, h, CImageHistogram::eImageFormat_32BPP_RGBA);
-}
-
-void QBitmapPreviewDialogImp::paintEvent(QPaintEvent* e)
-{
-    QBitmapPreviewDialog::paintEvent(e);
-
-    //if showing original size hide other information so it's easier to see
-    if (m_showOriginalSize)
-    {
-        return;
-    }
-    if (m_uiStyle == EUISTYLE_IMAGE_ONLY)
-    {
-        return;
-    }
-
-    QPainter p(this);
-    QPen pen;
-    QPainterPath path[4];
-
-    // Fill background color
-    QRect histogramRect = getHistogramArea();
-    p.fillRect(histogramRect, QColor(255, 255, 255));
-
-    // Draw borders
-    pen.setColor(QColor(0, 0, 0));
-    p.setPen(pen);
-    p.drawRect(histogramRect);
-
-    // Draw histogram
-
-    QVector<int> drawChannels;
-
-    switch (m_histrogramMode)
-    {
-    case eHistogramMode_Luminosity:
-        drawChannels.push_back(3);
-        break;
-    case eHistogramMode_SplitRGB:
-        drawChannels.push_back(0);
-        drawChannels.push_back(1);
-        drawChannels.push_back(2);
-        break;
-    case eHistogramMode_OverlappedRGB:
-        drawChannels.push_back(0);
-        drawChannels.push_back(1);
-        drawChannels.push_back(2);
-        break;
-    case eHistogramMode_RedChannel:
-        drawChannels.push_back(0);
-        break;
-    case eHistogramMode_GreenChannel:
-        drawChannels.push_back(1);
-        break;
-    case eHistogramMode_BlueChannel:
-        drawChannels.push_back(2);
-        break;
-    case eHistogramMode_AlphaChannel:
-        drawChannels.push_back(3);
-        break;
-    }
-
-    int graphWidth =  qMax(histogramRect.width(), 1);
-    int graphHeight = qMax(histogramRect.height() - 2, 0);
-    int graphBottom = histogramRect.bottom() + 1;
-    int currX[4] = {0, 0, 0, 0};
-    int prevX[4] = {0, 0, 0, 0};
-    float scale = 0.0f;
-    static const int numSubGraphs = 3;
-    const int subGraph = qCeil(graphWidth / numSubGraphs);
-
-    // Fill background for Split RGB histogram
-    if (m_histrogramMode == eHistogramMode_SplitRGB)
-    {
-        const static QColor backgroundColor[numSubGraphs] =
-        {
-            QColor(255, 220, 220),
-            QColor(220, 255, 220),
-            QColor(220, 220, 255)
-        };
-
-        for (int i = 0; i < numSubGraphs; i++)
-        {
-            p.fillRect(histogramRect.left() + subGraph * i,
-                histogramRect.top(),
-                subGraph + (i == numSubGraphs - 1 ? 1 : 0),
-                histogramRect.height(), backgroundColor[i]);
-        }
-    }
-
-    int lastHeight[CImageHistogram::kNumChannels] = { INT_MAX, INT_MAX, INT_MAX, INT_MAX };
-
-    for (int x = 0; x < graphWidth; ++x)
-    {
-        for (int j = 0; j < drawChannels.size(); j++)
-        {
-            const int c = drawChannels[j];
-            int& curr_x = currX[c];
-            int& prev_x = prevX[c];
-            int& last_height = lastHeight[c];
-            QPainterPath& curr_path = path[c];
-
-
-            curr_x = histogramRect.left() + x + 1;
-            int i = ((float)x / (graphWidth - 1)) * (CImageHistogram::kNumColorLevels - 1);
-            if (m_histrogramMode == eHistogramMode_SplitRGB)
-            {
-                // Filter out to area which we are interested
-                const int k = x / subGraph;
-                if (k != c)
-                {
-                    continue;
-                }
-
-                i = qCeil((i - (subGraph * c)) * numSubGraphs);
-                i = qMin(i, CImageHistogram::kNumColorLevels - 1);
-                i = qMax(i, 0);
-            }
-
-            if (m_histrogramMode == eHistogramMode_Luminosity)
-            {
-                scale = (float)m_histogram.m_lumCount[i] / m_histogram.m_maxLumCount;
-            }
-            else if (m_histogram.m_maxCount[c])
-            {
-                scale = (float)m_histogram.m_count[c][i] / m_histogram.m_maxCount[c];
-            }
-
-            int height = graphBottom - graphHeight * scale;
-            if (last_height == INT_MAX)
-            {
-                last_height = height;
-            }
-
-            curr_path.moveTo(prev_x, last_height);
-            curr_path.lineTo(curr_x, height);
-            last_height = height;
-
-            if (prev_x == INT_MAX)
-            {
-                prev_x = curr_x;
-            }
-
-            prev_x = curr_x;
-        }
-    }
-
-    static const QColor kChannelColor[4] =
-    {
-        QColor(255, 0, 0),
-        QColor(0, 255, 0),
-        QColor(0, 0, 255),
-        QColor(120, 120, 120)
-    };
-
-    for (int i = 0; i < drawChannels.size(); i++)
-    {
-        const int c = drawChannels[i];
-        pen.setColor(kChannelColor[c]);
-        p.setPen(pen);
-        p.drawPath(path[c]);
-    }
-
-    // Update histogram info
-    {
-        float mean = 0, stdDev = 0, median = 0;
-
-        switch (m_histrogramMode)
-        {
-        case eHistogramMode_Luminosity:
-        case eHistogramMode_SplitRGB:
-        case eHistogramMode_OverlappedRGB:
-            mean = m_histogram.m_meanAvg;
-            stdDev = m_histogram.m_stdDevAvg;
-            median = m_histogram.m_medianAvg;
-            break;
-        case eHistogramMode_RedChannel:
-            mean = m_histogram.m_mean[0];
-            stdDev = m_histogram.m_stdDev[0];
-            median = m_histogram.m_median[0];
-            break;
-        case eHistogramMode_GreenChannel:
-            mean = m_histogram.m_mean[1];
-            stdDev = m_histogram.m_stdDev[1];
-            median = m_histogram.m_median[1];
-            break;
-        case eHistogramMode_BlueChannel:
-            mean = m_histogram.m_mean[2];
-            stdDev = m_histogram.m_stdDev[2];
-            median = m_histogram.m_median[2];
-            break;
-        case eHistogramMode_AlphaChannel:
-            mean = m_histogram.m_mean[3];
-            stdDev = m_histogram.m_stdDev[3];
-            median = m_histogram.m_median[3];
-            break;
-        }
-        QString val;
-        val.setNum(mean);
-        setMean(val);
-        val.setNum(stdDev);
-        setStdDev(val);
-        val.setNum(median);
-        setMedian(val);
-    }
-}
-
-#include <Controls/moc_QBitmapPreviewDialogImp.cpp>
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.h b/Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.h
deleted file mode 100644
index 47039a7694..0000000000
--- a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef QBITMAPPREVIEWDIALOG_IMP_H
-#define QBITMAPPREVIEWDIALOG_IMP_H
-
-#if !defined(Q_MOC_RUN)
-#include "QBitmapPreviewDialog.h"
-#include <Util/ImageHistogram.h>
-#endif
-
-class CImageEx;
-
-class QBitmapPreviewDialogImp
-    : public QBitmapPreviewDialog
-{
-    Q_OBJECT;
-public:
-
-    enum EUIStyle
-    {
-        EUISTYLE_IMAGE_ONLY,
-        EUISTYLE_IMAGE_HISTOGRAM,
-        EUISTYLE_NumModes
-    };
-
-    enum EShowMode
-    {
-        ESHOW_RGB = 0,
-        ESHOW_ALPHA,
-        ESHOW_RGBA,
-        ESHOW_RGB_ALPHA,
-        ESHOW_RGBE,
-        ESHOW_NumModes,
-    };
-
-    enum EHistogramMode
-    {
-        eHistogramMode_Luminosity,
-        eHistogramMode_OverlappedRGB,
-        eHistogramMode_SplitRGB,
-        eHistogramMode_RedChannel,
-        eHistogramMode_GreenChannel,
-        eHistogramMode_BlueChannel,
-        eHistogramMode_AlphaChannel,
-        eHistogramMode_NumModes,
-    };
-
-    explicit QBitmapPreviewDialogImp(QWidget* parent = 0);
-    virtual ~QBitmapPreviewDialogImp();
-
-    void setImage(const QString path);
-
-    void setShowMode(EShowMode mode);
-    void toggleShowMode();
-    void setUIStyleMode(EUIStyle mode);
-    const EShowMode& getShowMode() const;
-
-    void setHistogramMode(EHistogramMode mode);
-    void toggleHistrogramMode();
-    const EHistogramMode& getHistogramMode() const;
-
-    void setOriginalSize(bool value);
-    void toggleOriginalSize();
-
-    bool isSizeSmallerThanDefault();
-    void paintEvent(QPaintEvent* e) override;
-
-protected:
-    void refreshData();
-
-private:
-    const char* GetShowModeDescription(EShowMode eShowMode, bool bShowInOriginalSize) const;
-
-private:
-    CImageEx*       m_image;
-    QString         m_path;
-    CImageHistogram m_histogram;
-    bool            m_showOriginalSize;
-    EShowMode       m_showMode;
-    EHistogramMode  m_histrogramMode;
-    EUIStyle        m_uiStyle;
-};
-
-#endif // QBITMAPPREVIEWDIALOG_IMP_H
diff --git a/Code/Sandbox/Editor/Controls/QToolTipWidget.cpp b/Code/Sandbox/Editor/Controls/QToolTipWidget.cpp
deleted file mode 100644
index 166f2bf1fa..0000000000
--- a/Code/Sandbox/Editor/Controls/QToolTipWidget.cpp
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include <Controls/QToolTipWidget.h>
-
-#include "QBitmapPreviewDialogImp.h"
-#include "qcoreapplication.h"
-#include "qguiapplication.h"
-#include "qapplication.h"
-#include <QDesktopWidget>
-#include <QPainter>
-#include <QtGlobal>
-#include <qgraphicseffect.h>
-
-void QToolTipWidget::RebuildLayout()
-{
-    if (m_title != nullptr)
-    {
-        m_title->hide();
-    }
-    if (m_content != nullptr)
-    {
-        m_content->hide();
-    }
-    if (m_specialContent != nullptr)
-    {
-        m_specialContent->hide();
-    }
-
-    //empty layout
-    while (m_layout->count() > 0)
-    {
-        m_layout->takeAt(0);
-    }
-    qDeleteAll(m_currentShortcuts);
-    m_currentShortcuts.clear();
-    if (m_includeTextureShortcuts)
-    {
-        m_currentShortcuts.append(new QLabel(tr("Alt - Alpha"), this));
-        m_currentShortcuts.back()->setProperty("tooltipLabel", "Shortcut");
-        m_currentShortcuts.append(new QLabel(tr("Shift - RGBA"), this));
-        m_currentShortcuts.back()->setProperty("tooltipLabel", "Shortcut");
-    }
-
-    if (m_title != nullptr && !m_title->text().isEmpty())
-    {
-        m_layout->addWidget(m_title);
-        m_title->show();
-    }
-
-    for (QLabel* var : m_currentShortcuts)
-    {
-        if (var != nullptr)
-        {
-            m_layout->addWidget(var);
-            var->show();
-        }
-    }
-    if (m_specialContent != nullptr)
-    {
-        m_layout->addWidget(m_specialContent);
-        m_specialContent->show();
-    }
-    if (m_content != nullptr && !m_content->text().isEmpty())
-    {
-        m_layout->addWidget(m_content);
-        m_content->show();
-    }
-    m_background->adjustSize();
-    adjustSize();
-}
-
-void QToolTipWidget::Hide()
-{
-    m_currentShortcuts.clear();
-    hide();
-}
-
-void QToolTipWidget::Show(QPoint pos, ArrowDirection dir)
-{
-    if (!IsValid())
-    {
-        return;
-    }
-    m_arrow->m_direction = dir;
-    pos = AdjustTipPosByArrowSize(pos, dir);
-    m_normalPos = pos;
-    move(pos);
-    RebuildLayout();
-    show();
-    m_arrow->show();
-}
-
-void QToolTipWidget::Display(QRect targetRect, ArrowDirection preferredArrowDir)
-{
-    if (!IsValid())
-    {
-        return;
-    }
-
-    KeepTipOnScreen(targetRect, preferredArrowDir);
-
-    RebuildLayout();
-    show();
-    m_arrow->show();
-}
-
-void QToolTipWidget::TryDisplay(QPoint mousePos, const QRect& rect, [[maybe_unused]] ArrowDirection preferredArrowDir)
-{
-    if (rect.contains(mousePos))
-    {
-        Display(rect, QToolTipWidget::ArrowDirection::ARROW_RIGHT);
-    }
-    else
-    {
-        hide();
-    }
-   }
-
-void QToolTipWidget::TryDisplay(QPoint mousePos, const QWidget* widget, ArrowDirection preferredArrowDir)
-{
-    const QRect rect(widget->mapToGlobal(QPoint(0,0)), widget->size());
-    TryDisplay(mousePos, rect, preferredArrowDir);
-}
-
-void QToolTipWidget::SetTitle(QString title)
-{
-    if (!title.isEmpty())
-    {
-        m_title->setText(title);
-    }
-    m_title->setProperty("tooltipLabel", "Title");
-
-    setWindowTitle("ToolTip - " + title);
-}
-
-void QToolTipWidget::SetContent(QString content)
-{
-    m_content->setWordWrap(true);
-
-    m_content->setProperty("tooltipLabel", "Content");
-    //line-height is not supported via stylesheet so we use the html rich-text subset in QT for it.
-    m_content->setText(QString("<span style=\"line-height: 14px;\">%1</span>").arg(content));
-}
-
-void QToolTipWidget::AppendContent(QString content)
-{
-    m_content->setText(m_content->text() + "\n\n" + content);
-    update();
-    RebuildLayout();
-    m_content->update();
-    m_content->repaint();
-}
-
-QToolTipWidget::QToolTipWidget(QWidget* parent)
-    : QWidget(parent)
-{
-    m_background = new QWidget(this);
-    m_background->setProperty("tooltip", "Background");
-    m_background->stackUnder(this);
-    m_title = new QLabel(this);
-    m_currentShortcuts = QVector<QLabel*>();
-    m_content = new QLabel(this);
-    m_specialContent = nullptr;
-    setWindowTitle("ToolTip");
-    setObjectName("ToolTip");
-    m_layout = new QVBoxLayout(this);
-    m_normalPos = QPoint(0, 0);
-    m_arrow = new QArrow(m_background);
-    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
-    m_arrow->setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
-    m_arrow->setAttribute(Qt::WA_TranslucentBackground, true);
-    m_background->setLayout(m_layout);
-    m_arrow->setObjectName("ToolTipArrow");
-    m_background->setObjectName("ToolTipBackground");
-
-    //we need a drop shadow for the background
-    QGraphicsDropShadowEffect* dropShadow = new QGraphicsDropShadowEffect(this);
-    dropShadow->setBlurRadius(m_shadowRadius);
-    dropShadow->setColor(Qt::black);
-    dropShadow->setOffset(0);
-    dropShadow->setEnabled(true);
-    m_background->setGraphicsEffect(dropShadow);
-    //we need a second drop shadow effect for the arrow
-    dropShadow = new QGraphicsDropShadowEffect(m_arrow);
-    dropShadow->setBlurRadius(m_shadowRadius);
-    dropShadow->setColor(Qt::black);
-    dropShadow->setOffset(0);
-    dropShadow->setEnabled(true);
-    m_arrow->setGraphicsEffect(dropShadow);
-}
-
-QToolTipWidget::~QToolTipWidget()
-{
-}
-
-void QToolTipWidget::AddSpecialContent(QString type, QString dataStream)
-{
-    if (type.isEmpty())
-    {
-        m_includeTextureShortcuts = false;
-        if (m_specialContent != nullptr)
-        {
-            delete m_specialContent;
-            m_specialContent = nullptr;
-        }
-        return;
-    }
-    if (type == "TEXTURE")
-    {
-        if (m_specialContent == nullptr)
-        {
-            QCoreApplication::instance()->installEventFilter(this); //grab the event filter while displaying the advanced texture tooltip
-            m_specialContent = new QBitmapPreviewDialogImp(this);
-        }
-        QString path(dataStream);
-        qobject_cast<QBitmapPreviewDialogImp*>(m_specialContent)->setImage(path);
-        // set default showmode to RGB
-        qobject_cast<QBitmapPreviewDialogImp*>(m_specialContent)->setShowMode(QBitmapPreviewDialogImp::EShowMode::ESHOW_RGB);
-        QString dir = (path.split("/").count() > path.split("\\").count()) ? path.split("/").back() : path.split("\\").back();
-        SetTitle(dir);
-        //always use default size but not image size
-        qobject_cast<QBitmapPreviewDialogImp*>(m_specialContent)->setOriginalSize(false);
-        m_includeTextureShortcuts = true;
-    }
-    else if (type == "ADD TO CONTENT")
-    {
-        AppendContent(dataStream);
-
-        m_includeTextureShortcuts = false;
-        if (m_specialContent != nullptr)
-        {
-            delete m_specialContent;
-            m_specialContent = nullptr;
-        }
-    }
-    else if (type == "REPLACE TITLE")
-    {
-        SetTitle(dataStream);
-        m_includeTextureShortcuts = false;
-        if (m_specialContent != nullptr)
-        {
-            delete m_specialContent;
-            m_specialContent = nullptr;
-        }
-    }
-    else if (type == "REPLACE CONTENT")
-    {
-        SetContent(dataStream);
-        m_includeTextureShortcuts = false;
-        if (m_specialContent != nullptr)
-        {
-            delete m_specialContent;
-            m_specialContent = nullptr;
-        }
-    }
-    else
-    {
-        m_includeTextureShortcuts = false;
-        if (m_specialContent != nullptr)
-        {
-            delete m_specialContent;
-            m_specialContent = nullptr;
-        }
-        return;
-    }
-
-    m_special = type;
-}
-
-
-bool QToolTipWidget::eventFilter(QObject* obj, QEvent* event)
-{
-    if (event->type() == QEvent::KeyPress)
-    {
-        if (m_special == "TEXTURE" && m_specialContent != nullptr)
-        {
-            const QKeyEvent* ke = static_cast<QKeyEvent*>(event);
-            Qt::KeyboardModifiers mods = ke->modifiers();
-            if (mods & Qt::KeyboardModifier::AltModifier)
-            {
-                ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_ALPHA);
-            }
-            else if (mods & Qt::KeyboardModifier::ShiftModifier && !(mods & Qt::KeyboardModifier::ControlModifier))
-            {
-                ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_RGBA);
-            }            
-        }
-    }
-    if (event->type() == QEvent::KeyRelease)
-    {
-        if (m_special == "TEXTURE" && m_specialContent != nullptr)
-        {
-            const QKeyEvent* ke = static_cast<QKeyEvent*>(event);
-            Qt::KeyboardModifiers mods = ke->modifiers();
-            if (!(mods& Qt::KeyboardModifier::AltModifier) && !(mods & Qt::KeyboardModifier::ShiftModifier))
-            {
-                ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_RGB);
-            }            
-        }
-    }
-    return QWidget::eventFilter(obj, event);
-}
-
-void QToolTipWidget::hideEvent(QHideEvent* event)
-{
-    QWidget::hideEvent(event);
-    m_arrow->hide();
-}
-
-void QToolTipWidget::UpdateOptionalData(QString optionalData)
-{
-    AddSpecialContent(m_special, optionalData);
-}
-
-
-
-QPoint QToolTipWidget::AdjustTipPosByArrowSize(QPoint pos, ArrowDirection dir)
-{
-    switch (dir)
-    {
-    case QToolTipWidget::ArrowDirection::ARROW_UP:
-    {
-        m_arrow->move(pos);
-        pos.setY(pos.y() + 10);
-        m_arrow->setFixedSize(20, 10);
-        pos -= QPoint(m_shadowRadius, m_shadowRadius);
-        break;
-    }
-    case QToolTipWidget::ArrowDirection::ARROW_LEFT:
-    {
-        m_arrow->move(pos);
-        pos.setX(pos.x() + 10);
-        m_arrow->setFixedSize(10, 20);
-        pos -= QPoint(m_shadowRadius, m_shadowRadius);
-        break;
-    }
-    case QToolTipWidget::ArrowDirection::ARROW_RIGHT:
-    {
-        pos.setX(pos.x() - 10);
-        m_arrow->move(QPoint(pos.x() + width(), pos.y()));
-        m_arrow->setFixedSize(10, 20);
-        pos -= QPoint(-m_shadowRadius, m_shadowRadius);
-        break;
-    }
-    case QToolTipWidget::ArrowDirection::ARROW_DOWN:
-    {
-        pos.setY(pos.y() - 10);
-        m_arrow->move(QPoint(pos.x(), pos.y() + height()));
-        m_arrow->setFixedSize(20, 10);
-        pos -= QPoint(m_shadowRadius, -m_shadowRadius);
-        break;
-    }
-    default:
-        m_arrow->move(-10, -10);
-        break;
-    }
-    return pos;
-}
-
-bool QToolTipWidget::IsValid()
-{
-    if (m_title->text().isEmpty() ||
-        (m_content->text().isEmpty() && m_specialContent == nullptr))
-    {
-        return false;
-    }
-    return true;
-}
-
-void QToolTipWidget::KeepTipOnScreen(QRect targetRect, ArrowDirection preferredArrowDir)
-{
-    QRect desktop = QApplication::desktop()->availableGeometry(this);
-
-    if (this->isHidden())
-    {
-        setAttribute(Qt::WA_DontShowOnScreen, true);
-        Show(QPoint(0, 0), preferredArrowDir);
-        hide();
-        setAttribute(Qt::WA_DontShowOnScreen, false);
-    }
-    //else assume the size is right
-
-    //calculate initial rect
-    QRect tipRect = QRect(0, 0, 0, 0);
-    switch (preferredArrowDir)
-    {
-    case QToolTipWidget::ArrowDirection::ARROW_UP:
-    {
-        //tip is below the widget with a left alignment
-        tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.bottomLeft(), preferredArrowDir));
-        break;
-    }
-    case QToolTipWidget::ArrowDirection::ARROW_LEFT:
-    {
-        //tip is on the right with the top being even
-        tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), preferredArrowDir));
-        break;
-    }
-    case QToolTipWidget::ArrowDirection::ARROW_RIGHT:
-    {
-        //tip is on the left with the top being even
-        tipRect.setY(targetRect.top());
-        tipRect.setX(targetRect.left() - width());
-        tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), preferredArrowDir));
-        break;
-    }
-    case QToolTipWidget::ArrowDirection::ARROW_DOWN:
-    {
-        //tip is above the widget with a left alignment
-        tipRect.setX(targetRect.left());
-        tipRect.setY(targetRect.top() - height());
-        tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), preferredArrowDir));
-        break;
-    }
-    default:
-    {
-        //tip is on the right with the top being even
-        preferredArrowDir = QToolTipWidget::ArrowDirection::ARROW_LEFT;
-        tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), QToolTipWidget::ArrowDirection::ARROW_LEFT));
-        break;
-    }
-    }
-    tipRect.setSize(size());
-
-    //FixPositioning
-    if (preferredArrowDir == ArrowDirection::ARROW_LEFT || preferredArrowDir == ArrowDirection::ARROW_RIGHT)
-    {
-        if (tipRect.left() <= desktop.left())
-        {
-            m_arrow->m_direction = ArrowDirection::ARROW_LEFT;
-            tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), m_arrow->m_direction));
-        }
-        else if (tipRect.right() >= desktop.right())
-        {
-            m_arrow->m_direction = ArrowDirection::ARROW_RIGHT;
-            tipRect.setLeft(targetRect.left() - width());
-            tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), m_arrow->m_direction));
-        }
-    }
-    else if (preferredArrowDir == ArrowDirection::ARROW_UP || preferredArrowDir == ArrowDirection::ARROW_DOWN)
-    {
-        if (tipRect.top() <= desktop.top())
-        {
-            m_arrow->m_direction = ArrowDirection::ARROW_UP;
-            tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.bottomLeft(), m_arrow->m_direction));
-        }
-        else if (tipRect.bottom() >= desktop.bottom())
-        {
-            m_arrow->m_direction = ArrowDirection::ARROW_DOWN;
-            tipRect.setY(targetRect.top() - height());
-            tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), m_arrow->m_direction));
-        }
-    }
-
-    //Nudge tip without arrow
-    if (preferredArrowDir == ArrowDirection::ARROW_UP || preferredArrowDir == ArrowDirection::ARROW_DOWN)
-    {
-        if (tipRect.left() <= desktop.left())
-        {
-            tipRect.setLeft(desktop.left());
-        }
-        else if (tipRect.right() >= desktop.right())
-        {
-            tipRect.setLeft(desktop.right() - width());
-        }
-    }
-    else if (preferredArrowDir == ArrowDirection::ARROW_RIGHT || preferredArrowDir == ArrowDirection::ARROW_LEFT)
-    {
-        if (tipRect.top() <= desktop.top())
-        {
-            tipRect.setTop(desktop.top());
-        }
-        else if (tipRect.bottom() >= desktop.bottom())
-        {
-            tipRect.setTop(desktop.bottom() - height());
-        }
-    }
-
-
-    m_normalPos = tipRect.topLeft();
-    move(m_normalPos);
-}
-
-QPolygonF QToolTipWidget::QArrow::CreateArrow()
-{
-    QVector<QPointF> vertex;
-    //3 points in triangle
-    vertex.reserve(3);
-    //all magic number below are given in order to draw smooth transitions between tooltip and arrow
-    if (m_direction == ArrowDirection::ARROW_UP)
-    {
-        vertex.push_back(QPointF(10, 1));
-        vertex.push_back(QPointF(19, 10));
-        vertex.push_back(QPointF(0, 10));
-    }
-    else if (m_direction == ArrowDirection::ARROW_RIGHT)
-    {
-        vertex.push_back(QPointF(9, 10));
-        vertex.push_back(QPointF(0, 19));
-        vertex.push_back(QPointF(0, 1));
-    }
-    else if (m_direction == ArrowDirection::ARROW_LEFT)
-    {
-        vertex.push_back(QPointF(1, 10));
-        vertex.push_back(QPointF(10, 19));
-        vertex.push_back(QPointF(10, 0));
-    }
-    else //ArrowDirection::ARROW_DOWN
-    {
-        vertex.push_back(QPointF(10, 10));
-        vertex.push_back(QPointF(19, 0));
-        vertex.push_back(QPointF(0, 0));
-    }
-    return QPolygonF(vertex);
-}
-
-void QToolTipWidget::QArrow::paintEvent([[maybe_unused]] QPaintEvent* event)
-{
-    QColor color(255, 255, 255, 255);
-    QPainter painter(this);
-    painter.fillRect(rect(), Qt::transparent); //force transparency
-    painter.setRenderHint(QPainter::Antialiasing, false);
-    painter.setBrush(color);
-    painter.setPen(Qt::NoPen);
-    painter.drawPolygon(CreateArrow());
-    //painter.setRenderHint(QPainter::Antialiasing, false);
-}
-
-QToolTipWrapper::QToolTipWrapper(QWidget* parent)
-    : QObject(parent)
-{
-}
-
-void QToolTipWrapper::SetTitle(QString title)
-{
-    m_title = title;
-}
-
-void QToolTipWrapper::SetContent(QString content)
-{
-    AddSpecialContent("REPLACE CONTENT", content);
-}
-
-void QToolTipWrapper::AppendContent(QString content)
-{
-    AddSpecialContent("ADD TO CONTENT", content);
-}
-
-void QToolTipWrapper::AddSpecialContent(QString type, QString dataStream)
-{
-    if (type == "REPLACE CONTENT")
-    {
-        m_contentOperations.clear();
-    }
-    m_contentOperations.push_back({type, dataStream});
-}
-
-void QToolTipWrapper::UpdateOptionalData(QString optionalData)
-{
-    m_contentOperations.push_back({"UPDATE OPTIONAL", optionalData});
-}
-
-void QToolTipWrapper::Display(QRect targetRect, QToolTipWidget::ArrowDirection preferredArrowDir)
-{
-    GetOrCreateToolTip()->Display(targetRect, preferredArrowDir);
-}
-
-void QToolTipWrapper::TryDisplay(QPoint mousePos, const QWidget * widget, QToolTipWidget::ArrowDirection preferredArrowDir)
-{
-    GetOrCreateToolTip()->TryDisplay(mousePos, widget, preferredArrowDir);
-}
-
-void QToolTipWrapper::TryDisplay(QPoint mousePos, const QRect & widget, QToolTipWidget::ArrowDirection preferredArrowDir)
-{
-    GetOrCreateToolTip()->TryDisplay(mousePos, widget, preferredArrowDir);
-}
-
-void QToolTipWrapper::hide()
-{
-    DestroyToolTip();
-}
-
-void QToolTipWrapper::show()
-{
-    GetOrCreateToolTip()->show();
-}
-
-bool QToolTipWrapper::isVisible() const
-{
-    return m_actualTooltip && m_actualTooltip->isVisible();
-}
-
-void QToolTipWrapper::update()
-{
-    if (m_actualTooltip)
-    {
-        m_actualTooltip->update();
-    }
-}
-
-void QToolTipWrapper::ReplayContentOperations(QToolTipWidget* tooltipWidget)
-{
-    tooltipWidget->SetTitle(m_title);
-    for (const auto& operation : m_contentOperations)
-    {
-        if (operation.first == "UPDATE OPTIONAL")
-        {
-            tooltipWidget->UpdateOptionalData(operation.second);
-        }
-        else
-        {
-            tooltipWidget->AddSpecialContent(operation.first, operation.second);
-        }
-    }
-}
-
-QToolTipWidget * QToolTipWrapper::GetOrCreateToolTip()
-{
-    if (!m_actualTooltip)
-    {
-        QToolTipWidget* tooltipWidget = new QToolTipWidget(static_cast<QWidget*>(parent()));
-        tooltipWidget->setAttribute(Qt::WA_DeleteOnClose);
-        ReplayContentOperations(tooltipWidget);
-        m_actualTooltip = tooltipWidget;
-    }
-    return m_actualTooltip.data();
-}
-
-void QToolTipWrapper::DestroyToolTip()
-{
-    if (m_actualTooltip)
-    {
-        m_actualTooltip->deleteLater();
-    }
-}
diff --git a/Code/Sandbox/Editor/Controls/QToolTipWidget.h b/Code/Sandbox/Editor/Controls/QToolTipWidget.h
deleted file mode 100644
index 1142b85ad4..0000000000
--- a/Code/Sandbox/Editor/Controls/QToolTipWidget.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef QToolTipWidget_h__
-#define QToolTipWidget_h__
-
-#include "EditorCoreAPI.h"
-
-#include <QPointer>
-#include <QWidget>
-#include <QLabel>
-#include <QString>
-#include <QMap>
-#include <QMapIterator>
-#include <QVector>
-#include <QVBoxLayout>
-
-#include <memory>
-
-class IQToolTip
-{
-public:
-    virtual void SetTitle(QString title) = 0;
-    virtual void SetContent(QString content) = 0;
-    virtual void AppendContent(QString content) = 0;
-    virtual void AddSpecialContent(QString type, QString dataStream) = 0;
-    virtual void UpdateOptionalData(QString optionalData) = 0;
-};
-
-class EDITOR_CORE_API QToolTipWidget
-    : public QWidget
-    , public IQToolTip
-{
-public:
-    enum class ArrowDirection
-    {
-        ARROW_UP,
-        ARROW_LEFT,
-        ARROW_RIGHT,
-        ARROW_DOWN
-    };
-    class QArrow
-        : public QWidget
-    {
-    public:
-        ArrowDirection m_direction;
-        QPoint m_pos;
-        QArrow(QWidget* parent)
-            : QWidget(parent){ setWindowFlags(Qt::ToolTip); }
-        virtual ~QArrow(){}
-
-        QPolygonF CreateArrow();
-        virtual void paintEvent(QPaintEvent*) override;
-    };
-    QToolTipWidget(QWidget* parent);
-    ~QToolTipWidget();
-    void SetTitle(QString title) override;
-    void SetContent(QString content) override;
-    void AppendContent(QString content) override;
-    void AddSpecialContent(QString type, QString dataStream) override;
-    void UpdateOptionalData(QString optionalData) override;
-    void Display(QRect targetRect, ArrowDirection preferredArrowDir);
-
-    //! Displays the tooltip on the given widget, only if the mouse is over it.
-    void TryDisplay(QPoint mousePos, const QWidget* widget, ArrowDirection preferredArrowDir);
-
-    //! Displays the tooltip on the given rect, only if the mouse is over it.
-    void TryDisplay(QPoint mousePos, const QRect& widget, ArrowDirection preferredArrowDir);
-
-    void Hide();
-    
-protected:
-    void Show(QPoint pos, ArrowDirection dir);
-    bool IsValid();
-    void KeepTipOnScreen(QRect targetRect, ArrowDirection preferredArrowDir);
-    QPoint AdjustTipPosByArrowSize(QPoint pos, ArrowDirection dir);
-    virtual bool eventFilter(QObject* obj, QEvent* event) override;
-    void RebuildLayout();
-    virtual void hideEvent(QHideEvent*) override;
-
-    QLabel* m_title;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QVector<QLabel*> m_currentShortcuts;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //can be anything from QLabel to QBitMapPreviewDialog
-    //must allow movement, and show/hide calls
-    QLabel* m_content;
-    QWidget* m_specialContent;
-    QWidget* m_background;
-    QVBoxLayout* m_layout;
-    QString m_special;
-    QPoint m_normalPos;
-    QArrow* m_arrow;
-    const int m_shadowRadius = 5;
-    bool m_includeTextureShortcuts; //added since Qt does not support modifier only shortcuts
-};
-
-// HACK: The EditorUI_QT classes all were keeping persistent references to QToolTipWidgets around
-// This led to many, many top-level widget creations, which led to many platform-side window allocations
-// which led to crashes in Qt5.15. As this is legacy code, this is a drop-in replacement that only
-// allocates the actual QToolTipWidget (and thus platform window) while the tooltip is visible
-class EDITOR_CORE_API QToolTipWrapper
-    : public QObject
-    , public IQToolTip
-{
-public:
-    QToolTipWrapper(QWidget* parent);
-
-    void SetTitle(QString title) override;
-    void SetContent(QString content) override;
-    void AppendContent(QString content) override;
-    void AddSpecialContent(QString type, QString dataStream) override;
-    void UpdateOptionalData(QString optionalData) override;
-
-    void Display(QRect targetRect, QToolTipWidget::ArrowDirection preferredArrowDir);
-    void TryDisplay(QPoint mousePos, const QWidget* widget, QToolTipWidget::ArrowDirection preferredArrowDir);
-    void TryDisplay(QPoint mousePos, const QRect& widget, QToolTipWidget::ArrowDirection preferredArrowDir);
-    void hide();
-    void show();
-    bool isVisible() const;
-    void update();
-    void repaint(){update();} //Things really shouldn't be calling repaint on these...
-
-    void Hide(){hide();}
-    void close(){hide();}
-
-private:
-    void ReplayContentOperations(QToolTipWidget* tooltipWidget);
-
-    QToolTipWidget* GetOrCreateToolTip();
-    void DestroyToolTip();
-
-    AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // conditional expression is constant, needs to have dll-interface to be used by clients of class 'AzQtComponents::FilteredSearchWidget'
-        QPointer<QToolTipWidget> m_actualTooltip;
-    AZ_POP_DISABLE_WARNING
-
-    QString m_title;
-    AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // conditional expression is constant, needs to have dll-interface to be used by clients of class 'AzQtComponents::FilteredSearchWidget'
-        QVector<QPair<QString, QString>> m_contentOperations;
-    AZ_POP_DISABLE_WARNING
-};
-
-
-#endif // QToolTipWidget_h__
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
deleted file mode 100644
index 094d546c44..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "PropertyAnimationCtrl.h"
-
-// Qt
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QToolButton>
-
-// Editor
-#include "Util/UIEnumerations.h"
-#include "IResourceSelectorHost.h"
-
-AnimationPropertyCtrl::AnimationPropertyCtrl(QWidget *pParent)
-    : QWidget(pParent)
-{
-    m_animationLabel = new QLabel;
-
-    m_pApplyButton = new QToolButton;
-    m_pApplyButton->setIcon(QIcon(":/reflectedPropertyCtrl/img/apply.png"));
-
-    m_pApplyButton->setFocusPolicy(Qt::StrongFocus);
-
-    QHBoxLayout *pLayout = new QHBoxLayout(this);
-    pLayout->setContentsMargins(0, 0, 0, 0);
-    pLayout->addWidget(m_animationLabel, 1);
-    pLayout->addWidget(m_pApplyButton);
-
-    connect(m_pApplyButton, &QAbstractButton::clicked, this, &AnimationPropertyCtrl::OnApplyClicked);
-};
-
-AnimationPropertyCtrl::~AnimationPropertyCtrl()
-{
-}
-
-
-void AnimationPropertyCtrl::SetValue(const CReflectedVarAnimation &animation)
-{
-    m_animation = animation;
-    m_animationLabel->setText(animation.m_animation.c_str());
-}
-
-CReflectedVarAnimation AnimationPropertyCtrl::value() const
-{
-    return m_animation;
-}
-
-void AnimationPropertyCtrl::OnApplyClicked()
-{
-    QStringList cSelectedAnimations;
-    size_t nTotalAnimations(0);
-    size_t nCurrentAnimation(0);
-
-    QString combinedString = GetIEditor()->GetResourceSelectorHost()->GetGlobalSelection("animation");
-    SplitString(combinedString, cSelectedAnimations, ',');
-
-    nTotalAnimations = cSelectedAnimations.size();
-    for (nCurrentAnimation = 0; nCurrentAnimation < nTotalAnimations; ++nCurrentAnimation)
-    {
-        QString& rstrCurrentAnimAction = cSelectedAnimations[nCurrentAnimation];
-        if (!rstrCurrentAnimAction.isEmpty())
-        {
-            m_animation.m_animation = rstrCurrentAnimAction.toUtf8().data();
-            m_animationLabel->setText(m_animation.m_animation.c_str());
-            emit ValueChanged(m_animation);
-        }
-    }
-}
-
-QWidget* AnimationPropertyCtrl::GetFirstInTabOrder()
-{
-    return m_pApplyButton;
-}
-QWidget* AnimationPropertyCtrl::GetLastInTabOrder()
-{
-    return m_pApplyButton;
-}
-
-void AnimationPropertyCtrl::UpdateTabOrder()
-{
-    setTabOrder(m_pApplyButton, m_pApplyButton);
-}
-
-
-QWidget* AnimationPropertyWidgetHandler::CreateGUI(QWidget *pParent)
-{
-    AnimationPropertyCtrl* newCtrl = aznew AnimationPropertyCtrl(pParent);
-    connect(newCtrl, &AnimationPropertyCtrl::ValueChanged, newCtrl, [newCtrl]()
-    {
-        EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
-    });
-    return newCtrl;
-}
-
-
-void AnimationPropertyWidgetHandler::ConsumeAttribute(AnimationPropertyCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-{
-    Q_UNUSED(GUI);
-    Q_UNUSED(attrib);
-    Q_UNUSED(attrValue);
-    Q_UNUSED(debugName);
-}
-
-void AnimationPropertyWidgetHandler::WriteGUIValuesIntoProperty(size_t index, AnimationPropertyCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
-    Q_UNUSED(index);
-    Q_UNUSED(node);
-    CReflectedVarAnimation val = GUI->value();
-    instance = static_cast<property_t>(val);
-}
-
-bool AnimationPropertyWidgetHandler::ReadValuesIntoGUI(size_t index, AnimationPropertyCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
-    Q_UNUSED(index);
-    Q_UNUSED(node);
-    CReflectedVarAnimation val = instance;
-    GUI->SetValue(val);
-    return false;
-}
-
-
-#include <Controls/ReflectedPropertyControl/moc_PropertyAnimationCtrl.cpp>
-
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
deleted file mode 100644
index 251e2abd4d..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYANIMATIONCTRL_H
-#define CRYINCLUDE_EDITOR_UTILS_PROPERTYANIMATIONCTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include "ReflectedVar.h"
-#include <QWidget>
-#include <QPointer>
-#endif
-
-class QToolButton;
-class QLabel;
-class QHBoxLayout;
-
-class AnimationPropertyCtrl
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(AnimationPropertyCtrl, AZ::SystemAllocator, 0);
-
-    AnimationPropertyCtrl(QWidget* pParent = nullptr);
-    virtual ~AnimationPropertyCtrl();
-
-    CReflectedVarAnimation value() const;
-
-    QWidget* GetFirstInTabOrder();
-    QWidget* GetLastInTabOrder();
-    void UpdateTabOrder();
-
-signals:
-    void ValueChanged(CReflectedVarAnimation value);
-
-public slots:
-    void SetValue(const CReflectedVarAnimation& animation);
-
-protected slots:
-    void OnApplyClicked();
-
-private:
-    QToolButton* m_pApplyButton;
-    QLabel* m_animationLabel;
-
-    CReflectedVarAnimation m_animation;
-};
-
-class AnimationPropertyWidgetHandler
-    : QObject
-    , public AzToolsFramework::PropertyHandler < CReflectedVarAnimation, AnimationPropertyCtrl >
-{
-public:
-    AZ_CLASS_ALLOCATOR(AnimationPropertyWidgetHandler, AZ::SystemAllocator, 0);
-
-    virtual AZ::u32 GetHandlerName(void) const override  { return AZ_CRC("Animation", 0x8d5284dc); }
-    virtual bool IsDefaultHandler() const override { return true; }
-    virtual QWidget* GetFirstInTabOrder(AnimationPropertyCtrl* widget) override { return widget->GetFirstInTabOrder(); }
-    virtual QWidget* GetLastInTabOrder(AnimationPropertyCtrl* widget) override { return widget->GetLastInTabOrder(); }
-    virtual void UpdateWidgetInternalTabbing(AnimationPropertyCtrl* widget) override { widget->UpdateTabOrder(); }
-
-    virtual QWidget* CreateGUI(QWidget* pParent) override;
-    virtual void ConsumeAttribute(AnimationPropertyCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-    virtual void WriteGUIValuesIntoProperty(size_t index, AnimationPropertyCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-    virtual bool ReadValuesIntoGUI(size_t index, AnimationPropertyCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYANIMATIONCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
deleted file mode 100644
index d2640e1c55..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-// Editor
-#include "PropertyCtrl.h"
-#include "PropertyAnimationCtrl.h"
-#include "PropertyResourceCtrl.h"
-#include "PropertyGenericCtrl.h"
-#include "PropertyMiscCtrl.h"
-#include "PropertyMotionCtrl.h"
-
-void RegisterReflectedVarHandlers()
-{
-    static bool registered = false;
-    if (!registered)
-    {
-        registered = true;
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew AnimationPropertyWidgetHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew FileResourceSelectorWidgetHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew ReverbPresetPropertyHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequencePropertyHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequenceIdPropertyHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LocalStringPropertyHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LightAnimationPropertyHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew UserPopupWidgetHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew ColorCurveHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew FloatCurveHandler());
-        EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew MotionPropertyWidgetHandler());
-    }
-}
-
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h
deleted file mode 100644
index cbbaf3c432..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYCTRL_H
-#define CRYINCLUDE_EDITOR_UTILS_PROPERTYCTRL_H
-#pragma once
-
-void RegisterReflectedVarHandlers();
-
-
-
-
-#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
deleted file mode 100644
index 0afefbb1f7..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "PropertyGenericCtrl.h"
-
-// Qt
-#include <QMessageBox>
-#include <QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QLineEdit>
-#include <QStringListModel>
-#include <QToolButton>
-
-// CryCommon
-#include <CryCommon/ILocalizationManager.h>
-
-// Editor
-#include "SelectLightAnimationDialog.h"
-#include "SelectSequenceDialog.h"
-#include "SelectEAXPresetDlg.h"
-#include "QtViewPaneManager.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <QtWidgets/QListView>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-GenericPopupPropertyEditor::GenericPopupPropertyEditor(QWidget *pParent, bool showTwoButtons)
-    :QWidget(pParent)
-{
-    m_valueLabel = new QLabel;
-
-    QToolButton *mainButton = new QToolButton;
-    mainButton->setAutoRaise(true);
-    mainButton->setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/browse-edit.svg")));
-    connect(mainButton, &QToolButton::clicked, this, &GenericPopupPropertyEditor::onEditClicked);
-
-    QHBoxLayout *mainLayout = new QHBoxLayout(this);
-    mainLayout->addWidget(m_valueLabel, 1);
-    mainLayout->addWidget(mainButton);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-
-    if (showTwoButtons)
-    {
-        QToolButton *button2 = new QToolButton;
-        button2->setAutoRaise(true);
-        button2->setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/more.svg")));
-        connect(button2, &QToolButton::clicked, this, &GenericPopupPropertyEditor::onButton2Clicked);
-        mainLayout->insertWidget(1, button2);
-    }
-}
-
-void GenericPopupPropertyEditor::SetValue(const QString &value, bool notify)
-{
-    if (m_value != value)
-    {
-        m_value = value;
-        m_valueLabel->setText(m_value);
-        if (notify)
-            emit ValueChanged(m_value);
-    }
-}
-
-void GenericPopupPropertyEditor::SetPropertyType(PropertyType type)
-{
-    m_propertyType = type;
-}
-
-void ReverbPresetPropertyEditor::onEditClicked()
-{
-    CSelectEAXPresetDlg PresetDlg(this);
-    PresetDlg.SetCurrPreset(GetValue());
-    if (PresetDlg.exec() == QDialog::Accepted)
-    {
-        SetValue(PresetDlg.GetCurrPreset());
-    }
-}
-
-void SequencePropertyEditor::onEditClicked()
-{
-    CSelectSequenceDialog gtDlg(this);
-    gtDlg.PreSelectItem(GetValue());
-    if (gtDlg.exec() == QDialog::Accepted)
-        SetValue(gtDlg.GetSelectedItem());
-}
-
-void SequenceIdPropertyEditor::onEditClicked()
-{
-    CSelectSequenceDialog gtDlg;
-    uint32 id = GetValue().toUInt();
-    IAnimSequence *pSeq = GetIEditor()->GetMovieSystem()->FindSequenceById(id);
-    if (pSeq)
-        gtDlg.PreSelectItem(pSeq->GetName());
-    if (gtDlg.exec() == QDialog::Accepted)
-    {
-        pSeq = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(gtDlg.GetSelectedItem().toUtf8().data());
-        assert(pSeq);
-        if (pSeq->GetId() > 0)
-        {
-            // This sequence is a new one with a valid ID.
-            SetValue(QString::number(pSeq->GetId()));
-        }
-        else
-        {
-            // This sequence is an old one without an ID.
-            QMessageBox::warning(this, tr("Old Sequence"), tr("This is an old sequence without an ID.\nSo it cannot be used with the new ID-based linking."));
-        }
-    }
-}
-
-void LocalStringPropertyEditor::onEditClicked()
-{
-    std::vector<IVariable::IGetCustomItems::SItem> items;
-    ILocalizationManager* pMgr = gEnv->pSystem->GetLocalizationManager();
-    if (!pMgr)
-        return;
-    int nCount = pMgr->GetLocalizedStringCount();
-    if (nCount <= 0)
-        return;
-    items.reserve(nCount);
-    IVariable::IGetCustomItems::SItem item;
-    SLocalizedInfoEditor sInfo;
-    for (int i = 0; i < nCount; ++i)
-    {
-        if (pMgr->GetLocalizedInfoByIndex(i, sInfo))
-        {
-            item.desc = tr("English Text:\r\n");
-            item.desc += QString::fromWCharArray(Unicode::Convert<wstring>(sInfo.sUtf8TranslatedText).c_str());
-            item.name = sInfo.sKey;
-            items.push_back(item);
-        }
-    }
-    CGenericSelectItemDialog gtDlg;
-    const bool bUseTree = true;
-    if (bUseTree)
-    {
-        gtDlg.SetMode(CGenericSelectItemDialog::eMODE_TREE);
-        gtDlg.SetTreeSeparator("/");
-    }
-    gtDlg.SetItems(items);
-    gtDlg.setWindowTitle(tr("Choose Localized String"));
-    QString preselect = GetValue();
-    if (!preselect.isEmpty() && preselect.at(0) == '@')
-        preselect = preselect.mid(1);
-    gtDlg.PreSelectItem(preselect);
-    if (gtDlg.exec() == QDialog::Accepted)
-    {
-        preselect = "@";
-        preselect += gtDlg.GetSelectedItem();
-        SetValue(preselect);
-    }
-}
-
-void LightAnimationPropertyEditor::onEditClicked()
-{
-    // First, check if there is any light animation defined.
-    bool bLightAnimationExists = false;
-    IMovieSystem *pMovieSystem = GetIEditor()->GetMovieSystem();
-    for (int i = 0; i < pMovieSystem->GetNumSequences(); ++i)
-    {
-        IAnimSequence *pSequence = pMovieSystem->GetSequence(i);
-        if (pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet)
-        {
-            bLightAnimationExists = pSequence->GetNodeCount() > 0;
-            break;
-        }
-    }
-
-    if (bLightAnimationExists) // If exists, show the selection dialog.
-    {
-        CSelectLightAnimationDialog dlg;
-        dlg.PreSelectItem(GetValue());
-        if (dlg.exec() == QDialog::Accepted)
-            SetValue(dlg.GetSelectedItem());
-    }
-    else                       // If not, remind the user of creating one in TrackView.
-    {
-        QMessageBox::warning(this, tr("No Available Animation"), tr("There is no available light animation.\nPlease create one in TrackView, first."));
-    }
-}
-
-ListEditWidget::ListEditWidget(QWidget *pParent /*= nullptr*/)
-    :QWidget(pParent)
-{
-    m_valueEdit = new QLineEdit;
-
-    m_model = new QStringListModel(this);
-
-    m_listView = new QListView;
-    m_listView->setModel(m_model);
-    m_listView->setMaximumHeight(50);
-    m_listView->setVisible(false);
-
-    QToolButton *expandButton = new QToolButton();
-    expandButton->setCheckable(true);
-    expandButton->setText("+");
-    
-    QToolButton *editButton = new QToolButton();
-    editButton->setText("..");
-
-    connect(editButton, &QAbstractButton::clicked, this, &ListEditWidget::OnEditClicked);
-    connect(expandButton, &QAbstractButton::toggled, m_listView, &QWidget::setVisible);
-
-    connect(m_model, &QAbstractItemModel::dataChanged, this, &ListEditWidget::OnModelDataChange);
-    connect(m_valueEdit, &QLineEdit::editingFinished, this, [this](){SetValue(m_valueEdit->text(), true); } );
-
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    QHBoxLayout *topLayout = new QHBoxLayout;
-    topLayout->addWidget(expandButton);
-    topLayout->addWidget(m_valueEdit,1);
-    topLayout->addWidget(editButton);
-
-    mainLayout->addLayout(topLayout);
-    mainLayout->addWidget(m_listView,1);
-    mainLayout->setContentsMargins(1,1,1,1);
-}
-
-void ListEditWidget::SetValue(const QString &value, bool notify /*= true*/)
-{
-    if (m_value != value)
-    {
-        m_value = value;
-        m_valueEdit->setText(value);
-        QStringList list = m_value.split(",", Qt::SkipEmptyParts);
-        m_model->setStringList(list);
-
-        if (notify)
-            emit ValueChanged(m_value);
-    }
-}
-
-
-void ListEditWidget::OnModelDataChange()
-{
-    m_value = m_model->stringList().join(",");
-    m_valueEdit->setText(m_value);
-    emit ValueChanged(m_value);
-}
-
-
-QWidget* ListEditWidget::GetFirstInTabOrder()
-{
-    return m_valueEdit;
-}
-
-QWidget* ListEditWidget::GetLastInTabOrder()
-{
-    return m_listView;
-}
-
-#include <Controls/ReflectedPropertyControl/moc_PropertyGenericCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
deleted file mode 100644
index d60cbe77ee..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYGENERICCTRL_H
-#define CRYINCLUDE_EDITOR_UTILS_PROPERTYGENERICCTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include "ReflectedVar.h"
-#include "Util/VariablePropertyType.h"
-#include <QWidget>
-#endif
-
-class QStringListModel;
-class QListView;
-class QLabel;
-class QLineEdit;
-
-class GenericPopupPropertyEditor
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(GenericPopupPropertyEditor, AZ::SystemAllocator, 0);
-    GenericPopupPropertyEditor(QWidget* pParent = nullptr, bool showTwoButtons = false);
-
-    void SetValue(const QString& value, bool notify = true);
-    QString GetValue() const { return m_value; }
-    void SetPropertyType(PropertyType type);
-    PropertyType GetPropertyType() const { return m_propertyType; }
-
-    //override in derived classes to show appropriate editor
-    virtual void onEditClicked() {};
-    virtual void onButton2Clicked() {};
-
-signals:
-    void ValueChanged(const QString& value);
-
-private:
-    QLabel* m_valueLabel;
-    PropertyType m_propertyType;
-    QString m_value;
-};
-
-template <class T, AZ::u32 CRC>
-class GenericPopupWidgetHandler
-    : public QObject
-    , public AzToolsFramework::PropertyHandler < CReflectedVarGenericProperty, GenericPopupPropertyEditor >
-{
-public:
-    AZ_CLASS_ALLOCATOR(GenericPopupWidgetHandler, AZ::SystemAllocator, 0);
-    virtual bool IsDefaultHandler() const override { return false; }
-
-    virtual AZ::u32 GetHandlerName(void) const override  { return CRC; }
-    virtual QWidget* CreateGUI(QWidget* pParent) override
-    {
-        GenericPopupPropertyEditor* newCtrl = aznew T(pParent);
-        connect(newCtrl, &GenericPopupPropertyEditor::ValueChanged, newCtrl, [newCtrl]()
-            {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
-            });
-        return newCtrl;
-    }
-    virtual void ConsumeAttribute(GenericPopupPropertyEditor* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override
-    {
-        Q_UNUSED(GUI);
-        Q_UNUSED(attrib);
-        Q_UNUSED(attrValue);
-        Q_UNUSED(debugName);
-    }
-    virtual void WriteGUIValuesIntoProperty(size_t index, GenericPopupPropertyEditor* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override
-    {
-        Q_UNUSED(index);
-        Q_UNUSED(node);
-        CReflectedVarGenericProperty val = instance;
-        val.m_propertyType = GUI->GetPropertyType();
-        val.m_value = GUI->GetValue().toUtf8().data();
-        instance = static_cast<property_t>(val);
-    }
-    virtual bool ReadValuesIntoGUI(size_t index, GenericPopupPropertyEditor* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override
-    {
-        Q_UNUSED(index);
-        Q_UNUSED(node);
-        CReflectedVarGenericProperty val = instance;
-        GUI->SetPropertyType(val.m_propertyType);
-        GUI->SetValue(val.m_value.c_str(), false);
-        return false;
-    }
-};
-
-class ReverbPresetPropertyEditor
-    : public GenericPopupPropertyEditor
-{
-public:
-    ReverbPresetPropertyEditor(QWidget* pParent = nullptr)
-        : GenericPopupPropertyEditor(pParent){}
-    void onEditClicked() override;
-};
-
-class MissionObjPropertyEditor
-    : public GenericPopupPropertyEditor
-{
-public:
-    MissionObjPropertyEditor(QWidget* pParent = nullptr)
-        : GenericPopupPropertyEditor(pParent){}
-    void onEditClicked() override;
-};
-
-class SequencePropertyEditor
-    : public GenericPopupPropertyEditor
-{
-public:
-    SequencePropertyEditor(QWidget* pParent = nullptr)
-        : GenericPopupPropertyEditor(pParent){}
-    void onEditClicked() override;
-};
-
-class SequenceIdPropertyEditor
-    : public GenericPopupPropertyEditor
-{
-public:
-    SequenceIdPropertyEditor(QWidget* pParent = nullptr)
-        : GenericPopupPropertyEditor(pParent){}
-    void onEditClicked() override;
-};
-
-class LocalStringPropertyEditor
-    : public GenericPopupPropertyEditor
-{
-public:
-    LocalStringPropertyEditor(QWidget* pParent = nullptr)
-        : GenericPopupPropertyEditor(pParent){}
-    void onEditClicked() override;
-};
-
-class LightAnimationPropertyEditor
-    : public GenericPopupPropertyEditor
-{
-public:
-    LightAnimationPropertyEditor(QWidget* pParent = nullptr)
-        : GenericPopupPropertyEditor(pParent){}
-    void onEditClicked() override;
-};
-
-
-// AZ_CRC changed recently - it used to be evaluated by the preprocessor to AZ::u32(value); now it evaluates to Az::Crc32, and can't be used as a const template parameter
-// So we use our own
-#define CONST_AZ_CRC(name, value) AZ::u32(value)
-
-using ReverbPresetPropertyHandler = GenericPopupWidgetHandler<ReverbPresetPropertyEditor, CONST_AZ_CRC("ePropertyReverbPreset", 0x51469f38)>;
-using MissionObjPropertyHandler = GenericPopupWidgetHandler<MissionObjPropertyEditor, CONST_AZ_CRC("ePropertyMissionObj", 0x4a2d0dc8)>;
-using SequencePropertyHandler = GenericPopupWidgetHandler<SequencePropertyEditor, CONST_AZ_CRC("ePropertySequence", 0xdd1c7d44)>;
-using SequenceIdPropertyHandler = GenericPopupWidgetHandler<SequenceIdPropertyEditor, CONST_AZ_CRC("ePropertySequenceId", 0x05983dcc)>;
-using LocalStringPropertyHandler = GenericPopupWidgetHandler<LocalStringPropertyEditor, CONST_AZ_CRC("ePropertyLocalString", 0x0cd9609a)>;
-using LightAnimationPropertyHandler = GenericPopupWidgetHandler<LightAnimationPropertyEditor, CONST_AZ_CRC("ePropertyLightAnimation", 0x277097da)>;
-
-class ListEditWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(ListEditWidget, AZ::SystemAllocator, 0);
-    ListEditWidget(QWidget *pParent = nullptr);
-
-    void SetValue(const QString &value, bool notify = true);
-    QString GetValue() const { return m_value; }
-
-    QWidget* GetFirstInTabOrder();
-    QWidget* GetLastInTabOrder();
-
-signals:
-    void ValueChanged(const QString &value);
-
-private:
-    void OnModelDataChange();
-    virtual void OnEditClicked() {};
-
-protected:
-    QLineEdit *m_valueEdit;
-    QString m_value;
-    QListView *m_listView;
-    QStringListModel *m_model;
-};
-
-template <class T, AZ::u32 CRC>
-class ListEditWidgetHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarGenericProperty, ListEditWidget >
-{
-public:
-    AZ_CLASS_ALLOCATOR(ListEditWidgetHandler, AZ::SystemAllocator, 0);
-    virtual bool IsDefaultHandler() const override { return false; }
-
-    virtual AZ::u32 GetHandlerName(void) const override  { return CRC; }
-    virtual QWidget* CreateGUI(QWidget *pParent) override
-    {
-        ListEditWidget* newCtrl = aznew T(pParent);
-        connect(newCtrl, &ListEditWidget::ValueChanged, newCtrl, [newCtrl]()
-        {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
-        });
-        return newCtrl;
-    }
-    virtual void ConsumeAttribute(ListEditWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override {
-        Q_UNUSED(GUI); Q_UNUSED(attrib); Q_UNUSED(attrValue); Q_UNUSED(debugName);
-    }
-    virtual void WriteGUIValuesIntoProperty(size_t index, ListEditWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override
-    {
-        Q_UNUSED(index);
-        Q_UNUSED(node);
-        CReflectedVarGenericProperty val = instance;
-        val.m_value = GUI->GetValue().toUtf8().data();
-        instance = static_cast<property_t>(val);
-    }
-    virtual bool ReadValuesIntoGUI(size_t index, ListEditWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override
-    {
-        Q_UNUSED(index);
-        Q_UNUSED(node);
-        CReflectedVarGenericProperty val = instance;
-        GUI->SetValue(val.m_value.c_str(), false);
-        return false;
-    }
-    QWidget* GetFirstInTabOrder(ListEditWidget* widget) override { return widget->GetFirstInTabOrder(); }
-    QWidget* GetLastInTabOrder(ListEditWidget* widget) override {return widget->GetLastInTabOrder(); }
-
-};
-
-#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYGENERICCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
deleted file mode 100644
index 9cdf28a951..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "PropertyMiscCtrl.h"
-
-// Qt
-#include <QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QLineEdit>
-#include <QtWidgets/QToolButton>
-#include <QtCore/QTimer>
-#include <QtUtilWin.h>
-
-// Editor
-#include "GenericSelectItemDialog.h"
-#include "QtViewPaneManager.h"
-
-
-UserPropertyEditor::UserPropertyEditor(QWidget *pParent /*= nullptr*/)
-    : QWidget(pParent)
-    , m_canEdit(false)
-    , m_useTree(false)
-{
-    m_valueLabel = new QLabel;
-
-    QToolButton *mainButton = new QToolButton;
-    mainButton->setText("..");
-    connect(mainButton, &QToolButton::clicked, this, &UserPropertyEditor::onEditClicked);
-
-    QHBoxLayout *mainLayout = new QHBoxLayout(this);
-    mainLayout->addWidget(m_valueLabel, 1);
-    mainLayout->addWidget(mainButton);
-    mainLayout->setContentsMargins(1, 1, 1, 1);
-}
-
-void UserPropertyEditor::SetValue(const QString &value, bool notify /*= true*/)
-{
-    if (m_value != value)
-    {
-        m_value = value;
-        m_valueLabel->setText(m_value);
-        if (notify)
-        {
-            emit ValueChanged(m_value);
-        }
-    }
-
-}
-
-void UserPropertyEditor::SetData(bool canEdit, bool useTree, const QString &treeSeparator, const QString &dialogTitle, const std::vector<IVariable::IGetCustomItems::SItem>& items)
-{
-    m_canEdit = canEdit;
-    m_useTree = useTree;
-    m_treeSeparator = treeSeparator;
-    m_dialogTitle = dialogTitle;
-    m_items = items;
-}
-
-void UserPropertyEditor::onEditClicked()
-{
-    // call the user supplied callback to fill-in items and get dialog title
-    emit RefreshItems();
-    if (m_canEdit) // if func didn't veto, show the dialog
-    {
-        CGenericSelectItemDialog gtDlg;
-        if (m_useTree)
-        {
-            gtDlg.SetMode(CGenericSelectItemDialog::eMODE_TREE);
-            if (!m_treeSeparator.isEmpty())
-            {
-                gtDlg.SetTreeSeparator(m_treeSeparator);
-            }
-        }
-        gtDlg.SetItems(m_items);
-        if (m_dialogTitle.isEmpty() == false)
-            gtDlg.setWindowTitle(m_dialogTitle);
-        gtDlg.PreSelectItem(GetValue());
-        if (gtDlg.exec() == QDialog::Accepted)
-        {
-            QString selectedItemStr = gtDlg.GetSelectedItem();
-
-            if (selectedItemStr.isEmpty() == false)
-            {
-                SetValue(selectedItemStr);
-            }
-        }
-    }
-}
-
-
-QWidget* UserPopupWidgetHandler::CreateGUI(QWidget *pParent)
-{
-    UserPropertyEditor* newCtrl = aznew UserPropertyEditor(pParent);
-    connect(newCtrl, &UserPropertyEditor::ValueChanged, newCtrl, [newCtrl]()
-    {
-        EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
-    });
-
-    return newCtrl;
-}
-
-void UserPopupWidgetHandler::ConsumeAttribute(UserPropertyEditor* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-{
-    Q_UNUSED(GUI);
-    Q_UNUSED(attrib);
-    Q_UNUSED(attrValue);
-    Q_UNUSED(debugName);
-}
-
-void UserPopupWidgetHandler::WriteGUIValuesIntoProperty(size_t index, UserPropertyEditor* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
-    Q_UNUSED(index);
-    Q_UNUSED(node);
-    CReflectedVarUser val = instance;
-    val.m_value = GUI->GetValue().toUtf8().data();
-    instance = static_cast<property_t>(val);
-}
-
-bool UserPopupWidgetHandler::ReadValuesIntoGUI(size_t index, UserPropertyEditor* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
-    Q_UNUSED(index);
-    Q_UNUSED(node);
-    CReflectedVarUser val = instance;
-
-    assert(val.m_itemNames.size() == val.m_itemDescriptions.size());
-
-    std::vector<IVariable::IGetCustomItems::SItem> items(val.m_itemNames.size());
-    int i = -1;
-    std::generate(items.begin(), items.end(), [&val, &i]() { ++i; return IVariable::IGetCustomItems::SItem(val.m_itemNames[i].c_str(), val.m_itemDescriptions[i].c_str());});
-
-    GUI->SetData(val.m_enableEdit, val.m_useTree, val.m_treeSeparator.c_str(), val.m_dialogTitle.c_str(), items);
-    GUI->SetValue(val.m_value.c_str(), false);
-    return false;
-}
-
-#include <Controls/ReflectedPropertyControl/moc_PropertyMiscCtrl.cpp>
-
-QWidget* FloatCurveHandler::CreateGUI(QWidget *pParent)
-{
-    CSplineCtrl *cSpline = new CSplineCtrl(pParent);
-    cSpline->SetUpdateCallback(AZStd::bind(&FloatCurveHandler::OnSplineChange, this, AZStd::placeholders::_1));
-    cSpline->SetTimeRange(0, 1);
-    cSpline->SetValueRange(0, 1);
-    cSpline->SetGrid(12, 12);
-    cSpline->setFixedHeight(52);
-    return cSpline;
-}
-void FloatCurveHandler::OnSplineChange(CSplineCtrl*)
-{
-//    EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, splineWidget);
-}
-
-void FloatCurveHandler::ConsumeAttribute(CSplineCtrl *, AZ::u32, AzToolsFramework::PropertyAttributeReader*, const char*)
-{}
-
-void FloatCurveHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, [[maybe_unused]] CSplineCtrl* GUI, [[maybe_unused]] property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-{
-    //nothing to do here. the spline itself will have it's new values.
-}
-
-bool FloatCurveHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, CSplineCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-{
-    GUI->SetSpline(reinterpret_cast<ISplineInterpolator*>(instance.m_spline));
-    return false;
-}
-
-
-QWidget* ColorCurveHandler::CreateGUI(QWidget *pParent)
-{
-    CColorGradientCtrl* gradientCtrl = new CColorGradientCtrl(pParent);
-    //connect(gradientCtrl, &CColorGradientCtrl::change, [gradientCtrl]()
-    //{
-    //    EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, gradientCtrl);
-    //});
-    gradientCtrl->SetTimeRange(0, 1);
-    gradientCtrl->setFixedHeight(36);
-    return gradientCtrl;
-
-}
-
-void ColorCurveHandler::ConsumeAttribute(CColorGradientCtrl*, AZ::u32, AzToolsFramework::PropertyAttributeReader*, const char*)
-{}
-
-void ColorCurveHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, [[maybe_unused]] CColorGradientCtrl* GUI, [[maybe_unused]] property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-{}
-
-bool ColorCurveHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, CColorGradientCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-{
-    GUI->SetSpline(reinterpret_cast<ISplineInterpolator*>(instance.m_spline));
-    return false;
-}
-
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
deleted file mode 100644
index 32c1d64118..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYMISCCTRL_H
-#define CRYINCLUDE_EDITOR_UTILS_PROPERTYMISCCTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include "ReflectedVar.h"
-#include "Util/VariablePropertyType.h"
-#include "Controls/ColorGradientCtrl.h"
-#include "Controls/SplineCtrl.h"
-#include <QWidget>
-#endif
-
-class QLabel;
-class QLineEdit;
-
-class UserPropertyEditor : public QWidget
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(UserPropertyEditor, AZ::SystemAllocator, 0);
-    UserPropertyEditor(QWidget *pParent = nullptr);
-
-    void SetValue(const QString &value, bool notify = true);
-    QString GetValue() const { return m_value; }
-
-    void SetData(bool canEdit, bool useTree, const QString &treeSeparator, const QString &dialogTitle, const std::vector<IVariable::IGetCustomItems::SItem>& items);
-    void onEditClicked();
-
-signals:
-    void ValueChanged(const QString &value);
-    void RefreshItems();
-
-private:
-    QLabel *m_valueLabel;
-    QString m_value;
-
-    bool m_canEdit;
-    bool m_useTree;
-    QString m_treeSeparator;
-    QString m_dialogTitle;
-    std::vector<IVariable::IGetCustomItems::SItem> m_items;
-};
-
-class UserPopupWidgetHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarUser, UserPropertyEditor>
-{
-public:
-    AZ_CLASS_ALLOCATOR(UserPopupWidgetHandler, AZ::SystemAllocator, 0);
-    bool IsDefaultHandler() const override { return false; }
-    QWidget* CreateGUI(QWidget *pParent) override;
-
-    AZ::u32 GetHandlerName(void) const override  {return AZ_CRC("ePropertyUser", 0x65b972c0); }
-    void ConsumeAttribute(UserPropertyEditor* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-    void WriteGUIValuesIntoProperty(size_t index, UserPropertyEditor* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-    bool ReadValuesIntoGUI(size_t index, UserPropertyEditor* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-
-};
-
-class FloatCurveHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarSpline, CSplineCtrl>
-{
-public:
-    AZ_CLASS_ALLOCATOR(FloatCurveHandler, AZ::SystemAllocator, 0);
-    bool IsDefaultHandler() const override { return false; }
-    QWidget* CreateGUI(QWidget *pParent) override;
-
-    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("ePropertyFloatCurve", 0x7440ccce); }
-
-    void ConsumeAttribute(CSplineCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-    void WriteGUIValuesIntoProperty(size_t index, CSplineCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-    bool ReadValuesIntoGUI(size_t index, CSplineCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-
-    void OnSplineChange(CSplineCtrl*);
-};
-
-class ColorCurveHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarSpline, CColorGradientCtrl>
-{
-public:
-    AZ_CLASS_ALLOCATOR(ColorCurveHandler, AZ::SystemAllocator, 0);
-    bool IsDefaultHandler() const override { return false; }
-    QWidget* CreateGUI(QWidget *pParent) override;
-
-    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("ePropertyColorCurve", 0xa30da4ec); }
-
-    void ConsumeAttribute(CColorGradientCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-    void WriteGUIValuesIntoProperty(size_t index, CColorGradientCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-    bool ReadValuesIntoGUI(size_t index, CColorGradientCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-};
-#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYMISCCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
deleted file mode 100644
index c7d1288249..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "PropertyMotionCtrl.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
-
-QWidget* MotionPropertyWidgetHandler::CreateGUI(QWidget* pParent)
-{
-    AzToolsFramework::PropertyAssetCtrl* newCtrl = aznew AzToolsFramework::PropertyAssetCtrl(pParent);
-    connect(
-        newCtrl, &AzToolsFramework::PropertyAssetCtrl::OnAssetIDChanged, this, [newCtrl]([[maybe_unused]] AZ::Data::AssetId newAssetId) {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
-            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
-                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, newCtrl);
-        });
-    return newCtrl;
-}
-
-void MotionPropertyWidgetHandler::ConsumeAttribute(
-    [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, [[maybe_unused]] AZ::u32 attrib,
-    [[maybe_unused]] AzToolsFramework::PropertyAttributeReader* attrValue, [[maybe_unused]] const char* debugName)
-{
-}
-
-void MotionPropertyWidgetHandler::WriteGUIValuesIntoProperty(
-    [[maybe_unused]] size_t index, [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, property_t& instance,
-    [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-{
-    CReflectedVarMotion val;
-    val.m_motion = GUI->GetCurrentAssetHint();
-    val.m_assetId = GUI->GetSelectedAssetID();
-    instance = static_cast<property_t>(val);
-}
-
-bool MotionPropertyWidgetHandler::ReadValuesIntoGUI(
-    [[maybe_unused]] size_t index, [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, const property_t& instance,
-    [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-{
-    static const AZ::Data::AssetType emotionFXMotionAssetType(
-        "{00494B8E-7578-4BA2-8B28-272E90680787}"); // from MotionAsset.h in EMotionFX Gem
-
-    GUI->blockSignals(true);
-    GUI->SetSelectedAssetID(instance.m_assetId);
-    GUI->SetCurrentAssetType(emotionFXMotionAssetType);
-    GUI->blockSignals(false);
-
-    return false;
-}
-
-#include <Controls/ReflectedPropertyControl/moc_PropertyMotionCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
deleted file mode 100644
index be1f0200bb..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "ReflectedVar.h"
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/base.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include <QPointer>
-#include <QWidget>
-#endif
-
-class MotionPropertyWidgetHandler : QObject,
-                                    public AzToolsFramework::PropertyHandler<CReflectedVarMotion, AzToolsFramework::PropertyAssetCtrl>
-{
-    Q_OBJECT
-
-public:
-    AZ_CLASS_ALLOCATOR(MotionPropertyWidgetHandler, AZ::SystemAllocator, 0);
-
-    virtual AZ::u32 GetHandlerName(void) const override
-    {
-        return AZ_CRC("Motion", 0xf5fea1e8);
-    }
-
-    virtual bool IsDefaultHandler() const override
-    {
-        return true;
-    }
-
-    virtual QWidget* GetFirstInTabOrder(AzToolsFramework::PropertyAssetCtrl* widget) override
-    {
-        return widget->GetFirstInTabOrder();
-    }
-
-    virtual QWidget* GetLastInTabOrder(AzToolsFramework::PropertyAssetCtrl* widget) override
-    {
-        return widget->GetLastInTabOrder();
-    }
-
-    virtual void UpdateWidgetInternalTabbing(AzToolsFramework::PropertyAssetCtrl* widget) override
-    {
-        widget->UpdateTabOrder();
-    }
-
-    virtual QWidget* CreateGUI(QWidget* pParent) override;
-    virtual void ConsumeAttribute(
-        AzToolsFramework::PropertyAssetCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue,
-        const char* debugName) override;
-    virtual void WriteGUIValuesIntoProperty(
-        size_t index, AzToolsFramework::PropertyAssetCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-    virtual bool ReadValuesIntoGUI(
-        size_t index, AzToolsFramework::PropertyAssetCtrl* GUI, const property_t& instance,
-        AzToolsFramework::InstanceDataNode* node) override;
-};
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
deleted file mode 100644
index 08367faf48..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "PropertyResourceCtrl.h"
-
-// Qt
-#include <QHBoxLayout>
-#include <QLineEdit>
-
-// AzToolsFramework
-#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-// Editor
-#include "IResourceSelectorHost.h"
-#include "Controls/QToolTipWidget.h"
-#include "Controls/BitmapToolTip.h"
-
-
-BrowseButton::BrowseButton(PropertyType type, QWidget* parent /*= nullptr*/)
-    : QToolButton(parent)
-    , m_propertyType(type)
-{
-    setAutoRaise(true);
-    setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/browse-edit.svg")));
-    connect(this, &QAbstractButton::clicked, this, &BrowseButton::OnClicked);
-}
-
-void BrowseButton::SetPathAndEmit(const QString& path)
-{
-    //only emit if path changes, except for ePropertyGeomCache. Old property control
-    if (path != m_path || m_propertyType == ePropertyGeomCache)
-    {
-        m_path = path;
-        emit PathChanged(m_path);
-    }
-}
-
-class FileBrowseButton
-    : public BrowseButton
-{
-public:
-    AZ_CLASS_ALLOCATOR(FileBrowseButton, AZ::SystemAllocator, 0);
-    FileBrowseButton(PropertyType type, QWidget* pParent = nullptr)
-        : BrowseButton(type, pParent)
-    {
-        setToolTip("Browse...");
-    }
-
-private:
-    void OnClicked() override
-    {
-        QString tempValue("");
-        QString ext("");
-        if (m_path.isEmpty() == false)
-        {
-            if (Path::GetExt(m_path) == "")
-            {
-                tempValue = "";
-            }
-            else
-            {
-                tempValue = m_path;
-            }
-        }
-
-        AssetSelectionModel selection;
-
-        if (m_propertyType == ePropertyTexture)
-        {
-            // Filters for texture.
-            selection = AssetSelectionModel::AssetGroupSelection("Texture");
-        }
-        else if (m_propertyType == ePropertyModel)
-        {
-            // Filters for models.
-            selection = AssetSelectionModel::AssetGroupSelection("Geometry");
-        }
-        else if (m_propertyType == ePropertyGeomCache)
-        {
-            // Filters for geom caches.
-            selection = AssetSelectionModel::AssetTypeSelection("Geom Cache");
-        }
-        else if (m_propertyType == ePropertyFile)
-        {
-            // Filters for files.
-            selection = AssetSelectionModel::AssetTypeSelection("File");
-        }
-        else
-        {
-            return;
-        }
-
-        AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
-        if (selection.IsValid())
-        {
-            QString newPath = Path::FullPathToGamePath(selection.GetResult()->GetFullPath().c_str()).c_str();
-
-            switch (m_propertyType)
-            {
-            case ePropertyTexture:
-            case ePropertyModel:
-                newPath.replace("\\\\", "/");
-            }
-            switch (m_propertyType)
-            {
-            case ePropertyTexture:
-            case ePropertyModel:
-            case ePropertyFile:
-                if (newPath.size() > MAX_PATH)
-                {
-                    newPath.resize(MAX_PATH);
-                }
-            }
-
-            SetPathAndEmit(newPath);
-        }
-    }
-};
-
-class ResourceSelectorButton
-    : public BrowseButton
-{
-public:
-    AZ_CLASS_ALLOCATOR(ResourceSelectorButton, AZ::SystemAllocator, 0);
-
-    ResourceSelectorButton(PropertyType type, QWidget* pParent = nullptr)
-        : BrowseButton(type, pParent)
-    {
-        setToolTip(tr("Select resource"));
-    }
-
-private:
-    void OnClicked() override
-    {
-        SResourceSelectorContext x;
-        x.parentWidget = this;
-        x.typeName = Prop::GetPropertyTypeToResourceType(m_propertyType);
-        QString newPath = GetIEditor()->GetResourceSelectorHost()->SelectResource(x, m_path);
-        SetPathAndEmit(newPath);
-    }
-};
-
-class TextureEditButton
-    : public BrowseButton
-{
-public:
-    AZ_CLASS_ALLOCATOR(TextureEditButton, AZ::SystemAllocator, 0);
-    TextureEditButton(QWidget* pParent = nullptr)
-        : BrowseButton(ePropertyTexture, pParent)
-    {
-        setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/open-in-internal-app.svg")));
-        setToolTip(tr("Launch default editor"));
-    }
-
-private:
-    void OnClicked() override
-    {
-        CFileUtil::EditTextureFile(m_path.toUtf8().data(), true);
-    }
-};
-
-FileResourceSelectorWidget::FileResourceSelectorWidget(QWidget* pParent /*= nullptr*/)
-    : QWidget(pParent)
-    , m_propertyType(ePropertyInvalid)
-    , m_tooltip(nullptr)
-{
-    m_pathEdit = new QLineEdit;
-    m_mainLayout = new QHBoxLayout(this);
-    m_mainLayout->addWidget(m_pathEdit, 1);
-
-    m_mainLayout->setContentsMargins(0, 0, 0, 0);
-
-// KDAB just ported the MFC texture preview tooltip, but looks like Amazon added their own. Not sure which to use.
-// To switch to Amazon QToolTipWidget, remove FileResourceSelectorWidget::event and m_previewTooltip 
-#ifdef USE_QTOOLTIPWIDGET
-    m_tooltip = new QToolTipWidget(this);
-
-    installEventFilter(this);
-#endif
-    connect(m_pathEdit, &QLineEdit::editingFinished, this, [this]() { OnPathChanged(m_pathEdit->text()); });
-}
-
-bool FileResourceSelectorWidget::eventFilter([[maybe_unused]] QObject* obj, QEvent* event)
-{
-    if (m_propertyType == ePropertyTexture)
-    {
-        if (event->type() == QEvent::ToolTip)
-        {
-            QHelpEvent* e = (QHelpEvent*)event;
-
-            m_tooltip->AddSpecialContent("TEXTURE", m_path);
-            m_tooltip->TryDisplay(e->globalPos(), m_pathEdit, QToolTipWidget::ArrowDirection::ARROW_RIGHT);
-
-            return true;
-        }
-
-        if (event->type() == QEvent::Leave)
-        {
-            m_tooltip->hide();
-        }
-    }
-
-    return false;
-}
-
-void FileResourceSelectorWidget::SetPropertyType(PropertyType type)
-{
-    if (m_propertyType == type)
-    {
-        return;
-    }
-
-    //if the property type changed for some reason, delete all the existing widgets
-    if (!m_buttons.isEmpty())
-    {
-        qDeleteAll(m_buttons.begin(), m_buttons.end());
-        m_buttons.clear();
-    }
-
-    m_previewToolTip.reset();
-    m_propertyType = type;
-
-    switch (type)
-    {
-    case ePropertyTexture:
-        AddButton(new FileBrowseButton(type));
-        AddButton(new TextureEditButton);
-        m_previewToolTip.reset(new CBitmapToolTip);
-        break;
-    case ePropertyModel:
-    case ePropertyGeomCache:
-    case ePropertyAudioTrigger:
-    case ePropertyAudioSwitch:
-    case ePropertyAudioSwitchState:
-    case ePropertyAudioRTPC:
-    case ePropertyAudioEnvironment:
-    case ePropertyAudioPreloadRequest:
-        AddButton(new ResourceSelectorButton(type));
-        break;
-    case ePropertyFile:
-        AddButton(new FileBrowseButton(type));
-        break;
-    default:
-        break;
-    }
-
-    m_mainLayout->invalidate();
-}
-
-void FileResourceSelectorWidget::AddButton(BrowseButton* button)
-{
-    m_mainLayout->addWidget(button);
-    m_buttons.push_back(button);
-    connect(button, &BrowseButton::PathChanged, this, &FileResourceSelectorWidget::OnPathChanged);
-}
-
-void FileResourceSelectorWidget::OnPathChanged(const QString& path)
-{
-    bool changed = SetPath(path);
-    if (changed)
-    {
-        emit PathChanged(m_path);
-    }
-}
-
-bool FileResourceSelectorWidget::SetPath(const QString& path)
-{
-    bool changed = false;
-
-    const QString newPath = path.toLower();
-    if (m_path != newPath)
-    {
-        m_path = newPath;
-        UpdateWidgets();
-
-        changed = true;
-    }
-
-    return changed;
-}
-
-
-void FileResourceSelectorWidget::UpdateWidgets()
-{
-    m_pathEdit->setText(m_path);
-
-    foreach(BrowseButton * button, m_buttons)
-    {
-        button->SetPath(m_path);
-    }
-
-    if (m_previewToolTip)
-    {
-        m_previewToolTip->SetTool(this, rect());
-    }
-}
-
-QString FileResourceSelectorWidget::GetPath() const
-{
-    return m_path;
-}
-
-
-
-QWidget* FileResourceSelectorWidget::GetLastInTabOrder()
-{
-    return m_buttons.empty() ? nullptr : m_buttons.last();
-}
-
-QWidget* FileResourceSelectorWidget::GetFirstInTabOrder()
-{
-    return m_buttons.empty() ? nullptr : m_buttons.first();
-}
-
-void FileResourceSelectorWidget::UpdateTabOrder()
-{
-    if (m_buttons.count() >= 2)
-    {
-        for (int i = 0; i < m_buttons.count() - 1; ++i)
-        {
-            setTabOrder(m_buttons[i], m_buttons[i + 1]);
-        }
-    }
-}
-
-bool FileResourceSelectorWidget::event(QEvent* event)
-{
-    if (event->type() == QEvent::ToolTip && m_previewToolTip && !m_previewToolTip->isVisible())
-    {
-        if (!m_path.isEmpty())
-        {
-            m_previewToolTip->LoadImage(m_path);
-            m_previewToolTip->setVisible(true);
-        }
-        event->accept();
-        return true;
-    }
-
-    if (event->type() == QEvent::Resize && m_previewToolTip)
-    {
-        m_previewToolTip->SetTool(this, rect());
-    }
-
-    return QWidget::event(event);
-}
-
-QWidget* FileResourceSelectorWidgetHandler::CreateGUI(QWidget* pParent)
-{
-    FileResourceSelectorWidget* newCtrl = aznew FileResourceSelectorWidget(pParent);
-    connect(newCtrl, &FileResourceSelectorWidget::PathChanged, newCtrl, [newCtrl]()
-        {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
-        });
-    return newCtrl;
-}
-
-void FileResourceSelectorWidgetHandler::ConsumeAttribute(FileResourceSelectorWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-{
-    Q_UNUSED(GUI);
-    Q_UNUSED(attrib);
-    Q_UNUSED(attrValue);
-    Q_UNUSED(debugName);
-}
-
-void FileResourceSelectorWidgetHandler::WriteGUIValuesIntoProperty(size_t index, FileResourceSelectorWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
-    Q_UNUSED(index);
-    Q_UNUSED(node);
-    CReflectedVarResource val = instance;
-    val.m_propertyType = GUI->GetPropertyType();
-    val.m_path = GUI->GetPath().toUtf8().data();
-    instance = static_cast<property_t>(val);
-}
-
-bool FileResourceSelectorWidgetHandler::ReadValuesIntoGUI(size_t index, FileResourceSelectorWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
-    Q_UNUSED(index);
-    Q_UNUSED(node);
-    CReflectedVarResource val = instance;
-    GUI->SetPropertyType(val.m_propertyType);
-    GUI->SetPath(val.m_path.c_str());
-    return false;
-}
-
-#include <Controls/ReflectedPropertyControl/moc_PropertyResourceCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
deleted file mode 100644
index 44c4e2cfc2..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
-#define CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include "ReflectedVar.h"
-#include "Util/VariablePropertyType.h"
-#include <QWidget>
-#include <QtWidgets/QToolButton>
-#include <QtCore/QVector>
-#endif
-
-class QLineEdit;
-class QHBoxLayout;
-class CBitmapToolTip;
-class QToolTipWidget;
-
-class BrowseButton
-    : public QToolButton
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(BrowseButton, AZ::SystemAllocator, 0);
-
-    BrowseButton(PropertyType type, QWidget* parent = nullptr);
-
-    void SetPath(const QString& path) { m_path = path; }
-    QString GetPath() const { return m_path; }
-
-    PropertyType GetPropertyType() const {return m_propertyType; }
-
-signals:
-    void PathChanged(const QString& path);
-
-protected:
-    void SetPathAndEmit(const QString& path);
-    virtual void OnClicked() = 0;
-
-    PropertyType m_propertyType;
-    QString m_path;
-};
-
-class FileResourceSelectorWidget
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    AZ_CLASS_ALLOCATOR(FileResourceSelectorWidget, AZ::SystemAllocator, 0);
-    FileResourceSelectorWidget(QWidget* pParent = nullptr);
-
-    bool SetPath(const QString& path);
-    QString GetPath() const;
-    void SetPropertyType(PropertyType type);
-    PropertyType GetPropertyType() const { return m_propertyType; }
-
-    QWidget* GetFirstInTabOrder();
-    QWidget* GetLastInTabOrder();
-    void UpdateTabOrder();
-
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-signals:
-    void PathChanged(const QString& path);
-
-protected:
-    bool event(QEvent* event) override;
-
-private:
-    void OnAssignClicked();
-    void OnMaterialClicked();
-
-    void UpdateWidgets();
-    void AddButton(BrowseButton* button);
-    void OnPathChanged(const QString& path);
-
-private:
-    QLineEdit* m_pathEdit;
-    PropertyType m_propertyType;
-    QString m_path;
-
-    QHBoxLayout* m_mainLayout;
-    QVector<BrowseButton*> m_buttons;
-    QScopedPointer<CBitmapToolTip> m_previewToolTip;
-    QToolTipWidget* m_tooltip;
-};
-
-class FileResourceSelectorWidgetHandler
-    : QObject
-    , public AzToolsFramework::PropertyHandler < CReflectedVarResource, FileResourceSelectorWidget >
-{
-public:
-    AZ_CLASS_ALLOCATOR(FileResourceSelectorWidgetHandler, AZ::SystemAllocator, 0);
-
-    virtual AZ::u32 GetHandlerName(void) const override  { return AZ_CRC("Resource", 0xbc91f416); }
-    virtual bool IsDefaultHandler() const override { return true; }
-    virtual QWidget* GetFirstInTabOrder(FileResourceSelectorWidget* widget) override { return widget->GetFirstInTabOrder(); }
-    virtual QWidget* GetLastInTabOrder(FileResourceSelectorWidget* widget) override { return widget->GetLastInTabOrder(); }
-    virtual void UpdateWidgetInternalTabbing(FileResourceSelectorWidget* widget) override { widget->UpdateTabOrder(); }
-
-    virtual QWidget* CreateGUI(QWidget* pParent) override;
-    virtual void ConsumeAttribute(FileResourceSelectorWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-    virtual void WriteGUIValuesIntoProperty(size_t index, FileResourceSelectorWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-    virtual bool ReadValuesIntoGUI(size_t index, FileResourceSelectorWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
deleted file mode 100644
index 7d9f3ed62d..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation file
-
-#include "EditorDefs.h"
-
-#include "ReflectedPropertiesPanel.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// ReflectedPropertiesPanel dialog
-
-
-ReflectedPropertiesPanel::ReflectedPropertiesPanel(QWidget* pParent)
-    : ReflectedPropertyControl(pParent)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ReflectedPropertiesPanel::DeleteVars()
-{
-    ClearVarBlock();
-    m_updateCallbacks.clear();
-    m_varBlock = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ReflectedPropertiesPanel::SetVarBlock(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* updCallback, const char* category)
-{
-    assert(vb);
-
-    m_varBlock = vb;
-
-    RemoveAllItems();
-    m_varBlock = vb;
-    AddVarBlock(m_varBlock, category);
-
-    SetUpdateCallback(AZStd::bind(&ReflectedPropertiesPanel::OnPropertyChanged, this, AZStd::placeholders::_1));
-
-    // When new object set all previous callbacks freed.
-    m_updateCallbacks.clear();
-    if (updCallback)
-    {
-        stl::push_back_unique(m_updateCallbacks, updCallback);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ReflectedPropertiesPanel::AddVars(CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* updCallback, const char* category)
-{
-    assert(vb);
-
-    bool bNewBlock = false;
-    // Make a clone of properties.
-    if (!m_varBlock)
-    {
-        RemoveAllItems();
-        m_varBlock = vb->Clone(true);
-        AddVarBlock(m_varBlock, category);
-        bNewBlock = true;
-    }
-    m_varBlock->Wire(vb);
-
-    if (bNewBlock)
-    {
-        SetUpdateCallback(AZStd::bind(&ReflectedPropertiesPanel::OnPropertyChanged, this, AZStd::placeholders::_1));
-
-        // When new object set all previous callbacks freed.
-        m_updateCallbacks.clear();
-    }
-
-    if (updCallback)
-    {
-        stl::push_back_unique(m_updateCallbacks, updCallback);
-    }
-}
-
-void ReflectedPropertiesPanel::OnPropertyChanged(IVariable* pVar)
-{
-    std::list<ReflectedPropertyControl::UpdateVarCallback*>::iterator iter;
-    for (iter = m_updateCallbacks.begin(); iter != m_updateCallbacks.end(); ++iter)
-    {
-        (*iter)->operator()(pVar);
-    }
-}
-
-
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
deleted file mode 100644
index f8a83322a5..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_REFLECTEDPROPERTIESPANEL_H
-#define CRYINCLUDE_EDITOR_REFLECTEDPROPERTIESPANEL_H
-
-#pragma once
-
-#include "Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h"
-#include "Util/Variable.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// ReflectedPropertiesPanel dialog
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-//This class is a port of ReflectedPropertiesPanel to use the ReflectedPropertyControl
-class SANDBOX_API ReflectedPropertiesPanel
-    : public ReflectedPropertyControl
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    ReflectedPropertiesPanel(QWidget* pParent = nullptr);   // standard constructor
-
-    void DeleteVars();
-    void AddVars(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* func = nullptr, const char* category = nullptr);
-
-    void SetVarBlock(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* func = nullptr, const char* category = nullptr);
-
-protected:
-    void OnPropertyChanged(IVariable* pVar);
-
-protected:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    TSmartPtr<CVarBlock> m_varBlock;
-
-    std::list<ReflectedPropertyControl::UpdateVarCallback*> m_updateCallbacks;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-
-#endif // CRYINCLUDE_EDITOR_REFLECTEDPROPERTIESPANEL_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
deleted file mode 100644
index c3bc965620..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
+++ /dev/null
@@ -1,1289 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ReflectedPropertyCtrl.h"
-
-// Qt
-#include <QScopedValueRollback>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMenu>
-#include <QScrollArea>
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.hxx>
-#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx>
-#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
-#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
-
-// Editor
-#include "Clipboard.h"
-
-
-ReflectedPropertyControl::ReflectedPropertyControl(QWidget *parent /*= nullptr*/, Qt::WindowFlags windowFlags /*= Qt::WindowFlags()*/)
-    : QWidget(parent, windowFlags)
-    , AzToolsFramework::IPropertyEditorNotify()
-    , m_filterLineEdit(nullptr)
-    , m_filterWidget(nullptr)
-    , m_titleLabel(nullptr)
-    , m_bEnableCallback(true)
-    , m_updateVarFunc(nullptr)
-    , m_updateObjectFunc(nullptr)
-    , m_selChangeFunc(nullptr)
-    , m_undoFunc(nullptr)
-    , m_bStoreUndoByItems(true)
-    , m_bForceModified(false)
-    , m_groupProperties(false)
-    , m_sortProperties(false)
-    , m_bSendCallbackOnNonModified(true)
-    , m_initialized(false)
-    , m_isTwoColumnSection(false)
-{
-    EBUS_EVENT_RESULT(m_serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(m_serializeContext, "Serialization context not available");
-    qRegisterMetaType<IVariable*>("IVariablePtr");
-
-    m_editor = new AzToolsFramework::ReflectedPropertyEditor(nullptr);
-    m_editor->SetAutoResizeLabels(true);
-
-    m_titleLabel = new QLabel;
-    m_titleLabel->hide();
-
-    m_filterWidget = new QWidget;
-    QLabel *label = new QLabel(tr("Search"));
-    m_filterLineEdit = new QLineEdit;
-    QHBoxLayout *filterlayout = new QHBoxLayout(m_filterWidget);
-    filterlayout->addWidget(label);
-    filterlayout->addWidget(m_filterLineEdit);
-    connect(m_filterLineEdit, &QLineEdit::textChanged, this, &ReflectedPropertyControl::RestrictToItemsContaining);
-
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-    mainLayout->addWidget(m_titleLabel, 0, Qt::AlignHCenter);
-    mainLayout->addWidget(m_filterWidget);
-    mainLayout->addWidget(m_editor, 1);
-
-    SetShowFilterWidget(false);
-    setMinimumSize(330, 0);
-}
-
-void ReflectedPropertyControl::Setup(bool showScrollbars /*= true*/, int labelWidth /*= 150*/)
-{
-    if (!m_initialized)
-    {
-        m_editor->Setup(m_serializeContext, this, showScrollbars, labelWidth);
-        m_initialized = true;
-    }
-}
-
-QSize ReflectedPropertyControl::sizeHint() const
-{
-    return m_editor->sizeHint();
-}
-
-ReflectedPropertyItem* ReflectedPropertyControl::AddVarBlock(CVarBlock *varBlock, const char *szCategory /*= nullptr*/)
-{
-    AZ_Assert(m_initialized, "ReflectedPropertyControl not initialized. Setup must be called first.");
-
-    if (!varBlock)
-        return nullptr;
-
-    m_pVarBlock = varBlock;
-
-    if (!m_root)
-    {
-        m_root = new ReflectedPropertyItem(this, nullptr);
-        m_rootContainer.reset(new CPropertyContainer(szCategory ? AZStd::string(szCategory) : AZStd::string()));
-        m_rootContainer->SetAutoExpand(true);
-        m_editor->AddInstance(m_rootContainer.get());
-    }
-
-
-    AZStd::vector<IVariable*> variables(varBlock->GetNumVariables());
-
-    //Copy variables into vector
-    int n = 0;
-    std::generate(variables.begin(), variables.end(), [&n, varBlock]{return varBlock->GetVariable(n++); });
-
-    //filter list based on search string
-    if (!m_filterString.isEmpty())
-    {
-        AZStd::vector<IVariable*> newVariables;
-        for (IVariable* var : variables)
-        {
-            if (QString(var->GetName()).toLower().contains(m_filterString))
-            {
-                newVariables.emplace_back(var);
-            }
-        }
-        variables.swap(newVariables);
-    }
-
-    //sorting if needed.  sort first when grouping to make grouping easier
-    if (m_sortProperties || m_groupProperties)
-    {
-        std::sort(variables.begin(), variables.end(), [](IVariable *var1, IVariable *var2) {return QString::compare(var1->GetName(), var2->GetName(), Qt::CaseInsensitive) <=0; } );
-    }
-
-    CPropertyContainer *parentContainer = m_rootContainer.get();
-    ReflectedPropertyItem *parentItem = m_root;
-    QChar currentGroupInitial;
-    for (auto var : variables)
-    {
-        if (m_groupProperties)
-        {
-            //check to see if this item starts with same letter as last. If not, create a new group for it.
-            const QChar groupInitial = var->GetName().toUpper().at(0);
-            if (groupInitial != currentGroupInitial)
-            {
-                currentGroupInitial = groupInitial;
-                //make new group be the parent for this item
-                parentItem = new ReflectedPropertyItem(this, parentItem);
-
-                QString groupName(groupInitial);
-                parentContainer = new CPropertyContainer(AZStd::string(groupName.toUtf8().data()));
-                parentContainer->SetAutoExpand(false);
-                m_rootContainer->AddProperty(parentContainer);
-            }
-        }
-        ReflectedPropertyItemPtr childItem = new ReflectedPropertyItem(this, parentItem);
-        childItem->SetVariable(var);
-        CReflectedVar *reflectedVar = childItem->GetReflectedVar();
-        parentContainer->AddProperty(reflectedVar);
-    }
-    m_editor->QueueInvalidation(AzToolsFramework::Refresh_EntireTree);
-
-    return parentItem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void AddVariable(CVariableBase& varArray, CVariableBase& var, const char* varName, const char* humanVarName, const char* description, IVariable::OnSetCallback* func, void* pUserData, char dataType = IVariable::DT_SIMPLE)
-{
-    if (varName)
-    {
-        var.SetName(varName);
-    }
-    if (humanVarName)
-    {
-        var.SetHumanName(humanVarName);
-    }
-    if (description)
-    {
-        var.SetDescription(description);
-    }
-    var.SetDataType(dataType);
-    var.SetUserData(QVariant::fromValue<void *>(pUserData));
-    if (func)
-    {
-        var.AddOnSetCallback(func);
-    }
-    varArray.AddVariable(&var);
-}
-
-void ReflectedPropertyControl::CreateItems(XmlNodeRef node)
-{
-    CVarBlockPtr out;
-    CreateItems(node, out, nullptr);
-}
-
-void ReflectedPropertyControl::CreateItems(XmlNodeRef node, CVarBlockPtr& outBlockPtr, IVariable::OnSetCallback* func, bool splitCamelCaseIntoWords)
-{
-    SelectItem(0);
-
-    outBlockPtr = new CVarBlock;
-    for (size_t i = 0, iGroupCount(node->getChildCount()); i < iGroupCount; ++i)
-    {
-        XmlNodeRef groupNode = node->getChild(i);
-
-        if (groupNode->haveAttr("hidden"))
-        {
-            bool isGroupHidden = false;
-            groupNode->getAttr("hidden", isGroupHidden);
-            if (isGroupHidden)
-            {
-                // do not create visual editors for this group
-                continue;
-            }
-        }
-
-        CSmartVariableArray group;
-        group->SetName(groupNode->getTag());
-        group->SetHumanName(groupNode->getTag());
-        group->SetDescription("");
-        group->SetDataType(IVariable::DT_SIMPLE);
-        outBlockPtr->AddVariable(&*group);
-
-        for (int k = 0, iChildCount(groupNode->getChildCount()); k < iChildCount; ++k)
-        {
-            XmlNodeRef child = groupNode->getChild(k);
-
-            const char* type;
-            if (!child->getAttr("type", &type))
-            {
-                continue;
-            }
-
-            // read parameter description from the tip tag and from associated console variable
-            QString strDescription;
-            child->getAttr("tip", strDescription);
-            QString strTipCVar;
-            child->getAttr("TipCVar", strTipCVar);
-            if (!strTipCVar.isEmpty())
-            {
-                strTipCVar.replace("*", child->getTag());
-                if (ICVar* pCVar = gEnv->pConsole->GetCVar(strTipCVar.toUtf8().data()))
-                {
-                    if (!strDescription.isEmpty())
-                    {
-                        strDescription += QString("\r\n");
-                    }
-                    strDescription = pCVar->GetHelp();
-
-#ifdef FEATURE_SVO_GI
-                    // Hide or unlock experimental items
-                    if ((pCVar->GetFlags() & VF_EXPERIMENTAL) && strstr(groupNode->getTag(), "Total_Illumination"))
-                    {
-                        AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome outcome;
-                        AzToolsFramework::EditorSettingsAPIBus::BroadcastResult(outcome, &AzToolsFramework::EditorSettingsAPIBus::Handler::GetValue, "Settings\\ExperimentalFeatures|TotalIlluminationEnabled");
-                        AZStd::any outcomeValue = outcome.GetValue<AZStd::any>();
-                        if (outcomeValue.is<bool>())
-                        {
-                            bool featureEnabled = AZStd::any_cast<bool>(outcomeValue);
-                            if (!featureEnabled)
-                            {
-                                continue;
-                            }
-                        }
-                    }
-#endif
-                }
-            }
-            QString humanReadableName;
-            child->getAttr("human", humanReadableName);
-            if (humanReadableName.isEmpty())
-            {
-                humanReadableName = child->getTag();
-
-                if (splitCamelCaseIntoWords)
-                {
-                    for (int index = 1; index < humanReadableName.length() - 1; index++)
-                    {
-                        // insert spaces between words
-                        if ((humanReadableName[index - 1].isLower() && humanReadableName[index].isUpper()) || (humanReadableName[index + 1].isLower() && humanReadableName[index - 1].isUpper() && humanReadableName[index].isUpper()))
-                        {
-                            humanReadableName.insert(index++, ' ');
-                        }
-
-                        // convert single upper cases letters to lower case
-                        if (humanReadableName[index].isUpper() && humanReadableName[index + 1].isLower())
-                        {
-                            humanReadableName[index] = humanReadableName[index].toLower();
-                        }
-                    }
-                }
-            }
-
-            void* pUserData = reinterpret_cast<void*>((i << 16) | k);
-
-            if (!azstricmp(type, "int"))
-            {
-                CSmartVariable<int> intVar;
-                AddVariable(group, intVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData);
-                int nValue(0);
-                if (child->getAttr("value", nValue))
-                {
-                    intVar->Set(nValue);
-                }
-
-                int nMin(0), nMax(0);
-                if (child->getAttr("min", nMin) && child->getAttr("max", nMax))
-                {
-                    intVar->SetLimits(nMin, nMax);
-                }
-            }
-            else if (!azstricmp(type, "float"))
-            {
-                CSmartVariable<float> floatVar;
-                AddVariable(group, floatVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData);
-                float fValue(0.0f);
-                if (child->getAttr("value", fValue))
-                {
-                    floatVar->Set(fValue);
-                }
-
-                float fMin(0), fMax(0);
-                if (child->getAttr("min", fMin) && child->getAttr("max", fMax))
-                {
-                    floatVar->SetLimits(fMin, fMax);
-                }
-            }
-            else if (!azstricmp(type, "vector"))
-            {
-                CSmartVariable<Vec3> vec3Var;
-                AddVariable(group, vec3Var, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData);
-                Vec3 vValue(0, 0, 0);
-                if (child->getAttr("value", vValue))
-                {
-                    vec3Var->Set(vValue);
-                }
-            }
-            else if (!azstricmp(type, "bool"))
-            {
-                CSmartVariable<bool> bVar;
-                AddVariable(group, bVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData);
-                bool bValue(false);
-                if (child->getAttr("value", bValue))
-                {
-                    bVar->Set(bValue);
-                }
-            }
-            else if (!azstricmp(type, "texture"))
-            {
-                CSmartVariable<QString> textureVar;
-                AddVariable(group, textureVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData, IVariable::DT_TEXTURE);
-                const char* textureName;
-                if (child->getAttr("value", &textureName))
-                {
-                    textureVar->Set(textureName);
-                }
-            }
-            else if (!azstricmp(type, "color"))
-            {
-                CSmartVariable<Vec3> colorVar;
-                AddVariable(group, colorVar, child->getTag(), humanReadableName.toUtf8().data(), strDescription.toUtf8().data(), func, pUserData, IVariable::DT_COLOR);
-                ColorB color;
-                if (child->getAttr("value", color))
-                {
-                    ColorF colorLinear = ColorGammaToLinear(QColor(color.r, color.g, color.b));
-                    Vec3 colorVec3(colorLinear.r, colorLinear.g, colorLinear.b);
-                    colorVar->Set(colorVec3);
-                }
-            }
-        }
-    }
-
-    AddVarBlock(outBlockPtr);
-
-    InvalidateCtrl();
-}
-
-void ReflectedPropertyControl::ReplaceVarBlock(IVariable *categoryItem, CVarBlock *varBlock)
-{
-    assert(m_root);
-    ReflectedPropertyItem *pCategoryItem = m_root->findItem(categoryItem);
-    if (pCategoryItem)
-    {
-        pCategoryItem->ReplaceVarBlock(varBlock);
-        m_editor->QueueInvalidation(AzToolsFramework::Refresh_EntireTree);
-    }
-}
-
-void ReflectedPropertyControl::ReplaceRootVarBlock(CVarBlock* newVarBlock)
-{
-    const AZStd::string category = m_rootContainer->m_varName;
-    RemoveAllItems();
-    AddVarBlock(newVarBlock, category.c_str());
-}
-
-void ReflectedPropertyControl::UpdateVarBlock(CVarBlock *pVarBlock)
-{
-    UpdateVarBlock(m_root, pVarBlock, m_pVarBlock);
-    m_editor->QueueInvalidation(AzToolsFramework::Refresh_AttributesAndValues);
-}
-
-void ReflectedPropertyControl::UpdateVarBlock(ReflectedPropertyItem* pPropertyItem, IVariableContainer *pSourceContainer, IVariableContainer *pTargetContainer)
-{
-    for (int i = 0; i < pPropertyItem->GetChildCount(); ++i)
-    {
-        ReflectedPropertyItem *pChild = pPropertyItem->GetChild(i);
-
-        if (pChild->GetType() != ePropertyInvalid)
-        {
-            const QString pPropertyVariableName = pChild->GetVariable()->GetName();
-
-            IVariable* pTargetVariable = pTargetContainer->FindVariable(pPropertyVariableName.toUtf8().data());
-            IVariable* pSourceVariable = pSourceContainer->FindVariable(pPropertyVariableName.toUtf8().data());
-
-            if (pSourceVariable && pTargetVariable)
-            {
-                pTargetVariable->SetFlags(pSourceVariable->GetFlags());
-                pTargetVariable->SetDisplayValue(pSourceVariable->GetDisplayValue());
-                pTargetVariable->SetUserData(pSourceVariable->GetUserData());
-
-                UpdateVarBlock(pChild, pSourceVariable, pTargetVariable);
-            }
-        }
-    }
-}
-
-ReflectedPropertyItem* ReflectedPropertyControl::FindItemByVar(IVariable* pVar)
-{
-    return m_root->findItem(pVar);
-}
-
-ReflectedPropertyItem* ReflectedPropertyControl::GetRootItem()
-{
-    return m_root;
-}
-
-int ReflectedPropertyControl::GetContentHeight() const
-{
-    return m_editor->GetContentHeight();
-}
-
-
-void ReflectedPropertyControl::AddCustomPopupMenuPopup(const QString& text, const AZStd::function<void(int)>& handler, const QStringList& items)
-{
-    m_customPopupMenuPopups.push_back(SCustomPopupMenu(text, handler, items));
-}
-
-
-void ReflectedPropertyControl::AddCustomPopupMenuItem(const QString& text, const SCustomPopupItem::Callback handler)
-{
-    m_customPopupMenuItems.push_back(SCustomPopupItem(text, handler));
-}
-
-//////////////////////////////////////////////////////////////////////////
-template<typename T>
-void ReflectedPropertyControl::RemoveCustomPopup(const QString& text, T& customPopup)
-{
-    for (auto itr = customPopup.begin(); itr != customPopup.end(); ++itr)
-    {
-        if (text == itr->m_text)
-        {
-            customPopup.erase(itr);
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ReflectedPropertyControl::RemoveCustomPopupMenuItem(const QString& text)
-{
-    RemoveCustomPopup(text, m_customPopupMenuItems);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ReflectedPropertyControl::RemoveCustomPopupMenuPopup(const QString& text)
-{
-    RemoveCustomPopup(text, m_customPopupMenuPopups);
-}
-
-void ReflectedPropertyControl::RestrictToItemsContaining(const QString &searchName)
-{
-   m_filterString = searchName.toLower();
-   RecreateAllItems();
-}
-
-void ReflectedPropertyControl::SetUpdateCallback(const ReflectedPropertyControl::UpdateVarCallback& callback)
-{
-    m_updateVarFunc = callback;
-}
-
-void ReflectedPropertyControl::SetSavedStateKey(AZ::u32 key)
-{
-    m_editor->SetSavedStateKey(key);
-}
-
-void ReflectedPropertyControl::RemoveAllItems()
-{
-    m_editor->ClearInstances();
-    m_rootContainer.reset();
-    m_root.reset();
-}
-
-void ReflectedPropertyControl::ClearVarBlock()
-{
-    RemoveAllItems();
-    m_pVarBlock = 0;
-}
-
-void ReflectedPropertyControl::RecreateAllItems()
-{
-    RemoveAllItems();
-    AddVarBlock(m_pVarBlock);
-}
-
-
-void ReflectedPropertyControl::SetGroupProperties(bool group)
-{
-    m_groupProperties = group;
-    RecreateAllItems();
-}
-
-void ReflectedPropertyControl::SetSortProperties(bool sort)
-{
-    m_sortProperties = sort;
-    RecreateAllItems();
-}
-
-
-void ReflectedPropertyControl::AfterPropertyModified(AzToolsFramework::InstanceDataNode* pNode)
-{
-    if (!pNode)
-        return;
-
-    CReflectedVar *pReflectedVar = GetReflectedVarFromCallbackInstance(pNode);
-    ReflectedPropertyItem *item = m_root->findItem(pReflectedVar);
-    AZ_Assert(item, "No item found in property modification callback");
-    item->OnReflectedVarChanged();
-
-    OnItemChange(item);
-}
-
-
-void ReflectedPropertyControl::SetIsTwoColumnCtrlSection(bool isSection)
-{
-    m_isTwoColumnSection = isSection;
-}
-
-void ReflectedPropertyControl::RequestPropertyContextMenu(AzToolsFramework::InstanceDataNode* pNode, const QPoint& pos)
-{
-    if (!pNode)
-        return;
-
-    CReflectedVar *pReflectedVar = GetReflectedVarFromCallbackInstance(pNode);
-    ReflectedPropertyItem *pItem = m_root->findItem(pReflectedVar);
-    AZ_Assert(pItem, "No item found in Context Menu callback");
-
-    CClipboard clipboard(nullptr);
-
-    // Popup Menu with Event selection.
-    QMenu menu;
-    UINT i = 0;
-
-    const int ePPA_CustomItemBase = 10; // reserved from 10 to 99
-    const int ePPA_CustomPopupBase = 100; // reserved from 100 to x*100+100 where x is size of m_customPopupMenuPopups
-
-    menu.addAction(tr("Copy"), [&]() { OnCopy({ pItem }, false); });
-    menu.addAction(tr("Copy Recursively"), [&]() { OnCopy({ pItem }, true); });
-    if (m_isTwoColumnSection)
-    {
-        // For a two-column control, OnCopyAll will only copy all for this section
-            // Emit a signal to the two-column control if we want to copy all sections
-        menu.addAction(tr("Copy Section"), [&]() { OnCopyAll(); });
-        menu.addAction(tr("Copy All"), [&]() { emit CopyAllSections(); });
-        menu.addSeparator();
-        menu.addAction(tr("Paste"), [&]() { emit PasteAllSections(); })->setEnabled(!clipboard.IsEmpty());
-    }
-    else
-    {
-        menu.addAction(tr("Copy All"), [&]() { OnCopyAll(); });
-        menu.addSeparator();
-        menu.addAction(tr("Paste"), [&]() { OnPaste(); })->setEnabled(!clipboard.IsEmpty());
-    }
-
-
-    if (!m_customPopupMenuItems.empty() || !m_customPopupMenuPopups.empty())
-    {
-        menu.addSeparator();
-    }
-
-    for (auto itr = m_customPopupMenuItems.cbegin(); itr != m_customPopupMenuItems.cend(); ++itr, ++i)
-    {
-        QAction *action = menu.addAction(itr->m_text);
-        action->setData(ePPA_CustomItemBase + i);
-    }
-
-    for (UINT j = 0; j < m_customPopupMenuPopups.size(); ++j)
-    {
-        SCustomPopupMenu* pMenuInfo = &m_customPopupMenuPopups[j];
-        QMenu* pSubMenu = menu.addMenu(pMenuInfo->m_text);
-
-        for (UINT k = 0; k < pMenuInfo->m_subMenuText.size(); ++k)
-        {
-            const UINT uID = ePPA_CustomPopupBase + ePPA_CustomPopupBase * j + k;
-            QAction *action = pSubMenu->addAction(pMenuInfo->m_subMenuText[k]);
-            action->setData(uID);
-        }
-    }
-
-    QAction *result = menu.exec(pos);
-    if (!result)
-    {
-        return;
-    }
-    const int res = result->data().toInt();
-    if (res >= ePPA_CustomItemBase && res < m_customPopupMenuItems.size() + ePPA_CustomItemBase)
-    {
-        m_customPopupMenuItems[res - ePPA_CustomItemBase].m_callback();
-    }
-    else if (res >= ePPA_CustomPopupBase && res < ePPA_CustomPopupBase + ePPA_CustomPopupBase * m_customPopupMenuPopups.size())
-    {
-        const int menuid = res / ePPA_CustomPopupBase - 1;
-        const int option = res % ePPA_CustomPopupBase;
-        m_customPopupMenuPopups[menuid].m_callback(option);
-    }
-}
-void ReflectedPropertyControl::SetSelChangeCallback(SelChangeCallback callback)
-{
-    m_selChangeFunc = callback;
-    m_editor->SetSelectionEnabled(true);
-}
-
-void ReflectedPropertyControl::PropertySelectionChanged(AzToolsFramework::InstanceDataNode *pNode, bool selected)
-{
-    if (!pNode)
-    {
-        return;
-    }
-
-    CReflectedVar *pReflectedVar = GetReflectedVarFromCallbackInstance(pNode);
-    ReflectedPropertyItem *pItem = m_root->findItem(pReflectedVar);
-    AZ_Assert(pItem, "No item found in selectoin change callback");
-
-    if (m_selChangeFunc)
-    {
-        //keep same logic as MFC where pass null if it's deselection
-        m_selChangeFunc(selected ? pItem->GetVariable() : nullptr);
-    }
-}
-
-CReflectedVar * ReflectedPropertyControl::GetReflectedVarFromCallbackInstance(AzToolsFramework::InstanceDataNode *pNode)
-{
-    if (!pNode)
-        return nullptr;
-    const AZ::SerializeContext::ClassData *classData = pNode->GetClassMetadata();
-    if (classData->m_azRtti && classData->m_azRtti->IsTypeOf(CReflectedVar::TYPEINFO_Uuid()))
-        return reinterpret_cast<CReflectedVar *>(pNode->GetInstance(0));
-    else
-        return GetReflectedVarFromCallbackInstance(pNode->GetParent());
-}
-
-
-AzToolsFramework::PropertyRowWidget* ReflectedPropertyControl::FindPropertyRowWidget(ReflectedPropertyItem* item)
-{
-    if (!item)
-    {
-        return nullptr;
-    }
-    const AzToolsFramework::ReflectedPropertyEditor::WidgetList& widgets = m_editor->GetWidgets();
-    for (auto instance : widgets)
-    {
-        if (instance.second->label() == item->GetPropertyName())
-        {
-            return instance.second;
-        }
-    }
-    return nullptr;
-}
-
-
-void ReflectedPropertyControl::OnItemChange(ReflectedPropertyItem *item, bool deferCallbacks)
-{
-    if (!item->IsModified() || !m_bSendCallbackOnNonModified)
-        return;
-
-    // variable updates/changes can trigger widgets being shown/hidden; allow a delay triggering the update
-    // callback until after the current event queue is processed, so that we aren't changing other widgets
-    // as a ton of them are still being created.
-    Qt::ConnectionType connectionType = deferCallbacks ? Qt::QueuedConnection : Qt::DirectConnection;
-    if (m_updateVarFunc != 0 && m_bEnableCallback)
-    {
-        QMetaObject::invokeMethod(this, "DoUpdateCallback", connectionType, Q_ARG(IVariable*, item->GetVariable()));
-    }
-    if (m_updateObjectFunc != 0 && m_bEnableCallback)
-    {
-        // KDAB: This callback has same signature as DoUpdateCallback. I think the only reason there are 2 is because some
-        // EntityObject registers callback and some derived objects want to register their own callback. the normal UpdateCallback
-        // can only be registered for item at a time so the original authors added a 2nd callback function, so we ported it this way.
-        // This can probably get cleaned up to only on callback function with multiple receivers.
-        QMetaObject::invokeMethod(this, "DoUpdateObjectCallback", connectionType, Q_ARG(IVariable*, item->GetVariable()));
-    }
-}
-
-
-void ReflectedPropertyControl::DoUpdateCallback(IVariable *var)
-{
-    // guard against element containing the IVariable being removed during a deferred callback
-    const bool variableStillExists = FindVariable(var);
-    AZ_Assert(variableStillExists, "This variable and the item containing it were destroyed during a deferred callback. Change to non-deferred callback.");
-
-    if (m_updateVarFunc == 0 || !variableStillExists)
-    {
-        return;
-    }
-
-    QScopedValueRollback<bool> rb(m_bEnableCallback, false);
-    m_updateVarFunc(var);
-}
-
-void ReflectedPropertyControl::DoUpdateObjectCallback(IVariable *var)
-{
-    // guard against element containing the IVariable being removed during a deferred callback
-    const bool variableStillExists = FindVariable(var);
-    AZ_Assert(variableStillExists, "This variable and the item containing it were destroyed during a deferred callback. Change to non-deferred callback.");
-
-    if (m_updateVarFunc == 0 || !variableStillExists)
-    {
-        return;
-    }
-
-    QScopedValueRollback<bool> rb(m_bEnableCallback, false);
-    m_updateObjectFunc(var);
-}
-
-void ReflectedPropertyControl::InvalidateCtrl(bool queued)
-{
-    if (queued)
-    {
-        m_editor->QueueInvalidation(AzToolsFramework::Refresh_AttributesAndValues);
-    }
-    else
-    {
-        m_editor->InvalidateAttributesAndValues();
-    }
-}
-
-void ReflectedPropertyControl::RebuildCtrl(bool queued)
-{
-    if (queued)
-    {
-        m_editor->QueueInvalidation(AzToolsFramework::Refresh_EntireTree);
-    }
-    else
-    {
-        m_editor->InvalidateAll();
-    }
-}
-
-bool ReflectedPropertyControl::CallUndoFunc(ReflectedPropertyItem *item)
-{
-    if (!m_undoFunc)
-        return false;
-
-    m_undoFunc(item->GetVariable());
-    return true;
-
-}
-
-void ReflectedPropertyControl::ClearSelection()
-{
-    m_editor->SelectInstance(nullptr);
-}
-
-void ReflectedPropertyControl::SelectItem(ReflectedPropertyItem* item)
-{
-    AzToolsFramework::PropertyRowWidget *widget = FindPropertyRowWidget(item);
-    if (widget)
-    {
-        m_editor->SelectInstance(m_editor->GetNodeFromWidget(widget));
-    }
-}
-
-ReflectedPropertyItem* ReflectedPropertyControl::GetSelectedItem()
-{
-    AzToolsFramework::PropertyRowWidget *widget = m_editor->GetWidgetFromNode(m_editor->GetSelectedInstance());
-    if (widget)
-    {
-       return m_root->findItem(widget->label());
-    }
-    return nullptr;
-}
-
-
-QVector<ReflectedPropertyItem*> ReflectedPropertyControl::GetSelectedItems()
-{
-    auto item = GetSelectedItem();
-    return item == nullptr ? QVector<ReflectedPropertyItem*>() : QVector<ReflectedPropertyItem*>{item};
-}
-
-void ReflectedPropertyControl::OnCopy(QVector<ReflectedPropertyItem*> itemsToCopy, bool bRecursively)
-{
-    if (!itemsToCopy.isEmpty())
-    {
-        CClipboard clipboard(nullptr);
-        auto rootNode = XmlHelpers::CreateXmlNode("PropertyCtrl");
-        for (auto item : itemsToCopy)
-        {
-            CopyItem(rootNode, item, bRecursively);
-        }
-        clipboard.Put(rootNode);
-    }
-}
-
-void ReflectedPropertyControl::OnCopyAll()
-{
-    if (m_root)
-    {
-        CClipboard clipboard(nullptr);
-        auto rootNode = XmlHelpers::CreateXmlNode("PropertyCtrl");
-        OnCopyAll(rootNode);
-        clipboard.Put(rootNode);
-    }
-}
-
-void ReflectedPropertyControl::OnCopyAll(XmlNodeRef rootNode)
-{
-    if (m_root)
-    {
-        for (int i = 0; i < m_root->GetChildCount(); i++)
-        {
-            CopyItem(rootNode, m_root->GetChild(i), true);
-        }
-    }
-}
-
-void ReflectedPropertyControl::OnPaste()
-{
-    CClipboard clipboard(nullptr);
-
-    CUndo undo("Paste Properties");
-
-    XmlNodeRef rootNode = clipboard.Get();
-    SetValuesFromNode(rootNode);
-}
-
-void ReflectedPropertyControl::SetValuesFromNode(XmlNodeRef rootNode)
-{
-    if (!rootNode || !rootNode->isTag("PropertyCtrl"))
-    {
-        return;
-    }
-
-    for (int i = 0; i < rootNode->getChildCount(); i++)
-    {
-        XmlNodeRef node = rootNode->getChild(i);
-        QString value;
-        QString name;
-        node->getAttr("Name", name);
-        node->getAttr("Value", value);
-        auto pItem = m_root->FindItemByFullName(name);
-        if (pItem)
-        {
-            pItem->SetValue(value);
-            // process callbacks immediately. In some cases, like the MaterialEditor the changing
-            // the value of one item will change the properties available in this control
-            // which needs to happen before we paste other values.
-            OnItemChange(pItem, false);
-        }
-    }
-}
-
-void ReflectedPropertyControl::CopyItem(XmlNodeRef rootNode, ReflectedPropertyItem* pItem, bool bRecursively)
-{
-    XmlNodeRef node = rootNode->newChild("PropertyItem");
-    node->setAttr("Name", pItem->GetFullName().toLatin1().data());
-    node->setAttr("Value", pItem->GetVariable()->GetDisplayValue().toLatin1().data());
-    if (bRecursively)
-    {
-        for (int i = 0; i < pItem->GetChildCount(); i++)
-        {
-            CopyItem(rootNode, pItem->GetChild(i), bRecursively);
-        }
-    }
-}
-
-void ReflectedPropertyControl::ReloadValues()
-{
-    if (m_root)
-        m_root->ReloadValues();
-
-    InvalidateCtrl();
-}
-
-void ReflectedPropertyControl::SetShowFilterWidget(bool showFilter)
-{
-    m_filterWidget->setVisible(showFilter);
-}
-
-void ReflectedPropertyControl::SetUndoCallback(UndoCallback &callback)
-{
-    m_undoFunc = callback;
-}
-
-void ReflectedPropertyControl::ClearUndoCallback()
-{
-    m_undoFunc = 0;
-}
-
-bool ReflectedPropertyControl::FindVariable(IVariable *categoryItem) const
-{
-    assert(m_root);
-    if (!m_root)
-    {
-        return false;
-    }
-
-    ReflectedPropertyItem *pItem = m_root->findItem(categoryItem);
-    return pItem != nullptr;
-}
-
-void ReflectedPropertyControl::EnableUpdateCallback(bool bEnable)
-{
-    // Handle case where update callbacks were disabled and we're enabling them now
-    // Need to force immediate invalidation of any queued invalidations made while callbacks were disabled
-    // to make them fire now, while m_bEnableCallback is still false.
-    if (bEnable && !m_bEnableCallback)
-    {
-        m_editor->ForceQueuedInvalidation();
-    }
-    m_bEnableCallback = bEnable;
-}
-
-void ReflectedPropertyControl::SetGrayed([[maybe_unused]] bool grayed)
-{
-    //KDAB_PROPERTYCTRL_PORT_TODO
-    //control should be grayed out but not disabled?
-}
-
-void ReflectedPropertyControl::SetReadOnly(bool readonly)
-{
-    setEnabled(!readonly);
-}
-
-
-void ReflectedPropertyControl::SetMultiSelect([[maybe_unused]] bool multiselect)
-{
-    //KDAB_PROPERTYCTRL_PORT_TODO
-}
-
-void ReflectedPropertyControl::EnableNotifyWithoutValueChange(bool bFlag)
-{
-    m_bForceModified = bFlag;
-}
-
-void ReflectedPropertyControl::SetTitle(const QString &title)
-{
-    m_titleLabel->setText(title);
-    m_titleLabel->setHidden(title.isEmpty());
-}
-
-void ReflectedPropertyControl::ExpandAll()
-{
-    m_editor->ExpandAll();
-}
-
-void ReflectedPropertyControl::CollapseAll()
-{
-    m_editor->CollapseAll();
-}
-
-void ReflectedPropertyControl::Expand(ReflectedPropertyItem* item, bool expand)
-{
-    item->Expand(expand);
-}
-
-void ReflectedPropertyControl::ExpandAllChildren(ReflectedPropertyItem* item, bool recursive)
-{
-    item->ExpandAllChildren(recursive);
-}
-
-TwoColumnPropertyControl::TwoColumnPropertyControl(QWidget *parent /*= nullptr*/)
-    : QWidget(parent)
-    , m_twoColumns(true)
-{
-    QHBoxLayout *mainlayout = new QHBoxLayout(this);
-
-    m_leftContainer = new QWidget;
-    auto leftLayout = new QVBoxLayout(m_leftContainer);
-    leftLayout->setContentsMargins(0, 0, 0, 0);
-
-    m_leftScrollArea = new QScrollArea;
-    m_leftScrollArea->setMinimumWidth(minimumColumnWidth);
-
-    m_leftScrollArea->setWidget(m_leftContainer);
-    m_leftScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_leftScrollArea->setWidgetResizable(true);
-    mainlayout->addWidget(m_leftScrollArea);
-
-    m_rightContainer = new QWidget;
-
-    auto rightLayout = new QVBoxLayout(m_rightContainer);
-    rightLayout->setContentsMargins(0, 0, 0, 0);
-
-    m_rightScrollArea = new QScrollArea;
-    m_rightScrollArea->setMinimumWidth(minimumColumnWidth);
-
-    m_rightScrollArea->setWidget(m_rightContainer);
-    m_rightScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_rightScrollArea->setWidgetResizable(true);
-    mainlayout->addWidget(m_rightScrollArea);
-}
-
-void TwoColumnPropertyControl::Setup([[maybe_unused]] bool showScrollbars /*= true*/, [[maybe_unused]] int labelWidth /*= 150*/)
-{
-}
-void TwoColumnPropertyControl::AddVarBlock(CVarBlock *varBlock, [[maybe_unused]] const char *szCategory /*= nullptr*/)
-{
-    m_pVarBlock = varBlock;
-
-    auto leftLayout = static_cast<QBoxLayout *>(m_leftContainer->layout());
-    auto rightLayout = static_cast<QBoxLayout *>(m_rightContainer->layout());
-
-    for (int i = 0; i < m_pVarBlock->GetNumVariables(); ++i)
-    {
-        CVarBlock *vb = new CVarBlock;
-        PropertyCard *ctrl = new PropertyCard;
-        m_varBlockList.append(vb);
-        m_controlList.append(ctrl);
-        IVariable *var = m_pVarBlock->GetVariable(i);
-        vb->AddVariable(var);
-        ctrl->AddVarBlock(vb);
-
-        if (var->GetFlags() & IVariable::UI_ROLLUP2)
-        {
-            rightLayout->addWidget(ctrl);
-        }
-        else
-        {
-            leftLayout->addWidget(ctrl);
-        }
-
-        ctrl->GetControl()->SetIsTwoColumnCtrlSection(true);
-        connect(ctrl->GetControl(), &ReflectedPropertyControl::CopyAllSections, this, &TwoColumnPropertyControl::OnCopyAll);
-        connect(ctrl->GetControl(), &ReflectedPropertyControl::PasteAllSections, this, &TwoColumnPropertyControl::OnPaste);
-    }
-
-    leftLayout->addStretch(1);
-    rightLayout->addStretch(1);
-}
-
-void TwoColumnPropertyControl::resizeEvent(QResizeEvent *event)
-{
-    const bool twoColumns = event->size().width() >= minimumTwoColumnWidth;
-    if (m_twoColumns != twoColumns)
-    {
-        ToggleTwoColumnLayout();
-    }
-}
-
-void TwoColumnPropertyControl::ToggleTwoColumnLayout()
-{
-    auto leftLayout = static_cast<QBoxLayout *>(m_leftContainer->layout());
-
-    if (m_twoColumns)
-    {
-        // change layout to one column
-        leftLayout->insertWidget(0, m_rightScrollArea->takeWidget());
-        m_rightScrollArea->hide();
-    }
-    else
-    {
-        // change layout to two columns
-        auto item = leftLayout->takeAt(0);
-        m_rightScrollArea->setWidget(item->widget());
-        delete item;
-        m_rightScrollArea->show();
-    }
-
-    m_twoColumns = !m_twoColumns;
-}
-
-void TwoColumnPropertyControl::ReplaceVarBlock(IVariable *categoryItem, CVarBlock *varBlock)
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->ReplaceVarBlock(categoryItem, varBlock);
-    }
-}
-
-void TwoColumnPropertyControl::RemoveAllItems()
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->RemoveAllItems();
-    }
-}
-
-bool TwoColumnPropertyControl::FindVariable(IVariable *categoryItem) const
-{
-    for (auto ctrl : m_controlList)
-    {
-        if (ctrl->GetControl()->FindVariable(categoryItem))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void TwoColumnPropertyControl::InvalidateCtrl()
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->InvalidateCtrl();
-    }
-}
-
-void TwoColumnPropertyControl::RebuildCtrl()
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->RebuildCtrl();
-    }
-}
-
-void TwoColumnPropertyControl::SetStoreUndoByItems(bool bStoreUndoByItems)
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->SetStoreUndoByItems(bStoreUndoByItems);
-    }
-}
-
-void TwoColumnPropertyControl::SetUndoCallback(ReflectedPropertyControl::UndoCallback callback)
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->SetUndoCallback(callback);
-    }
-}
-
-void TwoColumnPropertyControl::ClearUndoCallback()
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->ClearUndoCallback();
-    }
-}
-
-void TwoColumnPropertyControl::EnableUpdateCallback(bool bEnable)
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->EnableUpdateCallback(bEnable);
-    }
-}
-
-void TwoColumnPropertyControl::SetUpdateCallback(ReflectedPropertyControl::UpdateVarCallback callback)
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->SetUpdateCallback(callback);
-    }
-}
-
-void TwoColumnPropertyControl::SetGrayed(bool grayed)
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->SetGrayed(grayed);
-    }
-}
-
-
-void TwoColumnPropertyControl::SetSavedStateKey(const QString &key)
-{
-    for (int i = 0; i < m_controlList.count(); ++i)
-    {
-        m_controlList[i]->GetControl()->SetSavedStateKey(AZ::Crc32((key + QString::number(i)).toUtf8().data()));
-    }
-}
-
-void TwoColumnPropertyControl::ExpandAllChildren(ReflectedPropertyItem* item, bool recursive)
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->ExpandAllChildren(item, recursive);
-    }
-}
-
-void TwoColumnPropertyControl::ExpandAllChildren(bool recursive)
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->ExpandAllChildren(ctrl->GetControl()->GetRootItem(), recursive);
-    }
-}
-
-void TwoColumnPropertyControl::ReloadItems()
-{
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->ReloadValues();
-    }
-}
-
-void TwoColumnPropertyControl::OnCopyAll()
-{
-    CClipboard clipboard(nullptr);
-    auto rootNode = XmlHelpers::CreateXmlNode("PropertyCtrl");
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->OnCopyAll(rootNode);
-    }
-    clipboard.Put(rootNode);
-}
-
-void TwoColumnPropertyControl::OnPaste()
-{
-    CClipboard clipboard(nullptr);
-
-    CUndo undo("Paste Properties");
-
-    XmlNodeRef rootNode = clipboard.Get();
-    for (auto ctrl : m_controlList)
-    {
-        ctrl->GetControl()->SetValuesFromNode(rootNode);
-    }
-}
-
-
-PropertyCard::PropertyCard([[maybe_unused]] QWidget* parent /*= nullptr*/)
-{
-    // create header bar
-    m_header = new AzToolsFramework::ComponentEditorHeader(this);
-    m_header->SetExpandable(true);
-
-    // create property editor
-    m_propertyEditor = new ReflectedPropertyControl(this);
-    m_propertyEditor->Setup(false);
-    m_propertyEditor->GetEditor()->SetHideRootProperties(true);
-    m_propertyEditor->setProperty("ComponentDisabl", true); // used by stylesheet
-
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    mainLayout->setMargin(0);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-    mainLayout->addWidget(m_header);
-    mainLayout->addWidget(m_propertyEditor);
-    setLayout(mainLayout);
-
-    connect(m_header, &AzToolsFramework::ComponentEditorHeader::OnExpanderChanged, this, &PropertyCard::OnExpanderChanged);
-    connect(m_propertyEditor->GetEditor(), &AzToolsFramework::ReflectedPropertyEditor::OnExpansionContractionDone, this, &PropertyCard::OnExpansionContractionDone);
-
-    SetExpanded(true);
-}
-
-void PropertyCard::AddVarBlock(CVarBlock *varBlock)
-{
-    if (varBlock->GetNumVariables() > 0)
-    {
-        m_header->SetTitle(varBlock->GetVariable(0)->GetName());
-        m_propertyEditor->AddVarBlock(varBlock);
-    }
-}
-
-ReflectedPropertyControl* PropertyCard::GetControl()
-{
-    return m_propertyEditor;
-}
-
-void PropertyCard::SetExpanded(bool expanded)
-{
-    m_header->SetExpanded(expanded);
-    m_propertyEditor->setVisible(expanded);
-}
-
-bool PropertyCard::IsExpanded() const
-{
-    return m_header->IsExpanded();
-}
-
-void PropertyCard::OnExpanderChanged(bool expanded)
-{
-    SetExpanded(expanded);
-    emit OnExpansionContractionDone();
-}
-
-#include <Controls/ReflectedPropertyControl/moc_ReflectedPropertyCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
deleted file mode 100644
index 30f242915f..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYCTRL_H
-#define CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYCTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include "Include/EditorCoreAPI.h"
-#include "ReflectedPropertyItem.h"
-#include "ReflectedVar.h"
-#include <QFrame>
-#endif
-
-class QLineEdit;
-class QLabel;
-class QVBoxLayout;
-class PropertyCard;
-class QScrollArea;
-
-namespace AzToolsFramework {
-    class ReflectedPropertyEditor;
-    class PropertyRowWidget;
-    class ComponentEditorHeader;
-}
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-//ReflectedPropertyEditor-based implementation of the MFC CPropertyCtrl API
-class EDITOR_CORE_API ReflectedPropertyControl
-    : public QWidget
-    , public AzToolsFramework::IPropertyEditorNotify
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-        Q_OBJECT
-public:
-    //! For alternative undo.
-    typedef AZStd::function<void(IVariable*)> UndoCallback;
-
-    explicit ReflectedPropertyControl(QWidget* parent = nullptr, Qt::WindowFlags windowFlags = Qt::WindowFlags());
-
-    void Setup(bool showScrollbars = true, int labelWidth = 150);
-
-    ReflectedPropertyItem* AddVarBlock(CVarBlock* varBlock, const char* szCategory = nullptr);
-
-    void CreateItems(XmlNodeRef node);
-    void CreateItems(XmlNodeRef node, CVarBlockPtr& varBlock, IVariable::OnSetCallback* func, bool splitCamelCaseIntoWords = false);
-
-    // Replace category item contents with the specified var block.
-    virtual void ReplaceVarBlock(IVariable* categoryItem, CVarBlock* varBlock);
-
-    //replace top-level var block.  (used to port ctrl->ReplaceVarBlock(ctrl->GetRootItem(), varBlock);
-    virtual void ReplaceRootVarBlock(CVarBlock* newVarBlock);
-
-    void RemoveAllItems();
-
-    bool FindVariable(IVariable* categoryItem) const;
-
-    //! When item change, this callback fired variable that changed.
-    typedef AZStd::function<void(IVariable*)> UpdateVarCallback;
-    //! When item change, update object.
-    typedef AZStd::function<void(IVariable*)> UpdateObjectCallback;
-    //! When selection changes, this callback fired variable that changed.
-    typedef AZStd::function<void(IVariable*)> SelChangeCallback;
-
-    /** Set update callback to be used for this property window.
-    */
-    void SetUpdateCallback(const UpdateVarCallback& callback);
-    void ClearUpdateCallback() { m_updateVarFunc = nullptr; }
-
-    void SetUpdateObjectCallback(UpdateObjectCallback callback) { m_updateObjectFunc = callback; }
-    void ClearUpdateObjectCallback() { m_updateObjectFunc = nullptr; }
-
-    /** Set selchange callback to be used for this property window.
-    */
-    void SetSelChangeCallback(SelChangeCallback callback);
-
-    //set a key that can be used to save/restore expanded state.
-    void SetSavedStateKey(AZ::u32 key);
-
-    void ExpandAll();
-    void CollapseAll();
-
-    virtual void Expand(ReflectedPropertyItem* item, bool expand);
-    void ExpandAllChildren(ReflectedPropertyItem* item, bool recursive);
-
-    //IPropertyEditorNotify Interface
-    void BeforePropertyModified([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode) override {}
-    void AfterPropertyModified(AzToolsFramework::InstanceDataNode* pNode) override;
-    void SetPropertyEditingActive([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode) override {}
-    void SetPropertyEditingComplete([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode) override {}
-    void SealUndoStack() override {}
-    void RequestPropertyContextMenu(AzToolsFramework::InstanceDataNode*, const QPoint&) override;
-    void PropertySelectionChanged(AzToolsFramework::InstanceDataNode *pNode, bool selected) override;
-
-    void SetStoreUndoByItems(bool bStoreUndoByItems) { m_bStoreUndoByItems = bStoreUndoByItems; }
-    bool IsStoreUndoByItems() const { return m_bStoreUndoByItems; }
-
-    void ClearSelection();
-    ReflectedPropertyItem* GetSelectedItem();
-    virtual void SelectItem(ReflectedPropertyItem* item);
-
-    QVector<ReflectedPropertyItem*> GetSelectedItems();
-
-    /** Set alternative undo callback.
-    */
-    void SetUndoCallback(UndoCallback& callback);
-    void ClearUndoCallback();
-
-    /** Enable of disable calling update callback when some values change.
-    */
-    void EnableUpdateCallback(bool bEnable);
-    void SetDeferredUpdateCallback(bool deferred);
-
-    // Control is grayed, but is not readonly.
-    void SetGrayed(bool grayed);
-
-    // Sets control to be read only, User cannot modify content of properties.
-    void SetReadOnly(bool readonly);
-
-    void SetMultiSelect(bool multiSelect);
-
-    void EnableNotifyWithoutValueChange(bool bFlag);
-
-    void CopyItem(XmlNodeRef rootNode, ReflectedPropertyItem* pItem, bool bRecursively);
-
-    // set to false if you don't want to receive callbacks when the item is not modified (when items are expanded etc)
-    void SetCallbackOnNonModified(bool bEnable) { m_bSendCallbackOnNonModified = bEnable; }
-
-    void ReloadValues();
-
-    //whether to group child properties alphabetically under expanding elements
-    void SetGroupProperties(bool group);
-
-    //whether to sort child properties alphabetically
-    void SetSortProperties(bool sort);
-
-    //whether to show line edit for filtering properties
-    void SetShowFilterWidget(bool showFilter);
-
-    // It doesn't add any property item, but instead it updates all property items with
-    // a new variable block (sets display value, flags and user data).
-    virtual void UpdateVarBlock(CVarBlock* pVarBlock);
-
-    //! Find item that reference specified property.
-    ReflectedPropertyItem* FindItemByVar(IVariable* pVar);
-
-    ReflectedPropertyItem* GetRootItem();
-
-    int GetContentHeight() const;
-    int GetVisibleHeight() const {return GetContentHeight();}
-
-    //whether this control is a section of a TwoColumnPropertyCtrl (so we can show correct copy/paste options)
-    void SetIsTwoColumnCtrlSection(bool isSection);
-
-    struct SCustomPopupItem
-    {
-        typedef AZStd::function<void()> Callback;
-
-        QString m_text;
-        Callback m_callback;
-
-        SCustomPopupItem(const QString& text, const Callback& callback)
-            : m_text(text)
-            , m_callback(callback) {}
-    };
-
-    struct SCustomPopupMenu
-    {
-        typedef AZStd::function<void(int)> Callback;
-
-        QString m_text;
-        Callback m_callback;
-        QStringList m_subMenuText;
-
-        SCustomPopupMenu(const QString& text, const Callback& callback, const QStringList& subMenuText)
-            : m_text(text)
-            , m_callback(callback)
-            , m_subMenuText(subMenuText) {}
-    };
-
-    void AddCustomPopupMenuPopup(const QString& text, const AZStd::function<void(int)>& handler, const QStringList& items);
-    void RemoveCustomPopupMenuPopup(const QString& text);
-
-    void AddCustomPopupMenuItem(const QString& text, const SCustomPopupItem::Callback handler);
-    void RemoveCustomPopupMenuItem(const QString& text);
-
-    AzToolsFramework::PropertyRowWidget* FindPropertyRowWidget(ReflectedPropertyItem* item);
-
-    QSize sizeHint() const override;
-    AzToolsFramework::ReflectedPropertyEditor* GetEditor() { return m_editor; }
-
-    void SetValuesFromNode(XmlNodeRef rootNode);
-
-public slots:
-    //invalidates attributes and values
-    void InvalidateCtrl(bool queued = true);
-    void RebuildCtrl(bool queued = true);
-
-    void SetTitle(const QString &title);
-
-    void OnCopy(QVector<ReflectedPropertyItem*> items, bool bRecursively);
-    void OnCopyAll();
-    void OnCopyAll(XmlNodeRef node);
-    void OnPaste();
-
-Q_SIGNALS:
-    void CopyAllSections();
-    void PasteAllSections();
-
-protected:
-    friend class ReflectedPropertyItem;
-
-    virtual void OnItemChange(ReflectedPropertyItem* item, bool deferCallbacks = true);
-    CReflectedVar* GetReflectedVarFromCallbackInstance(AzToolsFramework::InstanceDataNode* pNode);
-    void RecreateAllItems();
-
-    // only shows items containing the string in their name. All items shown if string is empty.
-    void RestrictToItemsContaining(const QString& searchName);
-
-    bool CallUndoFunc(ReflectedPropertyItem* item);
-
-    virtual void UpdateVarBlock(ReflectedPropertyItem* pPropertyItem, IVariableContainer* pSourceContainer, IVariableContainer* pTargetContainer);
-
-    void ClearVarBlock();
-
-private slots:
-    void DoUpdateCallback(IVariable *var);
-    void DoUpdateObjectCallback(IVariable *var);
-
-private:
-    AzToolsFramework::ReflectedPropertyEditor* m_editor;
-    QLineEdit* m_filterLineEdit;
-    QWidget* m_filterWidget;
-    QLabel* m_titleLabel;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    _smart_ptr<CVarBlock> m_pVarBlock;
-    _smart_ptr<ReflectedPropertyItem> m_root;
-    AZStd::unique_ptr<CPropertyContainer> m_rootContainer;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    AZ::SerializeContext* m_serializeContext;
-
-    bool m_bEnableCallback;
-    QString m_filterString;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    UpdateVarCallback m_updateVarFunc;
-    UpdateObjectCallback m_updateObjectFunc;
-    SelChangeCallback m_selChangeFunc;
-    UndoCallback m_undoFunc;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    bool m_bStoreUndoByItems;
-    bool m_bForceModified;
-
-    bool m_groupProperties;
-    bool m_sortProperties;
-    bool m_bSendCallbackOnNonModified;
-    bool m_initialized;
-
-    bool m_isTwoColumnSection;
-
-    //custom popup menu
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    std::vector<SCustomPopupItem> m_customPopupMenuItems;
-    std::vector<SCustomPopupMenu> m_customPopupMenuPopups;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    template<typename T>
-    void RemoveCustomPopup(const QString& text, T& customPopup);
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class EDITOR_CORE_API TwoColumnPropertyControl
-    : public QWidget
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    Q_OBJECT
-public:
-    TwoColumnPropertyControl(QWidget* parent = nullptr);
-    void Setup(bool showScrollbars = true, int labelWidth = 150);
-
-    void AddVarBlock(CVarBlock* varBlock, const char* szCategory = nullptr);
-
-    // Replace category item contents with the specified var block.
-    virtual void ReplaceVarBlock(IVariable* categoryItem, CVarBlock* varBlock);
-
-    void RemoveAllItems();
-
-    bool FindVariable(IVariable* categoryItem) const;
-
-    void InvalidateCtrl();
-    void RebuildCtrl();
-
-    void SetStoreUndoByItems(bool bStoreUndoByItems);
-
-    /** Set alternative undo callback.
-    */
-    void SetUndoCallback(ReflectedPropertyControl::UndoCallback callback);
-    void ClearUndoCallback();
-
-    /** Enable of disable calling update callback when some values change.
-    */
-    void EnableUpdateCallback(bool bEnable);
-    void SetUpdateCallback(ReflectedPropertyControl::UpdateVarCallback callback);
-
-    // Control is grayed, but is not readonly.
-    void SetGrayed(bool grayed);
-
-    //set a key that can be used to save/restore expanded state.
-    void SetSavedStateKey(const QString& key);
-
-    void ExpandAllChildren(ReflectedPropertyItem* item, bool recursive);
-    void ExpandAllChildren(bool recursive);
-
-    void ReloadItems();
-
-    void OnCopyAll();
-    void OnPaste();
-
-protected:
-    void resizeEvent(QResizeEvent *event) override;
-
-private:
-    void ToggleTwoColumnLayout();
-
- AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QVector<PropertyCard*> m_controlList;
-    QVector<_smart_ptr<CVarBlock>> m_varBlockList;
-    _smart_ptr<CVarBlock> m_pVarBlock;
- AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    QWidget *m_leftContainer;
-    QWidget *m_rightContainer;
-    QScrollArea *m_leftScrollArea;
-    QScrollArea *m_rightScrollArea;
-
-    bool m_twoColumns;
-
-    static const int minimumColumnWidth = 320;
-    static const int minimumTwoColumnWidth = 660;
-};
-
-
-class PropertyCard
-    : public QFrame
-{
-    Q_OBJECT
-public:
-    PropertyCard(QWidget* parent = nullptr);
-
-    void AddVarBlock(CVarBlock *varBlock);
-
-    ReflectedPropertyControl* GetControl();
-
-    void SetExpanded(bool expanded);
-    bool IsExpanded() const;
-
-Q_SIGNALS:
-    void OnExpansionContractionDone();
-
-private:
-    void OnExpanderChanged(bool expanded);
-
-    AzToolsFramework::ComponentEditorHeader* m_header = nullptr;
-    ReflectedPropertyControl* m_propertyEditor = nullptr;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
deleted file mode 100644
index 6bfafcf69b..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ReflectedPropertyItem.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx>
-
-// Editor
-#include "ReflectedVarWrapper.h"
-#include "ReflectedPropertyCtrl.h"
-#include "Undo/UndoVariableChange.h"
-
-// default number of increments to cover the range of a property - determined experimentally by feel
-const float ReflectedPropertyItem::s_DefaultNumStepIncrements = 500.0f;
-
-
-//A ReflectedVarAdapter for holding IVariableContainers
-
-//The extra ReflectedVarAdapter is the extra case of a container (has children) but also has a value itself.
-//An example is an IVariable array whose type is forced to IVariable::DT_TEXTURE. The base Ivariable has a texture,
-//but it also has children that are parameters of the texture. The ReflectedPropertyEditor does not support this case
-//so we work around by adding the base property to the list of children and showing the value of the base property
-//in the container value space instead of "X Elements"
-
-static ColorF StringToColor(const QString &value)
-{
-    ColorF color;
-    float r, g, b, a;
-    int res = azsscanf(value.toUtf8().data(), "%f,%f,%f,%f", &r, &g, &b, &a);
-    if (res == 4)
-    {
-        color.Set(r, g, b, a);
-    }
-    else if (res == 3)
-    {
-        color.Set(r, g, b);
-    }
-    else
-    {
-        unsigned abgr;
-        azsscanf(value.toUtf8().data(), "%u", &abgr);
-        color = ColorF(abgr);
-    }
-    return color;
-}
-
-class ReflectedVarContainerAdapter : public ReflectedVarAdapter
-{
-public:
-    ReflectedVarContainerAdapter(ReflectedPropertyItem *item, ReflectedPropertyControl *control, ReflectedVarAdapter *variableAdapter = nullptr)
-        : m_extraVariableAdapter(variableAdapter)
-        , m_item(item)
-        , m_propertyCtrl(control)
-        , m_containerVar(new CPropertyContainer(AZStd::string()))
-    {
-        m_containerVar->SetAutoExpand(false);
-    }
-
-    void SetVariable(IVariable *pVariable) override
-    {
-        if (m_extraVariableAdapter)
-            m_extraVariableAdapter->SetVariable(pVariable);
-
-        //Check whether the parent container has autoExpand flag set, and if so, the autoexpand flag for this item
-        //We need to do this because the default IVariable flags has the item expanded, so most items are expanded,
-        //but the ReflectedPropertyEditor expands all ancestors if any item is expanded.
-        //This is not what we want -- the old property editor did not expand ancestors. In case of Material editor,
-        //this expansion can be really expensive!
-        const bool parentIsAutoExpand = m_item->GetParent() == nullptr || m_item->GetParent()->GetContainer() == nullptr || m_item->GetParent()->GetContainer()->m_containerVar->AutoExpand();
-        const bool bDefaultExpand = (pVariable->GetFlags() & IVariable::UI_COLLAPSED) == 0 || (pVariable->GetFlags() & IVariable::UI_AUTO_EXPAND);
-        m_containerVar->SetAutoExpand(parentIsAutoExpand && bDefaultExpand);
-
-        UpdateCommon(pVariable, pVariable);
-    }
-
-    //helps implement ReflectedPropertyControl::ReplaceVarBlock
-    void ReplaceVarBlock(CVarBlock *varBlock)
-    {
-        m_containerVar->Clear();
-        UpdateCommon(m_item->GetVariable(), varBlock);
-    }
-
-    void SyncReflectedVarToIVar(IVariable *pVariable) override
-    {
-        if (m_extraVariableAdapter)
-        {
-            m_extraVariableAdapter->SyncReflectedVarToIVar(pVariable);
-            //update text on parent container. Do not have control update attributes since this will happen anyway as part of updating ReflectedVar
-            updateContainerText(pVariable, false);
-        }
-    };
-
-    void SyncIVarToReflectedVar(IVariable *pVariable) override
-    {
-        if (m_extraVariableAdapter)
-        {
-            m_extraVariableAdapter->SyncIVarToReflectedVar(pVariable);
-            //update text on parent container. Force control to update attributes since this doesn't normally happen when updating an IVar from ReflectedVar
-            updateContainerText(pVariable, true);
-        }
-    };
-
-    CReflectedVar *GetReflectedVar() override { return m_containerVar.data(); }
-
-    bool Contains(CReflectedVar *var) override { return var == m_containerVar.data() || (m_extraVariableAdapter && m_extraVariableAdapter->GetReflectedVar() == var); }
-
-private:
-
-    void UpdateCommon(IVariable *nameVariable, IVariableContainer *childContainer)
-    {
-        m_containerVar->m_varName = nameVariable->GetHumanName().toUtf8().data();
-        m_containerVar->m_description = nameVariable->GetDescription().toUtf8().data();
-        if (m_extraVariableAdapter)
-        {
-            m_containerVar->AddProperty(m_extraVariableAdapter->GetReflectedVar());
-        }
-        //Handle adding empty varblock
-        if (!childContainer)
-            return;
-
-        for (int i = 0; i < childContainer->GetNumVariables(); i++)
-        {
-            AddChild(childContainer->GetVariable(i));
-        }
-    }
-
-    void AddChild(IVariable *var)
-    {
-        if (var->GetFlags() & IVariable::UI_INVISIBLE)
-            return;
-        ReflectedPropertyItemPtr item = new ReflectedPropertyItem(m_propertyCtrl, m_item);
-        item->SetVariable(var);
-        m_containerVar->AddProperty(item->GetReflectedVar());
-    }
-
-    void updateContainerText(IVariable *pVariable, bool updateAttributes)
-    {
-        //set text of the container to the value of the main variable.  If it's empty, use space, otherwise ReflectedPropertyEditor doesn't update it!
-        m_containerVar->SetValueText(pVariable->GetDisplayValue().isEmpty() ? AZStd::string(" ") : AZStd::string(pVariable->GetDisplayValue().toUtf8().data()));
-        if (updateAttributes)
-            m_propertyCtrl->InvalidateCtrl();
-    }
-
-private:
-    //optional adapter for case where this item contains a variable in addition to a container of variables.
-    ReflectedVarAdapter *m_extraVariableAdapter;
-    QScopedPointer<CPropertyContainer> m_containerVar;
-    ReflectedPropertyItem *m_item;
-    ReflectedPropertyControl *m_propertyCtrl;
-};
-
-ReflectedPropertyItem::ReflectedPropertyItem(ReflectedPropertyControl *control, ReflectedPropertyItem *parent)
-    : m_pVariable(nullptr)
-    , m_reflectedVarAdapter(nullptr)
-    , m_reflectedVarContainerAdapter(nullptr)
-    , m_parent(parent)
-    , m_propertyCtrl(control)
-    , m_syncingIVar(false)
-    , m_strNoScriptDefault("<<undefined>>")
-    , m_strScriptDefault(m_strNoScriptDefault)
-{
-    m_type = ePropertyInvalid;
-    m_modified = false;
-    if (parent)
-        parent->AddChild(this);
-
-    m_onSetCallback = AZStd::bind(&ReflectedPropertyItem::OnVariableChange, this, AZStd::placeholders::_1);
-    m_onSetEnumCallback = AZStd::bind(&ReflectedPropertyItem::OnVariableEnumChange, this, AZStd::placeholders::_1);
-}
-
-ReflectedPropertyItem::~ReflectedPropertyItem()
-{
-    // just to make sure we dont double (or infinitely recurse...) delete
-    AddRef();
-
-    if (m_pVariable)
-        ReleaseVariable();
-
-    RemoveAllChildren();
-}
-
-void ReflectedPropertyItem::SetVariable(IVariable *var)
-{
-    if (var == m_pVariable)
-    {
-        // Early exit optimization if setting the same var as the current var.
-        // A common use case, in Track View for example, is to re-use the save var for a property when switching to a new
-        // instance of the same variable. The visible display of the value is often handled by invalidating the property,
-        // but the non-visible attributes, i.e. the range values, are usually set using this method. Thus we reset the ranges
-        // explicitly here when the Ivariable var is the same
-
-        if (m_reflectedVarAdapter)
-            m_reflectedVarAdapter->UpdateRangeLimits(var);
-        return;
-    }
-    _smart_ptr<IVariable> pInputVar = var;
-    // Release previous variable.
-    if (m_pVariable)
-        ReleaseVariable();
-
-    m_pVariable = pInputVar;
-    assert(m_pVariable != NULL);
-
-    m_pVariable->AddOnSetCallback(&m_onSetCallback);
-    m_pVariable->AddOnSetEnumCallback(&m_onSetEnumCallback);
-
-    // Fetch base parameter description
-    Prop::Description desc(m_pVariable);
-    m_type = desc.m_type;
-
-    switch (m_type)
-    {
-    case ePropertyVector2:
-        m_reflectedVarAdapter = new ReflectedVarVector2Adapter;
-        break;
-    case ePropertyVector:
-        m_reflectedVarAdapter = new ReflectedVarVector3Adapter;
-        break;
-    case ePropertyVector4:
-        m_reflectedVarAdapter = new ReflectedVarVector4Adapter;
-        break;
-    case ePropertyFloat:
-    case ePropertyAngle:
-        //if the Description has a valid global enumDB lookup, edit as an enum, otherwise use normal float editor
-        if (desc.m_pEnumDBItem)
-            m_reflectedVarAdapter = new ReflectedVarDBEnumAdapter;
-        else
-            m_reflectedVarAdapter = new ReflectedVarFloatAdapter;
-        break;
-    case ePropertyInt:
-        //if the Description has a valid global enumDB lookup, edit as an enum, otherwise use normal int editor
-        if (desc.m_pEnumDBItem)
-            m_reflectedVarAdapter = new ReflectedVarDBEnumAdapter;
-        else
-            m_reflectedVarAdapter = new ReflectedVarIntAdapter;
-        break;
-    case ePropertyBool:
-        m_reflectedVarAdapter = new ReflectedVarBoolAdapter;
-        break;
-    case ePropertyString:
-        //if the Description has a valid global enumDB lookup, edit as an enum, otherwise use normal string editor
-        if (desc.m_pEnumDBItem)
-            m_reflectedVarAdapter = new ReflectedVarDBEnumAdapter;
-        else
-            m_reflectedVarAdapter = new ReflectedVarStringAdapter;
-        break;
-    case ePropertySelection:
-        m_reflectedVarAdapter = new ReflectedVarEnumAdapter;
-        break;
-    case ePropertyAnimation:
-        m_reflectedVarAdapter = new ReflectedVarAnimationAdapter;
-        break;
-    case ePropertyColor:
-        m_reflectedVarAdapter = new ReflectedVarColorAdapter;
-        break;
-    case ePropertyUser:
-        m_reflectedVarAdapter = new ReflectedVarUserAdapter;
-        break;
-    case ePropertyEquip:
-    case ePropertyReverbPreset:
-    case ePropertyGameToken:
-    case ePropertyMissionObj:
-    case ePropertySequence:
-    case ePropertySequenceId:
-    case ePropertyLocalString:
-    case ePropertyLightAnimation:
-    case ePropertyParticleName:
-        m_reflectedVarAdapter = new ReflectedVarGenericPropertyAdapter(desc.m_type);
-        break;
-    case ePropertyTexture:
-    case ePropertyModel:
-    case ePropertyGeomCache:
-    case ePropertyAudioTrigger:
-    case ePropertyAudioSwitch:
-    case ePropertyAudioSwitchState:
-    case ePropertyAudioRTPC:
-    case ePropertyAudioEnvironment:
-    case ePropertyAudioPreloadRequest:
-    case ePropertyFile:
-        m_reflectedVarAdapter = new ReflectedVarResourceAdapter;
-        break;
-    case ePropertyFloatCurve:
-    case ePropertyColorCurve:
-        m_reflectedVarAdapter = new ReflectedVarSplineAdapter(this, m_type);
-        break;
-    case ePropertyMotion:
-        m_reflectedVarAdapter = new ReflectedVarMotionAdapter;
-        break;
-    default:
-        break;
-    }
-
-    const bool hasChildren = (m_pVariable->GetNumVariables() > 0 || desc.m_type == ePropertyTable || m_pVariable->GetType() == IVariable::ARRAY);
-    //const bool isNotContainerType = (m_pVariable->GetType() != IVariable::ARRAY && desc.m_type != ePropertyTable  && desc.m_type != ePropertyInvalid);
-    if (hasChildren )
-    {
-        m_reflectedVarContainerAdapter = new ReflectedVarContainerAdapter(this, m_propertyCtrl, m_reflectedVarAdapter);
-        m_reflectedVarAdapter = m_reflectedVarContainerAdapter;
-    }
-
-    if (m_reflectedVarAdapter)
-    {
-        m_reflectedVarAdapter->SetVariable(m_pVariable);
-        m_reflectedVarAdapter->SyncReflectedVarToIVar(m_pVariable);
-    }
-
-    m_modified = false;
-}
-
-void ReflectedPropertyItem::ReplaceVarBlock(CVarBlock *varBlock)
-{
-    RemoveAllChildren();
-    if (m_reflectedVarAdapter)
-        m_reflectedVarAdapter->ReplaceVarBlock(varBlock);
-}
-
-void ReflectedPropertyItem::AddChild(ReflectedPropertyItem *item)
-{
-    assert(item);
-    m_childs.push_back(item);
-}
-
-void ReflectedPropertyItem::RemoveAllChildren()
-{
-    for (int i = 0; i < m_childs.size(); i++)
-    {
-        m_childs[i]->m_parent = 0;
-    }
-
-    m_childs.clear();
-}
-
-void ReflectedPropertyItem::RemoveChild(ReflectedPropertyItem* item)
-{
-    for (int i = 0; i < m_childs.size(); i++)
-    {
-        if (m_childs[i] == item)
-        {
-            item->m_parent = nullptr;
-            m_childs.erase(m_childs.begin() + i);
-            return;
-        }
-    }
-}
-
-CReflectedVar * ReflectedPropertyItem::GetReflectedVar() const
-{
-    return m_reflectedVarAdapter ? m_reflectedVarAdapter->GetReflectedVar() : nullptr;
-}
-
-ReflectedPropertyItem * ReflectedPropertyItem::findItem(CReflectedVar *var)
-{
-    if (m_reflectedVarAdapter && m_reflectedVarAdapter->Contains(var) )
-        return this;
-    for (auto child : m_childs)
-    {
-        ReflectedPropertyItem *result = child->findItem(var);
-        if (result)
-            return result;
-    }
-    return nullptr;
-}
-
-
-ReflectedPropertyItem * ReflectedPropertyItem::findItem(IVariable *var)
-{
-    if (m_pVariable == var)
-        return this;
-    for (auto child : m_childs)
-    {
-        ReflectedPropertyItem *result = child->findItem(var);
-        if (result)
-            return result;
-    }
-    return nullptr;
-}
-
-ReflectedPropertyItem* ReflectedPropertyItem::findItem(const QString &name)
-{
-    if (m_pVariable && m_pVariable->GetHumanName() == name)
-        return this;
-    for (auto child : m_childs)
-    {
-        ReflectedPropertyItem *result = child->findItem(name);
-        if (result)
-            return result;
-    }
-    return nullptr;
-
-}
-
-ReflectedPropertyItem * ReflectedPropertyItem::FindItemByFullName(const QString& fullName)
-{
-    if (GetFullName() == fullName)
-    {
-        return this;
-    }
-    for (int i = 0; i < m_childs.size(); ++i)
-    {
-        auto pFound = m_childs[i]->FindItemByFullName(fullName);
-        if (pFound)
-        {
-            return pFound;
-        }
-    }
-    return nullptr;
-}
-
-QString ReflectedPropertyItem::GetName() const
-{
-    return m_pVariable ? m_pVariable->GetHumanName() : QString();
-}
-
-QString ReflectedPropertyItem::GetFullName() const
-{
-    if (m_parent && m_pVariable)
-    {
-        return m_parent->GetFullName() + "::" + m_pVariable->GetName();
-    }
-    else if (m_pVariable)
-    {
-        return m_pVariable->GetName();
-    }
-    else
-    {
-        return {};
-    }
-}
-
-void ReflectedPropertyItem::OnReflectedVarChanged()
-{
-    m_syncingIVar = true;
-    if (m_reflectedVarAdapter)
-    {
-        std::unique_ptr<CUndo> undo;
-        if (!CUndo::IsRecording())
-        {
-            if (!m_propertyCtrl->CallUndoFunc(this))
-                undo.reset(new CUndo((m_pVariable->GetHumanName() + " Modified").toUtf8().data()));
-        }
-
-        m_reflectedVarAdapter->SyncIVarToReflectedVar(m_pVariable);
-
-        if (m_propertyCtrl->IsStoreUndoByItems() && CUndo::IsRecording())
-            CUndo::Record(new CUndoVariableChange(m_pVariable, "PropertyChange"));
-
-        m_modified = true;
-    }
-    m_syncingIVar = false;
-}
-
-void ReflectedPropertyItem::SyncReflectedVarToIVar()
-{
-    if (m_reflectedVarAdapter)
-    {
-        m_reflectedVarAdapter->SyncReflectedVarToIVar(m_pVariable);
-    }
-}
-
-void ReflectedPropertyItem::ReleaseVariable()
-{
-    if (m_pVariable)
-    {
-        // Unwire all from variable.
-        m_pVariable->RemoveOnSetCallback(&m_onSetCallback);
-        m_pVariable->RemoveOnSetEnumCallback(&m_onSetEnumCallback);
-    }
-    m_pVariable = 0;
-    delete m_reflectedVarAdapter;
-    m_reflectedVarAdapter = nullptr;
-}
-
-void ReflectedPropertyItem::OnVariableChange(IVariable* pVar)
-{
-    assert(pVar != 0 && pVar == m_pVariable);
-
-    if (m_syncingIVar)
-        return;
-
-    // When variable changes, invalidate UI.
-    m_modified = true;
-
-    if (m_reflectedVarAdapter)
-    {
-        m_reflectedVarAdapter->OnVariableChange(pVar);
-    }
-    SyncReflectedVarToIVar();
-
-    m_propertyCtrl->InvalidateCtrl();
-}
-
-void ReflectedPropertyItem::OnVariableEnumChange([[maybe_unused]] IVariable* pVar)
-{
-
-    if (m_reflectedVarAdapter && m_reflectedVarAdapter->UpdateReflectedVarEnums())
-    {
-        m_propertyCtrl->InvalidateCtrl(true);
-    }
-}
-
-void ReflectedPropertyItem::ReloadValues()
-{
-    m_modified = false;
-
-    if (m_pVariable)
-        SetVariable(m_pVariable);
-
-    for (int i = 0; i < GetChildCount(); i++)
-    {
-        GetChild(i)->ReloadValues();
-    }
-    SyncReflectedVarToIVar();
-}
-
-
-/** Changes value of item.
-*/
-void ReflectedPropertyItem::SetValue(const QString& sValue, bool bRecordUndo, bool bForceModified)
-{
-    if (!m_pVariable)
-    {
-        return;
-    }
-
-    _smart_ptr<ReflectedPropertyItem> holder = this; // Make sure we are not released during this function.
-
-    QString value = sValue;
-
-    switch (m_type)
-    {
-    case ePropertyBool:
-        if (QString::compare(value, "true", Qt::CaseInsensitive) == 0 || value.toInt() != 0)
-        {
-            value = "1";
-        }
-        else
-        {
-            value = "0";
-        }
-        break;
-
-    case ePropertyVector2:
-        if (!value.contains(','))
-        {
-            value = value + ", " + value;
-        }
-        break;
-
-    case ePropertyVector4:
-        if (!value.contains(','))
-        {
-            value = value + ", " + value + ", " + value + ", " + value;
-        }
-        break;
-
-    case ePropertyVector:
-        if (!value.contains(','))
-        {
-            value = value + ", " + value + ", " + value;
-        }
-        break;
-
-    case ePropertyTexture:
-    case ePropertyModel:
-        value.replace('\\', '/');
-        break;
-    }
-
-    // correct the length of value
-    switch (m_type)
-    {
-    case ePropertyTexture:
-    case ePropertyModel:
-    case ePropertyFile:
-        if (value.length() >= MAX_PATH)
-        {
-            value = value.left(MAX_PATH);
-        }
-        break;
-    }
-
-
-    bool bModified = bForceModified || m_pVariable->GetDisplayValue() != value;
-    bool bStoreUndo = (m_pVariable->GetDisplayValue() != value || bForceModified) && bRecordUndo;
-
-    std::unique_ptr<CUndo> undo;
-    if (bStoreUndo && !CUndo::IsRecording())
-    {
-        if (!m_propertyCtrl->CallUndoFunc(this))
-        {
-            undo.reset(new CUndo((GetName() + " Modified").toUtf8().data()));
-        }
-    }
-
-    if (m_pVariable)
-    {
-        if (bModified)
-        {
-            if (m_propertyCtrl->IsStoreUndoByItems() && bStoreUndo && CUndo::IsRecording())
-            {
-                CUndo::Record(new CUndoVariableChange(m_pVariable, "PropertyChange"));
-            }
-
-            if (bForceModified)
-            {
-                m_pVariable->SetForceModified(true);
-            }
-
-            switch (m_type)
-            {
-            case ePropertyColor:
-            {
-                ColorF color = StringToColor(value);
-                if (m_pVariable->GetType() == IVariable::VECTOR)
-                {
-                    m_pVariable->Set(color.toVec3());
-                }
-                else
-                {
-                    m_pVariable->Set(static_cast<int>(color.pack_abgr8888()));
-                }
-                break;
-            }
-            case ePropertyInvalid:
-                break;
-            default:
-                m_pVariable->SetDisplayValue(value);
-                break;
-            }
-        }
-    }
-    else
-    {
-        if (bModified)
-        {
-            m_modified = true;
-            // If Value changed mark document modified.
-            // Notify parent that this Item have been modified.
-            m_propertyCtrl->OnItemChange(this);
-        }
-    }
-}
-
-void ReflectedPropertyItem::SendOnItemChange()
-{
-    m_propertyCtrl->OnItemChange(this);
-}
-
-void ReflectedPropertyItem::ExpandAllChildren(bool recursive)
-{
-    Expand(true);
-    for (auto child : m_childs)
-    {
-        if (recursive)
-        {
-            child->ExpandAllChildren(recursive);
-        }
-        else
-        {
-            child->Expand(true);
-        }
-    }
-}
-
-void ReflectedPropertyItem::Expand(bool expand)
-{
-    AzToolsFramework::PropertyRowWidget *widget = m_propertyCtrl->FindPropertyRowWidget(this);
-    if (widget)
-    {
-        widget->SetExpanded(expand);
-    }
-}
-
-QString ReflectedPropertyItem::GetPropertyName() const
-{
-    return m_pVariable ? m_pVariable->GetHumanName() : QString();
-}
-
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
deleted file mode 100644
index 07bed16039..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYITEM_H
-#define CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYITEM_H
-#pragma once
-
-#include "Util/Variable.h"
-#include <Util/VariablePropertyType.h>
-
-namespace AzToolsFramework {
-    class ReflectedPropertyEditor;
-}
-
-class CReflectedVar;
-class CPropertyContainer;
-class ReflectedPropertyControl;
-class ReflectedVarAdapter;
-class ReflectedVarContainerAdapter;
-
-// Class representing a property inside a ReflectedPropertyCtrl.
-// It contains the IVariable and corresponding CReflectedVar for that property
-// and any children properties if the IVariable is a container.
-
-// This class is loosely based on the MFC-based CPropertyItem to make porting easier.
-// The CPropertyItem created editor widgets for each property type, but this class
-// just holds a CReflectedVar and updates it's values. The editing is done by the
-// reflection system and registered property handlers for each CReflectedVar.
-class EDITOR_CORE_API ReflectedPropertyItem
-    : public CRefCountBase
-{
-public:
-    ReflectedPropertyItem(ReflectedPropertyControl* control, ReflectedPropertyItem* parent);
-    ~ReflectedPropertyItem();
-
-    void SetVariable(IVariable* var);
-    IVariable* GetVariable() const { return m_pVariable; }
-
-    void ReplaceVarBlock(CVarBlock* varBlock);
-
-    CReflectedVar* GetReflectedVar() const;
-
-    ReflectedPropertyItem* findItem(CReflectedVar* var);
-    ReflectedPropertyItem* findItem(IVariable* var);
-    ReflectedPropertyItem* findItem(const QString &name);
-    ReflectedPropertyItem* FindItemByFullName(const QString& fullName);
-
-    //update the internal IVariable as result of ReflectedVar changing
-    void OnReflectedVarChanged();
-
-    //update the ReflectedVar to current value of IVar
-    void SyncReflectedVarToIVar();
-
-    //! Return true if this property item is modified.
-    bool IsModified() const { return m_modified; }
-
-    void ReloadValues();
-
-    ReflectedVarContainerAdapter* GetContainer() { return m_reflectedVarContainerAdapter; }
-    ReflectedPropertyItem* GetParent() { return m_parent; }
-
-    /** Get script default value of property item.
-    */
-    virtual bool HasScriptDefault() const { return m_strScriptDefault != m_strNoScriptDefault; };
-
-    /** Get script default value of property item.
-    */
-    virtual QString GetScriptDefault() const { return m_strScriptDefault; };
-
-    /** Set script default value of property item.
-    */
-    virtual void SetScriptDefault(const QString& sScriptDefault) { m_strScriptDefault = sScriptDefault; };
-
-    /** Set script default value of property item.
-    */
-    virtual void ClearScriptDefault() { m_strScriptDefault = m_strNoScriptDefault; };
-
-
-    /** Changes value of item.
-    */
-    virtual void SetValue(const QString& sValue, bool bRecordUndo = true, bool bForceModified = false);
-
-    //hack for calling ReflectedPropertyControl::OnItemChange from a wrapper class
-    //this is used because changes to Splines should not actually change anything in the IVariable,
-    //but we need OnItemChanged as if the IVariable did change.
-    void SendOnItemChange();
-
-    void ExpandAllChildren(bool recursive);
-    void Expand(bool expand);
-
-    QString GetPropertyName() const;
-
-    void AddChild(ReflectedPropertyItem* item);
-    void RemoveAllChildren();
-    void RemoveChild(ReflectedPropertyItem* item);
-
-    // default number of increments to cover the range of a property
-    static const float s_DefaultNumStepIncrements;
-
-    // for a consistent Feel, compute the step size for a numerical slider for the specified min/max, rounded to precision
-    inline static float ComputeSliderStep(float sliderMin, float sliderMax, const float precision = .01f)
-    {
-        float step;
-        step = int_round(((sliderMax - sliderMin) / ReflectedPropertyItem::s_DefaultNumStepIncrements) / precision) * precision;
-        // prevent rounding down to zero
-        return (step > precision) ? step : precision;
-    }
-
-protected:
-    friend class ReflectedPropertyControl;
-
-    //! Release used variable.
-    void ReleaseVariable();
-    //! Callback called when variable change.
-    void OnVariableChange(IVariable* var);
-    void OnVariableEnumChange(IVariable* var);
-
-public:
-    //! Get number of child nodes.
-    int GetChildCount() const { return m_childs.size(); };
-    //! Get Child by id.
-    ReflectedPropertyItem* GetChild(int index) const { return m_childs[index]; }
-    PropertyType GetType() const { return m_type; }
-
-    /** Get name of property item.
-    */
-    virtual QString GetName() const;
-
-    QString GetFullName() const;
-
-protected:
-    PropertyType m_type;
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //The variable being edited.
-    _smart_ptr<IVariable> m_pVariable;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    //holds the CReflectedVar and syncs its value with IVariable when either changes
-    ReflectedVarAdapter* m_reflectedVarAdapter;
-    ReflectedVarContainerAdapter* m_reflectedVarContainerAdapter;
-
-    ReflectedPropertyItem* m_parent;
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    std::vector<_smart_ptr<ReflectedPropertyItem> > m_childs;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    ReflectedPropertyControl* m_propertyCtrl;
-
-    unsigned int m_modified : 1;
-
-    bool m_syncingIVar;
-
-    QString m_strNoScriptDefault;
-    QString m_strScriptDefault;
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    IVariable::OnSetCallback m_onSetCallback;
-    IVariable::OnSetEnumCallback m_onSetEnumCallback;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-typedef _smart_ptr<ReflectedPropertyItem> ReflectedPropertyItemPtr;
-
-
-#endif // CRYINCLUDE_EDITOR_UTILS_REFLECTEDPROPERTYITEM_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
deleted file mode 100644
index 3cbf743522..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ReflectedVar.h"
-
-// AzCore
-#include <AzCore/Serialization/EditContext.h>
-
-
-bool ReflectedVarInit::s_reflectionDone = false;
-
-void ReflectedVarInit::setupReflection(AZ::SerializeContext* serializeContext)
-{
-    if (!serializeContext)
-        return;
-
-    if (s_reflectionDone)
-        return;
-
-    s_reflectionDone = true;
-
-    serializeContext->Class< CReflectedVar>()
-        ->Version(1)
-        ->Field("description", &CReflectedVar::m_description)
-        ->Field("varName", &CReflectedVar::m_varName);
-
-    serializeContext->Class <CReflectedVarAnimation, CReflectedVar >()
-        ->Version(1)
-        ->Field("animation", &CReflectedVarAnimation::m_animation)
-        ->Field("entityID", &CReflectedVarAnimation::m_entityID)
-        ;
-
-    serializeContext->Class <CReflectedVarResource, CReflectedVar >()
-        ->Version(1)
-        ->Field("path", &CReflectedVarResource::m_path)
-        ->Field("propertyType", &CReflectedVarResource::m_propertyType)
-        ;
-
-    serializeContext->Class< CReflectedVarColor, CReflectedVar>()
-        ->Version(1)
-        ->Field("color", &CReflectedVarColor::m_color);
-
-    serializeContext->Class< CReflectedVarUser, CReflectedVar>()
-        ->Version(1)
-        ->Field("value", &CReflectedVarUser::m_value)
-        ->Field("enableEdit", &CReflectedVarUser::m_enableEdit)
-        ->Field("title", &CReflectedVarUser::m_dialogTitle)
-        ->Field("useTree", &CReflectedVarUser::m_useTree)
-        ->Field("treeSeparator", &CReflectedVarUser::m_treeSeparator)
-        ->Field("itemNames", &CReflectedVarUser::m_itemNames)
-        ->Field("itemDescriptions", &CReflectedVarUser::m_itemDescriptions);
-
-    serializeContext->Class <CReflectedVarSpline, CReflectedVar >()
-        ->Version(1)
-        ->Field("spline", &CReflectedVarSpline::m_spline)
-        ->Field("propertyType", &CReflectedVarSpline::m_propertyType)
-        ;
-
-    serializeContext->Class< CPropertyContainer, CReflectedVar>()
-        ->Version(1)
-        ->Field("properties", &CPropertyContainer::m_properties);
-
-    serializeContext->Class <CReflectedVarMotion, CReflectedVar >()
-        ->Version(1)
-        ->Field("motion", &CReflectedVarMotion::m_motion)
-        ->Field("assetId", &CReflectedVarMotion::m_assetId)
-        ;
-
-    AZ::EditContext* ec = serializeContext->GetEditContext();
-    if (ec)
-    {
-        ec->Class< CReflectedVarAnimation >("VarAnimation", "Animation")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarAnimation::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarAnimation::description)
-            ;
-
-        ec->Class< CReflectedVarResource >("VarResource", "Resource")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarResource::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarResource::description)
-            ;
-
-        ec->Class< CReflectedVarUser >("VarUser", "")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarUser::varName)
-            ->Attribute(AZ::Edit::Attributes::Handler, AZ_CRC("ePropertyUser", 0x65b972c0))
-            ;
-
-        ec->Class< CReflectedVarColor >("VarColor", "")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Color, &CReflectedVarColor::m_color, "Color", "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarColor::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarColor::description)
-            ;
-
-        ec->Class< CReflectedVarSpline >("VarSpline", "")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarSpline::varName)
-            ->Attribute(AZ::Edit::Attributes::Handler, &CReflectedVarSpline::handler)
-            ;
-
-        ec->Class< CPropertyContainer >("PropertyContainer", "")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CPropertyContainer::m_properties, "Properties", "")
-            ->Attribute(AZ::Edit::Attributes::ContainerCanBeModified, false)
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CPropertyContainer::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CPropertyContainer::description)
-            ->Attribute(AZ::Edit::Attributes::Visibility, &CPropertyContainer::GetVisibility)
-            ->Attribute(AZ::Edit::Attributes::AutoExpand, &CPropertyContainer::m_autoExpand)
-            ->Attribute(AZ::Edit::Attributes::ValueText, &CPropertyContainer::m_valueText) //will be ignored if blank
-            ;
-
-        ec->Class< CReflectedVarMotion >("VarMotion", "Motion")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarMotion::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarMotion::description)
-            ;
-    }
-    CReflectedVarString::reflect(serializeContext);
-    CReflectedVarBool::reflect(serializeContext);
-    CReflectedVarFloat::reflect(serializeContext);
-    CReflectedVarInt::reflect(serializeContext);
-    CReflectedVarVector2::reflect(serializeContext);
-    CReflectedVarVector3::reflect(serializeContext);
-    CReflectedVarVector4::reflect(serializeContext);
-    CReflectedVarAny<AZStd::vector<AZStd::string>>::reflect(serializeContext);
-    CReflectedVarEnum<int>::reflect(serializeContext);
-    CReflectedVarEnum<AZStd::string>::reflect(serializeContext);
-    CReflectedVarGenericProperty::reflect(serializeContext);
-}
-
-
-template<class T>
-void CReflectedVarAny<T>::reflect(AZ::SerializeContext* serializeContext)
-{
-    static bool reflected = false;
-    if (reflected)
-        return;
-    reflected = true;
-
-    serializeContext->Class< CReflectedVarAny<T>, CReflectedVar>()
-        ->Version(1)
-        ->Field("value", &CReflectedVarAny<T>::m_value);
-
-    AZ::EditContext* ec = serializeContext->GetEditContext();
-    if (ec)
-    {
-        ec->Class< CReflectedVarAny<T> >("VarAny", "")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CReflectedVarAny<T>::m_value, "Value", "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarAny<T>::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarAny<T>::description)
-            ;
-    }
-}
-
-
-template<class T, class R>
-void CReflectedVarRanged<T, R>::reflect(AZ::SerializeContext* serializeContext)
-{
-    static bool reflected = false;
-    if (reflected)
-        return;
-    reflected = true;
-
-    serializeContext->Class< CReflectedVarRanged<T, R>, CReflectedVar>()
-        ->Version(1)
-        ->Field("value", &CReflectedVarRanged<T, R>::m_value)
-        ->Field("min", &CReflectedVarRanged<T, R>::m_minVal)
-        ->Field("max", &CReflectedVarRanged<T, R>::m_maxVal)
-        ->Field("step", &CReflectedVarRanged<T, R>::m_stepSize)
-        ->Field("softMin", &CReflectedVarRanged<T, R>::m_softMinVal)
-        ->Field("softMax", &CReflectedVarRanged<T, R>::m_softMaxVal)
-        ;
-
-    AZ::EditContext* ec = serializeContext->GetEditContext();
-    if (ec)
-    {
-        ec->Class< CReflectedVarRanged<T, R> >("VarAny", "")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Slider, &CReflectedVarRanged<T, R>::m_value, "Value", "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarRanged<T, R>::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarRanged<T, R>::description)
-            ->Attribute(AZ::Edit::Attributes::Min, &CReflectedVarRanged<T, R>::minValue)
-            ->Attribute(AZ::Edit::Attributes::Max, &CReflectedVarRanged<T, R>::maxValue)
-            ->Attribute(AZ::Edit::Attributes::Step, &CReflectedVarRanged<T, R>::stepSize)
-            ->Attribute(AZ::Edit::Attributes::SoftMin, &CReflectedVarRanged<T, R>::softMinVal)
-            ->Attribute(AZ::Edit::Attributes::SoftMax, &CReflectedVarRanged<T, R>::softMaxVal)
-            ;
-    }
-
-}
-
-
-template<class T>
-void CReflectedVarEnum<T>::reflect(AZ::SerializeContext* serializeContext)
-{
-    static bool reflected = false;
-    if (reflected)
-        return;
-    reflected = true;
-
-    serializeContext->Class< CReflectedVarEnum<T>, CReflectedVar>()
-        ->Version(1)
-        ->Field("value", &CReflectedVarEnum<T>::m_value)
-        ->Field("selectedName", &CReflectedVarEnum<T>::m_selectedEnumName)
-        ->Field("availableValues", &CReflectedVarEnum<T>::m_enums)
-        ;
-
-    AZ::EditContext* ec = serializeContext->GetEditContext();
-    if (ec)
-    {
-        ec->Class< CReflectedVarEnum<T> >("Enum Variable", "")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::ComboBox, &CReflectedVarEnum<T>::m_selectedEnumName, "Value", "")
-            ->Attribute(AZ::Edit::Attributes::StringList, &CReflectedVarEnum<T>::GetEnums)
-            ->Attribute(AZ::Edit::Attributes::ChangeNotify, &CReflectedVarEnum<T>::OnEnumChanged)
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarEnum<T>::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarEnum<T>::description)
-            ;
-    }
-}
-
-
-void CReflectedVarGenericProperty::reflect(AZ::SerializeContext* serializeContext)
-{
-    static bool reflected = false;
-    if (reflected)
-        return;
-    reflected = true;
-
-    serializeContext->Class< CReflectedVarGenericProperty, CReflectedVar>()
-        ->Version(1)
-        ->Field("value", &CReflectedVarGenericProperty::m_value)
-        ->Field("propertyType", &CReflectedVarGenericProperty::m_propertyType)
-        ;
-
-    AZ::EditContext* ec = serializeContext->GetEditContext();
-    if (ec)
-    {
-        ec->Class< CReflectedVarGenericProperty >("GenericProperty", "GenericProperty")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarGenericProperty::varName)
-            ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarGenericProperty::description)
-            ->Attribute(AZ::Edit::Attributes::Handler, &CReflectedVarGenericProperty::handler)
-            ;
-    }
-
-}
-
-AZ::u32 CReflectedVarSpline::handler()
-{
-    switch (m_propertyType)
-    {
-    case ePropertyFloatCurve:
-        return AZ_CRC("ePropertyFloatCurve", 0x7440ccce);
-    case ePropertyColorCurve:
-        return AZ_CRC("ePropertyColorCurve", 0xa30da4ec);
-    default:
-        AZ_Assert(false, "CReflectedVarSpline property type must be ePropertyFloatCurve or ePropertyColorCurve");
-        return AZ::Edit::UIHandlers::Default;
-    }
-}
-
-
-AZ::u32 CReflectedVarGenericProperty::handler()
-{
-    switch (m_propertyType)
-    {
-    case ePropertyShader:
-        return AZ_CRC("ePropertyShader", 0xc40932f1);
-    case ePropertyEquip:
-        return AZ_CRC("ePropertyEquip", 0x66ffd290);
-    case ePropertyReverbPreset:
-        return AZ_CRC("ePropertyReverbPreset", 0x51469f38);
-    case ePropertyDeprecated0:
-        return AZ_CRC("ePropertyCustomAction", 0x4ffa5ba5);
-    case ePropertyGameToken:
-        return AZ_CRC("ePropertyGameToken", 0x34855b6f);
-    case ePropertyMissionObj:
-        return AZ_CRC("ePropertyMissionObj", 0x4a2d0dc8);
-    case ePropertySequence:
-        return AZ_CRC("ePropertySequence", 0xdd1c7d44);
-    case ePropertySequenceId:
-        return AZ_CRC("ePropertySequenceId", 0x05983dcc);
-    case ePropertyLocalString:
-        return AZ_CRC("ePropertyLocalString", 0x0cd9609a);
-    case ePropertyLightAnimation:
-        return AZ_CRC("ePropertyLightAnimation", 0x277097da);
-    case ePropertyParticleName:
-        return AZ_CRC("ePropertyParticleName", 0xf44c7133);
-    default:
-        AZ_Assert(false, "No property handlers defined for the property type");
-        return AZ_CRC("Default", 0xe35e00df);
-    }
-}
-
-
-void CPropertyContainer::AddProperty(CReflectedVar *property)
-{
-    if (property)
-        m_properties.push_back(property);
-}
-
-void CPropertyContainer::Clear()
-{
-    m_properties.clear();
-}
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
deleted file mode 100644
index b38f535e8b..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_REFLECTEDVAR_H
-#define CRYINCLUDE_EDITOR_UTILS_REFLECTEDVAR_H
-#pragma once
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <algorithm>
-#include <limits>
-#include "Util/VariablePropertyType.h"
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Vector4.h>
-
-
-//Base class for generic reflected variables
-class CReflectedVar
-{
-public:
-    AZ_RTTI(CReflectedVar, "{9CF461B5-4093-4F7E-9A28-75531F0D046C}")
-
-    CReflectedVar() = default;
-    CReflectedVar(const AZStd::string& name)
-        : m_varName(name){}
-    virtual ~CReflectedVar(){}
-
-    AZStd::string m_varName;
-    AZStd::string m_description;
-};
-
-
-// Reflected container of reflected values.  Also holds ePropertyTable data
-class CPropertyContainer
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI(CPropertyContainer, "{99500790-241A-4274-BAD8-C4510E869FC6}", CReflectedVar)
-    CPropertyContainer(const AZStd::string& name)
-        : CReflectedVar(name) {}
-    CPropertyContainer() = default;
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-
-    void AddProperty(CReflectedVar* property);
-
-    void Clear();
-
-    //If we're an unnamed container, just show our children in flat list.  Otherwise show the container name with children underneath
-    AZ::u32 GetVisibility() const
-    {
-        return m_varName.empty() ? AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20) : AZ_CRC("PropertyVisibility_Show", 0xa43c82dd);
-    }
-
-    void SetAutoExpand(bool autoExpand) { m_autoExpand = autoExpand; }
-    bool AutoExpand() const { return m_autoExpand; }
-
-    AZStd::vector<CReflectedVar*> GetProperties() const { return m_properties; }
-
-    void SetValueText(const AZStd::string& valueText) { m_valueText = valueText; }
-
-    friend class ReflectedVarInit;
-
-private:
-    AZStd::vector<CReflectedVar*> m_properties;
-    bool m_autoExpand = false;
-    AZStd::string m_valueText;
-};
-
-
-template<class T>
-class CReflectedVarAny
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI((CReflectedVarAny<T>, "{EE8293C3-9B1E-470B-9922-2CBB8DA13D78}", T), CReflectedVar)
-
-    CReflectedVarAny(const AZStd::string& name, const T& val = T())
-        : CReflectedVar(name)
-        , m_value(val) {}
-    CReflectedVarAny() = default;
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-
-    static void reflect(AZ::SerializeContext* serializeContext);
-
-    T m_value;
-};
-
-// Class to hold values that have min/max
-// T = data type held in this variable
-// R = data type of the range
-template<class T, class R>
-class CReflectedVarRanged
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI((CReflectedVarRanged, "{6AB4EC29-E17B-4B3B-A153-BFDAA48B8CF8}", T, R), CReflectedVar)
-
-    CReflectedVarRanged(const AZStd::string& name, const T& val = T())
-        : CReflectedVar(name)
-        , m_value(val)
-        , m_minVal(std::numeric_limits<R>::lowest())
-        , m_maxVal(std::numeric_limits<R>::max())
-        , m_stepSize(1)
-        , m_softMinVal(std::numeric_limits<R>::lowest())
-        , m_softMaxVal(std::numeric_limits<R>::max())
-    {}
-    CReflectedVarRanged()
-        : CReflectedVarRanged(AZStd::string(), T()){}
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-
-    R minValue() const { return m_minVal; }
-    R maxValue() const { return m_maxVal; }
-    R stepSize() const { return m_stepSize; }
-    R softMinVal() const { return m_softMinVal; }
-    R softMaxVal() const { return m_softMaxVal; }
-
-    static void reflect(AZ::SerializeContext* serializeContext);
-
-    T m_value;
-    R m_minVal;
-    R m_maxVal;
-    R m_stepSize;
-    R m_softMinVal;
-    R m_softMaxVal;
-};
-
-//name some commonly-used variable types
-template <class T>
-using  CReflectedVarNumeric = CReflectedVarRanged<T, T>;
-
-//ePropertyFloat
-using CReflectedVarFloat = CReflectedVarNumeric<float>;
-
-//ePropertyInt
-using CReflectedVarInt = CReflectedVarNumeric<int>;
-
-//ePropertyString
-using CReflectedVarString = CReflectedVarAny<AZStd::string>;
-
-//ePropertyBool
-using CReflectedVarBool = CReflectedVarAny<bool>;
-
-//ePropertyVector2
-using CReflectedVarVector2 = CReflectedVarRanged<AZ::Vector2, float>;
-
-//ePropertyVector
-using CReflectedVarVector3 = CReflectedVarRanged<AZ::Vector3, float>;
-
-//ePropertyVector4
-using CReflectedVarVector4 = CReflectedVarRanged<AZ::Vector4, float>;
-
-// Class for holding enumerated values, ePropertySelection
-// Keeps a key-value pair values (int, string, float, etc) and names corresponding to each value
-// The names are displayed to user when editing, the values are used by underlying code.
-
-template<class T>
-class CReflectedVarEnum
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI((CReflectedVarEnum<T>, "{40AE7D74-7E3A-41A9-8F71-2BBC3067118B}", T), CReflectedVar)
-
-    CReflectedVarEnum(const AZStd::string& name)
-        : CReflectedVar(name) {}
-    CReflectedVarEnum() = default;
-
-    void setEnums(const AZStd::vector<AZStd::pair<T, AZStd::string> >& enums)
-    {
-        m_enums = enums;
-        if (m_enums.size() > 0)
-        {
-            m_value = m_enums.at(0).first;
-            m_selectedEnumName = m_enums.at(0).second;
-        }
-        else
-        {
-            m_value = T();
-            m_selectedEnumName.clear();
-        }
-    }
-
-    void addEnum(const T& value, const AZStd::string& name)
-    {
-        m_enums.push_back(AZStd::pair<T, AZStd::string>(value, name));
-        if (m_enums.size() == 1)
-        {
-            m_selectedEnumName = name;
-            m_value = value;
-        }
-    }
-
-    void setEnumValue(const T& value)
-    {
-        auto it = std::find_if(m_enums.cbegin(), m_enums.cend(), [value](const AZStd::pair<T, AZStd::string>& item) -> bool { return item.first == value; });
-        if (it != m_enums.end())
-        {
-            m_value = it->first;
-            m_selectedEnumName = it->second;
-        }
-    }
-
-    void setEnumByName(const AZStd::string& name)
-    {
-        auto it = std::find_if(m_enums.cbegin(), m_enums.cend(), [name](const AZStd::pair<T, AZStd::string>& item) -> bool { return item.second == name; });
-        if (it != m_enums.end())
-        {
-            m_value = it->first;
-            m_selectedEnumName = it->second;
-        }
-    }
-
-    void OnEnumChanged()
-    {
-        setEnumByName(m_selectedEnumName);
-    }
-
-    AZStd::vector < AZStd::string> GetEnums() const
-    {
-        AZStd::vector < AZStd::string> returnVal;
-        for (const auto& i : m_enums)
-        {
-            returnVal.push_back(i.second);
-        }
-
-        return returnVal;
-    }
-
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-
-    static void reflect(AZ::SerializeContext* serializeContext);
-
-    T m_value;
-    AZStd::string m_selectedEnumName;
-    AZStd::vector<AZStd::pair<T, AZStd::string> > m_enums;
-};
-
-//Class to hold ePropertyColor (IVariable::DT_COLOR)
-class CReflectedVarColor
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI(CReflectedVarColor, "{CC69E773-B4FA-4B6D-8A46-0B580097B6D2}", CReflectedVar)
-
-    CReflectedVarColor(const AZStd::string& name, AZ::Vector3 color = AZ::Vector3())
-        : CReflectedVar(name)
-        , m_color(color) {}
-    CReflectedVarColor() {}
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-
-    AZ::Vector3 m_color;
-};
-
-//Class to hold ePropertyAnimation (IVariable::DT_ANIMATION )
-class CReflectedVarAnimation
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI(CReflectedVarAnimation, "{635D982E-23EC-463F-8F33-4FC2C19D5673}", CReflectedVar)
-
-    CReflectedVarAnimation(const AZStd::string& name)
-        : CReflectedVar(name)
-        , m_entityID(0)
-    {}
-    CReflectedVarAnimation()
-        : m_entityID(0){}
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-
-    AZStd::string m_animation;
-    AZ::EntityId m_entityID;
-};
-
-//Class to hold:
-// ePropertyTexture          (IVariable::DT_TEXTURE)
-// ePropertyMaterial         (IVariable::DT_MATERIAL)
-// ePropertyModel            (IVariable::DT_OBJECT)
-// ePropertyGeomCache        (IVariable::DT_GEOM_CACHE)
-// ePropertyAudioTrigger        (IVariable::DT_AUDIO_TRIGGER)
-// ePropertyAudioSwitch         (IVariable::DT_AUDIO_SWITCH )
-// ePropertyAudioSwitchState    (IVariable::DT_AUDIO_SWITCH_STATE)
-// ePropertyAudioRTPC           (IVariable::DT_AUDIO_RTPC)
-// ePropertyAudioEnvironment    (IVariable::DT_AUDIO_ENVIRONMENT)
-// ePropertyAudioPreloadRequest (IVariable::DT_AUDIO_PRELOAD_REQUEST)
-
-class CReflectedVarResource
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI(CReflectedVarResource, "{162864C2-0C3E-4B6A-84D3-BBAD975B4FD2}", CReflectedVar)
-
-    CReflectedVarResource(const AZStd::string& name)
-        : CReflectedVar(name)
-        , m_propertyType(ePropertyInvalid)
-    {}
-    CReflectedVarResource()
-        : m_propertyType(ePropertyInvalid){}
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-
-    AZStd::string m_path;
-    PropertyType m_propertyType;
-};
-
-//Class to hold ePropertyUser (IVariable::DT_USERITEMCB)
-class CReflectedVarUser 
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI(CReflectedVarUser, "{A901DA91-3893-4848-9AE8-62C0ED074970}", CReflectedVar)
-
-        CReflectedVarUser(const AZStd::string &name)
-        : CReflectedVar(name)
-        , m_enableEdit(false)
-        , m_useTree(false)
-    {}
-    CReflectedVarUser() : m_enableEdit(false), m_useTree(false) {}
-
-    AZStd::string varName() const { return m_varName; }
-
-    AZStd::string m_value;
-
-    bool m_enableEdit;
-    bool m_useTree;
-    AZStd::string m_dialogTitle;
-    AZStd::string m_treeSeparator;
-    AZStd::vector<AZStd::string> m_itemNames;
-    AZStd::vector<AZStd::string> m_itemDescriptions;
-};
-
-//Class to hold ePropertyAnimation (IVariable::DT_ANIMATION )
-class CReflectedVarSpline
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI(CReflectedVarSpline, "{9A928683-7C84-48BF-8A2E-F7BEC423EE4E}", CReflectedVar)
-
-        CReflectedVarSpline(PropertyType propertyType, const AZStd::string &name)
-        : CReflectedVar(name)
-        , m_spline(0)
-        , m_propertyType(propertyType)
-    {}
-
-    CReflectedVarSpline()
-        : m_spline(0)
-        , m_propertyType(ePropertyInvalid) 
-    {}
-
-    AZStd::string varName() const { return m_varName; }
-    AZ::u32 handler();
-
-    uint64_t m_spline;
-    PropertyType m_propertyType;
-};
-
-//Class to wrap all the many properties that can be represented by a string and edited via a popup
-class CReflectedVarGenericProperty
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI(CReflectedVarGenericProperty, "{C4A34C95-3D71-40CE-86D2-DDE314B33CC5}", CReflectedVar)
-
-    CReflectedVarGenericProperty(PropertyType pType, const AZStd::string& name = AZStd::string(), const AZStd::string& val = AZStd::string())
-        : CReflectedVar(name)
-        , m_propertyType(pType)
-        , m_value(val) {}
-    CReflectedVarGenericProperty()
-        : CReflectedVar()
-        , m_propertyType(ePropertyInvalid){}
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-    PropertyType propertyType() const { return m_propertyType; }
-
-    AZ::u32 handler();
-
-    static void reflect(AZ::SerializeContext* serializeContext);
-
-    PropertyType m_propertyType;
-    AZStd::string m_value;
-};
-
-
-class EDITOR_CORE_API ReflectedVarInit
-{
-public:
-    static void setupReflection(AZ::SerializeContext* serializeContext);
-private:
-    static bool s_reflectionDone;
-};
-
-//Class to hold ePropertyMotion (IVariable::DT_MOTION )
-class CReflectedVarMotion
-    : public CReflectedVar
-{
-public:
-    AZ_RTTI(CReflectedVarMotion, "{66397EFB-620A-40B8-8C66-D6AECF690DF5}", CReflectedVar)
-
-    CReflectedVarMotion(const AZStd::string& name)
-        : CReflectedVar(name)
-        , m_assetId(0) {}
-
-    CReflectedVarMotion()
-        : m_assetId(0) {}
-
-    AZStd::string varName() const { return m_varName; }
-    AZStd::string description() const { return m_description; }
-
-    AZStd::string m_motion;
-    AZ::Data::AssetId m_assetId;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTILS_REFLECTEDVAR_H
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
deleted file mode 100644
index f1c80f05ce..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ReflectedVarWrapper.h"
-
-// AzCore
-#include <AzCore/Asset/AssetManagerBus.h>
-
-// Editor
-#include "ReflectedPropertyCtrl.h"
-#include "UIEnumsDatabase.h"
-
-namespace {
-
-    //setting the IVariable to itself in property items was trigger to update limits for that variable. 
-    //limits were obtained using IVariable::GetLimits instead of from the Prop::Description
-    template <class T, class R>
-    void setRangeParams(CReflectedVarRanged<T, R> *reflectedVar, IVariable *pVariable, bool updatingExistingVariable = false)
-    {
-        float min, max, step;
-        bool  hardMin, hardMax;
-        if (updatingExistingVariable)
-        {
-            pVariable->GetLimits(min, max, step, hardMin, hardMax);
-        }
-        else
-        {
-            Prop::Description desc(pVariable);
-            min = desc.m_rangeMin;
-            max = desc.m_rangeMax;
-            step = desc.m_step;
-            hardMin = desc.m_bHardMin;
-            hardMax = desc.m_bHardMax;
-        }
-        reflectedVar->m_softMinVal = min;
-        reflectedVar->m_softMaxVal = max;
-
-        if (hardMin)
-        {
-            reflectedVar->m_minVal = min;
-        }
-        else
-        {
-            reflectedVar->m_minVal = std::numeric_limits<int>::lowest();
-        }
-        if (hardMax)
-        {
-            reflectedVar->m_maxVal = max;
-        }
-        else
-        {
-            // There is an issue with assigning std::numeric_limits<int>::max() to a float
-            // A float can't actually represent the value of 2147483647 and clang
-            // compilers actually warn on this fact.
-            // A static_cast is used here to indicate explicit acceptance of the value change here
-            /* The clang compiler warning is below
-              ../Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp:59:38: error: implicit conversion from 'int' to 'float' changes value from 2147483647 to 2147483648 [-Werror,-Wimplicit-int-float-conversion]
-              reflectedVar->m_maxVal = std::numeric_limits<int>::max();
-            */
-            reflectedVar->m_maxVal = static_cast<float>(std::numeric_limits<int>::max());
-        }
-        reflectedVar->m_stepSize = step;
-    }
-}
-
-void ReflectedVarIntAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarInt(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-    UpdateRangeLimits(pVariable);
-    Prop::Description desc(pVariable);
-    m_valueMultiplier = desc.m_valueMultiplier;
-}
-
-void ReflectedVarIntAdapter::UpdateRangeLimits(IVariable *pVariable)
-{
-    setRangeParams<int>(m_reflectedVar.data(), pVariable);
-}
-
-void ReflectedVarIntAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    float value;
-    if (pVariable->GetType() == IVariable::FLOAT)
-    {
-        pVariable->Get(value);
-    }
-    else
-    {
-        int intValue;
-        pVariable->Get(intValue);
-        value = intValue;
-    }
-    m_reflectedVar->m_value = std::round(value * m_valueMultiplier);
-}
-
-void ReflectedVarIntAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    //don't round here.  Often the IVariable is actually a float under-the hood
-    //for example: DT_PERCENT is stored in float (0 to 1) but has ePropertyType::Integer because editor should be an integer editor ranging from 0 to 100.
-    pVariable->Set(m_reflectedVar->m_value / m_valueMultiplier);
-}
-
-
-
-void ReflectedVarFloatAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarFloat(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-    UpdateRangeLimits(pVariable);
-    Prop::Description desc(pVariable);
-    m_valueMultiplier = desc.m_valueMultiplier;
-}
-
-void ReflectedVarFloatAdapter::UpdateRangeLimits(IVariable *pVariable)
-{
-    setRangeParams<float>(m_reflectedVar.data(), pVariable);
-}
-
-void ReflectedVarFloatAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    float value;
-    pVariable->Get(value);
-    m_reflectedVar->m_value = value * m_valueMultiplier;
-}
-
-void ReflectedVarFloatAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->Set(m_reflectedVar->m_value/m_valueMultiplier);
-}
-
-
-
-void ReflectedVarStringAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarString(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-}
-
-void ReflectedVarStringAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    QString value;
-    pVariable->Get(value);
-    m_reflectedVar->m_value = value.toUtf8().data();
-}
-
-void ReflectedVarStringAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->Set(m_reflectedVar->m_value.c_str());
-}
-
-
-
-
-void ReflectedVarBoolAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarBool(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-}
-
-void ReflectedVarBoolAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    bool value;
-    pVariable->Get(value);
-    m_reflectedVar->m_value = value;
-}
-
-void ReflectedVarBoolAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->Set(m_reflectedVar->m_value);
-}
-
-
-
-
-ReflectedVarEnumAdapter::ReflectedVarEnumAdapter()
-    : m_updatingEnums(false)
-    , m_pVariable(nullptr)
-{}
-
-void ReflectedVarEnumAdapter::SetVariable(IVariable *pVariable)
-{
-    m_pVariable = pVariable;
-    Prop::Description desc(pVariable);
-    m_enumList = desc.m_enumList;
-    m_reflectedVar.reset(new CReflectedVarEnum<AZStd::string>(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-    UpdateReflectedVarEnums();
-}
-
-bool ReflectedVarEnumAdapter::UpdateReflectedVarEnums()
-{
-    if (!m_pVariable || m_updatingEnums)
-    {
-        return false;
-    }
-
-    m_updatingEnums = true;
-    //Allow derived classes to populate the IVariable's enumList
-    updateIVariableEnumList(m_pVariable);
-    m_enumList = m_pVariable->GetEnumList();
-    m_updatingEnums = false;
-
-    bool changed = false;
-    //Copy the updated enums to the ReflecteVar
-    if (m_enumList)
-    {
-        const AZStd::vector<AZStd::string> oldEnums = m_reflectedVar->GetEnums();
-
-        AZStd::vector<AZStd::pair<AZStd::string, AZStd::string>> enums;
-        for (uint i = 0; !m_enumList->GetItemName(i).isNull(); i++)
-        {
-            QString sEnumName = m_enumList->GetItemName(i);
-            enums.push_back(AZStd::pair<AZStd::string, AZStd::string>(sEnumName.toUtf8().data(), sEnumName.toUtf8().data()));
-
-        }
-        m_reflectedVar->setEnums(enums);
-
-        changed = m_reflectedVar->GetEnums() != oldEnums;
-        if (changed)
-        {
-            // set the current enum value from the IVariable
-            SyncReflectedVarToIVar(m_pVariable);
-        }
-    }
-    return changed;
-}
-
-void ReflectedVarEnumAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    const AZStd::string value = pVariable->GetDisplayValue().toUtf8().data();
-    m_reflectedVar->setEnumByName(value);
-}
-
-void ReflectedVarEnumAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    QString iVarVal = m_reflectedVar->m_selectedEnumName.c_str();
-    pVariable->SetDisplayValue(iVarVal);
-}
-
-void ReflectedVarEnumAdapter::OnVariableChange([[maybe_unused]] IVariable* pVariable)
-{
-    //setting the enums on the pVariable will cause the variable to change getting us back here
-    //The original property editor did need to update things immediately because it did so when creating the in-place editing control
-    if (!m_updatingEnums)
-    {
-        UpdateReflectedVarEnums();
-    }
-}
-
-void ReflectedVarDBEnumAdapter::SetVariable(IVariable *pVariable)
-{
-    Prop::Description desc(pVariable);
-    m_pEnumDBItem = desc.m_pEnumDBItem;
-    m_reflectedVar.reset(new CReflectedVarEnum<AZStd::string>(pVariable->GetHumanName().toUtf8().data()));
-    if (m_pEnumDBItem)
-    {
-        for (int i = 0; i < m_pEnumDBItem->strings.size(); i++)
-        {
-            QString name = m_pEnumDBItem->strings[i];
-            m_reflectedVar->addEnum( m_pEnumDBItem->NameToValue(name).toUtf8().data(), name.toUtf8().data() );
-        }
-    }
-}
-
-void ReflectedVarDBEnumAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    const AZStd::string valueStr = pVariable->GetDisplayValue().toUtf8().data();
-    const AZStd::string value = m_pEnumDBItem ? AZStd::string(m_pEnumDBItem->ValueToName(valueStr.c_str()).toUtf8().data()) : valueStr;
-    m_reflectedVar->setEnumByName(value);
-
-}
-
-void ReflectedVarDBEnumAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    QString iVarVal = m_reflectedVar->m_selectedEnumName.c_str();
-    if (m_pEnumDBItem)
-    {
-        iVarVal = m_pEnumDBItem->NameToValue(iVarVal);
-    }
-    pVariable->SetDisplayValue(iVarVal);
-}
-
-
-
-void ReflectedVarVector2Adapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarVector2(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-    UpdateRangeLimits(pVariable);
-}
-
-void ReflectedVarVector2Adapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    Vec2 vec;
-    pVariable->Get(vec);
-    m_reflectedVar->m_value = AZ::Vector2(vec.x, vec.y);
-}
-
-void ReflectedVarVector2Adapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->Set(Vec2(m_reflectedVar->m_value.GetX(), m_reflectedVar->m_value.GetY()));
-}
-
-
-void ReflectedVarVector3Adapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarVector3(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-    UpdateRangeLimits(pVariable);
-}
-
-void ReflectedVarVector3Adapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    Vec3 vec;
-    pVariable->Get(vec);
-    m_reflectedVar->m_value = AZ::Vector3(vec.x, vec.y, vec.z);
-}
-
-void ReflectedVarVector3Adapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->Set(Vec3(m_reflectedVar->m_value.GetX(), m_reflectedVar->m_value.GetY(), m_reflectedVar->m_value.GetZ()));
-}
-
-
-void ReflectedVarVector4Adapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarVector4(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-    UpdateRangeLimits(pVariable);
-}
-
-void ReflectedVarVector4Adapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    Vec4 vec;
-    pVariable->Get(vec);
-    m_reflectedVar->m_value = AZ::Vector4(vec.x, vec.y, vec.z, vec.w);
-}
-
-void ReflectedVarVector4Adapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->Set(Vec4(m_reflectedVar->m_value.GetX(), m_reflectedVar->m_value.GetY(), m_reflectedVar->m_value.GetZ(), m_reflectedVar->m_value.GetW()));
-}
-
-
-void ReflectedVarColorAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarColor(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-}
-
-void ReflectedVarColorAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    if (pVariable->GetType() == IVariable::VECTOR)
-    {
-        Vec3 v(0, 0, 0);
-        pVariable->Get(v);
-        const QColor col = ColorLinearToGamma(ColorF(v.x, v.y, v.z));
-        m_reflectedVar->m_color.Set(col.redF(), col.greenF(), col.blueF());
-    }
-    else
-    {
-        int col(0);
-        pVariable->Get(col);
-        const QColor qcolor = ColorToQColor((uint32)col);
-        m_reflectedVar->m_color.Set(qcolor.redF(), qcolor.greenF(), qcolor.blueF());
-    }
-}
-
-void ReflectedVarColorAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    if (pVariable->GetType() == IVariable::VECTOR)
-    {
-        ColorF colLin = ColorGammaToLinear(QColor::fromRgbF(m_reflectedVar->m_color.GetX(), m_reflectedVar->m_color.GetY(), m_reflectedVar->m_color.GetZ()));
-        pVariable->Set(Vec3(colLin.r, colLin.g, colLin.b));
-    }
-    else
-    {
-        int ir = m_reflectedVar->m_color.GetX() * 255.0f;
-        int ig = m_reflectedVar->m_color.GetY() * 255.0f;
-        int ib = m_reflectedVar->m_color.GetZ() * 255.0f;
-
-        pVariable->Set(static_cast<int>(RGB(ir, ig, ib)));
-    }
-}
-
-
-
-void ReflectedVarAnimationAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarAnimation(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-}
-
-void ReflectedVarAnimationAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    m_reflectedVar->m_entityID = static_cast<AZ::EntityId>(pVariable->GetUserData().value<AZ::u64>());
-    m_reflectedVar->m_animation = pVariable->GetDisplayValue().toUtf8().data();
-}
-
-void ReflectedVarAnimationAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->SetUserData(static_cast<AZ::u64>(m_reflectedVar->m_entityID));
-    pVariable->SetDisplayValue(m_reflectedVar->m_animation.c_str());
-
-}
-
-void ReflectedVarResourceAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarResource(pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-}
-
-void ReflectedVarResourceAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    QString path;
-    pVariable->Get(path);
-    m_reflectedVar->m_path = path.toUtf8().data();
-    Prop::Description desc(pVariable);
-    m_reflectedVar->m_propertyType = desc.m_type;
-
-}
-
-void ReflectedVarResourceAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    const bool bForceModified = (m_reflectedVar->m_propertyType == ePropertyGeomCache);
-    pVariable->SetForceModified(bForceModified);
-    pVariable->SetDisplayValue(m_reflectedVar->m_path.c_str());
-
-    //shouldn't be able to change the type, so ignore m_reflecatedVar->m_properyType
-}
-
-
-ReflectedVarGenericPropertyAdapter::ReflectedVarGenericPropertyAdapter(PropertyType propertyType)
-    :m_propertyType(propertyType)
-{}
-
-void ReflectedVarGenericPropertyAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarGenericProperty(m_propertyType, pVariable->GetHumanName().toUtf8().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-}
-
-void ReflectedVarGenericPropertyAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    QString value;
-    pVariable->Get(value);
-
-    m_reflectedVar->m_value = value.toUtf8().data();
-}
-
-void ReflectedVarGenericPropertyAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->Set(m_reflectedVar->m_value.c_str());
-}
-
-void ReflectedVarUserAdapter::SetVariable(IVariable *pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarUser( pVariable->GetHumanName().toUtf8().data()));
-}
-
-void ReflectedVarUserAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    QString value;
-    pVariable->Get(value);
-    m_reflectedVar->m_value = value.toUtf8().data();
-
-    //extract the list of custom items from the IVariable user data
-    IVariable::IGetCustomItems* pGetCustomItems = static_cast<IVariable::IGetCustomItems*> (pVariable->GetUserData().value<void *>());
-    if (pGetCustomItems != 0)
-    {
-        std::vector<IVariable::IGetCustomItems::SItem> items;
-        QString dlgTitle;
-        // call the user supplied callback to fill-in items and get dialog title
-        bool bShowIt = pGetCustomItems->GetItems(pVariable, items, dlgTitle);
-        if (bShowIt) // if func didn't veto, show the dialog
-        {
-            m_reflectedVar->m_enableEdit = true;
-            m_reflectedVar->m_useTree = pGetCustomItems->UseTree();
-            m_reflectedVar->m_treeSeparator = pGetCustomItems->GetTreeSeparator();
-            m_reflectedVar->m_dialogTitle = dlgTitle.toUtf8().data();
-            m_reflectedVar->m_itemNames.resize(items.size());
-            m_reflectedVar->m_itemDescriptions.resize(items.size());
-
-            QByteArray ba;
-            int i = -1;
-            std::generate(m_reflectedVar->m_itemNames.begin(), m_reflectedVar->m_itemNames.end(), [&items, &i, &ba]() { ++i; ba = items[i].name.toUtf8(); return ba.data(); });
-            i = -1;
-            std::generate(m_reflectedVar->m_itemDescriptions.begin(), m_reflectedVar->m_itemDescriptions.end(), [&items, &i, &ba]() { ++i; ba = items[i].desc.toUtf8(); return ba.data(); });
-
-        }
-    }
-    else
-    {
-        m_reflectedVar->m_enableEdit = false;
-    }
-}
-
-void ReflectedVarUserAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->Set(m_reflectedVar->m_value.c_str());
-}
-
-
-ReflectedVarSplineAdapter::ReflectedVarSplineAdapter(ReflectedPropertyItem *parentItem, PropertyType propertyType)
-    : m_propertyType(propertyType)
-    , m_bDontSendToControl(false)
-    , m_parentItem(parentItem)
-{
-}
-
-void ReflectedVarSplineAdapter::SetVariable(IVariable* pVariable)
-{
-    m_reflectedVar.reset(new CReflectedVarSpline(m_propertyType, pVariable->GetHumanName().toUtf8().data()));
-
-}
-
-void ReflectedVarSplineAdapter::SyncReflectedVarToIVar(IVariable* pVariable)
-{
-    if (!m_bDontSendToControl)
-    {
-        m_reflectedVar->m_spline = reinterpret_cast<uint64_t>(pVariable->GetSpline());
-    }
-}
-
-
-void ReflectedVarSplineAdapter::SyncIVarToReflectedVar(IVariable* pVariable)
-{
-    // Splines update variables directly so don't call OnVariableChange or SetValue here or values will be overwritten.
-
-    // Call OnSetValue to force this field to notify this variable that its model has changed without going through the
-    // full OnVariableChange pass
-    //
-    // Set m_bDontSendToControl to prevent the control's data from being overwritten (as the variable's data won't
-    // necessarily be up to date vs the controls at the point this happens).
-    m_bDontSendToControl = true;
-    pVariable->OnSetValue(false);
-    m_bDontSendToControl = false;
-
-    m_parentItem->SendOnItemChange();
-}
-
-void ReflectedVarMotionAdapter::SetVariable(IVariable *pVariable)
-{
-    // Create new reflected var
-    m_reflectedVar.reset(new CReflectedVarMotion(pVariable->GetHumanName().toLatin1().data()));
-    m_reflectedVar->m_description = pVariable->GetDescription().toLatin1().data();
-
-    // Set the asset id
-    AZStd::string stringGuid = pVariable->GetDisplayValue().toLatin1().data();
-    AZ::Uuid guid(stringGuid.c_str(), stringGuid.length());
-    AZ::u32 subId = pVariable->GetUserData().value<AZ::u32>();
-    m_reflectedVar->m_assetId = AZ::Data::AssetId(guid, subId);
-
-    // Lookup Filename by assetId and get the filename part of the description
-    EBUS_EVENT_RESULT(m_reflectedVar->m_motion, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, m_reflectedVar->m_assetId);
-}
-
-void ReflectedVarMotionAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
-    AZStd::string stringGuid = pVariable->GetDisplayValue().toLatin1().data();
-    AZ::Uuid guid(stringGuid.c_str(), stringGuid.length());
-    AZ::u32 subId = pVariable->GetUserData().value<AZ::u32>();
-    m_reflectedVar->m_assetId = AZ::Data::AssetId(guid, subId);
-
-    // Lookup Filename by assetId and get the filename part of the description
-    EBUS_EVENT_RESULT(m_reflectedVar->m_motion, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, m_reflectedVar->m_assetId);
-}
-
-void ReflectedVarMotionAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
-    pVariable->SetUserData(m_reflectedVar->m_assetId.m_subId);
-    pVariable->SetDisplayValue(m_reflectedVar->m_assetId.m_guid.ToString<AZStd::string>().c_str());
-}
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
deleted file mode 100644
index aac4e0ef42..0000000000
--- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_REFLECTEDVARWRAPPER_H
-#define CRYINCLUDE_EDITOR_UTILS_REFLECTEDVARWRAPPER_H
-#pragma once
-
-#include "Util/Variable.h"
-#include <Util/VariablePropertyType.h>
-#include "ReflectedVar.h"
-
-#include <QScopedPointer>
-
-struct CUIEnumsDatabase_SEnum;
-class ReflectedPropertyItem;
-
-// Class to wrap the CReflectedVars and sync them with corresponding IVariable.
-// Most of this code is ported from CPropertyItem functions that marshal data between
-// IVariable and editor widgets.
-
-class EDITOR_CORE_API ReflectedVarAdapter
-{
-public:
-    virtual ~ReflectedVarAdapter(){};
-
-    // update the range limits in CReflectedVar to range specified in IVariable
-    virtual void UpdateRangeLimits([[maybe_unused]] IVariable* pVariable) {};
-
-    //set IVariable for this property and create a CReflectedVar to represent it
-    virtual void SetVariable(IVariable* pVariable) = 0;
-
-    //update the ReflectedVar to current value of IVar
-    virtual void SyncReflectedVarToIVar(IVariable* pVariable) = 0;
-
-    //update the internal IVariable as result of ReflectedVar changing
-    virtual void SyncIVarToReflectedVar(IVariable* pVariable) = 0;
-
-    // Callback called when variable change. SyncReflectedVarToIVar will be called after
-    virtual void OnVariableChange([[maybe_unused]] IVariable* var) {};
-
-    virtual bool UpdateReflectedVarEnums() { return false; }
-
-    virtual CReflectedVar* GetReflectedVar() = 0;
-
-    //needed for containers that can have new values filled in
-    virtual void ReplaceVarBlock([[maybe_unused]] CVarBlock* varBlock) {};
-
-    virtual bool Contains(CReflectedVar* var) { return GetReflectedVar() == var; }
-};
-
-
-class EDITOR_CORE_API ReflectedVarIntAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void UpdateRangeLimits(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarInt > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    float m_valueMultiplier = 1.0f;
-};
-
-class EDITOR_CORE_API ReflectedVarFloatAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void UpdateRangeLimits(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarFloat > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    float m_valueMultiplier = 1.0f;
-};
-
-class EDITOR_CORE_API ReflectedVarStringAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarString > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-class EDITOR_CORE_API ReflectedVarBoolAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarBool > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-class EDITOR_CORE_API ReflectedVarEnumAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    ReflectedVarEnumAdapter();
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    virtual void OnVariableChange(IVariable* var);
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-
-protected:
-    //update the ReflectedVar with the allowable enum options
-    bool UpdateReflectedVarEnums() override;
-    
-    //virtual function to allow derived classes to update the enum list before syncing with ReflectedVar.
-    virtual void updateIVariableEnumList([[maybe_unused]] IVariable* pVariable) {};
-
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarEnum<AZStd::string>  > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    IVariable* m_pVariable;
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    IVarEnumListPtr m_enumList;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    bool m_updatingEnums;
-};
-
-class EDITOR_CORE_API ReflectedVarDBEnumAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarEnum<AZStd::string>  > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    CUIEnumsDatabase_SEnum* m_pEnumDBItem;
-};
-
-class EDITOR_CORE_API ReflectedVarVector2Adapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarVector2 > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-class EDITOR_CORE_API ReflectedVarVector3Adapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarVector3 > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-class EDITOR_CORE_API ReflectedVarVector4Adapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarVector4 > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-
-class EDITOR_CORE_API ReflectedVarColorAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarColor > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-class EDITOR_CORE_API ReflectedVarAnimationAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarAnimation > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-class EDITOR_CORE_API ReflectedVarResourceAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarResource> m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-class EDITOR_CORE_API ReflectedVarUserAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable *pVariable) override;
-    void SyncReflectedVarToIVar(IVariable *pVariable) override;
-    void SyncIVarToReflectedVar(IVariable *pVariable) override;
-    CReflectedVar *GetReflectedVar() override {
-        return m_reflectedVar.data();
-    }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarUser> m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-class EDITOR_CORE_API ReflectedVarSplineAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    ReflectedVarSplineAdapter(ReflectedPropertyItem *parentItem, PropertyType propertyType);
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override {
-        return m_reflectedVar.data();
-    }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarSpline > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    bool m_bDontSendToControl;
-    PropertyType m_propertyType;
-    ReflectedPropertyItem *m_parentItem;
-};
-
-
-class EDITOR_CORE_API ReflectedVarGenericPropertyAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    ReflectedVarGenericPropertyAdapter(PropertyType propertyType);
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarGenericProperty > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    PropertyType m_propertyType;
-};
-
-class EDITOR_CORE_API ReflectedVarMotionAdapter
-    : public ReflectedVarAdapter
-{
-public:
-    void SetVariable(IVariable* pVariable) override;
-    void SyncReflectedVarToIVar(IVariable* pVariable) override;
-    void SyncIVarToReflectedVar(IVariable* pVariable) override;
-    CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QScopedPointer<CReflectedVarMotion > m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTILS_REFLECTEDVARWRAPPER_H
diff --git a/Code/Sandbox/Editor/Controls/SplineCtrl.cpp b/Code/Sandbox/Editor/Controls/SplineCtrl.cpp
deleted file mode 100644
index e2321eb6c9..0000000000
--- a/Code/Sandbox/Editor/Controls/SplineCtrl.cpp
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SplineCtrl.h"
-
-// Qt
-#include <QPainter>
-#include <QPainterPath>
-#include <QToolTip>
-
-// Editor
-#include "TimelineCtrl.h"
-
-
-#define MIN_TIME_EPSILON 0.01f
-
-//////////////////////////////////////////////////////////////////////////
-CSplineCtrl::CSplineCtrl(QWidget* parent)
-    : QWidget(parent)
-{
-    m_nActiveKey = -1;
-    m_nHitKeyIndex = -1;
-    m_nKeyDrawRadius = 3;
-    m_bTracking = false;
-    m_pSpline = 0;
-    m_gridX = 10;
-    m_gridY = 10;
-    m_fMinTime = -1;
-    m_fMaxTime = 1;
-    m_fMinValue = -1;
-    m_fMaxValue = 1;
-    m_fTooltipScaleX = 1;
-    m_fTooltipScaleY = 1;
-    m_bLockFirstLastKey = false;
-    m_pTimelineCtrl = 0;
-
-    m_bSelectedKeys.reserve(0);
-
-    m_fTimeMarker = -10;
-
-    setMouseTracking(true);
-}
-
-CSplineCtrl::~CSplineCtrl()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CSplineCtrl message handlers
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::resizeEvent([[maybe_unused]] QResizeEvent* event)
-{
-    m_rcSpline = rect();
-
-    if (m_pTimelineCtrl)
-    {
-        QRect rct = m_rcSpline;
-        rct.setHeight(20);
-        m_rcSpline.setTop(rct.bottom() + 1);
-        m_pTimelineCtrl->setGeometry(rct);
-    }
-
-    m_rcSpline.adjust(2, 2, -2, -2);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint CSplineCtrl::KeyToPoint(int nKey)
-{
-    if (nKey >= 0)
-    {
-        return TimeToPoint(m_pSpline->GetKeyTime(nKey));
-    }
-    return QPoint(0, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint CSplineCtrl::TimeToPoint(float time)
-{
-    QPoint point;
-    point.setX((time - m_fMinTime) * (m_rcSpline.width() / (m_fMaxTime - m_fMinTime)) + m_rcSpline.left());
-    float val = 0;
-    if (m_pSpline)
-    {
-        m_pSpline->InterpolateFloat(time, val);
-    }
-    point.setY((floor((m_fMaxValue - val) * (m_rcSpline.height() / (m_fMaxValue - m_fMinValue)) + 0.5f) + m_rcSpline.top()));
-    return point;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::PointToTimeValue(const QPoint& point, float& time, float& value)
-{
-    time = XOfsToTime(point.x());
-    float t = float(m_rcSpline.bottom() - point.y()) / m_rcSpline.height();
-    value = LERP(m_fMinValue, m_fMaxValue, t);
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CSplineCtrl::XOfsToTime(int x)
-{
-    // m_fMinTime to m_fMaxTime time range.
-    float t = float(x - m_rcSpline.left()) / m_rcSpline.width();
-    return LERP(m_fMinTime, m_fMaxTime, t);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint CSplineCtrl::XOfsToPoint(int x)
-{
-    return TimeToPoint(XOfsToTime(x));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::paintEvent(QPaintEvent* event)
-{
-    QPainter painter(this);
-
-    QRect rcClient = rect();
-
-    if (m_pSpline)
-    {
-        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
-    }
-
-    {
-        if (m_TimeUpdateRect != event->rect())
-        {
-            painter.fillRect(event->rect(), QColor(140, 140, 140));
-
-            //Draw Grid
-            DrawGrid(&painter);
-
-            //Draw Keys and Curve
-            if (m_pSpline)
-            {
-                DrawSpline(&painter);
-                DrawKeys(&painter);
-            }
-        }
-        m_TimeUpdateRect = QRect();
-    }
-    DrawTimeMarker(&painter);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::DrawGrid(QPainter* painter)
-{
-    QPen pOldPen = painter->pen();
-
-    int cx = m_rcSpline.width();
-    int cy = m_rcSpline.height();
-
-    QPen pen(QColor(90, 90, 90), 1, Qt::DotLine);
-    pen.setCosmetic(true);
-    painter->setPen(pen);
-
-    //Draw Vertical Grid Lines
-    for (int y = 1; y < m_gridX; y++)
-    {
-        painter->drawLine(m_rcSpline.left() + y * cx / m_gridX, m_rcSpline.top() + cy, m_rcSpline.left() + y * cx / m_gridX, m_rcSpline.top());
-    }
-
-    //Draw Horizontal Grid Lines
-    for (int x = 1; x < m_gridY; x++)
-    {
-        painter->drawLine(m_rcSpline.left(), m_rcSpline.top() + x * cy / m_gridY, m_rcSpline.left() + cx, m_rcSpline.top() + x * cy / m_gridY);
-    }
-
-    painter->setPen(QColor(75, 75, 75));
-
-    painter->drawLine(m_rcSpline.left() + (m_gridX / 2) * cx / m_gridX, m_rcSpline.top() + cy, m_rcSpline.left() + (m_gridX / 2) * cx / m_gridX, m_rcSpline.top() + 0);
-    painter->drawLine(m_rcSpline.left() + 0, m_rcSpline.left() + (m_gridY / 2) * cy / m_gridY, m_rcSpline.left() + cx, m_rcSpline.left() + (m_gridY / 2) * cy / m_gridY);
-
-    painter->drawRect(m_rcSpline);
-
-    painter->setPen(pOldPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::DrawSpline(QPainter* painter)
-{
-    //Draw Curve
-    // create and select a thick, white pen
-    const QPen pOldPen = painter->pen();
-    painter->setPen(QColor(128, 255, 128));
-
-    const QRect rcClip = painter->hasClipping() ? painter->clipBoundingRect().intersected(m_rcSpline).toRect() : m_rcSpline;
-
-    bool bFirst = true;
-    QPainterPath path;
-    for (int x = rcClip.left(); x < rcClip.right(); x++)
-    {
-        QPoint pt = XOfsToPoint(x);
-        if (!bFirst)
-        {
-            path.lineTo(pt);
-        }
-        else
-        {
-            path.moveTo(pt);
-            bFirst = false;
-        }
-    }
-    painter->drawPath(path);
-
-    // Put back the old objects
-    painter->setPen(pOldPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::DrawKeys(QPainter* painter)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    // create and select a white pen
-    const QPen pOldPen = painter->pen();
-    painter->setPen(Qt::black);
-
-    m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
-
-    for (int i = 0; i < m_pSpline->GetKeyCount(); i++)
-    {
-        float time = m_pSpline->GetKeyTime(i);
-        const QPoint pt = TimeToPoint(time);
-
-        QColor clr(220, 220, 0);
-        if (m_bSelectedKeys[i])
-        {
-            clr = QColor(255, 0, 0);
-        }
-        const QBrush pOldBrush = painter->brush();
-        painter->setBrush(clr);
-
-        // Draw this key.
-        painter->drawRect(QRect(QPoint(pt.x() - m_nKeyDrawRadius, pt.y() - m_nKeyDrawRadius), QPoint(pt.x() + m_nKeyDrawRadius - 1, pt.y() + m_nKeyDrawRadius - 1)));
-
-        painter->setBrush(pOldBrush);
-    }
-
-    painter->setPen(pOldPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::DrawTimeMarker(QPainter* painter)
-{
-    painter->setPen(QColor(255, 0, 255));
-    const QPoint pt = TimeToPoint(m_fTimeMarker);
-    painter->drawLine(pt.x(), m_rcSpline.top() + 1, pt.x(), m_rcSpline.bottom() - 1);
-}
-
-void CSplineCtrl::UpdateToolTip()
-{
-    if (m_nHitKeyIndex >= 0 && m_pSpline)
-    {
-        float time = m_pSpline->GetKeyTime(m_nHitKeyIndex);
-        float val;
-        m_pSpline->GetKeyValueFloat(m_nHitKeyIndex, val);
-        int cont_s = (m_pSpline->GetKeyFlags(m_nHitKeyIndex) >> SPLINE_KEY_TANGENT_IN_SHIFT) & SPLINE_KEY_TANGENT_LINEAR ? 1 : 2;
-        int cont_d = (m_pSpline->GetKeyFlags(m_nHitKeyIndex) >> SPLINE_KEY_TANGENT_OUT_SHIFT) & SPLINE_KEY_TANGENT_LINEAR ? 1 : 2;
-
-        const QString tipText = tr("%1, %2, [%3|%4").arg(time * m_fTooltipScaleX, 3, 'f').arg(val * m_fTooltipScaleY, 3, 'f').arg(cont_s).arg(cont_d);
-        QToolTip::showText(QCursor::pos(), tipText, this);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-//Mouse Message Handlers
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::mousePressEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonDown(event->pos(), event->modifiers());
-        break;
-    case Qt::RightButton:
-        OnRButtonDown(event->pos(), event->modifiers());
-        break;
-    }
-}
-
-void CSplineCtrl::mouseReleaseEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonUp(event->pos(), event->modifiers());
-        break;
-    }
-}
-
-void CSplineCtrl::OnLButtonDown([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
-{
-    if (m_bTracking)
-    {
-        return;
-    }
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    setFocus();
-
-    switch (m_hitCode)
-    {
-    case HIT_KEY:
-        StartTracking();
-        SetActiveKey(m_nHitKeyIndex);
-        break;
-
-    case HIT_SPLINE:
-        // Cycle the spline slope of the nearest key.
-        ToggleKeySlope(m_nHitKeyIndex, m_nHitKeyDist);
-        SetActiveKey(-1);
-        break;
-
-    case HIT_NOTHING:
-        SetActiveKey(-1);
-        break;
-    }
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::OnRButtonDown([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
-{
-    setFocus();
-
-    if (!m_pSpline)
-    {
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::mouseDoubleClickEvent(QMouseEvent* event)
-{
-    if (!m_pSpline || event->button() != Qt::LeftButton)
-    {
-        return;
-    }
-
-    switch (m_hitCode)
-    {
-    case HIT_NOTHING:
-    {
-        int iIndex = InsertKey(event->pos());
-        SetActiveKey(iIndex);
-
-        update();
-    }
-    break;
-    case HIT_KEY:
-    {
-        RemoveKey(m_nHitKeyIndex);
-    }
-    break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::mouseMoveEvent(QMouseEvent* event)
-{
-    OnSetCursor();
-
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    if (m_bTracking)
-    {
-        TrackKey(event->pos());
-        UpdateToolTip();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::OnLButtonUp([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    if (m_bTracking)
-    {
-        StopTracking();
-    }
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::SetActiveKey(int nIndex)
-{
-    ClearSelection();
-
-    // Activate New Key
-    if (nIndex >= 0)
-    {
-        m_bSelectedKeys[nIndex] = true;
-    }
-    m_nActiveKey = nIndex;
-    update();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw)
-{
-    if (pSpline != m_pSpline)
-    {
-        m_pSpline = pSpline;
-    }
-
-    ValidateSpline();
-    ClearSelection();
-
-    if (bRedraw)
-    {
-        update();
-    }
-}
-
-void CSplineCtrl::ValidateSpline()
-{
-    // Add initial control points (will be  serialised only if edited).
-    if (m_pSpline->GetKeyCount() == 0)
-    {
-        m_pSpline->InsertKeyFloat(0.f, 1.f);
-        m_pSpline->InsertKeyFloat(1.f, 1.f);
-        m_pSpline->Update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISplineInterpolator* CSplineCtrl::GetSpline()
-{
-    return m_pSpline;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::OnSetCursor()
-{
-    const QPoint point = mapFromGlobal(QCursor::pos());
-
-    const int hitKey = m_nHitKeyIndex;
-
-    switch (HitTest(point))
-    {
-    case HIT_SPLINE:
-    {
-        setCursor(CMFCUtils::LoadCursor(IDC_ARRWHITE));
-    } break;
-    case HIT_KEY:
-    {
-        setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCK));
-    } break;
-    default:
-        unsetCursor();
-        break;
-    }
-
-    if (m_bTracking)
-    {
-        m_nHitKeyIndex = hitKey;
-    }
-
-    if (m_pSpline)
-    {
-        if (m_nHitKeyIndex >= 0)
-        {
-            UpdateToolTip();
-        }
-        else if (!m_bTracking)
-        {
-            QToolTip::hideText();
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::keyPressEvent(QKeyEvent* event)
-{
-    bool bProcessed = false;
-
-    if (m_nActiveKey != -1 && m_pSpline)
-    {
-        switch (event->key())
-        {
-        case Qt::Key_Space:
-        {
-            ToggleKeySlope(m_nActiveKey, 0);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Delete:
-        {
-            RemoveKey(m_nActiveKey);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Up:
-        {
-            CUndo undo("Move Spline Key");
-            QPoint point = KeyToPoint(m_nActiveKey);
-            point.ry() -= 1;
-            emit beforeChange();
-            TrackKey(point);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Down:
-        {
-            CUndo undo("Move Spline Key");
-            QPoint point = KeyToPoint(m_nActiveKey);
-            point.ry() += 1;
-            emit beforeChange();
-            TrackKey(point);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Left:
-        {
-            CUndo undo("Move Spline Key");
-            QPoint point = KeyToPoint(m_nActiveKey);
-            point.rx() -= 1;
-            emit beforeChange();
-            TrackKey(point);
-            bProcessed = true;
-        } break;
-        case Qt::Key_Right:
-        {
-            CUndo undo("Move Spline Key");
-            QPoint point = KeyToPoint(m_nActiveKey);
-            point.ry() += 1;
-            emit beforeChange();
-            TrackKey(point);
-            bProcessed = true;
-        } break;
-
-        default:
-            break; //do nothing
-        }
-
-        update();
-    }
-
-    event->setAccepted(bProcessed);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-CSplineCtrl::EHitCode CSplineCtrl::HitTest(const QPoint& point)
-{
-    if (!m_pSpline)
-    {
-        return HIT_NOTHING;
-    }
-
-    float time, val;
-    PointToTimeValue(point, time, val);
-
-    m_nHitKeyIndex = -1;
-    m_nHitKeyDist = 0xFFFF;
-    m_hitCode = HIT_NOTHING;
-
-    QPoint splinePt = TimeToPoint(time);
-    if (abs(splinePt.y() - point.y()) < 4)
-    {
-        m_hitCode = HIT_SPLINE;
-        for (int i = 0; i < m_pSpline->GetKeyCount(); i++)
-        {
-            const QPoint splinePt2 = TimeToPoint(m_pSpline->GetKeyTime(i));
-            if (abs(point.x() - splinePt2.x()) < abs(m_nHitKeyDist))
-            {
-                m_nHitKeyIndex = i;
-                m_nHitKeyDist = point.x() - splinePt2.x();
-            }
-        }
-        if (abs(m_nHitKeyDist) < 4)
-        {
-            m_hitCode = HIT_KEY;
-        }
-    }
-
-    return m_hitCode;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::StartTracking()
-{
-    m_bTracking = TRUE;
-
-    GetIEditor()->BeginUndo();
-
-    emit beforeChange();
-
-    setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCKCROSS));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::TrackKey(const QPoint& p)
-{
-    int nKey = m_nHitKeyIndex;
-
-    QPoint point = p;
-
-    if (nKey >= 0)
-    {
-        float time, val;
-
-        // Editing time & value.
-        Limit(point.rx(), m_rcSpline.left(), m_rcSpline.right());
-        Limit(point.ry(), m_rcSpline.top(), m_rcSpline.bottom());
-        PointToTimeValue(point, time, val);
-
-        int i;
-        for (i = 0; i < m_pSpline->GetKeyCount(); i++)
-        {
-            // Switch to next key.
-            if (fabs(m_pSpline->GetKeyTime(i) - time) < MIN_TIME_EPSILON)
-            {
-                if (i != nKey)
-                {
-                    return;
-                }
-            }
-        }
-
-        m_pSpline->SetKeyValueFloat(nKey, val);
-        if ((nKey != 0 && nKey != m_pSpline->GetKeyCount() - 1) || !m_bLockFirstLastKey)
-        {
-            m_pSpline->SetKeyTime(nKey, time);
-        }
-        else if (m_bLockFirstLastKey)
-        {
-            int first = 0;
-            int last = m_pSpline->GetKeyCount() - 1;
-            if (nKey == first)
-            {
-                m_pSpline->SetKeyValueFloat(last, val);
-            }
-            else if (nKey == last)
-            {
-                m_pSpline->SetKeyValueFloat(first, val);
-            }
-        }
-
-        m_pSpline->Update();
-        emit change();
-        if (m_updateCallback)
-        {
-            m_updateCallback(this);
-        }
-
-        update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::StopTracking()
-{
-    if (!m_bTracking)
-    {
-        return;
-    }
-
-    GetIEditor()->AcceptUndo("Spline Move");
-
-    m_bTracking = FALSE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::RemoveKey(int nKey)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-    if (nKey)
-    {
-        if (m_bLockFirstLastKey)
-        {
-            if (nKey == 0 || nKey == m_pSpline->GetKeyCount() - 1)
-            {
-                return;
-            }
-        }
-    }
-
-    CUndo undo("Remove Spline Key");
-
-    emit beforeChange();
-    m_nActiveKey = -1;
-    m_nHitKeyIndex = -1;
-    if (m_pSpline)
-    {
-        m_pSpline->RemoveKey(nKey);
-        m_pSpline->Update();
-        ValidateSpline();
-    }
-    emit change();
-    if (m_updateCallback)
-    {
-        m_updateCallback(this);
-    }
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSplineCtrl::InsertKey(const QPoint& point)
-{
-    CUndo undo("Spline Insert Key");
-
-    float time, val;
-    PointToTimeValue(point, time, val);
-
-    int i;
-    for (i = 0; i < m_pSpline->GetKeyCount(); i++)
-    {
-        // Skip if any key already have time that is very close.
-        if (fabs(m_pSpline->GetKeyTime(i) - time) < MIN_TIME_EPSILON)
-        {
-            return i;
-        }
-    }
-
-    emit beforeChange();
-
-    m_pSpline->InsertKeyFloat(time, val);
-    m_pSpline->Update();
-    ClearSelection();
-    update();
-
-    emit change();
-    if (m_updateCallback)
-    {
-        m_updateCallback(this);
-    }
-
-    for (i = 0; i < m_pSpline->GetKeyCount(); i++)
-    {
-        // Find key with added time.
-        if (m_pSpline->GetKeyTime(i) == time)
-        {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-void CSplineCtrl::ToggleKeySlope(int nIndex, int nDir)
-{
-    if (nIndex >= 0)
-    {
-        int flags = m_pSpline->GetKeyFlags(nIndex);
-        if (nDir <= 0)
-        {
-            // Toggle left side.
-            flags ^= SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_IN_SHIFT;
-        }
-        if (nDir >= 0)
-        {
-            // Toggle right side.
-            flags ^= SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_OUT_SHIFT;
-        }
-        m_pSpline->SetKeyFlags(nIndex, flags);
-        m_pSpline->Update();
-        emit change();
-        if (m_updateCallback)
-        {
-            m_updateCallback(this);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::ClearSelection()
-{
-    m_nActiveKey = -1;
-    if (m_pSpline)
-    {
-        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
-    }
-    for (int i = 0; i < (int)m_bSelectedKeys.size(); i++)
-    {
-        m_bSelectedKeys[i] = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::SetTimeMarker(float fTime)
-{
-    if (!m_pSpline)
-    {
-        return;
-    }
-
-    if (fTime == m_fTimeMarker)
-    {
-        return;
-    }
-
-    // Erase old first.
-    QPoint pt0 = TimeToPoint(m_fTimeMarker);
-    QPoint pt1 = TimeToPoint(fTime);
-    QRect rc(QPoint(pt0.x(), m_rcSpline.top()), QPoint(pt1.x(), m_rcSpline.bottom()));
-    rc = rc.normalized();
-    rc.adjust(-5, 0, 5, 0);
-    rc = rc.intersected(m_rcSpline);
-
-    m_TimeUpdateRect = rc;
-    update(rc);
-
-    m_fTimeMarker = fTime;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::SetTimelineCtrl(TimelineWidget* pTimelineCtrl)
-{
-    m_pTimelineCtrl = pTimelineCtrl;
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->setParent(this);
-    }
-}
-
-#include <Controls/moc_SplineCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/SplineCtrl.h b/Code/Sandbox/Editor/Controls/SplineCtrl.h
deleted file mode 100644
index 2ba330f028..0000000000
--- a/Code/Sandbox/Editor/Controls/SplineCtrl.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <ISplines.h>
-#endif
-
-// Custom styles for this control.
-#define SPLINE_STYLE_NOGRID 0x0001
-#define SPLINE_STYLE_NO_TIME_MARKER 0x0002
-
-// Notify event sent when spline is being modified.
-#define SPLN_CHANGE (0x0001)
-// Notify event sent just before when spline is modified.
-#define SPLN_BEFORE_CHANGE (0x0002)
-
-class TimelineWidget;
-
-//////////////////////////////////////////////////////////////////////////
-// Spline control.
-//////////////////////////////////////////////////////////////////////////
-class CSplineCtrl
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    CSplineCtrl(QWidget* parent = nullptr);
-    virtual ~CSplineCtrl();
-
-    //Key functions
-    int  GetActiveKey() { return m_nActiveKey; };
-    void SetActiveKey(int nIndex);
-    int InsertKey(const QPoint& point);
-    void ToggleKeySlope(int nIndex, int nDist);
-
-    void SetGrid(int numX, int numY) { m_gridX = numX; m_gridY = numY; };
-    void SetTimeRange(float tmin, float tmax) { m_fMinTime = tmin; m_fMaxTime = tmax; }
-    void SetValueRange(float tmin, float tmax)
-    {
-        m_fMinValue = tmin;
-        m_fMaxValue = tmax;
-        if (m_fMinValue == m_fMaxValue)
-        {
-            m_fMaxValue = m_fMinValue + 0.001f;
-        }
-    }
-    void SetTooltipValueScale(float x, float y) { m_fTooltipScaleX = x; m_fTooltipScaleY = y; };
-    // Lock value of first and last key to be the same.
-    void LockFirstAndLastKeys(bool bLock) { m_bLockFirstLastKey = bLock; }
-
-    void SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw = FALSE);
-    ISplineInterpolator* GetSpline();
-
-    void SetTimeMarker(float fTime);
-    void SetTimelineCtrl(TimelineWidget* pTimelineCtrl);
-    void UpdateToolTip();
-
-    typedef AZStd::function<void(CSplineCtrl*)> UpdateCallback;
-    void SetUpdateCallback(UpdateCallback cb) { m_updateCallback = cb; };
-
-Q_SIGNALS:
-    void beforeChange();
-    void change();
-
-protected:
-    enum EHitCode
-    {
-        HIT_NOTHING,
-        HIT_KEY,
-        HIT_SPLINE,
-    };
-
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void paintEvent(QPaintEvent* event) override;
-    void resizeEvent(QResizeEvent* event) override;
-    void OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void OnLButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnRButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnSetCursor();
-    void mouseDoubleClickEvent(QMouseEvent* event) override;
-    void keyPressEvent(QKeyEvent* event) override;
-
-    // Drawing functions
-    void DrawGrid(QPainter* pDC);
-    void DrawSpline(QPainter* pDC);
-    void DrawKeys(QPainter* pDC);
-    void DrawTimeMarker(QPainter* pDC);
-
-    EHitCode HitTest(const QPoint& point);
-
-    //Tracking support helper functions
-    void StartTracking();
-    void TrackKey(const QPoint& point);
-    void StopTracking();
-    void RemoveKey(int nKey);
-
-    QPoint KeyToPoint(int nKey);
-    QPoint TimeToPoint(float time);
-    void PointToTimeValue(const QPoint& point, float& time, float& value);
-    float  XOfsToTime(int x);
-    QPoint XOfsToPoint(int x);
-
-    void ClearSelection();
-    void ValidateSpline();
-
-private:
-    ISplineInterpolator* m_pSpline;
-
-    QRect m_rcClipRect;
-    QRect m_rcSpline;
-
-    QPoint m_hitPoint;
-    EHitCode m_hitCode;
-    int m_nHitKeyIndex;
-    int m_nHitKeyDist;
-
-    float m_fTimeMarker;
-
-    int m_nActiveKey;
-    int m_nKeyDrawRadius;
-
-    bool  m_bTracking;
-
-    int m_gridX;
-    int m_gridY;
-
-    float m_fMinTime, m_fMaxTime;
-    float m_fMinValue, m_fMaxValue;
-    float m_fTooltipScaleX, m_fTooltipScaleY;
-
-    bool m_bLockFirstLastKey;
-
-    std::vector<int> m_bSelectedKeys;
-
-    TimelineWidget* m_pTimelineCtrl;
-
-    QRect m_TimeUpdateRect;
-
-    UpdateCallback m_updateCallback;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRL_H
diff --git a/Code/Sandbox/Editor/Controls/SplineCtrlEx.cpp b/Code/Sandbox/Editor/Controls/SplineCtrlEx.cpp
deleted file mode 100644
index a0bdbc804f..0000000000
--- a/Code/Sandbox/Editor/Controls/SplineCtrlEx.cpp
+++ /dev/null
@@ -1,3349 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SplineCtrlEx.h"
-
-// Qt
-#include <QPainter>
-#include <QPainterPath>
-#include <QToolTip>
-#include <QRubberBand>
-
-// Editor
-#include "TimelineCtrl.h"
-#include "Clipboard.h"
-#include "GridUtils.h"
-
-
-#define DEFAULT_MIN_TIME_EPSILON 0.001f
-#define MIN_TIME_EPSILON_FOR_SCALING 0.1f
-
-#define ACTIVE_BKG_COLOR      QColor(190, 190, 190)
-#define GRID_COLOR            QColor(110, 110, 110)
-#define EDIT_SPLINE_COLOR     QColor(128, 255, 128)
-
-#define MIN_PIXEL_PER_GRID_X 50
-#define MIN_PIXEL_PER_GRID_Y 10
-
-#define LEFT_BORDER_OFFSET 40
-
-const float AbstractSplineWidget::threshold = 0.015f;
-static const float minViewRange = 0.1f;
-
-//////////////////////////////////////////////////////////////////////////
-
-static void SetKeyTangentType(ISplineInterpolator* pSpline, int key, ESplineKeyTangentType type)
-{
-    int flags = (pSpline->GetKeyFlags(key) & ~SPLINE_KEY_TANGENT_IN_MASK) & ~SPLINE_KEY_TANGENT_OUT_MASK;
-    pSpline->SetKeyFlags(key, flags | (type << SPLINE_KEY_TANGENT_IN_SHIFT) | (type << SPLINE_KEY_TANGENT_OUT_SHIFT));
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CUndoSplineCtrlEx
-    : public ISplineCtrlUndo
-{
-public:
-    CUndoSplineCtrlEx(AbstractSplineWidget* pCtrl, std::vector<ISplineInterpolator*>& splineContainer)
-    {
-        m_pCtrl = FindControl(pCtrl);
-
-        for (size_t splineIndex = 0; splineIndex < splineContainer.size(); ++splineIndex)
-        {
-            AddSpline(splineContainer[splineIndex]);
-        }
-
-        SerializeSplines(&SplineEntry::undo, false);
-    }
-
-protected:
-    void AddSpline(ISplineInterpolator* pSpline)
-    {
-        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
-        m_splineEntries.resize(m_splineEntries.size() + 1);
-        SplineEntry& entry = m_splineEntries.back();
-        ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
-        entry.id = (pSplineSet ? pSplineSet->GetIDFromSpline(pSpline) : 0);
-        entry.pSpline = pSpline;
-
-        const int numKeys = pSpline->GetKeyCount();
-        entry.keySelectionFlags.reserve(numKeys);
-        for (int i = 0; i < numKeys; ++i)
-        {
-            entry.keySelectionFlags.push_back(pSpline->GetKeyFlags(i) & ESPLINE_KEY_UI_SELECTED_MASK);
-        }
-    }
-
-    virtual int GetSize() { return sizeof(*this); }
-    virtual QString GetDescription() { return "UndoSplineCtrlEx"; };
-
-    virtual void Undo(bool bUndo)
-    {
-        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
-        if (pCtrl)
-        {
-            pCtrl->SendNotifyEvent(SPLN_BEFORE_CHANGE);
-        }
-        if (bUndo)
-        {
-            SerializeSplines(&SplineEntry::redo, false);
-        }
-        SerializeSplines(&SplineEntry::undo, true);
-        if (pCtrl && bUndo)
-        {
-            pCtrl->m_bKeyTimesDirty = true;
-            pCtrl->SendNotifyEvent(SPLN_CHANGE);
-            pCtrl->update();
-        }
-    }
-
-    virtual void Redo()
-    {
-        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
-        if (pCtrl)
-        {
-            pCtrl->SendNotifyEvent(SPLN_BEFORE_CHANGE);
-        }
-        SerializeSplines(&SplineEntry::redo, true);
-        if (pCtrl)
-        {
-            pCtrl->m_bKeyTimesDirty = true;
-            pCtrl->SendNotifyEvent(SPLN_CHANGE);
-            pCtrl->update();
-        }
-    }
-
-private:
-    class SplineEntry
-    {
-    public:
-        std::vector<int> keySelectionFlags;
-        _smart_ptr<ISplineBackup> undo;
-        _smart_ptr<ISplineBackup> redo;
-        string id;
-        ISplineInterpolator* pSpline;
-    };
-
-    void SerializeSplines(_smart_ptr<ISplineBackup> SplineEntry::* backup, bool bLoading)
-    {
-        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
-        ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
-        for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
-        {
-            SplineEntry& entry = *it;
-            ISplineInterpolator* pSpline = (pSplineSet ? pSplineSet->GetSplineFromID(entry.id) : entry.pSpline);
-
-            if (!pSpline && pCtrl && pCtrl->GetSplineCount() > 0)
-            {
-                pSpline = pCtrl->GetSpline(0);
-            }
-
-            if (pSpline && bLoading)
-            {
-                pSpline->Restore(entry.*backup);
-            }
-            else if (pSpline)
-            {
-                (entry.*backup) = pSpline->Backup();
-            }
-        }
-    }
-
-public:
-    typedef std::list<AbstractSplineWidget*> CSplineCtrls;
-
-    static AbstractSplineWidget* FindControl(AbstractSplineWidget* pCtrl)
-    {
-        if (!pCtrl)
-        {
-            return 0;
-        }
-
-        auto iter = std::find(s_activeCtrls.begin(), s_activeCtrls.end(), pCtrl);
-        if (iter == s_activeCtrls.end())
-        {
-            return 0;
-        }
-
-        return *iter;
-    }
-
-    static void RegisterControl(AbstractSplineWidget* pCtrl)
-    {
-        if (!FindControl(pCtrl))
-        {
-            s_activeCtrls.push_back(pCtrl);
-        }
-    }
-
-    static void UnregisterControl(AbstractSplineWidget* pCtrl)
-    {
-        if (FindControl(pCtrl))
-        {
-            s_activeCtrls.remove(pCtrl);
-        }
-    }
-
-    static CSplineCtrls s_activeCtrls;
-
-    virtual bool IsSelectionChanged() const
-    {
-        AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
-        ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
-
-        for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
-        {
-            const SplineEntry& entry = *it;
-            ISplineInterpolator* pSpline = (pSplineSet ? pSplineSet->GetSplineFromID(entry.id) : entry.pSpline);
-
-            if (!pSpline && pCtrl && pCtrl->GetSplineCount() > 0)
-            {
-                pSpline = pCtrl->GetSpline(0);
-            }
-
-            if (!pSpline)
-            {
-                return false;
-            }
-
-            if (pSpline->GetKeyCount() != entry.keySelectionFlags.size())
-            {
-                return true;
-            }
-
-            for (int i = 0; i < pSpline->GetKeyCount(); ++i)
-            {
-                if (entry.keySelectionFlags[i] != (pSpline->GetKeyFlags(i) & ESPLINE_KEY_UI_SELECTED_MASK))
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-private:
-    AbstractSplineWidget* m_pCtrl;
-    std::vector<SplineEntry> m_splineEntries;
-    std::vector<float> m_keyTimes;
-};
-
-CUndoSplineCtrlEx::CSplineCtrls CUndoSplineCtrlEx::s_activeCtrls;
-
-SplineWidget::SplineWidget(QWidget* parent)
-    : QWidget(parent)
-    , m_rubberBand(new QRubberBand(QRubberBand::Rectangle, this))
-{
-    m_rubberBand->setVisible(false);
-    setMouseTracking(true);
-
-    setFocusPolicy(Qt::StrongFocus);
-}
-
-SplineWidget::~SplineWidget()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-AbstractSplineWidget::AbstractSplineWidget()
-    : m_defaultKeyTangentType(SPLINE_KEY_TANGENT_NONE)
-{
-    m_pTimelineCtrl = 0;
-
-    m_totalSplineCount = 0;
-    m_pHitSpline = 0;
-    m_pHitDetailSpline = 0;
-    m_nHitKeyIndex = -1;
-    m_nHitDimension = -1;
-    m_bHitIncomingHandle = true;
-    m_nKeyDrawRadius = 3;
-    m_gridX = 10;
-    m_gridY = 10;
-    m_timeRange.start = 0;
-    m_timeRange.end = 1;
-    m_fMinValue = -1;
-    m_fMaxValue = 1;
-    m_valueRange.Set(-1, 1);
-    m_fTooltipScaleX = 1;
-    m_fTooltipScaleY = 1;
-
-    m_cMousePos = QPoint(0, 0);
-    m_fTimeScale = 1;
-    m_fValueScale = 1;
-    m_fGridTimeScale = 30.0f;
-
-    m_ticksStep = 10;
-
-    m_fTimeMarker = -10;
-    m_editMode = NothingMode;
-
-    m_bSnapTime = false;
-    m_bSnapValue = false;
-    m_bBitmapValid = false;
-
-    m_nLeftOffset = LEFT_BORDER_OFFSET;
-
-    m_grid.zoom.x = 200;
-    m_grid.zoom.y = 100;
-
-    m_bKeyTimesDirty = false;
-
-    m_rcSelect = QRect();
-    m_rcSpline = QRect();
-
-    m_boLeftMouseButtonDown = false;
-
-    m_pSplineSet = 0;
-
-    m_controlAmplitude = false;
-
-    m_fMinTimeEpsilon = DEFAULT_MIN_TIME_EPSILON;
-
-    m_defaultValueRange.Set(-1.1f, 1.1f);
-
-    m_bEditLock = false;
-
-    m_pCurrentUndo = nullptr;
-
-    CUndoSplineCtrlEx::RegisterControl(this);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-AbstractSplineWidget::~AbstractSplineWidget()
-{
-    CUndoSplineCtrlEx::UnregisterControl(this);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-Vec2 AbstractSplineWidget::GetZoom()
-{
-    return m_grid.zoom;
-}
-
-Vec2 AbstractSplineWidget::GetScrollOffset()
-{
-    return m_grid.origin;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SetZoom(Vec2 zoom, const QPoint& center)
-{
-    m_grid.SetZoom(zoom, QPoint(center.x(), m_rcSpline.bottom() + 1 - center.y()));
-    SetScrollOffset(m_grid.origin);
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->setZoom(zoom.x, m_grid.origin.x);
-    }
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SetZoom(Vec2 zoom)
-{
-    m_grid.zoom = zoom;
-    SetScrollOffset(m_grid.origin);
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->setZoom(zoom.x, m_grid.origin.x);
-    }
-    SendNotifyEvent(SPLN_SCROLL_ZOOM);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SetScrollOffset(Vec2 ofs)
-{
-    m_grid.origin = ofs;
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->setZoom(m_grid.zoom.x, m_grid.origin.x);
-    }
-    SendNotifyEvent(SPLN_SCROLL_ZOOM);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-float AbstractSplineWidget::SnapTime(float time)
-{
-    if (m_bSnapTime)
-    {
-        float step = m_grid.step.x / 10.0f;
-        return floor((time / step) + 0.5f) * step;
-    }
-    return time;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float AbstractSplineWidget::SnapValue(float val)
-{
-    if (m_bSnapValue)
-    {
-        float step = m_grid.step.y;
-        return floor((val / step) + 0.5f) * step;
-    }
-    return val;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int AbstractSplineWidget::GetKeyTimeCount() const
-{
-    UpdateKeyTimes();
-
-    return int(m_keyTimes.size());
-}
-
-//////////////////////////////////////////////////////////////////////////
-float AbstractSplineWidget::GetKeyTime(int index) const
-{
-    UpdateKeyTimes();
-
-    return m_keyTimes[index].time;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool AbstractSplineWidget::GetKeyTimeSelected(int index) const
-{
-    UpdateKeyTimes();
-
-    return m_keyTimes[index].selected;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SetKeyTimeSelected(int index, bool selected)
-{
-    m_keyTimes[index].selected = selected;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int AbstractSplineWidget::GetKeyCount(int index) const
-{
-    UpdateKeyTimes();
-
-    return m_keyTimes[index].count;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int AbstractSplineWidget::GetKeyCountBound() const
-{
-    UpdateKeyTimes();
-
-    return m_totalSplineCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::BeginEdittingKeyTimes()
-{
-    if (CUndo::IsRecording())
-    {
-        GetIEditor()->CancelUndo();
-        m_pCurrentUndo = nullptr;
-    }
-    GetIEditor()->BeginUndo();
-
-    for (int keyTimeIndex = 0; keyTimeIndex < int(m_keyTimes.size()); ++keyTimeIndex)
-    {
-        m_keyTimes[keyTimeIndex].oldTime = m_keyTimes[keyTimeIndex].time;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::EndEdittingKeyTimes()
-{
-    if (CUndo::IsRecording())
-    {
-        GetIEditor()->AcceptUndo("Batch key move");
-        m_pCurrentUndo = nullptr;
-    }
-
-    m_bKeyTimesDirty = true;
-    update();
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::MoveKeyTimes(int numChanges, int* indices, float scale, float offset, bool copyKeys)
-{
-    if (CUndo::IsRecording())
-    {
-        GetIEditor()->RestoreUndo();
-
-        std::vector<ISplineInterpolator*> splines;
-        for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
-        {
-            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-            if (pSpline)
-            {
-                splines.push_back(pSpline);
-            }
-        }
-        CUndo::Record(m_pCurrentUndo = CreateSplineCtrlUndoObject(splines));
-
-        for (int keyTimeIndex = 0; keyTimeIndex < int(m_keyTimes.size()); ++keyTimeIndex)
-        {
-            m_keyTimes[keyTimeIndex].time = m_keyTimes[keyTimeIndex].oldTime;
-        }
-    }
-
-    class KeyChange
-    {
-    public:
-        KeyChange(ISplineInterpolator* pSpline, int keyIndex, float oldTime, float newTime, int flags)
-            : pSpline(pSpline)
-            , keyIndex(keyIndex)
-            , oldTime(oldTime)
-            , newTime(newTime)
-            , flags(flags) {}
-
-        ISplineInterpolator* pSpline;
-        int keyIndex;
-        float oldTime;
-        float newTime;
-        ISplineInterpolator::ValueType value;
-        int flags;
-        ISplineInterpolator::ValueType tin, tout;
-    };
-
-    std::vector<KeyChange> individualKeyChanges;
-    for (int changeIndex = 0; indices && changeIndex < numChanges; ++changeIndex)
-    {
-        int index = (indices ? indices[changeIndex] : 0);
-
-        float oldTime = m_keyTimes[index].time;
-        float time = __max(m_timeRange.start, __min(m_timeRange.end, scale * oldTime + offset));
-
-        for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
-        {
-            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-            for (int keyIndex = 0; pSpline && keyIndex < pSpline->GetKeyCount(); ++keyIndex)
-            {
-                float keyTime = pSpline->GetKeyTime(keyIndex);
-                KeyChange change(pSpline, keyIndex, keyTime, SnapTimeToGridVertical(time), pSpline->GetKeyFlags(keyIndex));
-
-                pSpline->GetKeyValue(keyIndex, change.value);
-                pSpline->GetKeyTangents(keyIndex, change.tin, change.tout);
-
-                if (fabsf(keyTime - oldTime) < threshold)
-                {
-                    individualKeyChanges.push_back(change);
-                }
-            }
-        }
-
-        m_keyTimes[index].time = SnapTimeToGridVertical(time);
-    }
-
-    for (std::vector<KeyChange>::iterator itChange = individualKeyChanges.begin(); itChange != individualKeyChanges.end(); ++itChange)
-    {
-        (*itChange).pSpline->SetKeyTime((*itChange).keyIndex, (*itChange).newTime);
-    }
-
-    if (copyKeys)
-    {
-        for (std::vector<KeyChange>::iterator keyToAdd = individualKeyChanges.begin(), endKeysToAdd = individualKeyChanges.end(); keyToAdd != endKeysToAdd; ++keyToAdd)
-        {
-            int keyIndex = (*keyToAdd).pSpline->InsertKey((*keyToAdd).oldTime, (*keyToAdd).value);
-            (*keyToAdd).pSpline->SetKeyTangents(keyIndex, (*keyToAdd).tin, (*keyToAdd).tout);
-            (*keyToAdd).pSpline->SetKeyFlags(keyIndex, (*keyToAdd).flags & (~ESPLINE_KEY_UI_SELECTED_MASK));
-        }
-    }
-
-    // Loop through all moved keys, checking whether there are multiple keys on the same frame.
-    for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        float lastKeyTime = -FLT_MAX;
-        pSpline->Update();
-        for (int keyIndex = 0, keys = pSpline->GetKeyCount(); keyIndex <= keys; )
-        {
-            float keyTime = pSpline->GetKeyTime(keyIndex);
-            if (fabsf(keyTime - lastKeyTime) < m_fMinTimeEpsilon)
-            {
-                --keys;
-                pSpline->RemoveKey(keyIndex);
-            }
-            else
-            {
-                ++keyIndex;
-                lastKeyTime = keyTime;
-            }
-        }
-    }
-
-    SendNotifyEvent(SPLN_CHANGE);
-    update();
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::resizeEvent(QResizeEvent* event)
-{
-    QRect oldRect = m_rcSpline;
-
-    QWidget::resizeEvent(event);
-
-    m_rcClient = rect();
-    m_rcSpline = m_rcClient;
-
-    if (m_pTimelineCtrl)
-    {
-        QRect rct = m_rcSpline;
-        const int timelineControlHeight = 16;
-        rct.setHeight(timelineControlHeight);
-        m_rcSpline.setTop(rct.bottom() + 1);
-        rct.setLeft(rct.left() + m_nLeftOffset);
-        m_pTimelineCtrl->setGeometry(rct);
-    }
-
-    m_rcSpline.setLeft(m_rcSpline.left() + m_nLeftOffset);
-
-    m_grid.rect = m_rcSpline;
-
-    int oldW = oldRect.width();
-    int oldH = oldRect.height();
-
-    if (width() > 1 && height() > 1 && oldW > 1 && oldH > 1 && m_rcSpline.width() > 0 && m_rcSpline.height())
-    {
-        SetZoom(Vec2(float(m_rcSpline.width()) / oldW * GetZoom().x, float(m_rcSpline.height()) / oldH * GetZoom().y));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint AbstractSplineWidget::TimeToPoint(float time, ISplineInterpolator* pSpline)
-{
-    float val = 0;
-    if (pSpline)
-    {
-        pSpline->InterpolateFloat(time, val);
-    }
-
-    return WorldToClient(Vec2(time, val));
-    ;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float AbstractSplineWidget::TimeToXOfs(float x)
-{
-    return WorldToClient(Vec2(float(x), 0.0f)).x();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::PointToTimeValue(QPoint point, float& time, float& value)
-{
-    Vec2 v = ClientToWorld(point);
-    value = v.y;
-    time = XOfsToTime(point.x());
-}
-
-//////////////////////////////////////////////////////////////////////////
-float AbstractSplineWidget::XOfsToTime(int x)
-{
-    Vec2 v = ClientToWorld(QPoint(x, 0));
-    float time = v.x;
-    return time;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint AbstractSplineWidget::XOfsToPoint(int x, ISplineInterpolator* pSpline)
-{
-    return TimeToPoint(XOfsToTime(x), pSpline);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint AbstractSplineWidget::WorldToClient(Vec2 v)
-{
-    QPoint p = m_grid.WorldToClient(v);
-    p.setY(m_rcSpline.bottom() - p.y());
-    return p;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec2 AbstractSplineWidget::ClientToWorld(const QPoint& point)
-{
-    Vec2 v = m_grid.ClientToWorld(QPoint(point.x(), m_rcSpline.bottom() + 1 - point.y()));
-    return v;
-}
-
-void SplineWidget::paintEvent(QPaintEvent* event)
-{
-    QPainter painter(this);
-
-    if (m_TimeUpdateRect != event->rect())
-    {
-        painter.fillRect(event->rect(), QColor(160, 160, 160));
-
-        m_grid.CalculateGridLines();
-
-        //Draw Grid
-        DrawGrid(&painter);
-
-        const QRect drawSplineRect = event->rect().intersected(m_rcSpline);
-
-        // Calculate the times corresponding to the left and right of the area to be painted -
-        // we can use this to draw only the necessary parts of the splines.
-        float startTime = XOfsToTime(drawSplineRect.left());
-        float endTime = XOfsToTime(drawSplineRect.right());
-
-        //Draw Keys and Curve
-        for (int i = 0; i < int(m_splines.size()); ++i)
-        {
-            DrawSpline(&painter, m_splines[i], startTime, endTime);
-            DrawKeys(&painter, i, startTime, endTime);
-        }
-    }
-    m_TimeUpdateRect = QRect();
-
-    DrawTimeMarker(&painter);
-}
-
-//////////////////////////////////////////////////////////////////////////
-class SplineControlVerticalLineDrawer
-{
-public:
-    SplineControlVerticalLineDrawer(QPainter* painter, const QRect& rect)
-        : rect(rect)
-        , painter(painter)
-    {
-    }
-
-    void operator()([[maybe_unused]] int frameIndex, int x)
-    {
-        if (painter)
-        {
-            painter->drawLine(x, rect.top(), x, rect.bottom());
-        }
-    }
-
-    QPainter* painter;
-    QRect rect;
-};
-
-void SplineWidget::DrawGrid(QPainter* painter)
-{
-    QPoint ptTop = WorldToClient(Vec2(0.0f, m_valueRange.end));
-    QPoint ptBottom = WorldToClient(Vec2(0.0f, m_valueRange.start));
-    QPoint pt0 = WorldToClient(Vec2(m_timeRange.start, 0));
-    QPoint pt1 = WorldToClient(Vec2(m_timeRange.end, 0));
-    QRect timeRc = QRect(QPoint(pt0.x() - 2, ptTop.y()), QPoint(pt1.x() + 2, ptBottom.y()) - QPoint(1, 1));
-    timeRc = timeRc.intersected(m_rcSpline);
-    painter->fillRect(timeRc, ACTIVE_BKG_COLOR);
-
-    //////////////////////////////////////////////////////////////////////////
-    QPen pOldPen = painter->pen();
-    painter->setPen(GRID_COLOR);
-
-    /// Draw Left Separator.
-    painter->fillRect(QRect(QPoint(m_rcClient.left(), m_rcClient.top()), QPoint(m_rcClient.left() + m_nLeftOffset - 1, m_rcClient.bottom()) - QPoint(1, 1)), ACTIVE_BKG_COLOR);
-    painter->drawLine(m_rcClient.left() + m_nLeftOffset, m_rcClient.bottom(), m_rcClient.left() + m_nLeftOffset, m_rcClient.top());
-    //////////////////////////////////////////////////////////////////////////
-
-    int gy;
-
-    QPen pen(QColor(GRID_COLOR), 1, Qt::DotLine);
-    pen.setCosmetic(true);
-    painter->setPen(pen);
-
-    //if (m_grid.pixelsPerGrid.y >= MIN_PIXEL_PER_GRID_Y)
-    {
-        // Draw horizontal grid lines.
-        for (gy = m_grid.firstGridLine.y(); gy < m_grid.firstGridLine.y() + m_grid.numGridLines.y() + 1; gy++)
-        {
-            int y = m_grid.GetGridLineY(gy);
-            if (y < 0)
-            {
-                continue;
-            }
-            int py = m_rcSpline.height() - y;
-            if (py < m_rcSpline.top() || py > m_rcSpline.bottom() + 1)
-            {
-                continue;
-            }
-            painter->setPen(pen);
-            painter->drawLine(m_rcSpline.left(), py, m_rcSpline.right(), py);
-
-            float v = m_grid.GetGridLineYValue(gy);
-            v = floor(v * 1000.0f + 0.5f) / 1000.0f;
-
-            if ((v >= m_valueRange.start && v <= m_valueRange.end) || fabs(v - m_valueRange.start) < 0.01f || fabs(v - m_valueRange.end) < 0.01f)
-            {
-                painter->setPen(Qt::black);
-                painter->drawText(m_rcClient.left() + 2, py - 8, QString::number(v));
-            }
-        }
-    }
-
-    // Draw vertical grid lines.
-    SplineControlVerticalLineDrawer verticalLineDrawer(painter, m_rcSpline);
-    GridUtils::IterateGrid(verticalLineDrawer, 50.0f, m_grid.zoom.x, m_grid.origin.x, m_fGridTimeScale, m_grid.rect.left(), m_grid.rect.right() + 1);
-
-    //////////////////////////////////////////////////////////////////////////
-    {
-        const QPen pen0(QColor(110, 100, 100), 2);
-        const QPoint p = WorldToClient(Vec2(0, 0));
-
-        painter->setPen(pen0);
-
-        /// Draw X axis.
-        painter->drawLine(m_rcSpline.left(), p.y(), m_rcSpline.right() + 1, p.y());
-
-        // Draw Y Axis.
-        if (p.x() > m_rcSpline.left() && p.y() < m_rcSpline.right() + 1)
-        {
-            painter->drawLine(p.x(), m_rcSpline.top(), p.x(), m_rcSpline.bottom() + 1);
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    painter->setPen(pOldPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::DrawSpline(QPainter* painter, SSplineInfo& splineInfo, float startTime, float endTime)
-{
-    const QPen pOldPen = painter->pen();
-
-    const QRect rcClip = painter->clipBoundingRect().intersected(m_rcSpline).toRect();
-
-    //////////////////////////////////////////////////////////////////////////
-    ISplineInterpolator* pSpline = splineInfo.pSpline;
-    ISplineInterpolator* pDetailSpline = splineInfo.pDetailSpline;
-    if (!pSpline)
-    {
-        return;
-    }
-
-    int nTotalNumberOfDimensions(0);
-    int nCurrentDimension(0);
-
-    int left = TimeToXOfs(startTime);//rcClip.left;
-    int right = TimeToXOfs(endTime);//rcClip.right;
-    QPoint p0 = TimeToPoint(pSpline->GetKeyTime(0), pSpline);
-    QPoint p1 = TimeToPoint(pSpline->GetKeyTime(pSpline->GetKeyCount() - 1), pSpline);
-
-    nTotalNumberOfDimensions = pSpline->GetNumDimensions();
-    for (nCurrentDimension = 0; nCurrentDimension < nTotalNumberOfDimensions; nCurrentDimension++)
-    {
-        QColor splineColor = EDIT_SPLINE_COLOR;
-        splineColor = splineInfo.anColorArray[nCurrentDimension];
-        const QPen pen(splineColor, 2);
-
-        if (p0.x() > left && !pDetailSpline)
-        {
-            QPen alternatePen(splineColor, 1, Qt::DotLine);
-            alternatePen.setCosmetic(true);
-            painter->setPen(alternatePen);
-
-            painter->drawLine(m_rcSpline.left(), p0.y(), p0.x(), p0.y());
-            left = p0.x();
-        }
-
-        if (p1.x() < right && !pDetailSpline)
-        {
-            QPen alternatePen(splineColor, 1, Qt::DotLine);
-            alternatePen.setCosmetic(true);
-            painter->setPen(alternatePen);
-
-            painter->drawLine(p1.x(), p1.y(), m_rcSpline.right() + 1, p1.y());
-            right = p1.x();
-        }
-
-        painter->setPen(pen);
-
-        int linesDrawn = 0;
-        int pixels = 0;
-
-        float gradient = 0.0f;
-        int pointsInLine = -1;
-        QPoint lineStart;
-        QPainterPath path;
-        for (int x = left; x <= right; x++)
-        {
-            ++pixels;
-
-            float time = XOfsToTime(x);
-            ISplineInterpolator::ValueType value;
-            ISplineInterpolator::ZeroValue(value);
-
-            pSpline->Interpolate(time, value);
-
-            if (pDetailSpline)
-            {
-                ISplineInterpolator::ValueType value2;
-                ISplineInterpolator::ZeroValue(value2);
-
-                pDetailSpline->Interpolate(time, value2);
-
-                value[nCurrentDimension] = value[nCurrentDimension] + value2[nCurrentDimension];
-            }
-
-
-            QPoint pt = WorldToClient(Vec2(time, value[nCurrentDimension]));
-
-            if ((x == right && pointsInLine >= 0) || (pointsInLine > 0 && fabs(lineStart.y() + gradient * (pt.x() - lineStart.x()) - pt.y()) > 1.0f))
-            {
-                lineStart = QPoint(pt.x() - 1, lineStart.y() + gradient * (pt.x() - 1 - lineStart.x()));
-                path.lineTo(lineStart);
-                gradient = float(pt.y() - lineStart.y()) / (pt.x() - lineStart.x());
-                pointsInLine = 1;
-                ++linesDrawn;
-            }
-            else if ((x == right && pointsInLine >= 0) || (pointsInLine > 0 && fabs(lineStart.y() + gradient * (pt.x() - lineStart.x()) - pt.y()) == 1.0f))
-            {
-                lineStart = pt;
-                path.lineTo(lineStart);
-                gradient = 0.0f;
-                pointsInLine = 0;
-                ++linesDrawn;
-            }
-            else if (pointsInLine > 0)
-            {
-                ++pointsInLine;
-            }
-            else if (pointsInLine == 0)
-            {
-                gradient = float(pt.y() - lineStart.y()) / (pt.x() - lineStart.x());
-                ++pointsInLine;
-            }
-            else
-            {
-                path.moveTo(pt);
-                lineStart = pt;
-                ++pointsInLine;
-                gradient = 0.0f;
-            }
-        }
-
-        painter->drawPath(path);
-
-        // Put back the old objects
-        painter->setPen(pOldPen);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::DrawKeys(QPainter* painter, int splineIndex, [[maybe_unused]] float startTime, float endTime)
-{
-    SSplineInfo& splineInfo = m_splines[splineIndex];
-    ISplineInterpolator* pSpline = splineInfo.pSpline;
-    ISplineInterpolator* pDetailSpline = splineInfo.pDetailSpline;
-
-    if (!pSpline)
-    {
-        return;
-    }
-
-    // create and select a white pen - nope, black
-    const QPen pOldPen = painter->pen();
-    painter->setPen(Qt::black);
-
-    int i;
-
-    int nTotalNumberOfDimensions(0);
-    int nCurrentDimension(0);
-
-    nTotalNumberOfDimensions = pSpline->GetNumDimensions();
-    for (nCurrentDimension = 0; nCurrentDimension < nTotalNumberOfDimensions; nCurrentDimension++)
-    {
-        // Why is this here? Not even god knows...
-        //for (i = 0; i < pSpline->GetKeyCount() && pSpline->GetKeyTime(i) < startTime; ++i);
-        QPoint lastKeyPt;
-
-        int numKeys = pSpline->GetKeyCount();
-        for (i = 0; i < numKeys; i++)
-        {
-            float time = pSpline->GetKeyTime(i);
-            if (time >= endTime)
-            {
-                break;
-            }
-
-            ISplineInterpolator::ValueType value;
-            ISplineInterpolator::ZeroValue(value);
-
-            pSpline->Interpolate(time, value);
-
-            if (pDetailSpline)
-            {
-                ISplineInterpolator::ValueType value2;
-                ISplineInterpolator::ZeroValue(value2);
-
-                pDetailSpline->Interpolate(time, value2);
-
-                value[nCurrentDimension] = value[nCurrentDimension] + value2[nCurrentDimension];
-            }
-            QPoint pt = WorldToClient(Vec2(time, value[nCurrentDimension]));
-            ;
-
-            if (pt.x() < m_rcSpline.left())
-            {
-                continue;
-            }
-
-            if (i > 0 && (pt - lastKeyPt).manhattanLength() < 4)
-            {
-                continue;
-            }
-
-            QColor clr(220, 220, 0);
-            if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
-            {
-                clr = Qt::red;
-                DrawTangentHandle(painter, splineIndex, i, nCurrentDimension);
-            }
-
-            const QBrush brush(clr);
-            const QBrush pOldBrush = painter->brush();
-            painter->setBrush(brush);
-
-            // Draw this key.
-            painter->drawRect(QRect(QPoint(pt.x() - m_nKeyDrawRadius, pt.y() - m_nKeyDrawRadius), QPoint(pt.x() + m_nKeyDrawRadius - 1, pt.y() + m_nKeyDrawRadius - 1)));
-
-            lastKeyPt = pt;
-
-            painter->setBrush(pOldBrush);
-        }
-    }
-
-    painter->setPen(pOldPen);
-}
-
-bool AbstractSplineWidget::GetTangentHandlePts(QPoint&, QPoint&, QPoint&, int, int, int)
-{
-    return false;
-}
-
-void SplineWidget::DrawTangentHandle(QPainter* painter, int nSpline, int nKey, int nDimension)
-{
-    // create and select a white pen
-    const QPen pOldPen = painter->pen();
-    painter->setPen(QColor(96, 96, 96));
-
-    // Draw in-tangent & out-tangent lines.
-    QPoint a, b, pt;
-    if (GetTangentHandlePts(a, pt, b, nSpline, nKey, nDimension))
-    {
-        painter->drawLine(a, pt);
-        painter->drawLine(pt, b);
-
-        // Draw end-effectors.
-        const QBrush pOldBrush = painter->brush();
-        painter->setBrush(QColor(0, 220, 0));
-
-        painter->drawRect(QRect(QPoint(a.x() - m_nKeyDrawRadius, a.y() - m_nKeyDrawRadius), QPoint(a.x() + m_nKeyDrawRadius - 1, a.y() + m_nKeyDrawRadius - 1)));
-        painter->drawRect(QRect(QPoint(b.x() - m_nKeyDrawRadius, b.y() - m_nKeyDrawRadius), QPoint(b.x() + m_nKeyDrawRadius - 1, b.y() + m_nKeyDrawRadius - 1)));
-
-        painter->setBrush(pOldBrush);
-    }
-
-    painter->setPen(pOldPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::DrawTimeMarker(QPainter* painter)
-{
-    const QPen pOldPen = painter->pen();
-    painter->setPen(QColor(255, 0, 255));
-    float x = TimeToXOfs(m_fTimeMarker);
-    if (x >= m_rcSpline.left() && x <= m_rcSpline.right() + 1)
-    {
-        painter->drawLine(x, m_rcSpline.top(), x, m_rcSpline.bottom() + 1);
-    }
-    painter->setPen(pOldPen);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-//Mouse Message Handlers
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::mousePressEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonDown(event->pos(), event->modifiers());
-        break;
-    case Qt::MiddleButton:
-        OnMButtonDown(event->pos(), event->modifiers());
-        break;
-    case Qt::RightButton:
-        OnRButtonDown(event->pos(), event->modifiers());
-        break;
-    }
-}
-
-void SplineWidget::mouseReleaseEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonUp(event->pos(), event->modifiers());
-        break;
-    case Qt::MiddleButton:
-        OnMButtonUp(event->pos(), event->modifiers());
-        break;
-    }
-}
-
-void SplineWidget::OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers)
-{
-    m_pCurrentUndo = nullptr;
-
-    if (m_bEditLock)
-    {
-        return;
-    }
-
-    m_boLeftMouseButtonDown = true;
-
-    if (m_editMode == TrackingMode)
-    {
-        return;
-    }
-
-    SendNotifyEvent(NM_CLICK);
-
-    m_cMouseDownPos = point;
-
-    ISplineInterpolator* pSpline = HitSpline(m_cMouseDownPos);
-
-    // Get control key status.
-    bool bCtrlClick = modifiers & Qt::ControlModifier;
-
-    switch (m_hitCode)
-    {
-    case HIT_KEY:
-    {
-        {
-            CUndo undo("Select Spline Key");
-            StoreUndo();
-
-            SendNotifyEvent(SPLN_BEFORE_CHANGE);
-            bool bHitSelection = IsKeySelected(m_pHitSpline, m_nHitKeyIndex, m_nHitDimension);
-            bool bAddSelect = bCtrlClick;
-            if (!bAddSelect && !bHitSelection)
-            {
-                ClearSelection();
-            }
-            SelectKey(pSpline, m_nHitKeyIndex, m_nHitDimension, true);
-            SendNotifyEvent(SPLN_CHANGE);
-
-            if (m_pCurrentUndo && !m_pCurrentUndo->IsSelectionChanged())
-            {
-                undo.Cancel();
-            }
-
-            m_pCurrentUndo = nullptr;
-        }
-
-        GetIEditor()->BeginUndo();
-        StartTracking(bCtrlClick);
-    }
-    break;
-
-    case HIT_TANGENT_HANDLE:
-    {
-        {
-            CUndo undo("Select Tangent Handle");
-            SendNotifyEvent(SPLN_BEFORE_CHANGE);
-            ClearSelection();
-            SelectKey(pSpline, m_nHitKeyIndex, m_nHitDimension, true);
-            SendNotifyEvent(SPLN_CHANGE);
-        }
-        StartTracking(false);
-    }
-    break;
-
-    case HIT_SPLINE:
-    {
-        if (GetNumSelected() > 0)
-        {
-            StartTracking(bCtrlClick);
-        }
-    }
-    break;
-
-    case HIT_TIMEMARKER:
-    {
-        SendNotifyEvent(SPLN_TIME_START_CHANGE);
-        m_editMode = TimeMarkerMode;
-        grabMouse();
-    }
-    break;
-
-    case HIT_NOTHING:
-    {
-        if (m_rcSpline.contains(point))
-        {
-            GetIEditor()->BeginUndo();
-            StoreUndo();
-            m_rcSelect = QRect();
-            m_rubberBand->setVisible(false);
-            m_editMode = SelectMode;
-            grabMouse();
-        }
-    }
-    break;
-    }
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::OnRButtonDown(const QPoint&, Qt::KeyboardModifiers)
-{
-    m_pCurrentUndo = nullptr;
-
-    SendNotifyEvent(NM_RCLICK);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::OnMButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers)
-{
-    m_pCurrentUndo = nullptr;
-
-    bool bShiftClick = modifiers & Qt::ShiftModifier;
-
-    if (m_editMode == NothingMode)
-    {
-        if (bShiftClick)
-        {
-            m_editMode = ZoomMode;
-            setCursor(Qt::SizeAllCursor);
-        }
-        else
-        {
-            setCursor(Qt::SizeAllCursor);
-            m_editMode = ScrollMode;
-        }
-        m_cMouseDownPos = point;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::OnMButtonUp(const QPoint&, Qt::KeyboardModifiers)
-{
-    if (m_editMode == ScrollMode || m_editMode == ZoomMode)
-    {
-        m_editMode = NothingMode;
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::mouseDoubleClickEvent(QMouseEvent* event)
-{
-    if (event->button() != Qt::LeftButton)
-    {
-        return;
-    }
-
-    const QPoint point = event->pos();
-    m_pCurrentUndo = nullptr;
-
-    if (m_bEditLock)
-    {
-        return;
-    }
-
-    switch (m_hitCode)
-    {
-    case HIT_SPLINE:
-    {
-        if (m_pHitSpline)
-        {
-            InsertKey(m_pHitSpline, m_pHitDetailSpline, point);
-        }
-        update();
-        if (m_pTimelineCtrl)
-        {
-            m_pTimelineCtrl->update();
-        }
-    }
-    break;
-    case HIT_KEY:
-    {
-        RemoveKey(m_pHitSpline, m_nHitKeyIndex);
-    }
-    break;
-    case HIT_TANGENT_HANDLE:
-    {
-        if (m_bHitIncomingHandle)
-        {
-            ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK, 0);
-        }
-        else
-        {
-            ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_OUT_MASK, 0);
-        }
-    }
-    break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::mouseMoveEvent(QMouseEvent* event)
-{
-    const QPoint point = event->pos();
-
-    switch (HitTest(point))
-    {
-    case HIT_SPLINE:
-        setCursor(CMFCUtils::LoadCursor(IDC_ARRWHITE));
-        break;
-    case HIT_KEY:
-    case HIT_TANGENT_HANDLE:
-        setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCK));
-        break;
-    default:
-        setCursor(Qt::ArrowCursor);
-        break;
-    }
-
-    if (m_pHitSpline && m_nHitKeyIndex >= 0)
-    {
-        float time = m_pHitSpline->GetKeyTime(m_nHitKeyIndex);
-        ISplineInterpolator::ValueType  afValue;
-        m_pHitSpline->GetKeyValue(m_nHitKeyIndex, afValue);
-        const QString tipText = QString::fromLatin1("t=%1  v=%2").arg(time * m_fTooltipScaleX, 0, 'f', 3).arg(afValue[m_nHitDimension] * m_fTooltipScaleY, 2, 'f', 3);
-
-        m_tooltipText = tipText;
-        if (m_lastToolTipPos != point)
-        {
-            m_lastToolTipPos = point;
-            QToolTip::showText(event->globalPos(), tipText);
-        }
-    }
-    else if (m_editMode != TrackingMode)
-    {
-        if (!m_tooltipText.isEmpty())
-        {
-            QToolTip::hideText();
-        }
-    }
-
-    if (m_bEditLock)
-    {
-        return;
-    }
-
-    m_cMousePos = event->pos();
-
-    if (m_editMode == SelectMode)
-    {
-        setCursor(Qt::BlankCursor);
-        QRect rc(QPoint(m_cMouseDownPos.x(), m_cMouseDownPos.y()), point - QPoint(1, 1));
-        rc = rc.normalized().intersected(m_rcSpline);
-
-        m_rcSelect = rc;
-        m_rubberBand->setGeometry(m_rcSelect);
-        m_rubberBand->setVisible(true);
-
-        // Trigger a repaint so that the spline lines will be drawn correctly,
-        // or else they end up being chopped up if you drag the selection area
-        // over them
-        update();
-    }
-
-    if (m_editMode == TimeMarkerMode)
-    {
-        setCursor(Qt::BlankCursor);
-        SetTimeMarker(XOfsToTime(event->x()));
-        SendNotifyEvent(SPLN_TIME_CHANGE);
-    }
-
-    if (m_boLeftMouseButtonDown)
-    {
-        if (m_editMode == TrackingMode && event->pos() != m_cMouseDownPos)
-        {
-            m_startedDragging = true;
-            GetIEditor()->RestoreUndo();
-            m_pCurrentUndo = nullptr;
-
-            StoreUndo();
-
-            bool bAltClick = event->modifiers() & Qt::AltModifier;
-
-            Vec2 v0 = ClientToWorld(m_cMouseDownPos);
-            Vec2 v1 = ClientToWorld(event->pos());
-            if (bAltClick)
-            {
-                TimeScaleKeys(m_fTimeMarker, v0.x, v1.x);
-            }
-            else if (m_controlAmplitude)
-            {
-                ScaleAmplitudeKeys(v0.x, v0.y, v1.y - v0.y);
-            }
-            else
-            {
-                MoveSelectedKeys(v1 - v0, m_copyKeys);
-            }
-        }
-    }
-
-    switch (m_editMode)
-    {
-    case ScrollMode:
-    {
-        // Set the new scrolled coordinates
-        float ofsx = m_grid.origin.x - (event->x() - m_cMouseDownPos.x()) / m_grid.zoom.x;
-        float ofsy = m_grid.origin.y + (event->y() - m_cMouseDownPos.y()) / m_grid.zoom.y;
-        SetScrollOffset(Vec2(ofsx, ofsy));
-        m_cMouseDownPos = event->pos();
-    }
-    break;
-
-    case ZoomMode:
-    {
-        float ofsx = (event->x() - m_cMouseDownPos.x()) * 0.01f;
-        float ofsy = (event->y() - m_cMouseDownPos.y()) * 0.01f;
-
-        Vec2 z = m_grid.zoom;
-        if (ofsx != 0)
-        {
-            z.x = max(z.x * (1.0f + ofsx), 0.001f);
-        }
-        if (ofsy != 0)
-        {
-            z.y = max(z.y * (1.0f + ofsy), 0.001f);
-        }
-        SetZoom(z, m_cMouseDownPos);
-        m_cMouseDownPos = event->pos();
-    }
-    break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::UpdateKeyTimes() const
-{
-    if (!m_bKeyTimesDirty)
-    {
-        return;
-    }
-
-    std::vector<float> selectedKeyTimes;
-    selectedKeyTimes.reserve(m_keyTimes.size());
-    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
-    {
-        if ((*it).selected)
-        {
-            selectedKeyTimes.push_back((*it).time);
-        }
-    }
-    std::sort(selectedKeyTimes.begin(), selectedKeyTimes.end());
-
-    m_keyTimes.clear();
-    for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        for (int keyIndex = 0; pSpline && keyIndex < pSpline->GetKeyCount(); ++keyIndex)
-        {
-            float value = pSpline->GetKeyTime(keyIndex);
-
-            int lower = 0;
-            int upper = int(m_keyTimes.size());
-            while (lower < upper - 1)
-            {
-                int mid = ((lower + upper) >> 1);
-                ((m_keyTimes[mid].time >= value) ? upper : lower) = mid;
-            }
-
-            if ((lower >= int(m_keyTimes.size()) || fabsf(m_keyTimes[lower].time - value) > threshold) &&
-                (upper >= int(m_keyTimes.size()) || fabsf(m_keyTimes[upper].time - value) > threshold))
-            {
-                m_keyTimes.insert(m_keyTimes.begin() + upper, KeyTime(value, 0));
-            }
-        }
-    }
-
-    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
-    {
-        (*it).count = (m_pSplineSet ? m_pSplineSet->GetKeyCountAtTime((*it).time, threshold) : 0);
-    }
-
-    std::vector<float>::iterator itSelected = selectedKeyTimes.begin(), endSelected = selectedKeyTimes.end();
-    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
-    {
-        const float thisThreshold = 0.01f;
-        for (; itSelected != endSelected && (*itSelected) < (*it).time - thisThreshold; ++itSelected)
-        {
-            ;
-        }
-        if (itSelected != endSelected && fabsf((*itSelected) - (*it).time) < thisThreshold)
-        {
-            (*it).selected = true;
-        }
-    }
-
-    m_totalSplineCount = (m_pSplineSet ? m_pSplineSet->GetSplineCount() : 0);
-
-    m_bKeyTimesDirty = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::OnLButtonUp([[maybe_unused]] const QPoint& point, Qt::KeyboardModifiers modifiers)
-{
-    if (m_bEditLock)
-    {
-        return;
-    }
-
-    m_boLeftMouseButtonDown = false;
-
-    if (m_editMode == TrackingMode)
-    {
-        StopTracking();
-
-        if (!m_startedDragging)
-        {
-            HitSpline(m_cMouseDownPos);
-        }
-    }
-
-    if (m_editMode == SelectMode)
-    {
-        // Get control key status.
-        bool bAltClick = modifiers & Qt::AltModifier;
-        bool bCtrlClick = modifiers & Qt::ControlModifier;
-
-        bool bAddSelect = bCtrlClick;
-        bool bUnselect = bAltClick;
-
-        // Stop tracking first or else the clear selection will end up being
-        // undone
-        StopTracking();
-
-        if (!bAddSelect && !bUnselect)
-        {
-            ClearSelection();
-        }
-
-        SelectRectangle(m_rcSelect, !bUnselect);
-
-        m_rcSelect = QRect();
-        m_rubberBand->setVisible(false);
-        setCursor(Qt::ArrowCursor);
-    }
-
-    if (m_editMode == TimeMarkerMode)
-    {
-        m_editMode = NothingMode;
-        releaseMouse();
-        SendNotifyEvent(SPLN_TIME_END_CHANGE);
-    }
-
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->update();
-    }
-
-    m_tooltipText = "";
-    update();
-    m_editMode = NothingMode;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect)
-{
-    if (nKey >= 0)
-    {
-        pSpline->SelectKeyAtDimension(nKey, nDimension, bSelect);
-        SendNotifyEvent(SPLN_KEY_SELECTION_CHANGE);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool AbstractSplineWidget::IsKeySelected(ISplineInterpolator* pSpline, int nKey, int nHitDimension) const
-{
-    if (pSpline && nKey >= 0)
-    {
-        return (pSpline->IsKeySelectedAtDimension(nKey, nHitDimension));
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int AbstractSplineWidget::GetNumSelected()
-{
-    int nSelected = 0;
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        if (ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline)
-        {
-            for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
-            {
-                for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-                {
-                    if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
-                    {
-                        nSelected++;
-                    }
-                }
-            }
-        }
-    }
-    return nSelected;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SetSplineSet(ISplineSet* pSplineSet)
-{
-    m_pSplineSet = pSplineSet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::wheelEvent(QWheelEvent* event)
-{
-    int zDelta = event->angleDelta().y();
-    if (zDelta == 0)
-    {
-        return;
-    }
-    Vec2 z = m_grid.zoom;
-    float scale = 1.2f * fabs(zDelta / 120.0f);
-    if (zDelta > 0)
-    {
-        z *= scale;
-    }
-    else
-    {
-        z /= scale;
-    }
-    SetZoom(z, m_cMousePos);
-
-    event->accept();
-}
-
-void SplineWidget::keyPressEvent(QKeyEvent* e)
-{
-    BOOL bProcessed = false;
-
-    switch (e->key())
-    {
-        case Qt::Key_Delete:
-        {
-            RemoveSelectedKeys();
-            RemoveSelectedKeyTimes();
-            bProcessed = true;
-        }
-        break;
-
-        case Qt::Key_Up:
-        {
-            CUndo undo("Move Spline Key(s)");
-            SendNotifyEvent(SPLN_BEFORE_CHANGE);
-            MoveSelectedKeys(ClientToWorld(QPoint(0, -1)), false);
-            bProcessed = true;
-        }
-        break;
-
-        case Qt::Key_Down:
-        {
-            CUndo undo("Move Spline Key(s)");
-            SendNotifyEvent(SPLN_BEFORE_CHANGE);
-            MoveSelectedKeys(ClientToWorld(QPoint(0, 1)), false);
-            bProcessed = true;
-        }
-        break;
-
-        case Qt::Key_Left:
-        {
-            CUndo undo("Move Spline Key(s)");
-            SendNotifyEvent(SPLN_BEFORE_CHANGE);
-            MoveSelectedKeys(ClientToWorld(QPoint(-1, 0)), false);
-            bProcessed = true;
-        }
-        break;
-
-        case Qt::Key_Right:
-        {
-            CUndo undo("Move Spline Key(s)");
-            SendNotifyEvent(SPLN_BEFORE_CHANGE);
-            MoveSelectedKeys(ClientToWorld(QPoint(1, 0)), false);
-            bProcessed = true;
-        }
-        break;
-
-        default:
-        break; //do nothing
-    }
-
-    bool bCtrl = e->modifiers() & Qt::ControlModifier;
-    if (e->key() == Qt::Key_C && bCtrl)
-    {
-        CopyKeys();
-        return;
-    }
-
-    if (e->key() == Qt::Key_V && bCtrl)
-    {
-        PasteKeys();
-        return;
-    }
-
-    if (e->key() == Qt::Key_Z && bCtrl)
-    {
-        GetIEditor()->Undo();
-        return;
-    }
-
-    if (e->key() == Qt::Key_Y && bCtrl)
-    {
-        GetIEditor()->Redo();
-        return;
-    }
-
-    if (!bProcessed)
-    {
-        QWidget::keyPressEvent(e);
-    }
-}
-
-bool SplineWidget::event(QEvent* e)
-{
-    // Shortcut override events are sent to allow a widget to say that it wants to get the matching
-    // keypress event, and for it not to be treated as a shortcut by the shortcut/QAction system.
-    // So we need to handle it here, return true and mark the event as accepted, if it's a key combination we care
-    // about
-    if (e->type() == QEvent::ShortcutOverride)
-    {
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
-
-        bool filterOutEvent = false;
-
-        switch (keyEvent->key())
-        {
-            case Qt::Key_Delete:
-            case Qt::Key_Up:
-            case Qt::Key_Down:
-            case Qt::Key_Left:
-            case Qt::Key_Right:
-                filterOutEvent = true;
-            break;
-
-            case Qt::Key_C:
-            case Qt::Key_V:
-            case Qt::Key_Z:
-            case Qt::Key_Y:
-                filterOutEvent = (keyEvent->modifiers() & Qt::ControlModifier) != 0;
-            break;
-
-            default:
-            break; //do nothing
-        }
-
-        if (filterOutEvent)
-        {
-            e->accept();
-            return true;
-        }
-    }
-
-    return QWidget::event(e);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SetHorizontalExtent([[maybe_unused]] int min, [[maybe_unused]] int max)
-{
-    /*
-    m_scrollMin.x = min;
-    m_scrollMax.x = max;
-    int width = max - min;
-    int nPage = m_rcClient.Width()/2;
-    int sx = width - nPage + m_rcSpline.left;
-
-    SCROLLINFO si;
-    ZeroStruct(si);
-    si.cbSize = sizeof(si);
-    si.fMask = SIF_ALL;
-    si.nMin = m_scrollMin.x;
-    si.nMax = m_scrollMax.x - nPage + m_rcSpline.left;
-    si.nPage = m_rcClient.Width()/2;
-    si.nPos = m_scrollOffset.x;
-    //si.nPage = max(0,m_rcClient.Width() - m_leftOffset*2);
-    //si.nPage = 1;
-    //si.nPage = 1;
-    SetScrollInfo( SB_HORZ,&si,TRUE );
-    */
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISplineInterpolator* AbstractSplineWidget::HitSpline(const QPoint& point)
-{
-    if (HitTest(point) != HIT_NOTHING)
-    {
-        return m_pHitSpline;
-    }
-
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-AbstractSplineWidget::EHitCode AbstractSplineWidget::HitTest(const QPoint& point)
-{
-    float   time, val;
-    int     nTotalNumberOfDimensions(0);
-    int     nCurrentDimension(0);
-
-
-    PointToTimeValue(point, time, val);
-
-    m_hitCode = HIT_NOTHING;
-    m_pHitSpline = NULL;
-    m_pHitDetailSpline = NULL;
-    m_nHitKeyIndex = -1;
-    m_nHitDimension = -1;
-    m_bHitIncomingHandle = true;
-
-    if (abs(point.x() - TimeToXOfs(m_fTimeMarker)) < 4)
-    {
-        m_hitCode = HIT_TIMEMARKER;
-    }
-
-    // For each Spline...
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-        ISplineInterpolator* pDetailSpline = m_splines[splineIndex].pDetailSpline;
-
-        // If there is no spline, you can't hit nor a spline nor a key... isn't that logical?
-        if (!pSpline)
-        {
-            return m_hitCode;
-        }
-
-        ISplineInterpolator::ValueType stSplineValue;
-        ISplineInterpolator::ValueType stDetailSplineValue;
-        ISplineInterpolator::ZeroValue(stSplineValue);
-        ISplineInterpolator::ZeroValue(stDetailSplineValue);
-
-        pSpline->Interpolate(time, stSplineValue);
-
-        if (pDetailSpline)
-        {
-            pDetailSpline->Interpolate(time, stDetailSplineValue);
-        }
-
-        // For each dimension...
-        nTotalNumberOfDimensions = pSpline->GetNumDimensions();
-        for (nCurrentDimension = 0; nCurrentDimension < nTotalNumberOfDimensions; nCurrentDimension++)
-        {
-            if (pDetailSpline)
-            {
-                stSplineValue[nCurrentDimension] = stSplineValue[nCurrentDimension] + stDetailSplineValue[nCurrentDimension];
-            }
-
-            for (int i = 0; i < pSpline->GetKeyCount(); i++)
-            {
-                if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
-                // Check tangent handles first.
-                {
-                    QPoint incomingHandlePt, outgoingHandlePt, pt;
-                    if (GetTangentHandlePts(incomingHandlePt, pt, outgoingHandlePt, splineIndex, i, nCurrentDimension))
-                    {
-                        // For the incoming handle
-                        if (abs(incomingHandlePt.x() - point.x()) < 4 && abs(incomingHandlePt.y() - point.y()) < 4)
-                        {
-                            m_hitCode = HIT_TANGENT_HANDLE;
-                            m_pHitSpline = pSpline;
-                            m_pHitDetailSpline = m_splines[splineIndex].pDetailSpline;
-                            m_nHitKeyIndex = i;
-                            m_nHitDimension = nCurrentDimension;
-                            m_bHitIncomingHandle = true;
-                            return m_hitCode;
-                        }
-                        // For the outgoing handle
-                        else if (abs(outgoingHandlePt.x() - point.x()) < 4 && abs(outgoingHandlePt.y() - point.y()) < 4)
-                        {
-                            m_hitCode = HIT_TANGENT_HANDLE;
-                            m_pHitSpline = pSpline;
-                            m_pHitDetailSpline = m_splines[splineIndex].pDetailSpline;
-                            m_nHitKeyIndex = i;
-                            m_nHitDimension = nCurrentDimension;
-                            m_bHitIncomingHandle = false;
-                            return m_hitCode;
-                        }
-                    }
-                }
-            }
-
-            QPoint splinePt = WorldToClient(Vec2(time, stSplineValue[nCurrentDimension]));
-            bool bSplineHit = abs(splinePt.x() - point.x()) < 4 && abs(splinePt.y() - point.y()) < 4;
-
-            if (bSplineHit)
-            {
-                m_hitCode = HIT_SPLINE;
-                m_pHitSpline = pSpline;
-                m_pHitDetailSpline = m_splines[splineIndex].pDetailSpline;
-                for (int i = 0; i < pSpline->GetKeyCount(); i++)
-                {
-                    QPoint splinePt2 = TimeToPoint(pSpline->GetKeyTime(i), pSpline);
-                    if (abs(splinePt2.x() - point.x()) < 4 /* && abs(splinePt.y()-point.y()) < 4*/)
-                    {
-                        m_nHitKeyIndex = i;
-                        m_nHitDimension = nCurrentDimension;
-                        m_hitCode = HIT_KEY;
-                        return m_hitCode;
-                    }
-                }
-            }
-        }
-    }
-
-    return m_hitCode;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::StartTracking(bool copyKeys)
-{
-    m_copyKeys = copyKeys;
-    m_startedDragging = false;
-
-    m_editMode = TrackingMode;
-    captureMouseImpl();
-
-    GetIEditor()->BeginUndo();
-
-    SendNotifyEvent(SPLN_BEFORE_CHANGE);
-
-    setCursorImpl(IDC_ARRBLCKCROSS);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::StopTracking()
-{
-    if ((m_editMode == TrackingMode) && (m_cMousePos != m_cMouseDownPos))
-    {
-        GetIEditor()->AcceptUndo("Spline Move");
-    }
-    else if (m_pCurrentUndo && (m_cMousePos == m_cMouseDownPos))
-    {
-        if (m_editMode == SelectMode)
-        {
-            if (m_pCurrentUndo->IsSelectionChanged())
-            {
-                GetIEditor()->AcceptUndo("Key Selection");
-            }
-            else
-            {
-                GetIEditor()->CancelUndo();
-            }
-        }
-        else if ((m_editMode == TrackingMode))
-        {
-            GetIEditor()->CancelUndo();
-        }
-    }
-    else
-    {
-        GetIEditor()->CancelUndo();
-    }
-
-    // Undo has been accepted or cancelled, so clear the m_pCurrentUndo pointer.
-    m_pCurrentUndo = nullptr;
-
-    m_editMode = NothingMode;
-    releaseMouseImpl();
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::ScaleAmplitudeKeys(float time, float startValue, float offset)
-{
-    //TODO: Test it in the facial animation pane and fix it...
-    m_pHitSpline = 0;
-    m_pHitDetailSpline = 0;
-    m_nHitKeyIndex = -1;
-    m_nHitDimension = -1;
-
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        // Find the range of keys to process.
-        int keyCount = (pSpline ? pSpline->GetKeyCount() : 0);
-        int firstKeyIndex = keyCount;
-        int lastKeyIndex = -1;
-        for (int i = 0; i < keyCount; ++i)
-        {
-            if (pSpline->IsKeySelectedAtAnyDimension(i))
-            {
-                firstKeyIndex = min(firstKeyIndex, i);
-                lastKeyIndex = max(lastKeyIndex, i);
-            }
-        }
-
-        // Find the parameters of a line between the start and end points. This will form the centre line
-        // around which the amplitude of the keys will be scaled.
-        float rangeStartTime = (firstKeyIndex >= 0 && pSpline ? pSpline->GetKeyTime(firstKeyIndex) : 0.0f);
-        float rangeEndTime = (lastKeyIndex >= 0 && pSpline ? pSpline->GetKeyTime(lastKeyIndex) : 0.0f);
-        float rangeLength = max(0.01f, rangeEndTime - rangeStartTime);
-
-        for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-        {
-            ISplineInterpolator::ValueType afRangeStartValue;
-            if (firstKeyIndex >= 0 && pSpline)
-            {
-                pSpline->GetKeyValue(firstKeyIndex, afRangeStartValue);
-            }
-            else
-            {
-                memset(afRangeStartValue, 0, sizeof(ISplineInterpolator::ValueType));
-            }
-
-            ISplineInterpolator::ValueType afRangeEndValue;
-            if (lastKeyIndex >= 0 && pSpline)
-            {
-                pSpline->GetKeyValue(lastKeyIndex, afRangeEndValue);
-            }
-            else
-            {
-                memset(afRangeEndValue, 0, sizeof(ISplineInterpolator::ValueType));
-            }
-            float centreM = (afRangeEndValue[nCurrentDimension] - afRangeStartValue[nCurrentDimension]) / rangeLength;
-            float centreC = afRangeStartValue[nCurrentDimension] - centreM * rangeStartTime;
-            // Calculate the scale factor, based on how the mouse was dragged.
-            float dragCentreValue = centreM * time + centreC;
-            float dragCentreOffset = startValue - dragCentreValue;
-            float offsetScale = (fabs(dragCentreOffset) > 0.001 ? (offset + dragCentreOffset) / dragCentreOffset : 1.0f);
-            // Scale all the selected keys around this central line.
-            for (int i = 0; i < keyCount; ++i)
-            {
-                if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
-                {
-                    float keyTime = (pSpline ? pSpline->GetKeyTime(i) : 0.0f);
-                    float centreValue = keyTime * centreM + centreC;
-                    ISplineInterpolator::ValueType afKeyValue;
-                    if (pSpline)
-                    {
-                        pSpline->GetKeyValue(i, afKeyValue);
-                    }
-                    else
-                    {
-                        memset(afKeyValue, 0, sizeof(ISplineInterpolator::ValueType));
-                    }
-                    float keyOffset = afKeyValue[nCurrentDimension] - centreValue;
-                    float newKeyOffset = keyOffset * offsetScale;
-                    if (pSpline)
-                    {
-                        afKeyValue[nCurrentDimension] = centreValue + newKeyOffset;
-                        pSpline->SetKeyValue(i, afKeyValue);
-                    }
-                }
-            }
-        }
-    }
-
-    update();
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->update();
-    }
-    SendNotifyEvent(SPLN_CHANGE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::TimeScaleKeys(float time, float startTime, float endTime)
-{
-    // Calculate the scaling parameters (ie t1 = t0 * M + C).
-    float timeScaleM = 1.0f;
-    if (fabsf(startTime - time) > MIN_TIME_EPSILON_FOR_SCALING)
-    {
-        timeScaleM = (endTime - time) / (startTime - time);
-    }
-    float timeScaleC = endTime - startTime * timeScaleM;
-
-    // Loop through all keys that are selected.
-    m_pHitSpline = 0;
-    m_pHitDetailSpline = 0;
-    m_nHitKeyIndex = -1;
-
-    float affectedRangeMin = FLT_MAX;
-    float affectedRangeMax = -FLT_MAX;
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        int keyCount = pSpline->GetKeyCount();
-        float keyRangeMin = FLT_MAX;
-        float keyRangeMax = -FLT_MAX;
-        for (int i = 0; i < keyCount; i++)
-        {
-            if (pSpline->IsKeySelectedAtAnyDimension(i))
-            {
-                float oldTime = pSpline->GetKeyTime(i);
-                float t = SnapTime(oldTime * timeScaleM + timeScaleC);
-
-                pSpline->SetKeyTime(i, SnapTimeToGridVertical(t));
-
-                keyRangeMin = min(keyRangeMin, oldTime);
-                keyRangeMin = min(keyRangeMin, t);
-                keyRangeMax = max(keyRangeMax, oldTime);
-                keyRangeMax = max(keyRangeMax, t);
-            }
-        }
-        if (keyRangeMin <= keyRangeMax)
-        {
-            // Changes to a key's value affect spline up to two keys away.
-            int lastMovedKey = 0;
-            for (int keyIndex = 0; keyIndex < keyCount; ++keyIndex)
-            {
-                if (pSpline->GetKeyTime(keyIndex) <= keyRangeMax)
-                {
-                    lastMovedKey = keyIndex + 1;
-                }
-            }
-            int firstMovedKey = pSpline->GetKeyCount();
-            for (int keyIndex = pSpline->GetKeyCount() - 1; keyIndex >= 0; --keyIndex)
-            {
-                if (pSpline->GetKeyTime(keyIndex) >= keyRangeMin)
-                {
-                    firstMovedKey = keyIndex;
-                }
-            }
-
-            int firstAffectedKey = max(0, firstMovedKey - 2);
-            int lastAffectedKey = min(keyCount - 1, lastMovedKey + 2);
-
-            affectedRangeMin = min(affectedRangeMin, (firstAffectedKey <= 0 ? m_timeRange.start : pSpline->GetKeyTime(firstAffectedKey)));
-            affectedRangeMax = max(affectedRangeMax, (lastAffectedKey >= keyCount - 1 ? m_timeRange.end : pSpline->GetKeyTime(lastAffectedKey)));
-
-            // Loop through all moved keys, checking whether there are multiple keys on the same frame.
-            float lastKeyTime = -FLT_MAX;
-            pSpline->Update();
-            for (int keyIndex = 0, keys = pSpline->GetKeyCount(); keyIndex <= keys; )
-            {
-                float keyTime = pSpline->GetKeyTime(keyIndex);
-                if (fabsf(keyTime - lastKeyTime) < m_fMinTimeEpsilon)
-                {
-                    --keys;
-                    pSpline->RemoveKey(keyIndex);
-                }
-                else
-                {
-                    ++keyIndex;
-                    lastKeyTime = keyTime;
-                }
-            }
-        }
-    }
-
-    int rangeMin = TimeToXOfs(affectedRangeMin);
-    int rangeMax = TimeToXOfs(affectedRangeMax);
-
-    if (m_timeRange.start == affectedRangeMin)
-    {
-        rangeMin = m_rcSpline.left();
-    }
-    if (m_timeRange.end == affectedRangeMax)
-    {
-        rangeMax = m_rcSpline.right();
-    }
-
-    QRect invalidRect(QPoint(rangeMin - 3, m_rcSpline.top()), QPoint(rangeMax + 3, m_rcSpline.bottom() + 1) - QPoint(1, 1));
-    update(invalidRect);
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->update();
-    }
-
-    m_bKeyTimesDirty = true;
-    SendNotifyEvent(SPLN_CHANGE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::ValueScaleKeys(float startValue, float endValue)
-{
-    // Calculate the scaling parameters.
-    float valueScale = 1.0f;
-    if (fabsf(startValue) > MIN_TIME_EPSILON_FOR_SCALING)
-    {
-        valueScale = endValue / startValue;
-    }
-
-    // Loop through all keys that are selected.
-    m_pHitSpline = 0;
-    m_pHitDetailSpline = 0;
-    m_nHitKeyIndex = -1;
-    m_nHitDimension = -1;
-
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        int keyCount = pSpline->GetKeyCount();
-        for (int i = 0; i < keyCount; i++)
-        {
-            for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-            {
-                if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
-                {
-                    ISplineInterpolator::ValueType  afValue;
-                    pSpline->GetKeyValue(i, afValue);
-
-                    afValue[nCurrentDimension] = SnapValue(afValue[nCurrentDimension] * valueScale);
-                    pSpline->SetKeyValue(i, afValue);
-                }
-            }
-        }
-    }
-
-    update();
-    SendNotifyEvent(SPLN_CHANGE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::MoveSelectedKeys(Vec2 offset, bool copyKeys)
-{
-    m_pHitSpline = 0;
-    m_pHitDetailSpline = 0;
-    m_nHitKeyIndex = -1;
-    m_nHitDimension = -1;
-
-    if (copyKeys)
-    {
-        DuplicateSelectedKeys();
-    }
-
-    // For each spline...
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        int  keyCount = pSpline->GetKeyCount();
-        for (int i = 0; i < keyCount; i++)
-        {
-            float   oldTime = pSpline->GetKeyTime(i);
-            float   t = SnapTime(oldTime + offset.x);
-
-            if (pSpline->IsKeySelectedAtAnyDimension(i))
-            {
-                if (pSpline->FindKey(t, m_fMinTimeEpsilon) < 0)
-                {
-                    pSpline->SetKeyTime(i, SnapTimeToGridVertical(t));
-                }
-            }
-
-            for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-            {
-                if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
-                {
-                    ISplineInterpolator::ValueType  afValue;
-                    pSpline->GetKeyValue(i, afValue);
-
-                    afValue[nCurrentDimension] = SnapValue(afValue[nCurrentDimension] + offset.y);
-                    pSpline->SetKeyValue(i, afValue);
-                }
-            }
-        }
-    }
-
-    update();
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->update();
-    }
-
-    m_bKeyTimesDirty = true;
-    SendNotifyEvent(SPLN_CHANGE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::RemoveKey(ISplineInterpolator* pSpline, int nKey)
-{
-    CUndo undo("Remove Spline Key");
-    ConditionalStoreUndo();
-
-    m_bKeyTimesDirty = true;
-
-    SendNotifyEvent(SPLN_BEFORE_CHANGE);
-
-    m_pHitSpline = 0;
-    m_pHitDetailSpline = 0;
-    m_nHitKeyIndex = -1;
-    if (nKey != -1)
-    {
-        pSpline->RemoveKey(nKey);
-    }
-    SendNotifyEvent(SPLN_CHANGE);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::RemoveSelectedKeys()
-{
-    CUndo undo("Remove Spline Key");
-    StoreUndo();
-
-    SendNotifyEvent(SPLN_BEFORE_CHANGE);
-
-    m_pHitSpline = 0;
-    m_pHitDetailSpline = 0;
-    m_nHitKeyIndex = -1;
-
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        for (int i = 0; i < (int)pSpline->GetKeyCount(); )
-        {
-            if (pSpline->IsKeySelectedAtAnyDimension(i))
-            {
-                pSpline->RemoveKey(i);
-            }
-            else
-            {
-                i++;
-            }
-        }
-    }
-
-    m_bKeyTimesDirty = true;
-    SendNotifyEvent(SPLN_CHANGE);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::RemoveSelectedKeyTimesImpl()
-{
-    int numSelectedKeyTimes = 0;
-    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
-    {
-        if ((*it).selected)
-        {
-            ++numSelectedKeyTimes;
-        }
-    }
-
-    if (numSelectedKeyTimes)
-    {
-        CUndo undo("Remove Spline Key");
-        StoreUndo();
-        SendNotifyEvent(SPLN_BEFORE_CHANGE);
-
-        for (int splineIndex = 0, end = m_splines.size(); splineIndex < end; ++splineIndex)
-        {
-            std::vector<KeyTime>::iterator itTime = m_keyTimes.begin(), endTime = m_keyTimes.end();
-            for (int keyIndex = 0, endIndex = m_splines[splineIndex].pSpline->GetKeyCount(); keyIndex < endIndex; )
-            {
-                const float thisThreshold = 0.01f;
-                for (; itTime != endTime && (*itTime).time < m_splines[splineIndex].pSpline->GetKeyTime(keyIndex) - thisThreshold; ++itTime)
-                {
-                    ;
-                }
-                if (itTime != endTime && fabsf((*itTime).time - m_splines[splineIndex].pSpline->GetKeyTime(keyIndex)) < thisThreshold && (*itTime).selected)
-                {
-                    m_splines[splineIndex].pSpline->RemoveKey(keyIndex);
-                }
-                else
-                {
-                    ++keyIndex;
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::RemoveSelectedKeyTimes()
-{
-    RemoveSelectedKeyTimesImpl();
-
-    m_bKeyTimesDirty = true;
-    SendNotifyEvent(SPLN_CHANGE);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::RedrawWindowAroundMarker()
-{
-    UpdateKeyTimes();
-    std::vector<KeyTime>::iterator itKeyTime = std::lower_bound(m_keyTimes.begin(), m_keyTimes.end(), KeyTime(m_fTimeMarker, 0));
-    int keyTimeIndex = (itKeyTime != m_keyTimes.end() ? itKeyTime - m_keyTimes.begin() : m_keyTimes.size());
-    int redrawRangeStart = (keyTimeIndex >= 2 ? TimeToXOfs(m_keyTimes[keyTimeIndex - 2].time) : m_rcSpline.left());
-    int redrawRangeEnd = (keyTimeIndex < int(m_keyTimes.size()) - 2 ? TimeToXOfs(m_keyTimes[keyTimeIndex + 2].time) : m_rcSpline.right() + 1);
-
-    QRect rc(QPoint(redrawRangeStart, m_rcSpline.top()), QPoint(redrawRangeEnd, m_rcSpline.bottom() + 1) - QPoint(1, 1));
-    rc = rc.normalized().intersected(m_rcSpline);
-
-    m_TimeUpdateRect = QRect(QPoint(1, 2), QSize(2, 2));
-    update(rc);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SplinesChanged()
-{
-    m_bKeyTimesDirty = true;
-    UpdateKeyTimes();
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SetControlAmplitude(bool controlAmplitude)
-{
-    m_controlAmplitude = controlAmplitude;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool AbstractSplineWidget::GetControlAmplitude() const
-{
-    return m_controlAmplitude;
-}
-
-float AbstractSplineWidget::SnapTimeToGridVertical(float time)
-{
-    //float fSnapTime = int((time * m_fGridTimeScale) + 0.5f) * (1.0f / m_fGridTimeScale);
-    float fSnapTime = time;
-    return fSnapTime;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int AbstractSplineWidget::InsertKey(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, const QPoint& point)
-{
-    CUndo undo("Spline Insert Key");
-    StoreUndo();
-
-    float time, val;
-    PointToTimeValue(point, time, val);
-
-    time = SnapTimeToGridVertical(time);
-
-    int i;
-    for (i = 0; i < pSpline->GetKeyCount(); i++)
-    {
-        // Skip if any key already have time that is very close.
-        if (fabs(pSpline->GetKeyTime(i) - time) < m_fMinTimeEpsilon)
-        {
-            return i;
-        }
-    }
-
-    SendNotifyEvent(SPLN_BEFORE_CHANGE);
-
-    // The proper key value for a spline that has a detail spline is not what is shown in the control - we have
-    // to remove the detail value to get back to the underlying spline value.
-    if (pDetailSpline)
-    {
-        float offset = 0.0f;
-        pDetailSpline->InterpolateFloat(time, offset);
-        val -= offset;
-    }
-
-    ClearSelection();
-    ISplineInterpolator::ValueType currValue;
-    ISplineInterpolator::ZeroValue(currValue);
-
-    pSpline->Interpolate(time, currValue);
-
-    if (pSpline->GetNumDimensions() > 1)
-    {
-    }
-
-    int nKey = pSpline->InsertKey(time, currValue);  // TODO: Don't use FE specific snapping!
-    if (m_defaultKeyTangentType != SPLINE_KEY_TANGENT_NONE)
-    {
-        SetKeyTangentType(pSpline, nKey, m_defaultKeyTangentType);
-    }
-
-    //int nKey = pSpline->InsertKeyFloat( time,val ); // TODO: Don't use FE specific snapping!
-    SelectKey(pSpline, nKey, 0, true);
-    update();
-
-    m_bKeyTimesDirty = true;
-
-    SendNotifyEvent(SPLN_CHANGE);
-
-    return nKey;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::ClearSelection()
-{
-    ConditionalStoreUndo();
-
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
-        {
-            pSpline->SelectKeyAllDimensions(i, false);
-        }
-    }
-
-    ClearSelectedKeys();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SetTimeMarker(float fTime)
-{
-    if (m_pTimelineCtrl)
-    {
-        m_pTimelineCtrl->SetTimeMarker(fTime);
-    }
-
-    if (fTime == m_fTimeMarker)
-    {
-        return;
-    }
-
-    //// Erase old first.
-    //float x1 = TimeToXOfs(m_fTimeMarker);
-    //float x2 = TimeToXOfs(fTime);
-    //QRect rc(QPoint(x1, m_rcSpline.top()), QPoint(x2, m_rcSpline.bottom()));
-    //rc = rc.normalized().adjusted(-3, 0, 3, 0);// .intersected(m_rcSpline);
-
-    m_TimeUpdateRect = {};
-    m_fTimeMarker = fTime;
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::StoreUndo()
-{
-    if (CUndo::IsRecording() && !m_pCurrentUndo)
-    {
-        std::vector<ISplineInterpolator*> splines(m_splines.size());
-        for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-        {
-            splines[splineIndex] = m_splines[splineIndex].pSpline;
-        }
-        CUndo::Record(m_pCurrentUndo = CreateSplineCtrlUndoObject(splines));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::ConditionalStoreUndo()
-{
-    if (m_editMode == TrackingMode || m_editMode == SelectMode)
-    {
-        StoreUndo();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::ClearSelectedKeys()
-{
-    for (std::vector<KeyTime>::iterator it = m_keyTimes.begin(), end = m_keyTimes.end(); it != end; ++it)
-    {
-        (*it).selected = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CKeyCopyInfo
-{
-public:
-    ISplineInterpolator::ValueType value;
-    float time;
-    int flags;
-    ISplineInterpolator::ValueType tin, tout;
-};
-void AbstractSplineWidget::DuplicateSelectedKeys()
-{
-    m_pHitSpline = 0;
-    m_pHitDetailSpline = 0;
-    m_nHitKeyIndex = -1;
-
-    typedef std::vector<CKeyCopyInfo> KeysToAddContainer;
-    KeysToAddContainer keysToInsert;
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        keysToInsert.resize(0);
-        for (int i = 0; i < pSpline->GetKeyCount(); i++)
-        {
-            // In this particular case, the dimension doesn't matter.
-            if (pSpline->IsKeySelectedAtAnyDimension(i))
-            {
-                keysToInsert.resize(keysToInsert.size() + 1);
-                CKeyCopyInfo& copyInfo = keysToInsert.back();
-
-                copyInfo.time = pSpline->GetKeyTime(i);
-                pSpline->GetKeyValue(i, copyInfo.value);
-                pSpline->GetKeyTangents(i, copyInfo.tin, copyInfo.tout);
-                copyInfo.flags = pSpline->GetKeyFlags(i);
-            }
-        }
-
-        for (KeysToAddContainer::iterator keyToAdd = keysToInsert.begin(), endKeysToAdd = keysToInsert.end(); keyToAdd != endKeysToAdd; ++keyToAdd)
-        {
-            int keyIndex = pSpline->InsertKey(SnapTimeToGridVertical((*keyToAdd).time), (*keyToAdd).value);
-            pSpline->SetKeyTangents(keyIndex, (*keyToAdd).tin, (*keyToAdd).tout);
-            pSpline->SetKeyFlags(keyIndex, (*keyToAdd).flags & (~ESPLINE_KEY_UI_SELECTED_MASK));
-        }
-    }
-
-    m_bKeyTimesDirty = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::ZeroAll()
-{
-    GetIEditor()->BeginUndo();
-
-    typedef std::vector<ISplineInterpolator*> SplineContainer;
-    SplineContainer splines;
-    for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-        int keyIndex = (pSpline ? pSpline->FindKey(m_fTimeMarker, 0.015f) : -1);
-        if (pSpline && keyIndex >= 0)
-        {
-            splines.push_back(pSpline);
-        }
-    }
-
-    CUndo::Record(CreateSplineCtrlUndoObject(splines));
-
-    for (SplineContainer::iterator itSpline = splines.begin(); itSpline != splines.end(); ++itSpline)
-    {
-        int keyIndex = ((*itSpline) ? (*itSpline)->FindKey(m_fTimeMarker, 0.015f) : -1);
-        if ((*itSpline) && keyIndex >= 0)
-        {
-            (*itSpline)->SetKeyValueFloat(keyIndex, 0.0f);
-        }
-    }
-
-    GetIEditor()->AcceptUndo("Zero All");
-    m_pCurrentUndo = nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::KeyAll()
-{
-    GetIEditor()->BeginUndo();
-
-    typedef std::vector<ISplineInterpolator*> SplineContainer;
-    SplineContainer splines;
-    for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-        int keyIndex = (pSpline ? pSpline->FindKey(m_fTimeMarker, 0.015f) : -1);
-        if (pSpline && keyIndex == -1)
-        {
-            splines.push_back(pSpline);
-        }
-    }
-
-    CUndo::Record(CreateSplineCtrlUndoObject(splines));
-
-    for (SplineContainer::iterator itSpline = splines.begin(); itSpline != splines.end(); ++itSpline)
-    {
-        float value = 0.0f;
-        (*itSpline)->InterpolateFloat(m_fTimeMarker, value);
-        int keyIndex = (*itSpline)->InsertKeyFloat(SnapTimeToGridVertical(m_fTimeMarker), value);
-        if (m_defaultKeyTangentType != SPLINE_KEY_TANGENT_NONE)
-        {
-            SetKeyTangentType(*itSpline, keyIndex, m_defaultKeyTangentType);
-        }
-    }
-
-    GetIEditor()->AcceptUndo("Key All");
-    m_pCurrentUndo = nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SelectAll()
-{
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
-        {
-            pSpline->SelectKeyAllDimensions(i, true);
-        }
-    }
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::SendNotifyEvent(int nEvent)
-{
-    if (nEvent == SPLN_BEFORE_CHANGE)
-    {
-        ConditionalStoreUndo();
-    }
-
-    switch (nEvent)
-    {
-    case SPLN_BEFORE_CHANGE:
-        Q_EMIT beforeChange();
-        break;
-    case SPLN_CHANGE:
-        Q_EMIT change();
-        break;
-    case SPLN_TIME_CHANGE:
-        Q_EMIT timeChange();
-        break;
-    case SPLN_SCROLL_ZOOM:
-        Q_EMIT scrollZoomRequested();
-        break;
-    case SPLN_KEY_SELECTION_CHANGE:
-        Q_EMIT keySelectionChange();
-        break;
-    case NM_CLICK:
-        Q_EMIT clicked();
-        break;
-    case NM_RCLICK:
-        Q_EMIT rightClicked();
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SplineWidget::SetTimelineCtrl(TimelineWidget* pTimelineCtrl)
-{
-    m_pTimelineCtrl = pTimelineCtrl;
-    if (m_pTimelineCtrl)
-    {
-        pTimelineCtrl->setParent(this);
-        pTimelineCtrl->SetZoom(m_grid.zoom.x);
-        pTimelineCtrl->SetOrigin(m_grid.origin.x);
-        pTimelineCtrl->SetKeyTimeSet(this);
-        pTimelineCtrl->update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::AddSpline(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, const QColor& color)
-{
-    for (int i = 0; i < (int)m_splines.size(); i++)
-    {
-        if (m_splines[i].pSpline == pSpline)
-        {
-            return;
-        }
-    }
-    SSplineInfo si;
-
-    for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-    {
-        si.anColorArray[nCurrentDimension] = color;
-    }
-
-    si.pSpline = pSpline;
-    si.pDetailSpline = pDetailSpline;
-    m_splines.push_back(si);
-    m_bKeyTimesDirty = true;
-    update();
-}
-
-void AbstractSplineWidget::AddSpline(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, QColor anColorArray[4])
-{
-    for (int i = 0; i < (int)m_splines.size(); i++)
-    {
-        if (m_splines[i].pSpline == pSpline)
-        {
-            return;
-        }
-    }
-    SSplineInfo si;
-
-    for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-    {
-        si.anColorArray[nCurrentDimension] = anColorArray[nCurrentDimension];
-    }
-
-    si.pSpline = pSpline;
-    si.pDetailSpline = pDetailSpline;
-    m_splines.push_back(si);
-    m_bKeyTimesDirty = true;
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::RemoveSpline(ISplineInterpolator* pSpline)
-{
-    for (int i = 0; i < (int)m_splines.size(); i++)
-    {
-        if (m_splines[i].pSpline == pSpline)
-        {
-            m_splines.erase(m_splines.begin() + i);
-            return;
-        }
-    }
-    m_bKeyTimesDirty = true;
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::RemoveAllSplines()
-{
-    m_splines.clear();
-    m_bKeyTimesDirty = true;
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::SelectRectangle(const QRect& rc, bool bSelect)
-{
-    ConditionalStoreUndo();
-
-    ClearSelectedKeys();
-
-    Vec2 vec0 = ClientToWorld(rc.topLeft());
-    Vec2 vec1 = ClientToWorld(rc.bottomRight());
-    float t0 = vec0.x;
-    float t1 = vec1.x;
-    float v0 = vec0.y;
-    float v1 = vec1.y;
-    if (v0 > v1)
-    {
-        std::swap(v0, v1);
-    }
-    if (t0 > t1)
-    {
-        std::swap(t0, t1);
-    }
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-        ISplineInterpolator* pDetailSpline = m_splines[splineIndex].pDetailSpline;
-
-        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
-        {
-            float t = pSpline->GetKeyTime(i);
-            ISplineInterpolator::ValueType  afValue;
-            pSpline->GetKeyValue(i, afValue);
-
-            int nTotalNumberOfDimensions(pSpline->GetNumDimensions());
-
-            ISplineInterpolator::ValueType afDetailValue;
-            if (pDetailSpline)
-            {
-                ISplineInterpolator::ZeroValue(afDetailValue);
-                pDetailSpline->Interpolate(t, afDetailValue);
-            }
-
-            for (int nCurrentDimension = 0; nCurrentDimension < nTotalNumberOfDimensions; nCurrentDimension++)
-            {
-                if (pDetailSpline)
-                {
-                    afValue[nCurrentDimension] = afValue[nCurrentDimension] + afDetailValue[nCurrentDimension];
-                }
-                if (t >= t0 && t <= t1 && afValue[nCurrentDimension] >= v0 && afValue[nCurrentDimension] <= v1)
-                {
-                    pSpline->SelectKeyAtDimension(i, nCurrentDimension, bSelect);
-                }
-            }
-        }
-    }
-    SendNotifyEvent(SPLN_CHANGE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::CopyKeys()
-{
-    // Copy selected keys.
-    if (m_splines.empty() || GetNumSelected() == 0)
-    {
-        return;
-    }
-
-    XmlNodeRef rootNode = XmlHelpers::CreateXmlNode("SplineKeys");
-
-    int i;
-    float minTime = FLT_MAX;
-    float maxTime = -FLT_MAX;
-
-    ISplineInterpolator* pSpline = m_splines[0].pSpline;
-
-    for (i = 0; i < (int)pSpline->GetKeyCount(); i++)
-    {
-        if (!pSpline->IsKeySelectedAtAnyDimension(i))
-        {
-            continue;
-        }
-        float t = pSpline->GetKeyTime(i);
-        if (t < minTime)
-        {
-            minTime = t;
-        }
-        if (t > maxTime)
-        {
-            maxTime = t;
-        }
-    }
-
-    rootNode->setAttr("start", minTime);
-    rootNode->setAttr("end", maxTime);
-
-    for (i = 0; i < (int)pSpline->GetKeyCount(); i++)
-    {
-        if (!pSpline->IsKeySelectedAtAnyDimension(i))
-        {
-            continue;
-        }
-
-        float t = pSpline->GetKeyTime(i); // Store offset time from copy/paste range.
-        ISplineInterpolator::ValueType afValue;
-        pSpline->GetKeyValue(i, afValue);
-
-        float tin, tout;
-        ISplineInterpolator::ValueType vtin, vtout;
-        pSpline->GetKeyTangents(i, vtin, vtout);
-        tin = vtin[0];
-        tout = vtout[0];
-
-        XmlNodeRef keyNode = rootNode->newChild("Key");
-        keyNode->setAttr("time", t);
-        keyNode->setAttr("flags", (int)pSpline->GetKeyFlags(i));
-        keyNode->setAttr("in", tin);
-        keyNode->setAttr("out", tout);
-
-
-        for (int ii = 0; ii < pSpline->GetNumDimensions(); ++ii)
-        {
-            XmlNodeRef dimensionNode = keyNode->newChild("values");
-            dimensionNode->setAttr("value", afValue[ii]);
-        }
-    }
-
-    CClipboard clipboard(WidgetCast());
-    clipboard.Put(rootNode);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::PasteKeys()
-{
-    if (m_splines.empty() || GetNumSelected() == 0)
-    {
-        return;
-    }
-
-    ISplineInterpolator* pSpline = m_splines[0].pSpline;
-
-    CClipboard clipboard(WidgetCast());
-    if (clipboard.IsEmpty())
-    {
-        return;
-    }
-
-    XmlNodeRef rootNode = clipboard.Get();
-    if (!rootNode)
-    {
-        return;
-    }
-    if (!rootNode->isTag("SplineKeys"))
-    {
-        return;
-    }
-
-    float minTime = 0;
-    float maxTime = 0;
-    rootNode->getAttr("start", minTime);
-    rootNode->getAttr("end", maxTime);
-
-    const QPoint point = mapFromGlobal(QCursor::pos());
-    float fTime = XOfsToTime(point.x());
-    float fTimeRange = (maxTime - minTime);
-
-    CUndo undo("Paste Spline Keys");
-
-    ConditionalStoreUndo();
-
-    ClearSelection();
-
-    int i;
-    // Delete keys in range min to max time.
-    for (i = 0; i < pSpline->GetKeyCount(); )
-    {
-        float t = pSpline->GetKeyTime(i);
-        if (t >= fTime && t <= fTime + fTimeRange)
-        {
-            pSpline->RemoveKey(i);
-        }
-        else
-        {
-            i++;
-        }
-    }
-
-    for (i = 0; i < rootNode->getChildCount(); i++)
-    {
-        XmlNodeRef keyNode = rootNode->getChild(i);
-        float t = 0;
-        float tin = 0;
-        float tout = 0;
-        int flags = 0;
-
-        keyNode->getAttr("time", t);
-        keyNode->getAttr("flags", flags);
-        keyNode->getAttr("in", tin);
-        keyNode->getAttr("out", tout);
-
-        int nNumberOfChildXMLNodes(0);
-        int nCurrentChildXMLNode(0);
-        int nCurrentValue(0);
-
-        ISplineInterpolator::ValueType  afValue;
-
-        nNumberOfChildXMLNodes = keyNode->getChildCount();
-        for (nCurrentChildXMLNode = 0; nCurrentChildXMLNode < nNumberOfChildXMLNodes; ++nCurrentChildXMLNode)
-        {
-            XmlNodeRef rSubKeyNode = keyNode->getChild(nCurrentChildXMLNode);
-            if (rSubKeyNode->isTag("values"))
-            {
-                rSubKeyNode->getAttr("value", afValue[nCurrentValue]);
-                nCurrentValue++;
-            }
-        }
-
-        int key = pSpline->InsertKey(SnapTimeToGridVertical(t - minTime + fTime), afValue);
-        if (key >= 0)
-        {
-            pSpline->SelectKeyAllDimensions(key, true);
-            ISplineInterpolator::ValueType vtin, vtout;
-            vtin[0] = tin;
-            vtout[0] = tout;
-            pSpline->SetKeyTangents(key, vtin, vtout);
-        }
-    }
-    m_bKeyTimesDirty = true;
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::ModifySelectedKeysFlags(int nRemoveFlags, int nAddFlags)
-{
-    CUndo undo("Modify Spline Keys");
-    StoreUndo();
-
-    SendNotifyEvent(SPLN_BEFORE_CHANGE);
-
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
-        {
-            // If the key is selected in any dimension...
-            for (
-                int nCurrentDimension = 0;
-                nCurrentDimension < pSpline->GetNumDimensions();
-                nCurrentDimension++
-                )
-            {
-                if (IsKeySelected(pSpline, i, nCurrentDimension))
-                {
-                    int flags = pSpline->GetKeyFlags(i);
-                    flags &= ~nRemoveFlags;
-                    flags |= nAddFlags;
-
-                    pSpline->SetKeyFlags(i, flags);
-                    break;
-                }
-            }
-        }
-    }
-
-    SendNotifyEvent(SPLN_CHANGE);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::FitSplineToViewWidth()
-{
-    // Calculate time zoom so that whole time range fits.
-    float t0 = FLT_MAX;
-    float t1 = -FLT_MAX;
-
-    bool bAnyKey = false;
-    for (int i = 0; i < int(m_splines.size()); ++i)
-    {
-        //////////////////////////////////////////////////////////////////////////
-        ISplineInterpolator* pSpline = m_splines[i].pSpline;
-        if (!pSpline)
-        {
-            continue;
-        }
-
-        for (int keyIndex = 0; pSpline && keyIndex < pSpline->GetKeyCount(); ++keyIndex)
-        {
-            float keyTime = pSpline->GetKeyTime(keyIndex);
-            t0 = std::min(t0, keyTime);
-            t1 = std::max(t1, keyTime);
-            bAnyKey = true;
-        }
-    }
-    if (!bAnyKey)
-    {
-        t0 = m_timeRange.start;
-        t1 = m_timeRange.end;
-    }
-
-    float zoom = abs(m_rcSpline.width() - 20) / max(1.0f, fabs(t1 - t0));
-    SetZoom(Vec2(zoom, m_grid.zoom.y));
-    SetScrollOffset(Vec2(t0, m_grid.origin.y));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::FitSplineToViewHeight()
-{
-    // Calculate time zoom so that whole value range fits.
-    Range splineRange = GetSplinesRange();
-    if (splineRange.start == FLT_MAX)
-    {
-        splineRange = m_valueRange;
-    }
-
-    float zoom = abs(m_rcSpline.height() - 40) / max(minViewRange, splineRange.Length());
-    SetZoom(Vec2(m_grid.zoom.x, zoom));
-
-    // Center the range if it's less than the minRange by adjusting it's offset.
-    float scrollOffset = max(0.0f, minViewRange - splineRange.Length()) / 2.0f;
-
-    SetScrollOffset(Vec2(m_grid.origin.x, splineRange.start - scrollOffset));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::FitSplineHeightToValueRange()
-{
-    Range splineRange = GetSplinesRange();
-    splineRange.start = min(splineRange.start, m_valueRange.start);
-    splineRange.end = max(splineRange.end, m_valueRange.end);
-
-    float zoom = abs(m_rcSpline.height() - 40) / max(minViewRange, splineRange.Length());
-    SetZoom(Vec2(m_grid.zoom.x, zoom));
-    SetScrollOffset(Vec2(m_grid.origin.x, splineRange.start));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::OnUserCommand(UINT cmd)
-{
-    switch (cmd)
-    {
-    case ID_TANGENT_IN_ZERO:
-        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK, SPLINE_KEY_TANGENT_ZERO << SPLINE_KEY_TANGENT_IN_SHIFT);
-        break;
-    case ID_TANGENT_IN_STEP:
-        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK, SPLINE_KEY_TANGENT_STEP << SPLINE_KEY_TANGENT_IN_SHIFT);
-        break;
-    case ID_TANGENT_IN_LINEAR:
-        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK, SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_IN_SHIFT);
-        break;
-
-    case ID_TANGENT_OUT_ZERO:
-        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_OUT_MASK, SPLINE_KEY_TANGENT_ZERO << SPLINE_KEY_TANGENT_OUT_SHIFT);
-        break;
-    case ID_TANGENT_OUT_STEP:
-        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_OUT_MASK, SPLINE_KEY_TANGENT_STEP << SPLINE_KEY_TANGENT_OUT_SHIFT);
-        break;
-    case ID_TANGENT_OUT_LINEAR:
-        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_OUT_MASK, SPLINE_KEY_TANGENT_LINEAR << SPLINE_KEY_TANGENT_OUT_SHIFT);
-        break;
-
-    case ID_TANGENT_AUTO:
-        ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_IN_MASK | SPLINE_KEY_TANGENT_OUT_MASK, 0);
-        break;
-
-    case ID_SPLINE_FIT_X:
-        FitSplineToViewWidth();
-        break;
-    case ID_SPLINE_FIT_Y:
-        FitSplineToViewHeight();
-        break;
-    case ID_SPLINE_SNAP_GRID_X:
-        SetSnapTime(!m_bSnapTime);
-        break;
-    case ID_SPLINE_SNAP_GRID_Y:
-        SetSnapValue(!m_bSnapValue);
-        break;
-    case ID_SPLINE_PREVIOUS_KEY:
-        GotoNextKey(true);
-        break;
-    case ID_SPLINE_NEXT_KEY:
-        GotoNextKey(false);
-        break;
-    case ID_SPLINE_FLATTEN_ALL:
-        RemoveAllKeysButThis();
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::GotoNextKey(bool previousKey)
-{
-    if (GetNumSelected() == 1)
-    {
-        bool boFoundTheSelectedKey(false);
-
-        for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
-        {
-            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-            for (int i = 0; i < pSpline->GetKeyCount(); i++)
-            {
-                for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-                {
-                    if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
-                    {
-                        boFoundTheSelectedKey = true;
-
-                        if ((previousKey && i > 0) || (!previousKey && i + 1 < pSpline->GetKeyCount()))
-                        {
-                            int nextKey = previousKey ? i - 1 : i + 1;
-                            float keyTime = pSpline->GetKeyTime(nextKey);
-
-                            SetTimeMarker(keyTime);
-
-                            ISplineInterpolator::ValueType afValue;
-                            pSpline->GetKeyValue(nextKey, afValue);
-
-                            pSpline->SelectKeyAtDimension(i, nCurrentDimension, false);
-                            pSpline->SelectKeyAtDimension(nextKey, nCurrentDimension, true);
-
-                            // Set the new scrolled coordinates
-                            float ofsx = keyTime - ((m_grid.rect.right() + 1) / 2) / m_grid.zoom.x;
-                            float ofsy = afValue[nCurrentDimension] - ((m_grid.rect.bottom() + 1) / 2) / m_grid.zoom.y;
-
-                            SetScrollOffset(Vec2(ofsx, ofsy));
-                        }
-                        break;
-                    }
-                }
-                if (boFoundTheSelectedKey)
-                {
-                    break;
-                }
-            }
-        }
-    }
-    else
-    {
-        for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
-        {
-            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-            float fClosestKeyTime = -1.0f;
-            float fClosestDist = 1E8;
-
-            for (int i = 0; i < pSpline->GetKeyCount(); i++)
-            {
-                float fKeyTime = pSpline->GetKeyTime(i);
-                float fKeyDist = previousKey ? m_fTimeMarker - fKeyTime : fKeyTime - m_fTimeMarker;
-
-                if ((fKeyDist > 0.0f) && (fKeyDist < fClosestDist))
-                {
-                    fClosestDist = fKeyDist;
-                    fClosestKeyTime = pSpline->GetKeyTime(i);
-                }
-            }
-
-            if (fClosestKeyTime >= 0.0f)
-            {
-                SetTimeMarker(fClosestKeyTime);
-
-                float averageValue = 0.f;
-                int dimensions = pSpline->GetNumDimensions();
-
-                for (int i = 0; i < dimensions; i++)
-                {
-                    float keyValue;
-                    int keyNum = pSpline->FindKey(fClosestKeyTime);
-
-                    pSpline->GetKeyValueFloat(keyNum, keyValue);
-                    averageValue += keyValue;
-                }
-
-                // Set the new scrolled coordinates
-                float ofsx = fClosestKeyTime - ((m_grid.rect.right() + 1) / 2) / m_grid.zoom.x;
-                float ofsy = averageValue / dimensions - ((m_grid.rect.bottom() + 1) / 2) / m_grid.zoom.y;
-
-                SetScrollOffset(Vec2(ofsx, ofsy));
-            }
-        }
-    }
-    SendNotifyEvent(SPLN_TIME_CHANGE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AbstractSplineWidget::RemoveAllKeysButThis()
-{
-    std::vector<int> keys;
-
-    for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        for (int i = 0; i < pSpline->GetKeyCount(); i++)
-        {
-            if (pSpline->IsKeySelectedAtAnyDimension(i))
-            {
-                keys.push_back(i);
-            }
-        }
-
-        for (int i = pSpline->GetKeyCount(); i >= 0; i--)
-        {
-            bool saveKey = false;
-
-            for (int nIndex = 0; nIndex < keys.size(); nIndex++)
-            {
-                if (keys[nIndex] == i)
-                {
-                    saveKey = true;
-                }
-            }
-
-            if (!saveKey)
-            {
-                RemoveKey(pSpline, i);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-ISplineCtrlUndo* AbstractSplineWidget::CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer)
-{
-    return new CUndoSplineCtrlEx(this, splineContainer);
-}
-
-Range AbstractSplineWidget::GetSplinesRange()
-{
-    Range range(FLT_MAX, -FLT_MAX);
-
-    for (int i = 0; i < int(m_splines.size()); ++i)
-    {
-        //////////////////////////////////////////////////////////////////////////
-        ISplineInterpolator* pSpline = m_splines[i].pSpline;
-        if (!pSpline)
-        {
-            continue;
-        }
-
-        ISplineInterpolator::ValueType value;
-        for (int keyIndex = 0; pSpline && keyIndex < pSpline->GetKeyCount(); ++keyIndex)
-        {
-            pSpline->GetKeyValue(keyIndex, value);
-            for (int d = 0, numDim = pSpline->GetNumDimensions(); d < numDim; d++)
-            {
-                range.start = std::min(range.start, value[d]);
-                range.end = std::max(range.end, value[d]);
-            }
-        }
-    }
-
-    return range;
-}
-
-#include <Controls/moc_SplineCtrlEx.cpp>
diff --git a/Code/Sandbox/Editor/Controls/SplineCtrlEx.h b/Code/Sandbox/Editor/Controls/SplineCtrlEx.h
deleted file mode 100644
index 7be346b976..0000000000
--- a/Code/Sandbox/Editor/Controls/SplineCtrlEx.h
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRLEX_H
-#define CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRLEX_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <ISplines.h>
-#include "Controls/WndGridHelper.h"
-#include "IKeyTimeSet.h"
-#include "Undo/IUndoObject.h"
-#include <QWidget>
-#endif
-
-// Custom styles for this control.
-#define SPLINE_STYLE_NOGRID 0x0001
-#define SPLINE_STYLE_NO_TIME_MARKER 0x0002
-
-// Notify event sent when spline is being modified.
-#define SPLN_CHANGE (0x0001)
-// Notify event sent just before when spline is modified.
-#define SPLN_BEFORE_CHANGE (0x0002)
-// Notify when spline control is scrolled/zoomed.
-#define SPLN_SCROLL_ZOOM (0x0003)
-// Notify when time changed.
-#define SPLN_TIME_START_CHANGE  (0x0001)
-#define SPLN_TIME_END_CHANGE        (0x0002)
-#define SPLN_TIME_CHANGE (0x0004)
-// Notify event sent when a key selection changes
-#define SPLN_KEY_SELECTION_CHANGE (0x0005)
-
-#ifndef NM_CLICK
-#define NM_CLICK (-2)
-#define NM_RCLICK (-5)
-#endif
-
-#ifdef LoadCursor
-#undef LoadCursor
-#endif
-
-class AbstractTimelineWidget;
-class TimelineWidget;
-
-class QRubberBand;
-
-class ISplineSet
-{
-public:
-    virtual ISplineInterpolator* GetSplineFromID(const string& id) = 0;
-    virtual string GetIDFromSpline(ISplineInterpolator* pSpline) = 0;
-    virtual int GetSplineCount() const = 0;
-    virtual int GetKeyCountAtTime(float time, float threshold) const = 0;
-};
-
-class ISplineCtrlUndo
-    : public IUndoObject
-{
-public:
-    virtual bool IsSelectionChanged() const = 0;
-};
-
-class AbstractSplineWidget
-    : public IKeyTimeSet
-{
-    friend class CUndoSplineCtrlEx;
-public:
-    AbstractSplineWidget();
-    virtual ~AbstractSplineWidget();
-
-    int InsertKey(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, const QPoint& point);
-
-    virtual void update() = 0;
-    virtual void update(const QRect& rect) = 0;
-
-    virtual QPoint mapFromGlobal(const QPoint& point) const = 0;
-
-    virtual void SetCapture() {}
-
-    virtual QWidget* WidgetCast() = 0;
-
-    void SetGrid(int numX, int numY) { m_gridX = numX; m_gridY = numY; };
-    void SetTimeRange(const Range& range) { m_timeRange = range; }
-    void SetValueRange(const Range& range) { m_valueRange = range; }
-    void SetDefaultValueRange(const Range& range) { m_defaultValueRange = range; }
-    void SetDefaultKeyTangentType(ESplineKeyTangentType type) { m_defaultKeyTangentType = type; }
-    ESplineKeyTangentType GetDefaultKeyTangentType() const { return m_defaultKeyTangentType; }
-    void SetTooltipValueScale(float x, float y) { m_fTooltipScaleX = x; m_fTooltipScaleY = y; };
-    void SetSplineSet(ISplineSet* pSplineSet);
-
-    void AddSpline(ISplineInterpolator* pSpline, ISplineInterpolator* pDetailSpline, const QColor& color);
-    void AddSpline(ISplineInterpolator * pSpline, ISplineInterpolator * pDetailSpline, QColor anColorArray[4]);
-    void RemoveSpline(ISplineInterpolator* pSpline);
-    void RemoveAllSplines();
-    int  GetSplineCount() const { return m_splines.size(); }
-    ISplineInterpolator* GetSpline(int nIndex) const { return m_splines[nIndex].pSpline; }
-
-    void SetTimeMarker(float fTime);
-    float GetTimeMarker() const { return m_fTimeMarker; }
-    void SetTimeScale(float timeScale) { m_fTimeScale = timeScale; }
-    void SetGridTimeScale(float fGridTimeScale) { m_fGridTimeScale = fGridTimeScale; }
-    float GetGridTimeScale() { return m_fGridTimeScale; }
-
-    void  SetMinTimeEpsilon(float fMinTimeEpsilon) { m_fMinTimeEpsilon = fMinTimeEpsilon; }
-    float GetMinTimeEpsilon() const { return m_fMinTimeEpsilon; }
-
-    void SetSnapTime(bool bOn) { m_bSnapTime = bOn; }
-    void SetSnapValue(bool bOn) { m_bSnapValue = bOn; }
-    bool IsSnapTime() const { return m_bSnapTime; }
-    bool IsSnapValue() const { return m_bSnapValue; }
-
-    float SnapTimeToGridVertical(float time);
-
-    void OnUserCommand(UINT cmd);
-    void FitSplineToViewWidth();
-    void FitSplineToViewHeight();
-    void FitSplineHeightToValueRange();
-
-    void CopyKeys();
-    void PasteKeys();
-
-    void StoreUndo();
-
-    void ZeroAll();
-    void KeyAll();
-    void SelectAll();
-
-    void RemoveSelectedKeyTimes();
-
-    void RedrawWindowAroundMarker();
-
-    void SplinesChanged();
-    void SetControlAmplitude(bool controlAmplitude);
-    bool GetControlAmplitude() const;
-
-    //void SelectPreviousKey();
-    //void SelectNextKey();
-    void GotoNextKey(bool previousKey);
-    void RemoveAllKeysButThis();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Scrolling/Zooming.
-    //////////////////////////////////////////////////////////////////////////
-    Vec2   ClientToWorld(const QPoint& point);
-    QPoint WorldToClient(Vec2 v);
-    Vec2 GetZoom();
-    void SetZoom(Vec2 zoom, const QPoint& center);
-    void SetZoom(Vec2 zoom);
-    void SetScrollOffset(Vec2 ofs);
-    Vec2 GetScrollOffset();
-    float SnapTime(float time);
-    float SnapValue(float val);
-    //////////////////////////////////////////////////////////////////////////
-
-    // IKeyTimeSet Implementation
-    virtual int GetKeyTimeCount() const;
-    virtual float GetKeyTime(int index) const;
-    virtual void MoveKeyTimes(int numChanges, int* indices, float scale, float offset, bool copyKeys);
-    virtual bool GetKeyTimeSelected(int index) const;
-    virtual void SetKeyTimeSelected(int index, bool selected);
-    virtual int GetKeyCount(int index) const;
-    virtual int GetKeyCountBound() const;
-    virtual void BeginEdittingKeyTimes();
-    virtual void EndEdittingKeyTimes();
-
-    void SetEditLock(bool bLock) { m_bEditLock = bLock; }
-
-    int leftBorderOffset() const
-    {
-        return m_nLeftOffset;
-    }
-
-protected:
-    enum EHitCode
-    {
-        HIT_NOTHING,
-        HIT_KEY,
-        HIT_SPLINE,
-        HIT_TIMEMARKER,
-        HIT_TANGENT_HANDLE
-    };
-    enum EEditMode
-    {
-        NothingMode = 0,
-        SelectMode,
-        TrackingMode,
-        ScrollZoomMode,
-        ScrollMode,
-        ZoomMode,
-        TimeMarkerMode,
-    };
-
-    struct SSplineInfo
-    {
-        QColor anColorArray[4];
-        ISplineInterpolator* pSpline;
-        ISplineInterpolator* pDetailSpline;
-    };
-
-    virtual bool GetTangentHandlePts(QPoint& inTangentPt, QPoint& pt, QPoint& outTangentPt, int nSpline, int nKey, int nDimension);
-
-    EHitCode HitTest(const QPoint& point);
-    ISplineInterpolator* HitSpline(const QPoint& point);
-
-    //Tracking support helper functions
-    void StartTracking(bool copyKeys);
-    void StopTracking();
-    void RemoveKey(ISplineInterpolator* pSpline, int nKey);
-    void RemoveSelectedKeys();
-    void RemoveSelectedKeyTimesImpl();
-    void MoveSelectedKeys(Vec2 offset, bool copyKeys);
-    void ScaleAmplitudeKeys(float time, float startValue, float offset);
-    void TimeScaleKeys(float time, float startTime, float endTime);
-    void ValueScaleKeys(float startValue, float endValue);
-    void ModifySelectedKeysFlags(int nRemoveFlags, int nAddFlags);
-
-    QPoint TimeToPoint(float time, ISplineInterpolator* pSpline);
-    float TimeToXOfs(float x);
-    void PointToTimeValue(QPoint point, float& time, float& value);
-    float  XOfsToTime(int x);
-    QPoint XOfsToPoint(int x, ISplineInterpolator* pSpline);
-
-    virtual void ClearSelection();
-    virtual void SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect);
-    bool IsKeySelected(ISplineInterpolator* pSpline, int nKey, int nDimension) const;
-    int GetNumSelected();
-
-    void SetHorizontalExtent(int min, int max);
-
-    virtual void SendNotifyEvent(int nEvent) = 0;
-
-    virtual void SelectRectangle(const QRect& rc, bool bSelect);
-    //////////////////////////////////////////////////////////////////////////
-    void UpdateKeyTimes() const;
-
-    void ConditionalStoreUndo();
-
-    void ClearSelectedKeys();
-    void DuplicateSelectedKeys();
-
-    Range GetSplinesRange();
-
-    virtual void captureMouseImpl() = 0;
-    virtual void releaseMouseImpl() = 0;
-    virtual void setCursorImpl(UINT cursor) = 0;
-
-    virtual ISplineCtrlUndo* CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer);
-
-    QRect m_rcClipRect;
-    QRect m_rcSpline;
-    QRect m_rcClient;
-
-    QPoint m_cMousePos;
-    QPoint m_cMouseDownPos;
-    QPoint m_hitPoint;
-    EHitCode m_hitCode;
-    int m_nHitKeyIndex;
-    int m_nHitDimension;
-    int m_bHitIncomingHandle;
-    ISplineInterpolator* m_pHitSpline;
-    ISplineInterpolator* m_pHitDetailSpline;
-    QPoint m_curvePoint;
-
-    float m_fTimeMarker;
-
-    int m_nKeyDrawRadius;
-
-    bool m_bSnapTime;
-    bool m_bSnapValue;
-    bool m_bBitmapValid;
-
-    int m_gridX;
-    int m_gridY;
-
-    float m_fMinTime, m_fMaxTime;
-    float m_fMinValue, m_fMaxValue;
-    float m_fTooltipScaleX, m_fTooltipScaleY;
-
-    float m_fMinTimeEpsilon;
-
-    QPoint m_lastToolTipPos;
-    QString m_tooltipText;
-
-    QRect m_rcSelect;
-
-    QRect m_TimeUpdateRect;
-
-    float m_fTimeScale;
-    float m_fValueScale;
-    float m_fGridTimeScale;
-
-    Range m_timeRange;
-    Range m_valueRange;
-    Range m_defaultValueRange;
-
-    //! This is how often to place ticks.
-    //! value of 10 means place ticks every 10 second.
-    double m_ticksStep;
-
-    EEditMode m_editMode;
-
-    int m_nLeftOffset;
-    CWndGridHelper m_grid;
-
-    //////////////////////////////////////////////////////////////////////////
-    std::vector<SSplineInfo> m_splines;
-
-    mutable bool m_bKeyTimesDirty;
-    class KeyTime
-    {
-    public:
-        KeyTime(float time, int count)
-            : time(time)
-            , oldTime(0.0f)
-            , selected(false)
-            , count(count) {}
-        bool operator<(const KeyTime& other) const { return this->time < other.time; }
-        float time;
-        float oldTime;
-        bool selected;
-        int count;
-    };
-    mutable std::vector<KeyTime> m_keyTimes;
-    mutable int m_totalSplineCount;
-
-    static const float threshold;
-
-    bool m_copyKeys;
-    bool m_startedDragging;
-
-    bool m_controlAmplitude;
-    ESplineKeyTangentType m_defaultKeyTangentType;
-    // Improving mouse control...
-    bool m_boLeftMouseButtonDown;
-
-    ISplineSet* m_pSplineSet;
-
-    bool m_bEditLock;
-
-    ISplineCtrlUndo* m_pCurrentUndo;
-    AbstractTimelineWidget* m_pTimelineCtrl;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Spline control.
-//////////////////////////////////////////////////////////////////////////
-
-
-class SplineWidget
-    : public QWidget
-    , public AbstractSplineWidget
-{
-    Q_OBJECT
-public:
-    SplineWidget(QWidget* parent);
-    virtual ~SplineWidget();
-
-    void update() { QWidget::update(); }
-    void update(const QRect& rect) { QWidget::update(rect); }
-
-    QPoint mapFromGlobal(const QPoint& point) const override { return QWidget::mapFromGlobal(point); }
-
-    void SetTimelineCtrl(TimelineWidget* pTimelineCtrl);
-
-    QWidget* WidgetCast() override { return this; }
-
-Q_SIGNALS:
-    void beforeChange();
-    void change();
-    void timeChange();
-    void scrollZoomRequested();
-    void clicked();
-    void rightClicked();
-    void keySelectionChange();
-
-protected:
-    void paintEvent(QPaintEvent* event) override;
-    void resizeEvent(QResizeEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void mouseDoubleClickEvent(QMouseEvent* event) override;
-    void wheelEvent(QWheelEvent* event) override;
-    void keyPressEvent(QKeyEvent* event) override;
-    bool event(QEvent* event) override;
-
-    void OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnLButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnRButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnMButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnMButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
-
-    void DrawGrid(QPainter* painter);
-    void DrawSpline(QPainter* pDC, SSplineInfo& splineInfo, float startTime, float endTime);
-    void DrawKeys(QPainter* painter, int splineIndex, float startTime, float endTime);
-    void DrawTimeMarker(QPainter* pDC);
-
-    void DrawTangentHandle(QPainter* pDC, int nSpline, int nKey, int nDimension);
-
-    void SendNotifyEvent(int nEvent) override;
-
-    void captureMouseImpl() override { grabMouse(); }
-    void releaseMouseImpl() override { releaseMouse(); }
-    void setCursorImpl(UINT cursor) override { setCursor(CMFCUtils::LoadCursor(cursor)); }
-
-protected:
-    QRubberBand* m_rubberBand;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_SPLINECTRLEX_H
diff --git a/Code/Sandbox/Editor/Controls/TextEditorCtrl.cpp b/Code/Sandbox/Editor/Controls/TextEditorCtrl.cpp
deleted file mode 100644
index ae4252ab3f..0000000000
--- a/Code/Sandbox/Editor/Controls/TextEditorCtrl.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TextEditorCtrl.h"
-
-
-// CTextEditorCtrl
-CTextEditorCtrl::CTextEditorCtrl(QWidget* pParent)
-    : QTextEdit(pParent)
-{
-     m_bModified = true;
-
-    QFont font;
-    font.setFamily("Courier New");
-    font.setFixedPitch(true);
-    font.setPointSize(10);
-    setFont(font);
-
-    setLineWrapMode(NoWrap);
-
-    connect(this, &QTextEdit::textChanged, this, &CTextEditorCtrl::OnChange);
-}
-
-CTextEditorCtrl::~CTextEditorCtrl()
-{
-}
-
-
-// CTextEditorCtrl message handlers
-
-void CTextEditorCtrl::LoadFile(const QString& sFileName)
-{
-    if (m_filename == sFileName)
-    {
-        return;
-    }
-
-    m_filename = sFileName;
-
-    clear();
-
-    CCryFile file(sFileName.toUtf8().data(), "rb");
-    if (file.Open(sFileName.toUtf8().data(), "rb"))
-    {
-        size_t length = file.GetLength();
-
-        QByteArray text;
-        text.resize(length);
-        file.ReadRaw(text.data(), length);
-
-        setPlainText(text);
-    }
-
-    m_bModified = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTextEditorCtrl::SaveFile(const QString& sFileName)
-{
-    if (sFileName.isEmpty())
-    {
-        return;
-    }
-
-    if (!CFileUtil::OverwriteFile(sFileName.toUtf8().data()))
-    {
-        return;
-    }
-
-    QFile file(sFileName);
-    file.open(QFile::WriteOnly);
-
-    file.write(toPlainText().toUtf8());
-
-    m_bModified = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTextEditorCtrl::OnChange()
-{
-
-    m_bModified = true;
-}
-
-#include <Controls/moc_TextEditorCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/TextEditorCtrl.h b/Code/Sandbox/Editor/Controls/TextEditorCtrl.h
deleted file mode 100644
index 8f8599a3b2..0000000000
--- a/Code/Sandbox/Editor/Controls/TextEditorCtrl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_TEXTEDITORCTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_TEXTEDITORCTRL_H
-#pragma once
-
-// CTextEditorCtrl
-#if !defined(Q_MOC_RUN)
-#include <QTextEdit>
-#endif
-
-class CTextEditorCtrl
-    : public QTextEdit
-{
-    Q_OBJECT
-
-public:
-    CTextEditorCtrl(QWidget* pParent = nullptr);
-    virtual ~CTextEditorCtrl();
-
-    void LoadFile(const QString& sFileName);
-    void SaveFile(const QString& sFileName);
-    QString GetFilename() const { return m_filename; }
-
-    bool IsModified() const { return m_bModified; }
-
-    //! Must be called after OnChange message.
-    void OnChange();
-
-protected:
-    QString m_filename;
-    bool m_bModified;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_TEXTEDITORCTRL_H
diff --git a/Code/Sandbox/Editor/Controls/TimelineCtrl.cpp b/Code/Sandbox/Editor/Controls/TimelineCtrl.cpp
deleted file mode 100644
index 36580e676e..0000000000
--- a/Code/Sandbox/Editor/Controls/TimelineCtrl.cpp
+++ /dev/null
@@ -1,676 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TimelineCtrl.h"
-
-// Qt
-#include <QPainter>
-
-// Editor
-#include "ScopedVariableSetter.h"
-#include "GridUtils.h"
-
-
-static const QColor timeMarkerCol = QColor(255, 0, 255);
-static const QColor textCol = QColor(0, 0, 0);
-static const QColor ltgrayCol = QColor(110, 110, 110);
-
-QColor InterpolateColor(const QColor& c1, const QColor& c2, float fraction)
-{
-    const int r = (c2.red() - c1.red()) * fraction + c1.red();
-    const int g = (c2.green() - c1.green()) * fraction + c1.green();
-    const int b = (c2.blue() - c1.blue()) * fraction + c1.blue();
-    return QColor(r, g, b);
-}
-
-//////////////////////////////////////////////////////////////////////////
-TimelineWidget::TimelineWidget(QWidget* parent /* = nullptr */)
-    : QWidget(parent)
-{
-    setMouseTracking(true);
-
-    m_timeRange.start = 0;
-    m_timeRange.end = 1;
-
-    m_timeScale = 1;
-    m_fTicksTextScale = 1.0f;
-
-    m_fTimeMarker = -10;
-
-    m_nTicksStep = 100;
-
-    m_trackingMode = TRACKING_MODE_NONE;
-
-    m_leftOffset = 0;
-    m_scrollOffset = 0;
-
-    m_ticksStep = 10.0f;
-
-    m_grid.zoom.x = 100;
-
-    m_bIgnoreSetTime = false;
-
-    m_pKeyTimeSet = 0;
-
-    m_markerStyle = MARKER_STYLE_SECONDS;
-    m_fps = 30.0f;
-
-    m_copyKeyTimes = false;
-    m_bTrackingSnapToFrames = false;
-}
-
-TimelineWidget::~TimelineWidget()
-{
-}
-/////////////////////////////////////////////////////////////////////////////
-// CTimelineCtrl message handlers
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::resizeEvent(QResizeEvent* event)
-{
-    Q_UNUSED(event);
-    m_rcTimeline = rect();
-    m_grid.rect = m_rcTimeline;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int TimelineWidget::TimeToClient(float time)
-{
-    return m_grid.WorldToClient(Vec2(time, 0)).x();
-}
-
-//////////////////////////////////////////////////////////////////////////
-float TimelineWidget::ClientToTime(int x)
-{
-    return m_grid.ClientToWorld(QPoint(x, 0)).x;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::paintEvent(QPaintEvent* event)
-{
-    QPainter painter(this);
-
-    QRect rcClient = rect();
-
-    {
-        //////////////////////////////////////////////////////////////////////////
-        // Fill keys background.
-        //////////////////////////////////////////////////////////////////////////
-        const QRect rc = rcClient.intersected(event->rect());
-        painter.fillRect(rc, palette().color(QPalette::Button));
-        painter.drawRect(rc);
-        //////////////////////////////////////////////////////////////////////////
-
-        m_grid.CalculateGridLines();
-
-        DrawTicks(&painter);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float TimelineWidget::SnapTime(float time)
-{
-    double t = floor((double)time * m_ticksStep + 0.5);
-    t = t / m_ticksStep;
-    return t;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::DrawTicks(QPainter* painter)
-{
-    const QRectF rc = rect();
-
-    const QPen pOldPen = painter->pen();
-
-    const QPen ltgray(QColor(110, 110, 110));
-    const QPen black(palette().color(QPalette::Normal, QPalette::Text));
-    const QPen redpen(QColor(255, 0, 255));
-
-    // Draw time ticks every tick step seconds.
-    Range timeRange = m_timeRange;
-
-    painter->setPen(ltgray);
-
-    switch (m_markerStyle)
-    {
-    case MARKER_STYLE_SECONDS:
-        DrawSecondTicks(painter);
-        break;
-
-    case MARKER_STYLE_FRAMES:
-        DrawFrameTicks(painter);
-        break;
-    }
-
-    painter->setPen(redpen);
-    int x = TimeToClient(m_fTimeMarker);
-    painter->setBrush(Qt::NoBrush);
-    painter->drawRect(QRect(QPoint(x - 3, rc.top()), QPoint(x + 2, rc.bottom())));
-
-    painter->setPen(redpen);
-    painter->drawLine(x, rc.top(), x, rc.bottom());
-    painter->setBrush(Qt::NoBrush);
-
-    // Draw vertical line showing current time.
-    {
-        int x2 = TimeToClient(m_fTimeMarker);
-        if (x2 > m_rcTimeline.left() && x2 < m_rcTimeline.right())
-        {
-            painter->setPen(QColor(255, 0, 255));
-            painter->drawLine(x2, 0, x2, m_rcTimeline.bottom());
-        }
-    }
-
-    // Draw the key times.
-    painter->setPen(redpen);
-    painter->setBrush(Qt::NoBrush);
-    const QPen keySelectedPen(QColor(100, 255, 255));
-    const QBrush keySelectedBrush(QColor(100, 255, 255));
-    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
-    {
-        int keyCountBound = __max(m_pKeyTimeSet->GetKeyCountBound(), 1);
-        int keyCount = __min(m_pKeyTimeSet->GetKeyCount(keyTimeIndex), keyCountBound);
-        float colorCodeFraction = float(keyCount) / keyCountBound;
-        const QColor keyMarkerCol = InterpolateColor(Qt::green, Qt::red, colorCodeFraction);
-
-        const QPen keyPen(keyMarkerCol);
-        const QBrush keyBrush(keyMarkerCol);
-        bool keyTimeSelected = m_pKeyTimeSet && m_pKeyTimeSet->GetKeyTimeSelected(keyTimeIndex);
-        painter->setBrush(keyTimeSelected ? keySelectedBrush : keyBrush);
-        painter->setPen(keyTimeSelected ? keySelectedPen : keyPen);
-
-        float keyTime = (m_pKeyTimeSet ? m_pKeyTimeSet->GetKeyTime(keyTimeIndex) : 0.0f);
-
-        int x2 = TimeToClient(keyTime);
-        painter->drawRect(QRect(QPoint(x2 - 1, rc.top()), QPoint(x2 + 2, rc.bottom())));
-    }
-
-    painter->setPen(pOldPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-Range TimelineWidget::GetVisibleRange() const
-{
-    Range r;
-
-    r.start = (m_scrollOffset - m_leftOffset) / m_timeScale;
-    r.end = r.start + (m_rcTimeline.width()) / m_timeScale;
-    // Intersect range with global time range.
-    r = m_timeRange & r;
-
-    return r;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-//Mouse Message Handlers
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::mousePressEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonDown(event->pos(), event->modifiers());
-        break;
-    case Qt::RightButton:
-        OnRButtonDown(event->pos(), event->modifiers());
-        break;
-    }
-}
-
-void TimelineWidget::mouseReleaseEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonUp(event->pos(), event->modifiers());
-        break;
-    case Qt::RightButton:
-        OnRButtonUp(event->pos(), event->modifiers());
-        break;
-    }
-}
-
-namespace
-{
-    const float EDITOR_FPS = 30.0f;
-    float SnapTimeToFrame(float time) {return int((time * EDITOR_FPS) + 0.5f) * (1.0f / EDITOR_FPS); }
-}
-
-void TimelineWidget::OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers)
-{
-    if (m_trackingMode != TRACKING_MODE_NONE)
-    {
-        return;
-    }
-
-    Q_EMIT clicked();
-
-    int hitKeyTimeIndex = HitKeyTimes(point);
-    bool autoDeselect = !(modifiers& Qt::ControlModifier) && (m_pKeyTimeSet && ((hitKeyTimeIndex >= 0) ? !m_pKeyTimeSet->GetKeyTimeSelected(hitKeyTimeIndex) : true));
-    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
-    {
-        bool shouldBeSelected;
-        if (keyTimeIndex == hitKeyTimeIndex)
-        {
-            shouldBeSelected = (modifiers& Qt::ControlModifier) || !((modifiers& Qt::ShiftModifier) && m_pKeyTimeSet->GetKeyTimeSelected(keyTimeIndex));
-        }
-        else
-        {
-            shouldBeSelected = (!autoDeselect || (modifiers & Qt::ShiftModifier)) && m_pKeyTimeSet->GetKeyTimeSelected(keyTimeIndex);
-        }
-
-        m_pKeyTimeSet->SetKeyTimeSelected(keyTimeIndex, shouldBeSelected);
-    }
-    TrackingMode trackingMode = (hitKeyTimeIndex >= 0 ? TRACKING_MODE_MOVE_KEYS : TRACKING_MODE_NONE);
-    if (trackingMode == TRACKING_MODE_NONE)
-    {
-        trackingMode = ((modifiers& Qt::ControlModifier) ? TRACKING_MODE_SELECTION_RANGE : TRACKING_MODE_SET_TIME);
-    }
-    StartTracking(trackingMode);
-
-    switch (m_trackingMode)
-    {
-    case TRACKING_MODE_SET_TIME:
-    {
-        if (m_bTrackingSnapToFrames)
-        {
-            SetTimeMarker(SnapTimeToFrame(ClientToTime(point.x())));
-        }
-        else
-        {
-            SetTimeMarker(ClientToTime(point.x()));
-        }
-        CScopedVariableSetter<bool> ignoreSetTime(m_bIgnoreSetTime, true);
-        Q_EMIT startChange();
-        Q_EMIT change();
-    }
-    break;
-
-    case TRACKING_MODE_MOVE_KEYS:
-        m_bChangedKeyTimeSet = false;
-        m_copyKeyTimes = (modifiers & Qt::ControlModifier ? true : false);
-        break;
-
-    case TRACKING_MODE_NONE:
-        break;
-    }
-
-    m_lastPoint = point;
-
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::OnRButtonDown(const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
-{
-    Q_EMIT clicked();
-
-    if (m_trackingMode != TRACKING_MODE_NONE)
-    {
-        return;
-    }
-
-    StartTracking(TRACKING_MODE_SET_TIME);
-
-    if (m_bTrackingSnapToFrames)
-    {
-        SetTimeMarker(SnapTimeToFrame(ClientToTime(point.x())));
-    }
-    else
-    {
-        SetTimeMarker(ClientToTime(point.x()));
-    }
-    CScopedVariableSetter<bool> ignoreSetTime(m_bIgnoreSetTime, true);
-    Q_EMIT startChange();
-    Q_EMIT change();
-
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::OnRButtonUp([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
-{
-    switch (m_trackingMode)
-    {
-    case TRACKING_MODE_SET_TIME:
-    {
-        Q_EMIT endChange();
-    }
-    break;
-    }
-
-    if (m_trackingMode != TRACKING_MODE_NONE)
-    {
-        StopTracking();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::keyPressEvent(QKeyEvent* event)
-{
-    if (event->matches(QKeySequence::Delete))
-    {
-        Q_EMIT deleteRequested();
-    }
-    if (event->key() == Qt::Key_Space && m_playCallback)
-    {
-        m_playCallback();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::mouseMoveEvent(QMouseEvent* event)
-{
-    switch (m_trackingMode)
-    {
-    case TRACKING_MODE_SET_TIME:
-    {
-        if (m_bTrackingSnapToFrames)
-        {
-            SetTimeMarker(SnapTimeToFrame(ClientToTime(event->x())));
-        }
-        else
-        {
-            SetTimeMarker(ClientToTime(event->x()));
-        }
-        CScopedVariableSetter<bool> ignoreSetTime(m_bIgnoreSetTime, true);
-        Q_EMIT change();
-    }
-    break;
-
-    case TRACKING_MODE_MOVE_KEYS:
-    {
-        if (m_pKeyTimeSet && !m_bChangedKeyTimeSet)
-        {
-            m_bChangedKeyTimeSet = true;
-            m_pKeyTimeSet->BeginEdittingKeyTimes();
-        }
-
-        const bool altClicked = (Qt::AltModifier & QApplication::queryKeyboardModifiers());
-        float scale, offset;
-        float startTime = ClientToTime(m_lastPoint.x());
-        float endTime = ClientToTime(event->x());
-        if (altClicked)
-        {
-            // Alt was pressed, so we should scale the key times rather than translate.
-            // Calculate the scaling parameters (ie t1 = t0 * M + C).
-            scale = 1.0f;
-            if (fabsf(startTime - m_fTimeMarker) > 0.1)
-            {
-                scale = (endTime - m_fTimeMarker) / (startTime - m_fTimeMarker);
-            }
-            offset = endTime - startTime * scale;
-        }
-        else
-        {
-            // Simply move the keys.
-            offset = endTime - startTime;
-            scale = 1.0f;
-        }
-
-        MoveSelectedKeyTimes(scale, offset);
-    }
-    break;
-
-    case TRACKING_MODE_SELECTION_RANGE:
-    {
-        float start = min(ClientToTime(m_lastPoint.x()), ClientToTime(event->x()));
-        float end = max(ClientToTime(m_lastPoint.x()), ClientToTime(event->x()));
-        SelectKeysInRange(start, end, !(event->modifiers() & Qt::ShiftModifier));
-        m_lastPoint = event->pos();
-        update();
-    }
-    break;
-
-    case TRACKING_MODE_NONE:
-        break;
-    }
-
-    //m_lastPoint = point;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString TimelineWidget::TimeToString(float time)
-{
-    return QString::number(time, 'f', 3);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::OnLButtonUp([[maybe_unused]] const QPoint& point, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
-{
-    switch (m_trackingMode)
-    {
-    case TRACKING_MODE_MOVE_KEYS:
-    {
-        if (m_pKeyTimeSet && m_bChangedKeyTimeSet)
-        {
-            m_pKeyTimeSet->EndEdittingKeyTimes();
-        }
-    }
-    break;
-
-    case TRACKING_MODE_SET_TIME:
-    {
-        Q_EMIT endChange();
-    }
-    break;
-
-    case TRACKING_MODE_NONE:
-        break;
-    }
-
-    if (m_trackingMode != TRACKING_MODE_NONE)
-    {
-        StopTracking();
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void TimelineWidget::StartTracking(TrackingMode trackingMode)
-{
-    m_trackingMode = trackingMode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::StopTracking()
-{
-    if (!m_trackingMode)
-    {
-        return;
-    }
-
-    m_trackingMode = TRACKING_MODE_NONE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::SetTimeMarker(float fTime)
-{
-    if (fTime < m_timeRange.start)
-    {
-        fTime = m_timeRange.start;
-    }
-    else if (fTime > m_timeRange.end)
-    {
-        fTime = m_timeRange.end;
-    }
-
-    if (fTime == m_fTimeMarker || m_bIgnoreSetTime)
-    {
-        return;
-    }
-
-    int x0 = TimeToClient(m_fTimeMarker);
-    int x1 = TimeToClient(fTime);
-    QRect rc(QPoint(x0, m_rcClient.top()), QPoint(x1, m_rcClient.bottom()));
-    rc = rc.normalized();
-    rc.adjust(-5, 0, 5, 0);
-    update(rc);
-
-    m_fTimeMarker = fTime;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::SetZoom(float fZoom)
-{
-    m_grid.zoom.x = fZoom;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::SetOrigin(float fOffset)
-{
-    m_grid.origin.x = fOffset;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::SetKeyTimeSet(IKeyTimeSet* pKeyTimeSet)
-{
-    m_pKeyTimeSet = pKeyTimeSet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int TimelineWidget::HitKeyTimes(const QPoint& point)
-{
-    const int threshold = 3;
-
-    int hitKeyTimeIndex = -1;
-    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
-    {
-        float keyTime = (m_pKeyTimeSet ? m_pKeyTimeSet->GetKeyTime(keyTimeIndex) : 0.0f);
-        int x = TimeToClient(keyTime);
-        if (abs(point.x() - x) <= threshold)
-        {
-            hitKeyTimeIndex = keyTimeIndex;
-        }
-    }
-
-    return hitKeyTimeIndex;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::MoveSelectedKeyTimes(float scale, float offset)
-{
-    std::vector<int> indices;
-    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
-    {
-        if (m_pKeyTimeSet && m_pKeyTimeSet->GetKeyTimeSelected(keyTimeIndex))
-        {
-            indices.push_back(keyTimeIndex);
-        }
-    }
-
-    if (m_pKeyTimeSet)
-    {
-        m_pKeyTimeSet->MoveKeyTimes(int(indices.size()), &indices[0], scale, offset, m_copyKeyTimes);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::SelectKeysInRange(float start, float end, bool select)
-{
-    for (int keyTimeIndex = 0; m_pKeyTimeSet && keyTimeIndex < m_pKeyTimeSet->GetKeyTimeCount(); ++keyTimeIndex)
-    {
-        float time = (m_pKeyTimeSet ? m_pKeyTimeSet->GetKeyTime(keyTimeIndex) : 0.0f);
-        if (m_pKeyTimeSet && time >= start && time <= end)
-        {
-            m_pKeyTimeSet->SetKeyTimeSelected(keyTimeIndex, select);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::SetMarkerStyle(MarkerStyle markerStyle)
-{
-    m_markerStyle = markerStyle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::SetFPS(float fps)
-{
-    m_fps = fps;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void TimelineWidget::DrawSecondTicks(QPainter* painter)
-{
-    const QPen ltgray(QColor(110, 110, 110));
-    const QPen black(palette().color(QPalette::Normal, QPalette::Text));
-    const QPen redpen(QColor(255, 0, 255));
-
-    for (int gx = m_grid.firstGridLine.x(); gx < m_grid.firstGridLine.x() + m_grid.numGridLines.x() + 1; gx++)
-    {
-        painter->setPen(ltgray);
-
-        int x = m_grid.GetGridLineX(gx);
-        if (x < 0)
-        {
-            continue;
-        }
-
-        painter->drawLine(m_rcTimeline.left() + x, m_rcTimeline.bottom() - 2, m_rcTimeline.left() + x, m_rcTimeline.bottom() - 4);
-
-        //if (gx % 10 == 0)
-        {
-            float t = m_grid.GetGridLineXValue(gx);
-            t = floor(t * 1000.0f + 0.5f) / 1000.0f;
-
-            const QString str = QString::number(t * m_fTicksTextScale, 'g');
-
-            //t = t / pow(10,precision);
-            painter->setPen(black);
-            painter->drawLine(m_rcTimeline.left() + x, m_rcTimeline.bottom() - 2, m_rcTimeline.left() + x, m_rcTimeline.bottom() - 14);
-            painter->drawText(m_rcTimeline.left() + x + 2, m_rcTimeline.top(), str);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-class TickDrawer
-{
-public:
-    TickDrawer(QPainter* painter, const QRect& rect)
-        : rect(rect)
-        , painter(painter)
-    {
-    }
-
-    void operator()(int frameIndex, int x)
-    {
-        if (painter)
-        {
-            painter->setPen(QColor(110, 110, 110));
-            painter->drawLine(rect.left() + x, rect.bottom() - 2, rect.left() + x, rect.bottom() - 4);
-
-            {
-                const QString str = QString::number(frameIndex);
-
-                painter->setPen(Qt::black);
-                painter->drawLine(rect.left() + x, rect.bottom() - 2, rect.left() + x, rect.bottom() - 14);
-                painter->drawText(rect.left() + x + 2, rect.top(), str);
-            }
-        }
-    }
-
-    QRect rect;
-    QPainter* painter;
-};
-
-void TimelineWidget::DrawFrameTicks(QPainter* painter)
-{
-    TickDrawer tickDrawer(painter, m_rcTimeline);
-    GridUtils::IterateGrid(tickDrawer, 50.0f, m_grid.zoom.x, m_grid.origin.x, m_fps, m_grid.rect.left(), m_grid.rect.right() + 1);
-}
-
-void TimelineWidget::SetPlayCallback(const std::function<void()>& callback)
-{
-    m_playCallback = callback;
-}
-
-#include <Controls/moc_TimelineCtrl.cpp>
diff --git a/Code/Sandbox/Editor/Controls/TimelineCtrl.h b/Code/Sandbox/Editor/Controls/TimelineCtrl.h
deleted file mode 100644
index 4f3dbe29a7..0000000000
--- a/Code/Sandbox/Editor/Controls/TimelineCtrl.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_TIMELINECTRL_H
-#define CRYINCLUDE_EDITOR_CONTROLS_TIMELINECTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "Range.h"
-#include "SplineCtrlEx.h"
-#include "Controls/WndGridHelper.h"
-#include "Util/fastlib.h"
-#endif
-
-// Custom styles for this control.
-#define TL_STYLE_AUTO_DELETE    0x0001
-#define TL_STYLE_NO_TICKS       0x0002
-#define TL_STYLE_NO_TIME_MARKER 0x0004
-#define TL_STYLE_NO_TEXT        0x0008
-
-// Notify event sent when current time is change on the timeline control.
-#define TLN_START_CHANGE    (0x0001)
-#define TLN_END_CHANGE      (0x0002)
-#define TLN_CHANGE              (0x0003)
-#define TLN_DELETE              (0x0004)
-
-class AbstractTimelineWidget
-{
-public:
-    virtual void setZoom(float zoom, float origin) = 0;
-    virtual void update(const QRect& r = QRect()) = 0;
-    virtual void setGeometry(const QRect& r) = 0;
-    virtual void SetTimeMarker(float marker) = 0;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Timeline control.
-//////////////////////////////////////////////////////////////////////////
-class TimelineWidget
-    : public QWidget
-    , public AbstractTimelineWidget
-{
-    Q_OBJECT
-public:
-    TimelineWidget(QWidget* parent = nullptr);
-    ~TimelineWidget();
-
-    void setZoom(float zoom, float origin) override { SetZoom(zoom); SetOrigin(origin); update(); }
-    void update(const QRect& r = QRect()) override { QWidget::update(r); }
-    void setGeometry(const QRect& r) override { QWidget::setGeometry(r); }
-
-    void SetTimeRange(const Range& r) { m_timeRange = r; }
-    void SetTimeMarker(float fTime);
-    float GetTimeMarker() const { return m_fTimeMarker; }
-
-    void SetZoom(float fZoom);
-    void SetOrigin(float fOffset);
-
-    void SetKeyTimeSet(IKeyTimeSet* pKeyTimeSet);
-
-    void SetTicksTextScale(float fScale) { m_fTicksTextScale = fScale; }
-    float GetTicksTextScale() const { return m_fTicksTextScale; }
-
-    void SetTrackingSnapToFrames(bool bEnable) { m_bTrackingSnapToFrames = bEnable; }
-
-    enum MarkerStyle
-    {
-        MARKER_STYLE_SECONDS,
-        MARKER_STYLE_FRAMES
-    };
-    void SetMarkerStyle(MarkerStyle markerStyle);
-    void SetFPS(float fps); // Only referred to if MarkerStyle == MARKER_STYLE_FRAMES.
-    float GetFPS() const
-    {
-        return m_fps;
-    }
-
-    void SetPlayCallback(const std::function<void()>& callback);
-
-Q_SIGNALS:
-    void deleteRequested();
-    void clicked();
-
-    void startChange();
-    void change();
-    void endChange();
-
-protected:
-    enum TrackingMode
-    {
-        TRACKING_MODE_NONE,
-        TRACKING_MODE_SET_TIME,
-        TRACKING_MODE_MOVE_KEYS,
-        TRACKING_MODE_SELECTION_RANGE
-    };
-
-    int HitKeyTimes(const QPoint& point);
-    void MoveSelectedKeyTimes(float scale, float offset);
-    void SelectKeysInRange(float start, float end, bool select);
-
-    void paintEvent(QPaintEvent* event) override;
-    void resizeEvent(QResizeEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void OnLButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnLButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnRButtonDown(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void OnRButtonUp(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void keyPressEvent(QKeyEvent* event);
-
-    // Drawing functions
-    float  ClientToTime(int x);
-    int    TimeToClient(float fTime);
-
-    void DrawTicks(QPainter* painter);
-
-    Range GetVisibleRange() const;
-
-    void StartTracking(TrackingMode trackingMode);
-    void StopTracking();
-
-    QString TimeToString(float time);
-    // Convert time in seconds into the milliseconds.
-    int ToMillis(float time) { return RoundFloatToInt(time * 1000.0f); };
-    float MillisToTime(int nMillis) { return nMillis / 1000.0f; }
-    float SnapTime(float time);
-
-    void DrawSecondTicks(QPainter* dc);
-    void DrawFrameTicks(QPainter* dc);
-
-private:
-    bool m_bAutoDelete;
-    QRect m_rcClient;
-    QRect m_rcTimeline;
-    float m_fTimeMarker;
-    float m_fTicksTextScale;
-    TrackingMode m_trackingMode;
-    QPoint m_lastPoint;
-
-    Range m_timeRange;
-
-    float m_timeScale;
-
-    int m_scrollOffset;
-    int m_leftOffset;
-
-    // Tick every Nth millisecond.
-    int m_nTicksStep;
-
-    double m_ticksStep;
-
-    CWndGridHelper m_grid;
-
-    bool m_bIgnoreSetTime;
-
-    IKeyTimeSet* m_pKeyTimeSet;
-    bool m_bChangedKeyTimeSet;
-
-    MarkerStyle m_markerStyle;
-    float m_fps;
-    bool m_copyKeyTimes;
-    bool m_bTrackingSnapToFrames;
-    std::function<void()> m_playCallback;
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_TIMELINECTRL_H
diff --git a/Code/Sandbox/Editor/Controls/TreeCtrlUtils.h b/Code/Sandbox/Editor/Controls/TreeCtrlUtils.h
deleted file mode 100644
index 2ece91f07f..0000000000
--- a/Code/Sandbox/Editor/Controls/TreeCtrlUtils.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_TREECTRLUTILS_H
-#define CRYINCLUDE_EDITOR_CONTROLS_TREECTRLUTILS_H
-#pragma once
-
-#include <iterator>
-
-namespace TreeCtrlUtils
-{
-    template <typename P>
-    class TreeItemIterator
-        : public P
-    {
-    public:
-        typedef P Traits;
-
-        //iterator traits, required by STL
-        typedef ptrdiff_t difference_type;
-        typedef HTREEITEM value_type;
-        typedef HTREEITEM* pointer;
-        typedef HTREEITEM& reference;
-        typedef std::forward_iterator_tag iterator_category;
-
-        TreeItemIterator()
-            : pCtrl(0)
-            , hItem(0) {}
-        explicit TreeItemIterator(const P& traits)
-            : P(traits)
-            , pCtrl(0)
-            , hItem(0) {}
-        TreeItemIterator(const TreeItemIterator& other)
-            : P(other)
-            , pCtrl(other.pCtrl)
-            , hItem(other.hItem) {}
-        TreeItemIterator(CTreeCtrl* pCtrl, HTREEITEM hItem)
-            : pCtrl(pCtrl)
-            , hItem(hItem) {}
-        TreeItemIterator(CTreeCtrl* pCtrl, HTREEITEM hItem, const P& traits)
-            : P(traits)
-            , pCtrl(pCtrl)
-            , hItem(hItem) {}
-
-        HTREEITEM operator*() {return hItem; }
-        bool operator==(const TreeItemIterator& other) const {return pCtrl == other.pCtrl && hItem == other.hItem; }
-        bool operator!=(const TreeItemIterator& other) const {return pCtrl != other.pCtrl || hItem != other.hItem; }
-
-        TreeItemIterator& operator++()
-        {
-            HTREEITEM hNextItem = 0;
-            if (RecurseToChildren(hItem))
-            {
-                hNextItem = (pCtrl ? pCtrl->GetChildItem(hItem) : 0);
-            }
-            while (pCtrl && hItem && !hNextItem)
-            {
-                hNextItem = pCtrl->GetNextSiblingItem(hItem);
-                if (!hNextItem)
-                {
-                    hItem = pCtrl->GetParentItem(hItem);
-                }
-            }
-            hItem = hNextItem;
-
-            return *this;
-        }
-
-        TreeItemIterator operator++(int) {TreeItemIterator old = *this; ++(*this); return old; }
-
-        CTreeCtrl* pCtrl;
-        HTREEITEM hItem;
-    };
-
-    class NonRecursiveTreeItemIteratorTraits
-    {
-    public:
-        bool RecurseToChildren(HTREEITEM hItem) {return false; }
-    };
-    typedef TreeItemIterator<NonRecursiveTreeItemIteratorTraits> NonRecursiveTreeItemIterator;
-
-    class RecursiveTreeItemIteratorTraits
-    {
-    public:
-        bool RecurseToChildren(HTREEITEM hItem) {return true; }
-    };
-    typedef TreeItemIterator<RecursiveTreeItemIteratorTraits> RecursiveTreeItemIterator;
-
-    inline RecursiveTreeItemIterator BeginTreeItemsRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
-    {
-        if (hItem == 0)
-        {
-            hItem = (pCtrl ? pCtrl->GetRootItem() : 0);
-        }
-        return RecursiveTreeItemIterator(pCtrl, hItem);
-    }
-
-    inline RecursiveTreeItemIterator EndTreeItemsRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
-    {
-        HTREEITEM hEndItem = 0;
-        HTREEITEM hParent = hItem;
-        do
-        {
-            if (hParent)
-            {
-                hEndItem = pCtrl->GetNextSiblingItem(hParent);
-            }
-            hParent = (pCtrl && hParent ? pCtrl->GetParentItem(hParent) : 0);
-        }
-        while (hParent && !hEndItem);
-        return RecursiveTreeItemIterator(pCtrl, hEndItem);
-    }
-
-    inline NonRecursiveTreeItemIterator BeginTreeItemsNonRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
-    {
-        if (hItem == 0)
-        {
-            hItem = (pCtrl ? pCtrl->GetRootItem() : 0);
-        }
-        if (hItem)
-        {
-            hItem = pCtrl->GetChildItem(hItem);
-        }
-        return NonRecursiveTreeItemIterator(pCtrl, hItem);
-    }
-
-    inline NonRecursiveTreeItemIterator EndTreeItemsNonRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
-    {
-        HTREEITEM hEndItem = 0;
-        HTREEITEM hParent = 0;
-        while (hParent && !hEndItem)
-        {
-            hParent = (pCtrl && hItem ? pCtrl->GetParentItem(hItem) : 0);
-            if (hParent)
-            {
-                hEndItem = pCtrl->GetNextSiblingItem(hParent);
-            }
-        }
-        return NonRecursiveTreeItemIterator(pCtrl, hEndItem);
-    }
-
-    template <typename T, typename P>
-    class TreeItemDataIterator
-    {
-    public:
-        typedef T Type;
-        typedef TreeItemIterator<P> InternalIterator;
-
-        //iterator traits, required by STL
-        typedef ptrdiff_t difference_type;
-        typedef Type* value_type;
-        typedef Type** pointer;
-        typedef Type*& reference;
-        typedef std::forward_iterator_tag iterator_category;
-
-        TreeItemDataIterator() {}
-        TreeItemDataIterator(const TreeItemDataIterator& other)
-            : iterator(other.iterator) {AdvanceToValidIterator(); }
-        explicit TreeItemDataIterator(const InternalIterator& iterator)
-            : iterator(iterator) {AdvanceToValidIterator(); }
-
-        Type* operator*() {return reinterpret_cast<Type*>(iterator.pCtrl->GetItemData(iterator.hItem)); }
-        bool operator==(const TreeItemDataIterator& other) const {return iterator == other.iterator; }
-        bool operator!=(const TreeItemDataIterator& other) const {return iterator != other.iterator; }
-
-        HTREEITEM GetTreeItem() {return iterator.hItem; }
-
-        TreeItemDataIterator& operator++()
-        {
-            ++iterator;
-            AdvanceToValidIterator();
-            return *this;
-        }
-
-        TreeItemDataIterator operator++(int) {TreeItemDataIterator old = *this; ++(*this); return old; }
-
-    private:
-        void AdvanceToValidIterator()
-        {
-            while (iterator.pCtrl && iterator.hItem && !iterator.pCtrl->GetItemData(iterator.hItem))
-            {
-                ++iterator;
-            }
-        }
-
-        InternalIterator iterator;
-    };
-
-    template <typename T>
-    class RecursiveItemDataIteratorType
-    {
-    public: typedef TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits> type;
-    };
-    template <typename T>
-    inline TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits> BeginTreeItemDataRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
-    {
-        return TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits>(BeginTreeItemsRecursive(pCtrl, hItem));
-    }
-
-    template <typename T>
-    inline TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits> EndTreeItemDataRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
-    {
-        return TreeItemDataIterator<T, RecursiveTreeItemIteratorTraits>(EndTreeItemsRecursive(pCtrl, hItem));
-    }
-
-    template <typename T>
-    class NonRecursiveItemDataIteratorType
-    {
-        typedef TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits> type;
-    };
-    template <typename T>
-    inline TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits> BeginTreeItemDataNonRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
-    {
-        return TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits>(BeginTreeItemsNonRecursive(pCtrl, hItem));
-    }
-
-    template <typename T>
-    inline TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits> EndTreeItemDataNonRecursive(CTreeCtrl* pCtrl, HTREEITEM hItem = 0)
-    {
-        return TreeItemDataIterator<T, NonRecursiveTreeItemIteratorTraits>(EndTreeItemsNonRecursive(pCtrl, hItem));
-    }
-
-    class SelectedTreeItemIterator
-    {
-    public:
-        SelectedTreeItemIterator()
-            : pCtrl(0)
-            , hItem(0) {}
-        SelectedTreeItemIterator(const SelectedTreeItemIterator& other)
-            : pCtrl(other.pCtrl)
-            , hItem(other.hItem) {}
-        SelectedTreeItemIterator(CXTTreeCtrl* pCtrl, HTREEITEM hItem)
-            : pCtrl(pCtrl)
-            , hItem(hItem) {}
-
-        HTREEITEM operator*() {return hItem; }
-        bool operator==(const SelectedTreeItemIterator& other) const {return pCtrl == other.pCtrl && hItem == other.hItem; }
-        bool operator!=(const SelectedTreeItemIterator& other) const {return pCtrl != other.pCtrl || hItem != other.hItem; }
-
-        SelectedTreeItemIterator& operator++()
-        {
-            hItem = (pCtrl ? pCtrl->GetNextSelectedItem(hItem) : 0);
-
-            return *this;
-        }
-
-        SelectedTreeItemIterator operator++(int) {SelectedTreeItemIterator old = *this; ++(*this); return old; }
-
-        CXTTreeCtrl* pCtrl;
-        HTREEITEM hItem;
-    };
-
-    SelectedTreeItemIterator BeginSelectedTreeItems(CXTTreeCtrl* pCtrl)
-    {
-        return SelectedTreeItemIterator(pCtrl, (pCtrl ? pCtrl->GetFirstSelectedItem() : 0));
-    }
-
-    SelectedTreeItemIterator EndSelectedTreeItems(CXTTreeCtrl* pCtrl)
-    {
-        return SelectedTreeItemIterator(pCtrl, 0);
-    }
-
-    template <typename T>
-    class SelectedTreeItemDataIterator
-    {
-    public:
-        typedef T Type;
-        typedef SelectedTreeItemIterator InternalIterator;
-
-        SelectedTreeItemDataIterator() {}
-        SelectedTreeItemDataIterator(const SelectedTreeItemDataIterator& other)
-            : iterator(other.iterator) {AdvanceToValidIterator(); }
-        explicit SelectedTreeItemDataIterator(const InternalIterator& iterator)
-            : iterator(iterator) {AdvanceToValidIterator(); }
-
-        Type* operator*() {return reinterpret_cast<Type*>(iterator.pCtrl->GetItemData(iterator.hItem)); }
-        bool operator==(const SelectedTreeItemDataIterator& other) const {return iterator == other.iterator; }
-        bool operator!=(const SelectedTreeItemDataIterator& other) const {return iterator != other.iterator; }
-
-        HTREEITEM GetTreeItem() {return iterator.hItem; }
-
-        SelectedTreeItemDataIterator& operator++()
-        {
-            ++iterator;
-            AdvanceToValidIterator();
-            return *this;
-        }
-
-        SelectedTreeItemDataIterator operator++(int) {SelectedTreeItemDataIterator old = *this; ++(*this); return old; }
-
-    private:
-        void AdvanceToValidIterator()
-        {
-            while (iterator.pCtrl && iterator.hItem && !iterator.pCtrl->GetItemData(iterator.hItem))
-            {
-                ++iterator;
-            }
-        }
-
-        InternalIterator iterator;
-    };
-
-    template <typename T>
-    SelectedTreeItemDataIterator<T> BeginSelectedTreeItemData(CXTTreeCtrl* pCtrl)
-    {
-        return SelectedTreeItemDataIterator<T>(BeginSelectedTreeItems(pCtrl));
-    }
-
-    template <typename T>
-    SelectedTreeItemDataIterator<T> EndSelectedTreeItemData(CXTTreeCtrl* pCtrl)
-    {
-        return SelectedTreeItemDataIterator<T>(EndSelectedTreeItems(pCtrl));
-    }
-}
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_TREECTRLUTILS_H
diff --git a/Code/Sandbox/Editor/Controls/WndGridHelper.h b/Code/Sandbox/Editor/Controls/WndGridHelper.h
deleted file mode 100644
index df27f4dd9b..0000000000
--- a/Code/Sandbox/Editor/Controls/WndGridHelper.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_WNDGRIDHELPER_H
-#define CRYINCLUDE_EDITOR_CONTROLS_WNDGRIDHELPER_H
-#pragma once
-
-#include <QPoint>
-#include <QRect>
-#include "Cry_Vector2.h"
-
-//////////////////////////////////////////////////////////////////////////
-class CWndGridHelper
-{
-public:
-    Vec2 zoom;
-    Vec2 origin;
-    Vec2 step;
-    Vec2 pixelsPerGrid;
-    int nMajorLines;
-    QRect rect;
-    QPoint nMinPixelsPerGrid;
-    QPoint nMaxPixelsPerGrid;
-    //////////////////////////////////////////////////////////////////////////
-    QPoint firstGridLine;
-    QPoint numGridLines;
-
-    //////////////////////////////////////////////////////////////////////////
-    CWndGridHelper()
-    {
-        zoom = Vec2(1, 1);
-        step = Vec2(10, 10);
-        pixelsPerGrid = Vec2(10, 10);
-        origin = Vec2(0, 0);
-        nMajorLines = 10;
-        nMinPixelsPerGrid = QPoint(50, 10);
-        nMaxPixelsPerGrid = QPoint(100, 20);
-        firstGridLine = QPoint(0, 0);
-        numGridLines = QPoint(0, 0);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    Vec2 ClientToWorld(const QPoint& point)
-    {
-        Vec2 v;
-        v.x = (point.x() - rect.left()) / zoom.x + origin.x;
-        v.y = (point.y() - rect.top()) / zoom.y + origin.y;
-        return v;
-    }
-    //////////////////////////////////////////////////////////////////////////
-   QPoint WorldToClient(Vec2 v)
-    {
-        QPoint p(aznumeric_cast<int>(floor((v.x - origin.x) * zoom.x + 0.5f) + rect.left()),
-            aznumeric_cast<int>(floor((v.y - origin.y) * zoom.y + 0.5f) + rect.top()));
-        return p;
-    }
-
-    void SetOrigin(Vec2 neworigin)
-    {
-        origin = neworigin;
-    }
-    void SetZoom(Vec2 newzoom)
-    {
-        zoom = newzoom;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void SetZoom(Vec2 newzoom, const QPoint& center)
-    {
-        if (newzoom.x < 0.01f)
-        {
-            newzoom.x = 0.01f;
-        }
-        if (newzoom.y < 0.01f)
-        {
-            newzoom.y = 0.01f;
-        }
-
-        Vec2 prevz = zoom;
-
-        // Zoom to mouse position.
-        float ofsx = origin.x;
-        float ofsy = origin.y;
-
-        Vec2 z1 = zoom;
-        Vec2 z2 = newzoom;
-
-        zoom = newzoom;
-
-        // Calculate new offset to center zoom on mouse.
-        float x2 = aznumeric_cast<float>(center.x() - rect.left());
-        float y2 = aznumeric_cast<float>(center.y() - rect.top());
-        ofsx = -(x2 / z2.x - x2 / z1.x - ofsx);
-        ofsy = -(y2 / z2.y - y2 / z1.y - ofsy);
-        origin.x = ofsx;
-        origin.y = ofsy;
-    }
-    void CalculateGridLines()
-    {
-        pixelsPerGrid.x = zoom.x;
-        pixelsPerGrid.y = zoom.y;
-
-        step = Vec2(1.00f, 1.00f);
-        nMajorLines = 2;
-
-        int griditers;
-        if (pixelsPerGrid.x <= nMinPixelsPerGrid.x())
-        {
-            griditers = 0;
-            while (pixelsPerGrid.x <= nMinPixelsPerGrid.x() && griditers++ < 1000)
-            {
-                step.x = step.x * nMajorLines;
-                pixelsPerGrid.x = step.x * zoom.x;
-            }
-        }
-        else
-        {
-            griditers = 0;
-            while (pixelsPerGrid.x >= nMaxPixelsPerGrid.x() && griditers++ < 1000)
-            {
-                step.x = step.x / nMajorLines;
-                pixelsPerGrid.x = step.x * zoom.x;
-            }
-        }
-
-        if (pixelsPerGrid.y <= nMinPixelsPerGrid.y())
-        {
-            griditers = 0;
-            while (pixelsPerGrid.y <= nMinPixelsPerGrid.y() && griditers++ < 1000)
-            {
-                step.y = step.y * nMajorLines;
-                pixelsPerGrid.y = step.y * zoom.y;
-            }
-        }
-        else
-        {
-            griditers = 0;
-            while (pixelsPerGrid.y >= nMaxPixelsPerGrid.y() && griditers++ < 1000)
-            {
-                step.y = step.y / nMajorLines;
-                pixelsPerGrid.y = step.y * zoom.y;
-            }
-        }
-
-        firstGridLine.rx() = aznumeric_cast<int>(origin.x / step.x);
-        firstGridLine.ry() = aznumeric_cast<int>(origin.y / step.y);
-
-        numGridLines.rx() = aznumeric_cast<int>((rect.width() / zoom.x) / step.x + 1);
-        numGridLines.ry() = aznumeric_cast<int>((rect.height() / zoom.y) / step.y + 1);
-    }
-    int GetGridLineX(int nGridLineX) const
-    {
-        return aznumeric_cast<int>(floor((nGridLineX * step.x - origin.x) * zoom.x + 0.5f));
-    }
-    int GetGridLineY(int nGridLineY) const
-    {
-        return aznumeric_cast<int>(floor((nGridLineY * step.y - origin.y) * zoom.y + 0.5f));
-    }
-    float GetGridLineXValue(int nGridLineX) const
-    {
-        return (nGridLineX * step.x);
-    }
-    float GetGridLineYValue(int nGridLineY) const
-    {
-        return (nGridLineY * step.y);
-    }
-};
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_WNDGRIDHELPER_H
diff --git a/Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp b/Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp
deleted file mode 100644
index ddbd0352cf..0000000000
--- a/Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "EditorMetricsPlainTextNameRegistration.h"
-
-namespace Editor
-{
-
-EditorMetricsPlainTextNameRegistrationBusListener::EditorMetricsPlainTextNameRegistrationBusListener()
-{
-    AzFramework::MetricsPlainTextNameRegistrationBus::Handler::BusConnect();
-}
-
-EditorMetricsPlainTextNameRegistrationBusListener::~EditorMetricsPlainTextNameRegistrationBusListener()
-{
-    AzFramework::MetricsPlainTextNameRegistrationBus::Handler::BusDisconnect();
-}
-
-void EditorMetricsPlainTextNameRegistrationBusListener::RegisterForNameSending(const AZStd::vector<AZ::Uuid>& typeIdsThatCanBeSentAsPlainText)
-{
-    m_registeredTypeIds.insert(typeIdsThatCanBeSentAsPlainText.begin(), typeIdsThatCanBeSentAsPlainText.end());
-}
-
-bool EditorMetricsPlainTextNameRegistrationBusListener::IsTypeRegisteredForNameSending(const AZ::Uuid& typeId)
-{
-    return (m_registeredTypeIds.find(typeId) != m_registeredTypeIds.end());
-}
-
-} // namespace editor
diff --git a/Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.h b/Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.h
deleted file mode 100644
index 98e12c0325..0000000000
--- a/Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Metrics/MetricsPlainTextNameRegistration.h>
-#include <AzCore/std/containers/set.h>
-
-namespace Editor
-{
-    class EditorMetricsPlainTextNameRegistrationBusListener : public AzFramework::MetricsPlainTextNameRegistrationBus::Handler
-    {
-    public:
-        EditorMetricsPlainTextNameRegistrationBusListener();
-        virtual ~EditorMetricsPlainTextNameRegistrationBusListener();
-
-        void RegisterForNameSending(const AZStd::vector<AZ::Uuid>& typeIdsThatCanBeSentAsPlainText) override;
-
-        bool IsTypeRegisteredForNameSending(const AZ::Uuid& typeId) override;
-
-    private:
-        AZStd::set<AZ::Uuid> m_registeredTypeIds;
-    };
-
-} // namespace editor
diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
deleted file mode 100644
index 64d57d8baf..0000000000
--- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
+++ /dev/null
@@ -1,1289 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-// Editor
-#include "Resource.h"
-#include "LevelEditorMenuHandler.h"
-#include "CryEdit.h"
-#include "MainWindow.h"
-#include "QtViewPaneManager.h"
-#include "ToolBox.h"
-#include "Include/IObjectManager.h"
-#include "Objects/SelectionGroup.h"
-#include "ViewManager.h"
-
-#include <AzCore/Interface/Interface.h>
-
-// Qt
-#include <QMenuBar>
-#include <QUrlQuery>
-#include <QDesktopServices>
-#include <QHBoxLayout>
-#include <QUrl>
-
-// AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/SearchLineEdit.h>
-
-using namespace AZ;
-using namespace AzToolsFramework;
-
-static const char* const s_LUAEditorName = "Lua Editor";
-static const char* const s_shortTimeInterval = "debug";
-static const char* const s_assetImporterMetricsIdentifier = "AssetImporter";
-
-// top level menu ids
-static const char* const s_fileMenuId = "FileMenu";
-static const char* const s_editMenuId = "EditMenu";
-static const char* const s_gameMenuId = "GameMenu";
-static const char* const s_toolMenuId = "ToolMenu";
-static const char* const s_viewMenuId = "ViewMenu";
-static const char* const s_awsMenuId = "AwsMenu";
-static const char* const s_helpMenuId = "HelpMenu";
-
-static bool CompareLayoutNames(const QString& name1, const QString& name2)
-{
-    return name1.compare(name2, Qt::CaseInsensitive) < 0;
-}
-
-static void AddOpenViewPaneAction(ActionManager::MenuWrapper& menu, const char* viewPaneName, const char* menuActionText = nullptr)
-{
-    QAction* action = menu->addAction(QObject::tr(menuActionText ? menuActionText : viewPaneName));
-    QObject::connect(action, &QAction::triggered, action, [viewPaneName]()
-        {
-            QtViewPaneManager::instance()->OpenPane(viewPaneName);
-        });
-}
-
-namespace
-{
-    // This helper allows us to watch editor notifications to control action enable states
-    class EditorListener
-        : public QObject
-        , public IEditorNotifyListener
-    {
-    public:
-        explicit EditorListener(QObject* parent, AZStd::function<void(EEditorNotifyEvent)> trigger)
-            : QObject(parent)
-            , m_trigger(trigger)
-        {}
-
-        virtual ~EditorListener()
-        {
-            GetIEditor()->UnregisterNotifyListener(this);
-        }
-
-        void OnEditorNotifyEvent(EEditorNotifyEvent event)
-        {
-            m_trigger(event);
-        }
-
-    private:
-        AZStd::function<void(EEditorNotifyEvent)> m_trigger;
-    };
-
-    void DisableActionWhileLevelChanges(QAction* action, EEditorNotifyEvent e)
-    {
-        if (e == eNotify_OnBeginNewScene || e == eNotify_OnBeginLoad)
-        {
-            action->setDisabled(true);
-        }
-        else if (e == eNotify_OnEndNewScene || e == eNotify_OnEndLoad)
-        {
-            action->setDisabled(false);
-        }
-    }
-
-    void HideActionWhileEntitiesDeselected(QAction* action, EEditorNotifyEvent editorNotifyEvent)
-    {
-        if (action == nullptr)
-        {
-            return;
-        }
-
-        switch (editorNotifyEvent)
-        {
-        case eNotify_OnEntitiesDeselected:
-        {
-            action->setVisible(false);
-            break;
-        }
-        case eNotify_OnEntitiesSelected:
-        {
-            action->setVisible(true);
-            break;
-        }
-        default:
-            break;
-        }
-    }
-
-    void DisableActionWhileInSimMode(QAction* action, EEditorNotifyEvent editorNotifyEvent)
-    {
-        if (action == nullptr)
-        {
-            return;
-        }
-
-        switch (editorNotifyEvent)
-        {
-        case eNotify_OnBeginSimulationMode:
-        {
-            action->setVisible(false);
-            action->setDisabled(true);
-            break;
-        }
-        case eNotify_OnEndSimulationMode:
-        {
-            action->setVisible(true);
-            action->setDisabled(false);
-            break;
-        }
-        default:
-            break;
-        }
-    }
-}
-
-LevelEditorMenuHandler::LevelEditorMenuHandler(
-    MainWindow* mainWindow, QtViewPaneManager* const viewPaneManager, QSettings& settings)
-    : QObject(mainWindow)
-    , m_mainWindow(mainWindow)
-    , m_viewPaneManager(viewPaneManager)
-    , m_actionManager(mainWindow->GetActionManager())
-    , m_settings(settings)
-{
-#if defined(AZ_PLATFORM_MAC)
-    // Hide the non-native toolbar, then setNativeMenuBar to ensure it is always visible on macOS.
-    m_mainWindow->menuBar()->hide();
-    m_mainWindow->menuBar()->setNativeMenuBar(true);
-#endif
-
-    ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
-        AzToolsFramework::GetEntityContextId());
-    EditorMenuRequestBus::Handler::BusConnect();
-}
-
-LevelEditorMenuHandler::~LevelEditorMenuHandler()
-{
-    EditorMenuRequestBus::Handler::BusDisconnect();
-    ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
-}
-
-void LevelEditorMenuHandler::Initialize()
-{
-    // make sure we can fix the view menus
-    connect(
-        m_viewPaneManager, &QtViewPaneManager::registeredPanesChanged,
-        this, &LevelEditorMenuHandler::ResetToolsMenus);
-
-    m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-
-    m_topLevelMenus << CreateFileMenu();
-
-    auto editMenu = CreateEditMenu();
-    auto editMenuWrapper = ActionManager::MenuWrapper(editMenu, m_actionManager);
-    PopulateEditMenu(editMenuWrapper);
-
-    m_editmenu = editMenu;
-
-    m_topLevelMenus << editMenu;
-    m_topLevelMenus << CreateGameMenu();
-    m_topLevelMenus << CreateToolsMenu();
-    m_topLevelMenus << CreateViewMenu();
-    m_topLevelMenus << CreateHelpMenu();
-
-    // have to do this after creating the AWS Menu for the first time
-    ResetToolsMenus();
-
-    // Add our menus to the main window menu bar
-    QMenuBar* menuBar = m_mainWindow->menuBar();
-    menuBar->clear();
-    for (QMenu* menu : m_topLevelMenus)
-    {
-        menuBar->addMenu(menu);
-    }
-}
-
-bool LevelEditorMenuHandler::MRUEntryIsValid(const QString& entry, const QString& gameFolderPath)
-{
-    if (entry.isEmpty())
-    {
-        return false;
-    }
-
-    QFileInfo info(entry);
-    if (!info.exists())
-    {
-        return false;
-    }
-
-    if (!entry.endsWith(m_levelExtension))
-    {
-        return false;
-    }
-
-    const QDir gameDir(gameFolderPath);
-    QDir dir(entry); // actually pointing at file, first cdUp() gets us the parent dir
-    while (dir.cdUp())
-    {
-        if (dir == gameDir)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void LevelEditorMenuHandler::IncrementViewPaneVersion()
-{
-    m_viewPaneVersion++;
-}
-
-int LevelEditorMenuHandler::GetViewPaneVersion() const
-{
-    return m_viewPaneVersion;
-}
-
-void LevelEditorMenuHandler::UpdateViewLayoutsMenu(ActionManager::MenuWrapper& layoutsMenu)
-{
-    if (layoutsMenu.isNull())
-    {
-        return;
-    }
-
-    QStringList layoutNames = m_viewPaneManager->LayoutNames();
-    std::sort(layoutNames.begin(), layoutNames.end(), CompareLayoutNames);
-    layoutsMenu->clear();
-    const int MAX_LAYOUTS = ID_VIEW_LAYOUT_LAST - ID_VIEW_LAYOUT_FIRST + 1;
-
-    // Component entity layout is the default
-    QString componentLayoutLabel = tr("Component Entity Layout");
-    QAction* componentLayoutAction = layoutsMenu->addAction(componentLayoutLabel);
-    connect(componentLayoutAction, &QAction::triggered, this, &LevelEditorMenuHandler::LoadComponentLayout);
-
-    layoutsMenu.AddSeparator();
-
-    for (int i = 0; i < layoutNames.size() && i <= MAX_LAYOUTS; i++)
-    {
-        const QString layoutName = layoutNames[i];
-        QAction* action = layoutsMenu->addAction(layoutName);
-        QMenu* subSubMenu = new QMenu();
-
-        QAction* subSubAction = subSubMenu->addAction(tr("Load"));
-        connect(subSubAction, &QAction::triggered, this, [layoutName, this]() { m_mainWindow->ViewLoadPaneLayout(layoutName); });
-
-        subSubAction = subSubMenu->addAction(tr("Save"));
-        connect(subSubAction, &QAction::triggered, this, [layoutName, this]() { m_mainWindow->ViewSavePaneLayout(layoutName); });
-
-        subSubAction = subSubMenu->addAction(tr("Rename..."));
-        connect(subSubAction, &QAction::triggered, this, [layoutName, this]() { m_mainWindow->ViewRenamePaneLayout(layoutName); });
-
-        subSubAction = subSubMenu->addAction(tr("Delete"));
-        connect(subSubAction, &QAction::triggered, this, [layoutName, this]() { m_mainWindow->ViewDeletePaneLayout(layoutName); });
-
-        action->setMenu(subSubMenu);
-    }
-
-    layoutsMenu.AddAction(ID_VIEW_SAVELAYOUT);
-
-    layoutsMenu.AddAction(ID_VIEW_LAYOUT_LOAD_DEFAULT);
-}
-
-void LevelEditorMenuHandler::ResetToolsMenus()
-{
-    if (!m_toolsMenu->isEmpty())
-    {
-        // Clear everything from the Tools menu
-        m_toolsMenu->clear();
-        AzToolsFramework::EditorMenuNotificationBus::Broadcast(&AzToolsFramework::EditorMenuNotificationBus::Handler::OnResetToolMenuItems);
-    }
-
-    QtViewPanes allRegisteredViewPanes = QtViewPaneManager::instance()->GetRegisteredPanes();
-
-    QMap<QString, QList<QtViewPane*> > menuMap;
-
-    CreateMenuMap(menuMap, allRegisteredViewPanes);
-
-    CreateMenuOptions(&menuMap, m_toolsMenu, LyViewPane::CategoryTools);
-
-    AzToolsFramework::EditorMenuNotificationBus::Broadcast(&AzToolsFramework::EditorMenuNotificationBus::Handler::OnPopulateToolMenuItems);
-
-    m_toolsMenu.AddSeparator();
-
-    // Other
-    auto otherSubMenu = m_toolsMenu.AddMenu(QObject::tr("Other"));
-
-    CreateMenuOptions(&menuMap, otherSubMenu, LyViewPane::CategoryOther);
-
-    m_toolsMenu.AddSeparator();
-
-    // Optional Sub Menus
-    if (!menuMap.isEmpty())
-    {
-        QMap<QString, QList<QtViewPane*> >::iterator it = menuMap.begin();
-
-        while (it != menuMap.end())
-        {
-            auto currentSubMenu = m_toolsMenu.AddMenu(it.key());
-            CreateMenuOptions(&menuMap, currentSubMenu, it.key().toStdString().c_str());
-
-            it = menuMap.begin();
-        }
-    }
-}
-
-QMenu* LevelEditorMenuHandler::CreateFileMenu()
-{
-    auto fileMenu = m_actionManager->AddMenu(tr("&File"), s_fileMenuId);
-    connect(fileMenu, &QMenu::aboutToShow, this, &LevelEditorMenuHandler::OnUpdateOpenRecent);
-
-    // New level
-    auto fileNew = fileMenu.AddAction(ID_FILE_NEW);
-    GetIEditor()->RegisterNotifyListener(new EditorListener(fileNew, [fileNew](EEditorNotifyEvent e)
-    {
-        DisableActionWhileLevelChanges(fileNew, e);
-    }));
-
-    // Open level...
-    auto fileOpenLevel = fileMenu.AddAction(ID_FILE_OPEN_LEVEL);
-    GetIEditor()->RegisterNotifyListener(new EditorListener(fileOpenLevel, [fileOpenLevel](EEditorNotifyEvent e)
-    {
-        DisableActionWhileLevelChanges(fileOpenLevel, e);
-    }));
-
-#ifdef ENABLE_SLICE_EDITOR
-    // New slice
-    auto fileNewSlice = fileMenu.AddAction(ID_FILE_NEW_SLICE);
-    GetIEditor()->RegisterNotifyListener(new EditorListener(fileNewSlice, [fileNewSlice](EEditorNotifyEvent e)
-    {
-        DisableActionWhileLevelChanges(fileNewSlice, e);
-    }));
-
-    // Open slice...
-    auto fileOpenSlice = fileMenu.AddAction(ID_FILE_OPEN_SLICE);
-    GetIEditor()->RegisterNotifyListener(new EditorListener(fileOpenSlice, [fileOpenSlice](EEditorNotifyEvent e)
-    {
-        DisableActionWhileLevelChanges(fileOpenSlice, e);
-    }));
-#endif
-
-    // Save Selected Slice
-    auto saveSelectedSlice = fileMenu.AddAction(ID_FILE_SAVE_SELECTED_SLICE);
-    saveSelectedSlice->setVisible(false);
-    GetIEditor()->RegisterNotifyListener(new EditorListener(saveSelectedSlice, [saveSelectedSlice](EEditorNotifyEvent e)
-    {
-        HideActionWhileEntitiesDeselected(saveSelectedSlice, e);
-    }));
-
-    // Save Slice to Root
-    auto saveSliceToRoot = fileMenu.AddAction(ID_FILE_SAVE_SLICE_TO_ROOT);
-    saveSliceToRoot->setVisible(false);
-    GetIEditor()->RegisterNotifyListener(new EditorListener(saveSliceToRoot, [saveSliceToRoot](EEditorNotifyEvent e)
-    {
-        HideActionWhileEntitiesDeselected(saveSliceToRoot, e);
-    }));
-
-    // Open Recent
-    m_mostRecentLevelsMenu = fileMenu.AddMenu(tr("Open Recent"));
-    connect(m_mostRecentLevelsMenu, &QMenu::aboutToShow, this, &LevelEditorMenuHandler::UpdateMRUFiles);
-
-    OnUpdateOpenRecent();
-
-    // Import...
-    auto assetImporterMenu = fileMenu.Get()->addAction(tr("Import..."));
-    connect(assetImporterMenu, &QAction::triggered, this, &LevelEditorMenuHandler::ActivateAssetImporter);
-
-    fileMenu.AddSeparator();
-
-    // Save
-    fileMenu.AddAction(ID_FILE_SAVE_LEVEL);
-
-    // Save As...
-    fileMenu.AddAction(ID_FILE_SAVE_AS);
-
-    // Save Level Statistics
-    fileMenu.AddAction(ID_TOOLS_LOGMEMORYUSAGE);
-    fileMenu.AddSeparator();
-
-    // Project Settings
-    fileMenu.AddAction(ID_FILE_PROJECT_MANAGER_SETTINGS);
-
-    // Platform Settings - Project Settings Tool
-    // Shortcut must be set while adding the action otherwise it doesn't work
-    fileMenu.Get()->addAction(
-        tr(LyViewPane::ProjectSettingsTool),
-        []() { QtViewPaneManager::instance()->OpenPane(LyViewPane::ProjectSettingsTool); },
-        tr("Ctrl+Shift+P"));
-
-    fileMenu.AddSeparator();
-    fileMenu.AddAction(ID_FILE_PROJECT_MANAGER_NEW);
-    fileMenu.AddAction(ID_FILE_PROJECT_MANAGER_OPEN);
-    fileMenu.AddSeparator();
-
-    // NEWMENUS: NEEDS IMPLEMENTATION
-    // should have the equivalent of a Close here; it should be close the current slice, but the editor isn't slice based right now
-    // so that won't work.
-    // instead, it should be Close of the level, but we don't have that either. I'm leaving it here so that it's obvious where UX intended it
-    // to go
-    //fileMenu.AddAction(ID_FILE_CLOSE);
-
-    // Show Log File
-    fileMenu.AddAction(ID_FILE_EDITLOGFILE);
-
-    fileMenu.AddSeparator();
-
-    fileMenu.AddAction(ID_FILE_RESAVESLICES);
-
-    fileMenu.AddSeparator();
-
-    fileMenu.AddAction(ID_APP_EXIT);
-
-    return fileMenu;
-}
-
-void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMenu)
-{
-    // Undo
-    editMenu.AddAction(ID_UNDO);
-
-    // Redo
-    editMenu.AddAction(ID_REDO);
-
-    editMenu.AddSeparator();
-
-    // NEWMENUS: NEEDS IMPLEMENTATION
-    // Not quite ready for these yet. Have to register them with the ActionManager in MainWindow.cpp when we're ready
-    // editMenu->addAction(ID_EDIT_CUT);
-    // editMenu->addAction(ID_EDIT_COPY);
-    // editMenu->addAction(ID_EDIT_PASTE);
-    // editMenu.AddSeparator();
-
-    // Duplicate
-    editMenu.AddAction(ID_EDIT_CLONE);
-
-    // Delete
-    editMenu.AddAction(ID_EDIT_DELETE);
-
-    editMenu.AddSeparator();
-
-    // Select All
-    editMenu.AddAction(ID_EDIT_SELECTALL);
-
-    // Invert Selection
-    editMenu.AddAction(ID_EDIT_INVERTSELECTION);
-
-    editMenu.AddSeparator();
-
-    // New Viewport Interaction Model actions/shortcuts
-    editMenu.AddAction(ID_EDIT_PIVOT);
-    editMenu.AddAction(ID_EDIT_RESET);
-    editMenu.AddAction(ID_EDIT_RESET_MANIPULATOR);
-    editMenu.AddAction(ID_EDIT_RESET_LOCAL);
-    editMenu.AddAction(ID_EDIT_RESET_WORLD);
-
-    // Hide Selection
-    editMenu.AddAction(ID_EDIT_HIDE);
-
-    // Unhide All
-    editMenu.AddAction(ID_EDIT_UNHIDEALL);
-
-    /*
-     * The following block of code is part of the feature "Isolation Mode" and is temporarily
-     * disabled for 1.10 release.
-     * Jira: LY-49532
-
-    // Isolate Selected
-    QAction* isolateSelectedAction = editMenu->addAction(tr("Isolate Selected"));
-    connect(isolateSelectedAction, &QAction::triggered, this, []() {
-        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::EnterEditorIsolationMode);
-    });
-
-    // Exit Isolation
-    QAction* exitIsolationAction = editMenu->addAction(tr("Exit Isolation"));
-    connect(exitIsolationAction, &QAction::triggered, this, []() {
-        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::ExitEditorIsolationMode);
-    });
-
-    connect(editMenu, &QMenu::aboutToShow, this, [isolateSelectedAction, exitIsolationAction]() {
-        bool isInIsolationMode = false;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(isInIsolationMode, &AzToolsFramework::ToolsApplicationRequestBus::Events::IsEditorInIsolationMode);
-        if (isInIsolationMode)
-        {
-            isolateSelectedAction->setDisabled(true);
-            exitIsolationAction->setDisabled(false);
-        }
-        else
-        {
-            isolateSelectedAction->setDisabled(false);
-            exitIsolationAction->setDisabled(true);
-        }
-    });
-
-    */
-
-    editMenu.AddSeparator();
-
-    // Modify Menu
-    auto modifyMenu = editMenu.AddMenu(tr("&Modify"));
-
-    auto snapMenu = modifyMenu.AddMenu(tr("Snap"));
-
-    snapMenu.AddAction(ID_SNAPANGLE);
-
-    auto transformModeMenu = modifyMenu.AddMenu(tr("Transform Mode"));
-    transformModeMenu.AddAction(ID_EDITMODE_MOVE);
-    transformModeMenu.AddAction(ID_EDITMODE_ROTATE);
-    transformModeMenu.AddAction(ID_EDITMODE_SCALE);
-
-    editMenu.AddSeparator();
-
-    // Editor Settings
-    auto editorSettingsMenu = editMenu.AddMenu(tr("Editor Settings"));
-
-    // Global Preferences...
-    editorSettingsMenu.AddAction(ID_TOOLS_PREFERENCES);
-
-    // Graphics Settings...
-    editorSettingsMenu.AddAction(ID_GRAPHICS_SETTINGS);
-
-    // Editor Settings Manager
-    AddOpenViewPaneAction(editorSettingsMenu, LyViewPane::EditorSettingsManager);
-
-    // Graphics Performance
-    auto graphicPerformanceSubMenu = editorSettingsMenu.AddMenu(QObject::tr("Graphics Performance"));
-
-    auto pcMenu = graphicPerformanceSubMenu.AddMenu(tr("PC"));
-    pcMenu.AddAction(ID_GAME_PC_ENABLEVERYHIGHSPEC);
-    pcMenu.AddAction(ID_GAME_PC_ENABLEHIGHSPEC);
-    pcMenu.AddAction(ID_GAME_PC_ENABLEMEDIUMSPEC);
-    pcMenu.AddAction(ID_GAME_PC_ENABLELOWSPEC);
-
-    auto osxmetalMenu = graphicPerformanceSubMenu.AddMenu(tr("OSX Metal"));
-    osxmetalMenu.AddAction(ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC);
-    osxmetalMenu.AddAction(ID_GAME_OSXMETAL_ENABLEHIGHSPEC);
-    osxmetalMenu.AddAction(ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC);
-    osxmetalMenu.AddAction(ID_GAME_OSXMETAL_ENABLELOWSPEC);
-
-    auto androidMenu = graphicPerformanceSubMenu.AddMenu(tr("Android"));
-    androidMenu.AddAction(ID_GAME_ANDROID_ENABLEVERYHIGHSPEC);
-    androidMenu.AddAction(ID_GAME_ANDROID_ENABLEHIGHSPEC);
-    androidMenu.AddAction(ID_GAME_ANDROID_ENABLEMEDIUMSPEC);
-    androidMenu.AddAction(ID_GAME_ANDROID_ENABLELOWSPEC);
-
-    auto iosMenu = graphicPerformanceSubMenu.AddMenu(tr("iOS"));
-    iosMenu.AddAction(ID_GAME_IOS_ENABLEVERYHIGHSPEC);
-    iosMenu.AddAction(ID_GAME_IOS_ENABLEHIGHSPEC);
-    iosMenu.AddAction(ID_GAME_IOS_ENABLEMEDIUMSPEC);
-    iosMenu.AddAction(ID_GAME_IOS_ENABLELOWSPEC);
-
-#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)\
-    auto publicname##Menu = graphicPerformanceSubMenu.AddMenu(tr(PublicAuxName2));\
-    publicname##Menu.AddAction(ID_GAME_##CODENAME##_ENABLEHIGHSPEC);\
-    publicname##Menu.AddAction(ID_GAME_##CODENAME##_ENABLEMEDIUMSPEC);\
-    publicname##Menu.AddAction(ID_GAME_##CODENAME##_ENABLELOWSPEC);
-    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-
-    // Keyboard Customization
-    auto keyboardCustomizationMenu = editorSettingsMenu.AddMenu(tr("Keyboard Customization"));
-    keyboardCustomizationMenu.AddAction(ID_TOOLS_CUSTOMIZEKEYBOARD);
-    keyboardCustomizationMenu.AddAction(ID_TOOLS_EXPORT_SHORTCUTS);
-    keyboardCustomizationMenu.AddAction(ID_TOOLS_IMPORT_SHORTCUTS);
-}
-
-QMenu* LevelEditorMenuHandler::CreateEditMenu()
-{
-    return m_actionManager->AddMenu(tr("&Edit"), s_editMenuId);
-}
-
-QMenu* LevelEditorMenuHandler::CreateGameMenu()
-{
-    auto gameMenu = m_actionManager->AddMenu(tr("&Game"), s_gameMenuId);
-
-    // Play Game
-    gameMenu.AddAction(ID_VIEW_SWITCHTOGAME);
-
-    // Enable Physics/AI
-    gameMenu.AddAction(ID_SWITCH_PHYSICS);
-    gameMenu.AddSeparator();
-
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-    if (!usePrefabSystemForLevels)
-    {
-        // Export to Engine
-        gameMenu.AddAction(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE);
-    }
-
-    // Export Selected Objects
-    gameMenu.AddAction(ID_FILE_EXPORT_SELECTEDOBJECTS);
-
-    // Export Occlusion Mesh
-    gameMenu.AddAction(ID_FILE_EXPORTOCCLUSIONMESH);
-
-    gameMenu.AddSeparator();
-
-    // Synchronize Player with Camera
-    gameMenu.AddAction(ID_GAME_SYNCPLAYER);
-
-    gameMenu.AddSeparator();
-
-    // Audio
-    auto audioMenu = gameMenu.AddMenu(tr("Audio"));
-
-    // Stop All Sounds
-    audioMenu.AddAction(ID_SOUND_STOPALLSOUNDS);
-
-    // Refresh Audio
-    audioMenu.AddAction(ID_AUDIO_REFRESH_AUDIO_SYSTEM);
-
-    gameMenu.AddSeparator();
-
-    CreateDebuggingSubMenu(gameMenu);
-
-    return gameMenu;
-}
-
-QMenu* LevelEditorMenuHandler::CreateToolsMenu()
-{
-    // Tools
-    m_toolsMenu = m_actionManager->AddMenu(tr("&Tools"), s_toolMenuId);
-    return m_toolsMenu;
-}
-
-QMenu* LevelEditorMenuHandler::CreateViewMenu()
-{
-    auto viewMenu = m_actionManager->AddMenu(tr("&View"), s_viewMenuId);
-
-    // NEWMENUS: NEEDS IMPLEMENTATION
-    // minimize window - Ctrl+M
-    // Zoom - Ctrl+Plus(+) -> Need the inverse too?
-
-#ifdef FEATURE_ORTHOGRAPHIC_VIEW
-    // Cycle Viewports
-    viewMenu.AddAction(ID_VIEW_CYCLE2DVIEWPORT);
-#endif
-
-    // Center on Selection
-    viewMenu.AddAction(ID_MODIFY_GOTO_SELECTION);
-
-    // Show Quick Access Bar
-    viewMenu.AddAction(ID_OPEN_QUICK_ACCESS_BAR);
-
-    // Layouts
-    if (CViewManager::IsMultiViewportEnabled()) // Only supports 1 viewport for now.
-    {
-        // Disable Layouts menu
-        m_layoutsMenu = viewMenu.AddMenu(tr("Layouts"));
-        connect(m_viewPaneManager, &QtViewPaneManager::savedLayoutsChanged, this, [this]()
-            {
-                UpdateViewLayoutsMenu(m_layoutsMenu);
-            });
-
-        UpdateViewLayoutsMenu(m_layoutsMenu);
-    }
-
-    // Viewport
-    auto viewportViewsMenuWrapper = viewMenu.AddMenu(tr("Viewport"));
-
-#ifdef FEATURE_ORTHOGRAPHIC_VIEW
-    auto viewportTypesMenuWrapper = viewportViewsMenuWrapper.AddMenu(tr("Viewport Type"));
-
-    m_viewportViewsMenu = viewportViewsMenuWrapper;
-    connect(viewportTypesMenuWrapper, &QMenu::aboutToShow, this, &LevelEditorMenuHandler::UpdateOpenViewPaneMenu);
-
-    InitializeViewPaneMenu(m_actionManager, viewportTypesMenuWrapper, [](const QtViewPane& view)
-        {
-            return view.IsViewportPane();
-        });
-
-    viewportViewsMenuWrapper.AddSeparator();
-
-#endif
-
-    if (CViewManager::IsMultiViewportEnabled())
-    {
-        viewportViewsMenuWrapper.AddAction(ID_VIEW_CONFIGURELAYOUT);
-    }
-    viewportViewsMenuWrapper.AddSeparator();
-
-    viewportViewsMenuWrapper.AddAction(ID_DISPLAY_GOTOPOSITION);
-    viewportViewsMenuWrapper.AddAction(ID_MODIFY_GOTO_SELECTION);
-
-    auto gotoLocationMenu = viewportViewsMenuWrapper.AddMenu(tr("Go to Location"));
-    gotoLocationMenu.AddAction(ID_GOTO_LOC1);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC2);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC3);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC4);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC5);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC6);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC7);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC8);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC9);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC10);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC11);
-    gotoLocationMenu.AddAction(ID_GOTO_LOC12);
-
-    auto rememberLocationMenu = viewportViewsMenuWrapper.AddMenu(tr("Remember Location"));
-    rememberLocationMenu.AddAction(ID_TAG_LOC1);
-    rememberLocationMenu.AddAction(ID_TAG_LOC2);
-    rememberLocationMenu.AddAction(ID_TAG_LOC3);
-    rememberLocationMenu.AddAction(ID_TAG_LOC4);
-    rememberLocationMenu.AddAction(ID_TAG_LOC5);
-    rememberLocationMenu.AddAction(ID_TAG_LOC6);
-    rememberLocationMenu.AddAction(ID_TAG_LOC7);
-    rememberLocationMenu.AddAction(ID_TAG_LOC8);
-    rememberLocationMenu.AddAction(ID_TAG_LOC9);
-    rememberLocationMenu.AddAction(ID_TAG_LOC10);
-    rememberLocationMenu.AddAction(ID_TAG_LOC11);
-    rememberLocationMenu.AddAction(ID_TAG_LOC12);
-
-    viewportViewsMenuWrapper.AddSeparator();
-
-    auto switchCameraMenu = viewportViewsMenuWrapper.AddMenu(tr("Switch Camera"));
-    switchCameraMenu.AddAction(ID_SWITCHCAMERA_DEFAULTCAMERA);
-    switchCameraMenu.AddAction(ID_SWITCHCAMERA_SEQUENCECAMERA);
-    switchCameraMenu.AddAction(ID_SWITCHCAMERA_SELECTEDCAMERA);
-    switchCameraMenu.AddAction(ID_SWITCHCAMERA_NEXT);
-
-    // NEWMENUS:
-    // MISSING AVIRECORDER
-
-    viewportViewsMenuWrapper.AddSeparator();
-    viewportViewsMenuWrapper.AddAction(ID_DISPLAY_SHOWHELPERS);
-
-    // Refresh Style
-    viewMenu.AddAction(ID_SKINS_REFRESH);
-
-    return viewMenu;
-}
-
-QMenu* LevelEditorMenuHandler::CreateHelpMenu()
-{
-    // Help
-    auto helpMenu = m_actionManager->AddMenu(tr("&Help"), s_helpMenuId);
-
-    auto lineEditSearchAction = new QWidgetAction(m_mainWindow);
-    auto containerWidget = new QWidget(m_mainWindow);
-    auto lineEdit = new AzQtComponents::SearchLineEdit(m_mainWindow);
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(lineEdit);
-    containerWidget->setLayout(layout);
-    containerWidget->setContentsMargins(2, 0, 2, 0);
-    lineEdit->setPlaceholderText(tr("Search documentation"));
-    lineEditSearchAction->setDefaultWidget(containerWidget);
-
-    auto searchAction = [lineEdit]()
-        {
-            auto text = lineEdit->text();
-            if (text.isEmpty())
-            {
-                QDesktopServices::openUrl(QUrl("https://o3de.org/docs/"));
-            }
-            else
-            {
-                static const int versionStringSize = 128;
-                char productVersionString[versionStringSize];
-                const SFileVersion& productVersion = gEnv->pSystem->GetProductVersion();
-                productVersion.ToString(productVersionString, versionStringSize);
-
-                QUrl docSearchUrl("https://o3de.org/docs/");
-                QUrlQuery docSearchQuery;
-                docSearchQuery.addQueryItem("query", text);
-                docSearchUrl.setQuery(docSearchQuery);
-                QDesktopServices::openUrl(docSearchUrl);
-            }
-            lineEdit->clear();
-        };
-    connect(lineEdit, &QLineEdit::returnPressed, this, searchAction);
-    connect(helpMenu.Get(), &QMenu::aboutToHide, lineEdit, &QLineEdit::clear);
-    connect(helpMenu.Get(), &QMenu::aboutToShow, lineEdit, &QLineEdit::clearFocus);
-    helpMenu->addAction(lineEditSearchAction);
-
-    // Tutorials
-    helpMenu.AddAction(ID_DOCUMENTATION_TUTORIALS);
-
-    // Documentation
-    auto documentationMenu = helpMenu.AddMenu(tr("Documentation"));
-
-    // Open 3D Engine Documentation
-    documentationMenu.AddAction(ID_DOCUMENTATION_O3DE);
-
-    // GameLift Documentation
-    documentationMenu.AddAction(ID_DOCUMENTATION_GAMELIFT);
-
-    // Release Notes
-    documentationMenu.AddAction(ID_DOCUMENTATION_RELEASENOTES);
-
-    // GameDev Resources
-    auto gameDevResourceMenu = helpMenu.AddMenu(tr("GameDev Resources"));
-
-    // Game Dev Blog
-    gameDevResourceMenu.AddAction(ID_DOCUMENTATION_GAMEDEVBLOG);
-
-    // Forums
-    gameDevResourceMenu.AddAction(ID_DOCUMENTATION_FORUMS);
-
-    // AWS Support
-    gameDevResourceMenu.AddAction(ID_DOCUMENTATION_AWSSUPPORT);
-
-    helpMenu.AddSeparator();
-
-    // About Open 3D Engine
-    helpMenu.AddAction(ID_APP_ABOUT);
-
-    // Welcome dialog
-    auto helpWelcome = helpMenu.AddAction(ID_APP_SHOW_WELCOME);
-    GetIEditor()->RegisterNotifyListener(new EditorListener(helpWelcome, [helpWelcome](EEditorNotifyEvent e)
-        {
-            DisableActionWhileLevelChanges(helpWelcome, e);
-        }));
-
-    return helpMenu;
-}
-
-QAction* LevelEditorMenuHandler::CreateViewPaneAction(const QtViewPane* view)
-{
-    QAction* action = m_actionManager->HasAction(view->m_id) ? m_actionManager->GetAction(view->m_id) : nullptr;
-
-    if (!action)
-    {
-        const QString menuText = view->m_options.optionalMenuText.length() > 0
-            ? view->m_options.optionalMenuText
-            : view->m_name;
-
-        action = new QAction(menuText, this);
-        action->setObjectName(view->m_name);
-        action->setCheckable(true);
-
-        if (view->m_options.showOnToolsToolbar)
-        {
-            action->setIcon(QIcon(view->m_options.toolbarIcon));
-        }
-
-        m_actionManager->AddAction(view->m_id, action);
-
-        if (!view->m_options.shortcut.isEmpty())
-        {
-            action->setShortcut(view->m_options.shortcut);
-        }
-
-        QObject::connect(
-            action, &QAction::triggered, this, &LevelEditorMenuHandler::checkOrOpenView, Qt::UniqueConnection);
-    }
-
-    return action;
-}
-
-// Function used to show menu options without its icon and be able to toggle shortcut visibility in the new menu layout
-// This is a work around for the fact that setting the shortcut on the original action isn't working for some reasons
-// and we need to investigate it further in the future.
-QAction* LevelEditorMenuHandler::CreateViewPaneMenuItem(
-    [[maybe_unused]] ActionManager* actionManager, ActionManager::MenuWrapper& menu, const QtViewPane* view)
-{
-    QAction* action = CreateViewPaneAction(view);
-
-    if (action && view->m_options.isDisabledInSimMode)
-    {
-        AddDisableActionInSimModeListener(action);
-    }
-
-    menu->addAction(action);
-
-    if (view->m_options.showOnToolsToolbar)
-    {
-        m_mainWindow->GetToolbarManager()->AddButtonToEditToolbar(action);
-    }
-
-    return action;
-}
-
-void LevelEditorMenuHandler::InitializeViewPaneMenu(
-    ActionManager* actionManager, ActionManager::MenuWrapper& menu,
-    AZStd::function <bool(const QtViewPane& view)> functor)
-{
-    QtViewPanes views = QtViewPaneManager::instance()->GetRegisteredPanes();
-
-    for (auto it = views.cbegin(), end = views.cend(); it != end; ++it)
-    {
-        const QtViewPane& view = *it;
-        if (!functor(view))
-        {
-            continue;
-        }
-
-        CreateViewPaneMenuItem(actionManager, menu, it);
-    }
-}
-
-void LevelEditorMenuHandler::LoadComponentLayout()
-{
-    m_viewPaneManager->RestoreDefaultLayout();
-}
-
-QMap<QString, QList<QtViewPane*>> LevelEditorMenuHandler::CreateMenuMap(
-    QMap<QString, QList<QtViewPane*> >& menuMap, QtViewPanes& allRegisteredViewPanes)
-{
-    // set up view panes to each category
-    for (QtViewPane& viewpane : allRegisteredViewPanes)
-    {
-        // only store the view panes that should be shown in the menu
-        if (!viewpane.IsViewportPane())
-        {
-            menuMap[viewpane.m_category].push_back(&viewpane);
-        }
-    }
-
-    return menuMap;
-}
-
-// sort the menu option name in alphabetically order
-struct CaseInsensitiveStringCompare
-{
-    bool operator() (const QString& left, const QString& right) const
-    {
-        return left.toLower() < right.toLower();
-    }
-};
-
-static void LaunchLuaEditor()
-{
-    AzToolsFramework::EditorRequestBus::Broadcast(
-        &AzToolsFramework::EditorRequests::LaunchLuaEditor, nullptr);
-}
-
-void LevelEditorMenuHandler::CreateMenuOptions(
-    QMap<QString, QList<QtViewPane*> >* menuMap, ActionManager::MenuWrapper& menu, const char* category)
-{
-    // list in the menu and remove this menu category from the menuMap
-    QList<QtViewPane*> menuList = menuMap->take(category);
-
-    std::map<QString, std::function<void()>, CaseInsensitiveStringCompare> sortMenuMap;
-
-    // store menu options into the map
-    // name as a key, functionality as a value
-    for (QtViewPane* viewpane : menuList)
-    {
-        if (viewpane->m_options.builtInActionId != LyViewPane::NO_BUILTIN_ACTION)
-        {
-            sortMenuMap[viewpane->m_name] = [this, &menu, viewpane]()
-            {
-                // Handle shortcuts for actions with a built-in ID since they
-                // bypass our CreateViewPaneMenuItem method
-                QAction* action = menu.AddAction(viewpane->m_options.builtInActionId);
-                if (action)
-                {
-                    if (viewpane->m_options.isDisabledInSimMode)
-                    {
-                        AddDisableActionInSimModeListener(action);
-                    }
-                    if (!viewpane->m_options.shortcut.isEmpty())
-                    {
-                        action->setShortcut(viewpane->m_options.shortcut);
-                    }
-                }
-            };
-        }
-        else
-        {
-            const QString menuText = viewpane->m_options.optionalMenuText.length() > 0
-                ? viewpane->m_options.optionalMenuText
-                : viewpane->m_name;
-
-            sortMenuMap[menuText] = [this, viewpane, &menu]()
-            {
-                CreateViewPaneMenuItem(m_actionManager, menu, viewpane);
-            };
-        }
-    }
-
-    if (category == LyViewPane::CategoryTools)
-    {
-        // Add LUA Editor into the Tools map
-        sortMenuMap[s_LUAEditorName] = [this, &menu]()
-        {
-            auto luaEditormenu = menu.AddAction(ID_TOOLS_LUA_EDITOR);
-            connect(luaEditormenu, &QAction::triggered, this, &LaunchLuaEditor, Qt::UniqueConnection);
-        };
-    }
-
-    // add each menu option into the menu
-    std::map<QString, std::function<void()>, CaseInsensitiveStringCompare>::iterator iter;
-    for (iter = sortMenuMap.begin(); iter != sortMenuMap.end(); ++iter)
-    {
-        iter->second();
-    }
-}
-
-void LevelEditorMenuHandler::CreateDebuggingSubMenu(ActionManager::MenuWrapper gameMenu)
-{
-    // DebuggingSubMenu
-    auto debuggingSubMenu = gameMenu.AddMenu(QObject::tr("Debugging"));
-
-    // Error Report
-    AddOpenViewPaneAction(debuggingSubMenu, LyViewPane::ErrorReport);
-
-    debuggingSubMenu.AddSeparator();
-
-    // Configure Toolbox Macros
-    debuggingSubMenu.AddAction(ID_TOOLS_CONFIGURETOOLS);
-
-    // Toolbox Macros
-    m_macrosMenu = debuggingSubMenu.AddMenu(tr("ToolBox Macros"));
-    connect(m_macrosMenu, &QMenu::aboutToShow, this, &LevelEditorMenuHandler::UpdateMacrosMenu, Qt::UniqueConnection);
-
-    UpdateMacrosMenu();
-}
-
-void LevelEditorMenuHandler::UpdateMRUFiles()
-{
-    auto cryEdit = CCryEditApp::instance();
-    RecentFileList* mruList = cryEdit->GetRecentFileList();
-    const int numMru = mruList->GetSize();
-
-    if (!m_mostRecentLevelsMenu)
-    {
-        return;
-    }
-
-    // Remove most recent items
-    m_mostRecentLevelsMenu->clear();
-
-    // Insert mrus
-    QString sCurDir = QString(Path::GetEditingGameDataFolder().c_str()) + QDir::separator();
-
-    QFileInfo gameDir(sCurDir); // Pass it through QFileInfo so it comes out normalized
-    const QString gameDirPath = gameDir.absolutePath();
-
-    for (int i = 0; i < numMru; ++i)
-    {
-        if (!MRUEntryIsValid((*mruList)[i], gameDirPath))
-        {
-            continue;
-        }
-
-        QString displayName;
-        mruList->GetDisplayName(displayName, i, sCurDir);
-
-        QString entry = QString("%1 %2").arg(i + 1).arg(displayName);
-        QAction* action = m_actionManager->GetAction(ID_FILE_MRU_FILE1 + i);
-        action->setText(entry);
-
-        m_actionManager->RegisterActionHandler(ID_FILE_MRU_FILE1 + i, [i]()
-            {
-                auto cryEdit = CCryEditApp::instance();
-                RecentFileList* mruList = cryEdit->GetRecentFileList();
-                // Check file is still available
-                if (mruList->GetSize() > i)
-                {
-                    cryEdit->OpenDocumentFile((*mruList)[i].toUtf8().data());
-                }
-            });
-        m_actionManager->RegisterUpdateCallback(ID_FILE_MRU_FILE1 + i, cryEdit, &CCryEditApp::OnUpdateFileOpen);
-
-        GetIEditor()->RegisterNotifyListener(new EditorListener(action, [action](EEditorNotifyEvent e)
-            {
-                DisableActionWhileLevelChanges(action, e);
-            }));
-
-        m_mostRecentLevelsMenu->addAction(action);
-    }
-
-    // Used when disabling the "Open Recent" menu options
-    OnUpdateOpenRecent();
-
-    m_mostRecentLevelsMenu->addSeparator();
-
-    // Clear All
-    auto clearAllMenu = m_mostRecentLevelsMenu->addAction(tr("Clear All"));
-    connect(clearAllMenu, &QAction::triggered, this, &LevelEditorMenuHandler::ClearAll);
-}
-
-void LevelEditorMenuHandler::ClearAll()
-{
-    RecentFileList* mruList = CCryEditApp::instance()->GetRecentFileList();
-
-    // remove everything from the mru list
-    for (int i = mruList->GetSize(); i > 0; i--)
-    {
-        mruList->Remove(i - 1);
-    }
-
-    // save the settings immediately to the registry
-    mruList->WriteList();
-
-    // re-update the menus
-    UpdateMRUFiles();
-}
-
-// Used for disabling "Open Recent" menu option
-void LevelEditorMenuHandler::OnUpdateOpenRecent()
-{
-    RecentFileList* mruList = CCryEditApp::instance()->GetRecentFileList();
-    const int numMru = mruList->GetSize();
-    QString currentMru = numMru > 0 ? (*mruList)[0] : QString();
-
-    if (!currentMru.isEmpty())
-    {
-        m_mostRecentLevelsMenu->setEnabled(true);
-    }
-    else
-    {
-        m_mostRecentLevelsMenu->setEnabled(false);
-    }
-}
-
-void LevelEditorMenuHandler::OnUpdateMacrosMenu()
-{
-    auto tools = GetIEditor()->GetToolBoxManager();
-    const int macroCount = tools->GetMacroCount(true);
-
-    if (macroCount <= 0)
-    {
-        m_macrosMenu->setEnabled(false);
-    }
-    else
-    {
-        m_macrosMenu->setEnabled(true);
-    }
-}
-
-void LevelEditorMenuHandler::UpdateMacrosMenu()
-{
-    m_macrosMenu->clear();
-
-    auto tools = GetIEditor()->GetToolBoxManager();
-    const int macroCount = tools->GetMacroCount(true);
-
-    for (int i = 0; i < macroCount; ++i)
-    {
-        auto macro = tools->GetMacro(i, true);
-        const int toolbarId = macro->GetToolbarId();
-        if (toolbarId == -1 || toolbarId == ID_TOOLS_TOOL1)
-        {
-            m_macrosMenu->addAction(macro->action());
-        }
-    }
-}
-
-void LevelEditorMenuHandler::UpdateOpenViewPaneMenu()
-{
-    // This function goes through all the viewport menu actions (top, left, perspective...)
-    // and adds a check mark on the viewport that has focus
-
-    QtViewport* viewport = m_mainWindow->GetActiveViewport();
-    QString activeViewportName = viewport ? viewport->GetName() : QString();
-
-    for (QAction* action : m_viewportViewsMenu->actions())
-    {
-        action->setChecked(action->objectName() == activeViewportName);
-    }
-}
-
-void LevelEditorMenuHandler::checkOrOpenView()
-{
-    QAction* action = qobject_cast<QAction*>(sender());
-    const QString viewPaneName = action->objectName();
-    // If this action is checkable and was just unchecked, then we
-    // should close the view pane
-    if (action->isCheckable() && !action->isChecked())
-    {
-        QtViewPaneManager::instance()->ClosePane(viewPaneName);
-    }
-    // Otherwise, this action should open the view pane
-    else
-    {
-        const QtViewPane* pane = QtViewPaneManager::instance()->OpenPane(viewPaneName);
-
-        QObject::connect(pane->Widget(), &QWidget::destroyed, action, [action]
-        {
-            action->setChecked(false);
-        });
-    }
-}
-
-void LevelEditorMenuHandler::AddDisableActionInSimModeListener(QAction* action)
-{
-    GetIEditor()->RegisterNotifyListener(new EditorListener(action, [action](EEditorNotifyEvent e)
-    {
-        DisableActionWhileInSimMode(action, e);
-    }));
-}
-
-void LevelEditorMenuHandler::EnteredComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
-{
-    auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
-    if (!menuWrapper.isNull())
-    {
-        // copy of menu actions
-        auto actions = menuWrapper.Get()->actions();
-        // remove all non-reserved edit menu options
-        actions.erase(
-            std::remove_if(actions.begin(), actions.end(), [](QAction* action)
-            {
-                return !action->property("Reserved").toBool();
-            }),
-            actions.end());
-
-        // clear and update the menu with new actions
-        menuWrapper.Get()->clear();
-        menuWrapper.Get()->addActions(actions);
-    }
-}
-
-void LevelEditorMenuHandler::LeftComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
-{
-    RestoreEditMenuToDefault();
-}
-
-void LevelEditorMenuHandler::AddEditMenuAction(QAction* action)
-{
-    auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
-    if (!menuWrapper.isNull())
-    {
-        menuWrapper.Get()->addAction(action);
-    }
-}
-
-void LevelEditorMenuHandler::AddMenuAction(AZStd::string_view categoryId, QAction* action, bool addToToolsToolbar)
-{
-    auto menuWrapper = m_actionManager->FindMenu(categoryId.data());
-    if (menuWrapper.isNull())
-    {
-        AZ_Assert(false, "No %s category exists in Editor menu.");
-        return;
-    }
-    menuWrapper.Get()->addAction(action);
-
-    if (addToToolsToolbar)
-    {
-        m_mainWindow->GetToolbarManager()->AddButtonToEditToolbar(action);
-    }
-}
-
-void LevelEditorMenuHandler::RestoreEditMenuToDefault()
-{
-    auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
-    if (!menuWrapper.isNull())
-    {
-        menuWrapper.Get()->clear();
-        PopulateEditMenu(menuWrapper);
-    }
-}
-
-#include <Core/moc_LevelEditorMenuHandler.cpp>
diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h
deleted file mode 100644
index b08684ca5e..0000000000
--- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#ifndef LEVELEDITORMENUHANDLER_H
-#define LEVELEDITORMENUHANDLER_H
-
-#if !defined(Q_MOC_RUN)
-#include <QObject>
-#include <QString>
-#include <QMenu>
-#include <QPointer>
-#include "ActionManager.h"
-#include "QtViewPaneManager.h"
-#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
-#endif
-
-class MainWindow;
-class QtViewPaneManager;
-class QSettings;
-struct QtViewPane;
-
-class LevelEditorMenuHandler
-    : public QObject
-    , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
-    , private AzToolsFramework::EditorMenuRequestBus::Handler
-{
-    Q_OBJECT
-public:
-    LevelEditorMenuHandler(MainWindow* mainWindow, QtViewPaneManager* const viewPaneManager, QSettings& settings);
-    ~LevelEditorMenuHandler();
-
-    void Initialize();
-
-    bool MRUEntryIsValid(const QString& entry, const QString& gameFolderPath);
-
-    void IncrementViewPaneVersion();
-    int GetViewPaneVersion() const;
-
-    void UpdateViewLayoutsMenu(ActionManager::MenuWrapper& layoutsMenu);
-
-    void ResetToolsMenus();
-
-    QAction* CreateViewPaneAction(const QtViewPane* view);
-
-    // It's used when users update the Tool Box Macro list in the Configure Tool Box Macro dialog
-    void UpdateMacrosMenu();
-
-Q_SIGNALS:
-    void ActivateAssetImporter();
-
-private:
-    QMenu* CreateFileMenu();
-    QMenu* CreateEditMenu();
-    void PopulateEditMenu(ActionManager::MenuWrapper& editMenu);
-    QMenu* CreateGameMenu();
-    QMenu* CreateToolsMenu();
-    QMenu* CreateViewMenu();
-    QMenu* CreateHelpMenu();
-
-    void checkOrOpenView();
-
-    QMap<QString, QList<QtViewPane*>> CreateMenuMap(QMap<QString, QList<QtViewPane*>>& menuMap, QtViewPanes& allRegisteredViewPanes);
-    void CreateMenuOptions(QMap<QString, QList<QtViewPane*>>* menuMap, ActionManager::MenuWrapper& menu, const char* category);
-
-    void CreateDebuggingSubMenu(ActionManager::MenuWrapper gameMenu);
-
-    void UpdateMRUFiles();
-
-    void ClearAll();
-    void OnUpdateOpenRecent();
-
-    void OnUpdateMacrosMenu();
-
-    void UpdateOpenViewPaneMenu();
-
-    QAction* CreateViewPaneMenuItem(ActionManager* actionManager, ActionManager::MenuWrapper& menu, const QtViewPane* view);
-
-    void InitializeViewPaneMenu(ActionManager* actionManager, ActionManager::MenuWrapper& menu, AZStd::function < bool(const QtViewPane& view)> functor);
-
-    void LoadComponentLayout();
-
-    void AddDisableActionInSimModeListener(QAction* action);
-
-    // EditorComponentModeNotificationBus
-    void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
-    void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
-
-    // EditorMenuRequestBus
-    void AddEditMenuAction(QAction* action) override;
-    void AddMenuAction(AZStd::string_view categoryId, QAction* action, bool addToToolsToolbar) override;
-    void RestoreEditMenuToDefault() override;
-
-    MainWindow* m_mainWindow;
-    ActionManager* m_actionManager;
-    QtViewPaneManager* m_viewPaneManager;
-
-    QPointer<QMenu> m_viewportViewsMenu;
-
-    ActionManager::MenuWrapper m_toolsMenu;
-
-    QMenu* m_mostRecentLevelsMenu = nullptr;
-    QMenu* m_mostRecentProjectsMenu = nullptr;
-    QMenu* m_editmenu = nullptr;
-
-    ActionManager::MenuWrapper m_viewPanesMenu;
-    ActionManager::MenuWrapper m_layoutsMenu;
-    ActionManager::MenuWrapper m_macrosMenu;
-
-    const char* m_levelExtension = nullptr;
-    int m_viewPaneVersion = 0;
-
-    QList<QMenu*> m_topLevelMenus;
-    QSettings& m_settings;
-};
-
-#endif // LEVELEDITORMENUHANDLER_H
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication.cpp b/Code/Sandbox/Editor/Core/QtEditorApplication.cpp
deleted file mode 100644
index 5554498bfd..0000000000
--- a/Code/Sandbox/Editor/Core/QtEditorApplication.cpp
+++ /dev/null
@@ -1,659 +0,0 @@
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "QtEditorApplication.h"
-
-// Qt
-#include <QAbstractEventDispatcher>
-#include <QScopedValueRollback>
-#include <QToolBar>
-#include <QLoggingCategory>
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <QtGui/qpa/qplatformnativeinterface.h>
-#include <QtGui/private/qhighdpiscaling_p.h>
-#endif
-
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-// AzFramework
-#if defined(AZ_PLATFORM_WINDOWS)
-#   include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
-#endif // defined(AZ_PLATFORM_WINDOWS)
-
-// AzQtComponents
-#include <AzQtComponents/Components/GlobalEventFilter.h>
-#include <AzQtComponents/Components/O3DEStylesheet.h>
-#include <AzQtComponents/Components/Titlebar.h>
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-
-// Editor
-#include "Settings.h"
-#include "CryEdit.h"
-
-
-enum
-{
-    // in milliseconds
-    GameModeIdleFrequency = 0,
-    EditorModeIdleFrequency = 1,
-    InactiveModeFrequency = 10,
-    UninitializedFrequency = 9999,
-};
-
-Q_LOGGING_CATEGORY(InputDebugging, "o3de.editor.input")
-
-// internal, private namespace:
-namespace
-{
-    class EditorGlobalEventFilter
-        : public AzQtComponents::GlobalEventFilter
-    {
-    public:
-        explicit EditorGlobalEventFilter(QObject* watch)
-            : AzQtComponents::GlobalEventFilter(watch) {}
-
-        bool eventFilter(QObject* obj, QEvent* e) override
-        {
-            static bool isRecursing = false;
-
-            if (isRecursing)
-            {
-                return false;
-            }
-
-            QScopedValueRollback<bool> guard(isRecursing, true);
-
-            // Detect Widget move
-            // We're doing this before the events are actually consumed to avoid confusion
-            if (IsDragGuardedWidget(obj))
-            {
-                switch (e->type())
-                {
-                    case QEvent::MouseButtonPress:
-                    {
-                        m_widgetDraggedState = WidgetDraggedState::Clicked;
-                        break;
-                    }
-                    case QEvent::Move:
-                    case QEvent::MouseMove:
-                    {
-                        if (m_widgetDraggedState == WidgetDraggedState::Clicked)
-                        {
-                            m_widgetDraggedState = WidgetDraggedState::Dragged;
-                        }
-                        break;
-                    }
-                }
-            }
-
-            if (e->type() == QEvent::MouseButtonRelease)
-            {
-                m_widgetDraggedState = WidgetDraggedState::None;
-            }
-
-            switch (e->type())
-            {
-                case QEvent::KeyPress:
-                case QEvent::KeyRelease:
-                {
-                    if (GetIEditor()->IsInGameMode())
-                    {
-                        // don't let certain keys fall through to the game when it's running
-                        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
-                        auto key = keyEvent->key();
-
-                        if ((key == Qt::Key_Alt) || (key == Qt::Key_AltGr) || ((key >= Qt::Key_F1) && (key <= Qt::Key_F35)))
-                        {
-                            return true;
-                        }
-                    }
-                }
-                break;
-
-                case QEvent::Shortcut:
-                {
-                    // Eat shortcuts in game mode or when a guarded widget is being dragged
-                    if (GetIEditor()->IsInGameMode() || m_widgetDraggedState == WidgetDraggedState::Dragged)
-                    {
-                        return true;
-                    }
-                }
-                break;
-
-                case QEvent::MouseButtonPress:
-                case QEvent::MouseButtonRelease:
-                case QEvent::MouseButtonDblClick:
-                case QEvent::MouseMove:
-                {
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-                    auto widget = qobject_cast<QWidget*>(obj);
-                    if (widget && widget->graphicsProxyWidget() != nullptr)
-                    {
-                        QMouseEvent* me = static_cast<QMouseEvent*>(e);
-                        QWidget* target = qApp->widgetAt(QCursor::pos());
-                        if (target)
-                        {
-                            QMouseEvent ev(me->type(), target->mapFromGlobal(QCursor::pos()), me->button(), me->buttons(), me->modifiers());
-                            qApp->notify(target, &ev);
-                            return true;
-                        }
-                    }
-#endif
-                    GuardMouseEventSelectionChangeMetrics(e);
-                }
-                break;
-            }
-
-            return GlobalEventFilter::eventFilter(obj, e);
-        }
-
-    private:
-        bool m_mouseButtonWasDown = false;
-
-        void GuardMouseEventSelectionChangeMetrics(QEvent* e)
-        {
-            // Force the metrics collector to queue up any selection changed metrics until mouse release, so that we don't
-            // get flooded with multiple selection changed events when one, sent on mouse release, is enough.
-            if (e->type() == QEvent::MouseButtonPress)
-            {
-                if (!m_mouseButtonWasDown)
-                {
-                    m_mouseButtonWasDown = true;
-                }
-            }
-            else if (e->type() == QEvent::MouseButtonRelease)
-            {
-                // This is a tricky case. We don't want to send the end selection change event too early
-                // because there might be other things responding to the mouse release after this, and we want to
-                // block handling of the selection change events until we're entirely finished with the mouse press.
-                // So, queue the handling with a single shot timer, but then check the state of the mouse buttons
-                // to ensure that they haven't been pressed in between the release and the timer firing off.
-                QTimer::singleShot(0, this, [this]() {
-                    if (!QApplication::mouseButtons() && m_mouseButtonWasDown)
-                    {
-                        m_mouseButtonWasDown = false;
-                    }
-                });
-            }
-        }
-
-        //! Detect if the event's target is a Widget we want to guard from shortcuts while it's being dragged.
-        //! This function can be easily expanded to handle exceptions.
-        bool IsDragGuardedWidget(const QObject* obj)
-        {
-            return qobject_cast<const QWidget*>(obj) != nullptr;
-        }
-
-        //! Enum to keep track of Widget dragged state
-        enum class WidgetDraggedState
-        {
-            None,       //!< No widget is being clicked nor dragged
-            Clicked,    //!< A widget has been clicked on but has not been dragged
-            Dragged,    //!< A widget is being dragged
-        };
-
-        WidgetDraggedState m_widgetDraggedState = WidgetDraggedState::None;
-    };
-
-    static void LogToDebug([[maybe_unused]] QtMsgType Type, [[maybe_unused]] const QMessageLogContext& Context, const QString& message)
-    {
-#if defined(WIN32) || defined(WIN64)
-        OutputDebugStringW(L"Qt: ");
-        OutputDebugStringW(reinterpret_cast<const wchar_t*>(message.utf16()));
-        OutputDebugStringW(L"\n");
-#endif
-    }
-}
-
-namespace Editor
-{
-    void ScanDirectories(QFileInfoList& directoryList, const QStringList& filters, QFileInfoList& files, ScanDirectoriesUpdateCallBack updateCallback)
-    {
-        while (!directoryList.isEmpty())
-        {
-            QDir directory(directoryList.front().absoluteFilePath(), "*", QDir::Name | QDir::IgnoreCase, QDir::AllEntries);
-            directoryList.pop_front();
-
-            if (directory.exists())
-            {
-                // Append each file from this directory that matches one of the filters to files
-                directory.setNameFilters(filters);
-                directory.setFilter(QDir::Files);
-                files.append(directory.entryInfoList());
-
-                // Add all of the subdirectories from this directory to the queue to be searched
-                directory.setNameFilters(QStringList("*"));
-                directory.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
-                directoryList.append(directory.entryInfoList());
-                if (updateCallback)
-                {
-                    updateCallback();
-                }
-            }
-        }
-    }
-
-    EditorQtApplication::EditorQtApplication(int& argc, char** argv)
-        : QApplication(argc, argv)
-        , m_inWinEventFilter(false)
-        , m_stylesheet(new AzQtComponents::O3DEStylesheet(this))
-        , m_idleTimer(new QTimer(this))
-    {
-        m_idleTimer->setInterval(UninitializedFrequency);
-
-        setWindowIcon(QIcon(":/Application/res/o3de_editor.ico"));
-
-        // set the default key store for our preferences:
-        setOrganizationName("Amazon");
-        setOrganizationDomain("amazon.com");
-        setApplicationName("O3DE Editor");
-
-        connect(m_idleTimer, &QTimer::timeout, this, &EditorQtApplication::maybeProcessIdle);
-
-        connect(this, &QGuiApplication::applicationStateChanged, this, [this] { ResetIdleTimerInterval(PollState); });
-        installEventFilter(this);
-
-        // Disable our debugging input helpers by default
-        QLoggingCategory::setFilterRules(QStringLiteral("o3de.editor.input.*=false"));
-
-        // Initialize our stylesheet here to allow Gems to register stylesheets when their system components activate.
-        AZ::IO::FixedMaxPath engineRootPath;
-        {
-            // Create a ComponentApplication to initialize the AZ::SystemAllocator and initialize the SettingsRegistry
-            AZ::ComponentApplication application(argc, argv);
-            auto settingsRegistry = AZ::SettingsRegistry::Get();
-            settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
-        }
-        m_stylesheet->initialize(this, engineRootPath);
-    }
-
-    void EditorQtApplication::Initialize()
-    {
-        GetIEditor()->RegisterNotifyListener(this);
-
-        // install QTranslator
-        InstallEditorTranslators();
-
-        // install hooks and filters last and revoke them first
-        InstallFilters();
-
-        // install this filter. It will be a parent of the application and cleaned up when it is cleaned up automically
-        auto globalEventFilter = new EditorGlobalEventFilter(this);
-        installEventFilter(globalEventFilter);
-    }
-
-    void EditorQtApplication::LoadSettings()
-    {
-        AZ::SerializeContext* context;
-        EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
-        AZ_Assert(context, "No serialize context");
-        char resolvedPath[AZ_MAX_PATH_LEN];
-        AZ::IO::FileIOBase::GetInstance()->ResolvePath("@user@/EditorUserSettings.xml", resolvedPath, AZ_MAX_PATH_LEN);
-        m_localUserSettings.Load(resolvedPath, context);
-        m_localUserSettings.Activate(AZ::UserSettings::CT_LOCAL);
-        AZ::UserSettingsOwnerRequestBus::Handler::BusConnect(AZ::UserSettings::CT_LOCAL);
-        m_activatedLocalUserSettings = true;
-    }
-
-    void EditorQtApplication::UnloadSettings()
-    {
-        if (m_activatedLocalUserSettings)
-        {
-            SaveSettings();
-            m_localUserSettings.Deactivate();
-            AZ::UserSettingsOwnerRequestBus::Handler::BusDisconnect();
-            m_activatedLocalUserSettings = false;
-        }
-    }
-
-    void EditorQtApplication::SaveSettings()
-    {
-        if (m_activatedLocalUserSettings)
-        {
-            AZ::SerializeContext* context;
-            EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
-            AZ_Assert(context, "No serialize context");
-
-            char resolvedPath[AZ_MAX_PATH_LEN];
-            AZ::IO::FileIOBase::GetInstance()->ResolvePath("@user@/EditorUserSettings.xml", resolvedPath, AZ_ARRAY_SIZE(resolvedPath));
-            m_localUserSettings.Save(resolvedPath, context);
-        }
-    }
-
-    void EditorQtApplication::maybeProcessIdle()
-    {
-        if (!m_isMovingOrResizing)
-        {
-            if (auto winapp = CCryEditApp::instance())
-            {
-                winapp->OnIdle(0);
-            }
-        }
-    }
-
-    void EditorQtApplication::InstallQtLogHandler()
-    {
-        qInstallMessageHandler(LogToDebug);
-    }
-
-    void EditorQtApplication::InstallFilters()
-    {
-        if (auto dispatcher = QAbstractEventDispatcher::instance())
-        {
-            dispatcher->installNativeEventFilter(this);
-        }
-    }
-
-    void EditorQtApplication::UninstallFilters()
-    {
-        if (auto dispatcher = QAbstractEventDispatcher::instance())
-        {
-            dispatcher->removeNativeEventFilter(this);
-        }
-    }
-
-    EditorQtApplication::~EditorQtApplication()
-    {
-        if (GetIEditor())
-        {
-            GetIEditor()->UnregisterNotifyListener(this);
-        }
-
-        UninstallFilters();
-
-        UninstallEditorTranslators();
-    }
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    bool EditorQtApplication::nativeEventFilter([[maybe_unused]] const QByteArray& eventType, void* message, long* result)
-    {
-        MSG* msg = (MSG*)message;
-
-        if (msg->message == WM_MOVING || msg->message == WM_SIZING)
-        {
-            m_isMovingOrResizing = true;
-        }
-        else if (msg->message == WM_EXITSIZEMOVE)
-        {
-            m_isMovingOrResizing = false;
-        }
-
-        // Prevent the user from being able to move the window in game mode.
-        // This is done during the hit test phase to bypass the native window move messages. If the window
-        // decoration wrapper title bar contains the cursor, set the result to HTCLIENT instead of
-        // HTCAPTION.
-        if (msg->message == WM_NCHITTEST && GetIEditor()->IsInGameMode())
-        {
-            const LRESULT defWinProcResult = DefWindowProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
-            if (defWinProcResult == 1)
-            {
-                if (QWidget* widget = QWidget::find((WId)msg->hwnd))
-                {
-                    if (auto wrapper = qobject_cast<const AzQtComponents::WindowDecorationWrapper *>(widget))
-                    {
-                        AzQtComponents::TitleBar* titleBar = wrapper->titleBar();
-                        const short global_x = static_cast<short>(LOWORD(msg->lParam));
-                        const short global_y = static_cast<short>(HIWORD(msg->lParam));
-
-                        const QPoint globalPos = QHighDpi::fromNativePixels(QPoint(global_x, global_y), widget->window()->windowHandle());
-                        const QPoint local = titleBar->mapFromGlobal(globalPos);
-                        if (titleBar->draggableRect().contains(local) && !titleBar->isTopResizeArea(globalPos))
-                        {
-                            *result = HTCLIENT;
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-
-        // Ensure that the Windows WM_INPUT messages get passed through to the AzFramework input system.
-        // These events are now consumed both in and out of game mode.
-        if (msg->message == WM_INPUT)
-        {
-            UINT rawInputSize;
-            const UINT rawInputHeaderSize = sizeof(RAWINPUTHEADER);
-            GetRawInputData((HRAWINPUT)msg->lParam, RID_INPUT, NULL, &rawInputSize, rawInputHeaderSize);
-
-            AZStd::array<BYTE, sizeof(RAWINPUT)> rawInputBytesArray;
-            LPBYTE rawInputBytes = rawInputBytesArray.data();
-
-            const UINT bytesCopied = GetRawInputData((HRAWINPUT)msg->lParam, RID_INPUT, rawInputBytes, &rawInputSize, rawInputHeaderSize);
-            CRY_ASSERT(bytesCopied == rawInputSize);
-
-            RAWINPUT* rawInput = (RAWINPUT*)rawInputBytes;
-            CRY_ASSERT(rawInput);
-
-            AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputEvent, *rawInput);
-
-            return false;
-        }
-        else if (msg->message == WM_DEVICECHANGE)
-        {
-            if (msg->wParam == 0x0007) // DBT_DEVNODES_CHANGED
-            {
-                AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputDeviceChangeEvent);
-            }
-            return true;
-        }
-
-        return false;
-    }
-#endif
-
-    void EditorQtApplication::OnEditorNotifyEvent(EEditorNotifyEvent event)
-    {
-        switch (event)
-        {
-            case eNotify_OnStyleChanged:
-                RefreshStyleSheet();
-                emit skinChanged();
-            break;
-
-            case eNotify_OnQuit:
-                GetIEditor()->UnregisterNotifyListener(this);
-            break;
-
-            case eNotify_OnBeginGameMode:
-                // GetIEditor()->IsInGameMode() Isn't reliable when called from within the notification handler
-                ResetIdleTimerInterval(GameMode);
-            break;
-            case eNotify_OnEndGameMode:
-                ResetIdleTimerInterval(EditorMode);
-            break;
-        }
-    }
-
-    QColor EditorQtApplication::InterpolateColors(QColor a, QColor b, float factor)
-    {
-        return QColor(int(a.red() * (1.0f - factor) + b.red() * factor),
-            int(a.green() * (1.0f - factor) + b.green() * factor),
-            int(a.blue() * (1.0f - factor) + b.blue() * factor),
-            int(a.alpha() * (1.0f - factor) + b.alpha() * factor));
-    }
-
-    void EditorQtApplication::RefreshStyleSheet()
-    {
-        m_stylesheet->Refresh();
-    }
-
-    void EditorQtApplication::setIsMovingOrResizing(bool isMovingOrResizing)
-    {
-        if (m_isMovingOrResizing == isMovingOrResizing)
-        {
-            return;
-        }
-
-        m_isMovingOrResizing = isMovingOrResizing;
-    }
-
-    bool EditorQtApplication::isMovingOrResizing() const
-    {
-        return m_isMovingOrResizing;
-    }
-
-    const QColor& EditorQtApplication::GetColorByName(const QString& name)
-    {
-        return m_stylesheet->GetColorByName(name);
-    }
-
-    EditorQtApplication* EditorQtApplication::instance()
-    {
-        return static_cast<EditorQtApplication*>(QApplication::instance());
-    }
-
-    bool EditorQtApplication::IsActive()
-    {
-        return applicationState() == Qt::ApplicationActive;
-    }
-
-    QTranslator* EditorQtApplication::CreateAndInitializeTranslator(const QString& filename, const QString& directory)
-    {
-        Q_ASSERT(QFile::exists(directory + "/" + filename));
-
-        QTranslator* translator = new QTranslator();
-        translator->load(filename, directory);
-        installTranslator(translator);
-        return translator;
-    }
-
-    void EditorQtApplication::InstallEditorTranslators()
-    {
-        m_editorTranslator =        CreateAndInitializeTranslator("editor_en-us.qm", ":/Translations");
-        m_assetBrowserTranslator =  CreateAndInitializeTranslator("assetbrowser_en-us.qm", ":/Translations");
-    }
-
-    void EditorQtApplication::DeleteTranslator(QTranslator*& translator)
-    {
-        removeTranslator(translator);
-        delete translator;
-        translator = nullptr;
-    }
-
-    void EditorQtApplication::UninstallEditorTranslators()
-    {
-        DeleteTranslator(m_editorTranslator);
-        DeleteTranslator(m_assetBrowserTranslator);
-    }
-
-    void EditorQtApplication::EnableOnIdle(bool enable)
-    {
-        if (enable)
-        {
-            if (m_idleTimer->interval() == UninitializedFrequency)
-            {
-                ResetIdleTimerInterval();
-            }
-
-            m_idleTimer->start();
-        }
-        else
-        {
-            m_idleTimer->stop();
-        }
-    }
-
-    bool EditorQtApplication::OnIdleEnabled() const
-    {
-        if (m_idleTimer->interval() == UninitializedFrequency)
-        {
-            return false;
-        }
-
-        return m_idleTimer->isActive();
-    }
-
-    void EditorQtApplication::ResetIdleTimerInterval(TimerResetFlag flag)
-    {
-        bool isInGameMode = flag == GameMode;
-        if (flag == PollState)
-        {
-            isInGameMode = GetIEditor() ? GetIEditor()->IsInGameMode() : false;
-        }
-
-        // Game mode takes precedence over anything else
-        if (isInGameMode)
-        {
-            m_idleTimer->setInterval(GameModeIdleFrequency);
-        }
-        else
-        {
-            if (applicationState() & Qt::ApplicationActive)
-            {
-                m_idleTimer->setInterval(EditorModeIdleFrequency);
-            }
-            else
-            {
-                m_idleTimer->setInterval(InactiveModeFrequency);
-            }
-        }
-    }
-
-    bool EditorQtApplication::eventFilter(QObject* object, QEvent* event)
-    {
-        switch (event->type())
-        {
-        case QEvent::MouseButtonPress:
-            m_pressedButtons |= reinterpret_cast<QMouseEvent*>(event)->button();
-            break;
-        case QEvent::MouseButtonRelease:
-            m_pressedButtons &= ~(reinterpret_cast<QMouseEvent*>(event)->button());
-            break;
-        case QEvent::KeyPress:
-            m_pressedKeys.insert(reinterpret_cast<QKeyEvent*>(event)->key());
-            break;
-        case QEvent::KeyRelease:
-            m_pressedKeys.remove(reinterpret_cast<QKeyEvent*>(event)->key());
-            break;
-#ifdef AZ_PLATFORM_WINDOWS
-        case QEvent::Leave:
-        {
-            // if we receive a leave event for a toolbar on Windows
-            // check first whether we really left it. If we didn't: start checking
-            // for the tool bar under the mouse by timer to check when we really left.
-            // Synthesize a new leave event then. Workaround for LY-69788
-            auto toolBarAt = [](const QPoint& pos) -> QToolBar* {
-                QWidget* widget = qApp->widgetAt(pos);
-                while (widget != nullptr)
-                {
-                    if (QToolBar* tb = qobject_cast<QToolBar*>(widget))
-                    {
-                        return tb;
-                    }
-                    widget = widget->parentWidget();
-                }
-                return nullptr;
-            };
-            if (object == toolBarAt(QCursor::pos()))
-            {
-                QTimer* t = new QTimer(object);
-                t->start(100);
-                connect(t, &QTimer::timeout, object, [t, object, toolBarAt]() {
-                    if (object != toolBarAt(QCursor::pos()))
-                    {
-                        QEvent event(QEvent::Leave);
-                        qApp->sendEvent(object, &event);
-                        t->deleteLater();
-                    }
-                });
-                return true;
-            }
-            break;
-        }
-#endif
-        default:
-            break;
-        }
-        return QApplication::eventFilter(object, event);
-    }
-} // end namespace Editor
-
-#include <Core/moc_QtEditorApplication.cpp>
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication.h b/Code/Sandbox/Editor/Core/QtEditorApplication.h
deleted file mode 100644
index 1eb10ae46a..0000000000
--- a/Code/Sandbox/Editor/Core/QtEditorApplication.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QApplication>
-#include <QAbstractNativeEventFilter>
-#include <QColor>
-#include <QMap>
-#include <QTranslator>
-#include <QSet>
-#include "IEventLoopHook.h"
-#include <unordered_map>
-
-#include <AzCore/PlatformDef.h>
-#include <AzCore/UserSettings/UserSettingsProvider.h>
-#include <IEditor.h>
-#endif
-
-class QFileInfo;
-typedef QList<QFileInfo> QFileInfoList;
-class QByteArray;
-
-namespace AzQtComponents
-{
-    class O3DEStylesheet;
-}
-
-enum EEditorNotifyEvent;
-
-// This contains the main "QApplication"-derived class for the editor itself.
-// it performs the message hooking and other functions to allow CryEdit to function.
-
-namespace Editor
-{
-    typedef void(* ScanDirectoriesUpdateCallBack)(void);
-    /*!
-      \param directoryList A list of directories to search. ScanDirectories will also search the subdirectories of each of these.
-      \param filters A list of filename filters. Supports * and ? wildcards. The filters will not apply to the directory names.
-      \param files Any file that is found and matches any of the filters will be added to files.
-      \param updateCallback An optional callback function that will be called once for every directory and subdirectory that is scanned.
-    */
-    void ScanDirectories(QFileInfoList& directoryList, const QStringList& filters, QFileInfoList& files, ScanDirectoriesUpdateCallBack updateCallback = nullptr);
-
-    class EditorQtApplication
-        : public QApplication
-        , public QAbstractNativeEventFilter
-        , public IEditorNotifyListener
-        , public AZ::UserSettingsOwnerRequestBus::Handler
-    {
-        Q_OBJECT
-        Q_PROPERTY(QSet<int> pressedKeys READ pressedKeys)
-        Q_PROPERTY(int pressedMouseButtons READ pressedMouseButtons)
-    public:
-        // Call this before creating this object:
-        static void InstallQtLogHandler();
-
-        EditorQtApplication(int& argc, char** argv);
-        virtual ~EditorQtApplication();
-        void Initialize();
-
-        void LoadSettings();
-        void UnloadSettings();
-
-        // AZ::UserSettingsOwnerRequestBus::Handler
-        void SaveSettings() override;
-        ////
-
-        static EditorQtApplication* instance();
-
-        static bool IsActive();
-
-        bool isMovingOrResizing() const;
-
-        // QAbstractNativeEventFilter:
-        bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override;
-
-        // IEditorNotifyListener:
-        void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
-
-        const QColor& GetColorByName(const QString& colorName);
-
-        void EnableOnIdle(bool enable = true);
-        bool OnIdleEnabled() const;
-
-        bool eventFilter(QObject* object, QEvent* event) override;
-
-        QSet<int> pressedKeys() const { return m_pressedKeys; }
-        int pressedMouseButtons() const { return m_pressedButtons; }
-
-    public Q_SLOTS:
-
-        void setIsMovingOrResizing(bool isMovingOrResizing);
-
-    signals:
-        void skinChanged();
-
-    private:
-        enum TimerResetFlag
-        {
-            PollState,
-            GameMode,
-            EditorMode
-        };
-        void ResetIdleTimerInterval(TimerResetFlag = PollState);
-        static QColor InterpolateColors(QColor a, QColor b, float factor);
-        void RefreshStyleSheet();
-        void InstallFilters();
-        void UninstallFilters();
-        void maybeProcessIdle();
-
-        AzQtComponents::O3DEStylesheet* m_stylesheet;
-
-        bool m_inWinEventFilter = false;
-
-        // Translators
-        void InstallEditorTranslators();
-        void UninstallEditorTranslators();
-        QTranslator* CreateAndInitializeTranslator(const QString& filename, const QString& directory);
-        void DeleteTranslator(QTranslator*& translator);
-
-        QTranslator* m_editorTranslator = nullptr;
-        QTranslator* m_assetBrowserTranslator = nullptr;
-        QTimer* const m_idleTimer = nullptr;
-        bool m_isMovingOrResizing = false;
-
-        AZ::UserSettingsProvider m_localUserSettings;
-
-        Qt::MouseButtons m_pressedButtons = Qt::NoButton;
-        QSet<int> m_pressedKeys;
-
-        bool m_activatedLocalUserSettings = false;
-    };
-} // namespace editor
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication_linux.cpp b/Code/Sandbox/Editor/Core/QtEditorApplication_linux.cpp
deleted file mode 100644
index 0b8ddd487e..0000000000
--- a/Code/Sandbox/Editor/Core/QtEditorApplication_linux.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "QtEditorApplication.h"
-
-namespace Editor
-{
-    bool EditorQtApplication::nativeEventFilter(const QByteArray& , void* , long* )
-    {
-        // TODO_KDAB_LINUX
-        return false;
-    }
-}
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication_mac.mm b/Code/Sandbox/Editor/Core/QtEditorApplication_mac.mm
deleted file mode 100644
index 8eef39a30a..0000000000
--- a/Code/Sandbox/Editor/Core/QtEditorApplication_mac.mm
+++ /dev/null
@@ -1,43 +0,0 @@
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#import <AppKit/NSEvent.h>
-
-#include "EditorDefs.h"
-#include "QtEditorApplication.h"
-
-// AzFramework
-#include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
-
-// Qt
-#include <QCursor>
-
-namespace Editor
-{
-    bool EditorQtApplication::nativeEventFilter(const QByteArray& eventType, void* message, long* result)
-    {
-        NSEvent* event = (NSEvent*)message;
-        if (GetIEditor()->IsInGameMode())
-        {
-            AzFramework::RawInputNotificationBusMac::Broadcast(&AzFramework::RawInputNotificationsMac::OnRawInputEvent, event);
-            return true;
-        }
-
-        if ([event type] == NSEventTypeMouseEntered)
-        {
-            // filter out mouse enter events when the widget the mouse entered into
-            // does not exist anymore. This happened occasionally on startup when hovering
-            // over the splash screen - LY-84100
-            if (widgetAt(QCursor::pos()) == nullptr)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-} // end namespace Editor
diff --git a/Code/Sandbox/Editor/Core/Tests/test_Archive.cpp b/Code/Sandbox/Editor/Core/Tests/test_Archive.cpp
deleted file mode 100644
index d5e3cbe925..0000000000
--- a/Code/Sandbox/Editor/Core/Tests/test_Archive.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-// AzTest
-#include <AzTest/AzTest.h>
-
-// Qt
-#include <QBuffer>
-
-static QString CreateTestString(int size)
-{
-    QString testString;
-    testString.resize(size);
-
-    // generate a string with some kind of pattern, so that
-    // decoding is verified against something semi-realistic
-    QString pattern = "TestPattern";
-    for (int i = 0; i < size; i++)
-    {
-        testString[i] = pattern[i % pattern.length()];
-    }
-
-    return testString;
-}
-
-TEST(CArchive, 1ByteLengthString)
-{
-    QString outString = CreateTestString(20); // use a test size less than 2^8, so it takes only 1 byte for the length
-
-    QBuffer memBlock;
-    memBlock.open(QIODevice::ReadWrite);
-    CArchive writeArchive(&memBlock, CArchive::store);
-    writeArchive << outString;
-
-    QByteArray dataBuffer = memBlock.buffer();
-
-    // buffer size after write is the 1 byte for the string length followed by the string
-    EXPECT_EQ(memBlock.pos(), (1 + outString.length()));
-
-    const char* data = dataBuffer.constData();
-    EXPECT_EQ(data[0], outString.length());
-
-    for (int i = 0; i < outString.length(); i++)
-    {
-        EXPECT_EQ(data[1 + i], outString[i]);
-    }
-
-    // now confirm that we can read it back out
-    memBlock.reset();
-    CArchive readArchive(&memBlock, CArchive::load);
-    QString inString;
-    readArchive >> inString;
-
-    EXPECT_EQ(inString, outString);
-}
-
-TEST(CArchive, test2ByteLengthString)
-{
-    int testSize = 0xff + 1; // use a test size greater than 2^8, so it takes more than 1 byte for the length
-    QString outString = CreateTestString(testSize);
-
-    QBuffer memBlock;
-    memBlock.open(QIODevice::ReadWrite);
-    CArchive writeArchive(&memBlock, CArchive::store);
-    writeArchive << outString;
-
-    QByteArray dataBuffer = memBlock.buffer();
-
-    // buffer size after write is the 1 marker byte (0xff), 2 bytes for the string length followed by the string
-    EXPECT_EQ(memBlock.pos(), (1 + 2 + testSize));
-
-    const char* data = dataBuffer.constData();
-    EXPECT_EQ(data[0], '\xff');
-    short shortLength = 0;
-    memcpy(&shortLength, data + 1, 2);
-    EXPECT_EQ(shortLength, testSize);
-
-    for (int i = 0; i < testSize; i++)
-    {
-        EXPECT_EQ(data[3 + i], outString[i]);
-    }
-
-    // now confirm that we can read it back out
-    memBlock.reset();
-    CArchive readArchive(&memBlock, CArchive::load);
-    QString inString;
-    readArchive >> inString;
-
-    EXPECT_EQ(inString, outString);
-}
-
-TEST(CArchive, test4ByteLengthString)
-{
-    int testSize = 0xffff + 1; // use a test size greater than 2^16, so it takes more than 2 bytes for the length
-    QString outString = CreateTestString(testSize);
-
-    QBuffer memBlock;
-    memBlock.open(QIODevice::ReadWrite);
-    CArchive writeArchive(&memBlock, CArchive::store);
-    writeArchive << outString;
-
-    QByteArray dataBuffer = memBlock.buffer();
-
-    // buffer size after write is the 1 marker byte (0xff), the 2 byte marker (0xffff), 4 bytes for the string length followed by the string
-    EXPECT_EQ(memBlock.pos(), (1 + 2 + 4 + testSize));
-
-    const char* data = dataBuffer.constData();
-    EXPECT_EQ(data[0], '\xff');
-    EXPECT_EQ(data[1], '\xff');
-    EXPECT_EQ(data[2], '\xff');
-    uint32 doubleWordLength = 0;
-    memcpy(&doubleWordLength, data + 3, 4);
-    EXPECT_EQ(doubleWordLength, testSize);
-
-    for (int i = 0; i < testSize; i++)
-    {
-        EXPECT_EQ(data[7 + i], outString[i]);
-    }
-
-    // now confirm that we can read it back out
-    memBlock.reset();
-    CArchive readArchive(&memBlock, CArchive::load);
-    QString inString;
-    readArchive >> inString;
-
-    EXPECT_EQ(inString, outString);
-}
-
-TEST(CArchive, testWindowsWideCharacterString1ByteLength)
-{
-    // NOTE: CArchive only writes out Utf-8 now, so we can't actually
-    // use that class to encode to Windows wide character strings.
-    // That is why this test (unlike the non-Windows wide character tests)
-    // is manually creating a stream and only confirming that CArchive can decode it.
-
-    QString outString = CreateTestString(20); // use a test size smaller than 2^8, so that we only need one byte to store the length
-
-    // we have to write the 0xff marker, then the 2 byte marker to indicate it's wide characters, 
-    // then the actual length (1 byte), then the string, with windows wide characters (2 bytes per)
-    QByteArray testBuffer;
-    testBuffer.resize(1 + 2 + 1 + (outString.length() * 2));
-    testBuffer[0] = '\xff';
-    testBuffer[1] = '\xfe';
-    testBuffer[2] = '\xff';
-    testBuffer[3] = aznumeric_cast<char>(outString.length());
-
-    memcpy(testBuffer.data() + 4, outString.utf16(), outString.length() * 2);
-
-    // now confirm that we can read it back out
-    QBuffer memBlock(&testBuffer);
-    memBlock.open(QIODevice::ReadOnly);
-    CArchive readArchive(&memBlock, CArchive::load);
-    QString inString;
-    readArchive >> inString;
-
-    EXPECT_EQ(inString, outString);
-}
-
-TEST(CArchive, testWindowsWideCharacterString2ByteLength)
-{
-    // NOTE: CArchive only writes out Utf-8 now, so we can't actually
-    // use that class to encode to Windows wide character strings.
-    // That is why this test (unlike the non-Windows wide character tests)
-    // is manually creating a stream and only confirming that CArchive can decode it.
-
-    int testSize = 0xff + 1; // use a test size greater than 2^8, so that we need two bytes to store the length
-    QString outString = CreateTestString(testSize);
-
-    // we have to write the 0xff marker, then the 2 byte marker to indicate it's wide characters, 
-    // then the marker to indicate it's more than a 1 byte length, then the actual length (2 byte),
-    // then the string, with windows wide characters (2 bytes per)
-    QByteArray testBuffer;
-    testBuffer.resize(1 + 2 + 1 + 2 + (testSize * 2));
-    testBuffer[0] = '\xff';
-    testBuffer[1] = '\xfe';
-    testBuffer[2] = '\xff';
-    testBuffer[3] = '\xff';
-
-    memcpy(testBuffer.data() + 4, &testSize, 2);
-
-    memcpy(testBuffer.data() + 6, outString.utf16(), testSize * 2);
-
-    // now confirm that we can read it back out 
-    QBuffer memBlock(&testBuffer);
-    memBlock.open(QIODevice::ReadOnly);
-    CArchive readArchive(&memBlock, CArchive::load);
-    QString inString;
-    readArchive >> inString;
-
-    EXPECT_EQ(inString, outString);
-}
diff --git a/Code/Sandbox/Editor/Core/Tests/test_Main.cpp b/Code/Sandbox/Editor/Core/Tests/test_Main.cpp
deleted file mode 100644
index 8543977e26..0000000000
--- a/Code/Sandbox/Editor/Core/Tests/test_Main.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-// AzTest
-#include <AzTest/AzTest.h>
-
-// AzCore
-#include <AzCore/Memory/AllocatorScope.h>
-
-// AzFramework
-#include <AzFramework/IO/LocalFileIO.h>
-
-#include <Mocks/ICryPakMock.h>
-
-using ::testing::NiceMock;
-
-class EditorCoreTestEnvironment
-    : public AZ::Test::ITestEnvironment
-{
-public:
-    AZ_TEST_CLASS_ALLOCATOR(EditorCoreTestEnvironment);
-
-    virtual ~EditorCoreTestEnvironment()
-    {
-    }
-
-protected:
-    void SetupEnvironment() override
-    {
-        m_allocatorScope.ActivateAllocators();
-        m_cryPak = new NiceMock<CryPakMock>();
-
-        // Initialize the fileIO
-        AZ::IO::FileIOBase::SetInstance(&m_fileIO);
-
-        // Setup gEnv with the systems/mocks we will be using for the unit tests
-        m_stubEnv.pCryPak = m_cryPak;
-        m_stubEnv.pFileIO = &m_fileIO;
-        gEnv = &m_stubEnv;
-    }
-
-    void TeardownEnvironment() override
-    {
-        delete m_cryPak;
-        m_allocatorScope.DeactivateAllocators();
-    }
-
-private:
-    AZ::AllocatorScope<AZ::OSAllocator, AZ::SystemAllocator, AZ::LegacyAllocator, CryStringAllocator> m_allocatorScope;
-    SSystemGlobalEnvironment m_stubEnv;
-    AZ::IO::LocalFileIO m_fileIO;
-    NiceMock<CryPakMock>* m_cryPak;
-};
-
-AZ_UNIT_TEST_HOOK(new EditorCoreTestEnvironment);
diff --git a/Code/Sandbox/Editor/Core/Tests/test_PathUtil.cpp b/Code/Sandbox/Editor/Core/Tests/test_PathUtil.cpp
deleted file mode 100644
index 58a6f3d7ac..0000000000
--- a/Code/Sandbox/Editor/Core/Tests/test_PathUtil.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include "Util/PathUtil.h"
-#include <CrySystemBus.h>
-
-TEST(PathUtil, GamePathToFullPath_DoesNotBufferOverflow)
-{
-    // There are no test assertions in this test because the purpose is just to verify that the test runs without crashing
-    QString pngExtension(".png");
-
-    // Create a string of lenth AZ_MAX_PATH_LEN that ends in .png
-    QString longStringMaxPath(AZ_MAX_PATH_LEN, 'x');
-    longStringMaxPath.replace(longStringMaxPath.length() - pngExtension.length(), longStringMaxPath.length(), pngExtension);
-    Path::GamePathToFullPath(longStringMaxPath);
-
-    QString longStringMaxPathPlusOne(AZ_MAX_PATH_LEN + 1, 'x');
-    longStringMaxPathPlusOne.replace(longStringMaxPathPlusOne.length() - pngExtension.length(), longStringMaxPathPlusOne.length(), pngExtension);
-    Path::GamePathToFullPath(longStringMaxPathPlusOne);
-}
diff --git a/Code/Sandbox/Editor/CrtDebug.cpp b/Code/Sandbox/Editor/CrtDebug.cpp
deleted file mode 100644
index 66639a86f9..0000000000
--- a/Code/Sandbox/Editor/CrtDebug.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
-//#ifdef _CRTDBG_MAP_ALLOC
-#ifdef CRTDBG_MAP_ALLOC
-#pragma pack (push,1)
-#define nNoMansLandSize 4
-typedef struct MyCrtMemBlockHeader
-{
-    struct MyCrtMemBlockHeader* pBlockHeaderNext;
-    struct MyCrtMemBlockHeader* pBlockHeaderPrev;
-    char*                      szFileName;
-    int                         nLine;
-    size_t                      nDataSize;
-    int                         nBlockUse;
-    long                        lRequest;
-    unsigned char               gap[nNoMansLandSize];
-    /* followed by:
-    *  unsigned char           data[nDataSize];
-    *  unsigned char           anotherGap[nNoMansLandSize];
-    */
-} MyCrtMemBlockHeader;
-#pragma pack (pop)
-
-#define pbData(pblock) ((unsigned char*)((MyCrtMemBlockHeader*)pblock + 1))
-#define pHdr(pbData) (((MyCrtMemBlockHeader*)pbData) - 1)
-
-
-void crtdebug(const char* s, ...)
-{
-    char str[32768];
-    va_list arg_ptr;
-    va_start(arg_ptr, s);
-    vsprintf(str, s, arg_ptr);
-    va_end(arg_ptr);
-
-    FILE* l = nullptr;
-    azfopen(&l, "crtdump.txt", "a+t");
-    if (l)
-    {
-        fprintf(l, "%s", str);
-        fclose(l);
-    }
-}
-
-int crtAllocHook(int nAllocType, void* pvData,
-    size_t nSize, int nBlockUse, long lRequest,
-    const unsigned char* szFileName, int nLine)
-{
-    if (nBlockUse == _CRT_BLOCK)
-    {
-        return(TRUE);
-    }
-
-    static int total_cnt = 0;
-    static int total_mem = 0;
-    if (nAllocType == _HOOK_ALLOC)
-    {
-        //total_mem += nSize;
-        //total_cnt++;
-        //_CrtMemState mem_state;
-        //_CrtMemCheckpoint( &mem_state );
-        //total_cnt = mem_state.lCounts[_NORMAL_BLOCK];
-        //total_mem = mem_state.lTotalCount;
-        if ((total_cnt & 0xF) == 0)
-        {
-            //_CrtCheckMemory();
-        }
-
-        total_cnt++;
-        total_mem += nSize;
-
-        //crtdebug( "<CRT> Alloc %d,size=%d,in: %s %d (total size=%d,num=%d)\n",lRequest,nSize,szFileName,nLine,total_mem,total_cnt );
-        crtdebug("Size=%d,  [Total=%d,N=%d] [%s:%d]\n", nSize, total_mem, total_cnt, szFileName, nLine);
-    }
-    else if (nAllocType == _HOOK_FREE)
-    {
-        MyCrtMemBlockHeader* pHead;
-        pHead = pHdr(pvData);
-
-        total_cnt--;
-        total_mem -= pHead->nDataSize;
-
-        crtdebug("Size=%d,  [Total=%d,N=%d] [%s:%d]\n", pHead->nDataSize, total_mem, total_cnt, pHead->szFileName, pHead->nLine);
-        //crtdebug( "<CRT> Free size=%d,in: %s %d (total size=%d,num=%d)\n",pHead->nDataSize,pHead->szFileName,pHead->nLine,total_mem,total_cnt );
-        //total_mem -= nSize;
-        //total_cnt--;
-    }
-    return TRUE;
-}
-
-int crtReportHook(int nRptType, char* szMsg, int* retVal)
-{
-    static int gl_num_asserts = 0;
-    if (gl_num_asserts != 0)
-    {
-        return TRUE;
-    }
-    gl_num_asserts++;
-    switch (nRptType)
-    {
-    case _CRT_WARN:
-        crtdebug("<CRT WARNING> %s\n", szMsg);
-        break;
-    case _CRT_ERROR:
-        crtdebug("<CRT ERROR> %s\n", szMsg);
-        break;
-    case _CRT_ASSERT:
-        crtdebug("<CRT ASSERT> %s\n", szMsg);
-        break;
-    }
-    gl_num_asserts--;
-    return TRUE;
-}
-
-void InitCrt()
-{
-    FILE* l = nullptr;
-    azfopen(&l, "crtdump.txt", "w");
-    if (l)
-    {
-        fclose(l);
-    }
-
-    //_CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_DEBUG );
-    //_CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_DEBUG );
-    //_CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_DEBUG );
-
-    _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_WNDW);
-    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW);
-    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_WNDW);
-
-    //_CrtSetDbgFlag( _CRTDBG_CHECK_ALWAYS_DF|_CRTDBG_CHECK_CRT_DF|_CRTDBG_LEAK_CHECK_DF|_CRTDBG_DELAY_FREE_MEM_DF | _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) );
-    //_CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF|_CRTDBG_LEAK_CHECK_DF/*|_CRTDBG_DELAY_FREE_MEM_DF*/ | _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) );
-    int flags = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-    flags &= ~_CRTDBG_DELAY_FREE_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_CRT_DF;
-
-    _CrtSetDbgFlag(flags);
-
-    _CrtSetAllocHook (crtAllocHook);
-    _CrtSetReportHook(crtReportHook);
-}
-
-void DoneCrt()
-{
-    //_CrtCheckMemory();
-    //_CrtDumpMemoryLeaks();
-}
-
-// Autoinit CRT.
-//struct __autoinit_crt { __autoinit_crt() { InitCrt(); }; ~__autoinit_crt() { DoneCrt(); } } __autoinit_crt_var;
-#endif
-
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp
deleted file mode 100644
index e143e4dc66..0000000000
--- a/Code/Sandbox/Editor/CryEdit.cpp
+++ /dev/null
@@ -1,4338 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#ifdef WIN32
-AZ_PUSH_DISABLE_WARNING(4458, "-Wunknown-warning-option")
-#include <gdiplus.h>
-AZ_POP_DISABLE_WARNING
-#pragma comment (lib, "Gdiplus.lib")
-
-#include <WinUser.h> // needed for MessageBoxW in the assert handler
-#endif
-
-#include <array>
-#include <string>
-
-#include "CryEdit.h"
-
-// Qt
-#include <QCommandLineParser>
-#include <QSharedMemory>
-#include <QSystemSemaphore>
-#include <QDesktopServices>
-#include <QElapsedTimer>
-#include <QProcess>
-#include <QScopedValueRollback>
-#include <QClipboard>
-#include <QMenuBar>
-
-// Aws Native SDK
-#include <aws/sts/STSClient.h>
-#include <aws/core/auth/AWSCredentialsProvider.h>
-#include <aws/sts/model/GetFederationTokenRequest.h>
-#include <aws/core/http/HttpClient.h>
-#include <aws/core/http/HttpResponse.h>
-#include <aws/core/utils/json/JsonSerializer.h>
-
-// AzCore
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/Module/Environment.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/Utils/Utils.h>
-#include <AzCore/Console/IConsole.h>
-
-// AzFramework
-#include <AzFramework/Components/CameraBus.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-#include <AzFramework/ProjectManager/ProjectManager.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/Component/EditorComponentAPIBus.h>
-#include <AzToolsFramework/Component/EditorLevelComponentAPIBus.h>
-#include <AzToolsFramework/UI/UICore/ProgressShield.hxx>
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <AzToolsFramework/Slice/SliceUtilities.h>
-#include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
-#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
-#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
-#include <AzToolsFramework/PythonTerminal/ScriptHelpDialog.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/StyleManager.h>
-#include <AzQtComponents/Utilities/HandleDpiAwareness.h>
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-#include <AzQtComponents/Utilities/QtPluginPaths.h>
-
-// CryCommon
-#include <CryCommon/ITimer.h>
-#include <CryCommon/IPhysics.h>
-#include <CryCommon/ILevelSystem.h>
-
-// Editor
-#include "Settings.h"
-
-#include "GameExporter.h"
-#include "GameResourcesExporter.h"
-
-#include "ActionManager.h"
-#include "MainWindow.h"
-
-#include "Core/QtEditorApplication.h"
-#include "StringDlg.h"
-#include "NewLevelDialog.h"
-#include "LayoutConfigDialog.h"
-#include "ViewManager.h"
-#include "FileTypeUtils.h"
-#include "PluginManager.h"
-
-#include "IEditorImpl.h"
-#include "StartupLogoDialog.h"
-#include "DisplaySettings.h"
-#include "GameEngine.h"
-
-#include "StartupTraceHandler.h"
-#include "ToolsConfigPage.h"
-#include "Objects/SelectionGroup.h"
-#include "Include/IObjectManager.h"
-#include "WaitProgress.h"
-
-#include "ToolBox.h"
-#include "LevelInfo.h"
-#include "EditorPreferencesDialog.h"
-#include "GraphicsSettingsDialog.h"
-#include "AnimationContext.h"
-
-#include "GotoPositionDlg.h"
-
-#include "ConsoleDialog.h"
-#include "Controls/ConsoleSCB.h"
-
-#include "ScopedVariableSetter.h"
-
-#include "Util/3DConnexionDriver.h"
-
-#include "DimensionsDialog.h"
-
-#include "Util/AutoDirectoryRestoreFileDialog.h"
-#include "Util/EditorAutoLevelLoadTest.h"
-#include "Util/IndexedFiles.h"
-#include "AboutDialog.h"
-#include <AzToolsFramework/PythonTerminal/ScriptHelpDialog.h>
-
-#include "QuickAccessBar.h"
-
-#include "Export/ExportManager.h"
-
-#include "LevelFileDialog.h"
-#include "LevelIndependentFileMan.h"
-#include "WelcomeScreen/WelcomeScreenDialog.h"
-
-#include "Controls/ReflectedPropertyControl/PropertyCtrl.h"
-#include "Controls/ReflectedPropertyControl/ReflectedVar.h"
-
-#include "EditorToolsApplication.h"
-
-#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
-
-// AWSNativeSDK
-#include <AzToolsFramework/Undo/UndoSystem.h>
-#include <AWSNativeSDKInit/AWSNativeSDKInit.h>
-
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <AzFramework/API/ApplicationAPI_Platform.h>
-#endif
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-#include "WindowObserver_mac.h"
-#endif
-
-#include <AzCore/RTTI/BehaviorContext.h>
-
-#include <AzFramework/Render/Intersector.h>
-
-#include <AzCore/std/smart_ptr/make_shared.h>
-
-static const char O3DEEditorClassName[] = "O3DEEditorClass";
-static const char O3DEApplicationName[] = "O3DEApplication";
-
-static AZ::EnvironmentVariable<bool> inEditorBatchMode = nullptr;
-
-RecentFileList::RecentFileList()
-{
-    m_settings.beginGroup(QStringLiteral("Application"));
-    m_settings.beginGroup(QStringLiteral("Recent File List"));
-
-    ReadList();
-}
-
-void RecentFileList::Remove(int index)
-{
-    m_arrNames.removeAt(index);
-}
-
-void RecentFileList::Add(const QString& f)
-{
-    QString filename = QDir::toNativeSeparators(f);
-    m_arrNames.removeAll(filename);
-    m_arrNames.push_front(filename);
-    while (m_arrNames.count() > Max)
-    {
-        m_arrNames.removeAt(Max);
-    }
-}
-
-int RecentFileList::GetSize()
-{
-    return m_arrNames.count();
-}
-
-void RecentFileList::GetDisplayName(QString& name, int index, const QString& curDir)
-{
-    name = m_arrNames[index];
-
-    const QDir cur(curDir);
-    QDir fileDir(name); // actually pointing at file, first cdUp() gets us the parent dir
-    while (fileDir.cdUp())
-    {
-        if (fileDir == cur)
-        {
-            name = cur.relativeFilePath(name);
-            break;
-        }
-    }
-
-    name = QDir::toNativeSeparators(name);
-}
-
-QString& RecentFileList::operator[](int index)
-{
-    return m_arrNames[index];
-}
-
-void RecentFileList::ReadList()
-{
-    m_arrNames.clear();
-
-    for (int i = 1; i <= Max; ++i)
-    {
-        QString f = m_settings.value(QStringLiteral("File%1").arg(i)).toString();
-        if (!f.isEmpty())
-        {
-            m_arrNames.push_back(f);
-        }
-    }
-}
-
-void RecentFileList::WriteList()
-{
-    m_settings.remove(QString());
-
-    int i = 1;
-    for (auto f : m_arrNames)
-    {
-        m_settings.setValue(QStringLiteral("File%1").arg(i++), f);
-    }
-}
-
-
-
-#define ERROR_LEN 256
-
-
-CCryDocManager::CCryDocManager()
-{
-}
-
-CCrySingleDocTemplate* CCryDocManager::SetDefaultTemplate(CCrySingleDocTemplate* pNew)
-{
-    CCrySingleDocTemplate* pOld = m_pDefTemplate;
-    m_pDefTemplate = pNew;
-    m_templateList.clear();
-    m_templateList.push_back(m_pDefTemplate);
-    return pOld;
-}
-// Copied from MFC to get rid of the silly ugly unoverridable doc-type pick dialog
-void CCryDocManager::OnFileNew()
-{
-    assert(m_pDefTemplate != NULL);
-
-    m_pDefTemplate->OpenDocumentFile(NULL);
-    // if returns NULL, the user has already been alerted
-}
-BOOL CCryDocManager::DoPromptFileName(QString& fileName, [[maybe_unused]] UINT nIDSTitle,
-    [[maybe_unused]] DWORD lFlags, BOOL bOpenFileDialog, [[maybe_unused]] CDocTemplate* pTemplate)
-{
-    CLevelFileDialog levelFileDialog(bOpenFileDialog);
-    levelFileDialog.show();
-    levelFileDialog.adjustSize();
-
-    if (levelFileDialog.exec() == QDialog::Accepted)
-    {
-        fileName = levelFileDialog.GetFileName();
-        return true;
-    }
-
-    return false;
-}
-CCryEditDoc* CCryDocManager::OpenDocumentFile(LPCTSTR lpszFileName, BOOL bAddToMRU)
-{
-    assert(lpszFileName != NULL);
-
-    // find the highest confidence
-    auto pos = m_templateList.begin();
-    CCrySingleDocTemplate::Confidence bestMatch = CCrySingleDocTemplate::noAttempt;
-    CCrySingleDocTemplate* pBestTemplate = NULL;
-    CCryEditDoc* pOpenDocument = NULL;
-
-    if (lpszFileName[0] == '\"')
-    {
-        ++lpszFileName;
-    }
-    QString szPath = QString::fromUtf8(lpszFileName);
-    if (szPath.endsWith('"'))
-    {
-        szPath.remove(szPath.length() - 1, 1);
-    }
-
-    while (pos != m_templateList.end())
-    {
-        auto pTemplate = *(pos++);
-
-        CCrySingleDocTemplate::Confidence match;
-        assert(pOpenDocument == NULL);
-        match = pTemplate->MatchDocType(szPath.toUtf8().data(), pOpenDocument);
-        if (match > bestMatch)
-        {
-            bestMatch = match;
-            pBestTemplate = pTemplate;
-        }
-        if (match == CCrySingleDocTemplate::yesAlreadyOpen)
-        {
-            break;      // stop here
-        }
-    }
-
-    if (pOpenDocument != NULL)
-    {
-        return pOpenDocument;
-    }
-
-    if (pBestTemplate == NULL)
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Failed to open document."));
-        return NULL;
-    }
-
-    return pBestTemplate->OpenDocumentFile(szPath.toUtf8().data(), bAddToMRU, FALSE);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CCryEditApp
-
-#undef ON_COMMAND
-#define ON_COMMAND(id, method) \
-    MainWindow::instance()->GetActionManager()->RegisterActionHandler(id, this, &CCryEditApp::method);
-
-#undef ON_COMMAND_RANGE
-#define ON_COMMAND_RANGE(idStart, idEnd, method) \
-    for (int i = idStart; i <= idEnd; ++i) \
-        ON_COMMAND(i, method);
-
-AZ_CVAR_EXTERNED(bool, ed_previewGameInFullscreen_once);
-
-void CCryEditApp::RegisterActionHandlers()
-{
-    ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
-    ON_COMMAND(ID_APP_SHOW_WELCOME, OnAppShowWelcomeScreen)
-    ON_COMMAND(ID_DOCUMENTATION_TUTORIALS, OnDocumentationTutorials)
-    ON_COMMAND(ID_DOCUMENTATION_O3DE, OnDocumentationO3DE)
-    ON_COMMAND(ID_DOCUMENTATION_GAMELIFT, OnDocumentationGamelift)
-    ON_COMMAND(ID_DOCUMENTATION_RELEASENOTES, OnDocumentationReleaseNotes)
-    ON_COMMAND(ID_DOCUMENTATION_GAMEDEVBLOG, OnDocumentationGameDevBlog)
-    ON_COMMAND(ID_DOCUMENTATION_FORUMS, OnDocumentationForums)
-    ON_COMMAND(ID_DOCUMENTATION_AWSSUPPORT, OnDocumentationAWSSupport)
-    ON_COMMAND(ID_FILE_EXPORT_SELECTEDOBJECTS, OnExportSelectedObjects)
-    ON_COMMAND(ID_EDIT_HOLD, OnEditHold)
-    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_MOVE_OBJECT, OnMoveObject)
-    ON_COMMAND(ID_RENAME_OBJ, OnRenameObj)
-    ON_COMMAND(ID_EDITMODE_MOVE, OnEditmodeMove)
-    ON_COMMAND(ID_EDITMODE_ROTATE, OnEditmodeRotate)
-    ON_COMMAND(ID_EDITMODE_SCALE, OnEditmodeScale)
-    ON_COMMAND(ID_UNDO, OnUndo)
-    ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnUndo)     // Can't use the same ID, because for the menu we can't have a QWidgetAction, while for the toolbar we want one
-    ON_COMMAND(ID_IMPORT_ASSET, OnOpenAssetImporter)
-    ON_COMMAND(ID_EDIT_LEVELDATA, OnEditLevelData)
-    ON_COMMAND(ID_FILE_EDITLOGFILE, OnFileEditLogFile)
-    ON_COMMAND(ID_FILE_RESAVESLICES, OnFileResaveSlices)
-    ON_COMMAND(ID_FILE_EDITEDITORINI, OnFileEditEditorini)
-    ON_COMMAND(ID_PREFERENCES, OnPreferences)
-    ON_COMMAND(ID_REDO, OnRedo)
-    ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnRedo)
-    ON_COMMAND(ID_FILE_OPEN_LEVEL, OnOpenLevel)
-#ifdef ENABLE_SLICE_EDITOR
-    ON_COMMAND(ID_FILE_NEW_SLICE, OnCreateSlice)
-    ON_COMMAND(ID_FILE_OPEN_SLICE, OnOpenSlice)
-#endif
-    ON_COMMAND(ID_SWITCH_PHYSICS, OnSwitchPhysics)
-    ON_COMMAND(ID_GAME_SYNCPLAYER, OnSyncPlayer)
-    ON_COMMAND(ID_RESOURCES_REDUCEWORKINGSET, OnResourcesReduceworkingset)
-
-    ON_COMMAND(ID_VIEW_CONFIGURELAYOUT, OnViewConfigureLayout)
-
-    ON_COMMAND(IDC_SELECTION, OnDummyCommand)
-    //////////////////////////////////////////////////////////////////////////
-    ON_COMMAND(ID_TAG_LOC1, OnTagLocation1)
-    ON_COMMAND(ID_TAG_LOC2, OnTagLocation2)
-    ON_COMMAND(ID_TAG_LOC3, OnTagLocation3)
-    ON_COMMAND(ID_TAG_LOC4, OnTagLocation4)
-    ON_COMMAND(ID_TAG_LOC5, OnTagLocation5)
-    ON_COMMAND(ID_TAG_LOC6, OnTagLocation6)
-    ON_COMMAND(ID_TAG_LOC7, OnTagLocation7)
-    ON_COMMAND(ID_TAG_LOC8, OnTagLocation8)
-    ON_COMMAND(ID_TAG_LOC9, OnTagLocation9)
-    ON_COMMAND(ID_TAG_LOC10, OnTagLocation10)
-    ON_COMMAND(ID_TAG_LOC11, OnTagLocation11)
-    ON_COMMAND(ID_TAG_LOC12, OnTagLocation12)
-    //////////////////////////////////////////////////////////////////////////
-    ON_COMMAND(ID_GOTO_LOC1, OnGotoLocation1)
-    ON_COMMAND(ID_GOTO_LOC2, OnGotoLocation2)
-    ON_COMMAND(ID_GOTO_LOC3, OnGotoLocation3)
-    ON_COMMAND(ID_GOTO_LOC4, OnGotoLocation4)
-    ON_COMMAND(ID_GOTO_LOC5, OnGotoLocation5)
-    ON_COMMAND(ID_GOTO_LOC6, OnGotoLocation6)
-    ON_COMMAND(ID_GOTO_LOC7, OnGotoLocation7)
-    ON_COMMAND(ID_GOTO_LOC8, OnGotoLocation8)
-    ON_COMMAND(ID_GOTO_LOC9, OnGotoLocation9)
-    ON_COMMAND(ID_GOTO_LOC10, OnGotoLocation10)
-    ON_COMMAND(ID_GOTO_LOC11, OnGotoLocation11)
-    ON_COMMAND(ID_GOTO_LOC12, OnGotoLocation12)
-    //////////////////////////////////////////////////////////////////////////
-
-    ON_COMMAND(ID_TOOLS_LOGMEMORYUSAGE, OnToolsLogMemoryUsage)
-    ON_COMMAND(ID_TOOLS_CUSTOMIZEKEYBOARD, OnCustomizeKeyboard)
-    ON_COMMAND(ID_TOOLS_CONFIGURETOOLS, OnToolsConfiguretools)
-    ON_COMMAND(ID_TOOLS_SCRIPTHELP, OnToolsScriptHelp)
-#ifdef FEATURE_ORTHOGRAPHIC_VIEW
-    ON_COMMAND(ID_VIEW_CYCLE2DVIEWPORT, OnViewCycle2dviewport)
-#endif
-    ON_COMMAND(ID_DISPLAY_GOTOPOSITION, OnDisplayGotoPosition)
-    ON_COMMAND(ID_FILE_SAVELEVELRESOURCES, OnFileSavelevelresources)
-    ON_COMMAND(ID_CLEAR_REGISTRY, OnClearRegistryData)
-    ON_COMMAND(ID_VALIDATELEVEL, OnValidatelevel)
-    ON_COMMAND(ID_TOOLS_PREFERENCES, OnToolsPreferences)
-    ON_COMMAND(ID_GRAPHICS_SETTINGS, OnGraphicsSettings)
-    ON_COMMAND(ID_SWITCHCAMERA_DEFAULTCAMERA, OnSwitchToDefaultCamera)
-    ON_COMMAND(ID_SWITCHCAMERA_SEQUENCECAMERA, OnSwitchToSequenceCamera)
-    ON_COMMAND(ID_SWITCHCAMERA_SELECTEDCAMERA, OnSwitchToSelectedcamera)
-    ON_COMMAND(ID_SWITCHCAMERA_NEXT, OnSwitchcameraNext)
-    ON_COMMAND(ID_OPEN_SUBSTANCE_EDITOR, OnOpenProceduralMaterialEditor)
-    ON_COMMAND(ID_OPEN_ASSET_BROWSER, OnOpenAssetBrowserView)
-    ON_COMMAND(ID_OPEN_AUDIO_CONTROLS_BROWSER, OnOpenAudioControlsEditor)
-
-    ON_COMMAND(ID_DISPLAY_SHOWHELPERS, OnShowHelpers)
-    ON_COMMAND(ID_OPEN_TRACKVIEW, OnOpenTrackView)
-    ON_COMMAND(ID_OPEN_UICANVASEDITOR, OnOpenUICanvasEditor)
-
-    ON_COMMAND_RANGE(ID_GAME_PC_ENABLELOWSPEC, ID_GAME_PC_ENABLEVERYHIGHSPEC, OnChangeGameSpec)
-
-    ON_COMMAND_RANGE(ID_GAME_OSXMETAL_ENABLELOWSPEC, ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC, OnChangeGameSpec)
-
-    ON_COMMAND_RANGE(ID_GAME_ANDROID_ENABLELOWSPEC, ID_GAME_ANDROID_ENABLEVERYHIGHSPEC, OnChangeGameSpec)
-
-    ON_COMMAND_RANGE(ID_GAME_IOS_ENABLELOWSPEC, ID_GAME_IOS_ENABLEVERYHIGHSPEC, OnChangeGameSpec)
-
-#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)\
-    ON_COMMAND_RANGE(ID_GAME_##CODENAME##_ENABLELOWSPEC, ID_GAME_##CODENAME##_ENABLEHIGHSPEC, OnChangeGameSpec)
-    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-
-    ON_COMMAND(ID_OPEN_QUICK_ACCESS_BAR, OnOpenQuickAccessBar)
-
-    ON_COMMAND(ID_FILE_SAVE_LEVEL, OnFileSave)
-    ON_COMMAND(ID_FILE_EXPORTOCCLUSIONMESH, OnFileExportOcclusionMesh)
-
-    // Project Manager 
-    ON_COMMAND(ID_FILE_PROJECT_MANAGER_SETTINGS, OnOpenProjectManagerSettings)
-    ON_COMMAND(ID_FILE_PROJECT_MANAGER_NEW, OnOpenProjectManagerNew)
-    ON_COMMAND(ID_FILE_PROJECT_MANAGER_OPEN, OnOpenProjectManager)
-}
-
-CCryEditApp* CCryEditApp::s_currentInstance = nullptr;
-/////////////////////////////////////////////////////////////////////////////
-// CCryEditApp construction
-CCryEditApp::CCryEditApp()
-{
-    s_currentInstance = this;
-
-    m_sPreviewFile[0] = 0;
-
-    // Place all significant initialization in InitInstance
-    ZeroStruct(m_tagLocations);
-    ZeroStruct(m_tagAngles);
-
-    AzFramework::AssetSystemInfoBus::Handler::BusConnect();
-
-    m_disableIdleProcessingCounter = 0;
-    EditorIdleProcessingBus::Handler::BusConnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CCryEditApp::~CCryEditApp()
-{
-    EditorIdleProcessingBus::Handler::BusDisconnect();
-    AzFramework::AssetSystemInfoBus::Handler::BusDisconnect();
-    s_currentInstance = nullptr;
-}
-
-CCryEditApp* CCryEditApp::instance()
-{
-    return s_currentInstance;
-}
-
-class CEditCommandLineInfo
-{
-public:
-    bool m_bTest = false;
-    bool m_bAutoLoadLevel = false;
-    bool m_bExport = false;
-    bool m_bExportTexture = false;
-
-    bool m_bMatEditMode = false;
-
-    bool m_bConsoleMode = false;
-    bool m_bNullRenderer = false;
-    bool m_bDeveloperMode = false;
-    bool m_bRunPythonScript = false;
-    bool m_bRunPythonTestScript = false;
-    bool m_bShowVersionInfo = false;
-    QString m_exportFile;
-    QString m_strFileName;
-    QString m_appRoot;
-    QString m_logFile;
-    QString m_pythonArgs;
-    QString m_pythontTestCase;
-    QString m_execFile;
-    QString m_execLineCmd;
-
-    bool m_bSkipWelcomeScreenDialog = false;
-    bool m_bAutotestMode = false;
-
-    struct CommandLineStringOption
-    {
-        QString name;
-        QString description;
-        QString valueName;
-    };
-
-    CEditCommandLineInfo()
-    {
-        bool dummy;
-        QCommandLineParser parser;
-        parser.addHelpOption();
-        parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
-        parser.setApplicationDescription(QObject::tr("O3DE Editor"));
-        // nsDocumentRevisionDebugMode is an argument that the macOS system passed into an App bundle that is being debugged.
-        // Need to include it here so that Qt argument parser does not error out.
-        bool nsDocumentRevisionsDebugMode = false;
-        const std::vector<std::pair<QString, bool&> > options = {
-            { "export", m_bExport },
-            { "exportTexture", m_bExportTexture },
-            { "test", m_bTest },
-            { "auto_level_load", m_bAutoLoadLevel },
-            { "MatEdit", m_bMatEditMode },
-            { "BatchMode", m_bConsoleMode },
-            { "NullRenderer", m_bNullRenderer },
-            { "devmode", m_bDeveloperMode },
-            { "VTUNE", dummy },
-            { "runpython", m_bRunPythonScript },
-            { "runpythontest", m_bRunPythonTestScript },
-            { "version", m_bShowVersionInfo },
-            { "NSDocumentRevisionsDebugMode", nsDocumentRevisionsDebugMode},
-            { "skipWelcomeScreenDialog", m_bSkipWelcomeScreenDialog},
-            { "autotest_mode", m_bAutotestMode},
-            { "regdumpall", dummy }
-        };
-
-        QString dummyString;
-        const std::vector<std::pair<CommandLineStringOption, QString&> > stringOptions = {
-            {{"logfile", "File name of the log file to write out to.", "logfile"}, m_logFile},
-            {{"runpythonargs", "Command-line argument string to pass to the python script if --runpython or --runpythontest was used.", "runpythonargs"}, m_pythonArgs},
-            {{"pythontestcase", "Test case name of python test script if --runpythontest was used.", "pythontestcase"}, m_pythontTestCase},
-            {{"exec", "cfg file to run on startup, used for systems like automation", "exec"}, m_execFile},
-            {{"rhi", "Command-line argument to force which rhi to use", "dummyString"}, dummyString },
-            {{"rhi-device-validation", "Command-line argument to configure rhi validation", "dummyString"}, dummyString },
-            {{"exec_line", "command to run on startup, used for systems like automation", "exec_line"}, m_execLineCmd},
-            {{"regset", "Command-line argument to override settings registry values", "regset"}, dummyString},
-            {{"regremove", "Deletes a value within the global settings registry at the JSON pointer path @key", "regremove"}, dummyString},
-            {{"regdump", "Sets a value within the global settings registry at the JSON pointer path @key with value of @value", "regdump"}, dummyString},
-            {{"project-path", "Supplies the path to the project that the Editor should use", "project-path"}, dummyString},
-            {{"engine-path", "Supplies the path to the engine", "engine-path"}, dummyString},
-            {{"project-cache-path", "Path to the project cache", "project-cache-path"}, dummyString},
-            // add dummy entries here to prevent QCommandLineParser error-ing out on cmd line args that will be parsed later
-        };
-
-
-        parser.addPositionalArgument("file", QCoreApplication::translate("main", "file to open"));
-        for (const auto& option : options)
-        {
-            parser.addOption(QCommandLineOption(option.first));
-        }
-
-        for (const auto& option : stringOptions)
-        {
-            parser.addOption(QCommandLineOption(option.first.name, option.first.description, option.first.valueName));
-        }
-
-        QStringList args = qApp->arguments();
-
-#ifdef Q_OS_WIN32
-        for (QString& arg : args)
-        {
-            if (!arg.isEmpty() && arg[0] == '/')
-            {
-                arg[0] = '-'; // QCommandLineParser only supports - and -- prefixes
-            }
-        }
-#endif
-
-        if (!parser.parse(args))
-        {
-            AZ_TracePrintf("QT CommandLine Parser", "QT command line parsing warned with message %s."
-                " Has the QCommandLineParser had these options added to it", parser.errorText().toUtf8().constData());
-        }
-
-        // Get boolean options
-        const int numOptions = options.size();
-        for (int i = 0; i < numOptions; ++i)
-        {
-            options[i].second = parser.isSet(options[i].first);
-        }
-
-        // Get string options
-        for (auto& option : stringOptions)
-        {
-            option.second = parser.value(option.first.valueName);
-        }
-
-        m_bExport = m_bExport || m_bExportTexture;
-
-        const QStringList positionalArgs = parser.positionalArguments();
-
-        if (!positionalArgs.isEmpty())
-        {
-            m_strFileName = positionalArgs.first();
-
-            if (positionalArgs.first().at(0) != '[')
-            {
-                m_exportFile = positionalArgs.first();
-            }
-        }
-    }
-};
-
-struct SharedData
-{
-    bool raise = false;
-    char text[_MAX_PATH];
-};
-/////////////////////////////////////////////////////////////////////////////
-// CTheApp::FirstInstance
-//      FirstInstance checks for an existing instance of the application.
-//      If one is found, it is activated.
-//
-//      This function uses a technique similar to that described in KB
-//      article Q141752 to locate the previous instance of the application. .
-BOOL CCryEditApp::FirstInstance(bool bForceNewInstance)
-{
-    QSystemSemaphore sem(QString(O3DEApplicationName) + "_sem", 1);
-    sem.acquire();
-    {
-        FixDanglingSharedMemory(O3DEEditorClassName);
-    }
-    sem.release();
-    m_mutexApplication = new QSharedMemory(O3DEEditorClassName);
-    if (!m_mutexApplication->create(sizeof(SharedData)) && !bForceNewInstance)
-    {
-        m_mutexApplication->attach();
-        // another instance is already running - activate it
-        sem.acquire();
-        SharedData* data = reinterpret_cast<SharedData*>(m_mutexApplication->data());
-        data->raise = true;
-
-        if (m_bPreviewMode)
-        {
-            // IF in preview mode send this window copy data message to load new preview file.
-            azstrcpy(data->text, MAX_PATH, m_sPreviewFile);
-        }
-        return false;
-    }
-    else
-    {
-        m_mutexApplication->attach();
-        // this is the first instance
-        sem.acquire();
-        ::memset(m_mutexApplication->data(), 0, m_mutexApplication->size());
-        sem.release();
-        QTimer* t = new QTimer(this);
-        connect(t, &QTimer::timeout, this, [this]() {
-            QSystemSemaphore sem(QString(O3DEApplicationName) + "_sem", 1);
-            sem.acquire();
-            SharedData* data = reinterpret_cast<SharedData*>(m_mutexApplication->data());
-            QString preview = QString::fromLatin1(data->text);
-            if (data->raise)
-            {
-                QWidget* w = MainWindow::instance();
-                w->setWindowState((w->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
-                w->raise();
-                w->activateWindow();
-                data->raise = false;
-            }
-            if (!preview.isEmpty())
-            {
-                // Load this file
-                LoadFile(preview);
-                data->text[0] = 0;
-            }
-            sem.release();
-        });
-        t->start(1000);
-
-        return true;
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnFileSave()
-{
-    if (m_savingLevel)
-    {
-        return;
-    }
-
-    const QScopedValueRollback<bool> rollback(m_savingLevel, true);
-
-    GetIEditor()->GetDocument()->DoFileSave();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateDocumentReady(QAction* action)
-{
-    action->setEnabled(GetIEditor()
-        && GetIEditor()->GetDocument()
-        && GetIEditor()->GetDocument()->IsDocumentReady()
-        && !m_bIsExportingLegacyData
-        && !m_creatingNewLevel
-        && !m_openingLevel
-        && !m_savingLevel);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateFileOpen(QAction* action)
-{
-    action->setEnabled(!m_bIsExportingLegacyData && !m_creatingNewLevel && !m_openingLevel && !m_savingLevel);
-}
-
-bool CCryEditApp::ShowEnableDisableGemDialog(const QString& title, const QString& message)
-{
-    const QString informativeMessage = QObject::tr("Please follow the instructions <a href=\"http://docs.aws.amazon.com/lumberyard/latest/userguide/gems-system-gems.html\">here</a>, after which the Editor will be re-launched automatically.");
-
-    QMessageBox box(AzToolsFramework::GetActiveWindow());
-    box.addButton(QObject::tr("Continue"), QMessageBox::AcceptRole);
-    box.addButton(QObject::tr("Back"), QMessageBox::RejectRole);
-    box.setWindowTitle(title);
-    box.setText(message);
-    box.setInformativeText(informativeMessage);
-    box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    if (box.exec() == QMessageBox::AcceptRole)
-    {
-        // Called from a modal dialog with the main window as its parent. Best not to close the main window while the dialog is still active.
-        QTimer::singleShot(0, MainWindow::instance(), &MainWindow::close);
-        return true;
-    }
-
-    return false;
-}
-
-QString CCryEditApp::ShowWelcomeDialog()
-{
-    WelcomeScreenDialog wsDlg(MainWindow::instance());
-    wsDlg.SetRecentFileList(GetRecentFileList());
-    wsDlg.exec();
-    QString levelName = wsDlg.GetLevelPath();
-    return levelName;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::InitDirectory()
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Initializes Root folder of the game.
-    //////////////////////////////////////////////////////////////////////////
-    QString szExeFileName = qApp->applicationDirPath();
-    const static char* s_engineMarkerFile = "engine.json";
-
-    while (!QFile::exists(QString("%1/%2").arg(szExeFileName, s_engineMarkerFile)))
-    {
-        QDir currentdir(szExeFileName);
-        if (!currentdir.cdUp())
-        {
-            break;
-        }
-        szExeFileName = currentdir.absolutePath();
-    }
-    QDir::setCurrent(szExeFileName);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// Needed to work with custom memory manager.
-//////////////////////////////////////////////////////////////////////////
-
-CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(LPCTSTR lpszPathName, BOOL bMakeVisible /*= true*/)
-{
-    return OpenDocumentFile(lpszPathName, true, bMakeVisible);
-}
-
-CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(LPCTSTR lpszPathName, BOOL bAddToMRU, [[maybe_unused]] BOOL bMakeVisible)
-{
-    CCryEditDoc* pCurDoc = GetIEditor()->GetDocument();
-
-    if (pCurDoc)
-    {
-        if (!pCurDoc->SaveModified())
-        {
-            return nullptr;
-        }
-    }
-
-    if (!pCurDoc)
-    {
-        pCurDoc = qobject_cast<CCryEditDoc*>(m_documentClass->newInstance());
-        if (pCurDoc == nullptr)
-            return nullptr;
-        pCurDoc->setParent(this);
-    }
-
-    pCurDoc->SetModifiedFlag(false);
-    if (lpszPathName == nullptr)
-    {
-        pCurDoc->SetTitle(tr("Untitled"));
-        pCurDoc->OnNewDocument();
-    }
-    else
-    {
-        pCurDoc->OnOpenDocument(lpszPathName);
-        pCurDoc->SetPathName(lpszPathName);
-        if (bAddToMRU)
-        {
-            CCryEditApp::instance()->AddToRecentFileList(lpszPathName);
-        }
-    }
-
-    return pCurDoc;
-}
-
-CCrySingleDocTemplate::Confidence CCrySingleDocTemplate::MatchDocType(LPCTSTR lpszPathName, CCryEditDoc*& rpDocMatch)
-{
-    assert(lpszPathName != NULL);
-    rpDocMatch = NULL;
-
-    // go through all documents
-    CCryEditDoc* pDoc = GetIEditor()->GetDocument();
-    if (pDoc)
-    {
-        QString prevPathName = pDoc->GetLevelPathName();
-        // all we need to know here is whether it is the same file as before.
-        if (!prevPathName.isEmpty())
-        {
-            // QFileInfo is guaranteed to return true iff the two paths refer to the same path.
-            if (QFileInfo(prevPathName) == QFileInfo(QString::fromUtf8(lpszPathName)))
-            {
-                // already open
-                rpDocMatch = pDoc;
-                return yesAlreadyOpen;
-            }
-        }
-    }
-
-    // see if it matches our default suffix
-
-    const QString strFilterExt = EditorUtils::LevelFile::GetDefaultFileExtension();
-    const QString strOldFilterExt = EditorUtils::LevelFile::GetOldCryFileExtension();
-    const QString strSliceFilterExt = AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str();
-
-    // see if extension matches
-    assert(strFilterExt[0] == '.');
-    QString strDot = "." + Path::GetExt(lpszPathName);
-    if (!strDot.isEmpty())
-    {
-        if(strDot == strFilterExt || strDot == strOldFilterExt || strDot == strSliceFilterExt)
-        {
-            return yesAttemptNative; // extension matches, looks like ours
-        }
-    }
-    // otherwise we will guess it may work
-    return yesAttemptForeign;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-namespace
-{
-    CryMutex g_splashScreenStateLock;
-    CryConditionVariable g_splashScreenStateChange;
-    enum ESplashScreenState
-    {
-        eSplashScreenState_Init, eSplashScreenState_Started, eSplashScreenState_Destroy
-    };
-    ESplashScreenState g_splashScreenState = eSplashScreenState_Init;
-    IInitializeUIInfo* g_pInitializeUIInfo = nullptr;
-    QWidget* g_splashScreen = nullptr;
-}
-
-QString FormatVersion(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
-}
-
-QString FormatRichTextCopyrightNotice()
-{
-    // copyright symbol is HTML Entity = &#xA9;
-    QString copyrightHtmlSymbol = "&#xA9;";
-    QString copyrightString = QObject::tr("Copyright %1 Contributors to the Open 3D Engine Project");
-
-    return copyrightString.arg(copyrightHtmlSymbol);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CCryEditApp::ShowSplashScreen(CCryEditApp* app)
-{
-    g_splashScreenStateLock.Lock();
-
-    CStartupLogoDialog* splashScreen = new CStartupLogoDialog(FormatVersion(app->m_pEditor->GetFileVersion()), FormatRichTextCopyrightNotice());
-
-    g_pInitializeUIInfo = splashScreen;
-    g_splashScreen = splashScreen;
-    g_splashScreenState = eSplashScreenState_Started;
-
-    g_splashScreenStateLock.Unlock();
-    g_splashScreenStateChange.Notify();
-
-    splashScreen->show();
-    // Make sure the initial paint of the splash screen occurs so we dont get stuck with a blank window
-    QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-
-    QObject::connect(splashScreen, &QObject::destroyed, splashScreen, [=]
-    {
-        g_splashScreenStateLock.Lock();
-        g_pInitializeUIInfo = nullptr;
-        g_splashScreen = nullptr;
-        g_splashScreenStateLock.Unlock();
-    });
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CCryEditApp::CreateSplashScreen()
-{
-    if (!m_bConsoleMode && !IsInAutotestMode())
-    {
-        // Create startup output splash
-        ShowSplashScreen(this);
-
-        GetIEditor()->Notify(eNotify_OnSplashScreenCreated);
-    }
-    else
-    {
-        // Create console
-        m_pConsoleDialog = new CConsoleDialog();
-        m_pConsoleDialog->show();
-
-        g_pInitializeUIInfo = m_pConsoleDialog;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CCryEditApp::CloseSplashScreen()
-{
-    if (CStartupLogoDialog::instance())
-    {
-        delete CStartupLogoDialog::instance();
-        g_splashScreenStateLock.Lock();
-        g_splashScreenState = eSplashScreenState_Destroy;
-        g_splashScreenStateLock.Unlock();
-    }
-
-    GetIEditor()->Notify(eNotify_OnSplashScreenDestroyed);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OutputStartupMessage(QString str)
-{
-    g_splashScreenStateLock.Lock();
-    if (g_pInitializeUIInfo)
-    {
-        g_pInitializeUIInfo->SetInfoText(str.toUtf8().data());
-    }
-    g_splashScreenStateLock.Unlock();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::InitFromCommandLine(CEditCommandLineInfo& cmdInfo)
-{
-    m_bConsoleMode |= cmdInfo.m_bConsoleMode;
-    inEditorBatchMode = AZ::Environment::CreateVariable<bool>("InEditorBatchMode", m_bConsoleMode);
-
-    m_bTestMode |= cmdInfo.m_bTest;
-
-    m_bSkipWelcomeScreenDialog = cmdInfo.m_bSkipWelcomeScreenDialog || !cmdInfo.m_execFile.isEmpty() || !cmdInfo.m_execLineCmd.isEmpty() || cmdInfo.m_bAutotestMode;
-    m_bExportMode = cmdInfo.m_bExport;
-    m_bRunPythonTestScript = cmdInfo.m_bRunPythonTestScript;
-    m_bRunPythonScript = cmdInfo.m_bRunPythonScript || cmdInfo.m_bRunPythonTestScript;
-    m_execFile = cmdInfo.m_execFile;
-    m_execLineCmd = cmdInfo.m_execLineCmd;
-    m_bAutotestMode = cmdInfo.m_bAutotestMode || cmdInfo.m_bConsoleMode;
-
-    m_pEditor->SetMatEditMode(cmdInfo.m_bMatEditMode);
-
-    if (m_bExportMode)
-    {
-        m_exportFile = cmdInfo.m_exportFile;
-    }
-
-    // Do we have a passed filename ?
-    if (!cmdInfo.m_strFileName.isEmpty())
-    {
-        if (!m_bRunPythonScript && IsPreviewableFileType(cmdInfo.m_strFileName.toUtf8().constData()))
-        {
-            m_bPreviewMode = true;
-            azstrncpy(m_sPreviewFile, _MAX_PATH, cmdInfo.m_strFileName.toUtf8().constData(), _MAX_PATH);
-        }
-    }
-
-    if (cmdInfo.m_bAutoLoadLevel)
-    {
-        m_bLevelLoadTestMode = true;
-        gEnv->bNoAssertDialog = true;
-        CEditorAutoLevelLoadTest::Instance();
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-AZ::Outcome<void, AZStd::string> CCryEditApp::InitGameSystem(HWND hwndForInputSystem)
-{
-    CGameEngine* pGameEngine = new CGameEngine;
-
-    AZ::Outcome<void, AZStd::string> initOutcome = pGameEngine->Init(m_bPreviewMode, m_bTestMode, qApp->arguments().join(" ").toUtf8().data(), g_pInitializeUIInfo, hwndForInputSystem);
-    if (!initOutcome.IsSuccess())
-    {
-        return initOutcome;
-    }
-
-    AZ_Assert(pGameEngine, "Game engine initialization failed, but initOutcome returned success.");
-
-    m_pEditor->SetGameEngine(pGameEngine);
-
-    // needs to be called after CrySystem has been loaded.
-    gSettings.LoadDefaultGamePaths();
-
-    return AZ::Success();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-BOOL CCryEditApp::CheckIfAlreadyRunning()
-{
-    bool bForceNewInstance = false;
-
-    if (!m_bPreviewMode)
-    {
-        FixDanglingSharedMemory(O3DEApplicationName);
-        m_mutexApplication = new QSharedMemory(O3DEApplicationName);
-        if (!m_mutexApplication->create(16))
-        {
-            // Don't prompt the user in non-interactive export mode.  Instead, default to allowing multiple instances to
-            // run simultaneously, so that multiple level exports can be run in parallel on the same machine.
-            // NOTE:  If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs
-            // from trying to write to the same level at the same time.
-            // If we're running interactively, let's ask and make sure the user actually intended to do this.
-            if (!m_bExportMode && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Too many apps"), QObject::tr("There is already an Open 3D Engine application running\nDo you want to start another one?")) != QMessageBox::Yes)
-            {
-                return false;
-            }
-
-            bForceNewInstance = true;
-        }
-    }
-
-    if (!FirstInstance(bForceNewInstance))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-bool CCryEditApp::InitGame()
-{
-    if (!m_bPreviewMode && !GetIEditor()->IsInMatEditMode())
-    {
-        AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
-        Log((QString("project_path = %1").arg(!projectPath.empty() ? projectPath.c_str() : "<not set>")).toUtf8().data());
-
-        ICVar* pVar = gEnv->pConsole->GetCVar("sys_localization_folder");
-        const char* sLocalizationFolder = pVar ? pVar->GetString() : nullptr;
-        Log((QString("sys_localization_folder = ") + (sLocalizationFolder && sLocalizationFolder[0] ? sLocalizationFolder : "<not set>")).toUtf8().data());
-
-        OutputStartupMessage("Starting Game...");
-
-        if (!GetIEditor()->GetGameEngine()->InitGame(nullptr))
-        {
-            return false;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Apply settings post engine initialization.
-    GetIEditor()->GetDisplaySettings()->PostInitApply();
-    gSettings.PostInitApply();
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CCryEditApp::InitPlugins()
-{
-    OutputStartupMessage("Loading Plugins...");
-    // Load the plugins
-    {
-        GetIEditor()->LoadPlugins();
-
-#if defined(AZ_PLATFORM_WINDOWS)
-        C3DConnexionDriver* p3DConnexionDriver = new C3DConnexionDriver;
-        GetIEditor()->GetPluginManager()->RegisterPlugin(0, p3DConnexionDriver);
-#endif
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-// Be careful when calling this function: it should be called after
-// everything else has finished initializing, otherwise, certain things
-// aren't set up yet. If in doubt, wrap it in a QTimer::singleShot(0ms);
-void CCryEditApp::InitLevel(const CEditCommandLineInfo& cmdInfo)
-{
-    const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-    const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
-
-    if (m_bPreviewMode)
-    {
-        GetIEditor()->EnableAcceleratos(false);
-
-        // Load geometry object.
-        if (!cmdInfo.m_strFileName.isEmpty())
-        {
-            LoadFile(cmdInfo.m_strFileName);
-        }
-    }
-    else if (m_bExportMode && !m_exportFile.isEmpty())
-    {
-        GetIEditor()->SetModifiedFlag(false);
-        GetIEditor()->SetModifiedModule(eModifiedNothing);
-        auto pDocument = OpenDocumentFile(m_exportFile.toUtf8().constData());
-        if (pDocument)
-        {
-            GetIEditor()->SetModifiedFlag(false);
-            GetIEditor()->SetModifiedModule(eModifiedNothing);
-            ExportLevel(cmdInfo.m_bExport, cmdInfo.m_bExportTexture, true);
-            // Terminate process.
-            CLogFile::WriteLine("Editor: Terminate Process after export");
-        }
-        // the call to quit() must be posted to the event queue because the app is currently not yet running.
-        // if we were to call quit() right now directly, the app would ignore it.
-        QTimer::singleShot(0, QCoreApplication::instance(), &QCoreApplication::quit);
-        return;
-    }
-    else if ((cmdInfo.m_strFileName.endsWith(defaultExtension, Qt::CaseInsensitive))
-            || (cmdInfo.m_strFileName.endsWith(oldExtension, Qt::CaseInsensitive)))
-    {
-        auto pDocument = OpenDocumentFile(cmdInfo.m_strFileName.toUtf8().constData());
-        if (pDocument)
-        {
-            GetIEditor()->SetModifiedFlag(false);
-            GetIEditor()->SetModifiedModule(eModifiedNothing);
-        }
-    }
-    else
-    {
-        //////////////////////////////////////////////////////////////////////////
-        //It can happen that if you are switching between projects and you have auto load set that
-        //you could inadvertently load the wrong project and not know it, you would think you are editing
-        //one level when in fact you are editing the old one. This can happen if both projects have the same
-        //relative path... which is often the case when branching.
-        // Ex. D:\cryengine\dev\ gets branched to D:\cryengine\branch\dev
-        // Now you have gamesdk in both roots and therefore GameSDK\Levels\Singleplayer\Forest in both
-        // If you execute the branch the m_pRecentFileList will be an absolute path to the old gamesdk,
-        // then if auto load is set simply takes the old level and loads it in the new branch...
-        //I would question ever trying to load a level not in our gamesdk, what happens when there are things that
-        //an not exist in the level when built in a different gamesdk.. does it erase them, most likely, then you
-        //just screwed up the level for everyone in the other gamesdk...
-        //So if we are auto loading a level outside our current gamesdk we should act as though the flag
-        //was unset and pop the dialog which should be in the correct location. This is not fool proof, but at
-        //least this its a compromise that doesn't automatically do something you probably shouldn't.
-        bool autoloadLastLevel = gSettings.bAutoloadLastLevelAtStartup;
-        if (autoloadLastLevel
-            && GetRecentFileList()
-            && GetRecentFileList()->GetSize())
-        {
-            QString gamePath = Path::GetEditingGameDataFolder().c_str();
-            Path::ConvertSlashToBackSlash(gamePath);
-            gamePath = Path::ToUnixPath(gamePath.toLower());
-            gamePath = Path::AddSlash(gamePath);
-
-            QString fullPath = GetRecentFileList()->m_arrNames[0];
-            Path::ConvertSlashToBackSlash(fullPath);
-            fullPath = Path::ToUnixPath(fullPath.toLower());
-            fullPath = Path::AddSlash(fullPath);
-
-            if (fullPath.indexOf(gamePath, 0) != 0)
-            {
-                autoloadLastLevel = false;
-            }
-        }
-        //////////////////////////////////////////////////////////////////////////
-
-        QString levelName;
-        bool isLevelNameValid = false;
-        bool doLevelNeedLoading = true;
-        const bool runningPythonScript = cmdInfo.m_bRunPythonScript || cmdInfo.m_bRunPythonTestScript;
-
-        AZ::EBusLogicalResult<bool, AZStd::logical_or<bool> > skipStartupUIProcess(false);
-        EBUS_EVENT_RESULT(skipStartupUIProcess, AzToolsFramework::EditorEvents::Bus, SkipEditorStartupUI);
-
-        if (!skipStartupUIProcess.value)
-        {
-            do
-            {
-                isLevelNameValid = false;
-                doLevelNeedLoading = true;
-                if (gSettings.bShowDashboardAtStartup
-                    && !runningPythonScript
-                    && !GetIEditor()->IsInMatEditMode()
-                    && !m_bConsoleMode
-                    && !m_bSkipWelcomeScreenDialog
-                    && !m_bPreviewMode
-                    && !autoloadLastLevel)
-                {
-                    levelName = ShowWelcomeDialog();
-                }
-                else if (autoloadLastLevel
-                         && GetRecentFileList()
-                         && GetRecentFileList()->GetSize())
-                {
-                    levelName = GetRecentFileList()->m_arrNames[0];
-                }
-
-                if (levelName.isEmpty())
-                {
-                    break;
-                }
-                if (levelName == "new")
-                {
-                    //implies that the user has clicked the create new level option
-                    bool wasCreateLevelOperationCancelled = false;
-                    bool isNewLevelCreationSuccess = false;
-                    // This will show the new level dialog until a valid input has been entered by the user or until the user click cancel
-                    while (!isNewLevelCreationSuccess && !wasCreateLevelOperationCancelled)
-                    {
-                        isNewLevelCreationSuccess = CreateLevel(wasCreateLevelOperationCancelled);
-                        if (isNewLevelCreationSuccess == true)
-                        {
-                            doLevelNeedLoading = false;
-                            isLevelNameValid = true;
-                        }
-                    }
-                    ;
-                }
-                else if (levelName == "new slice")
-                {
-                    QMessageBox::warning(AzToolsFramework::GetActiveWindow(), "Not implemented", "New Slice is not yet implemented.");
-                }
-                else
-                {
-                    //implies that the user wants to open an existing level
-                    doLevelNeedLoading = true;
-                    isLevelNameValid = true;
-                }
-            } while (!isLevelNameValid);// if we reach here and levelName is not valid ,it implies that the user has clicked cancel on the create new level dialog
-
-            // load level
-            if (doLevelNeedLoading && !levelName.isEmpty())
-            {
-                if (!CFileUtil::Exists(levelName, false))
-                {
-                    QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QObject::tr("Missing level"), QObject::tr("Failed to auto-load last opened level. Level file does not exist:\n\n%1").arg(levelName));
-                    return;
-                }
-
-                QString str;
-                str = tr("Loading level %1 ...").arg(levelName);
-                OutputStartupMessage(str);
-
-                OpenDocumentFile(levelName.toUtf8().data());
-            }
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-BOOL CCryEditApp::InitConsole()
-{
-    // Execute command from cmdline -exec_line if applicable
-    if (!m_execLineCmd.isEmpty())
-    {
-        gEnv->pConsole->ExecuteString(QString("%1").arg(m_execLineCmd).toLocal8Bit());
-    }
-
-    // Execute cfg from cmdline -exec if applicable
-    if (!m_execFile.isEmpty())
-    {
-        gEnv->pConsole->ExecuteString(QString("exec %1").arg(m_execFile).toLocal8Bit());
-    }
-
-    // Execute special configs.
-    gEnv->pConsole->ExecuteString("exec editor_autoexec.cfg");
-    gEnv->pConsole->ExecuteString("exec editor.cfg");
-    gEnv->pConsole->ExecuteString("exec user.cfg");
-
-    GetISystem()->ExecuteCommandLine();
-
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-void CCryEditApp::CompileCriticalAssets() const
-{
-    // regardless of what is set in the bootstrap wait for AP to be ready
-    // wait a maximum of 100 milliseconds and pump the system event loop until empty
-    struct AssetsInQueueNotification
-        : public AzFramework::AssetSystemInfoBus::Handler
-    {
-        void CountOfAssetsInQueue(const int& count) override
-        {
-            CCryEditApp::OutputStartupMessage(QString("Asset Processor working... %1 jobs remaining.").arg(count));
-        }
-    };
-    AssetsInQueueNotification assetsInQueueNotifcation;
-    assetsInQueueNotifcation.BusConnect();
-    bool ready{};
-    while (!ready)
-    {
-        AzFramework::AssetSystemRequestBus::BroadcastResult(ready, &AzFramework::AssetSystemRequestBus::Events::WaitUntilAssetProcessorReady, AZStd::chrono::milliseconds(100));
-        if (!ready)
-        {
-            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::PumpSystemEventLoopUntilEmpty);
-        }
-    }
-    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
-{
-    bool connectedToAssetProcessor = false;
-
-    // When the AssetProcessor is already launched it should take less than a second to perform a connection
-    // but when the AssetProcessor needs to be launch it could take up to 15 seconds to have the AssetProcessor initialize
-    // and able to negotiate a connection when running a debug build
-    // and to negotiate a connection
-
-    // Setting the connectTimeout to 3 seconds if not set within the settings registry
-    AZStd::chrono::seconds connectTimeout(3);
-    // Initialize the launchAssetProcessorTimeout to 15 seconds by default and check the settings registry for an override
-    AZStd::chrono::seconds launchAssetProcessorTimeout(15);
-    AZ::SettingsRegistryInterface* settingsRegistry = AZ::SettingsRegistry::Get();
-    if (settingsRegistry)
-    {
-        AZ::s64 timeoutValue{};
-        if (AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, timeoutValue,
-            AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, "connect_ap_timeout"))
-        {
-            connectTimeout = AZStd::chrono::seconds(timeoutValue);
-        }
-
-        // Reset timeout integer
-        timeoutValue = {};
-        if (AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, timeoutValue,
-            AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, "launch_ap_timeout"))
-        {
-            launchAssetProcessorTimeout = AZStd::chrono::seconds(timeoutValue);
-        }
-    }
-
-    CCryEditApp::OutputStartupMessage(QString("Connecting to Asset Processor... "));
-
-    AzFramework::AssetSystem::ConnectionSettings connectionSettings;
-    AzFramework::AssetSystem::ReadConnectionSettingsFromSettingsRegistry(connectionSettings);
-
-    connectionSettings.m_launchAssetProcessorOnFailedConnection = true;
-    connectionSettings.m_connectionDirection = AzFramework::AssetSystem::ConnectionSettings::ConnectionDirection::ConnectToAssetProcessor;
-    connectionSettings.m_connectionIdentifier = AzFramework::AssetSystem::ConnectionIdentifiers::Editor;
-    connectionSettings.m_loggingCallback = [](AZStd::string_view logData)
-    {
-        CCryEditApp::OutputStartupMessage(QString::fromUtf8(logData.data(), aznumeric_cast<int>(logData.size())));
-    };
-
-    AzFramework::AssetSystemRequestBus::BroadcastResult(connectedToAssetProcessor, &AzFramework::AssetSystemRequestBus::Events::EstablishAssetProcessorConnection, connectionSettings);
-
-    if (connectedToAssetProcessor)
-    {
-        CCryEditApp::OutputStartupMessage(QString("Connected to Asset Processor"));
-        CompileCriticalAssets();
-        return true;
-    }
-
-    CCryEditApp::OutputStartupMessage(QString("Failed to connect to Asset Processor"));
-    return false;
-}
-
-//! This handles the normal logging of Python output in the Editor by outputting
-//! the data to both the Editor Console and the Editor.log file
-struct CCryEditApp::PythonOutputHandler
-    : public AzToolsFramework::EditorPythonConsoleNotificationBus::Handler
-{
-    PythonOutputHandler()
-    {
-        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusConnect();
-    }
-
-    virtual ~PythonOutputHandler()
-    {
-        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
-    }
-
-    int GetOrder() override
-    {
-        return 0;
-    }
-
-    void OnTraceMessage([[maybe_unused]] AZStd::string_view message) override
-    {
-        AZ_TracePrintf("python_test", "%.*s", static_cast<int>(message.size()), message.data());
-    }
-
-    void OnErrorMessage([[maybe_unused]] AZStd::string_view message) override
-    {
-        AZ_Error("python_test", false, "%.*s", static_cast<int>(message.size()), message.data());
-    }
-
-    void OnExceptionMessage([[maybe_unused]] AZStd::string_view message) override
-    {
-        AZ_Error("python_test", false, "EXCEPTION: %.*s", static_cast<int>(message.size()), message.data());
-    }
-};
-
-//! Outputs Python test script print() to stdout
-//! If an exception happens in a Python test script, the process terminates
-struct PythonTestOutputHandler final
-    : public CCryEditApp::PythonOutputHandler
-{
-    PythonTestOutputHandler() = default;
-    virtual ~PythonTestOutputHandler() = default;
-
-    void OnTraceMessage(AZStd::string_view message) override
-    {
-        PythonOutputHandler::OnTraceMessage(message);
-        printf("%.*s\n", static_cast<int>(message.size()), message.data());
-    }
-
-    void OnErrorMessage(AZStd::string_view message) override
-    {
-        PythonOutputHandler::OnErrorMessage(message);
-        printf("ERROR: %.*s\n", static_cast<int>(message.size()), message.data());
-    }
-
-    void OnExceptionMessage(AZStd::string_view message) override
-    {
-        PythonOutputHandler::OnExceptionMessage(message);
-        printf("EXCEPTION: %.*s\n", static_cast<int>(message.size()), message.data());
-        AZ::Debug::Trace::Terminate(1);
-    }
-};
-
-void CCryEditApp::RunInitPythonScript(CEditCommandLineInfo& cmdInfo)
-{
-    if (cmdInfo.m_bRunPythonTestScript)
-    {
-        m_pythonOutputHandler = AZStd::make_shared<PythonTestOutputHandler>();
-    }
-    else
-    {
-        m_pythonOutputHandler = AZStd::make_shared<PythonOutputHandler>();
-    }
-
-    using namespace AzToolsFramework;
-    if (cmdInfo.m_bRunPythonScript || cmdInfo.m_bRunPythonTestScript)
-    {
-        if (cmdInfo.m_pythonArgs.length() > 0 || cmdInfo.m_bRunPythonTestScript)
-        {
-            AZStd::vector<AZStd::string> tokens;
-            AzFramework::StringFunc::Tokenize(cmdInfo.m_pythonArgs.toUtf8().constData(), tokens, ' ');
-            AZStd::vector<AZStd::string_view> pythonArgs;
-            std::transform(tokens.begin(), tokens.end(), std::back_inserter(pythonArgs), [](auto& tokenData) { return tokenData.c_str(); });
-            if (cmdInfo.m_bRunPythonTestScript)
-            {
-                AZStd::string pythonTestCase;
-                if (!cmdInfo.m_pythontTestCase.isEmpty())
-                {
-                    pythonTestCase = cmdInfo.m_pythontTestCase.toUtf8().constData();
-                }
-
-                EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByFilenameAsTest, cmdInfo.m_strFileName.toUtf8().constData(), pythonTestCase, pythonArgs);
-
-                // Close the editor gracefully as the test has completed
-                GetIEditor()->GetDocument()->SetModifiedFlag(false);
-                QTimer::singleShot(0, qApp, &QApplication::closeAllWindows);
-            }
-            else
-            {
-                EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, cmdInfo.m_strFileName.toUtf8().constData(), pythonArgs);
-            }
-        }
-        else
-        {
-            EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByFilename, cmdInfo.m_strFileName.toUtf8().constData());
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CCryEditApp initialization
-BOOL CCryEditApp::InitInstance()
-{
-    QElapsedTimer startupTimer;
-    startupTimer.start();
-    InitDirectory();
-
-    // create / attach to the environment:
-    AttachEditorCoreAZEnvironment(AZ::Environment::GetInstance());
-    m_pEditor = new CEditorImpl();
-
-    // parameters must be parsed early to capture arguments for test bootstrap
-    CEditCommandLineInfo cmdInfo;
-
-    InitFromCommandLine(cmdInfo);
-
-    InitDirectory();
-
-    qobject_cast<Editor::EditorQtApplication*>(qApp)->Initialize(); // Must be done after CEditorImpl() is created
-    m_pEditor->Initialize();
-
-    // let anything listening know that they can use the IEditor now
-    AzToolsFramework::EditorEvents::Bus::Broadcast(&AzToolsFramework::EditorEvents::NotifyIEditorAvailable, m_pEditor);
-
-    if (cmdInfo.m_bShowVersionInfo)
-    {
-        CAboutDialog aboutDlg(FormatVersion(m_pEditor->GetFileVersion()), FormatRichTextCopyrightNotice());
-        aboutDlg.exec();
-        return FALSE;
-    }
-
-    // Reflect property control classes to the serialize context...
-    AZ::SerializeContext* serializeContext = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-    AZ_Assert(serializeContext, "Serialization context not available");
-    ReflectedVarInit::setupReflection(serializeContext);
-    RegisterReflectedVarHandlers();
-
-
-    QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
-
-    CreateSplashScreen();
-
-    // Register the application's document templates. Document templates
-    // serve as the connection between documents, frame windows and views
-    CCrySingleDocTemplate* pDocTemplate = CCrySingleDocTemplate::create<CCryEditDoc>();
-
-    m_pDocManager = new CCryDocManager;
-    ((CCryDocManager*)m_pDocManager)->SetDefaultTemplate(pDocTemplate);
-
-    auto mainWindow = new MainWindow();
-#ifdef Q_OS_MACOS
-    auto mainWindowWrapper = new AzQtComponents::WindowDecorationWrapper(AzQtComponents::WindowDecorationWrapper::OptionDisabled);
-#else
-    // No need for mainwindow wrapper for MatEdit mode
-    auto mainWindowWrapper = new AzQtComponents::WindowDecorationWrapper(cmdInfo.m_bMatEditMode ? AzQtComponents::WindowDecorationWrapper::OptionDisabled
-        : AzQtComponents::WindowDecorationWrapper::OptionAutoTitleBarButtons);
-#endif
-    mainWindowWrapper->setGuest(mainWindow);
-    HWND mainWindowWrapperHwnd = (HWND)mainWindowWrapper->winId();
-
-    AZ::IO::FixedMaxPath engineRootPath;
-    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
-    {
-        settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
-    }
-    QDir engineRoot = QString::fromUtf8(engineRootPath.c_str(), aznumeric_cast<int>(engineRootPath.Native().size()));
-    AzQtComponents::StyleManager::addSearchPaths(
-        QStringLiteral("style"),
-        engineRoot.filePath(QStringLiteral("Code/Sandbox/Editor/Style")),
-        QStringLiteral(":/Assets/Editor/Style"),
-        engineRootPath);
-    AzQtComponents::StyleManager::setStyleSheet(mainWindow, QStringLiteral("style:Editor.qss"));
-
-    // Note: we should use getNativeHandle to get the HWND from the widget, but
-    // it returns an invalid handle unless the widget has been shown and polished and even then
-    // it sometimes returns an invalid handle.
-    // So instead, we use winId(), which does consistently work
-    //mainWindowWrapperHwnd = QtUtil::getNativeHandle(mainWindowWrapper);
-
-    // Connect to the AssetProcessor at this point
-    // It will be launched if not running
-    ConnectToAssetProcessor();
-
-    auto initGameSystemOutcome = InitGameSystem(mainWindowWrapperHwnd);
-    if (!initGameSystemOutcome.IsSuccess())
-    {
-        return false;
-    }
-
-    // Process some queued events come from system init
-    // Such as asset catalog loaded notification.
-    // There are some systems need to load configurations from assets for post initialization but before loading level
-    AZ::TickBus::ExecuteQueuedEvents();
-
-    qobject_cast<Editor::EditorQtApplication*>(qApp)->LoadSettings();
-
-    // Create Sandbox user folder if necessary
-    AZ::IO::FileIOBase::GetDirectInstance()->CreatePath(Path::GetUserSandboxFolder().toUtf8().data());
-
-    if (!InitGame())
-    {
-        if (gEnv && gEnv->pLog)
-        {
-            gEnv->pLog->LogError("Game can not be initialized, InitGame() failed.");
-        }
-        if (!cmdInfo.m_bExport)
-        {
-            QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Game can not be initialized, please refer to the editor log file"));
-        }
-        return false;
-    }
-
-    // Meant to be called before MainWindow::Initialize
-    InitPlugins();
-
-    mainWindow->Initialize();
-
-    GetIEditor()->GetCommandManager()->RegisterAutoCommands();
-    GetIEditor()->AddUIEnums();
-
-    mainWindowWrapper->enableSaveRestoreGeometry("amazon", "O3DE", "mainWindowGeometry");
-    m_pDocManager->OnFileNew();
-
-    if (IsInRegularEditorMode())
-    {
-        CIndexedFiles::Create();
-
-        if (gEnv->pConsole->GetCVar("ed_indexfiles")->GetIVal())
-        {
-            Log("Started game resource files indexing...");
-            CIndexedFiles::StartFileIndexing();
-        }
-        else
-        {
-            Log("Game resource files indexing is disabled.");
-        }
-
-        // QuickAccessBar creation should be before m_pMainWnd->SetFocus(),
-        // since it receives the focus at creation time. It brakes MainFrame key accelerators.
-        m_pQuickAccessBar = new CQuickAccessBar;
-        m_pQuickAccessBar->setVisible(false);
-    }
-
-    if (MainWindow::instance())
-    {
-        if (m_bConsoleMode || IsInAutotestMode())
-        {
-            AZ::Environment::FindVariable<int>("assertVerbosityLevel").Set(1);
-            m_pConsoleDialog->raise();
-        }
-        else if (!GetIEditor()->IsInMatEditMode())
-        {
-            MainWindow::instance()->show();
-            MainWindow::instance()->raise();
-            MainWindow::instance()->update();
-            MainWindow::instance()->setFocus();
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-            QWindow* window = mainWindowWrapper->windowHandle();
-            if (window)
-            {
-                Editor::WindowObserver* observer = new Editor::WindowObserver(window, this);
-                connect(observer, &Editor::WindowObserver::windowIsMovingOrResizingChanged, Editor::EditorQtApplication::instance(), &Editor::EditorQtApplication::setIsMovingOrResizing);
-            }
-#endif
-        }
-    }
-
-    if (m_bAutotestMode)
-    {
-        ICVar* const noErrorReportWindowCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_error_report_window") : nullptr;
-        if (noErrorReportWindowCVar)
-        {
-            noErrorReportWindowCVar->Set(true);
-        }
-        ICVar* const showErrorDialogOnLoadCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("ed_showErrorDialogOnLoad") : nullptr;
-        if (showErrorDialogOnLoadCVar)
-        {
-            showErrorDialogOnLoadCVar->Set(false);
-        }
-    }
-
-    SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), 0);
-    if (!GetIEditor()->IsInMatEditMode())
-    {
-        m_pEditor->InitFinished();
-    }
-
-    // Make sure Python is started before we attempt to restore the Editor layout, since the user
-    // might have custom view panes in the saved layout that will need to be registered.
-    auto editorPythonEventsInterface = AZ::Interface<AzToolsFramework::EditorPythonEventsInterface>::Get();
-    if (editorPythonEventsInterface)
-    {
-        editorPythonEventsInterface->StartPython();
-    }
-
-    if (!GetIEditor()->IsInMatEditMode() && !GetIEditor()->IsInConsolewMode())
-    {
-        bool restoreDefaults = !mainWindowWrapper->restoreGeometryFromSettings();
-        QtViewPaneManager::instance()->RestoreLayout(restoreDefaults);
-    }
-
-    CloseSplashScreen();
-
-    // DON'T CHANGE ME!
-    // Test scripts listen for this line, so please don't touch this without updating them.
-    // We consider ourselves "initialized enough" at this stage because all further initialization may be blocked by the modal welcome screen.
-    CLogFile::WriteLine(QString("Engine initialized, took %1s.").arg(startupTimer.elapsed() / 1000.0, 0, 'f', 2));
-
-    // Init the level after everything else is finished initializing, otherwise, certain things aren't set up yet
-    QTimer::singleShot(0, this, [this, cmdInfo] {
-        InitLevel(cmdInfo);
-    });
-
-#ifdef USE_WIP_FEATURES_MANAGER
-    // load the WIP features file
-    CWipFeatureManager::Instance()->EnableManager(!cmdInfo.m_bDeveloperMode);
-    CWipFeatureManager::Init();
-#endif
-
-    if (!m_bConsoleMode && !m_bPreviewMode)
-    {
-        GetIEditor()->UpdateViews();
-        if (MainWindow::instance())
-        {
-            MainWindow::instance()->setFocus();
-        }
-    }
-
-    if (!InitConsole())
-    {
-        return true;
-    }
-
-    if (IsInRegularEditorMode())
-    {
-        int startUpMacroIndex = GetIEditor()->GetToolBoxManager()->GetMacroIndex("startup", true);
-        if (startUpMacroIndex >= 0)
-        {
-            CryLogAlways("Executing the startup macro");
-            GetIEditor()->GetToolBoxManager()->ExecuteMacro(startUpMacroIndex, true);
-        }
-    }
-
-    if (GetIEditor()->GetCommandManager()->IsRegistered("editor.open_lnm_editor"))
-    {
-        CCommand0::SUIInfo uiInfo;
-#if !defined(NDEBUG)
-        bool ok =
-#endif
-            GetIEditor()->GetCommandManager()->GetUIInfo("editor.open_lnm_editor", uiInfo);
-        assert(ok);
-    }
-
-    RunInitPythonScript(cmdInfo);
-
-    return true;
-}
-
-void CCryEditApp::RegisterEventLoopHook(IEventLoopHook* pHook)
-{
-    pHook->pNextHook = m_pEventLoopHook;
-    m_pEventLoopHook = pHook;
-}
-
-void CCryEditApp::UnregisterEventLoopHook(IEventLoopHook* pHookToRemove)
-{
-    IEventLoopHook* pPrevious = 0;
-    for (IEventLoopHook* pHook = m_pEventLoopHook; pHook != 0; pHook = pHook->pNextHook)
-    {
-        if (pHook == pHookToRemove)
-        {
-            if (pPrevious)
-            {
-                pPrevious->pNextHook = pHookToRemove->pNextHook;
-            }
-            else
-            {
-                m_pEventLoopHook = pHookToRemove->pNextHook;
-            }
-
-            pHookToRemove->pNextHook = 0;
-            return;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::LoadFile(QString fileName)
-{
-    //CEditCommandLineInfo cmdLine;
-    //ProcessCommandLine(cmdinfo);
-
-    //bool bBuilding = false;
-    //CString file = cmdLine.SpanExcluding()
-    if (GetIEditor()->GetViewManager()->GetViewCount() == 0)
-    {
-        return;
-    }
-
-    LoadTagLocations();
-
-    if (MainWindow::instance() || m_pConsoleDialog)
-    {
-        SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), GetIEditor()->GetGameEngine()->GetLevelName());
-    }
-
-    GetIEditor()->SetModifiedFlag(false);
-    GetIEditor()->SetModifiedModule(eModifiedNothing);
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline void ExtractMenuName(QString& str)
-{
-    // eliminate &
-    int pos = str.indexOf('&');
-    if (pos >= 0)
-    {
-        str = str.left(pos) + str.right(str.length() - pos - 1);
-    }
-    // cut the string
-    for (int i = 0; i < str.length(); i++)
-    {
-        if (str[i] == 9)
-        {
-            str = str.left(i);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::EnableAccelerator([[maybe_unused]] bool bEnable)
-{
-    /*
-    if (bEnable)
-    {
-        //LoadAccelTable( MAKEINTRESOURCE(IDR_MAINFRAME) );
-        m_AccelManager.UpdateWndTable();
-        CLogFile::WriteLine( "Enable Accelerators" );
-    }
-    else
-    {
-        CMainFrame *mainFrame = (CMainFrame*)m_pMainWnd;
-        if (mainFrame->m_hAccelTable)
-            DestroyAcceleratorTable( mainFrame->m_hAccelTable );
-        mainFrame->m_hAccelTable = NULL;
-        mainFrame->LoadAccelTable( MAKEINTRESOURCE(IDR_GAMEACCELERATOR) );
-        CLogFile::WriteLine( "Disable Accelerators" );
-    }
-    */
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::SaveAutoRemind()
-{
-    // Added a static variable here to avoid multiple messageboxes to
-    // remind the user of saving the file. Many message boxes would appear as this
-    // is triggered by a timer even which does not stop when the message box is called.
-    // Used a static variable instead of a member variable because this value is not
-    // Needed anywhere else.
-    static bool boIsShowingWarning(false);
-
-    // Ingore in game mode, or if no level created, or level not modified
-    if (GetIEditor()->IsInGameMode() || !GetIEditor()->GetGameEngine()->IsLevelLoaded() || !GetIEditor()->GetDocument()->IsModified())
-    {
-        return;
-    }
-
-    if (boIsShowingWarning)
-    {
-        return;
-    }
-
-    boIsShowingWarning = true;
-    if (QMessageBox::question(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Auto Reminder: You did not save level for at least %1 minute(s)\r\nDo you want to save it now?").arg(gSettings.autoRemindTime), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
-    {
-        // Save now.
-        GetIEditor()->SaveDocument();
-    }
-    boIsShowingWarning = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::WriteConfig()
-{
-    IEditor* pEditor = GetIEditor();
-    if (pEditor && pEditor->GetDisplaySettings())
-    {
-        pEditor->GetDisplaySettings()->SaveRegistry();
-    }
-}
-
-// App command to run the dialog
-void CCryEditApp::OnAppAbout()
-{
-    CAboutDialog aboutDlg(FormatVersion(m_pEditor->GetFileVersion()), FormatRichTextCopyrightNotice());
-    aboutDlg.exec();
-}
-
-// App command to run the Welcome to Open 3D Engine dialog
-void CCryEditApp::OnAppShowWelcomeScreen()
-{
-    // This logic is a simplified version of the startup
-    // flow that also shows the Welcome dialog
-
-    if (m_bIsExportingLegacyData
-        || m_creatingNewLevel
-        || m_openingLevel
-        || m_savingLevel)
-    {
-        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), QString(), "The Welcome screen cannot be displayed because a level load/save is in progress.");
-        return;
-    }
-
-    QString levelName;
-    bool showWelcomeDialog = true;
-    while (showWelcomeDialog)
-    {
-        // Keep showing the Welcome dialog as long as the user cancels
-        // a level creation/load triggered from the Welcome dialog
-        levelName = ShowWelcomeDialog();
-
-        if (levelName == "new")
-        {
-            // The user has clicked on the create new level option
-            bool wasCreateLevelOperationCancelled = false;
-            bool isNewLevelCreationSuccess = false;
-            // This will show the new level dialog until a valid input has been entered by the user or until the user click cancel
-            while (!isNewLevelCreationSuccess && !wasCreateLevelOperationCancelled)
-            {
-                isNewLevelCreationSuccess = CreateLevel(wasCreateLevelOperationCancelled);
-            }
-
-            if (isNewLevelCreationSuccess)
-            {
-                showWelcomeDialog = false;
-                levelName.clear();
-            }
-        }
-        else if (levelName == "new slice")
-        {
-            QMessageBox::warning(AzToolsFramework::GetActiveWindow(), "Not implemented", "New Slice is not yet implemented.");
-        }
-        else
-        {
-            // The user has selected an existing level to open
-            showWelcomeDialog = false;
-        }
-    }
-
-    if (!levelName.isEmpty())
-    {
-        // load level
-        if (!CFileUtil::Exists(levelName, false))
-        {
-            QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QObject::tr("Missing level"), QObject::tr("Failed to auto-load last opened level. Level file does not exist:\n\n%1").arg(levelName));
-        }
-        else
-        {
-            OpenDocumentFile(levelName.toUtf8().data());
-        }
-    }
-}
-
-void CCryEditApp::OnUpdateShowWelcomeScreen(QAction* action)
-{
-    action->setEnabled(!m_bIsExportingLegacyData
-        && !m_creatingNewLevel
-        && !m_openingLevel
-        && !m_savingLevel);
-}
-
-void CCryEditApp::OnDocumentationTutorials()
-{
-    QString webLink = tr("https://o3deorg.netlify.app/docs/learning-guide/");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-void CCryEditApp::OnDocumentationGlossary()
-{
-    QString webLink = tr("https://docs.o3de.org/docs/user-guide/appendix/glossary/");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-void CCryEditApp::OnDocumentationO3DE()
-{
-    QString webLink = tr("https://o3deorg.netlify.app/docs/");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-void CCryEditApp::OnDocumentationGamelift()
-{
-    QString webLink = tr("https://docs.aws.amazon.com/gamelift/");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-void CCryEditApp::OnDocumentationReleaseNotes()
-{
-    QString webLink = tr("https://o3deorg.netlify.app/docs/release-notes/");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-void CCryEditApp::OnDocumentationGameDevBlog()
-{
-    QString webLink = tr("https://aws.amazon.com/blogs/gamedev");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-void CCryEditApp::OnDocumentationForums()
-{
-    QString webLink = tr("https://o3deorg.netlify.app/community/");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-void CCryEditApp::OnDocumentationAWSSupport()
-{
-    QString webLink = tr("https://aws.amazon.com/contact-us");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-bool CCryEditApp::FixDanglingSharedMemory(const QString& sharedMemName) const
-{
-    QSystemSemaphore sem(sharedMemName + "_sem", 1);
-    sem.acquire();
-    {
-        QSharedMemory fix(sharedMemName);
-        if (!fix.attach())
-        {
-            if (fix.error() != QSharedMemory::NotFound)
-            {
-                sem.release();
-                return false;
-            }
-        }
-        // fix.detach() when destructed, taking out any dangling shared memory
-        // on unix
-    }
-    sem.release();
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CCryEditApp message handlers
-
-
-int CCryEditApp::ExitInstance(int exitCode)
-{
-    if (m_pEditor)
-    {
-        m_pEditor->OnBeginShutdownSequence();
-    }
-    qobject_cast<Editor::EditorQtApplication*>(qApp)->UnloadSettings();
-
-    #ifdef USE_WIP_FEATURES_MANAGER
-    //
-    // close wip features manager
-    //
-    CWipFeatureManager::Shutdown();
-    #endif
-
-    if (IsInRegularEditorMode())
-    {
-        if (GetIEditor())
-        {
-            int shutDownMacroIndex = GetIEditor()->GetToolBoxManager()->GetMacroIndex("shutdown", true);
-            if (shutDownMacroIndex >= 0)
-            {
-                CryLogAlways("Executing the shutdown macro");
-                GetIEditor()->GetToolBoxManager()->ExecuteMacro(shutDownMacroIndex, true);
-            }
-        }
-    }
-
-    if (IsInRegularEditorMode())
-    {
-        CIndexedFiles::AbortFileIndexing();
-        CIndexedFiles::Destroy();
-    }
-
-    if (GetIEditor() && !GetIEditor()->IsInMatEditMode())
-    {
-        //Nobody seems to know in what case that kind of exit can happen so instrumented to see if it happens at all
-        if (m_pEditor)
-        {
-            m_pEditor->OnEarlyExitShutdownSequence();
-        }
-
-        gEnv->pLog->FlushAndClose();
-
-        // note: the intention here is to quit immediately without processing anything further
-        // on linux and mac, _exit has that effect
-        // however, on windows, _exit() still invokes CRT functions, unloads, and destructors
-        // so on windows, we need to use TerminateProcess
-#if defined(AZ_PLATFORM_WINDOWS)
-       TerminateProcess(GetCurrentProcess(), exitCode);
-#else
-
-        _exit(exitCode);
-#endif
-    }
-
-    SAFE_DELETE(m_pConsoleDialog);
-    SAFE_DELETE(m_pQuickAccessBar);
-
-    if (GetIEditor())
-    {
-        GetIEditor()->Notify(eNotify_OnQuit);
-    }
-
-    // if we're aborting due to an unexpected shutdown then don't call into objects that don't exist yet.
-    if ((gEnv) && (gEnv->pSystem) && (gEnv->pSystem->GetILevelSystem()))
-    {
-        gEnv->pSystem->GetILevelSystem()->UnloadLevel();
-    }
-
-    if (GetIEditor())
-    {
-        GetIEditor()->GetDocument()->DeleteTemporaryLevel();
-    }
-
-    m_bExiting = true;
-
-    HEAP_CHECK
-    ////////////////////////////////////////////////////////////////////////
-    // Executed directly before termination of the editor, just write a
-    // quick note to the log so that we can later see that the editor
-    // terminated flawlessly. Also delete temporary files.
-    ////////////////////////////////////////////////////////////////////////
-        WriteConfig();
-
-    if (m_pEditor)
-    {
-        // Ensure component entities are wiped prior to unloading plugins,
-        // since components may be implemented in those plugins.
-        EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, ResetEditorContext);
-
-        // vital, so that the Qt integration can unhook itself!
-        m_pEditor->UnloadPlugins();
-        m_pEditor->Uninitialize();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Quick end for editor.
-    if (gEnv && gEnv->pSystem)
-    {
-        gEnv->pSystem->Quit();
-        SAFE_RELEASE(gEnv->pSystem);
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    if (m_pEditor)
-    {
-        m_pEditor->DeleteThis();
-        m_pEditor = nullptr;
-    }
-
-    // save accelerator manager configuration.
-    //m_AccelManager.SaveOnExit();
-
-#ifdef WIN32
-    Gdiplus::GdiplusShutdown(m_gdiplusToken);
-#endif
-
-    if (m_mutexApplication)
-    {
-        delete m_mutexApplication;
-    }
-
-    DetachEditorCoreAZEnvironment();
-    return 0;
-}
-
-bool CCryEditApp::IsWindowInForeground()
-{
-    return Editor::EditorQtApplication::instance()->IsActive();
-}
-
-void CCryEditApp::DisableIdleProcessing()
-{
-    m_disableIdleProcessingCounter++;
-}
-
-void CCryEditApp::EnableIdleProcessing()
-{
-    m_disableIdleProcessingCounter--;
-    AZ_Assert(m_disableIdleProcessingCounter >= 0, "m_disableIdleProcessingCounter must be nonnegative");
-}
-
-BOOL CCryEditApp::OnIdle([[maybe_unused]] LONG lCount)
-{
-    if (0 == m_disableIdleProcessingCounter)
-    {
-        return IdleProcessing(false);
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-int CCryEditApp::IdleProcessing(bool bBackgroundUpdate)
-{
-    AZ_Assert(m_disableIdleProcessingCounter == 0, "We should not be in IdleProcessing()");
-
-    //HEAP_CHECK
-    if (!MainWindow::instance())
-    {
-        return 0;
-    }
-
-    if (!GetIEditor()->GetSystem())
-    {
-        return 0;
-    }
-
-    // Ensure we don't get called re-entrantly
-    // This can occur when a nested Qt event loop fires (e.g. by way of a modal dialog calling exec)
-    if (m_idleProcessingRunning)
-    {
-        return 0;
-    }
-    QScopedValueRollback<bool> guard(m_idleProcessingRunning, true);
-
-    ////////////////////////////////////////////////////////////////////////
-    // Call the update function of the engine
-    ////////////////////////////////////////////////////////////////////////
-    if (m_bTestMode && !bBackgroundUpdate)
-    {
-        // Terminate process.
-        CLogFile::WriteLine("Editor: Terminate Process");
-        exit(0);
-    }
-
-    bool bIsAppWindow = IsWindowInForeground();
-    bool bActive = false;
-    int res = 0;
-    if (bIsAppWindow || m_bForceProcessIdle || m_bKeepEditorActive)
-    {
-        res = 1;
-        bActive = true;
-    }
-
-    if (m_bForceProcessIdle && bIsAppWindow)
-    {
-        m_bForceProcessIdle = false;
-    }
-
-    // focus changed
-    if (m_bPrevActive != bActive)
-    {
-        GetIEditor()->GetSystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_CHANGE_FOCUS, bActive, 0);
-    #if defined(AZ_PLATFORM_WINDOWS)
-        // This is required for the audio system to be notified of focus changes in the editor.  After discussing it
-        // with the macOS team, they are working on unifying the system events between the editor and standalone
-        // launcher so this is only needed on windows.
-        if (bActive)
-        {
-            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnSetFocus);
-        }
-        else
-        {
-            EBUS_EVENT(AzFramework::WindowsLifecycleEvents::Bus, OnKillFocus);
-        }
-    #endif
-    }
-
-    m_bPrevActive = bActive;
-
-    // Don't tick application if we're doing idle processing during an assert.
-    const bool isErrorWindowVisible = (gEnv && gEnv->pSystem->IsAssertDialogVisible());
-    if (isErrorWindowVisible)
-    {
-        if (m_pEditor)
-        {
-            m_pEditor->Update();
-        }
-    }
-    else if (bActive || (bBackgroundUpdate && !bIsAppWindow))
-    {
-        // Update Game
-        GetIEditor()->GetGameEngine()->Update();
-
-        if (!GetIEditor()->IsInGameMode())
-        {
-            if (m_pEditor)
-            {
-                m_pEditor->Update();
-            }
-
-            GetIEditor()->Notify(eNotify_OnIdleUpdate);
-
-            IEditor* pEditor = GetIEditor();
-            if (!pEditor->GetGameEngine()->IsLevelLoaded() && pEditor->GetSystem()->NeedDoWorkDuringOcclusionChecks())
-            {
-                pEditor->GetSystem()->DoWorkDuringOcclusionChecks();
-            }
-        }
-
-        AZ::ComponentApplication* componentApplication = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(componentApplication, &AZ::ComponentApplicationRequests::GetApplication);
-        if (componentApplication)
-        {
-            componentApplication->TickSystem();
-        }
-    }
-    else if (GetIEditor()->GetSystem() && GetIEditor()->GetSystem()->GetILog())
-    {
-        GetIEditor()->GetSystem()->GetILog()->Update(); // print messages from other threads
-    }
-
-    DisplayLevelLoadErrors();
-
-    if (CConsoleSCB::GetCreatedInstance())
-    {
-        CConsoleSCB::GetCreatedInstance()->FlushText();
-    }
-
-    return res;
-}
-
-void CCryEditApp::DisplayLevelLoadErrors()
-{
-    CCryEditDoc* currentLevel = GetIEditor()->GetDocument();
-    if (currentLevel && currentLevel->IsDocumentReady() && !m_levelErrorsHaveBeenDisplayed)
-    {
-        // Generally it takes a few idle updates for meshes to load and be processed by their components. This value
-        // was picked based on examining when mesh components are updated and their materials are checked for
-        // errors (2 updates) plus one more for good luck.
-        const int IDLE_FRAMES_TO_WAIT = 3;
-        ++m_numBeforeDisplayErrorFrames;
-        if (m_numBeforeDisplayErrorFrames > IDLE_FRAMES_TO_WAIT)
-        {
-            GetIEditor()->CommitLevelErrorReport();
-            GetIEditor()->GetErrorReport()->Display();
-            m_numBeforeDisplayErrorFrames = 0;
-            m_levelErrorsHaveBeenDisplayed = true;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::ExportLevel(bool bExportToGame, bool bExportTexture, bool bAutoExport)
-{
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-    if (usePrefabSystemForLevels)
-    {
-        AZ_Assert(false, "Prefab system doesn't require level exports.");
-        return;
-    }
-
-    if (bExportTexture)
-    {
-        CGameExporter gameExporter;
-        gameExporter.SetAutoExportMode(bAutoExport);
-        gameExporter.Export(eExp_SurfaceTexture);
-    }
-    else if (bExportToGame)
-    {
-        CGameExporter gameExporter;
-        gameExporter.SetAutoExportMode(bAutoExport);
-        gameExporter.Export();
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditHold()
-{
-    GetIEditor()->GetDocument()->Hold(HOLD_FETCH_FILE);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditFetch()
-{
-    GetIEditor()->GetDocument()->Fetch(HOLD_FETCH_FILE);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CCryEditApp::UserExportToGame(bool bNoMsgBox)
-{
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-    if (usePrefabSystemForLevels)
-    {
-        AZ_Assert(false, "Export Level should no longer exist.");
-        return false;
-    }
-
-    if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
-    {
-        if (bNoMsgBox == false)
-        {
-            QMessageBox::warning(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Please load a level before attempting to export."));
-        }
-        return false;
-    }
-    else
-    {
-        EditorUtils::AzWarningAbsorber absorb("Source Control");
-
-        // Record errors and display a dialog with them at the end.
-        CErrorsRecorder errRecorder(GetIEditor());
-
-        // Temporarily disable auto backup.
-        CScopedVariableSetter<bool> autoBackupEnabledChange(gSettings.autoBackupEnabled, false);
-        CScopedVariableSetter<int> autoRemindTimeChange(gSettings.autoRemindTime, 0);
-
-        m_bIsExportingLegacyData = true;
-        CGameExporter gameExporter;
-
-        unsigned int flags = eExp_CoverSurfaces;
-
-        // Change the cursor to show that we're busy.
-        QWaitCursor wait;
-
-        if (gameExporter.Export(flags, eLittleEndian, "."))
-        {
-            m_bIsExportingLegacyData = false;
-            return true;
-        }
-        m_bIsExportingLegacyData = false;
-        return false;
-    }
-}
-
-void CCryEditApp::ExportToGame(bool bNoMsgBox)
-{
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-    if (usePrefabSystemForLevels)
-    {
-        AZ_Assert(false, "Prefab system no longer exports levels.");
-        return;
-    }
-
-    CGameEngine* pGameEngine = GetIEditor()->GetGameEngine();
-    if (!pGameEngine->IsLevelLoaded())
-    {
-        if (pGameEngine->GetLevelPath().isEmpty())
-        {
-            QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), ("Open or create a level first."));
-            return;
-        }
-
-        CErrorsRecorder errRecorder(GetIEditor());
-        // If level not loaded first fast export terrain.
-        m_bIsExportingLegacyData = true;
-        CGameExporter gameExporter;
-        gameExporter.Export();
-        m_bIsExportingLegacyData = false;
-    }
-
-    {
-        UserExportToGame(bNoMsgBox);
-    }
-}
-
-void CCryEditApp::OnFileExportToGameNoSurfaceTexture()
-{
-    UserExportToGame(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::DeleteSelectedEntities([[maybe_unused]] bool includeDescendants)
-{
-    GetIEditor()->BeginUndo();
-    CUndo undo("Delete Selected Object");
-    GetIEditor()->GetObjectManager()->DeleteSelection();
-    GetIEditor()->AcceptUndo("Delete Selection");
-    GetIEditor()->SetModifiedFlag();
-    GetIEditor()->SetModifiedModule(eModifiedBrushes);
-}
-
-void CCryEditApp::OnMoveObject()
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Move the selected object to the marker position
-    ////////////////////////////////////////////////////////////////////////
-}
-
-void CCryEditApp::OnRenameObj()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeMove()
-{
-    using namespace AzToolsFramework;
-    EditorTransformComponentSelectionRequestBus::Event(
-        GetEntityContextId(),
-        &EditorTransformComponentSelectionRequests::SetTransformMode,
-        EditorTransformComponentSelectionRequests::Mode::Translation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeRotate()
-{
-    using namespace AzToolsFramework;
-    EditorTransformComponentSelectionRequestBus::Event(
-        GetEntityContextId(),
-        &EditorTransformComponentSelectionRequests::SetTransformMode,
-        EditorTransformComponentSelectionRequests::Mode::Rotation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeScale()
-{
-    using namespace AzToolsFramework;
-    EditorTransformComponentSelectionRequestBus::Event(
-        GetEntityContextId(),
-        &EditorTransformComponentSelectionRequests::SetTransformMode,
-        EditorTransformComponentSelectionRequests::Mode::Scale);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeMove(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-
-    AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
-    AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
-        mode, AzToolsFramework::GetEntityContextId(),
-        &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
-    action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Translation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeRotate(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-
-    AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
-    AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
-        mode, AzToolsFramework::GetEntityContextId(),
-        &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
-    action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Rotation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeScale(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-
-    AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
-    AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
-        mode, AzToolsFramework::GetEntityContextId(),
-        &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
-    action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Scale);
-}
-
-void CCryEditApp::OnViewSwitchToGame()
-{
-    if (IsInPreviewMode())
-    {
-        return;
-    }
-    // close all open menus
-    auto activePopup = qApp->activePopupWidget();
-    if (qobject_cast<QMenu*>(activePopup))
-    {
-        activePopup->hide();
-    }
-    // TODO: Add your command handler code here
-    bool inGame = !GetIEditor()->IsInGameMode();
-    GetIEditor()->SetInGameMode(inGame);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnExportSelectedObjects()
-{
-    CExportManager* pExportManager = static_cast<CExportManager*> (GetIEditor()->GetExportManager());
-    QString filename = "untitled";
-    CBaseObject* pObj = GetIEditor()->GetSelectedObject();
-    if (pObj)
-    {
-        filename = pObj->GetName();
-    }
-    else
-    {
-        QString levelName = GetIEditor()->GetGameEngine()->GetLevelName();
-        if (!levelName.isEmpty())
-        {
-            filename = levelName;
-        }
-    }
-    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
-    pExportManager->Export(filename.toUtf8().data(), "obj", levelPath.toUtf8().data());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnFileExportOcclusionMesh()
-{
-    CExportManager* pExportManager = static_cast<CExportManager*> (GetIEditor()->GetExportManager());
-    QString levelName = GetIEditor()->GetGameEngine()->GetLevelName();
-    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
-    pExportManager->Export(levelName.toUtf8().data(), "ocm", levelPath.toUtf8().data(), false, false, true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnOpenAssetImporter()
-{
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::SceneSettings);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateSelected(QAction* action)
-{
-    action->setEnabled(!GetIEditor()->GetSelection()->IsEmpty());
-}
-
-void CCryEditApp::OnShowHelpers()
-{
-    GetIEditor()->GetDisplaySettings()->DisplayHelpers(!GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
-    GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditLevelData()
-{
-    auto dir = QFileInfo(GetIEditor()->GetDocument()->GetLevelPathName()).dir();
-    CFileUtil::EditTextFile(dir.absoluteFilePath("LevelData.xml").toUtf8().data());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnFileEditLogFile()
-{
-    CFileUtil::EditTextFile(CLogFile::GetLogFileName(), 0, IFileUtil::FILE_TYPE_SCRIPT);
-}
-
-void CCryEditApp::OnFileResaveSlices()
-{
-    AZStd::vector<AZ::Data::AssetInfo> sliceAssetInfos;
-    sliceAssetInfos.reserve(5000);
-    AZ::Data::AssetCatalogRequests::AssetEnumerationCB sliceCountCb = [&sliceAssetInfos]([[maybe_unused]] const AZ::Data::AssetId id, const AZ::Data::AssetInfo& info)
-    {
-        // Only add slices and nothing that has been temporarily added to the catalog with a macro in it (ie @devroot@)
-        if (info.m_assetType == azrtti_typeid<AZ::SliceAsset>() && info.m_relativePath[0] != '@')
-        {
-            sliceAssetInfos.push_back(info);
-        }
-    };
-    AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequestBus::Events::EnumerateAssets, nullptr, sliceCountCb, nullptr);
-
-    QString warningMessage = QString("Resaving all slices can be *extremely* slow depending on source control and on the number of slices in your project!\n\nYou can speed this up dramatically by checking out all your slices before starting this!\n\n Your project has %1 slices.\n\nDo you want to continue?").arg(sliceAssetInfos.size());
-
-    if (QMessageBox::Cancel == QMessageBox::warning(MainWindow::instance(), tr("!!!WARNING!!!"), warningMessage, QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel))
-    {
-        return;
-    }
-
-    AZ::SerializeContext* serialize = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(serialize, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
-
-    if (!serialize)
-    {
-        AZ_TracePrintf("Resave Slices", "Couldn't get the serialize context.  Something is very wrong.  Aborting!!!");
-        return;
-    }
-
-    AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-    if (!fileIO)
-    {
-        AZ_Error("Resave Slices", false, "File IO is not initialized.");
-        return;
-    }
-
-    int numFailures = 0;
-
-    // Create a lambda for load & save logic to make the lambda below easier to read
-    auto LoadAndSaveSlice = [serialize, &numFailures](const AZStd::string& filePath)
-    {
-        AZ::Entity* newRootEntity = nullptr;
-
-        // Read in the slice file first
-        {
-            AZ::IO::FileIOStream readStream(filePath.c_str(), AZ::IO::OpenMode::ModeRead);
-            newRootEntity = AZ::Utils::LoadObjectFromStream<AZ::Entity>(readStream, serialize, AZ::ObjectStream::FilterDescriptor(AZ::Data::AssetFilterNoAssetLoading));
-        }
-
-        // If we successfully loaded the file
-        if (newRootEntity)
-        {
-            if (!AZ::Utils::SaveObjectToFile(filePath, AZ::DataStream::ST_XML, newRootEntity))
-            {
-                AZ_TracePrintf("Resave Slices", "Unable to serialize the slice (%s) out to a file.  Unable to resave this slice\n", filePath.c_str());
-                numFailures++;
-            }
-        }
-        else
-        {
-            AZ_TracePrintf("Resave Slices", "Unable to read a slice (%s) file from disk.  Unable to resave this slice.\n", filePath.c_str());
-            numFailures++;
-        }
-    };
-
-    const size_t numSlices = sliceAssetInfos.size();
-    int slicesProcessed = 0;
-    int slicesRequestedForProcessing = 0;
-
-    if (numSlices > 0)
-    {
-        AzToolsFramework::ProgressShield::LegacyShowAndWait(MainWindow::instance(), tr("Checking out and resaving slices..."),
-            [numSlices, &slicesProcessed, &sliceAssetInfos, &LoadAndSaveSlice, &slicesRequestedForProcessing, &numFailures](int& current, int& max)
-            {
-                const static int numToProcessPerCall = 5;
-
-                if (slicesRequestedForProcessing < numSlices)
-                {
-                    for (int index = 0; index < numToProcessPerCall; index++)
-                    {
-                        if (slicesRequestedForProcessing < numSlices)
-                        {
-                            AZStd::string sourceFile;
-                            AzToolsFramework::AssetSystemRequestBus::Broadcast(&AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath, sliceAssetInfos[slicesRequestedForProcessing].m_relativePath, sourceFile);
-
-                            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::RequestEditForFile, sourceFile.c_str(), [&slicesProcessed, sourceFile, &LoadAndSaveSlice, &numFailures](bool success)
-                                {
-                                    slicesProcessed++;
-
-                                    if (success)
-                                    {
-                                        LoadAndSaveSlice(sourceFile);
-                                    }
-                                    else
-                                    {
-                                        AZ_TracePrintf("Resave Slices", "Unable to check a slice (%s) out of source control.  Unable to resave this slice\n", sourceFile.c_str());
-                                        numFailures++;
-                                    }
-                                }
-                            );
-                            slicesRequestedForProcessing++;
-                        }
-                    }
-                }
-
-                current = slicesProcessed;
-                max = static_cast<int>(numSlices);
-                return slicesProcessed == numSlices;
-            }
-        );
-
-        QString completeMessage;
-        if (numFailures > 0)
-        {
-            completeMessage = QString("All slices processed.  There were %1 slices that could not be resaved.  Please check the console for details.").arg(numFailures);
-        }
-        else
-        {
-            completeMessage = QString("All slices successfully process and re-saved!");
-        }
-
-        QMessageBox::information(MainWindow::instance(), tr("Re-saving complete"), completeMessage, QMessageBox::Ok);
-    }
-    else
-    {
-        QMessageBox::information(MainWindow::instance(), tr("No slices found"), tr("There were no slices found to resave."), QMessageBox::Ok);
-    }
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnFileEditEditorini()
-{
-    CFileUtil::EditTextFile(EDITOR_CFG_FILE);
-}
-
-void CCryEditApp::OnPreferences()
-{
-    /*
-    //////////////////////////////////////////////////////////////////////////////
-    // Accels edit by CPropertyPage
-    CAcceleratorManager tmpAccelManager;
-    tmpAccelManager = m_AccelManager;
-    CAccelMapPage page(&tmpAccelManager);
-    CPropertySheet sheet;
-    sheet.SetTitle( _T("Preferences") );
-    sheet.AddPage(&page);
-    if (sheet.DoModal() == IDOK) {
-        m_AccelManager = tmpAccelManager;
-        m_AccelManager.UpdateWndTable();
-    }
-    */
-}
-
-void CCryEditApp::OnOpenProjectManagerSettings()
-{
-    OpenProjectManager("UpdateProject");
-}
-
-void CCryEditApp::OnOpenProjectManagerNew()
-{
-    OpenProjectManager("CreateProject");
-}
-
-void CCryEditApp::OnOpenProjectManager()
-{
-    OpenProjectManager("Projects");
-}
-
-void CCryEditApp::OpenProjectManager(const AZStd::string& screen)
-{
-    // provide the current project path for in case we want to update the project
-    AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
-    const AZStd::string commandLineOptions = AZStd::string::format(" --screen %s --project-path %s", screen.c_str(), projectPath.c_str());
-    bool launchSuccess = AzFramework::ProjectManager::LaunchProjectManager(commandLineOptions);
-    if (!launchSuccess)
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QObject::tr("Failed to launch O3DE Project Manager"), QObject::tr("Failed to find or start the O3dE Project Manager"));
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUndo()
-{
-    //GetIEditor()->GetObjectManager()->UndoLastOp();
-    GetIEditor()->Undo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnRedo()
-{
-    GetIEditor()->Redo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateRedo(QAction* action)
-{
-    if (GetIEditor()->GetUndoManager()->IsHaveRedo())
-    {
-        action->setEnabled(true);
-    }
-    else
-    {
-        action->setEnabled(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateUndo(QAction* action)
-{
-    if (GetIEditor()->GetUndoManager()->IsHaveUndo())
-    {
-        action->setEnabled(true);
-    }
-    else
-    {
-        action->setEnabled(false);
-    }
-}
-
-/// Undo command to track entering and leaving Simulation Mode.
-class SimulationModeCommand
-    : public AzToolsFramework::UndoSystem::URSequencePoint
-{
-public:
-    AZ_CLASS_ALLOCATOR(SimulationModeCommand, AZ::SystemAllocator, 0);
-    AZ_RTTI(SimulationModeCommand, "{FB9FB958-5C56-47F6-B168-B5F564F70E69}");
-
-    SimulationModeCommand(const AZStd::string& friendlyName);
-
-    void Undo() override;
-    void Redo() override;
-
-    bool Changed() const override { return true; } // State will always have changed.
-
-private:
-    void UndoRedo()
-    {
-        if (ActionManager* actionManager = MainWindow::instance()->GetActionManager())
-        {
-            if (auto* action = actionManager->GetAction(ID_SWITCH_PHYSICS))
-            {
-                action->trigger();
-            }
-        }
-    }
-};
-
-SimulationModeCommand::SimulationModeCommand(const AZStd::string& friendlyName)
-    : URSequencePoint(friendlyName)
-{
-}
-
-void SimulationModeCommand::Undo()
-{
-    UndoRedo();
-}
-
-void SimulationModeCommand::Redo()
-{
-    UndoRedo();
-}
-
-namespace UndoRedo
-{
-    static bool IsHappening()
-    {
-        bool undoRedo = false;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            undoRedo, &AzToolsFramework::ToolsApplicationRequests::IsDuringUndoRedo);
-
-        return undoRedo;
-    }
-} // namespace UndoRedo
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnSwitchPhysics()
-{
-    if (GetIEditor()->GetGameEngine() && !GetIEditor()->GetGameEngine()->GetSimulationMode() && !GetIEditor()->GetGameEngine()->IsLevelLoaded())
-    {
-        // Don't allow physics to be toggled on if we haven't loaded a level yet
-        return;
-    }
-
-    QWaitCursor wait;
-
-    AZStd::unique_ptr<AzToolsFramework::ScopedUndoBatch> undoBatch;
-    if (!UndoRedo::IsHappening())
-    {
-        undoBatch = AZStd::make_unique<AzToolsFramework::ScopedUndoBatch>("Switching Physics Simulation");
-
-        auto simulationModeCommand = AZStd::make_unique<SimulationModeCommand>(AZStd::string("Switch Physics"));
-        // simulationModeCommand managed by undoBatch
-        simulationModeCommand->SetParent(undoBatch->GetUndoBatch());
-        simulationModeCommand.release();
-    }
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_SWITCH_START, 0, 0);
-
-    uint32 flags = GetIEditor()->GetDisplaySettings()->GetSettings();
-    if (flags & SETTINGS_PHYSICS)
-    {
-        flags &= ~SETTINGS_PHYSICS;
-    }
-    else
-    {
-        flags |= SETTINGS_PHYSICS;
-    }
-
-    GetIEditor()->GetDisplaySettings()->SetSettings(flags);
-
-    if ((flags & SETTINGS_PHYSICS) == 0)
-    {
-        GetIEditor()->GetGameEngine()->SetSimulationMode(false);
-        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_CHANGED, 0, 0);
-    }
-    else
-    {
-        GetIEditor()->GetGameEngine()->SetSimulationMode(true);
-        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_CHANGED, 1, 0);
-    }
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_SIMULATION_MODE_SWITCH_END, 0, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnSwitchPhysicsUpdate(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-    action->setChecked(!m_bIsExportingLegacyData && GetIEditor()->GetGameEngine()->GetSimulationMode());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnSyncPlayer()
-{
-    GetIEditor()->GetGameEngine()->SyncPlayerPosition(!GetIEditor()->GetGameEngine()->IsSyncPlayerPosition());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnSyncPlayerUpdate(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-    action->setChecked(!GetIEditor()->GetGameEngine()->IsSyncPlayerPosition());
-}
-
-void CCryEditApp::OnUpdateNonGameMode(QAction* action)
-{
-    action->setEnabled(!GetIEditor()->IsInGameMode());
-}
-
-void CCryEditApp::OnUpdateNewLevel(QAction* action)
-{
-    action->setEnabled(!m_bIsExportingLegacyData);
-}
-
-void CCryEditApp::OnUpdatePlayGame(QAction* action)
-{
-    action->setEnabled(!m_bIsExportingLegacyData && GetIEditor()->IsLevelLoaded());
-}
-
-//////////////////////////////////////////////////////////////////////////
-CCryEditApp::ECreateLevelResult CCryEditApp::CreateLevel(const QString& levelName, QString& fullyQualifiedLevelName /* ={} */)
-{
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    // If we are creating a new level and we're in simulate mode, then switch it off before we do anything else
-    if (GetIEditor()->GetGameEngine() && GetIEditor()->GetGameEngine()->GetSimulationMode())
-    {
-        // Preserve the modified flag, we don't want this switch of physics to change that flag
-        bool bIsDocModified = GetIEditor()->GetDocument()->IsModified();
-        OnSwitchPhysics();
-        GetIEditor()->GetDocument()->SetModifiedFlag(bIsDocModified);
-    }
-
-    const QScopedValueRollback<bool> rollback(m_creatingNewLevel);
-    m_creatingNewLevel = true;
-    GetIEditor()->Notify(eNotify_OnBeginCreate);
-    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorBeginCreate);
-
-    QString currentLevel = GetIEditor()->GetLevelFolder();
-    if (!currentLevel.isEmpty())
-    {
-        GetIEditor()->GetSystem()->GetIPak()->ClosePacks(currentLevel.toUtf8().data());
-    }
-
-    QString cryFileName = levelName.mid(levelName.lastIndexOf('/') + 1, levelName.length() - levelName.lastIndexOf('/') + 1);
-    QString levelPath = QStringLiteral("%1/Levels/%2/").arg(Path::GetEditingGameDataFolder().c_str(), levelName);
-    fullyQualifiedLevelName = levelPath + cryFileName + EditorUtils::LevelFile::GetDefaultFileExtension();
-
-    //_MAX_PATH includes null terminator, so we actually want to cap at _MAX_PATH-1
-    if (fullyQualifiedLevelName.length() >= _MAX_PATH-1)
-    {
-        GetIEditor()->Notify(eNotify_OnEndCreate);
-        return ECLR_MAX_PATH_EXCEEDED;
-    }
-
-    // Does the directory already exist ?
-    if (QFileInfo(levelPath).exists())
-    {
-        GetIEditor()->Notify(eNotify_OnEndCreate);
-        return ECLR_ALREADY_EXISTS;
-    }
-
-    // Create the directory
-    CLogFile::WriteLine("Creating level directory");
-    if (!CFileUtil::CreatePath(levelPath))
-    {
-        GetIEditor()->Notify(eNotify_OnEndCreate);
-        return ECLR_DIR_CREATION_FAILED;
-    }
-
-    if (GetIEditor()->GetDocument()->IsDocumentReady())
-    {
-        m_pDocManager->OnFileNew();
-    }
-
-    ICVar* sv_map = gEnv->pConsole->GetCVar("sv_map");
-    if (sv_map)
-    {
-        sv_map->Set(levelName.toUtf8().data());
-    }
-
-
-    GetIEditor()->GetDocument()->InitEmptyLevel(128, 1);
-
-    GetIEditor()->SetStatusText("Creating Level...");
-
-    // Save the document to this folder
-    GetIEditor()->GetDocument()->SetPathName(fullyQualifiedLevelName);
-    GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
-
-    if (usePrefabSystemForLevels)
-    {
-        auto* service = AZ::Interface<AzToolsFramework::PrefabEditorEntityOwnershipInterface>::Get();
-        if (service)
-        {
-            service->CreateNewLevelPrefab(fullyQualifiedLevelName.toUtf8().constData(), DefaultLevelTemplateName);
-        }
-    }
-
-    if (GetIEditor()->GetDocument()->Save())
-    {
-        if (!usePrefabSystemForLevels)
-        {
-            m_bIsExportingLegacyData = true;
-            CGameExporter gameExporter;
-            gameExporter.Export();
-            m_bIsExportingLegacyData = false;
-        }
-
-        GetIEditor()->GetGameEngine()->LoadLevel(true, true);
-        GetIEditor()->GetSystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_START, 0, 0);
-
-        GetIEditor()->GetSystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_PRECACHE_END, 0, 0);
-    }
-
-    if (!usePrefabSystemForLevels)
-    {
-        // No terrain, but still need to export default octree and visarea data.
-        CGameExporter gameExporter;
-        gameExporter.Export(eExp_CoverSurfaces | eExp_SurfaceTexture, eLittleEndian, ".");
-    }
-
-    GetIEditor()->GetDocument()->CreateDefaultLevelAssets(128, 1);
-    GetIEditor()->GetDocument()->SetDocumentReady(true);
-    GetIEditor()->SetStatusText("Ready");
-
-    // At the end of the creating level process, add this level to the MRU list
-    CCryEditApp::instance()->AddToRecentFileList(fullyQualifiedLevelName);
-
-    GetIEditor()->Notify(eNotify_OnEndCreate);
-    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorEndCreate);
-    return ECLR_OK;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnCreateLevel()
-{
-    if (m_creatingNewLevel)
-    {
-        return;
-    }
-    bool wasCreateLevelOperationCancelled = false;
-    bool isNewLevelCreationSuccess = false;
-    // This will show the new level dialog until a valid input has been entered by the user or until the user click cancel
-    while (!isNewLevelCreationSuccess && !wasCreateLevelOperationCancelled)
-    {
-        wasCreateLevelOperationCancelled = false;
-        isNewLevelCreationSuccess = CreateLevel(wasCreateLevelOperationCancelled);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CCryEditApp::CreateLevel(bool& wasCreateLevelOperationCancelled)
-{
-    BOOL bIsDocModified = GetIEditor()->GetDocument()->IsModified();
-    if (GetIEditor()->GetDocument()->IsDocumentReady() && bIsDocModified)
-    {
-        QString str = QObject::tr("Level %1 has been changed. Save Level?").arg(GetIEditor()->GetGameEngine()->GetLevelName());
-        int result = QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Save Level"), str, QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-        if (QMessageBox::Yes == result)
-        {
-            if (!GetIEditor()->GetDocument()->DoFileSave())
-            {
-                // if the file save operation failed, assume that the user was informed of why
-                // already and treat it as a cancel
-                wasCreateLevelOperationCancelled = true;
-                return false;
-            }
-
-            bIsDocModified = false;
-        }
-        else if (QMessageBox::No == result)
-        {
-            // Set Modified flag to false to prevent show Save unchanged dialog again
-            GetIEditor()->GetDocument()->SetModifiedFlag(false);
-        }
-        else if (QMessageBox::Cancel == result)
-        {
-            wasCreateLevelOperationCancelled = true;
-            return false;
-        }
-    }
-
-    const char* temporaryLevelName = GetIEditor()->GetDocument()->GetTemporaryLevelName();
-
-    CNewLevelDialog dlg;
-    dlg.m_level = "";
-
-    if (dlg.exec() != QDialog::Accepted)
-    {
-        wasCreateLevelOperationCancelled = true;
-        GetIEditor()->GetDocument()->SetModifiedFlag(bIsDocModified);
-        return false;
-    }
-
-    if (!GetIEditor()->GetLevelIndependentFileMan()->PromptChangedFiles())
-    {
-        return false;
-    }
-
-    QString levelNameWithPath = dlg.GetLevel();
-    QString levelName = levelNameWithPath.mid(levelNameWithPath.lastIndexOf('/') + 1);
-
-    if (levelName == temporaryLevelName && GetIEditor()->GetLevelName() != temporaryLevelName)
-    {
-        GetIEditor()->GetDocument()->DeleteTemporaryLevel();
-    }
-
-    if (levelName.length() == 0 || !CryStringUtils::IsValidFileName(levelName.toUtf8().data()))
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Level name is invalid, please choose another name."));
-        return false;
-    }
-
-    //Verify that we are not using the temporary level name
-    if (QString::compare(levelName, temporaryLevelName) == 0)
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Please enter a level name that is different from the temporary name."));
-        return false;
-    }
-
-    // We're about to start creating a level, so start recording errors to display at the end.
-    GetIEditor()->StartLevelErrorReportRecording();
-
-    QString fullyQualifiedLevelName;
-    ECreateLevelResult result = CreateLevel(levelNameWithPath, fullyQualifiedLevelName);
-
-    if (result == ECLR_ALREADY_EXISTS)
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Level with this name already exists, please choose another name."));
-        return false;
-    }
-    else if (result == ECLR_DIR_CREATION_FAILED)
-    {
-        QString szLevelRoot = QStringLiteral("%1\\Levels\\%2").arg(Path::GetEditingGameDataFolder().c_str(), levelName);
-
-        QByteArray windowsErrorMessage(ERROR_LEN, 0);
-        QByteArray cwd(ERROR_LEN, 0);
-        DWORD dw = GetLastError();
-
-#ifdef WIN32
-        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-            NULL,
-            dw,
-            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-            windowsErrorMessage.data(),
-            windowsErrorMessage.length(), NULL);
-        _getcwd(cwd.data(), cwd.length());
-#else
-        windowsErrorMessage = strerror(dw);
-        cwd = QDir::currentPath().toUtf8();
-#endif
-
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Failed to create level directory: %1\n Error: %2\nCurrent Path: %3").arg(szLevelRoot, windowsErrorMessage, cwd));
-        return false;
-    }
-    else if (result == ECLR_MAX_PATH_EXCEEDED)
-    {
-        QFileInfo info(fullyQualifiedLevelName);
-        const AZStd::string rawProjectDirectory = Path::GetEditingGameDataFolder();
-        const QString projectDirectory = QDir::toNativeSeparators(QString::fromUtf8(rawProjectDirectory.data(), rawProjectDirectory.size()));
-        const QString elidedLevelName = QStringLiteral("%1...%2").arg(levelName.left(10)).arg(levelName.right(10));
-        const QString elidedLevelFileName = QStringLiteral("%1...%2").arg(info.fileName().left(10)).arg(info.fileName().right(10));
-        const QString message = QObject::tr(
-            "The fully-qualified path for the new level exceeds the maximum supported path length of %1 characters (it's %2 characters long). Please choose a smaller name.\n\n"
-            "The fully-qualified path is made up of the project folder (\"%3\", %4 characters), the \"Levels\" sub-folder, a folder named for the level (\"%5\", %6 characters) and the level file (\"%7\", %8 characters), plus necessary separators.\n\n"
-            "Please also note that on most platforms, individual components of the path (folder/file names can't exceed  approximately 255 characters)\n\n"
-            "Click \"Copy to Clipboard\" to copy the fully-qualified name and close this message.")
-            .arg(_MAX_PATH - 1).arg(fullyQualifiedLevelName.size())
-            .arg(projectDirectory).arg(projectDirectory.size())
-            .arg(elidedLevelName).arg(levelName.size())
-            .arg(elidedLevelFileName).arg(info.fileName().size());
-        QMessageBox messageBox(QMessageBox::Critical, QString(), message, QMessageBox::Ok, AzToolsFramework::GetActiveWindow());
-        QPushButton* copyButton = messageBox.addButton(QObject::tr("Copy to Clipboard"), QMessageBox::ActionRole);
-        QObject::connect(copyButton, &QPushButton::pressed, this, [fullyQualifiedLevelName]() { QGuiApplication::clipboard()->setText(fullyQualifiedLevelName); });
-        messageBox.exec();
-        return false;
-    }
-
-    // force the level being rendered at least once
-    m_bForceProcessIdle = true;
-
-    m_levelErrorsHaveBeenDisplayed = false;
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnCreateSlice()
-{
-    QMessageBox::warning(AzToolsFramework::GetActiveWindow(), "Not implemented", "New Slice is not yet implemented.");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnOpenLevel()
-{
-    CLevelFileDialog levelFileDialog(true);
-    levelFileDialog.show();
-    levelFileDialog.adjustSize();
-
-    if (levelFileDialog.exec() == QDialog::Accepted)
-    {
-        OpenDocumentFile(levelFileDialog.GetFileName().toUtf8().data());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnOpenSlice()
-{
-    QString fileName = QFileDialog::getOpenFileName(MainWindow::instance(),
-        tr("Open Slice"),
-        Path::GetEditingGameDataFolder().c_str(),
-        tr("Slice (*.slice)"));
-
-    if (!fileName.isEmpty())
-    {
-        OpenDocumentFile(fileName.toUtf8().data());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CCryEditDoc* CCryEditApp::OpenDocumentFile(LPCTSTR lpszFileName)
-{
-    if (m_openingLevel)
-    {
-        return GetIEditor()->GetDocument();
-    }
-
-    // If we are loading and we're in simulate mode, then switch it off before we do anything else
-    if (GetIEditor()->GetGameEngine() && GetIEditor()->GetGameEngine()->GetSimulationMode())
-    {
-        // Preserve the modified flag, we don't want this switch of physics to change that flag
-        bool bIsDocModified = GetIEditor()->GetDocument()->IsModified();
-        OnSwitchPhysics();
-        GetIEditor()->GetDocument()->SetModifiedFlag(bIsDocModified);
-    }
-
-    // We're about to start loading a level, so start recording errors to display at the end.
-    GetIEditor()->StartLevelErrorReportRecording();
-
-    const QScopedValueRollback<bool> rollback(m_openingLevel, true);
-
-    MainWindow::instance()->menuBar()->setEnabled(false);
-
-    CCryEditDoc* doc = nullptr;
-    bool bVisible = false;
-    bool bTriggerConsole = false;
-
-    doc = GetIEditor()->GetDocument();
-    bVisible = GetIEditor()->ShowConsole(true);
-    bTriggerConsole = true;
-
-    if (GetIEditor()->GetLevelIndependentFileMan()->PromptChangedFiles())
-    {
-        SandboxEditor::StartupTraceHandler openDocTraceHandler;
-        openDocTraceHandler.StartCollection();
-        if (m_bAutotestMode)
-        {
-            openDocTraceHandler.SetShowWindow(false);
-        }
-
-        // in this case, we set bAddToMRU to always be true because adding files to the MRU list
-        // automatically culls duplicate and normalizes paths anyway
-        m_pDocManager->OpenDocumentFile(lpszFileName, true);
-
-        if (openDocTraceHandler.HasAnyErrors())
-        {
-            doc->SetHasErrors();
-        }
-    }
-
-    if (bTriggerConsole)
-    {
-        GetIEditor()->ShowConsole(bVisible);
-    }
-    LoadTagLocations();
-
-    MainWindow::instance()->menuBar()->setEnabled(true);
-
-    if (doc->GetEditMode() == CCryEditDoc::DocumentEditingMode::SliceEdit)
-    {
-        // center camera on entities in slice
-        if (ActionManager* actionManager = MainWindow::instance()->GetActionManager())
-        {
-            GetIEditor()->GetUndoManager()->Suspend();
-            actionManager->GetAction(ID_EDIT_SELECTALL)->trigger();
-            actionManager->GetAction(ID_GOTO_SELECTED)->trigger();
-            GetIEditor()->GetUndoManager()->Resume();
-        }
-    }
-
-    m_levelErrorsHaveBeenDisplayed = false;
-
-    return doc; // the API wants a CDocument* to be returned. It seems not to be used, though, in our current state.
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnResourcesReduceworkingset()
-{
-#ifdef WIN32 // no such thing on macOS
-    SetProcessWorkingSetSize(GetCurrentProcess(), -1, -1);
-#endif
-}
-
-void CCryEditApp::OnUpdateWireframe(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-    int             nWireframe(R_SOLID_MODE);
-    ICVar*      r_wireframe(gEnv->pConsole->GetCVar("r_wireframe"));
-
-    if (r_wireframe)
-    {
-        nWireframe = r_wireframe->GetIVal();
-    }
-
-    action->setChecked(nWireframe == R_WIREFRAME_MODE);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnViewConfigureLayout()
-{
-    if (GetIEditor()->IsInGameMode())
-    {
-        // you may not change your viewports while game mode is running.
-        CryLog("You may not change viewport configuration while in game mode.");
-        return;
-    }
-    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-    if (layout)
-    {
-        CLayoutConfigDialog dlg;
-        dlg.SetLayout(layout->GetLayout());
-        if (dlg.exec() == QDialog::Accepted)
-        {
-            // Will kill this Pane. so must be last line in this function.
-            layout->CreateLayout(dlg.GetLayout());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::TagLocation(int index)
-{
-    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-    if (!pRenderViewport)
-    {
-        return;
-    }
-
-    Vec3 vPosVec = pRenderViewport->GetViewTM().GetTranslation();
-
-    m_tagLocations[index - 1] = vPosVec;
-    m_tagAngles[index - 1] = Ang3::GetAnglesXYZ(Matrix33(pRenderViewport->GetViewTM()));
-
-    QString sTagConsoleText("");
-    sTagConsoleText = tr("Camera Tag Point %1 set to the position: x=%2, y=%3, z=%4 ").arg(index).arg(vPosVec.x, 0, 'f', 2).arg(vPosVec.y, 0, 'f', 2).arg(vPosVec.z, 0, 'f', 2);
-
-    GetIEditor()->WriteToConsole(sTagConsoleText.toUtf8().data());
-
-    if (gSettings.bAutoSaveTagPoints)
-    {
-        SaveTagLocations();
-    }
-}
-
-void CCryEditApp::SaveTagLocations()
-{
-    // Save to file.
-    QString filename = QFileInfo(GetIEditor()->GetDocument()->GetLevelPathName()).dir().absoluteFilePath("tags.txt");
-    QFile f(filename);
-    if (f.open(QFile::WriteOnly))
-    {
-        QTextStream stream(&f);
-        for (int i = 0; i < 12; i++)
-        {
-            stream <<
-                m_tagLocations[i].x << "," << m_tagLocations[i].y << "," <<  m_tagLocations[i].z << "," <<
-                m_tagAngles[i].x << "," << m_tagAngles[i].y << "," << m_tagAngles[i].z << Qt::endl;
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::GotoTagLocation(int index)
-{
-    QString sTagConsoleText("");
-    Vec3 pos = m_tagLocations[index - 1];
-
-    if (!IsVectorsEqual(m_tagLocations[index - 1], Vec3(0, 0, 0)))
-    {
-        // Change render viewport view TM to the stored one.
-        CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-        if (pRenderViewport)
-        {
-            Matrix34 tm = Matrix34::CreateRotationXYZ(m_tagAngles[index - 1]);
-            tm.SetTranslation(pos);
-            pRenderViewport->SetViewTM(tm);
-            Vec3 vPosVec(tm.GetTranslation());
-
-            GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_BEAM_PLAYER_TO_CAMERA_POS, (UINT_PTR)&tm, 0);
-
-            sTagConsoleText = tr("Moved Camera To Tag Point %1 (x=%2, y=%3, z=%4)").arg(index).arg(vPosVec.x, 0, 'f', 2).arg(vPosVec.y, 0, 'f', 2).arg(vPosVec.z, 0, 'f', 2);
-        }
-    }
-    else
-    {
-        sTagConsoleText = tr("Camera Tag Point %1 not set").arg(index);
-    }
-
-    if (!sTagConsoleText.isEmpty())
-    {
-        GetIEditor()->WriteToConsole(sTagConsoleText.toUtf8().data());
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::LoadTagLocations()
-{
-    QString filename = QFileInfo(GetIEditor()->GetDocument()->GetLevelPathName()).dir().absoluteFilePath("tags.txt");
-    // Load tag locations from file.
-
-    ZeroStruct(m_tagLocations);
-
-    QFile f(filename);
-    if (f.open(QFile::ReadOnly))
-    {
-        QTextStream stream(&f);
-        for (int i = 0; i < 12; i++)
-        {
-            QStringList line = stream.readLine().split(",");
-            float x = 0, y = 0, z = 0, ax = 0, ay = 0, az = 0;
-            if (line.count() == 6)
-            {
-                x = line[0].toFloat();
-                y = line[1].toFloat();
-                z = line[2].toFloat();
-                ax = line[3].toFloat();
-                ay = line[4].toFloat();
-                az = line[5].toFloat();
-            }
-
-            m_tagLocations[i] = Vec3(x, y, z);
-            m_tagAngles[i] = Ang3(ax, ay, az);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnToolsLogMemoryUsage()
-{
-    gEnv->pConsole->ExecuteString("SaveLevelStats");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnTagLocation1() { TagLocation(1); }
-void CCryEditApp::OnTagLocation2() { TagLocation(2); }
-void CCryEditApp::OnTagLocation3() { TagLocation(3); }
-void CCryEditApp::OnTagLocation4() { TagLocation(4); }
-void CCryEditApp::OnTagLocation5() { TagLocation(5); }
-void CCryEditApp::OnTagLocation6() { TagLocation(6); }
-void CCryEditApp::OnTagLocation7() { TagLocation(7); }
-void CCryEditApp::OnTagLocation8() { TagLocation(8); }
-void CCryEditApp::OnTagLocation9() { TagLocation(9); }
-void CCryEditApp::OnTagLocation10() { TagLocation(10); }
-void CCryEditApp::OnTagLocation11() { TagLocation(11); }
-void CCryEditApp::OnTagLocation12() { TagLocation(12); }
-
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnGotoLocation1() { GotoTagLocation(1); }
-void CCryEditApp::OnGotoLocation2() { GotoTagLocation(2); }
-void CCryEditApp::OnGotoLocation3() { GotoTagLocation(3); }
-void CCryEditApp::OnGotoLocation4() { GotoTagLocation(4); }
-void CCryEditApp::OnGotoLocation5() { GotoTagLocation(5); }
-void CCryEditApp::OnGotoLocation6() { GotoTagLocation(6); }
-void CCryEditApp::OnGotoLocation7() { GotoTagLocation(7); }
-void CCryEditApp::OnGotoLocation8() { GotoTagLocation(8); }
-void CCryEditApp::OnGotoLocation9() { GotoTagLocation(9); }
-void CCryEditApp::OnGotoLocation10() { GotoTagLocation(10); }
-void CCryEditApp::OnGotoLocation11() { GotoTagLocation(11); }
-void CCryEditApp::OnGotoLocation12() { GotoTagLocation(12); }
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnCustomizeKeyboard()
-{
-    MainWindow::instance()->OnCustomizeToolbar();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnToolsConfiguretools()
-{
-    ToolsConfigDialog dlg;
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        MainWindow::instance()->UpdateToolsMenu();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnToolsScriptHelp()
-{
-    AzToolsFramework::CScriptHelpDialog::GetInstance()->show();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnViewCycle2dviewport()
-{
-    GetIEditor()->GetViewManager()->Cycle2DViewport();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnDisplayGotoPosition()
-{
-    GotoPositionDialog dialog;
-    dialog.exec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnFileSavelevelresources()
-{
-    CGameResourcesExporter saver;
-    saver.GatherAllLoadedResources();
-    saver.ChooseDirectoryAndSave();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnClearRegistryData()
-{
-    if (QMessageBox::warning(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Clear all sandbox registry data ?"),
-        QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
-    {
-        QSettings settings;
-        settings.clear();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnValidatelevel()
-{
-    // TODO: Add your command handler code here
-    CLevelInfo levelInfo;
-    levelInfo.Validate();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnToolsPreferences()
-{
-    EditorPreferencesDialog dlg(MainWindow::instance());
-    dlg.exec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnGraphicsSettings()
-{
-    GraphicsSettingsDialog dlg(MainWindow::instance());
-    dlg.exec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnSwitchToDefaultCamera()
-{
-    CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
-    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
-    {
-        rvp->SetDefaultCamera();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateSwitchToDefaultCamera(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-    CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
-    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(pViewport))
-    {
-        action->setEnabled(true);
-        action->setChecked(rvp->IsDefaultCamera());
-    }
-    else
-    {
-        action->setEnabled(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnSwitchToSequenceCamera()
-{
-    CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
-    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
-    {
-        rvp->SetSequenceCamera();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateSwitchToSequenceCamera(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-
-    CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
-
-    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(pViewport))
-    {
-        bool enableAction = false;
-
-        // only enable if we're editing a sequence in Track View and have cameras in the level
-        if (GetIEditor()->GetAnimation()->GetSequence())
-        {
-
-            AZ::EBusAggregateResults<AZ::EntityId> componentCameras;
-            Camera::CameraBus::BroadcastResult(componentCameras, &Camera::CameraRequests::GetCameras);
-
-            const int numCameras = componentCameras.values.size();
-            enableAction = (numCameras > 0);
-        }
-
-        action->setEnabled(enableAction);
-        action->setChecked(rvp->IsSequenceCamera());
-    }
-    else
-    {
-        action->setEnabled(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnSwitchToSelectedcamera()
-{
-    CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
-    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
-    {
-        rvp->SetSelectedCamera();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateSwitchToSelectedCamera(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-    AZ::EBusAggregateResults<AZ::EntityId> cameras;
-    Camera::CameraBus::BroadcastResult(cameras, &Camera::CameraRequests::GetCameras);
-    bool isCameraComponentSelected = selectedEntityList.size() > 0 ? AZStd::find(cameras.values.begin(), cameras.values.end(), *selectedEntityList.begin()) != cameras.values.end() : false;
-
-    CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
-    CRenderViewport* rvp = viewport_cast<CRenderViewport*>(pViewport);
-    if (isCameraComponentSelected && rvp)
-    {
-        action->setEnabled(true);
-        action->setChecked(rvp->IsSelectedCamera());
-    }
-    else
-    {
-        action->setEnabled(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnSwitchcameraNext()
-{
-    CViewport* vp = GetIEditor()->GetActiveView();
-    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
-    {
-        rvp->CycleCamera();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnOpenAssetBrowserView()
-{
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetBrowser);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnOpenTrackView()
-{
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::TrackView);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnOpenAudioControlsEditor()
-{
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::AudioControlsEditor);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnOpenUICanvasEditor()
-{
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::UiEditor);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::SetGameSpecCheck(ESystemConfigSpec spec, ESystemConfigPlatform platform, int &nCheck, bool &enable)
-{
-    if (GetIEditor()->GetEditorConfigSpec() == spec && GetIEditor()->GetEditorConfigPlatform() == platform)
-    {
-        nCheck = 1;
-    }
-    enable = spec <= GetIEditor()->GetSystem()->GetMaxConfigSpec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateGameSpec(QAction* action)
-{
-    Q_ASSERT(action->isCheckable());
-    int nCheck = 0;
-    bool enable = true;
-    switch (action->data().toInt())
-    {
-    case ID_GAME_PC_ENABLELOWSPEC:
-        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_PC, nCheck, enable);
-        break;
-    case ID_GAME_PC_ENABLEMEDIUMSPEC:
-        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_PC, nCheck, enable);
-        break;
-    case ID_GAME_PC_ENABLEHIGHSPEC:
-        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_PC, nCheck, enable);
-        break;
-    case ID_GAME_PC_ENABLEVERYHIGHSPEC:
-        SetGameSpecCheck(CONFIG_VERYHIGH_SPEC, CONFIG_PC, nCheck, enable);
-        break;
-    case ID_GAME_OSXMETAL_ENABLELOWSPEC:
-        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_OSX_METAL, nCheck, enable);
-        break;
-    case ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC:
-        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_OSX_METAL, nCheck, enable);
-        break;
-    case ID_GAME_OSXMETAL_ENABLEHIGHSPEC:
-        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_OSX_METAL, nCheck, enable);
-        break;
-    case ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC:
-        SetGameSpecCheck(CONFIG_VERYHIGH_SPEC, CONFIG_OSX_METAL, nCheck, enable);
-        break;
-    case ID_GAME_ANDROID_ENABLELOWSPEC:
-        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_ANDROID, nCheck, enable);
-        break;
-    case ID_GAME_ANDROID_ENABLEMEDIUMSPEC:
-        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_ANDROID, nCheck, enable);
-        break;
-    case ID_GAME_ANDROID_ENABLEHIGHSPEC:
-        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_ANDROID, nCheck, enable);
-        break;
-    case ID_GAME_ANDROID_ENABLEVERYHIGHSPEC:
-        SetGameSpecCheck(CONFIG_VERYHIGH_SPEC, CONFIG_ANDROID, nCheck, enable);
-        break;
-    case ID_GAME_IOS_ENABLELOWSPEC:
-        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_IOS, nCheck, enable);
-        break;
-    case ID_GAME_IOS_ENABLEMEDIUMSPEC:
-        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_IOS, nCheck, enable);
-        break;
-    case ID_GAME_IOS_ENABLEHIGHSPEC:
-        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_IOS, nCheck, enable);
-        break;
-    case ID_GAME_IOS_ENABLEVERYHIGHSPEC:
-        SetGameSpecCheck(CONFIG_VERYHIGH_SPEC, CONFIG_IOS, nCheck, enable);
-        break;
-#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)\
-    case ID_GAME_##CODENAME##_ENABLELOWSPEC:\
-        SetGameSpecCheck(CONFIG_LOW_SPEC, CONFIG_##CODENAME, nCheck, enable);\
-        break;\
-    case ID_GAME_##CODENAME##_ENABLEMEDIUMSPEC:\
-        SetGameSpecCheck(CONFIG_MEDIUM_SPEC, CONFIG_##CODENAME, nCheck, enable);\
-        break;\
-    case ID_GAME_##CODENAME##_ENABLEHIGHSPEC:\
-        SetGameSpecCheck(CONFIG_HIGH_SPEC, CONFIG_##CODENAME, nCheck, enable);\
-        break;
-        AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-    }
-    action->setChecked(nCheck);
-    action->setEnabled(enable);
-}
-
-//////////////////////////////////////////////////////////////////////////
-RecentFileList* CCryEditApp::GetRecentFileList()
-{
-    static RecentFileList list;
-    return &list;
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::AddToRecentFileList(const QString& lpszPathName)
-{
-    // In later MFC implementations (WINVER >= 0x0601) files must exist before they can be added to the recent files list.
-    // Here we override the new CWinApp::AddToRecentFileList code with the old implementation to remove this requirement.
-
-    if (IsInAutotestMode())
-    {
-        // Never add to the recent file list when in auto test mode
-        // This would cause issues for devs running tests locally impacting their normal workflows/setups
-        return;
-    }
-
-
-    if (GetRecentFileList())
-    {
-        GetRecentFileList()->Add(lpszPathName);
-    }
-
-    // write the list immediately so it will be remembered even after a crash
-    if (GetRecentFileList())
-    {
-        GetRecentFileList()->WriteList();
-    }
-    else
-    {
-        CLogFile::WriteLine("ERROR: Recent File List is NULL!");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CCryEditApp::IsInRegularEditorMode()
-{
-    return !IsInTestMode() && !IsInPreviewMode()
-           && !IsInExportMode() && !IsInConsoleMode() && !IsInLevelLoadTestMode() && !GetIEditor()->IsInMatEditMode();
-}
-
-void CCryEditApp::OnOpenQuickAccessBar()
-{
-    if (m_pQuickAccessBar == NULL)
-    {
-        return;
-    }
-
-    QRect geo = m_pQuickAccessBar->geometry();
-    geo.moveCenter(MainWindow::instance()->geometry().center());
-    m_pQuickAccessBar->setGeometry(geo);
-    m_pQuickAccessBar->setVisible(true);
-    m_pQuickAccessBar->setFocus();
-}
-
-void CCryEditApp::SetEditorWindowTitle(QString sTitleStr, QString sPreTitleStr, QString sPostTitleStr)
-{
-    if (MainWindow::instance() || m_pConsoleDialog)
-    {
-        if (sTitleStr.isEmpty())
-        {
-            sTitleStr = QObject::tr("O3DE Editor [Developer Preview]");
-        }
-
-        if (!sPreTitleStr.isEmpty())
-        {
-            sTitleStr.insert(sTitleStr.length(), QStringLiteral(" - %1").arg(sPreTitleStr));
-        }
-
-        if (!sPostTitleStr.isEmpty())
-        {
-            sTitleStr.insert(sTitleStr.length(), QStringLiteral(" - %1").arg(sPostTitleStr));
-        }
-
-        MainWindow::instance()->setWindowTitle(sTitleStr);
-        if (m_pConsoleDialog)
-        {
-            m_pConsoleDialog->setWindowTitle(sTitleStr);
-        }
-    }
-}
-
-bool CCryEditApp::Command_ExportToEngine()
-{
-    return CCryEditApp::instance()->UserExportToGame(true);
-}
-
-CMainFrame * CCryEditApp::GetMainFrame() const
-{
-    return MainWindow::instance()->GetOldMainFrame();
-}
-
-void CCryEditApp::StartProcessDetached(const char* process, const char* args)
-{
-    // Build the arguments as a QStringList
-    AZStd::vector<AZStd::string> tokens;
-
-    // separate the string based on spaces for paths like "-launch", "lua", "-files";
-    // also separate the string and keep spaces inside the folder path;
-    // Ex: C:\dev\Foundation\dev\Cache\AutomatedTesting\pc\automatedtesting\scripts\components\a a\empty.lua;
-    // Ex: C:\dev\Foundation\dev\Cache\AutomatedTesting\pc\automatedtesting\scripts\components\a a\'empty'.lua;
-    AZStd::string currentStr(args);
-    AZStd::size_t firstQuotePos = AZStd::string::npos;
-    AZStd::size_t secondQuotePos = 0;
-    AZStd::size_t pos = 0;
-
-    while (!currentStr.empty())
-    {
-        firstQuotePos = currentStr.find_first_of('\"');
-        pos = currentStr.find_first_of(" ");
-
-        if ((firstQuotePos != AZStd::string::npos) && (firstQuotePos < pos || pos == AZStd::string::npos))
-        {
-            secondQuotePos = currentStr.find_first_of('\"', firstQuotePos + 1);
-            if (secondQuotePos == AZStd::string::npos)
-            {
-                AZ_Warning("StartProcessDetached", false, "String tokenize failed, no matching \" found.");
-                return;
-            }
-
-            AZStd::string newElement(AZStd::string(currentStr.data() + (firstQuotePos + 1), (secondQuotePos - 1)));
-            tokens.push_back(newElement);
-
-            currentStr = currentStr.substr(secondQuotePos + 1);
-
-            firstQuotePos = AZStd::string::npos;
-            secondQuotePos = 0;
-            continue;
-        }
-        else
-        {
-            if (pos != AZStd::string::npos)
-            {
-                AZStd::string newElement(AZStd::string(currentStr.data() + 0, pos));
-                tokens.push_back(newElement);
-                currentStr = currentStr.substr(pos + 1);
-            }
-            else
-            {
-                tokens.push_back(AZStd::string(currentStr));
-                break;
-            }
-        }
-    }
-
-    QStringList argsList;
-    for (const auto& arg : tokens)
-    {
-        argsList.push_back(QString(arg.c_str()));
-    }
-
-    // Launch the process
-    [[maybe_unused]] bool startDetachedReturn = QProcess::startDetached(
-        process,
-        argsList,
-        QCoreApplication::applicationDirPath()
-    );
-    AZ_Warning("StartProcessDetached", startDetachedReturn, "Failed to start process:%s args:%s", process, args);
-}
-
-void CCryEditApp::OpenLUAEditor(const char* files)
-{
-    AZStd::string args = "-launch lua";
-    if (files && strlen(files) > 0)
-    {
-        AZStd::vector<AZStd::string> resolvedPaths;
-
-        AZStd::vector<AZStd::string> tokens;
-
-        AzFramework::StringFunc::Tokenize(files, tokens, '|');
-
-        for (const auto& file : tokens)
-        {
-            char resolved[AZ_MAX_PATH_LEN];
-
-            AZStd::string fullPath = Path::GamePathToFullPath(file.c_str()).toUtf8().data();
-            azstrncpy(resolved, AZ_MAX_PATH_LEN, fullPath.c_str(), fullPath.size());
-
-            if (AZ::IO::FileIOBase::GetInstance()->Exists(resolved))
-            {
-                AZStd::string current = '\"' + AZStd::string(resolved) + '\"';
-                AZStd::replace(current.begin(), current.end(), '\\', '/');
-                resolvedPaths.push_back(current);
-            }
-        }
-
-        if (!resolvedPaths.empty())
-        {
-            for (const auto& resolvedPath : resolvedPaths)
-            {
-                args.append(AZStd::string::format(" -files %s", resolvedPath.c_str()));
-            }
-        }
-    }
-
-    const char* engineRoot = nullptr;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-    AZ_Assert(engineRoot != nullptr, "Unable to communicate to AzFramework::ApplicationRequests::Bus");
-
-    AZStd::string_view exePath;
-    AZ::ComponentApplicationBus::BroadcastResult(exePath, &AZ::ComponentApplicationRequests::GetExecutableFolder);
-
-    AZStd::string process = AZStd::string::format("\"%.*s" AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING "LuaIDE"
-#if defined(AZ_PLATFORM_WINDOWS)
-        ".exe"
-#endif
-        "\"", aznumeric_cast<int>(exePath.size()), exePath.data());
-
-    AZStd::string processArgs = AZStd::string::format("%s -engine-path \"%s\"", args.c_str(), engineRoot);
-    StartProcessDetached(process.c_str(), processArgs.c_str());
-}
-
-void CCryEditApp::PrintAlways(const AZStd::string& output)
-{
-    m_stdoutRedirection.WriteBypassingRedirect(output.c_str(), output.size());
-}
-
-QString CCryEditApp::GetRootEnginePath() const
-{
-    return m_rootEnginePath;
-}
-
-void CCryEditApp::RedirectStdoutToNull()
-{
-    m_stdoutRedirection.RedirectTo(AZ::IO::SystemFile::GetNullFilename());
-}
-
-void CCryEditApp::OnError(AzFramework::AssetSystem::AssetSystemErrors error)
-{
-    AZStd::string errorMessage = "";
-
-    switch (error)
-    {
-    case AzFramework::AssetSystem::ASSETSYSTEM_FAILED_TO_LAUNCH_ASSETPROCESSOR:
-        errorMessage = AZStd::string::format("Failed to start the Asset Processor.\r\nPlease make sure that AssetProcessor is available in the same folder the Editor is in.\r\n");
-        break;
-    case AzFramework::AssetSystem::ASSETSYSTEM_FAILED_TO_CONNECT_TO_ASSETPROCESSOR:
-        errorMessage = AZStd::string::format("Failed to connect to the Asset Processor.\r\nPlease make sure that AssetProcessor is available in the same folder the Editor is in and another copy is not already running somewhere else.\r\n");
-        break;
-    }
-
-    CryMessageBox(errorMessage.c_str(), "Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
-}
-
-void CCryEditApp::OnOpenProceduralMaterialEditor()
-{
-    QtViewPaneManager::instance()->OpenPane(LyViewPane::SubstanceEditor);
-}
-
-namespace Editor
-{
-    //! This function returns the build system target name
-    AZStd::string_view GetBuildTargetName()
-    {
-#if !defined (LY_CMAKE_TARGET)
-#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
-#endif
-        return AZStd::string_view{ LY_CMAKE_TARGET };
-    }
-}
-
-#if defined(AZ_PLATFORM_WINDOWS)
-//Due to some laptops not autoswitching to the discrete gpu correctly we are adding these
-//dllspecs as defined in the amd and nvidia white papers to 'force on' the use of the
-//discrete chips.  This will be overriden by users setting application profiles
-//and may not work on older drivers or bios. In theory this should be enough to always force on
-//the discrete chips.
-
-//http://developer.download.nvidia.com/devzone/devcenter/gamegraphics/files/OptimusRenderingPolicies.pdf
-//https://community.amd.com/thread/169965
-
-// It is unclear if this is also needed for linux or osx at this time(22/02/2017)
-extern "C"
-{
-    __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
-    __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
-}
-#endif
-
-#ifdef Q_OS_WIN
-#pragma comment(lib, "Shell32.lib")
-#endif
-
-struct CryAllocatorsRAII
-{
-    CryAllocatorsRAII()
-    {
-        AZ_Assert(!AZ::AllocatorInstance<AZ::LegacyAllocator>::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
-        AZ_Assert(!AZ::AllocatorInstance<CryStringAllocator>::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
-
-        AZ::AllocatorInstance<AZ::LegacyAllocator>::Create();
-        AZ::AllocatorInstance<CryStringAllocator>::Create();
-    }
-
-    ~CryAllocatorsRAII()
-    {
-        AZ::AllocatorInstance<CryStringAllocator>::Destroy();
-        AZ::AllocatorInstance<AZ::LegacyAllocator>::Destroy();
-    }
-};
-
-
-extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
-{
-    CryAllocatorsRAII cryAllocatorsRAII;
-
-    // ensure the EditorEventsBus context gets created inside EditorLib
-    [[maybe_unused]] const auto& editorEventsContext = AzToolsFramework::EditorEvents::Bus::GetOrCreateContext();
-
-    // connect relevant buses to global settings
-    gSettings.Connect();
-
-    auto theApp = AZStd::make_unique<CCryEditApp>();
-    // this does some magic to set the current directory...
-    {
-        QCoreApplication app(argc, argv);
-        CCryEditApp::InitDirectory();
-    }
-
-    // Must be set before QApplication is initialized, so that we support HighDpi monitors, like the Retina displays
-    // on Windows 10
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
-
-    // QtOpenGL attributes and surface format setup.
-    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
-    QSurfaceFormat format = QSurfaceFormat::defaultFormat();
-    format.setDepthBufferSize(24);
-    format.setStencilBufferSize(8);
-    format.setVersion(2, 1);
-    format.setProfile(QSurfaceFormat::CoreProfile);
-    format.setSamples(8);
-    format.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
-    format.setRenderableType(QSurfaceFormat::OpenGL);
-    format.setSwapInterval(0);
-#ifdef AZ_DEBUG_BUILD
-    format.setOption(QSurfaceFormat::DebugContext);
-#endif
-    QSurfaceFormat::setDefaultFormat(format);
-
-    Editor::EditorQtApplication::InstallQtLogHandler();
-
-    AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::SystemDpiAware);
-    Editor::EditorQtApplication app(argc, argv);
-
-    if (app.arguments().contains("-autotest_mode"))
-    {
-        // Nullroute all stdout to null for automated tests, this way we make sure
-        // that the test result output is not polluted with unrelated output data.
-        theApp->RedirectStdoutToNull();
-    }
-
-    // Hook the trace bus to catch errors, boot the AZ app after the QApplication is up
-    int ret = 0;
-
-    // open a scope to contain the AZToolsApp instance;
-    {
-        EditorInternal::EditorToolsApplication AZToolsApp(&argc, &argv);
-
-        {
-            CEditCommandLineInfo cmdInfo;
-            if (!cmdInfo.m_bAutotestMode && !cmdInfo.m_bConsoleMode && !cmdInfo.m_bExport && !cmdInfo.m_bExportTexture &&
-                !cmdInfo.m_bNullRenderer && !cmdInfo.m_bMatEditMode && !cmdInfo.m_bTest)
-            {
-                if (auto nativeUI = AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get(); nativeUI != nullptr)
-                {
-                    nativeUI->SetMode(AZ::NativeUI::Mode::ENABLED);
-                }
-            }
-        }
-
-        // The settings registry has been created by the AZ::ComponentApplication constructor at this point
-        AZ::SettingsRegistryInterface& registry = *AZ::SettingsRegistry::Get();
-        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
-            registry, Editor::GetBuildTargetName());
-
-        if (!AZToolsApp.Start())
-        {
-            return -1;
-        }
-
-        AzToolsFramework::EditorEvents::Bus::Broadcast(&AzToolsFramework::EditorEvents::NotifyQtApplicationAvailable, &app);
-
-    #if defined(AZ_PLATFORM_MAC)
-        // Native menu bars do not work on macOS due to all the tool dialogs
-        QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
-    #endif
-
-        int exitCode = 0;
-
-        BOOL didCryEditStart = CCryEditApp::instance()->InitInstance();
-        AZ_Error("Editor", didCryEditStart, "O3DE Editor did not initialize correctly, and will close."
-            "\nThis could be because of incorrectly configured components, or missing required gems."
-            "\nSee other errors for more details.");
-
-        if (didCryEditStart)
-        {
-            app.EnableOnIdle();
-
-            ret = app.exec();
-        }
-        else
-        {
-            exitCode = 1;
-        }
-
-        CCryEditApp::instance()->ExitInstance(exitCode);
-
-    }
-
-    gSettings.Disconnect();
-
-    return ret;
-}
-
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env)
-{
-    AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(env));
-}
-
-extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule()
-{
-    AZ::Environment::Detach();
-}
-
-#include <moc_CryEdit.cpp>
diff --git a/Code/Sandbox/Editor/CryEdit.h b/Code/Sandbox/Editor/CryEdit.h
deleted file mode 100644
index 2dfd35bfc3..0000000000
--- a/Code/Sandbox/Editor/CryEdit.h
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CRYEDIT_H
-#define CRYINCLUDE_EDITOR_CRYEDIT_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/Outcome/Outcome.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include "WipFeatureManager.h"
-#include "CryEditDoc.h"
-#include "ViewPane.h"
-
-#include <QSettings>
-
-#endif
-
-class CCryDocManager;
-class CQuickAccessBar;
-class CCryEditDoc;
-class CEditCommandLineInfo;
-class CMainFrame;
-class CConsoleDialog;
-struct mg_connection;
-struct mg_request_info;
-struct mg_context;
-struct IEventLoopHook;
-class QAction;
-class MainWindow;
-class QSharedMemory;
-
-class SANDBOX_API RecentFileList
-{
-public:
-    RecentFileList();
-
-    void Remove(int index);
-    void Add(const QString& filename);
-
-    int GetSize();
-
-    void GetDisplayName(QString& name, int index, const QString& curDir);
-
-    QString& operator[](int index);
-
-    void ReadList();
-    void WriteList();
-
-    static const int Max = 12;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QStringList m_arrNames;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QSettings m_settings;
-};
-
-
-#define PROJECT_CONFIGURATOR_GEM_PAGE "Gems Settings"
-
-
-/**
-* Bus for controlling the application's idle processing (may include things like entity updates, ticks, viewport rendering, etc.).
-* This is sometimes necessary in special event-processing loops to prevent long (or infinite) processing time because Idle Processing
-* can perpetually generate more events.
-*/
-class EditorIdleProcessing : public AZ::EBusTraits
-{
-public:
-    using Bus = AZ::EBus<EditorIdleProcessing>;
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-    /// Disable the Editor's idle processing. EnableIdleProcessing() must be called exactly once when special processing is complete.
-    virtual void DisableIdleProcessing() {}
-
-    /// Re-enables Idle Processing. Must be called exactly one time for every call to DisableIdleProcessing().
-    virtual void EnableIdleProcessing() {}
-};
-
-using EditorIdleProcessingBus = AZ::EBus<EditorIdleProcessing>;
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-class SANDBOX_API CCryEditApp
-    : public QObject
-    , protected AzFramework::AssetSystemInfoBus::Handler
-    , protected EditorIdleProcessingBus::Handler
-{
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    friend MainWindow;
-    Q_OBJECT
-public:
-    enum ECreateLevelResult
-    {
-        ECLR_OK = 0,
-        ECLR_ALREADY_EXISTS,
-        ECLR_DIR_CREATION_FAILED,
-        ECLR_MAX_PATH_EXCEEDED
-    };
-
-
-    CCryEditApp();
-    ~CCryEditApp();
-
-    static CCryEditApp* instance();
-
-    bool GetRootEnginePath(QDir& rootEnginePath) const;
-    bool CreateLevel(bool& wasCreateLevelOperationCancelled);
-    void LoadFile(QString fileName);
-    void ForceNextIdleProcessing() { m_bForceProcessIdle = true; }
-    void KeepEditorActive(bool bActive) { m_bKeepEditorActive = bActive; };
-    bool IsInTestMode() const { return m_bTestMode; };
-    bool IsInPreviewMode() const { return m_bPreviewMode; };
-    bool IsInExportMode() const { return m_bExportMode; };
-    bool IsExportingLegacyData() const { return m_bIsExportingLegacyData; }
-    bool IsInConsoleMode() const { return m_bConsoleMode; };
-    bool IsInAutotestMode() const { return m_bAutotestMode; };
-    bool IsInLevelLoadTestMode() const { return m_bLevelLoadTestMode; }
-    bool IsInRegularEditorMode();
-    bool IsExiting() const { return m_bExiting; }
-    void EnableAccelerator(bool bEnable);
-    void SaveAutoBackup();
-    void SaveAutoRemind();
-    void ExportToGame(bool bNoMsgBox = true);
-    //! \param sTitleStr overwrites the default title - "Sandbox Editor 3 (tm)"
-    void SetEditorWindowTitle(QString sTitleStr = QString(), QString sPreTitleStr = QString(), QString sPostTitleStr = QString());
-    RecentFileList* GetRecentFileList();
-    virtual void AddToRecentFileList(const QString& lpszPathName);
-    ECreateLevelResult CreateLevel(const QString& levelName, QString& fullyQualifiedLevelName);
-    static void InitDirectory();
-    BOOL FirstInstance(bool bForceNewInstance = false);
-    void InitFromCommandLine(CEditCommandLineInfo& cmdInfo);
-    BOOL CheckIfAlreadyRunning();
-    //! @return successful outcome if initialization succeeded. or failed outcome with error message.
-    AZ::Outcome<void, AZStd::string> InitGameSystem(HWND hwndForInputSystem);
-    void CreateSplashScreen();
-    void InitPlugins();
-    bool InitGame();
-
-    BOOL InitConsole();
-    int IdleProcessing(bool bBackground);
-    bool IsWindowInForeground();
-    void RunInitPythonScript(CEditCommandLineInfo& cmdInfo);
-    void RegisterEventLoopHook(IEventLoopHook* pHook);
-    void UnregisterEventLoopHook(IEventLoopHook* pHook);
-
-    void DisableIdleProcessing() override;
-    void EnableIdleProcessing() override;
-
-    // Print to stdout even if there out has been redirected
-    void PrintAlways(const AZStd::string& output);
-
-    //! Launches a detached process
-    //! \param process The path to the process to start
-    //! \param args Space separated list of arguments to pass to the process on start.
-    void StartProcessDetached(const char* process, const char* args);
-
-    //! Launches the Lua Editor/Debugger
-    //! \param files A space separated list of aliased paths
-    void OpenLUAEditor(const char* files);
-
-    QString GetRootEnginePath() const;
-    void RedirectStdoutToNull();
-    // Overrides
-    // ClassWizard generated virtual function overrides
-public:
-    virtual BOOL InitInstance();
-    virtual int ExitInstance(int exitCode = 0);
-    virtual BOOL OnIdle(LONG lCount);
-    virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszFileName);
-
-    CCryDocManager* GetDocManager() { return m_pDocManager; }
-
-    void RegisterActionHandlers();
-
-    // Implementation
-    void OnCreateLevel();
-    void OnOpenLevel();
-    void OnCreateSlice();
-    void OnOpenSlice();
-    void OnAppAbout();
-    void OnAppShowWelcomeScreen();
-    void OnUpdateShowWelcomeScreen(QAction* action);
-    void OnDocumentationTutorials();
-    void OnDocumentationGlossary();
-    void OnDocumentationO3DE();
-    void OnDocumentationGamelift();
-    void OnDocumentationReleaseNotes();
-    void OnDocumentationGameDevBlog();
-    void OnDocumentationForums();
-    void OnDocumentationAWSSupport();
-    void OnCommercePublish();
-    void OnCommerceMerch();
-    void SaveTagLocations();
-    void OnExportSelectedObjects();
-    void OnEditHold();
-    void OnEditFetch();
-    void OnFileExportToGameNoSurfaceTexture();
-    void OnViewSwitchToGame();
-    void OnViewDeploy();
-    void DeleteSelectedEntities(bool includeDescendants);
-    void OnMoveObject();
-    void OnRenameObj();
-    void OnEditmodeMove();
-    void OnEditmodeRotate();
-    void OnEditmodeScale();
-    void OnUpdateEditmodeMove(QAction* action);
-    void OnUpdateEditmodeRotate(QAction* action);
-    void OnUpdateEditmodeScale(QAction* action);
-    void OnUndo();
-    void OnOpenAssetImporter();
-    void OnUpdateSelected(QAction* action);
-    void OnEditLevelData();
-    void OnFileEditLogFile();
-    void OnFileResaveSlices();
-    void OnFileEditEditorini();
-    void OnPreferences();
-    void OnOpenProjectManagerSettings();
-    void OnOpenProjectManagerNew();
-    void OnOpenProjectManager();
-    void OnRedo();
-    void OnUpdateRedo(QAction* action);
-    void OnUpdateUndo(QAction* action);
-    void OnSwitchPhysics();
-    void OnSwitchPhysicsUpdate(QAction* action);
-    void OnSyncPlayer();
-    void OnSyncPlayerUpdate(QAction* action);
-    void OnResourcesReduceworkingset();
-    void OnDummyCommand() {};
-    void OnShowHelpers();
-    void OnFileSave();
-    void OnUpdateDocumentReady(QAction* action);
-    void OnUpdateFileOpen(QAction* action);
-    void OnUpdateNonGameMode(QAction* action);
-    void OnUpdateNewLevel(QAction* action);
-    void OnUpdatePlayGame(QAction* action);
-
-protected:
-    // ------- AzFramework::AssetSystemInfoBus::Handler ------
-    void OnError(AzFramework::AssetSystem::AssetSystemErrors error) override;
-    // -------------------------------------------
-
-private:
-    void InitLevel(const CEditCommandLineInfo& cmdInfo);
-
-    bool ConnectToAssetProcessor() const;
-    void CompileCriticalAssets() const;
-
-    CMainFrame* GetMainFrame() const;
-    void WriteConfig();
-    void TagLocation(int index);
-    void GotoTagLocation(int index);
-    void LoadTagLocations();
-    bool UserExportToGame(bool bNoMsgBox = true);
-    static void ShowSplashScreen(CCryEditApp* app);
-    static void CloseSplashScreen();
-    static void OutputStartupMessage(QString str);
-    bool ShowEnableDisableGemDialog(const QString& title, const QString& message);
-    QString ShowWelcomeDialog();
-
-    bool FixDanglingSharedMemory(const QString& sharedMemName) const;
-
-    //! Displays level load errors after a certain number of idle frames have been processed.
-    //! Due to the asyncrhonous nature of loading assets any errors that are reported by components
-    //! can happen after the level is loaded. This method will wait for a few idle updates and then
-    //! display the load errors to ensure all errors are displayed properly.
-    void DisplayLevelLoadErrors();
-
-    class CEditorImpl* m_pEditor = nullptr;
-    static CCryEditApp* s_currentInstance;
-    //! True if editor is in test mode.
-    //! Test mode is a special mode enabled when Editor ran with /test command line.
-    //! In this mode editor starts up, but exit immediately after all initialization.
-    bool m_bTestMode = false;
-    //! In this mode editor will load specified cry file, export t, and then close.
-    bool m_bExportMode = false;
-    QString m_exportFile;
-    //! This flag is set to true every time any of the "Export" commands is being executed.
-    //! Once exporting is finished the flag is set back to false.
-    //! UI events like "New Level" or "Open Level", should not be allowed while m_bIsExportingLegacyData==true.
-    //! Otherwise it could trigger crashes trying to export while exporting.
-    bool m_bIsExportingLegacyData = false;
-    //! If application exiting.
-    bool m_bExiting = false;
-    //! True if editor is in preview mode.
-    //! In this mode only very limited functionality is available and only for fast preview of models.
-    bool m_bPreviewMode = false;
-    // Only console window is created.
-    bool m_bConsoleMode = false;
-    // Skip showing the WelcomeScreenDialog
-    bool m_bSkipWelcomeScreenDialog = false;
-    // Level load test mode
-    bool m_bLevelLoadTestMode = false;
-    //! Current file in preview mode.
-    char m_sPreviewFile[_MAX_PATH];
-    //! True if "/runpythontest" was passed as a flag.
-    bool m_bRunPythonTestScript = false;
-    //! True if "/runpython" was passed as a flag.
-    bool m_bRunPythonScript = false;
-    //! File to run on startup
-    QString m_execFile;
-    //! Command to run on startup
-    QString m_execLineCmd;
-    //! Autotest mode: Special mode meant for automated testing, things like blocking dialogs or error report windows won't appear
-    bool m_bAutotestMode = false;
-
-    CConsoleDialog* m_pConsoleDialog = nullptr;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Vec3 m_tagLocations[12];
-    Ang3 m_tagAngles[12];
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    float m_fastRotateAngle = 45.0f;
-    float m_moveSpeedStep = 0.1f;
-
-    ULONG_PTR m_gdiplusToken;
-    QSharedMemory* m_mutexApplication = nullptr;
-    //! was the editor active in the previous frame ... needed to detect if the game lost focus and
-    //! dispatch proper SystemEvent (needed to release input keys)
-    bool m_bPrevActive = false;
-    // If this flag is set, the next OnIdle() will update, even if the app is in the background, and then
-    // this flag will be reset.
-    bool m_bForceProcessIdle = false;
-    // This is set while IdleProcessing is running to prevent re-entrancy
-    bool m_idleProcessingRunning = false;
-    // Keep the editor alive, even if no focus is set
-    bool m_bKeepEditorActive = false;
-    // Currently creating a new level
-    bool m_creatingNewLevel = false;
-    bool m_openingLevel = false;
-    bool m_savingLevel = false;
-    // Flag indicating if the errors for the currently loaded level have been displayed
-    bool m_levelErrorsHaveBeenDisplayed = false;
-    // Number of idle frames that have passed before displaying level errors
-    int m_numBeforeDisplayErrorFrames = 0;
-
-    QString m_lastOpenLevelPath;
-    CQuickAccessBar* m_pQuickAccessBar = nullptr;
-    IEventLoopHook* m_pEventLoopHook = nullptr;
-    QString m_rootEnginePath;
-
-    int m_disableIdleProcessingCounter = 0; //!< Counts requests to disable idle processing. When non-zero, idle processing will be disabled.
-
-    CCryDocManager* m_pDocManager = nullptr;
-
-// Disable warning for dll export since this member won't be used outside this class
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    AZ::IO::FileDescriptorRedirector m_stdoutRedirection = AZ::IO::FileDescriptorRedirector(1); // < 1 for STDOUT
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING 
-
-private:
-    static inline constexpr const char* DefaultLevelTemplateName = "Prefabs/Default_Level.prefab";
-
-    struct PythonOutputHandler;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    AZStd::shared_ptr<PythonOutputHandler> m_pythonOutputHandler;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    friend struct PythonTestOutputHandler;
-
-    void OpenProjectManager(const AZStd::string& screen);
-    void OnUpdateWireframe(QAction* action);
-    void OnViewConfigureLayout();
-
-    // Tag Locations.
-    void OnTagLocation1();
-    void OnTagLocation2();
-    void OnTagLocation3();
-    void OnTagLocation4();
-    void OnTagLocation5();
-    void OnTagLocation6();
-    void OnTagLocation7();
-    void OnTagLocation8();
-    void OnTagLocation9();
-    void OnTagLocation10();
-    void OnTagLocation11();
-    void OnTagLocation12();
-
-    void OnGotoLocation1();
-    void OnGotoLocation2();
-    void OnGotoLocation3();
-    void OnGotoLocation4();
-    void OnGotoLocation5();
-    void OnGotoLocation6();
-    void OnGotoLocation7();
-    void OnGotoLocation8();
-    void OnGotoLocation9();
-    void OnGotoLocation10();
-    void OnGotoLocation11();
-    void OnGotoLocation12();
-    void OnToolsLogMemoryUsage();
-    void OnCustomizeKeyboard();
-    void OnToolsConfiguretools();
-    void OnToolsScriptHelp();
-    void OnViewCycle2dviewport();
-    void OnDisplayGotoPosition();
-    void OnFileSavelevelresources();
-    void OnClearRegistryData();
-    void OnValidatelevel();
-    void OnToolsPreferences();
-    void OnGraphicsSettings();
-    void OnSwitchToDefaultCamera();
-    void OnUpdateSwitchToDefaultCamera(QAction* action);
-    void OnSwitchToSequenceCamera();
-    void OnUpdateSwitchToSequenceCamera(QAction* action);
-    void OnSwitchToSelectedcamera();
-    void OnUpdateSwitchToSelectedCamera(QAction* action);
-    void OnSwitchcameraNext();
-    void OnOpenProceduralMaterialEditor();
-    void OnOpenAssetBrowserView();
-    void OnOpenTrackView();
-    void OnOpenAudioControlsEditor();
-    void OnOpenUICanvasEditor();
-    void OnChangeGameSpec(UINT nID);
-    void SetGameSpecCheck(ESystemConfigSpec spec, ESystemConfigPlatform platform, int &nCheck, bool &enable);
-    void OnUpdateGameSpec(QAction* action);
-    void OnOpenQuickAccessBar();
-
-public:
-    void ExportLevel(bool bExportToGame, bool bExportTexture, bool bAutoExport);
-    static bool Command_ExportToEngine();
-
-    void OnFileExportOcclusionMesh();
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CCrySingleDocTemplate 
-    : public QObject
-{
-private:
-    explicit CCrySingleDocTemplate(const QMetaObject* pDocClass)
-        : QObject()
-        , m_documentClass(pDocClass)
-    {
-    }
-public:
-    enum Confidence
-    {
-        noAttempt,
-        maybeAttemptForeign,
-        maybeAttemptNative,
-        yesAttemptForeign,
-        yesAttemptNative,
-        yesAlreadyOpen
-    };
-
-    template<typename DOCUMENT>
-    static CCrySingleDocTemplate* create()
-    {
-        return new CCrySingleDocTemplate(&DOCUMENT::staticMetaObject);
-    }
-    ~CCrySingleDocTemplate() {};
-    // avoid creating another CMainFrame
-    // close other type docs before opening any things
-    virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszPathName, BOOL bAddToMRU, BOOL bMakeVisible);
-    virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszPathName, BOOL bMakeVisible = TRUE);
-    virtual Confidence MatchDocType(LPCTSTR lpszPathName, CCryEditDoc*& rpDocMatch);
-
-private:
-    const QMetaObject* m_documentClass = nullptr;
-};
-
-class CDocTemplate;
-class CCryDocManager
-{
-    CCrySingleDocTemplate* m_pDefTemplate = nullptr;
-public:
-    CCryDocManager();
-    CCrySingleDocTemplate* SetDefaultTemplate(CCrySingleDocTemplate* pNew);
-    // Copied from MFC to get rid of the silly ugly unoverridable doc-type pick dialog
-    virtual void OnFileNew();
-    virtual BOOL DoPromptFileName(QString& fileName, UINT nIDSTitle,
-        DWORD lFlags, BOOL bOpenFileDialog, CDocTemplate* pTemplate);
-    virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszFileName, BOOL bAddToMRU);
-
-    QVector<CCrySingleDocTemplate*> m_templateList;
-};
-
-#include <AzCore/Component/Component.h>
-
-namespace AzToolsFramework
-{
-    //! A component to reflect scriptable commands for the Editor
-    class CryEditPythonHandler final
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(CryEditPythonHandler, "{D4B19973-54D9-44BD-9E70-6069462A0CDC}")
-        virtual ~CryEditPythonHandler() = default;
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-
-        class CryEditHandler
-        {
-        public:
-            AZ_RTTI(CryEditHandler, "{6C1FD05A-2F39-4094-80D4-CA526676F13E}")
-            virtual ~CryEditHandler() = default;
-        };
-
-        class CryEditCheckoutHandler
-        {
-        public:
-            AZ_RTTI(CryEditCheckoutHandler, "{C65EF439-6754-4ACD-AEA2-196F2DBA0AF3}")
-            virtual ~CryEditCheckoutHandler() = default;
-        };
-    };
-
-} // namespace AzToolsFramework
-
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env);
-extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule();
-
-#endif // CRYINCLUDE_EDITOR_CRYEDIT_H
diff --git a/Code/Sandbox/Editor/CryEditDoc.cpp b/Code/Sandbox/Editor/CryEditDoc.cpp
deleted file mode 100644
index b9c3d437ed..0000000000
--- a/Code/Sandbox/Editor/CryEditDoc.cpp
+++ /dev/null
@@ -1,2274 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "CryEditDoc.h"
-
-// Qt
-#include <QDateTime>
-
-// AzCore
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Utils/Utils.h>
-
-// AzFramework
-#include <AzFramework/Archive/IArchive.h>
-#include <AzFramework/API/ApplicationAPI.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/Slice/SliceUtilities.h>
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <AzToolsFramework/UI/Layer/NameConflictWarning.hxx>
-#include <AzToolsFramework/API/EditorLevelNotificationBus.h>
-#include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
-
-// CryCommon
-#include <CryCommon/IAudioSystem.h>
-
-// Editor
-#include "Settings.h"
-
-#include "PluginManager.h"
-#include "ViewManager.h"
-#include "DisplaySettings.h"
-#include "GameEngine.h"
-
-#include "CryEdit.h"
-#include "ActionManager.h"
-#include "Include/IObjectManager.h"
-#include "ErrorReportDialog.h"
-#include "SurfaceTypeValidator.h"
-#include "Util/AutoLogTime.h"
-#include "CheckOutDialog.h"
-#include "GameExporter.h"
-#include "MainWindow.h"
-#include "LevelFileDialog.h"
-#include "StatObjBus.h"
-
-#include <Atom/RPI.Public/ViewportContext.h>
-#include <Atom/RPI.Public/ViewportContextBus.h>
-
-// LmbrCentral
-#include <LmbrCentral/Rendering/EditorLightComponentBus.h> // for LmbrCentral::EditorLightComponentRequestBus
-
-//#define PROFILE_LOADING_WITH_VTUNE
-
-// profilers api.
-//#include "pure.h"
-#ifdef PROFILE_LOADING_WITH_VTUNE
-#include "C:\Program Files\Intel\Vtune\Analyzer\Include\VTuneApi.h"
-#pragma comment(lib,"C:\\Program Files\\Intel\\Vtune\\Analyzer\\Lib\\VTuneApi.lib")
-#endif
-
-static const char* kAutoBackupFolder = "_autobackup";
-static const char* kHoldFolder = "$tmp_hold"; // conform to the ignored file types $tmp[0-9]*_ regex
-static const char* kSaveBackupFolder = "_savebackup";
-static const char* kResizeTempFolder = "$tmp_resize"; // conform to the ignored file types $tmp[0-9]*_ regex
-
-static const char* kBackupOrTempFolders[] =
-{
-    kAutoBackupFolder,
-    kHoldFolder,
-    kSaveBackupFolder,
-    kResizeTempFolder,
-    "_hold", // legacy name
-    "_tmpresize", // legacy name
-};
-
-static const char* kLevelPathForSliceEditing = "EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly";
-
-static bool IsSliceFile(const QString& filePath)
-{
-    return filePath.endsWith(AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str(), Qt::CaseInsensitive);
-}
-
-namespace Internal
-{
-    bool SaveLevel()
-    {
-        if (!GetIEditor()->GetDocument()->DoSave(GetIEditor()->GetDocument()->GetActivePathName(), TRUE))
-        {
-            return false;
-        }
-
-        return true;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CCryEditDoc construction/destruction
-
-CCryEditDoc::CCryEditDoc()
-    : doc_validate_surface_types(0)
-    , m_modifiedModuleFlags(eModifiedNothing)
-    // It assumes loaded levels have already been exported. Can be a big fat lie, though.
-    // The right way would require us to save to the level folder the export status of the
-    // level.
-    , m_boLevelExported(true)
-    , m_modified(false)
-    , m_envProbeHeight(200.0f)
-    , m_envProbeSliceRelativePath("EngineAssets/Slices/DefaultLevelSetup.slice")
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Set member variables to initial values
-    ////////////////////////////////////////////////////////////////////////
-    m_bLoadFailed = false;
-    m_waterColor = QColor(0, 0, 255);
-
-    m_fogTemplate = GetIEditor()->FindTemplate("Fog");
-    m_environmentTemplate = GetIEditor()->FindTemplate("Environment");
-
-    if (m_environmentTemplate)
-    {
-        m_fogTemplate = m_environmentTemplate->findChild("Fog");
-    }
-    else
-    {
-        m_environmentTemplate = XmlHelpers::CreateXmlNode("Environment");
-    }
-
-    m_bDocumentReady = false;
-    GetIEditor()->SetDocument(this);
-    CLogFile::WriteLine("Document created");
-    RegisterConsoleVariables();
-
-    MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_FILE_SAVE_AS, this, &CCryEditDoc::OnFileSaveAs);
-}
-
-CCryEditDoc::~CCryEditDoc()
-{
-    GetIEditor()->SetDocument(nullptr);
-
-    CLogFile::WriteLine("Document destroyed");
-
-    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
-}
-
-bool CCryEditDoc::IsModified() const
-{
-    return m_modified;
-}
-
-void CCryEditDoc::SetModifiedFlag(bool modified)
-{
-    m_modified = modified;
-}
-
-QString CCryEditDoc::GetLevelPathName() const
-{
-    return m_pathName;
-}
-
-void CCryEditDoc::SetPathName(const QString& pathName)
-{
-    if (IsSliceFile(pathName))
-    {
-        m_pathName = kLevelPathForSliceEditing;
-        m_slicePathName = pathName;
-    }
-    else
-    {
-        m_pathName = pathName;
-        m_slicePathName.clear();
-    }
-    SetTitle(pathName.isEmpty() ? tr("Untitled") : PathUtil::GetFileName(pathName.toUtf8().data()).c_str());
-}
-
-QString CCryEditDoc::GetSlicePathName() const
-{
-    return m_slicePathName;
-}
-
-CCryEditDoc::DocumentEditingMode CCryEditDoc::GetEditMode() const
-{
-    return m_slicePathName.isEmpty() ? CCryEditDoc::DocumentEditingMode::LevelEdit : CCryEditDoc::DocumentEditingMode::SliceEdit;
-}
-
-QString CCryEditDoc::GetActivePathName() const
-{
-    return DocumentEditingMode() == CCryEditDoc::DocumentEditingMode::SliceEdit ? GetSlicePathName() : GetLevelPathName();
-}
-
-QString CCryEditDoc::GetTitle() const
-{
-    return m_title;
-}
-
-void CCryEditDoc::SetTitle(const QString& title)
-{
-    m_title = title;
-}
-
-bool CCryEditDoc::IsBackupOrTempLevelSubdirectory(const QString& folderName)
-{
-    for (const char* backupOrTempFolderName : kBackupOrTempFolders)
-    {
-        if (!folderName.compare(backupOrTempFolderName, Qt::CaseInsensitive))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool CCryEditDoc::DoSave(const QString& pathName, bool replace)
-{
-    if (!OnSaveDocument(pathName.isEmpty() ? GetActivePathName() : pathName))
-    {
-        return false;
-    }
-
-    if (replace)
-    {
-        SetPathName(pathName);
-    }
-
-    return true;
-}
-
-bool CCryEditDoc::Save()
-{
-    return OnSaveDocument(GetActivePathName());
-}
-
-void CCryEditDoc::DeleteContents()
-{
-    m_hasErrors = false;
-    SetDocumentReady(false);
-
-    GetIEditor()->Notify(eNotify_OnCloseScene);
-    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorCloseScene);
-
-    EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, ResetEditorContext);
-
-    // [LY-90904] move this to the EditorVegetationManager component
-    InstanceStatObjEventBus::Broadcast(&InstanceStatObjEventBus::Events::ReleaseData);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Clear all undo info.
-    //////////////////////////////////////////////////////////////////////////
-    GetIEditor()->FlushUndo();
-
-    // Notify listeners.
-    for (std::list<IDocListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        (*it)->OnCloseDocument();
-    }
-
-    GetIEditor()->ResetViews();
-
-    // Delete all objects from Object Manager.
-    GetIEditor()->GetObjectManager()->DeleteAllObjects();
-
-    // Load scripts data
-    SetModifiedFlag(FALSE);
-    SetModifiedModules(eModifiedNothing);
-    // Clear error reports if open.
-    CErrorReportDialog::Clear();
-
-    // Unload level specific audio binary data.
-    Audio::SAudioManagerRequestData<Audio::eAMRT_UNLOAD_AFCM_DATA_BY_SCOPE> oAMData(Audio::eADS_LEVEL_SPECIFIC);
-    Audio::SAudioRequest oAudioRequestData;
-    oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING);
-    oAudioRequestData.pData = &oAMData;
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-    // Now unload level specific audio config data.
-    Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_CONTROLS_DATA> oAMData2(Audio::eADS_LEVEL_SPECIFIC);
-    oAudioRequestData.pData = &oAMData2;
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-    Audio::SAudioManagerRequestData<Audio::eAMRT_CLEAR_PRELOADS_DATA> oAMData3(Audio::eADS_LEVEL_SPECIFIC);
-    oAudioRequestData.pData = &oAMData3;
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-    GetIEditor()->Notify(eNotify_OnSceneClosed);
-    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorSceneClosed);
-}
-
-
-void CCryEditDoc::Save(CXmlArchive& xmlAr)
-{
-    TDocMultiArchive arrXmlAr;
-    FillXmlArArray(arrXmlAr, &xmlAr);
-    Save(arrXmlAr);
-}
-
-void CCryEditDoc::Save(TDocMultiArchive& arrXmlAr)
-{
-    bool isPrefabEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    if (!isPrefabEnabled)
-    {
-        CAutoDocNotReady autoDocNotReady;
-
-        if (arrXmlAr[DMAS_GENERAL] != NULL)
-        {
-            (*arrXmlAr[DMAS_GENERAL]).root = XmlHelpers::CreateXmlNode("Level");
-            (*arrXmlAr[DMAS_GENERAL]).root->setAttr("WaterColor", m_waterColor);
-
-            char version[50];
-            GetIEditor()->GetFileVersion().ToString(version, AZ_ARRAY_SIZE(version));
-            (*arrXmlAr[DMAS_GENERAL]).root->setAttr("SandboxVersion", version);
-
-            SerializeViewSettings((*arrXmlAr[DMAS_GENERAL]));
-
-            // Fog settings  ///////////////////////////////////////////////////////
-            SerializeFogSettings((*arrXmlAr[DMAS_GENERAL]));
-
-            SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
-        }
-    }
-    AfterSave();
-}
-
-
-void CCryEditDoc::Load(CXmlArchive& xmlAr, const QString& szFilename)
-{
-    TDocMultiArchive arrXmlAr;
-    FillXmlArArray(arrXmlAr, &xmlAr);
-    CCryEditDoc::Load(arrXmlAr, szFilename);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
-{
-    bool isPrefabEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    m_hasErrors = false;
-
-    // Register a unique load event
-    QString fileName = Path::GetFileName(szFilename);
-    QString levelHash;
-    if (!isPrefabEnabled)
-    {
-        levelHash = GetIEditor()->GetSettingsManager()->GenerateContentHash(arrXmlAr[DMAS_GENERAL]->root, fileName);
-    }
-    else
-    {
-        levelHash = szFilename;
-    }
-    SEventLog loadEvent("Level_" + Path::GetFileName(fileName), "", levelHash);
-
-    // Register this level and its content hash as version
-    GetIEditor()->GetSettingsManager()->AddToolVersion(fileName, levelHash);
-    GetIEditor()->GetSettingsManager()->RegisterEvent(loadEvent);
-    LOADING_TIME_PROFILE_SECTION(gEnv->pSystem);
-    CAutoDocNotReady autoDocNotReady;
-
-    HEAP_CHECK
-
-    CLogFile::FormatLine("Loading from %s...", szFilename.toUtf8().data());
-    QString szLevelPath = Path::GetPath(szFilename);
-
-    {
-        // Set game g_levelname variable to the name of current level.
-        QString szGameLevelName = Path::GetFileName(szFilename);
-        ICVar* sv_map = gEnv->pConsole->GetCVar("sv_map");
-        if (sv_map)
-        {
-            sv_map->Set(szGameLevelName.toUtf8().data());
-        }
-    }
-
-    // Starts recording the opening of files using the level category
-    if (auto archive = AZ::Interface<AZ::IO::IArchive>::Get(); archive && archive->GetRecordFileOpenList() == AZ::IO::IArchive::RFOM_EngineStartup)
-    {
-        archive->RecordFileOpen(AZ::IO::IArchive::RFOM_Level);
-    }
-
-    GetIEditor()->Notify(eNotify_OnBeginSceneOpen);
-    GetIEditor()->GetMovieSystem()->RemoveAllSequences();
-
-    {
-        // Start recording errors
-        const ICVar* pShowErrorDialogOnLoad = gEnv->pConsole->GetCVar("ed_showErrorDialogOnLoad");
-        CErrorsRecorder errorsRecorder(pShowErrorDialogOnLoad && (pShowErrorDialogOnLoad->GetIVal() != 0));
-
-        bool usePrefabSystemForLevels = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(
-            usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-        if (!usePrefabSystemForLevels)
-        {
-            AZStd::string levelPakPath;
-            if (AzFramework::StringFunc::Path::ConstructFull(szLevelPath.toUtf8().data(), "level", "pak", levelPakPath, true))
-            {
-                // Check whether level.pak is present
-                if (!gEnv->pFileIO->Exists(levelPakPath.c_str()))
-                {
-                    CryWarning(
-                        VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING,
-                        "level.pak is missing.  This will cause other errors.  To fix this, re-export the level.");
-                }
-            }
-        }
-
-        int t0 = GetTickCount();
-
-#ifdef PROFILE_LOADING_WITH_VTUNE
-        VTResume();
-#endif
-        // Parse level specific config data.
-        const char* controlsPath = nullptr;
-        Audio::AudioSystemRequestBus::BroadcastResult(controlsPath, &Audio::AudioSystemRequestBus::Events::GetControlsPath);
-        QString sAudioLevelPath(controlsPath);
-        sAudioLevelPath += "levels/";
-        string const sLevelNameOnly = PathUtil::GetFileName(fileName.toUtf8().data());
-        sAudioLevelPath += sLevelNameOnly;
-        QByteArray path = sAudioLevelPath.toUtf8();
-        Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_CONTROLS_DATA> oAMData(path, Audio::eADS_LEVEL_SPECIFIC);
-        Audio::SAudioRequest oAudioRequestData;
-        oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING); // Needs to be blocking so data is available for next preloading request!
-        oAudioRequestData.pData = &oAMData;
-        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-        Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_PRELOADS_DATA> oAMData2(path, Audio::eADS_LEVEL_SPECIFIC);
-        oAudioRequestData.pData = &oAMData2;
-        Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
-        Audio::TAudioPreloadRequestID nPreloadRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID;
-        Audio::AudioSystemRequestBus::BroadcastResult(nPreloadRequestID, &Audio::AudioSystemRequestBus::Events::GetAudioPreloadRequestID, sLevelNameOnly.c_str());
-        if (nPreloadRequestID != INVALID_AUDIO_PRELOAD_REQUEST_ID)
-        {
-            Audio::SAudioManagerRequestData<Audio::eAMRT_PRELOAD_SINGLE_REQUEST> oAMData3(nPreloadRequestID);
-            oAudioRequestData.pData = &oAMData3;
-            Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-        }
-
-        {
-            CAutoLogTime logtime("Game Engine level load");
-            GetIEditor()->GetGameEngine()->LoadLevel(true, true);
-        }
-
-        if (!isPrefabEnabled)
-        {
-            //////////////////////////////////////////////////////////////////////////
-            // Load water color.
-            //////////////////////////////////////////////////////////////////////////
-                (*arrXmlAr[DMAS_GENERAL]).root->getAttr("WaterColor", m_waterColor);
-
-            //////////////////////////////////////////////////////////////////////////
-            // Load View Settings
-            //////////////////////////////////////////////////////////////////////////
-            SerializeViewSettings((*arrXmlAr[DMAS_GENERAL]));
-
-            //////////////////////////////////////////////////////////////////////////
-            // Fog settings
-            //////////////////////////////////////////////////////////////////////////
-            SerializeFogSettings((*arrXmlAr[DMAS_GENERAL]));
-        }
-
-        if (!isPrefabEnabled)
-        {
-            // Serialize Shader Cache.
-            CAutoLogTime logtime("Load Level Shader Cache");
-        }
-
-        {
-            // support old version of sequences
-            IMovieSystem* pMs = GetIEditor()->GetMovieSystem();
-
-            if (pMs)
-            {
-                for (int k = 0; k < pMs->GetNumSequences(); ++k)
-                {
-                    IAnimSequence* seq = pMs->GetSequence(k);
-                    QString fullname = seq->GetName();
-                    CBaseObject* pObj = GetIEditor()->GetObjectManager()->FindObject(fullname);
-
-                    if (!pObj)
-                    {
-                        pObj = GetIEditor()->GetObjectManager()->NewObject("SequenceObject", 0, fullname);
-                    }
-                }
-            }
-        }
-
-        if (!isPrefabEnabled)
-        {
-            // Name Selection groups
-            SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
-        }
-
-        {
-            CAutoLogTime logtime("Post Load");
-
-            // Notify listeners.
-            for (std::list<IDocListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-            {
-                (*it)->OnLoadDocument();
-            }
-        }
-
-        CSurfaceTypeValidator().Validate();
-
-#ifdef PROFILE_LOADING_WITH_VTUNE
-        VTPause();
-#endif
-
-        LogLoadTime(GetTickCount() - t0);
-        // Loaded with success, remove event from log file
-        GetIEditor()->GetSettingsManager()->UnregisterEvent(loadEvent);
-    }
-
-    GetIEditor()->Notify(eNotify_OnEndSceneOpen);
-}
-
-void CCryEditDoc::AfterSave()
-{
-    // When saving level also save editor settings
-    // Save settings
-    gSettings.Save();
-    GetIEditor()->GetDisplaySettings()->SaveRegistry();
-    MainWindow::instance()->SaveConfig();
-}
-
-void CCryEditDoc::SerializeViewSettings(CXmlArchive& xmlAr)
-{
-    // Load or restore the viewer settings from an XML
-    if (xmlAr.bLoading)
-    {
-        bool useOldViewFormat = false;
-        // Loading
-        CLogFile::WriteLine("Loading View settings...");
-
-        int numberOfGameViewports = GetIEditor()->GetViewManager()->GetNumberOfGameViewports();
-
-        for (int i = 0; i < numberOfGameViewports; i++)
-        {
-            XmlNodeRef view;
-            Vec3 vp(0.0f, 0.0f, 256.0f);
-            Ang3 va(ZERO);
-
-            auto viewName = QString("View%1").arg(i);
-            view = xmlAr.root->findChild(viewName.toUtf8().constData());
-
-            if (!view)
-            {
-                view = xmlAr.root->findChild("View");
-                if (view)
-                {
-                    useOldViewFormat = true;
-                }
-            }
-
-            if (view)
-            {
-                auto viewerPosName = QString("ViewerPos%1").arg(useOldViewFormat ? "" : QString::number(i));
-                view->getAttr(viewerPosName.toUtf8().constData(), vp);
-                auto viewerAnglesName = QString("ViewerAngles%1").arg(useOldViewFormat ? "" : QString::number(i));
-                view->getAttr(viewerAnglesName.toUtf8().constData(), va);
-            }
-
-            Matrix34 tm = Matrix34::CreateRotationXYZ(va);
-            tm.SetTranslation(vp);
-
-            auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
-            if (auto viewportContext = viewportContextManager->GetViewportContextById(i))
-            {
-                viewportContext->SetCameraTransform(LYTransformToAZTransform(tm));
-            }
-        }
-    }
-    else
-    {
-        // Storing
-        CLogFile::WriteLine("Storing View settings...");
-
-        int numberOfGameViewports = GetIEditor()->GetViewManager()->GetNumberOfGameViewports();
-
-        for (int i = 0; i < numberOfGameViewports; i++)
-        {
-            auto viewName = QString("View%1").arg(i);
-            XmlNodeRef view = xmlAr.root->newChild(viewName.toUtf8().constData());
-
-            CViewport* pVP = GetIEditor()->GetViewManager()->GetView(i);
-
-            if (pVP)
-            {
-                Vec3 pos = pVP->GetViewTM().GetTranslation();
-                Ang3 angles = Ang3::GetAnglesXYZ(Matrix33(pVP->GetViewTM()));
-                auto viewerPosName = QString("ViewerPos%1").arg(i);
-                view->setAttr(viewerPosName.toUtf8().constData(), pos);
-                auto viewerAnglesName = QString("ViewerAngles%1").arg(i);
-                view->setAttr(viewerAnglesName.toUtf8().constData(), angles);
-            }
-        }
-    }
-}
-
-void CCryEditDoc::SerializeFogSettings(CXmlArchive& xmlAr)
-{
-    if (xmlAr.bLoading)
-    {
-        CLogFile::WriteLine("Loading Fog settings...");
-
-        XmlNodeRef fog = xmlAr.root->findChild("Fog");
-
-        if (!fog)
-        {
-            return;
-        }
-
-        if (m_fogTemplate)
-        {
-            CXmlTemplate::GetValues(m_fogTemplate, fog);
-        }
-    }
-    else
-    {
-        CLogFile::WriteLine("Storing Fog settings...");
-
-        XmlNodeRef fog = xmlAr.root->newChild("Fog");
-
-        if (m_fogTemplate)
-        {
-            CXmlTemplate::SetValues(m_fogTemplate, fog);
-        }
-    }
-}
-
-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)
-    {
-        m_modifiedModuleFlags &= ~eModifiedModule;
-    }
-    else
-    {
-        if (eModifiedModule == eModifiedNothing)
-        {
-            m_modifiedModuleFlags = eModifiedNothing;
-        }
-        else
-        {
-            m_modifiedModuleFlags |= eModifiedModule;
-        }
-    }
-}
-
-int CCryEditDoc::GetModifiedModule()
-{
-    return m_modifiedModuleFlags;
-}
-
-BOOL CCryEditDoc::CanCloseFrame()
-{
-    // Ask the base class to ask for saving, which also includes the save
-    // status of the plugins. Additionaly we query if all the plugins can exit
-    // now. A reason for a failure might be that one of the plugins isn't
-    // currently processing data or has other unsaved information which
-    // are not serialized in the project file
-    if (!SaveModified())
-    {
-        return FALSE;
-    }
-
-    if (!GetIEditor()->GetPluginManager()->CanAllPluginsExitNow())
-    {
-        return FALSE;
-    }
-
-    // If there is an export in process, exiting will corrupt it
-    if (CGameExporter::GetCurrentExporter() != nullptr)
-    {
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-bool CCryEditDoc::SaveModified()
-{
-    if (!IsModified())
-    {
-        return true;
-    }
-
-    auto button = QMessageBox::question(AzToolsFramework::GetActiveWindow(), QString(), tr("Save changes to %1?").arg(GetTitle()), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-    switch (button)
-    {
-    case QMessageBox::Cancel:
-        return false;
-    case QMessageBox::Yes:
-        return DoFileSave();
-    case QMessageBox::No:
-        SetModifiedFlag(false);
-        return true;
-    }
-    Q_UNREACHABLE();
-}
-
-void CCryEditDoc::OnFileSaveAs()
-{
-    CLevelFileDialog levelFileDialog(false);
-    levelFileDialog.show();
-    levelFileDialog.adjustSize();
-
-    if (levelFileDialog.exec() == QDialog::Accepted)
-    {
-        if (OnSaveDocument(levelFileDialog.GetFileName()))
-        {
-            CCryEditApp::instance()->AddToRecentFileList(levelFileDialog.GetFileName());
-        }
-    }
-}
-
-bool CCryEditDoc::OnOpenDocument(const QString& lpszPathName)
-{
-    TOpenDocContext context;
-    if (!BeforeOpenDocument(lpszPathName, context))
-    {
-        return FALSE;
-    }
-    return DoOpenDocument(context);
-}
-
-bool CCryEditDoc::BeforeOpenDocument(const QString& lpszPathName, TOpenDocContext& context)
-{
-    CTimeValue loading_start_time = gEnv->pTimer->GetAsyncTime();
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    if (!usePrefabSystemForLevels)
-    {
-        // ensure we close any open packs
-        if (!GetIEditor()->GetLevelFolder().isEmpty())
-        {
-            GetIEditor()->GetSystem()->GetIPak()->ClosePack((GetIEditor()->GetLevelFolder() + "\\level.pak").toUtf8().data());
-        }
-    }
-
-    // restore directory to root.
-    QDir::setCurrent(GetIEditor()->GetPrimaryCDFolder());
-
-    QString absolutePath = lpszPathName;
-    QFileInfo fileInfo(absolutePath);
-    QString friendlyDisplayName = Path::GetRelativePath(absolutePath, true);
-    CLogFile::FormatLine("Opening level %s", friendlyDisplayName.toUtf8().data());
-
-    // normalize the file path.
-    absolutePath = Path::ToUnixPath(QFileInfo(absolutePath).canonicalFilePath());
-    context.loading_start_time = loading_start_time;
-    if (IsSliceFile(absolutePath))
-    {
-        context.absoluteLevelPath = Path::GamePathToFullPath(kLevelPathForSliceEditing);
-        context.absoluteSlicePath = absolutePath;
-    }
-    else
-    {
-        context.absoluteLevelPath = absolutePath;
-        context.absoluteSlicePath = "";
-    }
-    return TRUE;
-}
-
-bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
-{
-    CTimeValue& loading_start_time = context.loading_start_time;
-
-    bool isPrefabEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    // normalize the path so that its the same in all following calls:
-    QString levelFilePath = QFileInfo(context.absoluteLevelPath).absoluteFilePath();
-    context.absoluteLevelPath = levelFilePath;
-
-    m_bLoadFailed = false;
-
-    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-
-    QString levelFolderAbsolutePath = QFileInfo(context.absoluteLevelPath).absolutePath();
-
-
-    if (!isPrefabEnabled)
-    {
-        // if the level pack exists, open that, too:
-        QString levelPackFileAbsolutePath = QDir(levelFolderAbsolutePath).absoluteFilePath("level.pak");
-
-        // we mount the pack (level.pak) using the folder its sitting in as the mountpoint (first parameter)
-        pIPak->OpenPack(levelFolderAbsolutePath.toUtf8().constData(), levelPackFileAbsolutePath.toUtf8().constData());
-    }
-
-    TDocMultiArchive arrXmlAr = {};
-
-    if (!isPrefabEnabled)
-    {
-        if (!LoadXmlArchiveArray(arrXmlAr, levelFilePath, levelFolderAbsolutePath))
-        {
-            m_bLoadFailed = true;
-            return FALSE;
-        }
-    }
-    if (!LoadLevel(arrXmlAr, context.absoluteLevelPath))
-    {
-        m_bLoadFailed = true;
-    }
-
-    ReleaseXmlArchiveArray(arrXmlAr);
-
-    if (m_bLoadFailed)
-    {
-        return FALSE;
-    }
-
-    // Load AZ entities for the editor.
-    if (context.absoluteSlicePath.isEmpty())
-    {
-        if (!LoadEntitiesFromLevel(context.absoluteLevelPath))
-        {
-            m_bLoadFailed = true;
-        }
-    }
-    else
-    {
-        if (!LoadEntitiesFromSlice(context.absoluteSlicePath))
-        {
-            m_bLoadFailed = true;
-        }
-    }
-
-    if (m_bLoadFailed)
-    {
-        return FALSE;
-    }
-
-    StartStreamingLoad();
-
-    CTimeValue loading_end_time = gEnv->pTimer->GetAsyncTime();
-
-    CLogFile::FormatLine("-----------------------------------------------------------");
-    CLogFile::FormatLine("Successfully opened document %s", context.absoluteLevelPath.toUtf8().data());
-    CLogFile::FormatLine("Level loading time: %.2f seconds", (loading_end_time - loading_start_time).GetSeconds());
-    CLogFile::FormatLine("-----------------------------------------------------------");
-
-    // It assumes loaded levels have already been exported. Can be a big fat lie, though.
-    // The right way would require us to save to the level folder the export status of the
-    // level.
-    SetLevelExported(true);
-
-    return TRUE;
-}
-
-bool CCryEditDoc::OnNewDocument()
-{
-    DeleteContents();
-    m_pathName.clear();
-    m_slicePathName.clear();
-    SetModifiedFlag(false);
-    return true;
-}
-
-bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
-{
-    bool saveSuccess = false;
-    bool shouldSaveLevel = true;
-    if (gEnv->IsEditorSimulationMode())
-    {
-        // Don't allow saving in AI/Physics mode.
-        // Prompt the user to exit Simulation Mode (aka AI/Phyics mode) before saving.
-        QWidget* mainWindow = nullptr;
-        EBUS_EVENT_RESULT(mainWindow, AzToolsFramework::EditorRequests::Bus, GetMainWindow);
-
-        QMessageBox msgBox(mainWindow);
-        msgBox.setText(tr("You must exit AI/Physics mode before saving."));
-        msgBox.setInformativeText(tr("The level will not be saved."));
-        msgBox.setIcon(QMessageBox::Warning);
-        msgBox.exec();
-    }
-    else
-    {
-        if (m_hasErrors || m_bLoadFailed)
-        {
-            QWidget* mainWindow = nullptr;
-            AzToolsFramework::EditorRequests::Bus::BroadcastResult(
-                mainWindow,
-                &AzToolsFramework::EditorRequests::Bus::Events::GetMainWindow);
-
-            // Prompt the user that saving may result in data loss. Most of the time this is not desired
-            // (which is why 'cancel' is the default interaction), but this does provide users a way to still
-            // save their level if this is the only way they can solve the erroneous data.
-            QMessageBox msgBox(mainWindow);
-            msgBox.setText(tr("Your level loaded with errors, you may lose work if you save."));
-            msgBox.setInformativeText(tr("Do you want to save your changes?"));
-            msgBox.setIcon(QMessageBox::Warning);
-            msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Cancel);
-            msgBox.setDefaultButton(QMessageBox::Cancel);
-            int result = msgBox.exec();
-            switch (result)
-            {
-            case QMessageBox::Save:
-                // The user wishes to save, so don't bail.
-                break;
-            case QMessageBox::Cancel:
-                // The user is canceling the save operation, so stop any saving from occuring.
-                shouldSaveLevel = false;
-                break;
-            }
-        }
-
-        TSaveDocContext context;
-        if (shouldSaveLevel &&
-            BeforeSaveDocument(lpszPathName, context))
-        {
-            DoSaveDocument(lpszPathName, context);
-            saveSuccess = AfterSaveDocument(lpszPathName, context);
-        }
-    }
-
-    return saveSuccess;
-}
-
-bool CCryEditDoc::BeforeSaveDocument(const QString& lpszPathName, TSaveDocContext& context)
-{
-    // Don't save level data if any conflict exists
-    if (HasLayerNameConflicts())
-    {
-        return false;
-    }
-
-    // Restore directory to root.
-    QDir::setCurrent(GetIEditor()->GetPrimaryCDFolder());
-
-    // If we do not have a level loaded, we will also have an empty path, and that will
-    // cause problems later in the save process.  Early out here if that's the case
-    QString levelFriendlyName = QFileInfo(lpszPathName).fileName();
-    if (levelFriendlyName.isEmpty())
-    {
-        return false;
-    }
-
-    CryLog("Saving to %s...", levelFriendlyName.toUtf8().data());
-    GetIEditor()->Notify(eNotify_OnBeginSceneSave);
-
-    bool bSaved(true);
-
-    context.bSaved = bSaved;
-    return TRUE;
-}
-
-bool CCryEditDoc::HasLayerNameConflicts()
-{
-    AZStd::vector<AZ::Entity*> editorEntities;
-    AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
-        &AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
-        editorEntities);
-
-    AZStd::unordered_map<AZStd::string, int> nameConflictMapping;
-    for (AZ::Entity* entity : editorEntities)
-    {
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-            entity->GetId(),
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::UpdateLayerNameConflictMapping,
-            nameConflictMapping);
-    }
-
-    if (!nameConflictMapping.empty())
-    {
-        AzToolsFramework::Layers::NameConflictWarning* nameConflictWarning = new AzToolsFramework::Layers::NameConflictWarning(
-            MainWindow::instance(),
-            nameConflictMapping);
-        nameConflictWarning->exec();
-
-        return true;
-    }
-
-    return false;
-}
-
-bool CCryEditDoc::DoSaveDocument(const QString& filename, TSaveDocContext& context)
-{
-    bool& bSaved = context.bSaved;
-    if (bSaved)
-    {
-        // Paranoia - we shouldn't get this far into the save routine without a level loaded (empty levelPath)
-        // If nothing is loaded, we don't need to save anything
-        if (filename.isEmpty())
-        {
-            bSaved = false;
-        }
-        else
-        {
-            // Save Tag Point locations to file if auto save of tag points disabled
-            if (!gSettings.bAutoSaveTagPoints)
-            {
-                CCryEditApp::instance()->SaveTagLocations();
-            }
-
-            QString normalizedPath = Path::ToUnixPath(filename);
-            if (IsSliceFile(normalizedPath))
-            {
-                bSaved = SaveSlice(normalizedPath);
-            }
-            else
-            {
-                bSaved = SaveLevel(normalizedPath);
-            }
-
-            // Changes filename for this document.
-            SetPathName(normalizedPath);
-        }
-    }
-
-    return bSaved;
-}
-
-bool CCryEditDoc::AfterSaveDocument([[maybe_unused]] const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt)
-{
-    bool& bSaved = context.bSaved;
-
-    GetIEditor()->Notify(eNotify_OnEndSceneSave);
-
-    if (!bSaved)
-    {
-        if (bShowPrompt)
-        {
-            QMessageBox::warning(QApplication::activeWindow(), QString(), QObject::tr("Save Failed"), QMessageBox::Ok);
-        }
-        CLogFile::WriteLine("$4Document saving has failed.");
-    }
-    else
-    {
-        CLogFile::WriteLine("$3Document successfully saved");
-        SetModifiedFlag(FALSE);
-        SetModifiedModules(eModifiedNothing);
-        MainWindow::instance()->ResetAutoSaveTimers();
-    }
-
-    return bSaved;
-}
-
-
-static void GetUserSettingsFile(const QString& levelFolder, QString& userSettings)
-{
-    const char* pUserName = GetISystem()->GetUserName();
-    QString fileName;
-    fileName = QStringLiteral("%1_usersettings.editor_xml").arg(pUserName);
-    userSettings = Path::Make(levelFolder, fileName);
-}
-
-static bool TryRenameFile(const QString& oldPath, const QString& newPath, int retryAttempts=10)
-{
-    QFile(newPath).setPermissions(QFile::ReadOther | QFile::WriteOther);
-    QFile::remove(newPath);
-
-    // try a few times, something can lock the file (such as virus scanner, etc).
-    for (int attempts = 0; attempts < retryAttempts; ++attempts)
-    {
-        if (QFile::rename(oldPath, newPath))
-        {
-            return true;
-        }
-
-        AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(100));
-    }
-
-    return false;
-}
-
-bool CCryEditDoc::SaveLevel(const QString& filename)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    QWaitCursor wait;
-
-    CAutoCheckOutDialogEnableForAll enableForAll;
-
-    QString fullPathName = Path::ToUnixPath(filename);
-    QString originaLevelFilename = Path::GetFile(m_pathName);
-    if (QFileInfo(filename).isRelative())
-    {
-        // Resolving the path through resolvepath would normalize and lowcase it, and in this case, we don't want that.
-        fullPathName = Path::ToUnixPath(QDir(QString::fromUtf8(gEnv->pFileIO->GetAlias("@devassets@"))).absoluteFilePath(fullPathName));
-    }
-
-    if (!CFileUtil::OverwriteFile(fullPathName))
-    {
-        return false;
-    }
-
-    {
-
-        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel BackupBeforeSave");
-        BackupBeforeSave();
-    }
-
-    // need to copy existing level data before saving to different folder
-    const QString oldLevelFolder = Path::GetPath(GetLevelPathName()); // get just the folder name
-    QString newLevelFolder = Path::GetPath(fullPathName);
-
-    CFileUtil::CreateDirectory(newLevelFolder.toUtf8().data());
-    GetIEditor()->GetGameEngine()->SetLevelPath(newLevelFolder);
-
-    // QFileInfo operator== takes care of many side cases and will return true
-    // if the folder is the same folder, even if other things (like slashes, etc) are wrong
-    if (QFileInfo(oldLevelFolder) != QFileInfo(newLevelFolder))
-    {
-        // if we're saving to a new folder, we need to copy the old folder tree.
-        auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-        pIPak->Lock();
-
-        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);
-        if (findHandle)
-        {
-            do
-            {
-                const QString sourceName{ QString::fromUtf8(findHandle.m_filename.data(), aznumeric_cast<int>(findHandle.m_filename.size())) };
-                if ((findHandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-                {
-                    // we only end up here if sourceName is a folder name.
-                    bool skipDir = sourceName == "." || sourceName == "..";
-                    skipDir |= IsBackupOrTempLevelSubdirectory(sourceName);
-                    skipDir |= sourceName == "Layers"; // layers folder will be created and written out as part of saving
-                    if (!skipDir)
-                    {
-                        QString oldFolderName = QDir(oldLevelFolder).absoluteFilePath(sourceName);
-                        QString newFolderName = QDir(newLevelFolder).absoluteFilePath(sourceName);
-
-                        CFileUtil::CreateDirectory(newFolderName.toUtf8().data());
-                        CFileUtil::CopyTree(oldFolderName, newFolderName);
-                    }
-                    continue;
-                }
-
-                bool skipFile = sourceName.endsWith(".cry", Qt::CaseInsensitive) ||
-                                sourceName.endsWith(".ly", Qt::CaseInsensitive) ||
-                                sourceName == originaLevelFilename; // level file will be written out by saving, ignore the source one
-                if (skipFile)
-                {
-                    continue;
-                }
-
-                // close any paks in the source folder so that when the paks are re-opened there is
-                // no stale cached metadata in the pak system
-                if (sourceName.endsWith(".pak", Qt::CaseInsensitive))
-                {
-                    QString oldPackName = QDir(oldLevelFolder).absoluteFilePath(sourceName);
-                    pIPak->ClosePack(oldPackName.toUtf8().constData());
-                }
-
-                QString destName = sourceName;
-                // copy oldLevel.xml -> newLevel.xml
-                if (sourceName.compare(oldLevelXml, Qt::CaseInsensitive) == 0)
-                {
-                    destName = Path::ReplaceExtension(Path::GetFile(fullPathName), "xml");
-                }
-
-                QString oldFilePath = QDir(oldLevelFolder).absoluteFilePath(sourceName);
-                QString newFilePath = QDir(newLevelFolder).absoluteFilePath(sourceName);
-                CFileUtil::CopyFile(oldFilePath, newFilePath);
-            } while (findHandle = pIPak->FindNext(findHandle));
-            pIPak->FindClose(findHandle);
-        }
-
-        // ensure that copied files are not read-only
-        CFileUtil::ForEach(newLevelFolder, [](const QString& filePath)
-        {
-            QFile(filePath).setPermissions(QFile::ReadOther | QFile::WriteOther);
-        });
-
-        pIPak->Unlock();
-    }
-
-    // Save level to XML archive.
-    CXmlArchive xmlAr;
-    Save(xmlAr);
-
-    // temp files (to be ignored by AssetProcessor take the form $tmp[0-9]*_...).  we will conform
-    // to that to make this file invisible to AP until it has been written completely.
-    QString tempSaveFile = QDir(newLevelFolder).absoluteFilePath("$tmp_levelSave.tmp");
-    QFile(tempSaveFile).setPermissions(QFile::ReadOther | QFile::WriteOther);
-    QFile::remove(tempSaveFile);
-
-    // Save AZ entities to the editor level.
-
-    bool contentsAllSaved = false; // abort level save if anything within it fails
-
-    auto tempFilenameStrData = tempSaveFile.toStdString();
-    auto filenameStrData = fullPathName.toStdString();
-
-    bool isPrefabEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    if (!isPrefabEnabled)
-    {
-        AZStd::vector<char> entitySaveBuffer;
-        bool savedEntities = false;
-        CPakFile pakFile;
-
-        {
-            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Open PakFile");
-            if (!pakFile.Open(tempSaveFile.toUtf8().data(), false))
-            {
-                gEnv->pLog->LogWarning("Unable to open pack file %s for writing", tempSaveFile.toUtf8().data());
-                return false;
-            }
-        }
-
-
-        AZStd::vector<AZ::Entity*> editorEntities;
-        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
-            &AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
-            editorEntities);
-
-        AZStd::vector<AZ::Entity*> layerEntities;
-        AZ::SliceComponent::SliceReferenceToInstancePtrs instancesInLayers;
-        for (AZ::Entity* entity : editorEntities)
-        {
-            AzToolsFramework::Layers::LayerResult layerSaveResult(AzToolsFramework::Layers::LayerResult::CreateSuccess());
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-                layerSaveResult,
-                entity->GetId(),
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::WriteLayerAndGetEntities,
-                newLevelFolder,
-                layerEntities,
-                instancesInLayers);
-            layerSaveResult.MessageResult();
-        }
-
-        AZ::IO::ByteContainerStream<AZStd::vector<char>> entitySaveStream(&entitySaveBuffer);
-        {
-            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Save Entities To Stream");
-            EBUS_EVENT_RESULT(
-                savedEntities, AzToolsFramework::EditorEntityContextRequestBus, SaveToStreamForEditor, entitySaveStream, layerEntities,
-                instancesInLayers);
-        }
-
-        for (AZ::Entity* entity : editorEntities)
-        {
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-                entity->GetId(), &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::RestoreEditorData);
-        }
-
-        if (savedEntities)
-        {
-            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Updated PakFile levelEntities.editor_xml");
-            pakFile.UpdateFile("LevelEntities.editor_xml", entitySaveBuffer.begin(), entitySaveBuffer.size());
-
-            // Save XML archive to pak file.
-            bool bSaved = xmlAr.SaveToPak(Path::GetPath(tempSaveFile), pakFile);
-            if (bSaved)
-            {
-                contentsAllSaved = true;
-            }
-            else
-            {
-                gEnv->pLog->LogWarning("Unable to write the level data to file %s", tempSaveFile.toUtf8().data());
-            }
-        }
-        else
-        {
-            gEnv->pLog->LogWarning("Unable to generate entity data for level save %s", tempSaveFile.toUtf8().data());
-        }
-
-        pakFile.Close();
-    }
-    else
-    {
-        auto prefabEditorEntityOwnershipInterface = AZ::Interface<AzToolsFramework::PrefabEditorEntityOwnershipInterface>::Get();
-        if (prefabEditorEntityOwnershipInterface)
-        {
-            AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-            AZ_Assert(fileIO, "No File IO implementation available");
-
-            AZ::IO::HandleType tempSaveFileHandle;
-            AZ::IO::Result openResult = fileIO->Open(tempFilenameStrData.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeBinary, tempSaveFileHandle);
-            contentsAllSaved = openResult;
-            if (openResult)
-            {
-                AZ::IO::FileIOStream stream(tempSaveFileHandle, AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeBinary, false);
-                contentsAllSaved = prefabEditorEntityOwnershipInterface->SaveToStream(stream, AZStd::string_view(filenameStrData.data(), filenameStrData.size()));
-                stream.Close();
-            }
-        }
-    }
-
-    if (!contentsAllSaved)
-    {
-        AZ_Error("Editor", false, "Error when writing level '%s' into tmpfile '%s'", filenameStrData.c_str(), tempFilenameStrData.c_str());
-        QFile::remove(tempSaveFile);
-        return false;
-    }
-
-    if (!TryRenameFile(tempSaveFile, fullPathName))
-    {
-        gEnv->pLog->LogWarning("Unable to move file %s to %s when saving", tempSaveFile.toUtf8().data(), fullPathName.toUtf8().data());
-        return false;
-    }
-
-    // Commit changes to the disk.
-    _flushall();
-
-    AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(&AzToolsFramework::ToolsApplicationEvents::OnSaveLevel);
-
-    return true;
-}
-
-bool CCryEditDoc::SaveSlice(const QString& filename)
-{
-    using namespace AzToolsFramework::SliceUtilities;
-
-    // Gather entities from live slice in memory
-    AZ::SliceComponent* liveSlice = nullptr;
-    AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(liveSlice,
-        &AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::GetEditorRootSlice);
-    if (!liveSlice)
-    {
-        gEnv->pLog->LogWarning("Slice data not found.");
-        return false;
-    }
-
-    AZStd::unordered_set<AZ::EntityId> liveEntityIds;
-    if (!liveSlice->GetEntityIds(liveEntityIds))
-    {
-        gEnv->pLog->LogWarning("Error getting entities from slice.");
-        return false;
-    }
-
-
-    // Prevent save when there are multiple root entities.
-    bool foundRootEntity = false;
-    for (AZ::EntityId entityId : liveEntityIds)
-    {
-        AZ::EntityId parentId;
-        AZ::TransformBus::EventResult(parentId, entityId, &AZ::TransformBus::Events::GetParentId);
-        if (!parentId.IsValid())
-        {
-            if (foundRootEntity)
-            {
-                gEnv->pLog->LogWarning("Cannot save a slice with multiple root entities.");
-                return false;
-            }
-
-            foundRootEntity = true;
-        }
-    }
-
-    // Find target slice asset, and check if it's the same asset we opened
-    AZ::Data::AssetId targetAssetId;
-    AZ::Data::AssetCatalogRequestBus::BroadcastResult(targetAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, filename.toUtf8().data(), azrtti_typeid<AZ::SliceAsset>(), false);
-
-    QString openedFilepath = Path::ToUnixPath(Path::GetRelativePath(m_slicePathName, true));
-    AZ::Data::AssetId openedAssetId;
-    AZ::Data::AssetCatalogRequestBus::BroadcastResult(openedAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, openedFilepath.toUtf8().data(), azrtti_typeid<AZ::SliceAsset>(), false);
-
-    if (!targetAssetId.IsValid() || openedAssetId != targetAssetId)
-    {
-        gEnv->pLog->LogWarning("Slice editor can only modify existing slices. 'New Slice' and 'Save As' are not currently supported.");
-        return false;
-    }
-
-    AZ::Data::Asset<AZ::SliceAsset> sliceAssetRef = AZ::Data::AssetManager::Instance().GetAsset<AZ::SliceAsset>(targetAssetId, AZ::Data::AssetLoadBehavior::Default);
-
-    sliceAssetRef.BlockUntilLoadComplete();
-
-    if (!sliceAssetRef)
-    {
-        gEnv->pLog->LogWarning("Error loading slice: %s", filename.toUtf8().data());
-        return false;
-    }
-
-    // Get entities from target slice asset.
-    AZ::SliceComponent* assetSlice = sliceAssetRef.Get()->GetComponent();
-    if (!assetSlice)
-    {
-        gEnv->pLog->LogWarning("Error reading slice: %s", filename.toUtf8().data());
-        return false;
-    }
-
-    AZStd::unordered_set<AZ::EntityId> assetEntityIds;
-    if (!assetSlice->GetEntityIds(assetEntityIds))
-    {
-        gEnv->pLog->LogWarning("Error getting entities from slice: %s", filename.toUtf8().data());
-        return false;
-    }
-
-    AZStd::unordered_set<AZ::EntityId> entityAdds;
-    AZStd::unordered_set<AZ::EntityId> entityUpdates;
-    AZStd::unordered_set<AZ::EntityId> entityRemovals = assetEntityIds;
-
-    for (AZ::EntityId liveEntityId : liveEntityIds)
-    {
-        entityRemovals.erase(liveEntityId);
-        if (assetEntityIds.find(liveEntityId) != assetEntityIds.end())
-        {
-            entityUpdates.insert(liveEntityId);
-        }
-        else
-        {
-            entityAdds.insert(liveEntityId);
-        }
-    }
-
-    // Make a transaction targeting the specified slice
-    SliceTransaction::TransactionPtr transaction = SliceTransaction::BeginSlicePush(sliceAssetRef);
-    if (!transaction)
-    {
-        gEnv->pLog->LogWarning("Unable to update slice: %s", filename.toUtf8().data());
-        return false;
-    }
-
-    // Tell the transaction about all adds/updates/removals
-    for (AZ::EntityId id : entityAdds)
-    {
-        SliceTransaction::Result result = transaction->AddEntity(id);
-        if (!result)
-        {
-            gEnv->pLog->LogWarning("Error adding entity with ID %s to slice: %s\n\n%s",
-                id.ToString().c_str(), filename.toUtf8().data(), result.GetError().c_str());
-            return false;
-        }
-    }
-
-    for (AZ::EntityId id : entityRemovals)
-    {
-        SliceTransaction::Result result = transaction->RemoveEntity(id);
-        if (!result)
-        {
-            gEnv->pLog->LogWarning("Error removing entity with ID %s from slice: %s\n\n%s",
-                id.ToString().c_str(), filename.toUtf8().data(), result.GetError().c_str());
-            return false;
-        }
-    }
-
-    for (AZ::EntityId id : entityUpdates)
-    {
-        SliceTransaction::Result result = transaction->UpdateEntity(id);
-        if (!result)
-        {
-            gEnv->pLog->LogWarning("Error updating entity with ID %s in slice: %s\n\n%s",
-                id.ToString().c_str(), filename.toUtf8().data(), result.GetError().c_str());
-            return false;
-        }
-    }
-
-    // Commit
-    SliceTransaction::Result commitResult = transaction->Commit(
-        targetAssetId,
-        SlicePreSaveCallbackForWorldEntities,
-        nullptr,
-        SliceTransaction::SliceCommitFlags::DisableUndoCapture);
-
-    if (!commitResult)
-    {
-        gEnv->pLog->LogWarning("Failed to to save slice \"%s\".\n\nError:\n%s",
-            filename.toUtf8().data(), commitResult.GetError().c_str());
-        return false;
-    }
-
-    return true;
-}
-
-bool CCryEditDoc::LoadEntitiesFromLevel(const QString& levelPakFile)
-{
-    bool isPrefabEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    bool loadedSuccessfully = false;
-
-    if (!isPrefabEnabled)
-    {
-        auto pakSystem = GetIEditor()->GetSystem()->GetIPak();
-        bool pakOpened = pakSystem->OpenPack(levelPakFile.toUtf8().data());
-        if (pakOpened)
-        {
-            const QString entityFilename = Path::GetPath(levelPakFile) + "LevelEntities.editor_xml";
-
-            CCryFile entitiesFile;
-            if (entitiesFile.Open(entityFilename.toUtf8().data(), "rt"))
-            {
-                AZStd::vector<char> fileBuffer;
-                fileBuffer.resize(entitiesFile.GetLength());
-                if (fileBuffer.size() > 0)
-                {
-                    if (fileBuffer.size() == entitiesFile.ReadRaw(fileBuffer.begin(), fileBuffer.size()))
-                    {
-                        AZ::IO::ByteContainerStream<AZStd::vector<char>> fileStream(&fileBuffer);
-
-                        EBUS_EVENT_RESULT(
-                            loadedSuccessfully, AzToolsFramework::EditorEntityContextRequestBus, LoadFromStreamWithLayers, fileStream,
-                            levelPakFile);
-                    }
-                    else
-                    {
-                        AZ_Error(
-                            "Editor", false, "Failed to load level entities because the file \"%s\" could not be read.",
-                            entityFilename.toUtf8().data());
-                    }
-                }
-                else
-                {
-                    AZ_Error(
-                        "Editor", false, "Failed to load level entities because the file \"%s\" is empty.", entityFilename.toUtf8().data());
-                }
-
-                entitiesFile.Close();
-            }
-            else
-            {
-                AZ_Error(
-                    "Editor", false, "Failed to load level entities because the file \"%s\" was not found.",
-                    entityFilename.toUtf8().data());
-            }
-
-            pakSystem->ClosePack(levelPakFile.toUtf8().data());
-        }
-    }
-    else
-    {
-        AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-        AZ_Assert(fileIO, "No File IO implementation available");
-
-        AZ::IO::HandleType fileHandle;
-        AZ::IO::Result openResult = fileIO->Open(levelPakFile.toUtf8().data(), AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, fileHandle);
-        if (openResult)
-        {
-            AZ::IO::FileIOStream stream(fileHandle, AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, false);
-            AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
-                loadedSuccessfully, &AzToolsFramework::EditorEntityContextRequests::LoadFromStreamWithLayers, stream, levelPakFile);
-            stream.Close();
-        }
-    }
-
-    return loadedSuccessfully;
-}
-
-bool CCryEditDoc::LoadEntitiesFromSlice(const QString& sliceFile)
-{
-    bool sliceLoaded = false;
-    {
-        AZ::IO::FileIOStream sliceFileStream(sliceFile.toUtf8().data(), AZ::IO::OpenMode::ModeRead);
-        if (!sliceFileStream.IsOpen())
-        {
-            AZ_Error("Editor", false, "Failed to load entities because the file \"%s\" could not be read.", sliceFile.toUtf8().data());
-            return false;
-        }
-
-        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(sliceLoaded, &AzToolsFramework::EditorEntityContextRequestBus::Events::LoadFromStream, sliceFileStream);
-    }
-
-    if (!sliceLoaded)
-    {
-        AZ_Error("Editor", false, "Failed to load entities from slice file \"%s\"", sliceFile.toUtf8().data());
-        return false;
-    }
-
-    return true;
-}
-
-bool CCryEditDoc::LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteCryFilePath)
-{
-    bool isPrefabEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-
-    QString folderPath = QFileInfo(absoluteCryFilePath).absolutePath();
-
-    OnStartLevelResourceList();
-
-    // Load next level resource list.
-    if (!isPrefabEnabled)
-    {
-        pIPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Load(Path::Make(folderPath, "resourcelist.txt").toUtf8().data());
-    }
-
-    GetIEditor()->Notify(eNotify_OnBeginLoad);
-    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorBeginLoad);
-    //GetISystem()->GetISystemEventDispatcher()->OnSystemEvent( ESYSTEM_EVENT_LEVEL_LOAD_START,0,0 );
-    DeleteContents();
-
-    // Set level path directly *after* DeleteContents(), since that will unload the previous level and clear the level path.
-    GetIEditor()->GetGameEngine()->SetLevelPath(folderPath);
-
-    SetModifiedFlag(TRUE);  // dirty during de-serialize
-    SetModifiedModules(eModifiedAll);
-    Load(arrXmlAr, absoluteCryFilePath);
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
-    // We don't need next level resource list anymore.
-    if (!isPrefabEnabled)
-    {
-        pIPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Clear();
-    }
-    SetModifiedFlag(FALSE); // start off with unmodified
-    SetModifiedModules(eModifiedNothing);
-    SetDocumentReady(true);
-    GetIEditor()->Notify(eNotify_OnEndLoad);
-    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorEndLoad);
-
-    GetIEditor()->SetStatusText("Ready");
-
-    return true;
-}
-
-void CCryEditDoc::Hold(const QString& holdName)
-{
-    Hold(holdName, holdName);
-}
-
-void CCryEditDoc::Hold(const QString& holdName, const QString& relativeHoldPath)
-{
-    if (!IsDocumentReady() || GetEditMode() == CCryEditDoc::DocumentEditingMode::SliceEdit)
-    {
-        return;
-    }
-
-    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
-    char resolvedLevelPath[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(levelPath.toUtf8().data(), resolvedLevelPath, AZ_MAX_PATH_LEN);
-
-    QString holdPath = QString::fromUtf8(resolvedLevelPath) + "/" + relativeHoldPath + "/";
-    QString holdFilename = holdPath + holdName + GetIEditor()->GetGameEngine()->GetLevelExtension();
-
-    // never auto-backup while we're trying to hold.
-    bool oldBackup = gSettings.bBackupOnSave;
-    gSettings.bBackupOnSave = false;
-    SaveLevel(holdFilename);
-    gSettings.bBackupOnSave = oldBackup;
-
-    GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
-}
-
-void CCryEditDoc::Fetch(const QString& relativeHoldPath, bool bShowMessages, bool bDelHoldFolder)
-{
-    Fetch(relativeHoldPath, relativeHoldPath, bShowMessages, bDelHoldFolder ? FetchPolicy::DELETE_FOLDER : FetchPolicy::PRESERVE);
-}
-
-void CCryEditDoc::Fetch(const QString& holdName, const QString& relativeHoldPath, bool bShowMessages, FetchPolicy policy)
-{
-    if (!IsDocumentReady() || GetEditMode() == CCryEditDoc::DocumentEditingMode::SliceEdit)
-    {
-        return;
-    }
-
-    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
-    char resolvedLevelPath[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(levelPath.toUtf8().data(), resolvedLevelPath, AZ_MAX_PATH_LEN);
-
-    QString holdPath = QString::fromUtf8(resolvedLevelPath) + "/" + relativeHoldPath + "/";
-    QString holdFilename = holdPath + holdName + GetIEditor()->GetGameEngine()->GetLevelExtension();
-
-    {
-        QFile cFile(holdFilename);
-        // Open the file for writing, create it if needed
-        if (!cFile.open(QFile::ReadOnly))
-        {
-            if (bShowMessages)
-            {
-                QMessageBox::information(QApplication::activeWindow(), QString(), QObject::tr("You have to use 'Hold' before you can fetch!"));
-            }
-            return;
-        }
-    }
-
-    // Does the document contain unsaved data ?
-    if (bShowMessages && IsModified() &&
-        QMessageBox::question(QApplication::activeWindow(), QString(), QObject::tr("The document contains unsaved data, it will be lost if fetched.\r\nReally fetch old state?")) != QMessageBox::Yes)
-    {
-        return;
-    }
-
-    GetIEditor()->FlushUndo();
-
-    TDocMultiArchive arrXmlAr = {};
-    if (!LoadXmlArchiveArray(arrXmlAr, holdFilename, holdPath))
-    {
-        QMessageBox::critical(QApplication::activeWindow(), "Error", "The temporary 'Hold' level failed to load successfully.  Your level might be corrupted, you should restart the Editor.", QMessageBox::Ok);
-        AZ_Error("EditDoc", false, "Fetch failed to load the Xml Archive");
-        return;
-    }
-
-    // Load the state
-    LoadLevel(arrXmlAr, holdFilename);
-
-    // Load AZ entities for the editor.
-    LoadEntitiesFromLevel(holdFilename);
-
-    GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
-
-    GetIEditor()->FlushUndo();
-
-    switch (policy)
-    {
-    case FetchPolicy::DELETE_FOLDER:
-        CFileUtil::Deltree(holdPath.toUtf8().data(), true);
-        break;
-
-    case FetchPolicy::DELETE_LY_FILE:
-        CFileUtil::DeleteFile(holdFilename);
-        break;
-
-    default:
-        break;
-    }
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-namespace {
-    struct SFolderTime
-    {
-        QString folder;
-        time_t creationTime;
-    };
-
-    bool SortByCreationTime(SFolderTime& a, SFolderTime& b)
-    {
-        return a.creationTime < b.creationTime;
-    }
-
-    // This function, given a source folder to scan, returns all folders within that folder
-    // non-recursively.  They will be sorted by time, with most recent first, and oldest last.
-    void CollectAllFoldersByTime(const char* sourceFolder, std::vector<SFolderTime>& outputFolders)
-    {
-        QString folderMask(sourceFolder);
-        AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst((folderMask + "/*").toUtf8().data());
-        if (handle)
-        {
-            do
-            {
-                if (handle.m_filename.front() == '.')
-                {
-                    continue;
-                }
-
-                if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-                {
-                    SFolderTime ft;
-                    ft.folder = QString::fromUtf8(handle.m_filename.data(), aznumeric_cast<int>(handle.m_filename.size()));
-                    ft.creationTime = handle.m_fileDesc.tCreate;
-                    outputFolders.push_back(ft);
-                }
-            } while (handle = gEnv->pCryPak->FindNext(handle));
-
-            gEnv->pCryPak->FindClose(handle);
-        }
-        std::sort(outputFolders.begin(), outputFolders.end(), SortByCreationTime);
-    }
-}
-
-bool CCryEditDoc::BackupBeforeSave(bool force)
-{
-    // This function will copy the contents of an entire level folder to a backup folder
-    // and delete older ones based on user preferences.
-    if (!force && !gSettings.bBackupOnSave)
-    {
-        return true; // not an error
-    }
-
-    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
-    if (levelPath.isEmpty())
-    {
-        return false;
-    }
-
-    char resolvedLevelPath[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(levelPath.toUtf8().data(), resolvedLevelPath, AZ_MAX_PATH_LEN);
-    QWaitCursor wait;
-
-    QString saveBackupPath = QString::fromUtf8(resolvedLevelPath) + "/" + kSaveBackupFolder;
-
-    std::vector<SFolderTime> folders;
-    CollectAllFoldersByTime(saveBackupPath.toUtf8().data(), folders);
-
-    for (int i = int(folders.size()) - gSettings.backupOnSaveMaxCount; i >= 0; --i)
-    {
-        CFileUtil::Deltree(QStringLiteral("%1/%2/").arg(saveBackupPath, folders[i].folder).toUtf8().data(), true);
-    }
-
-    QDateTime theTime = QDateTime::currentDateTime();
-    QString subFolder = theTime.toString("yyyy-MM-dd [HH.mm.ss]");
-
-    QString levelName = GetIEditor()->GetGameEngine()->GetLevelName();
-    QString backupPath = saveBackupPath + "/" + subFolder + "/";
-    gEnv->pCryPak->MakeDir(backupPath.toUtf8().data());
-
-    QString sourcePath = QString::fromUtf8(resolvedLevelPath) + "/";
-
-    QString ignoredFiles;
-
-    for (const char* backupOrTempFolderName : kBackupOrTempFolders)
-    {
-        if (!ignoredFiles.isEmpty())
-        {
-            ignoredFiles += "|";
-        }
-        ignoredFiles += QString::fromUtf8(backupOrTempFolderName);
-    }
-
-    // copy that whole tree:
-    AZ_TracePrintf("Editor", "Saving level backup to '%s'...\n", backupPath.toUtf8().data());
-    if (IFileUtil::ETREECOPYOK != CFileUtil::CopyTree(sourcePath, backupPath, true, false, ignoredFiles.toUtf8().data()))
-    {
-        gEnv->pLog->LogWarning("Attempting to save backup to %s before saving, but could not write all files.", backupPath.toUtf8().data());
-        return false;
-    }
-    return true;
-}
-
-void CCryEditDoc::SaveAutoBackup(bool bForce)
-{
-    if (!bForce && (!gSettings.autoBackupEnabled || GetIEditor()->IsInGameMode()))
-    {
-        return;
-    }
-
-    QString levelPath = GetIEditor()->GetGameEngine()->GetLevelPath();
-    if (levelPath.isEmpty())
-    {
-        return;
-    }
-
-    static bool isInProgress = false;
-    if (isInProgress)
-    {
-        return;
-    }
-
-    isInProgress = true;
-
-    QWaitCursor wait;
-
-    QString autoBackupPath = levelPath + "/" + kAutoBackupFolder;
-
-    // collect all subfolders
-    std::vector<SFolderTime> folders;
-
-    CollectAllFoldersByTime(autoBackupPath.toUtf8().data(), folders);
-
-    for (int i = int(folders.size()) - gSettings.autoBackupMaxCount; i >= 0; --i)
-    {
-        CFileUtil::Deltree(QStringLiteral("%1/%2/").arg(autoBackupPath, folders[i].folder).toUtf8().data(), true);
-    }
-
-    // save new backup
-    QDateTime theTime = QDateTime::currentDateTime();
-    QString subFolder = theTime.toString(QStringLiteral("yyyy-MM-dd [HH.mm.ss]"));
-
-    QString levelName = GetIEditor()->GetGameEngine()->GetLevelName();
-    QString filename = autoBackupPath + "/" + subFolder + "/" + levelName + "/" + levelName + GetIEditor()->GetGameEngine()->GetLevelExtension();
-    SaveLevel(filename);
-    GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
-
-    isInProgress = false;
-}
-
-bool CCryEditDoc::IsLevelExported() const
-{
-    return m_boLevelExported;
-}
-
-void CCryEditDoc::SetLevelExported(bool boExported)
-{
-    m_boLevelExported = boExported;
-}
-
-void CCryEditDoc::RegisterListener(IDocListener* listener)
-{
-    if (listener == nullptr)
-    {
-        return;
-    }
-
-    if (std::find(m_listeners.begin(), m_listeners.end(), listener) == m_listeners.end())
-    {
-        m_listeners.push_back(listener);
-    }
-}
-
-void CCryEditDoc::UnregisterListener(IDocListener* listener)
-{
-    m_listeners.remove(listener);
-}
-
-void CCryEditDoc::LogLoadTime(int time)
-{
-    QString appFilePath = QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
-    QString exePath = Path::GetPath(appFilePath);
-    QString filename = Path::Make(exePath, "LevelLoadTime.log");
-    QString level = GetIEditor()->GetGameEngine()->GetLevelPath();
-
-    CLogFile::FormatLine("[LevelLoadTime] Level %s loaded in %d seconds", level.toUtf8().data(), time / 1000);
-#if defined(AZ_PLATFORM_WINDOWS)
-    SetFileAttributes(filename.toUtf8().data(), FILE_ATTRIBUTE_ARCHIVE);
-#endif
-
-    FILE* file = nullptr;
-    azfopen(&file, filename.toUtf8().data(), "at");
-
-    if (file)
-    {
-        char version[50];
-        GetIEditor()->GetFileVersion().ToShortString(version, AZ_ARRAY_SIZE(version));
-
-        QString text;
-
-        time = time / 1000;
-        text = QStringLiteral("\n[%1] Level %2 loaded in %3 seconds").arg(version, level).arg(time);
-        fwrite(text.toUtf8().data(), text.toUtf8().length(), 1, file);
-        fclose(file);
-    }
-}
-
-void CCryEditDoc::SetDocumentReady(bool bReady)
-{
-    m_bDocumentReady = bReady;
-}
-
-void CCryEditDoc::GetMemoryUsage(ICrySizer* pSizer)
-{
-    {
-        SIZER_COMPONENT_NAME(pSizer, "UndoManager(estimate)");
-        GetIEditor()->GetUndoManager()->GetMemoryUsage(pSizer);
-    }
-
-    pSizer->Add(*this);
-}
-
-void CCryEditDoc::RegisterConsoleVariables()
-{
-    doc_validate_surface_types = gEnv->pConsole->GetCVar("doc_validate_surface_types");
-
-    if (!doc_validate_surface_types)
-    {
-        doc_validate_surface_types = REGISTER_INT_CB("doc_validate_surface_types", 0, 0,
-            "Flag indicating whether icons are displayed on the animation graph.\n"
-            "Default is 1.\n",
-            OnValidateSurfaceTypesChanged);
-    }
-}
-
-void CCryEditDoc::OnValidateSurfaceTypesChanged(ICVar*)
-{
-    CErrorsRecorder errorsRecorder(GetIEditor());
-    CSurfaceTypeValidator().Validate();
-}
-
-void CCryEditDoc::OnStartLevelResourceList()
-{
-    // after loading another level we clear the RFOM_Level list, the first time the list should be empty
-    static bool bFirstTime = true;
-
-    if (bFirstTime)
-    {
-        const char* pResFilename = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level)->GetFirst();
-
-        while (pResFilename)
-        {
-            // This should be fixed because ExecuteCommandLine is executed right after engine init as we assume the
-            // engine already has all data loaded an is initialized to process commands. Loading data afterwards means
-            // some init was done later which can cause problems when running in the engine batch mode (executing console commands).
-            gEnv->pLog->LogError("'%s' was loaded after engine init but before level load/new (should be fixed)", pResFilename);
-            pResFilename = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level)->GetNext();
-        }
-
-        bFirstTime = false;
-    }
-
-    gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level)->Clear();
-}
-
-BOOL CCryEditDoc::DoFileSave()
-{
-    if (GetEditMode() == CCryEditDoc::DocumentEditingMode::LevelEdit)
-    {
-        // If the file to save is the temporary level it should 'save as' since temporary levels will get deleted
-        const char* temporaryLevelName = GetTemporaryLevelName();
-        if (QString::compare(GetIEditor()->GetLevelName(), temporaryLevelName) == 0)
-        {
-            QString filename;
-            if (CCryEditApp::instance()->GetDocManager()->DoPromptFileName(filename, ID_FILE_SAVE_AS, 0, false, nullptr)
-                && !filename.isEmpty() && !QFileInfo(filename).exists())
-            {
-                if (SaveLevel(filename))
-                {
-                    DeleteTemporaryLevel();
-                    QString newLevelPath = filename.left(filename.lastIndexOf('/') + 1);
-                    GetIEditor()->GetDocument()->SetPathName(filename);
-                    GetIEditor()->GetGameEngine()->SetLevelPath(newLevelPath);
-                    return TRUE;
-                }
-            }
-            return FALSE;
-        }
-    }
-    if (!IsDocumentReady())
-    {
-        return FALSE;
-    }
-
-    return Internal::SaveLevel();
-}
-
-const char* CCryEditDoc::GetTemporaryLevelName() const
-{
-    return gEnv->pConsole->GetCVar("g_TemporaryLevelName")->GetString();
-}
-
-void CCryEditDoc::DeleteTemporaryLevel()
-{
-    QString tempLevelPath = (Path::GetEditingGameDataFolder() + "/Levels/" + GetTemporaryLevelName()).c_str();
-    GetIEditor()->GetSystem()->GetIPak()->ClosePacks(tempLevelPath.toUtf8().data(), AZ::IO::IArchive::EPathResolutionRules::FLAGS_ADD_TRAILING_SLASH);
-    CFileUtil::Deltree(tempLevelPath.toUtf8().data(), true);
-}
-
-void CCryEditDoc::InitEmptyLevel(int /*resolution*/, int /*unitSize*/, bool /*bUseTerrain*/)
-{
-    GetIEditor()->SetStatusText("Initializing Level...");
-
-    OnStartLevelResourceList();
-
-    GetIEditor()->Notify(eNotify_OnBeginNewScene);
-    CLogFile::WriteLine("Preparing new document...");
-
-    //cleanup resources!
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_POST_UNLOAD, 0, 0);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Initialize defaults.
-    //////////////////////////////////////////////////////////////////////////
-    if (!GetIEditor()->IsInPreviewMode())
-    {
-        GetIEditor()->ReloadTemplates();
-        m_environmentTemplate = GetIEditor()->FindTemplate("Environment");
-
-        GetIEditor()->GetGameEngine()->SetLevelCreated(true);
-        GetIEditor()->GetGameEngine()->SetLevelCreated(false);
-    }
-
-    {
-        // Notify listeners.
-        std::list<IDocListener*> listeners = m_listeners;
-        std::list<IDocListener*>::iterator it, next;
-        for (it = listeners.begin(); it != listeners.end(); it = next)
-        {
-            next = it;
-            next++;
-            (*it)->OnNewDocument();
-        }
-    }
-
-    // Tell the system that the level has been created/loaded.
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
-
-    GetIEditor()->Notify(eNotify_OnEndNewScene);
-    SetModifiedFlag(FALSE);
-    SetLevelExported(false);
-    SetModifiedModules(eModifiedNothing);
-
-    GetIEditor()->SetStatusText("Ready");
-}
-
-void CCryEditDoc::CreateDefaultLevelAssets([[maybe_unused]] int resolution, [[maybe_unused]] int unitSize)
-{
-    AzToolsFramework::EditorLevelNotificationBus::Broadcast(&AzToolsFramework::EditorLevelNotificationBus::Events::OnNewLevelCreated);
-}
-
-void CCryEditDoc::OnEnvironmentPropertyChanged(IVariable* pVar)
-{
-    if (pVar == NULL)
-    {
-        return;
-    }
-
-    XmlNodeRef node = GetEnvironmentTemplate();
-    if (node == NULL)
-    {
-        return;
-    }
-
-    // QVariant will not convert a void * to int, so do it manually.
-    int nKey = reinterpret_cast<intptr_t>(pVar->GetUserData().value<void*>());
-
-    int nGroup = (nKey & 0xFFFF0000) >> 16;
-    int nChild = (nKey & 0x0000FFFF);
-
-    if (nGroup < 0 || nGroup >= node->getChildCount())
-    {
-        return;
-    }
-
-    XmlNodeRef groupNode = node->getChild(nGroup);
-
-    if (groupNode == NULL)
-    {
-        return;
-    }
-
-    if (nChild < 0 || nChild >= groupNode->getChildCount())
-    {
-        return;
-    }
-
-    XmlNodeRef childNode = groupNode->getChild(nChild);
-    if (childNode == NULL)
-    {
-        return;
-    }
-
-    if (pVar->GetDataType() == IVariable::DT_COLOR)
-    {
-        Vec3 value;
-        pVar->Get(value);
-        QString buff;
-        QColor gammaColor = ColorLinearToGamma(ColorF(value.x, value.y, value.z));
-        buff = QStringLiteral("%1,%2,%3").arg(gammaColor.red()).arg(gammaColor.green()).arg(gammaColor.blue());
-        childNode->setAttr("value", buff.toUtf8().data());
-    }
-    else
-    {
-        QString value;
-        pVar->Get(value);
-        childNode->setAttr("value", value.toUtf8().data());
-    }
-}
-
-QString CCryEditDoc::GetCryIndexPath(const LPCTSTR levelFilePath)
-{
-    QString levelPath = Path::GetPath(levelFilePath);
-    QString levelName = Path::GetFileName(levelFilePath);
-    return Path::AddPathSlash(levelPath + levelName + "_editor");
-}
-
-BOOL CCryEditDoc::LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString& absoluteLevelPath, const QString& levelPath)
-{
-    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-
-    //if (m_pSWDoc->IsNull())
-    {
-        CXmlArchive* pXmlAr = new CXmlArchive();
-        if (!pXmlAr)
-        {
-            return FALSE;
-        }
-
-        CXmlArchive& xmlAr = *pXmlAr;
-        xmlAr.bLoading = true;
-
-        // bound to the level folder, as if it were the assets folder.
-        // this mounts (whateverlevelname.ly) as @assets@/Levels/whateverlevelname/ and thus it works...
-        bool openLevelPakFileSuccess = pIPak->OpenPack(levelPath.toUtf8().data(), absoluteLevelPath.toUtf8().data());
-        if (!openLevelPakFileSuccess)
-        {
-            return FALSE;
-        }
-
-        CPakFile pakFile;
-        bool loadFromPakSuccess;
-        loadFromPakSuccess = xmlAr.LoadFromPak(levelPath, pakFile);
-        pIPak->ClosePack(absoluteLevelPath.toUtf8().data());
-        if (!loadFromPakSuccess)
-        {
-            return FALSE;
-        }
-
-        FillXmlArArray(arrXmlAr, &xmlAr);
-    }
-
-    return TRUE;
-}
-
-void CCryEditDoc::ReleaseXmlArchiveArray(TDocMultiArchive& arrXmlAr)
-{
-    SAFE_DELETE(arrXmlAr[0]);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// AzToolsFramework::EditorEntityContextNotificationBus interface implementation
-void CCryEditDoc::OnSliceInstantiated(const AZ::Data::AssetId& sliceAssetId, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/)
-{
-    if (m_envProbeSliceAssetId == sliceAssetId)
-    {
-        const AZ::SliceComponent::EntityList& entities = sliceAddress.GetInstance()->GetInstantiated()->m_entities;
-        const AZ::Uuid editorEnvProbeComponentId("{8DBD6035-583E-409F-AFD9-F36829A0655D}");
-        AzToolsFramework::EntityIdList entityIds;
-        entityIds.reserve(entities.size());
-        for (const AZ::Entity* entity : entities)
-        {
-            if (entity->FindComponent(editorEnvProbeComponentId))
-            {
-                // Update Probe Area size to cover the whole terrain
-                LmbrCentral::EditorLightComponentRequestBus::Event(entity->GetId(), &LmbrCentral::EditorLightComponentRequests::SetProbeAreaDimensions, AZ::Vector3(m_terrainSize, m_terrainSize, m_envProbeHeight));
-
-                // Force update the light to apply cubemap
-                LmbrCentral::EditorLightComponentRequestBus::Event(entity->GetId(), &LmbrCentral::EditorLightComponentRequests::RefreshLight);
-            }
-            entityIds.push_back(entity->GetId());
-        }
-
-        //Detach instantiated env probe entities from engine slice
-        AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
-            &AzToolsFramework::SliceEditorEntityOwnershipServiceRequests::DetachSliceEntities, entityIds);
-
-        sliceAddress.SetInstance(nullptr);
-        sliceAddress.SetReference(nullptr);
-        SetModifiedFlag(true);
-        SetModifiedModules(eModifiedEntities);
-
-        AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
-
-        //save after level default slice fully instantiated
-        Save();
-    }
-    GetIEditor()->ResumeUndo();
-}
-
-
-void CCryEditDoc::OnSliceInstantiationFailed(const AZ::Data::AssetId& sliceAssetId, const AzFramework::SliceInstantiationTicket& /*ticket*/)
-{
-    if (m_envProbeSliceAssetId == sliceAssetId)
-    {
-        AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
-        AZ_Warning("Editor", false, "Failed to instantiate default environment probe slice.");
-    }
-    GetIEditor()->ResumeUndo();
-}
-//////////////////////////////////////////////////////////////////////////
-
-namespace AzToolsFramework
-{
-    void CryEditDocFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.general' module
-            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
-            };
-            addLegacyGeneral(behaviorContext->Method("save_level", ::Internal::SaveLevel, nullptr, "Saves the current level."));
-        }
-    }
-}
-
-#include <moc_CryEditDoc.cpp>
diff --git a/Code/Sandbox/Editor/CryEditDoc.h b/Code/Sandbox/Editor/CryEditDoc.h
deleted file mode 100644
index fca0bea7ae..0000000000
--- a/Code/Sandbox/Editor/CryEditDoc.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_CRYEDITDOC_H
-#define CRYINCLUDE_EDITOR_CRYEDITDOC_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "DocMultiArchive.h"
-#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
-#include <AzCore/Component/Component.h>
-#include <TimeValue.h>
-#endif
-
-class CClouds;
-struct LightingSettings;
-struct IVariable;
-struct ICVar;
-
-// Filename of the temporary file used for the hold / fetch operation
-// conform to the "$tmp[0-9]_" naming convention
-#define HOLD_FETCH_FILE "$tmp_hold" 
-
-class CCryEditDoc
-    : public QObject
-    , protected AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
-{
-    Q_OBJECT
-    Q_PROPERTY(bool modified READ IsModified WRITE SetModifiedFlag);
-    Q_PROPERTY(QString pathName READ GetLevelPathName WRITE SetPathName);
-    Q_PROPERTY(QString title READ GetTitle WRITE SetTitle);
- 
-public: // Create from serialization only
-    enum DocumentEditingMode
-    {
-        LevelEdit,
-        SliceEdit
-    };
-
-    Q_INVOKABLE CCryEditDoc();
-
-    virtual ~CCryEditDoc();
-
-    bool IsModified() const;
-    void SetModifiedFlag(bool modified);
-    // Currently it's not possible to disable one single flag and eModifiedModule is ignored
-    // if bModified is false.
-    virtual void SetModifiedModules(EModifiedModule eModifiedModule, bool boSet = true);
-    int GetModifiedModule();
-
-    // Return level path.
-    // If a slice is being edited then the path to a placeholder level is returned.
-    QString GetLevelPathName() const;
-
-    // Set path of slice or level being edited.
-    void SetPathName(const QString& pathName);
-
-    // Return slice path, if slice is open, an empty string otherwise. Use GetEditMode() to determine if a slice is open.
-    QString GetSlicePathName() const;
-
-    // Return The current type of document being edited, a level or a slice
-    // While editing a slice, a placeholder level is opened since the editor requires an open level to function.
-    // While editing a slice, saving will only affect the slice and not the placeholder level.
-    DocumentEditingMode GetEditMode() const;
-
-    // Return slice path if editing slice, level path if editing level.
-    SANDBOX_API QString GetActivePathName() const;
-
-    QString GetTitle() const;
-    void SetTitle(const QString& title);
-
-    virtual bool OnNewDocument();
-    void InitEmptyLevel(int resolution = 0, int unitSize = 0, bool bUseTerrain = false);
-    void CreateDefaultLevelAssets(int resolution = 0, int unitSize = 0);
-
-    bool DoSave(const QString& pathName, bool replace);
-    SANDBOX_API bool Save();
-    virtual BOOL DoFileSave();
-    bool SaveModified();
-
-    virtual bool BackupBeforeSave(bool bForce = false);
-    void SaveAutoBackup(bool bForce = false);
-
-    // ClassWizard generated virtual function overrides
-    virtual bool OnOpenDocument(const QString& lpszPathName);
-
-    const bool IsLevelLoadFailed() const { return m_bLoadFailed; }
-
-    //! Marks this document as having errors.
-    void SetHasErrors() { m_hasErrors = true; }
-
-    bool IsDocumentReady() const { return m_bDocumentReady; }
-    void SetDocumentReady(bool bReady);
-
-    bool IsLevelExported() const;
-    void SetLevelExported(bool boExported = true);
-
-    BOOL CanCloseFrame();
-
-    enum class FetchPolicy
-    {
-        DELETE_FOLDER,
-        DELETE_LY_FILE,
-        PRESERVE
-    };
-
-    void Hold(const QString& holdName);
-    void Hold(const QString& holdName, const QString& relativeHoldPath);
-    void Fetch(const QString& relativeHoldPath, bool bShowMessages = true, bool bDelHoldFolder = false);
-    void Fetch(const QString& holdName, const QString& relativeHoldPath, bool bShowMessages, FetchPolicy policy);
-
-    const char* GetTemporaryLevelName() const;
-    void DeleteTemporaryLevel();
-
-    CClouds* GetClouds() { return m_pClouds; }
-    void SetWaterColor(const QColor& col) { m_waterColor = col; }
-    QColor GetWaterColor() { return m_waterColor; }
-    XmlNodeRef& GetFogTemplate() { return m_fogTemplate; }
-    XmlNodeRef& GetEnvironmentTemplate() { return m_environmentTemplate; }
-    void OnEnvironmentPropertyChanged(IVariable* pVar);
-
-    void RegisterListener(IDocListener* listener);
-    void UnregisterListener(IDocListener* listener);
-
-    void GetMemoryUsage(ICrySizer* pSizer);
-
-    static bool IsBackupOrTempLevelSubdirectory(const QString& folderName);
-protected:
-
-    virtual void DeleteContents();
-
-    struct TOpenDocContext
-    {
-        CTimeValue loading_start_time;
-        QString absoluteLevelPath;
-        QString absoluteSlicePath;
-    };
-    bool BeforeOpenDocument(const QString& lpszPathName, TOpenDocContext& context);
-    bool DoOpenDocument(TOpenDocContext& context);
-    virtual BOOL LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString& absoluteLevelPath, const QString& levelPath);
-    virtual void ReleaseXmlArchiveArray(TDocMultiArchive& arrXmlAr);
-
-    virtual void Load(TDocMultiArchive& arrXmlAr, const QString& szFilename);
-    virtual void StartStreamingLoad(){}
-
-    void Save(CXmlArchive& xmlAr);
-    void Load(CXmlArchive& xmlAr, const QString& szFilename);
-    void Save(TDocMultiArchive& arrXmlAr);
-    bool SaveLevel(const QString& filename);
-    bool SaveSlice(const QString& filename);
-    bool LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteCryFilePath);
-    bool LoadEntitiesFromLevel(const QString& levelPakFile);
-    bool LoadEntitiesFromSlice(const QString& sliceFile);
-    void SerializeFogSettings(CXmlArchive& xmlAr);
-    virtual void SerializeViewSettings(CXmlArchive& xmlAr);
-    void SerializeNameSelection(CXmlArchive& xmlAr);
-    void LogLoadTime(int time);
-
-    struct TSaveDocContext
-    {
-        bool bSaved;
-    };
-    bool BeforeSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
-    bool HasLayerNameConflicts();
-    bool DoSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
-    bool AfterSaveDocument(const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt = true);
-
-    virtual bool OnSaveDocument(const QString& lpszPathName);
-    virtual void OnFileSaveAs();
-    //! called immediately after saving the level.
-    void AfterSave();
-    void RegisterConsoleVariables();
-    void OnStartLevelResourceList();
-    static void OnValidateSurfaceTypesChanged(ICVar*);
-
-    QString GetCryIndexPath(const LPCTSTR levelFilePath);
-
-    //////////////////////////////////////////////////////////////////////////
-    // SliceEditorEntityOwnershipServiceNotificationBus::Handler
-    void OnSliceInstantiated(const AZ::Data::AssetId& sliceAssetId, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/) override;
-    void OnSliceInstantiationFailed(const AZ::Data::AssetId& sliceAssetId, const AzFramework::SliceInstantiationTicket& /*ticket*/) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    bool m_bLoadFailed;
-    QColor m_waterColor;
-    XmlNodeRef m_fogTemplate;
-    XmlNodeRef m_environmentTemplate;
-    CClouds* m_pClouds;
-    std::list<IDocListener*> m_listeners;
-    bool m_bDocumentReady;
-    ICVar* doc_validate_surface_types;
-    int m_modifiedModuleFlags;
-    bool m_boLevelExported;
-    bool m_modified;
-    QString m_pathName;
-    QString m_slicePathName;
-    QString m_title;
-    AZ::Data::AssetId m_envProbeSliceAssetId;
-    float m_terrainSize;
-    const char* m_envProbeSliceRelativePath;
-    const float m_envProbeHeight;
-    bool m_hasErrors = false; ///< This is used to warn the user that they may lose work when they go to save.
-};
-
-class CAutoDocNotReady
-{
-public:
-    CAutoDocNotReady()
-    {
-        m_prevState = GetIEditor()->GetDocument()->IsDocumentReady();
-        GetIEditor()->GetDocument()->SetDocumentReady(false);
-    }
-
-    ~CAutoDocNotReady()
-    {
-        GetIEditor()->GetDocument()->SetDocumentReady(m_prevState);
-    }
-
-private:
-    bool m_prevState;
-};
-
-namespace AzToolsFramework
-{
-    //! A component to reflect scriptable commands for the Editor
-    class CryEditDocFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(CryEditDocFuncsHandler, "{628CE458-72E7-4B7B-B8A2-62F95F55E738}")
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-} // namespace AzToolsFramework
-
-#endif // CRYINCLUDE_EDITOR_CRYEDITDOC_H
diff --git a/Code/Sandbox/Editor/CryEditPy.cpp b/Code/Sandbox/Editor/CryEditPy.cpp
deleted file mode 100644
index 476603f90d..0000000000
--- a/Code/Sandbox/Editor/CryEditPy.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "CryEdit.h"
-
-// Qt
-#include <QTimer>
-
-// AzCore
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/Console/IConsole.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
-#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
-
-// Editor
-#include "Core/QtEditorApplication.h"
-#include "CheckOutDialog.h"
-#include "GameEngine.h"
-#include "UndoConfigSpec.h"
-#include "ViewManager.h"
-#include "EditorViewportCamera.h"
-
-//////////////////////////////////////////////////////////////////////////
-namespace
-{
-    void PyRunFile(const AZ::ConsoleCommandContainer& args)
-    {
-        if (args.empty())
-        {
-            // We expect at least "pyRunFile" and the filename
-            AZ_Warning("editor", false, "The pyRunFile requires a file script name.");
-            return;
-        }
-        else if (args.size() == 1)
-        {
-            // If we only have "pyRunFile filename", there are no args to pass through.
-            AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(
-                &AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilename,
-                args.front().data());
-        }
-        else
-        {
-            // We have "pyRunFile filename x y z", so copy everything past filename into a new vector
-            AZStd::vector<AZStd::string_view> pythonArgs;
-            AZStd::transform(args.begin() + 1, args.end(), std::back_inserter(pythonArgs), [](auto&& value) { return value; });
-            AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(
-                &AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs,
-                args[0],
-                pythonArgs);
-        }
-    }
-    AZ_CONSOLEFREEFUNC("pyRunFile", PyRunFile, AZ::ConsoleFunctorFlags::Null, "Runs the Python script from the console.");
-
-    //! We have explicitly not exposed this CloseCurrentLevel API to Python Scripting since the Editor
-    //! doesn't officially support it (it doesn't exist in the File menu). It is used for cases
-    //! where a level with legacy entities are unable to be converted and so the level that has
-    //! been opened needs to be closed, but it hasn't been fully tested for a normal workflow.
-    void CloseCurrentLevel()
-    {
-        CCryEditDoc* currentLevel = GetIEditor()->GetDocument();
-        if (currentLevel && currentLevel->IsDocumentReady())
-        {
-            // This closes the current document (level)
-            currentLevel->OnNewDocument();
-
-            // Then we freeze the viewport's input
-            AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Broadcast(
-                &AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Events::FreezeViewportInput, true);
-
-            // Then we need to tell the game engine there is no level to render anymore
-            if (GetIEditor()->GetGameEngine())
-            {
-                GetIEditor()->GetGameEngine()->SetLevelPath("");
-                GetIEditor()->GetGameEngine()->SetLevelLoaded(false);
-
-                CViewManager* pViewManager = GetIEditor()->GetViewManager();
-                CViewport* pGameViewport = pViewManager ? pViewManager->GetGameViewport() : nullptr;
-                if (pGameViewport)
-                {
-                    pGameViewport->SetViewTM(Matrix34::CreateIdentity());
-                }
-            }
-        }
-    }
-
-    const char* PyGetGameFolder()
-    {
-        return Path::GetEditingGameDataFolder().c_str();
-    }
-
-    AZStd::string PyGetGameFolderAsString()
-    {
-        return Path::GetEditingGameDataFolder();
-    }
-
-    bool PyOpenLevel(const char* pLevelName)
-    {
-        const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
-        const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-
-        QString levelPath = pLevelName;
-
-        if (!QFile::exists(levelPath))
-        {
-            // if the input path can't be found, let's automatically add on the game folder and the levels
-            QString levelsDir = QString("%1/%2").arg(Path::GetEditingGameDataFolder().c_str()).arg("Levels");
-
-            // now let's check if they pre-pended directories (Samples/SomeLevelName)
-            QString levelFileName = levelPath;
-            QStringList splitLevelPath = levelPath.contains('/') ? levelPath.split('/') : levelPath.split('\\');
-            if (splitLevelPath.length() > 1)
-            {
-                // take the last one as the level directory name and the level file name in that directory
-                levelFileName = splitLevelPath.last();
-            }
-
-            levelPath = levelsDir / levelPath / levelFileName;
-
-            // make sure the level path includes the cry extension, if needed
-            if (!levelFileName.endsWith(oldExtension) && !levelFileName.endsWith(defaultExtension))
-            {
-                QString newLevelPath = levelPath + defaultExtension;
-                QString oldLevelPath = levelPath + oldExtension;
-
-                // Check if there is a .cry file, otherwise assume it is a new .ly file
-                if (QFileInfo(oldLevelPath).exists())
-                {
-                    levelPath = oldLevelPath;
-                }
-                else
-                {
-                    levelPath = newLevelPath;
-                }
-            }
-
-            if (!QFile::exists(levelPath))
-            {
-                return false;
-            }
-        }
-
-        auto previousDocument = GetIEditor()->GetDocument();
-        QString previousPathName = (previousDocument != nullptr) ? previousDocument->GetLevelPathName() : "";
-        auto newDocument = CCryEditApp::instance()->OpenDocumentFile(levelPath.toUtf8().data());
-
-        // the underlying document pointer doesn't change, so we can't check that; use the path name's instead
-
-        bool result = true;
-        if (newDocument == nullptr || newDocument->IsLevelLoadFailed() || (newDocument->GetLevelPathName() == previousPathName))
-        {
-            result = false;
-        }
-
-        return result;
-    }
-
-    bool PyOpenLevelNoPrompt(const char* pLevelName)
-    {
-        GetIEditor()->GetDocument()->SetModifiedFlag(false);
-        return PyOpenLevel(pLevelName);
-    }
-
-    bool PyReloadCurrentLevel()
-    {
-        if (GetIEditor()->IsLevelLoaded())
-        {
-            // Close the current level so that the subsequent call to open the same level will be allowed
-            QString currentLevelPath = GetIEditor()->GetDocument()->GetLevelPathName();
-            CloseCurrentLevel();
-
-            return PyOpenLevel(currentLevelPath.toUtf8().constData());
-        }
-
-        return false;
-    }
-
-    int PyCreateLevel(const char* levelName, [[maybe_unused]] int resolution, [[maybe_unused]] int unitSize, [[maybe_unused]] bool bUseTerrain)
-    {
-        QString qualifiedName;
-        return CCryEditApp::instance()->CreateLevel(levelName, qualifiedName);
-    }
-
-    int PyCreateLevelNoPrompt(const char* levelName, [[maybe_unused]] int heightmapResolution, [[maybe_unused]] int heightmapUnitSize,
-        [[maybe_unused]] int terrainExportTextureSize, [[maybe_unused]] bool useTerrain)
-    {
-        // If a level was open, ignore any unsaved changes if it had been modified
-        if (GetIEditor()->IsLevelLoaded())
-        {
-            GetIEditor()->GetDocument()->SetModifiedFlag(false);
-        }
-
-        QString qualifiedName;
-        return CCryEditApp::instance()->CreateLevel(levelName, qualifiedName);
-    }
-
-    const char* PyGetCurrentLevelName()
-    {
-        // Using static member to capture temporary data
-        static string tempLevelName;
-        tempLevelName = GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().data();
-        return tempLevelName.c_str();
-    }
-
-    const char* PyGetCurrentLevelPath()
-    {
-        // Using static member to capture temporary data
-        static string tempLevelPath;
-        tempLevelPath = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
-        return tempLevelPath.c_str();
-    }
-
-    void Command_LoadPlugins()
-    {
-        GetIEditor()->LoadPlugins();
-    }
-
-    AZ::Vector3 PyGetCurrentViewPosition()
-    {
-        Vec3 pos = GetIEditor()->GetSystem()->GetViewCamera().GetPosition();
-        return AZ::Vector3(pos.x, pos.y, pos.z);
-    }
-
-    AZ::Vector3 PyGetCurrentViewRotation()
-    {
-        Ang3 ang = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(GetIEditor()->GetSystem()->GetViewCamera().GetMatrix())));
-        return AZ::Vector3(ang.x, ang.y, ang.z);
-    }
-
-    void PySetCurrentViewPosition(float x, float y, float z)
-    {
-        SandboxEditor::SetDefaultViewportCameraPosition(AZ::Vector3(x, y, z));
-    }
-
-    void PySetCurrentViewRotation(float x, [[maybe_unused]] float y, float z)
-    {
-        SandboxEditor::SetDefaultViewportCameraRotation(AZ::DegToRad(x), AZ::DegToRad(z));
-    }
-}
-
-namespace
-{
-    void PyStartProcessDetached(const char* process, const char* args)
-    {
-        CCryEditApp::instance()->StartProcessDetached(process, args);
-    }
-
-    void PyLaunchLUAEditor(const char* files)
-    {
-        CCryEditApp::instance()->OpenLUAEditor(files);
-    }
-
-    bool PyCheckOutDialogEnableForAll(bool isEnable)
-    {
-        return CCheckOutDialog::EnableForAll(isEnable);
-    }
-}
-
-namespace
-{
-    bool g_runScriptResult = false; // true -> success, false -> failure
-}
-
-namespace
-{
-    void PySetResultToSuccess()
-    {
-        g_runScriptResult = true;
-    }
-
-    void PySetResultToFailure()
-    {
-        g_runScriptResult = false;
-    }
-
-    void PyIdleEnable(bool enable)
-    {
-        if (Editor::EditorQtApplication::instance())
-        {
-            Editor::EditorQtApplication::instance()->EnableOnIdle(enable);
-        }
-    }
-
-    bool PyIdleIsEnabled()
-    {
-        if (!Editor::EditorQtApplication::instance())
-        {
-            return false;
-        }
-        return Editor::EditorQtApplication::instance()->OnIdleEnabled();
-    }
-
-    void PyIdleWait(double timeInSec)
-    {
-        const bool wasIdleEnabled = PyIdleIsEnabled();
-        if (!wasIdleEnabled)
-        {
-            PyIdleEnable(true);
-        }
-
-        clock_t start = clock();
-        do
-        {
-            QEventLoop loop;
-            QTimer::singleShot(timeInSec * 1000, &loop, &QEventLoop::quit);
-            loop.exec();
-        } while ((double)(clock() - start) / CLOCKS_PER_SEC < timeInSec);
-
-        if (!wasIdleEnabled)
-        {
-            PyIdleEnable(false);
-        }
-    }
-
-    void PyIdleWaitFrames(uint32 frames)
-    {
-        struct Ticker : public AZ::TickBus::Handler
-        {
-            Ticker(QEventLoop* loop, uint32 targetFrames) : m_loop(loop), m_targetFrames(targetFrames)
-            {
-                AZ::TickBus::Handler::BusConnect();
-            }
-            ~Ticker()
-            {
-                AZ::TickBus::Handler::BusDisconnect();
-            }
-
-            void OnTick(float deltaTime, AZ::ScriptTimePoint time) override
-            {
-                AZ_UNUSED(deltaTime);
-                AZ_UNUSED(time);
-                if (++m_elapsedFrames >= m_targetFrames)
-                {
-                    m_loop->quit();
-                }
-            }
-            QEventLoop* m_loop = nullptr;
-            uint32 m_elapsedFrames = 0;
-            uint32 m_targetFrames = 0;
-        };
-
-        QEventLoop loop;
-        Ticker ticker(&loop, frames);
-        loop.exec();
-    }
-}
-
-
-inline namespace Commands
-{
-    void PySetConfigSpec(int spec, int platform)
-    {
-        CUndo undo("Set Config Spec");
-        if (CUndo::IsRecording())
-        {
-            CUndo::Record(new CUndoConficSpec());
-        }
-        GetIEditor()->SetEditorConfigSpec((ESystemConfigSpec)spec, (ESystemConfigPlatform)platform);
-    }
-
-    int PyGetConfigSpec()
-    {
-        return static_cast<int>(GetIEditor()->GetEditorConfigSpec());
-    }
-
-    int PyGetConfigPlatform()
-    {
-        return static_cast<int>(GetIEditor()->GetEditorConfigPlatform());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnChangeGameSpec(UINT nID)
-{
-    switch (nID)
-    {
-    case ID_GAME_PC_ENABLELOWSPEC:
-        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_PC);
-        break;
-    case ID_GAME_PC_ENABLEMEDIUMSPEC:
-        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_PC);
-        break;
-    case ID_GAME_PC_ENABLEHIGHSPEC:
-        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_PC);
-        break;
-    case ID_GAME_PC_ENABLEVERYHIGHSPEC:
-        Commands::PySetConfigSpec(CONFIG_VERYHIGH_SPEC, CONFIG_PC);
-        break;
-    case ID_GAME_OSXMETAL_ENABLELOWSPEC:
-        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_OSX_METAL);
-        break;
-    case ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC:
-        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_OSX_METAL);
-        break;
-    case ID_GAME_OSXMETAL_ENABLEHIGHSPEC:
-        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_OSX_METAL);
-        break;
-    case ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC:
-        Commands::PySetConfigSpec(CONFIG_VERYHIGH_SPEC, CONFIG_OSX_METAL);
-        break;
-    case ID_GAME_ANDROID_ENABLELOWSPEC:
-        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_ANDROID);
-        break;
-    case ID_GAME_ANDROID_ENABLEMEDIUMSPEC:
-        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_ANDROID);
-        break;
-    case ID_GAME_ANDROID_ENABLEHIGHSPEC:
-        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_ANDROID);
-        break;
-    case ID_GAME_ANDROID_ENABLEVERYHIGHSPEC:
-        Commands::PySetConfigSpec(CONFIG_VERYHIGH_SPEC, CONFIG_ANDROID);
-        break;
-    case ID_GAME_IOS_ENABLELOWSPEC:
-        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_IOS);
-        break;
-    case ID_GAME_IOS_ENABLEMEDIUMSPEC:
-        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_IOS);
-        break;
-    case ID_GAME_IOS_ENABLEHIGHSPEC:
-        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_IOS);
-        break;
-    case ID_GAME_IOS_ENABLEVERYHIGHSPEC:
-        Commands::PySetConfigSpec(CONFIG_VERYHIGH_SPEC, CONFIG_IOS);
-        break;
-#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)\
-    case ID_GAME_##CODENAME##_ENABLELOWSPEC:\
-        Commands::PySetConfigSpec(CONFIG_LOW_SPEC, CONFIG_##CODENAME);\
-        break;\
-    case ID_GAME_##CODENAME##_ENABLEMEDIUMSPEC:\
-        Commands::PySetConfigSpec(CONFIG_MEDIUM_SPEC, CONFIG_##CODENAME);\
-        break;\
-    case ID_GAME_##CODENAME##_ENABLEHIGHSPEC:\
-        Commands::PySetConfigSpec(CONFIG_HIGH_SPEC, CONFIG_##CODENAME);\
-        break;
-    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-    }
-}
-
-
-
-namespace AzToolsFramework
-{
-    void CryEditPythonHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.general' module
-            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
-            };
-            addLegacyGeneral(behaviorContext->Method("open_level", ::PyOpenLevel, nullptr, "Opens a level."));
-            addLegacyGeneral(behaviorContext->Method("open_level_no_prompt", ::PyOpenLevelNoPrompt, nullptr, "Opens a level. Doesn't prompt user about saving a modified level."));
-            addLegacyGeneral(behaviorContext->Method("reload_current_level", ::PyReloadCurrentLevel, nullptr, "Re-loads the current level. If no level is loaded, then does nothing."));
-            addLegacyGeneral(behaviorContext->Method("create_level", ::PyCreateLevel, nullptr, "Creates a level with the parameters of 'levelName', 'resolution', 'unitSize' and 'bUseTerrain'."));
-            addLegacyGeneral(behaviorContext->Method("create_level_no_prompt", ::PyCreateLevelNoPrompt, nullptr, "Creates a level with the parameters of 'levelName', 'resolution', 'unitSize' and 'bUseTerrain'."));
-            addLegacyGeneral(behaviorContext->Method("get_game_folder", PyGetGameFolderAsString, nullptr, "Gets the path to the Game folder of current project."));
-            addLegacyGeneral(behaviorContext->Method("get_current_level_name", PyGetCurrentLevelName, nullptr, "Gets the name of the current level."));
-            addLegacyGeneral(behaviorContext->Method("get_current_level_path", PyGetCurrentLevelPath, nullptr, "Gets the fully specified path of the current level."));
-
-            addLegacyGeneral(behaviorContext->Method("load_all_plugins", ::Command_LoadPlugins, nullptr, "Loads all available plugins."));
-            addLegacyGeneral(behaviorContext->Method("get_current_view_position", PyGetCurrentViewPosition, nullptr, "Returns the position of the current view as a Vec3."));
-            addLegacyGeneral(behaviorContext->Method("get_current_view_rotation", PyGetCurrentViewRotation, nullptr, "Returns the rotation of the current view as a Vec3 of Euler angles in degrees."));
-            addLegacyGeneral(behaviorContext->Method("set_current_view_position", PySetCurrentViewPosition, nullptr, "Sets the position of the current view as given x, y, z coordinates."));
-            addLegacyGeneral(behaviorContext->Method("set_current_view_rotation", PySetCurrentViewRotation, nullptr, "Sets the rotation of the current view as given x, y, z Euler angles in degrees."));
-
-            addLegacyGeneral(behaviorContext->Method("export_to_engine", CCryEditApp::Command_ExportToEngine, nullptr, "Exports the current level to the engine."));
-            addLegacyGeneral(behaviorContext->Method("set_config_spec", PySetConfigSpec, nullptr, "Sets the system config spec and platform."));
-            addLegacyGeneral(behaviorContext->Method("get_config_platform", PyGetConfigPlatform, nullptr, "Gets the system config platform."));
-            addLegacyGeneral(behaviorContext->Method("get_config_spec", PyGetConfigSpec, nullptr, "Gets the system config spec."));
-
-            addLegacyGeneral(behaviorContext->Method("set_result_to_success", PySetResultToSuccess, nullptr, "Sets the result of a script execution to success. Used only for Sandbox AutoTests."));
-            addLegacyGeneral(behaviorContext->Method("set_result_to_failure", PySetResultToFailure, nullptr, "Sets the result of a script execution to failure. Used only for Sandbox AutoTests."));
-
-            addLegacyGeneral(behaviorContext->Method("idle_enable", PyIdleEnable, nullptr, "Enables/Disables idle processing for the Editor. Primarily used for auto-testing."));
-            addLegacyGeneral(behaviorContext->Method("is_idle_enabled", PyIdleIsEnabled, nullptr, "Returns whether or not idle processing is enabled for the Editor. Primarily used for auto-testing."));
-            addLegacyGeneral(behaviorContext->Method("idle_is_enabled", PyIdleIsEnabled, nullptr, "Returns whether or not idle processing is enabled for the Editor. Primarily used for auto-testing."));
-            addLegacyGeneral(behaviorContext->Method("idle_wait", PyIdleWait, nullptr, "Waits idling for a given seconds. Primarily used for auto-testing."));
-            addLegacyGeneral(behaviorContext->Method("idle_wait_frames", PyIdleWaitFrames, nullptr, "Waits idling for a frames. Primarily used for auto-testing."));
-
-            addLegacyGeneral(behaviorContext->Method("start_process_detached", PyStartProcessDetached, nullptr, "Launches a detached process with an optional space separated list of arguments."));
-            addLegacyGeneral(behaviorContext->Method("launch_lua_editor", PyLaunchLUAEditor, nullptr, "Launches the Lua editor, may receive a list of space separate file paths, or an empty string to only open the editor."));
-
-            // this will put these methods into the 'azlmbr.legacy.checkout_dialog' module
-            auto addCheckoutDialog = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/CheckoutDialog")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.checkout_dialog");
-            };
-            addCheckoutDialog(behaviorContext->Method("enable_for_all", PyCheckOutDialogEnableForAll, nullptr, "Enables the 'Apply to all' button in the checkout dialog; useful for allowing the user to apply a decision to check out files to multiple, related operations."));
-
-            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_AUTO_SPEC>("SystemConfigSpec_Auto")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_LOW_SPEC>("SystemConfigSpec_Low")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_MEDIUM_SPEC>("SystemConfigSpec_Medium")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_HIGH_SPEC>("SystemConfigSpec_High")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigSpec::CONFIG_VERYHIGH_SPEC>("SystemConfigSpec_VeryHigh")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_INVALID_PLATFORM>("SystemConfigPlatform_InvalidPlatform")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_PC>("SystemConfigPlatform_Pc")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_MAC>("SystemConfigPlatform_Mac")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_OSX_METAL>("SystemConfigPlatform_OsxMetal")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_ANDROID>("SystemConfigPlatform_Android")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_IOS>("SystemConfigPlatform_Ios")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_PROVO>("SystemConfigPlatform_Provo")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-        }
-    }
-
-}
diff --git a/Code/Sandbox/Editor/CustomAspectRatioDlg.cpp b/Code/Sandbox/Editor/CustomAspectRatioDlg.cpp
deleted file mode 100644
index 6976b0399a..0000000000
--- a/Code/Sandbox/Editor/CustomAspectRatioDlg.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog for getting an aspect ratio info from users
-// Notice      : Refer to ViewportTitleDlg cpp for a use case
-
-
-#include "EditorDefs.h"
-
-#include "CustomAspectRatioDlg.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_CustomAspectRatioDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-#define MIN_ASPECT 1
-#define MAX_ASPECT 16384
-
-CCustomAspectRatioDlg::CCustomAspectRatioDlg(int x, int y, QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_xDefault(x)
-    , m_yDefault(y)
-    , m_ui(new Ui::CustomAspectRatioDlg)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-    OnInitDialog();
-}
-
-CCustomAspectRatioDlg::~CCustomAspectRatioDlg()
-{
-}
-
-void CCustomAspectRatioDlg::OnInitDialog()
-{
-    m_ui->m_x->setRange(MIN_ASPECT, MAX_ASPECT);
-    m_ui->m_x->setValue(m_xDefault);
-
-    m_ui->m_y->setRange(MIN_ASPECT, MAX_ASPECT);
-    m_ui->m_y->setValue(m_yDefault);
-}
-
-int CCustomAspectRatioDlg::GetX() const
-{
-    return m_ui->m_x->value();
-}
-
-int CCustomAspectRatioDlg::GetY() const
-{
-    return m_ui->m_y->value();
-}
-
-#include <moc_CustomAspectRatioDlg.cpp>
diff --git a/Code/Sandbox/Editor/CustomAspectRatioDlg.h b/Code/Sandbox/Editor/CustomAspectRatioDlg.h
deleted file mode 100644
index 5e4eb5aa28..0000000000
--- a/Code/Sandbox/Editor/CustomAspectRatioDlg.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog for getting an aspect ratio info from users
-// Notice      : Refer to ViewportTitleDlg cpp for a use case
-
-
-#ifndef CRYINCLUDE_EDITOR_CUSTOMASPECTRATIODLG_H
-#define CRYINCLUDE_EDITOR_CUSTOMASPECTRATIODLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class CustomAspectRatioDlg;
-}
-
-class CCustomAspectRatioDlg
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CCustomAspectRatioDlg(int x, int y, QWidget* pParent = nullptr);
-    ~CCustomAspectRatioDlg();
-
-    int GetX() const;
-    int GetY() const;
-
-protected:
-    void OnInitDialog();
-
-    int m_xDefault, m_yDefault;
-
-    QScopedPointer<Ui::CustomAspectRatioDlg> m_ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_CUSTOMASPECTRATIODLG_H
diff --git a/Code/Sandbox/Editor/CustomResolutionDlg.cpp b/Code/Sandbox/Editor/CustomResolutionDlg.cpp
deleted file mode 100644
index a62fcf6aac..0000000000
--- a/Code/Sandbox/Editor/CustomResolutionDlg.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog for getting a resolution info from users
-// Notice      : Refer to ViewportTitleDlg cpp for a use case
-
-
-#include "EditorDefs.h"
-
-#include "CustomResolutionDlg.h"
-
-// Qt
-#include <QTextStream>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_CustomResolutionDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-#define MIN_RES 64
-#define MAX_RES 8192
-
-CCustomResolutionDlg::CCustomResolutionDlg(int w, int h, QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_wDefault(w)
-    , m_hDefault(h)
-    , m_ui(new Ui::CustomResolutionDlg)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-    OnInitDialog();
-}
-
-CCustomResolutionDlg::~CCustomResolutionDlg()
-{
-}
-
-void CCustomResolutionDlg::OnInitDialog()
-{
-    m_ui->m_width->setRange(MIN_RES, MAX_RES);
-    m_ui->m_width->setValue(m_wDefault);
-
-    m_ui->m_height->setRange(MIN_RES, MAX_RES);
-    m_ui->m_height->setValue(m_hDefault);
-
-    QString maxDimensionString;
-    QTextStream(&maxDimensionString) 
-        << "Maximum Dimension: " << MAX_RES << Qt::endl 
-        << Qt::endl
-        << "Note: Dimensions over 8K may be" << Qt::endl
-        << "unstable depending on hardware.";
-    
-    m_ui->m_maxDimension->setText(maxDimensionString);
-}
-
-int CCustomResolutionDlg::GetWidth() const
-{
-    return m_ui->m_width->value();
-}
-
-int CCustomResolutionDlg::GetHeight() const
-{
-    return m_ui->m_height->value();
-}
diff --git a/Code/Sandbox/Editor/CustomResolutionDlg.h b/Code/Sandbox/Editor/CustomResolutionDlg.h
deleted file mode 100644
index b2f6e18268..0000000000
--- a/Code/Sandbox/Editor/CustomResolutionDlg.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog for getting a resolution info from users
-
-//  Notice     : Refer to ViewportTitleDlg.cpp for a use case.
-
-
-#ifndef CRYINCLUDE_EDITOR_CUSTOMRESOLUTIONDLG_H
-#define CRYINCLUDE_EDITOR_CUSTOMRESOLUTIONDLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class CustomResolutionDlg;
-}
-
-class CCustomResolutionDlg
-    : public QDialog
-{
-public:
-    CCustomResolutionDlg(int w, int h, QWidget* pParent = nullptr);
-    ~CCustomResolutionDlg();
-
-    int GetWidth() const;
-    int GetHeight() const;
-
-protected:
-    void OnInitDialog();
-
-    int m_wDefault, m_hDefault;
-
-    QScopedPointer<Ui::CustomResolutionDlg> m_ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_CUSTOMRESOLUTIONDLG_H
diff --git a/Code/Sandbox/Editor/CustomizeKeyboardDialog.cpp b/Code/Sandbox/Editor/CustomizeKeyboardDialog.cpp
deleted file mode 100644
index d87b0dbbb4..0000000000
--- a/Code/Sandbox/Editor/CustomizeKeyboardDialog.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "CustomizeKeyboardDialog.h"
-
-// Qt
-#include <QMenu>
-#include <QMenuBar>
-#include <QMessageBox>
-
-// AzQtComponents
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_CustomizeKeyboardDialog.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-using namespace AzQtComponents;
-
-namespace
-{
-    enum CustomRole
-    {
-        ActionRole = Qt::UserRole,
-        KeySequenceRole
-    };
-}
-
-class NestedQAction
-{
-public:
-    NestedQAction()
-        : m_action(nullptr)
-    {
-    }
-    NestedQAction(const QString& path, QAction* action)
-        : m_path(path)
-        , m_action(action)
-    {
-    }
-
-    QString Path() const { return m_path; }
-    QAction* Action() const { return m_action; }
-
-private:
-    QString m_path;
-    QAction* m_action;
-};
-
-QVector<NestedQAction> GetAllActionsForMenu(const QMenu* menu, const QString& path)
-{
-    QList<QAction*> menuActions = menu->actions();
-    QVector<NestedQAction> actions;
-    actions.reserve(menuActions.size());
-    foreach(QAction * action, menuActions)
-    {
-        if (action->menu() != nullptr)
-        {
-            QString newPath = path + action->text() + QStringLiteral(" | ");
-            newPath = RemoveAcceleratorAmpersands(newPath);
-
-            QVector<NestedQAction> subMenuActions = GetAllActionsForMenu(action->menu(), newPath);
-            actions.reserve(actions.size() + subMenuActions.size());
-            actions += subMenuActions;
-        }
-        else if (!action->isSeparator())
-        {
-            actions.push_back(NestedQAction(path + RemoveAcceleratorAmpersands(action->text()), action));
-        }
-    }
-
-    return actions;
-}
-
-class MenuActionsModel
-    : public QAbstractListModel
-{
-public:
-    MenuActionsModel(QObject* parent = nullptr)
-        : QAbstractListModel(parent)
-    {
-    }
-    virtual ~MenuActionsModel() {}
-
-    int rowCount([[maybe_unused]] const QModelIndex& parent = QModelIndex()) const override
-    {
-        return m_actions.size();
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        if (index.row() < 0 || index.row() >= m_actions.size())
-        {
-            return {};
-        }
-
-        switch (role)
-        {
-        case Qt::DisplayRole:
-        {
-            return m_actions[index.row()].Path();
-        }
-        case ActionRole:
-            return QVariant::fromValue(m_actions[index.row()].Action());
-        }
-
-        return {};
-    }
-
-    void Reset(const QVector<NestedQAction>& actions)
-    {
-        beginResetModel();
-        m_actions = actions;
-        endResetModel();
-    }
-
-private:
-    QVector<NestedQAction> m_actions;
-};
-
-class ActionShortcutsModel
-    : public QAbstractListModel
-{
-public:
-    ActionShortcutsModel(QObject* parent = nullptr)
-        : QAbstractListModel(parent)
-        , m_action(nullptr)
-    {
-    }
-    virtual ~ActionShortcutsModel() {}
-
-    int rowCount([[maybe_unused]] const QModelIndex& parent = QModelIndex()) const override
-    {
-        if (m_action)
-        {
-            return m_action->shortcuts().size();
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        auto shortcuts = m_action->shortcuts();
-        if (index.row() < 0 || index.row() >= shortcuts.size())
-        {
-            return {};
-        }
-
-        switch (role)
-        {
-        case Qt::DisplayRole:
-            return shortcuts.at(index.row()).toString();
-        case KeySequenceRole:
-            return QVariant::fromValue(shortcuts.at(index.row()));
-        }
-
-        return {};
-    }
-
-    void RemoveAll()
-    {
-        auto shortcuts = m_action->shortcuts();
-        beginRemoveRows({}, 0, shortcuts.size() - 1);
-        shortcuts.clear();
-        m_action->setShortcuts(shortcuts);
-        endRemoveRows();
-    }
-
-    void Remove(const QKeySequence& sequence)
-    {
-        auto shortcuts = m_action->shortcuts();
-        int index = shortcuts.indexOf(sequence);
-        if (index >= 0)
-        {
-            beginRemoveRows({}, index, index);
-            shortcuts.removeAll(sequence);
-            m_action->setShortcuts(shortcuts);
-            endRemoveRows();
-        }
-    }
-
-    QModelIndex Add(const QKeySequence& sequence)
-    {
-        auto shortcuts = m_action->shortcuts();
-        int position = shortcuts.indexOf(sequence);
-        if (-1 == position)
-        {
-            position = shortcuts.size();
-            beginInsertRows({}, position, position);
-            shortcuts.append(sequence);
-            m_action->setShortcuts(shortcuts);
-            endInsertRows();
-        }
-        return index(position);
-    }
-
-    bool Contains(const QKeySequence& sequence) const
-    {
-        return m_action->shortcuts().contains(sequence);
-    }
-
-    void Reset(QAction& action)
-    {
-        emit beginResetModel();
-        m_action = &action;
-        emit endResetModel();
-    }
-
-private:
-    QAction* m_action;
-};
-
-CustomizeKeyboardDialog::CustomizeKeyboardDialog(KeyboardCustomizationSettings& settings, QWidget* parent /* = nullptr */)
-    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, parent))
-    , m_ui(new Ui::CustomizeKeyboardDialog)
-    , m_settings(settings)
-    , m_settingsSnapshot(m_settings.CreateSnapshot())
-{
-    m_ui->setupUi(this);
-
-    m_menuActionsModel = new MenuActionsModel(this);
-    m_actionShortcutsModel = new ActionShortcutsModel(this);
-    m_ui->commandsView->setModel(m_menuActionsModel);
-    m_ui->shortcutsView->setModel(m_actionShortcutsModel);
-
-    QStringList categories = BuildModels(parent);
-
-    connect(m_ui->categories, &QComboBox::currentTextChanged, this, &CustomizeKeyboardDialog::CategoryChanged);
-    connect(m_ui->commandsView->selectionModel(), &QItemSelectionModel::currentChanged, this, &CustomizeKeyboardDialog::CommandSelectionChanged);
-    connect(m_ui->shortcutsView->selectionModel(), &QItemSelectionModel::currentChanged, this, &CustomizeKeyboardDialog::ShortcutsViewSelectionChanged);
-    connect(m_actionShortcutsModel, &QAbstractItemModel::rowsRemoved, this, &CustomizeKeyboardDialog::ShortcutsViewDataChanged);
-    connect(m_actionShortcutsModel, &QAbstractItemModel::rowsInserted, this, &CustomizeKeyboardDialog::ShortcutsViewDataChanged);
-    connect(m_ui->keySequenceEdit, &QKeySequenceEdit::editingFinished, this, &CustomizeKeyboardDialog::KeySequenceEditingFinished);
-    connect(m_ui->assignButton, &QPushButton::clicked, this, &CustomizeKeyboardDialog::AssignButtonClicked);
-    connect(m_ui->removeButton, &QPushButton::clicked, this, &CustomizeKeyboardDialog::ShortcutRemoved);
-    connect(m_ui->clearButton, &QPushButton::clicked, m_actionShortcutsModel, &ActionShortcutsModel::RemoveAll);
-    connect(m_ui->buttonBox, &QDialogButtonBox::clicked, this, &CustomizeKeyboardDialog::DialogButtonClicked);
-    connect(this, &QDialog::rejected, this, [&]() { m_settings.Load(m_settingsSnapshot); });
-
-    m_ui->categories->addItems(categories);
-}
-
-CustomizeKeyboardDialog::~CustomizeKeyboardDialog()
-{
-}
-
-QStringList CustomizeKeyboardDialog::BuildModels(QWidget* parent)
-{
-    QMenuBar* menuBar = parent->findChild<QMenuBar*>();
-    QList<QAction*> menuBarActions = menuBar->actions();
-
-    QStringList categories;
-    foreach(QAction * menuAction, menuBarActions)
-    {
-        QString category = RemoveAcceleratorAmpersands(menuAction->text());
-        categories.append(category);
-
-        QMenu* menu = menuAction->menu();
-        m_menuActions[category] = GetAllActionsForMenu(menu, QStringLiteral(""));
-    }
-
-    return categories;
-}
-
-void CustomizeKeyboardDialog::CategoryChanged(const QString& category)
-{
-    m_menuActionsModel->Reset(m_menuActions[category]);
-
-    // Must reset the shortcut sequence text box back to disabled state
-    // if the category is changed
-    m_ui->keySequenceEdit->setEnabled(false);
-    m_ui->commandsView->scrollToTop();
-}
-
-void CustomizeKeyboardDialog::CommandSelectionChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
-{
-    QAction* action = current.data(ActionRole).value<QAction*>();
-    m_actionShortcutsModel->Reset(*action);
-
-    m_ui->removeButton->setEnabled(false);
-    m_ui->clearButton->setEnabled(m_actionShortcutsModel->rowCount() > 0);
-    m_ui->keySequenceEdit->setEnabled(true);
-
-    const auto& description = action->statusTip().size() > 0 ? action->statusTip() : action->toolTip();
-    m_ui->descriptionLabel->setText(description);
-    m_ui->keySequenceEdit->clear();
-}
-
-void CustomizeKeyboardDialog::ShortcutsViewSelectionChanged(const QModelIndex& current, [[maybe_unused]] const QModelIndex& previous)
-{
-    m_ui->removeButton->setEnabled(current.isValid());
-}
-
-void CustomizeKeyboardDialog::ShortcutsViewDataChanged()
-{
-    m_ui->clearButton->setEnabled(m_actionShortcutsModel->rowCount() > 0);
-}
-
-void CustomizeKeyboardDialog::ShortcutRemoved()
-{
-    auto index = m_ui->shortcutsView->selectionModel()->selectedIndexes().first();
-    m_actionShortcutsModel->Remove(index.data(KeySequenceRole).value<QKeySequence>());
-}
-
-void CustomizeKeyboardDialog::KeySequenceEditingFinished()
-{
-    auto keySequence = m_ui->keySequenceEdit->keySequence();
-    m_ui->assignButton->setEnabled(!keySequence.isEmpty() && !m_actionShortcutsModel->Contains(keySequence));
-}
-
-void CustomizeKeyboardDialog::AssignButtonClicked()
-{
-    auto sequence = m_ui->keySequenceEdit->keySequence();
-    m_ui->keySequenceEdit->clear();
-
-    auto currentAction = m_settings.FindActionForShortcut(sequence);
-    if (currentAction)
-    {
-        auto result = QMessageBox::warning(
-                this,
-                tr("Shortcut already in use"),
-                tr("%1 is currently assigned to '%2'.\n\nAssign and replace?")
-                    .arg(sequence.toString()).arg(RemoveAcceleratorAmpersands(currentAction->text())),
-                QMessageBox::Yes | QMessageBox::No,
-                QMessageBox::No);
-        if (result == QMessageBox::No)
-        {
-            m_ui->keySequenceEdit->setFocus();
-            return;
-        }
-
-        //remove this sequence from the current shortcut
-        auto shortcuts = currentAction->shortcuts();
-        shortcuts.removeAll(sequence);
-        currentAction->setShortcuts(shortcuts);
-    }
-
-    QModelIndex index = m_actionShortcutsModel->Add(sequence);
-    m_ui->shortcutsView->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Clear | QItemSelectionModel::SelectCurrent);
-    m_ui->assignButton->setEnabled(false);
-    m_ui->removeButton->setFocus();
-}
-
-void CustomizeKeyboardDialog::DialogButtonClicked(const QAbstractButton* button)
-{
-    if (button == m_ui->buttonBox->button(QDialogButtonBox::RestoreDefaults))
-    {
-        auto result = QMessageBox::question(
-                this,
-                tr("Restore Default Keyboard Shortcuts"),
-                tr("Are you sure you wish to restore all keyboard shortcuts to factory defaults?"));
-        if (result == QMessageBox::Yes)
-        {
-            m_settings.LoadDefaults();
-        }
-    }
-    else if (button == m_ui->buttonBox->button(QDialogButtonBox::Close))
-    {
-        m_settings.Save();
-        accept();
-    }
-    else if (button == m_ui->buttonBox->button(QDialogButtonBox::Cancel))
-    {
-        m_settings.Load(m_settingsSnapshot);
-        reject();
-    }
-}
-
-#include <moc_CustomizeKeyboardDialog.cpp>
diff --git a/Code/Sandbox/Editor/CustomizeKeyboardDialog.h b/Code/Sandbox/Editor/CustomizeKeyboardDialog.h
deleted file mode 100644
index 645dad7f26..0000000000
--- a/Code/Sandbox/Editor/CustomizeKeyboardDialog.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_CUSTOMIZE_KEYBOARD_DIALOG_H
-#define CRYINCLUDE_EDITOR_CUSTOMIZE_KEYBOARD_DIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include "KeyboardCustomizationSettings.h"
-#endif
-
-namespace Ui
-{
-    class CustomizeKeyboardDialog;
-}
-
-class QAbstractButton;
-class NestedQAction;
-class MenuActionsModel;
-class ActionShortcutsModel;
-
-class CustomizeKeyboardDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CustomizeKeyboardDialog(KeyboardCustomizationSettings& settings, QWidget* parent = nullptr);
-    virtual ~CustomizeKeyboardDialog();
-
-private slots:
-    void CommandSelectionChanged(const QModelIndex& current, const QModelIndex& previous);
-
-    void CategoryChanged(const QString& category);
-    void DialogButtonClicked(const QAbstractButton* button);
-    void KeySequenceEditingFinished();
-    void AssignButtonClicked();
-    void ShortcutsViewSelectionChanged(const QModelIndex& current, const QModelIndex& previous);
-    void ShortcutsViewDataChanged();
-    void ShortcutRemoved();
-
-private:
-    QScopedPointer<Ui::CustomizeKeyboardDialog> m_ui;
-    QHash<QString, QVector<NestedQAction> > m_menuActions;
-
-    KeyboardCustomizationSettings& m_settings;
-    const KeyboardCustomizationSettings::Snapshot m_settingsSnapshot;
-
-    MenuActionsModel* m_menuActionsModel;
-    ActionShortcutsModel* m_actionShortcutsModel;
-
-    QStringList BuildModels(QWidget* parent);
-};
-
-#endif //CRYINCLUDE_EDITOR_CUSTOMIZE_KEYBOARD_DIALOG_H
diff --git a/Code/Sandbox/Editor/Dialogs/ErrorsDlg.cpp b/Code/Sandbox/Editor/Dialogs/ErrorsDlg.cpp
deleted file mode 100644
index 86f535512e..0000000000
--- a/Code/Sandbox/Editor/Dialogs/ErrorsDlg.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ErrorsDlg.h"
-
-// Qt
-#include <QClipboard>
-#include <QStyle>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <Dialogs/ui_ErrorsDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-CErrorsDlg::CErrorsDlg(QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , ui(new Ui::CErrorsDlg)
-{
-    ui->setupUi(this);
-
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-    m_bFirstMessage = true;
-
-    OnInitDialog();
-
-    connect(ui->m_buttonCopyErrors, &QPushButton::clicked, this, &CErrorsDlg::OnCopyErrors);
-    connect(ui->m_buttonClearErrors, &QPushButton::clicked, this, &CErrorsDlg::OnClearErrors);
-    connect(ui->m_buttonCancel, &QPushButton::clicked, this, &CErrorsDlg::OnCancel);
-}
-
-CErrorsDlg::~CErrorsDlg()
-{
-}
-
-void CErrorsDlg::OnInitDialog()
-{
-    auto icon = style()->standardIcon(QStyle::SP_MessageBoxCritical);
-    
-    ui->m_errorIconCtrl->setPixmap(icon.pixmap(ui->m_errorIconCtrl->width()));
-}
-
-void CErrorsDlg::AddMessage(const QString& text, const QString& caption)
-{
-    // At the load time this dialog is frozen, cause there is no message loop in progress.
-    // We need to dispatch messages before showing a window if it was closed by user.
-    if (!isVisible())
-    {
-        show();
-    }
-
-    ui->m_richEdit->moveCursor(QTextCursor::End);
-    auto textCursor = ui->m_richEdit->textCursor();
-
-    if (m_bFirstMessage)
-    {
-        m_bFirstMessage = false;
-    }
-    else
-    {
-        textCursor.insertText("\n\n");
-    }
-
-    QTextCharFormat format;
-    format.setFontWeight(QFont::Bold);
-
-    textCursor.setCharFormat(format);
-    textCursor.insertText(caption + "\n");
-
-    format.setFontWeight(QFont::Normal);
-    // Show message in a dialog
-    textCursor.setCharFormat(format);
-    textCursor.insertText(text);
-}
-
-void CErrorsDlg::OnCancel()
-{
-    hide();
-}
-
-
-void CErrorsDlg::OnCopyErrors()
-{
-    QString text = ui->m_richEdit->toPlainText();
-    QApplication::clipboard()->setText(text);
-}
-
-
-void CErrorsDlg::OnClearErrors()
-{
-    m_bFirstMessage = true;
-    ui->m_richEdit->clear();
-}
-
-#include <Dialogs/moc_ErrorsDlg.cpp>
diff --git a/Code/Sandbox/Editor/Dialogs/ErrorsDlg.h b/Code/Sandbox/Editor/Dialogs/ErrorsDlg.h
deleted file mode 100644
index 4f33fd54cb..0000000000
--- a/Code/Sandbox/Editor/Dialogs/ErrorsDlg.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Modeless dialog for list of errors.
-//               To avoid interuption on start Editor time and on load level time.
-//               Using: To add messages from any part of CryEngine you can use this style:
-//               gEnv->pSystem->ShowMessage("Text", "Caption", MB_OK);
-
-
-#ifndef CRYINCLUDE_EDITOR_DIALOGS_ERRORSDLG_H
-#define CRYINCLUDE_EDITOR_DIALOGS_ERRORSDLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui {
-    class CErrorsDlg;
-}
-
-class CErrorsDlg
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CErrorsDlg(QWidget* pParent = nullptr);
-    virtual ~CErrorsDlg();
-    void AddMessage(const QString& text, const QString& caption);
-
-protected:
-    void OnCancel();
-    void OnInitDialog();
-
-    void OnCopyErrors();
-    void OnClearErrors();
-
-private:
-    bool m_bFirstMessage;
-    QScopedPointer<Ui::CErrorsDlg> ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_DIALOGS_ERRORSDLG_H
diff --git a/Code/Sandbox/Editor/Dialogs/Generic/UserOptions.cpp b/Code/Sandbox/Editor/Dialogs/Generic/UserOptions.cpp
deleted file mode 100644
index 1b3e4b8350..0000000000
--- a/Code/Sandbox/Editor/Dialogs/Generic/UserOptions.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : These are helper classes for containing the data from the
-//               generic overwrite dialog
-
-
-#include "EditorDefs.h"
-
-#include "UserOptions.h"
-
-//////////////////////////////////////////////////////////////////////////
-CUserOptions::CUserOptionsReferenceCountHelper::CUserOptionsReferenceCountHelper(CUserOptions& roUserOptions)
-    : m_roReferencedUserOptionsObject(roUserOptions)
-{
-    m_roReferencedUserOptionsObject.IncRef();
-}
-//////////////////////////////////////////////////////////////////////////
-CUserOptions::CUserOptionsReferenceCountHelper::~CUserOptionsReferenceCountHelper()
-{
-    m_roReferencedUserOptionsObject.DecRef();
-}
-//////////////////////////////////////////////////////////////////////////
-CUserOptions::CUserOptions()
-{
-    m_boToAll = false;
-    m_nCurrentOption = ENotSet;
-}
-//////////////////////////////////////////////////////////////////////////
-bool    CUserOptions::IsOptionValid()
-{
-    return m_nCurrentOption != ENotSet;
-}
-//////////////////////////////////////////////////////////////////////////
-int CUserOptions::GetOption()
-{
-    return m_nCurrentOption;
-}
-//////////////////////////////////////////////////////////////////////////
-bool    CUserOptions::IsOptionToAll()
-{
-    return m_boToAll;
-}
-//////////////////////////////////////////////////////////////////////////
-void    CUserOptions::SetOption(int nNewOption, bool boToAll)
-{
-    m_nCurrentOption = nNewOption;
-    m_boToAll = boToAll;
-}
-//////////////////////////////////////////////////////////////////////////
-int CUserOptions::DecRef()
-{
-    if (m_nNumberOfReferences >= 1)
-    {
-        --m_nNumberOfReferences;
-        if (m_nNumberOfReferences == 0)
-        {
-            SetOption(CUserOptions::ENotSet, false);
-        }
-    }
-    return m_nNumberOfReferences;
-}
-//////////////////////////////////////////////////////////////////////////
-int CUserOptions::IncRef()
-{
-    ++m_nNumberOfReferences;
-    return m_nNumberOfReferences;
-}
-//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/Dialogs/Generic/UserOptions.h b/Code/Sandbox/Editor/Dialogs/Generic/UserOptions.h
deleted file mode 100644
index 22be9373d6..0000000000
--- a/Code/Sandbox/Editor/Dialogs/Generic/UserOptions.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : These are helper classes for containing the data from the
-//               generic overwrite dialog.
-
-#ifndef CRYINCLUDE_EDITOR_DIALOGS_GENERIC_USEROPTIONS_H
-#define CRYINCLUDE_EDITOR_DIALOGS_GENERIC_USEROPTIONS_H
-#pragma once
-
-
-// Small helper class.
-// Hint: have one for files and other for directories.
-// Hint: used a CUserOptionsReferenceCountHelper to automatically control the reference counts
-// of any CUserOptions variable: usefull for recursion when you don't want to use
-// only static variables. See example in FileUtill.cpp, function CopyTree.
-class CUserOptions
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Types & typedefs
-public:
-    enum EOption
-    {
-        ENotSet,
-        EYes = 6,
-        ENo = 7,
-        ECancel = 2,
-    };
-
-    class CUserOptionsReferenceCountHelper
-    {
-    public:
-        CUserOptionsReferenceCountHelper(CUserOptions& roUserOptions);
-        virtual ~CUserOptionsReferenceCountHelper();
-    protected:
-        CUserOptions&   m_roReferencedUserOptionsObject;
-    };
-protected:
-private:
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Methods
-public:
-    CUserOptions();
-
-    bool        IsOptionValid();
-
-    int         GetOption();
-
-    bool        IsOptionToAll();
-
-    void        SetOption(int   nNewOption, bool boToAll);
-
-    int DecRef();
-    int IncRef();
-protected:
-private:
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Data
-public:
-protected:
-    int                         m_nCurrentOption;
-    bool                        m_boToAll;
-    int                         m_nNumberOfReferences;
-private:
-    //////////////////////////////////////////////////////////////////////////
-};
-#endif // CRYINCLUDE_EDITOR_DIALOGS_GENERIC_USEROPTIONS_H
diff --git a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp b/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp
deleted file mode 100644
index b04e57853e..0000000000
--- a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "PythonScriptsDialog.h"
-
-// AzCore
-#include <AzCore/Module/Module.h>                               // for AZ::ModuleData
-#include <AzCore/Module/ModuleManagerBus.h>                     // for AZ::ModuleManagerRequestBus
-#include <AzCore/Module/DynamicModuleHandle.h>                  // for AZ::DynamicModuleHandle
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/Utils/Utils.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ViewPaneOptions.h>               // for AzToolsFramework::ViewPaneOptions
-#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h> // for AzToolsFramework::EditorPythonRunnerRequestBus
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/LineEdit.h>
-
-// Editor
-#include "Settings.h"
-#include "LyViewPaneNames.h"
-
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <Dialogs/ui_PythonScriptsDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-//////////////////////////////////////////////////////////////////////////
-namespace
-{
-    // File name extension for python files
-    const QString s_kPythonFileNameSpec = "*.py";
-
-    // Tree root element name
-    const QString s_kRootElementName = "Python Scripts";
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPythonScriptsDialog::RegisterViewClass()
-{
-    if (AzToolsFramework::EditorPythonRunnerRequestBus::HasHandlers())
-    {
-        AzToolsFramework::ViewPaneOptions options;
-        options.canHaveMultipleInstances = true;
-        AzToolsFramework::RegisterViewPane<CPythonScriptsDialog>("Python Scripts", LyViewPane::CategoryOther, options);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CPythonScriptsDialog::CPythonScriptsDialog(QWidget* parent)
-    : QWidget(parent)
-    , ui(new Ui::CPythonScriptsDialog)
-{
-    ui->setupUi(this);
-
-    AzQtComponents::LineEdit::applySearchStyle(ui->searchField);
-
-    QStringList scriptFolders;
-    auto engineScriptPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets" / "Editor" / "Scripts";
-    scriptFolders.push_back(engineScriptPath.c_str());
-
-    AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
-    ScanFolderForScripts(QString("%1/Editor/Scripts").arg(projectPath.c_str()), scriptFolders);
-
-    struct GetGemSourcePathsVisitor
-        : AZ::SettingsRegistryInterface::Visitor
-    {
-        GetGemSourcePathsVisitor(AZ::SettingsRegistryInterface& settingsRegistry)
-            : m_settingsRegistry(settingsRegistry)
-        {}
-        void Visit(AZStd::string_view path, AZStd::string_view, AZ::SettingsRegistryInterface::Type,
-            AZStd::string_view value) override
-        {
-            AZStd::string_view jsonSourcePathPointer{ path };
-            // Remove the array index from the path and check if the JSON path ends with "/SourcePaths"
-            AZ::StringFunc::TokenizeLast(jsonSourcePathPointer, "/");
-            if (jsonSourcePathPointer.ends_with("/SourcePaths"))
-            {
-                AZ::IO::Path newSourcePath = jsonSourcePathPointer;
-                // Resolve any file aliases first - Do not use ResolvePath() as that assumes
-                // any relative path is underneath the @assets@ alias
-                if (auto fileIoBase = AZ::IO::FileIOBase::GetInstance(); fileIoBase != nullptr)
-                {
-                    AZ::IO::FixedMaxPath replacedAliasPath;
-                    if (fileIoBase->ReplaceAlias(replacedAliasPath, value))
-                    {
-                        newSourcePath = AZ::IO::PathView(replacedAliasPath);
-                    }
-                }
-
-                // The current assumption is that the gem source path is the relative to the engine root
-                AZ::IO::Path engineRootPath;
-                m_settingsRegistry.Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
-                newSourcePath = (engineRootPath / newSourcePath).LexicallyNormal();
-
-                if (auto gemSourcePathIter = AZStd::find(m_gemSourcePaths.begin(), m_gemSourcePaths.end(), newSourcePath);
-                    gemSourcePathIter == m_gemSourcePaths.end())
-                {
-                    m_gemSourcePaths.emplace_back(AZStd::move(newSourcePath));
-                }
-            }
-        }
-
-        AZStd::vector<AZ::IO::Path> m_gemSourcePaths;
-    private:
-        AZ::SettingsRegistryInterface& m_settingsRegistry;
-    };
-
-    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
-    {
-        GetGemSourcePathsVisitor visitor{ *settingsRegistry };
-        constexpr auto gemListKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::OrganizationRootKey)
-            + "/Gems";
-        settingsRegistry->Visit(visitor, gemListKey);
-        for (const AZ::IO::Path& gemSourcePath : visitor.m_gemSourcePaths)
-        {
-            ScanFolderForScripts(QString("%1/Editor/Scripts").arg(gemSourcePath.c_str()), scriptFolders);
-        }
-    }
-
-    ui->treeView->init(scriptFolders, s_kPythonFileNameSpec, s_kRootElementName, false, false);
-    QObject::connect(ui->treeView, &CFolderTreeCtrl::ItemDoubleClicked, this, &CPythonScriptsDialog::OnExecute);
-    QObject::connect(ui->executeButton, &QPushButton::clicked, this, &CPythonScriptsDialog::OnExecute);
-    QObject::connect(ui->searchField, &QLineEdit::textChanged, ui->treeView, &CFolderTreeCtrl::SetSearchFilter);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPythonScriptsDialog::ScanFolderForScripts(QString path, QStringList& scriptFolders) const
-{
-    char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
-    if (AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(path.toLocal8Bit().constData(), resolvedPath, AZ_MAX_PATH_LEN))
-    {
-        if (AZ::IO::SystemFile::Exists(resolvedPath))
-        {
-            scriptFolders.push_back(path);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CPythonScriptsDialog::~CPythonScriptsDialog()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPythonScriptsDialog::OnExecute()
-{
-    QList<QStandardItem*> selectedItems = ui->treeView->GetSelectedItems();
-    QStandardItem* selectedItem = selectedItems.empty() ? nullptr : selectedItems.first();
-
-    if (selectedItem == NULL)
-    {
-        return;
-    }
-
-    if (ui->treeView->IsFile(selectedItem))
-    {
-        auto scriptPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / ui->treeView->GetPath(selectedItem).toUtf8().constData();
-        using namespace AzToolsFramework;
-        EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByFilename, scriptPath.Native());
-    }
-}
-
-#include <Dialogs/moc_PythonScriptsDialog.cpp>
diff --git a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.h b/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.h
deleted file mode 100644
index ad2ac61aff..0000000000
--- a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_DIALOGS_PYTHONSCRIPTSDIALOG_H
-#define CRYINCLUDE_EDITOR_DIALOGS_PYTHONSCRIPTSDIALOG_H
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <QScopedPointer>
-#endif
-
-namespace Ui {
-    class CPythonScriptsDialog;
-}
-
-class CPythonScriptsDialog
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit CPythonScriptsDialog(QWidget* parent = nullptr);
-    ~CPythonScriptsDialog();
-
-    static const GUID& GetClassID()
-    {
-        // {C61C9C4C-CFED-47C4-8FE1-79069D0284E1}
-        static const GUID guid = {
-            0xc61c9c4c, 0xcfed, 0x47c4, { 0x8f, 0xe1, 0x79, 0x6, 0x9d, 0x2, 0x84, 0xe1 }
-        };
-
-        return guid;
-    }
-
-    static void RegisterViewClass();
-
-private slots:
-    void OnExecute();
-
-protected:
-    void ScanFolderForScripts(QString path, QStringList& scriptFolders) const;
-
-private:
-    QScopedPointer<Ui::CPythonScriptsDialog> ui;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_DIALOGS_PYTHONSCRIPTSDIALOG_H
diff --git a/Code/Sandbox/Editor/DimensionsDialog.cpp b/Code/Sandbox/Editor/DimensionsDialog.cpp
deleted file mode 100644
index a4638ffad1..0000000000
--- a/Code/Sandbox/Editor/DimensionsDialog.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "DimensionsDialog.h"
-
-// Qt
-#include <QButtonGroup>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_DimensionsDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-CDimensionsDialog::CDimensionsDialog(QWidget* pParent /*=nullptr*/)
-    : QDialog(pParent)
-    , m_group(new QButtonGroup(this))
-    , ui(new Ui::CDimensionsDialog)
-{
-    ui->setupUi(this);
-
-    setWindowTitle(tr("Generate Terrain Texture"));
-
-    m_group->addButton(ui->Dim512, 512);
-    m_group->addButton(ui->Dim1024, 1024);
-    m_group->addButton(ui->Dim2048, 2048);
-    m_group->addButton(ui->Dim4096, 4096);
-    m_group->addButton(ui->Dim8192, 8192);
-    m_group->addButton(ui->Dim16384, 16384);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CDimensionsDialog::~CDimensionsDialog()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDimensionsDialog::SetDimensions(unsigned int iWidth)
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Select a dimension option button in the dialog
-    ////////////////////////////////////////////////////////////////////////
-
-    QAbstractButton* button = m_group->button(iWidth);
-    assert(button);
-
-    button->setChecked(true);
-}
-
-UINT CDimensionsDialog::GetDimensions()
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Get the currently selected dimension option button in the dialog
-    ////////////////////////////////////////////////////////////////////////
-
-    assert(m_group->checkedId() != -1);
-
-    return m_group->checkedId();
-}
-
-#include <moc_DimensionsDialog.cpp>
diff --git a/Code/Sandbox/Editor/DimensionsDialog.h b/Code/Sandbox/Editor/DimensionsDialog.h
deleted file mode 100644
index 613a496521..0000000000
--- a/Code/Sandbox/Editor/DimensionsDialog.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_EDITOR_DIMENSIONSDIALOG_H
-#define CRYINCLUDE_EDITOR_DIMENSIONSDIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QScopedPointer>
-
-#include <QDialog>
-#endif
-
-class QButtonGroup;
-
-namespace Ui {
-    class CDimensionsDialog;
-}
-
-class CDimensionsDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CDimensionsDialog(QWidget* pParent = nullptr);   // standard constructor
-    ~CDimensionsDialog();
-
-    UINT GetDimensions();
-    void SetDimensions(unsigned int iWidth);
-
-protected:
-    void UpdateData(bool fromUi = true);    // DDX/DDV support
-
-private:
-    QButtonGroup* m_group;
-
-    QScopedPointer<Ui::CDimensionsDialog> ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_DIMENSIONSDIALOG_H
diff --git a/Code/Sandbox/Editor/DisplaySettings.cpp b/Code/Sandbox/Editor/DisplaySettings.cpp
deleted file mode 100644
index c46007a21f..0000000000
--- a/Code/Sandbox/Editor/DisplaySettings.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Display Settings implementation.
-
-#include "EditorDefs.h"
-
-#include "DisplaySettings.h"
-
-// Qt
-#include <QSettings>
-
-// Editor
-#include "Settings.h"
-
-
-
-//////////////////////////////////////////////////////////////////////////
-CDisplaySettings::CDisplaySettings()
-{
-    m_flags = SETTINGS_NOLABELS | SETTINGS_NOCOLLISION;
-    m_objectHideMask = 0;
-
-    // All flags besides GI enabled by default
-    m_renderFlags = RENDER_FLAG_LAST_ONE - 1;
-    m_renderFlags &= ~(RENDER_FLAG_BBOX);
-    m_renderFlags &= ~(RENDER_FLAG_GI);
-    m_debugFlags = 0;
-    m_labelsDistance = 100;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CDisplaySettings::~CDisplaySettings()
-{
-}
-
-void CDisplaySettings::SaveRegistry()
-{
-    SaveValue("Settings", "ObjectHideMask", m_objectHideMask);
-    SaveValue("Settings", "RenderFlags", m_renderFlags);
-    SaveValue("Settings", "DisplayFlags", m_flags & SETTINGS_SERIALIZABLE_FLAGS_MASK);
-    SaveValue("Settings", "DebugFlags", m_debugFlags);
-    SaveValue("Settings", "LabelsDistance", m_labelsDistance);
-}
-
-void CDisplaySettings::LoadRegistry()
-{
-    LoadValue("Settings", "ObjectHideMask", m_objectHideMask);
-    LoadValue("Settings", "RenderFlags", m_renderFlags);
-    LoadValue("Settings", "DisplayFlags", m_flags);
-    m_flags &= SETTINGS_SERIALIZABLE_FLAGS_MASK;
-    LoadValue("Settings", "DebugFlags", m_debugFlags);
-    int temp = m_labelsDistance;
-    LoadValue("Settings", "LabelsDistance", temp);
-    m_labelsDistance = temp;
-
-    gSettings.objectHideMask = m_objectHideMask;
-}
-
-void CDisplaySettings::SetObjectHideMask(int hideMask)
-{
-    m_objectHideMask = hideMask;
-
-    gSettings.objectHideMask = m_objectHideMask;
-
-    GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::PostInitApply()
-{
-    SetRenderFlags(m_renderFlags);
-    SetDebugFlags(m_debugFlags);
-}
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::SetRenderFlags(int flags)
-{
-    m_renderFlags = flags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::SetDebugFlags(int flags)
-{
-    m_debugFlags = flags;
-
-    //
-    //SetCVar( "ai_DebugDraw",m_debugFlags&DBG_AI_DEBUGDRAW );
-    //SetCVarInt( "r_TexLog",(m_debugFlags&DBG_TEXTURE_MEMINFO) ? 2:0 );
-    //SetCVarInt( "MemStats",(m_debugFlags&DBG_MEMSTATS) ? 1000:0 );
-    //SetCVarInt( "p_draw_helpers",(m_debugFlags&DBG_PHYSICS_DEBUGDRAW) ? 5634:0 );
-
-    //SetCVar( "r_ProfileShaders",(m_debugFlags&DBG_RENDERER_PROFILESHADERS) );
-
-    SetCVarInt("r_MeasureOverdraw", (m_debugFlags & DBG_RENDERER_OVERDRAW) ? 1 : 0);   //Eric@conffx display Overdraw in Particle editor preview window
-    //SetCVarInt( "r_Stats",(m_debugFlags&DBG_RENDERER_RESOURCES) ? 4:0 );
-    //SetCVarInt( "sys_enable_budgetmonitoring",(m_debugFlags&DBG_BUDGET_MONITORING) ? 4:0 );
-
-    //SetCVarInt( "Profile",(m_debugFlags&DBG_FRAMEPROFILE) ? 1:0 );
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::SetCVar(const char* cvar, bool value)
-{
-    ICVar* var = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(cvar);
-    if (var)
-    {
-        var->Set((value) ? 1 : 0);
-    }
-    else
-    {
-        CLogFile::FormatLine("Console Variable %s not declared", cvar);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::SetCVarInt(const char* cvar, int value)
-{
-    ICVar* var = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(cvar);
-    if (var)
-    {
-        var->Set(value);
-    }
-    else
-    {
-        CLogFile::FormatLine("Console Variable %s not declared", cvar);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::DisplayLabels(bool bEnable)
-{
-    if (bEnable)
-    {
-        m_flags &= ~SETTINGS_NOLABELS;
-    }
-    else
-    {
-        m_flags |= SETTINGS_NOLABELS;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::DisplayTracks(bool bEnable)
-{
-    if (bEnable)
-    {
-        m_flags &= ~SETTINGS_HIDE_TRACKS;
-    }
-    else
-    {
-        m_flags |= SETTINGS_HIDE_TRACKS;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::DisplayLinks(bool bEnable)
-{
-    if (bEnable)
-    {
-        m_flags &= ~SETTINGS_HIDE_LINKS;
-    }
-    else
-    {
-        m_flags |= SETTINGS_HIDE_LINKS;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::DisplayHelpers(bool bEnable)
-{
-    if (bEnable)
-    {
-        m_flags &= ~SETTINGS_HIDE_HELPERS;
-    }
-    else
-    {
-        m_flags |= SETTINGS_HIDE_HELPERS;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::DisplayDimensionFigures(bool bEnable)
-{
-    if (bEnable)
-    {
-        m_flags |= SETTINGS_SHOW_DIMENSIONFIGURES;
-    }
-    else
-    {
-        m_flags &= ~SETTINGS_SHOW_DIMENSIONFIGURES;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::SetHighlightBreakable(bool bHighlight)
-{
-    if (bHighlight)
-    {
-        m_debugFlags |= DBG_HIGHLIGHT_BREAKABLE;
-    }
-    else
-    {
-        m_debugFlags &= ~DBG_HIGHLIGHT_BREAKABLE;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::SetHighlightMissingSurfaceType(bool bHighlight)
-{
-    if (bHighlight)
-    {
-        m_debugFlags |= DBG_HIGHLIGHT_MISSING_SURFACE_TYPE;
-    }
-    else
-    {
-        m_debugFlags &= ~DBG_HIGHLIGHT_MISSING_SURFACE_TYPE;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::SaveValue(const char* sSection, const char* sKey, int value)
-{
-    QSettings settings;
-    settings.setValue(QStringLiteral("%1/%2").arg(sSection, sKey), value);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::LoadValue(const char* sSection, const char* sKey, int& value)
-{
-    QSettings settings;
-    value = settings.value(QStringLiteral("%1/%2").arg(sSection, sKey), value).toInt();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CDisplaySettings::LoadValue(const char* sSection, const char* sKey, bool& value)
-{
-    QSettings settings;
-    value = settings.value(QStringLiteral("%1/%2").arg(sSection, sKey), value).toInt();
-}
diff --git a/Code/Sandbox/Editor/DisplaySettings.h b/Code/Sandbox/Editor/DisplaySettings.h
deleted file mode 100644
index 0eb25522a0..0000000000
--- a/Code/Sandbox/Editor/DisplaySettings.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Display Settings definition.
-
-
-#ifndef CRYINCLUDE_EDITOR_DISPLAYSETTINGS_H
-#define CRYINCLUDE_EDITOR_DISPLAYSETTINGS_H
-
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-enum EDisplayRenderFlags
-{
-    RENDER_FLAG_BBOX            = 1 << 0,
-    RENDER_FLAG_ROADS           = 1 << 1,
-    RENDER_FLAG_DECALS      = 1 << 2,
-    RENDER_FLAG_DETAILTEX   = 1 << 3,
-    RENDER_FLAG_FOG             = 1 << 4,
-    RENDER_FLAG_INDOORS     = 1 << 5,
-    RENDER_FLAG_LIVINGOBJ   = 1 << 6,
-    RENDER_FLAG_STATICOBJ   = 1 << 7,
-    RENDER_FLAG_SHADOWMAPS = 1 << 8,
-    RENDER_FLAG_SKYBOX      = 1 << 9,
-    RENDER_FLAG_TERRAIN     = 1 << 10,
-    RENDER_FLAG_WATER           = 1 << 11,
-    RENDER_FLAG_DETAILOBJ   = 1 << 12,
-
-    RENDER_FLAG_PARTICLES = 1 << 14,
-    RENDER_FLAG_VOXELS    = 1 << 15,
-    RENDER_FLAG_CLOUDS    = 1 << 16,
-    RENDER_FLAG_IMPOSTERS = 1 << 17,
-    RENDER_FLAG_BEAMS     = 1 << 18,
-    RENDER_FLAG_GI              = 1 << 19,
-    RENDER_FLAG_ALPHABLEND = 1 << 20,
-
-    //update this!
-    RENDER_FLAG_LAST_ONE = 1 << 21
-
-        // Debugging options.
-        //RENDER_FLAG_PROFILE = 1<<22,
-        //RENDER_FLAG_AIDEBUGDRAW = 1<<23,
-        //RENDER_FLAG_MEMINFO = 1<<24,
-};
-
-//////////////////////////////////////////////////////////////////////////
-enum EDisplaySettingsFlags
-{
-    SETTINGS_NOCOLLISION = 0x01,//!< Disable collision with terrain.
-    SETTINGS_NOLABELS = 0x02,       //!< Do not draw labels.
-    SETTINGS_PHYSICS = 0x04,        //!< Physics simulation is enabled.
-    SETTINGS_HIDE_TRACKS = 0x08, //!< Enable displaying of animation tracks in views.
-    SETTINGS_HIDE_LINKS = 0x10, //!< Enable displaying of links between objects.
-    SETTINGS_HIDE_HELPERS = 0x20, //!< Disable displaying of all object helpers.
-    SETTINGS_SHOW_DIMENSIONFIGURES = 0x40, //!< Enable displaying of dimension figures.
-
-    SETTINGS_SERIALIZABLE_FLAGS_MASK = ~(SETTINGS_PHYSICS),
-};
-
-//////////////////////////////////////////////////////////////////////////
-enum EDebugSettingsFlags
-{
-    DBG_MEMINFO                     = 0x002,
-    DBG_MEMSTATS                    = 0x004,
-    DBG_TEXTURE_MEMINFO     = 0x008,
-    DBG_AI_DEBUGDRAW            = 0x010,
-    DBG_PHYSICS_DEBUGDRAW   = 0x020,
-    DBG_RENDERER_PROFILE    = 0x040,
-    DBG_RENDERER_PROFILESHADERS = 0x080,
-    DBG_RENDERER_OVERDRAW   = 0x100,
-    DBG_RENDERER_RESOURCES  = 0x200,
-    DBG_FRAMEPROFILE                = 0x400,
-    DBG_DEBUG_LIGHTS                = 0x800,
-    DBG_BUDGET_MONITORING       = 0x1000,
-    DBG_HIGHLIGHT_BREAKABLE = 0x2000,
-    DBG_HIGHLIGHT_MISSING_SURFACE_TYPE = 0x4000
-};
-
-/*!
- *  CDisplaySettings is a collection of information about how to display current views.
- */
-class SANDBOX_API CDisplaySettings
-{
-public:
-    CDisplaySettings();
-    ~CDisplaySettings();
-
-    void PostInitApply();
-
-    void SetSettings(int flags) { m_flags = flags; };
-    int GetSettings() const { return m_flags; };
-
-    void SetObjectHideMask(int m_objectHideMask);
-    int GetObjectHideMask() const { return m_objectHideMask; }
-
-    void SetRenderFlags(int flags);
-    int GetRenderFlags() const { return m_renderFlags; }
-
-    void SetDebugFlags(int flags);
-    int GetDebugFlags() const { return m_debugFlags; }
-
-    void DisplayLabels(bool bEnable);
-    bool IsDisplayLabels() const { return (m_flags & SETTINGS_NOLABELS) == 0; };
-
-    void DisplayTracks(bool bEnable);
-    bool IsDisplayTracks() const { return (m_flags & SETTINGS_HIDE_TRACKS) == 0; };
-
-    void DisplayLinks(bool bEnable);
-    bool IsDisplayLinks() const { return (m_flags & SETTINGS_HIDE_LINKS) == 0; };
-
-    void DisplayHelpers(bool bEnable);
-    bool IsDisplayHelpers() const { return (m_flags & SETTINGS_HIDE_HELPERS) == 0; };
-
-    void DisplayDimensionFigures(bool bEnable);
-    bool IsDisplayDimensionFigures() const {    return m_flags & SETTINGS_SHOW_DIMENSIONFIGURES;  };
-
-    void SetLabelsDistance(float dist) { m_labelsDistance = dist; };
-    float GetLabelsDistance() const { return m_labelsDistance; };
-
-    bool IsHighlightBreakable() const { return (m_debugFlags & DBG_HIGHLIGHT_BREAKABLE) != 0; }
-    void SetHighlightBreakable(bool bEnable);
-
-    bool IsHighlightMissingSurfaceType() const { return (m_debugFlags & DBG_HIGHLIGHT_MISSING_SURFACE_TYPE) != 0; }
-    void SetHighlightMissingSurfaceType(bool bEnable);
-
-    void SaveRegistry();
-    void LoadRegistry();
-
-private:
-    // Restrict access.
-    CDisplaySettings(const CDisplaySettings&) {}
-    void operator=(const CDisplaySettings&) {}
-
-    void SetCVar(const char* cvar, bool val);
-    void SetCVarInt(const char* cvar, int val);
-    void SaveValue(const char* sSection, const char* sKey, int value);
-    void LoadValue(const char* sSection, const char* sKey, int& value);
-    void LoadValue(const char* sSection, const char* sKey, bool& value);
-
-    int m_objectHideMask;
-    int m_renderFlags;
-    int m_flags;
-
-    //! Debug/profile settings.
-    //! @see EDebugSettingsFlags.
-    int m_debugFlags;
-    float m_labelsDistance;
-};
-
-#endif // CRYINCLUDE_EDITOR_DISPLAYSETTINGS_H
diff --git a/Code/Sandbox/Editor/DisplaySettingsPythonFuncs.cpp b/Code/Sandbox/Editor/DisplaySettingsPythonFuncs.cpp
deleted file mode 100644
index 01ad63027c..0000000000
--- a/Code/Sandbox/Editor/DisplaySettingsPythonFuncs.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "DisplaySettingsPythonFuncs.h"
-
-// AzCore
-#include <AzCore/RTTI/ReflectContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-// Editor
-#include "DisplaySettings.h"
-
-namespace
-{
-    int PyGetMiscDisplaySettings()
-    {
-        return GetIEditor()->GetDisplaySettings()->GetSettings();
-    }
-
-    void PySetMiscDisplaySettings(int flags)
-    {
-        GetIEditor()->GetDisplaySettings()->SetSettings(flags);
-    }
-}
-
-namespace AzToolsFramework
-{
-    bool DisplaySettingsState::operator==(const DisplaySettingsState& rhs) const
-    {
-        return this->m_noCollision == rhs.m_noCollision &&
-            this->m_noLabels == rhs.m_noLabels &&
-            this->m_simulate == rhs.m_simulate &&
-            this->m_hideTracks == rhs.m_hideTracks &&
-            this->m_hideLinks == rhs.m_hideLinks &&
-            this->m_hideHelpers == rhs.m_hideHelpers &&
-            this->m_showDimensionFigures == rhs.m_showDimensionFigures;
-    }
-
-    AZStd::string DisplaySettingsState::ToString() const
-    {
-        auto boolToPyString = [](bool v)
-        {
-            return v ? "True" : "False";
-        };
-
-        return AZStd::string::format("(no_collision=%s, no_labels=%s, simulate=%s, hide_tracks=%s, hide_links=%s, hide_helpers=%s, show_dimension_figures=%s)",
-            boolToPyString(this->m_noCollision),
-            boolToPyString(this->m_noLabels),
-            boolToPyString(this->m_simulate),
-            boolToPyString(this->m_hideTracks),
-            boolToPyString(this->m_hideLinks),
-            boolToPyString(this->m_hideHelpers),
-            boolToPyString(this->m_showDimensionFigures)
-            );
-    }
-
-    void DisplaySettingsPythonFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.settings' module
-            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Settings")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.settings");
-            };
-            addLegacyGeneral(behaviorContext->Method("get_misc_editor_settings", PyGetMiscDisplaySettings, nullptr, "Get miscellaneous Editor settings (camera collides with terrain, AI/Physics enabled, etc)."));
-            addLegacyGeneral(behaviorContext->Method("set_misc_editor_settings", PySetMiscDisplaySettings, nullptr, "Set miscellaneous Editor settings (camera collides with terrain, AI/Physics enabled, etc)."));
-            
-            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_NOCOLLISION>("DisplaySettings_NoCollision")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_NOLABELS>("DisplaySettings_NoLabels")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_PHYSICS>("DisplaySettings_Physics")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_HIDE_TRACKS>("DisplaySettings_HideTracks")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_HIDE_LINKS>("DisplaySettings_HideLinks")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_HIDE_HELPERS>("DisplaySettings_HideHelpers")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_SHOW_DIMENSIONFIGURES>("DisplaySettings_ShowDimensionFigures")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<EDisplaySettingsFlags::SETTINGS_SERIALIZABLE_FLAGS_MASK>("DisplaySettings_SerializableFlagsMask")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-        }
-    }
-
-    void DisplaySettingsComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<DisplaySettingsComponent, AZ::Component>();
-
-            serializeContext->Class<DisplaySettingsState>()
-                ->Version(1)
-                ->Field("NoCollision", &DisplaySettingsState::m_noCollision)
-                ->Field("NoLabels", &DisplaySettingsState::m_noLabels)
-                ->Field("Simulate", &DisplaySettingsState::m_simulate)
-                ->Field("HideTracks", &DisplaySettingsState::m_hideTracks)
-                ->Field("HideLinks", &DisplaySettingsState::m_hideLinks)
-                ->Field("HideHelpers", &DisplaySettingsState::m_hideHelpers)
-                ->Field("ShowDimensionFigures", &DisplaySettingsState::m_showDimensionFigures)
-                ;
-        }
-
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->Class<DisplaySettingsState>("DisplaySettingsState")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                ->Attribute(AZ::Script::Attributes::Category, "DisplaySettings")
-                ->Attribute(AZ::Script::Attributes::Module, "display_settings")
-                ->Property("NoCollision", BehaviorValueProperty(&DisplaySettingsState::m_noCollision))
-                    ->Attribute(AZ::Script::Attributes::Alias, "no_collision")
-                ->Property("NoLabels", BehaviorValueProperty(&DisplaySettingsState::m_noLabels))
-                    ->Attribute(AZ::Script::Attributes::Alias, "no_labels")
-                ->Property("Simulate", BehaviorValueProperty(&DisplaySettingsState::m_simulate))
-                    ->Attribute(AZ::Script::Attributes::Alias, "simulate")
-                ->Property("HideTracks", BehaviorValueProperty(&DisplaySettingsState::m_hideTracks))
-                    ->Attribute(AZ::Script::Attributes::Alias, "hide_tracks")
-                ->Property("HideLinks", BehaviorValueProperty(&DisplaySettingsState::m_hideLinks))
-                    ->Attribute(AZ::Script::Attributes::Alias, "hide_links")
-                ->Property("HideHelpers", BehaviorValueProperty(&DisplaySettingsState::m_hideHelpers))
-                    ->Attribute(AZ::Script::Attributes::Alias, "hide_helpers")
-                ->Property("ShowDimensionFigures", BehaviorValueProperty(&DisplaySettingsState::m_showDimensionFigures))
-                    ->Attribute(AZ::Script::Attributes::Alias, "show_dimension_figures")
-                ->Method("ToString", &DisplaySettingsState::ToString)
-                ;
-
-            behaviorContext->EBus<DisplaySettingsBus>("DisplaySettingsBus")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                ->Attribute(AZ::Script::Attributes::Category, "DisplaySettings")
-                ->Attribute(AZ::Script::Attributes::Module, "display_settings")
-                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("GetSettingsState", &DisplaySettingsRequests::GetSettingsState)
-                ->Event("SetSettingsState", &DisplaySettingsRequests::SetSettingsState)
-            ;
-        }
-    }
-
-    void DisplaySettingsComponent::Activate()
-    {
-        DisplaySettingsBus::Handler::BusConnect();
-    }
-
-    void DisplaySettingsComponent::Deactivate()
-    {
-        DisplaySettingsBus::Handler::BusDisconnect();
-    }
-
-    DisplaySettingsState DisplaySettingsComponent::GetSettingsState() const
-    {
-        return ConvertToSettings(GetIEditor()->GetDisplaySettings()->GetSettings());
-    }
-
-    void DisplaySettingsComponent::SetSettingsState(const DisplaySettingsState& settingsState)
-    {
-        uint flags = ConvertToFlags(settingsState);
-        GetIEditor()->GetDisplaySettings()->SetSettings(flags);
-    }
-
-    int DisplaySettingsComponent::ConvertToFlags(const DisplaySettingsState& state) const
-    {
-        int flags = 0;
-        flags |= state.m_noCollision ? SETTINGS_NOCOLLISION : 0x0;
-        flags |= state.m_noLabels ? SETTINGS_NOLABELS : 0x0;
-        flags |= state.m_simulate ? SETTINGS_PHYSICS : 0x0;
-        flags |= state.m_hideTracks ? SETTINGS_HIDE_TRACKS : 0x0;
-        flags |= state.m_hideLinks ? SETTINGS_HIDE_LINKS : 0x0;
-        flags |= state.m_hideHelpers ? SETTINGS_HIDE_HELPERS : 0x0;
-        flags |= state.m_showDimensionFigures ? SETTINGS_SHOW_DIMENSIONFIGURES : 0x0;
-
-        return flags;
-    }
-
-    DisplaySettingsState DisplaySettingsComponent::ConvertToSettings(int settings) const
-    {
-        DisplaySettingsState state;
-        state.m_noCollision = settings & SETTINGS_NOCOLLISION;
-        state.m_noLabels = settings & SETTINGS_NOLABELS;
-        state.m_simulate = settings & SETTINGS_PHYSICS;
-        state.m_hideTracks = settings & SETTINGS_HIDE_TRACKS;
-        state.m_hideLinks = settings & SETTINGS_HIDE_LINKS;
-        state.m_hideHelpers = settings & SETTINGS_HIDE_HELPERS;
-        state.m_showDimensionFigures = settings & SETTINGS_SHOW_DIMENSIONFIGURES;
-
-        return state;
-    }
-}
diff --git a/Code/Sandbox/Editor/DisplaySettingsPythonFuncs.h b/Code/Sandbox/Editor/DisplaySettingsPythonFuncs.h
deleted file mode 100644
index 860be42ca4..0000000000
--- a/Code/Sandbox/Editor/DisplaySettingsPythonFuncs.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma once
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/EBus/EBus.h>
-
-namespace AzToolsFramework
-{
-    //! A legacy component to reflect scriptable commands for the Editor
-    class DisplaySettingsPythonFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(DisplaySettingsPythonFuncsHandler, "{517AC40C-4A1F-4E02-ABA2-5A927582ECB4}")
-
-            static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-    //! Class to store the Display Settings
-    class DisplaySettingsState
-    {
-    public:
-        AZ_TYPE_INFO(DisplaySettingsState, "{EBEDA5EC-29D3-4F23-ABCC-C7C4EE48FA36}")
-
-        //! Disable collision with terrain.
-        bool m_noCollision;
-        //! Do not draw labels.
-        bool m_noLabels;
-        //! Simulation is enabled.
-        bool m_simulate;
-        //! Enable displaying of animation tracks in views.
-        bool m_hideTracks;
-        //! Enable displaying of links between objects.
-        bool m_hideLinks;
-        //! Disable displaying of all object helpers.
-        bool m_hideHelpers;
-        //! Enable displaying of dimension figures.
-        bool m_showDimensionFigures;
-
-        //! Equality test operator
-        bool operator==(const DisplaySettingsState& rhs) const;
-
-        //! String representation of the current state
-        AZStd::string ToString() const;
-    };
-
-    //! API to retrieve and set the Display Settings
-    class DisplaySettingsRequests : public AZ::EBusTraits
-    {
-    public:
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-        //! Get the current display settings state
-        virtual DisplaySettingsState GetSettingsState() const = 0;
-        //! Set the display settings state
-        virtual void SetSettingsState(const DisplaySettingsState& settingsState) = 0;
-
-        ~DisplaySettingsRequests() = default;
-    };
-    using DisplaySettingsBus = AZ::EBus<DisplaySettingsRequests>;
-
-    //! Component to modify Display Settings 
-    class DisplaySettingsComponent final
-        : public AZ::Component
-        , public DisplaySettingsBus::Handler
-    {
-    public:
-        AZ_COMPONENT(DisplaySettingsComponent, "{A7CDBF22-3904-46C6-85D2-073CD902DD7F}")
-
-        DisplaySettingsComponent() = default;
-        ~DisplaySettingsComponent() override = default;
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        // Component...
-        void Activate() override;
-        void Deactivate() override;
-
-        // DisplaySettingsBus...
-        DisplaySettingsState GetSettingsState() const override;
-        void SetSettingsState(const DisplaySettingsState& settingsState) override;
-
-        int ConvertToFlags(const DisplaySettingsState& settingsState) const;
-        DisplaySettingsState ConvertToSettings(int settings) const;
-    };
-} // namespace AzToolsFramework
diff --git a/Code/Sandbox/Editor/DocMultiArchive.h b/Code/Sandbox/Editor/DocMultiArchive.h
deleted file mode 100644
index e0b8144fd0..0000000000
--- a/Code/Sandbox/Editor/DocMultiArchive.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_DOCMULTIARCHIVE_H
-#define CRYINCLUDE_EDITOR_DOCMULTIARCHIVE_H
-#pragma once
-
-#include "Util/XmlArchive.h"
-
-// Segmented World need XML Archive of editor level being split into multiple Archives
-// Because multiArchive is a super set of single archive, Doc can always use it, with or without SW Level
-// so some of the interface functions was written as always using MultiArchive
-// However, to decouple other sandbox interfaces with SW stuff(prevent important header files from being polluted),
-// it's better put it here as a generic implement and be included in both sides
-
-// the current available slots for MultiArchive
-// used by segmented world code through enum mapping (to EWDBType)
-enum EDocMultiArchiveSlot
-{
-    DMAS_GENERAL = 0,
-    DMAS_TERRAIN_LAYERS,
-    DMAS_VEGETATION,
-    DMAS_TIME_OF_DAY,
-    DMAS_ENVIRONMENT,
-    DMAS_GENERAL_NAMED_DATA,
-
-    DMAS_USER,                      // Per user data,
-
-    DMAS_COUNT,
-};
-
-
-typedef CXmlArchive* TDocMultiArchive [DMAS_COUNT];
-inline void FillXmlArArray(TDocMultiArchive& arrXmlAr, CXmlArchive* pXmlAr)
-{
-    for (int i = 0; i < DMAS_COUNT; i++)
-    {
-        arrXmlAr[i] = pXmlAr;
-    }
-}
-
-inline bool IsLoadingXmlArArray(TDocMultiArchive& arrXmlAr)
-{
-    bool bLoading = false;
-    for (int i = 0; i < DMAS_COUNT; i++)
-    {
-        if (arrXmlAr[i])
-        {
-            bLoading = arrXmlAr[i]->bLoading;
-            break;
-        }
-    }
-    return bLoading;
-}
-
-#endif // CRYINCLUDE_EDITOR_DOCMULTIARCHIVE_H
diff --git a/Code/Sandbox/Editor/EditMode/DeepSelection.cpp b/Code/Sandbox/Editor/EditMode/DeepSelection.cpp
deleted file mode 100644
index 04096a1958..0000000000
--- a/Code/Sandbox/Editor/EditMode/DeepSelection.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "DeepSelection.h"
-
-// Editor
-#include "Objects/BaseObject.h"
-
-
-//! Functor for sorting selected objects on deep selection mode.
-struct NearDistance
-{
-    NearDistance(){}
-    bool operator()(const CDeepSelection::RayHitObject& lhs, const CDeepSelection::RayHitObject& rhs) const
-    {
-        return lhs.distance < rhs.distance;
-    }
-};
-
-//-----------------------------------------------------------------------------
-CDeepSelection::CDeepSelection()
-    : m_Mode(DSM_NONE)
-    , m_previousMode(DSM_NONE)
-    , m_CandidateObjectCount(0)
-    , m_CurrentSelectedPos(-1)
-{
-    m_LastPickPoint = QPoint(-1, -1);
-}
-
-//-----------------------------------------------------------------------------
-CDeepSelection::~CDeepSelection()
-{
-}
-
-//-----------------------------------------------------------------------------
-void CDeepSelection::Reset(bool bResetLastPick)
-{
-    for (int i = 0; i < m_CandidateObjectCount; ++i)
-    {
-        m_RayHitObjects[i].object->ClearFlags(OBJFLAG_NO_HITTEST);
-    }
-
-    m_CandidateObjectCount = 0;
-    m_CurrentSelectedPos = -1;
-
-    m_RayHitObjects.clear();
-
-    if (bResetLastPick)
-    {
-        m_LastPickPoint = QPoint(-1, -1);
-    }
-}
-
-//-----------------------------------------------------------------------------
-void CDeepSelection::AddObject(float distance, CBaseObject* pObj)
-{
-    m_RayHitObjects.push_back(RayHitObject(distance, pObj));
-}
-
-//-----------------------------------------------------------------------------
-bool CDeepSelection::OnCycling (const QPoint& pt)
-{
-    QPoint diff = m_LastPickPoint - pt;
-    LONG epsilon = 2;
-    m_LastPickPoint = pt;
-
-    if (abs(diff.x()) < epsilon && abs(diff.y()) < epsilon)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-//-----------------------------------------------------------------------------
-void CDeepSelection::ExcludeHitTest(int except)
-{
-    int nExcept = except % m_CandidateObjectCount;
-
-    for (int i = 0; i < m_CandidateObjectCount; ++i)
-    {
-        m_RayHitObjects[i].object->SetFlags(OBJFLAG_NO_HITTEST);
-    }
-
-    m_RayHitObjects[nExcept].object->ClearFlags(OBJFLAG_NO_HITTEST);
-}
-
-//-----------------------------------------------------------------------------
-int CDeepSelection::CollectCandidate(float fMinDistance, float fRange)
-{
-    m_CandidateObjectCount = 0;
-
-    if (!m_RayHitObjects.empty())
-    {
-        std::sort(m_RayHitObjects.begin(), m_RayHitObjects.end(), NearDistance());
-
-        for (std::vector<CDeepSelection::RayHitObject>::iterator itr = m_RayHitObjects.begin();
-             itr != m_RayHitObjects.end(); ++itr)
-        {
-            if (itr->distance - fMinDistance < fRange)
-            {
-                ++m_CandidateObjectCount;
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-
-    return m_CandidateObjectCount;
-}
-
-//-----------------------------------------------------------------------------
-CBaseObject* CDeepSelection::GetCandidateObject(int index)
-{
-    m_CurrentSelectedPos = index % m_CandidateObjectCount;
-
-    return m_RayHitObjects[m_CurrentSelectedPos].object;
-}
-
-//-----------------------------------------------------------------------------
-//!
-void CDeepSelection::SetMode(EDeepSelectionMode mode)
-{
-    m_previousMode = m_Mode;
-    m_Mode = mode;
-}
diff --git a/Code/Sandbox/Editor/EditMode/DeepSelection.h b/Code/Sandbox/Editor/EditMode/DeepSelection.h
deleted file mode 100644
index 8f15ba4772..0000000000
--- a/Code/Sandbox/Editor/EditMode/DeepSelection.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Deep Selection Header
-
-
-#ifndef CRYINCLUDE_EDITOR_EDITMODE_DEEPSELECTION_H
-#define CRYINCLUDE_EDITOR_EDITMODE_DEEPSELECTION_H
-#pragma once
-
-class CBaseObject;
-
-//! Deep Selection
-//! Additional output information of HitContext on using "deep selection mode".
-//! At the deep selection mode, it supports second selection pass for easy
-//! selection on crowded area with two different method.
-//! One is to show pop menu of candidate objects list. Another is the cyclic
-//! selection on pick clicking.
-class CDeepSelection
-    : public _i_reference_target_t
-{
-public:
-    //! Deep Selection Mode Definition
-    enum EDeepSelectionMode
-    {
-        DSM_NONE    = 0,    // Not using deep selection.
-        DSM_POP     = 1,    // Deep selection mode with pop context menu.
-        DSM_CYCLE   = 2     // Deep selection mode with cyclic selection on each clinking same point.
-    };
-
-    //! Subclass for container of the selected object with hit distance.
-    struct RayHitObject
-    {
-        RayHitObject(float dist, CBaseObject* pObj)
-            : distance(dist)
-            , object(pObj)
-        {
-        }
-
-        float distance;
-        CBaseObject* object;
-    };
-
-    //! Constructor
-    CDeepSelection();
-    virtual ~CDeepSelection();
-
-    void Reset(bool bResetLastPick = false);
-    void AddObject(float distance, CBaseObject* pObj);
-    //! Check if clicking point is same position with last position,
-    //! to decide whether to continue cycling mode.
-    bool OnCycling (const QPoint& pt);
-    //! All objects in list are excluded for hitting test except one, current selection.
-    void ExcludeHitTest(int except);
-    void SetMode(EDeepSelectionMode mode);
-    inline EDeepSelectionMode GetMode() const { return m_Mode; }
-    inline EDeepSelectionMode GetPreviousMode() const { return m_previousMode; }
-    //! Collect object in the deep selection range. The distance from the minimum
-    //! distance is less than deep selection range.
-    int CollectCandidate(float fMinDistance, float fRange);
-    //! Return the candidate object in index position, then it is to be current
-    //! selection position.
-    CBaseObject* GetCandidateObject(int index);
-    //! Return the current selection position that is update in "GetCandidateObject"
-    //! function call.
-    inline int GetCurrentSelectPos() const { return m_CurrentSelectedPos; }
-    //! Return the number of objects in the deep selection range.
-    inline int GetCandidateObjectCount() const { return m_CandidateObjectCount; }
-
-private:
-    //! Current mode
-    EDeepSelectionMode m_Mode;
-    EDeepSelectionMode m_previousMode;
-    //! Last picking point to check whether cyclic selection continue.
-    QPoint m_LastPickPoint;
-    //! List of the selected objects with ray hitting
-    std::vector<RayHitObject> m_RayHitObjects;
-    int m_CandidateObjectCount;
-    int m_CurrentSelectedPos;
-};
-#endif // CRYINCLUDE_EDITOR_EDITMODE_DEEPSELECTION_H
diff --git a/Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp b/Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
deleted file mode 100644
index be479b00c9..0000000000
--- a/Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Calculate the reference frame for sub-object selections.
-
-#include "EditorDefs.h"
-
-#include "SubObjectSelectionReferenceFrameCalculator.h"
-
-SubObjectSelectionReferenceFrameCalculator::SubObjectSelectionReferenceFrameCalculator(ESubObjElementType selectionType)
-    :   m_anySelected(false)
-    , pos(0.0f, 0.0f, 0.0f)
-    , normal(0.0f, 0.0f, 0.0f)
-    , nNormals(0)
-    , selectionType(selectionType)
-    , bUseExplicitFrame(false)
-    , bExplicitAnySelected(false)
-{
-}
-
-void SubObjectSelectionReferenceFrameCalculator::SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame)
-{
-    this->m_refFrame = refFrame;
-    this->bUseExplicitFrame = true;
-    this->bExplicitAnySelected = bAnySelected;
-}
-
-bool SubObjectSelectionReferenceFrameCalculator::GetFrame(Matrix34& refFrame)
-{
-    if (this->bUseExplicitFrame)
-    {
-        refFrame = this->m_refFrame;
-        return this->bExplicitAnySelected;
-    }
-    else
-    {
-        refFrame.SetIdentity();
-
-        if (this->nNormals > 0)
-        {
-            this->normal = this->normal / this->nNormals;
-            if (!this->normal.IsZero())
-            {
-                this->normal.Normalize();
-            }
-
-            // Average position.
-            this->pos = this->pos / this->nNormals;
-            refFrame.SetTranslation(this->pos);
-        }
-
-        if (this->m_anySelected)
-        {
-            if (!this->normal.IsZero())
-            {
-                Vec3 xAxis(1, 0, 0), yAxis(0, 1, 0), zAxis(0, 0, 1);
-                if (this->normal.IsEquivalent(zAxis) || normal.IsEquivalent(-zAxis))
-                {
-                    zAxis = xAxis;
-                }
-                xAxis = this->normal.Cross(zAxis).GetNormalized();
-                yAxis = xAxis.Cross(this->normal).GetNormalized();
-                refFrame.SetFromVectors(xAxis, yAxis, normal, pos);
-            }
-        }
-
-        return m_anySelected;
-    }
-}
diff --git a/Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h b/Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
deleted file mode 100644
index 0a28a79548..0000000000
--- a/Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Calculate the reference frame for sub-object selections.
-
-
-#ifndef CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
-#define CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
-#pragma once
-
-
-#include "ISubObjectSelectionReferenceFrameCalculator.h"
-#include "Objects/SubObjSelection.h"
-
-class SubObjectSelectionReferenceFrameCalculator
-    : public ISubObjectSelectionReferenceFrameCalculator
-{
-public:
-    SubObjectSelectionReferenceFrameCalculator(ESubObjElementType selectionType);
-
-    virtual void SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame);
-    bool GetFrame(Matrix34& refFrame);
-
-private:
-    bool m_anySelected;
-    Vec3 pos;
-    Vec3 normal;
-    int nNormals;
-    ESubObjElementType selectionType;
-    std::vector<Vec3> positions;
-    Matrix34 m_refFrame;
-    bool bUseExplicitFrame;
-    bool bExplicitAnySelected;
-};
-
-#endif // CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
diff --git a/Code/Sandbox/Editor/EditorDefs.h b/Code/Sandbox/Editor/EditorDefs.h
deleted file mode 100644
index dc31c652f6..0000000000
--- a/Code/Sandbox/Editor/EditorDefs.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios
-// -------------------------------------------------------------------------
-//  Created:     13/2/2003 by Timur.
-//  Description: Main header included by every file in Editor.
-//
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_EDITOR_EDITORDEFS_H
-#define CRYINCLUDE_EDITOR_EDITORDEFS_H
-
-#include <AzCore/PlatformDef.h>
-
-// It is vital that at least some Qt header is pulled in to this header, so that
-// QT_VERSION is defined and the editor gets the correct set of overloads in the
-// IXML interface. This also disambiguates the GUID/REFGUID situation in Guid.h
-#include <QUuid>
-
-#include <platform.h>
-
-#include "ProjectDefines.h"
-
-#ifdef NOMINMAX
-#include "Cry_Math.h"
-#endif //NOMINMAX
-
-// Resource includes
-#include "Resource.h"
-
-
-#include <Include/SandboxAPI.h>
-#include <Include/EditorCoreAPI.h>
-
-// Warnings in STL
-#pragma warning (disable : 4786) // identifier was truncated to 'number' characters in the debug information.
-#pragma warning (disable : 4244) // conversion from 'long' to 'float', possible loss of data
-#pragma warning (disable : 4018) // signed/unsigned mismatch
-#pragma warning (disable : 4800) // BOOL bool conversion
-
-// Disable warning when a function returns a value inside an __asm block
-#pragma warning (disable : 4035)
-
-//////////////////////////////////////////////////////////////////////////
-// 64-bits related warnings.
-#pragma warning (disable : 4267) // conversion from 'size_t' to 'int', possible loss of data
-
-//////////////////////////////////////////////////////////////////////////
-// Simple type definitions.
-//////////////////////////////////////////////////////////////////////////
-#include "BaseTypes.h"
-
-// Which cfg file to use.
-#define EDITOR_CFG_FILE "editor.cfg"
-
-//////////////////////////////////////////////////////////////////////////
-// C runtime lib includes
-//////////////////////////////////////////////////////////////////////////
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
-#include <cmath>
-#include <cfloat>
-#include <climits>
-
-/////////////////////////////////////////////////////////////////////////////
-// STL
-/////////////////////////////////////////////////////////////////////////////
-#include <memory>
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-#include <algorithm>
-#include <functional>
-
-#undef rand // remove cryengine protection against wrong rand usage
-
-/////////////////////////////////////////////////////////////////////////////
-// VARIOUS MACROS AND DEFINES
-/////////////////////////////////////////////////////////////////////////////
-#ifdef new
-#undef new
-#endif
-
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(p)          { if (p) { delete (p);       (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(p)    { if (p) { delete[] (p);     (p) = NULL; } \
-}
-#endif
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p)         { if (p) { (p)->Release();   (p) = NULL; } \
-}
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <platform.h>
-#include <Cry_Math.h>
-#include <Cry_Geo.h>
-#include <Range.h>
-#include <StlUtils.h>
-
-#include <smartptr.h>
-#define TSmartPtr _smart_ptr
-
-#define TOOLBAR_TRANSPARENT_COLOR QColor(0xC0, 0xC0, 0xC0)
-
-/////////////////////////////////////////////////////////////////////////////
-// Interfaces ///////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <IRenderer.h>
-#include <CryFile.h>
-#include <ISystem.h>
-#include <IIndexedMesh.h>
-#include <ITimer.h>
-#include <IXml.h>
-#include <IMovieSystem.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Commonly used Editor includes.
-//////////////////////////////////////////////////////////////////////////
-
-// Utility classes.
-#include "Util/EditorUtils.h"
-#include "Util/FileEnum.h"
-#include "Util/Math.h"
-#include "Util/AffineParts.h"
-
-// Xml support.
-#include "Util/XmlArchive.h"
-#include "Util/XmlTemplate.h"
-
-// Utility classes.
-#include "Util/bitarray.h"
-#include "Util/RefCountBase.h"
-#include "Util/TRefCountBase.h"
-#include "Util/MemoryBlock.h"
-#include "Util/PathUtil.h"
-
-// Main Editor interface definition.
-#include "IEditor.h"
-
-// Log file access
-#include "LogFile.h"
-
-// Prevent macros to override certain function names
-#ifdef GetObject
-#undef GetObject
-#endif
-
-#ifdef max
-#undef max
-#undef min
-#endif
-
-#ifdef DeleteFile
-#undef DeleteFile
-#endif
-
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
-
-#ifdef RemoveDirectory
-#undef RemoveDirectory
-#endif
-
-#ifdef CopyFile
-#undef CopyFile
-#endif
-
-#ifdef GetUserName
-#undef GetUserName
-#endif
-
-#ifdef LoadCursor
-#undef LoadCursor
-#endif
-
-
-#ifdef _DEBUG
-#if !defined(AZ_PLATFORM_LINUX)
-#ifdef assert
-#undef assert
-#if defined(USE_AZ_ASSERT)
-#define assert(condition) AZ_Assert(condition, "")
-#else
-#define assert CRY_ASSERT
-#endif
-#endif // !defined(AZ_PLATFORM_LINUX)
-#endif
-#endif
-
-
-#endif // CRYINCLUDE_EDITOR_EDITORDEFS_H
diff --git a/Code/Sandbox/Editor/EditorEnvironment.cpp b/Code/Sandbox/Editor/EditorEnvironment.cpp
deleted file mode 100644
index 6a08437d9e..0000000000
--- a/Code/Sandbox/Editor/EditorEnvironment.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorEnvironment.h"
-
-void SetEditorEnvironment(SSystemGlobalEnvironment* pEnv)
-{
-    assert(!gEnv || gEnv != pEnv);
-    gEnv = pEnv;
-}
-
-void AttachEditorAZEnvironment(AZ::EnvironmentInstance azEnv)
-{
-    AZ::Environment::Attach(azEnv, true);
-}
-
-void DetachEditorAZEnvironment()
-{
-    AZ::Environment::Detach();
-}
diff --git a/Code/Sandbox/Editor/EditorEnvironment.h b/Code/Sandbox/Editor/EditorEnvironment.h
deleted file mode 100644
index 45ba43a63c..0000000000
--- a/Code/Sandbox/Editor/EditorEnvironment.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <SandboxAPI.h>
-#include <AzCore/Module/Environment.h>
-
-SANDBOX_API void  SetEditorEnvironment(struct SSystemGlobalEnvironment* pEnv);
-
-SANDBOX_API void AttachEditorAZEnvironment(AZ::EnvironmentInstance azEnv);
-
-SANDBOX_API void DetachEditorAZEnvironment();
diff --git a/Code/Sandbox/Editor/EditorFileMonitor.cpp b/Code/Sandbox/Editor/EditorFileMonitor.cpp
deleted file mode 100644
index 77b3093142..0000000000
--- a/Code/Sandbox/Editor/EditorFileMonitor.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "EditorFileMonitor.h"
-
-// Editor
-#include "CryEdit.h"
-
-//////////////////////////////////////////////////////////////////////////
-CEditorFileMonitor::CEditorFileMonitor()
-{
-    GetIEditor()->RegisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CEditorFileMonitor::~CEditorFileMonitor()
-{
-    CFileChangeMonitor::DeleteInstance();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEditorFileMonitor::OnEditorNotifyEvent(EEditorNotifyEvent ev)
-{
-    if (ev == eNotify_OnInit)
-    {
-        // We don't want the file monitor to be enabled while
-        // in console mode...
-        if (!GetIEditor()->IsInConsolewMode())
-        {
-            MonitorDirectories();
-        }
-
-        CFileChangeMonitor::Instance()->Subscribe(this);
-    }
-    else if (ev == eNotify_OnQuit)
-    {
-        CFileChangeMonitor::Instance()->StopMonitor();
-        GetIEditor()->UnregisterNotifyListener(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CEditorFileMonitor::RegisterListener(IFileChangeListener* pListener, const char* sMonitorItem)
-{
-    return RegisterListener(pListener, sMonitorItem, "*");
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-static string CanonicalizePath(const char* path)
-{
-    auto canon = QFileInfo(path).canonicalFilePath();
-    return canon.isEmpty() ? string(path) : string(canon.toUtf8());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CEditorFileMonitor::RegisterListener(IFileChangeListener* pListener, const char* sFolderRelativeToGame, const char* sExtension)
-{
-    bool success = true;
-
-    string gameFolder = Path::GetEditingGameDataFolder().c_str();
-    string naivePath;
-    CFileChangeMonitor* fileChangeMonitor = CFileChangeMonitor::Instance();
-    AZ_Assert(fileChangeMonitor, "CFileChangeMonitor singleton missing.");
-
-    naivePath += gameFolder;
-    // Append slash in preparation for appending the second part.
-    naivePath = PathUtil::AddSlash(naivePath);
-    naivePath += sFolderRelativeToGame;
-    naivePath.replace('/', '\\');
-
-    // Remove the final slash if the given item is a folder so the file change monitor correctly picks up on it.
-    naivePath = PathUtil::RemoveSlash(naivePath);
-
-    string canonicalizedPath = CanonicalizePath(naivePath.c_str());
-
-    if (fileChangeMonitor->IsDirectory(canonicalizedPath.c_str()) || fileChangeMonitor->IsFile(canonicalizedPath.c_str()))
-    {
-        if (fileChangeMonitor->MonitorItem(canonicalizedPath.c_str()))
-        {
-            m_vecFileChangeCallbacks.push_back(SFileChangeCallback(pListener, sFolderRelativeToGame, sExtension));
-        }
-        else
-        {
-            CryLogAlways("File Monitor: [%s] not found outside of PAK files. Monitoring disabled for this item", sFolderRelativeToGame);
-            success = false;
-        }
-    }
-
-    return success;
-}
-
-bool CEditorFileMonitor::UnregisterListener(IFileChangeListener* pListener)
-{
-    bool bRet = false;
-
-    // Note that we remove the listener, but we don't currently remove the monitored item
-    // from the file monitor. This is fine, but inefficient
-
-    std::vector<SFileChangeCallback>::iterator iter = m_vecFileChangeCallbacks.begin();
-    while (iter != m_vecFileChangeCallbacks.end())
-    {
-        if (iter->pListener == pListener)
-        {
-            iter = m_vecFileChangeCallbacks.erase(iter);
-            bRet = true;
-        }
-        else
-        {
-            iter++;
-        }
-    }
-
-    return bRet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEditorFileMonitor::MonitorDirectories()
-{
-    QString primaryCD = Path::AddPathSlash(QString(GetIEditor()->GetPrimaryCDFolder()));
-
-    // NOTE: Instead of monitoring each sub-directory we monitor the whole root
-    // folder. This is needed since if the sub-directory does not exist when
-    // we register it it will never get monitored properly.
-    CFileChangeMonitor::Instance()->MonitorItem(QStringLiteral("%1/%2/").arg(primaryCD).arg(QString::fromLatin1(Path::GetEditingGameDataFolder().c_str())));
-
-    // Add editor directory for scripts
-    CFileChangeMonitor::Instance()->MonitorItem(QStringLiteral("%1/Editor/").arg(primaryCD));
-}
-
-QString RemoveGameName(const QString &filename)
-{
-    // Remove first part of path.  File coming in has the game name included
-    // eg (AutomatedTesting/Animations/Chicken/anim_chicken_flapping.i_caf)->(Animations/Chicken/anim_chicken_flapping.i_caf)
-
-    int indexOfFirstSlash = filename.indexOf('/');
-    int indexOfFirstBackSlash = filename.indexOf('\\');
-    if (indexOfFirstSlash >= 0)
-    {
-        if (indexOfFirstBackSlash >= 0 && indexOfFirstBackSlash < indexOfFirstSlash)
-        {
-            indexOfFirstSlash = indexOfFirstBackSlash;
-        }
-    }
-    else
-    {
-        indexOfFirstSlash = indexOfFirstBackSlash;
-    }
-    return filename.mid(indexOfFirstSlash + 1);
-}
-///////////////////////////////////////////////////////////////////////////
-
-// Called when file monitor message is received
-void CEditorFileMonitor::OnFileMonitorChange(const SFileChangeInfo& rChange)
-{
-    CCryEditApp* app = CCryEditApp::instance();
-    if (app == NULL || app->IsExiting())
-    {
-        return;
-    }
-
-    // skip folders!
-    if (QFileInfo(rChange.filename).isDir())
-    {
-        return;
-    }
-
-    // Process updated file.
-    // Make file relative to PrimaryCD folder.
-    QString filename = rChange.filename;
-
-    // Remove game directory if present in path.
-    const QString rootPath =
-        QDir::fromNativeSeparators(QString::fromLatin1(Path::GetEditingRootFolder().c_str()));
-    if (filename.startsWith(rootPath, Qt::CaseInsensitive))
-    {
-        filename = filename.right(filename.length() - rootPath.length());
-    }
-
-    // Make sure there is no leading slash
-    if (!filename.isEmpty() && (filename[0] == '\\' || filename[0] == '/'))
-    {
-        filename = filename.mid(1);
-    }
-
-    if (!filename.isEmpty())
-    {
-        //remove game name. Make it relative to the game folder
-        const QString filenameRelGame = RemoveGameName(filename);
-        const int extIndex = filename.lastIndexOf('.');
-        const QString ext = filename.right(filename.length() - 1 - extIndex);
-
-        // Check for File Monitor callback
-        std::vector<SFileChangeCallback>::iterator iter;
-        for (iter = m_vecFileChangeCallbacks.begin(); iter != m_vecFileChangeCallbacks.end(); ++iter)
-        {
-            SFileChangeCallback& sCallback = *iter;
-
-            // We compare against length of callback string, so we get directory matches as well as full filenames
-            if (sCallback.pListener)
-            {
-                if (sCallback.extension == "*" || ext.compare(sCallback.extension, Qt::CaseInsensitive) == 0)
-                {
-                    if (filenameRelGame.compare(sCallback.item, Qt::CaseInsensitive) == 0)
-                    {
-                        sCallback.pListener->OnFileChange(qPrintable(filenameRelGame), IFileChangeListener::EChangeType(rChange.changeType));
-                    }
-                    else if (filename.compare(sCallback.item, Qt::CaseInsensitive) == 0)
-                    {
-                        sCallback.pListener->OnFileChange(qPrintable(filename), IFileChangeListener::EChangeType(rChange.changeType));
-                    }
-                }
-            }
-        }
-
-        // Set this flag to make sure that the viewport will update at least once,
-        // so that the changes will be shown, even if the app does not have focus.
-        CCryEditApp::instance()->ForceNextIdleProcessing();
-    }
-}
diff --git a/Code/Sandbox/Editor/EditorFileMonitor.h b/Code/Sandbox/Editor/EditorFileMonitor.h
deleted file mode 100644
index bb2696a646..0000000000
--- a/Code/Sandbox/Editor/EditorFileMonitor.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_EDITORFILEMONITOR_H
-#define CRYINCLUDE_EDITOR_EDITORFILEMONITOR_H
-#pragma once
-#include "Include/IEditorFileMonitor.h"
-#include "Util/FileChangeMonitor.h"
-
-class CEditorFileMonitor
-    : public IEditorFileMonitor
-    , public CFileChangeMonitorListener
-    , public IEditorNotifyListener
-{
-public:
-    CEditorFileMonitor();
-    ~CEditorFileMonitor();
-
-    bool RegisterListener(IFileChangeListener* pListener, const char* filename) override;
-    bool RegisterListener(IFileChangeListener* pListener, const char* folderRelativeToGame, const char* ext) override;
-    bool UnregisterListener(IFileChangeListener* pListener) override;
-
-    // from CFileChangeMonitorListener
-    void OnFileMonitorChange(const SFileChangeInfo& rChange) override;
-
-    // from IEditorNotifyListener
-    void OnEditorNotifyEvent(EEditorNotifyEvent ev) override;
-private:
-
-    void MonitorDirectories();
-    // File Change Monitor stuff
-    struct SFileChangeCallback
-    {
-        IFileChangeListener* pListener;
-        QString item;
-        QString extension;
-
-        SFileChangeCallback()
-            : pListener(NULL)
-        {}
-
-        SFileChangeCallback(IFileChangeListener* pListener, const char* item, const char* extension)
-            : pListener(pListener)
-            , item(item)
-            , extension(extension)
-        {}
-    };
-
-    std::vector<SFileChangeCallback> m_vecFileChangeCallbacks;
-};
-
-#endif // CRYINCLUDE_EDITOR_EDITORFILEMONITOR_H
diff --git a/Code/Sandbox/Editor/EditorPanelUtils.cpp b/Code/Sandbox/Editor/EditorPanelUtils.cpp
deleted file mode 100644
index 27a123f3b8..0000000000
--- a/Code/Sandbox/Editor/EditorPanelUtils.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-#include "EditorDefs.h"
-
-#include "EditorPanelUtils.h"
-
-#include <AzCore/Utils/Utils.h>
-
-// Qt
-#include <QInputDialog>
-#include <QFileDialog>
-#include <QXmlStreamReader>
-
-// Editor
-#include "IEditorPanelUtils.h"
-#include "Objects/EntityObject.h"
-#include "CryEditDoc.h"
-#include "ViewManager.h"
-#include "Controls/QToolTipWidget.h"
-#include "Objects/SelectionGroup.h"
-
-
-
-#ifndef PI
-#define PI 3.14159265358979323f
-#endif
-
-
-struct ToolTip
-{
-    bool isValid;
-    QString title;
-    QString content;
-    QString specialContent;
-    QString disabledContent;
-};
-
-// internal implementation for better compile times - should also never be used externally, use IParticleEditorUtils interface for that.
-class CEditorPanelUtils_Impl
-    : public IEditorPanelUtils
-{
-    #pragma region Drag & Drop
-public:
-    virtual void SetViewportDragOperation(void(* dropCallback)(CViewport* viewport, int dragPointX, int dragPointY, void* custom), void* custom) override
-    {
-        for (int i = 0; i < GetIEditor()->GetViewManager()->GetViewCount(); i++)
-        {
-            GetIEditor()->GetViewManager()->GetView(i)->SetGlobalDropCallback(dropCallback, custom);
-        }
-    }
-    #pragma endregion
-    #pragma region Preview Window
-public:
-
-    virtual int PreviewWindow_GetDisplaySettingsDebugFlags(CDisplaySettings* settings)
-    {
-        CRY_ASSERT(settings);
-        return settings->GetDebugFlags();
-    }
-
-    virtual void PreviewWindow_SetDisplaySettingsDebugFlags(CDisplaySettings* settings, int flags)
-    {
-        CRY_ASSERT(settings);
-        settings->SetDebugFlags(flags);
-    }
-
-    #pragma endregion
-    #pragma region Shortcuts
-protected:
-    QVector<HotKey> hotkeys;
-    bool m_hotkeysAreEnabled;
-public:
-
-    virtual bool HotKey_Import() override
-    {
-        QVector<QPair<QString, QString> > keys;
-        QString filepath = QFileDialog::getOpenFileName(nullptr, "Select shortcut configuration to load",
-                QString(), "HotKey Config Files (*.hkxml)");
-        QFile file(filepath);
-        if (!file.open(QIODevice::ReadOnly))
-        {
-            return false;
-        }
-        QXmlStreamReader stream(&file);
-        bool result = true;
-
-        while (!stream.isEndDocument())
-        {
-            if (stream.isStartElement())
-            {
-                if (stream.name() == "HotKey")
-                {
-                    QPair<QString, QString> key;
-                    QXmlStreamAttributes att = stream.attributes();
-                    for (QXmlStreamAttribute attr : att)
-                    {
-                        if (attr.name().compare(QLatin1String("path"), Qt::CaseInsensitive) == 0)
-                        {
-                            key.first = attr.value().toString();
-                        }
-                        if (attr.name().compare(QLatin1String("sequence"), Qt::CaseInsensitive) == 0)
-                        {
-                            key.second = attr.value().toString();
-                        }
-                    }
-                    if (!key.first.isEmpty())
-                    {
-                        keys.push_back(key); // we allow blank key sequences for unassigned shortcuts
-                    }
-                    else
-                    {
-                        result = false; //but not blank paths!
-                    }
-                }
-            }
-            stream.readNext();
-        }
-        file.close();
-
-        if (result)
-        {
-            HotKey_BuildDefaults();
-            for (QPair<QString, QString> key : keys)
-            {
-                for (unsigned int j = 0; j < hotkeys.count(); j++)
-                {
-                    if (hotkeys[j].path.compare(key.first, Qt::CaseInsensitive) == 0)
-                    {
-                        hotkeys[j].SetPath(key.first.toStdString().c_str());
-                        hotkeys[j].SetSequenceFromString(key.second.toStdString().c_str());
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    virtual void HotKey_Export() override
-    {
-        auto settingDir = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Editor" / "Plugins" / "ParticleEditorPlugin" / "settings";
-        QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", settingDir.c_str(), "HotKey Config Files (*.hkxml)");
-        QFile file(filepath);
-        if (!file.open(QIODevice::WriteOnly))
-        {
-            return;
-        }
-
-        QXmlStreamWriter stream(&file);
-        stream.setAutoFormatting(true);
-        stream.writeStartDocument();
-        stream.writeStartElement("HotKeys");
-
-        for (HotKey key : hotkeys)
-        {
-            stream.writeStartElement("HotKey");
-            stream.writeAttribute("path", key.path);
-            stream.writeAttribute("sequence", key.sequence.toString());
-            stream.writeEndElement();
-        }
-        stream.writeEndElement();
-        stream.writeEndDocument();
-        file.close();
-    }
-
-    virtual QKeySequence HotKey_GetShortcut(const char* path) override
-    {
-        for (HotKey combo : hotkeys)
-        {
-            if (combo.IsMatch(path))
-            {
-                return combo.sequence;
-            }
-        }
-        return QKeySequence();
-    }
-
-    virtual bool HotKey_IsPressed(const QKeyEvent* event, const char* path) override
-    {
-        if (!m_hotkeysAreEnabled)
-        {
-            return false;
-        }
-        unsigned int keyInt = 0;
-        //Capture any modifiers
-        Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers();
-        if (modifiers & Qt::ShiftModifier)
-        {
-            keyInt += Qt::SHIFT;
-        }
-        if (modifiers & Qt::ControlModifier)
-        {
-            keyInt += Qt::CTRL;
-        }
-        if (modifiers & Qt::AltModifier)
-        {
-            keyInt += Qt::ALT;
-        }
-        if (modifiers & Qt::MetaModifier)
-        {
-            keyInt += Qt::META;
-        }
-        //Capture any key
-        keyInt += event->key();
-
-        QString t0 = QKeySequence(keyInt).toString();
-        QString t1 = HotKey_GetShortcut(path).toString();
-
-        //if strings match then shortcut is pressed
-        if (t1.compare(t0, Qt::CaseInsensitive) == 0)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    virtual bool HotKey_IsPressed(const QShortcutEvent* event, const char* path) override
-    {
-        if (!m_hotkeysAreEnabled)
-        {
-            return false;
-        }
-
-        QString t0 = event->key().toString();
-        QString t1 = HotKey_GetShortcut(path).toString();
-
-        //if strings match then shortcut is pressed
-        if (t1.compare(t0, Qt::CaseInsensitive) == 0)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    virtual bool HotKey_LoadExisting() override
-    {
-        QSettings settings("Amazon", "O3DE");
-        QString group = "Hotkeys/";
-
-        HotKey_BuildDefaults();
-
-        int size = settings.beginReadArray(group);
-
-        for (int i = 0; i < size; i++)
-        {
-            settings.setArrayIndex(i);
-            QPair<QString, QString> hotkey;
-            hotkey.first = settings.value("name").toString();
-            hotkey.second = settings.value("keySequence").toString();
-            if (!hotkey.first.isEmpty())
-            {
-                for (unsigned int j = 0; j < hotkeys.count(); j++)
-                {
-                    if (hotkeys[j].path.compare(hotkey.first, Qt::CaseInsensitive) == 0)
-                    {
-                        hotkeys[j].SetPath(hotkey.first.toStdString().c_str());
-                        hotkeys[j].SetSequenceFromString(hotkey.second.toStdString().c_str());
-                    }
-                }
-            }
-        }
-
-        settings.endArray();
-        if (hotkeys.isEmpty())
-        {
-            return false;
-        }
-        return true;
-    }
-
-    virtual void HotKey_SaveCurrent() override
-    {
-        QSettings settings("Amazon", "O3DE");
-        QString group = "Hotkeys/";
-        settings.remove("Hotkeys/");
-        settings.sync();
-        settings.beginWriteArray(group);
-        int saveIndex = 0;
-        for (HotKey key : hotkeys)
-        {
-            if (!key.path.isEmpty())
-            {
-                settings.setArrayIndex(saveIndex++);
-                settings.setValue("name", key.path);
-                settings.setValue("keySequence", key.sequence.toString());
-            }
-        }
-        settings.endArray();
-        settings.sync();
-    }
-
-    virtual void HotKey_BuildDefaults() override
-    {
-        m_hotkeysAreEnabled = true;
-        QVector<QPair<QString, QString> > keys;
-        while (hotkeys.count() > 0)
-        {
-            hotkeys.takeAt(0);
-        }
-
-        //MENU SELECTION SHORTCUTS////////////////////////////////////////////////
-        keys.push_back(QPair<QString, QString>("Menus.File Menu", "Alt+F"));
-        keys.push_back(QPair<QString, QString>("Menus.Edit Menu", "Alt+E"));
-        keys.push_back(QPair<QString, QString>("Menus.View Menu", "Alt+V"));
-        //FILE MENU SHORTCUTS/////////////////////////////////////////////////////
-        keys.push_back(QPair<QString, QString>("File Menu.Create new emitter", "Ctrl+N"));
-        keys.push_back(QPair<QString, QString>("File Menu.Create new library", "Ctrl+Shift+N"));
-        keys.push_back(QPair<QString, QString>("File Menu.Create new folder", ""));
-        keys.push_back(QPair<QString, QString>("File Menu.Import", "Ctrl+I"));
-        keys.push_back(QPair<QString, QString>("File Menu.Import level library", "Ctrl+Shift+I"));
-        keys.push_back(QPair<QString, QString>("File Menu.Save", "Ctrl+S"));
-        keys.push_back(QPair<QString, QString>("File Menu.Close", "Ctrl+Q"));
-        //EDIT MENU SHORTCUTS/////////////////////////////////////////////////////
-        keys.push_back(QPair<QString, QString>("Edit Menu.Copy", "Ctrl+C"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Paste", "Ctrl+V"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Duplicate", "Ctrl+D"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Undo", "Ctrl+Z"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Redo", "Ctrl+Shift+Z"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Group", "Ctrl+G"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Ungroup", "Ctrl+Shift+G"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Rename", "Ctrl+R"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Reset", ""));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Edit Hotkeys", ""));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Assign to selected", "Ctrl+Space"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Insert Comment", "Ctrl+Alt+M"));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Enable/Disable Emitter", "Ctrl+E"));
-        keys.push_back(QPair<QString, QString>("File Menu.Enable All", ""));
-        keys.push_back(QPair<QString, QString>("File Menu.Disable All", ""));
-        keys.push_back(QPair<QString, QString>("Edit Menu.Delete", "Del"));
-        //VIEW MENU SHORTCUTS/////////////////////////////////////////////////////
-        keys.push_back(QPair<QString, QString>("View Menu.Reset Layout", ""));
-        //PLAYBACK CONTROL////////////////////////////////////////////////////////
-        keys.push_back(QPair<QString, QString>("Previewer.Play/Pause Toggle", "Space"));
-        keys.push_back(QPair<QString, QString>("Previewer.Step forward through time", "c"));
-        keys.push_back(QPair<QString, QString>("Previewer.Loop Toggle", "z"));
-        keys.push_back(QPair<QString, QString>("Previewer.Reset Playback", "x"));
-        keys.push_back(QPair<QString, QString>("Previewer.Focus", "Ctrl+F"));
-        keys.push_back(QPair<QString, QString>("Previewer.Zoom In", "w"));
-        keys.push_back(QPair<QString, QString>("Previewer.Zoom Out", "s"));
-        keys.push_back(QPair<QString, QString>("Previewer.Pan Left", "a"));
-        keys.push_back(QPair<QString, QString>("Previewer.Pan Right", "d"));
-
-        for (QPair<QString, QString> key : keys)
-        {
-            unsigned int index = hotkeys.count();
-            hotkeys.push_back(HotKey());
-            hotkeys[index].SetPath(key.first.toStdString().c_str());
-            hotkeys[index].SetSequenceFromString(key.second.toStdString().c_str());
-        }
-    }
-
-    virtual void HotKey_SetKeys(QVector<HotKey> keys) override
-    {
-        hotkeys = keys;
-    }
-
-    virtual QVector<HotKey> HotKey_GetKeys() override
-    {
-        return hotkeys;
-    }
-
-    virtual QString HotKey_GetPressedHotkey(const QKeyEvent* event) override
-    {
-        if (!m_hotkeysAreEnabled)
-        {
-            return "";
-        }
-        for (HotKey key : hotkeys)
-        {
-            if (HotKey_IsPressed(event, key.path.toUtf8()))
-            {
-                return key.path;
-            }
-        }
-        return "";
-    }
-    virtual QString HotKey_GetPressedHotkey(const QShortcutEvent* event) override
-    {
-        if (!m_hotkeysAreEnabled)
-        {
-            return "";
-        }
-        for (HotKey key : hotkeys)
-        {
-            if (HotKey_IsPressed(event, key.path.toUtf8()))
-            {
-                return key.path;
-            }
-        }
-        return "";
-    }
-    //building the default hotkey list re-enables hotkeys
-    //do not use this when rebuilding the default list is a possibility.
-    virtual void HotKey_SetEnabled(bool val) override
-    {
-        m_hotkeysAreEnabled = val;
-    }
-
-    virtual bool HotKey_IsEnabled() const override
-    {
-        return m_hotkeysAreEnabled;
-    }
-
-    #pragma  endregion
-    #pragma region ToolTip
-protected:
-    QMap<QString, ToolTip> m_tooltips;
-
-    void ToolTip_ParseNode(XmlNodeRef node)
-    {
-        if (QString(node->getTag()).compare("tooltip", Qt::CaseInsensitive) != 0)
-        {
-            unsigned int childCount = node->getChildCount();
-
-            for (unsigned int i = 0; i < childCount; i++)
-            {
-                ToolTip_ParseNode(node->getChild(i));
-            }
-        }
-
-        QString title = node->getAttr("title");
-        QString content = node->getAttr("content");
-        QString specialContent = node->getAttr("special_content");
-        QString disabledContent = node->getAttr("disabled_content");
-
-        QMap<QString, ToolTip>::iterator itr = m_tooltips.insert(node->getAttr("path"), ToolTip());
-        itr->isValid = true;
-        itr->title = title;
-        itr->content = content;
-        itr->specialContent = specialContent;
-        itr->disabledContent = disabledContent;
-
-        unsigned int childCount = node->getChildCount();
-
-        for (unsigned int  i = 0; i < childCount; i++)
-        {
-            ToolTip_ParseNode(node->getChild(i));
-        }
-    }
-
-    ToolTip GetToolTip(QString path)
-    {
-        if (m_tooltips.contains(path))
-        {
-            return m_tooltips[path];
-        }
-        ToolTip temp;
-        temp.isValid = false;
-        return temp;
-    }
-
-public:
-    virtual void ToolTip_LoadConfigXML(QString filepath) override
-    {
-        XmlNodeRef node = GetIEditor()->GetSystem()->LoadXmlFromFile(filepath.toStdString().c_str());
-        ToolTip_ParseNode(node);
-    }
-
-    virtual void ToolTip_BuildFromConfig(IQToolTip* tooltip, QString path, QString option, QString optionalData = "", bool isEnabled = true)
-    {
-        AZ_Assert(tooltip, "tooltip cannot be null");
-
-        QString title = ToolTip_GetTitle(path, option);
-        QString content = ToolTip_GetContent(path, option);
-        QString specialContent = ToolTip_GetSpecialContentType(path, option);
-        QString disabledContent = ToolTip_GetDisabledContent(path, option);
-
-        // Even if these items are empty, we set them anyway to clear out any data that was left over from when the tooltip was used for a different object.
-        tooltip->SetTitle(title);
-        tooltip->SetContent(content);
-
-        //this only handles simple creation...if you need complex call this then add specials separate
-        if (!specialContent.contains("::"))
-        {
-            tooltip->AddSpecialContent(specialContent, optionalData);
-        }
-
-        if (!isEnabled) // If disabled, add disabled value
-        {
-            tooltip->AppendContent(disabledContent);
-        }
-    }
-
-    virtual QString ToolTip_GetTitle(QString path, QString option) override
-    {
-        if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
-        {
-            return GetToolTip(path + "." + option).title;
-        }
-        if (!option.isEmpty() && GetToolTip("Options." + option).isValid)
-        {
-            return GetToolTip("Options." + option).title;
-        }
-        return GetToolTip(path).title;
-    }
-
-    virtual QString ToolTip_GetContent(QString path, QString option) override
-    {
-        if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
-        {
-            return GetToolTip(path + "." + option).content;
-        }
-        if (!option.isEmpty() && GetToolTip("Options." + option).isValid)
-        {
-            return GetToolTip("Options." + option).content;
-        }
-        return GetToolTip(path).content;
-    }
-
-    virtual QString ToolTip_GetSpecialContentType(QString path, QString option) override
-    {
-        if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
-        {
-            return GetToolTip(path + "." + option).specialContent;
-        }
-        if (!option.isEmpty() && GetToolTip("Options." + option).isValid)
-        {
-            return GetToolTip("Options." + option).specialContent;
-        }
-        return GetToolTip(path).specialContent;
-    }
-
-    virtual QString ToolTip_GetDisabledContent(QString path, QString option) override
-    {
-        if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
-        {
-            return GetToolTip(path + "." + option).disabledContent;
-        }
-        if (!option.isEmpty() && GetToolTip("Options." + option).isValid)
-        {
-            return GetToolTip("Options." + option).disabledContent;
-        }
-        return GetToolTip(path).disabledContent;
-    }
-    #pragma endregion ToolTip
-};
-
-IEditorPanelUtils* CreateEditorPanelUtils()
-{
-    return new CEditorPanelUtils_Impl();
-}
-
diff --git a/Code/Sandbox/Editor/EditorPanelUtils.h b/Code/Sandbox/Editor/EditorPanelUtils.h
deleted file mode 100644
index 80d83fe554..0000000000
--- a/Code/Sandbox/Editor/EditorPanelUtils.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-// Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#ifndef CRYINCLUDE_CRYEDITOR_EDITORPANELUTILS_H
-#define CRYINCLUDE_CRYEDITOR_EDITORPANELUTILS_H
-#pragma once
-
-struct IEditorPanelUtils;
-IEditorPanelUtils* CreateEditorPanelUtils();
-
-#endif
diff --git a/Code/Sandbox/Editor/EditorPreferencesBus.h b/Code/Sandbox/Editor/EditorPreferencesBus.h
deleted file mode 100644
index a854a94411..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesBus.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-//! Allows handlers to be notified when settings are changed to refresh accordingly
-class EditorPreferencesNotifications
-    : public AZ::EBusTraits
-{
-public:
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        
-    //! Notifies about changes in the Editor Preferences
-    virtual void OnEditorPreferencesChanged() {}
-};
-using EditorPreferencesNotificationBus = AZ::EBus<EditorPreferencesNotifications>;
diff --git a/Code/Sandbox/Editor/EditorPreferencesDialog.cpp b/Code/Sandbox/Editor/EditorPreferencesDialog.cpp
deleted file mode 100644
index ffcd4f241d..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesDialog.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesDialog.h"
-
-// AzQtComponents
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-#include <AzQtComponents/Components/StyleManager.h>
-
-#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
-
-#include "EditorPreferencesTreeWidgetItemDelegate.h"
-
-// Editor
-#include "MainWindow.h"
-#include "EditorPreferencesTreeWidgetItem.h"
-#include "PreferencesStdPages.h"
-#include "DisplaySettings.h"
-#include "CryEditDoc.h"
-#include "Controls/ConsoleSCB.h"
-#include "EditorPreferencesPageGeneral.h"
-#include "EditorPreferencesPageFiles.h"
-#include "EditorPreferencesPageViewportGeneral.h"
-#include "EditorPreferencesPageViewportGizmo.h"
-#include "EditorPreferencesPageViewportMovement.h"
-#include "EditorPreferencesPageViewportDebug.h"
-#include "EditorPreferencesPageExperimentalLighting.h"
-#include "EditorPreferencesPageAWS.h"
-#include "LyViewPaneNames.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_EditorPreferencesDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-using namespace AzQtComponents;
-
-EditorPreferencesDialog::EditorPreferencesDialog(QWidget* pParent)
-    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, pParent))
-    , ui(new Ui::EditorPreferencesDialog)
-    , m_currentPageItem(nullptr)
-{
-    ui->setupUi(this);
-
-    ui->filter->SetTypeFilterVisible(false);
-    connect(ui->filter, &FilteredSearchWidget::TextFilterChanged, this, &EditorPreferencesDialog::SetFilter);
-
-    AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(serializeContext, "Serialization context not available");
-
-    static bool bAlreadyRegistered = false;
-    if (!bAlreadyRegistered)
-    {
-        bAlreadyRegistered = true;
-        GetIEditor()->GetClassFactory()->RegisterClass(new CStdPreferencesClassDesc);
-
-        if (serializeContext)
-        {
-            CEditorPreferencesPage_General::Reflect(*serializeContext);
-            CEditorPreferencesPage_Files::Reflect(*serializeContext);
-            CEditorPreferencesPage_ViewportGeneral::Reflect(*serializeContext);
-            CEditorPreferencesPage_ViewportGizmo::Reflect(*serializeContext);
-            CEditorPreferencesPage_ViewportMovement::Reflect(*serializeContext);
-            CEditorPreferencesPage_ViewportDebug::Reflect(*serializeContext);
-            CEditorPreferencesPage_ExperimentalLighting::Reflect(*serializeContext);
-            CEditorPreferencesPage_AWS::Reflect(*serializeContext);
-        }
-    }
-
-    ui->propertyEditor->SetAutoResizeLabels(true);
-    ui->propertyEditor->Setup(serializeContext, this, true, 250);
-
-    ui->pageTree->setColumnCount(1);
-
-    // There are no expandable categories, so hide the column.
-    ui->pageTree->setRootIsDecorated(false);
-
-    // Set the delegate so we can use the svg icons.
-    ui->pageTree->setItemDelegate(new EditorPreferencesTreeWidgetItemDelegate(ui->pageTree));
-
-    // Shrink the spacer so that the search bar fills the dialog.
-    ui->horizontalSpacer_2->changeSize(0, 0, QSizePolicy::Maximum);
-
-    connect(ui->pageTree, &QTreeWidget::currentItemChanged, this, &EditorPreferencesDialog::OnTreeCurrentItemChanged);
-
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &EditorPreferencesDialog::OnAccept);
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &EditorPreferencesDialog::OnReject);
-    connect(ui->MANAGE_BTN, &QPushButton::clicked, this, &EditorPreferencesDialog::OnManage);
-
-    AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral("style:EditorPreferencesDialog.qss"));
-}
-
-EditorPreferencesDialog::~EditorPreferencesDialog()
-{
-}
-
-void EditorPreferencesDialog::showEvent(QShowEvent* event)
-{
-    origAutoBackup.bEnabled = gSettings.autoBackupEnabled;
-    origAutoBackup.nTime = gSettings.autoBackupTime;
-    origAutoBackup.nRemindTime = gSettings.autoRemindTime;
-
-    CreateImages();
-    CreatePages();
-    ui->pageTree->setCurrentItem(ui->pageTree->topLevelItem(0));
-    QDialog::showEvent(event);
-}
-
-void EditorPreferencesDialog::OnTreeCurrentItemChanged()
-{
-    QTreeWidgetItem* currentItem = ui->pageTree->currentItem();
-
-    if (currentItem->type() == EditorPreferencesTreeWidgetItem::EditorPreferencesPage)
-    {
-        EditorPreferencesTreeWidgetItem* currentPageItem = static_cast<EditorPreferencesTreeWidgetItem*>(currentItem);
-        if (currentPageItem != m_currentPageItem)
-        {
-            SetActivePage(currentPageItem);
-        }
-    }
-    else
-    {
-        if (m_currentPageItem == nullptr || m_currentPageItem->parent() != currentItem)
-        {
-            EditorPreferencesTreeWidgetItem* child = (EditorPreferencesTreeWidgetItem*)currentItem->child(0);
-            SetActivePage(child);
-        }
-    }
-}
-
-void EditorPreferencesDialog::OnAccept()
-{
-    // Call on OK for all pages.
-    QTreeWidgetItemIterator it(ui->pageTree);
-    while (*it)
-    {
-        QTreeWidgetItem* item = *it;
-        if (item->type() == EditorPreferencesTreeWidgetItem::EditorPreferencesPage)
-        {
-            EditorPreferencesTreeWidgetItem* pageItem = (EditorPreferencesTreeWidgetItem*)*it;
-            pageItem->GetPreferencesPage()->OnApply();
-        }
-        ++it;
-    }
-
-    // Save settings.
-    gSettings.Save();
-    GetIEditor()->GetDisplaySettings()->SaveRegistry();
-
-    if (GetIEditor()->GetDocument()->IsDocumentReady() && (
-            origAutoBackup.bEnabled != gSettings.autoBackupEnabled ||
-            origAutoBackup.nTime != gSettings.autoBackupTime ||
-            origAutoBackup.nRemindTime != gSettings.autoRemindTime))
-    {
-        MainWindow::instance()->ResetAutoSaveTimers(true);
-    }
-
-    AzToolsFramework::EditorPreferencesNotificationBus::Broadcast(&AzToolsFramework::EditorPreferencesNotifications::OnEditorPreferencesChanged);
-
-    accept();
-}
-
-void EditorPreferencesDialog::OnReject()
-{
-    // QueryCancel for all pages.
-    QTreeWidgetItemIterator it(ui->pageTree);
-    while (*it)
-    {
-        QTreeWidgetItem* item = *it;
-        if (item->type() == EditorPreferencesTreeWidgetItem::EditorPreferencesPage)
-        {
-            EditorPreferencesTreeWidgetItem* pageItem = (EditorPreferencesTreeWidgetItem*)*it;
-            if (!pageItem->GetPreferencesPage()->OnQueryCancel())
-            {
-                return;
-            }
-        }
-        ++it;
-    }
-
-    QTreeWidgetItemIterator cancelIt(ui->pageTree);
-    while (*cancelIt)
-    {
-        QTreeWidgetItem* item = *cancelIt;
-        if (item->type() == EditorPreferencesTreeWidgetItem::EditorPreferencesPage)
-        {
-            EditorPreferencesTreeWidgetItem* pageItem = (EditorPreferencesTreeWidgetItem*)*cancelIt;
-            pageItem->GetPreferencesPage()->OnCancel();
-        }
-        ++cancelIt;
-    }
-
-
-    reject();
-}
-
-void EditorPreferencesDialog::OnManage()
-{
-    GetIEditor()->OpenView(LyViewPane::EditorSettingsManager);
-    OnAccept();
-}
-
-void EditorPreferencesDialog::SetActivePage(EditorPreferencesTreeWidgetItem* pageItem)
-{
-    m_currentPageItem = pageItem;
-
-    ui->propertyEditor->ClearInstances();
-    IPreferencesPage* instance = m_currentPageItem->GetPreferencesPage();
-    const AZ::Uuid& classId = AZ::SerializeTypeInfo<IPreferencesPage>::GetUuid(instance);
-    ui->propertyEditor->AddInstance(instance, classId);
-    m_currentPageItem->UpdateEditorFilter(ui->propertyEditor, m_filter);
-
-    ui->propertyEditor->show();
-
-    // Refresh the Stylesheet - style would break on page load sometimes.
-    AzQtComponents::StyleManager::repolishStyleSheet(this);
-}
-
-void EditorPreferencesDialog::SetFilter(const QString& filter)
-{
-    m_filter = filter;
-
-    QTreeWidgetItem* firstVisiblePage = nullptr;
-
-    std::function<void(QTreeWidgetItem* item)> filterItem = [&](QTreeWidgetItem* item)
-    {
-        // Hide categories that have no pages remaining in them after filtering their pages
-        if (item->childCount() > 0)
-        {
-            bool shouldHide = true;
-            for (int i = item->childCount() - 1; i >= 0; --i)
-            {
-                QTreeWidgetItem* child = item->child(i);
-                filterItem(child);
-                shouldHide = shouldHide && child->isHidden();
-            }
-            item->setHidden(shouldHide);
-        }
-        else
-        {
-            EditorPreferencesTreeWidgetItem* pageItem = static_cast<EditorPreferencesTreeWidgetItem*>(item);
-            pageItem->Filter(filter);
-            if (!firstVisiblePage && !pageItem->isHidden())
-            {
-                firstVisiblePage = pageItem;
-            }
-        }
-    };
-    filterItem(ui->pageTree->invisibleRootItem());
-
-    // If we're searching and we don't have a current selection any more (the old page got filtered)
-    // go ahead and select the first valid page
-    if ((!m_currentPageItem || m_currentPageItem->isHidden())
-        && !filter.isEmpty() && firstVisiblePage)
-    {
-        ui->pageTree->setCurrentItem(firstVisiblePage);
-    }
-    else if (m_currentPageItem)
-    {
-        m_currentPageItem->UpdateEditorFilter(ui->propertyEditor, m_filter);
-    }
-}
-
-void EditorPreferencesDialog::CreateImages()
-{
-    m_selectedPixmap = QPixmap(":/res/Preferences_00.png");
-    m_unSelectedPixmap = QPixmap(":/res/Preferences_01.png");
-}
-
-void EditorPreferencesDialog::CreatePages()
-{
-    std::vector<IClassDesc*> classes;
-    GetIEditor()->GetClassFactory()->GetClassesBySystemID(ESYSTEM_CLASS_PREFERENCE_PAGE, classes);
-
-    for (int i = 0; i < classes.size(); i++)
-    {
-        auto pUnknown = classes[i];
-
-        IPreferencesPageCreator* pPageCreator = 0;
-        if (FAILED(pUnknown->QueryInterface(&pPageCreator)))
-        {
-            continue;
-        }
-
-        int numPages = pPageCreator->GetPagesCount();
-        for (int pindex = 0; pindex < numPages; pindex++)
-        {
-            IPreferencesPage* pPage = pPageCreator->CreateEditorPreferencesPage(pindex);
-            if (!pPage)
-            {
-                continue;
-            }
-
-            ui->pageTree->addTopLevelItem(new EditorPreferencesTreeWidgetItem(pPage, pPage->GetIcon()));
-        }
-    }
-}
-
-void EditorPreferencesDialog::AfterPropertyModified([[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-{
-    // ensure we refresh all the property editor values as it is possible for them to
-    // change based on other values (e.g. legacy ui and new viewport not being compatible)
-    ui->propertyEditor->InvalidateValues();
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesDialog.h b/Code/Sandbox/Editor/EditorPreferencesDialog.h
deleted file mode 100644
index 651055a50a..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesDialog.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <QDialog>
-#include <QScopedPointer>
-#include <QPixmap>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-
-namespace Ui
-{
-    class EditorPreferencesDialog;
-}
-
-class EditorPreferencesTreeWidgetItem;
-
-class EditorPreferencesDialog
-    : public QDialog
-    , public AzToolsFramework::IPropertyEditorNotify
-{
-public:
-    EditorPreferencesDialog(QWidget* pParent = nullptr);
-    ~EditorPreferencesDialog();
-
-    // IPropertyEditorNotify
-    void BeforePropertyModified([[maybe_unused]] AzToolsFramework::InstanceDataNode* node) override {}
-    void AfterPropertyModified(AzToolsFramework::InstanceDataNode* node) override;
-    void SetPropertyEditingActive([[maybe_unused]] AzToolsFramework::InstanceDataNode* node) override {}
-    void SetPropertyEditingComplete([[maybe_unused]] AzToolsFramework::InstanceDataNode* node) override {}
-    void SealUndoStack() override {}
-
-protected:
-    void showEvent(QShowEvent* event) override;
-
-private:
-    void CreateImages();
-    void CreatePages();
-    void SetActivePage(EditorPreferencesTreeWidgetItem* pageItem);
-    void SetFilter(const QString& filter);
-
-    void OnTreeCurrentItemChanged();
-    void OnReject();
-    void OnAccept();
-    void OnManage();
-
-    struct SAutoBackup
-    {
-        AZ_TYPE_INFO(SAutoBackup, "{547A0B74-B513-4A74-A27B-28256BE730E7}")
-
-        SAutoBackup()
-            : bEnabled(false)
-            , nTime(0)
-            , nRemindTime(0) { }
-
-        bool bEnabled;
-        int nTime;
-        int nRemindTime;
-    };
-    SAutoBackup origAutoBackup;
-
-    QScopedPointer<Ui::EditorPreferencesDialog> ui;
-
-    QPixmap m_selectedPixmap;
-    QPixmap m_unSelectedPixmap;
-    EditorPreferencesTreeWidgetItem* m_currentPageItem;
-    QString m_filter;
-};
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageAWS.cpp b/Code/Sandbox/Editor/EditorPreferencesPageAWS.cpp
deleted file mode 100644
index 6db7daa92e..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageAWS.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageAWS.h"
-
-// AzCore
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/Jobs/JobFunction.h>
-
-void CEditorPreferencesPage_AWS::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<UsageOptions>()
-        ->Version(1)
-        ->Field("AWSAttributionEnabled", &UsageOptions::m_awsAttributionEnabled);
-
-    serialize.Class<CEditorPreferencesPage_AWS>()
-        ->Version(1)
-        ->Field("UsageOptions", &CEditorPreferencesPage_AWS::m_usageOptions);
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<UsageOptions>("Options", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &UsageOptions::m_awsAttributionEnabled, "Allow O3DE to send information about your use of AWS Core Gem to AWS",
-            "");
-
-        editContext->Class<CEditorPreferencesPage_AWS>("AWS Preferences", "AWS Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_AWS::m_usageOptions, "AWS Data Collection and Use", "AWS Data Collection and Use");
-    }
-}
-
-
-CEditorPreferencesPage_AWS::CEditorPreferencesPage_AWS()
-{
-    m_settingsRegistry = AZStd::make_unique<AZ::SettingsRegistryImpl>();
-    InitializeSettings();
-    m_icon = QIcon(":/res/AWS_preferences_icon.svg");
-}
-
-CEditorPreferencesPage_AWS::~CEditorPreferencesPage_AWS()
-{
-    m_settingsRegistry.reset();
-}
-
-const char* CEditorPreferencesPage_AWS::GetTitle()
-{
-    return "Cloud";
-}
-
-QIcon& CEditorPreferencesPage_AWS::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_AWS::OnApply()
-{
-    m_settingsRegistry->Set(AWSAttributionEnabledKey, m_usageOptions.m_awsAttributionEnabled);
-    SaveSettingsRegistryFile();
-}
-
-const CEditorPreferencesPage_AWS::UsageOptions& CEditorPreferencesPage_AWS::GetUsageOptions()
-{
-    return m_usageOptions;
-}
-
-void CEditorPreferencesPage_AWS::SaveSettingsRegistryFile()
-{
-    AZ::Job* job = AZ::CreateJobFunction(
-        [this]()
-        {
-            AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-            AZ_Assert(fileIO, "File IO is not initialized.");
-
-            // Resolve path to editor_aws_preferences.setreg
-            AZStd::string editorPreferencesFilePath =
-                AZStd::string::format("@user@/%s/%s", AZ::SettingsRegistryInterface::RegistryFolder, EditorAWSPreferencesFileName);
-            AZStd::array<char, AZ::IO::MaxPathLength> resolvedPath{};
-            fileIO->ResolvePath(editorPreferencesFilePath.c_str(), resolvedPath.data(), resolvedPath.size());
-
-            AZ::SettingsRegistryMergeUtils::DumperSettings dumperSettings;
-            dumperSettings.m_prettifyOutput = true;
-            dumperSettings.m_jsonPointerPrefix = AWSAttributionSettingsPrefixKey;
-
-            AZStd::string stringBuffer;
-            AZ::IO::ByteContainerStream stringStream(&stringBuffer);
-            if (!AZ::SettingsRegistryMergeUtils::DumpSettingsRegistryToStream(
-                    *m_settingsRegistry, AWSAttributionSettingsPrefixKey, stringStream, dumperSettings))
-            {
-                AZ_Warning(
-                    "AWSAttributionManager", false, R"(Unable to save changes to the Editor AWS Preferences registry file at "%s"\n)",
-                    resolvedPath.data());
-                return;
-            }
-
-            bool saved{};
-            constexpr auto configurationMode =
-                AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
-            if (AZ::IO::SystemFile outputFile; outputFile.Open(resolvedPath.data(), configurationMode))
-            {
-                saved = outputFile.Write(stringBuffer.data(), stringBuffer.size()) == stringBuffer.size();
-            }
-
-            AZ_Warning(
-                "AWSAttributionManager", saved, R"(Unable to save Editor AWS Preferences registry file to path "%s"\n)",
-                editorPreferencesFilePath.c_str());
-        },
-        true);
-    job->Start();
-}
-
-void CEditorPreferencesPage_AWS::InitializeSettings()
-{
-    AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-    AZ_Assert(fileIO, "File IO is not initialized.");
-
-    // Resolve path to editor_aws_preferences.setreg
-    AZStd::string editorAWSPreferencesFilePath =
-        AZStd::string::format("@user@/%s/%s", AZ::SettingsRegistryInterface::RegistryFolder, EditorAWSPreferencesFileName);
-    AZStd::array<char, AZ::IO::MaxPathLength> resolvedPathAWSPreference{};
-    if (!fileIO->ResolvePath(editorAWSPreferencesFilePath.c_str(), resolvedPathAWSPreference.data(), resolvedPathAWSPreference.size()))
-    {
-        AZ_Warning("AWSAttributionManager", false, "Error resolving path %s", resolvedPathAWSPreference.data());
-        return;
-    }
-
-    if (fileIO->Exists(resolvedPathAWSPreference.data()))
-    {
-        m_settingsRegistry->MergeSettingsFile(resolvedPathAWSPreference.data(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, "");
-    }
-
-    if (!m_settingsRegistry->Get(m_usageOptions.m_awsAttributionEnabled, AWSAttributionEnabledKey))
-    {
-        // If key is missing default to on.
-        m_usageOptions.m_awsAttributionEnabled = true;
-    }
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageAWS.h b/Code/Sandbox/Editor/EditorPreferencesPageAWS.h
deleted file mode 100644
index c74b62e5a1..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageAWS.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Settings/SettingsRegistryImpl.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <QIcon>
-
-class CEditorPreferencesPage_AWS
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_AWS, "{51FB9557-ABA3-4FD7-803A-1784F5B06F5F}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_AWS();
-    virtual ~CEditorPreferencesPage_AWS();
-
-    // IPreferencesPage interface methods.
-    virtual const char* GetCategory() override { return "AWS"; }
-    virtual const char* GetTitle() override;
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-protected:
-    struct UsageOptions
-    {
-        AZ_TYPE_INFO(UsageOptions, "{2B7D9B19-D13B-4E54-B724-B2FD8D0828B3}")
-
-        bool m_awsAttributionEnabled;
-    };
-
-    const UsageOptions& GetUsageOptions();
-
-private:
-    void InitializeSettings();
-    void SaveSettingsRegistryFile();
-    UsageOptions m_usageOptions;
-    QIcon m_icon;
-    AZStd::unique_ptr<AZ::SettingsRegistryImpl> m_settingsRegistry;
-
-    static constexpr char AWSAttributionEnabledKey[] = "/Amazon/AWS/Preferences/AWSAttributionEnabled";
-    static constexpr char EditorPreferencesFileName[] = "editorpreferences.setreg";
-    static constexpr char EditorAWSPreferencesFileName[] = "editor_aws_preferences.setreg";
-    static constexpr char AWSAttributionSettingsPrefixKey[] = "/Amazon/AWS/Preferences";
-};
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.cpp b/Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.cpp
deleted file mode 100644
index 7e11a8a802..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageExperimentalLighting.h"
-
-// AzCore
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzQtComponents/Components/StyleManager.h>
-
-// Editor
-#include "Settings.h"
-
-
-void CEditorPreferencesPage_ExperimentalLighting::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<Options>()
-        ->Version(1)
-        ->Field("TotalIlluminationEnabled", &Options::m_totalIlluminationEnabled);
-
-    serialize.Class<CEditorPreferencesPage_ExperimentalLighting>()
-        ->Version(1)
-        ->Field("Options", &CEditorPreferencesPage_ExperimentalLighting::m_options);
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<Options>("Options", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Options::m_totalIlluminationEnabled, "Total Illumination", "Enable Total Illumination");
-
-        editContext->Class<CEditorPreferencesPage_ExperimentalLighting>("Experimental Features Preferences", "Experimental Features Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ExperimentalLighting::m_options, "Options", "Experimental Features Options");
-    }
-}
-
-
-CEditorPreferencesPage_ExperimentalLighting::CEditorPreferencesPage_ExperimentalLighting()
-{
-    InitializeSettings();
-
-    m_icon = QIcon(":/res/Experimental.svg");
-}
-
-const char* CEditorPreferencesPage_ExperimentalLighting::GetTitle()
-{
-    return "Experimental Features";
-}
-
-QIcon& CEditorPreferencesPage_ExperimentalLighting::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_ExperimentalLighting::OnApply()
-{
-    gSettings.sExperimentalFeaturesSettings.bTotalIlluminationEnabled = m_options.m_totalIlluminationEnabled;
-}
-
-void CEditorPreferencesPage_ExperimentalLighting::InitializeSettings()
-{
-    m_options.m_totalIlluminationEnabled = gSettings.sExperimentalFeaturesSettings.bTotalIlluminationEnabled;
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.h b/Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.h
deleted file mode 100644
index 9ba058f8e8..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <QIcon>
-
-
-class CEditorPreferencesPage_ExperimentalLighting
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_ExperimentalLighting, "{5D65D6A2-22B3-4CB7-A3F7-DC2B5034C9C2}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_ExperimentalLighting();
-    virtual ~CEditorPreferencesPage_ExperimentalLighting() = default;
-
-    virtual const char* GetCategory() override { return "Experimental Features"; }
-    virtual const char* GetTitle() override;
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-
-private:
-    void InitializeSettings();
-
-    struct Options
-    {
-        AZ_TYPE_INFO(Options, "{ED7400E6-3978-4C92-B366-7369E05760FD}")
-
-        bool m_totalIlluminationEnabled;
-    };
-
-    Options m_options;
-    QIcon m_icon;
-};
-
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageFiles.cpp b/Code/Sandbox/Editor/EditorPreferencesPageFiles.cpp
deleted file mode 100644
index c09c3441df..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageFiles.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageFiles.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/Slice/SliceUtilities.h>
-
-// Editor
-#include "Settings.h"
-
-
-
-void CEditorPreferencesPage_Files::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<Files>()
-        ->Version(2)
-        ->Field("AutoNumberSlices", &Files::m_autoNumberSlices)
-        ->Field("BackupOnSave", &Files::m_backupOnSave)
-        ->Field("BackupOnSaveMaxCount", &Files::m_backupOnSaveMaxCount)
-        ->Field("TempDirectory", &Files::m_standardTempDirectory)
-        ->Field("AutoSaveTagPoints", &Files::m_autoSaveTagPoints)
-        ->Field("SliceSaveLocation", &Files::m_saveLocation);
-
-    serialize.Class<ExternalEditors>()
-        ->Version(1)
-        ->Field("Scripts", &ExternalEditors::m_scripts)
-        ->Field("Shaders", &ExternalEditors::m_shaders)
-        ->Field("BSpaces", &ExternalEditors::m_BSpaces)
-        ->Field("Textures", &ExternalEditors::m_textures)
-        ->Field("Animations", &ExternalEditors::m_animations);
-
-    serialize.Class<AutoBackup>()
-        ->Version(1)
-        ->Field("Enabled", &AutoBackup::m_enabled)
-        ->Field("Interval", &AutoBackup::m_timeInterval)
-        ->Field("MaxCount", &AutoBackup::m_maxCount)
-        ->Field("RemindTime", &AutoBackup::m_remindTime);
-
-    serialize.Class<CEditorPreferencesPage_Files>()
-        ->Version(1)
-        ->Field("Files", &CEditorPreferencesPage_Files::m_files)
-        ->Field("Editors", &CEditorPreferencesPage_Files::m_editors)
-        ->Field("AutoBackup", &CEditorPreferencesPage_Files::m_autoBackup);
-
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<Files>("Files", "File Preferences")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Files::m_autoNumberSlices, "Append numeric value to slices", "Should the name of the slice file be automatically numbered. e.g SliceName_001.slice vs. SliceName.slice")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Files::m_backupOnSave, "Backup on Save", "Backup on Save")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Files::m_backupOnSaveMaxCount, "Maximum Save Backups", "Maximum Save Backups")
-            ->Attribute(AZ::Edit::Attributes::Min, 1)
-            ->Attribute(AZ::Edit::Attributes::Max, 100)
-            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &Files::m_standardTempDirectory, "Standard Temporary Directory", "Standard Temporary Directory")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Files::m_autoSaveTagPoints, "Auto Save Camera Tag Points", "Instantly Save Changed Camera Tag Points")
-            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &Files::m_saveLocation, "Slice Save location", "Specify the default location to save new slices");
-
-        editContext->Class<ExternalEditors>("External Editors", "External Editors")
-            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_scripts, "Scripts Editor", "Scripts Text Editor")
-            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_shaders, "Shaders Editor", "Shaders Text Editor")
-            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_BSpaces, "BSpace Editor", "Bspace Text Editor")
-            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_textures, "Texture Editor", "Texture Editor")
-            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &ExternalEditors::m_animations, "Animation Editor", "Animation Editor");
-
-        editContext->Class<AutoBackup>("Auto Backup", "Auto Backup")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &AutoBackup::m_enabled, "Enable", "Enable Auto Backup")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AutoBackup::m_timeInterval, "Time Interval", "Auto Backup Interval (Minutes)")
-            ->Attribute(AZ::Edit::Attributes::Min, 2)
-            ->Attribute(AZ::Edit::Attributes::Max, 10000)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AutoBackup::m_maxCount, "Maximum Backups", "Maximum Auto Backups")
-            ->Attribute(AZ::Edit::Attributes::Min, 1)
-            ->Attribute(AZ::Edit::Attributes::Max, 100)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AutoBackup::m_remindTime, "Remind Time", "Auto Remind Every (Minutes)");
-
-        editContext->Class<CEditorPreferencesPage_Files>("File Preferences", "Class for handling File Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_files, "Files", "File Preferences")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_editors, "External Editors", "External Editors")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_autoBackup, "Auto Backup", "Auto Backup");
-    }
-}
-
-
-CEditorPreferencesPage_Files::CEditorPreferencesPage_Files()
-{
-    InitializeSettings();
-
-    m_icon = QIcon(":/res/Files.svg");
-}
-
-QIcon& CEditorPreferencesPage_Files::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_Files::OnApply()
-{
-    using namespace AzToolsFramework::SliceUtilities;
-    auto sliceSettings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC("SliceUserSettings", 0x055b32eb), AZ::UserSettings::CT_LOCAL);
-    sliceSettings->m_autoNumber = m_files.m_autoNumberSlices;
-    sliceSettings->m_saveLocation = m_files.m_saveLocation;
-
-    gSettings.bBackupOnSave = m_files.m_backupOnSave;
-    gSettings.backupOnSaveMaxCount = m_files.m_backupOnSaveMaxCount;
-    gSettings.bAutoSaveTagPoints = m_files.m_autoSaveTagPoints;
-    gSettings.strStandardTempDirectory = m_files.m_standardTempDirectory.c_str();
-
-    gSettings.textEditorForScript = m_editors.m_scripts.c_str();
-    gSettings.textEditorForShaders = m_editors.m_shaders.c_str();
-    gSettings.textEditorForBspaces = m_editors.m_BSpaces.c_str();
-    gSettings.textureEditor = m_editors.m_textures.c_str();
-    gSettings.animEditor = m_editors.m_animations.c_str();
-
-    gSettings.autoBackupEnabled = m_autoBackup.m_enabled;
-    gSettings.autoBackupTime = m_autoBackup.m_timeInterval;
-    gSettings.autoBackupMaxCount = m_autoBackup.m_maxCount;
-    gSettings.autoRemindTime = m_autoBackup.m_remindTime;
-}
-
-void CEditorPreferencesPage_Files::InitializeSettings()
-{
-    using namespace AzToolsFramework::SliceUtilities;
-    auto sliceSettings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC("SliceUserSettings", 0x055b32eb), AZ::UserSettings::CT_LOCAL);
-
-    m_files.m_autoNumberSlices = sliceSettings->m_autoNumber;
-    m_files.m_saveLocation = sliceSettings->m_saveLocation;
-    m_files.m_backupOnSave = gSettings.bBackupOnSave;
-    m_files.m_backupOnSaveMaxCount = gSettings.backupOnSaveMaxCount;
-    m_files.m_autoSaveTagPoints = gSettings.bAutoSaveTagPoints;
-    m_files.m_standardTempDirectory = gSettings.strStandardTempDirectory.toUtf8().data();
-
-    m_editors.m_scripts = gSettings.textEditorForScript.toUtf8().data();
-    m_editors.m_shaders = gSettings.textEditorForShaders.toUtf8().data();
-    m_editors.m_BSpaces = gSettings.textEditorForBspaces.toUtf8().data();
-    m_editors.m_textures = gSettings.textureEditor.toUtf8().data();
-    m_editors.m_animations = gSettings.animEditor.toUtf8().data();
-
-    m_autoBackup.m_enabled = gSettings.autoBackupEnabled;
-    m_autoBackup.m_timeInterval = gSettings.autoBackupTime;
-    m_autoBackup.m_maxCount = gSettings.autoBackupMaxCount;
-    m_autoBackup.m_remindTime = gSettings.autoRemindTime;
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageFiles.h b/Code/Sandbox/Editor/EditorPreferencesPageFiles.h
deleted file mode 100644
index 44bcb3ba8d..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageFiles.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/Math/Vector3.h>
-#include <QIcon>
-
-
-class CEditorPreferencesPage_Files
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_Files, "{5574AAD2-7619-4C61-A095-CBE70BDB3BF3}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_Files();
-    virtual ~CEditorPreferencesPage_Files() = default;
-
-    virtual const char* GetCategory() override { return "General Settings"; }
-    virtual const char* GetTitle() override { return "Files"; }
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-private:
-    void InitializeSettings();
-
-    struct Files
-    {
-        AZ_TYPE_INFO(Files, "{9952889C-2A03-4A8B-8ECB-27A2BCC9D7F6}")
-
-        AZStd::string m_standardTempDirectory;
-        AZStd::string m_saveLocation;
-        int m_backupOnSaveMaxCount;
-        bool m_autoNumberSlices;
-        bool m_backupOnSave;
-        bool m_autoSaveTagPoints;
-    };
-
-    struct ExternalEditors
-    {
-        AZ_TYPE_INFO(ExternalEditors, "{6D04DAA8-C0DF-4AFE-B263-9B95619B2527}")
-
-        AZStd::string m_scripts;
-        AZStd::string m_shaders;
-        AZStd::string m_BSpaces;
-        AZStd::string m_textures;
-        AZStd::string m_animations;
-    };
-
-    struct AutoBackup
-    {
-        AZ_TYPE_INFO(AutoBackup, "{C4EC2E11-EBE4-4DAE-B1E2-EB4C8731ECEE}")
-
-        bool m_enabled;
-        int m_timeInterval;
-        int m_maxCount;
-        int m_remindTime;
-    };
-
-
-    Files m_files;
-    ExternalEditors m_editors;
-    AutoBackup m_autoBackup;
-    QIcon m_icon;
-};
-
-
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp b/Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp
deleted file mode 100644
index 5942f47e8d..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageGeneral.h"
-
-// Qt
-#include <QMessageBox>
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <AzQtComponents/Components/StyleManager.h>
-
-// Editor
-#include "MainWindow.h"
-#include "Core/QtEditorApplication.h"
-
-#define EDITORPREFS_EVENTNAME "EPGEvent"
-#define EDITORPREFS_EVENTVALTOGGLE "operation"
-#define UNDOSLICESAVE_VALON "UndoSliceSaveValueOn"
-#define UNDOSLICESAVE_VALOFF "UndoSliceSaveValueOff"
-
-void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<GeneralSettings>()
-        ->Version(3)
-        ->Field("PreviewPanel", &GeneralSettings::m_previewPanel)
-        ->Field("ApplyConfigSpec", &GeneralSettings::m_applyConfigSpec)
-        ->Field("EnableSourceControl", &GeneralSettings::m_enableSourceControl)
-        ->Field("ConsoleBackgroundColorTheme", &GeneralSettings::m_consoleBackgroundColorTheme)
-        ->Field("AutoloadLastLevel", &GeneralSettings::m_autoLoadLastLevel)
-        ->Field("ShowTimeInConsole", &GeneralSettings::m_bShowTimeInConsole)
-        ->Field("ToolbarIconSize", &GeneralSettings::m_toolbarIconSize)
-        ->Field("StylusMode", &GeneralSettings::m_stylusMode)
-        ->Field("ShowNews", &GeneralSettings::m_bShowNews)
-        ->Field("EnableSceneInspector", &GeneralSettings::m_enableSceneInspector)
-        ->Field("RestoreViewportCamera", &GeneralSettings::m_restoreViewportCamera);
-
-    serialize.Class<Messaging>()
-        ->Version(2)
-        ->Field("ShowDashboard", &Messaging::m_showDashboard)
-        ->Field("ShowCircularDependencyError", &Messaging::m_showCircularDependencyError);
-
-    serialize.Class<Undo>()
-        ->Version(2)
-        ->Field("UndoLevels", &Undo::m_undoLevels)
-        ->Field("UndoSliceOverrideSaves", &Undo::m_undoSliceOverrideSaveValue);;
-
-    serialize.Class<DeepSelection>()
-        ->Version(2)
-        ->Field("DeepSelectionRange", &DeepSelection::m_deepSelectionRange)
-        ->Field("StickDuplicate", &DeepSelection::m_stickDuplicate);
-
-    serialize.Class<SliceSettings>()
-        ->Version(1)
-        ->Field("DynamicByDefault", &SliceSettings::m_slicesDynamicByDefault);
-
-    serialize.Class<CEditorPreferencesPage_General>()
-        ->Version(1)
-        ->Field("General Settings", &CEditorPreferencesPage_General::m_generalSettings)
-        ->Field("Messaging", &CEditorPreferencesPage_General::m_messaging)
-        ->Field("Undo", &CEditorPreferencesPage_General::m_undo)
-        ->Field("Deep Selection", &CEditorPreferencesPage_General::m_deepSelection)
-        ->Field("Slice Settings", &CEditorPreferencesPage_General::m_sliceSettings);
-
-
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<GeneralSettings>("General Settings", "General Editor Preferences")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_previewPanel, "Show Geometry Preview Panel", "Show Geometry Preview Panel")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_applyConfigSpec, "Hide objects by config spec", "Hide objects by config spec")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSourceControl, "Enable Source Control", "Enable Source Control")
-            ->DataElement(AZ::Edit::UIHandlers::ComboBox, &GeneralSettings::m_consoleBackgroundColorTheme, "Console Background", "Console Background")
-                ->EnumAttribute(AzToolsFramework::ConsoleColorTheme::Light, "Light")
-                ->EnumAttribute(AzToolsFramework::ConsoleColorTheme::Dark, "Dark")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_autoLoadLastLevel, "Auto-load last level at startup", "Auto-load last level at startup")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_bShowTimeInConsole, "Show Time In Console", "Show Time In Console")
-            ->DataElement(AZ::Edit::UIHandlers::ComboBox, &GeneralSettings::m_toolbarIconSize, "Toolbar Icon Size", "Toolbar Icon Size")
-                ->EnumAttribute(AzQtComponents::ToolBar::ToolBarIconSize::IconNormal, "Default")
-                ->EnumAttribute(AzQtComponents::ToolBar::ToolBarIconSize::IconLarge, "Large")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_stylusMode, "Stylus Mode", "Stylus Mode for tablets and other pointing devices")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_restoreViewportCamera, EditorPreferencesGeneralRestoreViewportCameraSettingName, "Keep the original editor viewport transform when exiting game mode.")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSceneInspector, "Enable Scene Inspector (EXPERIMENTAL)", "Enable the option to inspect the internal data loaded from scene files like .fbx. This is an experimental feature. Restart the Scene Settings if the option is not visible under the Help menu.");
-
-        editContext->Class<Messaging>("Messaging", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showDashboard, "Show Welcome to Open 3D Engine at startup", "Show Welcome to Open 3D Engine at startup")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showCircularDependencyError, "Show Error: Circular dependency", "Show an error message when adding a slice instance to the target slice would create a cyclic asset dependency. All other valid overrides will be saved even if this is turned off.");
-
-        editContext->Class<Undo>("Undo", "")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Undo::m_undoLevels, "Undo Levels", "This field specifies the number of undo levels")
-            ->Attribute(AZ::Edit::Attributes::Min, 0)
-            ->Attribute(AZ::Edit::Attributes::Max, 10000)
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Undo::m_undoSliceOverrideSaveValue, "Undo Slice Override Saves", "Allow slice saves to be undone");
-
-        editContext->Class<DeepSelection>("Selection", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &DeepSelection::m_stickDuplicate, "Stick duplicate to cursor", "Stick duplicate to cursor")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &DeepSelection::m_deepSelectionRange, "Deep selection range", "Deep Selection Range")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
-            ->Attribute(AZ::Edit::Attributes::Max, 1000.0f);
-
-        editContext->Class<SliceSettings>("Slices", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &SliceSettings::m_slicesDynamicByDefault, "New Slices Dynamic By Default", "When creating slices, they will be set to dynamic by default");
-
-        editContext->Class<CEditorPreferencesPage_General>("General Editor Preferences", "Class for handling General Editor Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_generalSettings, "General Settings", "General Editor Preferences")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_messaging, "Messaging", "Messaging")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_undo, "Undo", "Undo Preferences")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_deepSelection, "Selection", "Selection")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_sliceSettings, "Slices", "Slice Settings");
-    }
-}
-
-CEditorPreferencesPage_General::CEditorPreferencesPage_General()
-{
-    InitializeSettings();
-
-    m_icon = QIcon(":/res/Global.svg");
-}
-
-const char* CEditorPreferencesPage_General::GetTitle()
-{
-    return "General Settings";
-}
-
-QIcon& CEditorPreferencesPage_General::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_General::OnApply()
-{
-    //general settings
-    gSettings.bPreviewGeometryWindow = m_generalSettings.m_previewPanel;
-    gSettings.bApplyConfigSpecInEditor = m_generalSettings.m_applyConfigSpec;
-    gSettings.enableSourceControl = m_generalSettings.m_enableSourceControl;
-    gSettings.consoleBackgroundColorTheme = m_generalSettings.m_consoleBackgroundColorTheme;
-    gSettings.bShowTimeInConsole = m_generalSettings.m_bShowTimeInConsole;
-    gSettings.bShowDashboardAtStartup = m_messaging.m_showDashboard;
-    gSettings.m_showCircularDependencyError = m_messaging.m_showCircularDependencyError;
-    gSettings.bAutoloadLastLevelAtStartup = m_generalSettings.m_autoLoadLastLevel;
-    gSettings.stylusMode = m_generalSettings.m_stylusMode;
-    gSettings.restoreViewportCamera = m_generalSettings.m_restoreViewportCamera;
-    gSettings.enableSceneInspector = m_generalSettings.m_enableSceneInspector;
-
-    if (static_cast<int>(m_generalSettings.m_toolbarIconSize) != gSettings.gui.nToolbarIconSize)
-    {
-        gSettings.gui.nToolbarIconSize = static_cast<int>(m_generalSettings.m_toolbarIconSize);
-        MainWindow::instance()->AdjustToolBarIconSize(m_generalSettings.m_toolbarIconSize);
-    }
-
-    //undo
-    gSettings.undoLevels = m_undo.m_undoLevels;
-
-    gSettings.m_undoSliceOverrideSaveValue = m_undo.m_undoSliceOverrideSaveValue;
-
-    //deep selection
-    gSettings.deepSelectionSettings.fRange = m_deepSelection.m_deepSelectionRange;
-    gSettings.deepSelectionSettings.bStickDuplicate = m_deepSelection.m_stickDuplicate;
-
-    //slices
-    gSettings.sliceSettings.dynamicByDefault = m_sliceSettings.m_slicesDynamicByDefault;
-}
-
-void CEditorPreferencesPage_General::InitializeSettings()
-{
-    //general settings
-    m_generalSettings.m_previewPanel = gSettings.bPreviewGeometryWindow;
-    m_generalSettings.m_applyConfigSpec = gSettings.bApplyConfigSpecInEditor;
-    m_generalSettings.m_enableSourceControl = gSettings.enableSourceControl;
-    m_generalSettings.m_consoleBackgroundColorTheme = gSettings.consoleBackgroundColorTheme;
-    m_generalSettings.m_bShowTimeInConsole = gSettings.bShowTimeInConsole;
-    m_generalSettings.m_autoLoadLastLevel = gSettings.bAutoloadLastLevelAtStartup;
-    m_generalSettings.m_stylusMode = gSettings.stylusMode;
-    m_generalSettings.m_restoreViewportCamera = gSettings.restoreViewportCamera;
-    m_generalSettings.m_enableSceneInspector = gSettings.enableSceneInspector;
-
-    m_generalSettings.m_toolbarIconSize = static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(gSettings.gui.nToolbarIconSize);
-
-    //Messaging
-    m_messaging.m_showDashboard = gSettings.bShowDashboardAtStartup;
-    m_messaging.m_showCircularDependencyError = gSettings.m_showCircularDependencyError;
-
-    //undo
-    m_undo.m_undoLevels = gSettings.undoLevels;
-    m_undo.m_undoSliceOverrideSaveValue = gSettings.m_undoSliceOverrideSaveValue;
-
-    //deep selection
-    m_deepSelection.m_deepSelectionRange = gSettings.deepSelectionSettings.fRange;
-    m_deepSelection.m_stickDuplicate = gSettings.deepSelectionSettings.bStickDuplicate;
-
-    //slices
-    m_sliceSettings.m_slicesDynamicByDefault = gSettings.sliceSettings.dynamicByDefault;
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.h b/Code/Sandbox/Editor/EditorPreferencesPageGeneral.h
deleted file mode 100644
index 45b0145fa0..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzQtComponents/Components/Widgets/ToolBar.h>
-#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
-#include <QIcon>
-
-#include "Settings.h"
-
-class CEditorPreferencesPage_General
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_General, "{9CFBBE85-560D-4720-A830-50EF25D06ED5}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_General();
-    virtual ~CEditorPreferencesPage_General() = default;
-
-    virtual const char* GetCategory() override { return "General Settings"; }
-    virtual const char* GetTitle() override;
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-private:
-    void InitializeSettings();
-
-    struct GeneralSettings
-    {
-        AZ_TYPE_INFO(GeneralSettings, "{C2AE8F6D-7AA6-499E-A3E8-ECCD0AC6F3D2}")
-
-        bool m_previewPanel;
-        bool m_applyConfigSpec;
-        bool m_enableSourceControl;
-        AzToolsFramework::ConsoleColorTheme m_consoleBackgroundColorTheme;
-        bool m_autoLoadLastLevel;
-        bool m_bShowTimeInConsole;
-        AzQtComponents::ToolBar::ToolBarIconSize m_toolbarIconSize;
-        bool m_stylusMode;
-        bool m_restoreViewportCamera;
-        bool m_bShowNews;
-        bool m_enableSceneInspector;
-    };
-
-    struct Messaging
-    {
-        AZ_TYPE_INFO(Messaging, "{A6AD87CB-E905-409B-A2BF-C43CDCE63B0C}")
-
-        bool m_showDashboard;
-        bool m_showCircularDependencyError;
-    };
-
-    struct Undo
-    {
-        AZ_TYPE_INFO(Undo, "{A3AC0728-F132-4BF2-B122-8A631B636E81}")
-
-        int m_undoLevels;
-        bool m_undoSliceOverrideSaveValue;
-    };
-
-    struct DeepSelection
-    {
-        AZ_TYPE_INFO(DeepSelection, "{225616BF-66DE-41EC-9FDD-F5A104112547}")
-
-        float m_deepSelectionRange;
-        bool m_stickDuplicate;
-    };
-
-    struct SliceSettings
-    {
-        AZ_TYPE_INFO(SliceSettings, "{8505CCC1-874C-4389-B51A-B9E5FF70CFDA}")
-
-        bool m_slicesDynamicByDefault;
-    };
-
-    GeneralSettings m_generalSettings;
-    Messaging m_messaging;
-    Undo m_undo;
-    DeepSelection m_deepSelection;
-    SliceSettings m_sliceSettings;
-    QIcon m_icon;
-};
-
-static const char* EditorPreferencesGeneralRestoreViewportCameraSettingName = "Restore Viewport Camera on Game Mode Exit";
-
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.cpp b/Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.cpp
deleted file mode 100644
index 5bef2d487b..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageViewportDebug.h"
-
-// AzCore
-#include <AzCore/Serialization/EditContext.h>
-
-// Editor
-#include "Settings.h"
-
-void CEditorPreferencesPage_ViewportDebug::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<Profiling>()
-        ->Version(1)
-        ->Field("ShowMeshStatsOnMouseOver", &Profiling::m_showMeshStatsOnMouseOver);
-
-    serialize.Class<Warnings>()
-        ->Version(1)
-        ->Field("WarningIconsDrawDistance", &Warnings::m_warningIconsDrawDistance)
-        ->Field("ShowScaleWarnings", &Warnings::m_showScaleWarnings)
-        ->Field("ShowRotationWarnings", &Warnings::m_showRotationWarnings);
-
-    serialize.Class<CEditorPreferencesPage_ViewportDebug>()
-        ->Version(1)
-        ->Field("Profiling", &CEditorPreferencesPage_ViewportDebug::m_profiling)
-        ->Field("Warnings", &CEditorPreferencesPage_ViewportDebug::m_warnings);
-
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<Profiling>("Profiling", "Profiling")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Profiling::m_showMeshStatsOnMouseOver, "Show Mesh Statistics", "Show Mesh Statistics on Mouse Over");
-
-        editContext->Class<Warnings>("Viewport Warning Settings", "")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Warnings::m_warningIconsDrawDistance, "Warning Icons Draw Distance", "Warning Icons Draw Distance")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Warnings::m_showScaleWarnings, "Show Scale Warnings", "Show Scale Warnings")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Warnings::m_showRotationWarnings, "Show Rotation Warnings", "Show Rotation Warnings");
-
-        editContext->Class<CEditorPreferencesPage_ViewportDebug>("Viewport Debug Preferences", "Viewport Debug Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportDebug::m_profiling, "Profiling", "Profiling")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportDebug::m_warnings, "Viewport Warning Settings", "Viewport Warning Settings");
-    }
-}
-
-
-CEditorPreferencesPage_ViewportDebug::CEditorPreferencesPage_ViewportDebug()
-{
-    InitializeSettings();
-    m_icon = QIcon(":/res/Debug.svg");
-}
-
-QIcon& CEditorPreferencesPage_ViewportDebug::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_ViewportDebug::OnApply()
-{
-    gSettings.viewports.bShowMeshStatsOnMouseOver = m_profiling.m_showMeshStatsOnMouseOver;
-    gSettings.viewports.bShowRotationWarnings = m_warnings.m_showRotationWarnings;
-    gSettings.viewports.bShowScaleWarnings = m_warnings.m_showScaleWarnings;
-    gSettings.viewports.fWarningIconsDrawDistance = m_warnings.m_warningIconsDrawDistance;
-}
-
-void CEditorPreferencesPage_ViewportDebug::InitializeSettings()
-{
-    m_profiling.m_showMeshStatsOnMouseOver = gSettings.viewports.bShowMeshStatsOnMouseOver;
-    m_warnings.m_showRotationWarnings = gSettings.viewports.bShowRotationWarnings;
-    m_warnings.m_showScaleWarnings = gSettings.viewports.bShowScaleWarnings;
-    m_warnings.m_warningIconsDrawDistance = gSettings.viewports.fWarningIconsDrawDistance;
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.h b/Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.h
deleted file mode 100644
index 87f3e0b66e..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <QIcon>
-
-
-class CEditorPreferencesPage_ViewportDebug
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_ViewportDebug, "{BD98FC0D-9F07-46AF-A123-BE34EC33E454}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_ViewportDebug();
-    virtual ~CEditorPreferencesPage_ViewportDebug() = default;
-
-    virtual const char* GetCategory() override { return "Viewports"; }
-    virtual const char* GetTitle() override { return "Debug"; }
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-private:
-    void InitializeSettings();
-
-    struct Profiling
-    {
-        AZ_TYPE_INFO(Profiling, "{AF413B5A-DDF3-4635-9D8B-1E1A3DF60287}")
-
-        bool m_showMeshStatsOnMouseOver;
-    };
-
-    struct Warnings
-    {
-        AZ_TYPE_INFO(Warnings, "{6CC8A276-24A4-4100-8F7F-7695ABAF6905}")
-
-        float m_warningIconsDrawDistance;
-        bool m_showScaleWarnings;
-        bool m_showRotationWarnings;
-    };
-
-    Profiling m_profiling;
-    Warnings m_warnings;
-    QIcon m_icon;
-};
-
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.cpp b/Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.cpp
deleted file mode 100644
index 9e60285b2c..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageViewportGeneral.h"
-
-#include <AzQtComponents/Components/StyleManager.h>
-
-// Editor
-#include "DisplaySettings.h"
-#include "Settings.h"
-
-
-void CEditorPreferencesPage_ViewportGeneral::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<General>()
-        ->Version(1)
-        ->Field("Sync2DViews", &General::m_sync2DViews)
-        ->Field("DefaultFOV", &General::m_defaultFOV)
-        ->Field("DefaultAspectRatio", &General::m_defaultAspectRatio)
-        ->Field("EnableContextMenu", &General::m_enableContextMenu);
-
-    serialize.Class<Display>()
-        ->Version(1)
-        ->Field("ShowSafeFrame", &Display::m_showSafeFrame)
-        ->Field("HighlightSelGeom", &Display::m_highlightSelGeom)
-        ->Field("HighlightSelVegetation", &Display::m_highlightSelVegetation)
-        ->Field("HighlightOnMouseOver", &Display::m_highlightOnMouseOver)
-        ->Field("HideMouseCursorWhenCaptured", &Display::m_hideMouseCursorWhenCaptured)
-        ->Field("DragSquareSize", &Display::m_dragSquareSize)
-        ->Field("DisplayLinks", &Display::m_displayLinks)
-        ->Field("DisplayTracks", &Display::m_displayTracks)
-        ->Field("AlwaysShowRadii", &Display::m_alwaysShowRadii)
-        ->Field("ShowBBoxes", &Display::m_showBBoxes)
-        ->Field("DrawEntityLabels", &Display::m_drawEntityLabels)
-        ->Field("ShowTriggerBounds", &Display::m_showTriggerBounds)
-        ->Field("ShowIcons", &Display::m_showIcons)
-        ->Field("DistanceScaleIcons", &Display::m_distanceScaleIcons)
-        ->Field("ShowFrozenHelpers", &Display::m_showFrozenHelpers)
-        ->Field("FillSelectedShapes", &Display::m_fillSelectedShapes)
-        ->Field("ShowGridGuide", &Display::m_showGridGuide)
-        ->Field("DisplayDimensions", &Display::m_displayDimension);
-
-    serialize.Class<MapViewport>()
-        ->Version(1)
-        ->Field("SwapXY", &MapViewport::m_swapXY)
-        ->Field("Resolution", &MapViewport::m_resolution);
-
-    serialize.Class<TextLabels>()
-        ->Version(1)
-        ->Field("LabelsOn", &TextLabels::m_labelsOn)
-        ->Field("LabelsDistance", &TextLabels::m_labelsDistance);
-
-    serialize.Class<SelectionPreviewColor>()
-        ->Version(1)
-        ->Field("ColorGroupBBox", &SelectionPreviewColor::m_colorGroupBBox)
-        ->Field("ColorEntityBBox", &SelectionPreviewColor::m_colorEntityBBox)
-        ->Field("BBoxAlpha", &SelectionPreviewColor::m_fBBoxAlpha)
-        ->Field("GeometryHighlihgtColor", &SelectionPreviewColor::m_geometryHighlightColor)
-        ->Field("SolidBrushGeometryColor", &SelectionPreviewColor::m_solidBrushGeometryColor)
-        ->Field("GeomAlpha", &SelectionPreviewColor::m_fgeomAlpha)
-        ->Field("ChildObjectGeomAlpha", &SelectionPreviewColor::m_childObjectGeomAlpha);
-
-    serialize.Class<CEditorPreferencesPage_ViewportGeneral>()
-        ->Version(1)
-        ->Field("General Viewport Settings", &CEditorPreferencesPage_ViewportGeneral::m_general)
-        ->Field("Viewport Displaying", &CEditorPreferencesPage_ViewportGeneral::m_display)
-        ->Field("Map Viewport", &CEditorPreferencesPage_ViewportGeneral::m_map)
-        ->Field("Test Labels", &CEditorPreferencesPage_ViewportGeneral::m_textLabels)
-        ->Field("Selection Preview Color", &CEditorPreferencesPage_ViewportGeneral::m_selectionPreviewColor);
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<General>("General Viewport Settings", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &General::m_sync2DViews, "Synchronize 2D Viewports", "Synchronize 2D Viewports")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &General::m_defaultFOV, "Perspective View FOV", "Perspective View FOV")
-                ->Attribute("Multiplier", RAD2DEG(1))
-                ->Attribute(AZ::Edit::Attributes::Min, 1.0f)
-                ->Attribute(AZ::Edit::Attributes::Max, 120.0f)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &General::m_defaultAspectRatio, "Perspective View Aspect Ratio", "Perspective View Aspect Ratio")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &General::m_enableContextMenu, "Enable Right-Click Context Menu", "Enable Right-Click Context Menu");
-
-        editContext->Class<Display>("Viewport Display Settings", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showSafeFrame, "Show 4:3 Aspect Ratio Frame", "Show 4:3 Aspect Ratio Frame")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_highlightSelGeom, "Highlight Selected Geometry", "Highlight Selected Geometry")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_highlightSelVegetation, "Highlight Selected Vegetation", "Highlight Selected Vegetation")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_highlightOnMouseOver, "Highlight Geometry On Mouse Over", "Highlight Geometry On Mouse Over")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_hideMouseCursorWhenCaptured, "Hide Cursor When Captured", "Hide Mouse Cursor When Captured")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Display::m_dragSquareSize, "Drag Square Size", "Drag Square Size")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_displayLinks, "Display Object Links", "Display Object Links")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_displayTracks, "Display Animation Tracks", "Display Animation Tracks")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_alwaysShowRadii, "Always Show Radii", "Always Show Radii")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showBBoxes, "Show Bounding Boxes", "Show Bounding Boxes")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_drawEntityLabels, "Always Draw Entity Labels", "Always Draw Entity Labels")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showTriggerBounds, "Always Show Trigger Bounds", "Always Show Trigger Bounds")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showIcons, "Show Object Icons", "Show Object Icons")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_distanceScaleIcons, "Scale Object Icons with Distance", "Scale Object Icons with Distance")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showFrozenHelpers, "Show Helpers of Frozen Objects", "Show Helpers of Frozen Objects")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_fillSelectedShapes, "Fill Selected Shapes", "Fill Selected Shapes")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_showGridGuide, "Show Snapping Grid Guide", "Show Snapping Grid Guide")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Display::m_displayDimension, "Display Dimension Figures", "Display Dimension Figures");
-
-        editContext->Class<MapViewport>("Map Viewport Settings", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &MapViewport::m_swapXY, "Swap X/Y Axis", "Swap X/Y Axis")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &MapViewport::m_resolution, "Map Texture Resolution", "Map Texture Resolution");
-
-        editContext->Class<TextLabels>("Text Label Settings", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &TextLabels::m_labelsOn, "Enabled", "Enabled")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &TextLabels::m_labelsDistance, "Distance", "Distance")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100000.f);
-
-        editContext->Class<SelectionPreviewColor>("Selection Preview Color Settings", "")
-            ->DataElement(AZ::Edit::UIHandlers::Color, &SelectionPreviewColor::m_colorGroupBBox, "Group Bounding Box", "Group Bounding Box")
-            ->DataElement(AZ::Edit::UIHandlers::Color, &SelectionPreviewColor::m_colorEntityBBox, "Entity Bounding Box", "Entity Bounding Box")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &SelectionPreviewColor::m_fBBoxAlpha, "Bounding Box Highlight Alpha", "Bounding Box Highlight Alpha")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
-                ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
-            ->DataElement(AZ::Edit::UIHandlers::Color, &SelectionPreviewColor::m_geometryHighlightColor, "Geometry Color", "Geometry Color")
-            ->DataElement(AZ::Edit::UIHandlers::Color, &SelectionPreviewColor::m_solidBrushGeometryColor, "Solid Brush Geometry Color", "Solid Brush Geometry Color")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &SelectionPreviewColor::m_fgeomAlpha, "Geometry Highlight Alpha", "Geometry Highlight Alpha")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
-                ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &SelectionPreviewColor::m_childObjectGeomAlpha, "Child Geometry Highlight Alpha", "Child Geometry Highlight Alpha")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
-                ->Attribute(AZ::Edit::Attributes::Max, 1.0f);
-
-        editContext->Class<CEditorPreferencesPage_ViewportGeneral>("General Viewport Preferences", "General Viewport Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_general, "General Viewport Settings", "General Viewport Settings")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_display, "Viewport Display Settings", "Viewport Display Settings")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_map, "Map Viewport Settings", "Map Viewport Settings")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_textLabels, "Text Label Settings", "Text Label Settings")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_selectionPreviewColor, "Selection Preview Color Settings", "Selection Preview Color Settings");
-    }
-}
-
-
-CEditorPreferencesPage_ViewportGeneral::CEditorPreferencesPage_ViewportGeneral()
-{
-    InitializeSettings();
-    m_icon = QIcon(":/res/Viewport.svg");
-}
-
-const char* CEditorPreferencesPage_ViewportGeneral::GetTitle()
-{
-    return "Viewport";
-}
-
-QIcon& CEditorPreferencesPage_ViewportGeneral::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_ViewportGeneral::OnApply()
-{
-    CDisplaySettings* ds = GetIEditor()->GetDisplaySettings();
-
-    gSettings.viewports.fDefaultAspectRatio = m_general.m_defaultAspectRatio;
-    gSettings.viewports.fDefaultFov = m_general.m_defaultFOV;
-    gSettings.viewports.bEnableContextMenu = m_general.m_enableContextMenu;
-    gSettings.viewports.bSync2DViews = m_general.m_sync2DViews;
-
-    gSettings.viewports.bShowSafeFrame = m_display.m_showSafeFrame;
-    gSettings.viewports.bHighlightSelectedGeometry = m_display.m_highlightSelGeom;
-    gSettings.viewports.bHighlightSelectedVegetation = m_display.m_highlightSelVegetation;
-    gSettings.viewports.bHighlightMouseOverGeometry = m_display.m_highlightOnMouseOver;
-    gSettings.viewports.bHideMouseCursorWhenCaptured = m_display.m_hideMouseCursorWhenCaptured;
-    gSettings.viewports.nDragSquareSize = m_display.m_dragSquareSize;
-    ds->DisplayLinks(m_display.m_displayLinks);
-    ds->DisplayTracks(m_display.m_displayTracks);
-    gSettings.viewports.bAlwaysShowRadiuses = m_display.m_alwaysShowRadii;
-    if (m_display.m_showBBoxes)
-    {
-        ds->SetRenderFlags(ds->GetRenderFlags() | RENDER_FLAG_BBOX);
-    }
-    else
-    {
-        ds->SetRenderFlags(ds->GetRenderFlags() & (~RENDER_FLAG_BBOX));
-    }
-    gSettings.viewports.bDrawEntityLabels = m_display.m_drawEntityLabels;
-    gSettings.viewports.bShowTriggerBounds = m_display.m_showTriggerBounds;
-    gSettings.viewports.bShowIcons = m_display.m_showIcons;
-    gSettings.viewports.bDistanceScaleIcons = m_display.m_distanceScaleIcons;
-    gSettings.viewports.nShowFrozenHelpers = m_display.m_showFrozenHelpers;
-    gSettings.viewports.bFillSelectedShapes = m_display.m_fillSelectedShapes;
-    gSettings.viewports.bShowGridGuide = m_display.m_showGridGuide;
-    ds->DisplayDimensionFigures(m_display.m_displayDimension);
-
-    gSettings.viewports.nTopMapTextureResolution = m_map.m_resolution;
-    gSettings.viewports.bTopMapSwapXY = m_map.m_swapXY;
-
-    ds->DisplayLabels(m_textLabels.m_labelsOn);
-    ds->SetLabelsDistance(m_textLabels.m_labelsDistance);
-
-    gSettings.objectColorSettings.fChildGeomAlpha = m_selectionPreviewColor.m_childObjectGeomAlpha;
-    gSettings.objectColorSettings.entityHighlight = QColor(m_selectionPreviewColor.m_colorEntityBBox.GetR() * 255.0f,
-            m_selectionPreviewColor.m_colorEntityBBox.GetG() * 255.0f,
-            m_selectionPreviewColor.m_colorEntityBBox.GetB() * 255.0f);
-    gSettings.objectColorSettings.groupHighlight = QColor(m_selectionPreviewColor.m_colorGroupBBox.GetR() * 255.0f,
-            m_selectionPreviewColor.m_colorGroupBBox.GetG() * 255.0f,
-            m_selectionPreviewColor.m_colorGroupBBox.GetB() * 255.0f);
-    gSettings.objectColorSettings.fBBoxAlpha = m_selectionPreviewColor.m_fBBoxAlpha;
-    gSettings.objectColorSettings.fGeomAlpha = m_selectionPreviewColor.m_fgeomAlpha;
-    gSettings.objectColorSettings.geometryHighlightColor = QColor(m_selectionPreviewColor.m_geometryHighlightColor.GetR() * 255.0f,
-            m_selectionPreviewColor.m_geometryHighlightColor.GetG() * 255.0f,
-            m_selectionPreviewColor.m_geometryHighlightColor.GetB() * 255.0f);
-    gSettings.objectColorSettings.solidBrushGeometryColor = QColor(m_selectionPreviewColor.m_solidBrushGeometryColor.GetR() * 255.0f,
-            m_selectionPreviewColor.m_solidBrushGeometryColor.GetG() * 255.0f,
-            m_selectionPreviewColor.m_solidBrushGeometryColor.GetB() * 255.0f);
-}
-
-void CEditorPreferencesPage_ViewportGeneral::InitializeSettings()
-{
-    CDisplaySettings* ds = GetIEditor()->GetDisplaySettings();
-
-    m_general.m_defaultAspectRatio = gSettings.viewports.fDefaultAspectRatio;
-    m_general.m_defaultFOV = gSettings.viewports.fDefaultFov;
-    m_general.m_enableContextMenu = gSettings.viewports.bEnableContextMenu;
-    m_general.m_sync2DViews = gSettings.viewports.bSync2DViews;
-
-    m_display.m_showSafeFrame = gSettings.viewports.bShowSafeFrame;
-    m_display.m_highlightSelGeom = gSettings.viewports.bHighlightSelectedGeometry;
-    m_display.m_highlightSelVegetation = gSettings.viewports.bHighlightSelectedVegetation;
-    m_display.m_highlightOnMouseOver = gSettings.viewports.bHighlightMouseOverGeometry;
-    m_display.m_hideMouseCursorWhenCaptured = gSettings.viewports.bHideMouseCursorWhenCaptured;
-    m_display.m_dragSquareSize = gSettings.viewports.nDragSquareSize;
-    m_display.m_displayLinks = ds->IsDisplayLinks();
-    m_display.m_displayTracks = ds->IsDisplayTracks();
-    m_display.m_alwaysShowRadii = gSettings.viewports.bAlwaysShowRadiuses;
-    m_display.m_showBBoxes = (ds->GetRenderFlags() & RENDER_FLAG_BBOX) == RENDER_FLAG_BBOX;
-    m_display.m_drawEntityLabels = gSettings.viewports.bDrawEntityLabels;
-    m_display.m_showTriggerBounds = gSettings.viewports.bShowTriggerBounds;
-    m_display.m_showIcons = gSettings.viewports.bShowIcons;
-    m_display.m_distanceScaleIcons = gSettings.viewports.bDistanceScaleIcons;
-    m_display.m_showFrozenHelpers = gSettings.viewports.nShowFrozenHelpers;
-    m_display.m_fillSelectedShapes = gSettings.viewports.bFillSelectedShapes;
-    m_display.m_showGridGuide = gSettings.viewports.bShowGridGuide;
-    m_display.m_displayDimension = ds->IsDisplayDimensionFigures();
-
-    m_map.m_resolution = gSettings.viewports.nTopMapTextureResolution;
-    m_map.m_swapXY = gSettings.viewports.bTopMapSwapXY;
-
-    m_textLabels.m_labelsOn = ds->IsDisplayLabels();
-    m_textLabels.m_labelsDistance = ds->GetLabelsDistance();
-
-    m_selectionPreviewColor.m_childObjectGeomAlpha = gSettings.objectColorSettings.fChildGeomAlpha;
-    m_selectionPreviewColor.m_colorEntityBBox.Set(gSettings.objectColorSettings.entityHighlight.redF(), gSettings.objectColorSettings.entityHighlight.greenF(), gSettings.objectColorSettings.entityHighlight.blueF(), 1.0f);
-    m_selectionPreviewColor.m_colorGroupBBox.Set(gSettings.objectColorSettings.groupHighlight.redF(), gSettings.objectColorSettings.groupHighlight.greenF(), gSettings.objectColorSettings.groupHighlight.blueF(), 1.0f);
-    m_selectionPreviewColor.m_fBBoxAlpha = gSettings.objectColorSettings.fBBoxAlpha;
-    m_selectionPreviewColor.m_fgeomAlpha = gSettings.objectColorSettings.fGeomAlpha;
-    m_selectionPreviewColor.m_geometryHighlightColor.Set(gSettings.objectColorSettings.geometryHighlightColor.redF(), gSettings.objectColorSettings.geometryHighlightColor.greenF(), gSettings.objectColorSettings.geometryHighlightColor.blueF(), 1.0f);
-    m_selectionPreviewColor.m_solidBrushGeometryColor.Set(gSettings.objectColorSettings.solidBrushGeometryColor.redF(), gSettings.objectColorSettings.solidBrushGeometryColor.greenF(), gSettings.objectColorSettings.solidBrushGeometryColor.blueF(), 1.0f);
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.h b/Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.h
deleted file mode 100644
index 219e5597d0..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/Math/Color.h>
-#include <QIcon>
-
-
-class CEditorPreferencesPage_ViewportGeneral
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_ViewportGeneral, "{8511FF7F-F774-47E1-A99B-3DE3A867E403}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_ViewportGeneral();
-    virtual ~CEditorPreferencesPage_ViewportGeneral() = default;
-
-    virtual const char* GetCategory() override { return "Viewports"; }
-    virtual const char* GetTitle() override;
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-private:
-    void InitializeSettings();
-
-    struct General
-    {
-        AZ_TYPE_INFO(General, "{3BAC6F1C-E954-4EDD-95B0-90741B1010E0}")
-
-        bool m_sync2DViews;
-        float m_defaultFOV;
-        float m_defaultAspectRatio;
-        bool m_enableContextMenu;
-    };
-
-    struct Display
-    {
-        AZ_TYPE_INFO(Display, "{F0376933-FA0B-4B58-9DD9-6F6EBC7386CA}")
-
-        bool m_showSafeFrame;
-        bool m_highlightSelGeom;
-        bool m_highlightSelVegetation;
-        bool m_highlightOnMouseOver;
-        bool m_hideMouseCursorWhenCaptured;
-        int m_dragSquareSize;
-        bool m_displayLinks;
-        bool m_displayTracks;
-        bool m_alwaysShowRadii;
-        bool m_showBBoxes;
-        bool m_drawEntityLabels;
-        bool m_showTriggerBounds;
-        bool m_showIcons;
-        bool m_distanceScaleIcons;
-        bool m_showFrozenHelpers;
-        bool m_fillSelectedShapes;
-        bool m_showGridGuide;
-        bool m_displayDimension;
-    };
-
-    struct MapViewport
-    {
-        AZ_TYPE_INFO(MapViewport, "{FF49D39D-9A92-4605-B20A-C1E72934DD16}")
-
-        bool m_swapXY;
-        int m_resolution;
-    };
-
-    struct TextLabels
-    {
-        AZ_TYPE_INFO(TextLabels, "{DD3972ED-5120-4552-8D55-3D3967A29360}")
-
-        bool m_labelsOn;
-        float m_labelsDistance;
-    };
-
-    struct SelectionPreviewColor
-    {
-        AZ_TYPE_INFO(SelectionPreviewColor, "{801A5252-B238-4832-BDA4-EAE0D0F98850}")
-
-        AZ::Color m_colorGroupBBox;
-        AZ::Color m_colorEntityBBox;
-        float m_fBBoxAlpha;
-        AZ::Color m_geometryHighlightColor;
-        AZ::Color m_solidBrushGeometryColor;
-        float m_fgeomAlpha;
-        float m_childObjectGeomAlpha;
-    };
-
-    General m_general;
-    Display m_display;
-    MapViewport m_map;
-    TextLabels m_textLabels;
-    SelectionPreviewColor m_selectionPreviewColor;
-    QIcon m_icon;
-};
-
-
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.cpp b/Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.cpp
deleted file mode 100644
index f6d60c975b..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageViewportGizmo.h"
-
-// Editor
-#include "Settings.h"
-
-
-void CEditorPreferencesPage_ViewportGizmo::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<AxisGizmo>()
-        ->Version(1)
-        ->Field("Size", &AxisGizmo::m_size)
-        ->Field("Text", &AxisGizmo::m_text)
-        ->Field("MaxCount", &AxisGizmo::m_maxCount);
-
-    serialize.Class<Helpers>()
-        ->Version(1)
-        ->Field("LabelsOn", &Helpers::m_helpersGlobalScale)
-        ->Field("LabelsOn", &Helpers::m_tagpointScaleMulti)
-        ->Field("LabelsOn", &Helpers::m_rulerSphereScale)
-        ->Field("LabelsDistance", &Helpers::m_rulerSphereTrans);
-
-    serialize.Class<CEditorPreferencesPage_ViewportGizmo>()
-        ->Version(1)
-        ->Field("Axis Gizmo", &CEditorPreferencesPage_ViewportGizmo::m_axisGizmo)
-        ->Field("Helpers", &CEditorPreferencesPage_ViewportGizmo::m_helpers);
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<AxisGizmo>("Axis Gizmo", "")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AxisGizmo::m_size, "Size", "Axis Gizmo Size")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &AxisGizmo::m_text, "Text Labels", "Text Labels on Axis Gizmo")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AxisGizmo::m_maxCount, "Max Count", "Max Count of Axis Gizmos");
-
-        editContext->Class<Helpers>("Helpers", "")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_helpersGlobalScale, "Helpers Scale", "Helpers Scale")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_tagpointScaleMulti, "Tagpoint Scale Multiplier", "Tagpoint Scale Multiplier")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_rulerSphereScale, "Ruler Sphere Scale", "Ruler Sphere Scale")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.1f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-                ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_rulerSphereTrans, "Ruler Sphere Transparency", "Ruler Sphere Transparency")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100.0f);
-
-        editContext->Class<CEditorPreferencesPage_ViewportGizmo>("Gizmo Viewport Preferences", "Gizmo Viewport Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGizmo::m_axisGizmo, "Axis Gizmo", "Axis Gizmo")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGizmo::m_helpers, "Helpers", "Helpers");
-    }
-}
-
-CEditorPreferencesPage_ViewportGizmo::CEditorPreferencesPage_ViewportGizmo()
-{
-    InitializeSettings();
-    m_icon = QIcon(":/res/Gizmos.svg");
-}
-
-QIcon& CEditorPreferencesPage_ViewportGizmo::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_ViewportGizmo::OnApply()
-{
-    gSettings.gizmo.axisGizmoSize = m_axisGizmo.m_size;
-    gSettings.gizmo.axisGizmoText = m_axisGizmo.m_text;
-    gSettings.gizmo.axisGizmoMaxCount = m_axisGizmo.m_maxCount;
-
-    gSettings.gizmo.helpersScale = m_helpers.m_helpersGlobalScale;
-    gSettings.gizmo.tagpointScaleMulti = m_helpers.m_tagpointScaleMulti;
-    gSettings.gizmo.rulerSphereScale = m_helpers.m_rulerSphereScale;
-    gSettings.gizmo.rulerSphereTrans = m_helpers.m_rulerSphereTrans;
-}
-
-void CEditorPreferencesPage_ViewportGizmo::InitializeSettings()
-{
-    m_axisGizmo.m_size = gSettings.gizmo.axisGizmoSize;
-    m_axisGizmo.m_text = gSettings.gizmo.axisGizmoText;
-    m_axisGizmo.m_maxCount = gSettings.gizmo.axisGizmoMaxCount;
-
-    m_helpers.m_helpersGlobalScale = gSettings.gizmo.helpersScale;
-    m_helpers.m_tagpointScaleMulti = gSettings.gizmo.tagpointScaleMulti;
-    m_helpers.m_rulerSphereScale = gSettings.gizmo.rulerSphereScale;
-    m_helpers.m_rulerSphereTrans = gSettings.gizmo.rulerSphereTrans;
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.h b/Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.h
deleted file mode 100644
index b5d5b9d46b..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/Math/Vector3.h>
-#include <QIcon>
-
-
-class CEditorPreferencesPage_ViewportGizmo
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_ViewportGizmo, "{14433511-8175-4348-954E-82D903475B06}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_ViewportGizmo();
-    virtual ~CEditorPreferencesPage_ViewportGizmo() = default;
-
-    virtual const char* GetCategory() override { return "Viewports"; }
-    virtual const char* GetTitle() override { return "Gizmos"; }
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-private:
-    void InitializeSettings();
-
-    struct AxisGizmo
-    {
-        AZ_TYPE_INFO(AxisGizmo, "{7D90D60E-996B-4F54-8748-B26EFA781EE2}")
-
-        float m_size;
-        bool m_text;
-        int m_maxCount;
-    };
-
-    struct Helpers
-    {
-        AZ_TYPE_INFO(Helpers, "{EC99922E-F61C-4AA0-9A51-630E09AB55AA}")
-
-        float m_helpersGlobalScale;
-        float m_tagpointScaleMulti;
-        float m_rulerSphereScale;
-        float m_rulerSphereTrans;
-    };
-
-    AxisGizmo m_axisGizmo;
-    Helpers m_helpers;
-    QIcon m_icon;
-};
-
-
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.cpp b/Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.cpp
deleted file mode 100644
index 37b2bf9818..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageViewportMovement.h"
-
-#include <AzQtComponents/Components/StyleManager.h>
-
-// Editor
-#include "Settings.h"
-#include "EditorViewportSettings.h"
-
-void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<CameraMovementSettings>()
-        ->Version(1)
-        ->Field("MoveSpeed", &CameraMovementSettings::m_moveSpeed)
-        ->Field("RotateSpeed", &CameraMovementSettings::m_rotateSpeed)
-        ->Field("FastMoveSpeed", &CameraMovementSettings::m_fastMoveSpeed)
-        ->Field("WheelZoomSpeed", &CameraMovementSettings::m_wheelZoomSpeed)
-        ->Field("InvertYAxis", &CameraMovementSettings::m_invertYRotation)
-        ->Field("InvertPan", &CameraMovementSettings::m_invertPan);
-
-    serialize.Class<CEditorPreferencesPage_ViewportMovement>()
-        ->Version(1)
-        ->Field("CameraMovementSettings", &CEditorPreferencesPage_ViewportMovement::m_cameraMovementSettings);
-
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<CameraMovementSettings>("Camera Movement Settings", "")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_moveSpeed, "Camera Movement Speed", "Camera Movement Speed")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_rotateSpeed, "Camera Rotation Speed", "Camera Rotation Speed")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_fastMoveSpeed, "Fast Movement Scale", "Fast Movement Scale (holding shift")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_wheelZoomSpeed, "Wheel Zoom Speed", "Wheel Zoom Speed")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_invertYRotation, "Invert Y Axis", "Invert Y Rotation (holding RMB)")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_invertPan, "Invert Pan", "Invert Pan (holding MMB)");
-
-        editContext->Class<CEditorPreferencesPage_ViewportMovement>("Gizmo Movement Preferences", "Gizmo Movement Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportMovement::m_cameraMovementSettings, "Camera Movement Settings", "Camera Movement Settings");
-    }
-}
-
-
-CEditorPreferencesPage_ViewportMovement::CEditorPreferencesPage_ViewportMovement()
-{
-    InitializeSettings();
-    m_icon = QIcon(":/res/Camera.svg");
-}
-
-const char* CEditorPreferencesPage_ViewportMovement::GetTitle()
-{
-    return "Camera";
-}
-
-QIcon& CEditorPreferencesPage_ViewportMovement::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_ViewportMovement::OnApply()
-{
-    if (SandboxEditor::UsingNewCameraSystem())
-    {
-        SandboxEditor::SetCameraTranslateSpeed(m_cameraMovementSettings.m_moveSpeed);
-        SandboxEditor::SetCameraRotateSpeed(m_cameraMovementSettings.m_rotateSpeed);
-        SandboxEditor::SetCameraBoostMultiplier(m_cameraMovementSettings.m_fastMoveSpeed);
-        SandboxEditor::SetCameraScrollSpeed(m_cameraMovementSettings.m_wheelZoomSpeed);
-        SandboxEditor::SetCameraOrbitYawRotationInverted(m_cameraMovementSettings.m_invertYRotation);
-        SandboxEditor::SetCameraPanInvertedX(m_cameraMovementSettings.m_invertPan);
-        SandboxEditor::SetCameraPanInvertedY(m_cameraMovementSettings.m_invertPan);
-    }
-    else
-    {
-        gSettings.cameraMoveSpeed = m_cameraMovementSettings.m_moveSpeed;
-        gSettings.cameraRotateSpeed = m_cameraMovementSettings.m_rotateSpeed;
-        gSettings.cameraFastMoveSpeed = m_cameraMovementSettings.m_fastMoveSpeed;
-        gSettings.wheelZoomSpeed = m_cameraMovementSettings.m_wheelZoomSpeed;
-        gSettings.invertYRotation = m_cameraMovementSettings.m_invertYRotation;
-        gSettings.invertPan = m_cameraMovementSettings.m_invertPan;
-    }
-}
-
-void CEditorPreferencesPage_ViewportMovement::InitializeSettings()
-{
-    if (SandboxEditor::UsingNewCameraSystem())
-    {
-        m_cameraMovementSettings.m_moveSpeed = SandboxEditor::CameraTranslateSpeed();
-        m_cameraMovementSettings.m_rotateSpeed = SandboxEditor::CameraRotateSpeed();
-        m_cameraMovementSettings.m_fastMoveSpeed = SandboxEditor::CameraBoostMultiplier();
-        m_cameraMovementSettings.m_wheelZoomSpeed = SandboxEditor::CameraScrollSpeed();
-        m_cameraMovementSettings.m_invertYRotation = SandboxEditor::CameraOrbitYawRotationInverted();
-        m_cameraMovementSettings.m_invertPan = SandboxEditor::CameraPanInvertedX() && SandboxEditor::CameraPanInvertedY();
-    }
-    else
-    {
-        m_cameraMovementSettings.m_moveSpeed = gSettings.cameraMoveSpeed;
-        m_cameraMovementSettings.m_rotateSpeed = gSettings.cameraRotateSpeed;
-        m_cameraMovementSettings.m_fastMoveSpeed = gSettings.cameraFastMoveSpeed;
-        m_cameraMovementSettings.m_wheelZoomSpeed = gSettings.wheelZoomSpeed;
-        m_cameraMovementSettings.m_invertYRotation = gSettings.invertYRotation;
-        m_cameraMovementSettings.m_invertPan = gSettings.invertPan;
-    }
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.h b/Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.h
deleted file mode 100644
index bd49b891de..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <QIcon>
-
-
-class CEditorPreferencesPage_ViewportMovement
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_ViewportMovement, "{BC593332-7EAF-4171-8A35-1C5DE5B40909}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_ViewportMovement();
-    virtual ~CEditorPreferencesPage_ViewportMovement() = default;
-
-    virtual const char* GetCategory() override { return "Viewports"; }
-    virtual const char* GetTitle();
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-private:
-    void InitializeSettings();
-
-    struct CameraMovementSettings
-    {
-        AZ_TYPE_INFO(CameraMovementSettings, "{60B8C07E-5F48-4171-A50B-F45558B5CCA1}")
-
-        float m_moveSpeed;
-        float m_rotateSpeed;
-        float m_fastMoveSpeed;
-        float m_wheelZoomSpeed;
-        bool m_invertYRotation;
-        bool m_invertPan;
-    };
-
-    CameraMovementSettings m_cameraMovementSettings;
-    QIcon m_icon;
-};
-
-
diff --git a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.cpp b/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.cpp
deleted file mode 100644
index 3188a7a53e..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesTreeWidgetItem.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
-
-// Editor
-#include "IPreferencesPage.h"
-
-#include <AzQtComponents/Components/StyleManager.h>
-
-EditorPreferencesTreeWidgetItem::EditorPreferencesTreeWidgetItem(IPreferencesPage* page, const QPixmap& selectedImage, QPixmap& unselectedImage)
-    : QTreeWidgetItem(EditorPreferencesPage)
-    , m_preferencesPage(page)
-    , m_selectedImage(selectedImage)
-    , m_unselectedImage(unselectedImage)
-    , m_entirePageMatchesFilter(true)
-{
-    Setup(page);
-}
-
-EditorPreferencesTreeWidgetItem::EditorPreferencesTreeWidgetItem(IPreferencesPage* page, const QIcon& icon)
-    : QTreeWidgetItem(EditorPreferencesPage)
-    , m_preferencesPage(page)
-    , m_entirePageMatchesFilter(true)
-{
-    setIcon(0, icon);
-
-    setData(0, Qt::DecorationRole, icon);
-    Setup(page);
-}
-
-void EditorPreferencesTreeWidgetItem::Setup(IPreferencesPage* page)
-{
-    setData(0, Qt::DisplayRole, m_preferencesPage->GetTitle());
-
-    AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(serializeContext, "Serialization context not available");
-
-    // Grab all property names on the page so we can filter by property text by recursing through the hierarchy
-    AzToolsFramework::InstanceDataHierarchy hierarchy;
-    hierarchy.AddRootInstance(page);
-    hierarchy.Build(serializeContext, AZ::SerializeContext::ENUM_ACCESS_FOR_READ);
-    std::function<void(AzToolsFramework::InstanceDataNode&)> visitNode = [&](AzToolsFramework::InstanceDataNode& node)
-    {
-        const AZ::Edit::ElementData* data = node.GetElementEditMetadata();
-        QString text;
-        if (data)
-        {
-            text = data->m_name;
-        }
-
-        if (!text.isEmpty() && !m_propertyNames.contains(text))
-        {
-            m_propertyNames.append(text);
-        }
-
-        for (AzToolsFramework::InstanceDataNode& child : node.GetChildren())
-        {
-            visitNode(child);
-        }
-    };
-    visitNode(hierarchy);
-}
-
-EditorPreferencesTreeWidgetItem::~EditorPreferencesTreeWidgetItem()
-{
-}
-
-
-IPreferencesPage* EditorPreferencesTreeWidgetItem::GetPreferencesPage() const
-{
-    return m_preferencesPage;
-}
-
-void EditorPreferencesTreeWidgetItem::Filter(const QString& filter)
-{
-    // Everything on a page matches the filter if its or any of its parents' text matches
-    m_entirePageMatchesFilter = false;
-    QTreeWidgetItem* item = this;
-    while (item && !m_entirePageMatchesFilter)
-    {
-        m_entirePageMatchesFilter = item->text(0).contains(filter, Qt::CaseInsensitive);
-        item = item->parent();
-    }
-
-    // Otherwise, just check the contents to see if there's a match
-    bool filtered = !m_entirePageMatchesFilter;
-    for (auto it = m_propertyNames.begin(), end = m_propertyNames.end(); it != end && filtered; ++it)
-    {
-        filtered = !(*it).contains(filter, Qt::CaseInsensitive);
-    }
-
-    setHidden(filtered);
-}
-
-void EditorPreferencesTreeWidgetItem::UpdateEditorFilter(AzToolsFramework::ReflectedPropertyEditor* editor, const QString& filter)
-{
-    QString filterText = m_entirePageMatchesFilter ? QString() : filter;
-    editor->InvalidateAll(filterText.toUtf8().constData());
-    editor->ExpandAll();
-}
diff --git a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.h b/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.h
deleted file mode 100644
index f22c61bae6..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <QTreeWidgetItem>
-#include <QPixmap>
-
-struct IPreferencesPage;
-
-namespace AzToolsFramework
-{
-    class ReflectedPropertyEditor;
-}
-
-class EditorPreferencesTreeWidgetItem
-    : public QTreeWidgetItem
-{
-public:
-
-    enum CustomType
-    {
-        EditorPreferencesPage = QTreeWidgetItem::UserType
-    };
-
-    EditorPreferencesTreeWidgetItem(IPreferencesPage* page, const QPixmap& selectedImage, QPixmap& unselectedImage);
-    EditorPreferencesTreeWidgetItem(IPreferencesPage* page, const QIcon& icon);
-    ~EditorPreferencesTreeWidgetItem();
-
-    void Filter(const QString& filter);
-    void UpdateEditorFilter(AzToolsFramework::ReflectedPropertyEditor* editor, const QString& filter);
-
-    IPreferencesPage* GetPreferencesPage() const;
-
-private:
-    void Setup(IPreferencesPage* page);
-
-    IPreferencesPage* m_preferencesPage;
-    QPixmap m_selectedImage;
-    QPixmap m_unselectedImage;
-    QStringList m_propertyNames;
-    bool m_entirePageMatchesFilter;
-};
-
diff --git a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp b/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp
deleted file mode 100644
index 843572b8cc..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-#include "EditorPreferencesTreeWidgetItemDelegate.h"
-#include <QIcon>
-#include <QPainter>
-#include <QStyledItemDelegate>
-
-static const int IconX = 26;
-static const int TextX = 27;
-
-EditorPreferencesTreeWidgetItemDelegate::EditorPreferencesTreeWidgetItemDelegate(QWidget* parent)
-    : QStyledItemDelegate(parent)
-{
-    m_mouseOverBrush = QBrush(QColor(0x40, 0x40, 0x40));
-    m_selectedBrush = QBrush(QColor(0x47, 0x47, 0x47));
-}
-
-void EditorPreferencesTreeWidgetItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-    painter->save();
-    painter->setPen(Qt::NoPen);
-
-    const auto textHeight = option.fontMetrics.height();
-    int vCenter = option.rect.bottom() - option.rect.height() / 2;
-    int iconSize = option.decorationSize.width();
-
-    if ((option.state & QStyle::State_Selected) || (option.state & QStyle::State_MouseOver))
-    {
-        if ((option.state & QStyle::State_Selected))
-        {
-            painter->setBrush(m_selectedBrush);
-        }
-        else if ((option.state & QStyle::State_MouseOver))
-        {
-            painter->setBrush(m_mouseOverBrush);
-        }
-
-        const QRect backGroundRect(option.rect.left(), option.rect.top(), option.rect.width(), option.rect.height());
-        painter->drawRect(backGroundRect);
-    }
-
-    const auto& iconVariant = index.data(Qt::DecorationRole);
-    if (!iconVariant.isNull())
-    {
-        const auto& icon = iconVariant.value<QIcon>();
-        QRect r(IconX, vCenter - iconSize/2, iconSize, iconSize);
-        r.setX(-r.width());
-        icon.paint(painter, r);
-    }
-
-    const QString& text = index.data(Qt::DisplayRole).toString();
-    painter->setPen(Qt::white);
-    const auto textRect = QRect{ TextX, vCenter - textHeight/2, option.rect.width() - TextX, textHeight };
-    painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text);
-
-    painter->restore();
-}
-
-QSize EditorPreferencesTreeWidgetItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-    return QStyledItemDelegate::sizeHint(option, index);
-}
-
-#include <moc_EditorPreferencesTreeWidgetItemDelegate.cpp>
diff --git a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.h b/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.h
deleted file mode 100644
index 589cc5dfac..0000000000
--- a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <QStyledItemDelegate>
-
-class EditorPreferencesTreeWidgetItemDelegate
-    : public QStyledItemDelegate
-{
-    Q_OBJECT
-
-public:
-    explicit EditorPreferencesTreeWidgetItemDelegate(QWidget* parent = nullptr);
-
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-
-private:
-    QBrush m_selectedBrush;
-    QBrush m_mouseOverBrush;
-};
-
diff --git a/Code/Sandbox/Editor/EditorToolsApplication.cpp b/Code/Sandbox/Editor/EditorToolsApplication.cpp
deleted file mode 100644
index f9fdde6c4e..0000000000
--- a/Code/Sandbox/Editor/EditorToolsApplication.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "EditorToolsApplication.h"
-
-// Qt
-#include <QMessageBox>
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailerComponent.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserComponent.h>
-
-// Editor
-#include "MainWindow.h"
-#include "CryEdit.h"
-#include "DisplaySettingsPythonFuncs.h"
-#include "GameEngine.h"
-#include "PythonEditorFuncs.h"
-#include "TrackView/TrackViewPythonFuncs.h"
-#include "Include/IObjectManager.h"
-#include "Objects/ObjectManager.h"
-
-namespace EditorInternal
-{
-    EditorToolsApplication::EditorToolsApplication(int* argc, char*** argv)
-        : ToolsApplication(argc, argv)
-    {
-        EditorToolsApplicationRequests::Bus::Handler::BusConnect();
-    }
-
-    EditorToolsApplication::~EditorToolsApplication()
-    {
-        EditorToolsApplicationRequests::Bus::Handler::BusDisconnect();
-        Stop();
-    }
-
-
-    bool EditorToolsApplication::IsStartupAborted() const
-    {
-        return m_StartupAborted;
-    }
-
-
-    void EditorToolsApplication::RegisterCoreComponents()
-    {
-        AzToolsFramework::ToolsApplication::RegisterCoreComponents();
-
-        // Expose Legacy Python Bindings to Behavior Context for EditorPythonBindings Gem
-        RegisterComponentDescriptor(AzToolsFramework::CryEditPythonHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::CryEditDocFuncsHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsPythonFuncsHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::MainWindowEditorFuncsHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::ObjectManagerFuncsHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::PythonEditorComponent::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::PythonEditorFuncsHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsComponent::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::TrackViewComponent::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::TrackViewFuncsHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::ViewPanePythonFuncsHandler::CreateDescriptor());
-        RegisterComponentDescriptor(AzToolsFramework::ViewportTitleDlgPythonFuncsHandler::CreateDescriptor());
-    }
-
-    AZ::ComponentTypeList EditorToolsApplication::GetRequiredSystemComponents() const
-    {
-        AZ::ComponentTypeList components = AzToolsFramework::ToolsApplication::GetRequiredSystemComponents();
-
-        components.emplace_back(azrtti_typeid<AzToolsFramework::Thumbnailer::ThumbnailerComponent>());
-        components.emplace_back(azrtti_typeid<AzToolsFramework::AssetBrowser::AssetBrowserComponent>());
-
-        // Add new Bus-based Python Bindings
-        components.emplace_back(azrtti_typeid<AzToolsFramework::DisplaySettingsComponent>());
-        components.emplace_back(azrtti_typeid<AzToolsFramework::PythonEditorComponent>());
-        components.emplace_back(azrtti_typeid<AzToolsFramework::TrackViewComponent>());
-
-        return components;
-    }
-
-
-    void EditorToolsApplication::StartCommon(AZ::Entity* systemEntity)
-    {
-        AzToolsFramework::ToolsApplication::StartCommon(systemEntity);
-
-        m_StartupAborted = m_moduleManager->m_quitRequested;
-
-        if (systemEntity->GetState() != AZ::Entity::State::Active)
-        {
-            m_StartupAborted = true;
-        }
-    }
-
-    bool EditorToolsApplication::Start()
-    {
-        AzFramework::Application::StartupParameters params;
-
-        // Must be done before creating QApplication, otherwise asserts when we alloc
-        AzToolsFramework::ToolsApplication::Start({}, params);
-        if (IsStartupAborted() || !m_systemEntity)
-        {
-            AzToolsFramework::ToolsApplication::Stop();
-            return false;
-        }
-        return true;
-    }
-
-    void EditorToolsApplication::QueryApplicationType(AZ::ApplicationTypeQuery& appType) const
-    { 
-        appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Editor | AZ::ApplicationTypeQuery::Masks::Tool;
-    };
-
-    void EditorToolsApplication::CreateReflectionManager()
-    {
-        ToolsApplication::CreateReflectionManager();
-
-        GetSerializeContext()->CreateEditContext();
-    }
-
-    void EditorToolsApplication::Reflect(AZ::ReflectContext* context)
-    {
-        ToolsApplication::Reflect(context);
-
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<EditorToolsApplicationRequestBus>("EditorToolsApplicationRequestBus")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                ->Attribute(AZ::Script::Attributes::Category, "Editor")
-                ->Attribute(AZ::Script::Attributes::Module, "editor")
-                ->Event("OpenLevel", &EditorToolsApplicationRequests::OpenLevel)
-                ->Event("OpenLevelNoPrompt", &EditorToolsApplicationRequests::OpenLevelNoPrompt)
-                ->Event("CreateLevel", &EditorToolsApplicationRequests::CreateLevel)
-                ->Event("CreateLevelNoPrompt", &EditorToolsApplicationRequests::CreateLevelNoPrompt)
-                ->Event("GetGameFolder", &EditorToolsApplicationRequests::GetGameFolder)
-                ->Event("GetCurrentLevelName", &EditorToolsApplicationRequests::GetCurrentLevelName)
-                ->Event("GetCurrentLevelPath", &EditorToolsApplicationRequests::GetCurrentLevelPath)
-                ->Event("Exit", &EditorToolsApplicationRequests::Exit)
-                ->Event("ExitNoPrompt", &EditorToolsApplicationRequests::ExitNoPrompt)
-                ;
-        }
-    }
-
-    AZStd::string EditorToolsApplication::GetGameFolder() const
-    {
-        return Path::GetEditingGameDataFolder();
-    }
-
-    bool EditorToolsApplication::OpenLevel(AZStd::string_view levelName)
-    {
-        AZStd::string levelPath = levelName;
-
-        if (!AZ::IO::SystemFile::Exists(levelPath.c_str()))
-        {
-            // now let's check if they pre-pended directories (Samples/SomeLevelName)
-            AZStd::string levelFileName;
-            {
-                AZStd::size_t found = levelPath.find_last_of("/\\");
-                if (found == AZStd::string::npos)
-                {
-                    levelFileName = levelPath.substr(found + 1);
-                }
-                else
-                {
-                    levelFileName = levelPath;
-                }
-            }
-
-            // if the input path can't be found, let's automatically add on the game folder and the levels
-            AzFramework::StringFunc::Path::Join(levelPath.c_str(), levelFileName.c_str(), levelPath);
-            AzFramework::StringFunc::Path::Join(DefaultLevelFolder, levelPath.c_str(), levelPath);
-            AzFramework::StringFunc::Path::Join(GetGameFolder().c_str(), levelPath.c_str(), levelPath);
-
-            // make sure the level path includes the cry extension, if needed
-            if (!levelFileName.ends_with(GetOldCryLevelExtension()) && !levelFileName.ends_with(GetLevelExtension()))
-            {
-                AZStd::size_t levelPathLength = levelPath.length();
-                levelPath += GetOldCryLevelExtension();
-
-                // Check if there is a .cry file, otherwise assume it is a new .ly file
-                if (!AZ::IO::SystemFile::Exists(levelPath.c_str()))
-                {
-                    levelPath.replace(levelPathLength, sizeof(GetOldCryLevelExtension()) - 1, GetLevelExtension());
-                }
-            }
-
-            if (!AZ::IO::SystemFile::Exists(levelPath.c_str()))
-            {
-                return false;
-            }
-        }
-        
-        auto previousDocument = GetIEditor()->GetDocument();
-        QString previousPathName = (previousDocument != nullptr) ? previousDocument->GetLevelPathName() : "";
-        auto newDocument = CCryEditApp::instance()->OpenDocumentFile(levelPath.c_str());
-
-        // the underlying document pointer doesn't change, so we can't check that; use the path name's instead
-        return newDocument && !newDocument->IsLevelLoadFailed() && (newDocument->GetLevelPathName() != previousPathName);
-    }
-
-    bool EditorToolsApplication::OpenLevelNoPrompt(AZStd::string_view levelName)
-    {
-        GetIEditor()->GetDocument()->SetModifiedFlag(false);
-        return OpenLevel(levelName);
-    }
-
-    int EditorToolsApplication::CreateLevel(AZStd::string_view levelName, bool /*bUseTerrain*/)
-    {
-        // Clang warns about a temporary being created in a function's argument list, so fullyQualifiedLevelName before the call
-        QString fullyQualifiedLevelName;
-        return CCryEditApp::instance()->CreateLevel(QString::fromUtf8(levelName.data(), static_cast<int>(levelName.size())), fullyQualifiedLevelName);
-    }
-
-    int EditorToolsApplication::CreateLevelNoPrompt(AZStd::string_view levelName, int /*terrainExportTextureSize*/, bool /*useTerrain*/)
-    {
-        // If a level was open, ignore any unsaved changes if it had been modified
-        if (GetIEditor()->IsLevelLoaded())
-        {
-            GetIEditor()->GetDocument()->SetModifiedFlag(false);
-        }
-
-        // Clang warns about a temporary being created in a function's argument list, so fullyQualifiedLevelName before the call
-        QString fullyQualifiedLevelName;
-        return CCryEditApp::instance()->CreateLevel(QString::fromUtf8(levelName.data(), static_cast<int>(levelName.size())), fullyQualifiedLevelName);
-    }
-
-    AZStd::string EditorToolsApplication::GetCurrentLevelName() const
-    {
-        return AZStd::string(GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().data());
-    }
-
-    AZStd::string EditorToolsApplication::GetCurrentLevelPath() const
-    {
-        return AZStd::string(GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data());
-    }
-
-    const char* EditorToolsApplication::GetLevelExtension() const
-    {
-        bool prefabSystemEnabled = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(
-            prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-        if (!prefabSystemEnabled)
-        {
-            return ".ly";
-        }
-        else
-        {
-            return ".prefab";
-        }
-    }
-
-    const char* EditorToolsApplication::GetOldCryLevelExtension() const
-    {
-        return ".cry";
-    }
-
-    void EditorToolsApplication::Exit()
-    {
-        // Adding a single-shot QTimer to PyExit delays the QApplication::closeAllWindows call until
-        // all the events in the event queue have been processed. Calling QApplication::closeAllWindows instead
-        // of MainWindow::close ensures the Metal render window is cleaned up on macOS.
-        QTimer::singleShot(0, qApp, &QApplication::closeAllWindows);
-    }
-
-    void EditorToolsApplication::ExitNoPrompt()
-    {
-        // Set the level to "unmodified" so that it doesn't prompt to save on exit.
-        GetIEditor()->GetDocument()->SetModifiedFlag(false);
-        Exit();
-    }
-
-}
-
diff --git a/Code/Sandbox/Editor/EditorToolsApplication.h b/Code/Sandbox/Editor/EditorToolsApplication.h
deleted file mode 100644
index 71da0ee124..0000000000
--- a/Code/Sandbox/Editor/EditorToolsApplication.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-#include <AzToolsFramework/Application/ToolsApplication.h>
-
-#include "Core/EditorMetricsPlainTextNameRegistration.h"
-#include "EditorToolsApplicationAPI.h"
-
-namespace EditorInternal
-{
-    // Override the ToolsApplication so that we can special case when the config file is not
-    // found and give the user of the Editor a specific message about it.
-    class EditorToolsApplication
-        : public AzToolsFramework::ToolsApplication
-        , public EditorToolsApplicationRequests::Bus::Handler
-    {
-    public:
-        EditorToolsApplication(int* argc, char*** argv);
-        ~EditorToolsApplication();
-
-        bool IsStartupAborted() const;
-
-        void RegisterCoreComponents() override;
-
-        AZ::ComponentTypeList GetRequiredSystemComponents() const;
-
-        void StartCommon(AZ::Entity* systemEntity) override;
-
-        using AzToolsFramework::ToolsApplication::Start;
-        bool Start();
-
-        //////////////////////////////////////////////////////////////////////////
-        // AzFramework::ApplicationRequests::Bus
-        void QueryApplicationType(AZ::ApplicationTypeQuery& appType) const override;
-        //////////////////////////////////////////////////////////////////////////
-
-        // From AzToolsFramework::ToolsApplication
-        void CreateReflectionManager() override;
-        void Reflect(AZ::ReflectContext* context) override;
-
-    protected:
-        // From EditorToolsApplicationRequests
-        bool OpenLevel(AZStd::string_view levelName) override;
-        bool OpenLevelNoPrompt(AZStd::string_view levelName) override;
-
-        int CreateLevel(AZStd::string_view levelName, bool bUseTerrain) override;
-        int CreateLevelNoPrompt(AZStd::string_view levelName, int terrainExportTextureSize, bool useTerrain) override;
-
-        void Exit() override;
-        void ExitNoPrompt() override;
-
-        AZStd::string GetGameFolder() const override;
-        AZStd::string GetCurrentLevelName() const override;
-        AZStd::string GetCurrentLevelPath() const override;
-
-        const char* GetOldCryLevelExtension() const override;
-        const char* GetLevelExtension() const override;
-
-    private:
-        static constexpr char DefaultLevelFolder[] = "Levels";
-
-        bool m_StartupAborted = false;
-        Editor::EditorMetricsPlainTextNameRegistrationBusListener m_metricsPlainTextRegistrar;
-    };
-
-}
-
-
diff --git a/Code/Sandbox/Editor/EditorToolsApplicationAPI.h b/Code/Sandbox/Editor/EditorToolsApplicationAPI.h
deleted file mode 100644
index ab1d867394..0000000000
--- a/Code/Sandbox/Editor/EditorToolsApplicationAPI.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-namespace EditorInternal
-{
-    /**
-     * Bus used to make general requests to the ToolsApplication.
-     */
-    class EditorToolsApplicationRequests
-        : public AZ::EBusTraits
-    {
-    public:
-
-        using Bus = AZ::EBus<EditorToolsApplicationRequests>;
-
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        //////////////////////////////////////////////////////////////////////////
-
-        virtual bool OpenLevel(AZStd::string_view levelName) = 0;
-        virtual bool OpenLevelNoPrompt(AZStd::string_view levelName) = 0;
-
-        virtual int CreateLevel(AZStd::string_view levelName, bool bUseTerrain) = 0;
-        virtual int CreateLevelNoPrompt(AZStd::string_view levelName, int terrainExportTextureSize, bool useTerrain) = 0;
-
-        virtual AZStd::string GetGameFolder() const = 0;
-        virtual AZStd::string GetCurrentLevelName() const = 0;
-        virtual AZStd::string GetCurrentLevelPath() const = 0;
-
-        //! Retrieve old cry level file extension (With prepending '.')
-        virtual const char* GetOldCryLevelExtension() const = 0;
-        //! Retrieve default level file extension (With prepending '.')
-        virtual const char* GetLevelExtension() const = 0;
-
-        virtual void Exit() = 0;
-        virtual void ExitNoPrompt() = 0;
-    };
-
-    using EditorToolsApplicationRequestBus = AZ::EBus<EditorToolsApplicationRequests>;
-    
-} // namespace EditorInternal
-
diff --git a/Code/Sandbox/Editor/EditorViewportSettings.cpp b/Code/Sandbox/Editor/EditorViewportSettings.cpp
deleted file mode 100644
index 84cef6b8a4..0000000000
--- a/Code/Sandbox/Editor/EditorViewportSettings.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <EditorViewportSettings.h>
-
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/Settings/SettingsRegistry.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/std/string/string_view.h>
-
-namespace SandboxEditor
-{
-    constexpr AZStd::string_view GridSnappingSetting = "/Amazon/Preferences/Editor/GridSnapping";
-    constexpr AZStd::string_view GridSizeSetting = "/Amazon/Preferences/Editor/GridSize";
-    constexpr AZStd::string_view AngleSnappingSetting = "/Amazon/Preferences/Editor/AngleSnapping";
-    constexpr AZStd::string_view AngleSizeSetting = "/Amazon/Preferences/Editor/AngleSize";
-    constexpr AZStd::string_view ShowGridSetting = "/Amazon/Preferences/Editor/ShowGrid";
-    constexpr AZStd::string_view CameraTranslateSpeedSetting = "/Amazon/Preferences/Editor/Camera/TranslateSpeed";
-    constexpr AZStd::string_view CameraBoostMultiplierSetting = "/Amazon/Preferences/Editor/Camera/BoostMultiplier";
-    constexpr AZStd::string_view CameraRotateSpeedSetting = "/Amazon/Preferences/Editor/Camera/RotateSpeed";
-    constexpr AZStd::string_view CameraScrollSpeedSetting = "/Amazon/Preferences/Editor/Camera/DollyScrollSpeed";
-    constexpr AZStd::string_view CameraDollyMotionSpeedSetting = "/Amazon/Preferences/Editor/Camera/DollyMotionSpeed";
-    constexpr AZStd::string_view CameraOrbitYawRotationInvertedSetting = "/Amazon/Preferences/Editor/Camera/YawRotationInverted";
-    constexpr AZStd::string_view CameraPanInvertedXSetting = "/Amazon/Preferences/Editor/Camera/PanInvertedX";
-    constexpr AZStd::string_view CameraPanInvertedYSetting = "/Amazon/Preferences/Editor/Camera/PanInvertedY";
-    constexpr AZStd::string_view CameraPanSpeedSetting = "/Amazon/Preferences/Editor/Camera/PanSpeed";
-    constexpr AZStd::string_view CameraRotateSmoothnessSetting = "/Amazon/Preferences/Editor/Camera/RotateSmoothness";
-    constexpr AZStd::string_view CameraTranslateSmoothnessSetting = "/Amazon/Preferences/Editor/Camera/TranslateSmoothness";
-
-    template<typename T>
-    void SetRegistry(const AZStd::string_view setting, T&& value)
-    {
-        if (auto* registry = AZ::SettingsRegistry::Get())
-        {
-            registry->Set(setting, AZStd::forward<T>(value));
-        }
-    }
-
-    template<typename T>
-    AZStd::remove_cvref_t<T> GetRegistry(const AZStd::string_view setting, T&& defaultValue)
-    {
-        AZStd::remove_cvref_t<T> value = AZStd::forward<T>(defaultValue);
-        if (auto* registry = AZ::SettingsRegistry::Get())
-        {
-            registry->Get(value, setting);
-        }
-
-        return value;
-    }
-
-    struct EditorViewportSettingsCallbacksImpl : public EditorViewportSettingsCallbacks
-    {
-        EditorViewportSettingsCallbacksImpl()
-        {
-            if (auto* registry = AZ::SettingsRegistry::Get())
-            {
-                using AZ::SettingsRegistryMergeUtils::IsPathAncestorDescendantOrEqual;
-
-                m_notifyEventHandler = registry->RegisterNotifier(
-                    [this](const AZStd::string_view path, [[maybe_unused]] const AZ::SettingsRegistryInterface::Type type)
-                    {
-                        if (IsPathAncestorDescendantOrEqual(GridSnappingSetting, path))
-                        {
-                            m_gridSnappingChanged.Signal(GridSnappingEnabled());
-                        }
-                    });
-            }
-        }
-
-        void SetGridSnappingChangedEvent(GridSnappingChangedEvent::Handler& handler) override
-        {
-            handler.Connect(m_gridSnappingChanged);
-        }
-
-        GridSnappingChangedEvent m_gridSnappingChanged;
-        AZ::SettingsRegistryInterface::NotifyEventHandler m_notifyEventHandler;
-    };
-
-    AZStd::unique_ptr<EditorViewportSettingsCallbacks> CreateEditorViewportSettingsCallbacks()
-    {
-        return AZStd::make_unique<EditorViewportSettingsCallbacksImpl>();
-    }
-
-    bool GridSnappingEnabled()
-    {
-        return GetRegistry(GridSnappingSetting, false);
-    }
-
-    void SetGridSnapping(const bool enabled)
-    {
-        SetRegistry(GridSnappingSetting, enabled);
-    }
-
-    float GridSnappingSize()
-    {
-        return aznumeric_cast<float>(GetRegistry(GridSizeSetting, 0.1));
-    }
-
-    void SetGridSnappingSize(const float size)
-    {
-        SetRegistry(GridSizeSetting, size);
-    }
-
-    bool AngleSnappingEnabled()
-    {
-        return GetRegistry(AngleSnappingSetting, false);
-    }
-
-    void SetAngleSnapping(const bool enabled)
-    {
-        SetRegistry(AngleSnappingSetting, enabled);
-    }
-
-    float AngleSnappingSize()
-    {
-        return aznumeric_cast<float>(GetRegistry(AngleSizeSetting, 5.0));
-    }
-
-    void SetAngleSnappingSize(const float size)
-    {
-        SetRegistry(AngleSizeSetting, size);
-    }
-
-    bool ShowingGrid()
-    {
-        return GetRegistry(ShowGridSetting, false);
-    }
-
-    void SetShowingGrid(const bool showing)
-    {
-        SetRegistry(ShowGridSetting, showing);
-    }
-
-    float CameraTranslateSpeed()
-    {
-        return aznumeric_cast<float>(GetRegistry(CameraTranslateSpeedSetting, 10.0));
-    }
-
-    void SetCameraTranslateSpeed(const float speed)
-    {
-        SetRegistry(CameraTranslateSpeedSetting, speed);
-    }
-
-    float CameraBoostMultiplier()
-    {
-        return aznumeric_cast<float>(GetRegistry(CameraBoostMultiplierSetting, 3.0));
-    }
-
-    void SetCameraBoostMultiplier(const float multiplier)
-    {
-        SetRegistry(CameraBoostMultiplierSetting, multiplier);
-    }
-
-    float CameraRotateSpeed()
-    {
-        return aznumeric_cast<float>(GetRegistry(CameraRotateSpeedSetting, 0.005));
-    }
-
-    void SetCameraRotateSpeed(const float speed)
-    {
-        SetRegistry(CameraRotateSpeedSetting, speed);
-    }
-
-    float CameraScrollSpeed()
-    {
-        return aznumeric_cast<float>(GetRegistry(CameraScrollSpeedSetting, 0.02));
-    }
-
-    void SetCameraScrollSpeed(const float speed)
-    {
-        SetRegistry(CameraScrollSpeedSetting, speed);
-    }
-
-    float CameraDollyMotionSpeed()
-    {
-        return aznumeric_cast<float>(GetRegistry(CameraDollyMotionSpeedSetting, 0.01));
-    }
-
-    void SetCameraDollyMotionSpeed(const float speed)
-    {
-        SetRegistry(CameraDollyMotionSpeedSetting, speed);
-    }
-
-    bool CameraOrbitYawRotationInverted()
-    {
-        return GetRegistry(CameraOrbitYawRotationInvertedSetting, false);
-    }
-
-    void SetCameraOrbitYawRotationInverted(const bool inverted)
-    {
-        SetRegistry(CameraOrbitYawRotationInvertedSetting, inverted);
-    }
-
-    bool CameraPanInvertedX()
-    {
-        return GetRegistry(CameraPanInvertedXSetting, true);
-    }
-
-    void SetCameraPanInvertedX(const bool inverted)
-    {
-        SetRegistry(CameraPanInvertedXSetting, inverted);
-    }
-
-    bool CameraPanInvertedY()
-    {
-        return GetRegistry(CameraPanInvertedYSetting, true);
-    }
-
-    void SetCameraPanInvertedY(const bool inverted)
-    {
-        SetRegistry(CameraPanInvertedYSetting, inverted);
-    }
-
-    float CameraPanSpeed()
-    {
-        return aznumeric_cast<float>(GetRegistry(CameraPanSpeedSetting, 0.01));
-    }
-
-    void SetCameraPanSpeed(float speed)
-    {
-        SetRegistry(CameraPanSpeedSetting, speed);
-    }
-
-    float CameraRotateSmoothness()
-    {
-        return aznumeric_cast<float>(GetRegistry(CameraRotateSmoothnessSetting, 5.0));
-    }
-
-    void SetCameraRotateSmoothness(const float smoothness)
-    {
-        SetRegistry(CameraRotateSmoothnessSetting, smoothness);
-    }
-
-    float CameraTranslateSmoothness()
-    {
-        return aznumeric_cast<float>(GetRegistry(CameraTranslateSmoothnessSetting, 5.0));
-    }
-
-    void SetCameraTranslateSmoothness(const float smoothness)
-    {
-        SetRegistry(CameraTranslateSmoothnessSetting, smoothness);
-    }
-} // namespace SandboxEditor
diff --git a/Code/Sandbox/Editor/EditorViewportSettings.h b/Code/Sandbox/Editor/EditorViewportSettings.h
deleted file mode 100644
index dd206436ea..0000000000
--- a/Code/Sandbox/Editor/EditorViewportSettings.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SandboxAPI.h>
-
-#include <AzCore/Settings/SettingsRegistry.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-
-namespace SandboxEditor
-{
-    using GridSnappingChangedEvent = AZ::Event<bool>;
-
-    //! Set callbacks to listen for editor settings change events.
-    class EditorViewportSettingsCallbacks
-    {
-    public:
-        virtual ~EditorViewportSettingsCallbacks() = default;
-
-        virtual void SetGridSnappingChangedEvent(GridSnappingChangedEvent::Handler& handler) = 0;
-    };
-
-    //! Create an instance of EditorViewportSettingsCallbacks
-    //! Note: EditorViewportSettingsCallbacks is implemented in EditorViewportSettings.cpp - a change
-    //! event will fire when a value in the settings registry (editorpreferences.setreg) is modified.
-    SANDBOX_API AZStd::unique_ptr<EditorViewportSettingsCallbacks> CreateEditorViewportSettingsCallbacks();
-
-    SANDBOX_API bool GridSnappingEnabled();
-    SANDBOX_API void SetGridSnapping(bool enabled);
-
-    SANDBOX_API float GridSnappingSize();
-    SANDBOX_API void SetGridSnappingSize(float size);
-
-    SANDBOX_API bool AngleSnappingEnabled();
-    SANDBOX_API void SetAngleSnapping(bool enabled);
-
-    SANDBOX_API float AngleSnappingSize();
-    SANDBOX_API void SetAngleSnappingSize(float size);
-
-    SANDBOX_API bool ShowingGrid();
-    SANDBOX_API void SetShowingGrid(bool showing);
-
-    SANDBOX_API float CameraTranslateSpeed();
-    SANDBOX_API void SetCameraTranslateSpeed(float speed);
-
-    SANDBOX_API float CameraBoostMultiplier();
-    SANDBOX_API void SetCameraBoostMultiplier(float multiplier);
-
-    SANDBOX_API float CameraRotateSpeed();
-    SANDBOX_API void SetCameraRotateSpeed(float speed);
-
-    SANDBOX_API float CameraScrollSpeed();
-    SANDBOX_API void SetCameraScrollSpeed(float speed);
-
-    SANDBOX_API float CameraDollyMotionSpeed();
-    SANDBOX_API void SetCameraDollyMotionSpeed(float speed);
-
-    SANDBOX_API bool CameraOrbitYawRotationInverted();
-    SANDBOX_API void SetCameraOrbitYawRotationInverted(bool inverted);
-
-    SANDBOX_API bool CameraPanInvertedX();
-    SANDBOX_API void SetCameraPanInvertedX(bool inverted);
-
-    SANDBOX_API bool CameraPanInvertedY();
-    SANDBOX_API void SetCameraPanInvertedY(bool inverted);
-
-    SANDBOX_API float CameraPanSpeed();
-    SANDBOX_API void SetCameraPanSpeed(float speed);
-
-    SANDBOX_API float CameraRotateSmoothness();
-    SANDBOX_API void SetCameraRotateSmoothness(float smoothness);
-
-    SANDBOX_API float CameraTranslateSmoothness();
-    SANDBOX_API void SetCameraTranslateSmoothness(float smoothness);
-
-    //! Return if the new editor camera system is enabled or not.
-    //! @note This is implemented in EditorViewportWidget.cpp
-    SANDBOX_API bool UsingNewCameraSystem();
-} // namespace SandboxEditor
diff --git a/Code/Sandbox/Editor/EditorViewportWidget.cpp b/Code/Sandbox/Editor/EditorViewportWidget.cpp
deleted file mode 100644
index 82ec8e4092..0000000000
--- a/Code/Sandbox/Editor/EditorViewportWidget.cpp
+++ /dev/null
@@ -1,3194 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation filefov
-
-#include "EditorDefs.h"
-
-#include "EditorViewportWidget.h"
-
-// Qt
-#include <QPainter>
-#include <QScopedValueRollback>
-#include <QCheckBox>
-#include <QMessageBox>
-#include <QTimer>
-#include <QBoxLayout>
-
-// AzCore
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Math/VectorConversions.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Console/IConsole.h>
-
-// AzFramework
-#include <AzFramework/Components/CameraBus.h>
-#include <AzFramework/Viewport/DisplayContextRequestBus.h>
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-#if defined(AZ_PLATFORM_WINDOWS)
-#   include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
-#endif // defined(AZ_PLATFORM_WINDOWS)
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>                   // for AzFramework::InputDeviceMouse
-#include <AzFramework/Viewport/ViewportControllerList.h>
-
-// AzQtComponents
-#include <AzQtComponents/Utilities/QtWindowUtilities.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
-#include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
-#include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
-
-// AtomToolsFramework
-#include <AtomToolsFramework/Viewport/RenderViewportWidget.h>
-#include <AtomToolsFramework/Viewport/ModularViewportCameraController.h>
-
-// CryCommon
-#include <CryCommon/HMDBus.h>
-
-// AzFramework
-#include <AzFramework/Render/IntersectorInterface.h>
-
-// Editor
-#include "Util/fastlib.h"
-#include "CryEditDoc.h"
-#include "GameEngine.h"
-#include "ViewManager.h"
-#include "Objects/DisplayContext.h"
-#include "DisplaySettings.h"
-#include "Include/IObjectManager.h"
-#include "Include/IDisplayViewport.h"
-#include "Objects/ObjectManager.h"
-#include "ProcessInfo.h"
-#include "IPostEffectGroup.h"
-#include "EditorPreferencesPageGeneral.h"
-#include "ViewportManipulatorController.h"
-#include "LegacyViewportCameraController.h"
-
-#include "ViewPane.h"
-#include "CustomResolutionDlg.h"
-#include "AnimationContext.h"
-#include "Objects/SelectionGroup.h"
-#include "Core/QtEditorApplication.h"
-#include "MainWindow.h"
-#include "LayoutWnd.h"
-
-// ComponentEntityEditorPlugin
-#include <Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h>
-
-// LmbrCentral
-#include <LmbrCentral/Rendering/EditorCameraCorrectionBus.h>
-
-// Atom
-#include <Atom/RPI.Public/View.h>
-#include <Atom/RPI.Public/ViewportContextManager.h>
-#include <AzCore/Console/IConsole.h>
-#include <AzCore/Math/MatrixUtils.h>
-
-#include <QtGui/private/qhighdpiscaling_p.h>
-
-#include <IEntityRenderState.h>
-#include <IPhysics.h>
-#include <IStatObj.h>
-
-AZ_CVAR(
-    bool, ed_visibility_logTiming, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Output the timing of the new IVisibilitySystem query");
-AZ_CVAR(bool, ed_useNewCameraSystem, true, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Editor camera system");
-
-namespace SandboxEditor
-{
-    bool UsingNewCameraSystem()
-    {
-        return ed_useNewCameraSystem;
-    }
-} // namespace SandboxEditor
-
-EditorViewportWidget* EditorViewportWidget::m_pPrimaryViewport = nullptr;
-
-namespace AzFramework
-{
-    extern InputChannelId CameraFreeLookButton;
-    extern InputChannelId CameraFreePanButton;
-    extern InputChannelId CameraOrbitLookButton;
-    extern InputChannelId CameraOrbitDollyButton;
-    extern InputChannelId CameraOrbitPanButton;
-} // namespace AzFramework
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-void StopFixedCursorMode();
-void StartFixedCursorMode(QObject *viewport);
-#endif
-
-#define RENDER_MESH_TEST_DISTANCE (0.2f)
-#define CURSOR_FONT_HEIGHT  8.0f
-
-//! Viewport settings for the EditorViewportWidget
-struct EditorViewportSettings : public AzToolsFramework::ViewportInteraction::ViewportSettings
-{
-    bool GridSnappingEnabled() const override;
-    float GridSize() const override;
-    bool ShowGrid() const override;
-    bool AngleSnappingEnabled() const override;
-    float AngleStep() const override;
-};
-
-static const EditorViewportSettings g_EditorViewportSettings;
-
-namespace AZ::ViewportHelpers
-{
-    static const char TextCantCreateCameraNoLevel[] = "Cannot create camera when no level is loaded.";
-
-    class EditorEntityNotifications
-        : public AzToolsFramework::EditorEntityContextNotificationBus::Handler
-    {
-    public:
-        EditorEntityNotifications(EditorViewportWidget& renderViewport)
-            : m_renderViewport(renderViewport)
-        {
-            AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
-        }
-
-        ~EditorEntityNotifications() override
-        {
-            AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
-        }
-
-        // AzToolsFramework::EditorEntityContextNotificationBus
-        void OnStartPlayInEditor() override
-        {
-            m_renderViewport.OnStartPlayInEditor();
-        }
-        void OnStopPlayInEditor() override
-        {
-            m_renderViewport.OnStopPlayInEditor();
-        }
-
-    private:
-        EditorViewportWidget& m_renderViewport;
-    };
-} // namespace AZ::ViewportHelpers
-
-//////////////////////////////////////////////////////////////////////////
-// EditorViewportWidget
-//////////////////////////////////////////////////////////////////////////
-
-EditorViewportWidget::EditorViewportWidget(const QString& name, QWidget* parent)
-    : QtViewport(parent)
-    , m_Camera(GetIEditor()->GetSystem()->GetViewCamera())
-    , m_camFOV(gSettings.viewports.fDefaultFov)
-    , m_defaultViewName(name)
-    , m_renderViewport(nullptr) //m_renderViewport is initialized later, in SetViewportId
-{
-    // need this to be set in order to allow for language switching on Windows
-    setAttribute(Qt::WA_InputMethodEnabled);
-    LockCameraMovement(true);
-
-    EditorViewportWidget::SetViewTM(m_Camera.GetMatrix());
-    m_defaultViewTM.SetIdentity();
-
-    if (GetIEditor()->GetViewManager()->GetSelectedViewport() == nullptr)
-    {
-        GetIEditor()->GetViewManager()->SelectViewport(this);
-    }
-
-    GetIEditor()->RegisterNotifyListener(this);
-
-    m_displayContext.pIconManager = GetIEditor()->GetIconManager();
-    GetIEditor()->GetUndoManager()->AddListener(this);
-
-    m_PhysicalLocation.SetIdentity();
-
-    // The renderer requires something, so don't allow us to shrink to absolutely nothing
-    // This won't in fact stop the viewport from being shrunk, when it's the centralWidget for
-    // the MainWindow, but it will stop the viewport from getting resize events
-    // once it's smaller than that, which from the renderer's perspective works out
-    // to be the same thing.
-    setMinimumSize(50, 50);
-
-    OnCreate();
-
-    setMouseTracking(true);
-
-    Camera::EditorCameraRequestBus::Handler::BusConnect();
-    m_editorEntityNotifications = AZStd::make_unique<AZ::ViewportHelpers::EditorEntityNotifications>(*this);
-    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-
-    auto handleCameraChange = [this](const AZ::Matrix4x4&)
-    {
-        UpdateCameraFromViewportContext();
-    };
-
-    m_cameraViewMatrixChangeHandler = AZ::RPI::ViewportContext::MatrixChangedEvent::Handler(handleCameraChange);
-    m_cameraProjectionMatrixChangeHandler = AZ::RPI::ViewportContext::MatrixChangedEvent::Handler(handleCameraChange);
-
-    m_manipulatorManager = GetIEditor()->GetViewManager()->GetManipulatorManager();
-    if (!m_pPrimaryViewport)
-    {
-        SetAsActiveViewport();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-EditorViewportWidget::~EditorViewportWidget()
-{
-    if (m_pPrimaryViewport == this)
-    {
-        m_pPrimaryViewport = nullptr;
-    }
-
-    DisconnectViewportInteractionRequestBus();
-    m_editorEntityNotifications.reset();
-    Camera::EditorCameraRequestBus::Handler::BusDisconnect();
-    OnDestroy();
-    GetIEditor()->GetUndoManager()->RemoveListener(this);
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// EditorViewportWidget message handlers
-//////////////////////////////////////////////////////////////////////////
-int EditorViewportWidget::OnCreate()
-{
-    CreateRenderContext();
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::resizeEvent(QResizeEvent* event)
-{
-    PushDisableRendering();
-    QtViewport::resizeEvent(event);
-    PopDisableRendering();
-
-    const QRect rcWindow = rect().translated(mapToGlobal(QPoint()));
-
-    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_MOVE, rcWindow.left(), rcWindow.top());
-
-    m_rcClient = rect();
-    m_rcClient.setBottomRight(WidgetToViewport(m_rcClient.bottomRight()));
-
-    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, width(), height());
-
-    // We queue the window resize event because the render overlay may be hidden.
-    // If the render overlay is not visible, the native window that is backing it will
-    // also be hidden, and it will not resize until it becomes visible.
-    m_windowResizedEvent = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::paintEvent([[maybe_unused]] QPaintEvent* event)
-{
-    // Do not call CViewport::OnPaint() for painting messages
-    // FIXME: paintEvent() isn't the best place for such logic. Should listen to proper eNotify events and to the stuff there instead. (Repeats for other view port classes too).
-    CGameEngine* ge = GetIEditor()->GetGameEngine();
-    if ((ge && ge->IsLevelLoaded()) || (GetType() != ET_ViewportCamera))
-    {
-        setRenderOverlayVisible(true);
-    }
-    else
-    {
-        setRenderOverlayVisible(false);
-        QPainter painter(this); // device context for painting
-
-        // draw gradient background
-        const QRect rc = rect();
-        QLinearGradient gradient(rc.topLeft(), rc.bottomLeft());
-        gradient.setColorAt(0, QColor(80, 80, 80));
-        gradient.setColorAt(1, QColor(200, 200, 200));
-        painter.fillRect(rc, gradient);
-
-        // if we have some level loaded/loading/new
-        // we draw a text
-        if (!GetIEditor()->GetLevelFolder().isEmpty())
-        {
-            const int kFontSize = 200;
-            const char* kFontName = "Arial";
-            const QColor kTextColor(255, 255, 255);
-            const QColor kTextShadowColor(0, 0, 0);
-            const QFont font(kFontName, kFontSize / 10.0);
-            painter.setFont(font);
-
-            QString friendlyName = QFileInfo(GetIEditor()->GetLevelName()).fileName();
-            const QString strMsg = tr("Preparing level %1...").arg(friendlyName);
-
-            // draw text shadow
-            painter.setPen(kTextShadowColor);
-            painter.drawText(rc, Qt::AlignCenter, strMsg);
-            painter.setPen(kTextColor);
-            // offset rect for normal text
-            painter.drawText(rc.translated(-1, -1), Qt::AlignCenter, strMsg);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::mousePressEvent(QMouseEvent* event)
-{
-    GetIEditor()->GetViewManager()->SelectViewport(this);
-
-    QtViewport::mousePressEvent(event);
-}
-
-AzToolsFramework::ViewportInteraction::MousePick EditorViewportWidget::BuildMousePickInternal(const QPoint& point) const
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-
-    MousePick mousePick;
-    mousePick.m_screenCoordinates = ScreenPointFromQPoint(point);
-    const auto& ray = m_renderViewport->ViewportScreenToWorldRay(mousePick.m_screenCoordinates);
-    if (ray.has_value())
-    {
-        mousePick.m_rayOrigin = ray.value().origin;
-        mousePick.m_rayDirection = ray.value().direction;
-    }
-    return mousePick;
-}
-
-AzToolsFramework::ViewportInteraction::MousePick EditorViewportWidget::BuildMousePick(const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-
-    PreWidgetRendering();
-    const MousePick mousePick = BuildMousePickInternal(point);
-    PostWidgetRendering();
-    return mousePick;
-}
-
-AzToolsFramework::ViewportInteraction::MouseInteraction EditorViewportWidget::BuildMouseInteractionInternal(
-    const AzToolsFramework::ViewportInteraction::MouseButtons buttons,
-    const AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
-    const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-
-    MouseInteraction mouse;
-    mouse.m_interactionId.m_cameraId = m_viewEntityId;
-    mouse.m_interactionId.m_viewportId = GetViewportId();
-    mouse.m_mouseButtons = buttons;
-    mouse.m_mousePick = mousePick;
-    mouse.m_keyboardModifiers = modifiers;
-    return mouse;
-}
-
-AzToolsFramework::ViewportInteraction::MouseInteraction EditorViewportWidget::BuildMouseInteraction(
-    const Qt::MouseButtons buttons, const Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-
-    return BuildMouseInteractionInternal(
-        BuildMouseButtons(buttons),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(WidgetToViewport(point)));
-}
-
-void EditorViewportWidget::InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons)
-{
-    // this is required, otherwise the user will see the context menu
-    OnMouseMove(Qt::NoModifier, buttons, QCursor::pos() + QPoint(deltaX, deltaY));
-    // we simply move the prev mouse position, so the change will be picked up
-    // by the next ProcessMouse call
-    m_prevMousePos -= QPoint(deltaX, deltaY);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::event(QEvent* event)
-{
-    switch (event->type())
-    {
-    case QEvent::WindowActivate:
-        GetIEditor()->GetViewManager()->SelectViewport(this);
-        // also kill the keys; if we alt-tab back to the viewport, or come back from the debugger, it's done (and there's no guarantee we'll get the keyrelease event anyways)
-        m_keyDown.clear();
-        break;
-
-    case QEvent::Shortcut:
-        // a shortcut should immediately clear us, otherwise the release event never gets sent
-        m_keyDown.clear();
-        break;
-    }
-
-    return QtViewport::event(event);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ResetContent()
-{
-    QtViewport::ResetContent();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::UpdateContent(int flags)
-{
-    QtViewport::UpdateContent(flags);
-    if (flags & eUpdateObjects)
-    {
-        m_bUpdateViewport = true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::Update()
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    if (Editor::EditorQtApplication::instance()->isMovingOrResizing())
-    {
-        return;
-    }
-
-    if (m_rcClient.isEmpty() || GetIEditor()->IsInMatEditMode())
-    {
-        return;
-    }
-
-    if (!isVisible())
-    {
-        return;
-    }
-
-    m_updatingCameraPosition = true;
-    if (!ed_useNewCameraSystem)
-    {
-        m_renderViewport->GetViewportContext()->SetCameraTransform(LYTransformToAZTransform(m_Camera.GetMatrix()));
-    }
-
-    // Don't override the game mode FOV
-    if (!GetIEditor()->IsInGameMode())
-    {
-        AZ::Matrix4x4 clipMatrix;
-        AZ::MakePerspectiveFovMatrixRH(
-            clipMatrix,
-            GetFOV(),
-            aznumeric_cast<float>(width()) / aznumeric_cast<float>(height()),
-            m_Camera.GetNearPlane(),
-            m_Camera.GetFarPlane(),
-            true
-        );
-        m_renderViewport->GetViewportContext()->SetCameraProjectionMatrix(clipMatrix);
-    }
-    m_updatingCameraPosition = false;
-
-    // Don't wait for changes to update the focused viewport.
-    if (CheckRespondToInput())
-    {
-        m_bUpdateViewport = true;
-    }
-
-    // While Renderer doesn't support fast rendering of the scene to more then 1 viewport
-    // render only focused viewport if more then 1 are opened and always update is off.
-    if (!m_isOnPaint && m_viewManager->GetNumberOfGameViewports() > 1 && GetType() == ET_ViewportCamera)
-    {
-        if (m_pPrimaryViewport != this)
-        {
-            if (CheckRespondToInput()) // If this is the focused window, set primary viewport.
-            {
-                SetAsActiveViewport();
-            }
-            else if (!m_bUpdateViewport) // Skip this viewport.
-            {
-                return;
-            }
-        }
-    }
-
-    const bool isGameMode = GetIEditor()->IsInGameMode();
-    const bool isSimulationMode = GetIEditor()->GetGameEngine()->GetSimulationMode();
-
-    // Allow debug visualization in both 'game' (Ctrl-G) and 'simulation' (Ctrl-P) modes
-    if (isGameMode || isSimulationMode)
-    {
-        if (!IsRenderingDisabled())
-        {
-            // Disable rendering to avoid recursion into Update()
-            PushDisableRendering();
-
-
-            //get debug display interface for the viewport
-            AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
-            AzFramework::DebugDisplayRequestBus::Bind(debugDisplayBus, GetViewportId());
-            AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
-
-            AzFramework::DebugDisplayRequests* debugDisplay =
-                AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
-
-
-            // draw debug visualizations
-            if (debugDisplay)
-            {
-                const AZ::u32 prevState = debugDisplay->GetState();
-                debugDisplay->SetState(
-                    e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
-
-                AzFramework::EntityDebugDisplayEventBus::Broadcast(
-                    &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport,
-                    AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
-
-                debugDisplay->SetState(prevState);
-            }
-
-            QtViewport::Update();
-            PopDisableRendering();
-        }
-
-        // Game mode rendering is handled by CryAction
-        if (isGameMode)
-        {
-            return;
-        }
-    }
-
-    // Prevents rendering recursion due to recursive Paint messages.
-    if (IsRenderingDisabled())
-    {
-        return;
-    }
-
-    PushDisableRendering();
-
-    m_viewTM = m_Camera.GetMatrix(); // synchronize.
-
-    // Render
-    {
-        // TODO: Move out this logic to a controller and refactor to work with Atom
-
-        OnRender();
-
-        ProcessRenderLisneters(m_displayContext);
-
-        m_displayContext.Flush2D();
-
-        // m_renderer->SwitchToNativeResolutionBackbuffer();
-
-        // 3D engine stats
-
-        CCamera CurCamera = gEnv->pSystem->GetViewCamera();
-        gEnv->pSystem->SetViewCamera(m_Camera);
-
-        // Post Render Callback
-        {
-            PostRenderers::iterator itr = m_postRenderers.begin();
-            PostRenderers::iterator end = m_postRenderers.end();
-            for (; itr != end; ++itr)
-            {
-                (*itr)->OnPostRender();
-            }
-        }
-
-        gEnv->pSystem->SetViewCamera(CurCamera);
-    }
-
-    {
-        auto start = std::chrono::steady_clock::now();
-
-        m_entityVisibilityQuery.UpdateVisibility(GetCameraState());
-
-        if (ed_visibility_logTiming)
-        {
-            auto stop = std::chrono::steady_clock::now();
-            std::chrono::duration<double> diff = stop - start;
-            AZ_Printf("Visibility", "FindVisibleEntities (new) - Duration: %f", diff);
-        }
-    }
-
-    QtViewport::Update();
-
-    PopDisableRendering();
-    m_bUpdateViewport = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetViewEntity(const AZ::EntityId& viewEntityId, bool lockCameraMovement)
-{
-    // if they've picked the same camera, then that means they want to toggle
-    if (viewEntityId.IsValid() && viewEntityId != m_viewEntityId)
-    {
-        LockCameraMovement(lockCameraMovement);
-        m_viewEntityId = viewEntityId;
-        AZStd::string entityName;
-        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, viewEntityId);
-        SetName(QString("Camera entity: %1").arg(entityName.c_str()));
-    }
-    else
-    {
-        SetDefaultCamera();
-    }
-
-    PostCameraSet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ResetToViewSourceType(const ViewSourceType& viewSourceType)
-{
-    LockCameraMovement(true);
-    m_pCameraFOVVariable = nullptr;
-    m_viewEntityId.SetInvalid();
-    m_cameraObjectId = GUID_NULL;
-    m_viewSourceType = viewSourceType;
-    SetViewTM(GetViewTM());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::PostCameraSet()
-{
-    if (m_viewPane)
-    {
-        m_viewPane->OnFOVChanged(GetFOV());
-    }
-
-    GetIEditor()->Notify(eNotify_CameraChanged);
-    QScopedValueRollback<bool> rb(m_ignoreSetViewFromEntityPerspective, true);
-    Camera::EditorCameraNotificationBus::Broadcast(
-        &Camera::EditorCameraNotificationBus::Events::OnViewportViewEntityChanged, m_viewEntityId);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* EditorViewportWidget::GetCameraObject() const
-{
-    CBaseObject* pCameraObject = nullptr;
-
-    if (m_viewSourceType == ViewSourceType::SequenceCamera)
-    {
-        m_cameraObjectId = GetViewManager()->GetCameraObjectId();
-    }
-    if (m_cameraObjectId != GUID_NULL)
-    {
-        // Find camera object from id.
-        pCameraObject = GetIEditor()->GetObjectManager()->FindObject(m_cameraObjectId);
-    }
-    else if (m_viewSourceType == ViewSourceType::CameraComponent || m_viewSourceType == ViewSourceType::AZ_Entity)
-    {
-        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(
-            pCameraObject, m_viewEntityId, &AzToolsFramework::ComponentEntityEditorRequests::GetSandboxObject);
-    }
-    return pCameraObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnBeginGameMode:
-    {
-        if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
-        {
-            m_preGameModeViewTM = GetViewTM();
-            // 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())
-            {
-                StartFullscreenPreview();
-            }
-        }
-
-        if (m_renderViewport)
-        {
-            m_renderViewport->GetControllerList()->SetEnabled(false);
-        }
-    }
-    break;
-
-    case eNotify_OnEndGameMode:
-        if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
-        {
-            SetCurrentCursor(STD_CURSOR_DEFAULT);
-            m_bInRotateMode = false;
-            m_bInMoveMode = false;
-            m_bInOrbitMode = false;
-            m_bInZoomMode = false;
-
-            if (m_inFullscreenPreview)
-            {
-                StopFullscreenPreview();
-            }
-
-            RestoreViewportAfterGameMode();
-        }
-
-        if (m_renderViewport)
-        {
-            m_renderViewport->GetControllerList()->SetEnabled(true);
-        }
-        break;
-
-    case eNotify_OnCloseScene:
-        m_renderViewport->SetScene(nullptr);
-        SetDefaultCamera();
-        break;
-
-    case eNotify_OnEndSceneOpen:
-        UpdateScene();
-        break;
-
-    case eNotify_OnBeginNewScene:
-        PushDisableRendering();
-        break;
-
-    case eNotify_OnEndNewScene:
-        PopDisableRendering();
-
-        {
-            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-            float sx = terrainAabb.GetXExtent();
-            float sy = terrainAabb.GetYExtent();
-
-            Matrix34 viewTM;
-            viewTM.SetIdentity();
-            // Initial camera will be at middle of the map at the height of 2
-            // meters above the terrain (default terrain height is 32)
-            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
-            SetViewTM(viewTM);
-
-            UpdateScene();
-        }
-        break;
-
-    case eNotify_OnBeginTerrainCreate:
-        PushDisableRendering();
-        break;
-
-    case eNotify_OnEndTerrainCreate:
-        PopDisableRendering();
-
-        {
-            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-            float sx = terrainAabb.GetXExtent();
-            float sy = terrainAabb.GetYExtent();
-
-            Matrix34 viewTM;
-            viewTM.SetIdentity();
-            // Initial camera will be at middle of the map at the height of 2
-            // meters above the terrain (default terrain height is 32)
-            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
-            SetViewTM(viewTM);
-        }
-        break;
-
-    case eNotify_OnBeginLayerExport:
-    case eNotify_OnBeginSceneSave:
-        PushDisableRendering();
-        break;
-    case eNotify_OnEndLayerExport:
-    case eNotify_OnEndSceneSave:
-        PopDisableRendering();
-        break;
-
-    case eNotify_OnBeginLoad: // disables viewport input when starting to load an existing level
-    case eNotify_OnBeginCreate: // disables viewport input when starting to create a new level
-        m_freezeViewportInput = true;
-        break;
-
-    case eNotify_OnEndLoad: // enables viewport input when finished loading an existing level
-    case eNotify_OnEndCreate: // enables viewport input when finished creating a new level
-        m_freezeViewportInput = false;
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnRender()
-{
-    if (m_rcClient.isEmpty())
-    {
-        // Even in null rendering, update the view camera.
-        // This is necessary so that automated editor tests using the null renderer to test systems like dynamic vegetation
-        // are still able to manipulate the current logical camera position, even if nothing is rendered.
-        GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
-        return;
-    }
-
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-}
-
-void EditorViewportWidget::OnBeginPrepareRender()
-{
-    if (!m_debugDisplay)
-    {
-        AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
-        AzFramework::DebugDisplayRequestBus::Bind(debugDisplayBus, GetViewportId());
-        AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
-
-        m_debugDisplay = AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
-    }
-
-    if (!m_debugDisplay)
-    {
-        return;
-    }
-
-    m_isOnPaint = true;
-    Update();
-    m_isOnPaint = false;
-
-    float fNearZ = GetIEditor()->GetConsoleVar("cl_DefaultNearPlane");
-    float fFarZ = m_Camera.GetFarPlane();
-
-    CBaseObject* cameraObject = GetCameraObject();
-    if (cameraObject)
-    {
-        AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
-        if (m_viewEntityId.IsValid())
-        {
-            Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
-            Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
-            LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
-                lookThroughEntityCorrection, m_viewEntityId, &LmbrCentral::EditorCameraCorrectionRequests::GetTransformCorrection);
-        }
-
-        m_viewTM = cameraObject->GetWorldTM() * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection);
-        m_viewTM.OrthonormalizeFast();
-
-        m_Camera.SetMatrix(m_viewTM);
-
-        int w = m_rcClient.width();
-        int h = m_rcClient.height();
-
-        m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
-    }
-    else if (m_viewEntityId.IsValid())
-    {
-        Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
-        Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
-        int w = m_rcClient.width();
-        int h = m_rcClient.height();
-
-        m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
-    }
-    else
-    {
-        // Normal camera.
-        m_cameraObjectId = GUID_NULL;
-        int w = m_rcClient.width();
-        int h = m_rcClient.height();
-
-        // Don't bother doing an FOV calculation if we don't have a valid viewport
-        // This prevents frustum calculation bugs with a null viewport
-        if (w <= 1 || h <= 1)
-        {
-            return;
-        }
-
-        float fov = gSettings.viewports.fDefaultFov;
-
-        // match viewport fov to default / selected title menu fov
-        if (GetFOV() != fov)
-        {
-            if (m_viewPane)
-            {
-                m_viewPane->OnFOVChanged(fov);
-                SetFOV(fov);
-            }
-        }
-
-        // Just for editor: Aspect ratio fix when changing the viewport
-        if (!GetIEditor()->IsInGameMode())
-        {
-            float viewportAspectRatio = float( w ) / h;
-            float targetAspectRatio = GetAspectRatio();
-            if (targetAspectRatio > viewportAspectRatio)
-            {
-                // Correct for vertical FOV change.
-                float maxTargetHeight = float( w ) / targetAspectRatio;
-                fov = 2 * atanf((h * tan(fov / 2)) / maxTargetHeight);
-            }
-        }
-        m_Camera.SetFrustum(w, h, fov, fNearZ);
-    }
-
-    GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
-
-    if (GetIEditor()->IsInGameMode())
-    {
-        return;
-    }
-
-    PreWidgetRendering();
-
-    RenderAll();
-
-    // Draw 2D helpers.
-    TransformationMatrices backupSceneMatrices;
-    m_debugDisplay->DepthTestOff();
-    //m_renderer->Set2DMode(m_rcClient.right(), m_rcClient.bottom(), backupSceneMatrices);
-    auto prevState = m_debugDisplay->GetState();
-    m_debugDisplay->SetState(e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
-
-    if (gSettings.viewports.bShowSafeFrame)
-    {
-        UpdateSafeFrame();
-        RenderSafeFrame();
-    }
-
-    AzFramework::ViewportDebugDisplayEventBus::Event(
-        AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport2d,
-        AzFramework::ViewportInfo{GetViewportId()}, *m_debugDisplay);
-
-    m_debugDisplay->SetState(prevState);
-    m_debugDisplay->DepthTestOn();
-
-    PostWidgetRendering();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::RenderAll()
-{
-    if (!m_debugDisplay)
-    {
-        return;
-    }
-
-    // allow the override of in-editor visualization
-    AzFramework::ViewportDebugDisplayEventBus::Event(
-        AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport,
-        AzFramework::ViewportInfo{ GetViewportId() }, *m_debugDisplay);
-
-    m_entityVisibilityQuery.DisplayVisibility(*m_debugDisplay);
-
-    if (m_manipulatorManager != nullptr)
-    {
-        using namespace AzToolsFramework::ViewportInteraction;
-
-        m_debugDisplay->DepthTestOff();
-        m_manipulatorManager->DrawManipulators(
-            *m_debugDisplay, GetCameraState(),
-            BuildMouseInteractionInternal(
-                MouseButtons(TranslateMouseButtons(QGuiApplication::mouseButtons())),
-                BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers()),
-                BuildMousePickInternal(WidgetToViewport(mapFromGlobal(QCursor::pos())))));
-        m_debugDisplay->DepthTestOn();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::UpdateSafeFrame()
-{
-    m_safeFrame = m_rcClient;
-
-    if (m_safeFrame.height() == 0)
-    {
-        return;
-    }
-
-    const bool allowSafeFrameBiggerThanViewport = false;
-
-    float safeFrameAspectRatio = float( m_safeFrame.width()) / m_safeFrame.height();
-    float targetAspectRatio = GetAspectRatio();
-    bool viewportIsWiderThanSafeFrame = (targetAspectRatio <= safeFrameAspectRatio);
-    if (viewportIsWiderThanSafeFrame || allowSafeFrameBiggerThanViewport)
-    {
-        float maxSafeFrameWidth = m_safeFrame.height() * targetAspectRatio;
-        float widthDifference = m_safeFrame.width() - maxSafeFrameWidth;
-
-        m_safeFrame.setLeft(m_safeFrame.left() + widthDifference * 0.5);
-        m_safeFrame.setRight(m_safeFrame.right() - widthDifference * 0.5);
-    }
-    else
-    {
-        float maxSafeFrameHeight = m_safeFrame.width() / targetAspectRatio;
-        float heightDifference = m_safeFrame.height() - maxSafeFrameHeight;
-
-        m_safeFrame.setTop(m_safeFrame.top() + heightDifference * 0.5);
-        m_safeFrame.setBottom(m_safeFrame.bottom() - heightDifference * 0.5);
-    }
-
-    m_safeFrame.adjust(0, 0, -1, -1); // <-- aesthetic improvement.
-
-    const float SAFE_ACTION_SCALE_FACTOR = 0.05f;
-    m_safeAction = m_safeFrame;
-    m_safeAction.adjust(m_safeFrame.width() * SAFE_ACTION_SCALE_FACTOR, m_safeFrame.height() * SAFE_ACTION_SCALE_FACTOR,
-        -m_safeFrame.width() * SAFE_ACTION_SCALE_FACTOR, -m_safeFrame.height() * SAFE_ACTION_SCALE_FACTOR);
-
-    const float SAFE_TITLE_SCALE_FACTOR = 0.1f;
-    m_safeTitle = m_safeFrame;
-    m_safeTitle.adjust(m_safeFrame.width() * SAFE_TITLE_SCALE_FACTOR, m_safeFrame.height() * SAFE_TITLE_SCALE_FACTOR,
-        -m_safeFrame.width() * SAFE_TITLE_SCALE_FACTOR, -m_safeFrame.height() * SAFE_TITLE_SCALE_FACTOR);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::RenderSafeFrame()
-{
-    RenderSafeFrame(m_safeFrame, 0.75f, 0.75f, 0, 0.8f);
-    RenderSafeFrame(m_safeAction, 0, 0.85f, 0.80f, 0.8f);
-    RenderSafeFrame(m_safeTitle, 0.80f, 0.60f, 0, 0.8f);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::RenderSafeFrame(const QRect& frame, float r, float g, float b, float a)
-{
-    m_debugDisplay->SetColor(r, g, b, a);
-
-    const int LINE_WIDTH = 2;
-    for (int i = 0; i < LINE_WIDTH; i++)
-    {
-        AZ::Vector3 topLeft(frame.left() + i, frame.top() + i, 0);
-        AZ::Vector3 bottomRight(frame.right() - i, frame.bottom() - i, 0);
-        m_debugDisplay->DrawWireBox(topLeft, bottomRight);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float EditorViewportWidget::GetAspectRatio() const
-{
-    return gSettings.viewports.fDefaultAspectRatio;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::RenderSnapMarker()
-{
-    if (!gSettings.snap.markerDisplay)
-    {
-        return;
-    }
-
-    QPoint point = QCursor::pos();
-    ScreenToClient(point);
-    Vec3 p = MapViewToCP(point);
-
-    DisplayContext& dc = m_displayContext;
-
-    float fScreenScaleFactor = GetScreenScaleFactor(p);
-
-    Vec3 x(1, 0, 0);
-    Vec3 y(0, 1, 0);
-    Vec3 z(0, 0, 1);
-    x = x * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
-    y = y * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
-    z = z * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
-
-    dc.SetColor(gSettings.snap.markerColor);
-    dc.DrawLine(p - x, p + x);
-    dc.DrawLine(p - y, p + y);
-    dc.DrawLine(p - z, p + z);
-
-    point = WorldToView(p);
-
-    int s = 8;
-    dc.DrawLine2d(point + QPoint(-s, -s), point + QPoint(s, -s), 0);
-    dc.DrawLine2d(point + QPoint(-s, s), point + QPoint(s, s), 0);
-    dc.DrawLine2d(point + QPoint(-s, -s), point + QPoint(-s, s), 0);
-    dc.DrawLine2d(point + QPoint(s, -s), point + QPoint(s, s), 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnMenuResolutionCustom()
-{
-    CCustomResolutionDlg resDlg(width(), height(), parentWidget());
-    if (resDlg.exec() == QDialog::Accepted)
-    {
-        ResizeView(resDlg.GetWidth(), resDlg.GetHeight());
-
-        const QString text = QString::fromLatin1("%1 x %2").arg(resDlg.GetWidth()).arg(resDlg.GetHeight());
-
-        QStringList customResPresets;
-        CViewportTitleDlg::LoadCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
-        CViewportTitleDlg::UpdateCustomPresets(text, customResPresets);
-        CViewportTitleDlg::SaveCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnMenuCreateCameraEntityFromCurrentView()
-{
-    Camera::EditorCameraSystemRequestBus::Broadcast(&Camera::EditorCameraSystemRequests::CreateCameraEntityFromViewport);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnMenuSelectCurrentCamera()
-{
-    CBaseObject* pCameraObject = GetCameraObject();
-
-    if (pCameraObject && !pCameraObject->IsSelected())
-    {
-        GetIEditor()->BeginUndo();
-        IObjectManager* pObjectManager = GetIEditor()->GetObjectManager();
-        pObjectManager->ClearSelection();
-        pObjectManager->SelectObject(pCameraObject);
-        GetIEditor()->AcceptUndo("Select Current Camera");
-    }
-}
-
-AzFramework::CameraState EditorViewportWidget::GetCameraState()
-{
-    return m_renderViewport->GetCameraState();
-}
-
-AZ::Vector3 EditorViewportWidget::PickTerrain(const AzFramework::ScreenPoint& point)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    return LYVec3ToAZVec3(ViewToWorld(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), nullptr, true));
-}
-
-AZ::EntityId EditorViewportWidget::PickEntity(const AzFramework::ScreenPoint& point)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    PreWidgetRendering();
-
-    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();
-        }
-    }
-
-    PostWidgetRendering();
-
-    return entityId;
-}
-
-float EditorViewportWidget::TerrainHeight(const AZ::Vector2& position)
-{
-    return GetIEditor()->GetTerrainElevation(position.GetX(), position.GetY());
-}
-
-void EditorViewportWidget::FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    visibleEntitiesOut.assign(m_entityVisibilityQuery.Begin(), m_entityVisibilityQuery.End());
-}
-
-AzFramework::ScreenPoint EditorViewportWidget::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
-{
-    return m_renderViewport->ViewportWorldToScreen(worldPosition);
-}
-
-bool EditorViewportWidget::IsViewportInputFrozen()
-{
-    return m_freezeViewportInput;
-}
-
-void EditorViewportWidget::FreezeViewportInput(bool freeze)
-{
-    m_freezeViewportInput = freeze;
-}
-
-QWidget* EditorViewportWidget::GetWidgetForViewportContextMenu()
-{
-    return this;
-}
-
-void EditorViewportWidget::BeginWidgetContext()
-{
-    PreWidgetRendering();
-}
-
-void EditorViewportWidget::EndWidgetContext()
-{
-    PostWidgetRendering();
-}
-
-bool EditorViewportWidget::ShowingWorldSpace()
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    return BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers()).Shift();
-}
-
-AZStd::shared_ptr<AtomToolsFramework::ModularViewportCameraController> CreateModularViewportCameraController(
-    AzFramework::ViewportId viewportId)
-{
-    AzFramework::ReloadCameraKeyBindings();
-
-    auto controller = AZStd::make_shared<AtomToolsFramework::ModularViewportCameraController>();
-    controller->SetCameraPropsBuilderCallback(
-        [](AzFramework::CameraProps& cameraProps)
-        {
-            cameraProps.m_rotateSmoothnessFn = []
-            {
-                return SandboxEditor::CameraRotateSmoothness();
-            };
-
-            cameraProps.m_translateSmoothnessFn = []
-            {
-                return SandboxEditor::CameraTranslateSmoothness();
-            };
-        });
-
-    controller->SetCameraListBuilderCallback(
-        [viewportId](AzFramework::Cameras& cameras)
-        {
-            auto firstPersonRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(AzFramework::CameraFreeLookButton);
-            firstPersonRotateCamera->m_rotateSpeedFn = []
-            {
-                return SandboxEditor::CameraRotateSpeed();
-            };
-
-            auto firstPersonPanCamera =
-                AZStd::make_shared<AzFramework::PanCameraInput>(AzFramework::CameraFreePanButton, AzFramework::LookPan);
-            firstPersonPanCamera->m_panSpeedFn = []
-            {
-                return SandboxEditor::CameraPanSpeed();
-            };
-            firstPersonPanCamera->m_invertPanXFn = []
-            {
-                return SandboxEditor::CameraPanInvertedX();
-            };
-            firstPersonPanCamera->m_invertPanYFn = []
-            {
-                return SandboxEditor::CameraPanInvertedY();
-            };
-
-            auto firstPersonTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(AzFramework::LookTranslation);
-            firstPersonTranslateCamera->m_translateSpeedFn = []
-            {
-                return SandboxEditor::CameraTranslateSpeed();
-            };
-            firstPersonTranslateCamera->m_boostMultiplierFn = []
-            {
-                return SandboxEditor::CameraBoostMultiplier();
-            };
-
-            auto firstPersonWheelCamera = AZStd::make_shared<AzFramework::ScrollTranslationCameraInput>();
-            firstPersonWheelCamera->m_scrollSpeedFn = []
-            {
-                return SandboxEditor::CameraScrollSpeed();
-            };
-
-            auto orbitCamera = AZStd::make_shared<AzFramework::OrbitCameraInput>();
-            orbitCamera->SetLookAtFn(
-                [viewportId](const AZ::Vector3& position, const AZ::Vector3& direction) -> AZStd::optional<AZ::Vector3>
-                {
-                    AZStd::optional<AZ::Vector3> lookAtAfterInterpolation;
-                    AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
-                        lookAtAfterInterpolation, viewportId,
-                        &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::LookAtAfterInterpolation);
-
-                    // initially attempt to use the last set look at point after an interpolation has finished
-                    if (lookAtAfterInterpolation.has_value())
-                    {
-                        return *lookAtAfterInterpolation;
-                    }
-
-                    const float RayDistance = 1000.0f;
-                    AzFramework::RenderGeometry::RayRequest ray;
-                    ray.m_startWorldPosition = position;
-                    ray.m_endWorldPosition = position + direction * RayDistance;
-                    ray.m_onlyVisible = true;
-
-                    AzFramework::RenderGeometry::RayResult renderGeometryIntersectionResult;
-                    AzFramework::RenderGeometry::IntersectorBus::EventResult(
-                        renderGeometryIntersectionResult, AzToolsFramework::GetEntityContextId(),
-                        &AzFramework::RenderGeometry::IntersectorBus::Events::RayIntersect, ray);
-
-                    // attempt a ray intersection with any visible mesh and return the intersection position if successful
-                    if (renderGeometryIntersectionResult)
-                    {
-                        return renderGeometryIntersectionResult.m_worldPosition;
-                    }
-
-                    // if there is no selection or no intersection, fallback to default camera orbit behavior (ground plane
-                    // intersection)
-                    return {};
-                });
-
-            auto orbitRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(AzFramework::CameraOrbitLookButton);
-            orbitRotateCamera->m_rotateSpeedFn = []
-            {
-                return SandboxEditor::CameraRotateSpeed();
-            };
-            orbitRotateCamera->m_invertYawFn = []
-            {
-                return SandboxEditor::CameraOrbitYawRotationInverted();
-            };
-
-            auto orbitTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(AzFramework::OrbitTranslation);
-            orbitTranslateCamera->m_translateSpeedFn = []
-            {
-                return SandboxEditor::CameraTranslateSpeed();
-            };
-            orbitTranslateCamera->m_boostMultiplierFn = []
-            {
-                return SandboxEditor::CameraBoostMultiplier();
-            };
-
-            auto orbitDollyWheelCamera = AZStd::make_shared<AzFramework::OrbitDollyScrollCameraInput>();
-            orbitDollyWheelCamera->m_scrollSpeedFn = []
-            {
-                return SandboxEditor::CameraScrollSpeed();
-            };
-
-            auto orbitDollyMoveCamera =
-                AZStd::make_shared<AzFramework::OrbitDollyCursorMoveCameraInput>(AzFramework::CameraOrbitDollyButton);
-            orbitDollyMoveCamera->m_cursorSpeedFn = []
-            {
-                return SandboxEditor::CameraDollyMotionSpeed();
-            };
-
-            auto orbitPanCamera = AZStd::make_shared<AzFramework::PanCameraInput>(AzFramework::CameraOrbitPanButton, AzFramework::OrbitPan);
-            orbitPanCamera->m_panSpeedFn = []
-            {
-                return SandboxEditor::CameraPanSpeed();
-            };
-            orbitPanCamera->m_invertPanXFn = []
-            {
-                return SandboxEditor::CameraPanInvertedX();
-            };
-            orbitPanCamera->m_invertPanYFn = []
-            {
-                return SandboxEditor::CameraPanInvertedY();
-            };
-
-            orbitCamera->m_orbitCameras.AddCamera(orbitRotateCamera);
-            orbitCamera->m_orbitCameras.AddCamera(orbitTranslateCamera);
-            orbitCamera->m_orbitCameras.AddCamera(orbitDollyWheelCamera);
-            orbitCamera->m_orbitCameras.AddCamera(orbitDollyMoveCamera);
-            orbitCamera->m_orbitCameras.AddCamera(orbitPanCamera);
-
-            cameras.AddCamera(firstPersonRotateCamera);
-            cameras.AddCamera(firstPersonPanCamera);
-            cameras.AddCamera(firstPersonTranslateCamera);
-            cameras.AddCamera(firstPersonWheelCamera);
-            cameras.AddCamera(orbitCamera);
-        });
-
-    return controller;
-}
-
-void EditorViewportWidget::SetViewportId(int id)
-{
-    CViewport::SetViewportId(id);
-
-    // Clear the cached debugdisplay pointer. we're about to delete that render viewport, and deleting the render
-    // viewport invalidates the debugdisplay.
-    m_debugDisplay = nullptr;
-
-    // First delete any existing layout
-    // This also deletes any existing render viewport widget (since it will be added to the layout)
-    // Below is the typical method of clearing a QLayout, see e.g. https://doc.qt.io/qt-5/qlayout.html#takeAt
-    if (QLayout* thisLayout = layout())
-    {
-        QLayoutItem* item;
-        while ((item = thisLayout->takeAt(0)) != nullptr)
-        {
-            if (QWidget* widget = item->widget())
-            {
-                delete widget;
-            }
-            thisLayout->removeItem(item);
-            delete item;
-        }
-        delete thisLayout;
-    }
-
-    // Now that we have an ID, we can initialize our viewport.
-    m_renderViewport = new AtomToolsFramework::RenderViewportWidget(this, false);
-    if (!m_renderViewport->InitializeViewportContext(id))
-    {
-        AZ_Warning("EditorViewportWidget", false, "Failed to initialize RenderViewportWidget's ViewportContext");
-        delete m_renderViewport;
-        m_renderViewport = nullptr;
-        return;
-    }
-    auto viewportContext = m_renderViewport->GetViewportContext();
-    m_defaultViewportContextName = viewportContext->GetName();
-    QBoxLayout* layout = new QBoxLayout(QBoxLayout::Direction::TopToBottom, this);
-    layout->setContentsMargins(QMargins());
-    layout->addWidget(m_renderViewport);
-
-    viewportContext->ConnectViewMatrixChangedHandler(m_cameraViewMatrixChangeHandler);
-    viewportContext->ConnectProjectionMatrixChangedHandler(m_cameraProjectionMatrixChangeHandler);
-
-    m_renderViewport->GetControllerList()->Add(AZStd::make_shared<SandboxEditor::ViewportManipulatorController>());
-
-    if (ed_useNewCameraSystem)
-    {
-        m_renderViewport->GetControllerList()->Add(CreateModularViewportCameraController(AzFramework::ViewportId(id)));
-    }
-    else
-    {
-        m_renderViewport->GetControllerList()->Add(AZStd::make_shared<SandboxEditor::LegacyViewportCameraController>());
-    }
-
-    m_renderViewport->SetViewportSettings(&g_EditorViewportSettings);
-
-    UpdateScene();
-
-    if (m_pPrimaryViewport == this)
-    {
-        SetAsActiveViewport();
-    }
-
-    m_editorViewportSettingsCallbacks = SandboxEditor::CreateEditorViewportSettingsCallbacks();
-
-    m_gridSnappingHandler = SandboxEditor::GridSnappingChangedEvent::Handler(
-        [id](const bool snapping)
-        {
-            AzToolsFramework::ViewportInteraction::ViewportSettingsNotificationBus::Event(
-                id, &AzToolsFramework::ViewportInteraction::ViewportSettingsNotificationBus::Events::OnGridSnappingChanged, snapping);
-        });
-
-    m_editorViewportSettingsCallbacks->SetGridSnappingChangedEvent(m_gridSnappingHandler);
-}
-
-void EditorViewportWidget::ConnectViewportInteractionRequestBus()
-{
-    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusConnect(GetViewportId());
-    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
-    m_viewportUi.ConnectViewportUiBus(GetViewportId());
-
-    AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusConnect();
-}
-
-void EditorViewportWidget::DisconnectViewportInteractionRequestBus()
-{
-    AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusDisconnect();
-
-    m_viewportUi.DisconnectViewportUiBus();
-    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusDisconnect();
-    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusDisconnect();
-}
-
-namespace AZ::ViewportHelpers
-{
-    void ToggleBool(bool* variable, bool* disableVariableIfOn)
-    {
-        *variable = !*variable;
-        if (*variable && disableVariableIfOn)
-        {
-            *disableVariableIfOn = false;
-        }
-    }
-
-    void ToggleInt(int* variable)
-    {
-        *variable = !*variable;
-    }
-
-    void AddCheckbox(QMenu* menu, const QString& text, bool* variable, bool* disableVariableIfOn = nullptr)
-    {
-        QAction* action = menu->addAction(text);
-        QObject::connect(action, &QAction::triggered, action, [variable, disableVariableIfOn] { ToggleBool(variable, disableVariableIfOn);
-            });
-        action->setCheckable(true);
-        action->setChecked(*variable);
-    }
-
-    void AddCheckbox(QMenu* menu, const QString& text, int* variable)
-    {
-        QAction* action = menu->addAction(text);
-        QObject::connect(action, &QAction::triggered, action, [variable] { ToggleInt(variable);
-            });
-        action->setCheckable(true);
-        action->setChecked(*variable);
-    }
-} // namespace AZ::ViewportHelpers
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnTitleMenu(QMenu* menu)
-{
-    const bool bDisplayLabels = GetIEditor()->GetDisplaySettings()->IsDisplayLabels();
-    QAction* action = menu->addAction(tr("Labels"));
-    connect(action, &QAction::triggered, this, [bDisplayLabels] {GetIEditor()->GetDisplaySettings()->DisplayLabels(!bDisplayLabels);
-        });
-    action->setCheckable(true);
-    action->setChecked(bDisplayLabels);
-
-    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Safe Frame"), &gSettings.viewports.bShowSafeFrame);
-    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Construction Plane"), &gSettings.snap.constructPlaneDisplay);
-    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Trigger Bounds"), &gSettings.viewports.bShowTriggerBounds);
-    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Icons"), &gSettings.viewports.bShowIcons, &gSettings.viewports.bShowSizeBasedIcons);
-    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Size-based Icons"), &gSettings.viewports.bShowSizeBasedIcons, &gSettings.viewports.bShowIcons);
-    AZ::ViewportHelpers::AddCheckbox(menu, tr("Show Helpers of Frozen Objects"), &gSettings.viewports.nShowFrozenHelpers);
-
-    if (!m_predefinedAspectRatios.IsEmpty())
-    {
-        QMenu* aspectRatiosMenu = menu->addMenu(tr("Target Aspect Ratio"));
-
-        for (size_t i = 0; i < m_predefinedAspectRatios.GetCount(); ++i)
-        {
-            const QString& aspectRatioString = m_predefinedAspectRatios.GetName(i);
-            QAction* aspectRatioAction = aspectRatiosMenu->addAction(aspectRatioString);
-            connect(aspectRatioAction, &QAction::triggered, this, [i, this] {
-                const float aspect = m_predefinedAspectRatios.GetValue(i);
-                gSettings.viewports.fDefaultAspectRatio = aspect;
-            });
-            aspectRatioAction->setCheckable(true);
-            aspectRatioAction->setChecked(m_predefinedAspectRatios.IsCurrent(i));
-        }
-    }
-
-    // Set ourself as the active viewport so the following actions create a camera from this view
-    GetIEditor()->GetViewManager()->SelectViewport(this);
-
-    CGameEngine* gameEngine = GetIEditor()->GetGameEngine();
-
-    if (Camera::EditorCameraSystemRequestBus::HasHandlers())
-    {
-        action = menu->addAction(tr("Create camera entity from current view"));
-        connect(action, &QAction::triggered, this, &EditorViewportWidget::OnMenuCreateCameraEntityFromCurrentView);
-
-        if (!gameEngine || !gameEngine->IsLevelLoaded())
-        {
-            action->setEnabled(false);
-            action->setToolTip(tr(AZ::ViewportHelpers::TextCantCreateCameraNoLevel));
-            menu->setToolTipsVisible(true);
-        }
-    }
-
-    if (!gameEngine || !gameEngine->IsLevelLoaded())
-    {
-        action->setEnabled(false);
-        action->setToolTip(tr(AZ::ViewportHelpers::TextCantCreateCameraNoLevel));
-        menu->setToolTipsVisible(true);
-    }
-
-    if (GetCameraObject())
-    {
-        action = menu->addAction(tr("Select Current Camera"));
-        connect(action, &QAction::triggered, this, &EditorViewportWidget::OnMenuSelectCurrentCamera);
-    }
-
-    // Add Cameras.
-    bool bHasCameras = AddCameraMenuItems(menu);
-    EditorViewportWidget* pFloatingViewport = nullptr;
-
-    if (GetIEditor()->GetViewManager()->GetViewCount() > 1)
-    {
-        for (int i = 0; i < GetIEditor()->GetViewManager()->GetViewCount(); ++i)
-        {
-            CViewport* vp = GetIEditor()->GetViewManager()->GetView(i);
-            if (!vp)
-            {
-                continue;
-            }
-
-            if (viewport_cast<EditorViewportWidget*>(vp) == nullptr)
-            {
-                continue;
-            }
-
-            if (vp->GetViewportId() == MAX_NUM_VIEWPORTS - 1)
-            {
-                menu->addSeparator();
-
-                QMenu* floatViewMenu = menu->addMenu(tr("Floating View"));
-
-                pFloatingViewport = (EditorViewportWidget*)vp;
-                pFloatingViewport->AddCameraMenuItems(floatViewMenu);
-
-                if (bHasCameras)
-                {
-                    floatViewMenu->addSeparator();
-                }
-
-                QMenu* resolutionMenu = floatViewMenu->addMenu(tr("Resolution"));
-
-                QStringList customResPresets;
-                CViewportTitleDlg::LoadCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
-                CViewportTitleDlg::AddResolutionMenus(resolutionMenu, [this](int width, int height) { ResizeView(width, height); }, customResPresets);
-                if (!resolutionMenu->actions().isEmpty())
-                {
-                    resolutionMenu->addSeparator();
-                }
-                QAction* customResolutionAction = resolutionMenu->addAction(tr("Custom..."));
-                connect(customResolutionAction, &QAction::triggered, this, &EditorViewportWidget::OnMenuResolutionCustom);
-                break;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::AddCameraMenuItems(QMenu* menu)
-{
-    if (!menu->isEmpty())
-    {
-        menu->addSeparator();
-    }
-
-    AZ::ViewportHelpers::AddCheckbox(menu, "Lock Camera Movement", &m_bLockCameraMovement);
-    menu->addSeparator();
-
-    // Camera Sub menu
-    QMenu* customCameraMenu = menu->addMenu(tr("Camera"));
-
-    QAction* action = customCameraMenu->addAction("Editor Camera");
-    action->setCheckable(true);
-    action->setChecked(m_viewSourceType == ViewSourceType::None);
-    connect(action, &QAction::triggered, this, &EditorViewportWidget::SetDefaultCamera);
-
-    AZ::EBusAggregateResults<AZ::EntityId> getCameraResults;
-    Camera::CameraBus::BroadcastResult(getCameraResults, &Camera::CameraRequests::GetCameras);
-
-    const int numCameras = getCameraResults.values.size();
-
-    // only enable if we're editing a sequence in Track View and have cameras in the level
-    bool enableSequenceCameraMenu = (GetIEditor()->GetAnimation()->GetSequence() && numCameras);
-
-    action = customCameraMenu->addAction(tr("Sequence Camera"));
-    action->setCheckable(true);
-    action->setChecked(m_viewSourceType == ViewSourceType::SequenceCamera);
-    action->setEnabled(enableSequenceCameraMenu);
-    connect(action, &QAction::triggered, this, &EditorViewportWidget::SetSequenceCamera);
-
-    QVector<QAction*> additionalCameras;
-    additionalCameras.reserve(getCameraResults.values.size());
-
-    for (const AZ::EntityId& entityId : getCameraResults.values)
-    {
-        AZStd::string entityName;
-        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, entityId);
-        action = new QAction(QString(entityName.c_str()), nullptr);
-        additionalCameras.append(action);
-        action->setCheckable(true);
-        action->setChecked(m_viewEntityId == entityId && m_viewSourceType == ViewSourceType::CameraComponent);
-        connect(action, &QAction::triggered, this, [this, entityId](bool isChecked)
-            {
-                if (isChecked)
-                {
-                    SetComponentCamera(entityId);
-                }
-                else
-                {
-                    SetDefaultCamera();
-                }
-            });
-    }
-
-    std::sort(additionalCameras.begin(), additionalCameras.end(), [] (QAction* a1, QAction* a2) {
-        return QString::compare(a1->text(), a2->text(), Qt::CaseInsensitive) < 0;
-    });
-
-    for (QAction* cameraAction : additionalCameras)
-    {
-        customCameraMenu->addAction(cameraAction);
-    }
-
-    action = customCameraMenu->addAction(tr("Look through entity"));
-    bool areAnyEntitiesSelected = false;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
-    action->setCheckable(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
-    action->setEnabled(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
-    action->setChecked(m_viewSourceType == ViewSourceType::AZ_Entity);
-    connect(action, &QAction::triggered, this, [this](bool isChecked)
-        {
-            if (isChecked)
-            {
-                AzToolsFramework::EntityIdList selectedEntityList;
-                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-                if (selectedEntityList.size())
-                {
-                    SetEntityAsCamera(*selectedEntityList.begin());
-                }
-            }
-            else
-            {
-                SetDefaultCamera();
-            }
-        });
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ResizeView(int width, int height)
-{
-    const QRect rView = rect().translated(mapToGlobal(QPoint()));
-    int deltaWidth = width - rView.width();
-    int deltaHeight = height - rView.height();
-
-    if (window()->isFullScreen())
-    {
-        setGeometry(rView.left(), rView.top(), rView.width() + deltaWidth, rView.height() + deltaHeight);
-    }
-    else
-    {
-        QWidget* window = this->window();
-        if (window->isMaximized())
-        {
-            window->showNormal();
-        }
-
-        const QSize deltaSize = QSize(width, height) - size();
-        window->move(0, 0);
-        window->resize(window->size() + deltaSize);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ToggleCameraObject()
-{
-    if (m_viewSourceType == ViewSourceType::SequenceCamera)
-    {
-        ResetToViewSourceType(ViewSourceType::LegacyCamera);
-    }
-    else
-    {
-        ResetToViewSourceType(ViewSourceType::SequenceCamera);
-    }
-    PostCameraSet();
-    GetIEditor()->GetAnimation()->ForceAnimation();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetCamera(const CCamera& camera)
-{
-    m_Camera = camera;
-    SetViewTM(m_Camera.GetMatrix());
-}
-
-//////////////////////////////////////////////////////////////////////////
-EditorViewportWidget* EditorViewportWidget::GetPrimaryViewport()
-{
-    return m_pPrimaryViewport;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::focusOutEvent([[maybe_unused]] QFocusEvent* event)
-{
-    // if we lose focus, the keyboard map needs to be cleared immediately
-    if (!m_keyDown.isEmpty())
-    {
-        m_keyDown.clear();
-
-        releaseKeyboard();
-    }
-}
-
-void EditorViewportWidget::keyPressEvent(QKeyEvent* event)
-{
-    // Special case Escape key and bubble way up to the top level parent so that it can cancel us out of any active tool
-    // or clear the current selection
-    if (event->key() == Qt::Key_Escape)
-    {
-        QCoreApplication::sendEvent(GetIEditor()->GetEditorMainWindow(), event);
-    }
-
-    // NOTE: we keep track of key presses and releases explicitly because the OS/Qt will insert a slight delay between sending
-    // key events when the key is held down. This is standard, but makes responding to key events for game style input silly
-    // because we want the movement to be butter smooth.
-    if (!event->isAutoRepeat())
-    {
-        m_keyDown.insert(event->key());
-    }
-
-    QtViewport::keyPressEvent(event);
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    // In game mode on windows we need to forward raw text events to the input system.
-    if (GetIEditor()->IsInGameMode() && GetType() == ET_ViewportCamera)
-    {
-        // Get the QString as a '\0'-terminated array of unsigned shorts.
-        // The result remains valid until the string is modified.
-        const ushort* codeUnitsUTF16 = event->text().utf16();
-        while (ushort codeUnitUTF16 = *codeUnitsUTF16)
-        {
-            AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputCodeUnitUTF16Event, codeUnitUTF16);
-            ++codeUnitsUTF16;
-        }
-    }
-#endif // defined(AZ_PLATFORM_WINDOWS)
-}
-
-void EditorViewportWidget::SetViewTM(const Matrix34& viewTM, bool bMoveOnly)
-{
-    Matrix34 camMatrix = viewTM;
-
-    // If no collision flag set do not check for terrain elevation.
-    if (GetType() == ET_ViewportCamera)
-    {
-        if ((GetIEditor()->GetDisplaySettings()->GetSettings() & SETTINGS_NOCOLLISION) == 0)
-        {
-            Vec3 p = camMatrix.GetTranslation();
-            bool adjustCameraElevation = true;
-            auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-            if (terrain)
-            {
-                AZ::Aabb terrainAabb(terrain->GetTerrainAabb());
-
-                // Adjust the AABB to include all Z values.  Since the goal here is to snap the camera to the terrain height if
-                // it's below the terrain, we only want to verify the camera is within the XY bounds of the terrain to adjust the elevation.
-                terrainAabb.SetMin(AZ::Vector3(terrainAabb.GetMin().GetX(), terrainAabb.GetMin().GetY(), -AZ::Constants::FloatMax));
-                terrainAabb.SetMax(AZ::Vector3(terrainAabb.GetMax().GetX(), terrainAabb.GetMax().GetY(), AZ::Constants::FloatMax));
-
-                if (!terrainAabb.Contains(LYVec3ToAZVec3(p)))
-                {
-                    adjustCameraElevation = false;
-                }
-                else if (terrain->GetIsHoleFromFloats(p.x, p.y))
-                {
-                    adjustCameraElevation = false;
-                }
-            }
-
-            if (adjustCameraElevation)
-            {
-                float z = GetIEditor()->GetTerrainElevation(p.x, p.y);
-                if (p.z < z + 0.25)
-                {
-                    p.z = z + 0.25;
-                    camMatrix.SetTranslation(p);
-                }
-            }
-        }
-
-        // Also force this position on game.
-        if (GetIEditor()->GetGameEngine())
-        {
-            GetIEditor()->GetGameEngine()->SetPlayerViewMatrix(viewTM);
-        }
-    }
-
-    CBaseObject* cameraObject = GetCameraObject();
-    if (cameraObject)
-    {
-        // Ignore camera movement if locked.
-        if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
-        {
-            return;
-        }
-
-        AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
-        if (m_viewEntityId.IsValid())
-        {
-            LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
-                lookThroughEntityCorrection, m_viewEntityId,
-                &LmbrCentral::EditorCameraCorrectionRequests::GetInverseTransformCorrection);
-        }
-
-        if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
-        {
-            CUndo undo("Move Camera");
-            if (bMoveOnly)
-            {
-                // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
-                cameraObject->SetWorldPos(camMatrix.GetTranslation(), eObjectUpdateFlags_UserInput);
-            }
-            else
-            {
-                // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
-                cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection), eObjectUpdateFlags_UserInput);
-            }
-        }
-        else
-        {
-            if (bMoveOnly)
-            {
-                // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
-                cameraObject->SetWorldPos(camMatrix.GetTranslation());
-            }
-            else
-            {
-                // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
-                cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection));
-            }
-        }
-    }
-    else if (m_viewEntityId.IsValid())
-    {
-        // Ignore camera movement if locked.
-        if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
-        {
-            return;
-        }
-
-        if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
-        {
-            CUndo undo("Move Camera");
-            if (bMoveOnly)
-            {
-                AZ::TransformBus::Event(
-                    m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
-                    LYVec3ToAZVec3(camMatrix.GetTranslation()));
-            }
-            else
-            {
-                AZ::TransformBus::Event(
-                    m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
-                    LYTransformToAZTransform(camMatrix));
-            }
-        }
-        else
-        {
-            if (bMoveOnly)
-            {
-                AZ::TransformBus::Event(
-                    m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
-                    LYVec3ToAZVec3(camMatrix.GetTranslation()));
-            }
-            else
-            {
-                AZ::TransformBus::Event(
-                    m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
-                    LYTransformToAZTransform(camMatrix));
-            }
-        }
-
-        AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
-            &AzToolsFramework::PropertyEditorGUIMessages::RequestRefresh,
-            AzToolsFramework::PropertyModificationRefreshLevel::Refresh_AttributesAndValues);
-    }
-
-    if (m_pressedKeyState == KeyPressedState::PressedThisFrame)
-    {
-        m_pressedKeyState = KeyPressedState::PressedInPreviousFrame;
-    }
-
-    QtViewport::SetViewTM(camMatrix);
-
-    m_Camera.SetMatrix(camMatrix);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::RenderSelectedRegion()
-{
-    AABB box;
-    GetIEditor()->GetSelectedRegion(box);
-    if (box.IsEmpty())
-    {
-        return;
-    }
-
-    float x1 = box.min.x;
-    float y1 = box.min.y;
-    float x2 = box.max.x;
-    float y2 = box.max.y;
-
-    DisplayContext& dc = m_displayContext;
-
-    float fMaxSide = MAX(y2 - y1, x2 - x1);
-    if (fMaxSide < 0.1f)
-    {
-        return;
-    }
-    float fStep = fMaxSide / 100.0f;
-
-    float fMinZ = 0;
-    float fMaxZ = 0;
-
-    // Draw yellow border lines.
-    dc.SetColor(1, 1, 0, 1);
-    float offset = 0.01f;
-    Vec3 p1, p2;
-
-    const float defaultTerrainHeight = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
-    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-
-    for (float y = y1; y < y2; y += fStep)
-    {
-        p1.x = x1;
-        p1.y = y;
-        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
-
-        p2.x = x1;
-        p2.y = y + fStep;
-        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
-        dc.DrawLine(p1, p2);
-
-        p1.x = x2;
-        p1.y = y;
-        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
-
-        p2.x = x2;
-        p2.y = y + fStep;
-        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
-        dc.DrawLine(p1, p2);
-
-        fMinZ = min(fMinZ, min(p1.z, p2.z));
-        fMaxZ = max(fMaxZ, max(p1.z, p2.z));
-    }
-    for (float x = x1; x < x2; x += fStep)
-    {
-        p1.x = x;
-        p1.y = y1;
-        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
-
-        p2.x = x + fStep;
-        p2.y = y1;
-        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
-        dc.DrawLine(p1, p2);
-
-        p1.x = x;
-        p1.y = y2;
-        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
-
-        p2.x = x + fStep;
-        p2.y = y2;
-        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
-        dc.DrawLine(p1, p2);
-
-        fMinZ = min(fMinZ, min(p1.z, p2.z));
-        fMaxZ = max(fMaxZ, max(p1.z, p2.z));
-    }
-
-    {
-        // Draw a box area
-        float fBoxOver = fMaxSide / 5.0f;
-        float fBoxHeight = fBoxOver + fMaxZ - fMinZ;
-
-        ColorB boxColor(64, 64, 255, 128); // light blue
-        ColorB transparent(boxColor.r, boxColor.g, boxColor.b, 0);
-
-        Vec3 base[] = {
-            Vec3(x1, y1, fMinZ),
-            Vec3(x2, y1, fMinZ),
-            Vec3(x2, y2, fMinZ),
-            Vec3(x1, y2, fMinZ)
-        };
-
-        // Generate vertices
-        static AABB boxPrev(AABB::RESET);
-        static std::vector<Vec3> verts;
-        static std::vector<ColorB> colors;
-
-        if (!IsEquivalent(boxPrev, box))
-        {
-            verts.resize(0);
-            colors.resize(0);
-            for (int i = 0; i < 4; ++i)
-            {
-                Vec3& p = base[i];
-
-                verts.push_back(p);
-                verts.push_back(Vec3(p.x, p.y, p.z + fBoxHeight));
-                verts.push_back(Vec3(p.x, p.y, p.z + fBoxHeight + fBoxOver));
-
-                colors.push_back(boxColor);
-                colors.push_back(boxColor);
-                colors.push_back(transparent);
-            }
-            boxPrev = box;
-        }
-
-        // Generate indices
-        const int numInds = 4 * 12;
-        static vtx_idx inds[numInds];
-        static bool bNeedIndsInit = true;
-        if (bNeedIndsInit)
-        {
-            vtx_idx* pInds = &inds[0];
-
-            for (int i = 0; i < 4; ++i)
-            {
-                int over = 0;
-                if (i == 3)
-                {
-                    over = -12;
-                }
-
-                int ind = i * 3;
-                *pInds++ = ind;
-                *pInds++ = ind + 3 + over;
-                *pInds++ = ind + 1;
-
-                *pInds++ = ind + 1;
-                *pInds++ = ind + 3 + over;
-                *pInds++ = ind + 4 + over;
-
-                ind = i * 3 + 1;
-                *pInds++ = ind;
-                *pInds++ = ind + 3 + over;
-                *pInds++ = ind + 1;
-
-                *pInds++ = ind + 1;
-                *pInds++ = ind + 3 + over;
-                *pInds++ = ind + 4 + over;
-            }
-            bNeedIndsInit = false;
-        }
-
-        // Draw lines
-        for (int i = 0; i < 4; ++i)
-        {
-            Vec3& p = base[i];
-
-            dc.DrawLine(p, Vec3(p.x, p.y, p.z + fBoxHeight), ColorF(1, 1, 0, 1), ColorF(1, 1, 0, 1));
-            dc.DrawLine(Vec3(p.x, p.y, p.z + fBoxHeight), Vec3(p.x, p.y, p.z + fBoxHeight + fBoxOver), ColorF(1, 1, 0, 1), ColorF(1, 1, 0, 0));
-        }
-
-        // Draw volume
-        dc.DepthWriteOff();
-        dc.CullOff();
-        dc.pRenderAuxGeom->DrawTriangles(&verts[0], verts.size(), &inds[0], numInds, &colors[0]);
-        dc.CullOn();
-        dc.DepthWriteOn();
-    }
-}
-
-Vec3 EditorViewportWidget::WorldToView3D(const Vec3& wp, [[maybe_unused]] int nFlags) const
-{
-    Vec3 out(0, 0, 0);
-    float x, y, z;
-
-    ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
-    if (_finite(x) && _finite(y) && _finite(z))
-    {
-        out.x = (x / 100) * m_rcClient.width();
-        out.y = (y / 100) * m_rcClient.height();
-        out.x /= QHighDpiScaling::factor(windowHandle()->screen());
-        out.y /= QHighDpiScaling::factor(windowHandle()->screen());
-        out.z = z;
-    }
-    return out;
-}
-
-//////////////////////////////////////////////////////////////////////////
-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() = (x / 100) * width;
-        p.ry() = (y / 100) * height;
-    }
-    else
-    {
-        QPoint(0, 0);
-    }
-    return p;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 EditorViewportWidget::ViewToWorld(
-    const QPoint& vp, bool* collideWithTerrain, bool onlyTerrain, bool bSkipVegetation, bool bTestRenderMesh, bool* collideWithObject) const
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    AZ_UNUSED(collideWithTerrain)
-    AZ_UNUSED(onlyTerrain)
-    AZ_UNUSED(bTestRenderMesh)
-    AZ_UNUSED(bSkipVegetation)
-    AZ_UNUSED(bSkipVegetation)
-    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;
-
-    if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z))
-    {
-        return Vec3(0, 0, 0);
-    }
-
-    Vec3 colp = AZVec3ToLYVec3(ray.value().origin) + 0.002f * v;
-
-    return colp;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 EditorViewportWidget::ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh)
-{
-    AZ_UNUSED(vp)
-    AZ_UNUSED(onlyTerrain)
-    AZ_UNUSED(bTestRenderMesh)
-
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    return Vec3(0, 0, 1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const
-{
-    Matrix34A objMat, objMatInv;
-    Matrix33 objRot, objRotInv;
-
-    if (hit.pCollider->GetiForeignData() != PHYS_FOREIGN_ID_STATIC)
-    {
-        return false;
-    }
-
-    IRenderNode* pNode = (IRenderNode*) hit.pCollider->GetForeignData(PHYS_FOREIGN_ID_STATIC);
-    if (!pNode || !pNode->GetEntityStatObj())
-    {
-        return false;
-    }
-
-    IStatObj* pEntObject  = pNode->GetEntityStatObj(hit.partid, 0, &objMat, false);
-    if (!pEntObject || !pEntObject->GetRenderMesh())
-    {
-        return false;
-    }
-
-    objRot = Matrix33(objMat);
-    objRot.NoScale(); // No scale.
-    objRotInv = objRot;
-    objRotInv.Invert();
-
-    float fWorldScale = objMat.GetColumn(0).GetLength(); // GetScale
-    float fWorldScaleInv = 1.0f / fWorldScale;
-
-    // transform decal into object space
-    objMatInv = objMat;
-    objMatInv.Invert();
-
-    // put into normal object space hit direction of projection
-    Vec3 invhitn = -(hit.n);
-    Vec3 vOS_HitDir = objRotInv.TransformVector(invhitn).GetNormalized();
-
-    // put into position object space hit position
-    Vec3 vOS_HitPos = objMatInv.TransformPoint(hit.pt);
-    vOS_HitPos -= vOS_HitDir * RENDER_MESH_TEST_DISTANCE * fWorldScaleInv;
-
-    IRenderMesh* pRM = pEntObject->GetRenderMesh();
-
-    AABB aabbRNode;
-    pRM->GetBBox(aabbRNode.min, aabbRNode.max);
-    Vec3 vOut(0, 0, 0);
-    if (!Intersect::Ray_AABB(Ray(vOS_HitPos, vOS_HitDir), aabbRNode, vOut))
-    {
-        return false;
-    }
-
-    if (!pRM || !pRM->GetVerticesCount())
-    {
-        return false;
-    }
-
-    if (RayRenderMeshIntersection(pRM, vOS_HitPos, vOS_HitDir, outPos, outNormal))
-    {
-        outNormal = objRot.TransformVector(outNormal).GetNormalized();
-        outPos = objMat.TransformPoint(outPos);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal) const
-{
-    AZ_UNUSED(pRenderMesh);
-    AZ_UNUSED(vInPos);
-    AZ_UNUSED(vInDir);
-    AZ_UNUSED(vOutPos);
-    AZ_UNUSED(vOutNormal);
-    return false;
-    /*SRayHitInfo hitInfo;
-    hitInfo.bUseCache = false;
-    hitInfo.bInFirstHit = false;
-    hitInfo.inRay.origin = vInPos;
-    hitInfo.inRay.direction = vInDir.GetNormalized();
-    hitInfo.inReferencePoint = vInPos;
-    hitInfo.fMaxHitDistance = 0;
-    bool bRes = ???->RenderMeshRayIntersection(pRenderMesh, hitInfo, nullptr);
-    vOutPos = hitInfo.vHitPos;
-    vOutNormal = hitInfo.vHitNormal;
-    return bRes;*/
-}
-
-void EditorViewportWidget::UnProjectFromScreen(float sx, float sy, float sz, 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);
-    *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
-{
-    AzFramework::ScreenPoint screenPosition = m_renderViewport->ViewportWorldToScreen(AZ::Vector3{ptx, pty, ptz});
-    *sx = screenPosition.m_x;
-    *sy = screenPosition.m_y;
-    *sz = 0.f;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const
-{
-    QRect rc = m_rcClient;
-
-    Vec3 pos0, pos1;
-    float wx, wy, wz;
-    UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 0, &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(vp.x(), rc.bottom() - vp.y(), 1, &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);
-
-    Vec3 v = (pos1 - pos0);
-    v = v.GetNormalized();
-
-    raySrc = pos0;
-    rayDir = v;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float EditorViewportWidget::GetScreenScaleFactor(const Vec3& worldPoint) const
-{
-    float dist = m_Camera.GetPosition().GetDistance(worldPoint);
-    if (dist < m_Camera.GetNearPlane())
-    {
-        dist = m_Camera.GetNearPlane();
-    }
-    return dist;
-}
-//////////////////////////////////////////////////////////////////////////
-float EditorViewportWidget::GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position)
-{
-    Vec3 camPos = camera.GetPosition();
-    float dist = camPos.GetDistance(object_position);
-    return dist;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnDestroy()
-{
-    DestroyRenderContext();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::CheckRespondToInput() const
-{
-    if (!Editor::EditorQtApplication::IsActive())
-    {
-        return false;
-    }
-
-    if (!hasFocus() && !m_renderViewport->hasFocus())
-    {
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::HitTest(const QPoint& point, HitContext& hitInfo)
-{
-    hitInfo.camera = &m_Camera;
-    hitInfo.pExcludedObject = GetCameraObject();
-    return QtViewport::HitTest(point, hitInfo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::IsBoundsVisible(const AABB& box) const
-{
-    // If at least part of bbox is visible then its visible.
-    return m_Camera.IsAABBVisible_F(AABB(box.min, box.max));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::CenterOnSelection()
-{
-    if (!GetIEditor()->GetSelection()->IsEmpty())
-    {
-        // Get selection bounds & center
-        CSelectionGroup* sel = GetIEditor()->GetSelection();
-        AABB selectionBounds = sel->GetBounds();
-        CenterOnAABB(selectionBounds);
-    }
-}
-
-void EditorViewportWidget::CenterOnAABB(const AABB& aabb)
-{
-    Vec3 selectionCenter = aabb.GetCenter();
-
-    // Minimum center size is 40cm
-    const float minSelectionRadius = 0.4f;
-    const float selectionSize = std::max(minSelectionRadius, aabb.GetRadius());
-
-    // Move camera 25% further back than required
-    const float centerScale = 1.25f;
-
-    // Decompose original transform matrix
-    const Matrix34& originalTM = GetViewTM();
-    AffineParts affineParts;
-    affineParts.SpectralDecompose(originalTM);
-
-    // Forward vector is y component of rotation matrix
-    Matrix33 rotationMatrix(affineParts.rot);
-    const Vec3 viewDirection = rotationMatrix.GetColumn1().GetNormalized();
-
-    // Compute adjustment required by FOV != 90 degrees
-    const float fov = GetFOV();
-    const float fovScale = (1.0f / tan(fov * 0.5f));
-
-    // Compute new transform matrix
-    const float distanceToTarget = selectionSize * fovScale * centerScale;
-    const Vec3 newPosition = selectionCenter - (viewDirection * distanceToTarget);
-    Matrix34 newTM = Matrix34(rotationMatrix, newPosition);
-
-    // Set new orbit distance
-    m_orbitDistance = distanceToTarget;
-    m_orbitDistance = fabs(m_orbitDistance);
-
-    SetViewTM(newTM);
-}
-
-void EditorViewportWidget::CenterOnSliceInstance()
-{
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    AZ::SliceComponent::SliceInstanceAddress sliceAddress;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(sliceAddress,
-        &AzToolsFramework::ToolsApplicationRequestBus::Events::FindCommonSliceInstanceAddress, selectedEntityList);
-
-    if (!sliceAddress.IsValid())
-    {
-        return;
-    }
-
-    AZ::EntityId sliceRootEntityId;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(sliceRootEntityId,
-        &AzToolsFramework::ToolsApplicationRequestBus::Events::GetRootEntityIdOfSliceInstance, sliceAddress);
-
-    if (!sliceRootEntityId.IsValid())
-    {
-        return;
-    }
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList{sliceRootEntityId});
-
-    const AZ::SliceComponent::InstantiatedContainer* instantiatedContainer = sliceAddress.GetInstance()->GetInstantiated();
-
-    AABB aabb(Vec3(std::numeric_limits<float>::max()), Vec3(-std::numeric_limits<float>::max()));
-    for (AZ::Entity* entity : instantiatedContainer->m_entities)
-    {
-        CEntityObject* entityObject = nullptr;
-        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(entityObject, entity->GetId(),
-            &AzToolsFramework::ComponentEntityEditorRequestBus::Events::GetSandboxObject);
-        AABB box;
-        entityObject->GetBoundBox(box);
-        aabb.Add(box.min);
-        aabb.Add(box.max);
-    }
-    CenterOnAABB(aabb);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetFOV(float fov)
-{
-    if (m_pCameraFOVVariable)
-    {
-        m_pCameraFOVVariable->Set(fov);
-    }
-    else
-    {
-        m_camFOV = fov;
-    }
-
-    if (m_viewPane)
-    {
-        m_viewPane->OnFOVChanged(fov);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float EditorViewportWidget::GetFOV() const
-{
-    if (m_viewSourceType == ViewSourceType::SequenceCamera)
-    {
-        CBaseObject* cameraObject = GetCameraObject();
-
-        AZ::EntityId cameraEntityId;
-        AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(cameraEntityId, cameraObject, &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
-        if (cameraEntityId.IsValid())
-        {
-            // component Camera
-            float fov = DEFAULT_FOV;
-            Camera::CameraRequestBus::EventResult(fov, cameraEntityId, &Camera::CameraComponentRequests::GetFov);
-            return AZ::DegToRad(fov);
-        }
-    }
-
-    if (m_pCameraFOVVariable)
-    {
-        float fov;
-        m_pCameraFOVVariable->Get(fov);
-        return fov;
-    }
-    else if (m_viewEntityId.IsValid())
-    {
-        float fov = AZ::RadToDeg(m_camFOV);
-        Camera::CameraRequestBus::EventResult(fov, m_viewEntityId, &Camera::CameraComponentRequests::GetFov);
-        return AZ::DegToRad(fov);
-    }
-
-    return m_camFOV;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::CreateRenderContext()
-{
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::DestroyRenderContext()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetDefaultCamera()
-{
-    if (IsDefaultCamera())
-    {
-        return;
-    }
-    ResetToViewSourceType(ViewSourceType::None);
-    GetViewManager()->SetCameraObjectId(m_cameraObjectId);
-    SetName(m_defaultViewName);
-    SetViewTM(m_defaultViewTM);
-    PostCameraSet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::IsDefaultCamera() const
-{
-    return m_viewSourceType == ViewSourceType::None;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetSequenceCamera()
-{
-    if (m_viewSourceType == ViewSourceType::SequenceCamera)
-    {
-        // Reset if we were checked before
-        SetDefaultCamera();
-    }
-    else
-    {
-        ResetToViewSourceType(ViewSourceType::SequenceCamera);
-
-        SetName(tr("Sequence Camera"));
-        SetViewTM(GetViewTM());
-
-        GetViewManager()->SetCameraObjectId(m_cameraObjectId);
-        PostCameraSet();
-
-        // ForceAnimation() so Track View will set the Camera params
-        // if a camera is animated in the sequences.
-        if (GetIEditor() && GetIEditor()->GetAnimation())
-        {
-            GetIEditor()->GetAnimation()->ForceAnimation();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetComponentCamera(const AZ::EntityId& entityId)
-{
-    ResetToViewSourceType(ViewSourceType::CameraComponent);
-    SetViewEntity(entityId);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement)
-{
-    ResetToViewSourceType(ViewSourceType::AZ_Entity);
-    SetViewEntity(entityId, lockCameraMovement);
-}
-
-void EditorViewportWidget::SetFirstComponentCamera()
-{
-    AZ::EBusAggregateResults<AZ::EntityId> results;
-    Camera::CameraBus::BroadcastResult(results, &Camera::CameraRequests::GetCameras);
-    AZStd::sort_heap(results.values.begin(), results.values.end());
-    AZ::EntityId entityId;
-    if (results.values.size() > 0)
-    {
-        entityId = results.values[0];
-    }
-    SetComponentCamera(entityId);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetSelectedCamera()
-{
-    AZ::EBusAggregateResults<AZ::EntityId> cameraList;
-    Camera::CameraBus::BroadcastResult(cameraList, &Camera::CameraRequests::GetCameras);
-    if (cameraList.values.size() > 0)
-    {
-        AzToolsFramework::EntityIdList selectedEntityList;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-        for (const AZ::EntityId& entityId : selectedEntityList)
-        {
-            if (AZStd::find(cameraList.values.begin(), cameraList.values.end(), entityId) != cameraList.values.end())
-            {
-                SetComponentCamera(entityId);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::IsSelectedCamera() const
-{
-    CBaseObject* pCameraObject = GetCameraObject();
-    if (pCameraObject && pCameraObject == GetIEditor()->GetSelectedObject())
-    {
-        return true;
-    }
-
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-        selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    if ((m_viewSourceType == ViewSourceType::CameraComponent  || m_viewSourceType == ViewSourceType::AZ_Entity)
-        && !selectedEntityList.empty()
-        && AZStd::find(selectedEntityList.begin(), selectedEntityList.end(), m_viewEntityId) != selectedEntityList.end())
-    {
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::CycleCamera()
-{
-    // None -> Sequence -> LegacyCamera -> ... LegacyCamera -> CameraComponent -> ... CameraComponent -> None
-    // AZ_Entity has been intentionally left out of the cycle for now.
-    switch (m_viewSourceType)
-    {
-    case EditorViewportWidget::ViewSourceType::None:
-    {
-        SetFirstComponentCamera();
-        break;
-    }
-    case EditorViewportWidget::ViewSourceType::SequenceCamera:
-    {
-        AZ_Error("EditorViewportWidget", false, "Legacy cameras no longer exist, unable to set sequence camera.");
-        break;
-    }
-    case EditorViewportWidget::ViewSourceType::LegacyCamera:
-    {
-        AZ_Warning("EditorViewportWidget", false, "Legacy cameras no longer exist, using first found component camera instead.");
-        SetFirstComponentCamera();
-        break;
-    }
-    case EditorViewportWidget::ViewSourceType::CameraComponent:
-    {
-        AZ::EBusAggregateResults<AZ::EntityId> results;
-        Camera::CameraBus::BroadcastResult(results, &Camera::CameraRequests::GetCameras);
-        AZStd::sort_heap(results.values.begin(), results.values.end());
-        auto&& currentCameraIterator = AZStd::find(results.values.begin(), results.values.end(), m_viewEntityId);
-        if (currentCameraIterator != results.values.end())
-        {
-            ++currentCameraIterator;
-            if (currentCameraIterator != results.values.end())
-            {
-                SetComponentCamera(*currentCameraIterator);
-                break;
-            }
-        }
-        SetDefaultCamera();
-        break;
-    }
-    case EditorViewportWidget::ViewSourceType::AZ_Entity:
-    {
-        // we may decide to have this iterate over just selected entities
-        SetDefaultCamera();
-        break;
-    }
-    default:
-    {
-        SetDefaultCamera();
-        break;
-    }
-    }
-}
-
-void EditorViewportWidget::SetViewFromEntityPerspective(const AZ::EntityId& entityId)
-{
-    SetViewAndMovementLockFromEntityPerspective(entityId, false);
-}
-
-void EditorViewportWidget::SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement)
-{
-    if (!m_ignoreSetViewFromEntityPerspective)
-    {
-        SetEntityAsCamera(entityId, lockCameraMovement);
-    }
-}
-
-bool EditorViewportWidget::GetActiveCameraPosition(AZ::Vector3& cameraPos)
-{
-    if (m_pPrimaryViewport == this)
-    {
-        if (GetIEditor()->IsInGameMode())
-        {
-            cameraPos = m_renderViewport->GetViewportContext()->GetCameraTransform().GetTranslation();
-        }
-        else
-        {
-            // Use viewTM, which is synced with the camera and guaranteed to be up-to-date
-            cameraPos = LYVec3ToAZVec3(m_viewTM.GetTranslation());
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-bool EditorViewportWidget::GetActiveCameraState(AzFramework::CameraState& cameraState)
-{
-    if (m_pPrimaryViewport == this)
-    {
-        cameraState = GetCameraState();
-
-        return true;
-    }
-
-    return false;
-}
-
-void EditorViewportWidget::OnStartPlayInEditor()
-{
-    if (m_viewEntityId.IsValid())
-    {
-        m_viewEntityIdCachedForEditMode = m_viewEntityId;
-        AZ::EntityId runtimeEntityId;
-        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
-            &AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId,
-            m_viewEntityId, runtimeEntityId);
-
-        m_viewEntityId = runtimeEntityId;
-    }
-}
-
-void EditorViewportWidget::OnStopPlayInEditor()
-{
-    if (m_viewEntityIdCachedForEditMode.IsValid())
-    {
-        m_viewEntityId = m_viewEntityIdCachedForEditMode;
-        m_viewEntityIdCachedForEditMode.SetInvalid();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnCameraFOVVariableChanged([[maybe_unused]] IVariable* var)
-{
-    if (m_viewPane)
-    {
-        m_viewPane->OnFOVChanged(GetFOV());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::HideCursor()
-{
-    if (m_bCursorHidden || !gSettings.viewports.bHideMouseCursorWhenCaptured)
-    {
-        return;
-    }
-
-    qApp->setOverrideCursor(Qt::BlankCursor);
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    StartFixedCursorMode(this);
-#endif
-    m_bCursorHidden = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ShowCursor()
-{
-    if (!m_bCursorHidden || !gSettings.viewports.bHideMouseCursorWhenCaptured)
-    {
-        return;
-    }
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    StopFixedCursorMode();
-#endif
-    qApp->restoreOverrideCursor();
-    m_bCursorHidden = false;
-}
-
-bool EditorViewportWidget::IsKeyDown(Qt::Key key) const
-{
-    return m_keyDown.contains(key);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::PushDisableRendering()
-{
-    assert(m_disableRenderingCount >= 0);
-    ++m_disableRenderingCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::PopDisableRendering()
-{
-    assert(m_disableRenderingCount >= 1);
-    --m_disableRenderingCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::IsRenderingDisabled() const
-{
-    return m_disableRenderingCount > 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint EditorViewportWidget::WidgetToViewport(const QPoint& point) const
-{
-    return point * WidgetToViewportFactor();
-}
-
-QPoint EditorViewportWidget::ViewportToWidget(const QPoint& point) const
-{
-    return point / WidgetToViewportFactor();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QSize EditorViewportWidget::WidgetToViewport(const QSize& size) const
-{
-    return size * WidgetToViewportFactor();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::BeginUndoTransaction()
-{
-    PushDisableRendering();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::EndUndoTransaction()
-{
-    PopDisableRendering();
-    Update();
-}
-
-void EditorViewportWidget::UpdateCurrentMousePos(const QPoint& newPosition)
-{
-    m_prevMousePos = m_mousePos;
-    m_mousePos = newPosition;
-}
-
-void* EditorViewportWidget::GetSystemCursorConstraintWindow() const
-{
-    AzFramework::SystemCursorState systemCursorState = AzFramework::SystemCursorState::Unknown;
-
-    AzFramework::InputSystemCursorRequestBus::EventResult(
-        systemCursorState, AzFramework::InputDeviceMouse::Id, &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
-
-    const bool systemCursorConstrained =
-        (systemCursorState == AzFramework::SystemCursorState::ConstrainedAndHidden ||
-         systemCursorState == AzFramework::SystemCursorState::ConstrainedAndVisible);
-
-    return systemCursorConstrained ? renderOverlayHWND() : nullptr;
-}
-
-void EditorViewportWidget::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt)
-{
-    const auto scaledPoint = WidgetToViewport(pt);
-    QtViewport::BuildDragDropContext(context, scaledPoint);
-}
-
-void EditorViewportWidget::RestoreViewportAfterGameMode()
-{
-    Matrix34 preGameModeViewTM = m_preGameModeViewTM;
-
-    QString text = QString("You are exiting Game Mode. Would you like to restore the camera in the viewport to where it was before you entered Game Mode?<br/><br/><small>This option can always be changed in the General Preferences tab of the Editor Settings, by toggling the \"%1\" option.</small><br/><br/>").arg(EditorPreferencesGeneralRestoreViewportCameraSettingName);
-    QString restoreOnExitGameModePopupDisabledRegKey("Editor/AutoHide/ViewportCameraRestoreOnExitGameMode");
-
-    // Read the popup disabled registry value
-    QSettings settings;
-    QVariant restoreOnExitGameModePopupDisabledRegValue = settings.value(restoreOnExitGameModePopupDisabledRegKey);
-
-    // Has the user previously disabled being asked about restoring the camera on exiting game mode?
-    if (restoreOnExitGameModePopupDisabledRegValue.isNull())
-    {
-        // No, ask them now
-        QMessageBox messageBox(QMessageBox::Question, "Lumberyard", text, QMessageBox::StandardButtons(QMessageBox::No | QMessageBox::Yes), this);
-        messageBox.setDefaultButton(QMessageBox::Yes);
-
-        QCheckBox* checkBox = new QCheckBox(QStringLiteral("Do not show this message again"));
-        messageBox.setCheckBox(checkBox);
-
-        // Unconstrain the system cursor and make it visible before we show the dialog box, otherwise the user can't see the cursor.
-        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-            AzFramework::SystemCursorState::UnconstrainedAndVisible);
-
-        int response = messageBox.exec();
-
-        if (checkBox->isChecked())
-        {
-            settings.setValue(restoreOnExitGameModePopupDisabledRegKey, response);
-        }
-
-        // Update the value only if the popup hasn't previously been disabled and the value has changed
-        bool newSetting = (response == QMessageBox::Yes);
-        if (newSetting != GetIEditor()->GetEditorSettings()->restoreViewportCamera)
-        {
-            GetIEditor()->GetEditorSettings()->restoreViewportCamera = newSetting;
-            GetIEditor()->GetEditorSettings()->Save();
-        }
-    }
-
-    bool restoreViewportCamera = GetIEditor()->GetEditorSettings()->restoreViewportCamera;
-    if (restoreViewportCamera)
-    {
-        SetViewTM(preGameModeViewTM);
-    }
-    else
-    {
-        SetViewTM(m_gameTM);
-    }
-}
-
-void EditorViewportWidget::UpdateScene()
-{
-    auto sceneSystem = AzFramework::SceneSystemInterface::Get();
-    if (sceneSystem)
-    {
-        AZStd::shared_ptr<AzFramework::Scene> mainScene = sceneSystem->GetScene(AzFramework::Scene::MainSceneName);
-        if (mainScene)
-        {
-            AZ::RPI::SceneNotificationBus::Handler::BusDisconnect();
-            m_renderViewport->SetScene(mainScene);
-            AZ::RPI::SceneNotificationBus::Handler::BusConnect(m_renderViewport->GetViewportContext()->GetRenderScene()->GetId());
-        }
-    }
-}
-
-void EditorViewportWidget::UpdateCameraFromViewportContext()
-{
-    // If we're not updating because the cry camera position changed, we should make sure our position gets copied back to the Cry Camera
-    if (m_updatingCameraPosition)
-    {
-        return;
-    }
-
-    auto cameraState = m_renderViewport->GetCameraState();
-    AZ::Matrix3x4 matrix;
-    matrix.SetBasisAndTranslation(cameraState.m_side, cameraState.m_forward, cameraState.m_up, cameraState.m_position);
-    auto m = AZMatrix3x4ToLYMatrix3x4(matrix);
-
-    m_updatingCameraPosition = true;
-    SetViewTM(m);
-    SetFOV(cameraState.m_fovOrZoom);
-    m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
-    m_updatingCameraPosition = false;
-}
-
-void EditorViewportWidget::SetAsActiveViewport()
-{
-    auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
-
-    const AZ::Name defaultContextName = viewportContextManager->GetDefaultViewportContextName();
-
-    // If another viewport was active before, restore its name to its per-ID one.
-    if (m_pPrimaryViewport && m_pPrimaryViewport != this && m_pPrimaryViewport->m_renderViewport)
-    {
-        auto viewportContext = m_pPrimaryViewport->m_renderViewport->GetViewportContext();
-        if (viewportContext)
-        {
-            // Remove the old viewport's camera from the stack, as it's no longer the owning viewport
-            viewportContextManager->PopView(defaultContextName, viewportContext->GetDefaultView());
-            viewportContextManager->RenameViewportContext(viewportContext, m_pPrimaryViewport->m_defaultViewportContextName);
-        }
-    }
-
-    m_pPrimaryViewport = this;
-    if (m_renderViewport)
-    {
-        auto viewportContext = m_renderViewport->GetViewportContext();
-        if (viewportContext)
-        {
-            // Push our camera onto the default viewport's view stack to preserve camera state continuity
-            // Other views can still be pushed on top of our view for e.g. game mode
-            viewportContextManager->PushView(defaultContextName, viewportContext->GetDefaultView());
-            viewportContextManager->RenameViewportContext(viewportContext, defaultContextName);
-        }
-    }
-}
-
-bool EditorViewportSettings::GridSnappingEnabled() const
-{
-    return SandboxEditor::GridSnappingEnabled();
-}
-
-float EditorViewportSettings::GridSize() const
-{
-    return SandboxEditor::GridSnappingSize();
-}
-
-bool EditorViewportSettings::ShowGrid() const
-{
-    return SandboxEditor::ShowingGrid();
-}
-
-bool EditorViewportSettings::AngleSnappingEnabled() const
-{
-    return SandboxEditor::AngleSnappingEnabled();
-}
-
-float EditorViewportSettings::AngleStep() const
-{
-    return SandboxEditor::AngleSnappingSize();
-}
-
-AZ_CVAR_EXTERNED(bool, ed_previewGameInFullscreen_once);
-
-bool EditorViewportWidget::ShouldPreviewFullscreen() const
-{
-    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-    if (!layout)
-    {
-        AZ_Assert(false, "CRenderViewport: No View Manager layout");
-        return false;
-    }
-
-    // Doesn't work with split layout
-    if (layout->GetLayout() != EViewLayout::ET_Layout0)
-    {
-        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())
-    {
-        if (!ge->IsLevelLoaded())
-        {
-            return false;
-        }
-    }
-
-    // Check 'ed_previewGameInFullscreen_once'
-    if (ed_previewGameInFullscreen_once)
-    {
-        ed_previewGameInFullscreen_once = false;
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-void EditorViewportWidget::StartFullscreenPreview()
-{
-    AZ_Assert(!m_inFullscreenPreview, "EditorViewportWidget::StartFullscreenPreview called when already in full screen preview");
-    m_inFullscreenPreview = true;
-
-    // Pick the screen on which the main window lies to use as the screen for the full screen preview
-    const QScreen* screen = MainWindow::instance()->screen();
-    const QRect screenGeometry = screen->geometry();
-
-    // Unparent this and show it, which turns it into a free floating window
-    // Also set style to frameless and disable resizing by user
-    setParent(nullptr);
-    setWindowFlag(Qt::FramelessWindowHint, true);
-    setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, true);
-    setFixedSize(screenGeometry.size());
-    move(QPoint(screenGeometry.x(), screenGeometry.y()));
-    showMaximized();
-
-    // This must be done after unparenting this widget above
-    MainWindow::instance()->hide();
-}
-
-void EditorViewportWidget::StopFullscreenPreview()
-{
-    AZ_Assert(m_inFullscreenPreview, "EditorViewportWidget::StartFullscreenPreview called when not in full screen preview");
-    m_inFullscreenPreview = false;
-
-    // Unset frameless window flags
-    setWindowFlag(Qt::FramelessWindowHint, false);
-    setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, false);
-
-    // Unset fixed size (note that 50x50 is the minimum set in the constructor)
-    setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
-    setMinimumSize(50, 50);
-
-    // Attach this viewport to the primary view pane (whose index is 0).
-    if (CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout())
-    {
-        if (CLayoutViewPane* viewPane = layout->GetViewPaneByIndex(0))
-        {
-            // Force-reattach this viewport to its view pane by first detaching
-            viewPane->DetachViewport();
-            viewPane->AttachViewport(this);
-
-            // Set the main widget of the layout, which causes this widgets size to be bound to the layout
-            // and the viewport title bar to be displayed
-            layout->SetMainWidget(viewPane);
-        }
-        else
-        {
-            AZ_Assert(false, "CRenderViewport: No view pane with ID 0 (primary view pane)");
-        }
-    }
-    else
-    {
-        AZ_Assert(false, "CRenderViewport: No View Manager layout");
-    }
-
-    // Set this as the selected viewport
-    GetIEditor()->GetViewManager()->SelectViewport(this);
-
-    // Show this widget (setting flags may hide it)
-    showNormal();
-
-    // Show the main window
-    MainWindow::instance()->show();
-}
-
-#include <moc_EditorViewportWidget.cpp>
diff --git a/Code/Sandbox/Editor/EditorViewportWidget.h b/Code/Sandbox/Editor/EditorViewportWidget.h
deleted file mode 100644
index ff0656e648..0000000000
--- a/Code/Sandbox/Editor/EditorViewportWidget.h
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-// RenderViewport.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include <Cry_Camera.h>
-
-#include <QSet>
-
-#include "Viewport.h"
-#include "Objects/DisplayContext.h"
-#include "Undo/Undo.h"
-#include "Util/PredefinedAspectRatios.h"
-#include "EditorViewportSettings.h"
-
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/std/optional.h>
-#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
-#include <AzFramework/Scene/SceneSystemInterface.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/EditorCameraBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Viewport/ViewportMessages.h>
-#include <MathConversion.h>
-#include <Atom/RPI.Public/ViewportContext.h>
-#include <Atom/RPI.Public/SceneBus.h>
-#endif
-
-#include <AzFramework/Windowing/WindowBus.h>
-#include <AzFramework/Visibility/EntityVisibilityQuery.h>
-
-// forward declarations.
-class CBaseObject;
-class QMenu;
-class QKeyEvent;
-struct ray_hit;
-struct IRenderMesh;
-struct IVariable;
-
-namespace AZ::ViewportHelpers
-{
-    class EditorEntityNotifications;
-} //namespace AZ::ViewportHelpers
-
-namespace AtomToolsFramework
-{
-    class RenderViewportWidget;
-}
-
-namespace AzToolsFramework
-{
-    class ManipulatorManager;
-}
-
-// EditorViewportWidget window
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-class SANDBOX_API EditorViewportWidget
-    : public QtViewport
-    , public IEditorNotifyListener
-    , public IUndoManagerListener
-    , public Camera::EditorCameraRequestBus::Handler
-    , public AzFramework::InputSystemCursorConstraintRequestBus::Handler
-    , public AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler
-    , public AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler
-    , public AzFramework::AssetCatalogEventBus::Handler
-    , public AZ::RPI::SceneNotificationBus::Handler
-{
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    Q_OBJECT
-public:
-    struct SResolution
-    {
-        SResolution()
-            : width(0)
-            , height(0)
-        {
-        }
-
-        SResolution(int w, int h)
-            : width(w)
-            , height(h)
-        {
-        }
-
-        int width;
-        int height;
-    };
-
-public:
-    EditorViewportWidget(const QString& name, QWidget* parent = nullptr);
-
-    static const GUID& GetClassID()
-    {
-        return QtViewport::GetClassID<EditorViewportWidget>();
-    }
-
-    /** Get type of this viewport.
-    */
-    virtual EViewportType GetType() const { return ET_ViewportCamera; }
-    virtual void SetType([[maybe_unused]] EViewportType type) { assert(type == ET_ViewportCamera); };
-
-    virtual ~EditorViewportWidget();
-
-    Q_INVOKABLE void InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons);
-
-    // Replacement for still used CRenderer methods
-    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;
-
-public:
-    virtual void Update();
-
-    virtual void ResetContent();
-    virtual void UpdateContent(int flags);
-
-    void OnTitleMenu(QMenu* menu) override;
-
-    void SetCamera(const CCamera& camera);
-    const CCamera& GetCamera() const { return m_Camera; };
-    virtual void SetViewTM(const Matrix34& tm)
-    {
-        if (m_viewSourceType == ViewSourceType::None)
-        {
-            m_defaultViewTM = tm;
-        }
-        SetViewTM(tm, false);
-    }
-
-    //! Map world space position to viewport position.
-    virtual QPoint WorldToView(const Vec3& wp) const;
-    virtual QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const;
-    virtual Vec3 WorldToView3D(const Vec3& wp, int nFlags = 0) const;
-
-    //! Map viewport position to world space position.
-    virtual Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
-    virtual void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
-    virtual Vec3 ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
-    virtual float GetScreenScaleFactor(const Vec3& worldPoint) const;
-    virtual float GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position);
-    virtual float GetAspectRatio() const;
-    virtual bool HitTest(const QPoint& point, HitContext& hitInfo);
-    virtual bool IsBoundsVisible(const AABB& box) const;
-    virtual void CenterOnSelection();
-    virtual void CenterOnAABB(const AABB& aabb);
-    void CenterOnSliceInstance() override;
-
-    void focusOutEvent(QFocusEvent* event) override;
-    void keyPressEvent(QKeyEvent* event) override;
-
-    void SetFOV(float fov);
-    float GetFOV() const;
-
-    void SetDefaultCamera();
-    bool IsDefaultCamera() const;
-    void SetSequenceCamera();
-    bool IsSequenceCamera() const { return m_viewSourceType == ViewSourceType::SequenceCamera; }
-    void SetSelectedCamera();
-    bool IsSelectedCamera() const;
-    void SetComponentCamera(const AZ::EntityId& entityId);
-    void SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement = false);
-    void SetFirstComponentCamera();
-    void SetViewEntity(const AZ::EntityId& cameraEntityId, bool lockCameraMovement = false);
-    void PostCameraSet();
-    // This switches the active camera to the next one in the list of (default, all custom cams).
-    void CycleCamera();
-
-    // Camera::EditorCameraRequestBus
-    void SetViewFromEntityPerspective(const AZ::EntityId& entityId) override;
-    void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
-    AZ::EntityId GetCurrentViewEntityId() override { return m_viewEntityId; }
-    bool GetActiveCameraPosition(AZ::Vector3& cameraPos) override;
-    bool GetActiveCameraState(AzFramework::CameraState& cameraState) override;
-
-    // AzToolsFramework::EditorEntityContextNotificationBus (handler moved to cpp to resolve link issues in unity builds)
-    virtual void OnStartPlayInEditor();
-    virtual void OnStopPlayInEditor();
-
-    AzFramework::CameraState GetCameraState();
-    AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
-
-    // AzToolsFramework::ViewportFreezeRequestBus
-    bool IsViewportInputFrozen() override;
-    void FreezeViewportInput(bool freeze) override;
-
-    // AzToolsFramework::MainEditorViewportInteractionRequestBus
-    AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) override;
-    AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override;
-    float TerrainHeight(const AZ::Vector2& position) override;
-    void FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut) override;
-    bool ShowingWorldSpace() override;
-    QWidget* GetWidgetForViewportContextMenu() override;
-    void BeginWidgetContext() override;
-    void EndWidgetContext() override;
-
-    // CViewport...
-    void SetViewportId(int id) override;
-
-    void ConnectViewportInteractionRequestBus();
-    void DisconnectViewportInteractionRequestBus();
-
-    void LockCameraMovement(bool bLock) { m_bLockCameraMovement = bLock; }
-    bool IsCameraMovementLocked() const { return m_bLockCameraMovement; }
-
-    void EnableCameraObjectMove(bool bMove) { m_bMoveCameraObject = bMove; }
-    bool IsCameraObjectMove() const { return m_bMoveCameraObject; }
-
-    void SetPlayerControl(uint32 i) { m_PlayerControl = i; };
-    uint32 GetPlayerControl() { return m_PlayerControl; };
-
-    const DisplayContext& GetDisplayContext() const { return m_displayContext; }
-    CBaseObject* GetCameraObject() const;
-
-    QPoint WidgetToViewport(const QPoint& point) const;
-    QPoint ViewportToWidget(const QPoint& point) const;
-    QSize WidgetToViewport(const QSize& size) const;
-
-    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-
-    void SetPlayerPos()
-    {
-        Matrix34 m = GetViewTM();
-        m.SetTranslation(m.GetTranslation() - m_PhysicalLocation.t);
-        SetViewTM(m);
-
-        m_AverageFrameTime = 0.14f;
-
-        m_PhysicalLocation.SetIdentity();
-
-        m_LocalEntityMat.SetIdentity();
-        m_PrevLocalEntityMat.SetIdentity();
-
-        m_absCameraHigh = 2.0f;
-        m_absCameraPos = Vec3(0, 3, 2);
-        m_absCameraPosVP = Vec3(0, -3, 1.5);
-
-        m_absCurrentSlope = 0.0f;
-
-        m_absLookDirectionXY = Vec2(0, 1);
-
-        m_LookAt = Vec3(ZERO);
-        m_LookAtRate = Vec3(ZERO);
-        m_vCamPos = Vec3(ZERO);
-        m_vCamPosRate = Vec3(ZERO);
-
-        m_relCameraRotX = 0;
-        m_relCameraRotZ = 0;
-
-        uint32 numSample6 = m_arrAnimatedCharacterPath.size();
-        for (uint32 i = 0; i < numSample6; i++)
-        {
-            m_arrAnimatedCharacterPath[i] = Vec3(ZERO);
-        }
-
-        numSample6 = m_arrSmoothEntityPath.size();
-        for (uint32 i = 0; i < numSample6; i++)
-        {
-            m_arrSmoothEntityPath[i] = Vec3(ZERO);
-        }
-
-        uint32 numSample7 = m_arrRunStrafeSmoothing.size();
-        for (uint32 i = 0; i < numSample7; i++)
-        {
-            m_arrRunStrafeSmoothing[i] = 0;
-        }
-
-        m_vWorldDesiredBodyDirection = Vec2(0, 1);
-        m_vWorldDesiredBodyDirectionSmooth = Vec2(0, 1);
-        m_vWorldDesiredBodyDirectionSmoothRate = Vec2(0, 1);
-
-        m_vWorldDesiredBodyDirection2 = Vec2(0, 1);
-
-        m_vWorldDesiredMoveDirection = Vec2(0, 1);
-        m_vWorldDesiredMoveDirectionSmooth = Vec2(0, 1);
-        m_vWorldDesiredMoveDirectionSmoothRate = Vec2(0, 1);
-        m_vLocalDesiredMoveDirection = Vec2(0, 1);
-        m_vLocalDesiredMoveDirectionSmooth = Vec2(0, 1);
-        m_vLocalDesiredMoveDirectionSmoothRate = Vec2(0, 1);
-
-        m_vWorldAimBodyDirection = Vec2(0, 1);
-
-        m_MoveSpeedMSec = 5.0f;
-        m_key_W = 0;
-        m_keyrcr_W = 0;
-        m_key_S = 0;
-        m_keyrcr_S = 0;
-        m_key_A = 0;
-        m_keyrcr_A = 0;
-        m_key_D = 0;
-        m_keyrcr_D = 0;
-        m_key_SPACE = 0;
-        m_keyrcr_SPACE = 0;
-        m_ControllMode = 0;
-
-        m_State = -1;
-        m_Stance = 1; //combat
-
-        m_udGround = 0.0f;
-        m_lrGround = 0.0f;
-        AABB aabb = AABB(Vec3(-40.0f, -40.0f, -0.25f), Vec3(+40.0f, +40.0f, +0.0f));
-        m_GroundOBB = OBB::CreateOBBfromAABB(Matrix33(IDENTITY), aabb);
-        m_GroundOBBPos = Vec3(0, 0, -0.01f);
-    };
-
-    static EditorViewportWidget* GetPrimaryViewport();
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    CCamera m_Camera;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-protected:
-    struct SScopedCurrentContext;
-
-    void SetViewTM(const Matrix34& tm, bool bMoveOnly);
-
-    // Called to render stuff.
-    virtual void OnRender();
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
-    //! Get currently active camera object.
-    void ToggleCameraObject();
-
-    void RenderConstructionPlane();
-    void RenderSnapMarker();
-
-    void RenderAll();
-
-    void OnBeginPrepareRender() override;
-
-    // Update the safe frame, safe action, safe title, and borders rectangles based on
-    // viewport size and target aspect ratio.
-    void UpdateSafeFrame();
-
-    // Draw safe frame, safe action, safe title rectangles and borders.
-    void RenderSafeFrame();
-
-    // Draw one of the safe frame rectangles with the desired color.
-    void RenderSafeFrame(const QRect& frame, float r, float g, float b, float a);
-
-    // Draw a selected region if it has been selected
-    void RenderSelectedRegion();
-
-    virtual bool CreateRenderContext();
-    virtual void DestroyRenderContext();
-
-    void OnMenuCommandChangeAspectRatio(unsigned int commandId);
-
-    bool AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const;
-    bool RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal) const;
-
-    bool AddCameraMenuItems(QMenu* menu);
-    void ResizeView(int width, int height);
-
-    void OnCameraFOVVariableChanged(IVariable* var);
-
-    void HideCursor();
-    void ShowCursor();
-
-    bool IsKeyDown(Qt::Key key) const;
-
-    enum class ViewSourceType
-    {
-        None,
-        SequenceCamera,
-        LegacyCamera,
-        CameraComponent,
-        AZ_Entity,
-        ViewSourceTypesCount,
-    };
-    void ResetToViewSourceType(const ViewSourceType& viewSourType);
-
-    bool ShouldPreviewFullscreen() const;
-    void StartFullscreenPreview();
-    void StopFullscreenPreview();
-
-    bool m_inFullscreenPreview = false;
-    bool m_bRenderContextCreated = false;
-    bool m_bInRotateMode = false;
-    bool m_bInMoveMode = false;
-    bool m_bInOrbitMode = false;
-    bool m_bInZoomMode = false;
-
-    QPoint m_mousePos = QPoint(0, 0);
-    QPoint m_prevMousePos = QPoint(0, 0);  // for tablets, you can't use SetCursorPos and need to remember the prior point and delta with that.
-
-
-    float m_moveSpeed = 1;
-
-    float m_orbitDistance = 10.0f;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Vec3 m_orbitTarget;
-
-    //-------------------------------------------
-    //---   player-control in CharEdit        ---
-    //-------------------------------------------
-    f32 m_MoveSpeedMSec;
-
-    uint32 m_key_W, m_keyrcr_W;
-    uint32 m_key_S, m_keyrcr_S;
-    uint32 m_key_A, m_keyrcr_A;
-    uint32 m_key_D, m_keyrcr_D;
-
-    uint32 m_key_SPACE, m_keyrcr_SPACE;
-    uint32 m_ControllMode;
-
-    int32 m_Stance;
-    int32 m_State;
-    f32 m_AverageFrameTime;
-
-    uint32 m_PlayerControl = 0;
-
-    f32 m_absCameraHigh;
-    Vec3 m_absCameraPos;
-    Vec3 m_absCameraPosVP;
-
-    f32  m_absCurrentSlope;  //in radiants
-
-    Vec2 m_absLookDirectionXY;
-
-    Vec3 m_LookAt;
-    Vec3 m_LookAtRate;
-    Vec3 m_vCamPos;
-    Vec3 m_vCamPosRate;
-    float m_camFOV;
-
-    f32 m_relCameraRotX;
-    f32 m_relCameraRotZ;
-
-    QuatTS m_PhysicalLocation;
-
-    Matrix34 m_AnimatedCharacterMat;
-
-    Matrix34 m_LocalEntityMat;  //this is used for data-driven animations where the character is running on the spot
-    Matrix34 m_PrevLocalEntityMat;
-
-    std::vector<Vec3> m_arrVerticesHF;
-    std::vector<vtx_idx> m_arrIndicesHF;
-
-    std::vector<Vec3> m_arrAnimatedCharacterPath;
-    std::vector<Vec3> m_arrSmoothEntityPath;
-    std::vector<f32> m_arrRunStrafeSmoothing;
-
-    Vec2 m_vWorldDesiredBodyDirection;
-    Vec2 m_vWorldDesiredBodyDirectionSmooth;
-    Vec2 m_vWorldDesiredBodyDirectionSmoothRate;
-
-    Vec2 m_vWorldDesiredBodyDirection2;
-
-
-    Vec2 m_vWorldDesiredMoveDirection;
-    Vec2 m_vWorldDesiredMoveDirectionSmooth;
-    Vec2 m_vWorldDesiredMoveDirectionSmoothRate;
-    Vec2 m_vLocalDesiredMoveDirection;
-    Vec2 m_vLocalDesiredMoveDirectionSmooth;
-    Vec2 m_vLocalDesiredMoveDirectionSmoothRate;
-    Vec2 m_vWorldAimBodyDirection;
-
-    f32 m_udGround;
-    f32 m_lrGround;
-    OBB m_GroundOBB;
-    Vec3 m_GroundOBBPos;
-
-    // Index of camera objects.
-    mutable GUID m_cameraObjectId;
-    mutable AZ::EntityId m_viewEntityId;
-    mutable ViewSourceType m_viewSourceType = ViewSourceType::None;
-    AZ::EntityId m_viewEntityIdCachedForEditMode;
-    Matrix34 m_preGameModeViewTM;
-    uint m_disableRenderingCount = 0;
-    bool m_bLockCameraMovement;
-    bool m_bUpdateViewport = false;
-    bool m_bMoveCameraObject = true;
-
-    enum class KeyPressedState
-    {
-        AllUp,
-        PressedThisFrame,
-        PressedInPreviousFrame,
-    };
-    KeyPressedState m_pressedKeyState = KeyPressedState::AllUp;
-
-    Matrix34 m_defaultViewTM;
-    const QString m_defaultViewName;
-
-    DisplayContext m_displayContext;
-
-
-    bool m_isOnPaint = false;
-    static EditorViewportWidget* m_pPrimaryViewport;
-
-    QRect m_safeFrame;
-    QRect m_safeAction;
-    QRect m_safeTitle;
-
-    CPredefinedAspectRatios m_predefinedAspectRatios;
-
-    IVariable* m_pCameraFOVVariable = nullptr;
-    bool m_bCursorHidden = false;
-
-    void OnMenuResolutionCustom();
-    void OnMenuCreateCameraEntityFromCurrentView();
-    void OnMenuSelectCurrentCamera();
-
-    int OnCreate();
-    void resizeEvent(QResizeEvent* event) override;
-    void paintEvent(QPaintEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-
-    // From a series of input primitives, compose a complete mouse interaction.
-    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteractionInternal(
-        AzToolsFramework::ViewportInteraction::MouseButtons buttons,
-        AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
-        const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const;
-    // Given a point in the viewport, return the pick ray into the scene.
-    // note: The argument passed to parameter **point**, originating
-    // from a Qt event, must first be passed to WidgetToViewport before being
-    // passed to BuildMousePick.
-    AzToolsFramework::ViewportInteraction::MousePick BuildMousePick(const QPoint& point);
-
-    bool event(QEvent* event) override;
-    void OnDestroy();
-
-    bool CheckRespondToInput() const;
-
-    // AzFramework::InputSystemCursorConstraintRequestBus
-    void* GetSystemCursorConstraintWindow() const override;
-
-    void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) override;
-
-private:
-    void SetAsActiveViewport();
-    void PushDisableRendering();
-    void PopDisableRendering();
-    bool IsRenderingDisabled() const;
-    AzToolsFramework::ViewportInteraction::MousePick BuildMousePickInternal(const QPoint& point) const;
-
-    void RestoreViewportAfterGameMode();
-    void UpdateCameraFromViewportContext();
-
-    double WidgetToViewportFactor() const
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        // Needed for high DPI mode on windows
-        return devicePixelRatioF();
-#else
-        return 1.0f;
-#endif
-    }
-
-    void BeginUndoTransaction() override;
-    void EndUndoTransaction() override;
-
-    void UpdateCurrentMousePos(const QPoint& newPosition);
-    void UpdateScene();
-
-    AzFramework::EntityVisibilityQuery m_entityVisibilityQuery;
-
-    SandboxEditor::GridSnappingChangedEvent::Handler m_gridSnappingHandler;
-    AZStd::unique_ptr<SandboxEditor::EditorViewportSettingsCallbacks> m_editorViewportSettingsCallbacks;
-
-    QSet<int> m_keyDown;
-
-    bool m_freezeViewportInput = false;
-
-    AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager;
-
-    // Used to prevent circular set camera events
-    bool m_ignoreSetViewFromEntityPerspective = false;
-    bool m_windowResizedEvent = false;
-
-    AZStd::unique_ptr<AZ::ViewportHelpers::EditorEntityNotifications> m_editorEntityNotifications;
-    AtomToolsFramework::RenderViewportWidget* m_renderViewport = nullptr;
-
-    bool m_updatingCameraPosition = false;
-    AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
-    AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraProjectionMatrixChangeHandler;
-    AzFramework::DebugDisplayRequests* m_debugDisplay = nullptr;
-
-    AZ::Name m_defaultViewportContextName;
-
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
diff --git a/Code/Sandbox/Editor/ErrorDialog.cpp b/Code/Sandbox/Editor/ErrorDialog.cpp
deleted file mode 100644
index 4dd8899cfd..0000000000
--- a/Code/Sandbox/Editor/ErrorDialog.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ErrorDialog.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_ErrorDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-namespace SandboxEditor
-{
-    ErrorDialog::ErrorDialog(QWidget* parent)
-        : QDialog(parent)
-        , m_ui(new Ui::ErrorLogDialog())
-    {
-        m_ui->setupUi(this);
-        connect(m_ui->okButton, &QPushButton::clicked, this, &ErrorDialog::OnOK);
-        connect(
-            m_ui->messages, 
-            SIGNAL(itemSelectionChanged()), 
-            this, 
-            SLOT(MessageSelectionChanged()));
-    }
-
-    ErrorDialog::~ErrorDialog()
-    {
-    }
-
-    void ErrorDialog::OnOK()
-    {
-        close();
-    }
-
-    void ErrorDialog::AddMessages(MessageType messageType, const AZStd::list<QString>& messages)
-    {
-        AZ_Assert(m_ui != nullptr, "ErrorDialog's AddMessages cannot be used without a valid UI.");
-        for (const QString& message : messages)
-        {
-            // filter out duplicate messages
-            if (m_uniqueStrings.contains(message))
-            {
-                continue;
-            }
-            m_uniqueStrings.insert(message);
-
-            // Attempt to split the message up by newline, so the list of errors can be kept shorter.
-            // This returns a QStringList with one element, the original string, if the split fails.
-            QStringList messageSplitPerLine = message.split('\n');
-
-            QStringList messageList;
-
-            // MessageColumn::MessageType
-            messageList << GetMessageTypeString(messageType);
-            // MessageColumn::ShortMessage
-            messageList << messageSplitPerLine[0];
-            // MessageColumn::DetailedMessage
-            messageList << message;
-
-            // Add the message to the tree widget at the root.
-            m_ui->messages->insertTopLevelItem(0, new QTreeWidgetItem(messageList));
-        }
-    }
-
-    void ErrorDialog::MessageSelectionChanged()
-    {
-        AZ_Assert(m_ui != nullptr, "ErrorDialog's MessageSelectionChanged cannot be used without a valid UI.");
-        AZ_Assert(m_ui->messages != nullptr, "ErrorDialog's MessageSelectionChanged cannot be used without a valid messages QTreeWidget.");
-        AZ_Assert(m_ui->details != nullptr, "ErrorDialog's MessageSelectionChanged cannot be used without a valid details QLabel.");
-        QList<QTreeWidgetItem*> selectedItem = m_ui->messages->selectedItems();
-        
-        QTreeWidgetItem* firstSelected = !selectedItem.isEmpty() ? selectedItem.first() : nullptr;
-        if (firstSelected)
-        {
-            m_ui->details->setText(firstSelected->text((int)MessageColumn::DetailedMessage));
-        }
-    }
-
-    QString ErrorDialog::GetMessageTypeString(MessageType messageType) const
-    {
-        switch (messageType)
-        {
-        case ErrorDialog::MessageType::Warning:
-            return QObject::tr("Warning");
-        case MessageType::Error:
-            return QObject::tr("Error");
-        default:
-            {
-                AZ_Warning(
-                    "ErrorDialog", 
-                    false,
-                    "No message type string is available for message type %u",
-                    messageType);
-
-                return QObject::tr("Unknown");
-            }
-        }
-    }
-}
-
-
-
-#include <moc_ErrorDialog.cpp>
diff --git a/Code/Sandbox/Editor/ErrorDialog.h b/Code/Sandbox/Editor/ErrorDialog.h
deleted file mode 100644
index 1e939bdf3f..0000000000
--- a/Code/Sandbox/Editor/ErrorDialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-
-#include "Include/EditorCoreAPI.h"
-#endif
-
-namespace Ui 
-{
-    class ErrorLogDialog;
-}
-class QItemSelection;
-
-namespace SandboxEditor
-{
-    /// Used to display a collection of error and warning messages.
-    /// This is used instead of QMessageBox because the details section of QMessageBox is not
-    /// very resizeable, making it hard to show multiple errors at once.
-    class EDITOR_CORE_API ErrorDialog
-        : public QDialog
-    {
-        Q_OBJECT
-    public:
-        enum class MessageType
-        {
-            Warning,
-            Error
-        };
-        
-        //! ErrorDialog constructor.
-        //! @param parent the optional QWidget to use as a parent.
-        explicit ErrorDialog(QWidget* parent = nullptr);
-        ~ErrorDialog();
-
-        //! Adds messages to the dialog, marked with the passed in message type.
-        //! @param messageType what message type to use to mark passed in messages.
-        //! @param messages the list of messages to add.
-        void AddMessages(MessageType messageType, const AZStd::list<QString>& messages);
-
-    protected Q_SLOTS:
-        void OnOK();
-        void MessageSelectionChanged();
-
-    private:
-        /// Tracks which column the message information is used in.
-        enum class MessageColumn
-        {
-            MessageType,
-            ShortMessage,
-            DetailedMessage,
-        };
-
-        //! Converts MessageType to QString.
-        //! @param messageType the message type to convert.
-        //! @return the QString representation of that message type.
-        QString GetMessageTypeString(MessageType messageType) const;
-
-        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        QScopedPointer<Ui::ErrorLogDialog> m_ui; ///< Tracks the Qt UI associated with this class.
-        QSet<QString> m_uniqueStrings;
-        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    };
-}
diff --git a/Code/Sandbox/Editor/ErrorRecorder.cpp b/Code/Sandbox/Editor/ErrorRecorder.cpp
deleted file mode 100644
index f43f0a1008..0000000000
--- a/Code/Sandbox/Editor/ErrorRecorder.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include "ErrorRecorder.h"
-#include "BaseLibraryItem.h"
-#include "Include/IErrorReport.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-CErrorsRecorder::CErrorsRecorder(bool showErrors)
-{
-    GetIEditor()->GetErrorReport()->SetImmediateMode(false);
-    GetIEditor()->GetErrorReport()->SetShowErrors(showErrors);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CErrorsRecorder::~CErrorsRecorder()
-{
-    GetIEditor()->GetErrorReport()->Display();
-}
diff --git a/Code/Sandbox/Editor/ErrorRecorder.h b/Code/Sandbox/Editor/ErrorRecorder.h
deleted file mode 100644
index 2b0c1c9e2a..0000000000
--- a/Code/Sandbox/Editor/ErrorRecorder.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-// Description : Class that collects error reports to present them later.
-
-#ifndef CRYINCLUDE_EDITOR_CORE_ERRORRECORDER_H
-#define CRYINCLUDE_EDITOR_CORE_ERRORRECORDER_H
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-//! Automatic class to record and display error.
-class EDITOR_CORE_API CErrorsRecorder
-{
-public:
-    CErrorsRecorder(bool showErrors = true);
-    ~CErrorsRecorder();
-};
-
-#endif // CRYINCLUDE_EDITOR_ERRORREPORT_H
diff --git a/Code/Sandbox/Editor/ErrorReport.cpp b/Code/Sandbox/Editor/ErrorReport.cpp
deleted file mode 100644
index 5d7daba57a..0000000000
--- a/Code/Sandbox/Editor/ErrorReport.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ErrorReport.h"
-
-// Editor
-#include "ErrorReportDialog.h"
-
-//////////////////////////////////////////////////////////////////////////
-QString CErrorRecord::GetErrorText() const
-{
-    QString str = error.trimmed();
-
-    const char* sModuleName = "";
-    // Module name
-    switch (module)
-    {
-    case VALIDATOR_MODULE_UNKNOWN:
-        sModuleName = "";
-        break;
-    case VALIDATOR_MODULE_RENDERER:
-        sModuleName = "Renderer";
-        break;
-    case VALIDATOR_MODULE_3DENGINE:
-        sModuleName = "Engine";
-        break;
-    case VALIDATOR_MODULE_SYSTEM:
-        sModuleName = "System";
-        break;
-    case VALIDATOR_MODULE_AUDIO:
-        sModuleName = "Audio";
-        break;
-    case VALIDATOR_MODULE_MOVIE:
-        sModuleName = "Movie";
-        break;
-    case VALIDATOR_MODULE_EDITOR:
-        sModuleName = "Editor";
-        break;
-    case VALIDATOR_MODULE_NETWORK:
-        sModuleName = "Network";
-        break;
-    case VALIDATOR_MODULE_PHYSICS:
-        sModuleName = "Physics";
-        break;
-    case VALIDATOR_MODULE_FEATURETESTS:
-        sModuleName = "FeatureTests";
-        break;
-    case VALIDATOR_MODULE_SHINE:
-        sModuleName = "UI";
-        break;
-    }
-    str = QStringLiteral("[%1]\t[%2]\t%3").arg(count, 2).arg(QString(sModuleName).leftJustified(6), error).trimmed();
-
-    if (!file.isEmpty())
-    {
-        str += QString("\t") + file;
-    }
-    else
-    {
-        str += QString("\t ");
-    }
-    if (pItem)
-    {
-        switch (pItem->GetType())
-        {
-        case EDB_TYPE_MATERIAL:
-            str += QString("\t Material=\"");
-            break;
-        case EDB_TYPE_PARTICLE:
-            str += QString("\t Particle=\"");
-            break;
-        case EDB_TYPE_MUSIC:
-            str += QString("\t Music=\"");
-            break;
-        default:
-            str += QString("\t Item=\"");
-        }
-        str += pItem->GetFullName() + "\"";
-    }
-    if (pObject)
-    {
-        str += QString("\t Object=\"") + pObject->GetName() + "\"";
-    }
-    return str;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CError Report.
-//////////////////////////////////////////////////////////////////////////
-CErrorReport::CErrorReport()
-{
-    m_errors.reserve(100);
-    m_bImmediateMode = true;
-    m_bShowErrors = true;
-    m_pObject = nullptr;
-    m_pItem = nullptr;
-    m_pParticle = nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReport::ReportError(CErrorRecord& err)
-{
-    static bool bNoRecurse = false;
-    if (bNoRecurse)
-    {
-        return;
-    }
-
-    bNoRecurse = true;
-    if (m_bImmediateMode)
-    {
-        if (err.module == VALIDATOR_MODULE_EDITOR && err.severity == static_cast<int>(VALIDATOR_ERROR))
-        {
-            Warning(err.error.toUtf8().data());
-        }
-        else
-        {
-            // Show dialog if first character of warning is !.
-            if (!err.error.isEmpty() && err.error[0] == '!')
-            {
-                Warning(err.error.toUtf8().data());
-            }
-            else
-            {
-                m_errors.push_back(err);
-            }
-        }
-    }
-    else
-    {
-        if (err.pObject == NULL && m_pObject != NULL)
-        {
-            err.pObject = m_pObject;
-        }
-        else if (err.pItem == NULL && m_pItem != NULL)
-        {
-            err.pItem = m_pItem;
-        }
-        m_errors.push_back(err);
-    }
-    bNoRecurse = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReport::Clear()
-{
-    m_errors.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline bool SortErrorsByModule(const CErrorRecord& e1, const CErrorRecord& e2)
-{
-    if (e1.module == e2.module)
-    {
-        if (e1.error == e2.error)
-        {
-            return e1.file < e2.file;
-        }
-        else
-        {
-            return e1.error < e2.error;
-        }
-    }
-    return e1.module < e2.module;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReport::Display()
-{
-    if (m_errors.empty() || !m_bShowErrors)
-    {
-        SetImmediateMode(true);
-        return;
-    }
-
-    // Sort by module.
-    std::sort(m_errors.begin(), m_errors.end(), SortErrorsByModule);
-
-    std::vector<CErrorRecord> errorList;
-    errorList.swap(m_errors);
-
-    m_errors.reserve(errorList.size());
-
-    QString prevName = "";
-    QString prevFile = "";
-    for (int i = 0; i < errorList.size(); i++)
-    {
-        CErrorRecord& err = errorList[i];
-        if (err.error != prevName || err.file != prevFile)
-        {
-            err.count = 1;
-            m_errors.push_back(err);
-        }
-        else if (!m_errors.empty())
-        {
-            m_errors.back().count++;
-        }
-        prevName = err.error;
-        prevFile = err.file;
-    }
-
-    // Log all errors.
-    CryLogAlways("========================= Errors =========================");
-    for (int i = 0; i < m_errors.size(); i++)
-    {
-        CErrorRecord& err = m_errors[i];
-        QString str = err.GetErrorText();
-        CryLogAlways("%3d) %s", i, str.toUtf8().data());
-    }
-    CryLogAlways("========================= End Errors =========================");
-
-    ICVar* const noErrorReportWindowCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_error_report_window") : nullptr;
-    if (noErrorReportWindowCVar && noErrorReportWindowCVar->GetIVal() == 0)
-    {
-        CErrorReportDialog::Open(this);
-    }
-
-    SetImmediateMode(true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CErrorReport::IsEmpty() const
-{
-    return m_errors.empty();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CErrorRecord& CErrorReport::GetError(int i)
-{
-    assert(i >= 0 && i < m_errors.size());
-    return m_errors[i];
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReport::SetImmediateMode(bool bEnable)
-{
-    if (bEnable != m_bImmediateMode)
-    {
-        Clear();
-        m_bImmediateMode = bEnable;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReport::Report(SValidatorRecord& record)
-{
-    if ((record.flags & VALIDATOR_FLAG_IGNORE_IN_EDITOR))
-    {
-        return;
-    }
-
-    CErrorRecord err;
-    if (record.text)
-    {
-        err.error = record.text;
-    }
-    if (record.description)
-    {
-        err.description = record.description;
-    }
-    if (record.file)
-    {
-        err.file = record.file;
-    }
-    else
-    {
-        err.file = m_currentFilename;
-    }
-    err.severity = (CErrorRecord::ESeverity)record.severity;
-
-    err.assetScope = record.assetScope;
-
-    err.flags = 0;
-    if (record.flags & VALIDATOR_FLAG_FILE)
-    {
-        err.flags |= CErrorRecord::FLAG_NOFILE;
-    }
-    if (record.flags & VALIDATOR_FLAG_TEXTURE)
-    {
-        err.flags |= CErrorRecord::FLAG_TEXTURE;
-    }
-    if (record.flags & VALIDATOR_FLAG_SCRIPT)
-    {
-        err.flags |= CErrorRecord::FLAG_SCRIPT;
-    }
-    if (record.flags & VALIDATOR_FLAG_AI)
-    {
-        err.flags |= CErrorRecord::FLAG_AI;
-    }
-
-    err.module = record.module;
-    err.pObject = m_pObject;
-    err.pItem = m_pItem;
-
-    ReportError(err);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReport::SetCurrentValidatorObject(CBaseObject* pObject)
-{
-    m_pObject = pObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReport::SetCurrentValidatorItem(CBaseLibraryItem* pItem)
-{
-    m_pItem = pItem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReport::SetCurrentFile(const QString& file)
-{
-    m_currentFilename = file;
-}
diff --git a/Code/Sandbox/Editor/ErrorReport.h b/Code/Sandbox/Editor/ErrorReport.h
deleted file mode 100644
index cb7ca2a2f1..0000000000
--- a/Code/Sandbox/Editor/ErrorReport.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Class that collects error reports to present them later.
-
-
-#ifndef CRYINCLUDE_EDITOR_ERRORREPORT_H
-#define CRYINCLUDE_EDITOR_ERRORREPORT_H
-#pragma once
-
-// forward declarations.
-class CParticleItem;
-
-#include "BaseLibraryItem.h"
-#include "Objects/BaseObject.h"
-#include "Include/IErrorReport.h"
-#include "ErrorRecorder.h"
-
-/*! Single error entry in error report.
- */
-class CErrorRecord
-{
-public:
-    enum ESeverity
-    {
-        ESEVERITY_ERROR,
-        ESEVERITY_WARNING,
-        ESEVERITY_COMMENT
-    };
-    enum EFlags
-    {
-        FLAG_NOFILE         = 0x0001,   // Indicate that required file was not found.
-        FLAG_SCRIPT         = 0x0002,   // Error with scripts.
-        FLAG_TEXTURE        = 0x0004,   // Error with scripts.
-        FLAG_OBJECTID       = 0x0008,   // Error with object Ids, Unresolved/Duplicate etc...
-        FLAG_AI                 = 0x0010,   // Error with AI.
-    };
-    //! Severety of this error.
-    ESeverity severity;
-    //! Module of error.
-    EValidatorModule module;
-    //! Error Text.
-    QString error;
-    //! File which is missing or causing problem.
-    QString file;
-    //! More detailed description for this error.
-    QString description;
-    // Asset dependencies
-    QString assetScope;
-    int count;
-    //! Object that caused this error.
-    _smart_ptr<CBaseObject> pObject;
-    //! Library Item that caused this error.
-    _smart_ptr<CBaseLibraryItem> pItem;
-    int flags;
-
-    CErrorRecord(CBaseObject* object, ESeverity _severity, const QString& _error, int _flags = 0, int _count = 0,
-        CBaseLibraryItem* item = 0, EValidatorModule _module = VALIDATOR_MODULE_EDITOR)
-        : severity(_severity)
-        , module(_module)
-        , pObject(object)
-        , pItem(item)
-        , flags(_flags)
-        , count(_count)
-        , error(_error)
-    {
-    }
-
-    CErrorRecord()
-    {
-        severity = ESEVERITY_WARNING;
-        module = VALIDATOR_MODULE_EDITOR;
-        pObject = 0;
-        pItem = 0;
-        flags = 0;
-        count = 0;
-    }
-    QString GetErrorText() const;
-};
-
-/*! Error report manages collection of errors occured duruing map analyzes or level load.
- */
-class CErrorReport
-    : public IErrorReport
-{
-public:
-    CErrorReport();
-
-    //! If enabled errors are reported immidiatly and not stored.
-    void SetImmediateMode(bool bEnable);
-    bool IsImmediateMode() const { return m_bImmediateMode; };
-
-    void SetShowErrors(bool bShowErrors = true) { m_bShowErrors = bShowErrors; };
-
-    //! Adds new error to report.
-    void ReportError(CErrorRecord& err);
-
-    //! Check if error report have any errors.
-    bool IsEmpty() const;
-
-    //! Get number of contained error records.
-    int GetErrorCount() const { return m_errors.size(); };
-    //! Get access to indexed error record.
-    CErrorRecord& GetError(int i);
-    //! Clear all error records.
-    void Clear();
-
-    //! Display dialog with all errors.
-    void Display();
-
-    //! Assign current Object to which new reported warnings are assigned.
-    void SetCurrentValidatorObject(CBaseObject* pObject);
-    //! Assign current Item to which new reported warnings are assigned.
-    void SetCurrentValidatorItem(CBaseLibraryItem* pItem);
-    //! Assign current filename.
-    void SetCurrentFile(const QString& file);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Implement IValidator interface.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void Report(SValidatorRecord& record);
-
-private:
-    //! Array of all error records added to report.
-    std::vector<CErrorRecord> m_errors;
-    bool m_bImmediateMode;
-    bool m_bShowErrors;
-    _smart_ptr<CBaseObject> m_pObject;
-    _smart_ptr<CBaseLibraryItem> m_pItem;
-    CParticleItem* m_pParticle;
-    QString m_currentFilename;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_ERRORREPORT_H
diff --git a/Code/Sandbox/Editor/ErrorReportDialog.cpp b/Code/Sandbox/Editor/ErrorReportDialog.cpp
deleted file mode 100644
index ab93cc98a1..0000000000
--- a/Code/Sandbox/Editor/ErrorReportDialog.cpp
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ErrorReportDialog.h"
-
-// Qt
-#include <QClipboard>
-#include <QDesktopServices>
-#include <QFile>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QUrl>
-#include <QDateTime>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-
-// Editor
-#include "ErrorReportTableModel.h"
-#include "Viewport.h"
-#include "Util/Mailer.h"
-#include "GameEngine.h"
-#include "LyViewPaneNames.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_ErrorReportDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-
-//////////////////////////////////////////////////////////////////////////
-CErrorReportDialog* CErrorReportDialog::m_instance = 0;
-
-// CErrorReportDialog dialog
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::RegisterViewClass()
-{
-    AzToolsFramework::ViewPaneOptions options;
-    options.showInMenu = false;
-    AzToolsFramework::RegisterViewPane<CErrorReportDialog>(LyViewPane::ErrorReport, LyViewPane::CategoryOther, options);
-}
-
-CErrorReportDialog::CErrorReportDialog(QWidget* parent)
-    : QWidget(parent)
-    , ui(new Ui::CErrorReportDialog)
-    , m_errorReportModel(new CErrorReportTableModel(this))
-    , m_sortIndicatorColumn(-1)
-    , m_sortIndicatorOrder(Qt::AscendingOrder)
-{
-    ui->setupUi(this);
-    ui->treeView->setModel(m_errorReportModel);
-
-    ui->treeView->header()->setContextMenuPolicy(Qt::CustomContextMenu);
-    ui->treeView->header()->setSectionsMovable(true);
-    ui->treeView->viewport()->setMouseTracking(true);
-    ui->treeView->viewport()->installEventFilter(this);
-
-    ui->treeView->header()->setSectionResizeMode(CErrorReportTableModel::ColumnSeverity, QHeaderView::ResizeToContents);
-    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnCount, 30);
-    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnText, 200);
-    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnFile, 150);
-    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnObject, 150);
-    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnModule, 100);
-    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnDescription, 100);
-    ui->treeView->header()->resizeSection(CErrorReportTableModel::ColumnAssetScope, 200);
-
-    connect(ui->treeView, SIGNAL(clicked(QModelIndex)), this, SLOT(OnReportItemClick(QModelIndex)));
-    connect(ui->treeView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnReportItemDblClick(QModelIndex)));
-    connect(ui->treeView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(OnReportItemRClick()));
-    connect(ui->treeView->header(), SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(OnReportColumnRClick()));
-    connect(ui->treeView->header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(OnSortIndicatorChanged(int,Qt::SortOrder)));
-
-    ui->treeView->AddGroup(CErrorReportTableModel::ColumnModule);
-
-    ui->treeView->header()->setSortIndicator(-1, Qt::AscendingOrder);
-
-    m_instance = this;
-    //CErrorReport *report,
-    //m_pErrorReport = report;
-    m_pErrorReport = 0;
-}
-
-CErrorReportDialog::~CErrorReportDialog()
-{
-    m_instance = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::Open(CErrorReport* pReport)
-{
-    if (!m_instance)
-    {
-        GetIEditor()->OpenView(LyViewPane::ErrorReport);
-    }
-
-    if (!m_instance)
-    {
-        return;
-    }
-
-    m_instance->SetReport(pReport);
-    m_instance->UpdateErrors();
-    m_instance->setFocus();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::Close()
-{
-    if (m_instance)
-    {
-        /*
-        CCryMemFile memFile( new BYTE[256], 256, 256 );
-        CArchive ar( &memFile, CArchive::store );
-        m_instance->m_wndReport.SerializeState( ar );
-        ar.Close();
-
-        UINT nSize = (UINT)memFile.GetLength();
-        LPBYTE pbtData = memFile.Detach();
-        CXTRegistryManager regManager;
-        regManager.WriteProfileBinary( "Dialogs\\ErrorReport", "Configuration", pbtData, nSize);
-        if ( pbtData )
-            delete [] pbtData;
-*/
-        m_instance->close();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::Clear()
-{
-    if (m_instance)
-    {
-        m_instance->SetReport(0);
-        m_instance->UpdateErrors();
-    }
-}
-
-bool CErrorReportDialog::eventFilter(QObject* watched, QEvent* event)
-{
-    if (event->type() == QEvent::MouseMove && watched == ui->treeView->viewport())
-    {
-        QMouseEvent* ev = static_cast<QMouseEvent*>(event);
-        const QModelIndex index = ui->treeView->indexAt(ev->pos());
-        QRect rect = ui->treeView->visualRect(index);
-        rect.moveTopLeft(ui->treeView->viewport()->mapToGlobal(rect.topLeft()));
-        const QRect target = fontMetrics().boundingRect(rect, index.data(Qt::TextAlignmentRole).toInt(), index.data().toString());
-
-        if (index.column() == CErrorReportTableModel::ColumnObject && target.contains(QCursor::pos()))
-        {
-            ui->treeView->viewport()->setCursor(Qt::PointingHandCursor);
-        }
-        else
-        {
-            ui->treeView->viewport()->setCursor(Qt::ArrowCursor);
-        }
-    }
-    return QWidget::eventFilter(watched, event);
-}
-
-// CErrorReportDialog message handlers
-
-void CErrorReportDialog::SetReport(CErrorReport* report)
-{
-    m_pErrorReport = report;
-    m_errorReportModel->setErrorReport(report);
-}
-
-
-void CErrorReportDialog::UpdateErrors()
-{
-    m_errorReportModel->setErrorReport(m_pErrorReport);
-}
-
-//////////////////////////////////////////////////////////////////////////
-#define ID_REMOVE_ITEM  1
-#define ID_SORT_ASC     2
-#define ID_SORT_DESC        3
-#define ID_GROUP_BYTHIS 4
-#define ID_SHOW_GROUPBOX        5
-#define ID_SHOW_FIELDCHOOSER 6
-#define ID_COLUMN_BESTFIT       7
-#define ID_COLUMN_ARRANGEBY 100
-#define ID_COLUMN_ALIGMENT  200
-#define ID_COLUMN_ALIGMENT_LEFT ID_COLUMN_ALIGMENT + 1
-#define ID_COLUMN_ALIGMENT_RIGHT    ID_COLUMN_ALIGMENT + 2
-#define ID_COLUMN_ALIGMENT_CENTER   ID_COLUMN_ALIGMENT + 3
-#define ID_COLUMN_SHOW      500
-
-void CErrorReportDialog::OnReportColumnRClick()
-{
-    QHeaderView* header = ui->treeView->header();
-
-    int column = header->logicalIndexAt(ui->treeView->mapFromGlobal(QCursor::pos()));
-    if (column < 0)
-    {
-        return;
-    }
-
-    QMenu menu;
-    QAction* actionSortAscending = menu.addAction(tr("Sort &Ascending"));
-    QAction* actionSortDescending = menu.addAction(tr("Sort Des&cending"));
-    menu.addSeparator();
-    QAction* actionGroupByThis = menu.addAction(tr("&Group by this field"));
-    QAction* actionGroupByBox = menu.addAction(tr("Group &by box"));
-    menu.addSeparator();
-    QAction* actionRemoveItem = menu.addAction(tr("&Remove column"));
-    QAction* actionFieldChooser = menu.addAction(tr("Field &Chooser"));
-    menu.addSeparator();
-    QAction* actionBestFit = menu.addAction(tr("Best &Fit"));
-
-    actionGroupByBox->setCheckable(true);
-    actionGroupByBox->setChecked(ui->treeView->IsGroupsShown());
-
-    // create arrange by items
-    QMenu menuArrange;
-    const int nColumnCount = m_errorReportModel->columnCount();
-    for (int nColumn = 0; nColumn < nColumnCount; nColumn++)
-    {
-        if (!header->isSectionHidden(nColumn))
-        {
-            const QString sCaption = m_errorReportModel->headerData(nColumn, Qt::Horizontal).toString();
-            if (!sCaption.isEmpty())
-            {
-                menuArrange.addAction(sCaption)->setData(nColumn);
-            }
-        }
-    }
-
-    menuArrange.addSeparator();
-
-    QAction* actionClearGroups = menuArrange.addAction(tr("Clear groups"));
-    menuArrange.setTitle(tr("Arrange By"));
-    menu.insertMenu(actionSortAscending, &menuArrange);
-
-    // create columns items
-    QMenu menuColumns;
-    for (int nColumn = 0; nColumn < nColumnCount; nColumn++)
-    {
-        const QString sCaption = m_errorReportModel->headerData(nColumn, Qt::Horizontal).toString();
-        //if (!sCaption.isEmpty())
-        QAction* action = menuColumns.addAction(sCaption);
-        action->setCheckable(true);
-        action->setChecked(!ui->treeView->header()->isSectionHidden(nColumn));
-    }
-
-    menuColumns.setTitle(tr("Columns"));
-    menu.insertMenu(menuArrange.menuAction(), &menuColumns);
-
-    //create Text alignment submenu
-    QMenu menuAlign;
-
-    QAction* actionAlignLeft = menuAlign.addAction(tr("Align Left"));
-    QAction* actionAlignRight = menuAlign.addAction(tr("Align Right"));
-    QAction* actionAlignCenter = menuAlign.addAction(tr("Align Center"));
-    actionAlignLeft->setCheckable(true);
-    actionAlignRight->setCheckable(true);
-    actionAlignCenter->setCheckable(true);
-
-    const int alignment = m_errorReportModel->headerData(column, Qt::Horizontal, Qt::TextAlignmentRole).toInt();
-    actionAlignLeft->setChecked(alignment & Qt::AlignLeft);
-    actionAlignRight->setChecked(alignment & Qt::AlignRight);
-    actionAlignCenter->setChecked(alignment & Qt::AlignHCenter);
-
-    menuAlign.setTitle(tr("&Alignment"));
-    menu.insertMenu(actionBestFit, &menuAlign);
-
-    // track menu
-    QAction* nMenuResult = menu.exec(QCursor::pos());
-
-    // arrange by items
-    if (menuArrange.actions().contains(nMenuResult))
-    {
-        // group by item
-        if (actionClearGroups == nMenuResult)
-        {
-            ui->treeView->ClearGroups();
-        }
-        else
-        {
-            column = nMenuResult->data().toInt();
-            ui->treeView->ToggleSortOrder(column);
-        }
-    }
-
-    // process Alignment options
-    if (nMenuResult == actionAlignLeft)
-    {
-        m_errorReportModel->setHeaderData(column, Qt::Horizontal, Qt::AlignLeft, Qt::TextAlignmentRole);
-    }
-    else if (nMenuResult == actionAlignRight)
-    {
-        m_errorReportModel->setHeaderData(column, Qt::Horizontal, Qt::AlignRight, Qt::TextAlignmentRole);
-    }
-    else if (nMenuResult == actionAlignCenter)
-    {
-        m_errorReportModel->setHeaderData(column, Qt::Horizontal, Qt::AlignCenter, Qt::TextAlignmentRole);
-    }
-
-    // process column selection item
-    if (menuColumns.actions().contains(nMenuResult))
-    {
-        ui->treeView->header()->setSectionHidden(menuColumns.actions().indexOf(nMenuResult), !nMenuResult->isChecked());
-    }
-
-
-    // other general items
-    if (nMenuResult == actionSortAscending || nMenuResult == actionSortDescending)
-    {
-        ui->treeView->sortByColumn(column, nMenuResult == actionSortAscending ? Qt::AscendingOrder : Qt::DescendingOrder);
-    }
-    else if (nMenuResult == actionFieldChooser)
-    {
-        //OnShowFieldChooser();
-    }
-    else if (nMenuResult == actionBestFit)
-    {
-        ui->treeView->resizeColumnToContents(column);
-    }
-    else if (nMenuResult == actionRemoveItem)
-    {
-        ui->treeView->header()->setSectionHidden(column, true);
-    }
-    // other general items
-    else if (nMenuResult == actionGroupByThis)
-    {
-        ui->treeView->AddGroup(column);
-        ui->treeView->ShowGroups(true);
-    }
-    else if (nMenuResult == actionGroupByBox)
-    {
-        ui->treeView->ShowGroups(!ui->treeView->IsGroupsShown());
-    }
-}
-
-#define ID_POPUP_COLLAPSEALLGROUPS 1
-#define ID_POPUP_EXPANDALLGROUPS 2
-
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::CopyToClipboard()
-{
-    QString str;
-    const QModelIndexList selRows = ui->treeView->selectionModel()->selectedRows();
-    for (const QModelIndex& index : selRows)
-    {
-        const CErrorRecord* pRecord = index.data(Qt::UserRole).value<const CErrorRecord*>();
-        if (pRecord)
-        {
-            str += pRecord->GetErrorText();
-            if (pRecord->pObject)
-            {
-                str += QString::fromLatin1(" [Object: %1]").arg(pRecord->pObject->GetName());
-            }
-            if (pRecord->pItem)
-            {
-                str += QString::fromLatin1(" [Material: %1]").arg(pRecord->pItem->GetName());
-            }
-            str += QString::fromLatin1("\r\n");
-        }
-    }
-    if (!str.isEmpty())
-    {
-        QApplication::clipboard()->setText(str);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::OnReportItemRClick()
-{
-    const QModelIndex index = ui->treeView->indexAt(ui->treeView->viewport()->mapFromGlobal(QCursor::pos()));
-
-    if (!index.isValid())
-    {
-        return;
-    }
-
-    if (ui->treeView->model()->hasChildren(index))
-    {
-        QMenu menu;
-        menu.addAction(tr("Collapse &All Groups"), ui->treeView, SLOT(collapseAll()));
-        menu.addAction(tr("E&xpand All Groups"), ui->treeView, SLOT(expandAll()));
-
-        // track menu
-        menu.exec(QCursor::pos());
-    }
-    else
-    {
-        QMenu menu;
-        //menu.addAction(tr("Select Object(s)")); // TODO: does nothing?
-        menu.addAction(tr("Copy Warning(s) To Clipboard"), this, SLOT(CopyToClipboard()));
-        menu.addAction(tr("E-mail Error Report"), this, SLOT(SendInMail()));
-        menu.addAction(tr("Open in Excel"), this, SLOT(OpenInExcel()));
-
-        // track menu
-        menu.exec(QCursor::pos());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::SendInMail()
-{
-    if (!m_pErrorReport)
-    {
-        return;
-    }
-
-    // Send E-Mail.
-    QString textMsg;
-    for (int i = 0; i < m_errorReportModel->rowCount(); ++i)
-    {
-        const CErrorRecord* err = m_errorReportModel->index(i, 0).data(Qt::UserRole).value<const CErrorRecord*>();
-        textMsg += err->GetErrorText() + QString::fromLatin1("\n");
-    }
-
-    std::vector<const char*> who;
-    const QString subject = QString::fromLatin1("Level %1 Error Report").arg(GetIEditor()->GetGameEngine()->GetLevelPath());
-    CMailer::SendMail(subject.toUtf8().data(), textMsg.toUtf8().data(), who, who, true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::OpenInExcel()
-{
-    if (!m_pErrorReport)
-    {
-        return;
-    }
-
-    const QString levelName = Path::GetFileName(GetIEditor()->GetGameEngine()->GetLevelName());
-
-    const QString filename = QString::fromLatin1("ErrorList_%1_%2.csv").arg(levelName).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd-HH-mm-ss"));
-
-    // Save to temp file.
-    QFile f(filename);
-    if (f.open(QIODevice::WriteOnly))
-    {
-        for (int i = 0; i < m_errorReportModel->rowCount(); ++i)
-        {
-            const CErrorRecord* err = m_errorReportModel->index(i, 0).data(Qt::UserRole).value<const CErrorRecord*>();
-            QString text = err->GetErrorText();
-            text.replace(',', '.');
-            text.replace('\t', ',');
-            f.write((text + QString::fromLatin1("\n")).toUtf8().data());
-        }
-        f.close();
-        QDesktopServices::openUrl(QUrl::fromLocalFile(filename));
-    }
-    else
-    {
-        Warning("Failed to save %s", (const char*)filename.toUtf8().data());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::OnReportItemClick(const QModelIndex& index)
-{
-    QRect rect = ui->treeView->visualRect(index);
-    rect.moveTopLeft(ui->treeView->viewport()->mapToGlobal(rect.topLeft()));
-    const QRect target = fontMetrics().boundingRect(rect, index.data(Qt::TextAlignmentRole).toInt(), index.data().toString());
-
-    if (index.column() == CErrorReportTableModel::ColumnObject && target.contains(QCursor::pos()))
-    {
-        OnReportHyperlink(index);
-    }
-
-    /*
-    if (pItemNotify->pColumn->GetItemIndex() == COLUMN_CHECK)
-    {
-        m_wndReport.Populate();
-    }
-    */
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::keyPressEvent(QKeyEvent* event)
-{
-    if (event->matches(QKeySequence::Copy))
-    {
-        CopyToClipboard();
-        event->accept();
-    }
-    else
-    {
-        QWidget::keyPressEvent(event);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::OnReportItemDblClick(const QModelIndex& index)
-{
-    bool bDone = false;
-    const CErrorRecord* pError = index.data(Qt::UserRole).value<const CErrorRecord*>();
-    if (pError && pError->pObject != NULL)
-    {
-        CUndo undo("Select Object(s)");
-        // Clear other selection.
-        GetIEditor()->ClearSelection();
-        // Select this object.
-        GetIEditor()->SelectObject(pError->pObject);
-
-        CViewport* vp = GetIEditor()->GetActiveView();
-        if (vp)
-        {
-            vp->CenterOnSelection();
-        }
-        bDone = true;
-    }
-
-    if (!bDone && pError && GetIEditor()->GetActiveView())
-    {
-        float x, y, z;
-        if (GetPositionFromString(pError->error, &x, &y, &z))
-        {
-            CViewport* vp = GetIEditor()->GetActiveView();
-            Matrix34 tm = vp->GetViewTM();
-            tm.SetTranslation(Vec3(x, y, z));
-            vp->SetViewTM(tm);
-        }
-    }
-
-    /*
-    if (index.isValid())
-    {
-        TRACE(_T("Double Click on row %d\n"),
-            index.row());
-
-        CErrorMessageRecord* pRecord = DYNAMIC_DOWNCAST(CErrorMessageRecord, pItemNotify->pRow->GetRecord());
-        if (pRecord)
-        {
-            {
-                m_wndReport.Populate();
-            }
-        }
-    }
-    */
-}
-
-void CErrorReportDialog::OnSortIndicatorChanged(int logicalIndex, Qt::SortOrder order)
-{
-    if (logicalIndex == 0)
-    {
-        ui->treeView->header()->setSortIndicator(m_sortIndicatorColumn, m_sortIndicatorOrder);
-    }
-    else
-    {
-        m_sortIndicatorColumn = logicalIndex;
-        m_sortIndicatorOrder = order;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::OnReportHyperlink(const QModelIndex& index)
-{
-    const CErrorRecord* pError = index.data(Qt::UserRole).value<const CErrorRecord*>();
-    bool bDone = false;
-    if (pError && pError->pObject != NULL)
-    {
-        CUndo undo("Select Object(s)");
-        // Clear other selection.
-        GetIEditor()->ClearSelection();
-        // Select this object.
-        GetIEditor()->SelectObject(pError->pObject);
-        bDone = true;
-    }
-
-    if (!bDone && pError && GetIEditor()->GetActiveView())
-    {
-        float x, y, z;
-        if (GetPositionFromString(pError->error, &x, &y, &z))
-        {
-            CViewport* vp = GetIEditor()->GetActiveView();
-            Matrix34 tm = vp->GetViewTM();
-            tm.SetTranslation(Vec3(x, y, z));
-            vp->SetViewTM(tm);
-        }
-    }
-}
-
-/*
-//////////////////////////////////////////////////////////////////////////
-void CErrorReportDialog::OnShowFieldChooser()
-{
-    CMainFrm* pMainFrm = (CMainFrame*)AfxGetMainWnd();
-    if (pMainFrm)
-    {
-        BOOL bShow = !pMainFrm->m_wndFieldChooser.IsVisible();
-        pMainFrm->ShowControlBar(&pMainFrm->m_wndFieldChooser, bShow, FALSE);
-    }
-}
-*/
-
-#include <moc_ErrorReportDialog.cpp>
diff --git a/Code/Sandbox/Editor/ErrorReportDialog.h b/Code/Sandbox/Editor/ErrorReportDialog.h
deleted file mode 100644
index 20d7b55bf2..0000000000
--- a/Code/Sandbox/Editor/ErrorReportDialog.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_ERRORREPORTDIALOG_H
-#define CRYINCLUDE_EDITOR_ERRORREPORTDIALOG_H
-#pragma once
-
-// CErrorReportDialog dialog
-
-#if !defined(Q_MOC_RUN)
-#include "ErrorReport.h"
-
-namespace Ui {
-    class CErrorReportDialog;
-}
-
-class CErrorReportTableModel;
-
-#include <QWidget>
-#endif
-
-class CErrorReportDialog
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit CErrorReportDialog(QWidget* parent = nullptr);   // standard constructor
-    virtual ~CErrorReportDialog();
-
-    static void RegisterViewClass();
-
-    static void Open(CErrorReport* pReport);
-    static void Close();
-    static void Clear();
-
-    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
-    // make sure you pick a unique GUID
-    static const GUID& GetClassID()
-    {
-        // {ea523b7e-3f63-821b-4823-a131fc5b46a3}
-        static const GUID guid =
-        {
-            0xea523b7e, 0x3f63, 0x821b, { 0x48, 0x23, 0xa1, 0x31, 0xfc, 0x5b, 0x46, 0xa3 }
-        };
-        return guid;
-    }
-
-    bool eventFilter(QObject* watched, QEvent* event) override;
-
-public Q_SLOTS:
-    void CopyToClipboard();
-
-    void SendInMail();
-    void OpenInExcel();
-
-protected:
-    void SetReport(CErrorReport* report);
-    void UpdateErrors();
-
-protected Q_SLOTS:
-    void OnReportItemClick(const QModelIndex& index);
-    void OnReportItemRClick();
-    void OnReportColumnRClick();
-    void OnReportItemDblClick(const QModelIndex& index);
-    void OnSortIndicatorChanged(int logicalIndex, Qt::SortOrder order);
-
-protected:
-    void OnReportHyperlink(const QModelIndex& index);
-
-    void keyPressEvent(QKeyEvent* event) override;
-
-
-    CErrorReport* m_pErrorReport;
-
-    static CErrorReportDialog* m_instance;
-
-    QScopedPointer<Ui::CErrorReportDialog> ui;
-    CErrorReportTableModel* m_errorReportModel;
-
-    int m_sortIndicatorColumn;
-    Qt::SortOrder m_sortIndicatorOrder;
-};
-
-#endif // CRYINCLUDE_EDITOR_ERRORREPORTDIALOG_H
diff --git a/Code/Sandbox/Editor/ErrorReportTableModel.cpp b/Code/Sandbox/Editor/ErrorReportTableModel.cpp
deleted file mode 100644
index 05253d4134..0000000000
--- a/Code/Sandbox/Editor/ErrorReportTableModel.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ErrorReportTableModel.h"
-
-// Editor
-#include "ErrorReport.h"
-
-bool GetPositionFromString(QString er, float* x, float* y, float* z)
-{
-    er = er.toLower();
-    int ind = er.indexOf("pos:");
-    int shift = 4;
-    if (ind < 0)
-    {
-        ind = er.indexOf("position:");
-        shift = 9;
-    }
-    if (ind >= 0)
-    {
-        er = er.mid(ind + shift);
-        er.remove(QRegExp("^ *"));
-        if (er[0] == '(')
-        {
-            er = er.mid(1);
-            er.remove(QRegExp("^ *"));
-            ind = er.indexOf(")");
-            if (ind > 0)
-            {
-                er = er.mid(0, ind);
-                er.remove(QRegExp(" *$"));
-
-                ind = er.indexOf(" ");
-                int ind2 = er.indexOf(",");
-                if (ind < 0 || (ind2 > 0 && ind > ind2))
-                {
-                    ind = ind2;
-                }
-                if (ind > 0)
-                {
-                    *x = er.mid(0, ind).toDouble();
-                    er = er.mid(ind);
-                    er.remove(QRegExp("^[ ,]*"));
-
-                    ind = er.indexOf(" ");
-                    ind2 = er.indexOf(",");
-                    if (ind < 0 || (ind2 > 0 && ind > ind2))
-                    {
-                        ind = ind2;
-                    }
-                    if (ind > 0)
-                    {
-                        *y = er.mid(0, ind).toDouble();
-                        er = er.mid(ind);
-                        er.remove(QRegExp("^[ ,]*"));
-                        if (er.length())
-                        {
-                            *z = er.toDouble();
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return false;
-}
-
-CErrorReportTableModel::CErrorReportTableModel(QObject* parent)
-    : AbstractSortModel(parent)
-{
-    QIcon error_icon = QIcon(":/error_report_error.svg");
-    error_icon.addFile(":/error_report_error.svg", QSize(), QIcon::Selected);
-    m_imageList.push_back(error_icon);
-
-    // VALIDATOR_ERROR_DBGBRK - this is never used but we need to space the icon list correctly.
-    QIcon dbg_icon = QIcon(":/error_report_error.svg");
-    dbg_icon.addFile(":/error_report_error.svg", QSize(), QIcon::Selected);
-    m_imageList.push_back(dbg_icon);
-
-    QIcon warning_icon = QIcon(":/error_report_warning.svg");
-    warning_icon.addFile(":/error_report_warning.svg", QSize(), QIcon::Selected);
-    m_imageList.push_back(warning_icon);
-
-    QIcon comment_icon = QIcon(":/error_report_comment.svg");
-    comment_icon.addFile(":/error_report_comment.svg", QSize(), QIcon::Selected);
-    m_imageList.push_back(comment_icon);
-}
-
-CErrorReportTableModel::~CErrorReportTableModel()
-{
-}
-
-void CErrorReportTableModel::setErrorReport(CErrorReport* report)
-{
-    beginResetModel();
-    if (!m_errorRecords.empty())
-    {
-        m_errorRecords.clear();
-    }
-    if (report != 0)
-    {
-        const int count = report->GetErrorCount();
-        m_errorRecords.reserve(count);
-        for (int i = 0; i < count; ++i)
-        {
-            m_errorRecords.push_back(report->GetError(i));
-        }
-    }
-    endResetModel();
-}
-
-int CErrorReportTableModel::rowCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : m_errorRecords.size();
-}
-
-int CErrorReportTableModel::columnCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : 8;
-}
-
-QVariant CErrorReportTableModel::data(const QModelIndex& index, int role) const
-{
-    assert(index.row() < m_errorRecords.size());
-    const CErrorRecord& record = m_errorRecords[index.row()];
-    return data(record, index.column(), role);
-}
-
-QVariant CErrorReportTableModel::data(const CErrorRecord& record, int column, int role) const
-{
-    switch (role)
-    {
-    case Qt::DisplayRole:
-    {
-        switch (column)
-        {
-        case ColumnCount:
-            return record.count;
-        case ColumnText:
-            return QString(record.error).simplified();
-        case ColumnFile:
-            return record.file;
-        case ColumnObject:
-            if (record.pItem)
-            {
-                return record.pItem->GetFullName();
-            }
-            else if (record.pObject)
-            {
-                return record.pObject->GetName();
-            }
-            else if (!record.error.isEmpty())
-            {
-                float x, y, z;
-                if (GetPositionFromString(record.error, &x, &y, &z))
-                {
-                    return tr("Pos: (%1, %2, %3)").arg(x, 0, 'f').arg(y, 0, 'f').arg(z, 0, 'f');
-                }
-            }
-            break;
-        case ColumnModule:
-            switch (record.module)
-            {
-            case VALIDATOR_MODULE_RENDERER:
-                return tr("Renderer");
-            case VALIDATOR_MODULE_3DENGINE:
-                return tr("3DEngine");
-            case VALIDATOR_MODULE_ASSETS:
-                return tr("Assets");
-            case VALIDATOR_MODULE_SYSTEM:
-                return tr("System");
-            case VALIDATOR_MODULE_AUDIO:
-                return tr("Audio");
-            case VALIDATOR_MODULE_MOVIE:
-                return tr("Movie");
-            case VALIDATOR_MODULE_EDITOR:
-                return tr("Editor");
-            case VALIDATOR_MODULE_NETWORK:
-                return tr("Network");
-            case VALIDATOR_MODULE_PHYSICS:
-                return tr("Physics");
-            case VALIDATOR_MODULE_FEATURETESTS:
-                return tr("FeatureTests");
-            default:
-                return tr("Unknown");
-            }
-        case ColumnDescription:
-            return record.description;
-        case ColumnAssetScope:
-            return record.assetScope;
-        }
-        break;
-    }
-    case Qt::DecorationRole:
-    {
-        if (column == ColumnSeverity)
-        {
-            return m_imageList[record.severity];
-        }
-        break;
-    }
-    case Qt::UserRole:
-    {
-        return QVariant::fromValue(&record);
-    }
-    case Qt::TextAlignmentRole:
-    {
-        return m_alignments.value(column, Qt::AlignLeft) | Qt::AlignVCenter;
-    }
-    case Qt::ForegroundRole:
-    {
-        if (column == ColumnObject)
-        {
-            return QPalette().color(QPalette::Link);
-        }
-        break;
-    }
-    case Qt::FontRole:
-    {
-        if (column == ColumnObject)
-        {
-            static QFont f;
-            f.setUnderline(true);
-            return f;
-        }
-        break;
-    }
-    case SeverityRole:
-        return record.severity;
-    }
-    return QVariant();
-}
-
-QVariant CErrorReportTableModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (orientation != Qt::Horizontal)
-    {
-        return QVariant();
-    }
-    else if (role == Qt::TextAlignmentRole)
-    {
-        return m_alignments.value(section, Qt::AlignLeft) | Qt::AlignVCenter;
-    }
-    else if (role == Qt::DisplayRole)
-    {
-        switch (section)
-        {
-        case ColumnSeverity:
-            return tr("");
-        case ColumnCount:
-            return tr("N");
-        case ColumnText:
-            return tr("Text");
-        case ColumnFile:
-            return tr("File");
-        case ColumnObject:
-            return tr("Object/Material");
-        case ColumnModule:
-            return tr("Module");
-        case ColumnDescription:
-            return tr("Description");
-        case ColumnAssetScope:
-            return tr("Scope");
-        default:
-            return QString();
-        }
-    }
-    else
-    {
-        return QVariant();
-    }
-}
-
-bool CErrorReportTableModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role)
-{
-    if (orientation == Qt::Horizontal && section >= 0 && section < columnCount() && value.canConvert<int>() && role == Qt::TextAlignmentRole)
-    {
-        m_alignments.insert(section, value.toInt());
-        Q_EMIT headerDataChanged(orientation, section, section);
-        const int rows = rowCount();
-        if (rows > 0)
-        {
-            Q_EMIT dataChanged(index(0, section), index(rows - 1, section));
-        }
-        return true;
-    }
-    return QAbstractTableModel::setHeaderData(section, orientation, value, role);
-}
-
-bool CErrorReportTableModel::LessThan(const QModelIndex& lhs, const QModelIndex& rhs) const
-{
-    int column = lhs.column();
-    if (column == ColumnSeverity)
-    {
-        return lhs.data(SeverityRole).toInt() < rhs.data(SeverityRole).toInt();
-    }
-    const QVariant l = lhs.data();
-    const QVariant r = rhs.data();
-    bool ok;
-    const int lInt = l.toInt(&ok);
-    const int rInt = r.toInt(&ok);
-    if (ok)
-    {
-        return lInt < rInt;
-    }
-    return l.toString() < r.toString();
-}
-
-#include <moc_ErrorReportTableModel.cpp>
diff --git a/Code/Sandbox/Editor/ErrorReportTableModel.h b/Code/Sandbox/Editor/ErrorReportTableModel.h
deleted file mode 100644
index e87cadf5a5..0000000000
--- a/Code/Sandbox/Editor/ErrorReportTableModel.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef ERRORREPORTTABLEMODEL_H
-#define ERRORREPORTTABLEMODEL_H
-
-#if !defined(Q_MOC_RUN)
-#include "Util/AbstractSortModel.h"
-
-#include <QMetaType>
-#include <QPixmap>
-#endif
-
-
-class CErrorReport;
-class CErrorRecord;
-
-bool GetPositionFromString(QString er, float* x, float* y, float* z);
-
-class CErrorReportTableModel
-    : public AbstractSortModel
-{
-    Q_OBJECT
-public:
-    enum Column
-    {
-        ColumnSeverity,
-        ColumnCount,
-        ColumnText,
-        ColumnFile,
-        ColumnObject,
-        ColumnModule,
-        ColumnDescription,
-        ColumnAssetScope
-    };
-
-    enum Roles
-    {
-        SeverityRole = Qt::UserRole + 1
-    };
-
-    CErrorReportTableModel(QObject* parent = 0);
-    ~CErrorReportTableModel();
-
-    void setErrorReport(CErrorReport* report);
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-
-    bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role = Qt::EditRole) override;
-
-    bool LessThan(const QModelIndex& lhs, const QModelIndex& rhs) const override;
-
-protected:
-    QVariant data(const CErrorRecord& record, int column, int role = Qt::DisplayRole) const;
-
-private:
-    QHash<int, int> m_alignments;
-    std::vector<CErrorRecord> m_errorRecords;
-    QVector<QIcon> m_imageList;
-};
-
-Q_DECLARE_METATYPE(const CErrorRecord*)
-
-#endif
diff --git a/Code/Sandbox/Editor/Export/ExportManager.cpp b/Code/Sandbox/Editor/Export/ExportManager.cpp
deleted file mode 100644
index 4aa711a6e6..0000000000
--- a/Code/Sandbox/Editor/Export/ExportManager.cpp
+++ /dev/null
@@ -1,1289 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ExportManager.h"
-
-// Qt
-#include <QMessageBox>
-
-// Maestro
-#include <Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "ViewManager.h"
-#include "OBJExporter.h"
-#include "OCMExporter.h"
-#include "FBXExporterDialog.h"
-#include "RenderViewport.h"
-#include "TrackViewExportKeyTimeDlg.h"
-#include "AnimationContext.h"
-#include "TrackView/DirectorNodeAnimator.h"
-#include "Util/AutoDirectoryRestoreFileDialog.h"
-#include "QtUI/WaitCursor.h"
-#include "WaitProgress.h"
-#include "Objects/SelectionGroup.h"
-#include "Include/IObjectManager.h"
-#include "TrackView/TrackViewTrack.h"
-#include "TrackView/TrackViewSequenceManager.h"
-#include "Resource.h"
-#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
-
-#include <IEntityRenderState.h>
-#include <IStatObj.h>
-
-namespace
-{
-    void SetTexture(Export::TPath& outName, IRenderShaderResources* pRes, int nSlot)
-    {
-        SEfResTexture* pTex = pRes->GetTextureResource(nSlot);
-        if (pTex)
-        {
-            cry_strcat(outName, Path::GamePathToFullPath(pTex->m_Name.c_str()).toUtf8().data());
-        }
-    }
-
-    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
-    const QString kPrimaryCameraName = "PrimaryCamera";
-} // namespace
-
-
-
-//////////////////////////////////////////////////////////
-// CMesh
-Export::CMesh::CMesh()
-{
-    ::ZeroMemory(&material, sizeof(material));
-    material.opacity = 1.0f;
-}
-
-
-//////////////////////////////////////////////////////////
-// CObject
-Export::CObject::CObject(const char* pName)
-    : m_MeshHash(0)
-{
-    pos.x = pos.y = pos.z = 0;
-    rot.v.x = rot.v.y = rot.v.z = 0;
-    rot.w = 1.0f;
-    scale.x = scale.y = scale.z = 1.0f;
-
-    nParent = -1;
-
-    cry_strcpy(name, pName);
-
-    materialName[0] = '\0';
-
-    entityType = Export::eEntity;
-
-    cameraTargetNodeName[0] = '\0';
-
-    m_pLastObject = 0;
-}
-
-
-void Export::CObject::SetMaterialName(const char* pName)
-{
-    cry_strcpy(materialName, pName);
-}
-
-
-// CExportData
-void Export::CData::Clear()
-{
-    m_objects.clear();
-}
-
-
-// CExportManager
-CExportManager::CExportManager()
-    : m_isPrecaching(false)
-    , m_pBaseObj(0)
-    , m_FBXBakedExportFPS(0.0f)
-    , m_fScale(100.0f)
-    ,                 // this scale is used by CryEngine RC
-    m_bAnimationExport(false)
-    , m_bExportLocalCoords(false)
-    , m_numberOfExportFrames(0)
-    , m_pivotEntityObject(0)
-    , m_bBakedKeysSequenceExport(true)
-    , m_animTimeExportPrimarySequenceCurrentTime(0.0f)
-    , m_animKeyTimeExport(true)
-    , m_soundKeyTimeExport(true)
-    , m_bExportOnlyPrimaryCamera(false)
-{
-    RegisterExporter(new COBJExporter());
-    RegisterExporter(new COCMExporter());
-}
-
-
-CExportManager::~CExportManager()
-{
-    m_data.Clear();
-    for (TExporters::iterator ppExporter = m_exporters.begin(); ppExporter != m_exporters.end(); ++ppExporter)
-    {
-        (*ppExporter)->Release();
-    }
-}
-
-
-bool CExportManager::RegisterExporter(IExporter* pExporter)
-{
-    if (!pExporter)
-    {
-        return false;
-    }
-
-    m_exporters.push_back(pExporter);
-    return true;
-}
-
-inline f32 Sandbox2MayaFOVDeg(const f32 fov, const f32 ratio) { return RAD2DEG(2.0f * atan_tpl(tan(DEG2RAD(fov) / 2.0f) * ratio)); };
-inline f32 Sandbox2MayaFOVRad2Deg(const f32 fov, const f32 ratio) { return RAD2DEG(2.0f * atan_tpl(tan(fov / 2.0f) * ratio)); };
-
-void CExportManager::AddEntityAnimationData(const CTrackViewTrack* pTrack, Export::CObject* pObj, AnimParamType entityTrackParamType)
-{
-    int keyCount = pTrack->GetKeyCount();
-    pObj->m_entityAnimData.reserve(keyCount * kReserveCount);
-
-    for (int keyNumber = 0; keyNumber < keyCount; keyNumber++)
-    {
-        const CTrackViewKeyConstHandle currentKeyHandle = pTrack->GetKey(keyNumber);
-        const float fCurrentKeytime = currentKeyHandle.GetTime();
-
-        float trackValue = 0.0f;
-        pTrack->GetValue(fCurrentKeytime, trackValue);
-
-        ISplineInterpolator* pSpline = pTrack->GetSpline();
-
-        if (pSpline)
-        {
-            Export::EntityAnimData entityData;
-            entityData.dataType = (Export::AnimParamType)pTrack->GetParameterType().GetType();
-            entityData.keyValue = trackValue;
-            entityData.keyTime = fCurrentKeytime;
-
-            if (entityTrackParamType == AnimParamType::Position)
-            {
-                entityData.keyValue *= 100.0f;
-            }
-            else if (entityTrackParamType == AnimParamType::FOV)
-            {
-                entityData.keyValue = Sandbox2MayaFOVDeg(entityData.keyValue, kAspectRatio);
-            }
-
-
-            ISplineInterpolator::ValueType tin;
-            ISplineInterpolator::ValueType tout;
-            ZeroStruct(tin);
-            ZeroStruct(tout);
-            pSpline->GetKeyTangents(keyNumber, tin, tout);
-
-            float fInTantentX = tin[0];
-            float fInTantentY = tin[1];
-
-            float fOutTantentX = tout[0];
-            float fOutTantentY = tout[1];
-
-            if (fInTantentX == 0.0f)
-            {
-                fInTantentX = kTangentDelta;
-            }
-
-            if (fOutTantentX == 0.0f)
-            {
-                fOutTantentX = kTangentDelta;
-            }
-
-            entityData.leftTangent = fInTantentY / fInTantentX;
-            entityData.rightTangent = fOutTantentY / fOutTantentX;
-
-            if (entityTrackParamType == AnimParamType::Position)
-            {
-                entityData.leftTangent *= 100.0f;
-                entityData.rightTangent *= 100.0f;
-            }
-
-            float fPrevKeyTime = 0.0f;
-            float fNextKeyTime = 0.0f;
-
-            bool bIsFirstKey = false;
-            bool bIsMiddleKey = false;
-            bool bIsLastKey = false;
-
-            if (keyNumber == 0 && keyNumber < (keyCount - 1))
-            {
-                const CTrackViewKeyConstHandle nextKeyHandle = pTrack->GetKey(keyNumber + 1);
-                fNextKeyTime = nextKeyHandle.GetTime();
-
-                if (fNextKeyTime != 0.0f)
-                {
-                    bIsFirstKey = true;
-                }
-            }
-            else if (keyNumber > 0)
-            {
-                const CTrackViewKeyConstHandle prevKeyHandle = pTrack->GetKey(keyNumber - 1);
-                fPrevKeyTime = prevKeyHandle.GetTime();
-
-                if (keyNumber < (keyCount - 1))
-                {
-                    const CTrackViewKeyConstHandle nextKeyHandle = pTrack->GetKey(keyNumber + 1);
-                    fNextKeyTime = nextKeyHandle.GetTime();
-
-                    if (fNextKeyTime != 0.0f)
-                    {
-                        bIsMiddleKey = true;
-                    }
-                }
-                else
-                {
-                    bIsLastKey = true;
-                }
-            }
-
-            float fLeftTangentWeightValue = 0.0f;
-            float fRightTangentWeightValue = 0.0f;
-
-            if (bIsFirstKey)
-            {
-                fRightTangentWeightValue = fOutTantentX / fNextKeyTime;
-            }
-            else if (bIsMiddleKey)
-            {
-                fLeftTangentWeightValue = fInTantentX / (fCurrentKeytime - fPrevKeyTime);
-                fRightTangentWeightValue = fOutTantentX / (fNextKeyTime - fCurrentKeytime);
-            }
-            else if (bIsLastKey)
-            {
-                fLeftTangentWeightValue = fInTantentX / (fCurrentKeytime - fPrevKeyTime);
-            }
-
-            entityData.leftTangentWeight = fLeftTangentWeightValue;
-            entityData.rightTangentWeight = fRightTangentWeightValue;
-
-            pObj->m_entityAnimData.push_back(entityData);
-        }
-    }
-}
-
-
-void CExportManager::ProcessEntityAnimationTrack(
-    const AZ::EntityId entityId, Export::CObject* pObj, AnimParamType entityTrackParamType)
-{
-    CTrackViewAnimNode* pEntityNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(entityId);
-    CTrackViewTrack* pEntityTrack = (pEntityNode ? pEntityNode->GetTrackForParameter(entityTrackParamType) : 0);
-
-    if (!pEntityTrack)
-    {
-        return;
-    }
-
-    if (pEntityTrack->GetParameterType() == AnimParamType::FOV)
-    {
-        AddEntityAnimationData(pEntityTrack, pObj, entityTrackParamType);
-        return;
-    }
-
-    for (int trackNumber = 0; trackNumber < pEntityTrack->GetChildCount(); ++trackNumber)
-    {
-        CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pEntityTrack->GetChild(trackNumber));
-
-        if (pSubTrack)
-        {
-            AddEntityAnimationData(pSubTrack, pObj, entityTrackParamType);
-        }
-    }
-}
-
-
-void CExportManager::AddEntityAnimationData(AZ::EntityId entityId)
-{
-    Export::CObject* pObj = new Export::CObject(m_pBaseObj->GetName().toUtf8().data());
-
-    ProcessEntityAnimationTrack(entityId, pObj, AnimParamType::Position);
-    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)
-    {
-        Export::UV tc;
-        meshDesc.m_pTexCoord[v].ExportTo(tc.u, tc.v);
-        tc.v = 1.0f - tc.v;
-        pObj->m_texCoords.push_back(tc);
-    }
-
-    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 != 0)
-        {
-            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 = 0;
-
-    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 = 0;
-                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)
-    {
-        return false;
-    }
-
-    m_pBaseObj = pBaseObj;
-
-    if (m_bAnimationExport)
-    {
-        if (pBaseObj->GetType() == OBJTYPE_AZENTITY)
-        {
-            const auto componentEntityObject = static_cast<CComponentEntityObject*>(pBaseObj);
-            AddEntityAnimationData(componentEntityObject->GetAssociatedEntityId());
-            return true;
-        }
-    }
-
-    if (m_isPrecaching)
-    {
-        AddMeshes(0);
-        return true;
-    }
-
-    Export::CObject* pObj = new Export::CObject(m_pBaseObj->GetName().toUtf8().data());
-
-    AddPosRotScale(pObj, pBaseObj);
-    m_data.m_objects.push_back(pObj);
-
-    m_objectMap[pBaseObj] = int(m_data.m_objects.size() - 1);
-
-    AddMeshes(pObj);
-    m_pBaseObj = 0;
-
-    return true;
-}
-
-
-void CExportManager::AddPosRotScale(Export::CObject* pObj, const CBaseObject* pBaseObj)
-{
-    Vec3 pos = pBaseObj->GetPos();
-    pObj->pos.x = pos.x * m_fScale;
-    pObj->pos.y = pos.y * m_fScale;
-    pObj->pos.z = pos.z * m_fScale;
-
-    Quat rot = pBaseObj->GetRotation();
-    pObj->rot.v.x = rot.v.x;
-    pObj->rot.v.y = rot.v.y;
-    pObj->rot.v.z = rot.v.z;
-    pObj->rot.w = rot.w;
-
-    Vec3 scale = pBaseObj->GetScale();
-    pObj->scale.x = scale.x;
-    pObj->scale.y = scale.y;
-    pObj->scale.z = scale.z;
-}
-
-void CExportManager::AddEntityData(Export::CObject* pObj, Export::AnimParamType dataType, const float fValue, const float fTime)
-{
-    Export::EntityAnimData entityData;
-    entityData.dataType = dataType;
-    entityData.leftTangent = kTangentDelta;
-    entityData.rightTangent = kTangentDelta;
-    entityData.rightTangentWeight = 0.0f;
-    entityData.leftTangentWeight = 0.0f;
-    entityData.keyValue = fValue;
-    entityData.keyTime = fTime;
-    pObj->m_entityAnimData.push_back(entityData);
-}
-
-
-void CExportManager::SolveHierarchy()
-{
-    for (TObjectMap::iterator it = m_objectMap.begin(); it != m_objectMap.end(); ++it)
-    {
-        CBaseObject* pObj = it->first;
-        int index = it->second;
-        if (pObj && pObj->GetParent())
-        {
-            CBaseObject* pParent = pObj->GetParent();
-            TObjectMap::iterator itFind = m_objectMap.find(pParent);
-            if (itFind != m_objectMap.end())
-            {
-                int indexOfParent = itFind->second;
-                if (indexOfParent >= 0 && index >= 0)
-                {
-                    m_data.m_objects[index]->nParent = indexOfParent;
-                }
-            }
-        }
-    }
-
-    m_objectMap.clear();
-}
-
-bool CExportManager::ShowFBXExportDialog()
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!pSequence)
-    {
-        return false;
-    }
-
-    CFBXExporterDialog fpsDialog;
-
-    CTrackViewNode* pivotObjectNode = pSequence->GetFirstSelectedNode();
-
-    if (pivotObjectNode && !pivotObjectNode->IsGroupNode())
-    {
-        m_pivotEntityObject = static_cast<CEntityObject*>(GetIEditor()->GetObjectManager()->FindObject(pivotObjectNode->GetName()));
-
-        if (m_pivotEntityObject)
-        {
-            fpsDialog.SetExportLocalCoordsCheckBoxEnable(true);
-        }
-    }
-
-    if (fpsDialog.exec() != QDialog::Accepted)
-    {
-        return false;
-    }
-
-    SetFBXExportSettings(fpsDialog.GetExportCoordsLocalToTheSelectedObject(), fpsDialog.GetExportOnlyPrimaryCamera(), fpsDialog.GetFPS());
-
-    return true;
-}
-
-bool CExportManager::ProcessObjectsForExport()
-{
-    Export::CObject* pObj = new Export::CObject(kPrimaryCameraName.toUtf8().data());
-    pObj->entityType = Export::eCamera;
-    m_data.m_objects.push_back(pObj);
-
-    float fpsTimeInterval = 1.0f / m_FBXBakedExportFPS;
-    float timeValue = 0.0f;
-
-    GetIEditor()->GetAnimation()->SetRecording(false);
-    GetIEditor()->GetAnimation()->SetPlaying(false);
-
-    CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
-    if (CRenderViewport* rvp = viewport_cast<CRenderViewport*>(vp))
-    {
-        rvp->SetSequenceCamera();
-    }
-
-    int startFrame = 0;
-    timeValue = startFrame * fpsTimeInterval;
-
-    for (int frameID = startFrame; frameID <= m_numberOfExportFrames; ++frameID)
-    {
-        GetIEditor()->GetAnimation()->SetTime(timeValue);
-
-        for (size_t objectID = 0; objectID < m_data.m_objects.size(); ++objectID)
-        {
-            Export::CObject* pObj2 =  m_data.m_objects[objectID];
-            CBaseObject* pObject = 0;
-
-            if (QString::compare(pObj2->name, kPrimaryCameraName) == 0)
-            {
-                pObject = GetIEditor()->GetObjectManager()->FindObject(GetIEditor()->GetViewManager()->GetCameraObjectId());
-            }
-            else
-            {
-                if (m_bExportOnlyPrimaryCamera && pObj2->entityType != Export::eCameraTarget)
-                {
-                    continue;
-                }
-
-                pObject = pObj2->GetLastObjectPtr();
-            }
-
-            if (!pObject)
-            {
-                continue;
-            }
-
-            Quat rotation(pObject->GetRotation());
-
-            if (pObject->GetParent())
-            {
-                CBaseObject* pParentObject = pObject->GetParent();
-                Quat parentWorldRotation;
-
-                const Vec3& parentScale = pParentObject->GetScale();
-                float threshold = 0.0003f;
-
-                bool bParentScaled = false;
-
-                if ((fabsf(parentScale.x - 1.0f) + fabsf(parentScale.y - 1.0f) + fabsf(parentScale.z - 1.0f)) >= threshold)
-                {
-                    bParentScaled = true;
-                }
-
-                if (bParentScaled)
-                {
-                    Matrix34 tm = pParentObject->GetWorldTM();
-                    tm.OrthonormalizeFast();
-                    parentWorldRotation = Quat(tm);
-                }
-                else
-                {
-                    parentWorldRotation = Quat(pParentObject->GetWorldTM());
-                }
-
-                rotation = parentWorldRotation * rotation;
-            }
-
-            Vec3 objectPos = pObject->GetWorldPos();
-
-            if (m_bExportLocalCoords && m_pivotEntityObject && m_pivotEntityObject != pObject)
-            {
-                Matrix34 currentObjectTM = pObject->GetWorldTM();
-                Matrix34 invParentTM = m_pivotEntityObject->GetWorldTM();
-                invParentTM.Invert();
-                currentObjectTM = invParentTM * currentObjectTM;
-
-                objectPos = currentObjectTM.GetTranslation();
-                rotation = Quat(currentObjectTM);
-            }
-
-            Ang3 worldAngles = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(rotation)));
-
-            Export::EntityAnimData entityData;
-            entityData.keyTime = timeValue;
-            entityData.leftTangentWeight = 0.0f;
-            entityData.rightTangentWeight = 0.0f;
-            entityData.leftTangent = 0.0f;
-            entityData.rightTangent = 0.0f;
-
-            entityData.keyValue = objectPos.x;
-            entityData.keyValue *= 100.0f;
-            entityData.dataType = (Export::AnimParamType)AnimParamType::PositionX;
-            pObj2->m_entityAnimData.push_back(entityData);
-
-            entityData.keyValue = objectPos.y;
-            entityData.keyValue *= 100.0f;
-            entityData.dataType = (Export::AnimParamType)AnimParamType::PositionY;
-            pObj2->m_entityAnimData.push_back(entityData);
-
-            entityData.keyValue = objectPos.z;
-            entityData.keyValue *= 100.0f;
-            entityData.dataType = (Export::AnimParamType)AnimParamType::PositionZ;
-            pObj2->m_entityAnimData.push_back(entityData);
-
-            entityData.keyValue = worldAngles.x;
-            entityData.dataType = (Export::AnimParamType)AnimParamType::RotationX;
-            pObj2->m_entityAnimData.push_back(entityData);
-
-            entityData.keyValue = worldAngles.y;
-            entityData.dataType = (Export::AnimParamType)AnimParamType::RotationY;
-            pObj2->m_entityAnimData.push_back(entityData);
-
-            entityData.dataType = (Export::AnimParamType)AnimParamType::RotationZ;
-            entityData.keyValue = worldAngles.z;
-            pObj2->m_entityAnimData.push_back(entityData);
-        }
-
-        timeValue += fpsTimeInterval;
-    }
-
-    return true;
-}
-
-bool CExportManager::IsDuplicateObjectBeingAdded(const QString& newObjectName)
-{
-    for (int objectID = 0; objectID < m_data.m_objects.size(); ++objectID)
-    {
-        if (newObjectName.compare(m_data.m_objects[objectID]->name, Qt::CaseInsensitive) == 0)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-QString CExportManager::CleanXMLText(const QString& text)
-{
-    QString outText(text);
-    outText.replace("\\", "_");
-    outText.replace("/", "_");
-    outText.replace(" ", "_");
-    outText.replace(":", "-");
-    outText.replace(";", "-");
-    return outText;
-}
-
-void CExportManager::FillAnimTimeNode(XmlNodeRef writeNode, CTrackViewAnimNode* pObjectNode, [[maybe_unused]] CTrackViewSequence* currentSequence)
-{
-    if (!writeNode)
-    {
-        return;
-    }
-
-    CTrackViewTrackBundle allTracks = pObjectNode->GetAllTracks();
-    const unsigned int numAllTracks = allTracks.GetCount();
-    bool bCreatedSubNodes = false;
-
-    if (numAllTracks > 0)
-    {
-        XmlNodeRef objNode = writeNode->createNode(CleanXMLText(pObjectNode->GetName()).toUtf8().data());
-        writeNode->setAttr("time", m_animTimeExportPrimarySequenceCurrentTime);
-
-        for (unsigned int trackID = 0; trackID < numAllTracks; ++trackID)
-        {
-            CTrackViewTrack* childTrack = allTracks.GetTrack(trackID);
-
-            AnimParamType trackType = childTrack->GetParameterType().GetType();
-
-            if (trackType == AnimParamType::Animation || trackType == AnimParamType::Sound)
-            {
-                QString childName = CleanXMLText(childTrack->GetName());
-
-                if (childName.isEmpty())
-                {
-                    continue;
-                }
-
-                XmlNodeRef subNode = objNode->createNode(childName.toUtf8().data());
-                CTrackViewKeyBundle keyBundle = childTrack->GetAllKeys();
-                uint keysNumber = keyBundle.GetKeyCount();
-
-                for (uint keyID = 0; keyID < keysNumber; ++keyID)
-                {
-                    const CTrackViewKeyHandle& keyHandle = keyBundle.GetKey(keyID);
-
-                    QString keyContentName;
-                    float keyStartTime = 0.0f;
-                    float keyEndTime = 0.0f;
-                    ;
-                    float keyTime = 0.0f;
-                    float keyDuration = 0.0f;
-
-                    if (trackType == AnimParamType::Animation)
-                    {
-                        if (!m_animKeyTimeExport)
-                        {
-                            continue;
-                        }
-
-                        ICharacterKey animationKey;
-                        keyHandle.GetKey(&animationKey);
-                        keyStartTime = animationKey.m_startTime;
-                        keyEndTime = animationKey.m_endTime;
-                        keyTime = animationKey.time;
-                        keyContentName = CleanXMLText(animationKey.m_animation.c_str());
-                        keyDuration = animationKey.GetActualDuration();
-                    }
-                    else if (trackType == AnimParamType::Sound)
-                    {
-                        if (!m_soundKeyTimeExport)
-                        {
-                            continue;
-                        }
-
-                        ISoundKey soundKey;
-                        keyHandle.GetKey(&soundKey);
-                        keyTime = soundKey.time;
-                        keyContentName = CleanXMLText(soundKey.sStartTrigger.c_str());
-                        keyDuration = soundKey.fDuration;
-                    }
-
-                    if (keyContentName.isEmpty())
-                    {
-                        continue;
-                    }
-
-                    XmlNodeRef keyNode = subNode->createNode(keyContentName.toUtf8().data());
-
-                    float keyGlobalTime = m_animTimeExportPrimarySequenceCurrentTime + keyTime;
-                    keyNode->setAttr("keyTime", keyGlobalTime);
-
-                    if (keyStartTime > 0)
-                    {
-                        keyNode->setAttr("startTime", keyStartTime);
-                    }
-
-                    if (keyEndTime > 0)
-                    {
-                        keyNode->setAttr("endTime", keyEndTime);
-                    }
-
-                    if (keyDuration > 0)
-                    {
-                        keyNode->setAttr("duration", keyDuration);
-                    }
-
-                    subNode->addChild(keyNode);
-                    objNode->addChild(subNode);
-                    bCreatedSubNodes = true;
-                }
-            }
-        }
-
-        if (bCreatedSubNodes)
-        {
-            writeNode->addChild(objNode);
-        }
-    }
-}
-
-
-bool CExportManager::AddObjectsFromSequence(CTrackViewSequence* pSequence, XmlNodeRef seqNode)
-{
-    CTrackViewAnimNodeBundle allNodes = pSequence->GetAllAnimNodes();
-    const unsigned int numAllNodes = allNodes.GetCount();
-
-    for (unsigned int nodeID = 0; nodeID < numAllNodes; ++nodeID)
-    {
-        CTrackViewAnimNode* pAnimNode = allNodes.GetNode(nodeID);
-
-        if (seqNode && pAnimNode)
-        {
-            FillAnimTimeNode(seqNode, pAnimNode, pSequence);
-        }
-
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(
-            entity, &AZ::ComponentApplicationBus::Events::FindEntity, pAnimNode->GetAzEntityId());
-
-        if (entity)
-        {
-            QString addObjectName = entity->GetName().c_str();
-
-            if (IsDuplicateObjectBeingAdded(addObjectName))
-            {
-                continue;
-            }
-
-            Export::CObject* pObj = new Export::CObject(entity->GetName().c_str());
-
-            pObj->m_entityAnimData.reserve(m_numberOfExportFrames * kReserveCount);
-            m_data.m_objects.push_back(pObj);
-        }
-    }
-
-    CTrackViewTrackBundle trackBundle = pSequence->GetTracksByParam(AnimParamType::Sequence);
-
-    const uint numSequenceTracks = trackBundle.GetCount();
-    for (uint i = 0; i < numSequenceTracks; ++i)
-    {
-        CTrackViewTrack* pSequenceTrack = trackBundle.GetTrack(i);
-        if (pSequenceTrack->IsDisabled())
-        {
-            continue;
-        }
-
-        const uint numKeys = pSequenceTrack->GetKeyCount();
-        for (int keyIndex = 0; keyIndex < numKeys; ++keyIndex)
-        {
-            const CTrackViewKeyHandle& keyHandle = pSequenceTrack->GetKey(keyIndex);
-            ISequenceKey sequenceKey;
-            keyHandle.GetKey(&sequenceKey);
-
-            CTrackViewSequence* pSubSequence = CDirectorNodeAnimator::GetSequenceFromSequenceKey(sequenceKey);
-
-            if (pSubSequence)
-            {
-                if (pSubSequence && !pSubSequence->IsDisabled())
-                {
-                    XmlNodeRef subSeqNode = 0;
-
-                    if (!seqNode)
-                    {
-                        AddObjectsFromSequence(pSubSequence);
-                    }
-                    else
-                    {
-                        // In case of exporting animation/sound times data
-                        const QString sequenceName = pSubSequence->GetName();
-                        XmlNodeRef subSeqNode2 = seqNode->createNode(sequenceName.toUtf8().data());
-
-                        if (sequenceName == m_animTimeExportPrimarySequenceName)
-                        {
-                            m_animTimeExportPrimarySequenceCurrentTime = sequenceKey.time;
-                        }
-                        else
-                        {
-                            m_animTimeExportPrimarySequenceCurrentTime += sequenceKey.time;
-                        }
-
-                        AddObjectsFromSequence(pSubSequence, subSeqNode2);
-                        seqNode->addChild(subSeqNode2);
-                    }
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-bool CExportManager::AddSelectedEntityObjects()
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSequence)
-    {
-        return false;
-    }
-
-    CTrackViewAnimNodeBundle selectedNodes = pSequence->GetSelectedAnimNodes();
-    const unsigned int numSelectedNodes = selectedNodes.GetCount();
-
-    for (unsigned int nodeNumber = 0; nodeNumber < numSelectedNodes; ++nodeNumber)
-    {
-        if (m_bAnimationExport)
-        {
-            CTrackViewAnimNode* pAnimNode = selectedNodes.GetNode(nodeNumber);
-            AddEntityAnimationData(pAnimNode->GetAzEntityId());
-        }
-    }
-
-    return true;
-}
-
-bool CExportManager::AddSelectedRegionObjects()
-{
-    AABB box;
-    GetIEditor()->GetSelectedRegion(box);
-    if (box.IsEmpty())
-    {
-        return false;
-    }
-
-    std::vector<CBaseObject*> objects;
-    GetIEditor()->GetObjectManager()->FindObjectsInAABB(box, objects);
-
-    int numObjects = objects.size();
-    if (numObjects > m_data.m_objects.size())
-    {
-        m_data.m_objects.reserve(numObjects + 1); // +1 for terrain
-    }
-    // First run pipeline to precache geometry
-    m_isPrecaching = true;
-    for (size_t i = 0; i < numObjects; ++i)
-    {
-        AddObject(objects[i]);
-    }
-
-    // Repeat pipeline to collect geometry
-    m_isPrecaching = false;
-    for (size_t i = 0; i < numObjects; ++i)
-    {
-        AddObject(objects[i]);
-    }
-
-    return true;
-}
-
-bool CExportManager::ExportToFile(const char* filename, bool bClearDataAfterExport)
-{
-    bool bRet = false;
-    QString ext = PathUtil::GetExt(filename);
-
-    if (m_data.GetObjectCount() == 0)
-    {
-        QMessageBox::warning(QApplication::activeWindow(), QString(), QObject::tr("Track View selection does not exist as an object."));
-        return false;
-    }
-
-    for (int i = 0; i < m_exporters.size(); ++i)
-    {
-        IExporter* pExporter = m_exporters[i];
-        if (!QString::compare(ext, pExporter->GetExtension(), Qt::CaseInsensitive))
-        {
-            bRet = pExporter->ExportToFile(filename, &m_data);
-            break;
-        }
-    }
-
-    if (bClearDataAfterExport)
-    {
-        m_data.Clear();
-    }
-    return bRet;
-}
-
-
-bool CExportManager::Export(const char* defaultName, const char* defaultExt, const char* defaultPath, [[maybe_unused]] bool isSelectedObjects, bool isSelectedRegionObjects, bool isOccluder, bool bAnimationExport)
-{
-    m_bAnimationExport = bAnimationExport;
-
-    m_isOccluder    =   isOccluder;
-    const float OldScale    =   m_fScale;
-    if (isOccluder)
-    {
-        m_fScale    =   1.f;
-    }
-
-    m_data.Clear();
-    m_objectMap.clear();
-
-    QString filters;
-    for (TExporters::iterator ppExporter = m_exporters.begin(); ppExporter != m_exporters.end(); ++ppExporter)
-    {
-        IExporter* pExporter = (*ppExporter);
-        if (pExporter)
-        {
-            const QString ext = pExporter->GetExtension();
-            const QString newFilter = QString("%1 (*.%2)").arg(pExporter->GetShortDescription(), ext);
-            if (filters.isEmpty())
-            {
-                filters = newFilter;
-            }
-            else if (ext == defaultExt) // the default extension should be the first item in the list, so it's the default export options
-            {
-                filters = newFilter + ";;" + filters;
-            }
-            else
-            {
-                filters = filters + ";;" + newFilter;
-            }
-        }
-    }
-    filters += ";;All files (*)";
-
-    bool returnRes = false;
-
-    QString newFilename(defaultName);
-    if (m_bAnimationExport || CFileUtil::SelectSaveFile(filters, defaultExt, defaultPath, newFilename))
-    {
-        WaitCursor wait;
-        if (isSelectedRegionObjects)
-        {
-            AddSelectedRegionObjects();
-        }
-
-        if (!bAnimationExport)
-        {
-            SolveHierarchy();
-        }
-
-        if (m_bAnimationExport)
-        {
-            CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-            if (pSequence)
-            {
-                // Save To FBX custom selected nodes
-                if (!m_bBakedKeysSequenceExport)
-                {
-                    returnRes = AddSelectedEntityObjects();
-                }
-                else
-                {
-                    // Export the whole sequence with baked keys
-                    if (ShowFBXExportDialog())
-                    {
-                        m_numberOfExportFrames = pSequence->GetTimeRange().end * m_FBXBakedExportFPS;
-
-                        if (!m_bExportOnlyPrimaryCamera)
-                        {
-                            AddObjectsFromSequence(pSequence);
-                        }
-
-                        returnRes = ProcessObjectsForExport();
-                        SolveHierarchy();
-                    }
-                }
-            }
-
-            if (returnRes)
-            {
-                returnRes = ExportToFile(defaultName);
-            }
-        }
-        else
-        {
-            returnRes = ExportToFile(newFilename.toStdString().c_str());
-        }
-    }
-
-    m_fScale = OldScale;
-    m_bBakedKeysSequenceExport = true;
-    m_FBXBakedExportFPS = 0.0f;
-
-    return returnRes;
-}
-
-void CExportManager::SetFBXExportSettings(bool bLocalCoordsToSelectedObject, bool bExportOnlyPrimaryCamera, const float fps)
-{
-    m_bExportLocalCoords = bLocalCoordsToSelectedObject;
-    m_bExportOnlyPrimaryCamera = bExportOnlyPrimaryCamera;
-    m_FBXBakedExportFPS = fps;
-}
-
-Export::Object* Export::CData::AddObject(const char* objectName)
-{
-    for (size_t objectID = 0; objectID < m_objects.size(); ++objectID)
-    {
-        if (strcmp(m_objects[objectID]->name, objectName) == 0)
-        {
-            return m_objects[objectID];
-        }
-    }
-
-    CObject* pObj = new CObject(objectName);
-    m_objects.push_back(pObj);
-    return m_objects[m_objects.size() - 1];
-}
-
-bool CExportManager::ImportFromFile(const char* filename)
-{
-    bool bRet = false;
-    QString ext = PathUtil::GetExt(filename);
-
-    m_data.Clear();
-
-    for (size_t handlerID = 0; handlerID < m_exporters.size(); ++handlerID)
-    {
-        IExporter* pExporter = m_exporters[handlerID];
-        if (!QString::compare(ext, pExporter->GetExtension(), Qt::CaseInsensitive))
-        {
-            bRet = pExporter->ImportFromFile(filename, &m_data);
-            break;
-        }
-    }
-
-    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();
-    if (!pSequence)
-    {
-        return;
-    }
-
-    CTrackViewExportKeyTimeDlg exportDialog;
-
-    if (exportDialog.exec() == QDialog::Accepted)
-    {
-        m_animKeyTimeExport = exportDialog.IsAnimationExportChecked();
-        m_soundKeyTimeExport = exportDialog.IsSoundExportChecked();
-
-        QString filters = "All files (*.xml)";
-        QString defaultName = QString(pSequence->GetName()) + ".xml";
-
-        QtUtil::QtMFCScopedHWNDCapture cap;
-        CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptSave, QFileDialog::AnyFile, "xml", defaultName, filters, {}, {}, cap);
-        if (dlg.exec())
-        {
-            m_animTimeNode = XmlHelpers::CreateXmlNode(pSequence->GetName());
-            m_animTimeExportPrimarySequenceName = pSequence->GetName();
-
-            m_data.Clear();
-            m_animTimeExportPrimarySequenceCurrentTime = 0.0;
-
-            AddObjectsFromSequence(pSequence, m_animTimeNode);
-
-            m_animTimeNode->saveToFile(dlg.selectedFiles().constFirst().toStdString().c_str());
-            QMessageBox::information(QApplication::activeWindow(), QString(), QObject::tr("Export Finished"));
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Export/ExportManager.h b/Code/Sandbox/Editor/Export/ExportManager.h
deleted file mode 100644
index 32275823b6..0000000000
--- a/Code/Sandbox/Editor/Export/ExportManager.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Manager for export geometry
-
-
-#ifndef CRYINCLUDE_EDITOR_EXPORT_EXPORTMANAGER_H
-#define CRYINCLUDE_EDITOR_EXPORT_EXPORTMANAGER_H
-#pragma once
-
-
-#include <AzCore/Component/EntityId.h>
-#include <IExportManager.h>
-
-class CExportManager;
-class CTrackViewTrack;
-class CTrackViewSequence;
-class CTrackViewAnimNode;
-class CEntityObject;
-
-typedef std::vector<IExporter*> TExporters;
-
-
-namespace Export
-{
-    class CMesh
-        : public Mesh
-        , public CRefCountBase
-    {
-    public:
-        CMesh();
-
-        virtual int GetFaceCount() const { return m_faces.size(); }
-        virtual const Face* GetFaceBuffer() const { return m_faces.size() ? &m_faces[0] : 0; }
-
-    private:
-        std::vector<Face> m_faces;
-
-        friend CExportManager;
-    };
-
-
-    class CObject
-        : public Object
-        , public CRefCountBase
-    {
-    public:
-        CObject(const char* pName);
-
-        virtual int GetVertexCount() const { return m_vertices.size(); }
-        virtual const Vector3D* GetVertexBuffer() const{ return m_vertices.size() ? &m_vertices[0] : 0; }
-
-        virtual int GetNormalCount() const { return m_normals.size(); }
-        virtual const Vector3D* GetNormalBuffer() const { return m_normals.size() ? &m_normals[0] : 0; }
-
-        virtual int GetTexCoordCount() const { return m_texCoords.size(); }
-        virtual const UV* GetTexCoordBuffer() const { return m_texCoords.size() ? &m_texCoords[0] : 0; }
-
-        virtual int GetMeshCount() const { return m_meshes.size(); }
-        virtual Mesh* GetMesh(int index) const { return m_meshes[index]; }
-
-        virtual size_t  MeshHash() const{return m_MeshHash; }
-
-        void SetMaterialName(const char* pName);
-        virtual int GetEntityAnimationDataCount() const {return m_entityAnimData.size(); }
-        virtual const EntityAnimData* GetEntityAnimationData(int index) const {return &m_entityAnimData[index]; }
-        virtual void SetEntityAnimationData(EntityAnimData entityData){ m_entityAnimData.push_back(entityData); };
-        void SetLastPtr(CBaseObject* pObject){m_pLastObject = pObject; };
-        CBaseObject* GetLastObjectPtr(){return m_pLastObject; };
-
-    private:
-        CBaseObject* m_pLastObject;
-        std::vector<Vector3D> m_vertices;
-        std::vector<Vector3D> m_normals;
-        std::vector<UV> m_texCoords;
-        std::vector< _smart_ptr<CMesh> > m_meshes;
-        std::vector<EntityAnimData> m_entityAnimData;
-
-        size_t  m_MeshHash;
-
-        friend CExportManager;
-    };
-
-
-    class CData
-        : public IData
-    {
-    public:
-        virtual int GetObjectCount() const { return m_objects.size(); }
-        virtual Object* GetObject(int index) const { return m_objects[index]; }
-        virtual Object* AddObject(const char* objectName);
-        void Clear();
-
-    private:
-        std::vector< _smart_ptr<Export::CObject> > m_objects;
-
-        friend CExportManager;
-    };
-}
-
-
-typedef std::map<CBaseObject*, int> TObjectMap;
-
-class CExportManager
-    : public IExportManager
-{
-public:
-
-    CExportManager();
-    virtual ~CExportManager();
-
-    //! Register exporter
-    //! return true if succeed, otherwise false
-    virtual bool RegisterExporter(IExporter* pExporter);
-
-    //! Export specified geometry
-    //! return true if succeed, otherwise false
-    bool Export(const char* defaultName, const char* defaultExt = "", const char* defaultPath = "", bool isSelectedObjects = true,
-        bool isSelectedRegionObjects = false, bool isOccluder = false, bool bAnimationExport = false);
-
-    bool AddSelectedEntityObjects();
-
-    //! Add to Export Data geometry from objects inside selected region volume
-    //! return true if succeed, otherwise false
-    bool AddSelectedRegionObjects();
-
-    //! Export to file collected data, using specified exporter throughout the file extension
-    //! return true if succeed, otherwise false
-    bool ExportToFile(const char* filename, bool bClearDataAfterExport = true);
-
-    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
-    virtual bool ExportSingleStatObj(IStatObj* pStatObj, const char* filename);
-
-    void SetBakedKeysSequenceExport(bool bBaked){m_bBakedKeysSequenceExport = bBaked; };
-
-    void SaveNodeKeysTimeToXML();
-
-private:
-    void AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh, Matrix34A* pTm = 0);
-    bool AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm = 0);
-    bool AddMeshes(Export::CObject* pObj);
-    bool AddObject(CBaseObject* pBaseObj);
-    void SolveHierarchy();
-
-    void AddEntityAnimationData(AZ::EntityId entityId);
-    void ProcessEntityAnimationTrack(AZ::EntityId entityId, Export::CObject* pObj, AnimParamType entityTrackParamType);
-    void AddEntityAnimationData(const CTrackViewTrack* pTrack, Export::CObject* pObj, AnimParamType entityTrackParamType);
-
-    void AddPosRotScale(Export::CObject* pObj, const CBaseObject* pBaseObj);
-    void AddEntityData(Export::CObject* pObj, Export::AnimParamType dataType, const float fValue, const float fTime);
-
-    bool AddObjectsFromSequence(CTrackViewSequence* pSequence, XmlNodeRef seqNode = 0);
-    bool IsDuplicateObjectBeingAdded(const QString& newObject);
-    void SetFBXExportSettings(bool bLocalCoordsToSelectedObject, bool bExportOnlyPrimaryCamera, const float fps);
-    bool ProcessObjectsForExport();
-
-    bool ShowFBXExportDialog();
-
-    void FillAnimTimeNode(XmlNodeRef writeNode, CTrackViewAnimNode* pObjectNode, CTrackViewSequence* currentSequence);
-    QString CleanXMLText(const QString& text);
-
-private:
-
-    TExporters m_exporters;
-    Export::CData m_data;
-    bool m_isPrecaching;
-    bool m_isOccluder;
-    float m_fScale;
-    TObjectMap m_objectMap;
-    bool m_bAnimationExport;
-
-    CBaseObject* m_pBaseObj;
-
-    float m_FBXBakedExportFPS;
-    bool m_bExportLocalCoords;
-    bool m_bExportOnlyPrimaryCamera;
-    int m_numberOfExportFrames;
-    CEntityObject* m_pivotEntityObject;
-    bool m_bBakedKeysSequenceExport;
-
-    QString m_animTimeExportPrimarySequenceName;
-    float m_animTimeExportPrimarySequenceCurrentTime;
-    XmlNodeRef m_animTimeNode;
-
-    bool m_animKeyTimeExport;
-    bool m_soundKeyTimeExport;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_EXPORT_EXPORTMANAGER_H
diff --git a/Code/Sandbox/Editor/Export/OBJExporter.cpp b/Code/Sandbox/Editor/Export/OBJExporter.cpp
deleted file mode 100644
index aed6c37ba7..0000000000
--- a/Code/Sandbox/Editor/Export/OBJExporter.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "OBJExporter.h"
-
-
-const char* COBJExporter::GetExtension() const
-{
-    return "obj";
-}
-
-
-const char* COBJExporter::GetShortDescription() const
-{
-    return "Object files";
-}
-
-
-bool COBJExporter::ExportToFile(const char* filename, const Export::IData* pExportData)
-{
-    CLogFile::FormatLine("Exporting OBJ file to '%s'", filename);
-
-    FILE* hFile = nullptr;
-    azfopen(&hFile, filename, "w");
-    if (!hFile)
-    {
-        CLogFile::FormatLine("Error while opening file '%s'!", filename);
-        assert(hFile);
-        return false;
-    }
-
-    // Write header
-    fprintf(hFile, "# Object file exported by Sandbox\n");
-    fprintf(hFile, "# Attention: while import to 3DS Max Unify checkbox for normals must be unchecked.\n");
-    fprintf(hFile, "#\n");
-
-    // Create MTL library filename
-    QString materialFilename = filename;
-    materialFilename = Path::ReplaceExtension(materialFilename, "mtl");
-    materialFilename = Path::GetFile(materialFilename);
-
-    // Write material library import statement
-    fprintf(hFile, "mtllib %s\n", materialFilename.toUtf8().data());
-    fprintf(hFile, "#\n");
-
-    int numObjects = pExportData->GetObjectCount();
-    for (int i = 0; i < numObjects; ++i)
-    {
-        const Export::Object* pObj = pExportData->GetObject(i);
-
-        Vec3 pos(pObj->pos.x, pObj->pos.y, pObj->pos.z);
-        Quat rot(pObj->rot.w, pObj->rot.v.x, pObj->rot.v.y, pObj->rot.v.z);
-        Vec3 scale(pObj->scale.x, pObj->scale.y, pObj->scale.z);
-
-        Matrix34 tm = Matrix33::CreateScale(scale) * Matrix34(rot);
-        tm.SetTranslation(pos);
-
-        int nParent = pObj->nParent;
-        while (nParent >= 0 && nParent < pExportData->GetObjectCount())
-        {
-            const Export::Object* pParentObj = pExportData->GetObject(nParent);
-            assert(NULL != pParentObj);
-
-            Vec3 pos2(pParentObj->pos.x, pParentObj->pos.y, pParentObj->pos.z);
-            Quat rot2(pParentObj->rot.w, pParentObj->rot.v.x, pParentObj->rot.v.y, pParentObj->rot.v.z);
-            Vec3 scale2(pParentObj->scale.x, pParentObj->scale.y, pParentObj->scale.z);
-
-            Matrix34 parentTm = Matrix33::CreateScale(scale2) * Matrix34(rot2);
-            parentTm.SetScale(scale2);
-            parentTm.SetTranslation(pos2);
-
-            tm = tm * parentTm;
-            nParent = pParentObj->nParent;
-        }
-
-        fprintf(hFile, "g %s\n", pObj->name); //For XSI
-        fprintf(hFile, "# object %s\n", pObj->name);
-        fprintf(hFile, "#\n");
-
-        int numVertices = pObj->GetVertexCount();
-        const Export::Vector3D* pVerts = pObj->GetVertexBuffer();
-
-        for (int ii = 0; ii < numVertices; ++ii)
-        {
-            const Export::Vector3D& vertex = pVerts[ii];
-
-            Vec3 vec(vertex.x, vertex.y, vertex.z);
-            vec = tm.TransformPoint(vec);
-
-            fprintf(hFile, "v %s %s %s\n", TrimFloat(vec.x), TrimFloat(vec.y), TrimFloat(vec.z));
-        }
-        fprintf(hFile, "# %i vertices\n\n", numVertices);
-
-        // Write object texture coordinates
-        int numTexCoords = pObj->GetTexCoordCount();
-        const Export::UV* pTexCoord = pObj->GetTexCoordBuffer();
-        for (int ii = 0; ii < numTexCoords; ++ii)
-        {
-            const Export::UV& textCoord = pTexCoord[ii];
-            fprintf(hFile, "vt %s %s 0\n", TrimFloat(textCoord.u), TrimFloat(textCoord.v));
-        }
-        fprintf(hFile, "# %i texture vertices\n\n", numTexCoords);
-
-        // Write object normals
-        int numNormals = pObj->GetNormalCount();
-        const Export::Vector3D* pNormals = pObj->GetNormalBuffer();
-        for (int ii = 0; ii < numNormals; ++ii)
-        {
-            const Export::Vector3D& normal = pNormals[ii];
-            fprintf(hFile, "vn %s %s %s\n", TrimFloat(normal.x), TrimFloat(normal.y), TrimFloat(normal.z));
-        }
-        fprintf(hFile, "# %i vertex normals\n\n", numNormals);
-
-
-        // Write submeshes
-        int numMeshes = pObj->GetMeshCount();
-        for (int j = 0; j < numMeshes; ++j)
-        {
-            const Export::Mesh* pMesh = pObj->GetMesh(j);
-            if (pMesh->material.name[0] != '\0')
-            {
-                fprintf(hFile, "usemtl %s\n", pMesh->material.name);
-            }
-
-            // TODO: if it's a smoth group fix it to bit difference
-            fprintf(hFile, "s %d\n", j);
-
-            // Write all faces, convert the indices to one based indices
-            int numFaces = pMesh->GetFaceCount();
-            const Export::Face* pFaceBuf = pMesh->GetFaceBuffer();
-            for (int ii = 0; ii < numFaces; ++ii)
-            {
-                const Export::Face& face = pFaceBuf[ii];
-                fprintf(hFile, "f %i/%i/%i %i/%i/%i %i/%i/%i\n",
-                    face.idx[0] - numVertices, face.idx[0] - numTexCoords, face.idx[0] - numNormals,
-                    face.idx[1] - numVertices, face.idx[1] - numTexCoords, face.idx[1] - numNormals,
-                    face.idx[2] - numVertices, face.idx[2] - numTexCoords, face.idx[2] - numNormals);
-            }
-            fprintf(hFile, "# %i faces\n\n", numFaces);
-        }
-    }
-
-    fprintf(hFile, "g\n");
-    fclose(hFile);
-
-
-    // Export Material
-    materialFilename = Path::ReplaceExtension(filename, "mtl");
-
-    // Open the material file
-    hFile = nullptr;
-    azfopen(&hFile, materialFilename.toUtf8().data(), "w");
-    if (!hFile)
-    {
-        CLogFile::FormatLine("Error while opening file '%s'!", materialFilename.toUtf8().data());
-        assert(hFile);
-        return false;
-    }
-
-    // Write header
-    fprintf(hFile, "# Material file exported by Sandbox\n\n");
-
-    for (int i = 0; i < numObjects; ++i)
-    {
-        const Export::Object* pObj = pExportData->GetObject(i);
-
-        int numMeshes = pObj->GetMeshCount();
-        for (int j = 0; j < numMeshes; j++)
-        {
-            const Export::Mesh* pMesh = pObj->GetMesh(j);
-            if (pMesh->material.name[0] != '\0')
-            {
-                // Write material
-                const Export::Material& mtl = pMesh->material;
-                fprintf(hFile, "newmtl %s\n", mtl.name);
-                fprintf(hFile, "Ka %s %s %s\n", TrimFloat(mtl.diffuse.r), TrimFloat(mtl.diffuse.g), TrimFloat(mtl.diffuse.b));
-                fprintf(hFile, "Kd %s %s %s\n", TrimFloat(mtl.diffuse.r), TrimFloat(mtl.diffuse.g), TrimFloat(mtl.diffuse.b));
-                fprintf(hFile, "Ks %s %s %s\n", TrimFloat(mtl.specular.r), TrimFloat(mtl.specular.g), TrimFloat(mtl.specular.b));
-                fprintf(hFile, "d %s\n", TrimFloat(1.0f - mtl.opacity));
-                fprintf(hFile, "Tr %s\n", TrimFloat(1.0f - mtl.opacity));
-                fprintf(hFile, "Ns %s\n", TrimFloat(mtl.smoothness));
-                if (strlen(mtl.mapDiffuse))
-                {
-                    fprintf(hFile, "map_Kd %s\n", MakeRelativePath(filename, mtl.mapDiffuse).toUtf8().constData());
-                }
-                if (strlen(mtl.mapSpecular))
-                {
-                    fprintf(hFile, "map_Ns %s\n", MakeRelativePath(filename, mtl.mapSpecular).toUtf8().constData());
-                }
-                if (strlen(mtl.mapOpacity))
-                {
-                    fprintf(hFile, "map_d %s\n", MakeRelativePath(filename, mtl.mapOpacity).toUtf8().constData());
-                }
-                if (strlen(mtl.mapNormals))
-                {
-                    fprintf(hFile, "bump %s\n", MakeRelativePath(filename, mtl.mapNormals).toUtf8().constData());
-                }
-                if (strlen(mtl.mapDecal))
-                {
-                    fprintf(hFile, "decal %s\n", MakeRelativePath(filename, mtl.mapDecal).toUtf8().constData());
-                }
-                if (strlen(mtl.mapDisplacement))
-                {
-                    fprintf(hFile, "disp %s\n", MakeRelativePath(filename, mtl.mapDisplacement).toUtf8().constData());
-                }
-                fprintf(hFile, "\n");
-            }
-        }
-    }
-
-    fclose(hFile);
-
-    return true;
-}
-
-
-QString COBJExporter::MakeRelativePath(const char* pMainFileName, const char* pFileName) const
-{
-    const char* ch = strrchr(pMainFileName, '\\');
-    if (ch)
-    {
-        if (strlen(pFileName) > ch - pMainFileName && !_strnicmp(pMainFileName, pFileName, ch - pMainFileName))
-        {
-            return QString(pFileName + (ch - pMainFileName) + 1);
-        }
-    }
-
-    return QString(pFileName);
-}
-
-
-const char* COBJExporter::TrimFloat(float fValue) const
-{
-    // Convert a float into a string representation and remove all
-    // uneccessary zeroes and the decimal dot if it is not needed
-    const int nMaxAccessInTime = 4;
-
-    static char ppBufs[nMaxAccessInTime][16];
-    static int nCurBuf = 0;
-
-    if (nCurBuf >= nMaxAccessInTime)
-    {
-        nCurBuf = 0;
-    }
-
-    char* pBuf = ppBufs[nCurBuf];
-    size_t bufSize = sizeof(ppBufs[nCurBuf]);
-    ++nCurBuf;
-    sprintf_s(pBuf, bufSize, "%f", fValue);
-
-    for (int i = strlen(pBuf) - 1; i > 0; --i)
-    {
-        if (pBuf[i] == '0')
-        {
-            pBuf[i] = 0;
-        }
-        else if (pBuf[i] == '.')
-        {
-            pBuf[i] = 0;
-            break;
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    return pBuf;
-}
-
-
-
-void COBJExporter::Release()
-{
-    delete this;
-}
diff --git a/Code/Sandbox/Editor/Export/OBJExporter.h b/Code/Sandbox/Editor/Export/OBJExporter.h
deleted file mode 100644
index 68522d1f8e..0000000000
--- a/Code/Sandbox/Editor/Export/OBJExporter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Export geometry OBJ file format
-
-
-#ifndef CRYINCLUDE_EDITOR_EXPORT_OBJEXPORTER_H
-#define CRYINCLUDE_EDITOR_EXPORT_OBJEXPORTER_H
-#pragma once
-
-
-#include <IExportManager.h>
-
-
-class COBJExporter
-    : public IExporter
-{
-public:
-    virtual const char* GetExtension() const;
-    virtual const char* GetShortDescription() const;
-    virtual bool ExportToFile(const char* filename, const Export::IData* pExportData);
-    virtual bool ImportFromFile([[maybe_unused]] const char* filename, [[maybe_unused]] Export::IData* pData){return false; };
-    virtual void Release();
-
-private:
-    const char* TrimFloat(float fValue) const;
-    QString MakeRelativePath(const char* pMainFileName, const char* pFileName) const;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_EXPORT_OBJEXPORTER_H
diff --git a/Code/Sandbox/Editor/Export/OCMExporter.cpp b/Code/Sandbox/Editor/Export/OCMExporter.cpp
deleted file mode 100644
index 81bbe8c335..0000000000
--- a/Code/Sandbox/Editor/Export/OCMExporter.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "OCMExporter.h"
-
-
-class CFileEndianWriter
-{
-    std::vector<uint8>              m_Data;
-    size_t                                      m_Offset;
-public:
-    CFileEndianWriter()
-        : m_Offset(0){}
-    void                                            Seek(size_t Offset){m_Offset = Offset; }
-    void                                            Write(const void* pData, size_t Size)
-    {
-        if (m_Offset + Size > m_Data.size())
-        {
-            m_Data.resize(m_Offset + Size);
-        }
-        memcpy(&m_Data[m_Offset], pData, Size);
-        m_Offset += Size;
-    }
-    size_t                                      Pos() const{return m_Offset; }
-    template<size_t Padding>
-    void                                            Align(){m_Offset = (m_Offset + (Padding - 1)) & ~(Padding - 1); }
-    template<class T>
-    void                                            Write(T D){Write(&D, sizeof(T)); }
-
-
-    const std::vector<uint8>&   Data() const{return m_Data; }
-};
-
-const char* COCMExporter::GetExtension() const
-{
-    return "ocm";
-}
-
-const char* COCMExporter::GetShortDescription() const
-{
-    return "occlusion culler mesh";
-}
-
-Matrix44 MatRotate(f32 a, f32 b, f32 g)
-{
-    const f32   CosR    =   cosf(a);
-    const f32   SinR    =   sinf(a);
-    const f32   CosP    =   cosf(b);
-    const f32   SinP    =   sinf(b);
-    const f32   CosY    =   cosf(g);
-    const f32   SinY    =   sinf(g);
-    const f32   SRSP    =   SinR * SinP;
-    const f32   CRSP    =   CosR * SinP;
-
-    Matrix44 Mat;
-    Mat.m00 = CosP * CosY;
-    Mat.m01 = CosP * SinY;
-    Mat.m02 = -SinP;
-    Mat.m03 = 0.f;
-    Mat.m10 = SRSP * CosY - CosR * SinY;
-    Mat.m11 = SRSP * SinY + CosR * CosY;
-    Mat.m12 = SinR * CosP;
-    Mat.m13 = 0.f;
-    Mat.m20 = CRSP * CosY + SinR * SinY;
-    Mat.m21 = CRSP * SinY - SinR * CosY;
-    Mat.m22 = CosR * CosP;
-    Mat.m23 = 0.f;
-    Mat.m30 = 0.f;
-    Mat.m31 = 0.f;
-    Mat.m32 = 0.f;
-    Mat.m33 = 1.f;
-    return Mat;
-};
-
-void COCMExporter::Extends(const Matrix44& rTransform, const Export::Object* pMesh, f32& rMinX, f32& rMaxX, f32& rMinY, f32& rMaxY, f32& rMinZ, f32& rMaxZ)    const
-{
-    rMinX = rMinY = rMinZ   =   FLT_MAX;
-    rMaxX = rMaxY = rMaxZ   =   -FLT_MAX;
-    const uint32 TriCount   =   pMesh->GetVertexCount();
-    const Export::Vector3D* pVerts = pMesh->GetVertexBuffer();
-    for (size_t a = 0; a < TriCount; a++)
-    {
-        const Export::Vector3D& rV = pVerts[a];
-        const Vec3  VO(rV.x, rV.y, rV.z);
-        const Vec3  V   =   rTransform.TransformPoint(VO);
-        rMinX   =   std::min(rMinX, V.x);
-        rMinY   =   std::min(rMinY, V.y);
-        rMinZ   =   std::min(rMinZ, V.z);
-        rMaxX   =   std::max(rMaxX, V.x);
-        rMaxY   =   std::max(rMaxY, V.y);
-        rMaxZ   =   std::max(rMaxZ, V.z);
-    }
-}
-
-Matrix44 COCMExporter::CalcOBB(const Export::Object* pMesh)
-{
-    Matrix44 OBBMat(IDENTITY);
-    f32 MinX, MaxX, MinY, MaxY, MinZ, MaxZ;
-    Extends(OBBMat, pMesh, MinX, MaxX, MinY, MaxY, MinZ, MaxZ);
-
-    OBBMat.m03  =   -(MaxX + MinX) * 0.5f;
-    OBBMat.m13  =   -(MaxY + MinY) * 0.5f;
-    OBBMat.m23  =   -(MaxZ + MinZ) * 0.5f;
-
-    return OBBMat;
-}
-
-size_t COCMExporter::SaveMesh(CFileEndianWriter& rWriter, const Export::Object* pMesh, Matrix44& rOBBMat)
-{
-    const size_t PosStart   =   rWriter.Pos();
-    rOBBMat =   CalcOBB(pMesh);
-    const Export::Vector3D* pVerts = pMesh->GetVertexBuffer();
-    std::vector<float> Pos;
-    const uint32 SubMeshCount = pMesh->GetMeshCount();
-    for (uint32 b = 0; b < SubMeshCount; b++)
-    {
-        const Export::Mesh* pSubMesh = pMesh->GetMesh(b);
-        const uint32 FaceCount  = pSubMesh->GetFaceCount();
-        const Export::Face* pFaces = pSubMesh->GetFaceBuffer();
-        Pos.reserve(Pos.size() + FaceCount * 9);
-        for (size_t a = 0; a < FaceCount; a++)
-        {
-            const Export::Vector3D& rV0 = pVerts[pFaces[a].idx[0]];
-            const Export::Vector3D& rV1 = pVerts[pFaces[a].idx[1]];
-            const Export::Vector3D& rV2 = pVerts[pFaces[a].idx[2]];
-            const Vec3  VO0(rV0.x, rV0.y, rV0.z);
-            const Vec3  VO1(rV1.x, rV1.y, rV1.z);
-            const Vec3  VO2(rV2.x, rV2.y, rV2.z);
-            const Vec3  V0  =   rOBBMat.TransformPoint(VO0);
-            const Vec3  V1  =   rOBBMat.TransformPoint(VO1);
-            const Vec3  V2  =   rOBBMat.TransformPoint(VO2);
-            const Vec3  N   =   (V2 - V0).cross(V1 - V0);
-            if (fabsf(N.dot(N)) <= FLT_EPSILON)//degenerated?
-            {
-                continue;
-            }
-            Pos.push_back(V0.x);
-            Pos.push_back(V0.y);
-            Pos.push_back(V0.z);
-            Pos.push_back(1.f);
-            Pos.push_back(V1.x);
-            Pos.push_back(V1.y);
-            Pos.push_back(V1.z);
-            Pos.push_back(1.f);
-            Pos.push_back(V2.x);
-            Pos.push_back(V2.y);
-            Pos.push_back(V2.z);
-            Pos.push_back(1.f);
-        }
-    }
-    const uint32 TriCount       =   static_cast<uint16>(std::min<size_t>(65535, Pos.size() / 4));//vertex count at 4float/vertex
-    rWriter.Write(TriCount);
-    rWriter.Align<16>();
-    rWriter.Write(&Pos[0], 4 * TriCount * sizeof(float));
-    rWriter.Align<4>();
-    const size_t PosEnd =   rWriter.Pos();
-    return PosEnd - PosStart;//sizeof(TriCount)+sizeof(Pos[0])*Pos.size();
-}
-
-void COCMExporter::SaveInstance(CFileEndianWriter& rWriter, const Export::Object* pInstance, const SOCMeshInfo& rMeshInfo)
-{
-    Vec3 pos(pInstance->pos.x, pInstance->pos.y, pInstance->pos.z);
-    Quat rot(pInstance->rot.w, pInstance->rot.v.x, pInstance->rot.v.y, pInstance->rot.v.z);
-    Vec3 scale(pInstance->scale.x, pInstance->scale.y, pInstance->scale.z);
-
-    Matrix44 tm = Matrix33::CreateScale(scale) * Matrix34(rot);
-    tm.SetTranslation(pos);
-
-    tm  =   tm * rMeshInfo.m_OBBMat.GetInverted();
-
-    //const uint32 MeshID   =   pInstance->MeshToUse()->ID();
-    rWriter.Write(rMeshInfo.m_Offset);
-    for (size_t a = 0; a < 12; a++)//just savin the 3x4 matrix
-    {
-        rWriter.Write(*(reinterpret_cast<float*>(&tm) + a));
-    }
-}
-
-bool COCMExporter::ExportToFile(const char* filename, const Export::IData* pExportData)
-{
-    CLogFile::FormatLine("Exporting OCM file to '%s'", filename);
-
-    FILE* pFile = nullptr;
-    azfopen(&pFile, filename, "wb");
-    if (!pFile)
-    {
-        CLogFile::FormatLine("Error while opening file '%s'!", filename);
-        assert(pFile);
-        return false;
-    }
-
-    CFileEndianWriter Writer;
-    // Write header
-    const uint32 Version        =   ~(4u << 24);
-    const uint32 MeshCount  =   pExportData->GetObjectCount();
-    const uint32 InstCount  =   pExportData->GetObjectCount();
-    uint32  OffsetInstances =   0;
-    Writer.Write(Version);
-    Writer.Write(MeshCount);
-    Writer.Write(InstCount);
-    Writer.Write(OffsetInstances);//keep header end aligned to 16byte
-
-    tdMeshOffset    MeshOffsets;
-    MeshOffsets.reserve(MeshCount);
-    size_t Offset = 16;
-    //std::map<void*,size_t> MeshO
-    for (size_t a = 0; a < MeshCount; a++)
-    {
-        SOCMeshInfo MeshInfo;
-        MeshInfo.m_MeshHash =    pExportData->GetObject(a)->MeshHash();
-        const tdMeshOffset::iterator it =   std::find(MeshOffsets.begin(), MeshOffsets.end(), MeshInfo);
-        if (it != MeshOffsets.end())
-        {
-            MeshInfo    =   *it;
-        }
-        else
-        {
-            MeshInfo.m_Offset   =   Offset;
-            Offset += SaveMesh(Writer, pExportData->GetObject(a), MeshInfo.m_OBBMat);
-        }
-        MeshOffsets.push_back(MeshInfo);
-    }
-    OffsetInstances =   Offset;
-    for (size_t a = 0; a < InstCount; a++)
-    {
-        SaveInstance(Writer, pExportData->GetObject(a), MeshOffsets[a]);
-    }
-    Writer.Seek(4);
-    Writer.Write(static_cast<uint32>(MeshOffsets.size()));
-    Writer.Seek(12);
-    Writer.Write(OffsetInstances);
-
-    fwrite(&Writer.Data()[0], 1, Writer.Data().size(), pFile);
-
-    fclose(pFile);
-    return true;
-}
-
-const char* COCMExporter::TrimFloat(float fValue) const
-{
-    // Convert a float into a string representation and remove all
-    // unnecessary zeros and the decimal dot if it is not needed
-    const int nMaxAccessInTime = 4;
-
-    static char ppBufs[nMaxAccessInTime][16];
-    static int nCurBuf = 0;
-
-    if (nCurBuf >= nMaxAccessInTime)
-    {
-        nCurBuf = 0;
-    }
-
-    char* pBuf = ppBufs[nCurBuf];
-    size_t bufSize = sizeof(ppBufs[nCurBuf]);
-    ++nCurBuf;
-    sprintf_s(pBuf, bufSize, "%f", fValue);
-
-    for (int i = strlen(pBuf) - 1; i > 0; --i)
-    {
-        if (pBuf[i] == '0')
-        {
-            pBuf[i] = 0;
-        }
-        else if (pBuf[i] == '.')
-        {
-            pBuf[i] = 0;
-            break;
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    return pBuf;
-}
-
-
-
-void COCMExporter::Release()
-{
-    delete this;
-}
diff --git a/Code/Sandbox/Editor/Export/OCMExporter.h b/Code/Sandbox/Editor/Export/OCMExporter.h
deleted file mode 100644
index 77cd6731f5..0000000000
--- a/Code/Sandbox/Editor/Export/OCMExporter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Export geometry OCM file format
-
-
-#ifndef CRYINCLUDE_EDITOR_EXPORT_OCMEXPORTER_H
-#define CRYINCLUDE_EDITOR_EXPORT_OCMEXPORTER_H
-#pragma once
-
-#include <IExportManager.h>
-
-class CFileEndianWriter;
-
-struct SOCMeshInfo
-{
-    Matrix44    m_OBBMat;
-    uint32      m_Offset;
-    size_t      m_MeshHash;
-    bool    operator==(const SOCMeshInfo& rOther) const{return m_MeshHash == rOther.m_MeshHash; }
-};
-typedef std::vector<SOCMeshInfo>    tdMeshOffset;
-
-class COCMExporter
-    : public IExporter
-{
-public:
-    virtual const char* GetExtension() const;
-    virtual const char* GetShortDescription() const;
-    virtual bool ExportToFile(const char* filename, const Export::IData* pExportData);
-    virtual bool ImportFromFile([[maybe_unused]] const char* filename, [[maybe_unused]] Export::IData* pData){return false; };
-    virtual void Release();
-
-private:
-    const char* TrimFloat(float fValue) const;
-    void SaveInstance(CFileEndianWriter& rWriter, const Export::Object* pInstance, const SOCMeshInfo& rMeshInfo);
-    size_t SaveMesh(CFileEndianWriter& rWriter, const Export::Object* pMesh, Matrix44& rOBBMat);
-
-    void Extends(const Matrix44& rTransform, const Export::Object* pMesh, f32& rMinX, f32& rMaxX, f32& rMinY, f32& rMaxY, f32& rMinZ, f32& rMaxZ)  const;
-    Matrix44 CalcOBB(const Export::Object* pMesh);
-};
-
-
-#endif // CRYINCLUDE_EDITOR_EXPORT_OCMEXPORTER_H
diff --git a/Code/Sandbox/Editor/FBXExporterDialog.cpp b/Code/Sandbox/Editor/FBXExporterDialog.cpp
deleted file mode 100644
index 5cdf8e3de9..0000000000
--- a/Code/Sandbox/Editor/FBXExporterDialog.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "FBXExporterDialog.h"
-
-#include <QMessageBox>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_FBXExporterDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-namespace
-{
-    const uint kDefaultFPS = 30.0f;
-}
-
-CFBXExporterDialog::CFBXExporterDialog(bool bDisplayOnlyFPSSetting, QWidget* pParent)
-    : QDialog(pParent)
-    , m_ui(new Ui::FBXExporterDialog)
-{
-    m_ui->setupUi(this);
-    setFixedSize(size());
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-    m_ui->m_exportLocalCoordsCheckbox->setChecked(false);
-    m_bDisplayOnlyFPSSetting = bDisplayOnlyFPSSetting;
-
-    connect(m_ui->m_fpsCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &CFBXExporterDialog::OnFPSChange);
-}
-
-CFBXExporterDialog::~CFBXExporterDialog()
-{
-}
-
-float CFBXExporterDialog::GetFPS() const
-{
-    return m_ui->m_fpsCombo->currentText().toDouble();
-}
-
-bool CFBXExporterDialog::GetExportCoordsLocalToTheSelectedObject() const
-{
-    return m_ui->m_exportLocalCoordsCheckbox->isChecked();
-}
-
-bool CFBXExporterDialog::GetExportOnlyPrimaryCamera() const
-{
-    return m_ui->m_exportOnlyPrimaryCameraCheckBox->isChecked();
-}
-
-void CFBXExporterDialog::SetExportLocalCoordsCheckBoxEnable(bool checked)
-{
-    if (!m_bDisplayOnlyFPSSetting)
-    {
-        m_ui->m_exportLocalCoordsCheckbox->setEnabled(checked);
-    }
-}
-
-void CFBXExporterDialog::accept()
-{
-    const QString fpsStr = m_ui->m_fpsCombo->currentText();
-
-    bool ok;
-    const double fps = fpsStr.toDouble(&ok);
-
-    if (fps <= 0 && !fpsStr.isEmpty() || fpsStr.isEmpty() || !ok)
-    {
-        QMessageBox::information(this, QString(), tr("Please enter a correct FPS value"));
-        m_ui->m_fpsCombo->setCurrentIndex(2);
-        return;
-    }
-
-    QDialog::accept();
-}
-
-void CFBXExporterDialog::OnFPSChange()
-{
-    const QString fpsStr = m_ui->m_fpsCombo->currentText();
-
-    if (QString::compare(fpsStr, tr("Custom"), Qt::CaseInsensitive) == 0)
-    {
-        m_ui->m_fpsCombo->setCurrentIndex(-1);
-    }
-}
-
-int CFBXExporterDialog::exec()
-{
-    if (m_bDisplayOnlyFPSSetting)
-    {
-        m_ui->m_exportLocalCoordsCheckbox->setEnabled(false);
-        m_ui->m_exportOnlyPrimaryCameraCheckBox->setEnabled(false);
-    }
-
-    m_ui->m_fpsCombo->addItem("24");
-    m_ui->m_fpsCombo->addItem("25");
-    m_ui->m_fpsCombo->addItem("30");
-    m_ui->m_fpsCombo->addItem("48");
-    m_ui->m_fpsCombo->addItem("60");
-    m_ui->m_fpsCombo->addItem(tr("Custom"));
-    m_ui->m_fpsCombo->setCurrentIndex(2);
-
-    return QDialog::exec();
-}
-
-#include <moc_FBXExporterDialog.cpp>
diff --git a/Code/Sandbox/Editor/FBXExporterDialog.h b/Code/Sandbox/Editor/FBXExporterDialog.h
deleted file mode 100644
index 1075fdd8dd..0000000000
--- a/Code/Sandbox/Editor/FBXExporterDialog.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_FBXEXPORTERDIALOG_H
-#define CRYINCLUDE_EDITOR_FBXEXPORTERDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "Resource.h"
-
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class FBXExporterDialog;
-}
-
-class CFBXExporterDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CFBXExporterDialog (bool bDisplayOnlyFPSSetting = false, QWidget* pParent = nullptr);
-    ~CFBXExporterDialog();
-
-    float GetFPS() const;
-    bool GetExportCoordsLocalToTheSelectedObject() const;
-    bool GetExportOnlyPrimaryCamera() const;
-    void SetExportLocalCoordsCheckBoxEnable(bool checked);
-
-    int exec() override;
-
-protected:
-    void OnFPSChange();
-    void SetExportLocalToTheSelectedObjectCheckBox();
-    void SetExportOnlyPrimaryCameraCheckBox();
-
-    void accept() override;
-
-    bool m_bDisplayOnlyFPSSetting;
-private:
-    QScopedPointer<Ui::FBXExporterDialog> m_ui;
-};
-#endif // CRYINCLUDE_EDITOR_FBXEXPORTERDIALOG_H
diff --git a/Code/Sandbox/Editor/FileTypeUtils.cpp b/Code/Sandbox/Editor/FileTypeUtils.cpp
deleted file mode 100644
index ae47ab23fa..0000000000
--- a/Code/Sandbox/Editor/FileTypeUtils.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "FileTypeUtils.h"
-
-// the supported file types
-static const char* szSupportedExt[] =
-{
-    "chr",
-    "chr(c)",
-    "skin",
-    "skin(c)",
-    "cdf",
-    "cdf(c)",
-    "cgf",
-    "cgf(c)",
-    "cga",
-    "cga(c)",
-    "cid",
-    "caf"
-};
-
-bool IsPreviewableFileType (const char* szPath)
-{
-    QString szExt = Path::GetExt(szPath);
-
-    for (unsigned int i = 0; i < sizeof(szSupportedExt) / sizeof(szSupportedExt[0]); ++i)
-    {
-        if (QString::compare(szExt, szSupportedExt[i], Qt::CaseInsensitive) == 0)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
diff --git a/Code/Sandbox/Editor/FileTypeUtils.h b/Code/Sandbox/Editor/FileTypeUtils.h
deleted file mode 100644
index 3dca778057..0000000000
--- a/Code/Sandbox/Editor/FileTypeUtils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_FILETYPEUTILS_H
-#define CRYINCLUDE_EDITOR_FILETYPEUTILS_H
-#pragma once
-
-// returns true if the given file path represents a file
-// that can be previewed in Preview mode in Editor (e.g. cgf, cga etc.)
-extern bool IsPreviewableFileType(const char* szPath);
-
-#endif // CRYINCLUDE_EDITOR_FILETYPEUTILS_H
diff --git a/Code/Sandbox/Editor/GameEngine.cpp b/Code/Sandbox/Editor/GameEngine.cpp
deleted file mode 100644
index 83f77b70ea..0000000000
--- a/Code/Sandbox/Editor/GameEngine.cpp
+++ /dev/null
@@ -1,926 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "GameEngine.h"
-
-// Qt
-#include <QMessageBox>
-#include <QThread>
-
-// AzCore
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/IO/IStreamer.h>
-#include <AzCore/std/parallel/binary_semaphore.h>
-
-// AzFramework
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
-#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>      // for TerrainDataRequests
-#include <AzFramework/Archive/IArchive.h>
-
-// Editor
-#include "IEditorImpl.h"
-#include "CryEditDoc.h"
-#include "Settings.h"
-
-// CryCommon
-#include <CryCommon/INavigationSystem.h>
-#include <CryCommon/LyShine/ILyShine.h>
-#include <CryCommon/MainThreadRenderRequestBus.h>
-
-// Editor
-#include "CryEdit.h"
-
-#include "ViewManager.h"
-#include "AnimationContext.h"
-#include "UndoViewPosition.h"
-#include "UndoViewRotation.h"
-#include "MainWindow.h"
-#include "Include/IObjectManager.h"
-#include "ActionManager.h"
-
-// Including this too early will result in a linker error
-#include <CryCommon/CryLibrary.h>
-
-// Implementation of System Callback structure.
-struct SSystemUserCallback
-    : public ISystemUserCallback
-{
-    SSystemUserCallback(IInitializeUIInfo* logo) : m_threadErrorHandler(this) { m_pLogo = logo; };
-    virtual void OnSystemConnect(ISystem* pSystem)
-    {
-        ModuleInitISystem(pSystem, "Editor");
-    }
-
-    virtual bool OnError(const char* szErrorString)
-    {
-        // since we show a message box, we have to use the GUI thread
-        if (QThread::currentThread() != qApp->thread())
-        {
-            bool result = false;
-            QMetaObject::invokeMethod(&m_threadErrorHandler, "OnError", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, result), Q_ARG(const char*, szErrorString));
-            return result;
-        }
-
-        if (szErrorString)
-        {
-            Log(szErrorString);
-        }
-
-        if (GetIEditor()->IsInTestMode())
-        {
-            exit(1);
-        }
-
-        char str[4096];
-
-        if (szErrorString)
-        {
-            azsnprintf(str, 4096, "%s\r\nSave Level Before Exiting the Editor?", szErrorString);
-        }
-        else
-        {
-            azsnprintf(str, 4096, "Unknown Error\r\nSave Level Before Exiting the Editor?");
-        }
-
-        int res = IDNO;
-
-        ICVar* pCVar = gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_crash_dialog") : NULL;
-
-        if (!pCVar || pCVar->GetIVal() == 0)
-        {
-            res = QMessageBox::critical(QApplication::activeWindow(), QObject::tr("Engine Error"), str, QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-        }
-
-        if (res == QMessageBox::Yes || res == QMessageBox::No)
-        {
-            if (res == QMessageBox::Yes)
-            {
-                if (GetIEditor()->SaveDocument())
-                {
-                    QMessageBox::information(QApplication::activeWindow(), QObject::tr("Save"), QObject::tr("Level has been successfully saved!\r\nPress Ok to terminate Editor."));
-                }
-            }
-        }
-
-        return true;
-    }
-
-    virtual bool OnSaveDocument()
-    {
-        bool success = false;
-
-        if (GetIEditor())
-        {
-            // Turn off save backup as we force a backup before reaching this point
-            bool prevSaveBackup = gSettings.bBackupOnSave;
-            gSettings.bBackupOnSave = false;
-
-            success = GetIEditor()->SaveDocument();
-            gSettings.bBackupOnSave = prevSaveBackup;
-        }
-
-        return success;
-    }
-
-    virtual bool OnBackupDocument()
-    {
-        CCryEditDoc* level = GetIEditor() ? GetIEditor()->GetDocument() : nullptr;
-        if (level)
-        {
-            return level->BackupBeforeSave(true);
-        }
-
-        return false;
-    }
-
-    virtual void OnProcessSwitch()
-    {
-        if (GetIEditor()->IsInGameMode())
-        {
-            GetIEditor()->SetInGameMode(false);
-        }
-    }
-
-    virtual void OnInitProgress(const char* sProgressMsg)
-    {
-        if (m_pLogo)
-        {
-            m_pLogo->SetInfoText(sProgressMsg);
-        }
-    }
-
-    virtual int ShowMessage(const char* text, const char* caption, unsigned int uType)
-    {
-        if (CCryEditApp::instance()->IsInAutotestMode())
-        {
-            return IDOK;
-        }
-
-        const UINT kMessageBoxButtonMask = 0x000f;
-        if (!GetIEditor()->IsInGameMode() && (uType == 0 || uType == MB_OK || !(uType & kMessageBoxButtonMask)))
-        {
-            static_cast<CEditorImpl*>(GetIEditor())->AddErrorMessage(text, caption);
-            return IDOK;
-        }
-        return CryMessageBox(text, caption, uType);
-    }
-
-    virtual void GetMemoryUsage(ICrySizer* pSizer)
-    {
-        GetIEditor()->GetMemoryUsage(pSizer);
-    }
-
-    void OnSplashScreenDone()
-    {
-        m_pLogo = nullptr;
-    }
-
-private:
-    IInitializeUIInfo* m_pLogo;
-    ThreadedOnErrorHandler m_threadErrorHandler;
-};
-
-ThreadedOnErrorHandler::ThreadedOnErrorHandler(ISystemUserCallback* callback)
-    : m_userCallback(callback)
-{
-    moveToThread(qApp->thread());
-}
-
-ThreadedOnErrorHandler::~ThreadedOnErrorHandler()
-{
-}
-
-bool ThreadedOnErrorHandler::OnError(const char* error)
-{
-    return m_userCallback->OnError(error);
-}
-
-//! This class will be used by CSystem to find out whether the negotiation with the assetprocessor failed
-class AssetProcessConnectionStatus
-    : public AzFramework::AssetSystemConnectionNotificationsBus::Handler
-{
-public:
-    AssetProcessConnectionStatus()
-    {
-        AzFramework::AssetSystemConnectionNotificationsBus::Handler::BusConnect();
-    };
-    ~AssetProcessConnectionStatus()
-    {
-        AzFramework::AssetSystemConnectionNotificationsBus::Handler::BusDisconnect();
-    }
-
-    //! Notifies listeners that connection to the Asset Processor failed
-    void ConnectionFailed() override
-    {
-        m_connectionFailed = true;
-    }
-
-    void NegotiationFailed() override
-    {
-        m_negotiationFailed = true;
-    }
-
-    bool CheckConnectionFailed()
-    {
-        return m_connectionFailed;
-    }
-
-    bool CheckNegotiationFailed()
-    {
-        return m_negotiationFailed;
-    }
-private:
-    bool m_connectionFailed = false;
-    bool m_negotiationFailed = false;
-};
-
-AZ_PUSH_DISABLE_WARNING(4273, "-Wunknown-warning-option")
-CGameEngine::CGameEngine()
-    : m_gameDll(0)
-    , m_bIgnoreUpdates(false)
-    , m_ePendingGameMode(ePGM_NotPending)
-    , m_modalWindowDismisser(nullptr)
-AZ_POP_DISABLE_WARNING
-{
-    m_pISystem = NULL;
-    m_bLevelLoaded = false;
-    m_bInGameMode = false;
-    m_bSimulationMode = false;
-    m_bSyncPlayerPosition = true;
-    m_hSystemHandle = 0;
-    m_bJustCreated = false;
-    m_levelName = "Untitled";
-    m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-    m_playerViewTM.SetIdentity();
-    GetIEditor()->RegisterNotifyListener(this);
-}
-
-AZ_PUSH_DISABLE_WARNING(4273, "-Wunknown-warning-option")
-CGameEngine::~CGameEngine()
-{
-AZ_POP_DISABLE_WARNING
-    GetIEditor()->UnregisterNotifyListener(this);
-    m_pISystem->GetIMovieSystem()->SetCallback(NULL);
-
-    if (m_gameDll)
-    {
-        CryFreeLibrary(m_gameDll);
-    }
-
-    delete m_pISystem;
-    m_pISystem = NULL;
-
-    if (m_hSystemHandle)
-    {
-        CryFreeLibrary(m_hSystemHandle);
-    }
-
-    delete m_pSystemUserCallback;
-}
-
-static int ed_killmemory_size;
-static int ed_indexfiles;
-
-void KillMemory(IConsoleCmdArgs* /* pArgs */)
-{
-    while (true)
-    {
-        const int kLimit = 10000000;
-        int size;
-
-        if (ed_killmemory_size > 0)
-        {
-            size = ed_killmemory_size;
-        }
-        else
-        {
-            size = rand() * rand();
-            size = size > kLimit ? kLimit : size;
-        }
-
-        new uint8[size];
-    }
-}
-
-static void CmdGotoEditor(IConsoleCmdArgs* pArgs)
-{
-    // feature is mostly useful for QA purposes, this works with the game "goto" command
-    // this console command actually is used by the game command, the editor command shouldn't be used by the user
-    int iArgCount = pArgs->GetArgCount();
-
-    CViewManager* pViewManager = GetIEditor()->GetViewManager();
-    CViewport* pRenderViewport = pViewManager->GetGameViewport();
-    if (!pRenderViewport)
-    {
-        return;
-    }
-
-    float x, y, z, wx, wy, wz;
-
-    if (iArgCount == 7
-        && azsscanf(pArgs->GetArg(1), "%f", &x) == 1
-        && azsscanf(pArgs->GetArg(2), "%f", &y) == 1
-        && azsscanf(pArgs->GetArg(3), "%f", &z) == 1
-        && azsscanf(pArgs->GetArg(4), "%f", &wx) == 1
-        && azsscanf(pArgs->GetArg(5), "%f", &wy) == 1
-        && azsscanf(pArgs->GetArg(6), "%f", &wz) == 1)
-    {
-        Matrix34 tm = pRenderViewport->GetViewTM();
-
-        tm.SetTranslation(Vec3(x, y, z));
-        tm.SetRotation33(Matrix33::CreateRotationXYZ(DEG2RAD(Ang3(wx, wy, wz))));
-        pRenderViewport->SetViewTM(tm);
-    }
-}
-
-AZ::Outcome<void, AZStd::string> CGameEngine::Init(
-    bool bPreviewMode,
-    bool bTestMode,
-    const char* sInCmdLine,
-    IInitializeUIInfo* logo,
-    HWND hwndForInputSystem)
-{
-    m_pSystemUserCallback = new SSystemUserCallback(logo);
-    m_hSystemHandle = CryLoadLibraryDefName("CrySystem");
-
-    if (!m_hSystemHandle)
-    {
-        auto errorMessage = AZStd::string::format("%s Loading Failed", CryLibraryDefName("CrySystem"));
-        Error(errorMessage.c_str());
-        return AZ::Failure(errorMessage);
-    }
-
-    PFNCREATESYSTEMINTERFACE pfnCreateSystemInterface =
-        (PFNCREATESYSTEMINTERFACE)CryGetProcAddress(m_hSystemHandle, "CreateSystemInterface");
-
-
-    SSystemInitParams sip;
-
-    sip.bEditor = true;
-    sip.bDedicatedServer = false;
-    sip.bPreview = bPreviewMode;
-    sip.bTestMode = bTestMode;
-    sip.hInstance = nullptr;
-
-    sip.pSharedEnvironment = AZ::Environment::GetInstance();
-
-#ifdef AZ_PLATFORM_MAC
-    // Create a hidden QWidget. Would show a black window on macOS otherwise.
-    auto window = new QWidget();
-    QObject::connect(qApp, &QApplication::lastWindowClosed, window, &QWidget::deleteLater);
-    sip.hWnd = (HWND)window->winId();
-#else
-    sip.hWnd = hwndForInputSystem;
-#endif
-
-    sip.pLogCallback = &m_logFile;
-    sip.sLogFileName = "@log@/Editor.log";
-    sip.pUserCallback = m_pSystemUserCallback;
-
-    if (sInCmdLine)
-    {
-        azstrncpy(sip.szSystemCmdLine, AZ_COMMAND_LINE_LEN, sInCmdLine, AZ_COMMAND_LINE_LEN);
-        if (strstr(sInCmdLine, "-export") || strstr(sInCmdLine, "/export") || strstr(sInCmdLine, "-autotest_mode"))
-        {
-            sip.bUnattendedMode = true;
-        }
-    }
-
-    if (sip.bUnattendedMode)
-    {
-        m_modalWindowDismisser = AZStd::make_unique<ModalWindowDismisser>();
-    }
-
-    AssetProcessConnectionStatus apConnectionStatus;
-
-    m_pISystem = pfnCreateSystemInterface(sip);
-
-    if (!gEnv)
-    {
-        gEnv = m_pISystem->GetGlobalEnvironment();
-    }
-
-    if (!m_pISystem)
-    {
-        AZStd::string errorMessage = "Could not initialize CSystem.  View the logs for more details.";
-
-        gEnv = nullptr;
-        Error("CreateSystemInterface Failed");
-        return AZ::Failure(errorMessage);
-    }
-
-    if (apConnectionStatus.CheckNegotiationFailed())
-    {
-        auto errorMessage = AZStd::string::format("Negotiation with Asset Processor failed.\n"
-            "Please ensure the Asset Processor is running on the same branch and try again.");
-        gEnv = nullptr;
-        return AZ::Failure(errorMessage);
-    }
-
-    if (apConnectionStatus.CheckConnectionFailed())
-    {
-        AzFramework::AssetSystem::ConnectionSettings connectionSettings;
-        AzFramework::AssetSystem::ReadConnectionSettingsFromSettingsRegistry(connectionSettings);
-        auto errorMessage = AZStd::string::format("Unable to connect to the local Asset Processor.\n\n"
-                                                  "The Asset Processor is either not running locally or not accepting connections on port %hu. "
-                                                  "Check your remote_port settings in bootstrap.cfg or view the Asset Processor's \"Logs\" tab "
-                                                  "for any errors.", connectionSettings.m_assetProcessorPort);
-        gEnv = nullptr;
-        return AZ::Failure(errorMessage);
-    }
-
-    SetEditorCoreEnvironment(gEnv);
-
-    if (gEnv && gEnv->pMovieSystem)
-    {
-        gEnv->pMovieSystem->EnablePhysicsEvents(m_bSimulationMode);
-    }
-
-    CLogFile::AboutSystem();
-    REGISTER_CVAR(ed_killmemory_size, -1, VF_DUMPTODISK, "Sets the testing allocation size. -1 for random");
-    REGISTER_CVAR(ed_indexfiles, 1, VF_DUMPTODISK, "Index game resource files, 0 - inactive, 1 - active");
-    REGISTER_COMMAND("ed_killmemory", KillMemory, VF_NULL, "");
-    REGISTER_COMMAND("ed_goto", CmdGotoEditor, VF_CHEAT, "Internal command, used by the 'GOTO' console command\n");
-
-    // The editor needs to handle the quit command differently
-    gEnv->pConsole->RemoveCommand("quit");
-    REGISTER_COMMAND("quit", CGameEngine::HandleQuitRequest, VF_RESTRICTEDMODE, "Quit/Shutdown the engine");
-
-    EBUS_EVENT(CrySystemEventBus, OnCryEditorInitialized);
-    
-    return AZ::Success();
-}
-
-bool CGameEngine::InitGame(const char*)
-{
-    m_pISystem->ExecuteCommandLine();
-
-    return true;
-}
-
-void CGameEngine::SetLevelPath(const QString& path)
-{
-    QByteArray levelPath;
-    levelPath.reserve(AZ_MAX_PATH_LEN);
-    levelPath = Path::ToUnixPath(Path::RemoveBackslash(path)).toUtf8();
-    m_levelPath = levelPath;
-
-    m_levelName = m_levelPath.mid(m_levelPath.lastIndexOf('/') + 1);
-
-    const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
-    const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-
-    // Store off if 
-    if (QFileInfo(path + oldExtension).exists())
-    {
-        m_levelExtension = oldExtension;
-    }
-    else
-    {
-        m_levelExtension = defaultExtension;
-    }
-}
-
-bool CGameEngine::LoadLevel(
-    [[maybe_unused]] bool bDeleteAIGraph,
-    bool bReleaseResources)
-{
-    LOADING_TIME_PROFILE_SECTION(GetIEditor()->GetSystem());
-    m_bLevelLoaded = false;
-    CLogFile::FormatLine("Loading map '%s' into engine...", m_levelPath.toUtf8().data());
-    // Switch the current directory back to the Primary CD folder first.
-    // The engine might have trouble to find some files when the current
-    // directory is wrong
-    QDir::setCurrent(GetIEditor()->GetPrimaryCDFolder());
-
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    if (!usePrefabSystemForLevels)
-    {
-        QString pakFile = m_levelPath + "/level.pak";
-
-        // Open Pak file for this level.
-        if (!m_pISystem->GetIPak()->OpenPack(m_levelPath.toUtf8().data(), pakFile.toUtf8().data()))
-        {
-            CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "Level Pack File %s Not Found", pakFile.toUtf8().data());
-        }
-    }
-
-    // Initialize physics grid.
-    if (bReleaseResources)
-    {
-        AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-        AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-        int physicsEntityGridSize = static_cast<int>(terrainAabb.GetXExtent());
-
-        //CryPhysics under performs if physicsEntityGridSize < nTerrainSize.
-        if (physicsEntityGridSize <= 0)
-        {
-            ICVar* pCvar = m_pISystem->GetIConsole()->GetCVar("e_PhysEntityGridSizeDefault");
-            physicsEntityGridSize = pCvar ? pCvar->GetIVal() : 4096;
-        }
-
-    }
-
-    // Audio: notify audio of level loading start?
-    GetIEditor()->GetObjectManager()->SendEvent(EVENT_REFRESH);
-
-    m_bLevelLoaded = true;
-
-    return true;
-}
-
-bool CGameEngine::ReloadLevel()
-{
-    if (!LoadLevel(false, false))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void CGameEngine::SwitchToInGame()
-{
-    auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
-    if (streamer)
-    {
-        AZStd::binary_semaphore wait;
-        AZ::IO::FileRequestPtr flush = streamer->FlushCaches();
-        streamer->SetRequestCompleteCallback(flush, [&wait](AZ::IO::FileRequestHandle) { wait.release(); });
-        streamer->QueueRequest(flush);
-        wait.acquire();
-    }
-    
-    GetIEditor()->Notify(eNotify_OnBeginGameMode);
-
-    m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(true);
-    m_bInGameMode = true;
-
-    gEnv->pSystem->GetViewCamera().SetMatrix(m_playerViewTM);
-
-    // Disable accelerators.
-    GetIEditor()->EnableAcceleratos(false);
-    //! Send event to switch into game.
-    GetIEditor()->GetObjectManager()->SendEvent(EVENT_INGAME);
-
-    m_pISystem->GetIMovieSystem()->Reset(true, false);
-
-    // Transition to runtime entity context.
-    EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, StartPlayInEditor);
-
-    if (!CCryEditApp::instance()->IsInAutotestMode())
-    {
-        // Constrain and hide the system cursor (important to do this last)
-        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-                                                    &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-                                                    AzFramework::SystemCursorState::ConstrainedAndHidden);
-    }
-
-    Log("Entered game mode");
-}
-
-void CGameEngine::SwitchToInEditor()
-{
-    // Transition to editor entity context.
-    EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, StopPlayInEditor);
-
-    // Reset movie system
-    for (int i = m_pISystem->GetIMovieSystem()->GetNumPlayingSequences(); --i >= 0;)
-    {
-        m_pISystem->GetIMovieSystem()->GetPlayingSequence(i)->Deactivate();
-    }
-    m_pISystem->GetIMovieSystem()->Reset(false, false);
-
-    CViewport* pGameViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-
-    m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(m_bSimulationMode);
-
-    // Enable accelerators.
-    GetIEditor()->EnableAcceleratos(true);
-
-
-    // reset UI system
-    if (gEnv->pLyShine)
-    {
-        gEnv->pLyShine->Reset();
-    }
-
-    // [Anton] - order changed, see comments for CGameEngine::SetSimulationMode
-    //! Send event to switch out of game.
-    GetIEditor()->GetObjectManager()->SendEvent(EVENT_OUTOFGAME);
-
-    m_bInGameMode = false;
-
-    // save the current gameView matrix for editor
-    if (pGameViewport)
-    {
-        Matrix34 gameView = gEnv->pSystem->GetViewCamera().GetMatrix();
-        pGameViewport->SetGameTM(gameView);
-    }
-
-    // Out of game in Editor mode.
-    if (pGameViewport)
-    {
-        pGameViewport->SetViewTM(m_playerViewTM);
-    }
-
-
-    GetIEditor()->Notify(eNotify_OnEndGameMode);
-
-    // Unconstrain the system cursor and make it visible (important to do this last)
-    AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-                                                    &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-                                                    AzFramework::SystemCursorState::UnconstrainedAndVisible);
-
-    Log("Exited game mode");
-}
-
-void CGameEngine::HandleQuitRequest(IConsoleCmdArgs* /*args*/)
-{
-    if (GetIEditor()->GetGameEngine()->IsInGameMode())
-    {
-        GetIEditor()->GetGameEngine()->RequestSetGameMode(false);
-        gEnv->pConsole->ShowConsole(false);
-    }
-    else
-    {
-        MainWindow::instance()->GetActionManager()->GetAction(ID_APP_EXIT)->trigger();
-    }
-}
-
-void CGameEngine::RequestSetGameMode(bool inGame)
-{
-    m_ePendingGameMode = inGame ? ePGM_SwitchToInGame : ePGM_SwitchToInEditor;
-
-    if (m_ePendingGameMode == ePGM_SwitchToInGame)
-    {
-        AzToolsFramework::EditorLegacyGameModeNotificationBus::Broadcast(
-            &AzToolsFramework::EditorLegacyGameModeNotificationBus::Events::OnStartGameModeRequest);
-    }
-    else if (m_ePendingGameMode == ePGM_SwitchToInEditor)
-    {
-        AzToolsFramework::EditorLegacyGameModeNotificationBus::Broadcast(
-            &AzToolsFramework::EditorLegacyGameModeNotificationBus::Events::OnStopGameModeRequest);
-    }
-}
-
-void CGameEngine::SetGameMode(bool bInGame)
-{
-    if (m_bInGameMode == bInGame)
-    {
-        return;
-    }
-
-    if (!GetIEditor()->GetDocument())
-    {
-        return;
-    }
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_GAME_MODE_SWITCH_START, bInGame, 0);
-
-    // Enables engine to know about that.
-    gEnv->SetIsEditorGameMode(bInGame);
-
-    // Ignore updates while changing in and out of game mode
-    m_bIgnoreUpdates = true;
-
-    // Switching modes will destroy the current AzFramework::EntityConext which may contain
-    // data the queued events hold on to, so execute all queued events before switching.
-    ExecuteQueuedEvents();
-
-    if (bInGame)
-    {
-        SwitchToInGame();
-    }
-    else
-    {
-        SwitchToInEditor();
-    }
-
-    GetIEditor()->GetObjectManager()->SendEvent(EVENT_PHYSICS_APPLYSTATE);
-
-    // Enables engine to know about that.
-    if (MainWindow::instance())
-    {
-        AzFramework::InputChannelRequestBus::Broadcast(&AzFramework::InputChannelRequests::ResetState);
-        MainWindow::instance()->setFocus();
-    }
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_GAME_MODE_CHANGED, bInGame, 0);
-
-    m_bIgnoreUpdates = false;
-
-    GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_GAME_MODE_SWITCH_END, bInGame, 0);
-}
-
-void CGameEngine::SetSimulationMode(bool enabled, bool bOnlyPhysics)
-{
-    if (m_bSimulationMode == enabled)
-    {
-        return;
-    }
-
-    m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(enabled);
-
-    if (enabled)
-    {
-        GetIEditor()->Notify(eNotify_OnBeginSimulationMode);
-    }
-    else
-    {
-        GetIEditor()->Notify(eNotify_OnEndSimulationMode);
-    }
-
-    m_bSimulationMode = enabled;
-
-    // Enables engine to know about simulation mode.
-    gEnv->SetIsEditorSimulationMode(enabled);
-
-    if (m_bSimulationMode)
-    {
-        // [Anton] the order of the next 3 calls changed, since, EVENT_INGAME loads physics state (if any),
-        // and Reset should be called before it
-        GetIEditor()->GetObjectManager()->SendEvent(EVENT_INGAME);
-    }
-    else
-    {
-        GetIEditor()->GetObjectManager()->SendEvent(EVENT_OUTOFGAME);
-    }
-
-    GetIEditor()->GetObjectManager()->SendEvent(EVENT_PHYSICS_APPLYSTATE);
-
-    // Execute all queued events before switching modes.
-    ExecuteQueuedEvents();
-
-    // Transition back to editor entity context.
-    // Symmetry is not critical. It's okay to call this even if we never called StartPlayInEditor
-    // (bOnlyPhysics was true when we entered simulation mode).
-    AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::StopPlayInEditor);
-
-    if (m_bSimulationMode && !bOnlyPhysics)
-    {
-        // Transition to runtime entity context.
-        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::StartPlayInEditor);
-    }
-
-    AzFramework::InputChannelRequestBus::Broadcast(&AzFramework::InputChannelRequests::ResetState);
-}
-
-void CGameEngine::SetPlayerViewMatrix(const Matrix34& tm, [[maybe_unused]] bool bEyePos)
-{
-    m_playerViewTM = tm;
-}
-
-void CGameEngine::SyncPlayerPosition(bool bEnable)
-{
-    m_bSyncPlayerPosition = bEnable;
-
-    if (m_bSyncPlayerPosition)
-    {
-        SetPlayerViewMatrix(m_playerViewTM);
-    }
-}
-
-void CGameEngine::SetCurrentMOD(const char* sMod)
-{
-    m_MOD = sMod;
-}
-
-QString CGameEngine::GetCurrentMOD() const
-{
-    return m_MOD;
-}
-
-void CGameEngine::Update()
-{
-    if (m_bIgnoreUpdates)
-    {
-        return;
-    }
-
-    switch (m_ePendingGameMode)
-    {
-    case ePGM_SwitchToInGame:
-    {
-        SetGameMode(true);
-        m_ePendingGameMode = ePGM_NotPending;
-        break;
-    }
-
-    case ePGM_SwitchToInEditor:
-    {
-        bool wasInSimulationMode = GetIEditor()->GetGameEngine()->GetSimulationMode();
-        if (wasInSimulationMode)
-        {
-            GetIEditor()->GetGameEngine()->SetSimulationMode(false);
-        }
-        SetGameMode(false);
-        if (wasInSimulationMode)
-        {
-            GetIEditor()->GetGameEngine()->SetSimulationMode(true);
-        }
-        m_ePendingGameMode = ePGM_NotPending;
-        break;
-    }
-    }
-
-    AZ::ComponentApplication* componentApplication = nullptr;
-    EBUS_EVENT_RESULT(componentApplication, AZ::ComponentApplicationBus, GetApplication);
-
-    if (m_bInGameMode)
-    {
-        if (gEnv->pSystem)
-        {
-            gEnv->pSystem->UpdatePreTickBus();
-            componentApplication->Tick(gEnv->pTimer->GetFrameTime(ITimer::ETIMER_GAME));
-            gEnv->pSystem->UpdatePostTickBus();
-        }
-
-        if (CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport())
-        {
-            pRenderViewport->Update();
-        }
-    }
-    else
-    {
-        // [marco] check current sound and vis areas for music etc.
-        // but if in game mode, 'cos is already done in the above call to game->update()
-        unsigned int updateFlags = ESYSUPDATE_EDITOR;
-        GetIEditor()->GetAnimation()->Update();
-        GetIEditor()->GetSystem()->UpdatePreTickBus(updateFlags);
-        componentApplication->Tick(gEnv->pTimer->GetFrameTime(ITimer::ETIMER_GAME));
-        GetIEditor()->GetSystem()->UpdatePostTickBus(updateFlags);
-    }
-}
-
-void CGameEngine::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnSplashScreenDestroyed:
-    {
-        if (m_pSystemUserCallback != NULL)
-        {
-            m_pSystemUserCallback->OnSplashScreenDone();
-        }
-    }
-    break;
-    }
-}
-
-void CGameEngine::OnTerrainModified(const Vec2& modPosition, float modAreaRadius, bool fullTerrain)
-{
-    INavigationSystem* pNavigationSystem = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-
-    if (pNavigationSystem)
-    {
-        // Only report local modifications, not a change in the full terrain (probably happening during initialization)
-        if (fullTerrain == false)
-        {
-            const Vec2 offset(modAreaRadius * 1.5f, modAreaRadius * 1.5f);
-            AABB updateBox;
-            updateBox.min = modPosition - offset;
-            updateBox.max = modPosition + offset;
-            AzFramework::Terrain::TerrainDataRequests* terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-            AZ_Assert(terrain != nullptr, "Expecting a valid terrain handler when the terrain is modified");
-            const float terrainHeight1 = terrain->GetHeightFromFloats(updateBox.min.x, updateBox.min.y);
-            const float terrainHeight2 = terrain->GetHeightFromFloats(updateBox.max.x, updateBox.max.y);
-            const float terrainHeight3 = terrain->GetHeightFromFloats(modPosition.x, modPosition.y);
-
-            updateBox.min.z = min(terrainHeight1, min(terrainHeight2, terrainHeight3)) - (modAreaRadius * 2.0f);
-            updateBox.max.z = max(terrainHeight1, max(terrainHeight2, terrainHeight3)) + (modAreaRadius * 2.0f);
-            pNavigationSystem->WorldChanged(updateBox);
-        }
-    }
-}
-
-void CGameEngine::OnAreaModified(const AABB& modifiedArea)
-{
-    INavigationSystem* pNavigationSystem = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-    if (pNavigationSystem)
-    {
-        pNavigationSystem->WorldChanged(modifiedArea);
-    }
-}
-
-void CGameEngine::ExecuteQueuedEvents()
-{
-    AZ::Data::AssetBus::ExecuteQueuedEvents();
-    AZ::TickBus::ExecuteQueuedEvents();
-    AZ::MainThreadRenderRequestBus::ExecuteQueuedEvents();
-}
-
-#include <moc_GameEngine.cpp>
diff --git a/Code/Sandbox/Editor/GameEngine.h b/Code/Sandbox/Editor/GameEngine.h
deleted file mode 100644
index 0321889627..0000000000
--- a/Code/Sandbox/Editor/GameEngine.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// 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
-
-class CStartupLogoDialog;
-struct IInitializeUIInfo;
-
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Math/Vector3.h>
-
-class ThreadedOnErrorHandler : public QObject
-{
-    Q_OBJECT
-public:
-    explicit ThreadedOnErrorHandler(ISystemUserCallback* callback);
-    ~ThreadedOnErrorHandler();
-
-public slots:
-    bool OnError(const char* error);
-
-private:
-    ISystemUserCallback* m_userCallback;
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-//! This class serves as a high-level wrapper for CryEngine game.
-class SANDBOX_API CGameEngine
-    : public IEditorNotifyListener
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    CGameEngine();
-    ~CGameEngine(void);
-    //! Initialize System.
-    //! @return successful outcome if initialization succeeded. or failed outcome with error message.
-    AZ::Outcome<void, AZStd::string> Init(
-        bool bPreviewMode,
-        bool bTestMode,
-        const char* sCmdLine,
-        IInitializeUIInfo* logo,
-        HWND hwndForInputSystem);
-    //! Initialize game.
-    //! @return true if initialization succeeded, false otherwise
-    bool InitGame(const char* sGameDLL);
-    //! Load new terrain level into 3d engine.
-    //! Also load AI triangulation for this level.
-    bool LoadLevel(
-        bool bDeleteAIGraph,
-        bool bReleaseResources);
-    //!* Reload level if it was already loaded.
-    bool ReloadLevel();
-    //! Request to switch In/Out of game mode on next update.
-    //! The switch will happen when no sub systems are currently being updated.
-    //! @param inGame When true editor switch to game mode.
-    void RequestSetGameMode(bool inGame);
-    //! Switch In/Out of AI and Physics simulation mode.
-    //! @param enabled When true editor switch to simulation mode.
-    void SetSimulationMode(bool enabled, bool bOnlyPhysics = false);
-    //! Get current simulation mode.
-    bool GetSimulationMode() const { return m_bSimulationMode; };
-    //! Returns true if level is loaded.
-    bool IsLevelLoaded() const { return m_bLevelLoaded; };
-    //! Assign new level path name.
-    void SetLevelPath(const QString& path);
-    //! Return name of currently loaded level.
-    const QString& GetLevelName() const { return m_levelName; };
-    //! Return extension of currently loaded level.
-    const QString& GetLevelExtension() const { return m_levelExtension; };
-    //! Get fully specified level path.
-    const QString& GetLevelPath() const { return m_levelPath; };
-    //! Query if engine is in game mode.
-    bool IsInGameMode() const { return m_bInGameMode; };
-    //! Force level loaded variable to true.
-    void SetLevelLoaded(bool bLoaded) { m_bLevelLoaded = bLoaded; }
-    //! Force level just created variable to true.
-    void SetLevelCreated(bool bJustCreated) { m_bJustCreated = bJustCreated; }
-    //! Query ISystem interface.
-    ISystem* GetSystem() { return m_pISystem; };
-    //! Set player position in game.
-    //! @param bEyePos If set then given position is position of player eyes.
-    void SetPlayerViewMatrix(const Matrix34& tm, bool bEyePos = true);
-    //! When set, player in game will be every frame synchronized with editor camera.
-    void SyncPlayerPosition(bool bEnable);
-    bool IsSyncPlayerPosition() const { return m_bSyncPlayerPosition; };
-    //! Set game's current Mod name.
-    void SetCurrentMOD(const char* sMod);
-    //! Returns game's current Mod name.
-    QString GetCurrentMOD() const;
-    //! Called every frame.
-    void Update();
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-    void OnTerrainModified(const Vec2& modPosition, float modAreaRadius, bool fullTerrain);
-    void OnAreaModified(const AABB& modifiedArea);
-
-    void ExecuteQueuedEvents();
-
-    //! mutex used by other threads to lock up the PAK modification,
-    //! so only one thread can modify the PAK at once
-    static CryMutex& GetPakModifyMutex()
-    {
-        //! mutex used to halt copy process while the export to game
-        //! or other pak operation is done in the main thread
-        static CryMutex s_pakModifyMutex;
-        return s_pakModifyMutex;
-    }
-
-    inline HMODULE GetGameModule() const
-    {
-        return m_gameDll;
-    }
-
-private:
-    void SetGameMode(bool inGame);
-    void SwitchToInGame();
-    void SwitchToInEditor();
-    static void HandleQuitRequest(IConsoleCmdArgs*);
-
-    CLogFile m_logFile;
-    QString m_levelName;
-    QString m_levelExtension;
-    QString m_levelPath;
-    QString m_MOD;
-    bool m_bLevelLoaded;
-    bool m_bInGameMode;
-    bool m_bSimulationMode;
-    bool m_bSyncPlayerPosition;
-    bool m_bJustCreated;
-    bool m_bIgnoreUpdates;
-    ISystem* m_pISystem;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Matrix34 m_playerViewTM;
-    struct SSystemUserCallback* m_pSystemUserCallback;
-    HMODULE m_hSystemHandle;
-    HMODULE m_gameDll;
-    enum EPendingGameMode
-    {
-        ePGM_NotPending,
-        ePGM_SwitchToInGame,
-        ePGM_SwitchToInEditor,
-    };
-    EPendingGameMode m_ePendingGameMode;
-    AZStd::unique_ptr<class ModalWindowDismisser> m_modalWindowDismisser;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-
-#endif // CRYINCLUDE_EDITOR_GAMEENGINE_H
diff --git a/Code/Sandbox/Editor/GameExporter.cpp b/Code/Sandbox/Editor/GameExporter.cpp
deleted file mode 100644
index 77583246d7..0000000000
--- a/Code/Sandbox/Editor/GameExporter.cpp
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// AzCore
-#include <AzCore/IO/IStreamer.h>
-#include <AzCore/std/parallel/binary_semaphore.h>
-
-// CryCommon
-#include <CryCommon/ILevelSystem.h>
-
-// Editor
-#include "GameExporter.h"
-#include "GameEngine.h"
-#include "CryEditDoc.h"
-#include "UsedResources.h"
-#include "WaitProgress.h"
-#include "Util/CryMemFile.h"
-#include "Objects/ObjectManager.h"
-
-#include "Objects/EntityObject.h"
-
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-//////////////////////////////////////////////////////////////////////////
-#define MUSIC_LEVEL_LIBRARY_FILE "Music.xml"
-#define MATERIAL_LEVEL_LIBRARY_FILE "Materials.xml"
-#define RESOURCE_LIST_FILE "ResourceList.txt"
-#define USED_RESOURCE_LIST_FILE "UsedResourceList.txt"
-#define SHADER_LIST_FILE "ShadersList.txt"
-
-#define GetAValue(rgb)      ((BYTE)((rgb) >> 24))
-
-//////////////////////////////////////////////////////////////////////////
-// SGameExporterSettings
-//////////////////////////////////////////////////////////////////////////
-SGameExporterSettings::SGameExporterSettings()
-    : iExportTexWidth(4096)
-    , nApplySS(1)
-{
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void SGameExporterSettings::SetLowQuality()
-{
-    iExportTexWidth = 4096;
-    nApplySS = 0;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void SGameExporterSettings::SetHiQuality()
-{
-    iExportTexWidth = 16384;
-    nApplySS = 1;
-}
-
-CGameExporter* CGameExporter::m_pCurrentExporter = NULL;
-
-//////////////////////////////////////////////////////////////////////////
-// CGameExporter
-//////////////////////////////////////////////////////////////////////////
-CGameExporter::CGameExporter()
-    : m_bAutoExportMode(false)
-{
-    m_pCurrentExporter = this;
-}
-
-CGameExporter::~CGameExporter()
-{
-    m_pCurrentExporter = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportEndian, const char* subdirectory)
-{
-    CAutoDocNotReady autoDocNotReady;
-    CObjectManagerLevelIsExporting levelIsExportingFlag;
-    QWaitCursor waitCursor;
-
-    IEditor* pEditor = GetIEditor();
-    CGameEngine* pGameEngine = pEditor->GetGameEngine();
-    if (pGameEngine->GetLevelPath().isEmpty())
-    {
-        return false;
-    }
-
-    bool exportSuccessful = true;
-
-    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorBeginLevelExport);
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-
-    if (usePrefabSystemForLevels)
-    {
-        // Level.pak and all the data contained within it is unused when using the prefab system for levels, so there's nothing
-        // to do here.
-
-        CCryEditDoc* pDocument = pEditor->GetDocument();
-        pDocument->SetLevelExported(true);
-    }
-    else
-    {
-        QDir::setCurrent(pEditor->GetPrimaryCDFolder());
-
-        QString sLevelPath = Path::AddSlash(pGameEngine->GetLevelPath());
-        if (subdirectory && subdirectory[0] && strcmp(subdirectory, ".") != 0)
-        {
-            sLevelPath = Path::AddSlash(sLevelPath + subdirectory);
-            QDir().mkpath(sLevelPath);
-        }
-
-        m_levelPak.m_sPath = QString(sLevelPath) + GetLevelPakFilename();
-
-        m_levelPath = Path::RemoveBackslash(sLevelPath);
-        QString rootLevelPath = Path::AddSlash(pGameEngine->GetLevelPath());
-
-        CCryEditDoc* pDocument = pEditor->GetDocument();
-
-        if (flags & eExp_Fast)
-        {
-            m_settings.SetLowQuality();
-        }
-        else if (m_bAutoExportMode)
-        {
-            m_settings.SetHiQuality();
-        }
-
-        CryAutoLock<CryMutex> autoLock(CGameEngine::GetPakModifyMutex());
-
-        // Close this pak file.
-        if (!CloseLevelPack(m_levelPak, true))
-        {
-            Error("Cannot close Pak file " + m_levelPak.m_sPath);
-            exportSuccessful = false;
-        }
-
-        if (exportSuccessful)
-        {
-            if (m_bAutoExportMode)
-            {
-                // Remove read-only flags.
-                CrySetFileAttributes(m_levelPak.m_sPath.toUtf8().data(), FILE_ATTRIBUTE_NORMAL);
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        if (exportSuccessful)
-        {
-            if (!CFileUtil::OverwriteFile(m_levelPak.m_sPath))
-            {
-                Error("Cannot overwrite Pak file " + m_levelPak.m_sPath);
-                exportSuccessful = false;
-            }
-        }
-
-        if (exportSuccessful)
-        {
-            if (!OpenLevelPack(m_levelPak, false))
-            {
-                Error("Cannot open Pak file " + m_levelPak.m_sPath + " for writing.");
-                exportSuccessful = false;
-            }
-        }
-
-        ////////////////////////////////////////////////////////////////////////
-        // Export all data to the game
-        ////////////////////////////////////////////////////////////////////////
-        if (exportSuccessful)
-        {
-            ////////////////////////////////////////////////////////////////////////
-            // Exporting map setttings
-            ////////////////////////////////////////////////////////////////////////
-            ExportOcclusionMesh(sLevelPath.toUtf8().data());
-
-            //! Export Level data.
-            CLogFile::WriteLine("Exporting LevelData.xml");
-            ExportLevelData(sLevelPath);
-            CLogFile::WriteLine("Exporting LevelData.xml done.");
-
-            ExportLevelInfo(sLevelPath);
-
-            ExportLevelResourceList(sLevelPath);
-            ExportLevelUsedResourceList(sLevelPath);
-
-            //////////////////////////////////////////////////////////////////////////
-            // End Exporting Game data.
-            //////////////////////////////////////////////////////////////////////////
-
-            // Close all packs.
-            CloseLevelPack(m_levelPak, false);
-            //  m_texturePakFile.Close();
-
-            pEditor->SetStatusText(QObject::tr("Ready"));
-
-            // Reopen this pak file.
-            if (!OpenLevelPack(m_levelPak, true))
-            {
-                Error("Cannot open Pak file " + m_levelPak.m_sPath);
-                exportSuccessful = false;
-            }
-        }
-
-        if (exportSuccessful)
-        {
-            // Commit changes to the disk.
-            _flushall();
-
-            // finally create filelist.xml
-            QString levelName = Path::GetFileName(pGameEngine->GetLevelPath());
-            ExportFileList(sLevelPath, levelName);
-
-            pDocument->SetLevelExported(true);
-        }
-    }
-
-    // Always notify that we've finished exporting, whether it was successful or not.
-    CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorEndLevelExport, exportSuccessful);
-
-    if (exportSuccessful)
-    {
-        // Notify the level system that there's a new level, so that the level info is populated.
-        gEnv->pSystem->GetILevelSystem()->Rescan(ILevelSystem::GetLevelsDirectoryName());
-
-        CLogFile::WriteLine("Exporting was successful.");
-    }
-
-    return exportSuccessful;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameExporter::ExportOcclusionMesh(const char* pszGamePath)
-{
-    IEditor* pEditor = GetIEditor();
-    pEditor->SetStatusText(QObject::tr("including Occluder Mesh \"occluder.ocm\" if available"));
-
-    char resolvedLevelPath[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(pszGamePath, resolvedLevelPath, AZ_MAX_PATH_LEN);
-    QString levelDataFile = QString(resolvedLevelPath) + "occluder.ocm";
-    QFile FileIn(levelDataFile);
-    if (FileIn.open(QFile::ReadOnly))
-    {
-        CMemoryBlock Temp;
-        const size_t Size   =   FileIn.size();
-        Temp.Allocate(Size);
-        FileIn.read(reinterpret_cast<char*>(Temp.GetBuffer()), Size);
-        FileIn.close();
-        CCryMemFile FileOut;
-        FileOut.Write(Temp.GetBuffer(), Size);
-        m_levelPak.m_pakFile.UpdateFile(levelDataFile.toUtf8().data(), FileOut);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameExporter::ExportLevelData(const QString& path, bool /*bExportMission*/)
-{
-    IEditor* pEditor = GetIEditor();
-    pEditor->SetStatusText(QObject::tr("Exporting LevelData.xml..."));
-
-    char versionString[256];
-    pEditor->GetFileVersion().ToString(versionString);
-
-    XmlNodeRef root = XmlHelpers::CreateXmlNode("LevelData");
-    root->setAttr("SandboxVersion", versionString);
-    XmlNodeRef rootAction = XmlHelpers::CreateXmlNode("LevelDataAction");
-    rootAction->setAttr("SandboxVersion", versionString);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Save Level Data XML
-    //////////////////////////////////////////////////////////////////////////
-    QString levelDataFile = path + "LevelData.xml";
-    XmlString xmlData = root->getXML();
-    CCryMemFile file;
-    file.Write(xmlData.c_str(), xmlData.length());
-    m_levelPak.m_pakFile.UpdateFile(levelDataFile.toUtf8().data(), file);
-
-    QString levelDataActionFile = path + "LevelDataAction.xml";
-    XmlString xmlDataAction = rootAction->getXML();
-    CCryMemFile fileAction;
-    fileAction.Write(xmlDataAction.c_str(), xmlDataAction.length());
-    m_levelPak.m_pakFile.UpdateFile(levelDataActionFile.toUtf8().data(), fileAction);
-
-    AZStd::vector<char> entitySaveBuffer;
-    AZ::IO::ByteContainerStream<AZStd::vector<char> > entitySaveStream(&entitySaveBuffer);
-    bool savedEntities = false;
-    EBUS_EVENT_RESULT(savedEntities, AzToolsFramework::EditorEntityContextRequestBus, SaveToStreamForGame, entitySaveStream, AZ::DataStream::ST_BINARY);
-    if (savedEntities)
-    {
-        QString entitiesFile;
-        entitiesFile = QStringLiteral("%1%2.entities_xml").arg(path, "Mission0");
-        m_levelPak.m_pakFile.UpdateFile(entitiesFile.toUtf8().data(), entitySaveBuffer.begin(), entitySaveBuffer.size());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameExporter::ExportLevelInfo(const QString& path)
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Export short level info xml.
-    //////////////////////////////////////////////////////////////////////////
-    IEditor* pEditor = GetIEditor();
-    XmlNodeRef root = XmlHelpers::CreateXmlNode("LevelInfo");
-    char versionString[256];
-    pEditor->GetFileVersion().ToString(versionString);
-    root->setAttr("SandboxVersion", versionString);
-
-    QString levelName = pEditor->GetGameEngine()->GetLevelPath();
-    root->setAttr("Name", levelName.toUtf8().data());
-    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-    const AZ::Aabb terrainAabb = terrain ? terrain->GetTerrainAabb() : AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-    const AZ::Vector2 terrainGridResolution = terrain ? terrain->GetTerrainGridResolution() : AZ::Vector2::CreateOne();
-    const int compiledHeightmapSize = static_cast<int>(terrainAabb.GetXExtent() / terrainGridResolution.GetX());
-    root->setAttr("HeightmapSize", compiledHeightmapSize);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Save LevelInfo file.
-    //////////////////////////////////////////////////////////////////////////
-    QString filename = path + "LevelInfo.xml";
-    XmlString xmlData = root->getXML();
-
-    CCryMemFile file;
-    file.Write(xmlData.c_str(), xmlData.length());
-    m_levelPak.m_pakFile.UpdateFile(filename.toUtf8().data(), file);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameExporter::ExportLevelResourceList(const QString& path)
-{
-    auto pResList = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level);
-
-    // Write resource list to file.
-    CCryMemFile memFile;
-    for (const char* filename = pResList->GetFirst(); filename; filename = pResList->GetNext())
-    {
-        memFile.Write(filename, strlen(filename));
-        memFile.Write("\n", 1);
-    }
-
-    QString resFile = Path::Make(path, RESOURCE_LIST_FILE);
-
-    m_levelPak.m_pakFile.UpdateFile(resFile.toUtf8().data(), memFile, true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameExporter::ExportLevelUsedResourceList(const QString& path)
-{
-    // Write used resource list to file.
-    CCryMemFile memFile;
-
-    CUsedResources resources;
-    GetIEditor()->GetObjectManager()->GatherUsedResources(resources);
-
-    for (CUsedResources::TResourceFiles::const_iterator it = resources.files.begin(); it != resources.files.end(); it++)
-    {
-        QString filePath = Path::MakeGamePath(*it).toLower();
-
-        memFile.Write(filePath.toUtf8().data(), filePath.toUtf8().length());
-        memFile.Write("\n", 1);
-    }
-
-    QString resFile = Path::Make(path, USED_RESOURCE_LIST_FILE);
-
-    m_levelPak.m_pakFile.UpdateFile(resFile.toUtf8().data(), memFile, true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameExporter::ExportFileList(const QString& path, const QString& levelName)
-{
-    // process the folder of the specified map name, producing a filelist.xml file
-    //  that can later be used for map downloads
-    string newpath;
-
-    QString filename = levelName;
-    string mapname = (filename + ".dds").toUtf8().data();
-    string metaname = (filename + ".xml").toUtf8().data();
-
-    XmlNodeRef rootNode = gEnv->pSystem->CreateXmlNode("download");
-    rootNode->setAttr("name", filename.toUtf8().data());
-    rootNode->setAttr("type", "Map");
-    XmlNodeRef indexNode = rootNode->newChild("index");
-    if (indexNode)
-    {
-        indexNode->setAttr("src", "filelist.xml");
-        indexNode->setAttr("dest", "filelist.xml");
-    }
-    XmlNodeRef filesNode = rootNode->newChild("files");
-    if (filesNode)
-    {
-        newpath = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
-        newpath += "/*";
-        AZ::IO::ArchiveFileIterator handle = gEnv->pCryPak->FindFirst(newpath.c_str());
-        if (!handle)
-        {
-            return;
-        }
-        do
-        {
-            // ignore "." and ".."
-            if (handle.m_filename.front() == '.')
-            {
-                continue;
-            }
-            // do we need any files from sub directories?
-            if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-            {
-                continue;
-            }
-
-            // only need the following files for multiplayer downloads
-            if (!_stricmp(handle.m_filename.data(), GetLevelPakFilename())
-                || !_stricmp(handle.m_filename.data(), mapname.c_str())
-                || !_stricmp(handle.m_filename.data(), metaname.c_str()))
-            {
-                XmlNodeRef newFileNode = filesNode->newChild("file");
-                if (newFileNode)
-                {
-                    // TEMP: this is just for testing. src probably needs to be blank.
-                    //      string src = "http://server41/updater/";
-                    //      src += m_levelName;
-                    //      src += "/";
-                    //      src += fileinfo.name;
-                    newFileNode->setAttr("src", handle.m_filename.data());
-                    newFileNode->setAttr("dest", handle.m_filename.data());
-                    newFileNode->setAttr("size", handle.m_fileDesc.nSize);
-
-                    unsigned char md5[16];
-                    string filenameToHash = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
-                    filenameToHash += "/";
-                    filenameToHash += string{ handle.m_filename.data(), handle.m_filename.size() };
-                    if (gEnv->pCryPak->ComputeMD5(filenameToHash.data(), md5))
-                    {
-                        char md5string[33];
-                        sprintf_s(md5string, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-                            md5[0], md5[1], md5[2], md5[3],
-                            md5[4], md5[5], md5[6], md5[7],
-                            md5[8], md5[9], md5[10], md5[11],
-                            md5[12], md5[13], md5[14], md5[15]);
-                        newFileNode->setAttr("md5", md5string);
-                    }
-                    else
-                    {
-                        newFileNode->setAttr("md5", "");
-                    }
-                }
-            }
-        } while (handle = gEnv->pCryPak->FindNext(handle));
-
-        gEnv->pCryPak->FindClose (handle);
-    }
-
-    // save filelist.xml
-    newpath = path.toUtf8().data();
-    newpath += "/filelist.xml";
-    rootNode->saveToFile(newpath.c_str());
-}
-
-void CGameExporter::Error(const QString& error)
-{
-    if (m_bAutoExportMode)
-    {
-        CLogFile::WriteLine((QString("Export failed! ") + error).toUtf8().data());
-    }
-    else
-    {
-        Warning((QString("Export failed! ") + error).toUtf8().data());
-    }
-}
-
-
-bool CGameExporter::OpenLevelPack(SLevelPakHelper& lphelper, bool bCryPak)
-{
-    bool bRet = false;
-
-    assert(lphelper.m_bPakOpened == false);
-    assert(lphelper.m_bPakOpenedCryPak == false);
-
-    if (bCryPak)
-    {
-        assert(!lphelper.m_sPath.isEmpty());
-        bRet = gEnv->pCryPak->OpenPack(lphelper.m_sPath.toUtf8().data());
-        assert(bRet);
-        lphelper.m_bPakOpenedCryPak = true;
-    }
-    else
-    {
-        bRet = lphelper.m_pakFile.Open(lphelper.m_sPath.toUtf8().data());
-        assert(bRet);
-        lphelper.m_bPakOpened = true;
-    }
-    return bRet;
-}
-
-
-bool CGameExporter::CloseLevelPack(SLevelPakHelper& lphelper, bool bCryPak)
-{
-    bool bRet = false;
-
-    if (bCryPak)
-    {
-        assert(lphelper.m_bPakOpenedCryPak == true);
-        assert(!lphelper.m_sPath.isEmpty());
-        bRet = gEnv->pCryPak->ClosePack(lphelper.m_sPath.toUtf8().data());
-        assert(bRet);
-        lphelper.m_bPakOpenedCryPak = false;
-    }
-    else
-    {
-        assert(lphelper.m_bPakOpened == true);
-        lphelper.m_pakFile.Close();
-        bRet = true;
-        lphelper.m_bPakOpened = false;
-    }
-
-    assert(lphelper.m_bPakOpened == false);
-    assert(lphelper.m_bPakOpenedCryPak == false);
-    return bRet;
-}
diff --git a/Code/Sandbox/Editor/GameExporter.h b/Code/Sandbox/Editor/GameExporter.h
deleted file mode 100644
index da9d754f6f..0000000000
--- a/Code/Sandbox/Editor/GameExporter.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_GAMEEXPORTER_H
-#define CRYINCLUDE_EDITOR_GAMEEXPORTER_H
-#pragma once
-
-#include "Util/PakFile.h"
-#include "Util/Image.h"
-#include <AzFramework/API/ApplicationAPI.h>
-
-enum EGameExport
-{
-    eExp_SurfaceTexture = BIT(0),
-    eExp_CoverSurfaces  = BIT(2),
-    eExp_Fast           = BIT(3)
-};
-
-
-class CWaitProgress;
-class CUsedResources;
-
-struct SGameExporterSettings
-{
-    UINT iExportTexWidth;
-    int nApplySS;
-
-    SGameExporterSettings();
-    void SetLowQuality();
-    void SetHiQuality();
-};
-
-struct SANDBOX_API SLevelPakHelper
-{
-    SLevelPakHelper()
-        :  m_bPakOpened(false)
-        , m_bPakOpenedCryPak(true) {}
-
-    QString m_sPath;
-    CPakFile m_pakFile;
-    bool m_bPakOpened;
-    bool m_bPakOpenedCryPak;
-};
-
-
-/*! CGameExporter implements exporting of data fom Editor to Game format.
-        It will produce level.pak file in current level folder, with nececcary exported files.
- */
-class SANDBOX_API CGameExporter
-{
-public:
-    CGameExporter();
-    ~CGameExporter();
-    SGameExporterSettings& GetSettings() { return m_settings; }
-
-    // In auto exporting mode, highest possible settings will be chosen and no UI dialogs will be shown.
-    void SetAutoExportMode(bool bAuto) { m_bAutoExportMode = bAuto; }
-
-    bool Export(unsigned int flags = 0, EEndian eExportEndian = GetPlatformEndian(), const char* subdirectory = 0);
-
-    static CGameExporter* GetCurrentExporter() { return m_pCurrentExporter; }
-
-private:
-    bool OpenLevelPack(SLevelPakHelper& lphelper, bool bCryPak = false);
-    bool CloseLevelPack(SLevelPakHelper& lphelper, bool bCryPak = false);
-
-    static const char* GetLevelPakFilename()
-    {
-        bool usePrefabSystemForLevels = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(
-            usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-        if (usePrefabSystemForLevels)
-        {
-            AZ_Assert(false, "Level.pak should no longer be used when prefabs are used for levels.");
-            return "";
-        }
-
-        return "level.pak";
-    }
-
-    void ExportLevelData(const QString& path, bool bExportMission = true);
-    void ExportLevelInfo(const QString& path);
-
-    void ExportOcclusionMesh(const char* pszGamePath);
-
-    void ExportLevelResourceList(const QString& path);
-    void ExportLevelUsedResourceList(const QString& path);
-    void ExportFileList(const QString& path, const QString& levelName);
-
-    void Error(const QString& error);
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QString m_levelPath;
-    SLevelPakHelper m_levelPak;
-    SGameExporterSettings m_settings;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    bool m_bAutoExportMode;
-    int m_numExportedMaterials;
-
-    static CGameExporter* m_pCurrentExporter;
-};
-
-// Helper to setup terrain info.
-template<typename Func>
-void SetupTerrainInfo(const size_t octreeCompiledDataSize, Func&& setupTerrainFn)
-{
-    // only setup the terrain if we know space has been allocated for the octree
-    if (octreeCompiledDataSize > 0)
-    {
-        setupTerrainFn(octreeCompiledDataSize);
-    }
-}
-
-#endif // CRYINCLUDE_EDITOR_GAMEEXPORTER_H
diff --git a/Code/Sandbox/Editor/GameResourcesExporter.cpp b/Code/Sandbox/Editor/GameResourcesExporter.cpp
deleted file mode 100644
index 2d53e29548..0000000000
--- a/Code/Sandbox/Editor/GameResourcesExporter.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "GameResourcesExporter.h"
-
-// Qt
-#include <QFileDialog>
-
-// Editor
-#include "UsedResources.h"
-#include "GameEngine.h"
-#include "Include/IObjectManager.h"
-#include "WaitProgress.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// Static data.
-//////////////////////////////////////////////////////////////////////////
-CGameResourcesExporter::Files CGameResourcesExporter::m_files;
-
-//////////////////////////////////////////////////////////////////////////
-void CGameResourcesExporter::ChooseDirectoryAndSave()
-{
-    ChooseDirectory();
-    if (!m_path.isEmpty())
-    {
-        Save(m_path);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameResourcesExporter::ChooseDirectory()
-{
-    m_path = QFileDialog::getExistingDirectory(nullptr, QObject::tr("Choose Target (root/PrimaryCD) Folder"));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameResourcesExporter::GatherAllLoadedResources()
-{
-    m_files.clear();
-    m_files.reserve(100000);        // count from GetResourceList, GetFilesFromObjects ...  is unknown
-
-    auto pResList = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level);
-    {
-        for (const char* filename = pResList->GetFirst(); filename; filename = pResList->GetNext())
-        {
-            m_files.push_back(filename);
-        }
-    }
-
-    GetFilesFromObjects();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameResourcesExporter::SetUsedResources(CUsedResources& resources)
-{
-    for (CUsedResources::TResourceFiles::const_iterator it = resources.files.begin(); it != resources.files.end(); it++)
-    {
-        m_files.push_back(*it);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGameResourcesExporter::Save(const QString& outputDirectory)
-{
-    CMemoryBlock data;
-
-    int numFiles = m_files.size();
-
-    CLogFile::WriteLine("===========================================================================");
-    CLogFile::FormatLine("Exporting Level %s resources, %d files", GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().data(), numFiles);
-    CLogFile::WriteLine("===========================================================================");
-
-    // Needed files.
-    CWaitProgress wait("Exporting Resources");
-    for (int i = 0; i < numFiles; i++)
-    {
-        QString srcFilename = m_files[i];
-        if (!wait.Step((i * 100) / numFiles))
-        {
-            break;
-        }
-        wait.SetText(srcFilename.toUtf8().data());
-
-        CLogFile::WriteLine(srcFilename.toUtf8().data());
-
-        CCryFile file;
-        if (file.Open(srcFilename.toUtf8().data(), "rb"))
-        {
-            // Save this file in target folder.
-            QString trgFilename = Path::Make(outputDirectory, srcFilename);
-            int fsize = file.GetLength();
-            if (fsize > data.GetSize())
-            {
-                data.Allocate(fsize + 16);
-            }
-            // Read data.
-            file.ReadRaw(data.GetBuffer(), fsize);
-
-            // Save this data to target file.
-            QString trgFileDir = Path::GetPath(trgFilename);
-            CFileUtil::CreateDirectory(trgFileDir.toUtf8().data());
-            // Create a file.
-            FILE* trgFile = nullptr;
-            azfopen(&trgFile, trgFilename.toUtf8().data(), "wb");
-            if (trgFile)
-            {
-                // Save data to new file.
-                fwrite(data.GetBuffer(), fsize, 1, trgFile);
-                fclose(trgFile);
-            }
-        }
-    }
-    CLogFile::WriteLine("===========================================================================");
-    m_files.clear();
-}
-
-#if defined(WIN64) || defined(APPLE) || defined(AZ_PLATFORM_LINUX)
-template <class Container1, class Container2>
-void Append(Container1& a, const Container2& b)
-{
-    a.reserve (a.size() + b.size());
-    for (auto it = b.begin(); it != b.end(); ++it)
-    {
-        a.insert(a.end(), *it);
-    }
-}
-#else
-template <class Container1, class Container2>
-void Append(Container1& a, const Container2& b)
-{
-    a.insert (a.end(), b.begin(), b.end());
-}
-#endif
-//////////////////////////////////////////////////////////////////////////
-//
-// Go through all editor objects and gathers files from thier properties.
-//
-//////////////////////////////////////////////////////////////////////////
-void CGameResourcesExporter::GetFilesFromObjects()
-{
-    CUsedResources rs;
-    GetIEditor()->GetObjectManager()->GatherUsedResources(rs);
-
-    Append(m_files, rs.files);
-}
diff --git a/Code/Sandbox/Editor/GameResourcesExporter.h b/Code/Sandbox/Editor/GameResourcesExporter.h
deleted file mode 100644
index 2d6cc86a0a..0000000000
--- a/Code/Sandbox/Editor/GameResourcesExporter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_GAMERESOURCESEXPORTER_H
-#define CRYINCLUDE_EDITOR_GAMERESOURCESEXPORTER_H
-#pragma once
-
-class CUsedResources;
-class CVarBlock;
-struct IVariable;
-
-/*! Implements exporting of all loaded resources to specified directory.
- *
- */
-class CGameResourcesExporter
-{
-public:
-    void ChooseDirectoryAndSave();
-    void ChooseDirectory();
-    void Save(const QString& outputDirectory);
-
-    void GatherAllLoadedResources();
-    void SetUsedResources(CUsedResources& resources);
-
-private:
-    typedef QStringList Files;
-    static Files m_files;
-
-    QString m_path;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Functions that gather files from editor subsystems.
-    //////////////////////////////////////////////////////////////////////////
-    void GetFilesFromObjects();
-    void GetFilesFromVarBlock(CVarBlock* pVB);
-    void GetFilesFromVariable(IVariable* pVar);
-};
-
-#endif // CRYINCLUDE_EDITOR_GAMERESOURCESEXPORTER_H
-
diff --git a/Code/Sandbox/Editor/GenericSelectItemDialog.cpp b/Code/Sandbox/Editor/GenericSelectItemDialog.cpp
deleted file mode 100644
index 6b527bc81b..0000000000
--- a/Code/Sandbox/Editor/GenericSelectItemDialog.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "GenericSelectItemDialog.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_GenericSelectItemDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-// CGenericSelectItemDialog dialog
-
-CGenericSelectItemDialog::CGenericSelectItemDialog(QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , ui(new Ui::CGenericSelectItemDialog)
-    , m_initialized(false)
-{
-    m_mode = eMODE_LIST;
-    m_bSet = false;
-    m_bAllowNew = false;
-    m_bShowDesc = true;
-
-    setWindowTitle(tr("Please choose..."));
-
-    ui->setupUi(this);
-
-    connect(ui->m_listBox, &QListWidget::itemSelectionChanged, this, &CGenericSelectItemDialog::OnLbnSelchangeList);
-    connect(ui->m_listBox, &QListWidget::itemDoubleClicked, this, &CGenericSelectItemDialog::OnLbnDoubleClick);
-    connect(ui->m_tree, &QTreeWidget::itemSelectionChanged, this, &CGenericSelectItemDialog::OnTvnSelchangedTree);
-    connect(ui->m_tree, &QTreeWidget::itemDoubleClicked, this, &CGenericSelectItemDialog::OnTvnDoubleClick);
-    connect(ui->m_buttonBox, &QDialogButtonBox::accepted, this, &CGenericSelectItemDialog::accept);
-    connect(ui->m_buttonBox, &QDialogButtonBox::rejected, this, &CGenericSelectItemDialog::reject);
-    connect(ui->m_newButton, &QAbstractButton::clicked, this, &CGenericSelectItemDialog::OnBnClickedNew);
-}
-
-CGenericSelectItemDialog::~CGenericSelectItemDialog()
-{
-}
-
-// CGenericSelectItemDialog message handlers
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::OnInitDialog()
-{
-    if (m_mode == eMODE_LIST)
-    {
-        ui->m_tree->hide();
-    }
-    else
-    {
-        ui->m_listBox->hide();
-    }
-
-    ui->m_newButton->setVisible(m_bAllowNew);
-
-    ui->m_desc->setVisible(m_bShowDesc);
-
-    if (m_bSet == false)
-    {
-        GetItems(m_items);
-    }
-
-    ReloadItems();
-
-    if (m_mode == eMODE_TREE)
-    {
-        ui->m_tree->setFocus();
-    }
-    else
-    {
-        ui->m_listBox->setFocus();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::GetItems([[maybe_unused]] std::vector<SItem>& outItems)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::ReloadTree()
-{
-    ui->m_tree->clear();
-
-    QTreeWidgetItem* hSelected = nullptr;
-
-    /*
-    std::vector<CString>::const_iterator iter = m_items.begin();
-    while (iter != m_items.end())
-    {
-        const CString& itemName = *iter;
-        HTREEITEM hItem = m_tree.InsertItem(itemName, 0, 0, TVI_ROOT, TVI_SORT);
-        if (!m_preselect.IsEmpty() && m_preselect.CompareNoCase(itemName) == 0)
-        {
-            hSelected = hItem;
-        }
-        ++iter;
-    }
-    */
-
-    std::map<QString, QTreeWidgetItem*, less_qstring_icmp> items;
-
-    QRegularExpression sep(QStringLiteral("[\\/.") + m_treeSeparator + QStringLiteral("]+"));
-
-    for (SItem& item : m_items)
-    {
-        QString name = item.name;
-
-        QTreeWidgetItem* hRoot = nullptr;
-
-        QString itemName;
-
-        for (const QString& token : name.split(sep))
-        {
-            itemName += token + QStringLiteral("/");
-
-            QTreeWidgetItem* hParentItem = stl::find_in_map(items, itemName, nullptr);
-            if (!hParentItem)
-            {
-                hRoot = hRoot == nullptr ? new QTreeWidgetItem(ui->m_tree) : new QTreeWidgetItem(hRoot);
-                hRoot->setText(0, token);
-                items[itemName] = hRoot;
-            }
-            else
-            {
-                hRoot = hParentItem;
-            }
-        }
-
-        Q_ASSERT(hRoot);
-        hRoot->setData(0, Qt::UserRole, QVariant::fromValue<void*>(&item));
-
-        if (!m_preselect.isEmpty() && m_preselect.compare(name, Qt::CaseInsensitive) == 0)
-        {
-            hSelected = hRoot;
-        }
-    }
-
-    ui->m_tree->expandAll();
-
-    if (hSelected != nullptr)
-    {
-        ui->m_tree->scrollToItem(hSelected);
-        ui->m_tree->setCurrentItem(hSelected, 0);
-        OnTvnSelchangedTree();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::ReloadItems()
-{
-    m_selectedItem.clear();
-    m_selectedDesc.clear();
-    if (m_mode == eMODE_TREE)
-    {
-        ReloadTree();
-    }
-    else // eMODE_LIST
-    {
-        std::vector<SItem>::const_iterator iter = m_items.begin();
-        while (iter != m_items.end())
-        {
-            const SItem* pItem = &*iter;
-            QListWidgetItem* item = new QListWidgetItem(pItem->name, ui->m_listBox);
-            item->setData(Qt::UserRole, pItem->desc);
-            ui->m_listBox->addItem(item);
-            ++iter;
-        }
-        if (!m_preselect.isEmpty())
-        {
-            QList<QListWidgetItem*> foundItems = ui->m_listBox->findItems(m_preselect, Qt::MatchExactly);
-            if (!foundItems.isEmpty())
-            {
-                ui->m_listBox->setCurrentItem(foundItems[0]);
-                OnLbnSelchangeList();
-            }
-        }
-    }
-    ItemSelected();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::OnTvnSelchangedTree()
-{
-    QTreeWidgetItem* item = ui->m_tree->currentItem();
-    if (item)
-    {
-        SItem* pItem = reinterpret_cast<SItem*>(item->data(0, Qt::UserRole).value<void*>());
-        if (pItem)
-        {
-            m_selectedItem = pItem->name;
-            m_selectedDesc = pItem->desc;
-        }
-        else
-        {
-            m_selectedItem.clear();
-            m_selectedDesc.clear();
-        }
-
-        ItemSelected();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::OnTvnDoubleClick()
-{
-    if (m_selectedItem.isEmpty() == false)
-    {
-        accept();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CGenericSelectItemDialog::GetSelectedItem()
-{
-    return m_selectedItem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::OnLbnDoubleClick()
-{
-    if (m_selectedItem.isEmpty() == false)
-    {
-        accept();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::OnLbnSelchangeList()
-{
-    QListWidgetItem* item = ui->m_listBox->currentItem();
-    if (item == nullptr)
-    {
-        m_selectedItem.clear();
-    }
-    else
-    {
-        m_selectedItem = item->text();
-        m_selectedDesc = item->data(Qt::UserRole).toString();
-    }
-    ItemSelected();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::OnBnClickedNew()
-{
-    done(New);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGenericSelectItemDialog::ItemSelected()
-{
-    if (m_selectedItem.isEmpty())
-    {
-        ui->m_desc->setText(tr("<Nothing selected>"));
-    }
-    else
-    {
-        if (m_selectedDesc.isEmpty())
-        {
-            ui->m_desc->setText(m_selectedItem);
-        }
-        else
-        {
-            ui->m_desc->setText(m_selectedDesc);
-        }
-    }
-}
-
-void CGenericSelectItemDialog::showEvent(QShowEvent* event)
-{
-    if (!m_initialized)
-    {
-        OnInitDialog();
-        m_initialized = true;
-    }
-
-    QDialog::showEvent(event);
-}
-
-#include <moc_GenericSelectItemDialog.cpp>
diff --git a/Code/Sandbox/Editor/GenericSelectItemDialog.h b/Code/Sandbox/Editor/GenericSelectItemDialog.h
deleted file mode 100644
index aa39a4529f..0000000000
--- a/Code/Sandbox/Editor/GenericSelectItemDialog.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_GENERICSELECTITEMDIALOG_H
-#define CRYINCLUDE_EDITOR_GENERICSELECTITEMDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QScopedPointer>
-#include "Util/Variable.h"
-#endif
-
-// CGenericSelectItem dialog
-
-namespace Ui {
-    class CGenericSelectItemDialog;
-}
-
-class CGenericSelectItemDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    typedef enum
-    {
-        eMODE_LIST, eMODE_TREE
-    } TDialogMode;
-    typedef IVariable::IGetCustomItems::SItem SItem;
-
-    CGenericSelectItemDialog(QWidget* pParent = nullptr);   // standard constructor
-    virtual ~CGenericSelectItemDialog();
-
-    void ShowDescription(bool bShow)
-    {
-        m_bShowDesc = bShow;
-    }
-
-    virtual QString GetSelectedItem();
-
-    virtual void PreSelectItem(const QString& name)
-    {
-        m_preselect = name;
-    }
-
-    void SetMode(TDialogMode inMode)
-    {
-        m_mode = inMode;
-    }
-
-    void AllowNew(bool bAllow)
-    {
-        m_bAllowNew = bAllow;
-    }
-
-    void SetTreeSeparator(const QString& sep)
-    {
-        m_treeSeparator = sep;
-    }
-
-    // Override items which are otherwise fetched by GetItems
-    void SetItems(const QStringList& items)
-    {
-        m_bSet = true;
-        m_items.resize(0);
-        m_items.reserve(items.size());
-        QStringList::const_iterator iter = items.begin();
-        QStringList::const_iterator iterEnd = items.end();
-        SItem item;
-        while (iter != iterEnd)
-        {
-            item.name = item.desc = *iter;
-            m_items.push_back(item);
-            ++iter;
-        }
-    }
-
-    // Override items which are otherwise fetched by GetItems
-    void SetItems(const std::vector<QString>& items)
-    {
-        m_bSet = true;
-        m_items.resize(0);
-        m_items.reserve(items.size());
-        std::vector<QString>::const_iterator iter = items.begin();
-        std::vector<QString>::const_iterator iterEnd = items.end();
-        SItem item;
-        while (iter != iterEnd)
-        {
-            item.name = item.desc = *iter;
-            m_items.push_back(item);
-            ++iter;
-        }
-    }
-
-    // Override items which are otherwise fetched by GetItems
-    void SetItems(const std::vector<SItem>& items)
-    {
-        m_bSet = true;
-        m_items = items;
-    }
-
-    void showEvent(QShowEvent* event) override;
-
-    enum
-    {
-        New = QDialog::Accepted + 1
-    };
-
-protected:
-    // Derived Dialogs should override this
-    virtual void GetItems(std::vector<SItem>& outItems);
-
-    // Called whenever an item gets selected
-    virtual void ItemSelected();
-
-    void OnTvnSelchangedTree();
-    void OnTvnDoubleClick();
-    void OnLbnSelchangeList();
-    void OnLbnDoubleClick();
-    void OnBnClickedNew();
-    virtual void OnInitDialog();
-
-    void ReloadItems();
-    void ReloadTree();
-
-    struct less_qstring_icmp
-    {
-        bool operator()(const QString& left, const QString& right) const
-        {
-            return QString::compare(left, right, Qt::CaseInsensitive) < 0;
-        }
-    };
-
-    QString m_preselect;
-    QString m_selectedItem;
-    QString m_selectedDesc;
-    QString m_treeSeparator;
-
-    std::vector<SItem> m_items;
-    TDialogMode m_mode;
-    bool m_bSet;
-    bool m_bAllowNew;
-    bool m_bShowDesc;
-
-    QScopedPointer<Ui::CGenericSelectItemDialog> ui;
-
-private:
-    bool m_initialized;
-};
-
-#endif // CRYINCLUDE_EDITOR_GENERICSELECTITEMDIALOG_H
diff --git a/Code/Sandbox/Editor/Geometry/TriMesh.cpp b/Code/Sandbox/Editor/Geometry/TriMesh.cpp
deleted file mode 100644
index f76703bae9..0000000000
--- a/Code/Sandbox/Editor/Geometry/TriMesh.cpp
+++ /dev/null
@@ -1,711 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TriMesh.h"
-
-// Editor
-#include "Util/fastlib.h"
-#include "Objects/SubObjSelection.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-CTriMesh::CTriMesh()
-{
-    pFaces = NULL;
-    pVertices = NULL;
-    pWSVertices = NULL;
-    pUV = NULL;
-    pColors = NULL;
-    pEdges = NULL;
-    pWeights = NULL;
-
-    nFacesCount = 0;
-    nVertCount = 0;
-    nUVCount = 0;
-    nEdgeCount = 0;
-
-    selectionType = SO_ELEM_NONE;
-
-    memset(m_streamSize, 0, sizeof(m_streamSize));
-    memset(m_streamSel, 0, sizeof(m_streamSel));
-    streamSelMask = 0;
-
-    m_streamSel[VERTICES] = &vertSel;
-    m_streamSel[EDGES] = &edgeSel;
-    m_streamSel[FACES] = &faceSel;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTriMesh::~CTriMesh()
-{
-    free(pFaces);
-    free(pEdges);
-    free(pVertices);
-    free(pUV);
-    free(pColors);
-    free(pWSVertices);
-    free(pWeights);
-}
-
-// Set stream size.
-void CTriMesh::ReallocStream(int stream, int nNewCount)
-{
-    assert(stream >= 0 && stream < LAST_STREAM);
-    if (stream < 0 || stream >= LAST_STREAM)
-    {
-        return;
-    }
-    if (m_streamSize[stream] == nNewCount)
-    {
-        return; // Stream already have required size.
-    }
-    void* pStream = 0;
-    int nElementSize = 0;
-    GetStreamInfo(stream, pStream, nElementSize);
-    pStream = ReAllocElements(pStream, nNewCount, nElementSize);
-    m_streamSize[stream] = nNewCount;
-
-    switch (stream)
-    {
-    case VERTICES:
-        pVertices = (CTriVertex*)pStream;
-        nVertCount = nNewCount;
-        vertSel.resize(nNewCount);
-        break;
-    case FACES:
-        pFaces = (CTriFace*)pStream;
-        nFacesCount = nNewCount;
-        faceSel.resize(nNewCount);
-        break;
-    case EDGES:
-        pEdges = (CTriEdge*)pStream;
-        nEdgeCount = nNewCount;
-        edgeSel.resize(nNewCount);
-        break;
-    case TEXCOORDS:
-        pUV = (SMeshTexCoord*)pStream;
-        nUVCount = nNewCount;
-        break;
-    case COLORS:
-        pColors = (SMeshColor*)pStream;
-        break;
-    case WEIGHTS:
-        pWeights = (float*)pStream;
-        break;
-    case LINES:
-        pLines = (CTriLine*)pStream;
-        break;
-    case WS_POSITIONS:
-        pWSVertices = (Vec3*)pStream;
-        break;
-    default:
-        assert(0); // unknown stream.
-    }
-    m_streamSize[stream] = nNewCount;
-}
-
-// Set stream size.
-void CTriMesh::GetStreamInfo(int stream, void*& pStream, int& nElementSize) const
-{
-    assert(stream >= 0 && stream < LAST_STREAM);
-    switch (stream)
-    {
-    case VERTICES:
-        pStream = pVertices;
-        nElementSize = sizeof(CTriVertex);
-        break;
-    case FACES:
-        pStream = pFaces;
-        nElementSize = sizeof(CTriFace);
-        break;
-    case EDGES:
-        pStream = pEdges;
-        nElementSize = sizeof(CTriEdge);
-        break;
-    case TEXCOORDS:
-        pStream = pUV;
-        nElementSize = sizeof(SMeshTexCoord);
-        break;
-    case COLORS:
-        pStream = pColors;
-        nElementSize = sizeof(SMeshColor);
-        break;
-    case WEIGHTS:
-        pStream = pWeights;
-        nElementSize = sizeof(float);
-        break;
-    case LINES:
-        pStream = pLines;
-        nElementSize = sizeof(CTriLine);
-        break;
-    case WS_POSITIONS:
-        pStream = pWSVertices;
-        nElementSize = sizeof(Vec3);
-        break;
-    default:
-        assert(0); // unknown stream.
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void* CTriMesh::ReAllocElements(void* old_ptr, int new_elem_num, int size_of_element)
-{
-    return realloc(old_ptr, new_elem_num * size_of_element);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Unshare all vertices and split on 3 arrays, positions/texcoords.
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::SetFromMesh(CMesh& mesh)
-{
-    bbox = mesh.m_bbox;
-
-    int maxVerts = mesh.GetIndexCount();
-
-    SetVertexCount(maxVerts);
-    SetUVCount(maxVerts);
-    if (mesh.m_pColor0)
-    {
-        SetColorsCount(maxVerts);
-    }
-
-    SetFacesCount(mesh.GetIndexCount());
-
-    int numv = 0;
-    int numface = 0;
-    for (int nSubset = 0; nSubset < mesh.GetSubSetCount(); nSubset++)
-    {
-        SMeshSubset& subset = mesh.m_subsets[nSubset];
-        for (int i = subset.nFirstIndexId; i < subset.nFirstIndexId + subset.nNumIndices; i += 3)
-        {
-            CTriFace& face = pFaces[numface++];
-            for (int j = 0; j < 3; j++)
-            {
-                int idx = mesh.m_pIndices[i + j];
-                pVertices[numv].pos = mesh.m_pPositions ? mesh.m_pPositions[idx] : mesh.m_pPositionsF16[idx].ToVec3();
-                pWeights[numv] = 0.0f;
-                pUV[numv] = mesh.m_pTexCoord[idx];
-                if (mesh.m_pColor0)
-                {
-                    pColors[numv] = mesh.m_pColor0[idx];
-                }
-
-                face.v [j] = numv;
-                face.uv[j] = numv;
-                face.n [j] = mesh.m_pNorms[idx].GetN();
-                face.MatID = subset.nMatID;
-                face.flags = 0;
-
-                numv++;
-            }
-        }
-    }
-    SetFacesCount(numface);
-    SharePositions();
-    ShareUV();
-    UpdateEdges();
-
-    CalcFaceNormals();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-inline int FindVertexInHash(const Vec3& vPosToFind, const CTriVertex* pVectors, std::vector<int>& hash, float fEpsilon)
-{
-    for (uint32 i = 0; i < hash.size(); i++)
-    {
-        const Vec3& v0 = pVectors[hash[i]].pos;
-        const Vec3& v1 = vPosToFind;
-        if (fabsf(v0.y - v1.y) < fEpsilon &&  fabsf(v0.x - v1.x) < fEpsilon &&  fabsf(v0.z - v1.z) < fEpsilon)
-        {
-            return hash[i];
-        }
-    }
-    return -1;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-inline int FindTexCoordInHash(const SMeshTexCoord& coordToFind, const SMeshTexCoord* pCoords, std::vector<int>& hash, float fEpsilon)
-{
-    for (uint32 i = 0; i < hash.size(); i++)
-    {
-        const SMeshTexCoord& t0 = pCoords[hash[i]];
-        const SMeshTexCoord& t1 = coordToFind;
-
-        if (t0.IsEquivalent(t1, fEpsilon))
-        {
-            return hash[i];
-        }
-    }
-    return -1;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::SharePositions()
-{
-    float fEpsilon = 0.0001f;
-    float fHashScale = 256.0f / MAX(bbox.GetSize().GetLength(), fEpsilon);
-    std::vector<int> arrHashTable[256];
-
-    CTriVertex* pNewVerts = new CTriVertex[GetVertexCount()];
-    SMeshColor* pNewColors = 0;
-    if (pColors)
-    {
-        pNewColors = new SMeshColor[GetVertexCount()];
-    }
-
-    int nLastIndex = 0;
-    for (int f = 0; f < GetFacesCount(); f++)
-    {
-        CTriFace& face = pFaces[f];
-        for (int i = 0; i < 3; i++)
-        {
-            const Vec3& v = pVertices[face.v[i]].pos;
-            uint8 nHash = RoundFloatToInt((v.x + v.y + v.z) * fHashScale);
-
-            int find = FindVertexInHash(v, pNewVerts, arrHashTable[nHash], fEpsilon);
-            if (find < 0)
-            {
-                pNewVerts[nLastIndex] = pVertices[face.v[i]];
-                if (pColors)
-                {
-                    pNewColors[nLastIndex] = pColors[face.v[i]];
-                }
-                face.v[i] = nLastIndex;
-                // Reserve some space already.
-                arrHashTable[nHash].reserve(100);
-                arrHashTable[nHash].push_back(nLastIndex);
-                nLastIndex++;
-            }
-            else
-            {
-                face.v[i] = find;
-            }
-        }
-    }
-
-    SetVertexCount(nLastIndex);
-    memcpy(pVertices, pNewVerts, nLastIndex * sizeof(CTriVertex));
-    delete []pNewVerts;
-
-    if (pColors)
-    {
-        SetColorsCount(nLastIndex);
-        memcpy(pColors, pNewColors, nLastIndex * sizeof(SMeshColor));
-        delete []pNewColors;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::ShareUV()
-{
-    float fEpsilon = 0.0001f;
-    float fHashScale = 256.0f;
-    std::vector<int> arrHashTable[256];
-
-    SMeshTexCoord* pNewUV = new SMeshTexCoord[GetUVCount()];
-
-    int nLastIndex = 0;
-    for (int f = 0; f < GetFacesCount(); f++)
-    {
-        CTriFace& face = pFaces[f];
-        for (int i = 0; i < 3; i++)
-        {
-            const Vec2 uv = pUV[face.uv[i]].GetUV();
-            uint8 nHash = RoundFloatToInt((uv.x + uv.y) * fHashScale);
-
-            int find = FindTexCoordInHash(pUV[face.uv[i]], pNewUV, arrHashTable[nHash], fEpsilon);
-            if (find < 0)
-            {
-                pNewUV[nLastIndex] = pUV[face.uv[i]];
-                face.uv[i] = nLastIndex;
-                arrHashTable[nHash].reserve(100);
-                arrHashTable[nHash].push_back(nLastIndex);
-                nLastIndex++;
-            }
-            else
-            {
-                face.uv[i] = find;
-            }
-        }
-    }
-
-    SetUVCount(nLastIndex);
-    memcpy(pUV, pNewUV, nLastIndex * sizeof(SMeshTexCoord));
-    delete []pNewUV;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::CalcFaceNormals()
-{
-    for (int i = 0; i < nFacesCount; i++)
-    {
-        CTriFace& face = pFaces[i];
-        Vec3 p1 = pVertices[face.v[0]].pos;
-        Vec3 p2 = pVertices[face.v[1]].pos;
-        Vec3 p3 = pVertices[face.v[2]].pos;
-        face.normal = (p2 - p1).Cross(p3 - p1);
-        face.normal.Normalize();
-    }
-}
-
-#define TEX_EPS 0.001f
-#define VER_EPS 0.001f
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::UpdateIndexedMesh(IIndexedMesh* pIndexedMesh) const
-{
-    {
-        const int maxVerts = nFacesCount * 3;
-
-        pIndexedMesh->SetVertexCount(maxVerts);
-        pIndexedMesh->SetTexCoordCount(maxVerts);
-        if (pColors)
-        {
-            pIndexedMesh->SetColorCount(maxVerts);
-        }
-        pIndexedMesh->SetIndexCount(0);
-        pIndexedMesh->SetFaceCount(nFacesCount);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // To find really used materials
-    std::vector<int> usedMaterialIds;
-    uint16 MatIdToSubset[MAX_SUB_MATERIALS];
-    int nLastSubsetId = 0;
-    memset(MatIdToSubset, 0, sizeof(MatIdToSubset));
-    //////////////////////////////////////////////////////////////////////////
-
-    CMesh& mesh = *pIndexedMesh->GetMesh();
-    AABB bb;
-    bb.Reset();
-    for (int i = 0; i < nFacesCount; ++i)
-    {
-        const CTriFace& face = pFaces[i];
-        SMeshFace& meshFace = mesh.m_pFaces[i];
-
-        // Remap new used material ID to index of chunk id.
-        if (!MatIdToSubset[face.MatID])
-        {
-            MatIdToSubset[face.MatID] = 1 + nLastSubsetId++;
-            usedMaterialIds.push_back(face.MatID); // Order of material ids in usedMaterialIds correspond to the indices of chunks.
-        }
-        meshFace.nSubset = MatIdToSubset[face.MatID] - 1;
-
-        for (int j = 0; j < 3; ++j)
-        {
-            const int dstVIdx = i * 3 + j;
-
-            mesh.m_pPositions[dstVIdx] = pVertices[face.v[j]].pos;
-            mesh.m_pNorms[dstVIdx] = SMeshNormal(face.n[j]);
-            mesh.m_pTexCoord[dstVIdx] = pUV[face.uv[j]];
-            if (pColors)
-            {
-                mesh.m_pColor0[dstVIdx] = pColors[face.v[j]];
-            }
-
-            meshFace.v[j] = dstVIdx;
-
-            bb.Add(mesh.m_pPositions[dstVIdx]);
-        }
-    }
-
-    pIndexedMesh->SetBBox(bb);
-
-    pIndexedMesh->SetSubSetCount(usedMaterialIds.size());
-    for (int i = 0; i < usedMaterialIds.size(); i++)
-    {
-        pIndexedMesh->SetSubsetMaterialId(i, usedMaterialIds[i]);
-    }
-
-    pIndexedMesh->Optimize();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::CopyStream(CTriMesh& fromMesh, int stream)
-{
-    void* pTrgStream = 0;
-    void* pSrcStream = 0;
-    int nElemSize = 0;
-    fromMesh.GetStreamInfo(stream, pSrcStream, nElemSize);
-    if (pSrcStream)
-    {
-        ReallocStream(stream, fromMesh.GetStreamSize(stream));
-        GetStreamInfo(stream, pTrgStream, nElemSize);
-        memcpy(pTrgStream, pSrcStream, nElemSize * fromMesh.GetStreamSize(stream));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::Copy(CTriMesh& fromMesh, int nCopyFlags)
-{
-    streamSelMask = fromMesh.streamSelMask;
-
-    if (nCopyFlags & COPY_VERTICES)
-    {
-        CopyStream(fromMesh, VERTICES);
-    }
-    if (nCopyFlags & COPY_FACES)
-    {
-        CopyStream(fromMesh, FACES);
-    }
-    if (nCopyFlags & COPY_EDGES)
-    {
-        CopyStream(fromMesh, EDGES);
-    }
-    if (nCopyFlags & COPY_TEXCOORDS)
-    {
-        CopyStream(fromMesh, TEXCOORDS);
-    }
-    if (nCopyFlags & COPY_COLORS)
-    {
-        CopyStream(fromMesh, COLORS);
-    }
-    if (nCopyFlags & COPY_WEIGHTS)
-    {
-        CopyStream(fromMesh, WEIGHTS);
-    }
-    if (nCopyFlags & COPY_LINES)
-    {
-        CopyStream(fromMesh, LINES);
-    }
-
-    if (nCopyFlags & COPY_VERT_SEL)
-    {
-        vertSel = fromMesh.vertSel;
-    }
-    if (nCopyFlags & COPY_EDGE_SEL)
-    {
-        edgeSel = fromMesh.edgeSel;
-    }
-    if (nCopyFlags & COPY_FACE_SEL)
-    {
-        faceSel = fromMesh.faceSel;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::UpdateEdges()
-{
-    SetEdgeCount(GetFacesCount() * 3);
-
-    std::map<CTriEdge, int> edgemap;
-
-    int nEdges = 0;
-    for (int i = 0; i < GetFacesCount(); i++)
-    {
-        CTriFace& face = pFaces[i];
-        for (int j = 0; j < 3; j++)
-        {
-            int v0 = j;
-            int v1 = (j != 2) ? j + 1 : 0;
-            CTriEdge edge;
-            edge.flags = 0;
-
-            // First vertex index must always be smaller.
-            if (face.v[v0] < face.v[v1])
-            {
-                edge.v[0] = face.v[v0];
-                edge.v[1] = face.v[v1];
-            }
-            else
-            {
-                edge.v[0] = face.v[v1];
-                edge.v[1] = face.v[v0];
-            }
-            edge.face[0] = i;
-            edge.face[1] = -1;
-            int nedge = stl::find_in_map(edgemap, edge, -1);
-            if (nedge >= 0)
-            {
-                // Assign this face as a second member of the edge.
-                if (pEdges[nedge].face[1] < 0)
-                {
-                    pEdges[nedge].face[1] = i;
-                }
-
-                face.edge[j] = nedge;
-            }
-            else
-            {
-                edgemap[edge] = nEdges;
-                pEdges[nEdges] = edge;
-                face.edge[j] = nEdges;
-                nEdges++;
-            }
-        }
-    }
-
-    SetEdgeCount(nEdges);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::SoftSelection(const SSubObjSelOptions& options)
-{
-    int i;
-    int nVerts = GetVertexCount();
-    CTriVertex* pVerts = pVertices;
-
-    for (i = 0; i < nVerts; i++)
-    {
-        if (pWeights[i] == 1.0f)
-        {
-            const Vec3& vp = pVerts[i].pos;
-            for (int j = 0; j < nVerts; j++)
-            {
-                if (pWeights[j] != 1.0f)
-                {
-                    if (vp.IsEquivalent(pVerts[j].pos, options.fSoftSelFalloff))
-                    {
-                        float fDist = vp.GetDistance(pVerts[j].pos);
-                        if (fDist < options.fSoftSelFalloff)
-                        {
-                            float fWeight = 1.0f - (fDist / options.fSoftSelFalloff);
-                            if (fWeight > pWeights[j])
-                            {
-                                pWeights[j] = fWeight;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTriMesh::UpdateSelection()
-{
-    bool bAnySelected = false;
-    if (selectionType == SO_ELEM_VERTEX)
-    {
-        for (int i = 0; i < GetVertexCount(); i++)
-        {
-            if (vertSel[i])
-            {
-                bAnySelected = true;
-                pWeights[i] = 1.0f;
-            }
-            else
-            {
-                pWeights[i] = 0;
-            }
-        }
-    }
-    if (selectionType == SO_ELEM_EDGE)
-    {
-        // Clear weights.
-        for (int i = 0; i < GetVertexCount(); i++)
-        {
-            pWeights[i] = 0;
-        }
-
-        for (int i = 0; i < GetEdgeCount(); i++)
-        {
-            if (edgeSel[i])
-            {
-                bAnySelected = true;
-                CTriEdge& edge = pEdges[i];
-                for (int j = 0; j < 2; j++)
-                {
-                    pWeights[edge.v[j]] = 1.0f;
-                }
-            }
-        }
-    }
-    else if (selectionType == SO_ELEM_FACE)
-    {
-        // Clear weights.
-        for (int i = 0; i < GetVertexCount(); i++)
-        {
-            pWeights[i] = 0;
-        }
-
-        for (int i = 0; i < GetFacesCount(); i++)
-        {
-            if (faceSel[i])
-            {
-                bAnySelected = true;
-                CTriFace& face = pFaces[i];
-                for (int j = 0; j < 3; j++)
-                {
-                    pWeights[face.v[j]] = 1.0f;
-                }
-            }
-        }
-    }
-    return bAnySelected;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CTriMesh::ClearSelection()
-{
-    bool bWasSelected = false;
-    // Remove all selections.
-    int i;
-    for (i = 0; i < GetVertexCount(); i++)
-    {
-        pWeights[i] = 0;
-    }
-    streamSelMask = 0;
-    for (int ii = 0; ii < LAST_STREAM; ii++)
-    {
-        if (m_streamSel[ii] && !m_streamSel[ii]->is_zero())
-        {
-            bWasSelected = true;
-            m_streamSel[ii]->clear();
-        }
-    }
-    return bWasSelected;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::GetEdgesByVertex(MeshElementsArray& inVertices, MeshElementsArray& outEdges)
-{
-    // Brute force algorithm using binary search.
-    // for every edge check if edge vertex is inside inVertices array.
-    std::sort(inVertices.begin(), inVertices.end());
-    for (int i = 0; i < GetEdgeCount(); i++)
-    {
-        if (stl::binary_find(inVertices.begin(), inVertices.end(), pEdges[i].v[0]) != inVertices.end())
-        {
-            outEdges.push_back(i);
-        }
-        else if (stl::binary_find(inVertices.begin(), inVertices.end(), pEdges[i].v[1]) != inVertices.end())
-        {
-            outEdges.push_back(i);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTriMesh::GetFacesByVertex(MeshElementsArray& inVertices, MeshElementsArray& outFaces)
-{
-    // Brute force algorithm using binary search.
-    // for every face check if face vertex is inside inVertices array.
-    std::sort(inVertices.begin(), inVertices.end());
-    for (int i = 0; i < GetFacesCount(); i++)
-    {
-        if (stl::binary_find(inVertices.begin(), inVertices.end(), pFaces[i].v[0]) != inVertices.end())
-        {
-            outFaces.push_back(i);
-        }
-        else if (stl::binary_find(inVertices.begin(), inVertices.end(), pFaces[i].v[1]) != inVertices.end())
-        {
-            outFaces.push_back(i);
-        }
-        else if (stl::binary_find(inVertices.begin(), inVertices.end(), pFaces[i].v[2]) != inVertices.end())
-        {
-            outFaces.push_back(i);
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Geometry/TriMesh.h b/Code/Sandbox/Editor/Geometry/TriMesh.h
deleted file mode 100644
index 433e2fa3d7..0000000000
--- a/Code/Sandbox/Editor/Geometry/TriMesh.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_GEOMETRY_TRIMESH_H
-#define CRYINCLUDE_EDITOR_GEOMETRY_TRIMESH_H
-#pragma once
-
-#include <IIndexedMesh.h>
-#include "Util/bitarray.h"
-
-struct SSubObjSelOptions;
-
-typedef std::vector<int> MeshElementsArray;
-
-//////////////////////////////////////////////////////////////////////////
-// Vertex used in the TriMesh.
-//////////////////////////////////////////////////////////////////////////
-struct CTriVertex
-{
-    Vec3 pos;
-    //float weight;    // Selection weight in 0-1 range.
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Triangle face used by the Triangle mesh.
-//////////////////////////////////////////////////////////////////////////
-struct CTriFace
-{
-    uint32 v[3];  // Indices to vertices array.
-    uint32 uv[3]; // Indices to texture coordinates array.
-    Vec3 n[3];    // Vertex normals at face vertices.
-    Vec3 normal;  // Face normal.
-    uint32 edge[3]; // Indices to the face edges.
-    unsigned char MatID; // Index of face sub material.
-    unsigned char flags; // see ETriMeshFlags
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Mesh edge.
-//////////////////////////////////////////////////////////////////////////
-struct CTriEdge
-{
-    uint32 v[2];   // Indices to edge vertices.
-    int face[2];   // Indices to edge faces (-1 if no face).
-    uint32 flags;  // see ETriMeshFlags
-
-    CTriEdge() {}
-    bool operator==(const CTriEdge& edge) const
-    {
-        if ((v[0] == edge.v[0] && v[1] == edge.v[1]) ||
-            (v[0] == edge.v[1] && v[1] == edge.v[0]))
-        {
-            return true;
-        }
-        return false;
-    }
-    bool operator!=(const CTriEdge& edge) const { return !(*this == edge); }
-    bool operator<(const CTriEdge& edge) const { return (*(uint64*)v < *(uint64*)edge.v); }
-    bool operator>(const CTriEdge& edge) const { return (*(uint64*)v > *(uint64*)edge.v); }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Mesh line.
-//////////////////////////////////////////////////////////////////////////
-struct CTriLine
-{
-    uint32 v[2];   // Indices to edge vertices.
-
-    CTriLine() {}
-    bool operator==(const CTriLine& edge) const
-    {
-        if ((v[0] == edge.v[0] && v[1] == edge.v[1]) ||
-            (v[0] == edge.v[1] && v[1] == edge.v[0]))
-        {
-            return true;
-        }
-        return false;
-    }
-    bool operator!=(const CTriLine& edge) const { return !(*this == edge); }
-    bool operator<(const CTriLine& edge) const { return (*(uint64*)v < *(uint64*)edge.v); }
-    bool operator>(const CTriLine& edge) const { return (*(uint64*)v > *(uint64*)edge.v); }
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct CTriMeshPoly
-{
-    std::vector<uint32> v;  // Indices to vertices array.
-    std::vector<uint32> uv; // Indices to texture coordinates array.
-    std::vector<Vec3> n;    // Vertex normals at face vertices.
-    Vec3 normal;  // Polygon normal.
-    uint32 edge[3]; // Indices to the face edges.
-    unsigned char MatID; // Index of face sub material.
-    unsigned char flags; // optional flags.
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CTriMesh is used in the Editor as a general purpose editable triangle mesh.
-//////////////////////////////////////////////////////////////////////////
-class CTriMesh
-{
-public:
-    enum EStream
-    {
-        VERTICES,
-        FACES,
-        EDGES,
-        TEXCOORDS,
-        COLORS,
-        WEIGHTS,
-        LINES,
-        WS_POSITIONS,
-        LAST_STREAM,
-    };
-    enum ECopyFlags
-    {
-        COPY_VERTICES   = BIT(1),
-        COPY_FACES      = BIT(2),
-        COPY_EDGES      = BIT(3),
-        COPY_TEXCOORDS  = BIT(4),
-        COPY_COLORS     = BIT(5),
-        COPY_VERT_SEL   = BIT(6),
-        COPY_EDGE_SEL   = BIT(7),
-        COPY_FACE_SEL   = BIT(8),
-        COPY_WEIGHTS    = BIT(9),
-        COPY_LINES      = BIT(10),
-        COPY_ALL        = 0xFFFF,
-    };
-    // geometry data
-    CTriFace* pFaces;
-    CTriEdge* pEdges;
-    CTriVertex* pVertices;
-    SMeshTexCoord* pUV;
-    SMeshColor* pColors; // If allocated same size as pVerts array.
-    Vec3* pWSVertices; // World space vertices.
-    float* pWeights;
-    CTriLine* pLines;
-
-    int nFacesCount;
-    int nVertCount;
-    int nUVCount;
-    int nEdgeCount;
-    int nLinesCount;
-
-    AABB bbox;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Selections.
-    //////////////////////////////////////////////////////////////////////////
-    CBitArray vertSel;
-    CBitArray edgeSel;
-    CBitArray faceSel;
-    // Every bit of the selection mask correspond to a stream, if bit is set this stream have some elements selected
-    int streamSelMask;
-
-    // Selection element type.
-    // see ESubObjElementType
-    int selectionType;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Vertices of the front facing triangles.
-    CBitArray frontFacingVerts;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Functions.
-    //////////////////////////////////////////////////////////////////////////
-    CTriMesh();
-    ~CTriMesh();
-
-    int GetFacesCount() const { return nFacesCount; }
-    int GetVertexCount() const { return nVertCount; }
-    int GetUVCount() const { return nUVCount; }
-    int GetEdgeCount() const { return nEdgeCount; }
-    int GetLinesCount() const { return nLinesCount; }
-
-    //////////////////////////////////////////////////////////////////////////
-    void SetFacesCount(int nNewCount) { ReallocStream(FACES, nNewCount); }
-    void SetVertexCount(int nNewCount)
-    {
-        ReallocStream(VERTICES, nNewCount);
-        if (pColors)
-        {
-            ReallocStream(COLORS, nNewCount);
-        }
-        ReallocStream(WEIGHTS, nNewCount);
-    }
-    void SetColorsCount(int nNewCount) { ReallocStream(COLORS, nNewCount); }
-    void SetUVCount(int nNewCount) { ReallocStream(TEXCOORDS, nNewCount); }
-    void SetEdgeCount(int nNewCount)  { ReallocStream(EDGES, nNewCount); }
-    void SetLinesCount(int nNewCount)  { ReallocStream(LINES, nNewCount); }
-
-    void ReallocStream(int stream, int nNewCount);
-    void GetStreamInfo(int stream, void*& pStream, int& nElementSize) const;
-    int  GetStreamSize(int stream) const { return m_streamSize[stream]; };
-
-    void SetFromMesh(CMesh& mesh);
-    void UpdateIndexedMesh(IIndexedMesh* pIndexedMesh) const;
-    // Calculate per face normal.
-    void CalcFaceNormals();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Welding functions.
-    //////////////////////////////////////////////////////////////////////////
-    void SharePositions();
-    void ShareUV();
-    //////////////////////////////////////////////////////////////////////////
-    // Recreate edges of the mesh.
-    void UpdateEdges();
-
-    void Copy(CTriMesh& fromMesh, int nCopyFlags = COPY_ALL);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Sub-object selection specific methods.
-    //////////////////////////////////////////////////////////////////////////
-    // Return true if something is selected.
-    bool UpdateSelection();
-    // Clear all selections, return true if something was selected.
-    bool ClearSelection();
-    void SoftSelection(const SSubObjSelOptions& options);
-    CBitArray* GetStreamSelection(int nStream) { return m_streamSel[nStream]; };
-    // Returns true if specified stream have any selected elements.
-    bool StreamHaveSelection(int nStream) { return streamSelMask & (1 << nStream); }
-    void GetEdgesByVertex(MeshElementsArray& inVertices, MeshElementsArray& outEdges);
-    void GetFacesByVertex(MeshElementsArray& inVertices, MeshElementsArray& outFaces);
-
-private:
-    void* ReAllocElements(void* old_ptr, int new_elem_num, int size_of_element);
-    void CopyStream(CTriMesh& fromMesh, int stream);
-
-    // For internal use.
-    int m_streamSize[LAST_STREAM];
-    CBitArray* m_streamSel[LAST_STREAM];
-};
-
-#endif // CRYINCLUDE_EDITOR_GEOMETRY_TRIMESH_H
diff --git a/Code/Sandbox/Editor/GotoPositionDlg.cpp b/Code/Sandbox/Editor/GotoPositionDlg.cpp
deleted file mode 100644
index fc19b19950..0000000000
--- a/Code/Sandbox/Editor/GotoPositionDlg.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "GotoPositionDlg.h"
-#include "EditorDefs.h"
-
-// Editor
-#include "EditorViewportCamera.h"
-#include "EditorViewportSettings.h"
-#include "GameEngine.h"
-#include "ViewManager.h"
-
-#include <AzFramework/Viewport/CameraInput.h>
-
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Math/Vector3.h>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_GotoPositionDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-GotoPositionDialog::GotoPositionDialog(QWidget* parent)
-    : QDialog(parent)
-    , m_ui(new Ui::GotoPositionDialog)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    setFixedSize(size());
-    OnInitDialog();
-
-    auto doubleValueChanged = static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged);
-
-    connect(m_ui->m_posEdit, &QLineEdit::editingFinished, this, &GotoPositionDialog::OnChangeEdit);
-    connect(m_ui->m_dymX, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
-    connect(m_ui->m_dymY, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
-    connect(m_ui->m_dymZ, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
-    connect(m_ui->m_dymAnglePitch, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
-    connect(m_ui->m_dymAngleYaw, doubleValueChanged, this, &GotoPositionDialog::OnUpdateNumbers);
-}
-
-GotoPositionDialog::~GotoPositionDialog() = default;
-
-void GotoPositionDialog::OnInitDialog()
-{
-    const auto cameraTransform = SandboxEditor::GetDefaultViewportCameraTransform();
-    const auto cameraTranslation = cameraTransform.GetTranslation();
-    const auto cameraRotation = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromQuaternion(cameraTransform.GetRotation()));
-    const auto pitchDegrees = AZ::RadToDeg(cameraRotation.GetX());
-    const auto yawDegrees = AZ::RadToDeg(cameraRotation.GetZ());
-
-    // position
-    m_ui->m_dymX->setRange(-64000.0, 64000.0);
-    m_ui->m_dymX->setValue(cameraTranslation.GetX());
-
-    m_ui->m_dymY->setRange(-64000.0, 64000.0);
-    m_ui->m_dymY->setValue(cameraTranslation.GetY());
-
-    m_ui->m_dymZ->setRange(-64000.0, 64000.0);
-    m_ui->m_dymZ->setValue(cameraTranslation.GetZ());
-
-    // rotation
-    m_ui->m_dymAnglePitch->setRange(-180.0, 180.0);
-    m_ui->m_dymAnglePitch->setValue(pitchDegrees);
-
-    m_ui->m_dymAngleYaw->setRange(-180.0, 180.0);
-    m_ui->m_dymAngleYaw->setValue(yawDegrees);
-
-    // ensure the goto button is highlighted correctly.
-    m_ui->pushButton->setDefault(true);
-
-    OnUpdateNumbers();
-}
-
-void GotoPositionDialog::OnChangeEdit()
-{
-    const int argCount = 5;
-    AZStd::vector<float> transform(argCount);
-
-    m_transform = m_ui->m_posEdit->text();
-    const QStringList parts = m_transform.split(QRegularExpression("[\\s,;\\t]"), Qt::SkipEmptyParts);
-    for (int i = 0; i < argCount && i < parts.count(); ++i)
-    {
-        transform[i] = parts[i].toDouble();
-    }
-
-    m_ui->m_dymX->setValue(transform[0]);
-    m_ui->m_dymY->setValue(transform[1]);
-    m_ui->m_dymZ->setValue(transform[2]);
-    m_ui->m_dymAnglePitch->setValue(transform[3]);
-    m_ui->m_dymAngleYaw->setValue(transform[4]);
-}
-
-void GotoPositionDialog::OnUpdateNumbers()
-{
-    m_ui->m_posEdit->setText(QString::fromLatin1("%1, %2, %3, %4, %5")
-                                 .arg(m_ui->m_dymX->value(), 2, 'f', 2)
-                                 .arg(m_ui->m_dymY->value(), 2, 'f', 2)
-                                 .arg(m_ui->m_dymZ->value(), 2, 'f', 2)
-                                 .arg(m_ui->m_dymAnglePitch->value(), 2, 'f', 2)
-                                 .arg(m_ui->m_dymAngleYaw->value(), 2, 'f', 2));
-}
-
-void GotoPositionDialog::accept()
-{
-    if (SandboxEditor::UsingNewCameraSystem())
-    {
-        SandboxEditor::InterpolateDefaultViewportCameraToTransform(
-            AZ::Vector3(
-                aznumeric_cast<float>(m_ui->m_dymX->value()), aznumeric_cast<float>(m_ui->m_dymY->value()),
-                aznumeric_cast<float>(m_ui->m_dymZ->value())),
-            AZ::DegToRad(aznumeric_cast<float>(m_ui->m_dymAnglePitch->value())),
-            AZ::DegToRad(aznumeric_cast<float>(m_ui->m_dymAngleYaw->value())));
-    }
-    else
-    {
-        SandboxEditor::SetDefaultViewportCameraPosition(AZ::Vector3(
-            aznumeric_cast<float>(m_ui->m_dymX->value()), aznumeric_cast<float>(m_ui->m_dymY->value()),
-            aznumeric_cast<float>(m_ui->m_dymZ->value())));
-        SandboxEditor::SetDefaultViewportCameraRotation(
-            AZ::DegToRad(aznumeric_cast<float>(m_ui->m_dymAnglePitch->value())),
-            AZ::DegToRad(aznumeric_cast<float>(m_ui->m_dymAngleYaw->value())));
-    }
-
-    QDialog::accept();
-}
-
-#include <moc_GotoPositionDlg.cpp>
diff --git a/Code/Sandbox/Editor/GotoPositionDlg.h b/Code/Sandbox/Editor/GotoPositionDlg.h
deleted file mode 100644
index 77500b4627..0000000000
--- a/Code/Sandbox/Editor/GotoPositionDlg.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class GotoPositionDialog;
-}
-
-//! GotoPositionDialog for setting camera position and rotation.
-class GotoPositionDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit GotoPositionDialog(QWidget* parent = nullptr);
-    ~GotoPositionDialog();
-
-protected:
-    void OnInitDialog();
-    void accept() override;
-
-    void OnUpdateNumbers();
-    void OnChangeEdit();
-
-public:
-    QString m_transform;
-
-private:
-    QScopedPointer<Ui::GotoPositionDialog> m_ui;
-};
diff --git a/Code/Sandbox/Editor/GraphicsSettingsDialog.cpp b/Code/Sandbox/Editor/GraphicsSettingsDialog.cpp
deleted file mode 100644
index de4062e550..0000000000
--- a/Code/Sandbox/Editor/GraphicsSettingsDialog.cpp
+++ /dev/null
@@ -1,1392 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include <AzCore/PlatformDef.h>
-#include <QUuid>
-#include <platform.h>
-#include "ProjectDefines.h"
-#include "EditorDefs.h"
-
-#include "GraphicsSettingsDialog.h"
-
-#include <QVector>
-#include <QMessageBox>
-#include <QComboBox>
-#include <QLabel>
-#include <QFile>
-#include <QLineEdit>
-#include <QGridLayout>
-#include <QDebug>
-#include <QFontMetrics>
-#include <QSettings>
-
-#include <AzCore/Utils/Utils.h>
-
-// AzFramework
-#include <AzFramework/IO/LocalFileIO.h>
-#include <AzQtComponents/Components/Widgets/PushButton.h>
-#include <AzQtComponents/Components/Widgets/SpinBox.h>
-#include <AzQtComponents/Components/StyleManager.h>
-
-// Editor
-#include "Util/AutoDirectoryRestoreFileDialog.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_graphicssettingsdialog.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-QString groupNames[] =
-{
-    "Game Effects",
-    "Light",
-    "Object Detail",
-    "Particles",
-    "Physics",
-    "Post Processing",
-    "Quality",
-    "Shading",
-    "Shadows",
-    "Sound",
-    "Texture",
-    "Texture Resolution",
-    "Volumetric Effects",
-    "Water",
-    "Miscellaneous"
-};
-
-GraphicsSettingsDialog::GraphicsSettingsDialog(QWidget* parent /* = nullptr */)
-    : QDialog(parent)
-    , m_ui(new Ui::GraphicsSettingsDialog())
-{
-    //Update qlabel color when disabled
-    setStyleSheet("QLabel::disabled{color: gray;}");
-
-    // Start initialization the dialog
-    m_ui->setupUi(this);
-    setWindowTitle("Graphics Settings");
-    m_ui->m_applyButton->setDefault(true);
-    m_headerView = new GraphicsSettingsHeaderView(this, Qt::Horizontal);
-    m_headerView->setMouseTracking(true);
-    m_ui->m_graphicsSettingsTreeView->setHeader(m_headerView);
-    /////////////////////////////////////////////
-
-    m_currentPlatform = GetISystem()->GetConfigPlatform();
-    m_currentSpecIndex = 0;
-    m_dirtyCVarCount = 0;
-
-    m_showCustomSpec = true;
-    ShowCustomSpecOption(false);
-
-    // Show categories, disable apply button
-    m_showCategories = true;
-    m_ui->m_applyButton->setEnabled(false);
-
-    m_graphicsSettingsModel = new GraphicsSettingsModel(this);
-    m_ui->m_graphicsSettingsTreeView->setModel(m_graphicsSettingsModel);
-
-    m_cfgFiles[CONFIG_PC].push_back("pc_low.cfg");
-    m_cfgFiles[CONFIG_PC].push_back("pc_medium.cfg");
-    m_cfgFiles[CONFIG_PC].push_back("pc_high.cfg");
-    m_cfgFiles[CONFIG_PC].push_back("pc_veryhigh.cfg");
-    m_cfgFiles[CONFIG_OSX_METAL].push_back("osx_metal_low.cfg");
-    m_cfgFiles[CONFIG_OSX_METAL].push_back("osx_metal_medium.cfg");
-    m_cfgFiles[CONFIG_OSX_METAL].push_back("osx_metal_high.cfg");
-    m_cfgFiles[CONFIG_OSX_METAL].push_back("osx_metal_veryhigh.cfg");
-    m_cfgFiles[CONFIG_ANDROID].push_back("android_low.cfg");
-    m_cfgFiles[CONFIG_ANDROID].push_back("android_medium.cfg");
-    m_cfgFiles[CONFIG_ANDROID].push_back("android_high.cfg");
-    m_cfgFiles[CONFIG_ANDROID].push_back("android_veryhigh.cfg");
-    m_cfgFiles[CONFIG_IOS].push_back("ios_low.cfg");
-    m_cfgFiles[CONFIG_IOS].push_back("ios_medium.cfg");
-    m_cfgFiles[CONFIG_IOS].push_back("ios_high.cfg");
-    m_cfgFiles[CONFIG_IOS].push_back("ios_veryhigh.cfg");
-#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)\
-    m_cfgFiles[CONFIG_##CODENAME].push_back(#publicname "_low.cfg");\
-    m_cfgFiles[CONFIG_##CODENAME].push_back(#publicname "_medium.cfg");\
-    m_cfgFiles[CONFIG_##CODENAME].push_back(#publicname "_high.cfg");
-    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-    // Since the layout order is set by the .ui file we need to match the order here so that tabbing works correctly.
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_gameeffects.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_light.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_objectdetail.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_particles.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_physics.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_postprocessing.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_quality.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_shading.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_shadows.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_sound.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_texture.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_textureresolution.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_volumetriceffects.cfg");
-    m_cvarGroupOrder.push_back("Config/CVarGroups/sys_spec_water.cfg");
-    m_cvarGroupOrder.push_back("miscellaneous");
-
-    m_platformStrings.push_back(AZStd::make_pair("PC", CONFIG_PC));
-    m_platformStrings.push_back(AZStd::make_pair("OSX Metal", CONFIG_OSX_METAL));
-    m_platformStrings.push_back(AZStd::make_pair("Android", CONFIG_ANDROID));
-    m_platformStrings.push_back(AZStd::make_pair("iOS", CONFIG_IOS));
-#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)\
-    m_platformStrings.push_back(AZStd::make_pair(PublicAuxName2, CONFIG_##CODENAME));
-    AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
-#undef AZ_RESTRICTED_PLATFORM_EXPANSION
-#endif
-    m_platformStrings.push_back(AZStd::make_pair("Custom", CONFIG_INVALID_PLATFORM));
-
-    for (auto& platformString : m_platformStrings)
-    {
-        QString platform = platformString.first.c_str();
-        m_ui->m_platformEntry->addItem(platform);
-    }
-
-    QSettings settings("Amazon", "O3DE");
-    settings.beginGroup("GraphicsSettingsDialog");
-
-    if (settings.contains("Platform"))
-    {
-        QString platformName = settings.value("Platform").toString();
-        AZStd::string azPlatform = platformName.toUtf8().data();
-        m_currentPlatform = GetConfigPlatformFromName(azPlatform);
-        if (m_currentPlatform == CONFIG_INVALID_PLATFORM)
-        {
-            ShowCustomSpecOption(true);
-        }
-    }
-
-    settings.endGroup();
-
-    SetPlatformEntry(m_currentPlatform);
-
-    BuildUI();
-
-    connect(m_ui->m_graphicsSettingsTreeView, &QTreeView::collapsed, this, [&](const QModelIndex& index) { SetCollapsed(index, true); });
-    connect(m_ui->m_graphicsSettingsTreeView, &QTreeView::expanded, this, [&](const QModelIndex& index) { SetCollapsed(index, false); });
-
-    AzQtComponents::StyleManager::setStyleSheet(this, "style:GraphicsSettingsDialog.qss");
-}
-
-GraphicsSettingsDialog::~GraphicsSettingsDialog()
-{
-    QSettings settings("Amazon", "O3DE");
-    settings.beginGroup("GraphicsSettingsDialog");
-
-    auto platformCheck = [this](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return stringConfigPair.second == m_currentPlatform; };
-    auto platformStringsIterator = AZStd::find_if(m_platformStrings.begin(), m_platformStrings.end(), platformCheck);
-    if (platformStringsIterator != m_platformStrings.end())
-    {
-        settings.setValue("Platform", platformStringsIterator->first.c_str());
-    }
-    else
-    {
-        settings.remove("Platform");
-    }
-
-    settings.beginGroup("cvarGroup");
-
-    for (auto& collapseIterator : m_uiCollapseGroup)
-    {
-        settings.setValue(collapseIterator->m_groupName, collapseIterator->m_isCollapsed);
-    }
-
-    settings.endGroup();
-    settings.endGroup();
-    settings.sync();
-
-    for (CollapseGroup* group : m_uiCollapseGroup)
-    {
-        // Destructor of CollapseGroup will set the members
-        // pointing to nullptr. The actually destruction of the
-        // widgets will be done on destruction of m_ui
-        delete group;
-    }
-
-    for (ParameterWidget* widget : m_parameterWidgets)
-    {
-        // Destructor of ParameterWidget will set the members
-        // pointing to nullptr. The actually destruction of the
-        // widgets will be done on destruction of m_ui
-        delete widget;
-    }
-
-    // Delete m_ui will destruct all the UI elements with in the ui file
-    // Since m_ui is a QScopedPointer which will cleanup itself on the end
-    // of the scope.
-}
-
-void GraphicsSettingsDialog::SetSettingsTree(int numColumns)
-{
-    m_graphicsSettingsModel->clear();
-    m_uiCollapseGroup.clear();
-    m_graphicsSettingsModel->setColumnCount(numColumns);
-
-    for (int i = 1; i < numColumns; ++i)
-    {
-        m_ui->m_graphicsSettingsTreeView->header()->setSectionResizeMode(i, QHeaderView::Stretch);
-    }
-
-    m_ui->m_graphicsSettingsTreeView->setColumnWidth(0, 200);
-    m_ui->m_graphicsSettingsTreeView->header()->setMinimumSectionSize(100);
-
-    m_graphicsSettingsModel->setHeaderData(0, Qt::Horizontal, "Properties");
-
-    auto parentItem = m_graphicsSettingsModel->invisibleRootItem();
-
-    for (int i = 0; i < aznumeric_cast<int>(GraphicsSettings::numSettings); ++i)
-    {
-        QStandardItem* row = new QStandardItem();
-        row->setData(groupNames[i], Qt::DisplayRole);
-        parentItem->appendRow(row);
-        SetCollapsedLayout(groupNames[i].replace(" ", ""), row);
-    }
-    m_numColumns = numColumns;
-
-    m_cvarGroupData["Config/CVarGroups/sys_spec_gameeffects.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::GameEffects));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_light.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Light));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_objectdetail.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::ObjectDetail));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_particles.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Particles));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_physics.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Physics));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_postprocessing.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::PostProcessing));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_quality.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Quality));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_shading.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Shading));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_shadows.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Shadows));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_sound.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Sound));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_texture.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Texture));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_textureresolution.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::TextureResolution));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_volumetriceffects.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::VolumetricEffects));
-    m_cvarGroupData["Config/CVarGroups/sys_spec_water.cfg"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Water));
-    m_cvarGroupData["miscellaneous"].m_treeRowItem = m_graphicsSettingsModel->item(aznumeric_cast<int>(GraphicsSettings::Miscellaneous));
-}
-
-void GraphicsSettingsDialog::OnLoadConfigurationEntry(const char* strKey, const char* strValue, const char* strGroup)
-{
-    AZStd::string key = strKey;
-    ICVar* cvar = gEnv->pConsole->GetCVar(strKey);
-
-    if (cvar)
-    {
-        AZStd::transform(key.begin(), key.end(), key.begin(), tolower);
-        if (azstricmp(key.c_str(), "sys_spec_full") == 0 || key.find("sys_spec_") == key.npos)
-        {
-            int type = cvar->GetType();
-            AZStd::any val;
-            if (type == CVAR_INT)
-            {
-                val = atoi(strValue);
-            }
-            else if (type == CVAR_FLOAT)
-            {
-                val = static_cast<float>(atof(strValue));
-            }
-            else
-            {
-                val = AZStd::string(strValue);
-            }
-
-            // Platform cfg file (ex. pc_veryhigh.cfg)
-            if (strGroup[0] == '\0')
-            {
-                // New cvar loaded into map
-                if (m_cVarTracker.find(key) == m_cVarTracker.end())
-                {
-                    m_cVarTracker[key].type = type;
-                    m_cVarTracker[key].cvarGroup = "miscellaneous";
-                    AZStd::any empty;
-                    if (type == CVAR_INT)
-                    {
-                        empty = 0;
-                    }
-                    else if (type == CVAR_FLOAT)
-                    {
-                        empty = 0.0f;
-                    }
-                    else
-                    {
-                        empty = AZStd::string("");
-                    }
-                    m_cVarTracker[key].fileVals.resize(m_numSpecLevels, CVarFileStatus(empty, empty, empty));
-                }
-
-                m_cVarTracker[key].fileVals[m_currentSpecIndex].editedValue = val;
-                m_cVarTracker[key].fileVals[m_currentSpecIndex].overwrittenValue = val;
-            }
-            // default group in sys_spec cfg file
-            else if (azstricmp(strGroup, "default") == 0)
-            {
-                CVarFileStatus defaultVal(val, val, val);
-                if (m_cVarTracker.find(key) == m_cVarTracker.end())
-                {
-                    // New cvar loaded into map
-                    CVarInfo& currentCVar = m_cVarTracker[key];
-                    currentCVar.type = cvar->GetType();
-                    currentCVar.fileVals.resize(m_numSpecLevels, defaultVal);
-                }
-                else
-                {
-                    // Reset values, if there's a platform override it always follows the sys_spec_*.cfg files.
-                    // Resetting avoids the issue where some spec levels are never set because of an extra platform
-                    // override load happening earlier just to store the value of sys_spec_full.
-                    for (int specLevel = 0; specLevel < m_numSpecLevels; ++specLevel)
-                    {
-                        m_cVarTracker[key].fileVals[specLevel] = defaultVal;
-                    }
-                }
-                // Overwrite miscellaneous if mentioned in platform config file
-                m_cVarTracker[key].cvarGroup = m_currentConfigFilename;
-            }
-            // specific index in sys_spec cfg file
-            else
-            {
-                int group = 0;
-
-                if (azsscanf(strGroup, "%d", &group) == 1)
-                {
-                    auto sysSpecFull = m_cVarTracker.find("sys_spec_full");
-                    if (sysSpecFull != m_cVarTracker.end())
-                    {
-                        CVarFileStatus indexAssignment(val, val, val);
-                        for (int specLevel = 0; specLevel < m_numSpecLevels; ++specLevel)
-                        {
-                            // Only apply cvar change to configurations with sys_spec_Full matching the index
-                            int overwrittenValue = 0;
-                            if (AZStd::any_numeric_cast<int>(&sysSpecFull->second.fileVals[specLevel].overwrittenValue, overwrittenValue) && group == overwrittenValue)
-                            {
-                                m_cVarTracker[key].fileVals[specLevel] = indexAssignment;
-                            }
-                        }
-                    }                    
-                }
-            }
-        }
-    }
-}
-
-// Loads UI column for specific cfg file (ex. pc_low.cfg)
-void GraphicsSettingsDialog::BuildColumn(int specLevel)
-{
-    if (specLevel < 0 || specLevel >= m_numSpecLevels)
-    {
-        return;
-    }
-
-    for (auto& it : m_cvarGroupData)
-    {
-        it.second.m_currentRow = 0;
-    }
-
-    for (auto& it : m_cVarTracker)
-    {
-        QString str = it.first.c_str();
-        QWidget* input = nullptr;
-        if (it.second.type == CVAR_INT)
-        {
-            AzQtComponents::SpinBox* intval = new AzQtComponents::SpinBox(nullptr);
-            intval->setFocusPolicy(Qt::StrongFocus);
-            intval->setMaximum(INT32_MAX);
-            intval->setMinimum(INT32_MIN);
-            int editedValue;
-            if (AZStd::any_numeric_cast<int>(&it.second.fileVals[specLevel].editedValue, editedValue))
-            {
-                intval->setValue(editedValue);
-            }
-            m_cvarGroupData[it.second.cvarGroup].m_cvarSpinBoxes.push_back(intval);
-            connect(intval, SIGNAL(valueChanged(int)), this, SLOT(CVarChanged(int)));
-            input = intval;
-        }
-        else if (it.second.type == CVAR_FLOAT)
-        {
-            AzQtComponents::DoubleSpinBox* doubleval = new AzQtComponents::DoubleSpinBox(nullptr);
-            doubleval->setFocusPolicy(Qt::StrongFocus);
-            doubleval->setMaximum(FLT_MAX);
-            doubleval->setMinimum(-FLT_MAX);
-            float editedValue;
-            if (AZStd::any_numeric_cast<float>(&it.second.fileVals[specLevel].editedValue, editedValue))
-            {
-                doubleval->setValue(editedValue);
-            }
-            m_cvarGroupData[it.second.cvarGroup].m_cvarDoubleSpinBoxes.push_back(doubleval);
-            connect(doubleval, SIGNAL(valueChanged(double)), this, SLOT(CVarChanged(double)));
-            input = doubleval;
-        }
-        else
-        {
-            QLineEdit* stringval = new QLineEdit(nullptr);
-            AZStd::string* editedValue = AZStd::any_cast<AZStd::string>(&it.second.fileVals[specLevel].editedValue);
-            stringval->setText(editedValue->c_str());
-            m_cvarGroupData[it.second.cvarGroup].m_cvarLineEdits.push_back(stringval);
-            connect(stringval, SIGNAL(textChanged(const QString&)), this, SLOT(CVarChanged(const QString&)));
-            input = stringval;
-        }
-
-        if (input)
-        {
-            input->setObjectName(str);
-            input->setProperty("specLevel", specLevel);
-            QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-            sizePolicy.setHeightForWidth(input->sizePolicy().hasHeightForWidth());
-            input->setSizePolicy(sizePolicy);
-            input->setMinimumSize(QSize(INPUT_MIN_WIDTH, INPUT_MIN_HEIGHT));
-            QStandardItem* parentItem = m_cvarGroupData[it.second.cvarGroup].m_treeRowItem;
-            QModelIndex parentIndex = parentItem->index();
-            QModelIndex thisIndex = m_graphicsSettingsModel->index(m_cvarGroupData[it.second.cvarGroup].m_currentRow++, specLevel + CVAR_VALUE_COLUMN_OFFSET, parentIndex);
-            m_ui->m_graphicsSettingsTreeView->setIndexWidget(thisIndex, input);
-            m_parameterWidgets.push_back(new ParameterWidget(input, it.first.c_str()));
-            m_cvarGroupData[it.second.cvarGroup].m_widgetInsertOrder.push_back(input);
-        }
-    }
-}
-
-void GraphicsSettingsDialog::LoadPlatformConfigurations()
-{
-    const int numColumns = m_cfgFiles[m_currentPlatform].size() + 1;
-    SetSettingsTree(numColumns);
-
-    for (ParameterWidget* widget : m_parameterWidgets)
-    {
-        delete widget;
-    }
-    m_parameterWidgets.clear();
-
-    m_ui->m_applyButton->setEnabled(false);
-    m_dirtyCVarCount = 0;
-
-    // Load platform cfg files to load in sys_spec_Full
-    for (size_t cfgFileIndex = 0; cfgFileIndex < m_cfgFiles[m_currentPlatform].size(); ++cfgFileIndex)
-    {
-        m_currentSpecIndex = cfgFileIndex;
-        m_currentConfigFilename = m_cfgFiles[m_currentPlatform][cfgFileIndex];
-        GetISystem()->LoadConfiguration(m_currentConfigFilename.c_str(), this, true);
-    }
-
-    if (m_cVarTracker.find("sys_spec_full") == m_cVarTracker.end())
-    {
-        m_cVarTracker.clear();
-        CleanUI();
-        ShowCategories(false);
-        QMessageBox::warning(this, "Warning", "Invalid custom spec file (missing sys_spec_full).",
-            QMessageBox::Ok);
-        return;
-    }
-
-    // Load sys_spec cfgs based on sys_spec_Full values
-    LoadCVarGroupDirectory(m_cvarGroupsFolder);
-
-    setUpdatesEnabled(false);
-
-    // Reload platform cfg files to override sys_spec index assignments and load rows with filenames of given platform
-    for (size_t cfgFileIndex = 0; cfgFileIndex < m_cfgFiles[m_currentPlatform].size(); ++cfgFileIndex)
-    {
-        m_currentSpecIndex = cfgFileIndex;
-        m_currentConfigFilename = m_cfgFiles[m_currentPlatform][cfgFileIndex];
-        GetISystem()->LoadConfiguration(m_currentConfigFilename.c_str(), this, true);
-
-        /*CVarGroupInfo& specFileGroup =*/ m_cvarGroupData["SpecFile"];
-        m_graphicsSettingsModel->setHeaderData(cfgFileIndex + CVAR_VALUE_COLUMN_OFFSET, Qt::Horizontal, QApplication::translate("GraphicsSettingsDialog", m_cfgFiles[m_currentPlatform][cfgFileIndex].c_str()));
-    }
-
-    // Loads column of cvar names
-    for (auto& it : m_cVarTracker)
-    {
-        QLabel* cVarLabel = new QLabel(nullptr);
-        QString str = it.first.c_str();
-        QString strLabel = str + "Label";
-        cVarLabel->setObjectName(strLabel);
-        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-        sizePolicy.setHeightForWidth(cVarLabel->sizePolicy().hasHeightForWidth());
-        cVarLabel->setSizePolicy(sizePolicy);
-        cVarLabel->setMinimumSize(QSize(INPUT_MIN_WIDTH, INPUT_MIN_HEIGHT));
-        cVarLabel->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
-        QStandardItem* cVarItem = new QStandardItem();
-        cVarItem->setData(QApplication::translate("GraphicsSettingsDialog", it.first.c_str(), 0), Qt::DisplayRole);
-        QList<QStandardItem*> items{ cVarItem };
-        for (int i = 1; i < numColumns; ++i)
-        {
-            items << new QStandardItem();
-        }
-        m_cvarGroupData[it.second.cvarGroup].m_treeRowItem->appendRow(items);
-        cVarLabel->setText(QApplication::translate("GraphicsSettingsDialog", it.first.c_str(), 0));
-        m_cvarGroupData[it.second.cvarGroup].m_cvarLabels.push_back(cVarLabel);
-
-        if (ICVar* cvar = gEnv->pConsole->GetCVar(it.first.c_str()))
-        {
-            cVarLabel->setToolTip(cvar->GetHelp());
-        }
-    }
-
-    // Loads columns of cvar values for each platform cfg file
-    for (int cfgFileIndex = 0; cfgFileIndex < m_cfgFiles[m_currentPlatform].size(); ++cfgFileIndex)
-    {
-        BuildColumn(cfgFileIndex);
-    }
-
-    // Remove any section that has no visible controls
-    for (auto& it : m_cvarGroupData)
-    {
-        int totalControlCount = 0;
-        CVarGroupInfo& currentCvarGroupInfo = it.second;
-        totalControlCount += currentCvarGroupInfo.m_cvarDoubleSpinBoxes.size();
-        totalControlCount += currentCvarGroupInfo.m_cvarSpinBoxes.size();
-        totalControlCount += currentCvarGroupInfo.m_cvarLineEdits.size();
-        totalControlCount += currentCvarGroupInfo.m_platformLabels.size();
-
-        if (totalControlCount == 0)
-        {
-            if (currentCvarGroupInfo.m_treeRowItem)
-            {
-                int i = 0;
-                for (auto& collapseIterator : m_uiCollapseGroup)
-                {
-                    if (collapseIterator->m_groupRow == currentCvarGroupInfo.m_treeRowItem)
-                    {
-                        m_uiCollapseGroup.remove(i);
-                        break;
-                    }
-                    ++i;
-                }
-                m_graphicsSettingsModel->removeRow(currentCvarGroupInfo.m_treeRowItem->row());
-            }
-        }
-    }
-
-    setUpdatesEnabled(true);
-
-    QSettings settings("Amazon", "O3DE");
-    settings.beginGroup("GraphicsSettingsDialog");
-    settings.beginGroup("cvarGroup");
-
-    for (auto& collapseIterator : m_uiCollapseGroup)
-    {
-        bool groupCollapsed = settings.value(collapseIterator->m_groupName, collapseIterator->m_isCollapsed).toBool();
-        if (collapseIterator->m_isCollapsed != groupCollapsed)
-        {
-            collapseIterator->ToggleCollapsed();
-        }
-    }
-
-    settings.endGroup();
-    settings.endGroup();
-}
-
-void GraphicsSettingsDialog::LoadCVarGroupDirectory(const AZStd::string& path)
-{
-    AZ::IO::LocalFileIO::FindFilesCallbackType fileFinderCb;
-    fileFinderCb = [&](const char* fullPath) -> bool
-    {
-        if (gEnv->pFileIO->IsDirectory(fullPath))
-        {
-            // recurse into subdirectory
-            gEnv->pFileIO->FindFiles(fullPath, "*.cfg", fileFinderCb);
-        }
-        else
-        {
-            m_currentConfigFilename = fullPath;
-            GetISystem()->LoadConfiguration(fullPath, this, false);
-        }
-
-        return true; // keep searching
-    };
-
-    gEnv->pFileIO->FindFiles(path.c_str(), "*.cfg", fileFinderCb);
-}
-
-//Build UI, link signals and set the data for device list.
-void GraphicsSettingsDialog::BuildUI()
-{
-    connect(m_ui->m_cancelButton, &QPushButton::clicked, this, &GraphicsSettingsDialog::reject);
-    connect(m_ui->m_applyButton, &QPushButton::clicked, this, &GraphicsSettingsDialog::accept);
-    connect(m_ui->m_platformEntry, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(PlatformChanged(const QString&)));
-    connect(m_ui->m_selectCustomSpecButton, &QPushButton::clicked, this, &GraphicsSettingsDialog::OpenCustomSpecDialog);
-
-    if (!m_cfgFiles[m_currentPlatform].empty())
-    {
-        LoadPlatformConfigurations();
-    }
-    else
-    {
-        m_cVarTracker.clear();
-        CleanUI();
-        ShowCategories(false);
-    }
-}
-
-void GraphicsSettingsDialog::CleanUI()
-{
-    setUpdatesEnabled(false);
-
-    QSettings settings("Amazon", "O3DE");
-    settings.beginGroup("GraphicsSettingsDialog");
-    settings.beginGroup("cvarGroup");
-
-    for (auto& collapseIterator : m_uiCollapseGroup)
-    {
-        settings.setValue(collapseIterator->m_groupName, collapseIterator->m_isCollapsed);
-    }
-
-    settings.endGroup();
-    settings.endGroup();
-    settings.sync();
-
-    m_cVarTracker.clear();
-
-    // Uncollapse groups
-    for (auto& collapseIt : m_uiCollapseGroup)
-    {
-        if (collapseIt->m_isCollapsed)
-        {
-            collapseIt->ToggleCollapsed();
-        }
-    }
-
-    setUpdatesEnabled(true);
-}
-
-void GraphicsSettingsDialog::ShowCategories(bool show)
-{
-    if (m_showCategories == show)
-    {
-        return;
-    }
-
-    m_showCategories = show;
-    m_ui->m_graphicsSettingsTreeView->setVisible(show);
-}
-
-void GraphicsSettingsDialog::ShowCustomSpecOption(bool show)
-{
-    if (m_showCustomSpec == show)
-    {
-        return;
-    }
-
-    m_showCustomSpec = show;
-    m_ui->m_selectCustomSpecButton->setVisible(m_showCustomSpec);
-    m_ui->m_lineSpacer->setVisible(m_showCustomSpec);
-}
-
-void GraphicsSettingsDialog::PlatformChanged(const QString& platform)
-{
-    bool change = true;
-    if (m_dirtyCVarCount > 0 && !SendUnsavedChangesWarning(false))
-    {
-        change = false;
-    }
-
-    if (change)
-    {
-        AZStd::string azPlatform = platform.toStdString().c_str();
-
-        m_currentPlatform = GetConfigPlatformFromName(azPlatform);
-        if (m_currentPlatform == CONFIG_INVALID_PLATFORM) // "Custom" selected
-        {
-            ShowCustomSpecOption(true);
-            CleanUI();
-            if (m_cfgFiles[CONFIG_INVALID_PLATFORM].empty()) // if we don't have a custom spec
-            {
-                ShowCategories(false);
-                m_ui->m_applyButton->setEnabled(false);
-                m_dirtyCVarCount = 0;
-            }
-            else
-            {
-                ShowCategories(true);
-                LoadPlatformConfigurations();
-            }
-        }
-        else
-        {
-            ShowCustomSpecOption(false);
-            ShowCategories(true);
-            CleanUI();
-            LoadPlatformConfigurations();
-        }
-    }
-    else
-    {
-        m_ui->m_platformEntry->blockSignals(true);
-        SetPlatformEntry(m_currentPlatform);
-        m_ui->m_platformEntry->blockSignals(false);
-    }
-}
-
-bool GraphicsSettingsDialog::SendUnsavedChangesWarning(bool cancel)
-{
-    int result = QMessageBox::Yes;
-
-    if (cancel)
-    {
-        result = QMessageBox::question(this, "Warning", "There are currently unsaved changed. Are you sure you want to cancel?",
-            QMessageBox::Yes, QMessageBox::No);
-    }
-    else
-    {
-        result = QMessageBox::question(this, "Warning", "There are currently unsaved changed. Are you sure you want to change configurations?",
-            QMessageBox::Yes, QMessageBox::No);
-    }
-
-    return (result == QMessageBox::Yes);
-}
-
-bool GraphicsSettingsDialog::CVarChanged(AZStd::any val, const char* cvarName, int specLevel)
-{
-    // Checking if the edited value (before change) is equal to the overwritten value
-    bool dirtyBefore = false;
-    AZStd::string azcvarName = cvarName;
-    AZStd::pair<AZStd::string, CVarInfo> cvarInfo = AZStd::make_pair(azcvarName, m_cVarTracker[cvarName]);
-    if (CheckCVarStatesForDiff(&cvarInfo, specLevel, EDITED_OVERWRITTEN_COMPARE))
-    {
-        dirtyBefore = true;
-    }
-
-    if (azstricmp(cvarName, "sys_spec_full") == 0)
-    {
-        //Pop out the warning dialog for sys_spec_Full since all cvars will be changed
-        int result = QMessageBox::Ok;
-
-        result = QMessageBox::question(this, "Warning", "Modifying sys_spec_full will override any unsaved changes.",
-            QMessageBox::Ok, QMessageBox::Cancel);
-
-        // Cancel - Change sys_spec_full qspinbox value back
-        if (result == QMessageBox::Cancel)
-        {
-            return false;
-        }
-        else // OK - reload column
-        {
-            // Updating sys_spec_full for when adding cvargroup directory
-            m_cVarTracker[cvarName].fileVals[specLevel].editedValue = val;
-            gEnv->pSystem->AddCVarGroupDirectory(m_cvarGroupsFolder);
-            m_currentConfigFilename = m_cfgFiles[m_currentPlatform][specLevel];
-            m_currentSpecIndex = specLevel;
-            GetISystem()->LoadConfiguration(m_currentConfigFilename.c_str(), this, true);
-            // Updating sys_spec_full since overwritten from loading platform cfg
-            m_cVarTracker[cvarName].fileVals[specLevel].editedValue = val;
-            BuildColumn(specLevel);
-        }
-    }
-    else
-    {
-        m_cVarTracker[cvarName].fileVals[specLevel].editedValue = val;
-    }
-
-    // Checking if the newly edited value is equal to the overwritten value
-    cvarInfo = AZStd::make_pair(azcvarName, m_cVarTracker[cvarName]);
-    if (CheckCVarStatesForDiff(&cvarInfo, specLevel, EDITED_OVERWRITTEN_COMPARE))
-    {
-        if (!dirtyBefore)
-        {
-            m_ui->m_applyButton->setEnabled(true);
-            m_dirtyCVarCount++;
-        }
-    }
-    else
-    {
-        if (dirtyBefore)
-        {
-            m_dirtyCVarCount--;
-            if (m_dirtyCVarCount == 0)
-            {
-                m_ui->m_applyButton->setEnabled(false);
-            }
-        }
-    }
-
-    return true;
-}
-
-void GraphicsSettingsDialog::CVarChanged(int i)
-{
-    AzQtComponents::SpinBox* box = static_cast<AzQtComponents::SpinBox*>(sender());
-    QString str = box->objectName();
-    QByteArray ba = str.toUtf8();
-    const char* cvarName = ba.data();
-
-    int specLevel = box->property("specLevel").toInt();
-
-    AZStd::any val;
-    val = i;
-
-    if (!CVarChanged(val, cvarName, specLevel))
-    {
-        // sys_spec_full warning cancelled
-        box->blockSignals(true);
-        int editedValue;
-        if (AZStd::any_numeric_cast<int>(&m_cVarTracker[cvarName].fileVals[specLevel].editedValue, editedValue))
-        {
-            box->setValue(editedValue);
-        }
-        box->blockSignals(false);
-    }
-}
-
-void GraphicsSettingsDialog::CVarChanged(double d)
-{
-    AzQtComponents::DoubleSpinBox* box = static_cast<AzQtComponents::DoubleSpinBox*>(sender());
-    QString str = box->objectName();
-    QByteArray ba = str.toUtf8();
-    const char* cvarName = ba.data();
-
-    AZStd::any val;
-    val = d;
-
-    int specLevel = box->property("specLevel").toInt();
-
-    if (!CVarChanged(val, cvarName, specLevel))
-    {
-        // only can return false from sys_spec_full, which is an int cvar
-    }
-}
-
-void GraphicsSettingsDialog::CVarChanged(const QString& s)
-{
-    QLineEdit* box = qobject_cast<QLineEdit*>(sender());
-    QString str = box->objectName();
-    QByteArray ba = str.toUtf8();
-    const char* cvarName = ba.data();
-
-    AZStd::any val;
-    val = AZStd::string(s.toStdString().c_str());
-
-    int specLevel = box->property("specLevel").toInt();
-
-    if (!CVarChanged(val, cvarName, specLevel))
-    {
-        // only can return false from sys_spec_full, which is an int cvar
-    }
-}
-
-// Returns true if there is a difference between the two cvar states
-bool GraphicsSettingsDialog::CheckCVarStatesForDiff(AZStd::pair<AZStd::string, CVarInfo>* it, int cfgFileIndex, CVarStateComparison cmp)
-{
-    if (it->second.type == CVAR_INT)
-    {
-        int editedVal, overwrittenVal, originalVal;
-        if (AZStd::any_numeric_cast<int>(&it->second.fileVals[cfgFileIndex].editedValue, editedVal) &&
-            AZStd::any_numeric_cast<int>(&it->second.fileVals[cfgFileIndex].overwrittenValue, overwrittenVal) &&
-            AZStd::any_numeric_cast<int>(&it->second.fileVals[cfgFileIndex].originalValue, originalVal))
-        {
-            if ((cmp == EDITED_OVERWRITTEN_COMPARE && editedVal != overwrittenVal) ||
-                (cmp == EDITED_ORIGINAL_COMPARE && editedVal != originalVal) ||
-                (cmp == OVERWRITTEN_ORIGINAL_COMPARE && overwrittenVal != originalVal))
-            {
-                return true;
-            }
-        }
-    }
-    else if (it->second.type == CVAR_FLOAT)
-    {
-        float editedVal, overwrittenVal, originalVal;
-        if (AZStd::any_numeric_cast<float>(&it->second.fileVals[cfgFileIndex].editedValue, editedVal) &&
-            AZStd::any_numeric_cast<float>(&it->second.fileVals[cfgFileIndex].overwrittenValue, overwrittenVal) &&
-            AZStd::any_numeric_cast<float>(&it->second.fileVals[cfgFileIndex].originalValue, originalVal))
-        {
-            if ((cmp == EDITED_OVERWRITTEN_COMPARE && editedVal != overwrittenVal) ||
-                (cmp == EDITED_ORIGINAL_COMPARE && editedVal != originalVal) ||
-                (cmp == OVERWRITTEN_ORIGINAL_COMPARE && overwrittenVal != originalVal))
-            {
-                return true;
-            }
-        }
-    }
-    else
-    {
-        AZStd::string editedVal = *AZStd::any_cast<AZStd::string>(&it->second.fileVals[cfgFileIndex].editedValue);
-        AZStd::string overwrittenVal = *AZStd::any_cast<AZStd::string>(&it->second.fileVals[cfgFileIndex].overwrittenValue);
-        AZStd::string originalVal = *AZStd::any_cast<AZStd::string>(&it->second.fileVals[cfgFileIndex].originalValue);
-        if ((cmp == EDITED_OVERWRITTEN_COMPARE && editedVal.compare(overwrittenVal) != 0) ||
-            (cmp == EDITED_ORIGINAL_COMPARE && editedVal.compare(originalVal) != 0) ||
-            (cmp == OVERWRITTEN_ORIGINAL_COMPARE && overwrittenVal.compare(originalVal) != 0))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////
-// settings file management
-void GraphicsSettingsDialog::reject()
-{
-    if (m_dirtyCVarCount > 0)
-    {
-        if (SendUnsavedChangesWarning(true))
-        {
-            QDialog::reject();
-        }
-    }
-    else
-    {
-        QDialog::reject();
-    }
-}
-
-void GraphicsSettingsDialog::accept()
-{
-    int result = QMessageBox::Yes;
-
-    //Pop out the warning dialog for customized setting
-    result = QMessageBox::question(this, "Warning", "A non-tested setting could potentially crash the game if the setting does not match the device. Are you sure you want to apply the customized setting?",
-            QMessageBox::Yes, QMessageBox::No);
-
-    //Save and exit
-    if (result == QMessageBox::Yes)
-    {
-        SaveSystemSettings();
-    }
-}
-
-void GraphicsSettingsDialog::OpenCustomSpecDialog()
-{
-    AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
-    projectPath /= SETTINGS_FILE_PATH.toUtf8().constData();
-    QString settingsPath = QString::fromUtf8(projectPath.c_str(), aznumeric_cast<int>(projectPath.Native().size()));
-
-    CAutoDirectoryRestoreFileDialog importCustomSpecDialog(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, ".cfg", settingsPath, CFG_FILEFILTER, {}, {}, this);
-
-    if (importCustomSpecDialog.exec())
-    {
-        QString file = importCustomSpecDialog.selectedFiles().first();
-        if (!file.isEmpty())
-        {
-            ApplyCustomSpec(file);
-        }
-    }
-}
-
-void GraphicsSettingsDialog::ApplyCustomSpec(const QString& customFilePath)
-{
-    if (customFilePath.isEmpty())
-    {
-        return;
-    }
-
-    QFile customFile(customFilePath);
-    if (!customFile.exists())
-    {
-        QMessageBox::warning(this, "Warning", "Could not find custom spec file.",
-            QMessageBox::Ok);
-        return;
-    }
-
-    bool change = true;
-    if (m_dirtyCVarCount > 0 && !SendUnsavedChangesWarning(false))
-    {
-        change = false;
-    }
-
-    if (change)
-    {
-        AZStd::string filename = customFilePath.toStdString().c_str();
-        filename = filename.substr(filename.find_last_of('/') + 1);
-
-        m_currentPlatform = CONFIG_INVALID_PLATFORM;
-
-        bool alreadyLoaded = IsCustomSpecAlreadyLoaded(filename);
-        if (m_cfgFiles[CONFIG_INVALID_PLATFORM].size() < m_numSpecLevels && !alreadyLoaded)
-        {
-            m_cfgFiles[CONFIG_INVALID_PLATFORM].push_back(filename);
-        }
-        else if (alreadyLoaded)
-        {
-            QMessageBox::warning(this, "Warning", "The selected custom spec file is already loaded. No changes have been made.",
-                QMessageBox::Ok);
-            return;
-        }
-
-        if (m_cfgFiles[CONFIG_INVALID_PLATFORM].size() == m_numSpecLevels)
-        {
-            m_ui->m_selectCustomSpecButton->setEnabled(false);
-        }
-
-        ShowCategories(true);
-
-        CleanUI();
-
-        LoadPlatformConfigurations();
-    }
-}
-
-void GraphicsSettingsDialog::UnloadCustomSpec(int specLevel)
-{
-    if (specLevel < 0 || specLevel >= m_cfgFiles[CONFIG_INVALID_PLATFORM].size())
-    {
-        return;
-    }
-
-    bool shouldUnload = m_dirtyCVarCount <= 0 || SendUnsavedChangesWarning(false);
-
-    if (shouldUnload)
-    {
-        m_cfgFiles[CONFIG_INVALID_PLATFORM].erase(m_cfgFiles[CONFIG_INVALID_PLATFORM].begin() + specLevel);
-
-        CleanUI();
-
-        if (!m_cfgFiles[CONFIG_INVALID_PLATFORM].empty())
-        {
-            LoadPlatformConfigurations();
-        }
-        else
-        {
-            ShowCategories(false);
-        }
-    }
-}
-
-bool GraphicsSettingsDialog::IsCustomSpecAlreadyLoaded(const AZStd::string& filename) const
-{
-    auto& customConfigFilenames = m_cfgFiles.at(CONFIG_INVALID_PLATFORM);
-    const auto& findResult = AZStd::find(customConfigFilenames.begin(), customConfigFilenames.end(), filename.c_str());
-
-    return findResult != customConfigFilenames.end();
-}
-
-void GraphicsSettingsDialog::SetCollapsedLayout(const QString& groupName, QStandardItem* groupRow)
-{
-    CollapseGroup* cgroup = new CollapseGroup(m_ui->m_graphicsSettingsTreeView);
-    cgroup->m_groupName = groupName;
-    cgroup->m_groupRow = groupRow;
-    m_uiCollapseGroup.push_back(cgroup);
-}
-
-void GraphicsSettingsDialog::SetPlatformEntry(ESystemConfigPlatform platform)
-{
-    auto platformCheck = [&platform](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return stringConfigPair.second == platform; };
-    auto platformStringsIterator = AZStd::find_if(m_platformStrings.begin(), m_platformStrings.end(), platformCheck);
-    if (platformStringsIterator != m_platformStrings.end())
-    {
-        int platformIndex = m_ui->m_platformEntry->findText(platformStringsIterator->first.c_str());
-        m_ui->m_platformEntry->setCurrentIndex(platformIndex);
-    }
-    else
-    {
-        AZ_Assert(false, "Platform not found in platform strings vector.");
-    }
-}
-
-ESystemConfigPlatform GraphicsSettingsDialog::GetConfigPlatformFromName(const AZStd::string& platformName)
-{
-    ESystemConfigPlatform configPlatform = CONFIG_INVALID_PLATFORM;
-
-    auto platformNameCheck = [&platformName](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return (stringConfigPair.first == platformName); };
-    auto configPlatformIterator = AZStd::find_if(m_platformStrings.begin(), m_platformStrings.end(), platformNameCheck);
-    if (configPlatformIterator != m_platformStrings.end())
-    {
-        configPlatform = configPlatformIterator->second;
-    }
-    else
-    {
-        AZ_Assert(false, "Platform name not found in platform strings vector.");
-    }
-
-    return configPlatform;
-}
-
-// Save the current UI options to system qsettings
-void GraphicsSettingsDialog::SaveSystemSettings()
-{
-    AZStd::vector<QString> successFiles;
-    AZStd::vector<QString> nochangeFiles;
-
-    for (int cfgFileIndex = 0; cfgFileIndex < m_cfgFiles[m_currentPlatform].size(); ++cfgFileIndex)
-    {
-        const QString eq = " = ";
-        const QString cvarGroupString1 = "\n------------------------\n-- ";
-        const QString cvarGroupString2 = "\n------------------------\n";
-        QString commandList = "";
-
-        int sysSpecFull;
-        if (AZStd::any_numeric_cast<int>(&m_cVarTracker["sys_spec_full"].fileVals[cfgFileIndex].editedValue, sysSpecFull))
-        {
-            commandList += "sys_spec_full" + eq + QString::number(sysSpecFull) + '\n';
-        }
-
-        QMap<QString, QString> cvarGroupStrings;
-
-        // Set to true as soon as cvar is found which is unique from current cfg file and index assignment
-        bool saveOut = false;
-
-        // Adding any dirty cvars not equal to sys_spec_full or any cvar in miscellaneous to command list
-        for (auto& it : m_cVarTracker)
-        {
-            if ((CheckCVarStatesForDiff(&it, cfgFileIndex, EDITED_ORIGINAL_COMPARE) || it.second.cvarGroup == "miscellaneous") && azstricmp(it.first.c_str(), "sys_spec_full"))
-            {
-                AZStd::string cvarGroup = it.second.cvarGroup;
-                if (azstricmp(cvarGroup.c_str(), "miscellaneous") != 0)
-                {
-                    int fileIndex = cvarGroup.find_last_of('/') + 1;
-                    cvarGroup = cvarGroup.substr(fileIndex, cvarGroup.size() - fileIndex - 4);
-                }
-                QString qcvarGroup = cvarGroup.c_str();
-                if (cvarGroupStrings.find(qcvarGroup) == cvarGroupStrings.end())
-                {
-                    cvarGroupStrings[qcvarGroup] = cvarGroupString1 + qcvarGroup + cvarGroupString2;
-                }
-
-                if (it.second.type == CVAR_INT)
-                {
-                    int val;
-                    if (AZStd::any_numeric_cast<int>(&it.second.fileVals[cfgFileIndex].editedValue, val))
-                    {
-                        cvarGroupStrings[qcvarGroup] += it.first.c_str() + eq + QString::number(val) + '\n';
-                    }
-                }
-                else if (it.second.type == CVAR_FLOAT)
-                {
-                    float val;
-                    if (AZStd::any_numeric_cast<float>(&it.second.fileVals[cfgFileIndex].editedValue, val))
-                    {
-                        cvarGroupStrings[qcvarGroup] += it.first.c_str() + eq + QString::number(val) + '\n';
-                    }
-                }
-                else
-                {
-                    cvarGroupStrings[qcvarGroup] += it.first.c_str() + eq + AZStd::any_cast<AZStd::string>(it.second.fileVals[cfgFileIndex].editedValue).c_str() + '\n';
-                }
-            }
-
-            if (!saveOut)
-            {
-                saveOut = CheckCVarStatesForDiff(&it, cfgFileIndex, EDITED_OVERWRITTEN_COMPARE);
-            }
-        }
-
-        // Adding the project name to the path so that the file is created there if it doesn't already exist
-        // as we don't want to modify the version in Engine/config.
-        AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
-        projectPath /= SETTINGS_FILE_PATH.toUtf8().constData();
-        QString settingsPath = QString::fromUtf8(projectPath.c_str(), aznumeric_cast<int>(projectPath.Native().size()));
-
-        QString settingsFile = settingsPath + m_cfgFiles[m_currentPlatform][cfgFileIndex].c_str();
-
-        // Check if current settings differ from existing cfg
-        if (saveOut)
-        {
-            // Adding any dirty cvars not equal to sys_spec_full to command list
-            for (auto& it : cvarGroupStrings)
-            {
-                commandList += it;
-            }
-
-            if (CFileUtil::OverwriteFile(settingsFile.toStdString().c_str()))
-            {
-                if (!CFileUtil::CreateDirectory(settingsPath.toStdString().c_str()))
-                {
-                    QMessageBox::warning(this, "Warning", "Could not create the directory for file \"" + settingsFile + "\". Failed to apply Graphics Setting.",
-                        QMessageBox::Ok);
-                    continue;
-                }
-
-                QByteArray dataArray = commandList.toUtf8().data();
-
-                QFile file(settingsFile);
-                if (!file.open(QIODevice::WriteOnly) || file.write(dataArray) != dataArray.size())
-                {
-                    QMessageBox::warning(this, "Warning", "Could not write settings to file \"" + settingsFile + ". Failed to apply Graphics Setting.",
-                        QMessageBox::Ok);
-                    file.close();
-                    continue;
-                }
-
-                successFiles.push_back(settingsFile);
-
-                // Update platform cvars to reflect new values
-                for (auto& it : m_cVarTracker)
-                {
-                    it.second.fileVals[cfgFileIndex].overwrittenValue = it.second.fileVals[cfgFileIndex].editedValue;
-                }
-
-                file.close();
-            }
-            else
-            {
-                QMessageBox::warning(this, "Warning", "Could not check out or make file writable: \"" + settingsFile + "\". Failed to apply Graphics Setting.",
-                    QMessageBox::Ok);
-            }
-        }
-        else
-        {
-            nochangeFiles.push_back(settingsFile);
-        }
-    }
-
-    // Print list of files which had no changes made
-    if (nochangeFiles.size() > 0)
-    {
-        QString message = "No changes have been made to the following files:\n";
-        for (int i = 0; i < nochangeFiles.size(); ++i)
-        {
-            message += nochangeFiles[i] + "\n";
-        }
-        QMessageBox::information(this, "Log", message, QMessageBox::Ok);
-    }
-
-    // Print list of files which were successfully saved
-    if (successFiles.size() > 0)
-    {
-        QString message = "Updated the graphics setting correctly for the following files:\n";
-        for (int i = 0; i < successFiles.size(); ++i)
-        {
-            message += successFiles[i] + "\n";
-        }
-        QMessageBox::information(this, "Log", message, QMessageBox::Ok);
-    }
-
-    // if we saved all of the files that we needed to then disable the save button again
-    if (nochangeFiles.size() + successFiles.size() == m_cfgFiles[m_currentPlatform].size())
-    {
-        m_dirtyCVarCount = 0;
-        m_ui->m_applyButton->setEnabled(false);
-    }
-}
-
-void GraphicsSettingsDialog::SetCollapsed(const QModelIndex& index, bool flags)
-{
-    QStandardItem* item = m_graphicsSettingsModel->itemFromIndex(index);
-
-    for (auto& collapseIterator : m_uiCollapseGroup)
-    {
-        if (collapseIterator->m_groupRow == item)
-        {
-            collapseIterator->m_isCollapsed = flags;
-            break;
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////
-// Collapse Group
-GraphicsSettingsDialog::CollapseGroup::CollapseGroup(QTreeView* treeView)
-    : m_treeView(treeView)
-    , m_isCollapsed(true)
-{
-}
-
-void GraphicsSettingsDialog::CollapseGroup::ToggleCollapsed()
-{
-    m_isCollapsed = !m_isCollapsed;
-    const QModelIndex index = m_groupRow->index();
-    if (m_isCollapsed)
-    {
-        m_treeView->collapse(index);
-    }
-    else
-    {
-        m_treeView->expand(index);
-    }
-}
-
-///////////////////////////////////////////////////////////////////
-// ParameterWidget
-GraphicsSettingsDialog::ParameterWidget::ParameterWidget(QWidget* widget, QString parameterName)
-    : m_widget(widget)
-    , m_parameterName(parameterName)
-{
-    m_widget->setToolTip(GetToolTip());
-}
-
-QString GraphicsSettingsDialog::ParameterWidget::GetToolTip() const
-{
-    if (!m_parameterName.isEmpty())
-    {
-        QString tooltipText = QString(PARAMETER_TOOLTIP).arg(m_parameterName);
-        return tooltipText;
-    }
-    return "";
-}
-
-GraphicsSettingsTreeView::GraphicsSettingsTreeView(QWidget* parent)
-    : QTreeView(parent)
-{
-}
-
-GraphicsSettingsHeaderView::GraphicsSettingsHeaderView(GraphicsSettingsDialog* dialog, Qt::Orientation orientation, QWidget* parent)
-    : QHeaderView(orientation, parent)
-    , m_dialog(dialog)
-{
-    setDefaultAlignment(Qt::AlignLeft);
-}
-
-bool GraphicsSettingsHeaderView::event(QEvent* e)
-{
-    if (m_dialog->IsCustom())
-    {
-        GraphicsSettingsTreeView* treeView = qobject_cast<GraphicsSettingsTreeView*>(parent());
-        if (treeView)
-        {
-            switch (e->type())
-            {
-                case QEvent::Enter:
-                    m_index = logicalIndexAt(static_cast<QEnterEvent*>(e)->pos());
-                    if (m_index > 0)
-                    {
-                        treeView->setSortingEnabled(true);
-                        treeView->sortByColumn(m_index, Qt::AscendingOrder);
-                    }
-                    break;
-                case QEvent::Leave:
-                    treeView->setSortingEnabled(false);
-                    break;
-            }
-        }
-    }
-    return QHeaderView::event(e);
-}
-
-void GraphicsSettingsHeaderView::mouseReleaseEvent(QMouseEvent* e)
-{
-    AZ_UNUSED(e);
-    if (QMessageBox::question(
-        this, QObject::tr("Unload Resource"),
-        QObject::tr("Are you sure you want to unload the resource?"),
-        QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Yes)
-    {
-        m_dialog->UnloadCustomSpec(m_index - 1);
-    }
-
-}
-
-void GraphicsSettingsHeaderView::mouseMoveEvent(QMouseEvent* e)
-{
-    AZ_UNUSED(e);
-    if (m_dialog->IsCustom())
-    {
-        GraphicsSettingsTreeView* treeView = qobject_cast<GraphicsSettingsTreeView*>(parent());
-        int index = logicalIndexAt(e->pos());
-        if (index != m_index)
-        {
-            m_index = index;
-            if (m_index > 0)
-            {
-                treeView->setSortingEnabled(true);
-                treeView->sortByColumn(m_index, Qt::AscendingOrder);
-            }
-            else
-            {
-                treeView->setSortingEnabled(false);
-            }
-        }
-    }
-}
-
-GraphicsSettingsModel::GraphicsSettingsModel(QObject* parent)
-    : QStandardItemModel(parent)
-{
-}
-
-Qt::ItemFlags GraphicsSettingsModel::flags(const QModelIndex& index) const
-{
-    Qt::ItemFlags flags = Qt::NoItemFlags;
-
-    if (index.column() == 0)
-    {
-        flags |= Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-    }
-    return flags;
-}
-
-#include <moc_GraphicsSettingsDialog.cpp>
diff --git a/Code/Sandbox/Editor/GraphicsSettingsDialog.h b/Code/Sandbox/Editor/GraphicsSettingsDialog.h
deleted file mode 100644
index 6852ff2d75..0000000000
--- a/Code/Sandbox/Editor/GraphicsSettingsDialog.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QTreeView>
-#include <QStandardItemModel>
-#include <QHeaderView>
-
-#include <AzQtComponents/Components/Widgets/SpinBox.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/any.h>
-
-#include <ISystem.h>
-#endif
-
-class QGridLayout;
-class QLabel;
-
-namespace Ui
-{
-    class GraphicsSettingsDialog;
-}
-
-// Description:
-//   Status of cvar for a specifc platform and spec level
-//   editedValue - current setting within Graphics Settings Dialog box
-//   overwrittenValue - original setting from platform config file (set to originalValue if not found)
-//   originalValue - original settings from sys_spec config file index
-
-struct CVarFileStatus
-{
-    AZStd::any editedValue;
-    AZStd::any overwrittenValue;
-    AZStd::any originalValue;
-    CVarFileStatus(AZStd::any edit, AZStd::any over, AZStd::any orig) : editedValue(edit), overwrittenValue(over), originalValue(orig) {}
-};
-
-// Description:
-//   Status of specific cvar for Editor mapping
-//   type - CVAR_INT / CVAR_FLOAT / CVAR_STRING
-//   cvarGroup - source of cvar (sys_spec_particles, sys_spec_physics, etc.) or "miscellaneous" if only specified in platform config file
-//   fileVals = CVarFileStatus for each spec level of a specific platform
-
-struct CVarInfo
-{
-    int type;
-    AZStd::string cvarGroup;
-    AZStd::vector<CVarFileStatus> fileVals;
-};
-
-enum class GraphicsSettings
-{
-    GameEffects,
-    Light,
-    ObjectDetail,
-    Particles,
-    Physics,
-    PostProcessing,
-    Quality,
-    Shading,
-    Shadows,
-    Sound,
-    Texture,
-    TextureResolution,
-    VolumetricEffects,
-    Water,
-    Miscellaneous,
-    numSettings
-};
-
-class GraphicsSettingsHeaderView;
-
-class GraphicsSettingsTreeView
-    : public QTreeView
-{
-    Q_OBJECT
-
-public:
-    GraphicsSettingsTreeView(QWidget* parent = nullptr);
-
-};
-
-class GraphicsSettingsModel
-    : public QStandardItemModel
-{
-    Q_OBJECT
-
-public:
-    explicit GraphicsSettingsModel(QObject* parent = 0);
-
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-};
-
-class GraphicsSettingsDialog
-    : public QDialog,
-      public ILoadConfigurationEntrySink
-{
-    Q_OBJECT
-
-public:
-
-    explicit GraphicsSettingsDialog(QWidget* parent = nullptr);
-    virtual ~GraphicsSettingsDialog();
-
-    bool IsCustom(void) { return m_showCustomSpec; }
-    void UnloadCustomSpec(int specLevel);
-
-    // ILoadConfigurationEntrySink
-    void OnLoadConfigurationEntry(const char* szKey, const char* szValue, const char* szGroup) override;
-
-public slots:
-    //Accept and reject
-    void reject() override;
-    void accept() override;
-
-private slots:
-    //Update UIs
-    void PlatformChanged(const QString& platform);
-    bool CVarChanged(AZStd::any val, const char* cvarName, int specLevel);
-    void CVarChanged(int i);
-    void CVarChanged(double d);
-    void CVarChanged(const QString& s);
-
-private:
-
-    // The struct ParameterWidget is used to store the parameter widget
-    // m_parameterName will be the name of the parameter the widget represent.
-    struct ParameterWidget
-    {
-        ParameterWidget(QWidget* widget, QString parameterName = "");
-
-        QString GetToolTip() const;
-
-        const char* PARAMETER_TOOLTIP = "The variable will update render parameter \"%1\".";
-        QWidget* m_widget;
-        QString m_parameterName;
-    };
-
-    struct CollapseGroup
-    {
-        QString m_groupName;
-        QStandardItem* m_groupRow;
-        QTreeView* m_treeView;
-        bool m_isCollapsed;
-
-        CollapseGroup(QTreeView* treeView);
-
-        void ToggleCollapsed();
-    };
-
-    void OpenCustomSpecDialog();
-    void ApplyCustomSpec(const QString& customFilePath);
-    bool IsCustomSpecAlreadyLoaded(const AZStd::string& filename) const;
-    void SetSettingsTree(int numColumns);
-    void SetCollapsed(const QModelIndex& index, bool flag);
-
-    enum CVarStateComparison
-    {
-        EDITED_OVERWRITTEN_COMPARE = 1,
-        EDITED_ORIGINAL_COMPARE = 2,
-        OVERWRITTEN_ORIGINAL_COMPARE = 3,
-
-        END_CVARSTATE_COMPARE,
-    };
-
-    bool CheckCVarStatesForDiff(AZStd::pair<AZStd::string, CVarInfo>* it, int cfgFileIndex, CVarStateComparison cmp);
-
-    // Save out settings into project-level cfg files
-    void SaveSystemSettings();
-
-    // Load in project-level cfg files for current platform
-    void LoadPlatformConfigurations();
-    // Build UI column for spec level of current platform
-    void BuildColumn(int specLevel);
-    // Initial UI building
-    void BuildUI();
-    // Cleaning out UI before loading new platform information
-    void CleanUI();
-    // Shows/hides custom spec option
-    void ShowCustomSpecOption(bool show);
-    // Shows/hides category labels and dropdowns
-    void ShowCategories(bool show);
-    // Warns about unsaved changes (returns true if accepted)
-    bool SendUnsavedChangesWarning(bool cancel);
-
-    void LoadCVarGroupDirectory(const AZStd::string& path);
-
-    /////////////////////////////////////////////
-    // UI help functions
-
-    // Setup collapsed buttons
-    void SetCollapsedLayout(const QString& groupName, QStandardItem* groupItem);
-    // Sets the platform entry index for the given platform
-    void SetPlatformEntry(ESystemConfigPlatform platform);
-    // Gets the platform enum given the platform name
-    ESystemConfigPlatform GetConfigPlatformFromName(const AZStd::string& platformName);
-
-    ////////////////////////////////////////////
-    // Members
-
-    // Qt values
-    const int INPUT_MIN_WIDTH = 100;
-    const int INPUT_MIN_HEIGHT = 20;
-    const int INPUT_ROW_SPAN = 1;
-    const int INPUT_COLUMN_SPAN = 1;
-    const int CVAR_ROW_OFFSET = 2;
-    const int CVAR_VALUE_COLUMN_OFFSET = 1;
-    const int PLATFORM_LABEL_ROW = 1;
-    const int CVAR_LABEL_COLUMN = 1;
-
-    // Tool tips
-    const QString SETTINGS_FILE_PATH = "Config/spec/";
-    const char* CFG_FILEFILTER = "Cfg File(*.cfg);;All files(*)";
-
-    const int m_numSpecLevels = 4;
-
-    bool m_showCustomSpec;
-    bool m_showCategories;
-    GraphicsSettingsModel* m_graphicsSettingsModel;
-    GraphicsSettingsHeaderView* m_headerView;
-    int m_numColumns{ 0 };
-
-    const char* m_cvarGroupsFolder = "Config/CVarGroups";
-
-    QScopedPointer<Ui::GraphicsSettingsDialog> m_ui;
-
-    QVector<CollapseGroup*> m_uiCollapseGroup;
-
-    QVector<ParameterWidget*> m_parameterWidgets;
-
-    AZStd::string m_currentConfigFilename;
-    size_t m_currentSpecIndex;
-
-    // cvar name --> pair(type, CVarStatus for each file)
-    AZStd::unordered_map<AZStd::string, CVarInfo> m_cVarTracker;
-
-    AZStd::unordered_map<ESystemConfigPlatform, AZStd::vector<AZStd::string> > m_cfgFiles;
-
-    AZStd::vector<AZStd::pair<AZStd::string, ESystemConfigPlatform> > m_platformStrings;
-
-    struct CVarGroupInfo
-    {
-        QVector<QLabel*> m_platformLabels;
-        QVector<QLabel*> m_cvarLabels;
-        QVector<AzQtComponents::SpinBox*> m_cvarSpinBoxes;
-        QVector<AzQtComponents::DoubleSpinBox*> m_cvarDoubleSpinBoxes;
-        QVector<QLineEdit*> m_cvarLineEdits;
-        QVector<QToolButton*> m_specFileArea;
-        QVector<QWidget*> m_widgetInsertOrder;
-        QStandardItem* m_treeRowItem;
-        int m_currentRow;
-    };
-
-    AZStd::unordered_map<AZStd::string, CVarGroupInfo> m_cvarGroupData;
-    AZStd::vector<AZStd::string> m_cvarGroupOrder;
-
-    ESystemConfigPlatform m_currentPlatform;
-
-    int m_dirtyCVarCount;
-};
-
-class GraphicsSettingsHeaderView
-    : public QHeaderView
-{
-        Q_OBJECT
-public:
-    GraphicsSettingsHeaderView(GraphicsSettingsDialog* dialog, Qt::Orientation orientation, QWidget* parent = nullptr);
-
-private:
-    bool event(QEvent* e) override;
-    void mouseMoveEvent(QMouseEvent* e) override;
-    void mouseReleaseEvent(QMouseEvent* e) override;
-
-    GraphicsSettingsDialog* m_dialog;
-    int m_index{ -1 };
-};
-
-
diff --git a/Code/Sandbox/Editor/GridUtils.h b/Code/Sandbox/Editor/GridUtils.h
deleted file mode 100644
index d66a0ff1dc..0000000000
--- a/Code/Sandbox/Editor/GridUtils.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_GRIDUTILS_H
-#define CRYINCLUDE_EDITOR_GRIDUTILS_H
-#pragma once
-
-
-namespace GridUtils
-{
-    template <typename F>
-    inline void IterateGrid(F& f, const float minPixelsPerTick, float zoomX, float originX, float fps, int left, int right)
-    {
-        float pixelsPerSecond = zoomX;
-        float pixelsPerFrame = pixelsPerSecond / fps;
-        float framesPerTick = ceil(minPixelsPerTick / pixelsPerFrame);
-        float scale = 1;
-        bool foundScale = false;
-        int numIters = 0;
-        for (float OOM = 1; !foundScale; OOM *= 10)
-        {
-            float scales[] = {1, 2, 5};
-            for (int scaleIndex = 0; !foundScale && scaleIndex < sizeof(scales) / sizeof(scales[0]); ++scaleIndex)
-            {
-                scale = scales[scaleIndex] * OOM;
-                if (framesPerTick <= scale + 0.1f)
-                {
-                    framesPerTick = scale;
-                    foundScale = true;
-                    if (numIters++ > 1000)
-                    {
-                        break;
-                    }
-                }
-            }
-            if (numIters++ > 1000)
-            {
-                break;
-            }
-        }
-        float pixelsPerTick = pixelsPerFrame * framesPerTick;
-        float timeAtLeft = -left / zoomX + originX;
-        float frameAtLeft = ceil(timeAtLeft * fps / framesPerTick) * framesPerTick;
-        float firstTick = floor((frameAtLeft / fps - originX) * zoomX + 0.5f) + left;
-        int frame = int(frameAtLeft);
-        int lockupPreventionCounter = 10000;
-        for (float tickX = firstTick; tickX < right && lockupPreventionCounter >= 0; tickX += pixelsPerTick, --lockupPreventionCounter)
-        {
-            f(frame, aznumeric_cast<int>(tickX));
-
-            frame += int(framesPerTick);
-        }
-    }
-}
-
-#endif // CRYINCLUDE_EDITOR_GRIDUTILS_H
diff --git a/Code/Sandbox/Editor/IEditor.h b/Code/Sandbox/Editor/IEditor.h
deleted file mode 100644
index ef20395a44..0000000000
--- a/Code/Sandbox/Editor/IEditor.h
+++ /dev/null
@@ -1,742 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_IEDITOR_H
-#define CRYINCLUDE_EDITOR_IEDITOR_H
-#pragma once
-
-#ifdef PLUGIN_EXPORTS
-#define PLUGIN_API DLL_EXPORT
-#else
-#define PLUGIN_API DLL_IMPORT
-#endif
-
-#include <ISystem.h>
-#include "Include/SandboxAPI.h"
-#include "Util/UndoUtil.h"
-#include <CryVersion.h>
-
-#include <WinWidgetId.h>
-
-#include <AzCore/Component/EntityId.h>
-
-class QMenu;
-
-struct CRuntimeClass;
-struct QtViewPane;
-class QMainWindow;
-struct QMetaObject;
-
-class CBaseObject;
-class CCryEditDoc;
-class CSelectionGroup;
-class CAnimationContext;
-class CTrackViewSequenceManager;
-class CGameEngine;
-struct IIconManager;
-class CToolBoxManager;
-class CClassFactory;
-class CMusicManager;
-struct IEditorParticleManager;
-class CEAXPresetManager;
-class CErrorReport;
-class CBaseLibraryItem;
-class ICommandManager;
-class CEditorCommandManager;
-class CHyperGraphManager;
-class CConsoleSynchronization;
-class CUIEnumsDatabase;
-struct ISourceControl;
-struct IEditorClassFactory;
-struct IDataBaseItem;
-struct ITransformManipulator;
-struct IDataBaseManager;
-class IFacialEditor;
-class CDialog;
-#if defined(AZ_PLATFORM_WINDOWS)
-class C3DConnexionDriver;
-#endif
-class CSettingsManager;
-struct IExportManager;
-class CDisplaySettings;
-struct SGizmoParameters;
-class CLevelIndependentFileMan;
-class CSelectionTreeManager;
-struct IResourceSelectorHost;
-struct SEditorSettings;
-class CGameExporter;
-class IAWSResourceManager;
-struct IEditorPanelUtils;
-
-namespace WinWidget
-{
-    class WinWidgetManager;
-}
-
-struct ISystem;
-struct IRenderer;
-struct AABB;
-struct IEventLoopHook;
-struct IErrorReport; // Vladimir@conffx
-struct IFileUtil;  // Vladimir@conffx
-struct IEditorLog;  // Vladimir@conffx
-struct IEditorMaterialManager;  // Vladimir@conffx
-struct IBaseLibraryManager;  // Vladimir@conffx
-struct IImageUtil;  // Vladimir@conffx
-struct IEditorParticleUtils;  // Leroy@conffx
-struct ILogFile; // Vladimir@conffx
-
-// Qt
-
-class QWidget;
-class QMimeData;
-class QString;
-class QColor;
-class QPixmap;
-
-#if !AZ_TRAIT_OS_PLATFORM_APPLE && !defined(AZ_PLATFORM_LINUX)
-typedef void* HANDLE;
-struct HWND__;
-typedef HWND__* HWND;
-#endif
-
-namespace Editor
-{
-    class EditorQtApplication;
-}
-
-
-// Global editor notify events.
-enum EEditorNotifyEvent
-{
-    // Global events.
-    eNotify_OnInit = 10,               // Sent after editor fully initialized.
-    eNotify_OnQuit,                    // Sent before editor quits.
-    eNotify_OnIdleUpdate,              // Sent every frame while editor is idle.
-
-    // Document events.
-    eNotify_OnBeginNewScene,           // Sent when the document is begin to be cleared.
-    eNotify_OnEndNewScene,             // Sent after the document have been cleared.
-    eNotify_OnBeginSceneOpen,          // Sent when document is about to be opened.
-    eNotify_OnEndSceneOpen,            // Sent after document have been opened.
-    eNotify_OnBeginSceneSave,          // Sent when document is about to be saved.
-    eNotify_OnEndSceneSave,            // Sent after document have been saved.
-    eNotify_OnBeginLayerExport,        // Sent when a layer is about to be exported.
-    eNotify_OnEndLayerExport,          // Sent after a layer have been exported.
-    eNotify_OnCloseScene,              // Send when the document is about to close.
-    eNotify_OnSceneClosed,             // Send when the document is closed.
-    eNotify_OnBeginLoad,               // Sent when the document is start to load.
-    eNotify_OnEndLoad,                 // Sent when the document loading is finished
-
-    // Editing events.
-    eNotify_OnEditModeChange,          // Sent when editing mode change (move,rotate,scale,....)
-    eNotify_OnEditToolChange,          // Sent when edit tool is changed (ObjectMode,TerrainModify,....)
-
-    // Deferred terrain create event.
-    eNotify_OnBeginTerrainCreate,      // Sent when terrain is created later (and not during level creation)
-    eNotify_OnEndTerrainCreate,        // Sent when terrain is created later (and not during level creation)
-
-    // Game related events.
-    eNotify_OnBeginGameMode,           // Sent when editor goes to game mode.
-    eNotify_OnEndGameMode,             // Sent when editor goes out of game mode.
-
-    // AI/Physics simulation related events.
-    eNotify_OnBeginSimulationMode,     // Sent when simulation mode is started.
-    eNotify_OnEndSimulationMode,       // Sent when editor goes out of simulation mode.
-
-    // UI events.
-    eNotify_OnUpdateViewports,         // Sent when editor needs to update data in the viewports.
-    eNotify_OnReloadTrackView,         // Sent when editor needs to update the track view.
-    eNotify_OnSplashScreenCreated,     // Sent when the editor splash screen was created.
-    eNotify_OnSplashScreenDestroyed,   // Sent when the editor splash screen was destroyed.
-
-    eNotify_OnInvalidateControls,      // Sent when editor needs to update some of the data that can be cached by controls like combo boxes.
-    eNotify_OnStyleChanged,            // Sent when UI color theme was changed
-
-    // Object events.
-    eNotify_OnSelectionChange,         // Sent when object selection change.
-    eNotify_OnPlaySequence,            // Sent when editor start playing animation sequence.
-    eNotify_OnStopSequence,            // Sent when editor stop playing animation sequence.
-
-    // Task specific events.
-    eNotify_OnTerrainRebuild,          // Sent when terrain was rebuilt (resized,...)
-    eNotify_OnBeginTerrainRebuild,     // Sent when terrain begin rebuilt (resized,...)
-    eNotify_OnEndTerrainRebuild,       // Sent when terrain end rebuilt (resized,...)
-    eNotify_OnVegetationObjectSelection, // When vegetation objects selection change.
-    eNotify_OnVegetationPanelUpdate,   // When vegetation objects selection change.
-
-    eNotify_OnDisplayRenderUpdate,     // Sent when editor finish terrain texture generation.
-
-    eNotify_OnDataBaseUpdate,          // DataBase Library was modified.
-
-    eNotify_OnLayerImportBegin,         //layer import was started
-    eNotify_OnLayerImportEnd,           //layer import completed
-
-    eNotify_OnBeginSWNewScene,          // Sent when SW document is begin to be cleared.
-    eNotify_OnEndSWNewScene,                // Sent after SW document have been cleared.
-    eNotify_OnBeginSWMoveTo,                // moveto operation was started
-    eNotify_OnEndSWMoveTo,          // moveto operation completed
-    eNotify_OnSWLockUnlock,             // Sent when commit, rollback or getting lock from segmented world
-    eNotify_OnSWVegetationStatusChange, // When changed segmented world status of vegetation map
-
-    eNotify_OnBeginUndoRedo,
-    eNotify_OnEndUndoRedo,
-    eNotify_CameraChanged, // When the active viewport camera was changed
-
-    eNotify_OnTextureLayerChange,      // Sent when texture layer was added, removed or moved
-
-    eNotify_OnSplatmapImport, // Sent when splatmaps get imported
-
-    eNotify_OnParticleUpdate,          // A particle effect was modified.
-    eNotify_OnAddAWSProfile,           // An AWS profile was added
-    eNotify_OnSwitchAWSProfile,        // The AWS profile was switched
-    eNotify_OnSwitchAWSDeployment,     // The AWS deployment was switched
-    eNotify_OnFirstAWSUse,             // This should only be emitted once
-
-    eNotify_OnRefCoordSysChange,
-
-    // Entity selection events.
-    eNotify_OnEntitiesSelected,
-    eNotify_OnEntitiesDeselected,
-
-    // More document events - added here in case enum values matter to any event consumers, metrics reporters, etc.
-    eNotify_OnBeginCreate,               // Sent when the document is starting to be created.
-    eNotify_OnEndCreate,                 // Sent when the document creation is finished.
-
-};
-
-// UI event handler
-struct IUIEvent
-{
-    virtual void OnClick(DWORD dwId) = 0;
-    virtual bool IsEnabled(DWORD dwId) = 0;
-    virtual bool IsChecked(DWORD dwId) = 0;
-    virtual const char* GetUIElementName(DWORD dwId) = 0;
-};
-
-//! Add object that implements this interface to Load listeners of IEditor
-//! To receive notifications when new document is loaded.
-struct IDocListener
-{
-    virtual ~IDocListener() = default;
-
-    //! Called after new level is created.
-    virtual void OnNewDocument() = 0;
-    //! Called after level have been loaded.
-    virtual void OnLoadDocument() = 0;
-    //! Called when document is being closed.
-    virtual void OnCloseDocument() = 0;
-};
-
-//! Derive from this class if you want to register for getting global editor notifications.
-struct IEditorNotifyListener
-{
-    bool m_bIsRegistered;
-
-    IEditorNotifyListener()
-        : m_bIsRegistered(false)
-    {
-    }
-    virtual ~IEditorNotifyListener()
-    {
-        if (m_bIsRegistered)
-        {
-            CryFatalError("Destroying registered IEditorNotifyListener");
-        }
-    }
-
-    //! called by the editor to notify the listener about the specified event.
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) = 0;
-};
-
-//! Axis constrains value.
-enum AxisConstrains
-{
-    AXIS_NONE = 0,
-    AXIS_X,
-    AXIS_Y,
-    AXIS_Z,
-    AXIS_XY,
-    AXIS_YZ,
-    AXIS_XZ,
-    AXIS_XYZ,
-    //! Follow terrain constrain
-    AXIS_TERRAIN,
-};
-
-//! Reference coordinate system values
-enum RefCoordSys
-{ // Don't change this order. Should be in the same order as MainWindow::CreateRefCoordComboBox()
-    COORDS_VIEW = 0,
-    COORDS_LOCAL,
-    COORDS_PARENT,
-    COORDS_WORLD,
-    COORDS_USERDEFINED,
-    LAST_COORD_SYSTEM, // Must always be the last member
-};
-
-// Insert locations for menu items
-enum EMenuInsertLocation
-{
-    // Custom menu of the plugin
-    eMenuPlugin,
-    // Predefined editor menus
-    eMenuEdit,
-    eMenuFile,
-    eMenuInsert,
-    eMenuGenerators,
-    eMenuScript,
-    eMenuView,
-    eMenuHelp
-};
-
-//! Global editor operation mode
-enum EOperationMode
-{
-    eOperationModeNone = 0, // None
-    eCompositingMode, // Normal operation mode where objects are composited in the scene
-    eModellingMode // Geometry modeling mode
-};
-
-//! Mouse events that viewport can send
-enum EMouseEvent
-{
-    eMouseMove,
-    eMouseLDown,
-    eMouseLUp,
-    eMouseLDblClick,
-    eMouseRDown,
-    eMouseRUp,
-    eMouseRDblClick,
-    eMouseMDown,
-    eMouseMUp,
-    eMouseMDblClick,
-    eMouseWheel,
-    eMouseLeave,
-};
-
-//! Viewports update flags
-enum UpdateConentFlags
-{
-    eUpdateHeightmap = 0x01,
-    eUpdateStatObj = 0x02,
-    eUpdateObjects = 0x04, //! Update objects in viewport.
-    eRedrawViewports = 0x08 //! Just redraw viewports..
-};
-
-enum MouseCallbackFlags
-{
-    MK_CALLBACK_FLAGS = 0x100
-};
-
-//! Types of database items
-enum EDataBaseItemType
-{
-    EDB_TYPE_MATERIAL,
-    EDB_TYPE_PARTICLE,
-    EDB_TYPE_MUSIC,
-    EDB_TYPE_EAXPRESET,
-    EDB_TYPE_SOUNDMOOD,
-    EDB_TYPE_FLARE
-};
-
-enum EEditorPathName
-{
-    EDITOR_PATH_OBJECTS,
-    EDITOR_PATH_TEXTURES,
-    EDITOR_PATH_SOUNDS,
-    EDITOR_PATH_MATERIALS,
-    EDITOR_PATH_UI_ICONS,
-    EDITOR_PATH_LAST
-};
-
-enum EModifiedModule
-{
-    eModifiedNothing = 0x0,
-    eModifiedTerrain = BIT(0),
-    eModifiedBrushes = BIT(1),
-    eModifiedEntities = BIT(2),
-    eModifiedAll = -1
-};
-
-//! Class provided by editor for various registration functions.
-struct CRegistrationContext
-{
-    CEditorCommandManager* pCommandManager;
-    CClassFactory* pClassFactory;
-};
-
-//! Interface provided by editor to reach status bar functionality.
-struct IMainStatusBar
-{
-    virtual void SetStatusText(const QString& text) = 0;
-    virtual QWidget* SetItem(QString indicatorName, QString text, QString tip, int iconId) = 0;
-    virtual QWidget* SetItem(QString indicatorName, QString text, QString tip, const QPixmap& icon) = 0;
-
-    virtual QWidget* GetItem(QString indicatorName) = 0;
-};
-
-// forward declaration
-struct IAnimSequence;
-class CTrackViewSequence;
-
-//! Interface to expose TrackViewSequenceManager functionality to SequenceComponent
-struct ITrackViewSequenceManager
-{
-    virtual IAnimSequence* OnCreateSequenceObject(QString name, bool isLegacySequence = true, AZ::EntityId entityId = AZ::EntityId()) = 0;
-
-    //! Notifies of the delete of a sequence entity OR legacy sequence object
-    //! @param entityId The Sequence Component Entity Id OR the legacy sequence object Id packed in the lower 32-bits, as returned from IAnimSequence::GetSequenceEntityId()
-    virtual void OnDeleteSequenceEntity(const AZ::EntityId& entityId) = 0;
-
-    //! Get the first sequence with the given name. They may be more than one sequence with this name.
-    //! Only intended for use with scripting or other cases where a user provides a name.
-    virtual CTrackViewSequence* GetSequenceByName(QString name) const = 0;
-
-    //! Get the sequence with the given EntityId. For legacy support, legacy sequences can be found by giving
-    //! the sequence ID in the lower 32 bits of the EntityId.
-    virtual CTrackViewSequence* GetSequenceByEntityId(const AZ::EntityId& entityId) const = 0;
-
-    virtual void OnCreateSequenceComponent(AZStd::intrusive_ptr<IAnimSequence>& sequence) = 0;
-
-    virtual void OnSequenceActivated(const AZ::EntityId& entityId) = 0;
-};
-
-//! Interface to expose TrackViewSequence functionality to SequenceComponent
-struct ITrackViewSequence
-{
-    virtual void Load() = 0;
-};
-
-//! Interface to permit usage of editor functionality inside the plugin
-struct IEditor
-{
-    virtual void DeleteThis() = 0;
-    //! Access to Editor ISystem interface.
-    virtual ISystem* GetSystem() = 0;
-    //! Access to class factory.
-    virtual IEditorClassFactory* GetClassFactory() = 0;
-    //! Access to commands manager.
-    virtual CEditorCommandManager* GetCommandManager() = 0;
-    virtual ICommandManager* GetICommandManager() = 0;
-    // Executes an Editor command.
-    virtual void ExecuteCommand(const char* sCommand, ...) = 0;
-    virtual void ExecuteCommand(const QString& sCommand) = 0;
-    virtual void SetDocument(CCryEditDoc* pDoc) = 0;
-    //! Get active document
-    virtual CCryEditDoc* GetDocument() const = 0;
-    //! Check if there is a level loaded
-    virtual bool IsLevelLoaded() const = 0;
-    //! Set document modified flag.
-    virtual void SetModifiedFlag(bool modified = true) = 0;
-    virtual void SetModifiedModule(EModifiedModule eModifiedModule, bool boSet = true) = 0;
-    virtual bool IsLevelExported() const = 0;
-    virtual bool SetLevelExported(bool boExported = true) = 0;
-    //! Check if active document is modified.
-    virtual bool IsModified() = 0;
-    //! Save current document.
-    virtual bool SaveDocument() = 0;
-    //! Legacy version of WriteToConsole; don't use.
-    virtual void WriteToConsole(const char* string) = 0;
-    //! Write the passed string to the editors console
-    virtual void WriteToConsole(const QString& string) = 0;
-    //! Set value of console variable.
-    virtual void SetConsoleVar(const char* var, float value) = 0;
-    //! Get value of console variable.
-    virtual float GetConsoleVar(const char* var) = 0;
-    //! Shows or Hides console window.
-    //! @return Previous visibility flag of console.
-    virtual bool ShowConsole(bool show) = 0;
-    // Get Main window status bar
-    virtual IMainStatusBar* GetMainStatusBar() = 0;
-    //! Change the message in the status bar
-    virtual void SetStatusText(const QString& pszString) = 0;
-    //! Query main window of the editor
-    virtual QMainWindow* GetEditorMainWindow() const = 0;
-    //! Returns the path of the editors Primary CD folder
-    virtual QString GetPrimaryCDFolder() = 0;
-    //! Get current level name (name only)
-    virtual QString GetLevelName() = 0;
-    //! Get path to folder of current level (Absolute, contains slash)
-    virtual QString GetLevelFolder() = 0;
-    //! Get path to folder of current level (absolute)
-    virtual QString GetLevelDataFolder() = 0;
-    //! Get path to folder of current level.
-    virtual QString GetSearchPath(EEditorPathName path) = 0;
-    //! This folder is supposed to store Sandbox user settings and state
-    virtual QString GetResolvedUserFolder() = 0;
-    //! Execute application and get console output.
-    virtual bool ExecuteConsoleApp(
-        const QString& CommandLine,
-        QString& OutputText,
-        bool bNoTimeOut = false,
-        bool bShowWindow = false) = 0;
-    //! Sets the document modified flag in the editor
-    virtual void SetDataModified() = 0;
-    //! Tells if editor startup is finished
-    virtual bool IsInitialized() const = 0;
-    //! Check if editor running in gaming mode.
-    virtual bool IsInGameMode() = 0;
-    //! Check if editor running in AI/Physics mode.
-    virtual bool IsInSimulationMode() = 0;
-    //! Set game mode of editor.
-    virtual void SetInGameMode(bool inGame) = 0;
-    //! Return true if Editor runs in the testing mode.
-    virtual bool IsInTestMode() = 0;
-    //! Return true if Editor runs in the preview mode.
-    virtual bool IsInPreviewMode() = 0;
-    //! Return true if Editor runs in the console only mode.
-    virtual bool IsInConsolewMode() = 0;
-    //! return true if editor is running the level load tests mode.
-    virtual bool IsInLevelLoadTestMode() = 0;
-    //! Return true if Editor runs in the material editing mode.
-    virtual bool IsInMatEditMode() = 0;
-    //! Enable/Disable updates of editor.
-    virtual void EnableUpdate(bool enable) = 0;
-    //! Enable/Disable accelerator table, (Enabled by default).
-    virtual void EnableAcceleratos(bool bEnable) = 0;
-    virtual SFileVersion GetFileVersion() = 0;
-    virtual SFileVersion GetProductVersion() = 0;
-    //! Retrieve pointer to game engine instance
-    virtual CGameEngine* GetGameEngine() = 0;
-    virtual CDisplaySettings* GetDisplaySettings() = 0;
-    virtual const SGizmoParameters& GetGlobalGizmoParameters() = 0;
-    //! Create new object
-    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;
-    virtual int ClearSelection() = 0;
-    //! Select object
-    virtual void SelectObject(CBaseObject* obj) = 0;
-    //! Lock current objects selection
-    //! While selection locked, other objects cannot be selected or unselected
-    virtual void LockSelection(bool bLock) = 0;
-    //! Check if selection is currently locked
-    virtual bool IsSelectionLocked() = 0;
-    //! Get access to object manager.
-    virtual struct IObjectManager* GetObjectManager() = 0;
-    virtual CSettingsManager* GetSettingsManager() = 0;
-    //! Get DB manager that own items of specified type.
-    virtual IDataBaseManager* GetDBItemManager(EDataBaseItemType itemType) = 0;
-    virtual IBaseLibraryManager* GetMaterialManagerLibrary() = 0; // Vladimir@conffx
-    virtual IEditorMaterialManager* GetIEditorMaterialManager() = 0; // Vladimir@Conffx
-    //! Returns IconManager.
-    virtual IIconManager* GetIconManager() = 0;
-    //! Get Panel Editor Utilities
-    virtual IEditorPanelUtils* GetEditorPanelUtils() = 0;
-    //! Get Music Manager.
-    virtual CMusicManager* GetMusicManager() = 0;
-    virtual float GetTerrainElevation(float x, float y) = 0;
-    virtual Editor::EditorQtApplication* GetEditorQtApplication() = 0;
-    virtual const QColor& GetColorByName(const QString& name) = 0;
-
-    virtual struct IMovieSystem* GetMovieSystem() = 0;
-    virtual class CPluginManager* GetPluginManager() = 0;
-    virtual class CViewManager* GetViewManager() = 0;
-    virtual class CViewport* GetActiveView() = 0;
-    virtual void SetActiveView(CViewport* viewport) = 0;
-    virtual struct IEditorFileMonitor* GetFileMonitor() = 0;
-
-    // These are needed for Qt integration:
-    virtual void RegisterEventLoopHook(IEventLoopHook* pHook) = 0;
-    virtual void UnregisterEventLoopHook(IEventLoopHook* pHook) = 0;
-    // ^^^
-
-    //! QMimeData is used by the Qt clipboard.
-    //! IMPORTANT: Any QMimeData allocated for the clipboard will be deleted
-    //! when the editor exists. If a QMimeData is allocated by a different
-    //! memory allocator (for example, in a different DLL) than the one used
-    //! by the main editor, a crash will occur on exit, if data is left in
-    //! the clipboard. The solution is to enfore all allocations of QMimeData
-    //! using CreateQMimeData().
-    virtual QMimeData* CreateQMimeData() const = 0;
-    virtual void DestroyQMimeData(QMimeData* data) const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Access for CLevelIndependentFileMan
-    // Manager can be used to register as an module that is asked before editor quits / loads level / creates level
-    // This gives the module the change to save changes or cancel the process
-    //////////////////////////////////////////////////////////////////////////
-    virtual class CLevelIndependentFileMan* GetLevelIndependentFileMan() = 0;
-    //! Notify all views that data is changed.
-    virtual void UpdateViews(int flags = 0xFFFFFFFF, const AABB* updateRegion = NULL) = 0;
-    virtual void ResetViews() = 0;
-    //! Update information in track view dialog.
-    virtual void ReloadTrackView() = 0;
-    //! Current position marker
-    virtual Vec3 GetMarkerPosition() = 0;
-    //! Set current position marker.
-    virtual void    SetMarkerPosition(const Vec3& pos) = 0;
-    //! Set current selected region.
-    virtual void    SetSelectedRegion(const AABB& box) = 0;
-    //! Get currently selected region.
-    virtual void    GetSelectedRegion(AABB& box) = 0;
-
-    virtual void SetOperationMode(EOperationMode mode) = 0;
-    virtual EOperationMode GetOperationMode() = 0;
-    //! Shows/Hides transformation manipulator.
-    //! if bShow is true also returns a valid ITransformManipulator pointer.
-    virtual ITransformManipulator* ShowTransformManipulator(bool bShow) = 0;
-    //! Return a pointer to a ITransformManipulator pointer if shown.
-    //! NULL is manipulator is not shown.
-    virtual ITransformManipulator* GetTransformManipulator() = 0;
-    //! Set constrain on specified axis for objects construction and modifications.
-    //! @param axis one of AxisConstrains enumerations.
-    virtual void SetAxisConstraints(AxisConstrains axis) = 0;
-    //! Get axis constrain for objects construction and modifications.
-    virtual AxisConstrains GetAxisConstrains() = 0;
-    //! Set whether axes are forced to the same value when they are changed (x = y = z).
-    virtual void SetAxisVectorLock(bool bAxisVectorLock) = 0;
-    //! Get whether axes are forced to the same value when they are changed (x = y = z).
-    virtual bool IsAxisVectorLocked() = 0;
-    //! If set, when axis terrain constrain is selected, snapping only to terrain.
-    virtual void SetTerrainAxisIgnoreObjects(bool bIgnore) = 0;
-    virtual bool IsTerrainAxisIgnoreObjects() = 0;
-    //! Set current reference coordinate system used when constructing/modifying objects.
-    virtual void SetReferenceCoordSys(RefCoordSys refCoords) = 0;
-    //! Get current reference coordinate system used when constructing/modifying objects.
-    virtual RefCoordSys GetReferenceCoordSys() = 0;
-    virtual XmlNodeRef FindTemplate(const QString& templateName) = 0;
-    virtual void AddTemplate(const QString& templateName, XmlNodeRef& tmpl) = 0;
-
-    virtual const QtViewPane* OpenView(QString sViewClassName, bool reuseOpen = true) = 0;
-    virtual QWidget* FindView(QString viewClassName) = 0;
-
-    virtual bool CloseView(const char* sViewClassName) = 0;
-    virtual bool SetViewFocus(const char* sViewClassName) = 0;
-    virtual void CloseView(const GUID& classId) = 0; // close ALL panels related to classId, used when unloading plugins.
-
-    // We want to open a view object but not wrap it in a view pane)
-    virtual QWidget* OpenWinWidget(WinWidgetId openId) = 0;
-    virtual WinWidget::WinWidgetManager* GetWinWidgetManager() const = 0;
-
-    //! Opens standard color selection dialog.
-    //! Initialized with the color specified in color parameter.
-    //! Returns true if selection is made and false if selection is canceled.
-    virtual bool SelectColor(QColor& color, QWidget* parent = 0) = 0;
-    //! Get shader enumerator.
-    virtual class CUndoManager* GetUndoManager() = 0;
-    //! Begin operation requiring undo
-    //! Undo manager enters holding state.
-    virtual void BeginUndo() = 0;
-    //! Restore all undo objects registered since last BeginUndo call.
-    //! @param bUndo if true all Undo object registered since BeginUpdate call up to this point will be undone.
-    virtual void RestoreUndo(bool undo = true) = 0;
-    //! Accept changes and registers an undo object with the undo manager.
-    //! This will allow the user to undo the operation.
-    virtual void AcceptUndo(const QString& name) = 0;
-    //! Cancel changes and restore undo objects.
-    virtual void CancelUndo() = 0;
-    //! Normally this is NOT needed but in special cases this can be useful.
-    //! This allows to group a set of Begin()/Accept() sequences to be undone in one operation.
-    virtual void SuperBeginUndo() = 0;
-    //! When a SuperBegin() used, this method is used to Accept.
-    //! This leaves the undo database in its modified state and registers the IUndoObjects with the undo system.
-    //! This will allow the user to undo the operation.
-    virtual void SuperAcceptUndo(const QString& name) = 0;
-    //! Cancel changes and restore undo objects.
-    virtual void SuperCancelUndo() = 0;
-    //! Suspend undo recording.
-    virtual void SuspendUndo() = 0;
-    //! Resume undo recording.
-    virtual void ResumeUndo() = 0;
-    // Undo last operation.
-    virtual void Undo() = 0;
-    //! Redo last undo.
-    virtual void Redo() = 0;
-    //! Check if undo information is recording now.
-    virtual bool IsUndoRecording() = 0;
-    //! Check if undo information is suspzended now.
-    virtual bool IsUndoSuspended() = 0;
-    //! Put new undo object, must be called between Begin and Accept/Cancel methods.
-    virtual void RecordUndo(struct IUndoObject* obj) = 0;
-    //! Completely flush all Undo and redo buffers.
-    //! Must be done on level reloads or global Fetch operation.
-    virtual bool FlushUndo(bool isShowMessage = false) = 0;
-    //! Clear the last N number of steps in the undo stack
-    virtual bool ClearLastUndoSteps(int steps) = 0;
-    //! Clear all current Redo steps in the undo stack
-    virtual bool ClearRedoStack() = 0;
-    //! Retrieve current animation context.
-    virtual CAnimationContext* GetAnimation() = 0;
-    //! Retrieve sequence manager
-    virtual CTrackViewSequenceManager* GetSequenceManager() = 0;
-    virtual ITrackViewSequenceManager* GetSequenceManagerInterface() = 0;
-
-    //! Returns external tools manager.
-    virtual CToolBoxManager* GetToolBoxManager() = 0;
-    //! Get global Error Report instance.
-    virtual IErrorReport* GetErrorReport() = 0;
-    virtual IErrorReport* GetLastLoadedLevelErrorReport() = 0;
-    virtual void StartLevelErrorReportRecording() = 0;
-    virtual void CommitLevelErrorReport() = 0;
-    // Retrieve interface to FileUtil
-    virtual IFileUtil* GetFileUtil() = 0;
-    // Notify all listeners about the specified event.
-    virtual void Notify(EEditorNotifyEvent event) = 0;
-    // Notify all listeners about the specified event, except for one.
-    virtual void NotifyExcept(EEditorNotifyEvent event, IEditorNotifyListener* listener) = 0;
-    //! Register Editor notifications listener.
-    virtual void RegisterNotifyListener(IEditorNotifyListener* listener) = 0;
-    //! Unregister Editor notifications listener.
-    virtual void UnregisterNotifyListener(IEditorNotifyListener* listener) = 0;
-    //! Register document notifications listener.
-    virtual void RegisterDocListener(IDocListener* listener) = 0;
-    //! Unregister document notifications listener.
-    virtual void UnregisterDocListener(IDocListener* listener) = 0;
-    //! Retrieve interface to the source control.
-    virtual ISourceControl* GetSourceControl() = 0;
-    //! Retrieve true if source control is provided and enabled in settings
-    virtual bool IsSourceControlAvailable() = 0;
-    //! Only returns true if source control is both available AND currently connected and functioning
-    virtual bool IsSourceControlConnected() = 0;
-
-    virtual CUIEnumsDatabase* GetUIEnumsDatabase() = 0;
-    virtual void AddUIEnums() = 0;
-    virtual void GetMemoryUsage(ICrySizer* pSizer) = 0;
-    virtual void ReduceMemory() = 0;
-
-    //! Export manager for exporting objects and a terrain from the game to DCC tools
-    virtual IExportManager* GetExportManager() = 0;
-    //! Set current configuration spec of the editor.
-    virtual void SetEditorConfigSpec(ESystemConfigSpec spec, ESystemConfigPlatform platform) = 0;
-    virtual ESystemConfigSpec GetEditorConfigSpec() const = 0;
-    virtual ESystemConfigPlatform GetEditorConfigPlatform() const = 0;
-    virtual void ReloadTemplates() = 0;
-    virtual IResourceSelectorHost* GetResourceSelectorHost() = 0;
-    virtual void ShowStatusText(bool bEnable) = 0;
-
-    // Provides a way to extend the context menu of an object. The function gets called every time the menu is opened.
-    typedef AZStd::function<void(QMenu*, const CBaseObject*)> TContextMenuExtensionFunc;
-    virtual void RegisterObjectContextMenuExtension(TContextMenuExtensionFunc func) = 0;
-
-    virtual SSystemGlobalEnvironment* GetEnv() = 0;
-    virtual IImageUtil* GetImageUtil() = 0;  // Vladimir@conffx
-    virtual SEditorSettings* GetEditorSettings() = 0;
-
-    virtual ILogFile* GetLogFile() = 0;  // Vladimir@conffx
-
-    // unload all plugins
-    virtual void UnloadPlugins() = 0;
-
-    // reloads the plugins
-    virtual void LoadPlugins() = 0;
-};
-
-//! Callback used by editor when initializing for info in UI dialogs
-struct IInitializeUIInfo
-{
-    virtual void SetInfoText(const char* text) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_IEDITOR_H
diff --git a/Code/Sandbox/Editor/IEditorImpl.cpp b/Code/Sandbox/Editor/IEditorImpl.cpp
deleted file mode 100644
index fc0ae12016..0000000000
--- a/Code/Sandbox/Editor/IEditorImpl.cpp
+++ /dev/null
@@ -1,1695 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CEditorImpl class implementation.
-
-#include "EditorDefs.h"
-
-#include "IEditorImpl.h"
-
-// Qt
-#include <QByteArray>
-
-// AWS Native SDK
-AZ_PUSH_DISABLE_WARNING(4251 4355 4996, "-Wunknown-warning-option")
-#include <aws/core/utils/memory/stl/AWSString.h>
-#include <aws/core/platform/FileSystem.h>
-AZ_POP_DISABLE_WARNING
-
-// AzCore
-#include <AzCore/JSON/document.h>
-
-// AzFramework
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/ColorPicker.h>
-#include <AzQtComponents/Utilities/Conversions.h>
-
-// Editor
-#include "CryEdit.h"
-#include "Dialogs/ErrorsDlg.h"
-#include "PluginManager.h"
-#include "IconManager.h"
-#include "ViewManager.h"
-#include "Objects/GizmoManager.h"
-#include "Objects/AxisGizmo.h"
-#include "DisplaySettings.h"
-#include "KeyboardCustomizationSettings.h"
-#include "Export/ExportManager.h"
-#include "LevelIndependentFileMan.h"
-#include "TrackView/TrackViewSequenceManager.h"
-#include "AnimationContext.h"
-#include "GameEngine.h"
-#include "ToolBox.h"
-#include "MainWindow.h"
-#include "UIEnumsDatabase.h"
-#include "RenderHelpers/AxisHelper.h"
-#include "Settings.h"
-#include "Include/IObjectManager.h"
-#include "Include/ISourceControl.h"
-#include "Objects/SelectionGroup.h"
-#include "Objects/ObjectManager.h"
-
-#include "EditorFileMonitor.h"
-#include "MainStatusBar.h"
-
-#include "ResourceSelectorHost.h"
-#include "Util/FileUtil_impl.h"
-#include "Util/ImageUtil_impl.h"
-#include "LogFileImpl.h"
-
-#include "Editor/AssetDatabase/AssetDatabaseLocationListener.h"
-#include "Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h"
-#include "Editor/AssetEditor/AssetEditorRequestsHandler.h"
-
-// EditorCommon
-#include <WinWidget/WinWidgetManager.h>
-
-// AWSNativeSDK
-#include <AWSNativeSDKInit/AWSNativeSDKInit.h>
-
-#include "IEditorPanelUtils.h"
-#include "EditorPanelUtils.h"
-
-
-// even in Release mode, the editor will return its heap, because there's no Profile build configuration for the editor
-#ifdef _RELEASE
-#undef _RELEASE
-#endif
-
-#include "Core/QtEditorApplication.h"                               // for Editor::EditorQtApplication
-
-static CCryEditDoc * theDocument;
-#include <QMimeData>
-#include <QMessageBox>
-#include <QProcess>
-
-#if defined(EXTERNAL_CRASH_REPORTING)
-#include <ToolsCrashHandler.h>
-#endif
-#ifndef VERIFY
-#define VERIFY(EXPRESSION) { auto e = EXPRESSION; assert(e); }
-#endif
-
-#undef GetCommandLine
-
-const char* CEditorImpl::m_crashLogFileName = "SessionStatus/editor_statuses.json";
-
-CEditorImpl::CEditorImpl()
-    : m_operationMode(eOperationModeNone)
-    , m_pSystem(nullptr)
-    , m_pFileUtil(nullptr)
-    , m_pClassFactory(nullptr)
-    , m_pCommandManager(nullptr)
-    , m_pObjectManager(nullptr)
-    , m_pPluginManager(nullptr)
-    , m_pViewManager(nullptr)
-    , m_pUndoManager(nullptr)
-    , m_marker(0, 0, 0)
-    , m_selectedAxis(AXIS_TERRAIN)
-    , m_refCoordsSys(COORDS_LOCAL)
-    , m_bAxisVectorLock(false)
-    , m_bUpdates(true)
-    , m_bTerrainAxisIgnoreObjects(false)
-    , m_pDisplaySettings(nullptr)
-    , m_pIconManager(nullptr)
-    , m_bSelectionLocked(true)
-    , m_pAxisGizmo(nullptr)
-    , m_pGameEngine(nullptr)
-    , m_pAnimationContext(nullptr)
-    , m_pSequenceManager(nullptr)
-    , m_pToolBoxManager(nullptr)
-    , m_pMusicManager(nullptr)
-    , m_pErrorReport(nullptr)
-    , m_pLasLoadedLevelErrorReport(nullptr)
-    , m_pErrorsDlg(nullptr)
-    , m_pSourceControl(nullptr)
-    , m_pSelectionTreeManager(nullptr)
-    , m_pUIEnumsDatabase(nullptr)
-    , m_pConsoleSync(nullptr)
-    , m_pSettingsManager(nullptr)
-    , m_pLevelIndependentFileMan(nullptr)
-    , m_pExportManager(nullptr)
-    , m_awsResourceManager(nullptr)
-    , m_bMatEditMode(false)
-    , m_bShowStatusText(true)
-    , m_bInitialized(false)
-    , m_bExiting(false)
-    , m_QtApplication(static_cast<Editor::EditorQtApplication*>(qApp))
-    , m_pImageUtil(nullptr)
-    , m_pLogFile(nullptr)
-    , m_panelEditorUtils(nullptr)
-{
-    // note that this is a call into EditorCore.dll, which stores the g_pEditorPointer for all shared modules that share EditorCore.dll
-    // this means that they don't need to do SetIEditor(...) themselves and its available immediately
-    SetIEditor(this);
-
-    m_pFileUtil = new CFileUtil_impl();
-    m_pLogFile = new CLogFileImpl();
-    m_pLevelIndependentFileMan = new CLevelIndependentFileMan;
-    SetPrimaryCDFolder();
-    gSettings.Load();
-
-    m_pErrorReport = new CErrorReport;
-    m_pClassFactory = CClassFactory::Instance();
-    m_pCommandManager = new CEditorCommandManager;
-    CRegistrationContext regCtx;
-    regCtx.pCommandManager = m_pCommandManager;
-    regCtx.pClassFactory = m_pClassFactory;
-    m_pEditorFileMonitor.reset(new CEditorFileMonitor());
-    m_pUIEnumsDatabase = new CUIEnumsDatabase;
-    m_pDisplaySettings = new CDisplaySettings;
-    m_pDisplaySettings->LoadRegistry();
-    m_pPluginManager = new CPluginManager;
-
-    m_panelEditorUtils = CreateEditorPanelUtils();
-
-    m_pObjectManager = new CObjectManager;
-    m_pViewManager = new CViewManager;
-    m_pIconManager = new CIconManager;
-    m_pUndoManager = new CUndoManager;
-    m_pToolBoxManager = new CToolBoxManager;
-    m_pSequenceManager = new CTrackViewSequenceManager;
-    m_pAnimationContext = new CAnimationContext;
-
-    m_pImageUtil = new CImageUtil_impl();
-    m_pResourceSelectorHost.reset(CreateResourceSelectorHost());
-    m_selectedRegion.min = Vec3(0, 0, 0);
-    m_selectedRegion.max = Vec3(0, 0, 0);
-    DetectVersion();
-    RegisterTools();
-
-    m_winWidgetManager.reset(new WinWidget::WinWidgetManager);
-
-    m_pAssetDatabaseLocationListener = nullptr;
-    m_pAssetBrowserRequestHandler = nullptr;
-    m_assetEditorRequestsHandler = nullptr;
-
-    AZ::IO::SystemFile::CreateDir("SessionStatus");
-    QFile::setPermissions(m_crashLogFileName, QFileDevice::ReadOther | QFileDevice::WriteOther);
-}
-
-void CEditorImpl::Initialize()
-{
-#if defined(EXTERNAL_CRASH_REPORTING)
-    CrashHandler::ToolsCrashHandler::InitCrashHandler("Editor", {});
-#endif
-
-    // Must be set before QApplication is initialized, so that we support HighDpi monitors, like the Retina displays
-    // on Windows 10
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
-
-    // Prevents (native) sibling widgets from causing problems with docked QOpenGLWidgets on Windows
-    // The problem is due to native widgets ending up with pixel formats that are incompatible with the GL pixel format
-    // (generally due to a lack of an alpha channel). This blocks the creation of a shared GL context.
-    // And on macOS it prevents all kinds of bugs related to native widgets, specially regarding toolbars (duplicate toolbars, artifacts, crashes).
-    QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
-
-    // Activate QT immediately so that its available as soon as CEditorImpl is (and thus GetIEditor())
-    InitializeEditorCommon(GetIEditor());
-}
-
-//The only purpose of that function is to be called at the very begining of the shutdown sequence so that we can instrument and track
-//how many crashes occur while shutting down
-void CEditorImpl::OnBeginShutdownSequence()
-{
-}
-
-void CEditorImpl::OnEarlyExitShutdownSequence()
-{
-}
-
-void CEditorImpl::Uninitialize()
-{
-    if (m_pSystem)
-    {
-        UninitializeEditorCommonISystem(m_pSystem);
-    }
-    UninitializeEditorCommon();
-}
-
-void CEditorImpl::UnloadPlugins()
-{
-    CryAutoLock<CryMutex> lock(m_pluginMutex);
-
-    // Flush core buses. We're about to unload DLLs and need to ensure we don't have module-owned functions left behind.
-    AZ::Data::AssetBus::ExecuteQueuedEvents();
-    AZ::TickBus::ExecuteQueuedEvents();
-
-    // first, stop anyone from accessing plugins that provide things like source control.
-    // note that m_psSourceControl is re-queried
-    m_pSourceControl = nullptr;
-
-    // Send this message to ensure that any widgets queued for deletion will get deleted before their
-    // plugin containing their vtable is unloaded. If not, access violations can occur
-    QCoreApplication::sendPostedEvents(Q_NULLPTR, QEvent::DeferredDelete);
-
-    GetPluginManager()->ReleaseAllPlugins();
-
-    GetPluginManager()->UnloadAllPlugins();
-}
-
-void CEditorImpl::LoadPlugins()
-{
-    CryAutoLock<CryMutex> lock(m_pluginMutex);
-
-    static const QString editor_plugins_folder("EditorPlugins");
-
-    // Build, verify, and set the engine root's editor plugin folder
-    QString editorPluginPathStr;
-
-    AZStd::string_view exeFolder;
-    AZ::ComponentApplicationBus::BroadcastResult(exeFolder, &AZ::ComponentApplicationRequests::GetExecutableFolder);
-
-    QDir testDir;
-    testDir.setPath(AZStd::string(exeFolder).c_str());
-    if (testDir.exists() && testDir.cd(editor_plugins_folder))
-    {
-        editorPluginPathStr = testDir.absolutePath();
-    }
-
-    // If no editor plugin path was found based on the root engine path, then fallback to the current editor.exe path
-    if (editorPluginPathStr.isEmpty())
-    {
-        editorPluginPathStr = QString("%1/%2").arg(qApp->applicationDirPath(), editor_plugins_folder);
-    }
-
-    QString pluginSearchPath = QDir::toNativeSeparators(QString("%1/*" AZ_DYNAMIC_LIBRARY_EXTENSION).arg(editorPluginPathStr));
-
-    GetPluginManager()->LoadPlugins(pluginSearchPath.toUtf8().data());
-}
-
-CEditorImpl::~CEditorImpl()
-{
-    gSettings.Save();
-    m_bExiting = true; // Can't save level after this point (while Crash)
-    SAFE_RELEASE(m_pSourceControl);
-
-    SAFE_DELETE(m_pIconManager)
-    SAFE_DELETE(m_pViewManager)
-    SAFE_DELETE(m_pObjectManager) // relies on prefab manager
-
-    SAFE_DELETE(m_panelEditorUtils);
-
-    // some plugins may be exporter - this must be above plugin manager delete.
-    SAFE_DELETE(m_pExportManager);
-
-    SAFE_DELETE(m_pPluginManager)
-    SAFE_DELETE(m_pAnimationContext) // relies on undo manager
-    SAFE_DELETE(m_pUndoManager)
-
-    if (m_pDisplaySettings)
-    {
-        m_pDisplaySettings->SaveRegistry();
-    }
-
-    SAFE_DELETE(m_pDisplaySettings)
-    SAFE_DELETE(m_pToolBoxManager)
-    SAFE_DELETE(m_pCommandManager)
-    SAFE_DELETE(m_pClassFactory)
-    SAFE_DELETE(m_pLasLoadedLevelErrorReport)
-    SAFE_DELETE(m_pUIEnumsDatabase)
-
-    SAFE_DELETE(m_pSettingsManager);
-
-    SAFE_DELETE(m_pAssetDatabaseLocationListener);
-    SAFE_DELETE(m_pAssetBrowserRequestHandler);
-    SAFE_DELETE(m_assetEditorRequestsHandler);
-
-    // Game engine should be among the last things to be destroyed, as it
-    // destroys the engine.
-    SAFE_DELETE(m_pErrorsDlg);
-    SAFE_DELETE(m_pLevelIndependentFileMan);
-    SAFE_DELETE(m_pGameEngine);
-    // The error report must be destroyed after the game, as the engine
-    // refers to the error report and the game destroys the engine.
-    SAFE_DELETE(m_pErrorReport);
-
-    SAFE_DELETE(m_pFileUtil); // Vladimir@Conffx
-    SAFE_DELETE(m_pImageUtil); // Vladimir@Conffx
-    SAFE_DELETE(m_pLogFile); // Vladimir@Conffx
-}
-
-void CEditorImpl::SetPrimaryCDFolder()
-{
-    QString szFolder = qApp->applicationDirPath();
-    QDir::setCurrent(szFolder);
-}
-
-void CEditorImpl::SetGameEngine(CGameEngine* ge)
-{
-    m_pAssetDatabaseLocationListener = new AssetDatabase::AssetDatabaseLocationListener();
-    m_pAssetBrowserRequestHandler = new AzAssetBrowserRequestHandler();
-    m_assetEditorRequestsHandler = aznew AssetEditorRequestsHandler();
-
-    m_pSystem = ge->GetSystem();
-    m_pGameEngine = ge;
-
-    InitializeEditorCommonISystem(m_pSystem);
-
-    m_templateRegistry.LoadTemplates("Editor");
-    m_pObjectManager->LoadClassTemplates("Editor");
-    m_pObjectManager->RegisterCVars();
-
-    m_pAnimationContext->Init();
-}
-
-void CEditorImpl::RegisterTools()
-{
-    CRegistrationContext rc;
-
-    rc.pCommandManager = m_pCommandManager;
-    rc.pClassFactory = m_pClassFactory;
-}
-
-void CEditorImpl::ExecuteCommand(const char* sCommand, ...)
-{
-    va_list args;
-    va_start(args, sCommand);
-    ExecuteCommand(QString::asprintf(sCommand, args));
-    va_end(args);
-}
-
-void CEditorImpl::ExecuteCommand(const QString& command)
-{
-    m_pCommandManager->Execute(command.toUtf8().data());
-}
-
-void CEditorImpl::Update()
-{
-    if (!m_bUpdates)
-    {
-        return;
-    }
-
-    // Make sure this is not called recursively
-    m_bUpdates = false;
-
-    FUNCTION_PROFILER(GetSystem(), PROFILE_EDITOR);
-
-    //@FIXME: Restore this latter.
-    //if (GetGameEngine() && GetGameEngine()->IsLevelLoaded())
-    {
-        m_pObjectManager->Update();
-    }
-    if (IsInPreviewMode())
-    {
-        SetModifiedFlag(FALSE);
-        SetModifiedModule(eModifiedNothing);
-    }
-
-    m_bUpdates = true;
-}
-
-ISystem* CEditorImpl::GetSystem()
-{
-    return m_pSystem;
-}
-
-IEditorClassFactory* CEditorImpl::GetClassFactory()
-{
-    return m_pClassFactory;
-}
-
-CCryEditDoc* CEditorImpl::GetDocument() const
-{
-    return theDocument;
-}
-
-bool CEditorImpl::IsLevelLoaded() const
-{
-    return GetDocument() && GetDocument()->IsDocumentReady();
-}
-
-void CEditorImpl::SetDocument(CCryEditDoc* pDoc)
-{
-    theDocument = pDoc;
-}
-
-void CEditorImpl::SetModifiedFlag(bool modified)
-{
-    if (GetDocument() && GetDocument()->IsDocumentReady())
-    {
-        GetDocument()->SetModifiedFlag(modified);
-
-        if (modified)
-        {
-            GetDocument()->SetLevelExported(false);
-        }
-    }
-}
-
-void CEditorImpl::SetModifiedModule(EModifiedModule eModifiedModule, bool boSet)
-{
-    if (GetDocument())
-    {
-        GetDocument()->SetModifiedModules(eModifiedModule, boSet);
-    }
-}
-
-bool CEditorImpl::IsLevelExported() const
-{
-    CCryEditDoc* pDoc = GetDocument();
-
-    if (pDoc)
-    {
-        return pDoc->IsLevelExported();
-    }
-
-    return false;
-}
-
-bool CEditorImpl::SetLevelExported(bool boExported)
-{
-    if (GetDocument())
-    {
-        GetDocument()->SetLevelExported(boExported);
-        return true;
-    }
-    return false;
-}
-
-bool CEditorImpl::IsModified()
-{
-    if (GetDocument())
-    {
-        return GetDocument()->IsModified();
-    }
-    return false;
-}
-
-bool CEditorImpl::SaveDocument()
-{
-    if (m_bExiting)
-    {
-        return false;
-    }
-
-    if (GetDocument())
-    {
-        return GetDocument()->Save();
-    }
-    else
-    {
-        return false;
-    }
-}
-
-QString CEditorImpl::GetPrimaryCDFolder()
-{
-    return m_primaryCDFolder;
-}
-
-QString CEditorImpl::GetLevelFolder()
-{
-    return GetGameEngine()->GetLevelPath();
-}
-
-QString CEditorImpl::GetLevelName()
-{
-    m_levelNameBuffer = GetGameEngine()->GetLevelName();
-    return m_levelNameBuffer;
-}
-
-QString CEditorImpl::GetLevelDataFolder()
-{
-    return Path::AddPathSlash(Path::AddPathSlash(GetGameEngine()->GetLevelPath()) + "LevelData");
-}
-
-QString CEditorImpl::GetSearchPath(EEditorPathName path)
-{
-    return gSettings.searchPaths[path][0];
-}
-
-QString CEditorImpl::GetResolvedUserFolder()
-{
-    m_userFolder = Path::GetResolvedUserSandboxFolder();
-    return m_userFolder;
-}
-
-void CEditorImpl::SetDataModified()
-{
-    GetDocument()->SetModifiedFlag(TRUE);
-}
-
-void CEditorImpl::SetStatusText(const QString& pszString)
-{
-    if (m_bShowStatusText && !m_bMatEditMode && GetMainStatusBar())
-    {
-        GetMainStatusBar()->SetStatusText(pszString);
-    }
-}
-
-IMainStatusBar* CEditorImpl::GetMainStatusBar()
-{
-    return MainWindow::instance()->StatusBar();
-}
-
-void CEditorImpl::SetOperationMode(EOperationMode mode)
-{
-    m_operationMode = mode;
-    gSettings.operationMode = mode;
-}
-
-EOperationMode CEditorImpl::GetOperationMode()
-{
-    return m_operationMode;
-}
-
-ITransformManipulator* CEditorImpl::ShowTransformManipulator(bool bShow)
-{
-    if (bShow)
-    {
-        if (!m_pAxisGizmo)
-        {
-            m_pAxisGizmo = new CAxisGizmo;
-            m_pAxisGizmo->AddRef();
-            GetObjectManager()->GetGizmoManager()->AddGizmo(m_pAxisGizmo);
-        }
-        return m_pAxisGizmo;
-    }
-    else
-    {
-        // Hide gizmo.
-        if (m_pAxisGizmo)
-        {
-            GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_pAxisGizmo);
-            m_pAxisGizmo->Release();
-        }
-        m_pAxisGizmo = 0;
-    }
-    return 0;
-}
-
-ITransformManipulator* CEditorImpl::GetTransformManipulator()
-{
-    return m_pAxisGizmo;
-}
-
-void CEditorImpl::SetAxisConstraints(AxisConstrains axisFlags)
-{
-    m_selectedAxis = axisFlags;
-    m_pViewManager->SetAxisConstrain(axisFlags);
-    SetTerrainAxisIgnoreObjects(false);
-
-    // Update all views.
-    UpdateViews(eUpdateObjects, NULL);
-}
-
-AxisConstrains CEditorImpl::GetAxisConstrains()
-{
-    return m_selectedAxis;
-}
-
-void CEditorImpl::SetTerrainAxisIgnoreObjects(bool bIgnore)
-{
-    m_bTerrainAxisIgnoreObjects = bIgnore;
-}
-
-bool CEditorImpl::IsTerrainAxisIgnoreObjects()
-{
-    return m_bTerrainAxisIgnoreObjects;
-}
-
-void CEditorImpl::SetReferenceCoordSys(RefCoordSys refCoords)
-{
-    m_refCoordsSys = refCoords;
-
-    // Update all views.
-    UpdateViews(eUpdateObjects, NULL);
-
-    // Update the construction plane infos.
-    CViewport* pViewport = GetActiveView();
-    if (pViewport)
-    {
-        //Pre and Post widget rendering calls are made here to make sure that the proper camera state is set.
-        //MakeConstructionPlane will make a call to ViewToWorldRay which needs the correct camera state 
-        //in the CRenderViewport to be set. 
-        pViewport->PreWidgetRendering();
-
-        pViewport->MakeConstructionPlane(GetIEditor()->GetAxisConstrains());
-
-        pViewport->PostWidgetRendering();
-    }
-
-    Notify(eNotify_OnRefCoordSysChange);
-}
-
-RefCoordSys CEditorImpl::GetReferenceCoordSys()
-{
-    return m_refCoordsSys;
-}
-
-CBaseObject* CEditorImpl::NewObject(const char* typeName, const char* fileName, const char* name, float x, float y, float z, bool modifyDoc)
-{
-    CUndo undo("Create new object");
-
-    IEditor* editor = GetIEditor();
-    if (modifyDoc)
-    {
-        editor->SetModifiedFlag();
-        editor->SetModifiedModule(eModifiedBrushes);
-    }
-    CBaseObject* object = editor->GetObjectManager()->NewObject(typeName, 0, fileName, name);
-    if (!object)
-    {
-        return nullptr;
-    }
-
-    object->SetPos(Vec3(x, y, z));
-
-    return object;
-}
-
-const SGizmoParameters& CEditorImpl::GetGlobalGizmoParameters()
-{
-    if (!m_pGizmoParameters.get())
-    {
-        m_pGizmoParameters.reset(new SGizmoParameters());
-    }
-
-    m_pGizmoParameters->axisConstraint = m_selectedAxis;
-    m_pGizmoParameters->referenceCoordSys = m_refCoordsSys;
-    m_pGizmoParameters->axisGizmoScale = gSettings.gizmo.axisGizmoSize;
-    m_pGizmoParameters->axisGizmoText = gSettings.gizmo.axisGizmoText;
-
-    return *m_pGizmoParameters;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEditorImpl::DeleteObject(CBaseObject* obj)
-{
-    SetModifiedFlag();
-    GetIEditor()->SetModifiedModule(eModifiedBrushes);
-    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)
-    {
-        return nullptr;
-    }
-    return m_pObjectManager->GetSelection()->GetObject(0);
-}
-
-void CEditorImpl::SelectObject(CBaseObject* obj)
-{
-    GetObjectManager()->SelectObject(obj);
-}
-
-IObjectManager* CEditorImpl::GetObjectManager()
-{
-    return m_pObjectManager;
-};
-
-CSettingsManager* CEditorImpl::GetSettingsManager()
-{
-    // Do not go any further before XML class is ready to use
-    if (!gEnv)
-    {
-        return nullptr;
-    }
-
-    if (!GetISystem())
-    {
-        return nullptr;
-    }
-
-    if (!m_pSettingsManager)
-    {
-        m_pSettingsManager = new CSettingsManager(eSettingsManagerMemoryStorage);
-    }
-
-    return m_pSettingsManager;
-}
-
-CSelectionGroup* CEditorImpl::GetSelection()
-{
-    return m_pObjectManager->GetSelection();
-}
-
-int CEditorImpl::ClearSelection()
-{
-    if (GetSelection()->IsEmpty())
-    {
-        return 0;
-    }
-    CUndo undo("Clear Selection");
-    return GetObjectManager()->ClearSelection();
-}
-
-void CEditorImpl::LockSelection(bool bLock)
-{
-    // Selection must be not empty to enable selection lock.
-    if (!GetSelection()->IsEmpty())
-    {
-        m_bSelectionLocked = bLock;
-    }
-    else
-    {
-        m_bSelectionLocked = false;
-    }
-}
-
-bool CEditorImpl::IsSelectionLocked()
-{
-    return m_bSelectionLocked;
-}
-
-CViewManager* CEditorImpl::GetViewManager()
-{
-    return m_pViewManager;
-}
-
-CViewport* CEditorImpl::GetActiveView()
-{
-    MainWindow* mainWindow = MainWindow::instance();
-    if (mainWindow)
-    {
-        CLayoutViewPane* viewPane = mainWindow->GetActiveView();
-        if (viewPane)
-        {
-            return qobject_cast<QtViewport*>(viewPane->GetViewport());
-        }
-    }
-    return nullptr;
-}
-
-void CEditorImpl::SetActiveView(CViewport* viewport)
-{
-    m_pViewManager->SelectViewport(viewport);
-}
-
-void CEditorImpl::UpdateViews(int flags, const AABB* updateRegion)
-{
-    AABB prevRegion = m_pViewManager->GetUpdateRegion();
-    if (updateRegion)
-    {
-        m_pViewManager->SetUpdateRegion(*updateRegion);
-    }
-    m_pViewManager->UpdateViews(flags);
-    if (updateRegion)
-    {
-        m_pViewManager->SetUpdateRegion(prevRegion);
-    }
-}
-
-void CEditorImpl::ReloadTrackView()
-{
-    Notify(eNotify_OnReloadTrackView);
-}
-
-void CEditorImpl::ResetViews()
-{
-    m_pViewManager->ResetViews();
-
-    m_pDisplaySettings->SetRenderFlags(m_pDisplaySettings->GetRenderFlags());
-}
-
-IIconManager* CEditorImpl::GetIconManager()
-{
-    return m_pIconManager;
-}
-
-IEditorFileMonitor* CEditorImpl::GetFileMonitor()
-{
-    return m_pEditorFileMonitor.get();
-}
-
-void CEditorImpl::RegisterEventLoopHook(IEventLoopHook* pHook)
-{
-    CCryEditApp::instance()->RegisterEventLoopHook(pHook);
-}
-
-void CEditorImpl::UnregisterEventLoopHook(IEventLoopHook* pHook)
-{
-    CCryEditApp::instance()->UnregisterEventLoopHook(pHook);
-}
-
-float CEditorImpl::GetTerrainElevation(float x, float y)
-{
-    float terrainElevation = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
-    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainElevation
-        , &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats, x, y,
-        AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, nullptr);
-    return terrainElevation;
-}
-
-const QColor& CEditorImpl::GetColorByName(const QString& name)
-{
-    return m_QtApplication->GetColorByName(name);
-}
-
-void CEditorImpl::SetSelectedRegion(const AABB& box)
-{
-    m_selectedRegion = box;
-}
-
-void CEditorImpl::GetSelectedRegion(AABB& box)
-{
-    box = m_selectedRegion;
-}
-
-const QtViewPane* CEditorImpl::OpenView(QString sViewClassName, bool reuseOpened)
-{
-    auto openMode = reuseOpened ? QtViewPane::OpenMode::None : QtViewPane::OpenMode::MultiplePanes;
-    return QtViewPaneManager::instance()->OpenPane(sViewClassName, openMode);
-}
-
-QWidget* CEditorImpl::OpenWinWidget(WinWidgetId openId)
-{
-    if (m_winWidgetManager)
-    {
-        return m_winWidgetManager->OpenWinWidget(openId);
-    }
-    return nullptr;
-}
-
-WinWidget::WinWidgetManager* CEditorImpl::GetWinWidgetManager() const
-{
-    return m_winWidgetManager.get();
-}
-
-QWidget* CEditorImpl::FindView(QString viewClassName)
-{
-    return QtViewPaneManager::instance()->GetView(viewClassName);
-}
-
-// Intended to give a window focus only if it is currently open
-bool CEditorImpl::SetViewFocus(const char* sViewClassName)
-{
-    QWidget* findWindow = FindView(sViewClassName);
-    if (findWindow)
-    {
-        findWindow->setFocus(Qt::OtherFocusReason);
-        return true;
-    }
-    return false;
-}
-
-bool CEditorImpl::CloseView(const char* sViewClassName)
-{
-    return QtViewPaneManager::instance()->ClosePane(sViewClassName);
-}
-
-void CEditorImpl::CloseView(const GUID& classId)
-{
-    IClassDesc* found = GetClassFactory()->FindClass(classId);
-    if (found)
-    {
-        CloseView(found->ClassName().toUtf8().data());
-    }
-}
-
-IDataBaseManager* CEditorImpl::GetDBItemManager([[maybe_unused]] EDataBaseItemType itemType)
-{
-    return 0;
-}
-
-bool CEditorImpl::SelectColor(QColor& color, QWidget* parent)
-{
-    const AZ::Color c = AzQtComponents::fromQColor(color);
-    AzQtComponents::ColorPicker dlg(AzQtComponents::ColorPicker::Configuration::RGB, tr("Select Color"), parent);
-    dlg.setCurrentColor(c);
-    dlg.setSelectedColor(c);
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        color = AzQtComponents::toQColor(dlg.currentColor());
-        return true;
-    }
-    return false;
-}
-
-void CEditorImpl::SetInGameMode(bool inGame)
-{
-    static bool bWasInSimulationMode(false);
-
-    if (inGame)
-    {
-        bWasInSimulationMode = GetIEditor()->GetGameEngine()->GetSimulationMode();
-        GetIEditor()->GetGameEngine()->SetSimulationMode(false);
-        GetIEditor()->GetGameEngine()->RequestSetGameMode(true);
-    }
-    else
-    {
-        GetIEditor()->GetGameEngine()->RequestSetGameMode(false);
-        GetIEditor()->GetGameEngine()->SetSimulationMode(bWasInSimulationMode);
-    }
-}
-
-bool CEditorImpl::IsInGameMode()
-{
-    if (m_pGameEngine)
-    {
-        return m_pGameEngine->IsInGameMode();
-    }
-    return false;
-}
-
-bool CEditorImpl::IsInSimulationMode()
-{
-    if (m_pGameEngine)
-    {
-        return m_pGameEngine->GetSimulationMode();
-    }
-    return false;
-}
-
-bool CEditorImpl::IsInTestMode()
-{
-    return CCryEditApp::instance()->IsInTestMode();
-}
-
-bool CEditorImpl::IsInConsolewMode()
-{
-    return CCryEditApp::instance()->IsInConsoleMode();
-}
-
-bool CEditorImpl::IsInLevelLoadTestMode()
-{
-    return CCryEditApp::instance()->IsInLevelLoadTestMode();
-}
-
-bool CEditorImpl::IsInPreviewMode()
-{
-    return CCryEditApp::instance()->IsInPreviewMode();
-}
-
-void CEditorImpl::EnableAcceleratos(bool bEnable)
-{
-    KeyboardCustomizationSettings::EnableShortcutsGlobally(bEnable);
-}
-
-static AZStd::string SafeGetStringFromDocument(rapidjson::Document& projectCfg, const char* memberName)
-{
-    if (projectCfg.HasMember(memberName) && projectCfg[memberName].IsString())
-    {
-        return projectCfg[memberName].GetString();
-    }
-
-    return "";
-}
-
-AZStd::string CEditorImpl::LoadProjectIdFromProjectData()
-{
-    const char* MissingProjectId = "";
-
-    // get the full path of the project.json
-    AZStd::string fullPath;
-    AZStd::string relPath("project.json");
-    bool fullPathFound = false;
-
-    using namespace AzToolsFramework;
-    AssetSystemRequestBus::BroadcastResult(fullPathFound, &AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath, relPath, fullPath);
-
-    if (!fullPathFound)
-    {
-        return MissingProjectId;
-    }
-
-    QFile file(fullPath.c_str());
-    if (!file.open(QIODevice::ReadOnly))
-    {
-        return MissingProjectId;
-    }
-
-    // Read the project.json file using its full path
-    QByteArray fileContents = file.readAll();
-    file.close();
-
-    rapidjson::Document projectCfg;
-    projectCfg.Parse(fileContents);
-
-    if (!projectCfg.IsObject())
-    {
-        return MissingProjectId;
-    }
-
-    AZStd::string projectId = SafeGetStringFromDocument(projectCfg, "project_id");
-
-    // if we don't have a valid projectId by now, it's not happening
-    if (projectId.empty() || projectId[0] == '\0')
-    {
-        return MissingProjectId;
-    }
-
-    // get the project Id and project name from the project.json file
-    QString projectName(SafeGetStringFromDocument(projectCfg, "project_name").data());
-
-    QFileInfo fileInfo(fullPath.c_str());
-    QDir folderDirectory = fileInfo.dir();
-
-    // get the project name from the folder directory
-    QString editorProjectName = folderDirectory.dirName();
-
-    // if the project name in the file doesn't match the directory name, it probably means that this is
-    // a copied project, and not safe to put any plain text into the projectId string
-    if (editorProjectName.compare(projectName, Qt::CaseInsensitive) != 0)
-    {
-        return projectId;
-    }
-
-    // get the project Id generated by using the project name from the folder directory
-    QByteArray editorProjectNameUtf8 = editorProjectName.toUtf8();
-    AZ::Uuid id = AZ::Uuid::CreateName(editorProjectNameUtf8.constData());
-
-    // The projects that Open 3D Engine ships with had their project IDs hand-generated based on the name of the level.
-    // Therefore, if the UUID from the project name is the same as the UUID in the file, it's one of our projects
-    // and we can therefore send the name back, making it easier for Metrics to determine which level it was.
-    // We are checking to see if this is a project we ship with Open 3D Engine, and therefore we can unobfuscate non-customer information.
-    if (id != AZ::Uuid(projectId.data()))
-    {
-        return projectId;
-    }
-
-    QByteArray projectNameUtf8 = projectName.toUtf8();
-
-    projectId += " [";
-    projectId += projectNameUtf8.constData();
-    projectId += "]";
-
-    return projectId;
-}
-
-void CEditorImpl::DetectVersion()
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    char exe[_MAX_PATH];
-    DWORD dwHandle;
-    UINT len;
-
-    char ver[1024 * 8];
-
-    GetModuleFileName(NULL, exe, _MAX_PATH);
-
-    int verSize = GetFileVersionInfoSize(exe, &dwHandle);
-    if (verSize > 0)
-    {
-        GetFileVersionInfo(exe, dwHandle, 1024 * 8, ver);
-        VS_FIXEDFILEINFO* vinfo;
-        VerQueryValue(ver, "\\", (void**)&vinfo, &len);
-
-        m_fileVersion.v[0] = vinfo->dwFileVersionLS & 0xFFFF;
-        m_fileVersion.v[1] = vinfo->dwFileVersionLS >> 16;
-        m_fileVersion.v[2] = vinfo->dwFileVersionMS & 0xFFFF;
-        m_fileVersion.v[3] = vinfo->dwFileVersionMS >> 16;
-
-        m_productVersion.v[0] = vinfo->dwProductVersionLS & 0xFFFF;
-        m_productVersion.v[1] = vinfo->dwProductVersionLS >> 16;
-        m_productVersion.v[2] = vinfo->dwProductVersionMS & 0xFFFF;
-        m_productVersion.v[3] = vinfo->dwProductVersionMS >> 16;
-    }
-#else
-    // This requires the application version to be set using QCoreApplication::setApplicationVersion, which isn't done yet.
-    const QString version = qApp->applicationVersion();
-    if (!version.isEmpty())
-    {
-        QByteArray versionBytes = version.toUtf8();
-        m_fileVersion.Set(versionBytes.data());
-        m_productVersion.Set(versionBytes.data());
-    }
-#endif
-}
-
-XmlNodeRef CEditorImpl::FindTemplate(const QString& templateName)
-{
-    return m_templateRegistry.FindTemplate(templateName);
-}
-
-void CEditorImpl::AddTemplate(const QString& templateName, XmlNodeRef& tmpl)
-{
-    m_templateRegistry.AddTemplate(templateName, tmpl);
-}
-
-bool CEditorImpl::ExecuteConsoleApp(const QString& CommandLine, QString& OutputText, [[maybe_unused]] bool bNoTimeOut, bool bShowWindow)
-{
-    CLogFile::FormatLine("Executing console application '%s'", CommandLine.toUtf8().data());
-
-    QProcess process;
-    if (bShowWindow)
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        process.start("cmd.exe", { QString("/C %1").arg(CommandLine) });
-#elif defined(AZ_PLATFORM_LINUX)
-       //KDAB_TODO
-#elif defined(AZ_PLATFORM_MAC)
-        process.start("/usr/bin/osascript", { QString("-e 'tell application \"Terminal\" to do script \"%1\"'").arg(QString(CommandLine).replace("\"", "\\\"")) });
-#else
-        process.start("/usr/bin/csh", { QString("-c \"%1\"'").arg(QString(CommandLine).replace("\"", "\\\"")) } );
-#endif
-    }
-    else
-    {
-        process.start(CommandLine, QStringList());
-    }
-
-    if (!process.waitForStarted())
-    {
-        return false;
-    }
-
-    // Wait for the process to finish
-    process.waitForFinished();
-    if (!bShowWindow)
-    {
-        OutputText = process.readAllStandardOutput();
-    }
-
-    return true;
-}
-
-void CEditorImpl::BeginUndo()
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Begin();
-    }
-}
-
-void CEditorImpl::RestoreUndo(bool undo)
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Restore(undo);
-    }
-}
-
-void CEditorImpl::AcceptUndo(const QString& name)
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Accept(name);
-    }
-}
-
-void CEditorImpl::CancelUndo()
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Cancel();
-    }
-}
-
-void CEditorImpl::SuperBeginUndo()
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->SuperBegin();
-    }
-}
-
-void CEditorImpl::SuperAcceptUndo(const QString& name)
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->SuperAccept(name);
-    }
-}
-
-void CEditorImpl::SuperCancelUndo()
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->SuperCancel();
-    }
-}
-
-void CEditorImpl::SuspendUndo()
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Suspend();
-    }
-}
-
-void CEditorImpl::ResumeUndo()
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Resume();
-    }
-}
-
-void CEditorImpl::Undo()
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Undo();
-    }
-}
-
-void CEditorImpl::Redo()
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Redo();
-    }
-}
-
-bool CEditorImpl::IsUndoRecording()
-{
-    if (m_pUndoManager)
-    {
-        return m_pUndoManager->IsUndoRecording();
-    }
-    return false;
-}
-
-bool CEditorImpl::IsUndoSuspended()
-{
-    if (m_pUndoManager)
-    {
-        return m_pUndoManager->IsUndoSuspended();
-    }
-    return false;
-}
-
-void CEditorImpl::RecordUndo(IUndoObject* obj)
-{
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->RecordUndo(obj);
-    }
-}
-
-bool CEditorImpl::FlushUndo(bool isShowMessage)
-{
-    if (isShowMessage && m_pUndoManager && m_pUndoManager->IsHaveUndo() && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Flush Undo"), QObject::tr("After this operation undo will not be available! Are you sure you want to continue?")) != QMessageBox::Yes)
-    {
-        return false;
-    }
-
-    if (m_pUndoManager)
-    {
-        m_pUndoManager->Flush();
-    }
-    return true;
-}
-
-bool CEditorImpl::ClearLastUndoSteps(int steps)
-{
-    if (!m_pUndoManager || !m_pUndoManager->IsHaveUndo())
-    {
-        return false;
-    }
-
-    m_pUndoManager->ClearUndoStack(steps);
-    return true;
-}
-
-bool CEditorImpl::ClearRedoStack()
-{
-    if (!m_pUndoManager || !m_pUndoManager->IsHaveRedo())
-    {
-        return false;
-    }
-
-    m_pUndoManager->ClearRedoStack();
-    return true;
-}
-
-void CEditorImpl::SetConsoleVar(const char* var, float value)
-{
-    ICVar* ivar = GetSystem()->GetIConsole()->GetCVar(var);
-    if (ivar)
-    {
-        ivar->Set(value);
-    }
-}
-
-float CEditorImpl::GetConsoleVar(const char* var)
-{
-    ICVar* ivar = GetSystem()->GetIConsole()->GetCVar(var);
-    if (ivar)
-    {
-        return ivar->GetFVal();
-    }
-    return 0;
-}
-
-CAnimationContext* CEditorImpl::GetAnimation()
-{
-    return m_pAnimationContext;
-}
-
-CTrackViewSequenceManager* CEditorImpl::GetSequenceManager()
-{
-    return m_pSequenceManager;
-}
-
-ITrackViewSequenceManager* CEditorImpl::GetSequenceManagerInterface()
-{
-    return GetSequenceManager();
-}
-
-void CEditorImpl::RegisterDocListener(IDocListener* listener)
-{
-    CCryEditDoc* doc = GetDocument();
-    if (doc)
-    {
-        doc->RegisterListener(listener);
-    }
-}
-
-void CEditorImpl::UnregisterDocListener(IDocListener* listener)
-{
-    CCryEditDoc* doc = GetDocument();
-    if (doc)
-    {
-        doc->UnregisterListener(listener);
-    }
-}
-
-void CEditorImpl::StartLevelErrorReportRecording()
-{
-    IErrorReport* errorReport = GetErrorReport();
-    if (errorReport)
-    {
-        errorReport->Clear();
-        errorReport->SetImmediateMode(false);
-        errorReport->SetShowErrors(true);
-    }
-}
-
-// Confetti Start: Leroy Sikkes
-void CEditorImpl::Notify(EEditorNotifyEvent event)
-{
-    NotifyExcept(event, nullptr);
-}
-
-void CEditorImpl::NotifyExcept(EEditorNotifyEvent event, IEditorNotifyListener* listener)
-{
-    if (m_bExiting)
-    {
-        return;
-    }
-
-    std::list<IEditorNotifyListener*>::iterator it = m_listeners.begin();
-    while (it != m_listeners.end())
-    {
-        if (*it == listener)
-        {
-            it++;
-            continue; // skip "except" listener
-        }
-
-        (*it++)->OnEditorNotifyEvent(event);
-    }
-
-    if (event == eNotify_OnBeginNewScene)
-    {
-        if (m_pAxisGizmo)
-        {
-            m_pAxisGizmo->Release();
-        }
-        m_pAxisGizmo = 0;
-    }
-
-    if (event == eNotify_OnInit)
-    {
-        REGISTER_COMMAND("py", CmdPy, 0, "Execute a Python code snippet.");
-    }
-
-    GetPluginManager()->NotifyPlugins(event);
-}
-// Confetti end: Leroy Sikkes
-
-void CEditorImpl::RegisterNotifyListener(IEditorNotifyListener* listener)
-{
-    listener->m_bIsRegistered = true;
-    stl::push_back_unique(m_listeners, listener);
-}
-
-void CEditorImpl::UnregisterNotifyListener(IEditorNotifyListener* listener)
-{
-    m_listeners.remove(listener);
-    listener->m_bIsRegistered = false;
-}
-
-ISourceControl* CEditorImpl::GetSourceControl()
-{
-    CryAutoLock<CryMutex> lock(m_pluginMutex);
-
-    if (m_pSourceControl)
-    {
-        return m_pSourceControl;
-    }
-
-    IEditorClassFactory* classFactory = GetIEditor() ? GetIEditor()->GetClassFactory() : nullptr;
-    if (classFactory)
-    {
-        std::vector<IClassDesc*> classes;
-        classFactory->GetClassesBySystemID(ESYSTEM_CLASS_SCM_PROVIDER, classes);
-        for (int i = 0; i < classes.size(); i++)
-        {
-            IClassDesc* pClass = classes[i];
-            ISourceControl* pSCM = NULL;
-            HRESULT hRes = pClass->QueryInterface(__uuidof(ISourceControl), (void**)&pSCM);
-            if (!FAILED(hRes) && pSCM)
-            {
-                m_pSourceControl = pSCM;
-                return m_pSourceControl;
-            }
-        }
-    }
-
-    return 0;
-}
-
-bool CEditorImpl::IsSourceControlAvailable()
-{
-    if ((gSettings.enableSourceControl) && (GetSourceControl()))
-    {
-        return true;
-    }
-
-    return false;
-}
-
-bool CEditorImpl::IsSourceControlConnected()
-{
-    if ((gSettings.enableSourceControl) && (GetSourceControl()) && (GetSourceControl()->GetConnectivityState() == ISourceControl::Connected))
-    {
-        return true;
-    }
-
-    return false;
-}
-
-void CEditorImpl::SetMatEditMode(bool bIsMatEditMode)
-{
-    m_bMatEditMode = bIsMatEditMode;
-}
-
-void CEditorImpl::ShowStatusText(bool bEnable)
-{
-    m_bShowStatusText = bEnable;
-}
-
-void CEditorImpl::GetMemoryUsage(ICrySizer* pSizer)
-{
-    SIZER_COMPONENT_NAME(pSizer, "Editor");
-
-    if (GetDocument())
-    {
-        SIZER_COMPONENT_NAME(pSizer, "Document");
-
-        GetDocument()->GetMemoryUsage(pSizer);
-    }
-}
-
-void CEditorImpl::ReduceMemory()
-{
-    GetIEditor()->GetUndoManager()->ClearRedoStack();
-    GetIEditor()->GetUndoManager()->ClearUndoStack();
-    GetIEditor()->GetObjectManager()->SendEvent(EVENT_FREE_GAME_DATA);
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    HANDLE hHeap = GetProcessHeap();
-
-    if (hHeap)
-    {
-        uint64 maxsize = (uint64)HeapCompact(hHeap, 0);
-        CryLogAlways("Max Free Memory Block = %I64d Kb", maxsize / 1024);
-    }
-#endif
-}
-
-IExportManager* CEditorImpl::GetExportManager()
-{
-    if (!m_pExportManager)
-    {
-        m_pExportManager = new CExportManager();
-    }
-
-    return m_pExportManager;
-}
-
-void CEditorImpl::AddUIEnums()
-{
-    // Spec settings for shadow casting lights
-    string SpecString[4];
-    QStringList types;
-    types.push_back("Never=0");
-    SpecString[0].Format("VeryHigh Spec=%d", CONFIG_VERYHIGH_SPEC);
-    types.push_back(SpecString[0].c_str());
-    SpecString[1].Format("High Spec=%d", CONFIG_HIGH_SPEC);
-    types.push_back(SpecString[1].c_str());
-    SpecString[2].Format("Medium Spec=%d", CONFIG_MEDIUM_SPEC);
-    types.push_back(SpecString[2].c_str());
-    SpecString[3].Format("Low Spec=%d", CONFIG_LOW_SPEC);
-    types.push_back(SpecString[3].c_str());
-    m_pUIEnumsDatabase->SetEnumStrings("CastShadows", types);
-
-    // Power-of-two percentages
-    string percentStringPOT[5];
-    types.clear();
-    percentStringPOT[0].Format("Default=%d", 0);
-    types.push_back(percentStringPOT[0].c_str());
-    percentStringPOT[1].Format("12.5=%d", 1);
-    types.push_back(percentStringPOT[1].c_str());
-    percentStringPOT[2].Format("25=%d", 2);
-    types.push_back(percentStringPOT[2].c_str());
-    percentStringPOT[3].Format("50=%d", 3);
-    types.push_back(percentStringPOT[3].c_str());
-    percentStringPOT[4].Format("100=%d", 4);
-    types.push_back(percentStringPOT[4].c_str());
-    m_pUIEnumsDatabase->SetEnumStrings("ShadowMinResPercent", types);
-}
-
-void CEditorImpl::SetEditorConfigSpec(ESystemConfigSpec spec, [[maybe_unused]]ESystemConfigPlatform platform)
-{
-    gSettings.editorConfigSpec = spec;
-}
-
-ESystemConfigSpec CEditorImpl::GetEditorConfigSpec() const
-{
-    return (ESystemConfigSpec)gSettings.editorConfigSpec;
-}
-
-ESystemConfigPlatform CEditorImpl::GetEditorConfigPlatform() const
-{
-    return m_pSystem->GetConfigPlatform();
-}
-
-void CEditorImpl::InitFinished()
-{
-    if (!m_bInitialized)
-    {
-        m_bInitialized = true;
-        Notify(eNotify_OnInit);
-
-        // Let system wide listeners know about this as well.
-        GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_EDITOR_ON_INIT, 0, 0);
-    }
-}
-
-void CEditorImpl::ReloadTemplates()
-{
-    m_templateRegistry.LoadTemplates("Editor");
-}
-
-void CEditorImpl::AddErrorMessage(const QString& text, const QString& caption)
-{
-    if (!m_pErrorsDlg)
-    {
-        m_pErrorsDlg = new CErrorsDlg(GetEditorMainWindow());
-        m_pErrorsDlg->show();
-    }
-
-    m_pErrorsDlg->AddMessage(text, caption);
-}
-
-void CEditorImpl::CmdPy(IConsoleCmdArgs* pArgs)
-{
-    if (AzToolsFramework::EditorPythonRunnerRequestBus::HasHandlers())
-    {
-        // Execute the given script command.
-        QString scriptCmd = pArgs->GetCommandLine();
-
-        scriptCmd = scriptCmd.right(scriptCmd.length() - 2); // The part of the text after the 'py'
-        scriptCmd = scriptCmd.trimmed();
-        AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByString, scriptCmd.toUtf8().data(), false);
-    }
-    else
-    {
-        AZ_Warning("python", false, "EditorPythonRunnerRequestBus has no handlers");
-    }
-}
-
-void CEditorImpl::OnObjectContextMenuOpened(QMenu* pMenu, const CBaseObject* pObject)
-{
-    for (auto it : m_objectContextMenuExtensions)
-    {
-        it(pMenu, pObject);
-    }
-}
-
-void CEditorImpl::RegisterObjectContextMenuExtension(TContextMenuExtensionFunc func)
-{
-    m_objectContextMenuExtensions.push_back(func);
-}
-
-// Vladimir@Conffx
-SSystemGlobalEnvironment* CEditorImpl::GetEnv()
-{
-    assert(gEnv);
-    return gEnv;
-}
-
-// Leroy@Conffx
-SEditorSettings* CEditorImpl::GetEditorSettings()
-{
-    return &gSettings;
-}
-
-// Vladimir@Conffx
-IBaseLibraryManager* CEditorImpl::GetMaterialManagerLibrary()
-{
-    return nullptr;
-}
-
-// Vladimir@Conffx
-IEditorMaterialManager* CEditorImpl::GetIEditorMaterialManager()
-{
-    return nullptr;
-}
-
-IImageUtil* CEditorImpl::GetImageUtil()
-{
-    return m_pImageUtil;
-}
-
-QMimeData* CEditorImpl::CreateQMimeData() const
-{
-    return new QMimeData();
-}
-
-void CEditorImpl::DestroyQMimeData(QMimeData* data) const
-{
-    delete data;
-}
-
-IEditorPanelUtils* CEditorImpl::GetEditorPanelUtils()
-{
-    return m_panelEditorUtils;
-}
diff --git a/Code/Sandbox/Editor/IEditorImpl.h b/Code/Sandbox/Editor/IEditorImpl.h
deleted file mode 100644
index de5e5320dc..0000000000
--- a/Code/Sandbox/Editor/IEditorImpl.h
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : IEditor interface implementation.
-
-#pragma once
-
-#include "IEditor.h"
-#include "MainWindow.h"
-
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-
-#include <memory> // for shared_ptr
-#include <QMap>
-#include <QApplication>
-#include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
-#include <AzCore/std/string/string.h>
-
-#include "Commands/CommandManager.h"                
-
-#include "Include/IErrorReport.h"
-#include "ErrorReport.h"
-
-class QMenu;
-
-
-#define GET_PLUGIN_ID_FROM_MENU_ID(ID) (((ID) & 0x000000FF))
-#define GET_UI_ELEMENT_ID_FROM_MENU_ID(ID) ((((ID) & 0x0000FF00) >> 8))
-
-class CObjectManager;
-class CUndoManager;
-class CGameEngine;
-class CExportManager;
-class CErrorsDlg;
-class CIconManager;
-class CTrackViewSequenceManager;
-class CEditorFileMonitor;
-class AzAssetWindow;
-class AzAssetBrowserRequestHandler;
-class AssetEditorRequestsHandler;
-struct IEditorFileMonitor;
-class CVegetationMap;
-
-
-namespace Editor
-{
-    class EditorQtApplication;
-}
-
-namespace WinWidget
-{
-    class WinWidgetManager;
-}
-
-namespace AssetDatabase
-{
-    class AssetDatabaseLocationListener;
-}
-
-class CEditorImpl 
-    : public IEditor
-{
-    Q_DECLARE_TR_FUNCTIONS(CEditorImpl)
-
-public:
-    CEditorImpl();
-    virtual ~CEditorImpl();
-
-    void Initialize();
-    void OnBeginShutdownSequence();
-    void OnEarlyExitShutdownSequence();
-    void Uninitialize();
-
-
-    void SetGameEngine(CGameEngine* ge);
-    void DeleteThis() { delete this; };
-    IEditorClassFactory* GetClassFactory();
-    CEditorCommandManager* GetCommandManager() { return m_pCommandManager; };
-    ICommandManager* GetICommandManager() { return m_pCommandManager; }
-    void ExecuteCommand(const char* sCommand, ...);
-    void ExecuteCommand(const QString& command);
-    void SetDocument(CCryEditDoc* pDoc);
-    CCryEditDoc* GetDocument() const;
-    bool IsLevelLoaded() const override;
-    void SetModifiedFlag(bool modified = true);
-    void SetModifiedModule(EModifiedModule  eModifiedModule, bool boSet = true);
-    bool IsLevelExported() const;
-    bool SetLevelExported(bool boExported = true);
-    void InitFinished();
-    bool IsModified();
-    bool IsInitialized() const{ return m_bInitialized; }
-    bool SaveDocument();
-    ISystem*    GetSystem();
-    void WriteToConsole(const char* string) { CLogFile::WriteLine(string); };
-    void WriteToConsole(const QString& string) { CLogFile::WriteLine(string); };
-    // Change the message in the status bar
-    void SetStatusText(const QString& pszString);
-    virtual IMainStatusBar* GetMainStatusBar() override;
-    bool ShowConsole([[maybe_unused]] bool show)
-    {
-        //if (AfxGetMainWnd())return ((CMainFrame *) (AfxGetMainWnd()))->ShowConsole(show);
-        return false;
-    }
-
-    void SetConsoleVar(const char* var, float value);
-    float GetConsoleVar(const char* var);
-    //! Query main window of the editor
-    QMainWindow* GetEditorMainWindow() const override
-    {
-        return MainWindow::instance();
-    };
-
-    QString GetPrimaryCDFolder();
-    QString GetLevelName() override;
-    QString GetLevelFolder();
-    QString GetLevelDataFolder();
-    QString GetSearchPath(EEditorPathName path);
-    QString GetResolvedUserFolder();
-    bool ExecuteConsoleApp(const QString& CommandLine, QString& OutputText, bool bNoTimeOut = false, bool bShowWindow = false);
-    virtual bool IsInGameMode() override;
-    virtual void SetInGameMode(bool inGame) override;
-    virtual bool IsInSimulationMode() override;
-    virtual bool IsInTestMode() override;
-    virtual bool IsInPreviewMode() override;
-    virtual bool IsInConsolewMode() override;
-    virtual bool IsInLevelLoadTestMode() override;
-    virtual bool IsInMatEditMode() override { return m_bMatEditMode; }
-
-    //! Enables/Disable updates of editor.
-    void EnableUpdate(bool enable) { m_bUpdates = enable; };
-    //! Enable/Disable accelerator table, (Enabled by default).
-    void EnableAcceleratos(bool bEnable);
-    CGameEngine* GetGameEngine() { return m_pGameEngine; };
-    CDisplaySettings*   GetDisplaySettings() { return m_pDisplaySettings; };
-    const SGizmoParameters& GetGlobalGizmoParameters();
-    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);
-    void DeleteObject(CBaseObject* obj);
-    CBaseObject* CloneObject(CBaseObject* obj);
-    IObjectManager* GetObjectManager();
-    // This will return a null pointer if CrySystem is not loaded before
-    // Global Sandbox Settings are loaded from the registry before CrySystem
-    // At that stage GetSettingsManager will return null and xml node in
-    // memory will not be populated with Sandbox Settings.
-    // After m_IEditor is created and CrySystem loaded, it is possible
-    // to feed memory node with all necessary data needed for export
-    // (gSettings.Load() and CXTPDockingPaneManager/CXTPDockingPaneLayout Sandbox layout management)
-    CSettingsManager* GetSettingsManager();
-    CSelectionGroup*    GetSelection();
-    int ClearSelection();
-    CBaseObject* GetSelectedObject();
-    void SelectObject(CBaseObject* obj);
-    void LockSelection(bool bLock);
-    bool IsSelectionLocked();
-
-    IDataBaseManager* GetDBItemManager(EDataBaseItemType itemType);
-    CMusicManager* GetMusicManager() { return m_pMusicManager; };
-
-    IEditorFileMonitor* GetFileMonitor() override;
-    void RegisterEventLoopHook(IEventLoopHook* pHook) override;
-    void UnregisterEventLoopHook(IEventLoopHook* pHook) override;
-    IIconManager* GetIconManager();
-    float GetTerrainElevation(float x, float y);
-    Editor::EditorQtApplication* GetEditorQtApplication() { return m_QtApplication; }
-    const QColor& GetColorByName(const QString& name) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    IMovieSystem* GetMovieSystem()
-    {
-        if (m_pSystem)
-        {
-            return m_pSystem->GetIMovieSystem();
-        }
-        return NULL;
-    };
-
-    CPluginManager* GetPluginManager() { return m_pPluginManager; }
-    CViewManager* GetViewManager();
-    CViewport* GetActiveView();
-    void SetActiveView(CViewport* viewport);
-
-    CLevelIndependentFileMan* GetLevelIndependentFileMan() { return m_pLevelIndependentFileMan; }
-
-    void UpdateViews(int flags, const AABB* updateRegion);
-    void ResetViews();
-    void ReloadTrackView();
-    Vec3 GetMarkerPosition() { return m_marker; };
-    void SetMarkerPosition(const Vec3& pos) { m_marker = pos; };
-    void    SetSelectedRegion(const AABB& box);
-    void    GetSelectedRegion(AABB& box);
-    bool AddToolbarItem(uint8 iId, IUIEvent* pIHandler);
-    void SetDataModified();
-    void SetOperationMode(EOperationMode mode);
-    EOperationMode GetOperationMode();
-
-    ITransformManipulator* ShowTransformManipulator(bool bShow);
-    ITransformManipulator* GetTransformManipulator();
-    void SetAxisConstraints(AxisConstrains axis);
-    AxisConstrains GetAxisConstrains();
-    void SetAxisVectorLock(bool bAxisVectorLock) { m_bAxisVectorLock = bAxisVectorLock; }
-    bool IsAxisVectorLocked() { return m_bAxisVectorLock; }
-    void SetTerrainAxisIgnoreObjects(bool bIgnore);
-    bool IsTerrainAxisIgnoreObjects();
-    void SetReferenceCoordSys(RefCoordSys refCoords);
-    RefCoordSys GetReferenceCoordSys();
-    XmlNodeRef FindTemplate(const QString& templateName);
-    void AddTemplate(const QString& templateName, XmlNodeRef& tmpl);
-   
-    const QtViewPane* OpenView(QString sViewClassName, bool reuseOpened = true) override;
-
-    /**
-     * Returns the top level widget which is showing the view pane with the specified name.
-     * To access the child widget which actually implements the view pane use this instead:
-     * QtViewPaneManager::FindViewPane<MyDialog>(name);
-     */
-    QWidget* FindView(QString viewClassName) override;
-
-    bool CloseView(const char* sViewClassName);
-    bool SetViewFocus(const char* sViewClassName);
-
-    virtual QWidget* OpenWinWidget(WinWidgetId openId) override;
-    virtual WinWidget::WinWidgetManager* GetWinWidgetManager() const override;
-
-    // close ALL panels related to classId, used when unloading plugins.
-    void CloseView(const GUID& classId);
-    bool SelectColor(QColor &color, QWidget *parent = 0) override;
-    void Update();
-    SFileVersion GetFileVersion() { return m_fileVersion; };
-    SFileVersion GetProductVersion() { return m_productVersion; };
-    //! Get shader enumerator.
-    CUndoManager* GetUndoManager() { return m_pUndoManager; };
-    void BeginUndo();
-    void RestoreUndo(bool undo);
-    void AcceptUndo(const QString& name);
-    void CancelUndo();
-    void SuperBeginUndo();
-    void SuperAcceptUndo(const QString& name);
-    void SuperCancelUndo();
-    void SuspendUndo();
-    void ResumeUndo();
-    void Undo();
-    void Redo();
-    bool IsUndoRecording();
-    bool IsUndoSuspended();
-    void RecordUndo(IUndoObject* obj);
-    bool FlushUndo(bool isShowMessage = false);
-    bool ClearLastUndoSteps(int steps);
-    bool ClearRedoStack();
-    //! Retrieve current animation context.
-    CAnimationContext* GetAnimation();
-    CTrackViewSequenceManager* GetSequenceManager() override;
-    ITrackViewSequenceManager* GetSequenceManagerInterface() override;
-
-    CToolBoxManager* GetToolBoxManager() { return m_pToolBoxManager; };
-    IErrorReport* GetErrorReport() { return m_pErrorReport; }
-    IErrorReport* GetLastLoadedLevelErrorReport() { return m_pLasLoadedLevelErrorReport; }
-    void StartLevelErrorReportRecording() override;
-    void CommitLevelErrorReport() {SAFE_DELETE(m_pLasLoadedLevelErrorReport); m_pLasLoadedLevelErrorReport = new CErrorReport(*m_pErrorReport); }
-    virtual IFileUtil* GetFileUtil() override { return m_pFileUtil;  }
-    void Notify(EEditorNotifyEvent event);
-    void NotifyExcept(EEditorNotifyEvent event, IEditorNotifyListener* listener);
-    void RegisterNotifyListener(IEditorNotifyListener* listener);
-    void UnregisterNotifyListener(IEditorNotifyListener* listener);
-    //! Register document notifications listener.
-    void RegisterDocListener(IDocListener* listener);
-    //! Unregister document notifications listener.
-    void UnregisterDocListener(IDocListener* listener);
-    //! Retrieve interface to the source control.
-    ISourceControl* GetSourceControl();
-    //! Retrieve true if source control is provided and enabled in settings
-    bool IsSourceControlAvailable() override;
-    //! Only returns true if source control is both available AND currently connected and functioning
-    bool IsSourceControlConnected() override;
-    //! Setup Material Editor mode
-    void SetMatEditMode(bool bIsMatEditMode);
-    CUIEnumsDatabase* GetUIEnumsDatabase() { return m_pUIEnumsDatabase; };
-    void AddUIEnums();
-    void GetMemoryUsage(ICrySizer* pSizer);
-    void ReduceMemory();
-    // Get Export manager
-    IExportManager* GetExportManager();
-    // Set current configuration spec of the editor.
-    void SetEditorConfigSpec(ESystemConfigSpec spec, ESystemConfigPlatform platform);
-    ESystemConfigSpec GetEditorConfigSpec() const;
-    ESystemConfigPlatform GetEditorConfigPlatform() const;
-    void ReloadTemplates();
-    void AddErrorMessage(const QString& text, const QString& caption);
-    IResourceSelectorHost* GetResourceSelectorHost() { return m_pResourceSelectorHost.get(); }
-    virtual void ShowStatusText(bool bEnable);
-
-    void OnObjectContextMenuOpened(QMenu* pMenu, const CBaseObject* pObject);
-    virtual void RegisterObjectContextMenuExtension(TContextMenuExtensionFunc func) override;
-
-    virtual SSystemGlobalEnvironment* GetEnv() override;
-    virtual IBaseLibraryManager* GetMaterialManagerLibrary() override; // Vladimir@Conffx
-    virtual IEditorMaterialManager* GetIEditorMaterialManager() override; // Vladimir@Conffx
-    virtual IImageUtil* GetImageUtil() override;  // Vladimir@conffx
-    virtual SEditorSettings* GetEditorSettings() override;
-    virtual IEditorPanelUtils* GetEditorPanelUtils() override;
-    virtual ILogFile* GetLogFile() override { return m_pLogFile; }
-
-    void UnloadPlugins() override;
-    void LoadPlugins() override;
-
-    QMimeData* CreateQMimeData() const override;
-    void DestroyQMimeData(QMimeData* data) const override;
-
-protected:
-
-    AZStd::string LoadProjectIdFromProjectData();
-
-    void DetectVersion();
-    void RegisterTools();
-    void SetPrimaryCDFolder();
-
-    //! List of all notify listeners.
-    std::list<IEditorNotifyListener*> m_listeners;
-
-    EOperationMode m_operationMode;
-    ISystem* m_pSystem;
-    IFileUtil* m_pFileUtil;
-    CClassFactory* m_pClassFactory;
-    CEditorCommandManager* m_pCommandManager;
-    CObjectManager* m_pObjectManager;
-    CPluginManager* m_pPluginManager;
-    CViewManager*   m_pViewManager;
-    CUndoManager* m_pUndoManager;
-    Vec3 m_marker;
-    AABB m_selectedRegion;
-    AxisConstrains m_selectedAxis;
-    RefCoordSys m_refCoordsSys;
-    bool m_bAxisVectorLock;
-    bool m_bUpdates;
-    bool m_bTerrainAxisIgnoreObjects;
-    SFileVersion m_fileVersion;
-    SFileVersion m_productVersion;
-    CXmlTemplateRegistry m_templateRegistry;
-    CDisplaySettings* m_pDisplaySettings;
-    CIconManager* m_pIconManager;
-    std::unique_ptr<SGizmoParameters> m_pGizmoParameters;
-    QString m_primaryCDFolder;
-    QString m_userFolder;
-    bool m_bSelectionLocked;
-    class CAxisGizmo* m_pAxisGizmo;
-    CGameEngine* m_pGameEngine;
-    CAnimationContext* m_pAnimationContext;
-    CTrackViewSequenceManager* m_pSequenceManager;
-    CToolBoxManager* m_pToolBoxManager;
-    CMusicManager* m_pMusicManager;
-    CErrorReport* m_pErrorReport;
-    //! Contains the error reports for the last loaded level.
-    CErrorReport* m_pLasLoadedLevelErrorReport;
-    //! Global instance of error report class.
-    CErrorsDlg* m_pErrorsDlg;
-    //! Source control interface.
-    ISourceControl* m_pSourceControl;
-    IEditorPanelUtils* m_panelEditorUtils;
-
-    CSelectionTreeManager* m_pSelectionTreeManager;
-
-    CUIEnumsDatabase* m_pUIEnumsDatabase;
-    //! CConsole Synchronization
-    CConsoleSynchronization* m_pConsoleSync;
-    //! Editor Settings Manager
-    CSettingsManager* m_pSettingsManager;
-
-    CLevelIndependentFileMan* m_pLevelIndependentFileMan;
-
-    //! Export manager for exporting objects and a terrain from the game to DCC tools
-    CExportManager* m_pExportManager;
-    std::unique_ptr<CEditorFileMonitor> m_pEditorFileMonitor;
-    std::unique_ptr<IResourceSelectorHost> m_pResourceSelectorHost;
-    QString m_selectFileBuffer;
-    QString m_levelNameBuffer;
-
-    IAWSResourceManager* m_awsResourceManager;
-    std::unique_ptr<WinWidget::WinWidgetManager> m_winWidgetManager;
-
-    //! True if the editor is in material edit mode. Fast preview of materials.
-    //! In this mode only very limited functionality is available.
-    bool m_bMatEditMode;
-    bool m_bShowStatusText;
-    bool m_bInitialized;
-    bool m_bExiting;
-    static void CmdPy(IConsoleCmdArgs* pArgs);
-
-    std::vector<TContextMenuExtensionFunc> m_objectContextMenuExtensions;
-
-    Editor::EditorQtApplication* const m_QtApplication = nullptr;
-
-    // This has to be absolute for the namespace since there is also a class called AssetDatabase that causes issues in unity builds
-    ::AssetDatabase::AssetDatabaseLocationListener* m_pAssetDatabaseLocationListener;
-    AzAssetBrowserRequestHandler* m_pAssetBrowserRequestHandler;
-    AssetEditorRequestsHandler* m_assetEditorRequestsHandler;
-
-    IImageUtil* m_pImageUtil;  // Vladimir@conffx
-    ILogFile* m_pLogFile;  // Vladimir@conffx
-
-    CryMutex m_pluginMutex; // protect any pointers that come from plugins, such as the source control cached pointer.
-    static const char* m_crashLogFileName;
-};
-
diff --git a/Code/Sandbox/Editor/IEditorPanelUtils.h b/Code/Sandbox/Editor/IEditorPanelUtils.h
deleted file mode 100644
index 1f65ad43af..0000000000
--- a/Code/Sandbox/Editor/IEditorPanelUtils.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- */
-
-#ifndef CRYINCLUDE_CRYEDITOR_IPANELEDITORUTILS_H
-#define CRYINCLUDE_CRYEDITOR_IPANELEDITORUTILS_H
-#pragma once
-
-#include "Cry_Vector3.h"
-
-#include "DisplaySettings.h"
-#include "Include/IDisplayViewport.h"
-#include "Include/IIconManager.h"
-#include <qstringlist.h>
-#include <qkeysequence.h>
-#include <qevent.h>
-#include <QShortcutEvent>
-
-class CBaseObject;
-class CViewport;
-class IQToolTip;
-
-struct HotKey
-{
-    HotKey()
-        : path("")
-        , sequence(QKeySequence())
-    {
-    }
-    void CopyFrom(const HotKey& other)
-    {
-        path = other.path;
-        sequence = other.sequence;
-    }
-    void SetPath(const char* _path)
-    {
-        path = QString(_path);
-    }
-    void SetSequenceFromString(const char* _sequence)
-    {
-        sequence = QKeySequence::fromString(_sequence);
-    }
-    void SetSequence(const QKeySequence& other)
-    {
-        sequence = other;
-    }
-    bool IsMatch(QString _path)
-    {
-        return path.compare(_path, Qt::CaseInsensitive) == 0;
-    }
-    bool IsMatch(QKeySequence _sequence)
-    {
-        return sequence.matches(_sequence);
-    }
-    bool operator < (const HotKey& other) const
-    {
-        //split the paths into lists compare per level
-        QStringList m_categories = path.split('.');
-        QStringList o_categories = other.path.split('.');
-        int m_catSize = m_categories.size();
-        int o_catSize = o_categories.size();
-        int size = (m_catSize < o_catSize) ? m_catSize : o_catSize;
-
-        //sort categories to keep them together
-        for (unsigned int i = 0; i < size; i++)
-        {
-            if (m_categories[i] < o_categories[i])
-            {
-                return true;
-            }
-            if (m_categories[i] > o_categories[i])
-            {
-                return false;
-            }
-        }
-        //if comparing a category and a item in that category the category is < item
-        return m_catSize > o_catSize;
-    }
-    QKeySequence sequence;
-    QString path;
-};
-
-struct IEditorPanelUtils
-{
-    virtual ~IEditorPanelUtils() {}
-    virtual void SetViewportDragOperation(void(*)(CViewport* viewport, int dragPointX, int dragPointY, void* custom), void* custom) = 0;
-
-    //PREVIEW WINDOW UTILS////////////////////////////////////////////////////
-    virtual int PreviewWindow_GetDisplaySettingsDebugFlags(CDisplaySettings* settings) = 0;
-    virtual void PreviewWindow_SetDisplaySettingsDebugFlags(CDisplaySettings* settings, int flags) = 0;
-
-    //HOTKEY UTILS////////////////////////////////////////////////////////////
-    virtual bool HotKey_Import() = 0;
-    virtual void HotKey_Export() = 0;
-    virtual QKeySequence HotKey_GetShortcut(const char* path) = 0;
-    virtual bool HotKey_IsPressed(const QKeyEvent* event, const char* path) = 0;
-    virtual bool HotKey_IsPressed(const QShortcutEvent* event, const char* path) = 0;
-    virtual bool HotKey_LoadExisting() = 0;
-    virtual void HotKey_SaveCurrent() = 0;
-    virtual void HotKey_BuildDefaults() = 0;
-    virtual void HotKey_SetKeys(QVector<HotKey> keys) = 0;
-    virtual QVector<HotKey> HotKey_GetKeys() = 0;
-    virtual QString HotKey_GetPressedHotkey(const QKeyEvent* event) = 0;
-    virtual QString HotKey_GetPressedHotkey(const QShortcutEvent* event) = 0;
-    virtual void HotKey_SetEnabled(bool val) = 0;
-    virtual bool HotKey_IsEnabled() const = 0;
-
-    //TOOLTIP UTILS///////////////////////////////////////////////////////////
-    
-    //! Loads a table of tooltip configuration data from an xml file.
-    virtual void ToolTip_LoadConfigXML(QString filepath) = 0;
-    
-    //! Initializes a QToolTipWidget from loaded configuration data (see ToolTip_LoadConfigXML())
-    //! \param tooltip       Will be initialized using loaded configuration data
-    //! \param path          Variable serialization path. Will be used as the key for looking up data in the configuration table. (ex: "Rotation.Rotation_Rate_X")
-    //! \param option        Name of a sub-option of the variable specified by "path". (ex: "Emitter_Strength" will look up the tooltip data for "Rotation.Rotation_Rate_X.Emitter_Strength")
-    //! \param optionalData  The argument to be used with "special_content" feature. See ToolTip_GetSpecialContentType() and QToolTipWidget::AddSpecialContent().
-    //! \param isEnabled     If false, the tooltip will indicate the reason why the widget is disabled.
-    virtual void ToolTip_BuildFromConfig(IQToolTip* tooltip, QString path, QString option, QString optionalData = "", bool isEnabled = true) = 0;
-    
-    virtual QString ToolTip_GetTitle(QString path, QString option = "") = 0;
-    virtual QString ToolTip_GetContent(QString path, QString option = "") = 0;
-    virtual QString ToolTip_GetSpecialContentType(QString path, QString option = "") = 0;
-    virtual QString ToolTip_GetDisabledContent(QString path, QString option = "") = 0;
-};
-
-
-#endif
diff --git a/Code/Sandbox/Editor/IObservable.h b/Code/Sandbox/Editor/IObservable.h
deleted file mode 100644
index f01e92f93a..0000000000
--- a/Code/Sandbox/Editor/IObservable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_IOBSERVABLE_H
-#define CRYINCLUDE_EDITOR_IOBSERVABLE_H
-#pragma once
-
-//! Observable macro to be used in pure interfaces
-#define DEFINE_OBSERVABLE_PURE_METHODS(observerClassName)               \
-    virtual bool RegisterObserver(observerClassName * pObserver) = 0;   \
-    virtual bool UnregisterObserver(observerClassName * pObserver) = 0; \
-    virtual void UnregisterAllObservers() = 0;
-
-#endif // CRYINCLUDE_EDITOR_IOBSERVABLE_H
diff --git a/Code/Sandbox/Editor/IPostRenderer.h b/Code/Sandbox/Editor/IPostRenderer.h
deleted file mode 100644
index 5f5d41f4f5..0000000000
--- a/Code/Sandbox/Editor/IPostRenderer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_IPOSTRENDERER_H
-#define CRYINCLUDE_EDITOR_IPOSTRENDERER_H
-#pragma once
-
-
-class IPostRenderer
-{
-public:
-    IPostRenderer()
-        : m_refCount(0){}
-
-    virtual void OnPostRender() const = 0;
-
-    void AddRef() { m_refCount++; }
-    void Release()
-    {
-        if (--m_refCount <= 0)
-        {
-            delete this;
-        }
-    }
-
-protected:
-    virtual ~IPostRenderer(){}
-
-    int m_refCount;
-};
-
-#endif // CRYINCLUDE_EDITOR_IPOSTRENDERER_H
diff --git a/Code/Sandbox/Editor/IconManager.cpp b/Code/Sandbox/Editor/IconManager.cpp
deleted file mode 100644
index 3607e545b5..0000000000
--- a/Code/Sandbox/Editor/IconManager.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "IconManager.h"
-
-#include <AzCore/Interface/Interface.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-
-// Editor
-#include "Settings.h"
-#include "Util/Image.h"
-#include "Util/ImageUtil.h"
-
-#include <IStatObj.h>
-
-#define HELPER_MATERIAL "Objects/Helper"
-
-namespace
-{
-    // Object names in this array must correspond to EObject enumeration.
-    const char* g_ObjectNames[eStatObject_COUNT] =
-    {
-        "Objects/Arrow.cgf",
-        "Objects/Axis.cgf",
-        "Objects/Sphere.cgf",
-        "Objects/Anchor.cgf",
-        "Objects/entrypoint.cgf",
-        "Objects/hidepoint.cgf",
-        "Objects/hidepoint_sec.cgf",
-        "Objects/reinforcement_point.cgf",
-    };
-
-    const char* g_IconNames[eIcon_COUNT] =
-    {
-        "Icons/ScaleWarning.png",
-        "Icons/RotationWarning.png",
-    };
-};
-
-//////////////////////////////////////////////////////////////////////////
-CIconManager::CIconManager()
-{
-    ZeroStruct(m_icons);
-    ZeroStruct(m_objects);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CIconManager::~CIconManager()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CIconManager::Init()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CIconManager::Done()
-{
-    Reset();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CIconManager::Reset()
-{
-    // Do not unload objects. but clears them.
-    int i;
-    for (i = 0; i < sizeof(m_objects) / sizeof(m_objects[0]); i++)
-    {
-        if (m_objects[i])
-        {
-            m_objects[i]->Release();
-        }
-        m_objects[i] = 0;
-    }
-    for (i = 0; i < eIcon_COUNT; i++)
-    {
-        m_icons[i] = 0;
-    }
-
-    // Free icon bitmaps.
-    for (IconsMap::iterator it = m_iconBitmapsMap.begin(); it != m_iconBitmapsMap.end(); ++it)
-    {
-        delete it->second;
-    }
-    m_iconBitmapsMap.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CIconManager::GetIconTexture(const char* iconName)
-{
-    int id = 0;
-    if (m_textures.Find(iconName, id))
-    {
-        return id;
-    }
-
-    if ((!iconName) || (iconName[0] == 0))
-    {
-        return 0;
-    }
-
-    return id;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CIconManager::GetIconTexture(EIcon icon)
-{
-    assert(icon >= 0 && icon < eIcon_COUNT);
-    if (m_icons[icon])
-    {
-        return m_icons[icon];
-    }
-
-    m_icons[icon] = GetIconTexture(g_IconNames[icon]);
-    return m_icons[icon];
-}
-
-//////////////////////////////////////////////////////////////////////////
-IStatObj*   CIconManager::GetObject(EStatObject)
-{
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QImage* CIconManager::GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects /*=0*/)
-{
-    QImage* pBitmap = 0;
-
-    QString iconFilename = filename;
-
-    if (Path::GetPath(iconFilename).isEmpty())
-    {
-        QString iconsPath;
-        if (!gSettings.searchPaths[EDITOR_PATH_UI_ICONS].empty())
-        {
-            iconsPath = gSettings.searchPaths[EDITOR_PATH_UI_ICONS][0];
-        }
-        iconFilename = Path::Make(iconsPath, iconFilename);
-    }
-
-    if (Path::GetExt(iconFilename).isEmpty())
-    {
-        // By default add .bmp extension to the filename without extension.
-        pBitmap = GetIconBitmap((iconFilename + ".png").toUtf8().data(), bHaveAlpha);
-        if (!pBitmap)
-        {
-            pBitmap = GetIconBitmap((iconFilename + ".bmp").toUtf8().data(), bHaveAlpha);
-        }
-        return pBitmap;
-    }
-
-    BOOL bAlphaBitmap = FALSE;
-    QPixmap pm(iconFilename);
-    bAlphaBitmap = pm.hasAlpha();
-
-    bHaveAlpha = (bAlphaBitmap == TRUE);
-    if (!pm.isNull())
-    {
-        pBitmap = new QImage;
-        *pBitmap = pm.toImage();
-        m_iconBitmapsMap[filename] = pBitmap;
-
-        // apply image effects
-        if (bAlphaBitmap)
-        {
-            const DWORD dataSize = pm.width() * pm.height() * 4;
-            BYTE* pImage = pBitmap->bits();
-
-              if (effects & eIconEffect_ColorEnabled)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] = (BYTE)((DWORD)pImage[i + 0] * 109 / 255);
-                    pImage[i + 1] = (BYTE)((DWORD)pImage[i + 1] * 97 / 255);
-                    pImage[i + 2] = (BYTE)((DWORD)pImage[i + 2] * 89 / 255);
-                }
-            }
-
-            if (effects & eIconEffect_ColorDisabled)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] = (BYTE)((DWORD)pImage[i + 0] * 168 / 255);
-                    pImage[i + 1] = (BYTE)((DWORD)pImage[i + 1] * 164 / 255);
-                    pImage[i + 2] = (BYTE)((DWORD)pImage[i + 2] * 162 / 255);
-                }
-            }
-
-            if (effects & eIconEffect_Dim)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] /= 2;
-                    pImage[i + 1] /= 2;
-                    pImage[i + 2] /= 2;
-                }
-            }
-
-            if (effects & eIconEffect_HalfAlpha)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 3] /= 2;
-                }
-            }
-
-            if (effects & eIconEffect_TintGreen)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] /= 2;
-                    pImage[i + 2] /= 2;
-                }
-            }
-
-            if (effects & eIconEffect_TintRed)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] /= 2;
-                    pImage[i + 1] /= 2;
-                }
-            }
-
-            if (effects & eIconEffect_TintYellow)
-            {
-                for (DWORD i = 0; i < dataSize; i += 4)
-                {
-                    pImage[i + 0] /= 2;
-                }
-            }
-
-            // alpha premultiply
-            for (DWORD i = 0; i < dataSize; i += 4)
-            {
-                pImage[i + 0] = ((DWORD)pImage[i + 0] * (DWORD)pImage[i + 3]) / 255;
-                pImage[i + 1] = ((DWORD)pImage[i + 1] * (DWORD)pImage[i + 3]) / 255;
-                pImage[i + 2] = ((DWORD)pImage[i + 2] * (DWORD)pImage[i + 3]) / 255;
-            }
-        }
-
-        return pBitmap;
-    }
-    return NULL;
-}
diff --git a/Code/Sandbox/Editor/IconManager.h b/Code/Sandbox/Editor/IconManager.h
deleted file mode 100644
index 979dfd07eb..0000000000
--- a/Code/Sandbox/Editor/IconManager.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Manages Textures used by Icon.
-
-
-#ifndef CRYINCLUDE_EDITOR_ICONMANAGER_H
-#define CRYINCLUDE_EDITOR_ICONMANAGER_H
-
-#pragma once
-
-struct IStatObj;
-struct IMaterial;
-
-#include "Include/IIconManager.h"   // for IIconManager
-#include "IEditor.h"                // for IDocListener
-
-/*!
- *  CIconManager contains map of icon names to icon textures,
- *  Ensuring that only one instance of texture for specified icon will be allocated.
- *  Also release textures when editor exit.
- *
- */
-class CIconManager
-    : public IIconManager
-    , public IDocListener
-{
-public:
-    // Construction
-    CIconManager();
-    ~CIconManager();
-
-    void Init();
-    void Done();
-
-    // Unload all loaded resources.
-    void Reset();
-
-    // Operations
-    virtual int GetIconTexture(EIcon icon);
-
-    virtual IStatObj*   GetObject(EStatObject object);
-    virtual int GetIconTexture(const char* iconName);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Icon bitmaps.
-    //////////////////////////////////////////////////////////////////////////
-    virtual QImage* GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects = 0);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Implementation of IDocListener.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnNewDocument() { Reset(); };
-    virtual void OnLoadDocument() { Reset(); };
-    virtual void OnCloseDocument() { Reset(); };
-    //////////////////////////////////////////////////////////////////////////
-
-private:
-    StdMap<QString, int> m_textures;
-
-    IStatObj*   m_objects[eStatObject_COUNT];
-    int m_icons[eIcon_COUNT];
-
-    //////////////////////////////////////////////////////////////////////////
-    // Icons bitmaps.
-    //////////////////////////////////////////////////////////////////////////
-    typedef std::map<QString, QImage*> IconsMap;
-    IconsMap m_iconBitmapsMap;
-};
-
-#endif // CRYINCLUDE_EDITOR_ICONMANAGER_H
diff --git a/Code/Sandbox/Editor/Include/Command.h b/Code/Sandbox/Editor/Include/Command.h
deleted file mode 100644
index 9116388eec..0000000000
--- a/Code/Sandbox/Editor/Include/Command.h
+++ /dev/null
@@ -1,791 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Classes to deal with commands
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_COMMAND_H
-#define CRYINCLUDE_EDITOR_INCLUDE_COMMAND_H
-#pragma once
-
-#include <QString>
-
-#include "Util/EditorUtils.h"
-
-inline string ToString(const QString& s)
-{
-    return s.toUtf8().data();
-}
-
-class CCommand
-{
-public:
-    CCommand(
-        const string& module,
-        const string& name,
-        const string& description,
-        const string& example)
-        : m_module(module)
-        , m_name(name)
-        , m_description(description)
-        , m_example(example)
-        , m_bAlsoAvailableInScripting(false)
-    {}
-
-    virtual ~CCommand()
-    {}
-
-    // Class for storing function parameters as a type-erased string
-    struct CArgs
-    {
-    public:
-        CArgs()
-            : m_stringFlags(0)
-        {}
-
-        template <typename T>
-        void Add(T p)
-        {
-            assert(m_args.size() < 8 * sizeof(m_stringFlags));
-            m_args.push_back(ToString(p));
-        }
-        void Add(const char* p)
-        {
-            assert(m_args.size() < 8 * sizeof(m_stringFlags));
-            m_stringFlags |= 1 << m_args.size();
-            m_args.push_back(p);
-        }
-        bool IsStringArg(int i) const
-        {
-            if (i < 0 || i >= GetArgCount())
-            {
-                return false;
-            }
-
-            if (m_stringFlags & (1 << i))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        int GetArgCount() const
-        { return m_args.size(); }
-        const string& GetArg(int i) const
-        {
-            assert(0 <= i && i < GetArgCount());
-            return m_args[i];
-        }
-    private:
-        DynArray<string> m_args;
-        unsigned char m_stringFlags;    // This is needed to quote string parameters when logging a command.
-    };
-
-    const string& GetName() const { return m_name; }
-    const string& GetModule() const { return m_module; }
-    const string& GetDescription() const { return m_description; }
-    const string& GetExample() const { return m_example; }
-
-    void SetAvailableInScripting() { m_bAlsoAvailableInScripting = true; };
-    bool IsAvailableInScripting() const { return m_bAlsoAvailableInScripting; }
-
-    virtual QString Execute(const CArgs& args) = 0;
-
-    // Only a command without any arguments and return value can be a UI command.
-    virtual bool CanBeUICommand() const { return false; }
-
-protected:
-    friend class CEditorCommandManager;
-    string m_module;
-    string m_name;
-    string m_description;
-    string m_example;
-    bool m_bAlsoAvailableInScripting;
-
-    template <typename T>
-    static string ToString_(T t) { return ::ToString(t); }
-    static inline string ToString_(const char* val)
-    { return val; }
-    template <typename T>
-    static bool FromString_(T& t, const char* s) { return ::FromString(t, s); }
-    static inline bool FromString_(const char*& val, const char* s)
-    { return (val = s) != 0; }
-
-    void PrintHelp()
-    {
-        CryLogAlways("%s.%s:", m_module.c_str(), m_name.c_str());
-        if (m_description.length() > 0)
-        {
-            CryLogAlways("    %s", m_description.c_str());
-        }
-        if (m_example.length() > 0)
-        {
-            CryLogAlways("    Usage:  %s", m_example.c_str());
-        }
-    }
-};
-
-class CCommand0
-    : public CCommand
-{
-public:
-    CCommand0(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<void()>& functor)
-        : CCommand(module, name, description, example)
-        , m_functor(functor) {}
-
-    // UI metadata for this command, if any
-    struct SUIInfo
-    {
-        string caption;
-        string tooltip;
-        string description;
-        string iconFilename;
-        int iconIndex;
-        int commandId; // Windows command id
-
-        SUIInfo()
-            : iconIndex(0)
-            , commandId(0) {}
-    };
-
-    inline QString Execute([[maybe_unused]] const CArgs& args)
-    {
-        assert(args.GetArgCount() == 0);
-
-        m_functor();
-        return "";
-    }
-    const SUIInfo& GetUIInfo() const { return m_uiInfo; }
-    virtual bool CanBeUICommand() const { return true; }
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<void()> m_functor;
-    SUIInfo m_uiInfo;
-};
-
-template <typename RT>
-class CCommand0wRet
-    : public CCommand
-{
-public:
-    CCommand0wRet(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<RT()>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<RT()> m_functor;
-};
-
-template <LIST(1, typename P)>
-class CCommand1
-    : public CCommand
-{
-public:
-    CCommand1(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<void(LIST(1, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<void(LIST(1, P))> m_functor;
-};
-
-template <LIST(1, typename P), typename RT>
-class CCommand1wRet
-    : public CCommand
-{
-public:
-    CCommand1wRet(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<RT(LIST(1, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<RT(LIST(1, P))> m_functor;
-};
-
-template <LIST(2, typename P)>
-class CCommand2
-    : public CCommand
-{
-public:
-    CCommand2(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<void(LIST(2, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<void(LIST(2, P))> m_functor;
-};
-
-template <LIST(2, typename P), typename RT>
-class CCommand2wRet
-    : public CCommand
-{
-public:
-    CCommand2wRet(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<RT(LIST(2, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<RT(LIST(2, P))> m_functor;
-};
-
-template <LIST(3, typename P)>
-class CCommand3
-    : public CCommand
-{
-public:
-    CCommand3(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<void(LIST(3, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<void(LIST(3, P))> m_functor;
-};
-
-template <LIST(3, typename P), typename RT>
-class CCommand3wRet
-    : public CCommand
-{
-public:
-    CCommand3wRet(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<RT(LIST(3, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<RT(LIST(3, P))> m_functor;
-};
-
-template <LIST(4, typename P)>
-class CCommand4
-    : public CCommand
-{
-public:
-    CCommand4(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<void(LIST(4, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<void(LIST(4, P))> m_functor;
-};
-
-template <LIST(4, typename P), typename RT>
-class CCommand4wRet
-    : public CCommand
-{
-public:
-    CCommand4wRet(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<RT(LIST(4, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<RT(LIST(4, P))> m_functor;
-};
-
-template <LIST(5, typename P)>
-class CCommand5
-    : public CCommand
-{
-public:
-    CCommand5(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<void(LIST(5, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<void(LIST(5, P))> m_functor;
-};
-
-template <LIST(6, typename P)>
-class CCommand6
-    : public CCommand
-{
-public:
-    CCommand6(const string& module, const string& name,
-        const string& description, const string& example,
-        const AZStd::function<void(LIST(6, P))>& functor);
-
-    QString Execute(const CArgs& args);
-
-protected:
-    friend class CEditorCommandManager;
-    AZStd::function<void(LIST(6, P))> m_functor;
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-template <typename RT>
-CCommand0wRet<RT>::CCommand0wRet(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<RT()>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <typename RT>
-QString CCommand0wRet<RT>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 0);
-
-    RT ret = m_functor();
-    return ToString_(ret).c_str();
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(1, typename P)>
-CCommand1<LIST(1, P)>::CCommand1(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<void(LIST(1, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(1, typename P)>
-QString CCommand1<LIST(1, P)>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 1);
-    if (args.GetArgCount() < 1)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! One argument required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    bool ok = FromString_(p1, args.GetArg(0).c_str());
-    if (ok)
-    {
-        m_functor(p1);
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s)! Invalid argument type.",
-            m_module, m_name, args.GetArg(0).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(1, typename P), typename RT>
-CCommand1wRet<LIST(1, P), RT>::CCommand1wRet(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<RT(LIST(1, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(1, typename P), typename RT>
-QString CCommand1wRet<LIST(1, P), RT>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 1);
-    if (args.GetArgCount() < 1)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! One argument required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    bool ok = FromString_(p1, args.GetArg(0).c_str());
-    if (ok)
-    {
-        RT ret = m_functor(p1);
-        return ToString_(ret).c_str();
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s)! Invalid argument type.",
-            m_module, m_name, args.GetArg(0).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(2, typename P)>
-CCommand2<LIST(2, P)>::CCommand2(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<void(LIST(2, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(2, typename P)>
-QString CCommand2<LIST(2, P)>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 2);
-    if (args.GetArgCount() < 2)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! Two arguments required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    P2 p2;
-    bool ok = FromString_(p1, args.GetArg(0).c_str())
-        && FromString_(p2, args.GetArg(1).c_str());
-    if (ok)
-    {
-        m_functor(p1, p2);
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s,%s)! Invalid argument type(s).",
-            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(2, typename P), typename RT>
-CCommand2wRet<LIST(2, P), RT>::CCommand2wRet(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<RT(LIST(2, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(2, typename P), typename RT>
-QString CCommand2wRet<LIST(2, P), RT>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 2);
-    if (args.GetArgCount() < 2)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! Two arguments required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    P2 p2;
-    bool ok = FromString_(p1, args.GetArg(0).c_str())
-        && FromString_(p2, args.GetArg(1).c_str());
-    if (ok)
-    {
-        RT ret = m_functor(p1, p2);
-        return ToString_(ret).c_str();
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s,%s)! Invalid argument type(s).",
-            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(3, typename P)>
-CCommand3<LIST(3, P)>::CCommand3(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<void(LIST(3, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(3, typename P)>
-QString CCommand3<LIST(3, P)>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 3);
-    if (args.GetArgCount() < 3)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! Three arguments required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    P2 p2;
-    P3 p3;
-    bool ok = FromString_(p1, args.GetArg(0).c_str())
-        && FromString_(p2, args.GetArg(1).c_str())
-        && FromString_(p3, args.GetArg(2).c_str());
-    if (ok)
-    {
-        m_functor(p1, p2, p3);
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s)! Invalid argument type(s).",
-            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(3, typename P), typename RT>
-CCommand3wRet<LIST(3, P), RT>::CCommand3wRet(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<RT(LIST(3, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(3, typename P), typename RT>
-QString CCommand3wRet<LIST(3, P), RT>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 3);
-    if (args.GetArgCount() < 3)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! Three arguments required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    P2 p2;
-    P3 p3;
-    bool ok = FromString_(p1, args.GetArg(0).c_str())
-        && FromString_(p2, args.GetArg(1).c_str())
-        && FromString_(p3, args.GetArg(2).c_str());
-    if (ok)
-    {
-        RT ret = m_functor(p1, p2, p3);
-        return ToString_(ret).c_str();
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s)! Invalid argument type(s).",
-            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(4, typename P)>
-CCommand4<LIST(4, P)>::CCommand4(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<void(LIST(4, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(4, typename P)>
-QString CCommand4<LIST(4, P)>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 4);
-    if (args.GetArgCount() < 4)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! Four arguments required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    P2 p2;
-    P3 p3;
-    P4 p4;
-    bool ok = FromString_(p1, args.GetArg(0).c_str())
-        && FromString_(p2, args.GetArg(1).c_str())
-        && FromString_(p3, args.GetArg(2).c_str())
-        && FromString_(p4, args.GetArg(3).c_str());
-    if (ok)
-    {
-        m_functor(p1, p2, p3, p4);
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s,%s)! Invalid argument type(s).",
-            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str(),
-            args.GetArg(3).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(4, typename P), typename RT>
-CCommand4wRet<LIST(4, P), RT>::CCommand4wRet(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<RT(LIST(4, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(4, typename P), typename RT>
-QString CCommand4wRet<LIST(4, P), RT>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 4);
-    if (args.GetArgCount() < 4)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! Four arguments required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    P2 p2;
-    P3 p3;
-    P4 p4;
-    bool ok = FromString_(p1, args.GetArg(0).c_str())
-        && FromString_(p2, args.GetArg(1).c_str())
-        && FromString_(p3, args.GetArg(2).c_str())
-        && FromString_(p4, args.GetArg(3).c_str());
-    if (ok)
-    {
-        RT ret = m_functor(p1, p2, p3, p4);
-        return ToString_(ret).c_str();
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s,%s)! Invalid argument type(s).",
-            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str(),
-            args.GetArg(3).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(5, typename P)>
-CCommand5<LIST(5, P)>::CCommand5(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<void(LIST(5, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(5, typename P)>
-QString CCommand5<LIST(5, P)>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 5);
-    if (args.GetArgCount() < 5)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! Five arguments required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1;
-    P2 p2;
-    P3 p3;
-    P4 p4;
-    P5 p5;
-    bool ok = FromString_(p1, args.GetArg(0).c_str())
-        && FromString_(p2, args.GetArg(1).c_str())
-        && FromString_(p3, args.GetArg(2).c_str())
-        && FromString_(p4, args.GetArg(3).c_str())
-        && FromString_(p5, args.GetArg(4).c_str());
-    if (ok)
-    {
-        m_functor(p1, p2, p3, p4, p5);
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s,%s,%s)! Invalid argument type(s).",
-            m_module, m_name, args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str(),
-            args.GetArg(3).c_str(), args.GetArg(4).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <LIST(6, typename P)>
-CCommand6<LIST(6, P)>::CCommand6(const string& module, const string& name,
-    const string& description, const string& example,
-    const AZStd::function<void(LIST(6, P))>& functor)
-    : CCommand(module, name, description, example)
-    , m_functor(functor)
-{
-}
-
-template <LIST(6, typename P)>
-QString CCommand6<LIST(6, P)>::Execute(const CCommand::CArgs& args)
-{
-    assert(args.GetArgCount() == 6);
-    if (args.GetArgCount() < 6)
-    {
-        CryLogAlways("Cannot execute the command %s.%s! Six arguments required.", m_module.c_str(), m_name.c_str());
-        PrintHelp();
-        return "";
-    }
-
-    P1 p1 = 0;
-    P2 p2 = 0;
-    P3 p3 = 0;
-    P4 p4 = 0;
-    P5 p5 = 0;
-    P6 p6 = 0;
-    bool ok = FromString_(p1, args.GetArg(0).c_str())
-        && FromString_(p2, args.GetArg(1).c_str())
-        && FromString_(p3, args.GetArg(2).c_str())
-        && FromString_(p4, args.GetArg(3).c_str())
-        && FromString_(p5, args.GetArg(4).c_str())
-        && FromString_(p6, args.GetArg(5).c_str());
-    if (ok)
-    {
-        m_functor(p1, p2, p3, p4, p5, p6);
-    }
-    else
-    {
-        CryLogAlways("Cannot execute the command %s.%s(%s,%s,%s,%s,%s,%s)! Invalid argument type(s).",
-            m_module.c_str(), m_name.c_str(), args.GetArg(0).c_str(), args.GetArg(1).c_str(), args.GetArg(2).c_str(),
-            args.GetArg(3).c_str(), args.GetArg(4).c_str(), args.GetArg(5).c_str());
-        PrintHelp();
-    }
-    return "";
-}
-#endif // CRYINCLUDE_EDITOR_INCLUDE_COMMAND_H
diff --git a/Code/Sandbox/Editor/Include/EditorCoreAPI.cpp b/Code/Sandbox/Editor/Include/EditorCoreAPI.cpp
deleted file mode 100644
index af69e7a73a..0000000000
--- a/Code/Sandbox/Editor/Include/EditorCoreAPI.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorCoreAPI.h"
-
-#include <AzCore/Module/Environment.h>
-
-
-static IEditor* s_pEditor = nullptr;
-
-void SetIEditor(IEditor* pEditor)
-{
-    //this function is called multiple times so only check once if the static editor pointer is null
-    if (s_pEditor == nullptr)
-    {
-        assert(pEditor);
-        s_pEditor = pEditor;
-    }
-    else if (pEditor == nullptr)
-    {
-        //clearing the static editor pointer
-        s_pEditor = nullptr;
-    }
-    else
-    {
-        assert(pEditor == s_pEditor); //trigger a warning that multiple instances of the editor are attempting to register
-    }
-}
-
-IEditor* GetIEditor()
-{
-    return s_pEditor;
-}
-
-void SetEditorCoreEnvironment(SSystemGlobalEnvironment* pEnv)
-{
-    assert(!gEnv);
-    gEnv = pEnv;
-}
-
-void AttachEditorCoreAZEnvironment(AZ::EnvironmentInstance pAzEnv)
-{
-    AZ::Environment::Attach(pAzEnv);
-}
-
-void DetachEditorCoreAZEnvironment()
-{
-    AZ::Environment::Detach();
-}
diff --git a/Code/Sandbox/Editor/Include/EditorCoreAPI.h b/Code/Sandbox/Editor/Include/EditorCoreAPI.h
deleted file mode 100644
index ddecaf6c88..0000000000
--- a/Code/Sandbox/Editor/Include/EditorCoreAPI.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_CORE_INCLUDE_API_H
-#define CRYINCLUDE_EDITOR_CORE_INCLUDE_API_H
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#if defined(EDITOR_CORE)
-    #define EDITOR_CORE_API AZ_DLL_EXPORT
-#else
-    #define EDITOR_CORE_API AZ_DLL_IMPORT
-#endif
-#elif defined(AZ_PLATFORM_MAC) || defined(AZ_PLATFORM_LINUX)
-#if defined(EDITOR_CORE)
-    #define EDITOR_CORE_API __attribute__ ((visibility ("default")))
-#else
-    #define EDITOR_CORE_API 
-#endif
-#endif
-
-struct IEditor;
-
-
-namespace AZ
-{
-    namespace Internal
-    {
-        class EnvironmentInterface;
-    }
-    typedef Internal::EnvironmentInterface* EnvironmentInstance;
-}
-
-EDITOR_CORE_API void SetIEditor(IEditor* pEditor);
-EDITOR_CORE_API IEditor* GetIEditor();
-
-//! Attach the editorcore dll to the system environmen in the System DLL
-EDITOR_CORE_API void SetEditorCoreEnvironment(struct SSystemGlobalEnvironment* pEnv);
-
-//! Attach the editorcore dll to the AZ Environment which allows ebus and memory allocation - should be done really early
-EDITOR_CORE_API void AttachEditorCoreAZEnvironment(AZ::EnvironmentInstance pAzEnv);
-
-//! Detach the editorcore dll from the AZ Environment, should be done last.
-EDITOR_CORE_API void DetachEditorCoreAZEnvironment();
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include "../IEditor.h"
-#endif
-
-#endif // CRYINCLUDE_EDITOR_CORE_INCLUDE_API_H
diff --git a/Code/Sandbox/Editor/Include/HitContext.h b/Code/Sandbox/Editor/Include/HitContext.h
deleted file mode 100644
index 9787cfef85..0000000000
--- a/Code/Sandbox/Editor/Include/HitContext.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Hit testing for editor viewport operations
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_HITCONTEXT_H
-#define CRYINCLUDE_EDITOR_INCLUDE_HITCONTEXT_H
-#pragma once
-
-class CGizmo;
-class CBaseObject;
-struct IDisplayViewport;
-class CDeepSelection;
-struct AABB;
-class CCamera;
-
-#include <QRect>
-#include <platform.h>
-
-//! Flags used in HitContext for nSubObjFlags member.
-enum ESubObjHitFlags
-{
-    //! When set all hit elements will be selected.
-    SO_HIT_SELECT = BIT(1),
-    //! Only test selected elements for hit.
-    SO_HIT_TEST_SELECTED = BIT(2),
-    //! Only hit test point2d, not rectangle
-    //! Will only test/select 1 closest element
-    SO_HIT_POINT = BIT(3),
-    //! Adds hit elements to previously selected ones.
-    SO_HIT_SELECT_ADD = BIT(4),
-    //! Remove hit elements from previously selected ones.
-    SO_HIT_SELECT_REMOVE = BIT(5),
-    //! Output flag, set if selection was changed.
-    SO_HIT_SELECTION_CHANGED = BIT(6),
-    //! Hit testing to highlight sub object-element.
-    SO_HIT_HIGHLIGHT_ONLY = BIT(7),
-    //! This hit test is not for editing sub-objects.
-    //! (ex. for moving an object by its face-normal)
-    SO_HIT_NO_EDIT = BIT(8),
-    // Check hit with vertices.
-    SO_HIT_ELEM_VERTEX = BIT(10),
-    // Check hit with edges.
-    SO_HIT_ELEM_EDGE = BIT(11),
-    // Check hit with faces.
-    SO_HIT_ELEM_FACE = BIT(12),
-    // Check hit with polygons.
-    SO_HIT_ELEM_POLYGON = BIT(13)
-};
-
-#define SO_HIT_ELEM_ALL (SO_HIT_ELEM_VERTEX | SO_HIT_ELEM_EDGE | SO_HIT_ELEM_FACE | SO_HIT_ELEM_POLYGON)
-
-//! Collision structure passed to HitTest function.
-struct HitContext
-{
-    //! Viewport that originates hit testing.
-    IDisplayViewport* view;
-    //! 2D point on view that is used for hit testing.
-    QPoint point2d;
-    //! 2D Selection rectangle (Only when HitTestRect)
-    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;
-    //! True if axis collision must be ignored.
-    bool bIgnoreAxis;
-    //! Hit test only gizmo objects
-    bool bOnlyGizmo;
-    //! Test objects using advanced selection helpers.
-    bool bUseSelectionHelpers;
-    //! an object excluded in hittest.
-    CBaseObject* pExcludedObject;
-
-    // Input parameters.
-
-    //! Ray origin.
-    Vec3 raySrc;
-    //! Ray direction.
-    Vec3 rayDir;
-    //! Relaxation parameter for hit testing.
-    float distanceTolerance;
-    //! Sub object hit testing flags, @see ESubObjHitFlags
-    int nSubObjFlags;
-
-    // Output parameters.
-
-    //! true if this hit should have less priority then non weak hits.
-    //! (exp: Ray hit entity bounding box but not entity geometry.)
-    bool weakHit;
-    //! constrain axis if hit AxisGizmo.
-    int axis;
-    //! if hit axis gizmo, 1 - move mode, 2 - rotate mode, 3 - scale mode, 4 - rotate circle mode
-    int manipulatorMode;
-    //! distance to the object from src.
-    float dist;
-    //! object that have been hit.
-    CBaseObject* object;
-    //! gizmo object that have been hit.
-    CGizmo* gizmo;
-    //! for deep selection mode
-    CDeepSelection* pDeepSelection;
-    //! For linking tool
-    const char* name;
-    //! true if this hit was from the object icon
-    bool iconHit;
-
-    HitContext()
-    {
-        rect = QRect();
-        b2DViewport = false;
-        view = 0;
-        camera = 0;
-        point2d = QPoint();
-        axis = 0;
-        distanceTolerance = 0;
-        raySrc(0, 0, 0);
-        rayDir(0, 0, 0);
-        dist = 0;
-        object = 0;
-        weakHit = false;
-        manipulatorMode = 0;
-        nSubObjFlags = 0;
-        bounds = 0;
-        bIgnoreAxis = false;
-        bOnlyGizmo = false;
-        bUseSelectionHelpers = false;
-        pDeepSelection = 0;
-        name = nullptr;
-        iconHit = false;
-    }
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_HITCONTEXT_H
diff --git a/Code/Sandbox/Editor/Include/IAnimationCompressionManager.h b/Code/Sandbox/Editor/Include/IAnimationCompressionManager.h
deleted file mode 100644
index 21244e78d7..0000000000
--- a/Code/Sandbox/Editor/Include/IAnimationCompressionManager.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IANIMATIONCOMPRESSIONMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IANIMATIONCOMPRESSIONMANAGER_H
-#pragma once
-
-struct IAnimationCompressionManager
-{
-    virtual bool IsEnabled() const = 0;
-    virtual void UpdateLocalAnimations() = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IANIMATIONCOMPRESSIONMANAGER_H
diff --git a/Code/Sandbox/Editor/Include/IAssetItem.h b/Code/Sandbox/Editor/Include/IAssetItem.h
deleted file mode 100644
index 9e97f8b6e1..0000000000
--- a/Code/Sandbox/Editor/Include/IAssetItem.h
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Standard interface for asset display in the asset browser,
-//               this header should be used to create plugins.
-//               The method Release of this interface should NOT be called.
-//               Instead, the FreeData from the database (from IAssetItemDatabase) should
-//               be used as it will safely release all the items from the database.
-//               It is still possible to call the release method, but this is not the
-//               recomended method, specially for usage outside of the plugins because there
-//               is no guarantee that a the asset will be properly removed from the database
-//               manager.
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IASSETITEM_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IASSETITEM_H
-#pragma once
-
-struct IAssetItemDatabase;
-
-namespace AssetViewer
-{
-    // Used in GetAssetFieldValue for each asset type to check if field name is the right one
-    inline bool IsFieldName(const char* pIncomingFieldName, const char* pFieldName)
-    {
-        return !strncmp(pIncomingFieldName, pFieldName, strlen(pIncomingFieldName));
-    }
-}
-
-// Description:
-//      This interface allows the programmer to extend asset display types visible in the asset browser.
-struct IAssetItem
-    : public IUnknown
-{
-    DEFINE_UUID(0x04F20346, 0x2EC3, 0x43f2, 0xBD, 0xA1, 0x2C, 0x0B, 0x97, 0x76, 0xF3, 0x84);
-
-    // The supported asset flags
-    enum EAssetFlags
-    {
-        // asset is visible in the database for filtering and sorting (not asset view control related)
-        eFlag_Visible = BIT(0),
-        // the asset is loaded
-        eFlag_Loaded = BIT(1),
-        // the asset is loaded
-        eFlag_Cached = BIT(2),
-        // the asset is selected in a selection set
-        eFlag_Selected = BIT(3),
-        // this asset is invalid, no thumb is shown/available
-        eFlag_Invalid = BIT(4),
-        // this asset has some errors/warnings, in the asset browser it will show some blinking/red elements
-        // and the user can check out the errors. Error text will be fetched using GetAssetFieldValue( "errors", &someStringVar )
-        eFlag_HasErrors = BIT(5),
-        // this flag is set when the asset is rendering its contents using GDI, and not the engine's rendering capabilities
-        // (this flags is used as hint for the preview tool, which will use a double-buffer canvas if this flag is set,
-        // and send a memory HDC to the OnBeginPreview method, for drawing of the asset)
-        eFlag_UseGdiRendering = BIT(6),
-        // set if this asset is draggable into the render viewports, and can be created there
-        eFlag_CanBeDraggedInViewports = BIT(7),
-        // set if this asset can be moved after creation, otherwise the asset instance will just be created where user clicked
-        eFlag_CanBeMovedAfterDroppedIntoViewport = BIT(8),
-        // the asset thumbnail image is loaded
-        eFlag_ThumbnailLoaded = BIT(9),
-        // the asset thumbnail image is loaded
-        eFlag_UsedInLevel = BIT(10)
-    };
-
-    // Asset field name and field values map
-    typedef std::map < QString/*fieldName*/, QString/*value*/ > TAssetFieldValuesMap;
-    // Dependency category names and corresponding files map, example: "Textures"=>{ "foam.dds","water.dds","normal.dds" }
-    typedef std::map < QString/*dependencyCategory*/, std::set<QString>/*dependency filenames*/ > TAssetDependenciesMap;
-
-    virtual ~IAssetItem() {
-    }
-
-    // Description:
-    //      Get the hash number/key used for database thumbnail and info records management
-    virtual uint32 GetHash() const = 0;
-    // Description:
-    //      Set the hash number/key used for database thumbnail and info records management
-    virtual void SetHash(uint32 hash) = 0;
-    // Description:
-    //      Get the owner database for this asset
-    // Return Value:
-    //      The owner database for this asset
-    // See Also:
-    //      SetOwnerDatabase()
-    virtual IAssetItemDatabase* GetOwnerDatabase() const = 0;
-    // Description:
-    //      Set the owner database for this asset
-    // Arguments:
-    //      piOwnerDisplayDatabase - the owner database
-    // See Also:
-    //      GetOwnerDatabase()
-    virtual void SetOwnerDatabase(IAssetItemDatabase* pOwnerDisplayDatabase) = 0;
-    // Description:
-    //      Get the asset's dependency files / objects
-    // Return Value:
-    //      The vector with filenames which this asset is dependent upon, ex.: ["Textures"].(vector of textures)
-    virtual const TAssetDependenciesMap& GetDependencies() const = 0;
-    // Description:
-    //      Set the file size of this asset in bytes
-    // Arguments:
-    //      aSize - size of the file in bytes
-    // See Also:
-    //      GetFileSize()
-    virtual void SetFileSize(quint64 aSize) = 0;
-    // Description:
-    //      Get the file size of this asset in bytes
-    // Return Value:
-    //      The file size of this asset in bytes
-    // See Also:
-    //      SetFileSize()
-    virtual quint64 GetFileSize() const = 0;
-    // Description:
-    //      Set asset filename (extension included and no path)
-    // Arguments:
-    //      pName - the asset filename (extension included and no path)
-    // See Also:
-    //      GetFilename()
-    virtual void SetFilename(const char* pName) = 0;
-    // Description:
-    //      Get asset filename (extension included and no path)
-    // Return Value:
-    //      The asset filename (extension included and no path)
-    // See Also:
-    //      SetFilename()
-    virtual QString GetFilename() const = 0;
-    // Description:
-    //      Set the asset's relative path
-    // Arguments:
-    //      pName - file's relative path
-    // See Also:
-    //      GetRelativePath()
-    virtual void SetRelativePath(const char* pName) = 0;
-    // Description:
-    //      Get the asset's relative path
-    // Return Value:
-    //      The asset's relative path
-    // See Also:
-    //      SetRelativePath()
-    virtual QString GetRelativePath()  const = 0;
-    // Description:
-    //      Set the file extension ( dot(s) must be included )
-    // Arguments:
-    //      pExt - the file's extension
-    // See Also:
-    //      GetFileExtension()
-    virtual void SetFileExtension(const char* pExt) = 0;
-    // Description:
-    //      Get the file extension ( dot(s) included )
-    // Return Value:
-    //      The file extension ( dot(s) included )
-    // See Also:
-    //      SetFileExtension()
-    virtual QString GetFileExtension()  const = 0;
-    // Description:
-    //      Get the asset flags, with values from IAssetItem::EAssetFlags
-    // Return Value:
-    //      The asset flags, with values from IAssetItem::EAssetFlags
-    // See Also:
-    //      SetFlags(), SetFlag(), IsFlagSet()
-    virtual UINT GetFlags() const = 0;
-    // Description:
-    //      Set the asset flags
-    // Arguments:
-    //      aFlags - flags, OR-ed values from IAssetItem::EAssetFlags
-    // See Also:
-    //      GetFlags(), SetFlag(), IsFlagSet()
-    virtual void SetFlags(UINT aFlags) = 0;
-    // Description:
-    //      Set/clear a single flag bit for the asset
-    // Arguments:
-    //      aFlag - the flag to set/clear, with values from IAssetItem::EAssetFlags
-    // See Also:
-    //      GetFlags(), SetFlags(), IsFlagSet()
-    virtual void SetFlag(EAssetFlags aFlag, bool bSet = true) = 0;
-    // Description:
-    //      Check if a specified flag is set
-    // Arguments:
-    //      aFlag - the flag to check, with values from IAssetItem::EAssetFlags
-    // Return Value:
-    //      True if the flag is set
-    // See Also:
-    //      GetFlags(), SetFlags(), SetFlag()
-    virtual bool IsFlagSet(EAssetFlags aFlag) const = 0;
-    // Description:
-    //      Set this asset's index; used in sorting, selections, and to know where an asset is in the current list
-    // Arguments:
-    //      aIndex - the asset's index
-    // See Also:
-    //      GetIndex()
-    virtual void SetIndex(UINT aIndex) = 0;
-    // Description:
-    //      Get the asset's index in the current list
-    // Return Value:
-    //      The asset's index in the current list
-    // See Also:
-    //      SetIndex()
-    virtual UINT GetIndex() const = 0;
-    // Description:
-    //      Get the asset's field raw data value into a user location, you must check the field's type ( from asset item's owner database )
-    //      before using this function and send the correct pointer to destination according to the type ( int8, float32, string, etc. )
-    // Arguments:
-    //      pFieldName - the asset field name to query the value for
-    //      pDest - the destination variable address, must be the same type as the field type
-    // Return Value:
-    //      True if the asset field name is found and the value is returned correctly
-    // See Also:
-    //      SetAssetFieldValue()
-    virtual QVariant GetAssetFieldValue(const char* pFieldName) const = 0;
-    // Description:
-    //      Set the asset's field raw data value from a user location, you must check the field's type ( from asset item's owner database )
-    //      before using this function and send the correct pointer to source according to the type ( int8, float32, string, etc. )
-    // Arguments:
-    //      pFieldName - the asset field name to set the value for
-    //      pSrc - the source variable address, must be the same type as the field type
-    // Return Value:
-    //      True if the asset field name is found and the value is set correctly
-    // See Also:
-    //      GetAssetFieldValue()
-    virtual bool SetAssetFieldValue(const char* pFieldName, void* pSrc) = 0;
-    // Description:
-    //      Get the drawing rectangle for the asset's thumb ( absolute viewer canvas location )
-    // Arguments:
-    //      rstDrawingRectangle - destination location to set with the asset's thumbnail rectangle location
-    // See Also:
-    //      SetDrawingRectangle()
-    virtual void GetDrawingRectangle(QRect& rstDrawingRectangle) const = 0;
-    // Description:
-    //      Set the drawing rectangle for the asset's thumb ( absolute viewer canvas location )
-    // Arguments:
-    //      crstDrawingRectangle - source to set the asset's thumbnail rectangle
-    // See Also:
-    //      GetDrawingRectangle()
-    virtual void SetDrawingRectangle(const QRect& crstDrawingRectangle) = 0;
-    // Description:
-    //      Checks if the given 2D point is inside the asset's thumb rectangle
-    // Arguments:
-    //      nX - mouse pointer position on X axis, relative to the asset viewer control
-    //      nY - mouse pointer position on Y axis, relative to the asset viewer control
-    // Return Value:
-    //      True if the given 2D point is inside the asset's thumb rectangle
-    // See Also:
-    //      HitTest(CRect)
-    virtual bool HitTest(int nX, int nY) const = 0;
-    // Description:
-    //      Checks if the given rectangle intersects the asset thumb's rectangle
-    // Arguments:
-    //      nX - mouse pointer position on X axis, relative to the asset viewer control
-    //      nY - mouse pointer position on Y axis, relative to the asset viewer control
-    // Return Value:
-    //      True if the given rectangle intersects the asset thumb's rectangle
-    // See Also:
-    //      HitTest(int nX,int nY)
-    virtual bool HitTest(const QRect& roTestRect) const = 0;
-    // Description:
-    //      When user drags this asset item into a viewport, this method is called when the dragging operation ends
-    //      and the mouse button is released,   for the asset to return an instance of the asset object to be placed in the level
-    // Arguments:
-    //      aX - instance's X position component in world coordinates
-    //      aY - instance's Y position component in world coordinates
-    //      aZ - instance's Z position component in world coordinates
-    // Return Value:
-    //      The newly created asset instance (Example: BrushObject*)
-    // See Also:
-    //      MoveInstanceInViewport()
-    virtual void* CreateInstanceInViewport(float aX, float aY, float aZ) = 0;
-    // Description:
-    //      When the mouse button is released after level object creation, the user now can move the mouse
-    //      and move the asset instance in the 3D world
-    // Arguments:
-    //      pDraggedObject -    the actual entity or brush object (CBaseObject* usually) to be moved around with the mouse
-    //                                          returned by the CreateInstanceInViewport()
-    //      aNewX - the new X world coordinates of the asset instance
-    //      aNewY - the new Y world coordinates of the asset instance
-    //      aNewZ - the new Z world coordinates of the asset instance
-    // Return Value:
-    //      True if asset instance was moved properly
-    // See Also:
-    //      CreateInstanceInViewport()
-    virtual bool MoveInstanceInViewport(const void* pDraggedObject, float aNewX, float aNewY, float aNewZ) = 0;
-    // Description:
-    //      This will be called when the user presses ESCAPE key when dragging the asset in the viewport, you must delete the given object
-    //      because the creation was aborted
-    // Arguments:
-    //      pDraggedObject - the asset instance to be deleted ( you must cast to the needed type, and delete it properly )
-    // See Also:
-    //      CreateInstanceInViewport()
-    virtual void AbortCreateInstanceInViewport(const void* pDraggedObject) = 0;
-    // Description:
-    //      This method is used to cache/load asset's data, so it can be previewed/rendered
-    // Return Value:
-    //      True if the asset was successfully cached
-    // See Also:
-    //      UnCache()
-    virtual bool Cache() = 0;
-    // Description:
-    //      This method is used to force cache/load asset's data, so it can be previewed/rendered
-    // Return Value:
-    //      True if the asset was successfully forced cached
-    // See Also:
-    //      UnCache(), Cache()
-    virtual bool ForceCache() = 0;
-    // Description:
-    //      This method is used to load the thumbnail image of the asset
-    // Return Value:
-    //      True if thumb loaded ok
-    // See Also:
-    //      UnloadThumbnail()
-    virtual bool LoadThumbnail() = 0;
-    // Description:
-    //      This method is used to unload the thumbnail image of the asset
-    // See Also:
-    //      LoadThumbnail()
-    virtual void UnloadThumbnail() = 0;
-    // Description:
-    //      This is called when the asset starts to be previewed in full detail, so here you can load the whole asset, in fine detail
-    //      ( textures are fully loaded, models etc. ). It is called once, when the Preview dialog is shown
-    // Arguments:
-    //      hPreviewWnd - the window handle of the quick preview dialog
-    //      hMemDC - the memory DC used to render assets that can render themselves in the DC, otherwise they will render in the dialog's HWND
-    // See Also:
-    //      OnEndPreview(), GetCustomPreviewPanelHeader()
-    virtual void OnBeginPreview(QWidget* hPreviewWnd) = 0;
-    // Description:
-    //      Called when the Preview dialog is closed, you may release the detail asset data here
-    // See Also:
-    //      OnBeginPreview(), GetCustomPreviewPanelHeader()
-    virtual void OnEndPreview() = 0;
-    // Description:
-    //      If the asset has a special preview panel with utility controls, to be placed at the top of the Preview window, it can return an child dialog window
-    //      otherwise it can return NULL, if no panel is available
-    // Arguments:
-    //      pParentWnd - a valid CDialog*, or NULL
-    // Return Value:
-    //      A valid child dialog window handle, if this asset wants to have a custom panel in the top side of the Asset Preview window,
-    //      otherwise it can return NULL, if no panel is available
-    // See Also:
-    //      OnBeginPreview(), OnEndPreview()
-    virtual QWidget* GetCustomPreviewPanelHeader(QWidget* pParentWnd) = 0;
-    virtual QWidget* GetCustomPreviewPanelFooter(QWidget* pParentWnd) = 0;
-    // Description:
-    //      Used when dragging/rotate/zoom a model, or other asset that can support preview
-    // Arguments:
-    //      hRenderWindow - the rendering window handle
-    //      rstViewport - the viewport rectangle
-    //      aMouseX - the render window relative mouse pointer X coordinate
-    //      aMouseY - the render window relative mouse pointer Y coordinate
-    //      aMouseDeltaX - the X coordinate delta between two mouse movements
-    //      aMouseDeltaY - the Y coordinate delta between two mouse movements
-    //      aMouseWheelDelta - the mouse wheel scroll delta/step
-    //      aKeyFlags - the key flags, see WM_LBUTTONUP
-    // See Also:
-    //      OnPreviewRenderKeyEvent()
-    virtual void PreviewRender(
-        QWidget* hRenderWindow,
-        const QRect& rstViewport,
-        int aMouseX = 0, int aMouseY = 0,
-        int aMouseDeltaX = 0, int aMouseDeltaY = 0,
-        int aMouseWheelDelta = 0, UINT aKeyFlags = 0) = 0;
-    // Description:
-    //      This is called when the user manipulates the assets in interactive render and a key is pressed ( with down or up state )
-    // Arguments:
-    //      bKeyDown - true if this is a WM_KEYDOWN event, else it is a WM_KEYUP event
-    //      aChar - the char/key code pressed/released
-    //      aKeyFlags - the key flags, compatible with WM_KEYDOWN/UP events
-    // See Also:
-    //      InteractiveRender()
-    virtual void OnPreviewRenderKeyEvent(bool bKeyDown, UINT aChar, UINT aKeyFlags) = 0;
-    // Description:
-    //      Called when user clicked once on the thumb image
-    // Arguments:
-    //      point - mouse coordinates relative to the thumbnail rectangle
-    //      aKeyFlags - the key flags, see WM_LBUTTONDOWN
-    // See Also:
-    //      OnThumbDblClick()
-    virtual void OnThumbClick(const QPoint& point, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers) = 0;
-    // Description:
-    //      Called when user double clicked on the thumb image
-    // Arguments:
-    //      point - mouse coordinates relative to the thumbnail rectangle
-    //      aKeyFlags - the key flags, see WM_LBUTTONDOWN
-    // See Also:
-    //      OnThumbClick()
-    //! called when user clicked twice on the thumb image
-    virtual void OnThumbDblClick(const QPoint& point, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers) = 0;
-    // Description:
-    //      Draw the cached thumb bitmap only, if any, no other kind of rendering
-    // Arguments:
-    //      hDC - the destination DC, where to draw the thumb
-    //      rRect - the destination rectangle
-    // Return Value:
-    //      True if drawing of the thumbnail was done OK
-    // See Also:
-    //      Render()
-    virtual bool DrawThumbImage(QPainter* painter, const QRect& rRect) = 0;
-    // Description:
-    //     Writes asset info to a XML node.
-    //     This is needed to save cached info as a persistent XML file for the next run of the editor.
-    // Arguments:
-    //     node - An XML node to contain the info
-    // See Also:
-    //     FromXML()
-    virtual void ToXML(XmlNodeRef& node) const = 0;
-    // Description:
-    //     Gets asset info from a XML node.
-    //       This is needed to get the asset info from previous runs of the editor without re-caching it.
-    // Arguments:
-    //     node - An XML node that contains info for this asset
-    // See Also:
-    //     ToXML()
-    virtual void FromXML(const XmlNodeRef& node) = 0;
-
-    // From IUnknown
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] const IID& riid, [[maybe_unused]] void** ppvObject)
-    {
-        return E_NOINTERFACE;
-    };
-    virtual ULONG STDMETHODCALLTYPE AddRef()
-    {
-        return 0;
-    };
-    virtual ULONG STDMETHODCALLTYPE Release()
-    {
-        return 0;
-    };
-};
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IASSETITEM_H
diff --git a/Code/Sandbox/Editor/Include/IAssetItemDatabase.h b/Code/Sandbox/Editor/Include/IAssetItemDatabase.h
deleted file mode 100644
index 4609a05ec9..0000000000
--- a/Code/Sandbox/Editor/Include/IAssetItemDatabase.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Standard interface for asset database creators used to
-//               create an asset plugin for the asset browser
-//               The category of the plugin must be  Asset Item DB
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IASSETITEMDATABASE_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IASSETITEMDATABASE_H
-#pragma once
-struct IAssetItem;
-struct IAssetViewer;
-
-class QString;
-class QStringList;
-
-// Description:
-//  This struct keeps the info, filter and sorting settings for an asset field
-struct SAssetField
-{
-    // the condition for the current filter on the field
-    enum EAssetFilterCondition
-    {
-        eCondition_Any = 0,
-        // string conditions
-        // this also supports '*' and '?' as wildcards inside text
-        eCondition_Contains,
-        // this filter will search the target for at least one of the words specified
-        // ( ex: filter: "water car moon" , field value : "the_great_moon.dds", this will pass the test
-        // it also supports '*' and '?' as wildcards inside words text
-        eCondition_ContainsOneOfTheWords,
-        eCondition_StartsWith,
-        eCondition_EndsWith,
-        // string & numerical conditions
-        eCondition_Equal,
-        eCondition_Greater,
-        eCondition_Less,
-        eCondition_GreaterOrEqual,
-        eCondition_LessOrEqual,
-        eCondition_Not,
-        eCondition_InsideRange
-    };
-
-    // the asset field type
-    enum EAssetFieldType
-    {
-        eType_None = 0,
-        eType_Bool,
-        eType_Int8,
-        eType_Int16,
-        eType_Int32,
-        eType_Int64,
-        eType_Float,
-        eType_Double,
-        eType_String
-    };
-
-    // used when a field can have different specific values
-    typedef QStringList TFieldEnumValues;
-
-    SAssetField(
-        const char* pFieldName = "",
-        const char* pDisplayName = "Unnamed field",
-        EAssetFieldType aFieldType = eType_None,
-        UINT aColumnWidth = 50,
-        bool bVisibleInUI = true,
-        bool bReadOnly = true)
-    {
-        m_fieldName = pFieldName;
-        m_displayName = pDisplayName;
-        m_fieldType = aFieldType;
-        m_filterCondition = eCondition_Equal;
-        m_bUseEnumValues = false;
-        m_bReadOnly = bReadOnly;
-        m_listColumnWidth = aColumnWidth;
-        m_bFieldVisibleInUI = bVisibleInUI;
-        m_bPostFilter = false;
-
-        SetupEnumValues();
-    }
-
-    void SetupEnumValues()
-    {
-        m_bUseEnumValues = true;
-
-        if (m_fieldType == eType_Bool)
-        {
-            m_enumValues.clear();
-            m_enumValues.push_back("Yes");
-            m_enumValues.push_back("No");
-        }
-    }
-
-    // the field's display name, used in UI
-    QString m_displayName,
-    // the field internal name, used in C++ code
-            m_fieldName,
-    // the current filter value, if its empty "" then no filter is applied
-            m_filterValue,
-    // the field's max value, valid when the field's filter condition is eAssertFilterCondition_InsideRange
-            m_maxFilterValue,
-    // the name of the database holding this field, used in Asset Browser preset editor, if its "" then the field
-    // is common to all current databases
-            m_parentDatabaseName;
-    // is this field visible in the UI ?
-    bool m_bFieldVisibleInUI,
-    // if true, then you cannot modify this field of an asset item, only use it
-         m_bReadOnly,
-    // this field filter is applied after the other filters
-         m_bPostFilter;
-    // the field data type
-    EAssetFieldType m_fieldType;
-    // the filter's condition
-    EAssetFilterCondition m_filterCondition;
-    // use the enum list values to choose a value for the field ?
-    bool m_bUseEnumValues;
-    // this map is used when asset field has m_bUseEnumValues on true,
-    // choose a value for the field from this list in the UI
-    TFieldEnumValues m_enumValues;
-    // recommended list column width
-    unsigned int m_listColumnWidth;
-};
-
-struct SFieldFiltersPreset
-{
-    QString presetName2;
-    QStringList checkedDatabaseNames;
-    bool bUsedInLevel;
-    std::vector<SAssetField> fields;
-};
-
-// Description:
-//  This interface allows the programmer to extend asset display types
-//  visible in the asset browser.
-struct IAssetItemDatabase
-    : public IUnknown
-{
-    DEFINE_UUID(0xFB09B039, 0x1D9D, 0x4057, 0xA5, 0xF0, 0xAA, 0x3C, 0x7B, 0x97, 0xAE, 0xA8)
-
-    typedef std::vector<SAssetField> TAssetFields;
-    typedef std::map < QString/*field name*/, SAssetField > TAssetFieldFiltersMap;
-    typedef std::map < QString/*asset filename*/, IAssetItem* > TFilenameAssetMap;
-    typedef AZStd::function<bool(const IAssetItem*)> MetaDataChangeListener;
-
-    // Description:
-    //      Refresh the database by scanning the folders/paks for files, does not load the files, only filename and filesize are fetched
-    virtual void Refresh() = 0;
-    // Description:
-    //      Fills the asset meta data from the loaded xml meta data DB.
-    // Arguments:
-    //      db - the database XML node from where to cache the info
-    virtual void PrecacheFieldsInfoFromFileDB(const XmlNodeRef& db) = 0;
-    // Description:
-    //      Return all assets loaded/scanned by this database
-    // Return Value:
-    //      The assets map reference (filename-asset)
-    virtual TFilenameAssetMap& GetAssets() = 0;
-    // Description:
-    //      Get an asset item by its filename
-    // Return Value:
-    //      A single asset from the database given the filename
-    virtual IAssetItem* GetAsset(const char* pAssetFilename) = 0;
-    // Description:
-    //      Return the asset fields this database's items support
-    // Return Value:
-    //      The asset fields vector reference
-    virtual TAssetFields& GetAssetFields() = 0;
-    // Description:
-    //      Return an asset field object pointer by the field internal name
-    // Arguments:
-    //      pFieldName - the internal field's name (ex: "filename", "relativepath")
-    // Return Value:
-    //      The asset field object pointer
-    virtual SAssetField* GetAssetFieldByName(const char* pFieldName) = 0;
-    // Description:
-    //      Get the database name
-    // Return Value:
-    //      Returns the database name, ex: "Textures"
-    virtual const char* GetDatabaseName() const = 0;
-    // Description:
-    //      Get the database supported file name extension(s)
-    // Return Value:
-    //      Returns the supported extensions, separated by comma, ex: "tga,bmp,dds"
-    virtual const char* GetSupportedExtensions() const = 0;
-    // Description:
-    //      Free the database internal data structures
-    virtual void FreeData() = 0;
-    // Description:
-    //      Apply filters to this database which will set/unset the IAssetItem::eAssetFlag_Visible of each asset, based
-    //      on the given field filters
-    // Arguments:
-    //      rFieldFilters - a reference to the field filters map (fieldname-field)
-    // See Also:
-    //      ClearFilters()
-    virtual void ApplyFilters(const TAssetFieldFiltersMap& rFieldFilters) = 0;
-    // Description:
-    //      Clear the current filters, by setting the IAssetItem::eAssetFlag_Visible of each asset to true
-    // See Also:
-    //      ApplyFilters()
-    virtual void ClearFilters() = 0;
-    virtual QWidget* CreateDbFilterDialog(QWidget* pParent, IAssetViewer* pViewerCtrl) = 0;
-    virtual void UpdateDbFilterDialogUI(QWidget* pDlg) = 0;
-    virtual void OnAssetBrowserOpen() = 0;
-    virtual void OnAssetBrowserClose() = 0;
-    // Description:
-    //       Gets the filename for saving new cached asset info.
-    // Return Value:
-    //     A file name to save new transactions to the persistent asset info DB
-    // See Also:
-    //     CAssetInfoFileDB, IAssetItem::ToXML(), IAssetItem::FromXML()
-    virtual const char* GetTransactionFilename() const = 0;
-    // Description:
-    //     Adds a callback to be called when the meta data of this asset changed.
-    // Arguments:
-    //     callBack - A functor to be added
-    // Return Value:
-    //     True if successful, false otherwise.
-    // See Also:
-    //     RemoveMetaDataChangeListener()
-    virtual bool AddMetaDataChangeListener(MetaDataChangeListener callBack) = 0;
-    // Description:
-    //     Removes a callback from the list of meta data change listeners.
-    // Arguments:
-    //     callBack - A functor to be removed
-    // Return Value:
-    //     True if successful, false otherwise.
-    // See Also:
-    //     AddMetaDataCHangeListener()
-    virtual bool RemoveMetaDataChangeListener(MetaDataChangeListener callBack) = 0;
-    // Description:
-    //          The method that should be called when the meta data of an asset item changes to notify all listeners
-    // Arguments:
-    //     pAssetItem - An asset item whose meta data have changed
-    // See Also:
-    //      AddMetaDataCHangeListener(), RemoveMetaDataChangeListener()
-    virtual void OnMetaDataChange(const IAssetItem* pAssetItem) = 0;
-
-    //! from IUnknown
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] REFIID riid, [[maybe_unused]] void** ppvObject)
-    {
-        return E_NOINTERFACE;
-    };
-    virtual ULONG STDMETHODCALLTYPE AddRef()
-    {
-        return 0;
-    };
-    virtual ULONG STDMETHODCALLTYPE Release()
-    {
-        return 0;
-    };
-};
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IASSETITEMDATABASE_H
diff --git a/Code/Sandbox/Editor/Include/IAssetViewer.h b/Code/Sandbox/Editor/Include/IAssetViewer.h
deleted file mode 100644
index 1fc137489f..0000000000
--- a/Code/Sandbox/Editor/Include/IAssetViewer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : This file declares a control which objective is to display
-//               multiple assets allowing selection and preview of such things
-//               It also handles scrolling and changes in the thumbnail display size
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IASSETVIEWER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IASSETVIEWER_H
-#pragma once
-#include "IObservable.h"
-#include "IAssetItemDatabase.h"
-
-struct IAssetItem;
-struct IAssetItemDatabase;
-
-// Description:
-//  Observer for the asset viewer events
-struct IAssetViewerObserver
-{
-    virtual void OnChangeStatusBarInfo(UINT nSelectedItems, UINT nVisibleItems, UINT nTotalItems) {};
-    virtual void OnSelectionChanged() {};
-    virtual void OnChangedPreviewedAsset(IAssetItem* pAsset) {};
-    virtual void OnAssetDblClick(IAssetItem* pAsset) {};
-    virtual void OnAssetFilterChanged() {};
-};
-
-// Description:
-//  The asset viewer interface for the asset database plugins to use
-struct IAssetViewer
-{
-    DEFINE_OBSERVABLE_PURE_METHODS(IAssetViewerObserver);
-
-    virtual HWND GetRenderWindow() = 0;
-    virtual void ApplyFilters(const IAssetItemDatabase::TAssetFieldFiltersMap& rFieldFilters) = 0;
-    virtual const IAssetItemDatabase::TAssetFieldFiltersMap& GetCurrentFilters() = 0;
-    virtual void ClearFilters() = 0;
-};
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IASSETVIEWER_H
diff --git a/Code/Sandbox/Editor/Include/IBaseLibraryManager.h b/Code/Sandbox/Editor/Include/IBaseLibraryManager.h
deleted file mode 100644
index 260f672a46..0000000000
--- a/Code/Sandbox/Editor/Include/IBaseLibraryManager.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IBASELIBRARYMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IBASELIBRARYMANAGER_H
-#pragma once
-
-#include <IEditor.h>
-#include "Include/IDataBaseItem.h"
-#include "Include/IDataBaseLibrary.h"
-#include "Include/IDataBaseManager.h"
-#include "Util/TRefCountBase.h"
-
-class CBaseLibraryItem;
-class CBaseLibrary;
-
-struct IBaseLibraryManager
-    : public TRefCountBase<IDataBaseManager>
-    , public IEditorNotifyListener
-{
-    //! Clear all libraries.
-    virtual void ClearAll() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // IDocListener implementation.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Library items.
-    //////////////////////////////////////////////////////////////////////////
-    //! Make a new item in specified library.
-    virtual IDataBaseItem* CreateItem(IDataBaseLibrary* pLibrary) = 0;
-    //! Delete item from library and manager.
-    virtual void DeleteItem(IDataBaseItem* pItem) = 0;
-
-    //! Find Item by its GUID.
-    virtual IDataBaseItem* FindItem(REFGUID guid) const = 0;
-    virtual IDataBaseItem* FindItemByName(const QString& fullItemName) = 0;
-    virtual IDataBaseItem* LoadItemByName(const QString& fullItemName) = 0;
-
-    virtual IDataBaseItemEnumerator* GetItemEnumerator() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set item currently selected.
-    virtual void SetSelectedItem(IDataBaseItem* pItem) = 0;
-    // Get currently selected item.
-    virtual IDataBaseItem* GetSelectedItem() const = 0;
-    virtual IDataBaseItem* GetSelectedParentItem() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Libraries.
-    //////////////////////////////////////////////////////////////////////////
-    //! Add Item library.
-    virtual IDataBaseLibrary* AddLibrary(const QString& library, bool isLevelLibrary = false, bool bIsLoading = true) = 0;
-    virtual void DeleteLibrary(const QString& library, bool forceDeleteLevel = false) = 0;
-    //! Get number of libraries.
-    virtual int GetLibraryCount() const = 0;
-    //! Get number of modified libraries.
-    virtual int GetModifiedLibraryCount() const = 0;
-
-    //! Get Item library by index.
-    virtual IDataBaseLibrary* GetLibrary(int index) const = 0;
-
-    //! Get Level Item library.
-    virtual IDataBaseLibrary* GetLevelLibrary() const = 0;
-
-    //! Find Items Library by name.
-    virtual IDataBaseLibrary* FindLibrary(const QString& library) = 0;
-
-    //! Find the Library's index by name.
-    virtual int FindLibraryIndex(const QString& library) = 0;
-    
-    //! Load Items library.
-#ifdef LoadLibrary
-#undef LoadLibrary
-#endif
-    virtual IDataBaseLibrary* LoadLibrary(const QString& filename, bool bReload = false) = 0;
-
-    //! Save all modified libraries.
-    virtual void SaveAllLibs() = 0;
-
-    //! Serialize property manager.
-    virtual void Serialize(XmlNodeRef& node, bool bLoading) = 0;
-
-    //! Export items to game.
-    virtual void Export(XmlNodeRef& node) = 0;
-
-    //! Returns unique name base on input name.
-    // Vera@conffx, add LibName parameter so we could make an unique name depends on input library.
-    // Arguments:
-    //    - name: name of the item
-    //    - libName: The library of the item. Given the library name, the function will return a unique name in the library
-    //      Default value "": The function will ignore the library name and return a unique name in the manager
-    virtual QString MakeUniqueItemName(const QString& name, const QString& libName = "") = 0;
-    virtual QString MakeFullItemName(IDataBaseLibrary* pLibrary, const QString& group, const QString& itemName) = 0;
-
-    //! Root node where this library will be saved.
-    virtual QString GetRootNodeName() = 0;
-    //! Path to libraries in this manager.
-    virtual QString GetLibsPath() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Validate library items for errors.
-    virtual void Validate() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void GatherUsedResources(CUsedResources& resources) = 0;
-
-    virtual void AddListener(IDataBaseManagerListener* pListener) = 0;
-    virtual void RemoveListener(IDataBaseManagerListener* pListener) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual void RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid) = 0;
-    virtual void RegisterItem(CBaseLibraryItem* pItem) = 0;
-    virtual void UnregisterItem(CBaseLibraryItem* pItem) = 0;
-
-    // Only Used internally.
-    virtual void OnRenameItem(CBaseLibraryItem* pItem, const QString& oldName) = 0;
-
-    // Called by items to indicated that they have been modified.
-    // Sends item changed event to listeners.
-    virtual void OnItemChanged(IDataBaseItem* pItem) = 0;
-    virtual void OnUpdateProperties(IDataBaseItem* pItem, bool bRefresh) = 0;
-
-    //CONFETTI BEGIN
-    // Used to change the library item order
-    virtual void ChangeLibraryOrder(IDataBaseLibrary* lib, unsigned int newLocation) = 0;
-    // simplifies the library renaming process
-    virtual bool SetLibraryName(CBaseLibrary* lib, const QString& name) = 0;
-
-    
-    //Check if the file name is unique.
-    //Params: library: library name. NOT the file path.
-    virtual bool IsUniqueFilename(const QString& library) = 0;
-    //CONFETTI END
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IBASELIBRARYMANAGER_H
diff --git a/Code/Sandbox/Editor/Include/ICommandManager.h b/Code/Sandbox/Editor/Include/ICommandManager.h
deleted file mode 100644
index 4267991ac4..0000000000
--- a/Code/Sandbox/Editor/Include/ICommandManager.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_ICOMMANDMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_ICOMMANDMANAGER_H
-#pragma once
-#include "Command.h"
-
-typedef void (* TPfnDeleter)(void*);
-
-class ICommandManager
-{
-public:
-    virtual ~ICommandManager() = default;
-
-    virtual bool AddCommand(CCommand* pCommand, TPfnDeleter deleter = nullptr) = 0;
-    virtual bool UnregisterCommand(const char* module, const char* name) = 0;
-    virtual bool AttachUIInfo(const char* fullCmdName, const CCommand0::SUIInfo& uiInfo) = 0;
-    virtual bool IsRegistered(const char* module, const char* name) const = 0;
-    virtual bool IsRegistered(const char* cmdLine) const = 0;
-    virtual bool IsRegistered(int commandId) const = 0;
-};
-
-/// A set of helper template methods for an easy registration of commands
-namespace CommandManagerHelper
-{
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<void()>& functor);
-    template <typename RT>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<RT()>& functor);
-    template <LIST(1, typename P)>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<void(LIST(1, P))>& functor);
-    template <LIST(1, typename P), typename RT>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<RT(LIST(1, P))>& functor);
-    template <LIST(2, typename P)>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<void(LIST(2, P))>& functor);
-    template <LIST(2, typename P), typename RT>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<RT(LIST(2, P))>& functor);
-    template <LIST(3, typename P)>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<void(LIST(3, P))>& functor);
-    template <LIST(3, typename P), typename RT>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<RT(LIST(3, P))>& functor);
-    template <LIST(4, typename P)>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<void(LIST(4, P))>& functor);
-    template <LIST(4, typename P), typename RT>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<RT(LIST(4, P))>& functor);
-    template <LIST(5, typename P)>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<void(LIST(5, P))>& functor);
-    template <LIST(6, typename P)>
-    bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-        const char* description, const char* example,
-        const AZStd::function<void(LIST(6, P))>& functor);
-
-    namespace Private
-    {
-        template <typename FunctorType, typename CommandType>
-        bool RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-            const char* description, const char* example,
-            const FunctorType& functor);
-    }
-};
-
-template <typename FunctorType, typename CommandType>
-bool CommandManagerHelper::Private::RegisterCommand(ICommandManager* pCmdMgr,
-    const char* module, const char* name,
-    const char* description, const char* example,
-    const FunctorType& functor)
-{
-    assert(functor);
-    if (!functor)
-    {
-        return false;
-    }
-
-    CommandType* pCommand
-        = new CommandType(module, name, description, example, functor);
-    if (pCmdMgr->AddCommand(pCommand) == false)
-    {
-        delete pCommand;
-        return false;
-    }
-    return true;
-}
-
-inline
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<void()>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<void()>, CCommand0>(pCmdMgr, module, name, description, example, functor);
-}
-
-template <typename RT>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<RT()>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<RT()>, CCommand0wRet<RT> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(1, typename P)>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<void(LIST(1, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<void(LIST(1, P))>, CCommand1<LIST(1, P)> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(1, typename P), typename RT>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<RT(LIST(1, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<RT(LIST(1, P))>, CCommand1wRet<LIST(1, P), RT> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(2, typename P)>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<void(LIST(2, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<void(LIST(2, P))>, CCommand2<LIST(2, P)> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(2, typename P), typename RT>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<RT(LIST(2, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<RT(LIST(2, P))>, CCommand2wRet<LIST(2, P), RT> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(3, typename P)>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<void(LIST(3, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<void(LIST(3, P))>, CCommand3<LIST(3, P)> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(3, typename P), typename RT>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<RT(LIST(3, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<RT(LIST(3, P))>, CCommand3wRet<LIST(3, P), RT> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(4, typename P)>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<void(LIST(4, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<void(LIST(4, P))>, CCommand4<LIST(4, P)> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(4, typename P), typename RT>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<RT(LIST(4, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<RT(LIST(4, P))>, CCommand4wRet<LIST(4, P), RT> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(5, typename P)>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<void(LIST(5, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<void(LIST(5, P))>, CCommand5<LIST(5, P)> >(pCmdMgr, module, name, description, example, functor);
-}
-
-template <LIST(6, typename P)>
-bool CommandManagerHelper::RegisterCommand(ICommandManager* pCmdMgr, const char* module, const char* name,
-    const char* description, const char* example,
-    const AZStd::function<void(LIST(6, P))>& functor)
-{
-    return Private::RegisterCommand<AZStd::function<void(LIST(6, P))>, CCommand6<LIST(6, P)> >(pCmdMgr, module, name, description, example, functor);
-}
-#endif // CRYINCLUDE_EDITOR_INCLUDE_ICOMMANDMANAGER_H
diff --git a/Code/Sandbox/Editor/Include/IConsoleConnectivity.h b/Code/Sandbox/Editor/Include/IConsoleConnectivity.h
deleted file mode 100644
index ad4d88d30a..0000000000
--- a/Code/Sandbox/Editor/Include/IConsoleConnectivity.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Standard interface for console connectivity plugins.
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
-#define CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
-#pragma once
-
-
-//////////////////////////////////////////////////////////////////////////
-// Description
-//    This interface provide access to the console connectivity
-// functionality.
-//////////////////////////////////////////////////////////////////////////
-struct IConsoleConnectivity
-    : public IUnknown
-{
-    DEFINE_UUID(0x4DAA85E1, 0x8498, 0x402f, 0x9B, 0x85, 0x7F, 0x62, 0x9D, 0x76, 0x79, 0x8A);
-
-    //////////////////////////////////////////////////////////////////////////
-    //TODO: Must add the useful interface here.
-    //////////////////////////////////////////////////////////////////////////
-
-    // Description:
-    //   Checks if a development console is connected to the development PC.
-    // See Also:
-    // Arguments:
-    //   Nothing
-    // Return:
-    //   bool - true if it is connected, false otherwise.
-    virtual bool IsConnectedToConsole() = 0;
-
-    // Description:
-    //   Send a file from the specified local filename to the console platform creating the full path
-    // as required so it can copy to the remote filename.
-    // See Also:
-    //   Nothing
-    // Arguments:
-    //   szLocalFileName - is the local filename from which you want to copy the file.
-    //   szRemoteFilename - is the full path and filename to where you want to copy the file.
-    // Return:
-    //   bool - true if the copy succeeded, false otherwise.
-    virtual bool SendFile(const char* szLocalFileName, const char* szRemoteFilename) = 0;
-
-    // Description:
-    //   Notifies to the console that a file has been changed, typically uploaded.
-    // This will be usually called after a SendFile (see above) call, so that the
-    // system running on the console may decide what to do with this new file.
-    //   Typically the system will have to load or reloads this new file.
-    // See Also:
-    //   SendFile
-    // Arguments:
-    //   szRemoteFilename - is the full path and filename in the console of the changed
-    // file.
-    // Return:
-    //   bool - true if succeeded sending the notification, false otherwise.
-    virtual bool NotifyFileChange(const char* szRemoteFilename) = 0;
-
-
-    // Description:
-    // Gets the the title IP for the connected console .
-    // Arguments:
-    //  dwConsoleAddressPlaceholder - is the pointer to the placeholder of the variable
-    // which will contain the title IP of the console.
-    // Return:
-    //   bool - true if dwConsoleAddressPlaceholder now contains the IP address, else false.
-    virtual bool GetConsoleAddress(DWORD* dwConsoleAddressPlaceholder) = 0;
-    //////////////////////////////////////////////////////////////////////////
-    // IUnknown
-    //////////////////////////////////////////////////////////////////////////
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) { return E_NOINTERFACE; };
-    virtual ULONG       STDMETHODCALLTYPE AddRef()  { return 0; };
-    virtual ULONG       STDMETHODCALLTYPE Release() { return 0; };
-    //////////////////////////////////////////////////////////////////////////
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_ICONSOLECONNECTIVITY_H
diff --git a/Code/Sandbox/Editor/Include/IDataBaseItem.h b/Code/Sandbox/Editor/Include/IDataBaseItem.h
deleted file mode 100644
index 3671d9c8ce..0000000000
--- a/Code/Sandbox/Editor/Include/IDataBaseItem.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IDATABASEITEM_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IDATABASEITEM_H
-#pragma once
-
-#include <qwindowdefs.h>
-#include <IEditor.h>
-
-struct IDataBaseLibrary;
-class CUsedResources;
-
-//////////////////////////////////////////////////////////////////////////
-/** Base class for all items contained in BaseLibraray.
-*/
-struct IDataBaseItem
-{
-    struct SerializeContext
-    {
-        XmlNodeRef node;
-        bool bUndo;
-        bool bLoading;
-        bool bCopyPaste;
-        bool bIgnoreChilds;
-        bool bUniqName;
-        SerializeContext()
-            : node(0)
-            , bLoading(false)
-            , bCopyPaste(false)
-            , bIgnoreChilds(false)
-            , bUniqName(false)
-            , bUndo(false) {};
-        SerializeContext(XmlNodeRef _node, bool bLoad)
-            : node(_node)
-            , bLoading(bLoad)
-            , bCopyPaste(false)
-            , bIgnoreChilds(false)
-            , bUniqName(false)
-            , bUndo(false) {};
-        SerializeContext(const SerializeContext& ctx)
-            : node(ctx.node)
-            , bLoading(ctx.bLoading)
-            , bCopyPaste(ctx.bCopyPaste)
-            , bIgnoreChilds(ctx.bIgnoreChilds)
-            , bUniqName(ctx.bUniqName)
-            , bUndo(ctx.bUndo) {};
-    };
-
-    virtual EDataBaseItemType GetType() const = 0;
-
-    //! Return Library this item are contained in.
-    //! Item can only be at one library.
-    virtual IDataBaseLibrary* GetLibrary() const = 0;
-
-    //! Change item name.
-    virtual void SetName(const QString& name) = 0;
-    //! Get item name.
-    virtual const QString& GetName() const = 0;
-
-    //! Get full item name, including name of library.
-    //! Name formed by adding dot after name of library
-    //! eg. library Pickup and item PickupRL form full item name: "Pickups.PickupRL".
-    virtual QString GetFullName() const = 0;
-
-    //! Get only nameof group from prototype.
-    virtual QString GetGroupName() = 0;
-    //! Get short name of prototype without group.
-    virtual QString GetShortName() = 0;
-
-    //! Serialize library item to archive.
-    virtual void Serialize(SerializeContext& ctx) = 0;
-
-    //! Generate new unique id for this item.
-    virtual void GenerateId() = 0;
-    //! Returns GUID of this material.
-    virtual const GUID& GetGUID() const = 0;
-
-    //! Validate item for errors.
-    virtual void Validate() {};
-
-    //! Gathers resources by this item.
-    virtual void GatherUsedResources([[maybe_unused]] CUsedResources& resources) {};
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IDATABASEITEM_H
diff --git a/Code/Sandbox/Editor/Include/IDataBaseLibrary.h b/Code/Sandbox/Editor/Include/IDataBaseLibrary.h
deleted file mode 100644
index c9b880f594..0000000000
--- a/Code/Sandbox/Editor/Include/IDataBaseLibrary.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IDATABASELIBRARY_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IDATABASELIBRARY_H
-#pragma once
-
-
-struct IDataBaseManager;
-struct IDataBaseItem;
-
-class QString;
-class XmlNodeRef;
-
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//      Interface to access specific library of editor data base.
-//      Ex. Archetype library, Material Library.
-// See Also:
-//     IDataBaseItem,IDataBaseManager
-//////////////////////////////////////////////////////////////////////////
-struct IDataBaseLibrary
-{
-    // Description:
-    //      Return IDataBaseManager interface to the manager for items stored in this library.
-    virtual IDataBaseManager* GetManager() = 0;
-
-    // Description:
-    //      Return library name.
-    virtual const QString& GetName() const = 0;
-
-    // Description:
-    //      Return filename where this library is stored.
-    virtual const QString& GetFilename() const = 0;
-
-    // Description:
-    //      Save contents of library to file.
-    virtual bool Save() = 0;
-
-    // Description:
-    //      Load library from file.
-    // Arguments:
-    //      filename - Full specified library filename (relative to root game folder).
-    virtual bool Load(const QString& filename) = 0;
-
-    // Description:
-    //      Serialize library parameters and items to/from XML node.
-    virtual void Serialize(XmlNodeRef& node, bool bLoading) = 0;
-
-    // Description:
-    //      Marks library as modified, indicates that some item in library was modified.
-    virtual void SetModified(bool bModified = true) = 0;
-
-    // Description:
-    //      Check if library parameters or any items where modified.
-    //      If any item was modified library may need saving before closing editor.
-    virtual bool IsModified() const = 0;
-
-    // Description:
-    //      Check if this library is not shared and internal to current level.
-    virtual bool IsLevelLibrary() const = 0;
-
-    // Description:
-    //      Make this library accessible only from current Level. (not shared)
-    virtual void SetLevelLibrary(bool bEnable) = 0;
-
-    // Description:
-    //      Associate a new item with the library.
-    //      Watch out if item was already in another library.
-    virtual void AddItem(IDataBaseItem* pItem, bool bRegister = true) = 0;
-
-    // Description:
-    //      Return number of items in library.
-    virtual int GetItemCount() const = 0;
-
-    // Description:
-    //      Get item by index.
-    // See Also:
-    //    GetItemCount
-    // Arguments:
-    //      index - Index from 0 to GetItemCount()
-    virtual IDataBaseItem* GetItem(int index) = 0;
-
-    // Description:
-    //      Remove item from library, does not destroy item,
-    //      only unliks it from this library, to delete item use IDataBaseManager.
-    // See Also:
-    //     AddItem
-    virtual void RemoveItem(IDataBaseItem* item) = 0;
-
-    // Description:
-    //      Remove all items from library, does not destroy items,
-    //      only unliks them from this library, to delete item use IDataBaseManager.
-    // See Also:
-    //      RemoveItem,AddItem
-    virtual void RemoveAllItems() = 0;
-
-    // Description:
-    //      Find item in library by name.
-    //      This function usually uses linear search so it is not particularry fast.
-    // See Also:
-    //      GetItem
-    virtual IDataBaseItem* FindItem(const QString& name) = 0;
-
-
-    //CONFETTI BEGIN
-    // Used to change the library item order
-    virtual void ChangeItemOrder(CBaseLibraryItem* item, unsigned int newLocation) = 0;
-    //CONFETTI END
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IDATABASELIBRARY_H
diff --git a/Code/Sandbox/Editor/Include/IDataBaseManager.h b/Code/Sandbox/Editor/Include/IDataBaseManager.h
deleted file mode 100644
index 72d2d270b8..0000000000
--- a/Code/Sandbox/Editor/Include/IDataBaseManager.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IDATABASEMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IDATABASEMANAGER_H
-#pragma once
-
-#include <QString>
-
-struct IDataBaseItem;
-struct IDataBaseLibrary;
-class CUsedResources;
-
-enum EDataBaseItemEvent
-{
-    EDB_ITEM_EVENT_ADD,
-    EDB_ITEM_EVENT_DELETE,
-    EDB_ITEM_EVENT_CHANGED,
-    EDB_ITEM_EVENT_SELECTED,
-    EDB_ITEM_EVENT_UPDATE_PROPERTIES,
-    EDB_ITEM_EVENT_UPDATE_PROPERTIES_NO_EDITOR_REFRESH
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//    Callback class to intercept item creation and deletion events.
-//////////////////////////////////////////////////////////////////////////
-struct IDataBaseManagerListener
-{
-    virtual void OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event) = 0;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Description:
-//    his interface is used to enumerate al items registered to the database manager.
-//////////////////////////////////////////////////////////////////////////
-struct IDataBaseItemEnumerator
-{
-    virtual ~IDataBaseItemEnumerator() = default;
-    
-    virtual void Release() = 0;
-    virtual IDataBaseItem* GetFirst() = 0;
-    virtual IDataBaseItem* GetNext() = 0;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Interface to the collection of all items or specific type
-// in data base libraries.
-//
-//////////////////////////////////////////////////////////////////////////
-struct IDataBaseManager
-{
-    //! Clear all libraries.
-    virtual void ClearAll() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Library items.
-    //////////////////////////////////////////////////////////////////////////
-    //! Make a new item in specified library.
-    virtual IDataBaseItem* CreateItem(IDataBaseLibrary* pLibrary) = 0;
-    //! Delete item from library and manager.
-    virtual void DeleteItem(IDataBaseItem* pItem) = 0;
-
-    //! Find Item by its GUID.
-    virtual IDataBaseItem* FindItem(REFGUID guid) const = 0;
-    virtual IDataBaseItem* FindItemByName(const QString& fullItemName) = 0;
-
-    virtual IDataBaseItemEnumerator* GetItemEnumerator() = 0;
-
-    // Select one item in DB.
-    virtual void SetSelectedItem(IDataBaseItem* pItem) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Libraries.
-    //////////////////////////////////////////////////////////////////////////
-    //! Add Item library.   Set isLevelLibrary to true if its the "level" library which gets saved inside the level
-    virtual IDataBaseLibrary* AddLibrary(const QString& library, bool isLevelLibrary = false, bool bIsLoading = true) = 0;
-    virtual void DeleteLibrary(const QString& library, bool forceDeleteLibrary = false) = 0;
-    //! Get number of libraries.
-    virtual int GetLibraryCount() const = 0;
-    //! Get Item library by index.
-    virtual IDataBaseLibrary* GetLibrary(int index) const = 0;
-
-    //! Find Items Library by name.
-    virtual IDataBaseLibrary* FindLibrary(const QString& library) = 0;
-
-    //! Load Items library.
-#ifdef LoadLibrary
-#undef LoadLibrary
-#endif
-    virtual IDataBaseLibrary* LoadLibrary(const QString& filename, bool bReload = false) = 0;
-
-    //! Save all modified libraries.
-    virtual void SaveAllLibs() = 0;
-
-    //! Serialize property manager.
-    virtual void Serialize(XmlNodeRef& node, bool bLoading) = 0;
-
-    //! Export items to game.
-    virtual void Export([[maybe_unused]] XmlNodeRef& node) {};
-
-    //! Returns unique name base on input name.
-    virtual QString MakeUniqueItemName(const QString& name, const QString& libName = "") = 0;
-    virtual QString MakeFullItemName(IDataBaseLibrary* pLibrary, const QString& group, const QString& itemName) = 0;
-
-    //! Root node where this library will be saved.
-    virtual QString GetRootNodeName() = 0;
-    //! Path to libraries in this manager.
-    virtual QString GetLibsPath() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Validate library items for errors.
-    virtual void Validate() = 0;
-
-    // Description:
-    //      Collects names of all resource files used by managed items.
-    // Arguments:
-    //      resources - Structure where all filenames are collected.
-    virtual void GatherUsedResources(CUsedResources& resources) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Register listeners.
-    virtual void AddListener(IDataBaseManagerListener* pListener) = 0;
-    virtual void RemoveListener(IDataBaseManagerListener* pListener) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IDATABASEMANAGER_H
diff --git a/Code/Sandbox/Editor/Include/IDisplayViewport.h b/Code/Sandbox/Editor/Include/IDisplayViewport.h
deleted file mode 100644
index 70069cd0db..0000000000
--- a/Code/Sandbox/Editor/Include/IDisplayViewport.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#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;
-
-// Viewport functionality required for DisplayContext
-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.
-     * @param lineP1 The first point of the line, in world space.
-     * @param lineP2 The second point of the line, in world space.
-     * @param point The point to check the distance from the line. This point is in screen space.
-     * @return The distance of the point to the line.
-    */
-    virtual float GetDistanceToLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& point) const = 0;
-
-    virtual CBaseObjectsCache* GetVisibleObjectsCache() = 0;
-
-    enum EAxis
-    {
-        AXIS_NONE,
-        AXIS_X,
-        AXIS_Y,
-        AXIS_Z
-    };
-    virtual void GetPerpendicularAxis(EAxis* axis, bool* is2D) const = 0;
-
-    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;
-
-    virtual void ScreenToClient(QPoint& pt) const = 0;
-    virtual void GetDimensions(int* width, int* height) const = 0;
-
-    virtual CViewport *asCViewport() { return nullptr; }
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
diff --git a/Code/Sandbox/Editor/Include/IEditorClassFactory.h b/Code/Sandbox/Editor/Include/IEditorClassFactory.h
deleted file mode 100644
index ab3bb56ccf..0000000000
--- a/Code/Sandbox/Editor/Include/IEditorClassFactory.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Class factory support classes
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEDITORCLASSFACTORY_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IEDITORCLASSFACTORY_H
-#pragma once
-
-#include <vector>
-
-#define DEFINE_UUID(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-static const GUID uuid() { return { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }; }
-
-#ifdef AZ_PLATFORM_WINDOWS
-#include <Unknwn.h>
-#else
-struct IUnknown
-{
-    virtual ~IUnknown() = default;
-};
-#endif
-
-#ifdef __uuidof
-#undef __uuidof
-#endif
-#define __uuidof(T) T::uuid()
-
-#if defined(AZ_PLATFORM_LINUX)
-
-# ifndef _REFGUID_DEFINED
-# define _REFGUID_DEFINED
-typedef const GUID& REFGUID;
-# endif
-
-# ifndef _REFIID_DEFINED
-# define _REFIID_DEFINED
-typedef const GUID& REFIID;
-# endif
-
-# ifndef IID_DEFINED
-# define IID_DEFINED
-typedef GUID IID;
-# endif
-
-#ifndef HRESULT_VALUES_DEFINED
-#define HRESULT_VALUES_DEFINED
-enum
-{
-    E_OUTOFMEMORY  = 0x8007000E,
-    E_FAIL         = 0x80004005,
-    E_ABORT        = 0x80004004,
-    E_INVALIDARG   = 0x80070057,
-    E_NOINTERFACE  = 0x80004002,
-    E_NOTIMPL      = 0x80004001,
-    E_UNEXPECTED   = 0x8000FFFF
-};
-#endif
-
-#endif  // defined(AZ_PLATFORM_LINUX)
-
-#include "SandboxAPI.h"
-
-class QObject;
-class QString;
-
-
-//! System class IDs
-enum ESystemClassID
-{
-    ESYSTEM_CLASS_OBJECT = 0x0001,
-    ESYSTEM_CLASS_EDITTOOL = 0x0002,
-    ESYSTEM_CLASS_PREFERENCE_PAGE = 0x0020,
-    ESYSTEM_CLASS_VIEWPANE = 0x0021,
-    //! Source/Asset Control Management Provider
-    ESYSTEM_CLASS_SCM_PROVIDER = 0x0022,
-    ESYSTEM_CLASS_CONSOLE_CONNECTIVITY = 0x0023,
-    ESYSTEM_CLASS_ASSET_DISPLAY = 0x0024,
-    ESYSTEM_CLASS_ASSET_TAGGING = 0x0025,
-    ESYSTEM_CLASS_FRAMEWND_EXTENSION_PANE = 0x0030,
-    ESYSTEM_CLASS_TRACKVIEW_KEYUI = 0x0040,
-    ESYSTEM_CLASS_UITOOLS = 0x0050, // UI Emulator tool
-    ESYSTEM_CLASS_CONTROL = 0x0900,
-    ESYSTEM_CLASS_USER = 0x1000
-};
-
-//! This interface describes a class created by a plugin
-struct IClassDesc
-    : public IUnknown
-{
-    //////////////////////////////////////////////////////////////////////////
-    // IUnknown implementation.
-    //////////////////////////////////////////////////////////////////////////
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] const IID& riid, [[maybe_unused]] void** ppvObj) { return E_NOINTERFACE; }
-    virtual ULONG STDMETHODCALLTYPE AddRef() { return 0; }
-    virtual ULONG STDMETHODCALLTYPE Release() { return 0; }
-
-    template<class Q>
-    HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)
-    {
-        return QueryInterface(__uuidof(Q), (void**)pp);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Class description.
-    //////////////////////////////////////////////////////////////////////////
-    //! This method returns an Editor defined GUID describing the class this plugin class is associated with.
-    virtual ESystemClassID SystemClassID() = 0;
-    //! Return the GUID of the class created by plugin.
-    virtual REFGUID ClassID() = 0;
-    //! This method returns the human readable name of the class.
-    virtual QString ClassName() = 0;
-    //! This method returns Category of this class, Category is specifying where this plugin class fits best in
-    //! create panel.
-    virtual QString Category() = 0;
-
-#ifdef QSTRING_H
-    virtual QString MenuSuggestion() { return QString(); }
-    virtual QString Tooltip() { return QString(); }
-    virtual QString Description() { return QString(); }
-#else
-    //! This method returns the desired menu in which this plugin class would like to be placed in the editor.
-    //! It is up to the editor to determine if it can and wants to fulfill this request.
-    virtual QString MenuSuggestion();
-    //! This method returns the tooltip for the pane
-    virtual QString Tooltip();
-    //! This method returns the description for the pane
-    virtual QString Description();
-#endif
-
-    //! This method returns if the plugin should have a menu item for its pane.
-    virtual bool ShowInMenu() const { return true; }
-    //! Qt equivalent of CRuntimeClass::CreateObject(). We might create a full QRuntimeClass, if there's a need for it.
-    virtual QObject* CreateQObject() const { return nullptr; }
-
-    //! For any class that may be conditionally enabled or disabled, this function can be overriden to return true if it is enabled, false otherwise.
-    //! The default is to always return true.
-    virtual bool IsEnabled() const { return true; }
-    //////////////////////////////////////////////////////////////////////////
-};
-
-
-struct IViewPaneClass;
-
-struct CRYEDIT_API IEditorClassFactory
-{
-public:
-    virtual ~IEditorClassFactory() = default;
-
-    //! Register new class to the factory.
-    virtual void RegisterClass(IClassDesc* pClassDesc) = 0;
-    //! Find class in the factory by class name.
-    virtual IClassDesc* FindClass(const char* pClassName) const = 0;
-    //! Find class in the factory by class id
-    virtual IClassDesc* FindClass(const GUID& rClassID) const = 0;
-    virtual IViewPaneClass* FindViewPaneClassByTitle(const char* pPaneTitle) const = 0;
-    virtual void UnregisterClass(const char* pClassName) = 0;
-    virtual void UnregisterClass(const GUID& rClassID) = 0;
-    //! Get classes that matching specific requirements.
-    virtual void GetClassesBySystemID(ESystemClassID aSystemClassID, std::vector<IClassDesc*>& rOutClasses) = 0;
-    virtual void GetClassesByCategory(const char* pCategory, std::vector<IClassDesc*>& rOutClasses) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IEDITORCLASSFACTORY_H
diff --git a/Code/Sandbox/Editor/Include/IEditorFileMonitor.h b/Code/Sandbox/Editor/Include/IEditorFileMonitor.h
deleted file mode 100644
index 20e668cdaa..0000000000
--- a/Code/Sandbox/Editor/Include/IEditorFileMonitor.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEDITORFILEMONITOR_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IEDITORFILEMONITOR_H
-#pragma once
-
-struct IFileChangeListener
-{
-    enum EChangeType
-    {
-        //! error or unknown change type
-        eChangeType_Unknown,
-        //! the file was created
-        eChangeType_Created,
-        //! the file was deleted
-        eChangeType_Deleted,
-        //! the file was modified (size changed,write)
-        eChangeType_Modified,
-        //! this is the old name of a renamed file
-        eChangeType_RenamedOldName,
-        //! this is the new name of a renamed file
-        eChangeType_RenamedNewName
-    };
-
-    virtual ~IFileChangeListener() = default;
-    
-    virtual void OnFileChange(const char* sFilename, EChangeType eType) = 0;
-};
-
-struct IFileChangeMonitor
-{
-    virtual ~IFileChangeMonitor() = default;
-
-    // <interfuscator:shuffle>
-    // Register the path of a file or directory to monitor
-    // Path is relative to game directory, e.g. "Libs/WoundSystem/" or "Libs/WoundSystem/HitLocations.xml"
-    virtual bool RegisterListener(IFileChangeListener* pListener, const char* sMonitorItem) = 0;
-    // This function can be used to monitor files of specific type, e.g.
-    //   RegisterListener(pListener, "Animations", "caf")
-    virtual bool RegisterListener(IFileChangeListener* pListener, const char* sFolder, const char* sExtension) = 0;
-    virtual bool UnregisterListener(IFileChangeListener* pListener) = 0;
-    // </interfuscator:shuffle>
-};
-
-struct IEditorFileMonitor
-    : public IFileChangeMonitor
-{
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IEDITORFILEMONITOR_H
diff --git a/Code/Sandbox/Editor/Include/IEditorMaterial.h b/Code/Sandbox/Editor/Include/IEditorMaterial.h
deleted file mode 100644
index bd21e66080..0000000000
--- a/Code/Sandbox/Editor/Include/IEditorMaterial.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEDITORMATERIAL_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IEDITORMATERIAL_H
-
-
-#include "BaseLibraryItem.h"
-#include <IMaterial.h>
-
-struct IEditorMaterial
-    : public CBaseLibraryItem
-{
-    virtual int GetFlags() const = 0;
-    virtual _smart_ptr<IMaterial> GetMatInfo(bool bUseExistingEngineMaterial = false) = 0;
-    virtual void DisableHighlightForFrame() = 0;
-};
-
-#endif
diff --git a/Code/Sandbox/Editor/Include/IEditorMaterialManager.h b/Code/Sandbox/Editor/Include/IEditorMaterialManager.h
deleted file mode 100644
index cf2bc5dc0e..0000000000
--- a/Code/Sandbox/Editor/Include/IEditorMaterialManager.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_MATERIAL_IEDITORMATERIALMANAGER_H
-#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>
-
-
-struct IEditorMaterialManager
-{
-    virtual void GotoMaterial(_smart_ptr<IMaterial> pMaterial) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_MATERIAL_MATERIALMANAGER_H
diff --git a/Code/Sandbox/Editor/Include/IErrorReport.h b/Code/Sandbox/Editor/Include/IErrorReport.h
deleted file mode 100644
index 25f959a6ed..0000000000
--- a/Code/Sandbox/Editor/Include/IErrorReport.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-// Description : Class that collects error reports to present them later.
-
-#ifndef CRYINCLUDE_EDITOR_INTERFACE_ERRORREPORT_H
-#define CRYINCLUDE_EDITOR_INTERFACE_ERRORREPORT_H
-#pragma once
-
-#include <IValidator.h>
-
-// forward declarations.
-class CParticleItem;
-class CBaseObject;
-class CBaseLibraryItem;
-class CErrorRecord;
-
-/*! Error report manages collection of errors occurred during map analyzes or level load.
- */
-struct IErrorReport
-    : public IValidator
-{
-    virtual ~IErrorReport(){}
-
-    //! If enabled errors are reported immediately and not stored.
-    virtual void SetImmediateMode(bool bEnable) = 0;
-
-    virtual bool IsImmediateMode() const = 0;
-
-    virtual void SetShowErrors(bool bShowErrors = true) = 0;
-
-    //! Adds new error to report.
-    virtual void ReportError(CErrorRecord& err) = 0;
-
-    //! Check if error report have any errors.
-    virtual bool IsEmpty() const = 0;
-
-    //! Get number of contained error records.
-    virtual int GetErrorCount() const = 0;
-
-    //! Get access to indexed error record.
-    virtual CErrorRecord& GetError(int i) = 0;
-
-    //! Clear all error records.
-    virtual void Clear() = 0;
-
-    //! Display dialog with all errors.
-    virtual void Display() = 0;
-
-    //! Assign current Object to which new reported warnings are assigned.
-    virtual void SetCurrentValidatorObject(CBaseObject* pObject) = 0;
-
-    //! Assign current Item to which new reported warnings are assigned.
-    virtual void SetCurrentValidatorItem(CBaseLibraryItem* pItem) = 0;
-
-    //! Assign current filename.
-    virtual void SetCurrentFile(const QString& file) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Implement IValidator interface.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void Report(SValidatorRecord& record) = 0;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_ERRORREPORT_H
diff --git a/Code/Sandbox/Editor/Include/IEventLoopHook.h b/Code/Sandbox/Editor/Include/IEventLoopHook.h
deleted file mode 100644
index 93411b1399..0000000000
--- a/Code/Sandbox/Editor/Include/IEventLoopHook.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
-#pragma once
-
-struct IEventLoopHook
-{
-    IEventLoopHook* pNextHook;
-
-    IEventLoopHook()
-        : pNextHook(0) {}
-
-    virtual bool PrePumpMessage() { return false; }
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
diff --git a/Code/Sandbox/Editor/Include/IExportManager.h b/Code/Sandbox/Editor/Include/IExportManager.h
deleted file mode 100644
index 98957ef660..0000000000
--- a/Code/Sandbox/Editor/Include/IExportManager.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// 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
-{
-    struct Vector3D
-    {
-        float x, y, z;
-    };
-
-
-    struct Quat
-    {
-        Vector3D v;
-        float w;
-    };
-
-
-    struct UV
-    {
-        float u, v;
-    };
-
-
-    struct Face
-    {
-        uint32 idx[3];
-    };
-
-
-    struct Color
-    {
-        float r, g, b, a;
-    };
-
-    typedef char TPath[_MAX_PATH];
-
-    struct Material
-    {
-        Color diffuse;
-        Color specular;
-        float opacity;
-        float smoothness;
-        char name[EXP_NAMESIZE];
-        TPath mapDiffuse;
-        TPath mapSpecular;
-        TPath mapOpacity;
-        TPath mapNormals;
-        TPath mapDecal;
-        TPath mapDisplacement;
-    };
-
-
-    struct Mesh
-    {
-        Material material;
-
-        virtual int GetFaceCount() const = 0;
-        virtual const Face* GetFaceBuffer() const = 0;
-    };
-
-    // The numbers in this enum list must reflect the one from AnimParamType.h
-    enum AnimParamType
-    {
-        FOV         = 0,
-        PositionX   = 51,
-        PositionY   = 52,
-        PositionZ   = 53,
-        RotationX   = 54,
-        RotationY   = 55,
-        RotationZ   = 56,
-
-        // FocalLength is an exceptional case for FBX importing from Maya. In engine we use FoV, not Focal Length, therefore
-        // there is no equivalent AnimParamType::FocalLength in IMovieSystem.h. However we enumerate it here so we can detect
-        // and convert it to FoV during import
-        FocalLength,
-    };
-
-    enum EEntityObjectType
-    {
-        eEntity = 0,
-        eCamera = 1,
-        eCameraTarget = 2,
-    };
-
-    struct EntityAnimData
-    {
-        AnimParamType dataType;
-        float keyTime;
-        float keyValue;
-        float leftTangent;
-        float rightTangent;
-        float leftTangentWeight;
-        float rightTangentWeight;
-    };
-
-    struct Object
-    {
-        Vector3D pos;
-        Quat rot;
-        Vector3D scale;
-        char name[EXP_NAMESIZE];
-        char materialName[EXP_NAMESIZE];
-        int nParent;
-        EEntityObjectType entityType;
-        char cameraTargetNodeName[EXP_NAMESIZE];
-
-        virtual int GetVertexCount() const = 0;
-        virtual const Vector3D* GetVertexBuffer() const = 0;
-
-        virtual int GetNormalCount() const = 0;
-        virtual const Vector3D* GetNormalBuffer() const = 0;
-
-        virtual int GetTexCoordCount() const = 0;
-        virtual const UV* GetTexCoordBuffer() const = 0;
-
-        virtual int GetMeshCount() const = 0;
-        virtual Mesh* GetMesh(int index) const = 0;
-
-        virtual size_t  MeshHash() const =   0;
-
-        virtual int GetEntityAnimationDataCount() const = 0;
-        virtual const EntityAnimData* GetEntityAnimationData(int index) const = 0;
-        virtual void SetEntityAnimationData(EntityAnimData entityData) = 0;
-    };
-
-
-    // IData: Collection of data like object meshes, materials, animations, etc.
-    // used for export
-    // This data is collected by Export Manager implementation
-    struct IData
-    {
-        virtual int GetObjectCount() const = 0;
-        virtual Object* GetObject(int index) const = 0;
-        virtual Object* AddObject(const char* objectName) = 0;
-    };
-} // namespace Export
-
-
-
-// IExporter: interface to present an exporter
-// Exporter is responding to export data from object of IData type
-// to file with specified format
-// Exporter could be provided by user through plug-in system
-struct IExporter
-{
-    virtual ~IExporter() = default;
-    
-    // Get file extension of exporter type, f.i. "obj"
-    virtual const char* GetExtension() const = 0;
-
-    // Get short format description for showing it in FileSave dialog
-    // Example: "Object format"
-    virtual const char* GetShortDescription() const = 0;
-
-    // Implementation of en exporting data to the file
-    virtual bool ExportToFile(const char* filename, const Export::IData* pData) = 0;
-    virtual bool ImportFromFile(const char* filename, Export::IData* pData) = 0;
-
-    // Before Export Manager is destroyed Release will be called
-    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/Sandbox/Editor/Include/IFacialEditor.h b/Code/Sandbox/Editor/Include/IFacialEditor.h
deleted file mode 100644
index c803c248c4..0000000000
--- a/Code/Sandbox/Editor/Include/IFacialEditor.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IFACIALEDITOR_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IFACIALEDITOR_H
-#pragma once
-
-
-class IFacialEditor
-{
-public:
-    enum EyeType
-    {
-        EYE_LEFT,
-        EYE_RIGHT
-    };
-
-    virtual int GetNumMorphTargets() const = 0;
-    virtual const char* GetMorphTargetName(int index) const = 0;
-    virtual void PreviewEffector(int index, float value) = 0;
-    virtual void ClearAllPreviewEffectors() = 0;
-    virtual void SetForcedNeckRotation(const Quat& rotation) = 0;
-    virtual void SetForcedEyeRotation(const Quat& rotation, EyeType eye) = 0;
-    virtual int GetJoystickCount() const = 0;
-    virtual const char* GetJoystickName(int joystickIndex) const = 0;
-    virtual void SetJoystickPosition(int joystickIndex, float x, float y) = 0;
-    virtual void GetJoystickPosition(int joystickIndex, float& x, float& y) const = 0;
-    virtual void LoadJoystickFile(const char* filename) = 0;
-    virtual void LoadCharacter(const char* filename) = 0;
-    virtual void LoadSequence(const char* filename) = 0;
-    virtual void SetVideoFrameResolution(int width, int height, int bpp) = 0;
-    virtual int GetVideoFramePitch() = 0;
-    virtual void* GetVideoFrameBits() = 0;
-    virtual void ShowVideoFramePane() = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IFACIALEDITOR_H
diff --git a/Code/Sandbox/Editor/Include/IFileUtil.h b/Code/Sandbox/Editor/Include/IFileUtil.h
deleted file mode 100644
index e75aab3da7..0000000000
--- a/Code/Sandbox/Editor/Include/IFileUtil.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "StringUtils.h"
-#include "../Include/SandboxAPI.h"
-
-class QWidget;
-
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
-
-#ifdef RemoveDirectory
-#undef RemoveDirectory
-#endif
-
-#ifdef CopyFile
-#undef CopyFile
-#endif
-
-#ifdef MoveFile
-#undef MoveFile
-#endif
-
-#ifdef DeleteFile
-#undef DeleteFile
-#endif
-
-namespace AzToolsFramework
-{
-    struct SourceControlFileInfo;
-}
-
-typedef int (*ProgressRoutine)(
-    qint64 totalFileSize,
-    qint64 totalBytesTransferred,
-    qint64 streamSize,
-    qint64 streamBytesTransferred,
-    long   streamNumber,
-    long   callbackReason,
-    void*  sourceFile,
-    void*  destinationFile,
-    void*  data
-);
-
-struct IFileUtil
-{
-    //! File types used for File Open dialogs
-    enum ECustomFileType
-    {
-        EFILE_TYPE_ANY,
-        EFILE_TYPE_GEOMETRY,
-        EFILE_TYPE_TEXTURE,
-        EFILE_TYPE_SOUND,
-        EFILE_TYPE_GEOMCACHE,
-        EFILE_TYPE_LAST,
-    };
-
-    struct FileDesc
-    {
-        QString filename;
-        unsigned int attrib;
-        time_t  time_create;    //! -1 for FAT file systems
-        time_t  time_access;    //! -1 for FAT file systems
-        time_t  time_write;
-        int64 size;
-    };
-
-    enum ETextFileType
-    {
-        FILE_TYPE_SCRIPT,
-        FILE_TYPE_SHADER,
-        FILE_TYPE_BSPACE,   // added back in 3.8 integration, may not end up needing this.
-    };
-
-    enum ECopyTreeResult
-    {
-        ETREECOPYOK,
-        ETREECOPYFAIL,
-        ETREECOPYUSERCANCELED,
-        ETREECOPYUSERDIDNTCOPYSOMEITEMS,
-    };
-
-    struct ExtraMenuItems
-    {
-        QStringList names;
-        int selectedIndexIfAny;
-
-        ExtraMenuItems()
-            : selectedIndexIfAny(-1) {}
-
-        int AddItem(const QString& name)
-        {
-            names.push_back(name);
-            return names.size() - 1;
-        }
-    };
-
-    typedef DynArray<FileDesc> FileArray;
-
-    typedef bool (* ScanDirectoryUpdateCallBack)(const QString& msg);
-
-    virtual ~IFileUtil() = default;
-
-    virtual bool ScanDirectory(const QString& path, const QString& fileSpec, FileArray& files, bool recursive = true, bool addDirAlso = false, ScanDirectoryUpdateCallBack updateCB = nullptr, bool bSkipPaks = false) = 0;
-
-    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
-    virtual bool CalculateDccFilename(const QString& assetFilename, QString& dccFilename) = 0;
-
-    //! Reformat filter string for (MFC) CFileDialog style file filtering
-    virtual void FormatFilterString(QString& filter) = 0;
-
-    virtual bool SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName) = 0;
-
-    //! Attempt to make a file writable
-    virtual bool OverwriteFile(const QString& filename) = 0;
-
-    //! Checks out the file from source control API.  Blocks until completed
-    virtual bool CheckoutFile(const char* filename, QWidget* parentWindow = nullptr) = 0;
-
-    //! Discard changes to a file from source control API.  Blocks until completed
-    virtual bool RevertFile(const char* filename, QWidget* parentWindow = nullptr) = 0;
-
-    //! Renames (moves) a file through the source control API.  Blocks until completed
-    virtual bool RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow = nullptr) = 0;
-
-    //! Deletes a file using source control API.  Blocks until completed
-    virtual bool DeleteFromSourceControl(const char* filename, QWidget* parentWindow = nullptr) = 0;
-
-    //! Attempts to get the latest version of a file from source control.  Blocks until completed
-    virtual bool GetLatestFromSourceControl(const char* filename, QWidget* parentWindow = nullptr) = 0;
-
-    //! Gather information about a file using the source control API.  Blocks until completed
-    virtual bool GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow = nullptr) = 0;
-
-    //! Creates this directory.
-    virtual void CreateDirectory(const char* dir) = 0;
-
-    //! Makes a backup file.
-    virtual void BackupFile(const char* filename) = 0;
-
-    //! Makes a backup file, marked with a datestamp, e.g. myfile.20071014.093320.xml
-    //! If bUseBackupSubDirectory is true, moves backup file into a relative subdirectory "backups"
-    virtual void BackupFileDated(const char* filename, bool bUseBackupSubDirectory = false) = 0;
-
-    // ! Added deltree as a copy from the function found in Crypak.
-    virtual bool Deltree(const char* szFolder, bool bRecurse) = 0;
-
-    // Checks if a file or directory exist.
-    // We are using 3 functions here in order to make the names more instructive for the programmers.
-    // Those functions only work for OS files and directories.
-    virtual bool Exists(const QString& strPath, bool boDirectory, FileDesc* pDesc = nullptr) = 0;
-    virtual bool FileExists(const QString& strFilePath, FileDesc* pDesc = nullptr) = 0;
-    virtual bool PathExists(const QString& strPath) = 0;
-    virtual bool GetDiskFileSize(const char* pFilePath, uint64& rOutSize) = 0;
-
-    // This function should be used only with physical files.
-    virtual bool IsFileExclusivelyAccessable(const QString& strFilePath) = 0;
-
-    // Creates the entire path, if needed.
-    virtual bool CreatePath(const QString& strPath) = 0;
-
-    // Attempts to delete a file (if read only it will set its attributes to normal first).
-    virtual bool DeleteFile(const QString& strPath) = 0;
-
-    // Attempts to remove a directory (if read only it will set its attributes to normal first).
-    virtual bool RemoveDirectory(const QString& strPath) = 0;
-
-    // Copies all the elements from the source directory to the target directory.
-    // It doesn't copy the source folder to the target folder, only it's contents.
-    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
-    virtual ECopyTreeResult CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
-    // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
-    virtual ECopyTreeResult CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = nullptr, bool* pbCancel = nullptr) = 0;
-
-    // As we don't have a FileUtil interface here, we have to duplicate some code :-( in order to keep
-    // function calls clean.
-    // Moves all the elements from the source directory to the target directory.
-    // It doesn't move the source folder to the target folder, only it's contents.
-    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
-    virtual ECopyTreeResult MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) = 0;
-
-    virtual void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false) = 0;
-
-    // Get file attributes include source control attributes if available
-    virtual uint32 GetAttributes(const char* filename, bool bUseSourceControl = true) = 0;
-
-    // Returns true if the files have the same content, false otherwise
-    virtual bool CompareFiles(const QString& strFilePath1, const QString& strFilePath2) = 0;
-
-    virtual QString GetPath(const QString& path) = 0;
-};
diff --git a/Code/Sandbox/Editor/Include/IGizmoManager.h b/Code/Sandbox/Editor/Include/IGizmoManager.h
deleted file mode 100644
index c6c951d79b..0000000000
--- a/Code/Sandbox/Editor/Include/IGizmoManager.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IGIZMOMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IGIZMOMANAGER_H
-#pragma once
-
-class CGizmo;
-struct DisplayContext;
-struct HitContext;
-
-/** GizmoManager manages set of currently active Gizmo objects.
-*/
-struct IGizmoManager
-{
-    virtual ~IGizmoManager() = default;
-    
-    virtual void AddGizmo(CGizmo* gizmo) = 0;
-    virtual void RemoveGizmo(CGizmo* gizmo) = 0;
-
-    virtual int GetGizmoCount() const = 0;
-    virtual CGizmo* GetGizmoByIndex(int nIndex) const = 0;
-
-    virtual void Display(DisplayContext& dc) = 0;
-    virtual bool HitTest(HitContext& hc) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IGIZMOMANAGER_H
diff --git a/Code/Sandbox/Editor/Include/IIconManager.h b/Code/Sandbox/Editor/Include/IIconManager.h
deleted file mode 100644
index 72a676dcca..0000000000
--- a/Code/Sandbox/Editor/Include/IIconManager.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
-#pragma once
-
-struct IStatObj;
-struct IMaterial;
-class CBitmap;
-
-// Note: values are used as array indices
-enum EStatObject
-{
-    eStatObject_Arrow = 0,
-    eStatObject_Axis,
-    eStatObject_Sphere,
-    eStatObject_Anchor,
-    eStatObject_Entrance,
-    eStatObject_HidePoint,
-    eStatObject_HidePointSecondary,
-    eStatObject_ReinforcementSpot,
-
-    eStatObject_COUNT
-};
-
-// Note: values are used as array indices
-enum EIcon
-{
-    eIcon_ScaleWarning = 0,
-    eIcon_RotationWarning,
-
-    eIcon_COUNT
-};
-
-// Note: image effects to apply to image
-enum EIconEffect
-{
-    eIconEffect_Dim = 1 << 0,
-    eIconEffect_HalfAlpha = 1 << 1,
-    eIconEffect_TintRed = 1 << 2,
-    eIconEffect_TintGreen = 1 << 3,
-    eIconEffect_TintYellow = 1 << 4,
-    eIconEffect_ColorEnabled = 1 << 5,
-    eIconEffect_ColorDisabled = 1 << 6,
-};
-
-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/Sandbox/Editor/Include/IImageUtil.h b/Code/Sandbox/Editor/Include/IImageUtil.h
deleted file mode 100644
index 50e5b18b4a..0000000000
--- a/Code/Sandbox/Editor/Include/IImageUtil.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H
-#pragma once
-
-#include "Util/Image.h"
-class CAlphaBitmap;
-
-struct IImageUtil
-{
-    virtual ~IImageUtil() = default;
-    
-    //! Load image, detect image type by file extension.
-    // Arguments:
-    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
-    virtual bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0) = 0;
-
-    //! Save image, detect image type by file extension.
-    virtual bool SaveImage(const QString& fileName, CImageEx& image) = 0;
-
-    // General image fucntions
-    virtual bool LoadJPEG(const QString& strFileName, CImageEx& image) = 0;
-
-    virtual bool SaveJPEG(const QString& strFileName, CImageEx& image) = 0;
-
-    virtual bool SaveBitmap(const QString& szFileName, CImageEx& image) = 0;
-
-    virtual bool LoadBmp(const QString& file, CImageEx& image) = 0;
-
-    virtual bool SavePGM(const QString& fileName, const CImageEx& image) = 0;
-
-    virtual bool LoadPGM(const QString& fileName, CImageEx& image) = 0;
-
-    //! Scale source image to fit size of target image.
-    virtual void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage) = 0;
-
-    //! Scale source image to fit size of target image.
-    virtual void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage) = 0;
-
-    //! Scale source image to fit twice side by side in target image.
-    virtual void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage) = 0;
-
-    //! Scale source image twice down image with filering
-    enum _EAddrMode
-    {
-        WRAP, CLAMP
-    };
-    virtual void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, _EAddrMode eAddressingMode = WRAP) = 0;
-
-    //! Smooth image.
-    virtual void SmoothImage(CByteImage& image, int numSteps) = 0;
-
-    //! behavior outside of the texture is not defined
-    //! \param iniX in fix point 24.8
-    //! \param iniY in fix point 24.8
-    //! \return 0..255
-    virtual unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image) = 0;
-};
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H
diff --git a/Code/Sandbox/Editor/Include/IKeyTimeSet.h b/Code/Sandbox/Editor/Include/IKeyTimeSet.h
deleted file mode 100644
index 9a4ff1f507..0000000000
--- a/Code/Sandbox/Editor/Include/IKeyTimeSet.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IKEYTIMESET_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IKEYTIMESET_H
-#pragma once
-
-
-class IKeyTimeSet
-{
-public:
-    virtual int GetKeyTimeCount() const = 0;
-    virtual float GetKeyTime(int index) const = 0;
-    virtual void MoveKeyTimes(int numChanges, int* indices, float scale, float offset, bool copyKeys) = 0;
-    virtual bool GetKeyTimeSelected(int index) const = 0;
-    virtual void SetKeyTimeSelected(int index, bool selected) = 0;
-    virtual int GetKeyCount(int index) const = 0;
-    virtual int GetKeyCountBound() const = 0;
-    virtual void BeginEdittingKeyTimes() = 0;
-    virtual void EndEdittingKeyTimes() = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IKEYTIMESET_H
diff --git a/Code/Sandbox/Editor/Include/ILogFile.h b/Code/Sandbox/Editor/Include/ILogFile.h
deleted file mode 100644
index 82fb42fa58..0000000000
--- a/Code/Sandbox/Editor/Include/ILogFile.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITORCORE_INCLUDE_ILOGFILE_H
-#define CRYINCLUDE_EDITORCORE_INCLUDE_ILOGFILE_H
-
-#pragma once
-
-struct ILogFile
-{
-    virtual ~ILogFile() = default;
-    
-    virtual const char* GetLogFileName() = 0;
-
-    //! Write to log spanpshot of current process memory usage.
-    virtual QString GetMemUsage() = 0;
-
-    virtual void WriteString(const char* pszString) = 0;
-    virtual void WriteLine(const char* pszLine) = 0;
-    virtual void FormatLine(const char* pszMessage, ...) = 0;
-
-    // logs some useful information
-    // should be called after CryLog() is available
-    virtual void AboutSystem() = 0;
-
-    virtual void Warning(const char* format, ...) = 0;
-};
-
-#endif // CRYINCLUDE_EDITORCORE_INCLUDE_ILOGFILE_H
diff --git a/Code/Sandbox/Editor/Include/IObjectManager.h b/Code/Sandbox/Editor/Include/IObjectManager.h
deleted file mode 100644
index 3fa4a56a60..0000000000
--- a/Code/Sandbox/Editor/Include/IObjectManager.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
-#pragma once
-
-// forward declarations.
-class CEntityObject;
-struct DisplayContext;
-struct IGizmoManager;
-class CTrackViewAnimNode;
-class CUsedResources;
-class CSelectionGroup;
-class CObjectClassDesc;
-class CObjectArchive;
-class CViewport;
-struct HitContext;
-enum class ImageRotationDegrees;
-struct IStatObj;
-
-#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.
-//
-//////////////////////////////////////////////////////////////////////////
-struct IObjectManager
-{
-public:
-    virtual ~IObjectManager() = default;
-
-    //! This callback will be called on response to object event.
-    struct EventListener
-    {
-        virtual void OnObjectEvent(CBaseObject*, int) = 0;
-    };
-
-    virtual CBaseObject* NewObject(CObjectClassDesc* cls, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr) = 0;
-    virtual CBaseObject* NewObject(const QString& typeName, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr) = 0;
-    virtual CBaseObject* NewObject(CObjectArchive& archive, CBaseObject* pUndoObject = 0, bool bMakeNewId = false) = 0;
-
-    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;
-
-    //! Get array of objects, managed by manager (not contain sub objects of groups).
-    //! @param layer if 0 get objects for all layers, or layer to get objects from.
-    virtual void GetObjects(CBaseObjectsArray& objects) const = 0;
-    virtual void GetObjects(DynArray<CBaseObject*>& 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;
-
-    //! Send event to all objects.
-    //! Will cause OnEvent handler to be called on all objects.
-    virtual void SendEvent(ObjectEvent event) = 0;
-
-    //! Send event to all objects within given bounding box.
-    //! Will cause OnEvent handler to be called on objects within bounding box.
-    virtual void SendEvent(ObjectEvent event, const AABB& bounds) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find object by ID.
-    virtual CBaseObject* FindObject(REFGUID guid) const = 0;
-    //////////////////////////////////////////////////////////////////////////
-    //! Find object by name.
-    virtual CBaseObject* FindObject(const QString& sName) const = 0;
-    //////////////////////////////////////////////////////////////////////////
-    //! Find objects of given type.
-    virtual void FindObjectsOfType(const QMetaObject* pClass, std::vector<CBaseObject*>& result) = 0;
-    virtual void FindObjectsOfType(ObjectType type, std::vector<CBaseObject*>& result) = 0;
-    //////////////////////////////////////////////////////////////////////////
-    //! 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;
-
-    //! Generates uniq name base on type name of object.
-    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;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! 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/Sandbox/Editor/Include/IPlugin.h b/Code/Sandbox/Editor/Include/IPlugin.h
deleted file mode 100644
index 35cc3e74af..0000000000
--- a/Code/Sandbox/Editor/Include/IPlugin.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : To add plug-in to the Editor create a new DLL with class implementation derived from IPlugin
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IPLUGIN_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IPLUGIN_H
-#pragma once
-
-#include <IEditor.h>
-
-// forbid plugins from loading across debug and release:
-
-#define SANDBOX_PLUGIN_SYSTEM_BASE_VERSION 1
-
-#if defined(_DEBUG)
-    #define SANDBOX_PLUGIN_SYSTEM_VERSION (100000 + SANDBOX_PLUGIN_SYSTEM_BASE_VERSION)
-#else
-    #define SANDBOX_PLUGIN_SYSTEM_VERSION SANDBOX_PLUGIN_SYSTEM_BASE_VERSION
-#endif
-
-// Interface for instantiating the plugin for the editor
-struct IPlugin
-{
-    enum EError
-    {
-        eError_None = 0,
-        eError_VersionMismatch = 1
-    };
-
-    virtual ~IPlugin() = default;
-    
-    // Releases plugin.
-    virtual void Release() = 0;
-    //! Show a modal about dialog / message box for the plugin
-    virtual void ShowAbout() = 0;
-    //! Return the GUID of the plugin
-    virtual const char* GetPluginGUID() = 0;
-    virtual DWORD GetPluginVersion() = 0;
-    //! Return the human readable name of the plugin
-    virtual const char* GetPluginName() = 0;
-    //! Asks if the plugin can exit now. This might involve asking the user if he wants to save
-    //! data. The plugin is only supposed to ask for unsaved data which is not serialize into
-    //! the editor project file. When data is modified which is saved into the project file, the
-    //! plugin should call IEditor::SetDataModified() to make the editor ask
-    virtual bool CanExitNow() = 0;
-    //! this method is called when there is an event triggered inside the editor
-    virtual void OnEditorNotify(EEditorNotifyEvent aEventId) = 0;
-};
-
-// Initialization structure
-struct PLUGIN_INIT_PARAM
-{
-    IEditor* pIEditorInterface;
-    int pluginVersion;
-    IPlugin::EError outErrorCode;
-};
-
-// Plugin Settings structure
-struct SPluginSettings
-{
-    // note: the pluginVersion in PLUGIN_INIT_PARAM denotes the version of the plugin manager
-    // whereas this denotes the version of the individual plugin.
-    // future: manage plugin versions.
-    int pluginVersion;
-    bool autoLoad;
-};
-
-// Factory API
-extern "C"
-{
-PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam);
-PLUGIN_API void QueryPluginSettings(SPluginSettings& settings);
-}
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IPLUGIN_H
diff --git a/Code/Sandbox/Editor/Include/IPreferencesPage.h b/Code/Sandbox/Editor/Include/IPreferencesPage.h
deleted file mode 100644
index e0f2f3b28f..0000000000
--- a/Code/Sandbox/Editor/Include/IPreferencesPage.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Custom preference page interfaces
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IPREFERENCESPAGE_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IPREFERENCESPAGE_H
-#pragma once
-#include "Plugin.h"
-#include <AzCore/RTTI/RTTI.h>
-
-//! The interface class for preferences pages.
-struct IPreferencesPage
-{
-    AZ_RTTI(IPreferencesPage, "{DEB112AD-55AD-4407-8482-BDA095A64752}")
-
-    //! Return category where this preferences page belongs.
-    virtual const char* GetCategory() = 0;
-    //! Title of this preferences page.
-    virtual const char* GetTitle() = 0;
-    //! Return the icon for this page.
-    virtual QIcon& GetIcon() = 0;
-    //! Called by the editor when the Apply Now button is clicked.
-    virtual void OnApply() = 0;
-    //! Called by the editor when the Cancel button is clicked.
-    virtual void OnCancel() = 0;
-    //! Called by the editor when the Cancel button is clicked, and before the cancel has taken place.
-    //! @return true to perform Cancel operation, false to abort Cancel.
-    virtual bool OnQueryCancel() = 0;
-    //! Called by the editor when the preferences page is made the active page or is not longer the active page.
-    //! @param bActive true when page become active, false when page deactivated.
-};
-
-//! Interface used to create new preferences pages.
-//! You can query this interface from any IClassDesc interface with ESYSTEM_CLASS_PREFERENCE_PAGE system class Id.
-struct IPreferencesPageCreator
-{
-    DEFINE_UUID(0xD494113C, 0xBF13, 0x4171, 0x91, 0x71, 0x03, 0x33, 0xDF, 0x10, 0xEA, 0xFC)
-
-    //! Get number of preferences page hosted by this class.
-    virtual int GetPagesCount() = 0;
-    //! Creates a new preferences page by page index.
-    //! @param index must be within 0 <= index < GetPagesCount().
-    virtual IPreferencesPage* CreateEditorPreferencesPage(int index) = 0;
-};
-
-//! A plugin class description for all IPreferencesPage derived classes.
-struct IPreferencesPageClassDesc
-    : public IClassDesc
-{
-    //////////////////////////////////////////////////////////////////////////
-    // IClassDesc implementation.
-    //////////////////////////////////////////////////////////////////////////
-    virtual ESystemClassID SystemClassID() { return ESYSTEM_CLASS_PREFERENCE_PAGE; };
-    //! This method returns the human readable name of the class.
-    virtual QString ClassName() { return "Preferences Page"; };
-    //! This method returns Category of this class,
-    //! Category is specifying where this plugin class fits best in the create panel.
-    virtual QString Category() { return "Preferences"; };
-    //! Show a modal about dialog / message box for the plugin.
-    virtual void ShowAbout() {};
-    virtual bool CanExitNow() { return true; };
-    //! The plugin should write / read its data to the passed stream. The data is saved to or loaded
-    //! from the editor project file. This function is called during the usual save / load process of
-    //! the editor's project file
-    virtual void Serialize([[maybe_unused]] CXmlArchive& ar) {};
-};
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IPREFERENCESPAGE_H
diff --git a/Code/Sandbox/Editor/Include/IRenderListener.h b/Code/Sandbox/Editor/Include/IRenderListener.h
deleted file mode 100644
index eb9656b8ac..0000000000
--- a/Code/Sandbox/Editor/Include/IRenderListener.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Interface for rendering custom 3D elements in the main
-//               render viewport. Particularly usefull for debug geometries.
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
-#pragma once
-
-
-struct DisplayContext;
-
-struct IRenderListener
-    : public IUnknown
-{
-    DEFINE_UUID(0x8D52F857, 0x1027, 0x4346, 0xAC, 0x7B, 0xF6, 0x20, 0xDA, 0x7C, 0xCE, 0x42)
-
-    virtual void Render(DisplayContext& rDisplayContext) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IRENDERLISTENER_H
diff --git a/Code/Sandbox/Editor/Include/IResourceSelectorHost.h b/Code/Sandbox/Editor/Include/IResourceSelectorHost.h
deleted file mode 100644
index d960a0ae3d..0000000000
--- a/Code/Sandbox/Editor/Include/IResourceSelectorHost.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-// The aim of IResourceSelectorHost is to unify resource selection dialogs in a one
-// API that can be reused with plugins. It also makes possible to register new
-// resource selectors dynamically, e.g. inside plugins.
-//
-// Here is how new selectors are created. In your implementation file you add handler function:
-//
-//   #include "IResourceSelectorHost.h"
-//
-//   QString SoundFileSelector(const SResourceSelectorContext& x, const QString& previousValue)
-//   {
-//     CMyModalDialog dialog(CWnd::FromHandle(x.parentWindow));
-//     ...
-//     return previousValue;
-//   }
-//   REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "Icons/sound_16x16.png")
-//
-// Here is how it can be invoked directly:
-//
-//   SResourceSelectorContext x;
-//   x.parentWindow = parent.GetSafeHwnd();
-//   x.typeName = "Sound";
-//   string newValue = GetIEditor()->GetResourceSelector()->SelectResource(x, previousValue).c_str();
-//
-// If you have your own resource selectors in the plugin you will need to run
-//
-//    RegisterModuleResourceSelectors(GetIEditor()->GetResourceSelector())
-//
-// during plugin initialization.
-//
-// If you want to be able to pass some custom context to the selector (e.g. source of the information for the
-// list of items or something similar) then you can add a poitner argument to your selector function, i.e.:
-//
-//   QString SoundFileSelector(const SResourceSelectorContext& x, const QString& previousValue,
-//                             SoundFileList* list) // your context argument
-
-#include <QString>
-
-class QWidget;
-
-struct SResourceSelectorContext
-{
-    const char* typeName;
-
-    // use either parentWidget or parentWindow (not both) until everything porting to QWidget.
-    QWidget* parentWidget;
-
-    unsigned int entityId;
-    void* contextObject;
-
-    SResourceSelectorContext()
-        : parentWidget(0)
-        , typeName(0)
-        , entityId(0)
-        , contextObject()
-    {
-    }
-};
-
-// TResourceSelecitonFunction is used to declare handlers for specific types.
-//
-// For canceled dialogs previousValue should be returned.
-typedef QString (* TResourceSelectionFunction)(const SResourceSelectorContext& selectorContext, const QString& previousValue);
-typedef QString (* TResourceSelectionFunctionWithContext)(const SResourceSelectorContext& selectorContext, const QString& previousValue, void* contextObject);
-
-struct SStaticResourceSelectorEntry;
-
-// See note at the beginning of the file.
-struct IResourceSelectorHost
-{
-    virtual ~IResourceSelectorHost() = default;
-    virtual QString SelectResource(const SResourceSelectorContext& context, const QString& previousValue) = 0;
-    virtual const char* ResourceIconPath(const char* typeName) const = 0;
-
-    virtual void RegisterResourceSelector(const SStaticResourceSelectorEntry* entry) = 0;
-
-    // secondary responsibility of this class is to store global selections
-    virtual void SetGlobalSelection(const char* resourceType, const char* value) = 0;
-    virtual const char* GetGlobalSelection(const char* resourceType) const = 0;
-};
-
-// ---------------------------------------------------------------------------
-#define INTERNAL_RSH_COMBINE_UTIL(A, B) A##B
-#define INTERNAL_RSH_COMBINE(A, B) INTERNAL_RSH_COMBINE_UTIL(A, B)
-#define REGISTER_RESOURCE_SELECTOR(name, function, icon) \
-    static SStaticResourceSelectorEntry INTERNAL_RSH_COMBINE(selector_##function, __LINE__)((name), (function), (icon));
-
-struct SStaticResourceSelectorEntry
-{
-    const char* typeName;
-    TResourceSelectionFunction function;
-    TResourceSelectionFunctionWithContext functionWithContext;
-    const char* iconPath;
-
-    static SStaticResourceSelectorEntry*& GetFirst() { static SStaticResourceSelectorEntry* first; return first; }
-    SStaticResourceSelectorEntry* next;
-
-    SStaticResourceSelectorEntry(const char* typeName, TResourceSelectionFunction function, const char* icon)
-        : typeName(typeName)
-        , function(function)
-        , functionWithContext()
-        , iconPath(icon)
-    {
-        next = GetFirst();
-        GetFirst() = this;
-    }
-
-    template<class T>
-    SStaticResourceSelectorEntry(const char* typeName, QString (*function)(const SResourceSelectorContext&, const QString& previousValue, T * context), const char* icon)
-        : typeName(typeName)
-        , function()
-        , functionWithContext(TResourceSelectionFunctionWithContext(function))
-        , iconPath(icon)
-    {
-        next = GetFirst();
-        GetFirst() = this;
-    }
-};
-
-inline void RegisterModuleResourceSelectors(IResourceSelectorHost* editorResourceSelector)
-{
-    for (SStaticResourceSelectorEntry* current = SStaticResourceSelectorEntry::GetFirst(); current != 0; current = current->next)
-    {
-        editorResourceSelector->RegisterResourceSelector(current);
-    }
-}
diff --git a/Code/Sandbox/Editor/Include/ISourceControl.h b/Code/Sandbox/Editor/Include/ISourceControl.h
deleted file mode 100644
index 61332c5806..0000000000
--- a/Code/Sandbox/Editor/Include/ISourceControl.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <map>
-
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-
-#include "IEditorClassFactory.h" 
-
-// Source control status of item.
-enum ESccFileAttributes
-{
-    SCC_FILE_ATTRIBUTE_INVALID      = 0x0000, // File is not found.
-    SCC_FILE_ATTRIBUTE_NORMAL       = 0x0001, // Normal file on disk.
-    SCC_FILE_ATTRIBUTE_READONLY     = 0x0002, // Read only files cannot be modified at all, either read only file not under source control or file in packfile.
-    SCC_FILE_ATTRIBUTE_INPAK        = 0x0004, // File is inside pack file.
-    SCC_FILE_ATTRIBUTE_MANAGED      = 0x0008, // File is managed under source control.
-    SCC_FILE_ATTRIBUTE_CHECKEDOUT   = 0x0010, // File is under source control and is checked out.
-    SCC_FILE_ATTRIBUTE_BYANOTHER    = 0x0020, // File is under source control and is checked out by another user.
-    SCC_FILE_ATTRIBUTE_FOLDER       = 0x0040, // Managed folder.
-    SCC_FILE_ATTRIBUTE_LOCKEDBYANOTHER = 0x0080, // File is under source control and is checked out and locked by another user.
-    SCC_FILE_ATTRIBUTE_NOTATHEAD    = 0x0100, // File is under source control and is not the latest version of the file
-    SCC_FILE_ATTRIBUTE_ADD          = 0x0200, // File is under source control and is marked for add
-    SCC_FILE_ATTRIBUTE_MOVED        = 0x0400, // File is under source control and is marked for move/add
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// Description
-//    This interface provide access to the source control functionality.
-//////////////////////////////////////////////////////////////////////////
-struct ISourceControl
-    : public IUnknown
-{
-    DEFINE_UUID(0x1D391E8C, 0xA124, 0x46bb, 0x80, 0x8D, 0x9B, 0xCA, 0x15, 0x5B, 0xCA, 0xFD)
-
-    // Source Control State
-    enum ConnectivityState
-    {
-        Connected = 0,
-        BadConfiguration,
-        Disconnected_Retrying,
-        Disconnected,
-    };
-
-    using SourceControlState = AzToolsFramework::SourceControlState;
-
-    //function to enable/disable source control
-    virtual void SetSourceControlState(SourceControlState state) = 0;
-    virtual ConnectivityState GetConnectivityState() = 0;
-
-    // Show settings dialog
-    virtual void ShowSettings() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // IUnknown
-    //////////////////////////////////////////////////////////////////////////
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] REFIID riid, [[maybe_unused]] void** ppvObject) { return E_NOINTERFACE; };
-    virtual ULONG STDMETHODCALLTYPE AddRef() { return 0; };
-    virtual ULONG STDMETHODCALLTYPE Release() { return 0; };
-    //////////////////////////////////////////////////////////////////////////
-};
-
diff --git a/Code/Sandbox/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h b/Code/Sandbox/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h
deleted file mode 100644
index 80e9a325c2..0000000000
--- a/Code/Sandbox/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Calculate the reference frame for sub-object selections.
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
-#define CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
-#pragma once
-
-
-class ISubObjectSelectionReferenceFrameCalculator
-{
-public:
-    virtual void SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
diff --git a/Code/Sandbox/Editor/Include/ITextureDatabaseUpdater.h b/Code/Sandbox/Editor/Include/ITextureDatabaseUpdater.h
deleted file mode 100644
index a49966892a..0000000000
--- a/Code/Sandbox/Editor/Include/ITextureDatabaseUpdater.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : This file declares the interface used by the texture viewer
-//               and (implemented first implemented by the Texture Database Creator) to
-//               syncronize their threads. A thread interace could be useful there.
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
-#pragma once
-
-
-class CTextureDatabaseItem;
-
-struct ITextureDatabaseUpdater
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Thread control
-    virtual void NotifyShutDown() = 0;
-    virtual void Lock() = 0;
-    virtual void Unlock() = 0;
-    virtual void WaitForThread() = 0;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Data access
-    virtual CTextureDatabaseItem*   GetItem(const char* szAddItem) = 0;
-    //////////////////////////////////////////////////////////////////////////
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_ITEXTUREDATABASEUPDATER_H
diff --git a/Code/Sandbox/Editor/Include/ITransformManipulator.h b/Code/Sandbox/Editor/Include/ITransformManipulator.h
deleted file mode 100644
index 5524c59828..0000000000
--- a/Code/Sandbox/Editor/Include/ITransformManipulator.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_ITRANSFORMMANIPULATOR_H
-#define CRYINCLUDE_EDITOR_INCLUDE_ITRANSFORMMANIPULATOR_H
-#pragma once
-
-#include "IEditor.h"
-
-struct IDisplayViewport;
-struct HitContext;
-class CViewport;
-
-//////////////////////////////////////////////////////////////////////////
-// ITransformManipulator implementation.
-//////////////////////////////////////////////////////////////////////////
-struct ITransformManipulator
-{
-    virtual Matrix34 GetTransformation(RefCoordSys coordSys, IDisplayViewport* view = nullptr) const = 0;
-    virtual void SetTransformation(RefCoordSys coordSys, const Matrix34& tm) = 0;
-    virtual bool HitTestManipulator(HitContext& hc) = 0;
-    virtual bool MouseCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) = 0;
-    virtual void SetAlwaysUseLocal(bool on) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_ITRANSFORMMANIPULATOR_H
diff --git a/Code/Sandbox/Editor/Include/IViewPane.h b/Code/Sandbox/Editor/Include/IViewPane.h
deleted file mode 100644
index e16086f9b7..0000000000
--- a/Code/Sandbox/Editor/Include/IViewPane.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IVIEWPANE_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IVIEWPANE_H
-#pragma once
-
-#include "IEditorClassFactory.h"
-
-#include <QSize>
-
-class QWidget;
-class QRect;
-
-struct IViewPaneClass
-    : public IClassDesc
-{
-    DEFINE_UUID(0x7E13EC7C, 0xF621, 0x4aeb, 0xB6, 0x42, 0x67, 0xD7, 0x8E, 0xD4, 0x68, 0xF8)
-
-    enum EDockingDirection
-    {
-        DOCK_TOP,
-        DOCK_LEFT,
-        DOCK_RIGHT,
-        DOCK_BOTTOM,
-        DOCK_FLOAT,
-    };
-
-    virtual ~IViewPaneClass() = default;
-
-    // Return text for view pane title.
-    virtual QString GetPaneTitle() = 0;
-
-    // Return the string resource ID for the title's text.
-    virtual unsigned int GetPaneTitleID() const = 0;
-
-    // Return preferable initial docking position for pane.
-    virtual EDockingDirection GetDockingDirection() = 0;
-
-    // Initial pane size.
-    virtual QRect GetPaneRect() = 0;
-
-    // Get Minimal view size
-    virtual QSize GetMinSize() { return QSize(0, 0); }
-
-    // Return true if only one pane at a time of time view class can be created.
-    virtual bool SinglePane() = 0;
-
-    // Return true if the view window wants to get ID_IDLE_UPDATE commands.
-    virtual bool WantIdleUpdate() = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // IUnknown
-    //////////////////////////////////////////////////////////////////////////
-    HRESULT STDMETHODCALLTYPE QueryInterface(const IID& riid, void** ppvObj)
-    {
-        if (riid == __uuidof(IViewPaneClass))
-        {
-            *ppvObj = this;
-            return S_OK;
-        }
-        return E_NOINTERFACE;
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IVIEWPANE_H
diff --git a/Code/Sandbox/Editor/Include/ObjectEvent.h b/Code/Sandbox/Editor/Include/ObjectEvent.h
deleted file mode 100644
index 529d624cdc..0000000000
--- a/Code/Sandbox/Editor/Include/ObjectEvent.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_OBJECTEVENT_H
-#define CRYINCLUDE_EDITOR_INCLUDE_OBJECTEVENT_H
-#pragma once
-
-//! Standart objects types.
-enum ObjectType
-{
-    OBJTYPE_DUMMY           = 1 << 20,
-    OBJTYPE_AZENTITY        = 1 << 21,
-};
-
-//////////////////////////////////////////////////////////////////////////
-//! Events that objects may want to handle.
-//! Passed to OnEvent method of CBaseObject.
-enum ObjectEvent
-{
-    EVENT_INGAME    = 1,    //!< Signals that editor is switching into the game mode.
-    EVENT_OUTOFGAME,        //!< Signals that editor is switching out of the game mode.
-    EVENT_REFRESH,          //!< Signals that editor is refreshing level.
-    EVENT_DBLCLICK,         //!< Signals that object have been double clicked.
-    EVENT_KEEP_HEIGHT,  //!< Signals that object must preserve its height over changed terrain.
-    EVENT_RELOAD_ENTITY,//!< Signals that entities scripts must be reloaded.
-    EVENT_RELOAD_GEOM,  //!< Signals that all possible geometries should be reloaded.
-    EVENT_UNLOAD_GEOM,  //!< Signals that all possible geometries should be unloaded.
-    EVENT_MISSION_CHANGE,   //!< Signals that mission have been changed.
-    EVENT_ALIGN_TOGRID, //!< Object should align itself to the grid.
-
-    EVENT_PHYSICS_GETSTATE,//!< Signals that entities should accept their physical state from game.
-    EVENT_PHYSICS_RESETSTATE,//!< Signals that physics state must be reseted on objects.
-    EVENT_PHYSICS_APPLYSTATE,//!< Signals that the stored physics state must be applied to objects.
-
-    EVENT_FREE_GAME_DATA,//!< Object should free game data that its holding.
-    EVENT_CONFIG_SPEC_CHANGE,   //!< Called when config spec changed.
-    EVENT_HIDE_HELPER, //!< Signals that happens when Helper mode switches to be hidden.
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_OBJECTEVENT_H
-
diff --git a/Code/Sandbox/Editor/Include/SandboxAPI.h b/Code/Sandbox/Editor/Include/SandboxAPI.h
deleted file mode 100644
index ab22adcfb7..0000000000
--- a/Code/Sandbox/Editor/Include/SandboxAPI.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Main header included by every file in Editor.
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_SANDBOXAPI_H
-#define CRYINCLUDE_EDITOR_INCLUDE_SANDBOXAPI_H
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-#if defined(SANDBOX_API) || defined(CRYEDIT_API)
-#error SANDBOX_API and CRYEDIT_API should only be defined in this header. Use SANDBOX_EXPORTS and SANDBOX_IMPROTS to control it.
-#endif
-
-#if defined(SANDBOX_IMPORTS) && defined(SANDBOX_EXPORTS)
-#error SANDBOX_EXPORTS and SANDBOX_IMPORTS can't be defined at the same time
-#endif
-
-#if defined(SANDBOX_EXPORTS)
-// Editor.exe case
-#define CRYEDIT_API AZ_DLL_EXPORT
-#define SANDBOX_API AZ_DLL_EXPORT
-#elif defined(SANDBOX_IMPORTS)
-// Sandbox plugins that rely on/extend Editor types.
-#define CRYEDIT_API AZ_DLL_IMPORT
-#define SANDBOX_API AZ_DLL_IMPORT
-#else
-// Standalone plugins that use Editor plugins.
-#define CRYEDIT_API
-#define SANDBOX_API
-#endif
-#endif // CRYINCLUDE_EDITOR_INCLUDE_SANDBOXAPI_H
diff --git a/Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp b/Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp
deleted file mode 100644
index 66a4ff7ba4..0000000000
--- a/Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "KeyboardCustomizationSettings.h"
-
-// Qt
-#include <QMenu>
-#include <QMenuBar>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QSettings>
-
-
-QString RemoveAcceleratorAmpersands(const QString& original)
-{
-    static const QRegularExpression expression(QStringLiteral("&(.)"));
-    QString updated = original;
-    updated.replace(expression, QStringLiteral("\\1"));
-
-    return updated;
-}
-
-QVector<QAction*> GetAllActionsForMenu(const QMenu* menu)
-{
-    QList<QAction*> menuActions = menu->actions();
-    QVector<QAction*> actions;
-    actions.reserve(menuActions.size());
-    foreach(QAction * action, menuActions)
-    {
-        if (action->menu() != nullptr)
-        {
-            QVector<QAction*> subMenuActions = GetAllActionsForMenu(action->menu());
-            actions.reserve(actions.size() + subMenuActions.size());
-            actions += subMenuActions;
-        }
-        else if (!action->isSeparator())
-        {
-            actions.push_back(action);
-        }
-    }
-
-    return actions;
-}
-
-void ProcessAllActions(const QWidget* parent, const std::function<bool(QAction*)>& processor)
-{
-    QMenuBar* menuBar = parent->findChild<QMenuBar*>();
-    QList<QAction*> menuBarActions = menuBar->actions();
-
-    for(QAction* menuAction : menuBarActions)
-    {
-        processor(menuAction);
-        auto actions = GetAllActionsForMenu(menuAction->menu());
-        for(QAction* action : actions)
-        {
-            if (Q_UNLIKELY(processor(action)))
-            {
-                return;
-            }
-        }
-    }
-}
-
-QString GetName(const QAction* action)
-{
-    if (action->data().isValid())
-    {
-        return action->data().toString();
-    }
-    else
-    {
-        return action->objectName();
-    }
-}
-
-QVector<KeyboardCustomizationSettings*> KeyboardCustomizationSettings::m_instances;
-
-KeyboardCustomizationSettings::KeyboardCustomizationSettings(const QString& group, QWidget* parent)
-    : m_parent(parent)
-    , m_group(group)
-    , m_defaults(CreateSnapshot())
-    , m_shortcutsEnabled(true)
-{
-    m_instances.append(this);
-    Load();
-}
-
-KeyboardCustomizationSettings::~KeyboardCustomizationSettings()
-{
-    m_instances.remove(m_instances.indexOf(this));
-}
-
-void KeyboardCustomizationSettings::LoadDefaults()
-{
-    LoadFromSnapshot(m_defaults);
-}
-
-void KeyboardCustomizationSettings::Load()
-{
-    QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
-    settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
-    settings.beginGroup(m_group);
-
-    QStringList groups = settings.childGroups();
-
-    ProcessAllActions(m_parent, [&](QAction* action)
-        {
-            auto groupName = GetName(action);
-            if (groups.contains(groupName))
-            {
-                settings.beginGroup(groupName);
-
-                auto sequence = QKeySequence::listFromString(settings.value("shortcuts").toString());
-                action->setShortcuts(sequence);
-
-                settings.endGroup();
-            }
-            return false;
-        });
-
-    settings.endGroup(); // m_group
-    settings.endGroup(); // Keyboard Shortcuts
-}
-
-void KeyboardCustomizationSettings::Load(const Snapshot& snapshot)
-{
-    LoadFromSnapshot(snapshot);
-}
-
-void KeyboardCustomizationSettings::LoadFromSnapshot(const Snapshot& snapshot)
-{
-    ProcessAllActions(m_parent, [&](QAction* action)
-        {
-            auto entry = snapshot.constFind(action);
-            if (entry != snapshot.constEnd())
-            {
-                const Shortcut& s = entry.value();
-                action->setText(s.text);
-                action->setShortcuts(s.keySequence);
-            }
-            return false;
-        });
-}
-
-void KeyboardCustomizationSettings::Save()
-{
-    QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
-    settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
-    settings.beginGroup(m_group);
-
-    ProcessAllActions(m_parent, [&](QAction* action)
-        {
-            auto groupName = GetName(action);
-            settings.beginGroup(groupName);
-
-            settings.setValue("shortcuts", QKeySequence::listToString(action->shortcuts()));
-
-            settings.endGroup();
-            return false;
-        });
-
-    settings.endGroup(); // m_group
-    settings.endGroup(); // Keyboard Shortcuts
-}
-
-KeyboardCustomizationSettings::Snapshot KeyboardCustomizationSettings::CreateSnapshot()
-{
-    Snapshot result;
-    ProcessAllActions(m_parent, [&](QAction* action)
-        {
-            Shortcut s = { action->text(), action->shortcuts() };
-            result[action] = s;
-            return false;
-        });
-    return result;
-}
-
-void KeyboardCustomizationSettings::ExportToFile(QWidget* parent)
-{
-    QString fileName = QFileDialog::getSaveFileName(parent, QObject::tr("Export Keyboard Shortcuts"), QStringLiteral("o3de.keys"), QObject::tr("Keyboard Settings (*.keys)"));
-    if (fileName.isEmpty())
-    {
-        return;
-    }
-
-    QFile file(fileName);
-
-    if (!file.open(QIODevice::WriteOnly))
-    {
-        QMessageBox::critical(parent, QObject::tr("Shortcut Export Error"), QObject::tr("Couldn't open \"%1\": %2").arg(fileName).arg(file.errorString()));
-        return;
-    }
-
-    QJsonObject store;
-    store.insert("version", "1.0");
-    store.insert("Content-Type", "application/x-o3de-sdk-keyboard-settings+json");
-    QJsonObject groups;
-
-    for (auto instance = m_instances.constBegin(); instance != m_instances.constEnd(); instance++)
-    {
-        groups.insert((*instance)->m_group, QJsonValue((*instance)->ExportGroup()));
-    }
-
-    store.insert("groups", groups);
-
-    QJsonDocument exported(store);
-    if (-1 == file.write(exported.toJson()))
-    {
-        QMessageBox::critical(parent, QObject::tr("Shortcut Export Error"), QObject::tr("Couldn't write settings to \"%1\": %2").arg(fileName).arg(file.errorString()));
-        return;
-    }
-
-    file.close();
-}
-
-QJsonObject KeyboardCustomizationSettings::ExportGroup()
-{
-    QJsonObject group;
-    group.insert("name", m_group);
-
-    ProcessAllActions(m_parent, [&](QAction* action)
-        {
-            QJsonObject entry;
-            entry.insert("label", RemoveAcceleratorAmpersands(action->text()));
-            entry.insert("shortcuts", QKeySequence::listToString(action->shortcuts()));
-            group.insert(GetName(action), QJsonValue(entry));
-            return false;
-        });
-
-    return group;
-}
-
-void KeyboardCustomizationSettings::ImportFromFile(QWidget* parent)
-{
-    QString fileName = QFileDialog::getOpenFileName(parent, QObject::tr("Export Keyboard Shortcuts"), QStringLiteral(""), QObject::tr("Keyboard Settings (*.keys)"));
-    if (fileName.isEmpty())
-    {
-        return;
-    }
-
-    QFile file(fileName);
-
-    if (!file.open(QIODevice::ReadOnly))
-    {
-        QMessageBox::critical(parent, QObject::tr("Shortcut Import Error"), QObject::tr("Couldn't open \"%1\": %2").arg(fileName).arg(file.errorString()));
-        return;
-    }
-
-    QByteArray rawData = file.readAll();
-    QJsonDocument imported(QJsonDocument::fromJson(rawData));
-    QJsonObject store = imported.object();
-
-    if (store.value("Content-Type") != "application/x-o3de-sdk-keyboard-settings+json" || store.value("version") != "1.0")
-    {
-        QMessageBox::critical(parent, QObject::tr("Shortcut Import Error"), QObject::tr("\"%1\" doesn't appear to contain keyboard settings").arg(fileName));
-        return;
-    }
-
-    QJsonObject groups = store.value("groups").toObject();
-    if (QJsonObject() == groups)
-    {
-        QMessageBox::critical(parent, QObject::tr("Shortcut Import Error"), QObject::tr("\"%1\" contains no keyboard settings").arg(fileName));
-        return;
-    }
-
-    for (auto instance = m_instances.begin(); instance != m_instances.end(); instance++)
-    {
-        QJsonValue rawGroup = groups.value((*instance)->m_group);
-        if (!rawGroup.isUndefined())
-        {
-            QJsonObject group = rawGroup.toObject();
-            if (QJsonObject() != group && group.value("name").toString() == (*instance)->m_group)
-            {
-                (*instance)->ImportGroup(group);
-            }
-        }
-    }
-
-    file.close();
-}
-
-void KeyboardCustomizationSettings::ImportGroup(const QJsonObject& group)
-{
-    ProcessAllActions(m_parent, [&](QAction* action)
-        {
-            auto position = group.constFind(GetName(action));
-            if (position != group.constEnd())
-            {
-                QJsonObject entry = position.value().toObject();
-                if (QJsonObject() != entry)
-                {
-                    QString value = entry.value("shortcuts").toString();
-                    action->setShortcuts(QKeySequence::listFromString(value));
-                }
-                else
-                {
-                    action->setShortcuts({});
-                }
-            }
-            return false;
-        });
-}
-
-
-QAction* KeyboardCustomizationSettings::FindActionForShortcut(QKeySequence shortcut) const
-{
-    QAction* result {
-        nullptr
-    };
-    ProcessAllActions(m_parent, [&](QAction* action)
-        {
-            bool found { false };
-            if (action->shortcuts().contains(shortcut))
-            {
-                result = action;
-                found = true;
-            }
-            return found;
-        });
-
-    return result;
-}
-
-void KeyboardCustomizationSettings::ClearShortcutsAndAccelerators()
-{
-    ProcessAllActions(m_parent, [&](QAction* action)
-        {
-            action->setText(RemoveAcceleratorAmpersands(action->text()));
-            action->setShortcut({});
-            return false;
-        });
-}
-
-/** static */
-void KeyboardCustomizationSettings::EnableShortcutsGlobally(bool enable)
-{
-    for (auto it : m_instances)
-    {
-        it->EnableShortcuts(enable);
-    }
-}
-
-void KeyboardCustomizationSettings::EnableShortcuts(bool enabled)
-{
-    if (enabled != m_shortcutsEnabled)
-    {
-        m_shortcutsEnabled = enabled;
-        if (enabled)
-        {
-            LoadFromSnapshot(m_lastEnabledShortcuts);
-            CLogFile::WriteLine("Enable Accelerators");
-        }
-        else
-        {
-            m_lastEnabledShortcuts = CreateSnapshot();
-            ClearShortcutsAndAccelerators();
-            CLogFile::WriteLine("Disable Accelerators");
-        }
-    }
-}
-
-/** static */
-void KeyboardCustomizationSettings::LoadDefaultsGlobally()
-{
-    for (auto it : m_instances)
-    {
-        it->LoadDefaults();
-    }
-}
-
-/** static */
-void KeyboardCustomizationSettings::SaveGlobally()
-{
-    for (auto it : m_instances)
-    {
-        it->Save();
-    }
-}
diff --git a/Code/Sandbox/Editor/KeyboardCustomizationSettings.h b/Code/Sandbox/Editor/KeyboardCustomizationSettings.h
deleted file mode 100644
index 98e25df34c..0000000000
--- a/Code/Sandbox/Editor/KeyboardCustomizationSettings.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_KEYBOARD_CUSTOMIZATION_SETTINGS_H
-#define CRYINCLUDE_EDITOR_KEYBOARD_CUSTOMIZATION_SETTINGS_H
-#pragma once
-
-#include <QWidget>
-#include <QHash>
-#include <QVector>
-
-// TODO: Move to an utils class or at least namespace
-QString RemoveAcceleratorAmpersands(const QString& original);
-
-class SANDBOX_API KeyboardCustomizationSettings
-{
-public:
-
-    struct Shortcut
-    {
-        QString text;
-        QList<QKeySequence> keySequence;
-    };
-
-    using Snapshot = QHash<const QAction*, Shortcut>;
-
-    KeyboardCustomizationSettings(const QString& group, QWidget* parent);
-    virtual ~KeyboardCustomizationSettings();
-
-    // Iterates over all KeyboardCustomizationSettings instances and calls EnableShortcuts()
-    static void EnableShortcutsGlobally(bool);
-    static void LoadDefaultsGlobally();
-    static void SaveGlobally();
-
-    // Enables or disables shortcuts. Disabling shortcuts is used when in game mode.
-    void EnableShortcuts(bool);
-
-    void Load();
-    void Load(const Snapshot& snapshot);
-    void LoadDefaults();
-    void Save();
-
-    Snapshot CreateSnapshot();
-
-    QAction* FindActionForShortcut(QKeySequence) const;
-
-public:
-    static void ExportToFile(QWidget* parentWindow);
-    static void ImportFromFile(QWidget* parentWindow);
-
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    const QWidget* m_parent;
-    const QString m_group;
-    const Snapshot m_defaults;
-    bool m_shortcutsEnabled;
-    Snapshot m_lastEnabledShortcuts; // just to avoid load/save IO from/to disk
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    void LoadFromSnapshot(const Snapshot& snapshot);
-
-    QJsonObject ExportGroup();
-    void ImportGroup(const QJsonObject& group);
-    void ClearShortcutsAndAccelerators();
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    static QVector<KeyboardCustomizationSettings*> m_instances;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif //CRYINCLUDE_EDITOR_KEYBOARD_CUSTOMIZATION_SETTINGS_H
diff --git a/Code/Sandbox/Editor/Launcher/resource.h b/Code/Sandbox/Editor/Launcher/resource.h
deleted file mode 100644
index 97452dfab6..0000000000
--- a/Code/Sandbox/Editor/Launcher/resource.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#define IDI_ICON1                        2
diff --git a/Code/Sandbox/Editor/LayoutConfigDialog.cpp b/Code/Sandbox/Editor/LayoutConfigDialog.cpp
deleted file mode 100644
index 22e21ef434..0000000000
--- a/Code/Sandbox/Editor/LayoutConfigDialog.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "LayoutConfigDialog.h"
-
-// AzQtComponents
-#include <AzQtComponents/Components/StyleManager.h>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_LayoutConfigDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-class LayoutConfigModel
-    : public QAbstractListModel
-{
-public:
-    LayoutConfigModel(QObject* parent = nullptr);
-
-    int rowCount(const QModelIndex& parent = {}) const override;
-    int columnCount(const QModelIndex& parent = {}) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-
-private:
-    static const int kNumLayouts = 9;
-};
-
-LayoutConfigModel::LayoutConfigModel(QObject* parent)
-    : QAbstractListModel(parent)
-{
-}
-
-int LayoutConfigModel::rowCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : kNumLayouts;
-}
-
-int LayoutConfigModel::columnCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : 1;
-}
-
-QVariant LayoutConfigModel::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid() || index.column() > 0 || index.row() >= kNumLayouts)
-    {
-        return {};
-    }
-
-    switch (role)
-    {
-    case Qt::SizeHintRole:
-        return QSize(38, 38);
-
-    case Qt::DecorationRole:
-        return QPixmap(QStringLiteral(":/layouts/layouts-%1.svg").arg(index.row()));
-    }
-
-    return {};
-}
-
-// CLayoutConfigDialog dialog
-
-CLayoutConfigDialog::CLayoutConfigDialog(QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_model(new LayoutConfigModel(this))
-    , ui(new Ui::CLayoutConfigDialog)
-{
-    m_layout = ET_Layout1;
-
-    ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    setFixedSize(size());
-
-    ui->m_layouts->setModel(m_model);
-
-    AzQtComponents::StyleManager::setStyleSheet(ui->m_layouts, "style:LayoutConfigDialog.qss");
-
-    connect(ui->m_buttonBox, &QDialogButtonBox::accepted, this, &CLayoutConfigDialog::OnOK);
-    connect(ui->m_buttonBox, &QDialogButtonBox::rejected, this, &CLayoutConfigDialog::reject);
-}
-
-CLayoutConfigDialog::~CLayoutConfigDialog()
-{
-}
-
-void CLayoutConfigDialog::SetLayout(EViewLayout layout)
-{
-    m_layout = layout;
-    ui->m_layouts->setCurrentIndex(m_model->index(static_cast<int>(layout), 0));
-}
-
-// CLayoutConfigDialog message handlers
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutConfigDialog::OnOK()
-{
-    auto index = ui->m_layouts->currentIndex();
-    auto oldLayout = m_layout;
-
-    if (index.isValid())
-    {
-        m_layout = static_cast<EViewLayout>(index.row());
-    }
-
-    // If the layout has not been changed, the calling code
-    // is not supposed to do anything. So let's simply reject in that case.
-    done(m_layout == oldLayout ? QDialog::Rejected : QDialog::Accepted);
-}
-
-#include <moc_LayoutConfigDialog.cpp>
diff --git a/Code/Sandbox/Editor/LayoutConfigDialog.h b/Code/Sandbox/Editor/LayoutConfigDialog.h
deleted file mode 100644
index 6b3521d30a..0000000000
--- a/Code/Sandbox/Editor/LayoutConfigDialog.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_LAYOUTCONFIGDIALOG_H
-#define CRYINCLUDE_EDITOR_LAYOUTCONFIGDIALOG_H
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "LayoutWnd.h"
-
-#include <QDialog>
-#endif
-
-namespace Ui {
-    class CLayoutConfigDialog;
-}
-
-class LayoutConfigModel;
-
-// CLayoutConfigDialog dialog
-
-class CLayoutConfigDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CLayoutConfigDialog(QWidget* pParent = nullptr);   // standard constructor
-    virtual ~CLayoutConfigDialog();
-
-    void SetLayout(EViewLayout layout);
-    EViewLayout GetLayout() const { return m_layout; };
-
-    // Dialog Data
-protected:
-    virtual void OnOK();
-
-    LayoutConfigModel* m_model;
-    EViewLayout m_layout;
-    QScopedPointer<Ui::CLayoutConfigDialog> ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_LAYOUTCONFIGDIALOG_H
diff --git a/Code/Sandbox/Editor/LayoutWnd.cpp b/Code/Sandbox/Editor/LayoutWnd.cpp
deleted file mode 100644
index 90e1a50b4c..0000000000
--- a/Code/Sandbox/Editor/LayoutWnd.cpp
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "LayoutWnd.h"
-
-// Qt
-#include <QMessageBox>
-#include <QToolBar>
-#include <QComboBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QTextDocumentFragment>
-
-#include <AzCore/Interface/Interface.h>
-#include <AzQtComponents/Components/Style.h>    // for AzQtComponents::Style
-
-// Editor
-#include "MainWindow.h"
-#include "ViewPane.h"
-#include "QtViewPaneManager.h"
-#include "ViewManager.h"
-
-#include <AzQtComponents/Components/Style.h>
-
-class CLayoutSplitterHandle
-    : public QSplitterHandle
-{
-public:
-    CLayoutSplitterHandle(Qt::Orientation orientation, CLayoutSplitter* parent)
-        : QSplitterHandle(orientation, parent)
-    {
-    }
-
-protected:
-    void paintEvent(QPaintEvent*) override
-    {
-        // draw nothing for flat look
-    }
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CLayoutSplitter
-//////////////////////////////////////////////////////////////////////////
-CLayoutSplitter::CLayoutSplitter(QWidget* parent)
-    : QSplitter(parent)
-{
-}
-
-CLayoutSplitter::~CLayoutSplitter()
-{
-}
-
-QSplitterHandle* CLayoutSplitter::createHandle()
-{
-    return new CLayoutSplitterHandle(orientation(), this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutSplitter::resizeEvent(QResizeEvent* event)
-{
-    QSplitter::resizeEvent(event);
-
-    // only the top level splitter should trigger resetting the layout when being resized
-    if (qobject_cast<CLayoutSplitter*>(parentWidget()) == nullptr)
-    {
-        for (CLayoutSplitter* s : findChildren<CLayoutSplitter*>())
-        {
-            s->setSizes(QList<int>::fromVector(QVector<int>(s->count(), (s->orientation() == Qt::Horizontal ? s->width() : s->height()) / s->count())));
-        }
-        setSizes(QList<int>::fromVector(QVector<int>(count(), (orientation() == Qt::Horizontal ? width() : height()) / count())));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutSplitter::CreateLayoutView(int row, int col, int id)
-{
-    assert(row >= 0 && row < 3);
-    assert(col >= 0 && col < 3);
-    CLayoutViewPane* viewPane = new CLayoutViewPane(this);
-    viewPane->setWindowFlags(Qt::Widget);
-    insertWidget(orientation() == Qt::Horizontal ? col : row, viewPane);
-    viewPane->SetId(id);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CLayoutWnd
-//////////////////////////////////////////////////////////////////////////
-CLayoutWnd::CLayoutWnd(QSettings* settings, QWidget* parent)
-    : AzQtComponents::ToolBarArea(parent)
-    , m_settings(settings)
-{
-    m_bMaximized = false;
-    m_maximizedView = 0;
-    m_layout = (EViewLayout) - 1;
-
-    m_maximizedViewId = 0;
-    m_infoBarSize = QSize(0, 0);
-
-    connect(qApp, &QApplication::focusChanged, this, &CLayoutWnd::OnFocusChanged);
-
-    setContextMenuPolicy(Qt::NoContextMenu);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CLayoutWnd::~CLayoutWnd()
-{
-    delete m_splitWnd;
-    delete m_splitWnd2;
-    delete m_splitWnd3;
-
-    OnDestroy();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::UnbindViewports()
-{
-    // First unbind all views.
-    for (int i = 0; i < MAX_VIEWPORTS; i++)
-    {
-        CLayoutViewPane* pViewPane = GetViewPane(i);
-        if (pViewPane)
-        {
-            pViewPane->ReleaseViewport();
-        }
-    }
-
-    if (m_maximizedView)
-    {
-        m_maximizedView->ReleaseViewport();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::BindViewports()
-{
-    // First unbind all views.
-    UnbindViewports();
-
-    for (int i = 0; i < MAX_VIEWPORTS; i++)
-    {
-        CLayoutViewPane* pViewPane = GetViewPane(i);
-        if (pViewPane)
-        {
-            BindViewport(pViewPane, m_viewType[pViewPane->GetId()]);
-        }
-    }
-
-    FocusFirstLayoutViewPane(m_splitWnd);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::BindViewport(CLayoutViewPane* vp, const QString& viewClassName, QWidget* pViewport)
-{
-    assert(vp);
-    if (!pViewport)
-    {
-        vp->SetViewClass(viewClassName);
-    }
-    else
-    {
-        vp->AttachViewport(pViewport);
-    }
-    vp->setVisible(true);
-    m_viewType[vp->GetId()] = viewClassName;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::MaximizeViewport(int paneId)
-{
-    // Ignore with full screen layout.
-    if (m_layout == ET_Layout0 && m_bMaximized)
-    {
-        return;
-    }
-
-    QString viewClass = m_viewType[paneId];
-
-    const QRect rc = rect();
-    if (!m_bMaximized)
-    {
-        CLayoutViewPane* pViewPane = GetViewPane(paneId);
-        m_maximizedViewId = paneId;
-        m_bMaximized = true;
-
-        if (m_maximizedView)
-        {
-            if (m_splitWnd)
-            {
-                m_splitWnd->setVisible(false);
-            }
-
-            if (pViewPane)
-            {
-                MoveViewport(pViewPane, m_maximizedView, viewClass);
-            }
-            else
-            {
-                BindViewport(m_maximizedView, viewClass);
-            }
-            m_maximizedView->setFocus();
-
-            SetMainWidget(m_maximizedView);
-            m_maximizedView->setVisible(true);
-
-            MainWindow::instance()->SetActiveView(m_maximizedView);
-        }
-    }
-    else
-    {
-        CLayoutViewPane* pViewPane = GetViewPane(m_maximizedViewId);
-        m_bMaximized = false;
-        m_maximizedViewId = 0;
-
-        if (pViewPane && m_maximizedView)
-        {
-            MoveViewport(m_maximizedView, pViewPane, viewClass);
-        }
-
-        if (m_maximizedView)
-        {
-            m_maximizedView->setVisible(false);
-        }
-
-        if (m_splitWnd)
-        {
-            m_splitWnd->setVisible(true);
-            SetMainWidget(m_splitWnd);
-            FocusFirstLayoutViewPane(m_splitWnd);
-        }
-    }
-}
-
-QString CLayoutWnd::ViewportTypeToClassName(EViewportType viewType)
-{
-    QtViewPane* pane = QtViewPaneManager::instance()->GetViewportPane(viewType);
-    return pane ? pane->m_name : QString();
-}
-
-void CLayoutWnd::CreateLayoutView(CLayoutSplitter* wndSplitter, int row, int col, int id, EViewportType viewType)
-{
-    QString viewClassName = ViewportTypeToClassName(viewType);
-    wndSplitter->CreateLayoutView(row, col, id);
-    m_viewType[id] = viewClassName;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::CreateLayout(EViewLayout layout, bool bBindViewports, EViewportType defaultView)
-{
-    UnbindViewports();
-
-    m_layout = layout;
-    m_bMaximized = false;
-
-    if (m_splitWnd)
-    {
-        m_splitWnd->setVisible(false);
-        delete m_splitWnd;
-    }
-
-    delete m_splitWnd2;
-    delete m_splitWnd3;
-
-    if (m_maximizedView)
-    {
-        m_maximizedView->setVisible(false);
-    }
-
-    QRect rcView = rect();
-
-    // Ensure we delete our old view immediately so it can relinquish its backing ViewportContext
-    if (m_maximizedView)
-    {
-        delete m_maximizedView;
-    }
-
-    m_maximizedView = new CLayoutViewPane(this);
-    m_maximizedView->SetId(0);
-    m_maximizedView->setGeometry(rcView);
-    m_maximizedView->setVisible(false);
-    m_maximizedView->SetFullscren(true);
-
-    if (!CViewManager::IsMultiViewportEnabled())
-    {
-        m_viewType[0] = ViewportTypeToClassName(defaultView);
-        if (bBindViewports)
-        {
-            MaximizeViewport(0);
-        }
-    }
-    else
-    {
-        switch (layout)
-        {
-        case ET_Layout0:
-            m_viewType[0] = ViewportTypeToClassName(defaultView);
-            if (bBindViewports)
-            {
-                MaximizeViewport(0);
-            }
-            break;
-
-        case ET_Layout1:
-            m_splitWnd = new CLayoutSplitter(this);
-            m_splitWnd->setOrientation(Qt::Horizontal);
-    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
-            CreateLayoutView(m_splitWnd, 0, 0, 2, ET_ViewportXY);
-    #else
-            CreateLayoutView(m_splitWnd, 0, 0, 2, ET_ViewportCamera);
-    #endif
-            CreateLayoutView(m_splitWnd, 0, 1, 1, defaultView);
-            break;
-        case ET_Layout2:
-            m_splitWnd = new CLayoutSplitter(this);
-            m_splitWnd->setOrientation(Qt::Vertical);
-    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
-            CreateLayoutView(m_splitWnd, 0, 0, 2, ET_ViewportXY);
-    #else
-            CreateLayoutView(m_splitWnd, 0, 0, 2, ET_ViewportCamera);
-    #endif
-            CreateLayoutView(m_splitWnd, 1, 0, 1, defaultView);
-            break;
-
-        case ET_Layout3:
-            m_splitWnd = new CLayoutSplitter(this);
-            m_splitWnd->setOrientation(Qt::Horizontal);
-            CreateLayoutView(m_splitWnd, 0, 1, 1, defaultView);
-
-            m_splitWnd2 = new CLayoutSplitter;
-            m_splitWnd2->setOrientation(Qt::Vertical);
-            m_splitWnd->insertWidget(0, m_splitWnd2);
-    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
-            CreateLayoutView(m_splitWnd2, 1, 0, 3, ET_ViewportXZ);
-    #else
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
-            CreateLayoutView(m_splitWnd2, 1, 0, 3, ET_ViewportCamera);
-    #endif
-            break;
-
-        case ET_Layout4:
-            m_splitWnd = new CLayoutSplitter(this);
-            m_splitWnd->setOrientation(Qt::Horizontal);
-            CreateLayoutView(m_splitWnd, 0, 0, 1, defaultView);
-
-            m_splitWnd2 = new CLayoutSplitter;
-            m_splitWnd2->setOrientation(Qt::Vertical);
-            m_splitWnd->insertWidget(1, m_splitWnd2);
-    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
-            CreateLayoutView(m_splitWnd2, 1, 0, 3, ET_ViewportXZ);
-    #else
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
-            CreateLayoutView(m_splitWnd2, 1, 0, 3, ET_ViewportCamera);
-    #endif
-            break;
-
-        case ET_Layout5:
-            m_splitWnd = new CLayoutSplitter(this);
-            m_splitWnd->setOrientation(Qt::Vertical);
-            CreateLayoutView(m_splitWnd, 1, 0, 1, defaultView);
-
-            m_splitWnd2 = new CLayoutSplitter;
-            m_splitWnd2->setOrientation(Qt::Horizontal);
-            m_splitWnd->insertWidget(0, m_splitWnd2);
-    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
-            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportXZ);
-    #else
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
-            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportCamera);
-    #endif
-            break;
-
-        case ET_Layout6:
-            m_splitWnd = new CLayoutSplitter(this);
-            m_splitWnd->setOrientation(Qt::Vertical);
-            CreateLayoutView(m_splitWnd, 0, 0, 1, defaultView);
-
-            m_splitWnd2 = new CLayoutSplitter;
-            m_splitWnd->insertWidget(1, m_splitWnd2);
-    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
-            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportXZ);
-    #else
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
-            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportCamera);
-    #endif
-            break;
-
-        case ET_Layout7:
-            m_splitWnd = new CLayoutSplitter(this);
-            m_splitWnd->setOrientation(Qt::Horizontal);
-            m_splitWnd2 = new CLayoutSplitter;
-            m_splitWnd2->setOrientation(Qt::Vertical);
-            m_splitWnd3 = new CLayoutSplitter;
-            m_splitWnd3->setOrientation(Qt::Vertical);
-            m_splitWnd->addWidget(m_splitWnd2);
-            m_splitWnd->addWidget(m_splitWnd3);
-    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXZ);
-            CreateLayoutView(m_splitWnd3, 0, 1, 3, ET_ViewportYZ);
-            CreateLayoutView(m_splitWnd2, 1, 0, 4, ET_ViewportXY);
-    #else
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
-            CreateLayoutView(m_splitWnd3, 0, 1, 3, ET_ViewportCamera);
-            CreateLayoutView(m_splitWnd2, 1, 0, 4, ET_ViewportCamera);
-    #endif
-            CreateLayoutView(m_splitWnd3, 1, 1, 1, defaultView);
-            connect(m_splitWnd2, &QSplitter::splitterMoved, m_splitWnd3, &CLayoutSplitter::otherSplitterMoved);
-            connect(m_splitWnd3, &QSplitter::splitterMoved, m_splitWnd2, &CLayoutSplitter::otherSplitterMoved);
-            break;
-
-        case ET_Layout8:
-            m_splitWnd = new CLayoutSplitter(this);
-            m_splitWnd->setOrientation(Qt::Vertical);
-            CreateLayoutView(m_splitWnd, 1, 0, 1, defaultView);
-
-            m_splitWnd2 = new CLayoutSplitter;
-            m_splitWnd2->setOrientation(Qt::Horizontal);
-            m_splitWnd->insertWidget(0, m_splitWnd2);
-    #ifdef FEATURE_ORTHOGRAPHIC_VIEW
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportXY);
-            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportXZ);
-            CreateLayoutView(m_splitWnd2, 0, 2, 4, ET_ViewportYZ);
-    #else
-            CreateLayoutView(m_splitWnd2, 0, 0, 2, ET_ViewportCamera);
-            CreateLayoutView(m_splitWnd2, 0, 1, 3, ET_ViewportCamera);
-            CreateLayoutView(m_splitWnd2, 0, 2, 4, ET_ViewportCamera);
-    #endif
-            break;
-
-        default:
-            CLogFile::FormatLine("Trying to Create Unknown Layout %d", (int)layout);
-            QMessageBox::critical(this, QString(), tr("Trying to Create Unknown Layout"));
-            break;
-        }
-        ;
-    }
-    if (m_splitWnd)
-    {
-        m_splitWnd->setGeometry(rcView);
-        m_splitWnd->setVisible(true);
-        FocusFirstLayoutViewPane(m_splitWnd);
-        SetMainWidget(m_splitWnd);
-    }
-
-    if (bBindViewports && !m_bMaximized)
-    {
-        BindViewports();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::SaveConfig()
-{
-    QSettings settings;
-    settings.beginGroup(GetConfigGroupName());
-    settings.setValue("Layout", static_cast<int>(m_layout));
-    settings.setValue("Maximized", m_maximizedViewId);
-
-    QString str;
-    for (int i = 1; i < MAX_VIEWPORTS; i++)
-    {
-        str += QString::fromLatin1("%1,").arg(m_viewType[i]);
-    }
-    settings.setValue("Viewports", str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLayoutWnd::LoadConfig()
-{
-    QSettings settings;
-    settings.beginGroup(GetConfigGroupName());
-    int layout = settings.value("Layout", -1).toInt();
-    int maximizedView = settings.value("Maximized", 0).toInt();
-    if (layout < 0)
-    {
-        return false;
-    }
-
-    CreateLayout((EViewLayout)layout, false);
-
-    bool bRebindViewports = false;
-    if (m_splitWnd)
-    {
-        const QString str = settings.value("Viewports").toString();
-        int nIndex = 1;
-        for (auto resToken : str.split(","))
-        {
-            if (nIndex >= MAX_VIEWPORTS)
-            {
-                break;
-            }
-            bRebindViewports = true;
-            if (!resToken.isEmpty())
-            {
-                m_viewType[nIndex] = resToken;
-            }
-            nIndex++;
-        }
-        ;
-    }
-
-    BindViewports();
-
-    if (maximizedView || layout == ET_Layout0)
-    {
-        MaximizeViewport(maximizedView);
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CLayoutWnd::GetConfigGroupName()
-{
-    return "ViewportLayout";
-}
-
-unsigned int CLayoutWnd::GetViewPaneCount()
-{
-    // If there's a maximized viewport, then exactly 1 is visible.
-    if (m_bMaximized)
-    {
-        return 1;
-    }
-
-    unsigned int numPanes = 0;
-
-    // Otherwise, go searching through and count how many are visible.
-    for (QSplitter* splitter : { m_splitWnd, m_splitWnd2, m_splitWnd3 })
-    {
-        if (splitter)
-        {
-            for (int i = 0; i < splitter->count(); ++i)
-            {
-                if (qobject_cast<CLayoutViewPane*>(splitter->widget(i)))
-                {
-                    numPanes++;
-                }
-            }
-        }
-    }
-
-    return numPanes;
-}
-
-CLayoutViewPane* CLayoutWnd::GetViewPaneByIndex(unsigned int index)
-{
-    // If there's a maximized viewport, return it if index 0 is requested.
-    // (All other index values are invalid in this state)
-    if (m_bMaximized)
-    {
-        if (index == 0)
-        {
-            return m_maximizedView;
-        }
-        return nullptr;
-    }
-
-    unsigned int curIndex = 0;
-
-    // Otherwise, go searching through until we've found the proper number of panes
-    // and return the one at the correct index.
-    for (QSplitter* splitter : { m_splitWnd, m_splitWnd2, m_splitWnd3 })
-    {
-        if (splitter)
-        {
-            for (int i = 0; i < splitter->count(); ++i)
-            {
-                if (QWidget* widget = splitter->widget(i))
-                {
-                    if (CLayoutViewPane* pane = qobject_cast<CLayoutViewPane*>(widget))
-                    {
-                        if (curIndex == index)
-                        {
-                            return pane;
-                        }
-                        curIndex++;
-                    }
-                }
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CLayoutViewPane* CLayoutWnd::GetViewPane(int id)
-{
-    QList<QSplitter*> splitters({ m_splitWnd, m_splitWnd2, m_splitWnd3 });
-
-    for (QSplitter* splitter : splitters)
-    {
-        if (!splitter)
-        {
-            continue;
-        }
-
-        for (int i = 0; i < splitter->count(); ++i)
-        {
-            QWidget* widget = splitter->widget(i);
-            if (widget == nullptr)
-            {
-                continue;
-            }
-            if (CLayoutViewPane* pane = qobject_cast<CLayoutViewPane*>(widget))
-            {
-                if (pane && pane->GetId() == id)
-                {
-                    return pane;
-                }
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CLayoutViewPane* CLayoutWnd::FindViewByClass(const QString& viewClassName)
-{
-    if (m_viewType[0] == viewClassName)
-    {
-        return m_maximizedView;
-    }
-
-    // Starts from 1, 0 is the maximized view.
-    for (int i = 1; i < MAX_VIEWPORTS; i++)
-    {
-        if (m_viewType[i] == viewClassName)
-        {
-            return GetViewPane(i);
-        }
-    }
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLayoutWnd::CycleViewport(EViewportType from, EViewportType to)
-{
-    const QString viewClassName = ViewportTypeToClassName(from);
-    CLayoutViewPane* vp = FindViewByClass(viewClassName);
-    if (m_layout == ET_Layout0 && !vp)
-    {
-        if (m_maximizedView)
-        {
-            if (m_maximizedView->GetViewClass() == viewClassName)
-            {
-                vp = m_maximizedView;
-            }
-        }
-    }
-    if (vp)
-    {
-        BindViewport(vp, ViewportTypeToClassName(to));
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::ResetLayout()
-{
-    // reset the layout settings. Mfc doesn't have a mechanism to delete settings, that I can find, so we use Qt.
-    m_settings->beginGroup("Editor");
-    m_settings->remove(GetConfigGroupName());
-    m_settings->endGroup();
-
-    // restore the default layout
-    CreateLayout(ET_Layout0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::Cycle2DViewport()
-{
-    // Cycle between 3 2D viewports.
-    switch (m_layout)
-    {
-    case ET_Layout0:
-        if (CycleViewport(ET_ViewportCamera, ET_ViewportXY))
-        {
-            return;
-        }
-        if (CycleViewport(ET_ViewportXY, ET_ViewportXZ))
-        {
-            return;
-        }
-        if (CycleViewport(ET_ViewportXZ, ET_ViewportYZ))
-        {
-            return;
-        }
-        if (CycleViewport(ET_ViewportYZ, ET_ViewportCamera))
-        {
-            return;
-        }
-        break;
-
-    default:
-        if (CycleViewport(ET_ViewportXY, ET_ViewportXZ))
-        {
-            return;
-        }
-        if (CycleViewport(ET_ViewportXZ, ET_ViewportYZ))
-        {
-            return;
-        }
-        if (CycleViewport(ET_ViewportYZ, ET_ViewportXY))
-        {
-            return;
-        }
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutWnd::OnDestroy()
-{
-    if (m_maximizedView)
-    {
-        delete m_maximizedView;
-        m_maximizedView = 0;
-    }
-}
-
-void CLayoutWnd::FocusFirstLayoutViewPane(CLayoutSplitter* splitter)
-{
-    // When starting in multi-layout mode we focus the first CLayoutViewPane
-    // Note that splitter->widget(0) might be another splitter, not a CLayoutViewPane
-    if (splitter)
-    {
-        if (auto view = splitter->findChild<CLayoutViewPane*>())
-        {
-            view->setFocus();
-            MainWindow::instance()->SetActiveView(view);
-        }
-    }
-}
-
-void CLayoutWnd::MoveViewport(CLayoutViewPane* from, CLayoutViewPane* to, const QString& viewClassName)
-{
-    // First detach from old pane, allowing the viewport to be disconnected from the event bus
-    // This must be done before re-binding the viewport and connecting to the bus with a new id
-    auto viewport = from->GetViewport();
-    from->DetachViewport();
-    BindViewport(to, viewClassName, viewport);
-}
-
-static CLayoutViewPane* layoutViewPaneForChild(QObject* child)
-{
-    CLayoutViewPane* result = nullptr;
-
-    while (child)
-    {
-        result = qobject_cast<CLayoutViewPane*>(child);
-        if (result)
-        {
-            break;
-        }
-        child = child->parent();
-    }
-
-    return result;
-}
-
-void CLayoutWnd::OnFocusChanged(QWidget* /* oldWidget */, QWidget* newWidget)
-{
-    if (CLayoutViewPane* layoutViewPane = layoutViewPaneForChild(newWidget))
-    {
-        MainWindow::instance()->SetActiveView(layoutViewPane);
-    }
-}
-
-#include <moc_LayoutWnd.cpp>
diff --git a/Code/Sandbox/Editor/LayoutWnd.h b/Code/Sandbox/Editor/LayoutWnd.h
deleted file mode 100644
index 1001a2bce0..0000000000
--- a/Code/Sandbox/Editor/LayoutWnd.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_LAYOUTWND_H
-#define CRYINCLUDE_EDITOR_LAYOUTWND_H
-
-#pragma once
-// LayoutWnd.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include "Viewport.h"
-
-#include <QSplitter>
-#include <QPointer>
-#include <AzQtComponents/Components/ToolBarArea.h>
-#endif
-
-class CLayoutViewPane;
-class CViewport;
-
-class QSettings;
-
-/////////////////////////////////////////////////////////////////////////////
-// CLayoutWnd window
-
-enum EViewLayout
-{
-    ET_Layout0,
-    ET_Layout1,
-    ET_Layout2,
-    ET_Layout3,
-    ET_Layout4,
-    ET_Layout5,
-    ET_Layout6,
-    ET_Layout7,
-    ET_Layout8
-};
-
-#define MAX_VIEWPORTS 9
-
-/** Window used as splitter window in Layout.
-*/
-class CLayoutSplitter
-    : public QSplitter
-{
-    Q_OBJECT
-public:
-    CLayoutSplitter(QWidget* parent = nullptr);
-
-    // Implementation
-public:
-    virtual ~CLayoutSplitter();
-
-    void otherSplitterMoved(int pos, int index) { const QSignalBlocker sb(this);  QSplitter::moveSplitter(pos, index); }
-
-    // Generated message map functions
-protected:
-    void resizeEvent(QResizeEvent* event) override;
-
-    void CreateLayoutView(int row, int col, int id);
-
-    QSplitterHandle* createHandle() override;
-
-private:
-    friend class CLayoutWnd;
-};
-
-/** Main layout window.
-*/
-class CLayoutWnd
-    : public AzQtComponents::ToolBarArea
-{
-    // Construction
-    Q_OBJECT
-public:
-    CLayoutWnd(QSettings* settings, QWidget* parent = nullptr);
-
-    // Attributes
-public:
-    CLayoutViewPane* GetViewPane(int id);
-    CLayoutViewPane* GetViewPaneByIndex(unsigned int index);
-    unsigned int GetViewPaneCount();
-
-    //! Maximize viewport with specified type.
-    void MaximizeViewport(int paneId);
-
-    //! Create specific layout.
-    void CreateLayout(EViewLayout layout, bool bBindViewports = true, EViewportType defaultView = ET_ViewportCamera);
-    EViewLayout GetLayout() const { return m_layout; }
-
-    //! Save layout window configuration to registry.
-    void SaveConfig();
-    //! Load layout window configuration from registry.
-    bool LoadConfig();
-    //! Get the config group name in the registry.
-    static const char* GetConfigGroupName();
-
-    CLayoutViewPane* FindViewByClass(const QString& viewClassName);
-    void BindViewport(CLayoutViewPane* vp, const QString& viewClassName, QWidget* pViewport = NULL);
-    QString ViewportTypeToClassName(EViewportType viewType);
-
-    //! Switch 2D viewports.
-    void Cycle2DViewport();
-
-    using AzQtComponents::ToolBarArea::SetMainWidget;
-
-public slots:
-    void ResetLayout();
-
-public:
-    virtual ~CLayoutWnd();
-
-    // Generated message map functions
-protected:
-    void OnDestroy();
-
-    // Bind viewports to split panes.
-    void BindViewports();
-    void UnbindViewports();
-
-    void CreateLayoutView(CLayoutSplitter* wndSplitter, int row, int col, int id, EViewportType viewType);
-
-    bool CycleViewport(EViewportType from, EViewportType to);
-
-private slots:
-    void OnFocusChanged(QWidget* oldWidget, QWidget* newWidget);
-
-private:
-    void FocusFirstLayoutViewPane(CLayoutSplitter*);
-    void MoveViewport(CLayoutViewPane* from, CLayoutViewPane* to, const QString& viewClassName);
-    bool m_bMaximized;
-
-    //! What view type is current maximized.
-    EViewLayout m_layout;
-
-    // ViewPane id to viewport type
-    QString m_viewType[MAX_VIEWPORTS];
-
-    //! Primary split window.
-    QPointer<CLayoutSplitter> m_splitWnd;
-    //! Secondary split window.
-    QPointer<CLayoutSplitter> m_splitWnd2;
-    //! Tertiary split window.
-    QPointer<CLayoutSplitter> m_splitWnd3;
-
-    //! View pane for maximized layout.
-    QPointer<CLayoutViewPane> m_maximizedView;
-    // Id of maximized view pane.
-    int m_maximizedViewId;
-
-    QSize m_infoBarSize;
-    QSettings* m_settings;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // CRYINCLUDE_EDITOR_LAYOUTWND_H
diff --git a/Code/Sandbox/Editor/LegacyViewportCameraController.cpp b/Code/Sandbox/Editor/LegacyViewportCameraController.cpp
deleted file mode 100644
index 8ed3f02228..0000000000
--- a/Code/Sandbox/Editor/LegacyViewportCameraController.cpp
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "LegacyViewportCameraController.h"
-
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
-#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
-#include <AzFramework/Viewport/ScreenGeometry.h>
-#include <AzToolsFramework/Viewport/ViewportMessages.h>
-#include <Atom/RPI.Public/ViewportContextBus.h>
-#include <Atom/RPI.Public/ViewportContext.h>
-
-#include <IViewSystem.h>
-#include <ISystem.h>
-#include "CryCommon/MathConversion.h"
-#include "SandboxAPI.h"
-#include "Settings.h"
-
-namespace SandboxEditor
-{
-
-LegacyViewportCameraControllerInstance::LegacyViewportCameraControllerInstance(AzFramework::ViewportId viewportId, LegacyViewportCameraController* controller)
-    : AzFramework::MultiViewportControllerInstanceInterface<LegacyViewportCameraController>(viewportId, controller)
-{
-}
-
-bool LegacyViewportCameraControllerInstance::JustAltHeld() const
-{
-    return (m_modifiers ^ Qt::AltModifier) == 0;
-}
-
-bool LegacyViewportCameraControllerInstance::NoModifierHeld() const
-{
-    return !m_modifiers;
-}
-
-bool LegacyViewportCameraControllerInstance::AllowDolly() const
-{
-    return JustAltHeld();
-}
-
-bool LegacyViewportCameraControllerInstance::AllowOrbit() const
-{
-    return JustAltHeld();
-}
-
-bool LegacyViewportCameraControllerInstance::AllowPan() const
-{
-    // begin pan with alt (inverted movement) or no modifiers
-    return JustAltHeld() || NoModifierHeld();
-}
-
-bool LegacyViewportCameraControllerInstance::InvertPan() const
-{
-    return JustAltHeld();
-}
-
-AZ::RPI::ViewportContextPtr LegacyViewportCameraControllerInstance::GetViewportContext()
-{
-    // This could be cached, if needed
-    auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
-    if (!viewportContextManager)
-    {
-        return {};
-    }
-    return viewportContextManager->GetViewportContextById(GetViewportId());
-}
-
-bool LegacyViewportCameraControllerInstance::HandleMouseMove(
-    const AzFramework::ScreenPoint& currentMousePos, const AzFramework::ScreenPoint& previousMousePos)
-{
-    if (previousMousePos == currentMousePos)
-    {
-        return false;
-    }
-
-    auto viewportContext = GetViewportContext();
-    if (!viewportContext)
-    {
-        return false;
-    }
-
-    float speedScale = gSettings.cameraMoveSpeed;
-
-    if (m_modifiers & Qt::Key_Control)
-    {
-        speedScale *= gSettings.cameraFastMoveSpeed;
-    }
-
-    if (m_inMoveMode || m_inOrbitMode || m_inRotateMode || m_inZoomMode)
-    {
-        m_totalMouseMoveDelta += (QPoint(currentMousePos.m_x, currentMousePos.m_y)-QPoint(previousMousePos.m_x, previousMousePos.m_y)).manhattanLength();
-    }
-
-    if ((m_inRotateMode && m_inMoveMode) || m_inZoomMode)
-    {
-        Matrix34 m = AZTransformToLYTransform(viewportContext->GetCameraTransform());
-
-        Vec3 ydir = m.GetColumn1().GetNormalized();
-        Vec3 pos = m.GetTranslation();
-
-        const float posDelta = 0.2f * (previousMousePos.m_y - currentMousePos.m_y) * speedScale;
-        pos = pos - ydir * posDelta;
-        m_orbitDistance = m_orbitDistance + posDelta;
-        m_orbitDistance = fabs(m_orbitDistance);
-
-        m.SetTranslation(pos);
-        viewportContext->SetCameraTransform(LYTransformToAZTransform(m));
-        return true;
-    }
-    else if (m_inRotateMode)
-    {
-        Ang3 angles(-currentMousePos.m_y + previousMousePos.m_y, 0, -currentMousePos.m_x + previousMousePos.m_x);
-        angles = angles * 0.002f * gSettings.cameraRotateSpeed;
-        if (gSettings.invertYRotation)
-        {
-            angles.x = -angles.x;
-        }
-        Matrix34 camtm = AZTransformToLYTransform(viewportContext->GetCameraTransform());
-        Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(camtm));
-        ypr.x += angles.z;
-        ypr.y += angles.x;
-
-        ypr.y = AZStd::clamp(ypr.y, -1.5f, 1.5f); // to keep rotation in reasonable range
-        ypr.z = 0;      // to have camera always upward
-
-        camtm = Matrix34(CCamera::CreateOrientationYPR(ypr), camtm.GetTranslation());
-        viewportContext->SetCameraTransform(LYTransformToAZTransform(camtm));
-        return true;
-    }
-    else if (m_inMoveMode)
-    {
-        // Slide.
-        Matrix34 m = AZTransformToLYTransform(viewportContext->GetCameraTransform());
-        Vec3 xdir = m.GetColumn0().GetNormalized();
-        Vec3 zdir = m.GetColumn2().GetNormalized();
-
-        if (InvertPan())
-        {
-            xdir = -xdir;
-            zdir = -zdir;
-        }
-
-        Vec3 pos = m.GetTranslation();
-        pos += 0.1f * xdir * (currentMousePos.m_x - previousMousePos.m_x) * speedScale + 0.1f * zdir * (previousMousePos.m_y - currentMousePos.m_y) * speedScale;
-        m.SetTranslation(pos);
-
-        AZ::Transform transform = viewportContext->GetCameraTransform();
-        transform.SetTranslation(LYVec3ToAZVec3(pos));
-        viewportContext->SetCameraTransform(transform);
-        return true;
-    }
-    else if (m_inOrbitMode)
-    {
-        Ang3 angles(-currentMousePos.m_y + previousMousePos.m_y, 0, -currentMousePos.m_x + previousMousePos.m_x);
-        angles = angles * 0.002f * gSettings.cameraRotateSpeed;
-
-        if (gSettings.invertPan)
-        {
-            angles.z = -angles.z;
-        }
-
-        Matrix34 m = AZTransformToLYTransform(viewportContext->GetCameraTransform());
-        Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(m));
-        ypr.x += angles.z;
-        ypr.y = AZStd::clamp(ypr.y, -1.5f, 1.5f); // to keep rotation in reasonable range
-        ypr.y += angles.x;
-
-        Matrix33 rotateTM = CCamera::CreateOrientationYPR(ypr);
-
-        Vec3 src = m.GetTranslation();
-        Vec3 trg(m_orbitTarget.GetX(), m_orbitTarget.GetY(), m_orbitTarget.GetZ());
-        float fCameraRadius = (trg - src).GetLength();
-
-        // Calc new source.
-        src = trg - rotateTM * Vec3(0, 1, 0) * fCameraRadius;
-        Matrix34 camTM = rotateTM;
-        camTM.SetTranslation(src);
-
-        viewportContext->SetCameraTransform(LYTransformToAZTransform(camTM));
-        return true;
-    }
-    return false;
-}
-
-bool LegacyViewportCameraControllerInstance::HandleMouseWheel(float zDelta)
-{
-    auto viewportContext = GetViewportContext();
-    if (!viewportContext)
-    {
-        return false;
-    }
-
-    Matrix34 m = AZTransformToLYTransform(viewportContext->GetCameraTransform());
-    const Vec3 ydir = m.GetColumn1().GetNormalized();
-
-    Vec3 pos = m.GetTranslation();
-
-    const float posDelta = 0.01f * zDelta * gSettings.wheelZoomSpeed;
-    pos += ydir * posDelta;
-    m_orbitDistance = m_orbitDistance - posDelta;
-    m_orbitDistance = fabs(m_orbitDistance);
-
-    m.SetTranslation(pos);
-    viewportContext->SetCameraTransform(LYTransformToAZTransform(m));
-    return true;
-}
-
-bool LegacyViewportCameraControllerInstance::IsKeyDown(Qt::Key key) const
-{
-    return m_pressedKeys.contains(key);
-}
-
-Qt::Key LegacyViewportCameraControllerInstance::GetKeyboardKey(const AzFramework::InputChannel& inputChannel)
-{
-    using Key = AzFramework::InputDeviceKeyboard::Key;
-    const auto& id = inputChannel.GetInputChannelId();
-    if (id == Key::AlphanumericW)
-    {
-        return Qt::Key_W;
-    }
-    else if (id == Key::AlphanumericA)
-    {
-        return Qt::Key_A;
-    }
-    else if (id == Key::AlphanumericS)
-    {
-        return Qt::Key_S;
-    }
-    else if (id == Key::AlphanumericD)
-    {
-        return Qt::Key_D;
-    }
-    else if (id == Key::AlphanumericQ)
-    {
-        return Qt::Key_Q;
-    }
-    else if (id == Key::AlphanumericE)
-    {
-        return Qt::Key_E;
-    }
-    else if (id == Key::NavigationArrowUp)
-    {
-        return Qt::Key_Up;
-    }
-    else if (id == Key::NavigationArrowUp)
-    {
-        return Qt::Key_Down;
-    }
-    else if (id == Key::NavigationArrowUp)
-    {
-        return Qt::Key_Left;
-    }
-    else if (id == Key::NavigationArrowUp)
-    {
-        return Qt::Key_Right;
-    }
-    return Qt::Key_unknown;
-}
-
-Qt::KeyboardModifier LegacyViewportCameraControllerInstance::GetKeyboardModifier(const AzFramework::InputChannel& inputChannel)
-{
-    using Key = AzFramework::InputDeviceKeyboard::Key;
-    const auto& id = inputChannel.GetInputChannelId();
-    if (id == Key::ModifierAltL || id == Key::ModifierAltR)
-    {
-        return Qt::KeyboardModifier::AltModifier;
-    }
-    if (id == Key::ModifierCtrlL || id == Key::ModifierCtrlR)
-    {
-        return Qt::KeyboardModifier::ControlModifier;
-    }
-    if (id == Key::ModifierShiftL || id == Key::ModifierShiftR)
-    {
-        return Qt::KeyboardModifier::ShiftModifier;
-    }
-    return Qt::KeyboardModifier::NoModifier;
-}
-
-bool LegacyViewportCameraControllerInstance::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
-{
-    using AzFramework::InputChannel;
-    using MouseButton = AzFramework::InputDeviceMouse::Button;
-    const auto& id = event.m_inputChannel.GetInputChannelId();
-    const auto& state = event.m_inputChannel.GetState();
-    bool shouldCaptureCursor = m_capturingCursor;
-    bool shouldConsumeEvent = false;
-
-    if (id == AzFramework::InputDeviceMouse::SystemCursorPosition)
-    {
-        bool result = false;
-        AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Event(
-            GetViewportId(),
-            [this, &result](AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequests* mouseRequests)
-            {
-                if (auto previousMousePosition = mouseRequests->PreviousViewportCursorScreenPosition();
-                    previousMousePosition.has_value())
-                {
-                    result = HandleMouseMove(mouseRequests->ViewportCursorScreenPosition(), previousMousePosition.value());
-                }
-            });
-        return result;
-    }
-    else if (id == MouseButton::Left)
-    {
-        if (state == InputChannel::State::Began)
-        {
-            if (AllowOrbit())
-            {
-                AzFramework::CameraState cameraState;
-                AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-                    cameraState, event.m_viewportId,
-                    &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GetCameraState);
-
-                m_inOrbitMode = true;
-                m_orbitTarget = cameraState.m_position + cameraState.m_forward * m_orbitDistance;
-
-                shouldConsumeEvent = true;
-                shouldCaptureCursor = true;
-            }
-        }
-        else if (state == InputChannel::State::Ended)
-        {
-            m_inOrbitMode = false;
-            shouldCaptureCursor = false;
-        }
-    }
-    else if (id == MouseButton::Right)
-    {
-        if (state == InputChannel::State::Began)
-        {
-            if (AllowDolly())
-            {
-                m_inZoomMode = true;
-            }
-            else
-            {
-                m_inRotateMode = true;
-            }
-
-            shouldCaptureCursor = true;
-            // Record how much the cursor has been moved to see if we should own the mouse up event.
-            m_totalMouseMoveDelta = 0;
-        }
-        else if (state == InputChannel::State::Ended)
-        {
-            m_inZoomMode = false;
-            m_inRotateMode = false;
-            // If we've moved the cursor more than a couple pixels, we should eat this mouse up event to prevent the context menu controller from seeing it.
-            shouldConsumeEvent = m_totalMouseMoveDelta > 2;
-            shouldCaptureCursor = false;
-        }
-    }
-    else if (id == MouseButton::Middle)
-    {
-        if (state == InputChannel::State::Began)
-        {
-            if (AllowPan())
-            {
-                m_inMoveMode = true;
-                shouldConsumeEvent = true;
-                shouldCaptureCursor = true;
-            }
-        }
-        else if (state == InputChannel::State::Ended)
-        {
-            m_inMoveMode = false;
-            shouldCaptureCursor = false;
-        }
-    }
-    else if (auto modifier = GetKeyboardModifier(event.m_inputChannel); modifier != Qt::KeyboardModifier::NoModifier)
-    {
-        if (state == InputChannel::State::Ended)
-        {
-            m_modifiers &= ~modifier;
-        }
-        else
-        {
-            m_modifiers |= modifier;
-        }
-    }
-    else if (id == AzFramework::InputDeviceMouse::Movement::Z)
-    {
-        if (state == InputChannel::State::Began || state == InputChannel::State::Updated)
-        {
-            shouldConsumeEvent = HandleMouseWheel(event.m_inputChannel.GetValue());
-        }
-    }
-    else if (auto key = GetKeyboardKey(event.m_inputChannel); key != Qt::Key_unknown)
-    {
-        if (state == InputChannel::State::Ended)
-        {
-            m_pressedKeys.erase(key);
-        }
-        else
-        {
-            m_pressedKeys.insert(key);
-            shouldConsumeEvent = true;
-        }
-    }
-
-    UpdateCursorCapture(shouldCaptureCursor);
-
-    return shouldConsumeEvent;
-}
-
-void LegacyViewportCameraControllerInstance::UpdateCursorCapture(bool shouldCaptureCursor)
-{
-    if (m_capturingCursor != shouldCaptureCursor)
-    {
-        if (shouldCaptureCursor)
-        {
-            AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Event(
-                GetViewportId(),
-                &AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Events::BeginCursorCapture
-            );
-        }
-        else
-        {
-            AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Event(
-                GetViewportId(),
-                &AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Events::EndCursorCapture
-            );
-        }
-
-        m_capturingCursor = shouldCaptureCursor;
-    }
-}
-
-void LegacyViewportCameraControllerInstance::ResetInputChannels()
-{
-    m_modifiers = 0;
-    m_pressedKeys.clear();
-    UpdateCursorCapture(false);
-    m_inRotateMode = m_inMoveMode = m_inOrbitMode = m_inZoomMode = false;
-}
-
-void LegacyViewportCameraControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
-{
-    auto viewportContext = GetViewportContext();
-    if (!viewportContext)
-    {
-        return;
-    }
-
-    AZ::Transform transform = viewportContext->GetCameraTransform();
-    AZ::Vector3 xdir = transform.GetBasisX();
-    AZ::Vector3 ydir = transform.GetBasisY();
-    AZ::Vector3 zdir = transform.GetBasisZ();
-
-    AZ::Vector3 pos = transform.GetTranslation();
-
-    float speedScale = AZStd::GetMin(30.0f * event.m_deltaTime.count(), 20.0f);
-
-    // Use the global modifier keys instead of our keymap. It's more reliable.
-    const bool shiftPressed = m_modifiers & Qt::ShiftModifier;
-    const bool controlPressed = m_modifiers & Qt::ControlModifier;
-
-    speedScale *= gSettings.cameraMoveSpeed;
-    if (controlPressed)
-    {
-        return;
-    }
-
-    if (shiftPressed)
-    {
-        speedScale *= gSettings.cameraFastMoveSpeed;
-    }
-
-    bool cameraMoved = false;
-
-    if (IsKeyDown(Qt::Key_Up) || IsKeyDown(Qt::Key_W))
-    {
-        // move forward
-        cameraMoved = true;
-        pos = pos + (speedScale * m_moveSpeed * ydir);
-    }
-
-    if (IsKeyDown(Qt::Key_Down) || IsKeyDown(Qt::Key_S))
-    {
-        // move backward
-        cameraMoved = true;
-        pos = pos - (speedScale * m_moveSpeed * ydir);
-    }
-
-    if (IsKeyDown(Qt::Key_Left) || IsKeyDown(Qt::Key_A))
-    {
-        // move left
-        cameraMoved = true;
-        pos = pos - (speedScale * m_moveSpeed * xdir);
-    }
-
-    if (IsKeyDown(Qt::Key_Right) || IsKeyDown(Qt::Key_D))
-    {
-        // move right
-        cameraMoved = true;
-        pos = pos + (speedScale * m_moveSpeed * xdir);
-    }
-
-    if (IsKeyDown(Qt::Key_E))
-    {
-        // move Up
-        cameraMoved = true;
-        pos = pos + (speedScale * m_moveSpeed * zdir);
-    }
-
-    if (IsKeyDown(Qt::Key_Q))
-    {
-        // move down
-        cameraMoved = true;
-        pos = pos - (speedScale * m_moveSpeed * zdir);
-    }
-
-    if (cameraMoved)
-    {
-        transform.SetTranslation(pos);
-        viewportContext->SetCameraTransform(transform);
-    }
-}
-
-} //namespace SandboxEditor
diff --git a/Code/Sandbox/Editor/LegacyViewportCameraController.h b/Code/Sandbox/Editor/LegacyViewportCameraController.h
deleted file mode 100644
index 24df6a2a9c..0000000000
--- a/Code/Sandbox/Editor/LegacyViewportCameraController.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzFramework/Viewport/ViewportId.h>
-#include <AzFramework/Viewport/MultiViewportController.h>
-#include <AzCore/Math/Vector3.h>
-
-#include <Atom/RPI.Public/Base.h>
-
-#include <QtCore/qnamespace.h>
-#include <QPoint>
-
-namespace AzFramework
-{
-    struct ScreenPoint;
-}
-
-namespace SandboxEditor
-{
-    class LegacyViewportCameraControllerInstance;
-    using LegacyViewportCameraController = AzFramework::MultiViewportController<LegacyViewportCameraControllerInstance>;
-
-    class LegacyViewportCameraControllerInstance final
-        : public AzFramework::MultiViewportControllerInstanceInterface<LegacyViewportCameraController>
-    {
-    public:
-        LegacyViewportCameraControllerInstance(AzFramework::ViewportId viewport, LegacyViewportCameraController* controller);
-
-        bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
-        void ResetInputChannels() override;
-        void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
-
-    private:
-        bool JustAltHeld() const;
-        bool NoModifierHeld() const;
-        bool AllowDolly() const;
-        bool AllowOrbit() const;
-        bool AllowPan() const;
-        bool InvertPan() const;
-
-        static Qt::KeyboardModifier GetKeyboardModifier(const AzFramework::InputChannel& inputChannel);
-        static Qt::Key GetKeyboardKey(const AzFramework::InputChannel& inputChannel);
-
-        AZ::RPI::ViewportContextPtr GetViewportContext();
-
-        bool HandleMouseMove(const AzFramework::ScreenPoint& currentMousePos, const AzFramework::ScreenPoint& previousMousePos);
-        bool HandleMouseWheel(float zDelta);
-        bool IsKeyDown(Qt::Key key) const;
-        void UpdateCursorCapture(bool shouldCaptureCursor);
-
-        bool m_inRotateMode = false;
-        bool m_inMoveMode = false;
-        bool m_inOrbitMode = false;
-        bool m_inZoomMode = false;
-        int m_totalMouseMoveDelta = 0;
-        float m_orbitDistance = 10.f;
-        float m_moveSpeed = 1.f;
-        AZ::Vector3 m_orbitTarget = {};
-        unsigned int m_modifiers = {};
-        AZStd::unordered_set<Qt::Key> m_pressedKeys;
-        bool m_capturingCursor = false;
-    };
-
-} //namespace SandboxEditor
diff --git a/Code/Sandbox/Editor/LevelFileDialog.cpp b/Code/Sandbox/Editor/LevelFileDialog.cpp
deleted file mode 100644
index 4445a07458..0000000000
--- a/Code/Sandbox/Editor/LevelFileDialog.cpp
+++ /dev/null
@@ -1,544 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "LevelFileDialog.h"
-
-#include <AzFramework/API/ApplicationAPI.h>
-
-// Qt
-#include <QMessageBox>
-#include <QInputDialog>
-
-// Editor
-#include "LevelTreeModel.h"
-#include "CryEditDoc.h"
-#include "API/ToolsApplicationAPI.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_LevelFileDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-static const char lastLoadPathFilename[] = "lastLoadPath.preset";
-
-// Folder in which levels are stored
-static const char kLevelsFolder[] = "Levels";
-
-// List of folder names that are used to detect a level folder
-static const char* kLevelFolderNames[] =
-{
-    "Layers",
-    "Minimap",
-    "LevelData"
-};
-
-// List of files that are used to detect a level folder
-static const char* kLevelFileNames[] =
-{
-    "level.pak",
-    "filelist.xml",
-    "levelshadercache.pak",
-};
-
-CLevelFileDialog::CLevelFileDialog(bool openDialog, QWidget* parent)
-    : QDialog(parent)
-    , m_bOpenDialog(openDialog)
-    , ui(new Ui::LevelFileDialog())
-    , m_model(new LevelTreeModel(this))
-    , m_filterModel(new LevelTreeModelFilter(this))
-{
-    ui->setupUi(this);
-    ui->treeView->header()->close();
-    m_filterModel->setSourceModel(m_model);
-    ui->treeView->setModel(m_filterModel);
-    ui->treeView->installEventFilter(this);
-
-    connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged,
-        this, &CLevelFileDialog::OnTreeSelectionChanged);
-
-    connect(ui->treeView, &QTreeView::doubleClicked, this, [this]()
-        {
-            if (m_bOpenDialog && !IsValidLevelSelected())
-            {
-                return;
-            }
-
-            OnOK();
-        });
-
-    connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &CLevelFileDialog::OnFilterChanged);
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &CLevelFileDialog::OnCancel);
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &CLevelFileDialog::OnOK);
-    connect(ui->newFolderButton, &QPushButton::clicked, this, &CLevelFileDialog::OnNewFolder);
-
-    if (m_bOpenDialog)
-    {
-        setWindowTitle(tr("Open Level"));
-        ui->newFolderButton->setVisible(false);
-        ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Open"));
-    }
-    else
-    {
-        setWindowTitle(tr("Save Level As "));
-        ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Save"));
-        ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-
-        // Make the name input the default active field for the save as dialog
-        // The filter input will still be the default active field for the open dialog
-        setTabOrder(ui->nameLineEdit, ui->filterLineEdit);
-
-        connect(ui->nameLineEdit, &QLineEdit::textChanged, this, &CLevelFileDialog::OnNameChanged);
-    }
-
-    // reject invalid file names (see CryStringUtils::IsValidFileName)
-    ui->nameLineEdit->setValidator(new QRegExpValidator(QRegExp("^[a-zA-Z0-9_\\-./]*$"), ui->nameLineEdit));
-
-    ReloadTree();
-    LoadLastUsedLevelPath();
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-}
-
-CLevelFileDialog::~CLevelFileDialog()
-{
-}
-
-QString CLevelFileDialog::GetFileName() const
-{
-    return m_fileName;
-}
-
-void CLevelFileDialog::OnCancel()
-{
-    close();
-}
-
-void CLevelFileDialog::OnOK()
-{
-    if (m_bOpenDialog)
-    {
-        // For Open button
-        if (!IsValidLevelSelected())
-        {
-            QMessageBox box(this);
-            box.setText(tr("Please enter a valid level name"));
-            box.setIcon(QMessageBox::Critical);
-            box.exec();
-            return;
-        }
-    }
-    else
-    {
-        QString errorMessage;
-        if (!ValidateSaveLevelPath(errorMessage))
-        {
-            QMessageBox::warning(this, tr("Error"), errorMessage);
-            return;
-        }
-
-        QString levelPath = GetLevelPath();
-        if (CFileUtil::PathExists(levelPath) && CheckLevelFolder(levelPath))
-        {
-            // there is already a level folder at that location, ask before for overwriting it
-            QMessageBox box(this);
-            box.setText(tr("Do you really want to overwrite '%1'?").arg(GetEnteredPath()));
-            box.setIcon(QMessageBox::Warning);
-            box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-            if (box.exec() != QMessageBox::Yes)
-            {
-                return;
-            }
-        }
-
-        m_fileName = levelPath + "/" + Path::GetFileName(levelPath) + EditorUtils::LevelFile::GetDefaultFileExtension();
-    }
-
-    SaveLastUsedLevelPath();
-    accept();
-}
-
-bool CLevelFileDialog::eventFilter(QObject* watched, QEvent* event)
-{
-    if (event->type() == QEvent::KeyPress) {
-        auto keyEvent = static_cast<QKeyEvent*>(event);
-        if (keyEvent->key() == Qt::Key_Return) {
-            OnOK();
-            return true;
-        }
-    }
-    return QDialog::eventFilter(watched, event);
-}
-
-QString CLevelFileDialog::NameForIndex(const QModelIndex& index) const
-{
-    QStringList tokens;
-    QModelIndex idx = index;
-
-    while (idx.isValid() && idx.parent().isValid())   // the root one doesn't count
-    {
-        tokens.push_front(idx.data(Qt::DisplayRole).toString());
-        idx = idx.parent();
-    }
-
-    QString text = tokens.join('/');
-    const bool isLevelFolder = index.data(LevelTreeModel::IsLevelFolderRole).toBool();
-    if (!isLevelFolder && !text.isEmpty())
-    {
-        text += "/";
-    }
-
-    return text;
-}
-
-bool CLevelFileDialog::IsValidLevelSelected()
-{
-    QString levelPath = GetLevelPath();
-    m_fileName = GetFileName(levelPath);
-
-    QString currentExtension = "." + Path::GetExt(m_fileName);
-
-    const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
-    const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-
-    bool isInvalidFileExtension = (currentExtension != defaultExtension && currentExtension != oldExtension);
-
-    if (!isInvalidFileExtension && CFileUtil::FileExists(m_fileName))
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-QString CLevelFileDialog::GetLevelPath() const
-{
-    const QString enteredPath = GetEnteredPath();
-    const QString levelPath = QString("%1/%2/%3").arg(Path::GetEditingGameDataFolder().c_str()).arg(kLevelsFolder).arg(enteredPath);
-    return levelPath;
-}
-
-QString CLevelFileDialog::GetEnteredPath() const
-{
-    QString enteredPath = ui->nameLineEdit->text();
-    enteredPath = enteredPath.trimmed();
-    enteredPath = Path::RemoveBackslash(enteredPath);
-
-    return enteredPath;
-}
-
-QString CLevelFileDialog::GetFileName(QString levelPath)
-{
-    QStringList levelFiles;
-    QString fileName;
-
-    if (CheckLevelFolder(levelPath, &levelFiles) && levelFiles.size() >= 1)
-    {
-        const char* oldExtension = EditorUtils::LevelFile::GetOldCryFileExtension();
-        const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-
-        // A level folder was entered. Prefer the .ly/.cry file with the
-        // folder name, otherwise pick the first one in the list
-        QString path = Path::GetFileName(levelPath);
-        QString needle = path + defaultExtension;
-        auto iter = std::find(levelFiles.begin(), levelFiles.end(), needle);
-
-        if (iter != levelFiles.end())
-        {
-            fileName = levelPath + "/" + *iter;
-        }
-        else
-        {
-            needle = path + oldExtension;
-            iter = std::find(levelFiles.begin(), levelFiles.end(), needle);
-            if (iter != levelFiles.end())
-            {
-                fileName = levelPath + "/" + *iter;
-            }
-            else
-            {
-                fileName = levelPath + "/" + levelFiles[0];
-            }
-        }
-    }
-    else
-    {
-        // Otherwise try to directly load the specified file (backward compatibility)
-        fileName = levelPath;
-    }
-
-    return fileName;
-}
-
-void CLevelFileDialog::OnTreeSelectionChanged()
-{
-    const QModelIndexList indexes = ui->treeView->selectionModel()->selectedIndexes();
-    if (!indexes.isEmpty())
-    {
-        ui->nameLineEdit->setText(NameForIndex(indexes.first()));
-    }
-}
-
-void CLevelFileDialog::OnNewFolder()
-{
-    const QModelIndexList indexes = ui->treeView->selectionModel()->selectedIndexes();
-
-    if (indexes.isEmpty())
-    {
-        QMessageBox box(this);
-        box.setText(tr("Please select a folder first"));
-        box.setIcon(QMessageBox::Critical);
-        box.exec();
-        return;
-    }
-
-    const QModelIndex index = indexes.first();
-    const bool isLevelFolder = index.data(LevelTreeModel::IsLevelFolderRole).toBool();
-
-    // Creating folders is not allowed in level folders
-    if (!isLevelFolder && index.isValid())
-    {
-        const QString parentFullPath = index.data(LevelTreeModel::FullPathRole).toString();
-        QInputDialog inputDlg(this);
-        inputDlg.setLabelText(tr("Please select a folder name"));
-
-        if (inputDlg.exec() == QDialog::Accepted && !inputDlg.textValue().isEmpty())
-        {
-            const QString newFolderName = inputDlg.textValue();
-            const QString newFolderPath = parentFullPath + "/" + newFolderName;
-
-            if (!CryStringUtils::IsValidFileName(newFolderName.toUtf8().data()))
-            {
-                QMessageBox box(this);
-                box.setText(tr("Please enter a single, valid folder name(standard English alphanumeric characters only)"));
-                box.setIcon(QMessageBox::Critical);
-                box.exec();
-                return;
-            }
-
-            if (CFileUtil::PathExists(newFolderPath))
-            {
-                QMessageBox box(this);
-                box.setText(tr("Folder already exists"));
-                box.setIcon(QMessageBox::Critical);
-                box.exec();
-                return;
-            }
-
-            // The trailing / is important, otherwise CreatePath doesn't work
-            if (!CFileUtil::CreatePath(newFolderPath + "/"))
-            {
-                QMessageBox box(this);
-                box.setText(tr("Could not create folder"));
-                box.setIcon(QMessageBox::Critical);
-                box.exec();
-                return;
-            }
-
-            m_model->AddItem(newFolderName, m_filterModel->mapToSource(index));
-            ui->treeView->expand(index);
-        }
-    }
-    else
-    {
-        QMessageBox box(this);
-        box.setText(tr("Please select a folder first"));
-        box.setIcon(QMessageBox::Critical);
-        box.exec();
-        return;
-    }
-}
-
-void CLevelFileDialog::OnFilterChanged()
-{
-    m_filterModel->setFilterText(ui->filterLineEdit->text().toLower());
-}
-
-void CLevelFileDialog::OnNameChanged()
-{
-    if (!m_bOpenDialog)
-    {
-        QString errorMessage;
-        ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ValidateSaveLevelPath(errorMessage));
-    }
-}
-
-void CLevelFileDialog::ReloadTree()
-{
-    m_model->ReloadTree(m_bOpenDialog);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Heuristic to detect a level folder, also returns all .cry/.ly files in it
-//////////////////////////////////////////////////////////////////////////
-bool CLevelFileDialog::CheckLevelFolder(const QString folder, QStringList* levelFiles)
-{
-    CFileEnum fileEnum;
-    QFileInfo fileData;
-    bool bIsLevelFolder = false;
-
-    for (bool bFoundFile = fileEnum.StartEnumeration(folder, "*", &fileData);
-         bFoundFile; bFoundFile = fileEnum.GetNextFile(&fileData))
-    {
-        const QString fileName = fileData.fileName();
-
-        if (!fileData.isDir())
-        {
-            QString ext = "." + Path::GetExt(fileName);
-
-            const char* defaultExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-
-            if (ext == defaultExtension)
-            {
-                bIsLevelFolder = true;
-
-                if (levelFiles)
-                {
-                    levelFiles->push_back(fileName);
-                }
-            }
-        }
-    }
-
-    return bIsLevelFolder;
-}
-
-bool CLevelFileDialog::ValidateSaveLevelPath(QString& errorMessage) const
-{
-    const QString enteredPath = GetEnteredPath();
-    const QString levelPath = GetLevelPath();
-
-    if (!CryStringUtils::IsValidFileName(Path::GetFileName(levelPath).toUtf8().data()))
-    {
-        errorMessage = tr("Please enter a valid level name (standard English alphanumeric characters only)");
-        return false;
-    }
-
-    //Verify that we are not using the temporary level name
-    const char* temporaryLevelName = GetIEditor()->GetDocument()->GetTemporaryLevelName();
-    if (QString::compare(Path::GetFileName(levelPath), temporaryLevelName) == 0)
-    {
-        errorMessage = tr("Please enter a level name that is different from the temporary name");
-        return false;
-    }
-
-    if (!ValidateLevelPath(enteredPath))
-    {
-        errorMessage = tr("Please enter a valid level location.\nYou cannot save levels inside levels.");
-        return false;
-    }
-
-    if (CFileUtil::FileExists(levelPath))
-    {
-        errorMessage = tr("A file with that name already exists");
-        return false;
-    }
-
-    if (CFileUtil::PathExists(levelPath) && !CheckLevelFolder(levelPath))
-    {
-        errorMessage = tr("Please enter a level name");
-        return false;
-    }
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// Checks if a given path is a valid level path
-//////////////////////////////////////////////////////////////////////////
-bool CLevelFileDialog::ValidateLevelPath(const QString& levelPath) const
-{
-    if (levelPath.isEmpty() || Path::GetExt(levelPath) != "")
-    {
-        return false;
-    }
-
-    // Split path
-    QStringList splittedPath = levelPath.split(QRegularExpression(QStringLiteral(R"([\\/])")), Qt::SkipEmptyParts);
-
-    // This shouldn't happen, but be careful
-    if (splittedPath.empty())
-    {
-        return false;
-    }
-
-    // Make sure that no folder before the last in the name contains a level
-    if (splittedPath.size() > 1)
-    {
-        QString currentPath = (Path::GetEditingGameDataFolder() + "/" + kLevelsFolder).c_str();
-        for (size_t i = 0; i < splittedPath.size() - 1; ++i)
-        {
-            currentPath += "/" + splittedPath[i];
-
-            if (CFileUtil::FileExists(currentPath) || CheckLevelFolder(currentPath))
-            {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-void CLevelFileDialog::SaveLastUsedLevelPath()
-{
-    const QString settingPath = QString(Path::GetUserSandboxFolder()) + lastLoadPathFilename;
-
-    XmlNodeRef lastUsedLevelPathNode = XmlHelpers::CreateXmlNode("lastusedlevelpath");
-    lastUsedLevelPathNode->setAttr("path", ui->nameLineEdit->text().toUtf8().data());
-    lastUsedLevelPathNode->saveToFile(settingPath.toUtf8().data());
-}
-
-void CLevelFileDialog::LoadLastUsedLevelPath()
-{
-    const QString settingPath = Path::GetUserSandboxFolder() + QString(lastLoadPathFilename);
-
-    XmlNodeRef lastUsedLevelPathNode = XmlHelpers::LoadXmlFromFile(settingPath.toUtf8().data());
-    if (lastUsedLevelPathNode == nullptr)
-    {
-        return;
-    }
-
-    QString lastLoadedFileName;
-    lastUsedLevelPathNode->getAttr("path", lastLoadedFileName);
-
-    if (m_filterModel->rowCount() < 1)
-    {
-        // Defensive, doesn't happen
-        return;
-    }
-
-    QModelIndex currentIndex = m_filterModel->index(0, 0); // Start with "Levels/" node
-    QStringList segments = Path::SplitIntoSegments(lastLoadedFileName);
-    for (auto it = segments.cbegin(), end = segments.cend(); it != end; ++it)
-    {
-        const int numChildren = m_filterModel->rowCount(currentIndex);
-        for (int i = 0; i < numChildren; ++i)
-        {
-            const QModelIndex subIndex = m_filterModel->index(i, 0, currentIndex);
-            if (*it == subIndex.data(Qt::DisplayRole).toString())
-            {
-                ui->treeView->expand(currentIndex);
-                currentIndex = subIndex;
-                break;
-            }
-        }
-    }
-
-    if (currentIndex.isValid())
-    {
-        ui->treeView->selectionModel()->select(currentIndex, QItemSelectionModel::Select);
-    }
-
-    ui->nameLineEdit->setText(lastLoadedFileName);
-}
-
-#include <moc_LevelFileDialog.cpp>
diff --git a/Code/Sandbox/Editor/LevelFileDialog.h b/Code/Sandbox/Editor/LevelFileDialog.h
deleted file mode 100644
index 47ba06e1fc..0000000000
--- a/Code/Sandbox/Editor/LevelFileDialog.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_LEVELFILEDIALOG_H
-#define CRYINCLUDE_EDITOR_LEVELFILEDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QScopedPointer>
-#endif
-
-namespace Ui {
-    class LevelFileDialog;
-}
-
-class LevelTreeModel;
-class LevelTreeModelFilter;
-
-class CLevelFileDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit CLevelFileDialog(bool openDialog, QWidget* parent = nullptr);
-    ~CLevelFileDialog();
-
-    QString GetFileName() const;
-
-    static bool CheckLevelFolder(const QString folder, QStringList* levelFiles = nullptr);
-
-protected Q_SLOTS:
-    void OnOK();
-    void OnCancel();
-    void OnTreeSelectionChanged();
-    void OnNewFolder();
-    void OnFilterChanged();
-    void OnNameChanged();
-protected:
-    void ReloadTree();
-    bool ValidateSaveLevelPath(QString& errorMessage) const;
-    bool ValidateLevelPath(const QString& folder) const;
-
-    void SaveLastUsedLevelPath();
-    void LoadLastUsedLevelPath();
-
-private:
-    bool eventFilter(QObject* watched, QEvent* event) override;
-
-    QString NameForIndex(const QModelIndex& index) const;
-
-    bool IsValidLevelSelected();
-    QString GetLevelPath() const;
-    QString GetEnteredPath() const;
-    QString GetFileName(QString levelPath);
-
-    QScopedPointer<Ui::LevelFileDialog> ui;
-    QString m_fileName;
-    QString m_filter;
-    const bool m_bOpenDialog;
-    bool m_initialized = false;
-    LevelTreeModel* const m_model;
-    LevelTreeModelFilter* const m_filterModel;
-};
-
-#endif // CRYINCLUDE_EDITOR_LEVELFILEDIALOG_H
diff --git a/Code/Sandbox/Editor/LevelIndependentFileMan.cpp b/Code/Sandbox/Editor/LevelIndependentFileMan.cpp
deleted file mode 100644
index f0552d06d7..0000000000
--- a/Code/Sandbox/Editor/LevelIndependentFileMan.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "LevelIndependentFileMan.h"
-
-CLevelIndependentFileMan::CLevelIndependentFileMan()
-{
-}
-
-CLevelIndependentFileMan::~CLevelIndependentFileMan()
-{
-    assert(m_Modules.size() == 0);
-}
-
-bool CLevelIndependentFileMan::PromptChangedFiles()
-{
-    for (std::vector<ILevelIndependentFileModule*>::iterator it = m_Modules.begin(); it != m_Modules.end(); ++it)
-    {
-        if (!(*it)->PromptChanges())
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-void CLevelIndependentFileMan::RegisterModule(ILevelIndependentFileModule* pModule)
-{
-    stl::push_back_unique(m_Modules, pModule);
-}
-void CLevelIndependentFileMan::UnregisterModule(ILevelIndependentFileModule* pModule)
-{
-    stl::find_and_erase(m_Modules, pModule);
-}
diff --git a/Code/Sandbox/Editor/LevelIndependentFileMan.h b/Code/Sandbox/Editor/LevelIndependentFileMan.h
deleted file mode 100644
index 5dcd1c9d60..0000000000
--- a/Code/Sandbox/Editor/LevelIndependentFileMan.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_LEVELINDEPENDENTFILEMAN_H
-#define CRYINCLUDE_EDITOR_LEVELINDEPENDENTFILEMAN_H
-#pragma once
-
-
-struct ILevelIndependentFileModule
-{
-    // this function should prompt some message box if changed files need to be saved
-    // if return false, editor will not continue with current action (e.g close the editor)
-    virtual bool PromptChanges() = 0;
-};
-
-class CLevelIndependentFileMan
-{
-public:
-    CLevelIndependentFileMan();
-    ~CLevelIndependentFileMan();
-
-    bool PromptChangedFiles();
-
-    void RegisterModule(ILevelIndependentFileModule* pModule);
-    void UnregisterModule(ILevelIndependentFileModule* pModule);
-private:
-    std::vector<ILevelIndependentFileModule* > m_Modules;
-};
-
-#endif // CRYINCLUDE_EDITOR_LEVELINDEPENDENTFILEMAN_H
diff --git a/Code/Sandbox/Editor/LevelInfo.cpp b/Code/Sandbox/Editor/LevelInfo.cpp
deleted file mode 100644
index 30158cbd13..0000000000
--- a/Code/Sandbox/Editor/LevelInfo.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "LevelInfo.h"
-
-// Qt
-#include <QMessageBox>
-
-// Editor
-#include "Util/fastlib.h"
-
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-#include "QtUI/WaitCursor.h"            // for WaitCursor
-#include "Include/IErrorReport.h"
-#include "Include/IObjectManager.h"
-#include "Objects/BaseObject.h"
-#include "UsedResources.h"
-#include "ErrorReport.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-CLevelInfo::CLevelInfo()
-{
-    m_pReport = GetIEditor()->GetErrorReport();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLevelInfo::SaveLevelResources([[maybe_unused]] const QString& toPath)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLevelInfo::Validate()
-{
-    m_pReport->Clear();
-    m_pReport->SetImmediateMode(false);
-    m_pReport->SetShowErrors(true);
-
-    int nTotalErrors(0);
-    int nCurrentError(0);
-
-    // Here we are appending the current level load errors to the general errors.
-    // Actually we are inserting them before all others, but this is not important :-).
-    IErrorReport*   poLastLoadedLevelErrorReport = GetIEditor()->GetLastLoadedLevelErrorReport();
-    if (poLastLoadedLevelErrorReport)
-    {
-        nTotalErrors = poLastLoadedLevelErrorReport->GetErrorCount();
-        for (nCurrentError = 0; nCurrentError < nTotalErrors; ++nCurrentError)
-        {
-            m_pReport->ReportError(poLastLoadedLevelErrorReport->GetError(nCurrentError));
-        }
-    }
-
-    // Validate level.
-    ValidateObjects();
-
-    if (m_pReport->GetErrorCount() == 0)
-    {
-        QMessageBox::information(QApplication::activeWindow(), QString(), QObject::tr("No Errors Found"));
-    }
-    else
-    {
-        m_pReport->Display();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLevelInfo::ValidateObjects()
-{
-    WaitCursor cursor;
-
-    // Validate all objects
-    CBaseObjectsArray objects;
-    GetIEditor()->GetObjectManager()->GetObjects(objects);
-
-    int i;
-
-    CLogFile::WriteLine("Validating Objects...");
-    for (i = 0; i < objects.size(); i++)
-    {
-        CBaseObject* pObject = objects[i];
-
-        m_pReport->SetCurrentValidatorObject(pObject);
-
-        pObject->Validate(m_pReport);
-
-        m_pReport->SetCurrentValidatorObject(NULL);
-    }
-
-    CLogFile::WriteLine("Validating Duplicate Objects...");
-    //////////////////////////////////////////////////////////////////////////
-    // Find duplicate objects, Same objects with same transform.
-    // Use simple grid to speed up the check.
-    //////////////////////////////////////////////////////////////////////////
-    int gridSize = 256;
-
-    AZ::Aabb terrainAabb = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-    float worldSize = terrainAabb.GetXExtent();
-
-    float fGridToWorld = worldSize / gridSize;
-
-    // Put all objects into parition grid.
-    std::vector<std::list<CBaseObject*> > grid;
-    grid.resize(gridSize * gridSize);
-    // Put objects to grid.
-    for (i = 0; i < objects.size(); i++)
-    {
-        CBaseObject* pObject = objects[i];
-        Vec3 pos = pObject->GetWorldPos();
-        int px = ftoi(pos.x / fGridToWorld);
-        int py = ftoi(pos.y / fGridToWorld);
-        if (px < 0)
-        {
-            px = 0;
-        }
-        if (py < 0)
-        {
-            py = 0;
-        }
-        if (px >= gridSize)
-        {
-            px = gridSize - 1;
-        }
-        if (py >= gridSize)
-        {
-            py = gridSize - 1;
-        }
-        grid[py * gridSize + px].push_back(pObject);
-    }
-
-    std::list<CBaseObject*>::iterator it1, it2;
-    // Check objects in grid.
-    for (i = 0; i < gridSize * gridSize; i++)
-    {
-        std::list<CBaseObject*>::iterator first = grid[i].begin();
-        std::list<CBaseObject*>::iterator last = grid[i].end();
-        for (it1 = first; it1 != last; ++it1)
-        {
-            for (it2 = first; it2 != it1; ++it2)
-            {
-                // Check if same object.
-                CBaseObject* p1 = *it1;
-                CBaseObject* p2 = *it2;
-                if (p1 != p2 && p1->GetClassDesc() == p2->GetClassDesc())
-                {
-                    // Same class.
-                    Quat q1 = p1->GetRotation();
-                    Quat q2 = p2->GetRotation();
-                    if (p1->GetWorldPos() == p2->GetWorldPos() && q1.w == q2.w && IsEquivalent(q1.v, q2.v, 0) && p1->GetScale() == p2->GetScale())
-                    {
-                        // Same transformation
-                        // Check if objects are really same.
-                        if (p1->IsSimilarObject(p2))
-                        {
-                            // Report duplicate objects.
-                            CErrorRecord err;
-                            err.error = QObject::tr("Found multiple objects in the same location (class %1): %2 and %3")
-                                .arg(p1->GetClassDesc()->ClassName(), p1->GetName(), p2->GetName());
-                            err.pObject = p1;
-                            err.severity = CErrorRecord::ESEVERITY_ERROR;
-                            m_pReport->ReportError(err);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/LevelInfo.h b/Code/Sandbox/Editor/LevelInfo.h
deleted file mode 100644
index 37dfa93dc0..0000000000
--- a/Code/Sandbox/Editor/LevelInfo.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_LEVELINFO_H
-#define CRYINCLUDE_EDITOR_LEVELINFO_H
-#pragma once
-
-/*! CLevelInfo provides methods for getting information about current level.
- */
-class CLevelInfo
-{
-public:
-    CLevelInfo();
-    void Validate();
-
-    void SaveLevelResources(const QString& toPath);
-
-private:
-    void ValidateObjects();
-
-    IErrorReport* m_pReport;
-};
-
-#endif // CRYINCLUDE_EDITOR_LEVELINFO_H
diff --git a/Code/Sandbox/Editor/LevelTreeModel.cpp b/Code/Sandbox/Editor/LevelTreeModel.cpp
deleted file mode 100644
index 2042091413..0000000000
--- a/Code/Sandbox/Editor/LevelTreeModel.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "LevelTreeModel.h"
-
-// Editor
-#include "LevelFileDialog.h"
-
-// Folder in which levels are stored
-static const char kLevelsFolder[] = "Levels";
-
-LevelTreeModelFilter::LevelTreeModelFilter(QObject* parent)
-    : QSortFilterProxyModel(parent)
-{
-}
-
-QVariant LevelTreeModelFilter::data(const QModelIndex& index, int role) const
-{
-    if (!sourceModel())
-    {
-        return QVariant();
-    }
-
-    return sourceModel()->data(mapToSource(index), role);
-}
-
-bool LevelTreeModelFilter::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
-{
-    if (m_filterText.isEmpty())
-    {
-        return true;
-    }
-
-    QModelIndex idx = sourceModel()->index(source_row, 0, source_parent);
-    if (!idx.isValid())
-    {
-        return false;
-    }
-
-    const QString text = idx.data(Qt::DisplayRole).toString();
-    if (text.contains(m_filterText, Qt::CaseInsensitive))
-    {
-        return true;
-    }
-
-    // Recurse into the children
-    const int count = sourceModel()->rowCount(idx);
-    for (int i = 0; i < count; ++i)
-    {
-        if (filterAcceptsRow(i, idx))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void LevelTreeModelFilter::setFilterText(const QString& text)
-{
-    QString lowerText = text.toLower();
-    if (m_filterText != lowerText)
-    {
-        m_filterText = lowerText;
-        invalidateFilter();
-    }
-}
-
-LevelTreeModel::LevelTreeModel(QObject* parent)
-    : QStandardItemModel(parent)
-{
-}
-
-LevelTreeModel::~LevelTreeModel()
-{
-}
-
-QVariant LevelTreeModel::data(const QModelIndex& index, int role) const
-{
-    if (role == Qt::DecorationRole)
-    {
-        const bool isLevelFolder = index.data(LevelTreeModel::IsLevelFolderRole).toBool();
-        if (isLevelFolder)
-        {
-            return QIcon(":/img/tree_view_level.png");
-        }
-        else
-        {
-            return QIcon(":/img/tree_view_folder.png");
-        }
-    }
-
-    return QStandardItemModel::data(index, role);
-}
-
-void LevelTreeModel::ReloadTree(bool recurseIfNoLevels)
-{
-    clear();
-
-    QString levelsFolder = QString("%1/%2").arg(Path::GetEditingGameDataFolder().c_str()).arg(kLevelsFolder);
-    QStandardItem* root = new QStandardItem(kLevelsFolder);
-    root->setData(levelsFolder, FullPathRole);
-    root->setEditable(false);
-    invisibleRootItem()->appendRow(root);
-    ReloadTree(root, recurseIfNoLevels);
-}
-
-void LevelTreeModel::ReloadTree(QStandardItem* root, bool recurseIfNoLevels)
-{
-    QStringList levelFiles;
-    const QString parentFullPath = root->data(FullPathRole).toString();
-    const bool isLevelFolder = CLevelFileDialog::CheckLevelFolder(parentFullPath, &levelFiles);
-    root->setData(isLevelFolder, IsLevelFolderRole);
-
-    // Recurse to sub folders if this is not a level folder
-    // Also recurse to sub folders if we detected a level folder
-    // but there are no level files in it in open mode
-    if (!isLevelFolder || (recurseIfNoLevels && levelFiles.empty()))
-    {
-        QDir currentDir(parentFullPath);
-        currentDir.setFilter(QDir::NoDot | QDir::NoDotDot | QDir::Dirs);
-        const QStringList subFolders = currentDir.entryList();
-        foreach (const QString &subFolder, subFolders)
-        {
-            auto child = new QStandardItem(subFolder);
-            child->setData(parentFullPath + "/" + subFolder, FullPathRole);
-            child->setEditable(false);
-            root->appendRow(child);
-            ReloadTree(child, recurseIfNoLevels);
-        }
-    }
-    else
-    {
-        // eTreeImage_Level
-        // Support for legacy folder structure: Multiple cry files in level folder
-        if (recurseIfNoLevels && levelFiles.size() > 1)
-        {
-            foreach (const QString &levelFile, levelFiles)
-            {
-                auto child = new QStandardItem(levelFile);
-                child->setData(root->data(FullPathRole).toString() + "/" + levelFile, FullPathRole);
-                child->setData(false, IsLevelFolderRole);
-                child->setEditable(false);
-                root->appendRow(child);
-            }
-        }
-    }
-}
-
-void LevelTreeModel::AddItem(const QString& name, const QModelIndex& parent)
-{
-    auto item = new QStandardItem(name);
-    item->setData(false, IsLevelFolderRole);
-    item->setEditable(false);
-    QStandardItem* parentItem = itemFromIndex(parent);
-    if (parentItem)
-    {
-        const QString parentPath = parent.data(FullPathRole).toString();
-        item->setData(parentPath + "/" + name, FullPathRole);
-        parentItem->appendRow(item);
-    }
-}
-
-#include <moc_LevelTreeModel.cpp>
diff --git a/Code/Sandbox/Editor/LevelTreeModel.h b/Code/Sandbox/Editor/LevelTreeModel.h
deleted file mode 100644
index e824520187..0000000000
--- a/Code/Sandbox/Editor/LevelTreeModel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_LEVEL_ITEM_MODEL_H
-#define CRYINCLUDE_EDITOR_LEVEL_ITEM_MODEL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QStandardItemModel>
-#include <QSortFilterProxyModel>
-#endif
-class QString;
-class QStandardItem;
-
-class LevelTreeModelFilter
-    : public QSortFilterProxyModel
-{
-    Q_OBJECT
-public:
-    explicit LevelTreeModelFilter(QObject* parent = nullptr);
-    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
-    void setFilterText(const QString&);
-    QVariant data(const QModelIndex& index, int role) const override;
-private:
-    QString m_filterText;
-};
-
-class LevelTreeModel
-    : public QStandardItemModel
-{
-    Q_OBJECT
-public:
-    enum Role
-    {
-        FullPathRole = Qt::UserRole + 1,
-        IsLevelFolderRole
-    };
-
-    explicit LevelTreeModel(QObject* parent = nullptr);
-    ~LevelTreeModel();
-    void ReloadTree(bool recurseIfNoLevels);
-    void AddItem(const QString& name, const QModelIndex& parent); // Called when clicking "New folder"
-    QVariant data(const QModelIndex& index, int role) const override;
-private:
-    void ReloadTree(QStandardItem* root, bool recurseIfNoLevels);
-};
-
-#endif
diff --git a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h b/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h
deleted file mode 100644
index 07ef96c5c5..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzTest/AzTest.h>
-#include <IEditor.h>
-#include <SFunctor.h>
-#include <RenderHelpers/AxisHelper.h>
-
-class CEditorMock
-    : public IEditor
-{
-public:
-    // GMock does not work with a variadic function
-    void ExecuteCommand(const char* sCommand, ...) override
-    {
-        va_list args;
-        va_start(args, sCommand);
-        ExecuteCommand(QString::asprintf(sCommand, args));
-        va_end(args);
-    }
-
-public:
-    MOCK_METHOD0(DeleteThis, void());
-    MOCK_METHOD0(GetSystem, ISystem*());
-    MOCK_METHOD0(GetClassFactory, IEditorClassFactory* ());
-    MOCK_METHOD0(GetCommandManager, CEditorCommandManager*());
-    MOCK_METHOD0(GetICommandManager, ICommandManager* ());
-    MOCK_METHOD1(ExecuteCommand, void(const QString& sCommand));
-    MOCK_METHOD1(SetDocument, void(CCryEditDoc* pDoc));
-    MOCK_CONST_METHOD0(GetDocument, CCryEditDoc* ());
-    MOCK_CONST_METHOD0(IsLevelLoaded, bool());
-    MOCK_METHOD1(SetModifiedFlag, void(bool));
-    MOCK_METHOD2(SetModifiedModule, void(EModifiedModule, bool));
-    MOCK_CONST_METHOD0(IsLevelExported, bool());
-    MOCK_METHOD1(SetLevelExported, bool(bool));
-    MOCK_METHOD0(IsModified, bool());
-    MOCK_METHOD0(SaveDocument, bool());
-    MOCK_METHOD1(WriteToConsole, void(const char* ));
-    MOCK_METHOD1(WriteToConsole, void(const QString& ));
-    MOCK_METHOD2(SetConsoleVar, void(const char* var, float ));
-    MOCK_METHOD1(GetConsoleVar, float(const char* var));
-    MOCK_METHOD1(ShowConsole, bool(bool show));
-    MOCK_METHOD0(GetMainStatusBar, IMainStatusBar*());
-    MOCK_METHOD1(SetStatusText, void(const QString& ));
-    MOCK_CONST_METHOD0(GetEditorMainWindow, QMainWindow* ());
-    MOCK_METHOD0(GetPrimaryCDFolder, QString());
-    MOCK_METHOD0(GetLevelName, QString());
-    MOCK_METHOD0(GetLevelFolder, QString());
-    MOCK_METHOD0(GetLevelDataFolder, QString());
-    MOCK_METHOD1(GetPrimaryCDFolder, QString(EEditorPathName));
-    MOCK_METHOD0(GetResolvedUserFolder, QString());
-    MOCK_METHOD4(ExecuteConsoleApp, bool(const QString&,QString&,bool,bool));
-    MOCK_METHOD0(SetDataModified, void());
-    MOCK_CONST_METHOD0(IsInitialized, bool());
-    MOCK_METHOD0(IsInGameMode, bool());
-    MOCK_METHOD0(IsInSimulationMode, bool());
-    MOCK_METHOD1(SetInGameMode, void(bool));
-    MOCK_METHOD0(IsInTestMode, bool());
-    MOCK_METHOD0(IsInPreviewMode, bool());
-    MOCK_METHOD0(IsInConsolewMode, bool());
-    MOCK_METHOD0(IsInLevelLoadTestMode, bool());
-    MOCK_METHOD0(IsInMatEditMode, bool());
-    MOCK_METHOD1(EnableUpdate, void(bool));
-    MOCK_METHOD1(EnableAcceleratos, void(bool));
-    MOCK_METHOD0(GetFileVersion, SFileVersion());
-    MOCK_METHOD0(GetProductVersion, SFileVersion());
-    MOCK_METHOD0(GetGameEngine , CGameEngine* ());
-    MOCK_METHOD0(GetDisplaySettings, CDisplaySettings*());
-    MOCK_METHOD0(GetGlobalGizmoParameters, const SGizmoParameters& ());
-    MOCK_METHOD7(NewObject, CBaseObject* (const char*, const char*, const char*, float, float, float, bool));
-    MOCK_METHOD1(DeleteObject, void(CBaseObject* obj));
-    MOCK_METHOD1(CloneObject, CBaseObject* (CBaseObject* ));
-    MOCK_METHOD0(GetSelection, CSelectionGroup* ());
-    MOCK_METHOD0(GetSelectedObject, CBaseObject* ());
-    MOCK_METHOD0(ClearSelection, int());
-    MOCK_METHOD1(SelectObject, void(CBaseObject*));
-    MOCK_METHOD1(LockSelection, void(bool));
-    MOCK_METHOD0(IsSelectionLocked, bool());
-    MOCK_METHOD0(GetObjectManager, struct IObjectManager* ());
-    MOCK_METHOD0(GetSettingsManager, CSettingsManager* ());
-    MOCK_METHOD1(GetDBItemManager, IDataBaseManager* (EDataBaseItemType));
-    MOCK_METHOD0(GetMaterialManagerLibrary, IBaseLibraryManager* ()); 
-    MOCK_METHOD0(GetIEditorMaterialManager, IEditorMaterialManager* ()); 
-    MOCK_METHOD0(GetIconManager, IIconManager* ());
-    MOCK_METHOD0(GetMusicManager, CMusicManager* ());
-    MOCK_METHOD2(GetTerrainElevation, float(float , float ));
-    MOCK_METHOD0(GetVegetationMap, class CVegetationMap* ());
-    MOCK_METHOD0(GetEditorQtApplication, Editor::EditorQtApplication* ());
-    MOCK_METHOD1(GetColorByName, const QColor& (const QString&));
-    MOCK_METHOD0(GetMovieSystem, struct IMovieSystem* ());
-    MOCK_METHOD0(GetPluginManager, class CPluginManager*());
-    MOCK_METHOD0(GetViewManager, class CViewManager* ());
-    MOCK_METHOD0(GetActiveView, class CViewport* ());
-    MOCK_METHOD1(SetActiveView, void(CViewport*));
-    MOCK_METHOD0(GetFileMonitor, struct IEditorFileMonitor* ());
-    MOCK_METHOD1(RegisterEventLoopHook, void(IEventLoopHook* ));
-    MOCK_METHOD1(UnregisterEventLoopHook, void(IEventLoopHook* ));
-    MOCK_CONST_METHOD0(CreateQMimeData, QMimeData* ());
-    MOCK_CONST_METHOD1(DestroyQMimeData, void(QMimeData*));
-    MOCK_METHOD0(GetLevelIndependentFileMan, class CLevelIndependentFileMan* ());
-    MOCK_METHOD2(UpdateViews, void(int , const AABB* ));
-    MOCK_METHOD0(ResetViews, void());
-    MOCK_METHOD0(ReloadTrackView, void());
-    MOCK_METHOD0(GetMarkerPosition, Vec3());
-    MOCK_METHOD1(SetMarkerPosition, void(const Vec3&));
-    MOCK_METHOD1(SetSelectedRegion, void(const AABB& box));
-    MOCK_METHOD1(GetSelectedRegion, void(AABB& box));
-    MOCK_METHOD1(SetOperationMode, void(EOperationMode ));
-    MOCK_METHOD0(GetOperationMode, EOperationMode());
-    MOCK_METHOD1(ShowTransformManipulator, ITransformManipulator* (bool));
-    MOCK_METHOD0(GetTransformManipulator, ITransformManipulator* ());
-    MOCK_METHOD1(SetAxisConstraints, void(AxisConstrains ));
-    MOCK_METHOD0(GetAxisConstrains, AxisConstrains());
-    MOCK_METHOD1(SetAxisVectorLock, void(bool));
-    MOCK_METHOD0(IsAxisVectorLocked, bool());
-    MOCK_METHOD1(SetTerrainAxisIgnoreObjects, void(bool));
-    MOCK_METHOD0(IsTerrainAxisIgnoreObjects, bool());
-    MOCK_METHOD1(SetReferenceCoordSys, void(RefCoordSys ));
-    MOCK_METHOD0(GetReferenceCoordSys, RefCoordSys());
-    MOCK_METHOD1(FindTemplate, XmlNodeRef(const QString& ));
-    MOCK_METHOD2(AddTemplate, void(const QString& , XmlNodeRef& ));
-    MOCK_METHOD2(OpenView, const QtViewPane* (QString , bool ));
-    MOCK_METHOD1(FindView, QWidget* (QString ));
-    MOCK_METHOD1(CloseView, bool(const char* ));
-    MOCK_METHOD1(SetViewFocus, bool(const char* ));
-    MOCK_METHOD1(CloseView, void(const GUID& ));
-    MOCK_METHOD1(OpenWinWidget, QWidget* (WinWidgetId ));
-    MOCK_CONST_METHOD0(GetWinWidgetManager, WinWidget::WinWidgetManager* ());
-    MOCK_METHOD2(SelectColor, bool(QColor &, QWidget *));
-    MOCK_METHOD0(GetUndoManager, class CUndoManager* ());
-    MOCK_METHOD0(BeginUndo, void());
-    MOCK_METHOD1(RestoreUndo, void(bool));
-    MOCK_METHOD1(AcceptUndo, void(const QString& ));
-    MOCK_METHOD0(CancelUndo, void());
-    MOCK_METHOD0(SuperBeginUndo, void());
-    MOCK_METHOD1(SuperAcceptUndo, void(const QString&));
-    MOCK_METHOD0(SuperCancelUndo, void());
-    MOCK_METHOD0(SuspendUndo, void());
-    MOCK_METHOD0(ResumeUndo, void());
-    MOCK_METHOD0(Undo, void());
-    MOCK_METHOD0(Redo, void());
-    MOCK_METHOD0(IsUndoRecording, bool());
-    MOCK_METHOD0(IsUndoSuspended, bool());
-    MOCK_METHOD1(RecordUndo, void(struct IUndoObject* ));
-    MOCK_METHOD1(FlushUndo, bool(bool isShowMessage));
-    MOCK_METHOD1(ClearLastUndoSteps, bool(int ));
-    MOCK_METHOD0(ClearRedoStack, bool());
-    MOCK_METHOD0(GetAnimation, CAnimationContext* ());
-    MOCK_METHOD0(GetSequenceManager, CTrackViewSequenceManager* ());
-    MOCK_METHOD0(GetSequenceManagerInterface, ITrackViewSequenceManager* ());
-    MOCK_METHOD0(GetToolBoxManager, CToolBoxManager* ());
-    MOCK_METHOD0(GetErrorReport, IErrorReport* ());
-    MOCK_METHOD0(GetLastLoadedLevelErrorReport, IErrorReport* ());
-    MOCK_METHOD0(StartLevelErrorReportRecording, void());
-    MOCK_METHOD0(CommitLevelErrorReport, void());
-    MOCK_METHOD0(GetFileUtil, IFileUtil* ());
-    MOCK_METHOD1(Notify, void(EEditorNotifyEvent));
-    MOCK_METHOD2(NotifyExcept, void(EEditorNotifyEvent , IEditorNotifyListener* ));
-    MOCK_METHOD1(RegisterNotifyListener, void(IEditorNotifyListener* ));
-    MOCK_METHOD1(UnregisterNotifyListener, void(IEditorNotifyListener* ));
-    MOCK_METHOD1(RegisterDocListener, void(IDocListener* ));
-    MOCK_METHOD1(UnregisterDocListener, void(IDocListener* ));
-    MOCK_METHOD0(GetSourceControl, ISourceControl* ());
-    MOCK_METHOD0(IsSourceControlAvailable, bool());
-    MOCK_METHOD0(IsSourceControlConnected, bool());
-    MOCK_METHOD0(GetUIEnumsDatabase, CUIEnumsDatabase* ());
-    MOCK_METHOD0(AddUIEnums, void());
-    MOCK_METHOD1(GetMemoryUsage, void(ICrySizer* ));
-    MOCK_METHOD0(ReduceMemory, void());
-    MOCK_METHOD0(GetExportManager, IExportManager* ());
-    MOCK_METHOD2(SetEditorConfigSpec, void(ESystemConfigSpec , ESystemConfigPlatform ));
-    MOCK_CONST_METHOD0(GetEditorConfigSpec, ESystemConfigSpec());
-    MOCK_CONST_METHOD0(GetEditorConfigPlatform, ESystemConfigPlatform());
-    MOCK_METHOD0(ReloadTemplates, void());
-    MOCK_METHOD0(GetResourceSelectorHost, IResourceSelectorHost* ());
-    MOCK_METHOD1(ShowStatusText, void(bool ));
-    MOCK_METHOD1(RegisterObjectContextMenuExtension, void(TContextMenuExtensionFunc ));
-    MOCK_METHOD0(GetEnv, SSystemGlobalEnvironment* ());
-    MOCK_METHOD0(GetImageUtil, IImageUtil* ());
-    MOCK_METHOD0(GetEditorSettings, SEditorSettings* ());
-    MOCK_METHOD0(GetLogFile, ILogFile* ());  
-    MOCK_METHOD0(UnloadPlugins, void());
-    MOCK_METHOD0(LoadPlugins, void());
-    MOCK_METHOD1(GetSearchPath, QString(EEditorPathName));
-    MOCK_METHOD0(GetEditorPanelUtils, IEditorPanelUtils* ());
-
-};
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_ClickableLabel.cpp b/Code/Sandbox/Editor/Lib/Tests/test_ClickableLabel.cpp
deleted file mode 100644
index dffd4bbc4e..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_ClickableLabel.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <AzCore/UnitTest/TestTypes.h>
-#include <QtUI/ClickableLabel.h>
-
-#include <QApplication>
-
-using namespace AZ;
-using namespace ::testing;
-
-namespace UnitTest
-{
-    class TestingClickableLabel
-        : public testing::Test
-    {
-    public:
-        ClickableLabel m_clickableLabel;
-    };
-
-    TEST_F(TestingClickableLabel, CursorDoesNotUpdateWhileDisabled)
-    {
-        m_clickableLabel.setEnabled(false);
-
-        QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
-        QEnterEvent enterEvent{ QPointF(), QPointF(), QPointF() };
-        QApplication::sendEvent(&m_clickableLabel, &enterEvent);
-
-        const Qt::CursorShape cursorShape = QApplication::overrideCursor()->shape();
-        EXPECT_THAT(cursorShape, Ne(Qt::PointingHandCursor));
-        EXPECT_THAT(cursorShape, Eq(Qt::BlankCursor));
-    }
-
-    TEST_F(TestingClickableLabel, DoesNotRespondToDblClickWhileDisabled)
-    {
-        m_clickableLabel.setEnabled(false);
-
-        bool linkActivated = false;
-        QObject::connect(&m_clickableLabel, &QLabel::linkActivated, [&linkActivated]()
-        {
-            linkActivated = true;
-        });
-
-        QMouseEvent mouseEvent {
-            QEvent::MouseButtonDblClick, QPointF(),
-            Qt::LeftButton, Qt::LeftButton, Qt::NoModifier };
-        QApplication::sendEvent(&m_clickableLabel, &mouseEvent);
-
-        EXPECT_THAT(linkActivated, Eq(false));
-    }
-} // namespace UnitTest
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp
deleted file mode 100644
index 06e9f3aae9..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <CryEditDoc.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-namespace CryEditDocPythonBindingsUnitTests
-{
-
-    class CryEditDocPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::CryEditDocFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(CryEditDocPythonBindingsFixture, CryEditDocEditorCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("save_level") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_CryEditPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_CryEditPythonBindings.cpp
deleted file mode 100644
index be6bd4151e..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_CryEditPythonBindings.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <AzCore/Component/TickBus.h>
-#include <MainWindow.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include "CryEdit.h"
-
-namespace CryEditPythonBindingsUnitTests
-{
-
-    class CryEditPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::CryEditPythonHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(CryEditPythonBindingsFixture, CryEditCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("open_level") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("open_level_no_prompt") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("create_level") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("create_level_no_prompt") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_game_folder") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_current_level_name") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_current_level_path") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("load_all_plugins") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_current_view_position") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_current_view_rotation") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_current_view_position") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_current_view_rotation") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("export_to_engine") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_config_spec") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_config_platform") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_config_spec") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_result_to_success") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_result_to_failure") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("idle_enable") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("is_idle_enabled") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("idle_is_enabled") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("idle_wait") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("idle_wait_frames") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("start_process_detached") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("launch_lua_editor") != behaviorContext->m_methods.end());
-    }
-
-    TEST_F(CryEditPythonBindingsFixture, CryEditCheckoutDialogCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("enable_for_all") != behaviorContext->m_methods.end());
-    }
-
-    TEST_F(CryEditPythonBindingsFixture, CryEditPython_IdleWaitFramesWorks)
-    {
-        AZ::BehaviorContext* behaviorContext = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
-        ASSERT_TRUE(behaviorContext);
-
-        unsigned int numTicks = 0;
-        QEventLoop loop;
-        QTimer timer;
-        loop.connect(&timer, &QTimer::timeout, [&numTicks]()
-        {
-            AZ::TickBus::Broadcast(&AZ::TickEvents::OnTick, 0.01f, AZ::ScriptTimePoint(AZStd::chrono::system_clock().now()));
-            ++numTicks;
-        });
-        timer.start(100);
-
-        const unsigned int framesToWait = 5;
-        AZStd::array<AZ::BehaviorValueParameter, 1> args;
-        args[0].Set(&framesToWait);
-        behaviorContext->m_methods.find("idle_wait_frames")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
-        loop.disconnect(&timer);
-        timer.stop();
-        EXPECT_EQ(numTicks, framesToWait);
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
deleted file mode 100644
index b1d962bd38..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <DisplaySettings.h>
-#include <DisplaySettingsPythonFuncs.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace DisplaySettingsPythonBindingsUnitTests
-{
-
-    class DisplaySettingsPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            m_app.RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsPythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(DisplaySettingsPythonBindingsFixture, DisplaySettingsEditorCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_misc_editor_settings") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_misc_editor_settings") != behaviorContext->m_methods.end());
-    }
-
-    class DisplaySettingsComponentFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            m_app.RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsComponent::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        auto itDisplaySettingsBus = behaviorContext->m_ebuses.find("DisplaySettingsBus");
-        if (itDisplaySettingsBus != behaviorContext->m_ebuses.end())
-        {
-            AZ::BehaviorEBus* behaviorBus = itDisplaySettingsBus->second;
-            EXPECT_TRUE(behaviorBus->m_events.find("GetSettingsState") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetSettingsState") != behaviorBus->m_events.end());
-        }
-    }
-
-    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ConvertToFlagsAllUnset)
-    {
-        AzToolsFramework::DisplaySettingsState state;
-        state.m_noCollision = false;
-        state.m_noLabels = false;
-        state.m_simulate = false;
-        state.m_hideTracks = false;
-        state.m_hideLinks = false;
-        state.m_hideHelpers = false;
-        state.m_showDimensionFigures = false;
-
-        AzToolsFramework::DisplaySettingsComponent component;
-        int result = component.ConvertToFlags(state);
-        int expected = 0x0;
-        EXPECT_EQ(result, expected);
-    }
-
-    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ConvertToFlagsAllSet)
-    {
-        AzToolsFramework::DisplaySettingsState state;
-        state.m_noCollision = true;
-        state.m_noLabels = true;
-        state.m_simulate = true;
-        state.m_hideTracks = true;
-        state.m_hideLinks = true;
-        state.m_hideHelpers = true;
-        state.m_showDimensionFigures = true;
-
-        AzToolsFramework::DisplaySettingsComponent component;
-        int result = component.ConvertToFlags(state);
-        int expected = SETTINGS_NOCOLLISION |
-            SETTINGS_NOLABELS |
-            SETTINGS_PHYSICS |
-            SETTINGS_HIDE_TRACKS |
-            SETTINGS_HIDE_LINKS |
-            SETTINGS_HIDE_HELPERS |
-            SETTINGS_SHOW_DIMENSIONFIGURES;
-        EXPECT_EQ(result, expected);
-    }
-
-    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ConvertToSettingsAllSet)
-    {
-        int flags = SETTINGS_NOCOLLISION |
-            SETTINGS_NOLABELS |
-            SETTINGS_PHYSICS |
-            SETTINGS_HIDE_TRACKS |
-            SETTINGS_HIDE_LINKS |
-            SETTINGS_HIDE_HELPERS |
-            SETTINGS_SHOW_DIMENSIONFIGURES;
-
-        AzToolsFramework::DisplaySettingsState expected;
-        expected.m_noCollision = true;
-        expected.m_noLabels = true;
-        expected.m_simulate = true;
-        expected.m_hideTracks = true;
-        expected.m_hideLinks = true;
-        expected.m_hideHelpers = true;
-        expected.m_showDimensionFigures = true;
-
-        AzToolsFramework::DisplaySettingsComponent component;
-        AzToolsFramework::DisplaySettingsState result = component.ConvertToSettings(flags);
-        EXPECT_EQ(result, expected);
-    }
-
-    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsComponent_ConvertToSettingsAllUnset)
-    {
-        int flags = 0x0;
-
-        AzToolsFramework::DisplaySettingsState expected;
-        expected.m_noCollision = false;
-        expected.m_noLabels = false;
-        expected.m_simulate = false;
-        expected.m_hideTracks = false;
-        expected.m_hideLinks = false;
-        expected.m_hideHelpers = false;
-        expected.m_showDimensionFigures = false;
-
-        AzToolsFramework::DisplaySettingsComponent component;
-        AzToolsFramework::DisplaySettingsState result = component.ConvertToSettings(flags);
-        EXPECT_EQ(result, expected);
-    }
-
-    TEST_F(DisplaySettingsComponentFixture, DisplaySettingsState_ToString)
-    {
-        AzToolsFramework::DisplaySettingsState state;
-        state.m_noCollision = false;
-        state.m_noLabels = true;
-        state.m_simulate = false;
-        state.m_hideTracks = true;
-        state.m_hideLinks = false;
-        state.m_hideHelpers = true;
-        state.m_showDimensionFigures = false;
-
-        AZStd::string result = state.ToString();
-
-        EXPECT_EQ(result, "(no_collision=False, no_labels=True, simulate=False, hide_tracks=True, hide_links=False, hide_helpers=True, show_dimension_figures=False)");
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp
deleted file mode 100644
index 36e47afb39..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <AzQtComponents/Utilities/QtPluginPaths.h>
-#include <PythonEditorFuncs.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/std/containers/array.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <Mocks/ICVarMock.h>
-#include <Mocks/ISystemMock.h>
-#include <Mocks/IConsoleMock.h>
-#include <Mocks/ILogMock.h>
-#include <Mocks/ITimerMock.h>
-#include <Mocks/IConsoleMock.h>
-#include "IEditorMock.h"
-
-namespace EditorPythonBindingsUnitTests
-{
-    using ::testing::NiceMock;
-    using ::testing::Return;
-    using ::testing::Invoke;
-    using ::testing::A;
-    using ::testing::_;
-
-    struct MockEditor final
-    {
-        ~MockEditor()
-        {
-            SetIEditor(nullptr);
-        }
-
-        template <typename T>
-        void PrepareSetCVar(int cvarType, AZStd::function<void(const T)> func)
-        {
-            m_cvarType = cvarType;
-            ON_CALL(m_cvarMock, GetType()).WillByDefault(Return(m_cvarType));
-            ON_CALL(m_cvarMock, Set(A<T>())).WillByDefault(Invoke(func));
-            ON_CALL(m_console, GetCVar(_)).WillByDefault(Return(&m_cvarMock));
-            ON_CALL(m_system, GetIConsole()).WillByDefault(Return(&m_console));
-            ON_CALL(m_editorMock, GetSystem()).WillByDefault(Return(&m_system));
-            SetIEditor(&m_editorMock);
-        }
-
-        void PrepareGetCVarString(const char* value)
-        {
-            ON_CALL(m_cvarMock, GetString()).WillByDefault(Return(value));
-            ON_CALL(m_console, GetCVar(_)).WillByDefault(Return(&m_cvarMock));
-            ON_CALL(m_system, GetIConsole()).WillByDefault(Return(&m_console));
-            ON_CALL(m_editorMock, GetSystem()).WillByDefault(Return(&m_system));
-            SetIEditor(&m_editorMock);
-        }
-
-        void PrepareGetIConsole()
-        {
-            ON_CALL(m_system, GetIConsole()).WillByDefault(Return(&m_console));
-            ON_CALL(m_editorMock, GetSystem()).WillByDefault(Return(&m_system));
-            SetIEditor(&m_editorMock);
-        }
-
-        int m_cvarType = CVAR_INT;
-        ::testing::NiceMock<CEditorMock> m_editorMock;
-        ::testing::NiceMock<ConsoleMock> m_console;
-        ::testing::NiceMock<SystemMock> m_system;
-        ::testing::NiceMock<CVarMock> m_cvarMock;
-    };
-
-    class EditorPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::PythonEditorFuncsHandler::CreateDescriptor());
-            // Disable saving global user settings to prevent failure due to detecting file updates
-            AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-
-        using TestEditorUtilityCommandFunc = AZStd::function<void(AZ::BehaviorContext* context)>;
-        void RunEditorUtilityCommandTest(TestEditorUtilityCommandFunc func)
-        {
-            AZ::BehaviorContext* behaviorContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
-            ASSERT_TRUE(behaviorContext);
-            func(behaviorContext);
-        }
-    };
-
-    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_cvar") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_cvar_string") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_cvar_integer") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_cvar_float") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("run_console") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("enter_game_mode") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("is_in_game_mode") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("exit_game_mode") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("run_file") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("run_file_parameters") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("execute_command") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("message_box") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("message_box_yes_no") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("message_box_ok") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("edit_box") != behaviorContext->m_methods.end());
-
-        // Blocked by LY-101816
-        //EXPECT_TRUE(behaviorContext->m_methods.find("edit_box_check_data_type") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("open_file_box") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_axis_constraint") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_axis_constraint") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_pak_from_file") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("log") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("undo") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("redo") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("draw_label") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("combo_box") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("crash") != behaviorContext->m_methods.end());
-    }
-
-    TEST_F(EditorPythonBindingsFixture, EditorPythonBindingsComponent_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        auto itPythonEditorBus = behaviorContext->m_ebuses.find("PythonEditorBus");
-        if (itPythonEditorBus != behaviorContext->m_ebuses.end())
-        {
-            AZ::BehaviorEBus* behaviorBus = itPythonEditorBus->second;
-            EXPECT_TRUE(behaviorBus->m_events.find("GetCVar") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetCVar") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetCVarFromString") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetCVarFromInteger") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetCVarFromFloat") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("PyRunConsole") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("EnterGameMode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("IsInGameMode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("ExitGameMode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("EnterSimulationMode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("IsInSimulationMode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("ExitSimulationMode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("RunLua") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("RunFile") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("RunFileParameters") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("ExecuteCommand") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("MessageBoxOkCancel") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("MessageBoxYesNo") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("MessageBoxOk") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("EditBox") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("EditBoxCheckDataType") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("OpenFileBox") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetAxisConstraint") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetAxisConstraint") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetPakFromFile") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("Log") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("Undo") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("Redo") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("DrawLabel") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("ComboBox") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetHidemaskAll") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetHidemaskNone") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetHidemaskInvert") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetHidemask") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetHidemask") != behaviorBus->m_events.end());
-        }
-    }
-
-    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_set_cvar_integer)
-    {
-        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
-        {
-            int testInt = -1;
-            MockEditor mockEditor;
-            mockEditor.PrepareSetCVar<int>(CVAR_INT, [&testInt](const int value) { testInt = value; });
-
-            const char* testCvar = "test.cvar.int";
-            int intArg = 1;
-            AZStd::array<AZ::BehaviorValueParameter, 2> args;
-            args[0].Set(&testCvar);
-            args[1].Set(&intArg);
-
-            context->m_methods.find("set_cvar_integer")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
-            EXPECT_EQ(1, testInt);
-        });
-    }
-
-    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_set_cvar_float)
-    {
-        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
-        {
-            float testFloat = 0.0f;
-            MockEditor mockEditor;
-            mockEditor.PrepareSetCVar<float>(CVAR_FLOAT, [&testFloat](const float value) { testFloat = value; });
-
-            const char* testCvar = "test.cvar.float";
-            float input = 1.234f;
-            AZStd::array<AZ::BehaviorValueParameter, 2> args;
-            args[0].Set(&testCvar);
-            args[1].Set(&input);
-
-            context->m_methods.find("set_cvar_float")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
-            EXPECT_FLOAT_EQ(1.234f, testFloat);
-        });
-    }
-
-    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_set_cvar_string)
-    {
-        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
-        {
-            AZStd::string testString;
-            MockEditor mockEditor;
-            mockEditor.PrepareSetCVar<const char*>(CVAR_STRING, [&testString](const char* value) { testString = value; });
-
-            const char* testCvar = "test.cvar.string";
-            const char* input = "testvalue";
-            AZStd::array<AZ::BehaviorValueParameter, 2> args;
-            args[0].Set(&testCvar);
-            args[1].Set(&input);
-
-            context->m_methods.find("set_cvar_string")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
-            EXPECT_STREQ("testvalue", testString.c_str());
-        });
-    }
-
-    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_get_cvar)
-    {
-        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
-        {
-            MockEditor mockEditor;
-            mockEditor.PrepareGetCVarString("atestvalue");
-
-            const char* testCvar = "test.cvar.string";
-            AZStd::array<AZ::BehaviorValueParameter, 1> args;
-            args[0].Set(&testCvar);
-
-            const char* data;
-            AZ::BehaviorObject obj;
-            obj.m_typeId = azrtti_typeid<const char*>();
-            obj.m_address = &data;
-    
-            AZ::BehaviorValueParameter result;
-            result.Set(&obj);
-
-            context->m_methods.find("get_cvar")->second->Call(args.begin(), static_cast<unsigned int>(args.size()), &result);
-            EXPECT_STREQ("atestvalue", reinterpret_cast<const char*>(obj.m_address));
-        });
-    }
-
-    TEST_F(EditorPythonBindingsFixture, EditorUtilityCommands_run_console)
-    {
-        RunEditorUtilityCommandTest([](AZ::BehaviorContext* context)
-        {
-            AZStd::string data;
-            MockEditor mockEditor;
-            mockEditor.PrepareGetIConsole();
-            ON_CALL(mockEditor.m_console, ExecuteString(_,_,_)).WillByDefault(Invoke([&data](const char* command, const bool, const bool) { data = command; }));
-
-            const char* testCvar = "enable_feature game.sim";
-            AZStd::array<AZ::BehaviorValueParameter, 1> args;
-            args[0].Set(&testCvar);
-
-            context->m_methods.find("run_console")->second->Call(args.begin(), static_cast<unsigned int>(args.size()));
-            EXPECT_STREQ(testCvar, data.c_str());
-        });
-    }
-}
-
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_EditorUtils.cpp b/Code/Sandbox/Editor/Lib/Tests/test_EditorUtils.cpp
deleted file mode 100644
index 94257551c4..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_EditorUtils.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-
-namespace EditorUtilsTest
-{
-    class WarningDetector
-        : public AZ::Debug::TraceMessageBus::Handler
-    {
-    public:
-        WarningDetector()
-        {
-            BusConnect();
-        }
-
-        ~WarningDetector()
-        {
-            BusDisconnect();
-        }
-
-        virtual bool OnWarning(const char* /*window*/, const char* /*message*/) override 
-        {
-            m_gotWarning = true;
-            return true;
-        }
-
-        bool m_gotWarning = false;
-    };
-
-
-    class TestWarningAbsorber
-        : public testing::Test
-    {
-    };
-
-    TEST_F(TestWarningAbsorber, Test)
-    {
-        WarningDetector detector;
-        EditorUtils::AzWarningAbsorber absorber("ignore this");
-
-        AZ_Warning("ignore this", false, "This warning should occur but be absorbed by the absorber");
-        ASSERT_FALSE(detector.m_gotWarning);
-
-        AZ_Warning("different window", false, "This warning should occur but be left alone by the absorber");
-        ASSERT_TRUE(detector.m_gotWarning);
-    }
-
-    TEST_F(TestWarningAbsorber, NullWindow)
-    {
-        WarningDetector detector;
-        EditorUtils::AzWarningAbsorber absorber("ignore this");
-
-        AZ_Warning(nullptr, false, "This warning should occur and not be absorbed by the absorber since the window name is nullptr");
-        ASSERT_TRUE(detector.m_gotWarning);
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_Main.cpp b/Code/Sandbox/Editor/Lib/Tests/test_Main.cpp
deleted file mode 100644
index 4325cd39e7..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_Main.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <EditorEnvironment.h>
-
-#include <QApplication>
-
-class EditorLibTestEnvironment
-    : public AZ::Test::ITestEnvironment
-{
-public:
-    virtual ~EditorLibTestEnvironment() {}
-
-protected:
-    void SetupEnvironment() override
-    {
-        AZ::Environment::Create(nullptr);
-        AttachEditorAZEnvironment(AZ::Environment::GetInstance());
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-    }
-
-    void TeardownEnvironment() override
-    {
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-        DetachEditorAZEnvironment();
-        AZ::Environment::Destroy();
-    }
-};
-
-AZTEST_EXPORT int AZ_UNIT_TEST_HOOK_NAME(int argc, char** argv)
-{
-    ::testing::InitGoogleMock(&argc, argv);
-    // NOTE - this line makes this code different from AZ_UNIT_TEST_HOOK()
-    QApplication app(argc, argv);
-    // end
-    AZ::Test::ApplyGlobalParameters(&argc, argv);
-    AZ::Test::printUnusedParametersWarning(argc, argv);
-    AZ::Test::addTestEnvironments({new EditorLibTestEnvironment});
-    int result = RUN_ALL_TESTS();
-    return result;
-}
-
-IMPLEMENT_TEST_EXECUTABLE_MAIN()
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp
deleted file mode 100644
index fa9631b566..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <MainWindow.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace MainWindowPythonBindingsUnitTests
-{
-
-    class MainWindowPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::MainWindowEditorFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(MainWindowPythonBindingsFixture, MainWindowEditorCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("open_pane") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("close_pane") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("is_pane_visible") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_pane_class_names") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("exit") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("exit_no_prompt") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
deleted file mode 100644
index e421ac9ef4..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <Objects/ObjectManager.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace ObjectManagerPythonBindingsUnitTests
-{
-
-    class ObjectManagerPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::ObjectManagerFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(ObjectManagerPythonBindingsFixture, ObjectManagerEditorCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_all_objects") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_names_of_selected_objects") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("select_object") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("unselect_objects") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("select_objects") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_num_selected") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("clear_selection") != behaviorContext->m_methods.end());
-
-        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());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_position") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_position") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_rotation") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_rotation") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_scale") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_scale") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("rename_object") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
deleted file mode 100644
index 8f261c3f6b..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <TerrainHoleTool.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace TerrainFuncsUnitTests
-{
-
-    class TerrainHoleToolPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainHoleToolPythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(TerrainHoleToolPythonBindingsFixture, TerrainCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_brush_radius") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_brush_radius") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_make_hole") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_make_hole") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("paint_hole") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("paint_hole_direct") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("is_hole_at") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp
deleted file mode 100644
index 7472786244..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <Terrain/PythonTerrainLayerFuncs.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace TerrainFuncsUnitTests
-{
-
-    class TerrainLayerPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainLayerPythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(TerrainLayerPythonBindingsFixture, TerrainCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_tile_count_x") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_tile_count_y") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_tile_resolution") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_tile_resolution") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_tile_count") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_color_at") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("import_megaterrain") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("export_megaterrain") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp
deleted file mode 100644
index e19badc5a9..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <TerrainModifyTool.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace TerrainModifyPythonBindingsUnitTests
-{
-
-    class TerrainModifyPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainModifyPythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(TerrainModifyPythonBindingsFixture, TerrainModifyEditorCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_tool_flatten") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_tool_smooth") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_tool_riselower") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp
deleted file mode 100644
index 3d1ae43405..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <TerrainTexturePainter.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace TerrainFuncsUnitTests
-{
-
-    class TerrainPainterPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainPainterPythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(TerrainPainterPythonBindingsFixture, TerrainCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_radius") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_radius") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_color_opacity") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_color_opacity") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_detail_intensity") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_detail_intensity") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_mask_by_layer_settings") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_mask_by_layer_settings") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_painter_brush_mask_layer_name") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_painter_brush_mask_layer_name") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_brush_color") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_brush_color") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_brush_color_brightness") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_brush_color_brightness") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("paint_layer") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_min_altitude") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_max_altitude") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_min_altitude") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_max_altitude") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_min_slope") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_max_slope") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_min_slope") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_max_slope") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_TerrainPythonBindings.cpp
deleted file mode 100644
index dbc756fa7a..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_TerrainPythonBindings.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <Terrain/PythonTerrainFuncs.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace TerrainFuncsUnitTests
-{
-
-    class TerrainPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainPythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(TerrainPythonBindingsFixture, TerrainCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_max_height") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_max_height") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("import_heightmap") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("export_heightmap") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_elevation") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_heightmap_elevation") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_elevation") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("flatten") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("reduce_range") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("smooth") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("slope_smooth") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("erase") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("resize") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("make_isle") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("normalize") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("invert") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("fetch") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("hold") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp
deleted file mode 100644
index c53a3a569f..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <TerrainTexture.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace TerrainFuncsUnitTests
-{
-
-    class TerrainTexturePythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TerrainTexturePythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(TerrainTexturePythonBindingsFixture, TerrainCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("open_layers") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("create_layer") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("delete_layer") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("move_layer") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_layer_index") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_material") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_splatmap") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("import_layer_splatmaps") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("export_layer_splatmap") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_layer_name") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
deleted file mode 100644
index 3e701bce06..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <TrackView/TrackViewPythonFuncs.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace TrackViewPythonBindingsUnitTests
-{
-
-    class TrackViewPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::TrackViewFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(TrackViewPythonBindingsFixture, TrackViewEditorCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_recording") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("new_sequence") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("delete_sequence") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_current_sequence") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_num_sequences") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_sequence_name") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_sequence_time_range") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_sequence_time_range") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("play_sequence") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("stop_sequence") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_time") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("add_node") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("add_selected_entities") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("add_layer_node") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("delete_node") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("add_track") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("delete_track") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_num_nodes") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_node_name") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_num_track_keys") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_key_value") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_interpolated_value") != behaviorContext->m_methods.end());
-    }
-
-    class TrackViewComponentFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            m_app.RegisterComponentDescriptor(AzToolsFramework::TrackViewComponent::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(TrackViewComponentFixture, TrackViewComponent_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        auto itTrackViewBus = behaviorContext->m_ebuses.find("TrackViewBus");
-        if (itTrackViewBus != behaviorContext->m_ebuses.end())
-        {
-            AZ::BehaviorEBus* behaviorBus = itTrackViewBus->second;
-            EXPECT_TRUE(behaviorBus->m_events.find("AddNode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("AddTrack") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("AddLayerNode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("AddSelectedEntities") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("AddNode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("AddTrack") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("AddLayerNode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("AddSelectedEntities") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("DeleteNode") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("DeleteTrack") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("DeleteSequence") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetInterpolatedValue") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetKeyValue") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetNodeName") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetNumNodes") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetNumSequences") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetNumTrackKeys") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetSequenceName") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("GetSequenceTimeRange") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("NewSequence") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("PlaySequence") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetCurrentSequence") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetRecording") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetSequenceTimeRange") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("SetTime") != behaviorBus->m_events.end());
-            EXPECT_TRUE(behaviorBus->m_events.find("StopSequence") != behaviorBus->m_events.end());
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
deleted file mode 100644
index 19a66cb2cc..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <ViewPane.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace ViewPaneFuncsUnitTests
-{
-
-    class ViewPanePythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::ViewPanePythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(ViewPanePythonBindingsFixture, ViewPaneCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_viewport_size") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_viewport_size") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("update_viewport") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("resize_viewport") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("bind_viewport") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_viewport_expansion_policy") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_viewport_expansion_policy") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_viewport_count") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_active_viewport") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_active_viewport") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("get_view_pane_layout") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("set_view_pane_layout") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
deleted file mode 100644
index 9242952c35..0000000000
--- a/Code/Sandbox/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include <AzTest/AzTest.h>
-#include <Util/EditorUtils.h>
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <ViewportTitleDlg.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-
-namespace ViewportTitleDlgFuncsUnitTests
-{
-
-    class ViewportTitleDlgPythonBindingsFixture
-        : public testing::Test
-    {
-    public:
-        AzToolsFramework::ToolsApplication m_app;
-
-        void SetUp() override
-        {
-            AzFramework::Application::Descriptor appDesc;
-            appDesc.m_enableDrilling = false;
-
-            m_app.Start(appDesc);
-            // 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_app.RegisterComponentDescriptor(AzToolsFramework::ViewportTitleDlgPythonFuncsHandler::CreateDescriptor());
-        }
-
-        void TearDown() override
-        {
-            m_app.Stop();
-        }
-    };
-
-    TEST_F(ViewportTitleDlgPythonBindingsFixture, ViewportTitleDlgCommands_ApiExists)
-    {
-        AZ::BehaviorContext* behaviorContext = m_app.GetBehaviorContext();
-        ASSERT_TRUE(behaviorContext);
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("toggle_helpers") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("is_helpers_shown") != behaviorContext->m_methods.end());
-    }
-}
diff --git a/Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp b/Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp
deleted file mode 100644
index 0e3dcbdaa4..0000000000
--- a/Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SimpleTriangleRasterizer.h"
-
-#include <math.h>
-
-#if !defined FLT_MAX
-#define FLT_MAX 3.402823466e+38F
-#endif
-
-void CSimpleTriangleRasterizer::lambertHorizlineConservative(float fx1, float fx2, int yy,  IRasterizeSink* inpSink)
-{
-    int x1 = (int)floorf(fx1 + 0.25f), x2 = (int)floorf(fx2 + .75f);
-
-    if (x1 < m_iMinX)
-    {
-        x1 = m_iMinX;
-    }
-    if (x2 > m_iMaxX + 1)
-    {
-        x2 = m_iMaxX + 1;
-    }
-    if (x1 > m_iMaxX + 1)
-    {
-        x1 = m_iMaxX + 1;
-    }
-    if (x2 < m_iMinX)
-    {
-        x2 = m_iMinX;
-    }
-
-
-    inpSink->Line(fx1, fx2, x1, x2, yy);
-}
-
-void CSimpleTriangleRasterizer::lambertHorizlineSubpixelCorrect(float fx1, float fx2, int yy,  IRasterizeSink* inpSink)
-{
-    int x1 = (int)floorf(fx1 + 0.5f), x2 = (int)floorf(fx2 + 0.5f);
-    //  int x1=(int)floorf(fx1*1023.f/1024.f+1.f),x2=(int)floorf(fx2*1023.f/1024.f+1.f);
-
-    if (x1 < m_iMinX)
-    {
-        x1 = m_iMinX;
-    }
-    if (x2 > m_iMaxX)
-    {
-        x2 = m_iMaxX;
-    }
-    if (x1 > m_iMaxX)
-    {
-        x1 = m_iMaxX;
-    }
-    if (x2 < m_iMinX)
-    {
-        x2 = m_iMinX;
-    }
-
-    inpSink->Line(fx1, fx2, x1, x2, yy);
-}
-
-// optimizable
-void CSimpleTriangleRasterizer::CopyAndSortY(const float infX[3], const float infY[3], float outfX[3], float outfY[3])
-{
-    outfX[0] = infX[0];
-    outfY[0] = infY[0];
-    outfX[1] = infX[1];
-    outfY[1] = infY[1];
-    outfX[2] = infX[2];
-    outfY[2] = infY[2];
-
-    // Sort the coordinates, so that (x[1], y[1]) becomes the highest coord
-    float tmp;
-
-    if (outfY[0] > outfY[1])
-    {
-        if (outfY[1] > outfY[2])
-        {
-            tmp = outfY[0];
-            outfY[0] = outfY[1];
-            outfY[1] = tmp;
-            tmp = outfX[0];
-            outfX[0] = outfX[1];
-            outfX[1] = tmp;
-            tmp = outfY[1];
-            outfY[1] = outfY[2];
-            outfY[2] = tmp;
-            tmp = outfX[1];
-            outfX[1] = outfX[2];
-            outfX[2] = tmp;
-
-            if (outfY[0] > outfY[1])
-            {
-                tmp = outfY[0];
-                outfY[0] = outfY[1];
-                outfY[1] = tmp;
-                tmp = outfX[0];
-                outfX[0] = outfX[1];
-                outfX[1] = tmp;
-            }
-        }
-        else
-        {
-            tmp = outfY[0];
-            outfY[0] = outfY[1];
-            outfY[1] = tmp;
-            tmp = outfX[0];
-            outfX[0] = outfX[1];
-            outfX[1] = tmp;
-
-            if (outfY[1] > outfY[2])
-            {
-                tmp = outfY[1];
-                outfY[1] = outfY[2];
-                outfY[2] = tmp;
-                tmp = outfX[1];
-                outfX[1] = outfX[2];
-                outfX[2] = tmp;
-            }
-        }
-    }
-    else
-    {
-        if (outfY[1] > outfY[2])
-        {
-            tmp = outfY[1];
-            outfY[1] = outfY[2];
-            outfY[2] = tmp;
-            tmp = outfX[1];
-            outfX[1] = outfX[2];
-            outfX[2] = tmp;
-
-            if (outfY[0] > outfY[1])
-            {
-                tmp = outfY[0];
-                outfY[0] = outfY[1];
-                outfY[1] = tmp;
-                tmp = outfX[0];
-                outfX[0] = outfX[1];
-                outfX[1] = tmp;
-            }
-        }
-    }
-}
-
-void CSimpleTriangleRasterizer::CallbackFillRectConservative(float _x[3], float _y[3], IRasterizeSink* inpSink)
-{
-    inpSink->Triangle(m_iMinY);
-
-    float fMinX = (std::min)(_x[0], (std::min)(_x[1], _x[2]));
-    float fMaxX = (std::max)(_x[0], (std::max)(_x[1], _x[2]));
-    float fMinY = (std::min)(_y[0], (std::min)(_y[1], _y[2]));
-    float fMaxY = (std::max)(_y[0], (std::max)(_y[1], _y[2]));
-
-    int iMinX = (std::max)(m_iMinX, (int)floorf(fMinX));
-    int iMaxX = (std::min)(m_iMaxX + 1, (int)ceilf(fMaxX));
-    int iMinY = (std::max)(m_iMinY, (int)floorf(fMinY));
-    int iMaxY = (std::min)(m_iMaxY + 1, (int)ceilf(fMaxY));
-
-    for (int y = iMinY; y < iMaxY; y++)
-    {
-        inpSink->Line(fMinX, fMaxX, iMinX, iMaxX, y);
-    }
-}
-
-
-
-
-void CSimpleTriangleRasterizer::CallbackFillConservative(float _x[3], float _y[3], IRasterizeSink* inpSink)
-{
-    float x[3], y[3];
-
-    CopyAndSortY(_x, _y, x, y);
-
-    // Calculate interpolation steps
-    float fX1toX2step = 0.0f;
-    float fX1toX3step = 0.0f;
-    float fX2toX3step = 0.0f;
-    if (fabsf(y[1] - y[0]) > FLT_EPSILON)
-    {
-        fX1toX2step = (x[1] - x[0]) / (float)(y[1] - y[0]);
-    }
-    if (fabsf(y[2] - y[0]) > FLT_EPSILON)
-    {
-        fX1toX3step = (x[2] - x[0]) / (float)(y[2] - y[0]);
-    }
-    if (fabsf(y[2] - y[1]) > FLT_EPSILON)
-    {
-        fX2toX3step = (x[2] - x[1]) / (float)(y[2] - y[1]);
-    }
-
-    float fX1toX2 = x[0], fX1toX3 = x[0], fX2toX3 = x[1];
-    bool bFirstLine = true;
-    bool bTriangleCallDone = false;
-
-    // Go through the scanlines of the triangle
-    int yy = (int)floorf(y[0]);           // was floor
-
-    for (; yy <= (int)floorf(y[2]); yy++)
-    //  for(yy=m_iMinY; yy<=m_iMaxY; yy++)      // juhu
-    {
-        float fSubPixelYStart = 0.0f, fSubPixelYEnd = 1.0f;
-        float start, end;
-
-        // first line
-        if (bFirstLine)
-        {
-            fSubPixelYStart = y[0] - floorf(y[0]);
-            start = x[0];
-            end = x[0];
-            bFirstLine = false;
-        }
-        else
-        {
-            // top part without middle corner line
-            if (yy <= (int)floorf(y[1]))
-            {
-                start = (std::min)(fX1toX2, fX1toX3);
-                end = (std::max)(fX1toX2, fX1toX3);
-            }
-            else
-            {
-                start = (std::min)(fX2toX3, fX1toX3);
-                end = (std::max)(fX2toX3, fX1toX3);
-            }
-        }
-
-        // middle corner line
-        if (yy == (int)floorf(y[1]))
-        {
-            fSubPixelYEnd = y[1] - floorf(y[1]);
-
-            fX1toX3 += fX1toX3step * (fSubPixelYEnd - fSubPixelYStart);
-            start = (std::min)(start, fX1toX3);
-            end = (std::max)(end, fX1toX3);
-            start = (std::min)(start, x[1]);
-            end = (std::max)(end, x[1]);
-
-            fSubPixelYStart = fSubPixelYEnd;
-            fSubPixelYEnd = 1.0f;
-        }
-
-        // last line
-        if (yy == (int)floorf(y[2]))
-        {
-            start = (std::min)(start, x[2]);
-            end = (std::max)(end, x[2]);
-        }
-        else
-        {
-            // top part without middle corner line
-            if (yy < (int)floorf(y[1]))
-            {
-                fX1toX2 += fX1toX2step * (fSubPixelYEnd - fSubPixelYStart);
-                start = (std::min)(start, fX1toX2);
-                end = (std::max)(end, fX1toX2);
-            }
-            else
-            {
-                fX2toX3 += fX2toX3step * (fSubPixelYEnd - fSubPixelYStart);
-                start = (std::min)(start, fX2toX3);
-                end = (std::max)(end, fX2toX3);
-            }
-
-            fX1toX3 += fX1toX3step * (fSubPixelYEnd - fSubPixelYStart);
-            start = (std::min)(start, fX1toX3);
-            end = (std::max)(end, fX1toX3);
-        }
-
-        if (yy >= m_iMinY && yy <= m_iMaxY)
-        {
-            if (!bTriangleCallDone)
-            {
-                inpSink->Triangle(yy);
-                bTriangleCallDone = true;
-            }
-
-            lambertHorizlineConservative(start, end, yy, inpSink);
-        }
-    }
-}
-
-
-
-void CSimpleTriangleRasterizer::CallbackFillSubpixelCorrect(float _x[3], float _y[3], IRasterizeSink* inpSink)
-{
-    float x[3], y[3];
-
-    CopyAndSortY(_x, _y, x, y);
-
-    if (fabs(y[0] - floorf(y[0])) < FLT_EPSILON)
-    {
-        y[0] -= FLT_EPSILON;
-    }
-
-    // Calculate interpolation steps
-    float fX1toX2step = 0.0f;
-    float fX1toX3step = 0.0f;
-    float fX2toX3step = 0.0f;
-    if (fabsf(y[1] - y[0]) > FLT_EPSILON)
-    {
-        fX1toX2step = (x[1] - x[0]) / (y[1] - y[0]);
-    }
-    if (fabsf(y[2] - y[0]) > FLT_EPSILON)
-    {
-        fX1toX3step = (x[2] - x[0]) / (y[2] - y[0]);
-    }
-    if (fabsf(y[2] - y[1]) > FLT_EPSILON)
-    {
-        fX2toX3step = (x[2] - x[1]) / (y[2] - y[1]);
-    }
-
-    float fX1toX2 = x[0], fX1toX3 = x[0], fX2toX3 = x[1];
-    bool bFirstLine = true;
-    bool bTriangleCallDone = false;
-
-    y[0] -= 0.5f;
-    y[1] -= 0.5f;
-    y[2] -= 0.5f;
-    //  y[0]=y[0]*1023.f/1024.f+1.f;
-    //  y[1]=y[1]*1023.f/1024.f+1.f;
-    //  y[2]=y[2]*1023.f/1024.f+1.f;
-
-    for (int yy = (int)floorf(y[0]); yy <= (int)floorf(y[2]); yy++)
-    {
-        float fSubPixelYStart = 0.0f, fSubPixelYEnd = 1.0f;
-        float start, end;
-
-        // first line
-        if (bFirstLine)
-        {
-            fSubPixelYStart = y[0] - floorf(y[0]);
-            start = x[0];
-            end = x[0];
-            bFirstLine = false;
-        }
-        else
-        {
-            // top part without middle corner line
-            if (yy <= (int)floorf(y[1]))
-            {
-                start = (std::min)(fX1toX2, fX1toX3);
-                end = (std::max)(fX1toX2, fX1toX3);
-            }
-            else
-            {
-                start = (std::min)(fX2toX3, fX1toX3);
-                end = (std::max)(fX2toX3, fX1toX3);
-            }
-        }
-
-        // middle corner line
-        if (yy == (int)floorf(y[1]))
-        {
-            fSubPixelYEnd = y[1] - floorf(y[1]);
-
-            fX1toX3 += fX1toX3step * (fSubPixelYEnd - fSubPixelYStart);
-
-            fSubPixelYStart = fSubPixelYEnd;
-            fSubPixelYEnd = 1.0f;
-        }
-
-        // last line
-        if (yy != (int)floorf(y[2]))
-        {
-            // top part without middle corner line
-            if (yy < (int)floorf(y[1]))
-            {
-                fX1toX2 += fX1toX2step * (fSubPixelYEnd - fSubPixelYStart);
-            }
-            else
-            {
-                fX2toX3 += fX2toX3step * (fSubPixelYEnd - fSubPixelYStart);
-            }
-
-            fX1toX3 += fX1toX3step * (fSubPixelYEnd - fSubPixelYStart);
-        }
-
-        if (start != end)
-        {
-            if (yy >= m_iMinY && yy <= m_iMaxY)
-            {
-                if (!bTriangleCallDone)
-                {
-                    inpSink->Triangle(yy);
-                    bTriangleCallDone = true;
-                }
-
-                lambertHorizlineSubpixelCorrect(start, end, yy, inpSink);
-            }
-        }
-    }
-}
-
-
-
-
-// shrink triangle by n pixel, optimizable
-void CSimpleTriangleRasterizer::ShrinkTriangle(float inoutfX[3], float inoutfY[3], float infAmount)
-{
-    float fX[3] = { inoutfX[0], inoutfX[1], inoutfX[2] };
-    float fY[3] = { inoutfY[0], inoutfY[1], inoutfY[2] };
-
-    /*
-    // move edge to opposing vertex
-    float dx,dy,fLength;
-
-    for(int a=0;a<3;a++)
-    {
-        int b=a+1;if(b>=3)b=0;
-        int c=b+1;if(c>=3)c=0;
-
-        dx=fX[a]-(fX[b]+fX[c])*0.5f;
-        dy=fY[a]-(fY[b]+fY[c])*0.5f;
-        fLength=(float)sqrt(dx*dx+dy*dy);
-        if(fLength>1.0f)
-        {
-            dx/=fLength;dy/=fLength;
-            inoutfX[b]+=dx;inoutfY[b]+=dy;
-            inoutfX[c]+=dx;inoutfY[c]+=dy;
-        }
-    }
-    */
-
-    /*
-    // move vertex to opposing edge
-    float dx,dy,fLength;
-
-    for(int a=0;a<3;a++)
-    {
-        int b=a+1;if(b>=3)b=0;
-        int c=b+1;if(c>=3)c=0;
-
-        dx=fX[a]-(fX[b]+fX[c])*0.5f;
-        dy=fY[a]-(fY[b]+fY[c])*0.5f;
-        fLength=(float)sqrt(dx*dx+dy*dy);
-        if(fLength>1.0f)
-        {
-            dx/=fLength;dy/=fLength;
-            inoutfX[a]-=dx;inoutfY[a]-=dy;
-        }
-    }
-    */
-
-    // move vertex to get edges shifted perpendicular for 1 unit
-    for (int a = 0; a < 3; a++)
-    {
-        float dx1, dy1, dx2, dy2, fLength;
-
-        int b = a + 1;
-        if (b >= 3)
-        {
-            b = 0;
-        }
-        int c = b + 1;
-        if (c >= 3)
-        {
-            c = 0;
-        }
-
-        dx1 = fX[b] - fX[a];
-        dy1 = fY[b] - fY[a];
-        fLength = (float)sqrt(dx1 * dx1 + dy1 * dy1);
-        if (infAmount > 0)
-        {
-            if (fLength < infAmount)
-            {
-                continue;
-            }
-        }
-        if (fLength == 0.0f)
-        {
-            continue;
-        }
-        dx1 /= fLength;
-        dy1 /= fLength;
-
-        dx2 = fX[c] - fX[a];
-        dy2 = fY[c] - fY[a];
-        fLength = (float)sqrt(dx2 * dx2 + dy2 * dy2);
-        if (infAmount > 0)
-        {
-            if (fLength < infAmount)
-            {
-                continue;
-            }
-        }
-        if (fLength == 0.0f)
-        {
-            continue;
-        }
-        dx2 /= fLength;
-        dy2 /= fLength;
-
-        inoutfX[a] += (dx1 + dx2) * infAmount;
-        inoutfY[a] += (dy1 + dy2) * infAmount;
-    }
-}
diff --git a/Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.h b/Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.h
deleted file mode 100644
index 2f4aa3abe8..0000000000
--- a/Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_LIGHTMAPCOMPILER_SIMPLETRIANGLERASTERIZER_H
-#define CRYINCLUDE_EDITOR_LIGHTMAPCOMPILER_SIMPLETRIANGLERASTERIZER_H
-#pragma once
-
-class CSimpleTriangleRasterizer
-{
-public:
-
-    class IRasterizeSink
-    {
-    public:
-
-        //! is called once per triangel for the first possible visible line
-        //! /param iniStartY
-        virtual void Triangle([[maybe_unused]] const int iniStartY)
-        {
-        }
-
-        //! callback function
-        //! /param infXLeft included - not clipped against left and reight border
-        //! /param infXRight excluded - not clipped against left and reight border
-        //! /param iniXLeft included
-        //! /param iniXRight excluded
-        //! /param iniY
-        virtual void Line(const float infXLeft, const float infXRight,
-            const int iniXLeft, const int iniXRight, const int iniY) = 0;
-    };
-
-    typedef unsigned long DWORD;
-
-    // -----------------------------------------------------
-
-    //! implementation sink sample
-    class CDWORDFlatFill
-        : public IRasterizeSink
-    {
-    public:
-
-        //! constructor
-        CDWORDFlatFill(DWORD* inpBuffer, const DWORD indwPitchInPixels, DWORD indwValue)
-        {
-            m_dwValue = indwValue;
-            m_pBuffer = inpBuffer;
-            m_dwPitchInPixels = indwPitchInPixels;
-        }
-
-        virtual void Triangle(const int iniY)
-        {
-            m_pBufferLine = &m_pBuffer[iniY * m_dwPitchInPixels];
-        }
-
-        virtual void Line([[maybe_unused]] const float infXLeft, [[maybe_unused]] const float infXRight,
-            const int iniLeft, const int iniRight, [[maybe_unused]] const int iniY)
-        {
-            DWORD* mem = &m_pBufferLine[iniLeft];
-
-            for (int x = iniLeft; x < iniRight; x++)
-            {
-                *mem++ = m_dwValue;
-            }
-
-            m_pBufferLine += m_dwPitchInPixels;
-        }
-
-    private:
-        DWORD m_dwValue;                    //!< fill value
-        DWORD* m_pBufferLine;           //!< to get rid of the multiplication per line
-
-        DWORD m_dwPitchInPixels;    //!< in DWORDS, not in Bytes
-        DWORD* m_pBuffer;                   //!< pointer to the buffer
-    };
-
-    // -----------------------------------------------------
-
-    //! constructor
-    //! /param iniWidth excluded
-    //! /param iniHeight excluded
-    CSimpleTriangleRasterizer(const int iniWidth, const int iniHeight)
-    {
-        m_iMinX = 0;
-        m_iMinY = 0;
-        m_iMaxX = iniWidth - 1;
-        m_iMaxY = iniHeight - 1;
-    }
-    /*
-        //! constructor
-        //! /param iniMinX included
-        //! /param iniMinY included
-        //! /param iniMaxX included
-        //! /param iniMaxY included
-        CSimpleTriangleRasterizer( const int iniMinX, const int iniMinY, const int iniMaxX, const int iniMaxY )
-        {
-            m_iMinX=iniMinX;
-            m_iMinY=iniMinY;
-            m_iMaxX=iniMaxX;
-            m_iMaxY=iniMaxY;
-        }
-    */
-    //! simple triangle filler with clipping (optimizable), not subpixel correct
-    //! /param pBuffer pointer o the color buffer
-    //! /param indwWidth width of the color buffer
-    //! /param indwHeight height of the color buffer
-    //! /param x array of the x coordiantes of the three vertices
-    //! /param y array of the x coordiantes of the three vertices
-    //! /param indwValue value of the triangle
-    void DWORDFlatFill(DWORD* inpBuffer, const DWORD indwPitchInPixels, float x[3], float y[3], DWORD indwValue, bool inbConservative)
-    {
-        CDWORDFlatFill pix(inpBuffer, indwPitchInPixels, indwValue);
-
-        if (inbConservative)
-        {
-            CallbackFillConservative(x, y, &pix);
-        }
-        else
-        {
-            CallbackFillSubpixelCorrect(x, y, &pix);
-        }
-    }
-
-    // Rectangle around triangle - more stable - use for debugging purpose
-    void CallbackFillRectConservative(float x[3], float y[3], IRasterizeSink * inpSink);
-
-
-    //! subpixel correct triangle filler (conservative or not conservative)
-    //! \param pBuffer pointe to the DWORD
-    //! \param indwWidth width of the buffer pBuffer pointes to
-    //! \param indwHeight height of the buffer pBuffer pointes to
-    //! \param x array of the x coordiantes of the three vertices
-    //! \param y array of the x coordiantes of the three vertices
-    //! \param inpSink pointer to the sink interface (is called per triangle and per triangle line)
-    void CallbackFillConservative(float x[3], float y[3], IRasterizeSink * inpSink);
-
-    //! subpixel correct triangle filler (conservative or not conservative)
-    //! \param pBuffer pointe to the DWORD
-    //! \param indwWidth width of the buffer pBuffer pointes to
-    //! \param indwHeight height of the buffer pBuffer pointes to
-    //! \param x array of the x coordiantes of the three vertices
-    //! \param y array of the x coordiantes of the three vertices
-    //! \param inpSink pointer to the sink interface (is called per triangle and per triangle line)
-    void CallbackFillSubpixelCorrect(float x[3], float y[3], IRasterizeSink * inpSink);
-
-    //!
-    //! /param inoutfX
-    //! /param inoutfY
-    //! /param infAmount could be positive or negative
-    static void ShrinkTriangle(float inoutfX[3], float inoutfY[3], float infAmount);
-
-private:
-
-    // Clipping Rect;
-
-    int     m_iMinX;        //!< minimum x value included
-    int     m_iMinY;        //!< minimum y value included
-    int     m_iMaxX;        //!< maximum x value included
-    int     m_iMaxY;        //!< maximum x value included
-
-    void lambertHorizlineConservative(float fx1, float fx2, int y, IRasterizeSink* inpSink);
-    void lambertHorizlineSubpixelCorrect(float fx1, float fx2, int y, IRasterizeSink* inpSink);
-    void CopyAndSortY(const float infX[3], const float infY[3], float outfX[3], float outfY[3]);
-};
-
-
-// extension ideas:
-// * callback with coverage mask (possible non ordered sampling)
-// * z-buffer behaviour
-// * gouraud shading
-// * texture mapping with nearest/bicubic/bilinear filter
-// * further primitives: thick line, ellipse
-// * build a template version
-// *
-
-#endif // CRYINCLUDE_EDITOR_LIGHTMAPCOMPILER_SIMPLETRIANGLERASTERIZER_H
diff --git a/Code/Sandbox/Editor/LogFile.cpp b/Code/Sandbox/Editor/LogFile.cpp
deleted file mode 100644
index 3fea03233d..0000000000
--- a/Code/Sandbox/Editor/LogFile.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation of the CLogFile class.
-
-#include "EditorDefs.h"
-
-#include "LogFile.h"
-
-// Qt
-#include <QTextEdit>
-#include <QScrollBar>
-#include <QListWidget>
-#include <QGuiApplication>
-#include <QScreen>
-
-// Editor
-#include "CryEdit.h"                // for CCryEditApp
-#include "ProcessInfo.h"            // for ProcessMemInfo
-#include "Controls/ConsoleSCB.h"    // for CConsoleSCB
-
-
-#include <stdarg.h>
-
-#if !defined(AZ_PLATFORM_WINDOWS)
-#include <time.h>
-#include <QTime>
-#endif
-
-#if defined(AZ_PLATFORM_MAC)
-#include <mach/clock.h>
-#include <mach/mach.h>
-
-#include <Carbon/Carbon.h>
-#endif
-
-// Static member variables
-SANDBOX_API QListWidget* CLogFile::m_hWndListBox = nullptr;
-SANDBOX_API QTextEdit* CLogFile::m_hWndEditBox = nullptr;
-bool CLogFile::m_bShowMemUsage = false;
-bool CLogFile::m_bIsQuitting = false;
-
-//////////////////////////////////////////////////////////////////////////
-SANDBOX_API void Error(const char* format, ...)
-{
-    va_list ArgList;
-
-    va_start(ArgList, format);
-    ErrorV(format, ArgList);
-    va_end(ArgList);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-SANDBOX_API void ErrorV(const char* format, va_list argList)
-{
-    char        szBuffer[MAX_LOGBUFFER_SIZE];
-    azvsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, format, argList);
-
-    QString str = "####-ERROR-####: ";
-    str += szBuffer;
-
-    //CLogFile::WriteLine( str );
-    CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_ERROR, str.toUtf8().data());
-
-    if (!CCryEditApp::instance()->IsInTestMode() && !CCryEditApp::instance()->IsInExportMode() && !CCryEditApp::instance()->IsInLevelLoadTestMode())
-    {
-        if (gEnv && gEnv->pSystem)
-        {
-            gEnv->pSystem->ShowMessage(szBuffer, "Error", MB_OK | MB_ICONERROR | MB_APPLMODAL);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-SANDBOX_API void Warning(const char* format, ...)
-{
-    va_list ArgList;
-
-    va_start(ArgList, format);
-    WarningV(format, ArgList);
-    va_end(ArgList);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-SANDBOX_API void WarningV(const char* format, va_list argList)
-{
-    char        szBuffer[MAX_LOGBUFFER_SIZE];
-    azvsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, format, argList);
-
-    CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, szBuffer);
-
-    bool bNoUI = false;
-    ICVar* pCVar = gEnv->pConsole->GetCVar("sys_no_crash_dialog");
-    if (pCVar->GetIVal() != 0)
-    {
-        bNoUI = true;
-    }
-
-    if (!CCryEditApp::instance()->IsInTestMode() && !CCryEditApp::instance()->IsInExportMode() && !bNoUI)
-    {
-        if (gEnv && gEnv->pSystem)
-        {
-            gEnv->pSystem->ShowMessage(szBuffer, "Warning", MB_OK | MB_ICONWARNING | MB_APPLMODAL);
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-SANDBOX_API void Log(const char* format, ...)
-{
-    va_list ArgList;
-    va_start(ArgList, format);
-    LogV(format, ArgList);
-    va_end(ArgList);
-}
-
-//////////////////////////////////////////////////////////////////////////
-SANDBOX_API void LogV(const char* format, va_list argList)
-{
-    char        szBuffer[MAX_LOGBUFFER_SIZE];
-    azvsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, format, argList);
-    CLogFile::WriteLine(szBuffer);
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-const char* CLogFile::GetLogFileName()
-{
-    if (gEnv && gEnv->pLog)
-    {
-        // Return the path
-        return gEnv->pLog->GetFileName();
-    }
-    else
-    {
-        return "";
-    }
-}
-
-void CLogFile::AttachListBox(QListWidget* hWndListBox)
-{
-    m_hWndListBox = hWndListBox;
-}
-
-void CLogFile::AttachEditBox(QTextEdit* hWndEditBox)
-{
-    m_hWndEditBox = hWndEditBox;
-}
-
-void CLogFile::FormatLine(const char * format, ...)
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Write a line with printf style formatting
-    ////////////////////////////////////////////////////////////////////////
-
-    va_list ArgList;
-    va_start(ArgList, format);
-    FormatLineV(format, ArgList);
-    va_end(ArgList);
-}
-
-void CLogFile::FormatLineV(const char * format, va_list argList)
-{
-    char szBuffer[MAX_LOGBUFFER_SIZE];
-    azvsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, format, argList);
-    CryLog("%s", szBuffer);
-}
-
-
-void CLogFile::AboutSystem()
-{
-    char szBuffer[MAX_LOGBUFFER_SIZE];
-#if defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
-    //////////////////////////////////////////////////////////////////////
-    // Write the system informations to the log
-    //////////////////////////////////////////////////////////////////////
-
-    char szProfileBuffer[128];
-    char szLanguageBuffer[64];
-    //char szCPUModel[64];
-    MEMORYSTATUS MemoryStatus;
-#endif // defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    DEVMODE DisplayConfig;
-    OSVERSIONINFO OSVerInfo;
-    OSVerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-
-    //////////////////////////////////////////////////////////////////////
-    // Display editor and Windows version
-    //////////////////////////////////////////////////////////////////////
-
-    // Get system language
-    GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_SENGLANGUAGE,
-        szLanguageBuffer, sizeof(szLanguageBuffer));
-
-    // Format and send OS information line
-    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, "Current Language: %s ", szLanguageBuffer);
-    CryLog("%s", szBuffer);
-#else
-    QLocale locale;
-    CryLog("Current Language: %s (%s)", qPrintable(QLocale::languageToString(locale.language())), qPrintable(QLocale::countryToString(locale.country())));
-#endif
-
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    // Format and send OS version line
-    QString str = "Windows ";
-
-AZ_PUSH_DISABLE_WARNING(4996, "-Wunknown-warning-option")
-    GetVersionEx(&OSVerInfo);
-AZ_POP_DISABLE_WARNING
-
-    if (OSVerInfo.dwMajorVersion == 4)
-    {
-        if (OSVerInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-        {
-            if (OSVerInfo.dwMinorVersion > 0)
-            {
-                // Windows 98
-                str += "98";
-            }
-            else
-            {
-                // Windows 95
-                str += "95";
-            }
-        }
-        else
-        {
-            // Windows NT
-            str += "NT";
-        }
-    }
-    else if (OSVerInfo.dwMajorVersion == 5)
-    {
-        if (OSVerInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-        {
-            // Windows Millennium
-            str += "ME";
-        }
-        else
-        {
-            if (OSVerInfo.dwMinorVersion > 0)
-            {
-                // Windows XP
-                str += "XP";
-            }
-            else
-            {
-                // Windows 2000
-                str += "2000";
-            }
-        }
-    }
-    else if (OSVerInfo.dwMajorVersion == 6)
-    {
-        if (OSVerInfo.dwMinorVersion == 0)
-        {
-            // Windows Vista
-            str += "Vista";
-        }
-        else if (OSVerInfo.dwMinorVersion == 1)
-        {
-            // Windows 7
-            str += "7";
-        }
-        else if (OSVerInfo.dwMinorVersion == 2)
-        {
-            // Windows 8
-            str += "8";
-        }
-        else
-        {
-            // Windows unknown (newer than Win8)
-            str += "Version Unknown";
-        }
-    }
-    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, " %d.%d", OSVerInfo.dwMajorVersion, OSVerInfo.dwMinorVersion);
-    str += szBuffer;
-
-    //////////////////////////////////////////////////////////////////////
-    // Show Windows directory
-    //////////////////////////////////////////////////////////////////////
-
-    str += " (";
-    GetWindowsDirectory(szBuffer, sizeof(szBuffer));
-    str += szBuffer;
-    str += ")";
-    CryLog("%s", str.toUtf8().data());
-#elif defined(AZ_PLATFORM_LINUX)
-    // TODO: Add more detail about the current Linux Distro
-    CryLog("Linux");
-#elif AZ_TRAIT_OS_PLATFORM_APPLE
-    QString operatingSystemName;
-    if (QSysInfo::MacintoshVersion >= Q_MV_OSX(10, 12))
-    {
-        operatingSystemName = "macOS ";
-    }
-    else
-    {
-        operatingSystemName = "OS X ";
-    }
-
-    int majorVersion = 0;
-    int minorVersion = 0;
-    AZ_PUSH_DISABLE_WARNING(, "-Wdeprecated-declarations")
-    Gestalt(gestaltSystemVersionMajor, &majorVersion);
-    Gestalt(gestaltSystemVersionMinor, &minorVersion);
-    AZ_POP_DISABLE_WARNING
-
-    CryLog("%s - %d.%d", qPrintable(operatingSystemName), majorVersion, minorVersion);
-#else
-    CryLog("Unknown Operating System");
-#endif
-
-    //////////////////////////////////////////////////////////////////////
-    // Send system time & date
-    //////////////////////////////////////////////////////////////////////
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    str = "Local time is ";
-    azstrtime(szBuffer);
-    str += szBuffer;
-    str += " ";
-    azstrdate(szBuffer);
-    str += szBuffer;
-    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, ", system running for %d minutes", GetTickCount() / 60000);
-    str += szBuffer;
-    CryLog("%s", str.toUtf8().data());
-#else
-    struct timespec ts;
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    clock_serv_t cclock;
-    mach_timespec_t mts;
-    host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock);
-    clock_get_time(cclock, &mts);
-    mach_port_deallocate(mach_task_self(), cclock);
-    ts.tv_sec = mts.tv_sec;
-#else
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-#endif
-    CryLog("Local time is %s, system running for %ld minutes", qPrintable(QTime::currentTime().toString("hh:mm:ss")), ts.tv_sec / 60);
-#endif
-
-    //////////////////////////////////////////////////////////////////////
-    // Send system memory status
-    //////////////////////////////////////////////////////////////////////
-
-#if defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
-    GlobalMemoryStatus(&MemoryStatus);
-    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, "%zdMB phys. memory installed, %zdMB paging available",
-        MemoryStatus.dwTotalPhys / 1048576 + 1,
-        MemoryStatus.dwAvailPageFile / 1048576);
-    CryLog("%s", szBuffer);
-#elif defined(AZ_PLATFORM_LINUX)
-    //KDAB_TODO
-#else
-
-    SInt32 mb = 0, lmb = 0;
-    AZ_PUSH_DISABLE_WARNING(, "-Wdeprecated-declarations")
-    Gestalt(gestaltPhysicalRAMSizeInMegabytes, &mb);
-    Gestalt(gestaltLogicalRAMSize, &lmb);
-    AZ_POP_DISABLE_WARNING
-    CryLog("%dMB phys. memory installed, %dMB paging available", mb, lmb);
-#endif
-
-    //////////////////////////////////////////////////////////////////////
-    // Send display settings
-    //////////////////////////////////////////////////////////////////////
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &DisplayConfig);
-    GetPrivateProfileString("boot.description", "display.drv",
-        "(Unknown graphics card)", szProfileBuffer, sizeof(szProfileBuffer),
-        "system.ini");
-    azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, "Current display mode is %dx%dx%d, %s",
-        DisplayConfig.dmPelsWidth, DisplayConfig.dmPelsHeight,
-        DisplayConfig.dmBitsPerPel, szProfileBuffer);
-    CryLog("%s", szBuffer);
-#else
-    auto screen = QGuiApplication::primaryScreen();
-    if (screen)
-    {
-        CryLog("Current display mode is %dx%dx%d, %s", screen->size().width(), screen->size().height(), screen->depth(), qPrintable(screen->name()));
-    }
-#endif
-
-    //////////////////////////////////////////////////////////////////////
-    // Send input device configuration
-    //////////////////////////////////////////////////////////////////////
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    str = "";
-    // Detect the keyboard type
-    switch (GetKeyboardType(0))
-    {
-    case 1:
-        str = "IBM PC/XT (83-key)";
-        break;
-    case 2:
-        str = "ICO (102-key)";
-        break;
-    case 3:
-        str = "IBM PC/AT (84-key)";
-        break;
-    case 4:
-        str = "IBM enhanced (101/102-key)";
-        break;
-    case 5:
-        str = "Nokia 1050";
-        break;
-    case 6:
-        str = "Nokia 9140";
-        break;
-    case 7:
-        str = "Japanese";
-        break;
-    default:
-        str = "Unknown";
-        break;
-    }
-
-    // Any mouse attached ?
-    if (!GetSystemMetrics(SM_MOUSEPRESENT))
-    {
-        CryLog("%s", (str + " keyboard and no mouse installed").toUtf8().data());
-    }
-    else
-    {
-        azsnprintf(szBuffer, MAX_LOGBUFFER_SIZE, " keyboard and %i+ button mouse installed",
-            GetSystemMetrics(SM_CMOUSEBUTTONS));
-        str += szBuffer;
-        CryLog("%s", str.toUtf8().data());
-    }
-
-    CryLog("--------------------------------------------------------------------------------");
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CLogFile::GetMemUsage()
-{
-    ProcessMemInfo mi;
-    CProcessInfo::QueryMemInfo(mi);
-    int MB = 1024 * 1024;
-
-    QString str;
-    str = QStringLiteral("Memory=%1Mb, Pagefile=%2Mb").arg(mi.WorkingSet / MB).arg(mi.PagefileUsage / MB);
-    //FormatLine( "PeakWorkingSet=%dMb, PeakPagefileUsage=%dMb",pc.PeakWorkingSetSize/MB,pc.PeakPagefileUsage/MB );
-    //FormatLine( "PagedPoolUsage=%d",pc.QuotaPagedPoolUsage/MB );
-    //FormatLine( "NonPagedPoolUsage=%d",pc.QuotaNonPagedPoolUsage/MB );
-
-    return str;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLogFile::WriteLine(const char* pszString)
-{
-    CryLog("%s", pszString);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLogFile::WriteString(const char* pszString)
-{
-    if (gEnv && gEnv->pLog)
-    {
-        gEnv->pLog->LogPlus(pszString);
-    }
-}
-
-static inline QString CopyAndRemoveColorCode(const char* sText)
-{
-    QByteArray ret = sText;      // alloc and copy
-
-    char* s, * d;
-
-    s = ret.data();
-    d = s;
-
-    // remove color code in place
-    while (*s != 0)
-    {
-        if (*s == '$' && *(s + 1) >= '0' && *(s + 1) <= '9')
-        {
-            s += 2;
-            continue;
-        }
-
-        *d++ = *s++;
-    }
-
-    ret.resize(d - ret.data());
-
-    return QString::fromLatin1(ret);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLogFile::OnWriteToConsole(const char* sText, bool bNewLine)
-{
-    if (!gEnv)
-    {
-        return;
-    }
-    //  if (GetIEditor()->IsInGameMode())
-    //  return;
-
-    // Skip any non character.
-    if (*sText != 0 && ((uint8) * sText) < 32)
-    {
-        sText++;
-    }
-
-    // If we have a listbox attached, also output the string to this listbox
-    if (m_hWndListBox)
-    {
-        QString str = CopyAndRemoveColorCode(sText);        // editor prinout doesn't support color coded log messages
-
-        if (m_bShowMemUsage)
-        {
-            str = QString("(") + GetMemUsage() + ")" + str;
-        }
-
-        // Add the string to the listbox
-        m_hWndListBox->addItem(str);
-
-        // Make sure the recently added string is visible
-        m_hWndListBox->scrollToItem(m_hWndListBox->item(m_hWndListBox->count() - 1));
-
-        if (m_hWndEditBox)
-        {
-            static int nCounter = 0;
-            if (nCounter++ > 500)
-            {
-                // Clean Edit box every 500 lines.
-                nCounter = 0;
-                m_hWndEditBox->clear();
-            }
-
-            // remember selection and the top row
-            int len = m_hWndEditBox->document()->toPlainText().length();
-            int top = 0;
-            int from = m_hWndEditBox->textCursor().selectionStart();
-            int to = from + m_hWndEditBox->textCursor().selectionEnd();
-            bool keepPos = false;
-
-            if (from != len || to != len)
-            {
-                keepPos = m_hWndEditBox->hasFocus();
-                if (keepPos)
-                {
-                    top = m_hWndEditBox->verticalScrollBar()->value();
-
-                }
-                QTextCursor cur = m_hWndEditBox->textCursor();
-                cur.setPosition(len);
-                m_hWndEditBox->setTextCursor(cur);
-            }
-            if (bNewLine)
-            {
-                //str = CString("\r\n") + str.TrimLeft();
-                //str = CString("\r\n") + str;
-                //str = CString("\r") + str;
-                str = QString("\r\n") + str;
-                str = str.trimmed();
-            }
-            m_hWndEditBox->textCursor().insertText(str);
-
-            // restore selection and the top line
-            if (keepPos)
-            {
-                QTextCursor cur = m_hWndEditBox->textCursor();
-                cur.setPosition(from);
-                cur.setPosition(to, QTextCursor::KeepAnchor);
-                m_hWndEditBox->setTextCursor(cur);
-                m_hWndEditBox->verticalScrollBar()->setValue(top);
-            }
-        }
-    }
-
-    if (CConsoleSCB::GetCreatedInstance())
-    {
-        QString sOutLine(sText);
-
-        if (gSettings.bShowTimeInConsole)
-        {
-            char sTime[128];
-            time_t ltime;
-            time(&ltime);
-            struct tm today;
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-            localtime_s(&today, &ltime);
-#else
-            today = *localtime(&ltime);
-#endif
-            strftime(sTime, sizeof(sTime), "<%H:%M:%S> ", &today);
-            sOutLine = sTime;
-            sOutLine += sText;
-        }
-
-        CConsoleSCB::GetCreatedInstance()->AddToConsole(sOutLine, bNewLine);
-    }
-    else
-    {
-        // add to intermediate messages until an instance of CConsoleSCB exists
-        CConsoleSCB::AddToPendingLines(sText, bNewLine);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Look for exit messages while writing to the console
-    //////////////////////////////////////////////////////////////////////////
-    if (gEnv && gEnv->pSystem && !gEnv->pSystem->IsQuitting() && !m_bIsQuitting)
-    {
-        if (QCoreApplication::closingDown())
-        {
-            m_bIsQuitting = true;
-            CCryEditApp::instance()->ExitInstance();
-            m_bIsQuitting = false;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLogFile::OnWriteToFile([[maybe_unused]] const char* sText, [[maybe_unused]] bool bNewLine)
-{
-}
diff --git a/Code/Sandbox/Editor/LogFile.h b/Code/Sandbox/Editor/LogFile.h
deleted file mode 100644
index d1952e8798..0000000000
--- a/Code/Sandbox/Editor/LogFile.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_LOGFILE_H
-#define CRYINCLUDE_EDITOR_LOGFILE_H
-
-#pragma once
-
-#include "ILog.h"
-#include <IConsole.h>
-#include <stdarg.h>
-
-#define MAX_LOGBUFFER_SIZE 16384
-
-class QTextEdit;
-class QListWidget;
-
-//struct IConsole;
-//struct ICVar;
-
-//////////////////////////////////////////////////////////////////////////
-// Global log functions.
-//////////////////////////////////////////////////////////////////////////
-
-// the 'v' versions are for when you've already done your unpack, so that we are not forced to truncate the buffer
-
-//! Displays error message.
-SANDBOX_API void Error(const char* format, ...);
-SANDBOX_API void ErrorV(const char* format, va_list argList);
-//! Log to console and file.
-SANDBOX_API void Log(const char* format, ...);
-SANDBOX_API void LogV(const char* format, va_list argList);
-//! Display Warning dialog.
-SANDBOX_API void Warning(const char* format, ...);
-SANDBOX_API void WarningV(const char* format, va_list argList);
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-/*!
- *  CLogFile implements ILog interface.
- */
-class SANDBOX_API CLogFile
-    : public ILogCallback
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    static const char* GetLogFileName();
-    static void AttachListBox(QListWidget* hWndListBox);
-    static void AttachEditBox(QTextEdit* hWndEditBox);
-
-    //! Write to log snapshot of current process memory usage.
-    static QString GetMemUsage();
-
-    static void WriteString(const char* pszString);
-    static void WriteString(const QString& string) { WriteString(string.toUtf8().data()); }
-    static void WriteLine(const char* pszLine);
-    static void WriteLine(const QString& string) { WriteLine(string.toUtf8().data()); }
-    static void FormatLine(const char* pszMessage, ...);
-    static void FormatLineV(const char* pszMessage, va_list argList);
-
-    //////////////////////////////////////////////////////////////////////////
-    // ILogCallback
-    //////////////////////////////////////////////////////////////////////////
-    virtual void OnWrite([[maybe_unused]] const char* sText, [[maybe_unused]] IMiniLog::ELogType type) override {};
-    virtual void OnWriteToConsole(const char* sText, bool bNewLine) override;
-    virtual void OnWriteToFile(const char* sText, bool bNewLine) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    // logs some useful information
-    // should be called after CryLog() is available
-    static void AboutSystem();
-
-private:
-    static void OpenFile();
-
-    // Attached control(s)
-    static QListWidget* m_hWndListBox;
-    static QTextEdit* m_hWndEditBox;
-    static bool m_bShowMemUsage;
-    static bool m_bIsQuitting;
-};
-
-#endif // CRYINCLUDE_EDITOR_LOGFILE_H
diff --git a/Code/Sandbox/Editor/LogFileImpl.cpp b/Code/Sandbox/Editor/LogFileImpl.cpp
deleted file mode 100644
index 5437a5c9aa..0000000000
--- a/Code/Sandbox/Editor/LogFileImpl.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "LogFileImpl.h"
-
-// Interface which we expose via GetIEditor()
-#include "LogFile.h"
-
-const char* CLogFileImpl::GetLogFileName()
-{
-    return CLogFile::GetLogFileName();
-}
-
-QString CLogFileImpl::GetMemUsage()
-{
-    return CLogFile::GetMemUsage();
-}
-
-void CLogFileImpl::WriteString(const char* pszString)
-{
-    CLogFile::WriteString(pszString);
-}
-
-void CLogFileImpl::WriteLine(const char* pszLine)
-{
-    CLogFile::WriteLine(pszLine);
-}
-
-void CLogFileImpl::FormatLine(const char* pszMessage, ...)
-{
-    va_list ArgList;
-    va_start(ArgList, pszMessage);
-    CLogFile::FormatLineV(pszMessage, ArgList);
-    va_end(ArgList);
-}
-
-void CLogFileImpl::AboutSystem()
-{
-    CLogFile::AboutSystem();
-}
-
-void CLogFileImpl::Warning(const char* format, ...)
-{
-    va_list ArgList;
-    va_start(ArgList, format);
-    ::WarningV(format, ArgList);
-    va_end(ArgList);
-}
diff --git a/Code/Sandbox/Editor/LogFileImpl.h b/Code/Sandbox/Editor/LogFileImpl.h
deleted file mode 100644
index 4c7426e8c6..0000000000
--- a/Code/Sandbox/Editor/LogFileImpl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_LOGFILEIMPL_H
-#define CRYINCLUDE_EDITOR_LOGFILEIMPL_H
-#pragma once
-
-#include <Include/ILogFile.h>
-
-class CLogFileImpl
-    : public ILogFile
-{
-public:
-    virtual const char* GetLogFileName() override;
-
-    //! Write to log spanpshot of current process memory usage.
-    virtual QString GetMemUsage() override;
-
-    virtual void WriteString(const char* pszString) override;
-    virtual void WriteLine(const char* pszLine) override;
-    virtual void FormatLine(const char* pszMessage, ...) override;
-
-    // logs some useful information
-    // should be called after CryLog() is available
-    virtual void AboutSystem() override;
-
-    virtual void Warning(const char* format, ...) override;
-};
-
-#endif // CRYINCLUDE_EDITOR_LOGFILEIMPL_H
diff --git a/Code/Sandbox/Editor/LogFile_mac.mm b/Code/Sandbox/Editor/LogFile_mac.mm
deleted file mode 100644
index 1cfbf89abe..0000000000
--- a/Code/Sandbox/Editor/LogFile_mac.mm
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#import <Cocoa/Cocoa.h>
-
-#include <QString>
-
-QString operatingSystemVersionString()
-{
-    NSString* operatingSystemVersionString = [[NSProcessInfo processInfo] operatingSystemVersionString];
-    return QString::fromNSString(operatingSystemVersionString);
-}
-
-QString graphicsCardName()
-{
-    QString name;
-
-    // Get dictionary of all the PCI Devicces
-    CFMutableDictionaryRef matchDict = IOServiceMatching("IOPCIDevice");
-
-    // Create an iterator
-    io_iterator_t iterator;
-
-    if (IOServiceGetMatchingServices(kIOMasterPortDefault,matchDict,
-                                     &iterator) == kIOReturnSuccess)
-    {
-        // Iterator for devices found
-        io_registry_entry_t regEntry;
-
-        while ((regEntry = IOIteratorNext(iterator))) {
-            // Put this services object into a dictionary object.
-            CFMutableDictionaryRef serviceDictionary;
-            if (IORegistryEntryCreateCFProperties(regEntry,
-                                                  &serviceDictionary,
-                                                  kCFAllocatorDefault,
-                                                  kNilOptions) != kIOReturnSuccess)
-            {
-                // Service dictionary creation failed.
-                IOObjectRelease(regEntry);
-                continue;
-            }
-            const void *GPUModel = CFDictionaryGetValue(serviceDictionary, @"model");
-
-            if (GPUModel != nil) {
-                if (CFGetTypeID(GPUModel) == CFDataGetTypeID()) {
-                    // Create a string from the CFDataRef.
-                    NSString *modelName = [[NSString alloc] initWithData:
-                                           (NSData *)GPUModel encoding:NSASCIIStringEncoding];
-
-                    name = QString::fromNSString(modelName);
-                    [modelName release];
-                }
-            }
-            // Release the dictionary
-            CFRelease(serviceDictionary);
-            // Release the serviceObject
-            IOObjectRelease(regEntry);
-        }
-        // Release the iterator
-        IOObjectRelease(iterator);
-    }
-
-    return name;
-}
diff --git a/Code/Sandbox/Editor/LyViewPaneNames.h b/Code/Sandbox/Editor/LyViewPaneNames.h
deleted file mode 100644
index 70d13150d2..0000000000
--- a/Code/Sandbox/Editor/LyViewPaneNames.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-namespace LyViewPane
-{
-    static const char* const CategoryTools = "Tools";
-    static const char* const CategoryOther = "Other";
-    //----
-    static const char* const CategoryEditor = "Editor";
-    static const char* const CategoryViewport = "Viewport";
-
-
-    // Putting these names here so that when view panes are opened
-    // from other areas of Editor code, they still work when the name changes.
-    static const char* const SceneSettings = "Scene Settings (PREVIEW)";
-    static const char* const AssetBrowser = "Asset Browser";
-    static const char* const AssetEditor = "Asset Editor";
-    static const char* const EntityOutliner = "Entity Outliner";
-    static const char* const EntityInspector = "Entity Inspector";
-    static const char* const EntityInspectorPinned = "Pinned Entity Inspector";
-    static const char* const LevelInspector = "Level Inspector";
-    static const char* const ProjectSettingsTool = "Edit Platform Settings...";
-    static const char* const ErrorReport = "Error Report";
-    static const char* const Console = "Console";
-    static const char* const ConsoleMenuName = "&Console";
-    static const char* const ConsoleVariables = "Console Variables";
-    static const char* const TrackView = "Track View";
-    static const char* const ScriptCanvas = "Script Canvas";
-    static const char* const UiEditor = "UI Editor";
-
-    static const char* const EditorSettingsManager = "Editor Settings Manager";
-    static const char* const TerrainEditor = "Terrain Editor";
-    static const char* const TerrainTool = "Terrain Tool";
-    static const char* const TerrainTextureLayers = "Terrain Texture Layers";
-    static const char* const ParticleEditor = "Particle Editor";
-    static const char* const AudioControlsEditor = "Audio Controls Editor";
-    static const char* const SubstanceEditor = "Substance Editor";
-    static const char* const VegetationEditor = "Vegetation Editor";
-    static const char* const LandscapeCanvas = "Landscape Canvas";
-    static const char* const AnimationEditor = "EMotion FX Animation Editor (PREVIEW)";
-    static const char* const PhysXConfigurationEditor = "PhysX Configuration (PREVIEW)";
-
-    static const char* const SliceRelationships = "Slice Relationship View (PREVIEW)";
-
-    const int NO_BUILTIN_ACTION = -1;
-}
-
diff --git a/Code/Sandbox/Editor/MainStatusBar.cpp b/Code/Sandbox/Editor/MainStatusBar.cpp
deleted file mode 100644
index daa9d2c6c2..0000000000
--- a/Code/Sandbox/Editor/MainStatusBar.cpp
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "MainStatusBar.h"
-
-#include <AzCore/Utils/Utils.h>
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/CheckBox.h>
-#include <AzQtComponents/Components/Style.h>
-
-// Qt
-#include <QMenu>
-#include <QStyleOption>
-#include <QStylePainter>
-#include <QTimer>
-#include <QCheckBox>
-#include <QWidgetAction>
-
-// Editor
-#include "MainStatusBarItems.h"
-#include "CryLibrary.h"
-#include "ProcessInfo.h"
-
-
-const int iconTextSpacing = 3;
-const int marginSpacing = 2;
-const int spacerSpacing = 5;
-const int spacerColor = 0x6F6D6D;
-
-StatusBarItem::StatusBarItem(const QString& name, bool isClickable, MainStatusBar* parent, bool hasLeadingSpacer)
-    : QWidget(parent)
-    , m_isClickable(isClickable)
-    , m_hasLeadingSpacer(hasLeadingSpacer)
-{
-    setObjectName(name);
-}
-
-StatusBarItem::StatusBarItem(const QString& name, MainStatusBar* parent, bool hasLeadingSpacer)
-    : StatusBarItem(name, false, parent, hasLeadingSpacer)
-{}
-
-void StatusBarItem::SetText(const QString& text)
-{
-    if (text != m_text)
-    {
-        m_text = text;
-        updateGeometry();
-        update();
-    }
-}
-
-void StatusBarItem::SetIcon(const QPixmap& icon)
-{
-    QIcon origIcon = m_icon;
-
-    if (icon.isNull())
-    {
-        m_icon = icon;
-    }
-    else
-    {
-        // avoid generating new pixmaps if we don't need to.
-        if (icon.height() != 16)
-        {
-            m_icon = icon.scaledToHeight(16);
-        }
-        else
-        {
-            m_icon = icon;
-        }
-    }
-
-    if (icon.isNull() ^ origIcon.isNull())
-    {
-        updateGeometry();
-    }
-
-    // don't generate paintevents unless we absolutely have changed!
-    if (origIcon.cacheKey() != m_icon.cacheKey())
-    {
-        update();
-    }
-}
-
-void StatusBarItem::SetIcon(const QIcon& icon)
-{
-    QIcon origIcon = m_icon;
-
-    m_icon = icon;
-
-    if (icon.isNull() ^ origIcon.isNull())
-    {
-        updateGeometry();
-    }
-
-    // don't generate paintevents unless we absolutely have changed!
-    if (origIcon.cacheKey() != m_icon.cacheKey())
-    {
-        update();
-    }
-}
-
-void StatusBarItem::SetToolTip(const QString& tip)
-{
-    setToolTip(tip);
-}
-
-void StatusBarItem::mousePressEvent(QMouseEvent* e)
-{
-    if (m_isClickable && e->button() == Qt::LeftButton)
-    {
-        emit clicked();
-    }
-}
-
-QSize StatusBarItem::sizeHint() const
-{
-    QSize hint(4, 20);
-    if (!m_icon.isNull())
-    {
-        hint.rwidth() += 16;
-    }
-    if (!m_icon.isNull() && !CurrentText().isEmpty())
-    {
-        hint.rwidth() += iconTextSpacing; //spacing
-    }
-    auto fm = fontMetrics();
-    hint.rwidth() += fm.horizontalAdvance(CurrentText());
-
-    hint.rwidth() += 2 * marginSpacing;
-    hint.rheight() += 2 * marginSpacing;
-
-    hint.rwidth() += m_hasLeadingSpacer ? spacerSpacing : 0;
-
-    return hint;
-}
-
-QSize StatusBarItem::minimumSizeHint() const
-{
-    return sizeHint();
-}
-
-void StatusBarItem::paintEvent([[maybe_unused]] QPaintEvent* pe)
-{
-    QStylePainter painter(this);
-    QStyleOption opt;
-    opt.initFrom(this);
-    painter.drawPrimitive(QStyle::PE_Widget, opt);
-
-    auto rect = contentsRect();
-    rect.adjust(marginSpacing, marginSpacing, -marginSpacing, -marginSpacing);
-
-    QRect textRect = rect;
-    if (m_hasLeadingSpacer)
-    {
-        textRect.adjust(spacerSpacing, 0, 0, 0);
-
-    }
-    if (!CurrentText().isEmpty())
-    {
-        painter.drawItemText(textRect, Qt::AlignLeft | Qt::AlignVCenter, this->palette(), true, CurrentText(), QPalette::WindowText);
-    }
-
-    if (!m_icon.isNull())
-    {
-        auto textWidth = textRect.width();
-        if (textWidth > 0)
-        {
-            textWidth += iconTextSpacing; //margin
-        }
-        QRect iconRect = { textRect.left() + textWidth - textRect.height() - 1, textRect.top() + 2,  textRect.height() - 4, textRect.height() - 4 };
-        m_icon.paint(&painter, iconRect, Qt::AlignCenter);
-    }
-
-    if (m_hasLeadingSpacer)
-    {
-        QPen pen{ spacerColor };
-        painter.setPen(pen);
-        painter.drawLine(spacerSpacing / 2, 3, spacerSpacing / 2, rect.height() + 2);
-    }
-}
-
-QString StatusBarItem::CurrentText() const
-{
-    return m_text;
-}
-
-MainStatusBar* StatusBarItem::StatusBar() const
-{
-    return static_cast<MainStatusBar*>(parentWidget());
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-MainStatusBar::MainStatusBar(QWidget* parent)
-    : QStatusBar(parent)
-{
-    addPermanentWidget(new GeneralStatusItem(QStringLiteral("status"), this), 50);
-
-    addPermanentWidget(new SourceControlItem(QStringLiteral("source_control"), this), 1);
-
-    addPermanentWidget(new StatusBarItem(QStringLiteral("connection"), true, this, true), 1);
-
-    addPermanentWidget(new StatusBarItem(QStringLiteral("game_info"), this, true), 1);
-
-    addPermanentWidget(new MemoryStatusItem(QStringLiteral("memory"), this), 1);
-}
-
-void MainStatusBar::Init()
-{
-    //called on mainwindow initialization
-    const int statusbarTimerUpdateInterval{
-        500
-    };                                             //in ms, so 2 FPS
-
-    AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
-    QString strGameInfo;
-    strGameInfo = tr("GameFolder: '%1'").arg(projectPath.c_str());
-    SetItem(QStringLiteral("game_info"), strGameInfo, tr("Game Info"), QPixmap());
-
-    //ask for updates for items regularly. This is basically what MFC does
-    auto timer = new QTimer(this);
-    timer->setInterval(statusbarTimerUpdateInterval);
-    connect(timer, &QTimer::timeout, this, &MainStatusBar::requestStatusUpdate);
-    timer->start();
-}
-
-void MainStatusBar::SetStatusText(const QString& text)
-{
-    SetItem(QStringLiteral("status"), text, QString(), QPixmap());
-}
-
-QWidget* MainStatusBar::SetItem(QString indicatorName, QString text, QString tip, const QPixmap& icon)
-{
-    auto item = findChild<StatusBarItem*>(indicatorName, Qt::FindDirectChildrenOnly);
-    assert(item);
-
-    item->SetText(text);
-    item->SetToolTip(tip);
-    item->SetIcon(icon);
-
-    return item;
-}
-
-QWidget* MainStatusBar::SetItem(QString indicatorName, QString text, QString tip, int iconId)
-{
-    static std::unordered_map<int, QPixmap> idImages {
-        {
-            IDI_BALL_DISABLED, QPixmap(QStringLiteral(":/statusbar/res/ball_disabled.ico")).scaledToHeight(16)
-        },
-        {
-            IDI_BALL_OFFLINE, QPixmap(QStringLiteral(":/statusbar/res/ball_offline.ico")).scaledToHeight(16)
-        },
-        {
-            IDI_BALL_ONLINE, QPixmap(QStringLiteral(":/statusbar/res/ball_online.ico")).scaledToHeight(16)
-        },
-        {
-            IDI_BALL_PENDING, QPixmap(QStringLiteral(":/statusbar/res/ball_pending.ico")).scaledToHeight(16)
-        }
-    };
-
-    auto search = idImages.find(iconId);
-
-    return SetItem(indicatorName, text, tip, search == idImages.end() ? QPixmap() : search->second);
-}
-
-
-QWidget* MainStatusBar::GetItem(QString indicatorName)
-{
-    return findChild<QWidget*>(indicatorName);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SourceControlItem::SourceControlItem(QString name, MainStatusBar* parent)
-    : StatusBarItem(name, true, parent)
-    , m_sourceControlAvailable(false)
-{
-    if (AzToolsFramework::SourceControlConnectionRequestBus::HasHandlers())
-    {
-        AzToolsFramework::SourceControlNotificationBus::Handler::BusConnect();
-        m_sourceControlAvailable = true;
-    }
-
-    InitMenu();
-    connect(this, &StatusBarItem::clicked, this, &SourceControlItem::UpdateAndShowMenu);
-}
-
-SourceControlItem::~SourceControlItem()
-{
-    AzToolsFramework::SourceControlNotificationBus::Handler::BusDisconnect();
-}
-
-void SourceControlItem::UpdateAndShowMenu()
-{
-    if (m_sourceControlAvailable)
-    {
-        UpdateMenuItems();
-        m_menu->popup(QCursor::pos());
-    }
-}
-
-void SourceControlItem::ConnectivityStateChanged(const AzToolsFramework::SourceControlState state)
-{
-    m_SourceControlState = state;
-    UpdateMenuItems();
-}
-
-void SourceControlItem::InitMenu()
-{
-    m_scIconOk = QIcon(":statusbar/res/source_control_connected.svg");
-    m_scIconError = QIcon(":statusbar/res/source_control_error_v2.svg");
-    m_scIconWarning = QIcon(":statusbar/res/source_control-warning_v2.svg");
-    m_scIconDisabled = QIcon(":statusbar/res/source_control-not_setup.svg");
-
-    if (m_sourceControlAvailable)
-    {
-        m_menu = std::make_unique<QMenu>();
-
-        m_settingsAction = m_menu->addAction(tr("Settings"));
-        m_checkBox = new QCheckBox(m_menu.get());
-        m_checkBox->setText(tr("Enable"));
-        AzQtComponents::CheckBox::applyToggleSwitchStyle(m_checkBox);
-        m_enableAction = new QWidgetAction(m_menu.get());
-        m_enableAction->setDefaultWidget(m_checkBox);
-        m_menu->addAction(m_settingsAction);
-        m_menu->addAction(m_enableAction);
-        AzQtComponents::Style::addClass(m_menu.get(), "SourceControlMenu");
-        m_enableAction->setCheckable(true);
-
-        m_enableAction->setEnabled(true);
-
-        {
-            using namespace AzToolsFramework;
-            m_SourceControlState = SourceControlState::Disabled;
-            SourceControlConnectionRequestBus::BroadcastResult(m_SourceControlState, &SourceControlConnectionRequestBus::Events::GetSourceControlState);
-            UpdateMenuItems();
-        }
-
-        connect(m_settingsAction, &QAction::triggered, this, [&]()
-        {
-            GetIEditor()->GetSourceControl()->ShowSettings();
-        });
-
-        connect(m_checkBox, &QCheckBox::stateChanged, this, [this](int state) {SetSourceControlEnabledState(state); });
-    }
-    else
-    {
-        SetIcon(m_scIconDisabled);
-        SetToolTip(tr("No source control provided"));
-    }
-    SetText("P4V");
-}
-
-void SourceControlItem::SetSourceControlEnabledState(bool state)
-{
-    using SCRequest = AzToolsFramework::SourceControlConnectionRequestBus;
-    SCRequest::Broadcast(&SCRequest::Events::EnableSourceControl, state);
-    m_menu->hide();
-}
-
-void SourceControlItem::UpdateMenuItems()
-{
-    QString toolTip;
-    bool disabled = false;
-    bool errorIcon = false;
-
-    switch (m_SourceControlState)
-    {
-    case AzToolsFramework::SourceControlState::Disabled:
-        toolTip = tr("Perforce disabled");
-        disabled = true;
-        errorIcon = true;
-        break;
-    case AzToolsFramework::SourceControlState::ConfigurationInvalid:
-        errorIcon = true;
-        toolTip = tr("Perforce configuration invalid");
-        break;
-    case AzToolsFramework::SourceControlState::Active:
-        toolTip = tr("Perforce connected");
-        break;
-    }
-
-    m_settingsAction->setEnabled(!disabled);
-    m_checkBox->setChecked(!disabled);
-    m_checkBox->setText(disabled ? tr("Status: Offline") : tr("Status: Online"));
-    SetIcon(errorIcon ? disabled ? m_scIconDisabled : m_scIconWarning : m_scIconOk);
-    SetToolTip(toolTip);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-MemoryStatusItem::MemoryStatusItem(QString name, MainStatusBar* parent)
-    : StatusBarItem(name, parent)
-{
-    connect(parent, &MainStatusBar::requestStatusUpdate, this, &MemoryStatusItem::updateStatus);
-    SetToolTip(tr("Memory usage"));
-}
-
-MemoryStatusItem::~MemoryStatusItem()
-{
-}
-
-void MemoryStatusItem::updateStatus()
-{
-    ProcessMemInfo mi;
-    CProcessInfo::QueryMemInfo(mi);
-
-    uint64 nSizeMb = (uint64)(mi.WorkingSet / (1024 * 1024));
-
-    SetText(QString("%1 Mb").arg(nSizeMb));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-GeneralStatusItem::GeneralStatusItem(QString name, MainStatusBar* parent)
-    : StatusBarItem(name, parent)
-{
-    connect(parent, SIGNAL(messageChanged(QString)), this, SLOT(update()));
-}
-
-QString GeneralStatusItem::CurrentText() const
-{
-    if (!StatusBar()->currentMessage().isEmpty())
-    {
-        return StatusBar()->currentMessage();
-    }
-
-    return StatusBarItem::CurrentText();
-}
-
-#include <moc_MainStatusBar.cpp>
-#include <moc_MainStatusBarItems.cpp>
diff --git a/Code/Sandbox/Editor/MainStatusBar.h b/Code/Sandbox/Editor/MainStatusBar.h
deleted file mode 100644
index f40413f908..0000000000
--- a/Code/Sandbox/Editor/MainStatusBar.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_MAINSTATUSBAR_H
-#define CRYINCLUDE_EDITOR_MAINSTATUSBAR_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "ISourceControl.h"
-#include <QStatusBar>
-#include <QWidget>
-#include <QIcon>
-#endif
-
-class MainStatusBar;
-class QLabel;
-class QString;
-class QPixmap;
-class QTimerEvent;
-class QMenu;
-class QAction;
-
-
-class StatusBarItem
-    : public QWidget
-{
-    Q_OBJECT
-    Q_PROPERTY(bool clickable MEMBER m_isClickable)
-
-public:
-    StatusBarItem(const QString& name, MainStatusBar* parent, bool hasLeadingSpacer = false);
-    StatusBarItem(const QString& name, bool isClickable, MainStatusBar* parent, bool hasLeadingSpacer = false);
-
-    void SetText(const QString& text);
-    void SetIcon(const QPixmap& icon);
-    void SetIcon(const QIcon& icon);
-    void SetToolTip(const QString& tip);
-
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
-
-signals:
-    void clicked();
-
-protected:
-    void mousePressEvent(QMouseEvent* me) override;
-    void paintEvent(QPaintEvent* pe) override;
-
-    virtual QString CurrentText() const;
-    MainStatusBar* StatusBar() const;
-
-private:
-    QIcon m_icon;
-    QString m_text;
-    bool m_isClickable;
-    bool m_hasLeadingSpacer;
-};
-
-class MainStatusBar
-    : public QStatusBar
-    , public IMainStatusBar
-{
-    Q_OBJECT
-public:
-    MainStatusBar(QWidget* parent = nullptr);
-
-    //implement IMainStatusBar interface
-    void SetStatusText(const QString& text) override;
-    QWidget* SetItem(QString indicatorName, QString text, QString tip, int iconId) override;
-    QWidget* GetItem(QString indicatorName) override;
-
-    QWidget* SetItem(QString indicatorName, QString text, QString tip, const QPixmap& icon) override;
-
-    void Init();
-
-signals:
-    void requestStatusUpdate();
-};
-
-
-#endif // CRYINCLUDE_EDITOR_MAINSTATUSBAR_H
diff --git a/Code/Sandbox/Editor/MainStatusBarItems.h b/Code/Sandbox/Editor/MainStatusBarItems.h
deleted file mode 100644
index 04fabcc839..0000000000
--- a/Code/Sandbox/Editor/MainStatusBarItems.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <MainStatusBar.h>
-#include <IRenderer.h>
-#include <QMutex>
-#include <QString>
-#include <QSet>
-
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-
-class GeneralStatusItem
-    : public StatusBarItem
-{
-    Q_OBJECT
-public:
-    GeneralStatusItem(QString name, MainStatusBar* parent);
-
-protected:
-    QString CurrentText() const override;
-};
-
-
-class SourceControlItem
-    : public StatusBarItem
-    , private AzToolsFramework::SourceControlNotificationBus::Handler
-{
-    Q_OBJECT
-public:
-    SourceControlItem(QString name, MainStatusBar* parent);
-    ~SourceControlItem();
-
-    void ConnectivityStateChanged(const AzToolsFramework::SourceControlState state) override;
-
-private:
-    void InitMenu();
-    void UpdateMenuItems();
-    void SetSourceControlEnabledState(bool state);
-    void UpdateAndShowMenu();
-    
-private:
-    std::unique_ptr<QMenu> m_menu;
-    QAction* m_settingsAction;
-    QWidgetAction* m_enableAction;
-    QCheckBox* m_checkBox;
-
-    QIcon m_scIconOk;
-    QIcon m_scIconError;
-    QIcon m_scIconWarning;
-    QIcon m_scIconDisabled;
-    bool m_sourceControlAvailable;
-    AzToolsFramework::SourceControlState m_SourceControlState; 
-};
-
-
-class MemoryStatusItem
-    : public StatusBarItem
-{
-    Q_OBJECT
-public:
-    MemoryStatusItem(QString name, MainStatusBar* parent);
-    ~MemoryStatusItem();
-
-private:
-    void updateStatus();
-};
diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp
deleted file mode 100644
index 05a1a027b0..0000000000
--- a/Code/Sandbox/Editor/MainWindow.cpp
+++ /dev/null
@@ -1,1994 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "MainWindow.h"
-
-#include <algorithm>
-
-// AWs Native SDK
-AZ_PUSH_DISABLE_WARNING(4251 4355 4996, "-Wunknown-warning-option")
-#include <aws/core/auth/AWSCredentialsProvider.h>
-AZ_POP_DISABLE_WARNING
-
-// Qt
-#include <QMenuBar>
-#include <QDebug>
-#include <QMessageBox>
-#include <QInputDialog>
-#include <QHBoxLayout>
-#ifdef Q_OS_WIN
-#include <QAbstractEventDispatcher>
-#endif
-
-// AzCore
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Utils/Utils.h>
-
-// AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
-#include <AzFramework/Network/SocketConnection.h>
-#include <AzFramework/Asset/AssetSystemComponent.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/Application/Ticker.h>
-#include <AzToolsFramework/API/EditorAnimationSystemRequestBus.h>
-#include <AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.h>
-#include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
-
-// AzQtComponents
-#include <AzQtComponents/Buses/ShortcutDispatch.h>
-#include <AzQtComponents/Components/DockMainWindow.h>
-#include <AzQtComponents/Components/Widgets/SpinBox.h>
-#include <AzQtComponents/Components/Style.h>
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-#include <AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h>
-
-// Editor
-#include "Resource.h"
-#include "Core/LevelEditorMenuHandler.h"
-#include "ShortcutDispatcher.h"
-#include "LayoutWnd.h"
-#include "AssetImporter/AssetImporterManager/AssetImporterManager.h"
-#include "AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h"
-#include "CryEdit.h"
-#include "Controls/ConsoleSCB.h"
-#include "ViewManager.h"
-#include "CryEditDoc.h"
-#include "ToolBox.h"
-#include "LevelIndependentFileMan.h"
-#include "GameEngine.h"
-#include "MainStatusBar.h"
-#include "ToolbarCustomizationDialog.h"
-#include "ToolbarManager.h"
-#include "Core/QtEditorApplication.h"
-#include "UndoDropDown.h"
-#include "CVarMenu.h"
-#include "EditorViewportSettings.h"
-
-#include "KeyboardCustomizationSettings.h"
-#include "CustomizeKeyboardDialog.h"
-#include "QtViewPaneManager.h"
-#include "ViewPane.h"
-#include "Include/IObjectManager.h"
-#include "Include/Command.h"
-#include "Commands/CommandManager.h"
-#include "SettingsManagerDialog.h"
-
-#include "TrackView/TrackViewDialog.h"
-#include "ErrorReportDialog.h"
-
-#include "Dialogs/PythonScriptsDialog.h"
-
-#include "AzAssetBrowser/AzAssetBrowserWindow.h"
-#include "AssetEditor/AssetEditorWindow.h"
-#include "ActionManager.h"
-
-using namespace AZ;
-using namespace AzQtComponents;
-using namespace AzToolsFramework;
-
-#define LAYOUTS_PATH "Editor\\Layouts\\"
-#define LAYOUTS_EXTENSION ".layout"
-#define LAYOUTS_WILDCARD "*.layout"
-#define DUMMY_LAYOUT_NAME "Dummy_Layout"
-
-static const char* g_openViewPaneEventName = "OpenViewPaneEvent"; //Sent when users open view panes;
-static const char* g_viewPaneAttributeName = "ViewPaneName"; //Name of the current view pane
-static const char* g_openLocationAttributeName = "OpenLocation"; //Indicates where the current view pane is opened from
-
-static const char* g_assetImporterName = "AssetImporter";
-
-class CEditorOpenViewCommand
-    : public _i_reference_target_t
-{
-    QString m_className;
-public:
-    CEditorOpenViewCommand(IEditor* pEditor, const QString& className)
-        : m_pEditor(pEditor)
-        , m_className(className)
-    {
-        assert(m_pEditor);
-    }
-    void Execute()
-    {
-        // Create browse mode for this category.
-        m_pEditor->OpenView(m_className);
-    }
-
-private:
-    IEditor* m_pEditor;
-};
-
-namespace
-{
-    // The purpose of this vector is just holding shared pointers, so CEditorOpenViewCommand dtors are called at exit
-    std::vector<_smart_ptr<CEditorOpenViewCommand> > s_openViewCmds;
-}
-
-class EngineConnectionListener
-    : public AzFramework::EngineConnectionEvents::Bus::Handler
-    , public AzFramework::AssetSystemInfoBus::Handler
-{
-public:
-    using EConnectionState = AzFramework::SocketConnection::EConnectionState;
-
-public:
-    EngineConnectionListener()
-        : m_state(EConnectionState::Disconnected)
-    {
-        AzFramework::EngineConnectionEvents::Bus::Handler::BusConnect();
-        AzFramework::AssetSystemInfoBus::Handler::BusConnect();
-
-        AzFramework::SocketConnection* engineConnection = AzFramework::SocketConnection::GetInstance();
-        if (engineConnection)
-        {
-            m_state = engineConnection->GetConnectionState();
-        }
-    }
-
-    ~EngineConnectionListener()
-    {
-        AzFramework::AssetSystemInfoBus::Handler::BusDisconnect();
-        AzFramework::EngineConnectionEvents::Bus::Handler::BusDisconnect();
-    }
-
-public:
-    virtual void Connected([[maybe_unused]] AzFramework::SocketConnection* connection)
-    {
-        m_state = EConnectionState::Connected;
-    }
-    virtual void Connecting([[maybe_unused]] AzFramework::SocketConnection* connection)
-    {
-        m_state = EConnectionState::Connecting;
-    }
-    virtual void Listening([[maybe_unused]] AzFramework::SocketConnection* connection)
-    {
-        m_state = EConnectionState::Listening;
-    }
-    virtual void Disconnecting([[maybe_unused]] AzFramework::SocketConnection* connection)
-    {
-        m_state = EConnectionState::Disconnecting;
-    }
-    virtual void Disconnected([[maybe_unused]] AzFramework::SocketConnection* connection)
-    {
-        m_state = EConnectionState::Disconnected;
-    }
-
-    virtual void AssetCompilationSuccess(const AZStd::string& assetPath) override
-    {
-        m_lastAssetProcessorTask = assetPath;
-    }
-
-    virtual void AssetCompilationFailed(const AZStd::string& assetPath) override
-    {
-        m_failedJobs.insert(assetPath);
-    }
-
-    virtual void CountOfAssetsInQueue(const int& count) override
-    {
-        m_pendingJobsCount = count;
-    }
-
-    int GetJobsCount() const
-    {
-        return m_pendingJobsCount;
-    }
-
-    AZStd::set<AZStd::string> FailedJobsList() const
-    {
-        return m_failedJobs;
-    }
-
-    AZStd::string LastAssetProcessorTask() const
-    {
-        return m_lastAssetProcessorTask;
-    }
-
-public:
-    EConnectionState GetState() const
-    {
-        return m_state;
-    }
-
-private:
-    EConnectionState m_state;
-    int m_pendingJobsCount = 0;
-    AZStd::set<AZStd::string> m_failedJobs;
-    AZStd::string m_lastAssetProcessorTask;
-};
-
-namespace
-{
-    void PyOpenViewPane(const char* viewClassName)
-    {
-        QtViewPaneManager::instance()->OpenPane(viewClassName);
-    }
-
-    void PyCloseViewPane(const char* viewClassName)
-    {
-        QtViewPaneManager::instance()->ClosePane(viewClassName);
-    }
-
-    bool PyIsViewPaneVisible(const char* viewClassName)
-    {
-        return QtViewPaneManager::instance()->IsVisible(viewClassName);
-    }
-
-    AZStd::vector<AZStd::string> PyGetViewPaneNames()
-    {
-        const QtViewPanes panes = QtViewPaneManager::instance()->GetRegisteredPanes();
-
-        AZStd::vector<AZStd::string> names;
-        names.reserve(panes.size());
-
-        AZStd::transform(panes.begin(), panes.end(), AZStd::back_inserter(names), [](const QtViewPane& pane)
-        {
-            return AZStd::string(pane.m_name.toUtf8().constData());
-        });
-
-        return names;
-    }
-
-    void PyExit()
-    {
-        // Adding a single-shot QTimer to PyExit delays the QApplication::closeAllWindows call until
-        // all the events in the event queue have been processed. Calling QApplication::closeAllWindows instead
-        // of MainWindow::close ensures the Metal render window is cleaned up on macOS.
-        QTimer::singleShot(0, qApp, &QApplication::closeAllWindows);
-    }
-
-    void PyExitNoPrompt()
-    {
-        // Set the level to "unmodified" so that it doesn't prompt to save on exit.
-        GetIEditor()->GetDocument()->SetModifiedFlag(false);
-        PyExit();
-    }
-
-    void PyReportTest(bool success, const AZStd::string& output)
-    {
-        CCryEditApp::instance()->PrintAlways(output);
-        if (!success)
-        {
-            gEnv->retCode = 0xF; // Special error code indicating a failure in tests
-        }
-        PyExitNoPrompt();
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// MainWindow
-/////////////////////////////////////////////////////////////////////////////
-MainWindow* MainWindow::m_instance = nullptr;
-
-MainWindow::MainWindow(QWidget* parent)
-    : QMainWindow(parent)
-    , m_oldMainFrame(nullptr)
-    , m_viewPaneManager(QtViewPaneManager::instance())
-    , m_shortcutDispatcher(new ShortcutDispatcher(this))
-    , m_actionManager(new ActionManager(this, QtViewPaneManager::instance(), m_shortcutDispatcher))
-    , m_undoStateAdapter(new UndoStackStateAdapter(this))
-    , m_keyboardCustomization(nullptr)
-    , m_activeView(nullptr)
-    , m_settings("amazon", "O3DE") // TODO_KDAB: Replace with a central settings class
-    , m_toolbarManager(new ToolbarManager(m_actionManager, this))
-    , m_assetImporterManager(new AssetImporterManager(this))
-    , m_levelEditorMenuHandler(new LevelEditorMenuHandler(this, m_viewPaneManager, m_settings))
-    , m_sourceControlNotifHandler(new AzToolsFramework::QtSourceControlNotificationHandler(this))
-    , m_viewPaneHost(nullptr)
-    , m_autoSaveTimer(nullptr)
-    , m_autoRemindTimer(nullptr)
-    , m_backgroundUpdateTimer(nullptr)
-    , m_connectionLostTimer(new QTimer(this))
-{
-    setObjectName("MainWindow"); // For IEditor::GetEditorMainWindow to work in plugins, where we can't link against MainWindow::instance()
-    m_instance = this;
-
-    //for new docking, create a DockMainWindow to host dock widgets so we can call QMainWindow::restoreState to restore docks without affecting our main toolbars.
-    m_viewPaneHost = new AzQtComponents::DockMainWindow();
-
-    m_viewPaneHost->setDockOptions(QMainWindow::GroupedDragging | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
-
-    m_connectionListener = AZStd::make_shared<EngineConnectionListener>();
-    QObject::connect(m_connectionLostTimer, &QTimer::timeout, this, &MainWindow::ShowConnectionDisconnectedDialog);
-
-    setStatusBar(new MainStatusBar(this));
-
-    setAttribute(Qt::WA_DeleteOnClose, true);
-
-    connect(m_viewPaneManager, &QtViewPaneManager::viewPaneCreated, this, &MainWindow::OnViewPaneCreated);
-    GetIEditor()->RegisterNotifyListener(this);
-
-    AssetImporterDragAndDropHandler* assetImporterDragAndDropHandler = new AssetImporterDragAndDropHandler(this, m_assetImporterManager);
-    connect(assetImporterDragAndDropHandler, &AssetImporterDragAndDropHandler::OpenAssetImporterManager, this, &MainWindow::OnOpenAssetImporterManager);
-
-    connect(m_levelEditorMenuHandler, &LevelEditorMenuHandler::ActivateAssetImporter, this, [this]() {
-        m_assetImporterManager->Exec();
-    });
-
-    setFocusPolicy(Qt::StrongFocus);
-
-    setAcceptDrops(true);
-
-    // special handling for escape key (outside ActionManager)
-    auto* escapeAction = new QAction(this);
-    escapeAction->setShortcut(QKeySequence(Qt::Key_Escape));
-    addAction(escapeAction);
-    connect(escapeAction, &QAction::triggered, this, &MainWindow::OnEscapeAction);
-
-    const QSize minSize(800, 600);
-    if (size().height() < minSize.height() || size().width() < minSize.width())
-    {
-        resize(size().expandedTo(minSize));
-    }
-}
-
-void MainWindow::SystemTick()
-{
-    AZ::ComponentApplication* componentApplication = nullptr;
-    EBUS_EVENT_RESULT(componentApplication, AZ::ComponentApplicationBus, GetApplication);
-    if (componentApplication)
-    {
-        componentApplication->TickSystem();
-    }
-}
-
-#ifdef Q_OS_WIN
-HWND MainWindow::GetNativeHandle()
-{
-    // if the parent widget is set, it's a window decoration wrapper
-    // we use that instead, to ensure we're in lock step the code in CryEdit.cpp when it calls
-    // InitGameSystem
-    if (parentWidget() != nullptr)
-    {
-        assert(qobject_cast<AzQtComponents::WindowDecorationWrapper*>(parentWidget()));
-        return QtUtil::getNativeHandle(parentWidget());
-    }
-
-    return QtUtil::getNativeHandle(this);
-}
-#endif // #ifdef Q_OS_WIN
-
-void MainWindow::OnOpenAssetImporterManager(const QStringList& dragAndDropFileList)
-{
-    m_assetImporterManager->Exec(dragAndDropFileList);
-}
-
-CLayoutWnd* MainWindow::GetLayout() const
-{
-    return m_pLayoutWnd;
-}
-
-CLayoutViewPane* MainWindow::GetActiveView() const
-{
-    return m_activeView;
-}
-
-QtViewport* MainWindow::GetActiveViewport() const
-{
-    return m_activeView ? qobject_cast<QtViewport*>(m_activeView->GetViewport()) : nullptr;
-}
-
-void MainWindow::SetActiveView(CLayoutViewPane* v)
-{
-    m_activeView = v;
-}
-
-MainWindow::~MainWindow()
-{
-    AzToolsFramework::SourceControlNotificationBus::Handler::BusDisconnect();
-
-    delete m_toolbarManager;
-    m_connectionListener.reset();
-    GetIEditor()->UnregisterNotifyListener(this);
-
-    // tear down the ActionOverride (clear the overrideWidget's parent)
-    ActionOverrideRequestBus::Event(
-        GetEntityContextId(), &ActionOverrideRequests::TeardownActionOverrideHandler);
-
-    m_instance = nullptr;
-}
-
-void MainWindow::InitCentralWidget()
-{
-    m_pLayoutWnd = new CLayoutWnd(&m_settings);
-
-    // Set the central widgets before calling CreateLayout to avoid reparenting everything later
-    setCentralWidget(m_viewPaneHost);
-    m_viewPaneHost->setCentralWidget(m_pLayoutWnd);
-
-    if (MainWindow::instance()->IsPreview())
-    {
-        m_pLayoutWnd->CreateLayout(ET_Layout0, true, ET_ViewportModel);
-    }
-    else
-    {
-        if (!m_pLayoutWnd->LoadConfig())
-        {
-            m_pLayoutWnd->CreateLayout(ET_Layout0);
-        }
-    }
-
-    // make sure the layout wnd knows to reset it's layout and settings
-    connect(m_viewPaneManager, &QtViewPaneManager::layoutReset, m_pLayoutWnd, &CLayoutWnd::ResetLayout);
-
-    EBUS_EVENT(AzToolsFramework::EditorEvents::Bus, NotifyCentralWidgetInitialized);
-}
-
-void MainWindow::Initialize()
-{
-    m_viewPaneManager->SetMainWindow(m_viewPaneHost, &m_settings, /*unused*/ QByteArray());
-
-    RegisterStdViewClasses();
-    InitCentralWidget();
-
-    InitActions();
-
-    // load toolbars ("shelves") and macros
-    GetIEditor()->GetToolBoxManager()->Load(m_actionManager);
-
-    InitToolActionHandlers();
-
-    // Initialize toolbars before we setup the menu so that any tools can be added to the toolbar as needed
-    InitToolBars();
-
-    m_levelEditorMenuHandler->Initialize();
-
-    InitStatusBar();
-
-    AzToolsFramework::SourceControlNotificationBus::Handler::BusConnect();
-    m_sourceControlNotifHandler->Init();
-
-    m_keyboardCustomization = new KeyboardCustomizationSettings(QStringLiteral("Main Window"), this);
-
-    if (!IsPreview())
-    {
-        RegisterOpenWndCommands();
-    }
-
-    ResetBackgroundUpdateTimer();
-
-    ICVar* pBackgroundUpdatePeriod = gEnv->pConsole->GetCVar("ed_backgroundUpdatePeriod");
-    if (pBackgroundUpdatePeriod)
-    {
-        pBackgroundUpdatePeriod->SetOnChangeCallback([](ICVar*) {
-            MainWindow::instance()->ResetBackgroundUpdateTimer();
-        });
-    }
-
-    // setup the ActionOverride (set overrideWidgets parent to be the MainWindow)
-    ActionOverrideRequestBus::Event(
-        GetEntityContextId(), &ActionOverrideRequests::SetupActionOverrideHandler, this);
-
-    AzToolsFramework::EditorEventsBus::Broadcast(&AzToolsFramework::EditorEvents::NotifyMainWindowInitialized, this);
-}
-
-void MainWindow::InitStatusBar()
-{
-    StatusBar()->Init();
-    connect(qobject_cast<StatusBarItem*>(StatusBar()->GetItem("connection")), &StatusBarItem::clicked, this, &MainWindow::OnConnectionStatusClicked);
-    connect(StatusBar(), &MainStatusBar::requestStatusUpdate, this, &MainWindow::OnUpdateConnectionStatus);
-}
-
-
-CMainFrame* MainWindow::GetOldMainFrame() const
-{
-    return m_oldMainFrame;
-}
-
-MainWindow* MainWindow::instance()
-{
-    return m_instance;
-}
-
-void MainWindow::closeEvent(QCloseEvent* event)
-{
-    gSettings.Save();
-
-    AzFramework::SystemCursorState currentCursorState;
-    bool isInGameMode = false;
-    if (GetIEditor()->IsInGameMode())
-    {
-        isInGameMode = true;
-        // Storecurrent state in case we need to restore Game Mode.
-        AzFramework::InputSystemCursorRequestBus::EventResult(currentCursorState, AzFramework::InputDeviceMouse::Id,
-            &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
-        // make sure the mouse is turned on before popping up any dialog boxes.
-        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-            AzFramework::SystemCursorState::UnconstrainedAndVisible);
-    }
-    if (GetIEditor()->GetDocument() && !GetIEditor()->GetDocument()->CanCloseFrame())
-    {
-        if (isInGameMode)
-        {
-            // make sure the mouse is turned back off if returning to the game.
-            AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-                &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-                currentCursorState);
-        }
-        event->ignore();
-        return;
-    }
-
-    KeyboardCustomizationSettings::EnableShortcutsGlobally(true);
-    SaveConfig();
-
-    // Some of the panes may ask for confirmation to save changes before closing.
-    if (!QtViewPaneManager::instance()->ClosePanesWithRollback(QVector<QString>()) ||
-        !GetIEditor() ||
-        !GetIEditor()->GetLevelIndependentFileMan()->PromptChangedFiles())
-    {
-        if (isInGameMode)
-        {
-            // make sure the mouse is turned back off if returning to the game.
-            AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-                &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-                currentCursorState);
-
-        }
-        event->ignore();
-        return;
-    }
-
-    Editor::EditorQtApplication::instance()->EnableOnIdle(false);
-
-    if (GetIEditor()->GetDocument())
-    {
-        GetIEditor()->GetDocument()->SetModifiedFlag(FALSE);
-        GetIEditor()->GetDocument()->SetModifiedModules(eModifiedNothing);
-    }
-    // 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(0, QEvent::DeferredDelete);
-
-    QMainWindow::closeEvent(event);
-}
-
-void MainWindow::SaveConfig()
-{
-    m_settings.setValue("mainWindowState", saveState());
-    QtViewPaneManager::instance()->SaveLayout();
-    if (m_pLayoutWnd)
-    {
-        m_pLayoutWnd->SaveConfig();
-    }
-    GetIEditor()->GetToolBoxManager()->Save();
-}
-
-void MainWindow::ShowKeyboardCustomization()
-{
-    CustomizeKeyboardDialog dialog(*m_keyboardCustomization, this);
-    dialog.exec();
-}
-
-void MainWindow::ExportKeyboardShortcuts()
-{
-    KeyboardCustomizationSettings::ExportToFile(this);
-}
-
-void MainWindow::ImportKeyboardShortcuts()
-{
-    KeyboardCustomizationSettings::ImportFromFile(this);
-    KeyboardCustomizationSettings::SaveGlobally();
-}
-
-void MainWindow::InitActions()
-{
-    auto am = m_actionManager;
-    auto cryEdit = CCryEditApp::instance();
-    cryEdit->RegisterActionHandlers();
-
-    am->AddAction(ID_TOOLBAR_SEPARATOR, QString());
-
-    am->AddAction(ID_TOOLBAR_WIDGET_UNDO, QString());
-    am->AddAction(ID_TOOLBAR_WIDGET_REDO, QString());
-    am->AddAction(ID_TOOLBAR_WIDGET_SNAP_ANGLE, QString());
-    am->AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, QString());
-    am->AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, QString());
-
-    // File actions
-    am->AddAction(ID_FILE_NEW, tr("New Level"))
-        .SetShortcut(tr("Ctrl+N"))
-        .Connect(&QAction::triggered, [cryEdit]()
-        {
-            cryEdit->OnCreateLevel();
-        })
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateNewLevel);
-    am->AddAction(ID_FILE_OPEN_LEVEL, tr("Open Level..."))
-        .SetShortcut(tr("Ctrl+O"))
-        .SetStatusTip(tr("Open an existing level"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateFileOpen);
-#ifdef ENABLE_SLICE_EDITOR
-    am->AddAction(ID_FILE_NEW_SLICE, tr("New Slice"))
-        .SetStatusTip(tr("Create a new slice"));
-    am->AddAction(ID_FILE_OPEN_SLICE, tr("Open Slice..."))
-        .SetStatusTip(tr("Open an existing slice"));
-#endif
-    am->AddAction(ID_FILE_SAVE_SELECTED_SLICE, tr("Save selected slice")).SetShortcut(tr("Alt+S"))
-        .SetStatusTip(tr("Save the selected slice to the first level root"));
-    am->AddAction(ID_FILE_SAVE_SLICE_TO_ROOT, tr("Save Slice to root")).SetShortcut(tr("Ctrl+Alt+S"))
-        .SetStatusTip(tr("Save the selected slice to the top level root"));
-    am->AddAction(ID_FILE_SAVE_LEVEL, tr("&Save"))
-        .SetShortcut(tr("Ctrl+S"))
-        .SetReserved()
-        .SetStatusTip(tr("Save the current level"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateDocumentReady);
-    am->AddAction(ID_FILE_SAVE_AS, tr("Save &As..."))
-        .SetShortcut(tr("Ctrl+Shift+S"))
-        .SetReserved()
-        .SetStatusTip(tr("Save the active document with a new name"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateDocumentReady);
-    am->AddAction(ID_FILE_SAVELEVELRESOURCES, tr("Save Level Resources..."))
-        .SetStatusTip(tr("Save Resources"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateDocumentReady);
-    am->AddAction(ID_IMPORT_ASSET, tr("Import &FBX..."));
-
-    bool usePrefabSystemForLevels = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
-    if (!usePrefabSystemForLevels)
-    {
-        am->AddAction(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE, tr("&Export to Engine"))
-            .SetShortcut(tr("Ctrl+E"))
-            .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateDocumentReady);
-    }
-
-    am->AddAction(ID_FILE_EXPORT_SELECTEDOBJECTS, tr("Export Selected &Objects"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
-    am->AddAction(ID_FILE_EXPORTOCCLUSIONMESH, tr("Export Occlusion Mesh"));
-    am->AddAction(ID_FILE_EDITLOGFILE, tr("Show Log File"));
-    am->AddAction(ID_FILE_RESAVESLICES, tr("Resave All Slices"));
-    am->AddAction(ID_FILE_PROJECT_MANAGER_SETTINGS, tr("Edit Project Settings..."));
-    am->AddAction(ID_FILE_PROJECT_MANAGER_NEW, tr("New Project..."));
-    am->AddAction(ID_FILE_PROJECT_MANAGER_OPEN, tr("Open Project..."));
-    am->AddAction(ID_GAME_PC_ENABLEVERYHIGHSPEC, tr("Very High")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_PC_ENABLEHIGHSPEC, tr("High")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_PC_ENABLEMEDIUMSPEC, tr("Medium")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_PC_ENABLELOWSPEC, tr("Low")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC, tr("Very High")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_OSXMETAL_ENABLEHIGHSPEC, tr("High")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC, tr("Medium")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_OSXMETAL_ENABLELOWSPEC, tr("Low")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_ANDROID_ENABLEVERYHIGHSPEC, tr("Very High")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_ANDROID_ENABLEHIGHSPEC, tr("High")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_ANDROID_ENABLEMEDIUMSPEC, tr("Medium")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_ANDROID_ENABLELOWSPEC, tr("Low")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_IOS_ENABLEVERYHIGHSPEC, tr("Very High")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_IOS_ENABLEHIGHSPEC, tr("High")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_IOS_ENABLEMEDIUMSPEC, tr("Medium")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-    am->AddAction(ID_GAME_IOS_ENABLELOWSPEC, tr("Low")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateGameSpec);
-#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
-#if defined(TOOLS_SUPPORT_JASPER)
-#include AZ_RESTRICTED_FILE_EXPLICIT(MainWindow_cpp, jasper)
-#endif
-#if defined(TOOLS_SUPPORT_PROVO)
-#include AZ_RESTRICTED_FILE_EXPLICIT(MainWindow_cpp, provo)
-#endif
-#if defined(TOOLS_SUPPORT_SALEM)
-#include AZ_RESTRICTED_FILE_EXPLICIT(MainWindow_cpp, salem)
-#endif
-#endif
-    am->AddAction(ID_TOOLS_CUSTOMIZEKEYBOARD, tr("Customize &Keyboard..."))
-        .Connect(&QAction::triggered, this, &MainWindow::ShowKeyboardCustomization);
-    am->AddAction(ID_TOOLS_EXPORT_SHORTCUTS, tr("&Export Keyboard Settings..."))
-        .Connect(&QAction::triggered, this, &MainWindow::ExportKeyboardShortcuts);
-    am->AddAction(ID_TOOLS_IMPORT_SHORTCUTS, tr("&Import Keyboard Settings..."))
-        .Connect(&QAction::triggered, this, &MainWindow::ImportKeyboardShortcuts);
-    am->AddAction(ID_TOOLS_PREFERENCES, tr("Global Preferences..."));
-    am->AddAction(ID_GRAPHICS_SETTINGS, tr("&Graphics Settings..."));
-
-    for (int i = ID_FILE_MRU_FIRST; i <= ID_FILE_MRU_LAST; ++i)
-    {
-        am->AddAction(i, QString());
-    }
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    const QString appExitText = tr("&Quit");
-#else
-    const QString appExitText = tr("E&xit");
-#endif
-
-    am->AddAction(ID_APP_EXIT, appExitText)
-        .SetReserved();
-
-    // Edit actions
-    am->AddAction(ID_UNDO, tr("&Undo"))
-        .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);
-
-    am->AddAction(ID_EDIT_HOLD, tr("&Hold"))
-        .SetShortcut(tr("Ctrl+Alt+H"))
-        .SetToolTip(tr("&Hold (Ctrl+Alt+H)"))
-        .SetStatusTip(tr("Save the current state(Hold)"));
-    am->AddAction(ID_EDIT_FETCH, tr("&Fetch"))
-        .SetShortcut(tr("Ctrl+Alt+F"))
-        .SetToolTip(tr("&Fetch (Ctrl+Alt+F)"))
-        .SetStatusTip(tr("Restore saved state (Fetch)"));
-
-    // Modify actions
-    am->AddAction(ID_EDITMODE_MOVE, tr("Move"))
-        .SetIcon(Style::icon("Move"))
-        .SetApplyHoverEffect()
-        .SetShortcut(tr("1"))
-        .SetToolTip(tr("Move (1)"))
-        .SetCheckable(true)
-        .SetStatusTip(tr("Select and move selected object(s)"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeMove);
-    am->AddAction(ID_EDITMODE_ROTATE, tr("Rotate"))
-        .SetIcon(Style::icon("Translate"))
-        .SetApplyHoverEffect()
-        .SetShortcut(tr("2"))
-        .SetToolTip(tr("Rotate (2)"))
-        .SetCheckable(true)
-        .SetStatusTip(tr("Select and rotate selected object(s)"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeRotate);
-    am->AddAction(ID_EDITMODE_SCALE, tr("Scale"))
-        .SetIcon(Style::icon("Scale"))
-        .SetApplyHoverEffect()
-        .SetShortcut(tr("3"))
-        .SetToolTip(tr("Scale (3)"))
-        .SetCheckable(true)
-        .SetStatusTip(tr("Select and scale selected object(s)"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeScale);
-
-    am->AddAction(ID_SNAP_TO_GRID, tr("Snap to grid"))
-        .SetIcon(Style::icon("Grid"))
-        .SetApplyHoverEffect()
-        .SetShortcut(tr("G"))
-        .SetToolTip(tr("Snap to grid (G)"))
-        .SetStatusTip(tr("Toggles snap to grid"))
-        .SetCheckable(true)
-        .RegisterUpdateCallback([](QAction* action) {
-            Q_ASSERT(action->isCheckable());
-            action->setChecked(SandboxEditor::GridSnappingEnabled());
-        })
-        .Connect(&QAction::triggered, []() { SandboxEditor::SetGridSnapping(!SandboxEditor::GridSnappingEnabled()); });
-
-    am->AddAction(ID_SNAPANGLE, tr("Snap angle"))
-        .SetIcon(Style::icon("Angle"))
-        .SetApplyHoverEffect()
-        .SetStatusTip(tr("Snap angle"))
-        .SetCheckable(true)
-        .RegisterUpdateCallback([](QAction* action) {
-            Q_ASSERT(action->isCheckable());
-            action->setChecked(SandboxEditor::AngleSnappingEnabled());
-        })
-        .Connect(&QAction::triggered, []() { SandboxEditor::SetAngleSnapping(!SandboxEditor::AngleSnappingEnabled()); });
-
-    // Display actions
-    am->AddAction(ID_SWITCHCAMERA_DEFAULTCAMERA, tr("Default Camera")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSwitchToDefaultCamera);
-    am->AddAction(ID_SWITCHCAMERA_SEQUENCECAMERA, tr("Sequence Camera")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSwitchToSequenceCamera);
-    am->AddAction(ID_SWITCHCAMERA_SELECTEDCAMERA, tr("Selected Camera Object")).SetCheckable(true)
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSwitchToSelectedCamera);
-    am->AddAction(ID_SWITCHCAMERA_NEXT, tr("Cycle Camera"))
-        .SetShortcut(tr("Ctrl+`"))
-        .SetToolTip(tr("Cycle Camera (Ctrl+`)"));
-    am->AddAction(ID_DISPLAY_GOTOPOSITION, tr("Go to Position..."));
-    am->AddAction(ID_MODIFY_GOTO_SELECTION, tr("Center on Selection"))
-        .SetShortcut(tr("Z"))
-        .SetToolTip(tr("Center on Selection (Z)"))
-        .Connect(&QAction::triggered, this, &MainWindow::OnGotoSelected);
-    am->AddAction(ID_GOTO_LOC1, tr("Location 1"))
-        .SetShortcut(tr("Shift+F1"))
-        .SetToolTip(tr("Location 1 (Shift+F1)"));
-    am->AddAction(ID_GOTO_LOC2, tr("Location 2"))
-        .SetShortcut(tr("Shift+F2"))
-        .SetToolTip(tr("Location 2 (Shift+F2)"));
-    am->AddAction(ID_GOTO_LOC3, tr("Location 3"))
-        .SetShortcut(tr("Shift+F3"))
-        .SetToolTip(tr("Location 3 (Shift+F3)"));
-    am->AddAction(ID_GOTO_LOC4, tr("Location 4"))
-        .SetShortcut(tr("Shift+F4"))
-        .SetToolTip(tr("Location 4 (Shift+F4)"));
-    am->AddAction(ID_GOTO_LOC5, tr("Location 5"))
-        .SetShortcut(tr("Shift+F5"))
-        .SetToolTip(tr("Location 5 (Shift+F5)"));
-    am->AddAction(ID_GOTO_LOC6, tr("Location 6"))
-        .SetShortcut(tr("Shift+F6"))
-        .SetToolTip(tr("Location 6 (Shift+F6)"));
-    am->AddAction(ID_GOTO_LOC7, tr("Location 7"))
-        .SetShortcut(tr("Shift+F7"))
-        .SetToolTip(tr("Location 7 (Shift+F7)"));
-    am->AddAction(ID_GOTO_LOC8, tr("Location 8"))
-        .SetShortcut(tr("Shift+F8"))
-        .SetToolTip(tr("Location 8 (Shift+F8)"));
-    am->AddAction(ID_GOTO_LOC9, tr("Location 9"))
-        .SetShortcut(tr("Shift+F9"))
-        .SetToolTip(tr("Location 9 (Shift+F9)"));
-    am->AddAction(ID_GOTO_LOC10, tr("Location 10"))
-        .SetShortcut(tr("Shift+F10"))
-        .SetToolTip(tr("Location 10 (Shift+F10)"));
-    am->AddAction(ID_GOTO_LOC11, tr("Location 11"))
-        .SetShortcut(tr("Shift+F11"))
-        .SetToolTip(tr("Location 11 (Shift+F11)"));
-    am->AddAction(ID_GOTO_LOC12, tr("Location 12"))
-        .SetShortcut(tr("Shift+F12"))
-        .SetToolTip(tr("Location 12 (Shift+F12)"));
-    am->AddAction(ID_TAG_LOC1, tr("Location 1"))
-        .SetShortcut(tr("Ctrl+F1"))
-        .SetToolTip(tr("Location 1 (Ctrl+F1)"));
-    am->AddAction(ID_TAG_LOC2, tr("Location 2"))
-        .SetShortcut(tr("Ctrl+F2"))
-        .SetToolTip(tr("Location 2 (Ctrl+F2)"));
-    am->AddAction(ID_TAG_LOC3, tr("Location 3"))
-        .SetShortcut(tr("Ctrl+F3"))
-        .SetToolTip(tr("Location 3 (Ctrl+F3)"));
-    am->AddAction(ID_TAG_LOC4, tr("Location 4"))
-        .SetShortcut(tr("Ctrl+F4"))
-        .SetToolTip(tr("Location 4 (Ctrl+F4)"));
-    am->AddAction(ID_TAG_LOC5, tr("Location 5"))
-        .SetShortcut(tr("Ctrl+F5"))
-        .SetToolTip(tr("Location 5 (Ctrl+F5)"));
-    am->AddAction(ID_TAG_LOC6, tr("Location 6"))
-        .SetShortcut(tr("Ctrl+F6"))
-        .SetToolTip(tr("Location 6 (Ctrl+F6)"));
-    am->AddAction(ID_TAG_LOC7, tr("Location 7"))
-        .SetShortcut(tr("Ctrl+F7"))
-        .SetToolTip(tr("Location 7 (Ctrl+F7)"));
-    am->AddAction(ID_TAG_LOC8, tr("Location 8"))
-        .SetShortcut(tr("Ctrl+F8"))
-        .SetToolTip(tr("Location 8 (Ctrl+F8)"));
-    am->AddAction(ID_TAG_LOC9, tr("Location 9"))
-        .SetShortcut(tr("Ctrl+F9"))
-        .SetToolTip(tr("Location 9 (Ctrl+F9)"));
-    am->AddAction(ID_TAG_LOC10, tr("Location 10"))
-        .SetShortcut(tr("Ctrl+F10"))
-        .SetToolTip(tr("Location 10 (Ctrl+F10)"));
-    am->AddAction(ID_TAG_LOC11, tr("Location 11"))
-        .SetShortcut(tr("Ctrl+F11"))
-        .SetToolTip(tr("Location 11 (Ctrl+F11)"));
-    am->AddAction(ID_TAG_LOC12, tr("Location 12"))
-        .SetShortcut(tr("Ctrl+F12"))
-        .SetToolTip(tr("Location 12 (Ctrl+F12)"));
-
-    if (CViewManager::IsMultiViewportEnabled())
-    {
-        am->AddAction(ID_VIEW_CONFIGURELAYOUT, tr("Configure Layout..."));
-    }
-#ifdef FEATURE_ORTHOGRAPHIC_VIEW
-    am->AddAction(ID_VIEW_CYCLE2DVIEWPORT, tr("Cycle Viewports"))
-        .SetShortcut(tr("Ctrl+Tab"))
-        .SetStatusTip(tr("Cycle 2D Viewport"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateNonGameMode);
-#endif
-    am->AddAction(ID_DISPLAY_SHOWHELPERS, tr("Show/Hide Helpers"))
-        .SetShortcut(tr("Shift+Space"))
-        .SetToolTip(tr("Show/Hide Helpers (Shift+Space)"));
-
-    // Audio actions
-    am->AddAction(ID_SOUND_STOPALLSOUNDS, tr("Stop All Sounds"))
-        .Connect(&QAction::triggered, this, &MainWindow::OnStopAllSounds);
-    am->AddAction(ID_AUDIO_REFRESH_AUDIO_SYSTEM, tr("Refresh Audio"))
-        .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem);
-
-    // Game actions
-    am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play &Game"))
-        .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg"))
-        .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)"))
-        .SetShortcut(tr("Ctrl+Shift+G"))
-        .SetStatusTip(tr("Activate the game input mode (maximized)"))
-        .SetIcon(Style::icon("Play"))
-        .SetApplyHoverEffect()
-        .SetCheckable(true);
-    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)
-        .SetStatusTip(tr("Move Player and Camera Separately"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnSyncPlayerUpdate);
-
-    // Physics actions
-    am->AddAction(ID_PHYSICS_GETPHYSICSSTATE, tr("Get Physics State"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
-    am->AddAction(ID_PHYSICS_RESETPHYSICSSTATE, tr("Reset Physics State"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
-    am->AddAction(ID_PHYSICS_SIMULATEOBJECTS, tr("Simulate Objects"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected);
-
-    // Tools actions
-    am->AddAction(ID_TOOLS_ENABLEFILECHANGEMONITORING, tr("Enable File Change Monitoring"));
-    am->AddAction(ID_CLEAR_REGISTRY, tr("Clear Registry Data"))
-        .SetStatusTip(tr("Clear Registry Data"));
-    am->AddAction(ID_VALIDATELEVEL, tr("&Check Level for Errors"))
-        .SetStatusTip(tr("Validate Level"));
-    am->AddAction(ID_TOOLS_VALIDATEOBJECTPOSITIONS, tr("Check Object Positions"));
-    QAction* saveLevelStatsAction =
-        am->AddAction(ID_TOOLS_LOGMEMORYUSAGE, tr("Save Level Statistics"))
-                .SetStatusTip(tr("Logs Editor memory usage."));
-    if( saveLevelStatsAction )
-    {
-        saveLevelStatsAction->setEnabled(false);
-    }
-    am->AddAction(ID_RESOURCES_REDUCEWORKINGSET, tr("Reduce Working Set"))
-        .SetStatusTip(tr("Reduce Physical RAM Working Set."));
-    am->AddAction(ID_TOOLS_UPDATEPROCEDURALVEGETATION, tr("Update Procedural Vegetation"));
-    am->AddAction(ID_TOOLS_CONFIGURETOOLS, tr("Configure ToolBox Macros..."));
-    am->AddAction(ID_TOOLS_SCRIPTHELP, tr("Script Help"));
-    am->AddAction(ID_TOOLS_LUA_EDITOR, tr("Lua Editor"));
-
-    // View actions
-    am->AddAction(ID_VIEW_OPENVIEWPANE, tr("Open View Pane"));
-    am->AddAction(ID_VIEW_CONSOLEWINDOW, tr(LyViewPane::ConsoleMenuName))
-        .SetShortcut(tr("^"))
-        .SetReserved()
-        .SetStatusTip(tr("Show or hide the console window"))
-        .SetCheckable(true)
-        .Connect(&QAction::triggered, this, &MainWindow::ToggleConsole);
-    am->AddAction(ID_OPEN_QUICK_ACCESS_BAR, tr("Show &Quick Access Bar"))
-        .SetShortcut(tr("Ctrl+Alt+Space"))
-        .SetToolTip(tr("Show &Quick Access Bar (Ctrl+Alt+Space)"));
-
-    // Disable layouts menu
-    if (CViewManager::IsMultiViewportEnabled())
-    {
-        am->AddAction(ID_VIEW_LAYOUTS, tr("Layouts"));
-
-        am->AddAction(ID_VIEW_SAVELAYOUT, tr("Save Layout..."))
-            .Connect(&QAction::triggered, this, &MainWindow::SaveLayout);
-        am->AddAction(ID_VIEW_LAYOUT_LOAD_DEFAULT, tr("Restore Default Layout"))
-            .Connect(&QAction::triggered, [this]() { m_viewPaneManager->RestoreDefaultLayout(true); });
-    }
-
-    am->AddAction(ID_SKINS_REFRESH, tr("Refresh Style"))
-        .SetToolTip(tr("Refreshes the editor stylesheet"))
-        .Connect(&QAction::triggered, this, &MainWindow::RefreshStyle);
-
-    // Help actions
-    am->AddAction(ID_DOCUMENTATION_TUTORIALS, tr("Tutorials"))
-        .SetReserved();
-
-    am->AddAction(ID_DOCUMENTATION_O3DE, tr("Open 3D Engine Documentation"))
-        .SetReserved();
-    am->AddAction(ID_DOCUMENTATION_GAMELIFT, tr("GameLift Documentation"))
-        .SetReserved();
-    am->AddAction(ID_DOCUMENTATION_RELEASENOTES, tr("Release Notes"))
-        .SetReserved();
-
-    am->AddAction(ID_DOCUMENTATION_GAMEDEVBLOG, tr("GameDev Blog"))
-        .SetReserved();
-    am->AddAction(ID_DOCUMENTATION_FORUMS, tr("Forums"))
-        .SetReserved();
-    am->AddAction(ID_DOCUMENTATION_AWSSUPPORT, tr("AWS Support"))
-        .SetReserved();
-
-    am->AddAction(ID_APP_ABOUT, tr("&About O3DE"))
-        .SetStatusTip(tr("Display program information, version number and copyright"))
-        .SetReserved();
-    am->AddAction(ID_APP_SHOW_WELCOME, tr("&Welcome"))
-        .SetStatusTip(tr("Show the Welcome to O3DE dialog box"))
-        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateShowWelcomeScreen);
-
-    // Editors Toolbar actions
-    am->AddAction(ID_OPEN_ASSET_BROWSER, tr("Asset browser"))
-        .SetToolTip(tr("Open Asset Browser"))
-        .SetApplyHoverEffect();
-
-    AZ::EBusReduceResult<bool, AZStd::logical_or<bool>> emfxEnabled(false);
-    using AnimationRequestBus = AzToolsFramework::EditorAnimationSystemRequestsBus;
-    using AnimationSystemType = AzToolsFramework::EditorAnimationSystemRequests::AnimationSystem;
-    AnimationRequestBus::BroadcastResult(emfxEnabled, &AnimationRequestBus::Events::IsSystemActive, AnimationSystemType::EMotionFX);
-    if (emfxEnabled.value)
-    {
-        QAction* action = am->AddAction(ID_OPEN_EMOTIONFX_EDITOR, tr("Animation Editor"))
-            .SetToolTip(tr("Open Animation Editor (PREVIEW)"))
-            .SetIcon(QIcon(":/EMotionFX/EMFX_icon_32x32.png"))
-            .SetApplyHoverEffect();
-        QObject::connect(action, &QAction::triggered, this, []() {
-            QtViewPaneManager::instance()->OpenPane(LyViewPane::AnimationEditor);
-        });
-    }
-
-    am->AddAction(ID_OPEN_AUDIO_CONTROLS_BROWSER, tr("Audio Controls Editor"))
-        .SetToolTip(tr("Open Audio Controls Editor"))
-        .SetIcon(Style::icon("Audio"))
-        .SetApplyHoverEffect();
-
-    am->AddAction(ID_OPEN_UICANVASEDITOR, tr(LyViewPane::UiEditor))
-        .SetToolTip(tr("Open UI Editor"))
-        .SetApplyHoverEffect();
-
-    // Edit Mode Toolbar Actions
-    am->AddAction(IDC_SELECTION_MASK, tr("Selected Object Types"));
-    am->AddAction(ID_REF_COORDS_SYS, tr("Reference coordinate system"))
-        .SetShortcut(tr("Ctrl+W"))
-        .SetToolTip(tr("Reference coordinate system (Ctrl+W)"))
-        .Connect(&QAction::triggered, this, &MainWindow::ToggleRefCoordSys);
-    am->AddAction(IDC_SELECTION, tr("Named Selections"));
-
-    // 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();
-}
-
-void MainWindow::InitToolActionHandlers()
-{
-    ActionManager* am = GetActionManager();
-    CToolBoxManager* tbm = GetIEditor()->GetToolBoxManager();
-    am->RegisterActionHandler(ID_APP_EXIT, [=]() { window()->close(); });
-
-    for (int id = ID_TOOL_FIRST; id <= ID_TOOL_LAST; ++id)
-    {
-        am->RegisterActionHandler(id, [tbm, id] {
-            tbm->ExecuteMacro(id - ID_TOOL_FIRST, true);
-        });
-    }
-
-    for (int id = ID_TOOL_SHELVE_FIRST; id <= ID_TOOL_SHELVE_LAST; ++id)
-    {
-        am->RegisterActionHandler(id, [tbm, id] {
-            tbm->ExecuteMacro(id - ID_TOOL_SHELVE_FIRST, false);
-        });
-    }
-
-    for (int id = CEditorCommandManager::CUSTOM_COMMAND_ID_FIRST; id <= CEditorCommandManager::CUSTOM_COMMAND_ID_LAST; ++id)
-    {
-        am->RegisterActionHandler(id, [id] {
-            GetIEditor()->GetCommandManager()->Execute(id);
-        });
-    }
-}
-
-void MainWindow::OnEscapeAction()
-{
-    if (!CCryEditApp::instance()->IsInAutotestMode())
-    {
-        if (GetIEditor()->IsInGameMode())
-        {
-            GetIEditor()->SetInGameMode(false);
-        }
-        else
-        {
-            AzToolsFramework::EditorEvents::Bus::Broadcast(
-                &AzToolsFramework::EditorEvents::OnEscape);
-        }
-    }
-}
-
-void MainWindow::InitToolBars()
-{
-    m_toolbarManager->LoadToolbars();
-    AdjustToolBarIconSize(static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(gSettings.gui.nToolbarIconSize));
-}
-
-QToolButton* MainWindow::CreateUndoRedoButton(int command)
-{
-    // We do either undo or redo below, sort that out here
-    UndoRedoDirection direction = UndoRedoDirection::Undo;
-    auto stateSignal = &UndoStackStateAdapter::UndoAvailable;
-    if (ID_REDO == command)
-    {
-        direction = UndoRedoDirection::Redo;
-        stateSignal = &UndoStackStateAdapter::RedoAvailable;
-    }
-
-    auto button = new UndoRedoToolButton(this);
-    button->setAutoRaise(true);
-    button->setPopupMode(QToolButton::MenuButtonPopup);
-    button->setDefaultAction(m_actionManager->GetAction(command));
-
-    QMenu* menu = new QMenu(button);
-    auto action = new QWidgetAction(button);
-    auto undoRedo = new CUndoDropDown(direction, button);
-    action->setDefaultWidget(undoRedo);
-    menu->addAction(action);
-    button->setMenu(menu);
-
-    connect(menu, &QMenu::aboutToShow, undoRedo, &CUndoDropDown::Prepare);
-    connect(undoRedo, &CUndoDropDown::accepted, menu, &QMenu::hide);
-    connect(m_undoStateAdapter, stateSignal, button, &UndoRedoToolButton::Update);
-
-    button->setEnabled(false);
-
-    return button;
-}
-
-QWidget* MainWindow::CreateSpacerRightWidget()
-{
-    QWidget* spacer = new QWidget(this);
-    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-    spacer->setVisible(true);
-    return spacer;
-}
-
-UndoRedoToolButton::UndoRedoToolButton(QWidget* parent)
-    : QToolButton(parent)
-{
-}
-
-void UndoRedoToolButton::Update(int count)
-{
-    setEnabled(count > 0);
-}
-
-bool MainWindow::IsPreview() const
-{
-    return GetIEditor()->IsInPreviewMode();
-}
-
-MainStatusBar* MainWindow::StatusBar() const
-{
-    assert(statusBar()->inherits("MainStatusBar"));
-    return static_cast<MainStatusBar*>(statusBar());
-}
-
-KeyboardCustomizationSettings* MainWindow::GetShortcutManager() const
-{
-    return m_keyboardCustomization;
-}
-
-ActionManager* MainWindow::GetActionManager() const
-{
-    return m_actionManager;
-}
-
-void MainWindow::OpenViewPane(int paneId)
-{
-    OpenViewPane(QtViewPaneManager::instance()->GetPane(paneId));
-}
-
-void MainWindow::OpenViewPane(QtViewPane* pane)
-{
-    if (pane && pane->IsValid())
-    {
-        QtViewPaneManager::instance()->OpenPane(pane->m_name);
-    }
-    else
-    {
-        if (pane)
-        {
-            qWarning() << Q_FUNC_INFO << "Invalid pane" << pane->m_id << pane->m_category << pane->m_name;
-        }
-        else
-        {
-            qWarning() << Q_FUNC_INFO << "Invalid pane";
-        }
-    }
-}
-
-void MainWindow::AdjustToolBarIconSize(AzQtComponents::ToolBar::ToolBarIconSize size)
-{
-    const QList<QToolBar*> toolbars = findChildren<QToolBar*>();
-
-    // make sure to set this back, so that the general settings page matches up with what the size is too
-    if (gSettings.gui.nToolbarIconSize != static_cast<int>(size))
-    {
-        gSettings.gui.nToolbarIconSize = static_cast<int>(size);
-    }
-
-    for (auto toolbar : toolbars)
-    {
-        AzQtComponents::ToolBar::setToolBarIconSize(toolbar, size);
-    }
-}
-
-void MainWindow::OnGameModeChanged(bool inGameMode)
-{
-    menuBar()->setDisabled(inGameMode);
-    m_toolbarManager->SetEnabled(!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) };
-    for (auto action : actions)
-    {
-        action->blockSignals(true);
-    }
-
-    for (auto action : actions)
-    {
-        action->setChecked(inGameMode);
-    }
-
-    for (auto action : actions)
-    {
-        action->blockSignals(false);
-    }
-}
-
-void MainWindow::OnEditorNotifyEvent(EEditorNotifyEvent ev)
-{
-    switch (ev)
-    {
-    case eNotify_OnEndSceneOpen:
-    case eNotify_OnEndSceneSave:
-    {
-        auto cryEdit = CCryEditApp::instance();
-        if (cryEdit)
-        {
-            cryEdit->SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), GetIEditor()->GetGameEngine()->GetLevelName());
-        }
-    }
-    break;
-    case eNotify_OnCloseScene:
-    {
-        auto cryEdit = CCryEditApp::instance();
-        if (cryEdit)
-        {
-            cryEdit->SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), 0);
-        }
-    }
-    break;
-    case eNotify_OnRefCoordSysChange:
-        emit UpdateRefCoordSys();
-        break;
-    case eNotify_OnInvalidateControls:
-        InvalidateControls();
-        break;
-    case eNotify_OnBeginGameMode:
-        OnGameModeChanged(true);
-        break;
-    case eNotify_OnEndGameMode:
-        OnGameModeChanged(false);
-        break;
-    // Remove track view option to avoid starting in bad state
-    case eNotify_OnBeginSimulationMode:
-        if (m_actionManager->HasAction(ID_OPEN_TRACKVIEW))
-        {
-            QAction* tvAction = m_actionManager->GetAction(ID_OPEN_TRACKVIEW);
-            if (tvAction)
-            {
-                tvAction->setVisible(false);
-            }
-        }
-        break;
-    case eNotify_OnEndSimulationMode:
-        if (m_actionManager->HasAction(ID_OPEN_TRACKVIEW))
-        {
-            QAction* tvAction = m_actionManager->GetAction(ID_OPEN_TRACKVIEW);
-            if (tvAction)
-            {
-                tvAction->setVisible(true);
-            }
-        }
-        break;
-    }
-
-    switch (ev)
-    {
-    case eNotify_OnBeginSceneOpen:
-    case eNotify_OnBeginNewScene:
-    case eNotify_OnCloseScene:
-        ResetAutoSaveTimers();
-        break;
-    case eNotify_OnEndSceneOpen:
-    case eNotify_OnEndNewScene:
-        ResetAutoSaveTimers(true);
-        break;
-    }
-}
-
-void MainWindow::InvalidateControls()
-{
-    emit UpdateRefCoordSys();
-}
-
-void MainWindow::RegisterStdViewClasses()
-{
-    AzAssetBrowserWindow::createListenerForShowAssetEditorEvent(this);
-
-    CTrackViewDialog::RegisterViewClass();
-    CErrorReportDialog::RegisterViewClass();
-    CPythonScriptsDialog::RegisterViewClass();
-
-    AzToolsFramework::CScriptTermDialog::RegisterViewClass();
-    CConsoleSCB::RegisterViewClass();
-    ConsoleVariableEditor::RegisterViewClass();
-    CSettingsManagerDialog::RegisterViewClass();
-    AzAssetBrowserWindow::RegisterViewClass();
-    AssetEditorWindow::RegisterViewClass();
-
-    // Notify that views can now be registered
-    AzToolsFramework::EditorEvents::Bus::Broadcast(
-        &AzToolsFramework::EditorEvents::Bus::Events::NotifyRegisterViews);
-}
-
-void MainWindow::OnCustomizeToolbar()
-{
-    /* TODO_KDAB, rest of CMainFrm::OnCustomize() goes here*/
-    SaveConfig();
-}
-
-void MainWindow::RefreshStyle()
-{
-    GetIEditor()->Notify(eNotify_OnStyleChanged);
-}
-
-void MainWindow::ResetAutoSaveTimers(bool bForceInit)
-{
-    if (m_autoSaveTimer)
-    {
-        delete m_autoSaveTimer;
-    }
-    if (m_autoRemindTimer)
-    {
-        delete m_autoRemindTimer;
-    }
-    m_autoSaveTimer = 0;
-    m_autoRemindTimer = 0;
-
-    if (bForceInit)
-    {
-        if (gSettings.autoBackupTime > 0 && gSettings.autoBackupEnabled)
-        {
-            m_autoSaveTimer = new QTimer(this);
-            m_autoSaveTimer->start(gSettings.autoBackupTime * 1000 * 60);
-            connect(m_autoSaveTimer, &QTimer::timeout, this, [&]() {
-                if (gSettings.autoBackupEnabled)
-                {
-                    // Call autosave function of CryEditApp
-                    GetIEditor()->GetDocument()->SaveAutoBackup();
-                }
-            });
-        }
-        if (gSettings.autoRemindTime > 0)
-        {
-            m_autoRemindTimer = new QTimer(this);
-            m_autoRemindTimer->start(gSettings.autoRemindTime * 1000 * 60);
-            connect(m_autoRemindTimer, &QTimer::timeout, this, [&]() {
-                if (gSettings.autoRemindTime > 0)
-                {
-                    // Remind to save.
-                    CCryEditApp::instance()->SaveAutoRemind();
-                }
-            });
-        }
-    }
-
-}
-
-void MainWindow::ResetBackgroundUpdateTimer()
-{
-    if (m_backgroundUpdateTimer)
-    {
-        delete m_backgroundUpdateTimer;
-        m_backgroundUpdateTimer = 0;
-    }
-
-    ICVar* pBackgroundUpdatePeriod = gEnv->pConsole->GetCVar("ed_backgroundUpdatePeriod");
-    if (pBackgroundUpdatePeriod && pBackgroundUpdatePeriod->GetIVal() > 0)
-    {
-        m_backgroundUpdateTimer = new QTimer(this);
-        m_backgroundUpdateTimer->start(pBackgroundUpdatePeriod->GetIVal());
-        connect(m_backgroundUpdateTimer, &QTimer::timeout, this, [&]() {
-            // Make sure that visible editor window get low-fps updates while in the background
-
-            CCryEditApp* pApp = CCryEditApp::instance();
-            if (!isMinimized() && !pApp->IsWindowInForeground())
-            {
-                pApp->IdleProcessing(true);
-            }
-        });
-    }
-}
-
-void MainWindow::UpdateToolsMenu()
-{
-     m_levelEditorMenuHandler->UpdateMacrosMenu();
-}
-
-int MainWindow::ViewPaneVersion() const
-{
-    return m_levelEditorMenuHandler->GetViewPaneVersion();
-}
-
-void MainWindow::OnStopAllSounds()
-{
-    Audio::SAudioRequest oStopAllSoundsRequest;
-    Audio::SAudioManagerRequestData<Audio::eAMRT_STOP_ALL_SOUNDS>   oStopAllSoundsRequestData;
-    oStopAllSoundsRequest.pData = &oStopAllSoundsRequestData;
-
-    CryLogAlways("<Audio> Executed \"Stop All Sounds\" command.");
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, oStopAllSoundsRequest);
-}
-
-void MainWindow::OnRefreshAudioSystem()
-{
-    QString sLevelName = GetIEditor()->GetGameEngine()->GetLevelName();
-
-    if (QString::compare(sLevelName, "Untitled", Qt::CaseInsensitive) == 0)
-    {
-        // Rather pass NULL to indicate that no level is loaded!
-        sLevelName = QString();
-    }
-
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::RefreshAudioSystem, sLevelName.toUtf8().data());
-}
-
-void MainWindow::SaveLayout()
-{
-    const int MAX_LAYOUTS = ID_VIEW_LAYOUT_LAST - ID_VIEW_LAYOUT_FIRST + 1;
-
-    if (m_viewPaneManager->LayoutNames(true).count() >= MAX_LAYOUTS)
-    {
-        QMessageBox::critical(this, tr("Maximum number of layouts reached"), tr("Please delete a saved layout before creating another."));
-        return;
-    }
-
-    QString layoutName = QInputDialog::getText(this, tr("Layout Name"), QString()).toLower();
-    if (layoutName.isEmpty())
-    {
-        return;
-    }
-
-    if (m_viewPaneManager->HasLayout(layoutName))
-    {
-        QMessageBox box(this); // Not static so we can remove help button
-        box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-        box.setText(tr("Overwrite Layout?"));
-        box.setIcon(QMessageBox::Warning);
-        box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
-        box.setInformativeText(tr("The chosen layout name already exists. Do you want to overwrite it?"));
-        if (box.exec() != QMessageBox::Yes)
-        {
-            SaveLayout();
-            return;
-        }
-    }
-
-    m_viewPaneManager->SaveLayout(layoutName);
-}
-
-void MainWindow::ViewDeletePaneLayout(const QString& layoutName)
-{
-    if (layoutName.isEmpty())
-    {
-        return;
-    }
-
-    QMessageBox box(this); // Not static so we can remove help button
-    box.setText(tr("Delete Layout?"));
-    box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-    box.setIcon(QMessageBox::Warning);
-    box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    box.setInformativeText(tr("Are you sure you want to delete the layout '%1'?").arg(layoutName));
-    if (box.exec() == QMessageBox::Yes)
-    {
-        m_viewPaneManager->RemoveLayout(layoutName);
-    }
-}
-
-void MainWindow::ViewRenamePaneLayout(const QString& layoutName)
-{
-    if (layoutName.isEmpty())
-    {
-        return;
-    }
-
-    QString newLayoutName;
-    bool validName = false;
-    while (!validName)
-    {
-        newLayoutName = QInputDialog::getText(this, tr("Rename layout '%1'").arg(layoutName), QString());
-        if (newLayoutName.isEmpty())
-        {
-            return;
-        }
-
-        if (m_viewPaneManager->HasLayout(newLayoutName))
-        {
-            QMessageBox box(this); // Not static so we can remove help button
-            box.setText(tr("Layout name already exists"));
-            box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-            box.setIcon(QMessageBox::Warning);
-            box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
-            box.setInformativeText(tr("The layout name '%1' already exists, please choose a different name").arg(newLayoutName));
-            if (box.exec() == QMessageBox::No)
-            {
-                return;
-            }
-        }
-        else
-        {
-            validName = true;
-        }
-    }
-
-    m_viewPaneManager->RenameLayout(layoutName, newLayoutName);
-}
-
-void MainWindow::ViewLoadPaneLayout(const QString& layoutName)
-{
-    if (!layoutName.isEmpty())
-    {
-        m_viewPaneManager->RestoreLayout(layoutName);
-    }
-}
-
-void MainWindow::ViewSavePaneLayout(const QString& layoutName)
-{
-    if (layoutName.isEmpty())
-    {
-        return;
-    }
-
-    QMessageBox box(this); // Not static so we can remove help button
-    box.setText(tr("Overwrite Layout?"));
-    box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-    box.setIcon(QMessageBox::Warning);
-    box.setWindowFlags(box.windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    box.setInformativeText(tr("Do you want to overwrite the layout '%1' with the current one?").arg(layoutName));
-    if (box.exec() == QMessageBox::Yes)
-    {
-        m_viewPaneManager->SaveLayout(layoutName);
-    }
-}
-
-void MainWindow::OnUpdateConnectionStatus()
-{
-    auto* statusBar = StatusBar();
-
-    if (!m_connectionListener)
-    {
-        statusBar->SetItem("connection", tr("Disconnected"), tr("Disconnected"), IDI_BALL_DISABLED);
-        //TODO: disable clicking
-    }
-    else
-    {
-        using EConnectionState = EngineConnectionListener::EConnectionState;
-        int icon = IDI_BALL_OFFLINE;
-        QString tooltip, status;
-        switch (m_connectionListener->GetState())
-        {
-        case EConnectionState::Connecting:
-            // Checking whether we are not connected here instead of disconnect state because this function is called on a timer
-            // and therefore we may not receive the disconnect state.
-            if (m_connectedToAssetProcessor)
-            {
-                m_connectedToAssetProcessor = false;
-                m_showAPDisconnectDialog = true;
-            }
-            tooltip = tr("Connecting to Asset Processor");
-            icon = IDI_BALL_PENDING;
-            break;
-        case EConnectionState::Disconnecting:
-            tooltip = tr("Disconnecting from Asset Processor");
-            icon = IDI_BALL_PENDING;
-            break;
-        case EConnectionState::Listening:
-            if (m_connectedToAssetProcessor)
-            {
-                m_connectedToAssetProcessor = false;
-                m_showAPDisconnectDialog = true;
-            }
-            tooltip = tr("Listening for incoming connections");
-            icon = IDI_BALL_PENDING;
-            break;
-        case EConnectionState::Connected:
-            m_connectedToAssetProcessor = true;
-            tooltip = tr("Connected to Asset Processor");
-            icon = IDI_BALL_ONLINE;
-            break;
-        case EConnectionState::Disconnected:
-            icon = IDI_BALL_OFFLINE;
-            tooltip = tr("Disconnected from Asset Processor");
-            break;
-        }
-
-        if (m_connectedToAssetProcessor)
-        {
-            m_connectionLostTimer->stop();
-        }
-
-        tooltip += "\n Last Asset Processor Task: ";
-        tooltip += m_connectionListener->LastAssetProcessorTask().c_str();
-        tooltip += "\n";
-        AZStd::set<AZStd::string> failedJobs = m_connectionListener->FailedJobsList();
-        int failureCount = failedJobs.size();
-        if (failureCount)
-        {
-            tooltip += "\n Failed Jobs\n";
-            for (auto failedJob : failedJobs)
-            {
-                tooltip += failedJob.c_str();
-                tooltip += "\n";
-            }
-        }
-
-        status = tr("Pending Jobs : %1  Failed Jobs : %2").arg(m_connectionListener->GetJobsCount()).arg(failureCount);
-
-        statusBar->SetItem(QtUtil::ToQString("connection"), status, tooltip, icon);
-
-        if (m_showAPDisconnectDialog && m_connectionListener->GetState() != EConnectionState::Connected)
-        {
-            m_showAPDisconnectDialog = false;// Just show the dialog only once if connection is lost
-            m_connectionLostTimer->setSingleShot(true);
-            m_connectionLostTimer->start(15000);
-        }
-    }
-}
-
-void MainWindow::ShowConnectionDisconnectedDialog()
-{
-    // when REMOTE_ASSET_PROCESSOR is undef'd it means behave as if there is no such thing as the remote asset processor.
-#ifdef REMOTE_ASSET_PROCESSOR
-    if (gEnv && gEnv->pSystem)
-    {
-        QMessageBox messageBox(this);
-        messageBox.setWindowTitle(tr("Asset Processor has disconnected."));
-        messageBox.setText(
-            tr("Asset Processor is not connected. Please try (re)starting the Asset Processor or restarting the Editor.<br><br>"
-                "Data may be lost while the Asset Processor is not running!<br>"
-                "The status of the Asset Processor can be monitored from the editor in the bottom-right corner of the status bar.<br><br>"
-                "Would you like to start the asset processor?<br>"));
-        messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Ignore);
-        messageBox.setDefaultButton(QMessageBox::Yes);
-        messageBox.setIcon(QMessageBox::Critical);
-        if (messageBox.exec() == QMessageBox::Yes)
-        {
-            AzFramework::AssetSystem::LaunchAssetProcessor();
-        }
-    }
-    else
-    {
-        QMessageBox::critical(this, tr("Asset Processor has disconnected."),
-            tr("Asset Processor is not connected. Please try (re)starting the asset processor or restarting the Editor.<br><br>"
-                "Data may be lost while the asset processor is not running!<br>"
-                "The status of the asset processor can be monitored from the editor in the bottom-right corner of the status bar."));
-    }
-#endif
-}
-
-void MainWindow::OnConnectionStatusClicked()
-{
-    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystemRequestBus::Events::ShowAssetProcessor);
-}
-
-static bool paneLessThan(const QtViewPane& v1, const QtViewPane& v2)
-{
-    return v1.m_name.compare(v2.m_name, Qt::CaseInsensitive) < 0;
-}
-
-void MainWindow::RegisterOpenWndCommands()
-{
-    s_openViewCmds.clear();
-
-    auto panes = m_viewPaneManager->GetRegisteredPanes(/* viewPaneMenuOnly=*/ false);
-    std::sort(panes.begin(), panes.end(), paneLessThan);
-
-    for (auto viewPane : panes)
-    {
-        if (viewPane.m_category.isEmpty())
-        {
-            continue;
-        }
-
-        const QString className = viewPane.m_name;
-
-        // Make a open-view command for the class.
-        QString classNameLowered = viewPane.m_name.toLower();
-        classNameLowered.replace(' ', '_');
-        QString openCommandName = "open_";
-        openCommandName += classNameLowered;
-
-        CEditorOpenViewCommand* pCmd = new CEditorOpenViewCommand(GetIEditor(), viewPane.m_name);
-        s_openViewCmds.push_back(pCmd);
-
-        CCommand0::SUIInfo cmdUI;
-        cmdUI.caption = className.toUtf8().data();
-        cmdUI.tooltip = (QString("Open ") + className).toUtf8().data();
-        cmdUI.iconFilename = className.toUtf8().data();
-        GetIEditor()->GetCommandManager()->RegisterUICommand("editor", openCommandName.toUtf8().data(),
-            "", "", AZStd::bind(&CEditorOpenViewCommand::Execute, pCmd), cmdUI);
-        GetIEditor()->GetCommandManager()->GetUIInfo("editor", openCommandName.toUtf8().data(), cmdUI);
-    }
-}
-
-bool MainWindow::event(QEvent* event)
-{
-#ifdef Q_OS_MAC
-    if (event->type() == QEvent::HoverMove)
-    {
-        // this fixes a problem on macOS where the mouse cursor was not
-        // set when hovering over the splitter handles between dock widgets
-        // it might be fixed in future Qt versions
-        auto mouse = static_cast<QHoverEvent*>(event);
-        bool result = QMainWindow::event(event);
-        void setCocoaMouseCursor(QWidget*);
-        setCocoaMouseCursor(childAt(mouse->pos()));
-        return result;
-    }
-#endif
-    return QMainWindow::event(event);
-}
-
-void MainWindow::ToggleConsole()
-{
-    m_viewPaneManager->TogglePane(LyViewPane::Console);
-
-    QtViewPane* pane = m_viewPaneManager->GetPane(LyViewPane::Console);
-    if (!pane)
-    {
-        return;
-    }
-
-    // If we toggled the console on, we want to focus its input text field
-    if (pane->IsVisible())
-    {
-        CConsoleSCB* console = qobject_cast<CConsoleSCB*>(pane->Widget());
-        if (!console)
-        {
-            return;
-        }
-
-        console->SetInputFocus();
-    }
-}
-
-void MainWindow::OnViewPaneCreated(const QtViewPane* pane)
-{
-    QAction* action = nullptr;
-    int id = pane->m_id;
-
-    // Use built-in action id if available
-    if (pane->m_options.builtInActionId != -1)
-    {
-        id = pane->m_options.builtInActionId;
-    }
-
-    if (m_actionManager->HasAction(id))
-    {
-        action = m_actionManager->GetAction(id);
-        action->setChecked(true);
-
-        connect(pane->m_dockWidget->toggleViewAction(), &QAction::toggled,
-            action, &QAction::setChecked, Qt::UniqueConnection);
-    }
-}
-
-void MainWindow::ConnectivityStateChanged(const AzToolsFramework::SourceControlState state)
-{
-    bool connected = false;
-    ISourceControl* pSourceControl = GetIEditor() ? GetIEditor()->GetSourceControl() : nullptr;
-    if (pSourceControl)
-    {
-        pSourceControl->SetSourceControlState(state);
-        if (state == AzToolsFramework::SourceControlState::Active || state == AzToolsFramework::SourceControlState::ConfigurationInvalid)
-        {
-            connected = true;
-        }
-    }
-
-    gSettings.enableSourceControl = connected;
-    gSettings.SaveEnableSourceControlFlag(false);
-}
-
-void MainWindow::OnGotoSelected()
-{
-    AzToolsFramework::EditorRequestBus::Broadcast(&AzToolsFramework::EditorRequestBus::Events::GoToSelectedEntitiesInViewports);
-}
-
-void MainWindow::OnGotoSliceRoot()
-{
-    int numViews = GetIEditor()->GetViewManager()->GetViewCount();
-    for (int i = 0; i < numViews; ++i)
-    {
-        CViewport* viewport = GetIEditor()->GetViewManager()->GetView(i);
-        if (viewport)
-        {
-            viewport->CenterOnSliceInstance();
-        }
-    }
-}
-
-void MainWindow::ShowCustomizeToolbarDialog()
-{
-    if (m_toolbarCustomizationDialog)
-    {
-        return;
-    }
-
-    m_toolbarCustomizationDialog = new ToolbarCustomizationDialog(this);
-    m_toolbarCustomizationDialog->show();
-}
-
-QMenu* MainWindow::createPopupMenu()
-{
-    QMenu* menu = QMainWindow::createPopupMenu();
-    menu->addSeparator();
-    QAction* action = menu->addAction(QStringLiteral("Customize..."));
-    connect(action, &QAction::triggered, this, &MainWindow::ShowCustomizeToolbarDialog);
-    return menu;
-}
-
-ToolbarManager* MainWindow::GetToolbarManager() const
-{
-    return m_toolbarManager;
-}
-
-bool MainWindow::IsCustomizingToolbars() const
-{
-    return m_toolbarCustomizationDialog != nullptr;
-}
-
-QWidget* MainWindow::CreateToolbarWidget(int actionId)
-{
-    QWidgetAction* action = qobject_cast<QWidgetAction*>(m_actionManager->GetAction(actionId));
-    if (!action)
-    {
-        qWarning() << Q_FUNC_INFO << "No QWidgetAction for actionId = " << actionId;
-        return nullptr;
-    }
-
-    QWidget* w = nullptr;
-    switch (actionId)
-    {
-    case ID_TOOLBAR_WIDGET_UNDO:
-        w = CreateUndoRedoButton(ID_UNDO);
-        break;
-    case ID_TOOLBAR_WIDGET_REDO:
-        w = CreateUndoRedoButton(ID_REDO);
-        break;
-    case ID_TOOLBAR_WIDGET_SPACER_RIGHT:
-        w = CreateSpacerRightWidget();
-        break; 
-    default:
-        qWarning() << Q_FUNC_INFO << "Unknown id " << actionId;
-        return nullptr;
-    }
-
-    return w;
-}
-
-
-// don't want to eat escape as if it were a shortcut, as it would eat it for other windows that also care about escape
-// and are reading it as an event rather.
-void MainWindow::keyPressEvent(QKeyEvent* e)
-{
-    // We shouldn't need to do this, as there's already an escape key shortcut set on an action
-    // attached to the MainWindow. We need to explicitly trap the escape key here because when in
-    // Game Mode, all of the actions attached to the MainWindow are disabled.
-    if (e->key() == Qt::Key_Escape)
-    {
-       MainWindow::OnEscapeAction();
-       return;
-    }
-    return QMainWindow::keyPressEvent(e);
-}
-
-void MainWindow::dragEnterEvent(QDragEnterEvent *event)
-{
-    using namespace AzQtComponents;
-    DragAndDropContextBase context;
-    DragAndDropEventsBus::Event(DragAndDropContexts::EditorMainWindow, &DragAndDropEvents::DragEnter, event, context);
-}
-
-void MainWindow::dragMoveEvent(QDragMoveEvent* event)
-{
-    using namespace AzQtComponents;
-    DragAndDropContextBase context;
-    DragAndDropEventsBus::Event(DragAndDropContexts::EditorMainWindow, &DragAndDropEvents::DragMove, event, context);
-}
-
-void MainWindow::dragLeaveEvent(QDragLeaveEvent* event)
-{
-    using namespace AzQtComponents;
-    DragAndDropEventsBus::Event(DragAndDropContexts::EditorMainWindow, &DragAndDropEvents::DragLeave, event);
-}
-
-void MainWindow::dropEvent(QDropEvent *event)
-{
-    using namespace AzQtComponents;
-    DragAndDropContextBase context;
-    DragAndDropEventsBus::Event(DragAndDropContexts::EditorMainWindow, &DragAndDropEvents::Drop, event, context);
-}
-
-bool MainWindow::focusNextPrevChild(bool next)
-{
-    // Don't change the focus when we're in game mode or else the viewport could
-    // stop receiving input events
-    if (GetIEditor()->IsInGameMode())
-    {
-        return false;
-    }
-
-    return QMainWindow::focusNextPrevChild(next);
-}
-
-namespace AzToolsFramework
-{
-    void MainWindowEditorFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.general' module
-            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
-            };
-            addLegacyGeneral(behaviorContext->Method("open_pane", PyOpenViewPane, nullptr, "Opens a view pane specified by the pane class name."));
-            addLegacyGeneral(behaviorContext->Method("close_pane", PyCloseViewPane, nullptr, "Closes a view pane specified by the pane class name."));
-            addLegacyGeneral(behaviorContext->Method("is_pane_visible", PyIsViewPaneVisible, nullptr, "Returns true if pane specified by the pane class name is visible."));
-            addLegacyGeneral(behaviorContext->Method("get_pane_class_names", PyGetViewPaneNames, nullptr, "Get all available class names for use with open_pane & close_pane."));
-            addLegacyGeneral(behaviorContext->Method("exit", PyExit, nullptr, "Exits the editor."));
-            addLegacyGeneral(behaviorContext->Method("exit_no_prompt", PyExitNoPrompt, nullptr, "Exits the editor without prompting to save first."));
-            addLegacyGeneral(behaviorContext->Method("report_test_result", PyReportTest, nullptr, "Report test information."));
-        }
-    }
-}
-
-#include <moc_MainWindow.cpp>
diff --git a/Code/Sandbox/Editor/MainWindow.h b/Code/Sandbox/Editor/MainWindow.h
deleted file mode 100644
index bbabe00739..0000000000
--- a/Code/Sandbox/Editor/MainWindow.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/Component/Component.h>
-
-#include <QComboBox>
-#include <QMainWindow>
-#include <QScopedPointer>
-#include <QSettings>
-#include <QList>
-#include <QPointer>
-#include <QToolButton>
-#include <QTimer>
-
-#include "Include/SandboxAPI.h"
-#include <AzQtComponents/Components/ToolButtonComboBox.h>
-#include <AzQtComponents/Components/Widgets/ToolBar.h>
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-
-#include "IEditor.h"
-#endif
-
-class AssetImporterManager;
-class LevelEditorMenuHandler;
-class CMainFrame;
-class UndoStackStateAdapter;
-class QComboBox;
-class KeyboardCustomizationSettings;
-class QToolButton;
-class MainStatusBar;
-class CLayoutWnd;
-struct QtViewPane;
-class CLayoutViewPane;
-class QtViewport;
-class QtViewPaneManager;
-class EngineConnectionListener;
-class ToolbarManager;
-class ToolbarCustomizationDialog;
-class QWidgetAction;
-class ActionManager;
-class ShortcutDispatcher;
-class CVarMenu;
-
-namespace AzQtComponents
-{
-    class DockMainWindow;
-}
-
-namespace AzToolsFramework
-{
-    class Ticker;
-}
-
-namespace AzToolsFramework
-{
-    class QtSourceControlNotificationHandler;
-}
-
-#define MAINFRM_LAYOUT_NORMAL "NormalLayout"
-#define MAINFRM_LAYOUT_PREVIEW "PreviewLayout"
-
-// Subclassing so we can add slots to our toolbar widgets
-// Using lambdas is crashy since the lamdba doesn't know when the widget is deleted.
-
-class UndoRedoToolButton
-    : public QToolButton
-{
-    Q_OBJECT
-public:
-    explicit UndoRedoToolButton(QWidget* parent);
-public Q_SLOTS:
-    void Update(int count);
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-class SANDBOX_API MainWindow
-    : public QMainWindow
-    , public IEditorNotifyListener
-    , private AzToolsFramework::SourceControlNotificationBus::Handler
-{
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    Q_OBJECT
-
-public:
-    explicit MainWindow(QWidget* parent = nullptr);
-    ~MainWindow();
-
-#ifdef Q_OS_WIN
-    HWND GetNativeHandle();
-#endif // #ifdef Q_OS_WIN
-
-    ActionManager* GetActionManager() const;
-
-    void Initialize();
-
-    // Returns the old and original main frame which we're porting away from.
-    // ActionManager still needs it, to SendMessage() to it.
-    CMainFrame* GetOldMainFrame() const;
-
-    bool IsPreview() const;
-
-    // The singleton is just a hack for now, it should be removed once everything
-    // is ported to Qt.
-    static MainWindow* instance();
-
-    MainStatusBar* StatusBar() const;
-    CLayoutWnd* GetLayout() const;
-
-    KeyboardCustomizationSettings* GetShortcutManager() const;
-    ToolbarManager* GetToolbarManager() const;
-
-    void OpenViewPane(int paneId);
-    void OpenViewPane(QtViewPane* pane);
-
-    void SetActiveView(CLayoutViewPane* vp);
-
-    QMenu* createPopupMenu() override;
-    bool IsCustomizingToolbars() const;
-
-    /**
-     * Returns the active view layout (Perspective, Top, Bottom, or Left, etc).
-     * This particularly useful when in multi-layout mode, it represents the default viewport to use
-     * when needing to interact with one.
-     * When the user gives mouse focus to a viewport it becomes the active one, when unfocusing it
-     * however, it remains the active one, unless another viewport got focus.
-     */
-    CLayoutViewPane* GetActiveView() const;
-    QtViewport* GetActiveViewport() const;
-
-    void AdjustToolBarIconSize(AzQtComponents::ToolBar::ToolBarIconSize size);
-    void InvalidateControls();
-    void OnCustomizeToolbar();
-    void SaveConfig();
-    void RefreshStyle();
-
-    //! Reset timers used for auto saving.
-    void ResetAutoSaveTimers(bool bForceInit = false);
-    void ResetBackgroundUpdateTimer();
-
-    void UpdateToolsMenu();
-
-    int ViewPaneVersion() const;
-
-    LevelEditorMenuHandler* GetLevelEditorMenuHandler() { return m_levelEditorMenuHandler; }
-
-    bool event(QEvent* event) override;
-
-    void OnGotoSliceRoot();
-Q_SIGNALS:
-    void ToggleRefCoordSys();
-    void UpdateRefCoordSys();
-    void DeleteSelection();
-
-protected:
-    void OnEditorNotifyEvent(EEditorNotifyEvent ev) override;
-    void closeEvent(QCloseEvent* event) override;
-    void keyPressEvent(QKeyEvent* e) override;
-
-    void dragEnterEvent(QDragEnterEvent *event) override;
-    void dragMoveEvent(QDragMoveEvent* event) override;
-    void dragLeaveEvent(QDragLeaveEvent* event) override;
-    void dropEvent(QDropEvent *event) override;
-
-    bool focusNextPrevChild(bool next) override;
-
-private:
-    void OnGameModeChanged(bool inGameMode);
-    QWidget* CreateToolbarWidget(int id);
-    void ShowCustomizeToolbarDialog();
-    void OnGotoSelected();
-
-    void ToggleConsole();
-    void RegisterOpenWndCommands();
-    void InitCentralWidget();
-    void InitActions();
-    void InitToolActionHandlers();
-    void InitToolBars();
-    void InitStatusBar();
-    void OnViewPaneCreated(const QtViewPane* pane);
-
-    template <class TValue>
-    void ReadConfigValue(const QString& key, TValue& value)
-    {
-        value = m_settings.value(key, value).template value<TValue>();
-    }
-
-    // AzToolsFramework::SourceControlNotificationBus::Handler:
-    void ConnectivityStateChanged(const AzToolsFramework::SourceControlState state) override;
-
-    QWidget* CreateSpacerRightWidget();
-
-    QToolButton* CreateUndoRedoButton(int command);
-
-private Q_SLOTS:
-    void ShowKeyboardCustomization();
-    void ExportKeyboardShortcuts();
-    void ImportKeyboardShortcuts();
-    void OnStopAllSounds();
-    void OnRefreshAudioSystem();
-    void SaveLayout();
-    void ViewDeletePaneLayout(const QString& layoutName);
-    void ViewRenamePaneLayout(const QString& layoutName);
-    void ViewLoadPaneLayout(const QString& layoutName);
-    void ViewSavePaneLayout(const QString& layoutName);
-    void OnConnectionStatusClicked();
-    void OnUpdateConnectionStatus();
-    void ShowConnectionDisconnectedDialog();
-    void OnEscapeAction();
-
-    void OnOpenAssetImporterManager(const QStringList& list);
-
-private:
-    bool IsGemEnabled(const QString& uuid, const QString& version) const;
-
-    // Broadcast the SystemTick event
-    void SystemTick();
-
-    QStringList coordSysList() const;
-    void RegisterStdViewClasses();
-    CMainFrame* m_oldMainFrame;
-    QtViewPaneManager* m_viewPaneManager;
-    ShortcutDispatcher* m_shortcutDispatcher = nullptr;
-    ActionManager* m_actionManager = nullptr;
-    UndoStackStateAdapter* m_undoStateAdapter;
-
-    KeyboardCustomizationSettings* m_keyboardCustomization;
-    CLayoutViewPane* m_activeView;
-    QSettings m_settings;
-    ToolbarManager* const m_toolbarManager;
-
-    AssetImporterManager* m_assetImporterManager;
-    LevelEditorMenuHandler* m_levelEditorMenuHandler;
-
-    CLayoutWnd* m_pLayoutWnd;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    AZStd::shared_ptr<EngineConnectionListener> m_connectionListener;
-    QTimer* m_connectionLostTimer;
-
-    QPointer<ToolbarCustomizationDialog> m_toolbarCustomizationDialog;
-    QScopedPointer<AzToolsFramework::QtSourceControlNotificationHandler> m_sourceControlNotifHandler;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    static MainWindow* m_instance;
-
-    AzQtComponents::DockMainWindow* m_viewPaneHost;
-
-    QTimer* m_autoSaveTimer;
-    QTimer* m_autoRemindTimer;
-    QTimer* m_backgroundUpdateTimer;
-
-    bool m_connectedToAssetProcessor = false;
-    bool m_showAPDisconnectDialog = false;
-    bool m_selectedEntityHasRoot = false;
-
-    friend class ToolbarManager;
-    friend class WidgetAction;
-    friend class LevelEditorMenuHandler;
-};
-
-namespace AzToolsFramework
-{
-    //! A component to reflect scriptable commands for MainWindow
-    class MainWindowEditorFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(MainWindowEditorFuncsHandler, "{C879102B-C767-4349-8F06-B69119CAC462}")
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-} // namespace AZ
diff --git a/Code/Sandbox/Editor/MainWindow_mac.mm b/Code/Sandbox/Editor/MainWindow_mac.mm
deleted file mode 100644
index 19d62295ee..0000000000
--- a/Code/Sandbox/Editor/MainWindow_mac.mm
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#import <Cocoa/Cocoa.h>
-
-#include <QWidget>
-
-void setCocoaMouseCursor(QWidget* widget)
-{
-    if (widget == nullptr)
-    {
-        // no widget, default cursor
-        [[NSCursor arrowCursor] set];
-    }
-    else
-    {
-        // otherwhise activate the Cocoa mouse
-        // cursor matching the one set via Qt
-        switch (widget->cursor().shape())
-        {
-        case Qt::ArrowCursor:
-            [[NSCursor arrowCursor] set];
-            break;
-        case Qt::SizeHorCursor:
-        case Qt::SplitVCursor:
-            [[NSCursor resizeUpDownCursor] set];
-            break;
-        case Qt::SizeVerCursor:
-        case Qt::SplitHCursor:
-            [[NSCursor resizeLeftRightCursor] set];
-            break;
-        default:
-            // for all other cursors we do nothing
-            // since this is only to fix the splitter handle cursors for now
-            break;
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/NewLevelDialog.cpp b/Code/Sandbox/Editor/NewLevelDialog.cpp
deleted file mode 100644
index dab7a3f341..0000000000
--- a/Code/Sandbox/Editor/NewLevelDialog.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "NewLevelDialog.h"
-
-// Qt
-#include <QtWidgets/QPushButton>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QTimer>
-#include <QToolButton>
-
-// Editor
-#include "NewTerrainDialog.h"  
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_NewLevelDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-// Folder in which levels are stored
-static const char kNewLevelDialog_LevelsFolder[] = "Levels";
-
-class LevelFolderValidator : public QValidator
-{
-public:
-    LevelFolderValidator(QObject* parent)
-        : QValidator(parent)
-    {
-        m_parentDialog = qobject_cast<CNewLevelDialog*>(parent);
-    }
-
-    QValidator::State validate([[maybe_unused]] QString& input, [[maybe_unused]] int& pos) const override
-    {
-        if (m_parentDialog->ValidateLevel())
-        {
-            return QValidator::Acceptable;
-        }
-
-        return QValidator::Intermediate;
-    }
-
-private:
-    CNewLevelDialog* m_parentDialog;
-};
-
-// CNewLevelDialog dialog
-
-CNewLevelDialog::CNewLevelDialog(QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_bUpdate(false)
-    , ui(new Ui::CNewLevelDialog)
-    , m_initialized(false)
-{
-    ui->setupUi(this);
-
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    setWindowTitle(tr("New Level"));
-    setMaximumSize(QSize(320, 180));
-    adjustSize();
-
-    m_bIsResize = false;
-
-    
-    ui->TITLE->setText(tr("Assign a name and location to the new level."));
-    ui->STATIC1->setText(tr("Location:"));
-    ui->STATIC2->setText(tr("Name:"));
-
-    // Level name only supports ASCII characters
-    QRegExp rx("[_a-zA-Z0-9-]+");
-    QValidator* validator = new QRegExpValidator(rx, this);
-    ui->LEVEL->setValidator(validator);
-
-    validator = new LevelFolderValidator(this);
-    ui->LEVEL_FOLDERS->lineEdit()->setValidator(validator);
-    ui->LEVEL_FOLDERS->setErrorToolTip(
-        QString("The location must be a folder underneath the current project's %1 folder. (%2)")
-            .arg(kNewLevelDialog_LevelsFolder)
-            .arg(GetLevelsFolder()));
-
-    ui->LEVEL_FOLDERS->setClearButtonEnabled(true);
-    QToolButton* clearButton = AzQtComponents::LineEdit::getClearButton(ui->LEVEL_FOLDERS->lineEdit());
-    assert(clearButton);
-    connect(clearButton, &QToolButton::clicked, this, &CNewLevelDialog::OnClearButtonClicked);
-
-    connect(ui->LEVEL_FOLDERS->lineEdit(), &QLineEdit::textEdited, this, &CNewLevelDialog::OnLevelNameChange);
-    connect(ui->LEVEL_FOLDERS, &AzQtComponents::BrowseEdit::attachedButtonTriggered, this, &CNewLevelDialog::PopupAssetPicker);
-
-    connect(ui->LEVEL, &QLineEdit::textChanged, this, &CNewLevelDialog::OnLevelNameChange);
-
-    m_levelFolders = GetLevelsFolder();
-    m_level = "";
-    // First of all, keyboard focus is related to widget tab order, and the default tab order is based on the order in which 
-    // widgets are constructed. Therefore, creating more widgets changes the keyboard focus. That is why setFocus() is called last.
-    // Secondly, using singleShot() allows setFocus() slot of the QLineEdit instance to be invoked right after the event system
-    // is ready to do so. Therefore, it is better to use singleShot() than directly call setFocus().
-    QTimer::singleShot(0, ui->LEVEL, SLOT(OnStartup()));
-
-    ReloadLevelFolder();
-}
-
-CNewLevelDialog::~CNewLevelDialog()
-{
-}
-
-void CNewLevelDialog::OnStartup()
-{
-    UpdateData(false);
-    setFocus();
-}
-
-void CNewLevelDialog::UpdateData(bool fromUi)
-{
-    if (fromUi)
-    {
-        m_level = ui->LEVEL->text();
-        m_levelFolders = ui->LEVEL_FOLDERS->text();
-    }
-    else
-    {
-        ui->LEVEL->setText(m_level);
-        ui->LEVEL_FOLDERS->lineEdit()->setText(m_levelFolders);
-    }
-}
-
-// CNewLevelDialog message handlers
-
-void CNewLevelDialog::OnInitDialog()
-{
-    ReloadLevelFolder();
-
-    // Disable OK until some text is entered
-    if (QPushButton* button = ui->buttonBox->button(QDialogButtonBox::Ok))
-    {
-        button->setEnabled(false);
-    }
-
-    // Save data.
-    UpdateData(false);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CNewLevelDialog::ReloadLevelFolder()
-{
-    m_itemFolders.clear();
-    ui->LEVEL_FOLDERS->lineEdit()->clear();
-    ui->LEVEL_FOLDERS->setText(QString(kNewLevelDialog_LevelsFolder) + '/');
-}
-
-QString CNewLevelDialog::GetLevelsFolder() const
-{
-    QDir projectDir = QDir(Path::GetEditingGameDataFolder().c_str());
-    QDir projectLevelsDir = QDir(QStringLiteral("%1/%2").arg(projectDir.absolutePath()).arg(kNewLevelDialog_LevelsFolder));
-
-    return projectLevelsDir.absolutePath();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CNewLevelDialog::GetLevel() const
-{
-    QString output = m_level;
-
-    QDir projectLevelsDir = QDir(GetLevelsFolder());
-
-    if (!m_levelFolders.isEmpty())
-    {
-        output = m_levelFolders + "/" + m_level;
-    }
-
-    QString relativePath = projectLevelsDir.relativeFilePath(output);
-
-    return relativePath;
-}
-
-bool CNewLevelDialog::ValidateLevel()
-{
-    // Check that the selected folder is in or below the project/LEVELS folder.
-    QDir projectLevelsDir = QDir(GetLevelsFolder());
-
-    QString selectedFolder = ui->LEVEL_FOLDERS->text();
-    QString absolutePath = QDir::cleanPath(projectLevelsDir.absoluteFilePath(selectedFolder));
-    QString relativePath = projectLevelsDir.relativeFilePath(absolutePath);
-
-    // Prevent saving to a different drive.
-    if (projectLevelsDir.absolutePath()[0] != absolutePath[0])
-    {
-        return false;
-    }
-
-    if (relativePath.startsWith(".."))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void CNewLevelDialog::OnLevelNameChange()
-{
-    UpdateData(true);
-
-    // QRegExpValidator means the string will always be valid as long as it's not empty:
-    const bool valid = !m_level.isEmpty() && ValidateLevel();
-
-    // Use the validity to dynamically change the Ok button's enabled state
-    if (QPushButton* button = ui->buttonBox->button(QDialogButtonBox::Ok))
-    {
-        button->setEnabled(valid);
-    }
-}
-
-void CNewLevelDialog::OnClearButtonClicked()
-{
-    ui->LEVEL_FOLDERS->lineEdit()->setText(GetLevelsFolder());
-    UpdateData(true);
-
-}
-
-void CNewLevelDialog::PopupAssetPicker()
-{
-    QString newPath = QFileDialog::getExistingDirectory(nullptr, QObject::tr("Choose Destination Folder"), GetLevelsFolder());
-
-    if (!newPath.isEmpty())
-    {
-        ui->LEVEL_FOLDERS->setText(newPath);
-        OnLevelNameChange();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CNewLevelDialog::IsResize(bool bIsResize)
-{
-    m_bIsResize = bIsResize;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CNewLevelDialog::showEvent(QShowEvent* event)
-{
-    if (!m_initialized)
-    {
-        OnInitDialog();
-        m_initialized = true;
-    }
-    QDialog::showEvent(event);
-}
-
-#include <moc_NewLevelDialog.cpp>
diff --git a/Code/Sandbox/Editor/NewLevelDialog.h b/Code/Sandbox/Editor/NewLevelDialog.h
deleted file mode 100644
index 4a6fd64a00..0000000000
--- a/Code/Sandbox/Editor/NewLevelDialog.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2002.
-// -------------------------------------------------------------------------
-//  File name:   newleveldialog.h
-//  Version:     v1.00
-//  Created:     24/7/2002 by Timur.
-//  Compilers:   Visual Studio.NET
-//  Description:
-// -------------------------------------------------------------------------
-//  History:
-//
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
-#define CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QScopedPointer>
-
-#include <vector>
-
-#include <QAbstractButton>
-#include <QDialog>
-#endif
-
-namespace Ui {
-    class CNewLevelDialog;
-}
-
-class CNewLevelDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CNewLevelDialog(QWidget* pParent = nullptr);   // standard constructor
-    ~CNewLevelDialog();
-
-    QString GetLevel() const;
-    void IsResize(bool bIsResize);
-    bool ValidateLevel();
-
-protected:
-    void UpdateData(bool fromUi = true);
-    void OnInitDialog();
-
-    void ReloadLevelFolder();
-
-    void showEvent(QShowEvent* event);
-
-    QString GetLevelsFolder() const;
-
-protected slots:
-    void OnLevelNameChange();
-    void OnClearButtonClicked();
-    void PopupAssetPicker();
-    void OnStartup();
-
-public:
-    QString         m_level;
-    QString         m_levelFolders;
-    bool                m_bIsResize;
-    bool                m_bUpdate;
-
-    std::vector<QString>    m_itemFolders;
-
-    QScopedPointer<Ui::CNewLevelDialog> ui;
-    bool m_initialized;
-};
-#endif // CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
diff --git a/Code/Sandbox/Editor/NewTerrainDialog.cpp b/Code/Sandbox/Editor/NewTerrainDialog.cpp
deleted file mode 100644
index 1673660658..0000000000
--- a/Code/Sandbox/Editor/NewTerrainDialog.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-// NewTerrainDialog.cpp : implementation file
-//
-
-#include "EditorDefs.h"
-
-#include "NewTerrainDialog.h"
-
-
-AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
-#include <ui_NewTerrainDialog.h>
-AZ_POP_DISABLE_WARNING
-
-
-
-CNewTerrainDialog::CNewTerrainDialog(QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_terrainResolutionIndex(0)
-    , m_terrainUnitsIndex(0)
-    , m_bUpdate(false)
-    , ui(new Ui::CNewTerrainDialog)
-    , m_initialized(false)
-{
-    ui->setupUi(this);
-
-    setWindowTitle(tr("Terrain options"));
-
-    // Default is 1024x1024, and m_terrainResolution holds an index to the combo box
-    m_terrainResolutionIndex = 3;
-
-    connect(ui->TERRAIN_RESOLUTION, SIGNAL(activated(int)), this, SLOT(OnComboBoxSelectionTerrainResolution()));
-    connect(ui->TERRAIN_UNITS, SIGNAL(activated(int)), this, SLOT(OnComboBoxSelectionTerrainUnits()));
-}
-
-
-CNewTerrainDialog::~CNewTerrainDialog()
-{
-}
-
-
-void CNewTerrainDialog::UpdateData(bool fromUi)
-{
-    if (fromUi)
-    {
-        m_terrainResolutionIndex = ui->TERRAIN_RESOLUTION->currentIndex();
-        m_terrainUnitsIndex = ui->TERRAIN_UNITS->currentIndex();
-    }
-    else
-    {
-        ui->TERRAIN_RESOLUTION->setCurrentIndex(m_terrainResolutionIndex);
-        ui->TERRAIN_UNITS->setCurrentIndex(m_terrainUnitsIndex);
-    }
-}
-
-
-void CNewTerrainDialog::OnInitDialog()
-{
-    // Initialize terrain values.
-    int resolution = Ui::START_TERRAIN_RESOLUTION;
-
-    // Fill terrain resolution combo box
-    for (int i = 0; i < 6; i++)
-    {
-        ui->TERRAIN_RESOLUTION->addItem(QString("%1x%1").arg(resolution));
-        resolution *= 2;
-    }
-
-    UpdateTerrainUnits();
-    UpdateTerrainInfo();
-
-    // Save data.
-    UpdateData(false);
-}
-
-
-void CNewTerrainDialog::UpdateTerrainUnits()
-{
-    uint32 terrainRes = GetTerrainResolution();
-    int size = terrainRes * GetTerrainUnits();
-    int maxUnit = IntegerLog2(Ui::MAXIMUM_TERRAIN_RESOLUTION / terrainRes);
-    int units = Ui::START_TERRAIN_UNITS;
-
-    ui->TERRAIN_UNITS->clear();
-    for (int i = 0; i <= maxUnit; i++)
-    {
-        ui->TERRAIN_UNITS->addItem(QString::number(units));
-        units *= 2;
-    }
-    if (size > Ui::MAXIMUM_TERRAIN_RESOLUTION)
-    {
-        m_terrainUnitsIndex = 0;
-    }
-    ui->TERRAIN_UNITS->setCurrentText(QString::number(m_terrainUnitsIndex));
-}
-
-
-void CNewTerrainDialog::UpdateTerrainInfo()
-{
-    int sizeX = GetTerrainResolution() * GetTerrainUnits();
-    int sizeY = GetTerrainResolution() * GetTerrainUnits();
-
-    QString str;
-    if (sizeX >= 1000)
-    {
-        str = tr("Terrain Size: %1 x %2 Kilometers").arg((float)sizeX / 1000.0f, 0, 'f', 3).arg((float)sizeY / 1000.0f, 0, 'f', 3);
-    }
-    else if (sizeX > 0)
-    {
-        str = tr("Terrain Size: %1 x %2 Meters").arg(sizeX).arg(sizeY);
-    }
-    else
-    {
-        str = tr("Level will have no terrain");
-    }
-
-    ui->TERRAIN_INFO->setText(str);
-}
-
-
-int CNewTerrainDialog::GetTerrainResolution() const
-{
-    // convert combo box index into resolution value
-    return Ui::START_TERRAIN_RESOLUTION * (1 << m_terrainResolutionIndex);
-}
-
-
-int CNewTerrainDialog::GetTerrainUnits() const
-{
-    // convert combo box index into units value
-    return Ui::START_TERRAIN_UNITS * (1 << m_terrainUnitsIndex);
-}
-
-
-void CNewTerrainDialog::OnComboBoxSelectionTerrainResolution()
-{
-    UpdateData();
-
-    UpdateTerrainUnits();
-
-    UpdateTerrainInfo();
-}
-
-
-void CNewTerrainDialog::OnComboBoxSelectionTerrainUnits()
-{
-    UpdateData();
-
-    UpdateTerrainInfo();
-}
-
-
-void CNewTerrainDialog::showEvent(QShowEvent* event)
-{
-    if (!m_initialized)
-    {
-        OnInitDialog();
-        m_initialized = true;
-    }
-    QDialog::showEvent(event);
-}
-
-#include <moc_NewTerrainDialog.cpp>
diff --git a/Code/Sandbox/Editor/NewTerrainDialog.h b/Code/Sandbox/Editor/NewTerrainDialog.h
deleted file mode 100644
index 7b6265e322..0000000000
--- a/Code/Sandbox/Editor/NewTerrainDialog.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2002.
-// -------------------------------------------------------------------------
-//  File name:   newterraindialog.h
-//  Version:     v1.00
-//  Created:     24/7/2002 by Timur.
-//  Compilers:   Visual Studio.NET
-//  Description:
-// -------------------------------------------------------------------------
-//  History:
-//
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
-#define CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QScopedPointer>
-
-#include <vector>
-
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class CNewTerrainDialog;
-
-    enum TerrainDialogConstants
-    {
-        START_TERRAIN_RESOLUTION_POWER_OF_TWO = 7,
-        START_TERRAIN_RESOLUTION = 1 << START_TERRAIN_RESOLUTION_POWER_OF_TWO,
-        MAXIMUM_TERRAIN_POWER_OF_TWO = 16,
-        MAXIMUM_TERRAIN_RESOLUTION = 1 << MAXIMUM_TERRAIN_POWER_OF_TWO,
-        POWER_OFFSET = (MAXIMUM_TERRAIN_POWER_OF_TWO - START_TERRAIN_RESOLUTION_POWER_OF_TWO),
-        START_TERRAIN_UNITS = 1
-    };
-}
-
-class CNewTerrainDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CNewTerrainDialog(QWidget* pParent = nullptr);   // standard constructor
-    ~CNewTerrainDialog();
-
-    int GetTerrainResolution() const;
-    int GetTerrainUnits() const;
-
-    void IsResize(bool bIsResize);
-
-
-protected:
-    void UpdateData(bool fromUi = true);
-    void OnInitDialog();
-
-    void UpdateTerrainUnits();
-    void UpdateTerrainInfo();
-
-    void showEvent(QShowEvent* event) override;
-
-protected slots:
-    void OnComboBoxSelectionTerrainResolution();
-    void OnComboBoxSelectionTerrainUnits();
-
-public:
-    int m_terrainResolutionIndex;
-    int m_terrainUnitsIndex;
-    bool m_bUpdate;
-
-    QScopedPointer<Ui::CNewTerrainDialog> ui;
-    bool m_initialized;
-};
-#endif // CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
diff --git a/Code/Sandbox/Editor/Objects/AxisGizmo.cpp b/Code/Sandbox/Editor/Objects/AxisGizmo.cpp
deleted file mode 100644
index a4f160d081..0000000000
--- a/Code/Sandbox/Editor/Objects/AxisGizmo.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "AxisGizmo.h"
-
-// Editor
-#include "Viewport.h"
-#include "GizmoManager.h"
-#include "ViewManager.h"
-#include "Settings.h"
-#include "RenderHelpers/AxisHelper.h"
-#include "IObjectManager.h"
-
-//////////////////////////////////////////////////////////////////////////
-// CAxisGizmo implementation.
-//////////////////////////////////////////////////////////////////////////
-int CAxisGizmo::m_axisGizmoCount = 0;
-
-//////////////////////////////////////////////////////////////////////////
-CAxisGizmo::CAxisGizmo(CBaseObject* object)
-{
-    assert(object != 0);
-    m_object = object;
-    m_pAxisHelper.reset(new CAxisHelper);
-
-    // Set selectable flag.
-    SetFlags(EGIZMO_SELECTABLE | EGIZMO_TRANSFORM_MANIPULATOR);
-
-    m_axisGizmoCount++;
-    m_object->AddEventListener(this);
-
-    m_localTM.SetIdentity();
-    m_parentTM.SetIdentity();
-    m_matrix.SetIdentity();
-
-    m_bDragging = false;
-    m_bAlwaysUseLocal = false;
-    m_coordSysBackUp = COORDS_VIEW;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CAxisGizmo::CAxisGizmo()
-{
-    // Set selectable flag.
-    SetFlags(EGIZMO_SELECTABLE);
-    m_axisGizmoCount++;
-    m_pAxisHelper.reset(new CAxisHelper);
-    m_bDragging = false;
-    m_bAlwaysUseLocal = false;
-    m_coordSysBackUp = COORDS_VIEW;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CAxisGizmo::~CAxisGizmo()
-{
-    if (m_object)
-    {
-        m_object->RemoveEventListener(this);
-    }
-    m_axisGizmoCount--;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisGizmo::OnObjectEvent([[maybe_unused]] CBaseObject* object, int event)
-{
-    if (event == CBaseObject::ON_DELETE || event == CBaseObject::ON_UNSELECT)
-    {
-        // This gizmo must be deleted as well.
-        GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(this);
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisGizmo::Display(DisplayContext& dc)
-{
-    if (m_object)
-    {
-        const bool visible =
-                !m_object->IsHidden()
-            &&  !m_object->IsFrozen()
-            &&  m_object->IsSelected();
-
-        if (!visible)
-        {
-            // This gizmo must be deleted.
-            DeleteThis();
-            return;
-        }
-
-        if (m_object->IsSkipSelectionHelper())
-        {
-            return;
-        }
-    }
-
-    DrawAxis(dc);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisGizmo::SetWorldBounds(const AABB& bbox)
-{
-    m_bbox = bbox;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisGizmo::GetWorldBounds(AABB& bbox)
-{
-    if (m_object)
-    {
-        m_object->GetBoundBox(bbox);
-    }
-    else
-    {
-        bbox.min = Vec3(-1000000, -1000000, -1000000);
-        bbox.max = Vec3(1000000, 1000000, 1000000);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisGizmo::DrawAxis(DisplayContext& dc)
-{
-    m_pAxisHelper->SetHighlightAxis(m_highlightAxis);
-
-    Matrix34 tm = GetTransformation(m_bAlwaysUseLocal ? COORDS_LOCAL : GetIEditor()->GetReferenceCoordSys(), dc.view);
-    m_pAxisHelper->DrawAxis(tm, GetIEditor()->GetGlobalGizmoParameters(), dc);
-    if (m_object && m_object->CheckFlags(OBJFLAG_IS_PARTICLE))
-    {
-        AABB objectBox;
-        m_object->GetBoundBox(objectBox);
-
-        m_pAxisHelper->DrawDome(tm, GetIEditor()->GetGlobalGizmoParameters(), dc, objectBox);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Matrix34& CAxisGizmo::GetMatrix() const
-{
-    if (m_object)
-    {
-        m_matrix.SetTranslation(m_object->GetWorldTM().GetTranslation());
-    }
-    return m_matrix;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CAxisGizmo::HitTest(HitContext& hc)
-{
-    Matrix34 tm = GetTransformation(m_bAlwaysUseLocal ? COORDS_LOCAL : GetIEditor()->GetReferenceCoordSys(), hc.view);
-
-    CAxisHelper axis;
-    bool bRes = m_pAxisHelper->HitTest(tm, GetIEditor()->GetGlobalGizmoParameters(), hc);
-    if (bRes)
-    {
-        hc.object = m_object;
-    }
-
-    m_highlightAxis = m_pAxisHelper->GetHighlightAxis();
-
-    return bRes;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CAxisGizmo::HitTestManipulator(HitContext& hc)
-{
-    return HitTest(hc);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisGizmo::SetTransformation(RefCoordSys coordSys, const Matrix34& tm)
-{
-    switch (coordSys)
-    {
-    case COORDS_WORLD:
-        SetMatrix(tm);
-        break;
-    case COORDS_LOCAL:
-        m_localTM = tm;
-        {
-            Matrix34 wtm;
-            wtm.SetIdentity();
-            wtm.SetTranslation(m_localTM.GetTranslation());
-            SetMatrix(wtm);
-            m_userTM = tm;
-        }
-        m_parentTM = m_localTM;
-        break;
-    case COORDS_PARENT:
-        m_parentTM = tm;
-        break;
-    case COORDS_USERDEFINED:
-        m_userTM = tm;
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-Matrix34 CAxisGizmo::GetTransformation(RefCoordSys coordSys, IDisplayViewport* view /*=nullptr*/) const
-{
-    if (m_object)
-    {
-        switch (coordSys)
-        {
-        case COORDS_VIEW:
-            if (view)
-            {
-                Matrix34 tm = view->GetViewTM();
-                tm.SetTranslation(m_object->GetWorldTM().GetTranslation());
-                return tm;
-            }
-            return GetMatrix();
-            break;
-        case COORDS_LOCAL:
-            return m_object->GetWorldTM();
-            break;
-        case COORDS_PARENT:
-            //return m_parentTM;
-            if (m_object->GetParent())
-            {
-                Matrix34 parentTM = m_object->GetParent()->GetWorldTM();
-                parentTM.SetTranslation(m_object->GetWorldTM().GetTranslation());
-                return parentTM;
-            }
-            else
-            {
-                return GetMatrix();
-            }
-            break;
-        case COORDS_WORLD:
-            return GetMatrix();
-            break;
-        case COORDS_USERDEFINED:
-        {
-            Matrix34 userTM;
-            userTM.SetIdentity();
-            userTM.SetTranslation(m_object->GetWorldTM().GetTranslation());
-            return userTM;
-        }
-        break;
-        }
-    }
-    else
-    {
-        switch (coordSys)
-        {
-        case COORDS_VIEW:
-            return GetMatrix();
-            break;
-        case COORDS_LOCAL:
-            return m_localTM;
-            break;
-        case COORDS_PARENT:
-            return m_parentTM;
-            break;
-        case COORDS_WORLD:
-            return GetMatrix();
-            break;
-        case COORDS_USERDEFINED:
-            return m_userTM;
-            break;
-        }
-    }
-    return GetMatrix();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point, [[maybe_unused]] int nFlags)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    if (event == eMouseLDown)
-    {
-        HitContext hc;
-        hc.view = view;
-        hc.b2DViewport = view->GetType() != ET_ViewportCamera;
-        hc.point2d = point;
-        view->ViewToWorldRay(point, hc.raySrc, hc.rayDir);
-        if (HitTest(hc))
-        {
-            if (event != eMouseLDown)
-            {
-                return false;
-            }
-
-            // On Left mouse down.
-
-            // Hit axis gizmo.
-            GetIEditor()->SetAxisConstraints((AxisConstrains)hc.axis);
-            view->SetAxisConstrain(hc.axis);
-
-            if (m_bAlwaysUseLocal)
-            {
-                m_coordSysBackUp = GetIEditor()->GetReferenceCoordSys();
-                GetIEditor()->SetReferenceCoordSys(COORDS_LOCAL);
-            }
-
-            view->SetConstructionMatrix(COORDS_LOCAL, GetTransformation(COORDS_LOCAL));
-            view->SetConstructionMatrix(COORDS_PARENT, GetTransformation(COORDS_PARENT));
-            view->SetConstructionMatrix(COORDS_USERDEFINED, GetTransformation(COORDS_USERDEFINED));
-
-            view->BeginUndo();
-            view->CaptureMouse();
-            m_bDragging = true;
-            m_cMouseDownPos = point;
-            m_initPos = GetTransformation(COORDS_WORLD).GetTranslation();
-
-            return true;
-        }
-    }
-    else if (event == eMouseMove)
-    {
-        if (m_bDragging)
-        {
-            return true;
-        }
-        else
-        {
-            // Hit test current transform manipulator, to highlight when mouse over.
-            HitContext hc;
-            hc.view = view;
-            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)
-                {
-                case 1:
-                    view->SetCurrentCursor(STD_CURSOR_MOVE);
-                    break;
-                case 2:
-                    view->SetCurrentCursor(STD_CURSOR_ROTATE);
-                    break;
-                case 3:
-                    view->SetCurrentCursor(STD_CURSOR_SCALE);
-                    break;
-                }
-                bHit = true;
-            }
-        }
-    }
-    else if (event == eMouseLUp)
-    {
-        if (m_bDragging)
-        {
-            view->AcceptUndo("Manipulator Drag");
-            view->ReleaseMouse();
-            m_bDragging = false;
-
-            if (m_bAlwaysUseLocal)
-            {
-                GetIEditor()->SetReferenceCoordSys(m_coordSysBackUp);
-            }
-        }
-    }
-
-    return false;
-}
diff --git a/Code/Sandbox/Editor/Objects/AxisGizmo.h b/Code/Sandbox/Editor/Objects/AxisGizmo.h
deleted file mode 100644
index 4e5b09f4c0..0000000000
--- a/Code/Sandbox/Editor/Objects/AxisGizmo.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_AXISGIZMO_H
-#define CRYINCLUDE_EDITOR_OBJECTS_AXISGIZMO_H
-#pragma once
-
-#include "BaseObject.h"
-#include "Gizmo.h"
-#include "Include/ITransformManipulator.h"
-
-// forward declarations.
-struct DisplayContext;
-class CAxisHelper;
-
-/** Gizmo of Objects animation track.
-*/
-class SANDBOX_API CAxisGizmo
-    : public CGizmo
-    , public ITransformManipulator
-    , public CBaseObject::EventListener
-{
-public:
-    CAxisGizmo();
-    // Creates axis gizmo linked to an object.
-    CAxisGizmo(CBaseObject* object);
-    ~CAxisGizmo();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Ovverides from CGizmo
-    //////////////////////////////////////////////////////////////////////////
-    virtual void GetWorldBounds(AABB& bbox);
-    virtual void Display(DisplayContext& dc);
-    virtual bool HitTest(HitContext& hc);
-    virtual const Matrix34& GetMatrix() const;
-    //////////////////////////////////////////////////////////////////////////
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // ITransformManipulator implementation.
-    //////////////////////////////////////////////////////////////////////////
-    virtual Matrix34 GetTransformation(RefCoordSys coordSys, IDisplayViewport* view = nullptr) const;
-    virtual void SetTransformation(RefCoordSys coordSys, const Matrix34& tm);
-    virtual bool HitTestManipulator(HitContext& hc);
-    virtual bool MouseCallback(CViewport* view, EMouseEvent event, QPoint& point, int nFlags);
-    virtual void SetAlwaysUseLocal(bool on)
-    { m_bAlwaysUseLocal = on; }
-    //////////////////////////////////////////////////////////////////////////
-
-
-    //////////////////////////////////////////////////////////////////////////
-    void SetWorldBounds(const AABB& bbox);
-
-    void DrawAxis(DisplayContext& dc);
-
-    static int GetGlobalAxisGizmoCount() { return m_axisGizmoCount; }
-
-    CBaseObjectPtr GetBaseObject() const override { return m_object; }
-
-private:
-    void OnObjectEvent(CBaseObject* object, int event) override;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    CBaseObjectPtr m_object;
-    AABB m_bbox;
-    std::unique_ptr<CAxisHelper> m_pAxisHelper;
-
-    bool m_bDragging;
-    QPoint m_cMouseDownPos;
-    Vec3 m_initPos;
-
-    int m_highlightAxis;
-
-    Matrix34 m_localTM;
-    Matrix34 m_parentTM;
-    Matrix34 m_userTM;
-
-    bool m_bAlwaysUseLocal;
-    RefCoordSys m_coordSysBackUp;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    static int m_axisGizmoCount;
-};
-#endif // CRYINCLUDE_EDITOR_OBJECTS_AXISGIZMO_H
diff --git a/Code/Sandbox/Editor/Objects/BaseObject.cpp b/Code/Sandbox/Editor/Objects/BaseObject.cpp
deleted file mode 100644
index c1ee9dc894..0000000000
--- a/Code/Sandbox/Editor/Objects/BaseObject.cpp
+++ /dev/null
@@ -1,2914 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CBaseObject implementation.
-
-
-#include "EditorDefs.h"
-
-#include "BaseObject.h"
-
-// Azframework
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>      // for AzFramework::Terrain::TerrainDataRequests
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>  // for ComponentEntityObjectRequestBus
-
-// Editor
-#include "Settings.h"
-#include "Viewport.h"
-#include "DisplaySettings.h"
-#include "Undo/Undo.h"
-#include "UsedResources.h"
-#include "GizmoManager.h"
-#include "Include/IIconManager.h"
-#include "Objects/SelectionGroup.h"
-#include "Objects/ObjectManager.h"
-#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"
-
-
-namespace {
-    QColor kLinkColorParent = QColor(0, 255, 255);
-    QColor kLinkColorChild = QColor(0, 0, 255);
-    QColor kLinkColorGray = QColor(128, 128, 128);
-}
-
-extern CObjectManager* g_pObjectManager;
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-//! Undo object for CBaseObject.
-class CUndoBaseObject
-    : public IUndoObject
-{
-public:
-    CUndoBaseObject(CBaseObject* pObj, const char* undoDescription);
-
-protected:
-    virtual int GetSize() { return sizeof(*this);   }
-    virtual QString GetDescription() { return m_undoDescription; };
-    virtual QString GetObjectName();
-
-    virtual void Undo(bool bUndo);
-    virtual void Redo();
-
-protected:
-    QString m_undoDescription;
-    GUID m_guid;
-    XmlNodeRef m_undo;
-    XmlNodeRef m_redo;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-//! Undo object for CBaseObject that only stores its transform, color, area and minSpec
-class CUndoBaseObjectMinimal
-    : public IUndoObject
-{
-public:
-    CUndoBaseObjectMinimal(CBaseObject* obj, const char* undoDescription, int flags);
-
-protected:
-    virtual int GetSize() { return sizeof(*this); }
-    virtual QString GetDescription() { return m_undoDescription; };
-    virtual QString GetObjectName();
-
-    virtual void Undo(bool bUndo);
-    virtual void Redo();
-
-private:
-    struct StateStruct
-    {
-        Vec3 pos;
-        Quat rotate;
-        Vec3 scale;
-        QColor color;
-        float area;
-        int minSpec;
-    };
-
-    void SetTransformsFromState(CBaseObject* pObject, const StateStruct& state, bool bUndo);
-
-    GUID m_guid;
-    QString m_undoDescription;
-    StateStruct m_undoState;
-    StateStruct m_redoState;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo object for attach/detach changes
-class CUndoAttachBaseObject
-    : public IUndoObject
-{
-public:
-    CUndoAttachBaseObject(CBaseObject* pAttachedObject, bool bKeepPos, bool bAttach)
-        : m_attachedObjectGUID(pAttachedObject->GetId())
-        , m_parentObjectGUID(pAttachedObject->GetParent()->GetId())
-        , m_bKeepPos(bKeepPos)
-        , m_bAttach(bAttach) {}
-
-    virtual void Undo([[maybe_unused]] bool bUndo) override
-    {
-        if (m_bAttach)
-        {
-            Detach();
-        }
-        else
-        {
-            Attach();
-        }
-    }
-
-    virtual void Redo() override
-    {
-        if (m_bAttach)
-        {
-            Attach();
-        }
-        else
-        {
-            Detach();
-        }
-    }
-
-private:
-    void Attach()
-    {
-        CObjectManager* pObjectManager = static_cast<CObjectManager*>(GetIEditor()->GetObjectManager());
-        CBaseObject* pObject = pObjectManager->FindObject(m_attachedObjectGUID);
-        CBaseObject* pParentObject = pObjectManager->FindObject(m_parentObjectGUID);
-
-        if (pObject && pParentObject)
-        {
-            pParentObject->AttachChild(pObject, m_bKeepPos);
-        }
-    }
-
-    void Detach()
-    {
-        CObjectManager* pObjectManager = static_cast<CObjectManager*>(GetIEditor()->GetObjectManager());
-        CBaseObject* pObject = pObjectManager->FindObject(m_attachedObjectGUID);
-
-        if (pObject)
-        {
-            pObject->DetachThis(m_bKeepPos);
-        }
-    }
-
-    virtual int GetSize() { return sizeof(CUndoAttachBaseObject); }
-    virtual QString GetDescription() { return "Attachment Changed"; }
-
-    GUID m_attachedObjectGUID;
-    GUID m_parentObjectGUID;
-    bool m_bKeepPos;
-    bool m_bAttach;
-};
-
-//////////////////////////////////////////////////////////////////////////
-CUndoBaseObject::CUndoBaseObject(CBaseObject* obj, const char* undoDescription)
-{
-    // Stores the current state of this object.
-    assert(obj != 0);
-    m_undoDescription = undoDescription;
-    m_guid = obj->GetId();
-
-    m_redo = 0;
-    m_undo = XmlHelpers::CreateXmlNode("Undo");
-    CObjectArchive ar(GetIEditor()->GetObjectManager(), m_undo, false);
-    ar.bUndo = true;
-    obj->Serialize(ar);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CUndoBaseObject::GetObjectName()
-{
-    if (CBaseObject* obj = GetIEditor()->GetObjectManager()->FindObject(m_guid))
-    {
-        return obj->GetName();
-    }
-    return QString();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoBaseObject::Undo(bool bUndo)
-{
-    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!pObject)
-    {
-        return;
-    }
-
-    GetIEditor()->SuspendUndo();
-
-    if (bUndo)
-    {
-        m_redo = XmlHelpers::CreateXmlNode("Redo");
-        // Save current object state.
-        CObjectArchive ar(GetIEditor()->GetObjectManager(), m_redo, false);
-        ar.bUndo = true;
-        pObject->Serialize(ar);
-    }
-
-    // Undo object state.
-    CObjectArchive ar(GetIEditor()->GetObjectManager(), m_undo, true);
-    ar.bUndo = true;
-    pObject->Serialize(ar);
-
-    GetIEditor()->ResumeUndo();
-
-    using namespace AzToolsFramework;
-    ComponentEntityObjectRequestBus::Event(pObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoBaseObject::Redo()
-{
-    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!pObject)
-    {
-        return;
-    }
-
-    GetIEditor()->SuspendUndo();
-
-    CObjectArchive ar(GetIEditor()->GetObjectManager(), m_redo, true);
-    ar.bUndo = true;
-
-    pObject->Serialize(ar);
-
-    GetIEditor()->ResumeUndo();
-
-    using namespace AzToolsFramework;
-    ComponentEntityObjectRequestBus::Event(pObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CUndoBaseObjectMinimal::CUndoBaseObjectMinimal(CBaseObject* pObj, const char* undoDescription, [[maybe_unused]] int flags)
-{
-    // Stores the current state of this object.
-    assert(pObj != nullptr);
-    m_undoDescription = undoDescription;
-    m_guid = pObj->GetId();
-
-    ZeroStruct(m_redoState);
-
-    m_undoState.pos = pObj->GetPos();
-    m_undoState.rotate = pObj->GetRotation();
-    m_undoState.scale = pObj->GetScale();
-    m_undoState.color = pObj->GetColor();
-    m_undoState.area = pObj->GetArea();
-    m_undoState.minSpec = pObj->GetMinSpec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CUndoBaseObjectMinimal::GetObjectName()
-{
-    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!pObject)
-    {
-        return QString();
-    }
-
-    return pObject->GetName();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoBaseObjectMinimal::Undo(bool bUndo)
-{
-    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!pObject || pObject->GetType() == OBJTYPE_DUMMY)
-    {
-        return;
-    }
-
-    if (bUndo)
-    {
-        m_redoState.pos = pObject->GetPos();
-        m_redoState.scale = pObject->GetScale();
-        m_redoState.rotate = pObject->GetRotation();
-        m_redoState.color = pObject->GetColor();
-        m_redoState.area = pObject->GetArea();
-        m_redoState.minSpec = pObject->GetMinSpec();
-    }
-
-    SetTransformsFromState(pObject, m_undoState, bUndo);
-
-    pObject->ChangeColor(m_undoState.color);
-    pObject->SetArea(m_undoState.area);
-    pObject->SetMinSpec(m_undoState.minSpec, false);
-
-    using namespace AzToolsFramework;
-    ComponentEntityObjectRequestBus::Event(pObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoBaseObjectMinimal::Redo()
-{
-    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!pObject || pObject->GetType() == OBJTYPE_DUMMY)
-    {
-        return;
-    }
-
-    SetTransformsFromState(pObject, m_redoState, true);
-
-    pObject->ChangeColor(m_redoState.color);
-    pObject->SetArea(m_redoState.area);
-    pObject->SetMinSpec(m_redoState.minSpec, false);
-
-    using namespace AzToolsFramework;
-    ComponentEntityObjectRequestBus::Event(pObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoBaseObjectMinimal::SetTransformsFromState(CBaseObject* pObject, const StateStruct& state, bool bUndo)
-{
-    uint32 flags = eObjectUpdateFlags_Undo;
-    if (!bUndo)
-    {
-        flags |= eObjectUpdateFlags_UserInputUndo;
-    }
-
-    pObject->SetPos(state.pos, flags);
-    pObject->SetScale(state.scale, flags);
-    pObject->SetRotation(state.rotate, flags);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectCloneContext::AddClone(CBaseObject* pFromObject, CBaseObject* pToObject)
-{
-    m_objectsMap[pFromObject] = pToObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CObjectCloneContext::FindClone(CBaseObject* pFromObject)
-{
-    CBaseObject* pTarget = stl::find_in_map(m_objectsMap, pFromObject, (CBaseObject*) NULL);
-    return pTarget;
-}
-
-//////////////////////////////////////////////////////////////////////////
-GUID CObjectCloneContext::ResolveClonedID(REFGUID guid)
-{
-    CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(guid);
-    CBaseObject* pClonedTarget = FindClone(pObject);
-    if (!pClonedTarget)
-    {
-        pClonedTarget = pObject; // If target not cloned, link to original target.
-    }
-    if (pClonedTarget)
-    {
-        return pClonedTarget->GetId();
-    }
-    return GUID_NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CBaseObject implementation.
-//////////////////////////////////////////////////////////////////////////
-CBaseObject::CBaseObject()
-    : m_pos(0, 0, 0)
-    , 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))
-    , m_worldTM(IDENTITY)
-    , m_lookat(nullptr)
-    , m_lookatSource(nullptr)
-    , m_flattenArea(0.f)
-    , m_classDesc(nullptr)
-    , m_numRefs(0)
-    , m_parent(nullptr)
-    , m_bInSelectionBox(false)
-    , m_pTransformDelegate(nullptr)
-    , 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);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IObjectManager* CBaseObject::GetObjectManager() const
-{
-    return g_pObjectManager;
-};
-
-
-void CBaseObject::SetClassDesc(CObjectClassDesc* classDesc)
-{
-    m_classDesc = classDesc;
-}
-
-//! Initialize Object.
-bool CBaseObject::Init([[maybe_unused]] IEditor* ie, CBaseObject* prev, [[maybe_unused]] const QString& file)
-{
-    SetFlags(m_flags & (~OBJFLAG_DELETED));
-
-    if (prev != 0)
-    {
-        SetUniqueName(prev->GetName());
-        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.
-        EnableUpdateCallbacks(false);
-        CopyVariableValues(prev);
-        EnableUpdateCallbacks(true);
-        OnSetValues();
-    }
-
-    m_nTextureIcon = m_classDesc->GetTextureIconId();
-    if (m_classDesc->RenderTextureOnTop())
-    {
-        SetFlags(OBJFLAG_SHOW_ICONONTOP);
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject::~CBaseObject()
-{
-    for (Childs::iterator c = m_childs.begin(); c != m_childs.end(); c++)
-    {
-        CBaseObject* child = *c;
-        child->m_parent = 0;
-    }
-    m_childs.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::Done()
-{
-    DetachThis();
-
-    // From children
-    DetachAll();
-
-    SetLookAt(0);
-    if (m_lookatSource)
-    {
-        m_lookatSource->SetLookAt(0);
-    }
-    SetFlags(m_flags | OBJFLAG_DELETED);
-
-    NotifyListeners(CBaseObject::ON_DELETE);
-    m_eventListeners.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetName(const QString& name)
-{
-    if (name == m_name)
-    {
-        return;
-    }
-
-    StoreUndo("Name");
-
-    // Notification is expensive and not required if this is during construction.
-    bool notify = (!m_name.isEmpty());
-
-    m_name = name;
-    GetObjectManager()->RegisterObjectName(name);
-    SetModified(false);
-
-    if (notify)
-    {
-        NotifyListeners(ON_RENAME);
-        static_cast<CObjectManager*>(GetIEditor()->GetObjectManager())->NotifyObjectListeners(this, ON_RENAME);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetUniqueName(const QString& name)
-{
-    SetName(GetObjectManager()->GenerateUniqueObjectName(name));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::GenerateUniqueName()
-{
-    if (m_classDesc)
-    {
-        SetUniqueName(m_classDesc->ClassName());
-    }
-    else
-    {
-        SetUniqueName("Object");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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)
-{
-    const Vec3 currentPos = GetPos();
-
-    bool equal = false;
-    if (flags & eObjectUpdateFlags_MoveTool) // very sensitive in case of the move tool
-    {
-        equal = IsVectorsEqual(currentPos, pos, 0.0f);
-    }
-    else // less sensitive for others
-    {
-        equal = IsVectorsEqual(currentPos, pos);
-    }
-
-    if (equal)
-    {
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check if position is bad.
-    if (fabs(pos.x) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
-        fabs(pos.y) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
-        fabs(pos.z) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
-        !_finite(pos.x) || !_finite(pos.y) || !_finite(pos.z))
-    {
-        CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING,
-            "Object %s, SetPos called with invalid position: (%f,%f,%f)",
-            GetName().toUtf8().data(), pos.x, pos.y, pos.z);
-        return false;
-    }
-
-    OnBeforeAreaChange();
-
-    //////////////////////////////////////////////////////////////////////////
-    const bool bPositionDelegated = m_pTransformDelegate && m_pTransformDelegate->IsPositionDelegated();
-    if (m_pTransformDelegate && (flags & eObjectUpdateFlags_Animated) == 0)
-    {
-        m_pTransformDelegate->SetTransformDelegatePos(pos);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    if (!bPositionDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
-    {
-        StoreUndo("Position", true, flags);
-    }
-
-    float terrainElevation = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
-    AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainElevation
-        , &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats
-        , pos.x, pos.y, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, nullptr);
-    m_height = pos.z - terrainElevation;
-
-    if (!bPositionDelegated)
-    {
-        m_pos = pos;
-    }
-
-    if (!(flags & eObjectUpdateFlags_DoNotInvalidate))
-    {
-        InvalidateTM(flags | eObjectUpdateFlags_PositionChanged);
-    }
-
-    SetModified(true);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::SetRotation(const Quat& rotate, int flags)
-{
-    const Quat currentRotate = GetRotation();
-
-    if (currentRotate.w == rotate.w && currentRotate.v.x == rotate.v.x
-        && currentRotate.v.y == rotate.v.y && currentRotate.v.z == rotate.v.z)
-    {
-        return false;
-    }
-
-    if (flags & eObjectUpdateFlags_ScaleTool)
-    {
-        return false;
-    }
-
-    OnBeforeAreaChange();
-
-    const bool bRotationDelegated = m_pTransformDelegate && m_pTransformDelegate->IsRotationDelegated();
-    if (m_pTransformDelegate && (flags & eObjectUpdateFlags_Animated) == 0)
-    {
-        m_pTransformDelegate->SetTransformDelegateRotation(rotate);
-    }
-
-    if (!bRotationDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
-    {
-        StoreUndo("Rotate", true, flags);
-    }
-
-    if (!bRotationDelegated)
-    {
-        m_rotate = rotate;
-    }
-
-    if (m_bMatrixValid && !(flags & eObjectUpdateFlags_DoNotInvalidate))
-    {
-        InvalidateTM(flags | eObjectUpdateFlags_RotationChanged);
-    }
-
-    SetModified(true);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::SetScale(const Vec3& scale, int flags)
-{
-    if (IsVectorsEqual(GetScale(), scale))
-    {
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check if scale is bad.
-    if (scale.x < 0.01f || scale.y < 0.01f || scale.z < 0.01f)
-    {
-        CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "Object %s, SetScale called with invalid scale: (%f,%f,%f)", GetName().toUtf8().data(), scale.x, scale.y, scale.z);
-        return false;
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    OnBeforeAreaChange();
-
-    const bool bScaleDelegated = m_pTransformDelegate && m_pTransformDelegate->IsScaleDelegated();
-    if (m_pTransformDelegate && (flags & eObjectUpdateFlags_Animated) == 0)
-    {
-        m_pTransformDelegate->SetTransformDelegateScale(scale);
-    }
-
-    if (!bScaleDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
-    {
-        StoreUndo("Scale", true, flags);
-    }
-
-    if (!bScaleDelegated)
-    {
-        m_scale = scale;
-    }
-
-    if (m_bMatrixValid && !(flags & eObjectUpdateFlags_DoNotInvalidate))
-    {
-        InvalidateTM(flags | eObjectUpdateFlags_ScaleChanged);
-    }
-
-    SetModified(true);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Vec3 CBaseObject::GetPos() const
-{
-    if (!m_pTransformDelegate)
-    {
-        return m_pos;
-    }
-
-    return m_pTransformDelegate->GetTransformDelegatePos(m_pos);
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Quat CBaseObject::GetRotation() const
-{
-    if (!m_pTransformDelegate)
-    {
-        return m_rotate;
-    }
-
-    return m_pTransformDelegate->GetTransformDelegateRotation(m_rotate);
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Vec3 CBaseObject::GetScale() const
-{
-    if (!m_pTransformDelegate)
-    {
-        return m_scale;
-    }
-
-    return m_pTransformDelegate->GetTransformDelegateScale(m_scale);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::ChangeColor(const QColor& color)
-{
-    if (color == m_color)
-    {
-        return;
-    }
-
-    StoreUndo("Color", true);
-
-    SetColor(color);
-    SetModified(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetColor(const QColor& color)
-{
-    m_color = color;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetArea(float area)
-{
-    if (m_flattenArea == area)
-    {
-        return;
-    }
-
-    StoreUndo("Area", true);
-
-    m_flattenArea = area;
-    SetModified(false);
-};
-
-//! Get bounding box of object in world coordinate space.
-void CBaseObject::GetBoundBox(AABB& box)
-{
-    if (!m_bWorldBoxValid)
-    {
-        GetLocalBounds(m_worldBounds);
-        if (!m_worldBounds.IsReset() && !m_worldBounds.IsEmpty())
-        {
-            m_worldBounds.SetTransformedAABB(GetWorldTM(), m_worldBounds);
-            m_bWorldBoxValid = true;
-        }
-    }
-    box = m_worldBounds;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::GetLocalBounds(AABB& box)
-{
-    box.min.Set(0, 0, 0);
-    box.max.Set(0, 0, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetModified(bool)
-{
-}
-
-void CBaseObject::DrawDefault(DisplayContext& dc, const QColor& labelColor)
-{
-    Vec3 wp = GetWorldPos();
-
-    bool bDisplaySelectionHelper = false;
-    if (!CanBeDrawn(dc, bDisplaySelectionHelper))
-    {
-        return;
-    }
-
-    // Draw link between parent and child.
-    if (dc.flags & DISPLAY_LINKS)
-    {
-        if (GetParent())
-        {
-            dc.DrawLine(GetParentAttachPointWorldTM().GetTranslation(), wp, IsFrozen() ? kLinkColorGray : kLinkColorParent, IsFrozen() ? kLinkColorGray : kLinkColorChild);
-        }
-        int nChildCount = GetChildCount();
-        for (int i = 0; i < nChildCount; ++i)
-        {
-            const CBaseObject* pChild = GetChild(i);
-            dc.DrawLine(pChild->GetParentAttachPointWorldTM().GetTranslation(), pChild->GetWorldPos(), pChild->IsFrozen() ? kLinkColorGray : kLinkColorParent, pChild->IsFrozen() ? kLinkColorGray : kLinkColorChild);
-        }
-    }
-
-    // Draw Bounding box
-    if (dc.flags & DISPLAY_BBOX)
-    {
-        AABB box;
-        GetBoundBox(box);
-        dc.SetColor(Vec3(1, 1, 1));
-        dc.DrawWireBox(box.min, box.max);
-    }
-
-    if (IsHighlighted())
-    {
-        DrawHighlight(dc);
-    }
-
-    if (IsSelected())
-    {
-        DrawArea(dc);
-
-        CSelectionGroup* pSelection = GetObjectManager()->GetSelection();
-
-        // If the number of selected object is over 2, the merged boundbox should be used to render the measurement axis.
-        if (!pSelection || (pSelection && pSelection->GetCount() == 1))
-        {
-            DrawDimensions(dc);
-        }
-    }
-
-    if (bDisplaySelectionHelper)
-    {
-        DrawSelectionHelper(dc, wp, labelColor, 1.0f);
-    }
-    else if (!(dc.flags & DISPLAY_HIDENAMES))
-    {
-        DrawLabel(dc, wp, labelColor);
-    }
-
-    SetDrawTextureIconProperties(dc, wp);
-    DrawTextureIcon(dc, wp);
-    DrawWarningIcons(dc, wp);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DrawDimensions(DisplayContext&, AABB*)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DrawSelectionHelper(DisplayContext& dc, const Vec3& pos, const QColor& labelColor, [[maybe_unused]] float alpha)
-{
-    DrawLabel(dc, pos, labelColor);
-
-    dc.SetColor(GetColor());
-    if (IsHighlighted() || IsSelected() || IsInSelectionBox())
-    {
-        dc.SetColor(dc.GetSelectedColor());
-    }
-
-    uint32 nPrevState = dc.GetState();
-    dc.DepthTestOff();
-    float r = dc.view->GetScreenScaleFactor(pos) * 0.006f;
-    dc.DrawWireBox(pos - Vec3(r, r, r), pos + Vec3(r, r, r));
-    dc.SetState(nPrevState);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetDrawTextureIconProperties(DisplayContext& dc, const Vec3& pos, float alpha, int texIconFlags)
-{
-    if (gSettings.viewports.bShowIcons || gSettings.viewports.bShowSizeBasedIcons)
-    {
-        if (IsHighlighted())
-        {
-            dc.SetColor(QColor(255, 120, 0), 0.8f * alpha);
-        }
-        else if (IsSelected())
-        {
-            dc.SetSelectedColor(alpha);
-        }
-        else if (IsFrozen())
-        {
-            dc.SetFreezeColor();
-        }
-        else
-        {
-            dc.SetColor(QColor(255, 255, 255), alpha);
-        }
-
-        m_vDrawIconPos = pos;
-
-        int nIconFlags = texIconFlags;
-        if (CheckFlags(OBJFLAG_SHOW_ICONONTOP))
-        {
-            Vec3 objectPos = GetWorldPos();
-
-            AABB box;
-            GetBoundBox(box);
-            m_vDrawIconPos.z = (m_vDrawIconPos.z - objectPos.z) + box.max.z;
-            nIconFlags |= DisplayContext::TEXICON_ALIGN_BOTTOM;
-        }
-        m_nIconFlags = nIconFlags;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DrawTextureIcon(DisplayContext& dc, [[maybe_unused]] const Vec3& pos, [[maybe_unused]] float alpha)
-{
-    if (m_nTextureIcon && (gSettings.viewports.bShowIcons || gSettings.viewports.bShowSizeBasedIcons))
-    {
-        dc.DrawTextureLabel(GetTextureIconDrawPos(), OBJECT_TEXTURE_ICON_SIZEX, OBJECT_TEXTURE_ICON_SIZEY, GetTextureIcon(), GetTextureIconFlags());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DrawWarningIcons(DisplayContext& dc, const Vec3& pos)
-{
-    // 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;
-        const int warningIconSizeY = OBJECT_TEXTURE_ICON_SIZEY / 2;
-
-        const int iconOffsetX = m_nTextureIcon ? (-OBJECT_TEXTURE_ICON_SIZEX / 2) : 0;
-        const int iconOffsetY = m_nTextureIcon ? (-OBJECT_TEXTURE_ICON_SIZEY / 2) : 0;
-
-        if (gSettings.viewports.bShowScaleWarnings)
-        {
-            const EScaleWarningLevel scaleWarningLevel = GetScaleWarningLevel();
-
-            if (scaleWarningLevel != eScaleWarningLevel_None)
-            {
-                dc.SetColor(QColor(255, scaleWarningLevel == eScaleWarningLevel_RescaledNonUniform ? 50 : 255, 50), 1.0f);
-                dc.DrawTextureLabel(GetTextureIconDrawPos(), warningIconSizeX, warningIconSizeY,
-                    GetIEditor()->GetIconManager()->GetIconTexture(eIcon_ScaleWarning), GetTextureIconFlags(),
-                    -warningIconSizeX / 2, iconOffsetX - (warningIconSizeY / 2));
-            }
-        }
-
-        if (gSettings.viewports.bShowRotationWarnings)
-        {
-            const ERotationWarningLevel rotationWarningLevel = GetRotationWarningLevel();
-            if (rotationWarningLevel != eRotationWarningLevel_None)
-            {
-                dc.SetColor(QColor(255, rotationWarningLevel == eRotationWarningLevel_RotatedNonRectangular ? 50 : 255, 50), 1.0f);
-                dc.DrawTextureLabel(GetTextureIconDrawPos(), warningIconSizeX, warningIconSizeY,
-                    GetIEditor()->GetIconManager()->GetIconTexture(eIcon_RotationWarning), GetTextureIconFlags(),
-                    warningIconSizeX / 2, iconOffsetY - (warningIconSizeY / 2));
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DrawLabel(DisplayContext& dc, const Vec3& pos, const QColor& lC, float alpha, float size)
-{
-    QColor labelColor = lC;
-
-    AABB box;
-    GetBoundBox(box);
-
-    //p.z = box.max.z + 0.2f;
-    if ((dc.flags & DISPLAY_2D) && labelColor == QColor(255, 255, 255))
-    {
-        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))
-    {
-        float range = maxDist / 2.0f;
-        Vec3 c(labelColor.redF(), labelColor.greenF(), labelColor.redF());
-        if (IsSelected())
-        {
-            c = Vec3(dc.GetSelectedColor().redF(), dc.GetSelectedColor().greenF(), dc.GetSelectedColor().blueF());
-        }
-
-        float col[4] = { c.x, c.y, c.z, 1 };
-        if (dc.flags & DISPLAY_SELECTION_HELPERS)
-        {
-            if (IsHighlighted())
-            {
-                c = Vec3(dc.GetSelectedColor().redF(), dc.GetSelectedColor().greenF(), dc.GetSelectedColor().blueF());
-            }
-            col[0] = c.x;
-            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());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DrawHighlight(DisplayContext& dc)
-{
-    if (!m_nTextureIcon)
-    {
-        AABB box;
-        GetLocalBounds(box);
-
-        dc.PushMatrix(GetWorldTM());
-        dc.DrawWireBox(box.min, box.max);
-        dc.SetLineWidth(1);
-        dc.PopMatrix();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DrawBudgetUsage(DisplayContext& dc, const QColor& color)
-{
-    AABB box;
-    GetLocalBounds(box);
-
-    dc.SetColor(color);
-
-    dc.PushMatrix(GetWorldTM());
-    dc.DrawWireBox(box.min, box.max);
-    dc.PopMatrix();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void    CBaseObject::DrawAxis([[maybe_unused]] DisplayContext& dc, [[maybe_unused]] const Vec3& pos, [[maybe_unused]] float size)
-{
-    /*
-    dc.renderer->EnableDepthTest(false);
-    Vec3 x(size,0,0);
-    Vec3 y(0,size,0);
-    Vec3 z(0,0,size);
-
-    bool bWorldSpace = false;
-    if (dc.flags & DISPLAY_WORLDSPACEAXIS)
-        bWorldSpace = true;
-
-    Matrix tm = GetWorldTM();
-    Vec3 org = tm.TransformPoint( pos );
-
-    if (!bWorldSpace)
-    {
-        tm.NoScale();
-        x = tm.TransformVector(x);
-        y = tm.TransformVector(y);
-        z = tm.TransformVector(z);
-    }
-
-    float fScreenScale = dc.view->GetScreenScaleFactor(org);
-    x = x * fScreenScale;
-    y = y * fScreenScale;
-    z = z * fScreenScale;
-
-    float col[4] = { 1,1,1,1 };
-    float hcol[4] = { 1,0,0,1 };
-    dc.renderer->DrawLabelEx( org+x,1.2f,col,true,true,"X" );
-    dc.renderer->DrawLabelEx( org+y,1.2f,col,true,true,"Y" );
-    dc.renderer->DrawLabelEx( org+z,1.2f,col,true,true,"Z" );
-
-    Vec3 colX(1,0,0),colY(0,1,0),colZ(0,0,1);
-    if (s_highlightAxis)
-    {
-        float col[4] = { 1,0,0,1 };
-        if (s_highlightAxis == 1)
-        {
-            colX.Set(1,1,0);
-            dc.renderer->DrawLabelEx( org+x,1.2f,col,true,true,"X" );
-        }
-        if (s_highlightAxis == 2)
-        {
-            colY.Set(1,1,0);
-            dc.renderer->DrawLabelEx( org+y,1.2f,col,true,true,"Y" );
-        }
-        if (s_highlightAxis == 3)
-        {
-            colZ.Set(1,1,0);
-            dc.renderer->DrawLabelEx( org+z,1.2f,col,true,true,"Z" );
-        }
-    }
-
-    x = x * 0.8f;
-    y = y * 0.8f;
-    z = z * 0.8f;
-    float fArrowScale = fScreenScale * 0.07f;
-    dc.SetColor( colX );
-    dc.DrawArrow( org,org+x,fArrowScale );
-    dc.SetColor( colY );
-    dc.DrawArrow( org,org+y,fArrowScale );
-    dc.SetColor( colZ );
-    dc.DrawArrow( org,org+z,fArrowScale );
-
-    //dc.DrawLine( org,org+x,colX,colX );
-    //dc.DrawLine( org,org+y,colY,colY );
-    //dc.DrawLine( org,org+z,colZ,colZ );
-
-    dc.renderer->EnableDepthTest(true);
-    ///dc.SetColor( 0,1,1,1 );
-    //dc.DrawLine( p,p+dc.view->m_constructionPlane.m_normal*10.0f );
-    */
-}
-
-void CBaseObject::DrawArea(DisplayContext& dc)
-{
-    float area = m_flattenArea;
-    if (area > 0)
-    {
-        dc.SetColor(QColor(5, 5, 255), 1.f); // make it different color from the AI sight radius
-        Vec3 wp = GetWorldPos();
-        float z = GetIEditor()->GetTerrainElevation(wp.x, wp.y);
-        if (fabs(wp.z - z) < 5)
-        {
-            dc.DrawTerrainCircle(wp, area, 0.2f);
-        }
-        else
-        {
-            dc.DrawCircle(wp, area);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::CanBeDrawn(const DisplayContext& dc, bool& outDisplaySelectionHelper) const
-{
-    bool bResult = true;
-    outDisplaySelectionHelper = false;
-
-    if (dc.flags & DISPLAY_SELECTION_HELPERS)
-    {
-        // Check if this object type is masked for selection.
-        if ((GetType() & gSettings.objectSelectMask) && !IsFrozen())
-        {
-            if (IsSkipSelectionHelper())
-            {
-                return bResult;
-            }
-            if (CanBeHightlighted())
-            {
-                outDisplaySelectionHelper = true;
-            }
-        }
-        else
-        {
-            // Object helpers should not be displayed when object is not for selection.
-            bResult = false;
-        }
-    }
-
-    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(AZ::Debug::ProfileCategory::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)
-    {
-        double angle = 1;
-        Quat rot = GetRotation();
-        rot.SetRotationXYZ(Ang3(0, 0, rot.GetRotZ() + DEG2RAD(flags > 0 ? angle * (-1) : angle)));
-        SetRotation(rot);
-    }
-    return MOUSECREATE_CONTINUE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnEvent(ObjectEvent event)
-{
-    switch (event)
-    {
-    case EVENT_KEEP_HEIGHT:
-    {
-        float h = m_height;
-        float newz = GetIEditor()->GetTerrainElevation(m_pos.x, m_pos.y) + m_height;
-        SetPos(Vec3(m_pos.x, m_pos.y, newz));
-        m_height = h;
-    }
-    break;
-    case EVENT_CONFIG_SPEC_CHANGE:
-        UpdateVisibility(!IsHidden());
-        break;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetShared([[maybe_unused]] bool bShared)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetHidden(bool bHidden, uint64 hiddenID, bool bAnimated)
-{
-    if (CheckFlags(OBJFLAG_HIDDEN) != bHidden)
-    {
-        if (!bAnimated)
-        {
-            StoreUndo("Hide Object");
-        }
-
-        if (bHidden)
-        {
-            SetFlags(OBJFLAG_HIDDEN);
-        }
-        else
-        {
-            ClearFlags(OBJFLAG_HIDDEN);
-        }
-
-        m_hideOrder = hiddenID;
-        UpdateVisibility(!IsHidden());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetFrozen(bool bFrozen)
-{
-    if (CheckFlags(OBJFLAG_FROZEN) != bFrozen)
-    {
-        StoreUndo("Freeze Object");
-        if (bFrozen)
-        {
-            SetFlags(OBJFLAG_FROZEN);
-        }
-        else
-        {
-            ClearFlags(OBJFLAG_FROZEN);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetHighlight(bool bHighlight)
-{
-    if (bHighlight)
-    {
-        SetFlags(OBJFLAG_HIGHLIGHT);
-    }
-    else
-    {
-        ClearFlags(OBJFLAG_HIGHLIGHT);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetSelected(bool bSelect)
-{
-    if (bSelect)
-    {
-        SetFlags(OBJFLAG_SELECTED);
-        NotifyListeners(ON_SELECT);
-
-        //CLogFile::FormatLine( "Selected: %s, ID=%u",(const char*)m_name,m_id );
-    }
-    else
-    {
-        ClearFlags(OBJFLAG_SELECTED);
-        NotifyListeners(ON_UNSELECT);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsHiddenBySpec() const
-{
-    if (!gSettings.bApplyConfigSpecInEditor)
-    {
-        return false;
-    }
-
-    return (m_nMinSpec != 0 && gSettings.editorConfigSpec != 0 && m_nMinSpec > gSettings.editorConfigSpec);
-}
-
-//////////////////////////////////////////////////////////////////////////
-//! Returns true if object hidden.
-bool CBaseObject::IsHidden() const
-{
-    return (CheckFlags(OBJFLAG_HIDDEN)) ||
-            (m_classDesc && (gSettings.objectHideMask & GetType()));
-}
-
-//////////////////////////////////////////////////////////////////////////
-//! Returns true if object frozen.
-bool CBaseObject::IsFrozen() const
-{
-    return CheckFlags(OBJFLAG_FROZEN);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsSelectable() const
-{
-    // Not selectable if frozen.
-    return IsFrozen() ? false : true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::Serialize(CObjectArchive& ar)
-{
-    XmlNodeRef xmlNode = ar.node;
-
-    ITransformDelegate* pTransformDelegate = m_pTransformDelegate;
-    m_pTransformDelegate = nullptr;
-
-    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;
-
-        QString name = m_name;
-        QString mtlName;
-
-        Vec3 pos = m_pos;
-        Vec3 scale = m_scale;
-        Quat quat = m_rotate;
-        Ang3 angles(0, 0, 0);
-        uint32 nMinSpec = m_nMinSpec;
-
-        QColor color = m_color;
-        float flattenArea = m_flattenArea;
-
-        GUID parentId = GUID_NULL;
-        GUID lookatId = GUID_NULL;
-
-        xmlNode->getAttr("Name", name);
-        xmlNode->getAttr("Pos", pos);
-        if (!xmlNode->getAttr("Rotate", quat))
-        {
-            // Backward compatibility.
-            if (xmlNode->getAttr("Angles", angles))
-            {
-                angles = DEG2RAD(angles);
-                //angles.z += gf_PI/2;
-                quat.SetRotationXYZ(angles);
-            }
-        }
-
-        xmlNode->getAttr("Scale", scale);
-        xmlNode->getAttr("ColorRGB", color);
-        xmlNode->getAttr("FlattenArea", flattenArea);
-        xmlNode->getAttr("Flags", flags);
-        xmlNode->getAttr("Parent", parentId);
-        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.
-        {
-            m_nMinSpec = nMinSpec;
-        }
-
-        bool bHidden = flags & OBJFLAG_HIDDEN;
-        bool bFrozen = flags & OBJFLAG_FROZEN;
-
-        m_flags = flags;
-        m_flags &= ~OBJFLAG_PERSISTMASK;
-        m_flags |= (oldFlags) & (~OBJFLAG_PERSISTMASK);
-        //SetFlags( flags & OBJFLAG_PERSISTMASK );
-        m_flags &= ~OBJFLAG_SHARED; // clear shared flag
-        m_flags &= ~OBJFLAG_DELETED; // clear deleted flag
-
-        if (ar.bUndo)
-        {
-            DetachThis(false);
-        }
-
-        if (name != m_name)
-        {
-            // This may change object id.
-            SetName(name);
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        // Check if position is bad.
-        if (fabs(pos.x) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
-            fabs(pos.y) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
-            fabs(pos.z) > AZ::Constants::MaxFloatBeforePrecisionLoss)
-        {
-            // File Not found.
-            CErrorRecord err;
-            err.error = QStringLiteral("Object %1 have invalid position (%2,%3,%4)").arg(GetName()).arg(pos.x).arg(pos.y).arg(pos.z);
-            err.pObject = this;
-            err.severity = CErrorRecord::ESEVERITY_WARNING;
-            GetIEditor()->GetErrorReport()->ReportError(err);
-        }
-        //////////////////////////////////////////////////////////////////////////
-
-        if (!ar.bUndo)
-        {
-            SetLocalTM(pos, quat, scale);
-        }
-        else
-        {
-            SetLocalTM(pos, quat, scale, eObjectUpdateFlags_Undo);
-        }
-
-        SetColor(color);
-        SetArea(flattenArea);
-        SetFrozen(bFrozen);
-        SetHidden(bHidden);
-
-        ar.SetResolveCallback(this, parentId, AZStd::bind(&CBaseObject::ResolveParent, this, AZStd::placeholders::_1 ));
-        ar.SetResolveCallback(this, lookatId, AZStd::bind(&CBaseObject::SetLookAt, this, AZStd::placeholders::_1));
-
-        InvalidateTM(0);
-        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
-    {
-        // Saving.
-
-        // This attributed only readed by ObjectManager.
-        xmlNode->setAttr("Type", GetTypeName().toUtf8().data());
-
-        xmlNode->setAttr("Id", m_guid);
-
-        xmlNode->setAttr("Name", GetName().toUtf8().data());
-        xmlNode->setAttr("HideOrder", m_hideOrder);
-
-        if (m_parent)
-        {
-            xmlNode->setAttr("Parent", m_parent->GetId());
-        }
-
-        if (m_lookat)
-        {
-            xmlNode->setAttr("LookAt", m_lookat->GetId());
-        }
-
-        if (!IsEquivalent(GetPos(), Vec3(0, 0, 0), 0))
-        {
-            xmlNode->setAttr("Pos", GetPos());
-        }
-
-        xmlNode->setAttr("FloorNumber", m_floorNumber);
-
-        xmlNode->setAttr("Rotate", m_rotate);
-
-        if (!IsEquivalent(GetScale(), Vec3(1, 1, 1), 0))
-        {
-            xmlNode->setAttr("Scale", GetScale());
-        }
-
-        xmlNode->setAttr("ColorRGB", GetColor());
-
-        if (GetArea() != 0)
-        {
-            xmlNode->setAttr("FlattenArea", GetArea());
-        }
-
-        int flags = m_flags & OBJFLAG_PERSISTMASK;
-        if (flags != 0)
-        {
-            xmlNode->setAttr("Flags", flags);
-        }
-
-        if (m_nMinSpec != 0)
-        {
-            xmlNode->setAttr("MinSpec", (uint32)m_nMinSpec);
-        }
-    }
-
-    // Serialize variables after default entity parameters.
-    CVarObject::Serialize(xmlNode, ar.bLoading);
-
-    m_pTransformDelegate = pTransformDelegate;
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CBaseObject::Export([[maybe_unused]] const QString& levelPath, XmlNodeRef& xmlNode)
-{
-    XmlNodeRef objNode = xmlNode->newChild("Object");
-
-    objNode->setAttr("Type", GetTypeName().toUtf8().data());
-    objNode->setAttr("Name", GetName().toUtf8().data());
-
-    Vec3 pos, scale;
-    Quat rotate;
-    if (m_parent)
-    {
-        // Export world coordinates.
-        AffineParts ap;
-        ap.SpectralDecompose(GetWorldTM());
-
-        pos = ap.pos;
-        rotate = ap.rot;
-        scale = ap.scale;
-    }
-    else
-    {
-        pos = m_pos;
-        rotate = m_rotate;
-        scale = m_scale;
-    }
-
-    if (!IsEquivalent(pos, Vec3(0, 0, 0), 0))
-    {
-        objNode->setAttr("Pos", pos);
-    }
-
-    if (!rotate.IsIdentity())
-    {
-        objNode->setAttr("Rotate", rotate);
-    }
-
-    if (!IsEquivalent(scale, Vec3(0, 0, 0), 0))
-    {
-        objNode->setAttr("Scale", scale);
-    }
-
-    if (m_nMinSpec != 0)
-    {
-        objNode->setAttr("MinSpec", (uint32)m_nMinSpec);
-    }
-
-    // Save variables.
-    CVarObject::Serialize(objNode, false);
-
-    return objNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CBaseObject::FindObject(REFGUID id) const
-{
-    return GetObjectManager()->FindObject(id);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::StoreUndo(const char* UndoDescription, 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))
-    {
-        return;
-    }
-
-    if (CUndo::IsRecording())
-    {
-        if (minimal)
-        {
-            CUndo::Record(new CUndoBaseObjectMinimal(this, UndoDescription, flags));
-        }
-        else
-        {
-            CUndo::Record(new CUndoBaseObject(this, UndoDescription));
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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())
-    {
-        return className;
-    }
-
-    QString name;
-    name.append(className.mid(0, className.length() - subClassName.length()));
-    return name;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IntersectRectBounds(const AABB& bbox)
-{
-    AABB aabb;
-    GetBoundBox(aabb);
-
-    return aabb.IsIntersectBox(bbox);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IntersectRayBounds(const Ray& ray)
-{
-    Vec3 tmpPnt;
-    AABB aabb;
-    GetBoundBox(aabb);
-
-    return Intersect::Ray_AABB(ray, aabb, tmpPnt);
-}
-
-//////////////////////////////////////////////////////////////////////////
-namespace
-{
-    typedef std::pair<Vec2, Vec2> Edge2D;
-}
-bool IsIncludePointsInConvexHull(Edge2D* pEdgeArray0, int nEdgeArray0Size, Edge2D* pEdgeArray1, int nEdgeArray1Size)
-{
-    if (!pEdgeArray0 || !pEdgeArray1 || nEdgeArray0Size <= 0 || nEdgeArray1Size <= 0)
-    {
-        return false;
-    }
-
-    static const float kPointEdgeMaxInsideDistance(0.05f);
-
-    bool bInside(true);
-    for (int i = 0; i < nEdgeArray0Size; ++i)
-    {
-        const Vec2& v(pEdgeArray0[i].first);
-        bInside = true;
-        for (int k = 0; k < nEdgeArray1Size; ++k)
-        {
-            Vec2 v0 = pEdgeArray1[k].first;
-            Vec2 v1 = pEdgeArray1[k].second;
-            Vec3 direction(v1.x - v0.x, v1.y - v0.y, 0);
-            Vec3 up(0, 0, 1);
-            Vec3 z = up.Cross(direction);
-            Vec2 normal;
-            normal.x = z.x;
-            normal.y = z.y;
-            normal.Normalize();
-            float distance = -normal.Dot(v0);
-            if (normal.Dot(v) + distance > kPointEdgeMaxInsideDistance)
-            {
-                bInside = false;
-                break;
-            }
-        }
-        if (bInside)
-        {
-            break;
-        }
-    }
-    return bInside;
-}
-
-void ModifyConvexEdgeDirection(Edge2D* pEdgeArray, int nEdgeArraySize)
-{
-    if (!pEdgeArray || nEdgeArraySize < 2)
-    {
-        return;
-    }
-    Vec3 v0(pEdgeArray[0].first.x - pEdgeArray[0].second.x, pEdgeArray[0].first.y - pEdgeArray[0].second.y, 0);
-    Vec3 v1(pEdgeArray[1].second.x - pEdgeArray[1].first.x, pEdgeArray[1].second.y - pEdgeArray[1].first.y, 0);
-    Vec3 vCross = v0.Cross(v1);
-    if (vCross.z < 0)
-    {
-        for (int i = 0; i < nEdgeArraySize; ++i)
-        {
-            std::swap(pEdgeArray[i].first, pEdgeArray[i].second);
-        }
-    }
-}
-
-bool CBaseObject::HitTestRectBounds(HitContext& hc, const AABB& box)
-{
-    if (hc.bUseSelectionHelpers)
-    {
-        if (IsSkipSelectionHelper())
-        {
-            return false;
-        }
-    }
-
-    static const int kNumberOfBoundBoxPt(8);
-
-    // transform all 8 vertices into view space.
-    QPoint p[kNumberOfBoundBoxPt] =
-    {
-        hc.view->WorldToView(Vec3(box.min.x, box.min.y, box.min.z)),
-        hc.view->WorldToView(Vec3(box.min.x, box.max.y, box.min.z)),
-        hc.view->WorldToView(Vec3(box.max.x, box.min.y, box.min.z)),
-        hc.view->WorldToView(Vec3(box.max.x, box.max.y, box.min.z)),
-        hc.view->WorldToView(Vec3(box.min.x, box.min.y, box.max.z)),
-        hc.view->WorldToView(Vec3(box.min.x, box.max.y, box.max.z)),
-        hc.view->WorldToView(Vec3(box.max.x, box.min.y, box.max.z)),
-        hc.view->WorldToView(Vec3(box.max.x, box.max.y, box.max.z))
-    };
-
-    QRect objrc;
-    objrc.setLeft(10000);
-    objrc.setTop(10000);
-    objrc.setRight(-10000);
-    objrc.setBottom(-10000);
-
-    // find new min/max values
-    for (int i = 0; i < 8; i++)
-    {
-        objrc.setLeft(min(objrc.left(), p[i].x()));
-        objrc.setRight(max(objrc.right(), p[i].x()));
-        objrc.setTop(min(objrc.top(), p[i].y()));
-        objrc.setBottom(max(objrc.bottom(), p[i].y()));
-    }
-    if (objrc.isEmpty())
-    {
-        // Make objrc at least of size 1.
-        objrc.moveBottomRight(objrc.bottomRight() + QPoint(1, 1));
-    }
-
-    if (hc.rect.contains(objrc.topLeft()) &&
-        hc.rect.contains(objrc.bottomLeft()) &&
-        hc.rect.contains(objrc.topRight()) &&
-        hc.rect.contains(objrc.bottomRight()))
-    {
-        hc.object = this;
-        return true;
-    }
-
-    if (objrc.intersects(hc.rect))
-    {
-        AABB localAABB;
-        GetLocalBounds(localAABB);
-        CBaseObject* pOldObj = hc.object;
-        hc.object = this;
-        if (localAABB.IsEmpty())
-        {
-            return true;
-        }
-
-        const int kMaxSizeOfEdgeList0(4);
-        Edge2D edgelist0[kMaxSizeOfEdgeList0] = {
-            Edge2D(Vec2(hc.rect.left(), hc.rect.top()), Vec2(hc.rect.right(), hc.rect.top())),
-            Edge2D(Vec2(hc.rect.right(), hc.rect.top()), Vec2(hc.rect.right(), hc.rect.bottom())),
-            Edge2D(Vec2(hc.rect.right(), hc.rect.bottom()), Vec2(hc.rect.left(), hc.rect.bottom())),
-            Edge2D(Vec2(hc.rect.left(), hc.rect.bottom()), Vec2(hc.rect.left(), hc.rect.top()))
-        };
-
-        const int kMaxSizeOfEdgeList1(8);
-        Edge2D edgelist1[kMaxSizeOfEdgeList1];
-        int nEdgeList1Count(kMaxSizeOfEdgeList1);
-
-        const Matrix34& worldTM(GetWorldTM());
-        OBB obb = OBB::CreateOBBfromAABB(Matrix33(worldTM), localAABB);
-        Vec3 ax = obb.m33.GetColumn0() * obb.h.x;
-        Vec3 ay = obb.m33.GetColumn1() * obb.h.y;
-        Vec3 az = obb.m33.GetColumn2() * obb.h.z;
-        QPoint obb_p[kMaxSizeOfEdgeList1] =
-        {
-            hc.view->WorldToView(-ax - ay - az + worldTM.GetTranslation()),
-            hc.view->WorldToView(-ax - ay + az + worldTM.GetTranslation()),
-            hc.view->WorldToView(-ax + ay - az + worldTM.GetTranslation()),
-            hc.view->WorldToView(-ax + ay + az + worldTM.GetTranslation()),
-            hc.view->WorldToView(ax - ay - az + worldTM.GetTranslation()),
-            hc.view->WorldToView(ax - ay + az + worldTM.GetTranslation()),
-            hc.view->WorldToView(ax + ay - az + worldTM.GetTranslation()),
-            hc.view->WorldToView(ax + ay + az + worldTM.GetTranslation())
-        };
-
-        std::vector<Vec3> pointsForRegion1;
-        pointsForRegion1.reserve(kMaxSizeOfEdgeList1);
-        for (int i = 0; i < kMaxSizeOfEdgeList1; ++i)
-        {
-            pointsForRegion1.push_back(Vec3(obb_p[i].x(), obb_p[i].y(), 0));
-        }
-
-        std::vector<Vec3> convexHullForRegion1;
-        ConvexHull2D(convexHullForRegion1, pointsForRegion1);
-        nEdgeList1Count = convexHullForRegion1.size();
-        if (nEdgeList1Count < 3 || nEdgeList1Count > kMaxSizeOfEdgeList1)
-        {
-            return true;
-        }
-
-        for (int i = 0; i < nEdgeList1Count; ++i)
-        {
-            int iNextI = (i + 1) % nEdgeList1Count;
-            edgelist1[i] = Edge2D(Vec2(convexHullForRegion1[i].x, convexHullForRegion1[i].y), Vec2(convexHullForRegion1[iNextI].x, convexHullForRegion1[iNextI].y));
-        }
-
-        ModifyConvexEdgeDirection(edgelist0, kMaxSizeOfEdgeList0);
-        ModifyConvexEdgeDirection(edgelist1, nEdgeList1Count);
-
-        bool bInside = IsIncludePointsInConvexHull(edgelist0, kMaxSizeOfEdgeList0, edgelist1, nEdgeList1Count);
-        if (!bInside)
-        {
-            bInside = IsIncludePointsInConvexHull(edgelist1, nEdgeList1Count, edgelist0, kMaxSizeOfEdgeList0);
-        }
-        if (!bInside)
-        {
-            hc.object = pOldObj;
-            return false;
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::HitTestRect(HitContext& hc)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
-
-    AABB box;
-
-    if (hc.bUseSelectionHelpers)
-    {
-        if (IsSkipSelectionHelper())
-        {
-            return false;
-        }
-        box.min = GetWorldPos();
-        box.max = box.min;
-    }
-    else
-    {
-        // Retrieve world space bound box.
-        GetBoundBox(box);
-    }
-
-    bool bHit = HitTestRectBounds(hc, box);
-    m_bInSelectionBox = bHit;
-    if (bHit)
-    {
-        hc.object = this;
-    }
-    return bHit;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::HitHelperTest(HitContext& hc)
-{
-    return HitHelperAtTest(hc, GetWorldPos());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::HitHelperAtTest(HitContext& hc, const Vec3& pos)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
-
-    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 *= OBJECT_TEXTURE_ICON_SCALE / fScreenScale;
-            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
-{
-    assert(i >= 0 && i < m_childs.size());
-    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::GetAllChildren(TBaseObjects& outAllChildren, CBaseObject* pObj) const
-{
-    const CBaseObject* pBaseObj = pObj ? pObj : this;
-
-    for (int i = 0, iChildCount(pBaseObj->GetChildCount()); i < iChildCount; ++i)
-    {
-        CBaseObject* pChild = pBaseObj->GetChild(i);
-        if (pChild == NULL)
-        {
-            continue;
-        }
-        outAllChildren.push_back(pChild);
-        GetAllChildren(outAllChildren, pChild);
-    }
-}
-
-void CBaseObject::GetAllChildren(DynArray< _smart_ptr<CBaseObject> >& outAllChildren, CBaseObject* pObj) const
-{
-    const CBaseObject* pBaseObj = pObj ? pObj : this;
-
-    for (int i = 0, iChildCount(pBaseObj->GetChildCount()); i < iChildCount; ++i)
-    {
-        CBaseObject* pChild = pBaseObj->GetChild(i);
-        if (pChild == NULL)
-        {
-            continue;
-        }
-        outAllChildren.push_back(pChild);
-        GetAllChildren(outAllChildren, pChild);
-    }
-}
-
-void CBaseObject::GetAllChildren(CSelectionGroup& outAllChildren, CBaseObject* pObj) const
-{
-    const CBaseObject* pBaseObj = pObj ? pObj : this;
-
-    for (int i = 0, iChildCount(pBaseObj->GetChildCount()); i < iChildCount; ++i)
-    {
-        CBaseObject* pChild = pBaseObj->GetChild(i);
-        if (pChild == NULL)
-        {
-            continue;
-        }
-        outAllChildren.AddObject(pChild);
-        GetAllChildren(outAllChildren, pChild);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::CloneChildren(CBaseObject* pFromObject)
-{
-    if (pFromObject == NULL)
-    {
-        return;
-    }
-
-    for (int i = 0, nChildCount(pFromObject->GetChildCount()); i < nChildCount; ++i)
-    {
-        CBaseObject* pFromChildObject = pFromObject->GetChild(i);
-
-        CBaseObject* pChildClone = GetObjectManager()->CloneObject(pFromChildObject);
-        if (pChildClone == NULL)
-        {
-            continue;
-        }
-
-        pChildClone->CloneChildren(pFromChildObject);
-        AddMember(pChildClone, false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos)
-{
-    Matrix34 childTM;
-    ITransformDelegate* pTransformDelegate;
-    ITransformDelegate* pChildTransformDelegate;
-
-    {
-        CScopedSuspendUndo suspendUndo;
-
-        assert(child);
-        if (!child || child == GetLookAt())
-        {
-            return;
-        }
-
-        static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(child, ON_PREATTACHED);
-        child->NotifyListeners(bKeepPos ? ON_PREATTACHEDKEEPXFORM : ON_PREATTACHED);
-
-        pTransformDelegate = m_pTransformDelegate;
-        pChildTransformDelegate = child->m_pTransformDelegate;
-        SetTransformDelegate(nullptr);
-        child->SetTransformDelegate(nullptr);
-
-        if (bKeepPos)
-        {
-            child->InvalidateTM(0);
-            childTM = child->GetWorldTM();
-        }
-
-        // If not already attached to this node.
-        if (child->m_parent == this)
-        {
-            return;
-        }
-
-        // Add to child list first to make sure node not get deleted while reattaching.
-        m_childs.push_back(child);
-        if (child->m_parent)
-        {
-            child->DetachThis(bKeepPos);    // Detach node if attached to other parent.
-        }
-        //////////////////////////////////////////////////////////////////////////
-        child->m_parent = this; // Assign this node as parent to child node.
-    }
-
-    {
-        CScopedSuspendUndo suspendUndo;
-
-        {
-            if (bKeepPos)
-            {
-                child->SetWorldTM(childTM);
-            }
-
-            child->InvalidateTM(0);
-        }
-
-        m_pTransformDelegate = pTransformDelegate;
-        child->m_pTransformDelegate = pChildTransformDelegate;
-
-        static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(child, ON_ATTACHED);
-        child->NotifyListeners(ON_ATTACHED);
-
-        NotifyListeners(ON_CHILDATTACHED);
-    }
-
-    if (CUndo::IsRecording())
-    {
-        CUndo::Record(new CUndoAttachBaseObject(child, bKeepPos, true));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DetachAll(bool bKeepPos)
-{
-    while (!m_childs.empty())
-    {
-        CBaseObject* child = *m_childs.begin();
-        child->DetachThis(bKeepPos);
-        NotifyListeners(ON_CHILDDETACHED);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::DetachThis(bool bKeepPos)
-{
-    if (m_parent)
-    {
-        if (CUndo::IsRecording())
-        {
-            CUndo::Record(new CUndoAttachBaseObject(this, bKeepPos, false));
-        }
-
-        Matrix34 worldTM;
-        ITransformDelegate* pTransformDelegate;
-
-        {
-            CScopedSuspendUndo suspendUndo;
-            static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(this, ON_PREDETACHED);
-            NotifyListeners(bKeepPos ? ON_PREDETACHEDKEEPXFORM : ON_PREDETACHED);
-
-            pTransformDelegate = m_pTransformDelegate;
-            SetTransformDelegate(nullptr);
-
-            if (bKeepPos)
-            {
-                ITransformDelegate* pParentTransformDelegate = m_parent->m_pTransformDelegate;
-                m_parent->SetTransformDelegate(nullptr);
-                worldTM = GetWorldTM();
-                m_parent->SetTransformDelegate(pParentTransformDelegate);
-            }
-        }
-
-        {
-            CScopedSuspendUndo suspendUndo;
-
-            // Copy parent to temp var, erasing child from parent may delete this node if child referenced only from parent.
-            CBaseObject* parent = m_parent;
-            m_parent = 0;
-            parent->RemoveChild(this);
-
-            if (bKeepPos)
-            {
-                // Keep old world space transformation.
-                SetWorldTM(worldTM);
-            }
-
-            SetTransformDelegate(pTransformDelegate);
-
-            static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(this, ON_DETACHED);
-            NotifyListeners(ON_DETACHED);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::RemoveChild(CBaseObject* node)
-{
-    Childs::iterator it = std::find(m_childs.begin(), m_childs.end(), node);
-    if (it != m_childs.end())
-    {
-        m_childs.erase(it);
-        NotifyListeners(ON_CHILDDETACHED);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::ResolveParent(CBaseObject* parent)
-{
-    // even though parent is same as m_parent, adding the member to the parent must be done.
-    if (parent)
-    {
-        parent->AddMember(this, false);
-    }
-    else
-    {
-        DetachThis(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::CalcLocalTM(Matrix34& tm) const
-{
-    tm.SetIdentity();
-
-    if (m_lookat)
-    {
-        Vec3 pos = GetPos();
-
-        if (m_parent)
-        {
-            // Get our world position.
-            pos = GetParentAttachPointWorldTM().TransformPoint(pos);
-        }
-
-        // Calculate local TM matrix differently.
-        Vec3 lookatPos = m_lookat->GetWorldPos();
-        if (lookatPos == pos) // if target at object pos
-        {
-            tm.SetTranslation(pos);
-        }
-        else
-        {
-            tm = Matrix34(Matrix33::CreateRotationVDir((lookatPos - pos).GetNormalized()), pos);
-        }
-        if (m_parent)
-        {
-            Matrix34 invParentTM = m_parent->GetWorldTM();
-            invParentTM.Invert();
-            tm = invParentTM * tm;
-        }
-    }
-    else
-    {
-        tm = Matrix34::Create(GetScale(), GetRotation(), GetPos());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Matrix34& CBaseObject::GetWorldTM() const
-{
-    if (!m_bMatrixValid)
-    {
-        m_worldTM = GetLocalTM();
-        m_bMatrixValid = true;
-        m_bMatrixInWorldSpace = false;
-        m_bWorldBoxValid = false;
-    }
-    if (!m_bMatrixInWorldSpace)
-    {
-        CBaseObject* parent = GetParent();
-        if (parent)
-        {
-            m_worldTM = GetParentAttachPointWorldTM() * m_worldTM;
-        }
-        m_bMatrixInWorldSpace = true;
-        m_bWorldBoxValid = false;
-    }
-    return m_worldTM;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Matrix34 CBaseObject::GetParentAttachPointWorldTM() const
-{
-    CBaseObject* pParent = GetParent();
-    if (pParent)
-    {
-        return pParent->GetWorldTM();
-    }
-
-    return Matrix34(IDENTITY);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsParentAttachmentValid() const
-{
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::InvalidateTM([[maybe_unused]] int flags)
-{
-    bool bMatrixWasValid = m_bMatrixValid;
-
-    m_bMatrixInWorldSpace = false;
-    m_bMatrixValid = false;
-    m_bWorldBoxValid = false;
-
-    // If matrix was valid, invalidate all childs.
-    if (bMatrixWasValid)
-    {
-        if (m_lookatSource)
-        {
-            m_lookatSource->InvalidateTM(eObjectUpdateFlags_ParentChanged);
-        }
-
-        // Invalidate matrices off all child objects.
-        for (int i = 0; i < m_childs.size(); i++)
-        {
-            if (m_childs[i] != 0 && m_childs[i]->m_bMatrixValid)
-            {
-                m_childs[i]->InvalidateTM(eObjectUpdateFlags_ParentChanged);
-            }
-        }
-        NotifyListeners(ON_TRANSFORM);
-
-        // Notify parent that we were modified.
-        if (m_parent)
-        {
-            m_parent->OnChildModified();
-        }
-    }
-
-    if (m_pTransformDelegate)
-    {
-        m_pTransformDelegate->MatrixInvalidated();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetLocalTM(const Vec3& pos, const Quat& rotate, const Vec3& scale, int flags)
-{
-    const bool b1 = SetPos(pos, flags | eObjectUpdateFlags_DoNotInvalidate);
-    const bool b2 = SetRotation(rotate, flags | eObjectUpdateFlags_DoNotInvalidate);
-    const bool b3 = SetScale(scale, flags | eObjectUpdateFlags_DoNotInvalidate);
-
-    if (b1 || b2 || b3 || flags == eObjectUpdateFlags_Animated)
-    {
-        flags = (b1) ? (flags | eObjectUpdateFlags_PositionChanged) : (flags & (~eObjectUpdateFlags_PositionChanged));
-        flags = (b2) ? (flags | eObjectUpdateFlags_RotationChanged) : (flags & (~eObjectUpdateFlags_RotationChanged));
-        flags = (b3) ? (flags | eObjectUpdateFlags_ScaleChanged) : (flags & (~eObjectUpdateFlags_ScaleChanged));
-        InvalidateTM(flags);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetLocalTM(const Matrix34& tm, int flags)
-{
-    if (m_lookat)
-    {
-        bool b1 = SetPos(tm.GetTranslation(), eObjectUpdateFlags_DoNotInvalidate);
-        flags = (b1) ? (flags | eObjectUpdateFlags_PositionChanged) : (flags & (~eObjectUpdateFlags_PositionChanged));
-        InvalidateTM(flags);
-    }
-    else
-    {
-        AffineParts affineParts;
-        affineParts.SpectralDecompose(tm);
-        SetLocalTM(affineParts.pos, affineParts.rot, affineParts.scale, flags);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetWorldPos(const Vec3& pos, int flags)
-{
-    if (GetParent())
-    {
-        Matrix34 invParentTM = GetParentAttachPointWorldTM();
-        invParentTM.Invert();
-        Vec3 posLocal = invParentTM * pos;
-        SetPos(posLocal, flags);
-    }
-    else
-    {
-        SetPos(pos, flags);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetWorldTM(const Matrix34& tm, int flags)
-{
-    if (GetParent())
-    {
-        Matrix34 invParentTM = GetParentAttachPointWorldTM();
-        invParentTM.Invert();
-        Matrix34 localTM = invParentTM * tm;
-        SetLocalTM(localTM, flags);
-    }
-    else
-    {
-        SetLocalTM(tm, flags);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::UpdateVisibility(bool bVisible)
-{
-    if (bVisible == CheckFlags(OBJFLAG_INVISIBLE))
-    {
-        if (IObjectManager* objectManager = GetObjectManager())
-        {
-            objectManager->InvalidateVisibleList();
-        }
-
-        if (!bVisible)
-        {
-            m_flags |= OBJFLAG_INVISIBLE;
-        }
-        else
-        {
-            m_flags &= ~OBJFLAG_INVISIBLE;
-        }
-
-        NotifyListeners(ON_VISIBILITY);
-
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::AddGizmo(CGizmo* gizmo)
-{
-    GetObjectManager()->GetGizmoManager()->AddGizmo(gizmo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::RemoveGizmo(CGizmo* gizmo)
-{
-    GetObjectManager()->GetGizmoManager()->RemoveGizmo(gizmo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetLookAt(CBaseObject* target)
-{
-    if (m_lookat == target)
-    {
-        return;
-    }
-
-    StoreUndo("Change LookAt");
-
-    if (m_lookat)
-    {
-        // Unbind current lookat.
-        m_lookat->m_lookatSource = nullptr;
-    }
-    m_lookat = target;
-    if (m_lookat)
-    {
-        m_lookat->m_lookatSource = this;
-    }
-
-    InvalidateTM(0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsLookAtTarget() const
-{
-    return m_lookatSource != 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::AddEventListener(EventListener* listener)
-{
-    if (find(m_eventListeners.begin(), m_eventListeners.end(), listener) == m_eventListeners.end())
-    {
-        m_eventListeners.push_back(listener);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::RemoveEventListener(EventListener* listener)
-{
-    std::vector<EventListener*>::iterator listenerFound = find(m_eventListeners.begin(), m_eventListeners.end(), listener);
-    if (listenerFound != m_eventListeners.end())
-    {
-        (*listenerFound) = nullptr;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool IsBaseObjectEventCallbackNULL(CBaseObject::EventListener* listener) { return listener == nullptr; }
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::NotifyListeners(EObjectListenerEvent event)
-{
-    for (auto it = m_eventListeners.begin(); it != m_eventListeners.end(); ++it)
-    {
-        // Call listener callback.
-        if (*it)
-        {
-            (*it)->OnObjectEvent(this, event);
-        }
-    }
-
-    m_eventListeners.erase(remove_if(m_eventListeners.begin(), m_eventListeners.end(), IsBaseObjectEventCallbackNULL), std::end(m_eventListeners));
-}
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::ConvertFromObject(CBaseObject* object)
-{
-    SetLocalTM(object->GetLocalTM());
-    SetName(object->GetName());
-    SetColor(object->GetColor());
-    m_flattenArea = object->m_flattenArea;
-    if (object->GetParent())
-    {
-        object->GetParent()->AttachChild(this);
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsPotentiallyVisible() const
-{
-    if (CheckFlags(OBJFLAG_HIDDEN))
-    {
-        return false;
-    }
-    if (gSettings.objectHideMask & GetType())
-    {
-        return false;
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-//! Analyze errors for this object.
-void CBaseObject::Validate(IErrorReport* report)
-{
-    // Checks for invalid values in base object.
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check if position is bad.
-    const Vec3 pos = GetPos();
-
-    if (fabs(pos.x) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
-        fabs(pos.y) > AZ::Constants::MaxFloatBeforePrecisionLoss ||
-        fabs(pos.z) > AZ::Constants::MaxFloatBeforePrecisionLoss)
-    {
-        // File Not found.
-        CErrorRecord err;
-        err.error = QStringLiteral("Object %1 have invalid position (%2,%3,%4)").arg(GetName()).arg(pos.x).arg(pos.y).arg(pos.z);
-        err.pObject = this;
-        report->ReportError(err);
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    float minScale = 0.01f;
-    float maxScale = 1000.0f;
-    //////////////////////////////////////////////////////////////////////////
-    // Check if position is bad.
-    if (m_scale.x < minScale || m_scale.x > maxScale ||
-        m_scale.y < minScale || m_scale.y > maxScale ||
-        m_scale.z < minScale || m_scale.z > maxScale)
-    {
-        // File Not found.
-        CErrorRecord err;
-        err.error = QStringLiteral("Object %1 have invalid scale (%2,%3,%4)").arg(GetName()).arg(m_scale.x).arg(m_scale.y).arg(m_scale.z);
-        err.pObject = this;
-        report->ReportError(err);
-    }
-    //////////////////////////////////////////////////////////////////////////
-};
-
-//////////////////////////////////////////////////////////////////////////
-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)
-{
-    if (GetVarBlock())
-    {
-        GetVarBlock()->GatherUsedResources(resources);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsSimilarObject(CBaseObject* pObject)
-{
-    if (pObject->GetClassDesc() == GetClassDesc() && pObject->metaObject() == metaObject())
-    {
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetMinSpec(uint32 nSpec, bool bSetChildren)
-{
-    m_nMinSpec = nSpec;
-    UpdateVisibility(!IsHidden());
-
-    // Set min spec for all childs.
-    if (bSetChildren)
-    {
-        for (int i = m_childs.size() - 1; i >= 0; --i)
-        {
-            m_childs[i]->SetMinSpec(nSpec, true);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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;
-    }
-
-    Matrix34A worldTM;
-    IStatObj* pStatObj = pRenderNode->GetEntityStatObj(0, 0, &worldTM);
-    if (!pStatObj)
-    {
-        return false;
-    }
-
-    // transform decal into object space
-    Matrix34A 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, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-EScaleWarningLevel CBaseObject::GetScaleWarningLevel() const
-{
-    EScaleWarningLevel scaleWarningLevel = eScaleWarningLevel_None;
-
-    const float kScaleThreshold = 0.001f;
-
-    if (fabs(m_scale.x - 1.0f) > kScaleThreshold
-        || fabs(m_scale.y - 1.0f) > kScaleThreshold
-        || fabs(m_scale.z - 1.0f) > kScaleThreshold)
-    {
-        if (fabs(m_scale.x - m_scale.y) < kScaleThreshold
-            && fabs(m_scale.y - m_scale.z) < kScaleThreshold)
-        {
-            scaleWarningLevel = eScaleWarningLevel_Rescaled;
-        }
-        else
-        {
-            scaleWarningLevel = eScaleWarningLevel_RescaledNonUniform;
-        }
-    }
-
-    return scaleWarningLevel;
-}
-
-//////////////////////////////////////////////////////////////////////////
-ERotationWarningLevel CBaseObject::GetRotationWarningLevel() const
-{
-    ERotationWarningLevel rotationWarningLevel = eRotationWarningLevel_None;
-
-    const float kRotationThreshold = 0.01f;
-
-    Ang3 eulerRotation = Ang3(GetRotation());
-
-    if (fabs(eulerRotation.x) > kRotationThreshold
-        || fabs(eulerRotation.y) > kRotationThreshold
-        || fabs(eulerRotation.z) > kRotationThreshold)
-    {
-        const float xRotationMod = fabs(fmod(eulerRotation.x, gf_PI / 2.0f));
-        const float yRotationMod = fabs(fmod(eulerRotation.y, gf_PI / 2.0f));
-        const float zRotationMod = fabs(fmod(eulerRotation.z, gf_PI / 2.0f));
-
-        if ((xRotationMod < kRotationThreshold || xRotationMod > (gf_PI / 2.0f - kRotationThreshold))
-            && (yRotationMod < kRotationThreshold || yRotationMod > (gf_PI / 2.0f - kRotationThreshold))
-            && (zRotationMod < kRotationThreshold || zRotationMod > (gf_PI / 2.0f - kRotationThreshold)))
-        {
-            rotationWarningLevel = eRotationWarningLevel_Rotated;
-        }
-        else
-        {
-            rotationWarningLevel = eRotationWarningLevel_RotatedNonRectangular;
-        }
-    }
-
-    return rotationWarningLevel;
-}
-
-bool CBaseObject::IsSkipSelectionHelper() const
-{
-    return false;
-}
-
-bool CBaseObject::CanBeHightlighted() const
-{
-    return true;
-}
-
-Matrix33 CBaseObject::GetWorldRotTM() const
-{
-    if (GetParent())
-    {
-        return GetParent()->GetWorldRotTM() * Matrix33(GetRotation());
-    }
-    return Matrix33(GetRotation());
-}
-
-Matrix33 CBaseObject::GetWorldScaleTM() const
-{
-    if (GetParent())
-    {
-        return GetParent()->GetWorldScaleTM() * Matrix33::CreateScale(GetScale());
-    }
-    return Matrix33::CreateScale(GetScale());
-}
-
-void CBaseObject::SetTransformDelegate(ITransformDelegate* pTransformDelegate)
-{
-    m_pTransformDelegate = pTransformDelegate;
-    InvalidateTM(0);
-}
-
-void CBaseObject::AddMember(CBaseObject* pMember, bool bKeepPos /*=true */)
-{
-    AttachChild(pMember, bKeepPos);
-}
-
-void CBaseObject::OnBeforeAreaChange()
-{
-    AABB aabb;
-    GetBoundBox(aabb);
-    GetIEditor()->GetGameEngine()->OnAreaModified(aabb);
-}
-
-#include <Objects/moc_BaseObject.cpp>
diff --git a/Code/Sandbox/Editor/Objects/BaseObject.h b/Code/Sandbox/Editor/Objects/BaseObject.h
deleted file mode 100644
index f03c3b5a2e..0000000000
--- a/Code/Sandbox/Editor/Objects/BaseObject.h
+++ /dev/null
@@ -1,852 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Definition of basic Editor object.
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_BASEOBJECT_H
-#define CRYINCLUDE_EDITOR_OBJECTS_BASEOBJECT_H
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-#include "Include/HitContext.h"
-#include "ClassDesc.h"
-#include "DisplayContext.h"
-#include "ObjectLoader.h"
-#include "Util/Variable.h"
-
-#include "AzCore/Math/Guid.h"
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// forward declarations.
-class CUndoBaseObject;
-class CObjectManager;
-class CGizmo;
-class CObjectArchive;
-struct SSubObjSelectionModifyContext;
-struct SRayHitInfo;
-class ISubObjectSelectionReferenceFrameCalculator;
-class CPopupMenuItem;
-class QMenu;
-struct IRenderNode;
-struct IStatObj;
-
-//////////////////////////////////////////////////////////////////////////
-typedef _smart_ptr<CBaseObject> CBaseObjectPtr;
-typedef std::vector<CBaseObjectPtr> TBaseObjects;
-
-//////////////////////////////////////////////////////////////////////////
-/*!
-This class used for object references remapping during cloning operation.
-*/
-class CObjectCloneContext
-{
-public:
-    //! Add cloned object.
-    SANDBOX_API void AddClone(CBaseObject* pFromObject, CBaseObject* pToObject);
-
-    //! Find cloned object for given object.
-    SANDBOX_API CBaseObject* FindClone(CBaseObject* pFromObject);
-
-    // Find id of the cloned object.
-    GUID ResolveClonedID(REFGUID guid);
-
-private:
-    typedef std::map<CBaseObject*, CBaseObject*> ObjectsMap;
-    ObjectsMap m_objectsMap;
-};
-
-//////////////////////////////////////////////////////////////////////////
-enum EObjectChangedOpType
-{
-    eOCOT_Empty = 0,
-    eOCOT_Modify,
-    eOCOT_ModifyTransform,
-    eOCOT_ModifyTransformInLibOnly,
-    eOCOT_Add,
-    eOCOT_Delete,
-    eOCOT_Count
-};
-
-struct SObjectChangedContext
-{
-    GUID m_modifiedObjectGlobalId; //! The object id globaly unique and used in ObjectManager
-    EObjectChangedOpType m_operation; //! What was the operation on the modified object
-    Matrix34 m_localTM; //! If we are in modify transform case this is the local TM info
-
-    SObjectChangedContext(EObjectChangedOpType optype)
-        : m_modifiedObjectGlobalId(GUID_NULL)
-        , m_operation(optype) { m_localTM.SetIdentity(); }
-    SObjectChangedContext()
-        : m_modifiedObjectGlobalId(GUID_NULL)
-        , m_operation(eOCOT_Empty) { m_localTM.SetIdentity(); }
-};
-
-//////////////////////////////////////////////////////////////////////////
-enum ObjectFlags
-{
-    OBJFLAG_SELECTED    = 0x0001,   //!< Object is selected. (Do not set this flag explicitly).
-    OBJFLAG_HIDDEN      = 0x0002,   //!< Object is hidden.
-    OBJFLAG_FROZEN      = 0x0004,   //!< Object is frozen (Visible but cannot be selected)
-    OBJFLAG_FLATTEN     = 0x0008,   //!< Flatten area around object.
-    OBJFLAG_SHARED      = 0x0010,   //!< This object is shared between missions.
-
-    OBJFLAG_KEEP_HEIGHT = 0x0040,   //!< This object should try to preserve height when snapping to flat objects.
-
-    OBJFLAG_NO_HITTEST  = 0x0080,   //!< This object will be not a target of ray hit test for deep selection mode.
-    OBJFLAG_IS_PARTICLE = 0x0100,
-    // object is in editing mode.
-    OBJFLAG_EDITING     = 0x01000,
-    OBJFLAG_ATTACHING   = 0x02000,  //!< Object in attaching to group mode.
-    OBJFLAG_DELETED     = 0x04000,  //!< This object is deleted.
-    OBJFLAG_HIGHLIGHT   = 0x08000,  //!< Object is highlighted (When mouse over).
-    OBJFLAG_INVISIBLE       = 0x10000,  //!< This object is invisible.
-    OBJFLAG_SUBOBJ_EDITING = 0x20000,   //!< This object is in the sub object editing mode.
-
-    OBJFLAG_SHOW_ICONONTOP = 0x100000,  //!< Icon will be drawn on top of the object.
-    OBJFLAG_HIDE_HELPERS = 0x200000,    //!< Helpers will be hidden.
-    OBJFLAG_DONT_SAVE   = 0x400000, //!< Object will not be saved with editor xml data.
-
-    OBJFLAG_PERSISTMASK = OBJFLAG_HIDDEN | OBJFLAG_FROZEN | OBJFLAG_FLATTEN,
-};
-
-#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
-{
-    MOUSECREATE_CONTINUE = 0,   //!< Continue placing this object.
-    MOUSECREATE_ABORT,              //!< Abort creation of this object.
-    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
-{
-    eObjectUpdateFlags_UserInput                = 0x00001,
-    eObjectUpdateFlags_PositionChanged  = 0x00002,
-    eObjectUpdateFlags_RotationChanged  = 0x00004,
-    eObjectUpdateFlags_ScaleChanged         = 0x00008,
-    eObjectUpdateFlags_DoNotInvalidate  = 0x00100, // Do not cause InvalidateTM call.
-    eObjectUpdateFlags_ParentChanged        = 0x00200, // When parent transformation change.
-    eObjectUpdateFlags_Undo                         = 0x00400, // When doing undo operation.
-    eObjectUpdateFlags_RestoreUndo          = 0x00800, // When doing RestoreUndo operation (This is different from normal undo).
-    eObjectUpdateFlags_Animated                 = 0x01000, // When doing animation.
-    eObjectUpdateFlags_MoveTool                 = 0x02000, // Transformation changed by the move tool
-    eObjectUpdateFlags_ScaleTool                = 0x04000, // Transformation changed by the scale tool
-    eObjectUpdateFlags_UserInputUndo        = 0x20000, // Undo operation related to user input rather than actual Undo
-};
-
-#define OBJECT_TEXTURE_ICON_SIZEX 32
-#define OBJECT_TEXTURE_ICON_SIZEY 32
-#define OBJECT_TEXTURE_ICON_SCALE 10.0f
-
-enum EScaleWarningLevel
-{
-    eScaleWarningLevel_None,
-    eScaleWarningLevel_Rescaled,
-    eScaleWarningLevel_RescaledNonUniform,
-};
-
-enum ERotationWarningLevel
-{
-    eRotationWarningLevel_None = 0,
-    eRotationWarningLevel_Rotated,
-    eRotationWarningLevel_RotatedNonRectangular,
-};
-
-// Used for external control of object position without changing the object's real position (e.g. TrackView)
-class ITransformDelegate
-{
-public:
-    // Called when matrix got invalidatd
-    virtual void MatrixInvalidated() = 0;
-
-    // Returns current delegated transforms, base transform is passed for delegates
-    // that need it, e.g. for overriding only X
-    virtual Vec3 GetTransformDelegatePos(const Vec3& basePos) const = 0;
-    virtual Quat GetTransformDelegateRotation(const Quat& baseRotation) const = 0;
-    virtual Vec3 GetTransformDelegateScale(const Vec3& baseScale) const = 0;
-
-    // Sets the delegate transform.
-    virtual void SetTransformDelegatePos(const Vec3& position) = 0;
-    virtual void SetTransformDelegateRotation(const Quat& rotation) = 0;
-    virtual void SetTransformDelegateScale(const Vec3& scale) = 0;
-
-    // If those return true the base object uses its own transform instead
-    virtual bool IsPositionDelegated() const = 0;
-    virtual bool IsRotationDelegated() const = 0;
-    virtual bool IsScaleDelegated() const = 0;
-};
-
-/*!
- *  CBaseObject is the base class for all objects which can be placed in map.
- *  Every object belongs to class specified by ClassDesc.
- *  Specific object classes must override this class, to provide specific functionality.
- *  Objects are reference counted and only destroyed when last reference to object
- *  is destroyed.
- *
- */
-class SANDBOX_API CBaseObject
-    : public CVarObject
-{
-    Q_OBJECT
-public:
-    //! Events sent by object to EventListeners
-    enum EObjectListenerEvent
-    {
-        ON_DELETE = 0,// Sent after object was deleted from object manager.
-        ON_ADD,       // Sent after object was added to object manager.
-        ON_SELECT,      // Sent when objects becomes selected.
-        ON_UNSELECT,    // Sent when objects unselected.
-        ON_TRANSFORM, // Sent when object transformed.
-        ON_VISIBILITY, // Sent when object visibility changes.
-        ON_RENAME,      // Sent when object changes name.
-        ON_CHILDATTACHED, // Sent when object gets a child attached.
-        ON_PREDELETE, // Sent before an object is processed to be deleted from the object manager.
-        ON_CHILDDETACHED, // Sent when the object gets a child detached.
-        ON_DETACHFROMPARENT, // Sent when the object detaches from a parent.
-        ON_PREATTACHED, // Sent when this object is about to get attached and is already in relative space
-        ON_PREATTACHEDKEEPXFORM, // Sent when this object is about to get attached and needs to stay in place
-        ON_ATTACHED, // Sent when this object got attached
-        ON_PREDETACHED, // Sent when this object is about to get detached and is already in relative space
-        ON_PREDETACHEDKEEPXFORM, // Sent when this object is about to get detached and needs to stay in place
-        ON_DETACHED, // Sent when this object got detached
-        ON_PREFAB_CHANGED, // Sent when prefab representation has been changed
-    };
-
-    //! This callback will be called if object is deleted.
-    struct EventListener
-    {
-        virtual void OnObjectEvent(CBaseObject*, int) = 0;
-    };
-
-    //! Childs structure.
-    typedef std::vector<_smart_ptr<CBaseObject> > Childs;
-
-    //! Retrieve class description of this object.
-    CObjectClassDesc*   GetClassDesc() const { return m_classDesc; };
-
-    static bool IsEnabled() { return true; }
-
-    /** 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();
-        }
-    };
-    //  const char* GetTypeName() const { return m_classDesc->ClassName(); };
-    QString GetTypeName() const;
-    virtual QString GetTypeDescription() const { return m_classDesc->ClassName(); };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Flags.
-    //////////////////////////////////////////////////////////////////////////
-    void SetFlags(int flags) { m_flags |= flags; };
-    void ClearFlags(int flags) { m_flags &= ~flags; };
-    bool CheckFlags(int flags) const { return (m_flags & flags) != 0; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // 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;
-    //! Check against min spec.
-    bool IsHiddenBySpec() const;
-    //! Returns true if object frozen.
-    virtual bool IsFrozen() const;
-    //! Returns true if object is shared between missions.
-    bool IsShared() const { return CheckFlags(OBJFLAG_SHARED); }
-
-    //! Returns true if object is selected.
-    virtual bool IsSelected() const { return CheckFlags(OBJFLAG_SELECTED); }
-    //! Returns true if object can be selected.
-    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);
-    //! 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 NULL; };
-    //! 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; }
-
-    // Tooltip is rendered in CObjectMode, when you hover the object
-    virtual QString GetTooltip() const { return QString(); }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Object Id.
-    //////////////////////////////////////////////////////////////////////////
-    //! Get unique object id.
-    //! Every object will have its own unique id assigned.
-    REFGUID GetId() const { return m_guid; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Name.
-    //////////////////////////////////////////////////////////////////////////
-    //! 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);
-    //! Set object name and make sure it is unique.
-    void SetUniqueName(const QString& name);
-    //! Generate unique object name based on a base name (e.g. class name)
-    virtual void GenerateUniqueName();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Geometry.
-    //////////////////////////////////////////////////////////////////////////
-    //! Set object position.
-    virtual bool SetPos(const Vec3& pos, int flags = 0);
-
-    //! Set object rotation angles.
-    virtual bool SetRotation(const Quat& rotate, int flags = 0);
-
-    //! Set object scale.
-    virtual bool SetScale(const Vec3& scale, int flags = 0);
-
-    //! Get object position.
-    const Vec3 GetPos() const;
-
-    //! Get object local rotation quaternion.
-    const Quat GetRotation() const;
-
-    //! 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; };
-
-    //! Assign display color to the object.
-    virtual void    ChangeColor(const QColor& color);
-    //! Get object color.
-    QColor GetColor() const { return m_color; };
-
-    // Set current transform delegate. Pass nullptr to unset.
-    virtual void SetTransformDelegate(ITransformDelegate* pTransformDelegate);
-    ITransformDelegate* GetTransformDelegate() const { return m_pTransformDelegate; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // 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(); }
-
-    //! Get child by index.
-    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);
-    //! Get all child objects
-    void GetAllChildren(TBaseObjects& outAllChildren, CBaseObject* pObj = NULL) const;
-    void GetAllChildren(DynArray< _smart_ptr<CBaseObject> >& outAllChildren, CBaseObject* pObj = NULL) const;
-    void GetAllChildren(CSelectionGroup& outAllChildren, CBaseObject* pObj = NULL) const;
-    //! 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);
-    //! Attach new child node when the object is not a sort of a group object like AttachChild()
-    //! but if the object is a group object, the group object should be set to all children objects recursively.
-    //! and if the object is a prefab object, the prefab object should be loaded from the prefabitem.
-    //! @param bKeepPos if true Child node will keep its world space position.
-    virtual void AddMember(CBaseObject* pMember, bool bKeepPos = true);
-    //! Detach all childs of this node.
-    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
-    //////////////////////////////////////////////////////////////////////////
-    //! Get objects' local transformation matrix.
-    Matrix34 GetLocalTM() const { Matrix34 tm; CalcLocalTM(tm); return tm; };
-
-    //! Get objects' world-space transformation matrix.
-    const Matrix34& GetWorldTM() const;
-
-    // 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);
-
-    //! Set object xform.
-    virtual void SetLocalTM(const Matrix34& tm, int flags = 0);
-
-    // Set object xform.
-    virtual void SetLocalTM(const Vec3& pos, const Quat& rotate, const Vec3& scale, int flags = 0);
-
-    //////////////////////////////////////////////////////////////////////////
-    // 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 NULL MouseCreateCallback method will be used instead.
-    virtual IMouseCreateCallback* GetMouseCreateCallback() { return 0; };
-
-    //! Draw object to specified viewport.
-    virtual void Display([[maybe_unused]] DisplayContext& disp) {}
-
-    //! Perform intersection testing of this object.
-    //! Return true if was hit.
-    virtual bool HitTest([[maybe_unused]] HitContext& hc) { return false; };
-
-    //! Perform intersection testing of this object with rectangle.
-    //! 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);
-
-    //! Get bounding box of object in local object space.
-    virtual void GetLocalBounds(AABB& box);
-
-    //! Called after some parameter been modified.
-    virtual void SetModified(bool boModifiedTransformOnly);
-
-    //! Called when visibility of this object changes.
-    //! Derived class may override this to respond to new visibility setting.
-    virtual void UpdateVisibility(bool bVisible);
-
-    //! Serialize object to/from xml.
-    //! @param xmlNode XML node to load/save serialized data to.
-    //! @param bLoading true if loading data from xml.
-    //! @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) {};
-
-    //! Export object to xml.
-    //! Return created object node in xml.
-    virtual XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode);
-
-    //! Handle events received by object.
-    //! 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.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetLookAt(CBaseObject* target);
-    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);
-
-    //! Add event listener callback.
-    void AddEventListener(EventListener* listener);
-    //! Remove event listener callback.
-    void RemoveEventListener(EventListener* listener);
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Analyze errors for this object.
-    virtual void Validate(IErrorReport* report);
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Gather resources of this object.
-    virtual void GatherUsedResources(CUsedResources& resources);
-
-    //////////////////////////////////////////////////////////////////////////
-    //! 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 CalculateSubObjectSelectionReferenceFrame([[maybe_unused]] ISubObjectSelectionReferenceFrameCalculator* pCalculator) { };
-    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 NULL; }
-
-    // Invalidates cached transformation matrix.
-    // nWhyFlags - Flags that indicate the reason for matrix invalidation.
-    virtual void InvalidateTM(int nWhyFlags);
-
-protected:
-    friend class CObjectManager;
-
-    //! Ctor is protected to restrict direct usage.
-    CBaseObject();
-    //! Dtor is protected to restrict direct usage.
-    virtual ~CBaseObject();
-
-    //! Initialize Object.
-    //! If previous object specified it must be of exactly same class as this object.
-    //! All data is copied from previous object.
-    //! 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.
-    */
-    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;
-
-    //! Called when object need to be converted from different object.
-    virtual bool ConvertFromObject(CBaseObject* object);
-
-    //! Called when local transformation matrix is calculated.
-    void CalcLocalTM(Matrix34& tm) const;
-
-    //! Called when child position changed.
-    virtual void OnChildModified() {};
-
-    //! Remove child from our childs list.
-    virtual void RemoveChild(CBaseObject* node);
-
-    //! Resolve parent from callback.
-    void ResolveParent(CBaseObject* object);
-    void SetColor(const QColor& color);
-
-    //! Draw default object items.
-    virtual void DrawDefault(DisplayContext& dc, const QColor& labelColor = QColor(255, 255, 255));
-    //! Draw object label.
-    void    DrawLabel(DisplayContext& dc, const Vec3& pos, const QColor& labelColor = QColor(255, 255, 255), float alpha = 1.0f, float size = 1.f);
-    //! Draw 3D Axis at object position.
-    void    DrawAxis(DisplayContext& dc, const Vec3& pos, float size);
-    //! Draw area around object.
-    void    DrawArea(DisplayContext& dc);
-    //! Draw selection helper.
-    void    DrawSelectionHelper(DisplayContext& dc, const Vec3& pos, const QColor& labelColor = QColor(255, 255, 255), float alpha = 1.0f);
-    //! Draw helper icon.
-    virtual void DrawTextureIcon(DisplayContext& dc, const Vec3& pos, float alpha = 1.0f);
-    //! Draw warning icons
-    virtual void DrawWarningIcons(DisplayContext& dc, const Vec3& pos);
-    //! Check if dimension's figures can be displayed before draw them.
-    virtual void DrawDimensions(DisplayContext& dc, AABB* pMergedBoundBox = NULL);
-
-    //! Draw highlight.
-    virtual void DrawHighlight(DisplayContext& dc);
-
-    //! 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);
-
-    // Do hit testing on specified bounding box.
-    // 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);
-
-    //! Notify all listeners about event.
-    void NotifyListeners(EObjectListenerEvent event);
-
-    //! 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; };
-
-    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; };
-
-    Matrix33 GetWorldRotTM() const;
-    Matrix33 GetWorldScaleTM() const;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //! World space object's position.
-    Vec3 m_pos;
-    //! Object's Rotation angles.
-    Quat m_rotate;
-    //! Object's scale value.
-    Vec3 m_scale;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-private:
-    friend class CUndoBaseObject;
-    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);
-
-    // From CObject, (not implemented)
-    virtual void Serialize([[maybe_unused]] CArchive& ar) {};
-
-    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; }
-
-    // Before translating, rotating or scaling, we ask our subclasses for whether
-    // they want us to notify CGameEngine of the upcoming change of our AABB.
-    virtual bool ShouldNotifyOfUpcomingAABBChanges() const { return false; }
-
-    // Notifies the CGameEngine about an upcoming change of our AABB.
-    void OnBeforeAreaChange();
-
-    //////////////////////////////////////////////////////////////////////////
-    // PRIVATE FIELDS
-    //////////////////////////////////////////////////////////////////////////
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //Default ObjType
-    ObjectType m_objType;
-
-    //! 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.
-    int m_nTextureIcon;
-
-    //! Display color.
-    QColor m_color;
-
-    //! World transformation matrix of this object.
-    mutable Matrix34 m_worldTM;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Look At target entity.
-    _smart_ptr<CBaseObject> m_lookat;
-    //! If we are lookat target. this is pointer to source.
-    CBaseObject* m_lookatSource;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Area radius around object, where terrain is flatten and static objects removed.
-    float m_flattenArea;
-    //! Every object keeps for itself height above terrain.
-    float m_height;
-    //! Object's name.
-    QString m_name;
-    //! Class description for this object.
-    CObjectClassDesc*   m_classDesc;
-
-    //! Number of reference to this object.
-    //! When reference count reach zero, object will delete itself.
-    int m_numRefs;
-
-    int m_nIconFlags;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Child animation nodes.
-    Childs m_childs;
-    //! Pointer to parent node.
-    mutable CBaseObject* m_parent;
-
-    AABB m_worldBounds;
-
-    // The transform delegate
-    ITransformDelegate* m_pTransformDelegate;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Listeners.
-    std::vector<EventListener*> m_eventListeners;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Flags and bit masks.
-    //////////////////////////////////////////////////////////////////////////
-    mutable uint32 m_bMatrixInWorldSpace : 1;
-    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*)
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_BASEOBJECT_H
diff --git a/Code/Sandbox/Editor/Objects/ClassDesc.cpp b/Code/Sandbox/Editor/Objects/ClassDesc.cpp
deleted file mode 100644
index fc60ad3a85..0000000000
--- a/Code/Sandbox/Editor/Objects/ClassDesc.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ClassDesc.h"
-
-// Editor
-#include "IconManager.h"
-
-int CObjectClassDesc::GetTextureIconId()
-{
-    if (!m_nTextureIcon)
-    {
-        QString pTexName = GetTextureIcon();
-
-        if (!pTexName.isEmpty())
-        {
-            m_nTextureIcon = GetIEditor()->GetIconManager()->GetIconTexture(pTexName.toUtf8().data());
-        }
-    }
-
-    return m_nTextureIcon;
-}
diff --git a/Code/Sandbox/Editor/Objects/ClassDesc.h b/Code/Sandbox/Editor/Objects/ClassDesc.h
deleted file mode 100644
index 83cdc39823..0000000000
--- a/Code/Sandbox/Editor/Objects/ClassDesc.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Class description of CBaseObject
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_CLASSDESC_H
-#define CRYINCLUDE_EDITOR_OBJECTS_CLASSDESC_H
-#pragma once
-
-#include "Plugin.h"
-#include "Include/ObjectEvent.h"
-#include <QString>
-
-class CXmlArchive;
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-//! Virtual base class description of CBaseObject.
-//! Override this class to create specific Class descriptions for every base object class.
-//! Type name is specified like this:
-//! Category\Type ex: "TagPoint\Respawn"
-class SANDBOX_API CObjectClassDesc
-    : public IClassDesc
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    CObjectClassDesc()
-    {
-        m_nTextureIcon = 0;
-    }
-
-    //! Release class description.
-    virtual ObjectType GetObjectType() = 0;
-    virtual QObject* CreateQObject() const { return nullptr; }
-    //! If this function return not empty string,object of this class must be created with file.
-    //! Return root path where to look for files this object supports.
-    //! Also wild card for files can be specified, ex: Objects\*.cgf
-    virtual QString GetFileSpec()
-    {
-        return "";
-    }
-
-    virtual ESystemClassID SystemClassID() { return ESYSTEM_CLASS_OBJECT; };
-    virtual void ShowAbout() {};
-    virtual bool CanExitNow() { return true; }
-    virtual void Serialize([[maybe_unused]] CXmlArchive& ar) {};
-    //! Ex. Object with creation order 200 will be created after any object with order 100.
-    virtual int GameCreationOrder() { return 100; };
-    virtual QString GetTextureIcon() { return QString(); };
-    int GetTextureIconId();
-    virtual bool RenderTextureOnTop() const { return false; }
-
-    virtual QString GetToolClassName() { return "EditTool.ObjectCreate"; }
-
-    QString MenuSuggestion() { return{}; }
-    QString Tooltip() { return{}; }
-    QString Description() { return{}; }
-
-private:
-    int m_nTextureIcon;
-};
-#endif // CRYINCLUDE_EDITOR_OBJECTS_CLASSDESC_H
diff --git a/Code/Sandbox/Editor/Objects/DisplayContext.cpp b/Code/Sandbox/Editor/Objects/DisplayContext.cpp
deleted file mode 100644
index 0e9b1c19f6..0000000000
--- a/Code/Sandbox/Editor/Objects/DisplayContext.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "DisplayContextShared.inl"
diff --git a/Code/Sandbox/Editor/Objects/DisplayContext.h b/Code/Sandbox/Editor/Objects/DisplayContext.h
deleted file mode 100644
index 1741614b3a..0000000000
--- a/Code/Sandbox/Editor/Objects/DisplayContext.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : DisplayContext definition.
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_DISPLAYCONTEXT_H
-#define CRYINCLUDE_EDITOR_OBJECTS_DISPLAYCONTEXT_H
-#pragma once
-
-
-#include "SandboxAPI.h"
-#include <Cry_Color.h>
-#include <Cry_Geo.h>
-
-#include <QColor>
-
-#define DC_DEFAULT_DOTLINE_STEPS 10
-#define DC_UNIT_DEGREE 1
-
-// forward declarations.
-struct IDisplayViewport;
-struct IRenderer;
-struct IRenderAuxGeom;
-struct IIconManager;
-class CDisplaySettings;
-class CCamera;
-
-enum DisplayFlags
-{
-    DISPLAY_2D = 0x01,
-    DISPLAY_HIDENAMES = 0x02,
-    DISPLAY_BBOX = 0x04,
-    DISPLAY_TRACKS = 0x08,
-    DISPLAY_TRACKTICKS = 0x010,
-    DISPLAY_WORLDSPACEAXIS = 0x020, //!< Set if axis must be displayed in world space.
-    DISPLAY_LINKS = 0x040,
-    DISPLAY_DEGRADATED = 0x080, //!< Display Objects in degradated quality (When moving/modifying).
-    DISPLAY_SELECTION_HELPERS = 0x100,  //!< Display advanced selection helpers.
-};
-
-/*!
- *  DisplayContex is a structure passed to BaseObject Display method.
- *  It contains everything the object should know to display itself in a view.
- *  All fields must be filled before passing that structure to Display call.
- */
-struct SANDBOX_API DisplayContext
-{
-    enum ETextureIconFlags
-    {
-        TEXICON_ADDITIVE     = 0x0001,
-        TEXICON_ALIGN_BOTTOM = 0x0002,
-        TEXICON_ALIGN_TOP    = 0x0004,
-        TEXICON_ON_TOP       = 0x0008,
-    };
-
-    CDisplaySettings* settings;
-    IDisplayViewport* view;
-    IRenderer* renderer;
-    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
-    int flags;
-
-    //! Ctor.
-    DisplayContext();
-    // Helper methods.
-    void SetView(IDisplayViewport* pView);
-    IDisplayViewport* GetView() const { return view; }
-    void Flush2D();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Draw functions
-    //////////////////////////////////////////////////////////////////////////
-    //! Set current materialc color.
-    void SetColor(float r, float g, float b, float a = 1) { m_color4b = ColorB(int(r * 255.0f), int(g * 255.0f), int(b * 255.0f), int(a * 255.0f)); };
-    void SetColor(const Vec3& color, float a = 1) { m_color4b = ColorB(int(color.x * 255.0f), int(color.y * 255.0f), int(color.z * 255.0f), int(a * 255.0f)); };
-    void SetColor(const QColor& rgb, float a) { m_color4b = ColorB(rgb.red(), rgb.green(), rgb.blue(), int(a * 255.0f)); };
-    void SetColor(const QColor& color) { m_color4b = ColorB(color.red(), color.green(), color.blue(), color.alpha()); };
-    void SetColor(const ColorB& color) { m_color4b = color; };
-    void SetAlpha(float a = 1) { m_color4b.a = int(a * 255.0f); };
-    ColorB GetColor() const { return m_color4b; }
-
-    void SetSelectedColor(float fAlpha = 1);
-    void SetFreezeColor();
-
-    //! Get color to draw selectin of object.
-    QColor GetSelectedColor();
-    QColor GetFreezeColor();
-
-    // Draw 3D quad.
-    void DrawQuad(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4);
-    void DrawQuad(float width, float height);
-    void DrawQuadGradient(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4, ColorB firstColor, ColorB secondColor);
-    void DrawWireQuad(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4);
-    void DrawWireQuad(float width, float height);
-    // Draw 3D Triangle.
-    void DrawTri(const Vec3& p1, const Vec3& p2, const Vec3& p3);
-    void DrawTriangles(const AZStd::vector<Vec3>& vertices, const ColorB& color);
-    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);
-    // 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);
-    void DrawPoint(const Vec3& p, int nSize = 1);
-    void DrawLine(const Vec3& p1, const Vec3& p2);
-    void DrawLine(const Vec3& p1, const Vec3& p2, const ColorF& col1, const ColorF& col2);
-    void DrawLine(const Vec3& p1, const Vec3& p2, const QColor& rgb1, const QColor& rgb2);
-    void DrawLines(const AZStd::vector<Vec3>& vertices, const ColorF& color);
-    void DrawPolyLine(const Vec3* pnts, int numPoints, bool cycled = true);
-
-    // Vera, Confetti
-    void DrawDottedLine(const Vec3& p1, const Vec3& p2, const ColorF& col1, const ColorF& col2, const float numOfSteps = DC_DEFAULT_DOTLINE_STEPS);
-    void DrawWireQuad2d(const QPoint& p1, const QPoint& p2, float z);
-    void DrawLine2d(const QPoint& p1, const QPoint& p2, float z);
-    void DrawLine2dGradient(const QPoint& p1, const QPoint& p2, float z, ColorB firstColor, ColorB secondColor);
-    void DrawWireCircle2d(const QPoint& center, float radius, float z);
-
-    // Draw circle from lines on terrain, position is in world space.
-    void DrawTerrainCircle(const Vec3& worldPos, float radius, float height);
-    void DrawTerrainCircle(const Vec3& center, float radius, float angle1, float angle2, float height);
-
-    /// DrawArc
-    /// Draws an arc around the specified position from a given angle across the angular length given by sweepAngleDegrees
-    /// it orients the arc around the index of the given basis axis.
-    /// \param pos World space position on which to center the arc.
-    /// \param radius Radius that defines the size of the arc.
-    /// \param startAngleDegrees Angle in degrees measured clockwise from the basis axis to the starting point of the arc.
-    /// \param sweepAngleDegreees Angle in degrees measured clockwise from the startAngle parameter to ending point of the arc.
-    /// \param angularStepDegrees Defines the distance between vertices, a small value will result in a greater number of vertices.
-    /// \param referenceAxis Axis on which to align the arc (0 for X, 1 for Y, 2 for Z)
-    void DrawArc(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, int referenceAxis = 2);
-
-
-    /// DrawArc
-    /// Draws an arc around the specified position from a given angle across the angular length given by sweepAngleDegrees
-    /// oriented around the specified axis.
-    /// \param pos World space position on which to center the arc.
-    /// \param radius Radius that defines the size of the arc.
-    /// \param startAngleDegrees Angle in degrees measured clockwise from the basis axis to the starting point of the arc.
-    /// \param sweepAngleDegreees Angle in degrees measured clockwise from the startAngle parameter to ending point of the arc.
-    /// \param angularStepDegrees Defines the distance between vertices, a small value will result in a greater number of vertices.
-    /// \param fixedAxis Normal axis on which to align the arc.
-    void DrawArc(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const Vec3& fixedAxis);
-
-    //Vera, Confetti:
-    //Draw an arc and an arrow at the end of the arc
-    void DrawArcWithArrow(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const Vec3& fixedAxis);
-
-    // Draw circle.
-    void DrawCircle(const Vec3& pos, float radius, int nUnchangedAxis = 2 /*z axis*/);
-
-    void DrawHalfDottedCircle(const Vec3& pos, float radius, const Vec3& viewPos, int nUnchangedAxis = 2 /*z axis*/);
-
-    // Vera, Confetti :
-    // Draw a dotted circle.
-    void DrawDottedCircle(const Vec3& pos, float radius, const Vec3& nUnchangedAxis, int numberOfArrows = 0, float stepDegree = DC_UNIT_DEGREE);
-
-    // Draw cylinder.
-    void DrawCylinder(const Vec3& p1, const Vec3& p2, float radius, float height);
-
-    void DrawCone(const Vec3& pos, const Vec3& dir, float radius, float height, bool drawShaded = true);
-
-    /// DrawWireCylinder
-    /// \param center Center of cylinder.
-    /// \param axis Axis along which cylinder is tall.
-    /// \param radius Radius of cylinder.
-    /// \param height Total height of cylinder.
-    void DrawWireCylinder(const Vec3& center, const Vec3& axis, float radius, float height);
-
-    /// DrawSolidCylinder
-    /// \param center Center of cylinder.
-    /// \param axis Axis along which cylinder is tall.
-    /// \param radius Radius of cylinder.
-    /// \param height Total height of cylinder.
-    void DrawSolidCylinder(const Vec3& center, const Vec3& axis, float radius, float height, bool drawShaded = true);
-
-    /// DrawWireCapsule
-    /// \param pos Center of capsule.
-    /// \param axis Axis along which capsule is tall.
-    /// \param radius Radius of capsule.
-    /// \param heightStraightSection Height of capsule's straight section (does not include caps).
-    void DrawWireCapsule(const Vec3& center, const Vec3& axis, float radius, float heightStraightSection);
-
-    //! Draw rectangle on top of terrain.
-    //! Coordinates are in world space.
-    void DrawTerrainRect(float x1, float y1, float x2, float y2, float height);
-
-    void DrawTerrainLine (Vec3 worldPos1, Vec3 worldPos2);
-
-    void DrawWireSphere(const Vec3& pos, float radius);
-    void DrawWireSphere(const Vec3& pos, const Vec3 radius);
-
-    void DrawWireDisk(const Vec3& pos, const Vec3& dir, float radius);
-
-    void PushMatrix(const Matrix34& tm);
-    void PopMatrix();
-    const Matrix34& GetMatrix();
-
-    // Draw special 3D objects.
-    void DrawBall(const Vec3& pos, float radius, bool drawShaded = true);
-    void DrawDisk(const Vec3& pos, const Vec3& dir, float radius);
-
-    //! Draws 3d arrow.
-    void DrawArrow(const Vec3& src, const Vec3& trg, float fHeadScale = 1, bool b2SidedArrow = false);
-
-    // Draw texture label in 2d view coordinates.
-    // w,h in pixels.
-    void DrawTextureLabel(const Vec3& pos, int nWidth, int nHeight, int nTexId, int nTexIconFlags = 0, int srcOffsetX = 0, int scrOffsetY = 0, bool bDistanceScaleIcons = false, float fDistanceScale = 1.0f);
-
-    void RenderObject(int objectType, const Vec3& pos, float scale);
-    void RenderObject(int objectType, const Matrix34& tm);
-
-    void DrawTextLabel(const Vec3& pos, float size, const char* text, const bool bCenter = false, int srcOffsetX = 0, int scrOffsetY = 0);
-    void Draw2dTextLabel(float x, float y, float size, const char* text, bool bCenter = false);
-    void SetLineWidth(float width);
-
-    //! Is given bbox visible in this display context.
-    bool IsVisible(const AABB& bounds);
-
-    //! Gets current render state.
-    uint32 GetState() const;
-    //! Set a new render state.
-    //! \param returns previous render state.
-    uint32 SetState(uint32 state);
-    //! Set a new render state flags.
-    //! \param returns previous render state.
-    uint32 SetStateFlag(uint32 state);
-    //! Clear specified flags in render state.
-    //! \param returns previous render state.
-    uint32 ClearStateFlag(uint32 state);
-
-    void DepthTestOff();
-    void DepthTestOn();
-
-    void DepthWriteOff();
-    void DepthWriteOn();
-
-    void CullOff();
-    void CullOn();
-
-    // Enables drawing helper lines in front of usual geometry, adds a small z offset to all drawn lines.
-    bool SetDrawInFrontMode(bool bOn);
-
-    // Description:
-    //   Changes fill mode.
-    // Arguments:
-    //    nFillMode is one of the values from EAuxGeomPublicRenderflags_FillMode
-    int  SetFillMode(int nFillMode);
-
-    //! Convert position to world space.
-    Vec3 ToWorldSpacePosition(const Vec3& v) { return m_matrixStack[m_currentMatrix].TransformPoint(v); }
-
-    //! Convert direction to world space (translation is not considered)
-    Vec3 ToWorldSpaceVector(const Vec3& v) { return m_matrixStack[m_currentMatrix].TransformVector(v); }
-
-    float ToWorldSpaceMaxScale(float value);
-
-    float GetLineWidth() const              {   return m_thickness; }
-
-private:
-
-    void InternalDrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1);
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    ColorB m_color4b;
-    uint32 m_renderState;
-    float m_thickness;
-    float m_width;
-    float m_height;
-
-    int m_currentMatrix;
-    //! Matrix stack.
-    Matrix34 m_matrixStack[32];
-
-    struct STextureLabel
-    {
-        float x, y, z; // 2D position (z in world space).
-        float w, h;  // Width height.
-        int nTexId; // Texture id.
-        int flags;  // ETextureIconFlags
-        float color[4];
-    };
-    std::vector<STextureLabel> m_textureLabels;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_DISPLAYCONTEXT_H
diff --git a/Code/Sandbox/Editor/Objects/DisplayContextShared.inl b/Code/Sandbox/Editor/Objects/DisplayContextShared.inl
deleted file mode 100644
index e4ffedef8c..0000000000
--- a/Code/Sandbox/Editor/Objects/DisplayContextShared.inl
+++ /dev/null
@@ -1,1314 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <Cry_Geo.h>
-#include "DisplayContext.h"
-#include "IRenderAuxGeom.h"
-#include "IEditor.h"
-#include "Include/IIconManager.h"
-#include "Include/IDisplayViewport.h"
-
-#include <QDateTime>
-#include <QPoint>
-
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
-#define FREEZE_COLOR QColor(100, 100, 100)
-
-//////////////////////////////////////////////////////////////////////////
-DisplayContext::DisplayContext()
-{
-    view = 0;
-    renderer = 0;
-    flags = 0;
-    settings = 0;
-    pIconManager = 0;
-    m_renderState = 0;
-
-    m_currentMatrix = 0;
-    m_matrixStack[m_currentMatrix].SetIdentity();
-    pRenderAuxGeom = nullptr; // ToDo: Remove DisplayContext or update to work with Atom: LYN-3670
-    m_thickness = 0;
-
-    m_width = 0;
-    m_height = 0;
-
-    m_textureLabels.reserve(100);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::SetView(IDisplayViewport* pView)
-{
-    view = pView;
-    int width, height;
-    view->GetDimensions(&width, &height);
-    m_width = static_cast<float>(width);
-    m_height = static_cast<float>(height);
-    m_textureLabels.resize(0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::InternalDrawLine(const Vec3& v0, const ColorB& colV0, const Vec3& v1, const ColorB& colV1)
-{
-    pRenderAuxGeom->DrawLine(v0, colV0, v1, colV1, m_thickness);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawPoint(const Vec3& p, int nSize)
-{
-    pRenderAuxGeom->DrawPoint(ToWorldSpacePosition(p), m_color4b, nSize);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawTri(const Vec3& p1, const Vec3& p2, const Vec3& p3)
-{
-    pRenderAuxGeom->DrawTriangle(ToWorldSpacePosition(p1), m_color4b, ToWorldSpacePosition(p2), m_color4b, ToWorldSpacePosition(p3), m_color4b);
-}
-
-void DisplayContext::DrawTriangles(const AZStd::vector<Vec3>& vertices, const ColorB& color)
-{
-    pRenderAuxGeom->DrawTriangles(vertices.begin(), vertices.size(), color);
-}
-
-void DisplayContext::DrawTrianglesIndexed(const AZStd::vector<Vec3>& vertices, const AZStd::vector<vtx_idx>& indices, const ColorB& color)
-{
-    pRenderAuxGeom->DrawTriangles(vertices.begin(), vertices.size(), indices.begin(), indices.size(), color);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawQuad(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4)
-{
-    Vec3 p[4] = { ToWorldSpacePosition(p1), ToWorldSpacePosition(p2), ToWorldSpacePosition(p3), ToWorldSpacePosition(p4) };
-    pRenderAuxGeom->DrawTriangle(p[0], m_color4b, p[1], m_color4b, p[2], m_color4b);
-    pRenderAuxGeom->DrawTriangle(p[2], m_color4b, p[3], m_color4b, p[0], m_color4b);
-}
-
-void DisplayContext::DrawQuad(float width, float height)
-{
-    pRenderAuxGeom->DrawQuad(width, height, m_matrixStack[m_currentMatrix], m_color4b);
-}
-
-void DisplayContext::DrawWireQuad(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4)
-{
-    Vec3 p[4] = { ToWorldSpacePosition(p1), ToWorldSpacePosition(p2), ToWorldSpacePosition(p3), ToWorldSpacePosition(p4) };
-    pRenderAuxGeom->DrawPolyline(p, 4, true, m_color4b);
-}
-
-void DisplayContext::DrawWireQuad(float width, float height)
-{
-    const float halfWidth = width * 0.5f;
-    const float halfHeight = height * 0.5f;
-
-    const Vec3 p[4] =
-    {
-        ToWorldSpacePosition(Vec3(-halfWidth, 0.0f,  halfHeight)),
-        ToWorldSpacePosition(Vec3( halfWidth, 0.0f,  halfHeight)),
-        ToWorldSpacePosition(Vec3( halfWidth, 0.0f, -halfHeight)),
-        ToWorldSpacePosition(Vec3(-halfWidth, 0.0f, -halfHeight)),
-    };
-    pRenderAuxGeom->DrawPolyline(p, 4, true, m_color4b);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawCylinder(const Vec3& p1, const Vec3& p2, float radius, float height)
-{
-    Vec3 p[2] = { ToWorldSpacePosition(p1), ToWorldSpacePosition(p2) };
-    Vec3 dir = p[1] - p[0];
-    pRenderAuxGeom->DrawCylinder(p[0], dir, radius, height, m_color4b);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawCone(const Vec3& pos, const Vec3& dir, float radius, float height, bool drawShaded /*= true*/)
-{
-    const Vec3 worldPos = ToWorldSpacePosition(pos);
-    const Vec3 worldDir = ToWorldSpaceVector(dir);
-    pRenderAuxGeom->DrawCone(worldPos, worldDir, radius, height, m_color4b, drawShaded);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawWireCylinder(const Vec3& center, const Vec3& axis, float radius, float height)
-{
-    if (radius > FLT_EPSILON && height > FLT_EPSILON && axis.GetLengthSquared() > FLT_EPSILON)
-    {
-        Vec3 axisNormalized = axis.GetNormalized();
-
-        // Draw circles at bottom & top of cylinder
-        Vec3 centerToTop = axisNormalized * height * 0.5f;
-        Vec3 circle1Center = center - centerToTop;
-        Vec3 circle2Center = center + centerToTop;
-        // DrawArc() takes local coordinates
-        DrawArc(circle1Center, radius, 0.0f, 360.0f, 22.5f, axisNormalized);
-        DrawArc(circle2Center, radius, 0.0f, 360.0f, 22.5f, axisNormalized);
-
-        // Draw 4 lines up side of cylinder
-        Vec3 rightDirNormalized, frontDirNormalized;
-        GetBasisVectors(axisNormalized, rightDirNormalized, frontDirNormalized);
-        Vec3 centerToRightEdge = rightDirNormalized * radius;
-        Vec3 centerToFrontEdge = frontDirNormalized * radius;
-        // InternalDrawLine() takes world coordinates
-        InternalDrawLine(ToWorldSpacePosition(circle1Center + centerToRightEdge), m_color4b,
-            ToWorldSpacePosition(circle2Center + centerToRightEdge), m_color4b);
-        InternalDrawLine(ToWorldSpacePosition(circle1Center - centerToRightEdge), m_color4b,
-            ToWorldSpacePosition(circle2Center - centerToRightEdge), m_color4b);
-        InternalDrawLine(ToWorldSpacePosition(circle1Center + centerToFrontEdge), m_color4b,
-            ToWorldSpacePosition(circle2Center + centerToFrontEdge), m_color4b);
-        InternalDrawLine(ToWorldSpacePosition(circle1Center - centerToFrontEdge), m_color4b,
-            ToWorldSpacePosition(circle2Center - centerToFrontEdge), m_color4b);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawSolidCylinder(const Vec3& center, const Vec3& axis, float radius, float height, bool drawShaded)
-{
-    if (radius > FLT_EPSILON && height > FLT_EPSILON && axis.GetLengthSquared() > FLT_EPSILON)
-    {
-        // transform everything to world space
-        Vec3 wsCenter = ToWorldSpacePosition(center);
-
-        // determine scale in dir direction, apply to height
-        Vec3 axisNormalized = axis.GetNormalized();
-        Vec3 wsAxis = ToWorldSpaceVector(axisNormalized);
-        float wsAxisLength = wsAxis.GetLength();
-        float wsHeight = height * wsAxisLength;
-
-        // determine scale in orthogonal direction, apply to radius
-        Vec3 radiusDirNormalized = axisNormalized.GetOrthogonal();
-        radiusDirNormalized.Normalize();
-        Vec3 wsRadiusDir = ToWorldSpaceVector(radiusDirNormalized);
-        float wsRadiusDirLen = wsRadiusDir.GetLength();
-        float wsRadius = radius * wsRadiusDirLen;
-
-        pRenderAuxGeom->DrawCylinder(wsCenter, wsAxis, wsRadius, wsHeight, m_color4b, drawShaded);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void DisplayContext::DrawWireCapsule(const Vec3& center, const Vec3& axis, float radius, float heightStraightSection)
-{
-    if (radius > FLT_EPSILON && axis.GetLengthSquared() > FLT_EPSILON)
-    {
-        Vec3 axisNormalized = axis.GetNormalizedFast();
-
-        // Draw cylinder part (or just a circle around the middle)
-        if (heightStraightSection > FLT_EPSILON)
-        {
-            DrawWireCylinder(center, axis, radius, heightStraightSection);
-        }
-        else
-        {
-            DrawArc(center, radius, 0.0f, 360.0f, 22.5f, axisNormalized);
-        }
-
-        // Draw top cap as two criss-crossing 180deg arcs
-        Vec3 ortho1Normalized, ortho2Normalized;
-        GetBasisVectors(axisNormalized, ortho1Normalized, ortho2Normalized);
-        Vec3 centerToTopCircleCenter = axisNormalized * heightStraightSection * 0.5f;
-        DrawArc(center + centerToTopCircleCenter, radius,  90.0f, 180.0f, 22.5f, ortho1Normalized);
-        DrawArc(center + centerToTopCircleCenter, radius, 180.0f, 180.0f, 22.5f, ortho2Normalized);
-
-        // Draw bottom cap
-        DrawArc(center - centerToTopCircleCenter, radius, -90.0f, 180.0f, 22.5f, ortho1Normalized);
-        DrawArc(center - centerToTopCircleCenter, radius,   0.0f, 180.0f, 22.5f, ortho2Normalized);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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::DrawSolidBox(const Vec3& min, const Vec3& max)
-{
-    pRenderAuxGeom->DrawAABB(AABB(min, max), m_matrixStack[m_currentMatrix], true, m_color4b, eBBD_Faceted);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawSolidOBB(const Vec3& center, const Vec3& axisX, const Vec3& axisY, const Vec3& axisZ, const Vec3& halfExtents)
-{
-    OBB obb;
-    obb.m33 = Matrix33::CreateFromVectors(axisX, axisY, axisZ);
-    obb.c = Vec3(0, 0, 0);
-    obb.h = halfExtents;
-    pRenderAuxGeom->DrawOBB(obb, center, true, m_color4b, eBBD_Faceted);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawLine(const Vec3& p1, const Vec3& p2)
-{
-    InternalDrawLine(ToWorldSpacePosition(p1), m_color4b, ToWorldSpacePosition(p2), m_color4b);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawPolyLine(const Vec3* pnts, int numPoints, bool cycled)
-{
-    MAKE_SURE(numPoints >= 2, return );
-    MAKE_SURE(pnts != 0, return );
-
-    int numSegments = cycled ? numPoints : (numPoints - 1);
-    Vec3 p1 = ToWorldSpacePosition(pnts[0]);
-    Vec3 p2;
-    for (int i = 0; i < numSegments; i++)
-    {
-        int j = (i + 1) % numPoints;
-        p2 = ToWorldSpacePosition(pnts[j]);
-        InternalDrawLine(p1, m_color4b, p2, m_color4b);
-        p1 = p2;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawTerrainCircle(const Vec3& worldPos, float radius, float height)
-{
-    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-    // Draw circle with default radius.
-    Vec3 p0, p1;
-    p0.x = worldPos.x + radius * sin(0.0f);
-    p0.y = worldPos.y + radius * cos(0.0f);
-    const float defaultTerrainElevation = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
-    float terrainElevation = terrain ? terrain->GetHeightFromFloats(p0.x, p0.y) : defaultTerrainElevation;
-    p0.z = terrainElevation + height;
-
-    float step = 20.0f / 180 * gf_PI;
-    for (float angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        p1.x = worldPos.x + radius * sin(angle);
-        p1.y = worldPos.y + radius * cos(angle);
-        terrainElevation = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) : defaultTerrainElevation;
-        p1.z = terrainElevation + height;
-
-        InternalDrawLine(ToWorldSpacePosition(p0), m_color4b, ToWorldSpacePosition(p1), m_color4b);
-        p0 = p1;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawTerrainCircle(const Vec3& worldPos, float radius, float angle1, float angle2, float height)
-{
-    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-    // Draw circle with default radius.
-    Vec3 p0, p1;
-    p0.x = worldPos.x + radius * sin(angle1);
-    p0.y = worldPos.y + radius * cos(angle1);
-    float terrainElevation = terrain ? terrain->GetHeightFromFloats(p0.x, p0.y) : 0.0f;
-    p0.z = terrainElevation + height;
-
-    float step = 20.0f / 180 * gf_PI;
-    for (float angle = step + angle1; angle < angle2; angle += step)
-    {
-        p1.x = worldPos.x + radius * sin(angle);
-        p1.y = worldPos.y + radius * cos(angle);
-        terrainElevation = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) : 0.0f;
-        p1.z = terrainElevation + height;
-
-        InternalDrawLine(ToWorldSpacePosition(p0), m_color4b, ToWorldSpacePosition(p1), m_color4b);
-        p0 = p1;
-    }
-
-    p1.x = worldPos.x + radius * sin(angle2);
-    p1.y = worldPos.y + radius * cos(angle2);
-    terrainElevation = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) : 0.0f;
-    p1.z = terrainElevation + height;
-
-    InternalDrawLine(ToWorldSpacePosition(p0), m_color4b, ToWorldSpacePosition(p1), m_color4b);
-}
-
-
-void DisplayContext::DrawArc(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, int referenceAxis)
-{
-    // angularStepDegrees cannot be zero as it is used to divide sweepAngleDegrees
-    if (fabs(angularStepDegrees) < FLT_EPSILON)
-    {
-        return;
-    }
-
-    float startAngleRadians = DEG2RAD(startAngleDegrees);
-    float sweepAngleRadians = DEG2RAD(sweepAngleDegrees);
-
-    float angle = startAngleRadians;
-
-    const uint referenceAxis0 = referenceAxis % 3;
-    const uint referenceAxis1 = (referenceAxis + 1) % 3;
-    const uint referenceAxis2 = (referenceAxis + 2) % 3;
-
-    Vec3 p0;
-    p0[referenceAxis0] = pos[referenceAxis0];
-    p0[referenceAxis1] = pos[referenceAxis1] + radius * sin(angle);
-    p0[referenceAxis2] = pos[referenceAxis2] + radius * cos(angle);
-    p0 = ToWorldSpacePosition(p0);
-
-    float step = DEG2RAD(angularStepDegrees);
-    int numSteps = std::abs(static_cast<int>(std::ceil(sweepAngleRadians / step)));
-
-    Vec3 p1;
-    for (int i = 0; i < numSteps; ++i)
-    {
-        angle += std::min(step, sweepAngleRadians); // Don't go past sweepAngleRadians when stepping or the arc will be too long.
-        sweepAngleRadians -= step;
-
-        p1[referenceAxis0] = pos[referenceAxis0];
-        p1[referenceAxis1] = pos[referenceAxis1] + radius * sin(angle);
-        p1[referenceAxis2] = pos[referenceAxis2] + radius * cos(angle);
-        p1 = ToWorldSpacePosition(p1);
-
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-}
-
-void DisplayContext::DrawArc(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const Vec3& fixedAxis)
-{
-    // angularStepDegrees cannot be zero as it is used to divide sweepAngleDegrees
-    if (fabs(angularStepDegrees) < FLT_EPSILON)
-    {
-        return;
-    }
-
-    float startAngleRadians = DEG2RAD(startAngleDegrees);
-    float sweepAngleRadians = DEG2RAD(sweepAngleDegrees);
-
-    Vec3 a;
-    Vec3 b;
-    GetBasisVectors(fixedAxis, a, b);
-
-    float angle = startAngleRadians;
-
-    float cosAngle = cos(angle) * radius;
-    float sinAngle = sin(angle) * radius;
-
-    Vec3 p0;
-    p0.x = pos.x + cosAngle * a.x + sinAngle * b.x;
-    p0.y = pos.y + cosAngle * a.y + sinAngle * b.y;
-    p0.z = pos.z + cosAngle * a.z + sinAngle * b.z;
-    p0 = ToWorldSpacePosition(p0);
-
-    float step = DEG2RAD(angularStepDegrees);
-    int numSteps = std::abs(static_cast<int>(std::ceil(sweepAngleRadians / step)));
-
-    Vec3 p1;
-    for (int i = 0; i < numSteps; ++i)
-    {
-        angle += std::min(step, sweepAngleRadians); // Don't go past sweepAngleRadians when stepping or the arc will be too long.
-        sweepAngleRadians -= step;
-
-        float cosAngle2 = cos(angle) * radius;
-        float sinAngle2 = sin(angle) * radius;
-
-        p1.x = pos.x + cosAngle2 * a.x + sinAngle2 * b.x;
-        p1.y = pos.y + cosAngle2 * a.y + sinAngle2 * b.y;
-        p1.z = pos.z + cosAngle2 * a.z + sinAngle2 * b.z;
-        p1 = ToWorldSpacePosition(p1);
-
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-
-        p0 = p1;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Vera, Confetti
-void DisplayContext::DrawArcWithArrow(const Vec3& pos, float radius, float startAngleDegrees, float sweepAngleDegrees, float angularStepDegrees, const Vec3& fixedAxis)
-{
-    // angularStepDegrees cannot be zero as it is used to divide sweepAngleDegrees
-    // Grab the code from draw arc to get the final p0 and p1;
-    if (fabs(angularStepDegrees) < FLT_EPSILON)
-    {
-        return;
-    }
-
-    float startAngleRadians = DEG2RAD(startAngleDegrees);
-    float sweepAngleRadians = DEG2RAD(sweepAngleDegrees);
-
-    Vec3 a;
-    Vec3 b;
-    GetBasisVectors(fixedAxis, a, b);
-
-    float angle = startAngleRadians;
-
-    float cosAngle = cos(angle) * radius;
-    float sinAngle = sin(angle) * radius;
-
-    Vec3 p0;
-    p0.x = pos.x + cosAngle * a.x + sinAngle * b.x;
-    p0.y = pos.y + cosAngle * a.y + sinAngle * b.y;
-    p0.z = pos.z + cosAngle * a.z + sinAngle * b.z;
-    p0 = ToWorldSpacePosition(p0);
-
-    float step = DEG2RAD(angularStepDegrees);
-    int numSteps = std::abs(static_cast<int>(std::ceil(sweepAngleRadians / step)));
-
-    Vec3 p1;
-    for (int i = 0; i < numSteps; ++i)
-    {
-        angle += step;
-        float cosAngle2 = cos(angle) * radius;
-        float sinAngle2 = sin(angle) * radius;
-
-        p1.x = pos.x + cosAngle2 * a.x + sinAngle2 * b.x;
-        p1.y = pos.y + cosAngle2 * a.y + sinAngle2 * b.y;
-        p1.z = pos.z + cosAngle2 * a.z + sinAngle2 * b.z;
-        p1 = ToWorldSpacePosition(p1);
-
-        if (i + 1 >= numSteps) // For last step, draw an arrow
-        {
-            // p0 and p1 are global position. We could like to map it to local
-            Matrix34 inverseMat =  m_matrixStack[m_currentMatrix].GetInverted();
-            Vec3 localP0 = inverseMat.TransformPoint(p0);
-            Vec3 localP1 = inverseMat.TransformPoint(p1);
-            DrawArrow(localP0, localP1, m_thickness);
-        }
-        else
-        {
-            InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        }
-
-        p0 = p1;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawCircle(const Vec3& pos, float radius, int nUnchangedAxis)
-{
-    // Draw circle with default radius.
-    Vec3 p0, p1;
-    p0[nUnchangedAxis] = pos[nUnchangedAxis];
-    p0[(nUnchangedAxis + 1) % 3] = pos[(nUnchangedAxis + 1) % 3] + radius * sin(0.0f);
-    p0[(nUnchangedAxis + 2) % 3] = pos[(nUnchangedAxis + 2) % 3] + radius * cos(0.0f);
-    p0 = ToWorldSpacePosition(p0);
-    const float step = 10.0f / 180.0f * gf_PI;
-    for (float angle = step; angle < 360.0f / 180.0f * gf_PI + step; angle += step)
-    {
-        p1[nUnchangedAxis] = pos[nUnchangedAxis];
-        p1[(nUnchangedAxis + 1) % 3] = pos[(nUnchangedAxis + 1) % 3] + radius * sin(angle);
-        p1[(nUnchangedAxis + 2) % 3] = pos[(nUnchangedAxis + 2) % 3] + radius * cos(angle);
-        p1 = ToWorldSpacePosition(p1);
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-}
-
-void DisplayContext::DrawHalfDottedCircle(const Vec3& pos, float radius, const Vec3& viewPos, int nUnchangedAxis)
-{
-    // Draw circle with default radius
-    Vec3 p0, p1;
-    p0[nUnchangedAxis] = pos[nUnchangedAxis];
-    p0[(nUnchangedAxis + 1) % 3] = pos[(nUnchangedAxis + 1) % 3] + radius * sin(0.0f);
-    p0[(nUnchangedAxis + 2) % 3] = pos[(nUnchangedAxis + 2) % 3] + radius * cos(0.0f);
-    p0 = ToWorldSpacePosition(p0);
-    const Vec3 worldPos = ToWorldSpacePosition(pos);
-    const Vec3 worldView = ToWorldSpacePosition(viewPos);
-    const float step = 10.0f / 180.0f * gf_PI;
-    size_t count = 0;
-    for (float angle = step; angle < 360.0f / 180.0f * gf_PI + step; angle += step)
-    {
-        p1[nUnchangedAxis] = pos[nUnchangedAxis];
-        p1[(nUnchangedAxis + 1) % 3] = pos[(nUnchangedAxis + 1) % 3] + radius * sin(angle);
-        p1[(nUnchangedAxis + 2) % 3] = pos[(nUnchangedAxis + 2) % 3] + radius * cos(angle);
-        p1 = ToWorldSpacePosition(p1);
-        // is circle edge facing away from us or not
-        const float dot = (p0 - worldPos).Dot(worldView - worldPos);
-        const bool facing = dot > 0.0f;
-        // if so skip every other line to produce a dotted effect
-        if (facing || count % 2 == 0)
-        {
-            InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        }
-        count++;
-        p0 = p1;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Vera, Confetti
-void DisplayContext::DrawDottedCircle(const Vec3& pos, float radius, const Vec3& nUnchangedAxis, int numberOfArrows /*=0*/, float stepDegree /*= 1*/)
-{
-    float startAngleRadians = 0;
-
-    Vec3 a;
-    Vec3 b;
-    GetBasisVectors(nUnchangedAxis, a, b);
-
-    float angle = startAngleRadians;
-
-    float cosAngle = cos(angle) * radius;
-    float sinAngle = sin(angle) * radius;
-
-    Vec3 p0;
-    p0.x = pos.x + cosAngle * a.x + sinAngle * b.x;
-    p0.y = pos.y + cosAngle * a.y + sinAngle * b.y;
-    p0.z = pos.z + cosAngle * a.z + sinAngle * b.z;
-    p0 = ToWorldSpacePosition(p0);
-
-    float step = DEG2RAD(stepDegree); // one degree each step
-    int numSteps = aznumeric_cast<int>(2.0f * gf_PI / step);
-
-    // Prepare for drawing arrow
-    float arrowStep = 0;
-    float arrowAngle = 0;
-    if (numberOfArrows > 0)
-    {
-        arrowStep = 2 * gf_PI / numberOfArrows;
-        arrowAngle = arrowStep;
-    }
-
-    Vec3 p1;
-    for (int i = 0; i < numSteps; ++i)
-    {
-        angle += step;
-        float cosAngle2 = cos(angle) * radius;
-        float sinAngle2 = sin(angle) * radius;
-
-        p1.x = pos.x + cosAngle2 * a.x + sinAngle2 * b.x;
-        p1.y = pos.y + cosAngle2 * a.y + sinAngle2 * b.y;
-        p1.z = pos.z + cosAngle2 * a.z + sinAngle2 * b.z;
-        p1 = ToWorldSpacePosition(p1);
-
-
-        if (arrowStep > 0) // If user want to draw arrow on circle
-        {
-            // if the arraw should be drawn between current angel and next angel
-            if (angle <= arrowAngle && angle + step * 2 > arrowAngle)
-            {
-                // Get local position from global position
-                Matrix34 inverseMat = m_matrixStack[m_currentMatrix].GetInverted();
-                Vec3 localP0 = inverseMat.TransformPoint(p0);
-                Vec3 localP1 = inverseMat.TransformPoint(p1);
-                DrawArrow(localP0, localP1, m_thickness);
-                arrowAngle += arrowStep;
-                if (arrowAngle > 2 * gf_PI) // if the next arrow angle is greater than 2PI. Stop adding arrow.
-                {
-                    arrowStep = 0;
-                }
-            }
-        }
-
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-
-        // Skip a step
-        angle += step;
-        cosAngle2 = cos(angle) * radius;
-        sinAngle2 = sin(angle) * radius;
-
-        p1.x = pos.x + cosAngle2 * a.x + sinAngle2 * b.x;
-        p1.y = pos.y + cosAngle2 * a.y + sinAngle2 * b.y;
-        p1.z = pos.z + cosAngle2 * a.z + sinAngle2 * b.z;
-        p1 = ToWorldSpacePosition(p1);
-
-        p0 = p1;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawWireCircle2d(const QPoint& center, float radius, float z)
-{
-    Vec3 p0, p1, pos;
-    pos.x = static_cast<float>(center.x());
-    pos.y = static_cast<float>(center.y());
-    pos.z = z;
-    p0.x = pos.x + radius * sin(0.0f);
-    p0.y = pos.y + radius * cos(0.0f);
-    p0.z = z;
-    float step = 10.0f / 180 * gf_PI;
-
-    int prevState = GetState();
-    //SetState( (prevState|e_Mode2D) & (~e_Mode3D) );
-    for (float angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        p1.x = pos.x + radius * sin(angle);
-        p1.y = pos.y + radius * cos(angle);
-        p1.z = z;
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-    SetState(prevState);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawWireSphere(const Vec3& pos, float radius)
-{
-    Vec3 p0, p1;
-    float step = 10.0f / 180 * gf_PI;
-    float angle;
-
-    // Z Axis
-    p0 = pos;
-    p1 = pos;
-    p0.x += radius * sin(0.0f);
-    p0.y += radius * cos(0.0f);
-    p0 = ToWorldSpacePosition(p0);
-    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        p1.x = pos.x + radius * sin(angle);
-        p1.y = pos.y + radius * cos(angle);
-        p1.z = pos.z;
-        p1 = ToWorldSpacePosition(p1);
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-
-    // X Axis
-    p0 = pos;
-    p1 = pos;
-    p0.y += radius * sin(0.0f);
-    p0.z += radius * cos(0.0f);
-    p0 = ToWorldSpacePosition(p0);
-    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        p1.x = pos.x;
-        p1.y = pos.y + radius * sin(angle);
-        p1.z = pos.z + radius * cos(angle);
-        p1 = ToWorldSpacePosition(p1);
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-
-    // Y Axis
-    p0 = pos;
-    p1 = pos;
-    p0.x += radius * sin(0.0f);
-    p0.z += radius * cos(0.0f);
-    p0 = ToWorldSpacePosition(p0);
-    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        p1.x = pos.x + radius * sin(angle);
-        p1.y = pos.y;
-        p1.z = pos.z + radius * cos(angle);
-        p1 = ToWorldSpacePosition(p1);
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawWireSphere(const Vec3& pos, const Vec3 radius)
-{
-    Vec3 p0, p1;
-    float step = 10.0f / 180 * gf_PI;
-    float angle;
-
-    // Z Axis
-    p0 = pos;
-    p1 = pos;
-    p0.x += radius.x * sin(0.0f);
-    p0.y += radius.y * cos(0.0f);
-    p0 = ToWorldSpacePosition(p0);
-    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        p1.x = pos.x + radius.x * sin(angle);
-        p1.y = pos.y + radius.y * cos(angle);
-        p1.z = pos.z;
-        p1 = ToWorldSpacePosition(p1);
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-
-    // X Axis
-    p0 = pos;
-    p1 = pos;
-    p0.y += radius.y * sin(0.0f);
-    p0.z += radius.z * cos(0.0f);
-    p0 = ToWorldSpacePosition(p0);
-    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        p1.x = pos.x;
-        p1.y = pos.y + radius.y * sin(angle);
-        p1.z = pos.z + radius.z * cos(angle);
-        p1 = ToWorldSpacePosition(p1);
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-
-    // Y Axis
-    p0 = pos;
-    p1 = pos;
-    p0.x += radius.x * sin(0.0f);
-    p0.z += radius.z * cos(0.0f);
-    p0 = ToWorldSpacePosition(p0);
-    for (angle = step; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        p1.x = pos.x + radius.x * sin(angle);
-        p1.y = pos.y;
-        p1.z = pos.z + radius.z * cos(angle);
-        p1 = ToWorldSpacePosition(p1);
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        p0 = p1;
-    }
-}
-
-void DisplayContext::DrawWireDisk(const Vec3& pos, const Vec3& dir, float radius)
-{
-    // Draw circle
-    DrawArc(pos, radius, 0.0f, 360.0f, 11.25f, dir);
-
-    // Draw disk direction normal from center.
-    DrawLine(pos, pos + dir * radius * 0.2f);
-}
-
-void DisplayContext::DrawWireQuad2d(const QPoint& pmin, const QPoint& pmax, float z)
-{
-    int prevState = GetState();
-    SetState((prevState | e_Mode2D) & (~e_Mode3D));
-    float minX = static_cast<float>(pmin.x());
-    float minY = static_cast<float>(pmin.y());
-    float maxX = static_cast<float>(pmax.x());
-    float maxY = static_cast<float>(pmax.y());
-    InternalDrawLine(Vec3(minX, minY, z), m_color4b, Vec3(maxX, minY, z), m_color4b);
-    InternalDrawLine(Vec3(maxX, minY, z), m_color4b, Vec3(maxX, maxY, z), m_color4b);
-    InternalDrawLine(Vec3(maxX, maxY, z), m_color4b, Vec3(minX, maxY, z), m_color4b);
-    InternalDrawLine(Vec3(minX, maxY, z), m_color4b, Vec3(minX, minY, z), m_color4b);
-    SetState(prevState);
-}
-
-void DisplayContext::DrawLine2d(const QPoint& p1, const QPoint& p2, float z)
-{
-    int prevState = GetState();
-
-    SetState((prevState | e_Mode2D) & (~e_Mode3D));
-
-    // If we don't have correct information, we try to get it, but while we
-    // don't, we skip rendering this frame.
-    if (m_width == 0 || m_height == 0)
-    {
-        if (view)
-        {
-            // We tell the window to update itself, as it might be needed to
-            // get correct information.
-            view->Update();
-            int width, height;
-            view->GetDimensions(&width, &height);
-            m_width = static_cast<float>(width);
-            m_height = static_cast<float>(height);
-        }
-    }
-    else
-    {
-        InternalDrawLine(Vec3(p1.x() / m_width, p1.y() / m_height, z), m_color4b, Vec3(p2.x() / m_width, p2.y() / m_height, z), m_color4b);
-    }
-
-    SetState(prevState);
-}
-
-void DisplayContext::DrawLine2dGradient(const QPoint& p1, const QPoint& p2, float z, ColorB firstColor, ColorB secondColor)
-{
-    int prevState = GetState();
-
-    SetState((prevState | e_Mode2D) & (~e_Mode3D));
-    InternalDrawLine(Vec3(p1.x() / m_width, p1.y() / m_height, z), firstColor, Vec3(p2.x() / m_width, p2.y() / m_height, z), secondColor);
-    SetState(prevState);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawQuadGradient(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4, ColorB firstColor, ColorB secondColor)
-{
-    Vec3 p[4] = { ToWorldSpacePosition(p1), ToWorldSpacePosition(p2), ToWorldSpacePosition(p3), ToWorldSpacePosition(p4) };
-    pRenderAuxGeom->DrawTriangle(p[0], firstColor, p[1], firstColor, p[2], secondColor);
-    pRenderAuxGeom->DrawTriangle(p[2], secondColor, p[3], secondColor, p[0], firstColor);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QColor DisplayContext::GetSelectedColor()
-{
-    float t = aznumeric_cast<float>(QDateTime::currentMSecsSinceEpoch() / 1000);
-    float r1 = fabs(sin(t * 8.0f));
-    if (r1 > 255)
-    {
-        r1 = 255;
-    }
-    return QColor(255, 0, aznumeric_cast<int>(r1 * 255));
-    //          float r2 = cos(t*3);
-    //dc.renderer->SetMaterialColor( 1,0,r1,0.5f );
-}
-
-QColor DisplayContext::GetFreezeColor()
-{
-    return FREEZE_COLOR;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::SetSelectedColor(float fAlpha)
-{
-    SetColor(GetSelectedColor(), fAlpha);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::SetFreezeColor()
-{
-    SetColor(FREEZE_COLOR, 0.5f);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawLine(const Vec3& p1, const Vec3& p2, const ColorF& col1, const ColorF& col2)
-{
-    InternalDrawLine(ToWorldSpacePosition(p1), ColorB(col1), ToWorldSpacePosition(p2), ColorB(col2));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawLine(const Vec3& p1, const Vec3& p2, const QColor& rgb1, const QColor& rgb2)
-{
-    InternalDrawLine(ToWorldSpacePosition(p1), ColorB(rgb1.red(), rgb1.green(), rgb1.blue(), 255), ToWorldSpacePosition(p2), ColorB(rgb2.red(), rgb2.green(), rgb2.blue(), 255));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawLines(const AZStd::vector<Vec3>& points, const ColorF& color)
-{
-    pRenderAuxGeom->DrawLines(points.begin(), points.size(), color, m_thickness);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Vera, Confetti
-void DisplayContext::DrawDottedLine(const Vec3& p1, const Vec3& p2, [[maybe_unused]] const ColorF& col1, [[maybe_unused]] const ColorF& col2, const float numOfSteps)
-{
-    Vec3 direction =  Vec3(p2.x - p1.x, p2.y - p1.y, p2.z - p1.z);
-    //We only draw half of a step and leave the other half empty to make it a dotted line.
-    Vec3 halfstep = (direction / numOfSteps) * 0.5f;
-    Vec3 startPoint = p1;
-
-    for (int stepCount = 0; stepCount < numOfSteps; stepCount++)
-    {
-        InternalDrawLine(ToWorldSpacePosition(startPoint), m_color4b, ToWorldSpacePosition(startPoint + halfstep), m_color4b);
-        startPoint += 2 * halfstep; //skip a half step to make it dotted
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::PushMatrix(const Matrix34& tm)
-{
-    assert(m_currentMatrix < 31);
-    if (m_currentMatrix < 31)
-    {
-        m_currentMatrix++;
-        m_matrixStack[m_currentMatrix] = m_matrixStack[m_currentMatrix - 1] * tm;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::PopMatrix()
-{
-    assert(m_currentMatrix > 0);
-    if (m_currentMatrix > 0)
-    {
-        m_currentMatrix--;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Matrix34& DisplayContext::GetMatrix()
-{
-    return m_matrixStack[m_currentMatrix];
-}
-
-float DisplayContext::ToWorldSpaceMaxScale(float value)
-{
-    // get the max scaled value in case the transform on the stack is scaled non-uniformly
-    const float transformedValueX = ToWorldSpaceVector(Vec3(value, 0.0f, 0.0f)).GetLength();
-    const float transformedValueY = ToWorldSpaceVector(Vec3(0.0f, value, 0.0f)).GetLength();
-    const float transformedValueZ = ToWorldSpaceVector(Vec3(0.0f, 0.0f, value)).GetLength();
-    return AZ::GetMax(transformedValueX, AZ::GetMax(transformedValueY, transformedValueZ));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawBall(const Vec3& pos, float radius, bool drawShaded)
-{
-    pRenderAuxGeom->DrawSphere(
-        ToWorldSpacePosition(pos), ToWorldSpaceMaxScale(radius), m_color4b, drawShaded);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawDisk(const Vec3& pos, const Vec3& dir, float radius)
-{
-    pRenderAuxGeom->DrawDisk(
-        ToWorldSpacePosition(pos), ToWorldSpaceVector(dir), ToWorldSpaceMaxScale(radius), m_color4b);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawArrow(const Vec3& src, const Vec3& trg, float fHeadScale, bool b2SidedArrow)
-{
-    float f2dScale = 1.0f;
-    float arrowLen = 0.4f * fHeadScale;
-    float arrowRadius = 0.1f * fHeadScale;
-    if (flags & DISPLAY_2D)
-    {
-        f2dScale = 1.2f * ToWorldSpaceVector(Vec3(1, 0, 0)).GetLength();
-    }
-    Vec3 dir = trg - src;
-    dir = ToWorldSpaceVector(dir.GetNormalized());
-    Vec3 p0 = ToWorldSpacePosition(src);
-    Vec3 p1 = ToWorldSpacePosition(trg);
-    if (!b2SidedArrow)
-    {
-        p1 = p1 - dir * arrowLen;
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        pRenderAuxGeom->DrawCone(p1, dir, arrowRadius * f2dScale, arrowLen * f2dScale, m_color4b);
-    }
-    else
-    {
-        p0 = p0 + dir * arrowLen;
-        p1 = p1 - dir * arrowLen;
-        InternalDrawLine(p0, m_color4b, p1, m_color4b);
-        pRenderAuxGeom->DrawCone(p0, -dir, arrowRadius * f2dScale, arrowLen * f2dScale, m_color4b);
-        pRenderAuxGeom->DrawCone(p1, dir, arrowRadius * f2dScale, arrowLen * f2dScale, m_color4b);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::RenderObject(int objectType, const Vec3& pos, float scale)
-{
-    Matrix34 tm;
-    tm.SetIdentity();
-
-    tm = Matrix33::CreateScale(Vec3(scale, scale, scale)) * tm;
-
-    tm.SetTranslation(pos);
-    RenderObject(objectType, tm);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::RenderObject(int, const Matrix34&)
-{
-}
-
-/////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawTerrainRect(float x1, float y1, float x2, float y2, float height)
-{
-    AzFramework::Terrain::TerrainDataRequests* terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-    if (terrain == nullptr)
-    {
-        return;
-    }
-
-    Vec3 p1, p2;
-    float x, y;
-
-    float step = MAX(y2 - y1, x2 - x1);
-    if (step < 0.1)
-    {
-        return;
-    }
-    step = step / 100.0f;
-    if (step > 10)
-    {
-        step /= 10;
-    }
-
-    for (y = y1; y < y2; y += step)
-    {
-        float ye = min(y + step, y2);
-
-        p1.x = x1;
-        p1.y = y;
-        p1.z = terrain->GetHeightFromFloats(p1.x, p1.y) + height;
-
-        p2.x = x1;
-        p2.y = ye;
-        p2.z = terrain->GetHeightFromFloats(p2.x, p2.y) + height;
-        DrawLine(p1, p2);
-
-        p1.x = x2;
-        p1.y = y;
-        p1.z = terrain->GetHeightFromFloats(p1.x, p1.y) + height;
-
-        p2.x = x2;
-        p2.y = ye;
-        p2.z = terrain->GetHeightFromFloats(p2.x, p2.y) + height;
-        DrawLine(p1, p2);
-    }
-    for (x = x1; x < x2; x += step)
-    {
-        float xe = min(x + step, x2);
-
-        p1.x = x;
-        p1.y = y1;
-        p1.z = terrain->GetHeightFromFloats(p1.x, p1.y) + height;
-
-        p2.x = xe;
-        p2.y = y1;
-        p2.z = terrain->GetHeightFromFloats(p2.x, p2.y) + height;
-        DrawLine(p1, p2);
-
-        p1.x = x;
-        p1.y = y2;
-        p1.z = terrain->GetHeightFromFloats(p1.x, p1.y) + height;
-
-        p2.x = xe;
-        p2.y = y2;
-        p2.z = terrain->GetHeightFromFloats(p2.x, p2.y) + height;
-        DrawLine(p1, p2);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawTerrainLine(Vec3 worldPos1, Vec3 worldPos2)
-{
-    worldPos1.z = worldPos2.z = 0;
-
-    int steps = static_cast<int>((worldPos2 - worldPos1).GetLength() / 4);
-    if (steps == 0)
-    {
-        steps = 1;
-    }
-
-    Vec3 step = (worldPos2 - worldPos1) / static_cast<float>(steps);
-
-    AzFramework::Terrain::TerrainDataRequests* terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-    AZ_Assert(terrain != nullptr, "If there's no terrain, %s shouldn't be called", __FUNCTION__);
-
-    Vec3 p1 = worldPos1;
-    p1.z = terrain->GetHeightFromFloats(worldPos1.x, worldPos1.y);
-    for (int i = 0; i < steps; ++i)
-    {
-        Vec3 p2 = p1 + step;
-        p2.z = 0.1f + terrain->GetHeightFromFloats(p2.x, p2.y);
-
-        DrawLine(p1, p2);
-
-        p1 = p2;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawTextLabel(const Vec3& pos, float size, const char* text, const bool bCenter, [[maybe_unused]] int srcOffsetX, [[maybe_unused]] int scrOffsetY)
-{
-    ColorF col(m_color4b.r * (1.0f / 255.0f), m_color4b.g * (1.0f / 255.0f), m_color4b.b * (1.0f / 255.0f), m_color4b.a * (1.0f / 255.0f));
-
-    float fCol[4] = { col.r, col.g, col.b, col.a };
-    if (flags & DISPLAY_2D)
-    {
-        //We need to pass Screen coordinates to Draw2dLabel Function
-        Vec3 screenPos = GetView()->GetScreenTM().TransformPoint(pos);
-        renderer->Draw2dLabel(screenPos.x, screenPos.y, size, fCol, bCenter, "%s", text);
-    }
-    else
-    {
-        renderer->DrawLabelEx(pos, size, fCol, true, true, text);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::Draw2dTextLabel(float x, float y, float size, const char* text, bool bCenter)
-{
-    float col[4] = { m_color4b.r * (1.0f / 255.0f), m_color4b.g * (1.0f / 255.0f), m_color4b.b * (1.0f / 255.0f), m_color4b.a * (1.0f / 255.0f) };
-    renderer->Draw2dLabel(x, y, size, col, bCenter, "%s", text);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::SetLineWidth(float width)
-{
-    m_thickness = width;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool DisplayContext::IsVisible(const AABB& bounds)
-{
-    if (flags & DISPLAY_2D)
-    {
-        if (box.IsIntersectBox(bounds))
-        {
-            return true;
-        }
-    }
-    else
-    {
-        return camera->IsAABBVisible_F(AABB(bounds.min, bounds.max));
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 DisplayContext::GetState() const
-{
-    return m_renderState;
-}
-
-//! Set a new render state flags.
-//! @param returns previous render state.
-uint32 DisplayContext::SetState(uint32 state)
-{
-    uint32 old = m_renderState;
-    m_renderState = state;
-    pRenderAuxGeom->SetRenderFlags(m_renderState);
-    return old;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DepthTestOff()
-{
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-    pRenderAuxGeom->SetRenderFlags((m_renderState | e_DepthTestOff) & (~e_DepthTestOn));
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DepthTestOn()
-{
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-    pRenderAuxGeom->SetRenderFlags((m_renderState | e_DepthTestOn) & (~e_DepthTestOff));
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DepthWriteOff()
-{
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-    pRenderAuxGeom->SetRenderFlags((m_renderState | e_DepthWriteOff) & (~e_DepthWriteOn));
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DepthWriteOn()
-{
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-    pRenderAuxGeom->SetRenderFlags((m_renderState | e_DepthWriteOn) & (~e_DepthWriteOff));
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::CullOff()
-{
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-    pRenderAuxGeom->SetRenderFlags((m_renderState | e_CullModeNone) & (~(e_CullModeBack | e_CullModeFront)));
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::CullOn()
-{
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-    pRenderAuxGeom->SetRenderFlags((m_renderState | e_CullModeBack) & (~(e_CullModeNone | e_CullModeFront)));
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool DisplayContext::SetDrawInFrontMode(bool bOn)
-{
-    int prevState = m_renderState;
-    SAuxGeomRenderFlags renderFlags = m_renderState;
-    renderFlags.SetDrawInFrontMode((bOn) ? e_DrawInFrontOn : e_DrawInFrontOff);
-    pRenderAuxGeom->SetRenderFlags(renderFlags);
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-    return (prevState & e_DrawInFrontOn) != 0;
-}
-
-int DisplayContext::SetFillMode(int nFillMode)
-{
-    int prevState = m_renderState;
-    SAuxGeomRenderFlags renderFlags = m_renderState;
-    renderFlags.SetFillMode((EAuxGeomPublicRenderflags_FillMode)nFillMode);
-    pRenderAuxGeom->SetRenderFlags(renderFlags);
-    m_renderState = pRenderAuxGeom->GetRenderFlags().m_renderFlags;
-    return prevState;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::DrawTextureLabel(const Vec3& pos, int nWidth, int nHeight, int nTexId, int nTexIconFlags, int srcOffsetX, int srcOffsetY, bool bDistanceScaleIcons, float fDistanceScale)
-{
-    const float fLabelDepthPrecision = 0.05f;
-    Vec3 scrpos = view->WorldToView3D(pos);
-
-    float fWidth = (float)nWidth;
-    float fHeight = (float)nHeight;
-
-    if (bDistanceScaleIcons)
-    {
-        float fScreenScale = view->GetScreenScaleFactor(pos);
-
-        fWidth *= fDistanceScale / fScreenScale;
-        fHeight *= fDistanceScale / fScreenScale;
-    }
-
-    STextureLabel tl;
-    tl.x = scrpos.x + srcOffsetX;
-    tl.y = scrpos.y + srcOffsetY;
-    if (nTexIconFlags & TEXICON_ALIGN_BOTTOM)
-    {
-        tl.y -= fHeight / 2;
-    }
-    else if (nTexIconFlags & TEXICON_ALIGN_TOP)
-    {
-        tl.y += fHeight / 2;
-    }
-    tl.z = scrpos.z - (1.0f - scrpos.z) * fLabelDepthPrecision;
-    tl.w = fWidth;
-    tl.h = fHeight;
-    tl.nTexId = nTexId;
-    tl.flags = nTexIconFlags;
-    tl.color[0] = m_color4b.r * (1.0f / 255.0f);
-    tl.color[1] = m_color4b.g * (1.0f / 255.0f);
-    tl.color[2] = m_color4b.b * (1.0f / 255.0f);
-    tl.color[3] = m_color4b.a * (1.0f / 255.0f);
-
-    // Try to not overflood memory with labels.
-    if (m_textureLabels.size() < 100000)
-    {
-        m_textureLabels.push_back(tl);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void DisplayContext::Flush2D()
-{
-#ifndef PHYSICS_EDITOR
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-#endif
-
-    if (m_textureLabels.empty())
-    {
-        return;
-    }
-
-    int rcw, rch;
-    view->GetDimensions(&rcw, &rch);
-
-    TransformationMatrices backupSceneMatrices;
-
-    renderer->Set2DMode(rcw, rch, backupSceneMatrices, 0.0f, 1.0f);
-
-    renderer->SetState(GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-    //renderer->SetCullMode( R_CULL_NONE );
-
-    float uvs[4], uvt[4];
-    uvs[0] = 0;
-    uvt[0] = 1;
-    uvs[1] = 1;
-    uvt[1] = 1;
-    uvs[2] = 1;
-    uvt[2] = 0;
-    uvs[3] = 0;
-    uvt[3] = 0;
-
-    int nLabels = m_textureLabels.size();
-    for (int i = 0; i < nLabels; i++)
-    {
-        STextureLabel& t = m_textureLabels[i];
-        float w2 = t.w * 0.5f;
-        float h2 = t.h * 0.5f;
-        if (t.flags & TEXICON_ADDITIVE)
-        {
-            renderer->SetState(GS_BLSRC_ONE | GS_BLDST_ONE);
-        }
-        else if (t.flags & TEXICON_ON_TOP)
-        {
-            renderer->SetState(GS_NODEPTHTEST | GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-        }
-
-        renderer->DrawImageWithUV(t.x - w2, t.y + h2, t.z, t.w, -t.h, t.nTexId, uvs, uvt, t.color[0], t.color[1], t.color[2], t.color[3]);
-
-        if (t.flags & (TEXICON_ADDITIVE | TEXICON_ON_TOP)) // Restore state.
-        {
-            renderer->SetState(GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA);
-        }
-    }
-
-    renderer->Unset2DMode(backupSceneMatrices);
-
-    m_textureLabels.clear();
-}
diff --git a/Code/Sandbox/Editor/Objects/EntityObject.cpp b/Code/Sandbox/Editor/Objects/EntityObject.cpp
deleted file mode 100644
index 3fcc4abae0..0000000000
--- a/Code/Sandbox/Editor/Objects/EntityObject.cpp
+++ /dev/null
@@ -1,2297 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : StaticObject implementation.
-
-
-#include "EditorDefs.h"
-
-#include "EntityObject.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-
-// Editor
-#include "Settings.h"
-#include "Viewport.h"
-#include "LineGizmo.h"
-#include "Include/IObjectManager.h"
-#include "Objects/ObjectManager.h"
-#include "ViewManager.h"
-#include "AnimationContext.h"
-#include "HitContext.h"
-#include "Objects/SelectionGroup.h"
-
-#include <IEntityRenderState.h>
-#include <IStatObj.h>
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo Entity Link
-class CUndoEntityLink
-    : public IUndoObject
-{
-public:
-    CUndoEntityLink(CSelectionGroup* pSelection)
-    {
-        int nObjectSize = pSelection->GetCount();
-        m_Links.reserve(nObjectSize);
-        for (int i = 0; i < nObjectSize; ++i)
-        {
-            CBaseObject* pObj = pSelection->GetObject(i);
-            if (qobject_cast<CEntityObject*>(pObj))
-            {
-                SLink link;
-                link.entityID = pObj->GetId();
-                link.linkXmlNode = XmlHelpers::CreateXmlNode("undo");
-                ((CEntityObject*)pObj)->SaveLink(link.linkXmlNode);
-                m_Links.push_back(link);
-            }
-        }
-    }
-
-protected:
-    virtual void Release() { delete this; };
-    virtual int GetSize() { return sizeof(*this); }; // Return size of xml state.
-    virtual QString GetDescription() { return "Entity Link"; };
-    virtual QString GetObjectName(){ return ""; };
-
-    virtual void Undo([[maybe_unused]] bool bUndo)
-    {
-        for (int i = 0, iLinkSize(m_Links.size()); i < iLinkSize; ++i)
-        {
-            SLink& link = m_Links[i];
-            CBaseObject* pObj = GetIEditor()->GetObjectManager()->FindObject(link.entityID);
-            if (pObj == NULL)
-            {
-                continue;
-            }
-            if (!qobject_cast<CEntityObject*>(pObj))
-            {
-                continue;
-            }
-            CEntityObject* pEntity = (CEntityObject*)pObj;
-            if (link.linkXmlNode->getChildCount() == 0)
-            {
-                continue;
-            }
-            pEntity->LoadLink(link.linkXmlNode->getChild(0));
-        }
-    }
-    virtual void Redo(){}
-
-private:
-
-    struct SLink
-    {
-        GUID entityID;
-        XmlNodeRef linkXmlNode;
-    };
-
-    std::vector<SLink> m_Links;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo object for attach/detach changes
-class CUndoAttachEntity
-    : public IUndoObject
-{
-public:
-    CUndoAttachEntity(CEntityObject* pAttachedObject, bool bAttach)
-        : m_attachedEntityGUID(pAttachedObject->GetId())
-        , m_attachmentTarget(pAttachedObject->GetAttachTarget())
-        , m_attachmentType(pAttachedObject->GetAttachType())
-        , m_bAttach(bAttach)
-    {}
-
-    virtual void Undo([[maybe_unused]] bool bUndo) override
-    {
-        if (!m_bAttach)
-        {
-            SetAttachmentTypeAndTarget();
-        }
-    }
-
-    virtual void Redo() override
-    {
-        if (m_bAttach)
-        {
-            SetAttachmentTypeAndTarget();
-        }
-    }
-
-private:
-    void SetAttachmentTypeAndTarget()
-    {
-        CObjectManager* pObjectManager = static_cast<CObjectManager*>(GetIEditor()->GetObjectManager());
-        CEntityObject* pEntity = static_cast<CEntityObject*>(pObjectManager->FindObject(m_attachedEntityGUID));
-
-        if (pEntity)
-        {
-            pEntity->SetAttachType(m_attachmentType);
-            pEntity->SetAttachTarget(m_attachmentTarget.toUtf8().data());
-        }
-    }
-
-    virtual int GetSize() { return sizeof(CUndoAttachEntity); }
-    virtual QString GetDescription() { return "Attachment Changed"; }
-
-    GUID m_attachedEntityGUID;
-    CEntityObject::EAttachmentType m_attachmentType;
-    QString m_attachmentTarget;
-    bool m_bAttach;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CBase implementation.
-//////////////////////////////////////////////////////////////////////////
-
-float CEntityObject::m_helperScale = 1;
-
-namespace
-{
-    CEntityObject* s_pPropertyPanelEntityObject = nullptr;
-
-    // Prevent OnPropertyChange to be executed when loading many properties at one time.
-    static bool s_ignorePropertiesUpdate = false;
-};
-
-//////////////////////////////////////////////////////////////////////////
-CEntityObject::CEntityObject()
-    : m_listeners(1)
-{
-    m_bLoadFailed = false;
-
-    m_visualObject = 0;
-
-    m_box.min.Set(0, 0, 0);
-    m_box.max.Set(0, 0, 0);
-
-    m_proximityRadius = 0;
-    m_innerRadius = 0;
-    m_outerRadius = 0;
-    m_boxSizeX = 1;
-    m_boxSizeY = 1;
-    m_boxSizeZ = 1;
-    m_bProjectInAllDirs = false;
-    m_bProjectorHasTexture = false;
-
-    m_bDisplayBBox = true;
-    m_bBBoxSelection = false;
-    m_bDisplaySolidBBox = false;
-    m_bDisplayAbsoluteRadius = false;
-    m_bIconOnTop = false;
-    m_bDisplayArrow = false;
-    m_entityId = 0;
-    m_bVisible = true;
-    m_bCalcPhysics = true;
-    m_bLight = false;
-    m_bAreaLight = false;
-    m_fAreaWidth = 1;
-    m_fAreaHeight = 1;
-    m_fAreaLightSize = 0.05f;
-    m_bBoxProjectedCM = false;
-    m_fBoxWidth = 1;
-    m_fBoxHeight = 1;
-    m_fBoxLength = 1;
-
-    m_bEnableReload = true;
-
-    m_lightColor = Vec3(1, 1, 1);
-
-    SetColor(QColor(255, 255, 0));
-
-    // Init Variables.
-    mv_castShadow = true;
-    mv_castShadowMinSpec = CONFIG_LOW_SPEC;
-    mv_outdoor          =   false;
-    mv_recvWind = false;
-    mv_renderNearest = false;
-    mv_noDecals = false;
-
-    mv_createdThroughPool = false;
-
-    mv_obstructionMultiplier = 1.f;
-    mv_obstructionMultiplier.SetLimits(0.f, 1.f, 0.01f);
-
-    mv_hiddenInGame = false;
-    mv_ratioLOD = 100;
-    mv_viewDistanceMultiplier = 1.0f;
-    mv_ratioLOD.SetLimits(0, 255);
-    mv_viewDistanceMultiplier.SetLimits(0.0f, IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX);
-
-    m_physicsState = 0;
-
-    m_attachmentType = eAT_Pivot;
-
-    // cache all the variable callbacks, must match order of enum defined in header
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnAreaHeightChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnAreaLightChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnAreaLightSizeChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnAreaWidthChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxHeightChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxLengthChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxProjectionChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxSizeXChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxSizeYChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxSizeZChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnBoxWidthChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnColorChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnInnerRadiusChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnOuterRadiusChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnProjectInAllDirsChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnProjectorFOVChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnProjectorTextureChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnPropertyChange, this, AZStd::placeholders::_1));
-    m_onSetCallbacksCache.push_back(AZStd::bind(&CEntityObject::OnRadiusChange, this, AZStd::placeholders::_1));
-}
-
-CEntityObject::~CEntityObject()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::InitVariables()
-{
-    mv_castShadowMinSpec.AddEnumItem("Never",          END_CONFIG_SPEC_ENUM);
-    mv_castShadowMinSpec.AddEnumItem("Low",                CONFIG_LOW_SPEC);
-    mv_castShadowMinSpec.AddEnumItem("Medium",     CONFIG_MEDIUM_SPEC);
-    mv_castShadowMinSpec.AddEnumItem("High",               CONFIG_HIGH_SPEC);
-    mv_castShadowMinSpec.AddEnumItem("VeryHigh",       CONFIG_VERYHIGH_SPEC);
-
-    mv_castShadow.SetFlags(mv_castShadow.GetFlags() | IVariable::UI_INVISIBLE);
-    mv_castShadowMinSpec->SetFlags(mv_castShadowMinSpec->GetFlags() | IVariable::UI_UNSORTED);
-
-    AddVariable(mv_outdoor, "OutdoorOnly", tr("Outdoor Only"));
-    AddVariable(mv_castShadow, "CastShadow", tr("Cast Shadow"));
-    AddVariable(mv_castShadowMinSpec, "CastShadowMinspec", tr("Cast Shadow MinSpec"));
-
-    AddVariable(mv_ratioLOD, "LodRatio");
-    AddVariable(mv_viewDistanceMultiplier, "ViewDistanceMultiplier");
-    AddVariable(mv_hiddenInGame, "HiddenInGame");
-    AddVariable(mv_recvWind, "RecvWind", tr("Receive Wind"));
-
-    // [artemk]: Add RenderNearest entity param because of animator request.
-    // This will cause that slot zero is rendered with ENTITY_SLOT_RENDER_NEAREST flag raised.
-    AddVariable(mv_renderNearest, "RenderNearest");
-    mv_renderNearest.SetDescription("Used to eliminate z-buffer artifacts when rendering from first person view");
-    AddVariable(mv_noDecals, "NoStaticDecals");
-
-    AddVariable(mv_createdThroughPool, "CreatedThroughPool", tr("Created Through Pool"));
-
-    AddVariable(mv_obstructionMultiplier, "ObstructionMultiplier", tr("Obstruction Multiplier"));
-}
-
-//////////////////////////////////////////////////////////////////////////&
-void CEntityObject::Done()
-{
-    DeleteEntity();
-
-    ReleaseEventTargets();
-    RemoveAllEntityLinks();
-
-    for (CListenerSet<IEntityObjectListener*>::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
-    {
-        notifier->OnDone();
-    }
-
-    CBaseObject::Done();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::FreeGameData()
-{
-    DeleteEntity();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::Init(IEditor* pEditor, CBaseObject* pPrev, const QString& file)
-{
-    CBaseObject::Init(pEditor, pPrev, file);
-
-    if (pPrev)
-    {
-        CEntityObject* pPreviousEntity = ( CEntityObject* )pPrev;
-
-        // Clone Properties.
-        if (pPreviousEntity->m_pProperties)
-        {
-            m_pProperties = CloneProperties(pPreviousEntity->m_pProperties);
-        }
-        if (pPreviousEntity->m_pProperties2)
-        {
-            m_pProperties2 = CloneProperties(pPreviousEntity->m_pProperties2);
-        }
-
-        mv_createdThroughPool = pPreviousEntity->mv_createdThroughPool;
-    }
-    else if (!file.isEmpty())
-    {
-        SetUniqueName(file);
-        m_entityClass = file;
-    }
-
-    ResetCallbacks();
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-/*static*/ CEntityObject* CEntityObject::FindFromEntityId(const AZ::EntityId& id)
-{
-    CEntityObject* retEntity = nullptr;
-    AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(retEntity, id, &AzToolsFramework::ComponentEntityEditorRequestBus::Events::GetSandboxObject);
-    return retEntity;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::SetTransformDelegate(ITransformDelegate* pTransformDelegate)
-{
-    CBaseObject::SetTransformDelegate(pTransformDelegate);
-
-    if (this == s_pPropertyPanelEntityObject)
-    {
-        return;
-    }
-
-    s_ignorePropertiesUpdate = true;
-    ForceVariableUpdate();
-    s_ignorePropertiesUpdate = false;
-    ResetCallbacks();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::IsSameClass(CBaseObject* obj)
-{
-    return (GetClassDesc() == obj->GetClassDesc());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::ConvertFromObject(CBaseObject* object)
-{
-    CBaseObject::ConvertFromObject(object);
-
-    if (qobject_cast<CEntityObject*>(object))
-    {
-        CEntityObject* pObject = ( CEntityObject* )object;
-
-        mv_outdoor = pObject->mv_outdoor;
-        mv_castShadowMinSpec = pObject->mv_castShadowMinSpec;
-        mv_ratioLOD = pObject->mv_ratioLOD;
-        mv_viewDistanceMultiplier = pObject->mv_viewDistanceMultiplier;
-        mv_hiddenInGame = pObject->mv_hiddenInGame;
-        mv_recvWind = pObject->mv_recvWind;
-        mv_renderNearest = pObject->mv_renderNearest;
-        mv_noDecals = pObject->mv_noDecals;
-
-        mv_createdThroughPool = pObject->mv_createdThroughPool;
-
-        mv_obstructionMultiplier = pObject->mv_obstructionMultiplier;
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::GetLocalBounds(AABB& box)
-{
-    box = m_box;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::HitTest(HitContext& hc)
-{
-    if (!hc.b2DViewport)
-    {
-        // Test 3D viewport.
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    if ((m_bDisplayBBox && gSettings.viewports.bShowTriggerBounds) || hc.b2DViewport || (m_bDisplayBBox && m_bBBoxSelection))
-    {
-        float hitEpsilon = hc.view->GetScreenScaleFactor(GetWorldPos()) * 0.01f;
-        float hitDist;
-
-        float fScale = GetScale().x;
-        AABB boxScaled;
-        boxScaled.min = m_box.min * fScale;
-        boxScaled.max = m_box.max * fScale;
-
-        Matrix34 invertWTM = GetWorldTM();
-        invertWTM.Invert();
-
-        Vec3 xformedRaySrc = invertWTM.TransformPoint(hc.raySrc);
-        Vec3 xformedRayDir = invertWTM.TransformVector(hc.rayDir);
-        xformedRayDir.Normalize();
-
-        {
-            Vec3 intPnt;
-            if (m_bBBoxSelection)
-            {
-                // Check intersection with bbox.
-                if (Intersect::Ray_AABB(xformedRaySrc, xformedRayDir, boxScaled, intPnt))
-                {
-                    hc.dist = xformedRaySrc.GetDistance(intPnt);
-                    hc.object = this;
-                    return true;
-                }
-            }
-            else
-            {
-                // Check intersection with bbox edges.
-                if (Intersect::Ray_AABBEdge(xformedRaySrc, xformedRayDir, boxScaled, hitEpsilon, hitDist, intPnt))
-                {
-                    hc.dist = xformedRaySrc.GetDistance(intPnt);
-                    hc.object = this;
-                    return true;
-                }
-            }
-        }
-    }
-
-    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);
-    }
-
-    if (bResult)
-    {
-        hc.object = this;
-    }
-
-    return bResult;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CEntityObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    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)
-{
-    IVariable* pVar = pSubBlockVar ? pSubBlockVar->FindVariable(pVarName) : properties->FindVariable(pVarName);
-    return pVar;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::AdjustLightProperties(CVarBlockPtr& properties, const char* pSubBlock)
-{
-    IVariable* pSubBlockVar = pSubBlock ? properties->FindVariable(pSubBlock) : NULL;
-
-    if (IVariable* pRadius = FindVariableInSubBlock(properties, pSubBlockVar, "Radius"))
-    {
-        // The value of 0.01 was found through asking Crysis 2 designer
-        // team.
-        pRadius->SetLimits(0.01f, 100.0f, 0.0f, true, false);
-    }
-
-    if (IVariable* pBoxSizeX = FindVariableInSubBlock(properties, pSubBlockVar, "BoxSizeX"))
-    {
-        pBoxSizeX->SetLimits(0.01f, 100.0f, 0.0f, true, false);
-    }
-
-    if (IVariable* pBoxSizeY = FindVariableInSubBlock(properties, pSubBlockVar, "BoxSizeY"))
-    {
-        pBoxSizeY->SetLimits(0.01f, 100.0f, 0.0f, true, false);
-    }
-
-    if (IVariable* pBoxSizeZ = FindVariableInSubBlock(properties, pSubBlockVar, "BoxSizeZ"))
-    {
-        pBoxSizeZ->SetLimits(0.01f, 100.0f, 0.0f, true, false);
-    }
-
-    if (IVariable* pProjectorFov = FindVariableInSubBlock(properties, pSubBlockVar, "fProjectorFov"))
-    {
-        pProjectorFov->SetLimits(0.01f, 180.0f, 0.0f, true, true);
-    }
-
-    if (IVariable* pPlaneWidth = FindVariableInSubBlock(properties, pSubBlockVar, "fPlaneWidth"))
-    {
-        pPlaneWidth->SetLimits(0.01f, 10.0f, 0.0f, true, false);
-        pPlaneWidth->SetHumanName("SourceWidth");
-    }
-
-    if (IVariable* pPlaneHeight = FindVariableInSubBlock(properties, pSubBlockVar, "fPlaneHeight"))
-    {
-        pPlaneHeight->SetLimits(0.01f, 10.0f, 0.0f, true, false);
-        pPlaneHeight->SetHumanName("SourceDiameter");
-    }
-
-    // For backwards compatibility with old lights (avoids changing settings in Lua which will break loading compatibility).
-    // Todo: Change the Lua property names on the next big light refactor.
-    if (IVariable* pAreaLight = FindVariableInSubBlock(properties, pSubBlockVar, "bAreaLight"))
-    {
-        pAreaLight->SetHumanName("PlanarLight");
-    }
-
-    bool bCastShadowLegacy = false;  // Backward compatibility for existing shadow casting lights
-    if (IVariable* pCastShadowVarLegacy = FindVariableInSubBlock(properties, pSubBlockVar, "bCastShadow"))
-    {
-        pCastShadowVarLegacy->SetFlags(pCastShadowVarLegacy->GetFlags() | IVariable::UI_INVISIBLE);
-
-        if (pCastShadowVarLegacy->GetDisplayValue()[0] != '0')
-        {
-            bCastShadowLegacy = true;
-            pCastShadowVarLegacy->SetDisplayValue("0");
-        }
-    }
-
-    if (IVariable* pCastShadowVar = FindVariableInSubBlock(properties, pSubBlockVar, "nCastShadows"))
-    {
-        if (bCastShadowLegacy)
-        {
-            pCastShadowVar->SetDisplayValue("1");
-        }
-        pCastShadowVar->SetDataType(IVariable::DT_UIENUM);
-        pCastShadowVar->SetFlags(pCastShadowVar->GetFlags() | IVariable::UI_UNSORTED);
-    }
-
-    if (IVariable* pShadowMinRes = FindVariableInSubBlock(properties, pSubBlockVar, "nShadowMinResPercent"))
-    {
-        pShadowMinRes->SetDataType(IVariable::DT_UIENUM);
-        pShadowMinRes->SetFlags(pShadowMinRes->GetFlags() | IVariable::UI_UNSORTED);
-    }
-
-    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsLeft"))
-    {
-        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
-    }
-
-    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsRight"))
-    {
-        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
-    }
-
-    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsNear"))
-    {
-        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
-    }
-
-    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsFar"))
-    {
-        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
-    }
-
-    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsTop"))
-    {
-        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
-    }
-
-    if (IVariable* pFade = FindVariableInSubBlock(properties, pSubBlockVar, "vFadeDimensionsBottom"))
-    {
-        pFade->SetFlags(pFade->GetFlags() | IVariable::UI_INVISIBLE);
-    }
-
-    if (IVariable* pSortPriority = FindVariableInSubBlock(properties, pSubBlockVar, "SortPriority"))
-    {
-        pSortPriority->SetLimits(0, 255, 1, true, true);
-    }
-
-    if (IVariable* pAttenFalloffMax = FindVariableInSubBlock(properties, pSubBlockVar, "fAttenuationFalloffMax"))
-    {
-        pAttenFalloffMax->SetLimits(0.0f, 1.0f, 1.0f / 255.0f, true, true);
-    }
-
-    if (IVariable* pVer = FindVariableInSubBlock(properties, pSubBlockVar, "_nVersion"))
-    {
-        int version = -1;
-        pVer->Get(version);
-        if (version == -1)
-        {
-            version++;
-            pVer->Set(version);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::SetName(const QString& name)
-{
-    if (name == GetName())
-    {
-        return;
-    }
-
-    const QString oldName = GetName();
-
-    CBaseObject::SetName(name);
-
-    CListenerSet<IEntityObjectListener*> listeners = m_listeners;
-    for (CListenerSet<IEntityObjectListener*>::Notifier notifier(listeners); notifier.IsValid(); notifier.Next())
-    {
-        notifier->OnNameChanged(name.toUtf8().data());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::SetSelected(bool bSelect)
-{
-    CBaseObject::SetSelected(bSelect);
-
-    if (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>
-struct IVariableType {};
-template <>
-struct IVariableType<bool>
-{
-    enum
-    {
-        value = IVariable::BOOL
-    };
-};
-template <>
-struct IVariableType<int>
-{
-    enum
-    {
-        value = IVariable::INT
-    };
-};
-template <>
-struct IVariableType<float>
-{
-    enum
-    {
-        value = IVariable::FLOAT
-    };
-};
-template <>
-struct IVariableType<QString>
-{
-    enum
-    {
-        value = IVariable::STRING
-    };
-};
-template <>
-struct IVariableType<Vec3>
-{
-    enum
-    {
-        value = IVariable::VECTOR
-    };
-};
-
-void CEntityObject::DrawExtraLightInfo(DisplayContext& dc)
-{
-    IObjectManager* objMan = GetIEditor()->GetObjectManager();
-
-    if (objMan)
-    {
-        if (objMan->IsLightClass(this) && GetProperties())
-        {
-            QString csText("");
-
-            if (GetEntityPropertyBool("bAmbient"))
-            {
-                csText += "A";
-            }
-
-            if (!GetEntityPropertyString("texture_Texture").isEmpty())
-            {
-                csText += "P";
-            }
-
-            int nLightType = GetEntityPropertyInteger("nCastShadows");
-            if (nLightType > 0)
-            {
-                csText += "S";
-            }
-
-            float fScale = GetIEditor()->GetViewManager()->GetView(ET_ViewportUnknown)->GetScreenScaleFactor(GetWorldPos());
-            Vec3 vDrawPos(GetWorldPos());
-            vDrawPos.z += fScale / 25;
-
-            ColorB col(255, 255, 255);
-            dc.SetColor(col);
-            dc.DrawTextLabel(vDrawPos, 1.3f, csText.toUtf8().data());
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::DrawProjectorPyramid(DisplayContext& dc, float dist)
-{
-    const int numPoints = 16; // per one arc
-    const int numArcs = 6;
-
-    if (m_projectorFOV < FLT_EPSILON)
-    {
-        return;
-    }
-
-    Vec3 points[numPoints * numArcs];
-    {
-        // generate 4 arcs on intersection of sphere with pyramid
-        const float fov = DEG2RAD(m_projectorFOV);
-
-        const Vec3 lightAxis(dist, 0.0f, 0.0f);
-        const float tanA = tan(fov * 0.5f);
-        const float fovProj = asinf(1.0f / sqrtf(2.0f + 1.0f / (tanA * tanA))) * 2.0f;
-
-        const float halfFov = 0.5f * fov;
-        const float halfFovProj = fovProj * 0.5f;
-        const float anglePerSegmentOfFovProj = 1.0f / (numPoints - 1) * fovProj;
-
-        const Quat yRot = Quat::CreateRotationY(halfFov);
-        Vec3* arcPoints = points;
-        for (int i = 0; i < numPoints; ++i)
-        {
-            float angle = i * anglePerSegmentOfFovProj - halfFovProj;
-            arcPoints[i] = lightAxis * Quat::CreateRotationZ(angle) * yRot;
-        }
-
-        const Quat zRot = Quat::CreateRotationZ(halfFov);
-        arcPoints += numPoints;
-        for (int i = 0; i < numPoints; ++i)
-        {
-            float angle = (numPoints - i - 1) * anglePerSegmentOfFovProj - halfFovProj;
-            arcPoints[i] = lightAxis * Quat::CreateRotationY(angle) * zRot;
-        }
-
-        const Quat nyRot = Quat::CreateRotationY(-halfFov);
-        arcPoints += numPoints;
-        for (int i = 0; i < numPoints; ++i)
-        {
-            float angle = (numPoints - i - 1) * anglePerSegmentOfFovProj - halfFovProj;
-            arcPoints[i] = lightAxis * Quat::CreateRotationZ(angle) * nyRot;
-        }
-
-        const Quat nzRot = Quat::CreateRotationZ(-halfFov);
-        arcPoints += numPoints;
-        for (int i = 0; i < numPoints; ++i)
-        {
-            float angle = i * anglePerSegmentOfFovProj - halfFovProj;
-            arcPoints[i] = lightAxis * Quat::CreateRotationY(angle) * nzRot;
-        }
-
-        // generate cross
-        arcPoints += numPoints;
-        const float anglePerSegmentOfFov = 1.0f / (numPoints - 1) * fov;
-        for (int i = 0; i < numPoints; ++i)
-        {
-            float angle = i * anglePerSegmentOfFov - halfFov;
-            arcPoints[i] = lightAxis * Quat::CreateRotationY(angle);
-        }
-
-        arcPoints += numPoints;
-        for (int i = 0; i < numPoints; ++i)
-        {
-            float angle = i * anglePerSegmentOfFov - halfFov;
-            arcPoints[i] = lightAxis * Quat::CreateRotationZ(angle);
-        }
-    }
-    // draw pyramid and sphere intersection
-    dc.DrawPolyLine(points, numPoints * 4, false);
-
-    // draw cross
-    dc.DrawPolyLine(points + numPoints * 4, numPoints, false);
-    dc.DrawPolyLine(points + numPoints * 5, numPoints, false);
-
-    Vec3 org(0.0f, 0.0f, 0.0f);
-    dc.DrawLine(org, points[numPoints * 0]);
-    dc.DrawLine(org, points[numPoints * 1]);
-    dc.DrawLine(org, points[numPoints * 2]);
-    dc.DrawLine(org, points[numPoints * 3]);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::DrawProjectorFrustum(DisplayContext& dc, Vec2 size, float dist)
-{
-    static const Vec3 org(0.0f, 0.0f, 0.0f);
-    const Vec3 corners[4] =
-    {
-        Vec3(dist, -size.x, -size.y),
-        Vec3(dist, size.x, -size.y),
-        Vec3(dist, -size.x, size.y),
-        Vec3(dist, size.x, size.y)
-    };
-
-    dc.DrawLine(org, corners[0]);
-    dc.DrawLine(org, corners[1]);
-    dc.DrawLine(org, corners[2]);
-    dc.DrawLine(org, corners[3]);
-
-    dc.DrawWireBox(Vec3(dist, -size.x, -size.y), Vec3(dist, size.x, size.y));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::Serialize(CObjectArchive& ar)
-{
-    CBaseObject::Serialize(ar);
-    XmlNodeRef xmlNode = ar.node;
-    if (ar.bLoading)
-    {
-        // Load
-        QString entityClass = m_entityClass;
-        m_bLoadFailed = false;
-
-        xmlNode->getAttr("EntityClass", entityClass);
-        m_physicsState = xmlNode->findChild("PhysicsState");
-
-        Vec3 angles;
-        // Backward compatibility, with FarCry levels.
-        if (xmlNode->getAttr("Angles", angles))
-        {
-            angles = DEG2RAD(angles);
-            angles.z += gf_PI / 2;
-            Quat quat;
-            quat.SetRotationXYZ(Ang3(angles));
-            SetRotation(quat);
-        }
-
-        // Load Event Targets.
-        ReleaseEventTargets();
-        XmlNodeRef eventTargets = xmlNode->findChild("EventTargets");
-        if (eventTargets)
-        {
-            for (int i = 0; i < eventTargets->getChildCount(); i++)
-            {
-                XmlNodeRef eventTarget = eventTargets->getChild(i);
-                CEntityEventTarget et;
-                et.target = 0;
-                GUID targetId = GUID_NULL;
-                eventTarget->getAttr("TargetId", targetId);
-                eventTarget->getAttr("Event", et.event);
-                eventTarget->getAttr("SourceEvent", et.sourceEvent);
-                m_eventTargets.push_back(et);
-                if (targetId != GUID_NULL)
-                {
-                    using namespace AZStd::placeholders;
-                    ar.SetResolveCallback(this, targetId, AZStd::bind(&CEntityObject::ResolveEventTarget, this, _1, _2), i);
-                }
-            }
-        }
-
-        XmlNodeRef propsNode = xmlNode->findChild("Properties");
-        XmlNodeRef props2Node = xmlNode->findChild("Properties2");
-
-        QString attachmentType;
-        xmlNode->getAttr("AttachmentType", attachmentType);
-
-        if (attachmentType == "GeomCacheNode")
-        {
-            m_attachmentType = eAT_GeomCacheNode;
-        }
-        else if (attachmentType == "CharacterBone")
-        {
-            m_attachmentType = eAT_CharacterBone;
-        }
-        else
-        {
-            m_attachmentType = eAT_Pivot;
-        }
-
-        xmlNode->getAttr("AttachmentTarget", m_attachmentTarget);
-
-        if (ar.bUndo)
-        {
-            RemoveAllEntityLinks();
-            PostLoad(ar);
-        }
-
-        if ((mv_castShadowMinSpec == CONFIG_LOW_SPEC) && !mv_castShadow) // backwards compatibility check
-        {
-            mv_castShadowMinSpec = END_CONFIG_SPEC_ENUM;
-            mv_castShadow = true;
-        }
-    }
-    else
-    {
-        if (m_attachmentType != eAT_Pivot)
-        {
-            if (m_attachmentType == eAT_GeomCacheNode)
-            {
-                xmlNode->setAttr("AttachmentType", "GeomCacheNode");
-            }
-            else if (m_attachmentType == eAT_CharacterBone)
-            {
-                xmlNode->setAttr("AttachmentType", "CharacterBone");
-            }
-
-            xmlNode->setAttr("AttachmentTarget", m_attachmentTarget.toUtf8().data());
-        }
-
-        // Saving.
-        if (!m_entityClass.isEmpty())
-        {
-            xmlNode->setAttr("EntityClass", m_entityClass.toUtf8().data());
-        }
-
-        if (m_physicsState)
-        {
-            xmlNode->addChild(m_physicsState);
-        }
-
-        //! Save properties.
-        if (m_pProperties)
-        {
-            XmlNodeRef propsNode = xmlNode->newChild("Properties");
-            m_pProperties->Serialize(propsNode, ar.bLoading);
-        }
-
-        //! Save properties.
-        if (m_pProperties2)
-        {
-            XmlNodeRef propsNode = xmlNode->newChild("Properties2");
-            m_pProperties2->Serialize(propsNode, ar.bLoading);
-        }
-
-        // Save Event Targets.
-        if (!m_eventTargets.empty())
-        {
-            XmlNodeRef eventTargets = xmlNode->newChild("EventTargets");
-            for (int i = 0; i < m_eventTargets.size(); i++)
-            {
-                CEntityEventTarget& et = m_eventTargets[i];
-                GUID targetId = GUID_NULL;
-                if (et.target != 0)
-                {
-                    targetId = et.target->GetId();
-                }
-
-                XmlNodeRef eventTarget = eventTargets->newChild("EventTarget");
-                eventTarget->setAttr("TargetId", targetId);
-                eventTarget->setAttr("Event", et.event.toUtf8().data());
-                eventTarget->setAttr("SourceEvent", et.sourceEvent.toUtf8().data());
-            }
-        }
-
-        // Save Entity Links.
-        SaveLink(xmlNode);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::PostLoad(CObjectArchive& ar)
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Load Links.
-    XmlNodeRef linksNode = ar.node->findChild("EntityLinks");
-    LoadLink(linksNode, &ar);
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CEntityObject::Export([[maybe_unused]] const QString& levelPath, XmlNodeRef& xmlExportNode)
-{
-    if (m_bLoadFailed)
-    {
-        return 0;
-    }
-
-    // Do not export entity with bad id.
-    if (!m_entityId)
-    {
-        return XmlHelpers::CreateXmlNode("Temp");
-    }
-
-    // Export entities to entities.ini
-    XmlNodeRef objNode = xmlExportNode->newChild("Entity");
-
-    objNode->setAttr("Name", GetName().toUtf8().data());
-
-    Vec3 pos = GetPos(), scale = GetScale();
-    Quat rotate = GetRotation();
-
-    if (GetParent())
-    {
-        if (qobject_cast<CEntityObject*>(GetParent()))
-        {
-            // Store parent entity id.
-            CEntityObject* parentEntity = ( CEntityObject* )GetParent();
-            if (parentEntity)
-            {
-                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)
-                    {
-                        objNode->setAttr("AttachmentType", "CharacterBone");
-                    }
-
-                    objNode->setAttr("AttachmentTarget", m_attachmentTarget.toUtf8().data());
-                }
-            }
-        }
-        else
-        {
-            // Export world coordinates.
-            AffineParts ap;
-            ap.SpectralDecompose(GetWorldTM());
-            pos = ap.pos;
-            rotate = ap.rot;
-            scale = ap.scale;
-        }
-    }
-
-    if (!IsEquivalent(pos, Vec3(0, 0, 0), 0))
-    {
-        objNode->setAttr("Pos", pos);
-    }
-
-    if (!rotate.IsIdentity())
-    {
-        objNode->setAttr("Rotate", rotate);
-    }
-
-    if (!IsEquivalent(scale, Vec3(1, 1, 1), 0))
-    {
-        objNode->setAttr("Scale", scale);
-    }
-
-    objNode->setTag("Entity");
-    objNode->setAttr("EntityClass", m_entityClass.toUtf8().data());
-    objNode->setAttr("EntityId", m_entityId);
-
-    if (mv_ratioLOD != 100)
-    {
-        objNode->setAttr("LodRatio", ( int )mv_ratioLOD);
-    }
-
-    if (fabs(mv_viewDistanceMultiplier - 1.f) > FLT_EPSILON)
-    {
-        objNode->setAttr("ViewDistanceMultiplier", mv_viewDistanceMultiplier);
-    }
-
-    objNode->setAttr("CastShadowMinSpec", mv_castShadowMinSpec);
-
-    if (mv_recvWind)
-    {
-        objNode->setAttr("RecvWind", true);
-    }
-
-    if (mv_noDecals)
-    {
-        objNode->setAttr("NoDecals", true);
-    }
-
-    if (mv_outdoor)
-    {
-        objNode->setAttr("OutdoorOnly", true);
-    }
-
-    if (GetMinSpec() != 0)
-    {
-        objNode->setAttr("MinSpec", ( uint32 )GetMinSpec());
-    }
-
-    uint32 nMtlLayersMask = GetMaterialLayersMask();
-    if (nMtlLayersMask != 0)
-    {
-        objNode->setAttr("MatLayersMask", nMtlLayersMask);
-    }
-
-    if (mv_hiddenInGame)
-    {
-        objNode->setAttr("HiddenInGame", true);
-    }
-
-    if (mv_createdThroughPool)
-    {
-        objNode->setAttr("CreatedThroughPool", true);
-    }
-
-    if (mv_obstructionMultiplier != 1.f)
-    {
-        objNode->setAttr("ObstructionMultiplier", (float)mv_obstructionMultiplier);
-    }
-
-    if (m_physicsState)
-    {
-        objNode->addChild(m_physicsState);
-    }
-
-    // Export Event Targets.
-    if (!m_eventTargets.empty())
-    {
-        XmlNodeRef eventTargets = objNode->newChild("EventTargets");
-        for (int i = 0; i < m_eventTargets.size(); i++)
-        {
-            CEntityEventTarget& et = m_eventTargets[i];
-
-            int entityId = 0;
-            if (et.target)
-            {
-                if (qobject_cast<CEntityObject*>(et.target))
-                {
-                    entityId = (( CEntityObject* )et.target)->GetEntityId();
-                }
-            }
-
-            XmlNodeRef eventTarget = eventTargets->newChild("EventTarget");
-            eventTarget->setAttr("Target", entityId);
-            eventTarget->setAttr("Event", et.event.toUtf8().data());
-            eventTarget->setAttr("SourceEvent", et.sourceEvent.toUtf8().data());
-        }
-    }
-
-    // Save Entity Links.
-    if (!m_links.empty())
-    {
-        XmlNodeRef linksNode = objNode->newChild("EntityLinks");
-        for (int i = 0, num = m_links.size(); i < num; i++)
-        {
-            if (m_links[i].target)
-            {
-                XmlNodeRef linkNode = linksNode->newChild("Link");
-                linkNode->setAttr("TargetId", m_links[i].target->GetEntityId());
-                linkNode->setAttr("Name", m_links[i].name.toUtf8().data());
-            }
-        }
-    }
-
-    //! Export properties.
-    if (m_pProperties)
-    {
-        XmlNodeRef propsNode = objNode->newChild("Properties");
-        m_pProperties->Serialize(propsNode, false);
-    }
-    //! Export properties.
-    if (m_pProperties2)
-    {
-        XmlNodeRef propsNode = objNode->newChild("Properties2");
-        m_pProperties2->Serialize(propsNode, false);
-    }
-
-    return objNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnEvent(ObjectEvent event)
-{
-    CBaseObject::OnEvent(event);
-
-    switch (event)
-    {
-    case EVENT_RELOAD_ENTITY:
-        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(this);
-        break;
-
-    case EVENT_RELOAD_GEOM:
-        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(this);
-        break;
-
-    case EVENT_FREE_GAME_DATA:
-        FreeGameData();
-        break;
-
-    case EVENT_CONFIG_SPEC_CHANGE:
-    {
-        IObjectManager* objMan = GetIEditor()->GetObjectManager();
-        if (objMan && objMan->IsLightClass(this))
-        {
-            OnPropertyChange(NULL);
-        }
-        break;
-    }
-    default:
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::UpdateVisibility(bool bVisible)
-{
-    CBaseObject::UpdateVisibility(bVisible);
-
-    bool bVisibleWithSpec = bVisible && !IsHiddenBySpec();
-    if (bVisibleWithSpec != m_bVisible)
-    {
-        m_bVisible = bVisibleWithSpec;
-    }
-
-    size_t const numChildren = GetChildCount();
-    for (size_t i = 0; i < numChildren; ++i)
-    {
-        CBaseObject* const pChildObject = GetChild(i);
-        pChildObject->SetHidden(!m_bVisible);
-
-        if (qobject_cast<CEntityObject*>(pChildObject))
-        {
-            pChildObject->UpdateVisibility(m_bVisible);
-        }
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-IVariable* CEntityObject::GetLightVariable(const char* name0) const
-{
-    if (m_pProperties2)
-    {
-        IVariable* pLightProperties = m_pProperties2->FindVariable("LightProperties_Base");
-
-        if (pLightProperties)
-        {
-            for (int i = 0; i < pLightProperties->GetNumVariables(); ++i)
-            {
-                IVariable* pChild = pLightProperties->GetVariable(i);
-
-                if (pChild == NULL)
-                {
-                    continue;
-                }
-
-                QString name(pChild->GetName());
-                if (name == name0)
-                {
-                    return pChild;
-                }
-            }
-        }
-    }
-
-    return m_pProperties ? m_pProperties->FindVariable(name0) : nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CEntityObject::GetLightAnimation() const
-{
-    IVariable* pStyleGroup = GetLightVariable("Style");
-    if (pStyleGroup)
-    {
-        for (int i = 0; i < pStyleGroup->GetNumVariables(); ++i)
-        {
-            IVariable* pChild = pStyleGroup->GetVariable(i);
-
-            if (pChild == NULL)
-            {
-                continue;
-            }
-
-            QString name(pChild->GetName());
-            if (name == "lightanimation_LightAnimation")
-            {
-                QString lightAnimationName;
-                pChild->Get(lightAnimationName);
-                return lightAnimationName;
-            }
-        }
-    }
-
-    return "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx)
-{
-    CBaseObject::PostClone(pFromObject, ctx);
-
-    CEntityObject* pFromEntity = ( CEntityObject* )pFromObject;
-    // Clone event targets.
-    if (!pFromEntity->m_eventTargets.empty())
-    {
-        int numTargets = pFromEntity->m_eventTargets.size();
-        for (int 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 = 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)
-{
-    // Find target id.
-    assert(index >= 0 && index < m_eventTargets.size());
-    if (object)
-    {
-        object->AddEventListener(this);
-    }
-    m_eventTargets[index].target = object;
-
-    // Make line gizmo.
-    if (!m_eventTargets[index].pLineGizmo && object)
-    {
-        CLineGizmo* pLineGizmo = new CLineGizmo;
-        pLineGizmo->SetObjects(this, object);
-        pLineGizmo->SetColor(Vec3(0.8f, 0.4f, 0.4f), Vec3(0.8f, 0.4f, 0.4f));
-        pLineGizmo->SetName(m_eventTargets[index].event.toUtf8().data());
-        AddGizmo(pLineGizmo);
-        m_eventTargets[index].pLineGizmo = pLineGizmo;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::RemoveAllEntityLinks()
-{
-    while (!m_links.empty())
-    {
-        RemoveEntityLink(m_links.size() - 1);
-    }
-    m_links.clear();
-    SetModified(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::ReleaseEventTargets()
-{
-    while (!m_eventTargets.empty())
-    {
-        RemoveEventTarget(m_eventTargets.size() - 1, false);
-    }
-    m_eventTargets.clear();
-    SetModified(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::LoadLink(XmlNodeRef xmlNode, CObjectArchive* pArchive)
-{
-    RemoveAllEntityLinks();
-
-    if (!xmlNode)
-    {
-        return;
-    }
-
-    QString name;
-    GUID targetId;
-
-    for (int i = 0; i < xmlNode->getChildCount(); i++)
-    {
-        XmlNodeRef linkNode = xmlNode->getChild(i);
-        linkNode->getAttr("Name", name);
-
-        if (linkNode->getAttr("TargetId", targetId))
-        {
-            int version = 0;
-            linkNode->getAttr("Version", version);
-
-            GUID newTargetId = pArchive ? pArchive->ResolveID(targetId) : targetId;
-
-            // Backwards compatibility with old bone attachment system
-            const char kOldBoneLinkPrefix = '@';
-            if (version == 0 && !name.isEmpty() && name[0] == kOldBoneLinkPrefix)
-            {
-                CBaseObject* pObject = FindObject(newTargetId);
-                if (qobject_cast<CEntityObject*>(pObject))
-                {
-                    CEntityObject* pTargetEntity = static_cast<CEntityObject*>(pObject);
-
-                    Quat relRot(IDENTITY);
-                    linkNode->getAttr("RelRot", relRot);
-                    Vec3 relPos(IDENTITY);
-                    linkNode->getAttr("RelPos", relPos);
-
-                    SetAttachType(eAT_CharacterBone);
-                    SetAttachTarget(name.mid(1).toUtf8().data());
-                    pTargetEntity->AttachChild(this);
-
-                    SetPos(relPos);
-                    SetRotation(relRot);
-                }
-            }
-            else
-            {
-                AddEntityLink(name, newTargetId);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::SaveLink(XmlNodeRef xmlNode)
-{
-    if (m_links.empty())
-    {
-        return;
-    }
-
-    XmlNodeRef linksNode = xmlNode->newChild("EntityLinks");
-    for (int i = 0, num = m_links.size(); i < num; i++)
-    {
-        XmlNodeRef linkNode = linksNode->newChild("Link");
-        linkNode->setAttr("TargetId", m_links[i].targetId);
-        linkNode->setAttr("Name", m_links[i].name.toUtf8().data());
-        linkNode->setAttr("Version", 1);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnObjectEvent(CBaseObject* target, int event)
-{
-    // When event target is deleted.
-    if (event == CBaseObject::ON_DELETE)
-    {
-        // Find this target in events list and remove.
-        int numTargets = m_eventTargets.size();
-        for (int i = 0; i < numTargets; i++)
-        {
-            if (m_eventTargets[i].target == target)
-            {
-                RemoveEventTarget(i);
-                numTargets = m_eventTargets.size();
-                i--;
-            }
-        }
-    }
-    else if (event == CBaseObject::ON_PREDELETE)
-    {
-        int numTargets = m_links.size();
-        for (int i = 0; i < numTargets; i++)
-        {
-            if (m_links[i].target == target)
-            {
-                RemoveEntityLink(i);
-                numTargets = m_eventTargets.size();
-                i--;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CEntityObject::AddEventTarget(CBaseObject* target, const QString& event, const QString& sourceEvent, [[maybe_unused]] bool bUpdateScript)
-{
-    StoreUndo("Add EventTarget");
-    CEntityEventTarget et;
-    et.target = target;
-    et.event = event;
-    et.sourceEvent = sourceEvent;
-
-    // Assign event target.
-    if (et.target)
-    {
-        et.target->AddEventListener(this);
-    }
-
-    if (target)
-    {
-        // Make line gizmo.
-        CLineGizmo* pLineGizmo = new CLineGizmo;
-        pLineGizmo->SetObjects(this, target);
-        pLineGizmo->SetColor(Vec3(0.8f, 0.4f, 0.4f), Vec3(0.8f, 0.4f, 0.4f));
-        pLineGizmo->SetName(event.toUtf8().data());
-        AddGizmo(pLineGizmo);
-        et.pLineGizmo = pLineGizmo;
-    }
-
-    m_eventTargets.push_back(et);
-
-    SetModified(false);
-    return m_eventTargets.size() - 1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::RemoveEventTarget(int index, [[maybe_unused]] bool bUpdateScript)
-{
-    if (index >= 0 && index < m_eventTargets.size())
-    {
-        StoreUndo("Remove EventTarget");
-
-        if (m_eventTargets[index].pLineGizmo)
-        {
-            RemoveGizmo(m_eventTargets[index].pLineGizmo);
-        }
-
-        if (m_eventTargets[index].target)
-        {
-            m_eventTargets[index].target->RemoveEventListener(this);
-        }
-        m_eventTargets.erase(m_eventTargets.begin() + index);
-
-        SetModified(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CEntityObject::AddEntityLink(const QString& name, GUID targetEntityId)
-{
-    CEntityObject* target = 0;
-    if (targetEntityId != GUID_NULL)
-    {
-        CBaseObject* pObject = FindObject(targetEntityId);
-        if (qobject_cast<CEntityObject*>(pObject))
-        {
-            target = ( CEntityObject* )pObject;
-
-            // Legacy entities and AZ entities shouldn't be linked.
-            if (target->GetType() == OBJTYPE_AZENTITY || GetType() == OBJTYPE_AZENTITY)
-            {
-                return -1;
-            }
-        }
-    }
-
-    StoreUndo("Add EntityLink");
-
-    CLineGizmo* pLineGizmo = 0;
-
-    // Assign event target.
-    if (target)
-    {
-        target->AddEventListener(this);
-
-        // Make line gizmo.
-        pLineGizmo = new CLineGizmo;
-        pLineGizmo->SetObjects(this, target);
-        pLineGizmo->SetColor(Vec3(0.4f, 1.0f, 0.0f), Vec3(0.0f, 1.0f, 0.0f));
-        pLineGizmo->SetName(name.toUtf8().data());
-        AddGizmo(pLineGizmo);
-    }
-
-    CEntityLink lnk;
-    lnk.targetId = targetEntityId;
-    lnk.target = target;
-    lnk.name = name;
-    lnk.pLineGizmo = pLineGizmo;
-    m_links.push_back(lnk);
-
-    SetModified(false);
-
-    return m_links.size() - 1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::EntityLinkExists(const QString& name, GUID targetEntityId)
-{
-    for (int i = 0, num = m_links.size(); i < num; ++i)
-    {
-        if (m_links[i].targetId == targetEntityId && name.compare(m_links[i].name, Qt::CaseInsensitive) == 0)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::RemoveEntityLink(int index)
-{
-    if (index >= 0 && index < m_links.size())
-    {
-        CEntityLink& link = m_links[index];
-        StoreUndo("Remove EntityLink");
-
-        if (link.pLineGizmo)
-        {
-            RemoveGizmo(link.pLineGizmo);
-        }
-
-        if (link.target)
-        {
-            link.target->RemoveEventListener(this);
-            link.target->EntityUnlinked(link.name, GetId());
-        }
-        m_links.erase(m_links.begin() + index);
-
-        SetModified(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::RenameEntityLink(int index, const QString& newName)
-{
-    if (index >= 0 && index < m_links.size())
-    {
-        StoreUndo("Rename EntityLink");
-
-        if (m_links[index].pLineGizmo)
-        {
-            m_links[index].pLineGizmo->SetName(newName.toUtf8().data());
-        }
-
-        m_links[index].name = newName;
-
-        SetModified(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnRadiusChange(IVariable* var)
-{
-    var->Get(m_proximityRadius);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnInnerRadiusChange(IVariable* var)
-{
-    var->Get(m_innerRadius);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnOuterRadiusChange(IVariable* var)
-{
-    var->Get(m_outerRadius);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnBoxSizeXChange(IVariable* var)
-{
-    var->Get(m_boxSizeX);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnBoxSizeYChange(IVariable* var)
-{
-    var->Get(m_boxSizeY);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnBoxSizeZChange(IVariable* var)
-{
-    var->Get(m_boxSizeZ);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnProjectorFOVChange(IVariable* var)
-{
-    var->Get(m_projectorFOV);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnProjectInAllDirsChange(IVariable* var)
-{
-    int value;
-    var->Get(value);
-    m_bProjectInAllDirs = value;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnProjectorTextureChange(IVariable* var)
-{
-    QString texture;
-    var->Get(texture);
-    m_bProjectorHasTexture = !texture.isEmpty();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnAreaLightChange(IVariable* var)
-{
-    int value;
-    var->Get(value);
-    m_bAreaLight = value;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnAreaWidthChange(IVariable* var)
-{
-    var->Get(m_fAreaWidth);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnAreaHeightChange(IVariable* var)
-{
-    var->Get(m_fAreaHeight);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnAreaLightSizeChange(IVariable* var)
-{
-    var->Get(m_fAreaLightSize);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnColorChange(IVariable* var)
-{
-    var->Get(m_lightColor);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnBoxProjectionChange(IVariable* var)
-{
-    int value;
-    var->Get(value);
-    m_bBoxProjectedCM = value;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnBoxWidthChange(IVariable* var)
-{
-    var->Get(m_fBoxWidth);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnBoxHeightChange(IVariable* var)
-{
-    var->Get(m_fBoxHeight);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnBoxLengthChange(IVariable* var)
-{
-    var->Get(m_fBoxLength);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CVarBlock* CEntityObject::CloneProperties(CVarBlock* srcProperties)
-{
-    assert(srcProperties);
-    return srcProperties->Clone(true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnLoadFailed()
-{
-    m_bLoadFailed = true;
-
-    CErrorRecord err;
-    err.error = tr("Entity %1 Failed to Spawn (Script: %2)").arg(GetName(), m_entityClass);
-    err.pObject = this;
-    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)
-{
-    CBaseObject::Validate(report);
-
-    if (!m_entityClass.isEmpty())
-    {
-        CErrorRecord err;
-        err.error = tr("Entity %1 Failed to Spawn (Script: %2)").arg(GetName(), m_entityClass);
-        err.pObject = this;
-        report->ReportError(err);
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::GatherUsedResources(CUsedResources& resources)
-{
-    CBaseObject::GatherUsedResources(resources);
-    if (m_pProperties)
-    {
-        m_pProperties->GatherUsedResources(resources);
-    }
-    if (m_pProperties2)
-    {
-        m_pProperties2->GatherUsedResources(resources);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::IsSimilarObject(CBaseObject* pObject)
-{
-    if (pObject->GetClassDesc() == GetClassDesc() && pObject->metaObject() == metaObject())
-    {
-        CEntityObject* pEntity = ( CEntityObject* )pObject;
-        if (m_entityClass == pEntity->m_entityClass &&
-            m_proximityRadius == pEntity->m_proximityRadius &&
-            m_innerRadius == pEntity->m_innerRadius &&
-            m_outerRadius == pEntity->m_outerRadius)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnContextMenu(QMenu* pMenu)
-{
-    if (!pMenu->isEmpty())
-    {
-        pMenu->addSeparator();
-    }
-
-    // Events
-
-    CBaseObject::OnContextMenu(pMenu);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::PreInitLightProperty()
-{
-    if (!IsLight() || !m_pProperties)
-    {
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::UpdateLightProperty()
-{
-    if (!IsLight() || !m_pProperties)
-    {
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::ForceVariableUpdate()
-{
-    if (m_pProperties)
-    {
-        m_pProperties->OnSetValues();
-    }
-    if (m_pProperties2)
-    {
-        m_pProperties2->OnSetValues();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::ResetCallbacks()
-{
-    ClearCallbacks();
-
-    CVarBlock* pProperties = m_pProperties;
-    CVarBlock* pProperties2 = m_pProperties2;
-
-    if (pProperties)
-    {
-        m_callbacks.reserve(6);
-
-        //@FIXME Hack to display radii of properties.
-        // wires properties from param block, to this entity internal variables.
-        IVariable* var = 0;
-        var = pProperties->FindVariable("Radius", false);
-        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-        {
-            var->Get(m_proximityRadius);
-            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnRadiusChange]);
-        }
-        else
-        {
-            var = pProperties->FindVariable("radius", false);
-            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-            {
-                var->Get(m_proximityRadius);
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnRadiusChange]);
-            }
-        }
-
-        var = pProperties->FindVariable("InnerRadius", false);
-        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-        {
-            var->Get(m_innerRadius);
-            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnInnerRadiusChange]);
-        }
-        var = pProperties->FindVariable("OuterRadius", false);
-        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-        {
-            var->Get(m_outerRadius);
-            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnOuterRadiusChange]);
-        }
-
-        var = pProperties->FindVariable("BoxSizeX", false);
-        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-        {
-            var->Get(m_boxSizeX);
-            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxSizeXChange]);
-        }
-        var = pProperties->FindVariable("BoxSizeY", false);
-        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-        {
-            var->Get(m_boxSizeY);
-            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxSizeYChange]);
-        }
-        var = pProperties->FindVariable("BoxSizeZ", false);
-        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-        {
-            var->Get(m_boxSizeZ);
-            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxSizeZChange]);
-        }
-
-        var = pProperties->FindVariable("fAttenuationBulbSize");
-        if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-        {
-            var->Get(m_fAreaLightSize);
-            SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnAreaLightSizeChange]);
-        }
-
-        IVariable* pProjector = pProperties->FindVariable("Projector");
-        if (pProjector)
-        {
-            var = pProjector->FindVariable("fProjectorFov");
-            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-            {
-                var->Get(m_projectorFOV);
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnProjectorFOVChange]);
-            }
-            var = pProjector->FindVariable("bProjectInAllDirs");
-            if (var && var->GetType() == IVariable::BOOL)
-            {
-                int value;
-                var->Get(value);
-                m_bProjectInAllDirs = value;
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnProjectInAllDirsChange]);
-            }
-            var = pProjector->FindVariable("texture_Texture");
-            if (var && var->GetType() == IVariable::STRING)
-            {
-                QString projectorTexture;
-                var->Get(projectorTexture);
-                m_bProjectorHasTexture = !projectorTexture.isEmpty();
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnProjectorTextureChange]);
-            }
-        }
-
-        IVariable* pColorGroup = pProperties->FindVariable("Color", false);
-        if (pColorGroup)
-        {
-            const int nChildCount = pColorGroup->GetNumVariables();
-            for (int i = 0; i < nChildCount; ++i)
-            {
-                IVariable* pChild = pColorGroup->GetVariable(i);
-                if (!pChild)
-                {
-                    continue;
-                }
-
-                QString name(pChild->GetName());
-                if (name == "clrDiffuse")
-                {
-                    pChild->Get(m_lightColor);
-                    SetVariableCallback(pChild, &m_onSetCallbacksCache[VariableCallbackIndex::OnColorChange]);
-                    break;
-                }
-            }
-        }
-
-        IVariable* pType = pProperties->FindVariable("Shape");
-        if (pType)
-        {
-            var = pType->FindVariable("bAreaLight");
-            if (var && var->GetType() == IVariable::BOOL)
-            {
-                int value;
-                var->Get(value);
-                m_bAreaLight = value;
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnAreaLightChange]);
-            }
-            var = pType->FindVariable("fPlaneWidth");
-            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-            {
-                var->Get(m_fAreaWidth);
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnAreaWidthChange]);
-            }
-            var = pType->FindVariable("fPlaneHeight");
-            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-            {
-                var->Get(m_fAreaHeight);
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnAreaHeightChange]);
-            }
-        }
-
-        IVariable* pProjection = pProperties->FindVariable("Projection");
-        if (pProjection)
-        {
-            var = pProjection->FindVariable("bBoxProject");
-            if (var && var->GetType() == IVariable::BOOL)
-            {
-                int value;
-                var->Get(value);
-                m_bBoxProjectedCM = value;
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxProjectionChange]);
-            }
-            var = pProjection->FindVariable("fBoxWidth");
-            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-            {
-                var->Get(m_fBoxWidth);
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxWidthChange]);
-            }
-            var = pProjection->FindVariable("fBoxHeight");
-            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-            {
-                var->Get(m_fBoxHeight);
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxHeightChange]);
-            }
-            var = pProjection->FindVariable("fBoxLength");
-            if (var && (var->GetType() == IVariable::FLOAT || var->GetType() == IVariable::INT))
-            {
-                var->Get(m_fBoxLength);
-                SetVariableCallback(var, &m_onSetCallbacksCache[VariableCallbackIndex::OnBoxLengthChange]);
-            }
-        }
-
-        // Each property must have callback to our OnPropertyChange.
-        pProperties->AddOnSetCallback(&m_onSetCallbacksCache[VariableCallbackIndex::OnPropertyChange]);
-    }
-
-    if (pProperties2)
-    {
-        pProperties2->AddOnSetCallback(&m_onSetCallbacksCache[VariableCallbackIndex::OnPropertyChange]);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::SetVariableCallback(IVariable* pVar, IVariable::OnSetCallback* func)
-{
-    pVar->AddOnSetCallback(func);
-    m_callbacks.push_back(std::make_pair(pVar, func));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::ClearCallbacks()
-{
-    if (m_pProperties)
-    {
-        m_pProperties->RemoveOnSetCallback(&m_onSetCallbacksCache[VariableCallbackIndex::OnPropertyChange]);
-    }
-
-    if (m_pProperties2)
-    {
-        m_pProperties2->RemoveOnSetCallback(&m_onSetCallbacksCache[VariableCallbackIndex::OnPropertyChange]);
-    }
-
-    for (auto iter = m_callbacks.begin(); iter != m_callbacks.end(); ++iter)
-    {
-        iter->first->RemoveOnSetCallback(iter->second);
-    }
-
-    m_callbacks.clear();
-}
-
-void CEntityObject::StoreUndoEntityLink(CSelectionGroup* pGroup)
-{
-    if (!pGroup)
-    {
-        return;
-    }
-
-    if (CUndo::IsRecording())
-    {
-        CUndo::Record(new CUndoEntityLink(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
-{
-    CVarBlock* pProperties = GetProperties2();
-    IVariable* pVariable = NULL;
-    if (pProperties)
-    {
-        pVariable = pProperties->FindVariable(pName);
-    }
-
-    if (!pVariable)
-    {
-        pProperties = GetProperties();
-        if (pProperties)
-        {
-            pVariable = pProperties->FindVariable(pName);
-        }
-
-        if (!pVariable)
-        {
-            return defaultvalue;
-        }
-    }
-
-    if (pVariable->GetType() != IVariableType<T>::value)
-    {
-        return defaultvalue;
-    }
-
-    T value;
-    pVariable->Get(value);
-    return value;
-}
-
-template <typename T>
-void CEntityObject::SetEntityProperty(const char* pName, T value)
-{
-    CVarBlock* pProperties = GetProperties2();
-    IVariable* pVariable = NULL;
-    if (pProperties)
-    {
-        pVariable = pProperties->FindVariable(pName);
-    }
-
-    if (!pVariable)
-    {
-        pProperties = GetProperties();
-        if (pProperties)
-        {
-            pVariable = pProperties->FindVariable(pName);
-        }
-
-        if (!pVariable)
-        {
-            throw std::runtime_error((QString("\"") + pName + "\" is an invalid property.").toUtf8().data());
-        }
-    }
-
-    if (pVariable->GetType() != IVariableType<T>::value)
-    {
-        throw std::logic_error("Data type is invalid.");
-    }
-    pVariable->Set(value);
-}
-
-bool CEntityObject::GetEntityPropertyBool(const char* name) const
-{
-    return GetEntityProperty<bool>(name, false);
-}
-
-int CEntityObject::GetEntityPropertyInteger(const char* name) const
-{
-    return GetEntityProperty<int>(name, 0);
-}
-
-float CEntityObject::GetEntityPropertyFloat(const char* name) const
-{
-    return GetEntityProperty<float>(name, 0.0f);
-}
-
-QString CEntityObject::GetEntityPropertyString(const char* name) const
-{
-    return GetEntityProperty<QString>(name, "");
-}
-
-void CEntityObject::SetEntityPropertyBool(const char* name, bool value)
-{
-    SetEntityProperty<bool>(name, value);
-}
-
-void CEntityObject::SetEntityPropertyInteger(const char* name, int value)
-{
-    SetEntityProperty<int>(name, value);
-}
-
-void CEntityObject::SetEntityPropertyFloat(const char* name, float value)
-{
-    SetEntityProperty<float>(name, value);
-}
-
-void CEntityObject::SetEntityPropertyString(const char* name, const QString& value)
-{
-    SetEntityProperty<QString>(name, value);
-}
-
-#include <Objects/moc_EntityObject.cpp>
diff --git a/Code/Sandbox/Editor/Objects/EntityObject.h b/Code/Sandbox/Editor/Objects/EntityObject.h
deleted file mode 100644
index ab4a43b897..0000000000
--- a/Code/Sandbox/Editor/Objects/EntityObject.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_ENTITYOBJECT_H
-#define CRYINCLUDE_EDITOR_OBJECTS_ENTITYOBJECT_H
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-#include "BaseObject.h"
-
-#include "IMovieSystem.h"
-#include "IEntityObjectListener.h"
-#include "Gizmo.h"
-#include "CryListenerSet.h"
-#include "StatObjBus.h"
-
-#include <QObject>
-#endif
-
-#define CLASS_LIGHT "Light"
-#define CLASS_DESTROYABLE_LIGHT "DestroyableLight"
-#define CLASS_RIGIDBODY_LIGHT "RigidBodyLight"
-#define CLASS_ENVIRONMENT_LIGHT "EnvironmentLight"
-
-class CEntityObject;
-class QMenu;
-
-/*!
- *  CEntityEventTarget is an Entity event target and type.
- */
-struct CEntityEventTarget
-{
-    CBaseObject* target; //! Target object.
-    _smart_ptr<CGizmo> pLineGizmo;
-    QString event;
-    QString sourceEvent;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Named link from entity to entity.
-//////////////////////////////////////////////////////////////////////////
-struct CEntityLink
-{
-    GUID targetId;   // Target entity id.
-    CEntityObject* target; // Target entity.
-    QString name;    // Name of the link.
-    _smart_ptr<CGizmo> pLineGizmo;
-};
-
-struct IPickEntitesOwner
-{
-    virtual void AddEntity(CBaseObject* pEntity) = 0;
-    virtual CBaseObject* GetEntity(int nIdx) = 0;
-    virtual int GetEntityCount() = 0;
-    virtual void RemoveEntity(int nIdx) = 0;
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-/*!
- *  CEntity is an static object on terrain.
- *
- */
-class CRYEDIT_API CEntityObject
-    : public CBaseObject
-    , public CBaseObject::EventListener
-{
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    Q_OBJECT
-public:
-    ~CEntityObject();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Overrides from CBaseObject.
-    //////////////////////////////////////////////////////////////////////////
-    //! Return type name of Entity.
-    QString GetTypeDescription() const { return GetEntityClass(); };
-
-    //////////////////////////////////////////////////////////////////////////
-    bool IsSameClass(CBaseObject* obj);
-
-    virtual bool Init(IEditor* ie, CBaseObject* prev, const QString& file);
-    virtual void InitVariables();
-    virtual void Done();
-
-    void DrawExtraLightInfo (DisplayContext& disp);
-
-    bool GetEntityPropertyBool(const char* name) const;
-    int GetEntityPropertyInteger(const char* name) const;
-    float GetEntityPropertyFloat(const char* name) const;
-    QString GetEntityPropertyString(const char* name) const;
-    void SetEntityPropertyBool(const char* name, bool value);
-    void SetEntityPropertyInteger(const char* name, int value);
-    void SetEntityPropertyFloat(const char* name, float value);
-    void SetEntityPropertyString(const char* name, const QString& value);
-
-    virtual int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags);
-    virtual void OnContextMenu(QMenu* menu);
-
-    void SetName(const QString& name);
-    void SetSelected(bool bSelect);
-
-    virtual void GetLocalBounds(AABB& box);
-
-    virtual bool HitTest(HitContext& hc);
-    virtual bool HitHelperTest(HitContext& hc);
-    virtual bool HitTestRect(HitContext& hc);
-    void UpdateVisibility(bool bVisible);
-    bool ConvertFromObject(CBaseObject* object);
-
-    virtual void Serialize(CObjectArchive& ar);
-    virtual void PostLoad(CObjectArchive& ar);
-
-    XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode);
-
-    //////////////////////////////////////////////////////////////////////////
-    void OnEvent(ObjectEvent event);
-
-    virtual void SetTransformDelegate(ITransformDelegate* pTransformDelegate) override;
-
-    // Set attach flags and target
-    enum EAttachmentType
-    {
-        eAT_Pivot,
-        eAT_GeomCacheNode,
-        eAT_CharacterBone,
-    };
-
-    void SetAttachType(const EAttachmentType attachmentType) { m_attachmentType = attachmentType; }
-    void SetAttachTarget(const char* target) { m_attachmentTarget = target; }
-    EAttachmentType GetAttachType() const { return m_attachmentType; }
-    QString GetAttachTarget() const { return m_attachmentTarget; }
-
-    virtual void SetHelperScale(float scale);
-    virtual float GetHelperScale();
-
-    virtual void GatherUsedResources(CUsedResources& resources);
-    virtual bool IsSimilarObject(CBaseObject* pObject);
-
-    virtual bool HasMeasurementAxis() const {   return false;   }
-
-    virtual bool IsIsolated() const { return false; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // END CBaseObject
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // CEntity interface.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void DeleteEntity() {}
-
-    QString GetEntityClass() const { return m_entityClass; };
-    int GetEntityId() const { return m_entityId; };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Return number of event targets of Script.
-    int     GetEventTargetCount() const { return m_eventTargets.size(); };
-    CEntityEventTarget& GetEventTarget(int index) { return m_eventTargets[index]; };
-    //! Add new event target, returns index of created event target.
-    //! Event targets are Always entities.
-    int AddEventTarget(CBaseObject* target, const QString& event, const QString& sourceEvent, bool bUpdateScript = true);
-    //! Remove existing event target by index.
-    void RemoveEventTarget(int index, bool bUpdateScript = true);
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Entity Links.
-    //////////////////////////////////////////////////////////////////////////
-    //! Return number of event targets of Script.
-    int     GetEntityLinkCount() const { return m_links.size(); };
-    CEntityLink& GetEntityLink(int index) { return m_links[index]; };
-    virtual int AddEntityLink(const QString& name, GUID targetEntityId);
-    virtual bool EntityLinkExists(const QString& name, GUID targetEntityId);
-    void RenameEntityLink(int index, const QString& newName);
-    void RemoveEntityLink(int index);
-    void RemoveAllEntityLinks();
-    virtual void EntityLinked([[maybe_unused]] const QString& name, [[maybe_unused]] GUID targetEntityId){}
-    virtual void EntityUnlinked([[maybe_unused]] const QString& name, [[maybe_unused]] GUID targetEntityId) {}
-    void LoadLink(XmlNodeRef xmlNode, CObjectArchive* pArchive = NULL);
-    void SaveLink(XmlNodeRef xmlNode);
-    //////////////////////////////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////
-
-    int GetCastShadowMinSpec() const { return mv_castShadowMinSpec; }
-
-    float GetRatioLod() const { return static_cast<float>(mv_ratioLOD); };
-    float GetViewDistanceMultiplier() const { return mv_viewDistanceMultiplier; }
-
-    CVarBlock* GetProperties() const { return m_pProperties; };
-    CVarBlock* GetProperties2() const { return m_pProperties2; };
-
-    bool IsLight()  const   {   return m_bLight;        }
-
-    void Validate(IErrorReport* report) override;
-
-    // Find CEntity from AZ::EntityId, which can also handle legacy game Ids stored as AZ::EntityIds
-    static CEntityObject* FindFromEntityId(const AZ::EntityId& id);
-
-    // Get the name of the light animation node assigned to this, if any.
-    QString GetLightAnimation() const;
-
-    IVariable* GetLightVariable(const char* name) const;
-
-    void PreInitLightProperty();
-    void UpdateLightProperty();
-
-    void EnableReload(bool bEnable)
-    {
-        m_bEnableReload = bEnable;
-    }
-
-    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.
-    virtual void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx);
-
-    //! Draw default object items.
-    void DrawProjectorPyramid(DisplayContext& dc, float dist);
-    void DrawProjectorFrustum(DisplayContext& dc, Vec2 size, float dist);
-
-    void OnLoadFailed();
-
-    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);
-    void ReleaseEventTargets();
-
-public:
-    CEntityObject();
-
-    static const GUID& GetClassID()
-    {
-        // {C80F8AEA-90EF-471f-82C7-D14FA80B9203}
-        static const GUID guid = {
-            0xc80f8aea, 0x90ef, 0x471f, { 0x82, 0xc7, 0xd1, 0x4f, 0xa8, 0xb, 0x92, 0x3 }
-        };
-        return guid;
-    }
-
-protected:
-    void DeleteThis() { delete this; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Radius callbacks.
-    //////////////////////////////////////////////////////////////////////////
-    void OnRadiusChange(IVariable* var);
-    void OnInnerRadiusChange(IVariable* var);
-    void OnOuterRadiusChange(IVariable* var);
-    void OnBoxSizeXChange(IVariable* var);
-    void OnBoxSizeYChange(IVariable* var);
-    void OnBoxSizeZChange(IVariable* var);
-    void OnProjectorFOVChange(IVariable* var);
-    void OnProjectorTextureChange(IVariable* var);
-    void OnProjectInAllDirsChange(IVariable* var);
-    //////////////////////////////////////////////////////////////////////////
-    // Area light callbacks.
-    //////////////////////////////////////////////////////////////////////////
-    void OnAreaLightChange(IVariable* var);
-    void OnAreaWidthChange(IVariable* var);
-    void OnAreaHeightChange(IVariable* var);
-    void OnAreaFOVChange(IVariable* var);
-    void OnAreaLightSizeChange(IVariable* var);
-    void OnColorChange(IVariable* var);
-    //////////////////////////////////////////////////////////////////////////
-    // Box projection callbacks.
-    //////////////////////////////////////////////////////////////////////////
-    void OnBoxProjectionChange(IVariable* var);
-    void OnBoxWidthChange(IVariable* var);
-    void OnBoxHeightChange(IVariable* var);
-    void OnBoxLengthChange(IVariable* var);
-    //////////////////////////////////////////////////////////////////////////
-
-    void FreeGameData();
-
-    void AdjustLightProperties(CVarBlockPtr& properties, const char* pSubBlock);
-    IVariable* FindVariableInSubBlock(CVarBlockPtr& properties, IVariable* pSubBlockVar, const char* pVarName);
-
-    unsigned int m_bLoadFailed : 1;
-    unsigned int m_bCalcPhysics : 1;
-    unsigned int m_bDisplayBBox : 1;
-    unsigned int m_bDisplaySolidBBox : 1;
-    unsigned int m_bDisplayAbsoluteRadius : 1;
-    unsigned int m_bDisplayArrow : 1;
-    unsigned int m_bIconOnTop : 1;
-    unsigned int m_bVisible : 1;
-    unsigned int m_bLight : 1;
-    unsigned int m_bAreaLight : 1;
-    unsigned int m_bProjectorHasTexture : 1;
-    unsigned int m_bProjectInAllDirs : 1;
-    unsigned int m_bBoxProjectedCM : 1;
-    unsigned int m_bBBoxSelection : 1;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Vec3  m_lightColor;
-
-    //! Entity class.
-    QString m_entityClass;
-    //! Id of spawned entity.
-    int m_entityId;
-
-    // Used for light entities
-    float m_projectorFOV;
-
-    IStatObj* m_visualObject;
-    AABB m_box;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Main entity parameters.
-    //////////////////////////////////////////////////////////////////////////
-    CVariable<bool> mv_outdoor;
-    CVariable<bool> mv_castShadow; // Legacy, required for backwards compatibility
-    CSmartVariableEnum<int> mv_castShadowMinSpec;
-    CVariable<int> mv_ratioLOD;
-    CVariable<float> mv_viewDistanceMultiplier;
-    CVariable<bool> mv_hiddenInGame; // Entity is hidden in game (on start).
-    CVariable<bool> mv_recvWind;
-    CVariable<bool> mv_renderNearest;
-    CVariable<bool> mv_noDecals;
-    CVariable<bool> mv_createdThroughPool;
-    CVariable<float> mv_obstructionMultiplier;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Temp variables (Not serializable) just to display radii from properties.
-    //////////////////////////////////////////////////////////////////////////
-    // Used for proximity entities.
-    float m_proximityRadius;
-    float m_innerRadius;
-    float m_outerRadius;
-    // Used for probes
-    float m_boxSizeX;
-    float m_boxSizeY;
-    float m_boxSizeZ;
-    // Used for area lights
-    float m_fAreaWidth;
-    float m_fAreaHeight;
-    float m_fAreaLightSize;
-    // Used for box projected cubemaps
-    float m_fBoxWidth;
-    float m_fBoxHeight;
-    float m_fBoxLength;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Event Targets.
-    //////////////////////////////////////////////////////////////////////////
-    //! Array of event targets of this Entity.
-    typedef std::vector<CEntityEventTarget> EventTargets;
-    EventTargets m_eventTargets;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Links
-    typedef std::vector<CEntityLink> Links;
-    Links m_links;
-
-    //! Entity properties variables.
-    CVarBlockPtr m_pProperties;
-
-    //! Per instance entity properties variables
-    CVarBlockPtr m_pProperties2;
-
-    // Physics state, as a string.
-    XmlNodeRef m_physicsState;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    static float m_helperScale;
-
-    EAttachmentType m_attachmentType;
-
-    bool m_bEnableReload;
-
-    QString m_attachmentTarget;
-
-private:
-    struct VariableCallbackIndex
-    {
-        enum : unsigned char
-        {
-            OnAreaHeightChange = 0,
-            OnAreaLightChange,
-            OnAreaLightSizeChange,
-            OnAreaWidthChange,
-            OnBoxHeightChange,
-            OnBoxLengthChange,
-            OnBoxProjectionChange,
-            OnBoxSizeXChange,
-            OnBoxSizeYChange,
-            OnBoxSizeZChange,
-            OnBoxWidthChange,
-            OnColorChange,
-            OnInnerRadiusChange,
-            OnOuterRadiusChange,
-            OnProjectInAllDirsChange,
-            OnProjectorFOVChange,
-            OnProjectorTextureChange,
-            OnPropertyChange,
-            OnRadiusChange,
-
-            // must be at the end
-            Count,
-        };
-    };
-
-    void ResetCallbacks();
-    void SetVariableCallback(IVariable* pVar, IVariable::OnSetCallback* func);
-    void ClearCallbacks();
-
-    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
-};
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_ENTITYOBJECT_H
diff --git a/Code/Sandbox/Editor/Objects/Gizmo.cpp b/Code/Sandbox/Editor/Objects/Gizmo.cpp
deleted file mode 100644
index 37ead864b4..0000000000
--- a/Code/Sandbox/Editor/Objects/Gizmo.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "Gizmo.h"
-
-//////////////////////////////////////////////////////////////////////////
-// CGizmo implementation.
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-CGizmo::CGizmo()
-{
-    m_bDelete = false;
-    m_matrix.SetIdentity();
-    m_flags = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CGizmo::~CGizmo()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGizmo::SetMatrix(const Matrix34& tm)
-{
-    m_matrix = tm;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGizmo::DeleteThis()
-{
-    m_bDelete = true;
-};
diff --git a/Code/Sandbox/Editor/Objects/Gizmo.h b/Code/Sandbox/Editor/Objects/Gizmo.h
deleted file mode 100644
index 90f1ce997f..0000000000
--- a/Code/Sandbox/Editor/Objects/Gizmo.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "BaseObject.h"
-
-// forward declarations.
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_GIZMO_H
-#define CRYINCLUDE_EDITOR_OBJECTS_GIZMO_H
-#pragma once
-struct DisplayContext;
-struct HitContext;
-
-enum EGizmoFlags
-{
-    EGIZMO_SELECTABLE = 0x0001, //! If set gizmo can be selected by clicking.
-    EGIZMO_HIDDEN = 0x0002,         //! If set gizmo hidden and should not be displayed.
-    EGIZMO_TRANSFORM_MANIPULATOR = 0x0004, //! This gizmo is a transform manipulator.
-};
-
-/** Any helper object that BaseObjects can use to display some usefull information like tracks.
-        Gizmo's life time should be controlled by thier owning BaseObjects.
-*/
-class SANDBOX_API CGizmo
-    : public CRefCountBase
-{
-public:
-    CGizmo();
-    virtual ~CGizmo();
-
-    virtual void SetName([[maybe_unused]] const char* sName) {};
-    virtual const char* GetName([[maybe_unused]] const char* sName) { return ""; };
-
-    //! Set gizmo object flags.
-    void SetFlags(uint32 flags) { m_flags = flags; }
-    //! Get gizmo object flags.
-    uint32 GetFlags() const { return m_flags; }
-
-    /** Get bounding box of Gizmo in world space.
-        @param bbox Returns bounding box.
-    */
-    virtual void GetWorldBounds(AABB& bbox) = 0;
-
-    /** Set transformation matrix of this gizmo.
-    */
-    virtual void SetMatrix(const Matrix34& tm);
-
-    /** Get transformation matrix of this gizmo.
-    */
-    virtual const Matrix34& GetMatrix() const { return m_matrix; }
-
-    /** Display Gizmo in the viewport.
-    */
-    virtual void Display(DisplayContext& dc) = 0;
-
-    /** Performs hit testing on gizmo object.
-    */
-    virtual bool HitTest([[maybe_unused]] HitContext& hc) { return false; };
-
-    //! Is this gizmo need to be deleted?.
-    bool IsDelete() const { return m_bDelete; }
-    //! Set this gizmo to be deleted.
-    void DeleteThis();
-
-    virtual CBaseObjectPtr GetBaseObject() const {  return NULL; }
-
-
-protected:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    mutable Matrix34 m_matrix;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    bool m_bDelete; // This gizmo is marked for deletion.
-    uint32 m_flags;
-};
-#endif // CRYINCLUDE_EDITOR_OBJECTS_GIZMO_H
diff --git a/Code/Sandbox/Editor/Objects/GizmoManager.cpp b/Code/Sandbox/Editor/Objects/GizmoManager.cpp
deleted file mode 100644
index d770886bc4..0000000000
--- a/Code/Sandbox/Editor/Objects/GizmoManager.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "GizmoManager.h"
-
-// Editor
-#include "Gizmo.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-void CGizmoManager::Display(DisplayContext& dc)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    AABB bbox;
-    std::vector<CGizmo*> todelete;
-    for (Gizmos::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        CGizmo* gizmo = *it;
-        if (gizmo->GetFlags() & EGIZMO_HIDDEN)
-        {
-            continue;
-        }
-
-        gizmo->GetWorldBounds(bbox);
-        if (dc.IsVisible(bbox))
-        {
-            gizmo->Display(dc);
-        }
-
-        if (gizmo->IsDelete())
-        {
-            todelete.push_back(gizmo);
-        }
-    }
-
-    // Delete gizmos that needs deletion.
-    for (int i = 0; i < todelete.size(); i++)
-    {
-        RemoveGizmo(todelete[i]);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGizmoManager::AddGizmo(CGizmo* gizmo)
-{
-    m_gizmos.insert(gizmo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGizmoManager::RemoveGizmo(CGizmo* gizmo)
-{
-    m_gizmos.erase(gizmo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CGizmoManager::GetGizmoCount() const
-{
-    return (int)m_gizmos.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CGizmo* CGizmoManager::GetGizmoByIndex(int nIndex) const
-{
-    int nCount = 0;
-    Gizmos::iterator ii = m_gizmos.begin();
-    for (; ii != m_gizmos.end(); ++ii)
-    {
-        if ((nCount++) == nIndex)
-        {
-            return *ii;
-        }
-    }
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CGizmoManager::HitTest(HitContext& hc)
-{
-    float mindist = FLT_MAX;
-
-    HitContext ghc = hc;
-    bool bGizmoHit = false;
-
-    AABB bbox;
-    for (Gizmos::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        CGizmo* gizmo = *it;
-
-        if (gizmo->GetFlags() & EGIZMO_SELECTABLE)
-        {
-            if (gizmo->HitTest(ghc))
-            {
-                bGizmoHit = true;
-                if (ghc.dist < mindist)
-                {
-                    mindist = ghc.dist;
-                    hc = ghc;
-                }
-            }
-        }
-    }
-    return bGizmoHit;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CGizmoManager::DeleteAllTransformManipulators()
-{
-    std::vector<CGizmo*> todelete;
-    for (Gizmos::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        CGizmo* gizmo = *it;
-        if (gizmo->GetFlags() & EGIZMO_TRANSFORM_MANIPULATOR)
-        {
-            todelete.push_back(gizmo);
-        }
-    }
-
-    // Delete gizmos that needs deletion.
-    for (int i = 0; i < todelete.size(); i++)
-    {
-        RemoveGizmo(todelete[i]);
-    }
-}
diff --git a/Code/Sandbox/Editor/Objects/GizmoManager.h b/Code/Sandbox/Editor/Objects/GizmoManager.h
deleted file mode 100644
index c32a48f657..0000000000
--- a/Code/Sandbox/Editor/Objects/GizmoManager.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_GIZMOMANAGER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_GIZMOMANAGER_H
-#pragma once
-
-
-#include "IGizmoManager.h"
-
-
-typedef _smart_ptr<CGizmo> CGizmoPtr;
-
-/** GizmoManager manages set of currently active Gizmo objects.
-*/
-class CGizmoManager
-    : public IGizmoManager
-{
-public:
-    void AddGizmo(CGizmo* gizmo);
-    void RemoveGizmo(CGizmo* gizmo);
-
-    int GetGizmoCount() const override;
-    CGizmo* GetGizmoByIndex(int nIndex) const override;
-
-    void Display(DisplayContext& dc);
-    bool HitTest(HitContext& hc);
-
-    void DeleteAllTransformManipulators();
-
-private:
-    typedef std::set<CGizmoPtr> Gizmos;
-    Gizmos m_gizmos;
-};
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_GIZMOMANAGER_H
diff --git a/Code/Sandbox/Editor/Objects/IEntityObjectListener.h b/Code/Sandbox/Editor/Objects/IEntityObjectListener.h
deleted file mode 100644
index 0642f0b729..0000000000
--- a/Code/Sandbox/Editor/Objects/IEntityObjectListener.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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/Sandbox/Editor/Objects/LineGizmo.cpp b/Code/Sandbox/Editor/Objects/LineGizmo.cpp
deleted file mode 100644
index 558e361f5c..0000000000
--- a/Code/Sandbox/Editor/Objects/LineGizmo.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "LineGizmo.h"
-
-// Editor
-#include "Include/IObjectManager.h"
-#include "DisplayContext.h"
-#include "DisplaySettings.h"
-#include "Objects/EntityObject.h"
-#include "GizmoManager.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-CLineGizmo::CLineGizmo()
-{
-    m_color[0] = ColorF(0, 1, 1, 1);
-    m_color[1] = ColorF(0, 1, 1, 1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CLineGizmo::~CLineGizmo()
-{
-    if (m_object[0])
-    {
-        m_object[0]->RemoveEventListener(this);
-    }
-    if (m_object[1])
-    {
-        m_object[1]->RemoveEventListener(this);
-    }
-    m_object[0] = 0;
-    m_object[1] = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLineGizmo::SetObjects(CBaseObject* pObject1, CBaseObject* pObject2, const QString& boneName)
-{
-    assert(pObject1);
-    assert(pObject2);
-    m_object[0] = pObject1;
-    m_object[1] = pObject2;
-    m_boneName = boneName;
-
-    m_object[0]->AddEventListener(this);
-    m_object[1]->AddEventListener(this);
-    CalcBounds();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLineGizmo::OnObjectEvent([[maybe_unused]] CBaseObject* object, int event)
-{
-    if (event == CBaseObject::ON_TRANSFORM)
-    {
-        // One of objects transformed, recalc gizmo bounds.
-        CalcBounds();
-        return;
-    }
-    if (event == CBaseObject::ON_DELETE)
-    {
-        // This gizmo must be deleted as well if one of the objects is deleted.
-        GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(this);
-        return;
-    }
-    if (event == CBaseObject::ON_VISIBILITY)
-    {
-        // Check visibility of gizmo.
-        bool bVisible = !m_object[0]->CheckFlags(OBJFLAG_INVISIBLE) && !m_object[1]->CheckFlags(OBJFLAG_INVISIBLE);
-        if (bVisible)
-        {
-            SetFlags(GetFlags() & (~EGIZMO_HIDDEN));
-        }
-        else
-        {
-            SetFlags(GetFlags() | EGIZMO_HIDDEN);
-        }
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLineGizmo::Display(DisplayContext& dc)
-{
-    if (dc.flags & DISPLAY_LINKS)
-    {
-        dc.DrawLine(m_point[0], m_point[1], m_color[0], m_color[1]);
-
-        //if (!(dc.flags & DISPLAY_HIDENAMES))
-        {
-            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());
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLineGizmo::CalcBounds()
-{
-    m_bbox.Reset();
-
-    for (int i = 0; i < 2; i++)
-    {
-        bool IsObjectLight = false;
-        if (qobject_cast<CEntityObject*>(m_object[i]))
-        {
-            CEntityObject* entityobject = static_cast<CEntityObject*>(m_object[i].get());
-            if (entityobject->IsLight())
-            {
-                m_point[i] = entityobject->GetWorldPos();
-                IsObjectLight = true;
-            }
-        }
-        if (IsObjectLight == false)
-        {
-            AABB box;
-            m_object[i]->GetBoundBox(box);
-            m_point[i] = 0.5f * Vec3(box.max + box.min);
-        }
-        m_bbox.Add(m_point[i]);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLineGizmo::GetWorldBounds(AABB& bbox)
-{
-    bbox = m_bbox;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLineGizmo::SetColor(const Vec3& color1, const Vec3& color2, float alpha1, float alpha2)
-{
-    m_color[0] = ColorF(color1.x, color1.y, color1.z, alpha1);
-    m_color[1] = ColorF(color2.x, color2.y, color2.z, alpha2);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLineGizmo::SetName(const char* sName)
-{
-    m_name = sName;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CLineGizmo::HitTest([[maybe_unused]] HitContext& hc)
-{
-    return 0;
-    /*
-    if (hc.distanceTollerance != 0)
-        return 0;
-
-    Vec3 org = m_object->GetWorldPos();
-
-    float fScreenScale = hc.view->GetScreenScaleFactor(org);
-    float size = gSettings.gizmo.axisGizmoSize * fScreenScale;
-
-    Vec3 x(size,0,0);
-    Vec3 y(0,size,0);
-    Vec3 z(0,0,size);
-
-    float hitDist = 0.01f * fScreenScale;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Calculate ray in local space of axis.
-    //////////////////////////////////////////////////////////////////////////
-    Matrix34 tm;
-    RefCoordSys refCoordSys = GetIEditor()->GetReferenceCoordSys();
-    if (refCoordSys == COORDS_LOCAL)
-    {
-        tm = m_object->GetWorldTM();
-        tm.NoScale();
-    }
-    else
-    {
-        tm.SetIdentity();
-        tm.SetTranslation( m_object->GetWorldPos() );
-    }
-    tm.Invert44();
-    Vec3 raySrc = tm.TransformPoint( hc.raySrc );
-    //CHANGED_BY_IVO
-    //Vec3 rayDir = tm.TransformVector( hc.rayDir );
-    Vec3 rayDir = GetTransposed44(tm) * ( hc.rayDir );
-    //////////////////////////////////////////////////////////////////////////
-
-    Vec3 pnt;
-    BBox box;
-    box.min = - Vec3(hitDist*2,hitDist*2,hitDist*2);
-    box.max = Vec3(size+hitDist*2,size+hitDist*2,size+hitDist*2);
-    if (!box.IsIntersectRay( raySrc,rayDir,pnt ))
-    {
-        m_highlightAxis = 0;
-        return false;
-    }
-
-
-    float axisdist[10];
-    Vec3 np[10];
-
-    Vec3 rayTrg = raySrc + rayDir*10000.0f;
-
-    size *= 0.3f;
-    Vec3 p1(size,size,0);
-    Vec3 p2(size,0,size);
-    Vec3 p3(0,size,size);
-
-    axisdist[AXIS_X] = RayToLineDistance( raySrc,rayTrg,Vec3(0,0,0),x,np[AXIS_X] );
-    axisdist[AXIS_Y] = RayToLineDistance( raySrc,rayTrg,Vec3(0,0,0),y,np[AXIS_Y] );
-    axisdist[AXIS_Z] = RayToLineDistance( raySrc,rayTrg,Vec3(0,0,0),z,np[AXIS_Z] );
-    axisdist[AXIS_XY] = RayToLineDistance( raySrc,rayTrg,p1,p1-x*0.3f,np[AXIS_XY] );
-    axisdist[AXIS_XZ] = RayToLineDistance( raySrc,rayTrg,p2,p2-x*0.3f,np[AXIS_XZ] );
-    axisdist[AXIS_YZ] = RayToLineDistance( raySrc,rayTrg,p3,p3-y*0.3f,np[AXIS_YZ] );
-
-    float mindist = hitDist;
-    int axis = 0;
-    for (int i = AXIS_X; i <= AXIS_XZ; i++)
-    {
-        if (axisdist[i] < mindist)
-        {
-            mindist = axisdist[i];
-            axis = i;
-        }
-    }
-
-    if (axis != 0)
-    {
-        hc.axis = axis;
-        hc.object = m_object;
-        hc.dist = GetDistance(raySrc,np[axis]);
-    }
-
-    m_highlightAxis = axis;
-
-    return axis != 0;
-    */
-}
diff --git a/Code/Sandbox/Editor/Objects/LineGizmo.h b/Code/Sandbox/Editor/Objects/LineGizmo.h
deleted file mode 100644
index 9afd5a3636..0000000000
--- a/Code/Sandbox/Editor/Objects/LineGizmo.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_LINEGIZMO_H
-#define CRYINCLUDE_EDITOR_OBJECTS_LINEGIZMO_H
-#pragma once
-
-#include "BaseObject.h"
-#include "Gizmo.h"
-
-// forward declarations.
-struct DisplayContext;
-
-/** Gizmo of link line connecting two Objects.
-*/
-class CLineGizmo
-    : public CGizmo
-    , public CBaseObject::EventListener
-{
-public:
-    CLineGizmo();
-    ~CLineGizmo();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Ovverides from CGizmo
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetName(const char* sName);
-    virtual void GetWorldBounds(AABB& bbox);
-    virtual void Display(DisplayContext& dc);
-    virtual bool HitTest(HitContext& hc);
-
-    //////////////////////////////////////////////////////////////////////////
-    void SetObjects(CBaseObject* pObject1, CBaseObject* pObject2, const QString& boneName = "");
-    void SetColor(const Vec3& color1, const Vec3& color2, float alpha1 = 1.0f, float alpha2 = 1.0f);
-
-private:
-    void OnObjectEvent(CBaseObject* object, int event) override;
-    void CalcBounds();
-
-    CBaseObjectPtr m_object[2];
-    Vec3 m_point[2];
-    AABB m_bbox;
-    ColorF m_color[2];
-    QString m_name;
-    QString m_boneName;
-};
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_LINEGIZMO_H
-
diff --git a/Code/Sandbox/Editor/Objects/ObjectLoader.cpp b/Code/Sandbox/Editor/Objects/ObjectLoader.cpp
deleted file mode 100644
index f8c1a99cf1..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectLoader.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ObjectLoader.h"
-
-// Editor
-#include "Util/PakFile.h"
-#include "WaitProgress.h"
-#include "Include/IObjectManager.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// CObjectArchive Implementation.
-//////////////////////////////////////////////////////////////////////////
-CObjectArchive::CObjectArchive(IObjectManager* objMan, XmlNodeRef xmlRoot, bool loading)
-{
-    m_objectManager = objMan;
-    bLoading = loading;
-    bUndo = false;
-    m_nFlags = 0;
-    node = xmlRoot;
-    m_pCurrentErrorReport = GetIEditor()->GetErrorReport();
-    m_pGeometryPak = NULL;
-    m_pCurrentObject = NULL;
-    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)
-    {
-        ResolveObjects();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor1 func)
-{
-    if (objectId == GUID_NULL)
-    {
-        func(0);
-        return;
-    }
-
-    GUID guid(objectId);
-
-    CBaseObject* pObject = m_objectManager->FindObject(guid);
-    if (pObject && !(m_nFlags & eObjectLoader_MakeNewIDs))
-    {
-        // Object is already resolved. immediately call callback.
-        func(pObject);
-    }
-    else
-    {
-        Callback cb;
-        cb.fromObject = fromObject;
-        cb.func1 = func;
-        m_resolveCallbacks.insert(Callbacks::value_type(guid, cb));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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)
-{
-    return stl::find_in_map(m_IdRemap, id, id);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::ResolveObjects()
-{
-    int i;
-
-    if (!bLoading)
-    {
-        return;
-    }
-
-    {
-        CWaitProgress wait("Loading Objects", false);
-        if (m_bProgressBarEnabled)
-        {
-            wait.Start();
-        }
-
-        GetIEditor()->SuspendUndo();
-        //////////////////////////////////////////////////////////////////////////
-        // Serialize All Objects from XML.
-        //////////////////////////////////////////////////////////////////////////
-        int numObj = m_loadedObjects.size();
-        for (i = 0; i < numObj; i++)
-        {
-            if (m_bProgressBarEnabled)
-            {
-                wait.Step((i * 100) / numObj);
-            }
-
-            SLoadedObjectInfo& obj = m_loadedObjects[i];
-            m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
-            node = obj.xmlNode;
-
-            obj.pObject->Serialize(*this);
-
-            m_pCurrentErrorReport->SetCurrentValidatorObject(nullptr);
-
-            // Objects can be added to the list here (from Groups).
-            numObj = m_loadedObjects.size();
-        }
-        m_pCurrentErrorReport->SetCurrentValidatorObject(NULL);
-        //////////////////////////////////////////////////////////////////////////
-        GetIEditor()->ResumeUndo();
-    }
-
-    // Sort objects by sort order.
-    std::sort(m_loadedObjects.begin(), m_loadedObjects.end());
-
-    // Then rearrange to parent-first, if same sort order.
-    for (i = 0; i < m_loadedObjects.size(); i++)
-    {
-        if (m_loadedObjects[i].pObject->GetParent())
-        {
-            // Find later in array.
-            for (int j = i + 1; j < m_loadedObjects.size() && m_loadedObjects[j].nSortOrder == m_loadedObjects[i].nSortOrder; j++)
-            {
-                if (m_loadedObjects[j].pObject == m_loadedObjects[i].pObject->GetParent())
-                {
-                    // Swap the objects.
-                    std::swap(m_loadedObjects[i], m_loadedObjects[j]);
-                    i--;
-                    break;
-                }
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Resolve objects GUIDs
-    //////////////////////////////////////////////////////////////////////////
-    for (Callbacks::iterator it = m_resolveCallbacks.begin(); it != m_resolveCallbacks.end(); it++)
-    {
-        Callback& cb = it->second;
-        GUID objectId = ResolveID(it->first);
-        CBaseObject* object = m_objectManager->FindObject(objectId);
-        if (!object)
-        {
-            QString from;
-            if (cb.fromObject)
-            {
-                from = cb.fromObject->GetName();
-            }
-            // Cannot resolve this object id.
-            CErrorRecord err;
-            err.error = QObject::tr("Unresolved ObjectID: %1, Referenced from Object %1").arg(GuidUtil::ToString(objectId)).arg(from);
-            err.severity = CErrorRecord::ESEVERITY_ERROR;
-            err.flags = CErrorRecord::FLAG_OBJECTID;
-            err.pObject = cb.fromObject;
-            GetIEditor()->GetErrorReport()->ReportError(err);
-
-            //Warning( "Cannot resolve ObjectID: %s\r\nObject with this ID was not present in loaded file.\r\nFor instance Trigger referencing another object which is not loaded in Level.",GuidUtil::ToString(objectId) );
-            continue;
-        }
-        m_pCurrentErrorReport->SetCurrentValidatorObject(object);
-        // Call callback with this object.
-        if (cb.func1)
-        {
-            (cb.func1)(object);
-        }
-        if (cb.func2)
-        {
-            (cb.func2)(object, cb.userData);
-        }
-    }
-    m_resolveCallbacks.clear();
-    //////////////////////////////////////////////////////////////////////////
-
-    {
-        CWaitProgress wait("Creating Objects", false);
-        if (m_bProgressBarEnabled)
-        {
-            wait.Start();
-        }
-        //////////////////////////////////////////////////////////////////////////
-        // Serialize All Objects from XML.
-        //////////////////////////////////////////////////////////////////////////
-        int numObj = m_loadedObjects.size();
-        for (i = 0; i < numObj; i++)
-        {
-            if (m_bProgressBarEnabled)
-            {
-                wait.Step((i * 100) / numObj);
-            }
-
-            SLoadedObjectInfo& obj = m_loadedObjects[i];
-            m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
-
-            obj.pObject->CreateGameObject();
-
-            // unset the current validator object because the wait Step 
-            // might generate unrelated errors
-            m_pCurrentErrorReport->SetCurrentValidatorObject(nullptr);
-        }
-        m_pCurrentErrorReport->SetCurrentValidatorObject(NULL);
-        //////////////////////////////////////////////////////////////////////////
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Call PostLoad on all these objects.
-    //////////////////////////////////////////////////////////////////////////
-    {
-        int numObj = m_loadedObjects.size();
-        for (i = 0; i < numObj; i++)
-        {
-            SLoadedObjectInfo& obj = m_loadedObjects[i];
-            m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
-            node = obj.xmlNode;
-            obj.pObject->PostLoad(*this);
-        }
-    }
-
-    m_bNeedResolveObjects = false;
-    m_pCurrentErrorReport->SetCurrentValidatorObject(NULL);
-    m_sequenceIdRemap.clear();
-    m_pendingIds.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::SaveObject(CBaseObject* pObject)
-{
-    if (pObject->CheckFlags(OBJFLAG_DONT_SAVE))
-    {
-        return;
-    }
-
-    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");
-        XmlNodeRef prevRoot = node;
-        node = objNode;
-
-        pObject->Serialize(*this);
-        node = prevRoot;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CObjectArchive::LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject)
-{
-    XmlNodeRef prevNode = node;
-    node = objNode;
-    CBaseObject* pObject;
-    bool bMakeNewID = (m_nFlags & eObjectLoader_MakeNewIDs) ? true : false;
-
-    pObject = m_objectManager->NewObject(*this, pPrevObject, bMakeNewID);
-    if (pObject)
-    {
-        SLoadedObjectInfo obj;
-        obj.nSortOrder = pObject->GetClassDesc()->GameCreationOrder();
-        obj.pObject = pObject;
-        obj.newGuid = pObject->GetId();
-        obj.xmlNode = node;
-        m_loadedObjects.push_back(obj);
-        m_bNeedResolveObjects = true;
-    }
-    node = prevNode;
-    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, NULL);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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)
-{
-    if (bEnable)
-    {
-        m_nFlags |= eObjectLoader_MakeNewIDs;
-    }
-    else
-    {
-        m_nFlags &= ~(eObjectLoader_MakeNewIDs);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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) == NULL);
-    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/Sandbox/Editor/Objects/ObjectLoader.h b/Code/Sandbox/Editor/Objects/ObjectLoader.h
deleted file mode 100644
index 401fdcb8d1..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectLoader.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
-#pragma once
-
-
-#include "Util/GuidUtil.h"
-#include "ErrorReport.h"
-
-class CPakFile;
-class CErrorRecord;
-struct IObjectManager;
-
-typedef std::map<GUID, GUID, guid_less_predicate> TGUIDRemap;
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-/** CObjectLoader used to load Bas Object and resolve ObjectId references while loading.
-*/
-class SANDBOX_API CObjectArchive
-{
-public:
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    XmlNodeRef node; //!< Current archive node.
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    bool bLoading;
-    bool bUndo;
-
-    CObjectArchive(IObjectManager* objMan, XmlNodeRef xmlRoot, bool loading);
-    ~CObjectArchive();
-
-    //! 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 = NULL);
-
-    //////////////////////////////////////////////////////////////////////////
-    int GetLoadedObjectsCount() { return 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
-    {
-        int nSortOrder;
-        _smart_ptr<CBaseObject> pObject;
-        XmlNodeRef xmlNode;
-        GUID newGuid;
-        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; };
-    };
-    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;
-    ObjectsSet m_savedObjects;
-
-    //typedef std::multimap<int,_smart_ptr<CBaseObject> > OrderedObjects;
-    //OrderedObjects m_orderedObjects;
-    std::vector<SLoadedObjectInfo> m_loadedObjects;
-
-    // Loaded objects IDs, used for remapping of GUIDs.
-    TGUIDRemap m_IdRemap;
-
-    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/Sandbox/Editor/Objects/ObjectManager.cpp b/Code/Sandbox/Editor/Objects/ObjectManager.cpp
deleted file mode 100644
index a7d470e852..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectManager.cpp
+++ /dev/null
@@ -1,3039 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ObjectManager.h"
-
-// Qt
-#include <QMessageBox>
-
-// Editor
-#include "Settings.h"
-#include "DisplaySettings.h"
-#include "EntityObject.h"
-#include "Viewport.h"
-#include "GizmoManager.h"
-#include "AxisGizmo.h"
-#include "GameEngine.h"
-#include "WaitProgress.h"
-#include "Util/Image.h"
-#include "ObjectManagerLegacyUndo.h"
-#include "Include/HitContext.h"
-#include "EditMode/DeepSelection.h"
-#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
-
-#include <AzCore/Console/Console.h>
-
-AZ_CVAR_EXTERNED(bool, ed_visibility_logTiming);
-AZ_CVAR_EXTERNED(bool, ed_visibility_use);
-
-/*!
- *  Class Description used for object templates.
- *  This description filled from Xml template files.
- */
-class CXMLObjectClassDesc
-    : public CObjectClassDesc
-{
-public:
-    CObjectClassDesc*   superType;
-    QString type;
-    QString category;
-    QString fileSpec;
-    GUID guid;
-
-public:
-    REFGUID ClassID()
-    {
-        return guid;
-    }
-    ObjectType GetObjectType() { return superType->GetObjectType(); };
-    QString ClassName() { return type; };
-    QString Category() { return category; };
-    QObject* CreateQObject() const override { return superType->CreateQObject(); }
-    QString GetTextureIcon() { return superType->GetTextureIcon(); };
-    QString GetFileSpec()
-    {
-        if (!fileSpec.isEmpty())
-        {
-            return fileSpec;
-        }
-        else
-        {
-            return superType->GetFileSpec();
-        }
-    };
-    virtual int GameCreationOrder() { return superType->GameCreationOrder(); };
-};
-
-void CBaseObjectsCache::AddObject(CBaseObject* object)
-{
-    m_objects.push_back(object);
-    if (object->GetType() == OBJTYPE_AZENTITY)
-    {
-        auto componentEntityObject = static_cast<CComponentEntityObject*>(object);
-        m_entityIds.push_back(componentEntityObject->GetAssociatedEntityId());
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// CObjectManager implementation.
-//////////////////////////////////////////////////////////////////////////
-CObjectManager* g_pObjectManager = 0;
-
-//////////////////////////////////////////////////////////////////////////
-CObjectManager::CObjectManager()
-    : m_lastHideMask(0)
-    , m_maxObjectViewDistRatio(0.00001f)
-    , m_currSelection(&m_defaultSelection)
-    , m_nLastSelCount(0)
-    , 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();
-
-    AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
-        AzToolsFramework::GetEntityContextId());
-}
-
-//////////////////////////////////////////////////////////////////////////
-CObjectManager::~CObjectManager()
-{
-    AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
-
-    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)
-{
-    // Suspend undo operations when initializing object.
-    GetIEditor()->SuspendUndo();
-
-    CBaseObjectPtr obj;
-    {
-        obj = qobject_cast<CBaseObject*>(cls->CreateQObject());
-        obj->SetClassDesc(cls);
-        obj->InitVariables();
-        obj->m_guid = AZ::Uuid::CreateRandom();    // generate uniq GUID for this object.
-
-        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(obj);
-        if (obj->Init(GetIEditor(), prev, file))
-        {
-            if ((newObjectName)&&(newObjectName[0]))
-            {
-                obj->SetName(newObjectName);
-            }
-            else
-            {
-                if (obj->GetName().isEmpty())
-                {
-                    obj->GenerateUniqueName();
-                }
-            }
-
-            // Create game object itself.
-            obj->CreateGameObject();
-
-            if (!AddObject(obj))
-            {
-                obj = 0;
-            }
-        }
-        else
-        {
-            obj = 0;
-        }
-        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(NULL);
-    }
-
-    GetIEditor()->ResumeUndo();
-
-    if (obj != 0 && GetIEditor()->IsUndoRecording())
-    {
-        // AZ entity creations are handled through the AZ undo system.
-        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();
-            }
-
-        }
-    }
-
-    return obj;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CObjectManager::NewObject(CObjectArchive& ar, CBaseObject* pUndoObject, bool bMakeNewId)
-{
-    XmlNodeRef objNode = ar.node;
-
-    // Load all objects from XML.
-    QString typeName;
-    GUID id = GUID_NULL;
-
-    if (!objNode->getAttr("Type", typeName))
-    {
-        return 0;
-    }
-
-    if (!objNode->getAttr("Id", id))
-    {
-        // Make new ID for object that doesn't have if.
-        id = AZ::Uuid::CreateRandom();
-    }
-
-    if (bMakeNewId)
-    {
-        // Make new guid for this object.
-        GUID newId = AZ::Uuid::CreateRandom();
-        ar.RemapID(id, newId);  // Mark this id remapped.
-        id = newId;
-    }
-
-    CBaseObjectPtr pObject;
-    if (pUndoObject)
-    {
-        // if undoing restore object pointer.
-        pObject = pUndoObject;
-    }
-    else
-    {
-        // New object creation.
-
-        // Suspend undo operations when initializing object.
-        CUndoSuspend undoSuspender;
-
-        QString entityClass;
-        if (objNode->getAttr("EntityClass", entityClass))
-        {
-            typeName = typeName + "::" + entityClass;
-        }
-
-        CObjectClassDesc* cls = FindClass(typeName);
-        if (!cls)
-        {
-            CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_ERROR, "RuntimeClass %s not registered", typeName.toUtf8().data());
-            return 0;
-        }
-
-        pObject = qobject_cast<CBaseObject*>(cls->CreateQObject());
-        assert(pObject);
-        pObject->SetClassDesc(cls);
-        pObject->m_guid = id;
-
-        pObject->InitVariables();
-
-        QString objName;
-        objNode->getAttr("Name", objName);
-        pObject->m_name = objName;
-
-        CBaseObject* obj = FindObject(pObject->GetId());
-        if (obj)
-        {
-            // If id is taken.
-            QString error;
-            error = QObject::tr("[Error] Object %1 already exists in the Object Manager and has been deleted as it is a duplicate of object %2").arg(pObject->m_name, obj->GetName());
-            CLogFile::WriteLine(error.toUtf8().data());
-
-            if (!GetIEditor()->IsInTestMode() && !GetIEditor()->IsInLevelLoadTestMode())
-            {
-                CErrorRecord errorRecord;
-                errorRecord.pObject = obj;
-                errorRecord.count = 1;
-                errorRecord.severity = CErrorRecord::ESEVERITY_ERROR;
-                errorRecord.error = error;
-                errorRecord.description = "Possible duplicate objects being loaded, potential fix is to remove duplicate objects from level files.";
-                GetIEditor()->GetErrorReport()->ReportError(errorRecord);
-            }
-
-            return 0;
-            //CoCreateGuid( &pObject->m_guid ); // generate uniq GUID for this object.
-        }
-    }
-
-    GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(pObject);
-    if (!pObject->Init(GetIEditor(), 0, ""))
-    {
-        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(NULL);
-        return 0;
-    }
-
-    if (!AddObject(pObject))
-    {
-        GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(NULL);
-        return 0;
-    }
-
-    //pObject->Serialize( ar );
-
-    GetIEditor()->GetErrorReport()->SetCurrentValidatorObject(NULL);
-
-    if (pObject != 0 && pUndoObject == 0)
-    {
-        // If new object with no undo, record it.
-        if (CUndo::IsRecording())
-        {
-            GetIEditor()->RecordUndo(new CUndoBaseObjectNew(pObject));
-        }
-    }
-
-    m_loadedObjects++;
-    if (m_pLoadProgress && m_totalObjectsToLoad > 0)
-    {
-        m_pLoadProgress->Step((m_loadedObjects * 100) / m_totalObjectsToLoad);
-    }
-
-    return pObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CObjectManager::NewObject(const QString& typeName, CBaseObject* prev, const QString& file, const char* newObjectName)
-{
-    // [9/22/2009 evgeny] If it is "Entity", figure out if a CEntity subclass is actually needed
-    QString fullName = typeName + "::" + file;
-    CObjectClassDesc* cls = FindClass(fullName);
-    if (!cls)
-    {
-        cls = FindClass(typeName);
-    }
-
-    if (!cls)
-    {
-        GetIEditor()->GetSystem()->GetILog()->Log("Warning: RuntimeClass %s (as well as %s) not registered", typeName.toUtf8().data(), fullName.toUtf8().data());
-        return 0;
-    }
-    CBaseObject* pObject = NewObject(cls, prev, file, newObjectName);
-    return pObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void    CObjectManager::DeleteObject(CBaseObject* obj)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    if (m_currEditObject == obj)
-    {
-        EndEditParams();
-    }
-
-    if (!obj)
-    {
-        return;
-    }
-
-    // If object already deleted.
-    if (obj->CheckFlags(OBJFLAG_DELETED))
-    {
-        return;
-    }
-
-    NotifyObjectListeners(obj, CBaseObject::ON_PREDELETE);
-    obj->NotifyListeners(CBaseObject::ON_PREDELETE);
-
-    // Must be after object DetachAll to support restoring Parent/Child relations.
-    // AZ entity deletions are handled through the AZ undo system.
-    if (CUndo::IsRecording() && obj->GetType() != OBJTYPE_AZENTITY)
-    {
-        // Store undo for all child objects.
-        for (int i = 0; i < obj->GetChildCount(); i++)
-        {
-            obj->GetChild(i)->StoreUndo("DeleteParent");
-        }
-        CUndo::Record(new CUndoBaseObjectDelete(obj));
-    }
-
-    AABB objAAB;
-    obj->GetBoundBox(objAAB);
-    GetIEditor()->GetGameEngine()->OnAreaModified(objAAB);
-
-    obj->Done();
-
-    NotifyObjectListeners(obj, CBaseObject::ON_DELETE);
-
-    RemoveObject(obj);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::DeleteSelection(CSelectionGroup* pSelection)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    if (pSelection == NULL)
-    {
-        return;
-    }
-
-    // if the object contains an entity which has link, the link information should be recorded for undo separately. p
-
-    if (CUndo::IsRecording())
-    {
-        for (int i = 0, iSize(pSelection->GetCount()); i < iSize; ++i)
-        {
-            CBaseObject* pObj = pSelection->GetObject(i);
-            if (!qobject_cast<CEntityObject*>(pObj))
-            {
-                continue;
-            }
-
-            CEntityObject* pEntity = (CEntityObject*)pObj;
-            if (pEntity->GetEntityLinkCount() <= 0)
-            {
-                continue;
-            }
-
-            CEntityObject::StoreUndoEntityLink(pSelection);
-            break;
-        }
-    }
-
-    AzToolsFramework::EntityIdList selectedComponentEntities;
-    for (int i = 0, iObjSize(pSelection->GetCount()); i < iObjSize; i++)
-    {
-        CBaseObject* object = pSelection->GetObject(i);
-
-        // AZ::Entity deletion is handled through AZ undo system (DeleteSelected bus call below).
-        if (object->GetType() != OBJTYPE_AZENTITY)
-        {
-            DeleteObject(object);
-        }
-        else
-        {
-            AZ::EntityId id;
-            EBUS_EVENT_ID_RESULT(id, object, AzToolsFramework::ComponentEntityObjectRequestBus, GetAssociatedEntityId);
-            if (id.IsValid())
-            {
-                selectedComponentEntities.push_back(id);
-            }
-        }
-    }
-
-    // Delete AZ (component) entities.
-    if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
-    {
-        EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, DeleteEntities, selectedComponentEntities);
-    }
-    else
-    {
-        EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, DeleteEntitiesAndAllDescendants, selectedComponentEntities);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::DeleteAllObjects()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::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);
-
-    // Clear map. Need to do this before deleting objects in case someone tries to get object list during shutdown.
-    m_objects.clear();
-    m_objectsByName.clear();
-
-    for (i = 0; i < objectsHolder.size(); i++)
-    {
-        objectsHolder[i]->Done();
-    }
-
-    //! Delete object instances.
-    objectsHolder.clear();
-
-    // Clear name map.
-    m_nameNumbersMap.clear();
-
-    m_animatedAttachedEntities.clear();
-}
-
-CBaseObject* CObjectManager::CloneObject(CBaseObject* obj)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::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
-{
-    CBaseObject* result = stl::find_in_map(m_objects, guid, (CBaseObject*)0);
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CObjectManager::FindObject(const QString& sName) const
-{
-    const AZ::Crc32 crc(sName.toUtf8().data(), sName.toUtf8().count(), true);
-
-    auto iter = m_objectsByName.find(crc);
-    if (iter != m_objectsByName.end())
-    {
-        return iter->second;
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::FindObjectsOfType(ObjectType type, std::vector<CBaseObject*>& result)
-{
-    result.clear();
-
-    CBaseObjectsArray objects;
-    GetObjects(objects);
-
-    for (size_t i = 0, n = objects.size(); i < n; ++i)
-    {
-        if (objects[i]->GetType() == type)
-        {
-            result.push_back(objects[i]);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::FindObjectsOfType(const QMetaObject* pClass, std::vector<CBaseObject*>& result)
-{
-    result.clear();
-
-    CBaseObjectsArray objects;
-    GetObjects(objects);
-
-    for (size_t i = 0, n = objects.size(); i < n; ++i)
-    {
-        CBaseObject* pObject = objects[i];
-        if (pObject->metaObject() == pClass)
-        {
-            result.push_back(pObject);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::FindObjectsInAABB(const AABB& aabb, std::vector<CBaseObject*>& result) const
-{
-    result.clear();
-
-    CBaseObjectsArray objects;
-    GetObjects(objects);
-
-    for (size_t i = 0, n = objects.size(); i < n; ++i)
-    {
-        CBaseObject* pObject = objects[i];
-        AABB aabbObj;
-        pObject->GetBoundBox(aabbObj);
-        if (aabb.IsIntersectBox(aabbObj))
-        {
-            result.push_back(pObject);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::AddObject(CBaseObject* obj)
-{
-    CBaseObjectPtr p = stl::find_in_map(m_objects, obj->GetId(), 0);
-    if (p)
-    {
-        CErrorRecord err;
-        err.error = QObject::tr("New Object %1 has Duplicate GUID %2, New Object Ignored").arg(obj->GetName()).arg(GuidUtil::ToString(obj->GetId()));
-        err.severity = CErrorRecord::ESEVERITY_ERROR;
-        err.pObject = obj;
-        err.flags = CErrorRecord::FLAG_OBJECTID;
-        GetIEditor()->GetErrorReport()->ReportError(err);
-
-        return false;
-    }
-    m_objects[obj->GetId()] = obj;
-
-    // Handle adding object to type-specific containers if needed
-    {
-        if (CEntityObject* entityObj = qobject_cast<CEntityObject*>(obj))
-        {
-            CEntityObject::EAttachmentType attachType = entityObj->GetAttachType();
-            if (attachType == CEntityObject::EAttachmentType::eAT_GeomCacheNode || attachType == CEntityObject::EAttachmentType::eAT_CharacterBone)
-            {
-                m_animatedAttachedEntities.insert(entityObj);
-            }
-        }
-    }
-
-    const AZ::Crc32 nameCrc(obj->GetName().toUtf8().data(), obj->GetName().toUtf8().count(), true);
-    m_objectsByName[nameCrc] = obj;
-
-    RegisterObjectName(obj->GetName());
-    InvalidateVisibleList();
-    NotifyObjectListeners(obj, CBaseObject::ON_ADD);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::RemoveObject(CBaseObject* obj)
-{
-    assert(obj != 0);
-
-    InvalidateVisibleList();
-
-    // Handle removing object from type-specific containers if needed
-    {
-        if (CEntityObject* entityObj = qobject_cast<CEntityObject*>(obj))
-        {
-            m_animatedAttachedEntities.erase(entityObj);
-        }
-    }
-
-    // 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));
-
-    // Need to erase this last since it is a smart pointer and can end up deleting the object if it is the last reference to it being kept
-    m_objects.erase(obj->GetId());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::GetAllObjects(TBaseObjects& objects) const
-{
-    objects.clear();
-    objects.reserve(m_objects.size());
-    for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        objects.push_back(it->second);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::ChangeObjectId(REFGUID oldGuid, REFGUID newGuid)
-{
-    Objects::iterator it = m_objects.find(oldGuid);
-    if (it != m_objects.end())
-    {
-        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, 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;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CObjectManager::GetObjectCount() const
-{
-    return m_objects.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::GetObjects(CBaseObjectsArray& objects) const
-{
-    objects.clear();
-    objects.reserve(m_objects.size());
-    for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        objects.push_back(it->second);
-    }
-}
-
-void CObjectManager::GetObjects(DynArray<CBaseObject*>& objects) const
-{
-    CBaseObjectsArray objectArray;
-    GetObjects(objectArray);
-    objects.clear();
-    for (int i = 0, iCount(objectArray.size()); i < iCount; ++i)
-    {
-        objects.push_back(objectArray[i]);
-    }
-}
-
-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;
-        obj->OnEvent(event);
-    }
-
-    if (event == EVENT_RELOAD_ENTITY)
-    {
-        m_bInReloading = false;
-        GetIEditor()->Notify(eNotify_OnReloadTrackView);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::SendEvent(ObjectEvent event, const AABB& bounds)
-{
-    AABB box;
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* obj = it->second;
-        obj->GetBoundBox(box);
-        if (bounds.IsIntersectBox(box))
-        {
-            obj->OnEvent(event);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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)
-{
-    assert(obj);
-    if (obj == NULL)
-    {
-        return false;
-    }
-
-    // Check if can be selected.
-    if (bUseMask && (!(obj->GetType() & gSettings.objectSelectMask)))
-    {
-        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).
-    // this check is to handle the case where an undo or redo action has occurred and
-    // the entity has been destroyed and recreated as part of the deserialization step.
-    // we want the internal state to stay consistent but do not want to notify other systems of the change.
-    if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-    {
-        obj->SetSelected(true);
-    }
-    else
-    {
-        SetObjectSelected(obj, true);
-        GetIEditor()->Notify(eNotify_OnSelectionChange);
-    }
-
-    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).
-    // this check is to handle the case where an undo or redo action has occurred and
-    // the entity has been destroyed and recreated as part of the deserialization step.
-    // we want the internal state to stay consistent but do not want to notify other systems of the change.
-    if (AzToolsFramework::ComponentModeFramework::InComponentMode())
-    {
-        obj->SetSelected(false);
-    }
-    else
-    {
-        SetObjectSelected(obj, false);
-    }
-
-    m_currSelection->RemoveObject(obj);
-}
-
-CSelectionGroup* CObjectManager::GetSelection(const QString& name) const
-{
-    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)0);
-    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*)0);
-    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(0);
-
-    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 = 0;
-
-        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()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    // Make sure to unlock selection.
-    GetIEditor()->LockSelection(false);
-
-    int numSel = m_currSelection->GetCount();
-
-    // Handle Undo/Redo of Component Entities
-    bool isUndoRecording = GetIEditor()->IsUndoRecording();
-    if (isUndoRecording)
-    {
-        m_processingBulkSelect = true;
-        GetIEditor()->RecordUndo(new CUndoBaseObjectClearSelection(*m_currSelection));
-    }
-
-    // Handle legacy entities separately so the selection group can be cleared safely.
-    // This prevents every AzEntity from being removed one by one from a vector.
-    m_currSelection->RemoveAllExceptLegacySet();
-
-    // Kick off Deselect for Legacy Entities
-    for (CBaseObjectPtr legacyObject : m_currSelection->GetLegacyObjects())
-    {
-        if (isUndoRecording && legacyObject->IsSelected())
-        {
-            GetIEditor()->RecordUndo(new CUndoBaseObjectSelect(legacyObject));
-        }
-
-        SetObjectSelected(legacyObject, false);
-    }
-
-    // Legacy set is cleared
-    m_defaultSelection.RemoveAll();
-    m_currSelection = &m_defaultSelection;
-    m_bSelectionChanged = true;
-
-    // Unselect all component entities as one bulk operation instead of individually
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities,
-        AzToolsFramework::EntityIdList());
-
-    m_processingBulkSelect = false;
-
-    if (!m_bExiting)
-    {
-        GetIEditor()->Notify(eNotify_OnSelectionChange);
-    }
-
-    return numSel;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CObjectManager::InvertSelection()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::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(AZ::Debug::ProfileCategory::Editor);
-    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)0);
-    if (selection)
-    {
-        UnselectCurrent();
-        assert(selection != 0);
-        m_currSelection = selection;
-        SelectCurrent();
-    }
-}
-
-void CObjectManager::RemoveSelection(const QString& name)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    QString selName = name;
-    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)0);
-    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(AZ::Debug::ProfileCategory::Editor);
-    for (int i = 0; i < m_currSelection->GetCount(); i++)
-    {
-        CBaseObject* obj = m_currSelection->GetObject(i);
-        if (GetIEditor()->IsUndoRecording() && !obj->IsSelected())
-        {
-            GetIEditor()->RecordUndo(new CUndoBaseObjectSelect(obj));
-        }
-
-        SetObjectSelected(obj, true);
-    }
-}
-
-void CObjectManager::UnselectCurrent()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    // Make sure to unlock selection.
-    GetIEditor()->LockSelection(false);
-
-    // Unselect all component entities as one bulk operation instead of individually
-    AzToolsFramework::EntityIdList selectedEntities;
-    EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, SetSelectedEntities, selectedEntities);
-
-    for (int i = 0; i < m_currSelection->GetCount(); i++)
-    {
-        CBaseObject* obj = m_currSelection->GetObject(i);
-        if (GetIEditor()->IsUndoRecording() && obj->IsSelected())
-        {
-            GetIEditor()->RecordUndo(new CUndoBaseObjectSelect(obj));
-        }
-
-        SetObjectSelected(obj, false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::Display(DisplayContext& dc)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    int currentHideMask = GetIEditor()->GetDisplaySettings()->GetObjectHideMask();
-    if (m_lastHideMask != currentHideMask)
-    {
-        // a setting has changed which may cause the set of currently visible objects to change, so invalidate the serial number
-        // so that viewports and anyone else that needs to update settings knows it has to.
-        m_lastHideMask = currentHideMask;
-        ++m_visibilitySerialNumber;
-    }
-
-    // the object manager itself has a visibility list, so it also has to update its cache when the serial has changed
-    if (m_visibilitySerialNumber != m_lastComputedVisibility)
-    {
-        m_lastComputedVisibility = m_visibilitySerialNumber;
-        UpdateVisibilityList();
-    }
-
-    bool viewIsDirty = dc.settings->IsDisplayHelpers(); // displaying helpers require computing all the bound boxes and things anyway.
-
-    if (!viewIsDirty)
-    {
-        if (CBaseObjectsCache* cache = dc.view->GetVisibleObjectsCache())
-        {
-            // if the current rendering viewport has an out-of-date cache serial number, it needs to be refreshed too.
-            // views set their cache empty when they indicate they need to force a refresh.
-            if ((cache->GetObjectCount() == 0) || (cache->GetSerialNumber() != m_visibilitySerialNumber))
-            {
-                viewIsDirty = true;
-            }
-        }
-    }
-
-    if (viewIsDirty)
-    {
-        FindDisplayableObjects(dc, true);  // this also actually draws the helpers.
-
-        // Also broadcast for anyone else that needs to draw global debug to do so now
-        AzFramework::DebugDisplayEventBus::Broadcast(&AzFramework::DebugDisplayEvents::DrawGlobalDebugInfo);
-    }
-
-    if (m_gizmoManager)
-    {
-        m_gizmoManager->Display(dc);
-    }
-}
-
-void CObjectManager::ForceUpdateVisibleObjectCache(DisplayContext& dc)
-{
-    FindDisplayableObjects(dc, false);
-}
-
-void CObjectManager::FindDisplayableObjects(DisplayContext& dc, [[maybe_unused]] bool bDisplay)
-{
-    // if the new IVisibilitySystem is being used, do not run this logic
-    if (ed_visibility_use)
-    {
-        return;
-    }
-
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    auto start = std::chrono::steady_clock::now();
-    CBaseObjectsCache* pDispayedViewObjects = dc.view->GetVisibleObjectsCache();
-    if (!pDispayedViewObjects)
-    {
-        return;
-    }
-
-    pDispayedViewObjects->SetSerialNumber(m_visibilitySerialNumber); // update viewport to be latest serial number
-
-    const CCamera& camera = GetIEditor()->GetSystem()->GetViewCamera();
-    AABB bbox;
-    bbox.min.zero();
-    bbox.max.zero();
-
-    pDispayedViewObjects->ClearObjects();
-    pDispayedViewObjects->Reserve(m_visibleObjects.size());
-
-    if (dc.flags & DISPLAY_2D)
-    {
-        int numVis = m_visibleObjects.size();
-        for (int i = 0; i < numVis; i++)
-        {
-            CBaseObject* obj = m_visibleObjects[i];
-
-            obj->GetBoundBox(bbox);
-            if (dc.box.IsIntersectBox(bbox))
-            {
-                pDispayedViewObjects->AddObject(obj);
-            }
-        }
-    }
-    else
-    {
-        CSelectionGroup* pSelection = GetSelection();
-        if (pSelection && pSelection->GetCount() > 1)
-        {
-            AABB mergedAABB;
-            mergedAABB.Reset();
-            for (int i = 0, iCount(pSelection->GetCount()); i < iCount; ++i)
-            {
-                CBaseObject* pObj(pSelection->GetObject(i));
-                if (pObj == NULL)
-                {
-                    continue;
-                }
-                AABB aabb;
-                pObj->GetBoundBox(aabb);
-                mergedAABB.Add(aabb);
-            }
-
-            pSelection->GetObject(0)->CBaseObject::DrawDimensions(dc, &mergedAABB);
-        }
-
-        int numVis = m_visibleObjects.size();
-        for (int i = 0; i < numVis; i++)
-        {
-            CBaseObject* obj = m_visibleObjects[i];
-
-            if (obj && obj->IsInCameraView(camera))
-            {
-                // Check if object is too far.
-                float visRatio = obj->GetCameraVisRatio(camera);
-                if (visRatio > m_maxObjectViewDistRatio || (dc.flags & DISPLAY_SELECTION_HELPERS) || obj->IsSelected())
-                {
-                    pDispayedViewObjects->AddObject(obj);
-                }
-            }
-        }
-    }
-
-    if (ed_visibility_logTiming && !ed_visibility_use)
-    {
-        auto stop = std::chrono::steady_clock::now();
-        std::chrono::duration<double> diff = stop - start;
-        AZ_Printf("Visibility", "FindDisplayableObjects (old) - Duration: %f", diff);
-    }
-}
-
-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 = 0;
-    //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(AZ::Debug::ProfileCategory::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)
-    {
-        return false;
-    }
-
-    return true;
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::DeleteSelection()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    // Make sure to unlock selection.
-    GetIEditor()->LockSelection(false);
-
-    GUID bID = GUID_NULL;
-
-    int i;
-    CSelectionGroup objects;
-    for (i = 0; i < m_currSelection->GetCount(); i++)
-    {
-        // Check condition(s) if object could be deleted
-        if (!IsObjectDeletionAllowed(m_currSelection->GetObject(i)))
-        {
-            return;
-        }
-
-        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(AZ::Debug::ProfileCategory::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(HitContext& hitInfo)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    hitInfo.object = nullptr;
-    hitInfo.dist = FLT_MAX;
-    hitInfo.axis = 0;
-    hitInfo.manipulatorMode = 0;
-
-    HitContext hcOrg = hitInfo;
-    if (hcOrg.view)
-    {
-        hcOrg.view->GetPerpendicularAxis(0, &hcOrg.b2DViewport);
-    }
-    hcOrg.rayDir = hcOrg.rayDir.GetNormalized();
-
-    HitContext hc = hcOrg;
-
-    float mindist = FLT_MAX;
-
-    if (!hitInfo.bIgnoreAxis && !hc.bUseSelectionHelpers)
-    {
-        // Test gizmos.
-        if (m_gizmoManager->HitTest(hc))
-        {
-            if (hc.axis != 0)
-            {
-                hitInfo.object = hc.object;
-                hitInfo.gizmo = hc.gizmo;
-                hitInfo.axis = hc.axis;
-                hitInfo.manipulatorMode = hc.manipulatorMode;
-                hitInfo.dist = hc.dist;
-                return true;
-            }
-        }
-    }
-
-    if (hitInfo.bOnlyGizmo)
-    {
-        return false;
-    }
-
-    // Only HitTest objects, that where previously Displayed.
-    CBaseObjectsCache* pDispayedViewObjects = hitInfo.view->GetVisibleObjectsCache();
-
-    const bool iconsPrioritized = true; // Force icons to always be prioritized over other things you hit. Can change to be a configurable option in the future.
-
-    CBaseObject* selected = 0;
-    const char* name = nullptr;
-    bool iconHit = false;
-    int numVis = pDispayedViewObjects->GetObjectCount();
-    for (int i = 0; i < numVis; i++)
-    {
-        CBaseObject* obj = pDispayedViewObjects->GetObject(i);
-
-        if (obj == hitInfo.pExcludedObject)
-        {
-            continue;
-        }
-
-        if (HitTestObject(obj, hc))
-        {
-            if (m_selectCallback && !m_selectCallback->CanSelectObject(obj))
-            {
-                continue;
-            }
-
-            // Check if this object is nearest.
-            if (hc.axis != 0)
-            {
-                hitInfo.object = obj;
-                hitInfo.axis = hc.axis;
-                hitInfo.dist = hc.dist;
-                return true;
-            }
-
-            // When prioritizing icons, we don't allow non-icon hits to beat icon hits
-            if (iconsPrioritized && iconHit && !hc.iconHit)
-            {
-                continue;
-            }
-
-            if (hc.dist < mindist || (!iconHit && hc.iconHit))
-            {
-                if (hc.iconHit)
-                {
-                    iconHit = true;
-                }
-
-                mindist = hc.dist;
-                name = hc.name;
-                selected = obj;
-            }
-
-            // Clear the object pointer if an object was hit, not just if the collision
-            // was closer than any previous. Not all paths from HitTestObject set the object pointer and so you could get
-            // an object from a previous (rejected) result but with collision information about a closer hit.
-            hc.object = nullptr;
-            hc.iconHit = false;
-
-            // If use deep selection
-            if (hitInfo.pDeepSelection)
-            {
-                hitInfo.pDeepSelection->AddObject(hc.dist, obj);
-            }
-        }
-    }
-
-    if (selected)
-    {
-        hitInfo.object = selected;
-        hitInfo.dist = mindist;
-        hitInfo.name = name;
-        hitInfo.iconHit = iconHit;
-        return true;
-    }
-    return false;
-}
-void CObjectManager::FindObjectsInRect(CViewport* view, const QRect& rect, std::vector<GUID>& guids)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    if (rect.width() < 1 || rect.height() < 1)
-    {
-        return;
-    }
-
-    HitContext hc;
-    hc.view = view;
-    hc.b2DViewport = view->GetType() != ET_ViewportCamera;
-    hc.rect = rect;
-    hc.bUseSelectionHelpers = view->GetAdvancedSelectModeFlag();
-
-    guids.clear();
-
-    CBaseObjectsCache* pDispayedViewObjects = view->GetVisibleObjectsCache();
-
-    int numVis = pDispayedViewObjects->GetObjectCount();
-    for (int i = 0; i < numVis; ++i)
-    {
-        CBaseObject* pObj = pDispayedViewObjects->GetObject(i);
-
-        HitTestObjectAgainstRect(pObj, view, hc, guids);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    // Ignore too small rectangles.
-    if (rect.width() < 1 || rect.height() < 1)
-    {
-        return;
-    }
-
-    CUndo undo("Select Object(s)");
-
-    HitContext hc;
-    hc.view = view;
-    hc.b2DViewport = view->GetType() != ET_ViewportCamera;
-    hc.rect = rect;
-    hc.bUseSelectionHelpers = view->GetAdvancedSelectModeFlag();
-
-    bool isUndoRecording = GetIEditor()->IsUndoRecording();
-    if (isUndoRecording)
-    {
-        m_processingBulkSelect = true;
-    }
-
-    CBaseObjectsCache* displayedViewObjects = view->GetVisibleObjectsCache();
-    int numVis = displayedViewObjects->GetObjectCount();
-
-    // Tracking the previous selection allows proper undo/redo functionality of additional
-    // selections (CTRL + drag select)
-    AZStd::unordered_set<const CBaseObject*> previousSelection;
-
-    for (int i = 0; i < numVis; ++i)
-    {
-        CBaseObject* object = displayedViewObjects->GetObject(i);
-
-        if (object->IsSelected())
-        {
-            previousSelection.insert(object);
-        }
-        else
-        {
-            // This will update m_currSelection
-            SelectObjectInRect(object, view, hc, bSelect);
-
-            // Legacy undo/redo does not go through the Ebus system and must be done individually
-            if (isUndoRecording && object->GetType() != OBJTYPE_AZENTITY)
-            {
-                GetIEditor()->RecordUndo(new CUndoBaseObjectSelect(object, true));
-            }
-        }
-    }
-
-    if (isUndoRecording && m_currSelection)
-    {
-        // Component Entities can handle undo/redo in bulk due to Ebuses
-        GetIEditor()->RecordUndo(new CUndoBaseObjectBulkSelect(previousSelection, *m_currSelection));
-    }
-
-    m_processingBulkSelect = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint16 FindPossibleObjectNameNumber(std::set<uint16>& numberSet)
-{
-    const int LIMIT = 65535;
-    size_t nSetSize = numberSet.size();
-    for (uint16 i = 1; i < LIMIT; ++i)
-    {
-        uint16 candidateNumber = (i + nSetSize) % LIMIT;
-        if (numberSet.find(candidateNumber) == numberSet.end())
-        {
-            numberSet.insert(candidateNumber);
-            return candidateNumber;
-        }
-    }
-    return 0;
-}
-
-void CObjectManager::RegisterObjectName(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 iNameNumber = m_nameNumbersMap.find(typeName);
-    if (iNameNumber == m_nameNumbersMap.end())
-    {
-        std::set<uint16> numberSet;
-        numberSet.insert(num);
-        m_nameNumbersMap[typeName] = numberSet;
-    }
-    else
-    {
-        std::set<uint16>& numberSet = iNameNumber->second;
-        numberSet.insert(num);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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)
-    {
-        typeName.remove(0, subIndex + 2);
-    }
-
-    // Remove all numbers from the end of typename.
-    int len = typeName.length();
-    while (len > 0 && typeName[len - 1].isDigit())
-    {
-        len--;
-    }
-
-    typeName = typeName.left(len);
-
-    NameNumbersMap::iterator ii = m_nameNumbersMap.find(typeName);
-    uint16 lastNumber = 1;
-    if (ii != m_nameNumbersMap.end())
-    {
-        lastNumber = FindPossibleObjectNameNumber(ii->second);
-    }
-    else
-    {
-        std::set<uint16> numberSet;
-        numberSet.insert(lastNumber);
-        m_nameNumbersMap[typeName] = numberSet;
-    }
-
-    QString str = QStringLiteral("%1%2").arg(typeName).arg(lastNumber);
-
-    return str;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::EnableUniqObjectNames(bool bEnable)
-{
-    bool bPrev = m_bGenUniqObjectNames;
-    m_bGenUniqObjectNames = bEnable;
-    return bPrev;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CObjectClassDesc* CObjectManager::FindClass(const QString& className)
-{
-    IClassDesc* cls = CClassFactory::Instance()->FindClass(className.toUtf8().data());
-    if (cls != NULL && cls->SystemClassID() == ESYSTEM_CLASS_OBJECT)
-    {
-        return (CObjectClassDesc*)cls;
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-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(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)
-{
-    QString typeName = templ->getTag();
-    QString superTypeName;
-    if (!templ->getAttr("SuperType", superTypeName))
-    {
-        return;
-    }
-
-    CObjectClassDesc* superType = FindClass(superTypeName);
-    if (!superType)
-    {
-        return;
-    }
-
-    QString category, fileSpec, initialName;
-    templ->getAttr("Category", category);
-    templ->getAttr("File", fileSpec);
-    templ->getAttr("Name", initialName);
-
-    CXMLObjectClassDesc* classDesc = new CXMLObjectClassDesc;
-    classDesc->superType = superType;
-    classDesc->type = typeName;
-    classDesc->category = category;
-    classDesc->fileSpec = fileSpec;
-    classDesc->guid = AZ::Uuid::CreateRandom();
-
-    CClassFactory::Instance()->RegisterClass(classDesc);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::LoadClassTemplates(const QString& path)
-{
-    QString dir = Path::AddPathSlash(path);
-
-    IFileUtil::FileArray files;
-    CFileUtil::ScanDirectory(dir, "*.xml", files, false);
-
-    for (int k = 0; k < files.size(); k++)
-    {
-        // Construct the full filepath of the current file
-        XmlNodeRef node = XmlHelpers::LoadXmlFromFile((dir + files[k].filename).toUtf8().data());
-        if (node != 0 && node->isTag("ObjectTemplates"))
-        {
-            QString name;
-            for (int i = 0; i < node->getChildCount(); i++)
-            {
-                RegisterClassTemplate(node->getChild(i));
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::RegisterCVars()
-{
-    REGISTER_CVAR2("AxisHelperHitRadius",
-        &m_axisHelperHitRadius,
-        20,
-        VF_DEV_ONLY,
-        "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()
-{
-    if (m_isUpdateVisibilityList)
-    {
-        return;
-    }
-    ++m_visibilitySerialNumber;
-    m_visibleObjects.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::UpdateVisibilityList()
-{
-    m_isUpdateVisibilityList = true;
-    m_visibleObjects.clear();
-
-    bool isInIsolationMode = false;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-        isInIsolationMode, &AzToolsFramework::ToolsApplicationRequestBus::Events::IsEditorInIsolationMode);
-
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* obj = it->second;
-        bool visible = obj->IsPotentiallyVisible();
-
-        // entities not isolated in Isolation Mode will be invisible
-        bool isObjectIsolated = obj->IsIsolated();
-        visible = visible && (!isInIsolationMode || isObjectIsolated);
-        obj->UpdateVisibility(visible);
-
-        // when the new viewport interaction model is enabled we always want to add objects
-        // in the view (frustum) to the visible objects list so we can draw feedback for
-        // entities being hidden in the viewport when selected in the  entity outliner
-        // (EditorVisibleEntityDataCache must be populated even if entities are 'hidden')
-        m_visibleObjects.push_back(obj);
-    }
-
-    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)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    // Only select/unselect once.
-    if ((pObject->IsSelected() && bSelect) || (!pObject->IsSelected() && !bSelect))
-    {
-        return;
-    }
-
-    // Store selection undo.
-    if (CUndo::IsRecording() && !m_processingBulkSelect)
-    {
-        CUndo::Record(new CUndoBaseObjectSelect(pObject));
-    }
-
-    pObject->SetSelected(bSelect);
-    m_bSelectionChanged = true;
-
-
-    if (bSelect && !GetIEditor()->GetTransformManipulator())
-    {
-        if (CAxisGizmo::GetGlobalAxisGizmoCount() < gSettings.gizmo.axisGizmoMaxCount)
-        {
-            // Create axis gizmo for this object.
-            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 = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::GatherUsedResources(CUsedResources& resources)
-{
-    CBaseObjectsArray objects;
-    GetIEditor()->GetObjectManager()->GetObjects(objects);
-
-    for (int i = 0; i < objects.size(); i++)
-    {
-        CBaseObject* pObject = objects[i];
-        pObject->GatherUsedResources(resources);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IGizmoManager* CObjectManager::GetGizmoManager()
-{
-    return m_gizmoManager;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::IsLightClass(CBaseObject* pObject)
-{
-    if (qobject_cast<CEntityObject*>(pObject))
-    {
-        CEntityObject* pEntity = (CEntityObject*)pObject;
-        if (pEntity)
-        {
-            if (pEntity->GetEntityClass().compare(CLASS_LIGHT) == 0)
-            {
-                return TRUE;
-            }
-            if (pEntity->GetEntityClass().compare(CLASS_RIGIDBODY_LIGHT) == 0)
-            {
-                return TRUE;
-            }
-            if (pEntity->GetEntityClass().compare(CLASS_DESTROYABLE_LIGHT) == 0)
-            {
-                return TRUE;
-            }
-        }
-    }
-
-    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);
-        }
-    }
-}
-
-void CObjectManager::EnteredComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
-{
-    // hide current gizmo for entity (translate/rotate/scale)
-    IGizmoManager* gizmoManager = GetGizmoManager();
-    const size_t gizmoCount = static_cast<size_t>(gizmoManager->GetGizmoCount());
-    for (size_t i = 0; i < gizmoCount; ++i)
-    {
-        gizmoManager->RemoveGizmo(gizmoManager->GetGizmoByIndex(i));
-    }
-}
-
-void CObjectManager::LeftComponentMode(const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
-{
-    // show translate/rotate/scale gizmo again
-    if (IGizmoManager* gizmoManager = GetGizmoManager())
-    {
-        if (CBaseObject* selectedObject = GetIEditor()->GetSelectedObject())
-        {
-            gizmoManager->AddGizmo(new CAxisGizmo(selectedObject));
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-namespace
-{
-    AZStd::vector<AZStd::string> PyGetAllObjects()
-    {
-        IObjectManager* pObjMgr = GetIEditor()->GetObjectManager();
-        CBaseObjectsArray objects;
-        pObjMgr->GetObjects(objects);
-        int count = pObjMgr->GetObjectCount();
-        AZStd::vector<AZStd::string> result;
-        for (int i = 0; i < count; ++i)
-        {
-            result.push_back(objects[i]->GetName().toUtf8().data());
-        }
-
-        return result;
-    }
-
-    AZStd::vector<AZStd::string> PyGetNamesOfSelectedObjects()
-    {
-        CSelectionGroup* pSel = GetIEditor()->GetSelection();
-        AZStd::vector<AZStd::string> result;
-        const int selectionCount = pSel->GetCount();
-        result.reserve(selectionCount);
-
-        for (int i = 0; i < selectionCount; i++)
-        {
-            result.push_back(pSel->GetObject(i)->GetName().toUtf8().data());
-        }
-
-        return result;
-    }
-
-    void PySelectObject(const char* objName)
-    {
-        CUndo undo("Select Object");
-
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
-        if (pObject)
-        {
-            GetIEditor()->GetObjectManager()->SelectObject(pObject);
-        }
-    }
-
-    void PyUnselectObjects(const AZStd::vector<AZStd::string>& names)
-    {
-        CUndo undo("Unselect Objects");
-
-        std::vector<CBaseObject*> pBaseObjects;
-        for (int i = 0; i < names.size(); i++)
-        {
-            if (!GetIEditor()->GetObjectManager()->FindObject(names[i].c_str()))
-            {
-                throw std::logic_error((QString("\"") + names[i].c_str() + "\" is an invalid entity.").toUtf8().data());
-            }
-            pBaseObjects.push_back(GetIEditor()->GetObjectManager()->FindObject(names[i].c_str()));
-        }
-
-        for (int i = 0; i < pBaseObjects.size(); i++)
-        {
-            GetIEditor()->GetObjectManager()->UnselectObject(pBaseObjects[i]);
-        }
-    }
-
-    void PySelectObjects(const AZStd::vector<AZStd::string>& names)
-    {
-        CUndo undo("Select Objects");
-        CBaseObject* pObject;
-        for (size_t i = 0; i < names.size(); ++i)
-        {
-            pObject = GetIEditor()->GetObjectManager()->FindObject(names[i].c_str());
-            if (!pObject)
-            {
-                throw std::logic_error((QString("\"") + names[i].c_str() + "\" is an invalid entity.").toUtf8().data());
-            }
-            GetIEditor()->GetObjectManager()->SelectObject(pObject);
-        }
-    }
-
-    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");
-
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
-        if (pObject)
-        {
-            GetIEditor()->GetObjectManager()->DeleteObject(pObject);
-        }
-    }
-
-    int PyClearSelection()
-    {
-        CUndo undo("Clear Selection");
-        return GetIEditor()->GetObjectManager()->ClearSelection();
-    }
-
-    void PyDeleteSelected()
-    {
-        CUndo undo("Delete Selected Object");
-        GetIEditor()->GetObjectManager()->DeleteSelection();
-    }
-
-    int PyGetNumSelectedObjects()
-    {
-        if (CSelectionGroup* pGroup = GetIEditor()->GetObjectManager()->GetSelection())
-        {
-            return pGroup->GetCount();
-        }
-
-        return 0;
-    }
-
-    AZ::Vector3 PyGetSelectionCenter()
-    {
-        if (CSelectionGroup* pGroup = GetIEditor()->GetObjectManager()->GetSelection())
-        {
-            if (pGroup->GetCount() == 0)
-            {
-                throw std::runtime_error("Nothing selected");
-            }
-
-            const Vec3 center = pGroup->GetCenter();
-            return AZ::Vector3(center.x, center.y, center.z);
-        }
-
-        throw std::runtime_error("Nothing selected");
-    }
-
-    AZ::Aabb PyGetSelectionAABB()
-    {
-        if (CSelectionGroup* pGroup = GetIEditor()->GetObjectManager()->GetSelection())
-        {
-            if (pGroup->GetCount() == 0)
-            {
-                throw std::runtime_error("Nothing selected");
-            }
-
-            const AABB aabb = pGroup->GetBounds();
-            AZ::Aabb result;
-            result.Set(
-                AZ::Vector3(
-                    aabb.min.x,
-                    aabb.min.y,
-                    aabb.min.z
-                ),
-                AZ::Vector3(
-                    aabb.max.x,
-                    aabb.max.y,
-                    aabb.max.z
-                )
-            );
-            return result;
-        }
-
-        throw std::runtime_error("Nothing selected");
-    }
-
-    AZ::Vector3 PyGetObjectPosition(const char* pName)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
-        }
-        Vec3 position = pObject->GetPos();
-        return AZ::Vector3(position.x, position.y, position.z);
-    }
-
-    AZ::Vector3 PyGetWorldObjectPosition(const char* pName)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
-        }
-        Vec3 position = pObject->GetWorldPos();
-        return AZ::Vector3(position.x, position.y, position.z);
-    }
-
-    void PySetObjectPosition(const char* pName, float fValueX, float fValueY, float fValueZ)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
-        }
-        CUndo undo("Set Object Base Position");
-        pObject->SetPos(Vec3(fValueX, fValueY, fValueZ));
-    }
-
-    AZ::Vector3 PyGetObjectRotation(const char* pName)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
-        }
-        Ang3 ang = RAD2DEG(Ang3(pObject->GetRotation()));
-        return AZ::Vector3(ang.x, ang.y, ang.z);
-    }
-
-    void PySetObjectRotation(const char* pName, float fValueX, float fValueY, float fValueZ)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
-        }
-        CUndo undo("Set Object Rotation");
-        pObject->SetRotation(Quat(DEG2RAD(Ang3(fValueX, fValueY, fValueZ))));
-    }
-
-    AZ::Vector3 PyGetObjectScale(const char* pName)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
-        }
-        Vec3 scaleVec3 = pObject->GetScale();
-        return AZ::Vector3(scaleVec3.x, scaleVec3.y, scaleVec3.z);
-    }
-
-    void PySetObjectScale(const char* pName, float fValueX, float fValueY, float fValueZ)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
-        }
-        CUndo undo("Set Object Scale");
-        pObject->SetScale(Vec3(fValueX, fValueY, fValueZ));
-    }
-
-    void PyRenameObject(const char* pOldName, const char* pNewName)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pOldName);
-        if (!pObject)
-        {
-            throw std::runtime_error("Could not find object");
-        }
-
-        if (strcmp(pNewName, "") == 0 || GetIEditor()->GetObjectManager()->FindObject(pNewName))
-        {
-            throw std::runtime_error("Invalid object name.");
-        }
-
-        CUndo undo("Rename object");
-        pObject->SetName(pNewName);
-    }
-}
-
-namespace AzToolsFramework
-{
-    void ObjectManagerFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.general' module
-            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
-            };
-            addLegacyGeneral(behaviorContext->Method("get_all_objects", PyGetAllObjects, nullptr, "Gets the list of names of all objects in the whole level."));
-            addLegacyGeneral(behaviorContext->Method("get_names_of_selected_objects", PyGetNamesOfSelectedObjects, nullptr, "Get the name from selected object/objects."));
-
-            addLegacyGeneral(behaviorContext->Method("select_object", PySelectObject, nullptr, "Selects a specified object."));
-            addLegacyGeneral(behaviorContext->Method("unselect_objects", PyUnselectObjects, nullptr, "Unselects a list of objects."));
-            addLegacyGeneral(behaviorContext->Method("select_objects", PySelectObjects, nullptr, "Selects a list of objects."));
-            addLegacyGeneral(behaviorContext->Method("get_num_selected", PyGetNumSelectedObjects, nullptr, "Returns the number of selected objects."));
-            addLegacyGeneral(behaviorContext->Method("clear_selection", PyClearSelection, nullptr, "Clears selection."));
-
-            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)."));
-
-            addLegacyGeneral(behaviorContext->Method("get_position", PyGetObjectPosition, nullptr, "Gets the position of an object."));
-            addLegacyGeneral(behaviorContext->Method("set_position", PySetObjectPosition, nullptr, "Sets the position of an object."));
-
-            addLegacyGeneral(behaviorContext->Method("get_rotation", PyGetObjectRotation, nullptr, "Gets the rotation of an object."));
-            addLegacyGeneral(behaviorContext->Method("set_rotation", PySetObjectRotation, nullptr, "Sets the rotation of an object."));
-
-            addLegacyGeneral(behaviorContext->Method("get_scale", PyGetObjectScale, nullptr, "Gets the scale of an object."));
-            addLegacyGeneral(behaviorContext->Method("set_scale", PySetObjectScale, nullptr, "Sets the scale of an object."));
-
-            addLegacyGeneral(behaviorContext->Method("rename_object", PyRenameObject, nullptr, "Renames object with oldObjectName to newObjectName."));
-
-
-        }
-    }
-}
-
-
diff --git a/Code/Sandbox/Editor/Objects/ObjectManager.h b/Code/Sandbox/Editor/Objects/ObjectManager.h
deleted file mode 100644
index 8902337345..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectManager.h
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : ObjectManager definition.
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
-#pragma once
-
-#include "IObjectManager.h"
-#include "BaseObject.h"
-#include "SelectionGroup.h"
-#include "ObjectManagerEventBus.h"
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
-#include <AzCore/EBus/EBus.h>
-#include <Include/SandboxAPI.h>
-
-// forward declarations.
-class CGizmoManager;
-class CEntityObject;
-class CObjectArchive;
-class CObjectClassDesc;
-class CWaitProgress;
-
-enum class ImageRotationDegrees;
-
-//////////////////////////////////////////////////////////////////////////
-// Helper class to signal when we are exporting a level to game
-//////////////////////////////////////////////////////////////////////////
-class CObjectManagerLevelIsExporting
-{
-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);
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Array of editor objects.
-//////////////////////////////////////////////////////////////////////////
-class CBaseObjectsCache
-{
-public:
-    int GetObjectCount() const { return m_objects.size(); }
-    CBaseObject* GetObject(int nIndex) const { return m_objects[nIndex]; }
-    void AddObject(CBaseObject* object);
-
-    void ClearObjects()
-    {
-        m_objects.clear();
-        m_entityIds.clear();
-    }
-
-    void Reserve(int nCount)
-    {
-        m_objects.reserve(nCount);
-        m_entityIds.reserve(nCount);
-    }
-
-    const AZStd::vector<AZ::EntityId>& GetEntityIdCache() const { return m_entityIds; }
-
-    /// Checksum is used as a dirty flag.
-    unsigned int GetSerialNumber() { return m_serialNumber; }
-    void SetSerialNumber(unsigned int serialNumber) { m_serialNumber = serialNumber; }
-private:
-    //! List of objects that was displayed at last frame.
-    std::vector<_smart_ptr<CBaseObject> > m_objects;
-    AZStd::vector<AZ::EntityId> m_entityIds;
-    unsigned int m_serialNumber = 0;
-};
-
-/*!
- *  CObjectManager is a singleton object that
- *  manages global set of objects in level.
- */
-class CObjectManager
-    : public IObjectManager
-    , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
-{
-public:
-    //! Selection functor callback.
-    //! Callback function must return a boolean value.
-    //! Return true if selection should proceed, or false to abort object selection.
-    CObjectManager();
-    ~CObjectManager();
-
-    void RegisterObjectClasses();
-
-    CBaseObject* NewObject(CObjectClassDesc* cls, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr);
-    CBaseObject* NewObject(const QString& typeName, CBaseObject* prev = 0, const QString& file = "", const char* newEntityName = nullptr);
-
-    void    DeleteObject(CBaseObject* obj);
-    void    DeleteSelection(CSelectionGroup* pSelection);
-    void    DeleteAllObjects();
-    CBaseObject* CloneObject(CBaseObject* obj);
-
-    void BeginEditParams(CBaseObject* obj, int flags);
-    void EndEditParams(int flags = 0);
-    // Hides all transform manipulators.
-    void HideTransformManipulators();
-
-    //! Get number of objects manager by ObjectManager (not contain sub objects of groups).
-    int     GetObjectCount() const;
-
-    //! Get array of objects, managed by manager (not contain sub objects of groups).
-    //! @param layer if 0 get objects for all layers, or layer to get objects from.
-    void GetObjects(CBaseObjectsArray& objects) const;
-    void GetObjects(DynArray<CBaseObject*>& objects) const;
-
-    //! 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;
-
-    //! Update objects.
-    void    Update();
-
-    //! Display objects on display context.
-    void    Display(DisplayContext& dc);
-
-    //! 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);
-
-    //! 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);
-
-    //! Check intersection with an object.
-    //! @return true if hit, and fills hitInfo structure.
-    bool HitTestObject(CBaseObject* obj, HitContext& hc);
-
-    //! Send event to all objects.
-    //! Will cause OnEvent handler to be called on all objects.
-    void    SendEvent(ObjectEvent event);
-
-    //! Send event to all objects within given bounding box.
-    //! Will cause OnEvent handler to be called on objects within bounding box.
-    void    SendEvent(ObjectEvent event, const AABB& bounds);
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Find object by ID.
-    CBaseObject* FindObject(REFGUID guid) const;
-    //////////////////////////////////////////////////////////////////////////
-    //! Find object by name.
-    CBaseObject* FindObject(const QString& sName) const;
-    //////////////////////////////////////////////////////////////////////////
-    //! Find objects of given type.
-    void FindObjectsOfType(const QMetaObject* pClass, std::vector<CBaseObject*>& result) override;
-    void FindObjectsOfType(ObjectType type, std::vector<CBaseObject*>& result) override;
-    //////////////////////////////////////////////////////////////////////////
-    //! Find objects which intersect with a given AABB.
-    virtual void FindObjectsInAABB(const AABB& aabb, std::vector<CBaseObject*>& result) const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Operations on objects.
-    //////////////////////////////////////////////////////////////////////////
-    //! Makes object visible or invisible.
-    void HideObject(CBaseObject* obj, bool hide);
-    //! Shows the last hidden object based on hidden ID
-    void ShowLastHiddenObject();
-    //! Freeze object, making it unselectable.
-    void FreezeObject(CBaseObject* obj, bool freeze);
-    //! Unhide all hidden objects.
-    void UnhideAll();
-    //! Unfreeze all frozen objects.
-    void UnfreezeAll();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Object Selection.
-    //////////////////////////////////////////////////////////////////////////
-    bool    SelectObject(CBaseObject* obj, bool bUseMask = true);
-    void    UnselectObject(CBaseObject* obj);
-
-    //! Select objects within specified distance from given position.
-    //! Return number of selected objects.
-    int SelectObjects(const AABB& box, bool bUnselect = false);
-
-    virtual void SelectEntities(std::set<CEntityObject*>& s);
-
-    int MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, bool bIsCopy = false);
-
-    //! Selects/Unselects all objects within 2d rectangle in given viewport.
-    void SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect);
-    void FindObjectsInRect(CViewport* view, const QRect& rect, std::vector<GUID>& guids);
-
-    //! Clear default selection set.
-    //! @Return number of objects removed from selection.
-    int ClearSelection();
-
-    //! Deselect all current selected objects and selects object that were unselected.
-    //! @Return number of selected objects.
-    int InvertSelection();
-
-    //! Get current selection.
-    CSelectionGroup*    GetSelection() const { return m_currSelection; };
-    //! Get named selection.
-    CSelectionGroup*    GetSelection(const QString& name) const;
-    // Get selection group names
-    void GetNameSelectionStrings(QStringList& names);
-    //! Change name of current selection group.
-    //! And store it in list.
-    void    NameSelection(const QString& name);
-    //! Set one of name selections as current selection.
-    void    SetSelection(const QString& name);
-    void    RemoveSelection(const QString& name);
-
-    bool IsObjectDeletionAllowed(CBaseObject* pObject);
-
-    //! Delete all objects in selection group.
-    void DeleteSelection();
-
-    uint32  ForceID() const{return m_ForceID; }
-    void    ForceID(uint32 FID){m_ForceID = FID; }
-
-    //! Generates uniq name base on type name of object.
-    QString GenerateUniqueObjectName(const QString& typeName);
-    //! Register object name in object manager, needed for generating uniq names.
-    void RegisterObjectName(const QString& name);
-    //! 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);
-
-    //! Register XML template of runtime class.
-    void    RegisterClassTemplate(const XmlNodeRef& templ);
-    //! Load class templates for specified directory,
-    void    LoadClassTemplates(const QString& path);
-
-    //! Registers the ObjectManager's console variables.
-    void RegisterCVars();
-
-    //! Find object class by name.
-    CObjectClassDesc* FindClass(const QString& className);
-    void    GetClassCategories(QStringList& categories);
-    void    GetClassCategoryToolClassNamePairs(std::vector< std::pair<QString, QString> >& categoryToolClassNamePairs) override;
-    void    GetClassTypes(const QString& category, QStringList& types);
-
-    //! 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);
-    void    ExportEntities(XmlNodeRef& rootNode);
-
-    //! 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);
-
-    void SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading);
-
-    //! Load objects from object archive.
-    //! @param bSelect if set newly loaded object will be selected.
-    void LoadObjects(CObjectArchive& ar, bool bSelect);
-
-    //! 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);
-    bool IsDuplicateObjectName(const QString& newName) const
-    {
-        return FindObject(newName) ? true : false;
-    }
-    void ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const;
-    void ChangeObjectName(CBaseObject* obj, const QString& newName);
-
-    //! Convert object of one type to object of another type.
-    //! Original object is deleted.
-    bool ConvertToType(CBaseObject* pObject, const QString& typeName);
-
-    //! Set new selection callback.
-    //! @return previous selection callback.
-    IObjectSelectCallback* SetSelectCallback(IObjectSelectCallback* callback);
-
-    // Enables/Disables creating of game objects.
-    void SetCreateGameObject(bool enable) { m_createGameObjects = enable; };
-    //! Return true if objects loaded from xml should immidiatly create game objects associated with them.
-    bool IsCreateGameObjects() const { return m_createGameObjects; };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Get access to gizmo manager.
-    IGizmoManager* GetGizmoManager();
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Invalidate visibily settings of objects.
-    void InvalidateVisibleList();
-
-    //////////////////////////////////////////////////////////////////////////
-    // ObjectManager notification Callbacks.
-    //////////////////////////////////////////////////////////////////////////
-    void AddObjectEventListener(EventListener* listener);
-    void RemoveObjectEventListener(EventListener* listener);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Used to indicate starting and ending of objects loading.
-    //////////////////////////////////////////////////////////////////////////
-    void StartObjectsLoading(int numObjects);
-    void EndObjectsLoading();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Gathers all resources used by all objects.
-    void GatherUsedResources(CUsedResources& resources);
-
-    virtual bool IsLightClass(CBaseObject* pObject);
-
-    virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue);
-    virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue);
-
-    bool IsReloading() const { 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:
-    friend CObjectArchive;
-    friend class CBaseObject;
-    /** Creates and serialize object from xml node.
-    @param objectNode Xml node to serialize object info from.
-    @param pUndoObject Pointer to deleted object for undo.
-    */
-    CBaseObject* NewObject(CObjectArchive& archive, CBaseObject* pUndoObject, bool bMakeNewId);
-
-    //! Update visibility of all objects.
-    void UpdateVisibilityList();
-    //! Get array of all objects in manager.
-    void GetAllObjects(TBaseObjects& objects) const;
-
-    void UnselectCurrent();
-    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);
-
-    // EditorComponentModeNotificationBus
-    void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
-    void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
-
-private:
-    typedef std::map<GUID, CBaseObjectPtr, guid_less_predicate> Objects;
-    Objects m_objects;
-    typedef std::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;
-
-    // this number changes whenever visibility is invalidated.  Viewports can use it to keep track of whether they need to recompute object
-    // visibility.
-    unsigned int m_visibilitySerialNumber = 1;
-    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
-    bool m_processingBulkSelect = false;
-
-    //! 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;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Numbering for names.
-    //////////////////////////////////////////////////////////////////////////
-    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;
-
-    bool m_isUpdateVisibilityList;
-
-    uint64 m_currentHideCount;
-
-    bool m_bInReloading;
-    bool m_bSkipObjectUpdate;
-    bool m_bLevelExporting;
-
-    int m_axisHelperHitRadius = 20;
-};
-
-namespace AzToolsFramework
-{
-    //! A component to reflect scriptable commands for the Editor
-    class ObjectManagerFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(ObjectManagerFuncsHandler, "{D79B69EE-A2CC-43C0-AA5C-47DCFCCBC955}")
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-} // namespace AzToolsFramework
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
diff --git a/Code/Sandbox/Editor/Objects/ObjectManagerEventBus.h b/Code/Sandbox/Editor/Objects/ObjectManagerEventBus.h
deleted file mode 100644
index c837dc2fab..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectManagerEventBus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-//////////////////////////////////////////////////////////////////////////
-// EBus to handle object manager events
-//////////////////////////////////////////////////////////////////////////
-namespace AZ
-{
-    class ObjectManagerEvents
-        : public AZ::EBusTraits
-    {
-    public:
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-
-        virtual ~ObjectManagerEvents() = default;
-
-        virtual void OnExportingStarting() {}
-        virtual void OnExportingFinished() {}
-    };
-
-    using ObjectManagerEventBus = AZ::EBus<ObjectManagerEvents>;
-}
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_BUS_H
diff --git a/Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.cpp b/Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.cpp
deleted file mode 100644
index 7cc2bc679c..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ObjectManagerLegacyUndo.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-
-// Editor
-#include "Include/IObjectManager.h"
-#include "Objects/BaseObject.h"
-#include "Objects/ObjectLoader.h"
-#include "Objects/SelectionGroup.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// CUndoBaseObjectNew implementation.
-//////////////////////////////////////////////////////////////////////////
-
-CUndoBaseObjectNew::CUndoBaseObjectNew(CBaseObject* object)
-{
-    m_object = object;
-}
-
-void CUndoBaseObjectNew::Undo(bool bUndo)
-{
-    if (bUndo)
-    {
-        m_redo = XmlHelpers::CreateXmlNode("Redo");
-        // Save current object state.
-        CObjectArchive ar(GetIEditor()->GetObjectManager(), m_redo, false);
-        ar.bUndo = true;
-        m_object->Serialize(ar);
-    }
-
-    // Delete this object.
-    GetIEditor()->DeleteObject(m_object);
-}
-
-void CUndoBaseObjectNew::Redo()
-{
-    if (!m_redo)
-    {
-        return;
-    }
-
-    IObjectManager* objectManager = GetIEditor()->GetObjectManager();
-    {
-        CObjectArchive ar(objectManager, m_redo, true);
-        ar.bUndo = true;
-        ar.MakeNewIds(false);
-        ar.LoadObject(m_redo, m_object);
-    }
-
-    objectManager->ClearSelection();
-    objectManager->SelectObject(m_object);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CUndoBaseObjectDelete implementation.
-//////////////////////////////////////////////////////////////////////////
-
-CUndoBaseObjectDelete::CUndoBaseObjectDelete(CBaseObject* object)
-{
-    AZ_Assert(object, "Object does not exist");
-    object->SetTransformDelegate(nullptr);
-    m_object = object;
-
-    // Save current object state.
-    m_undo = XmlHelpers::CreateXmlNode("Undo");
-    CObjectArchive ar(GetIEditor()->GetObjectManager(), m_undo, false);
-    ar.bUndo = true;
-    m_bSelected = m_object->IsSelected();
-    m_object->Serialize(ar);
-}
-
-void CUndoBaseObjectDelete::Undo([[maybe_unused]] bool bUndo)
-{
-    IObjectManager* objectManager = GetIEditor()->GetObjectManager();
-    {
-        CObjectArchive ar(objectManager, m_undo, true);
-        ar.bUndo = true;
-        ar.MakeNewIds(false);
-        ar.LoadObject(m_undo, m_object);
-        m_object->ClearFlags(OBJFLAG_SELECTED);
-    }
-
-    if (m_bSelected)
-    {
-        objectManager->ClearSelection();
-        objectManager->SelectObject(m_object);
-    }
-}
-
-void CUndoBaseObjectDelete::Redo()
-{
-    // Delete this object.
-    GetIEditor()->DeleteObject(m_object);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CUndoBaseObjectSelect implementation.
-//////////////////////////////////////////////////////////////////////////
-
-CUndoBaseObjectSelect::CUndoBaseObjectSelect(CBaseObject* object)
-{
-    AZ_Assert(object, "Object does not exist");
-    m_guid = object->GetId();
-    m_bUndoSelect = object->IsSelected();
-}
-
-CUndoBaseObjectSelect::CUndoBaseObjectSelect(CBaseObject* object, bool isSelect)
-{
-    AZ_Assert(object, "Object does not exist");
-    m_guid = object->GetId();
-    m_bUndoSelect = !isSelect;
-}
-
-QString CUndoBaseObjectSelect::GetObjectName()
-{
-    CBaseObject* object = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!object)
-    {
-        return "";
-    }
-
-    return object->GetName();
-}
-
-void CUndoBaseObjectSelect::Undo(bool bUndo)
-{
-    CBaseObject* object = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!object)
-    {
-        return;
-    }
-
-    if (bUndo)
-    {
-        m_bRedoSelect = object->IsSelected();
-    }
-
-    if (m_bUndoSelect)
-    {
-        GetIEditor()->GetObjectManager()->SelectObject(object);
-    }
-    else
-    {
-        GetIEditor()->GetObjectManager()->UnselectObject(object);
-    }
-}
-
-void CUndoBaseObjectSelect::Redo()
-{
-    if (CBaseObject* object = GetIEditor()->GetObjectManager()->FindObject(m_guid))
-    {
-        if (m_bRedoSelect)
-        {
-            GetIEditor()->GetObjectManager()->SelectObject(object);
-        }
-        else
-        {
-            GetIEditor()->GetObjectManager()->UnselectObject(object);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CUndoBaseObjectBulkSelect implementation.
-//////////////////////////////////////////////////////////////////////////
-
-CUndoBaseObjectBulkSelect::CUndoBaseObjectBulkSelect(const AZStd::unordered_set<const CBaseObject*>& previousSelection, const CSelectionGroup& selectionGroup)
-{
-    int numSelectedObjects = selectionGroup.GetCount();
-    m_entityIdList.reserve(numSelectedObjects);
-
-    // Populate list of entities to restore selection to 
-    for (int objectIndex = 0; objectIndex < numSelectedObjects; ++objectIndex)
-    {
-        CBaseObject* object = selectionGroup.GetObject(objectIndex);
-
-        // Don't track Undo/Redo for Legacy Objects or entities that were not selected in this step
-        if (object->GetType() != OBJTYPE_AZENTITY || previousSelection.find(object) != previousSelection.end())
-        {
-            continue;
-        }
-
-        AZ::EntityId id;
-        AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(
-            id, 
-            object, 
-            &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
-
-        m_entityIdList.push_back(id);
-    }
-}
-
-void CUndoBaseObjectBulkSelect::Undo(bool bUndo)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    if (!bUndo)
-    {
-        return;
-    }
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::MarkEntitiesDeselected,
-        m_entityIdList);
-}
-
-void CUndoBaseObjectBulkSelect::Redo()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::MarkEntitiesSelected,
-        m_entityIdList);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CUndoBaseObjectClearSelection implementation.
-//////////////////////////////////////////////////////////////////////////
-
-CUndoBaseObjectClearSelection::CUndoBaseObjectClearSelection(const CSelectionGroup& selectionGroup)
-{
-    int numSelectedObjects = selectionGroup.GetCount();
-    m_entityIdList.reserve(numSelectedObjects);
-
-    // Populate list of entities to restore selection to 
-    for (int objectIndex = 0; objectIndex < numSelectedObjects; ++objectIndex)
-    {
-        CBaseObject* object = selectionGroup.GetObject(objectIndex);
-
-        // Don't track Undo/Redo for Legacy Objects
-        if (object->GetType() != OBJTYPE_AZENTITY)
-        {
-            continue;
-        }
-
-        AZ::EntityId id;
-        AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(
-            id, 
-            object, 
-            &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
-
-        m_entityIdList.push_back(id);
-    }
-}
-
-void CUndoBaseObjectClearSelection::Undo(bool bUndo)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    if (!bUndo)
-    {
-        return;
-    }
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities,
-        m_entityIdList);
-}
-
-void CUndoBaseObjectClearSelection::Redo() 
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities,
-        AzToolsFramework::EntityIdList());
-}
diff --git a/Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.h b/Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.h
deleted file mode 100644
index 3f9c5da168..0000000000
--- a/Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "Undo/IUndoObject.h"
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include "Objects/BaseObject.h"
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo New Object
-class CUndoBaseObjectNew
-    : public IUndoObject
-{
-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(); };
-
-    virtual void Undo(bool bUndo) override;
-    virtual void Redo() override;
-
-private:
-    CBaseObjectPtr m_object;
-    TGUIDRemap m_remapping;
-    XmlNodeRef m_redo;
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo Delete Object
-class CUndoBaseObjectDelete
-    : public IUndoObject
-{
-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(); };
-
-    virtual void Undo(bool bUndo) override;
-    virtual void Redo() override;
-
-private:
-    CBaseObjectPtr m_object;
-    XmlNodeRef m_undo;
-    TGUIDRemap m_remapping;
-    bool m_bSelected;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo Select Object
-class CUndoBaseObjectSelect
-    : public IUndoObject
-{
-public:
-    CUndoBaseObjectSelect(CBaseObject* object);
-
-    /**
-    * 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 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; 
-
-    virtual void Undo(bool bUndo) override;
-    virtual void Redo() override;
-
-private:
-    GUID m_guid;
-    bool m_bUndoSelect;
-    bool m_bRedoSelect;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo Select for many Objects
-class CUndoBaseObjectBulkSelect
-    : public IUndoObject
-{
-public:
-    /**
-    * This Undo/Redo command is designed to improve performance of the standard CUndoBaseObjectSelect
-    * command by passing all Select/Deselect commands through the proper Ebuses in one bulk operation instead
-    * of individually.
-    *
-    * This only works with Component Entities. Legacy objects must still use the standard CUndoBaseObjectSelect.
-    *
-    * @param previousSelection the set of objects already selected. This is useful to ensure proper Undo/Redo
-    *        when a user makes a second rectangular selection by holding ctrl
-    * @param selectionGroup The items that will have their selection restored by either an Undo
-    *        or Redo step
-    */
-    CUndoBaseObjectBulkSelect(const AZStd::unordered_set<const CBaseObject*>& previousSelection, const CSelectionGroup& selectionGroup);
-
-protected:
-    int GetSize() override { return sizeof(*this); } // Return size of xml state.
-    QString GetDescription() override { return QObject::tr("Select Objects"); }
-
-    /*
-    * Deselects the objects
-    */
-    void Undo(bool bUndo) override;
-
-    /*
-    * Selects the objects
-    */
-    void Redo() override;
-
-private:
-    // The list of Entity Ids involved in the selection change
-    AzToolsFramework::EntityIdList m_entityIdList;
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo Clear Selection
-class CUndoBaseObjectClearSelection
-    : public IUndoObject
-{
-public:
-    /**
-    * This Undo/Redo command is designed to improve performance of the standard CUndoBaseObjectSelect
-    * command by passing all Select/Deselect commands through the proper Ebuses.
-    *
-    * This only works with Component Entities. Legacy objects must still use the standard CUndoBaseObjectSelect.
-    *
-    * @param selectionGroup The items that will have their selection restored by either an Undo
-    *        or Redo step
-    */
-    CUndoBaseObjectClearSelection(const CSelectionGroup& selectionGroup);
-
-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;
-
-    void Redo() override;
-
-private:
-    // The list of Entity Ids involved in the selection change
-    AzToolsFramework::EntityIdList m_entityIdList;
-};
diff --git a/Code/Sandbox/Editor/Objects/SelectionGroup.cpp b/Code/Sandbox/Editor/Objects/SelectionGroup.cpp
deleted file mode 100644
index 2446b8323d..0000000000
--- a/Code/Sandbox/Editor/Objects/SelectionGroup.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CSelectionGroup implementation.
-
-
-#include "EditorDefs.h"
-
-#include "SelectionGroup.h"
-
-// Editor
-#include "ViewManager.h"
-#include "Include/IObjectManager.h"
-
-#include <IStatObj.h>
-
-//////////////////////////////////////////////////////////////////////////
-CSelectionGroup::CSelectionGroup()
-    : m_ref(1)
-    , m_bVertexSnapped(false)
-{
-    m_LastestMoveSelectionFlag = eMS_None;
-    m_LastestMovedObjectRot.SetIdentity();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::AddObject(CBaseObject* obj)
-{
-    if (!IsContainObject(obj))
-    {
-        m_objects.push_back(obj);
-        m_objectsSet.insert(obj);
-        m_filtered.clear();
-
-        if (obj->GetType() != OBJTYPE_AZENTITY)
-        {
-            m_legacyObjectsSet.insert(obj);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::RemoveObject(CBaseObject* obj)
-{
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        if (*it == obj)
-        {
-            m_objects.erase(it);
-            m_objectsSet.erase(obj);
-            m_legacyObjectsSet.erase(obj);
-            m_filtered.clear();
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::RemoveAll()
-{
-    m_objects.clear();
-    m_objectsSet.clear();
-    m_filtered.clear();
-    m_legacyObjectsSet.clear();
-}
-
-void CSelectionGroup::RemoveAllExceptLegacySet()
-{
-    m_objects.clear();
-    m_objectsSet.clear();
-    m_filtered.clear();
-}
-
-bool CSelectionGroup::IsContainObject(CBaseObject* obj)
-{
-    return (m_objectsSet.find(obj) != m_objectsSet.end());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSelectionGroup::IsEmpty() const
-{
-    return m_objects.empty();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSelectionGroup::SameObjectType()
-{
-    if (IsEmpty())
-    {
-        return false;
-    }
-    CBaseObjectPtr pFirst = (*(m_objects.begin()));
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        if ((*it)->metaObject() != pFirst->metaObject())
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CSelectionGroup::GetCount() const
-{
-    return m_objects.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CSelectionGroup::GetObject(int index) const
-{
-    assert(index >= 0 && index < m_objects.size());
-    return m_objects[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CSelectionGroup::GetObjectByGuid(REFGUID guid) const
-{
-    for (size_t i = 0, count(m_objects.size()); i < count; ++i)
-    {
-        if (m_objects[i]->GetId() == guid)
-        {
-            return m_objects[i];
-        }
-    }
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-std::set<CBaseObjectPtr>& CSelectionGroup::GetLegacyObjects()
-{
-    return m_legacyObjectsSet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Copy(const CSelectionGroup& from)
-{
-    m_name = from.m_name;
-    m_objects = from.m_objects;
-    m_objectsSet = from.m_objectsSet;
-    m_filtered = from.m_filtered;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3    CSelectionGroup::GetCenter() const
-{
-    Vec3 c(0, 0, 0);
-    for (int i = 0; i < GetCount(); i++)
-    {
-        c += GetObject(i)->GetWorldPos();
-    }
-    if (GetCount() > 0)
-    {
-        c /= GetCount();
-    }
-    return c;
-}
-
-//////////////////////////////////////////////////////////////////////////
-AABB CSelectionGroup::GetBounds() const
-{
-    AABB b;
-    AABB box;
-    box.Reset();
-    for (int i = 0; i < GetCount(); i++)
-    {
-        GetObject(i)->GetBoundBox(b);
-        box.Add(b.min);
-        box.Add(b.max);
-    }
-    return box;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::FilterParents()
-{
-    if (!m_filtered.empty())
-    {
-        return;
-    }
-
-    m_filtered.reserve(m_objects.size());
-    for (int i = 0; i < m_objects.size(); i++)
-    {
-        CBaseObject* obj = m_objects[i];
-        CBaseObject* parent = obj->GetParent();
-        bool bParentInSet = false;
-        while (parent)
-        {
-            if (m_objectsSet.find(parent) != m_objectsSet.end())
-            {
-                bParentInSet = true;
-                break;
-            }
-            parent = parent->GetParent();
-        }
-        if (!bParentInSet)
-        {
-            m_filtered.push_back(obj);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[maybe_unused]] int referenceCoordSys, const QPoint& point)
-{
-    // [MichaelS - 17/3/2005] Removed this code from the three edit functions (move,
-    // rotate and scale). This was causing a bug where the render node of objects
-    // was not being updated when objects were dragged away from their position
-    // and then back again, since movement is re-calculated from the initial position
-    // each mouse message (ie first the previous movement is undone and then the
-    // movement is applied). This meant that when moving back to the start position
-    // it appeared like no movement was applied, although it was still necessary to
-    // update the graphics resources. The object transform is explicitly reset
-    // below.
-
-    //if (offset.x == 0 && offset.y == 0 && offset.z == 0)
-    //  return;
-
-    m_bVertexSnapped = false;
-    FilterParents();
-    Vec3 newPos;
-
-    bool bValidFollowGeometryMode(true);
-    if (point.x() == -1 || point.y() == -1)
-    {
-        bValidFollowGeometryMode = false;
-    }
-
-    SRayHitInfo pickedInfo;
-
-    if (moveFlag == eMS_FollowGeometryPosNorm)
-    {
-        if (m_LastestMoveSelectionFlag != eMS_FollowGeometryPosNorm)
-        {
-            if (GetFilteredCount() > 0)
-            {
-                CBaseObject* pObj = GetFilteredObject(0);
-                m_LastestMovedObjectRot = pObj->GetRotation();
-            }
-        }
-    }
-
-    m_LastestMoveSelectionFlag = moveFlag;
-
-    for (int i = 0; i < GetFilteredCount(); i++)
-    {
-        CBaseObject* obj = GetFilteredObject(i);
-
-        if(obj->IsFrozen())
-        {
-            continue;
-        }
-
-        if (i == 0 && moveFlag == eMS_FollowGeometryPosNorm && bValidFollowGeometryMode)
-        {
-            Vec3 zaxis = m_LastestMovedObjectRot * Vec3(0, 0, 1);
-            zaxis.Normalize();
-            Quat nq;
-            nq.SetRotationV0V1(zaxis, pickedInfo.vHitNormal);
-            obj->SetPos(pickedInfo.vHitPos);
-            obj->SetRotation(nq * m_LastestMovedObjectRot);
-            continue;
-        }
-
-        Matrix34 wtm = obj->GetWorldTM();
-        Vec3 wp = wtm.GetTranslation();
-
-        newPos = wp + offset;
-        if (moveFlag == eMS_FollowTerrain)
-        {
-            // Make sure object keeps it height.
-            float height = wp.z - GetIEditor()->GetTerrainElevation(wp.x, wp.y);
-            newPos.z = GetIEditor()->GetTerrainElevation(newPos.x, newPos.y) + height;
-        }
-
-        obj->SetWorldPos(newPos, eObjectUpdateFlags_UserInput | eObjectUpdateFlags_PositionChanged | eObjectUpdateFlags_MoveTool);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::MoveTo(const Vec3& pos, EMoveSelectionFlag moveFlag, int referenceCoordSys, const QPoint& point)
-{
-    FilterParents();
-    if (GetFilteredCount() < 1)
-    {
-        return;
-    }
-
-    CBaseObject* refObj = GetFilteredObject(0);
-    CSelectionGroup::Move(pos - refObj->GetWorldTM().GetTranslation(), moveFlag, referenceCoordSys, point);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Rotate(const Quat& qRot, int referenceCoordSys)
-{
-    Matrix34 rotateTM;
-    rotateTM.SetIdentity();
-    rotateTM = Matrix33(qRot) * rotateTM;
-
-    Rotate(rotateTM, referenceCoordSys);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Rotate(const Ang3& angles, int referenceCoordSys)
-{
-    //if (angles.x == 0 && angles.y == 0 && angles.z == 0)
-    //  return;
-
-    // Rotate selection about selection center.
-    Vec3 center = GetCenter();
-
-    Matrix34 rotateTM = Matrix34::CreateRotationXYZ(DEG2RAD(angles));
-    Rotate(rotateTM, referenceCoordSys);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Rotate(const Matrix34& rotateTM, int referenceCoordSys)
-{
-    // Rotate selection about selection center.
-    Vec3 center = GetCenter();
-
-    Matrix34 ToOrigin = Matrix34::CreateIdentity();
-    Matrix34 FromOrigin = Matrix34::CreateIdentity();
-
-    if (referenceCoordSys != COORDS_LOCAL)
-    {
-        ToOrigin.SetTranslation(-center);
-        FromOrigin.SetTranslation(center);
-
-        if (referenceCoordSys == COORDS_USERDEFINED)
-        {
-            Matrix34 userTM;
-            userTM.SetIdentity();
-            Matrix34 invUserTM = userTM.GetInvertedFast();
-
-            ToOrigin = invUserTM * ToOrigin;
-            FromOrigin = FromOrigin * userTM;
-        }
-    }
-
-    FilterParents();
-
-    for (int i = 0; i < GetFilteredCount(); i++)
-    {
-        CBaseObject* obj = GetFilteredObject(i);
-
-        Matrix34 objectTransform = obj->GetWorldTM();
-        if (referenceCoordSys != COORDS_LOCAL)
-        {
-            if (referenceCoordSys == COORDS_PARENT && obj->GetParent())
-            {
-                Matrix34 parentTM = obj->GetParent()->GetWorldTM();
-                parentTM.OrthonormalizeFast();
-                parentTM.SetTranslation(Vec3(0, 0, 0));
-                Matrix34 invParentTM = parentTM.GetInvertedFast();
-
-                objectTransform = FromOrigin * parentTM * rotateTM * invParentTM * ToOrigin * objectTransform;
-            }
-            else
-            {
-                objectTransform = FromOrigin * rotateTM * ToOrigin * objectTransform;
-            }
-        }
-        else
-        {
-            // Decompose the matrix and reconstruct it to ensure no scaling artifacts are introduced
-            AffineParts affineParts;
-            affineParts.SpectralDecompose(objectTransform);
-
-            Matrix33 rotationMatrix(affineParts.rot);
-            Matrix34 translationMatrix = Matrix34::CreateTranslationMat(affineParts.pos);
-            Matrix33 scaleMatrix = Matrix33::CreateScale(affineParts.scale);
-
-            objectTransform = translationMatrix * rotationMatrix * rotateTM * scaleMatrix;
-        }
-
-        obj->SetWorldTM(objectTransform, eObjectUpdateFlags_UserInput);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Scale(const Vec3& scale, int referenceCoordSys)
-{
-    //if (scale.x == 1 && scale.y == 1 && scale.z == 1)
-    //  return;
-
-    Vec3 scl = scale;
-    if (scl.x == 0)
-    {
-        scl.x = 0.01f;
-    }
-    if (scl.y == 0)
-    {
-        scl.y = 0.01f;
-    }
-    if (scl.z == 0)
-    {
-        scl.z = 0.01f;
-    }
-
-    // Scale selection relative to selection center.
-    Vec3 center = GetCenter();
-
-    Matrix34 scaleTM;
-    scaleTM.SetIdentity();
-    scaleTM = Matrix33::CreateScale(Vec3(scl.x, scl.y, scl.z)) * scaleTM;
-
-    Matrix34 ToOrigin;
-    Matrix34 FromOrigin;
-
-    ToOrigin.SetIdentity();
-    FromOrigin.SetIdentity();
-
-    if (referenceCoordSys != COORDS_LOCAL)
-    {
-        ToOrigin.SetTranslation(-center);
-        FromOrigin.SetTranslation(center);
-    }
-
-    FilterParents();
-
-    for (int i = 0; i < GetFilteredCount(); i++)
-    {
-        CBaseObject* obj = GetFilteredObject(i);
-        Matrix34 m = obj->GetWorldTM();
-
-        if (referenceCoordSys != COORDS_LOCAL)
-        {
-            // Apply new scale
-            m = FromOrigin * scaleTM * ToOrigin * m;
-        }
-        else
-        {
-            // Apply new scale
-            m = m * scaleTM;
-        }
-
-        obj->SetWorldTM(m, eObjectUpdateFlags_UserInput | eObjectUpdateFlags_ScaleTool);
-        obj->InvalidateTM(eObjectUpdateFlags_UserInput | eObjectUpdateFlags_ScaleTool);
-    }
-}
-
-
-void CSelectionGroup::SetScale(const Vec3& scale, int referenceCoordSys)
-{
-    Vec3 relScale = scale;
-
-    if (GetCount() > 0 && GetObject(0))
-    {
-        Vec3 objScale = GetObject(0)->GetScale();
-        if (relScale == objScale && (objScale.x == 0.0f || objScale.y == 0.0f || objScale.z == 0.0f))
-        {
-            return;
-        }
-        relScale = relScale / objScale;
-    }
-
-    Scale(relScale, referenceCoordSys);
-}
-
-
-void CSelectionGroup::StartScaling()
-{
-    for (int i = 0; i < GetFilteredCount(); i++)
-    {
-        CBaseObject* obj = GetFilteredObject(i);
-        obj->StartScaling();
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Align()
-{
-    for (int i = 0; i < GetFilteredCount(); ++i)
-    {
-        bool terrain = false;
-        CBaseObject* obj = GetFilteredObject(i);
-        Vec3 pos = obj->GetPos();
-        Quat rot = obj->GetRotation();
-        QPoint point = GetIEditor()->GetActiveView()->WorldToView(pos);
-        Vec3 normal = GetIEditor()->GetActiveView()->ViewToWorldNormal(point, false, true);
-        pos =   GetIEditor()->GetActiveView()->ViewToWorld(point, &terrain, false, false, true);
-        Vec3 zaxis = rot * Vec3(0, 0, 1);
-        normal.Normalize();
-        zaxis.Normalize();
-        Quat nq;
-        nq.SetRotationV0V1(zaxis, normal);
-        obj->SetRotation(nq * rot);
-        obj->SetPos(pos);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Transform(const Vec3& offset, EMoveSelectionFlag moveFlag, const Ang3& angles, const Vec3& scale, int referenceCoordSys)
-{
-    if (offset != Vec3(0))
-    {
-        Move(offset, moveFlag, referenceCoordSys);
-    }
-
-    if (!(angles == Ang3(ZERO)))
-    {
-        Rotate(angles, referenceCoordSys);
-    }
-
-    if (scale != Vec3(0))
-    {
-        Scale(scale, referenceCoordSys);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::ResetTransformation()
-{
-    FilterParents();
-    Quat qIdentity;
-    qIdentity.SetIdentity();
-    Vec3 vScale(1.0f, 1.0f, 1.0f);
-
-    for (int i = 0, n = GetFilteredCount(); i < n; ++i)
-    {
-        CBaseObject* pObj = GetFilteredObject(i);
-        pObj->SetRotation(qIdentity);
-        pObj->SetScale(vScale);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-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)
-{
-    for (int i = 0; i < m_objects.size(); i++)
-    {
-        CBaseObject* obj = m_objects[i];
-        obj->OnEvent(event);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-ULONG STDMETHODCALLTYPE CSelectionGroup::AddRef()
-{
-    return ++m_ref;
-};
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-ULONG STDMETHODCALLTYPE CSelectionGroup::Release()
-{
-    if ((--m_ref) == 0)
-    {
-        delete this;
-        return 0;
-    }
-    else
-    {
-        return m_ref;
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::IndicateSnappingVertex(DisplayContext& dc) const
-{
-    if (m_bVertexSnapped == false)
-    {
-        return;
-    }
-
-    dc.DepthTestOff();
-
-    ColorB green(0, 255, 0, 255);
-
-    dc.SetColor(green);
-    float fScale = dc.view->GetScreenScaleFactor(m_snapVertex) * 0.005f;
-    Vec3 sz(fScale, fScale, fScale);
-    dc.DrawWireBox(m_snapVertex - sz, m_snapVertex + sz);
-
-    dc.DepthTestOn();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::FinishChanges()
-{
-    Objects selectedObjects(m_objects);
-    int iObjectSize(selectedObjects.size());
-    for (int i = 0; i < iObjectSize; ++i)
-    {
-        CBaseObject* pObject = selectedObjects[i];
-        if (pObject == NULL)
-        {
-            continue;
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Objects/SelectionGroup.h b/Code/Sandbox/Editor/Objects/SelectionGroup.h
deleted file mode 100644
index 9910a5ae2e..0000000000
--- a/Code/Sandbox/Editor/Objects/SelectionGroup.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CSelection group definition.
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_SELECTIONGROUP_H
-#define CRYINCLUDE_EDITOR_OBJECTS_SELECTIONGROUP_H
-#pragma once
-
-
-class CBaseObject;
-
-#include "ObjectEvent.h"
-#include "Objects/BaseObject.h"
-
-/*!
- *  CSelectionGroup is a named selection group of objects.
- */
-class SANDBOX_API CSelectionGroup
-{
-public:
-    CSelectionGroup();
-
-    //! Set name of selection.
-    void SetName(const QString& name) { m_name = name; };
-    //! Get name of selection.
-    const QString& GetName() const { return m_name; };
-
-    //! Adds object into selection list.
-    void AddObject(CBaseObject* obj);
-    //! Remove object from selection list.
-    void RemoveObject(CBaseObject* obj);
-    //! Remove all objects from selection.
-    void RemoveAll();
-    //! Remove all objects from selection except for the LegacyObjects list
-    //! This is used in a performance improvement for deselecting legacy objects
-    void RemoveAllExceptLegacySet();
-    //! Check if object contained in selection list.
-    bool IsContainObject(CBaseObject* obj);
-    //! Return true if selection doesnt contain any object.
-    bool IsEmpty() const;
-    //! Check if all selected objects are of same type
-    bool SameObjectType();
-    //! Number of selected object.
-    int  GetCount() const;
-    //! Get object at given index.
-    CBaseObject* GetObject(int index) const;
-    //! Get object from a GUID
-    CBaseObject* GetObjectByGuid(REFGUID guid) const;
-    //! Get set of legacy objects
-    std::set<CBaseObjectPtr>& GetLegacyObjects();
-
-    //! Get mass center of selected objects.
-    Vec3    GetCenter() const;
-
-    //! Get Bounding box of selection.
-    AABB GetBounds() const;
-
-    void    Copy(const CSelectionGroup& from);
-
-    //! Remove from selection group all objects which have parent also in selection group.
-    //! And save resulting objects to saveTo selection.
-    void    FilterParents();
-    //! Get number of child filtered objects.
-    int GetFilteredCount() const { return m_filtered.size(); }
-    CBaseObject* GetFilteredObject(int i) const { return m_filtered[i]; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Operations on selection group.
-    //////////////////////////////////////////////////////////////////////////
-    enum EMoveSelectionFlag
-    {
-        eMS_None = 0x00,
-        eMS_FollowTerrain = 0x01,
-        eMS_FollowGeometryPosNorm = 0x02
-    };
-    //! Move objects in selection by offset.
-    void Move(const Vec3& offset, EMoveSelectionFlag moveFlag, int referenceCoordSys, const QPoint& point = QPoint(-1, -1));
-    //! Move objects in selection to specific position.
-    void MoveTo(const Vec3& pos, EMoveSelectionFlag moveFlag, int referenceCoordSys, const QPoint& point = QPoint(-1, -1));
-    //! Rotate objects in selection by given quaternion.
-    void Rotate(const Quat& qRot, int referenceCoordSys);
-    //! Rotate objects in selection by given angle.
-    void Rotate(const Ang3& angles, int referenceCoordSys);
-    //! Rotate objects in selection by given rotation matrix.
-    void Rotate(const Matrix34& matRot, int referenceCoordSys);
-    //! Transforms objects
-    void Transform(const Vec3& offset, EMoveSelectionFlag moveFlag, const Ang3& angles, const Vec3& scale, int referenceCoordSys);
-    //! 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
-    void Align();
-    //! 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);
-
-    ULONG STDMETHODCALLTYPE     AddRef();
-    ULONG STDMETHODCALLTYPE     Release();
-
-    void IndicateSnappingVertex(DisplayContext& dc) const;
-    void FinishChanges();
-private:
-    QString m_name;
-    typedef std::vector<TSmartPtr<CBaseObject> > Objects;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Objects m_objects;
-    // Objects set, for fast searches.
-    std::set<CBaseObject*> m_objectsSet;
-
-    // Legacy objects aren't deselected through Ebuses, so keeping a 
-    // separate set for them helps improve performance of deselection
-    std::set<CBaseObjectPtr> m_legacyObjectsSet;
-
-    //! Selection list with child objecs filtered out.
-    std::vector<CBaseObject*> m_filtered;
-
-    bool m_bVertexSnapped;
-    Vec3 m_snapVertex;
-
-    const static int SnappingVertexNumThreshold = 700;
-
-    EMoveSelectionFlag m_LastestMoveSelectionFlag;
-    Quat m_LastestMovedObjectRot;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-protected:
-    ULONG   m_ref;
-};
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_SELECTIONGROUP_H
diff --git a/Code/Sandbox/Editor/Objects/SubObjSelection.cpp b/Code/Sandbox/Editor/Objects/SubObjSelection.cpp
deleted file mode 100644
index 09f1b35d0a..0000000000
--- a/Code/Sandbox/Editor/Objects/SubObjSelection.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SubObjSelection.h"
-
-SSubObjSelOptions g_SubObjSelOptions;
-
-/*
-
-//////////////////////////////////////////////////////////////////////////
-bool CSubObjSelContext::IsEmpty() const
-{
-    if (GetCount() == 0)
-        return false;
-    for (int i = 0; i < GetCount(); i++)
-    {
-        CSubObjectSelection *pSel = GetSelection(i);
-        if (!pSel->IsEmpty())
-            return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSubObjSelContext::ModifySelection( SSubObjSelectionModifyContext &modCtx )
-{
-    for (int n = 0; n < GetCount(); n++)
-    {
-        CSubObjectSelection *pSel = GetSelection(n);
-        if (pSel->IsEmpty())
-            continue;
-        modCtx.pSubObjSelection = pSel;
-        pSel->pGeometry->SubObjSelectionModify( modCtx );
-    }
-    if (modCtx.type == SO_MODIFY_MOVE)
-    {
-        OnSelectionChange();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSubObjSelContext::AcceptModifySelection()
-{
-    for (int n = 0; n < GetCount(); n++)
-    {
-        CSubObjectSelection *pSel = GetSelection(n);
-        if (pSel->IsEmpty())
-            continue;
-        if (pSel->pGeometry)
-            pSel->pGeometry->Update();
-    }
-}
-
-*/
diff --git a/Code/Sandbox/Editor/Objects/SubObjSelection.h b/Code/Sandbox/Editor/Objects/SubObjSelection.h
deleted file mode 100644
index 83471fea6a..0000000000
--- a/Code/Sandbox/Editor/Objects/SubObjSelection.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_SUBOBJSELECTION_H
-#define CRYINCLUDE_EDITOR_OBJECTS_SUBOBJSELECTION_H
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// Sub Object element type.
-//////////////////////////////////////////////////////////////////////////
-enum ESubObjElementType
-{
-    SO_ELEM_NONE = 0,
-    SO_ELEM_VERTEX,
-    SO_ELEM_EDGE,
-    SO_ELEM_FACE,
-    SO_ELEM_POLYGON,
-    SO_ELEM_UV,
-};
-
-//////////////////////////////////////////////////////////////////////////
-enum ESubObjDisplayType
-{
-    SO_DISPLAY_WIREFRAME,
-    SO_DISPLAY_FLAT,
-    SO_DISPLAY_GEOMETRY,
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Options for sub-object selection.
-//////////////////////////////////////////////////////////////////////////
-struct SSubObjSelOptions
-{
-    bool bSelectByVertex;
-    bool bIgnoreBackfacing;
-    int nMatID;
-
-    bool bSoftSelection;
-    float fSoftSelFalloff;
-
-    // Display options.
-    bool bDisplayBackfacing;
-    bool bDisplayNormals;
-    float fNormalsLength;
-    ESubObjDisplayType displayType;
-
-    SSubObjSelOptions()
-    {
-        bSelectByVertex = false;
-        bIgnoreBackfacing = false;
-        bSoftSelection = false;
-        nMatID = 0;
-        fSoftSelFalloff = 1;
-
-        bDisplayBackfacing = true;
-        bDisplayNormals = false;
-        displayType = SO_DISPLAY_FLAT;
-        fNormalsLength = 0.4f;
-    }
-};
-
-extern SSubObjSelOptions g_SubObjSelOptions;
-
-
-//////////////////////////////////////////////////////////////////////////
-enum ESubObjSelectionModifyType
-{
-    SO_MODIFY_UNSELECT,
-    SO_MODIFY_MOVE,
-    SO_MODIFY_ROTATE,
-    SO_MODIFY_SCALE,
-};
-
-//////////////////////////////////////////////////////////////////////////
-// This structure is passed when user is dragging sub object selection.
-//////////////////////////////////////////////////////////////////////////
-struct SSubObjSelectionModifyContext
-{
-    CViewport* view;
-    ESubObjSelectionModifyType type;
-    Vec3 vValue;
-    Matrix34 worldRefFrame;
-};
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_SUBOBJSELECTION_H
diff --git a/Code/Sandbox/Editor/Objects/TrackGizmo.cpp b/Code/Sandbox/Editor/Objects/TrackGizmo.cpp
deleted file mode 100644
index 211db51e0d..0000000000
--- a/Code/Sandbox/Editor/Objects/TrackGizmo.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackGizmo.h"
-
-// Editor
-#include "DisplayContext.h"
-#include "TrackView/TrackViewAnimNode.h"
-#include "AnimationContext.h"
-#include "Maestro/Types/AnimParamType.h"
-#include "Settings.h"
-#include "Viewport.h"
-
-
-#define TRACK_DRAW_Z_OFFSET (0.01f)
-
-//////////////////////////////////////////////////////////////////////////
-// CTrackGizmo implementation.
-//////////////////////////////////////////////////////////////////////////
-#define AXIS_SIZE 0.1f
-
-namespace {
-    int s_highlightAxis = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackGizmo::CTrackGizmo()
-{
-    m_pAnimNode = 0;
-
-    m_worldBbox.min = Vec3(-10000, -10000, -10000);
-    m_worldBbox.max = Vec3(10000, 10000, 10000);
-    m_keysSelected = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackGizmo::~CTrackGizmo()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackGizmo::SetMatrix(const Matrix34& tm)
-{
-    CGizmo::SetMatrix(tm);
-    m_worldBbox.min = Vec3(-10000, -10000, -10000);
-    m_worldBbox.max = Vec3(10000, 10000, 10000);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackGizmo::Display(DisplayContext& dc)
-{
-    if (!(dc.flags & DISPLAY_TRACKS))
-    {
-        return;
-    }
-
-    if (!m_pAnimNode)
-    {
-        return;
-    }
-
-    CAnimationContext* ac = GetIEditor()->GetAnimation();
-
-    // Should have animation sequence.
-    if (!ac->GetSequence())
-    {
-        return;
-    }
-
-    m_keysSelected = false;
-
-    // Must have non empty position track.
-    CTrackViewTrack* pTrack = m_pAnimNode->GetTrackForParameter(AnimParamType::Position);
-    if (!pTrack)
-    {
-        return;
-    }
-
-    int nkeys = pTrack->GetKeyCount();
-    if (nkeys < 2)
-    {
-        return;
-    }
-
-    Range range = ac->GetTimeRange();
-    //range.start = __min(range.end,track->GetKeyTime(0));
-    //range.end = __min(range.end,track->GetKeyTime(nkeys-1));
-    //float step = range.Length() / 100.0f;
-    //step = min(step,0.01f);
-    float step = 0.1f;
-
-    bool bTicks = (dc.flags & DISPLAY_TRACKTICKS) == DISPLAY_TRACKTICKS;
-
-    // Get Spline color.
-    ColorF splineCol(0.5f, 0.3f, 1, 1);
-    ColorF timeCol(0, 1, 0, 1);
-
-    m_worldBbox.Reset();
-
-    float zOffset = TRACK_DRAW_Z_OFFSET;
-    Vec3 p0(0, 0, 0), p1(0, 0, 0);
-    Vec3 tick(0, 0, 0.05f);
-    pTrack->GetValue(range.start, p0);
-    p0 = m_matrix * p0;
-    p0.z += zOffset;
-
-    // Update bounding box.
-    m_worldBbox.Add(p0);
-
-    for (float t = range.start + step; t < range.end; t += step)
-    {
-        p1 = Vec3(0, 0, 0);
-        pTrack->GetValue(t, p1);
-        p1 = m_matrix * p1;
-        p1.z += zOffset;
-
-        // Update bounding box.
-        m_worldBbox.Add(p1);
-
-        if (bTicks)
-        {
-            dc.DrawLine(p0 - tick, p0 + tick, timeCol, timeCol);
-        }
-        dc.DrawLine(p0, p1, splineCol, splineCol);
-        p0 = p1;
-    }
-
-    int nSubTracks = pTrack->GetChildCount();
-    if (nSubTracks > 0)
-    {
-        for (int i = 0; i < nSubTracks; i++)
-        {
-            DrawKeys(dc, pTrack, static_cast<CTrackViewTrack*>(pTrack->GetChild(i)));
-        }
-    }
-    else
-    {
-        DrawKeys(dc, pTrack, pTrack);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackGizmo::SetAnimNode(CTrackViewAnimNode* pNode)
-{
-    m_pAnimNode = pNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackGizmo::GetWorldBounds(AABB& bbox)
-{
-    bbox = m_worldBbox;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackGizmo::DrawAxis(DisplayContext& dc, const Vec3& org)
-{
-    float size = AXIS_SIZE;
-
-    dc.DepthTestOff();
-
-    Vec3 x(size, 0, 0);
-    Vec3 y(0, size, 0);
-    Vec3 z(0, 0, size);
-
-    float fScreenScale = dc.view->GetScreenScaleFactor(org);
-    x = x * fScreenScale;
-    y = y * fScreenScale;
-    z = z * fScreenScale;
-
-    float col[4] = { 1, 1, 1, 1 };
-    float hcol[4] = { 1, 0, 0, 1 };
-    dc.renderer->DrawLabelEx(org + x, 1.2f, col, true, true, "X");
-    dc.renderer->DrawLabelEx(org + y, 1.2f, col, true, true, "Y");
-    dc.renderer->DrawLabelEx(org + z, 1.2f, col, true, true, "Z");
-
-    Vec3 colX(1, 0, 0), colY(0, 1, 0), colZ(0, 0, 1);
-    if (s_highlightAxis)
-    {
-        float col2[4] = { 1, 0, 0, 1 };
-        if (s_highlightAxis == 1)
-        {
-            colX(1, 1, 0);
-            dc.renderer->DrawLabelEx(org + x, 1.2f, col2, true, true, "X");
-        }
-        if (s_highlightAxis == 2)
-        {
-            colY(1, 1, 0);
-            dc.renderer->DrawLabelEx(org + y, 1.2f, col2, true, true, "Y");
-        }
-        if (s_highlightAxis == 3)
-        {
-            colZ(1, 1, 0);
-            dc.renderer->DrawLabelEx(org + z, 1.2f, col2, true, true, "Z");
-        }
-    }
-
-    x = x * 0.8f;
-    y = y * 0.8f;
-    z = z * 0.8f;
-    float fArrowScale = fScreenScale * 0.07f;
-    dc.SetColor(colX);
-    dc.DrawArrow(org, org + x, fArrowScale);
-    dc.SetColor(colY);
-    dc.DrawArrow(org, org + y, fArrowScale);
-    dc.SetColor(colZ);
-    dc.DrawArrow(org, org + z, fArrowScale);
-
-    dc.DepthTestOn();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackGizmo::HitTest([[maybe_unused]] HitContext& hc)
-{
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackGizmo::DrawKeys(DisplayContext& dc, CTrackViewTrack* pTrack, CTrackViewTrack* pKeysTrack)
-{
-    // Get Key color.
-    dc.SetColor(1, 0, 0, 1);
-
-    float zOffset = TRACK_DRAW_Z_OFFSET;
-
-    int nkeys = pKeysTrack->GetKeyCount();
-    for (int i = 0; i < nkeys; i++)
-    {
-        const CTrackViewKeyHandle& keyHandle = pKeysTrack->GetKey(i);
-
-        const float t = keyHandle.GetTime();
-        Vec3 p0(0, 0, 0);
-        pTrack->GetValue(t, p0);
-        p0 = m_matrix * p0;
-        p0.z += zOffset;
-
-        //float sz = 0.01f * dc.view->GetScreenScaleFactor(p0);
-        float sz2 = 0.005f * dc.view->GetScreenScaleFactor(p0);
-
-        // Draw quad.
-        //dc.DrawBall( p0,sz );
-        dc.DrawWireBox(p0 - Vec3(sz2, sz2, sz2), p0 + Vec3(sz2, sz2, sz2));
-
-        if (keyHandle.IsSelected())
-        {
-            m_keysSelected = true;
-            DrawAxis(dc, p0);
-            dc.SetColor(1, 0, 0, 1);
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Objects/TrackGizmo.h b/Code/Sandbox/Editor/Objects/TrackGizmo.h
deleted file mode 100644
index 046cb614ac..0000000000
--- a/Code/Sandbox/Editor/Objects/TrackGizmo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_TRACKGIZMO_H
-#define CRYINCLUDE_EDITOR_OBJECTS_TRACKGIZMO_H
-#pragma once
-
-
-#include "Gizmo.h"
-
-// forward declarations.
-struct DisplayContext;
-class CTrackViewAnimNode;
-class CTrackViewTrack;
-
-/** Gizmo of Objects animation track.
-*/
-class CTrackGizmo
-    : public CGizmo
-{
-public:
-    CTrackGizmo();
-    ~CTrackGizmo();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Overrides from CGizmo
-    //////////////////////////////////////////////////////////////////////////
-    virtual void GetWorldBounds(AABB& bbox);
-    virtual void Display(DisplayContext& dc);
-    virtual bool HitTest(HitContext& hc);
-    virtual void SetMatrix(const Matrix34& tm);
-
-    //////////////////////////////////////////////////////////////////////////
-    void SetAnimNode(CTrackViewAnimNode* pNode);
-    void DrawAxis(DisplayContext& dc, const Vec3& pos);
-
-    void DrawKeys(DisplayContext& dc, CTrackViewTrack* pTrack, CTrackViewTrack* pKeysTrack);
-
-private:
-    CTrackViewAnimNode* m_pAnimNode;
-    AABB m_worldBbox;
-    bool m_keysSelected;
-};
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_TRACKGIZMO_H
diff --git a/Code/Sandbox/Editor/Platform/Android/editor_android.cmake b/Code/Sandbox/Editor/Platform/Android/editor_android.cmake
deleted file mode 100644
index 11f7f0d6b9..0000000000
--- a/Code/Sandbox/Editor/Platform/Android/editor_android.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
diff --git a/Code/Sandbox/Editor/Platform/Android/editor_lib_android.cmake b/Code/Sandbox/Editor/Platform/Android/editor_lib_android.cmake
deleted file mode 100644
index 11f7f0d6b9..0000000000
--- a/Code/Sandbox/Editor/Platform/Android/editor_lib_android.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
diff --git a/Code/Sandbox/Editor/Platform/Common/Clang/editor_lib_clang.cmake b/Code/Sandbox/Editor/Platform/Common/Clang/editor_lib_clang.cmake
deleted file mode 100644
index cd5ac335ed..0000000000
--- a/Code/Sandbox/Editor/Platform/Common/Clang/editor_lib_clang.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(LY_COMPILE_OPTIONS PRIVATE -fexceptions)
diff --git a/Code/Sandbox/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake b/Code/Sandbox/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake
deleted file mode 100644
index 245ceb198b..0000000000
--- a/Code/Sandbox/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-ly_add_source_properties(
-    SOURCES MainWindow.cpp CryEdit.cpp
-    PROPERTY COMPILE_OPTIONS
-    VALUES -bigobj
-)
diff --git a/Code/Sandbox/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp b/Code/Sandbox/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp
deleted file mode 100644
index 3d152e93c2..0000000000
--- a/Code/Sandbox/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Send Mail.
-
-
-#include "EditorDefs.h"
-
-#include "Util/Mailer.h"
-
-bool CMailer::SendMail(const char* subject,
-    const char* messageBody,
-    const std::vector<const char*>& _recipients,
-    const std::vector<const char*>& _attachments,
-    bool bShowDialog)
-{
-    return true;
-}
diff --git a/Code/Sandbox/Editor/Platform/Linux/editor_core_files_linux.cmake b/Code/Sandbox/Editor/Platform/Linux/editor_core_files_linux.cmake
deleted file mode 100644
index c438d42e11..0000000000
--- a/Code/Sandbox/Editor/Platform/Linux/editor_core_files_linux.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    
-)
diff --git a/Code/Sandbox/Editor/Platform/Linux/editor_lib_linux.cmake b/Code/Sandbox/Editor/Platform/Linux/editor_lib_linux.cmake
deleted file mode 100644
index 11f7f0d6b9..0000000000
--- a/Code/Sandbox/Editor/Platform/Linux/editor_lib_linux.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
diff --git a/Code/Sandbox/Editor/Platform/Linux/editor_linux.cmake b/Code/Sandbox/Editor/Platform/Linux/editor_linux.cmake
deleted file mode 100644
index 11f7f0d6b9..0000000000
--- a/Code/Sandbox/Editor/Platform/Linux/editor_linux.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
diff --git a/Code/Sandbox/Editor/Platform/Linux/platform_linux_files.cmake b/Code/Sandbox/Editor/Platform/Linux/platform_linux_files.cmake
deleted file mode 100644
index 5293b5b7df..0000000000
--- a/Code/Sandbox/Editor/Platform/Linux/platform_linux_files.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    ../../Core/QtEditorApplication_linux.cpp
-    ../Common/Unimplemented/Util/Mailer_Unimplemented.cpp
-)
diff --git a/Code/Sandbox/Editor/Platform/Mac/editor_core_files_mac.cmake b/Code/Sandbox/Editor/Platform/Mac/editor_core_files_mac.cmake
deleted file mode 100644
index 49b128b2c2..0000000000
--- a/Code/Sandbox/Editor/Platform/Mac/editor_core_files_mac.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    ../../QtUI/ColorButton_mac.mm
-)
diff --git a/Code/Sandbox/Editor/Platform/Mac/editor_lib_mac.cmake b/Code/Sandbox/Editor/Platform/Mac/editor_lib_mac.cmake
deleted file mode 100644
index 0363e17774..0000000000
--- a/Code/Sandbox/Editor/Platform/Mac/editor_lib_mac.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-find_library(IOKIT_LIBRARY IOKit)
-
-set(LY_BUILD_DEPENDENCIES
-    PRIVATE
-        ${IOKIT_LIBRARY}
-)
diff --git a/Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake b/Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake
deleted file mode 100644
index 523c180397..0000000000
--- a/Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-# Set resources directory for app icons
-target_sources(Editor PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Images.xcassets)
-set_target_properties(Editor PROPERTIES
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_LIST_DIR}/gui_info.plist
-    RESOURCE ${CMAKE_CURRENT_LIST_DIR}/Images.xcassets
-    XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME EditorAppIcon
-)
diff --git a/Code/Sandbox/Editor/Platform/Mac/platform_mac_files.cmake b/Code/Sandbox/Editor/Platform/Mac/platform_mac_files.cmake
deleted file mode 100644
index 09845ae3d4..0000000000
--- a/Code/Sandbox/Editor/Platform/Mac/platform_mac_files.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    ../../Core/QtEditorApplication_mac.mm
-    ../../LogFile_mac.mm
-    ../../WindowObserver_mac.h
-    ../../WindowObserver_mac.mm
-    ../../MainWindow_mac.mm
-    ../../RenderViewport_mac.mm
-    ../Common/Unimplemented/Util/Mailer_Unimplemented.cpp
-)
diff --git a/Code/Sandbox/Editor/Platform/Windows/Util/Mailer_Windows.cpp b/Code/Sandbox/Editor/Platform/Windows/Util/Mailer_Windows.cpp
deleted file mode 100644
index e97cd5d1cc..0000000000
--- a/Code/Sandbox/Editor/Platform/Windows/Util/Mailer_Windows.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Send Mail.
-
-
-#include "EditorDefs.h"
-
-#include "Util/Mailer.h"
-
-#include <mapi.h>
-
-
-bool CMailer::SendMail(const char* subject,
-    const char* messageBody,
-    const std::vector<const char*>& _recipients,
-    const std::vector<const char*>& _attachments,
-    bool bShowDialog)
-{
-    // Preserve directory, (Can be changed if attachment specified)
-    WCHAR dir[MAX_PATH];
-    GetCurrentDirectoryW(sizeof(dir), dir);
-
-    // Load MAPI dll
-    HMODULE hMAPILib = LoadLibraryA("MAPI32.DLL");
-    LPMAPISENDMAIL lpfnMAPISendMail = (LPMAPISENDMAIL) GetProcAddress(hMAPILib, "MAPISendMail");
-
-    int numRecipients  = (int)_recipients.size();
-
-    // Handle Attachments
-    MapiFileDesc* attachments = new MapiFileDesc[_attachments.size()];
-
-    int i = 0;
-    for (unsigned int k = 0; k < _attachments.size(); k++)
-    {
-        FILE* file = nullptr;
-        azfopen(&file, _attachments[k], "r");
-        if (!file)
-        {
-            continue;
-        }
-        fclose(file);
-
-        attachments[i].ulReserved   = 0;
-        attachments[i].flFlags      = 0;
-        attachments[i].nPosition    = (ULONG)-1;
-        attachments[i].lpszPathName = (char*)(const char*)_attachments[k];
-        attachments[i].lpszFileName = NULL;
-        attachments[i].lpFileType   = NULL;
-        i++;
-    }
-    int numAttachments = i;
-
-    // Handle Recipients
-    MapiRecipDesc* recipients = new MapiRecipDesc[numRecipients];
-
-    std::vector<string> addresses;
-    addresses.resize(numRecipients);
-    for (i = 0; i < numRecipients; i++)
-    {
-        addresses[i] = string("SMTP:") + _recipients[i];
-    }
-
-    for (i = 0; i < numRecipients; i++)
-    {
-        recipients[i].ulReserved   = 0;
-        recipients[i].ulRecipClass = MAPI_TO;
-        recipients[i].lpszName     = (char*)(const char*)_recipients[i];
-        recipients[i].lpszAddress  = (char*)addresses[i].c_str();
-        recipients[i].ulEIDSize    = 0;
-        recipients[i].lpEntryID    = NULL;
-    }
-
-    MapiMessage message;
-    memset(&message, 0, sizeof(message));
-    message.lpszSubject = (char*)(const char*)subject;
-    message.lpszNoteText = (char*)(const char*)messageBody;
-    message.lpszMessageType = NULL;
-
-    message.nRecipCount = numRecipients;
-    message.lpRecips = recipients;
-
-    message.nFileCount = numAttachments;
-    message.lpFiles = attachments;
-
-
-    //Next, the client calls the MAPISendMail function and stores the return status so it can detect whether the call succeeded. You should use a more sophisticated error reporting mechanism than the C library function printf.
-
-    FLAGS flags = bShowDialog ? MAPI_DIALOG : 0;
-    flags |= MAPI_LOGON_UI;
-    ULONG err = (*lpfnMAPISendMail)(0L,           // use implicit session.
-            0L,      // ulUIParam; 0 is always valid
-            &message, // the message being sent
-            flags,   // if user allowed to edit the message
-            0L);     // reserved; must be 0
-    delete [] attachments;
-    delete [] recipients;
-
-    FreeLibrary(hMAPILib);   // Free DLL module through handle
-
-    // Restore previous directory.
-    SetCurrentDirectoryW(dir);
-
-    if (err != SUCCESS_SUCCESS)
-    {
-        return false;
-    }
-
-    return true;
-}
-
diff --git a/Code/Sandbox/Editor/Platform/Windows/editor_core_files_windows.cmake b/Code/Sandbox/Editor/Platform/Windows/editor_core_files_windows.cmake
deleted file mode 100644
index c438d42e11..0000000000
--- a/Code/Sandbox/Editor/Platform/Windows/editor_core_files_windows.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    
-)
diff --git a/Code/Sandbox/Editor/Platform/Windows/editor_lib_windows.cmake b/Code/Sandbox/Editor/Platform/Windows/editor_lib_windows.cmake
deleted file mode 100644
index 30503258bc..0000000000
--- a/Code/Sandbox/Editor/Platform/Windows/editor_lib_windows.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
diff --git a/Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake b/Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake
deleted file mode 100644
index 30503258bc..0000000000
--- a/Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
diff --git a/Code/Sandbox/Editor/Platform/Windows/platform_windows_files.cmake b/Code/Sandbox/Editor/Platform/Windows/platform_windows_files.cmake
deleted file mode 100644
index 70e7d818a3..0000000000
--- a/Code/Sandbox/Editor/Platform/Windows/platform_windows_files.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Util/Mailer_Windows.cpp
-)
diff --git a/Code/Sandbox/Editor/Platform/iOS/editor_ios.cmake b/Code/Sandbox/Editor/Platform/iOS/editor_ios.cmake
deleted file mode 100644
index 11f7f0d6b9..0000000000
--- a/Code/Sandbox/Editor/Platform/iOS/editor_ios.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
diff --git a/Code/Sandbox/Editor/Platform/iOS/editor_lib_ios.cmake b/Code/Sandbox/Editor/Platform/iOS/editor_lib_ios.cmake
deleted file mode 100644
index 11f7f0d6b9..0000000000
--- a/Code/Sandbox/Editor/Platform/iOS/editor_lib_ios.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
diff --git a/Code/Sandbox/Editor/Plugin.cpp b/Code/Sandbox/Editor/Plugin.cpp
deleted file mode 100644
index f6724d1e44..0000000000
--- a/Code/Sandbox/Editor/Plugin.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "Plugin.h"
-
-// Editor
-#include "Include/IViewPane.h"
-
-
-CClassFactory* CClassFactory::s_pInstance = nullptr;
-CAutoRegisterClassHelper* CAutoRegisterClassHelper::s_pFirst = nullptr;
-CAutoRegisterClassHelper* CAutoRegisterClassHelper::s_pLast = nullptr;
-
-CClassFactory::CClassFactory()
-{
-    m_classes.reserve(100);
-    RegisterAutoTypes();
-}
-
-CClassFactory::~CClassFactory()
-{
-    for (int i = 0; i < m_classes.size(); i++)
-    {
-        m_classes[i]->Release();
-    }
-}
-
-void CClassFactory::RegisterAutoTypes()
-{
-    CAutoRegisterClassHelper* pClass = CAutoRegisterClassHelper::s_pFirst;
-
-    while (pClass)
-    {
-        RegisterClass(pClass->m_pClassDesc);
-        pClass = pClass->m_pNext;
-    }
-}
-
-CClassFactory* CClassFactory::Instance()
-{
-    if (!s_pInstance)
-    {
-        s_pInstance = new CClassFactory;
-    }
-
-    return s_pInstance;
-}
-
-void CClassFactory::RegisterClass(IClassDesc* pClassDesc)
-{
-    assert(pClassDesc);
-
-    auto findByGuid = m_guidToClass.find(pClassDesc->ClassID());
-
-    if (findByGuid != m_guidToClass.end())
-    {
-        // you may not re-use UUIDs!
-        // this can happen when someone makes a new plugin or downloads one
-        // where the author copied and pasted code.  This can also happen if two DLLs exist which are actually the same plugin
-        // either way, give info if you can:
-        char errorMessageBuffer[512] = { 0 };
-        AZ::Uuid newUUID(pClassDesc->ClassID());
-        char existingUUIDString[64] = { 0 };
-        newUUID.ToString(existingUUIDString, 64, true, true);
-
-        sprintf_s(errorMessageBuffer, 512,
-            "Error registering class '%s' -  UUID of that class already exists (%s), and belongs to class named '%s.'\n"
-            "You may not have duplicate class identifiers.\n"
-            "Check for duplicate plugins or copy and pasted code for plugins that duplicates UUIDs returned.",
-            pClassDesc->ClassName().toUtf8().data(),
-            existingUUIDString,
-            findByGuid->second->ClassName().toUtf8().data());
-
-        CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate UUID", MB_OK);
-        return;
-    }
-
-    auto findByName = m_nameToClass.find(pClassDesc->ClassName());
-    if (findByName != m_nameToClass.end())
-    {
-        // you may not re-use names, either!
-        char errorMessageBuffer[512] = { 0 };
-
-        AZ::Uuid newUUID(pClassDesc->ClassID());
-        char newUUIDString[64] = { 0 };
-        newUUID.ToString(newUUIDString, 64, true, true);
-
-        AZ::Uuid existingUUID(findByName->second->ClassID());
-        char existingUUIDString[64] = { 0 };
-        existingUUID.ToString(existingUUIDString, 64, true, true);
-
-        sprintf_s(errorMessageBuffer, 512,
-            "Error registering class '%s' - that name is already taken by a different class.\n"
-            "New class's UUID is %s\n"
-            "Existing class's UUID is %s\n"
-            "You may not have duplicate class names.\n"
-            "Check for duplicate plugins or copy and pasted code for plugins.",
-            pClassDesc->ClassName().toUtf8().constData(),
-            newUUIDString,
-            existingUUIDString);
-
-        CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate Class Name", MB_OK);
-        return;
-    }
-
-#if defined(DEBUG_CLASS_NAME_REGISTRATION)
-    m_debugClassNames.push_back(pClassDesc->ClassName());
-#endif // DEBUG_CLASS_NAME_REGISTRATION
-
-    m_classes.push_back(pClassDesc);
-    m_guidToClass[pClassDesc->ClassID()] = pClassDesc;
-    m_nameToClass[pClassDesc->ClassName()] = pClassDesc;
-}
-
-IClassDesc* CClassFactory::FindClass(const char* pClassName) const
-{
-    IClassDesc* pClassDesc = stl::find_in_map(m_nameToClass, pClassName, (IClassDesc*)nullptr);
-
-    if (pClassDesc)
-    {
-        return pClassDesc;
-    }
-
-    const char* pSubClassName = strstr(pClassName, "::");
-
-    if (!pSubClassName)
-    {
-        return NULL;
-    }
-
-    QString name = QString(pClassName).left(pSubClassName - pClassName);
-
-    return stl::find_in_map(m_nameToClass, name, (IClassDesc*)nullptr);
-}
-
-IClassDesc* CClassFactory::FindClass(const GUID& rClassID) const
-{
-    IClassDesc* pClassDesc = stl::find_in_map(m_guidToClass, rClassID, (IClassDesc*)nullptr);
-
-    return pClassDesc;
-}
-
-IViewPaneClass* CClassFactory::FindViewPaneClassByTitle(const char* pPaneTitle) const
-{
-    for (size_t i = 0; i < m_classes.size(); i++)
-    {
-        IViewPaneClass* viewPane = nullptr;
-        IClassDesc* desc = m_classes[i];
-        if (SUCCEEDED(desc->QueryInterface(__uuidof(IViewPaneClass), (void**)&viewPane)))
-        {
-            if (QString::compare(viewPane->GetPaneTitle(), pPaneTitle) == 0)
-            {
-                return viewPane;
-            }
-        }
-    }
-    return nullptr;
-}
-
-void CClassFactory::UnregisterClass(const char* pClassName)
-{
-    IClassDesc* pClassDesc = FindClass(pClassName);
-
-    if (pClassDesc == NULL)
-    {
-        return;
-    }
-
-#if defined(DEBUG_CLASS_NAME_REGISTRATION)
-    stl::find_and_erase(m_debugClassNames, pClassDesc->ClassName());
-#endif // DEBUG_CLASS_NAME_REGISTRATION
-
-    stl::find_and_erase(m_classes, pClassDesc);
-    stl::member_find_and_erase(m_guidToClass, pClassDesc->ClassID());
-    stl::member_find_and_erase(m_nameToClass, pClassDesc->ClassName());
-}
-
-void CClassFactory::UnregisterClass(const GUID& rClassID)
-{
-    IClassDesc* pClassDesc = FindClass(rClassID);
-
-    if (!pClassDesc)
-    {
-        return;
-    }
-
-#if defined(DEBUG_CLASS_NAME_REGISTRATION)
-    stl::find_and_erase(m_debugClassNames, pClassDesc->ClassName());
-#endif // DEBUG_CLASS_NAME_REGISTRATION
-
-    stl::find_and_erase(m_classes, pClassDesc);
-    stl::member_find_and_erase(m_guidToClass, pClassDesc->ClassID());
-    stl::member_find_and_erase(m_nameToClass, pClassDesc->ClassName());
-}
-
-bool ClassDescNameCompare(IClassDesc* pArg1, IClassDesc* pArg2)
-{
-    return (QString::compare(pArg1->ClassName(), pArg2->ClassName(), Qt::CaseInsensitive) < 0);
-}
-
-void CClassFactory::GetClassesBySystemID(ESystemClassID aSystemClassID, std::vector<IClassDesc*>& rOutClasses)
-{
-    rOutClasses.clear();
-
-    for (size_t i = 0; i < m_classes.size(); ++i)
-    {
-        if (m_classes[i]->SystemClassID() == aSystemClassID)
-        {
-            rOutClasses.push_back(m_classes[i]);
-        }
-    }
-
-    std::sort(rOutClasses.begin(), rOutClasses.end(), ClassDescNameCompare);
-}
-
-void CClassFactory::GetClassesByCategory(const char* pCategory, std::vector<IClassDesc*>& rOutClasses)
-{
-    rOutClasses.clear();
-
-    for (size_t i = 0; i < m_classes.size(); ++i)
-    {
-        if (!QString::compare(pCategory, m_classes[i]->Category(), Qt::CaseInsensitive))
-        {
-            rOutClasses.push_back(m_classes[i]);
-        }
-    }
-
-    std::sort(rOutClasses.begin(), rOutClasses.end(), ClassDescNameCompare);
-}
diff --git a/Code/Sandbox/Editor/Plugin.h b/Code/Sandbox/Editor/Plugin.h
deleted file mode 100644
index 1da0be8f63..0000000000
--- a/Code/Sandbox/Editor/Plugin.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2001-2012
-// -------------------------------------------------------------------------
-//  Created:     15/1/2003 by Timur.
-//  Description: Plugin architecture supporting classes
-//
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_EDITOR_PLUGIN_H
-#define CRYINCLUDE_EDITOR_PLUGIN_H
-#include "Include/IEditorClassFactory.h"
-
-#include "Util/GuidUtil.h"
-
-//! Derive from this class to decrease the amount of work for creating a new class description
-//! Provides standard reference counter implementation for IUnknown
-class CRefCountClassDesc
-    : public IClassDesc
-{
-public:
-    virtual ~CRefCountClassDesc() { }
-    HRESULT STDMETHODCALLTYPE QueryInterface([[maybe_unused]] const IID& riid, [[maybe_unused]] void** ppvObj)
-    {
-        return E_NOINTERFACE;
-    }
-
-    ULONG STDMETHODCALLTYPE AddRef()
-    {
-        ++m_nRefCount;
-        return m_nRefCount;
-    }
-
-    ULONG STDMETHODCALLTYPE Release()
-    {
-        int refs = m_nRefCount;
-
-        if (--m_nRefCount <= 0)
-        {
-            delete this;
-        }
-
-        return refs;
-    }
-
-private:
-    int m_nRefCount;
-};
-
-
-// Use this for debugging unregistration problems.
-//#define DEBUG_CLASS_NAME_REGISTRATION
-
-
-//! Class factory is a common repository of all registered plugin classes,
-//! Classes here can found by their class ID or all classes of given system class retrieved
-class CRYEDIT_API CClassFactory
-    : public IEditorClassFactory
-{
-public:
-    CClassFactory();
-    ~CClassFactory();
-
-    //! Access class factory singleton.
-    static CClassFactory* Instance();
-    //! Register a new class to the factory
-    void RegisterClass(IClassDesc* pClassDesc);
-    //! Find class in the factory by class name
-    IClassDesc* FindClass(const char* className) const;
-    //! Find class in the factory by class ID
-    IClassDesc* FindClass(const GUID& rClassID) const;
-    //! Find View Pane Class in the factory by pane title
-    IViewPaneClass* FindViewPaneClassByTitle(const char* pPaneTitle) const;
-    void UnregisterClass(const char* pClassName);
-    void UnregisterClass(const GUID& rClassID);
-    //! Get classes matching specific requirements ordered alphabetically by name.
-    void GetClassesBySystemID(ESystemClassID aSystemClassID, std::vector<IClassDesc*>& rOutClasses);
-    void GetClassesByCategory(const char* pCategory, std::vector<IClassDesc*>& rOutClasses);
-
-private:
-    void RegisterAutoTypes();
-
-    typedef std::map<QString, IClassDesc*> TNameMap;
-    typedef std::map<GUID, IClassDesc*, guid_less_predicate> TGuidMap;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    TNameMap m_nameToClass;
-    TGuidMap m_guidToClass;
-    std::vector<IClassDesc*> m_classes;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-#if defined(DEBUG_CLASS_NAME_REGISTRATION)
-    // This vector will mirror that of CClassFactory::m_classes.
-    // When a class description is destroyed without being unregistered first
-    // (i.e. from within plugins is a common scenario) you will get a crash
-    // in ~CClassFactory as it's Releasing m_classes.
-    // When you hit that crash, take the index and look into this vector at
-    // the class name.  That class did not unregister before it was released.
-    std::vector<string> m_debugClassNames;
-#endif // DEBUG_CLASS_NAME_REGISTRATION
-
-    static CClassFactory* s_pInstance;
-};
-
-//! Auto registration for classes
-class CAutoRegisterClassHelper
-{
-public:
-    CAutoRegisterClassHelper(IClassDesc* pClassDesc)
-    {
-        m_pClassDesc = pClassDesc;
-        m_pNext = 0;
-
-        if (!s_pLast)
-        {
-            s_pFirst = this;
-        }
-        else
-        {
-            s_pLast->m_pNext = this;
-        }
-
-        s_pLast = this;
-    }
-
-    IClassDesc* m_pClassDesc;
-    CAutoRegisterClassHelper* m_pNext;
-    static CAutoRegisterClassHelper* s_pFirst;
-    static CAutoRegisterClassHelper* s_pLast;
-};
-
-// Use this define to automatically register a new class description.
-#define REGISTER_CLASS_DESC(ClassDesc) \
-    CAutoRegisterClassHelper g_AutoRegHelper##ClassDesc(new ClassDesc);
-
-#define REGISTER_QT_CLASS_DESC(ClassDesc, name, category) \
-    CAutoRegisterClassHelper g_AutoRegHelper##ClassDesc(new CQtViewClass<ClassDesc>(name, category));
-
-#define REGISTER_QT_CLASS_DESC_SYSTEM_ID(ClassDesc, name, category, systemid) \
-    CAutoRegisterClassHelper g_AutoRegHelper##ClassDesc(new CQtViewClass<ClassDesc>(name, category, systemid));
-
-#endif // CRYINCLUDE_EDITOR_PLUGIN_H
diff --git a/Code/Sandbox/Editor/PluginManager.cpp b/Code/Sandbox/Editor/PluginManager.cpp
deleted file mode 100644
index 4093440366..0000000000
--- a/Code/Sandbox/Editor/PluginManager.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "PluginManager.h"
-
-// Qt
-#include <QLibrary>
-
-// Editor
-#include "Include/IPlugin.h"
-
-
-typedef IPlugin* (* TPfnCreatePluginInstance)(PLUGIN_INIT_PARAM* pInitParam);
-typedef void (* TPfnQueryPluginSettings)(SPluginSettings&);
-
-CPluginManager::CPluginManager()
-{
-    m_currentUUID = 0;
-}
-
-CPluginManager::~CPluginManager()
-{
-    ReleaseAllPlugins();
-    UnloadAllPlugins();
-}
-
-
-void CPluginManager::ReleaseAllPlugins()
-{
-    CLogFile::WriteLine("[Plugin Manager] Releasing all previous plugins");
-
-    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
-    {
-        if (it->pPlugin)
-        {
-            it->pPlugin->Release();
-            it->pPlugin = nullptr;
-        }
-    }
-
-    m_pluginEventMap.clear();
-    m_uuidPluginMap.clear();
-}
-
-void CPluginManager::UnloadAllPlugins()
-{
-    CLogFile::WriteLine("[Plugin Manager] Unloading all previous plugins");
-
-    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
-    {
-        if (it->pPlugin)
-        {
-            it->pPlugin->Release();
-            it->pPlugin = nullptr;
-        }
-
-        if (it->hLibrary)
-        {
-            it->hLibrary->unload();
-            delete it->hLibrary;
-        }
-    }
-
-    m_plugins.clear();
-    m_pluginEventMap.clear();
-    m_uuidPluginMap.clear();
-}
-
-
-namespace
-{
-    IPlugin* SafeCallFactory(
-        TPfnCreatePluginInstance pfnFactory,
-        PLUGIN_INIT_PARAM* pInitParam,
-        const char* szFilePath)
-    {
-        IPlugin* pIPlugin = pfnFactory(pInitParam);
-        if (!pIPlugin)
-        {
-            if (AZ::Debug::Trace::IsDebuggerPresent())
-            {
-                AZ::Debug::Trace::Break();
-            }
-            CLogFile::FormatLine("Can't initialize plugin '%s'! Possible binary version incompatibility. Please reinstall this plugin.", szFilePath);
-        }
-
-        return pIPlugin;
-    }
-}
-
-namespace
-{
-    struct SPlugin
-    {
-        QString m_path;
-        QString m_name;
-    };
-
-    // This does a topological sort on the plugin list. It will also remove plugins that have
-    // missing dependencies or there is a cycle in the dependency tree.
-    void SortPluginsByDependency(std::list<SPlugin>& plugins)
-    {
-        std::list<SPlugin> finalList;
-        std::set<QString, stl::less_stricmp<QString> > loadedPlugins;
-
-        while (!plugins.empty())
-        {
-            for (auto iter = plugins.begin(); iter != plugins.end(); )
-            {
-                finalList.push_back(*iter);
-                loadedPlugins.insert(iter->m_name);
-                iter = plugins.erase(iter);
-            }
-        }
-        plugins = finalList;
-    }
-}
-
-bool CPluginManager::LoadPlugins(const char* pPathWithMask)
-{
-    QString strPath = QtUtil::ToQString(PathUtil::GetPath(pPathWithMask));
-    QString strMask = QString::fromUtf8(PathUtil::GetFile(pPathWithMask));
-
-    CLogFile::WriteLine("[Plugin Manager] Loading plugins...");
-
-    if (!QFileInfo::exists(strPath))
-    {
-        CLogFile::FormatLine("[Plugin Manager] Cannot find plugin directory '%s'", strPath.toUtf8().data());
-        return false;
-    }
-
-    std::list<SPlugin> plugins;
-    {
-        // LY_EDITOR_PLUGINS is defined by the CMakeLists.txt. The editor plugins add themselves to a variable that
-        // the editor uses to pass it to the build. Once a plugin is deleted, it will stop being in such variable producing
-        // the editor to not load that plugin anymore, even if it is in the output folder.
-#if defined(LY_EDITOR_PLUGINS)
-        QDir qPath(strPath);
-        AZStd::vector<AZStd::string> tokens;
-        AZ::StringFunc::Tokenize(AZStd::string_view(LY_EDITOR_PLUGINS), tokens, ',');
-        for (const AZStd::string& token : tokens)
-        {
-            SPlugin plugin;
-            plugin.m_name = QString(token.c_str());
-            plugin.m_path = qPath.absoluteFilePath(plugin.m_name);
-            plugins.push_back(plugin);
-        }
-#endif
-    }
-    if (plugins.size() == 0)
-    {
-        CLogFile::FormatLine("[Plugin Manager] Cannot find any plugins in plugin directory '%s'", strPath.toUtf8().data());
-        return false;
-    }
-
-    // Sort plugins by dependency
-    SortPluginsByDependency(plugins);
-
-    for (auto iter = plugins.begin(); iter != plugins.end(); ++iter)
-    {
-        // Load the plugin's DLL
-        QLibrary *hPlugin = new QLibrary(iter->m_path);
-        hPlugin->setLoadHints(QLibrary::DeepBindHint);
-
-        AZStd::string pathUtf8(iter->m_path.toUtf8().constData());
-
-        if (!hPlugin->load())
-        {
-            AZStd::string errorMsg(hPlugin->errorString().toUtf8().constData());
-            CLogFile::FormatLine("[Plugin Manager] Can't load plugin DLL '%s' message '%s' !", pathUtf8.c_str(), errorMsg.c_str());
-            delete hPlugin;
-            continue;
-        }
-
-        // Open 3D Engine:
-        // Query the plugin settings, check for manual load...
-        TPfnQueryPluginSettings pfnQuerySettings = reinterpret_cast<TPfnQueryPluginSettings>(hPlugin->resolve("QueryPluginSettings"));
-
-        if (pfnQuerySettings != nullptr)
-        {
-            SPluginSettings settings {
-                0
-            };
-            pfnQuerySettings(settings);
-            if (!settings.autoLoad)
-            {
-                CLogFile::FormatLine("[Plugin Manager] Skipping plugin DLL '%s' because it is marked as non-autoLoad!", pathUtf8.c_str());
-                hPlugin->unload();
-                delete hPlugin;
-                continue;
-            }
-        }
-
-        // Query the factory pointer
-        TPfnCreatePluginInstance pfnFactory = reinterpret_cast<TPfnCreatePluginInstance>(hPlugin->resolve("CreatePluginInstance"));
-
-        if (!pfnFactory)
-        {
-            CLogFile::FormatLine("[Plugin Manager] Cannot query plugin DLL '%s' factory pointer (is it a Sandbox plugin?)", pathUtf8.c_str());
-            hPlugin->unload();
-            delete hPlugin;
-            continue;
-        }
-
-        IPlugin* pPlugin = NULL;
-        PLUGIN_INIT_PARAM sInitParam =
-        {
-            GetIEditor(),
-            SANDBOX_PLUGIN_SYSTEM_VERSION,
-            IPlugin::eError_None
-        };
-
-        // Create an instance of the plugin
-        pPlugin = SafeCallFactory(pfnFactory, &sInitParam, iter->m_path.toUtf8().data());
-        if (!pPlugin)
-        {
-            CLogFile::FormatLine("[Plugin Manager] Cannot initialize plugin '%s'! Possible binary version incompatibility. Please reinstall this plugin.", pathUtf8.c_str());
-            assert(pPlugin);
-            hPlugin->unload();
-            delete hPlugin;
-            continue;
-        }
-
-        if (!pPlugin)
-        {
-            if (sInitParam.outErrorCode == IPlugin::eError_VersionMismatch)
-            {
-                CLogFile::FormatLine("[Plugin Manager] Cannot create instance of plugin DLL '%s'! Version mismatch. Please update the plugin.", pathUtf8.c_str());
-            }
-            else
-            {
-                CLogFile::FormatLine("[Plugin Manager] Cannot create instance of plugin DLL '%s'! Error code %u.", pathUtf8.c_str(), sInitParam.outErrorCode);
-            }
-
-            hPlugin->unload();
-            delete hPlugin;
-
-            continue;
-        }
-
-        RegisterPlugin(hPlugin, pPlugin);
-
-        // Write log string about plugin
-        CLogFile::FormatLine("[Plugin Manager] Successfully loaded plugin '%s', version '%i' (GUID: %s)",
-            pPlugin->GetPluginName(), pPlugin->GetPluginVersion(), pPlugin->GetPluginGUID());
-    }
-
-    return true;
-}
-
-void CPluginManager::RegisterPlugin(QLibrary* dllHandle, IPlugin* pPlugin)
-{
-    SPluginEntry entry;
-
-    entry.hLibrary = dllHandle;
-    entry.pPlugin = pPlugin;
-    m_plugins.push_back(entry);
-    m_uuidPluginMap[m_currentUUID] = pPlugin;
-    ++m_currentUUID;
-}
-
-IPlugin* CPluginManager::GetPluginByGUID(const char* pGUID)
-{
-    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
-    {
-        const char* pPluginGuid = it->pPlugin->GetPluginGUID();
-
-        if (pPluginGuid && !strcmp(pPluginGuid, pGUID))
-        {
-            return it->pPlugin;
-        }
-    }
-
-    return NULL;
-}
-
-IPlugin* CPluginManager::GetPluginByUIID(uint8 iUserInterfaceID)
-{
-    TUIIDPluginIt it;
-
-    it = m_uuidPluginMap.find(iUserInterfaceID);
-
-    if (it == m_uuidPluginMap.end())
-    {
-        return NULL;
-    }
-
-    return (*it).second;
-}
-
-IUIEvent* CPluginManager::GetEventByIDAndPluginID(uint8 aPluginID, uint8 aEventID)
-{
-    // Return the event interface of a user interface element which is
-    // specified by its ID and the user interface ID of the plugin which
-    // created the UI element
-
-    IPlugin* pPlugin = NULL;
-    TEventHandlerIt eventIt;
-    TPluginEventIt pluginIt;
-
-    pPlugin = GetPluginByUIID(aPluginID);
-
-    if (!pPlugin)
-    {
-        return NULL;
-    }
-
-    pluginIt = m_pluginEventMap.find(pPlugin);
-
-    if (pluginIt == m_pluginEventMap.end())
-    {
-        return NULL;
-    }
-
-    eventIt = (*pluginIt).second.find(aEventID);
-
-    if (eventIt == (*pluginIt).second.end())
-    {
-        return NULL;
-    }
-
-    return (*eventIt).second;
-}
-
-bool CPluginManager::CanAllPluginsExitNow()
-{
-    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
-    {
-        if (it->pPlugin)
-        {
-            if (!it->pPlugin->CanExitNow())
-            {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-void CPluginManager::AddHandlerForCmdID(IPlugin* pPlugin, uint8 aCmdID, IUIEvent* pEvent)
-{
-    m_pluginEventMap[pPlugin][aCmdID] = pEvent;
-}
-
-void CPluginManager::NotifyPlugins(EEditorNotifyEvent aEventId)
-{
-    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it)
-    {
-        if (it->pPlugin)
-        {
-            it->pPlugin->OnEditorNotify(aEventId);
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/PluginManager.h b/Code/Sandbox/Editor/PluginManager.h
deleted file mode 100644
index 2cd0841f08..0000000000
--- a/Code/Sandbox/Editor/PluginManager.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2001-2012.
-// -------------------------------------------------------------------------
-//  Description: The plugin manager, central point for loading/unloading plugins
-//
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_EDITOR_PLUGINMANAGER_H
-#define CRYINCLUDE_EDITOR_PLUGINMANAGER_H
-
-class QLibrary;
-struct IPlugin;
-
-struct SPluginEntry
-{
-    QLibrary *hLibrary = nullptr;
-    IPlugin* pPlugin = nullptr;
-};
-
-typedef std::list<SPluginEntry> TPluginList;
-
-// Event IDs associated with event handlers
-typedef std::map<int, IUIEvent*> TEventHandlerMap;
-typedef TEventHandlerMap::iterator TEventHandlerIt;
-
-// Plugins associated with ID / handler maps
-typedef std::map<IPlugin*, TEventHandlerMap> TPluginEventMap;
-typedef TPluginEventMap::iterator TPluginEventIt;
-
-// UI IDs associated with plugin pointers. When a plugin UI element is
-// activated, the ID is used to determine which plugin should handle
-// the event
-typedef std::map<uint8, IPlugin*> TUIIDPluginMap;
-typedef TUIIDPluginMap::iterator TUIIDPluginIt;
-
-class SANDBOX_API CPluginManager
-{
-public:
-    CPluginManager();
-    virtual ~CPluginManager();
-
-    bool LoadPlugins(const char* pPathWithMask);
-
-    // release all plugins (ie, call Release() on them) - but don't drop their DLL
-    void ReleaseAllPlugins();
-
-    // actually drop their DLL.
-    void UnloadAllPlugins();
-
-    bool CanAllPluginsExitNow();
-    void AddHandlerForCmdID(IPlugin* pPlugin, uint8 aCmdID, IUIEvent* pEvent);
-    void NotifyPlugins(EEditorNotifyEvent aEventId);
-
-    IPlugin* GetPluginByGUID(const char* pGUID);
-    IPlugin* GetPluginByUIID(uint8 iUserInterfaceID);
-    IUIEvent* GetEventByIDAndPluginID(uint8 iPluginID, uint8 iEvtID);
-    void RegisterPlugin(QLibrary* dllHandle, IPlugin* pPlugin);
-    const TPluginList& GetPluginList() const
-    {
-        return m_plugins;
-    }
-
-protected:
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    TPluginList m_plugins;
-    TPluginEventMap m_pluginEventMap;
-    TUIIDPluginMap m_uuidPluginMap;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    int m_currentUUID;
-};
-#endif // CRYINCLUDE_EDITOR_PLUGINMANAGER_H
diff --git a/Code/Sandbox/Editor/PreferencesStdPages.cpp b/Code/Sandbox/Editor/PreferencesStdPages.cpp
deleted file mode 100644
index f15dc02595..0000000000
--- a/Code/Sandbox/Editor/PreferencesStdPages.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "PreferencesStdPages.h"
-
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-
-// Editor
-#include "EditorPreferencesPageGeneral.h"
-#include "EditorPreferencesPageFiles.h"
-#include "EditorPreferencesPageViewportGeneral.h"
-#include "EditorPreferencesPageViewportGizmo.h"
-#include "EditorPreferencesPageViewportMovement.h"
-#include "EditorPreferencesPageViewportDebug.h"
-#include "EditorPreferencesPageExperimentalLighting.h"
-#include "EditorPreferencesPageAWS.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// Implementation of ClassDesc for standard Editor preferences.
-//////////////////////////////////////////////////////////////////////////
-
-CStdPreferencesClassDesc::CStdPreferencesClassDesc()
-    : m_refCount(0)
-{
-    m_pageCreators = {
-        [](){ return new CEditorPreferencesPage_General(); },
-        [](){ return new CEditorPreferencesPage_Files(); },
-        [](){ return new CEditorPreferencesPage_ViewportGeneral(); },
-        [](){ return new CEditorPreferencesPage_ViewportMovement(); },
-        [](){ return new CEditorPreferencesPage_ViewportGizmo(); },
-        [](){ return new CEditorPreferencesPage_ViewportDebug(); }
-    };
-
-    m_pageCreators.push_back([]() { return new CEditorPreferencesPage_ExperimentalLighting(); });
-
-    if (AzToolsFramework::IsComponentWithServiceRegistered(AZ_CRC_CE("AWSCoreEditorService")))
-    {
-        m_pageCreators.push_back([]() { return new CEditorPreferencesPage_AWS(); });
-    }
-}
-
-HRESULT CStdPreferencesClassDesc::QueryInterface(const IID& riid, void** ppvObj)
-{
-    if (riid == __uuidof(IPreferencesPageCreator))
-    {
-        *ppvObj = (IPreferencesPageCreator*)this;
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-ULONG CStdPreferencesClassDesc::AddRef()
-{
-    m_refCount++;
-    return m_refCount;
-};
-
-//////////////////////////////////////////////////////////////////////////
-ULONG CStdPreferencesClassDesc::Release()
-{
-    ULONG refs = --m_refCount;
-    if (m_refCount <= 0)
-    {
-        delete this;
-    }
-    return refs;
-}
-
-//////////////////////////////////////////////////////////////////////////
-REFGUID CStdPreferencesClassDesc::ClassID()
-{
-    // {95FE3251-796C-4e3b-82F0-AD35F7FFA267}
-    static const GUID guid = {
-        0x95fe3251, 0x796c, 0x4e3b, { 0x82, 0xf0, 0xad, 0x35, 0xf7, 0xff, 0xa2, 0x67 }
-    };
-    return guid;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CStdPreferencesClassDesc::GetPagesCount()
-{
-    return m_pageCreators.size();
-}
-
-IPreferencesPage* CStdPreferencesClassDesc::CreateEditorPreferencesPage(int index)
-{
-    return (index >= m_pageCreators.size()) ? nullptr : m_pageCreators[index]();
-}
-
diff --git a/Code/Sandbox/Editor/PreferencesStdPages.h b/Code/Sandbox/Editor/PreferencesStdPages.h
deleted file mode 100644
index e3b0779d0c..0000000000
--- a/Code/Sandbox/Editor/PreferencesStdPages.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_PREFERENCESSTDPAGES_H
-#define CRYINCLUDE_EDITOR_PREFERENCESSTDPAGES_H
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/std/functional.h>
-#include <AzCore/std/containers/vector.h>
-
-//////////////////////////////////////////////////////////////////////////
-class CStdPreferencesClassDesc
-    : public IPreferencesPageClassDesc
-    , public IPreferencesPageCreator
-{
-    ULONG m_refCount;
-    AZStd::vector< AZStd::function< IPreferencesPage*() > > m_pageCreators;
-public:
-    CStdPreferencesClassDesc();
-    virtual ~CStdPreferencesClassDesc() = default;
-
-    //////////////////////////////////////////////////////////////////////////
-    // IUnkown implementation.
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(const IID& riid, void** ppvObj);
-    virtual ULONG STDMETHODCALLTYPE AddRef();
-    virtual ULONG STDMETHODCALLTYPE Release();
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual REFGUID ClassID();
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual int GetPagesCount();
-    virtual IPreferencesPage* CreateEditorPreferencesPage(int index) override;
-};
-
-#endif // CRYINCLUDE_EDITOR_PREFERENCESSTDPAGES_H
-
diff --git a/Code/Sandbox/Editor/ProcessInfo.cpp b/Code/Sandbox/Editor/ProcessInfo.cpp
deleted file mode 100644
index c7298ed07e..0000000000
--- a/Code/Sandbox/Editor/ProcessInfo.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ProcessInfo.h"
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-#include <mach/mach.h>
-#endif
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include "Psapi.h"
-void UnloadPSApi();
-
-typedef BOOL (WINAPI * GetProcessMemoryInfoProc)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD);
-
-static HMODULE                                  g_hPSAPI = 0;
-static GetProcessMemoryInfoProc g_pGetProcessMemoryInfo = 0;
-#endif // AZ_PLATFORM_WINDOWS
-
-CProcessInfo::CProcessInfo(void)
-{
-}
-
-CProcessInfo::~CProcessInfo(void)
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    UnloadPSApi();
-#endif
-}
-
-#if defined(AZ_PLATFORM_WINDOWS)
-void LoadPSApi()
-{
-    if (!g_hPSAPI)
-    {
-        g_hPSAPI = LoadLibraryA("psapi.dll");
-
-        if (g_hPSAPI)
-        {
-            g_pGetProcessMemoryInfo = (GetProcessMemoryInfoProc)GetProcAddress(g_hPSAPI, "GetProcessMemoryInfo");
-        }
-    }
-}
-
-void UnloadPSApi()
-{
-    if (g_hPSAPI)
-    {
-        FreeLibrary(g_hPSAPI);
-        g_hPSAPI = 0;
-        g_pGetProcessMemoryInfo = 0;
-    }
-}
-#endif
-
-void CProcessInfo::QueryMemInfo(ProcessMemInfo& meminfo)
-{
-    memset(&meminfo, 0, sizeof(ProcessMemInfo));
-#if defined(AZ_PLATFORM_WINDOWS)
-    LoadPSApi();
-
-    if (!g_pGetProcessMemoryInfo)
-    {
-        return;
-    }
-
-    PROCESS_MEMORY_COUNTERS pc;
-    HANDLE hProcess = GetCurrentProcess();
-    pc.cb = sizeof(pc);
-    g_pGetProcessMemoryInfo(hProcess, &pc, sizeof(pc));
-
-    meminfo.WorkingSet = pc.WorkingSetSize;
-    meminfo.PeakWorkingSet = pc.PeakWorkingSetSize;
-    meminfo.PagefileUsage = pc.PagefileUsage;
-    meminfo.PeakPagefileUsage = pc.PeakPagefileUsage;
-    meminfo.PageFaultCount = pc.PageFaultCount;
-#elif AZ_TRAIT_OS_PLATFORM_APPLE
-    task_basic_info basic_info;
-    mach_msg_type_number_t size = sizeof(basic_info);
-    kern_return_t kerr = task_info(mach_task_self(), TASK_BASIC_INFO, reinterpret_cast<task_info_t>(&basic_info), &size);
-    if (kerr == KERN_SUCCESS)
-    {
-        meminfo.WorkingSet = basic_info.resident_size;
-        meminfo.PagefileUsage = basic_info.virtual_size;
-    }
-    task_events_info events_info;
-    size = sizeof(events_info);
-    kerr = task_info(mach_task_self(), TASK_EVENTS_INFO, reinterpret_cast<task_info_t>(&events_info), &size);
-    if (kerr == KERN_SUCCESS)
-    {
-        meminfo.PageFaultCount = events_info.faults;
-    }
-#endif
-}
diff --git a/Code/Sandbox/Editor/ProcessInfo.h b/Code/Sandbox/Editor/ProcessInfo.h
deleted file mode 100644
index 4fa7487323..0000000000
--- a/Code/Sandbox/Editor/ProcessInfo.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_PROCESSINFO_H
-#define CRYINCLUDE_EDITOR_PROCESSINFO_H
-
-#pragma once
-
-/** Stores information about memory usage of process, retrieved from CProcessInfo class.
-        All size values are in bytes.
-*/
-struct ProcessMemInfo
-{
-    int64 WorkingSet;
-    int64 PeakWorkingSet;
-    int64 PagefileUsage;
-    int64 PeakPagefileUsage;
-    int64 PageFaultCount;
-};
-
-/** Use this class to query information about current process.
-        Like memory usage, pagefile usage etc..
-*/
-class SANDBOX_API CProcessInfo
-{
-public:
-    CProcessInfo(void);
-    ~CProcessInfo(void);
-
-    /** Retrieve information about memory usage of current process.
-            @param meminfo Output parameter where information is saved.
-    */
-    static void QueryMemInfo(ProcessMemInfo& meminfo);
-};
-
-#endif // CRYINCLUDE_EDITOR_PROCESSINFO_H
diff --git a/Code/Sandbox/Editor/PythonEditorEventsBus.h b/Code/Sandbox/Editor/PythonEditorEventsBus.h
deleted file mode 100644
index 49a18b69f2..0000000000
--- a/Code/Sandbox/Editor/PythonEditorEventsBus.h
+++ /dev/null
@@ -1,168 +0,0 @@
-#pragma once
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/std/any.h>
-
-namespace AzToolsFramework
-{
-    /**
-    * This bus can be used to send commands to the editor.
-    */
-    class EditorLayerPythonRequests
-        : public AZ::ComponentBus
-    {
-    public:
-
-        /*
-        * Gets a CVar value as a string.
-        */
-        virtual const char* GetCVar(const char* pName) = 0;
-
-        /*
-        * Sets a CVar value from any simple value.
-        */
-        virtual void SetCVar(const char* pName, const AZStd::any& value) = 0;
-
-        /*
-        * Sets a CVar value from a string.
-        */
-        virtual void SetCVarFromString(const char* pName, const char* pValue) = 0;
-
-        /*
-        * Sets a CVar value from an integer.
-        */
-        virtual void SetCVarFromInteger(const char* pName, int pValue) = 0;
-
-        /*
-        * Sets a CVar value from a float.
-        */
-        virtual void SetCVarFromFloat(const char* pName, float pValue) = 0;
-
-        /*
-        * Runs a console command.
-        */
-        virtual void PyRunConsole(const char* text) = 0;
-
-        /*
-        * Enters the editor game mode.
-        */
-        virtual void EnterGameMode() = 0;
-
-        /*
-        * Queries if it's in the game mode or not.
-        */
-        virtual bool IsInGameMode() = 0;
-
-        /*
-        * Exits the editor game mode.
-        */
-        virtual void ExitGameMode() = 0;
-
-        /*
-        * Enters the editor AI/Physics simulation mode.
-        */
-        virtual void EnterSimulationMode() = 0;
-
-        /*
-        * Queries if the editor is currently in the AI/Physics simulation mode or not.
-        */
-        virtual bool IsInSimulationMode() = 0;
-
-        /*
-        * Exits the editor AI/Physics simulation mode.
-        */
-        virtual void ExitSimulationMode() = 0;
-
-        /*
-        * Runs a script file. A relative path from the editor user folder or an absolute path should be given as an argument.
-        */
-        virtual void RunFile(const char* pFile) = 0;
-
-        /*
-        * Runs a script file with parameters. A relative path from the editor user folder or an absolute path should be given as an argument. The arguments should be separated by whitespace.
-        */
-        virtual void RunFileParameters(const char* pFile, const char* pArguments) = 0;
-
-        /*
-        * Executes a given string as an editor command.
-        */
-        virtual void ExecuteCommand(const char* cmdline) = 0;
-
-        /*
-        * Shows a confirmation message box with ok|cancel and shows a custom message.
-        */
-        virtual bool MessageBoxOkCancel(const char* pMessage) = 0;
-
-        /*
-        * Shows a confirmation message box with yes|no and shows a custom message.
-        */
-        virtual bool MessageBoxYesNo(const char* pMessage) = 0;
-
-        /*
-        * Shows a confirmation message box with only ok and shows a custom message.
-        */
-        virtual bool MessageBoxOk(const char* pMessage) = 0;
-
-        /*
-        * Shows an edit box and returns the value as string.
-        */
-        virtual AZStd::string EditBox(AZStd::string_view pTitle) = 0;
-
-        /*
-        * Shows an edit box and checks the custom value to use the return value with other functions correctly.
-        */
-        virtual AZStd::any EditBoxCheckDataType(const char* pTitle) = 0;
-
-        /*
-        * Shows an open file box and returns the selected file path and name.
-        */
-        virtual AZStd::string OpenFileBox() = 0;
-
-        /*
-        * Gets axis.
-        */
-        virtual const char* GetAxisConstraint() = 0;
-
-        /*
-        * Sets axis.
-        */
-        virtual void SetAxisConstraint(AZStd::string_view pConstrain) = 0;
-
-        /*
-        * Finds a pak file name for a given file.
-        */
-        virtual const char* GetPakFromFile(const char* filename) = 0;
-
-        /*
-        * Prints the message to the editor console window.
-        */
-        virtual void Log(const char* pMessage) = 0;
-
-        /*
-        * Undoes the last operation.
-        */
-        virtual void Undo() = 0;
-
-        /*
-        * Redoes the last undone operation.
-        */
-        virtual void Redo() = 0;
-
-        /*
-        * Shows a 2d label on the screen at the given position and given color.
-        */
-        virtual void DrawLabel(int x, int y, float size, float r, float g, float b, float a, const char* pLabel) = 0;
-
-        /*
-        * Shows a combo box listing each value passed in, returns string value selected by the user.
-        */
-        virtual AZStd::string ComboBox(AZStd::string title, AZStd::vector<AZStd::string> values, int selectedIdx = 0) = 0;
-    };
-    using EditorLayerPythonRequestBus = AZ::EBus<EditorLayerPythonRequests>;
-}
diff --git a/Code/Sandbox/Editor/PythonEditorFuncs.cpp b/Code/Sandbox/Editor/PythonEditorFuncs.cpp
deleted file mode 100644
index da5bf73552..0000000000
--- a/Code/Sandbox/Editor/PythonEditorFuncs.cpp
+++ /dev/null
@@ -1,1196 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "PythonEditorFuncs.h"
-
-// Qt
-#include <QMessageBox>
-#include <QFileDialog>
-
-#include <AzCore/Utils/Utils.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-
-// Editor
-#include "CryEdit.h"
-#include "GameEngine.h"
-#include "ViewManager.h"
-#include "StringDlg.h"
-#include "GenericSelectItemDialog.h"
-#include "Objects/BaseObject.h"
-#include "Commands/CommandManager.h"
-
-
-namespace
-{
-    //////////////////////////////////////////////////////////////////////////
-    const char* PyGetCVar(const char* pName)
-    {
-        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
-        if (!pCVar)
-        {
-            Warning("PyGetCVar: Attempt to access non-existent CVar '%s'", pName ? pName : "(null)");
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid cvar.").toUtf8().data());
-        }
-        return pCVar->GetString();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    const char* PyGetCVarAsString(const char* pName)
-    {
-        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
-        if (!pCVar)
-        {
-            AZ_Warning("editor", false, "PyGetCVar: Attempt to access non-existent CVar '%s'", pName ? pName : "(null)");
-            return "(missing)";
-        }
-        return pCVar->GetString();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // forward declarations
-    void PySetCVarFromInt(const char* pName, int pValue);
-    void PySetCVarFromFloat(const char* pName, float pValue);
-
-    //////////////////////////////////////////////////////////////////////////
-    void PySetCVarFromString(const char* pName, const char* pValue)
-    {
-        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
-        if (!pCVar)
-        {
-            AZ_Warning("editor", false, "Attempt to set non-existent string CVar '%s'", pName ? pName : "(null)");
-        }
-        else if (pCVar->GetType() == CVAR_INT)
-        {
-            PySetCVarFromInt(pName, std::stol(pValue));
-        }
-        else if (pCVar->GetType() == CVAR_FLOAT)
-        {
-            PySetCVarFromFloat(pName, std::stod(pValue));
-        }
-        else if (pCVar->GetType() != CVAR_STRING)
-        {
-            AZ_Warning("editor", false, "Type mismatch while assigning CVar '%s' as a string.", pName ? pName : "(null)");
-        }
-        else
-        {
-            pCVar->Set(pValue);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PySetCVarFromInt(const char* pName, int pValue)
-    {
-        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
-        if (!pCVar)
-        {
-            AZ_Warning("editor", false, "Attempt to set non-existent integer CVar '%s'", pName ? pName : "(null)");
-        }
-        else if (pCVar->GetType() == CVAR_FLOAT)
-        {
-            PySetCVarFromFloat(pName, float(pValue));
-        }
-        else if (pCVar->GetType() == CVAR_STRING)
-        {
-            auto stringValue = AZStd::to_string(pValue);
-            PySetCVarFromString(pName, stringValue.c_str());
-        }
-        else if (pCVar->GetType() != CVAR_INT)
-        {
-            AZ_Warning("editor", false, "Type mismatch while assigning CVar '%s' as an integer.", pName ? pName : "(null)");
-        }
-        else
-        {
-            pCVar->Set(pValue);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PySetCVarFromFloat(const char* pName, float pValue)
-    {
-        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
-        if (!pCVar)
-        {
-            AZ_Warning("editor", false, "Attempt to set non-existent float CVar '%s'", pName ? pName : "(null)");
-        }
-        else if (pCVar->GetType() == CVAR_INT)
-        {
-            PySetCVarFromInt(pName, static_cast<int>(pValue));
-        }
-        else if (pCVar->GetType() == CVAR_STRING)
-        {
-            auto stringValue = AZStd::to_string(pValue);
-            PySetCVarFromString(pName, stringValue.c_str());
-        }
-        else if (pCVar->GetType() != CVAR_FLOAT)
-        {
-            AZ_Warning("editor", false, "Type mismatch while assigning CVar '%s' as a float.", pName ? pName : "(null)");
-        }
-        else
-        {
-            pCVar->Set(pValue);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PySetCVarFromAny(const char* pName, const AZStd::any& value)
-    {
-        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
-        if (!pCVar)
-        {
-            AZ_Warning("editor", false, "Attempt to set non-existent float CVar '%s'", pName ? pName : "(null)");
-        }
-        else if (pCVar->GetType() == CVAR_INT)
-        {
-            PySetCVarFromInt(pName, AZStd::any_cast<AZ::s64>(value));
-        }
-        else if (pCVar->GetType() == CVAR_FLOAT)
-        {
-            PySetCVarFromFloat(pName, AZStd::any_cast<double>(value));
-        }
-        else if (pCVar->GetType() == CVAR_STRING)
-        {
-            PySetCVarFromString(pName, AZStd::any_cast<AZStd::string_view>(value).data());
-        }
-        else
-        {
-            AZ_Warning("editor", false, "Type mismatch while assigning CVar '%s' as a float.", pName ? pName : "(null)");
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PyEnterGameMode()
-    {
-        if (GetIEditor()->GetGameEngine())
-        {
-            GetIEditor()->GetGameEngine()->RequestSetGameMode(true);
-        }
-    }
-
-    void PyExitGameMode()
-    {
-        if (GetIEditor()->GetGameEngine())
-        {
-            GetIEditor()->GetGameEngine()->RequestSetGameMode(false);
-        }
-    }
-
-    bool PyIsInGameMode()
-    {
-        return GetIEditor()->IsInGameMode();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PyEnterSimulationMode()
-    {
-        if (!GetIEditor()->IsInSimulationMode())
-        {
-            CCryEditApp::instance()->OnSwitchPhysics();
-        }
-    }
-
-    void PyExitSimulationMode()
-    {
-        if (GetIEditor()->IsInSimulationMode())
-        {
-            CCryEditApp::instance()->OnSwitchPhysics();
-        }
-    }
-
-    bool PyIsInSimulationMode()
-    {
-        return GetIEditor()->IsInSimulationMode();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    QString PyNewObject(const char* typeName, const char* fileName, const char* name, float x, float y, float z)
-    {
-        CBaseObject* object = GetIEditor()->NewObject(typeName, fileName, name, x, y, z);
-        if (object)
-        {
-            return object->GetName();
-        }
-        else
-        {
-            return "";
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    QString PyNewObjectAtCursor(const char* typeName, const char* fileName, const char* name)
-    {
-        CUndo undo("Create new object");
-
-        Vec3 pos(0, 0, 0);
-
-        QPoint p = QCursor::pos();
-        CViewport* viewport = GetIEditor()->GetViewManager()->GetViewportAtPoint(p);
-        if (viewport)
-        {
-            viewport->ScreenToClient(p);
-            if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
-            {
-                pos = viewport->MapViewToCP(p);
-            }
-            else
-            {
-                // Snap to terrain.
-                bool hitTerrain;
-                pos = viewport->ViewToWorld(p, &hitTerrain);
-                if (hitTerrain)
-                {
-                    pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y) + 1.0f;
-                }
-                pos = viewport->SnapToGrid(pos);
-            }
-        }
-
-        return PyNewObject(typeName, fileName, name, pos.x, pos.y, pos.z);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PyRunConsole(const char* text)
-    {
-        GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(text);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    bool GetPythonScriptPath(const char* pFile, QString& path)
-    {
-        bool bRelativePath = true;
-        char drive[_MAX_DRIVE];
-        char fdir[_MAX_DIR];
-        char fname[_MAX_FNAME];
-        char fext[_MAX_EXT];
-        drive[0] = '\0';
-
-        _splitpath_s(pFile, drive, fdir, fname, fext);
-        if (strlen(drive) != 0)
-        {
-            bRelativePath = false;
-        }
-
-        if (bRelativePath)
-        {
-            // Try to open from user folder
-            QString userSandboxFolder = Path::GetResolvedUserSandboxFolder();
-            Path::ConvertBackSlashToSlash(userSandboxFolder);
-            path = userSandboxFolder + pFile;
-
-            // If not found try editor folder
-            if (!CFileUtil::FileExists(path))
-            {
-                AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
-                QDir engineDir = !engineRoot.empty() ? QDir(QString(engineRoot.c_str())) : QDir::current();
-
-                QString scriptFolder = engineDir.absoluteFilePath("Assets/Editor/Scripts/");
-                Path::ConvertBackSlashToSlash(scriptFolder);
-                path = scriptFolder + pFile;
-
-                if (!CFileUtil::FileExists(path))
-                {
-                    QString error = QString("Could not find '%1'\n in '%2'\n or '%3'\n").arg(pFile).arg(userSandboxFolder).arg(scriptFolder);
-                    AZ_Warning("python", false, error.toUtf8().data());
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            path = pFile;
-            if (!CFileUtil::FileExists(path))
-            {
-                QString error = QString("Could not find '") + pFile + "'\n";
-                AZ_Warning("python", false, error.toUtf8().data());
-                return false;
-            }
-        }
-
-        Path::ConvertBackSlashToSlash(path);
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void GetPythonArgumentsVector(const char* pArguments, QStringList& inputArguments)
-    {
-        if (pArguments == NULL)
-        {
-            return;
-        }
-
-        inputArguments = QString(pArguments).split(" ", Qt::SkipEmptyParts);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PyRunFileWithParameters(const char* pFile, const char* pArguments)
-    {
-        QString path;
-        QStringList inputArguments;
-        GetPythonArgumentsVector(pArguments, inputArguments);
-        if (GetPythonScriptPath(pFile, path))
-        {
-            AZStd::vector<AZStd::string_view> argList;
-            argList.reserve(inputArguments.size() + 1);
-            QByteArray p = path.toUtf8();
-
-            QVector<QByteArray> argData;
-            argData.reserve(inputArguments.count());
-            for (auto iter = inputArguments.begin(); iter != inputArguments.end(); ++iter)
-            {
-                argData.push_back(iter->toLatin1());
-                argList.push_back(argData.last().data());
-            }
-            using namespace AzToolsFramework;
-            EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, p.data(), argList);
-        }
-    }
-
-    void PyRunFile(const char* pFile)
-    {
-        PyRunFileWithParameters(pFile, nullptr);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PyExecuteCommand(const char* cmdline)
-    {
-        GetIEditor()->GetCommandManager()->Execute(cmdline);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PyLog(const char* pMessage)
-    {
-        if (strcmp(pMessage, "") != 0)
-        {
-            CryLogAlways(pMessage);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    bool PyMessageBox(const char* pMessage)
-    {
-        return QMessageBox::information(QApplication::activeWindow(), QString(), pMessage, QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok;
-    }
-
-    bool PyMessageBoxYesNo(const char* pMessage)
-    {
-        return QMessageBox::question(QApplication::activeWindow(), QString(), pMessage) == QMessageBox::Yes;
-    }
-
-    bool PyMessageBoxOK(const char* pMessage)
-    {
-        return QMessageBox::information(QApplication::activeWindow(), QString(), pMessage) == QMessageBox::Ok;
-    }
-
-    AZStd::string PyEditBox(AZStd::string_view pTitle)
-    {
-        StringDlg stringDialog(pTitle.data());
-        if (stringDialog.exec() == QDialog::Accepted)
-        {
-            return stringDialog.GetString().toUtf8().constData();
-        }
-        return "";
-    }
-
-    AZStd::any PyEditBoxAndCheckProperty(const char* pTitle)
-    {
-        StringDlg stringDialog(pTitle);
-        stringDialog.SetString(QStringLiteral(""));
-        if (stringDialog.exec() == QDialog::Accepted)
-        {
-            const QString stringValue = stringDialog.GetString();
-
-            // detect data type
-            QString tempString = stringValue;
-            int countComa = 0;
-            int countOpenRoundBraket = 0;
-            int countCloseRoundBraket = 0;
-            int countDots = 0;
-
-            int posDots = 0;
-            int posComa = 0;
-            int posOpenRoundBraket = 0;
-            int posCloseRoundBraket = 0;
-
-            for (int i = 0; i < 3; i++)
-            {
-                if (tempString.indexOf(".", posDots) > -1)
-                {
-                    posDots = tempString.indexOf(".", posDots) + 1;
-                    countDots++;
-                }
-                if (tempString.indexOf(",", posComa) > -1)
-                {
-                    posComa = tempString.indexOf(",", posComa) + 1;
-                    countComa++;
-                }
-                if (tempString.indexOf("(", posOpenRoundBraket) > -1)
-                {
-                    posOpenRoundBraket = tempString.indexOf("(", posOpenRoundBraket) + 1;
-                    countOpenRoundBraket++;
-                }
-                if (tempString.indexOf(")", posCloseRoundBraket) > -1)
-                {
-                    posCloseRoundBraket = tempString.indexOf(")", posCloseRoundBraket) + 1;
-                    countCloseRoundBraket++;
-                }
-            }
-
-            if (countDots == 3 && countComa == 2 && countOpenRoundBraket == 1 && countCloseRoundBraket == 1)
-            {
-                // for example: (1.95, 2.75, 3.36)
-                QString valueRed = stringValue;
-                int iStart = valueRed.indexOf("(");
-                valueRed.remove(0, iStart + 1);
-                int iEnd = valueRed.indexOf(",");
-                valueRed.remove(iEnd, valueRed.length());
-                float fValueRed = valueRed.toFloat();
-
-                QString valueGreen = stringValue;
-                iStart = valueGreen.indexOf(",");
-                valueGreen.remove(0, iStart + 1);
-                iEnd = valueGreen.indexOf(",");
-                valueGreen.remove(iEnd, valueGreen.length());
-                float fValueGreen = valueGreen.toFloat();
-
-                QString valueBlue = stringValue;
-                valueBlue.remove(0, valueBlue.indexOf(",") + 1);
-                valueBlue.remove(0, valueBlue.indexOf(",") + 1);
-                valueBlue.remove(valueBlue.indexOf(")"), valueBlue.length());
-                float fValueBlue = valueBlue.toFloat();
-
-                return AZStd::make_any<AZ::Vector3>(fValueRed, fValueGreen, fValueBlue);
-            }
-            else if (countDots == 0 && countComa == 2 && countOpenRoundBraket == 1 && countCloseRoundBraket == 1)
-            {
-                // for example: (128, 32, 240)
-                const AZ::u8 lowColorValue { 0 };
-                const AZ::u8 highColorValue { 255 };
-                QString valueRed = stringValue;
-                int iStart = valueRed.indexOf("(");
-                valueRed.remove(0, iStart + 1);
-                int iEnd = valueRed.indexOf(",");
-                valueRed.remove(iEnd, valueRed.length());
-                AZ::u8 iValueRed = AZStd::clamp(aznumeric_cast<AZ::u8>(valueRed.toInt()), lowColorValue, highColorValue);
-
-                QString valueGreen = stringValue;
-                iStart = valueGreen.indexOf(",");
-                valueGreen.remove(0, iStart + 1);
-                iEnd = valueGreen.indexOf(",");
-                valueGreen.remove(iEnd, valueGreen.length());
-                AZ::u8 iValueGreen = AZStd::clamp(aznumeric_cast<AZ::u8>(valueGreen.toInt()), lowColorValue, highColorValue);
-
-                QString valueBlue = stringValue;
-                valueBlue.remove(0, valueBlue.indexOf(",") + 1);
-                valueBlue.remove(0, valueBlue.indexOf(",") + 1);
-                valueBlue.remove(valueBlue.indexOf(")"), valueBlue.length());
-                AZ::u8 iValueBlue = AZStd::clamp(aznumeric_cast<AZ::u8>(valueBlue.toInt()), lowColorValue, highColorValue);
-
-                return AZStd::make_any<AZ::Color>(iValueRed, iValueGreen, iValueBlue, highColorValue);
-            }
-            else if (countDots == 1 && countComa == 0 && countOpenRoundBraket == 0 && countCloseRoundBraket == 0)
-            {
-                // for example: 2.56
-                return AZStd::make_any<double>(stringValue.toDouble());
-            }
-            else if (countDots == 0 && countComa == 0 && countOpenRoundBraket == 0 && countCloseRoundBraket == 0)
-            {
-                if (stringValue == "False" || stringValue == "True")
-                {
-                    // for example: True
-                    return AZStd::make_any<bool>(stringValue == "True");
-                }
-                else
-                {
-                    const bool anyNotDigits = AZStd::any_of(stringValue.begin(), stringValue.end(), [](const QChar& ch) { return !ch.isDigit(); });
-
-                    // looks like a string value?
-                    if (stringValue.isEmpty() || anyNotDigits)
-                    {
-                        // for example: Hello
-                        return AZStd::make_any<AZStd::string>(stringValue.toUtf8().data());
-                    }
-                    else // then it looks like an integer
-                    {
-                        // for example: 456
-                        return AZStd::make_any<AZ::s64>(stringValue.toInt());
-                    }
-                }
-            }
-        }
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QObject::tr("Invalid Data"), QObject::tr("Invalid data type."));
-        return {};
-    }
-
-    AZStd::string PyOpenFileBox()
-    {
-        QString path = QFileDialog::getOpenFileName();
-        if (!path.isEmpty())
-        {
-            Path::ConvertBackSlashToSlash(path);
-        }
-        return path.toUtf8().constData();
-    }
-
-    AZStd::string PyComboBox(AZStd::string title, AZStd::vector<AZStd::string> values, int selectedIdx = 0)
-    {
-        AZStd::string result;
-
-        if (title.empty())
-        {
-            throw std::runtime_error("Incorrect title argument passed in. ");
-            return result;
-        }
-
-        if (values.size() == 0)
-        {
-            throw std::runtime_error("Empty value list passed in. ");
-            return result;
-        }
-
-        QStringList list;
-
-        for (const AZStd::string& str : values)
-        {
-            list.push_back(str.c_str());
-        }
-
-        CGenericSelectItemDialog pyDlg;
-        pyDlg.setWindowTitle(title.c_str());
-        pyDlg.SetMode(CGenericSelectItemDialog::eMODE_LIST);
-        pyDlg.SetItems(list);
-        pyDlg.PreSelectItem(list[selectedIdx]);
-
-        if (pyDlg.exec() == QDialog::Accepted)
-        {
-            result = pyDlg.GetSelectedItem().toUtf8().constData();
-        }
-
-        return result;
-    }
-
-    void PyCrash()
-    {
-        AZ_Crash();
-    }
-
-    static void PyDrawLabel(int x, int y, float size, float r, float g, float b, float a, const char* pLabel)
-    {
-        if (!pLabel)
-        {
-            throw std::logic_error("No label given.");
-            return;
-        }
-
-        if (!r || !g || !b || !a)
-        {
-            throw std::logic_error("Invalid color parameters given.");
-            return;
-        }
-
-        if (!x || !y || !size)
-        {
-            throw std::logic_error("Invalid position or size parameters given.");
-        }
-        else
-        {
-            // ToDo: Remove function or update to work with Atom? LYN-3672
-            // float color[] = {r, g, b, a};
-            // ???->Draw2dLabel(x, y, size, color, false, pLabel);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Constrain
-    //////////////////////////////////////////////////////////////////////////
-    const char* PyGetAxisConstraint()
-    {
-        AxisConstrains actualConstrain = GetIEditor()->GetAxisConstrains();
-        switch (actualConstrain)
-        {
-        case AXIS_X:
-            return "X";
-        case AXIS_Y:
-            return "Y";
-        case AXIS_Z:
-            return "Z";
-        case AXIS_XY:
-            return "XY";
-        case AXIS_XZ:
-            return "XZ";
-        case AXIS_YZ:
-            return "YZ";
-        case AXIS_XYZ:
-            return "XYZ";
-        case AXIS_TERRAIN:
-            return (GetIEditor()->IsTerrainAxisIgnoreObjects()) ? "TERRAIN" : "TERRAINSNAP";
-        default:
-            throw std::logic_error("Invalid axes.");
-        }
-    }
-
-    void PySetAxisConstraint(AZStd::string_view pConstrain)
-    {
-        if (pConstrain == "X")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_X);
-        }
-        else if (pConstrain == "Y")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_Y);
-        }
-        else if (pConstrain == "Z")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_Z);
-        }
-        else if (pConstrain == "XY")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_XY);
-        }
-        else if (pConstrain == "YZ")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_YZ);
-        }
-        else if (pConstrain == "XZ")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_XZ);
-        }
-        else if (pConstrain == "XYZ")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_XYZ);
-        }
-        else if (pConstrain == "TERRAIN")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_TERRAIN);
-            GetIEditor()->SetTerrainAxisIgnoreObjects(true);
-        }
-        else if (pConstrain == "TERRAINSNAP")
-        {
-            GetIEditor()->SetAxisConstraints(AXIS_TERRAIN);
-            GetIEditor()->SetTerrainAxisIgnoreObjects(false);
-        }
-        else
-        {
-            throw std::logic_error("Invalid axes.");
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    const char* PyGetPakFromFile(const char* filename)
-    {
-        auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-        AZ::IO::HandleType fileHandle = pIPak->FOpen(filename, "rb");
-        if (fileHandle == AZ::IO::InvalidHandle)
-        {
-            throw std::logic_error("Invalid file name.");
-        }
-        const char* pArchPath = pIPak->GetFileArchivePath(fileHandle);
-        pIPak->FClose(fileHandle);
-        return pArchPath;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PyUndo()
-    {
-        GetIEditor()->Undo();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void PyRedo()
-    {
-        GetIEditor()->Redo();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Temporal, to be removed by LY-101149
-AZ::EntityId PyFindEditorEntity(const char* name)
-{
-    AZ::EntityId foundEntityId;
-
-    auto searchFunc = [name, &foundEntityId](AZ::Entity* e)
-    {
-        if (!foundEntityId.IsValid() && e->GetName() == name)
-        {
-            bool isEditorEntity = false;
-            AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, e->GetId());
-            if (isEditorEntity)
-            {
-                foundEntityId = e->GetId();
-            }
-        }
-    };
-
-    AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationRequests::EnumerateEntities, searchFunc);
-    return foundEntityId;
-}
-
-AZ::EntityId PyFindGameEntity(const char* name)
-{
-    AZ::EntityId foundEntityId;
-
-    auto searchFunc = [name, &foundEntityId](AZ::Entity* e)
-    {
-        if (!foundEntityId.IsValid() && e->GetName() == name)
-        {
-            bool isEditorEntity = true;
-            AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, e->GetId());
-            if (!isEditorEntity)
-            {
-                foundEntityId = e->GetId();
-            }
-        }
-    };
-
-    AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationRequests::EnumerateEntities, searchFunc);
-    return foundEntityId;
-}
-
-
-struct PyDumpBindings
-{
-    static AZ_INLINE bool IsBehaviorFlaggedForEditor(const AZ::AttributeArray& attributes)
-    {
-        // defaults to Launcher
-        AZ::Script::Attributes::ScopeFlags scopeType = AZ::Script::Attributes::ScopeFlags::Launcher;
-        AZ::Attribute* scopeAttribute = AZ::FindAttribute(AZ::Script::Attributes::Scope, attributes);
-        if (scopeAttribute)
-        {
-            AZ::AttributeReader scopeAttributeReader(nullptr, scopeAttribute);
-            scopeAttributeReader.Read<AZ::Script::Attributes::ScopeFlags>(scopeType);
-        }
-        return (scopeType == AZ::Script::Attributes::ScopeFlags::Automation || scopeType == AZ::Script::Attributes::ScopeFlags::Common);
-    }
-
-    static AZ_INLINE AZStd::string GetModuleName(const AZ::AttributeArray& attributes)
-    {
-        AZStd::string moduleName;
-        AZ::Attribute* moduleAttribute = AZ::FindAttribute(AZ::Script::Attributes::Module, attributes);
-        if (moduleAttribute)
-        {
-            AZ::AttributeReader scopeAttributeReader(nullptr, moduleAttribute);
-            scopeAttributeReader.Read<AZStd::string>(moduleName);
-        }
-        if (!moduleName.empty())
-        {
-            moduleName = "azlmbr." + moduleName;
-        }
-        else
-        {
-            moduleName = "azlmbr";
-        }
-
-        return moduleName;
-    }
-
-
-    static AZStd::string ParameterToString(const AZ::BehaviorMethod* method, size_t index)
-    {
-        const AZStd::string* argNameStr = method->GetArgumentName(index);
-        const char* argName = (argNameStr && !argNameStr->empty()) ? argNameStr->c_str() : nullptr;
-        if (argName)
-        {
-            return AZStd::string::format("%s %s", method->GetArgument(index)->m_name, argName);
-        }
-        else
-        {
-            return method->GetArgument(index)->m_name;
-        }
-    }
-
-    static AZStd::string MethodArgumentsToString(const AZ::BehaviorMethod* method)
-    {
-        AZStd::string ret;
-        AZStd::string argumentStr;
-        for (size_t i = 0; i < method->GetNumArguments(); ++i)
-        {
-            argumentStr = ParameterToString(method, i);
-            ret += argumentStr;
-            if (i < method->GetNumArguments() - 1)
-            {
-                ret += ", ";
-            }
-        }
-        return ret;
-    }
-
-    static AZStd::string MethodToString(const AZStd::string& methodName, const AZ::BehaviorMethod* method)
-    {
-        AZStd::string methodNameStrip = methodName.data() + methodName.rfind(':') + 1; // remove ClassName:: part as it is redundant
-        return AZStd::string::format("%s %s(%s)%s", method->GetResult()->m_name, methodNameStrip.c_str(), MethodArgumentsToString(method).c_str(), method->m_isConst ? " const" : "");
-    }
-
-    static AZStd::string GetExposedPythonClasses()
-    {
-        AZ::BehaviorContext* behaviorContext(nullptr);
-        AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationRequests::GetBehaviorContext);
-
-        AZStd::string output = "";
-        output += "// Classes\n\n";
-
-        for (auto elem : behaviorContext->m_classes)
-        {
-            AZ::BehaviorClass* cls = elem.second;
-
-            bool exposedToPython = IsBehaviorFlaggedForEditor(cls->m_attributes);
-            if (!exposedToPython)
-                continue;
-
-            output += AZStd::string::format("// Module: %s\n", GetModuleName(cls->m_attributes).c_str());
-            output += AZStd::string::format("class %s\n", cls->m_name.c_str());
-            output += "{\n";
-
-            if (cls->m_methods.size() > 0)
-            {
-                output += "    // Methods\n";
-                for (auto method_elem : cls->m_methods)
-                {
-                    output += AZStd::string::format("    %s;\n", MethodToString(method_elem.first, method_elem.second).c_str());
-                }
-            }
-            if (cls->m_properties.size() > 0)
-            {
-                output += "    // Properties\n";
-                for (auto property_elem : cls->m_properties)
-                {
-                    AZ::BehaviorProperty* bproperty = property_elem.second;
-                    output += AZStd::string::format("    %s %s;\n", bproperty->m_getter->GetResult()->m_name, bproperty->m_name.c_str());
-                }
-            }
-
-            output += "}\n";
-        }
-        output += "\n\n// Ebuses\n\n";
-        for (auto elem : behaviorContext->m_ebuses)
-        {
-            AZ::BehaviorEBus* ebus = elem.second;
-
-            bool exposedToPython = IsBehaviorFlaggedForEditor(ebus->m_attributes);
-            if (!exposedToPython)
-                continue;
-
-            output += AZStd::string::format("// Module: %s\n", GetModuleName(ebus->m_attributes).c_str());
-            output += AZStd::string::format("ebus %s\n", ebus->m_name.c_str());
-            output += "{\n";
-            for (auto event_elem : ebus->m_events)
-            {
-                auto method = event_elem.second.m_event ? event_elem.second.m_event : event_elem.second.m_broadcast;
-                if (method)
-                {
-                    const char* comment = event_elem.second.m_event ? "/* event */" : "/* broadcast */";
-                    output += AZStd::string::format("    %s %s\n", comment, MethodToString(event_elem.first, method).c_str());
-                }
-                else
-                {
-                    output += AZStd::string::format("    %s %s\n", "/* unknown */", event_elem.first.c_str());
-                }
-            }
-
-            if (ebus->m_createHandler)
-            {
-                AZ::BehaviorEBusHandler* handler = nullptr;
-                ebus->m_createHandler->InvokeResult(handler);
-                if (handler)
-                {
-                    const auto& notifications = handler->GetEvents();
-                    for (const auto& notification : notifications)
-                    {
-                        AZStd::string argsStr;
-                        const size_t paramCount = notification.m_parameters.size();
-                        for (size_t i = 0; i < notification.m_parameters.size(); ++i)
-                        {
-                            AZStd::string argName = notification.m_parameters[i].m_name;
-                            argsStr += argName;
-                            if (i != paramCount - 1)
-                            {
-                                argsStr += ", ";
-                            }
-                        }
-
-                        AZStd::string funcName = notification.m_name;
-                        output += AZStd::string::format("    /* notification */ %s(%s);\n", funcName.c_str(), argsStr.c_str());
-                    }
-                    ebus->m_destroyHandler->Invoke(handler);
-                }
-            }
-
-            output += "}\n";
-
-        }
-        AzFramework::StringFunc::Replace(output, "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>", "AZStd::string");
-        return output;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-namespace AzToolsFramework
-{
-    void PythonEditorComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<EditorLayerPythonRequestBus>("PythonEditorBus")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                ->Attribute(AZ::Script::Attributes::Module, "python_editor_funcs")
-                ->Event("GetCVar", &EditorLayerPythonRequestBus::Events::GetCVar)
-                ->Event("SetCVar", &EditorLayerPythonRequestBus::Events::SetCVar)
-                ->Event("SetCVarFromString", &EditorLayerPythonRequestBus::Events::SetCVarFromString)
-                ->Event("SetCVarFromInteger", &EditorLayerPythonRequestBus::Events::SetCVarFromInteger)
-                ->Event("SetCVarFromFloat", &EditorLayerPythonRequestBus::Events::SetCVarFromFloat)
-                ->Event("RunConsole", &EditorLayerPythonRequestBus::Events::PyRunConsole)
-                ->Event("EnterGameMode", &EditorLayerPythonRequestBus::Events::EnterGameMode)
-                ->Event("IsInGameMode", &EditorLayerPythonRequestBus::Events::IsInGameMode)
-                ->Event("ExitGameMode", &EditorLayerPythonRequestBus::Events::ExitGameMode)
-                ->Event("EnterSimulationMode", &EditorLayerPythonRequestBus::Events::EnterSimulationMode)
-                ->Event("IsInSimulationMode", &EditorLayerPythonRequestBus::Events::IsInSimulationMode)
-                ->Event("ExitSimulationMode", &EditorLayerPythonRequestBus::Events::ExitSimulationMode)
-                ->Event("RunFile", &EditorLayerPythonRequestBus::Events::RunFile)
-                ->Event("RunFileParameters", &EditorLayerPythonRequestBus::Events::RunFileParameters)
-                ->Event("ExecuteCommand", &EditorLayerPythonRequestBus::Events::ExecuteCommand)
-                ->Event("MessageBoxOkCancel", &EditorLayerPythonRequestBus::Events::MessageBoxOkCancel)
-                ->Event("MessageBoxYesNo", &EditorLayerPythonRequestBus::Events::MessageBoxYesNo)
-                ->Event("MessageBoxOk", &EditorLayerPythonRequestBus::Events::MessageBoxOk)
-                ->Event("EditBox", &EditorLayerPythonRequestBus::Events::EditBox)
-                ->Event("EditBoxCheckDataType", &EditorLayerPythonRequestBus::Events::EditBoxCheckDataType)
-                ->Event("OpenFileBox", &EditorLayerPythonRequestBus::Events::OpenFileBox)
-                ->Event("GetAxisConstraint", &EditorLayerPythonRequestBus::Events::GetAxisConstraint)
-                ->Event("SetAxisConstraint", &EditorLayerPythonRequestBus::Events::SetAxisConstraint)
-                ->Event("GetPakFromFile", &EditorLayerPythonRequestBus::Events::GetPakFromFile)
-                ->Event("Log", &EditorLayerPythonRequestBus::Events::Log)
-                ->Event("Undo", &EditorLayerPythonRequestBus::Events::Undo)
-                ->Event("Redo", &EditorLayerPythonRequestBus::Events::Redo)
-                ->Event("DrawLabel", &EditorLayerPythonRequestBus::Events::DrawLabel)
-                ->Event("ComboBox", &EditorLayerPythonRequestBus::Events::ComboBox)
-                ;
-        }
-    }
-
-    void PythonEditorComponent::Activate()
-    {
-        EditorLayerPythonRequestBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void PythonEditorComponent::Deactivate()
-    {
-        EditorLayerPythonRequestBus::Handler::BusDisconnect();
-    }
-
-    const char* PythonEditorComponent::GetCVar(const char* pName)
-    {
-        return PyGetCVarAsString(pName);
-    }
-
-    void PythonEditorComponent::SetCVar(const char* pName, const AZStd::any& value)
-    {
-        return PySetCVarFromAny(pName, value);
-    }
-
-    void PythonEditorComponent::SetCVarFromString(const char* pName, const char* pValue)
-    {
-        return PySetCVarFromString(pName, pValue);
-    }
-
-    void PythonEditorComponent::SetCVarFromInteger(const char* pName, int pValue)
-    {
-        return PySetCVarFromInt(pName, pValue);
-    }
-
-    void PythonEditorComponent::SetCVarFromFloat(const char* pName, float pValue)
-    {
-        return PySetCVarFromFloat(pName, pValue);
-    }
-
-    void PythonEditorComponent::PyRunConsole(const char* text)
-    {
-        return ::PyRunConsole(text);
-    }
-
-    void PythonEditorComponent::EnterGameMode()
-    {
-        return PyEnterGameMode();
-    }
-
-    bool PythonEditorComponent::IsInGameMode()
-    {
-        return PyIsInGameMode();
-    }
-
-    void PythonEditorComponent::ExitGameMode()
-    {
-        return PyExitGameMode();
-    }
-
-    void PythonEditorComponent::EnterSimulationMode()
-    {
-        return PyEnterSimulationMode();
-    }
-
-    bool PythonEditorComponent::IsInSimulationMode()
-    {
-        return PyIsInSimulationMode();
-    }
-
-    void PythonEditorComponent::ExitSimulationMode()
-    {
-        return PyExitSimulationMode();
-    }
-
-    void PythonEditorComponent::RunFile(const char *pFile)
-    {
-        return PyRunFile(pFile);
-    }
-
-    void PythonEditorComponent::RunFileParameters(const char* pFile, const char* pArguments)
-    {
-        return PyRunFileWithParameters(pFile, pArguments);
-    }
-
-    void PythonEditorComponent::ExecuteCommand(const char* cmdline)
-    {
-        return PyExecuteCommand(cmdline);
-    }
-
-    bool PythonEditorComponent::MessageBoxOkCancel(const char* pMessage)
-    {
-        return PyMessageBox(pMessage);
-    }
-
-    bool PythonEditorComponent::MessageBoxYesNo(const char* pMessage)
-    {
-        return PyMessageBoxYesNo(pMessage);
-    }
-
-    bool PythonEditorComponent::MessageBoxOk(const char* pMessage)
-    {
-        return PyMessageBoxOK(pMessage);
-    }
-
-    AZStd::string PythonEditorComponent::EditBox(AZStd::string_view pTitle)
-    {
-        return PyEditBox(pTitle);
-    }
-
-    AZStd::any PythonEditorComponent::EditBoxCheckDataType(const char* pTitle)
-    {
-        return PyEditBoxAndCheckProperty(pTitle);
-    }
-
-    AZStd::string PythonEditorComponent::OpenFileBox()
-    {
-        return PyOpenFileBox();
-    }
-
-    const char* PythonEditorComponent::GetAxisConstraint()
-    {
-        return PyGetAxisConstraint();
-    }
-
-    void PythonEditorComponent::SetAxisConstraint(AZStd::string_view pConstrain)
-    {
-        return PySetAxisConstraint(pConstrain);
-    }
-
-    const char* PythonEditorComponent::GetPakFromFile(const char* filename)
-    {
-        return PyGetPakFromFile(filename);
-    }
-
-    void PythonEditorComponent::Log(const char* pMessage)
-    {
-        return PyLog(pMessage);
-    }
-
-    void PythonEditorComponent::Undo()
-    {
-        return PyUndo();
-    }
-
-    void PythonEditorComponent::Redo()
-    {
-        return PyRedo();
-    }
-
-    void PythonEditorComponent::DrawLabel(int x, int y, float size, float r, float g, float b, float a, const char* pLabel)
-    {
-        return PyDrawLabel(x, y, size, r, g, b, a, pLabel);
-    }
-
-    AZStd::string PythonEditorComponent::ComboBox(AZStd::string title, AZStd::vector<AZStd::string> values, int selectedIdx)
-    {
-        return PyComboBox(title, values, selectedIdx);
-    }
-}
-
-namespace AzToolsFramework
-{
-    void PythonEditorFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.general' module
-            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/General")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
-            };
-            addLegacyGeneral(behaviorContext->Method("get_cvar", PyGetCVarAsString, nullptr, "Gets a CVar value as a string."));
-            addLegacyGeneral(behaviorContext->Method("set_cvar", PySetCVarFromAny, nullptr, "Sets a CVar value from any simple value."));
-            addLegacyGeneral(behaviorContext->Method("set_cvar_string", PySetCVarFromString, nullptr, "Sets a CVar value from a string."));
-            addLegacyGeneral(behaviorContext->Method("set_cvar_integer", PySetCVarFromInt, nullptr, "Sets a CVar value from an integer."));
-            addLegacyGeneral(behaviorContext->Method("set_cvar_float", PySetCVarFromFloat, nullptr, "Sets a CVar value from a float."));
-            addLegacyGeneral(behaviorContext->Method("run_console", PyRunConsole, nullptr, "Runs a console command."));
-
-            addLegacyGeneral(behaviorContext->Method("enter_game_mode", PyEnterGameMode, nullptr, "Enters the editor game mode."));
-            addLegacyGeneral(behaviorContext->Method("is_in_game_mode", PyIsInGameMode, nullptr, "Queries if it's in the game mode or not."));
-            addLegacyGeneral(behaviorContext->Method("exit_game_mode", PyExitGameMode, nullptr, "Exits the editor game mode."));
-
-            addLegacyGeneral(behaviorContext->Method("enter_simulation_mode", PyEnterSimulationMode, nullptr, "Enters the editor AI/Physics simulation mode."));
-            addLegacyGeneral(behaviorContext->Method("is_in_simulation_mode", PyIsInSimulationMode, nullptr, "Queries if the editor is currently in the AI/Physics simulation mode or not."));
-            addLegacyGeneral(behaviorContext->Method("exit_simulation_mode", PyExitSimulationMode, nullptr, "Exits the editor AI/Physics simulation mode."));
-            addLegacyGeneral(behaviorContext->Method("run_file", PyRunFile, nullptr, "Runs a script file. A relative path from the editor user folder or an absolute path should be given as an argument."));
-            addLegacyGeneral(behaviorContext->Method("run_file_parameters", PyRunFileWithParameters, nullptr, "Runs a script file with parameters. A relative path from the editor user folder or an absolute path should be given as an argument. The arguments should be separated by whitespace."));
-            addLegacyGeneral(behaviorContext->Method("execute_command", PyExecuteCommand, nullptr, "Executes a given string as an editor command."));
-
-            addLegacyGeneral(behaviorContext->Method("message_box", PyMessageBox, nullptr, "Shows a confirmation message box with ok|cancel and shows a custom message."));
-            addLegacyGeneral(behaviorContext->Method("message_box_yes_no", PyMessageBoxYesNo, nullptr, "Shows a confirmation message box with yes|no and shows a custom message."));
-            addLegacyGeneral(behaviorContext->Method("message_box_ok", PyMessageBoxOK, nullptr, "Shows a confirmation message box with only ok and shows a custom message."));
-            addLegacyGeneral(behaviorContext->Method("edit_box", PyEditBox, nullptr, "Shows an edit box and returns the value as string."));
-
-            addLegacyGeneral(behaviorContext->Method("edit_box_check_data_type", PyEditBoxAndCheckProperty, nullptr, "Shows an edit box and checks the custom value to use the return value with other functions correctly."));
-
-            addLegacyGeneral(behaviorContext->Method("open_file_box", PyOpenFileBox, nullptr, "Shows an open file box and returns the selected file path and name."));
-
-            addLegacyGeneral(behaviorContext->Method("get_axis_constraint", PyGetAxisConstraint, nullptr, "Gets axis."));
-            addLegacyGeneral(behaviorContext->Method("set_axis_constraint", PySetAxisConstraint, nullptr, "Sets axis."));
-
-            addLegacyGeneral(behaviorContext->Method("get_pak_from_file", PyGetPakFromFile, nullptr, "Finds a pak file name for a given file."));
-
-            addLegacyGeneral(behaviorContext->Method("log", PyLog, nullptr, "Prints the message to the editor console window."));
-
-            addLegacyGeneral(behaviorContext->Method("undo", PyUndo, nullptr, "Undoes the last operation."));
-            addLegacyGeneral(behaviorContext->Method("redo", PyRedo, nullptr, "Redoes the last undone operation."));
-
-            addLegacyGeneral(behaviorContext->Method("draw_label", PyDrawLabel, nullptr, "Shows a 2d label on the screen at the given position and given color."));
-            addLegacyGeneral(behaviorContext->Method("combo_box", PyComboBox, nullptr, "Shows a combo box listing each value passed in, returns string value selected by the user."));
-
-            addLegacyGeneral(behaviorContext->Method("crash", PyCrash, nullptr, "Crashes the application, useful for testing crash reporting and other automation tools."));
-
-            /////////////////////////////////////////////////////////////////////////
-            // Temporal, to be removed by LY-101149
-            addLegacyGeneral(behaviorContext->Method("find_editor_entity", PyFindEditorEntity, nullptr, "Retrieves a editor entity id by name"));
-            addLegacyGeneral(behaviorContext->Method("find_game_entity", PyFindGameEntity, nullptr, "Retrieves a game entity id by name"));
-            //////////////////////////////////////////////////////////////////////////
-            addLegacyGeneral(behaviorContext->Method("dump_exposed_classes", PyDumpBindings::GetExposedPythonClasses, nullptr, "Retrieves exposed classes"));
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/PythonEditorFuncs.h b/Code/Sandbox/Editor/PythonEditorFuncs.h
deleted file mode 100644
index a37a8e946b..0000000000
--- a/Code/Sandbox/Editor/PythonEditorFuncs.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <Include/SandboxAPI.h>
-#include <AzCore/Component/Component.h>
-#include "PythonEditorEventsBus.h"
-
-namespace AzToolsFramework
-{
-    //! A component to reflect scriptable commands for the Editor
-    class PythonEditorFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(PythonEditorFuncsHandler, "{0F470E7E-9741-4608-84B1-7E4735FDA526}")
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-    //! Component to access the PythonEditorFuncs
-    class PythonEditorComponent final
-        : public AZ::Component
-        , public EditorLayerPythonRequestBus::Handler
-    {
-    public:
-        AZ_COMPONENT(PythonEditorComponent, "{B06810A1-E3C0-4A63-8DDD-3A01C5299DD3}")
-
-        PythonEditorComponent() = default;
-        ~PythonEditorComponent() override = default;
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        // Component...
-        void Activate() override;
-        void Deactivate() override;
-
-        const char* GetCVar(const char* pName) override;
-
-        void SetCVar(const char* pName, const AZStd::any& value) override;
-
-        void SetCVarFromString(const char* pName, const char* pValue) override;
-
-        void SetCVarFromInteger(const char* pName, int pValue) override;
-
-        void SetCVarFromFloat(const char* pName, float pValue) override;
-
-        void PyRunConsole(const char* text) override;
-
-        void EnterGameMode() override;
-
-        bool IsInGameMode() override;
-
-        void ExitGameMode() override;
-
-        void EnterSimulationMode() override;
-
-        bool IsInSimulationMode() override;
-
-        void ExitSimulationMode() override;
-
-        void RunFile(const char* pFile) override;
-
-        void RunFileParameters(const char* pFile, const char* pArguments) override;
-
-        void ExecuteCommand(const char* cmdline) override;
-
-        bool MessageBoxOkCancel(const char* pMessage) override;
-
-        bool MessageBoxYesNo(const char* pMessage) override;
-
-        bool MessageBoxOk(const char* pMessage) override;
-
-        AZStd::string EditBox(AZStd::string_view pTitle) override;
-
-        AZStd::any EditBoxCheckDataType(const char* pTitle) override;
-
-        AZStd::string OpenFileBox() override;
-
-        const char* GetAxisConstraint() override;
-
-        void SetAxisConstraint(AZStd::string_view pConstrain) override;
-
-        const char* GetPakFromFile(const char* filename) override;
-
-        void Log(const char* pMessage) override;
-
-        void Undo() override;
-
-        void Redo() override;
-
-        void DrawLabel(int x, int y, float size, float r, float g, float b, float a, const char* pLabel) override;
-
-        AZStd::string ComboBox(AZStd::string title, AZStd::vector<AZStd::string> values, int selectedIdx = 0) override;
-    };
-
-} // namespace AzToolsFramework
diff --git a/Code/Sandbox/Editor/QtUI/ClickableLabel.cpp b/Code/Sandbox/Editor/QtUI/ClickableLabel.cpp
deleted file mode 100644
index 5e35223b76..0000000000
--- a/Code/Sandbox/Editor/QtUI/ClickableLabel.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ClickableLabel.h"
-
-
-ClickableLabel::ClickableLabel(const QString& text, QWidget* parent)
-    : QLabel(parent)
-    , m_text(text)
-    , m_showDecoration(false)
-{
-    setTextFormat(Qt::RichText);
-    setTextInteractionFlags(Qt::TextBrowserInteraction);
-}
-
-ClickableLabel::ClickableLabel(QWidget* parent)
-    : QLabel(parent)
-    , m_showDecoration(false)
-{
-    setTextFormat(Qt::RichText);
-    setTextInteractionFlags(Qt::TextBrowserInteraction);
-}
-
-void ClickableLabel::showEvent([[maybe_unused]] QShowEvent* event)
-{
-    updateFormatting(false);
-}
-
-void ClickableLabel::enterEvent(QEvent* ev)
-{
-    if (!isEnabled())
-    {
-        return;
-    }
-
-    updateFormatting(true);
-    QApplication::setOverrideCursor(QCursor(Qt::PointingHandCursor));
-    QLabel::enterEvent(ev);
-}
-
-void ClickableLabel::leaveEvent(QEvent* ev)
-{
-    if (!isEnabled())
-    {
-        return;
-    }
-
-    updateFormatting(false);
-    QApplication::restoreOverrideCursor();
-    QLabel::leaveEvent(ev);
-}
-
-void ClickableLabel::setText(const QString& text)
-{
-    m_text = text;
-    QLabel::setText(text);
-    updateFormatting(false);
-}
-
-void ClickableLabel::setShowDecoration(bool b)
-{
-    m_showDecoration = b;
-    updateFormatting(false);
-}
-
-void ClickableLabel::updateFormatting(bool mouseOver)
-{
-    //FIXME: this should be done differently. Using a style sheet would be easiest.
-
-    QColor c = palette().color(QPalette::WindowText);
-    if (mouseOver || m_showDecoration)
-    {
-        QLabel::setText(QString(R"(<a href="dummy" style="color: %1";>%2</a>)").arg(c.name(), m_text));
-    }
-    else
-    {
-        QLabel::setText(m_text);
-    }
-}
-
-bool ClickableLabel::event(QEvent* e)
-{
-    if (isEnabled())
-    {
-        if (e->type() == QEvent::MouseButtonDblClick)
-        {
-            emit linkActivated(QString());
-            return true; //ignore
-        }
-    }
-
-    return QLabel::event(e);
-}
-
-#include <QtUI/moc_ClickableLabel.cpp>
diff --git a/Code/Sandbox/Editor/QtUI/ClickableLabel.h b/Code/Sandbox/Editor/QtUI/ClickableLabel.h
deleted file mode 100644
index 4eebc853b0..0000000000
--- a/Code/Sandbox/Editor/QtUI/ClickableLabel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#ifndef CRYINCLUDE_EDITORCOMMON_CLICKABLELABEL_H
-#define CRYINCLUDE_EDITORCOMMON_CLICKABLELABEL_H
-
-#if !defined(Q_MOC_RUN)
-#include <QLabel>
-#endif
-
-class SANDBOX_API ClickableLabel
-    : public QLabel
-{
-    Q_OBJECT
-public:
-    explicit ClickableLabel(const QString& text, QWidget* parent = nullptr);
-    explicit ClickableLabel(QWidget* parent = nullptr);
-    bool event(QEvent* e) override;
-
-    void setText(const QString& text);
-    void setShowDecoration(bool b);
-
-protected:
-    void showEvent(QShowEvent* event) override;
-    void enterEvent(QEvent* ev) override;
-    void leaveEvent(QEvent* ev) override;
-
-private:
-    void updateFormatting(bool mouseOver);
-    QString m_text;
-    bool m_showDecoration;
-};
-
-#endif
diff --git a/Code/Sandbox/Editor/QtUI/ColorButton.cpp b/Code/Sandbox/Editor/QtUI/ColorButton.cpp
deleted file mode 100644
index 9fc6c77d85..0000000000
--- a/Code/Sandbox/Editor/QtUI/ColorButton.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include <AzCore/PlatformDef.h>
-#include <platform.h>
-
-#include "ColorButton.h"
-
-// Qt
-#include <QPainter>
-
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/ColorPicker.h>  // for AzQtComponents::ColorPicker
-#include <AzQtComponents/Utilities/Conversions.h>           // for AzQtComponents::toQColor
-
-
-ColorButton::ColorButton(QWidget* parent /* = nullptr */)
-    : QToolButton(parent)
-{
-    connect(this, &ColorButton::clicked, this, &ColorButton::OnClick);
-}
-
-void ColorButton::paintEvent([[maybe_unused]] QPaintEvent* event)
-{
-    QPainter painter(this);
-    painter.fillRect(rect(), m_color);
-    painter.setPen(Qt::black);
-    painter.drawRect(rect().adjusted(0, 0, -1, -1));
-}
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-void macRaiseWindowDelayed(QWidget* window);
-#endif
-
-void ColorButton::OnClick()
-{
-    const QColor color = AzQtComponents::toQColor(
-        AzQtComponents::ColorPicker::getColor(AzQtComponents::ColorPicker::Configuration::RGB,
-        AzQtComponents::fromQColor(m_color),
-        tr("Select Color")));
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    macRaiseWindowDelayed(window());
-#endif
-
-    if (color != m_color)
-    
-    {
-        m_color = color;
-        update();
-        emit ColorChanged(m_color);
-    }
-}
-
-#include <QtUI/moc_ColorButton.cpp>
diff --git a/Code/Sandbox/Editor/QtUI/ColorButton.h b/Code/Sandbox/Editor/QtUI/ColorButton.h
deleted file mode 100644
index 8bfda2bb22..0000000000
--- a/Code/Sandbox/Editor/QtUI/ColorButton.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_EDITORCOMMON_COLORBUTTON_H
-#define CRYINCLUDE_EDITORCOMMON_COLORBUTTON_H
-
-#include <Include/EditorCoreAPI.h>
-
-#if !defined(Q_MOC_RUN)
-#include <QToolButton>
-#endif
-
-class QColor;
-class QPaintEvent;
-
-class EDITOR_CORE_API ColorButton
-    : public QToolButton
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QColor Color READ Color WRITE SetColor)
-
-public:
-    ColorButton(QWidget* parent = nullptr);
-    virtual ~ColorButton() {};
-
-    QColor Color() const { return m_color; }
-    void SetColor(const QColor& color)
-    {
-        m_color = color;
-        update();
-    }
-
-protected:
-    void paintEvent(QPaintEvent* event) override;
-
-private:
-    QColor m_color;
-
-signals:
-    void ColorChanged(const QColor& color);
-
-private slots:
-    void OnClick();
-};
-
-#endif // CRYINCLUDE_EDITORCOMMON_COLORBUTTON_H
diff --git a/Code/Sandbox/Editor/QtUI/ColorButton_mac.mm b/Code/Sandbox/Editor/QtUI/ColorButton_mac.mm
deleted file mode 100644
index d76e6717f2..0000000000
--- a/Code/Sandbox/Editor/QtUI/ColorButton_mac.mm
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#import <Cocoa/Cocoa.h>
-
-#include <QTimer>
-#include <QVariant>
-#include <QWidget>
-
-// this makes sure the native widget of the window
-// has the same window level as it should have
-// the problem is that for some reason the window level is changed to 0
-// unfortunately not directly so we have to check repeated times
-void macRaiseWindowDelayed(QWidget* window)
-{
-    NSWindow* nativeWindow = [(NSView*)(window->winId()) window];
-    CGWindowLevel level = nativeWindow.level;
-    QTimer* t = new QTimer(window);
-    QObject::connect(t, &QTimer::timeout, t, [t,nativeWindow,level] {
-        if (nativeWindow.level != level)
-        {
-            // level was changed -> we can break as soon as we fixed it
-            t->setProperty("raiseCounter", 99);
-        }
-        if (nativeWindow.level == level && t->property("raiseCounter").toInt() >= 99)
-        {
-            // break condition met and correct level -> end this
-            t->deleteLater();
-        }
-        t->setProperty("raiseCounter", t->property("raiseCounter").toInt() + 1);
-        // try to set the right level
-        nativeWindow.level = level;
-    });
-    t->start(10);
-}
diff --git a/Code/Sandbox/Editor/QtUI/PixmapLabelPreview.cpp b/Code/Sandbox/Editor/QtUI/PixmapLabelPreview.cpp
deleted file mode 100644
index 3944aaf4a5..0000000000
--- a/Code/Sandbox/Editor/QtUI/PixmapLabelPreview.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "PixmapLabelPreview.h"
-
-PixmapLabelPreview::PixmapLabelPreview(QWidget* parent)
-    : QLabel(parent)
-    , m_mode(Qt::IgnoreAspectRatio)
-{
-    this->setMinimumSize(10, 10);
-}
-
-void PixmapLabelPreview::setPixmap(const QPixmap& p)
-{
-    m_pixmap = p;
-    QLabel::setPixmap(transformPixmap(p));
-}
-
-int PixmapLabelPreview::heightForWidth(int width) const
-{
-    if (m_mode == Qt::KeepAspectRatio)
-    {
-        return width;
-    }
-
-    return ((qreal)m_pixmap.height() * width) / m_pixmap.width();
-}
-
-
-QSize PixmapLabelPreview::sizeHint() const
-{
-    int w = this->width();
-    return QSize(w, heightForWidth(w));
-}
-
-void PixmapLabelPreview::setAspectRatioMode(Qt::AspectRatioMode mode)
-{
-    m_mode = mode;
-}
-
-void PixmapLabelPreview::resizeEvent([[maybe_unused]] QResizeEvent* e)
-{
-    QLabel::setPixmap(transformPixmap(m_pixmap));
-}
-
-QPixmap PixmapLabelPreview::transformPixmap(QPixmap pix)
-{
-    return pix.scaled(this->size(), m_mode, Qt::SmoothTransformation);
-}
-
-#include <QtUI/moc_PixmapLabelPreview.cpp>
diff --git a/Code/Sandbox/Editor/QtUI/PixmapLabelPreview.h b/Code/Sandbox/Editor/QtUI/PixmapLabelPreview.h
deleted file mode 100644
index 8690b3472c..0000000000
--- a/Code/Sandbox/Editor/QtUI/PixmapLabelPreview.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef PIXMAPLABELPREVIEW_H
-#define PIXMAPLABELPREVIEW_H
-
-#if !defined(Q_MOC_RUN)
-#include <QLabel>
-#include <QPixmap>
-#include <QResizeEvent>
-#endif
-
-class PixmapLabelPreview
-    : public QLabel
-{
-    Q_OBJECT
-public:
-    explicit PixmapLabelPreview(QWidget* parent = 0);
-    virtual int heightForWidth(int width) const;
-    virtual QSize sizeHint() const;
-
-public slots:
-    void setAspectRatioMode(Qt::AspectRatioMode);
-    void setPixmap(const QPixmap&);
-    void resizeEvent(QResizeEvent*);
-private:
-    QPixmap transformPixmap(QPixmap);
-
-    QPixmap m_pixmap;
-    Qt::AspectRatioMode m_mode;
-};
-
-#endif // PIXMAPLABELPREVIEW_H
diff --git a/Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.cpp b/Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.cpp
deleted file mode 100644
index 3b5a4d72aa..0000000000
--- a/Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "QtUI/QCollapsibleGroupBox.h"
-
-
-QCollapsibleGroupBox::QCollapsibleGroupBox(QWidget* parent)
-    : QGroupBox(parent)
-    , m_collapsed(false)
-    , m_toggleButton(0)
-{
-    m_toggleButton = new QToolButton(this);
-    m_toggleButton->setFixedSize(16, 16);
-    m_toggleButton->setArrowType(Qt::DownArrow);
-    connect(m_toggleButton, &QToolButton::clicked, this, [&]()
-        {
-            setCollapsed(!m_collapsed);
-        });
-}
-
-QCollapsibleGroupBox::~QCollapsibleGroupBox()
-{
-}
-
-void QCollapsibleGroupBox::setCollapsed(bool v)
-{
-    if (v == m_collapsed)
-    {
-        return;
-    }
-
-    m_collapsed = v;
-    if (m_collapsed)
-    {
-        m_visibleState.clear();
-    }
-    Q_FOREACH(QObject * child, children())
-    {
-        QWidget* w = qobject_cast<QWidget*>(child);
-        if (w && w != m_toggleButton)
-        {
-            if (m_collapsed)
-            {
-                m_visibleState[w] = w->isVisible();
-                w->setHidden(true);
-            }
-            else
-            {
-                if (m_visibleState.contains(w))
-                {
-                    w->setVisible(m_visibleState[w]);
-                }
-                else
-                {
-                    w->setVisible(true);
-                }
-            }
-        }
-    }
-    m_toggleButton->setArrowType(v ? Qt::LeftArrow : Qt::DownArrow);
-    adaptSize(v);
-    Q_EMIT collapsed(v);
-}
-
-void QCollapsibleGroupBox::resizeEvent(QResizeEvent* event)
-{
-    if (m_toggleButton)
-    {
-        m_toggleButton->move(event->size().width() - m_toggleButton->width() - 1, 1);
-    }
-    QGroupBox::resizeEvent(event);
-}
-
-void QCollapsibleGroupBox::adaptSize(bool v)
-{
-    if (v)
-    {
-        m_expandedSize = maximumSize();
-        setMaximumHeight(fontMetrics().height() + 5); // shrinking to just let the groupbox title
-    }
-    else
-    {
-        setMaximumHeight(m_expandedSize.height());
-    }
-}
-
-#include <QtUI/moc_QCollapsibleGroupBox.cpp>
diff --git a/Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.h b/Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.h
deleted file mode 100644
index 8bd356b3c4..0000000000
--- a/Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#ifndef CRYINCLUDE_EDITORCOMMON_QCOLLAPSIBLEGROUPBOX_H
-#define CRYINCLUDE_EDITORCOMMON_QCOLLAPSIBLEGROUPBOX_H
-
-#if !defined(Q_MOC_RUN)
-#include <QGroupBox>
-#include <QToolButton>
-#include <QHash>
-#endif
-
-
-class QCollapsibleGroupBox
-    : public QGroupBox
-{
-    Q_OBJECT
-    Q_PROPERTY(bool collapsed READ collapsed WRITE setCollapsed NOTIFY collapsed)
-public:
-    QCollapsibleGroupBox(QWidget* parent);
-    ~QCollapsibleGroupBox();
-
-    bool collapsed() const { return m_collapsed; }
-
-public slots:
-    void setCollapsed(bool v);
-
-signals:
-    void collapsed(bool);
-
-protected:
-    void adaptSize(bool v);
-    void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
-
-    QSize m_expandedSize;
-    bool    m_collapsed;
-    QToolButton* m_toggleButton;
-    QHash<QWidget*, bool> m_visibleState;
-};
-
-#endif
diff --git a/Code/Sandbox/Editor/QtUI/WaitCursor.cpp b/Code/Sandbox/Editor/QtUI/WaitCursor.cpp
deleted file mode 100644
index dcd4ca59e6..0000000000
--- a/Code/Sandbox/Editor/QtUI/WaitCursor.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "WaitCursor.h"
-
-// Qt
-#include <QApplication>
-
-
-WaitCursor::WaitCursor()
-{
-    QApplication::setOverrideCursor(Qt::WaitCursor);
-}
-
-WaitCursor::~WaitCursor()
-{
-    QApplication::restoreOverrideCursor();
-}
diff --git a/Code/Sandbox/Editor/QtUI/WaitCursor.h b/Code/Sandbox/Editor/QtUI/WaitCursor.h
deleted file mode 100644
index 67a497116a..0000000000
--- a/Code/Sandbox/Editor/QtUI/WaitCursor.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_EDITORCOMMON_WAITCURSOR_H
-#define CRYINCLUDE_EDITORCOMMON_WAITCURSOR_H
-
-class WaitCursor
-{
-public:
-    WaitCursor();
-    ~WaitCursor();
-};
-
-#endif
diff --git a/Code/Sandbox/Editor/QtUtil.h b/Code/Sandbox/Editor/QtUtil.h
deleted file mode 100644
index b01a9a938f..0000000000
--- a/Code/Sandbox/Editor/QtUtil.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <QString>
-#include <CryString.h>
-#include "UnicodeFunctions.h"
-
-#include <QApplication>
-#include <QDropEvent>
-#include <QWidget>
-
-#ifdef LoadCursor
-#undef LoadCursor
-#endif
-
-class QWaitCursor
-{
-public:
-    QWaitCursor()
-    {
-        QGuiApplication::setOverrideCursor(Qt::BusyCursor);
-    }
-    ~QWaitCursor()
-    {
-        QGuiApplication::restoreOverrideCursor();
-    }
-};
-
-namespace QtUtil
-{
-    // From QString to CryString
-    inline CryStringT<char> ToString(const QString& str)
-    {
-        return Unicode::Convert<CryStringT<char> >(str);
-    }
-
-    // From CryString to QString
-    inline QString ToQString(const CryStringT<char>& str)
-    {
-        return Unicode::Convert<QString>(str);
-    }
-
-    // From const char * to QString
-    inline QString ToQString(const char* str, size_t len = -1)
-    {
-        if (len == -1)
-        {
-            len = strlen(str);
-        }
-        return Unicode::Convert<QString>(str, str + len);
-    }
-
-    // Replacement for CString::trimRight()
-    inline QString trimRight(const QString& str)
-    {
-        // We prepend a char, so that the left doesn't get trimmed, then we remove it after trimming
-        return QString(QStringLiteral("A") + str).trimmed().remove(0, 1);
-    }
-
-    template<typename ... Args>
-    struct Select
-    {
-        template<typename C, typename R>
-        static auto OverloadOf(R(C::* pmf)(Args...))->decltype(pmf) {
-            return pmf;
-        }
-    };
-}
-
-namespace stl
-{
-    //! Case insensitive less key for QString
-    template <>
-    struct less_stricmp<QString>
-    {
-        bool operator()(const QString& left, const QString& right) const
-        {
-            return left.compare(right, Qt::CaseInsensitive) < 0;
-        }
-    };
-}
diff --git a/Code/Sandbox/Editor/QtUtilWin.h b/Code/Sandbox/Editor/QtUtilWin.h
deleted file mode 100644
index 6139f68f46..0000000000
--- a/Code/Sandbox/Editor/QtUtilWin.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <QRect>
-#include <QColor>
-#include <QPixmap>
-#include <QString>
-#include <QPointF>
-#include <QRectF>
-#include <QVector>
-#include <QWidget>
-#include <QWindow>
-#include <QApplication>
-
-#ifdef Q_OS_WIN
-# include <QtWinExtras/QtWin>
-# include <QtGui/qpa/qplatformnativeinterface.h>
-# include <objidl.h>
-AZ_PUSH_DISABLE_WARNING(4458, "-Wunknown-warning-option")
-# include <GdiPlus.h>
-AZ_POP_DISABLE_WARNING
-#endif // Q_OS_WIN
-
-#include "Util/EditorUtils.h"
-
-namespace QtUtil
-{
-
-#ifdef Q_OS_WIN
-    inline HWND getNativeHandle(QWidget* widget)
-    {
-        QWindow* window = widget->windowHandle();
-        QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
-        return static_cast<HWND>(nativeInterface->nativeResourceForWindow(QByteArrayLiteral("handle"), window));
-    }
-#endif // Q_OS_WIN
-
-    //! a helper class which captures the HWND of a given widget for the duration of its life cycle.
-    //! used mainly to set the parent of popup dialogs like file dialogs which are still MFC classes.
-    class QtMFCScopedHWNDCapture
-    {
-    public:
-        QtMFCScopedHWNDCapture(QWidget* source = nullptr)
-        {
-            if (!source)
-            {
-                source = qApp->activeWindow();
-            }
-
-            if (source)
-            {
-                m_widget = source;
-            }
-        }
-
-        ~QtMFCScopedHWNDCapture()
-        {
-            m_widget = nullptr;
-            m_attached = false;
-        }
-
-        // this is here so that it will also work for widgets that need parents if we upgrade the file dialog and other dialogs to be widget based
-        operator QWidget*()
-        {
-            return m_widget;
-        }
-
-    private:
-        bool m_attached = false;
-        QWidget* m_widget = nullptr;
-    };
-}
diff --git a/Code/Sandbox/Editor/QtViewPane.h b/Code/Sandbox/Editor/QtViewPane.h
deleted file mode 100644
index 3ba95101cb..0000000000
--- a/Code/Sandbox/Editor/QtViewPane.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITORCOMMON_QTVIEWPANE_H
-#define CRYINCLUDE_EDITORCOMMON_QTVIEWPANE_H
-#pragma once
-
-#include "IEditor.h"
-#include "Include/IEditorClassFactory.h"
-#include "Include/IViewPane.h"
-#include "Include/ObjectEvent.h"
-#include "Objects/ClassDesc.h"
-
-#include <QRect>
-#include <QWidget>
-
-namespace Serialization {
-    class IArchive;
-}
-using Serialization::IArchive;
-
-// ---------------------------------------------------------------------------
-
-template<class TObject>
-class CTemplateObjectClassDesc
-    : public CObjectClassDesc
-{
-public:
-    const char* m_className;
-    const char* m_category;
-    const char* m_textureIcon;
-    ObjectType m_objectType;
-    int m_order;
-    const char* m_fileSpec;
-    const char* m_toolClassName;
-
-    CTemplateObjectClassDesc(const char* className, const char* category, const char* textureIcon, ObjectType objectType, int order = 100, const char* fileSpec = "", const char* toolClassName = nullptr)
-        : m_className(className)
-        , m_category(category)
-        , m_textureIcon(textureIcon)
-        , m_objectType(objectType)
-        , m_order(order)
-        , m_fileSpec(fileSpec)
-        , m_toolClassName(toolClassName)
-    {
-    }
-
-    REFGUID ClassID() override
-    {
-        return TObject::GetClassID();
-    }
-
-    QString GetFileSpec() override
-    {
-        return m_fileSpec;
-    }
-
-    ESystemClassID SystemClassID() override
-    {
-        return ESYSTEM_CLASS_OBJECT;
-    };
-
-    ObjectType GetObjectType() override
-    {
-        return m_objectType;
-    }
-
-    QString ClassName() override
-    {
-        return m_className;
-    }
-
-    QString Category() override
-    {
-        return m_category;
-    }
-
-    QString GetTextureIcon() override
-    {
-        return m_textureIcon;
-    }
-
-    QObject* CreateQObject() const override
-    {
-        return new TObject;
-    }
-
-    int GameCreationOrder() override
-    {
-        return m_order;
-    };
-
-    bool IsEnabled() const override
-    {
-        return TObject::IsEnabled();
-    }
-
-    QString GetToolClassName() override
-    {
-        return m_toolClassName ? m_toolClassName : CObjectClassDesc::GetToolClassName();
-    }
-};
-
-template<class TWidget>
-class CQtViewClass
-    : public IViewPaneClass
-{
-public:
-    const char* m_name;
-    const char* m_category;
-    ESystemClassID m_classId;
-
-    CQtViewClass(const char* name, const char* category, ESystemClassID classId = ESYSTEM_CLASS_VIEWPANE)
-        : m_name(name)
-        , m_category(category)
-        , m_classId(classId)
-    {
-    }
-
-    virtual ESystemClassID SystemClassID() { return m_classId; };
-    static const GUID& GetClassID()
-    {
-        return TWidget::GetClassID();
-    }
-
-    virtual const GUID& ClassID()
-    {
-        return GetClassID();
-    }
-    virtual QString ClassName() { return m_name; };
-    virtual QString Category() { return m_category; };
-
-    QObject* CreateQObject() const override { return new TWidget(); };
-    QString GetPaneTitle() override { return m_name; };
-    unsigned int GetPaneTitleID() const override { return 0; };
-    EDockingDirection GetDockingDirection() override { return DOCK_FLOAT; };
-    QRect GetPaneRect() override { return {}; /* KDAB_TODO: ;m_sizeOptions.m_paneRect; */};
-    bool SinglePane() override { return false; };
-    bool WantIdleUpdate() override { return true; };
-    QSize GetMinSize() override { return {}; /*return m_sizeOptions.m_minSize;*/ }
-};
-
-#endif // CRYINCLUDE_EDITORCOMMON_QTVIEWPANE_H
diff --git a/Code/Sandbox/Editor/QtViewPaneManager.cpp b/Code/Sandbox/Editor/QtViewPaneManager.cpp
deleted file mode 100644
index 57ef840f2a..0000000000
--- a/Code/Sandbox/Editor/QtViewPaneManager.cpp
+++ /dev/null
@@ -1,1597 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "QtViewPaneManager.h"
-#include "Controls/ConsoleSCB.h"
-#include <AzQtComponents/Components/FancyDocking.h>
-#include <AzQtComponents/Components/Titlebar.h>
-#include <AzQtComponents/Components/Widgets/Card.h>
-
-#include <QDockWidget>
-#include <QMainWindow>
-#include <QDataStream>
-#include <QDebug>
-#include <QCloseEvent>
-#include <QLayout>
-#include <QApplication>
-#include <QRect>
-#include <QDesktopWidget>
-#include <QMessageBox>
-#include <QRubberBand>
-#include <QCursor>
-#include <QTimer>
-#include <QGraphicsOpacityEffect>
-#include "MainWindow.h"
-
-#include <algorithm>
-#include <QScopedValueRollback>
-
-#include <AzFramework/API/ApplicationAPI.h>
-
-#include <AzAssetBrowser/AzAssetBrowserWindow.h>
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <AzQtComponents/Utilities/AutoSettingsGroup.h>
-#include <AzToolsFramework/UI/Docking/DockWidgetUtils.h>
-#include <AzToolsFramework/UI/PropertyEditor/ComponentEditor.hxx>
-#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
-#include <AzToolsFramework/Viewport/ViewportMessages.h>
-#include <AzQtComponents/Buses/ShortcutDispatch.h>
-#include <AzQtComponents/Utilities/QtViewPaneEffects.h>
-#include <AzQtComponents/Components/StyleManager.h>
-
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-
-#include "ShortcutDispatcher.h"
-
-struct ViewLayoutState
-{
-    QVector<QString> viewPanes;
-    QByteArray mainWindowState;
-    QMap<QString, QRect> fakeDockWidgetGeometries;
-};
-Q_DECLARE_METATYPE(ViewLayoutState)
-
-static QDataStream &operator<<(QDataStream & out, const ViewLayoutState&myObj)
-{
-    int placeHolderVersion = 1;
-    out << myObj.viewPanes << myObj.mainWindowState << placeHolderVersion << myObj.fakeDockWidgetGeometries;
-    return out;
-}
-
-static QDataStream& operator>>(QDataStream& in, ViewLayoutState& myObj)
-{
-    in >> myObj.viewPanes;
-    in >> myObj.mainWindowState;
-
-    int version = 0;
-    if (!in.atEnd())
-    {
-        in >> version;
-        in >> myObj.fakeDockWidgetGeometries;
-    }
-
-    return in;
-}
-
-// All settings keys for stored layouts are in the form "layouts/<name>"
-// When starting up, "layouts/last" is loaded
-static QLatin1String s_lastLayoutName = QLatin1String("last");
-
-static QString GetFancyViewPaneStateGroupName()
-{
-    return QString("%1/%2").arg("Editor").arg("fancyWindowLayouts");
-}
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-// this event filter class eats mouse events
-// it is used in the non dockable fake dock widget
-// to make sure its inner title bar cannot be dragged
-class MouseEatingEventFilter : public QObject
-{
-public:
-    MouseEatingEventFilter(QObject* parent)
-        : QObject(parent)
-    {
-    }
-
-protected:
-    bool eventFilter(QObject*, QEvent* event) override
-    {
-        switch (event->type())
-        {
-            case QEvent::MouseButtonPress:
-            case QEvent::MouseButtonRelease:
-            case QEvent::MouseButtonDblClick:
-            case QEvent::MouseMove:
-                return true;
-            default:
-                return false;
-        }
-    }
-};
-#endif
-
-Q_GLOBAL_STATIC(QtViewPaneManager, s_viewPaneManagerInstance)
-
-
-QWidget* QtViewPane::CreateWidget()
-{
-    QWidget* w = nullptr;
-
-    if (m_factoryFunc)
-    {
-        // Although all the factory lambdas do have a default nullptr argument, this information
-        // doesn't get retained when they are converted to std::function<QWidget*(QWidget*)>,
-        // thus we need to set the parent explicitly.
-        // At the same time, adding a default argument to the lambdas will allow for them to be
-        // called exactly as before in all other places where they are not converted, so we get
-        // to explicitly pass an argument only if strictly necessary.
-        w = m_factoryFunc(nullptr);
-    }
-    else
-    {
-        // If a view pane was registered using RegisterCustomViewPane, then instead of a factory function, we rely
-        // on ViewPaneCallbackBus::CreateViewPaneWidget to create the widget for us and then pass back the Qt windowId
-        // so that we can retrieve it.
-        AZ::u64 createdWidgetWinId;
-        AzToolsFramework::ViewPaneCallbackBus::EventResult(createdWidgetWinId, m_name.toUtf8().constData(), &AzToolsFramework::ViewPaneCallbacks::CreateViewPaneWidget);
-        w = QWidget::find(createdWidgetWinId);
-    }
-
-    return w;
-}
-
-bool QtViewPane::Close(QtViewPane::CloseModes closeModes)
-{
-    if (!IsConstructed())
-    {
-        return true;
-    }
-
-    return CloseInstance(m_dockWidget, closeModes);
-}
-
-bool QtViewPane::CloseInstance(QDockWidget* dockWidget, CloseModes closeModes)
-{
-    if (!dockWidget)
-    {
-        return false;
-    }
-
-    bool canClose = true;
-    bool destroy = closeModes & CloseMode::Destroy;
-
-    // Console is not deletable, so always hide it instead of destroying
-    if (!m_options.isDeletable)
-    {
-        destroy = false;
-    }
-
-    if (!(closeModes & CloseMode::Force))
-    {
-        QCloseEvent closeEvent;
-
-        // Prevent closing view pane if it has modal dialog open, as modal dialogs
-        // are often constructed on stack and will not finish properly when the view
-        // pane is destroyed.
-        QWidgetList topLevelWidgets = QApplication::topLevelWidgets();
-        const int numTopLevel = topLevelWidgets.size();
-        for (size_t i = 0; i < numTopLevel; ++i)
-        {
-            QWidget* widget = topLevelWidgets[i];
-            if (widget->isModal() && widget->isVisible())
-            {
-                widget->activateWindow();
-                return false;
-            }
-        }
-
-        // Check if embedded QWidget allows view pane to be closed.
-        QCoreApplication::sendEvent(dockWidget->widget(), &closeEvent);
-        // If widget accepted the close event, we delete the dockwidget, which will also delete the child widget in case it doesn't have Qt::WA_DeleteOnClose
-        if (!closeEvent.isAccepted())
-        {
-            // Widget doesn't want to close
-            canClose = false;
-        }
-    }
-
-    if (canClose)
-    {
-        if (destroy)
-        {
-            //important to set parent to null otherwise docking code will still find it while restoring since that happens before the delete.
-            dockWidget->setParent(nullptr);
-            dockWidget->deleteLater();
-
-            if (dockWidget == m_dockWidget)
-            {
-                //clear dockwidget pointer otherwise if we open this pane before the delete happens we'll think it's already there, then it gets deleted on us.
-                m_dockWidget.clear();
-            }
-        }
-        else
-        {
-            // If the dock widget is tabbed, then just remove it from the tab widget
-            AzQtComponents::DockTabWidget* tabWidget = AzQtComponents::DockTabWidget::ParentTabWidget(dockWidget);
-            if (tabWidget)
-            {
-                tabWidget->removeTab(dockWidget);
-            }
-            // Otherwise just hide the widget
-            else
-            {
-                dockWidget->hide();
-            }
-        }
-    }
-
-    return canClose;
-}
-
-static bool SkipTitleBarOverdraw(QtViewPane* pane)
-{
-    return !pane->m_options.isDockable;
-}
-
-DockWidget::DockWidget(QWidget* widget, QtViewPane* pane, QSettings* settings, QMainWindow* parent, AzQtComponents::FancyDocking* advancedDockManager)
-    : AzQtComponents::StyledDockWidget(pane->m_name, SkipTitleBarOverdraw(pane),
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-          pane->m_options.detachedWindow ? nullptr : parent)
-#else
-          parent)
-#endif
-    , m_settings(settings)
-    , m_mainWindow(parent)
-    , m_pane(pane)
-    , m_advancedDockManager(advancedDockManager)
-{
-    // keyboard shortcuts from any other context shouldn't trigger actions under this dock widget
-    AzQtComponents::MarkAsShortcutSearchBreak(this);
-
-    if (pane->m_options.isDeletable)
-    {
-        setAttribute(Qt::WA_DeleteOnClose);
-    }
-
-    QString objectNameForSave = pane->m_options.saveKeyName.length() > 0 ? pane->m_options.saveKeyName : pane->m_name;
-    setObjectName(objectNameForSave);
-
-    setWidget(widget);
-    setFocusPolicy(Qt::StrongFocus);
-
-    setAttribute(Qt::WA_Hover, true);
-    setMouseTracking(true);
-}
-
-bool DockWidget::event(QEvent* qtEvent)
-{
-    // this accounts for a difference in behavior where we want all floating windows to be always parented to the main window instead of to each other, so that
-    // they don't overlap in odd ways - for example, if you tear off a floating window from another floating window, under Qt's system its technically still a child of that window
-    // so that window can't ever be placed on top of it.  This is not what we want.  We want you to be able to then take that window and drag it into this new one.
-    // (Qt's original behavior is like that so if you double click on a floating widget it docks back into the parent which it came from - we don't use this functionality)
-    if (qtEvent->type() == QEvent::WindowActivate
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-        && !m_pane->m_options.detachedWindow
-#endif
-    )
-    {
-        reparentToMainWindowFix();
-    }
-
-    return AzQtComponents::StyledDockWidget::event(qtEvent);
-}
-
-void DockWidget::reparentToMainWindowFix()
-{
-    if (!isFloating() || !AzToolsFramework::DockWidgetUtils::isDockWidgetWindowGroup(parentWidget()))
-    {
-        return;
-    }
-
-    if (qApp->mouseButtons() & Qt::LeftButton)
-    {
-        // We're still dragging, lets try later
-        QTimer::singleShot(200, this, &DockWidget::reparentToMainWindowFix);
-        return;
-    }
-
-    // bump it up and to the left by the size of its frame, to account for the reparenting operation;
-    QPoint framePos = pos();
-    QPoint contentPos = mapToGlobal(QPoint(0, 0));
-    move(framePos.x() - (contentPos.x() - framePos.x()), framePos.y() - (contentPos.y() - framePos.y()));
-
-    // we have to dock this to the mainwindow, even if we're floating, so that the mainwindow knows about it.
-    // if the preferred area is valid, use that. Otherwise, arbitrarily toss it in the left.
-    // This is relevant because it will determine where the widget goes if the title bar is double clicked
-    // after it's been detached from a QDockWidgetGroupWindow
-    auto dockArea = (m_pane->m_options.preferedDockingArea != Qt::DockWidgetArea::NoDockWidgetArea) ? m_pane->m_options.preferedDockingArea : Qt::LeftDockWidgetArea;
-
-    setParent(m_mainWindow);
-    m_mainWindow->addDockWidget(dockArea, this);
-    setFloating(true);
-}
-
-QString DockWidget::PaneName() const
-{
-    return m_pane->m_name;
-}
-
-void DockWidget::RestoreState(bool forceDefault)
-{
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    if (m_pane->m_options.detachedWindow)
-    {
-        if (forceDefault)
-        {
-            window()->setGeometry(m_pane->m_options.paneRect);
-        }
-        else
-        {
-            QRect geometry = QtViewPaneManager::instance()->GetLayout().fakeDockWidgetGeometries[objectName()];
-            if (!geometry.isValid())
-            {
-                geometry = m_pane->m_options.paneRect;
-            }
-            window()->setGeometry(geometry);
-        }
-        return;
-    }
-#endif
-
-    // check if we can get the main window to do all the work for us first
-    // (which is also the proper way to do this)
-    if (!forceDefault)
-    {
-        // If the advanced docking is enabled, let it try to restore the dock widget
-        bool restored = false;
-        if (m_advancedDockManager)
-        {
-            restored = m_advancedDockManager->restoreDockWidget(this);
-        }
-        // Otherwise, let our main window do it directly
-        else
-        {
-            restored = m_mainWindow->restoreDockWidget(this);
-        }
-
-        if (restored)
-        {
-            AzToolsFramework::DockWidgetUtils::correctVisibility(this);
-            return;
-        }
-    }
-
-    // can't rely on the main window; fall back to our preferences
-    auto dockingArea = m_pane->m_options.preferedDockingArea;
-    auto paneRect = m_pane->m_options.paneRect;
-
-    // If we are floating and have multiple instances, try to calculate an appropriate rect from the most recently created, non-docked instance
-    // make sure the new location would be reasonable on screen - otherwise use default paneRect for new widget positioning
-    if (dockingArea == Qt::NoDockWidgetArea && m_pane->m_dockWidgetInstances.size() > 1)
-    {
-        static const int horizontalCascadeAmount = 20;
-        static const int verticalCascadeAmount = 20;
-        static const int lowerScreenEdgeBuffer = 50;
-
-        QRect screenRect = QApplication::primaryScreen()->geometry();
-        int screenHeight = screenRect.height();
-        int screenWidth = screenRect.width();
-
-        for (QList<DockWidget*>::reverse_iterator it = m_pane->m_dockWidgetInstances.rbegin(); it != m_pane->m_dockWidgetInstances.rend(); ++it)
-        {
-            DockWidget* dock = *it;
-
-            if (dock != this)
-            {
-                QMainWindow* mainWindow = qobject_cast<QMainWindow*>(dock->parentWidget());
-                if (mainWindow && mainWindow->parentWidget())
-                {
-                    QPoint windowLocation = mainWindow->parentWidget()->mapToGlobal(QPoint(0, 0));
-
-                    // Only nudge it to the right if we have room to do so
-                    if (windowLocation.x() + horizontalCascadeAmount < screenWidth - paneRect.width())
-                    {
-                        paneRect.moveLeft(windowLocation.x() + horizontalCascadeAmount);
-
-                        // Keep it from getting too low on the screen
-                        if (windowLocation.y() + verticalCascadeAmount < screenHeight - lowerScreenEdgeBuffer)
-                        {
-                            paneRect.moveTop(windowLocation.y() + verticalCascadeAmount);
-                        }
-                    }
-
-                    // We found an undocked window, just go ahead and break, if we couldn't adjust because of positioning,
-                    // it will be placed at the default location
-                    break;
-                }
-            }
-        }
-    }
-
-    // make sure we're sized properly before we dock
-    if (paneRect.isValid())
-    {
-        resize(paneRect.size());
-    }
-
-    // check if we should force floating
-    bool floatWidget = (dockingArea == Qt::NoDockWidgetArea);
-
-    // if we're floating, we need to move and resize again, because the act of docking may have moved us
-    if (floatWidget)
-    {
-        // in order for saving and restoring state to work properly in Qt,
-        // along with docking widgets within other floating widgets, the widget
-        // must be added at least once to the main window, with a VALID area,
-        // before we set it to floating.
-        auto arbitraryDockingArea = Qt::LeftDockWidgetArea;
-        m_mainWindow->addDockWidget(arbitraryDockingArea, this);
-
-        // If we are using the fancy docking, let it handle making the dock
-        // widget floating, or else the titlebar will be missing, since
-        // floating widgets are actually contained in a floating main
-        // window container
-        if (m_advancedDockManager)
-        {
-            m_advancedDockManager->makeDockWidgetFloating(this, paneRect);
-        }
-        // Otherwise, we can make the dock widget floating directly and move it
-        else
-        {
-            setFloating(true);
-
-            // Not using setGeometry() since it excludes the frame when positioning
-            if (paneRect.isValid())
-            {
-                resize(paneRect.size());
-                move(paneRect.topLeft());
-            }
-        }
-    }
-    else
-    {
-        m_mainWindow->addDockWidget(dockingArea, this);
-    }
-}
-
-QRect DockWidget::ProperGeometry() const
-{
-    QRect myGeom(pos(), size());
-
-    // we need this state in global coordinates, but if we're parented to one of those group dock windows, there is a problem, it will be local coords.
-    if (!isFloating())
-    {
-        if (parentWidget() && (strcmp(parentWidget()->metaObject()->className(), "QDockWidgetGroupWindow") == 0))
-        {
-            myGeom = QRect(parentWidget()->pos(), parentWidget()->size());
-        }
-    }
-
-    return myGeom;
-}
-
-QString DockWidget::settingsKey() const
-{
-    return settingsKey(m_pane->m_name);
-}
-
-QString DockWidget::settingsKey(const QString& paneName)
-{
-    return QStringLiteral("ViewPane-") + paneName;
-}
-
-// run generic function on all widgets considered for greying out/disabling
-template<typename Fn>
-void SetDefaultActionsEnabled(
-    const bool enabled, QtViewPanes& registeredPanes, const Fn& fn)
-{
-    for (QtViewPane& p : registeredPanes)
-    {
-        if (!p.m_dockWidgetInstances.empty())
-        {
-            for (auto& dockWidget : p.m_dockWidgetInstances)
-            {
-                const auto& paneName = dockWidget->PaneName();
-                // disable/fade all widgets other than those in the EntityInspector, EntityOutliner and Console
-                // note: The Console is not greyed out and the EntityInspector and EntityOutliner handle their
-                // own fading when entering/leaving ComponentMode
-                if (paneName != LyViewPane::EntityInspector &&
-                    paneName != LyViewPane::EntityInspectorPinned &&
-                    paneName != LyViewPane::Console &&
-                    paneName != LyViewPane::EntityOutliner)
-                {
-                    fn(dockWidget->widget(), enabled);
-                }
-            }
-        }
-    }
-}
-
-QtViewPaneManager::QtViewPaneManager(QObject* parent)
-    : QObject(parent)
-    , m_mainWindow(nullptr)
-    , m_settings(nullptr)
-    , m_restoreInProgress(false)
-    , m_advancedDockManager(nullptr)
-{
-    qRegisterMetaTypeStreamOperators<ViewLayoutState>("ViewLayoutState");
-    qRegisterMetaTypeStreamOperators<QVector<QString> >("QVector<QString>");
-
-    // view pane manager is interested when we enter/exit ComponentMode
-    m_componentModeNotifications.BusConnect(AzToolsFramework::GetEntityContextId());
-
-    m_componentModeNotifications.SetEnteredComponentModeFunc(
-        [this](const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
-    {
-        // gray out panels when entering ComponentMode
-        SetDefaultActionsEnabled(false, m_registeredPanes, [](QWidget* widget, bool on)
-        {
-            AzQtComponents::SetWidgetInteractEnabled(widget, on);
-        });
-    });
-
-    m_componentModeNotifications.SetLeftComponentModeFunc(
-        [this](const AZStd::vector<AZ::Uuid>& /*componentModeTypes*/)
-    {
-        // enable panels again when leaving ComponentMode
-        SetDefaultActionsEnabled(true, m_registeredPanes, [](QWidget* widget, bool on)
-        {
-            AzQtComponents::SetWidgetInteractEnabled(widget, on);
-        });
-    });
-}
-
-QtViewPaneManager::~QtViewPaneManager()
-{
-    m_componentModeNotifications.BusDisconnect();
-}
-
-static bool lessThan(const QtViewPane& v1, const QtViewPane& v2)
-{
-    if (v1.IsViewportPane() && v2.IsViewportPane())
-    {
-        // Registration order (Top, Front, Left ...)
-        return v1.m_id < v2.m_id;
-    }
-    else if (!v1.IsViewportPane() && !v2.IsViewportPane())
-    {
-        // Sort by name
-        return v1.m_name.compare(v2.m_name, Qt::CaseInsensitive) < 0;
-    }
-    else
-    {
-        // viewports on top of non-viewports
-        return v1.IsViewportPane();
-    }
-}
-
-void QtViewPaneManager::RegisterPane(const QString& name, const QString& category, ViewPaneFactory factory, const AzToolsFramework::ViewPaneOptions& options)
-{
-    if (IsPaneRegistered(name))
-    {
-        return;
-    }
-
-    QtViewPane view = { NextAvailableId(), name, category, factory, nullptr, options };
-
-    // Sorted insert
-    auto it = std::upper_bound(m_registeredPanes.begin(), m_registeredPanes.end(), view, lessThan);
-    m_registeredPanes.insert(it, view);
-
-    emit registeredPanesChanged();
-}
-
-void QtViewPaneManager::UnregisterPane(const QString& name)
-{
-    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
-            [name](const QtViewPane& pane) { return name == pane.m_name; });
-
-    if (it != m_registeredPanes.end())
-    {
-        QtViewPane& pane = *it;
-
-        ClosePane(&pane);
-
-        m_knownIdsSet.removeOne(pane.m_id);
-        m_registeredPanes.erase(it);
-        emit registeredPanesChanged();
-    }
-}
-
-QtViewPaneManager* QtViewPaneManager::instance()
-{
-    return s_viewPaneManagerInstance();
-}
-
-bool QtViewPaneManager::exists()
-{
-    return s_viewPaneManagerInstance.exists();
-}
-
-void QtViewPaneManager::SetMainWindow(AzQtComponents::DockMainWindow* mainWindow, QSettings* settings, const QByteArray& lastMainWindowState)
-{
-    Q_ASSERT(mainWindow && !m_mainWindow && settings && !m_settings);
-    m_mainWindow = mainWindow;
-    m_settings = settings;
-    m_advancedDockManager = new AzQtComponents::FancyDocking(mainWindow);
-
-    m_defaultMainWindowState = mainWindow->saveState();
-    m_loadedMainWindowState = lastMainWindowState;
-}
-
-const QtViewPane* QtViewPaneManager::OpenPane(const QString& name, QtViewPane::OpenModes modes)
-{
-    QtViewPane* pane = GetPane(name);
-    if (!pane || !pane->IsValid())
-    {
-        qWarning() << Q_FUNC_INFO << "Could not find pane with name" << name;
-        return nullptr;
-    }
-
-    // this multi-pane code is a bit of an hack to support more than one view of the same class
-    // All views are single pane, except for one in Maglev Control plugin
-    // Save/Restore support of the duplicates will only be implemented if required.
-
-    const bool isMultiPane = modes & QtViewPane::OpenMode::MultiplePanes;
-
-    DockWidget* newDockWidget = pane->m_dockWidget;
-
-    if (!pane->IsVisible() || isMultiPane)
-    {
-        if (!pane->IsConstructed() || isMultiPane)
-        {
-            QWidget* w = pane->CreateWidget();
-            if (!w)
-            {
-                qWarning() << Q_FUNC_INFO << "Unable to create widget for pane with name" << name;
-                return nullptr;
-            }
-
-            w->setProperty("restored", (modes & QtViewPane::OpenMode::RestoreLayout) != 0);
-            newDockWidget = new DockWidget(w, pane, m_settings, m_mainWindow, m_advancedDockManager);
-            AzQtComponents::StyleManager::repolishStyleSheet(newDockWidget);
-
-            // track every new dock widget instance that we created
-            pane->m_dockWidgetInstances.push_back(newDockWidget);
-            connect(newDockWidget, &QObject::destroyed, this, [this, name, newDockWidget]() {
-                QtViewPane* pane = GetPane(name);
-                if (pane && pane->IsValid())
-                {
-                    pane->m_dockWidgetInstances.removeAll(newDockWidget);
-                }
-            });
-
-            // only set the single instance of the dock widget on the pane if this
-            // isn't a special multi-pane instance
-            if (!isMultiPane)
-            {
-                pane->m_dockWidget = newDockWidget;
-            }
-            else
-            {
-                m_advancedDockManager->disableAutoSaveLayout(newDockWidget);
-            }
-
-            newDockWidget->setVisible(true);
-
-            // If this pane isn't dockable, set the allowed areas to none on the
-            // dock widget so the fancy docking knows to prevent it from docking
-            if (!pane->m_options.isDockable)
-            {
-                newDockWidget->setAllowedAreas(Qt::NoDockWidgetArea);
-            }
-
-            // only emit this signal if we're not creating a non-saving instance of the view pane
-            if (!isMultiPane)
-            {
-                emit viewPaneCreated(pane);
-            }
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-            // handle showing fake dock widgets
-            if (pane->m_options.detachedWindow)
-            {
-                ShowFakeNonDockableDockWidget(newDockWidget, pane);
-            }
-#endif
-        }
-        else if (!AzQtComponents::DockTabWidget::IsTabbed(newDockWidget))
-        {
-            newDockWidget->setVisible(true);
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-            if (pane->m_options.detachedWindow)
-            {
-                newDockWidget->window()->show();
-            }
-#endif
-        }
-
-        if ((modes & QtViewPane::OpenMode::UseDefaultState) || isMultiPane)
-        {
-            const bool forceToDefault = true;
-            newDockWidget->RestoreState(forceToDefault);
-        }
-        else if (!AzQtComponents::DockTabWidget::IsTabbed(newDockWidget) && !(modes & QtViewPane::OpenMode::OnlyOpen))
-        {
-            newDockWidget->RestoreState();
-        }
-    }
-
-    // If the dock widget is off screen (e.g. second monitor was disconnected),
-    // restore its default state
-    if (QApplication::desktop()->screenNumber(newDockWidget) == -1)
-    {
-        const bool forceToDefault = true;
-        newDockWidget->RestoreState(forceToDefault);
-    }
-
-    // If the widget's window is minimized, show it.
-    QWidget* window = newDockWidget->window();
-    if (window->isMinimized())
-    {
-        window->setWindowState(window->windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
-    }
-
-    if (pane->IsVisible())
-    {
-        if (!modes.testFlag(QtViewPane::OpenMode::RestoreLayout))
-        {
-            newDockWidget->setFocus();
-        }
-    }
-    else
-    {
-        // If the dock widget is tabbed, then set it as the active tab
-        AzQtComponents::DockTabWidget* tabWidget = AzQtComponents::DockTabWidget::ParentTabWidget(newDockWidget);
-        if (tabWidget)
-        {
-            int index = tabWidget->indexOf(newDockWidget);
-            tabWidget->setCurrentIndex(index);
-        }
-        // Otherwise just show the widget
-        else
-        {
-            newDockWidget->show();
-        }
-    }
-
-    // When a user opens a pane, if it is docked in a floating window, make sure
-    // it isn't hidden behind other floating windows or the Editor main window
-    if (modes.testFlag(QtViewPane::OpenMode::None))
-    {
-        QMainWindow* mainWindow = qobject_cast<QMainWindow*>(newDockWidget->parentWidget());
-        if (!mainWindow)
-        {
-            // If the parent of our dock widgets isn't a QMainWindow, then it
-            // might be tabbed, so try to find the tab container dock widget
-            // and then get the QMainWindow from that.
-            AzQtComponents::DockTabWidget* tabWidget = AzQtComponents::DockTabWidget::ParentTabWidget(newDockWidget);
-            if (tabWidget)
-            {
-                QDockWidget* tabDockContainer = qobject_cast<QDockWidget*>(tabWidget->parentWidget());
-                if (tabDockContainer)
-                {
-                    mainWindow = qobject_cast<QMainWindow*>(tabDockContainer->parentWidget());
-                }
-            }
-        }
-
-        if (mainWindow)
-        {
-            // If our pane is part of a floating window, then the parent of its
-            // QMainWindow will be another dock widget container that is floating.
-            // If this is the case, then raise it to the front so it won't be
-            // hidden behind other floating windows (or the Editor main window)
-            QDockWidget* parentDockWidget = qobject_cast<QDockWidget*>(mainWindow->parentWidget());
-            if (parentDockWidget && parentDockWidget->isFloating())
-            {
-                parentDockWidget->raise();
-            }
-        }
-    }
-
-    return pane;
-}
-
-QDockWidget* QtViewPaneManager::InstancePane(const QString& name)
-{
-    const QtViewPane* pane = OpenPane(name, QtViewPane::OpenMode::UseDefaultState | QtViewPane::OpenMode::MultiplePanes);
-    QDockWidget* newPaneWidget = nullptr;
-    if (pane != nullptr)
-    {
-        newPaneWidget = pane->m_dockWidgetInstances.last();
-    }
-
-    return newPaneWidget;
-}
-
-bool QtViewPaneManager::ClosePane(const QString& name, QtViewPane::CloseModes closeModes)
-{
-    if (QtViewPane* p = GetPane(name))
-    {
-        return ClosePane(p, closeModes);
-    }
-
-    return false;
-}
-
-bool QtViewPaneManager::ClosePaneInstance(const QString& name, QDockWidget* dockWidget, QtViewPane::CloseModes closeModes)
-{
-    if (QtViewPane* p = GetPane(name))
-    {
-        return p->CloseInstance(dockWidget, closeModes);
-    }
-
-    return false;
-}
-
-bool QtViewPaneManager::ClosePane(QtViewPane* pane, QtViewPane::CloseModes closeModes)
-{
-    if (pane)
-    {
-        // Don't allow a dock widget to be closed if it is being dragged for docking
-        if (m_advancedDockManager && m_advancedDockManager->IsDockWidgetBeingDragged(pane->m_dockWidget))
-        {
-            return false;
-        }
-
-        return pane->Close(closeModes | QtViewPane::CloseMode::Force);
-    }
-
-    return false;
-}
-
-bool QtViewPaneManager::CloseAllPanes()
-{
-    for (QtViewPane& p : m_registeredPanes)
-    {
-        if (!p.Close())
-        {
-            return false; // Abort closing
-        }
-    }
-    return true;
-}
-
-void QtViewPaneManager::CloseAllNonStandardPanes()
-{
-    for (QtViewPane& p : m_registeredPanes)
-    {
-        if (!p.m_options.isStandard)
-        {
-            p.Close(QtViewPane::CloseMode::Force);
-        }
-    }
-}
-
-void QtViewPaneManager::TogglePane(const QString& name)
-{
-    QtViewPane* pane = GetPane(name);
-    if (!pane)
-    {
-        Q_ASSERT(false);
-        return;
-    }
-
-    if (pane->IsVisible())
-    {
-        ClosePane(name);
-    }
-    else
-    {
-        OpenPane(name);
-    }
-}
-
-QWidget* QtViewPaneManager::CreateWidget(const QString& paneName)
-{
-    QtViewPane* pane = GetPane(paneName);
-    if (!pane)
-    {
-        qWarning() << Q_FUNC_INFO << "Couldn't find pane" << paneName << "; paneCount=" << m_registeredPanes.size();
-        return nullptr;
-    }
-
-    QWidget* w = pane->CreateWidget();
-    if (w)
-    {
-        w->setWindowTitle(paneName);
-        return w;
-    }
-
-    return nullptr;
-}
-
-void QtViewPaneManager::SaveLayout()
-{
-    SaveLayout(s_lastLayoutName);
-}
-
-void QtViewPaneManager::RestoreLayout(bool restoreDefaults)
-{
-    if (!restoreDefaults)
-    {
-        restoreDefaults = !RestoreLayout(s_lastLayoutName);
-    }
-
-    if (restoreDefaults)
-    {
-        // Nothing is saved in settings, restore default layout
-        RestoreDefaultLayout();
-    }
-}
-
-bool QtViewPaneManager::ClosePanesWithRollback(const QVector<QString>& panesToKeepOpen)
-{
-    QVector<QString> closedPanes;
-
-    // try to close all panes that aren't remaining open after relayout
-    bool rollback = false;
-    for (QtViewPane& p : m_registeredPanes)
-    {
-        // Only close the panes that aren't remaining open and are currently
-        // visible (which has to include a check if the pane is tabbed since
-        // it could be hidden if its not the active tab)
-        if (panesToKeepOpen.contains(p.m_name) || (!p.IsVisible() && !AzQtComponents::DockTabWidget::IsTabbed(p.m_dockWidget)))
-        {
-            continue;
-        }
-
-        // attempt to close this pane; if Close returns false, then the close event
-        // was intercepted and the pane doesn't want to close, so we should cancel the whole thing
-        // and rollback
-        if (!p.Close())
-        {
-            rollback = true;
-            break;
-        }
-
-        // keep track of the panes that we closed, so we can rollback later and reopen them
-        closedPanes.push_back(p.m_name);
-    }
-
-    // check if we cancelled and need to roll everything back
-    if (rollback)
-    {
-        for (const QString& paneName : closedPanes)
-        {
-            // append this to the end of the event loop with a zero length timer, so that
-            // all of the close/hide events above are entirely processed
-            QTimer::singleShot(0, this, [paneName, this]()
-                {
-                    OpenPane(paneName, QtViewPane::OpenMode::RestoreLayout);
-                });
-        }
-
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * Restore the default layout (also known as component entity layout)
- */
-void QtViewPaneManager::RestoreDefaultLayout(bool resetSettings)
-{
-    // Get whether the prefab system is enabled
-    bool isPrefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    if (resetSettings)
-    {
-        // We're going to do something destructive (removing all of the viewpane settings). Better confirm with the user
-        auto buttonPressed = QMessageBox::warning(m_mainWindow, tr("Restore Default Layout"), tr("Are you sure you'd like to restore to the default layout? This will reset all of your view related settings."), QMessageBox::Cancel | QMessageBox::RestoreDefaults, QMessageBox::RestoreDefaults);
-        if (buttonPressed != QMessageBox::RestoreDefaults)
-        {
-            return;
-        }
-    }
-
-    // First, close all the open panes
-    if (!ClosePanesWithRollback(QVector<QString>()))
-    {
-        return;
-    }
-
-    // Disable updates while we restore the layout to avoid temporary glitches
-    // as the panes are moved around
-    m_mainWindow->setUpdatesEnabled(false);
-
-    AzToolsFramework::EntityIdList selectedEntityIds;
-
-    // Reset all of the settings, or windows opened outside of RestoreDefaultLayout won't be reset at all.
-    // Also ensure that this is done after CloseAllPanes, because settings will be saved in CloseAllPanes
-    if (resetSettings)
-    {
-        // Store off currently selected entities
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-        // Clear any selection
-        AzToolsFramework::EntityIdList noEntities;
-        AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, noEntities);
-
-        ViewLayoutState state;
-
-        state.viewPanes.push_back(LyViewPane::EntityOutliner);
-        state.viewPanes.push_back(LyViewPane::EntityInspector);
-        state.viewPanes.push_back(LyViewPane::AssetBrowser);
-        state.viewPanes.push_back(LyViewPane::Console);
-
-        if (!isPrefabSystemEnabled)
-        {
-            state.viewPanes.push_back(LyViewPane::LevelInspector);
-        }
-
-        state.mainWindowState = m_defaultMainWindowState;
-
-        {
-            AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
-            m_settings->setValue(s_lastLayoutName, QVariant::fromValue<ViewLayoutState>(state));
-        }
-
-        m_settings->sync();
-
-        // Let anything listening know to reset as well (*cough*CLayoutWnd*cough*)
-        emit layoutReset();
-
-        // Ensure that the main window knows it's new state
-        // otherwise when we load view panes that haven't been loaded,
-        // the main window will attempt to position them where they were last, not in their default spot
-        m_mainWindow->restoreState(m_defaultMainWindowState);
-    }
-
-    // Reset the default view panes to be opened. Used for restoring default layout and component entity layout.
-    const QtViewPane* entityOutlinerViewPane = OpenPane(LyViewPane::EntityOutliner, QtViewPane::OpenMode::UseDefaultState);
-    const QtViewPane* assetBrowserViewPane = OpenPane(LyViewPane::AssetBrowser, QtViewPane::OpenMode::UseDefaultState);
-    const QtViewPane* entityInspectorViewPane = OpenPane(LyViewPane::EntityInspector, QtViewPane::OpenMode::UseDefaultState);
-    const QtViewPane* consoleViewPane = OpenPane(LyViewPane::Console, QtViewPane::OpenMode::UseDefaultState);
-
-    const QtViewPane* levelInspectorPane = nullptr;
-    if (!isPrefabSystemEnabled)
-    {
-        levelInspectorPane = OpenPane(LyViewPane::LevelInspector, QtViewPane::OpenMode::UseDefaultState);
-    }
-
-    // This class does all kinds of behind the scenes magic to make docking / restore work, especially with groups
-    // so instead of doing our special default layout attach / docking right now, we want to make it happen
-    // after all of the other events have been processed.
-    QTimer::singleShot(0, [=]
-    {
-        // If we are using the new docking, set the right dock area to be absolute
-        // so that the inspector will be to the right of the viewport and console
-        m_advancedDockManager->setAbsoluteCornersForDockArea(m_mainWindow, Qt::RightDockWidgetArea);
-
-        // Retrieve the width of the screen that our main window is on so we can
-        // use it later for resizing our panes. The main window ends up being maximized
-        // when we restore the default layout, but even if we maximize the main window
-        // before doing anything else, its width won't update until after this has all
-        // been processed, so we need to resize the panes based on what the main window
-        // width WILL be after maximized
-        int screenWidth = QApplication::desktop()->screenGeometry(m_mainWindow).width();
-
-        // Add the console view pane first
-        m_mainWindow->addDockWidget(Qt::BottomDockWidgetArea, consoleViewPane->m_dockWidget);
-        consoleViewPane->m_dockWidget->setFloating(false);
-
-        if (entityInspectorViewPane)
-        {
-            m_mainWindow->addDockWidget(Qt::RightDockWidgetArea, entityInspectorViewPane->m_dockWidget);
-            entityInspectorViewPane->m_dockWidget->setFloating(false);
-
-            static const float tabWidgetWidthPercentage = 0.2f;
-            int newWidth = (float)screenWidth * tabWidgetWidthPercentage;
-
-            if (levelInspectorPane)
-            {
-                // Tab the entity inspector with the level Inspector so that when they are
-                // tabbed they will be given the default width, and move the entity inspector
-                // to be the first tab on the left and active
-                AzQtComponents::DockTabWidget* tabWidget = m_advancedDockManager->tabifyDockWidget(levelInspectorPane->m_dockWidget, entityInspectorViewPane->m_dockWidget, m_mainWindow);
-                if (tabWidget)
-                {
-                    tabWidget->moveTab(1, 0);
-                    tabWidget->setCurrentWidget(entityInspectorViewPane->m_dockWidget);
-
-                    QDockWidget* tabWidgetParent = qobject_cast<QDockWidget*>(tabWidget->parentWidget());
-                    m_mainWindow->resizeDocks({ tabWidgetParent }, { newWidth }, Qt::Horizontal);
-                }
-            }
-            else
-            {
-                m_mainWindow->resizeDocks({ entityInspectorViewPane->m_dockWidget }, { newWidth }, Qt::Horizontal);
-            }
-        }
-
-        if (assetBrowserViewPane && entityOutlinerViewPane)
-        {
-            m_mainWindow->addDockWidget(Qt::LeftDockWidgetArea, entityOutlinerViewPane->m_dockWidget);
-            entityOutlinerViewPane->m_dockWidget->setFloating(false);
-
-            m_mainWindow->addDockWidget(Qt::LeftDockWidgetArea, assetBrowserViewPane->m_dockWidget);
-            assetBrowserViewPane->m_dockWidget->setFloating(false);
-
-            m_advancedDockManager->splitDockWidget(m_mainWindow, entityOutlinerViewPane->m_dockWidget, assetBrowserViewPane->m_dockWidget, Qt::Vertical);
-
-            // Resize our entity outliner (and by proxy the asset browser split with it)
-            // so that they get an appropriate default width since the minimum sizes have
-            // been removed from these widgets
-            static const float entityOutlinerWidthPercentage = 0.15f;
-            int newWidth = (float)screenWidth * entityOutlinerWidthPercentage;
-            m_mainWindow->resizeDocks({ entityOutlinerViewPane->m_dockWidget }, { newWidth }, Qt::Horizontal);
-        }
-
-        // Re-enable updates now that we've finished restoring the layout
-        m_mainWindow->setUpdatesEnabled(true);
-
-        // Default layout should always be maximized
-        // (use window() because the MainWindow may be wrapped in another window
-        // like a WindowDecoratorWrapper or another QMainWindow for various layout reasons)
-        m_mainWindow->window()->showMaximized();
-
-        if (resetSettings)
-        {
-            // Restore selection
-            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
-        }
-    });
-}
-
-void QtViewPaneManager::SaveLayout(QString layoutName)
-{
-    if (!m_mainWindow || m_restoreInProgress)
-    {
-        return;
-    }
-
-    layoutName = layoutName.trimmed();
-
-    ViewLayoutState state;
-    foreach(const QtViewPane &pane, m_registeredPanes)
-    {
-        // Include all visible and tabbed panes in our layout, since tabbed panes
-        // won't be visible if they aren't the active tab, but still need to be
-        // retained in the layout
-        if (pane.IsVisible() || AzQtComponents::DockTabWidget::IsTabbed(pane.m_dockWidget))
-        {
-            state.viewPanes.push_back(pane.m_dockWidget->PaneName());
-        }
-    }
-
-    state.mainWindowState = m_advancedDockManager->saveState();
-
-    state.fakeDockWidgetGeometries = m_fakeDockWidgetGeometries;
-
-    SaveStateToLayout(state, layoutName);
-
-    AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequestBus::Events::Save);
-
-}
-
-void QtViewPaneManager::SaveStateToLayout(const ViewLayoutState& state, const QString& layoutName)
-{
-    const bool isNew = !HasLayout(layoutName);
-
-    {
-        AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
-        m_settings->setValue(layoutName, QVariant::fromValue<ViewLayoutState>(state));
-    }
-
-    m_settings->sync();
-
-    if (isNew)
-    {
-        emit savedLayoutsChanged();
-    }
-}
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-/*
- * This methods creates a fake wrapper dock widget around the passed dock widget. The returned dock widget has
- * no parent and can therefore be used for a contained QOpenGLWidget on macOS, since this doesn't work as expected
- * when the QOpenGLWidget has the application's main window as (grand)parent.
- * The return dock widget looks like a normal dock widget. It cannot be docked and no other dock widget can be
- * docked into it.
- */
-QDockWidget* QtViewPaneManager::ShowFakeNonDockableDockWidget(AzQtComponents::StyledDockWidget* dockWidget, QtViewPane* pane)
-{
-    dockWidget->customTitleBar()->setButtons({});
-    dockWidget->customTitleBar()->setContextMenuPolicy(Qt::NoContextMenu);
-    dockWidget->customTitleBar()->installEventFilter(new MouseEatingEventFilter(dockWidget));
-    auto fakeDockWidget = new AzQtComponents::StyledDockWidget(QString(), false, nullptr);
-    connect(dockWidget, &QObject::destroyed, fakeDockWidget, &QObject::deleteLater);
-    fakeDockWidget->setAllowedAreas(Qt::NoDockWidgetArea);
-    auto titleBar = fakeDockWidget->customTitleBar();
-    titleBar->setDragEnabled(true);
-    titleBar->setDrawSimple(true);
-    titleBar->setButtons({AzQtComponents::DockBarButton::MaximizeButton, AzQtComponents::DockBarButton::CloseButton});
-    fakeDockWidget->setWidget(dockWidget);
-    fakeDockWidget->show();
-    fakeDockWidget->setObjectName(dockWidget->objectName());
-
-    connect(fakeDockWidget, &AzQtComponents::StyledDockWidget::aboutToClose, this, [this, fakeDockWidget]() {
-        m_fakeDockWidgetGeometries[fakeDockWidget->objectName()] = fakeDockWidget->geometry();
-    });
-    if (pane->m_options.isDeletable)
-    {
-        fakeDockWidget->setAttribute(Qt::WA_DeleteOnClose);
-    }
-
-    return fakeDockWidget;
-}
-#endif
-
-void QtViewPaneManager::SerializeLayout(XmlNodeRef& parentNode) const
-{
-    ViewLayoutState state = GetLayout();
-
-    XmlNodeRef paneListNode = XmlHelpers::CreateXmlNode("ViewPanes");
-    parentNode->addChild(paneListNode);
-
-    for (const QString& paneName : state.viewPanes)
-    {
-        XmlNodeRef paneNode = XmlHelpers::CreateXmlNode("ViewPane");
-        paneNode->setContent(paneName.toUtf8().data());
-
-        paneListNode->addChild(paneNode);
-    }
-
-    XmlNodeRef windowStateNode = XmlHelpers::CreateXmlNode("WindowState");
-    windowStateNode->setContent(state.mainWindowState.toHex().data());
-
-    parentNode->addChild(windowStateNode);
-}
-
-bool QtViewPaneManager::DeserializeLayout(const XmlNodeRef& parentNode)
-{
-    ViewLayoutState state;
-
-    XmlNodeRef paneListNode = parentNode->findChild("ViewPanes");
-    if (!paneListNode)
-        return false;
-
-    for (int i = 0; i < paneListNode->getChildCount(); ++i)
-    {
-        XmlNodeRef paneNode = paneListNode->getChild(i);
-        state.viewPanes.push_back(QString(paneNode->getContent()));
-    }
-
-    XmlNodeRef windowStateNode = parentNode->findChild("WindowState");
-    if (!windowStateNode)
-        return false;
-
-    state.mainWindowState = QByteArray::fromHex(windowStateNode->getContent());
-
-    return RestoreLayout(state);
-}
-
-ViewLayoutState QtViewPaneManager::GetLayout() const
-{
-    ViewLayoutState state;
-
-    foreach(const QtViewPane &pane, m_registeredPanes)
-    {
-        // Include all visible and tabbed panes in our layout, since tabbed panes
-        // won't be visible if they aren't the active tab, but still need to be
-        // retained in the layout
-        if (pane.IsVisible() || AzQtComponents::DockTabWidget::IsTabbed(pane.m_dockWidget))
-        {
-            state.viewPanes.push_back(pane.m_dockWidget->PaneName());
-        }
-    }
-
-    state.mainWindowState = m_advancedDockManager->saveState();
-
-    state.fakeDockWidgetGeometries = m_fakeDockWidgetGeometries;
-
-    return state;
-}
-
-
-bool QtViewPaneManager::RestoreLayout(QString layoutName)
-{
-    if (m_restoreInProgress) // Against re-entrancy
-    {
-        return true;
-    }
-
-    QScopedValueRollback<bool> recursionGuard(m_restoreInProgress);
-    m_restoreInProgress = true;
-
-    layoutName = layoutName.trimmed();
-    if (layoutName.isEmpty())
-    {
-        return false;
-    }
-
-    ViewLayoutState state;
-    {
-        AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
-
-        if (!m_settings->contains(layoutName))
-        {
-            return false;
-        }
-
-        state = m_settings->value(layoutName).value<ViewLayoutState>();
-    }
-
-    // If we have the legacy UI disabled and are restoring the last user layout,
-    // if it doesn't contain the Entity Inspector and Outliner then we need to
-    // save their previous layout for them and switch them to the new default
-    // layout because they won't be able to do much without them
-    static const QString userLegacyLayout = "User Legacy Layout";
-    if (layoutName == s_lastLayoutName && !HasLayout(userLegacyLayout))
-    {
-        bool layoutHasEntityInspector = false;
-        bool layoutHasEntityOutliner = false;
-        for (const QString& paneName : state.viewPanes)
-        {
-            if (paneName == LyViewPane::EntityInspector)
-            {
-                layoutHasEntityInspector = true;
-            }
-            else if (paneName == LyViewPane::EntityOutliner)
-            {
-                layoutHasEntityOutliner = true;
-            }
-        }
-
-        if (!layoutHasEntityInspector || !layoutHasEntityOutliner)
-        {
-            SaveStateToLayout(state, userLegacyLayout);
-
-            QMessageBox box(AzToolsFramework::GetActiveWindow());
-            box.addButton(QMessageBox::Ok);
-            box.setWindowTitle(tr("Layout Saved"));
-            box.setText(tr("Your layout has been automatically updated for the new Component-Entity workflows. Your old layout has been saved as \"%1\" and can be restored from the View -> Layouts menu.").arg(userLegacyLayout));
-            box.exec();
-
-            return false;
-        }
-    }
-
-    if (!ClosePanesWithRollback(state.viewPanes))
-    {
-        return false;
-    }
-
-    // Store off currently selected entities
-    AzToolsFramework::EntityIdList selectedEntityIds;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    // Clear any selection
-    AzToolsFramework::EntityIdList noEntities;
-    AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, noEntities);
-
-    m_fakeDockWidgetGeometries = state.fakeDockWidgetGeometries;
-
-    for (const QString& paneName : state.viewPanes)
-    {
-        OpenPane(paneName, QtViewPane::OpenMode::OnlyOpen);
-    }
-
-    // must do this after opening all of the panes!
-    m_advancedDockManager->restoreState(state.mainWindowState);
-
-    AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
-
-    // In case of a crash it might happen that the QMainWindow state gets out of sync with the
-    // QtViewPaneManager state, which would result in we opening dock widgets that QMainWindow
-    // didn't know how to restore.
-    // Check if that happened and return false indicating the restore failed and giving caller
-    // a chance to restore the default layout.
-    if (AzToolsFramework::DockWidgetUtils::hasInvalidDockWidgets(m_mainWindow))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool QtViewPaneManager::RestoreLayout(const ViewLayoutState& state)
-{
-    m_fakeDockWidgetGeometries = state.fakeDockWidgetGeometries;
-
-    if (!ClosePanesWithRollback(state.viewPanes))
-    {
-        return false;
-    }
-
-    for (const QString& paneName : state.viewPanes)
-    {
-        OpenPane(paneName, QtViewPane::OpenMode::OnlyOpen);
-    }
-
-    // must do this after opening all of the panes!
-    m_advancedDockManager->restoreState(state.mainWindowState);
-
-    return true;
-}
-
-
-void QtViewPaneManager::RenameLayout(QString name, QString newName)
-{
-    name = name.trimmed();
-    newName = newName.trimmed();
-    if (name == newName || newName.isEmpty() || name.isEmpty())
-    {
-        return;
-    }
-
-    {
-        AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
-
-        m_settings->setValue(newName, m_settings->value(name));
-        m_settings->remove(name);
-    }
-
-    m_settings->sync();
-    emit savedLayoutsChanged();
-}
-
-void QtViewPaneManager::RemoveLayout(QString layoutName)
-{
-    layoutName = layoutName.trimmed();
-    if (layoutName.isEmpty())
-    {
-        return;
-    }
-
-    {
-        AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
-        m_settings->remove(layoutName.trimmed());
-    }
-
-    m_settings->sync();
-    emit savedLayoutsChanged();
-}
-
-bool QtViewPaneManager::HasLayout(const QString& name) const
-{
-    return LayoutNames().contains(name.trimmed(), Qt::CaseInsensitive);
-}
-
-QStringList QtViewPaneManager::LayoutNames(bool userLayoutsOnly) const
-{
-    QStringList layouts;
-
-    AzQtComponents::AutoSettingsGroup settingsGroupGuard(m_settings, GetFancyViewPaneStateGroupName());
-    layouts = m_settings->childKeys();
-
-    if (userLayoutsOnly)
-    {
-        layouts.removeOne(s_lastLayoutName); // "last" is internal
-    }
-    return layouts;
-}
-
-QtViewPanes QtViewPaneManager::GetRegisteredPanes(bool viewPaneMenuOnly) const
-{
-    if (!viewPaneMenuOnly)
-    {
-        return m_registeredPanes;
-    }
-
-    QtViewPanes panes;
-    panes.reserve(30); // approximate
-    std::copy_if(m_registeredPanes.cbegin(), m_registeredPanes.cend(), std::back_inserter(panes), [](QtViewPane pane)
-        {
-            return pane.m_options.showInMenu;
-        });
-
-    return panes;
-}
-
-QtViewPanes QtViewPaneManager::GetRegisteredMultiInstancePanes(bool viewPaneMenuOnly) const
-{
-    QtViewPanes panes;
-    panes.reserve(30); // approximate
-
-    if (viewPaneMenuOnly)
-    {
-        std::copy_if(m_registeredPanes.cbegin(), m_registeredPanes.cend(), std::back_inserter(panes), [](QtViewPane pane)
-            {
-                return pane.m_options.showInMenu && pane.m_options.canHaveMultipleInstances;
-            });
-    }
-    else
-    {
-        std::copy_if(m_registeredPanes.cbegin(), m_registeredPanes.cend(), std::back_inserter(panes), [](QtViewPane pane)
-            {
-                return pane.m_options.canHaveMultipleInstances;
-            });
-    }
-
-    return panes;
-}
-
-QtViewPanes QtViewPaneManager::GetRegisteredViewportPanes() const
-{
-    QtViewPanes viewportPanes;
-    viewportPanes.reserve(5); // approximate
-    std::copy_if(m_registeredPanes.cbegin(), m_registeredPanes.cend(), std::back_inserter(viewportPanes), [](QtViewPane pane)
-        {
-            return pane.IsViewportPane();
-        });
-
-    return viewportPanes;
-}
-
-int QtViewPaneManager::NextAvailableId()
-{
-    for (int candidate = ID_VIEW_OPENPANE_FIRST; candidate <= ID_VIEW_OPENPANE_LAST; ++candidate)
-    {
-        if (!m_knownIdsSet.contains(candidate))
-        {
-            m_knownIdsSet.push_back(candidate);
-            return candidate;
-        }
-    }
-
-    return -1;
-}
-
-QtViewPane* QtViewPaneManager::GetPane(int id)
-{
-    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
-            [id](const QtViewPane& pane) { return id == pane.m_id; });
-
-    return it == m_registeredPanes.end() ? nullptr : it;
-}
-
-QtViewPane* QtViewPaneManager::GetPane(const QString& name)
-{
-    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
-            [name](const QtViewPane& pane) { return name == pane.m_name; });
-
-    QtViewPane* foundPane = ((it == m_registeredPanes.end()) ? nullptr : it);
-
-    if (foundPane == nullptr)
-    {
-        // if we couldn't find the pane based on the name (which will be the title), look it up by saveKeyName next
-        it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
-            [name](const QtViewPane& pane) { return name == pane.m_options.saveKeyName; });
-
-        foundPane = ((it == m_registeredPanes.end()) ? nullptr : it);
-    }
-
-    return foundPane;
-}
-
-QtViewPane* QtViewPaneManager::GetViewportPane(int viewportType)
-{
-    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
-            [viewportType](const QtViewPane& pane) { return viewportType == pane.m_options.viewportType; });
-
-    return it == m_registeredPanes.end() ? nullptr : it;
-}
-
-QDockWidget* QtViewPaneManager::GetView(const QString& name)
-{
-    QtViewPane* pane = GetPane(name);
-    return pane ? pane->m_dockWidget : nullptr;
-}
-
-bool QtViewPaneManager::IsVisible(const QString& name)
-{
-    QtViewPane* view = GetPane(name);
-    return view && view->IsVisible();
-}
-
-bool QtViewPaneManager::IsPaneRegistered(const QString& name) const
-{
-    auto it = std::find_if(m_registeredPanes.begin(), m_registeredPanes.end(),
-        [name](const QtViewPane& pane) { return name == pane.m_name; });
-
-    return it != m_registeredPanes.end();
-}
-
-#include <moc_QtViewPaneManager.cpp>
diff --git a/Code/Sandbox/Editor/QtViewPaneManager.h b/Code/Sandbox/Editor/QtViewPaneManager.h
deleted file mode 100644
index d106329be3..0000000000
--- a/Code/Sandbox/Editor/QtViewPaneManager.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "Include/EditorCoreAPI.h"
-#endif
-
-#if !defined(Q_MOC_RUN)
-#include "Include/EditorCoreAPI.h"
-#include <QtViewPane.h>
-#include "Resource.h"
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzQtComponents/Components/DockTabWidget.h>
-#include <AzQtComponents/Components/StyledDockWidget.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
-
-#include <QObject>
-#include <QVector>
-#include <QPointer>
-#include <QSettings>
-#include <QAction>
-#include <QByteArray>
-#include <QList>
-
-#include <LyViewPaneNames.h>
-
-#include <AzCore/std/functional.h>
-#endif
-
-class QMainWindow;
-struct ViewLayoutState;
-
-namespace AzQtComponents
-{
-    class DockMainWindow;
-    class StyledDockWidget;
-    class FancyDocking;
-
-} // namespace AzQtComponents
-
-typedef AZStd::function<QWidget*(QWidget*)> ViewPaneFactory;
-
-class DockWidget
-    : public AzQtComponents::StyledDockWidget
-{
-    Q_OBJECT
-public:
-    explicit DockWidget(QWidget* widget, QtViewPane* pane, QSettings* settings, QMainWindow* parent, AzQtComponents::FancyDocking* advancedDockManager);
-
-    QString PaneName() const;
-    void RestoreState(bool forceDefault = false);
-
-    /**
-     * Gets the setting name for a given pane.
-     */
-    static QString settingsKey(const QString& paneName);
-
-protected:
-    bool event(QEvent* qtEvent) override;
-private:
-    void reparentToMainWindowFix();
-    QRect ProperGeometry() const;
-    QString settingsKey() const;
-    QSettings* const m_settings;
-    QMainWindow* const m_mainWindow;
-    QtViewPane* const m_pane;
-    AzQtComponents::FancyDocking* m_advancedDockManager;
-};
-
-struct QtViewPane
-{
-    enum class OpenMode
-    {
-        None                = 0x0,
-        UseDefaultState     = 0x1, // Use default geometry and docking position when opening
-        MultiplePanes       = 0x2,
-        RestoreLayout       = 0x4,
-        OnlyOpen            = 0x8,
-    };
-    Q_DECLARE_FLAGS(OpenModes, OpenMode)
-
-    enum class CloseMode
-    {
-        None                = 0x0,
-        Destroy             = 0x1, // Destroy window when closing it
-        Force               = 0x2 // Force the dialog to close instead of querying the view if we can close
-    };
-    Q_DECLARE_FLAGS(CloseModes, CloseMode)
-
-    int m_id; // between ID_VIEW_OPENPANE_FIRST and ID_VIEW_OPENPANE_LAST
-    QString m_name;
-    QString m_category;
-    ViewPaneFactory m_factoryFunc;
-    QPointer<DockWidget> m_dockWidget;
-    AzToolsFramework::ViewPaneOptions m_options;
-    QList<DockWidget*> m_dockWidgetInstances;
-
-    bool IsValid() const
-    {
-        return m_id >= ID_VIEW_OPENPANE_FIRST && m_id <= ID_VIEW_OPENPANE_LAST && !m_name.isEmpty();
-    }
-
-    bool IsVisible() const
-    {
-        return m_dockWidget && m_dockWidget->isVisible();
-    }
-
-    bool IsConstructed() const
-    {
-        return m_dockWidget != nullptr;
-    }
-
-    QWidget* Widget() const
-    {
-        return IsConstructed() ? m_dockWidget->widget() : nullptr;
-    }
-
-    bool IsViewportPane() const
-    {
-        return m_category == QLatin1String("Viewport") && m_options.viewportType != -1;
-    }
-
-    bool IsPreview() const
-    {
-        return m_options.isPreview;
-    }
-
-    QWidget* CreateWidget();
-    bool Close(CloseModes = CloseMode::Destroy);
-    bool CloseInstance(QDockWidget* dockWidget, CloseModes closeModes = CloseMode::Destroy);
-};
-
-typedef QVector<QtViewPane> QtViewPanes;
-
-class EDITOR_CORE_API QtViewPaneManager
-    : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QtViewPaneManager(QObject* parent = nullptr);
-    ~QtViewPaneManager();
-    void SetMainWindow(AzQtComponents::DockMainWindow*, QSettings* settings, const QByteArray& lastMainWindowState);
-    void RegisterPane(const QString &name, const QString &category, ViewPaneFactory, const AzToolsFramework::ViewPaneOptions& = {});
-    void UnregisterPane(const QString& name);
-    QtViewPane* GetPane(int id);
-    QtViewPane* GetPane(const QString& name);
-    QtViewPane* GetViewportPane(int viewportType);
-    QDockWidget* GetView(const QString& name);
-    bool IsVisible(const QString& name);
-    bool IsPaneRegistered(const QString& name) const;
-
-    /**
-     * Constructs and shows a view pane.
-     * The pane is a QDockWidget who's widget was created with QtViewPane::m_factoryFunc.
-     * If useDefaultState is true, the default docking area and geometry are used, not the last one.
-     *
-     * Returns the view on success, nullptr otherwise
-     */
-    const QtViewPane* OpenPane(const QString& name, QtViewPane::OpenModes = QtViewPane::OpenMode::None);
-    QDockWidget* InstancePane(const QString& name);
-    bool ClosePane(const QString& name, QtViewPane::CloseModes = QtViewPane::CloseMode::None);
-    bool ClosePaneInstance(const QString& name, QDockWidget* dockPanel, QtViewPane::CloseModes = QtViewPane::CloseMode::None);
-
-    /**
-     * If the pane is not visible, it will be opened and made visible.
-     * If the pane is visible, it will be closed.
-     */
-    void TogglePane(const QString& name);
-    bool CloseAllPanes();
-
-    /**
-     * Closes all non standard panes. Standard panes are for example rollup and console.
-     */
-    void CloseAllNonStandardPanes();
-
-    /**
-     * Creates and returns a widget by calling QtViewPane::m_factoryFunc() for the view pane with name paneName.
-     * This is similar to OpenPane(), except that there's no dock widget involved. The widget will be used in a
-     * CLayoutViewPane (the embedded viewports).
-     *
-     * Returns nullptr if the specified pane name is not registered.
-     */
-    QWidget* CreateWidget(const QString& paneName);
-
-    void RestoreLayout(bool restoreDefaults);
-    bool RestoreLayout(QString name);
-    void RestoreDefaultLayout(bool resetSettings = false);
-    void SaveLayout();
-    void SaveLayout(QString name);
-    void RenameLayout(QString name, QString newName);
-    void RemoveLayout(QString name);
-    bool HasLayout(const QString& name) const;
-    QStringList LayoutNames(bool userLayoutsOnly = true) const;
-
-    void SerializeLayout(XmlNodeRef& parentNode) const;
-    bool DeserializeLayout(const XmlNodeRef& parentNode);
-
-    static QtViewPaneManager* instance();
-    static bool exists();
-
-    /**
-     * Returns the known view panes (regardless of them being open or not).
-     * If viewPaneMenuOnly is true, only those appearing in "View->Open View Pane" will be show,
-     * meaning panes such as the rollup bar or console aren't returned.
-     */
-    QtViewPanes GetRegisteredPanes(bool viewPaneMenuOnly = true) const;
-    QtViewPanes GetRegisteredMultiInstancePanes(bool viewPaneMenuOnly = true) const;
-    QtViewPanes GetRegisteredViewportPanes() const; // only returns the Top/Bottom/Left etc. ones
-
-    //! Attempts to closes everything not in the input list. Returns false if any failed, and restores all previously opened windows if it does. Returns true otherwise
-    bool ClosePanesWithRollback(const QVector<QString>& panesToKeepOpen);
-
-signals:
-    void savedLayoutsChanged();
-    void layoutReset();
-    void viewPaneCreated(const QtViewPane* pane);
-    void registeredPanesChanged();
-
-private:
-    friend class DockWidget;
-    ViewLayoutState GetLayout() const;
-    bool RestoreLayout(const ViewLayoutState& state);
-    void SaveStateToLayout(const ViewLayoutState& state, const QString& layoutName);
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    QDockWidget* ShowFakeNonDockableDockWidget(AzQtComponents::StyledDockWidget* dockWidget, QtViewPane* pane);
-#endif
-
-    bool ClosePane(QtViewPane* pane, QtViewPane::CloseModes closeModes = QtViewPane::CloseMode::None);
-    int NextAvailableId();
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QtViewPanes m_registeredPanes;
-    QByteArray m_defaultMainWindowState;
-    QByteArray m_loadedMainWindowState;
-    QMainWindow* m_mainWindow;
-    QSettings* m_settings;
-    QList<int> m_knownIdsSet; // Semantically a set, but QList is faster for small collections than QSet
-    bool m_restoreInProgress;
-    QMap<QString, QRect> m_fakeDockWidgetGeometries;
-
-    QPointer<AzQtComponents::FancyDocking> m_advancedDockManager;
-
-    using EditorComponentModeNotificationBusImpl = AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBusImpl;
-    EditorComponentModeNotificationBusImpl m_componentModeNotifications; /**< Helper for EditorComponentModeNotificationBus so 
-                                                                           *  QtViewPaneManager does not need to inherit directly from it. */
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-template<class TWidget>
-bool RegisterQtViewPane([[maybe_unused]] IEditor* editor, const QString& name, const QString& category, const AzToolsFramework::ViewPaneOptions& options = {})
-{
-    QtViewPaneManager::instance()->RegisterPane(name, category, [](QWidget* parent = nullptr) { return new TWidget(parent); }, options);
-    return true;
-}
-
-template<class TWidget>
-bool RegisterQtViewPaneWithName([[maybe_unused]] IEditor* editor, const QString& name, const QString& category, const AzToolsFramework::ViewPaneOptions& options = {})
-{
-    QtViewPaneManager::instance()->RegisterPane(name, category, [name](QWidget* parent = nullptr) { return new TWidget(name, parent); }, options);
-    return true;
-}
-
-template<class TWidget>
-void UnregisterQtViewPane()
-{
-    // always close any views that the pane is responsible for before you remove it!
-    GetIEditor()->CloseView(CQtViewClass<TWidget>::GetClassID());
-    GetIEditor()->GetClassFactory()->UnregisterClass(CQtViewClass<TWidget>::GetClassID());
-}
-
-template<typename TWidget>
-TWidget* FindViewPane(const QString& name)
-{
-    QtViewPane* pane = QtViewPaneManager::exists() ? QtViewPaneManager::instance()->GetPane(name) : nullptr;
-    return pane ? qobject_cast<TWidget*>(pane->Widget()) : nullptr;
-}
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QtViewPane::OpenModes)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QtViewPane::CloseModes)
-
-
diff --git a/Code/Sandbox/Editor/QuickAccessBar.cpp b/Code/Sandbox/Editor/QuickAccessBar.cpp
deleted file mode 100644
index d63980a4e9..0000000000
--- a/Code/Sandbox/Editor/QuickAccessBar.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog bar for quickly accessing menu items and cvars
-
-
-#include "EditorDefs.h"
-
-#include "QuickAccessBar.h"
-
-// Qt
-#include <QCompleter>
-#include <QAction>
-#include <QMenuBar>
-#include <QStringListModel>
-
-// Editor
-#include "MainWindow.h"
-#include "ActionManager.h"
-#include "KeyboardCustomizationSettings.h"
-#include "CryEdit.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_QuickAccessBar.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-CQuickAccessBar::CQuickAccessBar(QWidget* pParent)
-    : QWidget(pParent, Qt::FramelessWindowHint|Qt::WindowStaysOnTopHint)
-    , m_lastViewPaneMapVersion(-1)
-    , m_completer(new QCompleter(this))
-    , m_model(new QStringListModel(this))
-    , m_ui(new Ui::QuickAccessBar)
-{
-    m_ui->setupUi(this);
-    m_ui->m_inputEdit->installEventFilter(this);
-    m_ui->m_inputEdit->setCompleter(m_completer);
-    m_completer->setModel(m_model);
-    m_completer->setCaseSensitivity(Qt::CaseInsensitive);
-    m_completer->setFilterMode(Qt::MatchContains);
-    setFocusProxy(m_ui->m_inputEdit);
-    OnInitDialog();
-
-    connect(m_ui->m_inputEdit, &QLineEdit::returnPressed, this, &CQuickAccessBar::OnOK);
-}
-
-CQuickAccessBar::~CQuickAccessBar()
-{
-
-}
-
-void CQuickAccessBar::OnInitDialog()
-{
-    // Make this window 50% alpha.
-    setWindowOpacity(0.5);
-
-    m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-
-    CollectMenuItems(MainWindow::instance()->menuBar());
-
-    AddMRUFileItems();
-
-    // Add console variables & commands.
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-    std::vector<const char*> cmds;
-    cmds.resize(console->GetNumVars());
-    size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
-    for (int i = 0; i < cmdCount; ++i)
-    {
-        m_model->setStringList(m_model->stringList() += cmds[i]);
-    }
-}
-
-void CQuickAccessBar::OnOK()
-{
-    QString menuCmd = m_ui->m_inputEdit->text();
-    if (!menuCmd.isEmpty())
-    {
-        auto actionItem = m_menuActionTable.find(menuCmd);
-        if (actionItem != m_menuActionTable.end())
-        {
-            actionItem->second->trigger();
-        }
-        else
-        {
-            GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(menuCmd.toUtf8().data());
-        }
-
-        m_ui->m_inputEdit->clear();
-    }
-
-    setVisible(false);
-}
-
-void CQuickAccessBar::OnCancel()
-{
-    setVisible(false);
-}
-
-bool CQuickAccessBar::eventFilter(QObject* object, QEvent* event)
-{
-    if (object == m_ui->m_inputEdit && event->type() == QEvent::FocusOut)
-    {
-        OnCancel();
-    }
-    return false;
-}
-
-void CQuickAccessBar::showEvent([[maybe_unused]] QShowEvent* event)
-{
-    const int viewPaneVersion = MainWindow::instance()->ViewPaneVersion();
-
-    if (viewPaneVersion != m_lastViewPaneMapVersion)
-    {
-        m_lastViewPaneMapVersion = viewPaneVersion;
-        m_model->setStringList(QStringList());
-        m_menuActionTable.clear();
-        CollectMenuItems(MainWindow::instance()->menuBar());
-    }
-
-    m_ui->m_inputEdit->setFocus();
-}
-
-void CQuickAccessBar::AddMRUFileItems()
-{
-    RecentFileList* pMRUList = CCryEditApp::instance()->GetRecentFileList();
-
-    // someone may set HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer\NoRecentDocsHistory to 1, thus pMRUList is a nullptr
-    if (!pMRUList)
-    {
-        return;
-    }
-
-    for (int i = 0; i < pMRUList->GetSize(); ++i)
-    {
-        QString mruText;
-        pMRUList->GetDisplayName(mruText, i, "");
-        if (mruText.isEmpty() || !(*pMRUList)[i].endsWith(m_levelExtension))
-        {
-            continue;
-        }
-        m_model->setStringList(m_model->stringList() += mruText);
-        m_menuActionTable[mruText] = MainWindow::instance()->GetActionManager()->GetAction(ID_FILE_MRU_FILE1 + i);
-    }
-
-    m_model->sort(0);
-}
-
-void CQuickAccessBar::CollectMenuItems(QMenuBar* menuBar)
-{
-    foreach (auto action,  menuBar->actions())
-    {
-        CollectMenuItems(action, QString());
-    }
-    m_model->sort(0);
-}
-
-void CQuickAccessBar::CollectMenuItems(QAction* action, const QString& path)
-{
-    const QString actionText = RemoveAcceleratorAmpersands(action->text());
-    const QString newPath = path.isEmpty() ? actionText : (path + "." + actionText);
-    if (action->menu())
-    {
-        foreach (auto subAction, action->menu()->actions())
-        {
-            CollectMenuItems(subAction, newPath);
-        }
-    }
-    else
-    {
-        const int id = action->data().toInt();
-        if (id == 0 || actionText.isEmpty())
-        {
-            return;
-        }
-
-        m_model->setStringList(m_model->stringList() += newPath);
-        m_menuActionTable[newPath] = action;
-    }
-}
-
-#include <moc_QuickAccessBar.cpp>
diff --git a/Code/Sandbox/Editor/QuickAccessBar.h b/Code/Sandbox/Editor/QuickAccessBar.h
deleted file mode 100644
index 5859c86869..0000000000
--- a/Code/Sandbox/Editor/QuickAccessBar.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog bar for quickly accessing menu items and cvars
-
-#ifndef CRYINCLUDE_EDITOR_QUICKACCESSBAR_H
-#define CRYINCLUDE_EDITOR_QUICKACCESSBAR_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#endif
-
-class QAction;
-class QCompleter;
-class QMenuBar;
-class QStringListModel;
-
-namespace Ui
-{
-    class QuickAccessBar;
-}
-
-class CQuickAccessBar
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    CQuickAccessBar(QWidget* pParent = nullptr);
-    ~CQuickAccessBar();
-
-    bool eventFilter(QObject* object, QEvent* event) override;
-
-protected:
-    void showEvent(QShowEvent* event) override;
-
-    virtual void OnInitDialog();
-    virtual void OnOK();
-    virtual void OnCancel();
-
-    std::map<QString, QAction*> m_menuActionTable;
-    int m_lastViewPaneMapVersion;
-
-    void AddMRUFileItems();
-private:
-    void CollectMenuItems(QMenuBar* menuBar);
-    void CollectMenuItems(QAction* action, const QString& path);
-
-    QCompleter* m_completer;
-    QStringListModel* m_model;
-
-    QScopedPointer<Ui::QuickAccessBar> m_ui;
-    const char* m_levelExtension = nullptr;
-};
-
-#endif // CRYINCLUDE_EDITOR_QUICKACCESSBAR_H
diff --git a/Code/Sandbox/Editor/RenderHelpers/AxisHelper.cpp b/Code/Sandbox/Editor/RenderHelpers/AxisHelper.cpp
deleted file mode 100644
index 0df1e42720..0000000000
--- a/Code/Sandbox/Editor/RenderHelpers/AxisHelper.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "AxisHelperShared.inl"
diff --git a/Code/Sandbox/Editor/RenderHelpers/AxisHelper.h b/Code/Sandbox/Editor/RenderHelpers/AxisHelper.h
deleted file mode 100644
index f05d58712f..0000000000
--- a/Code/Sandbox/Editor/RenderHelpers/AxisHelper.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_RENDERHELPERS_AXISHELPER_H
-#define CRYINCLUDE_EDITOR_RENDERHELPERS_AXISHELPER_H
-#pragma once
-
-#include "IEditor.h" // for AxisConstrains and RefCoordSys
-
-struct DisplayContext;
-struct HitContext;
-struct IDisplayViewport;
-
-//////////////////////////////////////////////////////////////////////////
-struct SGizmoParameters
-{
-    bool axisGizmoText;
-    bool enabled;
-    float axisGizmoScale;
-    AxisConstrains axisConstraint;
-    RefCoordSys referenceCoordSys;
-
-    SGizmoParameters()
-        : axisGizmoText(false)
-        , enabled(true)
-        , axisGizmoScale(1.0f)
-        , axisConstraint(AXIS_TERRAIN)
-        , referenceCoordSys(COORDS_LOCAL)
-    {
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Helper Axis object.
-//////////////////////////////////////////////////////////////////////////
-class CAxisHelper
-{
-public:
-    enum EHelperMode
-    {
-        MOVE_MODE    = 0x1,
-        SCALE_MODE   = 0x2,
-        ROTATE_MODE  = 0x4,
-        SELECT_MODE  = 0x8,
-        ROTATE_CIRCLE_MODE = 0x10,
-    };
-
-    CAxisHelper();
-
-    void SetMode(int nModeFlags);
-    void DrawAxis(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc);
-    void DrawDome(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc, AABB& objectBox);
-    bool HitTest(const Matrix34& worldTM, const SGizmoParameters& setup, HitContext& hc);
-
-    bool HitTestForRotationCircle(const Matrix34& worldTM, IDisplayViewport* view, const QPoint& pos, float fHitWidth, Vec3* pOutHitPos = NULL, Vec3* pOutHitNormal = NULL);
-
-    void SetHighlightAxis(int axis) { m_highlightAxis = axis; };
-    int  GetHighlightAxis() const { return m_highlightAxis; };
-
-private:
-    void Prepare(const Matrix34& worldTM, const SGizmoParameters& setup, IDisplayViewport* view);
-    float GetDistance2D(IDisplayViewport* view, const QPoint& p, const Vec3& wp);
-
-    int m_nModeFlags;
-    int m_highlightAxis;
-    int m_highlightMode;
-    int m_currentMode;
-    bool m_bHighlightRotationCircle;
-
-    float m_fScreenScale;
-    bool m_bNeedX;
-    bool m_bNeedY;
-    bool m_bNeedZ;
-    float m_size;
-    Matrix34 m_matrix;
-};
-
-#endif // CRYINCLUDE_EDITOR_RENDERHELPERS_AXISHELPER_H
-
diff --git a/Code/Sandbox/Editor/RenderHelpers/AxisHelperShared.inl b/Code/Sandbox/Editor/RenderHelpers/AxisHelperShared.inl
deleted file mode 100644
index 35ed2dd133..0000000000
--- a/Code/Sandbox/Editor/RenderHelpers/AxisHelperShared.inl
+++ /dev/null
@@ -1,848 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "AxisHelper.h"
-
-#include "Objects/DisplayContext.h"
-#include "Include/IDisplayViewport.h"
-#include "Include/HitContext.h"
-#include "Util/Math.h"
-#include "IObjectManager.h"
-#include <Cry_Geo.h>
-
-const float kPlaneScale = 0.3f;
-const float kBoldLine3D = 4.f;
-const float kBoldLine2D = 2.f;
-const float kSelectionBallScale = 0.05f;
-const float kRotateCircleRadiusScale = 0.2f;
-
-//////////////////////////////////////////////////////////////////////////
-CAxisHelper::CAxisHelper()
-    : m_matrix(IDENTITY)
-{
-    m_nModeFlags = MOVE_MODE;
-    m_currentMode = MOVE_MODE;
-    m_highlightMode = 1;
-    m_highlightAxis = 0;
-    m_bHighlightRotationCircle = false;
-
-    m_bNeedX = true;
-    m_bNeedY = true;
-    m_bNeedZ = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisHelper::SetMode(int nModeFlags)
-{
-    m_nModeFlags = nModeFlags;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisHelper::Prepare(const Matrix34& worldTM, const SGizmoParameters& setup, IDisplayViewport* view)
-{
-    m_fScreenScale = view->GetScreenScaleFactor(worldTM.GetTranslation());
-    m_size = setup.axisGizmoScale * m_fScreenScale;
-
-    m_bNeedX = true;
-    m_bNeedY = true;
-    m_bNeedZ = true;
-
-    IDisplayViewport::EAxis axis = IDisplayViewport::AXIS_NONE;
-    bool b2D = false;
-
-    view->GetPerpendicularAxis(&axis, &b2D);
-    switch (axis)
-    {
-    case static_cast<IDisplayViewport::EAxis>(AXIS_X):
-        m_bNeedX = false;
-        break;
-    case static_cast<IDisplayViewport::EAxis>(AXIS_Y):
-        m_bNeedY = false;
-        break;
-    case static_cast<IDisplayViewport::EAxis>(AXIS_Z):
-        m_bNeedZ = false;
-        break;
-    }
-
-    m_matrix = worldTM;
-    RefCoordSys refCoordSys = setup.referenceCoordSys;
-    if (b2D && refCoordSys == COORDS_VIEW)
-    {
-        m_matrix = view->GetViewTM();
-        m_matrix.SetTranslation(worldTM.GetTranslation());
-    }
-    m_matrix.OrthonormalizeFast();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisHelper::DrawDome(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc, AABB& objectBox)
-{
-    Prepare(worldTM, setup, dc.view);
-    Vec3 x(m_size, 0, 0);
-    Vec3 y(0, m_size, 0);
-    Vec3 z(0, 0, m_size);
-
-
-    int prevRState = dc.GetState();
-
-    if (!(dc.flags & DISPLAY_2D))
-    {
-        dc.DepthTestOff();
-    }
-
-    dc.PushMatrix(m_matrix);
-    dc.SetDrawInFrontMode(true);
-
-    float radius = objectBox.GetRadius();
-    dc.DrawCircle(Vec3(0, 0, 0), radius);
-    dc.DrawCircle(Vec3(0, 0, 0), radius / 3.0f);
-
-    dc.DrawArc(Vec3(0, 0, 0), radius, 0.0f, 180.0f, 1, Vec3(0, -1, 0));
-    dc.DrawArc(Vec3(0, 0, 0), radius, 90.0f, 180.0f, 1, Vec3(1, 0, 0));
-
-
-    dc.PopMatrix();
-    if (!(dc.flags & DISPLAY_2D))
-    {
-        dc.DepthTestOn();
-    }
-
-    dc.SetState(prevRState);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CAxisHelper::DrawAxis(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc)
-{
-    Prepare(worldTM, setup, dc.view);
-
-    Vec3 x(m_size, 0, 0);
-    Vec3 y(0, m_size, 0);
-    Vec3 z(0, 0, m_size);
-
-    int prevRState = dc.GetState();
-
-    if (!(dc.flags & DISPLAY_2D))
-    {
-        dc.DepthTestOff();
-    }
-
-    dc.PushMatrix(m_matrix);
-    dc.SetDrawInFrontMode(true);
-
-    Vec3 colSelected(1, 1, 0);
-    Vec3 axisColor(1, 1, 1);
-    Vec3 disabledColor(0.75, 0.75, 0.75);
-
-    Matrix34 worldTMWithoutScale(worldTM);
-    worldTMWithoutScale.OrthonormalizeFast();
-    float textSize = 1.4f;
-
-    if (!(m_nModeFlags & ROTATE_CIRCLE_MODE))
-    {
-        dc.SetColor(setup.enabled ? axisColor : disabledColor);
-        if (m_bNeedX && setup.axisGizmoText)
-        {
-            dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(x), textSize, "x");
-        }
-        if (m_bNeedY && setup.axisGizmoText)
-        {
-            dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(y), textSize, "y");
-        }
-        if (m_bNeedZ && setup.axisGizmoText)
-        {
-            dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(z), textSize, "z");
-        }
-    }
-
-    int axis = setup.axisConstraint;
-    if (m_highlightAxis)
-    {
-        axis = m_highlightAxis;
-    }
-
-    float lineWidth = kBoldLine3D;
-    if (dc.flags & DISPLAY_2D)
-    {
-        lineWidth = kBoldLine2D;
-    }
-
-    float linew[3];
-    linew[0] = linew[1] = linew[2] = 0;
-    Vec3 colX, colY, colZ;
-    if (setup.enabled)
-    {
-        colX = Vec3(1, 0, 0);
-        colY = Vec3(0, 1, 0);
-        colZ = Vec3(0, 0, 1);
-    }
-    else
-    {
-        colX = colY = colZ = disabledColor;
-    }
-    Vec3 colXArrow = colX, colYArrow = colY, colZArrow = colZ;
-    if (!(m_nModeFlags & ROTATE_CIRCLE_MODE))
-    {
-        if (axis)
-        {
-            float col[4] = { 1, 0, 0, 1 };
-            if (axis == AXIS_X || axis == AXIS_XY || axis == AXIS_XZ || axis == AXIS_XYZ)
-            {
-                colX = colSelected;
-                dc.SetColor(colSelected);
-                if (m_bNeedX && setup.axisGizmoText)
-                {
-                    dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(x), textSize, "x");
-                }
-                linew[0] = lineWidth;
-            }
-            if (axis == AXIS_Y || axis == AXIS_XY || axis == AXIS_YZ || axis == AXIS_XYZ)
-            {
-                colY = colSelected;
-                dc.SetColor(colSelected);
-                if (m_bNeedY && setup.axisGizmoText)
-                {
-                    dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(y), textSize, "y");
-                }
-                linew[1] = lineWidth;
-            }
-            if (axis == AXIS_Z || axis == AXIS_XZ || axis == AXIS_YZ || axis == AXIS_XYZ)
-            {
-                colZ = colSelected;
-                dc.SetColor(colSelected);
-                if (m_bNeedZ && setup.axisGizmoText)
-                {
-                    dc.DrawTextLabel(worldTMWithoutScale.TransformPoint(z), textSize, "z");
-                }
-                linew[2] = lineWidth;
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Calc sizes.
-    //////////////////////////////////////////////////////////////////////////
-    float headOfs[8];
-    float headScl[8];
-    headOfs[MOVE_MODE] = 0;
-    headScl[MOVE_MODE] = 0.07f * m_fScreenScale;
-    headOfs[ROTATE_MODE] = 0;
-    headScl[ROTATE_MODE] = 0.01f * m_fScreenScale;
-    headOfs[SCALE_MODE] = 0;
-    headScl[SCALE_MODE] = 0.01f * m_fScreenScale;
-    if (m_nModeFlags == (MOVE_MODE | ROTATE_MODE | SCALE_MODE))
-    {
-        headOfs[ROTATE_MODE] += 0.05f * m_fScreenScale;
-        headOfs[SCALE_MODE] += 0.1f * m_fScreenScale;
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    if (!(m_nModeFlags & ROTATE_CIRCLE_MODE))
-    {
-        if (m_bNeedX)
-        {
-            dc.SetColor(colX);
-            dc.SetLineWidth(linew[0]);
-            dc.DrawLine(Vec3(0, 0, 0), x + Vec3(headOfs[SCALE_MODE], 0, 0));
-        }
-        if (m_bNeedY)
-        {
-            dc.SetColor(colY);
-            dc.SetLineWidth(linew[1]);
-            dc.DrawLine(Vec3(0, 0, 0), y + Vec3(0, headOfs[SCALE_MODE], 0));
-        }
-        if (m_bNeedZ)
-        {
-            dc.SetColor(colZ);
-            dc.SetLineWidth(linew[2]);
-            dc.DrawLine(Vec3(0, 0, 0), z + Vec3(0, 0, headOfs[SCALE_MODE]));
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Draw Move Arrows.
-    //////////////////////////////////////////////////////////////////////////
-    if (m_nModeFlags & MOVE_MODE)
-    {
-        if (m_bNeedX)
-        {
-            if (m_highlightMode == 1)
-            {
-                dc.SetColor(colX);
-            }
-            else
-            {
-                dc.SetColor(colXArrow);
-            }
-            dc.DrawArrow(x - x * 0.1f, x, headScl[MOVE_MODE]);
-        }
-        if (m_bNeedY)
-        {
-            if (m_highlightMode == 1)
-            {
-                dc.SetColor(colY);
-            }
-            else
-            {
-                dc.SetColor(colYArrow);
-            }
-            dc.DrawArrow(y - y * 0.1f, y, headScl[MOVE_MODE]);
-        }
-        if (m_bNeedZ)
-        {
-            if (m_highlightMode == 1)
-            {
-                dc.SetColor(colZ);
-            }
-            else
-            {
-                dc.SetColor(colZArrow);
-            }
-            dc.DrawArrow(z - z * 0.1f, z, headScl[MOVE_MODE]);
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Draw Scale Boxes.
-    //////////////////////////////////////////////////////////////////////////
-    if (m_nModeFlags & SCALE_MODE)
-    {
-        dc.SetColor(QColor(128, 128, 0));
-        Vec3 boxsz = Vec3(headScl[SCALE_MODE], headScl[SCALE_MODE], headScl[SCALE_MODE]);
-        dc.DrawSolidBox(-boxsz, boxsz);
-        if (m_bNeedX)
-        {
-            if (m_highlightMode == 3)
-            {
-                dc.SetColor(colX);
-            }
-            else
-            {
-                dc.SetColor(colXArrow);
-            }
-            dc.DrawSolidBox(x + boxsz + Vec3(headOfs[SCALE_MODE], 0, 0), x - boxsz + Vec3(headOfs[SCALE_MODE], 0, 0));
-        }
-        if (m_bNeedY)
-        {
-            if (m_highlightMode == 3)
-            {
-                dc.SetColor(colY);
-            }
-            else
-            {
-                dc.SetColor(colYArrow);
-            }
-            dc.DrawSolidBox(y + boxsz + Vec3(0, headOfs[SCALE_MODE], 0), y - boxsz + Vec3(0, headOfs[SCALE_MODE], 0));
-        }
-        if (m_bNeedZ)
-        {
-            if (m_highlightMode == 3)
-            {
-                dc.SetColor(colZ);
-            }
-            else
-            {
-                dc.SetColor(colZArrow);
-            }
-            dc.DrawSolidBox(z + boxsz + Vec3(0, 0, headOfs[SCALE_MODE]), z - boxsz + Vec3(0, 0, headOfs[SCALE_MODE]));
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Draw Rotate Circle
-    //////////////////////////////////////////////////////////////////////////
-    if (m_nModeFlags & ROTATE_CIRCLE_MODE)
-    {
-        if (m_bHighlightRotationCircle)
-        {
-            dc.SetLineWidth(5);
-            dc.SetColor(colSelected);
-        }
-        else
-        {
-            dc.SetLineWidth(0);
-            dc.SetColor(axisColor);
-        }
-        dc.DrawCircle(Vec3(0, 0, 0), kRotateCircleRadiusScale * m_fScreenScale, 0);
-    }
-
-    dc.SetLineWidth(0);
-
-    // If only in move mode.
-    if (m_nModeFlags == MOVE_MODE)
-    {
-        //////////////////////////////////////////////////////////////////////////
-        // Draw axis planes.
-        //////////////////////////////////////////////////////////////////////////
-        Vec3 colXY[2];
-        Vec3 colXZ[2];
-        Vec3 colYZ[2];
-
-        if (setup.enabled)
-        {
-            colX = Vec3(1, 0, 0);
-            colY = Vec3(0, 1, 0);
-            colZ = Vec3(0, 0, 1);
-        }
-        else
-        {
-            colX = colY = colZ = disabledColor;
-        }
-        colXY[0] = colX;
-        colXY[1] = colY;
-        colXZ[0] = colX;
-        colXZ[1] = colZ;
-        colYZ[0] = colY;
-        colYZ[1] = colZ;
-
-        linew[0] = linew[1] = linew[2] = 0;
-        if (axis)
-        {
-            if (axis == AXIS_XY)
-            {
-                colXY[0] = colSelected;
-                colXY[1] = colSelected;
-                linew[0] = lineWidth;
-            }
-            else if (axis == AXIS_XZ)
-            {
-                colXZ[0] = colSelected;
-                colXZ[1] = colSelected;
-                linew[1] = lineWidth;
-            }
-            else if (axis == AXIS_YZ)
-            {
-                colYZ[0] = colSelected;
-                colYZ[1] = colSelected;
-                linew[2] = lineWidth;
-            }
-        }
-
-        if (!(dc.flags & DISPLAY_2D))
-        {
-            if (axis == AXIS_TERRAIN)
-            {
-                dc.SetColor(colSelected, 0.4f);
-            }
-            else
-            {
-                dc.SetColor(QColor(128, 32, 32), 0.4f);
-            }
-            Vec3 org = worldTM.GetTranslation();
-            dc.DrawBall(Vec3(0.0f),  m_size * kSelectionBallScale);
-        }
-
-        dc.SetColor(QColor(255, 255, 0), 0.5f);
-
-        float sz = m_size * kPlaneScale;
-        Vec3 p1(sz, sz, 0);
-        Vec3 p2(sz, 0, sz);
-        Vec3 p3(0, sz, sz);
-
-        float colAlpha = 1.0f;
-        x *= kPlaneScale;
-        y *= kPlaneScale;
-        z *= kPlaneScale;
-
-        // XY
-        if (m_bNeedX && m_bNeedY)
-        {
-            dc.SetLineWidth(linew[0]);
-            dc.SetColor(colXY[0], colAlpha);
-            dc.DrawLine(p1, p1 - x);
-            dc.SetColor(colXY[1], colAlpha);
-            dc.DrawLine(p1, p1 - y);
-        }
-
-        // XZ
-        if (m_bNeedX && m_bNeedZ)
-        {
-            dc.SetLineWidth(linew[1]);
-            dc.SetColor(colXZ[0], colAlpha);
-            dc.DrawLine(p2, p2 - x);
-            dc.SetColor(colXZ[1], colAlpha);
-            dc.DrawLine(p2, p2 - z);
-        }
-
-        // YZ
-        if (m_bNeedY && m_bNeedZ)
-        {
-            dc.SetLineWidth(linew[2]);
-            dc.SetColor(colYZ[0], colAlpha);
-            dc.DrawLine(p3, p3 - y);
-            dc.SetColor(colYZ[1], colAlpha);
-            dc.DrawLine(p3, p3 - z);
-        }
-
-        dc.SetLineWidth(0);
-
-        colAlpha = 0.25f;
-
-        if (axis == AXIS_XY && m_bNeedX && m_bNeedY)
-        {
-            dc.CullOff();
-            dc.SetColor(colSelected, colAlpha);
-            dc.DrawQuad(p1, p1 - x, p1 - x - y, p1 - y);
-            dc.CullOn();
-        }
-        else if (axis == AXIS_XZ && m_bNeedX && m_bNeedZ)
-        {
-            dc.CullOff();
-            dc.SetColor(colSelected, colAlpha);
-            dc.DrawQuad(p2, p2 - x, p2 - x - z, p2 - z);
-            dc.CullOn();
-        }
-        else if (axis == AXIS_YZ && m_bNeedY && m_bNeedZ)
-        {
-            dc.CullOff();
-            dc.SetColor(colSelected, colAlpha);
-            dc.DrawQuad(p3, p3 - y, p3 - y - z, p3 - z);
-            dc.CullOn();
-        }
-    }
-
-    dc.PopMatrix();
-    if (!(dc.flags & DISPLAY_2D))
-    {
-        dc.DepthTestOn();
-    }
-
-    dc.SetState(prevRState);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CAxisHelper::HitTestForRotationCircle(const Matrix34& worldTM, IDisplayViewport* view, const QPoint& pos, float fHitWidth, Vec3* pOutHitPos, Vec3* pOutHitNormal)
-{
-    Ray ray;
-    view->ViewToWorldRay(pos, ray.origin, ray.direction);
-
-    const float fCircleRadius = kRotateCircleRadiusScale * m_fScreenScale;
-
-    std::vector<Vec3> vList;
-    float step = 30.0f / 180 * gf_PI;
-    for (float angle = 0; angle < 360.0f / 180 * gf_PI + step; angle += step)
-    {
-        Vec3 p(0, fCircleRadius * sin(angle), fCircleRadius * cos(angle));
-        vList.push_back(worldTM.TransformPoint(p));
-    }
-
-    Vec3 vDir0 = (vList[0] - vList[1]).GetNormalized();
-    Vec3 vDir1 = (vList[2] - vList[1]).GetNormalized();
-    Vec3 vNormal = vDir1.Cross(vDir0).GetNormalized();
-
-    if (pOutHitNormal)
-    {
-        *pOutHitNormal = vNormal;
-    }
-
-    Vec3 vShortestHitPos;
-    float shortestDist = 3e11f;
-
-    for (int i = 0, iCount(vList.size()); i < iCount; ++i)
-    {
-        const Vec3& v0 = vList[i];
-        const Vec3& v1 = vList[(i + 1) % iCount];
-        Vec3 vRight = (v1 - v0).Cross(vNormal).GetNormalized() * m_fScreenScale * fHitWidth;
-
-        Vec3 p_v0 = v0 + vRight;
-        Vec3 p_v1 = v1 + vRight;
-        Vec3 p_v2 = v1 - vRight;
-        Vec3 p_v3 = v0 - vRight;
-
-        Vec3 hitPos;
-        if (Intersect::Ray_Triangle(ray, p_v0, p_v1, p_v2, hitPos) || Intersect::Ray_Triangle(ray, p_v0, p_v2, p_v3, hitPos) ||
-            Intersect::Ray_Triangle(ray, p_v0, p_v2, p_v1, hitPos) || Intersect::Ray_Triangle(ray, p_v0, p_v3, p_v2, hitPos))
-        {
-            Vec3 hitPosToEdge;
-            if (PointToLineDistance(v0, v1, hitPos, hitPosToEdge))
-            {
-                if (!pOutHitPos)
-                {
-                    return true;
-                }
-                float hitDistance = hitPosToEdge.GetDistance(hitPos);
-                if (hitDistance < shortestDist)
-                {
-                    vShortestHitPos = hitPosToEdge;
-                    shortestDist = hitDistance;
-                }
-            }
-        }
-    }
-
-    if (shortestDist < 3e10f)
-    {
-        if (pOutHitPos)
-        {
-            *pOutHitPos = vShortestHitPos;
-        }
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CAxisHelper::HitTest(const Matrix34& worldTM, const SGizmoParameters& setup, HitContext& hc)
-{
-    if (hc.distanceTolerance != 0)
-    {
-        return 0;
-    }
-
-    Prepare(worldTM, setup, hc.view);
-
-    m_bHighlightRotationCircle = false;
-    hc.manipulatorMode = 0;
-
-    if (m_nModeFlags == ROTATE_CIRCLE_MODE)
-    {
-        if (HitTestForRotationCircle(m_matrix, hc.view, hc.point2d, 0.05f))
-        {
-            m_bHighlightRotationCircle = true;
-            hc.manipulatorMode = 4;
-            return true;
-        }
-        return false;
-    }
-
-    Vec3 x(m_size, 0, 0);
-    Vec3 y(0, m_size, 0);
-    Vec3 z(0, 0, m_size);
-
-    Vec3 pos = m_matrix.GetTranslation();
-
-    Vec3 intPoint;
-    hc.view->ViewToWorldRay(hc.point2d, hc.raySrc, hc.rayDir);
-    Ray ray(hc.raySrc, hc.rayDir);
-    Sphere sphere(pos, m_size + 0.1f * m_fScreenScale);
-    if (!Intersect::Ray_SphereFirst(ray, sphere, intPoint))
-    {
-        m_highlightAxis = 0;
-        return false;
-    }
-
-    x = m_matrix.TransformVector(x);
-    y = m_matrix.TransformVector(y);
-    z = m_matrix.TransformVector(z);
-
-    float sz = m_size * kPlaneScale;
-    Vec3 p1(sz, sz, 0);
-    Vec3 p2(sz, 0, sz);
-    Vec3 p3(0, sz, sz);
-
-    p1 = m_matrix.TransformPoint(p1);
-    p2 = m_matrix.TransformPoint(p2);
-    p3 = m_matrix.TransformPoint(p3);
-
-    Vec3 planeX = x * kPlaneScale;
-    Vec3 planeY = y * kPlaneScale;
-    Vec3 planeZ = z * kPlaneScale;
-
-    int axis = 0;
-
-    Sphere testSphere(pos, m_size * kSelectionBallScale);
-    if (!hc.b2DViewport && m_nModeFlags == MOVE_MODE && Intersect::Ray_SphereFirst(ray, testSphere, intPoint))
-    {
-        axis = AXIS_TERRAIN;
-    }
-    else
-    {
-        // Start the closestAxis value at the maximum selection radius based on the user's settings
-        float closestAxis = aznumeric_cast<float>(GetIEditor()->GetObjectManager()->GetAxisHelperHitRadius());
-
-        float distanceToAxis = hc.view->GetDistanceToLine(pos, pos + x, hc.point2d);
-        if(distanceToAxis < closestAxis)
-        {
-            axis = AXIS_X;
-            closestAxis = distanceToAxis;
-        }
-        distanceToAxis = hc.view->GetDistanceToLine(pos, pos + y, hc.point2d);
-        if(distanceToAxis < closestAxis)
-        {
-            axis = AXIS_Y;
-            closestAxis = distanceToAxis;
-        }
-        distanceToAxis = hc.view->GetDistanceToLine(pos, pos + z, hc.point2d);
-        if(distanceToAxis < closestAxis)
-        {
-            axis = AXIS_Z;
-            closestAxis = distanceToAxis;
-        }
-        if (m_nModeFlags == MOVE_MODE)
-        {
-            // If only in move mode.
-            distanceToAxis = hc.view->GetDistanceToLine(p1, p1 - planeX, hc.point2d);
-            if(distanceToAxis < closestAxis)
-            {
-                axis = AXIS_XY;
-                closestAxis = distanceToAxis;
-            }
-            distanceToAxis = hc.view->GetDistanceToLine(p1, p1 - planeY, hc.point2d);
-            if(distanceToAxis < closestAxis)
-            {
-                axis = AXIS_XY;
-                closestAxis = distanceToAxis;
-            }
-            distanceToAxis = hc.view->GetDistanceToLine(p2, p2 - planeX, hc.point2d);
-            if(distanceToAxis < closestAxis)
-            {
-                axis = AXIS_XZ;
-                closestAxis = distanceToAxis;
-            }
-            distanceToAxis = hc.view->GetDistanceToLine(p2, p2 - planeZ, hc.point2d);
-            if(distanceToAxis < closestAxis)
-            {
-                axis = AXIS_XZ;
-                closestAxis = distanceToAxis;
-            }
-            distanceToAxis = hc.view->GetDistanceToLine(p3, p3 - planeY, hc.point2d);
-            if(distanceToAxis < closestAxis)
-            {
-                axis = AXIS_YZ;
-                closestAxis = distanceToAxis;
-            }
-            distanceToAxis = hc.view->GetDistanceToLine(p3, p3 - planeZ, hc.point2d);
-            if(distanceToAxis < closestAxis)
-            {
-                axis = AXIS_YZ;
-                closestAxis = distanceToAxis;
-            }
-            if (axis != 0)
-            {
-                hc.manipulatorMode = 1;
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Calc sizes.
-    //////////////////////////////////////////////////////////////////////////
-    float headOfs[8];
-    float headScl[8];
-    headOfs[MOVE_MODE] = 0;
-    headScl[MOVE_MODE] = 0.07f * m_fScreenScale;
-    headOfs[ROTATE_MODE] = 0;
-    headScl[ROTATE_MODE] = 0.01f * m_fScreenScale;
-    headOfs[SCALE_MODE] = 0;
-    headScl[SCALE_MODE] = 0.01f * m_fScreenScale;
-    if (m_nModeFlags == (MOVE_MODE | ROTATE_MODE | SCALE_MODE))
-    {
-        headOfs[ROTATE_MODE] += 0.05f * m_fScreenScale;
-        headOfs[SCALE_MODE] += 0.1f * m_fScreenScale;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    if (axis == 0 && (m_nModeFlags & ROTATE_MODE))
-    {
-        Vec3 x2(m_size, 0, 0);
-        Vec3 y2(0, m_size, 0);
-        Vec3 z2(0, 0, m_size);
-        int hitr = 10;
-        if (m_bNeedX)
-        {
-            if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(x2 + Vec3(headOfs[ROTATE_MODE], 0, 0))) < hitr)
-            {
-                axis = AXIS_X;
-                hc.manipulatorMode = 2;
-            }
-        }
-        if (m_bNeedY)
-        {
-            if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(y2 + Vec3(0, headOfs[ROTATE_MODE], 0))) < hitr)
-            {
-                axis = AXIS_Y;
-                hc.manipulatorMode = 2;
-            }
-        }
-        if (m_bNeedZ)
-        {
-            if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(z2 + Vec3(0, 0, headOfs[ROTATE_MODE]))) < hitr)
-            {
-                axis = AXIS_Z;
-                hc.manipulatorMode = 2;
-            }
-        }
-    }
-    if (m_nModeFlags & SCALE_MODE)
-    {
-        Vec3 x2(m_size, 0, 0);
-        Vec3 y2(0, m_size, 0);
-        Vec3 z2(0, 0, m_size);
-        int hitr = 14;
-        if (GetDistance2D(hc.view, hc.point2d, m_matrix.GetTranslation()) < hitr + 2)
-        {
-            axis = AXIS_XYZ;
-            hc.manipulatorMode = 3;
-        }
-        if (axis == 0)
-        {
-            if (m_bNeedX)
-            {
-                if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(x2 + Vec3(headOfs[SCALE_MODE], 0, 0))) < hitr)
-                {
-                    axis = AXIS_X;
-                    hc.manipulatorMode = 3;
-                }
-            }
-            if (m_bNeedY)
-            {
-                if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(y2 + Vec3(0, headOfs[SCALE_MODE], 0))) < hitr)
-                {
-                    axis = AXIS_Y;
-                    hc.manipulatorMode = 3;
-                }
-            }
-            if (m_bNeedZ)
-            {
-                if (GetDistance2D(hc.view, hc.point2d, m_matrix.TransformPoint(z2 + Vec3(0, 0, headOfs[SCALE_MODE]))) < hitr)
-                {
-                    axis = AXIS_Z;
-                    hc.manipulatorMode = 3;
-                }
-            }
-        }
-    }
-
-    if (axis != 0)
-    {
-        if (hc.manipulatorMode == 0)
-        {
-            if (m_nModeFlags & MOVE_MODE)
-            {
-                hc.manipulatorMode = 1;
-            }
-            else if (m_nModeFlags & ROTATE_MODE)
-            {
-                hc.manipulatorMode = 2;
-            }
-            else if (m_nModeFlags & SCALE_MODE)
-            {
-                hc.manipulatorMode = 3;
-            }
-        }
-        hc.axis = axis;
-        hc.dist = 0;
-        m_highlightMode = hc.manipulatorMode;
-    }
-
-    m_highlightAxis = axis;
-
-    return axis != 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CAxisHelper::GetDistance2D(IDisplayViewport* view, const QPoint& p, const Vec3& wp)
-{
-    QPoint vp = view->WorldToView(wp);
-    float dx = static_cast<float>(p.x() - vp.x());
-    float dy = static_cast<float>(p.y() - vp.y());
-    return sqrtf(dx * dx + dy * dy);
-}
-
diff --git a/Code/Sandbox/Editor/RenderViewport.cpp b/Code/Sandbox/Editor/RenderViewport.cpp
deleted file mode 100644
index c8aafb1151..0000000000
--- a/Code/Sandbox/Editor/RenderViewport.cpp
+++ /dev/null
@@ -1,4135 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation filefov
-
-
-#include "EditorDefs.h"
-
-#include "RenderViewport.h"
-
-// Qt
-#include <QPainter>
-#include <QScopedValueRollback>
-#include <QCheckBox>
-#include <QMessageBox>
-#include <QTimer>
-
-// AzCore
-#include <AzCore/Console/Console.h>
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzCore/Math/Frustum.h>
-#include <AzCore/Math/VectorConversions.h>
-#include <AzCore/std/sort.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-
-// AzFramework
-#include <AzFramework/Components/CameraBus.h>
-#include <AzFramework/Viewport/DisplayContextRequestBus.h>
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-#if defined(AZ_PLATFORM_WINDOWS)
-#   include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
-#endif // defined(AZ_PLATFORM_WINDOWS)
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>                   // for AzFramework::InputDeviceMouse
-
-// AzQtComponents
-#include <AzQtComponents/Utilities/QtWindowUtilities.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
-#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
-#include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
-#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
-
-
-// CryCommon
-#include <CryCommon/HMDBus.h>
-
-// AzFramework
-#include <AzFramework/Render/IntersectorInterface.h>
-
-// Editor
-#include "Util/fastlib.h"
-#include "CryEditDoc.h"
-#include "GameEngine.h"
-#include "ViewManager.h"
-#include "Objects/DisplayContext.h"
-#include "DisplaySettings.h"
-#include "Include/IObjectManager.h"
-#include "Include/IDisplayViewport.h"
-#include "Objects/ObjectManager.h"
-#include "ProcessInfo.h"
-#include "IPostEffectGroup.h"
-#include "EditorPreferencesPageGeneral.h"
-
-#include "ViewPane.h"
-#include "CustomResolutionDlg.h"
-#include "AnimationContext.h"
-#include "Objects/SelectionGroup.h"
-#include "Core/QtEditorApplication.h"
-
-// ComponentEntityEditorPlugin
-#include <Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h>
-
-// LmbrCentral
-#include <LmbrCentral/Rendering/EditorCameraCorrectionBus.h>
-
-#include <QtGui/private/qhighdpiscaling_p.h>
-
-#include <IEntityRenderState.h>
-#include <IPhysics.h>
-#include <IStatObj.h>
-
-AZ_CVAR(
-    bool, ed_visibility_use, true, nullptr, AZ::ConsoleFunctorFlags::Null,
-    "Enable/disable using the new IVisibilitySystem for Entity visibility determination");
-
-CRenderViewport* CRenderViewport::m_pPrimaryViewport = nullptr;
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-void StopFixedCursorMode();
-void StartFixedCursorMode(QObject *viewport);
-#endif
-
-#define MAX_ORBIT_DISTANCE (2000.0f)
-#define RENDER_MESH_TEST_DISTANCE (0.2f)
-#define CURSOR_FONT_HEIGHT  8.0f
-#define FORWARD_DIRECTION Vec3(0, 1, 0)
-
-static const char TextCantCreateCameraNoLevel[] = "Cannot create camera when no level is loaded.";
-
-class EditorEntityNotifications
-    : public AzToolsFramework::EditorEntityContextNotificationBus::Handler
-    , public AzToolsFramework::EditorContextMenuBus::Handler
-{
-public:
-    EditorEntityNotifications(CRenderViewport& renderViewport)
-        : m_renderViewport(renderViewport)
-    {
-        AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
-        AzToolsFramework::EditorContextMenuBus::Handler::BusConnect();
-    }
-
-    ~EditorEntityNotifications() override
-    {
-        AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorContextMenuBus::Handler::BusDisconnect();
-    }
-
-    // AzToolsFramework::EditorEntityContextNotificationBus
-    void OnStartPlayInEditor() override
-    {
-        m_renderViewport.OnStartPlayInEditor();
-    }
-    void OnStopPlayInEditor() override
-    {
-        m_renderViewport.OnStopPlayInEditor();
-    }
-
-    // AzToolsFramework::EditorContextMenu::Bus
-    void PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags) override
-    {
-        m_renderViewport.PopulateEditorGlobalContextMenu(menu, point, flags);
-    }
-private:
-    CRenderViewport& m_renderViewport;
-};
-
-struct CRenderViewport::SScopedCurrentContext
-{
-    const CRenderViewport* m_viewport;
-    CRenderViewport::SPreviousContext m_previousContext;
-
-    explicit SScopedCurrentContext(const CRenderViewport* viewport)
-        : m_viewport(viewport)
-    {
-        m_previousContext = viewport->SetCurrentContext();
-
-        // During normal updates of RenderViewport the value of m_cameraSetForWidgetRenderingCount is expected to be 0.
-        // This is to guarantee no loss in performance by tracking unnecessary calls to SetCurrentContext/RestorePreviousContext.
-        // If some code makes additional calls to Pre/PostWidgetRendering then the assert will be triggered because
-        // m_cameraSetForWidgetRenderingCount will be greater than 0.
-        // There is a legitimate case where the counter can be greater than 0. This is when QtViewport is processing mouse callbacks.
-        // QtViewport::MouseCallback() is surrounded by Pre/PostWidgetRendering and the m_processingMouseCallbacksCounter
-        // tracks this specific case. If an update of a RenderViewport happens while processing the mouse callback,
-        // for example when showing a QMessageBox, then both counters must match.
-        AZ_Assert(viewport->m_cameraSetForWidgetRenderingCount == viewport->m_processingMouseCallbacksCounter,
-            "SScopedCurrentContext constructor was called while viewport widget context is active "
-            "- this is unnecessary");
-    }
-
-    ~SScopedCurrentContext()
-    {
-        m_viewport->RestorePreviousContext(m_previousContext);
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// CRenderViewport
-//////////////////////////////////////////////////////////////////////////
-
-CRenderViewport::CRenderViewport(const QString& name, QWidget* parent)
-    : QtViewport(parent)
-    , m_Camera(GetIEditor()->GetSystem()->GetViewCamera())
-    , m_camFOV(gSettings.viewports.fDefaultFov)
-    , m_defaultViewName(name)
-{
-    // need this to be set in order to allow for language switching on Windows
-    setAttribute(Qt::WA_InputMethodEnabled);
-    LockCameraMovement(true);
-
-    CRenderViewport::SetViewTM(m_Camera.GetMatrix());
-    m_defaultViewTM.SetIdentity();
-
-    if (GetIEditor()->GetViewManager()->GetSelectedViewport() == nullptr)
-    {
-        GetIEditor()->GetViewManager()->SelectViewport(this);
-    }
-
-    GetIEditor()->RegisterNotifyListener(this);
-
-    m_displayContext.pIconManager = GetIEditor()->GetIconManager();
-    GetIEditor()->GetUndoManager()->AddListener(this);
-
-    m_PhysicalLocation.SetIdentity();
-
-    // The renderer requires something, so don't allow us to shrink to absolutely nothing
-    // This won't in fact stop the viewport from being shrunk, when it's the centralWidget for
-    // the MainWindow, but it will stop the viewport from getting resize events
-    // once it's smaller than that, which from the renderer's perspective works out
-    // to be the same thing.
-    setMinimumSize(50, 50);
-
-    OnCreate();
-
-    setFocusPolicy(Qt::StrongFocus);
-
-    Camera::EditorCameraRequestBus::Handler::BusConnect();
-    m_editorEntityNotifications = AZStd::make_unique<EditorEntityNotifications>(*this);
-
-    m_manipulatorManager = GetIEditor()->GetViewManager()->GetManipulatorManager();
-    if (!m_pPrimaryViewport)
-    {
-        m_pPrimaryViewport = this;
-    }
-
-    m_hwnd = renderOverlayHWND();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CRenderViewport::~CRenderViewport()
-{
-    AzFramework::WindowNotificationBus::Event(m_hwnd, &AzFramework::WindowNotificationBus::Handler::OnWindowClosed);
-
-    if (m_pPrimaryViewport == this)
-    {
-        m_pPrimaryViewport = nullptr;
-    }
-
-    AzFramework::WindowRequestBus::Handler::BusDisconnect();
-    DisconnectViewportInteractionRequestBus();
-    m_editorEntityNotifications.reset();
-    Camera::EditorCameraRequestBus::Handler::BusDisconnect();
-    OnDestroy();
-    GetIEditor()->GetUndoManager()->RemoveListener(this);
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CRenderViewport message handlers
-//////////////////////////////////////////////////////////////////////////
-int CRenderViewport::OnCreate()
-{
-    CreateRenderContext();
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::resizeEvent(QResizeEvent* event)
-{
-    PushDisableRendering();
-    QtViewport::resizeEvent(event);
-    PopDisableRendering();
-
-    const QRect rcWindow = rect().translated(mapToGlobal(QPoint()));
-
-    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_MOVE, rcWindow.left(), rcWindow.top());
-
-    m_rcClient = rect();
-    m_rcClient.setBottomRight(WidgetToViewport(m_rcClient.bottomRight()));
-
-    gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, width(), height());
-
-    // We queue the window resize event because the render overlay may be hidden.
-    // If the render overlay is not visible, the native window that is backing it will
-    // also be hidden, and it will not resize until it becomes visible.
-    m_windowResizedEvent = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::paintEvent([[maybe_unused]] QPaintEvent* event)
-{
-    // Do not call CViewport::OnPaint() for painting messages
-    // FIXME: paintEvent() isn't the best place for such logic. Should listen to proper eNotify events and to the stuff there instead. (Repeats for other view port classes too).
-    CGameEngine* ge = GetIEditor()->GetGameEngine();
-    if ((ge && ge->IsLevelLoaded()) || (GetType() != ET_ViewportCamera))
-    {
-        setRenderOverlayVisible(true);
-        m_isOnPaint = true;
-        Update();
-        m_isOnPaint = false;
-    }
-    else
-    {
-        setRenderOverlayVisible(false);
-        QPainter painter(this); // device context for painting
-
-        // draw gradient background
-        const QRect rc = rect();
-        QLinearGradient gradient(rc.topLeft(), rc.bottomLeft());
-        gradient.setColorAt(0, QColor(80, 80, 80));
-        gradient.setColorAt(1, QColor(200, 200, 200));
-        painter.fillRect(rc, gradient);
-
-        // if we have some level loaded/loading/new
-        // we draw a text
-        if (!GetIEditor()->GetLevelFolder().isEmpty())
-        {
-            const int kFontSize = 200;
-            const char* kFontName = "Arial";
-            const QColor kTextColor(255, 255, 255);
-            const QColor kTextShadowColor(0, 0, 0);
-            const QFont font(kFontName, kFontSize / 10.0);
-            painter.setFont(font);
-
-            QString friendlyName = QFileInfo(GetIEditor()->GetLevelName()).fileName();
-            const QString strMsg = tr("Preparing level %1...").arg(friendlyName);
-
-            // draw text shadow
-            painter.setPen(kTextShadowColor);
-            painter.drawText(rc, Qt::AlignCenter, strMsg);
-            painter.setPen(kTextColor);
-            // offset rect for normal text
-            painter.drawText(rc.translated(-1, -1), Qt::AlignCenter, strMsg);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::mousePressEvent(QMouseEvent* event)
-{
-    // There's a bug caused by having a mix of MFC and Qt where if the render viewport
-    // had focus and then an MFC widget gets focus, Qt internally still thinks
-    // that the widget that had focus before (the render viewport) has it now.
-    // Because of this, Qt won't set the window that the viewport is in as the
-    // focused widget, and the render viewport won't get keyboard input.
-    // Forcing the window to activate should allow the window to take focus
-    // and then the call to setFocus() will give it focus.
-    // All so that the ::keyPressEvent() gets called.
-    ActivateWindowAndSetFocus();
-
-    GetIEditor()->GetViewManager()->SelectViewport(this);
-
-    QtViewport::mousePressEvent(event);
-}
-
-AzToolsFramework::ViewportInteraction::MousePick CRenderViewport::BuildMousePickInternal(const QPoint& point) const
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-
-    MousePick mousePick;
-    Vec3 from, dir;
-    ViewToWorldRay(point, from, dir);
-    mousePick.m_rayOrigin = LYVec3ToAZVec3(from);
-    mousePick.m_rayDirection = LYVec3ToAZVec3(dir);
-    mousePick.m_screenCoordinates = AzFramework::ScreenPoint(point.x(), point.y());
-    return mousePick;
-}
-
-AzToolsFramework::ViewportInteraction::MousePick CRenderViewport::BuildMousePick(const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-
-    PreWidgetRendering();
-    const MousePick mousePick = BuildMousePickInternal(point);
-    PostWidgetRendering();
-    return mousePick;
-}
-
-AzToolsFramework::ViewportInteraction::MouseInteraction CRenderViewport::BuildMouseInteractionInternal(
-    const AzToolsFramework::ViewportInteraction::MouseButtons buttons,
-    const AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
-    const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-
-    MouseInteraction mouse;
-    mouse.m_interactionId.m_cameraId = m_viewEntityId;
-    mouse.m_interactionId.m_viewportId = GetViewportId();
-    mouse.m_mouseButtons = buttons;
-    mouse.m_mousePick = mousePick;
-    mouse.m_keyboardModifiers = modifiers;
-    return mouse;
-}
-
-AzToolsFramework::ViewportInteraction::MouseInteraction CRenderViewport::BuildMouseInteraction(
-    const Qt::MouseButtons buttons, const Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-
-    return BuildMouseInteractionInternal(
-        BuildMouseButtons(buttons),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(WidgetToViewport(point)));
-}
-
-namespace RenderViewportUtil
-{
-    static bool JustAltHeld(const Qt::KeyboardModifiers modifiers)
-    {
-        return (modifiers & Qt::ShiftModifier) == 0
-            && (modifiers & Qt::ControlModifier) == 0
-            && (modifiers & Qt::AltModifier) != 0;
-    }
-
-    static bool NoModifiersHeld(const Qt::KeyboardModifiers modifiers)
-    {
-        return (modifiers & Qt::ShiftModifier) == 0
-            && (modifiers & Qt::ControlModifier) == 0
-            && (modifiers & Qt::AltModifier) == 0;
-    }
-
-    static bool AllowDolly(const Qt::KeyboardModifiers modifiers)
-    {
-        return JustAltHeld(modifiers);
-    }
-
-    static bool AllowOrbit(const Qt::KeyboardModifiers modifiers)
-    {
-        return JustAltHeld(modifiers);
-    }
-
-    static bool AllowPan(const Qt::KeyboardModifiers modifiers)
-    {
-        // begin pan with alt (inverted movement) or no modifiers
-        return JustAltHeld(modifiers) || NoModifiersHeld(modifiers);
-    }
-
-    static bool InvertPan(const Qt::KeyboardModifiers modifiers)
-    {
-        return JustAltHeld(modifiers);
-    }
-} // namespace RenderViewportUtil
-
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    if (!m_renderer)
-    {
-        return;
-    }
-
-    // Force the visible object cache to be updated - this is to ensure that
-    // selection will work properly even if helpers are not being displayed,
-    // in which case the cache is not updated every frame.
-    if (m_displayContext.settings && !m_displayContext.settings->IsDisplayHelpers())
-    {
-        GetIEditor()->GetObjectManager()->ForceUpdateVisibleObjectCache(m_displayContext);
-    }
-
-    const auto scaledPoint = WidgetToViewport(point);
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        MouseButtonsFromButton(MouseButton::Left),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    bool manipulatorInteraction = false;
-    EditorInteractionSystemViewportSelectionRequestBus::EventResult(
-        manipulatorInteraction, AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseManipulatorInteraction,
-        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-
-    if (!manipulatorInteraction)
-    {
-        if (RenderViewportUtil::AllowOrbit(modifiers))
-        {
-            m_bInOrbitMode = true;
-            m_orbitTarget =
-                GetViewTM().GetTranslation() + GetViewTM().TransformVector(FORWARD_DIRECTION) * m_orbitDistance;
-
-            // mouse buttons are treated as keys as well
-            if (m_pressedKeyState == KeyPressedState::AllUp)
-            {
-                m_pressedKeyState = KeyPressedState::PressedThisFrame;
-            }
-
-            m_mousePos = scaledPoint;
-            m_prevMousePos = scaledPoint;
-
-            HideCursor();
-            CaptureMouse();
-
-            // no further handling of left mouse button down
-            return;
-        }
-
-        EditorInteractionSystemViewportSelectionRequestBus::Event(
-            AzToolsFramework::GetEntityContextId(),
-            &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleMouseViewportInteraction,
-            MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    // Convert point to position on terrain.
-    if (!m_renderer)
-    {
-        return;
-    }
-
-    // Update viewports after done with actions.
-    GetIEditor()->UpdateViews(eUpdateObjects);
-
-    const auto scaledPoint = WidgetToViewport(point);
-
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        MouseButtonsFromButton(MouseButton::Left),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    if (m_bInOrbitMode)
-    {
-        m_bInOrbitMode = false;
-
-        ReleaseMouse();
-        ShowCursor();
-    }
-
-    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-        AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    const auto scaledPoint = WidgetToViewport(point);
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        MouseButtonsFromButton(MouseButton::Left),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-        AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-        MouseInteractionEvent(mouseInteraction, MouseEvent::DoubleClick));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    SetFocus();
-
-    const auto scaledPoint = WidgetToViewport(point);
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        MouseButtonsFromButton(MouseButton::Right),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-        AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-
-    if (RenderViewportUtil::AllowDolly(modifiers))
-    {
-        m_bInZoomMode = true;
-    }
-    else
-    {
-        m_bInRotateMode = true;
-    }
-
-    // mouse buttons are treated as keys as well
-    if (m_pressedKeyState == KeyPressedState::AllUp)
-    {
-        m_pressedKeyState = KeyPressedState::PressedThisFrame;
-    }
-
-    m_mousePos = scaledPoint;
-    m_prevMousePos = m_mousePos;
-
-    HideCursor();
-
-    // we can't capture the mouse here, or it will stop the popup menu
-    // when the mouse is released.
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    const auto scaledPoint = WidgetToViewport(point);
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        MouseButtonsFromButton(MouseButton::Right),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-        AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-
-    m_bInRotateMode = false;
-    m_bInZoomMode = false;
-
-    ReleaseMouse();
-
-    if (!m_bInMoveMode)
-    {
-        ShowCursor();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    const auto scaledPoint = WidgetToViewport(point);
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        MouseButtonsFromButton(MouseButton::Middle),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    if (RenderViewportUtil::AllowPan(modifiers))
-    {
-        m_bInMoveMode = true;
-
-        // mouse buttons are treated as keys as well
-        if (m_pressedKeyState == KeyPressedState::AllUp)
-        {
-            m_pressedKeyState = KeyPressedState::PressedThisFrame;
-        }
-
-        m_mousePos = scaledPoint;
-        m_prevMousePos = scaledPoint;
-
-        HideCursor();
-        CaptureMouse();
-    }
-
-    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-        AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-        MouseInteractionEvent(mouseInteraction, MouseEvent::Down));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    const auto scaledPoint = WidgetToViewport(point);
-    UpdateCurrentMousePos(scaledPoint);
-
-    const auto tryRestoreMouse = [this]
-    {
-        // if we are currently looking (rotateMode) or dollying (zoomMode)
-        // do not show the cursor on mouse up as rmb is still held
-        if (!m_bInZoomMode && !m_bInRotateMode)
-        {
-            ReleaseMouse();
-            ShowCursor();
-        }
-    };
-
-    if (m_bInMoveMode)
-    {
-        m_bInMoveMode = false;
-        tryRestoreMouse();
-    }
-
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        MouseButtonsFromButton(MouseButton::Middle),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-        AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-        MouseInteractionEvent(mouseInteraction, MouseEvent::Up));
-}
-
-void CRenderViewport::OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    const auto scaledPoint = WidgetToViewport(point);
-
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        BuildMouseButtons(buttons),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::Event(
-        AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-        MouseInteractionEvent(mouseInteraction, MouseEvent::Move));
-}
-
-void CRenderViewport::InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons)
-{
-    // this is required, otherwise the user will see the context menu
-    OnMouseMove(Qt::NoModifier, buttons, QCursor::pos() + QPoint(deltaX, deltaY));
-    // we simply move the prev mouse position, so the change will be picked up
-    // by the next ProcessMouse call
-    m_prevMousePos -= QPoint(deltaX, deltaY);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::ProcessMouse()
-{
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    const auto point = WidgetToViewport(mapFromGlobal(QCursor::pos()));
-
-    if (point == m_prevMousePos)
-    {
-        return;
-    }
-
-    // specifically for the right mouse button click, which triggers rotate or zoom,
-    // we can't capture the mouse until the user has moved the mouse, otherwise the
-    // right click context menu won't popup
-    if (!m_mouseCaptured && (m_bInZoomMode || m_bInRotateMode))
-    {
-        if ((point - m_mousePos).manhattanLength() > QApplication::startDragDistance())
-        {
-            CaptureMouse();
-        }
-    }
-
-    float speedScale = GetCameraMoveSpeed();
-
-    if (CheckVirtualKey(Qt::Key_Control))
-    {
-        speedScale *= gSettings.cameraFastMoveSpeed;
-    }
-
-    if (m_PlayerControl)
-    {
-        if (m_bInRotateMode)
-        {
-            f32 MousedeltaX = (m_mousePos.x() - point.x());
-            f32 MousedeltaY = (m_mousePos.y() - point.y());
-            m_relCameraRotZ += MousedeltaX;
-
-            if (GetCameraInvertYRotation())
-            {
-                MousedeltaY = -MousedeltaY;
-            }
-            m_relCameraRotZ += MousedeltaX;
-            m_relCameraRotX += MousedeltaY;
-
-            ResetCursor();
-        }
-    }
-    else if ((m_bInRotateMode && m_bInMoveMode) || m_bInZoomMode)
-    {
-        // Zoom.
-        Matrix34 m = GetViewTM();
-
-        Vec3 ydir = m.GetColumn1().GetNormalized();
-        Vec3 pos = m.GetTranslation();
-
-        const float posDelta = 0.2f * (m_prevMousePos.y() - point.y()) * speedScale;
-        pos = pos - ydir * posDelta;
-        m_orbitDistance = m_orbitDistance + posDelta;
-        m_orbitDistance = fabs(m_orbitDistance);
-
-        m.SetTranslation(pos);
-        SetViewTM(m);
-
-        ResetCursor();
-    }
-    else if (m_bInRotateMode)
-    {
-        Ang3 angles(-point.y() + m_prevMousePos.y(), 0, -point.x() + m_prevMousePos.x());
-        angles = angles * 0.002f * GetCameraRotateSpeed();
-        if (GetCameraInvertYRotation())
-        {
-            angles.x = -angles.x;
-        }
-        Matrix34 camtm = GetViewTM();
-        Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(camtm));
-        ypr.x += angles.z;
-        ypr.y += angles.x;
-
-        ypr.y = CLAMP(ypr.y, -1.5f, 1.5f);        // to keep rotation in reasonable range
-        // In the recording mode of a custom camera, the z rotation is allowed.
-        if (GetCameraObject() == nullptr || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
-        {
-            ypr.z = 0;      // to have camera always upward
-        }
-
-        camtm = Matrix34(CCamera::CreateOrientationYPR(ypr), camtm.GetTranslation());
-        SetViewTM(camtm);
-
-        ResetCursor();
-    }
-    else if (m_bInMoveMode)
-    {
-        // Slide.
-        Matrix34 m = GetViewTM();
-        Vec3 xdir = m.GetColumn0().GetNormalized();
-        Vec3 zdir = m.GetColumn2().GetNormalized();
-
-        const auto modifiers = QGuiApplication::queryKeyboardModifiers();
-        if (RenderViewportUtil::InvertPan(modifiers))
-        {
-            xdir = -xdir;
-            zdir = -zdir;
-        }
-
-        Vec3 pos = m.GetTranslation();
-        pos += 0.1f * xdir * (point.x() - m_prevMousePos.x()) * speedScale + 0.1f * zdir * (m_prevMousePos.y() - point.y()) * speedScale;
-        m.SetTranslation(pos);
-        SetViewTM(m, true);
-
-        ResetCursor();
-    }
-    else if (m_bInOrbitMode)
-    {
-        Ang3 angles(-point.y() + m_prevMousePos.y(), 0, -point.x() + m_prevMousePos.x());
-        angles = angles * 0.002f * GetCameraRotateSpeed();
-
-        if (GetCameraInvertPan())
-        {
-            angles.z = -angles.z;
-        }
-
-        Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(GetViewTM()));
-        ypr.x += angles.z;
-        ypr.y = CLAMP(ypr.y, -1.5f, 1.5f);        // to keep rotation in reasonable range
-        ypr.y += angles.x;
-
-        Matrix33 rotateTM =  CCamera::CreateOrientationYPR(ypr);
-
-        Vec3 src = GetViewTM().GetTranslation();
-        Vec3 trg = m_orbitTarget;
-        float fCameraRadius = (trg - src).GetLength();
-
-        // Calc new source.
-        src = trg - rotateTM * Vec3(0, 1, 0) * fCameraRadius;
-        Matrix34 camTM = rotateTM;
-        camTM.SetTranslation(src);
-
-        SetViewTM(camTM);
-
-        ResetCursor();
-    }
-}
-
-void CRenderViewport::ResetCursor()
-{
-#ifdef AZ_PLATFORM_WINDOWS
-    if (!gSettings.stylusMode)
-    {
-        const QPoint point = mapToGlobal(ViewportToWidget(m_prevMousePos));
-        AzQtComponents::SetCursorPos(point);
-    }
-#endif
-
-    // Recalculate the prev mouse pos even if we just reset to it to avoid compounding floating point math issues with DPI scaling
-    m_prevMousePos = WidgetToViewport(mapFromGlobal(QCursor::pos()));
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool  CRenderViewport::event(QEvent* event)
-{
-    switch (event->type())
-    {
-    case QEvent::WindowActivate:
-        GetIEditor()->GetViewManager()->SelectViewport(this);
-        // also kill the keys; if we alt-tab back to the viewport, or come back from the debugger, it's done (and there's no guarantee we'll get the keyrelease event anyways)
-        m_keyDown.clear();
-        break;
-
-    case QEvent::Shortcut:
-        // a shortcut should immediately clear us, otherwise the release event never gets sent
-        m_keyDown.clear();
-        break;
-
-    case QEvent::ShortcutOverride:
-    {
-        // since we respond to the following things, let Qt know so that shortcuts don't override us
-        bool respondsToEvent = false;
-
-        auto keyEvent = static_cast<QKeyEvent*>(event);
-        bool manipulatorInteracting = false;
-        AzToolsFramework::ManipulatorManagerRequestBus::EventResult(
-            manipulatorInteracting,
-            AzToolsFramework::g_mainManipulatorManagerId,
-            &AzToolsFramework::ManipulatorManagerRequestBus::Events::Interacting);
-
-        // If a manipulator is active, stop all shortcuts from working, except for the escape key, which cancels in some cases
-        if ((keyEvent->key() != Qt::Key_Escape) &&  manipulatorInteracting)
-        {
-            respondsToEvent = true;
-        }
-        else
-        {
-            // In game mode we never want to be overridden by shortcuts
-            if (GetIEditor()->IsInGameMode() && GetType() == ET_ViewportCamera)
-            {
-                respondsToEvent = true;
-            }
-            else
-            {
-                if (!(keyEvent->modifiers() & Qt::ControlModifier))
-                {
-                    switch (keyEvent->key())
-                    {
-                    case Qt::Key_Up:
-                    case Qt::Key_W:
-                    case Qt::Key_Down:
-                    case Qt::Key_S:
-                    case Qt::Key_Left:
-                    case Qt::Key_A:
-                    case Qt::Key_Right:
-                    case Qt::Key_D:
-                        respondsToEvent = true;
-                        break;
-
-                    default:
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (respondsToEvent)
-        {
-            event->accept();
-            return true;
-        }
-
-        // because we're doing keyboard grabs, we need to detect
-        // when a shortcut matched so that we can track the buttons involved
-        // in the shortcut, since the key released event won't be generated in that case
-        ProcessKeyRelease(keyEvent);
-    }
-    break;
-    default:
-        // do nothing
-        break;
-    }
-
-    return QtViewport::event(event);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::ResetContent()
-{
-    QtViewport::ResetContent();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::UpdateContent(int flags)
-{
-    QtViewport::UpdateContent(flags);
-    if (flags & eUpdateObjects)
-    {
-        m_bUpdateViewport = true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::Update()
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    if (Editor::EditorQtApplication::instance()->isMovingOrResizing())
-    {
-        return;
-    }
-
-    if (!m_renderer || m_rcClient.isEmpty() || GetIEditor()->IsInMatEditMode())
-    {
-        return;
-    }
-
-    if (!isVisible())
-    {
-        return;
-    }
-
-    // Only send the resize event if the render overlay is visible. This is to make sure
-    // the native window has resized.
-    if (m_windowResizedEvent && isRenderOverlayVisible())
-    {
-        AzFramework::WindowNotificationBus::Event(renderOverlayHWND(), &AzFramework::WindowNotificationBus::Handler::OnWindowResized, m_rcClient.width(), m_rcClient.height());
-        m_windowResizedEvent = false;
-    }
-
-    // Don't wait for changes to update the focused viewport.
-    if (CheckRespondToInput())
-    {
-        m_bUpdateViewport = true;
-    }
-
-    // While Renderer doesn't support fast rendering of the scene to more then 1 viewport
-    // render only focused viewport if more then 1 are opened and always update is off.
-    if (!m_isOnPaint && m_viewManager->GetNumberOfGameViewports() > 1 && GetType() == ET_ViewportCamera)
-    {
-        if (m_pPrimaryViewport != this)
-        {
-            if (CheckRespondToInput()) // If this is the focused window, set primary viewport.
-            {
-                m_pPrimaryViewport = this;
-            }
-            else if (!m_bUpdateViewport) // Skip this viewport.
-            {
-                return;
-            }
-        }
-    }
-
-    if (CheckRespondToInput())
-    {
-        ProcessMouse();
-        ProcessKeys();
-    }
-
-    const bool isGameMode = GetIEditor()->IsInGameMode();
-    const bool isSimulationMode = GetIEditor()->GetGameEngine()->GetSimulationMode();
-
-    // Allow debug visualization in both 'game' (Ctrl-G) and 'simulation' (Ctrl-P) modes
-    if (isGameMode || isSimulationMode)
-    {
-        if (!IsRenderingDisabled())
-        {
-            // Disable rendering to avoid recursion into Update()
-            PushDisableRendering();
-
-            // draw debug visualizations
-            {
-                const AzFramework::DisplayContextRequestGuard displayContextGuard(m_displayContext);
-
-                const AZ::u32 prevState = m_displayContext.GetState();
-                m_displayContext.SetState(
-                    e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
-
-                AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
-                AzFramework::DebugDisplayRequestBus::Bind(
-                    debugDisplayBus, AzFramework::g_defaultSceneEntityDebugDisplayId);
-                AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
-
-                AzFramework::DebugDisplayRequests* debugDisplay =
-                    AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
-
-                AzFramework::EntityDebugDisplayEventBus::Broadcast(
-                    &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport,
-                    AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
-
-                m_displayContext.SetState(prevState);
-            }
-
-            QtViewport::Update();
-            PopDisableRendering();
-        }
-
-        // Game mode rendering is handled by CryAction
-        if (isGameMode)
-        {
-            return;
-        }
-    }
-
-    // Prevents rendering recursion due to recursive Paint messages.
-    if (IsRenderingDisabled())
-    {
-        return;
-    }
-
-    PushDisableRendering();
-
-    m_viewTM = m_Camera.GetMatrix(); // synchronize.
-
-    // Render
-    if (!m_bRenderContextCreated)
-    {
-        if (!CreateRenderContext())
-        {
-            return;
-        }
-    }
-
-    if (ed_visibility_use)
-    {
-        auto start = std::chrono::steady_clock::now();
-
-        m_entityVisibilityQuery.UpdateVisibility(GetCameraState());
-    }
-
-    {
-        SScopedCurrentContext context(this);
-
-        m_renderer->SetClearColor(Vec3(0.4f, 0.4f, 0.4f));
-
-        InitDisplayContext();
-
-        OnRender();
-
-        ProcessRenderLisneters(m_displayContext);
-
-        m_displayContext.Flush2D();
-
-        m_renderer->SwitchToNativeResolutionBackbuffer();
-
-        // 3D engine stats
-
-        CCamera CurCamera = gEnv->pSystem->GetViewCamera();
-        gEnv->pSystem->SetViewCamera(m_Camera);
-
-        // Post Render Callback
-        {
-            PostRenderers::iterator itr = m_postRenderers.begin();
-            PostRenderers::iterator end = m_postRenderers.end();
-            for (; itr != end; ++itr)
-            {
-                (*itr)->OnPostRender();
-            }
-        }
-
-        gEnv->pSystem->SetViewCamera(CurCamera);
-    }
-
-    QtViewport::Update();
-
-    PopDisableRendering();
-    m_bUpdateViewport = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::SetViewEntity(const AZ::EntityId& viewEntityId, bool lockCameraMovement)
-{
-    // if they've picked the same camera, then that means they want to toggle
-    if (viewEntityId.IsValid() && viewEntityId != m_viewEntityId)
-    {
-        LockCameraMovement(lockCameraMovement);
-        m_viewEntityId = viewEntityId;
-        AZStd::string entityName;
-        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, viewEntityId);
-        SetName(QString("Camera entity: %1").arg(entityName.c_str()));
-    }
-    else
-    {
-        SetDefaultCamera();
-    }
-
-    PostCameraSet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::ResetToViewSourceType(const ViewSourceType& viewSourceType)
-{
-    LockCameraMovement(true);
-    m_pCameraFOVVariable = nullptr;
-    m_viewEntityId.SetInvalid();
-    m_cameraObjectId = GUID_NULL;
-    m_viewSourceType = viewSourceType;
-    SetViewTM(GetViewTM());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::PostCameraSet()
-{
-    if (m_viewPane)
-    {
-        m_viewPane->OnFOVChanged(GetFOV());
-    }
-
-    GetIEditor()->Notify(eNotify_CameraChanged);
-    QScopedValueRollback<bool> rb(m_ignoreSetViewFromEntityPerspective, true);
-    Camera::EditorCameraNotificationBus::Broadcast(
-        &Camera::EditorCameraNotificationBus::Events::OnViewportViewEntityChanged, m_viewEntityId);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CRenderViewport::GetCameraObject() const
-{
-    CBaseObject* pCameraObject = nullptr;
-
-    if (m_viewSourceType == ViewSourceType::SequenceCamera)
-    {
-        m_cameraObjectId = GetViewManager()->GetCameraObjectId();
-    }
-    if (m_cameraObjectId != GUID_NULL)
-    {
-        // Find camera object from id.
-        pCameraObject = GetIEditor()->GetObjectManager()->FindObject(m_cameraObjectId);
-    }
-    else if (m_viewSourceType == ViewSourceType::CameraComponent || m_viewSourceType == ViewSourceType::AZ_Entity)
-    {
-        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(
-            pCameraObject, m_viewEntityId, &AzToolsFramework::ComponentEntityEditorRequests::GetSandboxObject);
-    }
-    return pCameraObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnBeginGameMode:
-    {
-        if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
-        {
-            m_preGameModeViewTM = GetViewTM();
-            // 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)
-                {
-                    m_previousContext = SetCurrentContext(deviceInfo->renderWidth, deviceInfo->renderHeight);
-                    if (m_renderer->GetIStereoRenderer())
-                    {
-                        m_renderer->GetIStereoRenderer()->OnResolutionChanged();
-                    }
-                    SetActiveWindow();
-                    SetFocus();
-                    SetSelected(true);
-                }
-            }
-            else
-            {
-                m_previousContext = SetCurrentContext();
-            }
-            SetCurrentCursor(STD_CURSOR_GAME);
-        }
-    }
-    break;
-
-    case eNotify_OnEndGameMode:
-        if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
-        {
-            SetCurrentCursor(STD_CURSOR_DEFAULT);
-            if (m_renderer->GetCurrentContextHWND() != renderOverlayHWND())
-            {
-                // if this warning triggers it means that someone else (ie, some other part of the code)
-                // called SetCurrentContext(...) on the renderer, probably did some rendering, but then either
-                // failed to set the context back when done, or set it back to the wrong one.
-                CryWarning(VALIDATOR_MODULE_3DENGINE, VALIDATOR_WARNING, "RenderViewport render context was not correctly restored by someone else.");
-            }
-            RestorePreviousContext(m_previousContext);
-            m_bInRotateMode = false;
-            m_bInMoveMode = false;
-            m_bInOrbitMode = false;
-            m_bInZoomMode = false;
-
-            RestoreViewportAfterGameMode();
-        }
-        break;
-
-    case eNotify_OnCloseScene:
-        SetDefaultCamera();
-        break;
-
-    case eNotify_OnBeginNewScene:
-        PushDisableRendering();
-        break;
-
-    case eNotify_OnEndNewScene:
-        PopDisableRendering();
-
-        {
-            // Default this to the size of default terrain in case there is no listener on the buss
-            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromMinMaxValues(0, 0, 32, 1024, 1024, 32);
-            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-            float sx = terrainAabb.GetXExtent();
-            float sy = terrainAabb.GetYExtent();
-
-            Matrix34 viewTM;
-            viewTM.SetIdentity();
-            // Initial camera will be at middle of the map at the height of 2
-            // meters above the terrain (default terrain height is 32)
-            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
-            SetViewTM(viewTM);
-        }
-        break;
-
-    case eNotify_OnBeginTerrainCreate:
-        PushDisableRendering();
-        break;
-
-    case eNotify_OnEndTerrainCreate:
-        PopDisableRendering();
-
-        {
-            // Default this to the size of default terrain in case there is no listener on the buss
-            AZ::Aabb terrainAabb = AZ::Aabb::CreateFromMinMaxValues(0, 0, 32, 1024, 1024, 32);
-            AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(terrainAabb, &AzFramework::Terrain::TerrainDataRequests::GetTerrainAabb);
-            float sx = terrainAabb.GetXExtent();
-            float sy = terrainAabb.GetYExtent();
-
-            Matrix34 viewTM;
-            viewTM.SetIdentity();
-            // Initial camera will be at middle of the map at the height of 2
-            // meters above the terrain (default terrain height is 32)
-            viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
-            SetViewTM(viewTM);
-        }
-        break;
-
-    case eNotify_OnBeginLayerExport:
-    case eNotify_OnBeginSceneSave:
-        PushDisableRendering();
-        break;
-    case eNotify_OnEndLayerExport:
-    case eNotify_OnEndSceneSave:
-        PopDisableRendering();
-        break;
-
-    case eNotify_OnBeginLoad: // disables viewport input when starting to load an existing level
-    case eNotify_OnBeginCreate: // disables viewport input when starting to create a new level
-        m_freezeViewportInput = true;
-        break;
-
-    case eNotify_OnEndLoad: // enables viewport input when finished loading an existing level
-    case eNotify_OnEndCreate: // enables viewport input when finished creating a new level
-        m_freezeViewportInput = false;
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-namespace {
-    inline Vec3 NegY(const Vec3& v, float y)
-    {
-        return Vec3(v.x, y - v.y, v.z);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnRender()
-{
-    if (m_rcClient.isEmpty() || m_renderer->GetRenderType() == eRT_Null) // Null is crashing in CryEngine on macOS
-    {
-        // Even in null rendering, update the view camera.
-        // This is necessary so that automated editor tests using the null renderer to test systems like dynamic vegetation
-        // are still able to manipulate the current logical camera position, even if nothing is rendered.
-        GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
-        return;
-    }
-
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    float fNearZ = GetIEditor()->GetConsoleVar("cl_DefaultNearPlane");
-    float fFarZ = m_Camera.GetFarPlane();
-
-    CBaseObject* cameraObject = GetCameraObject();
-    if (cameraObject)
-    {
-        AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
-        if (m_viewEntityId.IsValid())
-        {
-            Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
-            Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
-            LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
-                lookThroughEntityCorrection, m_viewEntityId,
-                &LmbrCentral::EditorCameraCorrectionRequests::GetTransformCorrection);
-        }
-
-        m_viewTM = cameraObject->GetWorldTM() * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection);
-        m_viewTM.OrthonormalizeFast();
-
-        m_Camera.SetMatrix(m_viewTM);
-
-        int w = m_rcClient.width();
-        int h = m_rcClient.height();
-
-        m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
-    }
-    else if (m_viewEntityId.IsValid())
-    {
-        Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
-        Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
-        int w = m_rcClient.width();
-        int h = m_rcClient.height();
-
-        m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
-    }
-    else
-    {
-        // Normal camera.
-        m_cameraObjectId = GUID_NULL;
-        int w = m_rcClient.width();
-        int h = m_rcClient.height();
-
-        float fov = gSettings.viewports.fDefaultFov;
-
-        // match viewport fov to default / selected title menu fov
-        if (GetFOV() != fov)
-        {
-            if (m_viewPane)
-            {
-                m_viewPane->OnFOVChanged(fov);
-                SetFOV(fov);
-            }
-        }
-
-        // Just for editor: Aspect ratio fix when changing the viewport
-        if (!GetIEditor()->IsInGameMode())
-        {
-            float viewportAspectRatio = float( w ) / h;
-            float targetAspectRatio = GetAspectRatio();
-            if (targetAspectRatio > viewportAspectRatio)
-            {
-                // Correct for vertical FOV change.
-                float maxTargetHeight = float( w ) / targetAspectRatio;
-                fov = 2 * atanf((h * tan(fov / 2)) / maxTargetHeight);
-            }
-        }
-
-        m_Camera.SetFrustum(w, h, fov, fNearZ);
-    }
-
-    GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
-
-    CGameEngine* ge = GetIEditor()->GetGameEngine();
-
-    bool levelIsDisplayable = (ge && ge->IsLevelLoaded() && GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady());
-
-    //Handle scene render tasks such as gizmos and handles but only when not in VR
-    if (!m_renderer->IsStereoEnabled())
-    {
-        DisplayContext& displayContext = m_displayContext;
-
-        PreWidgetRendering();
-
-        RenderAll();
-
-        // Draw 2D helpers.
-        TransformationMatrices backupSceneMatrices;
-        m_renderer->Set2DMode(m_rcClient.right(), m_rcClient.bottom(), backupSceneMatrices);
-        displayContext.SetState(e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
-
-        // Display cursor string.
-        RenderCursorString();
-
-        if (gSettings.viewports.bShowSafeFrame)
-        {
-            UpdateSafeFrame();
-            RenderSafeFrame();
-        }
-
-        const AzFramework::DisplayContextRequestGuard displayContextGuard(displayContext);
-
-        AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
-        AzFramework::DebugDisplayRequestBus::Bind(
-            debugDisplayBus, AzFramework::g_defaultSceneEntityDebugDisplayId);
-        AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
-
-        AzFramework::DebugDisplayRequests* debugDisplay =
-            AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
-
-        AzFramework::ViewportDebugDisplayEventBus::Event(
-            AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport2d,
-            AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
-
-        m_renderer->Unset2DMode(backupSceneMatrices);
-
-        PostWidgetRendering();
-    }
-
-    if (levelIsDisplayable)
-    {
-        m_renderer->SetViewport(0, 0, m_renderer->GetWidth(), m_renderer->GetHeight(), m_nCurViewportID);
-    }
-    else
-    {
-        ColorF viewportBackgroundColor(pow(71.0f / 255.0f, 2.2f), pow(71.0f / 255.0f, 2.2f), pow(71.0f / 255.0f, 2.2f));
-        m_renderer->ClearTargetsLater(FRT_CLEAR_COLOR, viewportBackgroundColor);
-        DrawBackground();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderSelectionRectangle()
-{
-    if (m_selectedRect.isEmpty())
-    {
-        return;
-    }
-
-    Vec3 topLeft(m_selectedRect.left(), m_selectedRect.top(), 1);
-    Vec3 bottomRight(m_selectedRect.right() +1, m_selectedRect.bottom() + 1, 1);
-
-    m_displayContext.DepthTestOff();
-    m_displayContext.SetColor(1, 1, 1, 0.4f);
-    m_displayContext.DrawWireBox(topLeft, bottomRight);
-    m_displayContext.DepthTestOn();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::InitDisplayContext()
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    // Draw all objects.
-    DisplayContext& displayContext = m_displayContext;
-    displayContext.settings = GetIEditor()->GetDisplaySettings();
-    displayContext.view = this;
-    displayContext.renderer = m_renderer;
-    displayContext.box.min = Vec3(-100000.0f, -100000.0f, -100000.0f);
-    displayContext.box.max = Vec3(100000.0f, 100000.0f, 100000.0f);
-    displayContext.camera = &m_Camera;
-    displayContext.flags = 0;
-
-    if (!displayContext.settings->IsDisplayLabels() || !displayContext.settings->IsDisplayHelpers())
-    {
-        displayContext.flags |= DISPLAY_HIDENAMES;
-    }
-
-    if (displayContext.settings->IsDisplayLinks() && displayContext.settings->IsDisplayHelpers())
-    {
-        displayContext.flags |= DISPLAY_LINKS;
-    }
-
-    if (m_bDegradateQuality)
-    {
-        displayContext.flags |= DISPLAY_DEGRADATED;
-    }
-
-    if (displayContext.settings->GetRenderFlags() & RENDER_FLAG_BBOX)
-    {
-        displayContext.flags |= DISPLAY_BBOX;
-    }
-
-    if (displayContext.settings->IsDisplayTracks() && displayContext.settings->IsDisplayHelpers())
-    {
-        displayContext.flags |= DISPLAY_TRACKS;
-        displayContext.flags |= DISPLAY_TRACKTICKS;
-    }
-
-    if (GetIEditor()->GetReferenceCoordSys() == COORDS_WORLD)
-    {
-        displayContext.flags |= DISPLAY_WORLDSPACEAXIS;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::PopulateEditorGlobalContextMenu(QMenu* /*menu*/, const AZ::Vector2& /*point*/, int /*flags*/)
-{
-    m_bInMoveMode = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderAll()
-{
-    // Draw all objects.
-    DisplayContext& displayContext = m_displayContext;
-
-    m_renderer->ResetToDefault();
-
-    displayContext.SetState(e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
-    GetIEditor()->GetObjectManager()->Display(displayContext);
-
-    RenderSelectedRegion();
-
-    RenderSnapMarker();
-
-    if (gSettings.viewports.bShowGridGuide
-        && GetIEditor()->GetDisplaySettings()->IsDisplayHelpers())
-    {
-        RenderSnappingGrid();
-    }
-
-    if (displayContext.settings->GetDebugFlags() & DBG_MEMINFO)
-    {
-        ProcessMemInfo mi;
-        CProcessInfo::QueryMemInfo(mi);
-        int MB = 1024 * 1024;
-        QString str = QStringLiteral("WorkingSet=%1Mb, PageFile=%2Mb, PageFaults=%3").arg(mi.WorkingSet / MB).arg(mi.PagefileUsage / MB).arg(mi.PageFaultCount);
-        m_renderer->TextToScreenColor(1, 1, 1, 0, 0, 1, str.toUtf8().data());
-    }
-
-    {
-        const AzFramework::DisplayContextRequestGuard displayContextGuard(displayContext);
-
-        AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
-        AzFramework::DebugDisplayRequestBus::Bind(
-            debugDisplayBus, AzFramework::g_defaultSceneEntityDebugDisplayId);
-        AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
-
-        AzFramework::DebugDisplayRequests* debugDisplay =
-            AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
-
-        // allow the override of in-editor visualization
-        AzFramework::ViewportDebugDisplayEventBus::Event(
-            AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport,
-            AzFramework::ViewportInfo{ GetViewportId() }, *debugDisplay);
-
-        m_entityVisibilityQuery.DisplayVisibility(*debugDisplay);
-
-        if (m_manipulatorManager != nullptr)
-        {
-            using namespace AzToolsFramework::ViewportInteraction;
-
-            debugDisplay->DepthTestOff();
-            m_manipulatorManager->DrawManipulators(
-                *debugDisplay, GetCameraState(),
-                BuildMouseInteractionInternal(
-                    MouseButtons(TranslateMouseButtons(QGuiApplication::mouseButtons())),
-                    BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers()),
-                    BuildMousePickInternal(WidgetToViewport(mapFromGlobal(QCursor::pos())))));
-            debugDisplay->DepthTestOn();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::DrawAxis()
-{
-    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
-        "DrawAxis was called but viewport widget rendering was not set. PreWidgetRendering must be called before.");
-
-    DisplayContext& dc = m_displayContext;
-
-    // show axis only if draw helpers is activated
-    if (!dc.settings->IsDisplayHelpers())
-    {
-        return;
-    }
-
-    Vec3 colX(1, 0, 0), colY(0, 1, 0), colZ(0, 0, 1), colW(1, 1, 1);
-    Vec3 pos(50, 50, 0.1f); // Bottom-left corner
-
-    float wx, wy, wz;
-    m_renderer->UnProjectFromScreen(pos.x, pos.y, pos.z, &wx, &wy, &wz);
-    Vec3 posInWorld(wx, wy, wz);
-    float screenScale = GetScreenScaleFactor(posInWorld);
-    float length = 0.03f * screenScale;
-    float arrowSize = 0.02f * screenScale;
-    float textSize = 1.1f;
-
-    Vec3 x(length, 0, 0);
-    Vec3 y(0, length, 0);
-    Vec3 z(0, 0, length);
-
-    int prevRState = dc.GetState();
-    dc.DepthWriteOff();
-    dc.DepthTestOff();
-    dc.CullOff();
-    dc.SetLineWidth(1);
-
-    dc.SetColor(colX);
-    dc.DrawLine(posInWorld, posInWorld + x);
-    dc.DrawArrow(posInWorld + x * 0.9f, posInWorld + x, arrowSize);
-    dc.SetColor(colY);
-    dc.DrawLine(posInWorld, posInWorld + y);
-    dc.DrawArrow(posInWorld + y * 0.9f, posInWorld + y, arrowSize);
-    dc.SetColor(colZ);
-    dc.DrawLine(posInWorld, posInWorld + z);
-    dc.DrawArrow(posInWorld + z * 0.9f, posInWorld + z, arrowSize);
-
-    dc.SetColor(colW);
-    dc.DrawTextLabel(posInWorld + x, textSize, "x");
-    dc.DrawTextLabel(posInWorld + y, textSize, "y");
-    dc.DrawTextLabel(posInWorld + z, textSize, "z");
-
-    dc.DepthWriteOn();
-    dc.DepthTestOn();
-    dc.CullOn();
-    dc.SetState(prevRState);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::DrawBackground()
-{
-    DisplayContext& dc = m_displayContext;
-
-    if (!dc.settings->IsDisplayHelpers())            // show gradient bg only if draw helpers are activated
-    {
-        return;
-    }
-
-    int heightVP = m_renderer->GetHeight() - 1;
-    int widthVP = m_renderer->GetWidth() - 1;
-    Vec3 pos(0, 0, 0);
-
-    Vec3 x(widthVP, 0, 0);
-    Vec3 y(0, heightVP, 0);
-
-    float height = m_rcClient.height();
-
-    Vec3 src =  NegY(pos, height);
-    Vec3 trgx = NegY(pos + x, height);
-    Vec3 trgy = NegY(pos + y, height);
-
-    QColor topColor = palette().color(QPalette::Window);
-    QColor bottomColor = palette().color(QPalette::Disabled, QPalette::WindowText);
-
-    ColorB firstC(topColor.red(), topColor.green(), topColor.blue(), 255.0f);
-    ColorB secondC(bottomColor.red(), bottomColor.green(), bottomColor.blue(), 255.0f);
-
-    TransformationMatrices backupSceneMatrices;
-
-    m_renderer->Set2DMode(m_rcClient.right(), m_rcClient.bottom(), backupSceneMatrices);
-    m_displayContext.SetState(e_Mode3D | e_AlphaBlended | e_FillModeSolid | e_CullModeBack | e_DepthWriteOn | e_DepthTestOn);
-    dc.DrawQuadGradient(src, trgx, pos + x, pos, secondC, firstC);
-    m_renderer->Unset2DMode(backupSceneMatrices);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderCursorString()
-{
-    if (m_cursorStr.isEmpty())
-    {
-        return;
-    }
-
-    const auto point = WidgetToViewport(mapFromGlobal(QCursor::pos()));
-
-    // Display hit object name.
-    float col[4] = { 1, 1, 1, 1 };
-    m_renderer->Draw2dLabel(point.x() + 12, point.y() + 4, 1.2f, col, false, "%s", m_cursorStr.toUtf8().data());
-
-    if (!m_cursorSupplementaryStr.isEmpty())
-    {
-        float col2[4] = { 1, 1, 0, 1 };
-        m_renderer->Draw2dLabel(point.x() + 12, point.y() + 4 + CURSOR_FONT_HEIGHT * 1.2f, 1.2f, col2, false, "%s", m_cursorSupplementaryStr.toUtf8().data());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::UpdateSafeFrame()
-{
-    m_safeFrame = m_rcClient;
-
-    if (m_safeFrame.height() == 0)
-    {
-        return;
-    }
-
-    const bool allowSafeFrameBiggerThanViewport = false;
-
-    float safeFrameAspectRatio = float( m_safeFrame.width()) / m_safeFrame.height();
-    float targetAspectRatio = GetAspectRatio();
-    bool viewportIsWiderThanSafeFrame = (targetAspectRatio <= safeFrameAspectRatio);
-    if (viewportIsWiderThanSafeFrame || allowSafeFrameBiggerThanViewport)
-    {
-        float maxSafeFrameWidth = m_safeFrame.height() * targetAspectRatio;
-        float widthDifference = m_safeFrame.width() - maxSafeFrameWidth;
-
-        m_safeFrame.setLeft(m_safeFrame.left() + widthDifference * 0.5);
-        m_safeFrame.setRight(m_safeFrame.right() - widthDifference * 0.5);
-    }
-    else
-    {
-        float maxSafeFrameHeight = m_safeFrame.width() / targetAspectRatio;
-        float heightDifference = m_safeFrame.height() - maxSafeFrameHeight;
-
-        m_safeFrame.setTop(m_safeFrame.top() + heightDifference * 0.5);
-        m_safeFrame.setBottom(m_safeFrame.bottom() - heightDifference * 0.5);
-    }
-
-    m_safeFrame.adjust(0, 0, -1, -1); // <-- aesthetic improvement.
-
-    const float SAFE_ACTION_SCALE_FACTOR = 0.05f;
-    m_safeAction = m_safeFrame;
-    m_safeAction.adjust(m_safeFrame.width() * SAFE_ACTION_SCALE_FACTOR, m_safeFrame.height() * SAFE_ACTION_SCALE_FACTOR,
-        -m_safeFrame.width() * SAFE_ACTION_SCALE_FACTOR, -m_safeFrame.height() * SAFE_ACTION_SCALE_FACTOR);
-
-    const float SAFE_TITLE_SCALE_FACTOR = 0.1f;
-    m_safeTitle = m_safeFrame;
-    m_safeTitle.adjust(m_safeFrame.width() * SAFE_TITLE_SCALE_FACTOR, m_safeFrame.height() * SAFE_TITLE_SCALE_FACTOR,
-        -m_safeFrame.width() * SAFE_TITLE_SCALE_FACTOR, -m_safeFrame.height() * SAFE_TITLE_SCALE_FACTOR);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderSafeFrame()
-{
-    RenderSafeFrame(m_safeFrame, 0.75f, 0.75f, 0, 0.8f);
-    RenderSafeFrame(m_safeAction, 0, 0.85f, 0.80f, 0.8f);
-    RenderSafeFrame(m_safeTitle, 0.80f, 0.60f, 0, 0.8f);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderSafeFrame(const QRect& frame, float r, float g, float b, float a)
-{
-    m_displayContext.SetColor(r, g, b, a);
-
-    const int LINE_WIDTH = 2;
-    for (int i = 0; i < LINE_WIDTH; i++)
-    {
-        Vec3 topLeft(frame.left() + i, frame.top() + i, 0);
-        Vec3 bottomRight(frame.right() - i, frame.bottom() - i, 0);
-        m_displayContext.DrawWireBox(topLeft, bottomRight);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CRenderViewport::GetAspectRatio() const
-{
-    return gSettings.viewports.fDefaultAspectRatio;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderSnapMarker()
-{
-    if (!gSettings.snap.markerDisplay)
-    {
-        return;
-    }
-
-    QPoint point = QCursor::pos();
-    ScreenToClient(point);
-    Vec3 p = MapViewToCP(point);
-
-    DisplayContext& dc = m_displayContext;
-
-    float fScreenScaleFactor = GetScreenScaleFactor(p);
-
-    Vec3 x(1, 0, 0);
-    Vec3 y(0, 1, 0);
-    Vec3 z(0, 0, 1);
-    x = x * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
-    y = y * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
-    z = z * gSettings.snap.markerSize * fScreenScaleFactor * 0.1f;
-
-    dc.SetColor(gSettings.snap.markerColor);
-    dc.DrawLine(p - x, p + x);
-    dc.DrawLine(p - y, p + y);
-    dc.DrawLine(p - z, p + z);
-
-    point = WorldToView(p);
-
-    int s = 8;
-    dc.DrawLine2d(point + QPoint(-s, -s), point + QPoint(s, -s), 0);
-    dc.DrawLine2d(point + QPoint(-s, s), point + QPoint(s, s), 0);
-    dc.DrawLine2d(point + QPoint(-s, -s), point + QPoint(-s, s), 0);
-    dc.DrawLine2d(point + QPoint(s, -s), point + QPoint(s, s), 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void OnMenuDisplayWireframe()
-{
-    ICVar* piVar(gEnv->pConsole->GetCVar("r_wireframe"));
-    int nRenderMode = piVar->GetIVal();
-    if (nRenderMode != R_WIREFRAME_MODE)
-    {
-        piVar->Set(R_WIREFRAME_MODE);
-    }
-    else
-    {
-        piVar->Set(R_SOLID_MODE);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void OnMenuTargetAspectRatio(float aspect)
-{
-    gSettings.viewports.fDefaultAspectRatio = aspect;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnMenuResolutionCustom()
-{
-    CCustomResolutionDlg resDlg(width(), height(), parentWidget());
-    if (resDlg.exec() == QDialog::Accepted)
-    {
-        ResizeView(resDlg.GetWidth(), resDlg.GetHeight());
-
-        const QString text = QString::fromLatin1("%1 x %2").arg(resDlg.GetWidth()).arg(resDlg.GetHeight());
-
-        QStringList customResPresets;
-        CViewportTitleDlg::LoadCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
-        CViewportTitleDlg::UpdateCustomPresets(text, customResPresets);
-        CViewportTitleDlg::SaveCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnMenuCreateCameraEntityFromCurrentView()
-{
-    Camera::EditorCameraSystemRequestBus::Broadcast(&Camera::EditorCameraSystemRequests::CreateCameraEntityFromViewport);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnMenuSelectCurrentCamera()
-{
-    CBaseObject* pCameraObject = GetCameraObject();
-
-    if (pCameraObject && !pCameraObject->IsSelected())
-    {
-        GetIEditor()->BeginUndo();
-        IObjectManager* pObjectManager = GetIEditor()->GetObjectManager();
-        pObjectManager->ClearSelection();
-        pObjectManager->SelectObject(pCameraObject);
-        GetIEditor()->AcceptUndo("Select Current Camera");
-    }
-}
-
-static AzFramework::CameraState CameraStateFromCCamera(
-    const CCamera& camera, const float fov, const float width, const float height)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    AzFramework::CameraState state;
-    state.m_forward = LYVec3ToAZVec3(camera.GetViewdir());
-    state.m_up = LYVec3ToAZVec3(camera.GetUp());
-    state.m_side = state.m_forward.Cross(state.m_up);
-    state.m_position = LYVec3ToAZVec3(camera.GetPosition());
-    state.m_fovOrZoom = fov;
-    state.m_nearClip = camera.GetNearPlane();
-    state.m_farClip = camera.GetFarPlane();
-    state.m_orthographic = false;
-    state.m_viewportSize = AZ::Vector2(width, height);
-
-    return state;
-}
-
-AzFramework::CameraState CRenderViewport::GetCameraState()
-{
-    return CameraStateFromCCamera(GetCamera(), GetFOV(), m_rcClient.width(), m_rcClient.height());
-}
-
-bool CRenderViewport::GridSnappingEnabled()
-{
-    return false;
-}
-
-float CRenderViewport::GridSize()
-{
-    return 0.0f;
-}
-
-bool CRenderViewport::ShowGrid()
-{
-    return false;
-}
-
-bool CRenderViewport::AngleSnappingEnabled()
-{
-    return false;
-}
-
-float CRenderViewport::AngleStep()
-{
-    return 0.0f;
-}
-
-AZ::Vector3 CRenderViewport::PickTerrain(const AzFramework::ScreenPoint& point)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    return LYVec3ToAZVec3(ViewToWorld(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), nullptr, true));
-}
-
-AZ::EntityId CRenderViewport::PickEntity(const AzFramework::ScreenPoint& point)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    PreWidgetRendering();
-
-    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();
-        }
-    }
-
-    PostWidgetRendering();
-
-    return entityId;
-}
-
-float CRenderViewport::TerrainHeight(const AZ::Vector2& position)
-{
-    return GetIEditor()->GetTerrainElevation(position.GetX(), position.GetY());
-}
-
-void CRenderViewport::FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    if (ed_visibility_use)
-    {
-        visibleEntitiesOut.assign(m_entityVisibilityQuery.Begin(), m_entityVisibilityQuery.End());
-    }
-    else
-    {
-        if (m_displayContext.GetView() == nullptr)
-        {
-            return;
-        }
-
-        const AZStd::vector<AZ::EntityId>& entityIdCache =
-            m_displayContext.GetView()->GetVisibleObjectsCache()->GetEntityIdCache();
-
-        visibleEntitiesOut.assign(entityIdCache.begin(), entityIdCache.end());
-    }
-}
-
-AzFramework::ScreenPoint CRenderViewport::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    PreWidgetRendering();
-    const AzFramework::ScreenPoint screenPosition =
-        AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(WorldToView(AZVec3ToLYVec3(worldPosition)));
-    PostWidgetRendering();
-
-    return screenPosition;
-}
-
-bool CRenderViewport::IsViewportInputFrozen()
-{
-    return m_freezeViewportInput;
-}
-
-void CRenderViewport::FreezeViewportInput(bool freeze)
-{
-    m_freezeViewportInput = freeze;
-}
-
-QWidget* CRenderViewport::GetWidgetForViewportContextMenu()
-{
-    return this;
-}
-
-void CRenderViewport::BeginWidgetContext()
-{
-    PreWidgetRendering();
-}
-
-void CRenderViewport::EndWidgetContext()
-{
-    PostWidgetRendering();
-}
-
-bool CRenderViewport::ShowingWorldSpace()
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    return BuildKeyboardModifiers(QGuiApplication::queryKeyboardModifiers()).Shift();
-}
-
-void CRenderViewport::SetWindowTitle(const AZStd::string& title)
-{
-    // Do not support the WindowRequestBus changing the editor window title
-    AZ_UNUSED(title);
-}
-
-AzFramework::WindowSize CRenderViewport::GetClientAreaSize() const
-{
-    return AzFramework::WindowSize(m_rcClient.width(), m_rcClient.height());
-}
-
-
-void CRenderViewport::ResizeClientArea(AzFramework::WindowSize clientAreaSize)
-{
-    QWidget* window = this->window();
-    window->resize(aznumeric_cast<int>(clientAreaSize.m_width), aznumeric_cast<int>(clientAreaSize.m_height));
-}
-
-bool CRenderViewport::GetFullScreenState() const
-{
-    // CRenderViewport does not currently support full screen.
-    return false;
-}
-
-void CRenderViewport::SetFullScreenState([[maybe_unused]]bool fullScreenState)
-{
-    // CRenderViewport does not currently support full screen.
-}
-
-bool CRenderViewport::CanToggleFullScreenState() const
-{
-    // CRenderViewport does not currently support full screen.
-    return false;
-}
-
-void CRenderViewport::ToggleFullScreenState()
-{
-    // CRenderViewport does not currently support full screen.
-}
-
-void CRenderViewport::ConnectViewportInteractionRequestBus()
-{
-    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusConnect(GetViewportId());
-    AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
-    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
-    m_viewportUi.ConnectViewportUiBus(GetViewportId());
-
-    AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusConnect();
-}
-
-void CRenderViewport::DisconnectViewportInteractionRequestBus()
-{
-    AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusDisconnect();
-
-    m_viewportUi.DisconnectViewportUiBus();
-    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusDisconnect();
-    AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect();
-    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void ToggleBool(bool* variable, bool* disableVariableIfOn)
-{
-    *variable = !*variable;
-    if (*variable && disableVariableIfOn)
-    {
-        *disableVariableIfOn = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void ToggleInt(int* variable)
-{
-    *variable = !*variable;
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void AddCheckbox(QMenu* menu, const QString& text, bool* variable, bool* disableVariableIfOn = nullptr)
-{
-    QAction* action = menu->addAction(text);
-    QObject::connect(action, &QAction::triggered, action, [variable, disableVariableIfOn] { ToggleBool(variable, disableVariableIfOn);
-        });
-    action->setCheckable(true);
-    action->setChecked(*variable);
-}
-
-//////////////////////////////////////////////////////////////////////////
-static void AddCheckbox(QMenu* menu, const QString& text, int* variable)
-{
-    QAction* action = menu->addAction(text);
-    QObject::connect(action, &QAction::triggered, action, [variable] { ToggleInt(variable);
-        });
-    action->setCheckable(true);
-    action->setChecked(*variable);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnTitleMenu(QMenu* menu)
-{
-    const int nWireframe = gEnv->pConsole->GetCVar("r_wireframe")->GetIVal();
-    QAction* action = menu->addAction(tr("Wireframe"));
-    connect(action, &QAction::triggered, action, OnMenuDisplayWireframe);
-    action->setCheckable(true);
-    action->setChecked(nWireframe == R_WIREFRAME_MODE);
-
-    const bool bDisplayLabels = GetIEditor()->GetDisplaySettings()->IsDisplayLabels();
-    action = menu->addAction(tr("Labels"));
-    connect(action, &QAction::triggered, this, [bDisplayLabels] {GetIEditor()->GetDisplaySettings()->DisplayLabels(!bDisplayLabels);
-        });
-    action->setCheckable(true);
-    action->setChecked(bDisplayLabels);
-
-    AddCheckbox(menu, tr("Show Safe Frame"), &gSettings.viewports.bShowSafeFrame);
-    AddCheckbox(menu, tr("Show Construction Plane"), &gSettings.snap.constructPlaneDisplay);
-    AddCheckbox(menu, tr("Show Trigger Bounds"), &gSettings.viewports.bShowTriggerBounds);
-    AddCheckbox(menu, tr("Show Icons"), &gSettings.viewports.bShowIcons, &gSettings.viewports.bShowSizeBasedIcons);
-    AddCheckbox(menu, tr("Show Size-based Icons"), &gSettings.viewports.bShowSizeBasedIcons, &gSettings.viewports.bShowIcons);
-    AddCheckbox(menu, tr("Show Helpers of Frozen Objects"), &gSettings.viewports.nShowFrozenHelpers);
-
-    if (!m_predefinedAspectRatios.IsEmpty())
-    {
-        QMenu* aspectRatiosMenu = menu->addMenu(tr("Target Aspect Ratio"));
-
-        for (size_t i = 0; i < m_predefinedAspectRatios.GetCount(); ++i)
-        {
-            const QString& aspectRatioString = m_predefinedAspectRatios.GetName(i);
-            QAction* aspectRatioAction = aspectRatiosMenu->addAction(aspectRatioString);
-            connect(aspectRatioAction, &QAction::triggered, this, [i, this] { OnMenuTargetAspectRatio(m_predefinedAspectRatios.GetValue(i));
-                });
-            aspectRatioAction->setCheckable(true);
-            aspectRatioAction->setChecked(m_predefinedAspectRatios.IsCurrent(i));
-        }
-    }
-
-    // Set ourself as the active viewport so the following actions create a camera from this view
-    GetIEditor()->GetViewManager()->SelectViewport(this);
-
-    CGameEngine* gameEngine = GetIEditor()->GetGameEngine();
-
-    if (Camera::EditorCameraSystemRequestBus::HasHandlers())
-    {
-        action = menu->addAction(tr("Create camera entity from current view"));
-        connect(action, &QAction::triggered, this, &CRenderViewport::OnMenuCreateCameraEntityFromCurrentView);
-
-        if (!gameEngine || !gameEngine->IsLevelLoaded())
-        {
-            action->setEnabled(false);
-            action->setToolTip(tr(TextCantCreateCameraNoLevel));
-            menu->setToolTipsVisible(true);
-        }
-    }
-
-    if (!gameEngine || !gameEngine->IsLevelLoaded())
-    {
-        action->setEnabled(false);
-        action->setToolTip(tr(TextCantCreateCameraNoLevel));
-        menu->setToolTipsVisible(true);
-    }
-
-    if (GetCameraObject())
-    {
-        action = menu->addAction(tr("Select Current Camera"));
-        connect(action, &QAction::triggered, this, &CRenderViewport::OnMenuSelectCurrentCamera);
-    }
-
-    // Add Cameras.
-    bool bHasCameras = AddCameraMenuItems(menu);
-    CRenderViewport* pFloatingViewport = nullptr;
-
-    if (GetIEditor()->GetViewManager()->GetViewCount() > 1)
-    {
-        for (int i = 0; i < GetIEditor()->GetViewManager()->GetViewCount(); ++i)
-        {
-            CViewport* vp = GetIEditor()->GetViewManager()->GetView(i);
-            if (!vp)
-            {
-                continue;
-            }
-
-            if (viewport_cast<CRenderViewport*>(vp) == nullptr)
-            {
-                continue;
-            }
-
-            if (vp->GetViewportId() == MAX_NUM_VIEWPORTS - 1)
-            {
-                menu->addSeparator();
-
-                QMenu* floatViewMenu = menu->addMenu(tr("Floating View"));
-
-                pFloatingViewport = (CRenderViewport*)vp;
-                pFloatingViewport->AddCameraMenuItems(floatViewMenu);
-
-                if (bHasCameras)
-                {
-                    floatViewMenu->addSeparator();
-                }
-
-                QMenu* resolutionMenu = floatViewMenu->addMenu(tr("Resolution"));
-
-                QStringList customResPresets;
-                CViewportTitleDlg::LoadCustomPresets("ResPresets", "ResPresetFor2ndView", customResPresets);
-                CViewportTitleDlg::AddResolutionMenus(resolutionMenu, [this](int width, int height) { ResizeView(width, height); }, customResPresets);
-                if (!resolutionMenu->actions().isEmpty())
-                {
-                    resolutionMenu->addSeparator();
-                }
-                QAction* customResolutionAction = resolutionMenu->addAction(tr("Custom..."));
-                connect(customResolutionAction, &QAction::triggered, this, &CRenderViewport::OnMenuResolutionCustom);
-                break;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::AddCameraMenuItems(QMenu* menu)
-{
-    if (!menu->isEmpty())
-    {
-        menu->addSeparator();
-    }
-
-    AddCheckbox(menu, "Lock Camera Movement", &m_bLockCameraMovement);
-    menu->addSeparator();
-
-    // Camera Sub menu
-    QMenu* customCameraMenu = menu->addMenu(tr("Camera"));
-
-    QAction* action = customCameraMenu->addAction("Editor Camera");
-    action->setCheckable(true);
-    action->setChecked(m_viewSourceType == ViewSourceType::None);
-    connect(action, &QAction::triggered, this, &CRenderViewport::SetDefaultCamera);
-
-    AZ::EBusAggregateResults<AZ::EntityId> getCameraResults;
-    Camera::CameraBus::BroadcastResult(getCameraResults, &Camera::CameraRequests::GetCameras);
-
-    const int numCameras = getCameraResults.values.size();
-
-    // only enable if we're editing a sequence in Track View and have cameras in the level
-    bool enableSequenceCameraMenu = (GetIEditor()->GetAnimation()->GetSequence() && numCameras);
-
-    action = customCameraMenu->addAction(tr("Sequence Camera"));
-    action->setCheckable(true);
-    action->setChecked(m_viewSourceType == ViewSourceType::SequenceCamera);
-    action->setEnabled(enableSequenceCameraMenu);
-    connect(action, &QAction::triggered, this, &CRenderViewport::SetSequenceCamera);
-
-    QVector<QAction*> additionalCameras;
-    additionalCameras.reserve(getCameraResults.values.size());
-
-    for (const AZ::EntityId& entityId : getCameraResults.values)
-    {
-        AZStd::string entityName;
-        AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, entityId);
-        action = new QAction(QString(entityName.c_str()), nullptr);
-        additionalCameras.append(action);
-        action->setCheckable(true);
-        action->setChecked(m_viewEntityId == entityId && m_viewSourceType == ViewSourceType::CameraComponent);
-        connect(action, &QAction::triggered, this, [this, entityId](bool isChecked)
-            {
-                if (isChecked)
-                {
-                    SetComponentCamera(entityId);
-                }
-                else
-                {
-                    SetDefaultCamera();
-                }
-            });
-    }
-
-    std::sort(additionalCameras.begin(), additionalCameras.end(), [] (QAction* a1, QAction* a2) {
-        return QString::compare(a1->text(), a2->text(), Qt::CaseInsensitive) < 0;
-    });
-
-    for (QAction* cameraAction : additionalCameras)
-    {
-        customCameraMenu->addAction(cameraAction);
-    }
-
-    action = customCameraMenu->addAction(tr("Look through entity"));
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-    action->setCheckable(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
-    action->setEnabled(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
-    action->setChecked(m_viewSourceType == ViewSourceType::AZ_Entity);
-    connect(action, &QAction::triggered, this, [this](bool isChecked)
-        {
-            if (isChecked)
-            {
-                AzToolsFramework::EntityIdList selectedEntityList;
-                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-                if (selectedEntityList.size())
-                {
-                    SetEntityAsCamera(*selectedEntityList.begin());
-                }
-            }
-            else
-            {
-                SetDefaultCamera();
-            }
-        });
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::ResizeView(int width, int height)
-{
-    const QRect rView = rect().translated(mapToGlobal(QPoint()));
-    int deltaWidth = width - rView.width();
-    int deltaHeight = height - rView.height();
-
-    if (window()->isFullScreen())
-    {
-        setGeometry(rView.left(), rView.top(), rView.width() + deltaWidth, rView.height() + deltaHeight);
-    }
-    else
-    {
-        QWidget* window = this->window();
-        if (window->isMaximized())
-        {
-            window->showNormal();
-        }
-
-        const QSize deltaSize = QSize(width, height) - size();
-        window->move(0, 0);
-        window->resize(window->size() + deltaSize);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::ToggleCameraObject()
-{
-    if (m_viewSourceType == ViewSourceType::SequenceCamera)
-    {
-        ResetToViewSourceType(ViewSourceType::LegacyCamera);
-    }
-    else
-    {
-        ResetToViewSourceType(ViewSourceType::SequenceCamera);
-    }
-    PostCameraSet();
-    GetIEditor()->GetAnimation()->ForceAnimation();
-}
-
-void CRenderViewport::OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta, const QPoint& point)
-{
-    using namespace AzToolsFramework::ViewportInteraction;
-    using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-
-    if (GetIEditor()->IsInGameMode() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    const auto scaledPoint = WidgetToViewport(point);
-    const auto mouseInteraction = BuildMouseInteractionInternal(
-        MouseButtonsFromButton(MouseButton::None),
-        BuildKeyboardModifiers(modifiers),
-        BuildMousePick(scaledPoint));
-
-    bool handled = false;
-    MouseInteractionResult result = MouseInteractionResult::None;
-    AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus::EventResult(
-        result, AzToolsFramework::GetEntityContextId(),
-        &EditorInteractionSystemViewportSelectionRequestBus::Events::InternalHandleAllMouseInteractions,
-        MouseInteractionEvent(mouseInteraction, zDelta));
-
-    handled = result != MouseInteractionResult::None;
-
-    if (!handled)
-    {
-        Matrix34 m = GetViewTM();
-        const Vec3 ydir = m.GetColumn1().GetNormalized();
-
-        Vec3 pos = m.GetTranslation();
-
-        const float posDelta = 0.01f * zDelta * gSettings.wheelZoomSpeed;
-        pos += ydir * posDelta;
-        m_orbitDistance = m_orbitDistance - posDelta;
-        m_orbitDistance = fabs(m_orbitDistance);
-
-        m.SetTranslation(pos);
-        SetViewTM(m, true);
-
-        QtViewport::OnMouseWheel(modifiers, zDelta, scaledPoint);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::SetCamera(const CCamera& camera)
-{
-    m_Camera = camera;
-    SetViewTM(m_Camera.GetMatrix());
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CRenderViewport::GetCameraMoveSpeed() const
-{
-    return gSettings.cameraMoveSpeed;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CRenderViewport::GetCameraRotateSpeed() const
-{
-    return gSettings.cameraRotateSpeed;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::GetCameraInvertYRotation() const
-{
-    return gSettings.invertYRotation;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CRenderViewport::GetCameraInvertPan() const
-{
-    return gSettings.invertPan;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CRenderViewport* CRenderViewport::GetPrimaryViewport()
-{
-    return m_pPrimaryViewport;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::focusOutEvent([[maybe_unused]] QFocusEvent* event)
-{
-    // if we lose focus, the keyboard map needs to be cleared immediately
-    if (!m_keyDown.isEmpty())
-    {
-        m_keyDown.clear();
-
-        releaseKeyboard();
-    }
-}
-
-void CRenderViewport::keyPressEvent(QKeyEvent* event)
-{
-    // Special case Escape key and bubble way up to the top level parent so that it can cancel us out of any active tool
-    // or clear the current selection
-    if (event->key() == Qt::Key_Escape)
-    {
-        QCoreApplication::sendEvent(GetIEditor()->GetEditorMainWindow(), event);
-    }
-
-    // NOTE: we keep track of keypresses and releases explicitly because the OS/Qt will insert a slight delay between sending
-    // keyevents when the key is held down. This is standard, but makes responding to key events for game style input silly
-    // because we want the movement to be butter smooth.
-    if (!event->isAutoRepeat())
-    {
-        if (m_keyDown.isEmpty())
-        {
-            grabKeyboard();
-        }
-
-        m_keyDown.insert(event->key());
-    }
-
-    QtViewport::keyPressEvent(event);
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    // In game mode on windows we need to forward raw text events to the input system.
-    if (GetIEditor()->IsInGameMode() && GetType() == ET_ViewportCamera)
-    {
-        // Get the QString as a '\0'-terminated array of unsigned shorts.
-        // The result remains valid until the string is modified.
-        const ushort* codeUnitsUTF16 = event->text().utf16();
-        while (ushort codeUnitUTF16 = *codeUnitsUTF16)
-        {
-            AzFramework::RawInputNotificationBusWindows::Broadcast(&AzFramework::RawInputNotificationsWindows::OnRawInputCodeUnitUTF16Event, codeUnitUTF16);
-            ++codeUnitsUTF16;
-        }
-    }
-#endif // defined(AZ_PLATFORM_WINDOWS)
-}
-
-void CRenderViewport::ProcessKeyRelease(QKeyEvent* event)
-{
-    if (!event->isAutoRepeat())
-    {
-        if (m_keyDown.contains(event->key()))
-        {
-            m_keyDown.remove(event->key());
-
-            if (m_keyDown.isEmpty())
-            {
-                releaseKeyboard();
-            }
-        }
-    }
-}
-
-void CRenderViewport::keyReleaseEvent(QKeyEvent* event)
-{
-    ProcessKeyRelease(event);
-
-    QtViewport::keyReleaseEvent(event);
-}
-
-void CRenderViewport::SetViewTM(const Matrix34& viewTM, bool bMoveOnly)
-{
-    Matrix34 camMatrix = viewTM;
-
-    // If no collision flag set do not check for terrain elevation.
-    if (GetType() == ET_ViewportCamera)
-    {
-        if ((GetIEditor()->GetDisplaySettings()->GetSettings() & SETTINGS_NOCOLLISION) == 0)
-        {
-            Vec3 p = camMatrix.GetTranslation();
-            bool adjustCameraElevation = true;
-            auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-            if (terrain)
-            {
-                AZ::Aabb terrainAabb(terrain->GetTerrainAabb());
-
-                // Adjust the AABB to include all Z values.  Since the goal here is to snap the camera to the terrain height if
-                // it's below the terrain, we only want to verify the camera is within the XY bounds of the terrain to adjust the elevation.
-                terrainAabb.SetMin(AZ::Vector3(terrainAabb.GetMin().GetX(), terrainAabb.GetMin().GetY(), -AZ::Constants::FloatMax));
-                terrainAabb.SetMax(AZ::Vector3(terrainAabb.GetMax().GetX(), terrainAabb.GetMax().GetY(), AZ::Constants::FloatMax));
-
-                if (!terrainAabb.Contains(LYVec3ToAZVec3(p)))
-                {
-                    adjustCameraElevation = false;
-                }
-                else if (terrain->GetIsHoleFromFloats(p.x, p.y))
-                {
-                    adjustCameraElevation = false;
-                }
-            }
-
-            if (adjustCameraElevation)
-            {
-                float z = GetIEditor()->GetTerrainElevation(p.x, p.y);
-                if (p.z < z + 0.25)
-                {
-                    p.z = z + 0.25;
-                    camMatrix.SetTranslation(p);
-                }
-            }
-        }
-
-        // Also force this position on game.
-        if (GetIEditor()->GetGameEngine())
-        {
-            GetIEditor()->GetGameEngine()->SetPlayerViewMatrix(viewTM);
-        }
-    }
-
-    CBaseObject* cameraObject = GetCameraObject();
-    if (cameraObject)
-    {
-        // Ignore camera movement if locked.
-        if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
-        {
-            return;
-        }
-
-        AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
-        if (m_viewEntityId.IsValid())
-        {
-            LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
-                lookThroughEntityCorrection, m_viewEntityId,
-                &LmbrCentral::EditorCameraCorrectionRequests::GetInverseTransformCorrection);
-        }
-
-        if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
-        {
-            CUndo undo("Move Camera");
-            if (bMoveOnly)
-            {
-                // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
-                cameraObject->SetWorldPos(camMatrix.GetTranslation(), eObjectUpdateFlags_UserInput);
-            }
-            else
-            {
-                // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
-                cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection), eObjectUpdateFlags_UserInput);
-            }
-        }
-        else
-        {
-            if (bMoveOnly)
-            {
-                // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
-                cameraObject->SetWorldPos(camMatrix.GetTranslation());
-            }
-            else
-            {
-                // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
-                cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection));
-            }
-        }
-
-        using namespace AzToolsFramework;
-        ComponentEntityObjectRequestBus::Event(cameraObject, &ComponentEntityObjectRequestBus::Events::UpdatePreemptiveUndoCache);
-    }
-    else if (m_viewEntityId.IsValid())
-    {
-        // Ignore camera movement if locked.
-        if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
-        {
-            return;
-        }
-
-        if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
-        {
-            CUndo undo("Move Camera");
-            if (bMoveOnly)
-            {
-                AZ::TransformBus::Event(
-                    m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
-                    LYVec3ToAZVec3(camMatrix.GetTranslation()));
-            }
-            else
-            {
-                AZ::TransformBus::Event(
-                    m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
-                    LYTransformToAZTransform(camMatrix));
-            }
-        }
-        else
-        {
-            if (bMoveOnly)
-            {
-                AZ::TransformBus::Event(
-                    m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
-                    LYVec3ToAZVec3(camMatrix.GetTranslation()));
-            }
-            else
-            {
-                AZ::TransformBus::Event(
-                    m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
-                    LYTransformToAZTransform(camMatrix));
-            }
-        }
-
-        AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
-            &AzToolsFramework::PropertyEditorGUIMessages::RequestRefresh,
-            AzToolsFramework::PropertyModificationRefreshLevel::Refresh_AttributesAndValues);
-    }
-
-    if (m_pressedKeyState == KeyPressedState::PressedThisFrame)
-    {
-        m_pressedKeyState = KeyPressedState::PressedInPreviousFrame;
-    }
-
-    QtViewport::SetViewTM(camMatrix);
-
-    m_Camera.SetMatrix(camMatrix);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderSelectedRegion()
-{
-    AABB box;
-    GetIEditor()->GetSelectedRegion(box);
-    if (box.IsEmpty())
-    {
-        return;
-    }
-
-    float x1 = box.min.x;
-    float y1 = box.min.y;
-    float x2 = box.max.x;
-    float y2 = box.max.y;
-
-    DisplayContext& dc = m_displayContext;
-
-    float fMaxSide = MAX(y2 - y1, x2 - x1);
-    if (fMaxSide < 0.1f)
-    {
-        return;
-    }
-    float fStep = fMaxSide / 100.0f;
-
-    float fMinZ = 0;
-    float fMaxZ = 0;
-
-    // Draw yellow border lines.
-    dc.SetColor(1, 1, 0, 1);
-    float offset = 0.01f;
-    Vec3 p1, p2;
-
-    const float defaultTerrainHeight = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
-    auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
-
-    for (float y = y1; y < y2; y += fStep)
-    {
-        p1.x = x1;
-        p1.y = y;
-        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
-
-        p2.x = x1;
-        p2.y = y + fStep;
-        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
-        dc.DrawLine(p1, p2);
-
-        p1.x = x2;
-        p1.y = y;
-        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
-
-        p2.x = x2;
-        p2.y = y + fStep;
-        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
-        dc.DrawLine(p1, p2);
-
-        fMinZ = min(fMinZ, min(p1.z, p2.z));
-        fMaxZ = max(fMaxZ, max(p1.z, p2.z));
-    }
-    for (float x = x1; x < x2; x += fStep)
-    {
-        p1.x = x;
-        p1.y = y1;
-        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
-
-        p2.x = x + fStep;
-        p2.y = y1;
-        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
-        dc.DrawLine(p1, p2);
-
-        p1.x = x;
-        p1.y = y2;
-        p1.z = terrain ? terrain->GetHeightFromFloats(p1.x, p1.y) + offset : defaultTerrainHeight + offset;
-
-        p2.x = x + fStep;
-        p2.y = y2;
-        p2.z = terrain ? terrain->GetHeightFromFloats(p2.x, p2.y) + offset : defaultTerrainHeight + offset;
-        dc.DrawLine(p1, p2);
-
-        fMinZ = min(fMinZ, min(p1.z, p2.z));
-        fMaxZ = max(fMaxZ, max(p1.z, p2.z));
-    }
-
-    {
-        // Draw a box area
-        float fBoxOver = fMaxSide / 5.0f;
-        float fBoxHeight = fBoxOver + fMaxZ - fMinZ;
-
-        ColorB boxColor(64, 64, 255, 128); // light blue
-        ColorB transparent(boxColor.r, boxColor.g, boxColor.b, 0);
-
-        Vec3 base[] = {
-            Vec3(x1, y1, fMinZ),
-            Vec3(x2, y1, fMinZ),
-            Vec3(x2, y2, fMinZ),
-            Vec3(x1, y2, fMinZ)
-        };
-
-
-        // Generate vertices
-        static AABB boxPrev(AABB::RESET);
-        static std::vector<Vec3> verts;
-        static std::vector<ColorB> colors;
-
-        if (!IsEquivalent(boxPrev, box))
-        {
-            verts.resize(0);
-            colors.resize(0);
-            for (int i = 0; i < 4; ++i)
-            {
-                Vec3& p = base[i];
-
-                verts.push_back(p);
-                verts.push_back(Vec3(p.x, p.y, p.z + fBoxHeight));
-                verts.push_back(Vec3(p.x, p.y, p.z + fBoxHeight + fBoxOver));
-
-                colors.push_back(boxColor);
-                colors.push_back(boxColor);
-                colors.push_back(transparent);
-            }
-            boxPrev = box;
-        }
-
-        // Generate indices
-        const int numInds = 4 * 12;
-        static vtx_idx inds[numInds];
-        static bool bNeedIndsInit = true;
-        if (bNeedIndsInit)
-        {
-            vtx_idx* pInds = &inds[0];
-
-            for (int i = 0; i < 4; ++i)
-            {
-                int over = 0;
-                if (i == 3)
-                {
-                    over = -12;
-                }
-
-                int ind = i * 3;
-                *pInds++ = ind;
-                *pInds++ = ind + 3 + over;
-                *pInds++ = ind + 1;
-
-                *pInds++ = ind + 1;
-                *pInds++ = ind + 3 + over;
-                *pInds++ = ind + 4 + over;
-
-                ind = i * 3 + 1;
-                *pInds++ = ind;
-                *pInds++ = ind + 3 + over;
-                *pInds++ = ind + 1;
-
-                *pInds++ = ind + 1;
-                *pInds++ = ind + 3 + over;
-                *pInds++ = ind + 4 + over;
-            }
-            bNeedIndsInit = false;
-        }
-
-        // Draw lines
-        for (int i = 0; i < 4; ++i)
-        {
-            Vec3& p = base[i];
-
-            dc.DrawLine(p, Vec3(p.x, p.y, p.z + fBoxHeight), ColorF(1, 1, 0, 1), ColorF(1, 1, 0, 1));
-            dc.DrawLine(Vec3(p.x, p.y, p.z + fBoxHeight), Vec3(p.x, p.y, p.z + fBoxHeight + fBoxOver), ColorF(1, 1, 0, 1), ColorF(1, 1, 0, 0));
-        }
-
-        // Draw volume
-        dc.DepthWriteOff();
-        dc.CullOff();
-        dc.pRenderAuxGeom->DrawTriangles(&verts[0], verts.size(), &inds[0], numInds, &colors[0]);
-        dc.CullOn();
-        dc.DepthWriteOn();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::ProcessKeys()
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    if (m_PlayerControl || GetIEditor()->IsInGameMode() || !CheckRespondToInput() || m_freezeViewportInput)
-    {
-        return;
-    }
-
-    //m_Camera.UpdateFrustum();
-    Matrix34 m = GetViewTM();
-    Vec3 ydir = m.GetColumn1().GetNormalized();
-    Vec3 xdir = m.GetColumn0().GetNormalized();
-    Vec3 zdir = m.GetColumn2().GetNormalized();
-
-    Vec3 pos = GetViewTM().GetTranslation();
-
-    float speedScale = AZStd::GetMin(
-        60.0f * GetIEditor()->GetSystem()->GetITimer()->GetFrameTime(), 20.0f);
-
-    speedScale *= GetCameraMoveSpeed();
-
-    // Use the global modifier keys instead of our keymap. It's more reliable.
-    const bool shiftPressed = QGuiApplication::queryKeyboardModifiers() & Qt::ShiftModifier;
-    const bool controlPressed = QGuiApplication::queryKeyboardModifiers() & Qt::ControlModifier;
-
-    if (shiftPressed)
-    {
-        speedScale *= gSettings.cameraFastMoveSpeed;
-    }
-
-    if (controlPressed)
-    {
-        return;
-    }
-
-    bool bIsPressedSome = false;
-
-    if (IsKeyDown(Qt::Key_Up) || IsKeyDown(Qt::Key_W))
-    {
-        // move forward
-        bIsPressedSome = true;
-        pos = pos + (speedScale * m_moveSpeed * ydir);
-    }
-
-    if (IsKeyDown(Qt::Key_Down) || IsKeyDown(Qt::Key_S))
-    {
-        // move backward
-        bIsPressedSome = true;
-        pos = pos - (speedScale * m_moveSpeed * ydir);
-    }
-
-    if (IsKeyDown(Qt::Key_Left) || IsKeyDown(Qt::Key_A))
-    {
-        // move left
-        bIsPressedSome = true;
-        pos = pos - (speedScale * m_moveSpeed * xdir);
-    }
-
-    if (IsKeyDown(Qt::Key_Right) || IsKeyDown(Qt::Key_D))
-    {
-        // move right
-        bIsPressedSome = true;
-        pos = pos + (speedScale * m_moveSpeed * xdir);
-    }
-
-    if (IsKeyDown(Qt::Key_E))
-    {
-        // move Up
-        bIsPressedSome = true;
-        pos = pos + (speedScale * m_moveSpeed * zdir);
-    }
-
-    if (IsKeyDown(Qt::Key_Q))
-    {
-        // move down
-        bIsPressedSome = true;
-        pos = pos - (speedScale * m_moveSpeed * zdir);
-    }
-
-    if (bIsPressedSome)
-    {
-        // Only change the keystate to pressed if it wasn't already marked in
-        // a previous frame. Otherwise, the undo/redo stack will be all off
-        // from what SetViewTM() does.
-        if (m_pressedKeyState == KeyPressedState::AllUp)
-        {
-            m_pressedKeyState = KeyPressedState::PressedThisFrame;
-        }
-
-        m.SetTranslation(pos);
-        SetViewTM(m, true);
-    }
-
-    bool mouseModifierKeysDown = ((QGuiApplication::mouseButtons() & (Qt::RightButton | Qt::MiddleButton)) != 0);
-
-    if (!bIsPressedSome && !mouseModifierKeysDown)
-    {
-        m_pressedKeyState = KeyPressedState::AllUp;
-    }
-}
-
-Vec3 CRenderViewport::WorldToView3D(const Vec3& wp, [[maybe_unused]] int nFlags) const
-{
-    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
-        "WorldToView3D was called but viewport widget rendering was not set. PreWidgetRendering must be called before.");
-
-    Vec3 out(0, 0, 0);
-    float x, y, z;
-
-    m_renderer->ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
-    if (_finite(x) && _finite(y) && _finite(z))
-    {
-        out.x = (x / 100) * m_rcClient.width();
-        out.y = (y / 100) * m_rcClient.height();
-        out.x /= QHighDpiScaling::factor(windowHandle()->screen());
-        out.y /= QHighDpiScaling::factor(windowHandle()->screen());
-        out.z = z;
-    }
-    return out;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint CRenderViewport::WorldToView(const Vec3& wp) const
-{
-    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
-        "WorldToView was called but viewport widget rendering was not set. PreWidgetRendering must be called before.");
-
-    QPoint p;
-    float x, y, z;
-
-    m_renderer->ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
-    if (_finite(x) || _finite(y))
-    {
-        p.rx() = (x / 100) * m_rcClient.width();
-        p.ry() = (y / 100) * m_rcClient.height();
-    }
-    else
-    {
-        QPoint(0, 0);
-    }
-
-    return p;
-}
-//////////////////////////////////////////////////////////////////////////
-QPoint CRenderViewport::WorldToViewParticleEditor(const Vec3& wp, int width, int height) const
-{
-    QPoint p;
-    float x, y, z;
-
-    m_renderer->ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
-    if (_finite(x) || _finite(y))
-    {
-        p.rx() = (x / 100) * width;
-        p.ry() = (y / 100) * height;
-    }
-    else
-    {
-        QPoint(0, 0);
-    }
-    return p;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 CRenderViewport::ViewToWorld(const QPoint& vp, bool* collideWithTerrain, bool onlyTerrain, bool bSkipVegetation, bool bTestRenderMesh, bool* collideWithObject) const
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    // Make sure we initialize the value if a pointer has been passed in
-    if (collideWithTerrain != nullptr)
-    {
-        *collideWithTerrain = false;
-    }
-
-    // Make sure we initialize the value if a pointer has been passed in
-    if (collideWithObject != nullptr)
-{
-        *collideWithObject = false;
-    }
-
-    if (!m_renderer)
-    {
-        return Vec3(0, 0, 0);
-    }
-
-    QRect rc = m_rcClient;
-
-    Vec3 pos0;
-    if (!m_Camera.Unproject(Vec3(vp.x(), rc.bottom() - vp.y(), 0), pos0))
-    {
-        return Vec3(0, 0, 0);
-    }
-    if (!IsVectorInValidRange(pos0))
-    {
-        pos0.Set(0, 0, 0);
-    }
-
-    Vec3 pos1;
-    if (!m_Camera.Unproject(Vec3(vp.x(), rc.bottom() - vp.y(), 1), pos1))
-    {
-        return Vec3(0, 0, 0);
-    }
-    if (!IsVectorInValidRange(pos1))
-    {
-        pos1.Set(1, 0, 0);
-    }
-
-    const float maxDistance = 10000.f;
-
-    Vec3 v = (pos1 - pos0);
-    v = v.GetNormalized();
-    v = v * maxDistance;
-
-    if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z))
-    {
-        return Vec3(0, 0, 0);
-    }
-
-    Vec3 colp = pos0 + 0.002f * v;
-
-    AZ_UNUSED(vp)
-    AZ_UNUSED(bTestRenderMesh)
-    AZ_UNUSED(bSkipVegetation)
-    AZ_UNUSED(bSkipVegetation)
-    AZStd::optional<AZStd::pair<float, AZ::Vector3>> hitDistancePosition;
-
-    if (!onlyTerrain && !GetIEditor()->IsTerrainAxisIgnoreObjects())
-    {
-        AzFramework::EntityContextId editorContextId;
-        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
-            editorContextId, &AzToolsFramework::EditorEntityContextRequests::GetEditorEntityContextId);
-
-        AzFramework::RenderGeometry::RayRequest ray;
-        ray.m_startWorldPosition = LYVec3ToAZVec3(pos0);
-        ray.m_endWorldPosition = LYVec3ToAZVec3(pos0 + v);
-        ray.m_onlyVisible = true;
-
-        AzFramework::RenderGeometry::RayResult result;
-        AzFramework::RenderGeometry::IntersectorBus::EventResult(result, editorContextId,
-            &AzFramework::RenderGeometry::IntersectorInterface::RayIntersect, ray);
-
-        if (result)
-        {
-            if (!hitDistancePosition || result.m_distance < hitDistancePosition->first)
-            {
-                hitDistancePosition = {result.m_distance, result.m_worldPosition};
-                if (collideWithObject)
-                {
-                    *collideWithObject = true;
-                }
-            }
-        }
-    }
-
-    if (hitDistancePosition)
-    {
-        colp = AZVec3ToLYVec3(hitDistancePosition->second);
-    }
-
-
-    return colp;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 CRenderViewport::ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh)
-{
-    AZ_UNUSED(vp)
-    AZ_UNUSED(bTestRenderMesh)
-
-    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
-        "ViewToWorldNormal was called but viewport widget rendering was not set. PreWidgetRendering must be called before.");
-
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    if (!m_renderer)
-    {
-        return Vec3(0, 0, 1);
-    }
-
-    QRect rc = m_rcClient;
-
-    Vec3 pos0, pos1;
-    float wx, wy, wz;
-    m_renderer->UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 0, &wx, &wy, &wz);
-    if (!_finite(wx) || !_finite(wy) || !_finite(wz))
-    {
-        return Vec3(0, 0, 1);
-    }
-    pos0(wx, wy, wz);
-    if (!IsVectorInValidRange(pos0))
-    {
-        pos0.Set(0, 0, 0);
-    }
-
-    m_renderer->UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 1, &wx, &wy, &wz);
-    if (!_finite(wx) || !_finite(wy) || !_finite(wz))
-    {
-        return Vec3(0, 0, 1);
-    }
-    pos1(wx, wy, wz);
-
-    Vec3 v = (pos1 - pos0);
-    if (!IsVectorInValidRange(pos1))
-    {
-        pos1.Set(1, 0, 0);
-    }
-
-    const float maxDistance = 2000.f;
-    v = v.GetNormalized();
-    v = v * maxDistance;
-
-    if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z))
-    {
-        return Vec3(0, 0, 1);
-    }
-
-    Vec3 colp(0, 0, 0);
-
-
-    AZStd::optional<AZStd::pair<float, AZ::Vector3>> hitDistanceNormal;
-
-    if (!onlyTerrain && !GetIEditor()->IsTerrainAxisIgnoreObjects())
-    {
-        AzFramework::EntityContextId editorContextId;
-        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
-            editorContextId, &AzToolsFramework::EditorEntityContextRequests::GetEditorEntityContextId);
-
-        AzFramework::RenderGeometry::RayRequest ray;
-        ray.m_startWorldPosition = LYVec3ToAZVec3(pos0);
-        ray.m_endWorldPosition = LYVec3ToAZVec3(pos0 + v);
-        ray.m_onlyVisible = true;
-
-        AzFramework::RenderGeometry::RayResult result;
-        AzFramework::RenderGeometry::IntersectorBus::EventResult(result, editorContextId,
-            &AzFramework::RenderGeometry::IntersectorInterface::RayIntersect, ray);
-
-        if (result)
-        {
-            if (!hitDistanceNormal || result.m_distance < hitDistanceNormal->first)
-            {
-                hitDistanceNormal = { result.m_distance, result.m_worldNormal };
-            }
-        }
-    }
-
-    return hitDistanceNormal ? AZVec3ToLYVec3(hitDistanceNormal->second) : Vec3(0, 0, 1);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const
-{
-    Matrix34A objMat, objMatInv;
-    Matrix33 objRot, objRotInv;
-
-    if (hit.pCollider->GetiForeignData() != PHYS_FOREIGN_ID_STATIC)
-    {
-        return false;
-    }
-
-    IRenderNode* pNode = (IRenderNode*) hit.pCollider->GetForeignData(PHYS_FOREIGN_ID_STATIC);
-    if (!pNode || !pNode->GetEntityStatObj())
-    {
-        return false;
-    }
-
-    IStatObj* pEntObject  = pNode->GetEntityStatObj(hit.partid, 0, &objMat, false);
-    if (!pEntObject || !pEntObject->GetRenderMesh())
-    {
-        return false;
-    }
-
-    objRot = Matrix33(objMat);
-    objRot.NoScale(); // No scale.
-    objRotInv = objRot;
-    objRotInv.Invert();
-
-    float fWorldScale = objMat.GetColumn(0).GetLength(); // GetScale
-    float fWorldScaleInv = 1.0f / fWorldScale;
-
-    // transform decal into object space
-    objMatInv = objMat;
-    objMatInv.Invert();
-
-    // put into normal object space hit direction of projection
-    Vec3 invhitn = -(hit.n);
-    Vec3 vOS_HitDir = objRotInv.TransformVector(invhitn).GetNormalized();
-
-    // put into position object space hit position
-    Vec3 vOS_HitPos = objMatInv.TransformPoint(hit.pt);
-    vOS_HitPos -= vOS_HitDir * RENDER_MESH_TEST_DISTANCE * fWorldScaleInv;
-
-    IRenderMesh* pRM = pEntObject->GetRenderMesh();
-
-    AABB aabbRNode;
-    pRM->GetBBox(aabbRNode.min, aabbRNode.max);
-    Vec3 vOut(0, 0, 0);
-    if (!Intersect::Ray_AABB(Ray(vOS_HitPos, vOS_HitDir), aabbRNode, vOut))
-    {
-        return false;
-    }
-
-    if (!pRM || !pRM->GetVerticesCount())
-    {
-        return false;
-    }
-
-    if (RayRenderMeshIntersection(pRM, vOS_HitPos, vOS_HitDir, outPos, outNormal))
-    {
-        outNormal = objRot.TransformVector(outNormal).GetNormalized();
-        outPos = objMat.TransformPoint(outPos);
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::RayRenderMeshIntersection(IRenderMesh*, const Vec3&, const Vec3&, Vec3&, Vec3&) const
-{
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const
-{
-    AZ_Assert(m_cameraSetForWidgetRenderingCount > 0,
-        "ViewToWorldRay was called but SScopedCurrentContext was not set at a higher scope! This means the camera for this call is incorrect.");
-
-    if (!m_renderer)
-    {
-        return;
-    }
-
-    QRect rc = m_rcClient;
-
-    Vec3 pos0, pos1;
-    float wx, wy, wz;
-    m_renderer->UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 0, &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);
-    m_renderer->UnProjectFromScreen(vp.x(), rc.bottom() - vp.y(), 1, &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);
-
-    Vec3 v = (pos1 - pos0);
-    v = v.GetNormalized();
-
-    raySrc = pos0;
-    rayDir = v;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CRenderViewport::GetScreenScaleFactor(const Vec3& worldPoint) const
-{
-    float dist = m_Camera.GetPosition().GetDistance(worldPoint);
-    if (dist < m_Camera.GetNearPlane())
-    {
-        dist = m_Camera.GetNearPlane();
-    }
-    return dist;
-}
-//////////////////////////////////////////////////////////////////////////
-float CRenderViewport::GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position)
-{
-    Vec3 camPos = camera.GetPosition();
-    float dist = camPos.GetDistance(object_position);
-    return dist;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnDestroy()
-{
-    DestroyRenderContext();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::CheckRespondToInput() const
-{
-    if (!Editor::EditorQtApplication::IsActive())
-    {
-        return false;
-    }
-
-    if (!hasFocus())
-    {
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::HitTest(const QPoint& point, HitContext& hitInfo)
-{
-    hitInfo.camera = &m_Camera;
-    hitInfo.pExcludedObject = GetCameraObject();
-    return QtViewport::HitTest(point, hitInfo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::IsBoundsVisible(const AABB& box) const
-{
-    // If at least part of bbox is visible then its visible.
-    return m_Camera.IsAABBVisible_F(AABB(box.min, box.max));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::CenterOnSelection()
-{
-    if (!GetIEditor()->GetSelection()->IsEmpty())
-    {
-        // Get selection bounds & center
-        CSelectionGroup* sel = GetIEditor()->GetSelection();
-        AABB selectionBounds = sel->GetBounds();
-        CenterOnAABB(selectionBounds);
-    }
-}
-
-void CRenderViewport::CenterOnAABB(const AABB& aabb)
-{
-    Vec3 selectionCenter = aabb.GetCenter();
-
-    // Minimum center size is 40cm
-    const float minSelectionRadius = 0.4f;
-    const float selectionSize = std::max(minSelectionRadius, aabb.GetRadius());
-
-    // Move camera 25% further back than required
-    const float centerScale = 1.25f;
-
-    // Decompose original transform matrix
-    const Matrix34& originalTM = GetViewTM();
-    AffineParts affineParts;
-    affineParts.SpectralDecompose(originalTM);
-
-    // Forward vector is y component of rotation matrix
-    Matrix33 rotationMatrix(affineParts.rot);
-    const Vec3 viewDirection = rotationMatrix.GetColumn1().GetNormalized();
-
-    // Compute adjustment required by FOV != 90 degrees
-    const float fov = GetFOV();
-    const float fovScale = (1.0f / tan(fov * 0.5f));
-
-    // Compute new transform matrix
-    const float distanceToTarget = selectionSize * fovScale * centerScale;
-    const Vec3 newPosition = selectionCenter - (viewDirection * distanceToTarget);
-    Matrix34 newTM = Matrix34(rotationMatrix, newPosition);
-
-    // Set new orbit distance
-    m_orbitDistance = distanceToTarget;
-    m_orbitDistance = fabs(m_orbitDistance);
-
-    SetViewTM(newTM);
-}
-
-void CRenderViewport::CenterOnSliceInstance()
-{
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    AZ::SliceComponent::SliceInstanceAddress sliceAddress;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(sliceAddress,
-        &AzToolsFramework::ToolsApplicationRequestBus::Events::FindCommonSliceInstanceAddress, selectedEntityList);
-
-    if (!sliceAddress.IsValid())
-    {
-        return;
-    }
-
-    AZ::EntityId sliceRootEntityId;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(sliceRootEntityId,
-        &AzToolsFramework::ToolsApplicationRequestBus::Events::GetRootEntityIdOfSliceInstance, sliceAddress);
-
-    if (!sliceRootEntityId.IsValid())
-    {
-        return;
-    }
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList{sliceRootEntityId});
-
-    const AZ::SliceComponent::InstantiatedContainer* instantiatedContainer = sliceAddress.GetInstance()->GetInstantiated();
-
-    AABB aabb(Vec3(std::numeric_limits<float>::max()), Vec3(-std::numeric_limits<float>::max()));
-    for (AZ::Entity* entity : instantiatedContainer->m_entities)
-    {
-        CEntityObject* entityObject = nullptr;
-        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(entityObject, entity->GetId(),
-            &AzToolsFramework::ComponentEntityEditorRequestBus::Events::GetSandboxObject);
-        AABB box;
-        entityObject->GetBoundBox(box);
-        aabb.Add(box.min);
-        aabb.Add(box.max);
-    }
-    CenterOnAABB(aabb);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::SetFOV(float fov)
-{
-    if (m_pCameraFOVVariable)
-    {
-        m_pCameraFOVVariable->Set(fov);
-    }
-    else
-    {
-        m_camFOV = fov;
-    }
-
-    if (m_viewPane)
-    {
-        m_viewPane->OnFOVChanged(fov);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CRenderViewport::GetFOV() const
-{
-    if (m_viewSourceType == ViewSourceType::SequenceCamera)
-    {
-        CBaseObject* cameraObject = GetCameraObject();
-
-        AZ::EntityId cameraEntityId;
-        AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(cameraEntityId, cameraObject, &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
-        if (cameraEntityId.IsValid())
-        {
-            // component Camera
-            float fov = DEFAULT_FOV;
-            Camera::CameraRequestBus::EventResult(fov, cameraEntityId, &Camera::CameraComponentRequests::GetFov);
-            return AZ::DegToRad(fov);
-        }
-    }
-
-    if (m_pCameraFOVVariable)
-    {
-        float fov;
-        m_pCameraFOVVariable->Get(fov);
-        return fov;
-    }
-    else if (m_viewEntityId.IsValid())
-    {
-        float fov = AZ::RadToDeg(m_camFOV);
-        Camera::CameraRequestBus::EventResult(fov, m_viewEntityId, &Camera::CameraComponentRequests::GetFov);
-        return AZ::DegToRad(fov);
-    }
-
-    return m_camFOV;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::CreateRenderContext()
-{
-    // Create context.
-    if (m_renderer && !m_bRenderContextCreated)
-    {
-        m_bRenderContextCreated = true;
-
-        AzFramework::WindowRequestBus::Handler::BusConnect(renderOverlayHWND());
-        AzFramework::WindowSystemNotificationBus::Broadcast(&AzFramework::WindowSystemNotificationBus::Handler::OnWindowCreated, renderOverlayHWND());
-
-        WIN_HWND oldContext = m_renderer->GetCurrentContextHWND();
-        m_renderer->CreateContext(renderOverlayHWND());
-        m_renderer->SetCurrentContext(oldContext); // restore prior context
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::DestroyRenderContext()
-{
-    // Destroy render context.
-    if (m_renderer && m_bRenderContextCreated)
-    {
-        // Do not delete primary context.
-        if (m_hwnd != m_renderer->GetHWND())
-        {
-            m_renderer->DeleteContext(m_hwnd);
-        }
-        m_bRenderContextCreated = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::SetDefaultCamera()
-{
-    if (IsDefaultCamera())
-    {
-        return;
-    }
-    ResetToViewSourceType(ViewSourceType::None);
-    GetViewManager()->SetCameraObjectId(m_cameraObjectId);
-    SetName(m_defaultViewName);
-    SetViewTM(m_defaultViewTM);
-    PostCameraSet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::IsDefaultCamera() const
-{
-    return m_viewSourceType == ViewSourceType::None;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::SetSequenceCamera()
-{
-    if (m_viewSourceType == ViewSourceType::SequenceCamera)
-    {
-        // Reset if we were checked before
-        SetDefaultCamera();
-    }
-    else
-    {
-        ResetToViewSourceType(ViewSourceType::SequenceCamera);
-
-        SetName(tr("Sequence Camera"));
-        SetViewTM(GetViewTM());
-
-        GetViewManager()->SetCameraObjectId(m_cameraObjectId);
-        PostCameraSet();
-
-        // ForceAnimation() so Track View will set the Camera params
-        // if a camera is animated in the sequences.
-        if (GetIEditor() && GetIEditor()->GetAnimation())
-        {
-            GetIEditor()->GetAnimation()->ForceAnimation();
-    }
-}
-}
-
-//////////////////////////////////////////////////////////////////////////
-void  CRenderViewport::SetComponentCamera(const AZ::EntityId& entityId)
-{
-    ResetToViewSourceType(ViewSourceType::CameraComponent);
-    SetViewEntity(entityId);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void  CRenderViewport::SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement)
-{
-    ResetToViewSourceType(ViewSourceType::AZ_Entity);
-    SetViewEntity(entityId, lockCameraMovement);
-}
-
-void CRenderViewport::SetFirstComponentCamera()
-{
-    AZ::EBusAggregateResults<AZ::EntityId> results;
-    Camera::CameraBus::BroadcastResult(results, &Camera::CameraRequests::GetCameras);
-    AZStd::sort_heap(results.values.begin(), results.values.end());
-    AZ::EntityId entityId;
-    if (results.values.size() > 0)
-    {
-        entityId = results.values[0];
-    }
-    SetComponentCamera(entityId);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::SetSelectedCamera()
-{
-    AZ::EBusAggregateResults<AZ::EntityId> cameraList;
-    Camera::CameraBus::BroadcastResult(cameraList, &Camera::CameraRequests::GetCameras);
-    if (cameraList.values.size() > 0)
-    {
-        AzToolsFramework::EntityIdList selectedEntityList;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-        for (const AZ::EntityId& entityId : selectedEntityList)
-        {
-            if (AZStd::find(cameraList.values.begin(), cameraList.values.end(), entityId) != cameraList.values.end())
-            {
-                SetComponentCamera(entityId);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::IsSelectedCamera() const
-{
-    CBaseObject* pCameraObject = GetCameraObject();
-    if (pCameraObject && pCameraObject == GetIEditor()->GetSelectedObject())
-    {
-        return true;
-    }
-
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-        selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    if ((m_viewSourceType == ViewSourceType::CameraComponent  || m_viewSourceType == ViewSourceType::AZ_Entity)
-        && !selectedEntityList.empty()
-        && AZStd::find(selectedEntityList.begin(), selectedEntityList.end(), m_viewEntityId) != selectedEntityList.end())
-    {
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::CycleCamera()
-{
-    // None -> Sequence -> LegacyCamera -> ... LegacyCamera -> CameraComponent -> ... CameraComponent -> None
-    // AZ_Entity has been intentionally left out of the cycle for now.
-    switch (m_viewSourceType)
-    {
-    case CRenderViewport::ViewSourceType::None:
-    {
-        SetFirstComponentCamera();
-        break;
-    }
-    case CRenderViewport::ViewSourceType::SequenceCamera:
-    {
-        AZ_Error("CRenderViewport", false, "Legacy cameras no longer exist, unable to set sequence camera.");
-        break;
-    }
-    case CRenderViewport::ViewSourceType::LegacyCamera:
-    {
-        AZ_Warning("CRenderViewport", false, "Legacy cameras no longer exist, using first found component camera instead.");
-        SetFirstComponentCamera();
-        break;
-    }
-    case CRenderViewport::ViewSourceType::CameraComponent:
-    {
-        AZ::EBusAggregateResults<AZ::EntityId> results;
-        Camera::CameraBus::BroadcastResult(results, &Camera::CameraRequests::GetCameras);
-        AZStd::sort_heap(results.values.begin(), results.values.end());
-        auto&& currentCameraIterator = AZStd::find(results.values.begin(), results.values.end(), m_viewEntityId);
-        if (currentCameraIterator != results.values.end())
-        {
-            ++currentCameraIterator;
-            if (currentCameraIterator != results.values.end())
-            {
-                SetComponentCamera(*currentCameraIterator);
-                break;
-            }
-        }
-        SetDefaultCamera();
-        break;
-    }
-    case CRenderViewport::ViewSourceType::AZ_Entity:
-    {
-        // we may decide to have this iterate over just selected entities
-        SetDefaultCamera();
-        break;
-    }
-    default:
-    {
-        SetDefaultCamera();
-        break;
-    }
-    }
-}
-
-void CRenderViewport::SetViewFromEntityPerspective(const AZ::EntityId& entityId)
-{
-    SetViewAndMovementLockFromEntityPerspective(entityId, false);
-}
-
-void CRenderViewport::SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement)
-{
-    if (!m_ignoreSetViewFromEntityPerspective)
-    {
-        SetEntityAsCamera(entityId, lockCameraMovement);
-    }
-}
-
-bool CRenderViewport::GetActiveCameraPosition(AZ::Vector3& cameraPos)
-{
-    cameraPos = LYVec3ToAZVec3(m_viewTM.GetTranslation());
-    return true;
-}
-
-bool CRenderViewport::GetActiveCameraState(AzFramework::CameraState& cameraState)
-{
-    if (m_pPrimaryViewport == this)
-    {
-        if (GetIEditor()->IsInGameMode())
-        {
-            return false;
-        }
-        else
-        {
-            const auto& camera = GetCamera();
-            cameraState = CameraStateFromCCamera(camera, GetFOV(), m_rcClient.width(), m_rcClient.height());
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-void CRenderViewport::OnStartPlayInEditor()
-{
-    if (m_viewEntityId.IsValid())
-    {
-        m_viewEntityIdCachedForEditMode = m_viewEntityId;
-        AZ::EntityId runtimeEntityId;
-        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
-            &AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId,
-            m_viewEntityId, runtimeEntityId);
-
-        m_viewEntityId = runtimeEntityId;
-    }
-    // Force focus the render viewport, otherwise we don't receive keyPressEvents until the user first clicks a
-    // mouse button. See also CRenderViewport::mousePressEvent for a deatiled description of the underlying bug.
-    // We need to queue this up because we don't actually lose focus until sometime after this function returns.
-    QTimer::singleShot(0, this, &CRenderViewport::ActivateWindowAndSetFocus);
-}
-
-void CRenderViewport::OnStopPlayInEditor()
-{
-    if (m_viewEntityIdCachedForEditMode.IsValid())
-    {
-        m_viewEntityId = m_viewEntityIdCachedForEditMode;
-        m_viewEntityIdCachedForEditMode.SetInvalid();
-    }
-}
-
-void CRenderViewport::ActivateWindowAndSetFocus()
-{
-    window()->activateWindow();
-    setFocus();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderConstructionPlane()
-{
-    // noop
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RenderSnappingGrid()
-{
-    // noop
-}
-
-//////////////////////////////////////////////////////////////////////////
-CRenderViewport::SPreviousContext CRenderViewport::SetCurrentContext(int newWidth, int newHeight) const
-{
-    SPreviousContext x;
-    x.window = reinterpret_cast<HWND>(m_renderer->GetCurrentContextHWND());
-    x.mainViewport = m_renderer->IsCurrentContextMainVP();
-    x.width = m_renderer->GetCurrentContextViewportWidth();
-    x.height = m_renderer->GetCurrentContextViewportHeight();
-    x.rendererCamera = m_renderer->GetCamera();
-
-    const float scale = CLAMP(gEnv->pConsole->GetCVar("r_ResolutionScale")->GetFVal(), MIN_RESOLUTION_SCALE, MAX_RESOLUTION_SCALE);
-    const QSize newSize = WidgetToViewport(QSize(newWidth, newHeight)) * scale;
-
-    // No way to query the requested Qt scale here, so do it this way for now
-    float widthScale = aznumeric_cast<float>(newSize.width()) / aznumeric_cast<float>(newWidth);
-    float heightScale = aznumeric_cast<float>(newSize.height()) / aznumeric_cast<float>(newHeight);
-
-    m_renderer->SetCurrentContext(renderOverlayHWND());
-    m_renderer->ChangeViewport(0, 0, newWidth, newHeight, true, widthScale, heightScale);
-    m_renderer->SetCamera(m_Camera);
-
-    return x;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CRenderViewport::SPreviousContext CRenderViewport::SetCurrentContext() const
-{
-    const auto r = rect();
-    return SetCurrentContext(r.width(), r.height());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::RestorePreviousContext(const SPreviousContext& x) const
-{
-    if (x.window && x.window != m_renderer->GetCurrentContextHWND())
-    {
-        m_renderer->SetCurrentContext(x.window);
-        m_renderer->ChangeViewport(0, 0, x.width, x.height, x.mainViewport);
-        m_renderer->SetCamera(x.rendererCamera);
-    }
-}
-
-void CRenderViewport::PreWidgetRendering()
-{
-    // if we have not already set the render context for the viewport, do it now
-    // based on the current state of the renderer/viewport, record the previous
-    // context to restore afterwards
-    if (m_cameraSetForWidgetRenderingCount == 0)
-    {
-        m_preWidgetContext = SetCurrentContext();
-    }
-
-    // keep track of how many times we've attempted to update the context
-    m_cameraSetForWidgetRenderingCount++;
-}
-
-void CRenderViewport::PostWidgetRendering()
-{
-    if (m_cameraSetForWidgetRenderingCount > 0)
-    {
-        m_cameraSetForWidgetRenderingCount--;
-
-        // unwinding - when the viewport context is no longer required,
-        // restore the previous context when widget rendering first began
-        if (m_cameraSetForWidgetRenderingCount == 0)
-        {
-            RestorePreviousContext(m_preWidgetContext);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::OnCameraFOVVariableChanged([[maybe_unused]] IVariable* var)
-{
-    if (m_viewPane)
-    {
-        m_viewPane->OnFOVChanged(GetFOV());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::HideCursor()
-{
-    if (m_bCursorHidden || !gSettings.viewports.bHideMouseCursorWhenCaptured)
-    {
-        return;
-    }
-
-    qApp->setOverrideCursor(Qt::BlankCursor);
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    StartFixedCursorMode(this);
-#endif
-    m_bCursorHidden = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::ShowCursor()
-{
-    if (!m_bCursorHidden || !gSettings.viewports.bHideMouseCursorWhenCaptured)
-    {
-        return;
-    }
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    StopFixedCursorMode();
-#endif
-    qApp->restoreOverrideCursor();
-    m_bCursorHidden = false;
-}
-
-bool CRenderViewport::IsKeyDown(Qt::Key key) const
-{
-    return m_keyDown.contains(key);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::PushDisableRendering()
-{
-    assert(m_disableRenderingCount >= 0);
-    ++m_disableRenderingCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::PopDisableRendering()
-{
-    assert(m_disableRenderingCount >= 1);
-    --m_disableRenderingCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CRenderViewport::IsRenderingDisabled() const
-{
-    return m_disableRenderingCount > 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint CRenderViewport::WidgetToViewport(const QPoint &point) const
-{
-    return point * WidgetToViewportFactor();
-}
-
-QPoint CRenderViewport::ViewportToWidget(const QPoint &point) const
-{
-    return point / WidgetToViewportFactor();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QSize CRenderViewport::WidgetToViewport(const QSize &size) const
-{
-    return size * WidgetToViewportFactor();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::BeginUndoTransaction()
-{
-    PushDisableRendering();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CRenderViewport::EndUndoTransaction()
-{
-    PopDisableRendering();
-    Update();
-}
-
-void CRenderViewport::UpdateCurrentMousePos(const QPoint& newPosition)
-{
-    m_prevMousePos = m_mousePos;
-    m_mousePos = newPosition;
-}
-
-void CRenderViewport::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt)
-{
-    const auto scaledPoint = WidgetToViewport(pt);
-    QtViewport::BuildDragDropContext(context, scaledPoint);
-}
-
-void* CRenderViewport::GetSystemCursorConstraintWindow() const
-{
-    AzFramework::SystemCursorState systemCursorState = AzFramework::SystemCursorState::Unknown;
-
-    AzFramework::InputSystemCursorRequestBus::EventResult(
-        systemCursorState,
-        AzFramework::InputDeviceMouse::Id,
-        &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
-
-    const bool systemCursorConstrained =
-        (systemCursorState == AzFramework::SystemCursorState::ConstrainedAndHidden ||
-         systemCursorState == AzFramework::SystemCursorState::ConstrainedAndVisible);
-
-    return systemCursorConstrained ? renderOverlayHWND() : nullptr;
-}
-
-void CRenderViewport::RestoreViewportAfterGameMode()
-{
-    Matrix34 preGameModeViewTM = m_preGameModeViewTM;
-
-    QString text = QString("You are exiting Game Mode. Would you like to restore the camera in the viewport to where it was before you entered Game Mode?<br/><br/><small>This option can always be changed in the General Preferences tab of the Editor Settings, by toggling the \"%1\" option.</small><br/><br/>").arg(EditorPreferencesGeneralRestoreViewportCameraSettingName);
-    QString restoreOnExitGameModePopupDisabledRegKey("Editor/AutoHide/ViewportCameraRestoreOnExitGameMode");
-
-    // Read the popup disabled registry value
-    QSettings settings;
-    QVariant restoreOnExitGameModePopupDisabledRegValue = settings.value(restoreOnExitGameModePopupDisabledRegKey);
-
-    // Has the user previously disabled being asked about restoring the camera on exiting game mode?
-    if (restoreOnExitGameModePopupDisabledRegValue.isNull())
-    {
-        // No, ask them now
-        QMessageBox messageBox(QMessageBox::Question, "Lumberyard", text, QMessageBox::StandardButtons(QMessageBox::No | QMessageBox::Yes), this);
-        messageBox.setDefaultButton(QMessageBox::Yes);
-
-        QCheckBox* checkBox = new QCheckBox(QStringLiteral("Do not show this message again"));
-        messageBox.setCheckBox(checkBox);
-
-        // Unconstrain the system cursor and make it visible before we show the dialog box, otherwise the user can't see the cursor.
-        AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
-            &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
-            AzFramework::SystemCursorState::UnconstrainedAndVisible);
-
-        int response = messageBox.exec();
-
-        if (checkBox->isChecked())
-        {
-            settings.setValue(restoreOnExitGameModePopupDisabledRegKey, response);
-        }
-
-        // Update the value only if the popup hasn't previously been disabled and the value has changed
-        bool newSetting = (response == QMessageBox::Yes);
-        if (newSetting != GetIEditor()->GetEditorSettings()->restoreViewportCamera)
-        {
-            GetIEditor()->GetEditorSettings()->restoreViewportCamera = newSetting;
-            GetIEditor()->GetEditorSettings()->Save();
-        }
-    }
-
-    bool restoreViewportCamera = GetIEditor()->GetEditorSettings()->restoreViewportCamera;
-    if (restoreViewportCamera)
-    {
-        SetViewTM(preGameModeViewTM);
-    }
-    else
-    {
-        SetViewTM(m_gameTM);
-    }
-}
-
-#include <moc_RenderViewport.cpp>
diff --git a/Code/Sandbox/Editor/RenderViewport.h b/Code/Sandbox/Editor/RenderViewport.h
deleted file mode 100644
index d98a149a56..0000000000
--- a/Code/Sandbox/Editor/RenderViewport.h
+++ /dev/null
@@ -1,647 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_RENDERVIEWPORT_H
-#define CRYINCLUDE_EDITOR_RENDERVIEWPORT_H
-
-#pragma once
-// RenderViewport.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include <Cry_Camera.h>
-
-#include <QSet>
-
-#include "Viewport.h"
-#include "Objects/DisplayContext.h"
-#include "Undo/Undo.h"
-#include "Util/PredefinedAspectRatios.h"
-
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/std/optional.h>
-#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/EditorCameraBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Viewport/ViewportMessages.h>
-#include <MathConversion.h>
-#endif
-
-#include <AzFramework/Windowing/WindowBus.h>
-#include <AzFramework/Visibility/EntityVisibilityQuery.h>
-
-// forward declarations.
-class CBaseObject;
-class QMenu;
-class QKeyEvent;
-class EditorEntityNotifications;
-struct ray_hit;
-struct IRenderMesh;
-struct IVariable;
-
-namespace AzToolsFramework
-{
-    class ManipulatorManager;
-}
-
-// CRenderViewport window
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-class SANDBOX_API CRenderViewport
-    : public QtViewport
-    , public IEditorNotifyListener
-    , public IUndoManagerListener
-    , public Camera::EditorCameraRequestBus::Handler
-    , public AzFramework::InputSystemCursorConstraintRequestBus::Handler
-    , public AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler
-    , public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler
-    , public AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler
-    , public AzFramework::WindowRequestBus::Handler
-{
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    Q_OBJECT
-public:
-    struct SResolution
-    {
-        SResolution()
-            : width(0)
-            , height(0)
-        {
-        }
-
-        SResolution(int w, int h)
-            : width(w)
-            , height(h)
-        {
-        }
-
-        int width;
-        int height;
-    };
-
-public:
-    CRenderViewport(const QString& name, QWidget* parent = nullptr);
-
-    static const GUID& GetClassID()
-    {
-        return QtViewport::GetClassID<CRenderViewport>();
-    }
-
-    /** Get type of this viewport.
-    */
-    virtual EViewportType GetType() const { return ET_ViewportCamera; }
-    virtual void SetType([[maybe_unused]] EViewportType type) { assert(type == ET_ViewportCamera); };
-
-    // Implementation
-public:
-    virtual ~CRenderViewport();
-
-    Q_INVOKABLE void InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons);
-
-public:
-    virtual void Update();
-
-    virtual void ResetContent();
-    virtual void UpdateContent(int flags);
-
-    void OnTitleMenu(QMenu* menu) override;
-
-    void SetCamera(const CCamera& camera);
-    const CCamera& GetCamera() const { return m_Camera; };
-    virtual void SetViewTM(const Matrix34& tm)
-    {
-        if (m_viewSourceType == ViewSourceType::None)
-        {
-            m_defaultViewTM = tm;
-        }
-        SetViewTM(tm, false);
-    }
-
-    //! Map world space position to viewport position.
-    virtual QPoint WorldToView(const Vec3& wp) const;
-    virtual QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const;
-    virtual Vec3 WorldToView3D(const Vec3& wp, int nFlags = 0) const;
-
-    //! Map viewport position to world space position.
-    virtual Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
-    virtual void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
-    virtual Vec3 ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
-    virtual float GetScreenScaleFactor(const Vec3& worldPoint) const;
-    virtual float GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position);
-    virtual float GetAspectRatio() const;
-    virtual bool HitTest(const QPoint& point, HitContext& hitInfo);
-    virtual bool IsBoundsVisible(const AABB& box) const;
-    virtual void CenterOnSelection();
-    virtual void CenterOnAABB(const AABB& aabb);
-    void CenterOnSliceInstance() override;
-
-    void focusOutEvent(QFocusEvent* event) override;
-    void keyPressEvent(QKeyEvent* event) override;
-    void keyReleaseEvent(QKeyEvent* event) override;
-
-    void SetFOV(float fov);
-    float GetFOV() const;
-
-    void SetDefaultCamera();
-    bool IsDefaultCamera() const;
-    void SetSequenceCamera();
-    bool IsSequenceCamera() const { return m_viewSourceType == ViewSourceType::SequenceCamera; }
-    void SetSelectedCamera();
-    bool IsSelectedCamera() const;
-    void SetComponentCamera(const AZ::EntityId& entityId);
-    void SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement = false);
-    void SetFirstComponentCamera();
-    void SetViewEntity(const AZ::EntityId& cameraEntityId, bool lockCameraMovement = false);
-    void PostCameraSet();
-    // This switches the active camera to the next one in the list of (default, all custom cams).
-    void CycleCamera();
-
-    // Camera::EditorCameraRequestBus
-    void SetViewFromEntityPerspective(const AZ::EntityId& entityId) override;
-    void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
-    AZ::EntityId GetCurrentViewEntityId() override { return m_viewEntityId; }
-    bool GetActiveCameraPosition(AZ::Vector3& cameraPos) override;
-    bool GetActiveCameraState(AzFramework::CameraState& cameraState) override;
-
-    // AzToolsFramework::EditorEntityContextNotificationBus (handler moved to cpp to resolve link issues in unity builds)
-    virtual void OnStartPlayInEditor();
-    virtual void OnStopPlayInEditor();
-
-    // AzToolsFramework::EditorContextMenu::Bus (handler moved to cpp to resolve link issues in unity builds)
-    // We use this to determine when the viewport context menu is being displayed so we can exit move mode
-    void PopulateEditorGlobalContextMenu(QMenu* /*menu*/, const AZ::Vector2& /*point*/, int /*flags*/);
-
-    // AzToolsFramework::ViewportInteractionRequestBus
-    AzFramework::CameraState GetCameraState() override;
-    bool GridSnappingEnabled() override;
-    float GridSize() override;
-    bool ShowGrid() override;
-    bool AngleSnappingEnabled() override;
-    float AngleStep() override;
-    AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override;
-    AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint&, float) override
-    {
-        return {};
-    }
-    AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportScreenToWorldRay(
-        const AzFramework::ScreenPoint&) override
-    {
-        return {};
-    }
-    float DeviceScalingFactor() override { return 1.0f; }
-
-    // AzToolsFramework::ViewportFreezeRequestBus
-    bool IsViewportInputFrozen() override;
-    void FreezeViewportInput(bool freeze) override;
-
-    // AzToolsFramework::MainEditorViewportInteractionRequestBus
-    AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) override;
-    AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override;
-    float TerrainHeight(const AZ::Vector2& position) override;
-    void FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut) override;
-    bool ShowingWorldSpace() override;
-    QWidget* GetWidgetForViewportContextMenu() override;
-    void BeginWidgetContext() override;
-    void EndWidgetContext() override;
-
-    // WindowRequestBus::Handler...
-    void SetWindowTitle(const AZStd::string& title) override;
-    AzFramework::WindowSize GetClientAreaSize() const override;
-    void ResizeClientArea(AzFramework::WindowSize) override;
-    bool GetFullScreenState() const override;
-    void SetFullScreenState(bool fullScreenState) override;
-    bool CanToggleFullScreenState() const override;
-    void ToggleFullScreenState() override;
-
-    void ConnectViewportInteractionRequestBus();
-    void DisconnectViewportInteractionRequestBus();
-
-    void ActivateWindowAndSetFocus();
-
-    void LockCameraMovement(bool bLock) { m_bLockCameraMovement = bLock; }
-    bool IsCameraMovementLocked() const { return m_bLockCameraMovement; }
-
-    void EnableCameraObjectMove(bool bMove) { m_bMoveCameraObject = bMove; }
-    bool IsCameraObjectMove() const { return m_bMoveCameraObject; }
-
-    void SetPlayerControl(uint32 i) { m_PlayerControl = i; };
-    uint32 GetPlayerControl() { return m_PlayerControl; };
-
-    const DisplayContext& GetDisplayContext() const { return m_displayContext; }
-    CBaseObject* GetCameraObject() const;
-
-    QPoint WidgetToViewport(const QPoint& point) const;
-    QPoint ViewportToWidget(const QPoint& point) const;
-    QSize WidgetToViewport(const QSize& size) const;
-
-    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-
-    void SetPlayerPos()
-    {
-        Matrix34 m = GetViewTM();
-        m.SetTranslation(m.GetTranslation() - m_PhysicalLocation.t);
-        SetViewTM(m);
-
-        m_AverageFrameTime = 0.14f;
-
-        m_PhysicalLocation.SetIdentity();
-
-        m_LocalEntityMat.SetIdentity();
-        m_PrevLocalEntityMat.SetIdentity();
-
-        m_absCameraHigh = 2.0f;
-        m_absCameraPos = Vec3(0, 3, 2);
-        m_absCameraPosVP = Vec3(0, -3, 1.5);
-
-        m_absCurrentSlope = 0.0f;
-
-        m_absLookDirectionXY = Vec2(0, 1);
-
-        m_LookAt = Vec3(ZERO);
-        m_LookAtRate = Vec3(ZERO);
-        m_vCamPos = Vec3(ZERO);
-        m_vCamPosRate = Vec3(ZERO);
-
-        m_relCameraRotX = 0;
-        m_relCameraRotZ = 0;
-
-        uint32 numSample6 = m_arrAnimatedCharacterPath.size();
-        for (uint32 i = 0; i < numSample6; i++)
-        {
-            m_arrAnimatedCharacterPath[i] = Vec3(ZERO);
-        }
-
-        numSample6 = m_arrSmoothEntityPath.size();
-        for (uint32 i = 0; i < numSample6; i++)
-        {
-            m_arrSmoothEntityPath[i] = Vec3(ZERO);
-        }
-
-        uint32 numSample7 = m_arrRunStrafeSmoothing.size();
-        for (uint32 i = 0; i < numSample7; i++)
-        {
-            m_arrRunStrafeSmoothing[i] = 0;
-        }
-
-        m_vWorldDesiredBodyDirection = Vec2(0, 1);
-        m_vWorldDesiredBodyDirectionSmooth = Vec2(0, 1);
-        m_vWorldDesiredBodyDirectionSmoothRate = Vec2(0, 1);
-
-        m_vWorldDesiredBodyDirection2 = Vec2(0, 1);
-
-        m_vWorldDesiredMoveDirection = Vec2(0, 1);
-        m_vWorldDesiredMoveDirectionSmooth = Vec2(0, 1);
-        m_vWorldDesiredMoveDirectionSmoothRate = Vec2(0, 1);
-        m_vLocalDesiredMoveDirection = Vec2(0, 1);
-        m_vLocalDesiredMoveDirectionSmooth = Vec2(0, 1);
-        m_vLocalDesiredMoveDirectionSmoothRate = Vec2(0, 1);
-
-        m_vWorldAimBodyDirection = Vec2(0, 1);
-
-        m_MoveSpeedMSec = 5.0f;
-        m_key_W = 0;
-        m_keyrcr_W = 0;
-        m_key_S = 0;
-        m_keyrcr_S = 0;
-        m_key_A = 0;
-        m_keyrcr_A = 0;
-        m_key_D = 0;
-        m_keyrcr_D = 0;
-        m_key_SPACE = 0;
-        m_keyrcr_SPACE = 0;
-        m_ControllMode = 0;
-
-        m_State = -1;
-        m_Stance = 1; //combat
-
-        m_udGround = 0.0f;
-        m_lrGround = 0.0f;
-        AABB aabb = AABB(Vec3(-40.0f, -40.0f, -0.25f), Vec3(+40.0f, +40.0f, +0.0f));
-        m_GroundOBB = OBB::CreateOBBfromAABB(Matrix33(IDENTITY), aabb);
-        m_GroundOBBPos = Vec3(0, 0, -0.01f);
-    };
-
-    static CRenderViewport* GetPrimaryViewport();
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    CCamera m_Camera;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-protected:
-    struct SScopedCurrentContext;
-
-    void SetViewTM(const Matrix34& tm, bool bMoveOnly);
-
-    virtual float GetCameraMoveSpeed() const;
-    virtual float GetCameraRotateSpeed() const;
-    virtual bool  GetCameraInvertYRotation() const;
-    virtual float GetCameraInvertPan() const;
-
-    // Called to render stuff.
-    virtual void OnRender();
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
-    //! Get currently active camera object.
-    void ToggleCameraObject();
-
-    void RenderConstructionPlane();
-    void RenderSnapMarker();
-    void RenderCursorString();
-    void RenderSnappingGrid();
-    void ProcessMouse();
-    void ProcessKeys();
-
-    void RenderAll();
-    void DrawAxis();
-    void DrawBackground();
-    void InitDisplayContext();
-    void ResetCursor();
-
-    struct SPreviousContext
-    {
-        CCamera rendererCamera;
-        HWND window;
-        int width;
-        int height;
-        bool mainViewport;
-    };
-
-    SPreviousContext m_preWidgetContext;
-
-    // Create an auto-sized render context that is sized based on the Editor's current
-    // viewport.
-    SPreviousContext SetCurrentContext() const;
-
-    SPreviousContext SetCurrentContext(int newWidth, int newHeight) const;
-    void RestorePreviousContext(const SPreviousContext& x) const;
-
-    void PreWidgetRendering() override;
-    void PostWidgetRendering() override;
-
-    // Update the safe frame, safe action, safe title, and borders rectangles based on
-    // viewport size and target aspect ratio.
-    void UpdateSafeFrame();
-
-    // Draw safe frame, safe action, safe title rectangles and borders.
-    void RenderSafeFrame();
-
-    // Draw one of the safe frame rectangles with the desired color.
-    void RenderSafeFrame(const QRect& frame, float r, float g, float b, float a);
-
-    // Draw the selection rectangle.
-    void RenderSelectionRectangle();
-
-    // Draw a selected region if it has been selected
-    void RenderSelectedRegion();
-
-    virtual bool CreateRenderContext();
-    virtual void DestroyRenderContext();
-
-    void OnMenuCommandChangeAspectRatio(unsigned int commandId);
-
-    bool AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const;
-    bool RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal) const;
-
-    bool AddCameraMenuItems(QMenu* menu);
-    void ResizeView(int width, int height);
-
-    void OnCameraFOVVariableChanged(IVariable* var);
-
-    void HideCursor();
-    void ShowCursor();
-
-    bool IsKeyDown(Qt::Key key) const;
-
-    enum class ViewSourceType
-    {
-        None,
-        SequenceCamera,
-        LegacyCamera,
-        CameraComponent,
-        AZ_Entity,
-        ViewSourceTypesCount,
-    };
-    void ResetToViewSourceType(const ViewSourceType& viewSourType);
-
-    //! Assigned renderer.
-    IRenderer*  m_renderer = nullptr;
-    bool m_bRenderContextCreated = false;
-    bool m_bInRotateMode = false;
-    bool m_bInMoveMode = false;
-    bool m_bInOrbitMode = false;
-    bool m_bInZoomMode = false;
-
-    QPoint m_mousePos = QPoint(0, 0);
-    QPoint m_prevMousePos = QPoint(0, 0);  // for tablets, you can't use SetCursorPos and need to remember the prior point and delta with that.
-
-
-    float m_moveSpeed = 1;
-
-    float m_orbitDistance = 10.0f;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Vec3 m_orbitTarget;
-
-    //-------------------------------------------
-    //---   player-control in CharEdit        ---
-    //-------------------------------------------
-    f32 m_MoveSpeedMSec;
-
-    uint32 m_key_W, m_keyrcr_W;
-    uint32 m_key_S, m_keyrcr_S;
-    uint32 m_key_A, m_keyrcr_A;
-    uint32 m_key_D, m_keyrcr_D;
-
-    uint32 m_key_SPACE, m_keyrcr_SPACE;
-    uint32 m_ControllMode;
-
-    int32 m_Stance;
-    int32 m_State;
-    f32 m_AverageFrameTime;
-
-    uint32 m_PlayerControl = 0;
-
-    f32 m_absCameraHigh;
-    Vec3 m_absCameraPos;
-    Vec3 m_absCameraPosVP;
-
-    f32  m_absCurrentSlope;  //in radiants
-
-    Vec2 m_absLookDirectionXY;
-
-    Vec3 m_LookAt;
-    Vec3 m_LookAtRate;
-    Vec3 m_vCamPos;
-    Vec3 m_vCamPosRate;
-    float m_camFOV;
-
-    f32 m_relCameraRotX;
-    f32 m_relCameraRotZ;
-
-    QuatTS m_PhysicalLocation;
-
-    Matrix34 m_AnimatedCharacterMat;
-
-    Matrix34 m_LocalEntityMat;  //this is used for data-driven animations where the character is running on the spot
-    Matrix34 m_PrevLocalEntityMat;
-
-    std::vector<Vec3> m_arrVerticesHF;
-    std::vector<vtx_idx> m_arrIndicesHF;
-
-    std::vector<Vec3> m_arrAnimatedCharacterPath;
-    std::vector<Vec3> m_arrSmoothEntityPath;
-    std::vector<f32> m_arrRunStrafeSmoothing;
-
-    Vec2 m_vWorldDesiredBodyDirection;
-    Vec2 m_vWorldDesiredBodyDirectionSmooth;
-    Vec2 m_vWorldDesiredBodyDirectionSmoothRate;
-
-    Vec2 m_vWorldDesiredBodyDirection2;
-
-
-    Vec2 m_vWorldDesiredMoveDirection;
-    Vec2 m_vWorldDesiredMoveDirectionSmooth;
-    Vec2 m_vWorldDesiredMoveDirectionSmoothRate;
-    Vec2 m_vLocalDesiredMoveDirection;
-    Vec2 m_vLocalDesiredMoveDirectionSmooth;
-    Vec2 m_vLocalDesiredMoveDirectionSmoothRate;
-    Vec2 m_vWorldAimBodyDirection;
-
-    f32 m_udGround;
-    f32 m_lrGround;
-    OBB m_GroundOBB;
-    Vec3 m_GroundOBBPos;
-
-    // Index of camera objects.
-    mutable GUID m_cameraObjectId = GUID_NULL;
-    mutable AZ::EntityId m_viewEntityId;
-    mutable ViewSourceType m_viewSourceType = ViewSourceType::None;
-    AZ::EntityId m_viewEntityIdCachedForEditMode;
-    Matrix34 m_preGameModeViewTM;
-    uint m_disableRenderingCount = 0;
-    bool m_bLockCameraMovement;
-    bool m_bUpdateViewport = false;
-    bool m_bMoveCameraObject = true;
-
-    enum class KeyPressedState
-    {
-        AllUp,
-        PressedThisFrame,
-        PressedInPreviousFrame,
-    };
-    KeyPressedState m_pressedKeyState = KeyPressedState::AllUp;
-
-    Matrix34 m_defaultViewTM;
-    const QString m_defaultViewName;
-
-    DisplayContext m_displayContext;
-
-
-    bool m_isOnPaint = false;
-    static CRenderViewport* m_pPrimaryViewport;
-
-    QRect m_safeFrame;
-    QRect m_safeAction;
-    QRect m_safeTitle;
-
-    CPredefinedAspectRatios m_predefinedAspectRatios;
-
-    IVariable* m_pCameraFOVVariable = nullptr;
-    bool m_bCursorHidden = false;
-
-    void OnMenuResolutionCustom();
-    void OnMenuCreateCameraEntityFromCurrentView();
-    void OnMenuSelectCurrentCamera();
-
-    int OnCreate();
-    void resizeEvent(QResizeEvent* event) override;
-    void paintEvent(QPaintEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-    void OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-    void OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point) override;
-    void OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta, const QPoint& pt) override;
-
-    // From a series of input primitives, compose a complete mouse interaction.
-    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteractionInternal(
-        AzToolsFramework::ViewportInteraction::MouseButtons buttons,
-        AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
-        const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const;
-    // Given a point in the viewport, return the pick ray into the scene.
-    // note: The argument passed to parameter **point**, originating
-    // from a Qt event, must first be passed to WidgetToViewport before being
-    // passed to BuildMousePick.
-    AzToolsFramework::ViewportInteraction::MousePick BuildMousePick(const QPoint& point);
-
-    bool event(QEvent* event) override;
-    void OnDestroy();
-
-    bool CheckRespondToInput() const;
-
-    // AzFramework::InputSystemCursorConstraintRequestBus
-    void* GetSystemCursorConstraintWindow() const override;
-
-    void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) override;
-
-private:
-    void ProcessKeyRelease(QKeyEvent* event);
-    void PushDisableRendering();
-    void PopDisableRendering();
-    bool IsRenderingDisabled() const;
-    AzToolsFramework::ViewportInteraction::MousePick BuildMousePickInternal(
-        const QPoint& point) const;
-
-    void RestoreViewportAfterGameMode();
-
-    double WidgetToViewportFactor() const
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        // Needed for high DPI mode on windows
-        return devicePixelRatioF();
-#else
-        return 1.0f;
-#endif
-    }
-
-    void BeginUndoTransaction() override;
-    void EndUndoTransaction() override;
-
-    void UpdateCurrentMousePos(const QPoint& newPosition);
-
-    AzFramework::EntityVisibilityQuery m_entityVisibilityQuery;
-
-    SPreviousContext m_previousContext;
-    QSet<int> m_keyDown;
-
-    bool m_freezeViewportInput = false;
-
-    size_t m_cameraSetForWidgetRenderingCount = 0; ///< How many calls to PreWidgetRendering happened before
-                                                   ///< subsequent calls to PostWidetRendering.
-    AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager;
-
-    // Used to prevent circular set camera events
-    bool m_ignoreSetViewFromEntityPerspective = false;
-    bool m_windowResizedEvent = false;
-
-    // Cache hwnd value for teardown to avoid infinite loops in retrieving it from destroyed widgets.
-    HWND m_hwnd;
-
-    AZStd::unique_ptr<EditorEntityNotifications> m_editorEntityNotifications;
-
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_RENDERVIEWPORT_H
diff --git a/Code/Sandbox/Editor/RenderViewport_mac.mm b/Code/Sandbox/Editor/RenderViewport_mac.mm
deleted file mode 100644
index 664e7d90a6..0000000000
--- a/Code/Sandbox/Editor/RenderViewport_mac.mm
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <QAbstractNativeEventFilter>
-#include <QApplication>
-
-#include <Carbon/Carbon.h>
-#include <Cocoa/Cocoa.h>
-
-class HiddenMouseNativeEventFilter : public QAbstractNativeEventFilter
-{
-public:
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override
-    {
-        assert(eventType == "mac_generic_NSEvent");
-        NSEvent *event = (NSEvent *)message;
-        switch ([event type])
-        {
-        case NSEventTypeRightMouseDragged:
-            sendFakeMouseMoveEvent([event deltaX], [event deltaY], Qt::RightButton);
-            return true;
-        case NSEventTypeOtherMouseDragged:
-            sendFakeMouseMoveEvent([event deltaX], [event deltaY], Qt::MiddleButton);
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    void sendFakeMouseMoveEvent(int deltaX, int deltaY, Qt::MouseButtons buttons)
-    {
-        assert(m_target);
-        QMetaObject::invokeMethod(m_target, "InjectFakeMouseMove", Q_ARG(int, deltaX), Q_ARG(int, deltaY), Q_ARG(Qt::MouseButtons, buttons));
-    }
-
-    QObject *m_target = nullptr;
-};
-
-Q_GLOBAL_STATIC(HiddenMouseNativeEventFilter, eventFilter)
-
-void StopFixedCursorMode()
-{
-    qApp->removeNativeEventFilter(eventFilter());
-    eventFilter()->m_target = nullptr;
-    CGAssociateMouseAndMouseCursorPosition(true);
-}
-
-void StartFixedCursorMode(QObject* viewport)
-{
-    CGAssociateMouseAndMouseCursorPosition(false);
-    eventFilter()->m_target = viewport;
-    qApp->installNativeEventFilter(eventFilter());
-}
diff --git a/Code/Sandbox/Editor/Report.h b/Code/Sandbox/Editor/Report.h
deleted file mode 100644
index 5ca8b98f60..0000000000
--- a/Code/Sandbox/Editor/Report.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Generic report class, which contains arbitrary report entries.
-
-#ifndef CRYINCLUDE_EDITOR_REPORT_H
-#define CRYINCLUDE_EDITOR_REPORT_H
-#pragma once
-
-
-class IReportField
-{
-public:
-    virtual ~IReportField() {}
-
-    virtual const char* GetDescription() const = 0;
-    virtual const char* GetText() const = 0;
-};
-
-template <typename T, typename G>
-class CReportField
-    : public IReportField
-{
-public:
-    typedef T Object;
-    typedef G TextGetter;
-
-    CReportField(Object& object, const char* description, TextGetter& getter);
-    virtual const char* GetDescription() const;
-    virtual const char* GetText() const;
-
-private:
-    TextGetter m_getter;
-    string m_text;
-    string m_description;
-};
-
-class IReportRecord
-{
-public:
-    virtual ~IReportRecord() {}
-    virtual int GetFieldCount() const = 0;
-    virtual const char* GetFieldDescription(int fieldIndex) const = 0;
-    virtual const char* GetFieldText(int fieldIndex) const = 0;
-};
-
-template <typename T>
-class CReportRecord
-    : public IReportRecord
-{
-public:
-    typedef T Object;
-
-    CReportRecord(Object& object);
-    virtual ~CReportRecord();
-    virtual int GetFieldCount() const;
-    virtual const char* GetFieldDescription(int fieldIndex) const;
-    virtual const char* GetFieldText(int fieldIndex) const;
-    template <typename G>
-    CReportField<Object, G>* AddField(const char* description, G& getter);
-
-private:
-    Object m_object;
-    typedef std::vector<IReportField*> FieldContainer;
-    FieldContainer m_fields;
-};
-
-class CReport
-{
-public:
-    ~CReport();
-    template <typename T>
-    CReportRecord<T>* AddRecord(T& object);
-    int GetRecordCount() const;
-    IReportRecord* GetRecord(int recordIndex);
-    void Clear();
-
-private:
-    typedef std::vector<IReportRecord*> RecordContainer;
-    RecordContainer m_records;
-};
-
-template <typename T, typename G>
-inline CReportField<T, G>::CReportField(Object& object, const char* description, TextGetter& getter)
-    :   m_getter(getter)
-    , m_description(description)
-{
-    m_text = m_getter(object);
-}
-
-template <typename T, typename G>
-inline const char* CReportField<T, G>::GetDescription() const
-{
-    return m_description.c_str();
-}
-
-template <typename T, typename G>
-inline const char* CReportField<T, G>::GetText() const
-{
-    return m_text.c_str();
-}
-
-template <typename T>
-inline CReportRecord<T>::CReportRecord(Object& object)
-    :   m_object(object)
-{
-}
-
-template <typename T>
-inline CReportRecord<T>::~CReportRecord()
-{
-    for (FieldContainer::iterator it = m_fields.begin(); it != m_fields.end(); ++it)
-    {
-        delete (*it);
-    }
-}
-
-template <typename T>
-inline int CReportRecord<T>::GetFieldCount() const
-{
-    return m_fields.size();
-}
-
-template <typename T>
-inline const char* CReportRecord<T>::GetFieldDescription(int fieldIndex) const
-{
-    return m_fields[fieldIndex]->GetDescription();
-}
-
-template <typename T>
-inline const char* CReportRecord<T>::GetFieldText(int fieldIndex) const
-{
-    return m_fields[fieldIndex]->GetText();
-}
-
-template <typename T>
-template <typename G>
-inline CReportField<T, G>* CReportRecord<T>::AddField(const char* description, G& getter)
-{
-    CReportField<Object, G>* field = new CReportField<Object, G>(m_object, description, getter);
-    m_fields.push_back(field);
-    return field;
-}
-
-inline CReport::~CReport()
-{
-    Clear();
-}
-
-template <typename T>
-inline CReportRecord<T>* CReport::AddRecord(T& object)
-{
-    CReportRecord<T>* record = new CReportRecord<T>(object);
-    m_records.push_back(record);
-    return record;
-}
-
-inline int CReport::GetRecordCount() const
-{
-    return m_records.size();
-}
-
-inline IReportRecord* CReport::GetRecord(int recordIndex)
-{
-    return m_records[recordIndex];
-}
-
-inline void CReport::Clear()
-{
-    for (RecordContainer::iterator it = m_records.begin(); it != m_records.end(); ++it)
-    {
-        delete (*it);
-    }
-    m_records.clear();
-}
-
-#endif // CRYINCLUDE_EDITOR_REPORT_H
diff --git a/Code/Sandbox/Editor/ResizeResolutionDialog.cpp b/Code/Sandbox/Editor/ResizeResolutionDialog.cpp
deleted file mode 100644
index db580e9214..0000000000
--- a/Code/Sandbox/Editor/ResizeResolutionDialog.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ResizeResolutionDialog.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_ResizeResolutionDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-class ResizeResolutionModel
-    : public QAbstractListModel
-{
-public:
-    ResizeResolutionModel(QObject* parent = nullptr);
-
-    int rowCount(const QModelIndex& parent = {}) const override;
-    int columnCount(const QModelIndex& parent = {}) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-
-    int SizeRow(uint32 dwSize) const;
-
-private:
-    static const int kNumSizes = 6;
-};
-
-ResizeResolutionModel::ResizeResolutionModel(QObject* parent)
-    : QAbstractListModel(parent)
-{
-}
-
-int ResizeResolutionModel::rowCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : kNumSizes;
-}
-
-int ResizeResolutionModel::columnCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : 1;
-}
-
-QVariant ResizeResolutionModel::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid() || index.column() > 0 || index.row() >= kNumSizes)
-    {
-        return {};
-    }
-
-    const int size = 64 * (1 << index.row());
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-        return QStringLiteral("%1x%2").arg(size).arg(size);
-
-    case Qt::UserRole:
-        return size;
-    }
-
-    return {};
-}
-
-int ResizeResolutionModel::SizeRow(uint32 dwSize) const
-{
-    // not a power of 2?
-    if (dwSize & (dwSize - 1))
-    {
-        return 0;
-    }
-
-    int row = 0;
-
-    for (auto i = dwSize / 64; i > 1; i >>= 1)
-    {
-        ++row;
-    }
-
-    return row;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CResizeResolutionDialog dialog
-
-
-CResizeResolutionDialog::CResizeResolutionDialog(QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_model(new ResizeResolutionModel(this))
-    , ui(new Ui::CResizeResolutionDialog)
-{
-    ui->setupUi(this);
-
-    ui->m_resolution->setModel(m_model);
-
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-CResizeResolutionDialog::~CResizeResolutionDialog()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CResizeResolutionDialog::SetSize(uint32 dwSize)
-{
-    ui->m_resolution->setCurrentIndex(m_model->SizeRow(dwSize));
-}
-
-/////////////////////////////////////////////////////////////////////////////
-uint32 CResizeResolutionDialog::GetSize()
-{
-    return ui->m_resolution->itemData(ui->m_resolution->currentIndex()).toInt();
-}
diff --git a/Code/Sandbox/Editor/ResizeResolutionDialog.h b/Code/Sandbox/Editor/ResizeResolutionDialog.h
deleted file mode 100644
index c0593c0d24..0000000000
--- a/Code/Sandbox/Editor/ResizeResolutionDialog.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_RESIZERESOLUTIONDIALOG_H
-#define CRYINCLUDE_EDITOR_RESIZERESOLUTIONDIALOG_H
-
-#pragma once
-// ResizeResolutionDialog.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui {
-    class CResizeResolutionDialog;
-}
-
-class ResizeResolutionModel;
-
-/////////////////////////////////////////////////////////////////////////////
-// CResizeResolutionDialog dialog
-
-class CResizeResolutionDialog
-    : public QDialog
-{
-    // Construction
-public:
-    CResizeResolutionDialog(QWidget* pParent = nullptr);   // standard constructor
-    ~CResizeResolutionDialog();
-
-    void SetSize(uint32 dwSize);
-    uint32 GetSize();
-
-private:
-    ResizeResolutionModel* m_model;
-    QScopedPointer<Ui::CResizeResolutionDialog> ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_RESIZERESOLUTIONDIALOG_H
diff --git a/Code/Sandbox/Editor/Resource.h b/Code/Sandbox/Editor/Resource.h
deleted file mode 100644
index 80df93d109..0000000000
--- a/Code/Sandbox/Editor/Resource.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#define ID_FILE_NEW       0xE100
-#define ID_FILE_SAVE_AS   0xE104
-#define ID_FILE_MRU_FIRST 0xE110
-#define ID_FILE_MRU_FILE1 0xE110
-#define ID_FILE_MRU_LAST  0xE11F
-#define ID_EDIT_COPY      0xE122
-#define ID_EDIT_CUT       0xE123
-#define ID_EDIT_PASTE     0xE125
-#define ID_APP_ABOUT      0xE140
-#define ID_APP_EXIT       0xE141
-#define ID_APP_SHOW_WELCOME    0xE142
-#define IDD_TRACKVIEWDIALOG                        19
-#define IDD_DATABASE                               140
-#define IDR_DB_LIBRARY_ITEM_BAR                    141
-#define IDR_DB_MATERIAL_BAR                        142
-#define IDR_DB_ENTITY                              147
-#define IDD_DB_ENTITY                              149
-#define IDI_BALL_ONLINE                            315
-#define IDI_BALL_OFFLINE                           316
-#define IDI_BALL_PENDING                           395
-#define IDI_BALL_DISABLED                          396
-#define IDR_DB_PARTICLES_BAR                       410
-#define IDR_DB_LIBRARY_BAR                         455
-#define IDR_DB_STANDART                            456
-#define IDC_ZOOM_INTERNAL                          1052
-#define IDC_BRUSH_INTERNAL                         1053
-#define IDC_ARRBLCK                                1054
-#define IDC_ARRBLCKCROSS                           1055
-#define IDC_ARRWHITE                               1056
-#define IDC_COLOR_PICKER                           1057
-#define IDC_HIT_CURSOR                             1058
-#define IDC_ARROW_ADDKEY                           1059
-#define IDC_LEFTRIGHT                              1060
-#define IDC_POINTER_OBJHIT                         1061
-#define IDC_POINTER_LINK                           1062
-#define IDC_POINTER_LINKNOW                        1063
-#define IDC_POINTER_PLUS                           1064
-#define IDC_POINTER_OBJECT_ROTATE                  1065
-#define IDC_POINTER_OBJECT_SCALE                   1066
-#define IDC_POINTER_OBJECT_MOVE                    1067
-#define IDC_POINTER_MINUS                          1068
-#define IDC_POINTER_GET_HEIGHT                     1069
-#define IDC_POINTER_FLATTEN                        1070
-#define IDC_POINTER_SMOOTH                         1071
-#define IDC_POINTER_DRAG_ITEM                      1077
-#define IDC_CURSOR_HAND_DRAG                       1078
-#define IDC_CURSOR_HAND_FINGER                     1079
-#define IDC_ARROW_UP                               1080
-#define IDC_ARROW_DOWN                             1081
-#define IDC_ARROW_DOWNRIGHT                        1082
-#define IDC_ARROW_UPRIGHT                          1083
-#define IDC_NEW                                    1578
-#define IDC_POINTER_SO_SELECT                      1891
-#define IDC_HAND_INTERNAL                          1998
-#define IDC_POINTER_SO_SELECT_PLUS                 1999
-#define IDC_POINTER_SO_SELECT_MINUS                2000
-#define IDC_SELECTION                              2634
-#define IDC_SELECTION_MASK                         2637
-#define IDC_PLATFORM_PROVO                         2758
-#define IDC_PLATFORM_SALEM                         2759
-#define IDC_GROUPBOX_GLOBALTAGS                    2916
-#define IDC_GROUPBOX_FRAGMENTTAGS                  2917
-#define ID_RESOURCES_REDUCEWORKINGSET              32896
-#define ID_EDIT_HIDE                               32898
-#define ID_EDIT_UNHIDEALL                          32899
-#define ID_RELOAD_TERRAIN                          32902
-#define ID_VIEW_CONFIGURELAYOUT                    32906
-#define ID_TOOLS_LOGMEMORYUSAGE                    32908
-#define ID_TERRAIN_EXPORTBLOCK                     32909
-#define ID_TERRAIN_IMPORTBLOCK                     32910
-#define ID_TOOLS_CONFIGURETOOLS                    32911
-#define ID_TOOLS_TOOL1                             32913
-#define ID_TOOLS_CUSTOMIZEKEYBOARD                 32914
-#define ID_EXPORT_INDOORS                          32915
-#define ID_VIEW_CYCLE2DVIEWPORT                    32916
-#define ID_SNAPANGLE                               32917
-#define ID_PHYSICS_GETPHYSICSSTATE                 32937
-#define ID_PHYSICS_RESETPHYSICSSTATE               32938
-#define ID_GAME_SYNCPLAYER                         32941
-#define ID_FILE_SAVELEVELRESOURCES                 32942
-#define ID_VALIDATELEVEL                           32943
-#define ID_TERRAIN_RESIZE                          32944
-#define ID_TERRAIN_COLLISION                       32960
-#define ID_TOOL_FIRST                              32972
-#define ID_EDIT_UNFREEZE                           32973
-#define ID_EDIT_UNHIDE                             32974
-#define ID_TOOL_LAST                               33173
-#define ID_TOOL_SHELVE_FIRST                       33174
-#define ID_TOOL_SHELVE_LAST                        33375
-#define ID_EDIT_SELECTALL                          33376
-#define ID_WIREFRAME                               33410
-#define ID_FILE_GENERATETERRAINTEXTURE             33445
-#define ID_GENERATORS_TEXTURE                      33448
-#define ID_FILE_IMPORT                             33457
-#define ID_EDIT_HOLD                               33464
-#define ID_EDIT_FETCH                              33465
-#define ID_FILE_EXPORTTOGAMENOSURFACETEXTURE       33473
-#define ID_VIEW_SWITCHTOGAME                       33477
-#define ID_VIEW_SWITCHTOGAME_FULLSCREEN            33478
-#define ID_EDIT_DELETE                             33480
-#define ID_MOVE_OBJECT                             33481
-#define ID_RENAME_OBJ                              33483
-#define ID_FETCH                                   33496
-#define ID_EDITMODE_ROTATE                         33506
-#define ID_EDITMODE_SCALE                          33507
-#define ID_EDITMODE_MOVE                           33508
-#define ID_SELECTION_DELETE                        33512
-#define ID_EDIT_ESCAPE                             33513
-#define ID_UNDO                                    33524
-#define ID_EDIT_CLONE                              33525
-#define ID_GOTO_SELECTED                           33535
-#define ID_EDIT_LEVELDATA                          33542
-#define ID_FILE_EDITEDITORINI                      33543
-#define ID_FILE_EDITLOGFILE                        33544
-#define ID_PREFERENCES                             33546
-#define ID_REDO                                    33550
-#define ID_SWITCH_PHYSICS                          33555
-#define ID_REF_COORDS_SYS                          33556
-#define ID_TV_ADDKEY                               33557
-#define ID_TV_DELKEY                               33558
-#define ID_TV_MOVEKEY                              33559
-#define ID_TV_SLIDEKEY                             33560
-#define ID_TV_SCALEKEY                             33561
-#define ID_TV_ADD_SEQUENCE                         33563
-#define ID_TV_DEL_SEQUENCE                         33564
-#define ID_TV_EDIT_SEQUENCE                        33565
-#define ID_TV_RECORD                               33566
-#define ID_TV_PLAY                                 33567
-#define ID_TV_STOP                                 33568
-#define ID_TV_PAUSE                                33569
-#define ID_ADDNODE                                 33570
-#define ID_ADDSCENETRACK                           33573
-#define ID_FIND                                    33574
-#define ID_SNAP_TO_GRID                            33575
-#define ID_TAG_LOC1                                33576
-#define ID_TAG_LOC2                                33577
-#define ID_TAG_LOC3                                33578
-#define ID_TAG_LOC4                                33579
-#define ID_TAG_LOC5                                33580
-#define ID_TAG_LOC6                                33581
-#define ID_TAG_LOC7                                33582
-#define ID_TAG_LOC8                                33583
-#define ID_TAG_LOC9                                33584
-#define ID_TAG_LOC10                               33585
-#define ID_TAG_LOC11                               33586
-#define ID_TAG_LOC12                               33587
-#define ID_GOTO_LOC1                               33588
-#define ID_GOTO_LOC2                               33589
-#define ID_GOTO_LOC3                               33590
-#define ID_GOTO_LOC4                               33591
-#define ID_GOTO_LOC5                               33592
-#define ID_GOTO_LOC6                               33593
-#define ID_GOTO_LOC7                               33594
-#define ID_GOTO_LOC8                               33595
-#define ID_GOTO_LOC9                               33596
-#define ID_GOTO_LOC10                              33597
-#define ID_GOTO_LOC11                              33598
-#define ID_GOTO_LOC12                              33599
-#define ID_TV_JUMPEND                              33600
-#define ID_TV_JUMPSTART                            33601
-#define ID_TV_PREVKEY                              33602
-#define ID_TV_NEXTKEY                              33603
-#define ID_PLAY_LOOP                               33607
-#define ID_TERRAIN                                 33611
-#define ID_PANEL_VEG_EXPORT                        33672
-#define ID_PANEL_VEG_IMPORT                        33673
-#define ID_PANEL_VEG_DISTRIBUTE                    33674
-#define ID_PANEL_VEG_SCALE                         33675
-#define ID_PANEL_VEG_ADD                           33676
-#define ID_PANEL_VEG_REMOVE                        33677
-#define ID_PANEL_VEG_CLEAR                         33678
-#define ID_PANEL_VEG_CLONE                         33679
-#define ID_PANEL_VEG_REPLACE                       33681
-#define ID_PANEL_VEG_ADDCATEGORY                   33682
-#define ID_PANEL_VEG_RENAMECATEGORY                33683
-#define ID_PANEL_VEG_REMOVECATEGORY                33684
-#define ID_TOOLS_PREFERENCES                       33691
-#define ID_EDIT_INVERTSELECTION                    33692
-#define ID_TOOLTERRAINMODIFY_SMOOTH                33695
-#define ID_TERRAINMODIFY_SMOOTH                    33696
-#define ID_TERRAIN_PAINTLAYERS                     33698
-#define ID_SWITCHCAMERA_DEFAULTCAMERA              33700
-#define ID_SWITCHCAMERA_SEQUENCECAMERA             33701
-#define ID_SWITCHCAMERA_SELECTEDCAMERA             33702
-#define ID_TV_RECORD_AUTO                          33703
-#define ID_GRAPHICS_SETTINGS                       33705
-#define ID_VIEW_OPENVIEWPANE                       33709
-#define ID_VIEW_OPENPANE_FIRST          33712
-#define ID_VIEW_OPENPANE_LAST           33811
-#define ID_OPEN_EMOTIONFX_EDITOR                   39742
-#define ID_BRUSH_CSGSUBSTRUCT                      33837
-#define ID_MATERIAL_PICKTOOL                       33842
-#define ID_MODIFY_AIPOINT_PICKIMPASSLINK           33865
-#define ID_DISPLAY_SHOWHELPERS                     33871
-#define ID_FILE_EXPORTSELECTION                    33875
-#define ID_EDIT_PASTE_WITH_LINKS                   33893
-#define ID_FILE_EXPORT_TERRAINAREA                 33904
-#define ID_FILE_EXPORT_TERRAINAREAWITHOBJECTS      33910
-#define ID_FILE_EXPORT_SELECTEDOBJECTS             33911
-#define ID_TERRAIN_TIMEOFDAY                       33912
-#define ID_SPLINE_PREVIOUS_KEY                     33916
-#define ID_SPLINE_NEXT_KEY                         33917
-#define ID_SPLINE_FLATTEN_ALL                      33918
-#define ID_TANGENT_UNIFY                           33920
-#define ID_TANGENT_IN_ZERO                         33921
-#define ID_TANGENT_IN_STEP                         33923
-#define ID_TANGENT_OUT_ZERO                        33924
-#define ID_TANGENT_OUT_STEP                        33926
-#define ID_TANGENT_AUTO                            33927
-#define ID_TANGENT_IN_LINEAR                       33928
-#define ID_TANGENT_OUT_LINEAR                      33929
-#define ID_FREEZE_KEYS                             33930
-#define ID_SPLINE_FIT_X                            33931
-#define ID_SPLINE_FIT_Y                            33932
-#define ID_SPLINE_SNAP_GRID_X                      33933
-#define ID_SPLINE_SNAP_GRID_Y                      33934
-#define ID_FREEZE_TANGENTS                         33935
-#define ID_GAME_PC_ENABLELOWSPEC                   33960
-#define ID_GAME_PC_ENABLEMEDIUMSPEC                33961
-#define ID_GAME_PC_ENABLEHIGHSPEC                  33962
-#define ID_GAME_PC_ENABLEVERYHIGHSPEC              33963
-#define ID_PANEL_VEG_CREATE_SEL                    33990
-#define ID_TOOLS_UPDATEPROCEDURALVEGETATION        33999
-#define ID_DISPLAY_GOTOPOSITION                    34004
-#define ID_PHYSICS_SIMULATEOBJECTS                 34007
-#define ID_TERRAIN_TEXTURE_EXPORT                  34008
-#define ID_TV_SEQUENCE_NEW                         34049
-#define ID_TV_MODE_DOPESHEET                       34052
-#define ID_VIEW_LAYOUTS                            34053
-#define ID_TV_MODE_CURVEEDITOR                     34054
-#define ID_OPEN_TRACKVIEW                          34063
-#define ID_SWITCHCAMERA_NEXT                       34065
-#define ID_TV_SNAP_NONE                            34068
-#define ID_TV_SNAP_MAGNET                          34069
-#define ID_TV_SNAP_FRAME                           34070
-#define ID_TV_SNAP_TICK                            34071
-#define ID_TV_SNAP_FPS                             34072
-#define ID_VIEW_TICKINSECONDS                      34075
-#define ID_VIEW_TICKINFRAMES                       34076
-#define ID_OPEN_ASSET_BROWSER                      34077
-#define ID_SNAP_TO_GRID_RANGE_BEGIN     34087
-#define ID_SNAP_TO_GRID_RANGE_END       34106
-#define ID_TOOLS_EXPORT_SHORTCUTS       34138
-#define ID_TOOLS_IMPORT_SHORTCUTS       34139
-#define ID_TOOLS_VALIDATEOBJECTPOSITIONS 34143
-#define ID_TOOLS_BATCH_RENDER           34151
-#define ID_TOOLS_SCRIPTHELP             34152
-#define ID_TV_MODE_OPENCURVEEDITOR      34153
-#define ID_TOOLS_LUA_EDITOR             34154
-#define ID_OPEN_QUICK_ACCESS_BAR                   34177
-#define ID_TRACKVIEW_TOGGLE_DISABLE                34178
-#define ID_TRACKVIEW_TOGGLE_MUTE                   34179
-#define ID_TRACKVIEW_MUTE_ALL                      34180
-#define ID_TRACKVIEW_UNMUTE_ALL                    34181
-#define ID_TV_TOOLS_CUSTOMIZETRACKCOLORS           34182
-#define ID_TOOLS_ENABLEFILECHANGEMONITORING        34185
-#define ID_FILE_OPEN_LEVEL                         34196
-#define ID_FILE_SAVE_LEVEL                         34197
-#define ID_TV_SYNC_TO_BASE                         34199
-#define ID_TV_SYNC_FROM_BASE                       34200
-#ifdef ENABLE_SLICE_EDITOR
-#define ID_FILE_NEW_SLICE                          34201
-#define ID_FILE_OPEN_SLICE                         34202
-#endif
-#define ID_FILE_SAVE_SELECTED_SLICE                34203
-#define ID_FILE_SAVESETTINGS                       34204
-#define ID_FILE_SAVE_SLICE_TO_ROOT                 34205
-#define ID_SET_TIME_TO_KEY                         34206
-#define ID_TOGGLE_SCRUB_UNITS                      34207
-#define ID_TOGGLE_PREVIEW_UNITS                    34208
-#define ID_FILE_EXPORTOCCLUSIONMESH                34209
-#define ID_MANN_RELOAD_ANIMS                       34210
-#define ID_FILE_ANIMDBEDITOR                       34211
-#define ID_SNAP_TO_ANGLE_RANGE_BEGIN    34323
-#define ID_SNAP_TO_ANGLE_RANGE_END      34330
-#define ID_MODIFY_GOTO_SELECTION        34358
-#define ID_VIEW_LAYOUT_FIRST            34363
-#define ID_VIEW_LAYOUT_LAST             34377
-#define ID_VIEW_SAVELAYOUT                         34438
-#define ID_VIEW_LAYOUT_LOAD_DEFAULT                34439
-#define ID_GAME_OSXGL_ENABLESPEC                   34449
-#define ID_GAME_OSXMETAL_ENABLESPEC                34450
-#define ID_CLEAR_REGISTRY                          34470
-#define ID_SOUND_STOPALLSOUNDS                     34476
-#define ID_AUDIO_REFRESH_AUDIO_SYSTEM              34477
-#define ID_GAME_ANDROID_ENABLELOWSPEC              34490
-#define ID_GAME_ANDROID_ENABLEMEDIUMSPEC           34491
-#define ID_GAME_ANDROID_ENABLEHIGHSPEC             34492
-#define ID_GAME_ANDROID_ENABLEVERYHIGHSPEC         34493
-#define ID_GAME_IOS_ENABLELOWSPEC                  34494
-#define ID_GAME_IOS_ENABLEMEDIUMSPEC               34495
-#define ID_GAME_IOS_ENABLEHIGHSPEC                 34496
-#define ID_GAME_IOS_ENABLEVERYHIGHSPEC             34497
-#define ID_OPEN_AUDIO_CONTROLS_BROWSER              34580
-#define ID_CREATE_GLOBAL_FG_MODULE_FROM_SELECTION                   35076
-#define ID_CREATE_LEVEL_FG_MODULE_FROM_SELECTION                    35077
-#define ID_GRAPHVIEW_ADD_BLACK_BOX                                  35078
-#define ID_GRAPHVIEW_UNGROUP                                        35079
-#define ID_FILE_PROJECT_MANAGER_NEW                                 35080
-#define ID_FILE_PROJECT_MANAGER_OPEN                                35081
-#define ID_FILE_PROJECT_MANAGER_SETTINGS                            35082
-#define ID_TV_TRACKS_TOOLBAR_BASE                                   35083               // range between ID_TV_TRACKS_TOOLBAR_BASE to ID_TV_TRACKS_TOOLBAR_LAST reserved
-#define ID_TV_TRACKS_TOOLBAR_LAST                                   35183               // for up to 100 "Add Tracks..." dynamically added Track View Track buttons
-#define ID_OPEN_TERRAIN_EDITOR          36007
-#define ID_OPEN_UICANVASEDITOR          36010
-#define ID_TERRAIN_TIMEOFDAYBUTTON      36011
-#define ID_OPEN_TERRAINTEXTURE_EDITOR   36012
-#define ID_SKINS_REFRESH                36014
-#define ID_FILE_GENERATETERRAIN         36016
-#define ID_DOCUMENTATION_GETTINGSTARTEDGUIDE    36023
-#define ID_DOCUMENTATION_TUTORIALS              36024
-#define ID_DOCUMENTATION_GLOSSARY               36025
-#define ID_DOCUMENTATION_O3DE                   36026
-#define ID_DOCUMENTATION_GAMELIFT               36027
-#define ID_DOCUMENTATION_RELEASENOTES           36028
-#define ID_DOCUMENTATION_GAMEDEVBLOG            36029
-#define ID_DOCUMENTATION_TWITCHCHANNEL          36030
-#define ID_DOCUMENTATION_FORUMS                 36031
-#define ID_DOCUMENTATION_AWSSUPPORT             36032
-#define ID_DOCUMENTATION_FEEDBACK                    36043
-#define ID_OPEN_SUBSTANCE_EDITOR                     36060
-#define ID_IMPORT_ASSET                              36069
-#define ID_EDIT_PIVOT                                36203
-#define ID_EDIT_RESET                                36204
-#define ID_EDIT_RESET_LOCAL                          36205
-#define ID_EDIT_RESET_WORLD                          36206
-#define ID_EDIT_RESET_MANIPULATOR                    36207
-#define ID_GAME_PROVO_ENABLELOWSPEC                   34603
-#define ID_GAME_PROVO_ENABLEMEDIUMSPEC                34604
-#define ID_GAME_PROVO_ENABLEHIGHSPEC                  34605
-#define ID_GAME_OSXMETAL_ENABLELOWSPEC              34606
-#define ID_GAME_OSXMETAL_ENABLEMEDIUMSPEC           34607
-#define ID_GAME_OSXMETAL_ENABLEHIGHSPEC             34608
-#define ID_GAME_OSXMETAL_ENABLEVERYHIGHSPEC         34609
-#define ID_GAME_SALEM_ENABLELOWSPEC                 34610
-#define ID_GAME_SALEM_ENABLEMEDIUMSPEC              34611
-#define ID_GAME_SALEM_ENABLEHIGHSPEC                34612
-#define ID_GAME_JASPER_ENABLELOWSPEC                34613
-#define ID_GAME_JASPER_ENABLEMEDIUMSPEC             34614
-#define ID_GAME_JASPER_ENABLEHIGHSPEC               34615
-#define ID_FILE_RESAVESLICES                        36210
-#define FIRST_QT_ACTION                      50000
-#define ID_VIEW_CONSOLEWINDOW                50001
-#define ID_TOOLBAR_SEPARATOR                 50002
-#define ID_TOOLBAR_WIDGET_FIRST              50003
-#define ID_TOOLBAR_WIDGET_UNDO               50003
-#define ID_TOOLBAR_WIDGET_REDO               50004
-#define ID_TOOLBAR_WIDGET_SNAP_ANGLE         50007
-#define ID_TOOLBAR_WIDGET_SNAP_GRID          50008
-#define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE   50011
-#define ID_TOOLBAR_WIDGET_DEBUG_MODE         50012
-#define ID_TOOLBAR_WIDGET_SPACER_RIGHT       50013
-#define ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL  50014
-#define ID_TOOLBAR_WIDGET_LAST               50020
-#define ID_VIEWPORTUI_VISIBLE                50040
diff --git a/Code/Sandbox/Editor/ResourceSelectorHost.cpp b/Code/Sandbox/Editor/ResourceSelectorHost.cpp
deleted file mode 100644
index 8196d60d31..0000000000
--- a/Code/Sandbox/Editor/ResourceSelectorHost.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ResourceSelectorHost.h"
-
-// Qt
-#include <QMessageBox>
-#include <QString>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/AssetBrowser/Search/Filter.h>
-#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
-
-
-class CResourceSelectorHost
-    : public IResourceSelectorHost
-{
-public:
-    CResourceSelectorHost()
-    {
-        RegisterModuleResourceSelectors(this);
-    }
-
-    QString SelectResource(const SResourceSelectorContext& context, const QString& previousValue) override
-    {
-        if (!context.typeName)
-        {
-            assert(false && "SResourceSelectorContext::typeName is not specified");
-            return QString();
-        }
-
-        TTypeMap::iterator it = m_typeMap.find(context.typeName);
-        if (it == m_typeMap.end())
-        {
-            QMessageBox::critical(QApplication::activeWindow(), QString(), QObject::tr("No Resource Selector is registered for resource type \"%1\"").arg(context.typeName));
-            return previousValue;
-        }
-
-        QString result = previousValue;
-        if (it->second->function)
-        {
-            result = it->second->function(context, previousValue);
-        }
-        else if (it->second->functionWithContext)
-        {
-            result = it->second->functionWithContext(context, previousValue, context.contextObject);
-        }
-
-        return result;
-    }
-
-    const char* ResourceIconPath(const char* typeName) const override
-    {
-        TTypeMap::const_iterator it = m_typeMap.find(typeName);
-        if (it != m_typeMap.end())
-        {
-            return it->second->iconPath;
-        }
-        return "";
-    }
-
-    void RegisterResourceSelector(const SStaticResourceSelectorEntry* entry) override
-    {
-        m_typeMap[entry->typeName] = entry;
-    }
-
-    void SetGlobalSelection(const char* resourceType, const char* value) override
-    {
-        if (!resourceType)
-        {
-            return;
-        }
-        if (!value)
-        {
-            return;
-        }
-        m_globallySelectedResources[resourceType] = value;
-    }
-
-    const char* GetGlobalSelection(const char* resourceType) const override
-    {
-        if (!resourceType)
-        {
-            return "";
-        }
-        auto it = m_globallySelectedResources.find(resourceType);
-        if (it != m_globallySelectedResources.end())
-        {
-            return it->second.c_str();
-        }
-        return "";
-    }
-
-private:
-    typedef std::map<string, const SStaticResourceSelectorEntry*, stl::less_stricmp<string> > TTypeMap;
-    TTypeMap m_typeMap;
-
-    std::map<string, string> m_globallySelectedResources;
-};
-
-// ---------------------------------------------------------------------------
-
-IResourceSelectorHost* CreateResourceSelectorHost()
-{
-    return new CResourceSelectorHost();
-}
-
-// ---------------------------------------------------------------------------
-
-QString SoundFileSelector([[maybe_unused]] const SResourceSelectorContext& x, const QString& previousValue)
-{
-    AssetSelectionModel selection = AssetSelectionModel::AssetTypeSelection("Audio");
-    AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
-    if (selection.IsValid())
-    {
-        return Path::FullPathToGamePath(QString(selection.GetResult()->GetFullPath().c_str()));
-    }
-    else
-    {
-        return Path::FullPathToGamePath(previousValue);
-    }
-}
-REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "")
-
-// ---------------------------------------------------------------------------
-QString ModelFileSelector([[maybe_unused]] const SResourceSelectorContext& x, const QString& previousValue)
-{
-    AssetSelectionModel selection = AssetSelectionModel::AssetGroupSelection("Geometry");
-    AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
-    if (selection.IsValid())
-    {
-        return Path::FullPathToGamePath(QString(selection.GetResult()->GetFullPath().c_str()));
-    }
-    else
-    {
-        return Path::FullPathToGamePath(previousValue);
-    }
-}
-REGISTER_RESOURCE_SELECTOR("Model", ModelFileSelector, "")
-
-// ---------------------------------------------------------------------------
-QString GeomCacheFileSelector([[maybe_unused]] const SResourceSelectorContext& x, const QString& previousValue)
-{
-    AssetSelectionModel selection = AssetSelectionModel::AssetTypeSelection("Geom Cache");
-    AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
-    if (selection.IsValid())
-    {
-        return Path::FullPathToGamePath(QString(selection.GetResult()->GetFullPath().c_str()));
-    }
-    else
-    {
-        return Path::FullPathToGamePath(previousValue);
-    }
-}
-
-REGISTER_RESOURCE_SELECTOR("GeomCache", GeomCacheFileSelector, "")
-
-
diff --git a/Code/Sandbox/Editor/ResourceSelectorHost.h b/Code/Sandbox/Editor/ResourceSelectorHost.h
deleted file mode 100644
index a150c6cf05..0000000000
--- a/Code/Sandbox/Editor/ResourceSelectorHost.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_RESOURCESELECTORHOST_H
-#define CRYINCLUDE_EDITOR_RESOURCESELECTORHOST_H
-#pragma once
-
-#include "IResourceSelectorHost.h"
-
-IResourceSelectorHost* CreateResourceSelectorHost();
-
-#endif // CRYINCLUDE_EDITOR_RESOURCESELECTORHOST_H
diff --git a/Code/Sandbox/Editor/SelectEAXPresetDlg.cpp b/Code/Sandbox/Editor/SelectEAXPresetDlg.cpp
deleted file mode 100644
index 6f61032b2d..0000000000
--- a/Code/Sandbox/Editor/SelectEAXPresetDlg.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SelectEAXPresetDlg.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_SelectEAXPresetDlg.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-CSelectEAXPresetDlg::CSelectEAXPresetDlg(QWidget* pParent)
-    : QDialog(pParent)
-    , m_ui(new Ui_CSelectEAXPresetDlg)
-{
-    m_ui->setupUi(this);
-}
-
-CSelectEAXPresetDlg::~CSelectEAXPresetDlg()
-{
-}
-
-void CSelectEAXPresetDlg::SetCurrPreset(const QString& sPreset)
-{
-    QAbstractListModel* model = Model();
-    if (!model)
-    {
-        return;
-    }
-
-    QModelIndexList indexes = model->match(QModelIndex(), Qt::DisplayRole, sPreset, 1, Qt::MatchExactly);
-
-    if (!indexes.isEmpty())
-    {
-        m_ui->listView->setCurrentIndex(indexes.at(0));
-    }
-}
-
-QString CSelectEAXPresetDlg::GetCurrPreset() const
-{
-    if (m_ui->listView->currentIndex().isValid())
-    {
-        return m_ui->listView->currentIndex().data().toString();
-    }
-    // EXCEPTION: OCX Property Pages should return FALSE
-    return QString();
-}
-
-
-void CSelectEAXPresetDlg::SetModel(QAbstractListModel* model)
-{
-    m_ui->listView->setModel(model);
-}
-
-QAbstractListModel* CSelectEAXPresetDlg::Model() const
-{
-    return static_cast<QAbstractListModel*>(m_ui->listView->model());
-}
-
-#include "moc_SelectEAXPresetDlg.cpp"
diff --git a/Code/Sandbox/Editor/SelectEAXPresetDlg.h b/Code/Sandbox/Editor/SelectEAXPresetDlg.h
deleted file mode 100644
index a524726302..0000000000
--- a/Code/Sandbox/Editor/SelectEAXPresetDlg.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-// CSelectEAXPresetDlg dialog
-#ifndef CRYINCLUDE_EDITOR_SELECTEAXPRESETDLG_H
-#define CRYINCLUDE_EDITOR_SELECTEAXPRESETDLG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-class QAbstractListModel;
-class Ui_CSelectEAXPresetDlg;
-
-class CSelectEAXPresetDlg
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CSelectEAXPresetDlg(QWidget* pParent = nullptr);   // standard constructor
-    ~CSelectEAXPresetDlg();
-
-    void SetCurrPreset(const QString& sPreset);
-    QString GetCurrPreset() const;
-
-protected:
-    void SetModel(QAbstractListModel* model);
-    QAbstractListModel* Model() const;
-
-private:
-    Ui_CSelectEAXPresetDlg* m_ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_SELECTEAXPRESETDLG_H
diff --git a/Code/Sandbox/Editor/SelectLightAnimationDialog.cpp b/Code/Sandbox/Editor/SelectLightAnimationDialog.cpp
deleted file mode 100644
index 8ba66693bb..0000000000
--- a/Code/Sandbox/Editor/SelectLightAnimationDialog.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Used in a property item to select a light animation
-
-
-#include "EditorDefs.h"
-
-#include "SelectLightAnimationDialog.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>   // for AnimNodeType
-
-//////////////////////////////////////////////////////////////////////////
-CSelectLightAnimationDialog::CSelectLightAnimationDialog(QWidget* pParent)
-    :    CGenericSelectItemDialog(pParent)
-{
-    setWindowTitle(tr("Select Light Animation"));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectLightAnimationDialog::OnInitDialog()
-{
-    SetMode(eMODE_LIST);
-    CGenericSelectItemDialog::OnInitDialog();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSelectLightAnimationDialog::GetItems(std::vector<SItem>& outItems)
-{
-    IMovieSystem* pMovieSystem = GetIEditor()->GetMovieSystem();
-    for (int i = 0; i < pMovieSystem->GetNumSequences(); ++i)
-    {
-        IAnimSequence* pSequence = pMovieSystem->GetSequence(i);
-        if ((pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet) == 0)
-        {
-            continue;
-        }
-
-        for (int k = 0; k < pSequence->GetNodeCount(); ++k)
-        {
-            assert(pSequence->GetNode(k)->GetType() == AnimNodeType::Light);
-            if (pSequence->GetNode(k)->GetType() != AnimNodeType::Light)
-            {
-                continue;
-            }
-            SItem item;
-            item.name = pSequence->GetNode(k)->GetName();
-            outItems.push_back(item);
-        }
-        return;
-    }
-}
-
-#include <moc_SelectLightAnimationDialog.cpp>
diff --git a/Code/Sandbox/Editor/SelectLightAnimationDialog.h b/Code/Sandbox/Editor/SelectLightAnimationDialog.h
deleted file mode 100644
index 8184856cf6..0000000000
--- a/Code/Sandbox/Editor/SelectLightAnimationDialog.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Used in a property item to select a light animation
-
-
-#ifndef CRYINCLUDE_EDITOR_SELECTLIGHTANIMATIONDIALOG_H
-#define CRYINCLUDE_EDITOR_SELECTLIGHTANIMATIONDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "GenericSelectItemDialog.h"
-#endif
-
-class CSelectLightAnimationDialog
-    : public CGenericSelectItemDialog
-{
-    Q_OBJECT
-
-public:
-    CSelectLightAnimationDialog(QWidget* pParent = nullptr);
-
-protected:
-    void OnInitDialog() override;
-
-    virtual void GetItems(std::vector<SItem>& outItems) override;
-};
-
-#endif // CRYINCLUDE_EDITOR_SELECTLIGHTANIMATIONDIALOG_H
diff --git a/Code/Sandbox/Editor/SelectSequenceDialog.cpp b/Code/Sandbox/Editor/SelectSequenceDialog.cpp
deleted file mode 100644
index 3d6e194dd8..0000000000
--- a/Code/Sandbox/Editor/SelectSequenceDialog.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SelectSequenceDialog.h"
-
-// CSelectSequence dialog
-
-//////////////////////////////////////////////////////////////////////////
-CSelectSequenceDialog::CSelectSequenceDialog(QWidget* pParent)
-    :    CGenericSelectItemDialog(pParent)
-{
-    setWindowTitle(tr("Select Sequence"));
-}
-
-//////////////////////////////////////////////////////////////////////////
-/* virtual */ void
-CSelectSequenceDialog::OnInitDialog()
-{
-    SetMode(eMODE_LIST);
-    CGenericSelectItemDialog::OnInitDialog();
-}
-
-//////////////////////////////////////////////////////////////////////////
-/* virtual */ void
-CSelectSequenceDialog::GetItems(std::vector<SItem>& outItems)
-{
-    IMovieSystem* pMovieSys = GetIEditor()->GetMovieSystem();
-    for (int i = 0; i < pMovieSys->GetNumSequences(); ++i)
-    {
-        IAnimSequence* pSeq = pMovieSys->GetSequence(i);
-        SItem item;
-        string fullname = pSeq->GetName();
-        item.name = fullname.c_str();
-        outItems.push_back(item);
-    }
-}
-
-#include <moc_SelectSequenceDialog.cpp>
diff --git a/Code/Sandbox/Editor/SelectSequenceDialog.h b/Code/Sandbox/Editor/SelectSequenceDialog.h
deleted file mode 100644
index 60408f6bfd..0000000000
--- a/Code/Sandbox/Editor/SelectSequenceDialog.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_SELECTSEQUENCEDIALOG_H
-#define CRYINCLUDE_EDITOR_SELECTSEQUENCEDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "GenericSelectItemDialog.h"
-#endif
-
-// CSelectSequence dialog
-
-class CSelectSequenceDialog
-    : public CGenericSelectItemDialog
-{
-    Q_OBJECT
-
-public:
-    CSelectSequenceDialog(QWidget* pParent = nullptr);   // standard constructor
-    virtual ~CSelectSequenceDialog() {}
-
-protected:
-    void OnInitDialog() override;
-
-    // Derived Dialogs should override this
-    virtual void GetItems(std::vector<SItem>& outItems);
-};
-
-#endif // CRYINCLUDE_EDITOR_SELECTSEQUENCEDIALOG_H
diff --git a/Code/Sandbox/Editor/Settings.cpp b/Code/Sandbox/Editor/Settings.cpp
deleted file mode 100644
index bf699c842c..0000000000
--- a/Code/Sandbox/Editor/Settings.cpp
+++ /dev/null
@@ -1,1205 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "Settings.h"
-
-// Qt
-#include <QGuiApplication>
-#include <QOperatingSystemVersion>
-#include <QScreen>
-
-// AzCore
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/Settings/SettingsRegistry.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/StringFunc/StringFunc.h>
-#include <AzCore/Utils/Utils.h>
-#include <AzCore/Console/IConsole.h>
-
-// AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-
-// Editor
-#include "CryEdit.h"
-#include "MainWindow.h"
-
-#pragma comment(lib, "Gdi32.lib")
-
-//////////////////////////////////////////////////////////////////////////
-// Global Instance of Editor settings.
-//////////////////////////////////////////////////////////////////////////
-SANDBOX_API SEditorSettings gSettings;
-
-Q_GLOBAL_STATIC(QSettings, s_editorSettings);
-
-const QString kDefaultColumnsForAssetBrowserList = "Filename,Path,LODs,Triangles,Submeshes,Filesize,Textures,Materials,Tags";
-const int EditorSettingsVersion = 2; // bump this up on every substantial settings change
-
-void KeepEditorActiveChanged(ICVar* keepEditorActive)
-{
-    const int iCVarKeepEditorActive = keepEditorActive->GetIVal();
-    CCryEditApp::instance()->KeepEditorActive(iCVarKeepEditorActive);
-}
-
-void ToolbarIconSizeChanged(ICVar* toolbarIconSize)
-{
-    MainWindow::instance()->AdjustToolBarIconSize(static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(toolbarIconSize->GetIVal()));
-}
-
-class SettingsGroup
-{
-public:
-    explicit SettingsGroup(const QString& group)
-        : m_group(group)
-    {
-        for (auto g : m_group.split('\\'))
-        {
-            s_editorSettings()->beginGroup(g);
-        }
-    }
-    ~SettingsGroup()
-    {
-        for (auto g : m_group.split('\\'))
-        {
-            s_editorSettings()->endGroup();
-        }
-    }
-
-private:
-    const QString m_group;
-};
-
-namespace
-{
-
-    class QtApplicationListener
-        : public AzToolsFramework::EditorEvents::Bus::Handler
-    {
-    public:
-        QtApplicationListener()
-        {
-            AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
-        }
-
-        void NotifyQtApplicationAvailable(QApplication* application) override
-        {
-            gSettings.viewports.nDragSquareSize = application->startDragDistance();
-            AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
-            delete this;
-        }
-    };
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-SGizmoSettings::SGizmoSettings()
-{
-    axisGizmoSize = 0.2f;
-    axisGizmoText = true;
-    axisGizmoMaxCount = 50;
-    helpersScale = 1.f;
-    tagpointScaleMulti = 0.5f;
-    rulerSphereScale = 0.5f;
-    rulerSphereTrans = 0.5f;
-}
-//////////////////////////////////////////////////////////////////////////
-SEditorSettings::SEditorSettings()
-{
-    bSettingsManagerMode = false;
-
-    undoLevels = 50;
-    m_undoSliceOverrideSaveValue = false;
-    bShowDashboardAtStartup = true;
-    m_showCircularDependencyError = true;
-    bAutoloadLastLevelAtStartup = false;
-    bMuteAudio = false;
-    bEnableGameModeVR = false;
-
-
-    objectHideMask = 0;
-    objectSelectMask = 0xFFFFFFFF; // Initially all selectable.
-
-    autoBackupEnabled = false;
-    autoBackupTime = 10;
-    autoBackupMaxCount = 3;
-    autoRemindTime = 0;
-
-    bAutoSaveTagPoints = false;
-
-    bNavigationContinuousUpdate = false;
-    bNavigationShowAreas = true;
-    bNavigationDebugDisplay = false;
-    bVisualizeNavigationAccessibility = false;
-    navigationDebugAgentType = 0;
-
-    editorConfigSpec = CONFIG_VERYHIGH_SPEC;  //arbitrary choice, but lets assume that we want things to initially look as good as possible in the editor.
-
-    viewports.bAlwaysShowRadiuses = false;
-    viewports.bSync2DViews = false;
-    viewports.fDefaultAspectRatio = 800.0f / 600.0f;
-    viewports.fDefaultFov = DEG2RAD(60); // 60 degrees (to fit with current game)
-    viewports.bShowSafeFrame = false;
-    viewports.bHighlightSelectedGeometry = false;
-    viewports.bHighlightSelectedVegetation = true;
-    viewports.bHighlightMouseOverGeometry = true;
-    viewports.bShowMeshStatsOnMouseOver = false;
-    viewports.bDrawEntityLabels = false;
-    viewports.bShowTriggerBounds = false;
-    viewports.bShowIcons = true;
-    viewports.bDistanceScaleIcons = true;
-    viewports.bShowSizeBasedIcons = false;
-    viewports.nShowFrozenHelpers = true;
-    viewports.bFillSelectedShapes = false;
-    viewports.nTopMapTextureResolution = 512;
-    viewports.bTopMapSwapXY = false;
-    viewports.bShowGridGuide = true;
-    viewports.bHideMouseCursorWhenCaptured = true;
-    viewports.nDragSquareSize = 0; // We must initialize this after the Qt application object is available; see QtApplicationListener
-    viewports.bEnableContextMenu = true;
-    viewports.fWarningIconsDrawDistance = 50.0f;
-    viewports.bShowScaleWarnings = false;
-    viewports.bShowRotationWarnings = false;
-
-    cameraMoveSpeed = 1;
-    cameraRotateSpeed = 1;
-    cameraFastMoveSpeed = 2;
-    stylusMode = false;
-    restoreViewportCamera = true;
-    wheelZoomSpeed = 1;
-    invertYRotation = false;
-    invertPan = false;
-    fBrMultiplier = 2;
-    bPreviewGeometryWindow = true;
-    bBackupOnSave = true;
-    backupOnSaveMaxCount = 3;
-    bApplyConfigSpecInEditor = true;
-    useLowercasePaths = 0;
-    showErrorDialogOnLoad = 1;
-
-    consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
-    bShowTimeInConsole = false;
-
-    enableSceneInspector = false;
-
-    strStandardTempDirectory = "Temp";
-
-    // Init source safe params.
-    enableSourceControl = true;
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    textEditorForScript = "TextEdit";
-    textEditorForShaders = "TextEdit";
-    textEditorForBspaces = "TextEdit";
-    textureEditor = "Photoshop";
-#elif defined(AZ_PLATFORM_WINDOWS)
-    textEditorForScript = "notepad++.exe";
-    textEditorForShaders = "notepad++.exe";
-    textEditorForBspaces = "notepad++.exe";
-    textureEditor = "Photoshop.exe";
-#else
-    textEditorForScript = "";
-    textEditorForShaders = "";
-    textEditorForBspaces = "";
-    textureEditor = "";
-#endif
-    animEditor = "";
-
-    terrainTextureExport = "";
-
-    sTextureBrowserSettings.nCellSize = 128;
-
-    // Experimental features settings
-    sExperimentalFeaturesSettings.bTotalIlluminationEnabled = false;
-
-    //
-    // Asset Browser settings init
-    //
-    sAssetBrowserSettings.nThumbSize = 128;
-    sAssetBrowserSettings.bShowLoadedInLevel = false;
-    sAssetBrowserSettings.bShowUsedInLevel = false;
-    sAssetBrowserSettings.bAutoSaveFilterPreset = true;
-    sAssetBrowserSettings.bShowFavorites = false;
-    sAssetBrowserSettings.bHideLods = false;
-    sAssetBrowserSettings.bAutoChangeViewportSelection = false;
-    sAssetBrowserSettings.bAutoFilterFromViewportSelection = false;
-
-    smartOpenSettings.rect = QRect();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Initialize GUI settings.
-    //////////////////////////////////////////////////////////////////////////
-    gui.bWindowsVista = QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::Windows7);
-
-    gui.nToolbarIconSize = static_cast<int>(AzQtComponents::ToolBar::ToolBarIconSize::Default);
-
-    int lfHeight = 8;// -MulDiv(8, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72);
-    gui.nDefaultFontHieght = lfHeight;
-    gui.hSystemFont = QFont("Ms Shell Dlg 2", lfHeight, QFont::Normal);
-    gui.hSystemFontBold = QFont("Ms Shell Dlg 2", lfHeight, QFont::Bold);
-    gui.hSystemFontItalic = QFont("Ms Shell Dlg 2", lfHeight, QFont::Normal, true);
-
-    backgroundUpdatePeriod = 0;
-    g_TemporaryLevelName = nullptr;
-
-    sliceSettings.dynamicByDefault = false;
-}
-
-void SEditorSettings::Connect()
-{
-    new QtApplicationListener(); // Deletes itself when it's done.
-    AzToolsFramework::EditorSettingsAPIBus::Handler::BusConnect();
-}
-
-void SEditorSettings::Disconnect()
-{
-    AzToolsFramework::EditorSettingsAPIBus::Handler::BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::SaveValue(const char* sSection, const char* sKey, int value)
-{
-    const SettingsGroup sg(sSection);
-    s_editorSettings()->setValue(sKey, value);
-
-    if (!bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::SaveValue(const char* sSection, const char* sKey, const QColor& value)
-{
-    const SettingsGroup sg(sSection);
-    s_editorSettings()->setValue(sKey, QVariant::fromValue<int>(RGB(value.red(), value.green(), value.blue())));
-
-    if (!bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::SaveValue(const char* sSection, const char* sKey, float value)
-{
-    const SettingsGroup sg(sSection);
-    s_editorSettings()->setValue(sKey, QString::number(value));
-
-    if (!bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::SaveValue(const char* sSection, const char* sKey, const QString& value)
-{
-    const SettingsGroup sg(sSection);
-    s_editorSettings()->setValue(sKey, value);
-
-    if (!bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::LoadValue(const char* sSection, const char* sKey, int& value)
-{
-    if (bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
-        }
-
-        SaveValue(sSection, sKey, value);
-    }
-    else
-    {
-        const SettingsGroup sg(sSection);
-        value = s_editorSettings()->value(sKey, value).toInt();
-
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::LoadValue(const char* sSection, const char* sKey, QColor& value)
-{
-    if (bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
-        }
-
-        SaveValue(sSection, sKey, value);
-    }
-    else
-    {
-        const SettingsGroup sg(sSection);
-        int defaultValue = RGB(value.red(), value.green(), value.blue());
-        int v = s_editorSettings()->value(sKey, QVariant::fromValue<int>(defaultValue)).toInt();
-        value = QColor(GetRValue(v), GetGValue(v), GetBValue(v));
-
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::LoadValue(const char* sSection, const char* sKey, float& value)
-{
-    if (bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
-        }
-
-        SaveValue(sSection, sKey, value);
-    }
-    else
-    {
-        const SettingsGroup sg(sSection);
-        const QString defaultVal = s_editorSettings()->value(sKey, QString::number(value)).toString();
-        value = defaultVal.toDouble();
-
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::LoadValue(const char* sSection, const char* sKey, bool& value)
-{
-    if (bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
-        }
-
-        SaveValue(sSection, sKey, value);
-    }
-    else
-    {
-        const SettingsGroup sg(sSection);
-        value = s_editorSettings()->value(sKey, value).toInt();
-
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::LoadValue(const char* sSection, const char* sKey, QString& value)
-{
-    if (bSettingsManagerMode)
-    {
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, value);
-        }
-
-        SaveValue(sSection, sKey, value);
-    }
-    else
-    {
-        const SettingsGroup sg(sSection);
-        value = s_editorSettings()->value(sKey, value).toString();
-
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::LoadValue(const char* sSection, const char* sKey, ESystemConfigSpec& value)
-{
-    if (bSettingsManagerMode)
-    {
-        int valueCheck = 0;
-
-        if (GetIEditor()->GetSettingsManager())
-        {
-            GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, valueCheck);
-        }
-
-        if (valueCheck >= CONFIG_AUTO_SPEC && valueCheck < END_CONFIG_SPEC_ENUM)
-        {
-            value = (ESystemConfigSpec)valueCheck;
-            SaveValue(sSection, sKey, value);
-        }
-    }
-    else
-    {
-        const SettingsGroup sg(sSection);
-        auto valuecheck = static_cast<ESystemConfigSpec>(s_editorSettings()->value(sKey, QVariant::fromValue<int>(value)).toInt());
-        if (valuecheck >= CONFIG_AUTO_SPEC && valuecheck < END_CONFIG_SPEC_ENUM)
-        {
-            value = valuecheck;
-
-            if (GetIEditor()->GetSettingsManager())
-            {
-                GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::Save()
-{
-    QString strStringPlaceholder;
-
-    // Save settings to registry.
-    SaveValue("Settings", "UndoLevels", undoLevels);
-    SaveValue("Settings", "UndoSliceOverrideSaveValue", m_undoSliceOverrideSaveValue);
-    SaveValue("Settings", "ShowWelcomeScreenAtStartup", bShowDashboardAtStartup);
-    SaveValue("Settings", "ShowCircularDependencyError", m_showCircularDependencyError);
-    SaveValue("Settings", "LoadLastLevelAtStartup", bAutoloadLastLevelAtStartup);
-    SaveValue("Settings", "MuteAudio", bMuteAudio);
-    SaveValue("Settings", "AutoBackup", autoBackupEnabled);
-    SaveValue("Settings", "AutoBackupTime", autoBackupTime);
-    SaveValue("Settings", "AutoBackupMaxCount", autoBackupMaxCount);
-    SaveValue("Settings", "AutoRemindTime", autoRemindTime);
-    SaveValue("Settings", "CameraMoveSpeed", cameraMoveSpeed);
-    SaveValue("Settings", "CameraRotateSpeed", cameraRotateSpeed);
-    SaveValue("Settings", "StylusMode", stylusMode);
-    SaveValue("Settings", "RestoreViewportCamera", restoreViewportCamera);
-    SaveValue("Settings", "WheelZoomSpeed", wheelZoomSpeed);
-    SaveValue("Settings", "InvertYRotation", invertYRotation);
-    SaveValue("Settings", "InvertPan", invertPan);
-    SaveValue("Settings", "BrMultiplier", fBrMultiplier);
-    SaveValue("Settings", "CameraFastMoveSpeed", cameraFastMoveSpeed);
-    SaveValue("Settings", "PreviewGeometryWindow", bPreviewGeometryWindow);
-    SaveValue("Settings", "AutoSaveTagPoints", bAutoSaveTagPoints);
-
-    SaveValue("Settings\\Navigation", "NavigationContinuousUpdate", bNavigationContinuousUpdate);
-    SaveValue("Settings\\Navigation", "NavigationShowAreas", bNavigationShowAreas);
-    SaveValue("Settings\\Navigation", "NavigationDebugDisplay", bNavigationDebugDisplay);
-    SaveValue("Settings\\Navigation", "NavigationDebugAgentType", navigationDebugAgentType);
-    SaveValue("Settings\\Navigation", "VisualizeNavigationAccessibility", bVisualizeNavigationAccessibility);
-
-    SaveValue("Settings", "BackupOnSave", bBackupOnSave);
-    SaveValue("Settings", "SaveBackupMaxCount", backupOnSaveMaxCount);
-    SaveValue("Settings", "ApplyConfigSpecInEditor", bApplyConfigSpecInEditor);
-
-    SaveValue("Settings", "editorConfigSpec", editorConfigSpec);
-
-    SaveValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
-
-    SaveValue("Settings", "ConsoleBackgroundColorThemeV2", (int)consoleBackgroundColorTheme);
-
-    SaveValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
-
-    SaveValue("Settings", "EnableSceneInspector", enableSceneInspector);
-    
-    //////////////////////////////////////////////////////////////////////////
-    // Viewport settings.
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings", "AlwaysShowRadiuses", viewports.bAlwaysShowRadiuses);
-    SaveValue("Settings", "Sync2DViews", viewports.bSync2DViews);
-    SaveValue("Settings", "DefaultFov", viewports.fDefaultFov);
-    SaveValue("Settings", "AspectRatio", viewports.fDefaultAspectRatio);
-    SaveValue("Settings", "ShowSafeFrame", viewports.bShowSafeFrame);
-    SaveValue("Settings", "HighlightSelectedGeometry", viewports.bHighlightSelectedGeometry);
-    SaveValue("Settings", "HighlightSelectedVegetation", viewports.bHighlightSelectedVegetation);
-    SaveValue("Settings", "HighlightMouseOverGeometry", viewports.bHighlightMouseOverGeometry);
-    SaveValue("Settings", "ShowMeshStatsOnMouseOver", viewports.bShowMeshStatsOnMouseOver);
-    SaveValue("Settings", "DrawEntityLabels", viewports.bDrawEntityLabels);
-    SaveValue("Settings", "ShowTriggerBounds", viewports.bShowTriggerBounds);
-    SaveValue("Settings", "ShowIcons", viewports.bShowIcons);
-    SaveValue("Settings", "ShowSizeBasedIcons", viewports.bShowSizeBasedIcons);
-    SaveValue("Settings", "ShowFrozenHelpers", viewports.nShowFrozenHelpers);
-    SaveValue("Settings", "FillSelectedShapes", viewports.bFillSelectedShapes);
-    SaveValue("Settings", "MapTextureResolution", viewports.nTopMapTextureResolution);
-    SaveValue("Settings", "MapSwapXY", viewports.bTopMapSwapXY);
-    SaveValue("Settings", "ShowGridGuide", viewports.bShowGridGuide);
-    SaveValue("Settings", "HideMouseCursorOnCapture", viewports.bHideMouseCursorWhenCaptured);
-    SaveValue("Settings", "DragSquareSize", viewports.nDragSquareSize);
-    SaveValue("Settings", "EnableContextMenu", viewports.bEnableContextMenu);
-    SaveValue("Settings", "ToolbarIconSizeV2", gui.nToolbarIconSize);
-    SaveValue("Settings", "WarningIconsDrawDistance", viewports.fWarningIconsDrawDistance);
-    SaveValue("Settings", "ShowScaleWarnings", viewports.bShowScaleWarnings);
-    SaveValue("Settings", "ShowRotationWarnings", viewports.bShowRotationWarnings);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Gizmos.
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings", "AxisGizmoSize", gizmo.axisGizmoSize);
-    SaveValue("Settings", "AxisGizmoText", gizmo.axisGizmoText);
-    SaveValue("Settings", "AxisGizmoMaxCount", gizmo.axisGizmoMaxCount);
-    SaveValue("Settings", "HelpersScale", gizmo.helpersScale);
-    SaveValue("Settings", "TagPointScaleMulti", gizmo.tagpointScaleMulti);
-    SaveValue("Settings", "RulerSphereScale", gizmo.rulerSphereScale);
-    SaveValue("Settings", "RulerSphereTrans", gizmo.rulerSphereTrans);
-    //////////////////////////////////////////////////////////////////////////
-
-    SaveValue("Settings", "TextEditorScript", textEditorForScript);
-    SaveValue("Settings", "TextEditorShaders", textEditorForShaders);
-    SaveValue("Settings", "TextEditorBSpaces", textEditorForBspaces);
-    SaveValue("Settings", "TextureEditor", textureEditor);
-    SaveValue("Settings", "AnimationEditor", animEditor);
-
-    SaveEnableSourceControlFlag(true);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Snapping Settings.
-    SaveValue("Settings\\Snap", "ConstructPlaneSize", snap.constructPlaneSize);
-    SaveValue("Settings\\Snap", "ConstructPlaneDisplay", snap.constructPlaneDisplay);
-    SaveValue("Settings\\Snap", "SnapMarkerDisplay", snap.markerDisplay);
-    SaveValue("Settings\\Snap", "SnapMarkerColor", snap.markerColor);
-    SaveValue("Settings\\Snap", "SnapMarkerSize", snap.markerSize);
-    SaveValue("Settings\\Snap", "GridUserDefined", snap.bGridUserDefined);
-    SaveValue("Settings\\Snap", "GridGetFromSelected", snap.bGridGetFromSelected);
-    //////////////////////////////////////////////////////////////////////////
-
-    SaveValue("Settings", "TerrainTextureExport", terrainTextureExport);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Texture browser settings
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings\\TextureBrowser", "Cell Size", sTextureBrowserSettings.nCellSize);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Experimental features settings
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings\\ExperimentalFeatures", "TotalIlluminationEnabled", sExperimentalFeaturesSettings.bTotalIlluminationEnabled);
-
-    ///////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings\\SelectObjectDialog", "Columns", selectObjectDialog.columns);
-    SaveValue("Settings\\SelectObjectDialog", "LastColumnSortDirection", selectObjectDialog.nLastColumnSortDirection);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Asset browser settings
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings\\AssetBrowser", "ThumbSize", sAssetBrowserSettings.nThumbSize);
-    SaveValue("Settings\\AssetBrowser", "ShowLoadedInLevel", sAssetBrowserSettings.bShowLoadedInLevel);
-    SaveValue("Settings\\AssetBrowser", "ShowUsedInLevel", sAssetBrowserSettings.bShowUsedInLevel);
-    SaveValue("Settings\\AssetBrowser", "FilenameSearch", sAssetBrowserSettings.sFilenameSearch);
-    SaveValue("Settings\\AssetBrowser", "PresetName", sAssetBrowserSettings.sPresetName);
-    SaveValue("Settings\\AssetBrowser", "ShowDatabases", sAssetBrowserSettings.sVisibleDatabaseNames);
-    SaveValue("Settings\\AssetBrowser", "ShowFavorites", sAssetBrowserSettings.bShowFavorites);
-    SaveValue("Settings\\AssetBrowser", "HideLods", sAssetBrowserSettings.bHideLods);
-    SaveValue("Settings\\AssetBrowser", "AutoSaveFilterPreset", sAssetBrowserSettings.bAutoSaveFilterPreset);
-    SaveValue("Settings\\AssetBrowser", "AutoChangeViewportSelection", sAssetBrowserSettings.bAutoChangeViewportSelection);
-    SaveValue("Settings\\AssetBrowser", "AutoFilterFromViewportSelection", sAssetBrowserSettings.bAutoFilterFromViewportSelection);
-    SaveValue("Settings\\AssetBrowser", "VisibleColumnNames", sAssetBrowserSettings.sVisibleColumnNames);
-    SaveValue("Settings\\AssetBrowser", "ColumnNames", sAssetBrowserSettings.sColumnNames);
-      
-    //////////////////////////////////////////////////////////////////////////
-    // Deep Selection Settings
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings", "DeepSelectionNearness", deepSelectionSettings.fRange);
-    SaveValue("Settings", "StickDuplicate", deepSelectionSettings.bStickDuplicate);
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Object Highlight Colors
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings\\ObjectColors", "groupHighlight", objectColorSettings.groupHighlight);
-    SaveValue("Settings\\ObjectColors", "entityHighlight", objectColorSettings.entityHighlight);
-    SaveValue("Settings\\ObjectColors", "BBoxAlpha", objectColorSettings.fBBoxAlpha);
-    SaveValue("Settings\\ObjectColors", "GeometryHighlightColor", objectColorSettings.geometryHighlightColor);
-    SaveValue("Settings\\ObjectColors", "SolidBrushGeometryHighlightColor", objectColorSettings.solidBrushGeometryColor);
-    SaveValue("Settings\\ObjectColors", "GeometryAlpha", objectColorSettings.fGeomAlpha);
-    SaveValue("Settings\\ObjectColors", "ChildGeometryAlpha", objectColorSettings.fChildGeomAlpha);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Smart file open settings
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings\\SmartFileOpen", "LastSearchTerm", smartOpenSettings.lastSearchTerm);
-    SaveValue("Settings\\SmartFileOpen", "DlgRect.Left", smartOpenSettings.rect.left());
-    SaveValue("Settings\\SmartFileOpen", "DlgRect.Top", smartOpenSettings.rect.top());
-    SaveValue("Settings\\SmartFileOpen", "DlgRect.Right", smartOpenSettings.rect.right());
-    SaveValue("Settings\\SmartFileOpen", "DlgRect.Bottom", smartOpenSettings.rect.bottom());
-
-    //////////////////////////////////////////////////////////////////////////
-    // Slice settings
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings\\Slices", "DynamicByDefault", sliceSettings.dynamicByDefault);
-
-    /*
-    //////////////////////////////////////////////////////////////////////////
-    // Save paths.
-    //////////////////////////////////////////////////////////////////////////
-    for (int id = 0; id < EDITOR_PATH_LAST; id++)
-    {
-        for (int i = 0; i < searchPaths[id].size(); i++)
-        {
-            CString path = searchPaths[id][i];
-            CString key;
-            key.Format( "Paths","Path_%.2d_%.2d",id,i );
-            SaveValue( "Paths",key,path );
-        }
-    }
-    */
-
-    s_editorSettings()->sync();
-
-    // --- Settings Registry values
-
-    // Prefab System UI
-    AzFramework::ApplicationRequests::Bus::Broadcast(
-        &AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem);
-
-    SaveSettingsRegistryFile();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SEditorSettings::Load()
-{
-    // Load from Settings Registry
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        prefabSystem, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    const int settingsVersion = s_editorSettings()->value(QStringLiteral("Settings/EditorSettingsVersion"), 0).toInt();
-
-    if (settingsVersion != EditorSettingsVersion)
-    {
-        s_editorSettings()->setValue(QStringLiteral("Settings/EditorSettingsVersion"), EditorSettingsVersion);
-        Save();
-        return;
-    }
-
-    QString     strPlaceholderString;
-    // Load settings from registry.
-    LoadValue("Settings", "UndoLevels", undoLevels);
-    LoadValue("Settings", "UndoSliceOverrideSaveValue", m_undoSliceOverrideSaveValue);  
-    LoadValue("Settings", "ShowWelcomeScreenAtStartup", bShowDashboardAtStartup);
-    LoadValue("Settings", "ShowCircularDependencyError", m_showCircularDependencyError);
-    LoadValue("Settings", "LoadLastLevelAtStartup", bAutoloadLastLevelAtStartup);
-    LoadValue("Settings", "MuteAudio", bMuteAudio);
-    LoadValue("Settings", "AutoBackup", autoBackupEnabled);
-    LoadValue("Settings", "AutoBackupTime", autoBackupTime);
-    LoadValue("Settings", "AutoBackupMaxCount", autoBackupMaxCount);
-    LoadValue("Settings", "AutoRemindTime", autoRemindTime);
-    LoadValue("Settings", "CameraMoveSpeed", cameraMoveSpeed);
-    LoadValue("Settings", "CameraRotateSpeed", cameraRotateSpeed);
-    LoadValue("Settings", "StylusMode", stylusMode);
-    LoadValue("Settings", "RestoreViewportCamera", restoreViewportCamera);
-    LoadValue("Settings", "WheelZoomSpeed", wheelZoomSpeed);
-    LoadValue("Settings", "InvertYRotation", invertYRotation);
-    LoadValue("Settings", "InvertPan", invertPan);
-    LoadValue("Settings", "BrMultiplier", fBrMultiplier);
-    LoadValue("Settings", "CameraFastMoveSpeed", cameraFastMoveSpeed);
-    LoadValue("Settings", "PreviewGeometryWindow", bPreviewGeometryWindow);
-    LoadValue("Settings", "AutoSaveTagPoints", bAutoSaveTagPoints);
-
-    LoadValue("Settings\\Navigation", "NavigationContinuousUpdate", bNavigationContinuousUpdate);
-    LoadValue("Settings\\Navigation", "NavigationShowAreas", bNavigationShowAreas);
-    LoadValue("Settings\\Navigation", "NavigationDebugDisplay", bNavigationDebugDisplay);
-    LoadValue("Settings\\Navigation", "NavigationDebugAgentType", navigationDebugAgentType);
-    LoadValue("Settings\\Navigation", "VisualizeNavigationAccessibility", bVisualizeNavigationAccessibility);
-
-    LoadValue("Settings", "BackupOnSave", bBackupOnSave);
-    LoadValue("Settings", "SaveBackupMaxCount", backupOnSaveMaxCount);
-    LoadValue("Settings", "ApplyConfigSpecInEditor", bApplyConfigSpecInEditor);
-    LoadValue("Settings", "editorConfigSpec", editorConfigSpec);
-
-
-    LoadValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
-
-    int consoleBackgroundColorThemeInt = (int)consoleBackgroundColorTheme;
-    LoadValue("Settings", "ConsoleBackgroundColorThemeV2", consoleBackgroundColorThemeInt);
-    consoleBackgroundColorTheme = static_cast<AzToolsFramework::ConsoleColorTheme>(consoleBackgroundColorThemeInt);
-    if (consoleBackgroundColorTheme != AzToolsFramework::ConsoleColorTheme::Dark && consoleBackgroundColorTheme != AzToolsFramework::ConsoleColorTheme::Light)
-    {
-        consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
-    }
-
-    LoadValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
-
-    LoadValue("Settings", "EnableSceneInspector", enableSceneInspector);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Viewport Settings.
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings", "AlwaysShowRadiuses", viewports.bAlwaysShowRadiuses);
-    LoadValue("Settings", "Sync2DViews", viewports.bSync2DViews);
-    LoadValue("Settings", "DefaultFov", viewports.fDefaultFov);
-    LoadValue("Settings", "AspectRatio", viewports.fDefaultAspectRatio);
-    LoadValue("Settings", "ShowSafeFrame", viewports.bShowSafeFrame);
-    LoadValue("Settings", "HighlightSelectedGeometry", viewports.bHighlightSelectedGeometry);
-    LoadValue("Settings", "HighlightSelectedVegetation", viewports.bHighlightSelectedVegetation);
-    LoadValue("Settings", "HighlightMouseOverGeometry", viewports.bHighlightMouseOverGeometry);
-    LoadValue("Settings", "ShowMeshStatsOnMouseOver", viewports.bShowMeshStatsOnMouseOver);
-    LoadValue("Settings", "DrawEntityLabels", viewports.bDrawEntityLabels);
-    LoadValue("Settings", "ShowTriggerBounds", viewports.bShowTriggerBounds);
-    LoadValue("Settings", "ShowIcons", viewports.bShowIcons);
-    LoadValue("Settings", "ShowSizeBasedIcons", viewports.bShowSizeBasedIcons);
-    LoadValue("Settings", "ShowFrozenHelpers", viewports.nShowFrozenHelpers);
-    LoadValue("Settings", "FillSelectedShapes", viewports.bFillSelectedShapes);
-    LoadValue("Settings", "MapTextureResolution", viewports.nTopMapTextureResolution);
-    LoadValue("Settings", "MapSwapXY", viewports.bTopMapSwapXY);
-    LoadValue("Settings", "ShowGridGuide", viewports.bShowGridGuide);
-    LoadValue("Settings", "HideMouseCursorOnCapture", viewports.bHideMouseCursorWhenCaptured);
-    LoadValue("Settings", "DragSquareSize", viewports.nDragSquareSize);
-    LoadValue("Settings", "EnableContextMenu", viewports.bEnableContextMenu);
-    LoadValue("Settings", "ToolbarIconSizeV2", gui.nToolbarIconSize);
-    LoadValue("Settings", "WarningIconsDrawDistance", viewports.fWarningIconsDrawDistance);
-    LoadValue("Settings", "ShowScaleWarnings", viewports.bShowScaleWarnings);
-    LoadValue("Settings", "ShowRotationWarnings", viewports.bShowRotationWarnings);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Gizmos.
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings", "AxisGizmoSize", gizmo.axisGizmoSize);
-    LoadValue("Settings", "AxisGizmoText", gizmo.axisGizmoText);
-    LoadValue("Settings", "AxisGizmoMaxCount", gizmo.axisGizmoMaxCount);
-    LoadValue("Settings", "HelpersScale", gizmo.helpersScale);
-    LoadValue("Settings", "TagPointScaleMulti", gizmo.tagpointScaleMulti);
-    LoadValue("Settings", "RulerSphereScale", gizmo.rulerSphereScale);
-    LoadValue("Settings", "RulerSphereTrans", gizmo.rulerSphereTrans);
-    //////////////////////////////////////////////////////////////////////////
-
-    LoadValue("Settings", "TextEditorScript", textEditorForScript);
-    LoadValue("Settings", "TextEditorShaders", textEditorForShaders);
-    LoadValue("Settings", "TextEditorBSpaces", textEditorForBspaces);
-    LoadValue("Settings", "TextureEditor", textureEditor);
-    LoadValue("Settings", "AnimationEditor", animEditor);
-
-    LoadEnableSourceControlFlag();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Snapping Settings.
-    LoadValue("Settings\\Snap", "ConstructPlaneSize", snap.constructPlaneSize);
-    LoadValue("Settings\\Snap", "ConstructPlaneDisplay", snap.constructPlaneDisplay);
-    LoadValue("Settings\\Snap", "SnapMarkerDisplay", snap.markerDisplay);
-    LoadValue("Settings\\Snap", "SnapMarkerColor", snap.markerColor);
-    LoadValue("Settings\\Snap", "SnapMarkerSize", snap.markerSize);
-    LoadValue("Settings\\Snap", "GridUserDefined", snap.bGridUserDefined);
-    LoadValue("Settings\\Snap", "GridGetFromSelected", snap.bGridGetFromSelected);
-    //////////////////////////////////////////////////////////////////////////
-
-    LoadValue("Settings", "TerrainTextureExport", terrainTextureExport);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Texture browser settings
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings\\TextureBrowser", "Cell Size", sTextureBrowserSettings.nCellSize);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Experimental features settings
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings\\ExperimentalFeatures", "TotalIlluminationEnabled", sExperimentalFeaturesSettings.bTotalIlluminationEnabled);
-
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings\\SelectObjectDialog", "Columns", selectObjectDialog.columns);
-    LoadValue("Settings\\SelectObjectDialog", "LastColumnSortDirection", selectObjectDialog.nLastColumnSortDirection);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Asset browser settings
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings\\AssetBrowser", "ThumbSize", sAssetBrowserSettings.nThumbSize);
-    LoadValue("Settings\\AssetBrowser", "ShowLoadedInLevel", sAssetBrowserSettings.bShowLoadedInLevel);
-    LoadValue("Settings\\AssetBrowser", "ShowUsedInLevel", sAssetBrowserSettings.bShowUsedInLevel);
-    LoadValue("Settings\\AssetBrowser", "FilenameSearch", sAssetBrowserSettings.sFilenameSearch);
-    LoadValue("Settings\\AssetBrowser", "PresetName", sAssetBrowserSettings.sPresetName);
-    LoadValue("Settings\\AssetBrowser", "ShowDatabases", sAssetBrowserSettings.sVisibleDatabaseNames);
-    LoadValue("Settings\\AssetBrowser", "ShowFavorites", sAssetBrowserSettings.bShowFavorites);
-    LoadValue("Settings\\AssetBrowser", "HideLods", sAssetBrowserSettings.bHideLods);
-    LoadValue("Settings\\AssetBrowser", "AutoSaveFilterPreset", sAssetBrowserSettings.bAutoSaveFilterPreset);
-    LoadValue("Settings\\AssetBrowser", "AutoChangeViewportSelection", sAssetBrowserSettings.bAutoChangeViewportSelection);
-    LoadValue("Settings\\AssetBrowser", "AutoFilterFromViewportSelection", sAssetBrowserSettings.bAutoFilterFromViewportSelection);
-    LoadValue("Settings\\AssetBrowser", "VisibleColumnNames", sAssetBrowserSettings.sVisibleColumnNames);
-    LoadValue("Settings\\AssetBrowser", "ColumnNames", sAssetBrowserSettings.sColumnNames);
-
-    if (sAssetBrowserSettings.sVisibleColumnNames == ""
-        || sAssetBrowserSettings.sColumnNames == "")
-    {
-        sAssetBrowserSettings.sColumnNames =
-            sAssetBrowserSettings.sVisibleColumnNames = kDefaultColumnsForAssetBrowserList;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Deep Selection Settings
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings", "DeepSelectionNearness", deepSelectionSettings.fRange);
-    LoadValue("Settings", "StickDuplicate", deepSelectionSettings.bStickDuplicate);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Object Highlight Colors
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings\\ObjectColors", "GroupHighlight", objectColorSettings.groupHighlight);
-    LoadValue("Settings\\ObjectColors", "EntityHighlight", objectColorSettings.entityHighlight);
-    LoadValue("Settings\\ObjectColors", "BBoxAlpha", objectColorSettings.fBBoxAlpha);
-    LoadValue("Settings\\ObjectColors", "GeometryHighlightColor", objectColorSettings.geometryHighlightColor);
-    LoadValue("Settings\\ObjectColors", "SolidBrushGeometryHighlightColor", objectColorSettings.solidBrushGeometryColor);
-    LoadValue("Settings\\ObjectColors", "GeometryAlpha", objectColorSettings.fGeomAlpha);
-    LoadValue("Settings\\ObjectColors", "ChildGeometryAlpha", objectColorSettings.fChildGeomAlpha);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Smart file open settings
-    //////////////////////////////////////////////////////////////////////////
-    int soRcLeft = 0;
-    int soRcRight = 0;
-    int soRcTop = 0;
-    int soRcBottom = 0;
-
-    LoadValue("Settings\\SmartFileOpen", "LastSearchTerm", smartOpenSettings.lastSearchTerm);
-    LoadValue("Settings\\SmartFileOpen", "DlgRect.Left", soRcLeft);
-    LoadValue("Settings\\SmartFileOpen", "DlgRect.Top", soRcTop);
-    LoadValue("Settings\\SmartFileOpen", "DlgRect.Right", soRcRight);
-    LoadValue("Settings\\SmartFileOpen", "DlgRect.Bottom", soRcBottom);
-
-    // check for bad values
-    QRect screenRc = QGuiApplication::primaryScreen()->availableGeometry();
-
-    if (screenRc.contains(QPoint(soRcLeft, soRcTop))
-        && screenRc.contains(QPoint(soRcRight, soRcBottom)))
-    {
-        smartOpenSettings.rect.setLeft(soRcLeft);
-        smartOpenSettings.rect.setTop(soRcTop);
-        smartOpenSettings.rect.setRight(soRcRight);
-        smartOpenSettings.rect.setBottom(soRcBottom);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Slice settings
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings\\Slices", "DynamicByDefault", sliceSettings.dynamicByDefault);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Load paths.
-    //////////////////////////////////////////////////////////////////////////
-    for (int id = 0; id < EDITOR_PATH_LAST; id++)
-    {
-        if (id == EDITOR_PATH_UI_ICONS) // Skip UI icons path, not load it.
-        {
-            continue;
-        }
-        int i = 0;
-        searchPaths[id].clear();
-        while (true)
-        {
-            const QString key = QStringLiteral("Path_%1_%2").arg(id, 2, 10, QLatin1Char('.')).arg(i, 2, 10, QLatin1Char('.'));
-            QString path;
-            LoadValue("Paths", key.toUtf8().data(), path);
-            if (path.isEmpty())
-            {
-                break;
-            }
-            searchPaths[id].push_back(path);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZ_CVAR(bool, ed_previewGameInFullscreen_once, false, nullptr, AZ::ConsoleFunctorFlags::IsInvisible, "Preview the game (Ctrl+G, \"Play Game\", etc.) in fullscreen once");
-
-void SEditorSettings::PostInitApply()
-{
-    if (!gEnv || !gEnv->pConsole)
-    {
-        return;
-    }
-
-    // Create CVars.
-    REGISTER_CVAR2("ed_highlightGeometry", &viewports.bHighlightMouseOverGeometry, viewports.bHighlightMouseOverGeometry, 0, "Highlight geometry when mouse over it");
-    REGISTER_CVAR2("ed_showFrozenHelpers", &viewports.nShowFrozenHelpers, viewports.nShowFrozenHelpers, 0, "Show helpers of frozen objects");
-    REGISTER_CVAR2("ed_lowercasepaths", &useLowercasePaths, useLowercasePaths, 0, "generate paths in lowercase");
-    gEnv->pConsole->RegisterInt("fe_fbx_savetempfile", 0, 0, "When importing an FBX file into Facial Editor, this will save out a conversion FSQ to the Animations/temp folder for trouble shooting");
-
-    REGISTER_CVAR2_CB("ed_toolbarIconSize", &gui.nToolbarIconSize, gui.nToolbarIconSize, VF_NULL, "Override size of the toolbar icons 0-default, 16,32,...", ToolbarIconSizeChanged);
-
-    GetIEditor()->SetEditorConfigSpec(editorConfigSpec, GetISystem()->GetConfigPlatform());
-    REGISTER_CVAR2("ed_backgroundUpdatePeriod", &backgroundUpdatePeriod, backgroundUpdatePeriod, 0, "Delay between frame updates (ms) when window is out of focus but not minimized. 0 = disable background update");
-    REGISTER_CVAR2("ed_showErrorDialogOnLoad", &showErrorDialogOnLoad, showErrorDialogOnLoad, 0, "Show error dialog on level load");
-    REGISTER_CVAR2_CB("ed_keepEditorActive", &keepEditorActive, 0, VF_NULL, "Keep the editor active, even if no focus is set", KeepEditorActiveChanged);
-    REGISTER_CVAR2("g_TemporaryLevelName", &g_TemporaryLevelName, "temp_level", VF_NULL, "Temporary level named used for experimental levels.");
-
-    CCryEditApp::instance()->KeepEditorActive(keepEditorActive > 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// needs to be called after crysystem has been loaded
-void SEditorSettings::LoadDefaultGamePaths()
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Default paths.
-    //////////////////////////////////////////////////////////////////////////
-    if (searchPaths[EDITOR_PATH_OBJECTS].empty())
-    {
-        searchPaths[EDITOR_PATH_OBJECTS].push_back((Path::GetEditingGameDataFolder() + "/Objects").c_str());
-    }
-    if (searchPaths[EDITOR_PATH_TEXTURES].empty())
-    {
-        searchPaths[EDITOR_PATH_TEXTURES].push_back((Path::GetEditingGameDataFolder() + "/Textures").c_str());
-    }
-    if (searchPaths[EDITOR_PATH_SOUNDS].empty())
-    {
-        searchPaths[EDITOR_PATH_SOUNDS].push_back((Path::GetEditingGameDataFolder() + "/Sounds").c_str());
-    }
-    if (searchPaths[EDITOR_PATH_MATERIALS].empty())
-    {
-        searchPaths[EDITOR_PATH_MATERIALS].push_back((Path::GetEditingGameDataFolder() + "/Materials").c_str());
-    }
-
-    AZStd::string iconsPath;
-    AZ::StringFunc::Path::Join(Path::GetEditingRootFolder().c_str(), "Editor/UI/Icons", iconsPath);
-    searchPaths[EDITOR_PATH_UI_ICONS].push_back(iconsPath.c_str());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool SEditorSettings::BrowseTerrainTexture(bool bIsSave)
-{
-    QString path;
-
-    if (!terrainTextureExport.isEmpty())
-    {
-        path = Path::GetPath(terrainTextureExport);
-    }
-    else
-    {
-        path = Path::GetEditingGameDataFolder().c_str();
-    }
-
-    if (bIsSave)
-    {
-        return CFileUtil::SelectSaveFile("Bitmap Image File (*.bmp)", "bmp", path, terrainTextureExport);
-    }
-    else
-    {
-        return CFileUtil::SelectFile("Bitmap Image File (*.bmp)", path, terrainTextureExport);
-    }
-}
-
-void EnableSourceControl(bool enable)
-{
-    // Source control component
-    using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
-    SCRequestBus::Broadcast(&SCRequestBus::Events::EnableSourceControl, enable);
-}
-
-void SEditorSettings::SaveEnableSourceControlFlag(bool triggerUpdate /*= false*/)
-{
-    // Track the original source control value
-    bool originalSourceControlFlag;
-    LoadValue("Settings", "EnableSourceControl", originalSourceControlFlag);
-
-    // Update only on change
-    if (originalSourceControlFlag != enableSourceControl)
-    {
-        SaveValue("Settings", "EnableSourceControl", enableSourceControl);
-
-        // If we are triggering any update for the source control flag, then set the control state
-        if (triggerUpdate)
-        {
-            EnableSourceControl(enableSourceControl);
-        }
-    }
-}
-
-void SEditorSettings::LoadEnableSourceControlFlag()
-{
-    constexpr AZStd::string_view enableSourceControlKey = "/Amazon/Settings/EnableSourceControl";
-    bool sourceControlEnabledInSettingsRegistry{};
-    if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr &&
-        registry->Get(sourceControlEnabledInSettingsRegistry, enableSourceControlKey))
-    {
-        // Have the SettingsRegistry able to disable the SourceControl Connection
-        // only if the "EnableSourceControl" key is found
-        if (!sourceControlEnabledInSettingsRegistry)
-        {
-            EnableSourceControl(false);
-            return;
-        }
-    }
-    // Use the QSettings "EnableSourceControl" value if the SettingsRegistry
-    // hasn't disabled the SourceControlAPI
-    LoadValue("Settings", "EnableSourceControl", enableSourceControl);
-    EnableSourceControl(enableSourceControl);
-}
-
-AZStd::vector<AZStd::string> SEditorSettings::BuildSettingsList()
-{
-    if (GetIEditor()->GetSettingsManager())
-    {
-        // Will need to save the settings at least once to populate the list
-        // This will not affect the level nor prompt dialogs
-        Save();
-        return GetIEditor()->GetSettingsManager()->BuildSettingsList();
-    }
-
-    return AZStd::vector<AZStd::string>();
-}
-
-void SEditorSettings::ConvertPath(const AZStd::string_view sourcePath, AZStd::string& category, AZStd::string& attribute)
-{
-    // This API accepts pipe-separated paths like "Category1|Category2|AttributeName"
-    // But the SettingsManager requires 2 arguments, a Category like "Category1\Category2" and an attribute "AttributeName"
-    // The reason for the difference is to have this API be consistent with the path syntax in Open 3D Engine Python APIs.
-
-    // Find the last pipe separator ("|") in the path
-    int lastSeparator = sourcePath.find_last_of("|");
-
-    // Everything before the last separator is the category (since only the category is hierarchical)
-    category = sourcePath.substr(0, lastSeparator);
-
-    // Everything after the last separator is the attribute
-    attribute = sourcePath.substr(lastSeparator + 1, sourcePath.length());
-
-    // Replace pipes with backspaces in the category
-    AZStd::replace(category.begin(), category.end(), '|', '\\');
-}
-
-AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::GetValue(const AZStd::string_view path)
-{
-    if (path.find("|") < 0)
-    {
-        return { AZStd::string("Invalid Path - could not find separator \"|\"") };
-    }
-
-    AZStd::string category, attribute;
-    ConvertPath(path, category, attribute);
-
-    QString result;
-    LoadValue(category.c_str(), attribute.c_str(), result);
-
-    AZStd::string actualResult = result.toUtf8().data();
-
-    return { AZStd::any(actualResult) };
-}
-
-AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::SetValue(const AZStd::string_view path, const AZStd::any& value)
-{
-    if (path.find("|") < 0)
-    {
-        return { AZStd::string("Invalid Path - could not find separator \"|\"") };
-    }
-
-    AZStd::string category, attribute;
-    ConvertPath(path, category, attribute);
-
-    if (value.type() == azrtti_typeid<bool>())
-    {
-        bool val = AZStd::any_cast<bool>(value);
-        SaveValue(category.c_str(), attribute.c_str(), val);
-    }
-    else if (value.type() == azrtti_typeid<double>())
-    {
-        SaveValue(category.c_str(), attribute.c_str(), aznumeric_cast<float>(AZStd::any_cast<double>(value)));
-    }
-    else if (value.type() == azrtti_typeid<AZ::s64>())
-    {
-        SaveValue(category.c_str(), attribute.c_str(), aznumeric_cast<int>(AZStd::any_cast<AZ::s64>(value)));
-    }
-    else if (value.type() == azrtti_typeid<AZStd::string>())
-    {
-        SaveValue(category.c_str(), attribute.c_str(), QString(AZStd::any_cast<AZStd::string>(value).c_str()));
-    }
-    else if (value.type() == azrtti_typeid<AZStd::string_view>())
-    {
-        SaveValue(category.c_str(), attribute.c_str(), QString(AZStd::any_cast<AZStd::string_view>(value).data()));
-    }
-    else
-    {
-        return { AZStd::string("Invalid Value Type - supported types: string, bool, int, float") };
-    }
-
-    // Reload the changes in the Settings object used in the Editor
-    Load();
-
-    return { value };
-}
-
-void SEditorSettings::SaveSettingsRegistryFile()
-{
-    auto registry = AZ::SettingsRegistry::Get();
-    if (registry == nullptr)
-    {
-        AZ_Warning("SEditorSettings", false, "Unable to access global settings registry. Editor Preferences cannot be saved");
-        return;
-    }
-
-    // Resolve path to editorpreferences.setreg
-    AZ::IO::FixedMaxPath editorPreferencesFilePath = AZ::Utils::GetProjectPath();
-    editorPreferencesFilePath /= "user/Registry/editorpreferences.setreg";
-
-    AZ::SettingsRegistryMergeUtils::DumperSettings dumperSettings;
-    dumperSettings.m_prettifyOutput = true;
-    dumperSettings.m_jsonPointerPrefix = "/Amazon/Preferences";
-
-    AZStd::string stringBuffer;
-    AZ::IO::ByteContainerStream stringStream(&stringBuffer);
-    if (!AZ::SettingsRegistryMergeUtils::DumpSettingsRegistryToStream(*registry, "/Amazon/Preferences", stringStream, dumperSettings))
-    {
-        AZ_Warning("SEditorSettings", false, R"(Unable to save changes to the Editor Preferences registry file at "%s"\n)",
-            editorPreferencesFilePath.c_str());
-        return;
-    }
-
-    bool saved{};
-    constexpr auto configurationMode = AZ::IO::SystemFile::SF_OPEN_CREATE
-        | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH
-        | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
-    if (AZ::IO::SystemFile outputFile; outputFile.Open(editorPreferencesFilePath.c_str(), configurationMode))
-    {
-        saved = outputFile.Write(stringBuffer.data(), stringBuffer.size()) == stringBuffer.size();
-    }
-
-    AZ_Warning("SEditorSettings", saved, R"(Unable to save Editor Preferences registry file to path "%s"\n)",
-        editorPreferencesFilePath.c_str());
-}
-
-bool SEditorSettings::SetSettingsRegistry_Bool(const char* key, bool value)
-{
-    if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr)
-    {
-        return registry->Set(key, value);
-    }
-
-    return false;
-}
-
-bool SEditorSettings::GetSettingsRegistry_Bool(const char* key, bool& value)
-{
-    if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr)
-    {
-        return registry->Get(value, key);
-    }
-
-    return false;
-}
-
-AzToolsFramework::ConsoleColorTheme SEditorSettings::GetConsoleColorTheme() const
-{
-    return consoleBackgroundColorTheme;
-}
diff --git a/Code/Sandbox/Editor/Settings.h b/Code/Sandbox/Editor/Settings.h
deleted file mode 100644
index 7618a11485..0000000000
--- a/Code/Sandbox/Editor/Settings.h
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2002.
-// -------------------------------------------------------------------------
-//  File name:   settings.h
-//  Version:     v1.00
-//  Created:     14/1/2003 by Timur.
-//  Compilers:   Visual Studio.NET
-//  Description: General editor settings.
-// -------------------------------------------------------------------------
-//  History:
-//
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_EDITOR_SETTINGS_H
-#define CRYINCLUDE_EDITOR_SETTINGS_H
-#include "SettingsManager.h"
-
-#include <QColor>
-#include <QFont>
-#include <QRect>
-#include <QSettings>
-
-#include <AzToolsFramework/Editor/EditorSettingsAPIBus.h>
-#include <AzCore/JSON/document.h>
-
-#include <AzQtComponents/Components/Widgets/ToolBar.h>
-
-struct SGizmoSettings
-{
-    float axisGizmoSize;
-    bool axisGizmoText;
-    int axisGizmoMaxCount;
-
-    float helpersScale;
-    float tagpointScaleMulti;
-
-    // Scale size and transparency for debug spheres when using Ruler tool
-    float rulerSphereScale;
-    float rulerSphereTrans;
-
-    SGizmoSettings();
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Settings for snapping in the viewports.
-//////////////////////////////////////////////////////////////////////////
-struct SSnapSettings
-{
-    SSnapSettings()
-    {
-        constructPlaneDisplay = false;
-        constructPlaneSize = 5;
-
-        markerDisplay = false;
-        markerColor = QColor(0, 200, 200);
-        markerSize = 1.0f;
-
-        bGridUserDefined = false;
-        bGridGetFromSelected = false;
-    }
-
-    // Display settings for construction plane.
-    bool  constructPlaneDisplay;
-    float constructPlaneSize;
-
-    // Display settings for snapping marker.
-    bool  markerDisplay;
-    QColor markerColor;
-    float markerSize;
-
-    bool bGridUserDefined;
-    bool bGridGetFromSelected;
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// Settings for View of Tools
-//////////////////////////////////////////////////////////////////////////
-struct SToolViewSettings
-{
-    SToolViewSettings()
-    {
-    }
-
-    int nFrameRate;
-    QString codec;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Settings for deep selection.
-//////////////////////////////////////////////////////////////////////////
-struct SDeepSelectionSettings
-{
-    SDeepSelectionSettings()
-        : fRange(1.f)
-        , bStickDuplicate(false) {}
-
-    //! If there are other objects hit within this value, one of them needs
-    //! to be selected by user.
-    //! If this value is 0.f, then deep selection mode won't work.
-    float fRange;
-    bool bStickDuplicate;
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct SObjectColors
-{
-    SObjectColors()
-    {
-        groupHighlight = QColor(0, 255, 0);
-        entityHighlight = QColor(112, 117, 102);
-        fBBoxAlpha = 0.3f;
-        geometryHighlightColor = QColor(192, 0, 192);
-        solidBrushGeometryColor = QColor(192, 0, 192);
-        fGeomAlpha = 0.2f;
-        fChildGeomAlpha = 0.4f;
-    }
-
-    QColor groupHighlight;
-    QColor entityHighlight;
-    QColor geometryHighlightColor;
-    QColor solidBrushGeometryColor;
-
-    float fBBoxAlpha;
-    float fGeomAlpha;
-    float fChildGeomAlpha;
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct SViewportsSettings
-{
-    //! If enabled always show entity radiuse.
-    bool bAlwaysShowRadiuses;
-    //! True if 2D viewports will be synchronized with same view and origin.
-    bool bSync2DViews;
-    //! Camera FOV for perspective View.
-    float fDefaultFov;
-    //! Camera Aspect Ratio for perspective View.
-    float fDefaultAspectRatio;
-    //! Show safe frame.
-    bool bShowSafeFrame;
-    //! To highlight selected geometry.
-    bool bHighlightSelectedGeometry;
-    //! To highlight selected vegetation.
-    bool bHighlightSelectedVegetation;
-
-    //! To highlight selected geometry.
-    int bHighlightMouseOverGeometry;
-
-    //! Show triangle count on mouse over
-    bool bShowMeshStatsOnMouseOver;
-
-    //! If enabled will always display entity labels.
-    bool bDrawEntityLabels;
-    //! Show Trigger bounds.
-    bool bShowTriggerBounds;
-    //! Show Icons in viewport.
-    bool bShowIcons;
-    //! Scale icons with distance, so they aren't a fixed size no matter how far away you are
-    bool bDistanceScaleIcons;
-
-    //! Show Size-based Icons in viewport.
-    bool bShowSizeBasedIcons;
-
-    //! Show Helpers in viewport for frozen objects.
-    int nShowFrozenHelpers;
-    //! Fill Selected Shapes.
-    bool bFillSelectedShapes;
-
-    // Swap X/Y in map viewport.
-    bool bTopMapSwapXY;
-    // Texture resolution in the Top map viewport.
-    int nTopMapTextureResolution;
-
-    // Whether the grid guide (for move/rotate tool) will be shown or not.
-    bool bShowGridGuide;
-
-    // Whether the mouse cursor will be hidden when capturing the mouse.
-    bool bHideMouseCursorWhenCaptured;
-
-    // Size of square which the mouse must leave before a drag operation begins.
-    int nDragSquareSize;
-
-    // Enable context menu in the viewport
-    bool bEnableContextMenu;
-
-    //! Warning icons draw distance
-    float fWarningIconsDrawDistance;
-    //! Warnings for scale != 1
-    bool bShowScaleWarnings;
-    //! Warnings for rotation != 0
-    bool bShowRotationWarnings;
-};
-
-struct SSelectObjectDialogSettings
-{
-    QString columns;
-    int nLastColumnSortDirection;
-
-    SSelectObjectDialogSettings()
-        : nLastColumnSortDirection(0)
-    {
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct SGUI_Settings
-{
-    bool bWindowsVista;        // true when running on windows Vista
-    QFont hSystemFont;         // Default system GUI font.
-    QFont hSystemFontBold;     // Default system GUI bold font.
-    QFont hSystemFontItalic;   // Default system GUI italic font.
-    int nDefaultFontHieght;    // Default font height for 8 logical units.
-
-    int nToolbarIconSize;      // Override size of the toolbar icons
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct STextureBrowserSettings
-{
-    int nCellSize; // Stores the default texture maximum cell size for
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct SExperimentalFeaturesSettings
-{
-    bool bTotalIlluminationEnabled;
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct SSliceSettings
-{
-    bool dynamicByDefault;
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct SAssetBrowserSettings
-{
-    // stores the default thumb size
-    int nThumbSize;
-    // the current filename search filter in the search edit box
-    QString sFilenameSearch,
-    // the current filter preset name
-            sPresetName;
-    // current selected/checked/visible databases, db names separated by comma (,), Ex: "Textures,Models,Sounds"
-    QString sVisibleDatabaseNames;
-    // current visible columns in asset list
-    QString sVisibleColumnNames;
-    // current columns in asset list, in their actual order (including visible and hidden columns)
-    QString sColumnNames;
-    // check to show only the assets used in current level
-    bool bShowUsedInLevel,
-    // check to show only the assets loaded in the current level
-         bShowLoadedInLevel,
-    // check to filter only the favorite assets
-         bShowFavorites,
-    // hide LODs from thumbs view, for CGFs for example
-         bHideLods,
-    // true when the edited filter preset was changed, it will be saved automatically, without the user to push the "Save" button
-         bAutoSaveFilterPreset,
-    // true when we want sync between asset browser selection and viewport selection
-         bAutoChangeViewportSelection,
-    // true when we want sync between viewport selection and asset browser visible thumbs
-         bAutoFilterFromViewportSelection;
-};
-
-struct SSmartOpenDialogSettings
-{
-    QRect rect;
-    QString lastSearchTerm;
-};
-
-//////////////////////////////////////////////////////////////////////////
-/** Various editor settings.
-*/
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-struct SANDBOX_API SEditorSettings
-    : AzToolsFramework::EditorSettingsAPIBus::Handler
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    SEditorSettings();
-    ~SEditorSettings() = default;
-    void    Save();
-    void    Load();
-    void    LoadCloudSettings();
-
-    void Connect();
-    void Disconnect();
-
-    // EditorSettingsAPIBus...
-    AZStd::vector<AZStd::string> BuildSettingsList() override;
-    SettingOutcome GetValue(const AZStd::string_view path) override;
-    SettingOutcome SetValue(const AZStd::string_view path, const AZStd::any& value) override;
-    AzToolsFramework::ConsoleColorTheme GetConsoleColorTheme() const override;
-
-    void ConvertPath(const AZStd::string_view sourcePath, AZStd::string& category, AZStd::string& attribute);
-
-    // needs to be called after crysystem has been loaded
-    void    LoadDefaultGamePaths();
-
-    // need to expose updating of the source control enable/disable flag
-    // because its state is updateable through the main status bar
-    void SaveEnableSourceControlFlag(bool triggerUpdate = false);
-
-    void LoadEnableSourceControlFlag();
-
-    void PostInitApply();
-
-    bool BrowseTerrainTexture(bool bIsSave);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Variables.
-    //////////////////////////////////////////////////////////////////////////
-    int undoLevels;
-    bool m_undoSliceOverrideSaveValue;
-    bool bShowDashboardAtStartup;
-    bool m_showCircularDependencyError;
-    bool bAutoloadLastLevelAtStartup;
-    bool bMuteAudio;
-    bool bEnableGameModeVR;
-
-    //! Speed of camera movement.
-    float cameraMoveSpeed;
-    float cameraRotateSpeed;
-    float cameraFastMoveSpeed;
-    float wheelZoomSpeed;
-    bool invertYRotation;
-    bool invertPan;
-    bool stylusMode; // if stylus mode is enabled, no setCursorPos will be performed (WACOM tablets, etc)
-    bool restoreViewportCamera; // When true, restore the original editor viewport camera when exiting game mode
-
-    //! Hide mask for objects.
-    int objectHideMask;
-
-    //! Selection mask for objects.
-    int objectSelectMask;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Viewport settings.
-    //////////////////////////////////////////////////////////////////////////
-    SViewportsSettings viewports;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    SToolViewSettings toolViewSettings;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Files.
-    //////////////////////////////////////////////////////////////////////////
-
-    //! Before saving, make a backup into a subfolder
-    bool bBackupOnSave;
-    //! how many save backups to keep
-    int backupOnSaveMaxCount;
-
-    int useLowercasePaths;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Autobackup.
-    //////////////////////////////////////////////////////////////////////////
-    //! Save auto backup file every autoSaveTime minutes.
-    int autoBackupTime;
-    //! Keep only several last autobackups.
-    int autoBackupMaxCount;
-    //! When this variable set to true automatic file backup is enabled.
-    bool autoBackupEnabled;
-    //! After this amount of minutes message box with reminder to save will pop on.
-    int autoRemindTime;
-    //////////////////////////////////////////////////////////////////////////
-
-
-    //! If true preview windows is displayed when browsing geometries.
-    bool bPreviewGeometryWindow;
-
-    int showErrorDialogOnLoad;
-
-    //! Keeps the editor active even if no focus is set
-    int keepEditorActive;
-
-    SGizmoSettings gizmo;
-
-    // Settings of the snapping.
-    SSnapSettings snap;
-
-    //! Source Control Enabling.
-    bool enableSourceControl;
-
-    //! Text editor.
-    QString textEditorForScript;
-    QString textEditorForShaders;
-    QString textEditorForBspaces;
-
-    //! Asset editors
-    QString textureEditor;
-    QString animEditor;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Editor data search paths.
-    QStringList searchPaths[10]; // EDITOR_PATH_LAST
-
-    // This directory is related to the editor root.
-    QString strStandardTempDirectory;
-
-    SGUI_Settings gui;
-
-    bool              bApplyConfigSpecInEditor;
-
-    ESystemConfigSpec editorConfigSpec;
-
-    //! Terrain Texture Export/Import filename.
-    QString terrainTextureExport;
-
-    // Read only parameter.
-    // Refects the status of GetIEditor()->GetOperationMode
-    // To change current operation mode use GetIEditor()->SetOperationMode
-    // see EOperationMode
-    int operationMode;
-
-    // For the texture browser configurations.
-    STextureBrowserSettings sTextureBrowserSettings;
-
-    // Experimental features configurations.
-    SExperimentalFeaturesSettings sExperimentalFeaturesSettings;
-
-    // For the asset browser configurations.
-    SAssetBrowserSettings sAssetBrowserSettings;
-
-    SSelectObjectDialogSettings selectObjectDialog;
-
-    // For Terrain Texture Generation Multiplier.
-    float fBrMultiplier;
-
-    AzToolsFramework::ConsoleColorTheme consoleBackgroundColorTheme;
-
-    bool bShowTimeInConsole;
-
-    // Enable the option do get detailed information about the loaded scene data in the Scene Settings window.
-    bool enableSceneInspector;
-
-    // Deep Selection Mode Settings
-    SDeepSelectionSettings deepSelectionSettings;
-
-    // Object Highlight Settings
-    SObjectColors objectColorSettings;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    SSmartOpenDialogSettings smartOpenSettings;
-
-    bool bSettingsManagerMode;
-
-    bool bAutoSaveTagPoints;
-
-    bool bNavigationContinuousUpdate;
-    bool bNavigationShowAreas;
-    bool bNavigationDebugDisplay;
-    bool bVisualizeNavigationAccessibility;
-    int  navigationDebugAgentType;
-
-    int backgroundUpdatePeriod;
-    const char* g_TemporaryLevelName;
-
-    SSliceSettings sliceSettings;
-
-    bool prefabSystem = true;                  ///< Toggle to enable/disable the Prefab system for level entities.
-
-private:
-    void SaveValue(const char* sSection, const char* sKey, int value);
-    void SaveValue(const char* sSection, const char* sKey, const QColor& value);
-    void SaveValue(const char* sSection, const char* sKey, float value);
-    void SaveValue(const char* sSection, const char* sKey, const QString& value);
-
-    void LoadValue(const char* sSection, const char* sKey, int& value);
-    void LoadValue(const char* sSection, const char* sKey, QColor& value);
-    void LoadValue(const char* sSection, const char* sKey, float& value);
-    void LoadValue(const char* sSection, const char* sKey, bool& value);
-    void LoadValue(const char* sSection, const char* sKey, QString& value);
-    void LoadValue(const char* sSection, const char* sKey, ESystemConfigSpec& value);
-
-    void SaveCloudSettings();
-
-    void SaveSettingsRegistryFile();
-
-    //! Set a boolean setting value from the registry.
-    //! \param key[in] The key to set.
-    //! \param value[in] The new value for the setting.
-    //! \return Whether the value for the key was correctly set in the registry.
-    bool SetSettingsRegistry_Bool(const char* key, bool value);
-
-    //! Gets a boolean setting value from the registry.
-    //! \param key[in] The key to query.
-    //! \param value[out] The variable the queried value will be saved to, by reference.
-    //! \return Whether a value for the key was found in the registry.
-    bool GetSettingsRegistry_Bool(const char* key, bool& value);
-};
-
-//! Single instance of editor settings for fast access.
-SANDBOX_API extern SEditorSettings gSettings;
-
-#endif // CRYINCLUDE_EDITOR_SETTINGS_H
diff --git a/Code/Sandbox/Editor/SettingsManager.cpp b/Code/Sandbox/Editor/SettingsManager.cpp
deleted file mode 100644
index 43291f21eb..0000000000
--- a/Code/Sandbox/Editor/SettingsManager.cpp
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SettingsManager.h"
-
-// Qt
-#include <QDateTime>
-
-// Editor
-#include "Settings.h"
-#include "MainWindow.h"
-#include "ToolBox.h"
-#include "QtViewPaneManager.h"
-
-
-#define TOOLBOX_FILE "ToolBox.xml"
-#define TOOLBOX_NODE "ToolBox"
-
-CSettingsManager::CSettingsManager(EditorSettingsManagerType managerType)
-{
-    if (managerType < eSettingsManagerLast)
-    {
-        m_managerType = managerType;
-    }
-    else
-    {
-        managerType = eSettingsManagerMemoryStorage;
-    }
-
-    if (m_managerType == eSettingsManagerMemoryStorage)
-    {
-        m_pSettingsManagerMemoryNode = XmlHelpers::CreateXmlNode(EDITOR_SETTINGS_ROOT_NODE);
-    }
-
-    // Main frame layouts must be processed as first
-    AddToolName(QStringLiteral(MAINFRM_LAYOUT_NORMAL), QStringLiteral("Sandbox Layout"));
-    AddToolName(QStringLiteral(MAINFRM_LAYOUT_PREVIEW), QStringLiteral("Sandbox Preview Layout"));
-
-    CreateDefaultLayoutSettingsFile();
-
-    QDateTime theTime = QDateTime::currentDateTimeUtc();
-    SaveLogEventSetting("EditorStart", "time", theTime.toString(LOG_DATETIME_FORMAT));
-}
-
-CSettingsManager::~CSettingsManager()
-{
-}
-
-void CSettingsManager::SaveLayoutSettings(const QByteArray& layout, const QString& toolName)
-{
-    if (m_managerType == eSettingsManagerMemoryStorage)
-    {
-        XmlNodeRef rootLayoutNode = m_pSettingsManagerMemoryNode->findChild(EDITOR_LAYOUT_ROOT_NODE);
-        if (rootLayoutNode)
-        {
-            XmlNodeRef xmlDockingLayoutNode = rootLayoutNode->findChild(EDITOR_LAYOUT_NODE);
-
-            if (!xmlDockingLayoutNode)
-            {
-                return;
-            }
-
-            XmlNodeRef toolNode = xmlDockingLayoutNode->findChild(toolName.toUtf8().data());
-
-            if (toolNode)
-            {
-                xmlDockingLayoutNode->removeChild(toolNode);
-            }
-
-            toolNode = XmlHelpers::CreateXmlNode(toolName.toUtf8().data());
-            xmlDockingLayoutNode->addChild(toolNode);
-
-            XmlNodeRef windowStateNode = XmlHelpers::CreateXmlNode("WindowState");
-            toolNode->addChild(windowStateNode);
-
-            windowStateNode->setContent(layout.toHex().data());
-        }
-    }
-}
-
-bool CSettingsManager::CreateDefaultLayoutSettingsFile()
-{
-    XmlNodeRef pLayoutRootNode = XmlHelpers::CreateXmlNode(EDITOR_LAYOUT_ROOT_NODE);
-    XmlNodeRef pEditorLayoutNode = XmlHelpers::CreateXmlNode(EDITOR_LAYOUT_NODE);
-
-    pLayoutRootNode->addChild(pEditorLayoutNode);
-
-    if (m_pSettingsManagerMemoryNode->findChild(EDITOR_LAYOUT_ROOT_NODE))
-    {
-        m_pSettingsManagerMemoryNode->removeChild(m_pSettingsManagerMemoryNode->findChild(EDITOR_LAYOUT_ROOT_NODE));
-    }
-
-    m_pSettingsManagerMemoryNode->addChild(pLayoutRootNode);
-
-    return true;
-}
-
-AZStd::vector<AZStd::string> CSettingsManager::BuildSettingsList()
-{
-    XmlNodeRef root = NULL;
-
-    root = m_pSettingsManagerMemoryNode;
-
-    XmlNodeRef tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
-    if (!tmpNode)
-    {
-        root->addChild(root->createNode(EDITOR_SETTINGS_CONTENT_NODE));
-        tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
-
-        if (!tmpNode)
-        {
-            AZ_Warning("Settings Manager", false, "Failed to build the settings list - could not find the root xml node.");
-            return AZStd::vector<AZStd::string>();
-        }
-    }
-
-    AZStd::vector<AZStd::string> result;
-    BuildSettingsList_Helper(tmpNode, "", result);
-
-    return result;
-}
-
-void CSettingsManager::BuildSettingsList_Helper(const XmlNodeRef& node, const AZStd::string_view& pathToNode, AZStd::vector<AZStd::string>& result)
-{
-    for (int i = 0; i < node->getNumAttributes(); ++i)
-    {
-        const char* key = NULL;
-        const char* value = NULL;
-        node->getAttributeByIndex(i, &key, &value);
-        if (!pathToNode.empty())
-        {
-            result.push_back(AZStd::string(pathToNode));
-        }
-    }
-
-    if (node->getChildCount() > 0)
-    {
-        // Explore Children
-        int numChildren = node->getChildCount();
-        for (int i = 0; i < numChildren; ++i)
-        {
-            if (pathToNode.empty())
-            {
-                BuildSettingsList_Helper(
-                    node->getChild(i),
-                    node->getChild(i)->getTag(),
-                    result
-                );
-            }
-            else
-            {
-                BuildSettingsList_Helper(
-                    node->getChild(i),
-                    AZStd::string(pathToNode) + "|" + node->getChild(i)->getTag(),
-                    result
-                );
-            }
-            
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSettingsManager::SaveSetting(const QString& path, const QString& attr, const QString& val)
-{
-    QStringList strNodes;
-
-    QString fixedPath = path;
-
-    // Make sure it ends with "\" before extraction of tokens
-    QString slashChar = fixedPath.right(fixedPath.length() - 1);
-
-    if (slashChar != "\\")
-    {
-        fixedPath += "\\";
-    }
-
-    Path::GetDirectoryQueue(fixedPath, strNodes);
-
-    QString writeAttr = attr;
-
-    // Spaces in node names not allowed
-    writeAttr.replace(" ", "");
-
-    XmlNodeRef root = NULL;
-
-    root = m_pSettingsManagerMemoryNode;
-
-    XmlNodeRef tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
-    if (!tmpNode)
-    {
-        root->addChild(root->createNode(EDITOR_SETTINGS_CONTENT_NODE));
-        tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
-
-        if (!tmpNode)
-        {
-            return;
-        }
-    }
-
-    for (int i = 0; i < strNodes.size(); ++i)
-    {
-        if (!tmpNode->findChild(strNodes[i].toUtf8().data()))
-        {
-            tmpNode->addChild(tmpNode->createNode(strNodes[i].toUtf8().data()));
-            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
-        }
-        else
-        {
-            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
-        }
-    }
-
-    if (!tmpNode->findChild(writeAttr.toUtf8().data()))
-    {
-        tmpNode->addChild(tmpNode->createNode(writeAttr.toUtf8().data()));
-        tmpNode = tmpNode->findChild(writeAttr.toUtf8().data());
-    }
-    else
-    {
-        tmpNode = tmpNode->findChild(writeAttr.toUtf8().data());
-    }
-
-    if (!tmpNode)
-    {
-        return;
-    }
-
-    tmpNode->setAttr(EDITOR_SETTINGS_ATTRIB_NAME, val.toUtf8().data());
-}
-
-void CSettingsManager::SaveSetting(const QString& path, const QString& attr, bool bVal)
-{
-    SaveSetting(path, attr, QString ::number(bVal));
-}
-
-void CSettingsManager::SaveSetting(const QString& path, const QString& attr, float fVal)
-{
-    SaveSetting(path, attr, QString::number(fVal));
-}
-
-void CSettingsManager::SaveSetting(const QString& path, const QString& attr, int iVal)
-{
-    SaveSetting(path, attr, QString::number(iVal));
-}
-
-void CSettingsManager::SaveSetting(const QString& path, const QString& attr, QColor color)
-{
-    SaveSetting(path, attr, color.name());
-}
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CSettingsManager::LoadSetting(const QString& path, const QString& attr, QString& val)
-{
-    // Make sure it ends with "\" before extraction of tokens
-    QString fixedPath = path;
-    QString slashChar = fixedPath.right(fixedPath.length() - 1);
-
-    if (slashChar != "\\")
-    {
-        fixedPath += "\\";
-    }
-
-    QStringList strNodes;
-    Path::GetDirectoryQueue(fixedPath, strNodes);
-    QString readAttr = attr;
-
-    // Spaces in node names not allowed
-    readAttr.replace(" ", "");
-
-    XmlNodeRef root = NULL;
-
-    root = m_pSettingsManagerMemoryNode;
-
-    XmlNodeRef tmpNode = NULL;
-
-    if (NeedSettingsNode(path))
-    {
-        tmpNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
-    }
-    else
-    {
-        tmpNode = root;
-    }
-
-    if (!tmpNode)
-    {
-        return 0;
-    }
-
-    for (int i = 0; i < strNodes.size(); ++i)
-    {
-        if (tmpNode->findChild(strNodes[i].toUtf8().data()))
-        {
-            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    if (!tmpNode->findChild(readAttr.toUtf8().data()))
-    {
-        return 0;
-    }
-    else
-    {
-        tmpNode = tmpNode->findChild(readAttr.toUtf8().data());
-    }
-
-    if (tmpNode->haveAttr(EDITOR_SETTINGS_ATTRIB_NAME))
-    {
-        tmpNode->getAttr(EDITOR_SETTINGS_ATTRIB_NAME, val);
-    }
-
-    return tmpNode;
-}
-
-void CSettingsManager::LoadSetting(const QString& path, const QString& attr, bool& bVal)
-{
-    QString defaultVal = QString::number(bVal);
-    LoadSetting(path, attr, defaultVal);
-    bVal = defaultVal.toInt() != 0;
-}
-
-void CSettingsManager::LoadSetting(const QString& path, const QString& attr, int& iVal)
-{
-    QString defaultVal = QString::number(iVal);
-    LoadSetting(path, attr, defaultVal);
-    iVal = defaultVal.toInt();
-}
-
-void CSettingsManager::LoadSetting(const QString& path, const QString& attr, float& fVal)
-{
-    QString defaultVal = QString::number(fVal, 'g');
-    LoadSetting(path, attr, defaultVal);
-    fVal = defaultVal.toFloat();
-}
-
-void CSettingsManager::LoadSetting(const QString& path, const QString& attr, QColor &val)
-{
-    QString defaultVal = val.name();
-    LoadSetting(path, attr, defaultVal);
-    val = QColor(defaultVal);
-}
-
-void CSettingsManager::AddToolVersion(const QString& toolName, const QString& toolVersion)
-{
-    if (toolName.isEmpty())
-    {
-        return;
-    }
-
-    if (stl::find_in_map(m_toolNames, toolName, NULL) == "")
-    {
-        if (!toolVersion.isEmpty())
-        {
-            m_toolVersions[toolName] = toolVersion;
-        }
-        else
-        {
-            m_toolVersions[toolName] = "";
-        }
-    }
-};
-
-void CSettingsManager::AddToolName(const QString& toolName, const QString& humanReadableName)
-{
-    if (toolName == "")
-    {
-        return;
-    }
-
-    if (stl::find_in_map(m_toolNames, toolName, NULL) == "")
-    {
-        if (!humanReadableName.isEmpty())
-        {
-            m_toolNames[toolName] = humanReadableName;
-        }
-        else
-        {
-            m_toolNames[toolName] = toolName;
-        }
-    }
-};
-
-void CSettingsManager::AddSettingsNode(XmlNodeRef newNode)
-{
-    QString nodeStr = newNode->getTag();
-
-    XmlNodeRef oldNode = m_pSettingsManagerMemoryNode->findChild(nodeStr.toUtf8().data());
-
-    if (oldNode)
-    {
-        m_pSettingsManagerMemoryNode->removeChild(oldNode);
-    }
-
-    m_pSettingsManagerMemoryNode->addChild(newNode);
-}
-
-void CSettingsManager::ExportSettings(XmlNodeRef exportNode, QString fileName)
-{
-    exportNode->saveToFile(fileName.toUtf8().data());
-}
-
-void CSettingsManager::Export()
-{
-    // Feed in-memory node of CSettingsManager with global Sandbox settings
-    gSettings.Load();
-
-    if (m_ExportFilePath.isEmpty())
-    {
-        return;
-    }
-
-    // Update to the latest layout
-    UpdateLayoutNode();
-
-    // Save CVars
-    SerializeCVars(m_pSettingsManagerMemoryNode, false);
-
-    m_pSettingsManagerMemoryNode->saveToFile(m_ExportFilePath.toUtf8().data());
-
-    GetIEditor()->SetStatusText("Export Successful");
-}
-
-void CSettingsManager::UpdateLayoutNode()
-{
-    QtViewPaneManager::instance()->SaveLayout();
-
-    XmlNodeRef rootLayoutNode = m_pSettingsManagerMemoryNode->findChild(EDITOR_LAYOUT_ROOT_NODE);
-    if (!rootLayoutNode)
-    {
-        return;
-    }
-
-    XmlNodeRef xmlDockingLayoutNode = rootLayoutNode->findChild(EDITOR_LAYOUT_NODE);
-    if (!xmlDockingLayoutNode)
-    {
-        return;
-    }
-
-    xmlDockingLayoutNode->removeAllChilds();
-
-    // serialize layout for main window
-
-    XmlNodeRef xmlMainFrameLayoutNode = XmlHelpers::CreateXmlNode(MAINFRM_LAYOUT_NORMAL);
-    xmlDockingLayoutNode->addChild(xmlMainFrameLayoutNode);
-
-    QtViewPaneManager::instance()->SerializeLayout(xmlMainFrameLayoutNode);
-
-    // serialize layout for panes
-
-    TToolNamesMap::const_iterator tIt;
-    for (tIt = m_toolNames.begin(); tIt != m_toolNames.end(); ++tIt)
-    {
-        const QString& toolName = tIt->first;
-
-        QMainWindow* pane = FindViewPane<QMainWindow>(tIt->second);
-        if (pane)
-        {
-            SaveLayoutSettings(pane->saveState(), toolName);
-        }
-    }
-}
-
-void CSettingsManager::GetMatchingLayoutNames(TToolNamesMap& foundTools, XmlNodeRef& resultNode, QString file)
-{
-    // Need to populate in-memory node with available layouts.
-    UpdateLayoutNode();
-
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(file.toUtf8().data());
-
-    if (!root)
-    {
-        return;
-    }
-
-    root = root->findChild(EDITOR_LAYOUT_ROOT_NODE);
-
-    if (!root)
-    {
-        return;
-    }
-
-    root = root->findChild(EDITOR_LAYOUT_NODE);
-
-    if (!root)
-    {
-        return;
-    }
-
-    TToolNamesMap* toolNames = NULL;
-
-    if (!foundTools.empty())
-    {
-        toolNames = &foundTools;
-    }
-    else
-    {
-        toolNames = GetToolNames();
-    }
-
-    if (!toolNames)
-    {
-        return;
-    }
-
-    if (toolNames->empty())
-    {
-        return;
-    }
-
-    // toolIT->first is tool layout node name in XML file
-    TToolNamesMap::const_iterator toolIT = toolNames->begin();
-
-    for (; toolIT != toolNames->end(); ++toolIT)
-    {
-        if (root->findChild(toolIT->first.toUtf8().data()))
-        {
-            foundTools[toolIT->first] = toolIT->second;
-
-            if (resultNode)
-            {
-                resultNode->addChild(root->findChild(toolIT->first.toUtf8().data()));
-            }
-        }
-    }
-}
-
-void CSettingsManager::ImportSettings(QString file)
-{
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(file.toUtf8().data());
-
-    if (!root)
-    {
-        return;
-    }
-
-    XmlNodeRef importedSettingsContentNode = root->findChild(EDITOR_SETTINGS_CONTENT_NODE);
-
-    if (!importedSettingsContentNode)
-    {
-        return;
-    }
-
-    // Remove old settings node
-    XmlNodeRef oldSettingsContentNode = m_pSettingsManagerMemoryNode->findChild(EDITOR_SETTINGS_CONTENT_NODE);
-    m_pSettingsManagerMemoryNode->removeChild(oldSettingsContentNode);
-
-    // Add new, imported settings node
-    m_pSettingsManagerMemoryNode->addChild(importedSettingsContentNode);
-
-    // Force global settings to reload from memory node instead of registry
-    gSettings.bSettingsManagerMode = true;
-    gSettings.Load();
-    gSettings.bSettingsManagerMode = false;
-
-    // Dump ToolBox node on disk, replacing the old one
-    XmlNodeRef toolBoxNode =  root->findChild(TOOLBOX_NODE);
-    if (toolBoxNode)
-    {
-        toolBoxNode->saveToFile(TOOLBOX_FILE);
-    }
-
-    // Dump UserTools node on disk, replacing the old one
-    XmlNodeRef userToolsNode =  root->findChild(TOOLBOXMACROS_NODE);
-
-    if (userToolsNode)
-    {
-        QString macroFilePath;
-        GetIEditor()->GetToolBoxManager()->GetSaveFilePath(macroFilePath);
-        userToolsNode->saveToFile(macroFilePath.toUtf8().data());
-        GetIEditor()->GetToolBoxManager()->Load();
-    }
-
-    // Get and update CVars
-    SerializeCVars(root, true);
-
-    GetIEditor()->SetStatusText("Import Successful");
-}
-
-bool CSettingsManager::NeedSettingsNode(const QString& path)
-{
-    if ((path != EDITOR_LAYOUT_ROOT_NODE) && (path != TOOLBOX_NODE) && (path != TOOLBOXMACROS_NODE))
-    {
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
-}
-
-void CSettingsManager::SerializeCVars(XmlNodeRef& node, bool bLoad)
-{
-    int nNumberOfVariables(0);
-    int nCurrentVariable(0);
-    IConsole* piConsole(NULL);
-    ICVar* piVariable(NULL);
-    std::vector<char*>  cszVariableNames;
-
-    char* szKey(NULL);
-    char* szValue(NULL);
-    ICVar* piCVar(NULL);
-
-    piConsole = gEnv->pConsole;
-
-    if (!piConsole)
-    {
-        return;
-    }
-
-    if (bLoad)
-    {
-        XmlNodeRef readNode = NULL;
-        XmlNodeRef inputCVarsNode = node->findChild(CVARS_NODE);
-
-        if (!inputCVarsNode)
-        {
-            return;
-        }
-
-        // Remove Entities with ID`s from the list.
-        for (int childNo = 0; childNo < inputCVarsNode->getChildCount(); ++childNo)
-        {
-            readNode = inputCVarsNode->getChild(childNo);
-
-            for (int i = 0; i < readNode->getNumAttributes(); ++i)
-            {
-                readNode->getAttributeByIndex(i, (const char**)&szKey, (const char**)&szValue);
-                piCVar = piConsole->GetCVar(szKey);
-                if (!piCVar)
-                {
-                    continue;
-                }
-                piCVar->Set(szValue);
-            }
-        }
-    }
-    else
-    {
-        XmlNodeRef newCVarNode = NULL;
-        XmlNodeRef oldCVarsNode = node->findChild(CVARS_NODE);
-
-        if (oldCVarsNode)
-        {
-            node->removeChild(oldCVarsNode);
-        }
-
-        XmlNodeRef cvarsNode = XmlHelpers::CreateXmlNode(CVARS_NODE);
-
-        nNumberOfVariables = piConsole->GetNumVisibleVars();
-        cszVariableNames.resize(nNumberOfVariables, NULL);
-
-        if (piConsole->GetSortedVars((const char**)&cszVariableNames.front(), nNumberOfVariables, NULL) != nNumberOfVariables)
-        {
-            assert(false);
-            return;
-        }
-
-        for (nCurrentVariable = 0; nCurrentVariable < cszVariableNames.size(); ++nCurrentVariable)
-        {
-            if (_stricmp(cszVariableNames[nCurrentVariable], "_TestFormatMessage") == 0)
-            {
-                continue;
-            }
-
-            piVariable = piConsole->GetCVar(cszVariableNames[nCurrentVariable]);
-            if (!piVariable)
-            {
-                assert(false);
-                continue;
-            }
-
-            newCVarNode = XmlHelpers::CreateXmlNode(CVAR_NODE);
-            newCVarNode->setAttr(cszVariableNames[nCurrentVariable], piVariable->GetString());
-            cvarsNode->addChild(newCVarNode);
-        }
-
-        node->addChild(cvarsNode);
-    }
-}
-
-void CSettingsManager::ReadValueStr(XmlNodeRef& sourceNode, const QString& path, const QString& attr, QString& val)
-{
-    // Make sure the path has "\" at the end
-    QString fixedPath = path;
-
-    // Make sure it ends with "\" before extraction of tokens
-    QString slashChar = fixedPath.right(fixedPath.length() - 1);
-
-    if (slashChar != "\\")
-    {
-        fixedPath += "\\";
-    }
-
-    QStringList strNodes;
-    Path::GetDirectoryQueue(fixedPath, strNodes);
-    QString readAttr = attr;
-
-    // Spaces in node names not allowed
-    readAttr.replace(" ", "");
-
-    XmlNodeRef root = NULL;
-    XmlNodeRef tmpNode = NULL;
-
-    if (NeedSettingsNode(path))
-    {
-        tmpNode = sourceNode->findChild(EDITOR_SETTINGS_CONTENT_NODE);
-    }
-    else
-    {
-        tmpNode = sourceNode;
-    }
-
-    if (!tmpNode)
-    {
-        return;
-    }
-
-    for (int i = 0; i < strNodes.size(); ++i)
-    {
-        if (tmpNode->findChild(strNodes[i].toUtf8().data()))
-        {
-            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    if (!tmpNode->findChild(readAttr.toUtf8().data()))
-    {
-        return;
-    }
-    else
-    {
-        tmpNode = tmpNode->findChild(readAttr.toUtf8().data());
-    }
-
-    if (tmpNode->haveAttr(EDITOR_SETTINGS_ATTRIB_NAME))
-    {
-        tmpNode->getAttr(EDITOR_SETTINGS_ATTRIB_NAME, val);
-    }
-
-    return;
-}
-
-void CSettingsManager::RegisterEvent(const SEventLog& event)
-{
-    if (event.m_eventName.isEmpty())
-    {
-        return;
-    }
-
-    QString eventName = event.m_eventName;
-
-    QString path(eventName);
-    path.replace(" ", "");
-    SaveLogEventSetting(path, EVENT_LOG_EVENT_NAME, event.m_eventName);
-    QString subPath = path + "\\" + EVENT_LOG_EVENT_NAME;
-
-    SaveLogEventSetting(subPath, EVENT_LOG_CALLER_VERSION, event.m_callerVersion);
-    SaveLogEventSetting(subPath, "state", event.m_eventState);
-
-    QDateTime theTime = QDateTime::currentDateTimeUtc();
-    SaveLogEventSetting(subPath, "time", theTime.toString(LOG_DATETIME_FORMAT));
-}
-
-void CSettingsManager::UnregisterEvent(const SEventLog& event)
-{
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(EDITOR_EVENT_LOG_FILE_PATH);
-
-    if (!root)
-    {
-        return;
-    }
-
-    QString eventName = event.m_eventName;
-
-    QString path(eventName);
-    path.replace(" ", "");
-    QString subPath = path + "\\" + EVENT_LOG_EVENT_NAME;
-
-    XmlNodeRef resNode = LoadLogEventSetting(subPath, EDITOR_EVENT_LOG_ATTRIB_NAME, eventName, root);
-    if (!resNode)
-    {
-        return;
-    }
-
-    root->removeChild(resNode->getParent());
-    root->saveToFile(EDITOR_EVENT_LOG_FILE_PATH);
-}
-
-bool CSettingsManager::IsEventSafe(const SEventLog& event)
-{
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(EDITOR_EVENT_LOG_FILE_PATH);
-
-    if (!root)
-    {
-        return TRUE;
-    }
-
-    QString eventName = event.m_eventName;
-
-    QString path(eventName);
-    path += "\\";
-    path += EVENT_LOG_EVENT_NAME;
-    path.replace(" ", "");
-    XmlNodeRef resNode = LoadLogEventSetting(path, EDITOR_EVENT_LOG_ATTRIB_NAME, eventName, root);
-
-    // Log entry not found, so it is safe to start
-    if (!resNode)
-    {
-        return TRUE;
-    }
-
-    XmlNodeRef callerVersion = resNode->findChild(EVENT_LOG_CALLER_VERSION);
-
-    if (callerVersion)
-    {
-        QString callerVersionStr;
-
-        if (callerVersion->haveAttr(EDITOR_EVENT_LOG_ATTRIB_NAME))
-        {
-            callerVersionStr = callerVersion->getAttr(EDITOR_EVENT_LOG_ATTRIB_NAME);
-        }
-
-        if (!callerVersionStr.isEmpty())
-        {
-            if (callerVersionStr != GetToolVersion(eventName))
-            {
-                return TRUE;
-            }
-        }
-
-        // The same version of tool/level found
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CSettingsManager::SaveLogEventSetting(const QString& path, const QString& attr, const QString& val)
-{
-    QStringList strNodes;
-
-    QString fixedPath = path;
-
-    // Make sure it ends with "\" before extraction of tokens
-    QString slashChar = fixedPath.right(fixedPath.length() - 1);
-
-    if (slashChar != "\\")
-    {
-        fixedPath += "\\";
-    }
-
-    Path::GetDirectoryQueue(fixedPath, strNodes);
-
-    QString writeAttr = attr;
-
-    // Simple cleanup of node names - remove all characters except letters, digits,
-    // underscores, colons, periods, and hyphens.
-    // If this ever needs to be 100% compliant, the following rules would need to
-    // be added:
-    // - name must only *start* with a letter or underscore (not a digit, colon, period, or hyphen)
-    // - name must not start with "xml" in any case combination
-    const QRegularExpression xmlNodeCleanupRegex("[^a-zA-Z0-9_:.\\-]*");
-    writeAttr.remove(xmlNodeCleanupRegex);
-    for (auto& node : strNodes)
-    {
-        node.remove(xmlNodeCleanupRegex);
-    }
-
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(EDITOR_EVENT_LOG_FILE_PATH);
-
-    if (!root)
-    {
-        root = XmlHelpers::CreateXmlNode(EDITOR_EVENT_LOG_ROOT_NODE);
-        root->saveToFile(EDITOR_LAYOUT_FILE_PATH);
-    }
-
-    XmlNodeRef tmpNode = root;
-
-    for (int i = 0; i < strNodes.size(); ++i)
-    {
-        if (!tmpNode->findChild(strNodes[i].toUtf8().data()))
-        {
-            tmpNode->addChild(tmpNode->createNode(strNodes[i].toUtf8().data()));
-            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
-        }
-        else
-        {
-            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
-        }
-    }
-
-    if (!tmpNode->findChild(writeAttr.toUtf8().data()))
-    {
-        tmpNode->addChild(tmpNode->createNode(writeAttr.toUtf8().data()));
-        tmpNode = tmpNode->findChild(writeAttr.toUtf8().data());
-    }
-    else
-    {
-        tmpNode = tmpNode->findChild(writeAttr.toUtf8().data());
-    }
-
-    if (!tmpNode)
-    {
-        return;
-    }
-
-    tmpNode->setAttr(EDITOR_EVENT_LOG_ATTRIB_NAME, val.toUtf8().data());
-
-    root->saveToFile(EDITOR_EVENT_LOG_FILE_PATH);
-}
-
-XmlNodeRef CSettingsManager::LoadLogEventSetting(const QString& path, const QString& attr, [[maybe_unused]] QString& val, XmlNodeRef& root)
-{
-    // Make sure it ends with "\" before extraction of tokens
-    QString fixedPath = path;
-    QString slashChar = fixedPath.right(fixedPath.length() - 1);
-
-    if (slashChar != "\\")
-    {
-        fixedPath += "\\";
-    }
-
-    QStringList strNodes;
-    Path::GetDirectoryQueue(fixedPath, strNodes);
-    QString readAttr = attr;
-
-    // Spaces in node names not allowed
-    readAttr.replace(" ", "");
-
-    if (!root)
-    {
-        return 0;
-    }
-
-    XmlNodeRef tmpNode = NULL;
-    tmpNode = root;
-
-    if (!tmpNode)
-    {
-        return 0;
-    }
-
-    for (int i = 0; i < strNodes.size(); ++i)
-    {
-        if (tmpNode->findChild(strNodes[i].toUtf8().data()))
-        {
-            tmpNode = tmpNode->findChild(strNodes[i].toUtf8().data());
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    if (tmpNode->haveAttr(readAttr.toUtf8().data()))
-    {
-        return tmpNode;
-    }
-
-    return 0;
-}
-
-QString CSettingsManager::GenerateContentHash(XmlNodeRef& node, QString sourceName)
-{
-    QString hashStr("");
-
-    if (node->getChildCount() == 0)
-    {
-        return sourceName;
-    }
-
-    uint32 hash = CCrc32::ComputeLowercase(node->getXML(0));
-    hashStr = QString::number(hash);
-
-    return hashStr;
-}
diff --git a/Code/Sandbox/Editor/SettingsManager.h b/Code/Sandbox/Editor/SettingsManager.h
deleted file mode 100644
index 2a85b7566d..0000000000
--- a/Code/Sandbox/Editor/SettingsManager.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_SETTINGSMANAGER_H
-#define CRYINCLUDE_EDITOR_SETTINGSMANAGER_H
-#pragma once
-
-#include <QString>
-
-class QByteArray;
-
-#define EDITOR_LAYOUT_FILE_PATH "@user@/Editor/EditorLayout.xml"
-#define EDITOR_SETTINGS_FILE_PATH "@user@/Editor/EditorSettings.xml"
-#define EDITOR_LAYOUT_ROOT_NODE "EditorLayout"
-#define EDITOR_SETTINGS_ROOT_NODE "EditorSettings"
-#define EDITOR_SETTINGS_CONTENT_NODE "EditorSettingsContent"
-#define NEED_SETTINGS_VALID_LOOKUP_PATH "Settings"
-#define EDITOR_LAYOUT_NODE "DockingPaneLayouts"
-#define EDITOR_SETTINGS_ATTRIB_NAME "value"
-#define CVARS_NODE "CVars"
-#define CVAR_NODE "CVar"
-
-#define EDITOR_EVENT_LOG_FILE_PATH "@user@/Editor/EditorEventLog.xml"
-#define EDITOR_EVENT_LOG_ROOT_NODE "EventRecorder"
-#define EVENT_LOG_EVENT_NAME "eventName"
-#define EDITOR_EVENT_LOG_ATTRIB_NAME "value"
-#define EVENT_LOG_START "start"
-#define EVENT_LOG_END "end"
-
-#define LOG_DATETIME_FORMAT "MM/dd/yyyy HH:mm:ss"
-
-#define EVENT_LOG_CALLER_VERSION "callerVersion"
-
-enum EditorSettingsManagerType
-{
-    eSettingsManagerMemoryStorage = 0,
-    eSettingsManagerLast
-};
-
-enum EditorSettingsExportType
-{
-    eSettingsManagerExportSettings = 0,
-    eSettingsManagerExportLayout
-};
-
-typedef std::map<QString, QString> TToolNamesMap;
-
-struct SEventLog;
-
-struct SEventLog
-{
-    SEventLog(QString eventName, QString eventState, QString callerVersion = "")
-    {
-        m_eventName = eventName;
-        m_eventState = eventState;
-        m_callerVersion = callerVersion;
-    }
-
-    QString m_eventName;
-    QString m_callerVersion;
-    QString m_eventState;
-};
-
-class CSettingsManager
-{
-public:
-    // eMemoryStorage=0
-    CSettingsManager(EditorSettingsManagerType managerType);
-    ~CSettingsManager();
-
-    // Sandbox Editor events
-    void RegisterEvent(const SEventLog& event);
-    void UnregisterEvent(const SEventLog& event);
-    bool IsEventSafe(const SEventLog& event);
-    QString GenerateContentHash(XmlNodeRef& node, QString sourceName);
-
-    XmlNodeRef LoadLogEventSetting(const QString& path, const QString& attr, QString& val, XmlNodeRef& root);
-    void SaveLogEventSetting(const QString& path, const QString& attr, const QString& val);
-
-    bool CreateDefaultLayoutSettingsFile();
-
-    void SaveLayoutSettings(const QByteArray& layout, const QString& toolName);
-
-    AZStd::vector<AZStd::string> BuildSettingsList();
-    void BuildSettingsList_Helper(const XmlNodeRef& nodeList, const AZStd::string_view& previousPath, AZStd::vector<AZStd::string>& result);
-
-    void LoadSetting(const QString& path, const QString& attr, bool& val);
-    void LoadSetting(const QString& path, const QString& attr, int& iVal);
-    void LoadSetting(const QString& path, const QString& attr, float& fVal);
-    void LoadSetting(const QString& path, const QString& attr, QColor& color);
-    XmlNodeRef LoadSetting(const QString& path, const QString& attr, QString& val);
-
-    void SaveSetting(const QString& path, const QString& attr, bool val);
-    void SaveSetting(const QString& path, const QString& attr, float fVal);
-    void SaveSetting(const QString& path, const QString& attr, int iVal);
-    void SaveSetting(const QString& path, const QString& attr, QColor color);
-    void SaveSetting(const QString& path, const QString& attr, const QString& val);
-
-    void AddSettingsNode(XmlNodeRef newNode);
-
-    void AddToolVersion(const QString& toolName, const QString& toolVersion);
-    QString& GetToolVersion(const QString& sPaneClassName){ return m_toolVersions[sPaneClassName]; };
-
-    void AddToolName(const QString& toolName, const QString& humanReadableName = QString());
-    TToolNamesMap* GetToolNames() { return &m_toolNames; };
-
-    // Test if all tools can be safely opened
-    bool IsToolsOpenSafe();
-
-    void ClearToolNames(){ m_toolNames.clear(); m_toolVersions.clear(); };
-
-    void UpdateLayoutNode();
-
-    void ImportSettings(QString file);
-
-    void ExportSettings(XmlNodeRef exportNode, QString fileName);
-    void Export();
-
-    void GetMatchingLayoutNames(TToolNamesMap& foundTools, XmlNodeRef& resultNode, QString file);
-    bool NeedSettingsNode(const QString& path);
-
-    void SerializeCVars(XmlNodeRef& node, bool bLoad);
-
-    void ReadValueStr(XmlNodeRef& sourceNode, const QString& path, const QString& attr, QString& val);
-
-    void SetExportFileName(QString exportFilePath) { m_ExportFilePath = exportFilePath; };
-
-private:
-    // Save settings to memory or file
-    EditorSettingsManagerType m_managerType;
-
-    // Full path of exported file
-    QString m_ExportFilePath;
-
-    // Node created in memory to be used for exporting editor settings, console-set cvars and layout
-    XmlNodeRef m_pSettingsManagerMemoryNode;
-
-    // Registered Tool Names
-    TToolNamesMap m_toolNames;
-    TToolNamesMap m_toolVersions;
-
-    //static B4BugCrytekExtension s_b4BugCrytekExtension;
-};
-
-#endif // CRYINCLUDE_EDITOR_SETTINGSMANAGER_H
diff --git a/Code/Sandbox/Editor/SettingsManagerDialog.cpp b/Code/Sandbox/Editor/SettingsManagerDialog.cpp
deleted file mode 100644
index de85a2e798..0000000000
--- a/Code/Sandbox/Editor/SettingsManagerDialog.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SettingsManagerDialog.h"
-
-// Qt
-#include <QMessageBox>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-
-// Editor
-#include "SettingsManager.h"
-#include "MainWindow.h"
-#include "QtViewPaneManager.h"
-#include "Util/AutoDirectoryRestoreFileDialog.h"    // for CAutoDirectoryRestoreFileDialog
-#include "LyViewPaneNames.h"                        // for LyViewPane::
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_SettingsManagerDialog.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-//////////////////////////////////////////////////////////////////////////
-CSettingsManagerDialog::CSettingsManagerDialog(QWidget* pParent)
-    : QDialog(pParent)
-    , ui(new Ui::SettingsManagerDialog)
-{
-    ui->setupUi(this);
-
-    ui->m_skipToolsChk->setChecked(false);
-    ui->m_importSettingsChk->setChecked(false);
-
-    connect(ui->m_exportBtn, &QAbstractButton::clicked, this, &CSettingsManagerDialog::OnExportBtnClick);
-    connect(ui->m_readBtn, &QAbstractButton::clicked, this, &CSettingsManagerDialog::OnReadBtnClick);
-    connect(ui->m_importBtn, &QAbstractButton::clicked, this, &CSettingsManagerDialog::OnImportBtnClick);
-    connect(ui->m_closeAllToolsBtn, &QAbstractButton::clicked, this, &CSettingsManagerDialog::OnCloseAllTools);
-}
-
-
-
-CSettingsManagerDialog::~CSettingsManagerDialog()
-{
-}
-
-const GUID& CSettingsManagerDialog::GetClassID()
-{
-    // {64E0B47F-FA9B-46a9-AEF4-BDAC021B5B2F}
-    static const GUID guid =
-    {
-        0x64e0b47f, 0xfa9b, 0x46a9, { 0xae, 0xf4, 0xbd, 0xac, 0x2, 0x1b, 0x5b, 0x2f }
-    };
-
-    return guid;
-}
-
-
-void CSettingsManagerDialog::RegisterViewClass()
-{
-    AzToolsFramework::ViewPaneOptions options;
-    options.paneRect = QRect(5, 100, 210, 505);
-    options.showInMenu = false;
-
-    AzToolsFramework::RegisterViewPane<CSettingsManagerDialog>(LyViewPane::EditorSettingsManager, LyViewPane::CategoryOther, options);
-}
-
-
-void CSettingsManagerDialog::OnReadBtnClick()
-{
-    char szFilters[] = "Editor Settings and Layout File (*.xml);;All files (*)";
-    CAutoDirectoryRestoreFileDialog importFileSelectionDialog(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, "xml", {}, szFilters, {}, {}, this);
-
-    if (importFileSelectionDialog.exec())
-    {
-        m_importFileStr = importFileSelectionDialog.selectedFiles().first();
-
-        ui->m_layoutListBox->clear();
-
-        TToolNamesMap toolNames;
-        XmlNodeRef dummyNode = NULL;
-
-        GetIEditor()->GetSettingsManager()->GetMatchingLayoutNames(toolNames, dummyNode, m_importFileStr);
-
-        if (!toolNames.empty())
-        {
-            TToolNamesMap::const_iterator tIt = toolNames.begin();
-
-            for (; tIt != toolNames.end(); ++tIt)
-            {
-                if (!tIt->second.isEmpty())
-                {
-                    ui->m_layoutListBox->addItem(tIt->second);
-                }
-                else
-                if (!tIt->first.isEmpty())
-                {
-                    ui->m_layoutListBox->addItem(tIt->first);
-                }
-            }
-        }
-
-        ui->m_layoutListBox->selectAll();
-    }
-}
-
-void CSettingsManagerDialog::OnExportBtnClick()
-{
-    char szFilters[] = "Editor Settings and Layout File (*.xml);;All files (*)";
-    CAutoDirectoryRestoreFileDialog exportFileSelectionDialog(QFileDialog::AcceptSave, QFileDialog::AnyFile, "xml", "ExportedEditor.xml", szFilters, {}, {}, this);
-
-    if (exportFileSelectionDialog.exec())
-    {
-        QString file = exportFileSelectionDialog.selectedFiles().first();
-        GetIEditor()->GetSettingsManager()->SetExportFileName(file);
-        QtViewPaneManager::instance()->ClosePane(LyViewPane::EditorSettingsManager);
-        GetIEditor()->GetSettingsManager()->Export();
-    }
-}
-
-void CSettingsManagerDialog::OnImportBtnClick()
-{
-    QString importFileStr = m_importFileStr;
-    bool bImportSettings = ui->m_importSettingsChk->isChecked();
-
-    QString ask = tr("This will close all opened Views. Make sure to save your projects and backup layout before continuing");
-
-    QStringList layouts;
-
-    for (auto& item : ui->m_layoutListBox->selectedItems())
-    {
-        layouts.append(item->text());
-    }
-
-    // Show warning window to the user in case he selects some layouts to import
-    if (!layouts.isEmpty())
-    {
-        if (QMessageBox::question(this, tr("Editor"), ask) != QMessageBox::Yes)
-        {
-            return;
-        }
-    }
-
-    // Import Settings
-    if (bImportSettings)
-    {
-        ImportSettings(importFileStr);
-    }
-
-    QtViewPaneManager::instance()->CloseAllNonStandardPanes();
-
-    // Import layout
-    if (!layouts.isEmpty())
-    {
-        ImportLayouts(importFileStr, layouts);
-    }
-}
-
-void CSettingsManagerDialog::ImportSettings(QString file)
-{
-    if (QFile::exists(file))
-    {
-        GetIEditor()->GetSettingsManager()->ImportSettings(file);
-    }
-}
-
-void CSettingsManagerDialog::ImportLayouts(QString file, const QStringList& layouts)
-{
-    auto viewPaneManager = QtViewPaneManager::instance();
-
-    if (!layouts.isEmpty())
-    {
-        TToolNamesMap& allToolNames = *GetIEditor()->GetSettingsManager()->GetToolNames();
-        if (allToolNames.empty())
-        {
-            return;
-        }
-
-        TToolNamesMap toolNames;
-
-        for (const QString& layoutStr : layouts)
-        {
-            auto it = std::find_if(allToolNames.begin(), allToolNames.end(),
-                            [&](const std::pair<QString, QString>& v)
-                            {
-                                return layoutStr == v.second;
-                            });
-
-            if (it == allToolNames.end())
-            {
-                continue;
-            }
-
-            toolNames.insert(*it);
-        }
-
-        // Remove previous tool node
-        XmlNodeRef layoutNode = XmlHelpers::CreateXmlNode(EDITOR_LAYOUT_NODE);
-
-        // Find in file and add selected tool node
-        GetIEditor()->GetSettingsManager()->GetMatchingLayoutNames(toolNames, layoutNode, file);
-
-        // restore main window layout
-
-        auto it = toolNames.find(QStringLiteral(MAINFRM_LAYOUT_NORMAL));
-        if (it == toolNames.end())
-        {
-            it = toolNames.find(QStringLiteral(MAINFRM_LAYOUT_PREVIEW));
-        }
-
-        if (it != toolNames.end())
-        {
-            const QString& className = it->first;
-
-            XmlNodeRef dockingLayoutNode = layoutNode->findChild(className.toUtf8().data());
-            if (dockingLayoutNode)
-            {
-                viewPaneManager->DeserializeLayout(dockingLayoutNode);
-            }
-        }
-
-        // restore tool panes layouts
-
-        for (it = toolNames.begin(); it != toolNames.end(); ++it)
-        {
-            const QString& className = it->first;
-            const QString& paneName = it->second;
-
-            if (className == QStringLiteral(MAINFRM_LAYOUT_NORMAL) || className == QStringLiteral(MAINFRM_LAYOUT_PREVIEW))
-            {
-                continue;
-            }
-
-            XmlNodeRef dockingLayoutNode = layoutNode->findChild(className.toUtf8().data());
-            if (!dockingLayoutNode)
-            {
-                continue;
-            }
-
-            auto toolPanel = FindViewPane<QMainWindow>(paneName);
-            if (!toolPanel)
-            {
-                continue;
-            }
-
-            XmlNodeRef windowStateNode = dockingLayoutNode->findChild("WindowState");
-            if (windowStateNode)
-            {
-                toolPanel->restoreState(QByteArray::fromHex(windowStateNode->getContent()));
-            }
-        }
-    }
-}
-
-void CSettingsManagerDialog::OnCloseAllTools()
-{
-    auto viewPaneManager = QtViewPaneManager::instance();
-
-    viewPaneManager->CloseAllNonStandardPanes();
-    viewPaneManager->SaveLayout();
-}
-
-#include <moc_SettingsManagerDialog.cpp>
diff --git a/Code/Sandbox/Editor/SettingsManagerDialog.h b/Code/Sandbox/Editor/SettingsManagerDialog.h
deleted file mode 100644
index dd09db112a..0000000000
--- a/Code/Sandbox/Editor/SettingsManagerDialog.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_SETTINGSMANAGERDIALOG_H
-#define CRYINCLUDE_EDITOR_SETTINGSMANAGERDIALOG_H
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QScopedPointer>
-#endif
-
-
-class CSettingsManager;
-
-//////////////////////////////////////////////////////////////////////////
-// Settings Manager Dialog
-
-namespace Ui {
-    class SettingsManagerDialog;
-}
-
-class CSettingsManagerDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CSettingsManagerDialog(QWidget* pParent = nullptr);
-    ~CSettingsManagerDialog();
-
-    static const GUID& GetClassID();
-    static void RegisterViewClass();
-
-protected:
-    void OnReadBtnClick();
-    void OnExportBtnClick();
-    void ImportSettings(QString file);
-    void ImportLayouts(QString file, const QStringList& layouts);
-    void OnImportBtnClick();
-    void OnCloseAllTools();
-
-private:
-    QString m_importFileStr;
-
-    QScopedPointer<Ui::SettingsManagerDialog> ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_SETTINGSMANAGERDIALOG_H
diff --git a/Code/Sandbox/Editor/ShortcutDispatcher.cpp b/Code/Sandbox/Editor/ShortcutDispatcher.cpp
deleted file mode 100644
index 2c8d3114ed..0000000000
--- a/Code/Sandbox/Editor/ShortcutDispatcher.cpp
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ShortcutDispatcher.h"
-
-#include <assert.h>
-
-
-// Qt
-#include <QScopedValueRollback>
-#include <QAction>
-#include <QDockWidget>
-#include <QDebug>
-#include <QMainWindow>
-#include <QMenuBar>
-
-// AzQtComponents
-#include <AzQtComponents/Buses/ShortcutDispatch.h>
-
-// Editor
-#include "ActionManager.h"
-#include "QtViewPaneManager.h"
-
-const char* FOCUSED_VIEW_PANE_EVENT_NAME = "FocusedViewPaneEvent";    //Sent when view panes are focused
-const char* FOCUSED_VIEW_PANE_ATTRIBUTE_NAME = "FocusedViewPaneName"; //Name of the current focused view pane
-
-// Build sets _DEBUG when we're in debug mode; define SHOW_ACTION_INFO_IN_DEBUGGER so that when stepping through the debugger,
-// we can see what the actions are and what their keyboard shortcuts are
-#define SHOW_ACTION_INFO_IN_DEBUGGER _DEBUG
-
-static QPointer<QWidget> s_lastFocus;
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-class MacNativeShortcutFilter : public QObject
-{
-    /* mac's native toolbar doesn't generate shortcut events, it calls the action directly.
-     * It doesn't even honour shortcut contexts.
-     *
-     * To remedy this, we catch the QMetaCallEvent that triggers the menu item activation
-     * and suppress it if it was triggered via key combination, and send a QShortcutEvent.
-     *
-     * The tricky part is to find out if the menu item was triggered via mouse or shortcut.
-     * If the previous event was a ShortcutOverride then it means key press.
-     */
-
-public:
-    explicit MacNativeShortcutFilter(QObject* parent)
-        : QObject(parent)
-        , m_lastShortcutOverride(QEvent::KeyPress, 0, Qt::NoModifier) // dummy init
-    {
-        qApp->installEventFilter(this);
-    }
-
-    bool eventFilter(QObject* watched, QEvent* event) override
-    {
-
-        switch (event->type())
-        {
-            case QEvent::ShortcutOverride:
-            {
-                auto ke = static_cast<QKeyEvent*>(event);
-                m_lastEventWasShortcutOverride = true;
-                m_lastShortcutOverride = QKeyEvent(*ke);
-                break;
-            }
-            case QEvent::MetaCall:
-            {
-                if (m_lastEventWasShortcutOverride)
-                {
-                    m_lastEventWasShortcutOverride = false;
-                    const QMetaObject* mo = watched->metaObject();
-                    const bool isMenuItem = mo && qstrcmp(mo->className(), "QPlatformMenuItem") == 0;
-                    if (isMenuItem)
-                    {
-                        QWidget* focusWidget = ShortcutDispatcher::focusWidget();
-                        if (focusWidget)
-                        {
-                            QShortcutEvent se(QKeySequence(m_lastShortcutOverride.key() + m_lastShortcutOverride.modifiers()), /*ambiguous=*/false);
-                            se.setAccepted(false);
-                            QApplication::sendEvent(focusWidget, &se);
-                            return se.isAccepted();
-                        }
-                    }
-                }
-
-                break;
-            }
-            case QEvent::MouseButtonDblClick:
-            case QEvent::MouseButtonPress:
-            case QEvent::MouseButtonRelease:
-            case QEvent::KeyPress:
-            case QEvent::KeyRelease:
-                m_lastEventWasShortcutOverride = false;
-                break;
-            default:
-                break;
-        }
-
-        return false;
-    }
-
-    bool m_lastEventWasShortcutOverride = false;
-    QKeyEvent m_lastShortcutOverride;
-};
-#endif
-
-// Returns either a top-level or a dock widget (regardless of floating)
-// This way when docking a main window Qt::WindowShortcut still works
-QWidget* ShortcutDispatcher::FindParentScopeRoot(QWidget* widget)
-{
-    QWidget* w = widget;
-    // if the current scope root is a QDockWidget, we want to bubble out
-    // so we move to the parent immediately
-    if (qobject_cast<QDockWidget*>(w) != nullptr || qobject_cast<QMainWindow*>(w) != nullptr)
-    {
-        w = w->parentWidget();
-    }
-
-    QWidget* newScopeRoot = w;
-    while (newScopeRoot && newScopeRoot->parent() && !qobject_cast<QDockWidget*>(newScopeRoot) && !qobject_cast<QMainWindow*>(newScopeRoot))
-    {
-        newScopeRoot = newScopeRoot->parentWidget();
-    }
-
-    // This method should always return a parent scope root; if it can't find one
-    // it returns null
-    if (newScopeRoot == widget)
-    {
-        newScopeRoot = nullptr;
-
-        if (w != nullptr)
-        {
-            // we couldn't find a valid parent; broadcast a message to see if something else wants to tell us about one
-            AzQtComponents::ShortcutDispatchBus::EventResult(newScopeRoot, w, &AzQtComponents::ShortcutDispatchBus::Events::GetShortcutDispatchScopeRoot, w);
-        }
-    }
-
-    return newScopeRoot;
-}
-
-// Returns true if a widget is ancestor of another widget
-bool ShortcutDispatcher::IsAContainerForB(QWidget* a, QWidget* b)
-{
-    if (!a || !b)
-    {
-        return false;
-    }
-
-    while (b && (a != b))
-    {
-        b = b->parentWidget();
-    }
-
-    return (a == b);
-}
-
-// Returns the list of QActions which have this specific key shortcut
-// Only QActions under scopeRoot are considered.
-QList<QAction*> ShortcutDispatcher::FindCandidateActions(QObject* scopeRoot, const QKeySequence& sequence, QSet<QObject*>& previouslyVisited, bool checkVisibility)
-{
-    QList<QAction*> actions;
-    if (!scopeRoot)
-    {
-        return actions;
-    }
-
-    if (previouslyVisited.contains(scopeRoot))
-    {
-        return actions;
-    }
-    previouslyVisited.insert(scopeRoot);
-
-    QWidget* scopeRootWidget = qobject_cast<QWidget*>(scopeRoot);
-    if (scopeRootWidget && ((checkVisibility && !scopeRootWidget->isVisible()) || !scopeRootWidget->isEnabled()))
-    {
-        return actions;
-    }
-
-#ifdef SHOW_ACTION_INFO_IN_DEBUGGER
-    QString matchingAgainst = sequence.toString();
-    (void) matchingAgainst; // avoid an unused variable warning; want this for debugging
-#endif
-
-    // Don't just call scopeRoot->actions()! It doesn't always return the proper list, especially with the dock widgets
-    for (QAction* action : scopeRoot->findChildren<QAction*>(QString(), Qt::FindDirectChildrenOnly))   // Width first
-    {
-#ifdef SHOW_ACTION_INFO_IN_DEBUGGER
-        QString actionName = action->text();
-        (void)actionName; // avoid an unused variable warning; want this for debugging
-        QString shortcut = action->shortcut().toString();
-        (void)shortcut; // avoid an unused variable warning; want this for debugging
-#endif
-
-        if (action->shortcut() == sequence)
-        {
-            actions << action;
-        }
-    }
-
-    // also have to check the actions on the object directly, without looking at children
-    // specifically for the base Editor MainWindow
-    if (scopeRootWidget)
-    {
-        for (QAction* action : scopeRootWidget->actions())
-        {
-#ifdef SHOW_ACTION_INFO_IN_DEBUGGER
-            QString actionName = action->text();
-            (void)actionName; // avoid an unused variable warning; want this for debugging
-            QString shortcut = action->shortcut().toString();
-            (void)shortcut; // avoid an unused variable warning; want this for debugging
-#endif
-
-            if (action->shortcut() == sequence)
-            {
-                actions << action;
-            }
-        }
-    }
-
-    // Menubars have child widgets that have actions
-    // But menu bar child widgets (menu items) are only visible when they've been clicked on
-    // so we don't want to test visibility for child widgets of menubars
-    if (qobject_cast<QMenuBar*>(scopeRoot))
-    {
-        checkVisibility = false;
-    }
-
-    // check the dock's central widget and the main window's
-    // In some cases, they aren't in the scopeRoot's children, despite having the scopeRoot as their parent
-    QDockWidget* dockWidget = qobject_cast<QDockWidget*>(scopeRoot);
-    if (dockWidget)
-    {
-        actions << FindCandidateActions(dockWidget->widget(), sequence, previouslyVisited, checkVisibility);
-    }
-
-    QMainWindow* mainWindow = qobject_cast<QMainWindow*>(scopeRoot);
-    if (mainWindow)
-    {
-        actions << FindCandidateActions(mainWindow->centralWidget(), sequence, previouslyVisited, checkVisibility);
-    }
-
-    for (QWidget* child : scopeRoot->findChildren<QWidget*>(QString(), Qt::FindDirectChildrenOnly))
-    {
-        bool isMenu = (qobject_cast<QMenu*>(child) != nullptr);
-
-        if ((child->windowFlags() & Qt::Window) && !isMenu)
-        {
-            // When going down the hierarchy stop at window boundaries, to not accidentally trigger
-            // shortcuts from unfocused windows. Windows might be parented to this scope for purposes
-            // "centering within parent" or lifetime.
-            // Don't stop at menus though, as they are flagged as Qt::Window but are often the only thing that
-            // actions are attached to.
-            continue;
-        }
-
-        bool isDockWidget = (qobject_cast<QDockWidget*>(child) != nullptr);
-        if ((isDockWidget && !actions.isEmpty()) || IsShortcutSearchBreak(child))
-        {
-            // If we already found a candidate, don't go into dock widgets, they have lower priority
-            // since they are not focused.
-            // Also never go into viewpanes; viewpanes are their own separate shortcut context and they never take shortcuts from the main window
-            continue;
-        }
-
-        actions << FindCandidateActions(child, sequence, previouslyVisited, checkVisibility);
-    }
-
-    return actions;
-}
-
-bool ShortcutDispatcher::FindCandidateActionAndFire(QObject* focusWidget, QShortcutEvent* shortcutEvent, QList<QAction*>& candidates, QSet<QObject*>& previouslyVisited)
-{
-    candidates = FindCandidateActions(focusWidget, shortcutEvent->key(), previouslyVisited);
-    QSet<QAction*> candidateSet = QSet<QAction*>(candidates.begin(), candidates.end());
-    QAction* chosenAction = nullptr;
-    int numCandidates = candidateSet.size();
-    if (numCandidates == 1)
-    {
-        chosenAction = candidates.first();
-    }
-    else if (numCandidates > 1)
-    {
-        // If there are multiple candidates, choose the one that is parented to the ActionManager
-        // since there are cases where panes with their own menu shortcuts that are docked
-        // in the main window can be found in the same parent scope
-        for (QAction* action : candidateSet)
-        {
-            if (qobject_cast<ActionManager*>(action->parent()))
-            {
-                chosenAction = action;
-                break;
-            }
-        }
-    }
-    if (chosenAction)
-    {
-        if (chosenAction->isEnabled())
-        {
-            // has to be send, not post, or the dispatcher will get the event again and won't know that it was the one that queued it
-            bool isAmbiguous = false;
-            QShortcutEvent newEvent(shortcutEvent->key(), isAmbiguous);
-            QApplication::sendEvent(chosenAction, &newEvent);
-        }
-        shortcutEvent->accept();
-        return true;
-    }
-
-    return false;
-}
-
-ShortcutDispatcher::ShortcutDispatcher(QObject* parent)
-    : QObject(parent)
-    , m_currentlyHandlingShortcut(false)
-{
-    qApp->installEventFilter(this);
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    new MacNativeShortcutFilter(this);
-#endif
-}
-
-ShortcutDispatcher::~ShortcutDispatcher()
-{
-}
-
-bool ShortcutDispatcher::eventFilter(QObject* obj, QEvent* ev)
-{
-    switch (ev->type())
-    {
-    case QEvent::ShortcutOverride:
-        // QActions default "autoRepeat" to true, which is not an ideal user experience
-        // We globally disable that behavior here - in the unlikely event a shortcut needs to
-        // replicate it, its owner can instead implement a keyEvent handler
-        if (static_cast<QKeyEvent*>(ev)->isAutoRepeat())
-        {
-            ev->accept();
-            return true;
-        }
-        break;
-
-    case QEvent::Shortcut:
-        return shortcutFilter(obj, static_cast<QShortcutEvent*>(ev));
-        break;
-
-    case QEvent::MouseButtonPress:
-        if (!s_lastFocus || !IsAContainerForB(qobject_cast<QWidget*>(obj), s_lastFocus))
-        {
-            setNewFocus(obj);
-        }
-        break;
-
-    case QEvent::FocusIn:
-        setNewFocus(obj);
-        break;
-
-        // we don't really care about focus out, because something should always have the focus
-        // but I'm leaving this here, so that it's clear that this is intentional
-        //case QEvent::FocusOut:
-        //    break;
-    }
-
-    return false;
-}
-
-QWidget* ShortcutDispatcher::focusWidget()
-{
-    QWidget* focusWidget = s_lastFocus; // check the widget we tracked last
-    if (!focusWidget)
-    {
-        // we don't have anything, so fall back to using the focus object
-        focusWidget = qobject_cast<QWidget*>(qApp->focusObject()); // QApplication::focusWidget() doesn't always work
-    }
-
-    return focusWidget;
-}
-
-bool ShortcutDispatcher::shortcutFilter(QObject* obj, QShortcutEvent* shortcutEvent)
-{
-    if (m_currentlyHandlingShortcut)
-    {
-        return false;
-    }
-
-    QScopedValueRollback<bool> recursiveCheck(m_currentlyHandlingShortcut, true);
-
-    // prioritize m_actionOverrideObject if active
-    if (m_actionOverrideObject != nullptr)
-    {
-        QList<QAction*> childActions =
-            m_actionOverrideObject->findChildren<QAction*>(QString(), Qt::FindDirectChildrenOnly);
-
-        // attempt to find shortcut in override
-        const auto childActionIt = AZStd::find_if(
-            childActions.begin(), childActions.end(), [shortcutEvent](QAction* child)
-        {
-            return child->shortcut() == shortcutEvent->key();
-        });
-
-        // trigger shortcut
-        if (childActionIt != childActions.end())
-        {
-            // has to be send, not post, or the dispatcher will get the event again
-            // and won't know that it was the one that queued it
-            const bool isAmbiguous = false;
-            QShortcutEvent newEvent(shortcutEvent->key(), isAmbiguous);
-
-            QAction* action = *childActionIt;
-            QApplication::sendEvent(action, &newEvent);
-
-            shortcutEvent->accept();
-            return true;
-        }
-    }
-
-    QWidget* currentFocusWidget = focusWidget(); // check the widget we tracked last
-    if (!currentFocusWidget)
-    {
-        qWarning() << Q_FUNC_INFO << "No focus widget"; // Defensive. Doesn't happen.
-        return false;
-    }
-
-    // Shortcut is ambiguous, lets resolve ambiguity and give preference to QActions in the most inner scope
-
-    // Try below the focusWidget first:
-    QSet<QObject*> previouslyVisited;
-    QList<QAction*> candidates;
-    if (FindCandidateActionAndFire(currentFocusWidget, shortcutEvent, candidates, previouslyVisited))    {
-        return true;
-    }
-
-    // Now incrementally try bigger scopes. This handles complex cases several levels docking nesting
-
-    QWidget* correctedTopLevel = nullptr;
-    QWidget* p = currentFocusWidget;
-    correctedTopLevel = FindParentScopeRoot(p);
-    while (correctedTopLevel)
-    {
-        if (FindCandidateActionAndFire(correctedTopLevel, shortcutEvent, candidates, previouslyVisited))
-        {
-            return true;
-        }
-
-        p = correctedTopLevel;
-        correctedTopLevel = FindParentScopeRoot(p);
-    }
-
-
-    // Nothing else to do... shortcut is really ambiguous, or there's no actions, something for the developer to fix.
-    // Here's some debug info :
-
-    if (candidates.isEmpty())
-    {
-        qWarning() << Q_FUNC_INFO << "No candidate QActions found";
-    }
-    else
-    {
-        qWarning() << Q_FUNC_INFO << "Ambiguous shortcut:" << shortcutEvent->key() << "; focusWidget="
-            << qApp->focusWidget() << "Candidates=" << candidates << "; obj = " << obj
-            << "Focused top-level=" << currentFocusWidget;
-        for (auto ambiguousAction : candidates)
-        {
-            qWarning() << "action=" << ambiguousAction << "; action->parentWidget=" << ambiguousAction->parentWidget()
-                << "; associatedWidgets=" << ambiguousAction->associatedWidgets()
-                << "; shortcut=" << ambiguousAction->shortcut();
-        }
-    }
-
-    return false;
-}
-
-void ShortcutDispatcher::setNewFocus(QObject* obj)
-{
-    // Unless every widget has strong focus, mouse clicks don't change the current focus widget
-    // which is a little unintuitive, compared to how we expect focus to work, right now.
-    // So instead of putting strong focus on everything, we detect focus change and mouse clicks
-
-    QWidget* widget = qobject_cast<QWidget*>(obj);
-
-    // we only watch widgets
-    if (widget == nullptr)
-    {
-        return;
-    }
-
-    // track it for later
-    s_lastFocus = widget;
-}
-
-bool ShortcutDispatcher::IsShortcutSearchBreak(QWidget* widget)
-{
-    return widget->property(AzQtComponents::SHORTCUT_DISPATCHER_CONTEXT_BREAK_PROPERTY).toBool();
-}
-
-void ShortcutDispatcher::AttachOverride(QWidget* object)
-{
-    m_actionOverrideObject = object;
-}
-
-void ShortcutDispatcher::DetachOverride()
-{
-    m_actionOverrideObject = nullptr;
-}
-
-#include <moc_ShortcutDispatcher.cpp>
diff --git a/Code/Sandbox/Editor/ShortcutDispatcher.h b/Code/Sandbox/Editor/ShortcutDispatcher.h
deleted file mode 100644
index aa51290743..0000000000
--- a/Code/Sandbox/Editor/ShortcutDispatcher.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef SHORTCUT_DISPATCHER_H
-#define SHORTCUT_DISPATCHER_H
-
-#if !defined(Q_MOC_RUN)
-#include <QObject>
-#endif
-
-template<typename T> class QSet;
-template<typename T> class QList;
-template<typename T> class QPointer;
-
-class QWidget;
-class QShortcutEvent;
-class QKeyEvent;
-
-/* This class provides a workaround against Qt's buggy implementation of shortcut contexts when using dock widgets.
-
-   There are several problems with Qt's implementation:
-
-   - Qt::WindowShortcut doesn't work well with floating docking widgets.
-     Qt gives a warning about ambiguous shortcut even though both actions are in different windows.
-   - A Qt::WindowShortcut in a docked widget will conflict when the widget is embedded (not floating).
-   - Qt::WidgetWithChildrenShortcut doesn't work well on menus since they can't have focus
-     Implement our own conflict resolution and shortcut dispatch.
-     Deliver to the action in the most inner scope, for our purposes a scope is either a window or a dockwidget (regardless of floating)
-
-     Beware that shortcut handling is complex and try not to change this class too much, as it's hard to test
-     and hard to verify all edge cases.
-*/
-
-
-/*
-  More documentation on Qt shortcuts
-  -------------------------------------------
-
-  Here's some more detailed info regarding shortcuts in Qt. Not specific Open 3D Engine but
-  useful as not explained in Qt docs much.
-
-  P.S.: The following text details the strategy used in an earlier Open 3D Engine version. Not sure which
-        shortcut context type it uses nowadays, but eitherway, the following text is educational,
-        and all the traps still exist in current Qt (5.11).
-
-     Some applications have a QMainWindow and also secondary main windows which can dock into the main QMainWindow.
-     All these main windows have menu bars containing actions with shortcuts.
-
-     So, which shortcut context should be used ?
-
-     - Qt::ApplicationShortcut
-       Obviously not, would create conflicting shortcuts and you only want local shortcuts anyway.
-
-     - Qt::WindowShortcut ?
-       This is supposed to only work if the shortcut's parent is in the focused window. However,
-       there a bug with floating dock widgets: doing a key sequence in the dock widget
-       triggers the main QMainWindow's shortcut.
-
-     - Qt::WidgetShortcut
-       docs say: "The shortcut is active when its parent widget has focus"
-       The QAction's parent is a QMenuBar, which doesn't get focus, so this is useless.
-
-     - Qt::WidgetWithChildrenShortcut ?
-       docs say: "The shortcut is active when its parent widget, or any of its children has focus"
-       The QAction's parent is a QMenuBar, which doesn't get focus or has any focused children. Useless.
-
-     - Qt::WidgetWithChildrenShortcut (Round2!)
-       Actually it's not the QAction's parent that counts but the associated widget! (Misleading docs)
-       So if you also add the action to the window, it works:
-       QAction *action = menu->addAction("Del");
-       myWindow->addAction(action); // success!
-
-       Are we happy ?
-       Not yet.
-
-       Qt::WidgetWithChildrenShortcut is working pretty well, but as soon as you dock your secondary QMainWindow into your main QMainWindow we get:
-       "QAction::eventFilter: Ambiguous shortcut overload: Ctrl+O". Some widget inside main window 2 is focused, but it's also a child of main window 1 further up the hierarchy, so both QActions would apply.
-
-       So now what we need is simply a global event filter, catch QEvent::Shortcut, check if shortcut->isAmbiguous(), and if yes dispatch the shortcut
-       manually (sendEvent), otherwise Qt would just bail out. To which QAction you send it to is up to you. I chose to imagine each dock widget was a scope and dispatch the shortcut to the most
-       inner scope that contains the focused widget.
-
-       If you've read this far you can now press 'Ctrl+Q' and hope it closes your editor ;)
- */
-
-class ShortcutDispatcher
-    : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ShortcutDispatcher(QObject* parent = nullptr);
-    ~ShortcutDispatcher();
-    bool eventFilter(QObject* obj, QEvent* ev) override;
-
-    static QWidget* focusWidget();
-
-    /// Assign the widget responsible for getting first attempt
-    /// at every shortcut routed through the ShortcutDispatcher.
-    void AttachOverride(QWidget* object);
-    /// Detach the widget responsible for intercepting Actions
-    /// routed through the ShortcutDispatcher.
-    void DetachOverride();
-
-private:
-    bool shortcutFilter(QObject* obj, QShortcutEvent* ev);
-    void setNewFocus(QObject* obj);
-
-    QWidget* FindParentScopeRoot(QWidget* w);
-    bool IsAContainerForB(QWidget* a, QWidget* b);
-    QList<QAction*> FindCandidateActions(QObject* scopeRoot, const QKeySequence& sequence, QSet<QObject*>& previouslyVisited, bool checkVisibility = true);
-    bool FindCandidateActionAndFire(QObject* focusWidget, QShortcutEvent* shortcutEvent, QList<QAction*>& candidates, QSet<QObject*>& previouslyVisited);
-
-    static bool IsShortcutSearchBreak(QWidget* widget);
-
-    bool m_currentlyHandlingShortcut;
-
-    QString m_previousWidgetName;
-
-    QWidget* m_actionOverrideObject = nullptr; /**< (if set/not null) The widget responsible for getting first attempt
-                                                 *   at every shortcut routed through the ShortcutDispatcher. */
-};
-
-#endif
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.cpp b/Code/Sandbox/Editor/StartupLogoDialog.cpp
deleted file mode 100644
index da7d3308c5..0000000000
--- a/Code/Sandbox/Editor/StartupLogoDialog.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation file
-
-
-#include "EditorDefs.h"
-
-#include "StartupLogoDialog.h"
-
-// Qt
-#include <QPainter>
-#include <QThread>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_StartupLogoDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CStartupLogoDialog dialog
-
-CStartupLogoDialog* CStartupLogoDialog::s_pLogoWindow = 0;
-
-CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent /*=NULL*/)
-    : QWidget(pParent, Qt::Dialog | Qt::FramelessWindowHint)
-    , m_ui(new Ui::StartupLogoDialog)
-{
-    m_ui->setupUi(this);
- 
-    s_pLogoWindow = this;
-
-    m_backgroundImage = QPixmap(QStringLiteral(":/StartupLogoDialog/splashscreen_1_27.png"));
-    setFixedSize(QSize(600, 300));
-
-    // Prepare background image
-    QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_1_27.png"));
-    m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-
-    // Draw the Open 3D Engine logo from svg
-    m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/o3de_logo.svg"));
-
-    m_ui->m_TransparentConfidential->setObjectName("copyrightNotice");
-    m_ui->m_TransparentConfidential->setTextFormat(Qt::RichText);
-    m_ui->m_TransparentConfidential->setText(richTextCopyrightNotice);
-
-    setWindowTitle(tr("Starting Open 3D Engine Editor"));
-
-    setStyleSheet( "CStartupLogoDialog > QLabel { background: transparent; color: 'white' }\
-                    CStartupLogoDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; } ");
-
-    m_ui->m_TransparentVersion->setText(QString("BETA - ") + versionText);
-}
-
-CStartupLogoDialog::~CStartupLogoDialog()
-{
-    s_pLogoWindow = 0;
-}
-
-void CStartupLogoDialog::SetText(const char* text)
-{
-    if (s_pLogoWindow)
-    {
-        s_pLogoWindow->SetInfoText(text);
-    }
-}
-
-void CStartupLogoDialog::SetInfoText(const char* text)
-{
-    m_ui->m_TransparentText->setText(text);
-
-    if (QThread::currentThread() == thread())
-    {
-        m_ui->m_TransparentText->repaint();
-    }
-
-    qApp->processEvents(QEventLoop::ExcludeUserInputEvents);  // if you don't process events, repaint does not function correctly.
-}
-
-void CStartupLogoDialog::paintEvent(QPaintEvent*)
-{
-    QPainter painter(this);
-    painter.drawPixmap(rect(), m_backgroundImage);
-}
-
-#include <moc_StartupLogoDialog.cpp>
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.h b/Code/Sandbox/Editor/StartupLogoDialog.h
deleted file mode 100644
index e3c32cc9aa..0000000000
--- a/Code/Sandbox/Editor/StartupLogoDialog.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <QString>
-#include <QPixmap>
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CStartupLogoDialog dialog
-
-namespace Ui
-{
-    class StartupLogoDialog;
-}
-
-class CStartupLogoDialog
-    : public QWidget
-    , public IInitializeUIInfo
-{
-    Q_OBJECT
-
-public:
-    CStartupLogoDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent = nullptr);   // standard constructor
-    ~CStartupLogoDialog();
-
-    void SetInfoText(const char* text) override;
-
-    // Static way to call SetInfoText on the single instance of CStartupLogoDialog
-    static void SetText(const char* text);
-
-    static CStartupLogoDialog* instance() { return s_pLogoWindow; }
-
-private:
-
-    void SetInfo(const char* text);
-    void paintEvent(QPaintEvent* event) override;
-
-    static CStartupLogoDialog*              s_pLogoWindow;
-
-    QScopedPointer<Ui::StartupLogoDialog>   m_ui;
-
-    QPixmap                                 m_backgroundImage;
-    const int                               m_enforcedWidth = 600;
-    const int                               m_enforcedHeight = 300;
-};
-
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.qrc b/Code/Sandbox/Editor/StartupLogoDialog.qrc
deleted file mode 100644
index 29730ef9c7..0000000000
--- a/Code/Sandbox/Editor/StartupLogoDialog.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/StartupLogoDialog">
-        <file>o3de_logo.svg</file>
-        <file>splashscreen_1_27.png</file>
-    </qresource>
-</RCC>
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.ui b/Code/Sandbox/Editor/StartupLogoDialog.ui
deleted file mode 100644
index 0815fa8b18..0000000000
--- a/Code/Sandbox/Editor/StartupLogoDialog.ui
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>StartupLogoDialog</class>
- <widget class="QWidget" name="StartupLogoDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>600</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="bottomMargin">
-    <number>9</number>
-   </property>
-   <property name="verticalSpacing">
-    <number>10</number>
-   </property>
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="leftMargin">
-        <number>2</number>
-       </property>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_42">
-         <property name="leftMargin">
-          <number>3</number>
-         </property>
-         <property name="topMargin">
-          <number>21</number>
-         </property>
-         <property name="bottomMargin">
-          <number>24</number>
-         </property>
-         <item>
-          <widget class="QSvgWidget" name="m_logo" native="true">
-           <property name="minimumSize">
-            <size>
-             <width>175</width>
-             <height>66</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>175</width>
-             <height>66</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_TransparentVersion">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>290</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>290</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Development version</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>10</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_TransparentText">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>290</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>290</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Starting Editor...</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>36</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Artwork from New World</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>5</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="m_TransparentConfidential">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>240</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>240</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>128</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Specified in the StartupLogoDialog constructor.</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="1" rowspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>260</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>QSvgWidget</class>
-   <extends>QWidget</extends>
-   <header>qsvgwidget.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Code/Sandbox/Editor/StartupTraceHandler.cpp b/Code/Sandbox/Editor/StartupTraceHandler.cpp
deleted file mode 100644
index 77ba96fbee..0000000000
--- a/Code/Sandbox/Editor/StartupTraceHandler.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "StartupTraceHandler.h"
-
-// Qt
-#include <QMessageBox>
-
-// AzCore
-#include <AzCore/Component/TickBus.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-// Editor
-#include "ErrorDialog.h"
-
-
-namespace SandboxEditor
-{
-    StartupTraceHandler::StartupTraceHandler()
-    {
-        ConnectToMessageBus();
-    }
-
-    StartupTraceHandler::~StartupTraceHandler()
-    {
-        EndCollectionAndShowCollectedErrors();
-        DisconnectFromMessageBus();
-    }
-
-    bool StartupTraceHandler::OnPreAssert(const char* fileName, int line, const char* func, const char* message)
-    {
-        // Asserts are more fatal than errors, and need to be displayed right away.
-        // After the assert occurs, nothing else may be functional enough to collect and display messages.
-
-        // Only use Cry message boxes if we aren't using native dialog boxes
-#ifndef USE_AZ_ASSERT
-        if (message == nullptr || message[0] == 0)
-        {
-            AZStd::string emptyText = AZStd::string::format("Assertion failed in %s %s:%i", func, fileName, line);
-            OnMessage(emptyText.c_str(), nullptr, MessageDisplayBehavior::AlwaysShow);
-        }
-        else
-        {
-            OnMessage(message, nullptr, MessageDisplayBehavior::AlwaysShow);
-        }
-#else
-        AZ_UNUSED(fileName);
-        AZ_UNUSED(line);
-        AZ_UNUSED(func);
-        AZ_UNUSED(message);
-#endif // !USE_AZ_ASSERT
-
-        // Return false so other listeners can handle this. The StartupTraceHandler won't report messages
-        // will probably crash before that occurs, because this is an assert.
-        return false;
-    }
-
-    bool StartupTraceHandler::OnException(const char* message)
-    {
-        // Exceptions are more fatal than errors, and need to be displayed right away.
-        // After the exception occurs, nothing else may be functional enough to collect and display messages.
-        OnMessage(message, nullptr, MessageDisplayBehavior::AlwaysShow);
-        // Return false so other listeners can handle this. The StartupTraceHandler won't report messages 
-        // until the next time the main thread updates the system tick bus function queue. The editor 
-        // will probably crash before that occurs, because this is an exception.
-        return false;
-    }
-
-    bool StartupTraceHandler::OnPreError(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* message)
-    {
-        // If a collection is not active, then show this error. Otherwise, collect it 
-        // and show it with other occurs that occured in the operation.
-        return OnMessage(message, &m_errors, MessageDisplayBehavior::ShowWhenNotCollecting);
-    }
-
-    bool StartupTraceHandler::OnPreWarning(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* message)
-    {
-        // Only track warnings if messages are being collected.
-        return OnMessage(message, &m_warnings, MessageDisplayBehavior::OnlyCollect);
-    }
-
-    bool StartupTraceHandler::OnMessage(
-        const char *message,
-        AZStd::list<QString>* messageList,
-        MessageDisplayBehavior messageDisplayBehavior)
-    {
-        if (m_isCollecting && messageList)
-        {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
-            messageList->push_back(QString(message));
-            return true;
-        }
-
-        if ((!m_isCollecting && messageDisplayBehavior == MessageDisplayBehavior::ShowWhenNotCollecting) ||
-            messageDisplayBehavior == MessageDisplayBehavior::AlwaysShow)
-        {
-            ShowMessageBox(message);
-            return true;
-        }
-
-        return false;
-    }
-
-    void StartupTraceHandler::StartCollection()
-    {
-        ConnectToMessageBus();
-        if (m_isCollecting)
-        {
-            EndCollectionAndShowCollectedErrors();
-        }
-        m_isCollecting = true;
-    }
-
-    void StartupTraceHandler::EndCollectionAndShowCollectedErrors()
-    {
-        AZStd::list<QString> cachedWarnings;
-        AZStd::list<QString> cachedErrors;
-        {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
-            m_isCollecting = false;
-            if (m_warnings.size() == 0 && m_errors.size() == 0)
-            {
-                return;
-            }
-            if (m_warnings.size() > 0)
-            {
-                cachedWarnings.splice(cachedWarnings.end(), m_warnings);
-            }
-            if (m_errors.size() > 0)
-            {
-                cachedErrors.splice(cachedErrors.end(), m_errors);
-            }
-        }
-        if (m_showWindow)
-        {
-            AZ::SystemTickBus::QueueFunction([cachedWarnings, cachedErrors]() 
-            {
-                // Parent to the main window, so that the error dialog doesn't
-                // show up as a separate window when alt-tabbing.
-                QWidget* mainWindow = nullptr;
-                AzToolsFramework::EditorRequests::Bus::BroadcastResult(
-                    mainWindow,
-                    &AzToolsFramework::EditorRequests::Bus::Events::GetMainWindow);
-
-                ErrorDialog* errorDialog = new ErrorDialog(mainWindow);
-                errorDialog->AddMessages(
-                    SandboxEditor::ErrorDialog::MessageType::Warning,
-                    cachedWarnings);
-                errorDialog->AddMessages(
-                    SandboxEditor::ErrorDialog::MessageType::Error,
-                    cachedErrors);
-
-                // Use open() instead of exec() here so that we still achieve the modal dialog functionality without
-                // blocking the event queue
-                errorDialog->setAttribute(Qt::WA_DeleteOnClose, true);
-                errorDialog->open();
-            });
-        }
-    }
-
-    void StartupTraceHandler::ShowMessageBox(const QString& message)
-    {
-        AZ::SystemTickBus::QueueFunction([this, message]()
-        {
-            // Parent to the main window, so that the error dialog doesn't
-            // show up as a separate window when alt-tabbing.
-            QWidget* mainWindow = nullptr;
-            AzToolsFramework::EditorRequests::Bus::BroadcastResult(
-                mainWindow,
-                &AzToolsFramework::EditorRequests::Bus::Events::GetMainWindow);
-
-            QMessageBox* msg = new QMessageBox(
-                QMessageBox::Critical, 
-                QObject::tr("Error"), 
-                message, 
-                QMessageBox::Ok,
-                mainWindow);
-            msg->setTextInteractionFlags(Qt::TextSelectableByMouse);
-
-            // Use open() instead of exec() here so that we still achieve the modal dialog functionality without
-            // blocking the event queue
-            msg->setAttribute(Qt::WA_DeleteOnClose, true);
-            msg->open();
-        });
-    }
-
-    void StartupTraceHandler::ConnectToMessageBus()
-    {
-        AZ::Debug::TraceMessageBus::Handler::BusConnect();
-    }
-
-    void StartupTraceHandler::DisconnectFromMessageBus()
-    {
-        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
-    }
-
-    bool StartupTraceHandler::IsConnectedToMessageBus() const
-    {
-        return AZ::Debug::TraceMessageBus::Handler::BusIsConnected();
-    }
-}
diff --git a/Code/Sandbox/Editor/StartupTraceHandler.h b/Code/Sandbox/Editor/StartupTraceHandler.h
deleted file mode 100644
index 53a7745418..0000000000
--- a/Code/Sandbox/Editor/StartupTraceHandler.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Debug/TraceMessageBus.h>
-
-namespace SandboxEditor
-{
-    /// Class to display errors during startup.
-    /// This is a system lifted from CryEdit.cpp and made thread safe.
-    /// It existed to handle errors that occur during editor startup, before
-    /// the regular error handler is loaded and available.
-    class StartupTraceHandler
-        : public AZ::Debug::TraceMessageBus::Handler
-    {
-    public:
-        StartupTraceHandler();
-        ~StartupTraceHandler();
-
-        //////////////////////////////////////////////////////////////////////
-        // AZ::Debug::TraceMessageBus::Handler overrides
-        //////////////////////////////////////////////////////////////////////
-        bool OnPreAssert(const char* fileName, int line, const char* func, const char* message) override;
-        bool OnException(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;
-        
-        //////////////////////////////////////////////////////////////////////
-        // Public interface
-        //////////////////////////////////////////////////////////////////////
-        //! Tells the trace handler to start collecting messages, instead of displaying them as they occur.
-        //! Connects to the message bus to make sure collection can occur.
-        void StartCollection();
-        //! Ends collection, and displays all collected messages in one dialog.
-        void EndCollectionAndShowCollectedErrors();
-        //! @return if any errors occured during level load.
-        bool HasAnyErrors() const { return m_errors.size() > 0; }
-
-        //! Connects the trace handler to the trace message bus.
-        void ConnectToMessageBus();
-        //! Disconnects the trace handler from the trace message bus.
-        void DisconnectFromMessageBus();
-
-        //! @return if the trace handler is connected to the message bus.
-        bool IsConnectedToMessageBus() const;
-
-        //! Sets whether to display the error window or not
-        void SetShowWindow(bool showWindow) { m_showWindow = showWindow; }
-
-    private:
-
-        /// The display behavior for messages.
-        /// Some, like warnings, are only showed in a shared message dialog.
-        /// Others, like Exceptions, are likely fatal and need to be displayed immediately. The program
-        /// state after a fatal error may not be recoverable, so these messages can't be collected
-        /// to be displayed later.
-        enum class MessageDisplayBehavior
-        {
-            AlwaysShow,             ///< Always show this message, when collecting or not collecting messages.
-            ShowWhenNotCollecting,  ///< Only show this message when collecting is not active, otherwise 
-                                    ///< the collection system will show this later.
-            OnlyCollect,            ///< Only collect this message, don't show it if not collecting.
-        };
-
-        // Returns whether or not the message was handled
-        bool OnMessage(
-            const char *message,
-            AZStd::list<QString>* messageList,
-            MessageDisplayBehavior messageDisplayBehavior);
-
-        void ShowMessageBox(const QString& message);
-
-        mutable AZStd::recursive_mutex m_mutex; ///< Messages can come in from multiple threads, so use a mutex to lock things when necessary.
-
-        AZStd::list<QString> m_errors; ///< The list of errors that occured while collecting.
-        AZStd::list<QString> m_warnings; ///< The list of warnings that occured while collecting.
-        bool m_isCollecting = false; ///< Tracks if the trace handler is collecting messages or displaying them as they occur.
-        bool m_showWindow = true; ///< Whether it should display the window
-
-        ///< The list of messages that occured on a thread that can't display a Qt popup.
-        ///< These are intended for 1 at a time popups.
-        AZStd::list<QString> m_mainThreadMessages;
-
-    };
-}
diff --git a/Code/Sandbox/Editor/StringDlg.cpp b/Code/Sandbox/Editor/StringDlg.cpp
deleted file mode 100644
index b0bfeead9b..0000000000
--- a/Code/Sandbox/Editor/StringDlg.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "StringDlg.h"
-
-// Qt
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QVBoxLayout>
-
-
-/////////////////////////////////////////////////////////////////////////////
-// StringDlg dialog
-
-StringDlg::StringDlg(const QString &title, QWidget* pParent, bool bFileNameLimitation)
-    : QInputDialog(pParent)
-    , m_bFileNameLimitation(bFileNameLimitation)
-{
-    setWindowTitle(title);
-    setLabelText("");
-}
-
-void StringDlg::accept()
-{
-    if (m_bFileNameLimitation)
-    {
-        const QString text = textValue();
-        const QString reservedCharacters("<>:\"/\\|?*}");
-        foreach(auto reserv, reservedCharacters)
-        {
-            if (text.contains(reserv))
-            {
-                QMessageBox::warning(this, tr("Warning"), tr(" This string can't contain the following characters: %1").arg(reserv), QMessageBox::Ok);
-                return;
-            }
-        }
-    }
-    if (m_Check && !m_Check(textValue()))
-        return;
-
-    QInputDialog::accept();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-// CMultiLineStringDlg dialog
-StringGroupDlg::StringGroupDlg(const QString &title, QWidget *parent)
-    : QDialog(parent)
-{
-    if (!title.isEmpty())
-        setWindowTitle(title);
-
-    m_group = new QLineEdit(this);
-    m_string = new QLineEdit(this);
-
-    QFrame *horLine = new QFrame(this);
-    horLine->setFrameStyle(QFrame::HLine | QFrame::Plain);
-
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->addWidget(new QLabel(tr("Group"), this));
-    layout->addWidget(m_group);
-    layout->addWidget(new QLabel(tr("Name"), this));
-    layout->addWidget(m_string);
-    layout->addWidget(horLine);
-    layout->addWidget(buttonBox);
-}
-
-void StringGroupDlg::SetString(const QString &str)
-{
-    m_string->setText(str);
-}
-
-QString StringGroupDlg::GetString() const
-{
-    return m_string->text();
-}
-
-void StringGroupDlg::SetGroup(const QString &str)
-{
-    m_group->setText(str);
-}
-
-QString StringGroupDlg::GetGroup() const
-{
-    return m_group->text();
-}
diff --git a/Code/Sandbox/Editor/StringDlg.h b/Code/Sandbox/Editor/StringDlg.h
deleted file mode 100644
index 905b66d3fc..0000000000
--- a/Code/Sandbox/Editor/StringDlg.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_STRINGDLG_H
-#define CRYINCLUDE_EDITOR_STRINGDLG_H
-
-#pragma once
-
-#include <QInputDialog>
-#include <QMessageBox>
-
-/////////////////////////////////////////////////////////////////////////////
-// StringDlg Qt dialog
-
-// return false if error input
-typedef bool (StringDlgPredicate)(QString input);
-
-class StringDlg : public QInputDialog
-{
-public:
-    StringDlg(const QString &title, QWidget* pParent = NULL, bool bFileNameLimitation = false);
-
-    void SetCheckCallback(const std::function<StringDlgPredicate>& Check) {
-        m_Check = Check;
-    }
-    void SetString(const QString &str) {
-        setTextValue(str);
-    }
-    QString GetString() {
-        return textValue();
-    }
-
-protected:
-    virtual void accept();
-    bool m_bFileNameLimitation;
-    std::function<StringDlgPredicate> m_Check;
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-// StringGroupDlg Qt dialog
-class SANDBOX_API StringGroupDlg : public QDialog
-{
-    // Construction
-public:
-    StringGroupDlg(const QString &title = QString(), QWidget *parent = 0);
-
-    void SetString(const QString &str);
-    QString GetString() const;
-
-    void SetGroup(const QString &str);
-    QString GetGroup() const;
-
-protected:
-    QLineEdit *m_string;
-    QLineEdit *m_group;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_STRINGDLG_H
diff --git a/Code/Sandbox/Editor/Style/Editor.qss b/Code/Sandbox/Editor/Style/Editor.qss
deleted file mode 100644
index ded554664c..0000000000
--- a/Code/Sandbox/Editor/Style/Editor.qss
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-ActionWidget #LinkButton
-{
-    qproperty-flat: true;
-}
-
-AzAssetBrowserWindow #previewWidgetWrapper
-{
-    background-color: #323232;
-    border: 0 none;
-}
-
-AzAssetBrowserWindow QSplitter
-{
-    margin-top: 2px;
-}
-
-/* Component Palette Widget */
-AzToolsFramework--ComponentPaletteWidget
-{
-    border: 1px solid #4E4E4E;
-    background-color: #383A3B;
-}
-
-AzToolsFramework--ComponentPaletteWidget > QTreeView
-{
-    background-color: #222222;
-}
-
-AzToolsFramework--PropertyRowWidget[canBeReordered="true"]  QLabel#Name
-{
-    font-weight: bold;
-}
-
-/* Style for visualizing property values overridden from their prefab values */
-AzToolsFramework--PropertyRowWidget[IsOverridden=true] #Name QLabel,
-AzToolsFramework--ComponentEditorHeader #Title[IsOverridden="true"]
-{
-    font-weight: bold;
-    color: #F5A623;
-}
-
-/* Asset Editor */
-Ui--AssetEditorHeader
-{
-    margin: 0px;
-    padding: 0px;
-}
-
-Ui--AssetEditorHeader *
-{
-    height: 16px;
-    background-color: #272727;
-}
-
-Ui--AssetEditorHeader #Background
-{
-    margin: 0px;
-    padding: 2px 7px 3px 7px;
-    border: 1px solid transparent;
-    border-bottom: none;
-    background-image: none;
-    background-color: #272727;
-}
-
-Ui--AssetEditorHeader #Name
-{
-    height: 16px;
-    font: italic;
-    background-color: transparent;
-}
-
-Ui--AssetEditorHeader #Location
-{
-    height: 16px;
-    font: italic;
-    background-color: transparent;
-}
-
-#AssetEditorWidgetPropertyEditor AzToolsFramework--PropertyRowWidget[isTopLevel="true"]
-{
-    qproperty-appendDefaultLabelToName:1;
-}
-
-#AssetEditorWidgetPropertyEditor AzToolsFramework--PropertyRowWidget[isTopLevel="false"]
-{
-    qproperty-appendDefaultLabelToName:0;
-}
-
-#AssetEditorWidgetPropertyEditor AzToolsFramework--PropertyRowWidget[getLevel="1"][hasChildRows="true"]
-{
-    border-top: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-/* Set the Script Canvas search highlight color */
-GraphCanvas--NodePaletteTreeView
-{
-    selection-background-color: rgba(255, 255, 255, 41);
-}
-
-AzQtComponents--TabWidget#ScriptCanvasTabs
-{
-    height: 32px;
-    margin: 0 2px;
-    max-height: 32px;
-}
-
-/* Save Slice Override Window */
-AzToolsFramework--SlicePushWidget QTreeView QLabel
-{
-    min-height: 14px;
-}
-
-AzToolsFramework--SlicePushWidget QWidget#WarningTopLine
-{
-    background-color: #F5A623
-}
-
-AzToolsFramework--SlicePushWidget QWidget#WarningBottomLine
-{
-    background-color: #646464
-}
-
-AzToolsFramework--SlicePushWidget QTreeWidget#WarningTreeWidget::item:pressed
-, AzToolsFramework--SlicePushWidget QTreeWidget#WarningTreeWidget::item:selected
-{
-    background-color: #2D2D2D;
-}
-
-/* Toolbar borders (Editor UI Window) */
-EditorWindow QToolBar
-{
-    border-bottom: 2px solid #111111;
-}
-
-DockWidgetTitleBar #DockWidgetContextMenu
-{
-    qproperty-icon: url(:/Cards/img/UI20/Cards/menu_ico.svg);
-    qproperty-iconSize: 24px 16px;
-    qproperty-flat: true;
-    margin: 0px;
-    max-width: 24px;
-    max-height: 16px;
-}
-
-#EMFX_Menu
-{
-    border-bottom-width: 2px;
-    border-bottom-color: #111111;
-    border-bottom-style: solid;
-}
-
-#EMFX_Menu QComboBox
-{
-    margin-right: 4px;
-    margin-bottom: 2px;
-}
-
-PanelTitleBar
-{
-    border-top: 1px solid #111111;
-}
-
-/* Asset Editor */
-
-#AssetEditorStatusBar
-{
-    border-top: 2px solid #111111;
-}
-
-/* Console and Python Console */
-
-ConsoleTextEdit,
-ConsoleTextEdit:hover,
-ConsoleTextEdit:focus,
-#SCRIPT_OUTPUT,
-#SCRIPT_OUTPUT:hover,
-#SCRIPT_OUTPUT:focus
-{
-    margin: 0;
-    margin-top: 6px;
-    background-color: #222222;
-    border-radius: 0px;
-    border-width: 0px;
-    border-color: #e9e9e9;
-    border-style: solid;
-}
-
-/* Welcome Screen styling */
-
-WelcomeScreenDialog QLabel
-{
-    font-size: 12px;
-    color: #FFFFFF;
-    line-height: 20px;
-    background-color: transparent;
-    margin: 0;
-}
-
-WelcomeScreenDialog QLabel#currentProjectLabel
-{
-    margin-top: 10px;
-}
-
-WelcomeScreenDialog QPushButton
-{
-    font-size: 14px;
-    line-height: 16px;
-}
-
-WelcomeScreenDialog QWidget#articleViewContainerRoot
-{
-    background: #444444;
-}
-
-WelcomeScreenDialog QWidget#levelViewFTUEContainer
-{
-    background: #282828;
-}
-
-QTableWidget#recentLevelTable::item {
-	background-color: rgb(64,64,64);
-	margin-bottom: 4px;
-	margin-top: 4px;
-}
-
-/* Particle Editor */
-
-#NumParticlesLabel
-{
-    margin-top: 6px;
-}
-
-#LibrarySearchIcon
-{
-    max-width: 16px;
-    max-height: 16px;
-    qproperty-iconSize: 16px 16px;
-}
diff --git a/Code/Sandbox/Editor/Style/EditorPreferencesDialog.qss b/Code/Sandbox/Editor/Style/EditorPreferencesDialog.qss
deleted file mode 100644
index a70659c9f9..0000000000
--- a/Code/Sandbox/Editor/Style/EditorPreferencesDialog.qss
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-QWidget#EditorPreferencesDialog
-{
-    margin: 0px;
-    padding: -4px -5px -4px -5px;
-    background-color: #444444;
-    border-color: transparent;
-}
-
-QWidget#EditorPreferencesDialog QTreeWidget#pageTree
-{
-    font-size: 11px;
-    border: 1px solid #111111;
-    background-color: #333333;
-    margin: 0px;
-}
-
-QWidget#EditorPreferencesDialog QTreeWidget#pageTree::item
-{
-    margin-top: 3px;
-    margin-bottom: 2px;
-}
-
-QWidget#EditorPreferencesDialog AzToolsFramework--ReflectedPropertyEditor#propertyEditor
-{
-    background-color: #222222;
-    border: 1px solid #111111;
-    margin: 0px 2px 0px 5px
-}
-
-AzToolsFramework--PropertyRowWidget QLabel#Name
-{
-    color: #eeeeee;
-    padding: 0 0 0 5px;
-}
-
-AzToolsFramework--PropertyRowWidget[HasParent="false"] QLabel#Name
-{
-    font-weight: bold;
-    padding: 0 0 0 5;
-    color: white;
-}
-
-#EditorPreferencesDialog AzToolsFramework--PropertyRowWidget[isTopLevel="true"][hasChildRows="true"]
-{
-    border-bottom: 1px solid rgba(255, 255, 255, 0.2);
-    padding: 4px 0 6px;
-    margin-bottom: 4px;
-}
-
-#EditorPreferencesDialog AzToolsFramework--PropertyRowWidget[isTopLevel="true"][hasChildRows="true"] QLabel#Name
-{
-    font-weight: bold;
-}
diff --git a/Code/Sandbox/Editor/Style/GraphicsSettingsDialog.qss b/Code/Sandbox/Editor/Style/GraphicsSettingsDialog.qss
deleted file mode 100644
index 2bef28766e..0000000000
--- a/Code/Sandbox/Editor/Style/GraphicsSettingsDialog.qss
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#GraphicsSettingsDialog QHeaderView::section
-{
-        background: #2D2D2D;
-}
-
-#GraphicsSettingsDialog QHeaderView::down-arrow
-{
-    width: 14px;
-    height: 14px;
-    image: url(:/Gallery/Delete.svg);
-}
-
-#GraphicsSettingsDialog QHeaderView::up-arrow
-{
-    width: 14px;
-    height: 14px;
-    image: url(:/Gallery/Delete.svg);
-}
diff --git a/Code/Sandbox/Editor/Style/LayoutConfigDialog.qss b/Code/Sandbox/Editor/Style/LayoutConfigDialog.qss
deleted file mode 100644
index 1c79e47451..0000000000
--- a/Code/Sandbox/Editor/Style/LayoutConfigDialog.qss
+++ /dev/null
@@ -1,9 +0,0 @@
-#CLayoutConfigDialog QListView::item
-{
-    padding: 2px 4px;
-}
-
-#CLayoutConfigDialog QListView::item:selected
-{
-    background: #00A1C9;
-}
diff --git a/Code/Sandbox/Editor/SurfaceTypeValidator.cpp b/Code/Sandbox/Editor/SurfaceTypeValidator.cpp
deleted file mode 100644
index be598a14fc..0000000000
--- a/Code/Sandbox/Editor/SurfaceTypeValidator.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SurfaceTypeValidator.h"
-
-// Editor
-#include "Include/IObjectManager.h"
-#include "Objects/BaseObject.h"
-#include "ErrorReport.h"
-
-
-void CSurfaceTypeValidator::Validate()
-{
-}
-
diff --git a/Code/Sandbox/Editor/SurfaceTypeValidator.h b/Code/Sandbox/Editor/SurfaceTypeValidator.h
deleted file mode 100644
index cbfb6aa847..0000000000
--- a/Code/Sandbox/Editor/SurfaceTypeValidator.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_SURFACETYPEVALIDATOR_H
-#define CRYINCLUDE_EDITOR_SURFACETYPEVALIDATOR_H
-#pragma once
-
-
-
-class CSurfaceTypeValidator
-{
-public:
-    void Validate();
-
-private:
-};
-
-#endif // CRYINCLUDE_EDITOR_SURFACETYPEVALIDATOR_H
diff --git a/Code/Sandbox/Editor/ToolBox.cpp b/Code/Sandbox/Editor/ToolBox.cpp
deleted file mode 100644
index c202e5aa6c..0000000000
--- a/Code/Sandbox/Editor/ToolBox.cpp
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : ToolBox Macro System
-
-
-#include "EditorDefs.h"
-
-#include "ToolBox.h"
-
-#include <AzCore/Utils/Utils.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-// Editor
-#include "Settings.h"
-#include "ActionManager.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// CToolBoxCommand
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxCommand::Save(XmlNodeRef commandNode) const
-{
-    commandNode->setAttr("type", (int)m_type);
-    commandNode->setAttr("text", m_text.toUtf8().data());
-    commandNode->setAttr("bVariableToggle", m_bVariableToggle);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxCommand::Load(XmlNodeRef commandNode)
-{
-    int type = 0;
-    commandNode->getAttr("type", type);
-    m_type = CToolBoxCommand::EType(type);
-    m_text = commandNode->getAttr("text");
-    commandNode->getAttr("bVariableToggle", m_bVariableToggle);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxCommand::Execute() const
-{
-    if (m_type == CToolBoxCommand::eT_SCRIPT_COMMAND)
-    {
-        using namespace AzToolsFramework;
-        EditorPythonRunnerRequestBus::Broadcast(&EditorPythonRunnerRequestBus::Events::ExecuteByString, m_text.toUtf8().data(), false);
-    }
-    else if (m_type == CToolBoxCommand::eT_CONSOLE_COMMAND)
-    {
-        if (m_bVariableToggle)
-        {
-            // Toggle the variable.
-            float val = GetIEditor()->GetConsoleVar(m_text.toUtf8().data());
-            bool bOn = val != 0;
-            GetIEditor()->SetConsoleVar(m_text.toUtf8().data(), (bOn) ? 0 : 1);
-        }
-        else
-        {
-            // does the command required an active Python interpreter?
-            if (m_text.contains("pyRunFile") && !AzToolsFramework::EditorPythonRunnerRequestBus::HasHandlers())
-            {
-                AZ_Warning("toolbar", false, "The command '%s' requires an embedded Python interpreter. "
-                                             "The gem named EditorPythonBindings offers this service. "
-                                             "Please enable this gem for the project.", m_text.toUtf8().data());
-                return;
-            }
-            GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(m_text.toUtf8().data());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CToolBoxMacro
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxMacro::Save(XmlNodeRef macroNode) const
-{
-    for (size_t i = 0; i < m_commands.size(); ++i)
-    {
-        XmlNodeRef commandNode = macroNode->newChild("command");
-        m_commands[i]->Save(commandNode);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxMacro::Load(XmlNodeRef macroNode)
-{
-    for (int i = 0; i < macroNode->getChildCount(); ++i)
-    {
-        XmlNodeRef commandNode = macroNode->getChild(i);
-        m_commands.push_back(new CToolBoxCommand);
-        m_commands[i]->Load(commandNode);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxMacro::AddCommand(CToolBoxCommand::EType type, const QString& command, bool bVariableToggle)
-{
-    CToolBoxCommand* pNewCommand = new CToolBoxCommand;
-    pNewCommand->m_type = type;
-    pNewCommand->m_text = command;
-    pNewCommand->m_bVariableToggle = bVariableToggle;
-    m_commands.push_back(pNewCommand);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxMacro::Clear()
-{
-    for (size_t i = 0; i < m_commands.size(); ++i)
-    {
-        delete m_commands[i];
-    }
-
-    m_commands.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-const CToolBoxCommand* CToolBoxMacro::GetCommandAt(int index) const
-{
-    assert(0 <= index && index < m_commands.size());
-
-    return m_commands[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-CToolBoxCommand* CToolBoxMacro::GetCommandAt(int index)
-{
-    assert(0 <= index && index < m_commands.size());
-
-    return m_commands[index];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxMacro::SwapCommand(int index1, int index2)
-{
-    assert(0 <= index1 && index1 < m_commands.size());
-    assert(0 <= index2 && index2 < m_commands.size());
-    std::swap(m_commands[index1], m_commands[index2]);
-}
-
-void CToolBoxMacro::RemoveCommand(int index)
-{
-    assert(0 <= index && index < m_commands.size());
-
-    m_commands.erase(m_commands.begin() + index);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxMacro::Execute() const
-{
-    for (size_t i = 0; i < m_commands.size(); ++i)
-    {
-        m_commands[i]->Execute();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// CToolBoxManager
-//////////////////////////////////////////////////////////////////////////
-int CToolBoxManager::GetMacroCount(bool bToolbox) const
-{
-    if (bToolbox)
-    {
-        return int(m_macros.size());
-    }
-    return int(m_shelveMacros.size());
-}
-
-//////////////////////////////////////////////////////////////////////////
-const CToolBoxMacro* CToolBoxManager::GetMacro(int iIndex, bool bToolbox) const
-{
-    if (bToolbox)
-    {
-        assert(0 <= iIndex && iIndex < m_macros.size());
-        return m_macros[iIndex];
-    }
-    else
-    {
-        assert(0 <= iIndex && iIndex < m_shelveMacros.size());
-        return m_shelveMacros[iIndex];
-    }
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CToolBoxMacro* CToolBoxManager::GetMacro(int iIndex, bool bToolbox)
-{
-    if (bToolbox)
-    {
-        assert(0 <= iIndex && iIndex < m_macros.size());
-        return m_macros[iIndex];
-    }
-    else
-    {
-        assert(0 <= iIndex && iIndex < m_shelveMacros.size());
-        return m_shelveMacros[iIndex];
-    }
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CToolBoxManager::GetMacroIndex(const QString& title, bool bToolbox) const
-{
-    if (bToolbox)
-    {
-        for (size_t i = 0; i < m_macros.size(); ++i)
-        {
-            if (QString::compare(m_macros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
-            {
-                return int(i);
-            }
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < m_shelveMacros.size(); ++i)
-        {
-            if (QString::compare(m_shelveMacros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
-            {
-                return int(i);
-            }
-        }
-    }
-
-    return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CToolBoxMacro* CToolBoxManager::NewMacro(const QString& title, bool bToolbox, int* newIdx)
-{
-    if (bToolbox)
-    {
-        const int macroCount = m_macros.size();
-        if (macroCount > ID_TOOL_LAST - ID_TOOL_FIRST + 1)
-        {
-            return NULL;
-        }
-
-        for (size_t i = 0; i < macroCount; ++i)
-        {
-            if (QString::compare(m_macros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
-            {
-                return NULL;
-            }
-        }
-
-        CToolBoxMacro* pNewTool = new CToolBoxMacro(title);
-        if (newIdx)
-        {
-            *newIdx = macroCount;
-        }
-        m_macros.push_back(pNewTool);
-        return pNewTool;
-    }
-    else
-    {
-        const int shelveMacroCount = m_shelveMacros.size();
-        if (shelveMacroCount > ID_TOOL_SHELVE_LAST - ID_TOOL_SHELVE_FIRST + 1)
-        {
-            return NULL;
-        }
-
-        CToolBoxMacro* pNewTool = new CToolBoxMacro(title);
-        if (newIdx)
-        {
-            *newIdx = shelveMacroCount;
-        }
-        m_shelveMacros.push_back(pNewTool);
-        return pNewTool;
-    }
-    return NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CToolBoxManager::SetMacroTitle(int index, const QString& title, bool bToolbox)
-{
-    if (bToolbox)
-    {
-        assert(0 <= index && index < m_macros.size());
-        for (size_t i = 0; i < m_macros.size(); ++i)
-        {
-            if (i == index)
-            {
-                continue;
-            }
-
-            if (QString::compare(m_macros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
-            {
-                return false;
-            }
-        }
-
-        m_macros[index]->SetTitle(title);
-    }
-    else
-    {
-        assert(0 <= index && index < m_shelveMacros.size());
-        for (size_t i = 0; i < m_shelveMacros.size(); ++i)
-        {
-            if (i == index)
-            {
-                continue;
-            }
-
-            if (QString::compare(m_shelveMacros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
-            {
-                return false;
-            }
-        }
-
-        m_shelveMacros[index]->SetTitle(title);
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::Load(ActionManager* actionManager)
-{
-    Clear();
-
-    QString path;
-    GetSaveFilePath(path);
-    Load(path, nullptr, true, nullptr);
-
-    if (actionManager)
-    {
-        auto engineSourceAssetPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
-        LoadShelves((engineSourceAssetPath / "Editor" / "Scripts").c_str(),
-            (engineSourceAssetPath / "Editor" / "Scripts" / "Shelves").c_str(), actionManager);
-    }
-}
-
-void CToolBoxManager::LoadShelves(QString scriptPath, QString shelvesPath, ActionManager* actionManager)
-{
-    IFileUtil::FileArray files;
-    CFileUtil::ScanDirectory(shelvesPath, "*.xml", files);
-
-    const int shelfCount = files.size();
-    for (int idx = 0; idx < shelfCount; ++idx)
-    {
-        if (Path::GetExt(files[idx].filename) != "xml")
-        {
-            continue;
-        }
-
-        QString shelfName(PathUtil::GetFileName(files[idx].filename.toUtf8().data()));
-
-        AmazonToolbar toolbar(shelfName, shelfName);
-        Load(shelvesPath + QString("/") + files[idx].filename, &toolbar, false, actionManager);
-
-        m_toolbars.push_back(toolbar);
-    }
-}
-
-void CToolBoxManager::Load(QString xmlpath, AmazonToolbar* pToolbar, bool bToolbox, ActionManager* actionManager)
-{
-    XmlNodeRef toolBoxNode = XmlHelpers::LoadXmlFromFile(xmlpath.toUtf8().data());
-    if (toolBoxNode == NULL)
-    {
-        return;
-    }
-
-    if (!pToolbar)
-    {
-        GetIEditor()->GetSettingsManager()->AddSettingsNode(toolBoxNode);
-    }
-    else
-    {
-        const char* PRETTY_NAME_ATTR = "prettyName";
-        const char* SHOW_BY_DEFAULT_ATTR = "showByDefault";
-        const char* SHELF_NAME_ATTR = "shelfName";
-
-        QString shelfName = pToolbar->GetName();
-
-        if (toolBoxNode->haveAttr(SHELF_NAME_ATTR))
-        {
-            shelfName = toolBoxNode->getAttr(SHELF_NAME_ATTR);
-        }
-
-        QString prettyName = shelfName;
-
-        if (toolBoxNode->haveAttr(PRETTY_NAME_ATTR))
-        {
-            prettyName = toolBoxNode->getAttr(PRETTY_NAME_ATTR);
-        }
-
-        pToolbar->SetName(shelfName, prettyName);
-
-        if (toolBoxNode->haveAttr(SHOW_BY_DEFAULT_ATTR))
-        {
-            const char* showByDefaultAttrString = toolBoxNode->getAttr(SHOW_BY_DEFAULT_ATTR);
-
-            QString showByDefaultString = QString(showByDefaultAttrString);
-            showByDefaultString = showByDefaultString.trimmed();
-
-            bool hideByDefault = (QString::compare(showByDefaultString, "false", Qt::CaseInsensitive) == 0) || (QString::compare(showByDefaultString, "0") == 0);
-            pToolbar->SetShowByDefault(!hideByDefault);
-        }
-    }
-
-    AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
-    QDir engineDir = !engineRoot.empty() ? QDir(QString(engineRoot.c_str())) : QDir::current();
-
-    string enginePath = PathUtil::AddSlash(engineDir.absolutePath().toUtf8().data());
-
-    for (int i = 0; i < toolBoxNode->getChildCount(); ++i)
-    {
-        XmlNodeRef macroNode = toolBoxNode->getChild(i);
-        QString title = macroNode->getAttr("title");
-        QString shortcutName = macroNode->getAttr("shortcut");
-        QString iconPath = macroNode->getAttr("icon");
-
-        int idx = -1;
-        CToolBoxMacro* pMacro = NewMacro(title, bToolbox, &idx);
-        if (!pMacro || idx == -1)
-        {
-            continue;
-        }
-
-        pMacro->Load(macroNode);
-        pMacro->SetShortcutName(shortcutName);
-        pMacro->SetIconPath(iconPath.toUtf8().data());
-        pMacro->SetToolbarId(-1);
-
-        if (!pToolbar)
-        {
-            continue;
-        }
-
-        string shelfPath = PathUtil::GetParentDirectory(xmlpath.toUtf8().data());
-        string fullIconPath = enginePath + PathUtil::AddSlash(shelfPath.c_str());
-        fullIconPath.append(iconPath.toUtf8().data());
-
-        pMacro->SetIconPath(fullIconPath);
-
-        QString toolTip(macroNode->getAttr("tooltip"));
-        pMacro->action()->setToolTip(toolTip);
-
-        int actionId;
-
-        if (pMacro->GetCommandCount() == 0 || pMacro->GetCommandAt(0)->m_type == CToolBoxCommand::eT_INVALID_COMMAND)
-        {
-            actionId = ID_TOOLBAR_SEPARATOR;
-        }
-        else
-        {
-            actionId = bToolbox ? ID_TOOL_FIRST + idx : ID_TOOL_SHELVE_FIRST + idx;
-
-            // ActionManager uses a QSignalMapper internally. We need to disconnect any existing
-            // connections here otherwise the macro will be called more than once.
-            QObject::disconnect(pMacro->action(), &QAction::triggered, nullptr, nullptr);
-
-            actionManager->AddAction(actionId, pMacro->action());
-        }
-
-        pToolbar->AddAction(actionId);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::Save() const
-{
-    XmlNodeRef toolBoxNode = XmlHelpers::CreateXmlNode(TOOLBOXMACROS_NODE);
-    for (size_t i = 0; i < m_macros.size(); ++i)
-    {
-        if (m_macros[i]->GetToolbarId() != -1)
-        {
-            continue;
-        }
-
-        XmlNodeRef macroNode = toolBoxNode->newChild("macro");
-        macroNode->setAttr("title", m_macros[i]->GetTitle().toUtf8().data());
-        macroNode->setAttr("shortcut", m_macros[i]->GetShortcutName().toString().toUtf8().data());
-        macroNode->setAttr("icon", m_macros[i]->GetIconPath().toUtf8().data());
-        m_macros[i]->Save(macroNode);
-    }
-    QString path;
-    GetSaveFilePath(path);
-    XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), toolBoxNode, path.toUtf8().data());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::Clear()
-{
-    for (size_t i = 0; i < m_macros.size(); ++i)
-    {
-        delete m_macros[i];
-    }
-    m_macros.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::ExecuteMacro(int iIndex, bool bToolbox) const
-{
-    if (iIndex >= 0 && iIndex < GetMacroCount(bToolbox) && GetMacro(iIndex, bToolbox))
-    {
-        GetMacro(iIndex, bToolbox)->Execute();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::ExecuteMacro(const QString& name, bool bToolbox) const
-{
-    if (bToolbox)
-    {
-        // Find tool with this name.
-        for (size_t i = 0; i < m_macros.size(); ++i)
-        {
-            if (QString::compare(m_macros[i]->GetTitle(), name, Qt::CaseInsensitive) == 0)
-            {
-                ExecuteMacro(int(i), bToolbox);
-                break;
-            }
-        }
-    }
-    else
-    {
-        // Find tool with this name.
-        for (size_t i = 0; i < m_shelveMacros.size(); ++i)
-        {
-            if (QString::compare(m_shelveMacros[i]->GetTitle(), name, Qt::CaseInsensitive) == 0)
-            {
-                ExecuteMacro(int(i), bToolbox);
-                break;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::SwapMacro(int index1, int index2, bool bToolbox)
-{
-    assert(0 <= index1 && index1 < GetMacroCount(bToolbox));
-    assert(0 <= index2 && index2 < GetMacroCount(bToolbox));
-    if (bToolbox)
-    {
-        std::swap(m_macros[index1], m_macros[index2]);
-    }
-    else
-    {
-        std::swap(m_shelveMacros[index1], m_shelveMacros[index2]);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::RemoveMacro(int index, bool bToolbox)
-{
-    assert(0 <= index && index < GetMacroCount(bToolbox));
-
-    if (bToolbox)
-    {
-        delete m_macros[index];
-        m_macros[index] = nullptr;
-        m_macros.erase(m_macros.begin() + index);
-    }
-    else
-    {
-        delete m_shelveMacros[index];
-        m_shelveMacros[index] = nullptr;
-        m_shelveMacros.erase(m_shelveMacros.begin() + index);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::GetSaveFilePath(QString& outPath) const
-{
-    outPath = Path::GetResolvedUserSandboxFolder();
-    outPath += "Macros.xml";
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-const std::vector<AmazonToolbar>& CToolBoxManager::GetToolbars() const
-{
-    return m_toolbars;
-}
diff --git a/Code/Sandbox/Editor/ToolBox.h b/Code/Sandbox/Editor/ToolBox.h
deleted file mode 100644
index 39f3cbe695..0000000000
--- a/Code/Sandbox/Editor/ToolBox.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : ToolBox Macro System
-
-
-#ifndef CRYINCLUDE_EDITOR_TOOLBOX_H
-#define CRYINCLUDE_EDITOR_TOOLBOX_H
-#pragma once
-
-#define TOOLBOXMACROS_NODE "toolboxmacros"
-#define INVALID_TOOLBAR_ID -1
-
-#include "ToolbarManager.h"
-
-class ActionManager;
-
-class CToolBoxManager;
-
-#include <QAction>
-
-/** Represents a single ToolBox command.
-*/
-class CToolBoxCommand
-{
-public:
-    enum EType
-    {
-        eT_INVALID_COMMAND = 0,
-        eT_SCRIPT_COMMAND,
-        eT_CONSOLE_COMMAND,
-    };
-
-    CToolBoxCommand()
-        : m_bVariableToggle(false)
-        , m_type(eT_INVALID_COMMAND)
-    {
-    }
-
-    void Save(XmlNodeRef commandNode) const;
-    void Load(XmlNodeRef commandNode);
-
-    void Execute() const;
-
-    QString m_text;
-
-    bool m_bVariableToggle;
-    EType m_type;
-};
-
-Q_DECLARE_METATYPE(CToolBoxCommand*)
-
-/** Represents a sequence of ToolBox commands.
-*/
-class CToolBoxMacro
-{
-    friend class CToolBoxManager;
-public:
-    CToolBoxMacro(const QString& title)
-        : m_action(title, 0)
-        , m_toolbarId(INVALID_TOOLBAR_ID)
-    {
-        QObject::connect(&m_action, &QAction::triggered, &m_action, [this]() { Execute(); });
-    }
-    ~CToolBoxMacro()
-    { Clear(); }
-
-    void Save(XmlNodeRef macroNode) const;
-    void Load(XmlNodeRef macroNode);
-
-    void AddCommand(CToolBoxCommand::EType type, const QString& command, bool bVariableToggle = false);
-    void Clear();
-    QString GetTitle() const
-    { return m_action.text(); }
-    void SetTitle(const QString& title) { m_action.setText(title); }
-    int GetCommandCount() const
-    { return int(m_commands.size()); }
-    const CToolBoxCommand* GetCommandAt(int index) const;
-    CToolBoxCommand* GetCommandAt(int index);
-    void SwapCommand(int index1, int index2);
-    void RemoveCommand(int index);
-
-    QAction* action() { return &m_action;  }
-
-    void Execute() const;
-
-    void SetShortcutName(const QKeySequence& name)
-    {   m_action.setShortcut(name);   }
-    QKeySequence GetShortcutName()  const
-    {   return m_action.shortcut();         }
-
-    void SetIconPath(const char* path)
-    {
-        m_iconPath = path;
-        m_action.setIcon(QPixmap(path));
-    }
-    const QString& GetIconPath() const
-    { return m_iconPath; }
-
-    void SetToolbarId(int nID)
-    { m_toolbarId = nID; }
-    int GetToolbarId()
-    { return m_toolbarId; }
-
-private:
-    std::vector<CToolBoxCommand*> m_commands;
-    QString m_iconPath;
-    QAction m_action;
-    int m_toolbarId;
-};
-
-Q_DECLARE_METATYPE(CToolBoxMacro*)
-
-/** Manages user defined macros.
-*/
-class CToolBoxManager
-{
-public:
-    ~CToolBoxManager()
-    { Clear(); }
-
-    // Save macros configuration to registry.
-    void Save() const;
-    // Load macros configuration from registry.
-    void Load(ActionManager* actionManager = nullptr);
-    void LoadShelves(QString scriptPath, QString shelvesPath, ActionManager* actionManager);
-
-    //! Get the number of managed macros.
-    int GetMacroCount(bool bToolbox) const;
-    //! Get a macro by index.
-    const CToolBoxMacro* GetMacro(int iIndex, bool bToolbox) const;
-    CToolBoxMacro* GetMacro(int iIndex, bool bToolbox);
-    //! Get the index of a macro from its title.
-    int GetMacroIndex(const QString& title, bool bToolbox) const;
-    //! Creates a new macro in the manager. If the title is duplicate, this returns NULL.
-    CToolBoxMacro* NewMacro(const QString& title, bool bToolbox, int* newIdx);
-    //! Try to change the title of a macro. If the title is duplicate, the change is aborted and this returns false.
-    bool SetMacroTitle(int index, const QString& title, bool bToolbox);
-    //! Delete all macros.
-    void Clear();
-
-    void SwapMacro(int index1, int index2, bool bToolbox);
-    void RemoveMacro(int index, bool bToolbox);
-
-    //! Execute the macro with specified id.
-    void ExecuteMacro(int iIndex, bool bToolbox) const;
-    void ExecuteMacro(const QString& name, bool bToolbox) const;
-
-    void GetSaveFilePath(QString& path) const;
-
-    const std::vector<AmazonToolbar>& GetToolbars() const;
-
-private:
-    void Load(QString xmlpath, AmazonToolbar* pToolbar, bool bToolbox, ActionManager* actionManager);
-
-    std::vector<CToolBoxMacro*> m_macros;
-    std::vector<CToolBoxMacro*> m_shelveMacros;
-    std::vector<AmazonToolbar> m_toolbars;
-};
-
-#endif // CRYINCLUDE_EDITOR_TOOLBOX_H
diff --git a/Code/Sandbox/Editor/ToolbarCustomizationDialog.cpp b/Code/Sandbox/Editor/ToolbarCustomizationDialog.cpp
deleted file mode 100644
index 93183b3064..0000000000
--- a/Code/Sandbox/Editor/ToolbarCustomizationDialog.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ToolbarCustomizationDialog.h"
-
-// Qt
-#include <QMenuBar>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QDebug>
-
-// AzQtComponents
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-
-// Editor
-#include "MainWindow.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_ToolbarCustomizationDialog.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-using namespace AzQtComponents;
-
-enum ItemDataRole
-{
-    ToolbarRole = Qt::UserRole,
-    ToolbarNameRole
-};
-
-enum Tab
-{
-    TabToolbars,
-    TabCommands,
-    TabOptions,
-    TabKeyboard
-};
-
-ToolbarCustomizationDialog::ToolbarCustomizationDialog(MainWindow* mainWindow)
-    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, mainWindow))
-    , ui(new Ui::ToolbarCustomizationDialog())
-    , m_mainWindow(mainWindow)
-    , m_toolbarManager(mainWindow->GetToolbarManager())
-{
-    m_toolbarManager->SetIsEditingToolBars(true);
-    ui->setupUi(this);
-    setAcceptDrops(true);
-
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    connect(ui->closeButton, &QPushButton::clicked, this, &QWidget::close);
-    Setup();
-    setAttribute(Qt::WA_DeleteOnClose);
-    connect(ui->tabWidget, &QTabWidget::currentChanged, this, &ToolbarCustomizationDialog::OnTabChanged);
-    connect(ui->newButton, &QPushButton::clicked, this, [this] {
-        NewToolbar();
-    });
-    connect(ui->renameButton, &QPushButton::clicked, this, &ToolbarCustomizationDialog::RenameToolbar);
-    connect(ui->deleteButton, &QPushButton::clicked, this, &ToolbarCustomizationDialog::DeleteToolbar);
-    connect(ui->resetButton, &QPushButton::clicked, this, &ToolbarCustomizationDialog::ResetToolbar);
-
-    ui->commandsListWidget->setDragDropMode(QAbstractItemView::DragOnly);
-    ui->commandsListWidget->setDragEnabled(true);
-
-    // Hide the options and keyboard tabs. TODO: See what amazon wants to do with these. Most options don't make sense for Qt.
-    ui->tabWidget->removeTab(3);
-    ui->tabWidget->removeTab(2);
-}
-
-ToolbarCustomizationDialog::~ToolbarCustomizationDialog()
-{
-    m_toolbarManager->SetIsEditingToolBars(false);
-}
-
-void ToolbarCustomizationDialog::OnTabChanged(int index)
-{
-    switch (static_cast<Tab>(index))
-    {
-    case TabToolbars:
-        ui->toolbarsListWidget->setFocus(Qt::OtherFocusReason);
-        break;
-    case TabCommands:
-        ui->categoriesListWidget->setFocus(Qt::OtherFocusReason);
-        break;
-    case TabOptions:
-        break;
-    case TabKeyboard:
-        ui->keyboardCommandsListWidget->setFocus(Qt::OtherFocusReason);
-        break;
-    }
-}
-
-QList<QAction*> ToolbarCustomizationDialog::toplevelActions() const
-{
-    return m_mainWindow->menuBar()->actions();
-}
-
-void ToolbarCustomizationDialog::Setup()
-{
-    SetupCategoryCombo();
-    SetupCategoryListWidget();
-    SetupToolbarsListWidget();
-}
-
-void ToolbarCustomizationDialog::SetupCategoryCombo()
-{
-    ui->categoryCombo->clear();
-    for (QAction* action : toplevelActions())
-    {
-        ui->categoryCombo->addItem(action->text().remove(QLatin1Char('&')));
-    }
-
-    connect(ui->categoryCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-        this, &ToolbarCustomizationDialog::FillKeyboardCommands, Qt::UniqueConnection);
-
-    FillKeyboardCommands();
-}
-
-void ToolbarCustomizationDialog::FillKeyboardCommands()
-{
-    ui->keyboardCommandsListWidget->clear();
-    int idx = ui->categoryCombo->currentIndex();
-
-    QList<QAction*> rootActions = toplevelActions();
-    if (idx < 0 || idx >= rootActions.size())
-    {
-        return;
-    }
-
-    QAction* action = rootActions.at(idx);
-
-    QMenu* menu = action->menu();
-    if (!menu)
-    {
-        return;
-    }
-
-    for (QAction* menuAction : menu->actions())
-    {
-        if (!menuAction->isSeparator())
-        {
-            ui->keyboardCommandsListWidget->addItem(menuAction->text().remove(QLatin1Char('&')));
-        }
-    }
-}
-
-void ToolbarCustomizationDialog::SetupCategoryListWidget()
-{
-    ui->categoriesListWidget->clear();
-    for (QAction* action : toplevelActions())
-    {
-        ui->categoriesListWidget->addItem(action->text().remove(QLatin1Char('&')));
-    }
-
-    QModelIndex firstRow = ui->categoriesListWidget->model()->index(0, 0);
-    ui->categoriesListWidget->selectionModel()->select(firstRow, QItemSelectionModel::Select);
-
-    FillCommandsListWidget();
-    connect(ui->categoriesListWidget->selectionModel(), &QItemSelectionModel::selectionChanged,
-        this, &ToolbarCustomizationDialog::FillCommandsListWidget);
-}
-
-void ToolbarCustomizationDialog::FillCommandsListWidget()
-{
-    ui->commandsListWidget->clear();
-    QModelIndexList indexes = ui->categoriesListWidget->selectionModel()->selectedIndexes();
-    QModelIndex index = indexes.isEmpty() ? QModelIndex() : indexes.first();
-    if (!index.isValid())
-    {
-        return;
-    }
-
-    const int row = index.row();
-    const QList<QAction*> rootActions = toplevelActions();
-    if (row < 0 || row >= rootActions.size())
-    {
-        return;
-    }
-
-    QMenu* menu = rootActions[row]->menu();
-    if (!menu)
-    {
-        return;
-    }
-
-    for (QAction* action : menu->actions())
-    {
-        if (!action->isSeparator() && !action->menu())
-        {
-            auto item = new QListWidgetItem(action->text().remove(QLatin1Char('&')));
-            auto icon = action->icon();
-            const int actionId = action->data().toInt();
-            item->setData(ActionRole, actionId);
-            if (!icon.isNull())
-            {
-                item->setIcon(QIcon(icon.pixmap(32).scaled(QSize(16, 16))));
-            }
-
-            ui->commandsListWidget->addItem(item);
-        }
-    }
-}
-
-void ToolbarCustomizationDialog::SetupToolbarsListWidget()
-{
-    ui->toolbarsListWidget->clear();
-    auto toolbars = m_toolbarManager->GetToolbars();
-    connect(ui->toolbarsListWidget, &QListWidget::itemChanged,
-        this, &ToolbarCustomizationDialog::ToggleToolbar, Qt::UniqueConnection);
-    connect(ui->toolbarsListWidget->selectionModel(), &QItemSelectionModel::selectionChanged,
-        this, &ToolbarCustomizationDialog::OnToolbarSelected, Qt::UniqueConnection);
-    for (const AmazonToolbar& at : toolbars)
-    {
-        AddToolbarItem(at);
-    }
-    OnToolbarSelected(); // initial button state
-}
-
-void ToolbarCustomizationDialog::OnToolbarSelected()
-{
-    auto indexes = ui->toolbarsListWidget->selectionModel()->selectedIndexes();
-    if (!indexes.isEmpty())
-    {
-        int row = indexes.at(0).row();
-        const bool isValid = row >= 0;
-        const bool isCustom = m_toolbarManager->IsCustomToolbar(row);
-        const bool isStandard = isValid && !isCustom;
-
-        ui->newButton->setEnabled(isValid);
-        ui->resetButton->setEnabled(isStandard);
-        ui->renameButton->setEnabled(isCustom);
-        ui->deleteButton->setEnabled(isCustom);
-    }
-    else
-    {
-        ui->resetButton->setEnabled(false);
-        ui->renameButton->setEnabled(false);
-        ui->deleteButton->setEnabled(false);
-    }
-}
-
-void ToolbarCustomizationDialog::AddToolbarItem(const AmazonToolbar& at, bool forceVisible)
-{
-    auto item = new QListWidgetItem();
-    item->setData(ToolbarRole, QVariant::fromValue<QToolBar*>(at.Toolbar()));
-    item->setData(ToolbarNameRole, at.GetName());
-    item->setText(at.Toolbar()->windowTitle());
-    item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren);
-    item->setCheckState((forceVisible || at.Toolbar()->isVisible()) ? Qt::Checked : Qt::Unchecked);
-    ui->toolbarsListWidget->addItem(item);
-}
-
-void ToolbarCustomizationDialog::ToggleToolbar(QListWidgetItem* item)
-{
-    auto toolbar = item->data(ToolbarRole).value<QToolBar*>();
-    toolbar->setVisible(item->checkState() == Qt::Checked);
-}
-
-void ToolbarCustomizationDialog::NewToolbar(const QString &initialName)
-{
-    QString name = QInputDialog::getText(this, tr("New Toolbar"), tr("Toolbar name:"), QLineEdit::Normal, initialName);
-    for (const AmazonToolbar &t : m_toolbarManager->GetToolbars()) {
-        if (name == t.GetTranslatedName()) {
-            QMessageBox::warning(this, tr("Warning"),
-                tr("A toolbar with this name already exists. Please choose a different name."),
-                QMessageBox::Ok);
-            NewToolbar(name);
-            return;
-        }
-    }
-    int index = m_toolbarManager->Add(name);
-    if (index != -1)
-    {
-        AddToolbarItem(m_toolbarManager->GetToolbar(index), /**forceVisible=*/ true); // toolbar is only visible in the next event loop, so check the checkbox anyway
-    }
-}
-
-void ToolbarCustomizationDialog::DeleteToolbar()
-{
-    QModelIndex selectedIndex = SelectedToolbarIndex();
-    if (!selectedIndex.isValid())
-    {
-        return;
-    }
-
-    QString name = selectedIndex.data(Qt::DisplayRole).toString();
-
-    if (QMessageBox::question(this, "Editor", QString("Are you sure you want to delete the '%1' toolbar?").arg(name)) == QMessageBox::Yes)
-    {
-        const int index = SelectedToolbarIndex().row();
-        if (m_toolbarManager->Delete(index))
-        {
-            ui->toolbarsListWidget->selectionModel()->clear();
-            delete ui->toolbarsListWidget->item(index);
-        }
-    }
-}
-
-void ToolbarCustomizationDialog::RenameToolbar()
-{
-    const int index = SelectedToolbarIndex().row();
-    if (QListWidgetItem* item = ui->toolbarsListWidget->item(index))
-    {
-        const QString currentName = item->data(Qt::DisplayRole).toString();
-        const QString newName = QInputDialog::getText(this, tr("Rename Toolbar"), tr("Toolbar name:"),
-                QLineEdit::Normal, currentName);
-        if (m_toolbarManager->Rename(SelectedToolbarIndex().row(), newName))
-        {
-            item->setData(Qt::DisplayRole, newName);
-        }
-    }
-}
-
-void ToolbarCustomizationDialog::ResetToolbar()
-{
-    QModelIndex selectedIndex = SelectedToolbarIndex();
-    if (!selectedIndex.isValid())
-    {
-        return;
-    }
-
-    QString displayName = selectedIndex.data(Qt::DisplayRole).toString();
-
-    if (QMessageBox::question(this, "Editor", QString("Are you sure you want to reset the changes made to the '%1' toolbar?").arg(displayName)) == QMessageBox::Yes)
-    {
-        QString toolbarName = selectedIndex.data(ToolbarNameRole).toString();
-        m_toolbarManager->RestoreToolbarDefaults(toolbarName);
-    }
-}
-
-QModelIndex ToolbarCustomizationDialog::SelectedToolbarIndex() const
-{
-    auto indexes = ui->toolbarsListWidget->selectionModel()->selectedIndexes();
-    return indexes.isEmpty() ? QModelIndex() : indexes.at(0);
-}
-
-void ToolbarCustomizationDialog::dragEnterEvent(QDragEnterEvent* ev)
-{
-    ev->accept();
-}
-
-void ToolbarCustomizationDialog::dragMoveEvent(QDragMoveEvent* ev)
-{
-    ev->accept();
-}
-
-void ToolbarCustomizationDialog::dropEvent(QDropEvent* ev)
-{
-    auto sourceWidget = qobject_cast<QWidget*>(ev->source());
-    EditableQToolBar* sourceToolbar = m_toolbarManager->ToolbarParent(sourceWidget);
-
-    if (!sourceToolbar || !sourceWidget)
-    {
-        // Doesn't happen
-        qWarning() << Q_FUNC_INFO << "Invalid source widget or toolbar" << sourceWidget << sourceToolbar;
-        return;
-    }
-
-    QAction* action = sourceToolbar->ActionForWidget(sourceWidget);
-    const int actionId = action ? action->data().toInt() : 0;
-    if (actionId <= 0)
-    {
-        // Doesn't happen
-        qWarning() << Q_FUNC_INFO << "Invalid action id" << actionId << sourceWidget;
-        return;
-    }
-
-    m_toolbarManager->DeleteAction(action, sourceToolbar);
-}
-
-#include <moc_ToolbarCustomizationDialog.cpp>
diff --git a/Code/Sandbox/Editor/ToolbarCustomizationDialog.h b/Code/Sandbox/Editor/ToolbarCustomizationDialog.h
deleted file mode 100644
index e2f33cfc0a..0000000000
--- a/Code/Sandbox/Editor/ToolbarCustomizationDialog.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#ifndef TOOLBAR_CUSTOMIZATION_DIALOG_H
-#define TOOLBAR_CUSTOMIZATION_DIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include "ToolbarManager.h"
-
-#include <QDialog>
-#include <QScopedPointer>
-#include <QList>
-#endif
-
-class ToolbarManager;
-class MainWindow;
-class QAction;
-class QListWidgetItem;
-class QModelIndex;
-class QDropEvent;
-
-namespace Ui {
-    class ToolbarCustomizationDialog;
-}
-
-class ToolbarCustomizationDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit ToolbarCustomizationDialog(MainWindow* parent = nullptr);
-    ~ToolbarCustomizationDialog();
-
-protected:
-    void dragMoveEvent(QDragMoveEvent* ev) override;
-    void dragEnterEvent(QDragEnterEvent* ev) override;
-    void dropEvent(QDropEvent* ev);
-
-private:
-    void OnTabChanged(int index);
-    QList<QAction*> toplevelActions() const;
-    void ToggleToolbar(QListWidgetItem*);
-    void Setup();
-    void SetupCategoryCombo();
-    void SetupCategoryListWidget();
-    void SetupToolbarsListWidget();
-    void FillKeyboardCommands();
-    void FillCommandsListWidget();
-    QModelIndex SelectedToolbarIndex() const;
-    void AddToolbarItem(const AmazonToolbar&, bool forceVisible = false);
-    void OnToolbarSelected();
-
-    void NewToolbar(const QString &initialName = QString());
-    void DeleteToolbar();
-    void RenameToolbar();
-    void ResetToolbar();
-
-    QScopedPointer<Ui::ToolbarCustomizationDialog> ui;
-    MainWindow* const m_mainWindow;
-    ToolbarManager* const m_toolbarManager;
-};
-
-#endif
diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Sandbox/Editor/ToolbarManager.cpp
deleted file mode 100644
index e5362607c0..0000000000
--- a/Code/Sandbox/Editor/ToolbarManager.cpp
+++ /dev/null
@@ -1,1401 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ToolbarManager.h"
-
-// AzCore
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/Interface/Interface.h>
-
-// Qt
-#include <QDebug>
-#include <QDrag>
-#include <QMimeData>
-#include <QPainter>
-#include <QLayout>
-
-#include <QTextDocumentFragment>
-
-// Editor
-#include "MainWindow.h"
-#include "ToolBox.h"
-#include "PluginManager.h"
-#include "ActionManager.h"
-#include "Settings.h"
-
-
-static const char* SUBSTANCE_TOOLBAR_NAME = "Substance";
-static const QString TOOLBAR_SETTINGS_KEY("ToolbarSettings");
-
-
-// Save out the version of the toolbars with it
-// Only save a toolbar if it's not a standard or has some changes to it from the standard
-// On load, add any actions that are with a newer version to it
-// Check if a toolbar is the same as a default version on load
-
-const int TOOLBAR_IDENTIFIER = 0xFFFF; // must be an int, for compatibility
-
-enum AmazonToolbarVersions
-{
-    ORIGINAL_TOOLBAR_VERSION = 1,
-    TOOLBARS_WITH_PLAY_GAME = 2,
-    TOOLBARS_WITH_PERSISTENT_VISIBILITY = 3,
-    TOOLBARS_WITHOUT_CVAR_MODES = 5,
-
-    //TOOLBAR_VERSION = 1
-    TOOLBAR_VERSION = TOOLBARS_WITHOUT_CVAR_MODES
-};
-
-struct InternalAmazonToolbarList
-{
-    int version;
-    AmazonToolbar::List toolbars;
-};
-
-Q_DECLARE_METATYPE(AmazonToolbar)
-Q_DECLARE_METATYPE(AmazonToolbar::List)
-Q_DECLARE_METATYPE(InternalAmazonToolbarList)
-
-static bool ObjectIsSeparator(QObject* o)
-{
-    return o && o->metaObject()->className() == QStringLiteral("QToolBarSeparator");
-}
-
-static QDataStream& WriteToolbarDataStream(QDataStream& out, const AmazonToolbar& toolbar)
-{
-    out << toolbar.GetName();
-    out << toolbar.GetTranslatedName();
-    out << toolbar.ActionIds();
-    out << toolbar.IsShowByDefault();
-    out << toolbar.IsShowToggled();
-
-    return out;
-}
-
-static QDataStream& ReadToolbarDataStream(QDataStream& in, AmazonToolbar& toolbar, int version)
-{
-    QString name;
-    QString translatedName;
-    QVector<int> actionIds;
-
-    bool showByDefault = true;
-    bool showToggled = false;
-
-    in >> name;
-    in >> translatedName;
-
-    in >> actionIds;
-
-    if (version > 0)
-    {
-        in >> showByDefault;
-        toolbar.SetShowByDefault(showByDefault);
-    }
-
-    if (version >= TOOLBARS_WITH_PERSISTENT_VISIBILITY)
-    {
-        in >> showToggled;
-        toolbar.SetShowToggled(showToggled);
-    }
-
-    for (int actionId : actionIds)
-    {
-        toolbar.AddAction(actionId);
-    }
-
-    toolbar.SetName(name, translatedName);
-
-    return in;
-}
-
-static QDataStream& operator<<(QDataStream& out, const InternalAmazonToolbarList& list)
-{
-    out << TOOLBAR_IDENTIFIER;
-    out << list.version;
-    out << list.toolbars.size();
-    for (const AmazonToolbar& t : list.toolbars)
-    {
-        WriteToolbarDataStream(out, t);
-    }
-
-    return out;
-}
-
-static QDataStream& operator>>(QDataStream& in, InternalAmazonToolbarList& list)
-{
-    int identifier;
-
-    in >> identifier;
-
-    int size = 0;
-    if (identifier == TOOLBAR_IDENTIFIER)
-    {
-        in >> list.version;
-        in >> size;
-    }
-    else
-    {
-        // version 0; size is identifier
-        list.version = 0;
-        size = identifier;
-    }
-
-    size = std::min(size, 30); // protect against corrupt data
-    list.toolbars.reserve(size);
-    for (int i = 0; i < size; ++i)
-    {
-        AmazonToolbar t;
-        ReadToolbarDataStream(in, t, list.version);
-        list.toolbars.push_back(t);
-    }
-
-    return in;
-}
-
-class AmazonToolBarExpanderWatcher
-    : public QObject
-{
-public:
-    AmazonToolBarExpanderWatcher(QObject* parent = nullptr)
-        : QObject(parent)
-    {
-    }
-
-    bool eventFilter(QObject* obj, QEvent* event) override
-    {
-        switch (event->type())
-        {
-            case QEvent::MouseButtonPress:
-            case QEvent::MouseButtonRelease:
-            case QEvent::MouseButtonDblClick:
-            {
-                if (qobject_cast<QToolButton*>(obj))
-                {
-                    auto mouseEvent = static_cast<QMouseEvent*>(event);
-                    auto expansion = qobject_cast<QToolButton*>(obj);
-
-                    expansion->setPopupMode(QToolButton::InstantPopup);
-                    auto menu = new QMenu(expansion);
-
-                    auto toolbar = qobject_cast<QToolBar*>(expansion->parentWidget());
-
-                    for (auto toolbarAction : toolbar->actions())
-                    {
-                        auto actionWidget = toolbar->widgetForAction(toolbarAction);
-                        if (actionWidget && !actionWidget->isVisible())
-                        {
-                            QString plainText = QTextDocumentFragment::fromHtml(actionWidget->toolTip()).toPlainText();
-                            toolbarAction->setText(plainText);
-                            menu->addAction(toolbarAction);
-                        }
-                    }
-
-                    menu->exec(mouseEvent->globalPos());
-                    return true;
-                }
-
-                break;
-            }
-        }
-
-        return QObject::eventFilter(obj, event);
-    }
-};
-
-ToolbarManager::ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow)
-    : m_mainWindow(mainWindow)
-    , m_actionManager(actionManager)
-    , m_settings("amazon", "O3DE")
-    , m_expanderWatcher(new AmazonToolBarExpanderWatcher())
-{
-    // Note that we don't actually save/load from AmazonToolbar::List
-    // The data saved for existing users had that name, and it can't be changed now without ignoring user's data.
-    // We need to know the version stored, so we need to save/load into a different structure (InternalAmazonToolbarList)
-    qRegisterMetaType<InternalAmazonToolbarList>("AmazonToolbar::List");
-    qRegisterMetaTypeStreamOperators<InternalAmazonToolbarList>("AmazonToolbar::List");
-}
-
-ToolbarManager::~ToolbarManager()
-{
-    SaveToolbars();
-
-    if (m_expanderWatcher)
-    {
-        delete m_expanderWatcher;
-    }
-}
-
-EditableQToolBar* ToolbarManager::ToolbarParent(QObject* o) const
-{
-    if (!o)
-    {
-        return nullptr;
-    }
-
-    if (auto t = qobject_cast<EditableQToolBar*>(o))
-    {
-        return t;
-    }
-
-    return ToolbarParent(o->parent());
-}
-
-void ToolbarManager::LoadToolbars()
-{
-    InitializeStandardToolbars();
-
-    m_settings.beginGroup(TOOLBAR_SETTINGS_KEY);
-    InternalAmazonToolbarList loadedToolbarList = m_settings.value("toolbars").value<InternalAmazonToolbarList>();
-    m_toolbars = loadedToolbarList.toolbars;
-    m_loadedVersion = loadedToolbarList.version;
-    qDebug() << "Loaded toolbars:" << m_toolbars.size();
-
-    // Load the defaults which were saved by the previous version
-    // If no defaults are found, the effect is to re-add all commands in the current standard toolbars which are no
-    // longer present in the edited version (i.e. result = the set union of edited and current default)
-    QMap<QString, AmazonToolbar> previousStandardToolbars;
-    if (m_loadedVersion < TOOLBAR_VERSION)
-    {
-        m_settings.beginGroup("Defaults");
-        QVariant defaultsValue = m_settings.value(QString::number(m_loadedVersion));
-        if (defaultsValue.isValid())
-        {
-            InternalAmazonToolbarList oldDefaults = defaultsValue.value<InternalAmazonToolbarList>();
-
-            for (AmazonToolbar& oldDefault : oldDefaults.toolbars)
-            {
-                previousStandardToolbars[oldDefault.GetName()] = oldDefault;
-            }
-        }
-        m_settings.endGroup();
-    }
-
-    m_settings.endGroup();
-
-    SanitizeToolbars(previousStandardToolbars);
-    InstantiateToolbars();
-}
-
-static bool operator==(const AmazonToolbar& t1, const AmazonToolbar& t2)
-{
-    return t1.GetName() == t2.GetName();
-}
-
-void ToolbarManager::SanitizeToolbars(const QMap<QString, AmazonToolbar>& oldStandard)
-{
-    // All standard toolbars must be present
-    auto stdToolbars = m_standardToolbars;
-
-    if (m_loadedVersion < TOOLBARS_WITHOUT_CVAR_MODES)
-    {
-        // Check if any standard toolbars have been deprecated and no longer exist
-        for (const auto& oldStandardToolbar : oldStandard)
-        {
-            if (!stdToolbars.contains(oldStandardToolbar.GetName()))
-            {
-                // Add an empty standard toolbar as placeholder for the deprecated standard
-                // toolbar so that it is kept around with only the user added actions or
-                // removed from the toolbar list if it does not contain any custom actions
-                stdToolbars.append(AmazonToolbar(oldStandardToolbar.GetName(), oldStandardToolbar.GetTranslatedName()));
-            }
-        }
-    }
-
-    // make a set of the loaded toolbars
-    QMap<QString, AmazonToolbar> toolbarSet;
-    for (const AmazonToolbar& toolbar : m_toolbars)
-    {
-        toolbarSet[toolbar.GetName()] = toolbar;
-    }
-
-    // the order is important because IsCustomToolbar() checks based on the order (which it shouldn't...)
-    // so we go through the loaded toolbars and make sure that our standard ones are all in there
-    // in the right order. We also remove them from the set, so that we know what's left later
-    AmazonToolbar::List newToolbars;
-    for (AmazonToolbar& stdToolbar : stdToolbars)
-    {
-        auto customToolbarReference = toolbarSet.find(stdToolbar.GetName());
-        if (customToolbarReference == toolbarSet.end())
-        {
-            // An untouched standard toolbar or a user-created one
-            newToolbars.push_back(stdToolbar);
-        }
-        else if (customToolbarReference.value().IsSame(stdToolbar))
-        {
-            // Edge case of previous versions where all toolbars were saved regardless of dirtiness
-            // If we're replacing the Toolbar and haven't changed whether or not it's hidden by default since
-            // last load, ensure we respect whether or not the user had previously toggled it
-            if (stdToolbar.IsShowByDefault() == customToolbarReference.value().IsShowByDefault())
-            {
-                stdToolbar.SetShowToggled(customToolbarReference.value().IsShowToggled());
-            }
-            newToolbars.push_back(stdToolbar);
-        }
-        else
-        {
-            AmazonToolbar& newToolbar = customToolbarReference.value();
-
-            // make sure to add any actions added since the last time the user saved this toolbar
-            if (oldStandard.contains(stdToolbar.GetName()))
-            {
-                QVector<int> newCommands = stdToolbar.ActionIds();
-                QVector<int> previous = oldStandard[stdToolbar.GetName()].ActionIds();
-                QVector<int> custom = newToolbar.ActionIds();
-
-                // If the new layout removed some, we want to remove those if present in the edited layout
-                for (int previousCommand : previous)
-                {
-                    if (!newCommands.contains(previousCommand))
-                    {
-                        custom.removeOne(previousCommand);
-                    }
-                }
-
-                // We only want commands that weren't in the old default version and which aren't already in the
-                // customized toolbar.
-                // We just append them here, but it might be possible to attempt to preserve the ordering...
-                for (int command : newCommands)
-                {
-                    if (!previous.contains(command) && !custom.contains(command))
-                    {
-                        custom.push_back(command);
-                    }
-                }
-
-                newToolbar.Clear();
-                for (int actionId : custom)
-                {
-                    newToolbar.AddAction(actionId);
-                }
-            }
-
-            newToolbars.push_back(newToolbar);
-
-            toolbarSet.remove(stdToolbar.GetName());
-        }
-    }
-
-    // go through and add in all of the left over toolbars, in the same order now
-    for (const AmazonToolbar& existingToolbar : m_toolbars)
-    {
-        if (!newToolbars.contains(existingToolbar.GetName()))
-        {
-            newToolbars.push_back(existingToolbar);
-        }
-    }
-
-    // it isn't an older version of the std toolbar, but it needs to have all of the actions
-    // that the newest one has, so add anything newer than what it was saved with
-    // WORKS FOR THIS, BUT WHAT ABOUT FOR PLUGIN CREATOR TOOLBARS? HOW DO THEY ADD NEW BUTTONS?
-
-    // keep the new list now
-    m_toolbars = newToolbars;
-
-    // TODO: Remove this once gems are able to control toolbars
-    bool removeSubstanceToolbar = true;
-
-    if (AZ::SettingsRegistryInterface* settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
-    {
-        // Query the /Amazon/Gems/Substance key to determine if the substance gem is available
-        AZ::SettingsRegistryInterface::Type keyType = settingsRegistry->GetType(AZ::SettingsRegistryInterface::FixedValueString::format("%s/Gems/%s",
-            AZ::SettingsRegistryMergeUtils::OrganizationRootKey, SUBSTANCE_TOOLBAR_NAME));
-        removeSubstanceToolbar = keyType == AZ::SettingsRegistryInterface::Type::NoType;
-    }
-
-    // Remove toolbars with invalid names (corrupted)
-    m_toolbars.erase(std::remove_if(m_toolbars.begin(), m_toolbars.end(), [removeSubstanceToolbar](const AmazonToolbar& t)
-    {
-        return t.GetName().isEmpty() || (removeSubstanceToolbar && t.GetName() == SUBSTANCE_TOOLBAR_NAME);
-    }), m_toolbars.end());
-
-    if (m_loadedVersion < TOOLBARS_WITHOUT_CVAR_MODES)
-    {
-        // Remove any empty deprecated toolbars that haven't been customized, or
-        // rename and keep the toolbar if a custom action has been added
-        m_toolbars.erase(std::remove_if(m_toolbars.begin(), m_toolbars.end(), [](AmazonToolbar& toolbar)
-            {
-                const QString& toolbarName = toolbar.GetName();
-                if (toolbarName == "debugViewsToolbar"
-                    || toolbarName == "environmentModesToolbar"
-                    || toolbarName == "viewModesToolbar")
-                {
-                    if (toolbar.ActionIds().isEmpty())
-                    {
-                        return true;
-                    }
-                    else
-                    {
-                        QString newToolbarName = QString("%1 (Deprecated)").arg(toolbar.GetTranslatedName());
-                        toolbar.SetName(newToolbarName, newToolbarName);                        
-                    }
-                }
-                return false;
-            }), m_toolbars.end());
-    }
-}
-
-void ToolbarManager::SaveToolbar(EditableQToolBar* toolbar)
-{
-    for (AmazonToolbar& at : m_toolbars)
-    {
-        if (at.Toolbar() == toolbar)
-        {
-            at.Clear();
-            for (QAction* action : toolbar->actions())
-            {
-                const int actionId = action->data().toInt();
-                if (actionId >= 0)
-                {
-                    at.AddAction(actionId);
-                }
-                else
-                {
-                    qWarning() << Q_FUNC_INFO << "Invalid action id";
-                }
-            }
-
-            AmazonToolbar::UpdateAllowedAreas(toolbar);
-            SaveToolbars();
-            return;
-        }
-    }
-
-    qWarning() << Q_FUNC_INFO << "Couldn't find toolbar";
-}
-
-void ToolbarManager::SaveToolbars()
-{
-    // Determine if the user has manually shown or hidden any toolbars and flag that so we remember on startup
-    for (auto& toolbar : m_toolbars)
-    {
-        QToolBar* toolbarWidget = toolbar.Toolbar();
-        // If we're not explicitly hidden and we're not shown by default, or the converse, record that the user toggled our visibility
-        if (toolbarWidget && (!toolbarWidget->isHidden()) != toolbar.IsShowByDefault())
-        {
-            toolbar.SetShowToggled(true);
-        }
-        else
-        {
-            toolbar.SetShowToggled(false);
-        }
-    }
-
-    m_settings.beginGroup(TOOLBAR_SETTINGS_KEY);
-
-    QVector<AmazonToolbar> toBeSaved = m_toolbars;
-    // We only save toolbars that differ from their default or are user-created
-    toBeSaved.erase(std::remove_if(toBeSaved.begin(), toBeSaved.end(), [this](const AmazonToolbar& t) { return !IsDirty(t); }), toBeSaved.end());
-    InternalAmazonToolbarList savedToolbars = { TOOLBAR_VERSION, toBeSaved };
-    m_settings.setValue("toolbars", QVariant::fromValue<InternalAmazonToolbarList>(savedToolbars));
-    m_settings.endGroup();
-}
-
-void ToolbarManager::InitializeStandardToolbars()
-{
-    if (m_standardToolbars.isEmpty())
-    {
-        auto macroToolbars = GetIEditor()->GetToolBoxManager()->GetToolbars();
-
-        m_standardToolbars.reserve(5 + macroToolbars.size());
-        m_standardToolbars.push_back(GetEditModeToolbar());
-        m_standardToolbars.push_back(GetObjectToolbar());
-        m_standardToolbars.push_back(GetPlayConsoleToolbar());
-
-        IPlugin* pGamePlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{71CED8AB-54E2-4739-AA78-7590A5DC5AEB}");
-        IPlugin* pDescriptionEditorPlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{4B9B7074-2D58-4AFD-BBE1-BE469D48456A}");
-        if (pGamePlugin && pDescriptionEditorPlugin)
-        {
-            m_standardToolbars.push_back(GetMiscToolbar());
-        }
-
-        std::copy(std::begin(macroToolbars), std::end(macroToolbars), std::back_inserter(m_standardToolbars));
-
-        // Save that default state to future versions can reason about updating modified standard toolbars
-        m_settings.beginGroup(TOOLBAR_SETTINGS_KEY);
-        m_settings.beginGroup("Defaults");
-
-        InternalAmazonToolbarList savedToolbars = { TOOLBAR_VERSION, m_standardToolbars };
-        m_settings.setValue(QString::number(TOOLBAR_VERSION), QVariant::fromValue<InternalAmazonToolbarList>(savedToolbars));
-
-        m_settings.endGroup();
-        m_settings.endGroup();
-    }
-}
-
-void AmazonToolbar::UpdateAllowedAreas()
-{
-    UpdateAllowedAreas(m_toolbar);
-}
-
-void AmazonToolbar::UpdateAllowedAreas(QToolBar* toolbar)
-{
-    bool horizontalOnly = false;
-
-    for (QAction* action : toolbar->actions())
-    {
-        if (qobject_cast<QWidgetAction*>(action))
-        {
-            // if it's a widget action, we assume it won't fit in the vertical toolbars
-            horizontalOnly = true;
-            break;
-        }
-    }
-
-    if (horizontalOnly)
-    {
-        toolbar->setAllowedAreas(Qt::BottomToolBarArea | Qt::TopToolBarArea);
-    }
-    else
-    {
-        toolbar->setAllowedAreas(Qt::AllToolBarAreas);
-    }
-}
-
-bool ToolbarManager::IsDirty(const AmazonToolbar& toolbar) const
-{
-    const AmazonToolbar* defaultStandardToolbar = FindDefaultToolbar(toolbar.GetName());
-
-    // custom toolbars are always considered dirty
-    bool isDirty = true;
-
-    if (defaultStandardToolbar != nullptr)
-    {
-        isDirty = !defaultStandardToolbar->IsSame(toolbar);
-    }
-
-    return isDirty;
-}
-
-
-AmazonToolbar ToolbarManager::GetEditModeToolbar() const
-{
-    AmazonToolbar t = AmazonToolbar("EditMode", QObject::tr("Edit Mode Toolbar"));
-    t.SetMainToolbar(true);
-    return t;
-}
-
-AmazonToolbar ToolbarManager::GetObjectToolbar() const
-{
-    AmazonToolbar t = AmazonToolbar("Object", QObject::tr("Object Toolbar"));
-    t.SetMainToolbar(true);
-    t.AddAction(ID_GOTO_SELECTED, ORIGINAL_TOOLBAR_VERSION);
-
-    return t;
-}
-
-AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const
-{
-    AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Controls"));
-    t.SetMainToolbar(true);
-
-    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);
-    t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_SWITCH_PHYSICS, TOOLBARS_WITH_PLAY_GAME);    
-    return t;
-}
-
-AmazonToolbar ToolbarManager::GetEditorsToolbar() const
-{
-    AmazonToolbar t = AmazonToolbar("Editors", QObject::tr("Editors Toolbar"));
-
-    t.AddAction(ID_OPEN_AUDIO_CONTROLS_BROWSER, ORIGINAL_TOOLBAR_VERSION);
-
-    return t;
-}
-
-AmazonToolbar ToolbarManager::GetMiscToolbar() const
-{
-    AmazonToolbar t = AmazonToolbar("Misc", QObject::tr("Misc Toolbar"));
-    return t;
-}
-
-void ToolbarManager::AddButtonToEditToolbar(QAction* action)
-{
-    QString toolbarName = "EditMode";
-    const AmazonToolbar* toolbar = FindToolbar(toolbarName);
-
-    if (toolbar)
-    {
-        if (toolbar->Toolbar())
-        {
-            toolbar->Toolbar()->addAction(action);
-        }
-    }
-}
-
-const AmazonToolbar* ToolbarManager::FindDefaultToolbar(const QString& toolbarName) const
-{
-    for (const AmazonToolbar& toolbar : m_standardToolbars)
-    {
-        if (toolbar.GetName() == toolbarName)
-        {
-            return &toolbar;
-        }
-    }
-
-    return nullptr;
-}
-
-AmazonToolbar* ToolbarManager::FindToolbar(const QString& toolbarName)
-{
-    for (AmazonToolbar& toolbar : m_toolbars)
-    {
-        if (toolbar.GetName() == toolbarName)
-        {
-            return &toolbar;
-        }
-    }
-
-    return nullptr;
-}
-
-void ToolbarManager::RestoreToolbarDefaults(const QString& toolbarName)
-{
-    if (!IsCustomToolbar(toolbarName))
-    {
-        const AmazonToolbar* defaultToolbar = FindDefaultToolbar(toolbarName);
-        AmazonToolbar* existingToolbar = FindToolbar(toolbarName);
-        Q_ASSERT(existingToolbar != nullptr);
-
-        if (existingToolbar != nullptr)
-        {
-            const bool isInstantiated = existingToolbar->IsInstantiated();
-
-            if (isInstantiated)
-            {
-                // We have a QToolBar instance, updated it too
-                for (QAction* action : existingToolbar->Toolbar()->actions())
-                {
-                    existingToolbar->Toolbar()->removeAction(action);
-                }
-            }
-
-            Q_ASSERT(defaultToolbar != nullptr);
-            if (defaultToolbar != nullptr)
-            {
-                existingToolbar->CopyActions(*defaultToolbar);
-            }
-
-            if (isInstantiated)
-            {
-                existingToolbar->SetActionsOnInternalToolbar(m_actionManager);
-                existingToolbar->UpdateAllowedAreas();
-            }
-            SaveToolbars();
-        }
-    }
-    else
-    {
-        qWarning() << Q_FUNC_INFO << "Can only reset standard toolbars";
-    }
-}
-
-void ToolbarManager::SetEnabled(bool enabled)
-{
-    for (AmazonToolbar& amazonToolbar : m_toolbars)
-    {
-        QToolBar* toolbar = amazonToolbar.Toolbar();
-        if (toolbar)
-        {
-            toolbar->setEnabled(enabled);
-        }
-    }
-}
-
-void AmazonToolbar::SetActionsOnInternalToolbar(ActionManager* actionManager)
-{
-    for (auto actionData : m_actions)
-    {
-        int actionId = actionData.actionId;
-
-        if (actionId == ID_TOOLBAR_SEPARATOR)
-        {
-            QAction* action = m_toolbar->addSeparator();
-            action->setData(ID_TOOLBAR_SEPARATOR);
-        }
-        else
-        {
-            if (actionManager->HasAction(actionId))
-            {
-                m_toolbar->addAction(actionManager->GetAction(actionId));
-            }
-        }
-    }
-}
-
-void ToolbarManager::InstantiateToolbars()
-{
-    const int numToolbars = m_toolbars.size();
-    for (int i = 0; i < numToolbars; ++i)
-    {
-        InstantiateToolbar(i);
-        if (i == 2)
-        {
-            // Hack. Just copying how it was
-            m_mainWindow->addToolBarBreak();
-        }
-    }
-}
-
-void ToolbarManager::InstantiateToolbar(int index)
-{
-    AmazonToolbar& t = m_toolbars[index];
-    t.InstantiateToolbar(m_mainWindow, this); // Create the QToolbar
-}
-
-AmazonToolbar::List ToolbarManager::GetToolbars() const
-{
-    return m_toolbars;
-}
-
-AmazonToolbar ToolbarManager::GetToolbar(int index)
-{
-    if (index < 0 || index >= m_toolbars.size())
-    {
-        return AmazonToolbar();
-    }
-
-    return m_toolbars.at(index);
-}
-
-bool ToolbarManager::Delete(int index)
-{
-    if (!IsCustomToolbar(index))
-    {
-        qWarning() << Q_FUNC_INFO << "Won't try to delete invalid or standard toolbar" << index << m_toolbars.size();
-        return false;
-    }
-
-    AmazonToolbar t = m_toolbars.takeAt(index);
-    delete t.Toolbar();
-
-    SaveToolbars();
-
-    return true;
-}
-
-
-bool ToolbarManager::Rename(int index, const QString& newName)
-{
-    if (newName.isEmpty())
-    {
-        return false;
-    }
-
-    if (!IsCustomToolbar(index))
-    {
-        qWarning() << Q_FUNC_INFO << "Won't try to rename invalid or standard toolbar" << index << m_toolbars.size();
-        return false;
-    }
-
-    AmazonToolbar& t = m_toolbars[index];
-    if (t.GetName() == newName)
-    {
-        qWarning() << Q_FUNC_INFO << "Won't try to rename to the same name" << newName;
-        return false;
-    }
-    t.SetName(newName, newName); // No translation for custom bars
-    SaveToolbars();
-
-    return true;
-}
-
-int ToolbarManager::Add(const QString& name)
-{
-    if (name.isEmpty())
-    {
-        return -1;
-    }
-
-    AmazonToolbar t(name, name);
-    t.InstantiateToolbar(m_mainWindow, this);
-
-    MainWindow::instance()->AdjustToolBarIconSize(static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(gSettings.gui.nToolbarIconSize));
-
-    m_toolbars.push_back(t);
-    SaveToolbars();
-    return m_toolbars.size() - 1;
-}
-
-bool ToolbarManager::IsCustomToolbar(int index) const
-{
-    return IsCustomToolbar(m_toolbars[index].GetName());
-}
-
-bool ToolbarManager::IsCustomToolbar(const QString& toolbarName) const
-{
-    for (auto toolbar : m_standardToolbars)
-    {
-        if (toolbar.GetName() == toolbarName)
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-ActionManager* ToolbarManager::GetActionManager() const
-{
-    return m_actionManager;
-}
-
-AmazonToolBarExpanderWatcher* ToolbarManager::GetExpanderWatcher() const
-{
-    return m_expanderWatcher;
-}
-
-bool ToolbarManager::DeleteAction(QAction* action, EditableQToolBar* toolbar)
-{
-    if (!action)
-    {
-        // Doesn't happen
-        qWarning() << Q_FUNC_INFO << "Null action!";
-        return false;
-    }
-
-    const int actionId = action->data().toInt();
-    if (actionId <= 0)
-    {
-        qWarning() << Q_FUNC_INFO << "Action has null id";
-        return false;
-    }
-
-    if (toolbar->actions().contains(action))
-    {
-        toolbar->removeAction(action);
-    }
-    else
-    {
-        qWarning() << Q_FUNC_INFO << "Couldnt find action to remove";
-        return false;
-    }
-
-    SaveToolbar(toolbar);
-    return true;
-}
-
-void ToolbarManager::SetIsEditingToolBars(bool is)
-{
-    m_isEditingToolBars = is;
-}
-
-bool ToolbarManager::IsEditingToolBars() const
-{
-    return m_isEditingToolBars;
-}
-
-void ToolbarManager::InsertAction(QAction* action, QWidget* beforeWidget, QAction* beforeAction, EditableQToolBar* toolbar)
-{
-    if (!action)
-    {
-        qWarning() << Q_FUNC_INFO << "Invalid action for id" << action;
-        return;
-    }
-
-    const int actionId = action->data().toInt();
-    if (actionId <= 0)
-    {
-        qWarning() << Q_FUNC_INFO << "Invalid action id";
-        return;
-    }
-
-    const int beforeActionId = beforeAction ? beforeAction->data().toInt() : -1;
-    const bool beforeIsSeparator = beforeActionId == ID_TOOLBAR_SEPARATOR;
-
-    if (beforeIsSeparator)
-    {
-        beforeAction = beforeWidget->actions().first();
-    }
-
-    if (beforeAction && !toolbar->actions().contains(beforeAction))
-    {
-        qWarning() << Q_FUNC_INFO << "Invalid before action" << beforeAction << beforeActionId << beforeWidget->actions();
-        return;
-    }
-
-    toolbar->insertAction(beforeAction, action);
-
-    SaveToolbar(toolbar);
-}
-
-class DnDIndicator
-    : public QWidget
-{
-public:
-    DnDIndicator(EditableQToolBar* parent)
-        : QWidget(parent)
-        , m_toolbar(parent)
-    {
-        setVisible(false);
-    }
-
-    void paintEvent([[maybe_unused]] QPaintEvent* ev) override
-    {
-        QPainter painter(this);
-        painter.fillRect(QRect(0, 0, width(), height()), QBrush(QColor(217, 130, 46)));
-    }
-
-    void setLastDragPos(QPoint lastDragPos)
-    {
-        if (lastDragPos != m_lastDragPos)
-        {
-            m_lastDragPos = lastDragPos;
-            if (lastDragPos.isNull())
-            {
-                m_dragSourceWidget = nullptr;
-                setVisible(false);
-            }
-            else
-            {
-                setVisible(true);
-                updatePosition();
-            }
-            update();
-        }
-    }
-
-    void setDragSourceWidget(QWidget* w)
-    {
-        m_dragSourceWidget = w;
-    }
-
-    void updatePosition()
-    {
-        QWidget* beforeWidget = m_toolbar->insertPositionForDrop(m_lastDragPos);
-        const auto widgets = m_toolbar->childWidgetsWithActions();
-        QWidget* lastWidget = widgets.isEmpty() ? nullptr : widgets.last();
-
-        if (beforeWidget && beforeWidget == m_dragSourceWidget)
-        {
-            // Nothing to do, user is dragging to the same place, don't indicate it as a possibility
-            setVisible(false);
-            return;
-        }
-
-        if (!beforeWidget && m_dragSourceWidget == lastWidget)
-        {
-            // Nothing to do. Don't show indicator. The widget is already at the end.
-            setVisible(false);
-            return;
-        }
-
-        int x = 0;
-        if (beforeWidget)
-        {
-            x = beforeWidget->pos().x();
-        }
-        else
-        {
-            if (lastWidget)
-            {
-                x = lastWidget->pos().x() + lastWidget->width();
-            }
-            else
-            {
-                x = style()->pixelMetric(QStyle::PM_ToolBarHandleExtent) + style()->pixelMetric(QStyle::PM_ToolBarItemSpacing);
-            }
-        }
-
-        const int w = 2;
-        const int y = 5;
-        const int h = m_toolbar->height() - (y * 2);
-        setGeometry(x, y, w, h);
-        raise();
-    }
-
-    QPoint lastDragPos() const
-    {
-        return m_lastDragPos;
-    }
-
-private:
-    QPoint m_lastDragPos;
-    QPointer<QWidget> m_dragSourceWidget = nullptr;
-    EditableQToolBar* const m_toolbar;
-};
-
-EditableQToolBar::EditableQToolBar(const QString& title, ToolbarManager* manager)
-    : QToolBar(title)
-    , m_toolbarManager(manager)
-    , m_actionManager(manager->GetActionManager())
-    , m_dndIndicator(new DnDIndicator(this))
-{
-    setAcceptDrops(true);
-
-    connect(this, &QToolBar::orientationChanged, this, [this](Qt::Orientation orientation)
-    {
-        for (const auto& widget : findChildren<QWidget*>())
-            layout()->setAlignment(widget, orientation == Qt::Horizontal ? Qt::AlignVCenter : Qt::AlignHCenter);
-    });
-}
-
-QWidget* EditableQToolBar::insertPositionForDrop(QPoint mousePos)
-{
-    // QToolBar::actionAt() is no good here, since it sometimes returns nullptr between widgets
-
-    const QList<QWidget*> widgets = childWidgetsWithActions();
-    // Find the closest button
-    QWidget* beforeWidget = nullptr;
-    for (auto w : widgets)
-    {
-        if (w && w->pos().x() + w->width() / 2 > mousePos.x())
-        {
-            beforeWidget = w;
-            break;
-        }
-    }
-
-    return beforeWidget;
-}
-
-void EditableQToolBar::childEvent(QChildEvent* ev)
-{
-    QObject* child = ev->child();
-    if (ev->type() == QEvent::ChildAdded && child->isWidgetType()) // we can't qobject_cast to QToolButton yet, since it's not fully constructed
-    {
-        child->installEventFilter(this);
-    }
-
-    QToolBar::childEvent(ev);
-}
-
-QList<QWidget*> EditableQToolBar::childWidgetsWithActions() const
-{
-    QList<QWidget*> widgets;
-    widgets.reserve(actions().size());
-    for (QAction* action : actions())
-    {
-        if (QWidget* w = widgetForAction(action))
-        {
-            if (w->actions().isEmpty() && ObjectIsSeparator(w))
-            {
-                // Hack around the fact that QToolBarSeparator doesn't have an action associated
-                w->addAction(action);
-                action->setData(ID_TOOLBAR_SEPARATOR);
-            }
-            widgets.push_back(w);
-        }
-    }
-
-    return widgets;
-}
-
-bool EditableQToolBar::eventFilter(QObject* obj, QEvent* ev)
-{
-    auto type = ev->type();
-    const bool isMouseEvent = type == QEvent::MouseButtonPress || type == QEvent::MouseButtonRelease ||
-        type == QEvent::MouseButtonDblClick || type == QEvent::MouseMove;
-
-    auto* sourceWidget = qobject_cast<QWidget*>(obj);
-    if (!m_toolbarManager->IsEditingToolBars() || !isMouseEvent || !sourceWidget)
-    {
-        return QToolBar::eventFilter(obj, ev);
-    }
-
-    QAction* sourceAction = ActionForWidget(sourceWidget);
-    if (!sourceAction)
-    {
-        qWarning() << Q_FUNC_INFO << "Source widget" << sourceWidget << "doesn't have actions";
-        return QToolBar::eventFilter(obj, ev);
-    }
-
-    if (ev->type() == QEvent::MouseButtonPress)
-    {
-        QAction* action = ActionForWidget(sourceWidget);
-        const int actionId = action ? action->data().toInt() : 0;
-        if (actionId <= 0)
-        {
-            // Doesn't happen
-            qWarning() << Q_FUNC_INFO << "Invalid action id for widget" << sourceWidget << action << actionId;
-            return false;
-        }
-
-        QDrag* drag = new QDrag(sourceWidget);
-
-        { // Nested scope so painter gets deleted before we enter nested event-loop of QDrag::exec().
-          // Otherwise QPainter dereferences invalid pointer because QWidget was deleted already
-            QPixmap iconPixmap(sourceWidget->size());
-            QPainter painter(&iconPixmap);
-            sourceWidget->render(&painter);
-            drag->setPixmap(iconPixmap);
-        }
-
-        QMimeData* mimeData = new QMimeData();
-        mimeData->setText(action->text());
-        drag->setMimeData(mimeData);
-
-        drag->exec();
-        m_dndIndicator->setLastDragPos(QPoint());
-        return true;
-    }
-    else if (ev->type() == QEvent::MouseButtonPress)
-    {
-        if (QWidget* w = qobject_cast<QWidget*>(obj))
-        {
-            qDebug() << w->actions();
-        }
-    }
-    else if (isMouseEvent)
-    {
-        return true;
-    }
-
-    return QToolBar::eventFilter(obj, ev);
-}
-
-QAction* EditableQToolBar::actionFromDrop(QDropEvent* ev) const
-{
-    if (ev->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist"))
-    {
-        // The drag originated in ToolbarCustomizationDialog's list view of commands, decode it
-        QByteArray encoded = ev->mimeData()->data("application/x-qabstractitemmodeldatalist");
-        QDataStream stream(&encoded, QIODevice::ReadOnly);
-
-        if (!stream.atEnd())
-        {
-            int row, col;
-            QMap<int,  QVariant> roleDataMap;
-            stream >> row >> col >> roleDataMap;
-            const int actionId = roleDataMap.value(ActionRole).toInt();
-            if (actionId > 0)
-            {
-                return m_actionManager->GetAction(actionId);
-            }
-        }
-    }
-    else if (auto w = qobject_cast<QWidget*>(ev->source()))
-    {
-        return ActionForWidget(w);
-    }
-
-    return nullptr;
-}
-
-QAction* EditableQToolBar::ActionForWidget(QWidget* w) const
-{
-    EditableQToolBar* toolbar = m_toolbarManager->ToolbarParent(w);
-    if (!toolbar)
-    {
-        qWarning() << Q_FUNC_INFO << "Couldn't find parent toolbar for widget" << w;
-        return nullptr;
-    }
-
-    // Does the reverse of QToolBar::widgetForAction()
-    // Useful because only QToolButtons have actions, separators and custom widgets
-    // return an empty actions list.
-
-    for (QAction* action : toolbar->actions())
-    {
-        if (w == toolbar->widgetForAction(action))
-        {
-            return action;
-        }
-    }
-
-    return nullptr;
-}
-
-void EditableQToolBar::dropEvent(QDropEvent* ev)
-{
-    auto srcWidget = qobject_cast<QWidget*>(ev->source());
-    QAction* action = actionFromDrop(ev);
-    if (!action || !srcWidget)
-    { // doesn't happen
-        qDebug() << Q_FUNC_INFO << "null action or widget" << action << srcWidget;
-        return;
-    }
-
-    const int actionId = action->data().toInt();
-    QWidget* beforeWidget = insertPositionForDrop(ev->pos());
-    QAction* beforeAction = beforeWidget ? ActionForWidget(beforeWidget) : nullptr;
-
-    if (beforeAction == action)
-    {// Same place, nothing to do
-        m_dndIndicator->setLastDragPos(QPoint());
-        return;
-    }
-
-    if (EditableQToolBar* sourceToolbar = m_toolbarManager->ToolbarParent(srcWidget)) // If we're dragging from a QToolBar (instead of the customization dialog)
-    {
-        if (!m_toolbarManager->DeleteAction(sourceToolbar->ActionForWidget(srcWidget), sourceToolbar))
-        {
-            qWarning() << Q_FUNC_INFO << "Failed to delete source widget" << srcWidget;
-            return;
-        }
-    }
-    m_toolbarManager->InsertAction(action, beforeWidget, beforeAction, this);
-    m_dndIndicator->setLastDragPos(QPoint());
-}
-
-void EditableQToolBar::dragEnterEvent(QDragEnterEvent* ev)
-{
-    dragMoveEvent(ev); // Same code to run
-}
-
-void EditableQToolBar::dragMoveEvent(QDragMoveEvent* ev)
-{
-    // FIXME: D&D into & within vertical toolbars is broken
-    if (!m_toolbarManager->IsEditingToolBars() || orientation() == Qt::Orientation::Vertical)
-    {
-        return;
-    }
-
-    // We support dragging from a QToolBar but also from ToolbarCustomizationDialog's list view of commands
-    auto sourceWidget = qobject_cast<QWidget*>(ev->source());
-    if (!sourceWidget)
-    {
-        qWarning() << Q_FUNC_INFO << "Ignoring drag, widget is null";
-        return;
-    }
-
-    const bool valid = ev->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist") || ActionForWidget(sourceWidget) != nullptr;
-    if (valid)
-    {
-        m_dndIndicator->setDragSourceWidget(sourceWidget);
-        m_dndIndicator->setLastDragPos(ev->pos());
-        ev->accept();
-        update();
-    }
-    else
-    {
-        qWarning() << Q_FUNC_INFO << "Ignoring drag. Widget=" << ev->source();
-        m_dndIndicator->setLastDragPos(QPoint());
-        ev->ignore();
-    }
-}
-
-void EditableQToolBar::dragLeaveEvent(QDragLeaveEvent* ev)
-{
-    if (!m_toolbarManager->IsEditingToolBars())
-    {
-        return;
-    }
-
-    if (!m_dndIndicator->lastDragPos().isNull())
-    {
-        m_dndIndicator->setLastDragPos(QPoint());
-        ev->accept();
-        update();
-    }
-    else
-    {
-        ev->ignore();
-    }
-}
-
-AmazonToolbar::AmazonToolbar(const QString& name, const QString& translatedName)
-    : m_name(name)
-    , m_translatedName(translatedName)
-{
-}
-
-const bool AmazonToolbar::IsSame(const AmazonToolbar& other) const
-{
-    if (m_actions.size() != other.m_actions.size())
-    {
-        return false;
-    }
-
-    if (m_showByDefault != other.m_showByDefault)
-    {
-        return false;
-    }
-
-    if (m_showToggled != other.m_showToggled)
-    {
-        return false;
-    }
-
-    bool actionListsSame = AZStd::equal(m_actions.cbegin(), m_actions.cend(), other.m_actions.cbegin());
-    if (!actionListsSame)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-void AmazonToolbar::InstantiateToolbar(QMainWindow* mainWindow, ToolbarManager* manager)
-{
-    Q_ASSERT(!m_toolbar);
-    m_toolbar = new EditableQToolBar(m_translatedName, manager);
-    m_toolbar->setObjectName(m_name);
-    if (IsMainToolbar())
-    {
-        AzQtComponents::ToolBar::addMainToolBarStyle(m_toolbar);
-    }
-    if (QToolButton* expansion = AzQtComponents::ToolBar::getToolBarExpansionButton(m_toolbar))
-    {
-        expansion->installEventFilter(manager->GetExpanderWatcher());
-    }
-    mainWindow->addToolBar(m_toolbar);
-
-    // Hide custom toolbars if they've been flagged that way.
-    // We now store whether or not the user has toggled away the default visibility
-    // and use that restore in lieu of QMainWindow's restoreState
-    // So hide if we're hidden by default XOR we've toggled the default visibility
-    if ((!m_showByDefault) ^ m_showToggled)
-    {
-#ifdef AZ_PLATFORM_MAC
-        // on macOS, initially hidden tool bars result in a white rectangle when
-        // attaching a previously detached toolbar LY-66320
-        m_toolbar->show();
-        QMetaObject::invokeMethod(m_toolbar, "hide", Qt::QueuedConnection);
-#else
-        m_toolbar->hide();
-#endif
-    }
-
-    ActionManager* actionManager = manager->GetActionManager();
-    actionManager->AddToolBar(m_toolbar);
-
-    SetActionsOnInternalToolbar(actionManager);
-
-    UpdateAllowedAreas();
-}
-
-void AmazonToolbar::AddAction(int actionId, int toolbarVersionAdded)
-{
-    m_actions.push_back({ actionId, toolbarVersionAdded });
-}
-
-void AmazonToolbar::Clear()
-{
-    m_actions.clear();
-}
-
-QVector<int> AmazonToolbar::ActionIds() const
-{
-    QVector<int> ret;
-    ret.reserve(m_actions.size());
-
-    for (auto actionData : m_actions)
-    {
-        ret.push_back(actionData.actionId);
-    }
-
-    return ret;
-}
-
-void AmazonToolbar::SetName(const QString& name, const QString& translatedName)
-{
-    m_name = name;
-    m_translatedName = translatedName;
-    if (m_toolbar)
-    {
-        m_toolbar->setWindowTitle(translatedName);
-    }
-}
-
-#include <moc_ToolbarManager.cpp>
diff --git a/Code/Sandbox/Editor/ToolbarManager.h b/Code/Sandbox/Editor/ToolbarManager.h
deleted file mode 100644
index 681b0ee389..0000000000
--- a/Code/Sandbox/Editor/ToolbarManager.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#ifndef TOOLBAR_MANAGER_H
-#define TOOLBAR_MANAGER_H
-
-#if !defined(Q_MOC_RUN)
-#include <QString>
-#include <QVector>
-#include <QSettings>
-#include <QToolBar>
-#include <QSize>
-
-#include <functional>
-#endif
-
-class ActionManager;
-class QChildEvent;
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDragLeaveEvent;
-class QDropEvent;
-class ToolbarManager;
-class DnDIndicator;
-class MainWindow;
-
-enum StandardToolbar
-{
-    UndefinedToolbar = -1,
-    EditModeToolbar = 0,
-    ObjectToolbar,
-    EditorsToolbar,
-    SubstanceToolbar,
-    MiscToolbar
-};
-
-enum Role
-{
-    ActionRole = Qt::UserRole
-};
-
-// A QToolBar which DnD support
-class EditableQToolBar
-    : public QToolBar
-{
-    Q_OBJECT
-public:
-    explicit EditableQToolBar(const QString& title, ToolbarManager* manager);
-    QAction* ActionForWidget(QWidget* w) const;
-protected:
-    void childEvent(QChildEvent* ev) override;
-    void dragMoveEvent(QDragMoveEvent* ev) override;
-    void dragEnterEvent(QDragEnterEvent* ev) override;
-    void dragLeaveEvent(QDragLeaveEvent* ev) override;
-    void dropEvent(QDropEvent* ev) override;
-private:
-    QWidget* insertPositionForDrop(QPoint mousePos);
-    QList<QWidget*> childWidgetsWithActions() const;
-    QAction* actionFromDrop(QDropEvent* ev) const;
-    bool eventFilter(QObject* obj, QEvent* ev) override;
-    ToolbarManager* const m_toolbarManager;
-    ActionManager* const m_actionManager;
-    DnDIndicator* const m_dndIndicator;
-    friend class DnDIndicator;
-};
-
-class AmazonToolbar
-{
-public:
-    typedef QVector<AmazonToolbar> List;
-
-    AmazonToolbar(const QString& name = QString(), const QString& translatedName = QString());
-    AmazonToolbar(const AmazonToolbar&) = default;
-    AmazonToolbar& operator=(const AmazonToolbar&) = default;
-
-    void InstantiateToolbar(QMainWindow* mainWindow, ToolbarManager* manager);
-    bool IsInstantiated() const { return m_toolbar != nullptr; }
-
-    void SetName(const QString& name, const QString& translatedName);
-
-    const QString& GetName() const { return m_name; }
-    const QString& GetTranslatedName() const { return m_translatedName; }
-
-    void AddAction(int actionId, int toolbarVersionAdded = 0);
-
-    QToolBar* Toolbar() const { return m_toolbar; }
-
-    void Clear();
-    QVector<int> ActionIds() const;
-
-    void SetShowByDefault(bool value) { m_showByDefault = value; }
-    void SetShowToggled(bool value) { m_showToggled = value; }
-    void SetMainToolbar(bool value) { m_isMainToolbar = value; }
-    bool IsShowByDefault() const { return m_showByDefault; }
-    bool IsShowToggled() const { return m_showToggled; }
-    bool IsMainToolbar() const { return m_isMainToolbar; }
-
-    void CopyActions(const AmazonToolbar& other) { m_actions = other.m_actions; }
-    void SetActionsOnInternalToolbar(ActionManager* actionManager);
-
-    void UpdateAllowedAreas();
-    static void UpdateAllowedAreas(QToolBar* toolbar);
-
-    const bool IsSame(const AmazonToolbar& other) const;
-
-private:
-    QString m_name; // Not translated, for settings keys and such
-    QString m_translatedName;
-    QToolBar* m_toolbar = nullptr;
-
-    struct ActionData
-    {
-        int actionId;
-        int toolbarVersionAdded;
-
-        bool operator ==(const AmazonToolbar::ActionData& other) const
-        {
-            return actionId == other.actionId;
-        }
-    };
-
-    QVector<ActionData> m_actions;
-    bool m_showByDefault = true;
-    bool m_showToggled = false;
-    bool m_isMainToolbar = false;
-};
-
-class AmazonToolBarExpanderWatcher;
-
-class ToolbarManager
-{
-public:
-    explicit ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow);
-    ~ToolbarManager();
-
-    AmazonToolbar GetToolbar(int index);
-    AmazonToolbar::List GetToolbars() const;
-    void RestoreToolbarDefaults(const QString& toolbarName);
-    void SetEnabled(bool enabled);
-
-    bool Delete(int index);
-    bool Rename(int index, const QString& newName);
-    int Add(const QString& name);
-    void LoadToolbars();
-    bool IsCustomToolbar(int index) const;
-    bool IsCustomToolbar(const QString& name) const;
-    EditableQToolBar* ToolbarParent(QObject* o) const;
-    ActionManager* GetActionManager() const;
-    AmazonToolBarExpanderWatcher* GetExpanderWatcher() const;
-
-    void SetIsEditingToolBars(bool);
-    bool IsEditingToolBars() const;
-
-    bool DeleteAction(QAction* action, EditableQToolBar*);
-    void InsertAction(QAction* action, QWidget* beforeWidget, QAction* beforeAction, EditableQToolBar* toolbar);
-
-    AmazonToolbar GetEditModeToolbar() const;
-    AmazonToolbar GetObjectToolbar() const;
-    AmazonToolbar GetEditorsToolbar() const;
-    AmazonToolbar GetMiscToolbar() const;
-    AmazonToolbar GetPlayConsoleToolbar() const;
-
-    void AddButtonToEditToolbar(QAction* action);
-
-private:
-    Q_DISABLE_COPY(ToolbarManager);
-    void SaveToolbars();
-    void SaveToolbar(EditableQToolBar* toolbar);
-    void InstantiateToolbars();
-    void InstantiateToolbar(int index);
-    void SanitizeToolbars(const QMap<QString, AmazonToolbar>& previousStandardToolbars);
-    void InitializeStandardToolbars();
-    void UpdateAllowedAreas(QToolBar* toolbar);
-    bool IsDirty(const AmazonToolbar& toolbar) const;
-
-    const AmazonToolbar* FindDefaultToolbar(const QString& toolbarName) const;
-    AmazonToolbar* FindToolbar(const QString& toolbarName);
-
-    MainWindow* const m_mainWindow;
-    ActionManager* const m_actionManager;
-    QSettings m_settings;
-    AmazonToolbar::List m_toolbars;
-    AmazonToolBarExpanderWatcher* m_expanderWatcher;
-    int m_loadedVersion = 0;
-    bool m_isEditingToolBars = false;
-
-    AmazonToolbar::List m_standardToolbars;
-};
-
-#endif
diff --git a/Code/Sandbox/Editor/ToolsConfigPage.cpp b/Code/Sandbox/Editor/ToolsConfigPage.cpp
deleted file mode 100644
index 2cb904d393..0000000000
--- a/Code/Sandbox/Editor/ToolsConfigPage.cpp
+++ /dev/null
@@ -1,883 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ToolsConfigPage.h"
-
-// Qt
-#include <QCompleter>
-#include <QMessageBox>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/TabWidget.h>
-
-// Editor
-#include "Settings.h"
-#include "MainWindow.h"
-#include "ToolBox.h"
-#include "KeyboardCustomizationSettings.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_ToolsConfigPage.h>
-#include <ui_IconListDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-namespace
-{
-    QColor COLOR_FOR_EDITOR_COMMAND = QColor(0, 255, 0);
-    QColor COLOR_FOR_CONSOLE_COMMAND = QColor(0, 0, 255);
-    QColor COLOR_FOR_TOGGLE_COMMAND = QColor(128, 0, 255);
-    QColor COLOR_FOR_INVALID_COMMAND = QColor(255, 0, 0);
-
-    UINT CONSOLE_CMD_DROP_LIST_HEIGHT           = 300;
-};
-
-class IconListModel
-    : public QAbstractListModel
-{
-public:
-    IconListModel(QObject* parent = nullptr)
-        : QAbstractListModel(parent)
-    {
-        IFileUtil::FileArray pngFiles;
-
-        // Search for the png files in Editor/UI/Icons folder
-        // and add them to the image list.
-        const int iconSize = 32;    // Currently, accepts the image of this size only.
-        if (gSettings.searchPaths[EDITOR_PATH_UI_ICONS].empty())
-        {
-            return;
-        }
-        const QString iconsDir = gSettings.searchPaths[EDITOR_PATH_UI_ICONS][0];
-        CFileUtil::ScanDirectory(iconsDir, "*.png", pngFiles);
-        m_iconImages.reserve(pngFiles.size());
-        m_iconFiles.reserve(pngFiles.size());
-        for (size_t i = 0; i < pngFiles.size(); ++i)
-        {
-            const QString path = Path::Make(iconsDir, pngFiles[i].filename);
-            QPixmap bm(path);
-            if (bm.isNull())
-            {
-                continue;
-            }
-            if (bm.width() == iconSize && bm.height() == iconSize)
-            {
-                QIcon icon(bm);
-                icon.addPixmap(bm, QIcon::Selected);
-                m_iconImages.push_back(icon);
-                m_iconFiles.push_back(path);
-            }
-        }
-    }
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        return parent.isValid() ? 0 : m_iconImages.count();
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        if (!index.isValid() || index.row() >= rowCount(index.parent()))
-        {
-            return QVariant();
-        }
-
-        switch (role)
-        {
-        case Qt::DisplayRole:
-            return m_iconFiles[index.row()];
-        case Qt::DecorationRole:
-            return m_iconImages[index.row()];
-        default:
-            return QVariant();
-        }
-    }
-
-private:
-    QVector<QIcon> m_iconImages;
-    QStringList m_iconFiles;
-};
-
-CIconListDialog::CIconListDialog(QWidget* pParent /* = NULL */)
-    : QDialog(pParent)
-    , m_ui(new Ui::IconListDialog)
-{
-    m_ui->setupUi(this);
-    m_ui->m_iconListCtrl->setModel(new IconListModel(this));
-}
-
-bool CIconListDialog::GetSelectedIconPath(QString& path) const
-{
-    if (!m_ui->m_iconListCtrl->currentIndex().isValid())
-    {
-        return false;
-    }
-    path = m_ui->m_iconListCtrl->currentIndex().data().toString();
-    return true;
-}
-
-class CommandModel
-    : public QAbstractListModel
-{
-public:
-    CommandModel(QObject* parent = nullptr)
-        : QAbstractListModel(parent)
-    {
-    }
-
-    void setMacroIndex(const QModelIndex& macroIndex)
-    {
-        if (m_macroIndex == macroIndex)
-        {
-            return;
-        }
-        beginResetModel();
-        m_macroIndex = macroIndex;
-        endResetModel();
-    }
-
-    bool addRow()
-    {
-        if (macro() == nullptr)
-        {
-            return false;
-        }
-        beginInsertRows(QModelIndex(), rowCount(), rowCount());
-        macro()->AddCommand(CToolBoxCommand::eT_INVALID_COMMAND, "nop");
-        endInsertRows();
-        return true;
-    }
-
-    bool moveRow(int row, bool up)
-    {
-        const int targetRow = up ? row - 1 : row + 1;
-        if (row < 0 || row >= rowCount() || targetRow < 0 || targetRow >= rowCount())
-        {
-            return false;
-        }
-        if (up)
-        {
-            beginMoveRows(QModelIndex(), row, row, QModelIndex(), row - 1);
-        }
-        else
-        {
-            beginMoveRows(QModelIndex(), row + 1, row + 1, QModelIndex(), row);
-        }
-        macro()->SwapCommand(row, targetRow);
-        endMoveRows();
-        return true;
-    }
-
-    bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override
-    {
-        if (row < 0 || row + count - 1 >= rowCount(parent))
-        {
-            return false;
-        }
-
-        beginRemoveRows(QModelIndex(), row, row + count - 1);
-        for (int r = row + count - 1; r >= row; --r)
-        {
-            macro()->RemoveCommand(r);
-        }
-        endRemoveRows();
-        return true;
-    }
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        return parent.isValid() || macro() == nullptr ? 0 : macro()->GetCommandCount();
-    }
-
-    bool setData(const QModelIndex& index, [[maybe_unused]] const QVariant& value, int role = Qt::EditRole) override
-    {
-        if (!index.isValid() || index.row() >= rowCount(index.parent()))
-        {
-            return false;
-        }
-
-        if (role != Qt::UserRole)
-        {
-            return false;
-        }
-
-        // this has already been set
-        emit dataChanged(index, index);
-        return true;
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        if (!index.isValid() || index.row() >= rowCount(index.parent()))
-        {
-            return QVariant();
-        }
-
-        auto command = macro()->GetCommandAt(index.row());
-        switch (role)
-        {
-        case Qt::DisplayRole:
-        case Qt::EditRole:
-            return command->m_text;
-        case Qt::ForegroundRole:
-            switch (command->m_type)
-            {
-            case CToolBoxCommand::eT_SCRIPT_COMMAND:
-                return QVariant::fromValue(COLOR_FOR_EDITOR_COMMAND);
-            case CToolBoxCommand::eT_CONSOLE_COMMAND:
-                return command->m_bVariableToggle ? QVariant::fromValue(COLOR_FOR_TOGGLE_COMMAND) : QVariant::fromValue(COLOR_FOR_CONSOLE_COMMAND);
-            default:
-                return QVariant::fromValue(COLOR_FOR_INVALID_COMMAND);
-            }
-        case Qt::UserRole:
-            return QVariant::fromValue(command);
-        default:
-            return QVariant();
-        }
-    }
-
-private:
-    CToolBoxMacro* macro() const
-    {
-        return m_macroIndex.data(Qt::UserRole).value<CToolBoxMacro*>();
-    }
-
-    QPersistentModelIndex m_macroIndex;
-};
-
-class MacroModel
-    : public QAbstractListModel
-{
-public:
-    MacroModel(QObject* parent = nullptr)
-        : QAbstractListModel(parent)
-        , m_hasEmptyRow(false)
-        , m_currentlyRemovingRows(false)
-    {
-    }
-
-    bool moveRow(int row, bool up)
-    {
-        if (m_hasEmptyRow)
-        {
-            return false;
-        }
-
-        const int targetRow = up ? row - 1 : row + 1;
-        if (row < 0 || row >= rowCount() || targetRow < 0 || targetRow >= rowCount())
-        {
-            return false;
-        }
-        if (up)
-        {
-            beginMoveRows(QModelIndex(), row, row, QModelIndex(), row - 1);
-        }
-        else
-        {
-            beginMoveRows(QModelIndex(), row + 1, row + 1, QModelIndex(), row);
-        }
-        GetIEditor()->GetToolBoxManager()->SwapMacro(row, targetRow, true);
-        endMoveRows();
-        return true;
-    }
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        return parent.isValid() ? 0 : (GetIEditor()->GetToolBoxManager()->GetMacroCount(true) + (m_hasEmptyRow ? 1 : 0));
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        if (!index.isValid() || index.row() >= rowCount(index.parent()))
-        {
-            return QVariant();
-        }
-
-        if (isEmptyRow(index))
-        {
-            switch (role)
-            {
-            case Qt::DisplayRole:
-            case Qt::EditRole:
-                return QString();
-            default:
-                return QVariant();
-            }
-        }
-
-        auto macro = GetIEditor()->GetToolBoxManager()->GetMacro(index.row(), true);
-
-        switch (role)
-        {
-        case Qt::DisplayRole:
-        case Qt::EditRole:
-            return macro->GetTitle();
-        case Qt::UserRole:
-            return QVariant::fromValue(macro);
-        default:
-            return QVariant();
-        }
-    }
-
-    bool setData(const QModelIndex& index, const QVariant& data, [[maybe_unused]] int role = Qt::EditRole) override
-    {
-        if (!index.isValid() || index.row() >= rowCount(index.parent()))
-        {
-            return false;
-        }
-
-        // Retrieve the dialog parent widget for this model so we can display
-        // error popups properly (if needed)
-        QWidget* parentWidget = qobject_cast<QWidget*>(parent());
-
-        // isNull and isValid in Qvariant/QString in this case cannot detect null input
-        // check null data input
-        if (data.toString().isEmpty())
-        {
-            if (!m_currentlyRemovingRows)
-            {
-                QMessageBox::critical(parentWidget, QString(), tr("Please enter a valid name!"));
-
-                // If this is a newly added empty row, then just delete it
-                // Otherwise if the user was renaming an existing row, the previous
-                // value will be restored
-                if (isEmptyRow(index))
-                {
-                    removeRow(index.row());
-                    assert(!m_hasEmptyRow);
-                }
-            }
-
-            return false;
-        }
-
-        if (isEmptyRow(index))
-        {
-            auto macro = GetIEditor()->GetToolBoxManager()->NewMacro(data.toString(), true, nullptr);
-            if (macro == nullptr)
-            {
-                QMessageBox::critical(parentWidget, QString(), tr("There is a macro of that name, already!"));
-
-                removeRow(index.row());
-                assert(!m_hasEmptyRow);
-                return false;
-            }
-
-            emit dataChanged(index, index);
-            m_hasEmptyRow = false;
-        }
-        else if (GetIEditor()->GetToolBoxManager()->SetMacroTitle(index.row(), data.toString(), true))
-        {
-            emit dataChanged(index, index);
-            return true;
-        }
-        else
-        {
-            QMessageBox::critical(parentWidget, QString(), tr("There is a macro of that name, already!"));
-        }
-
-        return false;
-    }
-
-    Qt::ItemFlags flags(const QModelIndex& index) const override
-    {
-        return QAbstractListModel::flags(index) | Qt::ItemIsEditable;
-    }
-
-    bool addRow()
-    {
-        if (m_hasEmptyRow)
-        {
-            return false;
-        }
-        beginInsertRows(QModelIndex(), rowCount(), rowCount());
-        m_hasEmptyRow = true;
-        endInsertRows();
-        return true;
-    }
-
-    bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override
-    {
-        if (row < 0 || row + count - 1 >= rowCount(parent))
-        {
-            return false;
-        }
-
-        m_currentlyRemovingRows = true;
-        beginRemoveRows(QModelIndex(), row, row + count - 1);
-
-        auto tools = GetIEditor()->GetToolBoxManager();
-        for (int r = row + count - 1; r >= row; --r)
-        {
-            if (r == rowCount() - 1 && m_hasEmptyRow)
-            {
-                m_hasEmptyRow = false;
-            }
-            else
-            {
-                tools->RemoveMacro(r, true);
-            }
-        }
-
-        endRemoveRows();
-        m_currentlyRemovingRows = false;
-        return true;
-    }
-
-private:
-    bool m_hasEmptyRow;
-    bool m_currentlyRemovingRows;
-
-    // Empty row is the last row in the list if the proper flag is set
-    bool isEmptyRow(const QModelIndex& index) const
-    {
-        return m_hasEmptyRow && index.row() == rowCount() - 1;
-    }
-};
-
-// CToolsConfigPage dialog
-
-ToolsConfigDialog::ToolsConfigDialog(QWidget* parent)
-    : QDialog(parent)
-{
-    setWindowTitle(tr("Configure ToolBox Macros"));
-    setLayout(new QVBoxLayout);
-    AzQtComponents::TabWidget* tabs = new AzQtComponents::TabWidget;
-    AzQtComponents::TabWidget::applySecondaryStyle(tabs, false);
-    layout()->addWidget(tabs);
-    CToolsConfigPage* page = new CToolsConfigPage;
-    tabs->addTab(page, page->windowTitle());
-    QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-    layout()->addWidget(buttons);
-    connect(buttons, &QDialogButtonBox::accepted, page, &CToolsConfigPage::OnOK);
-    connect(buttons, &QDialogButtonBox::rejected, page, &CToolsConfigPage::OnCancel);
-    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-void ToolsConfigDialog::reject()
-{
-    // Revert to the original.
-    GetIEditor()->GetToolBoxManager()->Load();
-    QDialog::reject();
-}
-
-void ToolsConfigDialog::closeEvent(QCloseEvent* ev)
-{
-    reject();
-    QDialog::closeEvent(ev);
-}
-
-CToolsConfigPage::CToolsConfigPage(QWidget* parent)
-    : QWidget(parent)
-    , m_macroModel(new MacroModel(this))
-    , m_commandModel(new CommandModel(this))
-    , m_completionModel(new QStringListModel(this))
-    , m_ui(new Ui::ToolsConfigPage)
-{
-    m_ui->setupUi(this);
-
-    m_ui->m_macroCmd->setCompleter(new QCompleter(m_completionModel));
-
-    connect(m_ui->m_macroShortcutKey, &QKeySequenceEdit::keySequenceChanged, this, [&]([[maybe_unused]] const QKeySequence &keySequence) {
-        int numOfShortcuts = m_ui->m_macroShortcutKey->keySequence().count() - 1;
-        if (numOfShortcuts >= 1)
-        {
-            int value = m_ui->m_macroShortcutKey->keySequence()[numOfShortcuts];
-            QKeySequence shortcut(value);
-            m_ui->m_macroShortcutKey->setKeySequence(shortcut);
-        }
-        
-        if (m_ui->m_macroShortcutKey->keySequence().count() >= 1)
-        {
-            m_ui->m_assignShortcut->setEnabled(true);
-        }
-        else
-        {
-            m_ui->m_assignShortcut->setEnabled(false);
-        }
-    });
-
-    OnInitDialog();
-}
-
-CToolsConfigPage::~CToolsConfigPage()
-{
-}
-
-// CToolsConfigPage message handlers
-void CToolsConfigPage::OnInitDialog()
-{
-    m_ui->m_macroList->setModel(m_macroModel);
-    m_ui->m_commandList->setModel(m_commandModel);
-
-    connect(m_ui->m_assignCommand, &QPushButton::clicked, this, &CToolsConfigPage::OnAssignCommand);
-    connect(m_ui->m_assignShortcut, &QPushButton::clicked, this, &CToolsConfigPage::OnAssignMacroShortcut);
-    connect(m_ui->m_selectIcon, &QPushButton::clicked, this, &CToolsConfigPage::OnSelectMacroIcon);
-    connect(m_ui->m_clearIcon, &QPushButton::clicked, this, &CToolsConfigPage::OnClearMacroIcon);
-    connect(m_ui->m_console, &QRadioButton::clicked, this, &CToolsConfigPage::OnConsoleCmd);
-    connect(m_ui->m_script, &QRadioButton::clicked, this, &CToolsConfigPage::OnScriptCmd);
-
-    connect(m_ui->m_macroList->selectionModel(), &QItemSelectionModel::currentChanged, this, &CToolsConfigPage::OnSelchangeMacroList);
-    connect(m_ui->m_buttonMacroNew, &QToolButton::clicked, this, &CToolsConfigPage::OnNewMacroItem);
-    connect(m_ui->m_buttonMacroUp, &QToolButton::clicked, this, &CToolsConfigPage::OnMoveMacroItemUp);
-    connect(m_ui->m_buttonMacroDown, &QToolButton::clicked, this, &CToolsConfigPage::OnMoveMacroItemDown);
-    connect(m_ui->m_buttonMacroDelete, &QToolButton::clicked, this, &CToolsConfigPage::OnDeleteMacroItem);
-
-    connect(m_ui->m_commandList->selectionModel(), &QItemSelectionModel::currentChanged, this, &CToolsConfigPage::OnSelchangeCommandList);
-    connect(m_ui->m_buttonCommandNew, &QToolButton::clicked, this, &CToolsConfigPage::OnNewCommandItem);
-    connect(m_ui->m_buttonCommandUp, &QToolButton::clicked, this, &CToolsConfigPage::OnMoveCommandItemUp);
-    connect(m_ui->m_buttonCommandDown, &QToolButton::clicked, this, &CToolsConfigPage::OnMoveCommandItemDown);
-    connect(m_ui->m_buttonCommandDelete, &QToolButton::clicked, this, &CToolsConfigPage::OnDeleteCommandItem);
-
-    m_consoleOrScript = 1;  // To force the change in the next line
-    OnConsoleCmd();
-
-    // To ensure the proper disabling of controls
-    OnSelchangeMacroList();
-    OnSelchangeCommandList();
-}
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnOK()
-{
-    GetIEditor()->GetToolBoxManager()->Save();
-    MainWindow* pMainFrame = MainWindow::instance();
-
-    auto pShortcutMgr = pMainFrame->GetShortcutManager();
-    if (pShortcutMgr)
-    {
-        pShortcutMgr->Save();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnCancel()
-{
-    auto pShortcutMgr = MainWindow::instance()->GetShortcutManager();
-    if (pShortcutMgr)
-    {
-        pShortcutMgr->Load();
-    }
-
-    // Revert to the original.
-    GetIEditor()->GetToolBoxManager()->Load();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnSelchangeMacroList()
-{
-    /// Update the command list.
-    auto macro = m_ui->m_macroList->currentIndex().data(Qt::UserRole).value<CToolBoxMacro*>();
-    m_commandModel->setMacroIndex(m_ui->m_macroList->currentIndex());
-
-    if (m_ui->m_macroList->currentIndex().isValid())
-    {
-        // Update the shortcut.
-        auto pShortcutMgr = MainWindow::instance()->GetShortcutManager();
-        m_ui->m_macroShortcutKey->clear();
-        if (pShortcutMgr && macro)
-        {
-            m_ui->m_macroShortcutKey->setKeySequence(macro->GetShortcutName());
-        }
-
-        /// Update the icon.
-        const QPixmap icon(macro != nullptr ? macro->GetIconPath() : QString());
-        m_ui->m_macroIcon->setPixmap(icon);
-
-        m_ui->m_macroShortcutKey->setEnabled(true);
-        m_ui->m_selectIcon->setEnabled(true);
-        m_ui->m_clearIcon->setEnabled(true);
-    }
-    else
-    {
-        m_ui->m_macroShortcutKey->setEnabled(false);
-        m_ui->m_assignShortcut->setEnabled(false);
-        m_ui->m_selectIcon->setEnabled(false);
-        m_ui->m_clearIcon->setEnabled(false);
-    }
-
-    m_ui->m_commandList->selectionModel()->clear();
-    OnSelchangeCommandList();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnNewMacroItem()
-{
-    if (m_macroModel->addRow())
-    {
-        const QModelIndex index = m_macroModel->index(m_macroModel->rowCount() - 1, 0);
-        m_ui->m_macroList->setCurrentIndex(index);
-        m_ui->m_macroList->edit(index);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnSelchangeCommandList()
-{
-    auto commandIndex = m_ui->m_commandList->currentIndex();
-
-    if (!commandIndex.isValid())
-    {
-        m_ui->m_assignCommand->setEnabled(false);
-        m_ui->m_macroCmd->setEnabled(false);
-        m_ui->m_macroCmd->clear();
-        m_ui->m_toggleVar->setEnabled(false);
-        m_ui->m_toggleVar->setChecked(false);
-        m_ui->m_console->setEnabled(false);
-        m_ui->m_script->setEnabled(false);
-    }
-    else
-    {
-        m_ui->m_assignCommand->setEnabled(true);
-        m_ui->m_macroCmd->setEnabled(true);
-        m_ui->m_console->setEnabled(true);
-        m_ui->m_script->setEnabled(true);
-        CToolBoxCommand* pCommand = commandIndex.data(Qt::UserRole).value<CToolBoxCommand*>();
-        if (pCommand->m_type == CToolBoxCommand::eT_SCRIPT_COMMAND)
-        {
-            m_ui->m_macroCmd->setText(pCommand->m_text);
-            OnScriptCmd();
-        }
-        else if (pCommand->m_type == CToolBoxCommand::eT_CONSOLE_COMMAND)
-        {
-            m_ui->m_macroCmd->setText(pCommand->m_text);
-            OnConsoleCmd();
-            m_ui->m_toggleVar->setChecked(pCommand->m_bVariableToggle);
-            m_ui->m_toggleVar->setEnabled(true);
-        }
-        else
-        {
-            m_ui->m_macroCmd->clear();
-            OnConsoleCmd();
-            m_ui->m_toggleVar->setChecked(false);
-            m_ui->m_toggleVar->setEnabled(true);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnNewCommandItem()
-{
-    if (m_commandModel->addRow())
-    {
-        m_ui->m_commandList->setCurrentIndex(m_commandModel->index(m_commandModel->rowCount() - 1));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnAssignCommand()
-{
-    auto commandIndex = m_ui->m_commandList->currentIndex();
-    if (commandIndex.isValid())
-    {
-        CToolBoxCommand* pCommand = commandIndex.data(Qt::UserRole).value<CToolBoxCommand*>();
-        pCommand->m_type = m_consoleOrScript ? CToolBoxCommand::eT_SCRIPT_COMMAND
-            : CToolBoxCommand::eT_CONSOLE_COMMAND;
-        pCommand->m_text = m_ui->m_macroCmd->text();
-        if (pCommand->m_type == CToolBoxCommand::eT_CONSOLE_COMMAND)
-        {
-            pCommand->m_bVariableToggle = m_ui->m_toggleVar->isChecked();
-        }
-        else
-        {
-            pCommand->m_bVariableToggle = false;
-        }
-
-        m_commandModel->setData(commandIndex, QVariant::fromValue(pCommand), Qt::UserRole);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnAssignMacroShortcut()
-{
-    auto pShortcutMgr = MainWindow::instance()->GetShortcutManager();
-
-    if (pShortcutMgr  == NULL)
-    {
-        return;
-    }
-
-    auto macroIndex = m_ui->m_macroList->currentIndex();
-
-    if (!macroIndex.isValid())
-    {
-        return;
-    }
-
-    QKeySequence editorAccel = m_ui->m_macroShortcutKey->keySequence();
-    CToolBoxMacro* pMacro = macroIndex.data(Qt::UserRole).value<CToolBoxMacro*>();
-
-    QAction* action = pShortcutMgr->FindActionForShortcut(editorAccel);
-    bool bReassign = false;
-
-    if (action != nullptr)
-    {
-        if (!bReassign && QMessageBox::question(this, QString(), tr("This shortcut is currently assigned.\nDo you want to re - assign this shortcut ?")) != QMessageBox::Yes)
-        {
-            m_ui->m_macroShortcutKey->setKeySequence(pMacro->GetShortcutName());
-            return;
-        }
-        bReassign = true;
-        action->setShortcut(QKeySequence());
-    }
-
-    pMacro->SetShortcutName(m_ui->m_macroShortcutKey->keySequence());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnMoveMacroItemUp()
-{
-    auto macroIndex = m_ui->m_macroList->currentIndex();
-    m_macroModel->moveRow(macroIndex.row(), true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnMoveMacroItemDown()
-{
-    auto macroIndex = m_ui->m_macroList->currentIndex();
-    m_macroModel->moveRow(macroIndex.row(), false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnMoveCommandItemUp()
-{
-    auto commandIndex = m_ui->m_commandList->currentIndex();
-    m_commandModel->moveRow(commandIndex.row(), true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnMoveCommandItemDown()
-{
-    auto commandIndex = m_ui->m_commandList->currentIndex();
-    m_commandModel->moveRow(commandIndex.row(), false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnDeleteMacroItem()
-{
-    m_macroModel->removeRow(m_ui->m_macroList->currentIndex().row());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnDeleteCommandItem()
-{
-    m_commandModel->removeRow(m_ui->m_commandList->currentIndex().row());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnSelectMacroIcon()
-{
-    auto macroIndex = m_ui->m_macroList->currentIndex();
-    if (!macroIndex.isValid())
-    {
-        return;
-    }
-
-    CToolBoxMacro* pMacro = macroIndex.data(Qt::UserRole).value<CToolBoxMacro*>();
-
-    CIconListDialog iconListDlg;
-    if (iconListDlg.exec() == QDialog::Accepted)
-    {
-        QString iconPath;
-        if (iconListDlg.GetSelectedIconPath(iconPath))
-        {
-            const QPixmap pixmap(iconPath);
-            m_ui->m_macroIcon->setPixmap(pixmap);
-            pMacro->SetIconPath(iconPath.toUtf8().data());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnClearMacroIcon()
-{
-    auto macroIndex = m_ui->m_macroList->currentIndex();
-    if (!macroIndex.isValid())
-    {
-        return;
-    }
-
-    CToolBoxMacro* pMacro = macroIndex.data(Qt::UserRole).value<CToolBoxMacro*>();
-    m_ui->m_macroIcon->setPixmap(QPixmap());
-    pMacro->SetIconPath("");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::FillConsoleCmds()
-{
-    QStringList commands;
-    IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-    std::vector<const char*> cmds;
-    cmds.resize(console->GetNumVars());
-    size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
-    for (int i = 0; i < cmdCount; ++i)
-    {
-        commands.push_back(cmds[i]);
-    }
-    m_completionModel->setStringList(commands);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::FillScriptCmds()
-{
-    // Add module names to the auto-completion list.
-    QStringList commands;
-
-    using namespace AzToolsFramework;
-    EditorPythonConsoleInterface* editorPythonConsoleInterface = AZ::Interface<EditorPythonConsoleInterface>::Get();
-    if (editorPythonConsoleInterface)
-    {
-        EditorPythonConsoleInterface::GlobalFunctionCollection globalFunctionCollection;
-        editorPythonConsoleInterface->GetGlobalFunctionList(globalFunctionCollection);
-        commands.reserve(globalFunctionCollection.size());
-        for (const EditorPythonConsoleInterface::GlobalFunction& globalFunction : globalFunctionCollection)
-        {
-            const QString fullCmd = QString("%1.%2()").arg(globalFunction.m_moduleName.data()).arg(globalFunction.m_functionName.data());
-            commands.push_back(fullCmd);
-        }
-    }
-
-    m_completionModel->setStringList(commands);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnConsoleCmd()
-{
-    m_ui->m_console->setChecked(true);
-    if (m_consoleOrScript == 0)
-    {
-        return;
-    }
-
-    m_consoleOrScript = 0;
-    FillConsoleCmds();
-    m_ui->m_toggleVar->setEnabled(true);
-    m_ui->m_toggleVar->setChecked(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CToolsConfigPage::OnScriptCmd()
-{
-    m_ui->m_script->setChecked(true);
-    if (m_consoleOrScript == 1)
-    {
-        return;
-    }
-
-    m_consoleOrScript = 1;
-    FillScriptCmds();
-    m_ui->m_toggleVar->setEnabled(false);
-    m_ui->m_toggleVar->setChecked(false);
-}
-
-#include <moc_ToolsConfigPage.cpp>
diff --git a/Code/Sandbox/Editor/ToolsConfigPage.h b/Code/Sandbox/Editor/ToolsConfigPage.h
deleted file mode 100644
index b79c5f71c1..0000000000
--- a/Code/Sandbox/Editor/ToolsConfigPage.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TOOLSCONFIGPAGE_H
-#define CRYINCLUDE_EDITOR_TOOLSCONFIGPAGE_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QStringListModel>
-#endif
-
-namespace Ui
-{
-    class IconListDialog;
-    class ToolsConfigPage;
-}
-
-class CommandModel;
-class MacroModel;
-
-class QStringListModel;
-
-class CIconListDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CIconListDialog(QWidget* pParent = nullptr);
-
-    bool GetSelectedIconPath(QString& path) const;
-
-protected:
-    void OnInitDialog();
-
-private:
-    QScopedPointer<Ui::IconListDialog> m_ui;
-};
-
-class ToolsConfigDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    ToolsConfigDialog(QWidget* parent = nullptr);
-
-private:
-    void reject() override;
-    void closeEvent(QCloseEvent* ev) override;
-};
-
-/** Tools configuration property page.
-*/
-class CToolsConfigPage
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    CToolsConfigPage(QWidget* parent = nullptr);
-    virtual ~CToolsConfigPage();
-
-    virtual void OnOK();
-    virtual void OnCancel();
-
-protected:
-    virtual void OnInitDialog();
-
-    void OnSelchangeMacroList();
-    void OnSelchangeCommandList();
-
-    void OnAssignCommand();
-    void OnAssignMacroShortcut();
-    void OnSelectMacroIcon();
-    void OnClearMacroIcon();
-
-    void OnConsoleCmd();
-    void OnScriptCmd();
-
-    void OnNewMacroItem();
-    void OnNewCommandItem();
-
-    void OnMoveMacroItemUp();
-    void OnMoveMacroItemDown();
-    void OnMoveCommandItemUp();
-    void OnMoveCommandItemDown();
-
-    void OnDeleteMacroItem();
-    void OnDeleteCommandItem();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Vars.
-    //////////////////////////////////////////////////////////////////////////
-    int m_consoleOrScript;  // 0 -> console commands, 1 -> script commands
-
-    void FillConsoleCmds();
-    void FillScriptCmds();
-
-private:
-    MacroModel* m_macroModel;
-    CommandModel* m_commandModel;
-    QStringListModel* m_completionModel;
-
-    QScopedPointer<Ui::ToolsConfigPage> m_ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_TOOLSCONFIGPAGE_H
diff --git a/Code/Sandbox/Editor/TopRendererWnd.cpp b/Code/Sandbox/Editor/TopRendererWnd.cpp
deleted file mode 100644
index cb5d3069b2..0000000000
--- a/Code/Sandbox/Editor/TopRendererWnd.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TopRendererWnd.h"
-// Editor
-#include "Settings.h"
-
-#include "DisplaySettings.h"
-#include "ViewManager.h"
-
-// Size of the surface texture
-#define SURFACE_TEXTURE_WIDTH 512
-
-#define MARKER_SIZE 6.0f
-#define MARKER_DIR_SIZE 10.0f
-#define SELECTION_RADIUS 30.0f
-
-#define GL_RGBA 0x1908
-#define GL_BGRA 0x80E1
-
-// Used to give each static object type a different color
-static uint32 sVegetationColors[16] =
-{
-    0xFFFF0000,
-    0xFF00FF00,
-    0xFF0000FF,
-    0xFFFFFFFF,
-    0xFFFF00FF,
-    0xFFFFFF00,
-    0xFF00FFFF,
-    0xFF7F00FF,
-    0xFF7FFF7F,
-    0xFFFF7F00,
-    0xFF00FF7F,
-    0xFF7F7F7F,
-    0xFFFF0000,
-    0xFF00FF00,
-    0xFF0000FF,
-    0xFFFFFFFF,
-};
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-QTopRendererWnd::QTopRendererWnd(QWidget* parent)
-    : Q2DViewport(parent)
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Set the window type member of the base class to the correct type and
-    // create the initial surface texture
-    ////////////////////////////////////////////////////////////////////////
-
-    if (gSettings.viewports.bTopMapSwapXY)
-    {
-        SetAxis(VPA_YX);
-    }
-    else
-    {
-        SetAxis(VPA_XY);
-    }
-
-    m_bShowHeightmap = false;
-    m_bShowStatObjects = false;
-    m_bLastShowHeightmapState = false;
-
-    ////////////////////////////////////////////////////////////////////////
-    // Surface texture
-    ////////////////////////////////////////////////////////////////////////
-
-    m_textureSize.setWidth(gSettings.viewports.nTopMapTextureResolution);
-    m_textureSize.setHeight(gSettings.viewports.nTopMapTextureResolution);
-
-    m_heightmapSize = QSize(1, 1);
-
-    m_terrainTextureId = 0;
-
-    m_vegetationTextureId = 0;
-    m_bFirstTerrainUpdate = true;
-    m_bShowWater = false;
-
-    m_bContentsUpdated = false;
-
-    m_gridAlpha = 0.3f;
-    m_colorGridText = QColor(255, 255, 255);
-    m_colorAxisText = QColor(255, 255, 255);
-    m_colorBackground = QColor(128, 128, 128);
-
-    //For this viewport 250 is a better max zoom. 
-    //Anything more than that and the viewport is too small to actually 
-    //paint a heightmap outside of a very high res 4K+ monitor.
-    m_maxZoom = 250.0f;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QTopRendererWnd::~QTopRendererWnd()
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Destroy the attached render and free the surface texture
-    ////////////////////////////////////////////////////////////////////////
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QTopRendererWnd::SetType(EViewportType type)
-{
-    m_viewType = type;
-    m_axis = VPA_YX;
-    SetAxis(m_axis);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QTopRendererWnd::ResetContent()
-{
-    Q2DViewport::ResetContent();
-
-    // Reset texture ids.
-    m_terrainTextureId = 0;
-    m_vegetationTextureId = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QTopRendererWnd::UpdateContent(int flags)
-{
-    if (gSettings.viewports.bTopMapSwapXY)
-    {
-        SetAxis(VPA_YX);
-    }
-    else
-    {
-        SetAxis(VPA_XY);
-    }
-
-    Q2DViewport::UpdateContent(flags);
-    if (!GetIEditor()->GetDocument())
-    {
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QTopRendererWnd::Draw([[maybe_unused]] DisplayContext& dc)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-    ////////////////////////////////////////////////////////////////////////
-    // Perform the rendering for this window
-    ////////////////////////////////////////////////////////////////////////
-    if (!m_bContentsUpdated)
-    {
-        UpdateContent(0xFFFFFFFF);
-    }
-
-    ////////////////////////////////////////////////////////////////////////
-    // Render the 2D map
-    ////////////////////////////////////////////////////////////////////////
-     // ToDo: Remove TopRendererWnd or update to work with Atom: LYN-3671
-    /*if (!m_terrainTextureId)
-    {
-        //GL_BGRA_EXT
-        if (m_terrainTexture.IsValid())
-        {
-            m_terrainTextureId = m_renderer->DownLoadToVideoMemory((unsigned char*)m_terrainTexture.GetData(), m_textureSize.width(), m_textureSize.height(), eTF_R8G8B8A8, eTF_R8G8B8A8, 0, 0, 0);
-        }
-    }
-
-    if (m_terrainTextureId && m_terrainTexture.IsValid())
-    {
-        m_renderer->UpdateTextureInVideoMemory(m_terrainTextureId, (unsigned char*)m_terrainTexture.GetData(), 0, 0, m_textureSize.width(), m_textureSize.height(), eTF_R8G8B8A8);
-    }
-
-    if (m_bShowStatObjects)
-    {
-        if (m_vegetationTexture.IsValid())
-        {
-            int w = m_vegetationTexture.GetWidth();
-            int h = m_vegetationTexture.GetHeight();
-            uint32* tex = m_vegetationTexture.GetData();
-            if (!m_vegetationTextureId)
-            {
-                m_vegetationTextureId = m_renderer->DownLoadToVideoMemory((unsigned char*)tex, w, h, eTF_R8G8B8A8, eTF_R8G8B8A8, 0, 0, FILTER_NONE);
-            }
-            else
-            {
-                int px = m_vegetationTexturePos.x();
-                int py = m_vegetationTexturePos.y();
-                m_renderer->UpdateTextureInVideoMemory(m_vegetationTextureId, (unsigned char*)tex, px, py, w, h, eTF_R8G8B8A8);
-            }
-            m_vegetationTexture.Release();
-        }
-    }
-
-
-    // Reset states
-    m_renderer->ResetToDefault();
-
-    dc.DepthTestOff();
-
-    Matrix34 tm = GetScreenTM();
-
-    if (m_axis == VPA_YX)
-    {
-        float s[4], t[4];
-
-        s[0] = 0;
-        t[0] = 0;
-        s[1] = 1;
-        t[1] = 0;
-        s[2] = 1;
-        t[2] = 1;
-        s[3] = 0;
-        t[3] = 1;
-        m_renderer->DrawImageWithUV(tm.m03, tm.m13, 0, tm.m01 * m_heightmapSize.width(), tm.m10 * m_heightmapSize.height(), m_terrainTextureId, s, t);
-    }
-    else
-    {
-        float s[4], t[4];
-        s[0] = 0;
-        t[0] = 0;
-        s[1] = 0;
-        t[1] = 1;
-        s[2] = 1;
-        t[2] = 1;
-        s[3] = 1;
-        t[3] = 0;
-        m_renderer->DrawImageWithUV(tm.m03, tm.m13, 0, tm.m00 * m_heightmapSize.width(), tm.m11 * m_heightmapSize.height(), m_terrainTextureId, s, t);
-    }
-
-    dc.DepthTestOn();
-
-    Q2DViewport::Draw(dc);*/
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3    QTopRendererWnd::ViewToWorld(const QPoint& vp, bool* collideWithTerrain, bool onlyTerrain, bool bSkipVegetation, bool bTestRenderMesh, bool* collideWithObject) const
-{
-    Vec3 wp = Q2DViewport::ViewToWorld(vp, collideWithTerrain, onlyTerrain, bSkipVegetation, bTestRenderMesh, collideWithObject);
-    wp.z = GetIEditor()->GetTerrainElevation(wp.x, wp.y);
-    return wp;
-}
-
-#include <moc_TopRendererWnd.cpp>
diff --git a/Code/Sandbox/Editor/TopRendererWnd.h b/Code/Sandbox/Editor/TopRendererWnd.h
deleted file mode 100644
index b47913caa9..0000000000
--- a/Code/Sandbox/Editor/TopRendererWnd.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TOPRENDERERWND_H
-#define CRYINCLUDE_EDITOR_TOPRENDERERWND_H
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "Util/Image.h"
-#include "2DViewport.h"
-#endif
-
-class QMenu;
-
-// Predeclare because of friend declaration
-class QTopRendererWnd
-    : public Q2DViewport
-{
-    Q_OBJECT
-public:
-    QTopRendererWnd(QWidget* parent = nullptr);
-    virtual ~QTopRendererWnd();
-
-    static const GUID& GetClassID()
-    {
-        return QtViewport::GetClassID<QTopRendererWnd>();
-    }
-
-    /** Get type of this viewport.
-    */
-    virtual EViewportType GetType() const { return ET_ViewportMap; }
-    virtual void SetType(EViewportType type);
-
-    virtual void ResetContent();
-    virtual void UpdateContent(int flags);
-
-    //! Map viewport position to world space position.
-    virtual Vec3    ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
-
-    void SetShowWater(bool bShow) { m_bShowWater = bShow; }
-    bool GetShowWater() const { return m_bShowWater; };
-
-    void SetAutoScaleGreyRange(bool bAutoScale) { m_bAutoScaleGreyRange = bAutoScale; }
-    bool GetAutoScaleGreyRange() const { return m_bAutoScaleGreyRange; };
-
-protected:
-    // Draw everything.
-    virtual void Draw(DisplayContext& dc);
-
-private:
-    bool m_bContentsUpdated;
-
-    //CImage* m_pSurfaceTexture;
-    int m_terrainTextureId;
-
-    QSize m_textureSize;
-
-    // Size of heightmap in meters.
-    QSize m_heightmapSize;
-
-    CImageEx m_terrainTexture;
-
-    CImageEx m_vegetationTexture;
-    QPoint m_vegetationTexturePos;
-    QSize m_vegetationTextureSize;
-    int     m_vegetationTextureId;
-    bool m_bFirstTerrainUpdate;
-
-public:
-    // Display options.
-    bool m_bDisplayLabels;
-    bool m_bShowHeightmap;
-    bool m_bLastShowHeightmapState;
-    bool m_bShowStatObjects;
-    bool m_bShowWater;
-    bool m_bAutoScaleGreyRange;
-
-    friend class QTopRendererWnd;
-};
-
-#endif // CRYINCLUDE_EDITOR_TOPRENDERERWND_H
diff --git a/Code/Sandbox/Editor/TrackView/2DBezierKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/2DBezierKeyUIControls.cpp
deleted file mode 100644
index 8f00f66097..0000000000
--- a/Code/Sandbox/Editor/TrackView/2DBezierKeyUIControls.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"
-#include "Controls/ReflectedPropertyControl/ReflectedPropertyItem.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-class C2DBezierKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    C2DBezierKeyUIControls()
-    : m_skipOnUIChange(false)
-    {}
-
-    CSmartVariableArray mv_table;
-    CSmartVariable<float> mv_value;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_value, "Value");
-    }
-    bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return trackType == eAnimCurveType_BezierFloat;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 0; }
-
-    static const GUID& GetClassID()
-    {
-        // {DBD76F4B-8EFC-45b6-AFB8-56F171FA150A}
-        static const GUID guid =
-        {
-            0xdbd76f4b, 0x8efc, 0x45b6, { 0xaf, 0xb8, 0x56, 0xf1, 0x71, 0xfa, 0x15, 0xa }
-        };
-        return guid;
-    }
-
-    bool m_skipOnUIChange;
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool C2DBezierKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        float fMin = 0.0f;
-        float fMax = 0.0f;
-
-        const CTrackViewTrack* pTrack = keyHandle.GetTrack();
-        pTrack->GetKeyValueRange(fMin, fMax);
-
-        if (fMin != fMax)
-        {
-            float curMin, curMax, step;
-            bool  curMinHardLimit, curMaxHardLimit;
-
-            // need to call GetLimits to retrieve/maintain *HardLimit boolean values
-            mv_value.GetVar()->GetLimits(curMin, curMax, step, curMinHardLimit, curMaxHardLimit);
-
-            step = ReflectedPropertyItem::ComputeSliderStep(fMin, fMax);
-
-            mv_value.GetVar()->SetLimits(fMin, fMax, step, curMinHardLimit, curMaxHardLimit);
-        }
-        else
-        {
-            mv_value.GetVar()->ClearLimits();
-        }
-
-        EAnimCurveType trType = keyHandle.GetTrack()->GetCurveType();
-        if (trType == eAnimCurveType_BezierFloat)
-        {
-            I2DBezierKey bezierKey;
-            keyHandle.GetKey(&bezierKey);
-
-            m_skipOnUIChange = true;
-            SyncValue(mv_value, bezierKey.value.y, true);
-            m_skipOnUIChange = false;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void C2DBezierKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence || !selectedKeys.AreAllKeysOfSameType() || m_skipOnUIChange)
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-        EAnimCurveType trType = keyHandle.GetTrack()->GetCurveType();
-
-        if (trType == eAnimCurveType_BezierFloat)
-        {
-            I2DBezierKey bezierKey;
-            keyHandle.GetKey(&bezierKey);
-
-            SyncValue(mv_value, bezierKey.value.y, false, pVar);
-
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                keyHandle.SetKey(&bezierKey);
-            }
-            else
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
-                keyHandle.SetKey(&bezierKey);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(C2DBezierKeyUIControls, "TrackView.KeyUI.2DBezier", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/AssetBlendKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/AssetBlendKeyUIControls.cpp
deleted file mode 100644
index c51cded20b..0000000000
--- a/Code/Sandbox/Editor/TrackView/AssetBlendKeyUIControls.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-
-// AzCore
-#include <AzCore/Asset/AssetManagerBus.h>
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-#include <CryCommon/Maestro/Types/AnimValueType.h>
-#include <CryCommon/Maestro/Bus/SequenceComponentBus.h>
-#include <CryCommon/Maestro/Types/AssetBlendKey.h>
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"
-#include "Controls/ReflectedPropertyControl/ReflectedPropertyItem.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-class CAssetBlendKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-
-    AZ::EntityId m_entityId;
-    AZ::ComponentId m_componentId;
-
-    CSmartVariableArray mv_table;
-    CSmartVariable<QString> mv_asset;
-    CSmartVariable<bool> mv_loop;
-    CSmartVariable<float> mv_startTime;
-    CSmartVariable<float> mv_endTime;
-    CSmartVariable<float> mv_timeScale;
-    CSmartVariable<float> mv_blendInTime;
-    CSmartVariable<float> mv_blendOutTime;
-
-    virtual void OnCreateVars()
-    {
-        // Init to an invalid id
-        AZ::Data::AssetId assetId;
-        assetId.SetInvalid();
-        mv_asset->SetUserData(assetId.m_subId);
-        mv_asset->SetDisplayValue(assetId.m_guid.ToString<AZStd::string>().c_str());
-
-        AddVariable(mv_table, "Key Properties");
-        // In the future, we may have different types of AssetBlends supported. Right now
-        // "motion" for the Simple Motion Component is the only instance.
-        AddVariable(mv_table, mv_asset, "Motion", IVariable::DT_MOTION);
-        AddVariable(mv_table, mv_loop, "Loop");
-        AddVariable(mv_table, mv_startTime, "Start Time");
-        AddVariable(mv_table, mv_endTime, "End Time");
-        AddVariable(mv_table, mv_timeScale, "Time Scale");
-        AddVariable(mv_table, mv_blendInTime, "Blend In Time");
-        AddVariable(mv_table, mv_blendOutTime, "Blend Out Time");
-        mv_timeScale->SetLimits(0.001f, 100.f);
-    }
-
-    bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
-    {
-        return valueType == AnimValueType::AssetBlend;
-    }
-
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {5DC82D28-6C50-4406-8993-06770C640F98}
-        static const GUID guid =
-        {
-            0x5DC82D28, 0x6C50, 0x4406, { 0x89, 0x93, 0x06, 0x77, 0x0C, 0x64, 0x0F, 0x98 }
-        };
-        return guid;
-    }
-
-protected:
-    void ResetStartEndLimits(float AssetBlendKeyDuration);
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CAssetBlendKeyUIControls::ResetStartEndLimits(float assetBlendKeyDuration)
-{
-    const float time_zero = .0f;
-    float step = ReflectedPropertyItem::ComputeSliderStep(time_zero, assetBlendKeyDuration);
-    mv_startTime.GetVar()->SetLimits(time_zero, assetBlendKeyDuration, step, true, true);
-    mv_endTime.GetVar()->SetLimits(time_zero, assetBlendKeyDuration, step, true, true);
-    mv_blendInTime.GetVar()->SetLimits(time_zero, assetBlendKeyDuration, step, true, true);
-    mv_blendOutTime.GetVar()->SetLimits(time_zero, assetBlendKeyDuration, step, true, true);
-}
-
-bool CAssetBlendKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-        if (keyHandle.GetTrack()->GetValueType() == AnimValueType::AssetBlend)
-        {
-            AZ::IAssetBlendKey assetBlendKey;
-            keyHandle.GetKey(&assetBlendKey);
-
-            // Find editor object who owns this node.
-            const CTrackViewTrack* pTrack = keyHandle.GetTrack();
-            if (pTrack && pTrack->GetAnimNode()->GetType() == AnimNodeType::Component)
-            {
-                m_componentId = pTrack->GetAnimNode()->GetComponentId();
-
-                // try to get the AZ::EntityId from the component node's parent
-                CTrackViewAnimNode* parentNode = static_cast<CTrackViewAnimNode*>(pTrack->GetAnimNode()->GetParentNode());
-                if (parentNode)
-                {
-                    m_entityId = parentNode->GetAzEntityId();
-                }
-            }
-
-            mv_asset->SetUserData(assetBlendKey.m_assetId.m_subId);
-            mv_asset->SetDisplayValue(assetBlendKey.m_assetId.m_guid.ToString<AZStd::string>().c_str());
-            mv_loop = assetBlendKey.m_bLoop;
-            mv_endTime = assetBlendKey.m_endTime;
-            mv_startTime = assetBlendKey.m_startTime;
-            mv_timeScale = assetBlendKey.m_speed;
-            mv_blendInTime = assetBlendKey.m_blendInTime;
-            mv_blendOutTime = assetBlendKey.m_blendOutTime;
-
-            bAssigned = true;
-        }
-    }
-
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CAssetBlendKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0, num = (int)selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-        CTrackViewTrack* pTrack = keyHandle.GetTrack();
-
-        if (keyHandle.GetTrack()->GetValueType() == AnimValueType::AssetBlend)
-        {
-            AZ::IAssetBlendKey assetBlendKey;
-            keyHandle.GetKey(&assetBlendKey);
-
-            if (mv_asset.GetVar() == pVar)
-            {
-                AZStd::string stringGuid = mv_asset->GetDisplayValue().toLatin1().data();
-                if (!stringGuid.empty())
-                {
-                    AZ::Uuid guid(stringGuid.c_str(), stringGuid.length());
-                    AZ::u32 subId = mv_asset->GetUserData().value<AZ::u32>();
-                    assetBlendKey.m_assetId = AZ::Data::AssetId(guid, subId);
-
-                    // Lookup Filename by assetId and get the filename part of the description
-                    AZStd::string assetPath;
-                    EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetBlendKey.m_assetId);
-
-                    assetBlendKey.m_description = "";
-                    if (!assetPath.empty())
-                    {
-                        AZStd::string filename;
-                        if (AzFramework::StringFunc::Path::GetFileName(assetPath.c_str(), filename))
-                        {
-                            assetBlendKey.m_description = filename;
-                        }
-                    }
-                }
-
-                // This call is required to make sure that the newly set animation is properly triggered.
-                pTrack->GetSequence()->Reset(false);
-            }
-
-            SyncValue(mv_loop, assetBlendKey.m_bLoop, false, pVar);
-            SyncValue(mv_startTime, assetBlendKey.m_startTime, false, pVar);
-            SyncValue(mv_endTime, assetBlendKey.m_endTime, false, pVar);
-            SyncValue(mv_timeScale, assetBlendKey.m_speed, false, pVar);
-            SyncValue(mv_blendInTime, assetBlendKey.m_blendInTime, false, pVar);
-            SyncValue(mv_blendOutTime, assetBlendKey.m_blendOutTime, false, pVar);
-
-            if (assetBlendKey.m_assetId.IsValid())
-            {
-                // Ask entity id this asset blend is bound to, to
-                // get the duration of this asset in an async way.
-                Maestro::SequenceComponentRequests::AnimatedFloatValue currValue = 0.0f;
-                Maestro::SequenceComponentRequestBus::Event(
-                    pSequence->GetSequenceComponentEntityId(),
-                    &Maestro::SequenceComponentRequestBus::Events::GetAssetDuration,
-                    currValue,
-                    m_entityId,
-                    m_componentId,
-                    assetBlendKey.m_assetId
-                );
-
-                assetBlendKey.m_duration = currValue.GetFloatValue();
-                ResetStartEndLimits(assetBlendKey.m_duration);
-            }
-
-            keyHandle.SetKey(&assetBlendKey);
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CAssetBlendKeyUIControls, "TrackView.KeyUI.AssetBlends", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp b/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp
deleted file mode 100644
index f68260f46f..0000000000
--- a/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "AtomOutputFrameCapture.h"
-
-#include <Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h>
-#include <Atom/RPI.Public/RenderPipeline.h>
-#include <Atom/RPI.Public/Scene.h>
-#include <Atom/RPI.Public/View.h>
-#include <Atom/RPI.Reflect/System/RenderPipelineDescriptor.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Math/MatrixUtils.h>
-#include <AzCore/Name/Name.h>
-#include <AzFramework/Entity/GameEntityContextBus.h>
-#include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemInterface.h>
-
-namespace TrackView
-{
-    void AtomOutputFrameCapture::CreatePipeline(
-        AZ::RPI::Scene& scene, const AZStd::string& pipelineName, const uint32_t width, const uint32_t height)
-    {
-        AZ::RPI::RenderPipelineDescriptor pipelineDesc;
-        pipelineDesc.m_mainViewTagName = "MainCamera"; // must be "MainCamera"
-        pipelineDesc.m_name = pipelineName;
-        pipelineDesc.m_rootPassTemplate = "MainPipelineRenderToTexture";
-        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
-        m_renderPipeline = AZ::RPI::RenderPipeline::CreateRenderPipeline(pipelineDesc);
-
-        if (auto renderToTexturePass = azrtti_cast<AZ::RPI::RenderToTexturePass*>(m_renderPipeline->GetRootPass().get()))
-        {
-            renderToTexturePass->ResizeOutput(width, height);
-        }
-
-        scene.AddRenderPipeline(m_renderPipeline);
-
-        // rendering pipeline has a tree structure
-        m_passHierarchy.push_back(pipelineName);
-        m_passHierarchy.push_back("CopyToSwapChain");
-
-        // retrieve View from the camera that's animating
-        AZ::Name viewName = AZ::Name("MainCamera");
-        m_view = AZ::RPI::View::CreateView(viewName, AZ::RPI::View::UsageCamera);
-        m_renderPipeline->SetDefaultView(m_view);
-    }
-
-    void AtomOutputFrameCapture::DestroyPipeline(AZ::RPI::Scene& scene)
-    {
-        scene.RemoveRenderPipeline(m_renderPipeline->GetId());
-        m_passHierarchy.clear();
-        m_renderPipeline.reset();
-        m_view.reset();
-    }
-
-    void AtomOutputFrameCapture::UpdateView(const AZ::Matrix3x4& cameraTransform, const AZ::Matrix4x4& cameraProjection)
-    {
-        m_view->SetCameraTransform(cameraTransform);
-        m_view->SetViewToClipMatrix(cameraProjection);
-    }
-
-    bool AtomOutputFrameCapture::BeginCapture(
-        const AZ::RPI::AttachmentReadback::CallbackFunction& attachmentReadbackCallback, CaptureFinishedCallback captureFinishedCallback)
-    {
-        AZ::Render::FrameCaptureNotificationBus::Handler::BusConnect();
-
-        m_captureFinishedCallback = AZStd::move(captureFinishedCallback);
-
-        // note: "Output" (slot name) maps to MainPipeline.pass CopyToSwapChain
-        bool startedCapture = false;
-        AZ::Render::FrameCaptureRequestBus::BroadcastResult(
-            startedCapture, &AZ::Render::FrameCaptureRequestBus::Events::CapturePassAttachmentWithCallback, m_passHierarchy,
-            AZStd::string("Output"), attachmentReadbackCallback);
-
-        return startedCapture;
-    }
-
-    void AtomOutputFrameCapture::OnCaptureFinished(
-        [[maybe_unused]] AZ::Render::FrameCaptureResult result, [[maybe_unused]] const AZStd::string& info)
-    {
-        m_captureFinishedCallback();
-        AZ::Render::FrameCaptureNotificationBus::Handler::BusDisconnect();
-    }
-
-    AZ::Matrix3x4 TransformFromEntityId(const AZ::EntityId entityId)
-    {
-        AZ::Transform cameraTransform = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(cameraTransform, entityId, &AZ::TransformBus::Events::GetWorldTM);
-        return AZ::Matrix3x4::CreateFromTransform(cameraTransform);
-    }
-
-    AZ::Matrix4x4 ProjectionFromCameraEntityId(const AZ::EntityId entityId, const float outputWidth, const float outputHeight)
-    {
-        float nearDist = 0.0f;
-        Camera::CameraRequestBus::EventResult(nearDist, entityId, &Camera::CameraRequestBus::Events::GetNearClipDistance);
-        float farDist = 0.0f;
-        Camera::CameraRequestBus::EventResult(farDist, entityId, &Camera::CameraRequestBus::Events::GetFarClipDistance);
-        float fovRad = 0.0f;
-        Camera::CameraRequestBus::EventResult(fovRad, entityId, &Camera::CameraRequestBus::Events::GetFovRadians);
-
-        const float aspectRatio = outputWidth / outputHeight;
-
-        AZ::Matrix4x4 viewToClipMatrix;
-        AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, fovRad, aspectRatio, nearDist, farDist, /*reverseDepth=*/true);
-        return viewToClipMatrix;
-    }
-
-    AZ::RPI::Scene* SceneFromGameEntityContext()
-    {
-        AzFramework::EntityContextId entityContextId;
-        AzFramework::GameEntityContextRequestBus::BroadcastResult(
-            entityContextId, &AzFramework::GameEntityContextRequestBus::Events::GetGameEntityContextId);
-
-        return AZ::RPI::Scene::GetSceneForEntityContextId(entityContextId);
-    }
-} // namespace TrackView
diff --git a/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.h b/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.h
deleted file mode 100644
index afc379465b..0000000000
--- a/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <Atom/Feature/Utils/FrameCaptureBus.h>
-#include <AzFramework/Components/CameraBus.h>
-
-namespace TrackView
-{
-    //! Provides functionality to capture frames from the "MainCamera".
-    //! A new pipeline is created (and associated with the scene provided), a callback can be
-    //! provided to handle the attachment readback (what to do with the captured frame) and also
-    //! what to do after an individual capture fully completes (called in OnCaptureFinished).
-    class AtomOutputFrameCapture : private AZ::Render::FrameCaptureNotificationBus::Handler
-    {
-    public:
-        AtomOutputFrameCapture() = default;
-
-        using CaptureFinishedCallback = AZStd::function<void()>;
-
-        //! Create a new pipeline associated with a given scene.
-        //! @note "MainCamera" is the view that is captured.
-        void CreatePipeline(AZ::RPI::Scene& scene, const AZStd::string& pipelineName, uint32_t width, uint32_t height);
-        //! Removes the pipeline from the scene provided and then destroys it.
-        //! @note scene must be the same scene used to create the pipeline.
-        void DestroyPipeline(AZ::RPI::Scene& scene);
-
-        //! Request a capture to start.
-        //! @param attachmentReadbackCallback Handles the returned attachment (image data returned by the renderer).
-        //! @param captureFinishedCallback Logic to run once the capture has completed fully.
-        bool BeginCapture(
-            const AZ::RPI::AttachmentReadback::CallbackFunction& attachmentReadbackCallback,
-            CaptureFinishedCallback captureFinishedCallback);
-
-        //! Update the internal view that is associated with the created pipeline.
-        void UpdateView(const AZ::Matrix3x4& cameraTransform, const AZ::Matrix4x4& cameraProjection);
-
-    private:
-        AZ::RPI::RenderPipelinePtr m_renderPipeline; //!< The internal render pipeline.
-        AZ::RPI::ViewPtr m_view; //!< The view associated with the render pipeline.
-        AZStd::vector<AZStd::string> m_passHierarchy; //!< Pass hierarchy (includes pipelineName and CopyToSwapChain).
-        CaptureFinishedCallback m_captureFinishedCallback; //!< Stored callback called from OnCaptureFinished.
-
-        // FrameCaptureNotificationBus overrides ...
-        void OnCaptureFinished(AZ::Render::FrameCaptureResult result, const AZStd::string& info) override;
-    };
-
-    inline AZ::EntityId ActiveCameraEntityId()
-    {
-        AZ::EntityId activeCameraId;
-        Camera::CameraSystemRequestBus::BroadcastResult(activeCameraId, &Camera::CameraSystemRequests::GetActiveCamera);
-        return activeCameraId;
-    }
-
-    //! Returns the transform for the given EntityId.
-    AZ::Matrix3x4 TransformFromEntityId(AZ::EntityId entityId);
-
-    //! Returns the projection matrix for the given camera EntityId.
-    //! @note Must provide a valid camera entity.
-    AZ::Matrix4x4 ProjectionFromCameraEntityId(AZ::EntityId entityId, float outputWidth, float outputHeight);
-
-    //! Helper to return the GameEntityContext scene.
-    AZ::RPI::Scene* SceneFromGameEntityContext();
-} // namespace TrackView
diff --git a/Code/Sandbox/Editor/TrackView/CaptureKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/CaptureKeyUIControls.cpp
deleted file mode 100644
index 0125a0a845..0000000000
--- a/Code/Sandbox/Editor/TrackView/CaptureKeyUIControls.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"
-
-//////////////////////////////////////////////////////////////////////////
-class CCaptureKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariable<float> mv_duration;
-    CSmartVariable<float> mv_timeStep;
-    CSmartVariable<QString> mv_prefix;
-    CSmartVariable<QString> mv_folder;
-    CSmartVariable<bool> mv_once;
-
-    virtual void OnCreateVars()
-    {
-        mv_duration.GetVar()->SetLimits(0, 100000.0f);
-        mv_timeStep.GetVar()->SetLimits(0.001f, 1.0f);
-
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_duration, "Duration");
-        AddVariable(mv_table, mv_timeStep, "Time Step");
-        AddVariable(mv_table, mv_prefix, "Output Prefix");
-        AddVariable(mv_table, mv_folder, "Output Folder");
-        AddVariable(mv_table, mv_once, "Just one frame?");
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::Capture;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {543197BF-5E43-4abc-8F07-B84078846E4C}
-        static const GUID guid =
-        {
-            0x543197bf, 0x5e43, 0x4abc, { 0x8f, 0x7, 0xb8, 0x40, 0x78, 0x84, 0x6e, 0x4c }
-        };
-        return guid;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CCaptureKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Capture)
-        {
-            ICaptureKey captureKey;
-            keyHandle.GetKey(&captureKey);
-
-            mv_duration = captureKey.duration;
-            mv_timeStep = captureKey.timeStep;
-            mv_prefix = captureKey.prefix.c_str();
-            mv_folder = captureKey.folder.c_str();
-            mv_once = captureKey.once;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CCaptureKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Capture)
-        {
-            ICaptureKey captureKey;
-            keyHandle.GetKey(&captureKey);
-
-            SyncValue(mv_duration, captureKey.duration, false, pVar);
-            SyncValue(mv_timeStep, captureKey.timeStep, false, pVar);
-
-            if (pVar == mv_folder.GetVar())
-            {
-                QString sFolder = mv_folder;
-                captureKey.folder = sFolder.toUtf8().data();
-            }
-            if (pVar == mv_prefix.GetVar())
-            {
-                QString sPrefix = mv_prefix;
-                captureKey.prefix = sPrefix.toUtf8().data();
-            }
-
-            SyncValue(mv_once, captureKey.once, false, pVar);
-
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-                isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                keyHandle.SetKey(&captureKey);
-            }
-            else
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
-                keyHandle.SetKey(&captureKey);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CCaptureKeyUIControls, "TrackView.KeyUI.Capture", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/CharacterKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/CharacterKeyUIControls.cpp
deleted file mode 100644
index 797c1fdf82..0000000000
--- a/Code/Sandbox/Editor/TrackView/CharacterKeyUIControls.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>   // for AnimNodeType
-#include <CryCommon/Maestro/Types/AnimValueType.h>  // for AnimValueType
-#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
-
-// Editor
-#include "Controls/ReflectedPropertyControl/ReflectedPropertyItem.h"    // for ReflectedPropertyItem
-#include "TrackViewKeyPropertiesDlg.h"  // for CTrackViewKeyUIControls
-
-
-//////////////////////////////////////////////////////////////////////////
-class CCharacterKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariable<QString> mv_animation;
-    CSmartVariable<bool> mv_loop;
-    CSmartVariable<bool> mv_blendGap;
-    CSmartVariable<bool> mv_inplace;
-    CSmartVariable<float> mv_startTime;
-    CSmartVariable<float> mv_endTime;
-    CSmartVariable<float> mv_timeScale;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_animation, "Animation", IVariable::DT_ANIMATION);
-        AddVariable(mv_table, mv_loop, "Loop");
-        AddVariable(mv_table, mv_blendGap, "Blend Gap");
-        AddVariable(mv_table, mv_inplace, "In Place");
-        AddVariable(mv_table, mv_startTime, "Start Time");
-        AddVariable(mv_table, mv_endTime, "End Time");
-        AddVariable(mv_table, mv_timeScale, "Time Scale");
-        mv_timeScale->SetLimits(0.001f, 100.f);
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::Animation || valueType == AnimValueType::CharacterAnim;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {EAA26453-6B74-4771-8FD1-14CDFF88E723}
-        static const GUID guid =
-        {
-            0xeaa26453, 0x6b74, 0x4771, { 0x8f, 0xd1, 0x14, 0xcd, 0xff, 0x88, 0xe7, 0x23 }
-        };
-        return guid;
-    }
-
-protected:
-    void ResetStartEndLimits(float characterKeyDuration);
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CCharacterKeyUIControls::ResetStartEndLimits(float characterKeyDuration)
-{
-    const float time_zero = .0f;
-    float step = ReflectedPropertyItem::ComputeSliderStep(time_zero, characterKeyDuration);
-
-    mv_startTime.GetVar()->SetLimits(time_zero, characterKeyDuration, step, true, true);
-    mv_endTime.GetVar()->SetLimits(time_zero, characterKeyDuration, step, true, true);
-}
-
-bool CCharacterKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Animation || keyHandle.GetTrack()->GetValueType() == AnimValueType::CharacterAnim)
-        {
-            ICharacterKey charKey;
-            keyHandle.GetKey(&charKey);
-
-            // Find editor object who owns this node.
-            const CTrackViewTrack* pTrack = keyHandle.GetTrack();
-            if (pTrack->GetAnimNode()->GetType() == AnimNodeType::Component)
-            {
-                // no legacy entity was returned and the track's animNode is a component - try to get the AZ::EntityId from the component node's parent
-                CTrackViewAnimNode* parentNode = static_cast<CTrackViewAnimNode*>(pTrack->GetAnimNode()->GetParentNode());
-                if (parentNode)
-                {
-                    AZ::EntityId azEntityId = parentNode->GetAzEntityId();
-                    if (azEntityId.IsValid())
-                    {
-                        static_assert(sizeof(AZ::EntityId) <= sizeof(AZ::u64), "Can't pack AZ::EntityId into a AZ::u64 in CCharacterKeyUIControls::OnKeySelectionChange.");
-                        mv_animation->SetUserData(static_cast<AZ::u64>(azEntityId));
-                    }
-                }
-            }
-
-            mv_animation = charKey.m_animation.c_str();
-            mv_loop = charKey.m_bLoop;
-            mv_blendGap = charKey.m_bBlendGap;
-            mv_inplace = charKey.m_bInPlace;
-            mv_endTime = charKey.m_endTime;
-            mv_startTime = charKey.m_startTime;
-            mv_timeScale = charKey.m_speed;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CCharacterKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0, num = (int)selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-        CTrackViewTrack* pTrack = keyHandle.GetTrack();
-        const CAnimParamType paramType = pTrack->GetParameterType();
-
-        if (paramType == AnimParamType::Animation || keyHandle.GetTrack()->GetValueType() == AnimValueType::CharacterAnim)
-        {
-            ICharacterKey charKey;
-            keyHandle.GetKey(&charKey);
-
-            if (mv_animation.GetVar() == pVar)
-            {
-                charKey.m_animation = ((QString)mv_animation).toUtf8().data();
-                // This call is required to make sure that the newly set animation is properly triggered.
-                pTrack->GetSequence()->Reset(false);
-            }
-            SyncValue(mv_loop, charKey.m_bLoop, false, pVar);
-            SyncValue(mv_blendGap, charKey.m_bBlendGap, false, pVar);
-            SyncValue(mv_inplace, charKey.m_bInPlace, false, pVar);
-            SyncValue(mv_startTime, charKey.m_startTime, false, pVar);
-            SyncValue(mv_endTime, charKey.m_endTime, false, pVar);
-            SyncValue(mv_timeScale, charKey.m_speed, false, pVar);
-            keyHandle.SetKey(&charKey);
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CCharacterKeyUIControls, "TrackView.KeyUI.Character", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/CommentKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/CommentKeyUIControls.cpp
deleted file mode 100644
index 106c0120b9..0000000000
--- a/Code/Sandbox/Editor/TrackView/CommentKeyUIControls.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-class CCommentKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariable<QString> mv_comment;
-    CSmartVariable<float> mv_duration;
-    CSmartVariable<float> mv_size;
-    CSmartVariable<Vec3> mv_color;
-    CSmartVariableEnum<int> mv_align;
-    CSmartVariableEnum<QString> mv_font;
-
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_comment, "Comment");
-        AddVariable(mv_table, mv_duration, "Duration");
-
-        mv_size->SetLimits(1.f, 10.f);
-        AddVariable(mv_table, mv_size, "Size");
-
-        AddVariable(mv_table, mv_color, "Color", IVariable::DT_COLOR);
-
-        mv_align->SetEnumList(NULL);
-        mv_align->AddEnumItem("Left", ICommentKey::eTA_Left);
-        mv_align->AddEnumItem("Center", ICommentKey::eTA_Center);
-        mv_align->AddEnumItem("Right", ICommentKey::eTA_Right);
-        AddVariable(mv_table, mv_align, "Align");
-
-        mv_font->SetEnumList(NULL);
-        IFileUtil::FileArray fa;
-        CFileUtil::ScanDirectory((Path::GetEditingGameDataFolder() + "/Fonts/").c_str(), "*.xml", fa, true);
-        for (size_t i = 0; i < fa.size(); ++i)
-        {
-            string name = fa[i].filename.toUtf8().data();
-            PathUtil::RemoveExtension(name);
-            mv_font->AddEnumItem(name.c_str(), name.c_str());
-        }
-        AddVariable(mv_table, mv_font, "Font");
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::CommentText;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {FA250B8B-FC2A-43b1-AF7A-8C3B6672B49D}
-        static const GUID guid =
-        {
-            0xfa250b8b, 0xfc2a, 0x43b1, { 0xaf, 0x7a, 0x8c, 0x3b, 0x66, 0x72, 0xb4, 0x9d }
-        };
-        return guid;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CCommentKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::CommentText)
-        {
-            ICommentKey commentKey;
-            keyHandle.GetKey(&commentKey);
-
-            mv_comment = commentKey.m_strComment.c_str();
-            mv_duration = commentKey.m_duration;
-            mv_size = commentKey.m_size;
-            mv_font = commentKey.m_strFont.c_str();
-            mv_color = Vec3(commentKey.m_color.GetR(), commentKey.m_color.GetG(), commentKey.m_color.GetB());
-            mv_align = commentKey.m_align;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-//////////////////////////////////////////////////////////////////////////
-// Called when UI variable changes.
-void CCommentKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (size_t keyIndex = 0, num = selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::CommentText)
-        {
-            ICommentKey commentKey;
-            keyHandle.GetKey(&commentKey);
-
-            if (!pVar || pVar == mv_comment.GetVar())
-            {
-                commentKey.m_strComment = ((QString)mv_comment).toUtf8().data();
-            }
-
-            if (!pVar || pVar == mv_font.GetVar())
-            {
-                QString sFont = mv_font;
-                commentKey.m_strFont = sFont.toUtf8().data();
-            }
-
-            if (!pVar || pVar == mv_align.GetVar())
-            {
-                commentKey.m_align = (ICommentKey::ETextAlign)((int)mv_align);
-            }
-
-            SyncValue(mv_duration, commentKey.m_duration, false, pVar);
-            Vec3 color(commentKey.m_color.GetR(), commentKey.m_color.GetG(), commentKey.m_color.GetB());
-            SyncValue(mv_color, color, false, pVar);
-            commentKey.m_color.Set(color.x, color.y, color.z, commentKey.m_color.GetA());
-            SyncValue(mv_size, commentKey.m_size, false, pVar);
-
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                keyHandle.SetKey(&commentKey);
-            }
-            else
-            {
-                // Let the AZ Undo system manage the nodes on the sequence entity
-                AzToolsFramework::ScopedUndoBatch undoBatch("Change key");
-                keyHandle.SetKey(&commentKey);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CCommentKeyUIControls, "TrackView.KeyUI.Comment", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/CommentNodeAnimator.cpp b/Code/Sandbox/Editor/TrackView/CommentNodeAnimator.cpp
deleted file mode 100644
index b60b17ceea..0000000000
--- a/Code/Sandbox/Editor/TrackView/CommentNodeAnimator.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "CommentNodeAnimator.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "Settings.h"
-
-
-CCommentNodeAnimator::CCommentNodeAnimator(CTrackViewAnimNode* pCommentNode)
-{
-    assert(pCommentNode);
-    m_pCommentNode = pCommentNode;
-}
-
-CCommentNodeAnimator::~CCommentNodeAnimator()
-{
-    m_pCommentNode = 0;
-}
-
-void CCommentNodeAnimator::Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac)
-{
-    if (pNode != m_pCommentNode || pNode->IsDisabled())
-    {
-        return;
-    }
-
-    CTrackViewTrackBundle tracks = pNode->GetAllTracks();
-
-    int trackCount = tracks.GetCount();
-    Vec2 pos(0, 0);
-    for (int i = 0; i < trackCount; ++i)
-    {
-        CTrackViewTrack* pTrack = tracks.GetTrack(i);
-
-        if (pTrack->IsMasked(ac.trackMask))
-        {
-            continue;
-        }
-
-        switch (pTrack->GetParameterType().GetType())
-        {
-        case AnimParamType::CommentText:
-        {
-            AnimateCommentTextTrack(pTrack, ac);
-        }
-        break;
-        case AnimParamType::PositionX:
-        {
-            pTrack->GetValue(ac.time, pos.x);
-        }
-        break;
-        case AnimParamType::PositionY:
-        {
-            pTrack->GetValue(ac.time, pos.y);
-        }
-        break;
-        }
-    }
-
-    // Position mapping from [0,100] to [-1,1]
-    pos = (pos - Vec2(50.0f, 50.0f)) / 50.0f;
-    m_commentContext.m_unitPos = pos;
-}
-
-void CCommentNodeAnimator::AnimateCommentTextTrack(CTrackViewTrack* pTrack, const SAnimContext& ac)
-{
-    if (pTrack->GetKeyCount() == 0)
-    {
-        return;
-    }
-
-    CTrackViewKeyHandle keyHandle = GetActiveKeyHandle(pTrack, ac.time);
-
-    if (keyHandle.IsValid())
-    {
-        ICommentKey commentKey;
-
-        keyHandle.GetKey(&commentKey);
-
-        if (commentKey.m_duration > 0 && ac.time < keyHandle.GetTime() + commentKey.m_duration)
-        {
-            m_commentContext.m_strComment = commentKey.m_strComment;
-            cry_strcpy(m_commentContext.m_strFont,  commentKey.m_strFont.c_str());
-            m_commentContext.m_color = commentKey.m_color;
-            m_commentContext.m_align = commentKey.m_align;
-            m_commentContext.m_size = commentKey.m_size;
-        }
-        else
-        {
-            m_commentContext.m_strComment.clear();
-        }
-    }
-    else
-    {
-        m_commentContext.m_strComment.clear();
-    }
-}
-
-CTrackViewKeyHandle CCommentNodeAnimator::GetActiveKeyHandle(CTrackViewTrack* pTrack, float fTime)
-{
-    const int nkeys = pTrack->GetKeyCount();
-
-    if (nkeys == 0)
-    {
-        return CTrackViewKeyHandle();
-    }
-
-    const CTrackViewKeyHandle& firstKeyHandle = pTrack->GetKey(0);
-
-    // Time is before first key.
-    if (firstKeyHandle.GetTime() > fTime)
-    {
-        return CTrackViewKeyHandle();
-    }
-
-    for (int i = 0; i < nkeys; i++)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        if (fTime >= keyHandle.GetTime())
-        {
-            if ((i == nkeys - 1) || (fTime < pTrack->GetKey(i + 1).GetTime()))
-            {
-                return keyHandle;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-void CCommentNodeAnimator::Render(CTrackViewAnimNode* pNode, [[maybe_unused]] const SAnimContext& ac)
-{
-    if (!pNode->IsDisabled())
-    {
-        CCommentContext* cc = &m_commentContext;
-
-        if (!cc->m_strComment.empty())
-        {
-            Vec3 color(cc->m_color.GetR(), cc->m_color.GetG(), cc->m_color.GetB());
-            DrawText(cc->m_strFont, cc->m_size, cc->m_unitPos, color, cc->m_strComment.c_str(), cc->m_align);
-        }
-    }
-}
-
-Vec2 CCommentNodeAnimator::GetScreenPosFromNormalizedPos(const Vec2& unitPos)
-{
-    const CCamera& cam = gEnv->pSystem->GetViewCamera();
-    float width = (float)cam.GetViewSurfaceX();
-    int height = cam.GetViewSurfaceZ();
-    float fAspectRatio = gSettings.viewports.fDefaultAspectRatio;
-    float camWidth = height * fAspectRatio;
-
-    float x = 0.5f * width + 0.5f * camWidth * unitPos.x;
-    float y = 0.5f * height * (1.f - unitPos.y);
-
-    return Vec2(x, y);
-}
-
-void CCommentNodeAnimator::DrawText(const char* szFontName, float fSize, const Vec2& unitPos, const ColorF col, const char* szText, int align)
-{
-    IFFont* pFont = gEnv->pCryFont->GetFont(szFontName);
-    if (!pFont)
-    {
-        pFont = gEnv->pCryFont->GetFont("default");
-    }
-
-    if (pFont)
-    {
-        STextDrawContext ctx;
-        ctx.SetSizeIn800x600(false);
-        ctx.SetSize(Vec2(UIDRAW_TEXTSIZEFACTOR * fSize, UIDRAW_TEXTSIZEFACTOR * fSize));
-        ctx.SetCharWidthScale(0.5f);
-        ctx.SetProportional(false);
-        ctx.SetFlags(align);
-
-        // alignment
-        Vec2 pos = GetScreenPosFromNormalizedPos(unitPos);
-
-        if (align & eDrawText_Center)
-        {
-            pos.x -= pFont->GetTextSize(szText, true, ctx).x * 0.5f;
-        }
-        else if (align & eDrawText_Right)
-        {
-            pos.x -= pFont->GetTextSize(szText, true, ctx).x;
-        }
-
-        // Color
-        ctx.SetColor(col);
-
-        pFont->DrawString(pos.x, pos.y, szText, true, ctx);
-    }
-}
diff --git a/Code/Sandbox/Editor/TrackView/CommentNodeAnimator.h b/Code/Sandbox/Editor/TrackView/CommentNodeAnimator.h
deleted file mode 100644
index d6f2b033f7..0000000000
--- a/Code/Sandbox/Editor/TrackView/CommentNodeAnimator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Comment node animator class
-
-/*
-    CCommentContext stores information about comment track.
-    The Comment Track is activated only in the editor.
-*/
-
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_COMMENTNODEANIMATOR_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_COMMENTNODEANIMATOR_H
-#pragma once
-
-#include "TrackViewAnimNode.h"
-
-class CTrackViewTrack;
-
-struct CCommentContext
-{
-    CCommentContext()
-        : m_nLastActiveKeyIndex(-1)
-        , m_size(1.0f)
-        , m_align(0)
-        , m_color(0.f, 0.f, 0.f, 1.f)
-    {
-        sprintf_s(m_strFont, sizeof(m_strFont), "default");
-        m_unitPos = Vec2(0.f, 0.f);
-    }
-
-    int m_nLastActiveKeyIndex;
-
-    AZStd::string m_strComment;
-    char m_strFont[64];
-    Vec2 m_unitPos;
-    AZ::Color m_color;
-    float m_size;
-    int m_align;
-};
-
-class CCommentNodeAnimator
-    : public IAnimNodeAnimator
-{
-public:
-    CCommentNodeAnimator(CTrackViewAnimNode* pCommentNode);
-    virtual void Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac);
-    virtual void Render(CTrackViewAnimNode* pNode, const SAnimContext& ac);
-
-private:
-    virtual ~CCommentNodeAnimator();
-
-    void AnimateCommentTextTrack(CTrackViewTrack* pTrack, const SAnimContext& ac);
-    CTrackViewKeyHandle GetActiveKeyHandle(CTrackViewTrack* pTrack, float fTime);
-    Vec2 GetScreenPosFromNormalizedPos(const Vec2& unitPos);
-    void DrawText(const char* szFontName, float fSize, const Vec2& unitPos, const ColorF col, const char* szText, int align);
-
-    CTrackViewAnimNode* m_pCommentNode;
-    CCommentContext m_commentContext;
-};
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_COMMENTNODEANIMATOR_H
diff --git a/Code/Sandbox/Editor/TrackView/ConsoleKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/ConsoleKeyUIControls.cpp
deleted file mode 100644
index 4caeed0625..0000000000
--- a/Code/Sandbox/Editor/TrackView/ConsoleKeyUIControls.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"  // for CTrackViewKeyUIControls
-
-
-//////////////////////////////////////////////////////////////////////////
-class CConsoleKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariable<QString> mv_command;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_command, "Command");
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::Console;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {3E9D2C57-BFB1-42f9-82AC-A393C1062634}
-        static const GUID guid =
-        {
-            0x3e9d2c57, 0xbfb1, 0x42f9, { 0x82, 0xac, 0xa3, 0x93, 0xc1, 0x6, 0x26, 0x34 }
-        };
-        return guid;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CConsoleKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Console)
-        {
-            IConsoleKey consoleKey;
-            keyHandle.GetKey(&consoleKey);
-
-            mv_command = ((QString)consoleKey.command.c_str()).toUtf8().data();
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CConsoleKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Console)
-        {
-            IConsoleKey consoleKey;
-            keyHandle.GetKey(&consoleKey);
-
-            if (pVar == mv_command.GetVar())
-            {
-                consoleKey.command = ((QString)mv_command).toUtf8().data();
-            }
-
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                keyHandle.SetKey(&consoleKey);
-            }
-            else
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
-                keyHandle.SetKey(&consoleKey);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CConsoleKeyUIControls, "TrackView.KeyUI.Console", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.cpp b/Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.cpp
deleted file mode 100644
index cc764af9e3..0000000000
--- a/Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "DirectorNodeAnimator.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
-
-// Editor
-#include "TrackView/TrackViewSequenceManager.h"     // for CTrackViewSequence
-
-
-////////////////////////////////////////////////////////////////////////////
-CDirectorNodeAnimator::CDirectorNodeAnimator(CTrackViewAnimNode* pDirectorNode)
-    : m_pDirectorNode(pDirectorNode)
-{
-    assert(m_pDirectorNode != nullptr);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CDirectorNodeAnimator::Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac)
-{
-    if (!pNode->IsActiveDirector())
-    {
-        // Don't animate if it's not the sequence track of the active director
-        return;
-    }
-
-    CTrackViewTrack* pSequenceTrack = pNode->GetTrackForParameter(AnimParamType::Sequence);
-    if (pSequenceTrack && !pSequenceTrack->IsDisabled())
-    {
-        std::vector<CTrackViewSequence*> inactiveSequences;
-        std::vector<CTrackViewSequence*> activeSequences;
-
-        // Construct sets of sequences that need to be bound/unbound at this point
-        const float time = ac.time;
-        const unsigned int numKeys = pSequenceTrack->GetKeyCount();
-        for (unsigned int i = 0; i < numKeys; ++i)
-        {
-            CTrackViewKeyHandle keyHandle = pSequenceTrack->GetKey(i);
-
-            ISequenceKey sequenceKey;
-            keyHandle.GetKey(&sequenceKey);
-
-            CTrackViewSequence* pSequence = GetSequenceFromSequenceKey(sequenceKey);
-
-            if (pSequence)
-            {
-                if (sequenceKey.time <= time)
-                {
-                    stl::push_back_unique(activeSequences, pSequence);
-                    stl::find_and_erase(inactiveSequences, pSequence);
-                }
-                else
-                {
-                    if (!stl::find(activeSequences, pSequence))
-                    {
-                        stl::push_back_unique(inactiveSequences, pSequence);
-                    }
-                }
-            }
-        }
-
-        // Unbind must occur before binding, because entities can be referenced in multiple sequences
-        for (auto iter = inactiveSequences.begin(); iter != inactiveSequences.end(); ++iter)
-        {
-            CTrackViewSequence* pSequence = *iter;
-            if (pSequence->IsBoundToEditorObjects())
-            {
-                // No notifications because unbinding would call ForceAnimation again
-                CTrackViewSequenceNoNotificationContext context(pSequence);
-                pSequence->UnBindFromEditorObjects();
-            }
-        }
-
-        // Now bind sequences
-        for (auto iter = activeSequences.begin(); iter != activeSequences.end(); ++iter)
-        {
-            CTrackViewSequence* pSequence = *iter;
-            if (!pSequence->IsBoundToEditorObjects())
-            {
-                // No notifications because binding would call ForceAnimation again
-                CTrackViewSequenceNoNotificationContext context(pSequence);
-                pSequence->BindToEditorObjects();
-
-                // Make sure the sequence is active, harmless to call if the sequences is already
-                // active. The sequence may not be active in the Editor if this key was just created.
-                pSequence->Activate();
-            }
-        }
-
-        // Animate sub sequences
-        ForEachActiveSequence(ac, pSequenceTrack, true,
-            [&](CTrackViewSequence* pSequence, const SAnimContext& newAnimContext)
-            {
-                pSequence->Animate(newAnimContext);
-            },
-            [&](CTrackViewSequence* pSequence, [[maybe_unused]] const SAnimContext& newAnimContext)
-            {
-                pSequence->Reset(false);
-            }
-            );
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CDirectorNodeAnimator::Render(CTrackViewAnimNode* pNode, const SAnimContext& ac)
-{
-    if (!pNode->IsActiveDirector())
-    {
-        // Don't animate if it's not the sequence track of the active director
-        return;
-    }
-
-    CTrackViewTrack* pSequenceTrack = pNode->GetTrackForParameter(AnimParamType::Sequence);
-    if (pSequenceTrack && !pSequenceTrack->IsDisabled())
-    {
-        // Render sub sequences
-        ForEachActiveSequence(ac, pSequenceTrack, false,
-            [&](CTrackViewSequence* pSequence, [[maybe_unused]] const SAnimContext& newAnimContext)
-            {
-                pSequence->Render(newAnimContext);
-            },
-            [&]([[maybe_unused]] CTrackViewSequence* pSequence, [[maybe_unused]] const SAnimContext& newAnimContext) {}
-            );
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CDirectorNodeAnimator::ForEachActiveSequence(const SAnimContext& ac, CTrackViewTrack* pSequenceTrack,
-    const bool bHandleOtherKeys, std::function<void(CTrackViewSequence*, const SAnimContext&)> animateFunction,
-    std::function<void(CTrackViewSequence*, const SAnimContext&)> resetFunction)
-{
-    const float time = ac.time;
-    const unsigned int numKeys = pSequenceTrack->GetKeyCount();
-
-    if (bHandleOtherKeys)
-    {
-        // Reset all non-active sequences first
-        for (unsigned int i = 0; i < numKeys; ++i)
-        {
-            CTrackViewKeyHandle keyHandle = pSequenceTrack->GetKey(i);
-
-            ISequenceKey sequenceKey;
-            keyHandle.GetKey(&sequenceKey);
-
-            CTrackViewSequence* pSequence = GetSequenceFromSequenceKey(sequenceKey);
-
-            if (pSequence)
-            {
-                SAnimContext newAnimContext = ac;
-                const float duration = sequenceKey.fDuration;
-                const float sequenceTime = ac.time - sequenceKey.time + sequenceKey.fStartTime;
-                const float sequenceDuration = duration + sequenceKey.fStartTime;
-
-                newAnimContext.time = std::min(sequenceTime, sequenceDuration);
-                const bool bInsideKeyRange = (sequenceTime >= 0.0f) && (sequenceTime <= sequenceDuration);
-
-                if (!bInsideKeyRange)
-                {
-                    if (ac.forcePlay && sequenceTime >= 0.0f && newAnimContext.time != pSequence->GetTime())
-                    {
-                        // If forcing animation force previous keys to their last playback position
-                        animateFunction(pSequence, newAnimContext);
-                    }
-
-                    resetFunction(pSequence, newAnimContext);
-                }
-            }
-        }
-    }
-
-    for (unsigned int i = 0; i < numKeys; ++i)
-    {
-        CTrackViewKeyHandle keyHandle = pSequenceTrack->GetKey(i);
-
-        ISequenceKey sequenceKey;
-        keyHandle.GetKey(&sequenceKey);
-
-        CTrackViewSequence* pSequence = GetSequenceFromSequenceKey(sequenceKey);
-
-        if (pSequence)
-        {
-            SAnimContext newAnimContext = ac;
-            const float duration = sequenceKey.fDuration;
-            const float sequenceTime = ac.time - sequenceKey.time + sequenceKey.fStartTime;
-            const float sequenceDuration = duration + sequenceKey.fStartTime;
-
-            newAnimContext.time = std::min(sequenceTime, sequenceDuration);
-            const bool bInsideKeyRange = (sequenceTime >= 0.0f) && (sequenceTime <= sequenceDuration);
-
-            if ((bInsideKeyRange && (newAnimContext.time != pSequence->GetTime() || ac.forcePlay)))
-            {
-                animateFunction(pSequence, newAnimContext);
-            }
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CDirectorNodeAnimator::UnBind([[maybe_unused]] CTrackViewAnimNode* pNode)
-{
-    const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-
-    const unsigned int numSequences = pSequenceManager->GetCount();
-    for (unsigned int sequenceIndex = 0; sequenceIndex < numSequences; ++sequenceIndex)
-    {
-        CTrackViewSequence* pSequence = pSequenceManager->GetSequenceByIndex(sequenceIndex);
-
-        if (pSequence->IsActiveSequence())
-        {
-            // Don't care about the active sequence
-            continue;
-        }
-
-        if (pSequence->IsBoundToEditorObjects())
-        {
-            pSequence->UnBindFromEditorObjects();
-        }
-    }
-}
-
-/*static*/ CTrackViewSequence* CDirectorNodeAnimator::GetSequenceFromSequenceKey(const ISequenceKey& sequenceKey)
-{
-    CTrackViewSequence* retSequence = nullptr;
-    const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-
-    if (sequenceManager)
-    {
-        if (sequenceKey.sequenceEntityId.IsValid())
-        {            
-            retSequence = sequenceManager->GetSequenceByEntityId(sequenceKey.sequenceEntityId);
-            AZ_Assert(retSequence, "Null sequence returned when a Sequence Component was expected.");
-        }
-    }
-
-    return retSequence;
-}
-
diff --git a/Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.h b/Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.h
deleted file mode 100644
index a661ed2ef3..0000000000
--- a/Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_DIRECTORNODEANIMATOR_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_DIRECTORNODEANIMATOR_H
-#pragma once
-
-
-#include "TrackViewAnimNode.h"
-
-// This is used to bind/unbind sub sequences in director nodes
-// when the sequence time changes. A sequence only gets bound if it was already
-// referred in time before.
-class CDirectorNodeAnimator
-    : public IAnimNodeAnimator
-{
-public:
-    CDirectorNodeAnimator(CTrackViewAnimNode* pDirectorNode);
-
-    virtual void Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac) override;
-    virtual void Render(CTrackViewAnimNode* pNode, const SAnimContext& ac) override;
-    virtual void UnBind(CTrackViewAnimNode* pNode) override;
-
-    // Utility function to find a CTrackViewSequence* from an ISequenceKey
-    static CTrackViewSequence* GetSequenceFromSequenceKey(const ISequenceKey& sequenceKey);
-
-private:
-    void ForEachActiveSequence(const SAnimContext& ac, CTrackViewTrack* pSequenceTrack,
-        const bool bHandleOtherKeys, std::function<void(CTrackViewSequence*, const SAnimContext&)> animateFunction,
-        std::function<void(CTrackViewSequence*, const SAnimContext&)> resetFunction);
-
-    CTrackViewAnimNode* m_pDirectorNode;
-};
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_DIRECTORNODEANIMATOR_H
diff --git a/Code/Sandbox/Editor/TrackView/EditorTrackViewEventsBus.h b/Code/Sandbox/Editor/TrackView/EditorTrackViewEventsBus.h
deleted file mode 100644
index 20630e1ad0..0000000000
--- a/Code/Sandbox/Editor/TrackView/EditorTrackViewEventsBus.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/std/any.h>
-
-namespace AzToolsFramework
-{
-    /**
-    * This bus can be used to send commands to the track view.
-    */
-    class EditorLayerTrackViewRequests
-        : public AZ::ComponentBus
-    {
-    public:
-
-        /**
-        * Gets the number of sequences.
-        */
-        virtual int GetNumSequences() = 0;
-
-        /**
-        * Creates a new sequence of the given type(0 = Object Entity Sequence(Legacy), 1 = Component Entity Sequence(PREVIEW)) with the given name.
-        */
-        virtual void NewSequence(const char* name, int sequenceType) = 0;
-
-        /**
-        * Plays the current sequence in TrackView.
-        */
-        virtual void PlaySequence() = 0;
-
-        /**
-        * Stops any sequence currently playing in TrackView.
-        */
-        virtual void StopSequence() = 0;
-
-        /**
-        * Sets the time of the sequence currently playing in TrackView.
-        */
-        virtual void SetSequenceTime(float time) = 0;
-
-        /**
-        * Adds an entity node(s) from viewport selection to the current sequence.
-        */
-        virtual void AddSelectedEntities() = 0;
-
-        /**
-        * Adds a layer node from the current layer to the current sequence.
-        */
-        virtual void AddLayerNode() = 0;
-
-        /**
-        * Adds a track of the given parameter ID to the node.
-        */
-        virtual void AddTrack(const char* paramName, const char* nodeName, const char* parentDirectorName) = 0;
-
-        /**
-        * Deletes a track of the given parameter ID (in the given index in case of a multi-track) from the node.
-        */
-        virtual void DeleteTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName) = 0;
-
-        /**
-        * Gets number of keys of the specified track.
-        */
-        virtual int GetNumTrackKeys(const char* paramName, int trackIndex, const char* nodeName, const char* parentDirectorName) = 0;
-
-        /**
-        * Activates/deactivates TrackView recording mode.
-        */
-        virtual void SetRecording(bool bRecording) = 0;
-
-        /**
-        * Deletes the specified sequence.
-        */
-        virtual void DeleteSequence(const char* name) = 0;
-
-        /**
-        * Sets the specified sequence as a current one in TrackView.
-        */
-        virtual void SetCurrentSequence(const char* name) = 0;
-
-        /**
-        * Gets the name of a sequence by its index.
-        */
-        virtual AZStd::string GetSequenceName(unsigned int index) = 0;
-
-        /**
-        * Gets the time range of a sequence as a pair.
-        */
-        virtual TRange<float> GetSequenceTimeRange(const char* name) = 0;
-
-        /**
-        * Adds a new node with the given type & name to the current sequence.
-        */
-        virtual void AddNode(const char* nodeTypeString, const char* nodeName) = 0;
-
-        /**
-        * Deletes the specified node from the current sequence.
-        */
-        virtual void DeleteNode(AZStd::string_view nodeName, AZStd::string_view parentDirectorName) = 0;
-
-        /**
-        * Gets the number of nodes.
-        */
-        virtual int GetNumNodes(AZStd::string_view parentDirectorName) = 0;
-
-        /**
-        * Gets the name of a sequence by its index.
-        */
-        virtual AZStd::string GetNodeName(int index, AZStd::string_view parentDirectorName) = 0;
-
-        /**
-        * Gets the value of the specified key.
-        */
-        virtual AZStd::any GetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName) = 0;
-
-        /**
-        * Gets the interpolated value of a track at the specified time.
-        */
-        virtual AZStd::any GetInterpolatedValue(const char* paramName, int trackIndex, float time, const char* nodeName, const char* parentDirectorName) = 0;
-
-        /**
-        * Sets the time range of a sequence.
-        */
-        virtual void SetSequenceTimeRange(const char* name, float start, float end) = 0;
-    };
-    using EditorLayerTrackViewRequestBus = AZ::EBus<EditorLayerTrackViewRequests>;
-}
diff --git a/Code/Sandbox/Editor/TrackView/EventKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/EventKeyUIControls.cpp
deleted file mode 100644
index 9ec5b9cc00..0000000000
--- a/Code/Sandbox/Editor/TrackView/EventKeyUIControls.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewKeyPropertiesDlg.h"  // for CTrackViewKeyUIControls
-
-#include <CryCommon/Maestro/Types/AnimParamType.h>  // AnimParamType
-
-//////////////////////////////////////////////////////////////////////////
-class CEventKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariableArray mv_deprecated;
-
-    CSmartVariableEnum<QString> mv_animation;
-    CSmartVariableEnum<QString> mv_event;
-    CSmartVariable<QString> mv_value;
-    CSmartVariable<bool> mv_notrigger_in_scrubbing;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_event, "Event");
-        AddVariable(mv_table, mv_value, "Value");
-        AddVariable(mv_table, mv_notrigger_in_scrubbing, "No trigger in scrubbing");
-        AddVariable(mv_deprecated, "Deprecated");
-        AddVariable(mv_deprecated, mv_animation, "Animation");
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::Event;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {ED5A2023-EDE1-4a47-BBE6-7D7BA0E4001D}
-        static const GUID guid =
-        {
-            0xed5a2023, 0xede1, 0x4a47, { 0xbb, 0xe6, 0x7d, 0x7b, 0xa0, 0xe4, 0x0, 0x1d }
-        };
-        return guid;
-    }
-
-private:
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CEventKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Event)
-        {
-            mv_event.SetEnumList(NULL);
-            mv_animation.SetEnumList(NULL);
-
-            // Add <None> for empty, unset event
-            mv_event->AddEnumItem(QObject::tr("<None>"), "");
-            mv_animation->AddEnumItem(QObject::tr("<None>"), "");
-
-            IEventKey eventKey;
-            keyHandle.GetKey(&eventKey);
-
-            mv_event = eventKey.event.c_str();
-            mv_value = eventKey.eventValue.c_str();
-            mv_animation = eventKey.animation.c_str();
-            mv_notrigger_in_scrubbing = eventKey.bNoTriggerInScrubbing;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CEventKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Event)
-        {
-            IEventKey eventKey;
-            keyHandle.GetKey(&eventKey);
-
-            QByteArray event, value, animation;
-            event = static_cast<QString>(mv_event).toUtf8();
-            value = static_cast<QString>(mv_value).toUtf8();
-            animation = static_cast<QString>(mv_animation).toUtf8();
-
-            if (pVar == mv_event.GetVar())
-            {
-                eventKey.event = event.data();
-            }
-            if (pVar == mv_value.GetVar())
-            {
-                eventKey.eventValue = value.data();
-            }
-            if (pVar == mv_animation.GetVar())
-            {
-                eventKey.animation = animation.data();
-            }
-            SyncValue(mv_notrigger_in_scrubbing, eventKey.bNoTriggerInScrubbing, false, pVar);
-
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                keyHandle.SetKey(&eventKey);
-            }
-            else
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
-                keyHandle.SetKey(&eventKey);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CEventKeyUIControls, "TrackView.KeyUI.Event", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/GotoKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/GotoKeyUIControls.cpp
deleted file mode 100644
index 7e3fc22fee..0000000000
--- a/Code/Sandbox/Editor/TrackView/GotoKeyUIControls.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-class CGotoKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariable<float> mv_command;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_command, "Goto Time");
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        if (paramType == AnimParamType::Goto)
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {3E9D2C57-BFB1-42f9-82AC-A393C1062634}
-        static const GUID guid =
-        {
-            0x9b79c8b6, 0xe332, 0x4b9b, { 0xb2, 0x63, 0xef, 0x7e, 0x82, 0x7, 0xa4, 0x47 }
-        };
-        return guid;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CGotoKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Goto)
-        {
-            IDiscreteFloatKey discreteFloatKey;
-            keyHandle.GetKey(&discreteFloatKey);
-
-            mv_command = discreteFloatKey.m_fValue;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-//////////////////////////////////////////////////////////////////////////
-// Called when UI variable changes.
-void CGotoKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Goto)
-        {
-            IDiscreteFloatKey discreteFloatKey;
-
-            keyHandle.GetKey(&discreteFloatKey);
-            SyncValue(mv_command, discreteFloatKey.m_fValue, false, pVar);
-
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                keyHandle.SetKey(&discreteFloatKey);
-            }
-            else
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
-                keyHandle.SetKey(&discreteFloatKey);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CGotoKeyUIControls, "TrackView.KeyUI.Goto", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/ScreenFaderKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/ScreenFaderKeyUIControls.cpp
deleted file mode 100644
index 1a1c3f7e2f..0000000000
--- a/Code/Sandbox/Editor/TrackView/ScreenFaderKeyUIControls.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"
-
-
-//-----------------------------------------------------------------------------
-//!
-class CScreenFaderKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-    CSmartVariableArray     mv_table;
-    CSmartVariable<float>   mv_fadeTime;
-    CSmartVariable<Vec3>    mv_fadeColor;
-    CSmartVariable<QString> mv_strTexture;
-    CSmartVariable<bool>    mv_bUseCurColor;
-    CSmartVariableEnum<int> mv_fadeType;
-    CSmartVariableEnum<int> mv_fadechangeType;
-
-public:
-    //-----------------------------------------------------------------------------
-    //!
-    virtual bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::ScreenFader;
-    }
-
-    //-----------------------------------------------------------------------------
-    //!
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-
-        mv_fadeType->SetEnumList(NULL);
-        mv_fadeType->AddEnumItem("FadeIn", IScreenFaderKey::eFT_FadeIn);
-        mv_fadeType->AddEnumItem("FadeOut", IScreenFaderKey::eFT_FadeOut);
-        AddVariable(mv_table, mv_fadeType, "Type");
-
-        mv_fadechangeType->SetEnumList(NULL);
-        mv_fadechangeType->AddEnumItem("Linear", IScreenFaderKey::eFCT_Linear);
-        mv_fadechangeType->AddEnumItem("Square", IScreenFaderKey::eFCT_Square);
-        mv_fadechangeType->AddEnumItem("Cubic Square", IScreenFaderKey::eFCT_CubicSquare);
-        mv_fadechangeType->AddEnumItem("Square Root", IScreenFaderKey::eFCT_SquareRoot);
-        mv_fadechangeType->AddEnumItem("Sin", IScreenFaderKey::eFCT_Sin);
-        AddVariable(mv_table, mv_fadechangeType, "ChangeType");
-
-        AddVariable(mv_table, mv_fadeColor, "Color", IVariable::DT_COLOR);
-
-        mv_fadeTime->SetLimits(0.f, 100.f);
-        AddVariable(mv_table, mv_fadeTime, "Duration");
-        AddVariable(mv_table, mv_strTexture, "Texture", IVariable::DT_TEXTURE);
-        AddVariable(mv_table, mv_bUseCurColor, "Use Current Color");
-    }
-
-    //-----------------------------------------------------------------------------
-    //!
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& keys);
-
-    //-----------------------------------------------------------------------------
-    //!
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& keys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {FBBC2407-C36B-45b2-9A54-0CF9CD3908FD}
-        static const GUID guid =
-        {
-            0xfbbc2407, 0xc36b, 0x45b2, { 0x9a, 0x54, 0xc, 0xf9, 0xcd, 0x39, 0x8, 0xfd }
-        };
-        return guid;
-    }
-};
-
-//-----------------------------------------------------------------------------
-bool CScreenFaderKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& keys)
-{
-    if (!keys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (keys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = keys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::ScreenFader)
-        {
-            IScreenFaderKey screenFaderKey;
-            keyHandle.GetKey(&screenFaderKey);
-
-            mv_fadeTime = screenFaderKey.m_fadeTime;
-            mv_fadeColor = Vec3(screenFaderKey.m_fadeColor.GetR(), screenFaderKey.m_fadeColor.GetG(), screenFaderKey.m_fadeColor.GetB());
-            mv_strTexture = screenFaderKey.m_strTexture.c_str();
-            mv_bUseCurColor = screenFaderKey.m_bUseCurColor;
-            mv_fadeType = (int)screenFaderKey.m_fadeType;
-            mv_fadechangeType = (int)screenFaderKey.m_fadeChangeType;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-//-----------------------------------------------------------------------------
-void CScreenFaderKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (size_t keyIndex = 0, num = selectedKeys.GetKeyCount(); keyIndex < num; ++keyIndex)
-    {
-        CTrackViewKeyHandle selectedKey = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = selectedKey.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::ScreenFader)
-        {
-            IScreenFaderKey screenFaderKey;
-            selectedKey.GetKey(&screenFaderKey);
-
-            SyncValue(mv_fadeTime, screenFaderKey.m_fadeTime, false, pVar);
-
-            SyncValue(mv_bUseCurColor, screenFaderKey.m_bUseCurColor, false, pVar);
-
-            if (pVar == mv_fadeTime.GetVar())
-            {
-                screenFaderKey.m_fadeTime = MAX((float)mv_fadeTime, 0.f);
-            }
-            else if (pVar == mv_strTexture.GetVar())
-            {
-                QString sTexture = mv_strTexture;
-                screenFaderKey.m_strTexture = sTexture.toUtf8().data();
-            }
-            else if (pVar == mv_fadeType.GetVar())
-            {
-                screenFaderKey.m_fadeType = IScreenFaderKey::EFadeType((int)mv_fadeType);
-            }
-            else if (pVar == mv_fadechangeType.GetVar())
-            {
-                screenFaderKey.m_fadeChangeType = IScreenFaderKey::EFadeChangeType((int)mv_fadechangeType);
-            }
-            else if (pVar == mv_fadeColor.GetVar())
-            {
-                Vec3 color = mv_fadeColor;
-                screenFaderKey.m_fadeColor = AZ::Color(color.x, color.y, color.z, screenFaderKey.m_fadeType == IScreenFaderKey::eFT_FadeIn ? 1.f : 0.f);
-            }
-
-            selectedKey.SetKey(&screenFaderKey);
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CScreenFaderKeyUIControls, "TrackView.KeyUI.ScreenFader", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/SelectKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/SelectKeyUIControls.cpp
deleted file mode 100644
index ab7c310f64..0000000000
--- a/Code/Sandbox/Editor/TrackView/SelectKeyUIControls.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewKeyPropertiesDlg.h"                          // for CTrackViewKeyUIControls
-
-#include <AzCore/Component/EntityBus.h>                         // for AZ::EntitySystemBus
-#include <AzFramework/Components/CameraBus.h>                   // for Camera::CameraNotificationBus
-#include <CryCommon/Maestro/Types/AnimValueType.h>              // for AnimValueType
-
-//////////////////////////////////////////////////////////////////////////
-class CSelectKeyUIControls
-    : public CTrackViewKeyUIControls
-    , protected Camera::CameraNotificationBus::Handler
-    , protected AZ::EntitySystemBus::Handler
-{
-public:
-    CSelectKeyUIControls() {}
-
-    ~CSelectKeyUIControls() override;
-
-    CSmartVariableArray mv_table;
-    CSmartVariableEnum<QString> mv_camera;
-    CSmartVariable<float> mv_BlendTime;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_camera, "Camera");
-        AddVariable(mv_table, mv_BlendTime, "Blend time");
-
-        Camera::CameraNotificationBus::Handler::BusConnect();
-        AZ::EntitySystemBus::Handler::BusConnect();
-    }
-    bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
-    {
-        return valueType == AnimValueType::Select;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {9018D0D1-24CC-45e5-9D3D-16D3F9E591B2}
-        static const GUID guid =
-        {
-            0x9018d0d1, 0x24cc, 0x45e5, { 0x9d, 0x3d, 0x16, 0xd3, 0xf9, 0xe5, 0x91, 0xb2 }
-        };
-        return guid;
-    }
-
-protected:
-    ////////////////////////////////////////////////////////////////////////
-    // CameraNotificationBus interface implementation
-    void OnCameraAdded(const AZ::EntityId& cameraId) override;
-    void OnCameraRemoved(const AZ::EntityId& cameraId) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // AZ::EntitySystemBus::Handler
-    void OnEntityNameChanged(const AZ::EntityId& entityId, const AZStd::string& name) override;
-
-private:
-
-    void ResetCameraEntries();
-};
-
-CSelectKeyUIControls::~CSelectKeyUIControls()
-{
-    AZ::EntitySystemBus::Handler::BusDisconnect();
-    Camera::CameraNotificationBus::Handler::BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSelectKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        AnimValueType valueType = keyHandle.GetTrack()->GetValueType();
-        if (valueType == AnimValueType::Select)
-        {
-            ResetCameraEntries();
-
-            // Get All cameras.
-            mv_camera.SetEnumList(NULL);
-
-            mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
-
-            // Find all Component Entity Cameras
-            AZ::EBusAggregateResults<AZ::EntityId> cameraComponentEntities;
-            Camera::CameraBus::BroadcastResult(cameraComponentEntities, &Camera::CameraRequests::GetCameras);
-
-            // add names of all found entities with Camera Components
-            for (int i = 0; i < cameraComponentEntities.values.size(); i++)
-            {
-                AZ::Entity* entity = nullptr;
-                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, cameraComponentEntities.values[i]);
-                if (entity)
-                {
-                    // For Camera Components the enum value is the stringified AZ::EntityId of the entity with the Camera Component
-                    QString entityIdString = QString::number(static_cast<AZ::u64>(entity->GetId()));
-                    mv_camera->AddEnumItem(entity->GetName().c_str(), entityIdString);
-                }
-            }            
-
-            ISelectKey selectKey;
-            keyHandle.GetKey(&selectKey);
-
-            mv_camera = QString::number(static_cast<AZ::u64>(selectKey.cameraAzEntityId));            
-
-            mv_BlendTime.GetVar()->SetLimits(0.0f, selectKey.fDuration > .0f ? selectKey.fDuration : 1.0f, 0.1f, true, false);
-            mv_BlendTime = selectKey.fBlendTime;
-
-            bAssigned = true;        
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CSelectKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        AnimValueType valueType = keyHandle.GetTrack()->GetValueType();
-        if (valueType == AnimValueType::Select)
-        {
-            ISelectKey selectKey;
-            keyHandle.GetKey(&selectKey);
-
-            if (pVar == mv_camera.GetVar())
-            {
-                QString entityIdString = mv_camera;
-                selectKey.cameraAzEntityId = AZ::EntityId(entityIdString.toULongLong());
-                selectKey.szSelection =  mv_camera.GetVar()->GetDisplayValue().toUtf8().data();
-            }
-
-            if (pVar == mv_BlendTime.GetVar())
-            {
-                if (mv_BlendTime < 0.0f)
-                {
-                    mv_BlendTime = 0.0f;
-                }
-
-                selectKey.fBlendTime = mv_BlendTime;
-            }
-
-            if (!selectKey.szSelection.empty())
-            {
-                IAnimSequence* pSequence = GetIEditor()->GetSystem()->GetIMovieSystem()->FindLegacySequenceByName(selectKey.szSelection.c_str());
-                if (pSequence)
-                {
-                    selectKey.fDuration = pSequence->GetTimeRange().Length();
-                }
-            }
-
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                keyHandle.SetKey(&selectKey);
-            }
-            else
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
-                keyHandle.SetKey(&selectKey);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-
-        }
-    }
-}
-
-void CSelectKeyUIControls::OnCameraAdded(const AZ::EntityId & cameraId)
-{
-    // Add a single camera component
-    AZ::Entity* entity = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, cameraId);
-    if (entity)
-    {
-        // For Camera Components the enum value is the stringified AZ::EntityId of the entity with the Camera Component
-        QString entityIdString = QString::number(static_cast<AZ::u64>(entity->GetId()));
-        mv_camera->AddEnumItem(entity->GetName().c_str(), entityIdString);
-    }
-}
-
-void CSelectKeyUIControls::OnCameraRemoved(const AZ::EntityId & cameraId)
-{
-    mv_camera->EnableUpdateCallbacks(false);
-
-    // We can't iterate or remove an item from the enum list, and Camera::CameraRequests::GetCameras
-    // still includes the deleted camera at this point. Reset the list anyway and filter out the
-    // deleted camera.
-    mv_camera->SetEnumList(NULL);
-    mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
-
-    AZ::EBusAggregateResults<AZ::EntityId> cameraComponentEntities;
-    Camera::CameraBus::BroadcastResult(cameraComponentEntities, &Camera::CameraRequests::GetCameras);
-    for (int i = 0; i < cameraComponentEntities.values.size(); i++)
-    {
-        if (cameraId == cameraComponentEntities.values[i])
-        {
-            continue;
-        }
-        OnCameraAdded(cameraComponentEntities.values[i]);
-    }
-
-    mv_camera->EnableUpdateCallbacks(true);
-}
-
-void CSelectKeyUIControls::OnEntityNameChanged(const AZ::EntityId & entityId, [[maybe_unused]] const AZStd::string & name)
-{
-    AZ::Entity* entity = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
-    if (entity == nullptr)
-    {
-        return;
-    }
-
-    AZ::Entity::ComponentArrayType cameraComponents = entity->FindComponents(EditorCameraComponentTypeId);
-    if (cameraComponents.size() == 0)
-    {
-        return;
-    }
-
-    mv_camera->EnableUpdateCallbacks(false);
-    ResetCameraEntries();
-    mv_camera->EnableUpdateCallbacks(true);
-}
-
-void CSelectKeyUIControls::ResetCameraEntries()
-{
-    mv_camera.SetEnumList(NULL);
-    mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
-
-    // Find all Component Entity Cameras
-    AZ::EBusAggregateResults<AZ::EntityId> cameraComponentEntities;
-    Camera::CameraBus::BroadcastResult(cameraComponentEntities, &Camera::CameraRequests::GetCameras);
-
-    // add names of all found entities with Camera Components
-    for (int i = 0; i < cameraComponentEntities.values.size(); i++)
-    {
-        OnCameraAdded(cameraComponentEntities.values[i]);
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CSelectKeyUIControls, "TrackView.KeyUI.Select", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.cpp b/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.cpp
deleted file mode 100644
index e4ca619446..0000000000
--- a/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.cpp
+++ /dev/null
@@ -1,1633 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog for batch-rendering sequences
-
-
-#include "EditorDefs.h"
-
-#include "SequenceBatchRenderDialog.h"
-
-#include <AzFramework/Windowing/WindowBus.h>
-
-// Qt
-#include <QAction>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QStringListModel>
-#include <QtConcurrent>
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-
-// Editor
-#include "MainWindow.h"
-#include "CustomResolutionDlg.h"
-#include "ViewPane.h"
-#include "GameEngine.h"
-#include "Include/ICommandManager.h"
-#include "CryEdit.h"
-#include "Viewport.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <TrackView/ui_SequenceBatchRenderDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-namespace
-{
-    const int g_useActiveViewportResolution = -1;   // reserved value to indicate the use of the active viewport resolution
-    int resolutions[][2] = {
-        { 1280, 720 }, { 1920, 1080 }, { 1998, 1080 }, { 2048, 858 }, { 2560, 1440 }, 
-        { g_useActiveViewportResolution, g_useActiveViewportResolution }    // active viewport res must be the last element of the resolution array
-    };
-
-    // cached current active viewport resolution
-    int activeViewportWidth;
-    int activeViewportHeight;
-
-    struct SFPSPair
-    {
-        int fps;
-        const char* fpsDesc;
-    } fpsOptions[] = {
-        {24, "Film(24)"}, {25, "PAL(25)"}, {30, "NTSC(30)"},
-        {48, "Show(48)"}, {50, "PAL Field(50)"}, {60, "NTSC Field(60)"}
-    };
-
-    // currently supported file extensions
-    const char* imageFormatExtensions[] = {"dds", "ppm"};
-
-    const char defaultPresetFilename[] = "defaultBatchRender.preset";
-
-    const char customResFormat[] = "Custom(%1 x %2)...";
-
-    const int kBatchRenderFileVersion = 2; // This version number should be incremented every time available options like the list of formats,
-    // the list of buffers change.
-
-    // get the actual render width to use (substitutes active viewport width if needed)
-    int getResWidth(int renderItemWidth)
-    {
-        return (renderItemWidth == g_useActiveViewportResolution) ? activeViewportWidth : renderItemWidth;
-    }
-    // get the actual render height to use (substitutes active viewport height if needed)
-    int getResHeight(int renderItemHeight)
-    {
-        return (renderItemHeight == g_useActiveViewportResolution) ? activeViewportHeight : renderItemHeight;
-    }
-}
-
-static void UpdateAtomOutputFrameCaptureView(TrackView::AtomOutputFrameCapture& atomOutputFrameCapture, const int width, const int height)
-{
-    const AZ::EntityId activeCameraEntityId = TrackView::ActiveCameraEntityId();
-    atomOutputFrameCapture.UpdateView(
-        TrackView::TransformFromEntityId(activeCameraEntityId),
-        TrackView::ProjectionFromCameraEntityId(activeCameraEntityId, width, height));
-}
-
-CSequenceBatchRenderDialog::CSequenceBatchRenderDialog(float fps, QWidget* pParent /* = nullptr */)
-    : QDialog(pParent)
-    , m_fpsForTimeToFrameConversion(fps)
-    , m_customResH(0)
-    , m_customResW(0)
-    , m_customFPS(0)
-    , m_bFFMPEGCommandAvailable(false)
-    , m_ui(new Ui::SequenceBatchRenderDialog)
-    , m_renderListModel(new QStringListModel(this))
-    , CV_TrackViewRenderOutputCapturing(0)
-    , m_prefixValidator(new CPrefixValidator(this))
-{
-    m_ui->setupUi(this);
-    setFixedSize(size());
-    m_ui->m_renderList->setModel(m_renderListModel);
-
-    OnInitDialog();
-
-    connect(&m_renderTimer, &QTimer::timeout, this, &CSequenceBatchRenderDialog::OnKickIdleTimout);
-    m_renderTimer.setInterval(0);
-    m_renderTimer.setSingleShot(true);
-
-    REGISTER_CVAR3("TrackViewRenderOutputCapturing", CV_TrackViewRenderOutputCapturing, 0, VF_NULL, "Set to 1 when Track View is actively capturing render output.");
-}
-
-CSequenceBatchRenderDialog::~CSequenceBatchRenderDialog()
-{
-}
-
-void CSequenceBatchRenderDialog::reject()
-{
-    if (m_renderContext.IsInRendering())
-    {
-        OnCancelRender();
-    }
-    else
-    {
-        QDialog::reject();
-    }
-}
-
-void CSequenceBatchRenderDialog::OnInitDialog()
-{
-    QAction* browseAction = m_ui->m_destinationEdit->addAction(style()->standardPixmap(QStyle::SP_DirOpenIcon), QLineEdit::TrailingPosition);
-    connect(browseAction, &QAction::triggered, this, [=]()
-    {
-        const QString dir = QFileDialog::getExistingDirectory(this);
-        if (!dir.isEmpty())
-        {
-            m_ui->m_destinationEdit->setText(dir);
-        }
-    });
-
-    void(QComboBox::* activated)(int) = &QComboBox::activated;
-    void(QSpinBox::* editingFinished)() = &QSpinBox::editingFinished;
-
-    connect(m_ui->BATCH_RENDER_ADD_SEQ, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnAddRenderItem);
-    connect(m_ui->BATCH_RENDER_REMOVE_SEQ, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnRemoveRenderItem);
-    connect(m_ui->BATCH_RENDER_CLEAR_SEQ, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnClearRenderItems);
-    connect(m_ui->m_updateBtn, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnUpdateRenderItem);
-    connect(m_ui->BATCH_RENDER_LOAD_PRESET, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnLoadPreset);
-    connect(m_ui->BATCH_RENDER_SAVE_PRESET, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnSavePreset);
-    connect(m_ui->BATCH_RENDER_LOAD_BATCH, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnLoadBatch);
-    connect(m_ui->BATCH_RENDER_SAVE_BATCH, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnSaveBatch);
-    connect(m_ui->m_pGoBtn, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnGo);
-    connect(m_ui->CANCEL, &QPushButton::clicked, this, &CSequenceBatchRenderDialog::OnDone);
-    connect(m_ui->m_sequenceCombo, activated, this, &CSequenceBatchRenderDialog::OnSequenceSelected);
-    connect(m_ui->m_fpsCombo->lineEdit(), &QLineEdit::textEdited, this, &CSequenceBatchRenderDialog::OnFPSEditChange);
-    connect(m_ui->m_fpsCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &CSequenceBatchRenderDialog::OnFPSChange);
-    connect(m_ui->m_renderList->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CSequenceBatchRenderDialog::OnRenderItemSelChange);
-    connect(m_ui->m_resolutionCombo, activated, this, &CSequenceBatchRenderDialog::OnResolutionSelected);
-    connect(m_ui->m_startFrame, editingFinished, this, &CSequenceBatchRenderDialog::OnStartFrameChange);
-    connect(m_ui->m_endFrame, editingFinished, this, &CSequenceBatchRenderDialog::OnEndFrameChange);
-    connect(m_ui->m_imageFormatCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &CSequenceBatchRenderDialog::OnImageFormatChange);
-
-    const float bigEnoughNumber = 1000000.0f;
-    m_ui->m_startFrame->setRange(0.0f, bigEnoughNumber);
-
-    m_ui->m_endFrame->setRange(0.0f, bigEnoughNumber);
-
-    // Fill the sequence combo box.
-    bool activeSequenceWasSet = false;
-    for (int k = 0; k < GetIEditor()->GetMovieSystem()->GetNumSequences(); ++k)
-    {
-        IAnimSequence* pSequence = GetIEditor()->GetMovieSystem()->GetSequence(k);
-        m_ui->m_sequenceCombo->addItem(pSequence->GetName());
-        if (pSequence->IsActivated())
-        {
-            m_ui->m_sequenceCombo->setCurrentIndex(k);
-            activeSequenceWasSet = true;
-        }
-    }
-    if (!activeSequenceWasSet)
-    {
-        m_ui->m_sequenceCombo->setCurrentIndex(0);
-    }
-
-    m_ui->m_fpsCombo->setEditable(true);
-
-    // Fill the shot combos and the default frame range.
-    OnSequenceSelected();
-
-    // Fill the resolution combo box.
-    for (int i = 0; i < arraysize(resolutions); ++i)
-    {
-        if (resolutions[i][0] == g_useActiveViewportResolution  && resolutions[i][1] == g_useActiveViewportResolution)
-        {
-            m_ui->m_resolutionCombo->addItem(tr("Active View Resolution"));
-            stashActiveViewportResolution();    // render dialog is modal, so we can stash the viewport res on init
-        }
-        else
-        {
-            m_ui->m_resolutionCombo->addItem(tr("%1 x %2").arg(resolutions[i][0]).arg(resolutions[i][1]));
-        }
-    }
-    m_ui->m_resolutionCombo->addItem(tr("Custom..."));
-    m_ui->m_resolutionCombo->setCurrentIndex(0);
-
-    // Fill the FPS combo box.
-    for (int i = 0; i < AZStd::size(fpsOptions); ++i)
-    {
-        m_ui->m_fpsCombo->addItem(fpsOptions[i].fpsDesc);
-    }
-    m_ui->m_fpsCombo->setCurrentIndex(0);
-
-    // Fill the image format combo box.
-    for (int i = 0; i < AZStd::size(imageFormatExtensions); ++i)
-    {
-        m_ui->m_imageFormatCombo->addItem(imageFormatExtensions[i]);
-    }
-    m_ui->m_imageFormatCombo->setCurrentIndex(0);
-
-    m_ui->BATCH_RENDER_FILE_PREFIX->setText("Frame");
-    m_ui->BATCH_RENDER_FILE_PREFIX->setValidator(m_prefixValidator.data());
-
-    m_ui->m_progressStatusMsg->setText("Not running");
-
-    m_ui->BATCH_RENDER_REMOVE_SEQ->setEnabled(false);
-    m_ui->m_pGoBtn->setEnabled(false);
-    m_ui->m_pGoBtn->setIcon(QPixmap(":/Trackview/clapperboard_ready.png"));
-
-    m_ui->m_progressBar->setRange(0, 100);
-
-    m_ui->BATCH_RENDER_FRAME_IN_FPS->setText(tr("In %1 FPS").arg(static_cast<int>(m_fpsForTimeToFrameConversion)));
-
-    m_bFFMPEGCommandAvailable = GetIEditor()->GetICommandManager()->IsRegistered("plugin", "ffmpeg_encode");
-    m_ffmpegPluginStatusMsg = m_bFFMPEGCommandAvailable ?
-        QString("") :
-        tr("FFMPEG plug-in isn't found(creating a video isn't supported).");
-    m_ui->BATCH_RENDER_PRESS_ESC_TO_CANCEL->setText(m_ffmpegPluginStatusMsg);
-
-    // Disable the create video checkbox if the ffmpeg command is not available
-    if (!m_bFFMPEGCommandAvailable)
-    {
-        m_ui->m_createVideoCheckBox->setChecked(false);
-        m_ui->m_createVideoCheckBox->setEnabled(false);
-    }
-
-    // Load previously saved options, if any.
-    QString defaultPresetPath = Path::GetUserSandboxFolder();
-    defaultPresetPath += defaultPresetFilename;
-    if (CFileUtil::FileExists(defaultPresetPath))
-    {
-        LoadOutputOptions(defaultPresetPath);
-    }
-
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::OnRenderItemSelChange()
-{
-    // Enable/disable the 'remove'/'update' button properly.
-    bool bNoSelection = !m_ui->m_renderList->selectionModel()->hasSelection();
-    m_ui->BATCH_RENDER_REMOVE_SEQ->setEnabled(bNoSelection ? false : true);
-    
-    CheckForEnableUpdateButton();
-
-    if (bNoSelection)
-    {
-        return;
-    }
-
-    // Apply the settings of the selected one to the dialog.
-    const SRenderItem& item = m_renderItems[m_ui->m_renderList->currentIndex().row()];
-    // sequence
-    for (int i = 0; i < m_ui->m_sequenceCombo->count(); ++i)
-    {
-        const QString sequenceName = m_ui->m_sequenceCombo->itemText(i);
-        if (sequenceName == item.pSequence->GetName())
-        {
-            m_ui->m_sequenceCombo->setCurrentIndex(i);
-            OnSequenceSelected();
-            break;
-        }
-    }
-    // director
-    for (int i = 0; i < m_ui->m_shotCombo->count(); ++i)
-    {
-        const QString directorName = m_ui->m_shotCombo->itemText(i);
-        if (directorName == item.pDirectorNode->GetName())
-        {
-            m_ui->m_shotCombo->setCurrentIndex(i);
-            break;
-        }
-    }
-    // frame range
-    m_ui->m_startFrame->setValue(item.frameRange.start * m_fpsForTimeToFrameConversion);
-    m_ui->m_endFrame->setValue(item.frameRange.end * m_fpsForTimeToFrameConversion);
-    // folder
-    m_ui->m_destinationEdit->setText(item.folder);
-    // fps
-    bool bFound = false;
-    for (int i = 0; i < arraysize(fpsOptions); ++i)
-    {
-        if (item.fps == fpsOptions[i].fps)
-        {
-            m_ui->m_fpsCombo->setCurrentIndex(i);
-            bFound = true;
-            break;
-        }
-    }
-    if (bFound == false)
-    {
-        m_customFPS = item.fps;
-        m_ui->m_fpsCombo->setCurrentText(QString::number(item.fps));
-    }
-    // prefix
-    m_ui->BATCH_RENDER_FILE_PREFIX->setText(item.prefix);
-
-    m_ui->m_disableDebugInfoCheckBox->setChecked(item.disableDebugInfo);
-
-    // create_video
-    if (m_bFFMPEGCommandAvailable)
-    {
-        m_ui->m_createVideoCheckBox->setChecked(item.bCreateVideo);
-    }
-
-    // resolution
-    bFound = false;
-    for (int i = 0; i < arraysize(resolutions); ++i)
-    {
-        if (item.resW == resolutions[i][0] && item.resH == resolutions[i][1])
-        {
-            m_ui->m_resolutionCombo->setCurrentIndex(i);
-            bFound = true;
-            break;
-        }
-    }
-    if (bFound == false)
-    {
-        int indexOfCustomRes = arraysize(resolutions);
-        const QString resText = QString::fromLatin1(customResFormat).arg(item.resW).arg(item.resH);
-        m_customResW = item.resW;
-        m_customResH = item.resH;
-        m_ui->m_resolutionCombo->removeItem(indexOfCustomRes);
-        m_ui->m_resolutionCombo->addItem(resText);
-        m_ui->m_resolutionCombo->setCurrentIndex(indexOfCustomRes);
-    }
-    // cvars
-    QString cvarsText;
-    for (size_t i = 0; i < item.cvars.size(); ++i)
-    {
-        cvarsText += item.cvars[i];
-        cvarsText += "\r\n";
-    }
-    m_ui->m_cvarsEdit->setPlainText(cvarsText);    
-}
-
-void CSequenceBatchRenderDialog::CheckForEnableUpdateButton()
-{
-    bool enable = false;
-
-    // Enable the Update button if any ui elements are changed
-    // from the currently selected render item.
-    if (m_ui->m_renderList->selectionModel()->hasSelection())
-    {
-        SRenderItem item;
-        if (SetUpNewRenderItem(item))
-        {
-            int index = m_ui->m_renderList->currentIndex().row();
-            assert(index >= 0 && index < m_renderItems.size());
-            enable = !(m_renderItems[index] == item);
-        }
-    }
-
-    m_ui->m_updateBtn->setEnabled(enable);
-}
-
-void CSequenceBatchRenderDialog::OnAddRenderItem()
-{
-    // If there is no director node, it cannot be added.
-    if (m_ui->m_shotCombo->count() == 0)
-    {
-        QMessageBox::critical(this, tr("Cannot add"), tr("No director available!"));
-        return;
-    }
-
-    // Set up a new render item.
-    SRenderItem item;
-    if (SetUpNewRenderItem(item) == false)
-    {
-        return;
-    }
-
-    // Check a duplication before adding.
-    for (size_t i = 0; i < m_renderItems.size(); ++i)
-    {
-        if (m_renderItems[i] == item)
-        {
-            QMessageBox::critical(this, tr("Cannot add"), tr("The same item already exists"));
-            return;
-        }
-    }
-
-    AddItem(item);
-}
-
-void CSequenceBatchRenderDialog::OnRemoveRenderItem()
-{
-    int index = m_ui->m_renderList->currentIndex().row();
-    assert(index != CB_ERR);
-    m_ui->m_renderList->model()->removeRow(index);
-    m_renderItems.erase(m_renderItems.begin() + index);
-
-    if (m_renderItems.empty())
-    {
-        m_ui->BATCH_RENDER_REMOVE_SEQ->setEnabled(false);
-        m_ui->m_pGoBtn->setEnabled(false);
-    }
-    else
-    {
-        m_ui->m_renderList->setCurrentIndex(m_ui->m_renderList->model()->index(0, 0));
-        OnRenderItemSelChange();
-    }
-
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::OnClearRenderItems()
-{
-    m_ui->m_renderList->model()->removeRows(0, m_ui->m_renderList->model()->rowCount());
-    m_renderItems.clear();
-
-    m_ui->BATCH_RENDER_REMOVE_SEQ->setEnabled(false);
-    m_ui->m_pGoBtn->setEnabled(false);
-
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::OnUpdateRenderItem()
-{
-    int index = m_ui->m_renderList->currentIndex().row();
-    assert(index != -1);
-
-    // Set up a new render item.
-    SRenderItem item;
-    SetUpNewRenderItem(item);
-
-    // Check a duplication before updating.
-    for (size_t i = 0; i < m_renderItems.size(); ++i)
-    {
-        if (m_renderItems[i] == item)
-        {
-            QMessageBox::critical(this, tr("Cannot update"), tr("The same item already exists!"));
-            return;
-        }
-    }
-
-    // Update the item.
-    m_renderItems[index] = item;
-
-    // Update the list box, too.
-    m_ui->m_renderList->model()->setData(m_ui->m_renderList->model()->index(index, 0), GetCaptureItemString(item));
-
-    m_ui->m_updateBtn->setEnabled(false);
-}
-
-void CSequenceBatchRenderDialog::OnLoadPreset()
-{
-    QString loadPath;
-    if (CFileUtil::SelectFile("Preset Files (*.preset)", Path::GetUserSandboxFolder(), loadPath))
-    {
-        if (LoadOutputOptions(loadPath) == false)
-        {
-            QMessageBox::critical(this, tr("Cannot load"), tr("The file version is different!"));
-        }
-    }
-}
-
-void CSequenceBatchRenderDialog::OnSavePreset()
-{
-    QString savePath;
-    if (CFileUtil::SelectSaveFile("Preset Files (*.preset)", "preset", Path::GetUserSandboxFolder(), savePath))
-    {
-        SaveOutputOptions(savePath);
-    }
-}
-
-void CSequenceBatchRenderDialog::stashActiveViewportResolution()
-{   
-    // stash active resolution in global vars
-    activeViewportWidth = resolutions[0][0];
-    activeViewportHeight = resolutions[0][1];
-    CViewport* activeViewport = GetIEditor()->GetActiveView();
-    if (activeViewport)
-    {
-        activeViewport->GetDimensions(&activeViewportWidth, &activeViewportHeight);
-    }  
-}
-
-void CSequenceBatchRenderDialog::OnGo()
-{
-    if (m_renderContext.IsInRendering())
-    {
-        OnCancelRender();
-    }
-    else
-    {
-        // Start a new batch.
-        m_ui->m_pGoBtn->setText("Cancel");
-        m_ui->m_pGoBtn->setIcon(QPixmap(":/Trackview/clapperboard_cancel.png"));
-        // Inform the movie system that it soon will be in a batch-rendering mode.
-        GetIEditor()->GetMovieSystem()->EnableBatchRenderMode(true);
-
-        // Initialize the context.
-        InitializeContext();
-
-        // Trigger the first item.
-        OnMovieEvent(IMovieListener::eMovieEvent_Stopped, NULL);
-    }
-}
-
-void CSequenceBatchRenderDialog::OnMovieEvent(IMovieListener::EMovieEvent event, IAnimSequence* pSequence)
-{
-    if (event == IMovieListener::eMovieEvent_Stopped
-        || event == IMovieListener::eMovieEvent_Aborted)
-    {
-        // Finalize the current one, if any.
-        if (pSequence)
-        {
-            EnterCaptureState(CaptureState::End);
-            m_renderContext.endingSequence = pSequence;
-            m_renderContext.canceled = (event == IMovieListener::eMovieEvent_Aborted);
-        }
-        else
-        {
-            // This is odd, but this is the condition that starts the first item capturing
-            // when the user presses the start button.
-            if (m_renderItems.size() > 0)
-            {
-                // Setup and trigger the first time
-                m_renderContext.spentTime = 0.0f;
-                m_renderContext.currentItemIndex = 0;
-                CaptureItemStart();
-            }
-        }
-    }
-}
-
-void CSequenceBatchRenderDialog::OnDone()
-{
-    if (m_renderContext.IsInRendering())
-    {
-        OnCancelRender();
-    }
-    else
-    {
-        // Save options when closed.
-        QString defaultPresetPath = Path::GetUserSandboxFolder();
-        defaultPresetPath += defaultPresetFilename;
-        SaveOutputOptions(defaultPresetPath);
-
-        reject();
-    }
-}
-
-void CSequenceBatchRenderDialog::OnSequenceSelected()
-{
-    // Get the selected sequence.
-    const QString seqName = m_ui->m_sequenceCombo->currentText();
-    IAnimSequence* pSequence = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(seqName.toUtf8().data());
-
-    // Adjust the frame range.
-    float sFrame = pSequence->GetTimeRange().start * m_fpsForTimeToFrameConversion;
-    float eFrame = pSequence->GetTimeRange().end * m_fpsForTimeToFrameConversion;
-    m_ui->m_startFrame->setRange(0.0f, eFrame);
-    m_ui->m_endFrame->setRange(0.0f, eFrame);
-
-    // Set the default start/end frames properly.
-    m_ui->m_startFrame->setValue(sFrame);
-    m_ui->m_endFrame->setValue(eFrame);
-
-    m_ui->m_shotCombo->clear();
-    // Fill the shot combo box with the names of director nodes.
-    for (int i = 0; i < pSequence->GetNodeCount(); ++i)
-    {
-        if (pSequence->GetNode(i)->GetType() == AnimNodeType::Director)
-        {
-            m_ui->m_shotCombo->addItem(pSequence->GetNode(i)->GetName());
-        }
-    }
-    m_ui->m_shotCombo->setCurrentIndex(0);
-
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::OnFPSEditChange()
-{
-    const QString fpsText = m_ui->m_fpsCombo->currentText();
-    bool ok;
-    const int fps = fpsText.toInt(&ok);
-    bool bInvalidInput = !ok || fps <= 0;
-
-    if (bInvalidInput)
-    {
-        m_ui->m_fpsCombo->setCurrentIndex(0);
-    }
-    else
-    {
-        m_customFPS = fps;
-    }
-
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::OnFPSChange(int itemIndex)
-{
-    m_customFPS = fpsOptions[itemIndex].fps;
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::OnImageFormatChange()
-{
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::OnResolutionSelected()
-{
-    int indexOfCustomRes = arraysize(resolutions);
-    if (m_ui->m_resolutionCombo->currentIndex() == indexOfCustomRes)
-    {
-        int defaultW;
-        int defaultH;
-        const QString currentCustomResText = m_ui->m_resolutionCombo->currentText();
-        GetResolutionFromCustomResText(currentCustomResText.toStdString().c_str(), defaultW, defaultH);
-        
-        CCustomResolutionDlg resDlg(defaultW, defaultH, this);
-        if (resDlg.exec() == QDialog::Accepted)
-        {
-            const int maxRes = 8192;
-            m_customResW = min(resDlg.GetWidth(), maxRes);
-            m_customResH = min(resDlg.GetHeight(), maxRes);
-            const QString resText = QString(customResFormat).arg(m_customResW).arg(m_customResH);
-            m_ui->m_resolutionCombo->setItemText(indexOfCustomRes, resText);
-            m_ui->m_resolutionCombo->setCurrentIndex(indexOfCustomRes);
-        }
-        else
-        {
-            m_ui->m_resolutionCombo->setCurrentIndex(0);
-        }
-    }
-
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::SaveOutputOptions(const QString& pathname) const
-{
-    XmlNodeRef batchRenderOptionsNode = XmlHelpers::CreateXmlNode("batchrenderoptions");
-    batchRenderOptionsNode->setAttr("version", kBatchRenderFileVersion);
-
-    // Resolution
-    XmlNodeRef resolutionNode = batchRenderOptionsNode->newChild("resolution");
-    resolutionNode->setAttr("cursel", m_ui->m_resolutionCombo->currentIndex());
-    if (m_ui->m_resolutionCombo->currentIndex() == arraysize(resolutions))
-    {
-        const QString resText = m_ui->m_resolutionCombo->currentText();
-        resolutionNode->setContent(resText.toUtf8().data());
-    }
-
-    // FPS
-    XmlNodeRef fpsNode = batchRenderOptionsNode->newChild("fps");
-    fpsNode->setAttr("cursel", m_ui->m_fpsCombo->currentIndex());
-    const QString fpsText = m_ui->m_fpsCombo->currentText();
-    if (m_ui->m_fpsCombo->currentIndex() == -1 || m_ui->m_fpsCombo->findText(fpsText) == -1)
-    {
-        fpsNode->setContent(fpsText.toUtf8().data());
-    }
-
-    // Capture options (format, buffer, prefix, create_video)
-    XmlNodeRef imageNode = batchRenderOptionsNode->newChild("image");
-    imageNode->setAttr("format", m_ui->m_imageFormatCombo->currentIndex() % arraysize(imageFormatExtensions));
-    const QString prefix = m_ui->BATCH_RENDER_FILE_PREFIX->text();
-    imageNode->setAttr("prefix", prefix.toUtf8().data());
-    bool disableDebugInfo = m_ui->m_disableDebugInfoCheckBox->isChecked();
-    imageNode->setAttr("disabledebuginfo", disableDebugInfo);
-    bool bCreateVideoOn = m_ui->m_createVideoCheckBox->isChecked();
-    imageNode->setAttr("createvideo", bCreateVideoOn);
-
-    // Custom configs
-    XmlNodeRef cvarsNode = batchRenderOptionsNode->newChild("cvars");
-    const QStringList lines = m_ui->m_cvarsEdit->toPlainText().split(QStringLiteral("\n"));
-    for (const QString& line : lines)
-    {
-        cvarsNode->newChild("cvar")->setContent(line.toUtf8().data());
-    }
-
-    // Destination
-    XmlNodeRef destinationNode = batchRenderOptionsNode->newChild("destination");
-    const QString destinationText = m_ui->m_destinationEdit->text();
-    destinationNode->setContent(destinationText.toUtf8().data());
-
-    batchRenderOptionsNode->saveToFile(pathname.toUtf8().data());
-}
-
-bool CSequenceBatchRenderDialog::GetResolutionFromCustomResText(const char* customResText, int& retCustomWidth, int& retCustomHeight) const
-{
-    // initialize to first resolution preset as default if the sscanf below doesn't scan values successfully
-    retCustomWidth = resolutions[0][0];
-    retCustomHeight = resolutions[0][1];
-
-    bool    scanSuccess   = false;
-    int     scannedWidth  = retCustomWidth;      // initialize with default fall-back values - they'll be overwritten in the case of a succesful sscanf below.
-    int     scannedHeight = retCustomHeight;
-
-    QString strFormat = QString::fromLatin1(customResFormat).replace(QRegularExpression(QStringLiteral("%\\d")), QStringLiteral("%d"));
-    scanSuccess = (azsscanf(customResText, strFormat.toStdString().c_str(), &scannedWidth, &scannedHeight) == 2);
-    if (scanSuccess)
-    {
-        retCustomWidth = scannedWidth;
-        retCustomHeight = scannedHeight;
-    }
-    return scanSuccess;
-}
-
-bool CSequenceBatchRenderDialog::LoadOutputOptions(const QString& pathname)
-{
-    XmlNodeRef batchRenderOptionsNode = XmlHelpers::LoadXmlFromFile(pathname.toStdString().c_str());
-    if (batchRenderOptionsNode == NULL)
-    {
-        return true;
-    }
-    int version = 0;
-    batchRenderOptionsNode->getAttr("version", version);
-    if (version != kBatchRenderFileVersion)
-    {
-        return false;
-    }
-
-    // Resolution
-    XmlNodeRef resolutionNode = batchRenderOptionsNode->findChild("resolution");
-    if (resolutionNode)
-    {
-        int curSel = CB_ERR;
-        resolutionNode->getAttr("cursel", curSel);
-        if (curSel == arraysize(resolutions))
-        {
-            const QString customResText = resolutionNode->getContent();
-            m_ui->m_resolutionCombo->setItemText(curSel, customResText);
-            
-            GetResolutionFromCustomResText(customResText.toStdString().c_str(), m_customResW, m_customResH);
-        }
-        m_ui->m_resolutionCombo->setCurrentIndex(curSel);
-    }
-
-    // FPS
-    XmlNodeRef fpsNode = batchRenderOptionsNode->findChild("fps");
-    if (fpsNode)
-    {
-        int curSel = -1;
-        fpsNode->getAttr("cursel", curSel);
-        if (curSel == -1)
-        {
-            m_ui->m_fpsCombo->setCurrentIndex(-1);
-            m_ui->m_fpsCombo->setCurrentText(fpsNode->getContent());
-            m_customFPS = QString::fromLatin1(fpsNode->getContent()).toInt();
-        }
-        else
-        {
-            m_ui->m_fpsCombo->setCurrentIndex(curSel);
-        }
-    }
-
-    // Capture options (format, buffer, prefix, create_video)
-    XmlNodeRef imageNode = batchRenderOptionsNode->findChild("image");
-    if (imageNode)
-    {
-        int curSel = CB_ERR;
-        imageNode->getAttr("format", curSel);
-        m_ui->m_imageFormatCombo->setCurrentIndex(curSel);
-        curSel = CB_ERR;
-        m_ui->BATCH_RENDER_FILE_PREFIX->setText(imageNode->getAttr("prefix"));
-        bool disableDebugInfo = false;
-        imageNode->getAttr("disabledebuginfo", disableDebugInfo);
-        m_ui->m_disableDebugInfoCheckBox->setChecked(disableDebugInfo);
-        if (m_bFFMPEGCommandAvailable)
-        {
-            bool bCreateVideoOn = false;
-            imageNode->getAttr("createvideo", bCreateVideoOn);
-            m_ui->m_createVideoCheckBox->setChecked(bCreateVideoOn);
-        }
-    }
-
-    // Custom configs
-    XmlNodeRef cvarsNode = batchRenderOptionsNode->findChild("cvars");
-    if (cvarsNode)
-    {
-        QString cvarsText;
-        for (int i = 0; i < cvarsNode->getChildCount(); ++i)
-        {
-            cvarsText += cvarsNode->getChild(i)->getContent();
-            if (i < cvarsNode->getChildCount() - 1)
-            {
-                cvarsText += QStringLiteral("\r\n");
-            }
-        }
-        m_ui->m_cvarsEdit->setPlainText(cvarsText);
-    }
-
-    // Destination
-    XmlNodeRef destinationNode = batchRenderOptionsNode->findChild("destination");
-    if (destinationNode)
-    {
-        m_ui->m_destinationEdit->setText(destinationNode->getContent());
-    }
-
-    return true;
-}
-
-void CSequenceBatchRenderDialog::OnStartFrameChange()
-{
-    if (m_ui->m_startFrame->value() >= m_ui->m_endFrame->value())
-    {
-        m_ui->m_endFrame->setValue(m_ui->m_startFrame->value() + 1);
-    }
-
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::OnEndFrameChange()
-{
-    if (m_ui->m_startFrame->value() >= m_ui->m_endFrame->value())
-    {
-        m_ui->m_startFrame->setValue(m_ui->m_endFrame->value() - 1);
-    }
-
-    CheckForEnableUpdateButton();
-}
-
-void CSequenceBatchRenderDialog::InitializeContext()
-{
-    m_renderContext.currentItemIndex = 0;
-    m_renderContext.spentTime = 0;
-    m_renderContext.expectedTotalTime = 0;
-    for (size_t i = 0; i < m_renderItems.size(); ++i)
-    {
-        Range rng = m_renderItems[i].frameRange;
-        m_renderContext.expectedTotalTime += rng.end - rng.start;
-    }
-    m_renderContext.captureOptions.once = false;
-
-    m_ui->BATCH_RENDER_PRESS_ESC_TO_CANCEL->setText(tr("Press ESC to cancel"));
-}
-
-void CSequenceBatchRenderDialog::CaptureItemStart()
-{
-    // Disable most of the UI in group chunks.
-    // (Leave the start/cancel button and feedback elements).
-    m_ui->BATCH_RENDER_LIST_GROUP_BOX->setEnabled(false);
-    m_ui->BATCH_RENDER_INPUT_GROUP_BOX->setEnabled(false);
-    m_ui->BATCH_RENDER_OUTPUT_GROUP_BOX->setEnabled(false);
-
-    m_renderContext.canceled = false;
-
-    CV_TrackViewRenderOutputCapturing = 1;
-
-    SRenderItem renderItem = m_renderItems[m_renderContext.currentItemIndex];
-    IAnimSequence* nextSequence = renderItem.pSequence;
-    // Initialize the next one for the batch rendering.
-    // Set the active shot.
-    m_renderContext.pActiveDirectorBU = nextSequence->GetActiveDirector();
-    nextSequence->SetActiveDirector(renderItem.pDirectorNode);
-
-    // Back up flags and range of the sequence.
-    m_renderContext.flagBU = nextSequence->GetFlags();
-    m_renderContext.rangeBU = nextSequence->GetTimeRange();
-
-    // Change flags and range of the sequence so that it automatically starts
-    // once the game mode kicks in with the specified range.
-    nextSequence->SetFlags(m_renderContext.flagBU | IAnimSequence::eSeqFlags_PlayOnReset);
-
-    m_renderContext.captureOptions.timeStep = 1.0f / renderItem.fps;
-
-    Range newRange = renderItem.frameRange;
-    newRange.start -= m_renderContext.captureOptions.timeStep;
-    renderItem.pSequence->SetTimeRange(newRange);
-
-    // Set up the custom config cvars for this item.
-    for (size_t i = 0; i < renderItem.cvars.size(); ++i)
-    {
-        GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(renderItem.cvars[i].toUtf8().data());
-    }
-
-    // Set specific capture options for this item.
-    m_renderContext.captureOptions.prefix = renderItem.prefix.toUtf8().data();
-
-    Range rng = nextSequence->GetTimeRange();
-    m_renderContext.captureOptions.duration = rng.end - rng.start;
-    QString folder = renderItem.folder;
-    QString itemText = m_ui->m_renderList->model()->index(m_renderContext.currentItemIndex, 0).data().toString();
-    itemText.replace('/', '-'); // A full sequence name can have slash characters which aren't suitable for a file name.
-    folder += "/";
-    folder += itemText;
-
-    // If this is a relative path, prepend the @assets@ folder to match where the Renderer is going
-    // to dump the frame buffer image captures.
-    if (AzFramework::StringFunc::Path::IsRelative(folder.toUtf8().data()))
-    {
-        AZStd::string absolutePath;
-        AZStd::string assetsRoot = AZ::IO::FileIOBase::GetInstance()->GetAlias("@assets@");
-        AzFramework::StringFunc::Path::Join(assetsRoot.c_str(), folder.toUtf8().data(), absolutePath);
-        folder = absolutePath.c_str();
-    }
-
-    QString finalFolder = folder;
-    int i = 2;
-    while (QFileInfo::exists(finalFolder))
-    {
-        finalFolder = folder;
-        const QString suffix = QString::fromLatin1("_v%1").arg(i);
-        finalFolder += suffix;
-        ++i;
-    }
-
-    // create a new folder before writing any files
-    QDir().mkdir(finalFolder);
-
-    m_renderContext.captureOptions.folder = finalFolder.toUtf8().data();
-
-    // Change the resolution.
-    const int renderWidth = getResWidth(renderItem.resW);
-    const int renderHeight = getResHeight(renderItem.resH);
-    ICVar* pCVarCustomResWidth = gEnv->pConsole->GetCVar("r_CustomResWidth");
-    ICVar* pCVarCustomResHeight = gEnv->pConsole->GetCVar("r_CustomResHeight");
-    if (pCVarCustomResWidth && pCVarCustomResHeight)
-    {
-        // If available, use the custom resolution cvars.
-        m_renderContext.cvarCustomResWidthBU = pCVarCustomResWidth->GetIVal();
-        m_renderContext.cvarCustomResHeightBU = pCVarCustomResHeight->GetIVal();
-        pCVarCustomResWidth->Set(renderWidth);
-        pCVarCustomResHeight->Set(renderHeight);
-    }
-    else
-    {
-        // Otherwise, try to adjust the viewport resolution accordingly.
-        if (CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView())
-        {
-            viewPane->ResizeViewport(renderWidth, renderHeight);
-        }
-    }
-
-    // turn off debug info if requested
-    ICVar* cvarDebugInfo = gEnv->pConsole->GetCVar("r_DisplayInfo");
-    if (cvarDebugInfo)
-    {
-        // cache the current value to restore during OnCaptureItemEnd()
-        m_renderContext.cvarDisplayInfoBU = cvarDebugInfo->GetIVal();
-        if (renderItem.disableDebugInfo && cvarDebugInfo->GetIVal())
-        {
-            const int DISPLAY_INFO_OFF = 0;         
-            cvarDebugInfo->Set(DISPLAY_INFO_OFF);
-        }
-    }
-
-    // create a new atom pipeline to capture the frames of the current sequence
-    m_atomOutputFrameCapture.CreatePipeline(
-        *TrackView::SceneFromGameEntityContext(), "TrackViewSequencePipeline", renderItem.resW, renderItem.resH);
-    UpdateAtomOutputFrameCaptureView(m_atomOutputFrameCapture, renderItem.resW, renderItem.resH);
-
-    GetIEditor()->GetMovieSystem()->EnableFixedStepForCapture(m_renderContext.captureOptions.timeStep);
-
-    // The capturing doesn't actually start here. It just flags the warming-up and
-    // once it's done, then the capturing really begins.
-    // The warming-up is necessary to settle down some post-fxs after the resolution change.
-    EnterCaptureState(CaptureState::WarmingUpAfterResChange);
-
-    m_renderTimer.start();
-}
-
-void CSequenceBatchRenderDialog::OnUpdateWarmingUpAfterResChange()
-{
-    UpdateSpinnerProgressMessage("Warming up");
-
-    // Spend 30 frames warming up after frame buffer resolution change
-    if (m_renderContext.framesSpentInCurrentPhase++ >= 30)
-    {
-        // We will handle the idle tick manually now because calling Game Update directly.
-        SetEnableEditorIdleProcessing(false);
-
-        GetIEditor()->SetInGameMode(true);
-
-        EnterCaptureState(CaptureState::EnteringGameMode);
-    }
-}
-
-void CSequenceBatchRenderDialog::OnUpdateEnteringGameMode()
-{
-    UpdateSpinnerProgressMessage("Entering game mode");
-
-    GetIEditor()->GetGameEngine()->Update();
-
-    // Pause the movie player on the first frame
-    if (m_renderContext.framesSpentInCurrentPhase++ == 0)
-    {
-        GetIEditor()->GetMovieSystem()->Pause();
-    }
-    // Spend 30 frames warming up after changing to game mode.
-    else if (m_renderContext.framesSpentInCurrentPhase++ > 30)
-    {
-        EnterCaptureState(CaptureState::BeginPlayingSequence);
-    }
-}
-
-void CSequenceBatchRenderDialog::OnUpdateBeginPlayingSequence()
-{
-    UpdateSpinnerProgressMessage("Begin Playing Sequence");
-
-    SRenderItem renderItem = m_renderItems[m_renderContext.currentItemIndex];
-
-    GetIEditor()->GetMovieSystem()->AddMovieListener(renderItem.pSequence, this);
-
-    GetIEditor()->GetMovieSystem()->Resume();
-
-    // Set the time range for this render, back it up 1 frame so the capture will start
-    // exactly on the first frame.
-    Range newRange = renderItem.frameRange;
-    newRange.start -= m_renderContext.captureOptions.timeStep;
-    renderItem.pSequence->SetTimeRange(newRange);
-
-    // Start the sequence playing
-    GetIEditor()->GetMovieSystem()->SetPlayingTime(renderItem.pSequence, newRange.start);
-
-    EnterCaptureState(CaptureState::Capturing);
-}
-
-void CSequenceBatchRenderDialog::OnUpdateCapturing()
-{
-    // Make sure we are still in game mode if we are capturing, so we can never
-    // get soft locked if we somehow leave game mode without this module knowing about it.
-    if (!GetIEditor()->IsInGameMode())
-    {
-        m_renderContext.endingSequence = m_renderItems[m_renderContext.currentItemIndex].pSequence;
-        m_renderContext.canceled = true;
-        EnterCaptureState(CaptureState::End);
-        return;
-    }
-
-    // Progress bar
-    IAnimSequence* pCurSeq = m_renderItems[m_renderContext.currentItemIndex].pSequence;
-    Range rng = pCurSeq->GetTimeRange();
-    float elapsedTime = GetIEditor()->GetMovieSystem()->GetPlayingTime(pCurSeq) - rng.start;
-    int percentage
-        = int(100.0f * (m_renderContext.spentTime + elapsedTime) / m_renderContext.expectedTotalTime);
-    m_ui->m_progressBar->setValue(percentage);
-
-    // Progress message
-    const QString itemText = m_ui->m_renderList->model()->index(m_renderContext.currentItemIndex, 0).data().toString();
-    const QString msg = tr("Rendering '%1'...(%2%)").arg(itemText).arg(static_cast<int>(100.0f * elapsedTime / (rng.end - rng.start)));
-    UpdateSpinnerProgressMessage(msg.toLatin1().data());
-
-    m_renderContext.framesSpentInCurrentPhase++;
-}
-
-void CSequenceBatchRenderDialog::OnUpdateEnd(IAnimSequence* sequence)
-{
-    GetIEditor()->GetMovieSystem()->DisableFixedStepForCapture();
-
-    GetIEditor()->GetMovieSystem()->RemoveMovieListener(sequence, this);
-    GetIEditor()->SetInGameMode(false);
-    GetIEditor()->GetGameEngine()->Update();        // Update is needed because SetInGameMode() queues game mode, Update() executes it.
-
-    ICVar* pCVarCustomResWidth = gEnv->pConsole->GetCVar("r_CustomResWidth");
-    ICVar* pCVarCustomResHeight = gEnv->pConsole->GetCVar("r_CustomResHeight");
-    if (pCVarCustomResWidth && pCVarCustomResHeight)
-    {
-        // Restore the custom resolution cvars.
-        pCVarCustomResWidth->Set(m_renderContext.cvarCustomResWidthBU);
-        pCVarCustomResHeight->Set(m_renderContext.cvarCustomResHeightBU);
-    }
-
-    // Restore display debug info
-    ICVar* cvarDebugInfo = gEnv->pConsole->GetCVar("r_DisplayInfo");
-    if (cvarDebugInfo)
-    {
-        cvarDebugInfo->Set(m_renderContext.cvarDisplayInfoBU);
-    }
-
-    // Restore flags, range and the active director of the sequence.
-    sequence->SetFlags(m_renderContext.flagBU);
-    sequence->SetTimeRange(m_renderContext.rangeBU);
-    sequence->SetActiveDirector(m_renderContext.pActiveDirectorBU);
-
-    const auto imageFormat = m_ui->m_imageFormatCombo->currentText();
-    
-    SRenderItem renderItem = m_renderItems[m_renderContext.currentItemIndex];
-    if (m_bFFMPEGCommandAvailable && renderItem.bCreateVideo)
-    {
-        // Create a video using the ffmpeg plug-in from captured images.
-        m_renderContext.processingFFMPEG = true;
-       
-        AZStd::string outputFolder = m_renderContext.captureOptions.folder;
-        auto future = QtConcurrent::run(
-            [renderItem, outputFolder, imageFormat]
-        {
-            AZStd::string outputFile;
-            AzFramework::StringFunc::Path::Join(outputFolder.c_str(), renderItem.prefix.toUtf8().data(), outputFile);
-
-            QString inputFile = outputFile.c_str();
-            outputFile += ".mp4";
-
-            // Use a placeholder for the input file, will expand it with replace.
-            QString inputFileDefine = "__input_file__";
-
-            QString command = QStringLiteral("plugin.ffmpeg_encode '%1' '%2' '%3' %4 %5 '-vf crop=%6:%7:0:0'")
-                .arg(inputFileDefine).arg(outputFile.c_str()).arg("mpeg4")
-                .arg(10240).arg(renderItem.fps).arg(getResWidth(renderItem.resW)).arg(getResHeight(renderItem.resH));
-
-            // Create the input file string, leave the %06d unexpanded for the mpeg tool.
-            inputFile += "%06d.";
-            inputFile += imageFormat;
-
-            // Replace the input file
-            command = command.replace(inputFileDefine, inputFile);
-
-            // Run the command
-            GetIEditor()->ExecuteCommand(command);
-        });
-
-        // Use a watcher to set a flag when the mpeg processing is complete.
-        connect(&m_renderContext.processingFFMPEGWatcher, &QFutureWatcher<void>::finished, this, [this]()
-        {
-            m_renderContext.processingFFMPEG = false;
-        });
-        m_renderContext.processingFFMPEGWatcher.setFuture(future);
-
-        EnterCaptureState(CaptureState::FFMPEGProcessing);
-    }
-    else
-    {
-        EnterCaptureState(CaptureState::Finalize);
-    }
-}
-
-void CSequenceBatchRenderDialog::OnUpdateFFMPEGProcessing()
-{
-    UpdateSpinnerProgressMessage("FFMPEG processing");
-
-    if (!m_renderContext.processingFFMPEG)
-    {
-        EnterCaptureState(CaptureState::Finalize);
-    }
-}
-
-void CSequenceBatchRenderDialog::OnUpdateFinalize()
-{
-    SetEnableEditorIdleProcessing(true);
-    m_renderTimer.stop();
-
-    // Turn disabled UI elements back on
-    m_ui->BATCH_RENDER_LIST_GROUP_BOX->setEnabled(true);
-    m_ui->BATCH_RENDER_INPUT_GROUP_BOX->setEnabled(true);
-    m_ui->BATCH_RENDER_OUTPUT_GROUP_BOX->setEnabled(true);
-
-    m_renderContext.frameNumber = 0;
-    m_renderContext.capturingFrame = false;
-
-    m_atomOutputFrameCapture.DestroyPipeline(*TrackView::SceneFromGameEntityContext());
-
-    // Check to see if there is more items to process
-    bool done = m_renderContext.currentItemIndex == m_renderItems.size() - 1;
-    if (done)
-    {
-        // Update end the batch message
-        if (m_renderContext.canceled)
-        {
-            m_ui->m_progressBar->setValue(0);
-            m_ui->m_progressStatusMsg->setText(tr("Rendering canceled"));
-        }
-        else
-        {
-            m_ui->m_progressBar->setValue(100);
-            m_ui->m_progressStatusMsg->setText(tr("Rendering finished"));
-        }
-
-        m_ui->m_pGoBtn->setText(tr("Start"));
-        m_ui->m_pGoBtn->setIcon(QPixmap(":/Trackview/clapperboard_ready.png"));
-        GetIEditor()->GetMovieSystem()->EnableBatchRenderMode(false);
-        m_renderContext.currentItemIndex = -1;
-        m_ui->BATCH_RENDER_PRESS_ESC_TO_CANCEL->setText(m_ffmpegPluginStatusMsg);
-
-        CV_TrackViewRenderOutputCapturing = 0;
-
-        EnterCaptureState(CaptureState::Idle);
-    }
-    else
-    {
-        // Update the context.
-        m_renderContext.spentTime += m_renderContext.captureOptions.duration;
-        ++m_renderContext.currentItemIndex;
-
-        // Trigger the next item.
-        CaptureItemStart();
-    }
-}
-
-void CSequenceBatchRenderDialog::OnKickIdleTimout()
-{
-    OnKickIdle();
-    if (m_renderContext.IsInRendering())
-    {
-        m_renderTimer.start();
-    }
-    else
-    {
-        // All done with our custom OnKickIdle, restore editor idle.
-        SetEnableEditorIdleProcessing(true);
-    }
-}
-
-void CSequenceBatchRenderDialog::OnKickIdle()
-{    
-    if (m_renderContext.captureState == CaptureState::WarmingUpAfterResChange)
-    {
-        OnUpdateWarmingUpAfterResChange();
-    }
-    else if (m_renderContext.captureState == CaptureState::EnteringGameMode)
-    {
-        OnUpdateEnteringGameMode();
-    }
-    else if (m_renderContext.captureState == CaptureState::BeginPlayingSequence)
-    {
-        OnUpdateBeginPlayingSequence();
-    }
-    else if (m_renderContext.captureState == CaptureState::Capturing)
-    {
-        OnUpdateCapturing();
-    }    
-    else if (m_renderContext.captureState == CaptureState::End)
-    {
-        OnUpdateEnd(m_renderContext.endingSequence);
-        m_renderContext.endingSequence = nullptr;
-    }
-    else if (m_renderContext.captureState == CaptureState::FFMPEGProcessing)
-    {
-        OnUpdateFFMPEGProcessing();
-    }
-    else if (m_renderContext.captureState == CaptureState::Finalize)
-    {
-        OnUpdateFinalize();
-    }
-    else
-    {
-        if (!m_renderContext.IsInRendering())
-        {
-            CheckForEnableUpdateButton();
-        }
-    }
-
-    if (GetIEditor()->IsInGameMode())
-    {
-        // note: the internal state may change by calling GetGameEngine()->Update() so
-        // we must not cache this value
-        const auto capturing = [this]
-        {
-            return m_renderContext.captureState == CaptureState::Capturing
-                // this lags behind by one frame since we are capturing the back buffer,
-                // so don't bother enabling the capture on the first frame.
-                && m_renderContext.framesSpentInCurrentPhase != 0;
-        };
-
-        // if we're currently trying to capture and aren't waiting for a frame
-        // capture to complete, it's possible to start the next capture
-        const auto canBeginFrameCapture = [capturing, this]
-        {
-            return capturing() && !m_renderContext.capturingFrame;
-        };
-
-        if (canBeginFrameCapture())
-        {
-            // update the time so the frame number can be calculated in StartCapture()
-            IAnimSequence* sequence = m_renderItems[m_renderContext.currentItemIndex].pSequence;
-            m_renderContext.captureOptions.time = GetIEditor()->GetMovieSystem()->GetPlayingTime(sequence);
-
-            GetIEditor()->GetMovieSystem()->StartCapture(m_renderContext.captureOptions, ++m_renderContext.frameNumber);
-            GetIEditor()->GetMovieSystem()->ControlCapture();
-        }
-
-        // if we're not capturing or we're not currently waiting for the current frame to finish
-        // being captured, it's safe to move to the next step of the main update
-        if (!capturing() || !m_renderContext.capturingFrame)
-        {
-            const auto& renderItem = m_renderItems[m_renderContext.currentItemIndex];
-            // update the view given the current camera transform and projection
-            UpdateAtomOutputFrameCaptureView(m_atomOutputFrameCapture, renderItem.resW, renderItem.resH);
-            GetIEditor()->GetGameEngine()->Update(); // step update (original frame capture)
-        }
-
-        if (canBeginFrameCapture())
-        {
-            const AZStd::string fileName = AZStd::string::format("Frame_%06d", m_renderContext.frameNumber);
-
-            AZStd::string filePath;
-            AzFramework::StringFunc::Path::Join(
-                m_renderContext.captureOptions.folder.c_str(), fileName.c_str(), filePath, /*caseInsensitive=*/true,
-                /*normalize=*/false);
-
-            // track view callback after each frame is captured
-            const auto captureFinishedCallback = [this]() {
-                m_renderContext.capturingFrame = false;
-                GetIEditor()->GetMovieSystem()->EndCapture();
-                GetIEditor()->GetMovieSystem()->ControlCapture();
-            };
-
-            const auto imageFormatExtension = m_ui->m_imageFormatCombo->currentText();
-            // readback result callback (how the image should be captured)
-            // currently only .dds and .ppm
-            const auto readbackCallback = [filePath,
-                                           imageFormatExtension](const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult) {
-                const auto imageFormatExtensionUtf8 = imageFormatExtension.toUtf8();
-                const auto imageFormatExtensionCstr = imageFormatExtensionUtf8.constData();
-
-                const AZStd::string fileName = AZStd::string::format("%s.%s", filePath.c_str(), imageFormatExtensionCstr);
-                if (AZ::StringFunc::Equal(imageFormatExtensionCstr, "dds"))
-                {
-                    if (const AZ::Render::FrameCaptureOutputResult result = AZ::Render::DdsFrameCaptureOutput(fileName, readbackResult);
-                        result.m_errorMessage.has_value())
-                    {
-                        AZ_Printf("TrackView", "Dds frame capture failed: %s", result.m_errorMessage.value().c_str());
-                    }
-                }
-                else if (AZ::StringFunc::Equal(imageFormatExtensionCstr, "ppm"))
-                {
-                    if (const AZ::Render::FrameCaptureOutputResult result = AZ::Render::PpmFrameCaptureOutput(fileName, readbackResult);
-                        result.m_errorMessage.has_value())
-                    {
-                        AZ_Printf("TrackView", "Ppm frame capture failed: %s", result.m_errorMessage.value().c_str());
-                    }
-                }
-                else
-                {
-                    AZ_Printf("TrackView", "Image format .%s not supported", imageFormatExtensionCstr);
-                }
-            };
-
-            m_renderContext.capturingFrame = m_atomOutputFrameCapture.BeginCapture(readbackCallback, captureFinishedCallback);
-        }
-    }
-    else
-    {
-        // Post events, this will cause an Update tick.
-        qApp->sendPostedEvents();
-    }
-}
-
-void CSequenceBatchRenderDialog::OnCancelRender()
-{
-    if (m_renderContext.captureState == CaptureState::Capturing)
-    {
-        // In the capturing state, abort the sequence, OnMovieEvent with an abort will fire and cause
-        // the transition to CaptureState::End.
-        GetIEditor()->GetMovieSystem()->AbortSequence(m_renderItems[m_renderContext.currentItemIndex].pSequence);
-    }
-    else if (m_renderContext.captureState == CaptureState::EnteringGameMode)
-    {
-        // In the EnteringGameMode state, the movie sequences hasn't started yet, so we can't count on an
-        // OnMovieEvent event to end the capture early. So transition into the End state manually.
-        m_renderContext.endingSequence = m_renderItems[m_renderContext.currentItemIndex].pSequence;
-        m_renderContext.canceled = true;
-        EnterCaptureState(CaptureState::End);
-    }
-}
-
-void CSequenceBatchRenderDialog::OnLoadBatch()
-{
-    QString loadPath;
-    if (CFileUtil::SelectFile("Render Batch Files (*.batch)",
-            Path::GetUserSandboxFolder(), loadPath))
-    {
-        XmlNodeRef batchRenderListNode = XmlHelpers::LoadXmlFromFile(loadPath.toStdString().c_str());
-        if (batchRenderListNode == NULL)
-        {
-            return;
-        }
-        int version = 0;
-        batchRenderListNode->getAttr("version", version);
-        if (version != kBatchRenderFileVersion)
-        {
-            QMessageBox::critical(this, tr("Cannot load"), tr("The file version is different!"));
-            return;
-        }
-
-        OnClearRenderItems();
-
-        for (int i = 0; i < batchRenderListNode->getChildCount(); ++i)
-        {
-            // Get an item.
-            SRenderItem item;
-            XmlNodeRef itemNode = batchRenderListNode->getChild(i);
-
-            // sequence
-            const QString seqName = itemNode->getAttr("sequence");
-            item.pSequence = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(seqName.toUtf8().data());
-            if (item.pSequence == NULL)
-            {
-                QMessageBox::warning(this, tr("Sequence not found"), tr("A sequence of '%1' not found! This'll be skipped.").arg(seqName));
-                continue;
-            }
-
-            // director node
-            const QString directorName = itemNode->getAttr("director");
-            for (int k = 0; k < item.pSequence->GetNodeCount(); ++k)
-            {
-                IAnimNode* pNode = item.pSequence->GetNode(k);
-                if (pNode->GetType() == AnimNodeType::Director && directorName == pNode->GetName())
-                {
-                    item.pDirectorNode = pNode;
-                    break;
-                }
-            }
-            if (item.pDirectorNode == NULL)
-            {
-                QMessageBox::warning(this, tr("Director node not found"), tr("A director node of '%1' not found in the sequence of '%2'! This'll be skipped.").arg(directorName).arg(seqName));
-                continue;
-            }
-
-            // frame range
-            itemNode->getAttr("startframe", item.frameRange.start);
-            itemNode->getAttr("endframe", item.frameRange.end);
-
-            // resolution
-            itemNode->getAttr("width", item.resW);
-            itemNode->getAttr("height", item.resH);
-
-            // fps
-            itemNode->getAttr("fps", item.fps);
-
-            // prefix
-            item.prefix = itemNode->getAttr("prefix");
-
-            // create_video
-            itemNode->getAttr("createvideo", item.bCreateVideo);
-
-            // folder
-            item.folder = itemNode->getAttr("folder");
-
-            // cvars
-            for (int k = 0; k < itemNode->getChildCount(); ++k)
-            {
-                const QString cvar = itemNode->getChild(k)->getContent();
-                item.cvars.push_back(cvar);
-            }
-
-            AddItem(item);
-        }
-    }
-}
-
-void CSequenceBatchRenderDialog::OnSaveBatch()
-{
-    QString savePath;
-    if (CFileUtil::SelectSaveFile("Render Batch Files (*.batch)", "batch",
-            Path::GetUserSandboxFolder(), savePath))
-    {
-        XmlNodeRef batchRenderListNode = XmlHelpers::CreateXmlNode("batchrenderlist");
-        batchRenderListNode->setAttr("version", kBatchRenderFileVersion);
-
-        for (size_t i = 0; i < m_renderItems.size(); ++i)
-        {
-            const SRenderItem& item = m_renderItems[i];
-            XmlNodeRef itemNode = batchRenderListNode->newChild("item");
-
-            // sequence
-            itemNode->setAttr("sequence", item.pSequence->GetName());
-
-            // director node
-            itemNode->setAttr("director", item.pDirectorNode->GetName());
-
-            // frame range
-            itemNode->setAttr("startframe", item.frameRange.start);
-            itemNode->setAttr("endframe", item.frameRange.end);
-
-            // resolution
-            itemNode->setAttr("width", item.resW);
-            itemNode->setAttr("height", item.resH);
-
-            // fps
-            itemNode->setAttr("fps", item.fps);
-
-            // prefix
-            itemNode->setAttr("prefix", item.prefix.toUtf8().data());
-
-            // create_video
-            itemNode->setAttr("createvideo", item.bCreateVideo);
-
-            // folder
-            itemNode->setAttr("folder", item.folder.toUtf8().data());
-
-            // cvars
-            for (size_t k = 0; k < item.cvars.size(); ++k)
-            {
-                itemNode->newChild("cvar")->setContent(item.cvars[k].toUtf8().data());
-            }
-        }
-
-        XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), batchRenderListNode, savePath.toStdString().c_str());
-    }
-}
-
-bool CSequenceBatchRenderDialog::SetUpNewRenderItem(SRenderItem& item)
-{
-    const QString seqName = m_ui->m_sequenceCombo->currentText();
-    const QString shotName = m_ui->m_shotCombo->currentText();
-    // folder
-    item.folder = m_ui->m_destinationEdit->text();
-    if (item.folder.isEmpty())
-    {
-        QMessageBox::critical(this, tr("Cannot add"), tr("The output folder should be specified!"));
-        return false;
-    }
-    // sequence
-    item.pSequence = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(seqName.toUtf8().data());
-    assert(item.pSequence);
-    // director
-    for (int i = 0; i < item.pSequence->GetNodeCount(); ++i)
-    {
-        IAnimNode* pNode = item.pSequence->GetNode(i);
-        if (pNode->GetType() == AnimNodeType::Director && shotName == pNode->GetName())
-        {
-            item.pDirectorNode = pNode;
-            break;
-        }
-    }
-    if (item.pDirectorNode == NULL)
-    {
-        return false;
-    }
-    // frame range
-    item.frameRange = Range(m_ui->m_startFrame->value() / m_fpsForTimeToFrameConversion,
-            m_ui->m_endFrame->value() / m_fpsForTimeToFrameConversion);
-    // fps
-    if (m_ui->m_fpsCombo->currentIndex() == -1 || m_ui->m_fpsCombo->currentText() != fpsOptions[m_ui->m_fpsCombo->currentIndex()].fpsDesc)
-    {
-        item.fps = m_customFPS;
-    }
-    else
-    {
-        item.fps = fpsOptions[m_ui->m_fpsCombo->currentIndex()].fps;
-    }
-    // prefix
-    item.prefix = m_ui->BATCH_RENDER_FILE_PREFIX->text();
-    // disable debug info
-    item.disableDebugInfo = m_ui->m_disableDebugInfoCheckBox->isChecked();
-    // create_video
-    item.bCreateVideo = m_ui->m_createVideoCheckBox->isChecked();
-    // resolution
-    int curResSel = m_ui->m_resolutionCombo->currentIndex();
-    if (curResSel < arraysize(resolutions))
-    {
-        item.resW = resolutions[curResSel][0];
-        item.resH = resolutions[curResSel][1];
-    }
-    else
-    {
-        item.resW = m_customResW;
-        item.resH = m_customResH;
-    }
-    // cvars
-    const int kCVarNameMaxSize = 256;
-    char buf[kCVarNameMaxSize];
-    buf[kCVarNameMaxSize - 1] = 0;
-    const QStringList lines = m_ui->m_cvarsEdit->toPlainText().split('\n');
-    for (const QString& line : lines)
-    {
-        if (!line.isEmpty())
-        {
-            item.cvars.push_back(line);
-        }
-    }
-
-    return true;
-}
-
-void CSequenceBatchRenderDialog::AddItem(const SRenderItem& item)
-{
-    // Add the item.
-    m_renderItems.push_back(item);
-
-    // Add it to the list box, too.
-    m_renderListModel->setStringList(m_renderListModel->stringList() << GetCaptureItemString(item));
-
-    m_ui->m_pGoBtn->setEnabled(true);
-}
-
-QString CSequenceBatchRenderDialog::GetCaptureItemString(const SRenderItem& item) const
-{
-    return QString::fromLatin1("%1_%2_%3-%4(%5x%6,%7)%8").arg(item.pSequence->GetName())
-               .arg(item.pDirectorNode->GetName())
-               .arg(int(item.frameRange.start * m_fpsForTimeToFrameConversion))
-               .arg(int(item.frameRange.end * m_fpsForTimeToFrameConversion))
-               .arg(getResWidth(item.resW)).arg(getResHeight(item.resH)).arg(item.fps)
-               .arg(item.bCreateVideo ? "[v]" : "");
-}
-
-void CSequenceBatchRenderDialog::UpdateSpinnerProgressMessage(const char* description)
-{
-    static int count = 0;
-    const char* rotatingCursor[] = { "|", "/", "-", "\\" };
-    const QString msg = tr("%1 %2").arg(description).arg(rotatingCursor[(count++) % arraysize(rotatingCursor)]);
-    m_ui->m_progressStatusMsg->setText(msg);
-    GetIEditor()->Notify(eNotify_OnIdleUpdate);
-}
-
-void CSequenceBatchRenderDialog::EnterCaptureState(CaptureState captureState)
-{
-    m_renderContext.captureState = captureState;
-    m_renderContext.framesSpentInCurrentPhase = 0;
-}
-
-void CSequenceBatchRenderDialog::SetEnableEditorIdleProcessing(bool enabled)
-{
-    if (enabled && !m_editorIdleProcessingEnabled)
-    {
-        EditorIdleProcessingBus::Broadcast(&EditorIdleProcessing::EnableIdleProcessing);
-        m_editorIdleProcessingEnabled = true;
-    }
-
-    if (!enabled && m_editorIdleProcessingEnabled)
-    {
-        EditorIdleProcessingBus::Broadcast(&EditorIdleProcessing::DisableIdleProcessing);
-        m_editorIdleProcessingEnabled = false;
-    }
-}
-
diff --git a/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.h b/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.h
deleted file mode 100644
index d2f4b9ac76..0000000000
--- a/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog for batch-rendering sequences
-
-#pragma once
-
-#include "AtomOutputFrameCapture.h"
-
-#include <AzFramework/StringFunc/StringFunc.h>
-
-#include <QDialog>
-#include <QTimer>
-#include <QFutureWatcher>
-#include <QValidator>
-
-class QStringListModel;
-
-namespace Ui
-{
-    class SequenceBatchRenderDialog;
-}
-
-class CSequenceBatchRenderDialog
-    : public QDialog
-    , public IMovieListener
-{
-public:
-    CSequenceBatchRenderDialog(float fps, QWidget* pParent = nullptr);
-    virtual ~CSequenceBatchRenderDialog();
-
-    void reject() override; // overriding so Qt doesn't cancel
-
-protected:
-    void OnInitDialog();
-
-    void OnAddRenderItem();
-    void OnRemoveRenderItem();
-    void OnClearRenderItems();
-    void OnUpdateRenderItem();
-    void OnLoadPreset();
-    void OnSavePreset();
-    void OnGo();
-    void OnDone();
-    void OnSequenceSelected();
-    void OnRenderItemSelChange();
-    void OnFPSEditChange();
-    void OnFPSChange(int itemIndex);
-    void OnImageFormatChange();
-    void OnResolutionSelected();
-    void OnStartFrameChange();
-    void OnEndFrameChange();
-    void OnLoadBatch();
-    void OnSaveBatch();
-    void OnKickIdle();
-    void OnCancelRender();
-
-    void SaveOutputOptions(const QString& pathname) const;
-    bool LoadOutputOptions(const QString& pathname);
-
-    QString m_ffmpegPluginStatusMsg;
-    bool m_bFFMPEGCommandAvailable;
-
-    float m_fpsForTimeToFrameConversion;    // FPS setting in TrackView
-    struct SRenderItem
-    {
-        IAnimSequence* pSequence;
-        IAnimNode* pDirectorNode;
-        Range frameRange;
-        int resW, resH;
-        int fps;
-        QString folder;
-        QString prefix;
-        QStringList cvars;
-        bool disableDebugInfo;
-        bool bCreateVideo;
-        SRenderItem()
-            : pSequence(NULL)
-            , pDirectorNode(NULL)
-            , disableDebugInfo(false)
-            , bCreateVideo(false) {}
-        bool operator==(const SRenderItem& item)
-        {
-            if (pSequence == item.pSequence
-                && pDirectorNode == item.pDirectorNode
-                && frameRange == item.frameRange
-                && resW == item.resW && resH == item.resH
-                && fps == item.fps
-                && folder == item.folder
-                && prefix == item.prefix
-                && cvars == item.cvars
-                && disableDebugInfo == item.disableDebugInfo
-                && bCreateVideo == item.bCreateVideo)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-    };
-    std::vector<SRenderItem> m_renderItems;
-
-    // Capture States
-    enum class CaptureState
-    {
-        Idle,
-        WarmingUpAfterResChange,
-        EnteringGameMode,
-        BeginPlayingSequence,
-        Capturing,
-        End,
-        FFMPEGProcessing,
-        Finalize
-    };
-
-    struct SRenderContext
-    {
-        int currentItemIndex;
-        float expectedTotalTime;
-        float spentTime;
-        int flagBU;
-        Range rangeBU;
-        int cvarCustomResWidthBU, cvarCustomResHeightBU;
-        int cvarDisplayInfoBU;
-        int  framesSpentInCurrentPhase;
-        IAnimNode* pActiveDirectorBU;
-        ICaptureKey captureOptions;
-        bool processingFFMPEG;
-        // Signals when an mpeg is finished being processed.
-        QFutureWatcher<void> processingFFMPEGWatcher;
-        // True if the user canceled a render.
-        bool canceled;
-        // The sequence that triggered the CaptureState::Ending.
-        IAnimSequence* endingSequence;
-        // Current capture state.
-        CaptureState captureState;
-        // Is an individual frame currently being captured.
-        bool capturingFrame;
-        // Current frame being captured
-        int frameNumber;
-
-        bool IsInRendering() const
-        { return currentItemIndex >= 0; }
-
-        SRenderContext()
-            : currentItemIndex(-1)
-            , expectedTotalTime(0)
-            , spentTime(0)
-            , flagBU(0)
-            , pActiveDirectorBU(NULL)
-            , cvarCustomResWidthBU(0)
-            , cvarCustomResHeightBU(0)
-            , cvarDisplayInfoBU(0)
-            , framesSpentInCurrentPhase(0)
-            , processingFFMPEG(false)
-            , canceled(false)
-            , endingSequence(nullptr)
-            , captureState(CaptureState::Idle)
-            , capturingFrame(false)
-            , frameNumber(0) {}
-    };
-    SRenderContext m_renderContext;
-
-    // Custom validator to make sure the prefix is a valid part of a filename.
-    class CPrefixValidator : public QValidator
-    {
-    public:
-        CPrefixValidator(QObject* parent) : QValidator(parent) {}
-
-        QValidator::State validate(QString& input, [[maybe_unused]] int& pos) const override
-        {
-            bool valid = input.isEmpty() || AzFramework::StringFunc::Path::IsValid(input.toUtf8().data());
-            return valid ? QValidator::State::Acceptable : QValidator::State::Invalid;
-        }
-    };
-
-    // Custom values from resolution/FPS combo boxes
-    int m_customResW, m_customResH;
-    int m_customFPS;
-
-    void InitializeContext();
-    virtual void OnMovieEvent(IMovieListener::EMovieEvent event, IAnimSequence* pSequence);
-
-    void CaptureItemStart();
-
-    // Capture State Updates
-    void OnUpdateWarmingUpAfterResChange();
-    void OnUpdateEnteringGameMode();
-    void OnUpdateBeginPlayingSequence();
-    void OnUpdateCapturing();
-    void OnUpdateEnd(IAnimSequence* pSequence);
-    void OnUpdateFFMPEGProcessing();
-    void OnUpdateFinalize();
-
-    bool SetUpNewRenderItem(SRenderItem& item);
-    void AddItem(const SRenderItem& item);
-    QString GetCaptureItemString(const SRenderItem& item) const;
-
-protected slots:
-    void OnKickIdleTimout();
-
-    bool GetResolutionFromCustomResText(const char* customResText, int& retCustomWidth, int& retCustomHeight) const;
-
-private:
-    void CheckForEnableUpdateButton();
-    void stashActiveViewportResolution();
-    void UpdateSpinnerProgressMessage(const char* description);
-    void EnterCaptureState(CaptureState captureState);
-    void SetEnableEditorIdleProcessing(bool enabled);
-
-    QScopedPointer<Ui::SequenceBatchRenderDialog> m_ui;
-    QStringListModel* m_renderListModel;
-    QTimer m_renderTimer;
-    bool m_editorIdleProcessingEnabled;
-    int32 CV_TrackViewRenderOutputCapturing;
-    QScopedPointer<CPrefixValidator> m_prefixValidator;
-
-    TrackView::AtomOutputFrameCapture m_atomOutputFrameCapture;
-};
diff --git a/Code/Sandbox/Editor/TrackView/SequenceKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/SequenceKeyUIControls.cpp
deleted file mode 100644
index 11023b3c06..0000000000
--- a/Code/Sandbox/Editor/TrackView/SequenceKeyUIControls.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "TrackViewDialog.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-class CSequenceKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariableEnum<QString> mv_sequence;
-    CSmartVariable<bool> mv_overrideTimes;
-    CSmartVariable<float> mv_startTime;
-    CSmartVariable<float> mv_endTime;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_sequence, "Sequence");
-        AddVariable(mv_table, mv_overrideTimes, "Override Start/End Times");
-        AddVariable(mv_table, mv_startTime, "Start Time");
-        AddVariable(mv_table, mv_endTime, "End Time");
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::Sequence;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {68030C46-1402-45d1-91B3-8EC6F29C0FED}
-        static const GUID guid =
-        {
-            0x68030c46, 0x1402, 0x45d1, { 0x91, 0xb3, 0x8e, 0xc6, 0xf2, 0x9c, 0xf, 0xed }
-        };
-        return guid;
-    }
-
-private:
-    bool m_skipOnUIChange = false;
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CSequenceKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Sequence)
-        {
-            CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-            /////////////////////////////////////////////////////////////////////////////////
-            // fill sequence comboBox with available sequences
-            mv_sequence.SetEnumList(NULL);
-
-            // Insert '<None>' empty enum
-            mv_sequence->AddEnumItem(QObject::tr("<None>"), CTrackViewDialog::GetEntityIdAsString(AZ::EntityId(AZ::EntityId::InvalidEntityId)));
-
-            const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-            for (int i = 0; i < pSequenceManager->GetCount(); ++i)
-            {
-                CTrackViewSequence* pCurrentSequence = pSequenceManager->GetSequenceByIndex(i);
-                bool bNotMe = pCurrentSequence != pSequence;
-                bool bNotParent = !bNotMe || pCurrentSequence->IsAncestorOf(pSequence) == false;
-                if (bNotMe && bNotParent)
-                {
-                    string seqName = pCurrentSequence->GetName();
-
-                    QString ownerIdString = CTrackViewDialog::GetEntityIdAsString(pCurrentSequence->GetSequenceComponentEntityId());
-                    mv_sequence->AddEnumItem(seqName.c_str(), ownerIdString);
-                }
-            }
-
-            /////////////////////////////////////////////////////////////////////////////////
-            // fill Key Properties with selected key values
-            ISequenceKey sequenceKey;
-            keyHandle.GetKey(&sequenceKey);
-            
-            QString entityIdString = CTrackViewDialog::GetEntityIdAsString((sequenceKey.sequenceEntityId));
-            mv_sequence = entityIdString;            
-           
-            mv_overrideTimes = sequenceKey.bOverrideTimes;
-            if (!sequenceKey.bOverrideTimes)
-            {
-                IAnimSequence* pSequence2 = GetIEditor()->GetSystem()->GetIMovieSystem()->FindSequence(sequenceKey.sequenceEntityId);
-
-                if (pSequence2)
-                {
-                    sequenceKey.fStartTime = pSequence2->GetTimeRange().start;
-                    sequenceKey.fEndTime = pSequence2->GetTimeRange().end;
-                }
-                else
-                {
-                    sequenceKey.fStartTime = 0.0f;
-                    sequenceKey.fEndTime = 0.0f;
-                }
-            }
-
-            // Don't trigger an OnUIChange event, since this code is the one
-            // updating the start/end ui elements, not the user setting new values.
-            m_skipOnUIChange = true;
-            mv_startTime = sequenceKey.fStartTime;
-            mv_endTime = sequenceKey.fEndTime;
-            m_skipOnUIChange = false;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CSequenceKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence || !selectedKeys.AreAllKeysOfSameType() || m_skipOnUIChange)
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Sequence)
-        {
-            ISequenceKey sequenceKey;
-            keyHandle.GetKey(&sequenceKey);
-
-            AZ::EntityId seqOwnerId;
-            if (pVar == mv_sequence.GetVar())
-            {
-                QString entityIdString = mv_sequence;
-                seqOwnerId = AZ::EntityId(static_cast<AZ::u64>(entityIdString.toULongLong()));
-
-                sequenceKey.szSelection.clear();            // clear deprecated legacy data
-                sequenceKey.sequenceEntityId = seqOwnerId;
-            }
-
-            SyncValue(mv_overrideTimes, sequenceKey.bOverrideTimes, false, pVar);
-
-            IAnimSequence* pSequence = GetIEditor()->GetSystem()->GetIMovieSystem()->FindSequence(seqOwnerId);
-
-            if (!sequenceKey.bOverrideTimes)
-            {
-                if (pSequence)
-                {
-                    sequenceKey.fStartTime = pSequence->GetTimeRange().start;
-                    sequenceKey.fEndTime = pSequence->GetTimeRange().end;
-                }
-                else
-                {
-                    sequenceKey.fStartTime = 0.0f;
-                    sequenceKey.fEndTime = 0.0f;
-                }
-            }
-            else
-            {
-                SyncValue(mv_startTime, sequenceKey.fStartTime, false, pVar);
-                SyncValue(mv_endTime, sequenceKey.fEndTime, false, pVar);
-            }
-
-            sequenceKey.fDuration = sequenceKey.fEndTime - sequenceKey.fStartTime > 0 ? sequenceKey.fEndTime - sequenceKey.fStartTime : 0.0f;
-
-            IMovieSystem* pMovieSystem = GetIEditor()->GetSystem()->GetIMovieSystem();
-
-            if (pMovieSystem != NULL)
-            {
-                pMovieSystem->SetStartEndTime(pSequence, sequenceKey.fStartTime, sequenceKey.fEndTime);
-            }
-
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                keyHandle.SetKey(&sequenceKey);
-            }
-            else
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Set Key Value");
-                keyHandle.SetKey(&sequenceKey);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CSequenceKeyUIControls, "TrackView.KeyUI.Sequence", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/SoundKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/SoundKeyUIControls.cpp
deleted file mode 100644
index a4bbb23a61..0000000000
--- a/Code/Sandbox/Editor/TrackView/SoundKeyUIControls.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"  // for CTrackViewKeyUIControls
-
-
-//////////////////////////////////////////////////////////////////////////
-class CSoundKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariableArray mv_options;
-
-    CSmartVariable<QString> mv_startTrigger;
-    CSmartVariable<QString> mv_stopTrigger;
-    CSmartVariable<float> mv_duration;
-    CSmartVariable<Vec3> mv_customColor;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_startTrigger, "StartTrigger", IVariable::DT_AUDIO_TRIGGER);
-        AddVariable(mv_table, mv_stopTrigger, "StopTrigger", IVariable::DT_AUDIO_TRIGGER);
-        AddVariable(mv_table, mv_duration, "Duration");
-        AddVariable(mv_options, "Options");
-        AddVariable(mv_options, mv_customColor, "Custom Color", IVariable::DT_COLOR);
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::Sound;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {AB2226E5-D593-49d2-B7CB-989412CAAEDE}
-        static const GUID guid =
-        {
-            0xab2226e5, 0xd593, 0x49d2, { 0xb7, 0xcb, 0x98, 0x94, 0x12, 0xca, 0xae, 0xde }
-        };
-        return guid;
-    }
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CSoundKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Sound)
-        {
-            ISoundKey soundKey;
-            keyHandle.GetKey(&soundKey);
-
-            mv_startTrigger = soundKey.sStartTrigger.c_str();
-            mv_stopTrigger = soundKey.sStopTrigger.c_str();
-            mv_duration = soundKey.fDuration;
-            mv_customColor = soundKey.customColor;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CSoundKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::Sound)
-        {
-            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();
-            }
-
-            SyncValue(mv_duration, soundKey.fDuration, false, pVar);
-            SyncValue(mv_customColor, soundKey.customColor, false, pVar);
-
-            keyHandle.SetKey(&soundKey);
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CSoundKeyUIControls, "TrackView.KeyUI.Sound", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp b/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
deleted file mode 100644
index 67cac584be..0000000000
--- a/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog for customizing track colors
-
-
-#include "EditorDefs.h"
-
-#include "TVCustomizeTrackColorsDlg.h"
-
-// Qt
-#include <QLabel>
-#include <QMessageBox>
-#include <QSettings>
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "TrackViewDialog.h"
-#include "QtUI/ColorButton.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <TrackView/ui_TVCustomizeTrackColorsDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-#define TRACKCOLOR_ENTRY_PREFIX ("TrackColor")
-#define TRACKCOLOR_FOR_OTHERS_ENTRY ("TrackColorForOthers")
-#define TRACKCOLOR_FOR_DISABLED_ENTRY ("TrackColorForDisabled")
-#define TRACKCOLOR_FOR_MUTED_ENTRY ("TrackColorForMuted")
-
-struct STrackEntry
-{
-    CAnimParamType paramType;
-    QString name;
-    QColor defaultColor;
-};
-
-namespace
-{
-    const STrackEntry g_trackEntries[] = {
-        // Color for tracks
-        { AnimParamType::FOV, "FOV", QColor(220, 220, 220) },
-        { AnimParamType::Position, "Pos", QColor(90, 150, 90) },
-        { AnimParamType::Rotation, "Rot", QColor(90, 150, 90) },
-        { AnimParamType::Scale, "Scale", QColor(90, 150, 90) },
-        { AnimParamType::Event, "Event", QColor(220, 220, 220) },
-        { AnimParamType::Visibility, "Visibility", QColor(220, 220, 220) },
-        { AnimParamType::Camera, "Camera", QColor(220, 220, 220) },
-        { AnimParamType::Sound, "Sound", QColor(220, 220, 220) },
-        { AnimParamType::Animation, "Animation", QColor(220, 220, 220) },
-        { AnimParamType::Sequence, "Sequence", QColor(220, 220, 220) },
-        { AnimParamType::Console, "Console", QColor(220, 220, 220) },
-        { AnimParamType::LookAt, "LookAt", QColor(220, 220, 220) },
-        { AnimParamType::TrackEvent, "TrackEvent", QColor(220, 220, 220) },
-        { AnimParamType::ShakeMultiplier, "ShakeMult", QColor(90, 150, 90) },
-        { AnimParamType::TransformNoise, "Noise", QColor(90, 150, 90) },
-        { AnimParamType::TimeWarp, "Timewarp", QColor(220, 220, 220) },
-        { AnimParamType::FixedTimeStep, "FixedTimeStep", QColor(220, 220, 220) },
-        { AnimParamType::DepthOfField, "DepthOfField", QColor(90, 150, 90) },
-        { AnimParamType::CommentText, "CommentText", QColor(220, 220, 220) },
-        { AnimParamType::ScreenFader, "ScreenFader", QColor(220, 220, 220) },
-        { AnimParamType::LightDiffuse, "LightDiffuseColor", QColor(90, 150, 90) },
-        { AnimParamType::LightRadius, "LightRadius", QColor(220, 220, 220) },
-        { AnimParamType::LightDiffuseMult, "LightDiffuseMult", QColor(220, 220, 220) },
-        { AnimParamType::LightHDRDynamic, "LightHDRDynamic", QColor(220, 220, 220) },
-        { AnimParamType::LightSpecularMult, "LightSpecularMult", QColor(220, 220, 220) },
-        { AnimParamType::LightSpecPercentage, "LightSpecularPercent", QColor(220, 220, 220) },
-        { AnimParamType::FocusDistance, "FocusDistance", QColor(220, 220, 220) },
-        { AnimParamType::FocusRange, "FocusRange", QColor(220, 220, 220) },
-        { AnimParamType::BlurAmount, "BlurAmount", QColor(220, 220, 220) },
-        { AnimParamType::PositionX, "PosX", QColor(220, 220, 220) },
-        { AnimParamType::PositionY, "PosY", QColor(220, 220, 220) },
-        { AnimParamType::PositionZ, "PosZ", QColor(220, 220, 220) },
-        { AnimParamType::RotationX, "RotX", QColor(220, 220, 220) },
-        { AnimParamType::RotationY, "RotY", QColor(220, 220, 220) },
-        { AnimParamType::RotationZ, "RotZ", QColor(220, 220, 220) },
-        { AnimParamType::ScaleX, "ScaleX", QColor(220, 220, 220) },
-        { AnimParamType::ScaleY, "ScaleY", QColor(220, 220, 220) },
-        { AnimParamType::ScaleZ, "ScaleZ", QColor(220, 220, 220) },
-        { AnimParamType::ShakeAmpAMult, "ShakeMultAmpA", QColor(220, 220, 220) },
-        { AnimParamType::ShakeAmpBMult, "ShakeMultAmpB", QColor(220, 220, 220) },
-        { AnimParamType::ShakeFreqAMult, "ShakeMultFreqA", QColor(220, 220, 220) },
-        { AnimParamType::ShakeFreqBMult, "ShakeMultFreqB", QColor(220, 220, 220) },
-        { AnimParamType::ColorR, "ColorR", QColor(220, 220, 220) },
-        { AnimParamType::ColorG, "ColorG", QColor(220, 220, 220) },
-        { AnimParamType::ColorB, "ColorB", QColor(220, 220, 220) },
-        { AnimParamType::MaterialOpacity, "MaterialOpacity", QColor(220, 220, 220) },
-        { AnimParamType::MaterialSmoothness, "MaterialGlossiness", QColor(220, 220, 220) },
-        { AnimParamType::MaterialEmissive, "MaterialEmission", QColor(220, 220, 220) },
-        { AnimParamType::MaterialEmissiveIntensity, "MaterialEmissionIntensity", QColor(220, 220, 220) },
-        { AnimParamType::NearZ, "NearZ", QColor(220, 220, 220) },
-
-        { AnimParamType::User, "", QColor(0, 0, 0) }, // An empty string means a separator row.
-
-        // Misc colors for special states of a track
-        { AnimParamType::User, "Others", QColor(220, 220, 220) },
-        { AnimParamType::User, "Disabled/Inactive", QColor(255, 224, 224) },
-        { AnimParamType::User, "Muted", QColor(255, 224, 224) },
-    };
-
-    const int kButtonsIdBase = 0x7fff;
-    const int kMaxRows = 20;
-    const int kColumnWidth = 300;
-    const int kRowHeight = 24;
-
-    const int kOthersEntryIndex = arraysize(g_trackEntries) - 3;
-    const int kDisabledEntryIndex = arraysize(g_trackEntries) - 2;
-    const int kMutedEntryIndex = arraysize(g_trackEntries) - 1;
-}
-
-std::map<CAnimParamType, QColor> CTVCustomizeTrackColorsDlg::s_trackColors;
-QColor CTVCustomizeTrackColorsDlg::s_colorForDisabled;
-QColor CTVCustomizeTrackColorsDlg::s_colorForMuted;
-QColor CTVCustomizeTrackColorsDlg::s_colorForOthers;
-
-CTVCustomizeTrackColorsDlg::CTVCustomizeTrackColorsDlg(QWidget* pParent)
-    : QDialog(pParent)
-    , m_aLabels(arraysize(g_trackEntries))
-    , m_colorButtons(arraysize(g_trackEntries))
-    , m_ui(new Ui::TVCustomizeTrackColorsDialog)
-{
-    OnInitDialog();
-}
-
-CTVCustomizeTrackColorsDlg::~CTVCustomizeTrackColorsDlg()
-{
-}
-
-void CTVCustomizeTrackColorsDlg::OnInitDialog()
-{
-    m_ui->setupUi(this);
-
-    connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &CTVCustomizeTrackColorsDlg::accept);
-    connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &CTVCustomizeTrackColorsDlg::reject);
-    connect(m_ui->buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked, this, &CTVCustomizeTrackColorsDlg::OnApply);
-    connect(m_ui->buttonResetAll, &QPushButton::clicked, this, &CTVCustomizeTrackColorsDlg::OnResetAll);
-    connect(m_ui->buttonExport, &QPushButton::clicked, this, &CTVCustomizeTrackColorsDlg::OnExport);
-    connect(m_ui->buttonImport, &QPushButton::clicked, this, &CTVCustomizeTrackColorsDlg::OnImport);
-
-
-    QRect labelRect(QPoint(30, 30), QPoint(150, 50));
-    QRect buttonRect(QPoint(180, 30), QPoint(280, 50));
-    // Create a label and a color button for each track.
-    int col = 0, i = 0;
-    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
-    {
-        const QString labelText = entry.name;
-
-        if(!labelText.isEmpty())
-        {
-            m_aLabels[i] = new QLabel(m_ui->frame);
-            m_aLabels[i]->setGeometry(labelRect);
-            m_aLabels[i]->setText(labelText);
-
-            m_colorButtons[i] = new ColorButton(m_ui->frame);
-            m_colorButtons[i]->setGeometry(buttonRect);
-
-            if(entry.paramType.GetType() == AnimParamType::User)
-            {
-                assert(kOthersEntryIndex <= i);
-                if (i == kOthersEntryIndex)
-                    {
-                    m_colorButtons[i]->SetColor(s_colorForOthers);
-                    }
-                else if(i == kDisabledEntryIndex)
-                    {
-                    m_colorButtons[i]->SetColor(s_colorForDisabled);
-                    }
-                else if(i == kMutedEntryIndex)
-                    {
-                    m_colorButtons[i]->SetColor(s_colorForMuted);
-                    }
-                }
-            else
-            {
-                m_colorButtons[i]->SetColor(s_trackColors[entry.paramType]);
-            }
-        }
-
-        if(i % kMaxRows == kMaxRows - 1)
-        {
-            ++col;
-            labelRect.moveTopLeft(QPoint(30+kColumnWidth*col, 30));
-            buttonRect.moveTopLeft(QPoint(180+kColumnWidth*col, 30));
-        }
-        else
-        {
-            labelRect.translate(0, kRowHeight);
-            buttonRect.translate(0, kRowHeight);
-        }
-        ++i;
-    });
-
-    // Resize this dialog to fit the contents.
-    const QSize size(60 + kColumnWidth * (col + 1), 100 + kMaxRows * kRowHeight);
-    m_ui->frame->setFixedSize(size);
-    setFixedSize(sizeHint());
-}
-
-void CTVCustomizeTrackColorsDlg::accept()
-{
-    OnApply();
-    QDialog::accept();
-}
-
-void CTVCustomizeTrackColorsDlg::OnApply()
-{
-    int i = 0;
-    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
-    {
-        if(entry.paramType.GetType() != AnimParamType::User)
-        {
-                s_trackColors[entry.paramType] = m_colorButtons[i]->Color();
-        }
-        ++i;
-    });
-
-    s_colorForOthers = m_colorButtons[kOthersEntryIndex]->Color();
-    s_colorForDisabled = m_colorButtons[kDisabledEntryIndex]->Color();
-    s_colorForMuted = m_colorButtons[kMutedEntryIndex]->Color();
-
-    CTrackViewDialog::GetCurrentInstance()->InvalidateDopeSheet();
-}
-
-void CTVCustomizeTrackColorsDlg::OnResetAll()
-{
-    int i = 0;
-    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
-    {
-        const QString labelText = entry.name;
-        if(!labelText.isEmpty())
-        {
-            m_colorButtons[i]->SetColor(entry.defaultColor);
-        }
-        ++i;
-    });
-}
-
-void CTVCustomizeTrackColorsDlg::SaveColors(const char* sectionName)
-{
-    QSettings settings;
-    for (auto g : QString(sectionName).split('\\'))
-    {
-        settings.beginGroup(g);
-    }
-    std::for_each(begin(s_trackColors), end(s_trackColors),
-    [&](const std::pair<CAnimParamType, QColor>& pair)
-    {
-        const QString trackColorEntry = QString::fromLatin1("%1%2").arg(TRACKCOLOR_ENTRY_PREFIX).arg(static_cast<int>(pair.first.GetType()));
-        settings.setValue(trackColorEntry, pair.second.rgb());
-    });
-
-    settings.setValue(TRACKCOLOR_FOR_OTHERS_ENTRY, s_colorForOthers.rgb());
-    settings.setValue(TRACKCOLOR_FOR_DISABLED_ENTRY, s_colorForDisabled.rgb());
-    settings.setValue(TRACKCOLOR_FOR_MUTED_ENTRY, s_colorForMuted.rgb());
-}
-
-void CTVCustomizeTrackColorsDlg::LoadColors(const char* sectionName)
-{
-    QSettings settings;
-    for (auto g : QString(sectionName).split('\\'))
-    {
-        settings.beginGroup(g);
-    }
-    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
-    {
-        if (entry.paramType.GetType() != AnimParamType::User)
-        {
-            s_trackColors[entry.paramType] = QColor::fromRgb(settings.value(QStringLiteral("%2%3").arg(TRACKCOLOR_ENTRY_PREFIX).arg(static_cast<int>(entry.paramType.GetType())), entry.defaultColor.rgb()).toInt());
-        }
-    });
-
-    s_colorForOthers = QColor::fromRgb(settings.value(TRACKCOLOR_FOR_OTHERS_ENTRY, g_trackEntries[kOthersEntryIndex].defaultColor.rgb()).toInt());
-    s_colorForDisabled = QColor::fromRgb(settings.value(TRACKCOLOR_FOR_DISABLED_ENTRY, g_trackEntries[kDisabledEntryIndex].defaultColor.rgb()).toInt());
-    s_colorForMuted = QColor::fromRgb(settings.value(TRACKCOLOR_FOR_MUTED_ENTRY, g_trackEntries[kMutedEntryIndex].defaultColor.rgb()).toInt());
-}
-
-void CTVCustomizeTrackColorsDlg::OnExport()
-{
-    QString savePath;
-    if (CFileUtil::SelectSaveFile("Custom Track Colors Files (*.ctc)", "ctc",
-            Path::GetUserSandboxFolder(), savePath))
-    {
-        Export(savePath);
-    }
-}
-
-void CTVCustomizeTrackColorsDlg::OnImport()
-{
-    QString loadPath;
-    if (CFileUtil::SelectFile("Custom Track Colors Files (*.ctc)",
-            Path::GetUserSandboxFolder(), loadPath))
-    {
-        if (Import(loadPath))
-        {
-            // since the user is explicitly pressing 'Import', we assume he or she wants to apply this import
-            // to see the result immediately, based on a customer feedback sample of one
-            OnApply();
-        }
-        else
-        {
-            QMessageBox::critical(this, tr("Cannot import"), tr("The file format is invalid!"));
-        }
-    }
-}
-
-void CTVCustomizeTrackColorsDlg::Export(const QString& fullPath) const
-{
-    XmlNodeRef customTrackColorsNode = XmlHelpers::CreateXmlNode("customtrackcolors");
-
-    int i = 0;
-    std::for_each(g_trackEntries, g_trackEntries + arraysize(g_trackEntries), [&](const STrackEntry& entry)
-    {
-        if(entry.paramType.GetType() != AnimParamType::User)
-        {
-            XmlNodeRef entryNode = customTrackColorsNode->newChild("entry");
-
-            // Serialization is const safe
-            CAnimParamType &paramType = const_cast<CAnimParamType&>( entry.paramType );
-            paramType.Serialize( entryNode, false );
-                entryNode->setAttr("color", m_colorButtons[i]->Color().rgb());
-        }
-        ++i;
-    });
-
-    XmlNodeRef othersNode = customTrackColorsNode->newChild("others");
-    othersNode->setAttr("color", m_colorButtons[kOthersEntryIndex]->Color().rgb());
-    XmlNodeRef disabledNode = customTrackColorsNode->newChild("disabled");
-    disabledNode->setAttr("color", m_colorButtons[kDisabledEntryIndex]->Color().rgb());
-    XmlNodeRef mutedNode = customTrackColorsNode->newChild("muted");
-    mutedNode->setAttr("color", m_colorButtons[kMutedEntryIndex]->Color().rgb());
-
-    XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), customTrackColorsNode, fullPath.toStdString().c_str());
-}
-
-bool CTVCustomizeTrackColorsDlg::Import(const QString& fullPath)
-{
-    XmlNodeRef customTrackColorsNode = XmlHelpers::LoadXmlFromFile(fullPath.toStdString().c_str());
-    if (customTrackColorsNode == NULL)
-    {
-        return false;
-    }
-
-    QColor color;
-    for (int i = 0; i < customTrackColorsNode->getChildCount(); ++i)
-    {
-        XmlNodeRef childNode = customTrackColorsNode->getChild(i);
-        if (QString(childNode->getTag()) != "entry")
-        {
-            continue;
-        }
-
-        CAnimParamType paramType;
-        paramType.Serialize(childNode, true);
-
-        // Get the entry index for this param type.
-        const STrackEntry* pEntry = std::find_if(g_trackEntries, g_trackEntries + arraysize(g_trackEntries),
-                [=](const STrackEntry& entry)
-        { 
-            return entry.paramType == paramType;
-        });
-        int entryIndex = pEntry - g_trackEntries;
-        if (entryIndex >= arraysize(g_trackEntries)) // If not found, skip this.
-        {
-            continue;
-        }
-        GetQColorFromXmlNode(color, childNode);
-        m_colorButtons[entryIndex]->SetColor(color);
-    }
-
-    XmlNodeRef othersNode = customTrackColorsNode->findChild("others");
-    if (othersNode)
-    {
-        GetQColorFromXmlNode(color, othersNode);
-        m_colorButtons[kOthersEntryIndex]->SetColor(color);
-    }
-
-    XmlNodeRef disabledNode = customTrackColorsNode->findChild("disabled");
-    if (disabledNode)
-    {
-        GetQColorFromXmlNode(color, disabledNode);
-        m_colorButtons[kDisabledEntryIndex]->SetColor(color);
-    }
-
-    XmlNodeRef mutedNode = customTrackColorsNode->findChild("muted");
-    if (mutedNode)
-    {
-        GetQColorFromXmlNode(color, mutedNode);
-        m_colorButtons[kMutedEntryIndex]->SetColor(color);
-    }
-
-    return true;
-}
-
-#include <TrackView/moc_TVCustomizeTrackColorsDlg.cpp>
diff --git a/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.h b/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.h
deleted file mode 100644
index 678a4ff244..0000000000
--- a/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : A dialog for customizing track colors
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TVCUSTOMIZETRACKCOLORSDLG_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TVCUSTOMIZETRACKCOLORSDLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class TVCustomizeTrackColorsDialog;
-}
-
-class QLabel;
-class ColorButton;
-
-class CTVCustomizeTrackColorsDlg
-    : public QDialog
-{
-    Q_OBJECT
-    friend class CTrackViewDialog;
-public:
-    CTVCustomizeTrackColorsDlg(QWidget* pParent = nullptr);
-    virtual ~CTVCustomizeTrackColorsDlg();
-
-    static QColor GetTrackColor(CAnimParamType paramType)
-    {
-        auto itr = s_trackColors.find(paramType);
-        if (itr != end(s_trackColors))
-        {
-            return itr->second;
-        }
-        else
-        {
-            return s_colorForOthers;
-        }
-    }
-    static QColor GetColorForDisabledTracks()
-    { return s_colorForDisabled; }
-    static QColor GetColorForMutedTracks()
-    { return s_colorForMuted; }
-
-private:
-
-    inline void GetQColorFromXmlNode(QColor& colorOut, const XmlNodeRef& xmlNode) const
-    {
-        QRgb rgb = -1;
-        xmlNode->getAttr("color", rgb);
-        colorOut.setRgb(rgb);
-    };
-
-    virtual void OnInitDialog();
-    void OnApply();
-    void OnResetAll();
-    void OnExport();
-    void OnImport();
-    void accept() override;
-
-    void Export(const QString& fullPath) const;
-    bool Import(const QString& fullPath);
-
-    static void SaveColors(const char* sectionName);
-    static void LoadColors(const char* sectionName);
-
-    QVector<QLabel*> m_aLabels;
-    QVector<ColorButton*> m_colorButtons;
-
-    QScopedPointer<Ui::TVCustomizeTrackColorsDialog> m_ui;
-
-    static std::map<CAnimParamType, QColor> s_trackColors;
-    static QColor s_colorForDisabled;
-    static QColor s_colorForMuted;
-    static QColor s_colorForOthers;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TVCUSTOMIZETRACKCOLORSDLG_H
diff --git a/Code/Sandbox/Editor/TrackView/TVEventsDialog.cpp b/Code/Sandbox/Editor/TrackView/TVEventsDialog.cpp
deleted file mode 100644
index 72849cedc4..0000000000
--- a/Code/Sandbox/Editor/TrackView/TVEventsDialog.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TVEventsDialog.h"
-
-// Qt
-#include <QInputDialog>
-#include <QMessageBox>
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "AnimationContext.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <TrackView/ui_TVEventsDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-// CTVEventsDialog dialog
-
-namespace
-{
-    const int kCountSubItemIndex = 1;
-    const int kTimeSubItemIndex = 2;
-}
-
-class TVEventsModel
-    : public QAbstractTableModel
-{
-public:
-    TVEventsModel(QObject* parent = nullptr)
-        : QAbstractTableModel(parent)
-    {
-    }
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        if (parent.isValid())
-        {
-            return 0;
-        }
-        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-        assert(sequence);
-        return sequence->GetTrackEventsCount();
-    }
-
-    int columnCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        return parent.isValid() ? 0 : 3;
-    }
-
-    bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override
-    {
-        if (parent.isValid())
-        {
-            return false;
-        }
-
-        bool result = true;
-
-        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-        assert(sequence);
-
-        AzToolsFramework::ScopedUndoBatch undo("Remove Track Event");
-
-        for (int r = row; r < row + count; ++r)
-        {
-            const QString eventName = index(r, 0).data().toString();
-            beginRemoveRows(QModelIndex(), r, r);
-            result &= sequence->RemoveTrackEvent(eventName.toUtf8().data());
-            endRemoveRows();
-
-            undo.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-        }
-
-        return result;
-    }
-
-    bool addRow(const QString& name)
-    {
-        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-        assert(sequence);
-        const int index = rowCount();
-        beginInsertRows(QModelIndex(), index, index);
-        bool result = false;
-
-        AzToolsFramework::ScopedUndoBatch undo("Add Track Event");
-        result = sequence->AddTrackEvent(name.toUtf8().data());
-        undo.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-        endInsertRows();
-        if (!result)
-        {
-            beginRemoveRows(QModelIndex(), index, index);
-            endRemoveRows();
-        }
-        return result;
-    }
-
-    bool moveRow(const QModelIndex& index, bool up)
-    {
-        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-        assert(sequence);
-        if (!index.isValid() || (up && index.row() == 0) || (!up && index.row() == rowCount() - 1))
-        {
-            return false;
-        }
-
-        bool result = false;
-
-        AzToolsFramework::ScopedUndoBatch undo("Move Track Event");
-        if (up)
-        {
-            beginMoveRows(QModelIndex(), index.row(), index.row(), QModelIndex(), index.row() - 1);
-            result = sequence->MoveUpTrackEvent(index.sibling(index.row(), 0).data().toString().toUtf8().data());
-        }
-        else
-        {
-            beginMoveRows(QModelIndex(), index.row() + 1, index.row() + 1, QModelIndex(), index.row());
-            result = sequence->MoveDownTrackEvent(index.sibling(index.row(), 0).data().toString().toUtf8().data());
-        }
-        undo.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-        endMoveRows();
-
-        return result;
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-        assert(sequence);
-        if (role != Qt::DisplayRole)
-        {
-            return QVariant();
-        }
-
-        float timeFirstUsed;
-        int usageCount = GetNumberOfUsageAndFirstTimeUsed(sequence->GetTrackEvent(index.row()), timeFirstUsed);
-
-        switch (index.column())
-        {
-        case 0:
-            return QString::fromLatin1(sequence->GetTrackEvent(index.row()));
-        case 1:
-            return usageCount;
-        case 2:
-            return usageCount > 0 ? QString::number(timeFirstUsed, 'f', 3) : QString();
-        default:
-            return QVariant();
-        }
-    }
-
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override
-    {
-        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-        assert(sequence);
-        if (role != Qt::DisplayRole && role != Qt::EditRole)
-        {
-            return false;
-        }
-        if (index.column() != 0 || value.toString().isEmpty())
-        {
-            return false;
-        }
-
-        bool result = false;
-
-        const QString oldName = index.data().toString();
-        const QString newName = value.toString();
-
-        AzToolsFramework::ScopedUndoBatch undo("Set Track Event Data");
-        result = sequence->RenameTrackEvent(oldName.toUtf8().data(), newName.toUtf8().data());
-        undo.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-        emit dataChanged(index, index);
-        return result;
-    }
-
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override
-    {
-        if (role != Qt::DisplayRole || orientation != Qt::Horizontal)
-        {
-            return QVariant();
-        }
-
-        switch (section)
-        {
-        case 0:
-            return tr("Event");
-        case 1:
-            return tr("# of use");
-        case 2:
-            return tr("Time of first usage");
-        default:
-            return QVariant();
-        }
-    }
-
-    int GetNumberOfUsageAndFirstTimeUsed(const char* eventName, float& timeFirstUsed) const;
-};
-
-CTVEventsDialog::CTVEventsDialog(QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_ui(new Ui::TVEventsDialog)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    OnInitDialog();
-
-    connect(m_ui->buttonAddEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonAddEvent);
-    connect(m_ui->buttonRemoveEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonRemoveEvent);
-    connect(m_ui->buttonRenameEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonRenameEvent);
-    connect(m_ui->buttonUpEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonUpEvent);
-    connect(m_ui->buttonDownEvent, &QPushButton::clicked, this, &CTVEventsDialog::OnBnClickedButtonDownEvent);
-    connect(m_ui->m_List->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CTVEventsDialog::OnListItemChanged);
-}
-
-CTVEventsDialog::~CTVEventsDialog()
-{
-}
-
-// CTVEventsDialog message handlers
-
-void CTVEventsDialog::OnBnClickedButtonAddEvent()
-{
-    const QString add = QInputDialog::getText(this, tr("Track Event Name"), QString());
-    if (!add.isEmpty() && static_cast<TVEventsModel*>(m_ui->m_List->model())->addRow(add))
-    {
-        m_lastAddedEvent = add;
-        m_ui->m_List->setCurrentIndex(m_ui->m_List->model()->index(m_ui->m_List->model()->rowCount() - 1, 0));
-    }
-    m_ui->m_List->setFocus();
-}
-
-void CTVEventsDialog::OnBnClickedButtonRemoveEvent()
-{
-    QList<QPersistentModelIndex> indexes;
-    for (auto index : m_ui->m_List->selectionModel()->selectedRows())
-    {
-        indexes.push_back(index);
-    }
-
-    for (auto index : indexes)
-    {
-        if (QMessageBox::warning(this, tr("Remove Event"), tr("This removal might cause some link breakages in Flow Graph.\nStill continue?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
-        {
-            m_ui->m_List->model()->removeRow(index.row());
-        }
-    }
-    m_ui->m_List->setFocus();
-}
-
-void CTVEventsDialog::OnBnClickedButtonRenameEvent()
-{
-    const QModelIndex index = m_ui->m_List->currentIndex();
-
-    if (index.isValid())
-    {
-        const QString newName = QInputDialog::getText(this, tr("Track Event Name"), QString());
-        if (!newName.isEmpty())
-        {
-            m_ui->m_List->model()->setData(index.sibling(index.row(), 0), newName);
-        }
-    }
-    m_ui->m_List->setFocus();
-}
-
-void CTVEventsDialog::OnBnClickedButtonUpEvent()
-{
-    static_cast<TVEventsModel*>(m_ui->m_List->model())->moveRow(m_ui->m_List->currentIndex(), true);
-    UpdateButtons();
-    m_ui->m_List->setFocus();
-}
-
-void CTVEventsDialog::OnBnClickedButtonDownEvent()
-{
-    static_cast<TVEventsModel*>(m_ui->m_List->model())->moveRow(m_ui->m_List->currentIndex(), false);
-    UpdateButtons();
-    m_ui->m_List->setFocus();
-}
-
-void CTVEventsDialog::OnInitDialog()
-{
-    m_ui->m_List->setModel(new TVEventsModel(this));
-    m_ui->m_List->header()->resizeSections(QHeaderView::ResizeToContents);
-
-    assert(GetIEditor()->GetAnimation()->GetSequence());
-
-    UpdateButtons();
-}
-
-void CTVEventsDialog::OnListItemChanged()
-{
-    UpdateButtons();
-}
-
-void CTVEventsDialog::UpdateButtons()
-{
-    bool bRemove = false, bRename = false, bUp = false, bDown = false;
-
-    int nSelected = m_ui->m_List->selectionModel()->selectedRows().count();
-    if (nSelected > 1)
-    {
-        bRemove = true;
-        bRename = false;
-    }
-    else if (nSelected > 0)
-    {
-        bRemove = bRename = true;
-
-        const QModelIndex index = m_ui->m_List->selectionModel()->selectedRows().first();
-        if (index.row() > 0)
-        {
-            bUp = true;
-        }
-        if (index.row() < m_ui->m_List->model()->rowCount() - 1)
-        {
-            bDown = true;
-        }
-    }
-
-    m_ui->buttonRemoveEvent->setEnabled(bRemove);
-    m_ui->buttonRenameEvent->setEnabled(bRename);
-    m_ui->buttonUpEvent->setEnabled(bUp);
-    m_ui->buttonDownEvent->setEnabled(bDown);
-}
-
-const QString& CTVEventsDialog::GetLastAddedEvent()
-{
-    return m_lastAddedEvent;
-}
-
-int TVEventsModel::GetNumberOfUsageAndFirstTimeUsed(const char* eventName, float& timeFirstUsed) const
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    int usageCount = 0;
-    float firstTime = std::numeric_limits<float>::max();
-
-    CTrackViewAnimNodeBundle nodeBundle = sequence->GetAnimNodesByType(AnimNodeType::Event);
-    const unsigned int numNodes = nodeBundle.GetCount();
-
-    for (unsigned int currentNode = 0; currentNode < numNodes; ++currentNode)
-    {
-        CTrackViewAnimNode* pCurrentNode = nodeBundle.GetNode(currentNode);
-
-        CTrackViewTrackBundle tracks = pCurrentNode->GetTracksByParam(AnimParamType::TrackEvent);
-        const unsigned int numTracks = tracks.GetCount();
-
-        for (unsigned int currentTrack = 0; currentTrack < numTracks; ++currentTrack)
-        {
-            CTrackViewTrack* pTrack = tracks.GetTrack(currentTrack);
-
-            for (int currentKey = 0; currentKey < pTrack->GetKeyCount(); ++currentKey)
-            {
-                CTrackViewKeyHandle keyHandle = pTrack->GetKey(currentKey);
-
-                IEventKey key;
-                keyHandle.GetKey(&key);
-
-                if (strcmp(key.event.c_str(), eventName) == 0) // If it has a key with the specified event set
-                {
-                    ++usageCount;
-                    if (key.time < firstTime)
-                    {
-                        firstTime = key.time;
-                    }
-                }
-            }
-        }
-    }
-
-    if (usageCount > 0)
-    {
-        timeFirstUsed = firstTime;
-    }
-    return usageCount;
-}
-
-#include <TrackView/moc_TVEventsDialog.cpp>
diff --git a/Code/Sandbox/Editor/TrackView/TVEventsDialog.h b/Code/Sandbox/Editor/TrackView/TVEventsDialog.h
deleted file mode 100644
index d0651994b9..0000000000
--- a/Code/Sandbox/Editor/TrackView/TVEventsDialog.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TVEVENTSDIALOG_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TVEVENTSDIALOG_H
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-#include <IMovieSystem.h>
-
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class TVEventsDialog;
-}
-
-// CTVEventsDialog dialog
-
-class CTVEventsDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CTVEventsDialog(QWidget* pParent = nullptr);   // standard constructor
-    virtual ~CTVEventsDialog();
-
-    void OnBnClickedButtonAddEvent();
-    void OnBnClickedButtonRemoveEvent();
-    void OnBnClickedButtonRenameEvent();
-    void OnBnClickedButtonUpEvent();
-    void OnBnClickedButtonDownEvent();
-    void OnListItemChanged();
-
-    const QString& GetLastAddedEvent();
-
-protected:
-    void OnInitDialog();
-
-    void UpdateButtons();
-
-private:
-    QScopedPointer<Ui::TVEventsDialog> m_ui;
-    QString m_lastAddedEvent;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TVEVENTSDIALOG_H
diff --git a/Code/Sandbox/Editor/TrackView/TVSequenceProps.cpp b/Code/Sandbox/Editor/TrackView/TVSequenceProps.cpp
deleted file mode 100644
index 0fbb5668c2..0000000000
--- a/Code/Sandbox/Editor/TrackView/TVSequenceProps.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation file
-
-
-#include "EditorDefs.h"
-
-#include "TVSequenceProps.h"
-
-// Qt
-#include <QMessageBox>
-
-// Editor
-#include "TrackViewSequence.h"
-#include "TrackViewSequenceManager.h"
-#include "AnimationContext.h"
-
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <TrackView/ui_TVSequenceProps.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-CTVSequenceProps::CTVSequenceProps(CTrackViewSequence* pSequence, float fps, QWidget* pParent)
-    : QDialog(pParent)
-    , m_FPS(fps)
-    , m_outOfRange(0)
-    , m_timeUnit(Seconds)
-    , ui(new Ui::CTVSequenceProps)
-{
-    ui->setupUi(this);
-    assert(pSequence);
-    m_pSequence = pSequence;
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &CTVSequenceProps::OnOK);
-    connect(ui->CUT_SCENE, &QCheckBox::toggled, this, &CTVSequenceProps::ToggleCutsceneOptions);
-    connect(ui->TO_SECONDS, &QRadioButton::toggled, this, &CTVSequenceProps::OnBnClickedToSeconds);
-    connect(ui->TO_FRAMES, &QRadioButton::toggled, this, &CTVSequenceProps::OnBnClickedToFrames);
-
-    OnInitDialog();
-}
-
-CTVSequenceProps::~CTVSequenceProps()
-{
-}
-
-// CTVSequenceProps message handlers
-BOOL CTVSequenceProps::OnInitDialog()
-{
-    ui->NAME->setText(m_pSequence->GetName());
-    int seqFlags = m_pSequence->GetFlags();
-
-    ui->ALWAYS_PLAY->setChecked((seqFlags & IAnimSequence::eSeqFlags_PlayOnReset));
-    ui->CUT_SCENE->setChecked((seqFlags & IAnimSequence::eSeqFlags_CutScene));
-    ui->DISABLEPLAYER->setChecked((seqFlags & IAnimSequence::eSeqFlags_NoPlayer));
-    ui->DISABLESOUNDS->setChecked((seqFlags & IAnimSequence::eSeqFlags_NoGameSounds));
-    ui->NOSEEK->setChecked((seqFlags & IAnimSequence::eSeqFlags_NoSeek));
-    ui->NOABORT->setChecked((seqFlags & IAnimSequence::eSeqFlags_NoAbort));
-    ui->EARLYMOVIEUPDATE->setChecked((seqFlags & IAnimSequence::eSeqFlags_EarlyMovieUpdate));
-
-    ToggleCutsceneOptions(ui->CUT_SCENE->isChecked());
-
-    ui->MOVE_SCALE_KEYS->setChecked(BST_UNCHECKED);
-
-    ui->START_TIME->setRange(0.0, (1e+5));
-    ui->END_TIME->setRange(0.0, (1e+5));
-
-    Range timeRange = m_pSequence->GetTimeRange();
-    float invFPS = 1.0f / m_FPS;
-
-    m_timeUnit = Seconds;
-    ui->START_TIME->setValue(timeRange.start);
-    ui->START_TIME->setSingleStep(invFPS);
-    ui->END_TIME->setValue(timeRange.end);
-    ui->END_TIME->setSingleStep(invFPS);
-
-
-    m_outOfRange = 0;
-    if (m_pSequence->GetFlags() & IAnimSequence::eSeqFlags_OutOfRangeConstant)
-    {
-        m_outOfRange = 1;
-        ui->ORT_CONSTANT->setChecked(true);
-    }
-    else if (m_pSequence->GetFlags() & IAnimSequence::eSeqFlags_OutOfRangeLoop)
-    {
-        m_outOfRange = 2;
-        ui->ORT_LOOP->setChecked(true);
-    }
-    else
-    {
-        ui->ORT_ONCE->setChecked(true);
-    }
-
-    return TRUE;  // return TRUE unless you set the focus to a control
-    // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void CTVSequenceProps::MoveScaleKeys()
-{
-    // Move/Rescale the sequence to a new time range.
-    Range timeRangeOld = m_pSequence->GetTimeRange();
-    Range timeRangeNew;
-    timeRangeNew.start = ui->START_TIME->value();
-    timeRangeNew.end = ui->END_TIME->value();
-
-    if (!(timeRangeNew == timeRangeOld))
-    {
-        m_pSequence->AdjustKeysToTimeRange(timeRangeNew);
-    }
-}
-
-void CTVSequenceProps::UpdateSequenceProps(const QString& name)
-{
-    if (ui->MOVE_SCALE_KEYS->isChecked())
-    {
-        MoveScaleKeys();
-    }
-
-    Range timeRange;
-    timeRange.start = ui->START_TIME->value();
-    timeRange.end = ui->END_TIME->value();
-
-    if (m_timeUnit == Frames)
-    {
-        float invFPS = 1.0f / m_FPS;
-        timeRange.start = ui->START_TIME->value() * invFPS;
-        timeRange.end = ui->END_TIME->value() * invFPS;
-    }
-
-    m_pSequence->SetTimeRange(timeRange);
-
-    CAnimationContext* ac = GetIEditor()->GetAnimation();
-    if (ac)
-    {
-        ac->UpdateTimeRange();
-    }
-
-    QString seqName = m_pSequence->GetName();
-    if (name != seqName)
-    {
-        // Rename sequence.
-        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-
-        sequenceManager->RenameNode(m_pSequence, name.toUtf8().data());
-    }
-
-    int seqFlags = m_pSequence->GetFlags();
-    seqFlags &= ~(IAnimSequence::eSeqFlags_OutOfRangeConstant | IAnimSequence::eSeqFlags_OutOfRangeLoop);
-
-    if (ui->ALWAYS_PLAY->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_PlayOnReset;
-    }
-    else
-    {
-        seqFlags &= ~IAnimSequence::eSeqFlags_PlayOnReset;
-    }
-
-    if (ui->CUT_SCENE->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_CutScene;
-    }
-    else
-    {
-        seqFlags &= ~IAnimSequence::eSeqFlags_CutScene;
-    }
-
-    if (ui->DISABLEPLAYER->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_NoPlayer;
-    }
-    else
-    {
-        seqFlags &= (~IAnimSequence::eSeqFlags_NoPlayer);
-    }
-
-    if (ui->ORT_CONSTANT->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_OutOfRangeConstant;
-    }
-    else if (ui->ORT_LOOP->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_OutOfRangeLoop;
-    }
-
-    if (ui->DISABLESOUNDS->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_NoGameSounds;
-    }
-    else
-    {
-        seqFlags &= (~IAnimSequence::eSeqFlags_NoGameSounds);
-    }
-
-    if (ui->NOSEEK->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_NoSeek;
-    }
-    else
-    {
-        seqFlags &= (~IAnimSequence::eSeqFlags_NoSeek);
-    }
-
-    if (ui->NOABORT->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_NoAbort;
-    }
-    else
-    {
-        seqFlags &= (~IAnimSequence::eSeqFlags_NoAbort);
-    }
-
-    if (ui->EARLYMOVIEUPDATE->isChecked())
-    {
-        seqFlags |= IAnimSequence::eSeqFlags_EarlyMovieUpdate;
-    }
-    else
-    {
-        seqFlags &= (~IAnimSequence::eSeqFlags_EarlyMovieUpdate);
-    }
-
-    if (static_cast<IAnimSequence::EAnimSequenceFlags>(seqFlags) != m_pSequence->GetFlags())
-    {
-        AzToolsFramework::ScopedUndoBatch undoBatch("Change TrackView Sequence Flags");
-        m_pSequence->SetFlags(static_cast<IAnimSequence::EAnimSequenceFlags>(seqFlags));
-        undoBatch.MarkEntityDirty(m_pSequence->GetSequenceComponentEntityId());
-    }
-}
-
-void CTVSequenceProps::OnOK()
-{
-    QString name = ui->NAME->text();
-    if (name.isEmpty())
-    {
-        QMessageBox::warning(this, "Sequence Properties", "A sequence name cannot be empty!");
-        return;
-    }
-    else if (name.contains('/'))
-    {
-        QMessageBox::warning(this, "Sequence Properties", "A sequence name cannot contain a '/' character!");
-        return;
-    }
-
-    if (m_pSequence != nullptr)
-    {
-        AzToolsFramework::ScopedUndoBatch undoBatch("Change TrackView Sequence Settings");
-        UpdateSequenceProps(name);
-        undoBatch.MarkEntityDirty(m_pSequence->GetSequenceComponentEntityId());
-    }
-
-    accept();
-}
-
-void CTVSequenceProps::ToggleCutsceneOptions(bool bActivated)
-{
-    if (bActivated == FALSE)
-    {
-        ui->NOABORT->setChecked(false);
-        ui->DISABLEPLAYER->setChecked(false);
-        ui->DISABLESOUNDS->setChecked(false);
-    }
-
-    ui->NOABORT->setEnabled(bActivated);
-    ui->DISABLEPLAYER->setEnabled(bActivated);
-    ui->DISABLESOUNDS->setEnabled(bActivated);
-}
-
-void CTVSequenceProps::OnBnClickedToFrames(bool v)
-{
-    if (!v)
-    {
-        return;
-    }
-
-    ui->START_TIME->setSingleStep(1.0f);
-    ui->END_TIME->setSingleStep(1.0f);
-
-    ui->START_TIME->setValue(std::round(ui->START_TIME->value() * static_cast<double>(m_FPS)));
-    ui->END_TIME->setValue(std::round(ui->END_TIME->value() * static_cast<double>(m_FPS)));
-
-    m_timeUnit = Frames;
-}
-
-
-void CTVSequenceProps::OnBnClickedToSeconds(bool v)
-{
-    if (!v)
-    {
-        return;
-    }
-
-    float fInvFPS = 1.0f / m_FPS;
-
-    ui->START_TIME->setSingleStep(fInvFPS);
-    ui->END_TIME->setSingleStep(fInvFPS);
-
-    ui->START_TIME->setValue(ui->START_TIME->value() * fInvFPS);
-    ui->END_TIME->setValue(ui->END_TIME->value() * fInvFPS);
-
-    m_timeUnit = Seconds;
-}
-
-#include <TrackView/moc_TVSequenceProps.cpp>
diff --git a/Code/Sandbox/Editor/TrackView/TVSequenceProps.h b/Code/Sandbox/Editor/TrackView/TVSequenceProps.h
deleted file mode 100644
index 775a3f624a..0000000000
--- a/Code/Sandbox/Editor/TrackView/TVSequenceProps.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TVSEQUENCEPROPS_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TVSEQUENCEPROPS_H
-#pragma once
-
-
-class CTrackViewSequence;
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QScopedPointer>
-#endif
-
-namespace Ui {
-    class CTVSequenceProps;
-}
-
-class CTVSequenceProps
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CTVSequenceProps(CTrackViewSequence* pSequence, float fps, QWidget* pParent = NULL);    // standard constructor
-    ~CTVSequenceProps();
-
-private:
-    enum SequenceTimeUnit
-    {
-        Seconds = 0,
-        Frames
-    };
-    CTrackViewSequence* m_pSequence;
-
-    virtual BOOL OnInitDialog();
-    virtual void OnOK();
-
-    void MoveScaleKeys();
-    float m_FPS;
-    int m_outOfRange;
-    SequenceTimeUnit m_timeUnit;
-
-    QScopedPointer<Ui::CTVSequenceProps>    ui;
-
-public slots:
-    void OnBnClickedToFrames(bool);
-    void OnBnClickedToSeconds(bool);
-
-private slots:
-    void ToggleCutsceneOptions(bool);
-    void UpdateSequenceProps(const QString& name);
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TVSEQUENCEPROPS_H
diff --git a/Code/Sandbox/Editor/TrackView/TimeRangeKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/TimeRangeKeyUIControls.cpp
deleted file mode 100644
index 5208c4f1fe..0000000000
--- a/Code/Sandbox/Editor/TrackView/TimeRangeKeyUIControls.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>  // for AnimParamType
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"              // for CTrackViewKeyUIControls// Editor
-
-
-//////////////////////////////////////////////////////////////////////////
-class CTimeRangeKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariable<float> mv_startTime;
-    CSmartVariable<float> mv_endTime;
-    CSmartVariable<float> mv_timeScale;
-    CSmartVariable<bool> mv_bLoop;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_startTime, "Start Time");
-        AddVariable(mv_table, mv_endTime, "End Time");
-        AddVariable(mv_table, mv_timeScale, "Time Scale");
-        AddVariable(mv_table, mv_bLoop, "Loop");
-        mv_timeScale->SetLimits(0.001f, 100.f);
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::TimeRanges;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {E977A6F4-CEC1-4c67-8735-28721B3F6FEF}
-        static const GUID guid = {
-            0xe977a6f4, 0xcec1, 0x4c67, { 0x87, 0x35, 0x28, 0x72, 0x1b, 0x3f, 0x6f, 0xef }
-        };
-        return guid;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CTimeRangeKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::TimeRanges)
-        {
-            ICharacterKey timeRangeKey;
-            keyHandle.GetKey(&timeRangeKey);
-
-            mv_endTime = timeRangeKey.m_endTime;
-            mv_startTime = timeRangeKey.m_startTime;
-            mv_timeScale = timeRangeKey.m_speed;
-            mv_bLoop = timeRangeKey.m_bLoop;
-
-            bAssigned = true;
-        }
-    }
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CTimeRangeKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    for (unsigned int keyIndex = 0, num = (int)selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::TimeRanges)
-        {
-            ITimeRangeKey timeRangeKey;
-            keyHandle.GetKey(&timeRangeKey);
-
-            SyncValue(mv_startTime, timeRangeKey.m_startTime, false, pVar);
-            SyncValue(mv_endTime, timeRangeKey.m_endTime, false, pVar);
-            SyncValue(mv_timeScale, timeRangeKey.m_speed, false, pVar);
-            SyncValue(mv_bLoop, timeRangeKey.m_bLoop, false, pVar);
-
-            // Clamp values
-            if (!timeRangeKey.m_bLoop)
-            {
-                timeRangeKey.m_endTime = std::min(timeRangeKey.m_duration, timeRangeKey.m_endTime);
-            }
-            timeRangeKey.m_startTime = std::min(timeRangeKey.m_duration, timeRangeKey.m_startTime);
-            timeRangeKey.m_startTime = std::min(timeRangeKey.m_endTime, timeRangeKey.m_startTime);
-
-            keyHandle.SetKey(&timeRangeKey);
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CTimeRangeKeyUIControls, "TrackView.KeyUI.TimeRange", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/TrackEventKeyUIControls.cpp b/Code/Sandbox/Editor/TrackView/TrackEventKeyUIControls.cpp
deleted file mode 100644
index 7faf1989f8..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackEventKeyUIControls.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "TrackViewKeyPropertiesDlg.h"
-#include "TVEventsDialog.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-class CTrackEventKeyUIControls
-    : public CTrackViewKeyUIControls
-{
-public:
-    CSmartVariableArray mv_table;
-    CSmartVariableEnum<QString> mv_event;
-    CSmartVariable<QString> mv_value;
-
-    virtual void OnCreateVars()
-    {
-        AddVariable(mv_table, "Key Properties");
-        AddVariable(mv_table, mv_event, "Track Event");
-        mv_event->SetFlags(mv_event->GetFlags() | IVariable::UI_UNSORTED);
-        AddVariable(mv_table, mv_value, "Value");
-    }
-    bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
-    {
-        return paramType == AnimParamType::TrackEvent;
-    }
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
-
-    virtual unsigned int GetPriority() const { return 1; }
-
-    static const GUID& GetClassID()
-    {
-        // {F7D002EB-1FEA-46fa-B857-FC2B1B990B7F}
-        static const GUID guid =
-        {
-            0xf7d002eb, 0x1fea, 0x46fa, { 0xb8, 0x57, 0xfc, 0x2b, 0x1b, 0x99, 0xb, 0x7f }
-        };
-        return guid;
-    }
-
-private:
-    void OnEventEdit();
-    void BuildEventDropDown(QString& curEvent, const QString& addedEvent = "");
-
-    QString m_lastEvent;
-
-    static const char* GetAddEventString()
-    {
-        static const char* addEventString = "Add a new event...";
-
-        return addEventString;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackEventKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    if (!selectedKeys.AreAllKeysOfSameType())
-    {
-        return false;
-    }
-
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        const CTrackViewKeyHandle& keyHandle = selectedKeys.GetKey(0);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::TrackEvent)
-        {
-            IEventKey eventKey;
-            keyHandle.GetKey(&eventKey);
-
-            // Provide builder with current event value to ensure
-            // dropdown is displayed properly and value is updated if not found
-            QString event = eventKey.event.c_str();
-            BuildEventDropDown(event);
-
-            mv_event = event;
-            mv_value = eventKey.eventValue.c_str();
-
-            bAssigned = true;
-        }
-    }
-
-    m_lastEvent = mv_event;
-
-    return bAssigned;
-}
-
-// Called when UI variable changes.
-void CTrackEventKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!pSequence || !selectedKeys.AreAllKeysOfSameType())
-    {
-        return;
-    }
-
-    if (mv_event == GetAddEventString())
-    {
-        mv_event = m_lastEvent;
-        OnEventEdit();
-        return;
-    }
-
-    if (mv_event == "___spacer___")
-    {
-        mv_event = m_lastEvent;
-        return;
-    }
-
-    for (unsigned int keyIndex = 0; keyIndex < selectedKeys.GetKeyCount(); ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-
-        CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
-        if (paramType == AnimParamType::TrackEvent)
-        {
-            IEventKey eventKey;
-            keyHandle.GetKey(&eventKey);
-
-            QByteArray event, value;
-            event = static_cast<QString>(mv_event).toUtf8();
-            value = static_cast<QString>(mv_value).toUtf8();
-
-            if (pVar == mv_event.GetVar())
-            {
-                eventKey.event = event.data();
-            }
-            if (pVar == mv_value.GetVar())
-            {
-                eventKey.eventValue = value.data();
-            }
-            eventKey.animation = "";
-            eventKey.duration = 0;
-
-            keyHandle.SetKey(&eventKey);
-        }
-    }
-
-    m_lastEvent = mv_event;
-}
-
-void CTrackEventKeyUIControls::OnEventEdit()
-{
-    // Create dialog
-    CTVEventsDialog dlg;
-    dlg.exec();
-
-    QString event = mv_event;
-    BuildEventDropDown(event, dlg.GetLastAddedEvent());
-
-    // The step below is necessary to make the event drop-down up-to-date.
-    mv_event.GetVar()->EnableNotifyWithoutValueChange(true);
-    mv_event = event;
-    mv_event.GetVar()->EnableNotifyWithoutValueChange(false);
-}
-
-void CTrackEventKeyUIControls::BuildEventDropDown(QString& curEvent, const QString& addedEvent)
-{
-    if (CAnimationContext* context = GetIEditor()->GetAnimation())
-    {
-        CTrackViewSequence* sequence = context->GetSequence();
-
-        if (sequence)
-        {
-            bool curEventExists = false;
-            bool addedEventExists = false;
-            mv_event.SetEnumList(NULL);
-            const int eventCount = sequence->GetTrackEventsCount();
-
-            // Need to check if event exists before adding all events
-            // This handles the case where the current event got deleted in the dialog but no new events were added
-            for (int i = 0; i < eventCount; ++i)
-            {
-                const char* trackEvent = sequence->GetTrackEvent(i);
-
-                if (curEvent == trackEvent)
-                {
-                    curEventExists = true;
-                }
-                if (addedEvent == trackEvent)
-                {
-                    addedEventExists = true;
-                }
-                if (curEventExists && addedEventExists)
-                {
-                    break;
-                }
-            }
-
-            if (!curEventExists)
-            {
-                if (addedEventExists)
-                {
-                    // Set added event if key not set
-                    curEvent = addedEvent;
-                }
-                else
-                {
-                    mv_event->AddEnumItem(QObject::tr("<None>"), "");
-                    curEvent = "";
-                }
-            }
-
-            // Add Events
-            for (int i = 0; i < eventCount; ++i)
-            {
-                const char* trackEvent = sequence->GetTrackEvent(i);
-
-                mv_event->AddEnumItem(trackEvent, trackEvent);
-            }
-
-            // Used as a spacer to make Add a new event... standout
-            mv_event->AddEnumItem(QObject::tr(""), "___spacer___");
-
-            // Add a new event... to open event editor when selected
-            mv_event->AddEnumItem(QObject::tr(GetAddEventString()), GetAddEventString());
-        }
-    }
-}
-
-REGISTER_QT_CLASS_DESC(CTrackEventKeyUIControls, "TrackView.KeyUI.TrackEvent", "TrackViewKeyUI");
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewAnimNode.cpp b/Code/Sandbox/Editor/TrackView/TrackViewAnimNode.cpp
deleted file mode 100644
index 52dcedea6c..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewAnimNode.cpp
+++ /dev/null
@@ -1,2627 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewAnimNode.h"
-
-// AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorDisabledCompositionBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.h>
-#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-
-// CryCommon
-#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-#include <CryCommon/Maestro/Types/AnimValueType.h>
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "AnimationContext.h"
-#include "Clipboard.h"
-#include "CommentNodeAnimator.h"
-#include "DirectorNodeAnimator.h"
-#include "RenderViewport.h"
-#include "ViewManager.h"
-#include "Include/IObjectManager.h"
-#include "Objects/GizmoManager.h"
-#include "Objects/SelectionGroup.h"
-#include "TrackView/TrackViewDialog.h"
-#include "TrackView/TrackViewSequence.h"
-#include "TrackView/TrackViewUndo.h"
-#include "TrackView/TrackViewNodeFactories.h"
-
-// static class data
-const AZ::Uuid CTrackViewAnimNode::s_nullUuid = AZ::Uuid::CreateNull();
-
-//////////////////////////////////////////////////////////////////////////
-static void CreateDefaultTracksForEntityNode(CTrackViewAnimNode* node, const AZStd::vector<AnimParamType>& tracks)
-{
-    AZ_Assert(node->GetType() == AnimNodeType::AzEntity, "Expected AzEntity node for creating default tracks");
-
-    // add a Transform Component anim node if needed, then go through and look for Position,
-    // Rotation and Scale default tracks and adds them by hard-coded Virtual Property name. This is not a scalable way to do this,
-    // but fits into the legacy Track View entity property system. This will all be re-written in a new TrackView for components in the future.
-    AZ::Entity* entity = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, node->GetAzEntityId());
-    if (entity)
-    {
-        AZ::Component* transformComponent = entity->FindComponent(AzToolsFramework::Components::TransformComponent::TYPEINFO_Uuid());
-        if (transformComponent)
-        {
-            // find a transform Component Node if it exists, otherwise create one.
-            CTrackViewAnimNode* transformComponentNode = nullptr;
-
-            for (int i = node->GetChildCount(); --i >= 0;)
-            {
-                if (node->GetChild(i)->GetNodeType() == eTVNT_AnimNode)
-                {
-                    CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(node->GetChild(i));
-                    AZ::ComponentId componentId = childAnimNode->GetComponentId();
-                    AZ::Uuid componentTypeId;
-                    AzFramework::ApplicationRequests::Bus::BroadcastResult(componentTypeId, &AzFramework::ApplicationRequests::Bus::Events::GetComponentTypeId, entity->GetId(), componentId);
-                    if (componentTypeId == AzToolsFramework::Components::TransformComponent::TYPEINFO_Uuid())
-                    {
-                        transformComponentNode = childAnimNode;
-                        break;
-                    }
-                }
-            }
-
-            if (!transformComponentNode)
-            {
-                // no existing Transform Component node found - create one.
-                transformComponentNode = node->AddComponent(transformComponent, false);
-            }
-
-            if (transformComponentNode)
-            {
-                for (size_t i = 0; i < tracks.size(); ++i)
-                {
-                    // This is not ideal - we hard-code the VirtualProperty names for "Position", "Rotation", 
-                    // and "Scale" here, which creates an implicitly name dependency, but these are unlikely to change.
-                    CAnimParamType paramType = tracks[i];
-                    CAnimParamType transformPropertyParamType;
-                    bool createTransformTrack = false;
-
-                    if (paramType.GetType() == AnimParamType::Position)
-                    {
-                        transformPropertyParamType = AZStd::string("Position");
-                        createTransformTrack = true;
-                    }
-                    else if (paramType.GetType() == AnimParamType::Rotation)
-                    {
-                        transformPropertyParamType = AZStd::string("Rotation");
-                        createTransformTrack = true;
-                    }
-                    else if (paramType.GetType() == AnimParamType::Scale)
-                    {
-                        transformPropertyParamType = AZStd::string("Scale");
-                        createTransformTrack = true;
-                    }
-
-                    if (createTransformTrack)
-                    {
-                        // this sets the type to one of AnimParamType::Position, AnimParamType::Rotation or AnimParamType::Scale
-                        // but maintains the name
-                        transformPropertyParamType = paramType.GetType();
-                        transformComponentNode->CreateTrack(transformPropertyParamType);
-                    }
-                }
-            } 
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNodeBundle::AppendAnimNode(CTrackViewAnimNode* node)
-{
-    stl::push_back_unique(m_animNodes, node);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNodeBundle::AppendAnimNodeBundle(const CTrackViewAnimNodeBundle& bundle)
-{
-    for (auto iter = bundle.m_animNodes.begin(); iter != bundle.m_animNodes.end(); ++iter)
-    {
-        AppendAnimNode(*iter);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNodeBundle::ExpandAll(bool bAlsoExpandParentNodes)
-{
-    std::set<CTrackViewNode*> nodesToExpand;
-    std::copy(m_animNodes.begin(), m_animNodes.end(), std::inserter(nodesToExpand, nodesToExpand.end()));
-
-    if (bAlsoExpandParentNodes)
-    {
-        for (auto iter = nodesToExpand.begin(); iter != nodesToExpand.end(); ++iter)
-        {
-            CTrackViewNode* node = *iter;
-
-            for (CTrackViewNode* pParent = node->GetParentNode(); pParent; pParent = pParent->GetParentNode())
-            {
-                nodesToExpand.insert(pParent);
-            }
-        }
-    }
-
-    for (auto iter = nodesToExpand.begin(); iter != nodesToExpand.end(); ++iter)
-    {
-        (*iter)->SetExpanded(true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNodeBundle::CollapseAll()
-{
-    for (auto iter = m_animNodes.begin(); iter != m_animNodes.end(); ++iter)
-    {
-        (*iter)->SetExpanded(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-const bool CTrackViewAnimNodeBundle::DoesContain(const CTrackViewNode* pTargetNode)
-{
-    return stl::find(m_animNodes, pTargetNode);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNodeBundle::Clear()
-{
-    m_animNodes.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode::CTrackViewAnimNode(IAnimSequence* pSequence, IAnimNode* animNode, CTrackViewNode* pParentNode)
-    : CTrackViewNode(pParentNode)
-    , m_animSequence(pSequence)
-    , m_animNode(animNode)
-    , m_pNodeAnimator(nullptr)
-    , m_trackGizmo(nullptr)
-{
-    if (animNode)
-    {
-        // Search for child nodes
-        const int nodeCount = pSequence->GetNodeCount();
-        for (int i = 0; i < nodeCount; ++i)
-        {
-            IAnimNode* node = pSequence->GetNode(i);
-            IAnimNode* pNodeParentNode = node->GetParent();
-
-            // If our node is the parent, then the current node is a child of it
-            if (animNode == pNodeParentNode)
-            {
-                CTrackViewAnimNodeFactory animNodeFactory;
-                CTrackViewAnimNode* pNewTVAnimNode = animNodeFactory.BuildAnimNode(pSequence, node, this);
-                m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNewTVAnimNode));
-            }
-        }
-
-        // Copy tracks from animNode
-        const int trackCount = animNode->GetTrackCount();
-        for (int i = 0; i < trackCount; ++i)
-        {
-            IAnimTrack* pTrack = animNode->GetTrackByIndex(i);
-
-            CTrackViewTrackFactory trackFactory;
-            CTrackViewTrack* pNewTVTrack = trackFactory.BuildTrack(pTrack, this, this);
-            m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNewTVTrack));
-        }
-
-        // Set owner to update entity CryMovie entity IDs and remove it again
-        SetNodeEntityId(GetNodeEntityId());
-    }
-
-    SortNodes();
-
-    switch (GetType())
-    {
-    case AnimNodeType::Comment:
-        m_pNodeAnimator.reset(new CCommentNodeAnimator(this));
-        break;
-    case AnimNodeType::Layer:
-        AZ_Assert(false, "Animated Cry Layers are unsupported");
-        return;
-    case AnimNodeType::Director:
-        m_pNodeAnimator.reset(new CDirectorNodeAnimator(this));
-        break;
-    }
-
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
-
-    if (IsBoundToAzEntity())
-    {
-        AZ::TransformNotificationBus::Handler::BusConnect(GetAzEntityId());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode::~CTrackViewAnimNode()
-{
-    if (m_trackGizmo.get())
-    {
-        GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_trackGizmo);
-        m_trackGizmo = nullptr;
-    }
-
-    UnRegisterEditorObjectListeners();
-
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
-
-    if (IsBoundToAzEntity())
-    {
-        AZ::EntityId entityId = GetAzEntityId();
-        AZ::TransformNotificationBus::Handler::BusDisconnect(entityId);
-        AZ::EntityBus::Handler::BusDisconnect(entityId);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::BindToEditorObjects()
-{
-    if (!IsActive())
-    {
-        return;
-    }
-
-    CTrackViewSequenceNotificationContext context(GetSequence());
-
-    CTrackViewAnimNode* director = GetDirector();
-    const bool bBelongsToActiveDirector = director ? director->IsActiveDirector() : true;
-
-    if (bBelongsToActiveDirector)
-    {
-        bool ownerChanged = false;
-        if (m_pNodeAnimator)
-        {
-            m_pNodeAnimator->Bind(this);
-        }
-
-        if (m_animNode)
-        {
-            m_animNode->SetNodeOwner(this);
-            ownerChanged = true;
-        }
-
-        if (const AZ::EntityId entityId = GetNodeEntityId();
-            entityId.IsValid())
-        {
-            RegisterEditorObjectListeners(entityId);
-            SetNodeEntityId(entityId);
-        }
-
-        if (ownerChanged)
-        {
-            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged);
-        }
-
-        for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-        {
-            CTrackViewNode* pChildNode = (*iter).get();
-            if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-            {
-                CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
-                pChildAnimNode->BindToEditorObjects();
-            }
-        }
-    }
-
-    UpdateTrackGizmo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::UnBindFromEditorObjects()
-{
-    CTrackViewSequenceNotificationContext context(GetSequence());
-
-    UnRegisterEditorObjectListeners();
-
-    if (m_animNode)
-    {
-        // 'Owner' is the TrackViewNode, as opposed to the EditorEntityNode (as 'owner' is used in animSequence, or the pEntity 
-        // returned from FindAnimNodeOwner() - confusing, isn't it?
-        m_animNode->SetNodeOwner(nullptr);
-    }
-
-    if (m_pNodeAnimator)
-    {
-        m_pNodeAnimator->UnBind(this);
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
-            pChildAnimNode->UnBindFromEditorObjects();
-        }
-    }
-
-    GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_trackGizmo);
-    m_trackGizmo = nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::IsBoundToEditorObjects() const
-{
-    if (m_animNode)
-    {
-        if (m_animNode->GetType() == AnimNodeType::AzEntity)
-        {
-            // check if bound to comoponent entity
-            return m_animNode->GetAzEntityId().IsValid();
-        }
-        else
-        {
-            // check if bound to legacy entity
-            return (m_animNode->GetNodeOwner() != NULL);
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SyncToConsole(SAnimContext& animContext)
-{
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
-            pChildAnimNode->SyncToConsole(animContext);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode* CTrackViewAnimNode::CreateSubNode(
-    const QString& originalName, const AnimNodeType animNodeType, const AZ::EntityId owner, AZ::Uuid componentTypeId,
-    AZ::ComponentId componentId)
-{
-    const bool isGroupNode = IsGroupNode();
-    AZ_Assert(isGroupNode, "Expected CreateSubNode to be called on a group capible node.");
-    if (!isGroupNode)
-    {
-        return nullptr;
-    }
-
-    const auto originalNameStr = originalName.toUtf8();
-
-    // Find the director or sequence.
-    CTrackViewAnimNode* director = (GetType() == AnimNodeType::Director) ? this : GetDirector();
-    director = director ? director : GetSequence();
-    AZ_Assert(director, "Expected a valid director or sequence to be found.");
-    if (!director)
-    {
-        return nullptr;
-    }
-
-    // If this is an AzEntity, make sure there is an associated entity id
-    if (animNodeType == AnimNodeType::AzEntity)
-    {
-        if (!owner.IsValid())
-        {
-            GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(
-                AZStd::string::format(
-                    "Failed to add '%s' to sequence '%s', could not find associated entity. "
-                    "Please try adding the entity associated with '%s'.",
-                    originalNameStr.constData(), director->GetName(), originalNameStr.constData()));
-
-            return nullptr;
-        }
-    }
-
-    QString name = originalName;
-
-    // Check if the node's director or sequence already contains a node with this name, unless it's a component, for which we allow duplicate names since
-    // Components are children of unique AZEntities in Track View. If a different Entity component with the same name exists, create a new unique name;
-    if (animNodeType != AnimNodeType::Component)
-    {
-        CTrackViewAnimNode* director2 = (GetType() == AnimNodeType::Director) ? this : GetDirector();
-        director2 = director2 ? director2 : GetSequence();
-
-        AZ_Assert(director2, "Expected a valid director or sequence to be found.");
-        if (!director2)
-        {
-            return nullptr;
-        }
-
-        bool alreadyExists = false;
-
-        // If this is a valid AzEntity, we may generate a unique name if a dupe name is found
-        // from a different entity.
-        if (owner.IsValid())
-        {
-            // Check for a duplicates
-            CTrackViewAnimNodeBundle azEntityNodesFound = director2->GetAnimNodesByType(AnimNodeType::AzEntity);
-            for (int x = 0; x < azEntityNodesFound.GetCount(); x++)
-            {
-                if (azEntityNodesFound.GetNode(x)->GetAzEntityId() == owner)
-                {
-                    alreadyExists = true;
-                    break;
-                }
-            }
-        }
-        else
-        {
-            // Search by name for other non AzEntity 
-            alreadyExists = director2->GetAnimNodesByName(name.toUtf8().data()).GetCount() > 0;
-        }
-
-        // Show an error if this node is a duplicate
-        if (alreadyExists)
-        {
-            GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(
-                AZStd::string::format("'%s' already exists in sequence '%s', skipping...",
-                    originalNameStr.constData(), director2->GetName()));
-
-            return nullptr;
-        }
-
-        // Ensure a unique name, disallowed duplicates are already resolved by here.
-        name = GetAvailableNodeNameStartingWith(name);
-    }
-
-    const auto nameStr = name.toUtf8();
-
-    // Create CryMovie and TrackView node
-    IAnimNode* newAnimNode = m_animSequence->CreateNode(animNodeType);
-    if (!newAnimNode)
-    {
-        GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(
-            AZStd::string::format("Failed to add '%s' to sequence '%s'.", nameStr.constData(), director->GetName()));
-        return nullptr;
-    }
-
-    newAnimNode->SetName(nameStr.constData());
-    newAnimNode->CreateDefaultTracks();
-    newAnimNode->SetParent(m_animNode.get());
-    newAnimNode->SetComponent(componentId, componentTypeId);
-
-    CTrackViewAnimNodeFactory animNodeFactory;
-    CTrackViewAnimNode* newNode = animNodeFactory.BuildAnimNode(m_animSequence, newAnimNode, this);
-
-    // Make sure that camera and entity nodes get created with an owner
-    AZ_Assert((animNodeType != AnimNodeType::Camera && animNodeType != AnimNodeType::Entity), "Entity node should have valid owner.");
-
-    newNode->SetNodeEntityId(owner);
-    newAnimNode->SetNodeOwner(newNode);
-
-    newNode->BindToEditorObjects();
-
-    AddNode(newNode);
-
-    // Add node to sequence, let AZ Undo take care of undo/redo
-    m_animSequence->AddNode(newNode->m_animNode.get());
-
-    return newNode;
-}
-
-// Helper function to remove a child node
-void CTrackViewAnimNode::RemoveChildNode(CTrackViewAnimNode* child)
-{
-    assert(child);
-    auto parent = static_cast<CTrackViewAnimNode*>(child->m_pParentNode);
-    assert(parent);
-
-    child->UnBindFromEditorObjects();
-
-    for (auto iter = parent->m_childNodes.begin(); iter != parent->m_childNodes.end(); ++iter)
-    {
-        std::unique_ptr<CTrackViewNode>& currentNode = *iter;
-
-        if (currentNode.get() == child)
-        {
-            parent->m_childNodes.erase(iter);
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::RemoveSubNode(CTrackViewAnimNode* pSubNode)
-{
-    assert(CUndo::IsRecording());
-
-    const bool bIsGroupNode = IsGroupNode();
-    assert(bIsGroupNode);
-    if (!bIsGroupNode)
-    {
-        return;
-    }
-
-    // remove anim node children
-    for (int i = pSubNode->GetChildCount(); --i >= 0;)
-    {
-        CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(pSubNode->GetChild(i));
-        if (childAnimNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            RemoveSubNode(childAnimNode);
-        }
-    }
-
-    // Remove node from sequence entity, let AZ Undo take care of undo/redo
-    m_animSequence->RemoveNode(pSubNode->m_animNode.get(), /*removeChildRelationships=*/ false);
-    pSubNode->GetSequence()->OnNodeChanged(pSubNode, ITrackViewSequenceListener::eNodeChangeType_Removed);
-    RemoveChildNode(pSubNode);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrack* CTrackViewAnimNode::CreateTrack(const CAnimParamType& paramType)
-{
-    assert(CUndo::IsRecording());
-
-    if (GetTrackForParameter(paramType) && !(GetParamFlags(paramType) & IAnimNode::eSupportedParamFlags_MultipleTracks))
-    {
-        return nullptr;
-    }
-
-    // Create CryMovie track
-    IAnimTrack* pNewAnimTrack = m_animNode->CreateTrack(paramType);
-    if (!pNewAnimTrack)
-    {
-        return nullptr;
-    }
-
-    // Create Track View Track
-    CTrackViewTrackFactory trackFactory;
-    CTrackViewTrack* pNewTrack = trackFactory.BuildTrack(pNewAnimTrack, this, this);
-
-    AddNode(pNewTrack);
-
-    MarkAsModified();
-
-    const AnimParamType animParamType = paramType.GetType();
-    SetPosRotScaleTracksDefaultValues(
-        animParamType == AnimParamType::Position,
-        animParamType == AnimParamType::Rotation,
-        animParamType == AnimParamType::Scale
-    );
-
-    return pNewTrack;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::RemoveTrack(CTrackViewTrack* track)
-{
-    assert(CUndo::IsRecording());
-    assert(!track->IsSubTrack());
-
-    if (!track->IsSubTrack())
-    {
-        CTrackViewSequence* sequence = track->GetSequence();
-        if (nullptr != sequence)
-        {
-            AzToolsFramework::ScopedUndoBatch undoBatch("Remove Track");
-            CTrackViewAnimNode* parentNode = track->GetAnimNode();
-            std::unique_ptr<CTrackViewNode> foundTrack;
-
-            if (nullptr != parentNode)
-            {
-                for (auto iter = parentNode->m_childNodes.begin(); iter != parentNode->m_childNodes.end(); ++iter)
-                {
-                    std::unique_ptr<CTrackViewNode>& currentNode = *iter;
-                    if (currentNode.get() == track)
-                    {
-                        // Hang onto a reference until after OnNodeChanged is called.
-                        currentNode.swap(foundTrack);
-
-                        // Remove from parent node and sequence
-                        parentNode->m_childNodes.erase(iter);
-                        parentNode->m_animNode->RemoveTrack(track->GetAnimTrack());
-                        break;
-                    }
-                }
-
-                m_pParentNode->GetSequence()->OnNodeChanged(track, ITrackViewSequenceListener::eNodeChangeType_Removed);
-
-                // Release the track now that OnNodeChanged is complete.
-                if (nullptr != foundTrack.get())
-                {
-                    foundTrack.release();
-                }
-
-            }
-            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());            
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::SnapTimeToPrevKey(float& time) const
-{
-    const float startTime = time;
-    float closestTrackTime = std::numeric_limits<float>::min();
-    bool bFoundPrevKey = false;
-
-    for (size_t i = 0; i < m_childNodes.size(); ++i)
-    {
-        const CTrackViewNode* node = m_childNodes[i].get();
-
-        float closestNodeTime = startTime;
-        if (node->SnapTimeToPrevKey(closestNodeTime))
-        {
-            closestTrackTime = std::max(closestNodeTime, closestTrackTime);
-            bFoundPrevKey = true;
-        }
-    }
-
-    if (bFoundPrevKey)
-    {
-        time = closestTrackTime;
-    }
-
-    return bFoundPrevKey;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::SnapTimeToNextKey(float& time) const
-{
-    const float startTime = time;
-    float closestTrackTime = std::numeric_limits<float>::max();
-    bool bFoundNextKey = false;
-
-    for (size_t i = 0; i < m_childNodes.size(); ++i)
-    {
-        const CTrackViewNode* node = m_childNodes[i].get();
-
-        float closestNodeTime = startTime;
-        if (node->SnapTimeToNextKey(closestNodeTime))
-        {
-            closestTrackTime = std::min(closestNodeTime, closestTrackTime);
-            bFoundNextKey = true;
-        }
-    }
-
-    if (bFoundNextKey)
-    {
-        time = closestTrackTime;
-    }
-
-    return bFoundNextKey;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetExpanded(bool expanded)
-{
-    if (GetExpanded() != expanded)
-    {
-        CTrackViewSequence* sequence = GetSequence();
-        AZ_Assert(nullptr != sequence, "Every node should have a sequence.");
-        if (nullptr != sequence)
-        {
-            AZ_Assert(m_animNode, "Expected m_animNode to be valid.");
-            if (m_animNode)
-            {
-                m_animNode->SetExpanded(expanded);
-            }
-
-            if (expanded)
-            {
-                sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Expanded);
-            }
-            else
-            {
-                sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Collapsed);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::GetExpanded() const
-{
-    bool result = true;
-
-    AZ_Assert(m_animNode, "Expected m_animNode to be valid.");
-    if (m_animNode)
-    {
-        result = m_animNode->GetExpanded();
-    }
-
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyBundle CTrackViewAnimNode::GetSelectedKeys()
-{
-    CTrackViewKeyBundle bundle;
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        bundle.AppendKeyBundle((*iter)->GetSelectedKeys());
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyBundle CTrackViewAnimNode::GetAllKeys()
-{
-    CTrackViewKeyBundle bundle;
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        bundle.AppendKeyBundle((*iter)->GetAllKeys());
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyBundle CTrackViewAnimNode::GetKeysInTimeRange(const float t0, const float t1)
-{
-    CTrackViewKeyBundle bundle;
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        bundle.AppendKeyBundle((*iter)->GetKeysInTimeRange(t0, t1));
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrackBundle CTrackViewAnimNode::GetAllTracks()
-{
-    return GetTracks(false, CAnimParamType());
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrackBundle CTrackViewAnimNode::GetSelectedTracks()
-{
-    return GetTracks(true, CAnimParamType());
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrackBundle CTrackViewAnimNode::GetTracksByParam(const CAnimParamType& paramType) const
-{
-    return GetTracks(false, paramType);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrackBundle CTrackViewAnimNode::GetTracks(const bool bOnlySelected, const CAnimParamType& paramType) const
-{
-    CTrackViewTrackBundle bundle;
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* node = (*iter).get();
-
-        if (node->GetNodeType() == eTVNT_Track)
-        {
-            CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(node);
-
-            if (paramType != AnimParamType::Invalid && pTrack->GetParameterType() != paramType)
-            {
-                continue;
-            }
-
-            if (!bOnlySelected || pTrack->IsSelected())
-            {
-                bundle.AppendTrack(pTrack);
-            }
-
-            const unsigned int subTrackCount = pTrack->GetChildCount();
-            for (unsigned int subTrackIndex = 0; subTrackIndex < subTrackCount; ++subTrackIndex)
-            {
-                CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(subTrackIndex));
-                if (!bOnlySelected || pSubTrack->IsSelected())
-                {
-                    bundle.AppendTrack(pSubTrack);
-                }
-            }
-        }
-        else if (node->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* animNode = static_cast<CTrackViewAnimNode*>(node);
-            bundle.AppendTrackBundle(animNode->GetTracks(bOnlySelected, paramType));
-        }
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-AnimNodeType CTrackViewAnimNode::GetType() const
-{
-    return m_animNode ? m_animNode->GetType() : AnimNodeType::Invalid;
-}
-
-//////////////////////////////////////////////////////////////////////////
-EAnimNodeFlags CTrackViewAnimNode::GetFlags() const
-{
-    return m_animNode ? (EAnimNodeFlags)m_animNode->GetFlags() : (EAnimNodeFlags)0;
-}
-
-bool CTrackViewAnimNode::AreFlagsSetOnNodeOrAnyParent(EAnimNodeFlags flagsToCheck) const
-{
-    return m_animNode ? m_animNode->AreFlagsSetOnNodeOrAnyParent(flagsToCheck) : false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetAsActiveDirector()
-{
-    if (GetType() == AnimNodeType::Director)
-    {
-        m_animSequence->SetActiveDirector(m_animNode.get());
-
-        GetSequence()->UnBindFromEditorObjects();
-        GetSequence()->BindToEditorObjects();
-
-        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_SetAsActiveDirector);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::IsActiveDirector() const
-{
-    return m_animNode == m_animSequence->GetActiveDirector();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::IsParamValid(const CAnimParamType& param) const
-{
-    return m_animNode ? m_animNode->IsParamValid(param) : false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrack* CTrackViewAnimNode::GetTrackForParameter(const CAnimParamType& paramType, uint32 index) const
-{
-    uint32 currentIndex = 0;
-
-    if (GetType() == AnimNodeType::AzEntity)
-    {
-        // For AzEntity, search for track on all child components - returns first track match found (note components searched in reverse)
-        for (int i = GetChildCount(); --i >= 0;)
-        {
-            if (GetChild(i)->GetNodeType() == eTVNT_AnimNode)
-            {
-                CTrackViewAnimNode* componentNode = static_cast<CTrackViewAnimNode*>(GetChild(i));
-                if (componentNode->GetType() == AnimNodeType::Component)
-                {
-                    if (CTrackViewTrack* track = componentNode->GetTrackForParameter(paramType, index))
-                    {
-                        return track;
-                    }
-                }
-            }
-        }
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* node = (*iter).get();
-
-        if (node->GetNodeType() == eTVNT_Track)
-        {
-            CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(node);
-
-            if (pTrack->GetParameterType() == paramType)
-            {
-                if (currentIndex == index)
-                {
-                    return pTrack;
-                }
-                else
-                {
-                    ++currentIndex;
-                }
-            }
-
-            if (pTrack->IsCompoundTrack())
-            {
-                unsigned int numChildTracks = pTrack->GetChildCount();
-                for (unsigned int i = 0; i < numChildTracks; ++i)
-                {
-                    CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(i));
-                    if (pChildTrack->GetParameterType() == paramType)
-                    {
-                        if (currentIndex == index)
-                        {
-                            return pChildTrack;
-                        }
-                        else
-                        {
-                            ++currentIndex;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::Render(const SAnimContext& ac)
-{
-    if (m_pNodeAnimator && IsActive())
-    {
-        m_pNodeAnimator->Render(this, ac);
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-            pChildAnimNode->Render(ac);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::Animate(const SAnimContext& animContext)
-{
-    if (m_pNodeAnimator && IsActive())
-    {
-        m_pNodeAnimator->Animate(this, animContext);
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-            pChildAnimNode->Animate(animContext);
-        }
-    }
-
-    UpdateTrackGizmo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::SetName(const char* pName)
-{
-    // Check if the node's director already contains a node with this name
-    CTrackViewAnimNode* director = GetDirector();
-    director = director ? director : GetSequence();
-
-    CTrackViewAnimNodeBundle nodes = director->GetAnimNodesByName(pName);
-    const uint numNodes = nodes.GetCount();
-    for (uint i = 0; i < numNodes; ++i)
-    {
-        if (nodes.GetNode(i) != this)
-        {
-            return false;
-        }
-    }
-
-    string oldName = GetName();
-    m_animNode->SetName(pName);
-
-    CTrackViewSequence* sequence = GetSequence();
-    AZ_Assert(sequence, "Nodes should never have a null sequence.");
-
-    sequence->OnNodeRenamed(this, oldName);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::CanBeRenamed() const
-{
-    return (GetFlags() & eAnimNodeFlags_CanChangeName) != 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetNodeEntityId(const AZ::EntityId entityId)
-{
-    bool entityPointerChanged = (entityId != m_nodeEntityId);
-
-    m_nodeEntityId = entityId;
-
-    if (entityId.IsValid())
-    {
-        if (m_animNode->GetType() == AnimNodeType::AzEntity)
-        {
-            // We're connecting to a new AZ::Entity
-            AZ::EntityId sequenceComponentEntityId(m_animSequence->GetSequenceEntityId());
-
-            // Notify the SequenceComponent that we're binding an entity to the sequence
-            Maestro::EditorSequenceComponentRequestBus::Event(
-                sequenceComponentEntityId, &Maestro::EditorSequenceComponentRequestBus::Events::AddEntityToAnimate, entityId);
-
-            if (entityId != m_animNode->GetAzEntityId())
-            {
-                if (m_animNode->GetAzEntityId().IsValid())
-                {
-                    // disconnect from bus with previous entity ID before we reset it
-                    AZ::EntityBus::Handler::BusDisconnect(m_animNode->GetAzEntityId());
-                    AZ::TransformNotificationBus::Handler::BusDisconnect(m_animNode->GetAzEntityId());
-                }
-
-                m_animNode->SetAzEntityId(entityId);
-            }
-
-            // connect to EntityBus for OnEntityActivated() notifications to sync components on the entity
-            if (!AZ::EntityBus::Handler::BusIsConnectedId(m_animNode->GetAzEntityId()))
-            {
-                AZ::EntityBus::Handler::BusConnect(m_animNode->GetAzEntityId());
-            }
-
-            if (!AZ::TransformNotificationBus::Handler::BusIsConnectedId(m_animNode->GetAzEntityId()))
-            {
-                AZ::TransformNotificationBus::Handler::BusConnect(m_animNode->GetAzEntityId());
-            }
-        }
-
-        if (entityPointerChanged)
-        {
-            SetPosRotScaleTracksDefaultValues();
-        }
-
-        bool selected = AzToolsFramework::IsSelected(entityId);
-
-        OnSelectionChanged(selected);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZ::EntityId CTrackViewAnimNode::GetNodeEntityId(const bool bSearch)
-{
-    if (m_animNode)
-    {
-        if (m_nodeEntityId.IsValid())
-        {
-            return m_nodeEntityId;
-        }
-        else if (bSearch)
-        {
-            return GetAzEntityId();
-        }
-    }
-
-    return AZ::EntityId();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNodeBundle CTrackViewAnimNode::GetAllAnimNodes()
-{
-    CTrackViewAnimNodeBundle bundle;
-
-    if (GetNodeType() == eTVNT_AnimNode)
-    {
-        bundle.AppendAnimNode(this);
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-            bundle.AppendAnimNodeBundle(pChildAnimNode->GetAllAnimNodes());
-        }
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNodeBundle CTrackViewAnimNode::GetSelectedAnimNodes()
-{
-    CTrackViewAnimNodeBundle bundle;
-
-    if ((GetNodeType() == eTVNT_AnimNode || GetNodeType() == eTVNT_Sequence) && IsSelected())
-    {
-        bundle.AppendAnimNode(this);
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-            bundle.AppendAnimNodeBundle(pChildAnimNode->GetSelectedAnimNodes());
-        }
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNodeBundle CTrackViewAnimNode::GetAllOwnedNodes(const AZ::EntityId entityId)
-{
-    CTrackViewAnimNodeBundle bundle;
-
-    if (GetNodeType() == eTVNT_AnimNode && GetAzEntityId() == entityId)
-    {
-        bundle.AppendAnimNode(this);
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-            bundle.AppendAnimNodeBundle(pChildAnimNode->GetAllOwnedNodes(entityId));
-        }
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNodeBundle CTrackViewAnimNode::GetAnimNodesByType(AnimNodeType animNodeType)
-{
-    CTrackViewAnimNodeBundle bundle;
-
-    if (GetNodeType() == eTVNT_AnimNode && GetType() == animNodeType)
-    {
-        bundle.AppendAnimNode(this);
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-            bundle.AppendAnimNodeBundle(pChildAnimNode->GetAnimNodesByType(animNodeType));
-        }
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNodeBundle CTrackViewAnimNode::GetAnimNodesByName(const char* pName)
-{
-    CTrackViewAnimNodeBundle bundle;
-
-    QString nodeName = GetName();
-    if (GetNodeType() == eTVNT_AnimNode && QString::compare(pName, nodeName, Qt::CaseInsensitive) == 0)
-    {
-        bundle.AppendAnimNode(this);
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-            bundle.AppendAnimNodeBundle(pChildAnimNode->GetAnimNodesByName(pName));
-        }
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CTrackViewAnimNode::GetParamName(const CAnimParamType& paramType) const
-{
-    const char* pName = m_animNode->GetParamName(paramType);
-    return pName ? pName : "";
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::IsGroupNode() const
-{
-    AnimNodeType nodeType = GetType();
-
-    // AZEntities are really just containers for components, so considered a 'Group' node
-    return nodeType == AnimNodeType::Director || nodeType == AnimNodeType::Group || nodeType == AnimNodeType::AzEntity;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CTrackViewAnimNode::GetAvailableNodeNameStartingWith(const QString& name) const
-{
-    QString newName = name;
-    unsigned int index = 2;
-
-    while (const_cast<CTrackViewAnimNode*>(this)->GetAnimNodesByName(newName.toUtf8().data()).GetCount() > 0)
-    {
-        newName = QStringLiteral("%1%2").arg(name).arg(index);
-        ++index;
-    }
-
-    return newName;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNodeBundle CTrackViewAnimNode::AddSelectedEntities(const AZStd::vector<AnimParamType>& tracks)
-{
-    AZ_Assert(IsGroupNode(), "Expected to added selected entities to a group node.");
-
-    CTrackViewAnimNodeBundle addedNodes;
-
-    AzToolsFramework::EntityIdList entityIds;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-        entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    // Add selected nodes.
-    for (const AZ::EntityId& entityId : entityIds)
-    {
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
-
-        if (entity == nullptr)
-        {
-            continue;
-        }
-
-        // Check if object already assigned to some AnimNode.
-        if (CTrackViewAnimNode* existingNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(entityId))
-        {
-            // If it has the same director than the current node, reject it
-            if (existingNode->GetDirector() == GetDirector())
-            {
-                GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(AZStd::string::format(
-                    "'%s' was already added to '%s', skipping...", entity->GetName().c_str(), GetDirector()->GetName()));
-
-                continue;
-            }
-        }
-
-        if (CTrackViewAnimNode* animNode = CreateSubNode(entity->GetName().c_str(), AnimNodeType::AzEntity, entityId))
-        {
-            CUndo undo("Add Default Tracks");
-
-            CreateDefaultTracksForEntityNode(animNode, tracks);
-
-            addedNodes.AppendAnimNode(animNode);
-        }
-    }
-
-    return addedNodes;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::AddCurrentLayer()
-{
-    assert(IsGroupNode());
-
-    const QString name = "Main";
-
-    CreateSubNode(name, AnimNodeType::Entity);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetAsViewCamera()
-{
-    assert (GetType() == AnimNodeType::Camera);
-
-    if (GetType() == AnimNodeType::Camera)
-    {
-        AZ_Error("CTrackViewAnimNode", false, "Legacy cameras are no longer supported.  Unable to set view camera.");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-unsigned int CTrackViewAnimNode::GetParamCount() const
-{
-    return m_animNode ? m_animNode->GetParamCount() : 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CAnimParamType CTrackViewAnimNode::GetParamType(unsigned int index) const
-{
-    unsigned int paramCount = GetParamCount();
-    if (!m_animNode || index >= paramCount)
-    {
-        return AnimParamType::Invalid;
-    }
-
-    return m_animNode->GetParamType(index);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IAnimNode::ESupportedParamFlags CTrackViewAnimNode::GetParamFlags(const CAnimParamType& paramType) const
-{
-    if (m_animNode)
-    {
-        return m_animNode->GetParamFlags(paramType);
-    }
-
-    return IAnimNode::ESupportedParamFlags(0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-AnimValueType CTrackViewAnimNode::GetParamValueType(const CAnimParamType& paramType) const
-{
-    if (m_animNode)
-    {
-        return m_animNode->GetParamValueType(paramType);
-    }
-
-    return AnimValueType::Unknown;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::UpdateDynamicParams()
-{
-    if (m_animNode)
-    {
-        m_animNode->UpdateDynamicParams();
-    }
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-            pChildAnimNode->UpdateDynamicParams();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks)
-{
-    XmlNodeRef childNode = xmlNode->createNode("Node");
-    childNode->setAttr("name", GetName());
-    childNode->setAttr("type", static_cast<int>(GetType()));
-
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        pChildNode->CopyKeysToClipboard(childNode, bOnlySelectedKeys, bOnlyFromSelectedTracks);
-    }
-
-    if (childNode->getChildCount() > 0)
-    {
-        xmlNode->addChild(childNode);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::CopyNodesToClipboard(const bool bOnlySelected, QWidget* context)
-{
-    XmlNodeRef animNodesRoot = XmlHelpers::CreateXmlNode("CopyAnimNodesRoot");
-
-    CopyNodesToClipboardRec(this, animNodesRoot, bOnlySelected);
-
-    CClipboard clipboard(context);
-    clipboard.Put(animNodesRoot, "Track view entity nodes");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::CopyNodesToClipboardRec(CTrackViewAnimNode* pCurrentAnimNode, XmlNodeRef& xmlNode, const bool bOnlySelected)
-{
-    if (pCurrentAnimNode->m_animNode && (!bOnlySelected || pCurrentAnimNode->IsSelected()))
-    {
-        XmlNodeRef childXmlNode = xmlNode->newChild("Node");
-        pCurrentAnimNode->m_animNode->Serialize(childXmlNode, false, true);
-    }
-
-    for (auto iter = pCurrentAnimNode->m_childNodes.begin(); iter != pCurrentAnimNode->m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-
-            // If selected and group node, force copying of children
-            const bool bSelectedAndGroupNode = pCurrentAnimNode->IsSelected() && pCurrentAnimNode->IsGroupNode();
-            CopyNodesToClipboardRec(pChildAnimNode, xmlNode, !bSelectedAndGroupNode && bOnlySelected);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::PasteTracksFrom(XmlNodeRef& xmlNodeWithTracks)
-{
-    assert(CUndo::IsRecording());
-
-    // we clear our own tracks first because calling SerializeAnims() will clear out m_animNode's tracks below
-    CTrackViewTrackBundle allTracksBundle = GetAllTracks();
-    for (int i = allTracksBundle.GetCount(); --i >= 0;)
-    {
-        RemoveTrack(allTracksBundle.GetTrack(i));
-    }
-
-    // serialize all the tracks from xmlNode - note this will first delete all existing tracks on m_animNode
-    m_animNode->SerializeAnims(xmlNodeWithTracks, true, true);
-
-    // create TrackView tracks
-    const int trackCount = m_animNode->GetTrackCount();
-    for (int i = 0; i < trackCount; ++i)
-    {
-        IAnimTrack* pTrack = m_animNode->GetTrackByIndex(i);
-
-        CTrackViewTrackFactory trackFactory;
-        CTrackViewTrack* newTrackNode = trackFactory.BuildTrack(pTrack, this, this);
-
-        AddNode(newTrackNode);
-
-        MarkAsModified();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::PasteNodesFromClipboard(QWidget* context)
-{
-    assert(CUndo::IsRecording());
-
-    CClipboard clipboard(context);
-    if (clipboard.IsEmpty())
-    {
-        return false;
-    }
-
-    XmlNodeRef animNodesRoot = clipboard.Get();
-    if (animNodesRoot == NULL || strcmp(animNodesRoot->getTag(), "CopyAnimNodesRoot") != 0)
-    {
-        return false;
-    }
-
-    const bool bLightAnimationSetActive = GetSequence()->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet;
-
-    AZStd::map<int, IAnimNode*> copiedIdToNodeMap;
-    const unsigned int numNodes = animNodesRoot->getChildCount();
-    for (int i = 0; i < numNodes; ++i)
-    {
-        XmlNodeRef xmlNode = animNodesRoot->getChild(i);
-
-        // skip non-light nodes in light animation sets
-        int type;
-        if (!xmlNode->getAttr("Type", type) || (bLightAnimationSetActive && (AnimNodeType)type != AnimNodeType::Light))
-        {
-            continue;
-        }
-
-        PasteNodeFromClipboard(copiedIdToNodeMap, xmlNode);
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::PasteNodeFromClipboard(AZStd::map<int, IAnimNode*>& copiedIdToNodeMap, XmlNodeRef xmlNode)
-{
-    QString name;
-
-    if (!xmlNode->getAttr("Name", name))
-    {
-        return;
-    }
-
-    // can only paste nodes into a groupNode (i.e. accepts children)
-    const bool bIsGroupNode = IsGroupNode();
-    assert(bIsGroupNode);
-    if (!bIsGroupNode)
-    {
-        return;
-    }
-
-    AnimNodeType nodeType;
-    GetIEditor()->GetMovieSystem()->SerializeNodeType(nodeType, xmlNode, /*bLoading=*/ true, IAnimSequence::kSequenceVersion, m_animSequence->GetFlags());
-    
-    if (nodeType == AnimNodeType::Component)
-    {
-        // When pasting Component Nodes, the parent Component Entity Node would have already added all its Components as part of its OnEntityActivated() sync.
-        // Here we need to go copy any Components Tracks as well. For pasting, Components matched by ComponentId, which assumes the pasted Track View Component Node
-        // refers to the copied Component Entity referenced in the level
-
-        // Find the pasted parent Component Entity Node
-        int parentId = 0;
-        xmlNode->getAttr("ParentNode", parentId);
-        if (copiedIdToNodeMap.find(parentId) != copiedIdToNodeMap.end())
-        {
-            CTrackViewAnimNode* componentEntityNode = FindNodeByAnimNode(copiedIdToNodeMap[parentId]);
-            if (componentEntityNode)
-            {
-                // Find the copied Component Id on the pasted Component Entity Node, if it exists
-                AZ::ComponentId componentId = AZ::InvalidComponentId;
-                xmlNode->getAttr("ComponentId", componentId);
-
-                for (int i = componentEntityNode->GetChildCount(); --i >= 0;)
-                {
-                    CTrackViewNode* childNode = componentEntityNode->GetChild(i);
-                    if (childNode->GetNodeType() == eTVNT_AnimNode)
-                    {
-                        CTrackViewAnimNode* componentNode = static_cast<CTrackViewAnimNode*>(childNode);
-
-                        if (componentNode->GetComponentId() == componentId)
-                        {
-                            componentNode->PasteTracksFrom(xmlNode);
-                            break;
-                        }
-                    }
-                }
-            }
-        }   
-    }
-    else
-    {
-        // Pasting a non-Component Node - create and add nodes to CryMovie and TrackView
-
-        // Check if the node's director or sequence already contains a node with this name
-        CTrackViewAnimNode* director = GetDirector();
-        director = director ? director : GetSequence();
-        if (director->GetAnimNodesByName(name.toUtf8().data()).GetCount() > 0)
-        {
-            return;
-        }
-
-        IAnimNode* newAnimNode = m_animSequence->CreateNode(xmlNode);
-        if (!newAnimNode)
-        {
-            return;
-        }
-
-        // add new node to mapping of copied Id's to pasted nodes
-        int id;
-        xmlNode->getAttr("Id", id);
-        copiedIdToNodeMap[id] = newAnimNode;
-
-        // search for the parent Node among the pasted nodes - if not found, parent to the group node doing the pasting
-        IAnimNode* parentAnimNode = m_animNode.get();
-        int parentId = 0;
-        if (xmlNode->getAttr("ParentNode", parentId))
-        {
-            if (copiedIdToNodeMap.find(parentId) != copiedIdToNodeMap.end())
-            {
-                parentAnimNode = copiedIdToNodeMap[parentId];
-            }
-        }
-        newAnimNode->SetParent(parentAnimNode);
-
-        // Find the TrackViewNode corresponding to the parentNode
-        CTrackViewAnimNode* parentNode = FindNodeByAnimNode(parentAnimNode);
-        if (!parentNode)
-        {
-            parentNode = this;
-        }
-
-        CTrackViewAnimNodeFactory animNodeFactory;
-        CTrackViewAnimNode* newNode = animNodeFactory.BuildAnimNode(m_animSequence, newAnimNode, parentNode);
-
-        parentNode->AddNode(newNode);
-
-        // Add node to sequence, let AZ Undo take care of undo/redo
-        m_animSequence->AddNode(newNode->m_animNode.get());
-    }
-
-    // Make sure there are no duplicate track Ids
-    AZStd::vector<unsigned int> usedTrackIds;
-
-    int nodeCount = m_animSequence->GetNodeCount();
-    for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
-    {
-        IAnimNode* animNode = m_animSequence->GetNode(nodeIndex);
-        AZ_Assert(animNode, "Expected valid animNode");
-
-        int trackCount = animNode->GetTrackCount();
-        for (int trackIndex = 0; trackIndex < trackCount; trackIndex++)
-        {
-            IAnimTrack* track = animNode->GetTrackByIndex(trackIndex);
-            AZ_Assert(track, "Expected valid track");
-
-            // If the Track Id is already used, generate a new one
-            if (AZStd::find(usedTrackIds.begin(), usedTrackIds.end(), track->GetId()) != usedTrackIds.end())
-            {
-                track->SetId(m_animSequence->GetUniqueTrackIdAndGenerateNext());
-            }
-
-            usedTrackIds.push_back(track->GetId());
-
-            int subTrackCount = track->GetSubTrackCount();
-            for (int subTrackIndex = 0; subTrackIndex < subTrackCount; subTrackIndex++)
-            {
-                IAnimTrack* subTrack = track->GetSubTrack(subTrackIndex);
-                AZ_Assert(subTrack, "Expected valid subtrack.");
-
-                // If the Track Id is already used, generate a new one
-                if (AZStd::find(usedTrackIds.begin(), usedTrackIds.end(), subTrack->GetId()) != usedTrackIds.end())
-                {
-                    subTrack->SetId(m_animSequence->GetUniqueTrackIdAndGenerateNext());
-                }
-
-                usedTrackIds.push_back(subTrack->GetId());
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode* CTrackViewAnimNode::FindNodeByAnimNode(const IAnimNode* animNode)
-{
-    // Depth-first search for TrackViewAnimNode associated with the given animNode. Returns the first match found.
-    CTrackViewAnimNode* retNode = nullptr;
-
-    for (const std::unique_ptr<CTrackViewNode>& childNode : m_childNodes)
-    {
-        if (childNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(childNode.get());
-
-            // recurse to search children of group nodes
-            if (childNode->IsGroupNode())
-            {
-                retNode = childAnimNode->FindNodeByAnimNode(animNode);
-                if (retNode)
-                {
-                    break;
-                }
-            }
-
-            if (childAnimNode->GetAnimNode() == animNode)
-            {
-                retNode = childAnimNode;
-                break;
-            }
-        }
-    }
-    return retNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::IsValidReparentingTo(CTrackViewAnimNode* pNewParent)
-{
-    if (pNewParent == GetParentNode() || !pNewParent->IsGroupNode() || pNewParent->GetType() == AnimNodeType::AzEntity)
-    {
-        return false;
-    }
-
-    // Check if the new parent already contains a node with this name
-    CTrackViewAnimNodeBundle foundNodes = pNewParent->GetAnimNodesByName(GetName());
-    if (foundNodes.GetCount() > 1 || (foundNodes.GetCount() == 1 && foundNodes.GetNode(0) != this))
-    {
-        return false;
-    }
-
-    // Check if another node already owns this entity in the new parent's tree
-    if (const AZ::EntityId owner = GetNodeEntityId();
-        owner.IsValid())
-    {
-        CTrackViewAnimNodeBundle ownedNodes = pNewParent->GetAllOwnedNodes(owner);
-        if (ownedNodes.GetCount() > 0 && ownedNodes.GetNode(0) != this)
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void CTrackViewAnimNode::SetParentsInChildren(CTrackViewAnimNode* currentNode)
-{
-    const uint numChildren = currentNode->GetChildCount();
-
-    for (uint childIndex = 0; childIndex < numChildren; ++childIndex)
-    {
-        CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(currentNode->GetChild(childIndex));
-
-        if (childAnimNode->GetNodeType() != eTVNT_Track)
-        {
-            childAnimNode->m_animNode->SetParent(currentNode->m_animNode.get());
-
-            if (childAnimNode->GetChildCount() > 0 && childAnimNode->GetNodeType() != eTVNT_AnimNode)
-            {
-                SetParentsInChildren(childAnimNode);
-            }
-        }
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetNewParent(CTrackViewAnimNode* newParent)
-{
-    if (newParent == GetParentNode())
-    {
-        return;
-    }
-
-    assert(IsValidReparentingTo(newParent));
-
-    CTrackViewSequence* sequence = newParent->GetSequence();
-    AZ_Assert(sequence, "Expected valid sequence.");
-
-    AzToolsFramework::ScopedUndoBatch undoBatch("Set New Track View Anim Node Parent");
-
-    UnBindFromEditorObjects();
-
-    // Remove from the old parent's children and hang on to a ref.
-    std::unique_ptr<CTrackViewNode> storedTrackViewNode;
-    CTrackViewAnimNode* lastParent = static_cast<CTrackViewAnimNode*>(m_pParentNode);
-    if (nullptr != lastParent)
-    {
-        for (auto iter = lastParent->m_childNodes.begin(); iter != lastParent->m_childNodes.end(); ++iter)
-        {
-            std::unique_ptr<CTrackViewNode>& currentNode = *iter;
-
-            if (currentNode.get() == this)
-            {
-                currentNode.swap(storedTrackViewNode);
-                lastParent->m_childNodes.erase(iter);
-                break;
-            }
-        }
-    }
-    AZ_Assert(nullptr != storedTrackViewNode.get(), "Existing Parent of node not found");
-
-    sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Removed);
-
-    // Set new parent
-    m_pParentNode = newParent;
-    m_animNode->SetParent(newParent->m_animNode.get());
-    SetParentsInChildren(this);
-
-    // Add node to the new parent's children.
-    static_cast<CTrackViewAnimNode*>(m_pParentNode)->AddNode(storedTrackViewNode.release());
-
-    BindToEditorObjects();
-
-    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());    
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::CanBeEnabled() const
-{
-    bool canBeEnabled = true;
-    // If this node was disabled because the component was disabled,
-    // do not allow it to be re-enabled until that is resolved.
-    if (m_animNode)
-    {
-        canBeEnabled = !(m_animNode->GetFlags() & eAnimNodeFlags_DisabledForComponent);
-    }
-    return canBeEnabled;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetDisabled(bool disabled)
-{
-    {
-        CTrackViewSequence* sequence = GetSequence();
-        AZ_Assert(sequence, "Expected valid sequence.");
-        AZ_Assert(m_animNode, "Expected valid m_animNode.");
-
-        if (disabled)
-        {
-            m_animNode->SetFlags(m_animNode->GetFlags() | eAnimNodeFlags_Disabled);
-            sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Disabled);
-
-            // Call OnReset to disable the effects of the node.
-            m_animNode->OnReset();
-        }
-        else
-        {
-            m_animNode->SetFlags(m_animNode->GetFlags() & ~eAnimNodeFlags_Disabled);
-            sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Enabled);
-        }
-    }
-    MarkAsModified();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::IsDisabled() const
-{
-    return m_animNode ? m_animNode->GetFlags() & eAnimNodeFlags_Disabled : false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetPos(const Vec3& position)
-{
-    const float time = GetSequence()->GetTime();
-    CTrackViewTrack* track = GetTrackForParameter(AnimParamType::Position);
-
-    if (track)
-    {
-        if (!GetIEditor()->GetAnimation()->IsRecording())
-        {
-            // Offset all keys by move amount.
-            Vec3 offset = m_animNode->GetOffsetPosition(position);
-            
-            track->OffsetKeyPosition(offset);
-
-            GetSequence()->OnKeysChanged();
-        }
-        else if (AzToolsFramework::IsSelected(m_nodeEntityId))
-        {
-            CTrackViewSequence* sequence = GetSequence();
-
-            AZ_Assert(sequence, "Expected valid sequence");
-            if (sequence != nullptr)
-            {
-                const int flags = m_animNode->GetFlags();
-                // This is required because the entity movement system uses Undo to
-                // undo a previous move delta as the entity is dragged.
-                CUndo::Record(new CUndoComponentEntityTrackObject(track));
-
-                // Set the selected flag to enable record when unselected camera is moved through viewport
-                m_animNode->SetFlags(flags | eAnimNodeFlags_EntitySelected);
-                m_animNode->SetPos(sequence->GetTime(), position);
-                m_animNode->SetFlags(flags);
-                    
-                // We don't want to use ScopedUndoBatch here because we don't want a separate Undo operation
-                // generate for every frame as the user moves an entity.
-                AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
-                    &AzToolsFramework::ToolsApplicationRequests::Bus::Events::AddDirtyEntity, 
-                    sequence->GetSequenceComponentEntityId()
-                );                    
-
-                sequence->OnKeysChanged();
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetScale(const Vec3& scale)
-{
-    CTrackViewTrack* track = GetTrackForParameter(AnimParamType::Scale);
-
-    if (GetIEditor()->GetAnimation()->IsRecording() && AzToolsFramework::IsSelected(m_nodeEntityId) && track)
-    {
-        CTrackViewSequence* sequence = GetSequence();
-
-        AZ_Assert(sequence, "Expected valid sequence");
-        if (sequence != nullptr)
-        {
-            // This is required because the entity movement system uses Undo to
-            // undo a previous move delta as the entity is dragged.
-            CUndo::Record(new CUndoComponentEntityTrackObject(track));
-
-            m_animNode->SetScale(sequence->GetTime(), scale);
-
-            // We don't want to use ScopedUndoBatch here because we don't want a separate Undo operation
-            // generate for every frame as the user scales an entity.
-            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
-                &AzToolsFramework::ToolsApplicationRequests::Bus::Events::AddDirtyEntity,
-                sequence->GetSequenceComponentEntityId()
-            );
-            sequence->OnKeysChanged();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetRotation(const Quat& rotation)
-{
-    CTrackViewTrack* track = GetTrackForParameter(AnimParamType::Rotation);
-
-    if (GetIEditor()->GetAnimation()->IsRecording() && (AzToolsFramework::IsSelected(m_nodeEntityId)) && track)
-    {
-        CTrackViewSequence* sequence = GetSequence();
-
-        AZ_Assert(sequence, "Expected valid sequence");
-        if (sequence != nullptr)
-        {
-            const int flags = m_animNode->GetFlags();
-            // This is required because the entity movement system uses Undo to
-            // undo a previous move delta as the entity is dragged.
-            CUndo::Record(new CUndoComponentEntityTrackObject(track));
-
-            // Set the selected flag to enable record when unselected camera is moved through viewport
-            m_animNode->SetFlags(flags | eAnimNodeFlags_EntitySelected);
-            m_animNode->SetRotate(sequence->GetTime(), rotation);
-            m_animNode->SetFlags(flags);
-
-            // We don't want to use ScopedUndoBatch here because we don't want a separate Undo operation
-            // generate for every frame as the user rotates an entity.
-            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
-                &AzToolsFramework::ToolsApplicationRequests::Bus::Events::AddDirtyEntity,
-                sequence->GetSequenceComponentEntityId()
-            );
-
-            sequence->OnKeysChanged();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::IsActive()
-{
-    CTrackViewSequence* pSequence = GetSequence();
-    const bool bInActiveSequence = pSequence ? GetSequence()->IsBoundToEditorObjects() : false;
-
-    CTrackViewAnimNode* director = GetDirector();
-    const bool bMemberOfActiveDirector = director ? GetDirector()->IsActiveDirector() : true;
-
-    return bInActiveSequence && bMemberOfActiveDirector;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::OnSelectionChanged(const bool selected)
-{
-    if (m_animNode)
-    {
-        const AnimNodeType animNodeType = GetType();
-        AZ_Assert(animNodeType == AnimNodeType::AzEntity, "Expected AzEntity for selection changed");
-
-        const EAnimNodeFlags flags = (EAnimNodeFlags)m_animNode->GetFlags();
-        m_animNode->SetFlags(selected ? (flags | eAnimNodeFlags_EntitySelected) : (flags & ~eAnimNodeFlags_EntitySelected));
-    }
-}
-
-void CTrackViewAnimNode::OnSelected()
-{
-    OnSelectionChanged(true);
-}
-
-void CTrackViewAnimNode::OnDeselected()
-{
-    OnSelectionChanged(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetPosRotScaleTracksDefaultValues(bool positionAllowed, bool rotationAllowed, bool scaleAllowed)
-{
-    AZ::EntityId entityId;
-    bool entityIsBoundToEditorObjects = false;
-
-    if (m_animNode)
-    {
-        if (m_animNode->GetType() == AnimNodeType::Component)
-        {
-            // get entity from the parent Component Entity
-           CTrackViewNode* parentNode = GetParentNode();
-           if (parentNode && parentNode->GetNodeType() == eTVNT_AnimNode)
-           {
-               CTrackViewAnimNode* parentAnimNode = static_cast<CTrackViewAnimNode*>(parentNode);
-               if (parentAnimNode)
-               {
-                   entityId = parentAnimNode->GetNodeEntityId(false);
-                   entityIsBoundToEditorObjects = parentAnimNode->IsBoundToEditorObjects();
-               }
-           }
-        }
-        else
-        {
-            // not a component - get the entity on this node directly
-            entityId = GetNodeEntityId(false);
-            entityIsBoundToEditorObjects = IsBoundToEditorObjects();
-        }
-
-        if (entityId.IsValid() && entityIsBoundToEditorObjects)
-        {
-            const float time = GetSequence()->GetTime();
-            if (positionAllowed)
-            {
-                AZ::Vector3 position = AZ::Vector3::CreateZero();
-                AZ::TransformBus::EventResult(position, entityId, &AZ::TransformBus::Events::GetWorldTranslation);
-                m_animNode->SetPos(time, AZVec3ToLYVec3(position));
-            }
-            if (rotationAllowed)
-            {
-                AZ::Quaternion rotation = AZ::Quaternion::CreateIdentity();
-                AZ::TransformBus::EventResult(rotation, entityId, &AZ::TransformBus::Events::GetWorldRotationQuaternion);
-                m_animNode->SetRotate(time, AZQuaternionToLYQuaternion(rotation));
-            }
-            if (scaleAllowed)
-            {
-                float scale = 1.0f;
-                AZ::TransformBus::EventResult(scale, entityId, &AZ::TransformBus::Events::GetWorldUniformScale);
-                m_animNode->SetScale(time, Vec3(scale, scale, scale));
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::UpdateTrackGizmo()
-{
-    if (IsActive() && m_nodeEntityId.IsValid() && AzToolsFramework::IsEntityVisible(m_nodeEntityId))
-    {
-        if (!m_trackGizmo)
-        {
-            CTrackGizmo* pTrackGizmo = new CTrackGizmo;
-            pTrackGizmo->SetAnimNode(this);
-            m_trackGizmo = pTrackGizmo;
-            GetIEditor()->GetObjectManager()->GetGizmoManager()->AddGizmo(m_trackGizmo);
-        }
-    }
-    else
-    {
-        GetIEditor()->GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_trackGizmo);
-        m_trackGizmo = nullptr;
-    }
-
-    if (m_nodeEntityId.IsValid() && m_trackGizmo)
-    {
-        Matrix34 gizmoMatrix;
-        gizmoMatrix.SetIdentity();
-
-        if (GetType() == AnimNodeType::AzEntity)
-        {
-            // Key data are always relative to the parent (or world if there is no parent). So get the parent
-            // entity id if there is one.
-            AZ::EntityId parentId;
-            AZ::TransformBus::EventResult(parentId, GetAzEntityId(), &AZ::TransformBus::Events::GetParentId);
-            if (parentId.IsValid())
-            {
-                AZ::Transform azWorldTM = GetEntityWorldTM(parentId);
-                gizmoMatrix = AZTransformToLYTransform(azWorldTM);
-            }
-        }
-
-        m_trackGizmo->SetMatrix(gizmoMatrix);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::CheckTrackAnimated(const CAnimParamType& paramType) const
-{
-    if (!m_animNode)
-    {
-        return false;
-    }
-
-    CTrackViewTrack* pTrack = GetTrackForParameter(paramType);
-    return pTrack && pTrack->GetKeyCount() > 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::OnNodeVisibilityChanged([[maybe_unused]] IAnimNode* node, const bool bHidden)
-{
-    if (m_nodeEntityId.IsValid())
-    {
-        AzToolsFramework::SetEntityVisibility(m_nodeEntityId, !bHidden);
-
-        // Need to do this to force recreation of gizmos
-        const bool showSelected =
-            AzToolsFramework::IsEntityVisible(m_nodeEntityId) && AzToolsFramework::IsSelected(m_nodeEntityId);
-        if (showSelected)
-        {
-            AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(
-                &AzToolsFramework::ToolsApplicationRequests::Bus::Events::SetSelectedEntities,
-                AzToolsFramework::EntityIdList{m_nodeEntityId});
-        }
-
-        UpdateTrackGizmo();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::OnNodeReset([[maybe_unused]] IAnimNode* node)
-{
-}
-
-void CTrackViewAnimNode::SetComponent(AZ::ComponentId componentId, const AZ::Uuid& componentTypeId)
-{
-    if (m_animNode)
-    {
-        m_animNode->SetComponent(componentId, componentTypeId);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZ::ComponentId CTrackViewAnimNode::GetComponentId() const
-{
-    return m_animNode ? m_animNode->GetComponentId() : AZ::InvalidComponentId;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::MarkAsModified()
-{
-    GetSequence()->MarkAsModified();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewAnimNode::ContainsComponentWithId(AZ::ComponentId componentId) const
-{
-    bool retFound = false;
-
-    if (GetType() == AnimNodeType::AzEntity)
-    {
-        // search for a matching componentId on all children
-        for (int i = 0; i < GetChildCount(); i++)
-        {
-            CTrackViewNode* childNode = GetChild(i);
-            if (childNode->GetNodeType() == eTVNT_AnimNode)
-            {
-                if (static_cast<CTrackViewAnimNode*>(childNode)->GetComponentId() == componentId)
-                {
-                    retFound = true;
-                    break;
-                }
-            }
-        }
-    }
-
-    return retFound;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::OnStartPlayInEditor()
-{
-    if (m_animSequence->GetSequenceEntityId().IsValid())
-    {
-        AZ::EntityId remappedId;
-        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId, m_animSequence->GetSequenceEntityId(), remappedId);
-            
-        if (remappedId.IsValid())
-        {
-            // stash and remap the AZ::EntityId of the SequenceComponent entity to restore it when we switch back to Edit mode
-            m_stashedAnimSequenceEditorAzEntityId = m_animSequence->GetSequenceEntityId();
-            m_animSequence->SetSequenceEntityId(remappedId);
-        }
-    }
-
-    if (m_animNode && m_animNode->GetAzEntityId().IsValid())
-    {
-        AZ::EntityId remappedId;
-        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId, m_animNode->GetAzEntityId(), remappedId);
-
-        if (remappedId.IsValid())
-        {
-            // stash the AZ::EntityId of the SequenceComponent entity to restore it when we switch back to Edit mode
-            m_stashedAnimNodeEditorAzEntityId = m_animNode->GetAzEntityId();
-            m_animNode->SetAzEntityId(remappedId);
-        }
-    }
-    
-    if (m_animNode)
-    {
-        m_animNode->OnStartPlayInEditor();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::OnStopPlayInEditor()
-{
-    // restore sequenceComponent entity Ids back to their original Editor Ids
-    if (m_animSequence && m_stashedAnimSequenceEditorAzEntityId.IsValid())
-    {
-        m_animSequence->SetSequenceEntityId(m_stashedAnimSequenceEditorAzEntityId);
-
-        // invalidate the stashed Id now that we've restored it
-        m_stashedAnimSequenceEditorAzEntityId.SetInvalid();
-    }
-
-    if (m_animNode && m_stashedAnimNodeEditorAzEntityId.IsValid())
-    {
-        m_animNode->SetAzEntityId(m_stashedAnimNodeEditorAzEntityId);
-
-        // invalidate the stashed Id now that we've restored it
-        m_stashedAnimNodeEditorAzEntityId.SetInvalid();
-    }
-
-    if (m_animNode)
-    {
-        m_animNode->OnStopPlayInEditor();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::OnEntityActivated(const AZ::EntityId& activatedEntityId)
-{
-    if (GetAzEntityId() != activatedEntityId)
-    {
-        // This can happen when we're exiting Game/Sim Mode and entity Id's are remapped. Do nothing in such a circumstance.
-        return;
-    }
-
-    CTrackViewDialog* dialog = CTrackViewDialog::GetCurrentInstance();
-    if ((dialog && dialog->IsDoingUndoOperation()) || GetAzEntityId() != activatedEntityId)
-    {
-        // Do not respond during Undo. We'll get called when we connect to the AZ::EntityBus in SetEntityNode(),
-        // which would result in adding component nodes twice during Undo.
-
-        // Also do not respond to entity activation notifications for entities not associated with this animNode,
-        // although this should never happen
-        return;
-    }
-
-    // Ensure the components on the Entity match the components on the Entity Node in Track View.
-    //
-    // Note this gets called as soon as we connect to AZ::EntityBus - so in effect SetNodeEntity() on an AZ::Entity results
-    // in all of it's component nodes being added.
-    //
-    // If the component exists in Track View but not in the entity, we remove it from Track View.
-
-    AZ::Entity* entity = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, activatedEntityId);
-
-    // check if all Track View components are (still) on the entity. If not, remove it from TrackView
-    for (int i = GetChildCount(); --i >= 0;)
-    {
-        if (GetChild(i)->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(GetChild(i));
-            if (childAnimNode->GetComponentId() != AZ::InvalidComponentId && !(entity->FindComponent(childAnimNode->GetComponentId())))
-            {
-                // Check to see if the component is still on the entity, but just disabled. Don't remove it in that case.
-                AZ::Entity::ComponentArrayType disabledComponents;
-                AzToolsFramework::EditorDisabledCompositionRequestBus::Event(
-                    entity->GetId(), &AzToolsFramework::EditorDisabledCompositionRequests::GetDisabledComponents, disabledComponents);
-
-                bool isDisabled = false;
-                for (auto disabledComponent : disabledComponents)
-                {
-                    if (disabledComponent->GetId() == childAnimNode->GetComponentId())
-                    {
-                        isDisabled = true;
-                        break;
-                    }
-                }
-
-                // Check to see if the component is still on the entity, but just pending. Don't remove it in that case.
-                AZ::Entity::ComponentArrayType pendingComponents;
-                AzToolsFramework::EditorPendingCompositionRequestBus::Event(
-                    entity->GetId(), &AzToolsFramework::EditorPendingCompositionRequests::GetPendingComponents, pendingComponents);
-
-                bool isPending = false;
-                for (auto pendingComponent : pendingComponents)
-                {
-                    if (pendingComponent->GetId() == childAnimNode->GetComponentId())
-                    {
-                        isPending = true;
-                        break;
-                    }
-                }
-
-                if (!isDisabled && !isPending)
-                {
-                    AzToolsFramework::ScopedUndoBatch undoBatch("Remove Track View Component Node");
-                    RemoveSubNode(childAnimNode);
-                    CTrackViewSequence* sequence = GetSequence();
-                    AZ_Assert(sequence != nullptr, "Sequence should not be null");
-                    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-                }
-                else
-                {
-                    // don't remove this node, but do disable it.
-                    if (childAnimNode->m_animNode)
-                    {
-                        int flags = childAnimNode->m_animNode->GetFlags();
-                        flags |= eAnimNodeFlags_DisabledForComponent;
-                        childAnimNode->m_animNode->SetFlags(flags);
-                        childAnimNode->SetDisabled(true);
-                    }
-                }
-            }
-            else
-            {
-                // re-enable the node if it was disabled because of a missing component
-                if (childAnimNode->m_animNode)
-                {
-                    int flags = childAnimNode->m_animNode->GetFlags();
-                    if (flags & eAnimNodeFlags_DisabledForComponent)
-                    {
-                        flags &= ~eAnimNodeFlags_DisabledForComponent;
-                        childAnimNode->m_animNode->SetFlags(flags);
-                        childAnimNode->SetDisabled(false);
-                    }
-                }
-            }
-        }
-    }
-
-    /////////////////////////////////////////////////////////////////////////
-    // check that all animatable components on the Entity are in Track View
-
-    AZStd::vector<AZ::ComponentId> animatableComponentIds;
-
-    // Get all components animated through the behavior context
-    Maestro::EditorSequenceComponentRequestBus::Event(GetSequence()->GetSequenceComponentEntityId(), &Maestro::EditorSequenceComponentRequestBus::Events::GetAnimatableComponents,
-                                                          animatableComponentIds, activatedEntityId);
-
-    for (const AZ::ComponentId& componentId : animatableComponentIds)
-    {
-        bool componentFound = false;
-        for (int i = GetChildCount(); --i >= 0;)
-        {
-            if (GetChild(i)->GetNodeType() == eTVNT_AnimNode)
-            {
-                CTrackViewAnimNode* childAnimNode = static_cast<CTrackViewAnimNode*>(GetChild(i));
-                if (childAnimNode->GetComponentId() == componentId)
-                {
-                    componentFound = true;
-                    break;
-                }
-            }
-        }
-        if (!componentFound)
-        {
-            bool disabled = false;
-            const AZ::Component* component = entity->FindComponent(componentId);
-
-            // If not found in enabled components, check disabled and pending components
-            if (!component)
-            {
-                // Disable the node when it is created because the component is not enabled.
-                disabled = true;
-
-                // Check in disabled components
-                AZ::Entity::ComponentArrayType disabledComponents;
-                AzToolsFramework::EditorDisabledCompositionRequestBus::Event(entity->GetId(), &AzToolsFramework::EditorDisabledCompositionRequests::GetDisabledComponents, disabledComponents);
-
-                for (AZ::Component* currentComponent : disabledComponents)
-                {
-                    if (currentComponent->GetId() == componentId)
-                    {
-                        component = currentComponent;
-                        break;
-                    }
-                }
-
-                // Check in pending components
-                if (!component)
-                {
-                    AZ::Entity::ComponentArrayType pendingComponents;
-                    AzToolsFramework::EditorPendingCompositionRequestBus::Event(entity->GetId(), &AzToolsFramework::EditorPendingCompositionRequests::GetPendingComponents, pendingComponents);
-                    for (AZ::Component* currentComponent : pendingComponents)
-                    {
-                        if (currentComponent->GetId() == componentId)
-                        {
-                            component = currentComponent;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (component)
-            {
-                AddComponent(component, disabled);
-            }
-        }
-    }
-
-    // Refresh the sequence because things may have been enabled/disabled.
-    GetSequence()->ForceAnimation();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::OnEntityRemoved()
-{
-    // This is called by CTrackViewSequenceManager for both legacy and AZ Entities. When we deprecate legacy entities,
-    // we could (should) probably handle this via ComponentApplicationEventBus::Events::OnEntityRemoved
-
-    if (IsBoundToAzEntity())
-    {
-        AZ::EntityId entityId = GetAzEntityId();
-        AZ::TransformNotificationBus::Handler::BusDisconnect(entityId);
-        AZ::EntityBus::Handler::BusDisconnect(entityId);
-    }
-
-    m_nodeEntityId = AZ::EntityId(); // invalidate cached node entity id
-
-    // notify the change. This leads to Track View updating it's UI to account for the entity removal
-    GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode* CTrackViewAnimNode::AddComponent(const AZ::Component* component, bool disabled)
-{
-    CTrackViewAnimNode* retNewComponentNode = nullptr;
-    AZStd::string componentName;
-    AZ::Uuid      componentTypeId(AZ::Uuid::CreateNull());
-
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        componentTypeId, &AzFramework::ApplicationRequests::Bus::Events::GetComponentTypeId, GetAzEntityId(), component->GetId());
-
-    AzToolsFramework::EntityCompositionRequestBus::BroadcastResult(
-        componentName, &AzToolsFramework::EntityCompositionRequests::GetComponentName, component);
-
-    if (!componentName.empty() && !componentTypeId.IsNull())
-    {
-        CTrackViewSequence* sequence = GetSequence();
-        AZ_Assert(sequence, "Expected valid sequence.");
-
-        AzToolsFramework::ScopedUndoBatch undoBatch("Add TrackView Component");
-        retNewComponentNode = CreateSubNode(
-            componentName.c_str(), AnimNodeType::Component, AZ::EntityId(), componentTypeId, component->GetId());
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-    }
-    else
-    {
-        AZ_Warning("TrackView", false, "Could not determine component name or type for adding component - skipping...");
-    }
-
-    if (retNewComponentNode)
-    {
-        retNewComponentNode->SetDisabled(disabled);
-    }
-
-    return retNewComponentNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::MatrixInvalidated()
-{
-    UpdateTrackGizmo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 CTrackViewAnimNode::GetTransformDelegatePos(const Vec3& basePos) const
-{
-    const Vec3 position = GetPos();
-
-    return Vec3(CheckTrackAnimated(AnimParamType::PositionX) ? position.x : basePos.x,
-        CheckTrackAnimated(AnimParamType::PositionY) ? position.y : basePos.y,
-        CheckTrackAnimated(AnimParamType::PositionZ) ? position.z : basePos.z);
-}
-
-//////////////////////////////////////////////////////////////////////////
-Quat CTrackViewAnimNode::GetTransformDelegateRotation(const Quat& baseRotation) const
-{
-    if (!CheckTrackAnimated(AnimParamType::Rotation))
-    {
-        return baseRotation;
-    }
-
-    // Pass the sequence time to get the rotation from the
-    // track data if it is present. We don't want to go all the way out
-    // to the current rotation in component transform because that would mean
-    // we are going from Quat to Euler and then back to Quat and that could lead
-    // to the data drifting away from the original value.
-    Quat nodeRotation = GetRotation(GetSequenceConst()->GetTime());
-
-    const Ang3 angBaseRotation(baseRotation);
-    const Ang3 angNodeRotation(nodeRotation);
-    return Quat(Ang3(CheckTrackAnimated(AnimParamType::RotationX) ? angNodeRotation.x : angBaseRotation.x,
-            CheckTrackAnimated(AnimParamType::RotationY) ? angNodeRotation.y : angBaseRotation.y,
-            CheckTrackAnimated(AnimParamType::RotationZ) ? angNodeRotation.z : angBaseRotation.z));
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 CTrackViewAnimNode::GetTransformDelegateScale(const Vec3& baseScale) const
-{
-    const Vec3 scale = GetScale();
-
-    return Vec3(CheckTrackAnimated(AnimParamType::ScaleX) ? scale.x : baseScale.x,
-        CheckTrackAnimated(AnimParamType::ScaleY) ? scale.y : baseScale.y,
-        CheckTrackAnimated(AnimParamType::ScaleZ) ? scale.z : baseScale.z);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetTransformDelegatePos(const Vec3& position)
-{
-    SetPos(position);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetTransformDelegateRotation(const Quat& rotation)
-{
-    SetRotation(rotation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::SetTransformDelegateScale(const Vec3& scale)
-{
-    SetScale(scale);
-}
-
-bool CTrackViewAnimNode::IsTransformAnimParamTypeDelegated(const AnimParamType animParamType) const
-{
-    const bool delegated = (GetIEditor()->GetAnimation()->IsRecording() && AzToolsFramework::IsSelected(m_nodeEntityId) &&
-                             GetTrackForParameter(animParamType)) ||
-        CheckTrackAnimated(animParamType);
-    return delegated;
-}
-
-bool CTrackViewAnimNode::IsPositionDelegated() const
-{
-    return IsTransformAnimParamTypeDelegated(AnimParamType::Position);
-}
-
-bool CTrackViewAnimNode::IsRotationDelegated() const
-{
-    return IsTransformAnimParamTypeDelegated(AnimParamType::Rotation);
-}
-
-bool CTrackViewAnimNode::IsScaleDelegated() const
-{
-    return IsTransformAnimParamTypeDelegated(AnimParamType::Scale);
-}
-
-void CTrackViewAnimNode::OnEntityDestruction([[maybe_unused]] const AZ::EntityId& entityId)
-{
-    UnRegisterEditorObjectListeners();
-
-    SetNodeEntityId(AZ::EntityId());
-    UpdateTrackGizmo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-AZ::Transform CTrackViewAnimNode::GetEntityWorldTM(const AZ::EntityId entityId)
-{
-    AZ::Entity* entity = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
-
-    AZ::Transform worldTM = AZ::Transform::Identity();
-    if (entity != nullptr)
-    {
-        AZ::TransformInterface* transformInterface = entity->GetTransform();
-        if (transformInterface != nullptr)
-        {
-            worldTM = transformInterface->GetWorldTM();
-        }
-    }
-
-    return worldTM;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM)
-{
-    // Update the Position, Rotation and Scale tracks.
-    AZStd::vector<AnimParamType> animParamTypes{ AnimParamType::Position, AnimParamType::Rotation, AnimParamType::Scale };
-    for (AnimParamType animParamType : animParamTypes)
-    {
-        CTrackViewTrack* track = GetTrackForParameter(animParamType);
-        if (track != nullptr)
-        {
-            track->UpdateKeyDataAfterParentChanged(oldParentWorldTM, newParentWorldTM);
-        }
-    }
-
-    // Refresh after key data changed or parent changed.
-    CTrackViewSequence* sequence = GetSequence();
-    if (sequence != nullptr)
-    {
-        sequence->OnKeysChanged();
-    }
-}
-
-void CTrackViewAnimNode::OnTransformChanged(
-    [[maybe_unused]] const AZ::Transform& local, [[maybe_unused]] const AZ::Transform& world)
-{
-    UpdateTrackGizmo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewAnimNode::OnParentChanged(AZ::EntityId oldParent, AZ::EntityId newParent)
-{
-    // If the change is from no parent to parent, or the other way around,
-    // update the key data, because that action is like going from world space to
-    // relative to a new parent.
-    if (!oldParent.IsValid() || !newParent.IsValid())
-    {
-        // Get the world transforms, Identity if there was no parent
-        AZ::Transform oldParentWorldTM = GetEntityWorldTM(oldParent);
-        AZ::Transform newParentWorldTM = GetEntityWorldTM(newParent);
-
-        UpdateKeyDataAfterParentChanged(oldParentWorldTM, newParentWorldTM);
-    }
-
-    // Refresh after key data changed or parent changed.
-    CTrackViewSequence* sequence = GetSequence();
-    if (sequence != nullptr)
-    {
-        sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged);
-    }
-}
-
-void CTrackViewAnimNode::OnParentTransformWillChange(AZ::Transform oldTransform, AZ::Transform newTransform) 
-{ 
-    // Only used in circumstances where modified keys are required, but OnParentChanged 
-    // message will not be received for some reason, e.g. node being cloned in memory 
-    UpdateKeyDataAfterParentChanged(oldTransform, newTransform);
-
-    CTrackViewSequence* sequence = GetSequence();
-    if (sequence != nullptr)
-    {
-        sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged);
-    }
-}
-
-void CTrackViewAnimNode::RegisterEditorObjectListeners(const AZ::EntityId entityId)
-{
-    EntitySelectionEvents::Bus::Handler::BusConnect(entityId);
-}
-
-void CTrackViewAnimNode::UnRegisterEditorObjectListeners()
-{
-    EntitySelectionEvents::Bus::Handler::BusDisconnect();
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewAnimNode.h b/Code/Sandbox/Editor/TrackView/TrackViewAnimNode.h
deleted file mode 100644
index e09312a147..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewAnimNode.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <AzCore/std/containers/map.h>
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/Component/EntityBus.h>
-#include <AzFramework/Entity/EntityContextBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzCore/Component/TransformBus.h>
-
-#include "TrackViewNode.h"
-#include "TrackViewTrack.h"
-#include "Objects/TrackGizmo.h"
-
-class CTrackViewAnimNode;
-class QWidget;
-
-// Represents a bundle of anim nodes
-class CTrackViewAnimNodeBundle
-{
-public:
-    unsigned int GetCount() const { return m_animNodes.size(); }
-    CTrackViewAnimNode* GetNode(const unsigned int index) { return m_animNodes[index]; }
-    const CTrackViewAnimNode* GetNode(const unsigned int index) const { return m_animNodes[index]; }
-
-    void Clear();
-    const bool DoesContain(const CTrackViewNode* pTargetNode);
-
-    void AppendAnimNode(CTrackViewAnimNode* pNode);
-    void AppendAnimNodeBundle(const CTrackViewAnimNodeBundle& bundle);
-
-    void ExpandAll(bool bAlsoExpandParentNodes = true);
-    void CollapseAll();
-
-private:
-    std::vector<CTrackViewAnimNode*> m_animNodes;
-};
-
-// Callback called by animation node when its animated.
-class IAnimNodeAnimator
-{
-public:
-    virtual ~IAnimNodeAnimator() {}
-
-    virtual void Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac) = 0;
-    virtual void Render([[maybe_unused]] CTrackViewAnimNode* pNode, [[maybe_unused]] const SAnimContext& ac) {}
-
-    // Called when binding/unbinding the owning node
-    virtual void Bind([[maybe_unused]] CTrackViewAnimNode* pNode) {}
-    virtual void UnBind([[maybe_unused]] CTrackViewAnimNode* pNode) {}
-};
-
-////////////////////////////////////////////////////////////////////////////
-//
-// This class represents a IAnimNode in TrackView and contains
-// the editor side code for changing it
-//
-// It does *not* have ownership of the IAnimNode, therefore deleting it
-// will not destroy the CryMovie track
-//
-////////////////////////////////////////////////////////////////////////////
-class CTrackViewAnimNode
-    : public CTrackViewNode
-    , public IAnimNodeOwner
-    , public ITransformDelegate
-    , public AzToolsFramework::EditorEntityContextNotificationBus::Handler
-    , public AZ::EntityBus::Handler
-    , private AZ::TransformNotificationBus::Handler
-    , private AzToolsFramework::EntitySelectionEvents::Bus::Handler
-{
-public:
-    CTrackViewAnimNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode);
-    ~CTrackViewAnimNode();
-
-    // Rendering
-    virtual void Render(const SAnimContext& ac);
-
-    // Playback
-    virtual void Animate(const SAnimContext& animContext);
-
-    // Binding/Unbinding
-    virtual void BindToEditorObjects();
-    virtual void UnBindFromEditorObjects();
-    virtual bool IsBoundToEditorObjects() const;
-
-    // Console sync
-    virtual void SyncToConsole(SAnimContext& animContext);
-
-    // CTrackViewAnimNode
-    virtual ETrackViewNodeType GetNodeType() const override { return eTVNT_AnimNode; }
-
-    // Create & remove sub anim nodes
-    virtual CTrackViewAnimNode* CreateSubNode(
-        const QString& name, const AnimNodeType animNodeType, AZ::EntityId entityId = AZ::EntityId(),
-        AZ::Uuid componentTypeId = AZ::Uuid::CreateNull(), AZ::ComponentId componenId=AZ::InvalidComponentId);
-    virtual void RemoveSubNode(CTrackViewAnimNode* pSubNode);
-
-    // Create & remove sub tracks
-    virtual CTrackViewTrack* CreateTrack(const CAnimParamType& paramType);
-    virtual void RemoveTrack(CTrackViewTrack* pTrack);
-
-    // Add selected entities from scene to group node
-    virtual CTrackViewAnimNodeBundle AddSelectedEntities(const AZStd::vector<AnimParamType>& tracks);
-
-    // Add current layer to group node
-    virtual void AddCurrentLayer();
-
-    // Director related
-    virtual void SetAsActiveDirector();
-    virtual bool IsActiveDirector() const;
-
-    // Checks if anim node is part of active sequence and of an active director
-    virtual bool IsActive();
-
-    // Set as view camera
-    virtual void SetAsViewCamera();
-
-    // Name setter/getter
-    virtual const char* GetName() const override { return m_animNode->GetName(); }
-    virtual bool SetName(const char* pName) override;
-    virtual bool CanBeRenamed() const override;
-
-    // Node owner setter/getter
-    virtual void SetNodeEntityId(AZ::EntityId entityId);
-    virtual AZ::EntityId GetNodeEntityId(const bool bSearch = true);
-
-    AZ::EntityId GetAzEntityId() const { return m_animNode ? m_animNode->GetAzEntityId() : AZ::EntityId(); }
-    bool IsBoundToAzEntity() const { return m_animNode ? m_animNode->GetAzEntityId().IsValid(): false; }
-
-    // Snap time value to prev/next key in sequence
-    virtual bool SnapTimeToPrevKey(float& time) const override;
-    virtual bool SnapTimeToNextKey(float& time) const override;
-
-    // Expanded state interface
-    void SetExpanded(bool expanded) override;
-    bool GetExpanded() const override;
-
-    // Node getters
-    CTrackViewAnimNodeBundle GetAllAnimNodes();
-    CTrackViewAnimNodeBundle GetSelectedAnimNodes();
-    CTrackViewAnimNodeBundle GetAllOwnedNodes(AZ::EntityId entityId);
-    CTrackViewAnimNodeBundle GetAnimNodesByType(AnimNodeType animNodeType);
-    CTrackViewAnimNodeBundle GetAnimNodesByName(const char* pName);
-
-    // Track getters
-    virtual CTrackViewTrackBundle GetAllTracks();
-    virtual CTrackViewTrackBundle GetSelectedTracks();
-    virtual CTrackViewTrackBundle GetTracksByParam(const CAnimParamType& paramType) const;
-
-    // Key getters
-    virtual CTrackViewKeyBundle GetAllKeys() override;
-    virtual CTrackViewKeyBundle GetSelectedKeys() override;
-    virtual CTrackViewKeyBundle GetKeysInTimeRange(const float t0, const float t1) override;
-
-    // Type getters
-    AnimNodeType GetType() const;
-
-    // Flags
-    EAnimNodeFlags GetFlags() const;
-    bool AreFlagsSetOnNodeOrAnyParent(EAnimNodeFlags flagsToCheck) const;
-
-    // Disabled state
-    virtual void SetDisabled(bool bDisabled) override;
-    virtual bool IsDisabled() const override;
-    bool CanBeEnabled() const override;
-
-    // Return track assigned to the specified parameter.
-    CTrackViewTrack* GetTrackForParameter(const CAnimParamType& paramType, uint32 index = 0) const;
-
-    // Rotation/Position & Scale
-    void SetPos(const Vec3& position);
-    Vec3 GetPos() const { return m_animNode->GetPos(); }
-    void SetScale(const Vec3& scale);
-    Vec3 GetScale() const { return m_animNode->GetScale(); }
-    void SetRotation(const Quat& rotation);
-    Quat GetRotation() const { return m_animNode->GetRotate(); }
-    Quat GetRotation(float time) const { return m_animNode != nullptr ? m_animNode->GetRotate(time) : Quat(0,0,0,0); }
-
-    // Param
-    unsigned int GetParamCount() const;
-    CAnimParamType GetParamType(unsigned int index) const;
-    const char* GetParamName(const CAnimParamType& paramType) const;
-    bool IsParamValid(const CAnimParamType& param) const;
-    IAnimNode::ESupportedParamFlags GetParamFlags(const CAnimParamType& paramType) const;
-    AnimValueType GetParamValueType(const CAnimParamType& paramType) const;
-    void UpdateDynamicParams();
-
-    // Parameter getters/setters
-    template <class Type>
-    bool SetParamValue(const float time, const CAnimParamType& param, const Type& value)
-    {
-        AZ_Assert(m_animNode, "Expected valid m_animNode");
-        return m_animNode->SetParamValue(time, param, value);
-    }
-
-    template <class Type>
-    bool GetParamValue(const float time, const CAnimParamType& param, Type& value)
-    {
-        AZ_Assert(m_animNode, "Expected valid m_animNode");
-        return m_animNode->GetParamValue(time, param, value);
-    }
-
-    // Check if it's a group node
-    virtual bool IsGroupNode() const override;
-
-    // Generate a new node name
-    virtual QString GetAvailableNodeNameStartingWith(const QString& name) const;
-
-    // Copy/Paste nodes
-    virtual void CopyNodesToClipboard(const bool bOnlySelected, QWidget* context);
-    virtual bool PasteNodesFromClipboard(QWidget* context);
-
-    // Set new parent
-    virtual void SetNewParent(CTrackViewAnimNode* pNewParent);
-
-    // Check if this node may be moved to new parent
-    virtual bool IsValidReparentingTo(CTrackViewAnimNode* pNewParent);
-
-    int GetDefaultKeyTangentFlags() const { return m_animNode ? m_animNode->GetDefaultKeyTangentFlags() : SPLINE_KEY_TANGENT_UNIFIED; }
-    
-    void SetComponent(AZ::ComponentId componentId, const AZ::Uuid& componentTypeId);
-
-    // returns the AZ::ComponentId of the component associated with this node if it is of type AnimNodeType::Component, InvalidComponentId otherwise
-    AZ::ComponentId GetComponentId() const;
-
-    // IAnimNodeOwner
-    void MarkAsModified() override;
-    // ~IAnimNodeOwner
-
-    // Compares all of the node's track values at the given time with the associated property value and 
-    //     sets a key at that time if they are different to match the latter
-    // Returns the number of keys set
-    int SetKeysForChangedTrackValues(float time) { return m_animNode->SetKeysForChangedTrackValues(time); }
-
-    // returns true if this node is associated with an AnimNodeType::AzEntity node and contains a component with the given id
-    bool ContainsComponentWithId(AZ::ComponentId componentId) const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorEntityContextNotificationBus implementation
-    void OnStartPlayInEditor() override;
-    void OnStopPlayInEditor() override;
-    //~AzToolsFramework::EditorEntityContextNotificationBus implementation
-
-    //////////////////////////////////////////////////////////////////////////
-    // AZ::EntityBus
-    void OnEntityActivated(const AZ::EntityId& entityId) override;
-    void OnEntityDestruction(const AZ::EntityId& entityId) override;
-    //~AZ::EntityBus 
-
-    //////////////////////////////////////////////////////////////////////////
-    //! AZ::TransformNotificationBus::Handler
-    void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-    void OnParentChanged(AZ::EntityId oldParent, AZ::EntityId newParent) override;
-    void OnParentTransformWillChange(AZ::Transform oldTransform, AZ::Transform newTransform) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    void OnEntityRemoved();
-
-    // Creates a sub-node for the given component. Returns a pointer to the created component sub-node
-    CTrackViewAnimNode* AddComponent(const AZ::Component* component, bool disabled);
-
-    // Depth-first search for TrackViewAnimNode associated with the given animNode. Returns the first match found or nullptr if not found
-    CTrackViewAnimNode* FindNodeByAnimNode(const IAnimNode* animNode);
-
-protected:
-    IAnimNode* GetAnimNode() { return m_animNode.get(); }
-
-private:
-    // Copy selected keys to XML representation for clipboard
-    virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) override;
-
-    void CopyNodesToClipboardRec(CTrackViewAnimNode* pCurrentAnimNode, XmlNodeRef& xmlNode, const bool bOnlySelected);
-
-    void PasteTracksFrom(XmlNodeRef& xmlNodeWithTracks);
-
-    bool HasObsoleteTrackRec(CTrackViewNode* pCurrentNode) const;
-    CTrackViewTrackBundle GetTracks(const bool bOnlySelected, const CAnimParamType& paramType) const;
-
-    void PasteNodeFromClipboard(AZStd::map<int, IAnimNode*>& copiedIdToNodeMap, XmlNodeRef xmlNode);
-
-    void SetPosRotScaleTracksDefaultValues(bool positionAllowed = true, bool rotationAllowed = true, bool scaleAllowed = true);
-
-    void UpdateTrackGizmo();
-
-    bool CheckTrackAnimated(const CAnimParamType& paramType) const;
-
-    // IAnimNodeOwner
-    void OnNodeVisibilityChanged(IAnimNode* pNode, const bool bHidden) override;
-    void OnNodeReset(IAnimNode* pNode) override;
-    // ~IAnimNodeOwner
-
-    // ITransformDelegate
-    void MatrixInvalidated() override;
-
-    Vec3 GetTransformDelegatePos(const Vec3& realPos) const override;
-    Quat GetTransformDelegateRotation(const Quat& realRotation) const override;
-    Vec3 GetTransformDelegateScale(const Vec3& realScale) const override;
-
-    void SetTransformDelegatePos(const Vec3& position) override;
-    void SetTransformDelegateRotation(const Quat& rotation) override;
-    void SetTransformDelegateScale(const Vec3& scale) override;
-
-    // If those return true the base object uses its own transform instead
-    bool IsPositionDelegated() const override;
-    bool IsRotationDelegated() const override;
-    bool IsScaleDelegated() const override;
-    // ~ITransformDelegate
-
-    // Helper for Is<Position/Rotation/Scale>Delegated to call internally
-    bool IsTransformAnimParamTypeDelegated(AnimParamType animParamType) const;
-
-    // EntitySelectionEvents
-    void OnSelected() override;
-    void OnDeselected() override;
-
-    void OnSelectionChanged(bool selected);
-
-    void UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM);
-
-    // Used to track Editor object listener registration
-    void RegisterEditorObjectListeners(AZ::EntityId entityId);
-    void UnRegisterEditorObjectListeners();
-
-    // Helper functions
-    static void RemoveChildNode(CTrackViewAnimNode* child);
-    static AZ::Transform GetEntityWorldTM(AZ::EntityId entityId);
-    static void SetParentsInChildren(CTrackViewAnimNode* currentNode);
-
-    IAnimSequence* m_animSequence;
-    AZStd::intrusive_ptr<IAnimNode> m_animNode;
-    AZ::EntityId m_nodeEntityId;
-    AZStd::unique_ptr<IAnimNodeAnimator> m_pNodeAnimator;
-    _smart_ptr<CGizmo> m_trackGizmo;
-
-    // used to stash the Editor sequence and node entity Ids when we switch to game mode from the editor
-    AZ::EntityId    m_stashedAnimNodeEditorAzEntityId;
-    AZ::EntityId    m_stashedAnimSequenceEditorAzEntityId;
-
-    // Used to track Editor object listener registration
-    AZ::EntityId m_entityIdListenerRegistered;
-
-    // used to return a const reference to a null Uuid
-    static const AZ::Uuid s_nullUuid;
-};
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.cpp b/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.cpp
deleted file mode 100644
index 1f81274abb..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.cpp
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewCurveEditor.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "TrackView/ui_TrackViewCurveEditor.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-#define IDC_TRACKVIEWGRAPH_CURVE 1
-#define IDC_TIMELINE             2
-
-#define IDC_HORIZON_SLIDER      3
-#define IDC_VERTICAL_SLIDER     4
-
-//! It's for mapping from a slider control range to a real zoom range, and vice versa.
-#define SLIDER_MULTIPLIER       100.f
-#define SLIDERRANGE_TO_ZOOM(SLIDERVALUE)    (float)SLIDERVALUE / SLIDER_MULTIPLIER
-#define ZOOMRANGE_TO_SLIDER(ZOOMVALUE)      (int)(ZOOMVALUE * SLIDER_MULTIPLIER)
-
-
-//////////////////////////////////////////////////////////////////////////
-TrackViewCurveEditorDialog::TrackViewCurveEditorDialog(QWidget* parent)
-    : QWidget(parent)
-{
-    m_widget = new CTrackViewCurveEditor(this);
-    QVBoxLayout* l = new QVBoxLayout;
-    l->setMargin(0);
-    l->addWidget(m_widget);
-    setLayout(l);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewCurveEditor::CTrackViewCurveEditor(QWidget* parent)
-    : QWidget(parent)
-    , m_ui(new Ui::TrackViewCurveEditor)
-{
-    m_ui->setupUi(this);
-    m_bLevelClosing = false;
-    m_bIgnoreSelfEvents = false;
-    GetIEditor()->RegisterNotifyListener(this);
-    GetIEditor()->GetAnimation()->AddListener(this);
-
-    m_timelineCtrl.SetTimeRange(Range(0, 1));
-    m_timelineCtrl.SetTicksTextScale(1.0f);
-
-    m_ui->m_wndSpline->SetTimelineCtrl(&m_timelineCtrl);
-
-    connect(&m_timelineCtrl, &TimelineWidget::change, this, &CTrackViewCurveEditor::OnTimelineChange);
-    connect(m_ui->m_wndSpline, &SplineWidget::change, this, &CTrackViewCurveEditor::OnSplineChange);
-    connect(m_ui->m_wndSpline, &SplineWidget::timeChange, this, &CTrackViewCurveEditor::OnSplineTimeMarkerChange);
-
-    connect(m_ui->buttonTangentAuto,      &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_AUTO); });
-    connect(m_ui->buttonTangentInZero,    &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_IN_ZERO); });
-    connect(m_ui->buttonTangentInStep,    &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_IN_STEP); });
-    connect(m_ui->buttonTangentInLinear,  &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_IN_LINEAR); });
-    connect(m_ui->buttonTangentOutZero,   &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_OUT_ZERO); });
-    connect(m_ui->buttonTangentOutStep,   &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_OUT_STEP); });
-    connect(m_ui->buttonTangentOutLinear, &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_OUT_LINEAR); });
-    connect(m_ui->buttonSplineFitX,       &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_SPLINE_FIT_X); });
-    connect(m_ui->buttonSplineFitY,       &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_SPLINE_FIT_Y); });
-    connect(m_ui->buttonSplineSnapGridX,  &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_SPLINE_SNAP_GRID_X); });
-    connect(m_ui->buttonSplineSnapGridY,  &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_SPLINE_SNAP_GRID_Y); });
-    connect(m_ui->buttonTangentUnify,     &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_TANGENT_UNIFY); });
-    connect(m_ui->buttonFreezeKeys,       &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_FREEZE_KEYS); });
-    connect(m_ui->buttonFreezeTangents,   &QToolButton::clicked, this, [&]() {OnSplineCmd(ID_FREEZE_TANGENTS); });
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewCurveEditor::~CTrackViewCurveEditor()
-{
-    GetIEditor()->GetAnimation()->RemoveListener(this);
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-
-
-// CTrackViewGraph message handlers
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnSequenceChanged([[maybe_unused]] CTrackViewSequence* pSequence)
-{
-    UpdateSplines();
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    if (m_bIgnoreSelfEvents)
-    {
-        return;
-    }
-    switch (event)
-    {
-    case eNotify_OnCloseScene:
-        m_ui->m_wndSpline->RemoveAllSplines();
-        m_bLevelClosing = true;
-        break;
-    case eNotify_OnBeginNewScene:
-    case eNotify_OnBeginSceneOpen:
-        m_bLevelClosing = false;
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::UpdateSplines()
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!pSequence || m_bLevelClosing)
-    {
-        // No sequence selected, remove any splines.
-        if (nullptr != m_ui)
-        {
-            if (nullptr != m_ui->m_wndSpline)
-            {
-                m_ui->m_wndSpline->RemoveAllSplines();
-            }
-        }
-
-        return;
-    }
-
-    CTrackViewTrackBundle selectedTracks;
-    selectedTracks = pSequence->GetSelectedTracks();
-
-    std::set<CTrackViewTrack*> oldTracks;
-    for (auto iter = m_ui->m_wndSpline->GetTracks().begin(); iter != m_ui->m_wndSpline->GetTracks().end(); ++iter)
-    {
-        CTrackViewTrack* pTrack = *iter;
-        oldTracks.insert(pTrack);
-    }
-
-    std::set<CTrackViewTrack*> newTracks;
-    if (selectedTracks.AreAllOfSameType())
-    {
-        for (int i = 0; i < selectedTracks.GetCount(); i++)
-        {
-            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
-
-            if (pTrack->IsCompoundTrack())
-            {
-                unsigned int numChildTracks = pTrack->GetChildCount();
-                for (unsigned int ii = 0; ii < numChildTracks; ++ii)
-                {
-                    CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(ii));
-                    newTracks.insert(pChildTrack);
-                }
-            }
-            else
-            {
-                newTracks.insert(pTrack);
-            }
-        }
-    }
-
-    if (oldTracks == newTracks)
-    {
-        return;
-    }
-
-    m_ui->m_wndSpline->RemoveAllSplines();
-    for (auto iter = newTracks.begin(); iter != newTracks.end(); ++iter)
-    {
-        AddSpline(*iter);
-    }
-
-    UpdateTimeRange(pSequence);
-
-    // If it is a rotation track, adjust the default value range properly to accommodate some degree values.
-    if (selectedTracks.HasRotationTrack())
-    {
-        m_ui->m_wndSpline->SetDefaultValueRange(Range(-180.0f, 180.0f));
-    }
-    else
-    {
-        m_ui->m_wndSpline->SetDefaultValueRange(Range(-1.1f, 1.1f));
-    }
-
-    ResetSplineCtrlZoomLevel();
-
-    return;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::AddSpline(CTrackViewTrack* pTrack)
-{
-    if (!pTrack->GetSpline())
-    {
-        return;
-    }
-
-    const int subTrackIndex = pTrack->GetSubTrackIndex();
-
-    if (subTrackIndex >= 0)
-    {
-        QColor trackColor = QColor(255, 0, 0);
-        switch (subTrackIndex)
-        {
-        case 0:
-            trackColor = QColor(255, 0, 0);
-            break;
-        case 1:
-            trackColor = QColor(0, 255, 0);
-            break;
-        case 2:
-            trackColor = QColor(0, 0, 255);
-            break;
-        case 3:
-            trackColor = QColor(255, 255, 0);
-            break;
-        }
-
-        m_ui->m_wndSpline->AddSpline(pTrack->GetSpline(), pTrack, trackColor);
-    }
-    else
-    {
-        QColor    afColorArray[4];
-        afColorArray[0] = QColor(255, 0, 0);
-        afColorArray[1] = QColor(0, 255, 0);
-        afColorArray[2] = QColor(0, 0, 255);
-        afColorArray[3] = QColor(255, 0, 255); //Pink... so you know it's wrong if you see it.
-
-        m_ui->m_wndSpline->AddSpline(pTrack->GetSpline(), pTrack, afColorArray);
-    }
-}
-
-void CTrackViewCurveEditor::showEvent(QShowEvent* event)
-{
-    QWidget::showEvent(event);
-    OnSplineCmdUpdateUI();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnSplineChange()
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (pSequence)
-    {
-        pSequence->OnKeysChanged();
-    }
-
-    // In the end, focus this again in order to properly catch 'KeyDown' messages.
-    m_ui->m_wndSpline->setFocus();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnSplineCmd(UINT cmd)
-{
-    m_ui->m_wndSpline->OnUserCommand(cmd);
-    OnSplineCmdUpdateUI();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnSplineCmdUpdateUI()
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (m_bLevelClosing || !pSequence)
-    {
-        return;
-    }
-
-    m_ui->buttonSplineSnapGridX->setChecked(m_ui->m_wndSpline->IsSnapTime());
-    m_ui->buttonSplineSnapGridY->setChecked(m_ui->m_wndSpline->IsSnapValue());
-    m_ui->buttonTangentUnify->setChecked(m_ui->m_wndSpline->IsUnifiedKeyCurrentlySelected());
-    m_ui->buttonFreezeKeys->setChecked(m_ui->m_wndSpline->IsKeysFrozen());
-    m_ui->buttonFreezeTangents->setChecked(m_ui->m_wndSpline->IsTangentsFrozen());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnTimeChanged(float newTime)
-{
-    m_ui->m_wndSpline->SetTimeMarker(newTime);
-    m_ui->m_wndSpline->update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::SetEditLock(bool bLock)
-{
-    m_ui->m_wndSpline->SetEditLock(bLock);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnTimelineChange()
-{
-    float fTime = m_timelineCtrl.GetTimeMarker();
-    GetIEditor()->GetAnimation()->SetTime(fTime);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnSplineTimeMarkerChange()
-{
-    float fTime = m_ui->m_wndSpline->GetTimeMarker();
-    GetIEditor()->GetAnimation()->SetTime(fTime);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::SetFPS(float fps)
-{
-    m_timelineCtrl.SetFPS(fps);
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewCurveEditor::GetFPS() const
-{
-    return m_timelineCtrl.GetFPS();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::SetTickDisplayMode(ETVTickMode mode)
-{
-    if (mode == eTVTickMode_InFrames)
-    {
-        m_timelineCtrl.SetMarkerStyle(TimelineWidget::MARKER_STYLE_FRAMES);
-        m_ui->m_wndSpline->SetTooltipValueScale(GetFPS(), 1.0f);
-    }
-    else if (mode == eTVTickMode_InSeconds)
-    {
-        m_timelineCtrl.SetMarkerStyle(TimelineWidget::MARKER_STYLE_SECONDS);
-        m_ui->m_wndSpline->SetTooltipValueScale(1.0f, 1.0f);
-    }
-
-    m_timelineCtrl.update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::ResetSplineCtrlZoomLevel()
-{
-    m_ui->m_wndSpline->FitSplineToViewHeight();
-    m_ui->m_wndSpline->FitSplineToViewWidth();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnKeysChanged([[maybe_unused]] CTrackViewSequence* pSequence)
-{
-    m_ui->m_wndSpline->update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle)
-{
-    EAnimCurveType trType = addedKeyHandle.GetTrack()->GetCurveType();
-    if (trType == eAnimCurveType_BezierFloat)
-    {
-        // we query the added key's track to find the default tangent flags to use for newly created keys
-        const int tangentFlagsForNewKeys = addedKeyHandle.GetTrack()->GetAnimNode()->GetDefaultKeyTangentFlags();
-        I2DBezierKey bezierKey;
-        addedKeyHandle.GetKey(&bezierKey);
-
-        // clear any existing in and out tangent flags
-        bezierKey.flags &= ~SPLINE_KEY_TANGENT_ALL_MASK;
-
-        // set tangent flags to the default tangent flags used for the track's animNode and save them
-        bezierKey.flags |= tangentFlagsForNewKeys;
-        addedKeyHandle.SetKey(&bezierKey);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnKeySelectionChanged([[maybe_unused]] CTrackViewSequence* pSequence)
-{
-    if (isVisible())
-    {
-        m_ui->m_wndSpline->update();
-        m_ui->buttonTangentUnify->setChecked(m_ui->m_wndSpline->IsUnifiedKeyCurrentlySelected());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnNodeChanged([[maybe_unused]] CTrackViewNode* pNode, ENodeChangeType type)
-{
-    if (isVisible() && type == ITrackViewSequenceListener::eNodeChangeType_Removed)
-    {
-        UpdateSplines();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewCurveEditor::OnNodeSelectionChanged([[maybe_unused]] CTrackViewSequence* pSequence)
-{
-    if (isVisible())
-    {
-        UpdateSplines();
-    }
-}
-
-void CTrackViewCurveEditor::OnSequenceSettingsChanged(CTrackViewSequence* pSequence)
-{
-    if (isVisible())
-    {
-        UpdateTimeRange(pSequence);
-        m_timelineCtrl.update();
-        m_ui->m_wndSpline->update();
-    }
-}
-
-void CTrackViewCurveEditor::UpdateTimeRange(CTrackViewSequence* pSequence)
-{
-    Range timeRange =   pSequence->GetTimeRange();
-    m_ui->m_wndSpline->SetTimeRange(timeRange);
-    m_timelineCtrl.SetTimeRange(timeRange);
-    m_ui->m_wndSpline->SetValueRange(Range(-2000.0f, 2000.0f));
-}
-
-void CTrackViewCurveEditor::SetPlayCallback(const std::function<void()>& callback)
-{
-    m_ui->m_wndSpline->SetPlayCallback(callback);
-    m_timelineCtrl.SetPlayCallback(callback);
-}
-
-CTrackViewSplineCtrl& CTrackViewCurveEditor::GetSplineCtrl()
-{
-    return *m_ui->m_wndSpline;
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.h b/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.h
deleted file mode 100644
index 379bdf9942..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWCURVEEDITOR_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWCURVEEDITOR_H
-#pragma once
-
-
-#include "TrackViewDopeSheetBase.h"
-#include "TrackViewSplineCtrl.h"
-#include "Controls/TimelineCtrl.h"
-#include "TrackViewTimeline.h"
-
-#include <QWidget>
-
-namespace Ui
-{
-    class TrackViewCurveEditor;
-}
-
-/** CTrackViewGraph dialog.
-        Placed at the same position as tracks dialog, and display spline graphs of track.
-*/
-class CTrackViewCurveEditor
-    : public QWidget
-    , public IAnimationContextListener
-    , public IEditorNotifyListener
-    , public ITrackViewSequenceListener
-{
-    friend class TrackViewCurveEditorDialog;
-public:
-    CTrackViewCurveEditor(QWidget* parent);
-    virtual ~CTrackViewCurveEditor();
-
-    void SetEditLock(bool bLock);
-
-    void SetFPS(float fps);
-    float GetFPS() const;
-    void SetTickDisplayMode(ETVTickMode mode);
-
-    CTrackViewSplineCtrl& GetSplineCtrl();
-    void ResetSplineCtrlZoomLevel();
-
-    void SetPlayCallback(const std::function<void()>& callback);
-
-    // IAnimationContextListener
-    virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence);
-    virtual void OnTimeChanged(float newTime);
-
-protected:
-    void showEvent(QShowEvent* event) override;
-
-private:
-
-    void OnSplineChange();
-    void OnSplineCmd(UINT cmd);
-    void OnSplineCmdUpdateUI();
-    void OnTimelineChange();
-    void OnSplineTimeMarkerChange();
-
-    // IEditorNotifyListener
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
-
-    //ITrackViewSequenceListener
-    void OnKeysChanged(CTrackViewSequence* pSequence) override;
-    void OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle) override;
-    void OnKeySelectionChanged(CTrackViewSequence* pSequence) override;
-    void OnNodeChanged(CTrackViewNode* pNode, ENodeChangeType type) override;
-    void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override;
-    void OnSequenceSettingsChanged(CTrackViewSequence* pSequence) override;
-    //~ITrackViewSequenceListener
-
-    void UpdateSplines();
-    void UpdateTimeRange(CTrackViewSequence* pSequence);
-
-    void AddSpline(CTrackViewTrack* pTrack);
-
-    TrackView::CTrackViewTimelineWidget m_timelineCtrl;
-
-    bool m_bIgnoreSelfEvents;
-
-    bool m_bLevelClosing;
-
-    QScopedPointer<Ui::TrackViewCurveEditor> m_ui;
-};
-
-class TrackViewCurveEditorDialog
-    : public QWidget
-    , public ITrackViewSequenceListener
-    , public IAnimationContextListener
-{
-public:
-    TrackViewCurveEditorDialog(QWidget* parent);
-    virtual ~TrackViewCurveEditorDialog() {}
-
-    void SetPlayCallback(const std::function<void()>& callback) { m_widget->SetPlayCallback(callback); }
-
-    void SetEditLock(bool bLock) { m_widget->SetEditLock(bLock); }
-
-    CTrackViewSplineCtrl& GetSplineCtrl(){ return m_widget->GetSplineCtrl(); }
-
-    void SetFPS(float fps) { m_widget->SetFPS(fps); }
-    float GetFPS() const { return m_widget->GetFPS(); }
-    void SetTickDisplayMode(ETVTickMode mode) { m_widget->SetTickDisplayMode(mode); }
-
-    virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence) { m_widget->OnSequenceChanged(pNewSequence); }
-    virtual void OnTimeChanged(float newTime) { m_widget->OnTimeChanged(newTime); }
-
-    // ITrackViewSequenceListener delegation to m_widget
-    void OnKeysChanged(CTrackViewSequence* pSequence) override { m_widget->OnKeysChanged(pSequence); }
-    void OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle) override { m_widget->OnKeyAdded(addedKeyHandle); }
-    void OnKeySelectionChanged(CTrackViewSequence* pSequence) override { m_widget->OnKeySelectionChanged(pSequence); }
-    void OnNodeChanged(CTrackViewNode* pNode, ENodeChangeType type) override { m_widget->OnNodeChanged(pNode, type); }
-    void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override { m_widget->OnNodeSelectionChanged(pSequence); }
-    void OnSequenceSettingsChanged(CTrackViewSequence* pSequence) override { m_widget->OnSequenceSettingsChanged(pSequence); }
-    //~ITrackViewSequenceListener
-
-private:
-    CTrackViewCurveEditor* m_widget;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWCURVEEDITOR_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp b/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
deleted file mode 100644
index cef9d1b08e..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
+++ /dev/null
@@ -1,2344 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CTrackViewDialog Implementation file.
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewDialog.h"
-
-// Qt
-#include <QFileDialog>
-#include <QSplitter>
-#include <QToolBar>
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QAction>
-#include <QMessageBox>
-#include <QMenuBar>
-#include <QMenu>
-#include <QInputDialog>
-#include <QComboBox>
-#include <QSettings>
-#include <QToolButton>
-
-// AzFramework
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/StyledDockWidget.h>
-
-// CryCommon
-#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-
-// Editor
-#include "Settings.h"
-#include "Util/fastlib.h"
-#include "Objects/SelectionGroup.h"
-#include "TVSequenceProps.h"
-#include "TrackViewFindDlg.h"
-#include "SequenceBatchRenderDialog.h"
-#include "TVCustomizeTrackColorsDlg.h"
-#include "PluginManager.h"
-#include "Util/3DConnexionDriver.h"
-#include "TrackViewNewSequenceDialog.h"
-#include "FBXExporterDialog.h"
-#include "CryEditDoc.h"
-#include "LyViewPaneNames.h"
-
-//////////////////////////////////////////////////////////////////////////
-inline namespace TrackViewInternal
-{
-    const char* s_kTrackViewLayoutSection = "TrackViewLayout";
-    const char* s_kTrackViewSection = "DockingPaneLayouts\\TrackView";
-    const char* s_kSplitterEntry = "Splitter";
-    const char* s_kVersionEntry = "TrackViewLayoutVersion";
-
-    const char* s_kTrackViewSettingsSection = "TrackView";
-    const char* s_kSnappingModeEntry = "SnappingMode";
-    const char* s_kFrameSnappingFPSEntry = "FrameSnappingFPS";
-    const char* s_kTickDisplayModeEntry = "TickDisplayMode";
-    const char* s_kDefaultTracksEntry = "DefaultTracks2";
-
-    const char* s_kRebarVersionEntry = "TrackViewReBarVersion";
-    const char* s_kRebarBandEntryPrefix = "ReBarBand";
-
-    const char* s_kNoSequenceComboBoxEntry = "--- No Sequence ---";
-
-    const int s_kMinimumFrameSnappingFPS = 1;
-    const int s_kMaximumFrameSnappingFPS = 120;
-
-    const int TRACKVIEW_LAYOUT_VERSION = 0x0001; // Bump this up on every substantial pane layout change
-    const int TRACKVIEW_REBAR_VERSION = 0x0002; // Bump this up on every substantial rebar change
-
-    CTrackViewSequence* GetSequenceByEntityIdOrName(const CTrackViewSequenceManager* pSequenceManager, const char* entityIdOrName)
-    {
-        // the "name" string will be an AZ::EntityId in string form if this was called from
-        // TrackView code. But for backward compatibility we also support a sequence name.
-        bool isNameAValidU64 = false;
-        QString entityIdString = entityIdOrName;
-        AZ::u64 nameAsU64 = entityIdString.toULongLong(&isNameAValidU64);
-
-        CTrackViewSequence* pSequence = nullptr;
-        if (isNameAValidU64)
-        {
-            // "name" string was a valid u64 represented as a string. Use as an entity Id to search for sequence.
-            pSequence = pSequenceManager->GetSequenceByEntityId(AZ::EntityId(nameAsU64));
-        }
-
-        if (!pSequence)
-        {
-            // name passed in could not find a sequence by using it as an EntityId. Use it as a
-            // sequence name for backward compatibility
-            pSequence = pSequenceManager->GetSequenceByName(entityIdOrName);
-        }
-
-        return pSequence;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::RegisterViewClass()
-{
-    AzToolsFramework::ViewPaneOptions opts;
-    opts.shortcut = QKeySequence(Qt::Key_T);
-    opts.isDisabledInSimMode = true;
-    opts.showOnToolsToolbar = true;
-    opts.toolbarIcon = ":/Menu/trackview_editor.svg";
-
-    AzToolsFramework::RegisterViewPane<CTrackViewDialog>(LyViewPane::TrackView, LyViewPane::CategoryTools, opts);
-    GetIEditor()->GetSettingsManager()->AddToolName(s_kTrackViewLayoutSection, LyViewPane::TrackView);
-}
-
-const GUID& CTrackViewDialog::GetClassID()
-{
-    static const GUID guid =
-    {
-        0xd21c9fe5, 0x22d3, 0x41e3, { 0xb8, 0x4b, 0xa3, 0x77, 0xaf, 0xa0, 0xa0, 0x5c }
-    };
-    return guid;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewDialog* CTrackViewDialog::s_pTrackViewDialog = NULL;
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewDialog::CTrackViewDialog(QWidget* pParent /*=NULL*/)
-    : QMainWindow(pParent)
-{
-    s_pTrackViewDialog = this;
-    m_bRecord = false;
-    m_bAutoRecord = false;
-    m_bPause = false;
-    m_bPlay = false;
-    m_fLastTime = -1.0f;
-    m_fAutoRecordStep = 0.5f;
-    m_bNeedReloadSequence = false;
-    m_bIgnoreUpdates = false;
-    m_bDoingUndoOperation = false;
-
-    m_findDlg = nullptr;
-
-    m_lazyInitDone = false;
-    m_bEditLock = false;
-
-    m_pNodeForTracksToolBar = NULL;
-
-    m_currentToolBarParamTypeId = 0;
-
-    // Default Tracks created for AZ Entities
-    m_defaultTracksForEntityNode.push_back(AnimParamType::Position);
-    m_defaultTracksForEntityNode.push_back(AnimParamType::Rotation);
-
-    OnInitDialog();
-    AddDialogListeners();
-
-    AZ::EntitySystemBus::Handler::BusConnect();
-    AzToolsFramework::ToolsApplicationNotificationBus::Handler::BusConnect();
-}
-
-CTrackViewDialog::~CTrackViewDialog()
-{
-    AzToolsFramework::ToolsApplicationNotificationBus::Handler::BusDisconnect();
-    AZ::EntitySystemBus::Handler::BusDisconnect();
-
-    SaveLayouts();
-    SaveMiscSettings();
-    SaveTrackColors();
-
-    if (m_findDlg)
-    {
-        m_findDlg->deleteLater();
-        m_findDlg = nullptr;
-    }
-    s_pTrackViewDialog = 0;
-
-    const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-    CTrackViewSequence* sequence = pSequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
-    RemoveSequenceListeners(sequence);
-    RemoveDialogListeners();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnAddEntityNodeMenu()
-{
-    // Toggle the selection
-    QAction* action = static_cast<QAction*>(sender());
-    if (action)
-    {
-        AnimParamType paramTime = static_cast<AnimParamType>(action->data().toInt());
-        auto it = AZStd::find(m_defaultTracksForEntityNode.begin(), m_defaultTracksForEntityNode.end(), paramTime);
-        if (it == m_defaultTracksForEntityNode.end())
-        {
-            m_defaultTracksForEntityNode.push_back(paramTime);
-        }
-        else
-        {
-            m_defaultTracksForEntityNode.erase(it);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-BOOL CTrackViewDialog::OnInitDialog()
-{
-    InitToolbar();
-    InitMenu();
-
-    QWidget* w = new QWidget();
-    QVBoxLayout* l = new QVBoxLayout;
-    l->setMargin(0);
-
-    m_wndSplitter = new QSplitter(w);
-    m_wndSplitter->setOrientation(Qt::Horizontal);
-
-    m_wndNodesCtrl = new CTrackViewNodesCtrl(this, this);
-    m_wndNodesCtrl->SetTrackViewDialog(this);
-
-    m_wndDopeSheet = new CTrackViewDopeSheetBase(this);
-    m_wndDopeSheet->SetTimeRange(0, 20);
-    m_wndDopeSheet->SetTimeScale(100, 0);
-
-    m_wndDopeSheet->SetNodesCtrl(m_wndNodesCtrl);
-    m_wndNodesCtrl->SetDopeSheet(m_wndDopeSheet);
-
-    m_wndSplitter->addWidget(m_wndNodesCtrl);
-    m_wndSplitter->addWidget(m_wndDopeSheet);
-    m_wndSplitter->setStretchFactor(0, 1);
-    m_wndSplitter->setStretchFactor(1, 10);
-    l->addWidget(m_wndSplitter);
-    w->setLayout(l);
-    setCentralWidget(w);
-
-    m_wndKeyProperties = new CTrackViewKeyPropertiesDlg(this);
-    QDockWidget* dw = new AzQtComponents::StyledDockWidget(this);
-    dw->setObjectName("m_wndKeyProperties");
-    dw->setWindowTitle("Key");
-    dw->setWidget(m_wndKeyProperties);
-    addDockWidget(Qt::RightDockWidgetArea, dw);
-    m_wndKeyProperties->PopulateVariables();
-    m_wndKeyProperties->SetKeysCtrl(m_wndDopeSheet);
-
-    m_wndCurveEditorDock = new AzQtComponents::StyledDockWidget(this);
-    m_wndCurveEditorDock->setObjectName("m_wndCurveEditorDock");
-    m_wndCurveEditorDock->setWindowTitle("Curve Editor");
-    m_wndCurveEditor = new TrackViewCurveEditorDialog(this);
-    m_wndCurveEditorDock->setWidget(m_wndCurveEditor);
-    addDockWidget(Qt::BottomDockWidgetArea, m_wndCurveEditorDock);
-    m_wndCurveEditor->SetPlayCallback([this] { OnPlay();
-        });
-
-    InitSequences();
-
-    m_lazyInitDone = false;
-
-    QTimer::singleShot(0, this, SLOT(ReadLayouts()));
-    //  ReadLayouts();
-    ReadMiscSettings();
-    ReadTrackColors();
-
-    QString cursorPosText = QString("0.000(%1fps)").arg(FloatToIntRet(m_wndCurveEditor->GetFPS()));
-    m_cursorPos->setText(cursorPosText);
-
-    return TRUE;  // return TRUE unless you set the focus to a control
-    // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::FillAddSelectedEntityMenu()
-{
-    QMenu* menu = qobject_cast<QMenu*>(sender());
-    menu->clear();
-
-    AZStd::vector<AnimParamType> allTracks = {
-        AnimParamType::Position,
-        AnimParamType::Rotation,
-        AnimParamType::Scale
-    };
-
-    AZStd::map<AnimParamType, QString> paramNames;
-    paramNames[AnimParamType::Position] = "Position";
-    paramNames[AnimParamType::Rotation] = "Rotation",
-    paramNames[AnimParamType::Scale] = "Scale";
-
-    for (AnimParamType track : allTracks)
-    {
-        auto it = AZStd::find(m_defaultTracksForEntityNode.begin(), m_defaultTracksForEntityNode.end(), track);
-        bool checked = (it != m_defaultTracksForEntityNode.end());
-
-        QAction* action = menu->addAction(paramNames[track]);
-        action->setCheckable(true);
-        action->setChecked(checked);
-        action->setData(static_cast<int>(track));
-        action->setEnabled(true);
-        connect(action, &QAction::triggered, this, &CTrackViewDialog::OnAddEntityNodeMenu);
-    }
-}
-
-void CTrackViewDialog::InitToolbar()
-{
-    m_mainToolBar = addToolBar("Sequence/Node Toolbar");
-    m_mainToolBar->setObjectName("m_mainToolBar");
-    m_mainToolBar->setFloatable(false);
-    m_mainToolBar->addWidget(new QLabel("Sequence/Node:"));
-    QAction* qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-00.png"), "Add Sequence");
-    qaction->setData(ID_TV_ADD_SEQUENCE);
-    m_actions[ID_TV_ADD_SEQUENCE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAddSequence);
-    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-01.png"), "Delete Sequence");
-    qaction->setData(ID_TV_DEL_SEQUENCE);
-    m_actions[ID_TV_DEL_SEQUENCE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnDelSequence);
-    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-02.png"), "Edit Sequence Properties");
-    qaction->setData(ID_TV_EDIT_SEQUENCE);
-    m_actions[ID_TV_EDIT_SEQUENCE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnEditSequence);
-    m_sequencesComboBox = new QComboBox(this);
-    m_sequencesComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-    m_sequencesComboBox->setToolTip("Select the sequence");
-    connect(m_sequencesComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnSequenceComboBox()));
-    m_mainToolBar->addWidget(m_sequencesComboBox);
-    m_mainToolBar->addSeparator();
-
-    QToolButton* toolButton = new QToolButton(m_mainToolBar);
-    toolButton->setPopupMode(QToolButton::MenuButtonPopup);
-    qaction = new QAction(QIcon(":/Trackview/main/tvmain-03.png"), "Add Selected Node", this);
-    qaction->setData(ID_ADDNODE);
-    m_actions[ID_ADDNODE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAddSelectedNode);
-    toolButton->setDefaultAction(qaction);
-    {
-        QMenu* buttonMenu = new QMenu(this);
-        toolButton->setMenu(buttonMenu);
-        connect(buttonMenu, &QMenu::aboutToShow, this, &CTrackViewDialog::FillAddSelectedEntityMenu);
-    }
-    m_mainToolBar->addWidget(toolButton);
-
-    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-04.png"), "Add Director Node");
-    qaction->setData(ID_ADDSCENETRACK);
-    m_actions[ID_ADDSCENETRACK] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAddDirectorNode);
-    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-05.png"), "Find");
-    qaction->setData(ID_FIND);
-    m_actions[ID_FIND] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnFindNode);
-    m_mainToolBar->addSeparator();
-    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-06.png"), "Toggle Disable");
-    qaction->setCheckable(true);
-    qaction->setData(ID_TRACKVIEW_TOGGLE_DISABLE);
-    m_actions[ID_TRACKVIEW_TOGGLE_DISABLE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnToggleDisable);
-    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-07.png"), "Toggle Mute");
-    qaction->setCheckable(true);
-    qaction->setData(ID_TRACKVIEW_TOGGLE_MUTE);
-    m_actions[ID_TRACKVIEW_TOGGLE_MUTE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnToggleMute);
-    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-08.png"), "Mute Selected Tracks");
-    qaction->setData(ID_TRACKVIEW_MUTE_ALL);
-    m_actions[ID_TRACKVIEW_MUTE_ALL] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnMuteAll);
-    qaction = m_mainToolBar->addAction(QIcon(":/Trackview/main/tvmain-09.png"), "Unmute Selected Tracks");
-    qaction->setData(ID_TRACKVIEW_UNMUTE_ALL);
-    m_actions[ID_TRACKVIEW_UNMUTE_ALL] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnUnmuteAll);
-
-    m_viewToolBar = addToolBar("View Toolbar");
-    m_viewToolBar->setObjectName("m_viewToolBar");
-    m_viewToolBar->setFloatable(false);
-    m_viewToolBar->addWidget(new QLabel("View:"));
-    qaction = m_viewToolBar->addAction(QIcon(":/Trackview/view/tvview-00.png"), "Track Editor");
-    qaction->setData(ID_TV_MODE_DOPESHEET);
-    qaction->setShortcut(QKeySequence("Ctrl+D"));
-    qaction->setCheckable(true);
-    qaction->setChecked(true);
-    m_actions[ID_TV_MODE_DOPESHEET] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnModeDopeSheet);
-    qaction = m_viewToolBar->addAction(QIcon(":/Trackview/view/tvview-01.png"), "Curve Editor");
-    qaction->setData(ID_TV_MODE_CURVEEDITOR);
-    qaction->setShortcut(QKeySequence("Ctrl+R"));
-    qaction->setCheckable(true);
-    m_actions[ID_TV_MODE_CURVEEDITOR] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnModeCurveEditor);
-    qaction = m_viewToolBar->addAction(QIcon(":/Trackview/view/tvview-02.png"), "Both");
-    qaction->setData(ID_TV_MODE_OPENCURVEEDITOR);
-    qaction->setShortcut(QKeySequence("Ctrl+B"));
-    m_actions[ID_TV_MODE_OPENCURVEEDITOR] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnOpenCurveEditor);
-
-    m_playToolBar = addToolBar("Play Toolbar");
-    m_playToolBar->setObjectName("m_playToolBar");
-    m_playToolBar->setFloatable(false);
-    m_playToolBar->addWidget(new QLabel("Play:"));
-    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-00.png"), "Go to start of sequence");
-    qaction->setData(ID_TV_JUMPSTART);
-    m_actions[ID_TV_JUMPSTART] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnGoToStart);
-
-    toolButton = new QToolButton(m_playToolBar);
-    toolButton->setPopupMode(QToolButton::MenuButtonPopup);
-    qaction = new QAction(QIcon(":/Trackview/play/tvplay-01.png"), "Play Animation", this);
-    qaction->setData(ID_TV_PLAY);
-    qaction->setCheckable(true);
-    m_actions[ID_TV_PLAY] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnPlay);
-    qaction->setShortcut(QKeySequence(Qt::Key_Space));
-    qaction->setShortcutContext(Qt::WindowShortcut);
-    toolButton->setDefaultAction(qaction);
-    {
-        QMenu* buttonMenu = new QMenu(this);
-        toolButton->setMenu(buttonMenu);
-        QActionGroup* ag = new QActionGroup(buttonMenu);
-        for (auto i : { .5, 1., 2., 4., 8. })
-        {
-            if (i == .5)
-            {
-                qaction = buttonMenu->addAction(" 2 ");
-            }
-            else if (i == 1.)
-            {
-                qaction = buttonMenu->addAction(" 1 ");
-            }
-            else
-            {
-                qaction = buttonMenu->addAction(QString("1/%1").arg((int)i));
-            }
-            qaction->setData(i);
-            connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnPlaySetScale);
-            qaction->setCheckable(true);
-            qaction->setChecked(i == 1.);
-            ag->addAction(qaction);
-        }
-    }
-    m_playToolBar->addWidget(toolButton);
-
-    toolButton = new QToolButton(m_playToolBar);
-    toolButton->setPopupMode(QToolButton::MenuButtonPopup);
-    qaction = new QAction(QIcon(":/Trackview/play/tvplay-02.png"), "Stop", this);
-    qaction->setData(ID_TV_STOP);
-    m_actions[ID_TV_STOP] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnStop);
-    toolButton->setDefaultAction(qaction);
-    {
-        QMenu* buttonMenu = new QMenu(this);
-        toolButton->setMenu(buttonMenu);
-        qaction = buttonMenu->addAction("Stop");
-        connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnStop);
-        toolButton->addAction(qaction);
-        qaction = buttonMenu->addAction("Stop with Hard Reset");
-        qaction->setData(true);
-        connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnStopHardReset);
-    }
-    m_playToolBar->addWidget(toolButton);
-
-    m_playToolBar->addSeparator();
-    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-03.png"), "Pause");
-    qaction->setData(ID_TV_PAUSE);
-    qaction->setCheckable(true);
-    m_actions[ID_TV_PAUSE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnPause);
-    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-04.png"), "Go to end of sequence");
-    qaction->setData(ID_TV_JUMPEND);
-    m_actions[ID_TV_JUMPEND] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnGoToEnd);
-
-    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-05.png"), "Start Animation Recording");
-    qaction->setData(ID_TV_RECORD);
-    qaction->setCheckable(true);
-    m_actions[ID_TV_RECORD] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnRecord);
-
-    toolButton = new QToolButton(m_playToolBar);
-    toolButton->setPopupMode(QToolButton::MenuButtonPopup);
-    qaction = new QAction(QIcon(":/Trackview/play/tvplay-06.png"), "Start Auto Recording", this);
-    toolButton->addAction(qaction);
-    toolButton->setDefaultAction(qaction);
-    qaction->setData(ID_TV_RECORD_AUTO);
-    qaction->setCheckable(true);
-    m_actions[ID_TV_RECORD_AUTO] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAutoRecord);
-    {
-        QMenu* buttonMenu = new QMenu(this);
-        toolButton->setMenu(buttonMenu);
-        QActionGroup* ag = new QActionGroup(buttonMenu);
-        for (auto i : { 1, 2, 5, 10, 25, 50, 100 })
-        {
-            if (i == 1)
-            {
-                qaction = buttonMenu->addAction(" 1 sec");
-            }
-            else
-            {
-                qaction = buttonMenu->addAction(QString("1/%1 sec").arg(i));
-            }
-            qaction->setData(i);
-            connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAutoRecordStep);
-            qaction->setCheckable(true);
-            qaction->setChecked(i == 1);
-            ag->addAction(qaction);
-        }
-    }
-    m_playToolBar->addWidget(toolButton);
-
-    m_playToolBar->addSeparator();
-    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-07.png"), "Loop");
-    qaction->setData(ID_PLAY_LOOP);
-    qaction->setCheckable(true);
-    m_actions[ID_PLAY_LOOP] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnLoop);
-    m_playToolBar->addSeparator();
-    m_cursorPos = new QLabel(this);
-    m_playToolBar->addWidget(m_cursorPos);
-    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-08.png"), "Frame Rate");
-    qaction->setData(ID_TV_SNAP_FPS);
-    qaction->setCheckable(true);
-    m_actions[ID_TV_SNAP_FPS] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapFPS);
-    m_activeCamStatic = new QLabel(this);
-    m_playToolBar->addWidget(m_activeCamStatic);
-    m_playToolBar->addSeparator();
-    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-09.png"), "Undo");
-    qaction->setData(ID_UNDO);
-    m_actions[ID_UNDO] = qaction;
-    connect(qaction, &QAction::triggered, this, []()
-    {
-        GetIEditor()->Undo();
-    });
-    qaction = m_playToolBar->addAction(QIcon(":/Trackview/play/tvplay-10.png"), "Redo");
-    qaction->setData(ID_REDO);
-    m_actions[ID_REDO] = qaction;
-    connect(qaction, &QAction::triggered, this, []()
-    {
-        GetIEditor()->Redo();
-    });
-
-    addToolBarBreak(Qt::TopToolBarArea);
-
-    m_keysToolBar = addToolBar("Keys Toolbar");
-    m_keysToolBar->setObjectName("m_keysToolBar");
-    m_keysToolBar->setFloatable(false);
-    m_keysToolBar->addWidget(new QLabel("Keys:"));
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-00.png"), "Go to previous key");
-    qaction->setData(ID_TV_PREVKEY);
-    m_actions[ID_TV_PREVKEY] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnGoToPrevKey);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-01.png"), "Go to next key");
-    qaction->setData(ID_TV_NEXTKEY);
-    m_actions[ID_TV_NEXTKEY] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnGoToNextKey);
-    m_keysToolBar->addSeparator();
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-02.png"), "Move Keys");
-    qaction->setData(ID_TV_MOVEKEY);
-    m_actions[ID_TV_MOVEKEY] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnMoveKey);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-03.png"), "Slide Keys");
-    qaction->setData(ID_TV_SLIDEKEY);
-    m_actions[ID_TV_SLIDEKEY] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSlideKey);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-04.png"), "Scale Keys");
-    qaction->setData(ID_TV_SCALEKEY);
-    m_actions[ID_TV_SCALEKEY] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnScaleKey);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-05.png"), "Add Keys");
-    qaction->setData(ID_TV_ADDKEY);
-    m_actions[ID_TV_ADDKEY] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnAddKey);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-06.png"), "Delete Keys");
-    qaction->setData(ID_TV_DELKEY);
-    m_actions[ID_TV_DELKEY] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnDelKey);
-    m_keysToolBar->addSeparator();
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-07.png"), "No Snapping");
-    qaction->setData(ID_TV_SNAP_NONE);
-    m_actions[ID_TV_SNAP_NONE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapNone);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-08.png"), "Magnet Snapping");
-    qaction->setData(ID_TV_SNAP_MAGNET);
-    m_actions[ID_TV_SNAP_MAGNET] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapMagnet);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-09.png"), "Frame Snapping");
-    qaction->setData(ID_TV_SNAP_FRAME);
-    m_actions[ID_TV_SNAP_FRAME] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapFrame);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-10.png"), "Tick Snapping");
-    qaction->setData(ID_TV_SNAP_TICK);
-    m_actions[ID_TV_SNAP_TICK] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSnapTick);
-    m_keysToolBar->addSeparator();
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-11.png"), "Sync Selected Entity Nodes to Base Position");
-    qaction->setData(ID_TV_SYNC_TO_BASE);
-    m_actions[ID_TV_SYNC_TO_BASE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSyncSelectedTracksToBase);
-    qaction = m_keysToolBar->addAction(QIcon(":/Trackview/keys/tvkeys-12.png"), "Sync Selected Entity Nodes from Base Position");
-    qaction->setData(ID_TV_SYNC_FROM_BASE);
-    m_actions[ID_TV_SYNC_FROM_BASE] = qaction;
-    connect(qaction, &QAction::triggered, this, &CTrackViewDialog::OnSyncSelectedTracksFromBase);
-    QActionGroup* ag = new QActionGroup(this);
-    ag->addAction(m_actions[ID_TV_ADDKEY]);
-    ag->addAction(m_actions[ID_TV_MOVEKEY]);
-    ag->addAction(m_actions[ID_TV_SLIDEKEY]);
-    ag->addAction(m_actions[ID_TV_SCALEKEY]);
-    for (QAction* qaction2 : ag->actions())
-    {
-        qaction2->setCheckable(true);
-    }
-    m_actions[ID_TV_MOVEKEY]->setChecked(true);
-    ag = new QActionGroup(this);
-    ag->addAction(m_actions[ID_TV_SNAP_NONE]);
-    ag->addAction(m_actions[ID_TV_SNAP_MAGNET]);
-    ag->addAction(m_actions[ID_TV_SNAP_FRAME]);
-    ag->addAction(m_actions[ID_TV_SNAP_TICK]);
-    for (QAction* qaction2 : ag->actions())
-    {
-        qaction2->setCheckable(true);
-    }
-    
-    m_actions[ID_TV_SNAP_NONE]->setChecked(true);
-
-    m_tracksToolBar = addToolBar("Tracks Toolbar");
-    m_tracksToolBar->setObjectName("m_tracksToolBar");
-    m_tracksToolBar->setFloatable(false);
-    ClearTracksToolBar();
-
-    m_bRecord = false;
-    m_bPause = false;
-    m_bPlay = false;
-}
-
-void CTrackViewDialog::InitMenu()
-{
-    QMenuBar* mb = this->menuBar();
-
-    QMenu* m = mb->addMenu("&Sequence");
-    QAction* a = m->addAction("New Sequence...");
-    a->setData(ID_TV_SEQUENCE_NEW);
-    m_actions[ID_TV_SEQUENCE_NEW] = a;
-    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnAddSequence);
-
-    m = mb->addMenu("&View");
-    m->addAction(m_actions[ID_TV_MODE_DOPESHEET]);
-    m->addAction(m_actions[ID_TV_MODE_CURVEEDITOR]);
-    m->addAction(m_actions[ID_TV_MODE_OPENCURVEEDITOR]);
-    m->addSeparator();
-    a = m->addAction("Tick in Seconds");
-    a->setData(ID_VIEW_TICKINSECONDS);
-    a->setCheckable(true);
-    m_actions[ID_VIEW_TICKINSECONDS] = a;
-    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnViewTickInSeconds);
-    a = m->addAction("Tick in Frames");
-    a->setData(ID_VIEW_TICKINFRAMES);
-    a->setCheckable(true);
-    m_actions[ID_VIEW_TICKINFRAMES] = a;
-    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnViewTickInFrames);
-
-    m = mb->addMenu("T&ools");
-    a = m->addAction("Render Output...");
-    a->setData(ID_TOOLS_BATCH_RENDER);
-    m_actions[ID_TOOLS_BATCH_RENDER] = a;
-    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnBatchRender);
-    a = m->addAction("Customize &Track Colors...");
-    a->setData(ID_TV_TOOLS_CUSTOMIZETRACKCOLORS);
-    m_actions[ID_TV_TOOLS_CUSTOMIZETRACKCOLORS] = a;
-    connect(a, &QAction::triggered, this, &CTrackViewDialog::OnCustomizeTrackColors);
-}
-
-void CTrackViewDialog::UpdateActions()
-{
-    if (m_bIgnoreUpdates || m_actions.empty())
-    {
-        return;
-    }
-
-    if (GetIEditor()->GetAnimation()->IsRecordMode())
-    {
-        m_actions[ID_TV_RECORD]->setChecked(true);
-    }
-    else
-    {
-        m_actions[ID_TV_RECORD]->setChecked(false);
-    }
-    if (GetIEditor()->GetAnimation()->IsAutoRecording())
-    {
-        m_actions[ID_TV_RECORD_AUTO]->setChecked(true);
-    }
-    else
-    {
-        m_actions[ID_TV_RECORD_AUTO]->setChecked(false);
-    }
-    if (GetIEditor()->GetAnimation()->IsPlayMode())
-    {
-        m_actions[ID_TV_PLAY]->setChecked(true);
-    }
-    else
-    {
-        m_actions[ID_TV_PLAY]->setChecked(false);
-    }
-    if (GetIEditor()->GetAnimation()->IsPaused())
-    {
-        m_actions[ID_TV_PAUSE]->setChecked(true);
-    }
-    else
-    {
-        m_actions[ID_TV_PAUSE]->setChecked(false);
-    }
-    if (GetIEditor()->GetAnimation()->IsLoopMode())
-    {
-        m_actions[ID_PLAY_LOOP]->setChecked(true);
-    }
-    else
-    {
-        m_actions[ID_PLAY_LOOP]->setChecked(false);
-    }
-    if (m_wndDopeSheet->GetTickDisplayMode() == eTVTickMode_InSeconds)
-    {
-        m_actions[ID_VIEW_TICKINSECONDS]->setChecked(true);
-    }
-    else
-    {
-        m_actions[ID_VIEW_TICKINSECONDS]->setChecked(false);
-    }
-    if (m_wndDopeSheet->GetTickDisplayMode() == eTVTickMode_InFrames)
-    {
-        m_actions[ID_VIEW_TICKINFRAMES]->setChecked(true);
-    }
-    else
-    {
-        m_actions[ID_VIEW_TICKINFRAMES]->setChecked(false);
-    }
-
-    m_actions[ID_TV_DEL_SEQUENCE]->setEnabled(m_bEditLock ? false : true);
-
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        if (m_bEditLock)
-        {
-            m_actions[ID_TV_EDIT_SEQUENCE]->setEnabled(false);
-        }
-        else
-        {
-            m_actions[ID_TV_EDIT_SEQUENCE]->setEnabled(true);
-        }
-
-        CTrackViewAnimNodeBundle selectedNodes = sequence->GetSelectedAnimNodes();
-        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
-
-        const unsigned int selectedNodeCount = selectedNodes.GetCount();
-        const unsigned int selectedTrackCount = selectedTracks.GetCount();
-
-        bool updated_ID_TRACKVIEW_TOGGLE_DISABLE = false;
-        bool updated_ID_TRACKVIEW_TOGGLE_MUTE = false;
-        if (selectedNodeCount + selectedTrackCount == 1)
-        {
-            if (selectedNodeCount == 1)
-            {
-                const CTrackViewAnimNode* animNode = selectedNodes.GetNode(0);
-                // The root sequence node doesn't have an internal anim node and cannot be disabled.
-                m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setEnabled(animNode->GetNodeType() != eTVNT_Sequence);
-                m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setChecked(animNode->IsDisabled() ? true : false);
-                updated_ID_TRACKVIEW_TOGGLE_DISABLE = true;
-            }
-
-            if (selectedTrackCount == 1)
-            {
-                CTrackViewTrack* pTrack = selectedTracks.GetTrack(0);
-
-                m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setEnabled(true);
-                m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setChecked(pTrack->IsDisabled() ? true : false);
-                updated_ID_TRACKVIEW_TOGGLE_DISABLE = true;
-                m_actions[ID_TRACKVIEW_TOGGLE_MUTE]->setEnabled(true);
-                m_actions[ID_TRACKVIEW_TOGGLE_MUTE]->setChecked(pTrack->IsMuted() ? true : false);
-                updated_ID_TRACKVIEW_TOGGLE_MUTE = true;
-            }
-        }
-
-        bool allSelectedTracksUseMute = true;
-        for (int i = 0; i < selectedTrackCount; i++)
-        {
-            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
-            if (pTrack && !pTrack->UsesMute())
-            {
-                allSelectedTracksUseMute = false;
-                break;
-            }
-        }
-
-        if (!updated_ID_TRACKVIEW_TOGGLE_DISABLE)
-        {
-            m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setEnabled(false);
-        }
-        // disable toggle mute if don't have a single track selected or the all selected tracks does not use Mute
-        if (!updated_ID_TRACKVIEW_TOGGLE_MUTE || !allSelectedTracksUseMute)
-        {
-            m_actions[ID_TRACKVIEW_TOGGLE_MUTE]->setEnabled(false);
-        }
-
-        m_actions[ID_TRACKVIEW_MUTE_ALL]->setEnabled(true);
-        m_actions[ID_ADDSCENETRACK]->setEnabled(true);
-
-        bool areAnyEntitiesSelected = false;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
-
-        m_actions[ID_ADDNODE]->setEnabled(areAnyEntitiesSelected);
-    }
-    else
-    {
-        m_actions[ID_TV_DEL_SEQUENCE]->setEnabled(false);
-        m_actions[ID_TV_EDIT_SEQUENCE]->setEnabled(false);
-        m_actions[ID_TRACKVIEW_TOGGLE_DISABLE]->setEnabled(false);
-        m_actions[ID_TRACKVIEW_TOGGLE_MUTE]->setEnabled(false);
-        m_actions[ID_TRACKVIEW_MUTE_ALL]->setEnabled(false);
-        m_actions[ID_ADDSCENETRACK]->setEnabled(false);
-        m_actions[ID_ADDNODE]->setEnabled(false);
-    }
-
-
-    m_actions[ID_TOOLS_BATCH_RENDER]->setEnabled(GetIEditor()->GetMovieSystem()->GetNumSequences() > 0 && !m_enteringGameOrSimModeLock);
-    m_actions[ID_TV_ADD_SEQUENCE]->setEnabled(GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady() && !m_enteringGameOrSimModeLock);
-    m_actions[ID_TV_SEQUENCE_NEW]->setEnabled(GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady() && !m_enteringGameOrSimModeLock);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::InitSequences()
-{
-    ReloadSequences();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::InvalidateSequence()
-{
-    m_bNeedReloadSequence = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::InvalidateDopeSheet()
-{
-    if (m_wndDopeSheet)
-    {
-        m_wndDopeSheet->update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::Update()
-{
-    if (m_bNeedReloadSequence || m_needReAddListeners)
-    {
-        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* sequence = pSequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
-
-        if (m_bNeedReloadSequence)
-        {
-            m_bNeedReloadSequence = false;
-            CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-            pAnimationContext->SetSequence(sequence, true, false);
-        }
-        if (m_needReAddListeners)
-        {
-            m_needReAddListeners = false;
-            AddSequenceListeners(sequence);
-        }
-    }
-
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    float fTime = pAnimationContext->GetTime();
-
-    if (fTime != m_fLastTime)
-    {
-        m_fLastTime = fTime;
-        SetCursorPosText(fTime);
-    }
-
-    // Display the name of the active camera in the static control, if any.
-    // The active camera node means two conditions:
-    // 1. Sequence camera is currently active.
-    // 2. The camera which owns this node has been set as the current camera by the director node.
-    bool bSequenceCamInUse = gEnv->pMovieSystem->GetCallback() == NULL ||
-        gEnv->pMovieSystem->GetCallback()->IsSequenceCamUsed();
-    AZ::EntityId camId = gEnv->pMovieSystem->GetCameraParams().cameraEntityId;
-    if (camId.IsValid() && bSequenceCamInUse)
-    {
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, camId);
-        if (entity)
-        {
-            m_activeCamStatic->setText(entity->GetName().c_str());
-        }
-        else
-        {
-            m_activeCamStatic->setText("Active Camera");
-        }
-    }
-    else
-    {
-        m_activeCamStatic->setText("Active Camera");
-    }
-
-    if (m_wndNodesCtrl)
-    {
-        m_wndNodesCtrl->Update();
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnGoToPrevKey()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
-
-    if (sequence)
-    {
-        float time = pAnimationContext->GetTime();
-
-        CTrackViewNode* pNode = sequence->GetFirstSelectedNode();
-        pNode = pNode ? pNode : sequence;
-
-        if (pNode->SnapTimeToPrevKey(time))
-        {
-            pAnimationContext->SetTime(time);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnGoToNextKey()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
-
-    if (sequence)
-    {
-        float time = pAnimationContext->GetTime();
-
-        CTrackViewNode* pNode = sequence->GetFirstSelectedNode();
-        pNode = pNode ? pNode : sequence;
-
-        if (pNode->SnapTimeToNextKey(time))
-        {
-            pAnimationContext->SetTime(time);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnAddKey()
-{
-    m_wndDopeSheet->SetMouseActionMode(eTVActionMode_AddKeys);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnDelKey()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
-
-    if (sequence)
-    {
-        CUndo undo("Delete Keys");
-        sequence->DeleteSelectedKeys();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnMoveKey()
-{
-    m_wndDopeSheet->SetMouseActionMode(eTVActionMode_MoveKey);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSlideKey()
-{
-    m_wndDopeSheet->SetMouseActionMode(eTVActionMode_SlideKey);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnScaleKey()
-{
-    m_wndDopeSheet->SetMouseActionMode(eTVActionMode_ScaleKey);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSyncSelectedTracksToBase()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        sequence->SyncSelectedTracksToBase();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSyncSelectedTracksFromBase()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        sequence->SyncSelectedTracksFromBase();
-    }
-}
-
-void CTrackViewDialog::OnExportFBXSequence()
-{
-    SaveCurrentSequenceToFBX();
-}
-
-void CTrackViewDialog::OnExportNodeKeysGlobalTime()
-{
-    CExportManager* pExportManager = static_cast<CExportManager*>(GetIEditor()->GetExportManager());
-
-    if (pExportManager)
-    {
-        pExportManager->SaveNodeKeysTimeToXML();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnAddSequence()
-{
-    CTVNewSequenceDialog dlg(this);
-
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        QString sequenceName = dlg.GetSequenceName();
-
-        if (sequenceName != s_kNoSequenceComboBoxEntry)
-        {
-            SequenceType sequenceType = dlg.GetSequenceType();
-
-            CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-            AZ_Assert(sequenceManager, "Expected valid sequenceManager.");
-
-            CTrackViewSequence* pSequence = sequenceManager->GetSequenceByName(sequenceName);
-            if (pSequence)
-            {
-                throw std::runtime_error("A sequence with this name already exists");
-            }
-
-            AzToolsFramework::ScopedUndoBatch undoBatch("Create TrackView Director Node");
-            sequenceManager->CreateSequence(sequenceName, sequenceType);
-            CTrackViewSequence* newSequence = sequenceManager->GetSequenceByName(sequenceName);
-            AZ_Assert(newSequence, "Creating new sequence failed.");
-            undoBatch.MarkEntityDirty(newSequence->GetSequenceComponentEntityId());
-
-            // make it the currently selected sequence
-            CAnimationContext* animationContext = GetIEditor()->GetAnimation();
-            animationContext->SetSequence(newSequence, true, false);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::ReloadSequences()
-{
-    if (!GetIEditor()->GetMovieSystem() || m_bIgnoreUpdates || m_bDoingUndoOperation)
-    {
-        return;
-    }
-
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
-    CTrackViewSequenceNoNotificationContext context(sequence);
-
-    if (sequence)
-    {
-        sequence->UnBindFromEditorObjects();
-    }
-
-    ClearTracksToolBar();
-
-    if (pAnimationContext->IsPlaying())
-    {
-        pAnimationContext->SetPlaying(false);
-    }
-
-    ReloadSequencesComboBox();
-
-    if (m_currentSequenceEntityId.IsValid())
-    {
-        CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        sequence = pSequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
-
-        const float prevTime = pAnimationContext->GetTime();
-        pAnimationContext->SetSequence(sequence, true, true);
-        pAnimationContext->SetTime(prevTime);
-    }
-    else
-    {
-        pAnimationContext->SetSequence(nullptr, true, false);
-        m_sequencesComboBox->setCurrentIndex(0);
-    }
-
-    if (sequence)
-    {
-        sequence->BindToEditorObjects();
-    }
-
-    pAnimationContext->ForceAnimation();
-
-    UpdateSequenceLockStatus();
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::ReloadSequencesComboBox()
-{
-    m_sequencesComboBox->blockSignals(true);
-    m_sequencesComboBox->clear();
-    m_sequencesComboBox->addItem(QString(s_kNoSequenceComboBoxEntry));
-
-    {
-        CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        const unsigned int numSequences = pSequenceManager->GetCount();
-
-        for (int k = 0; k < numSequences; ++k)
-        {
-            CTrackViewSequence* sequence = pSequenceManager->GetSequenceByIndex(k);
-            QString entityIdString = GetEntityIdAsString(sequence->GetSequenceComponentEntityId());
-            m_sequencesComboBox->addItem(sequence->GetName(), entityIdString);
-        }
-    }
-
-    if (!m_currentSequenceEntityId.IsValid())
-    {
-        m_sequencesComboBox->setCurrentIndex(0);
-    }
-    else
-    {
-        QString entityIdString = GetEntityIdAsString(m_currentSequenceEntityId);
-        m_sequencesComboBox->setCurrentIndex(m_sequencesComboBox->findData(entityIdString));
-    }
-    m_sequencesComboBox->blockSignals(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::UpdateSequenceLockStatus()
-{
-    if (m_bIgnoreUpdates)
-    {
-        return;
-    }
-
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!sequence)
-    {
-        SetEditLock(true);
-    }
-    else
-    {
-        SetEditLock(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::SetEditLock(bool bLock)
-{
-    m_bEditLock = bLock;
-
-    m_wndDopeSheet->SetEditLock(bLock);
-    m_wndNodesCtrl->SetEditLock(bLock);
-    m_wndNodesCtrl->update();
-
-    m_wndCurveEditor->SetEditLock(bLock);
-    m_wndCurveEditor->update();
-}
-
-void CTrackViewDialog::OnGameOrSimModeLock(bool lock)
-{
-    if (lock)
-    {
-        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
-
-        // Remove sequence listeners when switching modes to ensure they get removed
-        // They will fail to be removed if dialog is closed in sim mode
-        RemoveSequenceListeners(sequence);
-    }
-    else
-    {
-        // Mark to re-add listeners next frame after the mode switch
-        m_needReAddListeners = true;
-    }
-
-    SetEditLock(lock);
-    m_enteringGameOrSimModeLock = lock;
-    m_sequencesComboBox->setDisabled(lock);
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnDelSequence()
-{
-    if (m_sequencesComboBox->currentIndex() == 0)
-    {
-        return;
-    }
-
-    if (QMessageBox::question(this, LyViewPane::TrackView, "Delete current sequence?") == QMessageBox::Yes)
-    {
-        int sel = m_sequencesComboBox->currentIndex();
-        if (sel != -1)
-        {
-            QString entityIdString = m_sequencesComboBox->currentData().toString();
-            m_sequencesComboBox->removeItem(sel);
-            m_sequencesComboBox->setCurrentIndex(0);
-
-            OnSequenceComboBox();
-
-            if (!entityIdString.isEmpty())
-            {
-                AZ::EntityId entityId = AZ::EntityId(entityIdString.toULongLong());
-                if (entityId.IsValid())
-                {
-                    CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-                    CTrackViewSequence* pSequence = GetSequenceByEntityIdOrName(pSequenceManager, entityIdString.toUtf8().constData());
-                    if (pSequence)
-                    {
-                        pSequenceManager->DeleteSequence(pSequence);
-                    }
-                }
-            }
-
-            UpdateActions();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnEditSequence()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (sequence)
-    {
-        float fps = m_wndCurveEditor->GetFPS();
-        CTVSequenceProps dlg(sequence, fps, this);
-        if (dlg.exec() == QDialog::Accepted)
-        {
-            // Sequence updated.
-            ReloadSequences();
-        }
-        m_wndDopeSheet->update();
-        UpdateActions();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSequenceComboBox()
-{
-    int sel = m_sequencesComboBox->currentIndex();
-    if (sel == -1)
-    {
-        GetIEditor()->GetAnimation()->SetSequence(nullptr, false, false);
-        return;
-    }
-
-    // Display current sequence.
-    QString entityIdString = m_sequencesComboBox->currentData().toString();
-    const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-    CTrackViewSequence* sequence = GetSequenceByEntityIdOrName(sequenceManager, entityIdString.toUtf8().constData());
-    CAnimationContext* animationContext = GetIEditor()->GetAnimation();
-    if (sequence && animationContext)
-    {
-        const bool force = false;
-        const bool noNotify = false;
-        const bool user = true;
-        animationContext->SetSequence(sequence, force, noNotify, user);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSequenceChanged(CTrackViewSequence* sequence)
-{
-    if (m_bIgnoreUpdates)
-    {
-        return;
-    }
-
-    // Remove listeners from previous sequence
-    CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-    CTrackViewSequence* prevSequence = sequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
-    RemoveSequenceListeners(prevSequence);
-
-    if (sequence)
-    {
-        m_currentSequenceEntityId = sequence->GetSequenceComponentEntityId();
-
-        sequence->Reset(true);
-
-        UpdateDopeSheetTime(sequence);
-
-        m_sequencesComboBox->blockSignals(true);
-        QString entityIdString = GetEntityIdAsString(m_currentSequenceEntityId);
-        int sequenceIndex = m_sequencesComboBox->findData(entityIdString);
-        m_sequencesComboBox->setCurrentIndex(sequenceIndex);
-        m_sequencesComboBox->blockSignals(false);
-
-        sequence->ClearSelection();
-
-        AddSequenceListeners(sequence);
-    }
-    else
-    {
-        m_currentSequenceEntityId.SetInvalid();
-        m_sequencesComboBox->setCurrentIndex(0);
-        m_wndCurveEditor->GetSplineCtrl().SetEditLock(true);
-    }
-
-    m_wndNodesCtrl->OnSequenceChanged();
-    m_wndKeyProperties->OnSequenceChanged(sequence);
-
-    ClearTracksToolBar();
-
-    GetIEditor()->GetAnimation()->ForceAnimation();
-
-    m_wndNodesCtrl->update();
-    m_wndDopeSheet->update();
-
-    UpdateSequenceLockStatus();
-    UpdateTracksToolBar();
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnRecord()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    pAnimationContext->SetRecording(!pAnimationContext->IsRecording());
-    m_wndDopeSheet->update();
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnAutoRecord()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    pAnimationContext->SetAutoRecording(!pAnimationContext->IsRecording(), m_fAutoRecordStep);
-    m_wndDopeSheet->update();
-    UpdateActions();
-}
-
-void CTrackViewDialog::OnAutoRecordStep()
-{
-    QAction* action = static_cast<QAction*>(sender());
-    int factor = action->data().toInt();
-    m_fAutoRecordStep = 1.f / factor;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnGoToStart()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    const float startTime = pAnimationContext->GetMarkers().start;
-
-    pAnimationContext->SetTime(startTime);
-    pAnimationContext->SetPlaying(false);
-    pAnimationContext->SetRecording(false);
-
-    CTrackViewSequence* sequence = pAnimationContext->GetSequence();
-    if (sequence)
-    {
-        // Reset sequence to the beginning.
-        sequence->Reset(true);
-    }
-
-    // notify explicit time changed and return to playback controls *after* the sequence is reset.
-    pAnimationContext->TimeChanged(startTime);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnGoToEnd()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    pAnimationContext->SetTime(pAnimationContext->GetMarkers().end);
-    pAnimationContext->SetPlaying(false);
-    pAnimationContext->SetRecording(false);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnPlay()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    bool wasRecordMode = pAnimationContext->IsRecordMode();
-    if (!pAnimationContext->IsPlaying())
-    {
-        CTrackViewSequence* sequence = pAnimationContext->GetSequence();
-        if (sequence)
-        {
-            if (!pAnimationContext->IsAutoRecording())
-            {
-                if (wasRecordMode)
-                {
-                    pAnimationContext->SetRecording(false);
-                }
-            }
-            pAnimationContext->SetPlaying(true);
-        }
-    }
-    else
-    {
-        pAnimationContext->SetPlaying(false);
-    }
-    UpdateActions();
-}
-
-void CTrackViewDialog::OnPlaySetScale()
-{
-    QAction* action = static_cast<QAction*>(sender());
-    float v = action->data().toFloat();
-    if (v > 0.f)
-    {
-        GetIEditor()->GetAnimation()->SetTimeScale(1.f / v);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnStop()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-
-    if (pAnimationContext->IsPlaying())
-    {
-        pAnimationContext->SetPlaying(false);
-    }
-    else
-    {
-        OnGoToStart();
-    }
-    pAnimationContext->SetRecording(false);
-    UpdateActions();
-}
-
-void CTrackViewDialog::OnStopHardReset()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    pAnimationContext->SetTime(pAnimationContext->GetMarkers().start);
-    pAnimationContext->SetPlaying(false);
-    pAnimationContext->SetRecording(false);
-
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        sequence->ResetHard();
-    }
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnPause()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    if (pAnimationContext->IsPaused())
-    {
-        pAnimationContext->Resume();
-    }
-    else
-    {
-        pAnimationContext->Pause();
-    }
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnLoop()
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    pAnimationContext->SetLoopMode(!pAnimationContext->IsLoopMode());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnBeginNewScene:
-    case eNotify_OnBeginLoad:
-    case eNotify_OnBeginSceneSave:
-        m_bIgnoreUpdates = true;
-        break;
-    case eNotify_OnBeginGameMode:
-        OnGameOrSimModeLock(true);
-        m_bIgnoreUpdates = true;
-        break;
-    case eNotify_OnEndNewScene:
-    case eNotify_OnEndLoad:
-        m_bIgnoreUpdates = false;
-        ReloadSequences();
-        break;
-    case eNotify_OnEndSceneSave:
-        m_bIgnoreUpdates = false;
-        break;
-    case eNotify_OnEndGameMode:
-        m_bIgnoreUpdates = false;
-        OnGameOrSimModeLock(false);
-        break;
-    case eNotify_OnReloadTrackView:
-        if (!m_bIgnoreUpdates)
-        {
-            ReloadSequences();
-        }
-        break;
-    case eNotify_OnIdleUpdate:
-        if (!m_bIgnoreUpdates)
-        {
-            Update();
-        }
-        break;
-    case eNotify_OnBeginSimulationMode:
-        OnGameOrSimModeLock(true);
-        break;
-    case eNotify_OnEndSimulationMode:
-        OnGameOrSimModeLock(false);
-        break;
-    case eNotify_OnSelectionChange:
-        UpdateActions();
-        break;
-    case eNotify_OnQuit:
-        SaveLayouts();
-        SaveMiscSettings();
-        SaveTrackColors();
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnAddSelectedNode()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (sequence)
-    {
-        // Try to paste to a selected group node, otherwise to sequence
-        CTrackViewAnimNodeBundle selectedNodes = sequence->GetSelectedAnimNodes();
-        CTrackViewAnimNode* animNode = (selectedNodes.GetCount() == 1) ? selectedNodes.GetNode(0) : sequence;
-        animNode = (animNode->IsGroupNode() && animNode->GetType() != AnimNodeType::AzEntity) ? animNode : sequence;
-
-        AzToolsFramework::ScopedUndoBatch undoBatch("Add Entities to Track View");
-        CTrackViewAnimNodeBundle addedNodes = animNode->AddSelectedEntities(m_defaultTracksForEntityNode);
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-        if (addedNodes.GetCount() > 0)
-        {
-            // mark layer containing sequence as dirty
-            sequence->MarkAsModified();
-        }
-
-        int selectedEntitiesCount = 0;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
-
-        // check to make sure all nodes were added and notify user if they weren't
-        if (addedNodes.GetCount() != selectedEntitiesCount)
-        {
-            IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();
-
-            QMessageBox::information(this, tr("Track View Warning"), tr(movieSystem->GetUserNotificationMsgs().c_str()));
-
-            // clear the notification log now that we've consumed and presented them.
-            movieSystem->ClearUserNotificationMsgs();
-        }
-
-        UpdateActions();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnAddDirectorNode()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (sequence)
-    {
-        QString name = sequence->GetAvailableNodeNameStartingWith("Director");
-        AzToolsFramework::ScopedUndoBatch undoBatch("Create Track View Director Node");
-        sequence->CreateSubNode(name, AnimNodeType::Director);
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-        UpdateActions();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnFindNode()
-{
-    if (!m_findDlg)
-    {
-        m_findDlg = new CTrackViewFindDlg("Find Node in Track View", this);
-        m_findDlg->Init(this);
-        connect(m_findDlg, SIGNAL(finished(int)), m_wndNodesCtrl->findChild<QTreeView*>(), SLOT(setFocus()), Qt::QueuedConnection);
-    }
-    m_findDlg->FillData();
-    m_findDlg->show();
-    m_findDlg->raise();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::keyPressEvent(QKeyEvent* event)
-{
-    // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
-    if (event->key() == Qt::Key_Space && event->modifiers() == Qt::NoModifier)
-    {
-        event->accept();
-        GetIEditor()->GetAnimation()->TogglePlay();
-    }
-    return QMainWindow::keyPressEvent(event);
-}
-
-bool CTrackViewDialog::event(QEvent* e)
-{
-    if (e->type() == QEvent::ShortcutOverride)
-    {
-        // since we respond to the following things, let Qt know so that shortcuts don't override us
-        bool respondsToEvent = false;
-
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
-        if (keyEvent->key() == Qt::Key_Space && keyEvent->modifiers() == Qt::NoModifier)
-        {
-            respondsToEvent = true;
-        }
-
-        if (respondsToEvent)
-        {
-            e->accept();
-            return true;
-        }
-    }
-
-    return QMainWindow::event(e);
-}
-
-#if defined(AZ_PLATFORM_WINDOWS)
-bool CTrackViewDialog::nativeEvent(const QByteArray &eventType, void *message, [[maybe_unused]] long *result)
-{
-    /* On Windows, eventType is set to "windows_generic_MSG" for messages sent to toplevel windows, and "windows_dispatcher_MSG" for
-    system - wide messages such as messages from a registered hot key.In both cases, the message can be casted to a MSG pointer.
-    The result pointer is only used on Windows, and corresponds to the LRESULT pointer.*/
-
-    if (eventType == "windows_generic_MSG") {
-        MSG* pMsg = static_cast<MSG*>(message);
-        return processRawInput(pMsg);
-    }
-
-    return false;
-}
-
-bool CTrackViewDialog::processRawInput(MSG* pMsg)
-{
-    if (pMsg->message == WM_INPUT)
-    {
-        static C3DConnexionDriver* p3DConnexionDriver = 0;
-
-        if (!p3DConnexionDriver)
-        {
-            p3DConnexionDriver = (C3DConnexionDriver*)GetIEditor()->GetPluginManager()->GetPluginByGUID("{AD109901-9128-4ffd-8E67-137CB2B1C41B}");
-        }
-        if (p3DConnexionDriver)
-        {
-            S3DConnexionMessage msg;
-            if (p3DConnexionDriver->GetInputMessageData(pMsg->lParam, msg))
-            {
-                if (msg.bGotRotation)
-                {
-                    float fTime = GetIEditor()->GetAnimation()->GetTime();
-                    float fDelta2 = msg.vRotate[2] * 0.1f;
-                    fTime += fDelta2;
-
-                    GetIEditor()->GetAnimation()->SetTime(fTime);
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnModeDopeSheet()
-{
-    auto sizes = m_wndSplitter->sizes();
-    m_wndCurveEditorDock->setVisible(false);
-    m_wndCurveEditorDock->toggleViewAction()->setEnabled(false);
-    if (m_wndCurveEditorDock->widget() != m_wndCurveEditor)
-    {
-        m_wndCurveEditorDock->setWidget(m_wndCurveEditor);
-    }
-    m_wndDopeSheet->show();
-    m_wndSplitter->setSizes(sizes);
-    m_actions[ID_TV_MODE_DOPESHEET]->setChecked(true);
-    m_actions[ID_TV_MODE_CURVEEDITOR]->setChecked(false);
-    m_wndCurveEditor->OnSequenceChanged(GetIEditor()->GetAnimation()->GetSequence());
-    m_lastMode = ViewMode::TrackView;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnModeCurveEditor()
-{
-    auto sizes = m_wndSplitter->sizes();
-    m_wndCurveEditorDock->setVisible(false);
-    m_wndCurveEditorDock->toggleViewAction()->setEnabled(false);
-    if (m_wndCurveEditorDock->widget() == m_wndCurveEditor)
-    {
-        m_wndSplitter->insertWidget(1, m_wndCurveEditor);
-    }
-    m_wndDopeSheet->hide();
-    m_wndSplitter->setSizes(sizes);
-    m_actions[ID_TV_MODE_DOPESHEET]->setChecked(false);
-    m_actions[ID_TV_MODE_CURVEEDITOR]->setChecked(true);
-    m_wndCurveEditor->OnSequenceChanged(GetIEditor()->GetAnimation()->GetSequence());
-    m_lastMode = ViewMode::CurveEditor;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnOpenCurveEditor()
-{
-    OnModeDopeSheet();
-    m_wndCurveEditorDock->show();
-    m_wndCurveEditorDock->toggleViewAction()->setEnabled(true);
-    m_actions[ID_TV_MODE_DOPESHEET]->setChecked(true);
-    m_actions[ID_TV_MODE_CURVEEDITOR]->setChecked(true);
-    m_wndCurveEditor->OnSequenceChanged(GetIEditor()->GetAnimation()->GetSequence());
-    m_lastMode = ViewMode::Both;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSnapNone()
-{
-    m_wndDopeSheet->SetSnappingMode(eSnappingMode_SnapNone);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSnapMagnet()
-{
-    m_wndDopeSheet->SetSnappingMode(eSnappingMode_SnapMagnet);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSnapFrame()
-{
-    m_wndDopeSheet->SetSnappingMode(eSnappingMode_SnapFrame);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSnapTick()
-{
-    m_wndDopeSheet->SetSnappingMode(eSnappingMode_SnapTick);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSnapFPS()
-{
-    int fps = FloatToIntRet(m_wndCurveEditor->GetFPS());
-    bool ok = false;
-    fps = QInputDialog::getInt(this, tr("Frame rate for frame snapping"), QStringLiteral(""), fps, s_kMinimumFrameSnappingFPS, s_kMaximumFrameSnappingFPS, 1, &ok);
-    if (ok)
-    {
-        m_wndDopeSheet->SetSnapFPS(fps);
-        m_wndCurveEditor->SetFPS(fps);
-
-        SetCursorPosText(GetIEditor()->GetAnimation()->GetTime());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnViewTickInSeconds()
-{
-    m_wndDopeSheet->SetTickDisplayMode(eTVTickMode_InSeconds);
-    m_wndCurveEditor->SetTickDisplayMode(eTVTickMode_InSeconds);
-    SetCursorPosText(GetIEditor()->GetAnimation()->GetTime());
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnViewTickInFrames()
-{
-    m_wndDopeSheet->SetTickDisplayMode(eTVTickMode_InFrames);
-    m_wndCurveEditor->SetTickDisplayMode(eTVTickMode_InFrames);
-    SetCursorPosText(GetIEditor()->GetAnimation()->GetTime());
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::SaveMiscSettings() const
-{
-    QSettings settings;
-    settings.beginGroup(s_kTrackViewSettingsSection);
-    settings.setValue(s_kSnappingModeEntry, static_cast<int>(m_wndDopeSheet->GetSnappingMode()));
-    float fps = m_wndCurveEditor->GetFPS();
-    settings.setValue(s_kFrameSnappingFPSEntry, fps);
-    settings.setValue(s_kTickDisplayModeEntry, static_cast<int>(m_wndDopeSheet->GetTickDisplayMode()));
-    settings.setValue(s_kDefaultTracksEntry, QByteArray(reinterpret_cast<const char*>(m_defaultTracksForEntityNode.data()),
-        m_defaultTracksForEntityNode.size() * sizeof(AnimParamType)));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::ReadMiscSettings()
-{
-    QSettings settings;
-    settings.beginGroup(s_kTrackViewSettingsSection);
-    ESnappingMode snapMode = (ESnappingMode)(settings.value(s_kSnappingModeEntry, eSnappingMode_SnapNone).toInt());
-    m_wndDopeSheet->SetSnappingMode(snapMode);
-    if (snapMode == eSnappingMode_SnapNone)
-    {
-        m_actions[ID_TV_SNAP_NONE]->setChecked(true);
-    }
-    else if (snapMode == eSnappingMode_SnapMagnet)
-    {
-        m_actions[ID_TV_SNAP_MAGNET]->setChecked(true);
-    }
-    else if (snapMode == eSnappingMode_SnapTick)
-    {
-        m_actions[ID_TV_SNAP_TICK]->setChecked(true);
-    }
-    else if (snapMode == eSnappingMode_SnapFrame)
-    {
-        m_actions[ID_TV_SNAP_FRAME]->setChecked(true);
-    }
-
-    if (settings.contains(s_kFrameSnappingFPSEntry))
-    {
-        float fps = settings.value(s_kFrameSnappingFPSEntry).toDouble();
-        if (fps >= s_kMinimumFrameSnappingFPS && fps <= s_kMaximumFrameSnappingFPS)
-        {
-            m_wndDopeSheet->SetSnapFPS(FloatToIntRet(fps));
-            m_wndCurveEditor->SetFPS(fps);
-        }
-    }
-
-    ETVTickMode tickMode = (ETVTickMode)(settings.value(s_kTickDisplayModeEntry, eTVTickMode_InSeconds).toInt());
-    m_wndDopeSheet->SetTickDisplayMode(tickMode);
-    m_wndCurveEditor->SetTickDisplayMode(tickMode);
-
-    if (settings.contains(s_kDefaultTracksEntry))
-    {
-        const QByteArray ba = settings.value(s_kDefaultTracksEntry).toByteArray();
-        m_defaultTracksForEntityNode.clear();
-        for (int x = 0; x < ba.size() / sizeof(AnimParamType); x++)
-        {
-            AnimParamType track = ((AnimParamType*)(ba.data()))[x];
-            m_defaultTracksForEntityNode.push_back(track);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::SaveLayouts()
-{
-    QSettings settings("Amazon", "O3DE");
-    settings.beginGroup("TrackView");
-    QByteArray stateData = this->saveState();
-    settings.setValue("layout", stateData);
-    settings.setValue("lastViewMode", (int)m_lastMode);
-    QStringList sl;
-    foreach(int i, m_wndSplitter->sizes())
-    sl << QString::number(i);
-    settings.setValue("splitter", sl.join(","));
-    settings.endGroup();
-    settings.sync();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::ReadLayouts()
-{
-    QSettings settings("Amazon", "O3DE");
-    settings.beginGroup("TrackView");
-
-    setViewMode(static_cast<ViewMode>(settings.value("lastViewMode").toInt()));
-
-    if (settings.contains("layout"))
-    {
-        QByteArray layoutData = settings.value("layout").toByteArray();
-        if (!layoutData.isEmpty())
-        {
-            restoreState(layoutData);
-        }
-    }
-    if (settings.contains("splitter"))
-    {
-        const QStringList sl = settings.value("splitter").toString().split(",");
-        QList<int> szl;
-        szl.reserve(sl.size());
-        for (const QString& s : sl)
-        {
-            szl << s.toInt();
-        }
-        if (!sl.isEmpty())
-        {
-            m_wndSplitter->setSizes(szl);
-        }
-    }
-}
-
-void CTrackViewDialog::setViewMode(ViewMode mode)
-{
-    switch (mode)
-    {
-    case ViewMode::TrackView:
-        OnModeDopeSheet();
-        break;
-    case ViewMode::CurveEditor:
-        OnModeCurveEditor();
-        break;
-    case ViewMode::Both:
-        OnOpenCurveEditor();
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::SaveTrackColors() const
-{
-    CTVCustomizeTrackColorsDlg::SaveColors(s_kTrackViewSettingsSection);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::ReadTrackColors()
-{
-    CTVCustomizeTrackColorsDlg::LoadColors(s_kTrackViewSettingsSection);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::SetCursorPosText(float fTime)
-{
-    QString sText;
-    int fps = FloatToIntRet(m_wndCurveEditor->GetFPS());
-    int nMins = int ( fTime / 60.0f );
-    int nSecs = int (fTime - float ( nMins ) * 60.0f);
-    int nFrames = fps > 0 ? int(fTime * m_wndCurveEditor->GetFPS()) % fps : 0;
-
-    sText = QString("%1:%2:%3 (%4fps)").arg(nMins).arg(nSecs, 2, 10, QLatin1Char('0')).arg(nFrames, 2, 10, QLatin1Char('0')).arg(fps);
-    m_cursorPos->setText(sText);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnCustomizeTrackColors()
-{
-    CTVCustomizeTrackColorsDlg dlg(this);
-    dlg.exec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnBatchRender()
-{
-    CSequenceBatchRenderDialog dlg(m_wndCurveEditor->GetFPS(), this);
-    dlg.exec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::UpdateTracksToolBar()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        ClearTracksToolBar();
-
-        CTrackViewAnimNodeBundle selectedNodes = sequence->GetSelectedAnimNodes();
-
-        if (selectedNodes.GetCount() == 1)
-        {
-            CTrackViewAnimNode* pAnimNode = selectedNodes.GetNode(0);
-            SetNodeForTracksToolBar(pAnimNode);
-
-            const AnimNodeType nodeType = pAnimNode->GetType();
-            int paramCount = 0;
-            IAnimNode::AnimParamInfos animatableProperties;
-            CTrackViewNode* parentNode = pAnimNode->GetParentNode();
-
-            // all AZ::Entity entities are animated through components. Component nodes always have a parent - the containing AZ::Entity
-            if (nodeType == AnimNodeType::Component && parentNode)
-            {
-                // component node - query all the animatable tracks via an EBus request
-
-                // all AnimNodeType::Component are parented to AnimNodeType::AzEntityNodes - get the parent to get it's AZ::EntityId to use for the EBus request
-                if (parentNode->GetNodeType() == eTVNT_AnimNode)
-                {
-                    // this cast is safe because we check that the type is eTVNT_AnimNode
-                    const AZ::EntityId azEntityId = static_cast<CTrackViewAnimNode*>(parentNode)->GetAzEntityId();
-
-                    // query the animatable component properties from the Sequence Component
-                    Maestro::EditorSequenceComponentRequestBus::Event(const_cast<CTrackViewAnimNode*>(pAnimNode)->GetSequence()->GetSequenceComponentEntityId(),
-                        &Maestro::EditorSequenceComponentRequestBus::Events::GetAllAnimatablePropertiesForComponent,
-                        animatableProperties, azEntityId, pAnimNode->GetComponentId());
-
-                    paramCount = animatableProperties.size();
-                }
-            }
-            else
-            {
-                // legacy Entity
-                paramCount = pAnimNode->GetParamCount();
-            }
-
-            for (int i = 0; i < paramCount; ++i)
-            {
-                CAnimParamType paramType;
-                QString name;
-
-                // get the animatable param name
-                if (nodeType == AnimNodeType::Component)
-                {
-                    paramType = animatableProperties[i].paramType;
-
-                    // Skip over any hidden params
-                    if (animatableProperties[i].flags & IAnimNode::ESupportedParamFlags::eSupportedParamFlags_Hidden)
-                    {
-                        continue;
-                    }
-                }
-                else
-                {
-
-                    paramType = pAnimNode->GetParamType(i);
-
-                    if (paramType.GetType() == AnimParamType::Invalid)
-                    {
-                        continue;
-                    }
-                }
-
-                CTrackViewTrack* pTrack = pAnimNode->GetTrackForParameter(paramType);
-                if (pTrack && !(pAnimNode->GetParamFlags(paramType) & IAnimNode::eSupportedParamFlags_MultipleTracks))
-                {
-                    continue;
-                }
-
-                name = pAnimNode->GetParamName(paramType);
-
-                QString sToolTipText("Add " + name + " Track");
-                QIcon hIcon = m_wndNodesCtrl->GetIconForTrack(pTrack);
-                AddButtonToTracksToolBar(paramType, hIcon, sToolTipText);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::ClearTracksToolBar()
-{
-    m_tracksToolBar->clear();
-    m_tracksToolBar->addWidget(new QLabel("Tracks:"));
-
-    m_pNodeForTracksToolBar = NULL;
-    m_toolBarParamTypes.clear();
-    m_currentToolBarParamTypeId = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::AddButtonToTracksToolBar(const CAnimParamType& paramId, const QIcon& hIcon, const QString& title)
-{
-    const int paramTypeToolBarID = ID_TV_TRACKS_TOOLBAR_BASE + m_currentToolBarParamTypeId;
-    if (paramTypeToolBarID <= ID_TV_TRACKS_TOOLBAR_LAST)
-    {
-        m_toolBarParamTypes.push_back(paramId);
-        ++m_currentToolBarParamTypeId;
-
-        QAction* a = m_tracksToolBar->addAction(hIcon, title);
-        a->setData(paramTypeToolBarID);
-        connect(a, &QAction::triggered, this, &CTrackViewDialog::OnTracksToolBar);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnTracksToolBar()
-{
-    QAction* action = static_cast<QAction*>(sender());
-    int nID = action->data().toInt();
-    const unsigned int paramTypeToolBarID = nID - ID_TV_TRACKS_TOOLBAR_BASE;
-
-    if (paramTypeToolBarID < m_toolBarParamTypes.size())
-    {
-        if (m_pNodeForTracksToolBar && m_toolBarParamTypes[paramTypeToolBarID].GetType() != AnimParamType::Invalid)
-        {
-            CTrackViewSequence* sequence = m_pNodeForTracksToolBar->GetSequence();
-            AZ_Assert(sequence, "Expected valid sequence");
-
-            if (sequence)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track via Toolbar");
-                m_pNodeForTracksToolBar->CreateTrack(m_toolBarParamTypes[paramTypeToolBarID]);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-
-            UpdateTracksToolBar();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnToggleDisable()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        CTrackViewAnimNodeBundle selectedNodes = sequence->GetSelectedAnimNodes();
-        const unsigned int numSelectedNodes = selectedNodes.GetCount();
-        for (unsigned int i = 0; i < numSelectedNodes; ++i)
-        {
-            CTrackViewAnimNode* pNode = selectedNodes.GetNode(i);
-            pNode->SetDisabled(!pNode->IsDisabled());
-        }
-
-        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
-        const unsigned int numSelectedTracks = selectedTracks.GetCount();
-        for (unsigned int i = 0; i < numSelectedTracks; ++i)
-        {
-            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
-            pTrack->SetDisabled(!pTrack->IsDisabled());
-        }
-        UpdateActions();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnToggleMute()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
-        const unsigned int numSelectedTracks = selectedTracks.GetCount();
-        for (unsigned int i = 0; i < numSelectedTracks; ++i)
-        {
-            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
-            pTrack->SetMuted(!pTrack->IsMuted());
-        }
-        UpdateActions();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnMuteAll()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
-        const unsigned int numSelectedTracks = selectedTracks.GetCount();
-        for (unsigned int i = 0; i < numSelectedTracks; ++i)
-        {
-            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
-            pTrack->SetMuted(true);
-        }
-        UpdateActions();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnUnmuteAll()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        CTrackViewTrackBundle selectedTracks = sequence->GetSelectedTracks();
-        const unsigned int numSelectedTracks = selectedTracks.GetCount();
-        for (unsigned int i = 0; i < numSelectedTracks; ++i)
-        {
-            CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
-            pTrack->SetMuted(false);
-        }
-        UpdateActions();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnNodeSelectionChanged(CTrackViewSequence* sequence)
-{
-    CTrackViewSequence* pCurrentSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (pCurrentSequence && pCurrentSequence == sequence)
-    {
-        UpdateTracksToolBar();
-        UpdateActions();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnNodeRenamed(CTrackViewNode* pNode, [[maybe_unused]] const char* pOldName)
-{
-    // React to sequence name changes
-    if (pNode->GetNodeType() == eTVNT_Sequence)
-    {
-        ReloadSequencesComboBox();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::UpdateDopeSheetTime(CTrackViewSequence* sequence)
-{
-    Range timeRange = sequence->GetTimeRange();
-    m_wndDopeSheet->SetTimeRange(timeRange.start, timeRange.end);
-    m_wndDopeSheet->SetStartMarker(timeRange.start);
-    m_wndDopeSheet->SetEndMarker(timeRange.end);
-    m_wndDopeSheet->SetTimeScale(m_wndDopeSheet->GetTimeScale(), 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnEntityDestruction(const AZ::EntityId& entityId)
-{
-    if (m_currentSequenceEntityId == entityId)
-    {
-        // The currently selected sequence is about to be deleted, make sure to clear the selection right now.
-        // Clearing it here will make sure it is clear in slice work flow edge cases.
-        GetIEditor()->GetAnimation()->SetSequence(nullptr, false, false);
-
-        // Refresh the records in m_wndNodesCtrl, the sequence will not be selected in Track View
-        // so the current sequence will be nullptr and the records will be cleared preventing
-        // dangling pointers.
-        m_wndNodesCtrl->OnSequenceChanged();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSequenceSettingsChanged(CTrackViewSequence* sequence)
-{
-    CTrackViewSequence* pCurrentSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (pCurrentSequence && pCurrentSequence == sequence)
-    {
-        UpdateDopeSheetTime(sequence);
-        m_wndNodesCtrl->update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSequenceAdded([[maybe_unused]] CTrackViewSequence* sequence)
-{
-    ReloadSequencesComboBox();
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::OnSequenceRemoved([[maybe_unused]] CTrackViewSequence* sequence)
-{
-    ReloadSequencesComboBox();
-    UpdateActions();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::AddSequenceListeners(CTrackViewSequence* sequence)
-{
-    if (sequence)
-    {
-        sequence->AddListener(this);
-        sequence->AddListener(m_wndNodesCtrl);
-        sequence->AddListener(m_wndKeyProperties);
-        sequence->AddListener(m_wndCurveEditor);
-        sequence->AddListener(m_wndDopeSheet);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::RemoveSequenceListeners(CTrackViewSequence* sequence)
-{
-    if (sequence)
-    {
-        sequence->RemoveListener(m_wndDopeSheet);
-        sequence->RemoveListener(m_wndCurveEditor);
-        sequence->RemoveListener(m_wndKeyProperties);
-        sequence->RemoveListener(m_wndNodesCtrl);
-        sequence->RemoveListener(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::AddDialogListeners()
-{
-    GetIEditor()->RegisterNotifyListener(this);
-    GetIEditor()->GetAnimation()->AddListener(this);
-    GetIEditor()->GetSequenceManager()->AddListener(this);
-    GetIEditor()->GetUndoManager()->AddListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::RemoveDialogListeners()
-{
-    GetIEditor()->GetUndoManager()->RemoveListener(this);
-    GetIEditor()->GetSequenceManager()->RemoveListener(this);
-    GetIEditor()->GetAnimation()->RemoveListener(this);
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::BeginUndoTransaction()
-{
-    m_bDoingUndoOperation = true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDialog::EndUndoTransaction()
-{
-    m_bDoingUndoOperation = false;
-}
-
-void CTrackViewDialog::SaveCurrentSequenceToFBX()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    QString selectedSequenceFBXStr = QString(sequence->GetName()) + ".fbx";
-    CExportManager* pExportManager = static_cast<CExportManager*>(GetIEditor()->GetExportManager());
-    const char szFilters[] = "FBX Files (*.fbx)";
-
-    CFBXExporterDialog fpsDialog;
-
-    CTrackViewTrackBundle allTracks = sequence->GetAllTracks();
-
-    for (int trackID = 0; trackID < allTracks.GetCount(); ++trackID)
-    {
-        CTrackViewTrack* pCurrentTrack = allTracks.GetTrack(trackID);
-
-        if (!pCurrentTrack->GetParentNode()->IsSelected())
-        {
-            continue;
-        }
-    }
-
-    QString filename = QFileDialog::getSaveFileName(this, tr("Export Selected Nodes To FBX File"), selectedSequenceFBXStr, szFilters);
-    if (!filename.isEmpty())
-    {
-        pExportManager->SetBakedKeysSequenceExport(true);
-        pExportManager->Export(filename.toUtf8().data(), "", "", false, false, false, true);
-    }
-}
-
-void CTrackViewDialog::AfterEntitySelectionChanged(
-    [[maybe_unused]] const AzToolsFramework::EntityIdList& newlySelectedEntities,
-    [[maybe_unused]] const AzToolsFramework::EntityIdList& newlyDeselectedEntities)
-{
-    UpdateActions();
-}
-
-#include <TrackView/moc_TrackViewDialog.cpp>
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDialog.h b/Code/Sandbox/Editor/TrackView/TrackViewDialog.h
deleted file mode 100644
index 43821de5be..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewDialog.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CTrackViewDialog Implementation file.
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDIALOG_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "IMovieSystem.h"
-
-#include "TrackViewNodes.h"
-#include "TrackViewDopeSheetBase.h"
-#include "TrackViewCurveEditor.h"
-#include "TrackViewKeyPropertiesDlg.h"
-#include "TrackViewSequence.h"
-#include "TrackViewSequenceManager.h"
-#include "AnimationContext.h"
-
-#include <AzCore/Component/EntityBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <QMainWindow>
-#endif
-
-class QSplitter;
-class QComboBox;
-class QLabel;
-
-class CMovieCallback;
-class CTrackViewFindDlg;
-
-class CTrackViewDialog
-    : public QMainWindow
-    , public IAnimationContextListener
-    , public IEditorNotifyListener
-    , public ITrackViewSequenceListener
-    , public ITrackViewSequenceManagerListener
-    , public AZ::EntitySystemBus::Handler
-    , private AzToolsFramework::ToolsApplicationNotificationBus::Handler
-    , IUndoManagerListener
-{
-    Q_OBJECT
-public:
-    friend CMovieCallback;
-
-    CTrackViewDialog(QWidget* pParent = NULL);
-    ~CTrackViewDialog();
-
-    static void RegisterViewClass();
-    static const GUID& GetClassID();
-
-    static CTrackViewDialog* GetCurrentInstance() { return s_pTrackViewDialog; }
-
-    void InvalidateDopeSheet();
-    void Update();
-
-    void ReloadSequences();
-    void InvalidateSequence();
-
-    void UpdateSequenceLockStatus();
-
-    // IAnimationContextListener
-    virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence) override;
-
-    // ITrackViewSequenceListener
-    virtual void OnSequenceSettingsChanged(CTrackViewSequence* pSequence) override;
-
-    void UpdateDopeSheetTime(CTrackViewSequence* pSequence);
-
-    const CTrackViewDopeSheetBase& GetTrackViewDopeSheet() const { return *m_wndDopeSheet; }
-    const AZStd::vector<AnimParamType>& GetDefaultTracksForEntityNode() const { return m_defaultTracksForEntityNode; }
-
-    bool IsDoingUndoOperation() const { return m_bDoingUndoOperation; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // AZ::EntitySystemBus
-    void OnEntityDestruction(const AZ::EntityId& entityId) override;
-    //~AZ::EntitySystemBus
-
-public: // static functions
-
-    static QString GetEntityIdAsString(const AZ::EntityId& entityId) { return QString::number(static_cast<AZ::u64>(entityId)); }
-
-protected slots:
-    void OnGoToPrevKey();
-    void OnGoToNextKey();
-    void OnAddKey();
-    void OnDelKey();
-    void OnMoveKey();
-    void OnSlideKey();
-    void OnScaleKey();
-    void OnSyncSelectedTracksToBase();
-    void OnSyncSelectedTracksFromBase();
-    void OnAddSequence();
-    void OnExportFBXSequence();
-    void OnExportNodeKeysGlobalTime();
-    void OnDelSequence();
-    void OnEditSequence();
-    void OnSequenceComboBox();
-    void OnAddSelectedNode();
-    void OnAddDirectorNode();
-    void OnFindNode();
-
-    void OnRecord();
-    void OnAutoRecord();
-    void OnAutoRecordStep();
-    void OnGoToStart();
-    void OnGoToEnd();
-    void OnPlay();
-    void OnPlaySetScale();
-    void OnStop();
-    void OnStopHardReset();
-    void OnPause();
-    void OnLoop();
-
-    void OnSnapNone();
-    void OnSnapMagnet();
-    void OnSnapFrame();
-    void OnSnapTick();
-    void OnSnapFPS();
-
-    void OnCustomizeTrackColors();
-
-    void OnBatchRender();
-
-    void OnModeDopeSheet();
-    void OnModeCurveEditor();
-    void OnOpenCurveEditor();
-
-    void OnViewTickInSeconds();
-    void OnViewTickInFrames();
-
-    void OnTracksToolBar();
-    void OnToggleDisable();
-    void OnToggleMute();
-    void OnMuteAll();
-    void OnUnmuteAll();
-
-protected:
-    void keyPressEvent(QKeyEvent* event) override;
-#if defined(AZ_PLATFORM_WINDOWS)
-    bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
-#endif
-    bool event(QEvent* event) override;
-
-private slots:
-    void ReadLayouts();
-    void FillAddSelectedEntityMenu();
-
-private:
-
-    enum class ViewMode
-    {
-        TrackView = 1,
-        CurveEditor = 2,
-        Both = 3
-    };
-
-    void setViewMode(ViewMode);
-    void UpdateActions();
-    void ReloadSequencesComboBox();
-
-    void UpdateTracksToolBar();
-    void ClearTracksToolBar();
-    void AddButtonToTracksToolBar(const CAnimParamType& paramId, const QIcon& hIcon, const QString& title);
-    void SetNodeForTracksToolBar(CTrackViewAnimNode* pNode) { m_pNodeForTracksToolBar = pNode; }
-
-    void SetEditLock(bool bLock);
-    void OnGameOrSimModeLock(bool lock);
-
-    void InitMenu();
-    void InitToolbar();
-    void InitSequences();
-    void OnAddEntityNodeMenu();
-
-    void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
-    BOOL OnInitDialog();
-
-    void SaveLayouts();
-    void SaveMiscSettings() const;
-    void ReadMiscSettings();
-    void SaveTrackColors() const;
-    void ReadTrackColors();
-
-    void SetCursorPosText(float fTime);
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    bool processRawInput(MSG* pMsg);
-#endif
-
-    virtual void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override;
-    virtual void OnNodeRenamed(CTrackViewNode* pNode, const char* pOldName) override;
-
-    void OnSequenceAdded(CTrackViewSequence* pSequence) override;
-    void OnSequenceRemoved(CTrackViewSequence* pSequence) override;
-
-    void AddSequenceListeners(CTrackViewSequence* sequence);
-    void RemoveSequenceListeners(CTrackViewSequence* sequence);
-
-    void AddDialogListeners();
-    void RemoveDialogListeners();
-
-    virtual void BeginUndoTransaction();
-    virtual void EndUndoTransaction();
-    void SaveCurrentSequenceToFBX();
-    void SaveSequenceTimingToXML();
-
-    // ToolsApplicationNotificationBus ...
-    void AfterEntitySelectionChanged(
-        const AzToolsFramework::EntityIdList& newlySelectedEntities,
-        const AzToolsFramework::EntityIdList& newlyDeselectedEntities) override;
-
-    // Instance
-    static CTrackViewDialog* s_pTrackViewDialog;
-
-    // GUI
-    QSplitter* m_wndSplitter;
-    CTrackViewNodesCtrl*    m_wndNodesCtrl;
-    CTrackViewDopeSheetBase*    m_wndDopeSheet;
-    QDockWidget* m_wndCurveEditorDock;
-    TrackViewCurveEditorDialog* m_wndCurveEditor;
-    CTrackViewKeyPropertiesDlg* m_wndKeyProperties;
-    CTrackViewFindDlg* m_findDlg;
-    QToolBar* m_mainToolBar;
-    QToolBar* m_keysToolBar;
-    QToolBar* m_playToolBar;
-    QToolBar* m_viewToolBar;
-    QToolBar* m_tracksToolBar;
-    QComboBox* m_sequencesComboBox;
-
-    QLabel* m_cursorPos;
-    QLabel* m_activeCamStatic;
-
-    // CryMovie
-    CMovieCallback* m_pMovieCallback;
-
-    // Current sequence
-    AZ::EntityId m_currentSequenceEntityId;
-
-    // State
-    bool m_bRecord;
-    bool m_bAutoRecord;
-    bool m_bPlay;
-    bool m_bPause;
-    bool m_bNeedReloadSequence;
-    bool m_bIgnoreUpdates;
-    bool m_bDoingUndoOperation;
-    bool m_lazyInitDone;
-    bool m_bEditLock;
-    bool m_enteringGameOrSimModeLock = false;
-    bool m_needReAddListeners = false;
-
-    float m_fLastTime;
-    float m_fAutoRecordStep;
-
-    CTrackViewAnimNode* m_pNodeForTracksToolBar;
-
-    int m_currentToolBarParamTypeId;
-    std::vector<CAnimParamType> m_toolBarParamTypes;
-
-    // Default tracks menu
-    AZStd::vector<AnimParamType> m_defaultTracksForEntityNode;
-
-    QHash<int, QAction*> m_actions;
-    ViewMode m_lastMode = ViewMode::TrackView;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDIALOG_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.cpp b/Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.cpp
deleted file mode 100644
index 5a2cdb3d84..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.cpp
+++ /dev/null
@@ -1,3659 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewDopeSheetBase.h"
-
-// Qt
-#include <QMenu>
-#include <QPainter>
-#include <QScrollBar>
-#include <QTimer>
-#include <QToolTip>
-
-// AzFramework
-#include <AzCore/std/sort.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/ColorPicker.h>
-#include <AzQtComponents/Utilities/Conversions.h>
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimValueType.h>
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-#include <CryCommon/Maestro/Types/AssetBlendKey.h>
-
-// Editor
-#include "Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h"
-#include "Clipboard.h"
-#include "Util/fastlib.h"
-#include "TrackView/TrackViewNodes.h"
-#include "TVCustomizeTrackColorsDlg.h"
-#include "TrackView/TrackViewKeyPropertiesDlg.h"
-
-
-#define EDIT_DISABLE_GRAY_COLOR QColor(128, 128, 128)
-#define KEY_TEXT_COLOR QColor(0, 0, 50)
-#define INACTIVE_TEXT_COLOR QColor(128, 128, 128)
-
-namespace
-{
-    const int kMarginForMagnetSnapping = 10;
-    const unsigned int kDefaultTrackHeight = 16;
-}
-
-enum ETVMouseMode
-{
-    eTVMouseMode_None = 0,
-    eTVMouseMode_Select = 1,
-    eTVMouseMode_Move,
-    eTVMouseMode_Clone,
-    eTVMouseMode_DragTime,
-    eTVMouseMode_DragStartMarker,
-    eTVMouseMode_DragEndMarker,
-    eTVMouseMode_Paste,
-    eTVMouseMode_SelectWithinTime,
-    eTVMouseMode_StartTimeAdjust,
-    eTVMouseMode_EndTimeAdjust
-};
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewDopeSheetBase::CTrackViewDopeSheetBase(QWidget* parent)
-    : QWidget(parent)
-{
-    m_bkgrBrush = palette().color(QPalette::Window);
-    m_bkgrBrushEmpty = QColor(190, 190, 190);
-    m_timeBkgBrush = QColor(0xE0, 0xE0, 0xE0);
-    m_timeHighlightBrush = QColor(0xFF, 0x0, 0x0);
-    m_selectedBrush = QColor(200, 200, 230);
-    m_visibilityBrush = QColor(120, 120, 255);
-    m_selectTrackBrush = QColor(100, 190, 255);
-
-    m_timeScale = 1.0f;
-    m_ticksStep = 10;
-
-    m_bZoomDrag = false;
-    m_bMoveDrag = false;
-
-    m_leftOffset = 30;
-    m_scrollOffset = QPoint(0, 0);
-    m_mouseMode = eTVMouseMode_None;
-    m_currentTime = 0.0f;
-    m_storedTime = m_currentTime;
-    m_rcSelect = QRect(0, 0, 0, 0);
-    m_rubberBand = 0;
-    m_scrollBar = new QScrollBar(Qt::Horizontal, this);
-    connect(m_scrollBar, &QScrollBar::valueChanged, this, &CTrackViewDopeSheetBase::OnHScroll);
-    m_keyTimeOffset = 0;
-    m_currCursor = QCursor(Qt::ArrowCursor);
-    m_mouseActionMode = eTVActionMode_MoveKey;
-
-    m_scrollMin = 0;
-    m_scrollMax = 1000;
-
-    m_descriptionFont = QFont(QStringLiteral("Verdana"), 7);
-
-    m_bCursorWasInKey = false;
-    m_bJustSelected = false;
-    m_snappingMode = eSnappingMode_SnapNone;
-    m_snapFrameTime = 0.033333f;
-    m_bMouseMovedAfterRButtonDown = false;
-    m_stashedRecordModeWhileTimeDragging = false;
-
-    m_tickDisplayMode = eTVTickMode_InSeconds;
-
-    m_bEditLock = false;
-
-    m_bFastRedraw = false;
-
-    m_pLastTrackSelectedOnSpot = NULL;
-
-    m_wndPropsOnSpot = nullptr;
-
-#ifdef DEBUG
-    m_redrawCount = 0;
-#endif
-    m_bKeysMoved = false;
-    ComputeFrameSteps(GetVisibleRange());
-
-    m_crsLeftRight = Qt::SizeHorCursor;
-
-    m_crsAddKey = CMFCUtils::LoadCursor(IDC_ARROW_ADDKEY);
-    m_crsCross = CMFCUtils::LoadCursor(IDC_POINTER_OBJHIT);
-    m_crsAdjustLR = CMFCUtils::LoadCursor(IDC_LEFTRIGHT);
-
-    setMouseTracking(true);
-    setFocusPolicy(Qt::StrongFocus);
-
-    m_colorUpdateTrack = nullptr;
-    m_colorUpdateKeyTime = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewDopeSheetBase::~CTrackViewDopeSheetBase()
-{
-    HideKeyPropertyCtrlOnSpot();
-    GetIEditor()->GetAnimation()->RemoveListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewDopeSheetBase::TimeToClient(float time) const
-{
-    int x = m_leftOffset - m_scrollOffset.x() + (time * m_timeScale);
-    return x;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Range CTrackViewDopeSheetBase::GetVisibleRange() const
-{
-    Range r;
-    r.start = (m_scrollOffset.x() - m_leftOffset) / m_timeScale;
-    r.end = r.start + (m_rcClient.width()) / m_timeScale;
-
-    Range extendedTimeRange(0.0f, m_timeRange.end);
-    r = extendedTimeRange & r;
-
-    return r;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Range CTrackViewDopeSheetBase::GetTimeRange(const QRect& rc) const
-{
-    Range r;
-    r.start = (rc.left() - m_leftOffset + m_scrollOffset.x()) / m_timeScale;
-    r.end = r.start + (rc.width()) / m_timeScale;
-
-    r.start = TickSnap(r.start);
-    r.end = TickSnap(r.end);
-
-    // Intersect range with global time range.
-    r = m_timeRange & r;
-
-    return r;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetTimeRange(float start, float end)
-{
-    if (m_timeMarked.start < start)
-    {
-        m_timeMarked.start = start;
-    }
-    if (m_timeMarked.end > end)
-    {
-        m_timeMarked.end = end;
-    }
-
-    m_timeRange.Set(start, end);
-
-    SetHorizontalExtent(-m_leftOffset, m_timeRange.end * m_timeScale - m_leftOffset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetTimeScale(float timeScale, float fAnchorTime)
-{
-    const double fOldOffset = -fAnchorTime * m_timeScale;
-    const double fOldScale = m_timeScale;
-
-    timeScale = std::max(timeScale, 0.001f);
-    timeScale = std::min(timeScale, 100000.0f);
-    m_timeScale = timeScale;
-
-    int steps = 0;
-    if (GetTickDisplayMode() == eTVTickMode_InSeconds)
-    {
-        m_ticksStep = 10;
-    }
-    else if (GetTickDisplayMode() == eTVTickMode_InFrames)
-    {
-        m_ticksStep = 1 / m_snapFrameTime;
-    }
-    else
-    {
-        assert(0);
-    }
-
-    double fPixelsPerTick;
-    do
-    {
-        fPixelsPerTick = (1.0 / m_ticksStep) * (double)m_timeScale;
-
-        if (fPixelsPerTick < 6.0)
-        {
-            m_ticksStep /= 2;
-        }
-
-        if (m_ticksStep <= 0)
-        {
-            m_ticksStep = 1;
-            break;
-        }
-        steps++;
-    }
-    while (fPixelsPerTick < 6.0 && steps < 100);
-
-    steps = 0;
-
-    do
-    {
-        fPixelsPerTick = (1.0 / m_ticksStep) * (double)m_timeScale;
-        if (fPixelsPerTick >= 12.0)
-        {
-            m_ticksStep *= 2;
-        }
-        if (m_ticksStep <= 0)
-        {
-            m_ticksStep = 1;
-            break;
-        }
-        steps++;
-    }
-    while (fPixelsPerTick >= 12.0 && steps < 100);
-
-    float fCurrentOffset = -fAnchorTime * m_timeScale;
-    m_scrollOffset.rx() += fOldOffset - fCurrentOffset;
-    m_scrollBar->setValue(m_scrollOffset.x());
-
-    update();
-
-    SetHorizontalExtent(-m_leftOffset, m_timeRange.end * m_timeScale);
-
-    ComputeFrameSteps(GetVisibleRange());
-
-    OnHScroll();
-}
-
-void CTrackViewDopeSheetBase::showEvent(QShowEvent* event)
-{
-    QWidget::showEvent(event);
-    GetIEditor()->GetAnimation()->AddListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::resizeEvent(QResizeEvent* event)
-{
-    QWidget::resizeEvent(event);
-
-    m_rcClient = rect();
-
-    m_offscreenBitmap = QPixmap(m_rcClient.width(), m_rcClient.height());
-    m_offscreenBitmap.fill(Qt::transparent);
-
-    m_rcTimeline = rect();
-    m_rcTimeline.setHeight(kDefaultTrackHeight);
-    m_rcSummary = m_rcTimeline;
-    m_rcSummary.setTop(m_rcTimeline.bottom());
-    m_rcSummary.setBottom(m_rcSummary.top() + 8);
-
-    SetHorizontalExtent(m_scrollMin, m_scrollMax);
-
-    m_scrollBar->setGeometry(0, height() - m_scrollBar->sizeHint().height(), width(), m_scrollBar->sizeHint().height());
-
-    QToolTip::hideText();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::wheelEvent(QWheelEvent* event)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSequence)
-    {
-        event->ignore();
-        return;
-    }
-
-    float z = (event->angleDelta().y() > 0) ? (m_timeScale * 1.25f) : (m_timeScale * 0.8f);
-    // Use m_mouseOverPos to get the local position in the timeline view instead of
-    // event->pos() which seems to include the variable left panel of the view that
-    // lists the tracks.
-    float fAnchorTime = TimeFromPointUnsnapped(m_mouseOverPos);
-    SetTimeScale(z, fAnchorTime);
-
-    event->accept();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnHScroll()
-{
-    // Get the current position of scroll box.
-    int curpos = m_scrollBar->value();
-    m_scrollOffset.setX(curpos);
-    update();
-}
-
-int CTrackViewDopeSheetBase::GetScrollPos() const
-{
-    return m_scrollBar->value();
-}
-
-//////////////////////////////////////////////////////////////////////////
-double CTrackViewDopeSheetBase::GetTickTime() const
-{
-    if (GetTickDisplayMode() == eTVTickMode_InFrames)
-    {
-        return m_fFrameTickStep;
-    }
-    else
-    {
-        return 1.0f / m_ticksStep;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewDopeSheetBase::TickSnap(float time) const
-{
-    double tickTime = GetTickTime();
-    double t = floor(((double)time / tickTime) + 0.5);
-    t *= tickTime;
-    return t;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewDopeSheetBase::TimeFromPoint(const QPoint& point) const
-{
-    int x = point.x() - m_leftOffset + m_scrollOffset.x();
-    double t = (double)x / m_timeScale;
-    return (float)TickSnap(t);
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewDopeSheetBase::TimeFromPointUnsnapped(const QPoint& point) const
-{
-    int x = point.x() - m_leftOffset + m_scrollOffset.x();
-    double t = (double)x / m_timeScale;
-    return t;
-}
-
-void CTrackViewDopeSheetBase::mousePressEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonDown(event->modifiers(), event->pos());
-        break;
-    case Qt::RightButton:
-        OnRButtonDown(event->modifiers(), event->pos());
-        break;
-    case Qt::MiddleButton:
-        OnMButtonDown(event->modifiers(), event->pos());
-        break;
-    default:
-        break;
-    }
-}
-
-void CTrackViewDopeSheetBase::mouseReleaseEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonUp(event->modifiers(), event->pos());
-        break;
-    case Qt::RightButton:
-        OnRButtonUp(event->modifiers(), event->pos());
-        break;
-    case Qt::MiddleButton:
-        OnMButtonUp(event->modifiers(), event->pos());
-        break;
-    default:
-        break;
-    }
-}
-
-void CTrackViewDopeSheetBase::mouseDoubleClickEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonDblClk(event->modifiers(), event->pos());
-        break;
-    default:
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    HideKeyPropertyCtrlOnSpot();
-
-    if (m_rcTimeline.contains(point))
-    {
-        m_mouseDownPos = point;
-
-        // Clicked inside timeline.
-        m_mouseMode = eTVMouseMode_DragTime;
-
-        // If mouse over selected key, change cursor to left-right arrows.
-        SetMouseCursor(m_crsLeftRight);
-
-        m_stashedRecordModeWhileTimeDragging = GetIEditor()->GetAnimation()->IsRecordMode();
-        GetIEditor()->GetAnimation()->SetRecording(false);  // disable recording while dragging time
-
-        SetCurrTime(TimeFromPoint(point));
-        return;
-    }
-
-    if (m_bEditLock)
-    {
-        m_mouseDownPos = point;
-        return;
-    }
-
-    if (m_mouseMode == eTVMouseMode_Paste)
-    {
-        m_mouseMode = eTVMouseMode_None;
-
-        CTrackViewAnimNode* animNode = GetAnimNodeFromPoint(m_mouseOverPos);
-        CTrackViewTrack* pTrack = GetTrackFromPoint(m_mouseOverPos);
-
-        if (animNode)
-        {
-            AzToolsFramework::ScopedUndoBatch undoBatch("Paste Keys");
-            sequence->DeselectAllKeys();
-            sequence->PasteKeysFromClipboard(animNode, pTrack, ComputeSnappedMoveOffset());
-            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-        }
-
-        SetMouseCursor(Qt::ArrowCursor);
-        OnCaptureChanged();
-        return;
-    }
-
-    m_mouseDownPos = point;
-
-    // The summary region is used for moving already selected keys.
-    if (m_rcSummary.contains(point))
-    {
-        CTrackViewKeyBundle selectedKeys = sequence->GetSelectedKeys();
-        if (selectedKeys.GetKeyCount() > 0)
-        {
-            // Move/Clone Key Undo Begin
-            GetIEditor()->BeginUndo();
-            StoreMementoForTracksWithSelectedKeys();
-
-            m_keyTimeOffset = 0;
-            m_mouseMode = eTVMouseMode_Move;
-            SetMouseCursor(m_crsLeftRight);
-            return;
-        }
-    }
-
-    bool bStart = false;
-    CTrackViewKeyHandle keyHandle = CheckCursorOnStartEndTimeAdjustBar(point, bStart);
-    if (keyHandle.IsValid())
-    {
-        return LButtonDownOnTimeAdjustBar(point, keyHandle, bStart);
-    }
-
-    keyHandle = FirstKeyFromPoint(point);
-    if (!keyHandle.IsValid())
-    {
-        keyHandle = DurationKeyFromPoint(point);
-    }
-
-    if (keyHandle.IsValid())
-    {
-        return LButtonDownOnKey(point, keyHandle, modifiers);
-    }
-
-    if (m_mouseActionMode == eTVActionMode_AddKeys)
-    {
-        AddKeys(point, modifiers & Qt::ShiftModifier);
-        return;
-    }
-
-    if (modifiers & Qt::ShiftModifier)
-    {
-        m_mouseMode = eTVMouseMode_SelectWithinTime;
-    }
-    else
-    {
-        m_mouseMode = eTVMouseMode_Select;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (!pSequence)
-    {
-        return;
-    }
-
-    if (m_mouseMode == eTVMouseMode_Select)
-    {
-        // Check if any key are selected.
-        m_rcSelect.translate(-m_scrollOffset);
-        SelectKeys(m_rcSelect, modifiers & Qt::ControlModifier);
-        m_rcSelect = QRect();
-        m_rubberBand->deleteLater();
-        m_rubberBand = 0;
-    }
-    else if (m_mouseMode == eTVMouseMode_SelectWithinTime)
-    {
-        m_rcSelect.translate(-m_scrollOffset);
-        SelectAllKeysWithinTimeFrame(m_rcSelect, modifiers & Qt::ControlModifier);
-        m_rcSelect = QRect();
-        m_rubberBand->deleteLater();
-        m_rubberBand = 0;
-    }
-    else if (m_mouseMode == eTVMouseMode_DragTime)
-    {
-        SetMouseCursor(Qt::ArrowCursor);
-        // Notify that time was explicitly set
-        GetIEditor()->GetAnimation()->TimeChanged(TimeFromPoint(point));
-        if (m_stashedRecordModeWhileTimeDragging)
-        {
-            GetIEditor()->GetAnimation()->SetRecording(true);   // re-enable recording that was disabled while dragging time
-            m_stashedRecordModeWhileTimeDragging = false;       // reset stashed value
-        }
-
-    }
-    else if (m_mouseMode == eTVMouseMode_Paste)
-    {
-        SetMouseCursor(Qt::ArrowCursor);
-    }
-
-    OnCaptureChanged();
-
-    m_keyTimeOffset = 0;
-    m_keyForTimeAdjust = CTrackViewKeyHandle();
-
-    AcceptUndo();
-
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence || m_rcTimeline.contains(point) || m_bEditLock)
-    {
-        return;
-    }
-
-    CTrackViewKeyHandle keyHandle = FirstKeyFromPoint(point);
-
-    if (!keyHandle.IsValid())
-    {
-        keyHandle = DurationKeyFromPoint(point);
-    }
-    else
-    {
-        CTrackViewTrack* pTrack = GetTrackFromPoint(point);
-        if (pTrack)
-        {
-            CTrackViewSequenceNotificationContext context(sequence);
-
-            AzToolsFramework::ScopedUndoBatch undoBatch("Select key");
-
-            const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
-
-            sequence->DeselectAllKeys();
-            keyHandle.Select(true);
-
-            const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
-
-            if (beforeKeyState != afterKeyState)
-            {
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-
-            m_keyTimeOffset = 0;
-
-            if (pTrack->GetValueType() == AnimValueType::RGB)
-            {
-                // bring up color picker
-                EditSelectedColorKey(pTrack);
-            }
-            else if (pTrack->GetValueType() != AnimValueType::Bool)
-            {
-                // Edit On Spot is blank (not useful) for boolean tracks so we disable dbl-clicking to bring it up for boolean tracks
-                const QPoint p = QCursor::pos();
-
-                bool bKeyChangeInSameTrack = m_pLastTrackSelectedOnSpot && pTrack == m_pLastTrackSelectedOnSpot;
-                m_pLastTrackSelectedOnSpot = pTrack;
-
-                ShowKeyPropertyCtrlOnSpot(p.x(), p.y(), sequence->GetSelectedKeys().GetKeyCount() > 1, bKeyChangeInSameTrack);
-            }
-        }
-
-        return;
-    }
-
-    const bool bTryAddKeysInGroup = modifiers & Qt::ShiftModifier;
-
-    AddKeys(point, bTryAddKeysInGroup);
-
-    m_mouseMode = eTVMouseMode_None;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    OnRButtonDown(modifiers, point);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    OnRButtonUp(modifiers, point);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSequence)
-    {
-        return;
-    }
-
-    HideKeyPropertyCtrlOnSpot();
-
-    m_bCursorWasInKey = false;
-    m_bMouseMovedAfterRButtonDown = false;
-
-    if (m_rcTimeline.contains(point))
-    {
-        // Clicked inside timeline.
-        // adjust markers.
-        int nMarkerStart = TimeToClient(m_timeMarked.start);
-        int nMarkerEnd = TimeToClient(m_timeMarked.end);
-        if ((abs(point.x() - nMarkerStart)) < (abs(point.x() - nMarkerEnd)))
-        {
-            SetStartMarker(TimeFromPoint(point));
-            m_mouseMode = eTVMouseMode_DragStartMarker;
-        }
-        else
-        {
-            SetEndMarker(TimeFromPoint(point));
-            m_mouseMode = eTVMouseMode_DragEndMarker;
-        }
-        return;
-    }
-
-    m_mouseDownPos = point;
-
-    if (modifiers & Qt::ShiftModifier)  // alternative zoom
-    {
-        m_bZoomDrag = true;
-        return;
-    }
-
-    CTrackViewKeyHandle keyHandle = FirstKeyFromPoint(point);
-    if (!keyHandle.IsValid())
-    {
-        keyHandle = DurationKeyFromPoint(point);
-    }
-
-    if (keyHandle.IsValid())
-    {
-        m_bCursorWasInKey = true;
-
-        CTrackViewNode* pNode = GetNodeFromPoint(point);
-        CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(pNode);
-
-        keyHandle.Select(true);
-        m_keyTimeOffset = 0;
-        update();
-
-        // Show a little pop-up menu for copy & delete.
-        QMenu menu;
-        CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
-        const bool bEnableEditOnSpot = ((pTrack && pTrack->GetValueType() != AnimValueType::Bool) &&
-                                        (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType()));
-
-        QAction* actionEditOnSpot = menu.addAction(tr("Edit On Spot"));
-        actionEditOnSpot->setEnabled(bEnableEditOnSpot);
-        menu.addSeparator();
-        QAction* actionCopy = menu.addAction(tr("Copy"));
-        menu.addSeparator();
-        QAction* actionDelete = menu.addAction(tr("Delete"));
-
-        const QPoint p = QCursor::pos();
-        QAction* action = menu.exec(p);
-        if (action == actionEditOnSpot)
-        {
-            bool bKeyChangeInSameTrack
-                = m_pLastTrackSelectedOnSpot
-                    && selectedKeys.GetKeyCount() == 1
-                    && selectedKeys.GetKey(0).GetTrack() == m_pLastTrackSelectedOnSpot;
-
-            if (selectedKeys.GetKeyCount() == 1)
-            {
-                m_pLastTrackSelectedOnSpot = selectedKeys.GetKey(0).GetTrack();
-            }
-            else
-            {
-                m_pLastTrackSelectedOnSpot = NULL;
-            }
-
-            ShowKeyPropertyCtrlOnSpot(p.x(), p.y(), selectedKeys.GetKeyCount() > 1, bKeyChangeInSameTrack);
-        }
-        else if (action == actionCopy)
-        {
-            pSequence->CopyKeysToClipboard(true, false);
-        }
-        else if (action == actionDelete)
-        {
-            CUndo undo("Delete Keys");
-            pSequence->DeleteSelectedKeys();
-        }
-    }
-    else
-    {
-        m_bMoveDrag = true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnRButtonUp([[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSequence)
-    {
-        return;
-    }
-
-    m_bZoomDrag = false;
-    m_bMoveDrag = false;
-
-    OnCaptureChanged();
-
-    m_mouseMode = eTVMouseMode_None;
-
-    if (!m_bCursorWasInKey)
-    {
-        const bool bHasCopiedKey = (GetKeysInClickboard() != NULL);
-
-        if (bHasCopiedKey && m_bMouseMovedAfterRButtonDown == false)    // Once moved, it means the user wanted to scroll, so no paste pop-up.
-        {
-            // Show a little pop-up menu for paste.
-            QMenu menu;
-            QAction* actionPaste = menu.addAction(tr("Paste"));
-
-            QAction* action = menu.exec(QCursor::pos());
-            if (action == actionPaste)
-            {
-                StartPasteKeys();
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::CancelDrag()
-{
-    AcceptUndo();
-    m_mouseMode = eTVMouseMode_None;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::mouseMoveEvent(QMouseEvent* event)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSequence)
-    {
-        return;
-    }
-
-    // To prevent the key moving while selecting
-    if (m_bJustSelected)
-    {
-        m_bJustSelected = false;
-        return;
-    }
-
-    // For some drags, make sure the left mouse button is still down.
-    // If you drag off the window, and press the right mouse button,
-    // and *then* release the left mouse button, QT will never tell us
-    // about the release event.
-    bool leftButtonPressed = event->buttons() & Qt::LeftButton;
-
-    m_bMouseMovedAfterRButtonDown = true;
-    m_mouseOverPos = event->pos();
-
-    if (m_bZoomDrag && (event->modifiers() & Qt::ShiftModifier))
-    {
-        float fAnchorTime = TimeFromPointUnsnapped(m_mouseDownPos);
-        SetTimeScale(m_timeScale * (1.0f + (event->pos().x() - m_mouseDownPos.x()) * 0.0025f), fAnchorTime);
-        m_mouseDownPos = event->pos();
-        return;
-    }
-    else
-    {
-        m_bZoomDrag = false;
-    }
-
-    if (m_bMoveDrag)
-    {
-        m_scrollOffset.setX(qBound(m_scrollMin, m_scrollOffset.x() + m_mouseDownPos.x() - event->pos().x(), m_scrollMax));
-        m_mouseDownPos = event->pos();
-        // Set the new position of the thumb (scroll box).
-        m_scrollBar->setValue(m_scrollOffset.x());
-        update();
-        SetMouseCursor(m_crsLeftRight);
-        return;
-    }
-
-    if (m_mouseMode == eTVMouseMode_Select
-        || m_mouseMode == eTVMouseMode_SelectWithinTime)
-    {
-        MouseMoveSelect(event->pos());
-    }
-    else if (m_mouseMode == eTVMouseMode_Move)
-    {
-        if (leftButtonPressed)
-        {
-            MouseMoveMove(event->pos(), event->modifiers());
-        }
-        else
-        {
-            CancelDrag();
-        }
-    }
-    else if (m_mouseMode == eTVMouseMode_Clone)
-    {
-        pSequence->CloneSelectedKeys();
-        m_mouseMode = eTVMouseMode_Move;
-    }
-    else if (m_mouseMode == eTVMouseMode_DragTime)
-    {
-        if (leftButtonPressed)
-        {
-            MouseMoveDragTime(event->pos(), event->modifiers());
-        }
-        else
-        {
-            CancelDrag();
-        }
-    }
-    else if (m_mouseMode == eTVMouseMode_DragStartMarker)
-    {
-        if (leftButtonPressed)
-        {
-            MouseMoveDragStartMarker(event->pos(), event->modifiers());
-        }
-        else
-        {
-            CancelDrag();
-        }
-    }
-    else if (m_mouseMode == eTVMouseMode_DragEndMarker)
-    {
-        if (leftButtonPressed)
-        {
-            MouseMoveDragEndMarker(event->pos(), event->modifiers());
-        }
-        else
-        {
-            CancelDrag();
-        }
-    }
-    else if (m_mouseMode == eTVMouseMode_Paste)
-    {
-        update();
-    }
-    else if (m_mouseMode == eTVMouseMode_StartTimeAdjust)
-    {
-        if (leftButtonPressed)
-        {
-            MouseMoveStartEndTimeAdjust(event->pos(), true);
-        }
-        else
-        {
-            CancelDrag();
-        }
-    }
-    else if (m_mouseMode == eTVMouseMode_EndTimeAdjust)
-    {
-        if (leftButtonPressed)
-        {
-            MouseMoveStartEndTimeAdjust(event->pos(), false);
-        }
-        else
-        {
-            CancelDrag();
-        }
-    }
-    else
-    {
-        //////////////////////////////////////////////////////////////////////////
-        if (m_mouseActionMode == eTVActionMode_AddKeys)
-        {
-            SetMouseCursor(m_crsAddKey);
-        }
-        else
-        {
-            MouseMoveOver(event->pos());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::paintEvent(QPaintEvent* event)
-{
-    QPainter painter(this);
-
-    {
-        // In case of the fast-redraw mode, just draw the saved bitmap.
-        // Otherwise, actually redraw all things.
-        // This mode is helpful when playing a sequence if the sequence has a lot of keys.
-        if (!m_bFastRedraw)
-        {
-            QLinearGradient gradient(rect().topLeft(), rect().bottomLeft());
-            gradient.setColorAt(0, QColor(250, 250, 250));
-            gradient.setColorAt(1, QColor(220, 220, 220));
-            painter.fillRect(rect(), gradient);
-
-            if (GetIEditor()->GetAnimation()->GetSequence())
-            {
-                if (m_bEditLock)
-                {
-                    painter.fillRect(event->rect(), EDIT_DISABLE_GRAY_COLOR);
-                }
-
-                DrawControl(&painter, event->rect());
-            }
-        }
-    }
-
-    if (GetIEditor()->GetAnimation()->GetSequence())
-    {
-        // Drawing the timeline is handled separately. In other words, it's not saved to the 'm_offscreenBitmap'.
-        // This is for the fast-redraw mode mentioned above.
-        DrawTimeline(&painter, event->rect());
-    }
-
-#ifdef DEBUG
-    painter.setFont(m_descriptionFont);
-    painter.setPen(QColor(255, 255, 255));
-    painter.setBrush(QColor(0, 0, 0));
-
-    const QString redrawCountStr = QString::fromLatin1("Redraw Count: %1").arg(m_redrawCount);
-    QRect redrawCountRect(0, 0, 150, 20);
-
-    QRect bounds;
-    painter.drawText(redrawCountRect, Qt::AlignLeft | Qt::TextSingleLine, redrawCountStr, &bounds);
-    painter.fillRect(bounds, Qt::black);
-    painter.drawText(redrawCountRect, Qt::AlignLeft | Qt::TextSingleLine, redrawCountStr);
-
-    ++m_redrawCount;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SelectAllKeysWithinTimeFrame(const QRect& rc, const bool bMultiSelection)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    AzToolsFramework::ScopedUndoBatch undoBatch("Select keys");
-
-    const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
-
-    if (!bMultiSelection)
-    {
-        sequence->DeselectAllKeys();
-    }
-
-    // put selection rectangle from client to track space.
-    QRect trackRect = rc;
-    trackRect.translate(m_scrollOffset);
-
-    Range selTime = GetTimeRange(trackRect);
-
-    CTrackViewTrackBundle tracks = sequence->GetAllTracks();
-
-    CTrackViewSequenceNotificationContext context(sequence);
-    for (int i = 0; i < tracks.GetCount(); ++i)
-    {
-        CTrackViewTrack* pTrack = tracks.GetTrack(i);
-
-        // Check which keys we intersect.
-        for (int j = 0; j < pTrack->GetKeyCount(); j++)
-        {
-            CTrackViewKeyHandle keyHandle = pTrack->GetKey(j);
-            const float time = keyHandle.GetTime();
-
-            if (selTime.IsInside(time))
-            {
-                keyHandle.Select(true);
-            }
-        }
-    }
-
-    const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
-
-    if (beforeKeyState != afterKeyState)
-    {
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetMouseCursor(const QCursor& cursor)
-{
-    m_currCursor = cursor;
-    setCursor(m_currCursor);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetCurrTime(float time)
-{
-    if (time < m_timeRange.start)
-    {
-        time = m_timeRange.start;
-    }
-    if (time > m_timeRange.end)
-    {
-        time = m_timeRange.end;
-    }
-
-    GetIEditor()->GetAnimation()->SetTime(time);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnTimeChanged(float newTime)
-{
-    int x1 = TimeToClient(m_currentTime);
-    int x2 = TimeToClient(newTime);
-
-    m_currentTime = newTime;
-
-    m_bFastRedraw = true;
-    const QRect rc(QPoint(x1 - 3, m_rcClient.top()), QPoint(x1 + 4, m_rcClient.bottom()));
-    update(rc);
-    const QRect rc1(QPoint(x2 - 3, m_rcClient.top()), QPoint(x2 + 4, m_rcClient.bottom()));
-    update(rc1);
-    m_bFastRedraw = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetStartMarker(float fTime)
-{
-    m_timeMarked.start = fTime;
-
-    if (m_timeMarked.start < m_timeRange.start)
-    {
-        m_timeMarked.start = m_timeRange.start;
-    }
-    if (m_timeMarked.start > m_timeRange.end)
-    {
-        m_timeMarked.start = m_timeRange.end;
-    }
-    if (m_timeMarked.start > m_timeMarked.end)
-    {
-        m_timeMarked.end = m_timeMarked.start;
-    }
-
-    GetIEditor()->GetAnimation()->SetMarkers(m_timeMarked);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetEndMarker(float fTime)
-{
-    m_timeMarked.end = fTime;
-    if (m_timeMarked.end < m_timeRange.start)
-    {
-        m_timeMarked.end = m_timeRange.start;
-    }
-    if (m_timeMarked.end > m_timeRange.end)
-    {
-        m_timeMarked.end = m_timeRange.end;
-    }
-    if (m_timeMarked.start > m_timeMarked.end)
-    {
-        m_timeMarked.start = m_timeMarked.end;
-    }
-    GetIEditor()->GetAnimation()->SetMarkers(m_timeMarked);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetMouseActionMode(ETVActionMode mode)
-{
-    m_mouseActionMode = mode;
-    if (mode == eTVActionMode_AddKeys)
-    {
-        setCursor(m_crsAddKey);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNode* CTrackViewDopeSheetBase::GetNodeFromPointRec(CTrackViewNode* pCurrentNode, const QPoint& point)
-{
-    QRect currentNodeRect = GetNodeRect(pCurrentNode);
-
-    if (currentNodeRect.top() > point.y())
-    {
-        return nullptr;
-    }
-
-    if (currentNodeRect.bottom() >= point.y())
-    {
-        return pCurrentNode;
-    }
-
-    if (pCurrentNode->GetExpanded())
-    {
-        unsigned int childCount = pCurrentNode->GetChildCount();
-        for (unsigned int i = 0; i < childCount; ++i)
-        {
-            CTrackViewNode* pFoundNode = GetNodeFromPointRec(pCurrentNode->GetChild(i), point);
-            if (pFoundNode)
-            {
-                return pFoundNode;
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNode* CTrackViewDopeSheetBase::GetNodeFromPoint(const QPoint& point)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    return GetNodeFromPointRec(pSequence, point);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode* CTrackViewDopeSheetBase::GetAnimNodeFromPoint(const QPoint& point)
-{
-    CTrackViewNode* pNode = GetNodeFromPoint(point);
-
-    if (pNode)
-    {
-        if (pNode->GetNodeType() == eTVNT_Track)
-        {
-            CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(pNode);
-            return static_cast<CTrackViewAnimNode*>(pTrack->GetAnimNode());
-        }
-        else if (pNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            return static_cast<CTrackViewAnimNode*>(pNode);
-        }
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrack* CTrackViewDopeSheetBase::GetTrackFromPoint(const QPoint& point)
-{
-    CTrackViewNode* pNode = GetNodeFromPoint(point);
-
-    if (pNode && pNode->GetNodeType() == eTVNT_Track)
-    {
-        return static_cast<CTrackViewTrack*>(pNode);
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetHorizontalExtent(int min, int max)
-{
-    m_scrollMin = min;
-    m_scrollMax = max;
-    m_scrollBar->setPageStep(m_rcClient.width() / 2);
-    m_scrollBar->setRange(min, max - m_scrollBar->pageStep() * 2 + m_leftOffset);
-};
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CTrackViewDopeSheetBase::GetKeysInClickboard()
-{
-    CClipboard clip(this);
-    if (clip.IsEmpty())
-    {
-        return NULL;
-    }
-
-    if (clip.GetTitle() != "Track view keys")
-    {
-        return NULL;
-    }
-
-    XmlNodeRef copyNode = clip.Get();
-    if (copyNode == NULL || strcmp(copyNode->getTag(), "CopyKeysNode"))
-    {
-        return NULL;
-    }
-
-    int nNumTracksToPaste = copyNode->getChildCount();
-    if (nNumTracksToPaste == 0)
-    {
-        return NULL;
-    }
-
-    return copyNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::StartPasteKeys()
-{
-    m_clipboardKeys = GetKeysInClickboard();
-
-    if (m_clipboardKeys)
-    {
-        m_mouseMode = eTVMouseMode_Paste;
-        // If mouse over selected key, change cursor to left-right arrows.
-        SetMouseCursor(m_crsLeftRight);
-        m_mouseDownPos = m_mouseOverPos;
-    }
-}
-
-void CTrackViewDopeSheetBase::keyPressEvent(QKeyEvent* event)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
-    if (event->matches(QKeySequence::Delete))
-    {
-        CUndo undo("Delete Keys");
-        sequence->DeleteSelectedKeys();
-        return;
-    }
-
-    if (event->key() == Qt::Key_Up || event->key() == Qt::Key_Down || event->key() == Qt::Key_Right || event->key() == Qt::Key_Left)
-    {
-        CTrackViewKeyBundle keyBundle = sequence->GetSelectedKeys();
-        CTrackViewKeyHandle keyHandle = keyBundle.GetSingleSelectedKey();
-
-        if (keyHandle.IsValid())
-        {
-            switch (event->key())
-            {
-            case Qt::Key_Up:
-                keyHandle = keyHandle.GetAboveKey();
-                break;
-            case Qt::Key_Down:
-                keyHandle = keyHandle.GetBelowKey();
-                break;
-            case Qt::Key_Right:
-                keyHandle = keyHandle.GetNextKey();
-                break;
-            case Qt::Key_Left:
-                keyHandle = keyHandle.GetPrevKey();
-                break;
-            }
-
-            if (keyHandle.IsValid())
-            {
-                CTrackViewSequenceNotificationContext context(sequence);
-
-                const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
-
-                AzToolsFramework::ScopedUndoBatch undoBatch("Select Key");
-
-                sequence->DeselectAllKeys();
-                keyHandle.Select(true);
-
-                const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
-
-                if (beforeKeyState != afterKeyState)
-                {
-                    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-                }
-
-            }
-        }
-
-        return;
-    }
-
-    if (event->matches(QKeySequence::Copy))
-    {
-        sequence->CopyKeysToClipboard(true, false);
-    }
-    else if (event->matches(QKeySequence::Paste))
-    {
-        StartPasteKeys();
-    }
-    else if (event->matches(QKeySequence::Undo))
-    {
-        GetIEditor()->Undo();
-    }
-    else if (event->matches(QKeySequence::Redo))
-    {
-        GetIEditor()->Redo();
-    }
-    else
-    {
-        return QWidget::keyPressEvent(event);
-    }
-}
-
-bool CTrackViewDopeSheetBase::event(QEvent* e)
-{
-    if (e->type() == QEvent::ShortcutOverride)
-    {
-        // since we respond to the following things, let Qt know so that shortcuts don't override us
-        bool respondsToEvent = false;
-
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
-        switch (keyEvent->key())
-        {
-            case Qt::Key_Delete:
-            case Qt::Key_Up:
-            case Qt::Key_Down:
-            case Qt::Key_Left:
-            case Qt::Key_Right:
-                respondsToEvent = true;
-            break;
-
-            default:
-                respondsToEvent =
-                    keyEvent->matches(QKeySequence::Copy) ||
-                    keyEvent->matches(QKeySequence::Paste) ||
-                    keyEvent->matches(QKeySequence::Undo) ||
-                    keyEvent->matches(QKeySequence::Redo);
-            break;
-        }
-
-        if (respondsToEvent)
-        {
-            e->accept();
-            return true;
-        }
-    }
-
-    return QWidget::event(e);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::ShowKeyTooltip(CTrackViewKeyHandle& keyHandle, const QPoint& point)
-{
-    if (m_lastTooltipPos == point)
-    {
-        return;
-    }
-
-    m_lastTooltipPos = point;
-
-    const float time = keyHandle.GetTime();
-    const char* desc = keyHandle.GetDescription();
-
-    QString tipText;
-    if (GetTickDisplayMode() == eTVTickMode_InSeconds)
-    {
-        tipText = tr("%1, {%2}").arg(time, 0, 'f', 3).arg(desc);
-    }
-    else
-    {
-        tipText = tr("%1, {%2}").arg(ftoi(time / m_snapFrameTime)).arg(desc);
-    }
-
-    QToolTip::showText(point, tipText);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::OnCaptureChanged()
-{
-    AcceptUndo();
-
-    m_bZoomDrag = false;
-    m_bMoveDrag = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewDopeSheetBase::IsOkToAddKeyHere(const CTrackViewTrack* pTrack, float time) const
-{
-    const float timeEpsilon = 0.05f;
-
-    for (int i = 0; i < pTrack->GetKeyCount(); ++i)
-    {
-        const CTrackViewKeyConstHandle& keyHandle = pTrack->GetKey(i);
-
-        if (keyHandle.GetTime() == time)
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::MouseMoveSelect(const QPoint& point)
-{
-    SetMouseCursor(Qt::ArrowCursor);
-    QRect rc(m_mouseDownPos, point);
-    rc = rc.normalized();
-    QRect rcClient = rect();
-    rc = rc.intersected(rcClient);
-
-    if (m_rubberBand == nullptr)
-    {
-        m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
-    }
-    m_rubberBand->show();
-    if (m_mouseMode == eTVMouseMode_SelectWithinTime)
-    {
-        rc.setTop(m_rcClient.top());
-        rc.setBottom(m_rcClient.bottom());
-    }
-
-    m_rcSelect = rc;
-    m_rubberBand->setGeometry(m_rcSelect);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::MouseMoveStartEndTimeAdjust(const QPoint& p, bool bStart)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    SetMouseCursor(m_crsAdjustLR);
-    const QPoint point(qBound(m_rcClient.left(), p.x(), m_rcClient.right()), p.y());
-
-    const QPoint ofs = point - m_mouseDownPos;
-
-    CTrackViewKeyHandle& keyHandle = m_keyForTimeAdjust;
-
-    // TODO: Refactor this Time Range Key stuff.
-    ICharacterKey characterKey;
-    AZ::IAssetBlendKey assetBlendKey;
-    ITimeRangeKey* timeRangeKey = nullptr;
-
-    if (keyHandle.GetTrack()->GetValueType() == AnimValueType::AssetBlend)
-    {
-        keyHandle.GetKey(&assetBlendKey);
-        timeRangeKey = &assetBlendKey;
-    }
-    else
-    {
-        // This will work for both character & time range keys because
-        // ICharacterKey is derived from ITimeRangeKey. Not the most beautiful code.
-        keyHandle.GetKey(&characterKey);
-        timeRangeKey = &characterKey;
-    }
-
-    float& timeToAdjust = bStart ? timeRangeKey->m_startTime : timeRangeKey->m_endTime;
-
-    // Undo the last offset.
-    timeToAdjust += -m_keyTimeOffset;
-
-    // Apply a new offset.
-    m_keyTimeOffset = (ofs.x() / m_timeScale) * timeRangeKey->m_speed;
-    timeToAdjust += m_keyTimeOffset;
-
-    // Check the validity.
-    if (bStart)
-    {
-        if (timeToAdjust < 0)
-        {
-            timeToAdjust = 0;
-        }
-        else if (timeToAdjust > timeRangeKey->GetValidEndTime())
-        {
-            timeToAdjust = timeRangeKey->GetValidEndTime();
-        }
-    }
-    else
-    {
-        float endTime = AZStd::min(timeRangeKey->GetValidEndTime(), timeRangeKey->m_duration);
-        if (timeToAdjust < timeRangeKey->m_startTime)
-        {
-            timeToAdjust = timeRangeKey->m_startTime;
-        }
-        else if (timeToAdjust > endTime)
-        {
-            timeToAdjust = endTime;
-        }
-    }
-
-    keyHandle.SetKey(timeRangeKey);
-
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::MouseMoveMove(const QPoint& p, [[maybe_unused]] Qt::KeyboardModifiers modifiers)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    CTrackViewSequenceNotificationContext context(pSequence);
-
-    SetMouseCursor(m_crsLeftRight);
-    const QPoint point(qBound(m_rcClient.left(), p.x(), m_rcClient.right()), p.y());
-
-    // Reset tracks to their initial state before starting the move
-    for (auto iter = m_trackMementos.begin(); iter != m_trackMementos.end(); ++iter)
-    {
-        CTrackViewTrack* pTrack = iter->first;
-
-        const TrackMemento& trackMemento = iter->second;
-        pTrack->RestoreFromMemento(trackMemento.m_memento);
-
-        const unsigned int numKeys = trackMemento.m_keySelectionStates.size();
-        for (unsigned int i = 0; i < numKeys; ++i)
-        {
-            pTrack->GetKey(i).Select(trackMemento.m_keySelectionStates[i]);
-        }
-    }
-
-    CTrackViewKeyHandle keyHandle = FirstKeyFromPoint(m_mouseDownPos);
-    if (!keyHandle.IsValid())
-    {
-        keyHandle = DurationKeyFromPoint(m_mouseDownPos);
-    }
-
-    float oldTime;
-    if (keyHandle.IsValid())
-    {
-        oldTime = keyHandle.GetTime();
-    }
-    else
-    {
-        oldTime = TimeFromPointUnsnapped(m_mouseDownPos);
-    }
-
-    QPoint ofs = point - m_mouseDownPos;
-    float timeOffset = ofs.x() / m_timeScale;
-    float newTime = oldTime + timeOffset;
-
-    // Snap it, if necessary.
-    ESnappingMode snappingMode = GetKeyModifiedSnappingMode();
-    if (snappingMode == eSnappingMode_SnapFrame)
-    {
-        snappingMode = m_snappingMode;
-    }
-
-    if (snappingMode == eSnappingMode_SnapMagnet)
-    {
-        newTime = MagnetSnap(newTime, GetAnimNodeFromPoint(m_mouseOverPos));
-    }
-
-    else if (snappingMode == eSnappingMode_SnapTick)
-    {
-        newTime = TickSnap(newTime);
-    }
-
-    else if (snappingMode == eSnappingMode_SnapFrame)
-    {
-        newTime = FrameSnap(newTime);
-    }
-
-    Range extendedTimeRange(0.0f, m_timeRange.end);
-    extendedTimeRange.ClipValue(newTime);
-
-    timeOffset = newTime - oldTime; // Re-compute the time offset using snapped & clipped 'newTime'.
-    if (timeOffset == 0.0f)
-    {
-        return;
-    }
-
-    m_bKeysMoved = true;
-
-    if (m_mouseActionMode == eTVActionMode_ScaleKey)
-    {
-        float tscale = 0.005f;
-        float tofs = ofs.x() * tscale;
-        tofs = pSequence->ClipTimeOffsetForScaling(1 + tofs) - 1;
-        // Offset all selected keys by this offset.
-        pSequence->ScaleSelectedKeys(1 + tofs);
-        m_keyTimeOffset = tofs;
-    }
-    else
-    {
-        // Offset all selected keys by this offset.
-        if (m_mouseActionMode == eTVActionMode_SlideKey)
-        {
-            timeOffset = pSequence->ClipTimeOffsetForSliding(timeOffset);
-            pSequence->SlideKeys(timeOffset);
-        }
-        else
-        {
-            timeOffset = pSequence->ClipTimeOffsetForOffsetting(timeOffset);
-            pSequence->OffsetSelectedKeys(timeOffset);
-        }
-
-        if (CheckVirtualKey(Qt::Key_Menu))
-        {
-            CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
-            CTrackViewKeyHandle selectedKey = selectedKeys.GetSingleSelectedKey();
-
-            if (selectedKey.IsValid())
-            {
-                GetIEditor()->GetAnimation()->SetTime(selectedKey.GetTime());
-            }
-        }
-        m_keyTimeOffset = timeOffset;
-    }
-
-    // The time of the selected keys has likely just changed. OnKeySelectionChanged() so the 
-    // UI elements of the key properties control will update.
-    pSequence->OnKeySelectionChanged();
-}
-
-void CTrackViewDopeSheetBase::MouseMoveDragTime(const QPoint& point, Qt::KeyboardModifiers modifiers)
-{
-    const QPoint p(qBound(m_rcClient.left(), point.x(), m_rcClient.right()),
-        qBound(m_rcClient.top(), point.y(), m_rcClient.bottom()));
-
-    float time = TimeFromPointUnsnapped(p);
-    m_timeRange.ClipValue(time);
-
-    bool bSnap = (modifiers & Qt::ControlModifier);
-    if (bSnap)
-    {
-        time = TickSnap(time);
-    }
-    SetCurrTime(time);
-}
-
-void CTrackViewDopeSheetBase::MouseMoveDragStartMarker(const QPoint& point, Qt::KeyboardModifiers modifiers)
-{
-    const QPoint p(qBound(m_rcClient.left(), point.x(), m_rcClient.right()),
-        qBound(m_rcClient.top(), point.y(), m_rcClient.bottom()));
-
-    bool bNoSnap = (modifiers & Qt::ControlModifier);
-    float time = TimeFromPointUnsnapped(p);
-    m_timeRange.ClipValue(time);
-    if (!bNoSnap)
-    {
-        time = TickSnap(time);
-    }
-    SetStartMarker(time);
-}
-
-void CTrackViewDopeSheetBase::MouseMoveDragEndMarker(const QPoint& point, Qt::KeyboardModifiers modifiers)
-{
-    const QPoint p(qBound(m_rcClient.left(), point.x(), m_rcClient.right()),
-        qBound(m_rcClient.top(), point.y(), m_rcClient.bottom()));
-
-    bool bNoSnap = (modifiers & Qt::ControlModifier);
-    float time = TimeFromPointUnsnapped(p);
-    m_timeRange.ClipValue(time);
-    if (!bNoSnap)
-    {
-        time = TickSnap(time);
-    }
-    SetEndMarker(time);
-}
-
-void CTrackViewDopeSheetBase::MouseMoveOver(const QPoint& point)
-{
-    // No mouse mode.
-    SetMouseCursor(Qt::ArrowCursor);
-
-    bool bStart = false;
-    CTrackViewKeyHandle keyHandle = CheckCursorOnStartEndTimeAdjustBar(point, bStart);
-    if (keyHandle.IsValid())
-    {
-        SetMouseCursor(m_crsAdjustLR);
-        return;
-    }
-
-    keyHandle = FirstKeyFromPoint(point);
-    if (!keyHandle.IsValid())
-    {
-        keyHandle = DurationKeyFromPoint(point);
-    }
-
-    if (keyHandle.IsValid())
-    {
-        CTrackViewTrack* pTrack = GetTrackFromPoint(point);
-
-        if (pTrack && keyHandle.IsSelected())
-        {
-            // If mouse over selected key, change cursor to left-right arrows.
-            SetMouseCursor(m_crsLeftRight);
-        }
-        else
-        {
-            SetMouseCursor(m_crsCross);
-        }
-
-        if (pTrack)
-        {
-            ShowKeyTooltip(keyHandle, mapToGlobal(point));
-        }
-    }
-    else
-    {
-        QToolTip::hideText();
-    }
-}
-
-float CTrackViewDopeSheetBase::MagnetSnap(float newTime, const CTrackViewAnimNode* pNode) const
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSequence)
-    {
-        return newTime;
-    }
-
-    CTrackViewKeyBundle keys = pSequence->GetKeysInTimeRange(newTime - kMarginForMagnetSnapping / m_timeScale,
-            newTime + kMarginForMagnetSnapping / m_timeScale);
-
-    if (keys.GetKeyCount() > 0)
-    {
-        // By default, just use the first key that belongs to the time range as a magnet.
-        newTime = keys.GetKey(0).GetTime();
-        // But if there is an in-range key in a sibling track, use it instead.
-        // Here a 'sibling' means a track that belongs to a same node.
-        for (int i = 0; i < keys.GetKeyCount(); ++i)
-        {
-            CTrackViewKeyHandle keyHandle = keys.GetKey(i);
-            if (keyHandle.GetTrack()->GetAnimNode() == pNode)
-            {
-                newTime = keyHandle.GetTime();
-                break;
-            }
-        }
-    }
-
-    return newTime;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewDopeSheetBase::FrameSnap(float time) const
-{
-    double t = floor((double)time / m_snapFrameTime + 0.5);
-    t = t * m_snapFrameTime;
-    return t;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::ShowKeyPropertyCtrlOnSpot(int x, int y, [[maybe_unused]] bool bMultipleKeysSelected, bool bKeyChangeInSameTrack)
-{
-    if (m_keyPropertiesDlg == NULL)
-    {
-        return;
-    }
-
-
-    if (m_wndPropsOnSpot == nullptr)
-    {
-        m_wndPropsOnSpot = new ReflectedPropertyControl(this);
-        m_wndPropsOnSpot->Setup(true, 150);
-        m_wndPropsOnSpot->setWindowFlags(Qt::CustomizeWindowHint | Qt::Popup | Qt::WindowStaysOnTopHint);
-        m_wndPropsOnSpot->SetStoreUndoByItems(false);
-        bKeyChangeInSameTrack = false;
-    }
-
-    if (bKeyChangeInSameTrack)
-    {
-        m_wndPropsOnSpot->ClearSelection();
-        m_wndPropsOnSpot->ReloadValues();
-    }
-    else
-    {
-        m_keyPropertiesDlg->PopulateVariables(m_wndPropsOnSpot);
-    }
-
-    m_wndPropsOnSpot->show();
-    m_wndPropsOnSpot->move(x, y);
-    m_wndPropsOnSpot->ExpandAll();
-    QTimer::singleShot(0, [this]() {
-        m_wndPropsOnSpot->resize(m_wndPropsOnSpot->sizeHint());
-    });
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::HideKeyPropertyCtrlOnSpot()
-{
-    if (m_wndPropsOnSpot)
-    {
-        m_wndPropsOnSpot->hide();
-        m_wndPropsOnSpot->ClearSelection();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetScrollOffset(int hpos)
-{
-    m_scrollBar->setValue(hpos);
-    m_scrollOffset.setX(hpos);
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::LButtonDownOnTimeAdjustBar([[maybe_unused]] const QPoint& point, CTrackViewKeyHandle& keyHandle, bool bStart)
-{
-    m_keyTimeOffset = 0;
-    m_keyForTimeAdjust = keyHandle;
-
-    GetIEditor()->BeginUndo();
-
-    if (bStart)
-    {
-        m_mouseMode = eTVMouseMode_StartTimeAdjust;
-    }
-    else
-    {
-        // TODO: Refactor this Time Range Key stuff.
-        ICharacterKey characterKey;
-        AZ::IAssetBlendKey assetBlendKey;
-        ITimeRangeKey* timeRangeKey = nullptr;
-
-        if (keyHandle.GetTrack()->GetValueType() == AnimValueType::AssetBlend)
-        {
-            keyHandle.GetKey(&assetBlendKey);
-            timeRangeKey = &assetBlendKey;
-        }
-        else
-        {
-            // This will work for both character & time range keys because
-            // ICharacterKey is derived from ITimeRangeKey. Not the most beautiful code.
-            keyHandle.GetKey(&characterKey);
-            timeRangeKey = &characterKey;
-        }
-
-        // In case of the end time, make it have a valid (not zero)
-        // end time, first.
-        if (timeRangeKey->m_endTime == 0)
-        {
-            timeRangeKey->m_endTime = timeRangeKey->m_duration;
-            keyHandle.SetKey(timeRangeKey);
-        }
-        m_mouseMode = eTVMouseMode_EndTimeAdjust;
-    }
-    SetMouseCursor(m_crsAdjustLR);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::LButtonDownOnKey([[maybe_unused]] const QPoint& point, CTrackViewKeyHandle& keyHandle, Qt::KeyboardModifiers modifiers)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    AZ_Assert(sequence, "Expected a valid sequence.");
-
-    if (!sequence)
-    {
-        return;
-    }
-
-    if (!keyHandle.IsSelected() && !(modifiers & Qt::ControlModifier))
-    {
-        CTrackViewSequenceNotificationContext context(sequence);
-        AzToolsFramework::ScopedUndoBatch undoBatch("Select keys");
-
-        const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
-
-        sequence->DeselectAllKeys();
-        m_bJustSelected = true;
-        m_keyTimeOffset = 0;
-        keyHandle.Select(true);
-
-        ChangeSequenceTrackSelection(sequence, keyHandle.GetTrack());
-
-        const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
-
-        if (beforeKeyState != afterKeyState)
-        {
-            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-        }
-    }
-    else
-    {
-        GetIEditor()->CancelUndo();
-    }
-
-    // Move/Clone Key Undo Begin
-    GetIEditor()->BeginUndo();
-    StoreMementoForTracksWithSelectedKeys();
-
-    if (modifiers & Qt::ShiftModifier)
-    {
-        m_mouseMode = eTVMouseMode_Clone;
-        SetMouseCursor(m_crsLeftRight);
-    }
-    else
-    {
-        m_mouseMode = eTVMouseMode_Move;
-        SetMouseCursor(m_crsLeftRight);
-    }
-
-    update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::ChangeSequenceTrackSelection(CTrackViewSequence* sequenceWithTrack, CTrackViewTrack* trackToSelect) const
-{
-    // Deselect all currently selected tracks that aren't the keyHandle's Track, then ensure the trackToSelect  is selected
-    CTrackViewTrackBundle prevSelectedTracks;
-
-    prevSelectedTracks = sequenceWithTrack->GetSelectedTracks();
-    for (int i = 0; i < prevSelectedTracks.GetCount(); i++)
-    {
-        CTrackViewTrack* prevSelectedTrack = prevSelectedTracks.GetTrack(i);
-        if (prevSelectedTrack != trackToSelect)
-        {
-            prevSelectedTrack->SetSelected(false);
-        }
-    }
-    trackToSelect->SetSelected(true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::ChangeSequenceTrackSelection(CTrackViewSequence* sequence, CTrackViewTrackBundle tracksToSelect, bool multiTrackSelection) const
-{
-    if (!multiTrackSelection)
-    {
-        // Deselect any tracks not in the tracksToSelect bundle
-        CTrackViewTrackBundle prevSelectedTracks;
-        prevSelectedTracks = sequence->GetSelectedTracks();
-
-        for (int i = prevSelectedTracks.GetCount(); --i >= 0; )
-        {
-            bool                deselectTrack = true;
-            CTrackViewTrack*    prevSelectedTrack = prevSelectedTracks.GetTrack(i);
-
-            for (int j = tracksToSelect.GetCount(); --j >= 0; )
-            {
-                CTrackViewTrack* selectTrackCandidate = tracksToSelect.GetTrack(j);
-                if (selectTrackCandidate == prevSelectedTrack)
-                {
-                    // selectTrackCandidate is already selected
-                    tracksToSelect.RemoveTrack(selectTrackCandidate);
-                    deselectTrack = false;
-                    break;
-                }
-            }
-            if (deselectTrack)
-            {
-                prevSelectedTrack->SetSelected(false);
-            }
-        }
-    }
-
-    // Add remaining tracks in tracksToSelect bundle to track selection
-    for (int j = tracksToSelect.GetCount(); --j >= 0; )
-    {
-        tracksToSelect.GetTrack(j)->SetSelected(true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewDopeSheetBase::CreateColorKey(CTrackViewTrack* pTrack, float keyTime)
-{
-    bool keyCreated = false;
-    Vec3 vColor(0, 0, 0);
-    pTrack->GetValue(keyTime, vColor);
-
-    const AZ::Color defaultColor(clamp_tpl<AZ::u8>(FloatToIntRet(vColor.x), 0, 255),
-        clamp_tpl<AZ::u8>(FloatToIntRet(vColor.y), 0, 255),
-        clamp_tpl<AZ::u8>(FloatToIntRet(vColor.z), 0, 255),
-        255);
-    AzQtComponents::ColorPicker dlg(AzQtComponents::ColorPicker::Configuration::RGB, QString(), this);
-    dlg.setWindowTitle(tr("Select Color"));
-    dlg.setCurrentColor(defaultColor);
-    dlg.setSelectedColor(defaultColor);
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        const AZ::Color col = dlg.currentColor();
-        ColorF colArray(col.GetR8(), col.GetG8(), col.GetB8(), col.GetA8());
-
-        CTrackViewSequence* sequence = pTrack->GetSequence();
-        if (nullptr != sequence)
-        {
-            CTrackViewSequenceNotificationContext context(sequence);
-
-            AzToolsFramework::ScopedUndoBatch undoBatch("Set Key");
-            const unsigned int numChildNodes = pTrack->GetChildCount();
-            for (int i = 0; i < numChildNodes; ++i)
-            {
-                CTrackViewTrack* subTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(i));
-                if (IsOkToAddKeyHere(subTrack, keyTime))
-                {
-                    CTrackViewKeyHandle newKey = subTrack->CreateKey(keyTime);
-
-                    I2DBezierKey bezierKey;
-                    newKey.GetKey(&bezierKey);
-                    bezierKey.value = Vec2(keyTime, colArray[i]);
-                    newKey.SetKey(&bezierKey);
-
-                    keyCreated = true;
-                }
-            }
-            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-        }
-    }
-
-    return keyCreated;
-}
-
-void CTrackViewDopeSheetBase::OnCurrentColorChange(const AZ::Color& color)
-{
-    // This is while the color picker is up 
-    // so we want to update the property but not store an undo
-    UpdateColorKey(AzQtComponents::toQColor(color), false);
-}
-
-void CTrackViewDopeSheetBase::UpdateColorKey(const QColor& color, bool addToUndo)
-{
-    ColorF colArray(color.red(), color.green(), color.blue(), color.alpha());
-
-    CTrackViewSequence* sequence = m_colorUpdateTrack->GetSequence();
-    if (nullptr != sequence)
-    {
-        CTrackViewSequenceNotificationContext context(sequence);
-
-        if (addToUndo)
-        {
-            AzToolsFramework::ScopedUndoBatch undoBatch("Set Key");
-            UpdateColorKeyHelper(colArray);
-            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-        }
-        else
-        {
-            UpdateColorKeyHelper(colArray);
-        }
-
-        // We want this to take affect now
-        if (!addToUndo)
-        {
-            GetIEditor()->GetAnimation()->ForceAnimation();
-        }
-    }
-}
-
-void CTrackViewDopeSheetBase::UpdateColorKeyHelper(const ColorF& color)
-{
-    const unsigned int numChildNodes = m_colorUpdateTrack->GetChildCount();
-    for (int i = 0; i < numChildNodes; ++i)
-    {
-        CTrackViewTrack* subTrack = static_cast<CTrackViewTrack*>(m_colorUpdateTrack->GetChild(i));
-        CTrackViewKeyHandle subTrackKey = subTrack->GetKeyByTime(m_colorUpdateKeyTime);
-        I2DBezierKey bezierKey;
-        if (subTrackKey.IsValid())
-        {
-            subTrackKey.GetKey(&bezierKey);
-        }
-        else
-        {
-            // no valid key found at this time - create Key
-            subTrackKey = subTrack->CreateKey(m_colorUpdateKeyTime);
-            subTrackKey.GetKey(&bezierKey);
-        }
-
-        bezierKey.value.x = m_colorUpdateKeyTime;
-        bezierKey.value.y = color[i];
-        subTrackKey.SetKey(&bezierKey);
-    }
-}
-
-void CTrackViewDopeSheetBase::EditSelectedColorKey(CTrackViewTrack* pTrack)
-{
-    if (pTrack->IsCompoundTrack())
-    {
-        CTrackViewKeyBundle selectedKeyBundle = pTrack->GetSelectedKeys();
-        if (selectedKeyBundle.GetKeyCount())
-        {
-            m_colorUpdateTrack = pTrack;
-            // init with the first selected key color
-            m_colorUpdateKeyTime = selectedKeyBundle.GetKey(0).GetTime();
-
-            Vec3  color;
-            pTrack->GetValue(m_colorUpdateKeyTime, color);
-
-            const AZ::Color defaultColor(clamp_tpl<AZ::u8>(FloatToIntRet(color.x), 0, 255),
-                clamp_tpl<AZ::u8>(FloatToIntRet(color.y), 0, 255),
-                clamp_tpl<AZ::u8>(FloatToIntRet(color.z), 0, 255), 
-                255);
-
-            AzQtComponents::ColorPicker picker(AzQtComponents::ColorPicker::Configuration::RGB);
-            picker.setWindowTitle(tr("Select Color"));
-            picker.setCurrentColor(defaultColor);
-            picker.setSelectedColor(defaultColor);
-            QObject::connect(&picker, &AzQtComponents::ColorPicker::currentColorChanged, this, &CTrackViewDopeSheetBase::OnCurrentColorChange);
-    
-            if (picker.exec() == QDialog::Accepted)
-            {
-                const AZ::Color col = picker.currentColor();
-
-                // Moved bulk of method into helper to handle matching logic in QT callback and undo redo cases
-                UpdateColorKey(AzQtComponents::toQColor(col), true);
-            }
-            else
-            {
-                // We canceled out of the color picker, revert to color held before opening it
-                UpdateColorKey(AzQtComponents::toQColor(defaultColor), false);
-            }
-        }      
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::AcceptUndo()
-{
-    if (CUndo::IsRecording())
-    {
-        const QPoint mousePos = mapFromGlobal(QCursor::pos());
-
-        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-        if (m_mouseMode == eTVMouseMode_Paste)
-        {
-            GetIEditor()->CancelUndo();
-        }
-        else if (m_mouseMode == eTVMouseMode_Move || m_mouseMode == eTVMouseMode_Clone)
-        {
-            if (sequence && m_bKeysMoved)
-            {
-                GetIEditor()->CancelUndo();
-
-                // Keys Moved, mark the sequence dirty to get an AZ undo event.
-                AzToolsFramework::ScopedUndoBatch undoBatch("Move/Clone Keys");
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-            else
-            {
-                GetIEditor()->CancelUndo();
-            }
-        }
-        else if (m_mouseMode == eTVMouseMode_StartTimeAdjust || m_mouseMode == eTVMouseMode_EndTimeAdjust)
-        {
-            if (sequence)
-            {
-                GetIEditor()->CancelUndo();
-
-                AzToolsFramework::ScopedUndoBatch undoBatch("Adjust Start/End Time of an Animation Key");
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-            else
-            {
-                GetIEditor()->CancelUndo();
-            }
-        }
-    }
-
-    m_mouseMode = eTVMouseMode_None;
-    m_trackMementos.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewDopeSheetBase::ComputeSnappedMoveOffset()
-{
-    // Compute time offset
-    const QPoint currentMousePos(qBound(m_rcClient.left(), m_mouseOverPos.x(), m_rcClient.right()), m_mouseOverPos.y());
-
-    float time0 = TimeFromPointUnsnapped(m_mouseDownPos);
-    float time = TimeFromPointUnsnapped(currentMousePos);
-
-    if (GetKeyModifiedSnappingMode() == eSnappingMode_SnapTick)
-    {
-        time0 = TickSnap(time0);
-        time = TickSnap(time);
-    }
-
-    return time - time0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKeysInGroup)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    // Add keys here.
-    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
-
-    if (!pTrack)
-    {
-        return;
-    }
-
-    CTrackViewSequenceNotificationContext context(sequence);
-
-    CTrackViewAnimNode* pNode = pTrack->GetAnimNode();
-    float keyTime = TimeFromPoint(point);
-    bool inRange = m_timeRange.IsInside(keyTime);
-
-    if (pTrack && inRange)
-    {
-        bool keyCreated = false;
-        if (bTryAddKeysInGroup && pNode->GetParentNode())       // Add keys in group
-        {
-            CTrackViewTrackBundle tracksInGroup = pNode->GetTracksByParam(pTrack->GetParameterType());
-            for (int i = 0; i < (int)tracksInGroup.GetCount(); ++i)
-            {
-                CTrackViewTrack* pCurrTrack = tracksInGroup.GetTrack(i);
-
-                if (pCurrTrack->GetChildCount() == 0)   // A simple track
-                {
-                    if (IsOkToAddKeyHere(pCurrTrack, keyTime))
-                    {
-                        AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
-                        pCurrTrack->CreateKey(keyTime);
-                        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-                        keyCreated = true;
-                    }
-                }
-                else                                                                            // A compound track
-                {
-                    for (int k = 0; k < pCurrTrack->GetChildCount(); ++k)
-                    {
-                        CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pCurrTrack->GetChild(k));
-                        if (IsOkToAddKeyHere(pSubTrack, keyTime))
-                        {
-                            AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
-                            pSubTrack->CreateKey(keyTime);
-                            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-                            keyCreated = true;
-                        }
-                    }
-                }
-            }
-        }
-        else if (pTrack->GetChildCount() == 0)          // A simple track
-        {
-            if (IsOkToAddKeyHere(pTrack, keyTime))
-            {
-                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);
-            }
-            else
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
-                for (int i = 0; i < pTrack->GetChildCount(); ++i)
-                {
-                    CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(i));
-                    if (IsOkToAddKeyHere(pSubTrack, keyTime))
-                    {
-                        pSubTrack->CreateKey(keyTime);
-                        keyCreated = true;
-                    }
-                }
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawControl(QPainter* painter, const QRect& rcUpdate)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    DrawNodesRecursive(pSequence, painter, rcUpdate);
-
-    DrawSummary(painter, rcUpdate);
-
-    DrawSelectedKeyIndicators(painter);
-
-    if (m_mouseMode == eTVMouseMode_Paste)
-    {
-        // If in paste mode draw keys that are in clipboard
-        DrawClipboardKeys(painter, QRect());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawNodesRecursive(CTrackViewNode* pNode, QPainter* painter, const QRect& rcUpdate)
-{
-    const QRect rect = GetNodeRect(pNode);
-
-    if (!rect.isEmpty())
-    {
-        switch (pNode->GetNodeType())
-        {
-        case eTVNT_AnimNode:
-            DrawNodeTrack(static_cast<CTrackViewAnimNode*>(pNode), painter, rect);
-            break;
-        case eTVNT_Track:
-            DrawTrack(static_cast<CTrackViewTrack*>(pNode), painter, rect);
-            break;
-        }
-    }
-
-    if (pNode->GetExpanded())
-    {
-        unsigned int numChildren = pNode->GetChildCount();
-        for (unsigned int i = 0; i < numChildren; ++i)
-        {
-            DrawNodesRecursive(pNode->GetChild(i), painter, rcUpdate);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawTicks(QPainter* painter, const QRect& rc, Range& timeRange)
-{
-    // Draw time ticks every tick step seconds.
-    const QPen dkgray(QColor(90, 90, 90));
-    const QPen ltgray(QColor(120, 120, 120));
-
-    const QPen prevPen = painter->pen();
-    painter->setPen(dkgray);
-    Range VisRange = GetVisibleRange();
-    int nNumberTicks = 10;
-    if (GetTickDisplayMode() == eTVTickMode_InFrames)
-    {
-        nNumberTicks = 8;
-    }
-
-    double start = TickSnap(timeRange.start);
-    double step = 1.0 / m_ticksStep;
-
-    for (double t = 0.0f; t <= timeRange.end + step; t += step)
-    {
-        double st = TickSnap(t);
-        if (st > timeRange.end)
-        {
-            st = timeRange.end;
-        }
-        if (st < VisRange.start)
-        {
-            continue;
-        }
-        if (st > VisRange.end)
-        {
-            break;
-        }
-        int x = TimeToClient(st);
-        if (x < 0)
-        {
-            continue;
-        }
-
-        int k = RoundFloatToInt(st * m_ticksStep);
-        if (k % nNumberTicks == 0)
-        {
-            if (st >= start)
-            {
-                painter->setPen(Qt::black);
-            }
-            else
-            {
-                painter->setPen(dkgray);
-            }
-
-            painter->drawLine(x, rc.bottom() - 1, x, rc.bottom() - 5);
-            painter->setPen(dkgray);
-        }
-        else
-        {
-            if (st >= start)
-            {
-                painter->setPen(dkgray);
-            }
-            else
-            {
-                painter->setPen(ltgray);
-            }
-            painter->drawLine(x, rc.bottom() - 1, x, rc.bottom() - 3);
-        }
-    }
-    painter->setPen(prevPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawTrack(CTrackViewTrack* pTrack, QPainter* painter, const QRect& trackRect)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    const QPen prevPen = painter->pen();
-    painter->setPen(QColor(120, 120, 120));
-    painter->drawLine(trackRect.bottomLeft(), trackRect.bottomRight());
-    painter->setPen(prevPen);
-
-    QRect rcInner = trackRect;
-    rcInner.setLeft(max(trackRect.left(), m_leftOffset - m_scrollOffset.x()));
-    rcInner.setRight(min(trackRect.right(), (m_scrollMax + m_scrollMin) - m_scrollOffset.x() + m_leftOffset * 2));
-
-    bool bLightAnimationSetActive = pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet;
-    if (bLightAnimationSetActive && pTrack->GetKeyCount() > 0)
-    {
-        // In the case of the light animation set, the time of of the last key
-        // determines the end of the track.
-        float lastKeyTime = pTrack->GetKey(pTrack->GetKeyCount() - 1).GetTime();
-        rcInner.setRight(min(rcInner.right(), TimeToClient(lastKeyTime)));
-    }
-
-    QRect rcInnerDraw(QPoint(rcInner.left() - 6, rcInner.top()), QPoint(rcInner.right() + 6, rcInner.bottom()));
-    QColor trackColor = CTVCustomizeTrackColorsDlg::GetTrackColor(pTrack->GetParameterType());
-    if (pTrack->HasCustomColor())
-    {
-        ColorB customColor = pTrack->GetCustomColor();
-        trackColor = QColor(customColor.r, customColor.g, customColor.b);
-    }
-    // For the case of tracks belonging to an inactive director node,
-    // changes the track color to a custom one.
-    const QColor colorForDisabled = CTVCustomizeTrackColorsDlg::GetColorForDisabledTracks();
-    const QColor colorForMuted = CTVCustomizeTrackColorsDlg::GetColorForMutedTracks();
-
-    CTrackViewAnimNode* pDirectorNode = pTrack->GetDirector();
-    if (!pDirectorNode->IsActiveDirector())
-    {
-        trackColor = colorForDisabled;
-    }
-
-    // A disabled/muted track or any track in a disabled node also uses a custom color.
-    CTrackViewAnimNode* animNode = pTrack->GetAnimNode();
-    bool bTrackDisabled = pTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled;
-    bool bTrackMuted = pTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Muted;
-    bool bTrackInvalid = !pTrack->IsSubTrack() && !animNode->IsParamValid(pTrack->GetParameterType());
-    bool bTrackInDisabledNode = animNode->AreFlagsSetOnNodeOrAnyParent(eAnimNodeFlags_Disabled);
-    if (bTrackDisabled || bTrackInDisabledNode || bTrackInvalid)
-    {
-        trackColor = colorForDisabled;
-    }
-    else if (bTrackMuted)
-    {
-        trackColor = colorForMuted;
-    }
-    const QRect rc = rcInnerDraw.adjusted(0, 1, 0, 0);
-
-    const EAnimCurveType trackType = pTrack->GetCurveType();
-    if (trackType == eAnimCurveType_TCBFloat || trackType == eAnimCurveType_TCBQuat || trackType == eAnimCurveType_TCBVector)
-    {
-        trackColor = QColor(245, 80, 70);
-    }
-
-    if (pTrack->IsSelected())
-    {
-        QLinearGradient gradient(rc.topLeft(), rc.bottomLeft());
-        gradient.setColorAt(0, trackColor);
-        gradient.setColorAt(1, QColor(trackColor.red() / 2, trackColor.green() / 2, trackColor.blue() / 2));
-        painter->fillRect(rc, gradient);
-    }
-    else if (pTrack->GetValueType() == AnimValueType::RGB && pTrack->GetKeyCount() > 0)
-    {
-        DrawColorGradient(painter, rc, pTrack);
-    }
-    else
-    {
-        painter->fillRect(rc, trackColor);
-    }
-
-    // Left outside
-    QRect rcOutside = trackRect;
-    rcOutside.setRight(rcInnerDraw.left() - 1);
-    rcOutside.adjust(1, 1, -1, 0);
-
-    QLinearGradient gradient(rcOutside.topLeft(), rcOutside.bottomLeft());
-    gradient.setColorAt(0, QColor(210, 210, 210));
-    gradient.setColorAt(1, QColor(180, 180, 180));
-    painter->fillRect(rcOutside, gradient);
-
-    // Right outside.
-    rcOutside = trackRect;
-    rcOutside.setLeft(rcInnerDraw.right() + 1);
-    rcOutside.adjust(1, 1, -1, 0);
-
-    gradient = QLinearGradient(rcOutside.topLeft(), rcOutside.bottomLeft());
-    gradient.setColorAt(0, QColor(210, 210, 210));
-    gradient.setColorAt(1, QColor(180, 180, 180));
-    painter->fillRect(rcOutside, gradient);
-
-    // Get time range of update rectangle.
-    Range timeRange = GetTimeRange(trackRect);
-
-    // Draw tick marks in time range.
-    DrawTicks(painter, rcInner, timeRange);
-
-    // Draw special track features
-    AnimValueType trackValueType = pTrack->GetValueType();
-    CAnimParamType trackParamType = pTrack->GetParameterType();
-
-    if (trackValueType == AnimValueType::Bool)
-    {
-        // If this track is bool Track draw bars where track is true
-        DrawBoolTrack(timeRange, painter, pTrack, rc);
-    }
-    else if (trackValueType == AnimValueType::Select)
-    {
-        // If this track is Select Track draw bars to show where selection is active.
-        DrawSelectTrack(timeRange, painter, pTrack, rc);
-    }
-    else if (trackParamType == AnimParamType::Sequence)
-    {
-        // If this track is Sequence Track draw bars to show where sequence is active.
-        DrawSequenceTrack(timeRange, painter, pTrack, rc);
-    }
-    else if (trackParamType == AnimParamType::Goto)
-    {
-        // if this track is GoTo Track, draw an arrow to indicate jump position.
-        DrawGoToTrackArrow(pTrack, painter, rc);
-    }
-
-    // Draw keys in time range.
-    DrawKeys(pTrack, painter, rcInner, timeRange);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
-{
-    const QBrush prevBrush = painter->brush();
-    painter->setBrush(m_selectTrackBrush);
-
-    const int numKeys = pTrack->GetKeyCount();
-    for (int i = 0; i < numKeys; ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        ISelectKey selectKey;
-        keyHandle.GetKey(&selectKey);
-
-        if (!selectKey.szSelection.empty() || selectKey.cameraAzEntityId.IsValid())
-        {
-            float time = keyHandle.GetTime();
-            float nextTime = timeRange.end;
-            if (i < numKeys - 1)
-            {
-                nextTime = pTrack->GetKey(i + 1).GetTime();
-            }
-
-            time = clamp_tpl(time, timeRange.start, timeRange.end);
-            nextTime = clamp_tpl(nextTime, timeRange.start, timeRange.end);
-
-            int x0_2 = TimeToClient(time);
-
-            float fBlendTime = selectKey.fBlendTime;
-            int blendTimeEnd = 0;
-
-            if (fBlendTime > 0.0f && fBlendTime < (nextTime - time))
-            {
-                blendTimeEnd = TimeToClient(nextTime);
-                nextTime -= fBlendTime;
-            }
-
-            int x = TimeToClient(nextTime);
-
-            if (x != x0_2)
-            {
-                QLinearGradient gradient(x0_2, rc.top() + 1, x0_2, rc.bottom());
-                gradient.setColorAt(0, Qt::white);
-                gradient.setColorAt(1, QColor(100, 190, 255));
-                painter->fillRect(QRect(QPoint(x0_2, rc.top() + 1), QPoint(x, rc.bottom())), gradient);
-            }
-
-            if (fBlendTime > 0.0f)
-            {
-                QLinearGradient gradient(x, rc.top() + 1, x, rc.bottom());
-                gradient.setColorAt(0, Qt::white);
-                gradient.setColorAt(1, QColor(0, 115, 230));
-                painter->fillRect(QRect(QPoint(x, rc.top() + 1), QPoint(blendTimeEnd, rc.bottom())), gradient);
-            }
-        }
-    }
-    painter->setBrush(prevBrush);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
-{
-    int x0 = TimeToClient(timeRange.start);
-    float t0 = timeRange.start;
-    QRect trackRect;
-
-    const QBrush prevBrush = painter->brush();
-    painter->setBrush(m_visibilityBrush);
-
-    const int numKeys = pTrack->GetKeyCount();
-    for (int i = 0; i < numKeys; ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        const float time = keyHandle.GetTime();
-        if (time < timeRange.start)
-        {
-            continue;
-        }
-        if (time > timeRange.end)
-        {
-            break;
-        }
-
-        int x = TimeToClient(time);
-        bool val = false;
-        pTrack->GetValue(time - 0.001f, val);
-        if (val)
-        {
-            QLinearGradient gradient(x0, rc.top() + 4, x0, rc.bottom() - 4);
-            gradient.setColorAt(0, QColor(250, 250, 250));
-            gradient.setColorAt(1, QColor(0, 80, 255));
-            painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient);
-        }
-
-        t0 = time;
-        x0 = x;
-    }
-    int x = TimeToClient(timeRange.end);
-    bool val = false;
-    pTrack->GetValue(timeRange.end - 0.001f, val);
-    if (val)
-    {
-        QLinearGradient gradient(x0, rc.top() + 4, x0, rc.bottom() - 4);
-        gradient.setColorAt(0, QColor(250, 250, 250));
-        gradient.setColorAt(1, QColor(0, 80, 255));
-        painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient);
-    }
-    painter->setBrush(prevBrush);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawSequenceTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
-{
-    const QBrush prevBrush = painter->brush();
-    painter->setBrush(m_selectTrackBrush);
-
-    const int numKeys = pTrack->GetKeyCount();
-    for (int i = 0; i < numKeys - 1; ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        ISequenceKey sequenceKey;
-        keyHandle.GetKey(&sequenceKey);
-        if (sequenceKey.sequenceEntityId.IsValid())
-        {
-            float time = keyHandle.GetTime();
-            float nextTime = timeRange.end;
-            if (i < numKeys - 1)
-            {
-                nextTime = pTrack->GetKey(i + 1).GetTime();
-            }
-            time = clamp_tpl(time, timeRange.start, timeRange.end);
-            nextTime = clamp_tpl(nextTime, timeRange.start, timeRange.end);
-
-            int x0_2 = TimeToClient(time);
-            int x = TimeToClient(nextTime);
-
-            if (x != x0_2)
-            {
-                const QColor startColour(100, 190, 255);
-                const QColor endColour(250, 250, 250);
-                QLinearGradient gradient(x0_2, rc.top() + 1, x0_2, rc.bottom());
-                gradient.setColorAt(0, startColour);
-                gradient.setColorAt(1, endColour);
-                painter->fillRect(QRect(QPoint(x0_2, rc.top() + 1), QPoint(x, rc.bottom())), gradient);
-            }
-        }
-    }
-    painter->setBrush(prevBrush);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewDopeSheetBase::CompareKeyHandleByTime(const CTrackViewKeyHandle &a, const CTrackViewKeyHandle &b)
-{
-    return a.GetTime() < b.GetTime();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawKeys(CTrackViewTrack* pTrack, QPainter* painter, QRect& rect, [[maybe_unused]] Range& timeRange)
-{
-    int numKeys = pTrack->GetKeyCount();
-
-    const QFont prevFont = painter->font();
-    painter->setFont(m_descriptionFont);
-
-    painter->setPen(KEY_TEXT_COLOR);
-
-    int prevKeyPixel = -10000;
-    const int kDefaultWidthForDescription = 200;
-    const int kSmallMargin = 10;
-
-    AZStd::vector<CTrackViewKeyHandle> sortedKeys;
-    sortedKeys.reserve(numKeys);
-    for (int i = 0; i < numKeys; ++i)
-    {
-        sortedKeys.push_back(pTrack->GetKey(i));
-    }
-    AZStd::sort(sortedKeys.begin(), sortedKeys.end(), CompareKeyHandleByTime);
-
-    // Draw keys.
-    for (int i = 0; i < numKeys; ++i)
-    {
-        CTrackViewKeyHandle keyHandle = sortedKeys[i];
-
-        const float time = keyHandle.GetTime();
-        int x = TimeToClient(time);
-        if (x - kSmallMargin > rect.right())
-        {
-            continue;
-        }
-
-        int x1 = x + kDefaultWidthForDescription;
-        CTrackViewKeyHandle nextKey = keyHandle.GetNextKey();
-
-        int nextKeyIndex = i + 1;
-
-        // Skip over next keys that have the same time as the current key.
-        // If they have the same time it means they are keys from sub tracks
-        // in a compound track at the same time.
-        while (nextKeyIndex < numKeys && AZ::IsClose(sortedKeys[nextKeyIndex].GetTime(), time, AZ::Constants::FloatEpsilon))
-        {
-            nextKeyIndex++;
-        }
-
-        if (nextKeyIndex < numKeys)
-        {
-            CTrackViewKeyHandle nextKey2 = sortedKeys[nextKeyIndex];
-            x1 = TimeToClient(nextKey2.GetTime()) - kSmallMargin;
-        }
-
-        if (x1 > x + kSmallMargin)  // Enough space for description text or duration bar
-        {
-            // Get info about that key.
-            const char* pDescription = keyHandle.GetDescription();
-            const float duration = keyHandle.GetDuration();
-
-            int xlast = x;
-            if (duration > 0)
-            {
-                xlast = TimeToClient(time + duration);
-            }
-            if (xlast + kSmallMargin < rect.left())
-            {
-                continue;
-            }
-
-            if (duration > 0)
-            {
-                DrawKeyDuration(pTrack, painter, rect, i);
-            }
-
-            if (pDescription && pDescription[0] != 0)
-            {
-                char keydesc[1024];
-                bool bSelectedAndBeingMoved = m_mouseMode == eTVMouseMode_Move && keyHandle.IsSelected();
-                if (bSelectedAndBeingMoved)
-                {
-                    // Show its time or frame number additionally.
-                    if (GetTickDisplayMode() == eTVTickMode_InSeconds)
-                    {
-                        sprintf_s(keydesc, "%.3f, {", time);
-                    }
-                    else
-                    {
-                        sprintf_s(keydesc, "%d, {", ftoi(time / m_snapFrameTime));
-                    }
-                }
-                else
-                {
-                    cry_strcpy(keydesc, "{");
-                }
-                cry_strcat(keydesc, pDescription);
-                cry_strcat(keydesc, "}");
-                // Draw key description text.
-                // Find next key.
-                const QRect textRect(QPoint(x + 10, rect.top()), QPoint(x1, rect.bottom()));
-                painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, painter->fontMetrics().elidedText(keydesc, Qt::ElideRight, textRect.width()));
-            }
-        }
-
-        if (x < 0)
-        {
-            continue;
-        }
-
-        if (pTrack->GetChildCount() == 0 // At compound tracks, keys are all green.
-            && abs(x - prevKeyPixel) < 2)
-        {
-            // If multiple keys on the same time.
-            painter->drawPixmap(QPoint(x - 6, rect.top() + 2), QPixmap(":/Trackview/trackview_keys_02.png"));
-        }
-        else
-        {
-            if (keyHandle.IsSelected())
-            {
-                painter->drawPixmap(QPoint(x - 6, rect.top() + 2), QPixmap(":/Trackview/trackview_keys_01.png"));
-            }
-            else
-            {
-                painter->drawPixmap(QPoint(x - 6, rect.top() + 2), QPixmap(":/Trackview/trackview_keys_00.png"));
-            }
-        }
-
-        prevKeyPixel = x;
-    }
-    painter->setFont(prevFont);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawClipboardKeys(QPainter* painter, [[maybe_unused]] const QRect& rc)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    const float timeOffset = ComputeSnappedMoveOffset();
-
-    // Get node & track under cursor
-    CTrackViewAnimNode* animNode = GetAnimNodeFromPoint(m_mouseOverPos);
-    CTrackViewTrack* pTrack = GetTrackFromPoint(m_mouseOverPos);
-
-    auto matchedLocations = pSequence->GetMatchedPasteLocations(m_clipboardKeys, animNode, pTrack);
-
-    for (size_t i = 0; i < matchedLocations.size(); ++i)
-    {
-        auto& matchedLocation = matchedLocations[i];
-        CTrackViewTrack* pMatchedTrack = matchedLocation.first;
-        XmlNodeRef trackNode = matchedLocation.second;
-
-        if (pMatchedTrack->IsCompoundTrack())
-        {
-            // Both child counts should be the same, but make sure
-            const unsigned int numSubTrack = std::min(pMatchedTrack->GetChildCount(), (unsigned int)trackNode->getChildCount());
-
-            for (unsigned int subTrackIndex = 0; subTrackIndex < numSubTrack; ++subTrackIndex)
-            {
-                CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pMatchedTrack->GetChild(subTrackIndex));
-                XmlNodeRef subTrackNode = trackNode->getChild(subTrackIndex);
-                DrawTrackClipboardKeys(painter, pSubTrack, subTrackNode, timeOffset);
-
-                // Also draw to parent track. This is intentional
-                DrawTrackClipboardKeys(painter, pMatchedTrack, subTrackNode, timeOffset);
-            }
-        }
-        else
-        {
-            DrawTrackClipboardKeys(painter, pMatchedTrack, trackNode, timeOffset);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawTrackClipboardKeys(QPainter* painter, CTrackViewTrack* pTrack, XmlNodeRef trackNode, const float timeOffset)
-{
-    const QPen prevPen = painter->pen();
-    painter->setPen(Qt::green);
-
-    const QRect trackRect = GetNodeRect(pTrack);
-    const int numKeysToPaste = trackNode->getChildCount();
-
-    for (int i = 0; i < numKeysToPaste; ++i)
-    {
-        XmlNodeRef keyNode = trackNode->getChild(i);
-
-        float time;
-        if (keyNode->getAttr("time", time))
-        {
-            int x = TimeToClient(time + timeOffset);
-            painter->drawPixmap(QPoint(x - 6, trackRect.top() + 2), QPixmap(":/Trackview/trackview_keys_03.png"));
-            painter->drawLine(x, m_rcClient.top(), x, m_rcClient.bottom());
-        }
-    }
-
-    painter->setPen(prevPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewDopeSheetBase::FirstKeyFromPoint(const QPoint& point)
-{
-    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
-    if (!pTrack)
-    {
-        return CTrackViewKeyHandle();
-    }
-
-    float t1 = TimeFromPointUnsnapped(QPoint(point.x() - 4, point.y()));
-    float t2 = TimeFromPointUnsnapped(QPoint(point.x() + 4, point.y()));
-
-    int numKeys = pTrack->GetKeyCount();
-    for (int i = 0; i < numKeys; ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        float time = keyHandle.GetTime();
-        if (time >= t1 && time <= t2)
-        {
-            return keyHandle;
-        }
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewDopeSheetBase::DurationKeyFromPoint(const QPoint& point)
-{
-    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
-    if (!pTrack)
-    {
-        return CTrackViewKeyHandle();
-    }
-
-    float t = TimeFromPointUnsnapped(point);
-
-    int numKeys = pTrack->GetKeyCount();
-    // Iterate in a reverse order to prioritize later nodes.
-    for (int i = numKeys - 1; i >= 0; --i)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        const float time = keyHandle.GetTime();
-        const float duration = keyHandle.GetDuration();
-
-        if (t >= time && t <= time + duration)
-        {
-            return keyHandle;
-        }
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewDopeSheetBase::CheckCursorOnStartEndTimeAdjustBar(const QPoint& point, bool& bStart)
-{
-    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
-
-    if (!pTrack || (pTrack->GetParameterType() != AnimParamType::Animation &&
-                    pTrack->GetParameterType() != AnimParamType::TimeRanges && 
-                    pTrack->GetValueType() != AnimValueType::CharacterAnim &&
-                    pTrack->GetValueType() != AnimValueType::AssetBlend))
-    {
-        return CTrackViewKeyHandle();
-    }
-
-    int numKeys = pTrack->GetKeyCount();
-    for (int i = 0; i < numKeys; ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        if (!keyHandle.IsSelected())
-        {
-            continue;
-        }
-
-        const float time = keyHandle.GetTime();
-        const float duration = keyHandle.GetDuration();
-
-        if (duration == 0)
-        {
-            continue;
-        }
-
-        // TODO: Refactor this Time Range Key stuff.
-        ICharacterKey characterKey;
-        AZ::IAssetBlendKey assetBlendKey;
-        ITimeRangeKey* timeRangeKey = nullptr;
-
-        if (pTrack->GetValueType() == AnimValueType::AssetBlend)
-        {
-            keyHandle.GetKey(&assetBlendKey);
-            timeRangeKey = &assetBlendKey;
-        }
-        else
-        {
-            // This will work for both character & time range keys because
-            // ICharacterKey is derived from ITimeRangeKey. Not the most beautiful code.
-            keyHandle.GetKey(&characterKey);
-            timeRangeKey = &characterKey;
-        }
-
-        int stime = TimeToClient(time);
-        int etime = TimeToClient(time + AZStd::min(timeRangeKey->GetValidEndTime(), timeRangeKey->m_duration));
-
-        if (point.x() >= stime - 3 && point.x() <= stime)
-        {
-            bStart = true;
-            return keyHandle;
-        }
-        else if (point.x() >= etime && point.x() <= etime + 3)
-        {
-            bStart = false;
-            return keyHandle;
-        }
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewDopeSheetBase::NumKeysFromPoint(const QPoint& point)
-{
-    CTrackViewTrack* pTrack = GetTrackFromPoint(point);
-    if (!pTrack)
-    {
-        return -1;
-    }
-
-    float t1 = TimeFromPointUnsnapped(QPoint(point.x() - 4, point.y()));
-    float t2 = TimeFromPointUnsnapped(QPoint(point.x() + 4, point.y()));
-
-    int count = 0;
-    int numKeys = pTrack->GetKeyCount();
-    for (int i = 0; i < numKeys; ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        const float time = keyHandle.GetTime();
-        if (time >= t1 && time <= t2)
-        {
-            ++count;
-        }
-    }
-    return count;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SelectKeys(const QRect& rc, const bool bMultiSelection)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    AZ_Assert(sequence != nullptr, "sequence should never be nullptr here");
-
-    if (!sequence)
-    {
-        return;
-    }
-
-    AzToolsFramework::ScopedUndoBatch undoBatch("Select Keys");
-
-    const std::vector<bool> beforeKeyState = sequence->SaveKeyStates();
-
-    CTrackViewSequenceNotificationContext context(sequence);
-    if (!bMultiSelection)
-    {
-        sequence->DeselectAllKeys();
-    }
-
-    // put selection rectangle from client to track space.
-    const QRect rci = rc.translated(m_scrollOffset);
-
-    Range selTime = GetTimeRange(rci);
-
-    CTrackViewTrackBundle tracks = sequence->GetAllTracks();
-
-    // note the tracks to select for the keyHandles selected
-    CTrackViewTrackBundle tracksToSelect;
-
-    for (int i = 0; i < tracks.GetCount(); ++i)
-    {
-        CTrackViewTrack* pTrack = tracks.GetTrack(i);
-
-        QRect trackRect = GetNodeRect(pTrack);
-        // Decrease item rectangle a bit.
-        trackRect.adjust(4, 4, -4, -4);
-        // Check if item rectangle intersects with selection rectangle in y axis.
-        if ((trackRect.top() >= rc.top() && trackRect.top() <= rc.bottom()) ||
-            (trackRect.bottom() >= rc.top() && trackRect.bottom() <= rc.bottom()) ||
-            (rc.top() >= trackRect.top() && rc.top() <= trackRect.bottom()) ||
-            (rc.bottom() >= trackRect.top() && rc.bottom() <= trackRect.bottom()))
-        {
-            // Check which keys we intersect.
-            for (int j = 0; j < pTrack->GetKeyCount(); j++)
-            {
-                CTrackViewKeyHandle keyHandle = pTrack->GetKey(j);
-
-                const float time = keyHandle.GetTime();
-                if (selTime.IsInside(time))
-                {
-                    keyHandle.Select(true);
-                    tracksToSelect.AppendTrack(pTrack);
-                }
-            }
-        }
-    }
-
-    ChangeSequenceTrackSelection(sequence, tracksToSelect, bMultiSelection);
-
-    const std::vector<bool> afterKeyState = sequence->SaveKeyStates();
-
-    if (beforeKeyState != afterKeyState)
-    {
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetTickDisplayMode(ETVTickMode mode)
-{
-    m_tickDisplayMode = mode;
-    SetTimeScale(GetTimeScale(), 0); // for refresh
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::SetSnapFPS(UINT fps)
-{
-    m_snapFrameTime = (fps == 0) ? 0.033333f : (1.0f / float(fps));
-}
-
-//////////////////////////////////////////////////////////////////////////
-ESnappingMode CTrackViewDopeSheetBase::GetKeyModifiedSnappingMode()
-{
-    ESnappingMode snappingMode = m_snappingMode;
-
-    if (qApp->keyboardModifiers() & Qt::ControlModifier)
-    {
-        snappingMode = eSnappingMode_SnapNone;
-    }
-    else if (qApp->keyboardModifiers() & Qt::ShiftModifier)
-    {
-        snappingMode = eSnappingMode_SnapMagnet;
-    }
-    else if (qApp->keyboardModifiers() & Qt::AltModifier)
-    {
-        snappingMode = eSnappingMode_SnapFrame;
-    }
-
-    return snappingMode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawSelectedKeyIndicators(QPainter* painter)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    const QPen prevPen = painter->pen();
-    painter->setPen(Qt::green);
-
-    CTrackViewKeyBundle keys = pSequence->GetSelectedKeys();
-    for (int i = 0; i < keys.GetKeyCount(); ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = keys.GetKey(i);
-        int x = TimeToClient(keyHandle.GetTime());
-        painter->drawLine(x, m_rcClient.top(), x, m_rcClient.bottom());
-    }
-
-    painter->setPen(prevPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::ComputeFrameSteps(const Range& visRange)
-{
-    float fNbFrames = fabsf ((visRange.end - visRange.start) / m_snapFrameTime);
-    float afStepTable [4] = { 1.0f, 0.5f, 0.2f, 0.1f };
-    bool bDone = false;
-    float fFact = 1.0f;
-    unsigned int nStepIdx = 0;
-    for (unsigned int nAttempts = 0; nAttempts < 10 && !bDone; ++nAttempts)
-    {
-        bool bLess = true;
-        for (nStepIdx = 0; nStepIdx < 4; ++nStepIdx)
-        {
-            float fFactNbFrames = fNbFrames / (afStepTable[nStepIdx] * fFact);
-            if (fFactNbFrames >= 3 && fFactNbFrames <= 9)
-            {
-                bDone = true;
-                break;
-            }
-            else
-            {
-                bLess = (fFactNbFrames < 3);
-            }
-        }
-        if (!bDone)
-        {
-            fFact *= (bLess) ? 0.1f : 10.0f;
-        }
-    }
-
-    float nBIntermediateTicks = 5;
-    m_fFrameLabelStep = fFact * afStepTable[nStepIdx];
-
-    if (TimeToClient(m_fFrameLabelStep) - TimeToClient(0) > 1300)
-    {
-        nBIntermediateTicks = 10;
-    }
-
-    m_fFrameTickStep = m_fFrameLabelStep * double (m_snapFrameTime) / double(nBIntermediateTicks);
-}
-
-
-void CTrackViewDopeSheetBase::DrawTimeLineInFrames(QPainter* painter, const QRect& rc, [[maybe_unused]] const QColor& lineCol, const QColor& textCol, [[maybe_unused]] double step)
-{
-    float fFramesPerSec = 1.0f / m_snapFrameTime;
-    float fInvFrameLabelStep = 1.0f / m_fFrameLabelStep;
-    Range VisRange = GetVisibleRange();
-
-    const Range& timeRange = m_timeRange;
-
-    const QPen ltgray(QColor(90, 90, 90));
-    const QPen black(textCol);
-
-    for (double t = TickSnap(timeRange.start); t <= timeRange.end + m_fFrameTickStep; t += m_fFrameTickStep)
-    {
-        double st = t;
-        if (st > timeRange.end)
-        {
-            st = timeRange.end;
-        }
-        if (st < VisRange.start)
-        {
-            continue;
-        }
-        if (st > VisRange.end)
-        {
-            break;
-        }
-        if (st < m_timeRange.start || st > m_timeRange.end)
-        {
-            continue;
-        }
-        const int x = TimeToClient(st);
-
-        float fFrame = st * fFramesPerSec;
-        float fFrameScaled = fFrame * fInvFrameLabelStep;
-        if (fabsf(fFrameScaled - RoundFloatToInt(fFrameScaled)) < 0.001f)
-        {
-            painter->setPen(black);
-            painter->drawLine(x, rc.bottom() - 2, x, rc.bottom() - 14);
-            painter->drawText(x + 2, rc.top(), QString::number(fFrame));
-            painter->setPen(ltgray);
-        }
-        else
-        {
-            painter->drawLine(x, rc.bottom() - 2, x, rc.bottom() - 6);
-        }
-    }
-}
-
-
-void CTrackViewDopeSheetBase::DrawTimeLineInSeconds(QPainter* painter, const QRect& rc, [[maybe_unused]] const QColor& lineCol, const QColor& textCol, double step)
-{
-    Range VisRange = GetVisibleRange();
-    const Range& timeRange = m_timeRange;
-    int nNumberTicks = 10;
-
-    const QPen ltgray(QColor(90, 90, 90));
-    const QPen black(textCol);
-
-    for (double t = TickSnap(timeRange.start); t <= timeRange.end + step; t += step)
-    {
-        double st = TickSnap(t);
-        if (st > timeRange.end)
-        {
-            st = timeRange.end;
-        }
-        if (st < VisRange.start)
-        {
-            continue;
-        }
-        if (st > VisRange.end)
-        {
-            break;
-        }
-        if (st < m_timeRange.start || st > m_timeRange.end)
-        {
-            continue;
-        }
-        int x = TimeToClient(st);
-
-        int k = RoundFloatToInt(st * m_ticksStep);
-        if (k % nNumberTicks == 0)
-        {
-            painter->setPen(black);
-            painter->drawLine(x, rc.bottom() - 2, x, rc.bottom() - 14);
-            painter->drawText(x + 2, rc.top(), QString::number(st));
-            painter->setPen(ltgray);
-        }
-        else
-        {
-            painter->drawLine(x, rc.bottom() - 2, x, rc.bottom() - 6);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawTimeline(QPainter* painter, const QRect& rcUpdate)
-{
-    bool recording = GetIEditor()->GetAnimation()->IsRecording();
-
-    QColor lineCol(255, 0, 255);
-    const QColor textCol(Qt::black);
-    const QColor dkgrayCol(90, 90, 90);
-    const QColor ltgrayCol(150, 150, 150);
-
-    if (recording)
-    {
-        lineCol = Qt::red;
-    }
-
-    // Draw vertical line showing current time.
-    {
-        int x = TimeToClient(m_currentTime);
-        if (x > m_rcClient.left() && x < m_rcClient.right())
-        {
-            const QPen prevPen = painter->pen();
-            painter->setPen(lineCol);
-            painter->drawLine(x, 0, x, m_rcClient.bottom());
-            painter->setPen(prevPen);
-        }
-    }
-
-    const QRect rc = m_rcTimeline;
-    if (!rc.intersects(rcUpdate))
-    {
-        return;
-    }
-
-    QLinearGradient gradient(rc.topLeft(), rc.bottomLeft());
-    gradient.setColorAt(0, QColor(250, 250, 250));
-    gradient.setColorAt(1, QColor(180, 180, 180));
-    painter->fillRect(rc, gradient);
-
-    const QPen prevPen = painter->pen();
-    const QPen dkgray(dkgrayCol);
-    const QPen ltgray(ltgrayCol);
-    const QPen black(textCol);
-    const QPen redpen(lineCol);
-    // Draw time ticks every tick step seconds.
-
-    painter->setPen(dkgray);
-
-    double step = 1.0 / double(m_ticksStep);
-    if (GetTickDisplayMode() == eTVTickMode_InFrames)
-    {
-        DrawTimeLineInFrames(painter, rc, lineCol, textCol, step);
-    }
-    else if (GetTickDisplayMode() == eTVTickMode_InSeconds)
-    {
-        DrawTimeLineInSeconds(painter, rc, lineCol, textCol, step);
-    }
-    else
-    {
-        assert (0);
-    }
-
-    // Draw time markers.
-    int x;
-
-    x = TimeToClient(m_timeMarked.start);
-    painter->drawPixmap(QPoint(x, m_rcTimeline.bottom() - 9), QPixmap(":/Trackview/marker/bmp00016_01.png"));
-    x = TimeToClient(m_timeMarked.end);
-    painter->drawPixmap(QPoint(x - 7, m_rcTimeline.bottom() - 9), QPixmap(":/Trackview/marker/bmp00016_00.png"));
-
-    painter->setPen(redpen);
-    x = TimeToClient(m_currentTime);
-    painter->setBrush(Qt::NoBrush);
-    painter->drawRect(QRect(QPoint(x - 3, rc.top()), QPoint(x + 3, rc.bottom())));
-
-    painter->setPen(redpen);
-    painter->drawLine(x, rc.top(), x, rc.bottom());
-
-    painter->setPen(prevPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawSummary(QPainter* painter, const QRect& rcUpdate)
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    const QColor lineCol = Qt::black;
-    const QColor fillCol(150, 100, 220);
-
-    const QRect rc = m_rcSummary;
-    if (!rc.intersects(rcUpdate))
-    {
-        return;
-    }
-
-    painter->fillRect(rc, fillCol);
-
-    const QPen prevPen = painter->pen();
-    painter->setPen(QPen(lineCol, 3));
-    Range timeRange = m_timeRange;
-
-    // Draw a short thick line at each place where there is a key in any tracks.
-    CTrackViewKeyBundle keys = pSequence->GetAllKeys();
-    for (int i = 0; i < keys.GetKeyCount(); ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = keys.GetKey(i);
-        int x = TimeToClient(keyHandle.GetTime());
-        painter->drawLine(x, rc.bottom() - 2, x, rc.top() + 2);
-    }
-
-    painter->setPen(prevPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawNodeTrack(CTrackViewAnimNode* animNode, QPainter* painter, const QRect& trackRect)
-{
-    const QFont prevFont = painter->font();
-    painter->setFont(m_descriptionFont);
-
-    CTrackViewAnimNode* pDirectorNode = animNode->GetDirector();
-
-    if (pDirectorNode->GetNodeType() != eTVNT_Sequence && !pDirectorNode->IsActiveDirector())
-    {
-        painter->setPen(INACTIVE_TEXT_COLOR);
-    }
-    else
-    {
-        painter->setPen(KEY_TEXT_COLOR);
-    }
-
-    const QRect textRect = trackRect.adjusted(4, 0, -4, 0);
-
-    QString sAnimNodeName = animNode->GetName();
-    const bool hasObsoleteTrack = animNode->HasObsoleteTrack();
-
-    if (hasObsoleteTrack)
-    {
-        painter->setPen(QColor(245, 80, 70));
-        sAnimNodeName += tr(": Some of the sub-tracks contains obsoleted TCB splines (marked in red), thus cannot be copied or pasted.");
-    }
-
-    painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, painter->fontMetrics().elidedText(sAnimNodeName, Qt::ElideRight, textRect.width()));
-
-    painter->setFont(prevFont);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawGoToTrackArrow(CTrackViewTrack* pTrack, QPainter* painter, const QRect& rc)
-{
-    int numKeys = pTrack->GetKeyCount();
-    const QColor colorLine(150, 150, 150);
-    const QColor colorHeader(50, 50, 50);
-    const int tickness = 2;
-    const int halfMargin = (rc.height() - tickness) / 2;
-
-    for (int i = 0; i < numKeys; ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-        IDiscreteFloatKey discreteFloatKey;
-        keyHandle.GetKey(&discreteFloatKey);
-
-        int arrowStart = TimeToClient(discreteFloatKey.time);
-        int arrowEnd = TimeToClient(discreteFloatKey.m_fValue);
-
-        if (discreteFloatKey.m_fValue < 0.f)
-        {
-            continue;
-        }
-
-        // draw arrow body line
-        if (arrowStart < arrowEnd)
-        {
-            painter->fillRect(QRect(QPoint(arrowStart, rc.top() + halfMargin), QPoint(arrowEnd, rc.bottom() - halfMargin)), colorLine);
-        }
-        else if (arrowStart > arrowEnd)
-        {
-            painter->fillRect(QRect(QPoint(arrowEnd, rc.top() + halfMargin), QPoint(arrowStart, rc.bottom() - halfMargin)), colorLine);
-        }
-
-        // draw arrow head
-        if (arrowStart != arrowEnd)
-        {
-            painter->fillRect(QRect(QPoint(arrowEnd, rc.top() + 2), QPoint(arrowEnd + 1, rc.bottom() - 2)), colorHeader);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawKeyDuration(CTrackViewTrack* pTrack, QPainter* painter, const QRect& rc, int keyIndex)
-{
-    const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(keyIndex);
-
-    const float time = keyHandle.GetTime();
-    const float duration = keyHandle.GetDuration();
-
-    int x = TimeToClient(time);
-
-    // Draw key duration.
-    float endt = min(time + duration, m_timeRange.end);
-    int x1 = TimeToClient(endt);
-    if (x1 < 0)
-    {
-        if (x > 0)
-        {
-            x1 = rc.right();
-        }
-    }
-    const QBrush prevBrush = painter->brush();
-    painter->setBrush(m_visibilityBrush);
-    QColor colorFrom(120, 120, 255);
-    if (pTrack->GetParameterType() == AnimParamType::Sound)    // If it is a sound key
-    {
-        ISoundKey soundKey;
-        keyHandle.GetKey(&soundKey);
-        colorFrom.setRgbF(soundKey.customColor.x, soundKey.customColor.y, soundKey.customColor.z);
-    }
-    QLinearGradient gradient(x, rc.top() + 3, x, rc.bottom() - 3);
-    gradient.setColorAt(0, colorFrom);
-    gradient.setColorAt(1, QColor(250, 250, 250));
-    const int width = x1 + 1 - x;
-    painter->fillRect(QRect(x, rc.top() + 3, width, rc.height() - 3), gradient);
-
-    painter->setBrush(prevBrush);
-    painter->drawLine(x1, rc.top(), x1, rc.bottom());
-
-    bool typeHasAnimBox = pTrack->GetParameterType() == AnimParamType::Animation ||
-        pTrack->GetParameterType() == AnimParamType::TimeRanges ||
-        pTrack->GetValueType() == AnimValueType::CharacterAnim ||
-        pTrack->GetValueType() == AnimValueType::AssetBlend;
-
-    // If it is a selected animation track, draw the whole animation box (in green)
-    // and two adjust bars (in red) for start/end time each, too.
-    if (keyHandle.IsSelected() && typeHasAnimBox)
-    {
-        // Draw the whole animation box.
-
-        // TODO: Refactor this Time Range Key stuff.
-        ICharacterKey characterKey;
-        AZ::IAssetBlendKey assetBlendKey;
-        ITimeRangeKey* timeRangeKey = nullptr;
-
-        if (pTrack->GetValueType() == AnimValueType::AssetBlend)
-        {
-            keyHandle.GetKey(&assetBlendKey);
-            timeRangeKey = &assetBlendKey;
-        }
-        else
-        {
-            // This will work for both character & time range keys because
-            // ICharacterKey is derived from ITimeRangeKey. Not the most beautiful code.
-            keyHandle.GetKey(&characterKey);
-            timeRangeKey = &characterKey;
-        }
-
-        int startX = TimeToClient(time - timeRangeKey->m_startTime / timeRangeKey->m_speed);
-        int endX = TimeToClient(time + (timeRangeKey->m_duration - timeRangeKey->m_startTime) / timeRangeKey->m_speed);
-        const QPen prevPen = painter->pen();
-        painter->setPen(Qt::green);
-        painter->drawLine(startX, rc.top(), endX, rc.top());
-        painter->drawLine(endX, rc.top(), endX, rc.bottom());
-        painter->drawLine(endX, rc.bottom(), startX, rc.bottom());
-        painter->drawLine(startX, rc.bottom(), startX, rc.top());
-
-        // Draw two adjust bars.
-        int durationX = TimeToClient(time + AZStd::min(timeRangeKey->GetValidEndTime(), timeRangeKey->m_duration));
-        painter->setPen(QPen(Qt::red, 3));
-        painter->drawLine(x - 2, rc.top(), x - 2, rc.bottom());
-        painter->drawLine(durationX + 2, rc.top(), durationX + 2, rc.bottom());
-        painter->setPen(prevPen);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::DrawColorGradient(QPainter* painter, const QRect& rc, const CTrackViewTrack* pTrack)
-{
-    const QPen pOldPen = painter->pen();
-    for (int x = rc.left(); x < rc.right(); ++x)
-    {
-        // This is really slow. Is there a better way?
-        Vec3 vColor(0, 0, 0);
-        pTrack->GetValue(TimeFromPointUnsnapped(QPoint(x, rc.top())), vColor);
-
-        painter->setPen(ColorLinearToGamma(vColor / 255.0f));
-        painter->drawLine(x, rc.top(), x, rc.bottom());
-    }
-    painter->setPen(pOldPen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QRect CTrackViewDopeSheetBase::GetNodeRect(const CTrackViewNode* pNode) const
-{
-    CTrackViewNodesCtrl::CRecord* pRecord = m_pNodesCtrl->GetNodeRecord(pNode);
-
-    if (pRecord && pRecord->IsVisible())
-    {
-        QRect recordRect = pRecord->GetRect();
-        return QRect(0, recordRect.top(), m_rcClient.width(), recordRect.height());
-    }
-
-    return QRect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewDopeSheetBase::StoreMementoForTracksWithSelectedKeys()
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
-
-    m_trackMementos.clear();
-
-    // Construct the set of tracks that have selected keys
-    std::set<CTrackViewTrack*> tracks;
-
-    const unsigned int numKeys = selectedKeys.GetKeyCount();
-    for (int keyIndex = 0; keyIndex < numKeys; ++keyIndex)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
-        tracks.insert(keyHandle.GetTrack());
-    }
-
-    // For each of those tracks store an undo object
-    for (auto iter = tracks.begin(); iter != tracks.end(); ++iter)
-    {
-        CTrackViewTrack* pTrack = *iter;
-
-        TrackMemento trackMemento;
-        trackMemento.m_memento = pTrack->GetMemento();
-
-        const unsigned int numKeys2 = pTrack->GetKeyCount();
-        for (unsigned int i = 0; i < numKeys2; ++i)
-        {
-            trackMemento.m_keySelectionStates.push_back(pTrack->GetKey(i).IsSelected());
-        }
-
-        m_trackMementos[pTrack] = trackMemento;
-    }
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.h b/Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.h
deleted file mode 100644
index 0097c88c59..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDOPESHEETBASE_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDOPESHEETBASE_H
-#pragma once
-
-
-#include <IMovieSystem.h>
-#include "TrackViewNode.h"
-#include "TrackViewSequence.h"
-#include "AnimationContext.h"
-#include <QWidget>
-
-class CTVTrackPropsDialog;
-class CTrackViewNodesCtrl;
-class CTrackViewKeyPropertiesDlg;
-class CTrackViewNode;
-class CTrackViewTrack;
-class CTrackViewAnimNode;
-
-class QRubberBand;
-class QScrollBar;
-class ReflectedPropertyControl;
-
-namespace AZ
-{
-    class Color;
-}
-
-enum ETVActionMode
-{
-    eTVActionMode_MoveKey = 1,
-    eTVActionMode_AddKeys,
-    eTVActionMode_SlideKey,
-    eTVActionMode_ScaleKey,
-};
-
-enum ESnappingMode
-{
-    eSnappingMode_SnapNone = 0,
-    eSnappingMode_SnapTick,
-    eSnappingMode_SnapMagnet,
-    eSnappingMode_SnapFrame,
-};
-
-enum ETVTickMode
-{
-    eTVTickMode_InSeconds = 0,
-    eTVTickMode_InFrames,
-};
-
-/** TrackView DopeSheet interface
-*/
-class CTrackViewDopeSheetBase
-    : public QWidget
-    , public IAnimationContextListener
-    , public ITrackViewSequenceListener
-{
-public:
-    CTrackViewDopeSheetBase(QWidget* parent = 0);
-    virtual ~CTrackViewDopeSheetBase();
-
-    void SetNodesCtrl(CTrackViewNodesCtrl* pNodesCtrl) { m_pNodesCtrl = pNodesCtrl; }
-
-    void SetTimeScale(float timeScale, float fAnchorTime);
-    float GetTimeScale() { return m_timeScale; }
-
-    void SetScrollOffset(int hpos);
-
-    int GetScrollPos() const;
-
-    void SetTimeRange(float start, float end);
-    void SetStartMarker(float fTime);
-    void SetEndMarker(float fTime);
-
-    void SetMouseActionMode(ETVActionMode mode);
-
-    void SetKeyPropertiesDlg(CTrackViewKeyPropertiesDlg* dlg) { m_keyPropertiesDlg = dlg; }
-
-    void SetSnappingMode(ESnappingMode mode) { m_snappingMode = mode; }
-    ESnappingMode GetSnappingMode() const { return m_snappingMode; }
-    void SetSnapFPS(UINT fps);
-
-    ETVTickMode GetTickDisplayMode() const { return m_tickDisplayMode; }
-    void SetTickDisplayMode(ETVTickMode mode);
-
-    void SetEditLock(bool bLock) { m_bEditLock = bLock; }
-
-    // IAnimationContextListener
-    virtual void OnTimeChanged(float newTime) override;
-
-    float TickSnap(float time) const;
-
-protected:
-    void showEvent(QShowEvent* event) override;
-    void resizeEvent(QResizeEvent* event) override;
-    void wheelEvent(QWheelEvent* event) override;
-
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void mouseDoubleClickEvent(QMouseEvent* event) override;
-
-private:
-    void OnHScroll();
-    void OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void paintEvent(QPaintEvent* event) override;
-    void keyPressEvent(QKeyEvent* event) override;
-    bool event(QEvent* event) override;
-    void OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    void OnCaptureChanged();
-
-private slots:
-    void OnCurrentColorChange(const AZ::Color& color);
-
-private:
-    void UpdateColorKey(const QColor& color, bool addToUndo);
-    void UpdateColorKeyHelper(const ColorF& color);
-    void AddKeys(const QPoint& point, const bool bTryAddKeysInGroup);
-
-    void ShowKeyPropertyCtrlOnSpot(int x, int y, bool bMultipleKeysSelected, bool bKeyChangeInSameTrack);
-    void HideKeyPropertyCtrlOnSpot();
-
-    // Utility functions to change the selected track(s) in the given track(s)
-    void ChangeSequenceTrackSelection(CTrackViewSequence* sequence, CTrackViewTrack* trackToSelect) const;
-    void ChangeSequenceTrackSelection(CTrackViewSequence* sequence, CTrackViewTrackBundle trackBundle, bool multiTrackSelection) const;
-
-    XmlNodeRef GetKeysInClickboard();
-    void StartPasteKeys();
-
-    CTrackViewKeyHandle FirstKeyFromPoint(const QPoint& point);
-    CTrackViewKeyHandle DurationKeyFromPoint(const QPoint& point);
-    CTrackViewKeyHandle CheckCursorOnStartEndTimeAdjustBar(const QPoint& point, bool& bStart);
-
-    void SelectKeys(const QRect& rc, const bool bMultiSelection);
-
-    int NumKeysFromPoint(const QPoint& point);
-
-    //! Select all keys within time frame defined by this client rectangle.
-    void SelectAllKeysWithinTimeFrame(const QRect& rc, const bool bMultiSelection);
-
-    //! Return time snapped to time step,
-    double GetTickTime() const;
-    float MagnetSnap(float time, const CTrackViewAnimNode* pNode) const;
-    float FrameSnap(float time) const;
-
-    //! Return move time offset snapped with current snap settings
-    float ComputeSnappedMoveOffset();
-
-    //! Returns visible time range.
-    Range GetVisibleRange() const;
-    Range GetTimeRange(const QRect& rc) const;
-
-    void SetHorizontalExtent(int min, int max);
-
-    void SetCurrTime(float time);
-
-    //! Return client position for given time.
-    int TimeToClient(float time) const;
-
-    float TimeFromPoint(const QPoint& point) const;
-    float TimeFromPointUnsnapped(const QPoint& point) const;
-
-    void SetLeftOffset(int ofs) { m_leftOffset = ofs; };
-
-    void SetMouseCursor(const QCursor& cursor);
-
-    void ShowKeyTooltip(CTrackViewKeyHandle& keyHandle, const QPoint& point);
-
-    bool IsOkToAddKeyHere(const CTrackViewTrack* pTrack, float time) const;
-
-    void MouseMoveSelect(const QPoint& point);
-    void MouseMoveMove(const QPoint& point, Qt::KeyboardModifiers modifiers);
-
-    void MouseMoveDragTime(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void MouseMoveOver(const QPoint& point);
-    void MouseMoveDragEndMarker(const QPoint& point, Qt::KeyboardModifiers modifiers);
-
-    void CancelDrag();
-
-    float SnapTime(Qt::KeyboardModifiers modifiers, const QPoint& p);
-
-    void MouseMoveDragStartMarker(const QPoint& point, Qt::KeyboardModifiers modifiers);
-    void MouseMoveStartEndTimeAdjust(const QPoint& point, bool bStart);
-
-    CTrackViewNode* GetNodeFromPointRec(CTrackViewNode* pCurrentNode, const QPoint& point);
-    CTrackViewNode* GetNodeFromPoint(const QPoint& point);
-    CTrackViewAnimNode* GetAnimNodeFromPoint(const QPoint& point);
-    CTrackViewTrack* GetTrackFromPoint(const QPoint& point);
-
-    void LButtonDownOnTimeAdjustBar(const QPoint& point, CTrackViewKeyHandle& keyHandle, bool bStart);
-    void LButtonDownOnKey(const QPoint& point, CTrackViewKeyHandle& keyHandle, Qt::KeyboardModifiers modifiers);
-
-    bool CreateColorKey(CTrackViewTrack* pTrack, float keyTime);
-    void EditSelectedColorKey(CTrackViewTrack* pTrack);
-
-    void AcceptUndo();
-
-    // Returns the snapping mode modified active keys
-    ESnappingMode GetKeyModifiedSnappingMode();
-
-    QRect GetNodeRect(const CTrackViewNode* pNode) const;
-
-    void StoreMementoForTracksWithSelectedKeys();
-
-    // Drawing methods.
-    void DrawControl(QPainter* pDC, const QRect& rcUpdate);
-    void DrawNodesRecursive(CTrackViewNode* pNode, QPainter* pDC, const QRect& rcUpdate);
-    void DrawTimeline(QPainter* pDC, const QRect& rcUpdate);
-    void DrawSummary(QPainter* pDC, const QRect& rcUpdate);
-    void DrawSelectedKeyIndicators(QPainter* pDC);
-    void DrawTicks(QPainter* pDC, const QRect& rc, Range& timeRange);
-    void DrawNodeTrack(CTrackViewAnimNode* pAnimNode, QPainter* pDC, const QRect& trackRect);
-    void DrawTrack(CTrackViewTrack* pTrack, QPainter* pDC, const QRect& trackRect);
-    void DrawKeys(CTrackViewTrack* pTrack, QPainter* pDC, QRect& rc, Range& timeRange);
-    void DrawSequenceTrack(const Range& timeRange, QPainter* pDC, CTrackViewTrack* pTrack, const QRect& rc);
-    void DrawBoolTrack(const Range& timeRange, QPainter* pDC, CTrackViewTrack* pTrack, const QRect& rc);
-    void DrawSelectTrack(const Range& timeRange, QPainter* pDC, CTrackViewTrack* pTrack, const QRect& rc);
-    void DrawKeyDuration(CTrackViewTrack* pTrack, QPainter* pDC, const QRect& rc, int keyIndex);
-    void DrawGoToTrackArrow(CTrackViewTrack* pTrack, QPainter* pDC, const QRect& rc);
-    void DrawColorGradient(QPainter* pDC, const QRect& rc, const CTrackViewTrack* pTrack);
-    void DrawClipboardKeys(QPainter* pDC, const QRect& rc);
-    void DrawTrackClipboardKeys(QPainter* pDC, CTrackViewTrack* pTrack, XmlNodeRef trackNode, const float timeOffset);
-
-    CTrackViewNodesCtrl* m_pNodesCtrl;
-    void ComputeFrameSteps(const Range& VisRange);
-    void DrawTimeLineInFrames(QPainter* dc, const QRect& rc, const QColor& lineCol, const QColor& textCol, double step);
-    void DrawTimeLineInSeconds(QPainter* dc, const QRect& rc, const QColor& lineCol, const QColor& textCol, double step);
-
-    static bool CompareKeyHandleByTime(const CTrackViewKeyHandle &a, const CTrackViewKeyHandle &b);
-
-    QBrush m_bkgrBrush;
-    QBrush m_bkgrBrushEmpty;
-    QBrush m_selectedBrush;
-    QBrush m_timeBkgBrush;
-    QBrush m_timeHighlightBrush;
-    QBrush m_visibilityBrush;
-    QBrush m_selectTrackBrush;
-
-    QCursor m_currCursor;
-    QCursor m_crsLeftRight;
-    QCursor m_crsAddKey;
-    QCursor m_crsCross;
-    QCursor m_crsAdjustLR;
-
-    QRect m_rcClient;
-    QPoint m_scrollOffset;
-    QRect m_rcSelect;
-    QRect m_rcTimeline;
-    QRect m_rcSummary;
-
-    QPoint m_lastTooltipPos;
-    QPoint m_mouseDownPos;
-    QPoint m_mouseOverPos;
-
-    QPixmap m_offscreenBitmap;
-
-    QRubberBand* m_rubberBand;
-    QScrollBar* m_scrollBar;
-
-    // Time
-    float m_timeScale;
-    float m_currentTime;
-    float m_storedTime;
-    Range m_timeRange;
-    Range m_timeMarked;
-
-    // This is how often to place ticks.
-    // value of 10 means place ticks every 10 second.
-    double m_ticksStep;
-
-    CTrackViewKeyPropertiesDlg* m_keyPropertiesDlg;
-    ReflectedPropertyControl* m_wndPropsOnSpot;
-    const CTrackViewTrack* m_pLastTrackSelectedOnSpot;
-
-    QFont m_descriptionFont;
-
-    // Mouse interaction state
-    int m_mouseMode;
-    int m_mouseActionMode;
-    bool m_bZoomDrag;
-    bool m_bMoveDrag;
-    bool m_bCursorWasInKey;
-    bool m_bJustSelected;
-    bool m_bMouseMovedAfterRButtonDown;
-    bool m_bKeysMoved;
-    bool m_stashedRecordModeWhileTimeDragging;
-
-    // Offset for keys while moving/pasting
-    float m_keyTimeOffset;
-
-    // If control is locked for editing
-    bool m_bEditLock;
-
-    // Fast redraw: Only redraw time slider. Everything else is buffered.
-    bool m_bFastRedraw;
-
-    // Scrolling
-    int m_leftOffset;
-    int m_scrollMin;
-    int m_scrollMax;
-
-    // Snapping
-    ESnappingMode m_snappingMode;
-    float m_snapFrameTime;
-
-    // Ticks in frames or seconds
-    ETVTickMode m_tickDisplayMode;
-    double m_fFrameTickStep;
-    double m_fFrameLabelStep;
-
-    // Key for time adjust
-    CTrackViewKeyHandle m_keyForTimeAdjust;
-
-    // Cached clipboard XML for eTVMouseMode_Paste
-    XmlNodeRef m_clipboardKeys;
-
-    // Store current track whose color is being updated
-    CTrackViewTrack* m_colorUpdateTrack;
-
-    // Store the key time of that track
-    float            m_colorUpdateKeyTime;
-
-    // Mementos of unchanged tracks for Move/Scale/Slide etc.
-    struct TrackMemento
-    {
-        CTrackViewTrackMemento m_memento;
-
-        // Also need to store key selection states,
-        // because RestoreMemento will destroy them
-        std::vector<bool> m_keySelectionStates;
-    };
-
-    std::unordered_map<CTrackViewTrack*, TrackMemento> m_trackMementos;
-
-#ifdef DEBUG
-    unsigned int m_redrawCount;
-#endif
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWDOPESHEETBASE_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.cpp b/Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.cpp
deleted file mode 100644
index 443d9083c1..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "TrackViewDoubleSpinBox.h"
-
-CTrackViewDoubleSpinBox::CTrackViewDoubleSpinBox(QWidget* parent) 
-    : AzQtComponents::DoubleSpinBox(parent)
-{
-}
-
-CTrackViewDoubleSpinBox::~CTrackViewDoubleSpinBox()
-{
-}
-
-void CTrackViewDoubleSpinBox::stepBy(int steps)
-{
-    AzQtComponents::DoubleSpinBox::stepBy(steps);
-    Q_EMIT stepByFinished();
-}
-
-#include <TrackView/moc_TrackViewDoubleSpinBox.cpp>
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.h b/Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.h
deleted file mode 100644
index 5d5b89758e..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#if !defined(Q_MOC_RUN)
-#include <AzQtComponents/Components/Widgets/SpinBox.h>
-#endif
-
-class CTrackViewDoubleSpinBox
-    : public AzQtComponents::DoubleSpinBox
-{
-    Q_OBJECT
-
-public:
-    CTrackViewDoubleSpinBox(QWidget* parent = nullptr);
-    ~CTrackViewDoubleSpinBox() override;
-
-protected:
-    virtual void stepBy(int steps) override;
-
-signals:
-    void stepByFinished();
-};
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewEventNode.cpp b/Code/Sandbox/Editor/TrackView/TrackViewEventNode.cpp
deleted file mode 100644
index a6bb756e53..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewEventNode.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewEventNode.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewEventNode::CTrackViewEventNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode)
-    : CTrackViewAnimNode(pSequence, pAnimNode, pParentNode)
-{
-    if (GetAnimNode() && GetAnimNode()->GetSequence())
-    {
-        GetAnimNode()->GetSequence()->AddTrackEventListener(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewEventNode::~CTrackViewEventNode()
-{
-    if (GetAnimNode() && GetAnimNode()->GetSequence())
-    {
-        GetAnimNode()->GetSequence()->RemoveTrackEventListener(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewEventNode::OnTrackEvent([[maybe_unused]] IAnimSequence* pSequence, int reason, const char* event, void* pUserData)
-{
-    ITrackEventListener::ETrackEventReason  eReason = static_cast<ITrackEventListener::ETrackEventReason>(reason);
-    switch (eReason)
-    {
-    case ITrackEventListener::eTrackEventReason_Renamed:
-        RenameTrackEvent(event, static_cast<const char*>(pUserData));
-        break;
-    case ITrackEventListener::eTrackEventReason_Removed:
-        RemoveTrackEvent(event);
-    default:
-        // do nothing for events we're not interested in
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewEventNode::RenameTrackEvent(const char* fromName, const char* toName)
-{
-    CTrackViewTrackBundle eventTracks = GetTracksByParam(AnimParamType::TrackEvent);
-    const uint numEventTracks = eventTracks.GetCount();
-
-    for (uint i = 0; i < numEventTracks; ++i)
-    {
-        CTrackViewTrack* eventTrack = eventTracks.GetTrack(i);
-        if (eventTrack)
-        {
-            // Go through all keys searching for match to the fromName and re-set these keys to use the toName
-            CTrackViewKeyBundle allKeys = eventTrack->GetAllKeys();
-            const uint numKeys = allKeys.GetKeyCount();
-            for (uint k = 0; k < numKeys; ++k)
-            {
-                CTrackViewKeyHandle keyHandle = allKeys.GetKey(k);
-                IEventKey eventKey;
-
-                keyHandle.GetKey(&eventKey);
-                if (strcmp(eventKey.event.c_str(), fromName) == 0)
-                {
-                    // we have a match - re-set the eventKey with the toName
-                    eventKey.event = toName;
-                    keyHandle.SetKey(&eventKey);
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewEventNode::RemoveTrackEvent(const char* removedEventName)
-{
-    // rename the removedEventName keys to the empty string, which represents an unset event key
-    RenameTrackEvent(removedEventName, "");
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewEventNode.h b/Code/Sandbox/Editor/TrackView/TrackViewEventNode.h
deleted file mode 100644
index d8a9f49b8c..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewEventNode.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWEVENTNODE_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWEVENTNODE_H
-#pragma once
-
-#include "IMovieSystem.h"
-#include "TrackViewAnimNode.h"
-
-////////////////////////////////////////////////////////////////////////////
-// This class represents an IAnimNode deditcated to firing Track Events
-////////////////////////////////////////////////////////////////////////////
-
-class CTrackViewEventNode
-    : public CTrackViewAnimNode
-    , public ITrackEventListener
-{
-public:
-    CTrackViewEventNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode);
-    virtual ~CTrackViewEventNode();
-
-    // overrides from ITrackEventListener
-    void OnTrackEvent(IAnimSequence* pSequence, int reason, const char* event, void* pUserData) override;
-
-protected:
-    // updates existing keys using fromName events, changes them to use the toName events instead
-    void RenameTrackEvent(const char* fromName, const char* toName);
-
-    // updates existing keys using removedEventName events to use the empty string (representing no event)
-    void RemoveTrackEvent(const char* removedEventName);
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWEVENTNODE_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.cpp b/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.cpp
deleted file mode 100644
index 4b21949971..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewFindDlg.h"
-
-// Editor
-#include "TrackViewSequenceManager.h"
-#include "AnimationContext.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <TrackView/ui_TrackViewFindDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "Maestro/Types/AnimNodeType.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CTrackViewFindDlg dialog
-
-
-CTrackViewFindDlg::CTrackViewFindDlg(const char* title, QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , ui(new Ui::TrackViewFindDlg)
-{
-    setWindowTitle(title);
-
-    m_tvDlg = 0;
-    m_numSeqs = 0;
-
-    ui->setupUi(this);
-    ui->LIST->setSelectionMode(QAbstractItemView::SingleSelection);
-
-    connect(ui->OK, &QPushButton::clicked, this, &CTrackViewFindDlg::OnOK);
-    connect(ui->CANCEL, &QPushButton::clicked, this, &CTrackViewFindDlg::OnCancel);
-    connect(ui->FILTER, &QLineEdit::textEdited, this, &CTrackViewFindDlg::OnFilterChange);
-    connect(ui->LIST, &QListWidget::itemDoubleClicked, this, &CTrackViewFindDlg::OnItemDoubleClicked);
-
-    FillData();
-}
-
-CTrackViewFindDlg::~CTrackViewFindDlg()
-{
-}
-
-void CTrackViewFindDlg::FillData()
-{
-    m_numSeqs = 0;
-    m_objs.resize(0);
-    for (int k = 0; k < GetIEditor()->GetMovieSystem()->GetNumSequences(); ++k)
-    {
-        IAnimSequence* seq = GetIEditor()->GetMovieSystem()->GetSequence(k);
-        for (int i = 0; i < seq->GetNodeCount(); i++)
-        {
-            IAnimNode* pNode = seq->GetNode(i);
-            ObjName obj;
-            obj.m_objName = pNode->GetName();
-            obj.m_directorName = pNode->HasDirectorAsParent() ? pNode->HasDirectorAsParent()->GetName() : "";
-            string fullname = seq->GetName();
-            obj.m_seqName = fullname.c_str();
-            m_objs.push_back(obj);
-        }
-        m_numSeqs++;
-    }
-    FillList();
-}
-
-
-void CTrackViewFindDlg::Init(CTrackViewDialog* tvDlg)
-{
-    m_tvDlg = tvDlg;
-}
-
-void CTrackViewFindDlg::FillList()
-{
-    QString filter = ui->FILTER->text();
-    ui->LIST->clear();
-
-    for (int i = 0; i < m_objs.size(); i++)
-    {
-        ObjName pObj = m_objs[i];
-        if (filter.isEmpty() || pObj.m_objName.contains(filter, Qt::CaseInsensitive))
-        {
-            QString text = pObj.m_objName;
-            if (!pObj.m_directorName.isEmpty())
-            {
-                text += " (";
-                text += pObj.m_directorName;
-                text += ")";
-            }
-            if (m_numSeqs > 1)
-            {
-                text += " / ";
-                text += pObj.m_seqName;
-            }
-            ui->LIST->addItem(text);
-        }
-    }
-    ui->LIST->setCurrentRow(0);
-}
-
-void CTrackViewFindDlg::OnOK()
-{
-    ProcessSel();
-    accept();
-}
-
-void CTrackViewFindDlg::OnCancel()
-{
-    reject();
-}
-
-void CTrackViewFindDlg::OnFilterChange([[maybe_unused]] const QString& text)
-{
-    FillList();
-}
-
-void CTrackViewFindDlg::ProcessSel()
-{
-    QList<QListWidgetItem*> selection = ui->LIST->selectedItems();
-
-    if (selection.size() != 1)
-    {
-        return;
-    }
-    int index = ui->LIST->row(selection.first());
-
-    if (index >= 0 && m_tvDlg)
-    {
-        ObjName object = m_objs[index];
-
-        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* pSequence = pSequenceManager->GetSequenceByName(object.m_seqName);
-
-        if (pSequence)
-        {
-            CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-            pAnimationContext->SetSequence(pSequence, false, false);
-
-            CTrackViewAnimNode* pParentDirector = pSequence;
-            CTrackViewAnimNodeBundle foundDirectorNodes = pSequence->GetAnimNodesByName(object.m_directorName.toUtf8().data());
-            if (foundDirectorNodes.GetCount() > 0 && foundDirectorNodes.GetNode(0)->GetType() == AnimNodeType::Director)
-            {
-                pParentDirector = foundDirectorNodes.GetNode(0);
-            }
-
-            CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAnimNodesByName(object.m_objName.toUtf8().data());
-
-            const uint numNodes = foundNodes.GetCount();
-            for (uint i = 0; i < numNodes; ++i)
-            {
-                foundNodes.GetNode(i)->SetSelected(true);
-            }
-        }
-    }
-}
-
-void CTrackViewFindDlg::OnItemDoubleClicked()
-{
-    ProcessSel();
-}
-
-#include <TrackView/moc_TrackViewFindDlg.cpp>
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.h b/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.h
deleted file mode 100644
index 96ebc248a0..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWFINDDLG_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWFINDDLG_H
-#pragma once
-
-// TrackViewFindDlg.h : header file
-//
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QScopedPointer>
-#endif
-
-class CTrackViewDialog;
-
-namespace Ui {
-    class TrackViewFindDlg;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CTrackViewFindDlg dialog
-class CTrackViewFindDlg
-    : public QDialog
-{
-    Q_OBJECT
-    // Construction
-public:
-    CTrackViewFindDlg(const char* title = NULL, QWidget* pParent = NULL);   // standard constructor
-    ~CTrackViewFindDlg();
-
-    //Functions
-    void FillData();
-    void FillList();
-    void Init(CTrackViewDialog* tvDlg);
-    void ProcessSel();
-
-protected slots:
-    void OnOK();
-    void OnCancel();
-    void OnFilterChange(const QString& text);
-    void OnItemDoubleClicked();
-
-protected:
-    struct ObjName
-    {
-        QString m_objName;
-        QString m_directorName;
-        QString m_seqName;
-    };
-
-    std::vector<ObjName> m_objs;
-    CTrackViewDialog* m_tvDlg;
-
-    int m_numSeqs;
-
-    QScopedPointer<Ui::TrackViewFindDlg> ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWFINDDLG_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp b/Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
deleted file mode 100644
index 8299960c80..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewKeyPropertiesDlg.h"
-
-// Qt
-#include <QMessageBox>
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimValueType.h>
-
-// Editor
-#include "Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <TrackView/ui_TrackViewTrackPropsDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyUIControls::OnInternalVariableChange(IVariable* var)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    AZ_Assert(sequence, "Expected valid sequence.");
-    if (sequence)
-    {
-        CTrackViewKeyBundle keys = sequence->GetSelectedKeys();
-        OnUIChange(var, keys);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyPropertiesDlg::CTrackViewKeyPropertiesDlg(QWidget* hParentWnd)
-    : QWidget(hParentWnd)
-    , m_pLastTrackSelected(nullptr)
-    , m_sequence(nullptr)
-{
-    QVBoxLayout* l = new QVBoxLayout();
-    l->setMargin(0);
-    m_wndTrackProps = new CTrackViewTrackPropsDlg(this);
-    l->addWidget(m_wndTrackProps);
-    m_wndProps = new ReflectedPropertyControl(this);
-    m_wndProps->Setup(true, 120);
-    m_wndProps->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
-    l->addWidget(m_wndProps);
-
-    m_wndProps->SetStoreUndoByItems(false);
-
-    setLayout(l);
-
-    m_pVarBlock = new CVarBlock;
-
-    // Add key UI classes
-    std::vector<IClassDesc*> classes;
-    GetIEditor()->GetClassFactory()->GetClassesByCategory("TrackViewKeyUI", classes);  // BySystemID(ESYSTEM_CLASS_TRACKVIEW_KEYUI, classes);
-    for (IClassDesc* iclass : classes)
-    {
-        if (QObject* pObj = iclass->CreateQObject())
-        {
-            auto keyControl = qobject_cast<CTrackViewKeyUIControls*>(pObj);
-            Q_ASSERT(keyControl);
-            m_keyControls.push_back(keyControl);
-        }
-    }
-
-    // Sort key controls by descending priority
-    std::stable_sort(m_keyControls.begin(), m_keyControls.end(),
-        [](const _smart_ptr<CTrackViewKeyUIControls>& a, const _smart_ptr<CTrackViewKeyUIControls>& b)
-        {
-            return a->GetPriority() > b->GetPriority();
-        }
-        );
-
-    CreateAllVars();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyPropertiesDlg::OnVarChange(IVariable* pVar)
-{
-    // If it was a motion that just changed, we need to rebuild the controls
-    // so the min/max on the sliders update correctly.
-    if (m_sequence && pVar->GetDataType() == IVariable::DT_MOTION)
-    {
-        OnKeySelectionChanged(m_sequence);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyPropertiesDlg::CreateAllVars()
-{
-    for (int i = 0; i < (int)m_keyControls.size(); i++)
-    {
-        m_keyControls[i]->SetKeyPropertiesDlg(this);
-        m_keyControls[i]->OnCreateVars();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyPropertiesDlg::PopulateVariables()
-{
-    // Must first clear any selection in properties window.
-    m_wndProps->RemoveAllItems();
-    m_wndProps->AddVarBlock(m_pVarBlock);
-
-    m_wndProps->SetUpdateCallback(AZStd::bind(&CTrackViewKeyPropertiesDlg::OnVarChange, this, AZStd::placeholders::_1));
-    //m_wndProps->m_props.ExpandAll();
-
-
-    ReloadValues();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyPropertiesDlg::PopulateVariables(ReflectedPropertyControl* propCtrl)
-{
-    propCtrl->RemoveAllItems();
-    propCtrl->AddVarBlock(m_pVarBlock);
-
-    propCtrl->ReloadValues();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyPropertiesDlg::OnKeysChanged(CTrackViewSequence* pSequence)
-{
-    CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
-
-    if (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType())
-    {
-        CTrackViewTrack* pTrack = selectedKeys.GetKey(0).GetTrack();
-
-        CAnimParamType paramType = pTrack->GetParameterType();
-        EAnimCurveType trackType = pTrack->GetCurveType();
-        AnimValueType valueType = pTrack->GetValueType();
-
-        for (int i = 0; i < (int)m_keyControls.size(); i++)
-        {
-            if (m_keyControls[i]->SupportTrackType(paramType, trackType, valueType))
-            {
-                m_keyControls[i]->OnKeySelectionChange(selectedKeys);
-                break;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyPropertiesDlg::OnKeySelectionChanged(CTrackViewSequence* sequence)
-{
-    m_sequence = sequence;
-
-    if (nullptr == sequence)
-    {
-        m_wndProps->ClearSelection();
-        m_pVarBlock->DeleteAllVariables();
-        m_wndProps->setEnabled(false);
-        m_wndTrackProps->setEnabled(false);
-        return;
-    }
-
-    CTrackViewKeyBundle selectedKeys = sequence->GetSelectedKeys();
-
-    m_wndTrackProps->OnKeySelectionChange(selectedKeys);
-
-    bool bSelectChangedInSameTrack
-        = m_pLastTrackSelected
-            && selectedKeys.GetKeyCount() == 1
-            && selectedKeys.GetKey(0).GetTrack() == m_pLastTrackSelected;
-
-    // Every Key in an Asset Blend track can have different min/max values on the float sliders
-    // because it's based on the duration of the motion that is set. So don't try to
-    // reuse the controls when the selection changes, otherwise the tooltips may be wrong.
-    bool reuseControls = bSelectChangedInSameTrack && m_pLastTrackSelected && (m_pLastTrackSelected->GetValueType() != AnimValueType::AssetBlend);
-
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        m_pLastTrackSelected = selectedKeys.GetKey(0).GetTrack();
-    }
-    else
-    {
-        m_pLastTrackSelected = nullptr;
-    }
-
-    if (reuseControls)
-    {
-        m_wndProps->ClearSelection();
-    }
-    else
-    {
-        m_pVarBlock->DeleteAllVariables();
-    }
-
-    m_wndProps->setEnabled(false);
-    m_wndTrackProps->setEnabled(false);
-    bool bAssigned = false;
-    if (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType())
-    {
-        CTrackViewTrack* pTrack = selectedKeys.GetKey(0).GetTrack();
-
-        CAnimParamType paramType = pTrack->GetParameterType();
-        EAnimCurveType trackType = pTrack->GetCurveType();
-        AnimValueType valueType = pTrack->GetValueType();
-
-        for (int i = 0; i < (int)m_keyControls.size(); i++)
-        {
-            if (m_keyControls[i]->SupportTrackType(paramType, trackType, valueType))
-            {
-                if (!reuseControls)
-                {
-                    AddVars(m_keyControls[i]);
-                }
-
-                if (m_keyControls[i]->OnKeySelectionChange(selectedKeys))
-                {
-                    bAssigned = true;
-                }
-
-                break;
-            }
-        }
-
-        m_wndProps->setEnabled(true);
-        m_wndTrackProps->setEnabled(true);
-    }
-    else
-    {
-        m_wndProps->setEnabled(false);
-        m_wndTrackProps->setEnabled(false);
-    }
-
-    if (reuseControls)
-    {
-        ReloadValues();
-    }
-    else
-    {
-        PopulateVariables();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyPropertiesDlg::AddVars(CTrackViewKeyUIControls* pUI)
-{
-    CVarBlock* pVB = pUI->GetVarBlock();
-    for (int i = 0, num = pVB->GetNumVariables(); i < num; i++)
-    {
-        IVariable* pVar = pVB->GetVariable(i);
-        m_pVarBlock->AddVariable(pVar);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyPropertiesDlg::ReloadValues()
-{
-    m_wndProps->ReloadValues();
-}
-
-void CTrackViewKeyPropertiesDlg::OnSequenceChanged(CTrackViewSequence* sequence)
-{
-    OnKeySelectionChanged(sequence);
-    m_wndTrackProps->OnSequenceChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrackPropsDlg::CTrackViewTrackPropsDlg(QWidget* parent /* = 0 */)
-    : QWidget(parent)
-    , ui(new Ui::CTrackViewTrackPropsDlg)
-{
-    ui->setupUi(this);
-
-    // Use editingFinished and a custom signal stepByFinished (and not valueChanged)
-    // so the time will be updated when the user finishes editing the time field (hits enter)
-    // or if the arrow keys (or mouse click on the arrow buttons) in the spinner box are
-    // pressed. Don't just use valueChanged because we don't want intermediate values
-    // like 1 as the user is typing 10 to register as updates to the key values. Keys
-    // are identified by time, so the keys jumping around like that can stomp existing keys
-    // that happen to live at the intermediate values.
-    connect(ui->TIME, SIGNAL(editingFinished()), this, SLOT(OnUpdateTime()));
-    connect(ui->TIME, SIGNAL(stepByFinished()), this, SLOT(OnUpdateTime()));
-}
-
-CTrackViewTrackPropsDlg::~CTrackViewTrackPropsDlg()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrackPropsDlg::OnSequenceChanged()
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (pSequence)
-    {
-        Range range = pSequence->GetTimeRange();
-        ui->TIME->setRange(range.start, range.end);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewTrackPropsDlg::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys)
-{
-    m_keyHandle = CTrackViewKeyHandle();
-
-    if (selectedKeys.GetKeyCount() == 1)
-    {
-        m_keyHandle = selectedKeys.GetKey(0);
-    }
-
-    if (m_keyHandle.IsValid())
-    {
-        // Block the callback, the values is already set in m_keyHandle.GetTime(), no need to
-        // reset it and create an undo even like the user was setting it via the UI.
-        ui->TIME->blockSignals(true);
-        ui->TIME->setValue(m_keyHandle.GetTime());
-        ui->TIME->blockSignals(false);
-        ui->PREVNEXT->setText(QString::number(m_keyHandle.GetIndex() + 1));
-
-        ui->PREVNEXT->setEnabled(true);
-        ui->TIME->setEnabled(true);
-    }
-    else
-    {
-        ui->PREVNEXT->setEnabled(FALSE);
-        ui->TIME->setEnabled(FALSE);
-    }
-    return true;
-}
-
-void CTrackViewTrackPropsDlg::OnUpdateTime()
-{
-    if (!m_keyHandle.IsValid())
-    {
-        return;
-    }
-
-    const float time = (float)ui->TIME->value();
-
-    // Check if the sequence is legacy
-    CTrackViewTrack* track = m_keyHandle.GetTrack();
-    if (nullptr != track)
-    {
-        CTrackViewSequence* sequence = track->GetSequence();
-        if (nullptr != sequence && !AZ::IsClose(m_keyHandle.GetTime(), time, AZ::Constants::FloatEpsilon))
-        {
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            if (isDuringUndo)
-            {
-                m_keyHandle.SetTime(time);
-            }
-            else
-            {
-                // Let the AZ Undo system manage the nodes on the sequence entity
-                AzToolsFramework::ScopedUndoBatch undoBatch("Change key time");
-
-                CTrackViewKeyHandle existingKey = track->GetKeyByTime(time);
-
-                // If there is an existing key at this time, remove it so the
-                // new key at this time is the only one here. Make sure it's actually a different
-                // key, because time can "change" but then be quantized (or snapped) to the same time by track->GetKeyByTime(time).
-                if (existingKey.IsValid() && (existingKey.GetIndex() != m_keyHandle.GetIndex()))
-                {
-                    // Save the old time before we set the new time so we
-                    // can reselect the m_keyHandle after the Delete.
-                    float currentTime = m_keyHandle.GetTime();
-
-                    // There is a bug in QT where editingFinished will get fired a second time if we show a QMessageBox
-                    // so work around it by blocking signal before we do it.
-                    ui->TIME->blockSignals(true);
-
-                    QString msgBody = "There is an existing key at the specified time. If you continue, the existing key will be removed.";
-                    if (QMessageBox::warning(this, "Overwrite Existing Key?", msgBody, QMessageBox::Cancel | QMessageBox::Yes) == QMessageBox::Cancel)
-                    {
-                        // Restore the old value and return.
-                        ui->TIME->setValue(currentTime);
-                        ui->TIME->blockSignals(false);
-                        return;
-                    }
-                    else
-                    {
-                        ui->TIME->blockSignals(false);
-                    }
-
-                    // Delete the key that is able to get replaced. This will
-                    // cause a sort and may cause m_keyHandle to become invalid.
-                    existingKey.Delete();
-
-                    // Reselect the key handle by time.
-                    m_keyHandle = track->GetKeyByTime(currentTime);
-                }
-
-                m_keyHandle.SetTime(time);
-
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-        }
-    }
-}
-
-#include <TrackView/moc_TrackViewKeyPropertiesDlg.cpp>
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.h b/Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.h
deleted file mode 100644
index 925bb5db02..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWKEYPROPERTIESDLG_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWKEYPROPERTIESDLG_H
-#pragma once
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "TrackViewSequence.h"
-#include "TrackViewNode.h"
-#include "Plugin.h"
-#include "TrackViewDopeSheetBase.h"
-#include "QtViewPane.h"
-
-#include <QScopedPointer>
-#include <QDockWidget>
-#endif
-
-namespace Ui {
-    class CTrackViewTrackPropsDlg;
-    class CTrackViewKeyPropertiesDlg;
-}
-
-class ReflectedPropertyControl;
-class CTrackViewKeyPropertiesDlg;
-
-//////////////////////////////////////////////////////////////////////////
-class CTrackViewKeyUIControls
-    : public QObject
-    , public _i_reference_target_t
-{
-    Q_OBJECT
-public:
-    CTrackViewKeyUIControls()
-    {
-        m_pVarBlock = new CVarBlock;
-        m_onSetCallback = AZStd::bind(&CTrackViewKeyUIControls::OnInternalVariableChange, this, AZStd::placeholders::_1);
-    };
-
-    void SetKeyPropertiesDlg(CTrackViewKeyPropertiesDlg* pDlg) { m_pKeyPropertiesDlg = pDlg; }
-
-    // Return internal variable block.
-    CVarBlock* GetVarBlock() const { return m_pVarBlock; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Callbacks that must be implemented in derived class
-    //////////////////////////////////////////////////////////////////////////
-    // Returns true if specified animation track type is supported by this UI.
-    virtual bool SupportTrackType(const CAnimParamType& paramType, EAnimCurveType trackType, AnimValueType valueType) const = 0;
-
-    // Called when UI variable changes.
-    virtual void OnCreateVars() = 0;
-
-    // Called when user changes selected keys.
-    // Return true if control update UI values
-    virtual bool OnKeySelectionChange(CTrackViewKeyBundle& keys) = 0;
-
-    // Called when UI variable changes.
-    virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& keys) = 0;
-
-    // Get priority of key UI control, so that specializations can have precedence
-    virtual unsigned int GetPriority() const = 0;
-
-protected:
-    //////////////////////////////////////////////////////////////////////////
-    // Helper functions.
-    //////////////////////////////////////////////////////////////////////////
-    template <class T>
-    void SyncValue(CSmartVariable<T>& var, T& value, bool bCopyToUI, IVariable* pSrcVar = NULL)
-    {
-        if (bCopyToUI)
-        {
-            var = value;
-        }
-        else
-        {
-            if (!pSrcVar || pSrcVar == var.GetVar())
-            {
-                value = var;
-            }
-        }
-    }
-    void AddVariable(CVariableBase& varArray, CVariableBase& var, const char* varName, unsigned char dataType = IVariable::DT_SIMPLE)
-    {
-        if (varName)
-        {
-            var.SetName(varName);
-        }
-        var.SetDataType(dataType);
-        var.AddOnSetCallback(&m_onSetCallback);
-        varArray.AddVariable(&var);
-        m_registeredVariables.push_back(&var);
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void AddVariable(CVariableBase& var, const char* varName, unsigned char dataType = IVariable::DT_SIMPLE)
-    {
-        if (varName)
-        {
-            var.SetName(varName);
-        }
-        var.SetDataType(dataType);
-        var.AddOnSetCallback(&m_onSetCallback);
-        m_pVarBlock->AddVariable(&var);
-        m_registeredVariables.push_back(&var);
-    }
-    void OnInternalVariableChange(IVariable* pVar);
-
-protected:
-    _smart_ptr<CVarBlock> m_pVarBlock;
-    std::vector<_smart_ptr<IVariable> > m_registeredVariables;
-    CTrackViewKeyPropertiesDlg* m_pKeyPropertiesDlg;
-    IVariable::OnSetCallback m_onSetCallback;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CTrackViewTrackPropsDlg
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    CTrackViewTrackPropsDlg(QWidget* parent = 0);
-    ~CTrackViewTrackPropsDlg();
-
-    void OnSequenceChanged();
-    bool OnKeySelectionChange(CTrackViewKeyBundle& keys);
-    void ReloadKey();
-
-protected slots:
-    void OnUpdateTime();
-
-protected:
-    CTrackViewKeyHandle m_keyHandle;
-    QScopedPointer<Ui::CTrackViewTrackPropsDlg> ui;
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-class TrackViewKeys;
-class CTrackViewKeyPropertiesDlg
-    : public QWidget
-    , public ITrackViewSequenceListener
-{
-public:
-    CTrackViewKeyPropertiesDlg(QWidget* hParentWnd);
-
-    void SetKeysCtrl(CTrackViewDopeSheetBase* pKeysCtrl)
-    {
-        m_keysCtrl = pKeysCtrl;
-        if (m_keysCtrl)
-        {
-            m_keysCtrl->SetKeyPropertiesDlg(this);
-        }
-    }
-
-    void OnSequenceChanged(CTrackViewSequence* sequence);
-
-    void PopulateVariables();
-    void PopulateVariables(ReflectedPropertyControl* propCtrl);
-
-    // ITrackViewSequenceListener
-    virtual void OnKeysChanged(CTrackViewSequence* pSequence) override;
-    virtual void OnKeySelectionChanged(CTrackViewSequence* pSequence) override;
-
-protected:
-    //////////////////////////////////////////////////////////////////////////
-    void OnVarChange(IVariable* pVar);
-    void CreateAllVars();
-    void AddVars(CTrackViewKeyUIControls* pUI);
-    void ReloadValues();
-
-protected:
-    std::vector< _smart_ptr<CTrackViewKeyUIControls> > m_keyControls;
-
-    _smart_ptr<CVarBlock> m_pVarBlock;
-
-    ReflectedPropertyControl* m_wndProps;
-    CTrackViewTrackPropsDlg* m_wndTrackProps;
-
-    CTrackViewDopeSheetBase* m_keysCtrl;
-
-    CTrackViewTrack* m_pLastTrackSelected;
-    CTrackViewSequence* m_sequence;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWKEYPROPERTIESDLG_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNode.cpp b/Code/Sandbox/Editor/TrackView/TrackViewNode.cpp
deleted file mode 100644
index 320d16568d..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewNode.cpp
+++ /dev/null
@@ -1,713 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewNode.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-
-// Editor
-#include "TrackView/TrackViewTrack.h"
-#include "TrackView/TrackViewSequence.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyConstHandle::GetKey(IKey* pKey) const
-{
-    assert(m_bIsValid);
-
-    m_pTrack->GetKey(m_keyIndex, pKey);
-}
-
-////////////////////////////////////////////////////////////////////////////
-float CTrackViewKeyConstHandle::GetTime() const
-{
-    assert(m_bIsValid);
-
-    return m_pTrack->GetKeyTime(m_keyIndex);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyHandle::SetKey(IKey* pKey)
-{
-    assert(m_bIsValid);
-
-    m_pTrack->SetKey(m_keyIndex, pKey);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyHandle::GetKey(IKey* pKey) const
-{
-    assert(m_bIsValid);
-
-    m_pTrack->GetKey(m_keyIndex, pKey);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyHandle::Select(bool bSelect)
-{
-    assert(m_bIsValid);
-
-    m_pTrack->SelectKey(m_keyIndex, bSelect);
-}
-
-////////////////////////////////////////////////////////////////////////////
-bool CTrackViewKeyHandle::IsSelected() const
-{
-    assert(m_bIsValid);
-
-    return m_pTrack->IsKeySelected(m_keyIndex);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyHandle::SetTime(float time, bool notifyListeners)
-{
-    AZ_Assert(m_bIsValid, "Expected a valid key handle.");
-
-    // Flag the current key, because the key handle may become invalid
-    // after the time is set and it is potentially sorted into a different
-    // index.    
-    m_pTrack->SetSortMarkerKey(m_keyIndex, true);
-
-    // set the new time, this may cause a sort that reorders the keys, making
-    // m_keyIndex incorrect.
-    m_pTrack->SetKeyTime(m_keyIndex, time, notifyListeners);
-
-    // If the key at this index changed because of the key sort by time.
-    // We need to search through the keys now and find the marker.
-    if (!m_pTrack->IsSortMarkerKey(m_keyIndex))
-    {
-        CTrackViewKeyBundle allKeys = m_pTrack->GetAllKeys();
-        for (int x = 0; x < allKeys.GetKeyCount(); x++)
-        {
-            unsigned int curIndex = allKeys.GetKey(x).GetIndex();
-            if (m_pTrack->IsSortMarkerKey(curIndex))
-            {
-                m_keyIndex = curIndex;
-                break;
-            }
-        }
-    }
-
-    // clear the sort marker
-    m_pTrack->SetSortMarkerKey(m_keyIndex, false);
-}
-
-////////////////////////////////////////////////////////////////////////////
-float CTrackViewKeyHandle::GetTime() const
-{
-    assert(m_bIsValid);
-
-    return m_pTrack->GetKeyTime(m_keyIndex);
-}
-
-////////////////////////////////////////////////////////////////////////////
-float CTrackViewKeyHandle::GetDuration() const
-{
-    assert(m_bIsValid);
-
-    const char* desc = nullptr;
-    float duration = 0;
-    m_pTrack->m_pAnimTrack->GetKeyInfo(m_keyIndex, desc, duration);
-
-    return duration;
-}
-
-////////////////////////////////////////////////////////////////////////////
-const char* CTrackViewKeyHandle::GetDescription() const
-{
-    assert(m_bIsValid);
-
-    const char* desc = "";
-    float duration = 0;
-    m_pTrack->m_pAnimTrack->GetKeyInfo(m_keyIndex, desc, duration);
-
-    return desc;
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyHandle::Offset(float offset, bool notifyListeners)
-{
-    AZ_Assert(m_bIsValid, "Expected key handle to be in a valid state.");
-
-    float newTime = m_pTrack->GetKeyTime(m_keyIndex) + offset;
-    m_pTrack->SetKeyTime(m_keyIndex, newTime, notifyListeners);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyHandle::Delete()
-{
-    assert(m_bIsValid);
-
-    m_pTrack->RemoveKey(m_keyIndex);
-    m_bIsValid = false;
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewKeyHandle::Clone()
-{
-    assert(m_bIsValid);
-
-    unsigned int newKeyIndex = m_pTrack->CloneKey(m_keyIndex);
-    return CTrackViewKeyHandle(m_pTrack, newKeyIndex);
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewKeyHandle::GetNextKey()
-{
-    return m_pTrack->GetNextKey(GetTime());
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewKeyHandle::GetPrevKey()
-{
-    return m_pTrack->GetPrevKey(GetTime());
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewKeyHandle::GetAboveKey() const
-{
-    // Search for track above that has keys
-    for (CTrackViewNode* pCurrentNode = m_pTrack->GetAboveNode(); pCurrentNode; pCurrentNode = pCurrentNode->GetAboveNode())
-    {
-        if (pCurrentNode->GetNodeType() == eTVNT_Track)
-        {
-            CTrackViewTrack* pCurrentTrack = static_cast<CTrackViewTrack*>(pCurrentNode);
-            const unsigned int keyCount = pCurrentTrack->GetKeyCount();
-            if (keyCount > 0)
-            {
-                // Return key with nearest time to this key
-                return pCurrentTrack->GetNearestKeyByTime(GetTime());
-            }
-        }
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewKeyHandle::GetBelowKey() const
-{
-    // Search for track below that has keys
-    for (CTrackViewNode* pCurrentNode = m_pTrack->GetBelowNode(); pCurrentNode; pCurrentNode = pCurrentNode->GetBelowNode())
-    {
-        if (pCurrentNode->GetNodeType() == eTVNT_Track)
-        {
-            CTrackViewTrack* pCurrentTrack = static_cast<CTrackViewTrack*>(pCurrentNode);
-            const unsigned int keyCount = pCurrentTrack->GetKeyCount();
-            if (keyCount > 0)
-            {
-                // Return key with nearest time to this key
-                return pCurrentTrack->GetNearestKeyByTime(GetTime());
-            }
-        }
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-////////////////////////////////////////////////////////////////////////////
-bool CTrackViewKeyHandle::operator==(const CTrackViewKeyHandle& keyHandle) const
-{
-    return m_pTrack == keyHandle.m_pTrack && m_keyIndex == keyHandle.m_keyIndex;
-}
-
-////////////////////////////////////////////////////////////////////////////
-bool CTrackViewKeyHandle::operator!=(const CTrackViewKeyHandle& keyHandle) const
-{
-    return !(*this == keyHandle);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyBundle::AppendKey(const CTrackViewKeyHandle& keyHandle)
-{
-    // Check if newly added key has different type than existing ones
-    if (m_bAllOfSameType && m_keys.size() > 0)
-    {
-        const CTrackViewKeyHandle& lastKey = m_keys.back();
-
-        const CTrackViewTrack* pMyTrack = keyHandle.GetTrack();
-        const CTrackViewTrack* pOtherTrack = lastKey.GetTrack();
-
-        // Check if keys are from sub tracks, always compare types of parent track
-        if (pMyTrack->IsSubTrack())
-        {
-            pMyTrack = static_cast<const CTrackViewTrack*>(pMyTrack->GetParentNode());
-        }
-
-        if (pOtherTrack->IsSubTrack())
-        {
-            pOtherTrack = static_cast<const CTrackViewTrack*>(pOtherTrack->GetParentNode());
-        }
-
-        // Do comparison
-        if (pMyTrack->GetParameterType() != pOtherTrack->GetParameterType()
-            || pMyTrack->GetCurveType() != pOtherTrack->GetCurveType()
-            || pMyTrack->GetValueType() != pOtherTrack->GetValueType())
-        {
-            m_bAllOfSameType = false;
-        }
-    }
-
-    m_keys.push_back(keyHandle);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyBundle::AppendKeyBundle(const CTrackViewKeyBundle& bundle)
-{
-    for (auto iter = bundle.m_keys.begin(); iter != bundle.m_keys.end(); ++iter)
-    {
-        AppendKey(*iter);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewKeyBundle::SelectKeys(const bool bSelected)
-{
-    const unsigned int numKeys = GetKeyCount();
-
-    for (unsigned int i = 0; i < numKeys; ++i)
-    {
-        GetKey(i).Select(bSelected);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewKeyBundle::GetSingleSelectedKey()
-{
-    const unsigned int keyCount = GetKeyCount();
-
-    if (keyCount == 1)
-    {
-        return m_keys[0];
-    }
-    else if (keyCount > 1 && keyCount <= 4)
-    {
-        // All keys must have same time & same parent track
-        CTrackViewNode* pFirstParent = m_keys[0].GetTrack()->GetParentNode();
-        const float firstTime = m_keys[0].GetTime();
-
-        // Parent must be a track
-        if (pFirstParent->GetNodeType() != eTVNT_Track)
-        {
-            return CTrackViewKeyHandle();
-        }
-
-        // Check other keys for equality
-        for (unsigned int i = 0; i < keyCount; ++i)
-        {
-            if (m_keys[i].GetTrack()->GetParentNode() != pFirstParent || m_keys[i].GetTime() != firstTime)
-            {
-                return CTrackViewKeyHandle();
-            }
-        }
-
-        return static_cast<CTrackViewTrack*>(pFirstParent)->GetKeyByTime(firstTime);
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNode::CTrackViewNode(CTrackViewNode* pParent)
-    : m_pParentNode(pParent)
-    , m_bSelected(false)
-    , m_bHidden(false)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewNode::HasObsoleteTrack() const
-{
-    return HasObsoleteTrackRec(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewNode::HasObsoleteTrackRec(const CTrackViewNode* pCurrentNode) const
-{
-    if (pCurrentNode->GetNodeType() == eTVNT_Track)
-    {
-        const CTrackViewTrack* pTrack = static_cast<const CTrackViewTrack*>(pCurrentNode);
-
-        EAnimCurveType trackType = pTrack->GetCurveType();
-        if (trackType == eAnimCurveType_TCBFloat || trackType == eAnimCurveType_TCBQuat || trackType == eAnimCurveType_TCBVector)
-        {
-            return true;
-        }
-    }
-
-    for (unsigned int i = 0; i < pCurrentNode->GetChildCount(); ++i)
-    {
-        CTrackViewNode* pNode = pCurrentNode->GetChild(i);
-
-        if (HasObsoleteTrackRec(pNode))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNode::ClearSelection()
-{
-    CTrackViewSequenceNotificationContext context(GetSequence());
-
-    SetSelected(false);
-
-    const unsigned int numChilds = GetChildCount();
-    for (unsigned int childIndex = 0; childIndex < numChilds; ++childIndex)
-    {
-        GetChild(childIndex)->ClearSelection();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNode* CTrackViewNode::GetAboveNode() const
-{
-    CTrackViewNode* pParent = GetParentNode();
-    if (!pParent)
-    {
-        // The root does not have an above node
-        return nullptr;
-    }
-
-    CTrackViewNode* pPrevSibling = GetPrevSibling();
-    if (!pPrevSibling)
-    {
-        // First sibling -> parent is above node
-        return pParent;
-    }
-
-    // Find last node in sibling tree
-    CTrackViewNode* pCurrentNode = pPrevSibling;
-    while (pCurrentNode && pCurrentNode->GetChildCount() > 0 && pCurrentNode->GetExpanded())
-    {
-        pCurrentNode = pCurrentNode->GetChild(pCurrentNode->GetChildCount() - 1);
-    }
-
-    return pCurrentNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNode* CTrackViewNode::GetBelowNode() const
-{
-    const unsigned int childCount = GetChildCount();
-    if (childCount > 0 && GetExpanded())
-    {
-        return GetChild(0);
-    }
-
-    CTrackViewNode* pParent = GetParentNode();
-    if (!pParent)
-    {
-        // Root without children
-        return nullptr;
-    }
-
-    // If there is a next sibling return it
-    CTrackViewNode* pNextSibling = GetNextSibling();
-    if (pNextSibling)
-    {
-        return pNextSibling;
-    }
-
-    // Otherwise we need to go up the tree and check
-    // the parent nodes for next siblings
-    CTrackViewNode* pCurrentNode = pParent;
-    while (pCurrentNode)
-    {
-        CTrackViewNode* pNextParentSibling = pCurrentNode->GetNextSibling();
-        if (pNextParentSibling)
-        {
-            return pNextParentSibling;
-        }
-
-        pCurrentNode = pCurrentNode->GetParentNode();
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNode* CTrackViewNode::GetPrevSibling() const
-{
-    CTrackViewNode* pParent = GetParentNode();
-    if (!pParent)
-    {
-        // The root does not have siblings
-        return nullptr;
-    }
-
-    // Search for prev sibling
-    unsigned int siblingCount = pParent->GetChildCount();
-    assert(siblingCount > 0);
-
-    for (unsigned int i = 1; i < siblingCount; ++i)
-    {
-        CTrackViewNode* pSibling = pParent->GetChild(i);
-        if (pSibling == this)
-        {
-            return pParent->GetChild(i - 1);
-        }
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNode* CTrackViewNode::GetNextSibling() const
-{
-    CTrackViewNode* pParent = GetParentNode();
-    if (!pParent)
-    {
-        // The root does not have siblings
-        return nullptr;
-    }
-
-    // Search for next sibling
-    unsigned int siblingCount = pParent->GetChildCount();
-    assert(siblingCount > 0);
-
-    for (unsigned int i = 0; i < siblingCount - 1; ++i)
-    {
-        CTrackViewNode* pSibling = pParent->GetChild(i);
-        if (pSibling == this)
-        {
-            return pParent->GetChild(i + 1);
-        }
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNode::SetSelected(bool bSelected)
-{
-    if (bSelected != m_bSelected)
-    {
-        m_bSelected = bSelected;
-
-        if (m_bSelected)
-        {
-            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Selected);
-        }
-        else
-        {
-            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Deselected);
-        }
-
-        GetSequence()->OnNodeSelectionChanged();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewSequence* CTrackViewNode::GetSequence()
-{
-    for (CTrackViewNode* pCurrentNode = this; pCurrentNode; pCurrentNode = pCurrentNode->GetParentNode())
-    {
-        if (pCurrentNode->GetNodeType() == eTVNT_Sequence)
-        {
-            return static_cast<CTrackViewSequence*>(pCurrentNode);
-        }
-    }
-
-    // Every node belongs to a sequence
-    assert(false);
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const CTrackViewSequence* CTrackViewNode::GetSequenceConst() const
-{
-    for (const CTrackViewNode* pCurrentNode = this; pCurrentNode; pCurrentNode = pCurrentNode->GetParentNode())
-    {
-        if (pCurrentNode->GetNodeType() == eTVNT_Sequence)
-        {
-            return static_cast<const CTrackViewSequence*>(pCurrentNode);
-        }
-    }
-
-    AZ_Assert(false, "Every node belongs to a sequence");
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNode::AddNode(CTrackViewNode* pNode)
-{
-    assert (pNode->GetNodeType() != eTVNT_Sequence);
-
-    m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNode));
-    SortNodes();
-
-    pNode->m_pParentNode = this;
-    GetSequence()->OnNodeChanged(pNode, ITrackViewSequenceListener::eNodeChangeType_Added);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNode::SortNodes()
-{
-    // Sort with operator<
-    std::stable_sort(m_childNodes.begin(), m_childNodes.end(),
-        [&](const std::unique_ptr<CTrackViewNode>& a, const std::unique_ptr<CTrackViewNode>& b) -> bool
-        {
-            const CTrackViewNode* pA = a.get();
-            const CTrackViewNode* pB = b.get();
-            return *pA < *pB;
-        }
-        );
-}
-
-namespace
-{
-    static int GetNodeOrder(AnimNodeType nodeType)
-    {
-        AZ_Assert(nodeType < AnimNodeType::Num, "Expected nodeType to be less than AnimNodeType::Num");
-
-        // note: this array gets over-allocated and is sparsely populated because the eAnimNodeType enums are not sequential in IMovieSystem.h
-        // I wonder if the original authors intended this? Not a big deal, just some trivial memory wastage.
-        static int nodeOrder[static_cast<int>(AnimNodeType::Num)];
-        nodeOrder[static_cast<int>(AnimNodeType::Invalid)] = 0;
-        nodeOrder[static_cast<int>(AnimNodeType::Director)] = 1;
-        nodeOrder[static_cast<int>(AnimNodeType::Alembic)] = 4;
-        nodeOrder[static_cast<int>(AnimNodeType::CVar)] = 6;
-        nodeOrder[static_cast<int>(AnimNodeType::ScriptVar)] = 7;
-        nodeOrder[static_cast<int>(AnimNodeType::Material)] = 8;
-        nodeOrder[static_cast<int>(AnimNodeType::Event)] = 9;
-        nodeOrder[static_cast<int>(AnimNodeType::Layer)] = 10;
-        nodeOrder[static_cast<int>(AnimNodeType::Comment)] = 11;
-        nodeOrder[static_cast<int>(AnimNodeType::RadialBlur)] = 12;
-        nodeOrder[static_cast<int>(AnimNodeType::ColorCorrection)] = 13;
-        nodeOrder[static_cast<int>(AnimNodeType::DepthOfField)] = 14;
-        nodeOrder[static_cast<int>(AnimNodeType::ScreenFader)] = 15;
-        nodeOrder[static_cast<int>(AnimNodeType::Light)] = 16;
-        nodeOrder[static_cast<int>(AnimNodeType::ShadowSetup)] = 17;
-        nodeOrder[static_cast<int>(AnimNodeType::Environment)] = 18;
-        nodeOrder[static_cast<int>(AnimNodeType::Group)] = 19;
-
-        return nodeOrder[static_cast<int>(nodeType)];
-    }
-}
-
-bool CTrackViewNode::operator<(const CTrackViewNode& otherNode) const
-{
-    // Order nodes before tracks
-    if (GetNodeType() < otherNode.GetNodeType())
-    {
-        return true;
-    }
-    else if (GetNodeType() > otherNode.GetNodeType())
-    {
-        return false;
-    }
-
-    // Same node type
-    switch (GetNodeType())
-    {
-    case eTVNT_AnimNode:
-    {
-        const CTrackViewAnimNode& thisAnimNode = static_cast<const CTrackViewAnimNode&>(*this);
-        const CTrackViewAnimNode& otherAnimNode = static_cast<const CTrackViewAnimNode&>(otherNode);
-
-        const int thisTypeOrder = GetNodeOrder(thisAnimNode.GetType());
-        const int otherTypeOrder = GetNodeOrder(otherAnimNode.GetType());
-
-        if (thisTypeOrder == otherTypeOrder)
-        {
-            // Same node type, sort by name
-            return azstricmp(thisAnimNode.GetName(), otherAnimNode.GetName()) < 0;
-        }
-
-        return thisTypeOrder < otherTypeOrder;
-    }
-    case eTVNT_Track:
-        const CTrackViewTrack& thisTrack = static_cast<const CTrackViewTrack&>(*this);
-        const CTrackViewTrack& otherTrack = static_cast<const CTrackViewTrack&>(otherNode);
-
-        if (thisTrack.GetParameterType() == otherTrack.GetParameterType())
-        {
-            // Same parameter type, sort by name
-            return azstricmp(thisTrack.GetName(), otherTrack.GetName()) < 0;
-        }
-
-        return thisTrack.GetParameterType() < otherTrack.GetParameterType();
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNode::SetHidden(bool bHidden)
-{
-    bool bWasHidden = m_bHidden;
-    m_bHidden = bHidden;
-
-    if (bHidden && !bWasHidden)
-    {
-        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Hidden);
-    }
-    else if (!bHidden && bWasHidden)
-    {
-        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Unhidden);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewNode::IsHidden() const
-{
-    return m_bHidden;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNode* CTrackViewNode::GetFirstSelectedNode()
-{
-    if (IsSelected())
-    {
-        return this;
-    }
-
-    const unsigned int numChilds = GetChildCount();
-    for (unsigned int childIndex = 0; childIndex < numChilds; ++childIndex)
-    {
-        CTrackViewNode* pSelectedNode = GetChild(childIndex)->GetFirstSelectedNode();
-        if (pSelectedNode)
-        {
-            return pSelectedNode;
-        }
-    }
-
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode* CTrackViewNode::GetDirector()
-{
-    for (CTrackViewNode* pCurrentNode = GetParentNode(); pCurrentNode; pCurrentNode = pCurrentNode->GetParentNode())
-    {
-        if (pCurrentNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pParentAnimNode = static_cast<CTrackViewAnimNode*>(pCurrentNode);
-
-            if (pParentAnimNode->GetType() == AnimNodeType::Director)
-            {
-                return pParentAnimNode;
-            }
-        }
-        else if (pCurrentNode->GetNodeType() == eTVNT_Sequence)
-        {
-            return static_cast<CTrackViewAnimNode*>(pCurrentNode);
-        }
-    }
-
-    return nullptr;
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNode.h b/Code/Sandbox/Editor/TrackView/TrackViewNode.h
deleted file mode 100644
index 273e04de4b..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewNode.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODE_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODE_H
-#pragma once
-
-
-class CTrackViewTrack;
-class CTrackViewSequence;
-struct IKey;
-class CTrackViewAnimNode;
-
-
-class CTrackViewKeyConstHandle
-{
-public:
-    CTrackViewKeyConstHandle()
-        : m_bIsValid(false)
-        , m_keyIndex(0)
-        , m_pTrack(nullptr) {}
-
-    CTrackViewKeyConstHandle(const CTrackViewTrack* pTrack, unsigned int keyIndex)
-        : m_bIsValid(true)
-        , m_keyIndex(keyIndex)
-        , m_pTrack(pTrack) {}
-
-    void GetKey(IKey* pKey) const;
-    float GetTime() const;
-    const CTrackViewTrack* GetTrack() const { return m_pTrack; }
-
-private:
-    bool m_bIsValid;
-    unsigned int m_keyIndex;
-    const CTrackViewTrack* m_pTrack;
-};
-
-// Represents one CryMovie key
-class CTrackViewKeyHandle
-{
-public:
-    CTrackViewKeyHandle()
-        : m_bIsValid(false)
-        , m_keyIndex(0)
-        , m_pTrack(nullptr) {}
-
-    CTrackViewKeyHandle(CTrackViewTrack* pTrack, unsigned int keyIndex)
-        : m_bIsValid(true)
-        , m_keyIndex(keyIndex)
-        , m_pTrack(pTrack) {}
-
-    void SetKey(IKey* pKey);
-    void GetKey(IKey* pKey) const;
-
-    CTrackViewTrack* GetTrack() { return m_pTrack; }
-    const CTrackViewTrack* GetTrack() const { return m_pTrack; }
-
-    bool IsValid() const { return m_bIsValid; }
-    unsigned int GetIndex() const { return m_keyIndex; }
-
-    void Select(bool bSelect);
-    bool IsSelected() const;
-
-    void SetTime(float time, bool notifyListeners = true);
-    float GetTime() const;
-
-    float GetDuration() const;
-
-    const char* GetDescription() const;
-
-    void Offset(float offset, bool notifyListeners);
-
-    bool operator==(const CTrackViewKeyHandle& keyHandle) const;
-    bool operator!=(const CTrackViewKeyHandle& keyHandle) const;
-
-    // Deletes key. Note that handle will be invalid afterwards
-    void Delete();
-
-    CTrackViewKeyHandle Clone();
-
-    // Get next/prev/above/below key in expanded node tree
-    // Note: Key is assumed to be already visible
-    CTrackViewKeyHandle GetNextKey();
-    CTrackViewKeyHandle GetPrevKey();
-    CTrackViewKeyHandle GetAboveKey() const;
-    CTrackViewKeyHandle GetBelowKey() const;
-
-private:
-    bool m_bIsValid;
-    unsigned int m_keyIndex;
-    CTrackViewTrack* m_pTrack;
-};
-
-// Abstract base class that defines common
-// operations for key bundles and tracks
-class ITrackViewKeyBundle
-{
-public:
-    virtual bool AreAllKeysOfSameType() const = 0;
-
-    virtual unsigned int GetKeyCount() const = 0;
-    virtual CTrackViewKeyHandle GetKey(unsigned int index) = 0;
-
-    virtual void SelectKeys(const bool bSelected) = 0;
-};
-
-// Represents a bundle of keys
-class CTrackViewKeyBundle
-    : public ITrackViewKeyBundle
-{
-    friend class CTrackViewTrack;
-    friend class CTrackViewAnimNode;
-
-public:
-    CTrackViewKeyBundle()
-        : m_bAllOfSameType(true) {}
-
-    virtual bool AreAllKeysOfSameType() const override { return m_bAllOfSameType; }
-
-    virtual unsigned int GetKeyCount() const override { return m_keys.size(); }
-    virtual CTrackViewKeyHandle GetKey(unsigned int index) override { return m_keys[index]; }
-
-    virtual void SelectKeys(const bool bSelected) override;
-
-    CTrackViewKeyHandle GetSingleSelectedKey();
-
-private:
-    void AppendKey(const CTrackViewKeyHandle& keyHandle);
-    void AppendKeyBundle(const CTrackViewKeyBundle& bundle);
-
-    bool m_bAllOfSameType;
-    std::vector<CTrackViewKeyHandle> m_keys;
-};
-
-// Types of nodes that derive from CTrackViewNode
-enum ETrackViewNodeType
-{
-    eTVNT_Sequence,
-    eTVNT_AnimNode,
-    eTVNT_Track
-};
-
-////////////////////////////////////////////////////////////////////////////
-//
-// This is the base class for all sequences, nodes and tracks in TrackView,
-// which provides a interface for common operations
-//
-////////////////////////////////////////////////////////////////////////////
-class CTrackViewNode
-{
-public:
-    CTrackViewNode(CTrackViewNode* pParent);
-    virtual ~CTrackViewNode() {}
-
-    // Name
-    virtual const char* GetName() const = 0;
-    virtual bool SetName([[maybe_unused]] const char* pName) { return false; };
-    virtual bool CanBeRenamed() const { return false; }
-
-    // CryMovie node type
-    virtual ETrackViewNodeType GetNodeType() const = 0;
-
-    // Get the sequence of this node
-    CTrackViewSequence* GetSequence();
-    const CTrackViewSequence* GetSequenceConst() const;
-
-    // Get parent
-    CTrackViewNode* GetParentNode() const { return m_pParentNode; }
-
-    // Children
-    unsigned int GetChildCount() const { return m_childNodes.size(); }
-    CTrackViewNode* GetChild(unsigned int index) const { return m_childNodes[index].get(); }
-
-    // Snap time value to prev/next key in sequence
-    virtual bool SnapTimeToPrevKey(float& time) const = 0;
-    virtual bool SnapTimeToNextKey(float& time) const = 0;
-
-    // Selection state
-    virtual void SetSelected(bool bSelected);
-    virtual bool IsSelected() const { return m_bSelected; }
-
-    // Clear selection of this node and all sub nodes
-    void ClearSelection();
-
-    // Expanded state interface
-    virtual void SetExpanded(bool expanded) = 0;
-    virtual bool GetExpanded() const = 0;
-
-    // Disabled state
-    virtual bool CanBeEnabled() const { return true; }
-    virtual void SetDisabled([[maybe_unused]] bool bDisabled) {}
-    virtual bool IsDisabled() const { return false; }
-
-    // Hidden state
-    void SetHidden(bool bHidden);
-    bool IsHidden() const;
-
-    // Key getters
-    virtual CTrackViewKeyBundle GetSelectedKeys() = 0;
-    virtual CTrackViewKeyBundle GetAllKeys() = 0;
-    virtual CTrackViewKeyBundle GetKeysInTimeRange(const float t0, const float t1) = 0;
-
-    // Check if node itself is obsolete, or any child is an obsolete track
-    bool HasObsoleteTrack() const;
-
-    // Get above/below nodes in pCurrentNode node tree
-    CTrackViewNode* GetAboveNode() const;
-    CTrackViewNode* GetBelowNode() const;
-
-    // Get previous or next sibling of this node
-    CTrackViewNode* GetPrevSibling() const;
-    CTrackViewNode* GetNextSibling() const;
-
-    // Check if it's a group node
-    virtual bool IsGroupNode() const { return false; }
-
-    // Copy selected keys to XML representation for clipboard
-    virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) = 0;
-
-    // Sorting
-    bool operator<(const CTrackViewNode& pOtherNode) const;
-
-    // Get first selected node in tree
-    CTrackViewNode* GetFirstSelectedNode();
-
-    // Get director of this node
-    CTrackViewAnimNode* GetDirector();
-
-protected:
-    void AddNode(CTrackViewNode* pNode);
-    void SortNodes();
-
-    bool HasObsoleteTrackRec(const CTrackViewNode* pCurrentNode) const;
-
-    CTrackViewNode* m_pParentNode;
-    std::vector<std::unique_ptr<CTrackViewNode> > m_childNodes;
-
-    bool m_bSelected;
-    bool m_bHidden;
-};
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODE_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.cpp b/Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.cpp
deleted file mode 100644
index b7439385a2..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewNodeFactories.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "TrackViewEventNode.h"
-
-
-CTrackViewAnimNode* CTrackViewAnimNodeFactory::BuildAnimNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode)
-{
-    CTrackViewAnimNode* retNode = nullptr;
-
-    if (pAnimNode->GetType() == AnimNodeType::Event)
-    {
-        retNode = new CTrackViewEventNode(pSequence, pAnimNode, pParentNode);
-    }
-    else
-    {
-        retNode = new CTrackViewAnimNode(pSequence, pAnimNode, pParentNode);
-    }
-
-    return retNode;
-}
-
-CTrackViewTrack* CTrackViewTrackFactory::BuildTrack(IAnimTrack* pTrack, CTrackViewAnimNode* pTrackAnimNode,
-    CTrackViewNode* pParentNode, bool bIsSubTrack, unsigned int subTrackIndex)
-{
-    return new CTrackViewTrack(pTrack, pTrackAnimNode, pParentNode, bIsSubTrack, subTrackIndex);
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.h b/Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.h
deleted file mode 100644
index 5bfbabfe17..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODEFACTORIES_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODEFACTORIES_H
-#pragma once
-
-
-class CTrackViewTrack;
-class CTrackViewAnimNode;
-class CTrackViewNode;
-
-class CTrackViewAnimNodeFactory
-{
-public:
-    CTrackViewAnimNode* BuildAnimNode(IAnimSequence* pSequence, IAnimNode* pAnimNode, CTrackViewNode* pParentNode);
-};
-
-class CTrackViewTrackFactory
-{
-public:
-    CTrackViewTrack* BuildTrack(IAnimTrack* pTrack, CTrackViewAnimNode* pTrackAnimNode,
-        CTrackViewNode* pParentNode, bool bIsSubTrack = false, unsigned int subTrackIndex = 0);
-};
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODEFACTORIES_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp b/Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp
deleted file mode 100644
index 94f5eb2053..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp
+++ /dev/null
@@ -1,2981 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : TrackView's tree control.
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewNodes.h"
-
-// Qt
-#include <QAction>
-#include <QMenu>
-#include <QMimeData>
-#include <QCompleter>
-#include <QScrollBar>
-#include <QMessageBox>
-#include <QStyledItemDelegate>
-#include <QDropEvent>
-#include <QFileDialog>
-
-// AzToolsFramework
-#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/ColorPicker.h>
-
-// CryCommon
-#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
-#include <CryCommon/Maestro/Types/AnimValueType.h>
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-#include <CryCommon/Maestro/Types/SequenceType.h>
-
-// Editor
-#include "StringDlg.h"
-#include "TrackView/TVEventsDialog.h"
-#include "TrackView/TrackViewDialog.h"
-#include "Objects/SelectionGroup.h"
-#include "Objects/ObjectManager.h"
-#include "Util/AutoDirectoryRestoreFileDialog.h"
-#include "TrackViewFBXImportPreviewDialog.h"
-#include "AnimationContext.h"
-
-
-CTrackViewNodesCtrl::CRecord::CRecord(CTrackViewNode* pNode /*= nullptr*/)
-    : m_pNode(pNode)
-    , m_bVisible(false)
-{
-    if (pNode)
-    {
-        QVariant v;
-        v.setValue<CTrackViewNodePtr>(pNode);
-        setData(0, Qt::UserRole, v);
-    }
-}
-
-class CTrackViewNodesCtrlDelegate
-    : public QStyledItemDelegate
-{
-public:
-    CTrackViewNodesCtrlDelegate(QObject* parent = nullptr)
-        : QStyledItemDelegate(parent)
-    {}
-
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
-    {
-        bool enabled = index.data(CTrackViewNodesCtrl::CRecord::EnableRole).toBool();
-        QStyleOptionViewItem opt = option;
-        if (!enabled)
-        {
-            opt.state &= ~QStyle::State_Enabled;
-        }
-        QStyledItemDelegate::paint(painter, opt, index);
-    }
-};
-
-
-class CTrackViewNodesTreeWidget
-    : public QTreeWidget
-{
-public:
-    CTrackViewNodesTreeWidget(QWidget* parent)
-        : QTreeWidget(parent)
-        , m_controller(nullptr)
-    {
-        setItemDelegate(new CTrackViewNodesCtrlDelegate(this));
-    }
-
-    void setController(CTrackViewNodesCtrl* p)
-    {
-        m_controller = p;
-    }
-
-protected:
-
-    // Allow both CopyActions and MoveActions to be valid drag and drop operations.
-    Qt::DropActions supportedDropActions() const override
-    {
-        return Qt::CopyAction | Qt::MoveAction;
-    }
-
-    void dragMoveEvent(QDragMoveEvent* event)
-    {
-        CTrackViewNodesCtrl::CRecord* record = (CTrackViewNodesCtrl::CRecord*) itemAt(event->pos());
-        if (!record)
-        {
-            return;
-        }
-        CTrackViewNode* pTargetNode = record->GetNode();
-
-        QTreeWidget::dragMoveEvent(event);
-        if (!event->isAccepted())
-        {
-            return;
-        }
-
-        if (pTargetNode && pTargetNode->IsGroupNode() /*&& !m_draggedNodes.DoesContain(pTargetNode)*/)
-        {
-            CTrackViewAnimNode* pDragTarget = static_cast<CTrackViewAnimNode*>(pTargetNode);
-            bool bAllValidReparenting = true;
-            QList<CTrackViewAnimNode*> nodes = draggedNodes(event);
-            Q_FOREACH(CTrackViewAnimNode * pDraggedNode, nodes)
-            {
-                if (!pDraggedNode->IsValidReparentingTo(pDragTarget))
-                {
-                    bAllValidReparenting = false;
-                    break;
-                }
-            }
-
-            if (!(bAllValidReparenting && !nodes.isEmpty()))
-            {
-                event->ignore();
-            }
-
-            return;
-        }
-    }
-
-    void dropEvent(QDropEvent* event)
-    {
-        CTrackViewNodesCtrl::CRecord* record = (CTrackViewNodesCtrl::CRecord*) itemAt(event->pos());
-        if (!record)
-        {
-            return;
-        }
-        CTrackViewNode* targetNode = record->GetNode();
-
-        if (targetNode && targetNode->IsGroupNode())
-        {
-            CTrackViewAnimNode* dragTarget = static_cast<CTrackViewAnimNode*>(targetNode);
-            bool allValidReparenting = true;
-            QList<CTrackViewAnimNode*> nodes = draggedNodes(event);
-            Q_FOREACH(CTrackViewAnimNode * draggedNode, nodes)
-            {
-                if (!draggedNode->IsValidReparentingTo(dragTarget))
-                {
-                    allValidReparenting = false;
-                    break;
-                }
-            }
-
-            if (allValidReparenting && !nodes.isEmpty())
-            {
-                // By default here the drop action is a CopyAction. That is what we want in case
-                // some other random control accepts this drop (and then does nothing with the data). 
-                // If that happens we will not receive any notifications. If the Action default was MoveAction,
-                // the dragged items in the tree would be deleted out from under us causing a crash.
-                // Since we are here, we know this drop is on the same control so we can
-                // switch it to a MoveAction right now. The node parents will be fixed up below.
-                event->setDropAction(Qt::MoveAction);
-
-                QTreeWidget::dropEvent(event);
-                if (!event->isAccepted())
-                {
-                    return;
-                }
-
-                if (nodes.size() > 0)
-                {
-                    // All nodes are from the same sequence
-                    CTrackViewSequence* sequence = nodes[0]->GetSequence();
-                    AZ_Assert(nullptr != sequence, "GetSequence() should never be null");
-
-                    AzToolsFramework::ScopedUndoBatch undoBatch("Drag and Drop Track View Nodes");
-                    Q_FOREACH(CTrackViewAnimNode * draggedNode, nodes)
-                    {
-                        draggedNode->SetNewParent(dragTarget);
-                        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-                    }
-                }
-            }
-        }
-    }
-
-    void keyPressEvent(QKeyEvent* event)
-    {
-        // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
-        switch (event->key())
-        {
-        case Qt::Key_Tab:
-            if (m_controller)
-            {
-                m_controller->ShowNextResult();
-                event->accept();
-            }
-            return;
-        default:
-            break;
-        }
-        QTreeWidget::keyPressEvent(event);
-    }
-
-    bool event(QEvent* e) override
-    {
-        if (e->type() == QEvent::ShortcutOverride)
-        {
-            // since we respond to the following things, let Qt know so that shortcuts don't override us
-            bool respondsToEvent = false;
-
-            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
-            if (keyEvent->key() == Qt::Key_Tab)
-            {
-                respondsToEvent = true;
-            }
-
-            if (respondsToEvent)
-            {
-                e->accept();
-                return true;
-            }
-        }
-
-        return QTreeWidget::event(e);
-    }
-
-
-    bool focusNextPrevChild([[maybe_unused]] bool next)
-    {
-        return false;   // so we get the tab key
-    }
-
-private:
-    QList<CTrackViewAnimNode*> draggedNodes(QDropEvent* event)
-    {
-        QByteArray encoded = event->mimeData()->data("application/x-qabstractitemmodeldatalist");
-        QDataStream stream(&encoded, QIODevice::ReadOnly);
-
-        QList<CTrackViewAnimNode*> nodes;
-        while (!stream.atEnd())
-        {
-            int row, col;
-            QMap<int, QVariant> roleDataMap;
-            stream >> row >> col >> roleDataMap;
-
-            QVariant v = roleDataMap[Qt::UserRole];
-            if (v.isValid())
-            {
-                CTrackViewNode* pNode = v.value<CTrackViewNodePtr>();
-                if (pNode && pNode->GetNodeType() == eTVNT_AnimNode)
-                {
-                    nodes << (CTrackViewAnimNode*)pNode;
-                }
-            }
-        }
-        return nodes;
-    }
-
-    CTrackViewNodesCtrl*    m_controller;
-};
-
-QDataStream& operator<<(QDataStream& out, const CTrackViewNodePtr& obj)
-{
-    out.writeRawData((const char*) &obj, sizeof(obj));
-    return out;
-}
-
-QDataStream& operator>>(QDataStream& in, CTrackViewNodePtr& obj)
-{
-    in.readRawData((char*) &obj, sizeof(obj));
-    return in;
-}
-
-
-
-enum EMenuItem
-{
-    eMI_SelectInViewport = 603,
-    eMI_CopyNodes = 605,
-    eMI_CopySelectedNodes = 602,
-    eMI_PasteNodes = 604,
-    eMI_RemoveSelected = 10,
-    eMI_CopyKeys = 599,
-    eMI_CopySelectedKeys = 600,
-    eMI_PasteKeys = 601,
-    eMI_AddTrackBase = 1000,
-    eMI_RemoveTrack = 299,
-    eMI_ExpandAll = 650,
-    eMI_CollapseAll = 659,
-    eMI_ExpandFolders = 660,
-    eMI_CollapseFolders = 661,
-    eMI_ExpandEntities = 651,
-    eMI_CollapseEntities = 652,
-    eMI_ExpandCameras = 653,
-    eMI_CollapseCameras = 654,
-    eMI_ExpandMaterials = 655,
-    eMI_CollapseMaterials = 656,
-    eMI_ExpandEvents = 657,
-    eMI_CollapseEvents = 658,
-    eMI_Rename = 11,
-    eMI_CreateFolder = 610,
-    eMI_AddSelectedEntities = 500,
-    eMI_AddDirectorNode = 501,
-    eMI_AddConsoleVariable = 502,
-    eMI_AddScriptVariable = 503,
-    eMI_AddMaterial = 504,
-    eMI_AddEvent = 505,
-    eMI_AddCurrentLayer = 506,
-    eMI_AddCommentNode = 507,
-    eMI_AddRadialBlur = 508,
-    eMI_AddColorCorrection = 509,
-    eMI_AddDOF = 510,
-    eMI_AddScreenfader = 511,
-    eMI_AddShadowSetup = 513,
-    eMI_AddEnvironment = 514,
-    eMI_EditEvents = 550,
-    eMI_SaveToFBX = 12,
-    eMI_ImportFromFBX = 14,
-    eMI_SetAsViewCamera = 13,
-    eMI_SetAsActiveDirector = 15,
-    eMI_Disable = 17,
-    eMI_Mute = 18,
-    eMI_CustomizeTrackColor = 19,
-    eMI_ClearCustomTrackColor = 20,
-    eMI_ShowHideBase = 100,
-    eMI_SelectSubmaterialBase = 2000,
-    eMI_SetAnimationLayerBase = 3000,
-};
-
-// The 'MI' represents a Menu Item.
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <TrackView/ui_TrackViewNodes.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNodesCtrl::CTrackViewNodesCtrl(QWidget* hParentWnd, CTrackViewDialog* parent /* = 0 */)
-    : QWidget(hParentWnd)
-    , m_bIgnoreNotifications(false)
-    , m_bNeedReload(false)
-    , m_bSelectionChanging(false)
-    , ui(new Ui::CTrackViewNodesCtrl)
-    , m_pTrackViewDialog(parent)
-{
-    ui->setupUi(this);
-    m_pDopeSheet = 0;
-    m_currentMatchIndex = 0;
-    m_matchCount = 0;
-
-    qRegisterMetaType<CTrackViewNodePtr>("CTrackViewNodePtr");
-    qRegisterMetaTypeStreamOperators<CTrackViewNodePtr>("CTrackViewNodePtr");
-
-    ui->treeWidget->hide();
-    ui->searchField->hide();
-    ui->searchCount->hide();
-    ui->searchField->installEventFilter(this);
-
-    ui->treeWidget->setController(this);
-    ui->treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(ui->treeWidget, &QTreeWidget::customContextMenuRequested, this, &CTrackViewNodesCtrl::OnNMRclick);
-    connect(ui->treeWidget, &QTreeWidget::itemExpanded, this, &CTrackViewNodesCtrl::OnItemExpanded);
-    connect(ui->treeWidget, &QTreeWidget::itemCollapsed, this, &CTrackViewNodesCtrl::OnItemExpanded);
-    connect(ui->treeWidget, &QTreeWidget::itemSelectionChanged, this, &CTrackViewNodesCtrl::OnSelectionChanged);
-    connect(ui->treeWidget, &QTreeWidget::itemDoubleClicked, this, &CTrackViewNodesCtrl::OnItemDblClick);
-
-    connect(ui->searchField, &QLineEdit::textChanged, this, &CTrackViewNodesCtrl::OnFilterChange);
-
-    // legacy node icons are enumerated and stored as png files on disk
-    for (int i = 0; i <= 29; i++)
-    {
-        QIcon icon(QString(":/nodes/tvnodes-%1.png").arg(i, 2, 10, QLatin1Char('0')));
-        if (!icon.isNull())
-        {
-            m_imageList[i] = icon;
-        }
-    }
-
-    m_bEditLock = false;
-
-    m_arrowCursor = Qt::ArrowCursor;
-    m_noIcon = Qt::ForbiddenCursor;
-
-    ///////////////////////////////////////////////////////////////
-    // Populate m_componentTypeToIconMap with all component icons
-    AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(serializeContext, "Failed to acquire serialize context.");
-
-    serializeContext->EnumerateDerived<AZ::Component>([this](const AZ::SerializeContext::ClassData* classData, const AZ::Uuid&) -> bool
-    {
-        AZStd::string iconPath;
-        EBUS_EVENT_RESULT(iconPath, AzToolsFramework::EditorRequests::Bus, GetComponentEditorIcon, classData->m_typeId, nullptr);
-        if (!iconPath.empty())
-        {
-            m_componentTypeToIconMap[classData->m_typeId] = QIcon(iconPath.c_str());
-        }
-
-        return true; // continue enumerating
-    });
-    ///////////////////////////////////////////////////////////////
-
-
-    GetIEditor()->GetUndoManager()->AddListener(this);
-};
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNodesCtrl::~CTrackViewNodesCtrl()
-{
-    GetIEditor()->GetUndoManager()->RemoveListener(this);
-}
-
-bool CTrackViewNodesCtrl::eventFilter(QObject* o, QEvent* e)
-{
-    if (o == ui->searchField && e->type() == QEvent::KeyPress)
-    {
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
-        if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier)
-        {
-            ShowNextResult();
-            return true;
-        }
-    }
-    return QWidget::eventFilter(o, e);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnSequenceChanged()
-{
-    assert(m_pTrackViewDialog);
-
-    m_nodeToRecordMap.clear();
-    ui->treeWidget->clear();
-
-    FillAutoCompletionListForFilter();
-
-    Reload();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::SetDopeSheet(CTrackViewDopeSheetBase* pDopeSheet)
-{
-    m_pDopeSheet = pDopeSheet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewNodesCtrl::GetIconIndexForTrack(const CTrackViewTrack* pTrack) const
-{
-    int nImage = 13; // Default
-
-    if (!pTrack)
-    {
-        return nImage;
-    }
-
-    CAnimParamType paramType = pTrack->GetParameterType();
-    AnimValueType valueType = pTrack->GetValueType();
-    AnimNodeType nodeType = pTrack->GetAnimNode()->GetType();
-
-    // If it's a track which belongs to the post-fx node,
-    // just use a default icon.
-    if (nodeType == AnimNodeType::RadialBlur
-        || nodeType == AnimNodeType::ColorCorrection
-        || nodeType == AnimNodeType::DepthOfField
-        || nodeType == AnimNodeType::ShadowSetup)
-    {
-        return nImage;
-    }
-
-    AnimParamType type = paramType.GetType();
-
-    if (type == AnimParamType::FOV)
-    {
-        nImage = 2;
-    }
-    else if (type == AnimParamType::Position)
-    {
-        nImage = 3;
-    }
-    else if (type == AnimParamType::Rotation)
-    {
-        nImage = 4;
-    }
-    else if (type == AnimParamType::Scale)
-    {
-        nImage = 5;
-    }
-    else if (type == AnimParamType::Event || type == AnimParamType::TrackEvent)
-    {
-        nImage = 6;
-    }
-    else if (type == AnimParamType::Visibility)
-    {
-        nImage = 7;
-    }
-    else if (type == AnimParamType::Camera)
-    {
-        nImage = 8;
-    }
-    else if (type == AnimParamType::Sound)
-    {
-        nImage = 9;
-    }
-    else if (type == AnimParamType::Animation || type == AnimParamType::TimeRanges || valueType == AnimValueType::CharacterAnim || valueType == AnimValueType::AssetBlend)
-    {
-        nImage = 10;
-    }
-    else if (type == AnimParamType::Sequence)
-    {
-        nImage = 11;
-    }
-    else if (type == AnimParamType::Float)
-    {
-        nImage = 13;
-    }
-    else if (type == AnimParamType::Capture)
-    {
-        nImage = 25;
-    }
-    else if (type == AnimParamType::Console)
-    {
-        nImage = 15;
-    }
-    else if (type == AnimParamType::LookAt)
-    {
-        nImage = 17;
-    }
-    else if (type == AnimParamType::TimeWarp)
-    {
-        nImage = 22;
-    }
-    else if (type == AnimParamType::CommentText)
-    {
-        nImage = 23;
-    }
-    else if (type == AnimParamType::ShakeMultiplier || type == AnimParamType::TransformNoise)
-    {
-        nImage = 28;
-    }
-
-    return nImage;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewNodesCtrl::GetIconIndexForNode(AnimNodeType type) const
-{
-    int nImage = 0;
-    if (type == AnimNodeType::AzEntity)
-    {
-        nImage = 29;
-    }
-    else if (type == AnimNodeType::Director)
-    {
-        nImage = 27;
-    }
-    else if (type == AnimNodeType::CVar)
-    {
-        nImage = 15;
-    }
-    else if (type == AnimNodeType::ScriptVar)
-    {
-        nImage = 14;
-    }
-    else if (type == AnimNodeType::Material)
-    {
-        nImage = 16;
-    }
-    else if (type == AnimNodeType::Event)
-    {
-        nImage = 6;
-    }
-    else if (type == AnimNodeType::Group)
-    {
-        nImage = 1;
-    }
-    else if (type == AnimNodeType::Layer)
-    {
-        nImage = 20;
-    }
-    else if (type == AnimNodeType::Comment)
-    {
-        nImage = 23;
-    }
-    else if (type == AnimNodeType::Light)
-    {
-        nImage = 18;
-    }
-    else if (type == AnimNodeType::ShadowSetup)
-    {
-        nImage = 24;
-    }
-
-    return nImage;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::AddAnimNodeRecord(CRecord* pParentRecord, CTrackViewAnimNode* animNode)
-{
-    CRecord* pNewRecord = new CRecord(animNode);
-
-    pNewRecord->setText(0, animNode->GetName());
-    UpdateAnimNodeRecord(pNewRecord, animNode);
-    pParentRecord->insertChild(GetInsertPosition(pParentRecord, animNode), pNewRecord);
-    FillNodesRec(pNewRecord, animNode);
-
-    return pNewRecord;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::AddTrackRecord(CRecord* pParentRecord, CTrackViewTrack* pTrack)
-{
-    CRecord* pNewTrackRecord = new CRecord(pTrack);
-    pNewTrackRecord->setSizeHint(0, QSize(30, 18));
-    pNewTrackRecord->setText(0, pTrack->GetName());
-    UpdateTrackRecord(pNewTrackRecord, pTrack);
-    pParentRecord->insertChild(GetInsertPosition(pParentRecord, pTrack), pNewTrackRecord);
-    FillNodesRec(pNewTrackRecord, pTrack);
-
-    return pNewTrackRecord;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewNodesCtrl::GetInsertPosition(CRecord* pParentRecord, CTrackViewNode* pNode)
-{
-    // Search for insert position
-    const int siblingCount = pParentRecord->childCount();
-    for (int i = 0; i < siblingCount; ++i)
-    {
-        CRecord* record = static_cast<CRecord*>(pParentRecord->child(i));
-        CTrackViewNode* pSiblingNode = record->GetNode();
-
-        if (*pNode < *pSiblingNode)
-        {
-            return i;
-        }
-    }
-
-    return siblingCount;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::AddNodeRecord(CRecord* record, CTrackViewNode* pNode)
-{
-    assert(m_nodeToRecordMap.find(pNode) == m_nodeToRecordMap.end());
-    if (m_nodeToRecordMap.find(pNode) != m_nodeToRecordMap.end())
-    {
-        // For safety. Shouldn't happen
-        return;
-    }
-
-    CRecord* pNewRecord = nullptr;
-
-    if (pNode->IsHidden())
-    {
-        return;
-    }
-
-    switch (pNode->GetNodeType())
-    {
-    case eTVNT_AnimNode:
-        pNewRecord = AddAnimNodeRecord(record, static_cast<CTrackViewAnimNode*>(pNode));
-        break;
-    case eTVNT_Track:
-        pNewRecord = AddTrackRecord(record, static_cast<CTrackViewTrack*>(pNode));
-        break;
-    }
-
-    if (pNewRecord)
-    {
-        if (!pNode->IsGroupNode() && pNode->GetChildCount() == 0)       // groups and compound tracks are draggable
-        {
-            pNewRecord->setFlags(pNewRecord->flags() & ~Qt::ItemIsDragEnabled);
-        }
-        if (!pNode->IsGroupNode())                                      // only groups can be dropped into
-        {
-            pNewRecord->setFlags(pNewRecord->flags() & ~Qt::ItemIsDropEnabled);
-        }
-        if (pNode->GetExpanded())
-        {
-            pNewRecord->setExpanded(true);
-        }
-
-        if (pNode->IsSelected())
-        {
-            m_bIgnoreNotifications = true;
-            SelectRow(pNode, false, false);
-            m_bIgnoreNotifications = false;
-        }
-
-        m_nodeToRecordMap[pNode] = pNewRecord;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::FillNodesRec(CRecord* record, CTrackViewNode* pCurrentNode)
-{
-    const unsigned int childCount = pCurrentNode->GetChildCount();
-
-    for (unsigned int childIndex = 0; childIndex < childCount; ++childIndex)
-    {
-        CTrackViewNode* pNode = pCurrentNode->GetChild(childIndex);
-
-        if (!pNode->IsHidden())
-        {
-            AddNodeRecord(record, pNode);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::UpdateNodeRecord(CRecord* record)
-{
-    CTrackViewNode* pNode = record->GetNode();
-
-    if (pNode)
-    {
-        switch (pNode->GetNodeType())
-        {
-        case eTVNT_AnimNode:
-            UpdateAnimNodeRecord(record, static_cast<CTrackViewAnimNode*>(pNode));
-            break;
-        case eTVNT_Track:
-            UpdateTrackRecord(record, static_cast<CTrackViewTrack*>(pNode));
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::UpdateTrackRecord(CRecord* record, CTrackViewTrack* pTrack)
-{
-    int nImage = GetIconIndexForTrack(pTrack);
-    assert(m_imageList.contains(nImage));
-    record->setIcon(0, m_imageList[nImage]);
-
-    // Check if parameter is valid for non sub tracks
-    CTrackViewAnimNode* animNode = pTrack->GetAnimNode();
-    const bool isParamValid = pTrack->IsSubTrack() || animNode->IsParamValid(pTrack->GetParameterType());
-
-    // Check if disabled or muted
-    const bool bDisabledOrMuted = pTrack->IsDisabled() || pTrack->IsMuted();
-
-    // If track is not valid and disabled/muted color node in grey
-    record->setData(0, CRecord::EnableRole, !bDisabledOrMuted && isParamValid);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::UpdateAnimNodeRecord(CRecord* record, CTrackViewAnimNode* animNode)
-{
-    const QColor TextColorForMissingEntity(226, 52, 43);        // LY palette for 'Error/Failure'
-    const QColor TextColorForInvalidMaterial(226, 52, 43);      // LY palette for 'Error/Failure'
-    const QColor BackColorForActiveDirector(243, 81, 29);       // LY palette for 'Primary'
-    const QColor BackColorForInactiveDirector(22, 23, 27);      // LY palette for 'Background (In Focus)'
-    const QColor BackColorForGroupNodes(42, 84, 244);           // LY palette for 'Secondary'
-
-    QFont f = font();
-    f.setBold(true);
-    record->setFont(0, f);
-
-    AnimNodeType nodeType = animNode->GetType();
-    if (nodeType == AnimNodeType::Component)
-    {
-        // get the component icon from cached component icons
-        
-        AZ::Entity* azEntity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(azEntity, &AZ::ComponentApplicationBus::Events::FindEntity, 
-                                                        static_cast<CTrackViewAnimNode*>(animNode->GetParentNode())->GetAzEntityId());
-        if (azEntity)
-        {
-            const AZ::Component* component = azEntity->FindComponent(animNode->GetComponentId());
-            if (component)
-            {
-                auto findIter = m_componentTypeToIconMap.find(AzToolsFramework::GetUnderlyingComponentType(*component));
-                if (findIter != m_componentTypeToIconMap.end())
-                {
-                    record->setIcon(0, findIter->second);
-                }
-            }           
-        }     
-    }
-    else
-    {
-        // legacy node icons
-        int nNodeImage = GetIconIndexForNode(nodeType);
-        assert(m_imageList.contains(nNodeImage));
-
-        record->setIcon(0, m_imageList[nNodeImage]);
-    }
-    
-
-    const bool disabled = animNode->IsDisabled();
-    record->setData(0, CRecord::EnableRole, !disabled);
-
-    if (nodeType == AnimNodeType::Group)
-    {
-        record->setBackground(0, BackColorForGroupNodes);
-        record->setSizeHint(0, QSize(30, 20));
-    }
-    else if (nodeType == AnimNodeType::AzEntity)
-    {
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(
-            entity, &AZ::ComponentApplicationBus::Events::FindEntity, animNode->GetAzEntityId());
-
-        if (!entity)
-        {
-            // In case of a missing entity, color it red.
-            record->setForeground(0, TextColorForMissingEntity);
-        }
-    }
-    else if (nodeType == AnimNodeType::Material)
-    {
-        record->setForeground(0, TextColorForInvalidMaterial);
-    }
-
-    // Mark the active director and other directors properly.
-    if (animNode->IsActiveDirector())
-    {
-        record->setBackground(0, BackColorForActiveDirector);
-    }
-    else if (nodeType == AnimNodeType::Director)
-    {
-        record->setBackground(0, BackColorForInactiveDirector);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::Reload()
-{
-    ui->treeWidget->clear();
-    OnFillItems();
-}
-
-
-void CTrackViewNodesCtrl::OnFillItems()
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        CTrackViewSequenceNotificationContext context(sequence);
-
-        m_nodeToRecordMap.clear();
-
-        CRecord* pRootGroupRec = new CRecord(sequence);
-        pRootGroupRec->setText(0, sequence->GetName());
-        QFont f = font();
-        f.setBold(true);
-        pRootGroupRec->setData(0, Qt::FontRole, f);
-        pRootGroupRec->setSizeHint(0, QSize(width(), 24));
-
-        m_nodeToRecordMap[sequence] = pRootGroupRec;
-        ui->treeWidget->addTopLevelItem(pRootGroupRec);
-
-        FillNodesRec(pRootGroupRec, sequence);
-        pRootGroupRec->setExpanded(sequence->GetExpanded());
-
-        // Additional empty record like space for scrollbar in key control
-        CRecord* pGroupRec = new CRecord();
-        pGroupRec->setSizeHint(0, QSize(width(), 18));
-        ui->treeWidget->addTopLevelItem(pRootGroupRec);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnItemExpanded(QTreeWidgetItem* item)
-{
-    CRecord* record = (CRecord*) item;
-
-    if (record && record->GetNode())
-    {
-        bool currentlyExpanded = record->GetNode()->GetExpanded();
-        bool expanded = item->isExpanded();
-
-        if (expanded != currentlyExpanded)
-        {
-            bool isDuringUndo = false;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-            // Don't record another undo event if this OnItemExpanded callback is fired because we are Undoing or Redoing.
-            if (isDuringUndo)
-            {
-                record->GetNode()->SetExpanded(expanded);
-            }
-            else
-            {
-                CTrackViewSequence* sequence = record->GetNode()->GetSequence();
-                AZ_Assert(nullptr != sequence, "Expected valid sequence");
-                AzToolsFramework::ScopedUndoBatch undoBatch("Set Node Expanded");
-                record->GetNode()->SetExpanded(expanded);
-                undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-            }
-        }
-    }
-
-    UpdateDopeSheet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnSelectionChanged()
-{
-    // Need to avoid the second call to this, because GetSelectedRows is broken
-    // with multi selection
-    if (m_bSelectionChanging)
-    {
-        return;
-    }
-    m_bSelectionChanging = true;
-
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        CTrackViewSequenceNotificationContext context(sequence);
-        sequence->ClearSelection();
-
-        QList<QTreeWidgetItem*> items = ui->treeWidget->selectedItems();
-        int nCount = items.count();
-        for (int i = 0; i < nCount; i++)
-        {
-            CRecord* record = (CRecord*)items.at(i);
-
-            if (record && record->GetNode())
-            {
-                if (!record->GetNode()->IsSelected())
-                {
-                    record->GetNode()->SetSelected(true);
-                    ui->treeWidget->setCurrentItem(record);
-                }
-            }
-        }
-    }
-
-    m_bSelectionChanging = false;
-    UpdateDopeSheet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnNMRclick(QPoint point)
-{
-    CRecord* record = 0;
-    bool isOnAzEntity = false;
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    CTrackViewSequenceNotificationContext context(sequence);
-
-    // Find node under mouse.
-    // Select the item that is at the point myPoint.
-    record = static_cast<CRecord*>(ui->treeWidget->itemAt(point));
-
-    CTrackViewAnimNode* groupNode = nullptr;
-    CTrackViewNode* pNode = nullptr;
-    CTrackViewAnimNode* animNode = nullptr;
-    CTrackViewTrack* pTrack = nullptr;
-
-    if (record && record->GetNode())
-    {
-        pNode = record->GetNode();
-
-        if (pNode)
-        {
-            ETrackViewNodeType nodeType = pNode->GetNodeType();
-
-            if (nodeType == eTVNT_AnimNode)
-            {
-                animNode = static_cast<CTrackViewAnimNode*>(pNode);
-                isOnAzEntity = (animNode && animNode->GetType() == AnimNodeType::AzEntity);
-
-                if (animNode->GetType() == AnimNodeType::Director || animNode->GetType() == AnimNodeType::Group || isOnAzEntity)
-                {
-                    groupNode = animNode;
-                }
-            }
-            else if (nodeType == eTVNT_Sequence)
-            {
-                groupNode = sequence;
-            }
-            else if (nodeType == eTVNT_Track)
-            {
-                pTrack = static_cast<CTrackViewTrack*>(pNode);
-                animNode = pTrack->GetAnimNode();
-            }
-        }
-    }
-    else
-    {
-        pNode = sequence;
-        groupNode = sequence;
-        record = m_nodeToRecordMap[sequence];
-    }
-
-    int cmd = ShowPopupMenu(point, record);
-
-    float scrollPos = SaveVerticalScrollPos();
-
-    if (cmd == eMI_SaveToFBX)
-    {
-        CExportManager* pExportManager = static_cast<CExportManager*>(GetIEditor()->GetExportManager());
-
-        if (pExportManager)
-        {
-            CTrackViewSequence* sequence2 = GetIEditor()->GetAnimation()->GetSequence();
-            if (!sequence2)
-            {
-                return;
-            }
-
-            CTrackViewAnimNodeBundle selectedNodes = sequence2->GetSelectedAnimNodes();
-            const unsigned int numSelectedNodes = selectedNodes.GetCount();
-            if (numSelectedNodes == 0)
-            {
-                return;
-            }
-
-            QString file = QString(sequence2->GetName()) + QString(".fbx");
-            QString selectedSequenceFBXStr = QString(sequence2->GetName()) + ".fbx";
-
-            if (numSelectedNodes > 1)
-            {
-                file = selectedSequenceFBXStr;
-            }
-            else
-            {
-                file = QString(selectedNodes.GetNode(0)->GetName()) + QString(".fbx");
-            }
-
-            QString path = QFileDialog::getSaveFileName(this, tr("Export Selected Nodes To FBX File"), QString(), tr("FBX Files (*.fbx)"));
-
-            if (!path.isEmpty())
-            {
-                pExportManager->SetBakedKeysSequenceExport(false);
-                pExportManager->Export(path.toUtf8().data(), "", "", false, false, false, true);
-            }
-        }
-    }
-    else if (cmd == eMI_ImportFromFBX)
-    {
-        if (animNode)
-        {
-            ImportFromFBX();
-        }
-    }
-    else if (cmd == eMI_SetAsViewCamera)
-    {
-        if (animNode && animNode->GetType() == AnimNodeType::Camera)
-        {
-            animNode->SetAsViewCamera();
-        }
-    }
-    else if (cmd == eMI_RemoveSelected)
-    {
-        // If we are about to delete the sequence, cancel the notification
-        // context, otherwise it will notify on a stale sequence pointer.
-        if (sequence->IsSelected())
-        {
-            context.Cancel();
-        }
-
-        // Let the AZ Undo system manage the nodes on the sequence entity
-        AzToolsFramework::ScopedUndoBatch undoBatch("Delete Selected Nodes/Tracks");
-        auto id = sequence->GetSequenceComponentEntityId();
-        sequence->DeleteSelectedNodes();
-        undoBatch.MarkEntityDirty(id);
-    }
-
-    if (groupNode)
-    {
-        // Group operations applicable to AZEntities and Group Nodes
-        if (cmd == eMI_ExpandAll)
-        {
-            BeginUndoTransaction();
-            groupNode->GetAllAnimNodes().ExpandAll();
-            EndUndoTransaction();
-        }
-        else if (cmd == eMI_CollapseAll)
-        {
-            BeginUndoTransaction();
-            groupNode->GetAllAnimNodes().CollapseAll();
-            EndUndoTransaction();
-        }
-
-        if (!isOnAzEntity)
-        {
-            // Group operations not applicable to AZEntities
-            if (cmd == eMI_AddSelectedEntities)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Entities to Track View");
-                CTrackViewAnimNodeBundle addedNodes = groupNode->AddSelectedEntities(m_pTrackViewDialog->GetDefaultTracksForEntityNode());
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-
-                int selectedEntitiesCount = 0;
-                AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-                    selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);
-
-                // check to make sure all nodes were added and notify user if they weren't
-                if (addedNodes.GetCount() != selectedEntitiesCount)
-                {
-                    IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();
-
-                    AZStd::string messages = movieSystem->GetUserNotificationMsgs();
-
-                    // Create a list of all lines
-                    AZStd::vector<AZStd::string> lines;
-                    AzFramework::StringFunc::Tokenize(messages.c_str(), lines, "\n");
-
-                    // Truncate very long messages. No information is lost because
-                    // all of these errors will have been logged to the console already.
-                    const int maxLines = 30;
-                    AZStd::string shortMessages;
-                    if (lines.size() > maxLines)
-                    {
-                        int numLines = 0;
-                        for (AZStd::string line : lines)
-                        {
-                            shortMessages += line + "\n";
-                            if (++numLines >= maxLines)
-                            {
-                                break;
-                            }
-                        }
-                        shortMessages += "Message truncated, please see console for a full list of warnings.\n";
-                    }
-                    else
-                    {
-                        shortMessages = messages;
-                    }
-
-                    QMessageBox::information(this, tr("Track View Warning"), tr(shortMessages.c_str()));
-
-                    // clear the notification log now that we've consumed and presented them.
-                    movieSystem->ClearUserNotificationMsgs();
-                }
-
-                groupNode->BindToEditorObjects();
-            }
-            else if (cmd == eMI_AddCurrentLayer)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Current Layer to Track View");
-                groupNode->AddCurrentLayer();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddScreenfader)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Screen Fader Node");
-                groupNode->CreateSubNode("ScreenFader", AnimNodeType::ScreenFader);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddCommentNode)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Comment Node");
-                QString commentNodeName = groupNode->GetAvailableNodeNameStartingWith("Comment");
-                groupNode->CreateSubNode(commentNodeName, AnimNodeType::Comment);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddRadialBlur)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Radial Blur Node");
-                groupNode->CreateSubNode("RadialBlur", AnimNodeType::RadialBlur);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddColorCorrection)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Color Correction Node");
-                groupNode->CreateSubNode("ColorCorrection", AnimNodeType::ColorCorrection);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddDOF)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Depth of Field Node");
-                groupNode->CreateSubNode("DepthOfField", AnimNodeType::DepthOfField);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddShadowSetup)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Shadow Setup Node");
-                groupNode->CreateSubNode("ShadowsSetup", AnimNodeType::ShadowSetup);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddEnvironment)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Environment Node");
-                groupNode->CreateSubNode("Environment", AnimNodeType::Environment);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddDirectorNode)
-            {
-                QString name = groupNode->GetAvailableNodeNameStartingWith("Director");
-                AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Director Node");
-                groupNode->CreateSubNode(name, AnimNodeType::Director);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_AddConsoleVariable)
-            {
-                StringDlg dlg(tr("Console Variable Name"));
-                if (dlg.exec() == QDialog::Accepted && !dlg.GetString().isEmpty())
-                {
-                    QString name = groupNode->GetAvailableNodeNameStartingWith(dlg.GetString());
-                    AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Console (CVar) Node");
-                    groupNode->CreateSubNode(name, AnimNodeType::CVar);
-                    undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-                }
-            }
-            else if (cmd == eMI_AddScriptVariable)
-            {
-                StringDlg dlg(tr("Script Variable Name"));
-                if (dlg.exec() == QDialog::Accepted && !dlg.GetString().isEmpty())
-                {
-                    QString name = groupNode->GetAvailableNodeNameStartingWith(dlg.GetString());
-                    AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Script Variable Node");
-                    groupNode->CreateSubNode(name, AnimNodeType::ScriptVar);
-                    undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-                }
-            }
-            else if (cmd == eMI_AddMaterial)
-            {
-                StringDlg dlg(tr("Material Name"));
-                if (dlg.exec() == QDialog::Accepted && !dlg.GetString().isEmpty())
-                {
-                    if (groupNode->GetAnimNodesByName(dlg.GetString().toUtf8().data()).GetCount() == 0)
-                    {
-                        AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Material Node");
-                        groupNode->CreateSubNode(dlg.GetString(), AnimNodeType::Material);
-                        undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-                    }
-                }
-            }
-            else if (cmd == eMI_AddEvent)
-            {
-                StringDlg dlg(tr("Track Event Name"));
-                if (dlg.exec() == QDialog::Accepted && !dlg.GetString().isEmpty())
-                {
-                    AzToolsFramework::ScopedUndoBatch undoBatch("Add Track View Event Node");
-                    groupNode->CreateSubNode(dlg.GetString(), AnimNodeType::Event);
-                    undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-                }
-            }
-            else if (cmd == eMI_PasteNodes)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Paste Track View Nodes");
-                groupNode->PasteNodesFromClipboard(this);
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_CreateFolder)
-            {
-                CreateFolder(groupNode);
-            }
-            else if (cmd == eMI_ExpandFolders)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View folders");
-                groupNode->GetAnimNodesByType(AnimNodeType::Group).ExpandAll();
-                groupNode->GetAnimNodesByType(AnimNodeType::Director).ExpandAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_CollapseFolders)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View folders");
-                groupNode->GetAnimNodesByType(AnimNodeType::Group).CollapseAll();
-                groupNode->GetAnimNodesByType(AnimNodeType::Director).CollapseAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_ExpandEntities)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View entities");
-                groupNode->GetAnimNodesByType(AnimNodeType::AzEntity).ExpandAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_CollapseEntities)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View entities");
-                groupNode->GetAnimNodesByType(AnimNodeType::AzEntity).CollapseAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_ExpandCameras)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View cameras");
-                groupNode->GetAnimNodesByType(AnimNodeType::Camera).ExpandAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_CollapseCameras)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View cameras");
-                groupNode->GetAnimNodesByType(AnimNodeType::Camera).CollapseAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_ExpandMaterials)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View materials");
-                groupNode->GetAnimNodesByType(AnimNodeType::Material).ExpandAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_CollapseMaterials)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View materials");
-                groupNode->GetAnimNodesByType(AnimNodeType::Material).CollapseAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_ExpandEvents)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Expand Track View events");
-                groupNode->GetAnimNodesByType(AnimNodeType::Event).ExpandAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-            else if (cmd == eMI_CollapseEvents)
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Collapse Track View events");
-                groupNode->GetAnimNodesByType(AnimNodeType::Event).CollapseAll();
-                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());
-            }
-        }  
-    }
-
-    if (cmd == eMI_EditEvents)
-    {
-        EditEvents();
-    }
-    else if (cmd == eMI_Rename)
-    {
-        if (animNode || groupNode)
-        {
-            CTrackViewAnimNode* animNode2 = static_cast<CTrackViewAnimNode*>(pNode);
-            QString oldName = animNode2->GetName();
-
-            StringDlg dlg(tr("Rename Node"));
-            dlg.SetString(oldName);
-
-            // add check for duplicate entity names if this is bound to an Object node
-            if (animNode2->IsBoundToEditorObjects())
-            {
-                dlg.SetCheckCallback([this](QString newName) -> bool
-                {
-                    bool nameExists = false;
-                    const auto nameUtf8 = newName.toUtf8();
-                    const AZStd::string name(nameUtf8.constData(), nameUtf8.length());
-                    AZ::ComponentApplicationBus::Broadcast(
-                        &AZ::ComponentApplicationRequests::EnumerateEntities,
-                        [&name, nameExists] (const AZ::Entity* entity) mutable
-                    {
-                        const auto entityId = entity->GetId();
-
-                        bool editorEntity = false;
-                        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
-                            editorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, entityId);
-
-                        if (!editorEntity)
-                        {
-                            return;
-                        }
-
-                        AZStd::string entityName;
-                        AZ::ComponentApplicationBus::BroadcastResult(
-                            entityName, &AZ::ComponentApplicationBus::Events::GetEntityName, entityId);
-
-                        if (entityName == name)
-                        {
-                            nameExists = true;
-                        }
-                    });
-
-                    if (nameExists)
-                    {
-                        QMessageBox::warning(this, tr("Entity already exists"), QString(tr("Entity named '%1' already exists.\n\nPlease choose another unique name.")).arg(newName));
-                        return false;
-                    }
-                    // Max name length is 512 when creating a new sequence, match that here for rename.
-                    // It would be nice to make this a restriction at input but I didnt see a way to do that with StringDlg and this is
-                    // very unlikely to happen in normal usage.
-                    const int maxLenth = 512;
-                    if (newName.length() > maxLenth)
-                    {
-                        QMessageBox::warning(
-                            this,
-                            tr("New entity name is too long"), 
-                            QString(tr("New entity name is over the maximum of %1.\n\nPlease reduce the length.")).arg(maxLenth)
-                        );
-                        return false;
-                    }
-                    return true;
-                });
-            }
-
-            if (dlg.exec() == QDialog::Accepted)
-            {
-                const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-                QString name = dlg.GetString();
-                sequenceManager->RenameNode(animNode2, name.toUtf8().data());
-                UpdateNodeRecord(record);
-            }
-        }
-    }
-    else if (cmd == eMI_SetAsActiveDirector)
-    {
-        if (pNode && pNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* animNode2 = static_cast<CTrackViewAnimNode*>(pNode);
-            animNode2->SetAsActiveDirector();
-        }
-    }
-    else if (cmd >= eMI_AddTrackBase && cmd < eMI_AddTrackBase + 1000)
-    {
-        if (animNode)
-        {
-            UINT_PTR menuId = cmd - eMI_AddTrackBase;
-            
-            if (animNode->GetType() != AnimNodeType::AzEntity)
-            {
-                // add track
-                auto findIter = m_menuParamTypeMap.find(menuId);
-                if (findIter != m_menuParamTypeMap.end())
-                {
-                    AzToolsFramework::ScopedUndoBatch undoBatch("Add TrackView Track");
-                    animNode->CreateTrack(findIter->second);
-                    undoBatch.MarkEntityDirty(animNode->GetSequence()->GetSequenceComponentEntityId());
-                }
-            }                   
-        }
-    }
-    else if (cmd == eMI_RemoveTrack)
-    {
-        if (pTrack)
-        {
-            AzToolsFramework::ScopedUndoBatch undoBatch("Remove TrackView Track");
-            pTrack->GetAnimNode()->RemoveTrack(pTrack);
-            undoBatch.MarkEntityDirty(pTrack->GetSequence()->GetSequenceComponentEntityId());
-        }
-    }
-    else if (cmd >= eMI_ShowHideBase && cmd < eMI_ShowHideBase + 100)
-    {
-        if (animNode)
-        {
-            unsigned int childIndex = cmd - eMI_ShowHideBase;
-
-            if (childIndex < animNode->GetChildCount())
-            {
-                CTrackViewNode* pChild = animNode->GetChild(childIndex);
-                pChild->SetHidden(!pChild->IsHidden());
-            }
-        }
-    }
-    else if (cmd == eMI_CopyKeys)
-    {
-        sequence->CopyKeysToClipboard(false, true);
-    }
-    else if (cmd == eMI_CopySelectedKeys)
-    {
-        sequence->CopyKeysToClipboard(true, true);
-    }
-    else if (cmd == eMI_PasteKeys)
-    {
-        CUndo undo("Paste TrackView Keys");
-        sequence->PasteKeysFromClipboard(animNode, pTrack);
-    }
-    else if (cmd == eMI_CopyNodes)
-    {
-        if (animNode)
-        {
-            animNode->CopyNodesToClipboard(false, this);
-        }
-        else
-        {
-            sequence->CopyNodesToClipboard(false, this);
-        }
-    }
-    else if (cmd == eMI_CopySelectedNodes)
-    {
-        sequence->CopyNodesToClipboard(true, this);
-    }
-    else if (cmd == eMI_SelectInViewport)
-    {
-        CUndo undo("Select TrackView Nodes in Viewport");
-        sequence->SelectSelectedNodesInViewport();
-    }
-    else if (cmd >= eMI_SelectSubmaterialBase && cmd < eMI_SelectSubmaterialBase + 100)
-    {
-        if (animNode)
-        {
-            QString matName;
-            GetMatNameAndSubMtlIndexFromName(matName, animNode->GetName());
-            QString newMatName;
-            newMatName = tr("%1.[%2]").arg(matName).arg(cmd - eMI_SelectSubmaterialBase + 1);
-            CUndo undo("Rename TrackView node");
-            animNode->SetName(newMatName.toUtf8().data());
-            animNode->SetSelected(true);
-            UpdateNodeRecord(record);
-        }
-    }
-    else if (cmd >= eMI_SetAnimationLayerBase && cmd < eMI_SetAnimationLayerBase + 100)
-    {
-        if (pNode && pNode->GetNodeType() == eTVNT_Track)
-        {
-            CTrackViewTrack* pTrack2 = static_cast<CTrackViewTrack*>(pNode);
-            pTrack2->SetAnimationLayerIndex(cmd - eMI_SetAnimationLayerBase);
-        }
-    }
-    else if (cmd == eMI_Disable)
-    {
-        if (pNode)
-        {
-            CTrackViewSequence* sequence2 = pNode->GetSequence();
-            AZ_Assert(nullptr != sequence2, "Expected valid sequence");
-            AzToolsFramework::ScopedUndoBatch undoBatch("Node Set Disabled");
-            pNode->SetDisabled(!pNode->IsDisabled());
-            undoBatch.MarkEntityDirty(sequence2->GetSequenceComponentEntityId());
-        }
-    }
-    else if (cmd == eMI_Mute)
-    {
-        if (pTrack)
-        {
-            pTrack->SetMuted(!pTrack->IsMuted());
-        }
-    }
-    else if (cmd == eMI_CustomizeTrackColor)
-    {
-        CustomizeTrackColor(pTrack);
-    }
-    else if (cmd == eMI_ClearCustomTrackColor)
-    {
-        if (pTrack)
-        {
-            pTrack->ClearCustomColor();
-        }
-    }
-
-    if (cmd)
-    {
-        RestoreVerticalScrollPos(scrollPos);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnItemDblClick(QTreeWidgetItem* item, int)
-{
-    CRecord* record = (CRecord*)item;
-    if (record && record->GetNode())
-    {
-        CTrackViewNode* pNode = record->GetNode();
-
-        if (pNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* animNode = static_cast<CTrackViewAnimNode*>(pNode);
-
-            if (const AZ::EntityId entityId = animNode->GetAzEntityId();
-                entityId.IsValid())
-            {
-                CUndo undo("Select Object");
-                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-                    &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities,
-                    AzToolsFramework::EntityIdList{animNode->GetAzEntityId()});
-            }
-        }
-    }
-}
-
-CTrackViewTrack* CTrackViewNodesCtrl::GetTrackViewTrack(const Export::EntityAnimData* pAnimData, CTrackViewTrackBundle trackBundle, const QString& nodeName)
-{
-    for (unsigned int trackID = 0; trackID < trackBundle.GetCount(); ++trackID)
-    {
-        CTrackViewTrack* pTrack = trackBundle.GetTrack(trackID);
-        const QString bundleTrackName = pTrack->GetAnimNode()->GetName();
-
-        if (bundleTrackName.compare(nodeName, Qt::CaseInsensitive) != 0)
-        {
-            continue;
-        }
-
-        // Position, Rotation
-        if (pTrack->IsCompoundTrack())
-        {
-            for (unsigned int childTrackID = 0; childTrackID < pTrack->GetChildCount(); ++childTrackID)
-            {
-                CTrackViewTrack* childTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(childTrackID));
-                // Have to cast GetType to int since the enum it returns is not the same enum that pAnimData->dataType is
-                if (static_cast<int>(childTrack->GetParameterType().GetType()) == pAnimData->dataType)
-                {
-                    return childTrack;
-                }
-            }
-        }
-
-        // FOV
-        // Have to cast GetType to int since the enum it returns is not the same enum that pAnimData->dataType is
-        if (static_cast<int>(pTrack->GetParameterType().GetType()) == pAnimData->dataType)
-        {
-            return pTrack;
-        }
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::ImportFromFBX()
-{
-    CExportManager* pExportManager = static_cast<CExportManager*>(GetIEditor()->GetExportManager());
-
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::AnyFile, {}, {}, "FBX Files (*.fbx)", {}, {}, this);
-
-    if (dlg.exec())
-    {
-        bool bImportResult = pExportManager->ImportFromFile(dlg.selectedFiles().first().toStdString().c_str());
-
-        if (!bImportResult)
-        {
-            return;
-        }
-    }
-    else
-    {
-        return;
-    }
-
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (sequence)
-    {
-        AzToolsFramework::ScopedUndoBatch undoBatch("Replace Keys");
-        CTrackViewTrackBundle tracks = sequence->GetAllTracks();
-        const unsigned int numTracks = tracks.GetCount();
-
-        for (unsigned int trackID = 0; trackID < numTracks; ++trackID)
-        {
-            undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-        }
-
-        CTrackViewTrackBundle trackBundle = sequence->GetAllTracks();
-
-        const Export::CData pData = pExportManager->GetData();
-        const int objectsCount = pData.GetObjectCount();
-
-        CTrackViewFBXImportPreviewDialog importSelectionDialog;
-
-        for (int objectID = 0; objectID < objectsCount; ++objectID)
-        {
-            importSelectionDialog.AddTreeItem(pData.GetObject(objectID)->name);
-        }
-
-        if (importSelectionDialog.exec() != QDialog::Accepted)
-        {
-            return;
-        }
-
-        // Remove all keys from the affected tracks
-        for (int objectID = 0; objectID < objectsCount; ++objectID)
-        {
-            Export::Object* pObject = pData.GetObject(objectID);
-
-            if (pObject)
-            {
-                // Clear only the selected tracks for which we have AnimNodes
-                if (!importSelectionDialog.IsObjectSelected(pObject->name))
-                {
-                    continue;
-                }
-                const char* updatedNodeName = pObject->name;
-                if (sequence->GetAnimNodesByName(updatedNodeName).GetCount() == 0)
-                {
-                    continue;
-                }
-
-                int animatonDataCount = pObject->GetEntityAnimationDataCount();
-                for (int animDataID = 0; animDataID < animatonDataCount; ++animDataID)
-                {
-                    const Export::EntityAnimData* pAnimData = pObject->GetEntityAnimationData(animDataID);
-
-                    CTrackViewTrack* pTrack = GetTrackViewTrack(pAnimData, trackBundle, (QString)updatedNodeName);
-
-                    if (pTrack)
-                    {
-                        CTrackViewKeyBundle keys = pTrack->GetAllKeys();
-
-                        for (int deleteKeyID = (int)keys.GetKeyCount() - 1; deleteKeyID >= 0; --deleteKeyID)
-                        {
-                            CTrackViewKeyHandle key = keys.GetKey(deleteKeyID);
-                            key.Delete();
-                        }
-                    }
-                }
-            }
-        }
-        // Add keys from FBX file
-        for (int objectID = 0; objectID < objectsCount; ++objectID)
-        {
-            const Export::Object* pObject = pData.GetObject(objectID);
-
-            if (pObject)
-            {
-                // only process selected nodes from file for which we have AnimNodes
-                if (!importSelectionDialog.IsObjectSelected(pObject->name))
-                {
-                    continue;
-                }
-                const char* updatedNodeName = pObject->name;
-                if (sequence->GetAnimNodesByName(updatedNodeName).GetCount() == 0)
-                {
-                    continue;
-                }
-
-                const int animatonDataCount = pObject->GetEntityAnimationDataCount();
-
-                // Add keys from the imported file to the selected tracks
-                for (int animDataID = 0; animDataID < animatonDataCount; ++animDataID)
-                {
-                    const Export::EntityAnimData* pAnimData = pObject->GetEntityAnimationData(animDataID);
-                    CTrackViewTrack* pTrack = GetTrackViewTrack(pAnimData, trackBundle, (QString)updatedNodeName);
-
-                    if (pTrack)
-                    {
-                        CTrackViewKeyHandle key = pTrack->CreateKey(pAnimData->keyTime);
-                        I2DBezierKey bezierKey;
-                        key.GetKey(&bezierKey);
-                        bezierKey.value = Vec2(pAnimData->keyTime, pAnimData->keyValue);
-                        key.SetKey(&bezierKey);
-                    }
-                }
-
-                // After all keys are added, we are able to add the left and right tangents to the imported keys
-                for (int animDataID = 0; animDataID < animatonDataCount; ++animDataID)
-                {
-                    const Export::EntityAnimData* pAnimData = pObject->GetEntityAnimationData(animDataID);
-
-                    CTrackViewTrack* pTrack = GetTrackViewTrack(pAnimData, trackBundle, (QString)updatedNodeName);
-
-                    if (pTrack)
-                    {
-                        CTrackViewKeyHandle key = pTrack->GetKeyByTime(pAnimData->keyTime);
-                        ISplineInterpolator* pSpline = pTrack->GetSpline();
-
-                        if (pSpline)
-                        {
-                            const int keyIndex = key.GetIndex();
-
-                            ISplineInterpolator::ValueType inTangent;
-                            ISplineInterpolator::ValueType outTangent;
-                            ZeroStruct(inTangent);
-                            ZeroStruct(outTangent);
-
-                            float currentKeyTime = 0.0f;
-                            pSpline->SetKeyFlags(keyIndex, SPLINE_KEY_TANGENT_BROKEN);
-
-                            if (keyIndex > 0)
-                            {
-                                currentKeyTime = key.GetTime() - key.GetPrevKey().GetTime();
-                                inTangent[0] = pAnimData->leftTangentWeight * currentKeyTime;
-                                inTangent[1] = inTangent[0] * pAnimData->leftTangent;
-                                pSpline->SetKeyInTangent(keyIndex, inTangent);
-                            }
-
-                            if (keyIndex < (pTrack->GetKeyCount() - 1))
-                            {
-                                CTrackViewKeyHandle nextKey = key.GetNextKey();
-                                if (nextKey.IsValid())
-                                {
-                                    currentKeyTime = nextKey.GetTime() - key.GetTime();
-                                    outTangent[0] = pAnimData->rightTangentWeight * currentKeyTime;
-                                    outTangent[1] = outTangent[0] * pAnimData->rightTangent;
-                                    pSpline->SetKeyOutTangent(keyIndex, outTangent);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::EditEvents()
-{
-    CTVEventsDialog dlg;
-    dlg.exec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::CreateFolder(CTrackViewAnimNode* groupNode)
-{
-    // Change Group of the node.
-    StringDlg dlg(tr("Enter Folder Name"));
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        QString name = dlg.GetString();
-        if (name.isEmpty())
-        {
-            return;
-        }
-
-        CUndo undo("Create folder");
-        if (!groupNode->CreateSubNode(name, AnimNodeType::Group))
-        {
-            QMessageBox::critical(this, QString(), tr("The name already exists. Use another."));
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-struct STrackMenuTreeNode
-{
-    QMenu menu;
-    CAnimParamType paramType;
-    std::map<QString, std::unique_ptr<STrackMenuTreeNode> > children;
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct SContextMenu
-{
-    QMenu main;
-    QMenu expandSub;
-    QMenu collapseSub;
-    QMenu setLayerSub;
-    STrackMenuTreeNode addTrackSub;
-    QMenu addComponentSub;
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::AddGroupNodeAddItems(SContextMenu& contextMenu, CTrackViewAnimNode* animNode)
-{
-    contextMenu.main.addAction("Create Folder")->setData(eMI_CreateFolder);
-
-    AzToolsFramework::EntityIdList entityIds;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-        entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    if (!entityIds.empty())
-    {
-        const char* msg = entityIds.size() == 1 ? "Add Selected Entity" : "Add Selected Entities";
-        contextMenu.main.addAction(msg)->setData(eMI_AddSelectedEntities);
-    }
-
-    const bool bIsDirectorOrSequence = (animNode->GetType() == AnimNodeType::Director || animNode->GetNodeType() == eTVNT_Sequence);
-    CTrackViewAnimNode* pDirector = bIsDirectorOrSequence ? animNode : animNode->GetDirector();
-
-    if (pDirector->GetAnimNodesByType(AnimNodeType::RadialBlur).GetCount() == 0)
-    {
-        contextMenu.main.addAction("Add Radial Blur Node")->setData(eMI_AddRadialBlur);
-    }
-
-    if (pDirector->GetAnimNodesByType(AnimNodeType::ColorCorrection).GetCount() == 0)
-    {
-        contextMenu.main.addAction("Add Color Correction Node")->setData(eMI_AddColorCorrection);
-    }
-
-    if (pDirector->GetAnimNodesByType(AnimNodeType::DepthOfField).GetCount() == 0)
-    {
-        contextMenu.main.addAction("Add Depth of Field Node")->setData(eMI_AddDOF);
-    }
-
-    if (pDirector->GetAnimNodesByType(AnimNodeType::ScreenFader).GetCount() == 0)
-    {
-        contextMenu.main.addAction("Add Screen Fader")->setData(eMI_AddScreenfader);
-    }
-
-    if (pDirector->GetAnimNodesByType(AnimNodeType::ShadowSetup).GetCount() == 0)
-    {
-        contextMenu.main.addAction("Add Shadows Setup Node")->setData(eMI_AddShadowSetup);
-    }
-
-    if (pDirector->GetAnimNodesByType(AnimNodeType::Environment).GetCount() == 0)
-    {
-        contextMenu.main.addAction("Add Environment Node")->setData(eMI_AddEnvironment);
-    }
-
-    // A director node cannot have another director node as a child.
-    if (animNode->GetType() != AnimNodeType::Director)
-    {
-        contextMenu.main.addAction("Add Director(Scene) Node")->setData(eMI_AddDirectorNode);
-    }
-
-    contextMenu.main.addAction("Add Comment Node")->setData(eMI_AddCommentNode);
-    contextMenu.main.addAction("Add Console Variable Node")->setData(eMI_AddConsoleVariable);
-    contextMenu.main.addAction("Add Script Variable Node")->setData(eMI_AddScriptVariable);
-    contextMenu.main.addAction("Add Material Node")->setData(eMI_AddMaterial);
-    contextMenu.main.addAction("Add Event Node")->setData(eMI_AddEvent);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::AddMenuSeperatorConditional(QMenu& menu, bool& bAppended)
-{
-    if (bAppended)
-    {
-        menu.addSeparator();
-    }
-
-    bAppended = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewNodesCtrl::ShowPopupMenuSingleSelection(SContextMenu& contextMenu, CTrackViewSequence* sequence, CTrackViewNode* pNode)
-{
-    bool bAppended = false;
-    bool isOnComponentNode = false;
-    bool isOnAzEntityNode = false;
-
-    const bool bOnSequence = pNode->GetNodeType() == eTVNT_Sequence;
-    const bool bOnNode = pNode->GetNodeType() == eTVNT_AnimNode;
-    const bool bOnTrack = pNode->GetNodeType() == eTVNT_Track;
-    const bool bIsLightAnimationSet = sequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet;
-
-    // Get track & anim node pointers
-    CTrackViewTrack* pTrack = bOnTrack ? static_cast<CTrackViewTrack*>(pNode) : nullptr;
-    const bool bOnTrackNotSub = bOnTrack && !pTrack->IsSubTrack();
-
-    if (bOnNode)
-    {
-        AnimNodeType nodeType = static_cast<CTrackViewAnimNode*>(pNode)->GetType();
-        if (nodeType == AnimNodeType::Component)
-        {
-            isOnComponentNode = true;
-        }
-        else if (nodeType == AnimNodeType::AzEntity)
-        {
-            isOnAzEntityNode = true;
-        }
-    }
-
-    CTrackViewAnimNode* animNode = nullptr;
-    if (bOnSequence || bOnNode)
-    {
-        animNode = static_cast<CTrackViewAnimNode*>(pNode);
-    }
-    else if (bOnTrack)
-    {
-        animNode = pTrack->GetAnimNode();
-    }
-
-    bool isOnDirector = (animNode && animNode->GetType() == AnimNodeType::Director);
-    bool isOnAzEntity = (animNode && animNode->GetType() == AnimNodeType::AzEntity);
-    bool isOnSequence = (animNode && animNode->GetNodeType() == eTVNT_Sequence);
-
-    if (isOnSequence)
-    {
-        contextMenu.main.addAction("Select In Viewport")->setData(eMI_SelectInViewport);
-        contextMenu.main.addSeparator();
-    }
-
-    // Entity
-    if (bOnNode && !bIsLightAnimationSet && animNode->IsBoundToAzEntity())
-    {
-        AddMenuSeperatorConditional(contextMenu.main, bAppended);
-
-        contextMenu.main.addAction("Select In Viewport")->setData(eMI_SelectInViewport);
-
-        if (animNode->GetType() == AnimNodeType::Camera)
-        {
-            contextMenu.main.addAction("Set As View Camera")->setData(eMI_SetAsViewCamera);
-        }
-
-        bAppended = true;
-    }
-
-    {
-        bool bCopyPasteRenameAppended = false;
-
-        // Copy & paste nodes
-        if ((bOnNode || bOnSequence) && !isOnComponentNode)
-        {
-            AddMenuSeperatorConditional(contextMenu.main, bAppended);
-            contextMenu.main.addAction("Copy")->setData(eMI_CopyNodes);
-            bCopyPasteRenameAppended = true;
-        }
-
-        if (pNode->IsGroupNode() && !isOnAzEntity)
-        {
-            contextMenu.main.addAction("Paste")->setData(eMI_PasteNodes);
-            bCopyPasteRenameAppended = true;
-        }
-
-        if ((bOnNode || bOnSequence || bOnTrackNotSub) && !isOnComponentNode)
-        {
-            contextMenu.main.addAction("Delete")->setData(bOnTrackNotSub ? eMI_RemoveTrack : eMI_RemoveSelected);
-            bCopyPasteRenameAppended = true;
-        }
-
-        // Renaming
-        if (pNode->CanBeRenamed())
-        {
-            AddMenuSeperatorConditional(contextMenu.main, bAppended);
-            contextMenu.main.addAction("Rename")->setData(eMI_Rename);
-            bCopyPasteRenameAppended = true;
-        }
-
-        bAppended = bAppended || bCopyPasteRenameAppended;
-    }
-
-    if (bOnTrack)
-    {
-        // Copy & paste keys
-        AddMenuSeperatorConditional(contextMenu.main, bAppended);
-        contextMenu.main.addAction("Copy Keys")->setData(eMI_CopyKeys);
-        contextMenu.main.addAction("Copy Selected Keys")->setData(eMI_CopySelectedKeys);
-        contextMenu.main.addAction("Paste Keys")->setData(eMI_PasteKeys);
-        bAppended = true;
-    }
-
-    // Flags
-    {
-        bool bFlagAppended = false;
-
-        if (!bOnSequence)
-        {
-            AddMenuSeperatorConditional(contextMenu.main, bAppended);
-            QAction* a = contextMenu.main.addAction("Disabled");
-            a->setData(eMI_Disable);
-            a->setCheckable(true);
-            a->setChecked(pNode->IsDisabled());
-            // If the node is not currently allowed to be enabled, disable the check box.
-            if (pNode->IsDisabled() && !pNode->CanBeEnabled())
-            {
-                a->setEnabled(false);
-            }
-            bFlagAppended = true;
-        }
-
-        if (bOnTrack)
-        {
-            if (pTrack->GetParameterType() == AnimParamType::Sound)
-            {
-                AddMenuSeperatorConditional(contextMenu.main, bAppended);
-                bool bMuted = pTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Muted;
-                QAction* a = contextMenu.main.addAction("Muted");
-                a->setData(eMI_Mute);
-                a->setCheckable(true);
-                a->setChecked(bMuted);
-                bFlagAppended = true;
-            }
-        }
-
-        // In case that it's a director node instead of a normal group node,
-        if (bOnNode && animNode->GetType() == AnimNodeType::Director)
-        {
-            AddMenuSeperatorConditional(contextMenu.main, bAppended);
-            QAction* a = contextMenu.main.addAction("Active Director");
-            a->setData(eMI_SetAsActiveDirector);
-            a->setCheckable(true);
-            a->setChecked(animNode->IsActiveDirector());
-            bFlagAppended = true;
-        }
-
-        bAppended = bAppended || bFlagAppended;
-    }
-
-    // Expand / collapse
-    if (bOnSequence || pNode->IsGroupNode())
-    {
-        AddMenuSeperatorConditional(contextMenu.main, bAppended);
-
-        contextMenu.expandSub.addAction("Expand all")->setData(eMI_ExpandAll);
-        contextMenu.collapseSub.addAction("Collapse all")->setData(eMI_CollapseAll);
-        if (!isOnAzEntity)
-        {
-            contextMenu.expandSub.addAction("Expand Folders")->setData(eMI_ExpandFolders);
-            contextMenu.collapseSub.addAction("Collapse Folders")->setData(eMI_CollapseFolders);
-            contextMenu.expandSub.addAction("Expand Entities")->setData(eMI_ExpandEntities);
-            contextMenu.collapseSub.addAction("Collapse Entities")->setData(eMI_CollapseEntities);
-            contextMenu.expandSub.addAction("Expand Cameras")->setData(eMI_ExpandCameras);
-            contextMenu.collapseSub.addAction("Collapse Cameras")->setData(eMI_CollapseCameras);
-            contextMenu.expandSub.addAction("Expand Materials")->setData(eMI_ExpandMaterials);
-            contextMenu.collapseSub.addAction("Collapse Materials")->setData(eMI_CollapseMaterials);
-            contextMenu.expandSub.addAction("Expand Events")->setData(eMI_ExpandEvents);
-            contextMenu.collapseSub.addAction("Collapse Events")->setData(eMI_CollapseEvents);
-        }
-        contextMenu.expandSub.setTitle("Expand");
-        contextMenu.main.addMenu(&contextMenu.expandSub);
-        contextMenu.collapseSub.setTitle("Collapse");
-        contextMenu.main.addMenu(&contextMenu.collapseSub);
-
-        bAppended = true;
-    }
-
-    // Add/Remove
-    {
-        if (bOnSequence || (pNode->IsGroupNode() && !isOnAzEntity) )
-        {
-            AddMenuSeperatorConditional(contextMenu.main, bAppended);
-            AddGroupNodeAddItems(contextMenu, animNode);
-            bAppended = true;
-        }
-
-        if (bOnNode)
-        {
-            AddMenuSeperatorConditional(contextMenu.main, bAppended);
-
-            if (!isOnAzEntity)
-            {
-                // Create 'Add Tracks' submenu
-                m_menuParamTypeMap.clear();
-
-                if (FillAddTrackMenu(contextMenu.addTrackSub, animNode))
-                {
-                    // add script table properties
-                    unsigned int currentId = 0;
-                    CreateAddTrackMenuRec(contextMenu.main, "Add Track", animNode, contextMenu.addTrackSub, currentId);
-                }
-            }
-
-            bAppended = true;
-        }
-    }
-
-    bool isLegacySequence = (sequence && sequence->GetSequenceType() == SequenceType::Legacy);
-
-    if (isLegacySequence && bOnNode && !bIsLightAnimationSet && !isOnDirector && !isOnComponentNode && !isOnAzEntityNode)
-    {
-        AddMenuSeperatorConditional(contextMenu.main, bAppended);
-        contextMenu.main.addAction("Import FBX File...")->setData(eMI_ImportFromFBX);
-        contextMenu.main.addAction("Export FBX File...")->setData(eMI_SaveToFBX);
-        bAppended = true;
-    }
-
-    // Events
-    if (bOnSequence || pNode->IsGroupNode() && !bIsLightAnimationSet && !isOnAzEntity)
-    {
-        AddMenuSeperatorConditional(contextMenu.main, bAppended);
-        contextMenu.main.addAction("Edit Events...")->setData(eMI_EditEvents);
-        bAppended = true;
-    }
-
-    // Delete track menu
-    if (bOnTrackNotSub)
-    {
-        if (pTrack->GetParameterType() == AnimParamType::Animation || pTrack->GetParameterType() == AnimParamType::LookAt || pTrack->GetValueType() == AnimValueType::CharacterAnim)
-        {
-            // Add the set-animation-layer pop-up menu.
-            AddMenuSeperatorConditional(contextMenu.main, bAppended);
-            CreateSetAnimationLayerPopupMenu(contextMenu.setLayerSub, pTrack);
-            contextMenu.setLayerSub.setTitle("Set Animation Layer");
-            contextMenu.main.addMenu(&contextMenu.setLayerSub);
-            bAppended = true;
-        }
-    }
-
-    // Track color
-    if (bOnTrack)
-    {
-        AddMenuSeperatorConditional(contextMenu.main, bAppended);
-        contextMenu.main.addAction("Customize Track Color...")->setData(eMI_CustomizeTrackColor);
-        if (pTrack->HasCustomColor())
-        {
-            contextMenu.main.addAction("Clear Custom Track Color")->setData(eMI_ClearCustomTrackColor);
-        }
-        bAppended = true;
-    }
-
-    // Track hide/unhide flags
-    if (bOnNode && !pNode->IsGroupNode())
-    {
-        AddMenuSeperatorConditional(contextMenu.main, bAppended);
-        QString string = QString("%1 Tracks").arg(animNode->GetName());
-        contextMenu.main.addAction(string)->setEnabled(false);
-
-        bool bAppendedTrackFlag = false;
-
-        const unsigned int numChildren = animNode->GetChildCount();
-        for (unsigned int childIndex = 0; childIndex < numChildren; ++childIndex)
-        {
-            CTrackViewNode* pChild = animNode->GetChild(childIndex);
-            if (pChild->GetNodeType() == eTVNT_Track)
-            {
-                CTrackViewTrack* pTrack2 = static_cast<CTrackViewTrack*>(pChild);
-
-                if (pTrack2->IsSubTrack())
-                {
-                    continue;
-                }
-
-                QAction* a = contextMenu.main.addAction(QString("  %1").arg(pTrack2->GetName()));
-                a->setData(eMI_ShowHideBase + childIndex);
-                a->setCheckable(true);
-                a->setChecked(!pTrack2->IsHidden());
-                bAppendedTrackFlag = true;
-            }
-        }
-
-        bAppended = bAppendedTrackFlag || bAppended;
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewNodesCtrl::ShowPopupMenuMultiSelection(SContextMenu& contextMenu)
-{
-    QList<QTreeWidgetItem*> records = ui->treeWidget->selectedItems();
-
-    bool bNodeSelected = false;
-    for (int currentNode = 0; currentNode < records.size(); ++currentNode)
-    {
-        CRecord* pItemInfo = (CRecord*)records[currentNode];
-
-        if (pItemInfo->GetNode()->GetNodeType() == eTVNT_AnimNode)
-        {
-            bNodeSelected = true;
-        }
-    }
-
-    if (bNodeSelected)
-    {
-        contextMenu.main.addAction("Copy Selected Nodes")->setData(eMI_CopySelectedNodes);
-    }
-
-    contextMenu.main.addAction("Remove Selected Nodes/Tracks")->setData(eMI_RemoveSelected);
-
-    if (bNodeSelected)
-    {
-        contextMenu.main.addSeparator();
-        contextMenu.main.addAction("Select In Viewport")->setData(eMI_SelectInViewport);
-
-        // Importing FBX is currently only supported on legacy entities. Legacy
-        // sequences contain only legacy Cry entities and no AZ component entities.
-        CAnimationContext* context = GetIEditor()->GetAnimation();
-        AZ_Assert(context, "Expected valid GetIEditor()->GetAnimation()");
-        if (context)
-        {
-            CTrackViewSequence* sequence = context->GetSequence();
-            if (sequence && sequence->GetSequenceType() == SequenceType::Legacy)
-            {
-                contextMenu.main.addAction("Import From FBX File")->setData(eMI_ImportFromFBX);
-                contextMenu.main.addAction("Save To FBX File")->setData(eMI_SaveToFBX);
-            }
-        }
-    }
-
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewNodesCtrl::ShowPopupMenu([[maybe_unused]] QPoint point, const CRecord* record)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return 0;
-    }
-
-    SContextMenu contextMenu;
-
-    CTrackViewNode* pNode = record ? record->GetNode() : nullptr;
-    if (!pNode)
-    {
-        return 0;
-    }
-
-    if (ui->treeWidget->selectedItems().size() > 1)
-    {
-        ShowPopupMenuMultiSelection(contextMenu);
-    }
-    else if (pNode)
-    {
-        ShowPopupMenuSingleSelection(contextMenu, sequence, pNode);
-    }
-
-    if (m_bEditLock)
-    {
-        SetPopupMenuLock(&contextMenu.main);
-    }
-
-    QAction* action = contextMenu.main.exec(QCursor::pos());
-    int ret = action ? action->data().toInt() : 0;
-
-    return ret;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Add tracks that can be added to the given animation node to the
-// internal track menu tree data structure rooted at menuAddTrack
-bool CTrackViewNodesCtrl::FillAddTrackMenu(STrackMenuTreeNode& menuAddTrack, const CTrackViewAnimNode* animNode)
-{
-    bool bTracksToAdd = false;
-    const AnimNodeType nodeType = animNode->GetType();
-    int paramCount = 0;
-    IAnimNode::AnimParamInfos animatableProperties;
-    CTrackViewNode* parentNode = animNode->GetParentNode();
-   
-    // all AZ::Entity entities are animated through components. Component nodes always have a parent - the containing AZ::Entity
-    if (nodeType == AnimNodeType::Component && parentNode)
-    {
-        // component node - query all the animatable tracks via an EBus request
-
-        // all AnimNodeType::Component are parented to AnimNodeType::AzEntityNodes - get the parent to get it's AZ::EntityId to use for the EBus request
-        if (parentNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            // this cast is safe because we check that the type is eTVNT_AnimNode
-            const AZ::EntityId azEntityId = static_cast<CTrackViewAnimNode*>(parentNode)->GetAzEntityId();
-
-            // query the animatable component properties from the Sequence Component
-            Maestro::EditorSequenceComponentRequestBus::Event(const_cast<CTrackViewAnimNode*>(animNode)->GetSequence()->GetSequenceComponentEntityId(), 
-                                                                    &Maestro::EditorSequenceComponentRequestBus::Events::GetAllAnimatablePropertiesForComponent, 
-                                                                    animatableProperties, azEntityId, animNode->GetComponentId());
-
-            paramCount = animatableProperties.size();
-        }       
-    }
-    else
-    {
-        // legacy Entity
-        paramCount = animNode->GetParamCount(); 
-    }
-    
-    for (int i = 0; i < paramCount; ++i)
-    {
-        CAnimParamType paramType;
-        QString name;
-
-        // get the animatable param name
-        if (nodeType == AnimNodeType::Component)
-        {
-            // Skip over any hidden params
-            if (animatableProperties[i].flags & IAnimNode::ESupportedParamFlags::eSupportedParamFlags_Hidden)
-            {
-                continue;
-            }
-
-            paramType = animatableProperties[i].paramType;
-        }
-        else
-        {
-            // legacy node
-            paramType = animNode->GetParamType(i);
-            if (paramType == AnimParamType::Invalid)
-            {
-                continue;
-            }
-
-            IAnimNode::ESupportedParamFlags paramFlags = animNode->GetParamFlags(paramType);
-
-            CTrackViewTrack* pTrack = animNode->GetTrackForParameter(paramType);
-            if (pTrack && !(paramFlags & IAnimNode::eSupportedParamFlags_MultipleTracks))
-            {
-                continue;
-            }
-        }
-        name = animNode->GetParamName(paramType);
-        QStringList splittedName = name.split("/", Qt::SkipEmptyParts);
-
-        STrackMenuTreeNode* pCurrentNode = &menuAddTrack;
-        for (unsigned int j = 0; j < splittedName.size() - 1; ++j)
-        {
-            const QString& segment = splittedName[j];
-            auto findIter = pCurrentNode->children.find(segment);
-            if (findIter != pCurrentNode->children.end())
-            {
-                pCurrentNode = findIter->second.get();
-            }
-            else
-            {
-                STrackMenuTreeNode* pNewNode = new STrackMenuTreeNode;
-                pCurrentNode->children[segment] = std::unique_ptr<STrackMenuTreeNode>(pNewNode);
-                pCurrentNode = pNewNode;
-            }
-        }
-
-        // only add tracks to the that STrackMenuTreeNode tree that haven't already been added
-        CTrackViewTrackBundle matchedTracks = animNode->GetTracksByParam(paramType);
-        if (matchedTracks.GetCount() == 0)
-        {
-            STrackMenuTreeNode* pParamNode = new STrackMenuTreeNode;
-            pCurrentNode->children[splittedName.back()] = std::unique_ptr<STrackMenuTreeNode>(pParamNode);
-            pParamNode->paramType = paramType;
-
-            bTracksToAdd = true;
-        }  
-    }
-    
-    return bTracksToAdd;
-}
-
-//////////////////////////////////////////////////////////////////////////
-//
-// FillAddTrackMenu fills the data structure for tracks to add (a STrackMenuTreeNode tree)
-// CreateAddTrackMenuRec actually creates the Qt submenu from this data structure
-//
-void CTrackViewNodesCtrl::CreateAddTrackMenuRec(QMenu& parent, const QString& name, CTrackViewAnimNode* animNode, struct STrackMenuTreeNode& node, unsigned int& currentId)
-{
-    if (node.paramType.GetType() == AnimParamType::Invalid)
-    {
-        node.menu.setTitle(name);
-        parent.addMenu(&node.menu);
-
-        for (auto iter = node.children.begin(); iter != node.children.end(); ++iter)
-        {
-            CreateAddTrackMenuRec(node.menu, iter->first, animNode, *iter->second.get(), currentId);
-        }
-    }
-    else
-    {
-        m_menuParamTypeMap[currentId] = node.paramType;
-        QVariant paramTypeMenuID;
-        paramTypeMenuID.setValue(eMI_AddTrackBase + currentId);
-        parent.addAction(name)->setData(paramTypeMenuID);
-        ++currentId;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::SetPopupMenuLock(QMenu* menu)
-{
-    if (!m_bEditLock || !menu)
-    {
-        return;
-    }
-
-    UINT count = menu->actions().size();
-    for (UINT i = 0; i < count; ++i)
-    {
-        QAction* a = menu->actions()[i];
-        QString menuString = a->text();
-
-        if (menuString != "Expand" && menuString != "Collapse")
-        {
-            a->setEnabled(false);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewNodesCtrl::SaveVerticalScrollPos() const
-{
-    int sbMin = ui->treeWidget->verticalScrollBar()->minimum();
-    int sbMax = ui->treeWidget->verticalScrollBar()->maximum();
-    return float(ui->treeWidget->verticalScrollBar()->value() - sbMin) / std::max(float(sbMax - sbMin), 1.0f);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::RestoreVerticalScrollPos(float fScrollPos)
-{
-    int sbMin = ui->treeWidget->verticalScrollBar()->minimum();
-    int sbMax = ui->treeWidget->verticalScrollBar()->maximum();
-    int newScrollPos = qRound(fScrollPos * (sbMax - sbMin)) + sbMin;
-    ui->treeWidget->verticalScrollBar()->setValue(newScrollPos);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::FillAutoCompletionListForFilter()
-{
-    QStringList strings;
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        ui->noitems->hide();
-        ui->treeWidget->show();
-        ui->searchField->show();
-        ui->searchCount->show();
-        CTrackViewAnimNodeBundle animNodes = sequence->GetAllAnimNodes();
-        const unsigned int animNodeCount = animNodes.GetCount();
-
-        for (unsigned int i = 0; i < animNodeCount; ++i)
-        {
-            strings << animNodes.GetNode(i)->GetName();
-        }
-    }
-    else
-    {
-        ui->noitems->show();
-        ui->treeWidget->hide();
-        ui->searchField->hide();
-        ui->searchCount->hide();
-    }
-
-    QCompleter* c = new QCompleter(strings, this);
-    c->setCaseSensitivity(Qt::CaseInsensitive);
-    c->setCompletionMode(QCompleter::InlineCompletion);
-    ui->searchField->setCompleter(c);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnFilterChange(const QString& text)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-    if (sequence)
-    {
-        m_currentMatchIndex = 0;    // Reset the match index
-        m_matchCount = 0;           // and the count.
-        if (!text.isEmpty())
-        {
-            QList<QTreeWidgetItem*> items = ui->treeWidget->findItems(text, Qt::MatchContains | Qt::MatchRecursive);
-
-            CTrackViewAnimNodeBundle animNodes = sequence->GetAllAnimNodes();
-
-            m_matchCount = items.size();                    // and the count.
-
-            if (!items.empty())
-            {
-                ui->treeWidget->selectionModel()->clear();
-                items.front()->setSelected(true);
-            }
-        }
-
-        QString matchCountText = QString("%1/%2").arg(m_matchCount == 0 ? 0 : 1).arg(m_matchCount); // One-based indexing
-        ui->searchCount->setText(matchCountText);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewNodesCtrl::GetMatNameAndSubMtlIndexFromName(QString& matName, const char* nodeName)
-{
-    if (const char* pCh = strstr(nodeName, ".["))
-    {
-        char matPath[MAX_PATH];
-        cry_strcpy(matPath, nodeName, (size_t)(pCh - nodeName));
-        matName = matPath;
-        pCh += 2;
-        if ((*pCh) != 0)
-        {
-            const int index = atoi(pCh) - 1;
-            return index;
-        }
-    }
-    else
-    {
-        matName = nodeName;
-    }
-
-    return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CTrackViewNodesCtrl::ShowNextResult()
-{
-    if (m_matchCount > 1)
-    {
-        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-
-        if (sequence && !ui->searchField->text().isEmpty())
-        {
-            QList<QTreeWidgetItem*> items = ui->treeWidget->findItems(ui->searchField->text(), Qt::MatchContains | Qt::MatchRecursive);
-
-            CTrackViewAnimNodeBundle animNodes = sequence->GetAllAnimNodes();
-
-            m_matchCount = items.size();                    // and the count.
-
-            if (!items.empty())
-            {
-                ++m_currentMatchIndex;
-                m_currentMatchIndex = m_currentMatchIndex % m_matchCount;
-                ui->treeWidget->selectionModel()->clear();
-                items[m_currentMatchIndex]->setSelected(true);
-            }
-
-            QString matchCountText = QString("%1/%2").arg(m_currentMatchIndex + 1).arg(m_matchCount); // One-based indexing
-            ui->searchCount->setText(matchCountText);
-        }
-    }
-}
-
-void CTrackViewNodesCtrl::Update()
-{
-    // Update the Track UI elements with the latest names of the Tracks.
-    // In some cases (save slice overrides) the Track names (param names)
-    // may not be available at the time of the Sequence activation because
-    // they come from the animated entities (which may not be active). So
-    // just update them once a frame to make sure they are the latest.
-    for (auto iter = m_nodeToRecordMap.begin(); iter != m_nodeToRecordMap.end(); ++iter)
-    {
-        const CTrackViewNode* node = iter->first;
-        CTrackViewNodesCtrl::CRecord* record = iter->second;
-        if (node && record)
-        {
-            if (node->GetNodeType() == eTVNT_Track)
-            {
-                const CTrackViewAnimNode* track = static_cast<const CTrackViewAnimNode*>(node);
-                if (track)
-                { 
-                    record->setText(0, track->GetName());
-                }
-            }            
-        }
-    }
-}
-
-void CTrackViewNodesCtrl::keyPressEvent(QKeyEvent* event)
-{
-    // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
-    switch (event->key())
-    {
-    case Qt::Key_Z:
-        if (event->modifiers() == Qt::ControlModifier)
-        {
-            GetIEditor()->Undo();
-            event->accept();
-        }
-        break;
-    default:
-        break;
-    }
-}
-
-bool CTrackViewNodesCtrl::event(QEvent* e)
-{
-    if (e->type() == QEvent::ShortcutOverride)
-    {
-        // since we respond to the following things, let Qt know so that shortcuts don't override us
-        bool respondsToEvent = false;
-
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
-        if (keyEvent->key() == Qt::Key_Z && keyEvent->modifiers() == Qt::ControlModifier)
-        {
-            respondsToEvent = true;
-        }
-
-        if (respondsToEvent)
-        {
-            e->accept();
-            return true;
-        }
-    }
-
-    return QWidget::event(e);
-}
-
-void CTrackViewNodesCtrl::CreateSetAnimationLayerPopupMenu(QMenu& menuSetLayer, CTrackViewTrack* pTrack) const
-{
-    // First collect layers already in use.
-    std::vector<int> layersInUse;
-
-    CTrackViewTrackBundle lookAtTracks = pTrack->GetAnimNode()->GetTracksByParam(AnimParamType::LookAt);
-    assert(lookAtTracks.GetCount() <= 1);
-
-    if (lookAtTracks.GetCount() > 0)
-    {
-        const int kDefaultLookIKLayer = 15;
-        int lookIKLayerIndex = lookAtTracks.GetTrack(0)->GetAnimationLayerIndex();
-
-        if (lookIKLayerIndex < 0) // Not set before, use the default instead.
-        {
-            lookIKLayerIndex = kDefaultLookIKLayer;
-        }
-
-        layersInUse.push_back(lookIKLayerIndex);
-    }
-
-    CTrackViewTrackBundle animationTracks = pTrack->GetAnimNode()->GetTracksByParam(AnimParamType::Animation);
-
-    const unsigned int numAnimationTracks = animationTracks.GetCount();
-    for (int i = 0; i < numAnimationTracks; ++i)
-    {
-        CTrackViewTrack* pAnimationTrack = animationTracks.GetTrack(i);
-        if (pAnimationTrack)
-        {
-            const int kAdditiveLayerOffset = 6;
-            int layerIndex = pAnimationTrack->GetAnimationLayerIndex();
-
-            if (layerIndex < 0) // Not set before, use the default instead.
-            {
-                layerIndex = i == 0 ? 0 : kAdditiveLayerOffset + i;
-            }
-
-            layersInUse.push_back(layerIndex);
-        }
-    }
-
-    // Add layer items.
-    for (int i = 0; i < 16; ++i)
-    {
-        QString layerText = QString("Layer #%1").arg(i);
-
-        QAction* a = menuSetLayer.addAction(layerText);
-        a->setData(eMI_SetAnimationLayerBase + i);
-        a->setCheckable(true);
-        a->setChecked(pTrack->GetAnimationLayerIndex() == i);
-        a->setEnabled(!stl::find(layersInUse, i));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::CustomizeTrackColor(CTrackViewTrack* pTrack)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    AZ::Color defaultColor;
-    if (pTrack->HasCustomColor())
-    {
-        ColorB customColor = pTrack->GetCustomColor();
-        defaultColor = AZ::Color(customColor.r, customColor.g, customColor.b, customColor.a);
-    }
-    const AZ::Color color = AzQtComponents::ColorPicker::getColor(AzQtComponents::ColorPicker::Configuration::RGB, defaultColor, tr("Select Color"));
-    if (color != defaultColor)
-    {
-        AzToolsFramework::ScopedUndoBatch undoBatch("Customize Track Color");
-
-        pTrack->SetCustomColor(ColorB(color.GetR8(), color.GetG8(), color.GetB8()));
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-        UpdateDopeSheet();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::ClearCustomTrackColor(CTrackViewTrack* pTrack)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!sequence)
-    {
-        return;
-    }
-
-    AzToolsFramework::ScopedUndoBatch undoBatch("Clear Custom Track Color");
-    
-    pTrack->ClearCustomColor();
-    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-    UpdateDopeSheet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::paintEvent(QPaintEvent* event)
-{
-    QWidget::paintEvent(event);
-    UpdateDopeSheet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::GetNodeRecord(const CTrackViewNode* pNode) const
-{
-    auto findIter = m_nodeToRecordMap.find(pNode);
-    if (findIter == m_nodeToRecordMap.end())
-    {
-        return nullptr;
-    }
-
-    assert (findIter->second->GetNode() == pNode);
-    return findIter->second;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::UpdateDopeSheet()
-{
-    UpdateRecordVisibility();
-
-    if (m_pDopeSheet)
-    {
-        m_pDopeSheet->update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Workaround: CXTPReportRecord::IsVisible is
-// unreliable after the last visible element
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::UpdateRecordVisibility()
-{
-    // Mark all records invisible
-    for (auto iter = m_nodeToRecordMap.begin(); iter != m_nodeToRecordMap.end(); ++iter)
-    {
-        iter->second->m_bVisible = ui->treeWidget->visualItemRect(iter->second).isValid();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnNodeChanged(CTrackViewNode* pNode, ITrackViewSequenceListener::ENodeChangeType type)
-{
-    if (pNode->GetSequence() != GetIEditor()->GetAnimation()->GetSequence())
-    {
-        return;
-    }
-
-    if (!m_bIgnoreNotifications)
-    {
-        CTrackViewNode* pParentNode = pNode->GetParentNode();
-
-        CRecord* pNodeRecord = GetNodeRecord(pNode);
-        CRecord* pParentNodeRecord = pParentNode ? GetNodeRecord(pParentNode) : nullptr;
-
-        float storedScrollPosition = SaveVerticalScrollPos();
-
-        switch (type)
-        {
-        case ITrackViewSequenceListener::eNodeChangeType_Added:
-        case ITrackViewSequenceListener::eNodeChangeType_Unhidden:
-            if (pParentNodeRecord)
-            {
-                AddNodeRecord(pParentNodeRecord, pNode);
-            }
-            break;
-        case ITrackViewSequenceListener::eNodeChangeType_Removed:
-        case ITrackViewSequenceListener::eNodeChangeType_Hidden:
-            if (pNodeRecord)
-            {
-                EraseNodeRecordRec(pNode);
-                delete pNodeRecord;
-            }
-            break;
-        case ITrackViewSequenceListener::eNodeChangeType_Expanded:
-            if (pNodeRecord)
-            {
-                pNodeRecord->setExpanded(true);
-            }
-            break;
-        case ITrackViewSequenceListener::eNodeChangeType_Collapsed:
-            if (pNodeRecord)
-            {
-                pNodeRecord->setExpanded(false);
-            }
-            break;
-        case ITrackViewSequenceListener::eNodeChangeType_Disabled:
-        case ITrackViewSequenceListener::eNodeChangeType_Enabled:
-        case ITrackViewSequenceListener::eNodeChangeType_Muted:
-        case ITrackViewSequenceListener::eNodeChangeType_Unmuted:
-        case ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged:
-            if (pNodeRecord)
-            {
-                UpdateNodeRecord(pNodeRecord);
-            }
-        }
-
-        switch (type)
-        {
-        case ITrackViewSequenceListener::eNodeChangeType_Added:
-        case ITrackViewSequenceListener::eNodeChangeType_Unhidden:
-        case ITrackViewSequenceListener::eNodeChangeType_Removed:
-        case ITrackViewSequenceListener::eNodeChangeType_Hidden:
-        case ITrackViewSequenceListener::eNodeChangeType_Expanded:
-        case ITrackViewSequenceListener::eNodeChangeType_Collapsed:
-            update();
-            RestoreVerticalScrollPos(storedScrollPosition);
-            break;
-        case eNodeChangeType_SetAsActiveDirector:
-            update();
-            break;
-        }
-    }
-    else
-    {
-        m_bNeedReload = true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnNodeRenamed(CTrackViewNode* pNode, [[maybe_unused]] const char* pOldName)
-{
-    if (!m_bIgnoreNotifications)
-    {
-        CRecord* pNodeRecord = GetNodeRecord(pNode);
-        pNodeRecord->setText(0, pNode->GetName());
-
-        update();
-    }
-    else
-    {
-        m_bNeedReload = true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::BeginUndoTransaction()
-{
-    m_bNeedReload = false;
-    m_bIgnoreNotifications = true;
-    m_storedScrollPosition = SaveVerticalScrollPos();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::EndUndoTransaction()
-{
-    m_bIgnoreNotifications = false;
-
-    if (m_bNeedReload)
-    {
-        Reload();
-        RestoreVerticalScrollPos(m_storedScrollPosition);
-        m_bNeedReload = false;
-    }
-
-    UpdateDopeSheet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-QIcon CTrackViewNodesCtrl::GetIconForTrack(const CTrackViewTrack* pTrack)
-{
-    int r = GetIconIndexForTrack(pTrack);
-    return m_imageList.contains(r) ? m_imageList[r] : QIcon();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnKeysChanged(CTrackViewSequence* sequence)
-{
-    if (!m_bIgnoreNotifications && sequence && sequence == GetIEditor()->GetAnimation()->GetSequence())
-    {
-        UpdateDopeSheet();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnKeySelectionChanged(CTrackViewSequence* sequence)
-{
-    OnKeysChanged(sequence);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::OnNodeSelectionChanged(CTrackViewSequence* sequence)
-{
-    if (m_bSelectionChanging)
-    {
-        return;
-    }
-
-    if (!m_bIgnoreNotifications && sequence && sequence == GetIEditor()->GetAnimation()->GetSequence())
-    {
-        UpdateDopeSheet();
-
-        CTrackViewAnimNodeBundle animNodes = sequence->GetAllAnimNodes();
-        const uint numNodes = animNodes.GetCount();
-        for (uint i = 0; i < numNodes; ++i)
-        {
-            CTrackViewAnimNode* pNode = animNodes.GetNode(i);
-            if (pNode->IsSelected())
-            {
-                SelectRow(pNode, false, false);
-            }
-            else
-            {
-                DeselectRow(pNode);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::SelectRow(CTrackViewNode* pNode, const bool bEnsureVisible, const bool bDeselectOtherRows)
-{
-    std::unordered_map<const CTrackViewNode*, CRecord*>::const_iterator it = m_nodeToRecordMap.find(pNode);
-    if (it != m_nodeToRecordMap.end())
-    {
-        if (bDeselectOtherRows)
-        {
-            ui->treeWidget->selectionModel()->clear();
-        }
-        (*it).second->setSelected(true);
-        if (bEnsureVisible)
-        {
-            ui->treeWidget->scrollToItem((*it).second);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::DeselectRow(CTrackViewNode* pNode)
-{
-    std::unordered_map<const CTrackViewNode*, CRecord*>::const_iterator it = m_nodeToRecordMap.find(pNode);
-    if (it != m_nodeToRecordMap.end())
-    {
-        (*it).second->setSelected(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewNodesCtrl::EraseNodeRecordRec(CTrackViewNode* pNode)
-{
-    m_nodeToRecordMap.erase(pNode);
-
-    const unsigned int numChildren = pNode->GetChildCount();
-    for (unsigned int i = 0; i < numChildren; ++i)
-    {
-        EraseNodeRecordRec(pNode->GetChild(i));
-    }
-}
-
-#include <TrackView/moc_TrackViewNodes.cpp>
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodes.h b/Code/Sandbox/Editor/TrackView/TrackViewNodes.h
deleted file mode 100644
index ac35ddf77c..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewNodes.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : TrackView's tree control.
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODES_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODES_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/Component/Entity.h>
-
-#include "TrackViewNode.h"
-#include "TrackViewSequence.h"
-#include "Undo/Undo.h"
-#include "Export/ExportManager.h"
-
-#include <IMovieSystem.h>
-#include <QMap>
-#include <QTreeWidgetItem>
-
-#include <QWidget>
-#endif
-
-// forward declarations.
-class CTrackViewNode;
-class CTrackViewAnimNode;
-class CTrackViewTrack;
-class CTrackViewSequence;
-class CTrackViewDopeSheetBase;
-class CTrackViewDialog;
-
-class QLineEdit;
-
-
-namespace Ui {
-    class CTrackViewNodesCtrl;
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CTrackViewNodesCtrl
-    : public QWidget
-    , public ITrackViewSequenceListener
-    , public IUndoManagerListener
-{
-    Q_OBJECT
-public:
-    class CRecord
-        : public QTreeWidgetItem
-    {
-        friend class CTrackViewNodesCtrl;
-
-    public:
-        enum Roles
-        {
-            EnableRole = Qt::UserRole + 1
-        };
-
-        CRecord(CTrackViewNode* pNode = nullptr);
-        CTrackViewNode* GetNode() const { return m_pNode; }
-        bool IsGroup() const { return m_pNode->GetChildCount() != 0; }
-        const QString GetName() const { return m_pNode->GetName(); }
-
-        // Workaround: CXTPReportRecord::IsVisible is
-        // unreliable after the last visible element
-        bool IsVisible() const { return m_bVisible; }
-
-        QRect GetRect() const { return treeWidget()->visualItemRect(this);  }
-
-    private:
-        bool m_bVisible;
-        CTrackViewNode* m_pNode;
-    };
-
-    CTrackViewNodesCtrl(QWidget* hParentWnd, CTrackViewDialog* parent = 0);
-    ~CTrackViewNodesCtrl();
-
-    void SetTrackViewDialog(CTrackViewDialog* dlg) { m_pTrackViewDialog = dlg; }
-    void OnSequenceChanged();
-
-    void SetDopeSheet(CTrackViewDopeSheetBase* keysCtrl);
-
-    void SetEditLock(bool bLock) { m_bEditLock = bLock; }
-
-    float SaveVerticalScrollPos() const;
-    void RestoreVerticalScrollPos(float fScrollPos);
-
-    CRecord* GetNodeRecord(const CTrackViewNode* pNode) const;
-
-    virtual void Reload();
-    virtual void OnFillItems();
-
-    // ITrackViewSequenceListener
-    virtual void OnNodeChanged(CTrackViewNode* pNode, ITrackViewSequenceListener::ENodeChangeType type) override;
-    virtual void OnNodeRenamed(CTrackViewNode* pNode, const char* pOldName) override;
-    virtual void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override;
-    virtual void OnKeysChanged(CTrackViewSequence* pSequence) override;
-    virtual void OnKeySelectionChanged(CTrackViewSequence* pSequence) override;
-
-    // IUndoManagerListener
-    virtual void BeginUndoTransaction() override;
-    virtual void EndUndoTransaction() override;
-
-    // Helper for dialog
-    QIcon GetIconForTrack(const CTrackViewTrack* pTrack);
-    void ShowNextResult();
-
-    void Update();
-
-protected:
-    void paintEvent(QPaintEvent* event) override;
-    void keyPressEvent(QKeyEvent* event) override;
-    bool event(QEvent* event) override;
-    bool eventFilter(QObject* o, QEvent* e) override;
-
-private slots:
-    void OnNMRclick(QPoint pos);
-    void OnItemExpanded(QTreeWidgetItem*);
-    void OnSelectionChanged();
-    void OnItemDblClick(QTreeWidgetItem* item, int);
-    void OnFilterChange(const QString& text);
-
-private:
-    void CreateFolder(CTrackViewAnimNode* pGroupNode);
-    void EditEvents();
-
-    void ImportFromFBX();
-    CTrackViewTrack* GetTrackViewTrack(const Export::EntityAnimData* pAnimData, CTrackViewTrackBundle trackBundle, const QString& nodeName);
-
-    void AddMenuSeperatorConditional(QMenu& menu, bool& bAppended);
-    void AddGroupNodeAddItems(struct SContextMenu& contextMenu, CTrackViewAnimNode* pAnimNode);
-    int ShowPopupMenuSingleSelection(struct SContextMenu& contextMenu, CTrackViewSequence* pSequence, CTrackViewNode* pNode);
-    int ShowPopupMenuMultiSelection(struct SContextMenu& contextMenu);
-    int ShowPopupMenu(QPoint point, const CRecord* pItemInfo);
-
-    bool FillAddTrackMenu(struct STrackMenuTreeNode& menuAddTrack, const CTrackViewAnimNode* pAnimNode);
-    
-    void CreateAddTrackMenuRec(QMenu& parent, const QString& name, CTrackViewAnimNode* animNode, struct STrackMenuTreeNode& node, unsigned int& currentId);
-    
-    void SetPopupMenuLock(QMenu* menu);
-    void CreateSetAnimationLayerPopupMenu(QMenu& menuSetLayer, CTrackViewTrack* pTrack) const;
-
-    int GetIconIndexForTrack(const CTrackViewTrack* pTrack) const;
-    int GetIconIndexForNode(AnimNodeType type) const;
-
-    void AddNodeRecord(CRecord* pParentRecord, CTrackViewNode* pNode);
-    CRecord* AddTrackRecord(CRecord* pParentRecord, CTrackViewTrack* pTrack);
-    CRecord* AddAnimNodeRecord(CRecord* pParentRecord, CTrackViewAnimNode* pNode);
-
-    void FillNodesRec(CRecord* pRecord, CTrackViewNode* pCurrentNode);
-
-    void EraseNodeRecordRec(CTrackViewNode* pNode);
-
-    void UpdateNodeRecord(CRecord* pRecord);
-    void UpdateTrackRecord(CRecord* pRecord, CTrackViewTrack* pTrack);
-    void UpdateAnimNodeRecord(CRecord* pRecord, CTrackViewAnimNode* pAnimNode);
-
-    void FillAutoCompletionListForFilter();
-
-    // Utility function for handling material nodes
-    // It'll return -1 if the found material isn't a multi-material.
-    static int GetMatNameAndSubMtlIndexFromName(QString& matName, const char* nodeName);
-
-    void CustomizeTrackColor(CTrackViewTrack* pTrack);
-    void ClearCustomTrackColor(CTrackViewTrack* pTrack);
-
-    // For drawing dope sheet
-    void UpdateRecordVisibility();
-
-    void UpdateDopeSheet();
-
-    int GetInsertPosition(CRecord* pParentRecord, CTrackViewNode* pNode);
-
-    void SelectRow(CTrackViewNode* pNode, const bool bEnsureVisible, const bool bDeselectOtherRows);
-    void DeselectRow(CTrackViewNode* pNode);
-
-    CTrackViewDopeSheetBase* m_pDopeSheet;
-    CTrackViewDialog* m_pTrackViewDialog;
-
-    typedef std::vector<CRecord*> ItemInfos;
-    ItemInfos m_itemInfos;
-
-    bool m_bSelectionChanging;
-    bool m_bEditLock;
-
-    QCursor m_arrowCursor;
-    QCursor m_noIcon;
-
-    UINT m_currentMatchIndex;
-    UINT m_matchCount;
-
-    bool m_bIgnoreNotifications;
-    bool m_bNeedReload;
-    float m_storedScrollPosition;
-
-    // Drag and drop
-    CTrackViewAnimNodeBundle m_draggedNodes;
-    CTrackViewAnimNode* m_pDragTarget;
-
-    std::unordered_map<unsigned int, CAnimParamType> m_menuParamTypeMap;
-    std::unordered_map<const CTrackViewNode*, CRecord*> m_nodeToRecordMap;
-
-    QMap<int, QIcon> m_imageList;
-    QScopedPointer<Ui::CTrackViewNodesCtrl> ui;
-
-    //! Cached map of component icons.
-    //! Key: Component's RTTI type
-    //! Value: Icon for this component
-    AZStd::unordered_map<AZ::Uuid, QIcon> m_componentTypeToIconMap;
-};
-
-
-typedef CTrackViewNode* CTrackViewNodePtr;
-Q_DECLARE_METATYPE(CTrackViewNodePtr);
-QDataStream& operator<<(QDataStream& out, const CTrackViewNodePtr& obj);
-QDataStream& operator>>(QDataStream& in, CTrackViewNodePtr& obj);
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWNODES_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.cpp b/Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.cpp
deleted file mode 100644
index af8c0f2186..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.cpp
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewPythonFuncs.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-#include <CryCommon/Maestro/Types/AnimValueType.h>
-
-// Editor
-#include "AnimationContext.h"
-
-
-namespace
-{
-    CTrackViewSequence* GetSequenceByEntityIdOrName(const CTrackViewSequenceManager* pSequenceManager, const char* entityIdOrName)
-    {
-        // the "name" string will be an AZ::EntityId in string form if this was called from
-        // TrackView code. But for backward compatibility we also support a sequence name.
-        bool isNameAValidU64 = false;
-        QString entityIdString = entityIdOrName;
-        AZ::u64 nameAsU64 = entityIdString.toULongLong(&isNameAValidU64);
-
-        CTrackViewSequence* pSequence = nullptr;
-        if (isNameAValidU64)
-        {
-            // "name" string was a valid u64 represented as a string. Use as an entity Id to search for sequence.
-            pSequence = pSequenceManager->GetSequenceByEntityId(AZ::EntityId(nameAsU64));
-        }
-
-        if (!pSequence)
-        {
-            // name passed in could not find a sequence by using it as an EntityId. Use it as a
-            // sequence name for backward compatibility
-            pSequence = pSequenceManager->GetSequenceByName(entityIdOrName);
-        }
-
-        return pSequence;
-    }
-
-}
-
-namespace
-{
-    //////////////////////////////////////////////////////////////////////////
-    // Misc
-    //////////////////////////////////////////////////////////////////////////
-    void PyTrackViewSetRecording(bool bRecording)
-    {
-        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-        if (pAnimationContext)
-        {
-            pAnimationContext->SetRecording(bRecording);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Sequences
-    //////////////////////////////////////////////////////////////////////////
-    void PyTrackViewNewSequence(const char* name, int sequenceType)
-    {
-        CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-
-        CTrackViewSequence* pSequence = pSequenceManager->GetSequenceByName(name);
-        if (pSequence)
-        {
-            throw std::runtime_error("A sequence with this name already exists");
-        }
-
-        CUndo undo("Create TrackView sequence");
-        pSequenceManager->CreateSequence(name, static_cast<SequenceType>(sequenceType));
-    }
-
-    void PyTrackViewDeleteSequence(const char* name)
-    {
-        CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* pSequence = GetSequenceByEntityIdOrName(pSequenceManager, name);
-        if (pSequence)
-        {
-            pSequenceManager->DeleteSequence(pSequence);
-            return;
-        }
-
-        throw std::runtime_error("Could not find sequence");
-    }
-
-    void PyTrackViewSetCurrentSequence(const char* name)
-    {
-        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* sequence = GetSequenceByEntityIdOrName(sequenceManager, name);
-        CAnimationContext* animationContext = GetIEditor()->GetAnimation();
-        bool force = false;
-        bool noNotify = false;
-        bool user = true;
-        animationContext->SetSequence(sequence, force, noNotify, user);
-    }
-
-    int PyTrackViewGetNumSequences()
-    {
-        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        AZ_TracePrintf("", "PyTrackViewGetNumSequences called")
-        return pSequenceManager->GetCount();
-    }
-
-    AZStd::string PyTrackViewGetSequenceName(unsigned int index)
-    {
-        if (index < PyTrackViewGetNumSequences())
-        {
-            const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-            return pSequenceManager->GetSequenceByIndex(index)->GetName();
-        }
-
-        throw std::runtime_error("Could not find sequence");
-    }
-
-    Range PyTrackViewGetSequenceTimeRange(const char* name)
-    {
-        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* pSequence = GetSequenceByEntityIdOrName(pSequenceManager, name);
-        if (!pSequence)
-        {
-            throw std::runtime_error("A sequence with this name doesn't exists");
-        }
-
-        return pSequence->GetTimeRange();
-    }
-
-    void PyTrackViewSetSequenceTimeRange(const char* name, float start, float end)
-    {
-        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* pSequence = GetSequenceByEntityIdOrName(pSequenceManager, name);
-        if (!pSequence)
-        {
-            throw std::runtime_error("A sequence with this name doesn't exists");
-        }
-
-        CUndo undo("Set sequence time range");
-        pSequence->SetTimeRange(Range(start, end));
-        pSequence->MarkAsModified();
-    }
-
-    void PyTrackViewPlaySequence()
-    {
-        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-        if (pAnimationContext->IsPlaying())
-        {
-            throw std::runtime_error("A sequence is already playing");
-        }
-
-        pAnimationContext->SetPlaying(true);
-    }
-
-    void PyTrackViewStopSequence()
-    {
-        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-        if (!pAnimationContext->IsPlaying())
-        {
-            throw std::runtime_error("No sequence is playing");
-        }
-
-        pAnimationContext->SetPlaying(false);
-    }
-
-    void PyTrackViewSetSequenceTime(float time)
-    {
-        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-        pAnimationContext->SetTime(time);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Nodes
-    //////////////////////////////////////////////////////////////////////////
-    void PyTrackViewAddNode(const char* nodeTypeString, const char* nodeName)
-    {
-        CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-        if (!pSequence)
-        {
-            throw std::runtime_error("No sequence is active");
-        }
-
-        const AnimNodeType nodeType = GetIEditor()->GetMovieSystem()->GetNodeTypeFromString(nodeTypeString);
-        if (nodeType == AnimNodeType::Invalid)
-        {
-            throw std::runtime_error("Invalid node type");
-        }
-
-        CUndo undo("Create anim node");
-        pSequence->CreateSubNode(nodeName, nodeType);
-    }
-
-    void PyTrackViewAddSelectedEntities()
-    {
-        CAnimationContext* animationContext = GetIEditor()->GetAnimation();
-        CTrackViewSequence* sequence = animationContext->GetSequence();
-        if (!sequence)
-        {
-            throw std::runtime_error("No sequence is active");
-        }
-
-        AZStd::vector<AnimParamType> tracks = {
-            AnimParamType::Position,
-            AnimParamType::Rotation
-        };
-
-        AzToolsFramework::ScopedUndoBatch undoBatch("Add entities to Track View");
-        sequence->AddSelectedEntities(tracks);
-        sequence->BindToEditorObjects();
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-    }
-
-    void PyTrackViewAddLayerNode()
-    {
-        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-        CTrackViewSequence* pSequence = pAnimationContext->GetSequence();
-        if (!pSequence)
-        {
-            throw std::runtime_error("No sequence is active");
-        }
-
-        CUndo undo("Add current layer to TrackView");
-        pSequence->AddCurrentLayer();
-    }
-
-    CTrackViewAnimNode* GetNodeFromName(const char* nodeName, const char* parentDirectorName)
-    {
-        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-        CTrackViewSequence* pSequence = pAnimationContext->GetSequence();
-        if (!pSequence)
-        {
-            throw std::runtime_error("No sequence is active");
-        }
-
-        CTrackViewAnimNode* pParentDirector = pSequence;
-        if (strlen(parentDirectorName) > 0)
-        {
-            CTrackViewAnimNodeBundle foundNodes = pSequence->GetAnimNodesByName(parentDirectorName);
-            if (foundNodes.GetCount() == 0 || foundNodes.GetNode(0)->GetType() != AnimNodeType::Director)
-            {
-                throw std::runtime_error("Director node not found");
-            }
-
-            pParentDirector = foundNodes.GetNode(0);
-        }
-
-        CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAnimNodesByName(nodeName);
-        return (foundNodes.GetCount() > 0) ? foundNodes.GetNode(0) : nullptr;
-    }
-
-    void PyTrackViewDeleteNode(AZStd::string_view nodeName, AZStd::string_view parentDirectorName)
-    {
-        CTrackViewAnimNode* pNode = GetNodeFromName(nodeName.data(), parentDirectorName.data());
-        if (pNode == nullptr)
-        {
-            throw std::runtime_error("Couldn't find node");
-        }
-
-        CTrackViewAnimNode* pParentNode = static_cast<CTrackViewAnimNode*>(pNode->GetParentNode());
-
-        CUndo undo("Delete TrackView Node");
-        pParentNode->RemoveSubNode(pNode);
-    }
-
-    void PyTrackViewAddTrack(const char* paramName, const char* nodeName, const char* parentDirectorName)
-    {
-        CTrackViewAnimNode* pNode = GetNodeFromName(nodeName, parentDirectorName);
-        if (!pNode)
-        {
-            throw std::runtime_error("Couldn't find node");
-        }
-
-        // Add tracks to menu, that can be added to animation node.
-        const int paramCount = pNode->GetParamCount();
-        for (int i = 0; i < paramCount; ++i)
-        {
-            CAnimParamType paramType = pNode->GetParamType(i);
-
-            if (paramType == AnimParamType::Invalid)
-            {
-                continue;
-            }
-
-            IAnimNode::ESupportedParamFlags paramFlags = pNode->GetParamFlags(paramType);
-
-            CTrackViewTrack* pTrack = pNode->GetTrackForParameter(paramType);
-            if (!pTrack || (paramFlags & IAnimNode::eSupportedParamFlags_MultipleTracks))
-            {
-                const char* name = pNode->GetParamName(paramType);
-                if (_stricmp(name, paramName) == 0)
-                {
-                    CUndo undo("Create track");
-                    if (!pNode->CreateTrack(paramType))
-                    {
-                        undo.Cancel();
-                        throw std::runtime_error("Could not create track");
-                    }
-
-                    pNode->SetSelected(true);
-                    return;
-                }
-            }
-        }
-
-        throw std::runtime_error("Could not create track");
-    }
-
-    void PyTrackViewDeleteTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName)
-    {
-        CTrackViewAnimNode* pNode = GetNodeFromName(nodeName, parentDirectorName);
-        if (!pNode)
-        {
-            throw std::runtime_error("Couldn't find node");
-        }
-
-        const CAnimParamType paramType = GetIEditor()->GetMovieSystem()->GetParamTypeFromString(paramName);
-        CTrackViewTrack* pTrack = pNode->GetTrackForParameter(paramType, index);
-        if (!pTrack)
-        {
-            throw std::runtime_error("Could not find track");
-        }
-
-        CUndo undo("Delete TrackView track");
-        pNode->RemoveTrack(pTrack);
-    }
-
-    int PyTrackViewGetNumNodes(AZStd::string_view parentDirectorName)
-    {
-        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-        CTrackViewSequence* pSequence = pAnimationContext->GetSequence();
-        if (!pSequence)
-        {
-            throw std::runtime_error("No sequence is active");
-        }
-
-        CTrackViewAnimNode* pParentDirector = pSequence;
-        if (!parentDirectorName.empty())
-        {
-            CTrackViewAnimNodeBundle foundNodes = pSequence->GetAnimNodesByName(parentDirectorName.data());
-            if (foundNodes.GetCount() == 0 || foundNodes.GetNode(0)->GetType() != AnimNodeType::Director)
-            {
-                throw std::runtime_error("Director node not found");
-            }
-
-            pParentDirector = foundNodes.GetNode(0);
-        }
-
-        CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAllAnimNodes();
-        return foundNodes.GetCount();
-    }
-
-    AZStd::string PyTrackViewGetNodeName(int index, AZStd::string_view parentDirectorName)
-    {
-        CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-        CTrackViewSequence* pSequence = pAnimationContext->GetSequence();
-        if (!pSequence)
-        {
-            throw std::runtime_error("No sequence is active");
-        }
-
-        CTrackViewAnimNode* pParentDirector = pSequence;
-        if (!parentDirectorName.empty())
-        {
-            CTrackViewAnimNodeBundle foundNodes = pSequence->GetAnimNodesByName(parentDirectorName.data());
-            if (foundNodes.GetCount() == 0 || foundNodes.GetNode(0)->GetType() != AnimNodeType::Director)
-            {
-                throw std::runtime_error("Director node not found");
-            }
-
-            pParentDirector = foundNodes.GetNode(0);
-        }
-
-        CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAllAnimNodes();
-        if (index < 0 || index >= foundNodes.GetCount())
-        {
-            throw std::runtime_error("Invalid node index");
-        }
-
-        return foundNodes.GetNode(index)->GetName();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Tracks
-    //////////////////////////////////////////////////////////////////////////
-    CTrackViewTrack* GetTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName)
-    {
-        CTrackViewAnimNode* pNode = GetNodeFromName(nodeName, parentDirectorName);
-        if (!pNode)
-        {
-            throw std::runtime_error("Couldn't find node");
-        }
-
-        const CAnimParamType paramType = GetIEditor()->GetMovieSystem()->GetParamTypeFromString(paramName);
-        CTrackViewTrack* pTrack = pNode->GetTrackForParameter(paramType, index);
-        if (!pTrack)
-        {
-            throw std::runtime_error("Track doesn't exist");
-        }
-
-        return pTrack;
-    }
-
-    std::set<float> GetKeyTimeSet(CTrackViewTrack* pTrack)
-    {
-        std::set<float> keyTimeSet;
-        for (uint i = 0; i < pTrack->GetKeyCount(); ++i)
-        {
-            CTrackViewKeyHandle keyHandle = pTrack->GetKey(i);
-            keyTimeSet.insert(keyHandle.GetTime());
-        }
-
-        return keyTimeSet;
-    }
-
-    int PyTrackViewGetNumTrackKeys(const char* paramName, int trackIndex, const char* nodeName, const char* parentDirectorName)
-    {
-        CTrackViewTrack* pTrack = GetTrack(paramName, trackIndex, nodeName, parentDirectorName);
-        return (int)GetKeyTimeSet(pTrack).size();
-    }
-
-    AZStd::any PyTrackViewGetInterpolatedValue(const char* paramName, int trackIndex, float time, const char* nodeName, const char* parentDirectorName)
-    {
-        CTrackViewTrack* pTrack = GetTrack(paramName, trackIndex, nodeName, parentDirectorName);
-
-        switch (pTrack->GetValueType())
-        {
-        case AnimValueType::Float:
-        case AnimValueType::DiscreteFloat:
-        {
-            float value;
-            pTrack->GetValue(time, value);
-            return AZStd::make_any<float>(value);
-        }
-        break;
-        case AnimValueType::Bool:
-        {
-            bool value;
-            pTrack->GetValue(time, value);
-            return AZStd::make_any<bool>(value);
-        }
-        break;
-        case AnimValueType::Quat:
-        {
-            Quat value;
-            pTrack->GetValue(time, value);
-            Ang3 rotation(value);
-            return AZStd::make_any<AZ::Vector3>(rotation.x, rotation.y, rotation.z);
-        }
-        case AnimValueType::Vector:
-        {
-            Vec3 value;
-            pTrack->GetValue(time, value);
-            return AZStd::make_any<AZ::Vector3>(value.x, value.y, value.z);
-        }
-        break;
-        case AnimValueType::Vector4:
-        {
-            Vec4 value;
-            pTrack->GetValue(time, value);
-            return AZStd::make_any<AZ::Vector4>(value.x, value.y, value.z, value.w);
-        }
-        break;
-        case AnimValueType::RGB:
-        {
-            Vec3 value;
-            pTrack->GetValue(time, value);
-            return AZStd::make_any<AZ::Color>(value.x, value.y, value.z, 0.0f);
-        }
-        break;
-        default:
-            throw std::runtime_error("Unsupported key type");
-        }
-    }
-
-    AZStd::any PyTrackViewGetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName)
-    {
-        CTrackViewTrack* pTrack = GetTrack(paramName, trackIndex, nodeName, parentDirectorName);
-
-        std::set<float> keyTimeSet = GetKeyTimeSet(pTrack);
-        if (keyIndex < 0 || keyIndex >= keyTimeSet.size())
-        {
-            throw std::runtime_error("Invalid key index");
-        }
-
-        auto keyTimeIter = keyTimeSet.begin();
-        std::advance(keyTimeIter, keyIndex);
-        const float keyTime = *keyTimeIter;
-
-        return PyTrackViewGetInterpolatedValue(paramName, trackIndex, keyTime, nodeName, parentDirectorName);
-    }
-}
-
-
-namespace AzToolsFramework
-{
-    void TrackViewComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->EBus<EditorLayerTrackViewRequestBus>("EditorLayerTrackViewRequestBus")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                ->Attribute(AZ::Script::Attributes::Module, "track_view")
-                ->Event("AddNode", &EditorLayerTrackViewRequestBus::Events::AddNode)
-                ->Event("AddTrack", &EditorLayerTrackViewRequestBus::Events::AddTrack)
-                ->Event("AddLayerNode", &EditorLayerTrackViewRequestBus::Events::AddLayerNode)
-                ->Event("AddSelectedEntities", &EditorLayerTrackViewRequestBus::Events::AddSelectedEntities)
-                ->Event("DeleteNode", &EditorLayerTrackViewRequestBus::Events::DeleteNode)
-                ->Event("DeleteTrack", &EditorLayerTrackViewRequestBus::Events::DeleteTrack)
-                ->Event("DeleteSequence", &EditorLayerTrackViewRequestBus::Events::DeleteSequence)
-                ->Event("GetInterpolatedValue", &EditorLayerTrackViewRequestBus::Events::GetInterpolatedValue)
-                ->Event("GetKeyValue", &EditorLayerTrackViewRequestBus::Events::GetKeyValue)
-                ->Event("GetNodeName", &EditorLayerTrackViewRequestBus::Events::GetNodeName)
-                ->Event("GetNumNodes", &EditorLayerTrackViewRequestBus::Events::GetNumNodes)
-                ->Event("GetNumSequences", &EditorLayerTrackViewRequestBus::Events::GetNumSequences)
-                ->Event("GetNumTrackKeys", &EditorLayerTrackViewRequestBus::Events::GetNumTrackKeys)
-                ->Event("GetSequenceName", &EditorLayerTrackViewRequestBus::Events::GetSequenceName)
-                ->Event("GetSequenceTimeRange", &EditorLayerTrackViewRequestBus::Events::GetSequenceTimeRange)
-                ->Event("NewSequence", &EditorLayerTrackViewRequestBus::Events::NewSequence)
-                ->Event("PlaySequence", &EditorLayerTrackViewRequestBus::Events::PlaySequence)
-                ->Event("SetCurrentSequence", &EditorLayerTrackViewRequestBus::Events::SetCurrentSequence)
-                ->Event("SetRecording", &EditorLayerTrackViewRequestBus::Events::SetRecording)
-                ->Event("SetSequenceTimeRange", &EditorLayerTrackViewRequestBus::Events::SetSequenceTimeRange)
-                ->Event("SetTime", &EditorLayerTrackViewRequestBus::Events::SetSequenceTime)
-                ->Event("StopSequence", &EditorLayerTrackViewRequestBus::Events::StopSequence)
-                ;
-        }
-    }
-
-    void TrackViewComponent::Activate()
-    {
-        EditorLayerTrackViewRequestBus::Handler::BusConnect(GetEntityId());
-    }
-
-    void TrackViewComponent::Deactivate()
-    {
-        EditorLayerTrackViewRequestBus::Handler::BusDisconnect();
-    }
-
-    int TrackViewComponent::GetNumSequences()
-    {
-        return PyTrackViewGetNumSequences();
-    }
-
-    void TrackViewComponent::NewSequence(const char* name, int sequenceType)
-    {
-        return PyTrackViewNewSequence(name, sequenceType);
-    }
-
-    void TrackViewComponent::PlaySequence()
-    {
-        return PyTrackViewPlaySequence();
-    }
-
-    void TrackViewComponent::StopSequence()
-    {
-        return PyTrackViewStopSequence();
-    }
-
-    void TrackViewComponent::SetSequenceTime(float time)
-    {
-        return PyTrackViewSetSequenceTime(time);
-    }
-
-    void TrackViewComponent::AddSelectedEntities()
-    {
-        return PyTrackViewAddSelectedEntities();
-    }
-
-    void TrackViewComponent::AddLayerNode()
-    {
-        return PyTrackViewAddLayerNode();
-    }
-
-    void TrackViewComponent::AddTrack(const char* paramName, const char* nodeName, const char* parentDirectorName)
-    {
-        return PyTrackViewAddTrack(paramName, nodeName, parentDirectorName);
-    }
-
-    void TrackViewComponent::DeleteTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName)
-    {
-        return PyTrackViewDeleteTrack(paramName, index, nodeName, parentDirectorName);
-    }
-
-    int TrackViewComponent::GetNumTrackKeys(const char* paramName, int trackIndex, const char* nodeName, const char* parentDirectorName)
-    {
-        return PyTrackViewGetNumTrackKeys(paramName, trackIndex, nodeName, parentDirectorName);
-    }
-
-    void TrackViewComponent::SetRecording(bool bRecording)
-    {
-        return PyTrackViewSetRecording(bRecording);
-    }
-
-    void TrackViewComponent::DeleteSequence(const char* name)
-    {
-        return PyTrackViewDeleteSequence(name);
-    }
-
-    void TrackViewComponent::SetCurrentSequence(const char* name)
-    {
-        return PyTrackViewSetCurrentSequence(name);
-    }
-
-    AZStd::string TrackViewComponent::GetSequenceName(unsigned int index)
-    {
-        return PyTrackViewGetSequenceName(index);
-    }
-
-    Range TrackViewComponent::GetSequenceTimeRange(const char* name)
-    {
-        return PyTrackViewGetSequenceTimeRange(name);
-    }
-
-    void TrackViewComponent::AddNode(const char* nodeTypeString, const char* nodeName)
-    {
-        return PyTrackViewAddNode(nodeTypeString, nodeName);
-    }
-
-    void TrackViewComponent::DeleteNode(AZStd::string_view nodeName, AZStd::string_view parentDirectorName)
-    {
-        return PyTrackViewDeleteNode(nodeName, parentDirectorName);
-    }
-
-    int TrackViewComponent::GetNumNodes(AZStd::string_view parentDirectorName)
-    {
-        return PyTrackViewGetNumNodes(parentDirectorName);
-    }
-
-    AZStd::string TrackViewComponent::GetNodeName(int index, AZStd::string_view parentDirectorName)
-    {
-        return PyTrackViewGetNodeName(index, parentDirectorName);
-    }
-
-    AZStd::any TrackViewComponent::GetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName)
-    {
-        return PyTrackViewGetKeyValue(paramName, trackIndex, keyIndex, nodeName, parentDirectorName);
-    }
-
-    AZStd::any TrackViewComponent::GetInterpolatedValue(const char* paramName, int trackIndex, float time, const char* nodeName, const char* parentDirectorName)
-    {
-        return PyTrackViewGetInterpolatedValue(paramName, trackIndex, time, nodeName, parentDirectorName);
-    }
-
-    void TrackViewComponent::SetSequenceTimeRange(const char* name, float start, float end)
-    {
-        return PyTrackViewSetSequenceTimeRange(name, start, end);
-    }
-}
-
-namespace AzToolsFramework
-{
-    void TrackViewFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            behaviorContext->Class<Range>("CryRange")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                ->Attribute(AZ::Script::Attributes::Module, "legacy.trackview")
-                ->Property("start", BehaviorValueProperty(&Range::start))
-                ->Property("end", BehaviorValueProperty(&Range::end))
-                ;
-
-            // this will put these methods into the 'azlmbr.legacy.trackview' module
-            auto addLegacyTrackview = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/TrackView")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.trackview");
-            };
-            addLegacyTrackview(behaviorContext->Method("set_recording", PyTrackViewSetRecording, nullptr, "Activates/deactivates TrackView recording mode."));
-
-            addLegacyTrackview(behaviorContext->Method("new_sequence", PyTrackViewNewSequence, nullptr, "Creates a new sequence of the given type (0=Object Entity Sequence (Legacy), 1=Component Entity Sequence (PREVIEW)) with the given name."));
-            addLegacyTrackview(behaviorContext->Method("delete_sequence", PyTrackViewDeleteSequence, nullptr, "Deletes the specified sequence."));
-            addLegacyTrackview(behaviorContext->Method("set_current_sequence", PyTrackViewSetCurrentSequence, nullptr, "Sets the specified sequence as a current one in TrackView."));
-            addLegacyTrackview(behaviorContext->Method("get_num_sequences", PyTrackViewGetNumSequences, nullptr, "Gets the number of sequences."));
-            addLegacyTrackview(behaviorContext->Method("get_sequence_name", PyTrackViewGetSequenceName, nullptr, "Gets the name of a sequence by its index."));
-
-            addLegacyTrackview(behaviorContext->Method("get_sequence_time_range", PyTrackViewGetSequenceTimeRange, nullptr, "Gets the time range of a sequence as a pair."));
-
-            addLegacyTrackview(behaviorContext->Method("set_sequence_time_range", PyTrackViewSetSequenceTimeRange, nullptr, "Sets the time range of a sequence."));
-            addLegacyTrackview(behaviorContext->Method("play_sequence", PyTrackViewPlaySequence, nullptr, "Plays the current sequence in TrackView."));
-            addLegacyTrackview(behaviorContext->Method("stop_sequence", PyTrackViewStopSequence, nullptr, "Stops any sequence currently playing in TrackView."));
-            addLegacyTrackview(behaviorContext->Method("set_time", PyTrackViewSetSequenceTime, nullptr, "Sets the time of the sequence currently playing in TrackView."));
-
-            addLegacyTrackview(behaviorContext->Method("add_node", PyTrackViewAddNode, nullptr, "Adds a new node with the given type & name to the current sequence."));
-            addLegacyTrackview(behaviorContext->Method("add_selected_entities", PyTrackViewAddSelectedEntities, nullptr, "Adds an entity node(s) from viewport selection to the current sequence."));
-            addLegacyTrackview(behaviorContext->Method("add_layer_node", PyTrackViewAddLayerNode, nullptr, "Adds a layer node from the current layer to the current sequence."));
-            addLegacyTrackview(behaviorContext->Method("delete_node", PyTrackViewDeleteNode, nullptr, "Deletes the specified node from the current sequence."));
-            addLegacyTrackview(behaviorContext->Method("add_track", PyTrackViewAddTrack, nullptr, "Adds a track of the given parameter ID to the node."));
-            addLegacyTrackview(behaviorContext->Method("delete_track", PyTrackViewDeleteTrack, nullptr, "Deletes a track of the given parameter ID (in the given index in case of a multi-track) from the node."));
-            addLegacyTrackview(behaviorContext->Method("get_num_nodes", PyTrackViewGetNumNodes, nullptr, "Gets the number of nodes."));
-            addLegacyTrackview(behaviorContext->Method("get_node_name", PyTrackViewGetNodeName, nullptr, "Gets the name of a sequence by its index."));
-
-            addLegacyTrackview(behaviorContext->Method("get_num_track_keys", PyTrackViewGetNumTrackKeys, nullptr, "Gets number of keys of the specified track."));
-
-            addLegacyTrackview(behaviorContext->Method("get_key_value", PyTrackViewGetKeyValue, nullptr, "Gets the value of the specified key."));
-            addLegacyTrackview(behaviorContext->Method("get_interpolated_value", PyTrackViewGetInterpolatedValue, nullptr, "Gets the interpolated value of a track at the specified time."));
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.h b/Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.h
deleted file mode 100644
index e69e562e56..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <Include/SandboxAPI.h>
-#include "EditorTrackViewEventsBus.h"
-
-namespace AzToolsFramework
-{
-    //! A legacy component to reflect scriptable commands for the Editor
-    class TrackViewFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(TrackViewFuncsHandler, "{5315678D-2951-4CF6-A9DC-CE21CD23C9C9}")
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-    //! Component to access the TrackView
-    AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    class SANDBOX_API TrackViewComponent final
-        : public AZ::Component
-        , public EditorLayerTrackViewRequestBus::Handler
-    {
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-    public:
-        AZ_COMPONENT(TrackViewComponent, "{3CF943CC-6F10-4B19-88FC-CFB697558FFD}")
-
-        TrackViewComponent() = default;
-        ~TrackViewComponent() override = default;
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        // Component...
-        void Activate() override;
-        void Deactivate() override;
-
-        int GetNumSequences() override;
-
-        void NewSequence(const char* name, int sequenceType) override;
-
-        void PlaySequence() override;
-
-        void StopSequence() override;
-
-        void SetSequenceTime(float time) override;
-
-        void AddSelectedEntities() override;
-
-        void AddLayerNode() override;
-
-        void AddTrack(const char* paramName, const char* nodeName, const char* parentDirectorName) override;
-
-        void DeleteTrack(const char* paramName, uint32 index, const char* nodeName, const char* parentDirectorName) override;
-
-        int GetNumTrackKeys(const char* paramName, int trackIndex, const char* nodeName, const char* parentDirectorName) override;
-
-        void SetRecording(bool bRecording) override;
-
-        void DeleteSequence(const char* name) override;
-
-        void SetCurrentSequence(const char* name) override;
-
-        AZStd::string GetSequenceName(unsigned int index) override;
-
-        TRange<float> GetSequenceTimeRange(const char* name) override;
-
-        void AddNode(const char* nodeTypeString, const char* nodeName) override;
-
-        void DeleteNode(AZStd::string_view nodeName, AZStd::string_view parentDirectorName) override;
-
-        int GetNumNodes(AZStd::string_view parentDirectorName) override;
-
-        AZStd::string GetNodeName(int index, AZStd::string_view parentDirectorName) override;
-
-        AZStd::any GetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName) override;
-
-        AZStd::any GetInterpolatedValue(const char* paramName, int trackIndex, float time, const char* nodeName, const char* parentDirectorName) override;
-
-        void SetSequenceTimeRange(const char* name, float start, float end) override;
-
-    };
-
-} // namespace AzToolsFramework
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequence.cpp b/Code/Sandbox/Editor/TrackView/TrackViewSequence.cpp
deleted file mode 100644
index ff2b35d6fa..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewSequence.cpp
+++ /dev/null
@@ -1,1584 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewSequence.h"
-
-// Qt
-#include <QMessageBox>
-
-// AzCore
-#include <AzCore/std/sort.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimValueType.h>
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
-#include <CryCommon/MathConversion.h>
-
-// Editor
-#include "AnimationContext.h"
-#include "Clipboard.h"
-#include "TrackViewSequenceManager.h"
-#include "TrackViewNodeFactories.h"
-#include "Include/IObjectManager.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewSequence::CTrackViewSequence(IAnimSequence* pSequence)
-    : CTrackViewAnimNode(pSequence, nullptr, nullptr)
-    , m_pAnimSequence(pSequence)
-{
-    AZ_Assert(m_pAnimSequence, "Expected valid m_pAnimSequence");
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewSequence::CTrackViewSequence(AZStd::intrusive_ptr<IAnimSequence>& sequence)
-    : CTrackViewAnimNode(sequence.get(), nullptr, nullptr)
-    , m_pAnimSequence(sequence)
-{
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewSequence::~CTrackViewSequence()
-{
-    GetIEditor()->GetSequenceManager()->RemoveListener(this);
-    GetIEditor()->GetUndoManager()->RemoveListener(this);       // For safety. Should be done by OnRemoveSequence callback
-
-    // For safety, disconnect to any buses we may have been listening on for record mode
-    if (m_pAnimSequence)
-    {
-        // disconnect from all EBuses for notification of changes for all AZ::Entities in our sequence
-        for (int i = m_pAnimSequence->GetNodeCount(); --i >= 0;)
-        {
-            IAnimNode* animNode = m_pAnimSequence->GetNode(i);
-            if (animNode->GetType() == AnimNodeType::AzEntity)
-            {
-                Maestro::EditorSequenceComponentRequestBus::Event(m_pAnimSequence->GetSequenceEntityId(), &Maestro::EditorSequenceComponentRequestBus::Events::RemoveEntityToAnimate, animNode->GetAzEntityId());
-                ConnectToBusesForRecording(animNode->GetAzEntityId(), false);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::Load()
-{
-    m_childNodes.clear();
-
-    const int nodeCount = m_pAnimSequence->GetNodeCount();
-    for (int i = 0; i < nodeCount; ++i)
-    {
-        IAnimNode* node = m_pAnimSequence->GetNode(i);
-
-        // Only add top level nodes to sequence
-        if (!node->GetParent())
-        {
-            CTrackViewAnimNodeFactory animNodeFactory;
-            CTrackViewAnimNode* pNewTVAnimNode = animNodeFactory.BuildAnimNode(m_pAnimSequence.get(), node, this);
-            m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNewTVAnimNode));
-        }
-    }
-
-    SortNodes();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::BindToEditorObjects()
-{
-    m_bBoundToEditorObjects = true;
-    CTrackViewAnimNode::BindToEditorObjects();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::UnBindFromEditorObjects()
-{
-    m_bBoundToEditorObjects = false;
-    CTrackViewAnimNode::UnBindFromEditorObjects();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewSequence::IsBoundToEditorObjects() const
-{
-    return m_bBoundToEditorObjects;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewSequence::FindSingleSelectedKey()
-{
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSequence)
-    {
-        return CTrackViewKeyHandle();
-    }
-
-    CTrackViewKeyBundle selectedKeys = pSequence->GetSelectedKeys();
-
-    if (selectedKeys.GetKeyCount() != 1)
-    {
-        return CTrackViewKeyHandle();
-    }
-
-    return selectedKeys.GetKey(0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnEntityComponentPropertyChanged(AZ::ComponentId changedComponentId)
-{
-    const AZ::EntityId entityId = *AzToolsFramework::PropertyEditorEntityChangeNotificationBus::GetCurrentBusId();
-   
-    // find the component node for this changeComponentId if it exists
-    for (int i = m_pAnimSequence->GetNodeCount(); --i >= 0;)
-    {
-        IAnimNode* animNode = m_pAnimSequence->GetNode(i);
-        if (animNode && animNode->GetComponentId() == changedComponentId)
-        {
-            // we have a component animNode for this changedComponentId. Process the component change
-            RecordTrackChangesForNode(static_cast<CTrackViewAnimNode*>(animNode->GetNodeOwner()));
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrack* CTrackViewSequence::FindTrackById(unsigned int trackId)
-{
-    CTrackViewTrack* result = nullptr;
-    CTrackViewTrackBundle allTracks = GetAllTracks();
-    
-    int allTracksCount = allTracks.GetCount();
-    for (int trackIndex = 0; trackIndex < allTracksCount; trackIndex++)
-    {
-        CTrackViewTrack* track = allTracks.GetTrack(trackIndex);
-        AZ_Assert(track, "Expected valid track.");
-        if (track->GetId() == trackId)
-        {
-            result = track;
-            break;
-        }
-    }
-
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////
-std::vector<bool> CTrackViewSequence::SaveKeyStates() const
-{
-    // const hack because GetAllKeys();
-    CTrackViewSequence* nonConstSequence = const_cast<CTrackViewSequence*>(this);
-    CTrackViewKeyBundle keys = nonConstSequence->GetAllKeys();
-    const unsigned int numkeys = keys.GetKeyCount();
-
-    std::vector<bool> selectionState;
-    selectionState.reserve(numkeys);
-
-    for (unsigned int i = 0; i < numkeys; ++i)
-    {
-        const CTrackViewKeyHandle& keyHandle = keys.GetKey(i);
-        selectionState.push_back(keyHandle.IsSelected());
-    }
-
-    return selectionState;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::RestoreKeyStates(const std::vector<bool>& keyStates)
-{
-    CTrackViewKeyBundle keys = GetAllKeys();
-    const unsigned int numkeys = keys.GetKeyCount();
-
-    if (keyStates.size() >= numkeys)
-    {
-        CTrackViewSequenceNotificationContext context(this);
-        for (unsigned int i = 0; i < numkeys; ++i)
-        {
-            CTrackViewKeyHandle keyHandle = keys.GetKey(i);
-            keyHandle.Select(keyStates[i]);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::ConnectToBusesForRecording(const AZ::EntityId& entityId, bool enableConnection)
-{
-    // we connect to PropertyEditorEntityChangeNotificationBus for all other changes
-    if (enableConnection)
-    {
-        AzToolsFramework::PropertyEditorEntityChangeNotificationBus::MultiHandler::BusConnect(entityId);
-    }
-    else
-    {
-        AzToolsFramework::PropertyEditorEntityChangeNotificationBus::MultiHandler::BusDisconnect(entityId);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewSequence::RecordTrackChangesForNode(CTrackViewAnimNode* componentNode)
-{
-    int retNumKeysSet = 0;
-
-    if (componentNode)
-    {
-        retNumKeysSet = componentNode->SetKeysForChangedTrackValues(GetIEditor()->GetAnimation()->GetTime());
-        if (retNumKeysSet)
-        {
-            OnKeysChanged();    // change notification for updating TrackView UI
-        }
-    }
-
-    return retNumKeysSet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::SetRecording(bool enableRecording)
-{
-    if (m_pAnimSequence)
-    {
-        // connect (or disconnect) to EBuses for notification of changes for all AZ::Entities in our sequence
-        for (int i = m_pAnimSequence->GetNodeCount(); --i >= 0;)
-        {
-            IAnimNode* animNode = m_pAnimSequence->GetNode(i);
-            if (animNode->GetType() == AnimNodeType::AzEntity)
-            {
-                ConnectToBusesForRecording(animNode->GetAzEntityId(), enableRecording);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewSequence::IsAncestorOf(CTrackViewSequence* pSequence) const
-{
-    return m_pAnimSequence->IsAncestorOf(pSequence->m_pAnimSequence.get());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::BeginCutScene(const bool bResetFx) const
-{
-    IMovieUser* pMovieUser = GetIEditor()->GetMovieSystem()->GetUser();
-
-    if (pMovieUser)
-    {
-        pMovieUser->BeginCutScene(m_pAnimSequence.get(), m_pAnimSequence->GetCutSceneFlags(false), bResetFx);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::EndCutScene() const
-{
-    IMovieUser* pMovieUser = GetIEditor()->GetMovieSystem()->GetUser();
-
-    if (pMovieUser)
-    {
-        pMovieUser->EndCutScene(m_pAnimSequence.get(), m_pAnimSequence->GetCutSceneFlags(true));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::Render(const SAnimContext& animContext)
-{
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
-            pChildAnimNode->Render(animContext);
-        }
-    }
-
-    m_pAnimSequence->Render();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::Animate(const SAnimContext& animContext)
-{
-    if (!m_pAnimSequence->IsActivated())
-    {
-        return;
-    }
-
-    m_time = animContext.time;
-
-    m_pAnimSequence->Animate(animContext);
-
-    CTrackViewSequenceNoNotificationContext context(this);
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            CTrackViewAnimNode* pChildAnimNode = (CTrackViewAnimNode*)pChildNode;
-            pChildAnimNode->Animate(animContext);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::AddListener(ITrackViewSequenceListener* pListener)
-{
-    stl::push_back_unique(m_sequenceListeners, pListener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::RemoveListener(ITrackViewSequenceListener* pListener)
-{
-    stl::find_and_erase(m_sequenceListeners, pListener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnNodeSelectionChanged()
-{
-    if (m_bNoNotifications)
-    {
-        return;
-    }
-
-    if (m_bQueueNotifications)
-    {
-        m_bNodeSelectionChanged = true;
-    }
-    else
-    {
-        CTrackViewSequenceNoNotificationContext context(this);
-        for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
-        {
-            (*iter)->OnNodeSelectionChanged(this);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::ForceAnimation()
-{
-    if (m_bNoNotifications)
-    {
-        return;
-    }
-
-    if (m_bQueueNotifications)
-    {
-        m_bForceAnimation = true;
-    }
-    else
-    {
-        if (IsActive())
-        {
-            GetIEditor()->GetAnimation()->ForceAnimation();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnKeySelectionChanged()
-{
-    if (m_bNoNotifications)
-    {
-        return;
-    }
-
-    if (m_bQueueNotifications)
-    {
-        m_bKeySelectionChanged = true;
-    }
-    else
-    {
-        CTrackViewSequenceNoNotificationContext context(this);
-        for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
-        {
-            (*iter)->OnKeySelectionChanged(this);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnKeysChanged()
-{
-    if (m_bNoNotifications)
-    {
-        return;
-    }
-
-    if (m_bQueueNotifications)
-    {
-        m_bKeysChanged = true;
-    }
-    else
-    {
-        CTrackViewSequenceNoNotificationContext context(this);
-        for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
-        {
-            (*iter)->OnKeysChanged(this);
-        }
-
-        if (IsActive())
-        {
-            GetIEditor()->GetAnimation()->ForceAnimation();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle)
-{
-    if (m_bNoNotifications)
-    {
-        return;
-    }
-
-    CTrackViewSequenceNoNotificationContext context(this);
-    for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
-    {
-        (*iter)->OnKeyAdded(addedKeyHandle);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnNodeChanged(CTrackViewNode* node, ITrackViewSequenceListener::ENodeChangeType type)
-{
-    if (node && node->GetNodeType() == eTVNT_AnimNode)
-    {
-        // Deselect the node before deleting to give listeners a chance to update things like UI state.
-        if (type == ITrackViewSequenceListener::eNodeChangeType_Removed)
-        {
-            CTrackViewSequenceNotificationContext context(this);
-
-            // Make sure to deselect any keys
-            CTrackViewKeyBundle keys = node->GetAllKeys();
-            for (int key = 0; key < keys.GetKeyCount(); key++)
-            {
-                CTrackViewKeyHandle keyHandle = keys.GetKey(key);
-                if (keyHandle.IsSelected())
-                {
-                    keyHandle.Select(false);
-                    m_bKeySelectionChanged = true;
-                }
-            }
-
-            // Cancel notification if nothing changed.
-            if (!m_bKeySelectionChanged)
-            {
-                context.Cancel();
-            }
-            
-            // deselect the node
-            if (node->IsSelected())
-            {
-                node->SetSelected(false);
-            }
-        }
-
-        CTrackViewAnimNode* pAnimNode = static_cast<CTrackViewAnimNode*>(node);
-        if (pAnimNode->IsActive())
-        {
-            switch (type)
-            {
-            case ITrackViewSequenceListener::eNodeChangeType_Added:
-                {
-                    ForceAnimation();
-                    // if we're in record mode and this is an AzEntity node, add the node to the buses we listen to for notification of changes
-                    if (pAnimNode->GetType() == AnimNodeType::AzEntity && GetIEditor()->GetAnimation()->IsRecordMode())
-                    {
-                        ConnectToBusesForRecording(pAnimNode->GetAzEntityId(), true);
-                    }
-                }
-                break;
-            case ITrackViewSequenceListener::eNodeChangeType_Removed:
-                {
-                    ForceAnimation();
-                    // if we're in record mode and this is an AzEntity node, remove the node to the buses we listen to for notification of changes
-                    if (pAnimNode->GetType() == AnimNodeType::AzEntity && GetIEditor()->GetAnimation()->IsRecordMode())
-                    {
-                        ConnectToBusesForRecording(pAnimNode->GetAzEntityId(), false);
-                    }
-                }
-                break;
-            }
-        }
-
-        switch (type)
-        {
-        case ITrackViewSequenceListener::eNodeChangeType_Enabled:
-        // Fall through
-        case ITrackViewSequenceListener::eNodeChangeType_Hidden:
-        // Fall through
-        case ITrackViewSequenceListener::eNodeChangeType_SetAsActiveDirector:
-        // Fall through
-        case ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged:
-            ForceAnimation();
-            break;
-        }
-    }
-
-    // Mark Layer with Sequence Object as dirty for non-internal or non-UI changes
-    if (type != ITrackViewSequenceListener::eNodeChangeType_NodeOwnerChanged && 
-        type != ITrackViewSequenceListener::eNodeChangeType_Selected &&
-        type != ITrackViewSequenceListener::eNodeChangeType_Deselected && 
-        type != ITrackViewSequenceListener::eNodeChangeType_Collapsed &&
-        type != ITrackViewSequenceListener::eNodeChangeType_Expanded)
-    {
-        MarkAsModified();
-    }
-
-    if (m_bNoNotifications)
-    {
-        return;
-    }
-
-    CTrackViewSequenceNoNotificationContext context(this);
-    for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
-    {
-        (*iter)->OnNodeChanged(node, type);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnNodeRenamed(CTrackViewNode* node, const char* pOldName)
-{
-    // Marks Layer with Sequence Object as dirty
-    MarkAsModified();
-
-    if (m_bNoNotifications)
-    {
-        return;
-    }
-
-    CTrackViewSequenceNoNotificationContext context(this);
-    for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
-    {
-        (*iter)->OnNodeRenamed(node, pOldName);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnSequenceSettingsChanged()
-{
-    MarkAsModified();
-
-    if (m_bNoNotifications)
-    {
-        return;
-    }
-
-    CTrackViewSequenceNoNotificationContext context(this);
-    for (auto iter = m_sequenceListeners.begin(); iter != m_sequenceListeners.end(); ++iter)
-    {
-        (*iter)->OnSequenceSettingsChanged(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::MarkAsModified()
-{
-    if (m_pAnimSequence)
-    {
-        Maestro::EditorSequenceComponentRequestBus::Event(
-            m_pAnimSequence->GetSequenceEntityId(), &Maestro::EditorSequenceComponentRequestBus::Events::MarkEntityAsDirty);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::QueueNotifications()
-{
-    m_bQueueNotifications = true;
-    ++m_selectionRecursionLevel;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::DequeueNotifications()
-{
-    AZ_Assert(m_selectionRecursionLevel > 0, "QueueNotifications should be called before DequeueNotifications()");
-    --m_selectionRecursionLevel;
-    if (m_selectionRecursionLevel == 0)
-    {
-        m_bQueueNotifications = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::SubmitPendingNotifcations(bool force)
-{
-    if (force)
-    {
-        m_selectionRecursionLevel = 1;
-    }
-
-    assert(m_selectionRecursionLevel > 0);
-    if (m_selectionRecursionLevel > 0)
-    {
-        --m_selectionRecursionLevel;
-    }
-
-    if (m_selectionRecursionLevel == 0)
-    {
-        m_bQueueNotifications = false;
-
-        if (m_bNodeSelectionChanged)
-        {
-            OnNodeSelectionChanged();
-        }
-
-        if (m_bKeysChanged)
-        {
-            OnKeysChanged();
-        }
-
-        if (m_bKeySelectionChanged)
-        {
-            OnKeySelectionChanged();
-        }
-
-        if (m_bForceAnimation)
-        {
-            ForceAnimation();
-        }
-
-        m_bForceAnimation = false;
-        m_bKeysChanged = false;
-        m_bNodeSelectionChanged = false;
-        m_bKeySelectionChanged = false;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnSequenceRemoved(CTrackViewSequence* removedSequence)
-{
-    if (removedSequence == this)
-    {
-        // submit any queued notifications before removing
-        if (m_bQueueNotifications)
-        {
-            SubmitPendingNotifcations(true);
-        }
-
-        // remove ourselves as listeners from the undo manager
-        GetIEditor()->GetUndoManager()->RemoveListener(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OnSequenceAdded(CTrackViewSequence* addedSequence)
-{
-    if (addedSequence == this)
-    {
-        GetIEditor()->GetUndoManager()->AddListener(this);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::DeleteSelectedNodes()
-{
-    if (IsSelected())
-    {
-        GetIEditor()->GetSequenceManager()->DeleteSequence(this);
-        return;
-    }
-
-    // Don't notify in the above IsSelected() case,
-    // because 'this' will become deleted and invalid.
-    CTrackViewSequenceNotificationContext context(this);
-
-    CTrackViewAnimNodeBundle selectedNodes = GetSelectedAnimNodes();
-    const unsigned int numSelectedNodes = selectedNodes.GetCount();
-
-    // Call RemoveEntityToAnimate on any nodes that are able to be removed right here. If we wait to do it inside
-    // of RemoveSubNode() it will fail because the EditorSequenceComponentRequestBus will be disconnected
-    // by the Deactivate / Activate of the sequence entity.
-    if (nullptr != m_pAnimSequence)
-    {
-        AZ::EntityId sequenceEntityId = m_pAnimSequence->GetSequenceEntityId();
-        if (sequenceEntityId.IsValid())
-        {
-            for (unsigned int i = 0; i < numSelectedNodes; ++i)
-            {
-                AZ::EntityId removedNodeId = selectedNodes.GetNode(i)->GetAzEntityId();
-                if (removedNodeId.IsValid())
-                {
-                    Maestro::EditorSequenceComponentRequestBus::Event(
-                        m_pAnimSequence->GetSequenceEntityId(), &Maestro::EditorSequenceComponentRequestBus::Events::RemoveEntityToAnimate,
-                        removedNodeId);
-                }
-            }
-        }
-    }
-
-    // Deactivate the sequence entity while we are potentially removing things from it. 
-    // We need to allow the full removal operation (node and children) to complete before 
-    // OnActivate happens on the Sequence again. If we don't deactivate the sequence entity
-    // OnActivate will get called by the entity system as components are removed.
-    // In some cases this will erroneously cause some components to be added 
-    // back to the sequence that were just deleted.
-    bool sequenceEntityWasActive = false;
-    AZ::Entity* sequenceEntity = nullptr;
-    if (GetSequenceComponentEntityId().IsValid())
-    {
-        AZ::ComponentApplicationBus::BroadcastResult(sequenceEntity, &AZ::ComponentApplicationBus::Events::FindEntity, GetSequenceComponentEntityId());
-        if (sequenceEntity != nullptr)
-        {
-            if (sequenceEntity->GetState() == AZ::Entity::State::Active)
-            {
-                sequenceEntityWasActive = true;
-                sequenceEntity->Deactivate();
-            }
-        }
-    }
-
-    CTrackViewTrackBundle selectedTracks = GetSelectedTracks();
-    const unsigned int numSelectedTracks = selectedTracks.GetCount();
-
-    for (int i = numSelectedTracks - 1; i >= 0; i--)
-    {
-        CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
-
-        // Ignore sub tracks
-        if (!pTrack->IsSubTrack())
-        {
-            pTrack->GetAnimNode()->RemoveTrack(pTrack);
-        }
-    }
-
-    // GetSelectedAnimNodes() will add parent nodes first and then children to the selected
-    // node bundle list. So iterating backwards here causes child nodes to be deleted first,
-    // and then parents. If parent nodes get deleted first, node->GetParentNode() will return
-    // a bad pointer if it happens to be one of the nodes that was deleted.
-    for (int i = numSelectedNodes - 1; i >= 0; i--)
-    {
-        CTrackViewAnimNode* node = selectedNodes.GetNode(i);
-        CTrackViewAnimNode* pParentNode = static_cast<CTrackViewAnimNode*>(node->GetParentNode());
-        pParentNode->RemoveSubNode(node);
-    }
-
-    if (sequenceEntityWasActive && sequenceEntity != nullptr)
-    {
-        sequenceEntity->Activate();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::SelectSelectedNodesInViewport()
-{
-    assert(CUndo::IsRecording());
-
-    CTrackViewAnimNodeBundle selectedNodes = GetSelectedAnimNodes();
-    const unsigned int numSelectedNodes = selectedNodes.GetCount();
-
-    AZStd::vector<AZ::EntityId> entitiesToBeSelected;
-    for (unsigned int i = 0; i < numSelectedNodes; ++i)
-    {
-        CTrackViewAnimNode* node = selectedNodes.GetNode(i);
-        ETrackViewNodeType nodeType = node->GetNodeType();
-
-        if (nodeType == eTVNT_Sequence)
-        {
-            CTrackViewSequence* seqNode = static_cast<CTrackViewSequence*>(node);
-            entitiesToBeSelected.push_back(seqNode->GetSequenceComponentEntityId());
-        }
-        else
-        {
-            // TrackView AnimNode
-            entitiesToBeSelected.push_back(node->GetAzEntityId());
-        }
-    }
-
-    // remove duplicate entities
-    AZStd::sort(entitiesToBeSelected.begin(), entitiesToBeSelected.end());
-    entitiesToBeSelected.erase(
-        AZStd::unique(entitiesToBeSelected.begin(), entitiesToBeSelected.end()), entitiesToBeSelected.end());
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, entitiesToBeSelected);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::SyncSelectedTracksToBase()
-{
-    CTrackViewAnimNodeBundle selectedNodes = GetSelectedAnimNodes();
-    bool bNothingWasSynced = true;
-
-    const unsigned int numSelectedNodes = selectedNodes.GetCount();
-    if (numSelectedNodes > 0)
-    {
-        CUndo undo("Sync selected entity nodes to base");
-
-        for (unsigned int i = 0; i < numSelectedNodes; ++i)
-        {
-            CTrackViewAnimNode* pAnimNode = selectedNodes.GetNode(i);
-            if (pAnimNode)
-            {
-                pAnimNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(pAnimNode->GetAzEntityId());
-
-                if (pAnimNode)
-                {
-                    const Vec3 position = pAnimNode->GetPos();
-                    const Quat rotation = pAnimNode->GetRotation();
-                    const Vec3 scale = pAnimNode->GetScale();
-
-                    AZ::Transform transform = AZ::Transform::CreateIdentity();
-                    transform.SetUniformScale(LYVec3ToAZVec3(scale).GetMaxElement());
-                    transform.SetRotation(LYQuaternionToAZQuaternion(rotation));
-                    transform.SetTranslation(LYVec3ToAZVec3(position));
-
-                    AZ::TransformBus::Event(
-                        pAnimNode->GetAzEntityId(), &AZ::TransformBus::Events::SetWorldTM, transform);
-
-                    bNothingWasSynced = false;
-                }
-            }
-        }
-
-        if (bNothingWasSynced)
-        {
-            undo.Cancel();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::SyncSelectedTracksFromBase()
-{
-    CTrackViewAnimNodeBundle selectedNodes = GetSelectedAnimNodes();
-    bool bNothingWasSynced = true;
-
-    const unsigned int numSelectedNodes = selectedNodes.GetCount();
-    if (numSelectedNodes > 0)
-    {
-        CUndo undo("Sync selected entity nodes from base");
-
-        for (unsigned int i = 0; i < numSelectedNodes; ++i)
-        {
-            CTrackViewAnimNode* pAnimNode = selectedNodes.GetNode(i);
-            pAnimNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(pAnimNode->GetAzEntityId());
-
-            if (pAnimNode)
-            {
-                AZ::Transform transform = AZ::Transform::CreateIdentity();
-                AZ::TransformBus::EventResult(transform, pAnimNode->GetAzEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-
-                pAnimNode->SetPos(AZVec3ToLYVec3(transform.GetTranslation()));
-                pAnimNode->SetRotation(AZQuaternionToLYQuaternion(transform.GetRotation()));
-                pAnimNode->SetScale(AZVec3ToLYVec3(AZ::Vector3(transform.GetUniformScale())));
-
-                bNothingWasSynced = false;
-            }
-        }
-
-        if (bNothingWasSynced)
-        {
-            undo.Cancel();
-        }
-    }
-
-    if (IsActive())
-    {
-        GetIEditor()->GetAnimation()->ForceAnimation();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewSequence::SetName(const char* name)
-{
-    // Check if there is already a sequence with that name
-    const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-    if (pSequenceManager->GetSequenceByName(name))
-    {
-        return false;
-    }
-
-    const char* oldName = GetName();
-    if (0 != strcmp(name, oldName))
-    {
-        m_pAnimSequence->SetName(name);
-        MarkAsModified();
-
-        AzToolsFramework::ScopedUndoBatch undoBatch("Rename Sequence");
-        GetSequence()->OnNodeRenamed(this, oldName);
-        undoBatch.MarkEntityDirty(m_pAnimSequence->GetSequenceEntityId());
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::DeleteSelectedKeys()
-{
-    CTrackViewSequenceNotificationContext context(this);
-    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
-    for (int k = (int)selectedKeys.GetKeyCount() - 1; k >= 0; --k)
-    {
-        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
-        skey.Delete();
-    }
-
-    // The selected keys are deleted, so notify the selection was just changed.
-    OnKeySelectionChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::CopyKeysToClipboard(const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks)
-{
-    XmlNodeRef copyNode = XmlHelpers::CreateXmlNode("CopyKeysNode");
-    CopyKeysToClipboard(copyNode, bOnlySelectedKeys, bOnlyFromSelectedTracks);
-
-    CClipboard clip(nullptr);
-    clip.Put(copyNode, "Track view keys");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks)
-{
-    for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-    {
-        CTrackViewNode* pChildNode = (*iter).get();
-        pChildNode->CopyKeysToClipboard(xmlNode, bOnlySelectedKeys, bOnlyFromSelectedTracks);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::PasteKeysFromClipboard(CTrackViewAnimNode* pTargetNode, CTrackViewTrack* pTargetTrack, const float timeOffset)
-{
-    assert(CUndo::IsRecording());
-
-    CClipboard clipboard(nullptr);
-    XmlNodeRef clipboardContent = clipboard.Get();
-    if (clipboardContent)
-    {
-        std::vector<TMatchedTrackLocation> matchedLocations = GetMatchedPasteLocations(clipboardContent, pTargetNode, pTargetTrack);
-
-        for (auto iter = matchedLocations.begin(); iter != matchedLocations.end(); ++iter)
-        {
-            const TMatchedTrackLocation& location = *iter;
-            CTrackViewTrack* pTrack = location.first;
-            const XmlNodeRef& trackNode = location.second;
-            pTrack->PasteKeys(trackNode, timeOffset);
-        }
-
-        OnKeysChanged();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-std::vector<CTrackViewSequence::TMatchedTrackLocation>
-CTrackViewSequence::GetMatchedPasteLocations(XmlNodeRef clipboardContent, CTrackViewAnimNode* pTargetNode, CTrackViewTrack* pTargetTrack)
-{
-    std::vector<TMatchedTrackLocation> matchedLocations;
-
-    bool bPastingSingleNode = false;
-    XmlNodeRef singleNode;
-    bool bPastingSingleTrack = false;
-    XmlNodeRef singleTrack;
-
-    // Check if the XML tree only contains one node and if so if that node only contains one track
-    for (XmlNodeRef currentNode = clipboardContent; currentNode->getChildCount() > 0; currentNode = currentNode->getChild(0))
-    {
-        bool bAllChildsAreTracks = true;
-        const unsigned int numChilds = currentNode->getChildCount();
-        for (unsigned int i = 0; i < numChilds; ++i)
-        {
-            XmlNodeRef childNode = currentNode->getChild(i);
-            if (strcmp(currentNode->getChild(0)->getTag(), "Track") != 0)
-            {
-                bAllChildsAreTracks = false;
-                break;
-            }
-        }
-
-        if (bAllChildsAreTracks)
-        {
-            bPastingSingleNode = true;
-            singleNode = currentNode;
-
-            if (currentNode->getChildCount() == 1)
-            {
-                bPastingSingleTrack = true;
-                singleTrack = currentNode->getChild(0);
-            }
-        }
-        else if (currentNode->getChildCount() != 1)
-        {
-            break;
-        }
-    }
-
-    if (bPastingSingleTrack && pTargetNode && pTargetTrack)
-    {
-        // We have a target node & track, so try to match the value type
-        int valueType = 0;
-        if (singleTrack->getAttr("valueType", valueType))
-        {
-            if (pTargetTrack->GetValueType() == static_cast<AnimValueType>(valueType))
-            {
-                matchedLocations.push_back(TMatchedTrackLocation(pTargetTrack, singleTrack));
-                return matchedLocations;
-            }
-        }
-    }
-
-    if (bPastingSingleNode && pTargetNode)
-    {
-        // Set of tracks that were already matched
-        std::vector<CTrackViewTrack*> matchedTracks;
-
-        // We have a single node to paste and have been given a target node
-        // so try to match the tracks by param type
-        const unsigned int numTracks = singleNode->getChildCount();
-        for (unsigned int i = 0; i < numTracks; ++i)
-        {
-            XmlNodeRef trackNode = singleNode->getChild(i);
-
-            // Try to match the track
-            auto matchingTracks = GetMatchingTracks(pTargetNode, trackNode);
-            for (auto iter = matchingTracks.begin(); iter != matchingTracks.end(); ++iter)
-            {
-                CTrackViewTrack* pMatchedTrack = *iter;
-                // Pick the first track that was matched *and* was not already matched
-                if (!stl::find(matchedTracks, pMatchedTrack))
-                {
-                    stl::push_back_unique(matchedTracks, pMatchedTrack);
-                    matchedLocations.push_back(TMatchedTrackLocation(pMatchedTrack, trackNode));
-                    break;
-                }
-            }
-        }
-
-        // Return if matching succeeded
-        if (matchedLocations.size() > 0)
-        {
-            return matchedLocations;
-        }
-    }
-
-    if (!bPastingSingleNode)
-    {
-        // Ok, we're pasting keys from multiple nodes, haven't been given any target
-        // or matching the targets failed. Ignore given target pointers and start
-        // a recursive match at the sequence root.
-        GetMatchedPasteLocationsRec(matchedLocations, this, clipboardContent);
-    }
-
-    return matchedLocations;
-}
-
-//////////////////////////////////////////////////////////////////////////
-std::deque<CTrackViewTrack*> CTrackViewSequence::GetMatchingTracks(CTrackViewAnimNode* pAnimNode, XmlNodeRef trackNode)
-{
-    std::deque<CTrackViewTrack*> matchingTracks;
-
-    const string trackName = trackNode->getAttr("name");
-
-    CAnimParamType animParamType;
-    animParamType.LoadFromXml(trackNode);
-
-    int valueType;
-    if (!trackNode->getAttr("valueType", valueType))
-    {
-        return matchingTracks;
-    }
-
-    CTrackViewTrackBundle tracks = pAnimNode->GetTracksByParam(animParamType);
-    const unsigned int trackCount = tracks.GetCount();
-
-    if (trackCount > 0)
-    {
-        // Search for a track with the given name and value type
-        for (unsigned int i = 0; i < trackCount; ++i)
-        {
-            CTrackViewTrack* pTrack = tracks.GetTrack(i);
-
-            if (pTrack->GetValueType() == static_cast<AnimValueType>(valueType))
-            {
-                if (pTrack->GetName() == trackName)
-                {
-                    matchingTracks.push_back(pTrack);
-                }
-            }
-        }
-
-        // Then with lower precedence add the tracks that only match the value
-        for (unsigned int i = 0; i < trackCount; ++i)
-        {
-            CTrackViewTrack* pTrack = tracks.GetTrack(i);
-
-            if (pTrack->GetValueType() == static_cast<AnimValueType>(valueType))
-            {
-                stl::push_back_unique(matchingTracks, pTrack);
-            }
-        }
-    }
-
-    return matchingTracks;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::GetMatchedPasteLocationsRec(std::vector<TMatchedTrackLocation>& locations, CTrackViewNode* pCurrentNode, XmlNodeRef clipboardNode)
-{
-    if (pCurrentNode->GetNodeType() == eTVNT_Sequence)
-    {
-        if (strcmp(clipboardNode->getTag(), "CopyKeysNode") != 0)
-        {
-            return;
-        }
-    }
-
-    const unsigned int numChildNodes = clipboardNode->getChildCount();
-    for (unsigned int nodeIndex = 0; nodeIndex < numChildNodes; ++nodeIndex)
-    {
-        XmlNodeRef xmlChildNode = clipboardNode->getChild(nodeIndex);
-        const string tagName = xmlChildNode->getTag();
-
-        if (tagName == "Node")
-        {
-            const string nodeName = xmlChildNode->getAttr("name");
-
-            int nodeType = static_cast<int>(AnimNodeType::Invalid);
-            xmlChildNode->getAttr("type", nodeType);
-
-            const unsigned int childCount = pCurrentNode->GetChildCount();
-            for (unsigned int i = 0; i < childCount; ++i)
-            {
-                CTrackViewNode* pChildNode = pCurrentNode->GetChild(i);
-
-                if (pChildNode->GetNodeType() == eTVNT_AnimNode)
-                {
-                    CTrackViewAnimNode* pAnimNode = static_cast<CTrackViewAnimNode*>(pChildNode);
-                    if (pAnimNode->GetName() == nodeName && pAnimNode->GetType() == static_cast<AnimNodeType>(nodeType))
-                    {
-                        GetMatchedPasteLocationsRec(locations, pChildNode, xmlChildNode);
-                    }
-                }
-            }
-        }
-        else if (tagName == "Track")
-        {
-            const string trackName = xmlChildNode->getAttr("name");
-
-            CAnimParamType trackParamType;
-            trackParamType.Serialize(xmlChildNode, true);
-
-            int trackParamValue = static_cast<int>(AnimValueType::Unknown);
-            xmlChildNode->getAttr("valueType", trackParamValue);
-
-            const unsigned int childCount = pCurrentNode->GetChildCount();
-            for (unsigned int i = 0; i < childCount; ++i)
-            {
-                CTrackViewNode* node = pCurrentNode->GetChild(i);
-
-                if (node->GetNodeType() == eTVNT_Track)
-                {
-                    CTrackViewTrack* pTrack = static_cast<CTrackViewTrack*>(node);
-                    if (pTrack->GetName() == trackName && pTrack->GetParameterType() == trackParamType)
-                    {
-                        locations.push_back(TMatchedTrackLocation(pTrack, xmlChildNode));
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::AdjustKeysToTimeRange(Range newTimeRange)
-{
-    // Set new time range
-    Range oldTimeRange = GetTimeRange();
-    float offset = newTimeRange.start - oldTimeRange.start;
-    // Calculate scale ratio.
-    float scale = newTimeRange.Length() / oldTimeRange.Length();
-    SetTimeRange(newTimeRange);
-
-    CTrackViewKeyBundle keyBundle = GetAllKeys();
-    const unsigned int numKeys = keyBundle.GetKeyCount();
-
-    // Do not notify listeners until all the times are set, otherwise the
-    // keys will be sorted and the indices inside the CTrackViewKeyHandle
-    // will become invalid.
-    bool notifyListeners = false;
-
-    for (unsigned int i = 0; i < numKeys; ++i)
-    {
-        CTrackViewKeyHandle keyHandle = keyBundle.GetKey(i);
-        float scaled = (keyHandle.GetTime() - oldTimeRange.start) * scale;
-        keyHandle.SetTime(offset + scaled + oldTimeRange.start, notifyListeners);
-    }
-
-    // notifyListeners was disabled in the above SetTime() calls so
-    // notify all the keys changes now.
-    OnKeysChanged();
-
-    MarkAsModified();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::SetTimeRange(Range timeRange)
-{
-    m_pAnimSequence->SetTimeRange(timeRange);
-    OnSequenceSettingsChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-Range CTrackViewSequence::GetTimeRange() const
-{
-    return m_pAnimSequence->GetTimeRange();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::SetFlags(IAnimSequence::EAnimSequenceFlags flags)
-{
-    m_pAnimSequence->SetFlags(flags);
-    OnSequenceSettingsChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-IAnimSequence::EAnimSequenceFlags CTrackViewSequence::GetFlags() const
-{
-    return (IAnimSequence::EAnimSequenceFlags)m_pAnimSequence->GetFlags();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::DeselectAllKeys()
-{
-    CTrackViewSequenceNotificationContext context(this);
-
-    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
-    for (int i = 0; i < selectedKeys.GetKeyCount(); ++i)
-    {
-        CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(i);
-        keyHandle.Select(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::OffsetSelectedKeys(const float timeOffset)
-{
-    assert(CUndo::IsRecording());
-    CTrackViewSequenceNotificationContext context(this);
-
-    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
-
-    // Set notifyListeners to false and wait until all keys 
-    // have been updated, otherwise the indexes in CTrackViewKeyHandle
-    // may become invalid after sorted with a new time.
-    bool notifyListeners = false;
-
-    for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
-    {
-        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
-        skey.Offset(timeOffset, notifyListeners);
-    }
-
-    if (selectedKeys.GetKeyCount() > 0)
-    {
-        OnKeysChanged();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewSequence::ClipTimeOffsetForOffsetting(const float timeOffset)
-{
-    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
-
-    float newTimeOffset = timeOffset;
-    for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
-    {
-        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
-        const float keyTime = skey.GetTime();
-        float newKeyTime = keyTime + timeOffset;
-
-        Range extendedTimeRange(0.0f, GetTimeRange().end);
-        extendedTimeRange.ClipValue(newKeyTime);
-
-        float offset = newKeyTime - keyTime;
-        if (fabs(offset) < fabs(newTimeOffset))
-        {
-            newTimeOffset = offset;
-        }
-    }
-
-    return newTimeOffset;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewSequence::ClipTimeOffsetForScaling(float timeOffset)
-{
-    if (timeOffset <= 0)
-    {
-        return timeOffset;
-    }
-
-    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
-
-    float newTimeOffset = timeOffset;
-    for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
-    {
-        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
-        float keyTime = skey.GetTime();
-        float newKeyTime = keyTime * timeOffset;
-        GetTimeRange().ClipValue(newKeyTime);
-        float offset = newKeyTime / keyTime;
-        if (offset < newTimeOffset)
-        {
-            newTimeOffset = offset;
-        }
-    }
-
-    return newTimeOffset;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::ScaleSelectedKeys(const float timeOffset)
-{
-    assert(CUndo::IsRecording());
-    CTrackViewSequenceNotificationContext context(this);
-
-    if (timeOffset <= 0)
-    {
-        return;
-    }
-
-    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
-
-    const CTrackViewTrack* pTrack = nullptr;
-    for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
-    {
-        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
-        if (pTrack != skey.GetTrack())
-        {
-            pTrack = skey.GetTrack();
-        }
-
-        float keyt = skey.GetTime() * timeOffset;
-        skey.SetTime(keyt);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewSequence::ClipTimeOffsetForSliding(const float timeOffset)
-{
-    CTrackViewKeyBundle keys = GetSelectedKeys();
-
-    std::set<CTrackViewTrack*> tracks;
-    std::set<CTrackViewTrack*>::const_iterator pTrackIter;
-
-    Range timeRange = GetTimeRange();
-
-    // Get the first key in the timeline among selected and
-    // also gather tracks.
-    float time0 = timeRange.end;
-    for (int k = 0; k < (int)keys.GetKeyCount(); ++k)
-    {
-        CTrackViewKeyHandle skey = keys.GetKey(k);
-        tracks.insert(skey.GetTrack());
-        float keyTime = skey.GetTime();
-        if (keyTime < time0)
-        {
-            time0 = keyTime;
-        }
-    }
-
-    // If 'bAll' is true, slide all tracks.
-    // (Otherwise, slide only selected tracks.)
-    bool bAll = Qt::AltModifier & QApplication::queryKeyboardModifiers();
-    if (bAll)
-    {
-        keys = GetKeysInTimeRange(time0, timeRange.end);
-        // Gather tracks again.
-        tracks.clear();
-        for (int k = 0; k < (int)keys.GetKeyCount(); ++k)
-        {
-            CTrackViewKeyHandle skey = keys.GetKey(k);
-            tracks.insert(skey.GetTrack());
-        }
-    }
-
-    float newTimeOffset = timeOffset;
-    for (pTrackIter = tracks.begin(); pTrackIter != tracks.end(); ++pTrackIter)
-    {
-        CTrackViewTrack* pTrack = *pTrackIter;
-        for (int i = 0; i < pTrack->GetKeyCount(); ++i)
-        {
-            const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-            const float keyTime = keyHandle.GetTime();
-            if (keyTime >= time0)
-            {
-                float newKeyTime = keyTime + timeOffset;
-                timeRange.ClipValue(newKeyTime);
-                float offset = newKeyTime - keyTime;
-                if (fabs(offset) < fabs(newTimeOffset))
-                {
-                    newTimeOffset = offset;
-                }
-            }
-        }
-    }
-
-    return newTimeOffset;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::SlideKeys(float timeOffset)
-{
-    assert(CUndo::IsRecording());
-    CTrackViewSequenceNotificationContext context(this);
-
-    CTrackViewKeyBundle keys = GetSelectedKeys();
-
-    std::set<CTrackViewTrack*> tracks;
-    std::set<CTrackViewTrack*>::const_iterator pTrackIter;
-    Range timeRange = GetTimeRange();
-
-    // Get the first key in the timeline among selected and
-    // also gather tracks.
-    float time0 = timeRange.end;
-    for (int k = 0; k < (int)keys.GetKeyCount(); ++k)
-    {
-        CTrackViewKeyHandle skey = keys.GetKey(k);
-        tracks.insert(skey.GetTrack());
-        float keyTime = skey.GetTime();
-        if (keyTime < time0)
-        {
-            time0 = keyTime;
-        }
-    }
-
-    // If 'bAll' is true, slide all tracks.
-    // (Otherwise, slide only selected tracks.)
-    bool bAll = Qt::AltModifier & QApplication::queryKeyboardModifiers();
-    if (bAll)
-    {
-        keys = GetKeysInTimeRange(time0, timeRange.end);
-        // Gather tracks again.
-        tracks.clear();
-        for (int k = 0; k < (int)keys.GetKeyCount(); ++k)
-        {
-            CTrackViewKeyHandle skey = keys.GetKey(k);
-            tracks.insert(skey.GetTrack());
-        }
-    }
-
-    for (pTrackIter = tracks.begin(); pTrackIter != tracks.end(); ++pTrackIter)
-    {
-        CTrackViewTrack* pTrack = *pTrackIter;
-        pTrack->SlideKeys(time0, timeOffset);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::CloneSelectedKeys()
-{
-    assert(CUndo::IsRecording());
-    CTrackViewSequenceNotificationContext context(this);
-
-    CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
-
-    const CTrackViewTrack* pTrack = nullptr;
-    // In case of multiple cloning, indices cannot be used as a solid pointer to the original.
-    // So use the time of keys as an identifier, instead.
-    std::vector<float> selectedKeyTimes;
-    for (size_t k = 0; k < selectedKeys.GetKeyCount(); ++k)
-    {
-        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
-        if (pTrack != skey.GetTrack())
-        {
-            pTrack = skey.GetTrack();
-        }
-
-        selectedKeyTimes.push_back(skey.GetTime());
-    }
-
-    // Now, do the actual cloning.
-    for (size_t k = 0; k < selectedKeyTimes.size(); ++k)
-    {
-        CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
-        skey = skey.GetTrack()->GetKeyByTime(selectedKeyTimes[k]);
-
-        assert(skey.IsValid());
-        if (!skey.IsValid())
-        {
-            continue;
-        }
-
-        CTrackViewKeyHandle newKey = skey.Clone();
-
-        // Select new key.
-        newKey.Select(true);
-        // Deselect cloned key.
-        skey.Select(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::BeginUndoTransaction()
-{
-    QueueNotifications();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::EndUndoTransaction()
-{
-    // if the sequence was added during a redo, it will add itself as an UndoManagerListener in the process and we'll
-    // get an EndUndoTransaction without a corresponding BeginUndoTransaction() call - only SubmitPendingNotifications()
-    // if we're queued
-    if (m_bQueueNotifications)
-    {
-        SubmitPendingNotifcations();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::BeginRestoreTransaction()
-{
-    QueueNotifications();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequence::EndRestoreTransaction()
-{
-    // if the sequence was added during a restore, it will add itself as an UndoManagerListener in the process and we'll
-    // get an EndUndoTransaction without a corresponding BeginUndoTransaction() call - only SubmitPendingNotifications()
-    // if we're queued
-    if (m_bQueueNotifications)
-    {
-        SubmitPendingNotifcations();
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewSequence::IsActiveSequence() const
-{
-    return GetIEditor()->GetAnimation()->GetSequence() == this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-const float CTrackViewSequence::GetTime() const
-{
-    return m_time;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewSequence* CTrackViewSequence::LookUpSequenceByEntityId(const AZ::EntityId& sequenceId)
-{
-    CTrackViewSequence* sequence = nullptr;
-
-    IEditor* editor = nullptr;
-    EBUS_EVENT_RESULT(editor, AzToolsFramework::EditorRequests::Bus, GetEditor);
-    if (editor)
-    {
-        ITrackViewSequenceManager* sequenceManager = editor->GetSequenceManager();
-        if (sequenceManager)
-        {
-            sequence = sequenceManager->GetSequenceByEntityId(sequenceId);
-        }
-    }
-
-    return sequence;
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequence.h b/Code/Sandbox/Editor/TrackView/TrackViewSequence.h
deleted file mode 100644
index b25b810a84..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewSequence.h
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCE_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCE_H
-#pragma once
-
-#include "IMovieSystem.h"
-
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-
-#include "TrackViewAnimNode.h"
-#include "Undo/Undo.h"
-
-struct ITrackViewSequenceListener
-{
-    // Called when sequence settings (time range, flags) have changed
-    virtual void OnSequenceSettingsChanged([[maybe_unused]] CTrackViewSequence* pSequence) {}
-
-    enum ENodeChangeType
-    {
-        eNodeChangeType_Added,
-        eNodeChangeType_Removed,
-        eNodeChangeType_Expanded,
-        eNodeChangeType_Collapsed,
-        eNodeChangeType_Hidden,
-        eNodeChangeType_Unhidden,
-        eNodeChangeType_Enabled,
-        eNodeChangeType_Disabled,
-        eNodeChangeType_Muted,
-        eNodeChangeType_Unmuted,
-        eNodeChangeType_Selected,
-        eNodeChangeType_Deselected,
-        eNodeChangeType_SetAsActiveDirector,
-        eNodeChangeType_NodeOwnerChanged
-    };
-
-    // Called when a node is changed
-    virtual void OnNodeChanged([[maybe_unused]] CTrackViewNode* pNode, [[maybe_unused]] ENodeChangeType type) {}
-
-    // Called when a node is added
-    virtual void OnNodeRenamed([[maybe_unused]] CTrackViewNode* pNode, [[maybe_unused]] const char* pOldName) {}
-
-    // Called when selection of nodes changed
-    virtual void OnNodeSelectionChanged([[maybe_unused]] CTrackViewSequence* pSequence) {}
-
-    // Called when selection of keys changed.
-    virtual void OnKeySelectionChanged([[maybe_unused]] CTrackViewSequence* pSequence) {}
-
-    // Called when keys in a track changed
-    virtual void OnKeysChanged([[maybe_unused]] CTrackViewSequence* pSequence) {}
-
-    // Called when a new key is added to a track
-    virtual void OnKeyAdded([[maybe_unused]] CTrackViewKeyHandle& addedKeyHandle) {}
-};
-
-struct ITrackViewSequenceManagerListener
-{
-    virtual void OnSequenceAdded([[maybe_unused]] CTrackViewSequence* pSequence) {}
-    virtual void OnSequenceRemoved([[maybe_unused]] CTrackViewSequence* pSequence) {}
-};
-
-////////////////////////////////////////////////////////////////////////////
-//
-// This class represents a IAnimSequence in TrackView and contains
-// the editor side code for changing it
-//
-////////////////////////////////////////////////////////////////////////////
-class CTrackViewSequence
-    : public CTrackViewAnimNode
-    , public IUndoManagerListener
-    , public ITrackViewSequence
-    , public ITrackViewSequenceManagerListener
-    , public AzToolsFramework::PropertyEditorEntityChangeNotificationBus::MultiHandler
-{
-    friend class CTrackViewSequenceManager;
-    friend class CTrackViewNode;
-    friend class CTrackViewAnimNode;
-    friend class CTrackViewTrack;
-    friend class CTrackViewSequenceNotificationContext;
-    friend class CTrackViewSequenceNoNotificationContext;
-
-    // Undo friends
-    friend class CUndoAnimNodeReparent;
-    friend class CUndoTrackObject;
-    friend class CUndoComponentEntityTrackObject;
-
-public:
-    CTrackViewSequence(IAnimSequence* pSequence);
-    CTrackViewSequence(AZStd::intrusive_ptr<IAnimSequence>& sequence);
-    ~CTrackViewSequence();
-
-    // Called after de-serialization of IAnimSequence
-    void Load() override;
-
-    // ITrackViewNode
-    virtual ETrackViewNodeType GetNodeType() const override { return eTVNT_Sequence; }
-
-    virtual const char* GetName() const override { return m_pAnimSequence->GetName(); }
-    virtual bool SetName(const char* pName) override;
-    virtual bool CanBeRenamed() const override { return true; }
-
-    // Binding/Unbinding
-    virtual void BindToEditorObjects() override;
-    virtual void UnBindFromEditorObjects() override;
-    virtual bool IsBoundToEditorObjects() const override;
-
-    // Time range
-    void SetTimeRange(Range timeRange);
-    Range GetTimeRange() const;
-
-    // Current time in sequence. Note that this can be different from the time
-    // of the animation context, if this sequence is used as a sub sequence
-    const float GetTime() const;
-
-    // CryMovie Flags
-    void SetFlags(IAnimSequence::EAnimSequenceFlags flags);
-    IAnimSequence::EAnimSequenceFlags GetFlags() const;
-
-    // Get sequence object in scene
-    AZ::EntityId     GetSequenceComponentEntityId() const { return m_pAnimSequence.get() ? m_pAnimSequence->GetSequenceEntityId() : AZ::EntityId(); }
-
-    // Check if this node belongs to a sequence
-    bool IsAncestorOf(CTrackViewSequence* pSequence) const;
-
-    // Get single selected key if only one key is selected
-    CTrackViewKeyHandle FindSingleSelectedKey();
-
-    // Get CryMovie sequence ID
-    uint32 GetCryMovieId() const { return m_pAnimSequence->GetId(); }
-
-    // Rendering
-    virtual void Render(const SAnimContext& animContext) override;
-
-    // Playback control
-    virtual void Animate(const SAnimContext& animContext) override;
-    void Resume() { m_pAnimSequence->Resume(); }
-    void Pause() { m_pAnimSequence->Pause(); }
-    void StillUpdate() { m_pAnimSequence->StillUpdate(); }
-
-    void OnLoop() { m_pAnimSequence->OnLoop(); }
-
-    // Active & deactivate
-    void Activate() { m_pAnimSequence->Activate(); }
-    void Deactivate() { m_pAnimSequence->Deactivate(); }
-    void PrecacheData(const float time) { m_pAnimSequence->PrecacheData(time); }
-
-    // Begin & end cut scene
-    void BeginCutScene(const bool bResetFx) const;
-    void EndCutScene() const;
-
-    // Reset
-    void Reset(const bool bSeekToStart) { m_pAnimSequence->Reset(bSeekToStart); }
-    void ResetHard() { m_pAnimSequence->ResetHard(); }
-
-    void TimeChanged(float newTime) { m_pAnimSequence->TimeChanged(newTime); }
-
-    // Check if it's a group node
-    virtual bool IsGroupNode() const override { return true; }
-
-    // Track Events (TODO: Undo?)
-    int GetTrackEventsCount() const      { return m_pAnimSequence->GetTrackEventsCount(); }
-    const char* GetTrackEvent(int index) { return m_pAnimSequence->GetTrackEvent(index); }
-    bool AddTrackEvent(const char* szEvent)                            { MarkAsModified(); return m_pAnimSequence->AddTrackEvent(szEvent); }
-    bool RemoveTrackEvent(const char* szEvent)                         { MarkAsModified(); return m_pAnimSequence->RemoveTrackEvent(szEvent); }
-    bool RenameTrackEvent(const char* szEvent, const char* szNewEvent) { MarkAsModified(); return m_pAnimSequence->RenameTrackEvent(szEvent, szNewEvent); }
-    bool MoveUpTrackEvent(const char* szEvent)                         { MarkAsModified(); return m_pAnimSequence->MoveUpTrackEvent(szEvent); }
-    bool MoveDownTrackEvent(const char* szEvent)                       { MarkAsModified(); return m_pAnimSequence->MoveDownTrackEvent(szEvent); }
-    void ClearTrackEvents()                                            { MarkAsModified(); m_pAnimSequence->ClearTrackEvents(); }
-
-    // Deletes all selected nodes (re-parents childs if group node gets deleted)
-    void DeleteSelectedNodes();
-
-    // Select selected nodes in viewport
-    void SelectSelectedNodesInViewport();
-
-    // Deletes all selected keys
-    void DeleteSelectedKeys();
-
-    // Sync from/to base
-    void SyncSelectedTracksToBase();
-    void SyncSelectedTracksFromBase();
-
-    // Listeners
-    void AddListener(ITrackViewSequenceListener* pListener);
-    void RemoveListener(ITrackViewSequenceListener* pListener);
-
-    // Checks if this is the active sequence in TV
-    bool IsActiveSequence() const;
-
-    // The root sequence node is always an active director
-    virtual bool IsActiveDirector() const override { return true; }
-
-    // Copy keys to clipboard (in XML form)
-    void CopyKeysToClipboard(const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks);
-
-    // Paste keys from clipboard. Tries to match the given data to the target track first,
-    // then the target anim node and finally the whole sequence. If it doesn't find any
-    // matching location, nothing will be pasted. Before pasting the given time offset is
-    // applied to the keys.
-    void PasteKeysFromClipboard(CTrackViewAnimNode* pTargetNode, CTrackViewTrack* pTargetTrack, const float timeOffset = 0.0f);
-
-    // Returns a vector of pairs that match the XML track nodes in the clipboard to the tracks in the sequence for pasting.
-    // It is used by PasteKeysFromClipboard directly and to preview the locations of the to be pasted keys.
-    typedef std::pair<CTrackViewTrack*, XmlNodeRef> TMatchedTrackLocation;
-    std::vector<TMatchedTrackLocation> GetMatchedPasteLocations(XmlNodeRef clipboardContent, CTrackViewAnimNode* pTargetNode, CTrackViewTrack* pTargetTrack);
-
-    // Adjust the time range
-    void AdjustKeysToTimeRange(Range newTimeRange);
-
-    // Clear all key selection
-    void DeselectAllKeys();
-
-    // Offset all key selection
-    void OffsetSelectedKeys(const float timeOffset);
-    // Scale all selected keys by this offset.
-    void ScaleSelectedKeys(const float timeOffset);
-    //! Push all the keys which come after the first key in time among selected ones by this offset.
-    void SlideKeys(const float timeOffset);
-    //! Clone all selected keys
-    void CloneSelectedKeys();
-
-    // Limit the time offset so as to keep all involved keys in range when offsetting.
-    float ClipTimeOffsetForOffsetting(const float timeOffset);
-    // Limit the time offset so as to keep all involved keys in range when scaling.
-    float ClipTimeOffsetForScaling(const float timeOffset);
-    // Limit the time offset so as to keep all involved keys in range when sliding.
-    float ClipTimeOffsetForSliding(const float timeOffset);
-
-    // Notifications
-    void OnSequenceSettingsChanged();
-    void OnKeySelectionChanged();
-    void OnKeysChanged();
-    void OnKeyAdded(CTrackViewKeyHandle& addedKeyHandle);
-    void OnNodeSelectionChanged();
-    void OnNodeChanged(CTrackViewNode* pNode, ITrackViewSequenceListener::ENodeChangeType type);
-    void OnNodeRenamed(CTrackViewNode* pNode, const char* pOldName);
-
-    // IAnimNodeOwner
-    void MarkAsModified() override;
-    // ~IAnimNodeOwner
-
-    SequenceType GetSequenceType() const 
-    {
-        if (m_pAnimSequence.get())
-        {
-            return m_pAnimSequence->GetSequenceType();
-        }
-        else
-        {
-            return kSequenceTypeDefault;
-        }
-    }
-
-    void SetExpanded(bool expanded) override
-    {
-        if (m_pAnimSequence)
-        {
-            m_pAnimSequence->SetExpanded(expanded);
-        }
-    }
-
-    bool GetExpanded() const override
-    {
-        return m_pAnimSequence ? m_pAnimSequence->GetExpanded() : true;
-    }
-
-    // Called when the 'Record' button is pressed in the toolbar
-    void SetRecording(bool enableRecording);
-
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-    // PropertyEditorEntityChangeNotificationBus handler
-    void OnEntityComponentPropertyChanged(AZ::ComponentId /*changedComponentId*/) override;
-    /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    CTrackViewTrack* FindTrackById(unsigned int trackId);
-
-    std::vector<bool> SaveKeyStates() const;
-    void RestoreKeyStates(const std::vector<bool>& keyStates);
-
-    // Helper function to find a sequence by entity id
-    static CTrackViewSequence* LookUpSequenceByEntityId(const AZ::EntityId& sequenceId);
-
-private:
-    // These are used to avoid listener notification spam via CTrackViewSequenceNotificationContext.
-    // For recursion there is a counter that increases on QueueListenerNotifications
-    // and decreases on SubmitPendingListenerNotifcations
-    // Only when the counter reaches 0 again SubmitPendingListenerNotifcations
-    // will submit the notifications
-    void QueueNotifications();
-    // Used to cancel a previously queued notification.
-    void DequeueNotifications();
-    void SubmitPendingNotifcations(bool force = false);
-
-    /////////////////////////////////////////////////////////////////////////
-    // overrides for ITrackViewSequenceManagerListener
-    void OnSequenceRemoved(CTrackViewSequence* pSequence) override;
-    void OnSequenceAdded(CTrackViewSequence* pSequence) override;
-
-    // Called when an animation updates needs to be schedules
-    void ForceAnimation();
-
-    virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) override;
-
-    std::deque<CTrackViewTrack*> GetMatchingTracks(CTrackViewAnimNode* pAnimNode, XmlNodeRef trackNode);
-    void GetMatchedPasteLocationsRec(std::vector<TMatchedTrackLocation>& locations, CTrackViewNode* pCurrentNode, XmlNodeRef clipboardNode);
-
-    virtual void BeginUndoTransaction();
-    virtual void EndUndoTransaction();
-    virtual void BeginRestoreTransaction();
-    virtual void EndRestoreTransaction();
-
-    // For record mode on AZ::Entities - connect (or disconnect) to buses for notification of property changes
-    void ConnectToBusesForRecording(const AZ::EntityId& entityIdForBus, bool enableConnection);
-
-    // Searches for current property vs. Track values for the given node and sets a key for all values that differ.
-    // Returns the number of keys set
-    int RecordTrackChangesForNode(CTrackViewAnimNode* componentNode);
-
-    // Current time when animated
-    float m_time;
-
-    // Stores if sequence is bound
-    bool m_bBoundToEditorObjects = false;
-
-    AZStd::intrusive_ptr<IAnimSequence> m_pAnimSequence;
-    std::vector<ITrackViewSequenceListener*> m_sequenceListeners;
-
-    // Notification queuing
-    unsigned int m_selectionRecursionLevel = 0;
-    bool m_bNoNotifications = false;
-    bool m_bQueueNotifications = false;
-    bool m_bNodeSelectionChanged = false;
-    bool m_bForceAnimation = false;
-    bool m_bKeySelectionChanged = false;
-    bool m_bKeysChanged = false;
-};
-
-////////////////////////////////////////////////////////////////////////////
-class CTrackViewSequenceNotificationContext
-{
-public:
-    CTrackViewSequenceNotificationContext(CTrackViewSequence* pSequence)
-        : m_pSequence(pSequence)
-    {
-        if (m_pSequence)
-        {
-            m_pSequence->QueueNotifications();
-        }
-    }
-
-    ~CTrackViewSequenceNotificationContext()
-    {
-        if (m_pSequence)
-        {
-            m_pSequence->SubmitPendingNotifcations();
-        }
-    }
-
-    void Cancel()
-    {
-        if (m_pSequence)
-        {
-            m_pSequence->DequeueNotifications();
-        }        
-        m_pSequence = nullptr;
-    }
-
-private:
-    CTrackViewSequence* m_pSequence;
-};
-
-////////////////////////////////////////////////////////////////////////////
-class CTrackViewSequenceNoNotificationContext
-{
-public:
-    CTrackViewSequenceNoNotificationContext(CTrackViewSequence* pSequence)
-        : m_pSequence(pSequence)
-        , m_bNoNotificationsPreviously(false)
-    {
-        if (m_pSequence)
-        {
-            m_bNoNotificationsPreviously = m_pSequence->m_bNoNotifications;
-            m_pSequence->m_bNoNotifications = true;
-        }
-    }
-
-    ~CTrackViewSequenceNoNotificationContext()
-    {
-        if (m_pSequence)
-        {
-            m_pSequence->m_bNoNotifications = m_bNoNotificationsPreviously;
-        }
-    }
-
-private:
-    CTrackViewSequence* m_pSequence;
-
-    // Reentrance could happen if there are overlapping sub-sequences controlling
-    // the same camera.
-    bool m_bNoNotificationsPreviously;
-};
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCE_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp b/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp
deleted file mode 100644
index 78e54ea673..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewSequenceManager.h"
-
-// AzToolsFramework
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
-
-// CryCommon
-#include <CryCommon/Maestro/Bus/EditorSequenceComponentBus.h>
-#include <CryCommon/Maestro/Types/SequenceType.h>
-
-// Editor
-#include "AnimationContext.h"
-#include "GameEngine.h"
-#include "Include/IObjectManager.h"
-#include "Objects/ObjectManager.h"
-
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewSequenceManager::CTrackViewSequenceManager()
-{
-    GetIEditor()->RegisterNotifyListener(this);
-
-    AZ::EntitySystemBus::Handler::BusConnect();
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewSequenceManager::~CTrackViewSequenceManager()
-{
-    AZ::EntitySystemBus::Handler::BusDisconnect();
-
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnBeginGameMode:
-        ResumeAllSequences();
-        break;
-    case eNotify_OnCloseScene:
-    // Fall through
-    case eNotify_OnBeginLoad:
-        m_bUnloadingLevel = true;
-        break;
-    case eNotify_OnEndNewScene:
-    // Fall through
-    case eNotify_OnEndSceneOpen:
-    // Fall through
-    case eNotify_OnEndLoad:
-    // Fall through
-    case eNotify_OnLayerImportEnd:
-        m_bUnloadingLevel = false;
-        SortSequences();
-        break;
-    }   
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewSequence* CTrackViewSequenceManager::GetSequenceByName(QString name) const
-{
-    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
-    {
-        CTrackViewSequence* sequence = (*iter).get();
-
-        if (sequence->GetName() == name)
-        {
-            return sequence;
-        }
-    }
-
-    return nullptr;
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewSequence* CTrackViewSequenceManager::GetSequenceByEntityId(const AZ::EntityId& entityId) const
-{
-    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
-    {
-        CTrackViewSequence* sequence = (*iter).get();
-
-        if (sequence->GetSequenceComponentEntityId() == entityId)
-        {
-            return sequence;
-        }
-    }
-
-    return nullptr;
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewSequence* CTrackViewSequenceManager::GetSequenceByAnimSequence(IAnimSequence* pAnimSequence) const
-{
-    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
-    {
-        CTrackViewSequence* sequence = (*iter).get();
-
-        if (sequence->m_pAnimSequence == pAnimSequence)
-        {
-            return sequence;
-        }
-    }
-
-    return nullptr;
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewSequence* CTrackViewSequenceManager::GetSequenceByIndex(unsigned int index) const
-{
-    if (index >= m_sequences.size())
-    {
-        return nullptr;
-    }
-
-    return m_sequences[index].get();
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::CreateSequence(QString name, [[maybe_unused]] SequenceType sequenceType)
-{
-    CGameEngine* pGameEngine = GetIEditor()->GetGameEngine();
-    if (!pGameEngine || !pGameEngine->IsLevelLoaded())
-    {
-        return;
-    }
-
-    CTrackViewSequence* pExistingSequence = GetSequenceByName(name);
-    if (pExistingSequence)
-    {
-        return;
-    }
-
-    AzToolsFramework::ScopedUndoBatch undoBatch("Create TrackView Sequence");
-
-    // create AZ::Entity at the current center of the viewport, but don't select it
-
-    // Store the current selection for selection restore after the sequence component is created
-    AzToolsFramework::EntityIdList selectedEntities;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
-
-    AZ::EntityId newEntityId;   // initialized with InvalidEntityId
-    EBUS_EVENT_RESULT(newEntityId, AzToolsFramework::EditorRequests::Bus, CreateNewEntity, AZ::EntityId());
-    if (newEntityId.IsValid())
-    {
-        // set the entity name
-        AZ::Entity* entity = nullptr;
-        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, newEntityId);
-        if (entity)
-        {
-            entity->SetName(static_cast<const char*>(name.toUtf8().data()));
-        }
-
-        // add the SequenceComponent. The SequenceComponent's Init() method will call OnCreateSequenceObject() which will actually create
-        // the sequence and connect it
-        // #TODO LY-21846: Use "SequenceService" to find component, rather than specific component-type.
-        AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, AzToolsFramework::EntityIdList{ newEntityId }, AZ::ComponentTypeList{ "{C02DC0E2-D0F3-488B-B9EE-98E28077EC56}" });
-
-        // restore the Editor selection
-        AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::Bus::Events::SetSelectedEntities, selectedEntities);
-
-        undoBatch.MarkEntityDirty(newEntityId);        
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-IAnimSequence* CTrackViewSequenceManager::OnCreateSequenceObject(QString name, bool isLegacySequence, AZ::EntityId entityId)
-{
-    // Drop legacy sequences on the floor, they are no longer supported.
-    if (isLegacySequence)
-    {
-        GetIEditor()->GetMovieSystem()->LogUserNotificationMsg(AZStd::string::format("Legacy Sequences are no longer supported. Skipping '%s'.", name.toUtf8().data()));
-        return nullptr;
-    }
-
-    IAnimSequence* sequence = GetIEditor()->GetMovieSystem()->CreateSequence(name.toUtf8().data(), /*bload =*/ false, /*id =*/ 0U, SequenceType::SequenceComponent, entityId);
-    AZ_Assert(sequence, "Failed to create sequence");
-    AddTrackViewSequence(new CTrackViewSequence(sequence));
-
-    return sequence;
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::OnSequenceActivated(const AZ::EntityId& entityId)
-{
-    CAnimationContext* pAnimationContext = GetIEditor()->GetAnimation();
-    if (pAnimationContext != nullptr)
-    {
-        pAnimationContext->OnSequenceActivated(entityId);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::OnCreateSequenceComponent(AZStd::intrusive_ptr<IAnimSequence>& sequence)
-{
-    // Fix up the internal pointers in the sequence to match the deserialized structure
-    sequence->InitPostLoad();
-
-    // Add the sequence to the movie system
-    GetIEditor()->GetMovieSystem()->AddSequence(sequence.get());
-
-    // Create the TrackView Sequence
-    CTrackViewSequence* newTrackViewSequence = new CTrackViewSequence(sequence);
-
-    AddTrackViewSequence(newTrackViewSequence);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::AddTrackViewSequence(CTrackViewSequence* sequenceToAdd)
-{
-    m_sequences.push_back(std::unique_ptr<CTrackViewSequence>(sequenceToAdd));
-    SortSequences();
-    OnSequenceAdded(sequenceToAdd);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::DeleteSequence(CTrackViewSequence* sequence)
-{
-    const int numSequences = m_sequences.size();
-    for (int sequenceIndex = 0; sequenceIndex < numSequences; ++sequenceIndex)
-    {
-        if (m_sequences[sequenceIndex].get() == sequence)
-        {
-            AzToolsFramework::ScopedUndoBatch undoBatch("Delete TrackView Sequence");
-
-            // delete Sequence Component (and entity if there's no other components left on the entity except for the Transform Component)
-            AZ::Entity* entity = nullptr;
-            AZ::EntityId entityId = sequence->m_pAnimSequence->GetSequenceEntityId();
-            AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
-            if (entity)
-            {
-                const AZ::Uuid editorSequenceComponentTypeId(EditorSequenceComponentTypeId);
-                AZ::Component* sequenceComponent = entity->FindComponent(editorSequenceComponentTypeId);
-                if (sequenceComponent)
-                {
-                    AZ::ComponentTypeList requiredComponents;
-                    AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(requiredComponents, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetRequiredComponentTypes);
-                    const int numComponentToDeleteEntity = requiredComponents.size() + 1;
-
-                    AZ::Entity::ComponentArrayType entityComponents = entity->GetComponents();
-                    if (entityComponents.size() == numComponentToDeleteEntity)
-                    {
-                        // if the entity only has required components + 1 (the found sequenceComponent), delete the Entity. No need to start undo here
-                        // AzToolsFramework::ToolsApplicationRequests::DeleteEntities will take care of that
-                        AzToolsFramework::EntityIdList entitiesToDelete;
-                        entitiesToDelete.push_back(entityId);
-
-                        AzToolsFramework::ToolsApplicationRequests::Bus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::DeleteEntities, entitiesToDelete);
-                    }
-                    else
-                    {
-                        // just remove the sequence component from the entity
-                        CUndo undo("Delete TrackView Sequence");
-
-                        AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::RemoveComponents, AZ::Entity::ComponentArrayType{ sequenceComponent });
-                    }
-
-                    undoBatch.MarkEntityDirty(entityId);
-                }
-            }
-
-            // sequence was deleted, we can stop searching
-            break;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::RenameNode(CTrackViewAnimNode* animNode, const char* newName) const
-{
-    AZ::EntityId entityId;
-    CTrackViewSequence* sequence = animNode->GetSequence();
-
-    AZ_Assert(sequence, "Nodes should never have a null sequence.");
-
-    if (animNode->IsBoundToEditorObjects())
-    {
-        if (animNode->GetNodeType() == eTVNT_Sequence)
-        {
-            CTrackViewSequence* sequenceNode = static_cast<CTrackViewSequence*>(animNode);
-            entityId = sequenceNode->GetSequenceComponentEntityId();
-        }
-        else if (animNode->GetNodeType() == eTVNT_AnimNode)
-        {
-            entityId = animNode->GetNodeEntityId();
-        }
-    }
-
-    if (entityId.IsValid())
-    {
-        AzToolsFramework::ScopedUndoBatch undoBatch("ModifyEntityName");
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
-        entity->SetName(newName);
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-    }
-    else
-    {
-        AzToolsFramework::ScopedUndoBatch undoBatch("Rename TrackView Node");
-        animNode->SetName(newName);
-        undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-    }
-}
-
-void CTrackViewSequenceManager::RemoveSequenceInternal(CTrackViewSequence* sequence)
-{
-    std::unique_ptr<CTrackViewSequence> storedTrackViewSequence;
-    
-    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
-    {
-        std::unique_ptr<CTrackViewSequence>& currentSequence = *iter;
-
-        if (currentSequence.get() == sequence)
-        {
-            // Hang onto this until we finish this function.
-            currentSequence.swap(storedTrackViewSequence);
-
-            // Remove from CryMovie and TrackView
-            m_sequences.erase(iter);
-            IMovieSystem* pMovieSystem = GetIEditor()->GetMovieSystem();
-            pMovieSystem->RemoveSequence(sequence->m_pAnimSequence.get());
-
-            break;
-        }
-    }
-
-    OnSequenceRemoved(sequence);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::OnDeleteSequenceEntity(const AZ::EntityId& entityId)
-{
-    CTrackViewSequence* sequence = GetSequenceByEntityId(entityId);
-    assert(sequence);
-
-    if (sequence)
-    {
-        const bool bUndoWasSuspended = GetIEditor()->IsUndoSuspended();
-        bool isDuringUndo = false;
-
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isDuringUndo, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsDuringUndoRedo);
-
-        if (bUndoWasSuspended)
-        {
-            GetIEditor()->ResumeUndo();
-        }
-
-        RemoveSequenceInternal(sequence);
-
-        if (bUndoWasSuspended)
-        {
-            GetIEditor()->SuspendUndo();
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::SortSequences()
-{
-    std::stable_sort(m_sequences.begin(), m_sequences.end(),
-        [](const std::unique_ptr<CTrackViewSequence>& a, const std::unique_ptr<CTrackViewSequence>& b) -> bool
-        {
-            QString aName = a.get()->GetName();
-            QString bName = b.get()->GetName();
-            return aName < bName;
-        });
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::ResumeAllSequences()
-{
-    for (auto iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
-    {
-        CTrackViewSequence* sequence = (*iter).get();
-        if (sequence)
-        {
-            sequence->Resume();
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::OnSequenceAdded(CTrackViewSequence* sequence)
-{
-    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
-    {
-        (*iter)->OnSequenceAdded(sequence);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::OnSequenceRemoved(CTrackViewSequence* sequence)
-{
-    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
-    {
-        (*iter)->OnSequenceRemoved(sequence);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CTrackViewSequenceManager::OnDataBaseItemEvent([[maybe_unused]] IDataBaseItem* pItem, EDataBaseItemEvent event)
-{
-    if (event != EDataBaseItemEvent::EDB_ITEM_EVENT_ADD)
-    {
-        const uint numSequences = m_sequences.size();
-
-        for (uint i = 0; i < numSequences; ++i)
-        {
-            m_sequences[i]->UpdateDynamicParams();
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNodeBundle CTrackViewSequenceManager::GetAllRelatedAnimNodes(const AZ::EntityId entityId) const
-{
-    CTrackViewAnimNodeBundle nodeBundle;
-
-    const uint sequenceCount = GetCount();
-
-    for (uint sequenceIndex = 0; sequenceIndex < sequenceCount; ++sequenceIndex)
-    {
-        CTrackViewSequence* sequence = GetSequenceByIndex(sequenceIndex);
-        nodeBundle.AppendAnimNodeBundle(sequence->GetAllOwnedNodes(entityId));
-    }
-
-    return nodeBundle;
-}
-
-////////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode* CTrackViewSequenceManager::GetActiveAnimNode(const AZ::EntityId entityId) const
-{
-    CTrackViewAnimNodeBundle nodeBundle = GetAllRelatedAnimNodes(entityId);
-
-    const uint nodeCount = nodeBundle.GetCount();
-    for (uint nodeIndex = 0; nodeIndex < nodeCount; ++nodeIndex)
-    {
-        CTrackViewAnimNode* animNode = nodeBundle.GetNode(nodeIndex);
-        if (animNode->IsActive())
-        {
-            return animNode;
-        }
-    }
-
-    return nullptr;
-}
-
-void CTrackViewSequenceManager::OnEntityNameChanged(const AZ::EntityId& entityId, const AZStd::string& name)
-{
-    CTrackViewAnimNodeBundle bundle;
-
-    // entity or component entity sequence object
-    bundle = GetAllRelatedAnimNodes(entityId);
-
-    // GetAllRelatedAnimNodes only accounts for entities in the sequences, not the sequence entities themselves. We additionally check
-    // for sequence entities that have object as their entity object for renaming
-    const uint sequenceCount = GetCount();
-    for (uint sequenceIndex = 0; sequenceIndex < sequenceCount; ++sequenceIndex)
-    {
-        CTrackViewSequence* sequence = GetSequenceByIndex(sequenceIndex);
-        if (entityId == sequence->GetSequenceComponentEntityId())
-        {
-            bundle.AppendAnimNode(sequence);
-        }
-    }
-
-    const uint numAffectedNodes = bundle.GetCount();
-    for (uint i = 0; i < numAffectedNodes; ++i)
-    {
-        CTrackViewAnimNode* animNode = bundle.GetNode(i);
-        animNode->SetName(name.c_str());
-    }
-
-    if (numAffectedNodes > 0)
-    {
-        GetIEditor()->Notify(eNotify_OnReloadTrackView);
-    }
-}
-
-void CTrackViewSequenceManager::OnEntityDestruction(const AZ::EntityId& entityId)
-{
-    // we handle pre-delete instead of delete because GetAllRelatedAnimNodes() uses the ObjectManager to find node owners
-    CTrackViewAnimNodeBundle bundle = GetAllRelatedAnimNodes(entityId);
-
-    const uint numAffectedAnimNodes = bundle.GetCount();
-    for (uint i = 0; i < numAffectedAnimNodes; ++i)
-    {
-        CTrackViewAnimNode* animNode = bundle.GetNode(i);
-        animNode->OnEntityRemoved();
-    }
-
-    if (numAffectedAnimNodes > 0)
-    {
-        // Only reload track view if the object being deleted has related anim nodes.
-        GetIEditor()->Notify(eNotify_OnReloadTrackView);
-    }
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.h b/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.h
deleted file mode 100644
index f7ad3f0812..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCEMANAGER_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCEMANAGER_H
-#pragma once
-
-
-#include "TrackViewSequence.h"
-#include "IDataBaseManager.h"
-
-#include <AzCore/Component/EntityBus.h>
-
-class CTrackViewSequenceManager
-    : public IEditorNotifyListener
-    , public IDataBaseManagerListener
-    , public ITrackViewSequenceManager
-    , public AZ::EntitySystemBus::Handler
-{
-public:
-    CTrackViewSequenceManager();
-    ~CTrackViewSequenceManager();
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
-    unsigned int GetCount() const { return m_sequences.size(); }
-
-    void CreateSequence(QString name, SequenceType sequenceType);
-    void DeleteSequence(CTrackViewSequence* pSequence);
-
-    void RenameNode(CTrackViewAnimNode* pAnimNode, const char* newName) const;
-
-    CTrackViewSequence* GetSequenceByName(QString name) const override;
-    CTrackViewSequence* GetSequenceByEntityId(const AZ::EntityId& entityId) const override;
-    CTrackViewSequence* GetSequenceByIndex(unsigned int index) const;
-    CTrackViewSequence* GetSequenceByAnimSequence(IAnimSequence* pAnimSequence) const;
-
-    CTrackViewAnimNodeBundle GetAllRelatedAnimNodes(AZ::EntityId entityId) const;
-    CTrackViewAnimNode* GetActiveAnimNode(AZ::EntityId entityId) const;
-
-    void AddListener(ITrackViewSequenceManagerListener* pListener) { stl::push_back_unique(m_listeners, pListener); }
-    void RemoveListener(ITrackViewSequenceManagerListener* pListener) { stl::find_and_erase(m_listeners, pListener); }
-
-    //  ITrackViewSequenceManager Overrides
-    // Callback from SequenceObject
-    IAnimSequence* OnCreateSequenceObject(QString name, bool isLegacySequence = true, AZ::EntityId entityId = AZ::EntityId()) override;
-    void OnDeleteSequenceEntity(const AZ::EntityId& entityId) override;
-    void OnCreateSequenceComponent(AZStd::intrusive_ptr<IAnimSequence>& sequence) override;
-    void OnSequenceActivated(const AZ::EntityId& entityId) override;
-    //~ ITrackViewSequenceManager Overrides
-
-private:
-    void AddTrackViewSequence(CTrackViewSequence* sequenceToAdd);
-    void RemoveSequenceInternal(CTrackViewSequence* sequence);
-
-    void SortSequences();
-    void ResumeAllSequences();
-
-    void OnSequenceAdded(CTrackViewSequence* pSequence);
-    void OnSequenceRemoved(CTrackViewSequence* pSequence);
-
-    virtual void OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event);
-
-    // AZ::EntitySystemBus
-    void OnEntityNameChanged(const AZ::EntityId& entityId, const AZStd::string& name) override;
-    void OnEntityDestruction(const AZ::EntityId& entityId) override;
-
-    std::vector<ITrackViewSequenceManagerListener*> m_listeners;
-    std::vector<std::unique_ptr<CTrackViewSequence> > m_sequences;
-
-    // Set to hold sequences that existed when undo transaction began
-    std::set<CTrackViewSequence*> m_transactionSequences;
-
-    bool m_bUnloadingLevel;
-
-    // Used to handle object attach/detach
-    std::unordered_map<CTrackViewNode*, Matrix34> m_prevTransforms;
-};
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSEQUENCEMANAGER_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.cpp b/Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.cpp
deleted file mode 100644
index 452c731cbf..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.cpp
+++ /dev/null
@@ -1,1081 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewSplineCtrl.h"
-
-// Qt
-#include <QRubberBand>
-
-// Editor
-#include "AnimationContext.h"
-
-
-class CUndoTrackViewSplineCtrl
-    : public ISplineCtrlUndo
-{
-public:
-    CUndoTrackViewSplineCtrl(CTrackViewSplineCtrl* pCtrl, std::vector<ISplineInterpolator*>& splineContainer)
-    {
-        if (GetIEditor()->GetAnimation()->GetSequence())
-        {
-            m_sequenceEntityId = GetIEditor()->GetAnimation()->GetSequence()->GetSequenceComponentEntityId();
-        }
-
-        m_pCtrl = pCtrl;
-
-        // Loop over all affected splines
-        for (size_t splineIndex = 0; splineIndex < splineContainer.size(); ++splineIndex)
-        {
-            AddSpline(splineContainer[splineIndex]);
-        }
-
-        SerializeSplines(&CSplineEntry::m_undo, false);
-    }
-
-protected:
-    void AddSpline(ISplineInterpolator* pSpline)
-    {
-        // Find corresponding track and remember it
-        for (size_t trackIndex = 0; trackIndex < m_pCtrl->m_tracks.size(); ++trackIndex)
-        {
-            CTrackViewTrack* pTrack = m_pCtrl->m_tracks[trackIndex];
-            if (pTrack->GetSpline() == pSpline)
-            {
-                CSplineEntry entry;
-                entry.m_trackId = pTrack->GetId();
-                m_splineEntries.push_back(entry);
-            }
-        }
-    }
-
-    virtual int GetSize() { return sizeof(*this); }
-    virtual QString GetDescription() { return "UndoTrackViewSplineCtrl"; };
-
-    virtual void Undo(bool bUndo)
-    {
-        CTrackViewSplineCtrl* pCtrl = FindControl(m_pCtrl);
-        if (pCtrl)
-        {
-            pCtrl->SendNotifyEvent(SPLN_BEFORE_CHANGE);
-        }
-
-        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
-
-        AZ_Assert(sequence, "Expected valid sequence.");
-        if (!sequence)
-        {
-            return;
-        }
-
-        CTrackViewSequenceNotificationContext context(sequence);
-
-        if (bUndo)
-        {
-            // Save key selection states for redo if necessary
-            m_redoKeyStates = sequence->SaveKeyStates();
-            SerializeSplines(&CSplineEntry::m_redo, false);
-        }
-
-        SerializeSplines(&CSplineEntry::m_undo, true);
-
-        // Undo key selection state
-        sequence->RestoreKeyStates(m_undoKeyStates);
-
-        if (pCtrl && bUndo)
-        {
-            pCtrl->m_bKeyTimesDirty = true;
-            pCtrl->SendNotifyEvent(SPLN_CHANGE);
-            pCtrl->update();
-        }
-
-        if (bUndo)
-        {
-            sequence->OnKeySelectionChanged();
-        }
-    }
-
-    virtual void Redo()
-    {
-        const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* sequence = pSequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
-        AZ_Assert(sequence, "Expected valid sequence.");
-        if (!sequence)
-        {
-            return;
-        }
-
-        CTrackViewSequenceNotificationContext context(sequence);
-
-        CTrackViewSplineCtrl* pCtrl = FindControl(m_pCtrl);
-
-        if (pCtrl)
-        {
-            pCtrl->SendNotifyEvent(SPLN_BEFORE_CHANGE);
-        }
-        SerializeSplines(&CSplineEntry::m_redo, true);
-
-        // Redo key selection state
-        sequence->RestoreKeyStates(m_redoKeyStates);
-
-        if (pCtrl)
-        {
-            pCtrl->m_bKeyTimesDirty = true;
-            pCtrl->SendNotifyEvent(SPLN_CHANGE);
-            pCtrl->update();
-        }
-
-        sequence->OnKeySelectionChanged();
-    }
-
-    virtual bool IsSelectionChanged() const
-    {
-        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
-        AZ_Assert(sequence, "Expected valid sequence.");
-        if (!sequence)
-        {
-            return false;
-        }
-
-        const std::vector<bool> currentKeyState = sequence->SaveKeyStates();
-        return m_undoKeyStates != currentKeyState;
-    }
-
-public:
-    typedef std::list<CTrackViewSplineCtrl*> CTrackViewSplineCtrls;
-
-    static CTrackViewSplineCtrl* FindControl(CTrackViewSplineCtrl* pCtrl)
-    {
-        if (!pCtrl)
-        {
-            return 0;
-        }
-
-        auto iter = std::find(s_activeCtrls.begin(), s_activeCtrls.end(), pCtrl);
-        if (iter == s_activeCtrls.end())
-        {
-            return 0;
-        }
-
-        return *iter;
-    }
-
-    static void RegisterControl(CTrackViewSplineCtrl* pCtrl)
-    {
-        if (!FindControl(pCtrl))
-        {
-            s_activeCtrls.push_back(pCtrl);
-        }
-    }
-
-    static void UnregisterControl(CTrackViewSplineCtrl* pCtrl)
-    {
-        if (FindControl(pCtrl))
-        {
-            s_activeCtrls.remove(pCtrl);
-        }
-    }
-
-    static CTrackViewSplineCtrls s_activeCtrls;
-
-private:
-    class CSplineEntry
-    {
-    public:
-        _smart_ptr<ISplineBackup> m_undo;
-        _smart_ptr<ISplineBackup> m_redo;
-        unsigned int m_trackId;
-    };
-
-    void SerializeSplines(_smart_ptr<ISplineBackup> CSplineEntry::* backup, bool bLoading)
-    {
-        const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
-        CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
-        AZ_Assert(sequence, "Expected valid sequence");
-        if (!sequence)
-        {
-            return;
-        }
-
-        for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
-        {
-            CSplineEntry& entry = *it;
-            CTrackViewTrack* track = sequence->FindTrackById(entry.m_trackId);
-            if (track)
-            {
-                ISplineInterpolator* pSpline = track->GetSpline();
-
-                if (pSpline && bLoading)
-                {
-                    pSpline->Restore(entry.*backup);
-                }
-                else if (pSpline)
-                {
-                    (entry.*backup) = pSpline->Backup();
-                }
-            }
-        }
-    }
-
-    AZ::EntityId m_sequenceEntityId;
-    CTrackViewSplineCtrl* m_pCtrl;
-    std::vector<CSplineEntry> m_splineEntries;
-    std::vector<float> m_keyTimes;
-    std::vector<bool> m_undoKeyStates;
-    std::vector<bool> m_redoKeyStates;
-};
-
-CUndoTrackViewSplineCtrl::CTrackViewSplineCtrls CUndoTrackViewSplineCtrl::s_activeCtrls;
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewSplineCtrl::CTrackViewSplineCtrl(QWidget* parent)
-    : SplineWidget(parent)
-    , m_bKeysFreeze(false)
-    , m_bTangentsFreeze(false)
-    , m_stashedRecordModeWhenDraggingTime(false)
-{
-    CUndoTrackViewSplineCtrl::RegisterControl(this);
-}
-
-CTrackViewSplineCtrl::~CTrackViewSplineCtrl()
-{
-    CUndoTrackViewSplineCtrl::UnregisterControl(this);
-}
-
-bool CTrackViewSplineCtrl::GetTangentHandlePts(QPoint& inTangentPt, QPoint& pt, QPoint& outTangentPt,
-    int nSpline, int nKey, int nDimension)
-{
-    ISplineInterpolator* pSpline = m_splines[nSpline].pSpline;
-    CTrackViewTrack* pTrack = m_tracks[nSpline];
-
-    float time = pSpline->GetKeyTime(nKey);
-
-    ISplineInterpolator::ValueType value, tin, tout;
-    ISplineInterpolator::ZeroValue(value);
-    pSpline->GetKeyValue(nKey, value);
-    pSpline->GetKeyTangents(nKey, tin, tout);
-
-    const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(nKey);
-
-    if (pTrack->GetCurveType() == eAnimCurveType_TCBFloat)
-    {
-        ITcbKey tcbKey;
-        keyHandle.GetKey(&tcbKey);
-
-        Vec2 va, vb, vc;
-        va.x = time - 1.0f;
-        va.y = value[nDimension] - tin[nDimension];
-        vb.x = time;
-        vb.y = value[nDimension];
-        vc.x = time + 1.0f;
-        vc.y = value[nDimension] + tout[nDimension];
-        inTangentPt = WorldToClient(va);
-        pt = WorldToClient(vb);
-        outTangentPt = WorldToClient(vc);
-
-        Vec2 tinv, toutv;
-        float maxLength = float(outTangentPt.x() - pt.x());
-        tinv.x = float(inTangentPt.x() - pt.x());
-        tinv.y = float(inTangentPt.y() - pt.y());
-        toutv.x = float(outTangentPt.x() - pt.x());
-        toutv.y = float(outTangentPt.y() - pt.y());
-        tinv.Normalize();
-        toutv.Normalize();
-        tinv *= maxLength / (2 - tcbKey.easeto);
-        toutv *= maxLength / (2 - tcbKey.easefrom);
-
-        inTangentPt = pt + QPoint(int(tinv.x), int(tinv.y));
-        outTangentPt = pt + QPoint(int(toutv.x), int(toutv.y));
-    }
-    else
-    {
-        assert(pTrack->GetCurveType() == eAnimCurveType_BezierFloat);
-        assert(nDimension == 0);
-
-        I2DBezierKey bezierKey;
-        keyHandle.GetKey(&bezierKey);
-
-        Vec2 va, vb, vc;
-        va.x = time - tin[0];
-        va.y = value[0] - tin[1];
-        vb.x = time;
-        vb.y = value[0];
-        vc.x = time + tout[0];
-        vc.y = value[0] + tout[1];
-        inTangentPt = WorldToClient(va);
-        pt = WorldToClient(vb);
-        outTangentPt = WorldToClient(vc);
-    }
-
-    return true;
-}
-
-void CTrackViewSplineCtrl::ComputeIncomingTangentAndEaseTo(float& ds, float& easeTo, QPoint inTangentPt,
-    int nSpline, int nKey, int nDimension)
-{
-    ISplineInterpolator* pSpline = m_splines[nSpline].pSpline;
-    CTrackViewTrack* pTrack = m_tracks[nSpline];
-
-    float time = pSpline->GetKeyTime(nKey);
-
-    ISplineInterpolator::ValueType value, tin, tout;
-    ISplineInterpolator::ZeroValue(value);
-    pSpline->GetKeyValue(nKey, value);
-    pSpline->GetKeyTangents(nKey, tin, tout);
-
-    const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(nKey);
-
-    ITcbKey tcbKey;
-    keyHandle.GetKey(&tcbKey);
-
-    // Get the control point.
-    Vec2 tinv, vb;
-    vb.x = time;
-    vb.y = value[nDimension];
-    QPoint pt = WorldToClient(vb);
-
-    // Get the max length to compute the 'ease' value.
-    float maxLength = float(WorldToClient(Vec2(vb.x + 1, vb.y)).x() - pt.x());
-
-    QPoint tmp = inTangentPt - pt;
-    tinv.x = float(tmp.x());
-    tinv.y = float(tmp.y());
-
-    // Compute the 'easeTo'.
-    easeTo = 2.0f - maxLength / tinv.GetLength();
-
-    // Compute the 'ds'.
-    Vec2 va = ClientToWorld(inTangentPt);
-    if (time < va.x + 0.000001f)
-    {
-        if (value[nDimension] > va.y)
-        {
-            ds = 1000000.0f;
-        }
-        else
-        {
-            ds = -1000000.0f;
-        }
-    }
-    else
-    {
-        ds = (value[nDimension] - va.y) / (time - va.x);
-    }
-}
-
-void CTrackViewSplineCtrl::ComputeOutgoingTangentAndEaseFrom(float& dd, float& easeFrom, QPoint outTangentPt,
-    int nSpline, int nKey, int nDimension)
-{
-    ISplineInterpolator* pSpline = m_splines[nSpline].pSpline;
-    CTrackViewTrack* pTrack = m_tracks[nSpline];
-
-    float time = pSpline->GetKeyTime(nKey);
-
-    ISplineInterpolator::ValueType value, tin, tout;
-    ISplineInterpolator::ZeroValue(value);
-    pSpline->GetKeyValue(nKey, value);
-    pSpline->GetKeyTangents(nKey, tin, tout);
-
-    const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(nKey);
-
-    ITcbKey tcbKey;
-    keyHandle.GetKey(&tcbKey);
-
-    // Get the control point.
-    Vec2 toutv, vb;
-    vb.x = time;
-    vb.y = value[nDimension];
-    QPoint pt = WorldToClient(vb);
-
-    // Get the max length to comute the 'ease' value.
-    float maxLength = float(WorldToClient(Vec2(vb.x + 1, vb.y)).x() - pt.x());
-
-    QPoint tmp = outTangentPt - pt;
-    toutv.x = float(tmp.x());
-    toutv.y = float(tmp.y());
-
-    // Compute the 'easeFrom'.
-    easeFrom = 2.0f - maxLength / toutv.GetLength();
-
-    // Compute the 'dd'.
-    Vec2 vc = ClientToWorld(outTangentPt);
-    if (vc.x < time + 0.000001f)
-    {
-        if (value[nDimension] < vc.y)
-        {
-            dd = 1000000.0f;
-        }
-        else
-        {
-            dd = -1000000.0f;
-        }
-    }
-    else
-    {
-        dd = (vc.y - value[nDimension]) / (vc.x - time);
-    }
-}
-
-void CTrackViewSplineCtrl::AddSpline(ISplineInterpolator* pSpline, CTrackViewTrack* pTrack, const QColor& color)
-{
-    QColor colorArray[4];
-    colorArray[0] = colorArray[1] = colorArray[2] = colorArray[3] = color;
-    AddSpline(pSpline, pTrack, colorArray);
-}
-
-void CTrackViewSplineCtrl::AddSpline(ISplineInterpolator* pSpline, CTrackViewTrack* pTrack, QColor anColorArray[4])
-{
-    for (int i = 0; i < (int)m_splines.size(); i++)
-    {
-        if (m_splines[i].pSpline == pSpline)
-        {
-            return;
-        }
-    }
-    SSplineInfo si;
-
-    for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-    {
-        si.anColorArray[nCurrentDimension] = anColorArray[nCurrentDimension];
-    }
-
-    si.pSpline = pSpline;
-    si.pDetailSpline = NULL;
-    m_splines.push_back(si);
-    m_tracks.push_back(pTrack);
-    m_bKeyTimesDirty = true;
-    update();
-}
-
-void CTrackViewSplineCtrl::RemoveAllSplines()
-{
-    m_tracks.clear();
-    SplineWidget::RemoveAllSplines();
-}
-
-void CTrackViewSplineCtrl::MoveSelectedTangentHandleTo(const QPoint& point)
-{
-    assert(m_pHitSpline && m_nHitKeyIndex >= 0 && m_bHitIncomingHandle >= 0);
-
-    // Set the custom flag to the key.
-    int nRemoveFlags, nAddFlags;
-    if (m_bHitIncomingHandle)
-    {
-        nRemoveFlags = SPLINE_KEY_TANGENT_IN_MASK;
-        nAddFlags = SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_IN_SHIFT;
-    }
-    else
-    {
-        nRemoveFlags = SPLINE_KEY_TANGENT_OUT_MASK;
-        nAddFlags = SPLINE_KEY_TANGENT_CUSTOM << SPLINE_KEY_TANGENT_OUT_SHIFT;
-    }
-    int flags = m_pHitSpline->GetKeyFlags(m_nHitKeyIndex);
-    flags &= ~nRemoveFlags;
-    flags |= nAddFlags;
-    m_pHitSpline->SetKeyFlags(m_nHitKeyIndex, flags);
-
-    // Adjust the incoming or outgoing tangent.
-    int splineIndex;
-    for (splineIndex = 0; splineIndex < m_splines.size(); ++splineIndex)
-    {
-        if (m_pHitSpline == m_splines[splineIndex].pSpline)
-        {
-            break;
-        }
-    }
-    assert(splineIndex < m_splines.size());
-
-    CTrackViewTrack* pTrack = m_tracks[splineIndex];
-    CTrackViewKeyHandle keyHandle = pTrack->GetKey(m_nHitKeyIndex);
-
-    if (pTrack->GetCurveType() == eAnimCurveType_TCBFloat)
-    {
-        if (m_bHitIncomingHandle)
-        {
-            float ds, easeTo;
-            ComputeIncomingTangentAndEaseTo(ds, easeTo, point, splineIndex, m_nHitKeyIndex, m_nHitDimension);
-            // ease-to
-            ITcbKey key;
-            keyHandle.GetKey(&key);
-            key.easeto += easeTo;
-            if (key.easeto > 1)
-            {
-                key.easeto = 1.0f;
-            }
-            else if (key.easeto < 0)
-            {
-                key.easeto = 0;
-            }
-            keyHandle.SetKey(&key);
-            // tin
-            ISplineInterpolator::ValueType tin, tout;
-            m_pHitSpline->GetKeyTangents(m_nHitKeyIndex, tin, tout);
-            tin[m_nHitDimension] = ds;
-            m_pHitSpline->SetKeyInTangent(m_nHitKeyIndex, tin);
-        }
-        else
-        {
-            float dd, easeFrom;
-            ComputeOutgoingTangentAndEaseFrom(dd, easeFrom, point, splineIndex, m_nHitKeyIndex, m_nHitDimension);
-            // ease-from
-            ITcbKey key;
-            keyHandle.GetKey(&key);
-            key.easefrom += easeFrom;
-            if (key.easefrom > 1)
-            {
-                key.easefrom = 1.0f;
-            }
-            else if (key.easefrom < 0)
-            {
-                key.easefrom = 0;
-            }
-            keyHandle.SetKey(&key);
-            // tout
-            ISplineInterpolator::ValueType tin, tout;
-            m_pHitSpline->GetKeyTangents(m_nHitKeyIndex, tin, tout);
-            tout[m_nHitDimension] = dd;
-            m_pHitSpline->SetKeyOutTangent(m_nHitKeyIndex, tout);
-        }
-    }
-    else
-    {
-        assert(pTrack->GetCurveType() == eAnimCurveType_BezierFloat);
-        assert(m_nHitDimension == 0);
-
-        Vec2 tp = ClientToWorld(point);
-        if (m_bHitIncomingHandle)
-        {
-            // tin
-            ISplineInterpolator::ValueType value, tin, tout;
-            float time = m_pHitSpline->GetKeyTime(m_nHitKeyIndex);
-            m_pHitSpline->GetKeyValue(m_nHitKeyIndex, value);
-            m_pHitSpline->GetKeyTangents(m_nHitKeyIndex, tin, tout);
-            tin[0] = time - tp.x;
-            // Constrain the time range so that the time curve is always monotonically increasing.
-            if (tin[0] < 0)
-            {
-                tin[0] = 0;
-            }
-            else if (m_nHitKeyIndex > 0
-                     && tin[0] > (time - m_pHitSpline->GetKeyTime(m_nHitKeyIndex - 1)))
-            {
-                tin[0] = time - m_pHitSpline->GetKeyTime(m_nHitKeyIndex - 1);
-            }
-            tin[1] = value[0] - tp.y;
-            m_pHitSpline->SetKeyInTangent(m_nHitKeyIndex, tin);
-        }
-        else
-        {
-            // tout
-            ISplineInterpolator::ValueType value, tin, tout;
-            float time = m_pHitSpline->GetKeyTime(m_nHitKeyIndex);
-            m_pHitSpline->GetKeyValue(m_nHitKeyIndex, value);
-            m_pHitSpline->GetKeyTangents(m_nHitKeyIndex, tin, tout);
-            tout[0] = tp.x - time;
-            // Constrain the time range so that the time curve is always monotonically increasing.
-            if (tout[0] < 0)
-            {
-                tout[0] = 0;
-            }
-            else if (m_nHitKeyIndex < m_pHitSpline->GetKeyCount() - 1
-                     && tout[0] > (m_pHitSpline->GetKeyTime(m_nHitKeyIndex + 1) - time))
-            {
-                tout[0] = m_pHitSpline->GetKeyTime(m_nHitKeyIndex + 1) - time;
-            }
-            tout[1] = tp.y - value[0];
-            m_pHitSpline->SetKeyOutTangent(m_nHitKeyIndex, tout);
-        }
-    }
-
-    SendNotifyEvent(SPLN_CHANGE);
-    update();
-}
-
-void CTrackViewSplineCtrl::mouseMoveEvent(QMouseEvent* event)
-{
-    const QPoint point = event->pos();
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (!pSequence)
-    {
-        return;
-    }
-
-    CTrackViewSequenceNotificationContext context(pSequence);
-
-    QPoint cMousePosPrev = m_cMousePos;
-    m_cMousePos = point;
-
-    if (m_editMode == NothingMode)
-    {
-        switch (HitTest(point))
-        {
-        case HIT_SPLINE:
-            setCursor(CMFCUtils::LoadCursor(IDC_ARRWHITE));
-            break;
-        case HIT_KEY:
-        case HIT_TANGENT_HANDLE:
-            setCursor(CMFCUtils::LoadCursor(IDC_ARRBLCK));
-            break;
-        default:
-            unsetCursor();
-            break;
-        }
-    }
-
-    if (m_editMode == SelectMode)
-    {
-        unsetCursor();
-        QRect rc(m_cMouseDownPos, point);
-        rc = rc.normalized().intersected(m_rcSpline);
-
-        m_rcSelect = rc;
-        m_rubberBand->setGeometry(m_rcSelect);
-        m_rubberBand->setVisible(true);
-    }
-
-    if (m_editMode == TimeMarkerMode)
-    {
-        unsetCursor();
-        SetTimeMarker(XOfsToTime(point.x()));
-        SendNotifyEvent(SPLN_TIME_CHANGE);
-    }
-
-    if (m_boLeftMouseButtonDown)
-    {
-        if (m_editMode == TrackingMode && point != m_cMouseDownPos)
-        {
-            m_startedDragging = true;
-            GetIEditor()->RestoreUndo();
-            m_pCurrentUndo = nullptr;
-            StoreUndo();
-
-            bool bAltClick = CheckVirtualKey(Qt::Key_Menu);
-            bool bShiftClick = CheckVirtualKey(Qt::Key_Shift);
-            bool bSpaceClick = CheckVirtualKey(Qt::Key_Space);
-
-            Vec2 v0 = ClientToWorld(m_cMouseDownPos);
-            Vec2 v1 = ClientToWorld(point);
-            if (m_hitCode == HIT_TANGENT_HANDLE)
-            {
-                if (!m_bTangentsFreeze)
-                {
-                    MoveSelectedTangentHandleTo(point);
-                }
-            }
-            else if (!m_bKeysFreeze)
-            {
-                if (bAltClick && bShiftClick)
-                {
-                    ValueScaleKeys(v0.y, v1.y);
-                }
-                else if (bAltClick)
-                {
-                    TimeScaleKeys(m_fTimeMarker, v0.x, v1.x);
-                }
-                else if (bShiftClick)
-                {
-                    // Constrains the move to the vertical direction.
-                    MoveSelectedKeys(Vec2(0, v1.y - v0.y), false);
-                }
-                else if (bSpaceClick)
-                {
-                    // Reset to the original position.
-                    MoveSelectedKeys(Vec2(0, 0), false);
-                }
-                else
-                {
-                    MoveSelectedKeys(v1 - v0, m_copyKeys);
-                }
-            }
-        }
-    }
-
-    if (m_editMode == TrackingMode && GetNumSelected() == 1)
-    {
-        float time = 0;
-        ISplineInterpolator::ValueType  afValue;
-        QString                         tipText;
-        bool                            boFoundTheSelectedKey(false);
-
-        for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
-        {
-            ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-            CTrackViewTrack* pTrack = m_tracks[splineIndex];
-            for (int i = 0; i < pSpline->GetKeyCount(); i++)
-            {
-                const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
-
-                for (int nCurrentDimension = 0; nCurrentDimension < pSpline->GetNumDimensions(); nCurrentDimension++)
-                {
-                    if (pSpline->IsKeySelectedAtDimension(i, nCurrentDimension))
-                    {
-                        time = pSpline->GetKeyTime(i);
-                        pSpline->GetKeyValue(i, afValue);
-                        if (pTrack->GetCurveType() == eAnimCurveType_TCBFloat)
-                        {
-                            ITcbKey key;
-                            keyHandle.GetKey(&key);
-                            tipText = QStringLiteral("t=%1  v=%2 / T=%3  C=%4  B=%5")
-                                .arg(time * m_fTooltipScaleX, 3, 'f').arg(afValue[nCurrentDimension] * m_fTooltipScaleY, 3, 'f', 2)
-                                .arg(key.tens, 3, 'f').arg(key.cont, 3, 'f').arg(key.bias, 3, 'f');
-                        }
-                        else
-                        {
-                            assert(pTrack->GetCurveType() == eAnimCurveType_BezierFloat);
-                            ISplineInterpolator::ValueType tin, tout;
-                            pSpline->GetKeyTangents(i, tin, tout);
-                            tipText = QStringLiteral("t=%1  v=%2 / tin=(%3,%4)  tout=(%5,%6)")
-                                .arg(time * m_fTooltipScaleX, 3, 'f').arg(afValue[0] * m_fTooltipScaleY, 3, 'f', 2)
-                                .arg(tin[0], 3, 'f').arg(tin[1], 3, 'f', 2).arg(tout[0], 3, 'f').arg(tout[1], 3, 'f', 2);
-                        }
-                        boFoundTheSelectedKey = true;
-                        break;
-                    }
-                }
-                if (boFoundTheSelectedKey)
-                {
-                    break;
-                }
-            }
-        }
-
-        if (point != m_lastToolTipPos)
-        {
-            m_lastToolTipPos = point;
-            m_tooltipText = tipText;
-            update();
-        }
-    }
-
-    switch (m_editMode)
-    {
-    case ScrollMode:
-    {
-        // Set the new scrolled coordinates
-        float ofsx = m_grid.origin.x - (point.x() - m_cMouseDownPos.x()) / m_grid.zoom.x;
-        float ofsy = m_grid.origin.y + (point.y() - m_cMouseDownPos.y()) / m_grid.zoom.y;
-        SetScrollOffset(Vec2(ofsx, ofsy));
-        m_cMouseDownPos = point;
-    }
-    break;
-
-    case ZoomMode:
-    {
-        float ofsx = (point.x() - m_cMouseDownPos.x()) * 0.01f;
-        float ofsy = (point.y() - m_cMouseDownPos.y()) * 0.01f;
-
-        Vec2 z = m_grid.zoom;
-        if (ofsx != 0)
-        {
-            z.x = max(z.x * (1.0f + ofsx), 0.001f);
-        }
-        if (ofsy != 0)
-        {
-            z.y = max(z.y * (1.0f + ofsy), 0.001f);
-        }
-        SetZoom(z, m_cMouseDownPos);
-        m_cMouseDownPos = point;
-    }
-    break;
-    }
-}
-
-void CTrackViewSplineCtrl::AdjustTCB(float d_tension, float d_continuity, float d_bias)
-{
-    CUndo undo("Modify Spline Keys TCB");
-    ConditionalStoreUndo();
-
-    SendNotifyEvent(SPLN_BEFORE_CHANGE);
-
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-        CTrackViewTrack* pTrack = m_tracks[splineIndex];
-
-        if (pTrack->GetCurveType() != eAnimCurveType_TCBFloat)
-        {
-            continue;
-        }
-
-        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
-        {
-            CTrackViewKeyHandle keyHandle = pTrack->GetKey(i);
-
-            // If the key is selected in any dimension...
-            for (
-                int nCurrentDimension = 0;
-                nCurrentDimension < pSpline->GetNumDimensions();
-                nCurrentDimension++
-                )
-            {
-                if (IsKeySelected(pSpline, i, nCurrentDimension))
-                {
-                    ITcbKey key;
-                    keyHandle.GetKey(&key);
-                    // tension
-                    key.tens += d_tension;
-                    if (key.tens > 1)
-                    {
-                        key.tens = 1.0f;
-                    }
-                    else if (key.tens < -1)
-                    {
-                        key.tens = -1.0f;
-                    }
-                    // continuity
-                    key.cont += d_continuity;
-                    if (key.cont > 1)
-                    {
-                        key.cont = 1.0f;
-                    }
-                    else if (key.cont < -1)
-                    {
-                        key.cont = -1.0f;
-                    }
-                    // bias
-                    key.bias += d_bias;
-                    if (key.bias > 1)
-                    {
-                        key.bias = 1.0f;
-                    }
-                    else if (key.bias < -1)
-                    {
-                        key.bias = -1.0f;
-                    }
-                    keyHandle.SetKey(&key);
-                    OnUserCommand(ID_TANGENT_AUTO);
-                    break;
-                }
-            }
-        }
-    }
-
-    SendNotifyEvent(SPLN_CHANGE);
-    update();
-}
-
-void CTrackViewSplineCtrl::OnUserCommand(UINT cmd)
-{
-    if (cmd == ID_TANGENT_UNIFY)
-    {
-        if (IsUnifiedKeyCurrentlySelected() == false)
-        {
-            ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_ALL_MASK, SPLINE_KEY_TANGENT_UNIFIED);
-        }
-        else
-        {
-            ModifySelectedKeysFlags(SPLINE_KEY_TANGENT_ALL_MASK, SPLINE_KEY_TANGENT_BROKEN);
-        }
-    }
-    else if (cmd == ID_FREEZE_KEYS)
-    {
-        m_bKeysFreeze = !m_bKeysFreeze;
-    }
-    else if (cmd == ID_FREEZE_TANGENTS)
-    {
-        m_bTangentsFreeze = !m_bTangentsFreeze;
-    }
-    else
-    {
-        SplineWidget::OnUserCommand(cmd);
-    }
-}
-
-bool CTrackViewSplineCtrl::IsUnifiedKeyCurrentlySelected() const
-{
-    for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
-    {
-        ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
-
-        if (pSpline == NULL)
-        {
-            continue;
-        }
-
-        for (int i = 0; i < (int)pSpline->GetKeyCount(); i++)
-        {
-            // If the key is selected in any dimension...
-            for (
-                int nCurrentDimension = 0;
-                nCurrentDimension < pSpline->GetNumDimensions();
-                nCurrentDimension++
-                )
-            {
-                if (IsKeySelected(pSpline, i, nCurrentDimension))
-                {
-                    int flags = pSpline->GetKeyFlags(i);
-                    if ((flags & SPLINE_KEY_TANGENT_ALL_MASK) != SPLINE_KEY_TANGENT_UNIFIED)
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-void CTrackViewSplineCtrl::ClearSelection()
-{
-    // In this case, we should deselect all keys, even ones in other tracks.
-    // So this overriding is necessary.
-    CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (pSequence)
-    {
-        pSequence->DeselectAllKeys();
-    }
-}
-
-ISplineCtrlUndo* CTrackViewSplineCtrl::CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer)
-{
-    return new CUndoTrackViewSplineCtrl(this, splineContainer);
-}
-
-void CTrackViewSplineCtrl::mousePressEvent(QMouseEvent* event)
-{
-    if (GetIEditor()->GetAnimation()->GetSequence())
-    {
-        SplineWidget::mousePressEvent(event);
-        if (m_editMode == TimeMarkerMode)
-        {
-            // turn off recording when dragging time
-            m_stashedRecordModeWhenDraggingTime = GetIEditor()->GetAnimation()->IsRecordMode();
-            GetIEditor()->GetAnimation()->SetRecording(false);
-        }
-    }
-}
-
-void CTrackViewSplineCtrl::mouseReleaseEvent(QMouseEvent* event)
-{
-    if (GetIEditor()->GetAnimation()->GetSequence())
-    {
-        bool restoreRecordModeToTrue = (m_editMode == TimeMarkerMode && m_stashedRecordModeWhenDraggingTime);
-        
-        SplineWidget::mouseReleaseEvent(event);
-
-        if (restoreRecordModeToTrue)
-        {
-            // restore recording when dragging time
-            GetIEditor()->GetAnimation()->SetRecording(true);
-            m_stashedRecordModeWhenDraggingTime = false;    // reset stashed value
-        }
-    }
-}
-
-void CTrackViewSplineCtrl::mouseDoubleClickEvent(QMouseEvent* event)
-{
-    CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        SplineWidget::mouseDoubleClickEvent(event);
-
-        if (m_hitCode == HIT_SPLINE)
-        {
-            // HIT_SPLINE results in an added key that gets selected.
-            // Use the selected keys to notify the sequence, key by key, of newly added keys
-            CTrackViewKeyBundle addedKeys = sequence->GetSelectedKeys();
-            for (int keyIdx = addedKeys.GetKeyCount(); --keyIdx >= 0; )
-            {
-                CTrackViewKeyHandle addedKey = addedKeys.GetKey(keyIdx);
-                sequence->OnKeyAdded(addedKey);
-            }
-        }
-    }
-}
-
-void CTrackViewSplineCtrl::keyPressEvent(QKeyEvent* event)
-{
-    auto sequence = GetIEditor()->GetAnimation()->GetSequence();
-    if (sequence)
-    {
-        // HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
-        if (event->key() == Qt::Key_S && m_playCallback)
-        {
-            m_playCallback();
-        }
-        else if (event->matches(QKeySequence::Delete))
-        {
-            CUndo undo("Delete Keys");
-
-            SendNotifyEvent(SPLN_BEFORE_CHANGE);
-            sequence->DeleteSelectedKeys();
-            SendNotifyEvent(SPLN_CHANGE);
-            update();
-        }
-        else if (event->matches(QKeySequence::Undo))
-        {
-            GetIEditor()->Undo();
-        }
-        else if (event->matches(QKeySequence::Redo))
-        {
-            GetIEditor()->Redo();
-        }
-        else
-        {
-            SplineWidget::keyPressEvent(event);
-        }
-    }
-}
-
-bool CTrackViewSplineCtrl::event(QEvent* e)
-{
-    if (e->type() == QEvent::ShortcutOverride)
-    {
-        // since we respond to the following things, let Qt know so that shortcuts don't override us
-        bool respondsToEvent = false;
-
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(e);
-        if (keyEvent->key() == Qt::Key_S)
-        {
-            respondsToEvent = true;
-        }
-        else
-        {
-            respondsToEvent = keyEvent->matches(QKeySequence::Delete) ||
-                keyEvent->matches(QKeySequence::Undo) ||
-                keyEvent->matches(QKeySequence::Redo);
-        }
-
-        if (respondsToEvent)
-        {
-            e->accept();
-            return true;
-        }
-    }
-
-    return SplineWidget::event(e);
-}
-
-void CTrackViewSplineCtrl::wheelEvent(QWheelEvent* event)
-{
-    if (GetIEditor()->GetAnimation()->GetSequence())
-    {
-        SplineWidget::wheelEvent(event);
-    }
-}
-
-void CTrackViewSplineCtrl::SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect)
-{
-    SplineWidget::SelectKey(pSpline, nKey, nDimension, bSelect);
-    GetIEditor()->GetAnimation()->GetSequence()->OnKeySelectionChanged();
-}
-
-void CTrackViewSplineCtrl::SelectRectangle(const QRect& rc, bool bSelect)
-{
-    SplineWidget::SelectRectangle(rc, bSelect);
-    GetIEditor()->GetAnimation()->GetSequence()->OnKeySelectionChanged();
-}
-
-void CTrackViewSplineCtrl::SetPlayCallback(const std::function<void()>& callback)
-{
-    m_playCallback = callback;
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.h b/Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.h
deleted file mode 100644
index 6ed55a45e7..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSPLINECTRL_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSPLINECTRL_H
-#pragma once
-
-
-#include <IMovieSystem.h>
-#include "Controls/SplineCtrlEx.h"
-#include <functional>
-
-class CTrackViewTrack;
-
-/** A customized spline control for CTrackViewGraph.
-*/
-class CTrackViewSplineCtrl
-    : public SplineWidget
-{
-    friend class CUndoTrackViewSplineCtrl;
-public:
-    CTrackViewSplineCtrl(QWidget* parent);
-    virtual ~CTrackViewSplineCtrl();
-
-    virtual void ClearSelection();
-
-    void AddSpline(ISplineInterpolator* pSpline, CTrackViewTrack* pTrack, const QColor& color);
-    void AddSpline(ISplineInterpolator * pSpline, CTrackViewTrack * pTrack, QColor anColorArray[4]);
-
-    const std::vector<CTrackViewTrack*>& GetTracks() const { return m_tracks; }
-    void RemoveAllSplines();
-
-    void OnUserCommand(UINT cmd);
-    bool IsUnifiedKeyCurrentlySelected() const;
-    bool IsKeysFrozen() const { return m_bKeysFreeze; }
-    bool IsTangentsFrozen() const { return m_bTangentsFreeze; }
-
-    void SetPlayCallback(const std::function<void()>& callback);
-
-protected:
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void mouseDoubleClickEvent(QMouseEvent* event) override;
-    void keyPressEvent(QKeyEvent* event) override;
-    bool event(QEvent* event) override;
-    void wheelEvent(QWheelEvent* event) override;
-
-private:
-    virtual void SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect) override;
-    virtual void SelectRectangle(const QRect& rc, bool bSelect) override;
-
-    std::vector<CTrackViewTrack*> m_tracks;
-
-    virtual bool GetTangentHandlePts(QPoint& inTangentPt, QPoint& pt, QPoint& outTangentPt,
-        int nSpline, int nKey, int nDimension) override;
-    void ComputeIncomingTangentAndEaseTo(float& ds, float& easeTo, QPoint inTangentPt,
-        int nSpline, int nKey, int nDimension);
-    void ComputeOutgoingTangentAndEaseFrom(float& dd, float& easeFrom, QPoint outTangentPt,
-        int nSpline, int nKey, int nDimension);
-    void AdjustTCB(float d_tension, float d_continuity, float d_bias);
-    void MoveSelectedTangentHandleTo(const QPoint& point);
-
-    virtual ISplineCtrlUndo* CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer);
-
-    bool m_bKeysFreeze;
-    bool m_bTangentsFreeze;
-    bool m_stashedRecordModeWhenDraggingTime;
-
-    std::function<void()> m_playCallback;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWSPLINECTRL_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTimeline.cpp b/Code/Sandbox/Editor/TrackView/TrackViewTimeline.cpp
deleted file mode 100644
index 5cb7d04483..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewTimeline.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewTimeline.h"
-
-// Editor
-#include "AnimationContext.h"
-
-namespace TrackView
-{
-    void CTrackViewTimelineWidget::mousePressEvent(QMouseEvent* event)
-    {
-        m_stashedRecordModeWhileTimeDragging = GetIEditor()->GetAnimation()->IsRecordMode();
-        GetIEditor()->GetAnimation()->SetRecording(false);  // disable recording while dragging time
-
-        TimelineWidget::mousePressEvent(event);
-    }
-
-    void CTrackViewTimelineWidget::mouseReleaseEvent(QMouseEvent* event)
-    {
-        TimelineWidget::mouseReleaseEvent(event);
-    
-        if (m_stashedRecordModeWhileTimeDragging)
-        {
-            GetIEditor()->GetAnimation()->SetRecording(true);   // restore recording
-            m_stashedRecordModeWhileTimeDragging = false;       // reset stash
-        }
-    }
-} // namespace TrackView
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTimeline.h b/Code/Sandbox/Editor/TrackView/TrackViewTimeline.h
deleted file mode 100644
index bb3ddc4996..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewTimeline.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "Controls/TimelineCtrl.h"
-
-namespace TrackView
-{
-    /** A customized timeline widget for CTrackViewGraph.
-    */
-    class CTrackViewTimelineWidget
-        : public TimelineWidget
-    {
-    public:
-
-        CTrackViewTimelineWidget(QWidget* parent = nullptr)
-            : TimelineWidget(parent)
-            , m_stashedRecordModeWhileTimeDragging(false) {};
-        virtual ~CTrackViewTimelineWidget() = default;
-
-    protected:
-        void mousePressEvent(QMouseEvent* event) override;
-        void mouseReleaseEvent(QMouseEvent* event) override;
-
-    private:
-        bool m_stashedRecordModeWhileTimeDragging;
-    };
-} // namespace TrackView
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTrack.cpp b/Code/Sandbox/Editor/TrackView/TrackViewTrack.cpp
deleted file mode 100644
index 20e9829e94..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewTrack.cpp
+++ /dev/null
@@ -1,829 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewTrack.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimParamType.h>
-
-// Editor
-#include "TrackViewSequence.h"
-#include "TrackViewNodeFactories.h"
-#include "TrackViewUndo.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrackBundle::AppendTrack(CTrackViewTrack* pTrack)
-{
-    // Check if newly added key has different type than existing ones
-    if (m_bAllOfSameType && m_tracks.size() > 0)
-    {
-        const CTrackViewTrack* pLastTrack = m_tracks.back();
-
-        if (pTrack->GetParameterType() != pLastTrack->GetParameterType()
-            || pTrack->GetCurveType() != pLastTrack->GetCurveType()
-            || pTrack->GetValueType() != pLastTrack->GetValueType())
-        {
-            m_bAllOfSameType = false;
-        }
-    }
-
-    stl::push_back_unique(m_tracks, pTrack);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrackBundle::AppendTrackBundle(const CTrackViewTrackBundle& bundle)
-{
-    for (auto iter = bundle.m_tracks.begin(); iter != bundle.m_tracks.end(); ++iter)
-    {
-        AppendTrack(*iter);
-    }
-}
-
-bool CTrackViewTrackBundle::RemoveTrack(CTrackViewTrack* trackToRemove)
-{
-    return stl::find_and_erase(m_tracks, trackToRemove);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrack::CTrackViewTrack(IAnimTrack* pTrack, CTrackViewAnimNode* pTrackAnimNode,
-    CTrackViewNode* pParentNode, bool bIsSubTrack, unsigned int subTrackIndex)
-    : CTrackViewNode(pParentNode)
-    , m_pAnimTrack(pTrack)
-    , m_pTrackAnimNode(pTrackAnimNode)
-    , m_bIsSubTrack(bIsSubTrack)
-    , m_subTrackIndex(subTrackIndex)
-{
-    // Search for child tracks
-    const unsigned int subTrackCount = m_pAnimTrack->GetSubTrackCount();
-    for (unsigned int subTrackI = 0; subTrackI < subTrackCount; ++subTrackI)
-    {
-        IAnimTrack* pSubTrack = m_pAnimTrack->GetSubTrack(subTrackI);
-
-        CTrackViewTrackFactory trackFactory;
-        CTrackViewTrack* pNewTVTrack = trackFactory.BuildTrack(pSubTrack, pTrackAnimNode, this, true, subTrackI);
-        m_childNodes.push_back(std::unique_ptr<CTrackViewNode>(pNewTVTrack));
-    }
-
-    m_bIsCompoundTrack = subTrackCount > 0;
-
-    // Connect bus to listen for OnStart/StopPlayInEditor events
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
-}
-
-CTrackViewTrack::~CTrackViewTrack()
-{
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewAnimNode* CTrackViewTrack::GetAnimNode() const
-{
-    return m_pTrackAnimNode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewTrack::SnapTimeToPrevKey(float& time) const
-{
-    CTrackViewKeyHandle prevKey = const_cast<CTrackViewTrack*>(this)->GetPrevKey(time);
-
-    if (prevKey.IsValid())
-    {
-        time = prevKey.GetTime();
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewTrack::SnapTimeToNextKey(float& time) const
-{
-    CTrackViewKeyHandle prevKey = const_cast<CTrackViewTrack*>(this)->GetNextKey(time);
-
-    if (prevKey.IsValid())
-    {
-        time = prevKey.GetTime();
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SetExpanded(bool expanded)
-{
-    if (m_pAnimTrack)
-    {
-        CTrackViewSequence* sequence = GetSequence();
-        if (nullptr != sequence)
-        {
-            if (GetExpanded() != expanded)
-            {
-                m_pAnimTrack->SetExpanded(expanded);
-
-                if (expanded)
-                {
-                    sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Expanded);
-                }
-                else
-                {
-                    sequence->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Collapsed);
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewTrack::GetExpanded() const
-{
-    return (m_pAnimTrack) ? m_pAnimTrack->GetExpanded() : false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewTrack::GetPrevKey(const float time)
-{
-    CTrackViewKeyHandle keyHandle;
-
-#ifdef max
-#undef max
-#endif
-
-    const float startTime = time;
-    float closestTime = -std::numeric_limits<float>::max();
-
-    const int numKeys = m_pAnimTrack->GetNumKeys();
-    for (int i = 0; i < numKeys; ++i)
-    {
-        const float keyTime = m_pAnimTrack->GetKeyTime(i);
-        if (keyTime < startTime && keyTime > closestTime)
-        {
-            keyHandle = CTrackViewKeyHandle(this, i);
-            closestTime = keyTime;
-        }
-    }
-
-    return keyHandle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewTrack::GetNextKey(const float time)
-{
-    CTrackViewKeyHandle keyHandle;
-
-    const float startTime = time;
-    float closestTime = std::numeric_limits<float>::max();
-
-    const int numKeys = m_pAnimTrack->GetNumKeys();
-    for (int i = 0; i < numKeys; ++i)
-    {
-        const float keyTime = m_pAnimTrack->GetKeyTime(i);
-        if (keyTime > startTime && keyTime < closestTime)
-        {
-            keyHandle = CTrackViewKeyHandle(this, i);
-            closestTime = keyTime;
-        }
-    }
-
-    return keyHandle;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyBundle CTrackViewTrack::GetSelectedKeys()
-{
-    CTrackViewKeyBundle bundle;
-
-    if (m_bIsCompoundTrack)
-    {
-        for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-        {
-            bundle.AppendKeyBundle((*iter)->GetSelectedKeys());
-        }
-    }
-    else
-    {
-        bundle = GetKeys(true, -std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyBundle CTrackViewTrack::GetAllKeys()
-{
-    CTrackViewKeyBundle bundle;
-
-    if (m_bIsCompoundTrack)
-    {
-        for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-        {
-            bundle.AppendKeyBundle((*iter)->GetAllKeys());
-        }
-    }
-    else
-    {
-        bundle = GetKeys(false, -std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyBundle CTrackViewTrack::GetKeysInTimeRange(const float t0, const float t1)
-{
-    CTrackViewKeyBundle bundle;
-
-    if (m_bIsCompoundTrack)
-    {
-        for (auto iter = m_childNodes.begin(); iter != m_childNodes.end(); ++iter)
-        {
-            bundle.AppendKeyBundle((*iter)->GetKeysInTimeRange(t0, t1));
-        }
-    }
-    else
-    {
-        bundle = GetKeys(false, t0, t1);
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyBundle CTrackViewTrack::GetKeys(const bool bOnlySelected, const float t0, const float t1)
-{
-    CTrackViewKeyBundle bundle;
-
-    const int keyCount = m_pAnimTrack->GetNumKeys();
-    for (int keyIndex = 0; keyIndex < keyCount; ++keyIndex)
-    {
-        const float keyTime = m_pAnimTrack->GetKeyTime(keyIndex);
-        const bool timeRangeOk = (t0 <= keyTime && keyTime <= t1);
-
-        if ((!bOnlySelected || IsKeySelected(keyIndex)) && timeRangeOk)
-        {
-            CTrackViewKeyHandle keyHandle(this, keyIndex);
-            bundle.AppendKey(keyHandle);
-        }
-    }
-
-    return bundle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewTrack::CreateKey(const float time)
-{
-    const int keyIndex = m_pAnimTrack->CreateKey(time);
-    GetSequence()->OnKeysChanged();
-    CTrackViewKeyHandle createdKeyHandle(this, keyIndex);
-    GetSequence()->OnKeyAdded(createdKeyHandle);
-
-    return createdKeyHandle;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SlideKeys(const float time0, const float timeOffset)
-{
-    for (int i = 0; i < m_pAnimTrack->GetNumKeys(); ++i)
-    {
-        float keyTime = m_pAnimTrack->GetKeyTime(i);
-        if (keyTime >= time0)
-        {
-            m_pAnimTrack->SetKeyTime(i, keyTime + timeOffset);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::OffsetKeyPosition(const Vec3& offset)
-{
-    // Use the CUndoComponentEntityTrackObject here and not the AZ Undo system because
-    // the Editor movement system uses CUndo as part of its move function (canceling last frame of undo whilst dragging).
-    CUndo::Record(new CUndoComponentEntityTrackObject(this));
-    m_pAnimTrack->OffsetKeyPosition(offset);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM)
-{
-    AZStd::unique_ptr<AzToolsFramework::ScopedUndoBatch> undoBatch;
-
-    if (!AzToolsFramework::UndoRedoOperationInProgress())
-    {
-        undoBatch = AZStd::make_unique<AzToolsFramework::ScopedUndoBatch>("Update Key Data After Parent Changed");
-    }
-
-    m_pAnimTrack->UpdateKeyDataAfterParentChanged(oldParentWorldTM, newParentWorldTM);
-
-    if (undoBatch.get())
-    {
-        undoBatch->MarkEntityDirty(GetSequence()->GetSequenceComponentEntityId());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewTrack::GetKey(unsigned int index)
-{
-    if (index < GetKeyCount())
-    {
-        return CTrackViewKeyHandle(this, index);
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyConstHandle CTrackViewTrack::GetKey(unsigned int index) const
-{
-    if (index < GetKeyCount())
-    {
-        return CTrackViewKeyConstHandle(this, index);
-    }
-
-    return CTrackViewKeyConstHandle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewTrack::GetKeyByTime(const float time)
-{
-    if (m_bIsCompoundTrack)
-    {
-        // Search key in sub tracks
-        unsigned int currentIndex = 0;
-
-        unsigned int childCount = GetChildCount();
-        for (unsigned int i = 0; i < childCount; ++i)
-        {
-            CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(GetChild(i));
-
-            int keyIndex = pChildTrack->m_pAnimTrack->FindKey(time);
-            if (keyIndex >= 0)
-            {
-                return CTrackViewKeyHandle(this, currentIndex + keyIndex);
-            }
-
-            currentIndex += pChildTrack->GetKeyCount();
-        }
-    }
-
-    int keyIndex = m_pAnimTrack->FindKey(time);
-
-    if (keyIndex < 0)
-    {
-        return CTrackViewKeyHandle();
-    }
-
-    return CTrackViewKeyHandle(this, keyIndex);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewTrack::GetNearestKeyByTime(const float time)
-{
-    int minDelta = std::numeric_limits<int>::max();
-
-    const unsigned int keyCount = GetKeyCount();
-    for (unsigned int i = 0; i < keyCount; ++i)
-    {
-        CTrackViewKeyHandle keyHandle = GetKey(i);
-
-        const int deltaT = abs((int)keyHandle.GetTime() - (int)time);
-
-        // If deltaT got larger since last key, then the last key
-        // was the key with minimum temporal distance to the given time
-        if (deltaT > minDelta)
-        {
-            return CTrackViewKeyHandle(this, i - 1);
-        }
-
-        minDelta = std::min(minDelta, deltaT);
-    }
-
-    // If we didn't return above and there are keys, then the
-    // last key needs to be the one with minimum distance
-    if (keyCount > 0)
-    {
-        return CTrackViewKeyHandle(this, keyCount - 1);
-    }
-
-    // No keys
-    return CTrackViewKeyHandle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::GetKeyValueRange(float& min, float& max) const
-{
-    m_pAnimTrack->GetKeyValueRange(min, max);
-}
-
-//////////////////////////////////////////////////////////////////////////
-ColorB CTrackViewTrack::GetCustomColor() const
-{
-    return m_pAnimTrack->GetCustomColor();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SetCustomColor(ColorB color)
-{
-    m_pAnimTrack->SetCustomColor(color);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewTrack::HasCustomColor() const
-{
-    return m_pAnimTrack->HasCustomColor();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::ClearCustomColor()
-{
-    m_pAnimTrack->ClearCustomColor();
-}
-
-//////////////////////////////////////////////////////////////////////////
-IAnimTrack::EAnimTrackFlags CTrackViewTrack::GetFlags() const
-{
-    return (IAnimTrack::EAnimTrackFlags)m_pAnimTrack->GetFlags();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrackMemento CTrackViewTrack::GetMemento() const
-{
-    CTrackViewTrackMemento memento;
-    memento.m_serializedTrackState = XmlHelpers::CreateXmlNode("TrackState");
-    m_pAnimTrack->Serialize(memento.m_serializedTrackState, false);
-    return memento;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::RestoreFromMemento(const CTrackViewTrackMemento& memento)
-{
-    // We're going to de-serialize, so this is const safe
-    XmlNodeRef& xmlNode = const_cast<XmlNodeRef&>(memento.m_serializedTrackState);
-    m_pAnimTrack->Serialize(xmlNode, true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-const char* CTrackViewTrack::GetName() const
-{
-    CTrackViewNode* pParentNode = GetParentNode();
-
-    if (pParentNode->GetNodeType() == eTVNT_Track)
-    {
-        CTrackViewTrack* pParentTrack = static_cast<CTrackViewTrack*>(pParentNode);
-        return pParentTrack->m_pAnimTrack->GetSubTrackName(m_subTrackIndex);
-    }
-
-    return GetAnimNode()->GetParamName(GetParameterType());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SetDisabled(bool bDisabled)
-{
-    if (bDisabled)
-    {
-        m_pAnimTrack->SetFlags(m_pAnimTrack->GetFlags() | IAnimTrack::eAnimTrackFlags_Disabled);
-        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Disabled);
-    }
-    else
-    {
-        m_pAnimTrack->SetFlags(m_pAnimTrack->GetFlags() & ~IAnimTrack::eAnimTrackFlags_Disabled);
-        GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Enabled);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewTrack::IsDisabled() const
-{
-    return m_pAnimTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Disabled;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SetMuted(bool bMuted)
-{
-    if (UsesMute())
-    {
-        if (bMuted)
-        {
-            m_pAnimTrack->SetFlags(m_pAnimTrack->GetFlags() | IAnimTrack::eAnimTrackFlags_Muted);
-            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Muted);
-        }
-        else
-        {
-            m_pAnimTrack->SetFlags(m_pAnimTrack->GetFlags() & ~IAnimTrack::eAnimTrackFlags_Muted);
-            GetSequence()->OnNodeChanged(this, ITrackViewSequenceListener::eNodeChangeType_Unmuted);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Returns whether the track is muted, or false if the track does not use muting
-bool CTrackViewTrack::IsMuted() const
-{
-    return m_pAnimTrack->UsesMute() ? (m_pAnimTrack->GetFlags() & IAnimTrack::eAnimTrackFlags_Muted) : false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SetKey(unsigned int keyIndex, IKey* pKey)
-{
-    m_pAnimTrack->SetKey(keyIndex, pKey);
-    m_pTrackAnimNode->GetSequence()->OnKeysChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::GetKey(unsigned int keyIndex, IKey* pKey) const
-{
-    m_pAnimTrack->GetKey(keyIndex, pKey);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SelectKey(unsigned int keyIndex, bool bSelect)
-{
-    const bool bWasSelected = m_pAnimTrack->IsKeySelected(keyIndex);
-
-    m_pAnimTrack->SelectKey(keyIndex, bSelect);
-
-    if (bSelect != bWasSelected)
-    {
-        m_pTrackAnimNode->GetSequence()->OnKeySelectionChanged();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SetKeyTime(const int index, const float time, bool notifyListeners)
-{
-    const float bOldTime = m_pAnimTrack->GetKeyTime(index);
-
-    m_pAnimTrack->SetKeyTime(index, time);
-
-    if (notifyListeners && (bOldTime != time))
-    {
-        // The keys were just make invalid by the above SetKeyTime(), so sort them now
-        // to make sure they are ready to be used. Only do this when notifyListeners
-        // is set so client callers can batch up a bunch of SetKeyTime calls if desired.
-        m_pAnimTrack->SortKeys();
-
-        m_pTrackAnimNode->GetSequence()->OnKeysChanged();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CTrackViewTrack::GetKeyTime(const int index) const
-{
-    return m_pAnimTrack->GetKeyTime(index);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::RemoveKey(const int index)
-{
-    m_pAnimTrack->RemoveKey(index);
-    m_pTrackAnimNode->GetSequence()->OnKeysChanged();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewTrack::CloneKey(const int index)
-{
-    int newIndex = m_pAnimTrack->CloneKey(index);
-    m_pTrackAnimNode->GetSequence()->OnKeysChanged();
-    return newIndex;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SelectKeys(const bool bSelected)
-{
-    m_pTrackAnimNode->GetSequence()->QueueNotifications();
-
-    if (!m_bIsCompoundTrack)
-    {
-        unsigned int keyCount = GetKeyCount();
-        for (unsigned int i = 0; i < keyCount; ++i)
-        {
-            m_pAnimTrack->SelectKey(i, bSelected);
-            m_pTrackAnimNode->GetSequence()->OnKeySelectionChanged();
-        }
-    }
-    else
-    {
-        // Affect sub tracks
-        unsigned int childCount = GetChildCount();
-        for (unsigned int childIndex = 0; childIndex < childCount; ++childIndex)
-        {
-            CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(GetChild(childIndex));
-            pChildTrack->SelectKeys(bSelected);
-            m_pTrackAnimNode->GetSequence()->OnKeySelectionChanged();
-        }
-    }
-
-    m_pTrackAnimNode->GetSequence()->SubmitPendingNotifcations();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewTrack::IsKeySelected(unsigned int keyIndex) const
-{
-    if (m_pAnimTrack)
-    {
-        return m_pAnimTrack->IsKeySelected(keyIndex);
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SetSortMarkerKey(unsigned int keyIndex, bool enabled)
-{
-    if (m_pAnimTrack)
-    {
-        return m_pAnimTrack->SetSortMarkerKey(keyIndex, enabled);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CTrackViewTrack::IsSortMarkerKey(unsigned int keyIndex) const
-{
-    if (m_pAnimTrack)
-    {
-        return m_pAnimTrack->IsSortMarkerKey(keyIndex);
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewKeyHandle CTrackViewTrack::GetSubTrackKeyHandle(unsigned int index) const
-{
-    // Return handle to sub track key
-    unsigned int childCount = GetChildCount();
-    for (unsigned int childIndex = 0; childIndex < childCount; ++childIndex)
-    {
-        CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(GetChild(childIndex));
-
-        const unsigned int childKeyCount = pChildTrack->GetKeyCount();
-        if (index < childKeyCount)
-        {
-            return pChildTrack->GetKey(index);
-        }
-
-        index -= childKeyCount;
-    }
-
-    return CTrackViewKeyHandle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::SetAnimationLayerIndex(const int index)
-{
-    if (m_pAnimTrack)
-    {
-        m_pAnimTrack->SetAnimationLayerIndex(index);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewTrack::GetAnimationLayerIndex() const
-{
-    return m_pAnimTrack->GetAnimationLayerIndex();
-}
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::OnStartPlayInEditor()
-{
-    // remap any AZ::EntityId's used in tracks
-    if (m_pAnimTrack)
-    {
-        // OnStopPlayInEditor clears this as well, but we clear it here in case OnStartPlayInEditor() is called multiple times before OnStopPlayInEditor()
-        m_paramTypeToStashedEntityIdMap.clear();
-
-        CAnimParamType trackParamType = m_pAnimTrack->GetParameterType();
-        const AnimParamType paramType = trackParamType.GetType();
-        if (paramType == AnimParamType::Camera || paramType == AnimParamType::Sequence)
-        {
-            ISelectKey selectKey;
-            ISequenceKey sequenceKey;
-            IKey* key = nullptr;
-
-            for (int i = 0; i < m_pAnimTrack->GetNumKeys(); i++)
-            {
-                AZ::EntityId entityIdToRemap;
-
-                if (paramType == AnimParamType::Camera)
-                {
-                    m_pAnimTrack->GetKey(i, &selectKey);
-                    entityIdToRemap = selectKey.cameraAzEntityId;
-                    key = &selectKey;
-                }
-                else if (paramType == AnimParamType::Sequence)
-                {
-                    m_pAnimTrack->GetKey(i, &sequenceKey);
-                    entityIdToRemap = sequenceKey.sequenceEntityId;    
-                    key = &sequenceKey;
-                }
-
-                // stash the entity Id for restore in OnStopPlayInEditor
-                m_paramTypeToStashedEntityIdMap[trackParamType].push_back(entityIdToRemap);
-
-                if (entityIdToRemap.IsValid())
-                {
-                    AZ::EntityId remappedId;
-                    AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequestBus::Events::MapEditorIdToRuntimeId, entityIdToRemap, remappedId);
-
-                    // remap
-                    if (paramType == AnimParamType::Camera)
-                    {
-                        selectKey.cameraAzEntityId = remappedId;
-                    }
-                    else if (paramType == AnimParamType::Sequence)
-                    {
-                        sequenceKey.sequenceEntityId = remappedId;
-                    }
-                    m_pAnimTrack->SetKey(i, key);
-                }                
-            }
-        }
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::OnStopPlayInEditor()
-{
-    // restore any AZ::EntityId's remapped in OnStartPlayInEditor
-    if (m_pAnimTrack && m_paramTypeToStashedEntityIdMap.size())
-    {
-        CAnimParamType trackParamType = m_pAnimTrack->GetParameterType();
-        const AnimParamType paramType = trackParamType.GetType();
-
-        if (paramType == AnimParamType::Camera || paramType == AnimParamType::Sequence)
-        {
-            for (int i = 0; i < m_pAnimTrack->GetNumKeys(); i++)
-            {
-                ISelectKey selectKey;
-                ISequenceKey sequenceKey;
-                IKey* key = nullptr;
-
-                // restore entityIds
-                if (paramType == AnimParamType::Camera)
-                {
-                    m_pAnimTrack->GetKey(i, &selectKey);
-                    selectKey.cameraAzEntityId = m_paramTypeToStashedEntityIdMap[trackParamType][i];
-                    key = &selectKey;
-                }
-                else if (paramType == AnimParamType::Sequence)
-                {
-                    m_pAnimTrack->GetKey(i, &sequenceKey);
-                    sequenceKey.sequenceEntityId = m_paramTypeToStashedEntityIdMap[trackParamType][i];
-                    key = &sequenceKey;
-                }
-                m_pAnimTrack->SetKey(i, key);
-            }
-        }
-        // clear the StashedEntityIdMap now that we've consumed it
-        m_paramTypeToStashedEntityIdMap.clear();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks)
-{
-    if (bOnlyFromSelectedTracks && !IsSelected())
-    {
-        return;
-    }
-
-    if (GetKeyCount() == 0)
-    {
-        return;
-    }
-
-    if (bOnlySelectedKeys)
-    {
-        CTrackViewKeyBundle keyBundle = GetSelectedKeys();
-        if (keyBundle.GetKeyCount() == 0)
-        {
-            return;
-        }
-    }
-
-    XmlNodeRef childNode = xmlNode->newChild("Track");
-    childNode->setAttr("name", GetName());
-    GetParameterType().SaveToXml(childNode);
-    childNode->setAttr("valueType", static_cast<int>(GetValueType()));
-
-    m_pAnimTrack->SerializeSelection(childNode, false, bOnlySelectedKeys);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewTrack::PasteKeys(XmlNodeRef xmlNode, const float timeOffset)
-{
-
-    CTrackViewSequence* sequence = GetSequence();
-    AZ_Assert(sequence, "Expected sequence not to be null.");
-
-    AzToolsFramework::ScopedUndoBatch undoBatch("Paste Keys");
-    m_pAnimTrack->SerializeSelection(xmlNode, true, true, timeOffset);
-    undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTrack.h b/Code/Sandbox/Editor/TrackView/TrackViewTrack.h
deleted file mode 100644
index dba6631164..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewTrack.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWTRACK_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWTRACK_H
-#pragma once
-
-#include "IMovieSystem.h"
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-
-#include "TrackViewNode.h"
-
-class CTrackViewAnimNode;
-enum class AnimValueType;
-
-// Represents a bundle of tracks
-class CTrackViewTrackBundle
-{
-public:
-    CTrackViewTrackBundle()
-        : m_bAllOfSameType(true)
-        , m_bHasRotationTrack(false) {}
-
-    unsigned int GetCount() const { return m_tracks.size(); }
-    CTrackViewTrack* GetTrack(const unsigned int index) { return m_tracks[index]; }
-    const CTrackViewTrack* GetTrack(const unsigned int index) const { return m_tracks[index]; }
-
-    void AppendTrack(CTrackViewTrack* pTrack);
-    void AppendTrackBundle(const CTrackViewTrackBundle& bundle);
-
-    bool RemoveTrack(CTrackViewTrack* pTrackToRemove);
-
-    bool IsOneTrack() const;
-    bool AreAllOfSameType() const { return m_bAllOfSameType; }
-    bool HasRotationTrack() const { return m_bHasRotationTrack; }
-
-private:
-    bool m_bAllOfSameType;
-    bool m_bHasRotationTrack;
-    std::vector<CTrackViewTrack*> m_tracks;
-};
-
-// Track Memento for Undo/Redo
-class CTrackViewTrackMemento
-{
-private:
-    friend class CTrackViewTrack;
-    XmlNodeRef m_serializedTrackState;
-};
-
-////////////////////////////////////////////////////////////////////////////
-//
-// This class represents a IAnimTrack in TrackView and contains
-// the editor side code for changing it
-//
-// It does *not* have ownership of the IAnimTrack, therefore deleting it
-// will not destroy the CryMovie track
-//
-////////////////////////////////////////////////////////////////////////////
-class CTrackViewTrack
-    : public CTrackViewNode
-    , public ITrackViewKeyBundle
-    , public AzToolsFramework::EditorEntityContextNotificationBus::Handler
-{
-    friend class CTrackViewKeyHandle;
-    friend class CTrackViewKeyConstHandle;
-    friend class CTrackViewKeyBundle;
-
-public:
-    CTrackViewTrack(IAnimTrack* pTrack, CTrackViewAnimNode* pTrackAnimNode, CTrackViewNode* pParentNode,
-        bool bIsSubTrack = false, unsigned int subTrackIndex = 0);
-    ~CTrackViewTrack();
-
-    CTrackViewAnimNode* GetAnimNode() const;
-
-    // Name getter
-    virtual const char* GetName() const;
-
-    // CTrackViewNode
-    virtual ETrackViewNodeType GetNodeType() const override { return eTVNT_Track; }
-
-    // Check for compound/sub track
-    bool IsCompoundTrack() const { return m_bIsCompoundTrack; }
-
-    // Sub track index
-    bool IsSubTrack() const { return m_bIsSubTrack; }
-    unsigned int GetSubTrackIndex() const { return m_subTrackIndex; }
-
-    // Snap time value to prev/next key in track
-    virtual bool SnapTimeToPrevKey(float& time) const override;
-    virtual bool SnapTimeToNextKey(float& time) const override;
-
-    // Expanded state interface
-    void SetExpanded(bool expanded) override;
-    bool GetExpanded() const override;
-
-    // Key getters
-    virtual unsigned int GetKeyCount() const override { return m_pAnimTrack->GetNumKeys(); }
-    virtual CTrackViewKeyHandle GetKey(unsigned int index) override;
-    virtual CTrackViewKeyConstHandle GetKey(unsigned int index) const;
-
-    virtual CTrackViewKeyHandle GetKeyByTime(const float time);
-    virtual CTrackViewKeyHandle GetNearestKeyByTime(const float time);
-
-    virtual CTrackViewKeyBundle GetSelectedKeys() override;
-    virtual CTrackViewKeyBundle GetAllKeys() override;
-    virtual CTrackViewKeyBundle GetKeysInTimeRange(const float t0, const float t1) override;
-
-    // Key modifications
-    virtual CTrackViewKeyHandle CreateKey(const float time);
-    virtual void SlideKeys(const float time0, const float timeOffset);
-    void OffsetKeyPosition(const Vec3& offset);
-    void UpdateKeyDataAfterParentChanged(const AZ::Transform& oldParentWorldTM, const AZ::Transform& newParentWorldTM);
-
-    // Value getters
-    template <class Type>
-    void GetValue(const float time, Type& value, bool applyMultiplier) const
-    {
-        assert (m_pAnimTrack.get());
-        return m_pAnimTrack->GetValue(time, value, applyMultiplier);
-    }
-    template <class Type>
-    void GetValue(const float time, Type& value) const
-    {
-        assert(m_pAnimTrack.get());
-        return m_pAnimTrack->GetValue(time, value);
-    }
-
-    void GetKeyValueRange(float& min, float& max) const;
-
-    // Type getters
-    const CAnimParamType& GetParameterType() const { return m_pAnimTrack->GetParameterType(); }
-    AnimValueType GetValueType() const { return m_pAnimTrack->GetValueType(); }
-    EAnimCurveType GetCurveType() const { return m_pAnimTrack->GetCurveType(); }
-
-    // Mask
-    bool IsMasked(uint32 mask) const { return m_pAnimTrack->IsMasked(mask); }
-
-    // Flag getter
-    IAnimTrack::EAnimTrackFlags GetFlags() const;
-
-    // Spline getter
-    ISplineInterpolator* GetSpline() const { return m_pAnimTrack->GetSpline(); }
-
-    // Color
-    ColorB GetCustomColor() const;
-    void SetCustomColor(ColorB color);
-    bool HasCustomColor() const;
-    void ClearCustomColor();
-
-    // Memento
-    virtual CTrackViewTrackMemento GetMemento() const;
-    virtual void RestoreFromMemento(const CTrackViewTrackMemento& memento);
-
-    // Disabled state
-    virtual void SetDisabled(bool bDisabled) override;
-    virtual bool IsDisabled() const override;
-
-    // Muted state
-    void SetMuted(bool bMuted);
-    bool IsMuted() const;
-
-    // Returns if the contained AnimTrack responds to muting
-    bool UsesMute() const { return m_pAnimTrack.get() ? m_pAnimTrack->UsesMute() : false; }
-
-    // Key selection
-    virtual void SelectKeys(const bool bSelected) override;
-
-    // Paste from XML representation with time offset
-    void PasteKeys(XmlNodeRef xmlNode, const float timeOffset);
-
-    // Key types
-    virtual bool AreAllKeysOfSameType() const override { return true; }
-
-    // Animation layer index
-    void SetAnimationLayerIndex(const int index);
-    int GetAnimationLayerIndex() const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorEntityContextNotificationBus implementation
-    void OnStartPlayInEditor() override;
-    void OnStopPlayInEditor() override;
-    //~AzToolsFramework::EditorEntityContextNotificationBus implementation
-
-    IAnimTrack* GetAnimTrack() const { return m_pAnimTrack.get(); }
-
-    unsigned int GetId() const
-    {
-        return m_pAnimTrack->GetId();
-    }
-
-    void SetId(unsigned int id)
-    {
-        m_pAnimTrack->SetId(id);
-    }
-
-private:
-    CTrackViewKeyHandle GetPrevKey(const float time);
-    CTrackViewKeyHandle GetNextKey(const float time);
-
-    // Those are called from CTrackViewKeyHandle
-    void SetKey(unsigned int keyIndex, IKey* pKey);
-    void GetKey(unsigned int keyIndex, IKey* pKey) const;
-
-    void SelectKey(unsigned int keyIndex, bool bSelect);
-    bool IsKeySelected(unsigned int keyIndex) const;
-
-    void SetSortMarkerKey(unsigned int keyIndex, bool enabled);
-    bool IsSortMarkerKey(unsigned int keyIndex) const;
-
-    void SetKeyTime(const int index, const float time, bool notifyListeners = true);
-    float GetKeyTime(const int index) const;
-
-    void RemoveKey(const int index);
-    int CloneKey(const int index);
-
-    CTrackViewKeyBundle GetKeys(bool bOnlySelected, float t0, float t1);
-    CTrackViewKeyHandle GetSubTrackKeyHandle(unsigned int index) const;
-
-    // Copy selected keys to XML representation for clipboard
-    virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) override;
-
-    bool m_bIsCompoundTrack;
-    bool m_bIsSubTrack;
-    unsigned int m_subTrackIndex;
-    AZStd::intrusive_ptr<IAnimTrack> m_pAnimTrack;
-    CTrackViewAnimNode* m_pTrackAnimNode;
-
-    // used to stash AZ Entity ID's stored in track keys when entering/exiting AI/Physic or Ctrl-G game modes
-    AZStd::unordered_map<CAnimParamType, AZStd::vector<AZ::EntityId>> m_paramTypeToStashedEntityIdMap;  
-};
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWTRACK_H
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewUndo.cpp b/Code/Sandbox/Editor/TrackView/TrackViewUndo.cpp
deleted file mode 100644
index 64ce02036d..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewUndo.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewUndo.h"
-
-// CryCommon
-#include <CryCommon/Maestro/Types/AnimNodeType.h>
-
-// Editor
-#include "TrackView/TrackViewAnimNode.h"
-#include "TrackView/TrackViewSequence.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-CUndoComponentEntityTrackObject::CUndoComponentEntityTrackObject(CTrackViewTrack* track)
-{
-    AZ_Assert(track, "Expected a valid track");
-    if (track)
-    {
-        m_trackName = track->GetName();
-        AZ_Assert(!m_trackName.empty(), "Expected a valid track name");
-
-        CTrackViewAnimNode* animNode = track->GetAnimNode();
-        AZ_Assert(animNode, "Expected a valid anim node");
-        if (animNode)
-        {
-            m_trackComponentId = animNode->GetComponentId();
-            AZ_Assert(m_trackComponentId != AZ::InvalidComponentId, "Expected a valid track component id");
-
-            CTrackViewSequence* sequence = track->GetSequence();
-            AZ_Assert(sequence, "Expected to find the sequence");
-            if (sequence)
-            {
-                m_sequenceId = sequence->GetSequenceComponentEntityId();
-                AZ_Assert(m_sequenceId.IsValid(), "Expected a valid sequence id");
-
-                AnimNodeType nodeType = animNode->GetType();
-                AZ_Assert(nodeType == AnimNodeType::Component, "Expected a this node to be a AnimNodeType::Component type");
-                if (nodeType == AnimNodeType::Component)
-                {
-                    CTrackViewAnimNode* parentAnimNode = static_cast<CTrackViewAnimNode*>(animNode->GetParentNode());
-                    AZ_Assert(parentAnimNode, "Expected a valid parent node");
-                    if (parentAnimNode)
-                    {
-                        m_entityId = parentAnimNode->GetAzEntityId();
-                        AZ_Assert(m_entityId.IsValid(), "Expected a valid sequence id");
-
-                        // Store undo info.
-                        m_undo = track->GetMemento();
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewTrack* CUndoComponentEntityTrackObject::FindTrack(CTrackViewSequence* sequence)
-{
-    AZ_Assert(sequence, "Expected to find the sequence");
-
-    CTrackViewTrack* track = nullptr;
-    CTrackViewTrackBundle allTracks = sequence->GetAllTracks();
-    for (int trackIndex = 0; trackIndex < allTracks.GetCount(); trackIndex++)
-    {
-        CTrackViewTrack* curTrack = allTracks.GetTrack(trackIndex);
-        if (curTrack->GetAnimNode() && curTrack->GetAnimNode()->GetComponentId() == m_trackComponentId)
-        {
-            if (0 == azstricmp(curTrack->GetName(), m_trackName.c_str()))
-            {
-                CTrackViewAnimNode* parentAnimNode = static_cast<CTrackViewAnimNode*>(curTrack->GetAnimNode()->GetParentNode());
-                if (parentAnimNode && parentAnimNode->GetAzEntityId() == m_entityId)
-                {
-                    track = curTrack;
-                    break;
-                }
-            }
-        }
-    }
-    return track;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoComponentEntityTrackObject::Undo(bool bUndo)
-{
-    CTrackViewSequence* sequence = CTrackViewSequence::LookUpSequenceByEntityId(m_sequenceId);
-    AZ_Assert(sequence, "Expected to find the sequence");
-    if (sequence)
-    {
-        CTrackViewTrack* track = FindTrack(sequence);
-        AZ_Assert(track, "Expected to find track");
-        {
-            CTrackViewSequenceNoNotificationContext context(sequence);
-
-            if (bUndo)
-            {
-                m_redo = track->GetMemento();
-            }
-
-            // Undo track state.
-            track->RestoreFromMemento(m_undo);
-        }
-
-        if (bUndo)
-        {
-            sequence->OnKeysChanged();
-        }
-        else
-        {
-            sequence->ForceAnimation();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoComponentEntityTrackObject::Redo()
-{
-    CTrackViewSequence* sequence = CTrackViewSequence::LookUpSequenceByEntityId(m_sequenceId);
-    AZ_Assert(sequence, "Expected to find the sequence");
-    if (sequence)
-    {
-        CTrackViewTrack* track = FindTrack(sequence);
-        AZ_Assert(track, "Expected to find track");
-
-        // Redo track state.
-        track->RestoreFromMemento(m_redo);
-
-        sequence->OnKeysChanged();
-    }
-}
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewUndo.h b/Code/Sandbox/Editor/TrackView/TrackViewUndo.h
deleted file mode 100644
index 93cd9ba4c2..0000000000
--- a/Code/Sandbox/Editor/TrackView/TrackViewUndo.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
-#pragma once
-
-#include "TrackViewTrack.h"
-
-#include "Undo/IUndoObject.h"
-
-class CTrackViewSequence;
-
-/** Undo object stored when track is modified for component entity.
-* Stores ids, not raw pointers.
-*/
-class CUndoComponentEntityTrackObject
-    : public IUndoObject
-{
-public:
-    CUndoComponentEntityTrackObject(CTrackViewTrack* track);
-
-protected:
-    virtual int GetSize() override { return sizeof(*this); }
-    virtual QString GetDescription() override { return "Undo Component Entity Track Modify"; };
-
-    virtual void Undo(bool bUndo) override;
-    virtual void Redo() override;
-
-private:
-
-    // Helper function to get a pointer to the track based.
-    CTrackViewTrack* FindTrack(CTrackViewSequence* sequence);
-
-    // Internal state are id's used to uniquely identify
-    // a track. This does not store pointers to tracks because
-    // those can change when an AZ::Undo event happens and the entity
-    // is reloaded.
-    AZ::EntityId m_sequenceId;
-    AZ::EntityId m_entityId;
-    AZStd::string m_trackName;
-    AZ::ComponentId m_trackComponentId;
-
-    CTrackViewTrackMemento m_undo;
-    CTrackViewTrackMemento m_redo;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
diff --git a/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.cpp b/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.cpp
deleted file mode 100644
index 004d9d5c94..0000000000
--- a/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewExportKeyTimeDlg.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_TrackViewExportKeyTimeDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewExportKeyTimeDlg::CTrackViewExportKeyTimeDlg(QWidget* parent)
-    : QDialog(parent)
-    , m_ui(new Ui::TrackViewExportKeyTimeDlg)
-{
-    m_ui->setupUi(this);
-    m_ui->m_animationTimeExport->setChecked(true);
-    m_ui->m_soundTimeExport->setChecked(true);
-}
-
-CTrackViewExportKeyTimeDlg::~CTrackViewExportKeyTimeDlg()
-{
-}
-
-bool CTrackViewExportKeyTimeDlg::IsAnimationExportChecked() const
-{
-    return m_ui->m_animationTimeExport->isChecked();
-}
-
-bool CTrackViewExportKeyTimeDlg::IsSoundExportChecked() const
-{
-    return m_ui->m_soundTimeExport->isChecked();
-}
-
-#include <moc_TrackViewExportKeyTimeDlg.cpp>
diff --git a/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.h b/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.h
deleted file mode 100644
index 0ec9a07a47..0000000000
--- a/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEWEXPORTKEYTIMEDLG_H
-#define CRYINCLUDE_EDITOR_TRACKVIEWEXPORTKEYTIMEDLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class TrackViewExportKeyTimeDlg;
-}
-
-class CTrackViewExportKeyTimeDlg
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CTrackViewExportKeyTimeDlg(QWidget* parent = nullptr);
-    virtual ~CTrackViewExportKeyTimeDlg();
-
-    bool IsAnimationExportChecked() const;
-    bool IsSoundExportChecked() const;
-
-private:
-    QScopedPointer<Ui::TrackViewExportKeyTimeDlg> m_ui;
-};
-#endif // CRYINCLUDE_EDITOR_TRACKVIEWEXPORTKEYTIMEDLG_H
diff --git a/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.cpp b/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.cpp
deleted file mode 100644
index 2ce9667082..0000000000
--- a/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewFBXImportPreviewDialog.h"
-
-// Qt
-#include <QAbstractListModel>
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_TrackViewFBXImportPreviewDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-class FBXImportModel
-    : public QAbstractListModel
-{
-public:
-    FBXImportModel(CTrackViewFBXImportPreviewDialog::TItemsMap& map, QObject* parent = nullptr)
-        : QAbstractListModel(parent)
-        , m_map(map)
-    {
-    }
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        return parent.isValid() ? 0 : m_map.size();
-    }
-
-    Qt::ItemFlags flags(const QModelIndex& index) const override
-    {
-        return QAbstractListModel::flags(index) | Qt::ItemIsUserCheckable;
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        if (!index.isValid() || index.row() >= m_map.size())
-        {
-            return QVariant();
-        }
-        auto it = m_map.begin() + index.row();
-        switch (role)
-        {
-        case Qt::DisplayRole:
-            return it->name;
-        case Qt::CheckStateRole:
-            return it->checked ? Qt::Checked : Qt::Unchecked;
-        default:
-            return QVariant();
-        }
-    }
-
-    bool setData(const QModelIndex& index, const QVariant& data, int role = Qt::EditRole) override
-    {
-        if (!index.isValid() || index.row() >= m_map.size())
-        {
-            return false;
-        }
-        auto it = m_map.begin() + index.row();
-        switch (role)
-        {
-        case Qt::CheckStateRole:
-            it->checked = (data.toInt() == Qt::Checked);
-            emit dataChanged(index, index, QVector<int>(1, Qt::CheckStateRole));
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    void setAllItemsChecked(bool checked)
-    {
-        if (m_map.empty())
-        {
-            return;
-        }
-        for (auto it : m_map)
-        {
-            it.checked = checked;
-        }
-        emit dataChanged(index(0, 0), index(m_map.size() - 1, 0), QVector<int>(1, Qt::CheckStateRole));
-    }
-
-private:
-    CTrackViewFBXImportPreviewDialog::TItemsMap& m_map;
-};
-
-//////////////////////////////////////////////////////////////////////////
-CTrackViewFBXImportPreviewDialog::CTrackViewFBXImportPreviewDialog(QWidget* parent)
-    : QDialog(parent)
-    , m_ui(new Ui::TrackViewFBXImportPreviewDialog)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    setFixedSize(size());
-    connect(m_ui->buttonSelectAll, &QPushButton::clicked, this, &CTrackViewFBXImportPreviewDialog::OnBnSelectAllClicked);
-    connect(m_ui->buttonUnselectAll, &QPushButton::clicked, this, &CTrackViewFBXImportPreviewDialog::OnBnUnselectAllClicked);
-}
-
-CTrackViewFBXImportPreviewDialog::~CTrackViewFBXImportPreviewDialog()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CTrackViewFBXImportPreviewDialog::exec()
-{
-    m_ui->m_tree->setModel(new FBXImportModel(m_fBXItemNames, this));
-    return QDialog::exec();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CTrackViewFBXImportPreviewDialog::AddTreeItem(const QString& objectName)
-{
-    m_fBXItemNames.push_back(Item { objectName, true });
-}
-
-bool CTrackViewFBXImportPreviewDialog::IsObjectSelected(const QString& objectName) const
-{
-    for (auto it : m_fBXItemNames)
-    {
-        if (it.name == objectName)
-        {
-            return it.checked;
-        }
-    }
-    return false;
-};
-
-void CTrackViewFBXImportPreviewDialog::OnBnSelectAllClicked()
-{
-    static_cast<FBXImportModel*>(m_ui->m_tree->model())->setAllItemsChecked(true);
-}
-
-void CTrackViewFBXImportPreviewDialog::OnBnUnselectAllClicked()
-{
-    static_cast<FBXImportModel*>(m_ui->m_tree->model())->setAllItemsChecked(false);
-}
-
-#include <moc_TrackViewFBXImportPreviewDialog.cpp>
diff --git a/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.h b/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.h
deleted file mode 100644
index 87118aa55b..0000000000
--- a/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEWFBXIMPORTPREVIEWDIALOG_H
-#define CRYINCLUDE_EDITOR_TRACKVIEWFBXIMPORTPREVIEWDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class TrackViewFBXImportPreviewDialog;
-}
-
-class CTrackViewFBXImportPreviewDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CTrackViewFBXImportPreviewDialog(QWidget* parent = nullptr);
-    virtual ~CTrackViewFBXImportPreviewDialog();
-
-    void AddTreeItem(const QString& objectName);
-    bool IsObjectSelected(const QString& objectName) const;
-
-    int exec() override;
-
-protected:
-    void OnBnSelectAllClicked();
-    void OnBnUnselectAllClicked();
-
-private:
-    friend class FBXImportModel;
-    struct Item
-    {
-        QString name;
-        bool checked;
-    };
-    typedef QVector<Item> TItemsMap;
-    TItemsMap m_fBXItemNames;
-    QScopedPointer<Ui::TrackViewFBXImportPreviewDialog> m_ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEWFBXIMPORTPREVIEWDIALOG_H
diff --git a/Code/Sandbox/Editor/TrackViewNewSequenceDialog.cpp b/Code/Sandbox/Editor/TrackViewNewSequenceDialog.cpp
deleted file mode 100644
index 17940c5fb5..0000000000
--- a/Code/Sandbox/Editor/TrackViewNewSequenceDialog.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "TrackViewNewSequenceDialog.h"
-
-// Qt
-#include <QMessageBox>
-
-// CryCommon
-#include <CryCommon/Maestro/Types/SequenceType.h>
-
-// Editor
-#include "TrackView/TrackViewSequenceManager.h"
-
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <ui_TrackViewNewSequenceDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-namespace
-{
-    struct seqTypeComboPair
-    {
-        const char*    name;
-        SequenceType   type;
-    };
-}
-
-// TrackViewNewSequenceDialog dialog
-CTVNewSequenceDialog::CTVNewSequenceDialog(QWidget* parent)
-    : QDialog(parent)
-    , ui(new Ui::CTVNewSequenceDialog)
-    , m_inputFocusSet(false)
-{
-    ui->setupUi(this);
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &CTVNewSequenceDialog::OnOK);
-    connect(ui->NAME, &QLineEdit::returnPressed, this, &CTVNewSequenceDialog::OnOK);
-    setWindowTitle("Add New Sequence");
-
-    OnInitDialog();
-}
-
-CTVNewSequenceDialog::~CTVNewSequenceDialog()
-{
-}
-
-void CTVNewSequenceDialog::OnInitDialog()
-{
-}
-
-void CTVNewSequenceDialog::OnOK()
-{
-    m_sequenceType = SequenceType::SequenceComponent;
-
-    m_sequenceName = ui->NAME->text();
-
-    if (m_sequenceName.isEmpty())
-    {
-        QMessageBox::warning(this, "New Sequence", "A sequence name cannot be empty!");
-        return;
-    }
-    else if (m_sequenceName.contains('/'))
-    {
-        QMessageBox::warning(this, "New Sequence", "A sequence name cannot contain a '/' character!");
-        return;
-    }
-    else if (m_sequenceName == LIGHT_ANIMATION_SET_NAME)
-    {
-        QMessageBox::warning(this, "New Sequence", QString("The sequence name '%1' is reserved.\n\nPlease choose a different name.").arg(LIGHT_ANIMATION_SET_NAME));
-        return;
-    }
-
-    for (int k = 0; k < GetIEditor()->GetSequenceManager()->GetCount(); ++k)
-    {
-        CTrackViewSequence* pSequence = GetIEditor()->GetSequenceManager()->GetSequenceByIndex(k);
-        QString fullname = QtUtil::ToQString(pSequence->GetName());
-
-        if (fullname.compare(m_sequenceName, Qt::CaseInsensitive) == 0)
-        {
-            QMessageBox::warning(this, "New Sequence", "Sequence with this name already exists!");
-            return;
-        }
-    }
-
-    accept();
-}
-
-void CTVNewSequenceDialog::showEvent(QShowEvent* event)
-{
-    if (!m_inputFocusSet)
-    {
-        ui->NAME->setFocus();
-        m_inputFocusSet = true;
-    }
-
-    QDialog::showEvent(event);
-}
-
-#include <moc_TrackViewNewSequenceDialog.cpp>
diff --git a/Code/Sandbox/Editor/TrackViewNewSequenceDialog.h b/Code/Sandbox/Editor/TrackViewNewSequenceDialog.h
deleted file mode 100644
index b38c00a47c..0000000000
--- a/Code/Sandbox/Editor/TrackViewNewSequenceDialog.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEWNEWSEQUENCEDIALOG_H
-#define CRYINCLUDE_EDITOR_TRACKVIEWNEWSEQUENCEDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QScopedPointer>
-#include <QDialog>
-#endif
-
-namespace Ui {
-    class CTVNewSequenceDialog;
-}
-
-
-class CTVNewSequenceDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CTVNewSequenceDialog(QWidget* pParent = 0);
-    virtual ~CTVNewSequenceDialog();
-
-    const QString& GetSequenceName() const { return m_sequenceName; };
-    SequenceType   GetSequenceType() const { return m_sequenceType; };
-
-    void showEvent(QShowEvent* event) override;
-
-protected:
-    virtual void OnOK();
-    void OnInitDialog();
-
-private:
-    QString        m_sequenceName;
-    SequenceType   m_sequenceType;
-    QScopedPointer<Ui::CTVNewSequenceDialog> ui;
-    bool           m_inputFocusSet;
-};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEWNEWSEQUENCEDIALOG_H
diff --git a/Code/Sandbox/Editor/UIEnumsDatabase.cpp b/Code/Sandbox/Editor/UIEnumsDatabase.cpp
deleted file mode 100644
index bc7d27ccb1..0000000000
--- a/Code/Sandbox/Editor/UIEnumsDatabase.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "UIEnumsDatabase.h"
-
-//////////////////////////////////////////////////////////////////////////
-QString CUIEnumsDatabase_SEnum::NameToValue(const QString& name)
-{
-    int n = (int)strings.size();
-    for (int i = 0; i < n; i++)
-    {
-        if (name == strings[i])
-        {
-            return values[i];
-        }
-    }
-    return name;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CUIEnumsDatabase_SEnum::ValueToName(const QString& value)
-{
-    int n = (int)strings.size();
-    for (int i = 0; i < n; i++)
-    {
-        if (value == values[i])
-        {
-            return strings[i];
-        }
-    }
-    return value;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CUIEnumsDatabase::CUIEnumsDatabase()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CUIEnumsDatabase::~CUIEnumsDatabase()
-{
-    // Free enums.
-    for (Enums::iterator it = m_enums.begin(); it != m_enums.end(); ++it)
-    {
-        delete it->second;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUIEnumsDatabase::SetEnumStrings(const QString& enumName, const QStringList& sStringsArray)
-{
-    int nStringCount = sStringsArray.size();
-
-    CUIEnumsDatabase_SEnum* pEnum = stl::find_in_map(m_enums, enumName, 0);
-    if (!pEnum)
-    {
-        pEnum = new CUIEnumsDatabase_SEnum;
-        pEnum->m_name = enumName;
-        m_enums[enumName] = pEnum;
-    }
-    pEnum->strings.clear();
-    pEnum->values.clear();
-    for (int i = 0; i < nStringCount; i++)
-    {
-        QString str = sStringsArray[i];
-        QString value = str;
-        int pos = str.indexOf('=');
-        if (pos >= 0)
-        {
-            value = str.mid(pos + 1);
-            str = str.mid(0, pos);
-        }
-        pEnum->strings.push_back(str);
-        pEnum->values.push_back(value);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CUIEnumsDatabase_SEnum* CUIEnumsDatabase::FindEnum(const QString& enumName) const
-{
-    CUIEnumsDatabase_SEnum* pEnum = stl::find_in_map(m_enums, enumName, 0);
-    return pEnum;
-}
diff --git a/Code/Sandbox/Editor/UIEnumsDatabase.h b/Code/Sandbox/Editor/UIEnumsDatabase.h
deleted file mode 100644
index 4ed200d2ae..0000000000
--- a/Code/Sandbox/Editor/UIEnumsDatabase.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UIENUMSDATABASE_H
-#define CRYINCLUDE_EDITOR_UIENUMSDATABASE_H
-#pragma once
-
-#include "Include/EditorCoreAPI.h"
-
-struct EDITOR_CORE_API CUIEnumsDatabase_SEnum
-{
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QString m_name;
-    QStringList strings; // Display Strings.
-    QStringList values;  // Corresponding Values.
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    QString NameToValue(const QString& name);
-    QString ValueToName(const QString& value);
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Stores string associates to the enumeration collections for UI.
-//////////////////////////////////////////////////////////////////////////
-class EDITOR_CORE_API CUIEnumsDatabase
-{
-public:
-    CUIEnumsDatabase();
-    ~CUIEnumsDatabase();
-
-    void SetEnumStrings(const QString& enumName, const QStringList& sStringsArray);
-    CUIEnumsDatabase_SEnum* FindEnum(const QString& enumName) const;
-
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    typedef std::map<QString, CUIEnumsDatabase_SEnum*> Enums;
-    Enums m_enums;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_UIENUMSDATABASE_H
diff --git a/Code/Sandbox/Editor/Undo/IUndoManagerListener.h b/Code/Sandbox/Editor/Undo/IUndoManagerListener.h
deleted file mode 100644
index 9b9b2a894b..0000000000
--- a/Code/Sandbox/Editor/Undo/IUndoManagerListener.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITORCORE_UNDO_IUNDOMANAGERLISTENER_H
-#define CRYINCLUDE_EDITORCORE_UNDO_IUNDOMANAGERLISTENER_H
-#pragma once
-
-struct IUndoManagerListener
-{
-    virtual void BeginUndoTransaction() {}
-    virtual void EndUndoTransaction() {}
-    virtual void BeginRestoreTransaction() {}
-    virtual void EndRestoreTransaction() {}
-    virtual void SignalNumUndoRedo([[maybe_unused]] const unsigned int& numUndo, [[maybe_unused]] const unsigned int& numRedo){}
-    virtual void UndoStackFlushed() {}
-};
-
-#endif // CRYINCLUDE_EDITORCORE_UNDO_IUNDOMANAGERLISTENER_H
diff --git a/Code/Sandbox/Editor/Undo/IUndoObject.h b/Code/Sandbox/Editor/Undo/IUndoObject.h
deleted file mode 100644
index cf125b7244..0000000000
--- a/Code/Sandbox/Editor/Undo/IUndoObject.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Interface for implementation of IUndo objects.
-
-
-#ifndef CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
-#define CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
-#pragma once
-
-#include <QString>
-
-//! IUndoObject is a interface of general Undo object.
-struct IUndoObject
-{
-    // Virtual destructor.
-    virtual ~IUndoObject() {};
-
-    //! Called to delete undo object.
-    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.
-    virtual void Undo(bool bUndo = true) = 0;
-
-    //! Redo undone changes on object.
-    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; }
-};
-
-#endif // CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
diff --git a/Code/Sandbox/Editor/Undo/Undo.cpp b/Code/Sandbox/Editor/Undo/Undo.cpp
deleted file mode 100644
index fd1dbd4608..0000000000
--- a/Code/Sandbox/Editor/Undo/Undo.cpp
+++ /dev/null
@@ -1,839 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "Undo.h"
-
-#include "Settings.h"
-#include "IUndoManagerListener.h"
-#include "Objects/ObjectManager.h"
-#include <Include/ILogFile.h>
-#include <list>
-
-#include <QString>
-#include "QtUtilWin.h"
-
-#define UNDOREDO_BUTTON_POPUP_TEXT_WIDTH 81
-#define UNDOREDO_MULTIPLE_OBJECTS_TEXT " (Multiple Objects)"
-
-
-//! CSuperUndo objects groups together a block of UndoStepto to allow them to be Undo by single operation.
-class CSuperUndoStep
-    : public CUndoStep
-{
-public:
-    //! Add new undo object to undo step.
-    void AddUndoStep(CUndoStep* step)
-    {
-        m_undoSteps.push_back(step);
-    }
-    virtual int GetSize() const
-    {
-        int size = 0;
-        for (int i = 0; i < m_undoSteps.size(); i++)
-        {
-            size += m_undoSteps[i]->GetSize();
-        }
-        return size;
-    }
-    virtual bool IsEmpty() const
-    {
-        return m_undoSteps.empty();
-    }
-    virtual void Undo(bool bUndo)
-    {
-        for (int i = m_undoSteps.size() - 1; i >= 0; i--)
-        {
-            m_undoSteps[i]->Undo(bUndo);
-        }
-    }
-    virtual void Redo()
-    {
-        for (int i = 0; i < m_undoSteps.size(); i++)
-        {
-            m_undoSteps[i]->Redo();
-        }
-    }
-
-    // to get memory statistics
-    void GetMemoryUsage(ICrySizer* pSizer)
-    {
-        for (int i = 0; i < m_undoSteps.size(); i++)
-        {
-            m_undoSteps[i]->GetMemoryUsage(pSizer);
-        }
-
-        pSizer->Add(*this);
-    }
-
-private:
-    //! Undo steps included in this step.
-    std::vector<CUndoStep*> m_undoSteps;
-};
-
-// Helper class for CUndoManager that monitors the Asset Manager and suspends undo recording while the Asset Manager
-// is processing asset loading events.  The events are processed non-deterministically, so they could accidentally get captured
-// within an undo recording block.
-class AssetManagerUndoInterruptor
-    : public AZ::Data::AssetManagerNotificationBus::Handler
-{
-public:
-    AssetManagerUndoInterruptor()
-    {
-        AZ::Data::AssetManagerNotificationBus::Handler::BusConnect();
-    }
-
-    ~AssetManagerUndoInterruptor() override
-    {
-        AZ::Data::AssetManagerNotificationBus::Handler::BusDisconnect();
-    }
-
-    void OnAssetEventsDispatchBegin() override
-    {
-        GetIEditor()->GetUndoManager()->Suspend();
-    }
-
-    void OnAssetEventsDispatchEnd() override
-    {
-        GetIEditor()->GetUndoManager()->Resume();
-    }
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-CUndoManager::CUndoManager()
-{
-    m_bRecording = false;
-    m_bSuperRecording = false;
-
-    m_currentUndo = 0;
-    m_superUndo = 0;
-    m_assetManagerUndoInterruptor = new AssetManagerUndoInterruptor();
-
-    m_suspendCount = 0;
-
-    m_bUndoing = false;
-    m_bRedoing = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CUndoManager::~CUndoManager()
-{
-
-    m_bRecording = false;
-    ClearRedoStack();
-    ClearUndoStack();
-
-    delete m_superUndo;
-    delete m_currentUndo;
-    delete m_assetManagerUndoInterruptor;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Begin()
-{
-    //CryLog( "<Undo> Begin SuspendCount=%d",m_suspendCount );
-    //if (m_bSuperRecording)
-    //CLogFile::FormatLine( "<Undo> Begin (Inside SuperSuper)" );
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    //  assert( m_bRecording == false );
-
-    if (m_bRecording)
-    {
-        //CLogFile::WriteLine( "<Undo> Begin (already recording)" );
-        // Not cancel, just combine.
-        return;
-    }
-
-    // Begin Creates a new undo object.
-    m_currentUndo = new CUndoStep;
-
-    m_bRecording = true;
-    //CLogFile::WriteLine( "<Undo> Begin OK" );
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Restore(bool bUndo)
-{
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    if (m_currentUndo)
-    {
-        BeginRestoreTransaction();
-        Suspend();
-        if (bUndo && m_currentUndo)
-        {
-            m_currentUndo->Undo(false); // Undo not by Undo command (no need to store Redo)
-        }
-        Resume();
-        if (m_currentUndo)
-        {
-            m_currentUndo->ClearObjects();
-        }
-        EndRestoreTransaction();
-    }
-    //CryLog( "Restore Undo" );
-}
-
-// This function is used below to decide if an operation should force a save or not. This currently
-// prevents selecting an entity, either from the outliner or both the old and new viewports.
-static bool ShouldPersist(const QString& name)
-{
-    return name != "Select Object(s)" && name != "Select Entity" && name != "Box Select Entities";
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Accept(const QString& name)
-{
-    //CryLog( "<Undo> Accept, Suspend Count=%d",m_suspendCount );
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    if (!m_bRecording)
-    {
-        //CLogFile::WriteLine( "<Undo> Accept (Not recording)" );
-        return;
-    }
-
-    if (!m_currentUndo->IsEmpty())
-    {
-        const bool persist = ShouldPersist(name);
-        if (persist)
-        {
-            GetIEditor()->SetModifiedFlag();
-        }
-
-        // If accepting new undo object, must clear all redo stack.
-        ClearRedoStack();
-
-        m_currentUndo->SetName(name);
-        if (m_bSuperRecording)
-        {
-            m_superUndo->AddUndoStep(m_currentUndo);
-        }
-        else
-        {
-            // Normal recording.
-            // Keep max undo steps.
-            while (m_undoStack.size() && (m_undoStack.size() >= GetIEditor()->GetEditorSettings()->undoLevels || GetDatabaseSize() > 100 * 1024 * 1024))
-            {
-                delete m_undoStack.front();
-                m_undoStack.pop_front();
-            }
-            m_undoStack.push_back(m_currentUndo);
-        }
-        //CLogFile::FormatLine( "Undo Object Accepted (Undo:%d,Redo:%d, Size=%dKb)",m_undoStack.size(),m_redoStack.size(),GetDatabaseSize()/1024 );
-
-        // If undo accepted, document modified.
-        if (persist)
-        {
-            GetIEditor()->SetModifiedFlag();
-        }
-
-        if (name.compare("Select Object(s)", Qt::CaseInsensitive) == 0)
-        {
-            GetIEditor()->SetModifiedModule(eModifiedBrushes);
-        }
-        else if (name.compare("Move Selection", Qt::CaseInsensitive) == 0)
-        {
-            GetIEditor()->SetModifiedModule(eModifiedBrushes);
-        }
-        else if (name.compare("SubObject Select", Qt::CaseInsensitive) == 0)
-        {
-            GetIEditor()->SetModifiedModule(eModifiedBrushes);
-        }
-        else if (name.compare("Manipulator Drag", Qt::CaseInsensitive) == 0)
-        {
-            GetIEditor()->SetModifiedModule(eModifiedBrushes);
-        }
-    }
-    else
-    {
-        // If no any object was recorded, Cancel undo operation.
-        Cancel();
-    }
-
-    m_bRecording = false;
-    m_currentUndo = 0;
-
-    SignalNumUndoRedoToListeners();
-
-    //CLogFile::WriteLine( "<Undo> Accept OK" );
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Cancel()
-{
-    //CryLog( "<Undo> Cancel" );
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    if (!m_bRecording)
-    {
-        return;
-    }
-
-    assert(m_currentUndo != 0);
-
-    m_bRecording = false;
-
-    if (!m_currentUndo->IsEmpty())
-    {
-        // Restore all objects to the state they was at Begin call and throws out all undo objects.
-        Restore(true);
-        //GetIEditor()->GetLogFile()->FormatLine( "Undo Object Canceled (Undo:%d,Redo:%d)",m_undoStack.size(),m_redoStack.size() );
-    }
-
-    delete m_currentUndo;
-    m_currentUndo = 0;
-    //CLogFile::WriteLine( "<Undo> Cancel OK" );
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Redo(int numSteps)
-{
-    GetIEditor()->Notify(eNotify_OnBeginUndoRedo);
-
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    if (m_bRecording || m_bSuperRecording)
-    {
-        GetIEditor()->GetLogFile()->FormatLine("Cannot Redo while Recording");
-        return;
-    }
-
-    m_bRedoing = true;
-    BeginUndoTransaction();
-    m_bRedoing = false;
-
-    if (!m_redoStack.empty())
-    {
-        Suspend();
-        while (numSteps-- > 0 && !m_redoStack.empty() && !m_bClearRedoStackQueued)
-        {
-            m_bRedoing = true;
-            CUndoStep* redo = m_redoStack.back();
-            redo->Redo();
-            m_redoStack.pop_back();
-            // Push undo object to redo stack.
-            m_undoStack.push_back(redo);
-            m_bRedoing = false;
-        }
-        Resume();
-    }
-    if (m_suspendCount == 0)
-    {
-        GetIEditor()->UpdateViews(eUpdateObjects);
-    }
-    GetIEditor()->GetLogFile()->FormatLine("Redo (Undo:%d,Redo:%d)", m_undoStack.size(), m_redoStack.size());
-    GetIEditor()->GetObjectManager()->InvalidateVisibleList();
-
-    m_bRedoing = true;
-    EndUndoTransaction();
-    SignalNumUndoRedoToListeners();
-    m_bRedoing = false;
-
-    GetIEditor()->Notify(eNotify_OnEndUndoRedo);
-
-    if (m_bClearRedoStackQueued)
-    {
-        ClearRedoStack();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Undo(int numSteps)
-{
-    GetIEditor()->Notify(eNotify_OnBeginUndoRedo);
-
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    if (m_bRecording || m_bSuperRecording)
-    {
-        GetIEditor()->GetLogFile()->FormatLine("Cannot Undo while Recording");
-        return;
-    }
-
-    m_bUndoing = true;
-    BeginUndoTransaction();
-    m_bUndoing = false;
-
-    if (!m_undoStack.empty())
-    {
-        Suspend();
-        while (numSteps-- > 0 && !m_undoStack.empty())
-        {
-            m_bUndoing = true;
-            CUndoStep* undo = m_undoStack.back();
-            undo->Undo(true);
-            m_undoStack.pop_back();
-            // Push undo object to redo stack.
-            m_redoStack.push_back(undo);
-            m_bUndoing = false;
-        }
-        Resume();
-    }
-    // Update viewports.
-    if (m_suspendCount == 0)
-    {
-        GetIEditor()->UpdateViews(eUpdateObjects);
-    }
-    GetIEditor()->GetLogFile()->FormatLine("Undo (Undo:%d,Redo:%d)", m_undoStack.size(), m_redoStack.size());
-    GetIEditor()->GetObjectManager()->InvalidateVisibleList();
-
-    m_bUndoing = true;
-    EndUndoTransaction();
-    SignalNumUndoRedoToListeners();
-    m_bUndoing = false;
-
-    GetIEditor()->Notify(eNotify_OnEndUndoRedo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::RecordUndo(IUndoObject* obj)
-{
-    //CryLog( "<Undo> RecordUndo Name=%s",obj->GetDescription() );
-
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        //CLogFile::WriteLine( "<Undo> RecordUndo (Undoing or Redoing)" );
-        obj->Release();
-        return;
-    }
-
-    if (m_bRecording && (m_suspendCount == 0))
-    {
-        assert(m_currentUndo != 0);
-        m_currentUndo->AddUndoObject(obj);
-        //CLogFile::FormatLine( "Undo Object Added: %s",obj->GetDescription() );
-    }
-    else
-    {
-        //CLogFile::WriteLine( "<Undo> RecordUndo (Not Recording)" );
-        // Ignore this object.
-        obj->Release();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::ClearRedoStack()
-{
-    if (m_bRedoing)
-    {
-        m_bClearRedoStackQueued = true;
-        return;
-    }
-    m_bClearRedoStackQueued = false;
-
-    for (std::list<CUndoStep*>::iterator it = m_redoStack.begin(); it != m_redoStack.end(); it++)
-    {
-        delete *it;
-    }
-    m_redoStack.clear();
-
-    SignalNumUndoRedoToListeners();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::ClearUndoStack()
-{
-    for (std::list<CUndoStep*>::iterator it = m_undoStack.begin(); it != m_undoStack.end(); it++)
-    {
-        delete *it;
-    }
-    m_undoStack.clear();
-
-    SignalNumUndoRedoToListeners();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::ClearUndoStack(int num)
-{
-    int i = num;
-    while (i > 0 && !m_undoStack.empty())
-    {
-        delete m_undoStack.front();
-        m_undoStack.pop_front();
-        i--;
-    }
-
-    SignalNumUndoRedoToListeners();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::ClearRedoStack(int num)
-{
-    int i = num;
-    while (i > 0 && !m_redoStack.empty())
-    {
-        delete m_redoStack.back();
-        m_redoStack.pop_back();
-        i--;
-    }
-
-    SignalNumUndoRedoToListeners();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CUndoManager::IsHaveRedo() const
-{
-    return !m_redoStack.empty();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CUndoManager::IsHaveUndo() const
-{
-    return !m_undoStack.empty();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Suspend()
-{
-    m_suspendCount++;
-    //CLogFile::FormatLine( "<Undo> Suspend %d",m_suspendCount );
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Resume()
-{
-    assert(m_suspendCount >= 0);
-    if (m_suspendCount > 0)
-    {
-        m_suspendCount--;
-    }
-    //CLogFile::FormatLine( "<Undo> Resume %d",m_suspendCount );
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::SuperBegin()
-{
-    //CLogFile::FormatLine( "<Undo> SuperBegin (SuspendCount%d)",m_suspendCount );
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    m_bSuperRecording = true;
-    m_superUndo = new CSuperUndoStep;
-    //CLogFile::WriteLine( "<Undo> SuperBegin OK" );
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::SuperAccept(const QString& name)
-{
-    //CLogFile::WriteLine( "<Undo> SupperAccept" );
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    if (!m_bSuperRecording)
-    {
-        return;
-    }
-
-    assert(m_superUndo != 0);
-
-    if (m_bRecording)
-    {
-        Accept(name);
-    }
-
-    if (!m_superUndo->IsEmpty())
-    {
-        m_superUndo->SetName(name);
-        // Keep max undo steps.
-        while (m_undoStack.size() && (m_undoStack.size() >= GetIEditor()->GetEditorSettings()->undoLevels || GetDatabaseSize() > 100 * 1024 * 1024))
-        {
-            delete m_undoStack.front();
-            m_undoStack.pop_front();
-        }
-        m_undoStack.push_back(m_superUndo);
-    }
-    else
-    {
-        // If no any object was recorded, Cancel undo operation.
-        SuperCancel();
-    }
-
-    //CLogFile::FormatLine( "Undo Object Accepted (Undo:%d,Redo:%d)",m_undoStack.size(),m_redoStack.size() );
-    m_bSuperRecording = false;
-    m_superUndo = 0;
-    //CLogFile::WriteLine( "<Undo> SupperAccept OK" );
-
-    SignalNumUndoRedoToListeners();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::SuperCancel()
-{
-    //CLogFile::WriteLine( "<Undo> SuperCancel" );
-    if (m_bUndoing || m_bRedoing) // If Undoing or redoing now, ignore this calls.
-    {
-        return;
-    }
-
-    if (!m_bSuperRecording)
-    {
-        return;
-    }
-
-    assert(m_superUndo != 0);
-
-    if (m_bRecording)
-    {
-        Cancel();
-    }
-
-    Suspend();
-    //! Undo all changes already made.
-    m_superUndo->Undo(false); // Undo not by Undo command (no need to store Redo)
-    Resume();
-
-    m_bSuperRecording = false;
-    delete m_superUndo;
-    m_superUndo = 0;
-    //CLogFile::WriteLine( "<Undo> SuperCancel OK" );
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-int CUndoManager::GetUndoStackLen() const
-{
-    return m_undoStack.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CUndoManager::GetRedoStackLen() const
-{
-    return m_redoStack.size();
-}
-
-//////////////////////////////////////////////////////////////////////////
-std::vector<QString> CUndoManager::GetUndoStackNames() const
-{
-    std::vector<QString> undos(m_undoStack.size());
-    int i = 0;
-    QString text;
-
-    for (auto it = m_undoStack.begin(); it != m_undoStack.end(); it++)
-    {
-        QString objNames = (*it)->GetObjectNames();
-        text = (*it)->GetName() + objNames;
-        if (text.length() > UNDOREDO_BUTTON_POPUP_TEXT_WIDTH)
-        {
-            undos[i++] = (*it)->GetName() + UNDOREDO_MULTIPLE_OBJECTS_TEXT;
-        }
-        else
-        {
-            undos[i++] = (*it)->GetName() + (objNames.isEmpty() ? "" : " (" + objNames + ")");
-        }
-    }
-
-    return undos;
-}
-
-//////////////////////////////////////////////////////////////////////////
-std::vector<QString> CUndoManager::GetRedoStackNames() const
-{
-    std::vector<QString> redos(m_redoStack.size());
-    int i = 0;
-    QString text;
-
-    for (auto it = m_redoStack.begin(); it != m_redoStack.end(); it++)
-    {
-        text = (*it)->GetName() + (*it)->GetObjectNames();
-        if (text.length() > UNDOREDO_BUTTON_POPUP_TEXT_WIDTH)
-        {
-            redos[i++] = (*it)->GetName() + UNDOREDO_MULTIPLE_OBJECTS_TEXT;
-        }
-        else
-        {
-            redos[i++] = (*it)->GetName() + " (" + (*it)->GetObjectNames() + ")";
-        }
-    }
-
-    return redos;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CUndoManager::GetDatabaseSize()
-{
-    int size = 0;
-    {
-        for (std::list<CUndoStep*>::iterator it = m_undoStack.begin(); it != m_undoStack.end(); it++)
-        {
-            size += (*it)->GetSize();
-        }
-    }
-    {
-        for (std::list<CUndoStep*>::iterator it = m_redoStack.begin(); it != m_redoStack.end(); it++)
-        {
-            size += (*it)->GetSize();
-        }
-    }
-    return size;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::Flush()
-{
-    m_bRecording = false;
-    ClearRedoStack();
-    ClearUndoStack();
-
-    delete m_superUndo;
-    delete m_currentUndo;
-    m_superUndo = 0;
-    m_currentUndo = 0;
-
-    SignalUndoFlushedToListeners();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CUndoStep* CUndoManager::GetNextUndo()
-{
-    if (!m_undoStack.empty())
-    {
-        return m_undoStack.back();
-    }
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CUndoStep* CUndoManager::GetNextRedo()
-{
-    if (!m_redoStack.empty())
-    {
-        return m_redoStack.back();
-    }
-    return nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CUndoManager::SetMaxUndoStep(int steps)
-{
-    GetIEditor()->GetEditorSettings()->undoLevels = steps;
-};
-
-//////////////////////////////////////////////////////////////////////////
-int CUndoManager::GetMaxUndoStep() const
-{
-    return GetIEditor()->GetEditorSettings()->undoLevels;
-}
-
-void CUndoManager::GetMemoryUsage(ICrySizer* pSizer)
-{
-    if (m_currentUndo)
-    {
-        m_currentUndo->GetMemoryUsage(pSizer);
-    }
-
-    if (m_superUndo)
-    {
-        m_superUndo->GetMemoryUsage(pSizer);
-    }
-
-    for (std::list<CUndoStep*>::const_iterator it = m_undoStack.begin(); it != m_undoStack.end(); it++)
-    {
-        (*it)->GetMemoryUsage(pSizer);
-    }
-
-    for (std::list<CUndoStep*>::const_iterator it = m_redoStack.begin(); it != m_redoStack.end(); it++)
-    {
-        (*it)->GetMemoryUsage(pSizer);
-    }
-
-    pSizer->Add(*this);
-}
-
-void CUndoManager::AddListener(IUndoManagerListener* pListener)
-{
-    stl::push_back_unique(m_listeners, pListener);
-}
-
-void CUndoManager::RemoveListener(IUndoManagerListener* pListener)
-{
-    stl::find_and_erase(m_listeners, pListener);
-}
-
-void CUndoManager::BeginUndoTransaction()
-{
-    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
-    {
-        (*iter)->BeginUndoTransaction();
-    }
-}
-
-void CUndoManager::EndUndoTransaction()
-{
-    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
-    {
-        (*iter)->EndUndoTransaction();
-    }
-}
-
-void CUndoManager::BeginRestoreTransaction()
-{
-    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
-    {
-        (*iter)->BeginRestoreTransaction();
-    }
-}
-
-void CUndoManager::EndRestoreTransaction()
-{
-    for (auto iter = m_listeners.begin(); iter != m_listeners.end(); ++iter)
-    {
-        (*iter)->EndRestoreTransaction();
-    }
-}
-
-void CUndoManager::SignalNumUndoRedoToListeners()
-{
-    for (IUndoManagerListener* listener : m_listeners)
-    {
-        listener->SignalNumUndoRedo(m_undoStack.size(), m_redoStack.size());
-    }
-}
-
-void CUndoManager::SignalUndoFlushedToListeners()
-{
-    for (IUndoManagerListener* listener : m_listeners)
-    {
-        listener->UndoStackFlushed();
-    }
-}
-
-bool CUndoManager::IsUndoRecording() const
-{
-    return (m_bRecording || m_bSuperRecording) && m_suspendCount == 0;
-}
-
-bool CUndoManager::IsUndoSuspended() const
-{
-    return m_suspendCount != 0;
-}
diff --git a/Code/Sandbox/Editor/Undo/Undo.h b/Code/Sandbox/Editor/Undo/Undo.h
deleted file mode 100644
index 8d38f2f028..0000000000
--- a/Code/Sandbox/Editor/Undo/Undo.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITORCORE_UNDO_UNDO_H
-#define CRYINCLUDE_EDITORCORE_UNDO_UNDO_H
-#pragma once
-
-#include "IUndoManagerListener.h"
-#include "CrySizer.h"                           // ICrySizer
-#include "IUndoObject.h"
-#include <AzCore/Asset/AssetManager.h>
-
-struct IUndoObject;
-class CSuperUndoStep;
-class AssetManagerUndoInterruptor;
-
-//! CUndo is a collection of IUndoObjects instances that forms single undo step.
-class CUndoStep
-{
-public:
-    CUndoStep() {};
-    virtual ~CUndoStep() { ClearObjects(); }
-
-    //! Set undo object name.
-    void SetName(const QString& name) { m_name = name; };
-    //! Get undo object name.
-    const QString& GetName() { return m_name; };
-
-    //! Add new undo object to undo step.
-    void AddUndoObject(IUndoObject* o)
-    {
-        m_undoObjects.push_back(o);
-    }
-    void ClearObjects()
-    {
-        int i;
-        // Release all undo objects.
-        std::vector<IUndoObject*> undoObjects = m_undoObjects;
-        m_undoObjects.clear();
-
-        for (i = 0; i < undoObjects.size(); i++)
-        {
-            undoObjects[i]->Release();
-        }
-    };
-    virtual int GetSize() const
-    {
-        int size = 0;
-        for (int i = 0; i < m_undoObjects.size(); i++)
-        {
-            size += m_undoObjects[i]->GetSize();
-        }
-        return size;
-    }
-    // Confetti: Get the size of m_undoObjects
-    virtual int GetCount() const
-    {
-        return m_undoObjects.size();
-    }
-    virtual bool IsEmpty() const { return m_undoObjects.empty(); };
-    virtual void Undo(bool bUndo)
-    {
-        for (int i = m_undoObjects.size() - 1; i >= 0; i--)
-        {
-            m_undoObjects[i]->Undo(bUndo);
-        }
-    }
-    virtual void Redo()
-    {
-        for (int i = 0; i < m_undoObjects.size(); i++)
-        {
-            m_undoObjects[i]->Redo();
-        }
-    }
-
-    // to get memory statistics
-    void GetMemoryUsage(ICrySizer* pSizer)
-    {
-        size_t nThisSize = sizeof(*this);
-
-        for (int i = 0; i < m_undoObjects.size(); i++)
-        {
-            nThisSize += m_undoObjects[i]->GetSize();
-        }
-
-        pSizer->Add(m_name);
-        pSizer->Add(this, nThisSize);
-    }
-
-    // get undo object at index i
-    IUndoObject* GetUndoObject(int i = 0)
-    {
-        if (i < m_undoObjects.size())
-        {
-            return m_undoObjects[i];
-        }
-        return nullptr;
-    }
-
-    const QString GetObjectNames()
-    {
-        QString objNamesStr("");
-        std::vector<QString> objNames;
-
-        bool bFirst = true;
-        for (int i = 0; i < m_undoObjects.size(); ++i)
-        {
-            if (!m_undoObjects[i])
-            {
-                continue;
-            }
-
-            if (m_undoObjects[i]->GetObjectName() == NULL)
-            {
-                continue;
-            }
-
-            if (stl::find(objNames, m_undoObjects[i]->GetObjectName()))
-            {
-                continue;
-            }
-
-            if (bFirst == false)
-            {
-                objNamesStr += ",";
-            }
-            else
-            {
-                bFirst = false;
-            }
-
-            objNamesStr += m_undoObjects[i]->GetObjectName();
-
-            objNames.push_back(m_undoObjects[i]->GetObjectName());
-        }
-
-        return objNamesStr;
-    };
-
-private: // ------------------------------------------------------
-
-    friend class CUndoManager;
-    QString m_name;
-    // Undo objects registered for this step.
-    std::vector<IUndoObject*> m_undoObjects;
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-/*!
- *  CUndoManager is keeping and operating on CUndo class instances.
- */
-class EDITOR_CORE_API CUndoManager
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    CUndoManager();
-    ~CUndoManager();
-
-    //! Begin operation requiring undo.
-    //! Undo manager enters holding state.
-    void Begin();
-    //! Restore all undo objects registered since last Begin call.
-    //! @param bUndo if true all Undo object registered up to this point will be undone.
-    void Restore(bool bUndo);
-    //! Accept changes and registers an undo object with the undo manager.
-    //! This will allow the user to undo the operation.
-    void Accept(const QString& name);
-    //! Cancel changes and restore undo objects.
-    void Cancel();
-
-    //! Normally this is NOT needed but in special cases this can be useful.
-    //! This allows to group a set of Begin()/Accept() sequences to be undone in one operation.
-    void SuperBegin();
-    //! When a SuperBegin() used, this method is used to Accept.
-    //! This leaves the undo database in its modified state and registers the IUndoObjects with the undo system.
-    //! This will allow the user to undo the operation.
-    void SuperAccept(const QString& name);
-    //! Cancel changes and restore undo objects.
-    void SuperCancel();
-
-    //! Temporarily suspends recording of undo.
-    void Suspend();
-    //! Resume recording if was suspended.
-    void Resume();
-
-    // Undo last operation.
-    void Undo(int numSteps = 1);
-
-    // Undo a specific operation
-    void Reset(const QString& name);
-
-    //! Redo last undo.
-    void Redo(int numSteps = 1);
-
-    //! Check if undo information is recording now.
-    bool IsUndoRecording() const;
-
-    //////////////////////////////////////////////////////////////////////////
-    bool IsUndoSuspended() const;
-
-    //! Put new undo object, must be called between Begin and Accept/Cancel methods.
-    void RecordUndo(IUndoObject* obj);
-
-    bool IsHaveUndo() const;
-    bool IsHaveRedo() const;
-    
-    void SetMaxUndoStep(int steps);
-    int GetMaxUndoStep() const;
-
-    //! Returns length of undo stack.
-    int GetUndoStackLen() const;
-    //! Returns length of redo stack.
-    int GetRedoStackLen() const;
-
-    //! Retreves array of undo objects names.
-    std::vector<QString> GetUndoStackNames() const;
-    //! Retreves array of redo objects names.
-    std::vector<QString> GetRedoStackNames() const;
-
-    //! Get size of current Undo and redo database size.
-    int GetDatabaseSize();
-
-    //! Completly flush all Undo and redo buffers.
-    //! Must be done on level reloads or global Fetch operation.
-    void Flush();
-
-    //! Get Next Undo Item and Next Redo Item -- Vera, Confetti
-    CUndoStep* GetNextUndo();
-    CUndoStep* GetNextRedo();
-
-
-    void ClearRedoStack();
-    void ClearUndoStack();
-
-    void ClearUndoStack(int num);
-    void ClearRedoStack(int num);
-
-    // to get memory statistics
-    void GetMemoryUsage(ICrySizer* pSizer);
-
-    void AddListener(IUndoManagerListener* pListener);
-    void RemoveListener(IUndoManagerListener* pListener);
-
-    int GetSuspendCount() { return m_suspendCount; }
-
-private: // ---------------------------------------------------------------
-
-    void BeginUndoTransaction();
-    void EndUndoTransaction();
-    void BeginRestoreTransaction();
-    void EndRestoreTransaction();
-    void SignalNumUndoRedoToListeners();
-    void SignalUndoFlushedToListeners();
-
-    bool                                            m_bRecording;
-    bool                                            m_bSuperRecording;
-    int                                             m_suspendCount;
-
-    bool                                            m_bUndoing;
-    bool                                            m_bRedoing;
-
-    bool                                            m_bClearRedoStackQueued;
-
-    CUndoStep*                             m_currentUndo;
-    //! Undo step object created by SuperBegin.
-    CSuperUndoStep*                    m_superUndo;
-
-    AssetManagerUndoInterruptor* m_assetManagerUndoInterruptor;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    std::list<CUndoStep*>      m_undoStack;
-    std::list<CUndoStep*>      m_redoStack;
-
-    std::vector<IUndoManagerListener*> m_listeners;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-
-class CScopedSuspendUndo
-{
-public:
-    CScopedSuspendUndo() { GetIEditor()->SuspendUndo(); }
-    ~CScopedSuspendUndo() { GetIEditor()->ResumeUndo(); }
-};
-
-#endif // CRYINCLUDE_EDITORCORE_UNDO_UNDO_H
diff --git a/Code/Sandbox/Editor/Undo/UndoVariableChange.h b/Code/Sandbox/Editor/Undo/UndoVariableChange.h
deleted file mode 100644
index eb643b699d..0000000000
--- a/Code/Sandbox/Editor/Undo/UndoVariableChange.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_UNDO_UNDOVARIABLECHANGE_H
-#define CRYINCLUDE_EDITOR_UNDO_UNDOVARIABLECHANGE_H
-#pragma once
-
-#include "IUndoObject.h"
-
-#include "Util/Variable.h"
-
-class CAttributeItem;
-
-//////////////////////////////////////////////////////////////////////////
-//! Undo object for Variable in property control..
-class CUndoVariableChange
-    : public IUndoObject
-{
-public:
-    CUndoVariableChange(IVariable* var, const char* undoDescription, const char* editorObjfullname = 0)
-    {
-        // Stores the current state of this object.
-        assert(var != 0);
-        m_undoDescription = undoDescription;
-        m_var = var;
-        m_undo = m_var->Clone(false);
-        m_EditorObjFullName = editorObjfullname;
-    }
-
-protected:
-    virtual int GetSize()
-    {
-        int size = sizeof(*this);
-        //if (m_var)
-        //size += m_var->GetSize();
-        if (m_undo)
-        {
-            size += m_undo->GetSize();
-        }
-        if (m_redo)
-        {
-            size += m_redo->GetSize();
-        }
-        return size;
-    }
-
-    virtual QString GetDescription()
-    {
-        return m_undoDescription;
-    }
-
-    virtual void Undo(bool bUndo)
-    {
-        if (bUndo)
-        {
-            m_redo = m_var->Clone(false);
-        }
-        m_var->CopyValue(m_undo);
-    }
-
-    virtual void Redo()
-    {
-        if (m_redo)
-        {
-            m_var->CopyValue(m_redo);
-        }
-    }
-
-    virtual QString GetEditorObjectName()
-    {
-        return m_EditorObjFullName;
-    };
-
-    void SetEditorObjName(const char* fullname)
-    {
-        m_EditorObjFullName = fullname;
-    }
-
-private:
-    QString m_undoDescription;
-    QString m_EditorObjFullName;        // Add related editor object name so we can track undo by editor object
-    TSmartPtr<IVariable> m_undo;
-    TSmartPtr<IVariable> m_redo;
-    TSmartPtr<IVariable> m_var;
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// Confetti Start
-// This undoobject class is responsible for recording varialeundo action reqiure QTUI reaction.
-// This class will store a CAttributeView. Editor plugin is responsible for deal with QTUI actions.
-class CUndoQTUIVariableChange
-    : public CUndoVariableChange
-{
-public:
-    CUndoQTUIVariableChange(IVariable* var, CAttributeItem* widget, const char* undoDescription, const char* editorObjfullname = 0)
-        : CUndoVariableChange(var, undoDescription, editorObjfullname)
-    {
-        // Stores the current state of this object.
-        m_uiWidget = widget;
-    }
-
-    CAttributeItem* getWidget() const
-    {
-        return m_uiWidget;
-    }
-
-private:
-    CAttributeItem* m_uiWidget;
-};
-// Confetti End
-////////////////////////////////////////////////////////////////////////
-
-
-#endif // CRYINCLUDE_EDITOR_UNDO_UNDO_H
diff --git a/Code/Sandbox/Editor/UndoConfigSpec.cpp b/Code/Sandbox/Editor/UndoConfigSpec.cpp
deleted file mode 100644
index 77746daac9..0000000000
--- a/Code/Sandbox/Editor/UndoConfigSpec.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Undo for Python function (PySetConfigSpec)
-
-
-#include "EditorDefs.h"
-
-#include "UndoConfigSpec.h"
-
-CUndoConficSpec::CUndoConficSpec(const QString& pUndoDescription)
-{
-    m_undo = GetIEditor()->GetEditorConfigSpec();
-    m_undoDescription = pUndoDescription;
-}
-
-int CUndoConficSpec::GetSize()
-{
-    return sizeof(*this);
-}
-
-QString CUndoConficSpec::GetDescription()
-{
-    return m_undoDescription;
-}
-
-void CUndoConficSpec::Undo(bool bUndo)
-{
-    if (bUndo)
-    {
-        m_redo = GetIEditor()->GetEditorConfigSpec();
-    }
-    GetIEditor()->SetEditorConfigSpec((ESystemConfigSpec)m_undo, GetIEditor()->GetEditorConfigPlatform());
-}
-
-void CUndoConficSpec::Redo()
-{
-    GetIEditor()->SetEditorConfigSpec((ESystemConfigSpec)m_redo, GetIEditor()->GetEditorConfigPlatform());
-}
diff --git a/Code/Sandbox/Editor/UndoConfigSpec.h b/Code/Sandbox/Editor/UndoConfigSpec.h
deleted file mode 100644
index f81ab9fc26..0000000000
--- a/Code/Sandbox/Editor/UndoConfigSpec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Undo for Python function (PySetConfigSpec)
-
-
-#ifndef CRYINCLUDE_EDITOR_UNDOCONFIGSPEC_H
-#define CRYINCLUDE_EDITOR_UNDOCONFIGSPEC_H
-#pragma once
-
-#include "Undo/IUndoObject.h"
-
-class CUndoConficSpec
-    : public IUndoObject
-{
-public:
-    CUndoConficSpec(const QString& pUndoDescription = "Set Config Spec");
-
-protected:
-    int GetSize();
-    QString GetDescription();
-    void Undo(bool bUndo);
-    void Redo();
-
-private:
-    int m_undo;
-    int m_redo;
-    QString m_undoDescription;
-};
-
-#endif // CRYINCLUDE_EDITOR_UNDOCONFIGSPEC_H
diff --git a/Code/Sandbox/Editor/UndoDropDown.cpp b/Code/Sandbox/Editor/UndoDropDown.cpp
deleted file mode 100644
index e7cffce0b9..0000000000
--- a/Code/Sandbox/Editor/UndoDropDown.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "UndoDropDown.h"
-
-#include <vector>               // for std::vector
-#include <algorithm>            // for std::reverse
-
-// Qt
-#include <QVBoxLayout>
-#include <QListView>
-#include <QAbstractListModel>
-#include <QPushButton>
-
-// Editor
-#include "Undo/Undo.h"          // for CUndoManager
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Turns listener callbacks into signals
-
-UndoStackStateAdapter::UndoStackStateAdapter(QObject* parent /* = nullptr */)
-    : QObject(parent)
-{
-    GetIEditor()->GetUndoManager()->AddListener(this);
-}
-
-UndoStackStateAdapter::~UndoStackStateAdapter()
-{
-    GetIEditor()->GetUndoManager()->RemoveListener(this);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// The model that holds the list of undo/redo actions
-
-class UndoDropDownListModel
-    : public QAbstractListModel
-    , IUndoManagerListener
-{
-public:
-    UndoDropDownListModel(CUndoManager& manager, UndoRedoDirection direction, QObject* parent = nullptr)
-        : QAbstractListModel(parent)
-        , m_manager(manager)
-        , m_direction(direction)
-    {
-        m_stackNames = m_direction == UndoRedoDirection::Undo ? m_manager.GetUndoStackNames() : m_manager.GetRedoStackNames();
-        m_manager.AddListener(this);
-    }
-
-    virtual ~UndoDropDownListModel()
-    {
-        m_manager.RemoveListener(this);
-    }
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        if (parent.model() != this && parent != QModelIndex())
-        {
-            return 0;
-        }
-
-        return m_stackNames.size();
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        if (index.row() < 0 || index.row() >= rowCount() || role != Qt::DisplayRole)
-        {
-            return {};
-        }
-
-        return m_stackNames[index.row()];
-    }
-
-    void SignalNumUndoRedo(const unsigned int& numUndo, const unsigned int& numRedo)
-    {
-        std::vector<QString> fresh;
-        if (UndoRedoDirection::Undo == m_direction && m_stackNames.size() != numUndo)
-        {
-            fresh = m_manager.GetUndoStackNames();
-        }
-        else if (UndoRedoDirection::Redo == m_direction && m_stackNames.size() != numRedo)
-        {
-            fresh = m_manager.GetRedoStackNames();
-        }
-        else
-        {
-            return;
-        }
-
-        std::reverse(fresh.begin(), fresh.end());
-
-        if (fresh.size() < m_stackNames.size())
-        {
-            beginRemoveRows(createIndex(-1, -1), fresh.size(), m_stackNames.size() - 1);
-            m_stackNames = fresh;
-            endRemoveRows();
-        }
-        else
-        {
-            beginInsertRows(createIndex(-1, -1), m_stackNames.size(), fresh.size() - 1);
-            m_stackNames = fresh;
-            endInsertRows();
-        }
-    }
-
-private:
-    CUndoManager& m_manager;
-    UndoRedoDirection m_direction;
-    std::vector<QString> m_stackNames;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// Custom selection model we use for the list of undo/redo actions
-
-void UndoStackItemSelectionModel::select(const QModelIndex& index, QItemSelectionModel::SelectionFlags command)
-{
-    if (!model())
-    {
-        return;
-    }
-
-    if (index.isValid())
-    {
-        QItemSelectionModel::select({ model()->index(0, 0, {}), index }, command);
-    }
-    clearCurrentIndex();
-}
-
-void UndoStackItemSelectionModel::select([[maybe_unused]] const QItemSelection& selection, QItemSelectionModel::SelectionFlags command)
-{
-    QPoint mouse = m_view->mapFromGlobal(QCursor::pos());
-    QModelIndex first = model()->index(0, 0, {});
-    QModelIndex last = model()->index(model()->rowCount() - 1, 0, {});
-    QModelIndex underMouse = m_view->indexAt(mouse);
-
-    if (underMouse.isValid())
-    {
-        last = underMouse;
-    }
-
-    QItemSelectionModel::select({ first, last }, command);
-    clearCurrentIndex();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CUndoDropDown dialog
-
-CUndoDropDown::CUndoDropDown(UndoRedoDirection direction, QWidget* pParent /* = nullptr */)
-    : QDialog(pParent)
-    , m_direction(direction)
-{
-    auto layout = new QVBoxLayout(this);
-    setLayout(layout);
-
-    // Model & view
-    m_model = new UndoDropDownListModel(*GetIEditor()->GetUndoManager(), direction, this);
-    m_view = new QListView(this);
-    m_view->setModel(m_model);
-    m_view->setSelectionModel(new UndoStackItemSelectionModel(m_view, m_model));
-    m_view->setSelectionMode(QAbstractItemView::ContiguousSelection);
-    layout->addWidget(m_view);
-
-    // The buttons along the bottom of the dropdown
-    auto buttonBox = new QHBoxLayout();
-
-    m_doButton = new QPushButton(this);
-    buttonBox->addWidget(m_doButton);
-
-    buttonBox->addStretch(1);
-
-    auto clearButton = new QPushButton(this);
-    clearButton->setText(tr("Clear"));
-
-    buttonBox->addWidget(clearButton);
-
-    layout->addLayout(buttonBox);
-
-    // Connections
-    connect(m_doButton, &QPushButton::clicked, this, &CUndoDropDown::OnUndoButton);
-    connect(clearButton, &QPushButton::clicked, this, &CUndoDropDown::OnUndoClear);
-
-    connect(m_view->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CUndoDropDown::SelectionChanged);
-
-    setMinimumWidth(450);
-}
-
-void CUndoDropDown::Prepare()
-{
-    m_view->selectionModel()->select(m_model->index(0, 0, {}), QItemSelectionModel::ClearAndSelect);
-    m_view->setFocus();
-    show();
-}
-
-void CUndoDropDown::OnUndoButton()
-{
-    int numSelected = m_view->selectionModel()->selectedIndexes().size();
-    if (m_direction == UndoRedoDirection::Undo)
-    {
-        GetIEditor()->GetUndoManager()->Undo(numSelected);
-    }
-    else
-    {
-        GetIEditor()->GetUndoManager()->Redo(numSelected);
-    }
-    accept();
-}
-
-void CUndoDropDown::OnUndoClear()
-{
-    if (m_direction == UndoRedoDirection::Undo)
-    {
-        GetIEditor()->GetUndoManager()->ClearUndoStack();
-    }
-    else
-    {
-        GetIEditor()->GetUndoManager()->ClearRedoStack();
-    }
-    accept();
-}
-
-void CUndoDropDown::SelectionChanged([[maybe_unused]] const QItemSelection& selected, [[maybe_unused]] const QItemSelection& deselected)
-{
-    QString label = QString("%1 %2 action%3")
-            .arg(m_direction == UndoRedoDirection::Undo ? tr("Undo") : tr("Redo"))
-            .arg(m_view->selectionModel()->selectedIndexes().size())
-            .arg(m_view->selectionModel()->selectedIndexes().size() > 1 ? "s" : "");
-    m_doButton->setText(label);
-}
-
-void CUndoDropDown::contextMenuEvent(QContextMenuEvent*)
-{
-    // Inhibit QDialog::contextMenuEvent() as this will trigger the "What's this" popup.
-    // That happens because we're a child of a QMenu, and menus have Qt::WA_CustomWhatsThis
-    // which make the popup show even if QWidget::whatsThis() text is empty.
-}
-
-#include <moc_UndoDropDown.cpp>
diff --git a/Code/Sandbox/Editor/UndoDropDown.h b/Code/Sandbox/Editor/UndoDropDown.h
deleted file mode 100644
index 015c0369bb..0000000000
--- a/Code/Sandbox/Editor/UndoDropDown.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UNDODROPDOWN_H
-#define CRYINCLUDE_EDITOR_UNDODROPDOWN_H
-
-#pragma once
-// UndoDropDown.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QItemSelectionModel>
-#include "Undo/IUndoManagerListener.h"
-#endif
-
-class QAction;
-class QListView;
-class UndoDropDownListModel;
-class QAbstractItemView;
-class QContextMenuEvent;
-
-enum class UndoRedoDirection
-{
-    Undo,
-    Redo
-};
-
-/// Turns IUndoManagerListener callbacks into signals
-class UndoStackStateAdapter
-    : public QObject
-    , IUndoManagerListener
-{
-    Q_OBJECT
-
-public:
-    explicit UndoStackStateAdapter(QObject* parent = nullptr);
-
-    ~UndoStackStateAdapter();
-
-    void SignalNumUndoRedo(const unsigned int& numUndo, const unsigned int& numRedo)
-    {
-        emit UndoAvailable(numUndo);
-        emit RedoAvailable(numRedo);
-    }
-
-signals:
-    void UndoAvailable(quint32 count);
-    void RedoAvailable(quint32 count);
-};
-
-/// Enforces contiguous selections from the top element in the list view to any that is selected below
-class UndoStackItemSelectionModel
-    : public QItemSelectionModel
-{
-    Q_OBJECT
-public:
-    UndoStackItemSelectionModel(QAbstractItemView* view, QAbstractItemModel* model)
-        : QItemSelectionModel(model)
-        , m_view(view)
-    {}
-
-    virtual ~UndoStackItemSelectionModel() {}
-
-public slots:
-    void select(const QModelIndex& index, QItemSelectionModel::SelectionFlags command) override;
-    void select(const QItemSelection& selection, QItemSelectionModel::SelectionFlags command) override;
-
-private:
-    QAbstractItemView* m_view;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CUndoDropDown dialog
-
-class CUndoDropDown
-    : public QDialog
-{
-    Q_OBJECT
-
-    // Construction
-public:
-    CUndoDropDown(UndoRedoDirection direction, QWidget* pParent = nullptr);   // standard constructor
-
-public slots:
-    // Prepare to be shown in the popup/dropdown
-    void Prepare();
-
-    // Implementation
-protected:
-    void OnUndoButton();
-    void OnUndoClear();
-    void contextMenuEvent(QContextMenuEvent*) override;
-
-    UndoRedoDirection m_direction;
-    UndoDropDownListModel* m_model;
-    QListView* m_view;
-    QPushButton* m_doButton;
-
-private slots:
-    void SelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
-};
-
-#endif // CRYINCLUDE_EDITOR_UNDODROPDOWN_H
diff --git a/Code/Sandbox/Editor/UndoViewPosition.cpp b/Code/Sandbox/Editor/UndoViewPosition.cpp
deleted file mode 100644
index dc2e54f98e..0000000000
--- a/Code/Sandbox/Editor/UndoViewPosition.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Undo for Python function (PySetCurrentViewPosition)
-
-
-#include "EditorDefs.h"
-
-#include "UndoViewPosition.h"
-
-// Editor
-#include "ViewManager.h"
-
-CUndoViewPosition::CUndoViewPosition(const QString& pUndoDescription)
-{
-    m_undoDescription = pUndoDescription;
-
-    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-    if (pRenderViewport)
-    {
-        Matrix34 tm = pRenderViewport->GetViewTM();
-        m_undo = tm.GetTranslation();
-    }
-}
-
-int CUndoViewPosition::GetSize()
-{
-    return sizeof(*this);
-}
-
-QString CUndoViewPosition::GetDescription()
-{
-    return m_undoDescription;
-}
-
-void CUndoViewPosition::Undo(bool bUndo)
-{
-    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-    if (pRenderViewport)
-    {
-        Matrix34 tm = pRenderViewport->GetViewTM();
-        if (bUndo)
-        {
-            m_redo = tm.GetTranslation();
-        }
-
-        tm.SetTranslation(m_undo);
-        pRenderViewport->SetViewTM(tm);
-    }
-}
-
-void CUndoViewPosition::Redo()
-{
-    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-    if (pRenderViewport)
-    {
-        Matrix34 tm = pRenderViewport->GetViewTM();
-        tm.SetTranslation(m_redo);
-        pRenderViewport->SetViewTM(tm);
-    }
-}
diff --git a/Code/Sandbox/Editor/UndoViewPosition.h b/Code/Sandbox/Editor/UndoViewPosition.h
deleted file mode 100644
index 4feb295117..0000000000
--- a/Code/Sandbox/Editor/UndoViewPosition.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Undo for Python function (PySetCurrentViewPosition)
-
-#ifndef CRYINCLUDE_EDITOR_UNDOVIEWPOSITION_H
-#define CRYINCLUDE_EDITOR_UNDOVIEWPOSITION_H
-#pragma once
-
-#include "Undo/IUndoObject.h"
-
-class CUndoViewPosition
-    : public IUndoObject
-{
-public:
-    CUndoViewPosition(const QString& pUndoDescription = "Set Current View Position");
-
-protected:
-    int GetSize();
-    QString GetDescription();
-    void Undo(bool bUndo);
-    void Redo();
-
-private:
-    Vec3 m_undo;
-    Vec3 m_redo;
-    QString m_undoDescription;
-};
-
-#endif // CRYINCLUDE_EDITOR_UNDOVIEWPOSITION_H
diff --git a/Code/Sandbox/Editor/UndoViewRotation.cpp b/Code/Sandbox/Editor/UndoViewRotation.cpp
deleted file mode 100644
index 35c7be2e40..0000000000
--- a/Code/Sandbox/Editor/UndoViewRotation.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Undo for Python function (PySetCurrentViewPosition)
-
-
-#include "EditorDefs.h"
-
-#include "UndoViewRotation.h"
-
-// Editor
-#include "ViewManager.h"
-
-CUndoViewRotation::CUndoViewRotation(const QString& pUndoDescription)
-{
-    m_undoDescription = pUndoDescription;
-    m_undo = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(GetIEditor()->GetSystem()->GetViewCamera().GetMatrix())));
-}
-
-int CUndoViewRotation::GetSize()
-{
-    return sizeof(*this);
-}
-
-QString CUndoViewRotation::GetDescription()
-{
-    return m_undoDescription;
-}
-
-void CUndoViewRotation::Undo(bool bUndo)
-{
-    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-    if (pRenderViewport)
-    {
-        if (bUndo)
-        {
-            m_redo = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(GetIEditor()->GetSystem()->GetViewCamera().GetMatrix())));
-        }
-
-        Matrix34 tm = pRenderViewport->GetViewTM();
-        tm.SetRotationXYZ(Ang3(DEG2RAD(m_undo.x), DEG2RAD(m_undo.y), DEG2RAD(m_undo.z)), tm.GetTranslation());
-        pRenderViewport->SetViewTM(tm);
-    }
-}
-
-void CUndoViewRotation::Redo()
-{
-    CViewport* pRenderViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-    if (pRenderViewport)
-    {
-        Matrix34 tm = pRenderViewport->GetViewTM();
-        tm.SetRotationXYZ(Ang3(DEG2RAD(m_redo.x), DEG2RAD(m_redo.y), DEG2RAD(m_redo.z)), tm.GetTranslation());
-        pRenderViewport->SetViewTM(tm);
-    }
-}
diff --git a/Code/Sandbox/Editor/UndoViewRotation.h b/Code/Sandbox/Editor/UndoViewRotation.h
deleted file mode 100644
index c9e32addd1..0000000000
--- a/Code/Sandbox/Editor/UndoViewRotation.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Undo for Python function (PySetCurrentViewRotation)
-
-
-#ifndef CRYINCLUDE_EDITOR_UNDOVIEWROTATION_H
-#define CRYINCLUDE_EDITOR_UNDOVIEWROTATION_H
-#pragma once
-#include "Undo/IUndoObject.h"
-
-
-class CUndoViewRotation
-    : public IUndoObject
-{
-public:
-    CUndoViewRotation(const QString& pUndoDescription = "Set Current View Rotation");
-
-protected:
-    int GetSize();
-    QString GetDescription();
-    void Undo(bool bUndo);
-    void Redo();
-
-private:
-    Ang3 m_undo;
-    Ang3 m_redo;
-    QString m_undoDescription;
-};
-
-#endif // CRYINCLUDE_EDITOR_UNDOVIEWROTATION_H
diff --git a/Code/Sandbox/Editor/UsedResources.cpp b/Code/Sandbox/Editor/UsedResources.cpp
deleted file mode 100644
index 4239e8d467..0000000000
--- a/Code/Sandbox/Editor/UsedResources.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "UsedResources.h"
-#include "ErrorReport.h"
-
-CUsedResources::CUsedResources()
-{
-}
-
-void CUsedResources::Add(const char* pResourceFileName)
-{
-    if (pResourceFileName && strcmp(pResourceFileName, ""))
-    {
-        files.insert(pResourceFileName);
-    }
-}
diff --git a/Code/Sandbox/Editor/UsedResources.h b/Code/Sandbox/Editor/UsedResources.h
deleted file mode 100644
index 13362f5472..0000000000
--- a/Code/Sandbox/Editor/UsedResources.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2001-2012
-// -------------------------------------------------------------------------
-//  File name:   UsedResources.h
-//  Created:     28/11/2003 by Timur.
-//  Description: Class to gather used resources
-//
-////////////////////////////////////////////////////////////////////////////
-
-//! Class passed to resource gathering functions
-#ifndef CRYINCLUDE_EDITOR_USEDRESOURCES_H
-#define CRYINCLUDE_EDITOR_USEDRESOURCES_H
-
-#include "Include/EditorCoreAPI.h"
-
-class EDITOR_CORE_API CUsedResources
-{
-public:
-    typedef std::set<QString, stl::less_stricmp<QString> > TResourceFiles;
-
-    CUsedResources();
-    void Add(const char* pResourceFileName);
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    TResourceFiles files;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-#endif // CRYINCLUDE_EDITOR_USEDRESOURCES_H
diff --git a/Code/Sandbox/Editor/UserMessageDefines.h b/Code/Sandbox/Editor/UserMessageDefines.h
deleted file mode 100644
index 5cf9a14e4c..0000000000
--- a/Code/Sandbox/Editor/UserMessageDefines.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_USERMESSAGEDEFINES_H
-#define CRYINCLUDE_EDITOR_USERMESSAGEDEFINES_H
-#pragma once
-
-
-enum ESandboxUserMessages
-{
-    // InPlaceComboBox
-    WM_USER_ON_SELECTION_CANCEL = WM_USER + 1,
-    WM_USER_ON_SELECTION_OK,
-    WM_USER_ON_NEW_SELECTION,
-    WM_USER_ON_EDITCHANGE,
-    WM_USER_ON_OPENDROPDOWN,
-    WM_USER_ON_EDITKEYDOWN,
-    WM_USER_ON_EDITCLICK,
-    // ACListWnd
-    ENAC_UPDATE,
-    // EditWithButton
-    WM_USER_EDITWITHBUTTON_CLICKED,
-    // FillSliderCtrl
-    WMU_FS_CHANGED,
-    WMU_FS_LBUTTONDOWN,
-    WMU_FS_LBUTTONUP,
-    FLM_EDITTEXTCHANGED,
-    FLM_FILTERTEXTCHANGED,
-    // NumberCtrlEdit
-    WMU_LBUTTONDOWN,
-    WMU_LBUTTONUP,
-    WM_ONWINDOWFOCUSCHANGES,
-    // SelectObjectDialog
-    IDT_TIMER_0,
-    IDT_TIMER_1,
-    // LensFlareEditor
-    WM_FLAREEDITOR_UPDATETREECONTROL,
-    // EquipPackDialog
-    UM_EQUIPLIST_CHECKSTATECHANGE,
-    // MaterialSender/MatEditMainDlg
-    WM_MATEDITPICK,
-    // GridMapWindow
-    WM_USER_ON_DBL_CLICK,
-    // LMCompDialog
-    WM_UPDATE_LIGHTMAP_GENERATION_PROGRESS,
-    WM_UPDATE_LIGHTMAP_GENERATION_MEMUSAGE,
-    WM_UPDATE_LIGHTMAP_GENERATION_MEMUSAGE_STATIC,
-    WM_UPDATE_GLM_NAME_EDIT,
-    // Viewport
-    WM_VIEWPORT_ON_TITLE_CHANGE,
-    // VisualLogControls
-    UWM_BUTTON_CLICKED,
-};
-#endif // CRYINCLUDE_EDITOR_USERMESSAGEDEFINES_H
diff --git a/Code/Sandbox/Editor/Util/3DConnexionDriver.cpp b/Code/Sandbox/Editor/Util/3DConnexionDriver.cpp
deleted file mode 100644
index 64047383d8..0000000000
--- a/Code/Sandbox/Editor/Util/3DConnexionDriver.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "3DConnexionDriver.h"
-
-#if defined(AZ_PLATFORM_WINDOWS)
-
-//////////////////////////////////////////////////////////////////////////
-C3DConnexionDriver::C3DConnexionDriver()
-{
-    m_pRawInputDeviceList = 0;
-    m_pRawInputDevices = 0;
-    m_nUsagePage1Usage8Devices = 0;
-    m_fMultiplier = 1.0f;
-
-    InitDevice();
-}
-
-//////////////////////////////////////////////////////////////////////////
-C3DConnexionDriver::~C3DConnexionDriver()
-{
-}
-
-bool C3DConnexionDriver::InitDevice()
-{
-    // Find the Raw Devices
-    UINT nDevices;
-    // Get Number of devices attached
-    if (GetRawInputDeviceList(NULL, &nDevices, sizeof(RAWINPUTDEVICELIST)) != 0)
-    {
-        return false;
-    }
-    // Create list large enough to hold all RAWINPUTDEVICE structs
-    if ((m_pRawInputDeviceList = (PRAWINPUTDEVICELIST)malloc(sizeof(RAWINPUTDEVICELIST) * nDevices)) == NULL)
-    {
-        return false;
-    }
-    // Now get the data on the attached devices
-    if (GetRawInputDeviceList(m_pRawInputDeviceList, &nDevices, sizeof(RAWINPUTDEVICELIST)) == -1)
-    {
-        return false;
-    }
-
-    m_pRawInputDevices = (PRAWINPUTDEVICE)malloc(nDevices * sizeof(RAWINPUTDEVICE));
-    m_nUsagePage1Usage8Devices = 0;
-
-    // Look through device list for RIM_TYPEHID devices with UsagePage == 1, Usage == 8
-    for (UINT i = 0; i < nDevices; i++)
-    {
-        //Doc says RIM_TYPEHID: Data comes from an HID that is not a keyboard or a mouse.
-        if (m_pRawInputDeviceList[i].dwType == RIM_TYPEHID)
-        {
-            UINT nchars = 300;
-            TCHAR deviceName[300];
-            if (GetRawInputDeviceInfo(m_pRawInputDeviceList[i].hDevice,
-                    RIDI_DEVICENAME, deviceName, &nchars) >= 0)
-            {
-                //_RPT3(_CRT_WARN, "Device[%d]: handle=0x%x name = %S\n", i, g_pRawInputDeviceList[i].hDevice, deviceName);
-            }
-
-            RID_DEVICE_INFO dinfo;
-            UINT sizeofdinfo = sizeof(dinfo);
-            dinfo.cbSize = sizeofdinfo;
-            if (GetRawInputDeviceInfo(m_pRawInputDeviceList[i].hDevice,
-                    RIDI_DEVICEINFO, &dinfo, &sizeofdinfo) >= 0)
-            {
-                if (dinfo.dwType == RIM_TYPEHID)
-                {
-                    RID_DEVICE_INFO_HID* phidInfo = &dinfo.hid;
-                    // Add this one to the list of interesting devices?
-                    // Actually only have to do this once to get input from all usage 1, usagePage 8 devices
-                    // This just keeps out the other usages.
-                    // You might want to put up a list for users to select amongst the different devices.
-                    // In particular, to assign separate functionality to the different devices.
-                    if (phidInfo->usUsagePage == 1 && phidInfo->usUsage == 8)
-                    {
-                        m_pRawInputDevices[m_nUsagePage1Usage8Devices].usUsagePage = phidInfo->usUsagePage;
-                        m_pRawInputDevices[m_nUsagePage1Usage8Devices].usUsage     = phidInfo->usUsage;
-                        m_pRawInputDevices[m_nUsagePage1Usage8Devices].dwFlags     = 0;
-                        m_pRawInputDevices[m_nUsagePage1Usage8Devices].hwndTarget  = NULL;
-                        m_nUsagePage1Usage8Devices++;
-                    }
-                }
-            }
-        }
-    }
-
-    // Register for input from the devices in the list
-    if (RegisterRawInputDevices(m_pRawInputDevices, m_nUsagePage1Usage8Devices, sizeof(RAWINPUTDEVICE)) == false)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool C3DConnexionDriver::GetInputMessageData(LPARAM lParam, S3DConnexionMessage& msg)
-{
-    ZeroStruct(msg);
-
-    RAWINPUTHEADER header;
-    UINT size = sizeof(header);
-    if (GetRawInputData((HRAWINPUT)lParam, RID_HEADER, &header,  &size, sizeof(RAWINPUTHEADER)) == -1)
-    {
-        return false;
-    }
-
-    // Set aside enough memory for the full event
-    char rawbuffer[128];
-    LPRAWINPUT event = (LPRAWINPUT)rawbuffer;
-    size = sizeof(rawbuffer);
-    if (GetRawInputData((HRAWINPUT)lParam, RID_INPUT, event, &size, sizeof(RAWINPUTHEADER)) == -1)
-    {
-        return false;
-    }
-    else
-    {
-        if (event->header.dwType == RIM_TYPEHID)
-        {
-            static BOOL bGotTranslation = FALSE,
-                        bGotRotation    = FALSE;
-            static int all6DOFs[6] = {0};
-            LPRAWHID pRawHid = &event->data.hid;
-
-            // Translation or Rotation packet?  They come in two different packets.
-            if (pRawHid->bRawData[0] == 1) // Translation vector
-            {
-                msg.raw_translation[0] = (pRawHid->bRawData[1] & 0x000000ff) | ((signed short)(pRawHid->bRawData[2] << 8) & 0xffffff00);
-                msg.raw_translation[1] = (pRawHid->bRawData[3] & 0x000000ff) | ((signed short)(pRawHid->bRawData[4] << 8) & 0xffffff00);
-                msg.raw_translation[2] = (pRawHid->bRawData[5] & 0x000000ff) | ((signed short)(pRawHid->bRawData[6] << 8) & 0xffffff00);
-                msg.vTranslate.x = msg.raw_translation[0] / 255.f * m_fMultiplier;
-                msg.vTranslate.y = msg.raw_translation[1] / 255.f * m_fMultiplier;
-                msg.vTranslate.z = msg.raw_translation[2] / 255.f * m_fMultiplier;
-                msg.bGotTranslation = true;
-            }
-            else if (pRawHid->bRawData[0] == 2) // Rotation vector
-            {
-                msg.raw_rotation[0] = (pRawHid->bRawData[1] & 0x000000ff) | ((signed short)(pRawHid->bRawData[2] << 8) & 0xffffff00);
-                msg.raw_rotation[1] = (pRawHid->bRawData[3] & 0x000000ff) | ((signed short)(pRawHid->bRawData[4] << 8) & 0xffffff00);
-                msg.raw_rotation[2] = (pRawHid->bRawData[5] & 0x000000ff) | ((signed short)(pRawHid->bRawData[6] << 8) & 0xffffff00);
-                msg.vRotate.x = msg.raw_rotation[0] / 255.f * m_fMultiplier;
-                msg.vRotate.y = msg.raw_rotation[1] / 255.f * m_fMultiplier;
-                msg.vRotate.z = msg.raw_rotation[2] / 255.f * m_fMultiplier;
-                msg.bGotRotation = true;
-            }
-            else if (pRawHid->bRawData[0] == 3) // Buttons (display most significant byte to least)
-            {
-                msg.buttons[0] = (unsigned char)pRawHid->bRawData[1];
-                msg.buttons[1] = (unsigned char)pRawHid->bRawData[2];
-                msg.buttons[2] = (unsigned char)pRawHid->bRawData[3];
-
-                CryLog("Button mask: %.2x %.2x %.2x\n", (unsigned char)pRawHid->bRawData[3], (unsigned char)pRawHid->bRawData[2], (unsigned char)pRawHid->bRawData[1]);
-
-                if (msg.buttons[0] == 1)
-                {
-                    m_fMultiplier /= 2.0f;
-                }
-                else if (msg.buttons[0] == 2)
-                {
-                    m_fMultiplier *= 2.0f;
-                }
-            }
-        }
-    }
-    return true;
-}
-
-#endif
diff --git a/Code/Sandbox/Editor/Util/3DConnexionDriver.h b/Code/Sandbox/Editor/Util/3DConnexionDriver.h
deleted file mode 100644
index 8f90c9c3b8..0000000000
--- a/Code/Sandbox/Editor/Util/3DConnexionDriver.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_3DCONNEXIONDRIVER_H
-#define CRYINCLUDE_EDITOR_UTIL_3DCONNEXIONDRIVER_H
-#pragma once
-#include "Include/IPlugin.h"
-
-struct S3DConnexionMessage
-{
-    bool bGotTranslation;
-    bool bGotRotation;
-
-    int raw_translation[3];
-    int raw_rotation[3];
-
-    Vec3 vTranslate;
-    Vec3 vRotate;
-
-    unsigned char buttons[3];
-
-    S3DConnexionMessage()
-        : bGotRotation(false)
-        , bGotTranslation(false)
-    {
-        raw_translation[0] = raw_translation[1] = raw_translation[2] = 0;
-        raw_rotation[0] = raw_rotation[1] = raw_rotation[2] = 0;
-        vTranslate.Set(0, 0, 0);
-        vRotate.Set(0, 0, 0);
-        buttons[0] = buttons[1] = buttons[2] = 0;
-    };
-};
-
-#if defined(AZ_PLATFORM_WINDOWS)
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class SANDBOX_API C3DConnexionDriver
-    : public IPlugin
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    C3DConnexionDriver();
-    ~C3DConnexionDriver();
-
-    bool InitDevice();
-    bool GetInputMessageData(LPARAM lParam, S3DConnexionMessage& msg);
-
-    void Release() { delete this; };
-    void ShowAbout() {};
-    const char* GetPluginGUID() { return "{AD109901-9128-4ffd-8E67-137CB2B1C41B}"; };
-    DWORD GetPluginVersion() { return 1; };
-    const char* GetPluginName() { return "3DConnexionDriver"; };
-    bool CanExitNow() { return true; };
-    void OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId){}
-
-private:
-    class C3DConnexionDriverImpl* m_pImpl;
-    PRAWINPUTDEVICELIST m_pRawInputDeviceList;
-    PRAWINPUTDEVICE m_pRawInputDevices;
-    int m_nUsagePage1Usage8Devices;
-    float m_fMultiplier;
-};
-#endif
-#endif // CRYINCLUDE_EDITOR_UTIL_3DCONNEXIONDRIVER_H
diff --git a/Code/Sandbox/Editor/Util/AbstractGroupProxyModel.cpp b/Code/Sandbox/Editor/Util/AbstractGroupProxyModel.cpp
deleted file mode 100644
index 58840b505d..0000000000
--- a/Code/Sandbox/Editor/Util/AbstractGroupProxyModel.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "AbstractGroupProxyModel.h"
-
-AbstractGroupProxyModel::AbstractGroupProxyModel(QObject* parent)
-    : QAbstractProxyModel(parent)
-{
-}
-
-AbstractGroupProxyModel::~AbstractGroupProxyModel()
-{
-}
-
-QVariant AbstractGroupProxyModel::data(const QModelIndex& index, int role) const
-{
-    if (!index.isValid())
-    {
-        return QVariant();
-    }
-
-    const GroupItem* group = reinterpret_cast<GroupItem*>(index.internalPointer());
-    if (index.row() >= group->subGroups.count())
-    {
-        return sourceModel()->data(mapToSource(index), role);
-    }
-    else if (role == Qt::DisplayRole && index.column() == 0 && !group->subGroups.at(index.row())->groupTitle.isEmpty())
-    {
-        return group->subGroups[index.row()]->groupTitle;
-    }
-    else if (group->subGroups.at(index.row())->groupSourceIndex.isValid())
-    {
-        return group->subGroups.at(index.row())->groupSourceIndex.data(role);
-    }
-    return QVariant();
-}
-
-int AbstractGroupProxyModel::rowCount(const QModelIndex& parent) const
-{
-    if (!sourceModel())
-    {
-        return 0;
-    }
-
-    // invalid parent - root item is used
-    if (!parent.isValid())
-    {
-        return m_rootItem.subGroups.count() + m_rootItem.sourceIndexes.count();
-    }
-    // this is the group the parent is in.
-    const GroupItem* group = reinterpret_cast<GroupItem*>(parent.internalPointer());
-    if (parent.row() < group->subGroups.count())
-    {
-        return group->subGroups[parent.row()]->subGroups.count() + group->subGroups[parent.row()]->sourceIndexes.count();
-    }
-    return 0;
-}
-
-int AbstractGroupProxyModel::columnCount(const QModelIndex& parent) const
-{
-    Q_UNUSED(parent)
-    if (!sourceModel())
-    {
-        return 0;
-    }
-    return sourceModel()->columnCount(QModelIndex());
-}
-
-QModelIndex AbstractGroupProxyModel::index(int row, int column, const QModelIndex& parent) const
-{
-    if (row >= rowCount(parent) || column >= columnCount(parent))
-    {
-        return QModelIndex();
-    }
-    if (!parent.isValid())
-    {
-        return createIndex(row, column, const_cast<GroupItem*>(&m_rootItem));
-    }
-    const GroupItem* group = reinterpret_cast<GroupItem*>(parent.internalPointer());
-    GroupItem* newParent = group->subGroups[parent.row()];
-    return createIndex(row, column, newParent);
-}
-
-QVariant AbstractGroupProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    return sourceModel()->headerData(section, orientation, role);
-}
-
-QModelIndex AbstractGroupProxyModel::parent(const QModelIndex& index) const
-{
-    GroupItem* group = reinterpret_cast<GroupItem*>(index.internalPointer());
-    if (!group)
-    {
-        return QModelIndex();
-    }
-    const GroupItem* parentGroup = FindGroup(group);
-    if (!parentGroup)
-    {
-        return QModelIndex();
-    }
-    const int row = parentGroup->subGroups.indexOf(group);
-    return createIndex(row, 0, const_cast<GroupItem*>(parentGroup));
-}
-
-bool AbstractGroupProxyModel::hasChildren(const QModelIndex& parent) const
-{
-    if (!parent.isValid())
-    {
-        return true;
-    }
-    const GroupItem* group = reinterpret_cast<GroupItem*>(parent.internalPointer());
-    return parent.row() < group->subGroups.count();
-}
-
-Qt::ItemFlags AbstractGroupProxyModel::flags(const QModelIndex& index) const
-{
-    const QModelIndex sourceIndex = mapToSource(index);
-    if (!sourceIndex.isValid())
-    {
-        return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-    }
-    return sourceModel()->flags(sourceIndex);
-}
-
-QModelIndex AbstractGroupProxyModel::mapToSource(const QModelIndex& proxyIndex) const
-{
-    GroupItem* group = reinterpret_cast<GroupItem*>(proxyIndex.internalPointer());
-    if (!group)
-    {
-        return QModelIndex();
-    }
-    const int i = proxyIndex.row() - group->subGroups.count();
-    if (i < 0)
-    {
-        return QModelIndex();
-    }
-    return group->sourceIndexes[i].sibling(group->sourceIndexes[i].row(), proxyIndex.column());
-}
-
-QModelIndex AbstractGroupProxyModel::mapFromSource(const QModelIndex& sourceIndex) const
-{
-    if (!sourceIndex.isValid())
-    {
-        return QModelIndex();
-    }
-    
-    GroupItem* group = FindIndex(sourceIndex.sibling(sourceIndex.row(), 0));
-    if (!group)
-    {
-        return QModelIndex();
-    }
-
-    if (group->groupSourceIndex == sourceIndex)
-    {
-        GroupItem* parentGroup = FindGroup(group);
-        return createIndex(parentGroup->subGroups.indexOf(group), sourceIndex.column(), parentGroup);
-    }
-    return createIndex(group->subGroups.count() + group->sourceIndexes.indexOf(sourceIndex.sibling(sourceIndex.row(), 0)),
-        sourceIndex.column(), const_cast<GroupItem*>(group));
-}
-
-AbstractGroupProxyModel::GroupItem* AbstractGroupProxyModel::FindIndex(const QModelIndex& index, GroupItem* group) const
-{
-    if (group == nullptr)
-    {
-        group = const_cast<GroupItem*>(&m_rootItem);
-    }
-
-    if (group->sourceIndexes.contains(index) || group->groupSourceIndex == index)
-    {
-        return group;
-    }
-    for (GroupItem* subGroup : group->subGroups)
-    {
-        GroupItem* g = FindIndex(index, subGroup);
-        if (g)
-        {
-            return g;
-        }
-    }
-    return nullptr;
-}
-
-AbstractGroupProxyModel::GroupItem* AbstractGroupProxyModel::FindGroup(GroupItem* group, GroupItem* parent) const
-{
-    if (parent == nullptr)
-    {
-        parent = const_cast<GroupItem*>(&m_rootItem);
-    }
-
-    if (parent->subGroups.contains(group))
-    {
-        return parent;
-    }
-    for (GroupItem* subGroup : parent->subGroups)
-    {
-        GroupItem* g = FindGroup(group, subGroup);
-        if (g)
-        {
-            return g;
-        }
-    }
-    return nullptr;
-}
-
-void AbstractGroupProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
-{
-    QAbstractProxyModel::setSourceModel(sourceModel);
-    connect(sourceModel, &QAbstractItemModel::rowsInserted, this, &AbstractGroupProxyModel::SourceRowsInserted);
-    connect(sourceModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &AbstractGroupProxyModel::SourceRowsAboutToBeRemoved);
-    connect(sourceModel, &QAbstractItemModel::dataChanged, this, &AbstractGroupProxyModel::SourceDataChanged);
-    connect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, this, &AbstractGroupProxyModel::slotSourceAboutToBeReset);
-    connect(sourceModel, &QAbstractItemModel::modelReset, this, &AbstractGroupProxyModel::slotSourceReset);
-    connect(sourceModel, &QAbstractItemModel::layoutAboutToBeChanged, this, &AbstractGroupProxyModel::slotSourceAboutToBeReset);
-    connect(sourceModel, &QAbstractItemModel::layoutChanged, this, &AbstractGroupProxyModel::slotSourceReset);
-    RebuildTree();
-}
-
-void AbstractGroupProxyModel::slotSourceAboutToBeReset()
-{
-    beginResetModel();
-    qDeleteAll(m_rootItem.subGroups);
-    m_rootItem.subGroups.clear();
-    m_rootItem.sourceIndexes.clear();
-}
-
-void AbstractGroupProxyModel::slotSourceReset()
-{
-    const int rowCount = sourceModel() ? sourceModel()->rowCount() : 0;
-    for (int row = 0; row < rowCount; ++row)
-    {
-        const QModelIndex sourceIndex = sourceModel()->index(row, 0);
-        GroupItem* group = CreateGroupIfNotExists(GroupForSourceIndex(sourceIndex));
-        if (IsGroupIndex(sourceIndex))
-        {
-            group->groupSourceIndex = sourceIndex;
-        }
-        else
-        {
-            group->sourceIndexes.push_back(sourceIndex);
-        }
-    }
-    endResetModel();
-}
-
-void AbstractGroupProxyModel::RebuildTree()
-{
-    beginResetModel();
-    {
-        QSignalBlocker blocker(this);
-        slotSourceAboutToBeReset();
-        slotSourceReset();
-    }
-    endResetModel();
-    Q_EMIT GroupUpdated();
-}
-
-int AbstractGroupProxyModel::subGroupCount() const
-{
-    return m_rootItem.subGroups.count();
-}
-
-void AbstractGroupProxyModel::SourceRowsInserted(const QModelIndex& p, int from, int to)
-{
-    if (p.isValid())
-    {
-        return;
-    }
-
-    for (int row = from; row <= to; ++row)
-    {
-        const QModelIndex sourceIndex = sourceModel()->index(row, 0);
-        GroupItem* group = CreateGroupIfNotExists(GroupForSourceIndex(sourceIndex));
-        if (IsGroupIndex(sourceIndex))
-        {
-            group->groupSourceIndex = sourceIndex;
-        }
-        else
-        {
-            const int modelRow = group->subGroups.count() + group->sourceIndexes.count();
-            beginInsertRows(parent(createIndex(0, 0, group)), modelRow, modelRow);
-            group->sourceIndexes.push_back(sourceIndex);
-            endInsertRows();
-        }
-    }
-    Q_EMIT GroupUpdated();
-}
-
-void AbstractGroupProxyModel::SourceRowsAboutToBeRemoved(const QModelIndex& p, int from, int to)
-{
-    if (p.isValid())
-    {
-        return;
-    }
-
-    for (int row = from; row <= to; ++row)
-    {
-        const QModelIndex sourceIndex = sourceModel()->index(row, 0);
-        GroupItem* group = const_cast<GroupItem*>(FindIndex(sourceIndex));
-        if (!group)
-        {
-            continue;
-        }
-        if (group->groupSourceIndex != sourceIndex)
-        {
-            const int modelRow = group->subGroups.count() + group->sourceIndexes.indexOf(sourceIndex);
-            beginRemoveRows(parent(createIndex(0, 0, group)), modelRow, modelRow);
-            group->sourceIndexes.remove(group->sourceIndexes.indexOf(sourceIndex));
-            endRemoveRows();
-        }
-        RemoveEmptyGroup(group);
-    }
-    Q_EMIT GroupUpdated();
-}
-
-void AbstractGroupProxyModel::SourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
-{
-    if (topLeft.parent().isValid())
-    {
-        return;
-    }
-
-    for (int row = topLeft.row(); row <= bottomRight.row(); ++row)
-    {
-        const QModelIndex sourceIndex = sourceModel()->index(row, 0);
-        const GroupItem* currentGroup = FindIndex(sourceIndex);
-        GroupItem* newGroup = CreateGroupIfNotExists(GroupForSourceIndex(sourceIndex));
-        if (currentGroup != newGroup)
-        {
-            SourceRowsAboutToBeRemoved(QModelIndex(), row, row);
-            SourceRowsInserted(QModelIndex(), row, row);
-        }
-        else
-        {
-            emit dataChanged(mapFromSource(sourceIndex), mapFromSource(sourceIndex.sibling(row, columnCount() - 1)));
-        }
-    }
-    Q_EMIT GroupUpdated();
-}
-
-AbstractGroupProxyModel::GroupItem* AbstractGroupProxyModel::CreateGroupIfNotExists(QStringList group)
-{
-    GroupItem* currentGroup = &m_rootItem;
-
-    while (true)
-    {
-        if (group.isEmpty())
-        {
-            return currentGroup;
-        }
-        auto matchingSubGroup = std::find_if(currentGroup->subGroups.begin(), currentGroup->subGroups.end(),
-                [=](const GroupItem* g)
-                {
-                    return QString::compare(g->groupTitle, group.first(), Qt::CaseInsensitive) == 0;
-                }
-                );
-        if (matchingSubGroup == currentGroup->subGroups.end())
-        {
-            GroupItem* newGroup = new GroupItem;
-            newGroup->groupTitle = group.first();
-            beginInsertRows(parent(createIndex(0, 0, currentGroup)),
-                currentGroup->subGroups.size(), currentGroup->subGroups.size());
-            currentGroup->subGroups.push_back(newGroup);
-            endInsertRows();
-            currentGroup = currentGroup->subGroups[currentGroup->subGroups.size() - 1];
-        }
-        else
-        {
-            currentGroup = *matchingSubGroup;
-        }
-        group.pop_front();
-    }
-}
-
-void AbstractGroupProxyModel::RemoveEmptyGroup(GroupItem* group)
-{
-    if (!group->subGroups.isEmpty() || !group->sourceIndexes.isEmpty() || group == &m_rootItem
-        || (group->groupSourceIndex.isValid() && !IsGroupIndex(group->groupSourceIndex)))
-    {
-        return;
-    }
-    GroupItem* parentGroup = const_cast<GroupItem*>(FindGroup(group));
-    const int row = parentGroup->subGroups.indexOf(group);
-    beginRemoveRows(parent(createIndex(0, 0, parentGroup)), row, row);
-    delete parentGroup->subGroups.takeAt(row);
-    endRemoveRows();
-    RemoveEmptyGroup(parentGroup);
-}
-
-#include <Util/moc_AbstractGroupProxyModel.cpp>
diff --git a/Code/Sandbox/Editor/Util/AbstractGroupProxyModel.h b/Code/Sandbox/Editor/Util/AbstractGroupProxyModel.h
deleted file mode 100644
index 1532f144ce..0000000000
--- a/Code/Sandbox/Editor/Util/AbstractGroupProxyModel.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef ABSTRACTGROUPPROXYMODEL_H
-#define ABSTRACTGROUPPROXYMODEL_H
-
-#if !defined(Q_MOC_RUN)
-#include <QAbstractProxyModel>
-#endif
-
-#if !defined(Q_MOC_RUN)
-#include <QPixmap>
-#endif
-
-class AbstractGroupProxyModel
-    : public QAbstractProxyModel
-{
-    Q_OBJECT
-
-public:
-    AbstractGroupProxyModel(QObject* parent = 0);
-    ~AbstractGroupProxyModel();
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
-
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex& index) const override;
-
-    bool hasChildren(const QModelIndex& parent = QModelIndex()) const override;
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-
-    QModelIndex mapToSource(const QModelIndex& proxyIndex) const override;
-    QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override;
-
-    void setSourceModel(QAbstractItemModel* sourceModel) override;
-
-signals:
-    void GroupUpdated();
-
-protected:
-    virtual QStringList GroupForSourceIndex(const QModelIndex& sourceIndex) const = 0;
-    virtual bool IsGroupIndex([[maybe_unused]] const QModelIndex& sourceIndex) const { return false; }
-
-    void slotSourceAboutToBeReset();
-    void slotSourceReset();
-
-    void RebuildTree();
-    int subGroupCount() const;
-
-private:
-    struct GroupItem
-    {
-        QPersistentModelIndex groupSourceIndex;
-        QString groupTitle;
-        QVector<GroupItem*> subGroups;
-        QVector<QPersistentModelIndex> sourceIndexes;
-
-        ~GroupItem()
-        {
-            qDeleteAll(subGroups);
-        }
-    };
-
-    GroupItem* FindIndex(const QModelIndex& index, GroupItem* group = 0) const;
-    GroupItem* FindGroup(GroupItem* group, GroupItem* parent = 0) const;
-
-    void SourceRowsInserted(const QModelIndex& parent, int from, int to);
-    void SourceRowsAboutToBeRemoved(const QModelIndex& parent, int from, int to);
-    void SourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
-    GroupItem* CreateGroupIfNotExists(QStringList group);
-    void RemoveEmptyGroup(GroupItem* group);
-
-    GroupItem m_rootItem;
-};
-
-#endif // ABSTRACTGROUPPROXYMODEL_H
diff --git a/Code/Sandbox/Editor/Util/AbstractSortModel.cpp b/Code/Sandbox/Editor/Util/AbstractSortModel.cpp
deleted file mode 100644
index c5b6f5c535..0000000000
--- a/Code/Sandbox/Editor/Util/AbstractSortModel.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "AbstractSortModel.h"
-
-AbstractSortModel::AbstractSortModel(QObject* parent)
-    : QAbstractTableModel(parent)
-{
-}
-
-bool AbstractSortModel::LessThan(const QModelIndex& lhs, const QModelIndex& rhs) const
-{
-    return lhs.data().toString() < rhs.data().toString();
-}
-
-#include <Util/moc_AbstractSortModel.cpp>
diff --git a/Code/Sandbox/Editor/Util/AbstractSortModel.h b/Code/Sandbox/Editor/Util/AbstractSortModel.h
deleted file mode 100644
index cec5401754..0000000000
--- a/Code/Sandbox/Editor/Util/AbstractSortModel.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef ABSTRACTSORTMODEL_H
-#define ABSTRACTSORTMODEL_H
-
-#if !defined(Q_MOC_RUN)
-#include <QAbstractItemModel>
-#endif
-
-class AbstractSortModel
-    : public QAbstractTableModel
-{
-    Q_OBJECT
-
-public:
-    AbstractSortModel(QObject* parent = nullptr);
-
-    virtual bool LessThan(const QModelIndex& lhs, const QModelIndex& rhs) const;
-};
-
-#endif // ABSTRACTSORTMODEL_H
diff --git a/Code/Sandbox/Editor/Util/AffineParts.cpp b/Code/Sandbox/Editor/Util/AffineParts.cpp
deleted file mode 100644
index 1cbac25d6d..0000000000
--- a/Code/Sandbox/Editor/Util/AffineParts.cpp
+++ /dev/null
@@ -1,856 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#pragma warning ( disable : 4244 )  // conversion from 'double' to 'float', possible loss of data.
-
-/**** Decompose.h - Basic declarations ****/
-typedef struct
-{
-    float x, y, z, w;
-} Quatern;                                  /* Quaternernion */
-enum QuaternPart
-{
-    X, Y, Z, W
-};
-typedef Quatern HVect; /* Homogeneous 3D vector */
-typedef float HMatrix[4][4]; /* Right-handed, for column vectors */
-typedef struct
-{
-    HVect t;  /* Translation components */
-    Quatern  q;  /* Essential rotation   */
-    Quatern  u;  /* Stretch rotation   */
-    HVect k;  /* Stretch factors    */
-    float f;  /* Sign of determinant    */
-} SAffineParts;
-
-
-float polar_decomp(HMatrix M, HMatrix Q, HMatrix S);
-HVect spect_decomp(HMatrix S, HMatrix U);
-Quatern snuggle(Quatern q, HVect* k);
-
-/******* Matrix Preliminaries *******/
-
-/** Fill out 3x3 matrix to 4x4 **/
-#define mat_pad(A) (A[W][X] = A[X][W] = A[W][Y] = A[Y][W] = A[W][Z] = A[Z][W] = 0, A[W][W] = 1)
-
-/** Copy nxn matrix A to C using "gets" for assignment **/
-#define mat_copy(C, gets, A, n) {int i, j; for (i = 0; i < n; i++) {for (j = 0; j < n; j++) {     \
-                                                                        C[i][j] gets (A[i][j]); } \
-                                 }                                                                \
-}
-
-/** Copy transpose of nxn matrix A to C using "gets" for assignment **/
-#define mat_tpose(AT, gets, A, n) {int i, j; for (i = 0; i < n; i++) {for (j = 0; j < n; j++) {      \
-                                                                          AT[i][j] gets (A[j][i]); } \
-                                   }                                                                 \
-}
-
-/** Assign nxn matrix C the element-wise combination of A and B using "op" **/
-#define mat_binop(C, gets, A, op, B, n) {int i, j; for (i = 0; i < n; i++) {for (j = 0; j < n; j++) {                  \
-                                                                                C[i][j] gets (A[i][j]) op (B[i][j]); } \
-                                         }                                                                             \
-}
-
-/** Multiply the upper left 3x3 parts of A and B to get AB **/
-static  void mat_mult(HMatrix A, HMatrix B, HMatrix AB)
-{
-    int i, j;
-    for (i = 0; i < 3; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            AB[i][j] = A[i][0] * B[0][j] + A[i][1] * B[1][j] + A[i][2] * B[2][j];
-        }
-    }
-}
-
-/** Return dot product of length 3 vectors va and vb **/
-static  float vdot(float* va, float* vb)
-{
-    return (va[0] * vb[0] + va[1] * vb[1] + va[2] * vb[2]);
-}
-
-/** Set v to cross product of length 3 vectors va and vb **/
-static  void vcross(float* va, float* vb, float* v)
-{
-    v[0] = va[1] * vb[2] - va[2] * vb[1];
-    v[1] = va[2] * vb[0] - va[0] * vb[2];
-    v[2] = va[0] * vb[1] - va[1] * vb[0];
-}
-
-/** Set MadjT to transpose of inverse of M times determinant of M **/
-static  void adjoint_transpose(HMatrix M, HMatrix MadjT)
-{
-    vcross(M[1], M[2], MadjT[0]);
-    vcross(M[2], M[0], MadjT[1]);
-    vcross(M[0], M[1], MadjT[2]);
-}
-
-/******* Quaternernion Preliminaries *******/
-
-/* Construct a (possibly non-unit) Quaternernion from real components. */
-static  Quatern Qt_(float x, float y, float z, float w)
-{
-    Quatern qq;
-    qq.x = x;
-    qq.y = y;
-    qq.z = z;
-    qq.w = w;
-    return (qq);
-}
-
-/* Return conjugate of Quaternernion. */
-static  Quatern Qt_Conj(Quatern q)
-{
-    Quatern qq;
-    qq.x = -q.x;
-    qq.y = -q.y;
-    qq.z = -q.z;
-    qq.w = q.w;
-    return (qq);
-}
-
-/* Return Quaternernion product qL * qR.  Note: order is important!
- * To combine rotations, use the product Mul(qSecond, qFirst),
- * which gives the effect of rotating by qFirst then qSecond. */
-static  Quatern Qt_Mul(Quatern qL, Quatern qR)
-{
-    Quatern qq;
-    qq.w = qL.w * qR.w - qL.x * qR.x - qL.y * qR.y - qL.z * qR.z;
-    qq.x = qL.w * qR.x + qL.x * qR.w + qL.y * qR.z - qL.z * qR.y;
-    qq.y = qL.w * qR.y + qL.y * qR.w + qL.z * qR.x - qL.x * qR.z;
-    qq.z = qL.w * qR.z + qL.z * qR.w + qL.x * qR.y - qL.y * qR.x;
-    return (qq);
-}
-
-/* Return product of Quaternernion q by scalar w. */
-static  Quatern Qt_Scale(Quatern q, float w)
-{
-    Quatern qq;
-    qq.w = q.w * w;
-    qq.x = q.x * w;
-    qq.y = q.y * w;
-    qq.z = q.z * w;
-    return (qq);
-}
-
-/* Construct a unit Quaternernion from rotation matrix.  Assumes matrix is
- * used to multiply column vector on the left: vnew = mat vold.  Works
- * correctly for right-handed coordinate system and right-handed rotations.
- * Translation and perspective components ignored. */
-static  Quatern Qt_FromMatrix(HMatrix mat)
-{
-    /* This algorithm avoids near-zero divides by looking for a large component
-     * - first w, then x, y, or z.  When the trace is greater than zero,
-     * |w| is greater than 1/2, which is as small as a largest component can be.
-     * Otherwise, the largest diagonal entry corresponds to the largest of |x|,
-     * |y|, or |z|, one of which must be larger than |w|, and at least 1/2. */
-    Quatern qu = { 0.0f, 0.0f, 0.0f, 1.0f };
-    double tr, s;
-
-    tr = mat[X][X] + mat[Y][Y] + mat[Z][Z];
-    if (tr >= 0.0)
-    {
-        s = sqrt(tr + mat[W][W]);
-        qu.w = s * 0.5;
-        s = 0.5 / s;
-        qu.x = (mat[Z][Y] - mat[Y][Z]) * s;
-        qu.y = (mat[X][Z] - mat[Z][X]) * s;
-        qu.z = (mat[Y][X] - mat[X][Y]) * s;
-    }
-    else
-    {
-        int h = X;
-        if (mat[Y][Y] > mat[X][X])
-        {
-            h = Y;
-        }
-        if (mat[Z][Z] > mat[h][h])
-        {
-            h = Z;
-        }
-        switch (h)
-        {
-#define caseMacro(i, j, k, I, J, K)                              \
-case I:                                                          \
-    s = sqrt((mat[I][I] - (mat[J][J] + mat[K][K])) + mat[W][W]); \
-    qu.i = s * 0.5;                                              \
-    s = 0.5 / s;                                                 \
-    qu.j = (mat[I][J] + mat[J][I]) * s;                          \
-    qu.k = (mat[K][I] + mat[I][K]) * s;                          \
-    qu.w = (mat[K][J] - mat[J][K]) * s;                          \
-    break
-            caseMacro(x, y, z, X, Y, Z);
-            caseMacro(y, z, x, Y, Z, X);
-            caseMacro(z, x, y, Z, X, Y);
-        }
-    }
-    if (mat[W][W] != 1.0)
-    {
-        qu = Qt_Scale(qu, 1.0f / sqrt(mat[W][W]));
-    }
-    return (qu);
-}
-/******* Decomp Auxiliaries *******/
-
-static HMatrix mat_id = {
-    {1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, {0, 0, 0, 1}
-};
-
-/** Compute either the 1 or infinity norm of M, depending on tpose **/
-static  float mat_norm(HMatrix M, int tpose)
-{
-    int i;
-    float sum, max;
-    max = 0.0;
-    for (i = 0; i < 3; i++)
-    {
-        if (tpose)
-        {
-            sum = fabs(M[0][i]) + fabs(M[1][i]) + fabs(M[2][i]);
-        }
-        else
-        {
-            sum = fabs(M[i][0]) + fabs(M[i][1]) + fabs(M[i][2]);
-        }
-        if (max < sum)
-        {
-            max = sum;
-        }
-    }
-    return max;
-}
-
-static  float norm_inf(HMatrix M) {return mat_norm(M, 0); }
-static  float norm_one(HMatrix M) {return mat_norm(M, 1); }
-
-/** Return index of column of M containing maximum abs entry, or -1 if M=0 **/
-static  int find_max_col(HMatrix M)
-{
-    float abs, max;
-    int i, j, col;
-    max = 0.0;
-    col = -1;
-    for (i = 0; i < 3; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            abs = M[i][j];
-            if (abs < 0.0)
-            {
-                abs = -abs;
-            }
-            if (abs > max)
-            {
-                max = abs;
-                col = j;
-            }
-        }
-    }
-    return col;
-}
-
-/** Setup u for Household reflection to zero all v components but first **/
-static  void make_reflector(float* v, float* u)
-{
-    float s = sqrt(vdot(v, v));
-    u[0] = v[0];
-    u[1] = v[1];
-    u[2] = v[2] + ((v[2] < 0.0) ? -s : s);
-    s = sqrt(2.0 / vdot(u, u));
-    u[0] = u[0] * s;
-    u[1] = u[1] * s;
-    u[2] = u[2] * s;
-}
-
-/** Apply Householder reflection represented by u to column vectors of M **/
-static  void reflect_cols(HMatrix M, float* u)
-{
-    int i, j;
-    for (i = 0; i < 3; i++)
-    {
-        float s = u[0] * M[0][i] + u[1] * M[1][i] + u[2] * M[2][i];
-        for (j = 0; j < 3; j++)
-        {
-            M[j][i] -= u[j] * s;
-        }
-    }
-}
-/** Apply Householder reflection represented by u to row vectors of M **/
-static  void reflect_rows(HMatrix M, float* u)
-{
-    int i, j;
-    for (i = 0; i < 3; i++)
-    {
-        float s = vdot(u, M[i]);
-        for (j = 0; j < 3; j++)
-        {
-            M[i][j] -= u[j] * s;
-        }
-    }
-}
-
-/** Find orthogonal factor Q of rank 1 (or less) M **/
-static  void do_rank1(HMatrix M, HMatrix Q)
-{
-    float v1[3], v2[3], s;
-    int col;
-    mat_copy(Q, =, mat_id, 4);
-    /* If rank(M) is 1, we should find a non-zero column in M */
-    col = find_max_col(M);
-    if (col < 0)
-    {
-        return;        /* Rank is 0 */
-    }
-    v1[0] = M[0][col];
-    v1[1] = M[1][col];
-    v1[2] = M[2][col];
-    make_reflector(v1, v1);
-    reflect_cols(M, v1);
-    v2[0] = M[2][0];
-    v2[1] = M[2][1];
-    v2[2] = M[2][2];
-    make_reflector(v2, v2);
-    reflect_rows(M, v2);
-    s = M[2][2];
-    if (s < 0.0)
-    {
-        Q[2][2] = -1.0;
-    }
-    reflect_cols(Q, v1);
-    reflect_rows(Q, v2);
-}
-
-/** Find orthogonal factor Q of rank 2 (or less) M using adjoint transpose **/
-static  void do_rank2(HMatrix M, HMatrix MadjT, HMatrix Q)
-{
-    float v1[3], v2[3];
-    float w, x, y, z, c, s, d;
-    int col;
-    /* If rank(M) is 2, we should find a non-zero column in MadjT */
-    col = find_max_col(MadjT);
-    if (col < 0)
-    {
-        do_rank1(M, Q);
-        return;
-    }                                    /* Rank<2 */
-    v1[0] = MadjT[0][col];
-    v1[1] = MadjT[1][col];
-    v1[2] = MadjT[2][col];
-    make_reflector(v1, v1);
-    reflect_cols(M, v1);
-    vcross(M[0], M[1], v2);
-    make_reflector(v2, v2);
-    reflect_rows(M, v2);
-    w = M[0][0];
-    x = M[0][1];
-    y = M[1][0];
-    z = M[1][1];
-    if (w * z > x * y)
-    {
-        c = z + w;
-        s = y - x;
-        d = sqrt(c * c + s * s);
-        c = c / d;
-        s = s / d;
-        Q[0][0] = Q[1][1] = c;
-        Q[0][1] = -(Q[1][0] = s);
-    }
-    else
-    {
-        c = z - w;
-        s = y + x;
-        d = sqrt(c * c + s * s);
-        c = c / d;
-        s = s / d;
-        Q[0][0] = -(Q[1][1] = c);
-        Q[0][1] = Q[1][0] = s;
-    }
-    Q[0][2] = Q[2][0] = Q[1][2] = Q[2][1] = 0.0;
-    Q[2][2] = 1.0;
-    reflect_cols(Q, v1);
-    reflect_rows(Q, v2);
-}
-
-
-/******* Polar Decomposition *******/
-
-/* Polar Decomposition of 3x3 matrix in 4x4,
- * M = QS.  See Nicholas Higham and Robert S. Schreiber,
- * Fast Polar Decomposition of An Arbitrary Matrix,
- * Technical Report 88-942, October 1988,
- * Department of Computer Science, Cornell University.
- */
-float polar_decomp(HMatrix M, HMatrix Q, HMatrix S)
-{
-#define TOL 1.0e-6
-    HMatrix Mk, MadjTk, Ek;
-    float det, M_one, M_inf, MadjT_one, MadjT_inf, E_one, gamma, g1, g2;
-    mat_tpose(Mk, =, M, 3);
-    M_one = norm_one(Mk);
-    M_inf = norm_inf(Mk);
-    do
-    {
-        adjoint_transpose(Mk, MadjTk);
-        det = vdot(Mk[0], MadjTk[0]);
-        if (det == 0.0)
-        {
-            do_rank2(Mk, MadjTk, Mk);
-            break;
-        }
-        MadjT_one = norm_one(MadjTk);
-        MadjT_inf = norm_inf(MadjTk);
-        gamma = sqrt(sqrt((MadjT_one * MadjT_inf) / (M_one * M_inf)) / fabs(det));
-        g1 = gamma * 0.5;
-        g2 = 0.5 / (gamma * det);
-        mat_copy(Ek, =, Mk, 3);
-        mat_binop(Mk, =, g1 * Mk, +, g2 * MadjTk, 3);
-        mat_copy(Ek, -=, Mk, 3);
-        E_one = norm_one(Ek);
-        M_one = norm_one(Mk);
-        M_inf = norm_inf(Mk);
-    } while (E_one > (M_one * TOL));
-    mat_tpose(Q, =, Mk, 3);
-    mat_pad(Q);
-    mat_mult(Mk, M, S);
-    mat_pad(S);
-    for (int i = 0; i < 3; i++)
-    {
-        for (int j = i; j < 3; j++)
-        {
-            S[i][j] = S[j][i] = 0.5 * (S[i][j] + S[j][i]);
-        }
-    }
-    return (det);
-}
-
-
-/******* Spectral Decomposition *******/
-
-/* Compute the spectral decomposition of symmetric positive semi-definite S.
- * Returns rotation in U and scale factors in result, so that if K is a diagonal
- * matrix of the scale factors, then S = U K (U transpose). Uses Jacobi method.
- * See Gene H. Golub and Charles F. Van Loan. Matrix Computations. Hopkins 1983.
- */
-HVect spect_decomp(HMatrix S, HMatrix U)
-{
-    HVect kv;
-    double Diag[3], OffD[3]; /* OffD is off-diag (by omitted index) */
-    double g, h, fabsh, fabsOffDi, t, theta, c, s, tau, ta, OffDq, a, b;
-    static char nxt[] = {Y, Z, X};
-    int sweep;
-    mat_copy(U, =, mat_id, 4);
-    Diag[X] = S[X][X];
-    Diag[Y] = S[Y][Y];
-    Diag[Z] = S[Z][Z];
-    OffD[X] = S[Y][Z];
-    OffD[Y] = S[Z][X];
-    OffD[Z] = S[X][Y];
-    for (sweep = 20; sweep > 0; sweep--)
-    {
-        float sm = fabs(OffD[X]) + fabs(OffD[Y]) + fabs(OffD[Z]);
-        if (sm == 0.0)
-        {
-            break;
-        }
-        for (int i = Z; i >= X; i--)
-        {
-            int p = nxt[i];
-            int q = nxt[p];
-            fabsOffDi = fabs(OffD[i]);
-            g = 100.0 * fabsOffDi;
-            if (fabsOffDi > AZ::Constants::FloatEpsilon)
-            {
-                h = Diag[q] - Diag[p];
-                fabsh = fabs(h);
-                if (fabsh + g == fabsh)
-                {
-                    t = OffD[i] / h;
-                }
-                else
-                {
-                    theta = 0.5 * h / OffD[i];
-                    t = 1.0 / (fabs(theta) + sqrt(theta * theta + 1.0));
-                    if (theta < 0.0)
-                    {
-                        t = -t;
-                    }
-                }
-                c = 1.0 / sqrt(t * t + 1.0);
-                s = t * c;
-                tau = s / (c + 1.0);
-                ta = t * OffD[i];
-                OffD[i] = 0.0;
-                Diag[p] -= ta;
-                Diag[q] += ta;
-                OffDq = OffD[q];
-                OffD[q] -= s * (OffD[p] + tau * OffD[q]);
-                OffD[p] += s * (OffDq   - tau * OffD[p]);
-                for (int j = Z; j >= X; j--)
-                {
-                    a = U[j][p];
-                    b = U[j][q];
-                    U[j][p] -= s * (b + tau * a);
-                    U[j][q] += s * (a - tau * b);
-                }
-            }
-        }
-    }
-    kv.x = Diag[X];
-    kv.y = Diag[Y];
-    kv.z = Diag[Z];
-    kv.w = 1.0;
-    return (kv);
-}
-
-/******* Spectral Axis Adjustment *******/
-
-/* Given a unit Quaternernion, q, and a scale vector, k, find a unit Quaternernion, p,
- * which permutes the axes and turns freely in the plane of duplicate scale
- * factors, such that q p has the largest possible w component, i.e. the
- * smallest possible angle. Permutes k's components to go with q p instead of q.
- * See Ken Shoemake and Tom Duff. Matrix Animation and Polar Decomposition.
- * Proceedings of Graphics Interface 1992. Details on p. 262-263.
- */
-Quatern snuggle(Quatern q, HVect* k)
-{
-#define SQRTHALF (0.7071067811865475244f)
-#define sgn(n, v)    ((n) ? -(v) : (v))
-#define swap(a, i, j) {a[3] = a[i]; a[i] = a[j]; a[j] = a[3]; }
-#define cycle(a, p)  if (p) {a[3] = a[0]; a[0] = a[1]; a[1] = a[2]; a[2] = a[3]; } \
-    else   {a[3] = a[2]; a[2] = a[1]; a[1] = a[0]; a[0] = a[3]; }
-    Quatern p = { 0.0f, 0.0f, 0.0f, 1.0f };
-    float ka[4];
-    int i, turn = -1;
-    ka[X] = k->x;
-    ka[Y] = k->y;
-    ka[Z] = k->z;
-    if (ka[X] == ka[Y])
-    {
-        if (ka[X] == ka[Z])
-        {
-            turn = W;
-        }
-        else
-        {
-            turn = Z;
-        }
-    }
-    else
-    {
-        if (ka[X] == ka[Z])
-        {
-            turn = Y;
-        }
-        else if (ka[Y] == ka[Z])
-        {
-            turn = X;
-        }
-    }
-    if (turn >= 0)
-    {
-        Quatern qtoz, qp;
-        unsigned neg[3], win;
-        double mag[3], t;
-        static Quatern qxtoz = {0, SQRTHALF, 0, SQRTHALF};
-        static Quatern qytoz = {SQRTHALF, 0, 0, SQRTHALF};
-        static Quatern qppmm = { 0.5, 0.5, -0.5, -0.5};
-        static Quatern qpppp = { 0.5, 0.5, 0.5, 0.5};
-        static Quatern qmpmm = {-0.5, 0.5, -0.5, -0.5};
-        static Quatern qpppm = { 0.5, 0.5, 0.5, -0.5};
-        static Quatern q0001 = { 0.0, 0.0, 0.0, 1.0};
-        static Quatern q1000 = { 1.0, 0.0, 0.0, 0.0};
-        switch (turn)
-        {
-        default:
-            return (Qt_Conj(q));
-        case X:
-            q = Qt_Mul(q, qtoz = qxtoz);
-            swap(ka, X, Z);
-            break;
-        case Y:
-            q = Qt_Mul(q, qtoz = qytoz);
-            swap(ka, Y, Z);
-            break;
-        case Z:
-            qtoz = q0001;
-            break;
-        }
-        q = Qt_Conj(q);
-        mag[0] = (double)q.z * q.z + (double)q.w * q.w - 0.5;
-        mag[1] = (double)q.x * q.z - (double)q.y * q.w;
-        mag[2] = (double)q.y * q.z + (double)q.x * q.w;
-        for (i = 0; i < 3; i++)
-        {
-            neg[i] = (mag[i] < 0.0);
-            if (neg[i])
-            {
-                mag[i] = -mag[i];
-            }
-        }
-        if (mag[0] > mag[1])
-        {
-            if (mag[0] > mag[2])
-            {
-                win = 0;
-            }
-            else
-            {
-                win = 2;
-            }
-        }
-        else
-        {
-            if (mag[1] > mag[2])
-            {
-                win = 1;
-            }
-            else
-            {
-                win = 2;
-            }
-        }
-        switch (win)
-        {
-        case 0:
-            if (neg[0])
-            {
-                p = q1000;
-            }
-            else
-            {
-                p = q0001;
-            } break;
-        case 1:
-            if (neg[1])
-            {
-                p = qppmm;
-            }
-            else
-            {
-                p = qpppp;
-            } cycle(ka, 0);
-            break;
-        case 2:
-            if (neg[2])
-            {
-                p = qmpmm;
-            }
-            else
-            {
-                p = qpppm;
-            } cycle(ka, 1);
-            break;
-        }
-        qp = Qt_Mul(q, p);
-        t = sqrt(mag[win] + 0.5);
-        p = Qt_Mul(p, Qt_(0.0, 0.0, -qp.z / t, qp.w / t));
-        p = Qt_Mul(qtoz, Qt_Conj(p));
-    }
-    else
-    {
-        float qa[4], pa[4];
-        unsigned lo, hi, neg[4], par = 0;
-        double all, big, two;
-        qa[0] = q.x;
-        qa[1] = q.y;
-        qa[2] = q.z;
-        qa[3] = q.w;
-        for (i = 0; i < 4; i++)
-        {
-            pa[i] = 0.0;
-            neg[i] = (qa[i] < 0.0);
-            if (neg[i])
-            {
-                qa[i] = -qa[i];
-            }
-            par ^= neg[i];
-        }
-        /* Find two largest components, indices in hi and lo */
-        if (qa[0] > qa[1])
-        {
-            lo = 0;
-        }
-        else
-        {
-            lo = 1;
-        }
-        if (qa[2] > qa[3])
-        {
-            hi = 2;
-        }
-        else
-        {
-            hi = 3;
-        }
-        if (qa[lo] > qa[hi])
-        {
-            if (qa[lo ^ 1] > qa[hi])
-            {
-                hi = lo;
-                lo ^= 1;
-            }
-            else
-            {
-                hi ^= lo;
-                lo ^= hi;
-                hi ^= lo;
-            }
-        }
-        else
-        {
-            if (qa[hi ^ 1] > qa[lo])
-            {
-                lo = hi ^ 1;
-            }
-        }
-        all = (qa[0] + qa[1] + qa[2] + qa[3]) * 0.5;
-        two = (qa[hi] + qa[lo]) * SQRTHALF;
-        big = qa[hi];
-        if (all > two)
-        {
-            if (all > big)/*all*/
-            {
-                {
-                    int ii;
-                    for (ii = 0; ii < 4; ii++)
-                    {
-                        pa[ii] = sgn(neg[ii], 0.5);
-                    }
-                }
-                cycle(ka, par)
-            }
-            else
-            { /*big*/
-                pa[hi] = sgn(neg[hi], 1.0);
-            }
-        }
-        else
-        {
-            if (two > big)/*two*/
-            {
-                pa[hi] = sgn(neg[hi], SQRTHALF);
-                pa[lo] = sgn(neg[lo], SQRTHALF);
-                if (lo > hi)
-                {
-                    hi ^= lo;
-                    lo ^= hi;
-                    hi ^= lo;
-                }
-                if (hi == W)
-                {
-                    hi = "\001\002\000"[lo];
-                    lo = 3 - hi - lo;
-                }
-                swap(ka, hi, lo)
-            }
-            else
-            { /*big*/
-                pa[hi] = sgn(neg[hi], 1.0);
-            }
-        }
-        p.x = -pa[0];
-        p.y = -pa[1];
-        p.z = -pa[2];
-        p.w = pa[3];
-    }
-    k->x = ka[X];
-    k->y = ka[Y];
-    k->z = ka[Z];
-    return (p);
-}
-
-
-/******* Decompose Affine Matrix *******/
-
-/* Decompose 4x4 affine matrix A as TFRUK(U transpose), where t contains the
- * translation components, q contains the rotation R, u contains U, k contains
- * scale factors, and f contains the sign of the determinant.
- * Assumes A transforms column vectors in right-handed coordinates.
- * See Ken Shoemake and Tom Duff. Matrix Animation and Polar Decomposition.
- * Proceedings of Graphics Interface 1992.
- */
-static  void decomp_affine(HMatrix A, SAffineParts* parts)
-{
-    HMatrix Q, S, U;
-    Quatern p;
-    float det;
-    parts->t = Qt_(A[X][W], A[Y][W], A[Z][W], 0);
-    det = polar_decomp(A, Q, S);
-    if (det < 0.0)
-    {
-        mat_copy(Q, =, -Q, 3);
-        parts->f = -1;
-    }
-    else
-    {
-        parts->f = 1;
-    }
-    parts->q = Qt_FromMatrix(Q);
-    parts->k = spect_decomp(S, U);
-    parts->u = Qt_FromMatrix(U);
-    p = snuggle(parts->u, &parts->k);
-    parts->u = Qt_Mul(parts->u, p);
-}
-
-static  void spectral_decomp_affine(HMatrix A, SAffineParts* parts)
-{
-    HMatrix Q, S, U;
-    float det;
-
-    parts->t = Qt_(A[X][W], A[Y][W], A[Z][W], 0);
-    det = polar_decomp(A, Q, S);
-    if (det < 0.0)
-    {
-        mat_copy(Q, =, -Q, 3);
-        parts->f = -1;
-    }
-    else
-    {
-        parts->f = 1;
-    }
-    parts->q = Qt_FromMatrix(Q);
-    parts->k = spect_decomp(S, U);
-    parts->u = Qt_FromMatrix(U);
-}
-
-// Decompose matrix to affine parts.
-void AffineParts::Decompose(const Matrix34& tm)
-{
-    SAffineParts parts;
-
-    Matrix44 tm44(tm);
-    HMatrix& H = *((HMatrix*)&tm44); // Treat HMatrix as a Matrix44.
-
-    decomp_affine(H, &parts);
-
-    rot = Quat(parts.q.w, parts.q.x, parts.q.y, parts.q.z);
-    rotScale = Quat(parts.u.w, parts.u.x, parts.u.y, parts.u.z);
-    pos = Vec3(parts.t.x, parts.t.y, parts.t.z);
-    scale = Vec3(parts.k.x, parts.k.y, parts.k.z);
-    fDet = parts.f;
-}
-
-// Spectral matrix decompostion to affine parts.
-void AffineParts::SpectralDecompose(const Matrix34& tm)
-{
-    SAffineParts parts;
-
-    Matrix44 tm44(tm);
-    HMatrix& H = *((HMatrix*)&tm44); // Treat HMatrix as a Matrix44.
-
-    spectral_decomp_affine(H, &parts);
-
-    rot = Quat(parts.q.w, parts.q.x, parts.q.y, parts.q.z);
-    rotScale = Quat(parts.u.w, parts.u.x, parts.u.y, parts.u.z);
-    pos = Vec3(parts.t.x, parts.t.y, parts.t.z);
-    scale = Vec3(parts.k.x, parts.k.y, parts.k.z);
-    fDet = parts.f;
-}
diff --git a/Code/Sandbox/Editor/Util/AffineParts.h b/Code/Sandbox/Editor/Util/AffineParts.h
deleted file mode 100644
index 3c27c8a5da..0000000000
--- a/Code/Sandbox/Editor/Util/AffineParts.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_AFFINEPARTS_H
-#define CRYINCLUDE_EDITOR_UTIL_AFFINEPARTS_H
-#pragma once
-
-
-struct AffineParts
-{
-    Vec3 pos;               //!< Translation components
-    Quat rot;           //!< Essential rotation.
-    Quat rotScale;  //!< Stretch rotation.
-    Vec3 scale;         //!< Stretch factors.
-    float fDet;         //!< Sign of determinant.
-
-    /** Decompose matrix to its affnie parts.
-    */
-    void Decompose(const Matrix34& mat);
-
-    /** Decompose matrix to its affnie parts.
-            Assume there`s no stretch rotation.
-    */
-    void SpectralDecompose(const Matrix34& mat);
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_AFFINEPARTS_H
diff --git a/Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.cpp b/Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.cpp
deleted file mode 100644
index b16b2d2106..0000000000
--- a/Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "AutoDirectoryRestoreFileDialog.h"
-
-// Qt
-#include <QMessageBox>
-
-
-CAutoDirectoryRestoreFileDialog::CAutoDirectoryRestoreFileDialog(
-    QFileDialog::AcceptMode acceptMode,
-    QFileDialog::FileMode fileMode,
-    const QString& defaultSuffix,
-    const QString& directory /* = {} */,
-    const QString& filter /* = {} */,
-    QFileDialog::Options options /* = {} */,
-    const QString& caption /* = {} */,
-    QWidget* parent /* = nullptr */)
-    : QFileDialog(parent, caption, QString(""), filter)
-{
-    char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(directory.toUtf8().data(), resolvedPath, AZ_MAX_PATH_LEN);
-    setDirectory(QString::fromUtf8(resolvedPath));
-
-    setAcceptMode(acceptMode);
-    setDefaultSuffix(defaultSuffix);
-    setFileMode(fileMode);
-    setOptions(options);
-}
-
-int CAutoDirectoryRestoreFileDialog::exec()
-{
-    int result = -1;
-    while ((result = QFileDialog::exec()) == QDialog::Accepted)
-    {
-        bool problem = false;
-        foreach(const QString&fileName, selectedFiles())
-        {
-            QFileInfo info(fileName);
-            if (!CryStringUtils::IsValidFileName(info.fileName().toStdString().c_str()))
-            {
-                QMessageBox::warning(this, tr("Error"), tr("Please select a valid file name (standard English alphanumeric characters only)"));
-                problem = true;
-                break;
-            }
-        }
-
-        if (!problem)
-        {
-            return result;
-        }
-    }
-
-    return result;
-}
-
-#include <Util/moc_AutoDirectoryRestoreFileDialog.cpp>
diff --git a/Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.h b/Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.h
deleted file mode 100644
index 60b85570f1..0000000000
--- a/Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_AUTODIRECTORYRESTOREFILEDIALOG_H
-#define CRYINCLUDE_EDITOR_UTIL_AUTODIRECTORYRESTOREFILEDIALOG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QFileDialog>
-#endif
-
-class CAutoDirectoryRestoreFileDialog
-    : public QFileDialog
-{
-    Q_OBJECT
-
-public:
-    explicit CAutoDirectoryRestoreFileDialog(
-        QFileDialog::AcceptMode acceptMode,
-        QFileDialog::FileMode fileMode = QFileDialog::AnyFile,
-        const QString& defaultSuffix = {},
-        const QString& directory = {},
-        const QString& filter = {},
-        QFileDialog::Options options = QFileDialog::Options(),
-        const QString& caption = {},
-        QWidget* parent = nullptr);
-    virtual ~CAutoDirectoryRestoreFileDialog() {}
-
-    int exec() override;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_AUTODIRECTORYRESTOREFILEDIALOG_H
diff --git a/Code/Sandbox/Editor/Util/AutoLogTime.cpp b/Code/Sandbox/Editor/Util/AutoLogTime.cpp
deleted file mode 100644
index 71d24ca079..0000000000
--- a/Code/Sandbox/Editor/Util/AutoLogTime.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "AutoLogTime.h"
-
-CAutoLogTime::CAutoLogTime(const char* what)
-{
-    m_what = what;
-    CLogFile::FormatLine("---- Start: %s", m_what);
-    m_t0 = GetTickCount();
-}
-
-CAutoLogTime::~CAutoLogTime()
-{
-    m_t1 = GetTickCount();
-    CLogFile::FormatLine("---- End: %s (%d seconds)", m_what, (m_t1 - m_t0) / 1000);
-}
diff --git a/Code/Sandbox/Editor/Util/AutoLogTime.h b/Code/Sandbox/Editor/Util/AutoLogTime.h
deleted file mode 100644
index 01aa7a6cf9..0000000000
--- a/Code/Sandbox/Editor/Util/AutoLogTime.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_AUTOLOGTIME_H
-#define CRYINCLUDE_EDITOR_UTIL_AUTOLOGTIME_H
-#pragma once
-
-
-class CAutoLogTime
-{
-public:
-    CAutoLogTime(const char* what);
-    ~CAutoLogTime();
-private:
-    const char* m_what;
-    int m_t0, m_t1;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_AUTOLOGTIME_H
diff --git a/Code/Sandbox/Editor/Util/ColorUtils.cpp b/Code/Sandbox/Editor/Util/ColorUtils.cpp
deleted file mode 100644
index 6fef5f5e85..0000000000
--- a/Code/Sandbox/Editor/Util/ColorUtils.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "ColorUtils.h"
-
-// Qt
-#include <QColor>
-
-//////////////////////////////////////////////////////////////////////////
-QColor ColorLinearToGamma(ColorF col)
-{
-    float r = clamp_tpl(col.r, 0.0f, 1.0f);
-    float g = clamp_tpl(col.g, 0.0f, 1.0f);
-    float b = clamp_tpl(col.b, 0.0f, 1.0f);
-    float a = clamp_tpl(col.a, 0.0f, 1.0f);
-
-    r = (float)(r <= 0.0031308 ? (12.92 * r) : (1.055 * pow((double)r, 1.0 / 2.4) - 0.055));
-    g = (float)(g <= 0.0031308 ? (12.92 * g) : (1.055 * pow((double)g, 1.0 / 2.4) - 0.055));
-    b = (float)(b <= 0.0031308 ? (12.92 * b) : (1.055 * pow((double)b, 1.0 / 2.4) - 0.055));
-
-    return QColor(FtoI(r * 255.0f), FtoI(g * 255.0f), FtoI(b * 255.0f), FtoI(a * 255.0f));
-}
-
-//////////////////////////////////////////////////////////////////////////
-ColorF ColorGammaToLinear(const QColor& col)
-{
-    float r = (float)col.red() / 255.0f;
-    float g = (float)col.green() / 255.0f;
-    float b = (float)col.blue() / 255.0f;
-    float a = (float)col.alpha() / 255.0f;
-
-    return ColorF((float)(r <= 0.04045 ? (r / 12.92) : pow(((double)r + 0.055) / 1.055, 2.4)),
-        (float)(g <= 0.04045 ? (g / 12.92) : pow(((double)g + 0.055) / 1.055, 2.4)),
-        (float)(b <= 0.04045 ? (b / 12.92) : pow(((double)b + 0.055) / 1.055, 2.4)), a);
-}
-
-QColor ColorToQColor(uint32 color)
-{
-    return QColor::fromRgbF((float)GetRValue(color) / 255.0f,
-        (float)GetGValue(color) / 255.0f,
-        (float)GetBValue(color) / 255.0f);
-}
diff --git a/Code/Sandbox/Editor/Util/ColorUtils.h b/Code/Sandbox/Editor/Util/ColorUtils.h
deleted file mode 100644
index 9f322db678..0000000000
--- a/Code/Sandbox/Editor/Util/ColorUtils.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Utility classes used by Editor.
-
-
-#pragma once
-
-#include <Cry_Color.h>
-
-class QColor;
-
-QColor ColorLinearToGamma(ColorF col);
-ColorF ColorGammaToLinear(const QColor& col);
-QColor ColorToQColor(uint32 color);
-
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupHeaderView.cpp b/Code/Sandbox/Editor/Util/ColumnGroupHeaderView.cpp
deleted file mode 100644
index ec4406f758..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnGroupHeaderView.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ColumnGroupHeaderView.h"
-
-// Qt
-#include <QPainter>
-
-// Editor
-#include "Util/ColumnGroupProxyModel.h"
-
-
-ColumnGroupHeaderView::ColumnGroupHeaderView(QWidget* parent)
-    : QHeaderView(Qt::Horizontal, parent)
-    , m_groupModel(nullptr)
-    , m_showGroups(false)
-{
-    setSectionsMovable(true);
-    setStretchLastSection(true);
-    setSortIndicatorShown(false);
-}
-
-void ColumnGroupHeaderView::setModel(QAbstractItemModel* model)
-{
-    QHeaderView::setModel(model);
-    m_groupModel = qobject_cast<ColumnGroupProxyModel*>(model);
-    if (m_groupModel)
-    {
-        connect(m_groupModel, SIGNAL(SortChanged()), this, SLOT(update()));
-    }
-}
-
-QSize ColumnGroupHeaderView::sizeHint() const
-{
-    QSize s = QHeaderView::sizeHint();
-    if (m_showGroups)
-    {
-        s.setHeight(s.height() + GroupViewHeight());
-    }
-    return s;
-}
-
-bool ColumnGroupHeaderView::IsGroupsShown() const
-{
-    return m_showGroups;
-}
-
-bool ColumnGroupHeaderView::event(QEvent* event)
-{
-    switch (event->type())
-    {
-    case QEvent::Paint:
-    {
-        if (!m_showGroups || !m_groupModel)
-        {
-            return true;
-        }
-
-        QPainter painter(this);
-        painter.fillRect(rect(), QColor(145, 145, 145));
-        int xOffset = 10;
-        int yOffset = 10;
-
-        auto groups = m_groupModel->Groups();
-
-        m_groups.clear();
-        foreach(int column, groups)
-        {
-            const int width = sectionSize(column);
-            const QRect r(xOffset, yOffset, width == 0 ? defaultSectionSize() : width, QHeaderView::sizeHint().height());
-            xOffset += r.width() + 10;
-            yOffset += 10;
-
-            if (column != groups.last())
-            {
-                painter.setPen(Qt::black);
-                painter.drawLine(r.bottomRight() + QPoint(-3, 0), r.bottomRight() + QPoint(-3, 3));
-                painter.drawLine(r.bottomRight() + QPoint(-3, 3), r.bottomRight() + QPoint(10, 3));
-            }
-            m_groups.push_back({ r, column });
-            paintSection(&painter, r, column);
-        }
-        break;
-    }
-    case QEvent::MouseButtonRelease:
-    {
-        auto mouseEvent = static_cast<QMouseEvent*>(event);
-        if (m_showGroups && m_groupModel)
-        {
-            foreach(const Group &group, m_groups)
-            {
-                if (group.rect.contains(mouseEvent->pos()))
-                {
-                    auto sortOrder = m_groupModel->SortOrder(group.col);
-                    m_groupModel->sort(group.col, (sortOrder == Qt::AscendingOrder) ?
-                        Qt::DescendingOrder : Qt::AscendingOrder);
-                }
-            }
-        }
-        break;
-    }
-
-    default:
-        return QHeaderView::event(event);
-        break;
-    }
-
-    return true;
-}
-
-void ColumnGroupHeaderView::ShowGroups(bool showGroups)
-{
-    m_showGroups = showGroups;
-    Q_EMIT geometriesChanged();
-}
-
-void ColumnGroupHeaderView::updateGeometries()
-{
-    setViewportMargins(0, m_showGroups ? GroupViewHeight() : 0, 0, 0);
-    QHeaderView::updateGeometries();
-}
-
-int ColumnGroupHeaderView::GroupViewHeight() const
-{
-    if (!m_groupModel)
-    {
-        return 0;
-    }
-    int groupCount = m_groupModel->Groups().size();
-    return QHeaderView::sizeHint().height() + qMax(0, groupCount - 1) * 10 + 20;
-}
-
-
-#include <Util/moc_ColumnGroupHeaderView.cpp>
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupHeaderView.h b/Code/Sandbox/Editor/Util/ColumnGroupHeaderView.h
deleted file mode 100644
index 4d91e96329..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnGroupHeaderView.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef COLUMNGROUPHEADERVIEW_H
-#define COLUMNGROUPHEADERVIEW_H
-
-#if !defined(Q_MOC_RUN)
-#include <QHeaderView>
-#include <QVector>
-#endif
-
-class ColumnGroupProxyModel;
-
-class ColumnGroupHeaderView
-    : public QHeaderView
-{
-    Q_OBJECT
-
-public:
-    ColumnGroupHeaderView(QWidget* parent = 0);
-
-    void setModel(QAbstractItemModel* model) override;
-
-    QSize sizeHint() const override;
-
-    bool IsGroupsShown() const;
-
-    bool event(QEvent* event) override;
-
-public slots:
-    void ShowGroups(bool showGroups);
-
-protected slots:
-    void updateGeometries() override;
-
-private:
-    int GroupViewHeight() const;
-
-private:
-    struct Group
-    {
-        QRect rect;
-        int col;
-    };
-
-    ColumnGroupProxyModel* m_groupModel;
-    bool m_showGroups;
-
-    QVector<Group> m_groups;
-};
-
-#endif // COLUMNGROUPHEADERVIEW_H
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.cpp b/Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.cpp
deleted file mode 100644
index 20bd64a9c1..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ColumnGroupItemDelegate.h"
-
-// Qt
-#include <QHeaderView>
-#include <QPainter>
-#include <QTreeView>
-
-
-
-ColumnGroupItemDelegate::ColumnGroupItemDelegate(QObject* parent)
-    : QStyledItemDelegate(parent)
-{
-}
-
-QSize ColumnGroupItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-    // group title indexes have no own width, their text is drawn over all columns
-    if (index.model()->hasChildren(index) && index.column() == 0)
-    {
-        return QSize(32, QStyledItemDelegate::sizeHint(option, index).height());
-    }
-    return QStyledItemDelegate::sizeHint(option, index);
-}
-
-void ColumnGroupItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-    if (index.model()->hasChildren(index))
-    {
-        painter->setClipping(false);
-        painter->setPen(option.palette.text().color());
-        if (option.state & QStyle::State_Selected)
-        {
-            painter->setPen(option.palette.highlightedText().color());
-        }
-        QRect textRect = option.rect;
-        textRect.setRight(qobject_cast<QWidget*>(parent())->width());
-        if (option.state & QStyle::State_Selected && index.column() == 0)
-        {
-            painter->fillRect(textRect, option.palette.highlight());
-        }
-        // there's just one text - somewhere in the model row, show it!
-        QString content;
-        const int columnCount = index.model()->columnCount(index.parent());
-        for (int column = 0; column < columnCount; ++column)
-        {
-            content += index.sibling(index.row(), column).data().toString();
-        }
-        int alignment = index.data(Qt::TextAlignmentRole).toInt();
-        if (index.column() == 0)
-        {
-            painter->drawText(textRect, (alignment == 0 ? Qt::AlignLeft | Qt::AlignVCenter : alignment) | Qt::ElideRight, content);
-        }
-
-        if (!index.parent().isValid() && index.row() > 0)
-        {
-            QTreeView* tv = qobject_cast<QTreeView*>(option.styleObject);
-            if (tv)
-            {
-                // draw a line in the same color as the table header for separation between groups
-                QStyleOptionHeader header;
-                header.rect = QRect(QPoint(1, textRect.top()), textRect.topRight() - QPoint(1,0));
-                tv->style()->drawControl(QStyle::CE_HeaderSection, &header, painter, tv->header());
-            }
-        }
-    }
-    else
-    {
-        QStyledItemDelegate::paint(painter, option, index);
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.h b/Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.h
deleted file mode 100644
index 2535a14c03..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef COLUMNGROUPITEMDELEGATE_H
-#define COLUMNGROUPITEMDELEGATE_H
-
-#include <QStyledItemDelegate>
-
-class ColumnGroupItemDelegate
-    : public QStyledItemDelegate
-{
-public:
-    ColumnGroupItemDelegate(QObject* parent = 0);
-
-    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-};
-
-#endif // COLUMNGROUPITEMDELEGATE_H
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupProxyModel.cpp b/Code/Sandbox/Editor/Util/ColumnGroupProxyModel.cpp
deleted file mode 100644
index b2553e7ac1..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnGroupProxyModel.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ColumnGroupProxyModel.h"
-
-// Editor
-#include "Util/ColumnSortProxyModel.h"
-#include "Util/AbstractSortModel.h"
-
-
-ColumnGroupProxyModel::ColumnGroupProxyModel(QObject* parent)
-    : AbstractGroupProxyModel(parent)
-    , m_sortModel(new ColumnSortProxyModel(this))
-    , m_freeSortColumn(-1)
-{
-    AbstractGroupProxyModel::setSourceModel(m_sortModel);
-    connect(m_sortModel, &ColumnSortProxyModel::SortChanged, this, &ColumnGroupProxyModel::SortChanged);
-}
-
-void ColumnGroupProxyModel::sort(int column, Qt::SortOrder order)
-{
-    if (m_freeSortColumn != -1)
-    {
-        m_sortModel->RemoveColumnWithoutSorting(m_freeSortColumn);
-        m_freeSortColumn = -1;
-    }
-    if (!m_groups.contains(column))
-    {
-        m_freeSortColumn = column;
-    }
-    m_sortModel->sort(column, order);
-}
-
-void ColumnGroupProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
-{
-    Q_ASSERT(qobject_cast<AbstractSortModel*>(sourceModel));
-    m_sortModel->setSourceModel(sourceModel);
-    RebuildTree();
-}
-
-void ColumnGroupProxyModel::AddGroup(int column)
-{
-    if (!m_groups.contains(column))
-    {
-        m_groups.push_back(column);
-        sort(column);
-        Q_EMIT GroupsChanged();
-    }
-}
-
-void ColumnGroupProxyModel::RemoveGroup(int column)
-{
-    if (m_groups.contains(column))
-    {
-        m_groups.remove(m_groups.indexOf(column));
-        m_sortModel->RemoveColumn(column);
-        Q_EMIT GroupsChanged();
-    }
-}
-
-void ColumnGroupProxyModel::SetGroups(const QVector<int>& columns)
-{
-    m_groups.clear();
-    foreach(int col, columns)
-    {
-        m_groups.push_back(col);
-        m_sortModel->AddColumnWithoutSorting(col);
-    }
-    m_sortModel->SortModel();
-    Q_EMIT GroupsChanged();
-}
-
-void ColumnGroupProxyModel::ClearGroups()
-{
-    m_groups.clear();
-    m_sortModel->ClearColumns();
-    Q_EMIT GroupsChanged();
-}
-
-QVector<int> ColumnGroupProxyModel::Groups() const
-{
-    return m_groups;
-}
-
-bool ColumnGroupProxyModel::IsColumnSorted(int col) const
-{
-    return m_sortModel->IsColumnSorted(col);
-}
-
-Qt::SortOrder ColumnGroupProxyModel::SortOrder(int col) const
-{
-    return m_sortModel->SortOrder(col);
-}
-
-QStringList ColumnGroupProxyModel::GroupForSourceIndex(const QModelIndex& sourceIndex) const
-{
-    QStringList group;
-    foreach(int column, m_groups)
-    group.push_back(QString::fromLatin1("%1: %2").arg(headerData(column, Qt::Horizontal).toString(), sourceIndex.sibling(sourceIndex.row(), column).data().toString()));
-    return group;
-}
-
-#include <Util/moc_ColumnGroupProxyModel.cpp>
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupProxyModel.h b/Code/Sandbox/Editor/Util/ColumnGroupProxyModel.h
deleted file mode 100644
index bc8988f544..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnGroupProxyModel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef COLUMNGROUPPROXYMODEL_H
-#define COLUMNGROUPPROXYMODEL_H
-
-#if !defined(Q_MOC_RUN)
-#include "AbstractGroupProxyModel.h"
-
-#include <QVector>
-#endif
-
-class ColumnSortProxyModel;
-
-class ColumnGroupProxyModel
-    : public AbstractGroupProxyModel
-{
-    Q_OBJECT
-
-public:
-    ColumnGroupProxyModel(QObject* parent = nullptr);
-
-    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
-
-    void setSourceModel(QAbstractItemModel* sourceModel) override;
-
-    void AddGroup(int column);
-    void RemoveGroup(int column);
-    void SetGroups(const QVector<int>& columns);
-    void ClearGroups();
-    QVector<int> Groups() const;
-
-    bool IsColumnSorted(int col) const;
-    Qt::SortOrder SortOrder(int col) const;
-
-protected:
-    QStringList GroupForSourceIndex(const QModelIndex& sourceIndex) const override;
-
-signals:
-    void GroupsChanged();
-    void SortChanged();
-
-private:
-    ColumnSortProxyModel* m_sortModel;
-    QVector<int> m_groups;
-    int m_freeSortColumn;
-};
-
-#endif // COLUMNGROUPPROXYMODEL_H
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupTreeView.cpp b/Code/Sandbox/Editor/Util/ColumnGroupTreeView.cpp
deleted file mode 100644
index 769b5f64f6..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnGroupTreeView.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ColumnGroupTreeView.h"
-
-// Editor
-#include "Util/ColumnGroupHeaderView.h"
-#include "Util/ColumnGroupProxyModel.h"
-#include "Util/ColumnGroupItemDelegate.h"
-
-
-ColumnGroupTreeView::ColumnGroupTreeView(QWidget* parent)
-    : QTreeView(parent)
-    , m_header(new ColumnGroupHeaderView)
-    , m_groupModel(new ColumnGroupProxyModel(this))
-{
-    setSortingEnabled(true);
-    setHeader(m_header);
-    setItemDelegate(new ColumnGroupItemDelegate(this));
-    setSelectionMode(QAbstractItemView::ExtendedSelection);
-    setSelectionBehavior(QAbstractItemView::SelectRows);
-
-    QTreeView::setModel(m_groupModel);
-    connect(m_groupModel, &QAbstractItemModel::modelAboutToBeReset, this, &ColumnGroupTreeView::SaveOpenState);
-    connect(m_groupModel, &QAbstractItemModel::modelReset, this, &ColumnGroupTreeView::RestoreOpenState);
-    connect(m_groupModel, SIGNAL(GroupUpdated()), this, SLOT(SpanGroups()));
-    connect(m_groupModel, &ColumnGroupProxyModel::GroupsChanged, this, &ColumnGroupTreeView::expandAll);
-}
-
-void ColumnGroupTreeView::setModel(QAbstractItemModel* model)
-{
-    m_groupModel->setSourceModel(model);
-    if (model)
-    {
-        connect(model, &QAbstractItemModel::modelReset, this, &QTreeView::expandAll, Qt::QueuedConnection);
-    }
-}
-
-bool ColumnGroupTreeView::IsGroupsShown() const
-{
-    return m_header->IsGroupsShown();
-}
-
-void ColumnGroupTreeView::ShowGroups(bool showGroups)
-{
-    m_header->ShowGroups(showGroups);
-}
-
-QSet<QString> GetOpenNodes(QTreeView* tree, const QModelIndex& parent)
-{
-    int rows = tree->model()->rowCount(parent);
-    QSet<QString> results;
-
-    for (int row = 0; row < rows; ++row)
-    {
-        auto index = tree->model()->index(row, 0, parent);
-        if (tree->isExpanded(index))
-        {
-            results.insert(index.data().toString());
-        }
-        results.unite(GetOpenNodes(tree, index));
-    }
-    return results;
-}
-
-void ColumnGroupTreeView::SaveOpenState()
-{
-    m_openNodes = GetOpenNodes(this, QModelIndex());
-}
-
-void RestoreOpenNodes(QTreeView* tree, const QSet<QString> openNodes, const QModelIndex& parent)
-{
-    int rows = tree->model()->rowCount(parent);
-    QSet<QString> results;
-
-    for (int row = 0; row < rows; ++row)
-    {
-        auto index = tree->model()->index(row, 0, parent);
-        auto text = index.data().toString();
-        if (openNodes.contains(text))
-        {
-            tree->expand(index);
-        }
-        RestoreOpenNodes(tree, openNodes, index);
-    }
-}
-
-void ColumnGroupTreeView::RestoreOpenState()
-{
-    RestoreOpenNodes(this, m_openNodes, QModelIndex());
-}
-
-void ColumnGroupTreeView::Sort(int column, Qt::SortOrder order)
-{
-    m_groupModel->sort(column, order);
-    m_header->setSortIndicator(column, order);
-}
-
-void ColumnGroupTreeView::ToggleSortOrder(int column)
-{
-    auto sortOrder = m_groupModel->SortOrder(column) == Qt::AscendingOrder ? Qt::DescendingOrder : Qt::AscendingOrder;
-    m_groupModel->sort(column, sortOrder);
-}
-
-void ColumnGroupTreeView::AddGroup(int column)
-{
-    m_groupModel->AddGroup(column);
-}
-
-void ColumnGroupTreeView::RemoveGroup(int column)
-{
-    m_groupModel->RemoveGroup(column);
-}
-
-void ColumnGroupTreeView::SetGroups(const QVector<int>& columns)
-{
-    m_groupModel->SetGroups(columns);
-}
-
-void ColumnGroupTreeView::ClearGroups()
-{
-    m_groupModel->ClearGroups();
-}
-
-QVector<int> ColumnGroupTreeView::Groups() const
-{
-    return m_groupModel->Groups();
-}
-
-void ColumnGroupTreeView::SpanGroups(const QModelIndex& index)
-{
-    int childrenCount = m_groupModel->rowCount(index);
-    for (int row = 0; row < childrenCount; ++row)
-    {
-        auto childIndex = m_groupModel->index(row, 0, index);
-        bool hasChildren = m_groupModel->hasChildren(childIndex);
-        if (hasChildren)
-        {
-            setFirstColumnSpanned(row, index, true);
-            SpanGroups(childIndex);
-        }
-    }
-}
-
-QModelIndex ColumnGroupTreeView::mapToSource(const QModelIndex& proxyIndex) const
-{
-    auto sortProxy = qobject_cast<QAbstractProxyModel*>(m_groupModel->sourceModel());
-    return sortProxy->mapToSource(m_groupModel->mapToSource(proxyIndex));
-}
-
-QModelIndex ColumnGroupTreeView::mapFromSource(const QModelIndex& sourceModel) const
-{
-    auto sortProxy = qobject_cast<QAbstractProxyModel*>(m_groupModel->sourceModel());
-    return m_groupModel->mapFromSource(sortProxy->mapFromSource(sourceModel));
-}
-
-
-#include <Util/moc_ColumnGroupTreeView.cpp>
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupTreeView.h b/Code/Sandbox/Editor/Util/ColumnGroupTreeView.h
deleted file mode 100644
index a5b559dfdd..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnGroupTreeView.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef COLUMNGROUPTREEVIEW_H
-#define COLUMNGROUPTREEVIEW_H
-
-#if !defined(Q_MOC_RUN)
-#include <QTreeView>
-#include <QPainter>
-#endif
-
-class ColumnGroupProxyModel;
-class ColumnGroupHeaderView;
-
-class ColumnGroupTreeView
-    : public QTreeView
-{
-    Q_OBJECT
-
-public:
-    ColumnGroupTreeView(QWidget* parent = 0);
-
-    void setModel(QAbstractItemModel* model) override;
-
-    bool IsGroupsShown() const;
-
-    QModelIndex mapToSource(const QModelIndex& proxyIndex) const;
-    QModelIndex mapFromSource(const QModelIndex& sourceModel) const;
-
-public slots:
-    void ShowGroups(bool showGroups);
-
-    void Sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
-    void ToggleSortOrder(int column);
-
-    void AddGroup(int column);
-    void RemoveGroup(int column);
-    void SetGroups(const QVector<int>& columns);
-    void ClearGroups();
-    QVector<int> Groups() const;
-
-protected:
-    void paintEvent(QPaintEvent* event)
-    {
-        if (model() && model()->rowCount() > 0)
-        {
-            QTreeView::paintEvent(event);
-        }
-        else
-        {
-            const QMargins margins(2, 2, 2, 2);
-            QPainter painter(viewport());
-            QString text(tr("There are no items to show."));
-            QRect textRect = painter.fontMetrics().boundingRect(text).marginsAdded(margins);
-            textRect.moveCenter(viewport()->rect().center());
-            textRect.moveTop(viewport()->rect().top());
-            painter.drawText(textRect, Qt::AlignCenter, text);
-        }
-    }
-
-private slots:
-    void SaveOpenState();
-    void RestoreOpenState();
-    void SpanGroups(const QModelIndex& index = QModelIndex());
-
-private:
-    ColumnGroupHeaderView* m_header;
-    ColumnGroupProxyModel* m_groupModel;
-    QSet<QString> m_openNodes;
-    bool m_showGroups;
-};
-
-#endif // COLUMNGROUPTREEVIEW_H
diff --git a/Code/Sandbox/Editor/Util/ColumnSortProxyModel.cpp b/Code/Sandbox/Editor/Util/ColumnSortProxyModel.cpp
deleted file mode 100644
index 6d41fead42..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnSortProxyModel.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ColumnSortProxyModel.h"
-
-// Editor
-#include "Util/AbstractSortModel.h"
-
-class ColumnSortProxyModelLessThan
-{
-public:
-    inline ColumnSortProxyModelLessThan(int column, const AbstractSortModel* source)
-        : sort_column(column)
-        , source_model(source) {}
-
-    inline bool operator()(int r1, int r2) const
-    {
-        QModelIndex i1 = source_model->index(r1, sort_column);
-        QModelIndex i2 = source_model->index(r2, sort_column);
-        return source_model->LessThan(i1, i2);
-    }
-
-private:
-    int sort_column;
-    const AbstractSortModel* source_model;
-};
-
-class ColumnSortProxyModelGreaterThan
-{
-public:
-    inline ColumnSortProxyModelGreaterThan(int column, const AbstractSortModel* source)
-        : sort_column(column)
-        , source_model(source) {}
-
-    inline bool operator()(int r1, int r2) const
-    {
-        QModelIndex i1 = source_model->index(r1, sort_column);
-        QModelIndex i2 = source_model->index(r2, sort_column);
-        return source_model->LessThan(i2, i1);
-    }
-
-private:
-    int sort_column;
-    const AbstractSortModel* source_model;
-};
-
-
-ColumnSortProxyModel::ColumnSortProxyModel(QObject* parent)
-    : QAbstractProxyModel(parent)
-{
-}
-
-ColumnSortProxyModel::~ColumnSortProxyModel()
-{
-}
-
-QVariant ColumnSortProxyModel::data(const QModelIndex& index, int role) const
-{
-    Q_ASSERT(index.isValid() && index.model() == this);
-    return sourceModel()->data(mapToSource(index), role);
-}
-
-QVariant ColumnSortProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    return sourceModel()->headerData(section, orientation, role);
-}
-
-int ColumnSortProxyModel::rowCount(const QModelIndex& index) const
-{
-    if (!sourceModel() || index.isValid())
-    {
-        return 0;
-    }
-    return sourceModel()->rowCount(index);
-}
-
-int ColumnSortProxyModel::columnCount(const QModelIndex& index) const
-{
-    if (!sourceModel() || index.isValid())
-    {
-        return 0;
-    }
-    return sourceModel()->columnCount(index);
-}
-
-QModelIndex ColumnSortProxyModel::index(int row, int column, const QModelIndex& parent) const
-{
-    Q_UNUSED(parent);
-    Q_ASSERT(!parent.isValid());
-    return createIndex(row, column);
-}
-
-QModelIndex ColumnSortProxyModel::parent(const QModelIndex& index) const
-{
-    Q_UNUSED(index);
-    return QModelIndex();
-}
-
-QModelIndex ColumnSortProxyModel::mapFromSource(const QModelIndex& sourceIndex) const
-{
-    Q_ASSERT(!sourceIndex.isValid() || sourceIndex.model() == sourceModel());
-    if (!sourceIndex.isValid())
-    {
-        return QModelIndex();
-    }
-    int row = m_mappingToSource.indexOf(sourceIndex.row());
-    return createIndex(row, sourceIndex.column());
-}
-
-QModelIndex ColumnSortProxyModel::mapToSource(const QModelIndex& proxyIndex) const
-{
-    Q_ASSERT(!proxyIndex.isValid() || proxyIndex.model() == this);
-    if (!proxyIndex.isValid())
-    {
-        return QModelIndex();
-    }
-    int row = m_mappingToSource.at(proxyIndex.row());
-    return sourceModel()->index(row, proxyIndex.column());
-}
-
-void ColumnSortProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
-{
-    Q_ASSERT(qobject_cast<AbstractSortModel*>(sourceModel));
-    QAbstractProxyModel::setSourceModel(sourceModel);
-
-    connect(sourceModel, &QAbstractItemModel::rowsInserted, this, &ColumnSortProxyModel::SortModel);
-    connect(sourceModel, &QAbstractItemModel::rowsRemoved, this, &ColumnSortProxyModel::SortModel);
-    connect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, this, &ColumnSortProxyModel::beginResetModel);
-    connect(sourceModel, &QAbstractItemModel::modelReset, this, [=]()
-        {
-            { QSignalBlocker sb(this);
-              SortModel();
-            } endResetModel();
-        });
-    connect(sourceModel, &QAbstractItemModel::layoutChanged, this, &ColumnSortProxyModel::SortModel);
-    connect(sourceModel, &QAbstractItemModel::dataChanged, this, &ColumnSortProxyModel::SourceDataChanged);
-
-    SortModel();
-}
-
-void ColumnSortProxyModel::sort(int column, Qt::SortOrder order)
-{
-    int id = ColumnContains(column);
-    if (id == -1)
-    {
-        AddColumn(column, order);
-    }
-    else
-    {
-        if (m_columns.at(id).sortOrder != order)
-        {
-            m_columns[id].sortOrder = order;
-            SortModel();
-        }
-    }
-}
-
-void ColumnSortProxyModel::AddColumn(int column, Qt::SortOrder order)
-{
-    if (ColumnContains(column) == -1)
-    {
-        m_columns.push_front({ column, order });
-        SortModel();
-    }
-}
-
-void ColumnSortProxyModel::AddColumnWithoutSorting(int column, Qt::SortOrder order)
-{
-    if (ColumnContains(column) == -1)
-    {
-        m_columns.push_front({ column, order });
-    }
-}
-
-void ColumnSortProxyModel::RemoveColumn(int column)
-{
-    int id = ColumnContains(column);
-    if (id != -1)
-    {
-        m_columns.remove(id);
-        SortModel();
-    }
-}
-
-void ColumnSortProxyModel::RemoveColumnWithoutSorting(int column)
-{
-    int id = ColumnContains(column);
-    if (id != -1)
-    {
-        m_columns.remove(id);
-    }
-}
-
-void ColumnSortProxyModel::SetColumns(const QVector<int>& columns)
-{
-    m_columns.clear();
-    foreach(int col, columns)
-    {
-        m_columns.push_back({ col, Qt::AscendingOrder });
-    }
-    SortModel();
-}
-
-void ColumnSortProxyModel::ClearColumns()
-{
-    SortModel();
-}
-
-bool ColumnSortProxyModel::IsColumnSorted(int col) const
-{
-    int id = ColumnContains(col);
-    return (id != -1);
-}
-
-Qt::SortOrder ColumnSortProxyModel::SortOrder(int col) const
-{
-    int id = ColumnContains(col);
-    if (id != -1)
-    {
-        return m_columns.at(id).sortOrder;
-    }
-    return Qt::AscendingOrder;
-}
-
-void ColumnSortProxyModel::SortModel()
-{
-    emit layoutAboutToBeChanged();
-
-    int size = sourceModel() ? sourceModel()->rowCount() : 0;
-    m_mappingToSource.resize(size);
-    for (int i = 0; i < size; ++i)
-    {
-        m_mappingToSource[i] = i;
-    }
-
-    foreach(Column col, m_columns)
-    {
-        if (col.sortOrder == Qt::AscendingOrder)
-        {
-            ColumnSortProxyModelLessThan lt(col.column, qobject_cast<AbstractSortModel*>(sourceModel()));
-            std::stable_sort(m_mappingToSource.begin(), m_mappingToSource.end(), lt);
-        }
-        else
-        {
-            ColumnSortProxyModelGreaterThan gt(col.column, qobject_cast<AbstractSortModel*>(sourceModel()));
-            std::stable_sort(m_mappingToSource.begin(), m_mappingToSource.end(), gt);
-        }
-    }
-
-    emit layoutChanged();
-    emit SortChanged();
-}
-
-void ColumnSortProxyModel::SourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
-{
-    for (int col = topLeft.column(); col <= bottomRight.column(); ++col)
-    {
-        if (ColumnContains(col) != -1)
-        {
-            SortModel();
-            return;
-        }
-    }
-}
-
-int ColumnSortProxyModel::ColumnContains(int col) const
-{
-    for (int i = 0; i < m_columns.count(); ++i)
-    {
-        if (m_columns.at(i).column == col)
-        {
-            return i;
-        }
-    }
-    return -1;
-}
-
-#include <Util/moc_ColumnSortProxyModel.cpp>
diff --git a/Code/Sandbox/Editor/Util/ColumnSortProxyModel.h b/Code/Sandbox/Editor/Util/ColumnSortProxyModel.h
deleted file mode 100644
index 5508cc1240..0000000000
--- a/Code/Sandbox/Editor/Util/ColumnSortProxyModel.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef COLUMNSORTPROXYMODEL_H
-#define COLUMNSORTPROXYMODEL_H
-
-#if !defined(Q_MOC_RUN)
-#include <QAbstractProxyModel>
-
-#include <QVector>
-#endif
-
-class ColumnGroupProxyModel;
-
-/*!
-    \brief Proxy model used to sort on multiple columns
-
-    It's using a stable sort to sort on multiple columns.
-    Every time a value is changed (on one of the sorted columns), it will resort everything.
-    THis model does not work with tree models!
-*/
-
-class ColumnSortProxyModel
-    : public QAbstractProxyModel
-{
-    Q_OBJECT
-
-public:
-    ColumnSortProxyModel(QObject* parent = nullptr);
-    ~ColumnSortProxyModel();
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-
-    int rowCount(const QModelIndex& index = QModelIndex()) const override;
-    int columnCount(const QModelIndex& index = QModelIndex()) const override;
-
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex& index) const override;
-
-    QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override;
-    QModelIndex mapToSource(const QModelIndex& proxyIndex) const override;
-
-    void setSourceModel(QAbstractItemModel* sourceModel) override;
-
-    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
-
-    void AddColumn(int column, Qt::SortOrder order = Qt::AscendingOrder);
-    void RemoveColumn(int column);
-    void SetColumns(const QVector<int>& columns);
-    void ClearColumns();
-
-    bool IsColumnSorted(int col) const;
-    Qt::SortOrder SortOrder(int col) const;
-
-signals:
-    void SortChanged();
-
-private:
-    friend class ColumnGroupProxyModel;
-    void AddColumnWithoutSorting(int column, Qt::SortOrder order = Qt::AscendingOrder);
-    void RemoveColumnWithoutSorting(int column);
-
-private slots:
-    void SortModel();
-    void SourceDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
-
-private:
-    struct Column
-    {
-        int column;
-        Qt::SortOrder sortOrder;
-    };
-    int ColumnContains(int col) const;
-
-    QVector<Column> m_columns;
-    QVector<int> m_mappingToSource;
-};
-
-#endif //COLUMNSORTPROXYMODEL_H
diff --git a/Code/Sandbox/Editor/Util/Contrib/NvFloatMath.inl b/Code/Sandbox/Editor/Util/Contrib/NvFloatMath.inl
deleted file mode 100644
index c6fa3bdabc..0000000000
--- a/Code/Sandbox/Editor/Util/Contrib/NvFloatMath.inl
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-/* BEGIN CONTENTS OF README.TXT -------------------------------------
-The ConvexDecomposition library was written by John W. Ratcliff mailto:jratcliffscarab@gmail.com
-
-What is Convex Decomposition?
-
-Convex Decomposition is when you take an arbitrarily complex triangle mesh and sub-divide it into
-a collection of discrete compound pieces (each represented as a convex hull) to approximate
-the original shape of the objet.
-
-This is required since few physics engines can treat aribtrary triangle mesh objects as dynamic
-objects.  Even those engines which can handle this use case incurr a huge performance and memory
-penalty to do so.
-
-By breaking a complex triangle mesh up into a discrete number of convex components you can greatly
-improve performance for dynamic simulations.
-
---------------------------------------------------------------------------------
-
-This code is released under the MIT license.
-
-The code is functional but could use the following improvements:
-
-(1) The convex hull generator, originally written by Stan Melax, could use some major code cleanup.
-
-(2) The code to remove T-junctions appears to have a bug in it.  This code was working fine before,
-but I haven't had time to debug why it stopped working.
-
-(3) Island generation once the mesh has been split is currently disabled due to the fact that the
-Remove Tjunctions functionality has a bug in it.
-
-(4) The code to perform a raycast against a triangle mesh does not currently use any acceleration
-data structures.
-
-(5) When a split is performed, the surface that got split is not 'capped'.  This causes a problem
-if you use a high recursion depth on your convex decomposition.  It will cause the object to
-be modelled as if it had a hollow interior.  A lot of work was done to solve this problem, but
-it hasn't been integrated into this code drop yet.
-
-
-*/// ---------- END CONTENTS OF README.TXT ----------------------------
-
-
-// a set of routines that let you do common 3d math
-// operations without any vector, matrix, or quaternion
-// classes or templates.
-//
-// a vector (or point) is a 'NxF32 *' to 3 floating point numbers.
-// a matrix is a 'NxF32 *' to an array of 16 floating point numbers representing a 4x4 transformation matrix compatible with D3D or OGL
-// a quaternion is a 'NxF32 *' to 4 floats representing a quaternion x,y,z,w
-//
-//
-/*!
-**
-** Copyright (c) 2009 by John W. Ratcliff mailto:jratcliffscarab@gmail.com
-**
-** Portions of this source has been released with the PhysXViewer application, as well as
-** Rocket, CreateDynamics, ODF, and as a number of sample code snippets.
-**
-** If you find this code useful or you are feeling particularily generous I would
-** ask that you please go to http://www.amillionpixels.us and make a donation
-** to Troy DeMolay.
-**
-** DeMolay is a youth group for young men between the ages of 12 and 21.
-** It teaches strong moral principles, as well as leadership skills and
-** public speaking.  The donations page uses the 'pay for pixels' paradigm
-** where, in this case, a pixel is only a single penny.  Donations can be
-** made for as small as $4 or as high as a $100 block.  Each person who donates
-** will get a link to their own site as well as acknowledgement on the
-** donations blog located here http://www.amillionpixels.blogspot.com/
-**
-** If you wish to contact me you can use the following methods:
-**
-** Skype ID: jratcliff63367
-** Yahoo: jratcliff63367
-** AOL: jratcliff1961
-** email: jratcliffscarab@gmail.com
-**
-**
-** The MIT license:
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is furnished
-** to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in all
-** copies or substantial portions of the Software.
-
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-** WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-#pragma warning(disable:4996)
-
-class TVec
-{
-public:
-    TVec(NxF64 _x, NxF64 _y, NxF64 _z) { x = _x; y = _y; z = _z; };
-    TVec(void) { };
-
-    NxF64 x;
-    NxF64 y;
-    NxF64 z;
-};
-
-
-class CTriangulator
-{
-public:
-    ///     Default constructor
-    CTriangulator();
-
-    ///     Default destructor
-    virtual ~CTriangulator();
-
-    ///     Returns the given point in the triangulator array
-    inline TVec get(const TU32 id) { return mPoints[id]; }
-
-    virtual void reset(void)
-    {
-        mInputPoints.clear();
-        mPoints.clear();
-        mIndices.clear();
-    }
-
-    virtual void addPoint(NxF64 x, NxF64 y, NxF64 z)
-    {
-        TVec v(x, y, z);
-        // update bounding box...
-        if (mInputPoints.empty())
-        {
-            mMin = v;
-            mMax = v;
-        }
-        else
-        {
-            if (x < mMin.x)
-            {
-                mMin.x = x;
-            }
-            if (y < mMin.y)
-            {
-                mMin.y = y;
-            }
-            if (z < mMin.z)
-            {
-                mMin.z = z;
-            }
-
-            if (x > mMax.x)
-            {
-                mMax.x = x;
-            }
-            if (y > mMax.y)
-            {
-                mMax.y = y;
-            }
-            if (z > mMax.z)
-            {
-                mMax.z = z;
-            }
-        }
-        mInputPoints.push_back(v);
-    }
-
-    // Triangulation happens in 2d.  We could inverse transform the polygon around the normal direction, or we just use the two most signficant axes
-    // Here we find the two longest axes and use them to triangulate.  Inverse transforming them would introduce more doubleing point error and isn't worth it.
-    virtual NxU32* triangulate(NxU32& tcount, NxF64 epsilon)
-    {
-        NxU32* ret = 0;
-        tcount = 0;
-        mEpsilon = epsilon;
-
-        if (!mInputPoints.empty())
-        {
-            mPoints.clear();
-
-            NxF64 dx = mMax.x - mMin.x; // locate the first, second and third longest edges and store them in i1, i2, i3
-            NxF64 dy = mMax.y - mMin.y;
-            NxF64 dz = mMax.z - mMin.z;
-
-            NxU32 i1, i2, i3;
-
-            if (dx > dy && dx > dz)
-            {
-                i1 = 0;
-                if (dy > dz)
-                {
-                    i2 = 1;
-                    i3 = 2;
-                }
-                else
-                {
-                    i2 = 2;
-                    i3 = 1;
-                }
-            }
-            else if (dy > dx && dy > dz)
-            {
-                i1 = 1;
-                if (dx > dz)
-                {
-                    i2 = 0;
-                    i3 = 2;
-                }
-                else
-                {
-                    i2 = 2;
-                    i3 = 0;
-                }
-            }
-            else
-            {
-                i1 = 2;
-                if (dx > dy)
-                {
-                    i2 = 0;
-                    i3 = 1;
-                }
-                else
-                {
-                    i2 = 1;
-                    i3 = 0;
-                }
-            }
-
-            NxU32 pcount = (NxU32)mInputPoints.size();
-            const NxF64* points = &mInputPoints[0].x;
-            for (NxU32 i = 0; i < pcount; i++)
-            {
-                TVec v(points[i1], points[i2], points[i3]);
-                mPoints.push_back(v);
-                points += 3;
-            }
-
-            mIndices.clear();
-            triangulate(mIndices);
-            tcount = (NxU32)mIndices.size() / 3;
-            if (tcount)
-            {
-                ret = &mIndices[0];
-            }
-        }
-        return ret;
-    }
-
-    virtual const NxF64* getPoint(NxU32 index)
-    {
-        return &mInputPoints[index].x;
-    }
-
-
-private:
-    NxF64                  mEpsilon;
-    TVec                   mMin;
-    TVec                   mMax;
-    TVecVector             mInputPoints;
-    TVecVector             mPoints;
-    TU32Vector             mIndices;
-
-    ///     Tests if a point is inside the given triangle
-    bool _insideTriangle(const TVec& A, const TVec& B, const TVec& C, const TVec& P);
-
-    ///     Returns the area of the contour
-    NxF64 _area();
-
-    bool _snip(NxI32 u, NxI32 v, NxI32 w, NxI32 n, NxI32* V);
-
-    ///     Processes the triangulation
-    void _process(TU32Vector& indices);
-    ///     Triangulates the contour
-    void triangulate(TU32Vector& indices);
-};
-
-///     Default constructor
-CTriangulator::CTriangulator(void)
-{
-}
-
-///     Default destructor
-CTriangulator::~CTriangulator()
-{
-}
-
-///     Triangulates the contour
-void CTriangulator::triangulate(TU32Vector& indices)
-{
-    _process(indices);
-}
-
-///     Processes the triangulation
-void CTriangulator::_process(TU32Vector& indices)
-{
-    const NxI32 n = (const NxI32)mPoints.size();
-    if (n < 3)
-    {
-        return;
-    }
-    NxI32* V = (NxI32*)MEMALLOC_MALLOC(sizeof(NxI32) * n);
-
-    bool flipped = false;
-
-    if (0.0f < _area())
-    {
-        for (NxI32 v = 0; v < n; v++)
-        {
-            V[v] = v;
-        }
-    }
-    else
-    {
-        flipped = true;
-        for (NxI32 v = 0; v < n; v++)
-        {
-            V[v] = (n - 1) - v;
-        }
-    }
-
-    NxI32 nv = n;
-    NxI32 count = 2 * nv;
-    for (NxI32 m = 0, v = nv - 1; nv > 2; )
-    {
-        if (0 >= (count--))
-        {
-            return;
-        }
-
-        NxI32 u = v;
-        if (nv <= u)
-        {
-            u = 0;
-        }
-        v = u + 1;
-        if (nv <= v)
-        {
-            v = 0;
-        }
-        NxI32 w = v + 1;
-        if (nv <= w)
-        {
-            w = 0;
-        }
-
-        if (_snip(u, v, w, nv, V))
-        {
-            NxI32 a, b, c, s, t;
-            a = V[u];
-            b = V[v];
-            c = V[w];
-            if (flipped)
-            {
-                indices.push_back(a);
-                indices.push_back(b);
-                indices.push_back(c);
-            }
-            else
-            {
-                indices.push_back(c);
-                indices.push_back(b);
-                indices.push_back(a);
-            }
-            m++;
-            for (s = v, t = v + 1; t < nv; s++, t++)
-            {
-                V[s] = V[t];
-            }
-            nv--;
-            count = 2 * nv;
-        }
-    }
-
-    MEMALLOC_FREE(V);
-}
-
-///     Returns the area of the contour
-NxF64 CTriangulator::_area()
-{
-    NxI32 n = (NxU32)mPoints.size();
-    NxF64 A = 0.0f;
-    for (NxI32 p = n - 1, q = 0; q < n; p = q++)
-    {
-        const TVec& pval = mPoints[p];
-        const TVec& qval = mPoints[q];
-        A += pval.x * qval.y - qval.x * pval.y;
-    }
-    A *= 0.5f;
-    return A;
-}
-
-bool CTriangulator::_snip(NxI32 u, NxI32 v, NxI32 w, NxI32 n, NxI32* V)
-{
-    NxI32 p;
-
-    const TVec& A = mPoints[V[u]];
-    const TVec& B = mPoints[V[v]];
-    const TVec& C = mPoints[V[w]];
-
-    if (mEpsilon > (((B.x - A.x) * (C.y - A.y)) - ((B.y - A.y) * (C.x - A.x))))
-    {
-        return false;
-    }
-
-    for (p = 0; p < n; p++)
-    {
-        if ((p == u) || (p == v) || (p == w))
-        {
-            continue;
-        }
-        const TVec& P = mPoints[V[p]];
-        if (_insideTriangle(A, B, C, P))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-///     Tests if a point is inside the given triangle
-bool CTriangulator::_insideTriangle(const TVec& A, const TVec& B, const TVec& C, const TVec& P)
-{
-    NxF64 ax, ay, bx, by, cx, cy, apx, apy, bpx, bpy, cpx, cpy;
-    NxF64 cCROSSap, bCROSScp, aCROSSbp;
-
-    ax = C.x - B.x;
-    ay = C.y - B.y;
-    bx = A.x - C.x;
-    by = A.y - C.y;
-    cx = B.x - A.x;
-    cy = B.y - A.y;
-    apx = P.x - A.x;
-    apy = P.y - A.y;
-    bpx = P.x - B.x;
-    bpy = P.y - B.y;
-    cpx = P.x - C.x;
-    cpy = P.y - C.y;
-
-    aCROSSbp = ax * bpy - ay * bpx;
-    cCROSSap = cx * apy - cy * apx;
-    bCROSScp = bx * cpy - by * cpx;
-
-    return ((aCROSSbp >= 0.0f) && (bCROSScp >= 0.0f) && (cCROSSap >= 0.0f));
-}
-
diff --git a/Code/Sandbox/Editor/Util/CryMemFile.h b/Code/Sandbox/Editor/Util/CryMemFile.h
deleted file mode 100644
index b2897e5914..0000000000
--- a/Code/Sandbox/Editor/Util/CryMemFile.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_CRYMEMFILE_H
-#define CRYINCLUDE_EDITOR_UTIL_CRYMEMFILE_H
-#pragma once
-
-#include <QBuffer>
-
-// derived class to get correct memory allocation/deallocation with custom memory manager - and to avoid memory leaks from calling Detach()
-class CCryMemFile
-    : public QBuffer
-{
-public: // ---------------------------------------------------------------
-
-    CCryMemFile()
-        : QBuffer(&m_lpBuffer)
-    {
-        open(QIODevice::WriteOnly);
-    }
-    CCryMemFile(char* lpBuffer, int nBufferSize)
-        : QBuffer(&m_lpBuffer), m_lpBuffer(lpBuffer, nBufferSize)
-    {
-        open(QIODevice::WriteOnly);
-    }
-
-    virtual ~CCryMemFile()
-    {
-        close();        // call Close() to make sure the Free() is using my v-table
-    }
-
-    qulonglong GetPosition() const
-    {
-        return QBuffer::pos();
-    }
-
-    qulonglong GetLength() const
-    {
-        return QBuffer::size();
-    }
-
-    void Write(const void* lpBuf, unsigned int nCount)
-    {
-        QBuffer::write(reinterpret_cast<const char*>(lpBuf), nCount);
-    }
-
-    // only for temporary use
-    void* GetMemPtr() const
-    {
-        return const_cast<char*>(m_lpBuffer.data());
-    }
-
-    void Close()
-    {
-        QBuffer::close();
-    }
-
-    char* Detach()
-    {
-        assert(0);      // dangerous - most likely we cause memory leak - better use GetMemPtr
-        return 0;
-    }
-
-private:
-    QByteArray m_lpBuffer;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_CRYMEMFILE_H
diff --git a/Code/Sandbox/Editor/Util/DynamicArray2D.cpp b/Code/Sandbox/Editor/Util/DynamicArray2D.cpp
deleted file mode 100644
index 884dfe6863..0000000000
--- a/Code/Sandbox/Editor/Util/DynamicArray2D.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "DynamicArray2D.h"
-
-// Editor
-#include "Util/fastlib.h"
-
-//////////////////////////////////////////////////////////////////////
-// Construction / destruction
-//////////////////////////////////////////////////////////////////////
-
-CDynamicArray2D::CDynamicArray2D(unsigned int iDimension1, unsigned int iDimension2)
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Declare a 2D array on the free store
-    ////////////////////////////////////////////////////////////////////////
-
-    unsigned int i;
-
-    // Save the position of the array dimensions
-    m_Dimension1 = iDimension1;
-    m_Dimension2 = iDimension2;
-
-    // First dimension
-    m_Array = new float* [m_Dimension1];
-    assert(m_Array);
-
-    // Second dimension
-    for (i = 0; i < m_Dimension1; ++i)
-    {
-        m_Array[i] = new float[m_Dimension2];
-
-        // Init all fields with 0
-        memset(&m_Array[i][0], 0, m_Dimension2 * sizeof(float));
-    }
-}
-
-CDynamicArray2D::~CDynamicArray2D()
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Remove the 2D array and all its sub arrays from the free store
-    ////////////////////////////////////////////////////////////////////////
-
-    unsigned int i;
-
-    for (i = 0; i < m_Dimension1; ++i)
-    {
-        delete [] m_Array[i];
-    }
-
-    delete [] m_Array;
-    m_Array = 0;
-}
-
-
-void CDynamicArray2D::GetMemoryUsage(ICrySizer* pSizer)
-{
-    pSizer->Add((char*)this, m_Dimension1 * m_Dimension2 * sizeof(float) + sizeof(*this));
-}
-
-void CDynamicArray2D::ScaleImage(CDynamicArray2D* pDestination)
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Scale an image stored (in an array class) to a new size
-    ////////////////////////////////////////////////////////////////////////
-
-    unsigned int i, j, iOldWidth;
-    int iXSrcFl, iXSrcCe, iYSrcFl, iYSrcCe;
-    float fXSrc, fYSrc;
-    float fHeight[4];
-    float fHeightWeight[4];
-    float fHeightBottom;
-    float fHeightTop;
-
-    assert(pDestination);
-    assert(pDestination->m_Dimension1 > 1);
-
-    // Width has to be zero based, not a count
-    iOldWidth = m_Dimension1 - 1;
-
-    // Loop trough each field of the new image and interpolate the value
-    // from the source heightmap
-    for (i = 0; i < pDestination->m_Dimension1; i++)
-    {
-        // Calculate the average source array position
-        fXSrc = i / (float) pDestination->m_Dimension1 * iOldWidth;
-        assert(fXSrc >= 0.0f && fXSrc <= iOldWidth);
-
-        // Precalculate floor and ceiling values. Use fast asm integer floor and
-        // fast asm float / integer conversion
-        iXSrcFl = ifloor(fXSrc);
-        iXSrcCe = FloatToIntRet((float) ceil(fXSrc));
-
-        // Distribution between left and right height values
-        fHeightWeight[0] = (float) iXSrcCe - fXSrc;
-        fHeightWeight[1] = fXSrc - (float) iXSrcFl;
-
-        // Avoid error when floor() and ceil() return the same value
-        if (fHeightWeight[0] == 0.0f && fHeightWeight[1] == 0.0f)
-        {
-            fHeightWeight[0] = 0.5f;
-            fHeightWeight[1] = 0.5f;
-        }
-
-        for (j = 0; j < pDestination->m_Dimension1; j++)
-        {
-            // Calculate the average source array position
-            fYSrc = j / (float) pDestination->m_Dimension1 * iOldWidth;
-            assert(fYSrc >= 0.0f && fYSrc <= iOldWidth);
-
-            // Precalculate floor and ceiling values. Use fast asm integer floor and
-            // fast asm float / integer conversion
-            iYSrcFl = ifloor(fYSrc);
-            iYSrcCe = FloatToIntRet((float) ceil(fYSrc));
-
-            // Get the four nearest height values
-            fHeight[0] = m_Array[iXSrcFl][iYSrcFl];
-            fHeight[1] = m_Array[iXSrcCe][iYSrcFl];
-            fHeight[2] = m_Array[iXSrcFl][iYSrcCe];
-            fHeight[3] = m_Array[iXSrcCe][iYSrcCe];
-
-            // Calculate how much weight each height value has
-
-            // Distribution between top and bottom height values
-            fHeightWeight[2] = (float) iYSrcCe - fYSrc;
-            fHeightWeight[3] = fYSrc - (float) iYSrcFl;
-
-            // Avoid error when floor() and ceil() return the same value
-            if (fHeightWeight[2] == 0.0f && fHeightWeight[3] == 0.0f)
-            {
-                fHeightWeight[2] = 0.5f;
-                fHeightWeight[3] = 0.5f;
-            }
-
-            // Interpolate between the four nearest height values
-
-            // Get the height for the given X position trough interpolation between
-            // the left and the right height
-            fHeightBottom = (fHeight[0] * fHeightWeight[0] + fHeight[1] * fHeightWeight[1]);
-            fHeightTop    = (fHeight[2] * fHeightWeight[0] + fHeight[3] * fHeightWeight[1]);
-
-            // Set the new value in the destination heightmap
-            pDestination->m_Array[i][j] = fHeightBottom * fHeightWeight[2] + fHeightTop * fHeightWeight[3];
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/DynamicArray2D.h b/Code/Sandbox/Editor/Util/DynamicArray2D.h
deleted file mode 100644
index 8aa6581e20..0000000000
--- a/Code/Sandbox/Editor/Util/DynamicArray2D.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Interface of the class CDynamicArray.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_DYNAMICARRAY2D_H
-#define CRYINCLUDE_EDITOR_UTIL_DYNAMICARRAY2D_H
-#pragma once
-
-
-class CDynamicArray2D
-{
-public:
-    // constructor
-    CDynamicArray2D(unsigned int iDimension1, unsigned int iDimension2);
-    // destructor
-    virtual ~CDynamicArray2D();
-    //
-    void ScaleImage(CDynamicArray2D* pDestination);
-    //
-    void GetMemoryUsage(ICrySizer* pSizer);
-
-
-    float**                    m_Array;                     //
-
-private:
-
-    unsigned int            m_Dimension1;           //
-    unsigned int            m_Dimension2;           //
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_DYNAMICARRAY2D_H
diff --git a/Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.cpp b/Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.cpp
deleted file mode 100644
index 9917e93d53..0000000000
--- a/Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "EditorAutoLevelLoadTest.h"
-
-CEditorAutoLevelLoadTest& CEditorAutoLevelLoadTest::Instance()
-{
-    static CEditorAutoLevelLoadTest levelLoadTest;
-    return levelLoadTest;
-}
-
-CEditorAutoLevelLoadTest::CEditorAutoLevelLoadTest()
-{
-    GetIEditor()->RegisterNotifyListener(this);
-}
-
-CEditorAutoLevelLoadTest::~CEditorAutoLevelLoadTest()
-{
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-void CEditorAutoLevelLoadTest::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnEndSceneOpen:
-        CLogFile::WriteLine("[LevelLoadFinished]");
-        exit(0);
-        break;
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.h b/Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.h
deleted file mode 100644
index 8d1189a35d..0000000000
--- a/Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_EDITORAUTOLEVELLOADTEST_H
-#define CRYINCLUDE_EDITOR_UTIL_EDITORAUTOLEVELLOADTEST_H
-#pragma once
-
-
-class CEditorAutoLevelLoadTest
-    : public IEditorNotifyListener
-{
-public:
-    static CEditorAutoLevelLoadTest& Instance();
-private:
-    CEditorAutoLevelLoadTest();
-    virtual ~CEditorAutoLevelLoadTest();
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_EDITORAUTOLEVELLOADTEST_H
diff --git a/Code/Sandbox/Editor/Util/EditorUtils.cpp b/Code/Sandbox/Editor/Util/EditorUtils.cpp
deleted file mode 100644
index 0763a83aad..0000000000
--- a/Code/Sandbox/Editor/Util/EditorUtils.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "EditorUtils.h"
-
-#include "EditorToolsApplicationAPI.h"
-
-// Qt
-#include <QColor>
-#include <QMessageBox>
-
-
-#define GetAValue(rgba)      (LOBYTE((rgba)>>24)) // Microsoft does not provide this one so let's make our own.
-#define RGBA(r,g,b,a)          ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)|(((DWORD)(BYTE)(a))<<24)))
-
-//////////////////////////////////////////////////////////////////////////
-void HeapCheck::Check([[maybe_unused]] const char* file, [[maybe_unused]] int line)
-{
-    #ifdef _DEBUG
-
-#ifdef Q_OS_WIN
-    _ASSERTE(_CrtCheckMemory());
-#endif
-
-    /*
-   int heapstatus = _heapchk();
-   switch( heapstatus )
-   {
-   case _HEAPOK:
-      break;
-   case _HEAPEMPTY:
-      break;
-   case _HEAPBADBEGIN:
-            {
-                CString str;
-                str.Format( "Bad Start of Heap, at file %s line:%d",file,line );
-                MessageBox( NULL,str,"Heap Check",MB_OK );
-            }
-      break;
-   case _HEAPBADNODE:
-            {
-                CString str;
-                str.Format( "Bad Node in Heap, at file %s line:%d",file,line );
-                MessageBox( NULL,str,"Heap Check",MB_OK );
-            }
-      break;
-   }
-     */
-    #endif
-}
-
-#ifdef LoadCursor
-#undef LoadCursor
-#endif
-QCursor CMFCUtils::LoadCursor(unsigned int nIDResource, int hotX, int hotY)
-{
-    QString path;
-    switch (nIDResource)
-    {
-    case IDC_HAND_INTERNAL:
-        path = QStringLiteral("cursor1.cur");
-        break;
-    case IDC_ZOOM_INTERNAL:
-        path = QStringLiteral("cur00001.cur");
-        break;
-    case IDC_BRUSH_INTERNAL:
-        path = QStringLiteral("cur00002.cur");
-        break;
-    case IDC_ARRBLCK:
-        path = QStringLiteral("cur00003.cur");
-        break;
-    case IDC_ARRBLCKCROSS:
-        path = QStringLiteral("cur00004.cur");
-        break;
-    case IDC_ARRWHITE:
-        path = QStringLiteral("cur00005.cur");
-        break;
-    case IDC_COLOR_PICKER:
-        path = QStringLiteral("pick_cursor.cur");
-        break;
-    case IDC_HIT_CURSOR:
-        path = QStringLiteral("hit.cur");
-        break;
-    case IDC_ARROW_ADDKEY:
-        path = QStringLiteral("arr_addkey.cur");
-        break;
-    case IDC_LEFTRIGHT:
-        path = QStringLiteral("leftright.cur");
-        break;
-    case IDC_POINTER_OBJHIT:
-        path = QStringLiteral("pointerHit.cur");
-        break;
-    case IDC_POINTER_LINK:
-        path = QStringLiteral("pointer_link.cur");
-        break;
-    case IDC_POINTER_LINKNOW:
-        path = QStringLiteral("pointer_linknow.cur");
-        break;
-    case IDC_POINTER_OBJECT_ROTATE:
-        path = QStringLiteral("object_rotate.cur");
-        break;
-    case IDC_POINTER_OBJECT_SCALE:
-        path = QStringLiteral("object_scale.cur");
-        break;
-    case IDC_POINTER_OBJECT_MOVE:
-        path = QStringLiteral("object_move.cur");
-        break;
-    case IDC_POINTER_PLUS:
-        path = QStringLiteral("pointer_plus.cur");
-        break;
-    case IDC_POINTER_MINUS:
-        path = QStringLiteral("pointer_minus.cur");
-        break;
-    case IDC_POINTER_FLATTEN:
-        path = QStringLiteral("pointer_flatten.cur");
-        break;
-    case IDC_POINTER_SMOOTH:
-        path = QStringLiteral("pointer_smooth.cur");
-        break;
-    case IDC_POINTER_SO_SELECT:
-        path = QStringLiteral("pointer_so_select.cur");
-        break;
-    case IDC_POINTER_SO_SELECT_PLUS:
-        path = QStringLiteral("pointer_so_sel_plus.cur");
-        break;
-    case IDC_POINTER_SO_SELECT_MINUS:
-        path = QStringLiteral("pointer_.cur");
-        break;
-    case IDC_POINTER_DRAG_ITEM:
-        path = QStringLiteral("pointerDragItem.cur");
-        break;
-    case IDC_CURSOR_HAND_DRAG:
-        path = QStringLiteral("handDrag.cur");
-        break;
-    case IDC_CURSOR_HAND_FINGER:
-        path = QStringLiteral("cursor2.cur");
-        break;
-    case IDC_ARROW_UP:
-        path = QStringLiteral("arrow_up.cur");
-        break;
-    case IDC_ARROW_DOWN:
-        path = QStringLiteral("arrow_down.cur");
-        break;
-    case IDC_ARROW_DOWNRIGHT:
-        path = QStringLiteral("arrow_downright.cur");
-        break;
-    case IDC_ARROW_UPRIGHT:
-        path = QStringLiteral("arrow_upright.cur");
-        break;
-    case IDC_POINTER_GET_HEIGHT:
-        path = QStringLiteral("pointer_getheight.cur");
-        break;
-    default:
-        return QCursor();
-    }
-    path = QStringLiteral(":/cursors/res/") + path;
-    QPixmap pm(path);
-    if (!pm.isNull() && (hotX < 0 || hotY < 0))
-    {
-        QFile f(path);
-        f.open(QFile::ReadOnly);
-        QDataStream stream(&f);
-        stream.setByteOrder(QDataStream::LittleEndian);
-        f.read(10);
-        quint16 x;
-        stream >> x;
-        hotX = x;
-        stream >> x;
-        hotY = x;
-    }
-    return QCursor(pm, hotX, hotY);
-}
-
-//////////////////////////////////////////////////////////////////////////-
-QString TrimTrailingZeros(QString str)
-{
-    if (str.contains('.'))
-    {
-        for (int p = str.size() - 1; p >= 0; --p)
-        {
-            if (str.at(p) == '.')
-            {
-                return str.left(p);
-            }
-            else if (str.at(p) != '0')
-            {
-                return str.left(p + 1);
-            }
-        }
-        return QString("0");
-    }
-    return str;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// This function is supposed to format float in user-friendly way,
-// omitting the exponent notation.
-//
-// Why not using printf? Its formatting rules has following drawbacks:
-//  %g   - will use exponent for small numbers;
-//  %.Nf - doesn't allow to control total amount of significant numbers,
-//         which exposes limited precision during binary-to-decimal fraction
-//         conversion.
-//////////////////////////////////////////////////////////////////////////
-void FormatFloatForUI(QString& str, int significantDigits, double value)
-{
-    str = TrimTrailingZeros(QString::number(value, 'f', significantDigits));
-    return;
-}
-//////////////////////////////////////////////////////////////////////////-
-
-//////////////////////////////////////////////////////////////////////////
-QColor ColorLinearToGamma(ColorF col)
-{
-    float r = clamp_tpl(col.r, 0.0f, 1.0f);
-    float g = clamp_tpl(col.g, 0.0f, 1.0f);
-    float b = clamp_tpl(col.b, 0.0f, 1.0f);
-    float a = clamp_tpl(col.a, 0.0f, 1.0f);
-
-    r = (float)(r <= 0.0031308 ? (12.92 * r) : (1.055 * pow((double)r, 1.0 / 2.4) - 0.055));
-    g = (float)(g <= 0.0031308 ? (12.92 * g) : (1.055 * pow((double)g, 1.0 / 2.4) - 0.055));
-    b = (float)(b <= 0.0031308 ? (12.92 * b) : (1.055 * pow((double)b, 1.0 / 2.4) - 0.055));
-
-    return QColor(FtoI(r * 255.0f), FtoI(g * 255.0f), FtoI(b * 255.0f), FtoI(a * 255.0f));
-}
-
-//////////////////////////////////////////////////////////////////////////
-ColorF ColorGammaToLinear(const QColor& col)
-{
-    float r = (float)col.red() / 255.0f;
-    float g = (float)col.green() / 255.0f;
-    float b = (float)col.blue() / 255.0f;
-    float a = (float)col.alpha() / 255.0f;
-
-    return ColorF((float)(r <= 0.04045 ? (r / 12.92) : pow(((double)r + 0.055) / 1.055, 2.4)),
-        (float)(g <= 0.04045 ? (g / 12.92) : pow(((double)g + 0.055) / 1.055, 2.4)),
-        (float)(b <= 0.04045 ? (b / 12.92) : pow(((double)b + 0.055) / 1.055, 2.4)), a);
-}
-
-QColor ColorToQColor(uint32 color)
-{
-    return QColor::fromRgbF((float)GetRValue(color) / 255.0f,
-        (float)GetGValue(color) / 255.0f,
-        (float)GetBValue(color) / 255.0f);
-}
-
-namespace EditorUtils
-{
-    AZ_PUSH_DISABLE_WARNING(4273, "-Wunknown-warning-option")
-    AzWarningAbsorber::AzWarningAbsorber(const char* window)
-        : m_window(window)
-    AZ_POP_DISABLE_WARNING
-    { 
-        BusConnect();
-    }
-
-    AzWarningAbsorber::~AzWarningAbsorber()
-    {
-        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
-    }
-
-    bool AzWarningAbsorber::OnPreWarning(const char* window, const char*, int, const char*, const char*)
-    {
-        if ((window)&&(m_window == window))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    const char* LevelFile::GetOldCryFileExtension()
-    {
-        const char* oldCryExtension = nullptr;
-        EditorInternal::EditorToolsApplicationRequestBus::BroadcastResult(
-            oldCryExtension, &EditorInternal::EditorToolsApplicationRequests::GetOldCryLevelExtension);
-
-        AZ_Assert(oldCryExtension, "Cannot retrieve file extension");
-        return oldCryExtension;
-    }
-
-    const char* LevelFile::GetDefaultFileExtension()
-    {
-        const char* levelExtension = nullptr;
-        EditorInternal::EditorToolsApplicationRequestBus::BroadcastResult(
-            levelExtension, &EditorInternal::EditorToolsApplicationRequests::GetLevelExtension);
-
-        AZ_Assert(levelExtension, "Cannot retrieve file extension");
-        return levelExtension;
-    }
-
-} // namespace EditorUtils
-
diff --git a/Code/Sandbox/Editor/Util/EditorUtils.h b/Code/Sandbox/Editor/Util/EditorUtils.h
deleted file mode 100644
index ed327f3b51..0000000000
--- a/Code/Sandbox/Editor/Util/EditorUtils.h
+++ /dev/null
@@ -1,704 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Utility classes used by Editor.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_EDITORUTILS_H
-#define CRYINCLUDE_EDITOR_UTIL_EDITORUTILS_H
-#pragma once
-
-
-#include <IXml.h>
-#include "Util/FileUtil.h"
-#include <Cry_Color.h>
-
-//! Typedef for quaternion.
-//typedef CryQuat Quat;
-
-#include <QColor>
-#include <QDataStream>
-#include <QGuiApplication>
-#include <QSet>
-
-#include <Include/SandboxAPI.h>
-#include <AzCore/Debug/TraceMessageBus.h>
-
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-
-#ifdef LoadCursor
-#undef LoadCursor
-#endif
-
-#define LINE_EPS (0.00001f)
-
-template <typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-#define arraysize(array) (sizeof(ArraySizeHelper(array)))
-
-/// Some preprocessor utils
-/// http://altdevblogaday.com/2011/07/12/abusing-the-c-preprocessor/
-#define JOIN(x, y)       JOIN2(x, y)
-#define JOIN2(x, y)  x##y
-
-#define LIST_0(x)
-#define LIST_1(x)       x##1
-#define LIST_2(x)       LIST_1(x), x##2
-#define LIST_3(x)       LIST_2(x), x##3
-#define LIST_4(x)       LIST_3(x), x##4
-#define LIST_5(x)       LIST_4(x), x##5
-#define LIST_6(x)       LIST_5(x), x##6
-#define LIST_7(x)       LIST_6(x), x##7
-#define LIST_8(x)       LIST_7(x), x##8
-
-#define LIST(cnt, x)     JOIN(LIST_, cnt)(x)
-
-//! Checks heap for errors.
-struct HeapCheck
-{
-    //! Runs consistency checks on the heap.
-    static void Check(const char* file, int line);
-};
-
-#ifdef _DEBUG
-#define HEAP_CHECK HeapCheck::Check(__FILE__, __LINE__);
-#else
-#define HEAP_CHECK
-#endif
-
-#define MAKE_SURE(x, action) { if (!(x)) { assert(0 && #x); action; } \
-}
-
-namespace EditorUtils
-{
-    // Class to create scoped variable value.
-    template<typename TType>
-    class TScopedVariableValue
-    {
-    public:
-        //Relevant for containers, should not be used manually.
-        TScopedVariableValue()
-            : m_pVariable(nullptr)
-        {
-        }
-
-        // Main constructor.
-        TScopedVariableValue(TType& tVariable, const TType& tConstructValue, const TType& tDestructValue)
-            : m_pVariable(&tVariable)
-            , m_tConstructValue(tConstructValue)
-            , m_tDestructValue(tDestructValue)
-        {
-            *m_pVariable = m_tConstructValue;
-        }
-
-        // Transfers ownership.
-        TScopedVariableValue(TScopedVariableValue& tInput)
-            : m_pVariable(tInput.m_pVariable)
-            , m_tConstructValue(tInput.m_tConstructValue)
-            , m_tDestructValue(tInput.m_tDestructValue)
-        {
-            // I'm not sure if anyone should use this but for now I'm adding one.
-            tInput.m_pVariable = nullptr;
-        }
-
-        // Move constructor: needed to use CreateScopedVariable, and transfers ownership.
-        TScopedVariableValue(TScopedVariableValue&& tInput)
-        {
-            std::move(m_pVariable, tInput.m_tVariable);
-            std::move(m_tConstructValue, tInput.m_tConstructValue);
-            std::move(m_tDestructValue, tInput.m_tDestructtValue);
-        }
-
-        // Applies the scoping exit, if the variable is valid.
-        virtual ~TScopedVariableValue()
-        {
-            if (m_pVariable)
-            {
-                *m_pVariable = m_tDestructValue;
-            }
-        }
-
-        // Transfers ownership, if not self assignment.
-        TScopedVariableValue& operator=(TScopedVariableValue& tInput)
-        {
-            // I'm not sure if this makes sense to exist... but for now I'm adding one.
-            if (this != &tInput)
-            {
-                m_pVariable = tInput.m_pVariable;
-                m_tConstructValue = tInput.m_tConstructValue;
-                m_tDestructValue = tInput.m_tDestructValue;
-                tInput.m_pVariable = nullptr;
-            }
-
-            return *this;
-        }
-
-    protected:
-        TType* m_pVariable;
-        TType m_tConstructValue;
-        TType m_tDestructValue;
-    };
-
-    // Helper function to create scoped variable.
-    // Ideal usage: auto tMyVariable=CreateScoped(tContainedVariable,tConstructValue,tDestructValue);
-    template<typename TType>
-    TScopedVariableValue<TType> CreateScopedVariableValue(TType& tVariable, const TType& tConstructValue, const TType& tDestructValue)
-    {
-        return TScopedVariableValue<TType>(tVariable, tConstructValue, tDestructValue);
-    }
-
-    class AzWarningAbsorber
-        : public AZ::Debug::TraceMessageBus::Handler
-    {
-    public:
-        SANDBOX_API AzWarningAbsorber(const char* window);
-        SANDBOX_API ~AzWarningAbsorber();
-
-        bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
-
-        AZStd::string m_window;
-    };
-
-    namespace LevelFile
-    {
-        //! Retrieve old cry level file extension (With prepending '.')
-        const char* GetOldCryFileExtension();
-        //! Retrieve default level file extension (With prepending '.')
-        const char* GetDefaultFileExtension();
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// XML Helper functions.
-//////////////////////////////////////////////////////////////////////////
-namespace XmlHelpers
-{
-    SANDBOX_API inline XmlNodeRef CreateXmlNode(const char* sTag)
-    {
-        return GetISystem()->CreateXmlNode(sTag);
-    }
-
-    inline bool SaveXmlNode(IFileUtil* pFileUtil, XmlNodeRef node, const char* filename)
-    {
-        if (!pFileUtil->OverwriteFile(filename))
-        {
-            return false;
-        }
-        return node->saveToFile(filename);
-    }
-
-    SANDBOX_API inline XmlNodeRef LoadXmlFromFile(const char* fileName)
-    {
-        return GetISystem()->LoadXmlFromFile(fileName);
-    }
-
-    SANDBOX_API inline XmlNodeRef LoadXmlFromBuffer(const char* buffer, size_t size, bool suppressWarnings = false)
-    {
-        return GetISystem()->LoadXmlFromBuffer(buffer, size, false, suppressWarnings);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////
-// Drag Drop helper functions
-//////////////////////////////////////////////////////////////////////////
-namespace EditorDragDropHelpers
-{
-    inline QString GetAnimationNameClipboardFormat()
-    {
-        return QStringLiteral("application/x-animation-browser-copy");
-    }
-
-    inline QString GetFragmentClipboardFormat()
-    {
-        return QStringLiteral("application/x-preview-fragment-properties");
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-/*!
- * StdMap Wraps std::map to provide easier to use interface.
- */
-template <class Key, class Value>
-struct StdMap
-{
-private:
-    typedef std::map<Key, Value> Map;
-    Map m;
-
-public:
-    typedef typename Map::iterator Iterator;
-    typedef typename Map::const_iterator ConstIterator;
-
-    void    Insert(const Key& key, const Value& value) { m[key] = value; }
-    int     GetCount() const { return m.size(); };
-    bool    IsEmpty() const { return m.empty(); };
-    void    Clear() { m.clear(); }
-    int     Erase(const Key& key) { return m.erase(key); };
-    Value& operator[](const Key& key) { return m[key]; };
-    bool Find(const Key& key, Value& value) const
-    {
-        ConstIterator it = m.find(key);
-        if (it == m.end())
-        {
-            return false;
-        }
-        value = it->second;
-        return true;
-    }
-    Iterator Find(const Key& key) { return m.find(key); }
-    ConstIterator Find(const Key& key) const { return m.find(key); }
-
-    bool FindKeyByValue(const Value& value, Key& key) const
-    {
-        for (ConstIterator it = m.begin(); it != m.end(); ++it)
-        {
-            if (it->second == value)
-            {
-                key = it->first;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    Iterator Begin() { return m.begin(); };
-    Iterator End() { return m.end(); };
-    ConstIterator Begin() const { return m.begin(); };
-    ConstIterator End() const { return m.end(); };
-
-    void    GetAsVector(std::vector<Value>& array) const
-    {
-        array.resize(m.size());
-        int i = 0;
-        for (ConstIterator it = m.begin(); it != m.end(); ++it)
-        {
-            array[i++] = it->second;
-        }
-    }
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Convert String representation of color to RGB integer value.
-//
-//////////////////////////////////////////////////////////////////////////
-inline QColor String2Color(const QString& val)
-{
-    unsigned int r = 0, g = 0, b = 0;
-    int res = 0;
-    res = azsscanf(val.toUtf8().data(), "R:%d,G:%d,B:%d", &r, &g, &b);
-    if (res != 3)
-    {
-        res = azsscanf(val.toUtf8().data(), "R:%d G:%d B:%d", &r, &g, &b);
-    }
-    if (res != 3)
-    {
-        res = azsscanf(val.toUtf8().data(), "%d,%d,%d", &r, &g, &b);
-    }
-    if (res != 3)
-    {
-        res = azsscanf(val.toUtf8().data(), "%d %d %d", &r, &g, &b);
-    }
-    if (res != 3)
-    {
-        azsscanf(val.toUtf8().data(), "%x", &r);
-        return r;
-    }
-
-    return QColor(r, g, b);
-}
-
-// Converts QColor to Vector.
-inline Vec3 Rgb2Vec(const QColor& color)
-{
-    return Vec3(aznumeric_cast<float>(color.redF()), aznumeric_cast<float>(color.greenF()), aznumeric_cast<float>(color.blueF()));
-}
-
-// Converts QColor to ColorF.
-inline ColorF Rgb2ColorF(const QColor& color)
-{
-    return ColorF(aznumeric_cast<float>(color.redF()), aznumeric_cast<float>(color.greenF()), aznumeric_cast<float>(color.blueF()), 1.0f);
-}
-
-// Converts QColor to Vector.
-inline QColor Vec2Rgb(const Vec3& color)
-{
-    return QColor(aznumeric_cast<int>(color.x * 255), aznumeric_cast<int>(color.y * 255), aznumeric_cast<int>(color.z * 255));
-}
-
-// Converts ColorF to QColor.
-inline QColor ColorF2Rgb(const ColorF& color)
-{
-    return QColor(aznumeric_cast<int>(color.r * 255), aznumeric_cast<int>(color.g * 255), aznumeric_cast<int>(color.b * 255));
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Tokenize string.
-//////////////////////////////////////////////////////////////////////////
-inline QString TokenizeString(const QString& s, LPCSTR pszTokens, int& iStart)
-{
-    assert(iStart >= 0);
-
-    QByteArray str = s.toUtf8();
-
-    if (pszTokens == NULL)
-    {
-        return str;
-    }
-
-    auto pszPlace = str.begin() + iStart;
-    auto pszEnd = str.end();
-    if (pszPlace < pszEnd)
-    {
-        int nIncluding = (int)strspn(pszPlace, pszTokens);
-        ;
-
-        if ((pszPlace + nIncluding) < pszEnd)
-        {
-            pszPlace += nIncluding;
-            int nExcluding = (int)strcspn(pszPlace, pszTokens);
-
-            int iFrom = iStart + nIncluding;
-            int nUntil = nExcluding;
-            iStart = iFrom + nUntil + 1;
-
-            return (str.mid(iFrom, nUntil));
-        }
-    }
-
-    // return empty string, done tokenizing
-    iStart = -1;
-    return "";
-}
-
-// This template function will join strings from a vector into a single string, using a separator char
-template<class T>
-inline void JoinStrings(const QList<T>& rStrings, QString& rDestStr, char aSeparator = ',')
-{
-    for (size_t i = 0, iCount = rStrings.size(); i < iCount; ++i)
-    {
-        rDestStr += rStrings[i];
-
-        if (i < iCount - 1)
-        {
-            rDestStr += aSeparator;
-        }
-    }
-}
-
-// This function will split a string containing separated strings, into a vector of strings
-// better version of TokenizeString
-inline void SplitString(const QString& rSrcStr, QStringList& rDestStrings, char aSeparator = ',')
-{
-    int crtPos = 0, lastPos = 0;
-
-    while (true)
-    {
-        crtPos = rSrcStr.indexOf(aSeparator, lastPos);
-
-        if (-1 == crtPos)
-        {
-            crtPos = rSrcStr.length();
-
-            if (crtPos != lastPos)
-            {
-                rDestStrings.push_back(rSrcStr.mid(lastPos, crtPos - lastPos));
-            }
-
-            break;
-        }
-        else
-        {
-            if (crtPos != lastPos)
-            {
-                rDestStrings.push_back(rSrcStr.mid(lastPos, crtPos - lastPos));
-            }
-        }
-
-        lastPos = crtPos + 1;
-    }
-}
-
-// Format unsigned number to string with 1000s separator
-inline QString FormatWithThousandsSeperator(const unsigned int number)
-{
-    QString string;
-
-    string = QString::number(number);
-
-    for (int p = string.length() - 3; p > 0; p -= 3)
-    {
-        string.insert(p, ',');
-    }
-
-    return string;
-}
-
-
-void FormatFloatForUI(QString& str, int significantDigits, double value);
-
-//////////////////////////////////////////////////////////////////////////
-// Simply sub string searching case insensitive.
-//////////////////////////////////////////////////////////////////////////
-inline const char* strstri(const char* pString, const char* pSubstring)
-{
-    int i, j, k;
-    for (i = 0; pString[i]; i++)
-    {
-        for (j = i, k = 0; tolower(pString[j]) == tolower(pSubstring[k]); j++, k++)
-        {
-            if (!pSubstring[k + 1])
-            {
-                return (pString + i);
-            }
-        }
-    }
-
-    return NULL;
-}
-
-
-inline bool CheckVirtualKey(Qt::MouseButton button)
-{
-    return (qApp->property("pressedMouseButtons").toInt() & button) != 0;
-}
-inline bool CheckVirtualKey(Qt::Key virtualKey)
-{
-    return qApp->property("pressedKeys").value<QSet<int>>().contains(virtualKey);
-}
-
-class QColor;
-QColor ColorLinearToGamma(ColorF col);
-ColorF ColorGammaToLinear(const QColor& col);
-
-QColor ColorToQColor(uint32 color);
-
-class QCursor;
-class QPixmap;
-
-template<typename T>
-class QVector;
-
-/*! Collection of Utility MFC functions.
-*/
-struct CMFCUtils
-{
-    static QCursor LoadCursor(unsigned int nIDResource, int hotX = -1, int hotY = -1);
-};
-
-#ifndef _AFX
-class CArchive : public QDataStream
-{
-public:
-    enum Mode
-    {
-        load,
-        store
-    };
-
-    CArchive(QIODevice* device, Mode mode)
-        : QDataStream(device)
-        , m_mode(mode)
-    {
-        setByteOrder(LittleEndian);
-    }
-
-    bool IsLoading() const
-    {
-        return m_mode == load;
-    }
-
-    bool IsStoring() const
-    {
-        return m_mode == store;
-    }
-
-    uint Read(void* buffer, uint size)
-    {
-        QDataStream::readRawData(reinterpret_cast<char*>(buffer), size);
-        return size;
-    }
-
-    uint Write(void* buffer, uint size)
-    {
-        // There is a bug in QT with writing files larger than 32MB. It separates
-        // the write into 32MB blocks, but doesn't write the last block correctly.
-        // To deal with this, we'll separate into blocks here so QT doesn't have to.
-        
-        // QT bug in qfileengine_win.cpp line 434. Block size is calculated once and always
-        // used as the amount of data to write, but for the last block, unless there is exactly
-        // block size left to write, the actual remaining amount needs to be written, not the
-        // whole block size. This will cause WriteFile() to either write garbage to the file or
-        // attempt to get into memory it doesn't have access to.
-
-        const uint blockSize = 1024 * 1024 * 32; // This is the size QT uses for blocks.
-        uint totalBytesLeftToWrite = size;
-        uint totalBytesWritten = 0;
-
-        while (totalBytesLeftToWrite > 0)
-        {
-            uint bytesToWrite = AZ::GetMin(blockSize, totalBytesLeftToWrite);
-            uint bytesWritten = QDataStream::writeRawData(reinterpret_cast<char*>(buffer) + totalBytesWritten, bytesToWrite);
-
-            totalBytesLeftToWrite -= bytesWritten;
-            totalBytesWritten += bytesWritten;
-
-            // If something goes wrong, stop.
-            if (bytesWritten != bytesToWrite)
-            {
-                break;
-            }
-
-        }
-        return totalBytesWritten;
-    }
-
-private:
-    Mode m_mode;
-};
-
-inline quint64 readStringLength(CArchive& ar, int& charSize)
-{
-    // This is legacy MFC converted code. It used to use AfxReadStringLength() which has a complicated
-    // decoding pattern.
-    // The basic algorithm is that it reads in an 8 bit int, and if the length is less than 2^8,
-    // then that's the length. Next it reads in a 16 bit int, and if the length is less than 2^16,
-    // then that's the length. It does the same thing for 32 bit values and finally for 64 bit values.
-    // The 16 bit length also indicates whether or not it's a UCS2 / wide-char Windows string, if it's
-    // 0xfffe, but that comes after the first byte marker indicating there's a 16 bit length value.
-    // So, if the first 3 bytes are: 0xFF, 0xFF, 0xFE, it's a 2 byte string being read in, and the real
-    // length follows those 3 bytes (which may still be an 8, 16, or 32 bit length).
-
-    // default to one byte strings
-    charSize = 1;
-
-    quint8 len8;
-    ar >> len8;
-    if (len8 < 0xff)
-    {
-        return len8;
-    }
-
-    quint16 len16;
-    ar >> len16;
-    if (len16 == 0xfffe)
-    {
-        charSize = 2;
-
-        ar >> len8;
-        if (len8 < 0xff)
-        {
-            return len8;
-        }
-
-        ar >> len16;
-    }
-
-    if (len16 < 0xffff)
-    {
-        return len16;
-    }
-
-    quint32 len32;
-    ar >> len32;
-
-    if (len32 < 0xffffffff)
-    {
-        return len32;
-    }
-
-    quint64 len64;
-    ar >> len64;
-
-    return len64;
-}
-
-inline CArchive& operator>>(CArchive& ar, QString& str)
-{
-    int charSize = 1;
-    auto length = readStringLength(ar, charSize);
-    QByteArray data = ar.device()->read(length * charSize);
-
-    if (charSize == 1)
-    {
-        str = QString::fromUtf8(data);
-    }
-    else
-    {
-        char* raw = data.data();
-
-        // check if it's short aligned; if it isn't, we need to copy to a temp buffer
-        if ((reinterpret_cast<uintptr_t>(raw) & 1) != 0)
-        {
-            ushort* shortAlignedData = new ushort[length];
-            memcpy(shortAlignedData, raw, length * 2);
-            str = QString::fromUtf16(shortAlignedData, aznumeric_cast<int>(length));
-            delete[] shortAlignedData;
-        }
-        else
-        {
-            str = QString::fromUtf16(reinterpret_cast<ushort*>(raw), aznumeric_cast<int>(length));
-        }
-    }
-    
-    return ar;
-}
-
-inline CArchive& operator<<(CArchive& ar, const QString& str)
-{
-    // This is written to mimic how MFC archiving worked, which was to
-    // write markers to indicate the size of the length - 
-    // so a length that will fit into 8 bits takes 8 bits.
-    // A length that requires more than 8 bits, puts an 8 bit marker (0xff)
-    // to indicate that the length is greater, then 16 bits for the length.
-    // If the length requires 32 bits, there's an 8 bit marker (0xff), a
-    // 16 bit marker (0xffff) and then the 32 bit length.
-    // Note that the legacy code could also encode to 16 bit Windows wide character
-    // streams; that isn't necessary though, given that Qt supports Utf-8 out of the
-    // box and is much less ambiguous on other platforms.
-
-    QByteArray data = str.toUtf8();
-    int length = data.length();
-
-    if (length < 255)
-    {
-        ar << static_cast<quint8>(length);
-    }
-    else if (length < 0xfffe) // 0xfffe instead of 0xffff because 0xfffe indicated Windows wide character strings, which we aren't bothering with anymore
-    {
-        ar << static_cast<quint8>(0xff);
-        ar << static_cast<quint16>(length);
-    }
-    else
-    {
-        ar << static_cast<quint8>(0xff);
-        ar << static_cast<quint16>(0xffff);
-        ar << static_cast<quint32>(length);
-    }
-   
-    ar.device()->write(data);
-
-    return ar;
-}
-
-#endif
-
-#endif // CRYINCLUDE_EDITOR_UTIL_EDITORUTILS_H
-
diff --git a/Code/Sandbox/Editor/Util/FileChangeMonitor.cpp b/Code/Sandbox/Editor/Util/FileChangeMonitor.cpp
deleted file mode 100644
index cc37015eaa..0000000000
--- a/Code/Sandbox/Editor/Util/FileChangeMonitor.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "FileChangeMonitor.h"
-
-// Qt
-#include <QDateTime>
-#include <QTimer>
-
-
-CFileChangeMonitor* CFileChangeMonitor::s_pFileMonitorInstance = NULL;
-
-//////////////////////////////////////////////////////////////////////////
-CFileChangeMonitor::CFileChangeMonitor(QObject* parent)
-    : QObject(parent)
-{
-    ed_logFileChanges = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CFileChangeMonitor::~CFileChangeMonitor()
-{
-    for (TListeners::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        CFileChangeMonitorListener* pListener = *it;
-
-        if (pListener)
-        {
-            pListener->SetMonitor(NULL);
-        }
-    }
-
-    // Send to thread a kill event.
-    StopMonitor();
-}
-
-CFileChangeMonitor* CFileChangeMonitor::Instance()
-{
-    if (!s_pFileMonitorInstance)
-    {
-        s_pFileMonitorInstance = new CFileChangeMonitor();
-        s_pFileMonitorInstance->Initialize();
-    }
-
-    return s_pFileMonitorInstance;
-}
-
-void CFileChangeMonitor::DeleteInstance()
-{
-    SAFE_DELETE(s_pFileMonitorInstance);
-}
-
-void CFileChangeMonitor::Initialize()
-{
-    REGISTER_CVAR(ed_logFileChanges, 0, VF_NULL, "If its 1, then enable the logging of file monitor file changes");
-
-    m_watcher.reset(new QFileSystemWatcher);
-    connect(m_watcher.data(), &QFileSystemWatcher::fileChanged,
-            this, &CFileChangeMonitor::OnFileChange);
-    connect(m_watcher.data(), &QFileSystemWatcher::directoryChanged,
-            this, &CFileChangeMonitor::OnDirectoryChange);
-
-    AddIgnoreFileMask("*$tmp*");
-}
-
-bool CFileChangeMonitor::IsDirectory(const char* sFileName)
-{
-    QFileInfo finfo(sFileName);
-    return finfo.isDir();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileChangeMonitor::IsFile(const char* sFileName)
-{
-    QFileInfo finfo(sFileName);
-    return finfo.isFile();
-}
-
-void CFileChangeMonitor::AddIgnoreFileMask(const char* pMask)
-{
-    Log("Adding '%s' to ignore masks for changed files.", pMask);
-    m_ignoreMasks.append(QString::fromLatin1(pMask));
-}
-
-void CFileChangeMonitor::RemoveIgnoreFileMask(const char* pMask, int aAfterDelayMsec)
-{
-    QTimer::singleShot(aAfterDelayMsec, [=]() {
-        m_ignoreMasks.removeAll(QString::fromLatin1(pMask));
-    });
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileChangeMonitor::MonitorItem(const QString& sItem)
-{
-    QFileInfo finfo(sItem);
-
-    if (finfo.isDir())
-    {
-        QDir dir(sItem);
-        m_entries.insert(sItem, std::move(dir.entryInfoList(QDir::Files|QDir::Dirs|QDir::NoDotAndDotDot)));
-    }
-
-    return m_watcher->addPath(sItem);
-}
-
-void CFileChangeMonitor::StopMonitor()
-{
-    if (m_watcher)
-    {
-        disconnect(m_watcher.data(), &QFileSystemWatcher::fileChanged,
-                   this, &CFileChangeMonitor::OnFileChange);
-        disconnect(m_watcher.data(), &QFileSystemWatcher::directoryChanged,
-                   this, &CFileChangeMonitor::OnDirectoryChange);
-    }
-}
-
-void CFileChangeMonitor::SetEnabled(bool bEnable)
-{
-    m_watcher->blockSignals(!bEnable);
-}
-
-bool CFileChangeMonitor::IsEnabled()
-{
-    return !m_watcher->signalsBlocked();
-}
-
-void CFileChangeMonitor::Subscribe(CFileChangeMonitorListener* pListener)
-{
-    assert(pListener);
-    pListener->SetMonitor(this);
-    m_listeners.insert(pListener);
-}
-
-void CFileChangeMonitor::Unsubscribe(CFileChangeMonitorListener* pListener)
-{
-    assert(pListener);
-    m_listeners.erase(pListener);
-    pListener->SetMonitor(NULL);
-}
-
-void CFileChangeMonitor::OnDirectoryChange(const QString &path)
-{
-    QDir dir(path);
-
-    auto entries = dir.entryInfoList(QDir::Files|QDir::Dirs|QDir::NoDotAndDotDot);
-    const auto prev = m_entries.value(path);
-
-    for (const auto &fi : prev)
-    {
-        int eindex = entries.indexOf(fi);
-        if (eindex >= 0)
-        {
-            if (fi.lastModified() != entries.at(eindex).lastModified())
-            {
-                NotifyListeners(fi.canonicalFilePath(), SFileChangeInfo::eChangeType_Modified);
-            }
-        }
-        else
-        {
-            NotifyListeners(fi.canonicalFilePath(), SFileChangeInfo::eChangeType_Deleted);
-        }
-    }
-
-    for (const auto &fi : entries)
-    {
-        if (!prev.contains(fi))
-        {
-            NotifyListeners(fi.canonicalFilePath(), SFileChangeInfo::eChangeType_Created);
-        }
-    }
-
-    m_entries.insert(path, std::move(entries));
-
-    NotifyListeners(path, SFileChangeInfo::eChangeType_Modified);
-}
-
-void CFileChangeMonitor::OnFileChange(const QString &path)
-{
-    QFileInfo finfo(path);
-    NotifyListeners(path, finfo.exists() ? SFileChangeInfo::eChangeType_Modified : SFileChangeInfo::eChangeType_Deleted);
-}
-
-void CFileChangeMonitor::NotifyListeners(const QString &path, SFileChangeInfo::EChangeType changeType)
-{
-    for (const auto &glob : m_ignoreMasks)
-    {
-        QRegExp exp(glob, Qt::CaseInsensitive, QRegExp::Wildcard);
-        if (path.contains(exp))
-        {
-            return; // mask matches, ignore event
-        }
-    }
-
-    SFileChangeInfo change;
-    change.filename = path;
-    change.changeType = changeType;
-
-    for (auto it = m_listeners.begin(); it != m_listeners.end(); ++it)
-    {
-        CFileChangeMonitorListener* pListener = *it;
-
-        if (pListener)
-        {
-            pListener->OnFileMonitorChange(change);
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/FileChangeMonitor.h b/Code/Sandbox/Editor/Util/FileChangeMonitor.h
deleted file mode 100644
index aa5155ac9d..0000000000
--- a/Code/Sandbox/Editor/Util/FileChangeMonitor.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_FILECHANGEMONITOR_H
-#define CRYINCLUDE_EDITOR_UTIL_FILECHANGEMONITOR_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/std/containers/set.h>
-
-#include <QFileInfoList>
-#include <QFileSystemWatcher>
-
-#include <QObject>
-#include <QQueue>
-#include <QScopedPointer>
-#endif
-
-class CFileChangeMonitorListener;
-
-struct SFileChangeInfo
-{
-    enum EChangeType
-    {
-        //! error or unknown change type
-        eChangeType_Unknown,
-        //! the file was created
-        eChangeType_Created,
-        //! the file was deleted
-        eChangeType_Deleted,
-        //! the file was modified (size changed,write)
-        eChangeType_Modified,
-        //! this is the old name of a renamed file
-        eChangeType_RenamedOldName,
-        //! this is the new name of a renamed file
-        eChangeType_RenamedNewName
-    };
-
-    SFileChangeInfo()
-        : changeType(eChangeType_Unknown)
-    {
-    }
-
-    bool operator==(const SFileChangeInfo& rhs) const
-    {
-        return changeType == rhs.changeType && filename == rhs.filename;
-    }
-
-    QString filename;
-    EChangeType changeType;
-};
-
-// Monitors directory for any changed files
-class CFileChangeMonitor : public QObject
-{
-public:
-    friend class CEditorFileMonitor;
-    typedef AZStd::set<CFileChangeMonitorListener*> TListeners;
-
-protected:
-    explicit CFileChangeMonitor(QObject* parent = nullptr);
-    ~CFileChangeMonitor();
-
-    void Initialize();
-    static void DeleteInstance();
-
-    static CFileChangeMonitor* s_pFileMonitorInstance;
-
-public:
-
-    static CFileChangeMonitor* Instance();
-
-    bool MonitorItem(const QString& sItem);
-    void StopMonitor();
-    void SetEnabled(bool bEnable);
-    bool IsEnabled();
-    //! get next modified file, this file will be delete from list after calling this function,
-    //! call it until HaveModifiedFiles return true or this function returns false
-    void Subscribe(CFileChangeMonitorListener* pListener);
-    void Unsubscribe(CFileChangeMonitorListener* pListener);
-    bool IsDirectory(const char* pFilename);
-    bool IsFile(const char* pFilename);
-    bool IsLoggingChanges() const
-    {
-        return ed_logFileChanges != 0;
-    }
-    void AddIgnoreFileMask(const char* pMask);
-    void RemoveIgnoreFileMask(const char* pMask, int aAfterDelayMsec = 1000);
-
-private:
-    void OnDirectoryChange(const QString &path);
-    void OnFileChange(const QString &path);
-    void NotifyListeners(const QString &path, SFileChangeInfo::EChangeType changeType);
-
-    int ed_logFileChanges;
-    QScopedPointer<QFileSystemWatcher> m_watcher;
-    TListeners m_listeners;
-    QQueue<SFileChangeInfo> m_changes;
-    QStringList m_ignoreMasks;
-    QHash<QString, QFileInfoList> m_entries;
-};
-
-// Used as base class (aka interface) to subscribe for file change events
-class CFileChangeMonitorListener
-{
-public:
-    CFileChangeMonitorListener()
-        : m_pMonitor(NULL)
-    {
-    }
-
-    virtual ~CFileChangeMonitorListener()
-    {
-        if (m_pMonitor)
-        {
-            m_pMonitor->Unsubscribe(this);
-        }
-    }
-
-    virtual void OnFileMonitorChange(const SFileChangeInfo& rChange) = 0;
-
-    void SetMonitor(CFileChangeMonitor* pMonitor)
-    {
-        m_pMonitor = pMonitor;
-    }
-
-private:
-    CFileChangeMonitor* m_pMonitor;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_FILECHANGEMONITOR_H
diff --git a/Code/Sandbox/Editor/Util/FileEnum.cpp b/Code/Sandbox/Editor/Util/FileEnum.cpp
deleted file mode 100644
index 89e6c9448c..0000000000
--- a/Code/Sandbox/Editor/Util/FileEnum.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "FileEnum.h"
-
-CFileEnum::CFileEnum()
-    : m_hEnumFile(0)
-{
-}
-
-CFileEnum::~CFileEnum()
-{
-    if (m_hEnumFile)
-    {
-        delete m_hEnumFile;
-        m_hEnumFile = 0;
-    }
-}
-
-bool CFileEnum::StartEnumeration(
-    const QString& szEnumPath,
-    const QString& szEnumPattern,
-    QFileInfo* pFile)
-{
-    //////////////////////////////////////////////////////////////////////
-    // Take path and search pattern as separate arguments
-    //////////////////////////////////////////////////////////////////////
-
-    // Build enumeration path
-    QString szPath = szEnumPath;
-
-    if (!szPath.endsWith('\\') && !szPath.endsWith('/'))
-    {
-        szPath += QDir::separator();
-    }
-
-    szPath += szEnumPattern;
-
-    return StartEnumeration(szPath, pFile);
-}
-
-bool CFileEnum::StartEnumeration(const QString& szEnumPathAndPattern, QFileInfo* pFile)
-{
-    // End any previous enumeration
-    if (m_hEnumFile)
-    {
-        delete m_hEnumFile;
-        m_hEnumFile = 0;
-    }
-
-    QStringList parts = szEnumPathAndPattern.split(QRegularExpression(R"([\\/])"));
-    QString pattern = parts.takeLast();
-    QString path = parts.join(QDir::separator());
-
-    // Start the enumeration
-    m_hEnumFile = new QDirIterator(path, QStringList(pattern));
-    if (!m_hEnumFile->hasNext())
-    {
-        // No files found
-        delete m_hEnumFile;
-        m_hEnumFile = 0;
-
-        return false;
-    }
-
-    m_hEnumFile->next();
-    *pFile = m_hEnumFile->fileInfo();
-
-    return true;
-}
-
-bool CFileEnum::GetNextFile(QFileInfo* pFile)
-{
-    // Fill file strcuture
-    if (!m_hEnumFile->hasNext())
-    {
-        // No more files left
-        delete m_hEnumFile;
-        m_hEnumFile = 0;
-
-        return false;
-    }
-
-    m_hEnumFile->next();
-    *pFile = m_hEnumFile->fileInfo();
-
-    // At least one file left
-    return true;
-}
-
-inline bool ScanDirectoryRecursive(
-    const QString& root,
-    const QString& path,
-    const QString& file,
-    QStringList& files,
-    bool bRecursive)
-{
-    bool bFoundAny = false;
-
-    QDirIterator hFile(root + path, QStringList(file));
-
-    if (hFile.hasNext())
-    {
-
-        // Find the rest of the files.
-        do
-        {
-            hFile.next();
-            QFileInfo foundFile = hFile.fileInfo();
-
-            bFoundAny = true;
-            files.push_back(path + foundFile.fileName());
-        }   while (hFile.hasNext());
-    }
-
-    if (bRecursive)
-    {
-        QDirIterator hFile2(root + path, QStringList("*.*"));
-
-        if (hFile2.hasNext())
-        {
-            // Find directories.
-            do
-            {
-                hFile2.next();
-                QFileInfo foundFile = hFile2.fileInfo();
-
-                if (foundFile.isDir())
-                {
-                    // If recursive.
-                    if (!foundFile.fileName().startsWith('.'))
-                    {
-                        if (ScanDirectoryRecursive(
-                                root,
-                                path + foundFile.fileName() + QDir::separator(),
-                                file,
-                                files,
-                                bRecursive))
-                        {
-                            bFoundAny = true;
-                        }
-                    }
-                }
-            }   while (hFile2.hasNext());
-        }
-    }
-
-    return bFoundAny;
-}
-
-bool CFileEnum::ScanDirectory(
-    const QString& path,
-    const QString& file,
-    QStringList& files,
-    bool bRecursive,
-    bool /* bSkipPaks - unused, left for backwards API compatibility */)
-{
-    return ScanDirectoryRecursive(path, "", file, files, bRecursive);
-}
diff --git a/Code/Sandbox/Editor/Util/FileEnum.h b/Code/Sandbox/Editor/Util/FileEnum.h
deleted file mode 100644
index bc356b031f..0000000000
--- a/Code/Sandbox/Editor/Util/FileEnum.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_FILEENUM_H
-#define CRYINCLUDE_EDITOR_UTIL_FILEENUM_H
-#pragma once
-
-#include <QDirIterator>
-
-class QFileInfo;
-class QString;
-class QStringList;
-
-class CFileEnum
-{
-public:
-    CFileEnum();
-    virtual ~CFileEnum();
-    bool GetNextFile(QFileInfo* pFile);
-    bool StartEnumeration(const QString& szEnumPathAndPattern, QFileInfo* pFile);
-    bool StartEnumeration(const QString& szEnumPath, const QString& szEnumPattern, QFileInfo* pFile);
-    static bool ScanDirectory(
-        const QString& path,
-        const QString& file,
-        QStringList& files,
-        bool bRecursive = true,
-        bool bSkipPaks = false);
-
-protected:
-    QDirIterator* m_hEnumFile;
-};
-#endif // CRYINCLUDE_EDITOR_UTIL_FILEENUM_H
diff --git a/Code/Sandbox/Editor/Util/FileUtil.cpp b/Code/Sandbox/Editor/Util/FileUtil.cpp
deleted file mode 100644
index ecd71f9865..0000000000
--- a/Code/Sandbox/Editor/Util/FileUtil.cpp
+++ /dev/null
@@ -1,2371 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "FileUtil.h"
-
-// Qt
-#include <QMenu>
-#include <QMessageBox>
-#include <QApplication>
-#include <QClipboard>
-#include <QDesktopServices>
-#include <QProcess>
-#include <QThread>
-
-// AzCore
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-
-// AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
-
-// AzQtComponents
-#include <AzQtComponents/Utilities/DesktopUtilities.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <AzToolsFramework/UI/UICore/ProgressShield.hxx>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <AzToolsFramework/Thumbnails/SourceControlThumbnailBus.h>
-
-// Editor
-#include "Settings.h"
-#include "MainWindow.h"
-#include "CheckOutDialog.h"
-#include "ISourceControl.h"
-#include "Dialogs/Generic/UserOptions.h"
-#include "IAssetItem.h"
-#include "IAssetItemDatabase.h"
-#include "Include/IObjectManager.h"
-#include "UsedResources.h"
-#include "Objects/BaseObject.h"
-#include "StringHelpers.h"
-#include "AutoDirectoryRestoreFileDialog.h"
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#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 };
-
-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)
-{
-    CCryFile cryfile;
-    if (cryfile.Open(file.toUtf8().data(), "rb"))
-    {
-        // Check if in pack.
-        if (cryfile.IsInPak())
-        {
-            const char* sPakName = cryfile.GetPakPath();
-
-            if (bMsgBoxAskForExtraction)
-            {
-                // Cannot edit file in pack, suggest to extract it for editing.
-                if (QMessageBox::critical(QApplication::activeWindow(), QString(), QObject::tr("File %1 is inside a PAK file %2\r\nDo you want it to be extracted for editing ?").arg(file, sPakName), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
-                {
-                    return false;
-                }
-            }
-
-            if (pDestinationFilename)
-            {
-                file = pDestinationFilename;
-            }
-
-            CFileUtil::CreatePath(Path::GetPath(file));
-
-            // Extract it from Pak file.
-            QFile diskFile(file);
-
-            if (diskFile.open(QFile::WriteOnly))
-            {
-                // Copy data from packed file to disk file.
-                char* data = new char[cryfile.GetLength()];
-                cryfile.ReadRaw(data, cryfile.GetLength());
-                diskFile.write(data, cryfile.GetLength());
-                delete []data;
-            }
-            else
-            {
-                Warning("Failed to create file %s on disk", file.toUtf8().data());
-            }
-        }
-        else
-        {
-            file = cryfile.GetAdjustedFilename();
-        }
-
-        return true;
-    }
-
-    return false;
-}
-//////////////////////////////////////////////////////////////////////////
-void CFileUtil::EditTextFile(const char* txtFile, int line, IFileUtil::ETextFileType fileType)
-{
-    QString file = txtFile;
-
-    QString fullPathName =  Path::GamePathToFullPath(file);
-    ExtractFile(fullPathName);
-    QString cmd(fullPathName);
-#if defined (AZ_PLATFORM_WINDOWS)
-    cmd.replace('/', '\\');
-    if (line != 0)
-    {
-        cmd = QStringLiteral("%1/%2/0").arg(cmd).arg(line);
-    }
-#endif
-
-    QString TextEditor = gSettings.textEditorForScript;
-    if (fileType == IFileUtil::FILE_TYPE_SHADER)
-    {
-        TextEditor = gSettings.textEditorForShaders;
-    }
-    else if (fileType == IFileUtil::FILE_TYPE_BSPACE)
-    {
-        TextEditor = gSettings.textEditorForBspaces;
-    }
-
-    // attempt to open it with the text editor from the preferences.
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    // 'open' already detaches, so dont use startDetach, otherwise we can't see the exit code
-    if (QProcess::execute(QStringLiteral("open"), { QStringLiteral("-a"), TextEditor, fullPathName }) != 0)
-#else
-    if (!QProcess::startDetached(TextEditor, { cmd }))
-#endif
-    {
-        // allow the user to opt for notepad, but also tell them about the preferences panel
-
-        if (QMessageBox::question(QApplication::activeWindow(), QString(), QObject::tr("Can't open the file. You can specify a text editor in the Preferences dialog.  Do you want to open the file in the default platform editor?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
-        {
-            QDesktopServices::openUrl(QUrl::fromLocalFile(fullPathName));
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CFileUtil::EditTextureFile(const char* textureFile, [[maybe_unused]] bool bUseGameFolder)
-{
-    using namespace AzToolsFramework;
-    using namespace AzToolsFramework::AssetSystem;
-
-    AZStd::string fullTexturePath;
-    bool fullTexturePathFound = false;
-    AZStd::string relativePath = textureFile;
-
-    // First check if we have been given an empty path
-    QString warningTitle = QObject::tr("Cannot open file!");
-    if (relativePath.empty())
-    {
-        QString messageString = QObject::tr("Texture path is empty. You need to assign a texture first.");
-        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), warningTitle, messageString);
-        return;
-    }
-
-    AssetSystemRequestBus::BroadcastResult(fullTexturePathFound, &AssetSystemRequest::GetFullSourcePathFromRelativeProductPath, relativePath, fullTexturePath);
-    if (!fullTexturePathFound)
-    {
-        QString messageString = QObject::tr("Failed to find absolute path to %1 - could not open texture editor.").arg(textureFile);
-        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), warningTitle, messageString);
-        return;
-    }
-
-    bool failedToLaunch = true;
-    QByteArray textureEditorPath = gSettings.textureEditor.toUtf8();
-
-    // Give the user a warning if they don't have a texture editor configured
-    if (textureEditorPath.isEmpty())
-    {
-        QString messageString = QObject::tr("No texture editor has been configured.\nYou need to configure one by going to Edit > Editor Settings > Global Preferences in the menu bar and then configure the 'External Editors > Texture Editor'.");
-        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), warningTitle, messageString);
-        return;
-    }
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    // Use the Win32 API calls to open the right editor; the OS knows how to do this even better than
-    // Qt does.
-    QString fullTexturePathFixedForWindows = QString(fullTexturePath.data()).replace('/', '\\');
-    QByteArray fullTexturePathFixedForWindowsUtf8 = fullTexturePathFixedForWindows.toUtf8();
-    HINSTANCE hInst = ShellExecute(NULL, "open", textureEditorPath.data(), fullTexturePathFixedForWindowsUtf8.data(), NULL, SW_SHOWNORMAL);
-    failedToLaunch = ((DWORD_PTR)hInst <= 32);
-#elif defined(AZ_PLATFORM_MAC)
-    failedToLaunch = QProcess::execute(QString("/usr/bin/open"), {"-a", gSettings.textureEditor, QString(fullTexturePath.data()) }) != 0;
-#else
-    failedToLaunch = !QProcess::startDetached(gSettings.textureEditor, { QString(fullTexturePath.data()) });
-#endif
-
-    if (failedToLaunch)
-    {
-        //failed
-        QString messageString = QObject::tr("Failed to open %1 with texture editor %2.").arg(fullTexturePath.data()).arg(textureEditorPath.data());
-        QMessageBox::warning(AzToolsFramework::GetActiveWindow(), warningTitle, messageString);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::EditMayaFile(const char* filepath, const bool bExtractFromPak, const bool bUseGameFolder)
-{
-    QString dosFilepath = QtUtil::ToQString(PathUtil::ToDosPath(filepath));
-    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());
-    }
-
-    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)
-{
-    if (ExtractDccFilenameFromAssetDatabase(assetFilename, dccFilename))
-    {
-        return true;
-    }
-
-    if (ExtractDccFilenameUsingNamingConventions(assetFilename, dccFilename))
-    {
-        return true;
-    }
-
-    GetIEditor()->GetEnv()->pLog->LogError("Failed to find psd file for texture: '%s'", assetFilename.toUtf8().data());
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::ExtractDccFilenameFromAssetDatabase(const QString& assetFilename, QString& dccFilename)
-{
-    IAssetItemDatabase* pCurrentDatabaseInterface = NULL;
-    std::vector<IClassDesc*> assetDatabasePlugins;
-    IEditorClassFactory* pClassFactory = GetIEditor()->GetClassFactory();
-    pClassFactory->GetClassesByCategory("Asset Item DB", assetDatabasePlugins);
-
-    for (size_t i = 0; i < assetDatabasePlugins.size(); ++i)
-    {
-        if (assetDatabasePlugins[i]->QueryInterface(__uuidof(IAssetItemDatabase), (void**)&pCurrentDatabaseInterface) == S_OK)
-        {
-            if (!pCurrentDatabaseInterface)
-            {
-                continue;
-            }
-
-            QString assetDatabaseDccFilename;
-            IAssetItem* pAssetItem = pCurrentDatabaseInterface->GetAsset(assetFilename.toUtf8().data());
-            if (pAssetItem)
-            {
-                if ((pAssetItem->GetFlags() & IAssetItem::eFlag_Cached))
-                {
-                    QVariant v = pAssetItem->GetAssetFieldValue("dccfilename");
-                    assetDatabaseDccFilename = v.toString();
-                    if (!v.isNull())
-                    {
-                        dccFilename = assetDatabaseDccFilename;
-                        dccFilename = Path::GetRelativePath(dccFilename, false);
-
-                        uint32 attr = CFileUtil::GetAttributes(dccFilename.toUtf8().data());
-
-                        if (CFileUtil::FileExists(dccFilename))
-                        {
-                            return true;
-                        }
-                        else if (GetIEditor()->IsSourceControlAvailable() && (attr & SCC_FILE_ATTRIBUTE_MANAGED))
-                        {
-                            return CFileUtil::GetLatestFromSourceControl(dccFilename.toUtf8().data());
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::ExtractDccFilenameUsingNamingConventions(const QString& assetFilename, QString& dccFilename)
-{
-    //else to try find it by naming conventions
-    QString tempStr = assetFilename;
-    int foundSplit = -1;
-    if ((foundSplit = tempStr.lastIndexOf('.')) > 0)
-    {
-        QString first = tempStr.mid(0, foundSplit);
-        tempStr = first + ".psd";
-    }
-    if (CFileUtil::FileExists(tempStr))
-    {
-        dccFilename = tempStr;
-        return true;
-    }
-
-    //else try to find it by replacing post fix _<description> with .psd
-    tempStr = assetFilename;
-    foundSplit = -1;
-    if ((foundSplit = tempStr.lastIndexOf('_')) > 0)
-    {
-        QString first = tempStr.mid(0, foundSplit);
-        tempStr = first + ".psd";
-    }
-    if (CFileUtil::FileExists(tempStr))
-    {
-        dccFilename = tempStr;
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CFileUtil::FormatFilterString(QString& filter)
-{
-    const int numPipeChars = std::count(filter.begin(), filter.end(), '|');
-    if (numPipeChars == 1)
-    {
-        filter = QStringLiteral("%1||").arg(filter);
-    }
-    else if (numPipeChars > 1)
-    {
-        assert(numPipeChars % 2 != 0);
-        if (!filter.contains("||"))
-        {
-            filter = QStringLiteral("%1||").arg(filter);
-        }
-    }
-    else if (!filter.isEmpty())
-    {
-        filter = QStringLiteral("%1|%2||").arg(filter, filter);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::SelectFile(const QString& fileSpec, const QString& searchFolder, QString& fullFileName)
-{
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, {}, searchFolder, fileSpec, {}, {}, cap);
-
-    if (dlg.exec())
-    {
-        fullFileName = dlg.selectedFiles().first();
-        return true;
-        /*
-        if (!fileName.IsEmpty())
-        {
-            relativeFileName = Path::GetRelativePath( fileName );
-            if (!relativeFileName.IsEmpty())
-            {
-                return true;
-            }
-            else
-            {
-                Warning( "You must select files from %s folder",(const char*)GetIEditor()->GetPrimaryCDFolder(); );
-            }
-        }
-        */
-    }
-
-    //  CSelectFileDlg cDialog;
-    //  bool res = cDialog.SelectFileName( &fileName,&relativeFileName,fileSpec,searchFolder );
-    return false;
-}
-
-bool CFileUtil::SelectFiles(const QString& fileSpec, const QString& searchFolder, QStringList& files)
-{
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::ExistingFiles, {}, searchFolder, fileSpec, {}, {}, cap);
-
-    if (dlg.exec())
-    {
-        const QStringList selected = dlg.selectedFiles();
-        foreach(const QString&file, selected)
-        {
-            files.push_back(file);
-        }
-    }
-
-    if (!files.empty())
-    {
-        return true;
-    }
-
-    return false;
-}
-
-bool CFileUtil::SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName)
-{
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptSave, {}, defaulExtension, startFolder, fileFilter, {}, {}, cap);
-
-    if (dlg.exec())
-    {
-        fileName = dlg.selectedFiles().first();
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Get directory contents.
-//////////////////////////////////////////////////////////////////////////
-inline bool ScanDirectoryFiles(const QString& root, const QString& path, const QString& fileSpec, IFileUtil::FileArray& files, bool bSkipPaks)
-{
-    bool anyFound = false;
-    QString dir = Path::AddPathSlash(root + path);
-
-    QString findFilter = Path::Make(dir, fileSpec);
-    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-
-    // Add all directories.
-
-    AZ::IO::ArchiveFileIterator fhandle = pIPak->FindFirst(findFilter.toUtf8().data());
-    if (fhandle)
-    {
-        do
-        {
-            // Skip back folders.
-            if (fhandle.m_filename.front() == '.')
-            {
-                continue;
-            }
-            if ((fhandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory) // skip sub directories.
-            {
-                continue;
-            }
-
-            if (bSkipPaks && (fhandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Archive) == AZ::IO::FileDesc::Attribute::Archive)
-            {
-                continue;
-            }
-
-            anyFound = true;
-
-            IFileUtil::FileDesc file;
-            file.filename = path + fhandle.m_filename.data();
-            file.attrib = static_cast<unsigned int>(fhandle.m_fileDesc.nAttrib);
-            file.size = fhandle.m_fileDesc.nSize;
-            file.time_access = fhandle.m_fileDesc.tAccess;
-            file.time_create = fhandle.m_fileDesc.tCreate;
-            file.time_write = fhandle.m_fileDesc.tWrite;
-
-            files.push_back(file);
-        } while (fhandle = pIPak->FindNext(fhandle));
-        pIPak->FindClose(fhandle);
-    }
-
-    /*
-    CFileFind finder;
-    BOOL bWorking = finder.FindFile( Path::Make(dir,fileSpec) );
-    while (bWorking)
-    {
-        bWorking = finder.FindNextFile();
-
-        if (finder.IsDots())
-            continue;
-
-        if (!finder.IsDirectory())
-        {
-            anyFound = true;
-
-            IFileUtil::FileDesc fd;
-            fd.filename = dir + finder.GetFileName();
-            fd.nFileSize = finder.GetLength();
-
-            finder.GetCreationTime( &fd.ftCreationTime );
-            finder.GetLastAccessTime( &fd.ftLastAccessTime );
-            finder.GetLastWriteTime( &fd.ftLastWriteTime );
-
-            fd.dwFileAttributes = 0;
-            if (finder.IsArchived())
-                fd.dwFileAttributes |= FILE_ATTRIBUTE_ARCHIVE;
-            if (finder.IsCompressed())
-                fd.dwFileAttributes |= FILE_ATTRIBUTE_COMPRESSED;
-            if (finder.IsNormal())
-                fd.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
-            if (finder.IsHidden())
-                fd.dwFileAttributes = FILE_ATTRIBUTE_HIDDEN;
-            if (finder.IsReadOnly())
-                fd.dwFileAttributes = FILE_ATTRIBUTE_READONLY;
-            if (finder.IsSystem())
-                fd.dwFileAttributes = FILE_ATTRIBUTE_SYSTEM;
-            if (finder.IsTemporary())
-                fd.dwFileAttributes = FILE_ATTRIBUTE_TEMPORARY;
-
-            files.push_back(fd);
-        }
-    }
-    */
-
-    return anyFound;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Get directory contents.
-//////////////////////////////////////////////////////////////////////////
-inline int ScanDirectoryRecursive(const QString& root, const QString& path, const QString& fileSpec, IFileUtil::FileArray& files, bool recursive, bool addDirAlso,
-    IFileUtil::ScanDirectoryUpdateCallBack updateCB, bool bSkipPaks)
-{
-    bool anyFound = false;
-    QString dir = Path::AddPathSlash(root + path);
-
-    if (updateCB)
-    {
-        QString msg = QObject::tr("Scanning %1...").arg(dir);
-        if (updateCB(msg) == false)
-        {
-            return -1;
-        }
-    }
-
-    if (ScanDirectoryFiles(root, Path::AddPathSlash(path), fileSpec, files, bSkipPaks))
-    {
-        anyFound = true;
-    }
-
-    if (recursive)
-    {
-        /*
-        CFileFind finder;
-        BOOL bWorking = finder.FindFile( Path::Make(dir,"*.*") );
-        while (bWorking)
-        {
-            bWorking = finder.FindNextFile();
-
-            if (finder.IsDots())
-                continue;
-
-            if (finder.IsDirectory())
-            {
-                // Scan directory.
-                if (ScanDirectoryRecursive( root,Path::AddBackslash(path+finder.GetFileName()),fileSpec,files,recursive ))
-                    anyFound = true;
-            }
-        }
-        */
-
-        auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-
-        // Add all directories.
-
-        AZ::IO::ArchiveFileIterator fhandle = pIPak->FindFirst(Path::Make(dir, "*").toUtf8().data());
-        if (fhandle)
-        {
-            do
-            {
-                // Skip back folders.
-                if (fhandle.m_filename.front() == '.')
-                {
-                    continue;
-                }
-
-                if ((fhandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) != AZ::IO::FileDesc::Attribute::Subdirectory) // skip not directories.
-                {
-                    continue;
-                }
-
-                if (bSkipPaks && (fhandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Archive) == AZ::IO::FileDesc::Attribute::Archive)
-                {
-                    continue;
-                }
-
-                if (addDirAlso)
-                {
-                    IFileUtil::FileDesc Dir;
-                    Dir.filename = path + QString::fromUtf8(fhandle.m_filename.data(), aznumeric_cast<int>(fhandle.m_filename.size()));
-                    Dir.attrib = static_cast<unsigned int>(fhandle.m_fileDesc.nAttrib);
-                    Dir.size = fhandle.m_fileDesc.nSize;
-                    Dir.time_access = fhandle.m_fileDesc.tAccess;
-                    Dir.time_create = fhandle.m_fileDesc.tCreate;
-                    Dir.time_write = fhandle.m_fileDesc.tWrite;
-                    files.push_back(Dir);
-                }
-
-                // Scan directory.
-                int result = ScanDirectoryRecursive(root, Path::AddPathSlash(path + fhandle.m_filename.data()), fileSpec, files, recursive, addDirAlso, updateCB, bSkipPaks);
-                if (result == -1)
-                // Cancel the scan immediately.
-                {
-                    pIPak->FindClose(fhandle);
-                    return -1;
-                }
-                else if (result == 1)
-                {
-                    anyFound = true;
-                }
-            } while (fhandle = pIPak->FindNext(fhandle));
-            pIPak->FindClose(fhandle);
-        }
-    }
-
-    return anyFound ? 1 : 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::ScanDirectory(const QString& path, const QString& file, IFileUtil::FileArray& files, bool recursive,
-    bool addDirAlso, IFileUtil::ScanDirectoryUpdateCallBack updateCB, bool bSkipPaks)
-{
-    QString fileSpec = Path::GetFile(file);
-    QString localPath = Path::GetPath(file);
-    return ScanDirectoryRecursive(Path::AddPathSlash(path), localPath, fileSpec, files, recursive, addDirAlso, updateCB, bSkipPaks) > 0;
-}
-
-void CFileUtil::ShowInExplorer([[maybe_unused]] const QString& path)
-{
-    AZStd::string assetRoot;
-    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
-    {
-        settingsRegistry->Get(assetRoot, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheRootFolder);
-    }
-
-    auto fullpath = QString::fromUtf8(assetRoot.c_str(), aznumeric_cast<int>(assetRoot.size()));
-    AzQtComponents::ShowFileOnDesktop(fullpath);
-}
-
-/*
-bool CFileUtil::ScanDirectory( const QString &startDirectory,const QString &searchPath,const QString &fileSpec,FileArray &files, bool recursive=true )
-{
-    return ScanDirectoryRecursive(startDirectory,SearchPath,file,files,recursive );
-}
-*/
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::OverwriteFile(const QString& filename)
-{
-    AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-    AZ_Assert(fileIO, "FileIO is not initialized.");
-
-    QString adjFileName = Path::GamePathToFullPath(filename);
-
-    AZStd::string filePath = adjFileName.toUtf8().data();
-    if (!fileIO->IsReadOnly(filePath.c_str()))
-    {
-        // if its already writable, we can just RequestEdit async and return immediately
-        // RequestEdit will mark it for "add" if it needs to be added.
-        using namespace AzToolsFramework;
-        SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestEdit, filePath.c_str(), true, [](bool, const SourceControlFileInfo&) {});
-        return true;
-    }
-
-    // Otherwise, show the checkout dialog
-    if (!CCheckOutDialog::IsForAll())
-    {
-        QtUtil::QtMFCScopedHWNDCapture cap;
-        CCheckOutDialog dlg(adjFileName, cap);
-        dlg.exec();
-    }
-
-    bool opSuccess = false;
-    switch (CCheckOutDialog::LastResult())
-    {
-    case CCheckOutDialog::CANCEL:
-        break;
-    case CCheckOutDialog::CHECKOUT:
-        opSuccess = CheckoutFile(filePath.c_str());
-        break;
-    case CCheckOutDialog::OVERWRITE:
-        opSuccess = AZ::IO::SystemFile::SetWritable(filePath.c_str(), true);
-        break;
-    default:
-        AZ_Assert(false, "Unsupported result returned from CCheckoutDialog");
-    }
-
-    return opSuccess;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void BlockAndWait(const bool& opComplete, QWidget* parent, const char* message)
-{
-    bool useProgressShield = false;
-    bool isGUIThread = false;
-    if (QApplication::instance()->thread() == QThread::currentThread())
-    {
-        isGUIThread = true;
-        if (!parent)
-        {
-            parent = QApplication::activeWindow() ? QApplication::activeWindow() : MainWindow::instance();
-        }
-
-        useProgressShield = parent ? true : false;
-    }
-
-    if (useProgressShield)
-    {
-        // ProgressShield will internally pump the Qt Event Pump and the AZ::TickBus.
-        AzToolsFramework::ProgressShield::LegacyShowAndWait(parent, parent->tr(message),
-            [&opComplete](int& current, int& max)
-            {
-                current = 0;
-                max = 0;
-                return opComplete;
-            },
-            500);
-    }
-    else
-    {
-        // either we are not on the main thread or we are not using the progress shield.
-        while (!opComplete)
-        {
-            // we can ONLY interact with the application event loop or the AZ::TickBus from the GUI thread.
-            if (isGUIThread)
-            {
-                // note that 16ms below is not the amount of time to wait, its the maximum time that
-                // processEvents is allowed to keep processing them if they just keep being emitted.
-                // adding a maximum time here means that we get an opportunity to pump the TickBus 
-                // periodically even during a flood of events.
-                QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 16);
-                AZ::TickBus::ExecuteQueuedEvents();
-            }
-            
-            // if we are not the main thread then the above will be done by the main thread, and we can just wait for it to happen.
-            // its fairly important we don't sleep for really long because this legacy code is often invoked in a blocking loop
-            // for many items, and in the worst case, any time we spend sleeping here will be added to each item.
-            AZStd::this_thread::yield();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::CheckoutFile(const char* filename, QWidget* parentWindow)
-{
-    using namespace AzToolsFramework;
-
-    bool scOpSuccess = false;
-    bool scOpComplete = false;
-    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestEdit, filename, true,
-        [&scOpSuccess, &scOpComplete, filename](bool success, const SourceControlFileInfo& /*info*/)
-        {
-            scOpSuccess = success;
-            scOpComplete = true;
-            Thumbnailer::SourceControlThumbnailRequestBus::Broadcast(&Thumbnailer::SourceControlThumbnailRequests::FileStatusChanged, filename);
-        }
-    );
-
-    BlockAndWait(scOpComplete, parentWindow, "Checking out for edit...");
-    return scOpSuccess;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::RevertFile(const char* filename, QWidget* parentWindow)
-{
-    using namespace AzToolsFramework;
-
-    bool scOpSuccess = false;
-    bool scOpComplete = false;
-    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestRevert, filename,
-        [&scOpSuccess, &scOpComplete, filename](bool success, const SourceControlFileInfo& /*info*/)
-        {
-            scOpSuccess = success;
-            scOpComplete = true;
-            Thumbnailer::SourceControlThumbnailRequestBus::Broadcast(&Thumbnailer::SourceControlThumbnailRequests::FileStatusChanged, filename);
-        }
-    );
-
-    BlockAndWait(scOpComplete, parentWindow, "Discarding Changes...");
-    return scOpSuccess;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow)
-{
-    using namespace AzToolsFramework;
-
-    bool scOpSuccess = false;
-    bool scOpComplete = false;
-    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestRename, sourceFile, targetFile,
-        [&scOpSuccess, &scOpComplete](bool success, const SourceControlFileInfo& /*info*/)
-        {
-            scOpSuccess = success;
-            scOpComplete = true;
-        }
-    );
-
-    BlockAndWait(scOpComplete, parentWindow, "Renaming file...");
-    return scOpSuccess;
-}
-
-bool  override;
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::DeleteFromSourceControl(const char* filename, QWidget* parentWindow)
-{
-    using namespace AzToolsFramework;
-
-    bool scOpSuccess = false;
-    bool scOpComplete = false;
-    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestDelete, filename,
-        [&scOpSuccess, &scOpComplete, filename](bool success, const SourceControlFileInfo& /*info*/)
-        {
-            scOpSuccess = success;
-            scOpComplete = true;
-            Thumbnailer::SourceControlThumbnailRequestBus::Broadcast(&Thumbnailer::SourceControlThumbnailRequests::FileStatusChanged, filename);
-        }
-    );
-
-    BlockAndWait(scOpComplete, parentWindow, "Marking for deletion...");
-    return scOpSuccess;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::GetLatestFromSourceControl(const char* filename, QWidget* parentWindow)
-{
-    using namespace AzToolsFramework;
-
-    bool scOpSuccess = false;
-    bool scOpComplete = false;
-    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestLatest, filename,
-        [&scOpSuccess, &scOpComplete, filename](bool success, const SourceControlFileInfo& /*info*/)
-        {
-            scOpSuccess = success;
-            scOpComplete = true;
-            Thumbnailer::SourceControlThumbnailRequestBus::Broadcast(&Thumbnailer::SourceControlThumbnailRequests::FileStatusChanged, filename);
-        }
-    );
-
-    BlockAndWait(scOpComplete, parentWindow, "Requesting latest verison of file...");
-    return scOpSuccess;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow)
-{
-    using namespace AzToolsFramework;
-
-    bool scOpSuccess = false;
-    bool scOpComplete = false;
-    SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::GetFileInfo, filename,
-        [&fileInfo, &scOpSuccess, &scOpComplete](bool success, const SourceControlFileInfo& info)
-        {
-            fileInfo = info;
-            scOpSuccess = success;
-            scOpComplete = true;
-        }
-    );
-
-    BlockAndWait(scOpComplete, parentWindow, "Getting file status...");
-    return scOpSuccess;
-}
-
-// Create new directory, check if directory already exist.
-static bool CheckAndCreateDirectory(const QString& path)
-{
-    // QFileInfo does not handle mixed separators (/ and \) gracefully, so cleaning up path
-    const QString cleanPath = QDir::cleanPath(path).replace('\\', '/');
-    QFileInfo fileInfo(cleanPath);
-    if (fileInfo.isDir())
-    {
-        return true;
-    }
-    else if (!fileInfo.exists())
-    {
-        return QDir().mkpath(cleanPath);
-    }
-    return false;
-}
-
-static bool MoveFileReplaceExisting(const QString& existingFileName, const QString& newFileName)
-{
-    bool moveSuccessful = false;
-
-    // Delete the new file if it already exists
-    QFile newFile(newFileName);
-    if (newFile.exists())
-    {
-        newFile.setPermissions(newFile.permissions() | QFile::ReadOther | QFile::WriteOther);
-        newFile.remove();
-    }
-
-    // Rename the existing file if it exists
-    QFile existingFile(existingFileName);
-    if (existingFile.exists())
-    {
-        existingFile.setPermissions(existingFile.permissions() | QFile::ReadOther | QFile::WriteOther);
-        moveSuccessful = existingFile.rename(newFileName);
-    }
-
-    return moveSuccessful;
-}
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::CreateDirectory(const char* directory)
-{
-    QString path = directory;
-    if (GetIEditor()->GetConsoleVar("ed_lowercasepaths"))
-    {
-        path = path.toLower();
-    }
-
-    return CheckAndCreateDirectory(path);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CFileUtil::BackupFile(const char* filename)
-{
-    // Make a backup of previous file.
-    bool makeBackup = true;
-
-    QString bakFilename = Path::ReplaceExtension(filename, "bak");
-
-    // Check if backup needed.
-    QFile bak(filename);
-    if (bak.open(QFile::ReadOnly))
-    {
-        if (bak.size() <= 0)
-        {
-            makeBackup = false;
-        }
-    }
-    else
-    {
-        makeBackup = false;
-    }
-    bak.close();
-
-    if (makeBackup)
-    {
-        QString bakFilename2 = Path::ReplaceExtension(bakFilename, "bak2");
-        MoveFileReplaceExisting(bakFilename, bakFilename2);
-        MoveFileReplaceExisting(filename, bakFilename);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CFileUtil::BackupFileDated(const char* filename, bool bUseBackupSubDirectory /*=false*/)
-{
-    bool makeBackup = true;
-    {
-        // Check if backup needed.
-        QFile bak(filename);
-        if (bak.open(QFile::ReadOnly))
-        {
-            if (bak.size() <= 0)
-            {
-                makeBackup = false;
-            }
-        }
-        else
-        {
-            makeBackup = false;
-        }
-    }
-
-    if (makeBackup)
-    {
-        // Generate new filename
-        time_t ltime;
-        time(&ltime);
-        tm today;
-#if AZ_TRAIT_USE_SECURE_CRT_FUNCTIONS
-        localtime_s(&today, &ltime);
-#else
-        today = *localtime(&ltime);
-#endif
-
-        char sTemp[128];
-        strftime(sTemp, sizeof(sTemp), ".%Y%m%d.%H%M%S.", &today);
-        QString bakFilename = Path::RemoveExtension(filename) + sTemp + Path::GetExt(filename);
-
-        if (bUseBackupSubDirectory)
-        {
-            QString sBackupPath = Path::ToUnixPath(Path::GetPath(filename)) + QString("/backups");
-            CFileUtil::CreateDirectory(sBackupPath.toUtf8().data());
-            bakFilename = sBackupPath + QString("/") + Path::GetFile(bakFilename);
-        }
-
-        // Do the backup
-        MoveFileReplaceExisting(filename, bakFilename);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::Deltree(const char* szFolder, [[maybe_unused]] bool bRecurse)
-{
-    return QDir(szFolder).removeRecursively();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool   CFileUtil::Exists(const QString& strPath, bool boDirectory, IFileUtil::FileDesc* pDesc)
-{
-    auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-    bool                        boIsDirectory(false);
-
-    AZ::IO::ArchiveFileIterator nFindHandle = pIPak->FindFirst(strPath.toUtf8().data());
-    // If it found nothing, no matter if it is a file or directory, it was not found.
-    if (!nFindHandle)
-    {
-        return false;
-    }
-    pIPak->FindClose(nFindHandle);
-
-    if ((nFindHandle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-    {
-        boIsDirectory = true;
-    }
-    else if (pDesc)
-    {
-        pDesc->filename = strPath;
-        pDesc->attrib = static_cast<unsigned int>(nFindHandle.m_fileDesc.nAttrib);
-        pDesc->size = nFindHandle.m_fileDesc.nSize;
-        pDesc->time_access = nFindHandle.m_fileDesc.tAccess;
-        pDesc->time_create = nFindHandle.m_fileDesc.tCreate;
-        pDesc->time_write = nFindHandle.m_fileDesc.tWrite;
-    }
-
-    // If we are seeking directories...
-    if (boDirectory)
-    {
-        // The return value will tell us if the found element is a directory.
-        return boIsDirectory;
-    }
-    else
-    {
-        // If we are not seeking directories...
-        // We return true if the found element is not a directory.
-        return !boIsDirectory;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::FileExists(const QString& strFilePath, IFileUtil::FileDesc* pDesc)
-{
-    return Exists(strFilePath, false, pDesc);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::PathExists(const QString& strPath)
-{
-    return Exists(strPath, true);
-}
-
-bool CFileUtil::GetDiskFileSize(const char* pFilePath, uint64& rOutSize)
-{
-    const QFileInfo fi(pFilePath);
-    rOutSize = fi.size();
-    return fi.exists();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool   CFileUtil::IsFileExclusivelyAccessable(const QString& strFilePath)
-{
-    // this was simply trying to open the file before, so keep it like that
-    QFile f(strFilePath);
-    return f.open(QFile::ReadOnly);
-}
-//////////////////////////////////////////////////////////////////////////
-bool   CFileUtil::CreatePath(const QString& strPath)
-{
-#if defined(AZ_PLATFORM_MAC)
-    bool pathCreated = true;
-
-    QString cleanPath = QDir::cleanPath(strPath);
-    QDir path(cleanPath);
-    if (!path.exists())
-    {
-        pathCreated = path.mkpath(cleanPath);
-    }
-
-    return pathCreated;
-#else
-    QString                                 strDriveLetter;
-    QString                                 strDirectory;
-    QString                                 strFilename;
-    QString                                 strExtension;
-    QString                                 strCurrentDirectoryPath;
-    QStringList        cstrDirectoryQueue;
-    size_t                                  nCurrentPathQueue(0);
-    size_t                                  nTotalPathQueueElements(0);
-    BOOL                                        bnLastDirectoryWasCreated(FALSE);
-
-    if (PathExists(strPath))
-    {
-        return true;
-    }
-
-    Path::SplitPath(strPath, strDriveLetter, strDirectory, strFilename, strExtension);
-    Path::GetDirectoryQueue(strDirectory, cstrDirectoryQueue);
-
-    if (!strDriveLetter.isEmpty())
-    {
-        strCurrentDirectoryPath = strDriveLetter;
-        strCurrentDirectoryPath += "\\";
-    }
-
-
-    nTotalPathQueueElements = cstrDirectoryQueue.size();
-    for (nCurrentPathQueue = 0; nCurrentPathQueue < nTotalPathQueueElements; ++nCurrentPathQueue)
-    {
-        strCurrentDirectoryPath += cstrDirectoryQueue[nCurrentPathQueue];
-        strCurrentDirectoryPath += "\\";
-        // The value which will go out of this loop is the result of the attempt to create the
-        // last directory, only.
-
-        strCurrentDirectoryPath = Path::CaselessPaths(strCurrentDirectoryPath);
-        bnLastDirectoryWasCreated = QDir().mkpath(strCurrentDirectoryPath);
-    }
-
-    if (!bnLastDirectoryWasCreated)
-    {
-        if (!QDir(strCurrentDirectoryPath).exists())
-        {
-            return false;
-        }
-    }
-
-    return true;
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool   CFileUtil::DeleteFile(const QString& strPath)
-{
-    QFile(strPath).setPermissions(QFile::ReadOther | QFile::WriteOther);
-    return QFile::remove(strPath);
-}
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::RemoveDirectory(const QString& strPath)
-{
-    return Deltree(strPath.toUtf8().data(), true);
-}
-
-void CFileUtil::ForEach(const QString& path, std::function<void(const QString&)> predicate, bool recurse)
-{
-    bool trailingSlash = path.endsWith('/') || path.endsWith('\\');
-    const QString dirName = trailingSlash ? path.left(path.length() - 1) : path;
-    QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags;
-
-    if (recurse)
-    {
-        flags = QDirIterator::Subdirectories;
-    }
-
-    QDirIterator dirIterator(path, QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot, flags);
-    while (dirIterator.hasNext())
-    {
-        dirIterator.next();
-        QString filePath = Path::ToUnixPath(dirIterator.filePath());
-        predicate(filePath);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IFileUtil::ECopyTreeResult CFileUtil::CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse, bool boConfirmOverwrite, const char* const ignoreFilesAndFolders)
-{
-    static CUserOptions             oFileOptions;
-    static CUserOptions             oDirectoryOptions;
-
-    CUserOptions::CUserOptionsReferenceCountHelper  oFileOptionsHelper(oFileOptions);
-    CUserOptions::CUserOptionsReferenceCountHelper  oDirectoryOptionsHelper(oDirectoryOptions);
-
-    IFileUtil::ECopyTreeResult                      eCopyResult(IFileUtil::ETREECOPYOK);
-
-    QStringList            cFiles;
-    QStringList            cDirectories;
-
-    size_t                                      nCurrent(0);
-    size_t                                      nTotal(0);
-
-    // For this function to work properly, it has to first process all files in the directory AND JUST AFTER IT
-    // work on the sub-folders...this is NOT OBVIOUS, but imagine the case where you have a hierarchy of folders,
-    // all with the same names and all with the same files names inside. If you would make a depth-first search
-    // you could end up with the files from the deepest folder in ALL your folders.
-
-    std::vector<string> ignoredPatterns;
-    StringHelpers::Split(ignoreFilesAndFolders, "|", false, ignoredPatterns);
-
-    QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags;
-
-    if (boRecurse)
-    {
-        flags = QDirIterator::Subdirectories;
-    }
-
-    QDir sourceDir(strSourceDirectory);
-    QDir targetDir(strTargetDirectory);
-
-    QDirIterator dirIterator(strSourceDirectory, {"*.*"}, QDir::Files, flags);
-
-    if (!dirIterator.hasNext())
-    {
-        return IFileUtil::ETREECOPYOK;
-    }
-
-    while (dirIterator.hasNext())
-    {
-        const QString filePath = dirIterator.next();
-        const QString fileName = QFileInfo(filePath).fileName();
-
-        bool ignored = false;
-        for (const string& ignoredFile : ignoredPatterns)
-        {
-            if (StringHelpers::CompareIgnoreCase(fileName.toStdString().c_str(), ignoredFile.c_str()) == 0)
-            {
-                ignored = true;
-                break;
-            }
-        }
-        if (ignored)
-        {
-            continue;
-        }
-
-        QFileInfo fileInfo(filePath);
-        if (fileInfo.isDir())
-        {
-            if (boRecurse)
-            {
-                cDirectories.push_back(fileName);
-            }
-        }
-        else
-        {
-            cFiles.push_back(fileName);
-        }
-    }
-
-    // First we copy all files (maybe not all, depending on the user options...)
-    nTotal = cFiles.size();
-    for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
-    {
-        BOOL        bnLastFileWasCopied(FALSE);
-
-
-        if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
-        {
-            return eCopyResult;
-        }
-
-        QString sourceName = sourceDir.absoluteFilePath(cFiles[nCurrent]);
-        QString targetName = targetDir.absoluteFilePath(cFiles[nCurrent]);
-
-        if (boConfirmOverwrite)
-        {
-            if (QFileInfo::exists(targetName))
-            {
-                // If the directory already exists...
-                // we must warn our user about the possible actions.
-                int             nUserOption(0);
-
-                if (boConfirmOverwrite)
-                {
-                    // If the option is not valid to all folder, we must ask anyway again the user option.
-                    if (!oFileOptions.IsOptionToAll())
-                    {
-                        const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
-                            QObject::tr("Confirm file overwrite?"),
-                            QObject::tr("There is already a file named \"%1\" in the target folder. Do you want to move this file anyway replacing the old one?")
-                                .arg(cFiles[nCurrent]),
-                            QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-
-                        switch (ret) {
-                        case QMessageBox::YesToAll: /* fall-through */
-                        case QMessageBox::Yes:    nUserOption = IDYES; break;
-                        case QMessageBox::No:     nUserOption = IDNO; break;
-                        case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
-                        }
-
-                        oFileOptions.SetOption(nUserOption, ret == QMessageBox::YesToAll);
-                    }
-                    else
-                    {
-                        nUserOption = oFileOptions.GetOption();
-                    }
-                }
-
-                switch (nUserOption)
-                {
-                case IDYES:
-                {
-                    // Actually, we need to do nothing in this case.
-                }
-                break;
-
-                case IDNO:
-                {
-                    eCopyResult = IFileUtil::ETREECOPYUSERDIDNTCOPYSOMEITEMS;
-                    continue;
-                }
-                break;
-
-                // This IS ALWAYS for all... so it's easy to deal with.
-                case IDCANCEL:
-                {
-                    return IFileUtil::ETREECOPYUSERCANCELED;
-                }
-                break;
-                }
-            }
-        }
-
-        bnLastFileWasCopied = QFile::copy(sourceName, targetName);
-        if (!bnLastFileWasCopied)
-        {
-            eCopyResult = IFileUtil::ETREECOPYFAIL;
-        }
-    }
-
-    // Now we can recurse into the directories, if needed.
-    nTotal = cDirectories.size();
-    for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
-    {
-        if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
-        {
-            return eCopyResult;
-        }
-
-        BOOL        bnLastDirectoryWasCreated(FALSE);
-
-        QString sourceName = sourceDir.absoluteFilePath(cDirectories[nCurrent]);
-        QString targetName = targetDir.absoluteFilePath(cDirectories[nCurrent]);
-
-        bnLastDirectoryWasCreated = QDir().mkpath(targetName);
-
-        if (!bnLastDirectoryWasCreated)
-        {
-            if (!QDir(targetName).exists())
-            {
-                return IFileUtil::ETREECOPYFAIL;
-            }
-            else
-            {
-                // If the directory already exists...
-                // we must warn our user about the possible actions.
-                int             nUserOption(0);
-
-                if (boConfirmOverwrite)
-                {
-                    // If the option is not valid to all folder, we must ask anyway again the user option.
-                    if (!oDirectoryOptions.IsOptionToAll())
-                    {
-                        const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
-                            QObject::tr("Confirm directory overwrite?"),
-                            QObject::tr("There is already a folder named \"%1\" in the target folder. Do you want to move this folder anyway?")
-                                .arg(cDirectories[nCurrent]),
-                            QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-
-                        switch (ret) {
-                            case QMessageBox::YesToAll: /* fall-through */
-                            case QMessageBox::Yes:    nUserOption = IDYES; break;
-                            case QMessageBox::No:     nUserOption = IDNO; break;
-                            case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
-                        }
-
-                        oDirectoryOptions.SetOption(nUserOption, ret == QMessageBox::YesToAll);
-                    }
-                    else
-                    {
-                        nUserOption = oDirectoryOptions.GetOption();
-                    }
-                }
-
-                switch (nUserOption)
-                {
-                case IDYES:
-                {
-                    // Actually, we need to do nothing in this case.
-                }
-                break;
-
-                case IDNO:
-                {
-                    // If no, we just need to go to the next item.
-                    eCopyResult = IFileUtil::ETREECOPYUSERDIDNTCOPYSOMEITEMS;
-                    continue;
-                }
-                break;
-
-                // This IS ALWAYS for all... so it's easy to deal with.
-                case IDCANCEL:
-                {
-                    return IFileUtil::ETREECOPYUSERCANCELED;
-                }
-                break;
-                }
-            }
-        }
-
-        eCopyResult = CopyTree(sourceName, targetName, boRecurse, boConfirmOverwrite, ignoreFilesAndFolders);
-    }
-
-    return eCopyResult;
-}
-//////////////////////////////////////////////////////////////////////////
-IFileUtil::ECopyTreeResult   CFileUtil::CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite, ProgressRoutine pfnProgress, bool* pbCancel)
-{
-    CUserOptions                            oFileOptions;
-    IFileUtil::ECopyTreeResult                      eCopyResult(IFileUtil::ETREECOPYOK);
-
-    BOOL                                            bnLastFileWasCopied(FALSE);
-    QString                                     name(strSourceFile);
-    QString                                     strQueryFilename;
-    QString                                     strFullStargetName;
-
-    QString strTargetName(strTargetFile);
-    if (GetIEditor()->GetConsoleVar("ed_lowercasepaths"))
-    {
-        strTargetName = strTargetName.toLower();
-    }
-
-    QString strDriveLetter, strDirectory, strFilename, strExtension;
-    Path::SplitPath(strTargetName, strDriveLetter, strDirectory, strFilename, strExtension);
-    strFullStargetName = strDriveLetter;
-    strFullStargetName += strDirectory;
-
-    if (strFilename.isEmpty())
-    {
-        strFullStargetName += Path::GetFileName(strSourceFile);
-        strFullStargetName += ".";
-        strFullStargetName += Path::GetExt(strSourceFile);
-    }
-    else
-    {
-        strFullStargetName += strFilename;
-        strFullStargetName += strExtension;
-    }
-
-
-    if (boConfirmOverwrite)
-    {
-        if (QFileInfo::exists(strFullStargetName))
-        {
-            strQueryFilename = strFilename;
-            if (strFilename.isEmpty())
-            {
-                strQueryFilename = Path::GetFileName(strSourceFile);
-                strQueryFilename += ".";
-                strQueryFilename += Path::GetExt(strSourceFile);
-            }
-            else
-            {
-                strQueryFilename += strExtension;
-            }
-
-            // If the directory already exists...
-            // we must warn our user about the possible actions.
-            int             nUserOption(0);
-
-            if (boConfirmOverwrite)
-            {
-                // If the option is not valid to all folder, we must ask anyway again the user option.
-                if (!oFileOptions.IsOptionToAll())
-                {
-                    const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
-                        QObject::tr("Confirm file overwrite?"),
-                        QObject::tr("There is already a file named \"%1\" in the target folder. Do you want to move this file anyway replacing the old one?")
-                            .arg(strQueryFilename),
-                        QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-
-                    switch (ret) {
-                    case QMessageBox::Yes:    nUserOption = IDYES; break;
-                    case QMessageBox::No:     nUserOption = IDNO; break;
-                    case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
-                    }
-
-                    oFileOptions.SetOption(nUserOption, false);
-                }
-                else
-                {
-                    nUserOption = oFileOptions.GetOption();
-                }
-            }
-
-            switch (nUserOption)
-            {
-            case IDYES:
-            {
-                // Actually, we need to do nothing in this case.
-            }
-            break;
-
-            case IDNO:
-            {
-                return eCopyResult = IFileUtil::ETREECOPYUSERCANCELED;
-            }
-            break;
-
-            // This IS ALWAYS for all... so it's easy to deal with.
-            case IDCANCEL:
-            {
-                return IFileUtil::ETREECOPYUSERCANCELED;
-            }
-            break;
-            }
-        }
-    }
-
-    bnLastFileWasCopied = false;
-
-    QFile source(name);
-    if (source.open(QFile::ReadOnly))
-    {
-        QFile out(strFullStargetName);
-        if (out.open(QFile::ReadWrite))
-        {
-            bnLastFileWasCopied = true;
-            char block[4096];
-            qint64 totalRead = 0;
-            while (!source.atEnd())
-            {
-                qint64 in = source.read(block, sizeof(block));
-                if (in <= 0)
-                {
-                    break;
-                }
-                totalRead += in;
-                if (in != out.write(block, in))
-                {
-                    bnLastFileWasCopied = false;
-                    break;
-                }
-                if (pbCancel && *pbCancel == true)
-                {
-                    bnLastFileWasCopied = false;
-                    break;
-                }
-                if (pfnProgress)
-                {
-                    pfnProgress(source.size(), totalRead, 0, 0, 0, 0, 0, 0, 0);
-                }
-            }
-            if (totalRead != source.size())
-            {
-                bnLastFileWasCopied = false;
-            }
-        }
-    }
-
-    if (!bnLastFileWasCopied)
-    {
-        eCopyResult = IFileUtil::ETREECOPYFAIL;
-    }
-
-    return eCopyResult;
-}
-//////////////////////////////////////////////////////////////////////////
-IFileUtil::ECopyTreeResult   CFileUtil::MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse, bool boConfirmOverwrite)
-{
-    static CUserOptions             oFileOptions;
-    static CUserOptions             oDirectoryOptions;
-
-    CUserOptions::CUserOptionsReferenceCountHelper  oFileOptionsHelper(oFileOptions);
-    CUserOptions::CUserOptionsReferenceCountHelper  oDirectoryOptionsHelper(oDirectoryOptions);
-
-    IFileUtil::ECopyTreeResult                  eCopyResult(IFileUtil::ETREECOPYOK);
-
-    QStringList            cFiles;
-    QStringList            cDirectories;
-
-    size_t                                      nCurrent(0);
-    size_t                                      nTotal(0);
-
-    // For this function to work properly, it has to first process all files in the directory AND JUST AFTER IT
-    // work on the sub-folders...this is NOT OBVIOUS, but imagine the case where you have a hierarchy of folders,
-    // all with the same names and all with the same files names inside. If you would make a depth-first search
-    // you could end up with the files from the deepest folder in ALL your folders.
-
-    QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags;
-
-    if (boRecurse)
-    {
-        flags = QDirIterator::Subdirectories;
-    }
-
-    QDirIterator dirIterator(strSourceDirectory, {"*.*"}, QDir::Files, flags);
-
-    if (!dirIterator.hasNext())
-    {
-        return IFileUtil::ETREECOPYOK;
-    }
-
-    QDir sourceDir(strSourceDirectory);
-    QDir targetDir(strTargetDirectory);
-
-    while (dirIterator.hasNext())
-    {
-        const QString filePath = dirIterator.next();
-        const QString fileName = QFileInfo(filePath).fileName();
-
-        QFileInfo fileInfo(filePath);
-        if (fileInfo.isDir())
-        {
-            if (boRecurse)
-            {
-                cDirectories.push_back(fileName);
-            }
-        }
-        else
-        {
-            cFiles.push_back(fileName);
-        }
-    }
-
-    // First we copy all files (maybe not all, depending on the user options...)
-    nTotal = cFiles.size();
-    for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
-    {
-        if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
-        {
-            return eCopyResult;
-        }
-
-        BOOL        bnLastFileWasCopied(FALSE);
-        QString sourceName(sourceDir.absoluteFilePath(cFiles[nCurrent]));
-        QString targetName(targetDir.absoluteFilePath(cFiles[nCurrent]));
-
-        if (boConfirmOverwrite)
-        {
-            if (QFileInfo::exists(targetName))
-            {
-                // If the directory already exists...
-                // we must warn our user about the possible actions.
-                int             nUserOption(0);
-
-                if (boConfirmOverwrite)
-                {
-                    // If the option is not valid to all folder, we must ask anyway again the user option.
-                    if (!oFileOptions.IsOptionToAll())
-                    {
-                        const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
-                            QObject::tr("Confirm file overwrite?"),
-                            QObject::tr("There is already a file named \"%1\" in the target folder. Do you want to move this file anyway replacing the old one?")
-                                .arg(cFiles[nCurrent]),
-                            QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-
-                        switch (ret) {
-                        case QMessageBox::YesToAll: /* fall-through */
-                        case QMessageBox::Yes:    nUserOption = IDYES; break;
-                        case QMessageBox::No:     nUserOption = IDNO; break;
-                        case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
-                        }
-
-                        oFileOptions.SetOption(nUserOption, ret == QMessageBox::YesToAll);
-                    }
-                    else
-                    {
-                        nUserOption = oFileOptions.GetOption();
-                    }
-                }
-
-                switch (nUserOption)
-                {
-                case IDYES:
-                {
-                    // Actually, we need to do nothing in this case.
-                }
-                break;
-
-                case IDNO:
-                {
-                    eCopyResult = IFileUtil::ETREECOPYUSERDIDNTCOPYSOMEITEMS;
-                    continue;
-                }
-                break;
-
-                // This IS ALWAYS for all... so it's easy to deal with.
-                case IDCANCEL:
-                {
-                    return IFileUtil::ETREECOPYUSERCANCELED;
-                }
-                break;
-                }
-            }
-        }
-        bnLastFileWasCopied = MoveFileReplaceExisting(sourceName, targetName);
-
-        if (!bnLastFileWasCopied)
-        {
-            eCopyResult = IFileUtil::ETREECOPYFAIL;
-        }
-    }
-
-    // Now we can recurse into the directories, if needed.
-    nTotal = cDirectories.size();
-    for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
-    {
-        BOOL        bnLastDirectoryWasCreated(FALSE);
-
-        if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
-        {
-            return eCopyResult;
-        }
-
-        QString sourceName(sourceDir.absoluteFilePath(cDirectories[nCurrent]));
-        QString targetName(targetDir.absoluteFilePath(cDirectories[nCurrent]));
-
-        bnLastDirectoryWasCreated = QDir().mkdir(targetName);
-
-        if (!bnLastDirectoryWasCreated)
-        {
-            if (!QDir(targetName).exists())
-            {
-                return IFileUtil::ETREECOPYFAIL;
-            }
-            else
-            {
-                // If the directory already exists...
-                // we must warn our user about the possible actions.
-                int             nUserOption(0);
-
-                if (boConfirmOverwrite)
-                {
-                    // If the option is not valid to all folder, we must ask anyway again the user option.
-                    if (!oDirectoryOptions.IsOptionToAll())
-                    {
-                        const int ret = QMessageBox::question(AzToolsFramework::GetActiveWindow(),
-                            QObject::tr("Confirm directory overwrite?"),
-                            QObject::tr("There is already a folder named \"%1\" in the target folder. Do you want to move this folder anyway?")
-                                .arg(cDirectories[nCurrent]),
-                            QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-
-                        switch (ret) {
-                        case QMessageBox::YesToAll: /* fall-through */
-                        case QMessageBox::Yes:    nUserOption = IDYES; break;
-                        case QMessageBox::No:     nUserOption = IDNO; break;
-                        case QMessageBox::Cancel: nUserOption = IDCANCEL; break;
-                        }
-
-                        oDirectoryOptions.SetOption(nUserOption, ret == QMessageBox::YesToAll);
-                    }
-                    else
-                    {
-                        nUserOption = oDirectoryOptions.GetOption();
-                    }
-                }
-
-                switch (nUserOption)
-                {
-                case IDYES:
-                {
-                    // Actually, we need to do nothing in this case.
-                }
-                break;
-
-                case IDNO:
-                {
-                    // If no, we just need to go to the next item.
-                    eCopyResult = IFileUtil::ETREECOPYUSERDIDNTCOPYSOMEITEMS;
-                    continue;
-                }
-                break;
-
-                // This IS ALWAYS for all... so it's easy to deal with.
-                case IDCANCEL:
-                {
-                    return IFileUtil::ETREECOPYUSERCANCELED;
-                }
-                break;
-                }
-            }
-        }
-
-        eCopyResult = MoveTree(sourceName, targetName, boRecurse, boConfirmOverwrite);
-    }
-
-    CFileUtil::RemoveDirectory(strSourceDirectory);
-
-    return eCopyResult;
-}
-
-QString CFileUtil::PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent)
-{
-    QStringList extraItemsFront;
-    return PopupQMenu(filename, fullGamePath, parent, nullptr, extraItemsFront);
-}
-
-QString CFileUtil::PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent, [[maybe_unused]] bool* pIsSelected, const QStringList& extraItemsFront)
-{
-    QStringList extraItemsBack;
-    return PopupQMenu(filename, fullGamePath, parent, nullptr, extraItemsFront, extraItemsBack);
-}
-
-QString CFileUtil::PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent, bool* pIsSelected, const QStringList& extraItemsFront, const QStringList& extraItemsBack)
-{
-    QMenu menu;
-
-    foreach(QString text, extraItemsFront)
-    {
-        if (!text.isEmpty())
-        {
-            menu.addAction(text);
-        }
-    }
-    if (extraItemsFront.count())
-    {
-        menu.addSeparator();
-    }
-
-    PopulateQMenu(parent, &menu, filename, fullGamePath, pIsSelected);
-    if (extraItemsBack.count())
-    {
-        menu.addSeparator();
-    }
-    foreach(QString text, extraItemsBack)
-    {
-        if (!text.isEmpty())
-        {
-            menu.addAction(text);
-        }
-    }
-
-    QAction* result = menu.exec(QCursor::pos());
-    return result ? result->text() : QString();
-}
-
-void CFileUtil::PopulateQMenu(QWidget* caller, QMenu* menu, const QString& filename, const QString& fullGamePath)
-{
-    PopulateQMenu(caller, menu, filename, fullGamePath, nullptr);
-}
-
-void CFileUtil::PopulateQMenu(QWidget* caller, QMenu* menu, const QString& filename, const QString& fullGamePath, bool* isSelected)
-{
-    QString fullPath;
-
-    if (isSelected)
-    {
-        *isSelected = false;
-    }
-
-    if (!filename.isEmpty())
-    {
-        QString path = Path::MakeGamePath(fullGamePath);
-        path = Path::AddSlash(path) + filename;
-        fullPath = Path::GamePathToFullPath(path);
-    }
-    else
-    {
-        fullPath = fullGamePath;
-    }
-
-    uint32 nFileAttr = CFileUtil::GetAttributes(fullPath.toUtf8().data());
-
-    QAction* action;
-
-    // NOTE: isSelected being passed in implies that the menu filled from this call must have exec() called on it, and not show.
-    if (isSelected)
-    {
-        action = new QAction(QObject::tr("Select"), nullptr);
-        QObject::connect(action, &QAction::triggered, action, [isSelected]() { *isSelected = true; });
-        if (menu->isEmpty())
-        {
-            menu->addAction(action);
-        }
-        else
-        {
-            menu->insertAction(menu->actions()[0], action);
-        }
-    }
-
-    action = menu->addAction(AzQtComponents::fileBrowserActionName(), [=]()
-    {
-        if (nFileAttr & SCC_FILE_ATTRIBUTE_INPAK)
-        {
-            QString path = QDir::toNativeSeparators(Path::GetPath(fullPath));
-            QDesktopServices::openUrl(QUrl::fromLocalFile(path));
-        }
-        else
-        {
-            AzQtComponents::ShowFileOnDesktop(fullPath);
-        }
-    });
-    action->setDisabled(nFileAttr & SCC_FILE_ATTRIBUTE_INPAK);
-
-    action = menu->addAction(QObject::tr("Copy Name To Clipboard"), [=]()
-    {
-        if (filename.isEmpty())
-        {
-            QFileInfo fi(fullGamePath);
-            QString file = fi.completeBaseName();
-            QApplication::clipboard()->setText(file);
-        }
-        else
-        {
-            QApplication::clipboard()->setText(filename);
-        }
-    });
-
-    action = menu->addAction(QObject::tr("Copy Path To Clipboard"), [fullPath]() { QApplication::clipboard()->setText(fullPath); });
-
-    if (!filename.isEmpty() && GetIEditor()->IsSourceControlAvailable() && nFileAttr != SCC_FILE_ATTRIBUTE_INVALID)
-    {
-        bool isEnableSC = nFileAttr & SCC_FILE_ATTRIBUTE_MANAGED;
-        bool isInPak = nFileAttr & SCC_FILE_ATTRIBUTE_INPAK;
-        menu->addSeparator();
-        if (isInPak && !isEnableSC)
-        {
-            menu->addAction(QObject::tr("File In Pak (Read Only)"));
-            menu->setDisabled(true);
-        }
-        else
-        {
-            action = menu->addAction(QObject::tr("Check Out"), [fullPath, caller]()
-            {
-                if (!CheckoutFile(fullPath.toUtf8().data(), caller))
-                {
-                    QMessageBox::warning(caller, QObject::tr("Error"),
-                        QObject::tr("Source Control Check Out Failed.\r\nCheck if Source Control Provider is correctly setup and working directory is correct."));
-                }
-            });
-            action->setEnabled(isEnableSC && !isInPak && (nFileAttr & SCC_FILE_ATTRIBUTE_READONLY));
-
-            action = menu->addAction(QObject::tr("Undo Check Out"), [fullPath, caller]()
-            {
-                if (!RevertFile(fullPath.toUtf8().data(), caller))
-                {
-                    QMessageBox::warning(caller, QObject::tr("Error"),
-                        QObject::tr("Source Control Undo Check Out Failed.\r\nCheck if Source Control Provider is correctly setup and working directory is correct."));
-                }
-            });
-            action->setEnabled(isEnableSC && !isInPak && (nFileAttr & SCC_FILE_ATTRIBUTE_CHECKEDOUT));
-
-            action = menu->addAction(QObject::tr("Get Latest Version"), [fullPath, caller]()
-            {
-                if (GetIEditor()->IsSourceControlAvailable())
-                {
-                    if (!CFileUtil::GetLatestFromSourceControl(fullPath.toUtf8().data(), caller))
-                    {
-                        QMessageBox::warning(caller, QObject::tr("Error"),
-                            QObject::tr("Source Control failed to get latest version of file.\r\nCheck if Source Control Provider is setup correctly."
-                            "\r\n\r\nAdditionally, this operation will fail on files that have local changes\r\nthat are not currently checked out, in order to prevent data loss."
-                            "\r\nIn this case, please reconcile offline work directly from Source Control Provider."));
-                    }
-                }
-            });
-            action->setEnabled(isEnableSC);
-
-            action = menu->addAction(QObject::tr("Add To Source Control"), [fullPath, caller]()
-            {
-                if (!CheckoutFile(fullPath.toUtf8().data(), caller))
-                {
-                    QMessageBox::warning(caller, QObject::tr("Error"),
-                        QObject::tr("Source Control Add Failed.\r\nCheck if Source Control Provider is correctly setup and working directory is correct."));
-                }
-            });
-            action->setDisabled(isEnableSC);
-        }
-    }
-}
-
-void CFileUtil::GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase, bool bMakeUnixPath)
-{
-    rOutFilenames.clear();
-    CBaseObjectsArray objArr;
-    CUsedResources usedRes;
-
-    GetIEditor()->GetObjectManager()->GetObjects(objArr);
-
-    for (size_t i = 0, iCount = objArr.size(); i < iCount; ++i)
-    {
-        CBaseObject* pObj = objArr[i];
-
-        usedRes.files.clear();
-        pObj->GatherUsedResources(usedRes);
-
-        for (CUsedResources::TResourceFiles::iterator iter = usedRes.files.begin(); iter != usedRes.files.end(); ++iter)
-        {
-            QString tmpStr = (*iter);
-
-            if (bMakeLowerCase)
-            {
-                tmpStr = tmpStr.toLower();
-            }
-
-            if (bMakeUnixPath)
-            {
-                tmpStr = Path::ToUnixPath(tmpStr);
-            }
-
-            rOutFilenames.insert(tmpStr);
-        }
-    }
-}
-
-uint32 CFileUtil::GetAttributes(const char* filename, bool bUseSourceControl /*= true*/)
-{
-    using namespace AzToolsFramework;
-
-    bool scOpSuccess = false;
-    SourceControlFileInfo fileInfo;
-
-    if (bUseSourceControl)
-    {
-        using SCRequest = SourceControlConnectionRequestBus;
-
-        SourceControlState state = SourceControlState::Disabled;
-        SCRequest::BroadcastResult(state, &SCRequest::Events::GetSourceControlState);
-
-        if (state == SourceControlState::ConfigurationInvalid)
-        {
-            return SCC_FILE_ATTRIBUTE_INVALID;
-        }
-
-        if (state == SourceControlState::Active)
-        {
-            using SCCommand = SourceControlCommandBus;
-
-            bool scOpComplete = false;
-            SCCommand::Broadcast(&SCCommand::Events::GetFileInfo, filename,
-                [&fileInfo, &scOpSuccess, &scOpComplete](bool success, const SourceControlFileInfo& info)
-                {
-                    fileInfo = info;
-                    scOpSuccess = success;
-                    scOpComplete = true;
-                }
-            );
-
-            BlockAndWait(scOpComplete, nullptr, "Getting file status...");
-
-            // we intended to use source control, but the operation failed.
-            // do not fall through to checking as if bUseSourceControl was false
-            if (!scOpSuccess)
-            {
-                return SCC_FILE_ATTRIBUTE_INVALID;
-            }
-        }
-    }
-
-    CCryFile file;
-    bool isCryFile = file.Open(filename, "rb");
-
-    // Using source control and our fstat succeeded.
-    // Translate SourceControlStatus to (legacy) ESccFileAttributes
-    if (scOpSuccess)
-    {
-        uint32 sccFileAttr = AZ::IO::SystemFile::Exists(filename) ? SCC_FILE_ATTRIBUTE_NORMAL : SCC_FILE_ATTRIBUTE_INVALID;
-
-        if (fileInfo.HasFlag(SourceControlFlags::SCF_Tracked))
-        {
-            sccFileAttr |= SCC_FILE_ATTRIBUTE_MANAGED;
-        }
-
-        if (fileInfo.HasFlag(SourceControlFlags::SCF_OpenByUser))
-        {
-            sccFileAttr |= SCC_FILE_ATTRIBUTE_MANAGED | SCC_FILE_ATTRIBUTE_CHECKEDOUT;
-        }
-
-        if ((sccFileAttr & SCC_FILE_ATTRIBUTE_MANAGED) == SCC_FILE_ATTRIBUTE_MANAGED)
-        {
-            if (fileInfo.HasFlag(SourceControlFlags::SCF_OutOfDate))
-            {
-                sccFileAttr |= SCC_FILE_ATTRIBUTE_NOTATHEAD;
-            }
-
-            if (fileInfo.HasFlag(SourceControlFlags::SCF_OtherOpen))
-            {
-                sccFileAttr |= SCC_FILE_ATTRIBUTE_CHECKEDOUT | SCC_FILE_ATTRIBUTE_BYANOTHER;
-            }
-
-            if (fileInfo.HasFlag(SourceControlFlags::SCF_PendingAdd))
-            {
-                sccFileAttr |= SCC_FILE_ATTRIBUTE_ADD;
-            }
-        }
-
-        if (fileInfo.IsReadOnly())
-        {
-            sccFileAttr |= SCC_FILE_ATTRIBUTE_READONLY;
-        }
-
-        if (file.IsInPak())
-        {
-            sccFileAttr |= SCC_FILE_ATTRIBUTE_READONLY | SCC_FILE_ATTRIBUTE_INPAK;
-        }
-
-        return sccFileAttr;
-    }
-
-    // We've asked not to use source control OR we disabled source control
-    if (!isCryFile)
-    {
-        return SCC_FILE_ATTRIBUTE_INVALID;
-    }
-
-    if (file.IsInPak())
-    {
-        return SCC_FILE_ATTRIBUTE_READONLY | SCC_FILE_ATTRIBUTE_INPAK;
-    }
-
-    DWORD dwAttrib = ::GetFileAttributes(file.GetAdjustedFilename());
-    if (dwAttrib == INVALID_FILE_ATTRIBUTES)
-    {
-        return SCC_FILE_ATTRIBUTE_INVALID;
-    }
-
-    if (dwAttrib & FILE_ATTRIBUTE_READONLY)
-    {
-        return SCC_FILE_ATTRIBUTE_NORMAL | SCC_FILE_ATTRIBUTE_READONLY;
-    }
-
-    return SCC_FILE_ATTRIBUTE_NORMAL;
-}
-
-bool CFileUtil::CompareFiles(const QString& strFilePath1, const QString& strFilePath2)
-{
-    // Get the size of both files.  If either fails we say they are different (most likely one doesn't exist)
-    uint64 size1 = 0;
-    uint64 size2 = 0;
-    if (!GetDiskFileSize(strFilePath1.toUtf8().data(), size1) || !GetDiskFileSize(strFilePath2.toUtf8().data(), size2))
-    {
-        return false;
-    }
-
-    // If the files are different sizes return false
-    if (size1 != size2)
-    {
-        return false;
-    }
-
-    // Sizes are the same, we need to compare the bytes.  Try to open both files for read.
-    CCryFile file1, file2;
-    if (!file1.Open(strFilePath1.toUtf8().data(), "rb") || !file2.Open(strFilePath2.toUtf8().data(), "rb"))
-    {
-        return false;
-    }
-
-    const uint64 bufSize = 4096;
-
-    char buf1[bufSize], buf2[bufSize];
-
-    for (uint64 i = 0; i < size1; i += bufSize)
-    {
-        size_t amtRead1 = file1.ReadRaw(buf1, bufSize);
-        size_t amtRead2 = file2.ReadRaw(buf2, bufSize);
-
-        // Not a match if we didn't read the same amount from each file
-        if (amtRead1 != amtRead2)
-        {
-            return false;
-        }
-
-        // Not a match if we didn't read the amount of data we expected
-        if (amtRead1 != bufSize && i + amtRead1 != size1)
-        {
-            return false;
-        }
-
-        // Not a match if the buffers aren't the same
-        if (memcmp(buf1, buf2, amtRead1) != 0)
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool CFileUtil::SortAscendingFileNames(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
-{
-    return desc1.filename.compare(desc2.filename) == -1 ? true : false;
-}
-
-bool CFileUtil::SortDescendingFileNames(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
-{
-    return desc1.filename.compare(desc2.filename) == 1 ? true : false;
-}
-
-bool CFileUtil::SortAscendingDates(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
-{
-    return desc1.time_write < desc2.time_write;
-}
-
-bool CFileUtil::SortDescendingDates(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
-{
-    return desc1.time_write > desc2.time_write;
-}
-
-bool CFileUtil::SortAscendingSizes(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
-{
-    return desc1.size > desc2.size;
-}
-
-bool CFileUtil::SortDescendingSizes(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2)
-{
-    return desc1.size < desc2.size;
-}
-
-
-bool CFileUtil::IsAbsPath(const QString& filepath)
-{
-    return (!filepath.isEmpty() && ((filepath[1] == ':' && (filepath[2] == '\\' || filepath[2] == '/')
-                          || (filepath[0] == '\\' || filepath[0] == '/'))));
-}
-
-CTempFileHelper::CTempFileHelper(const char* pFileName)
-{
-    char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(pFileName, resolvedPath, AZ_MAX_PATH_LEN);
-    m_fileName = QString::fromUtf8(resolvedPath);
-
-    // the official pattern for temp files in the editor is /$tmp[0-9]*_"
-    // so we'll follow this pattern to make sure its ignored by asset processor.
-    // the _h_ is added to be unique (helper) in case someone else is also making temp files.
-    Path::ReplaceFilename(m_fileName, "$tmp_h_" + Path::GetFileName(QString::fromUtf8(pFileName)), m_tempFileName);
-    CFileUtil::DeleteFile(m_tempFileName);
-}
-
-CTempFileHelper::~CTempFileHelper()
-{
-    CFileUtil::DeleteFile(m_tempFileName);
-}
-
-bool CTempFileHelper::UpdateFile(bool bBackup)
-{
-    // First, check if the files are actually different
-    if (!CFileUtil::CompareFiles(m_tempFileName, m_fileName))
-    {
-        // If the file changed, make sure the destination file is writable
-        if (!CFileUtil::OverwriteFile(m_fileName))
-        {
-            CFileUtil::DeleteFile(m_tempFileName);
-            return false;
-        }
-
-        // Back up the current file if requested
-        if (bBackup)
-        {
-            CFileUtil::BackupFile(m_fileName.toUtf8().data());
-        }
-
-        // Move the temp file over the top of the destination file
-        return MoveFileReplaceExisting(m_tempFileName, m_fileName);
-    }
-    // If the files are the same, just delete the temp file and return.
-    else
-    {
-        CFileUtil::DeleteFile(m_tempFileName);
-        return true;
-    }
-}
-
diff --git a/Code/Sandbox/Editor/Util/FileUtil.h b/Code/Sandbox/Editor/Util/FileUtil.h
deleted file mode 100644
index 909b6eecf5..0000000000
--- a/Code/Sandbox/Editor/Util/FileUtil.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "CryThread.h"
-#include "StringUtils.h"
-#include "../Include/SandboxAPI.h"
-#include <QString>
-#include <QFileInfo>
-#include "../Include/IFileUtil.h"
-
-class QStringList;
-class QMenu;
-
-class SANDBOX_API CFileUtil
-{
-public:
-    static bool ScanDirectory(const QString& path, const QString& fileSpec, IFileUtil::FileArray& files,
-        bool recursive = true, bool addDirAlso = false, IFileUtil::ScanDirectoryUpdateCallBack updateCB = nullptr, bool bSkipPaks = false);
-
-    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);
-
-    //! Reformat filter string for (MFC) CFileDialog style file filtering
-    static void FormatFilterString(QString& filter);
-
-    //! Open file selection dialog.
-    static bool SelectFile(const QString& fileSpec, const QString& searchFolder, QString& fullFileName);
-    //! Open file selection dialog.
-    static bool SelectFiles(const QString& fileSpec, const QString& searchFolder, QStringList& files);
-
-    //! Display OpenFile dialog and allow to select multiple files.
-    //! @return true if selected, false if canceled.
-    //! @outputFile Inputs and Outputs filename.
-    /*
-    static bool SelectSingleFile(IFileUtil::ECustomFileType fileType, QString& outputFile, const QString& filter = "", const QString& initialDir = "");
-    static bool SelectSingleFile(IFileUtil::ECustomFileType fileType, char* outputFile, int outputSize, const char* filter = "", const char* initialDir = "");
-    static bool SelectSingleFile(IFileUtil::ECustomFileType fileType, QString& outputFile, const QString& filter = {}, const QString& initialDir = {});
-    */
-    static bool SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName);
-
-    //! Attempt to make a file writable
-    static bool OverwriteFile(const QString& filename);
-
-    //! Checks out the file from source control API.  Blocks until completed
-    static bool CheckoutFile(const char* filename, QWidget* parentWindow = nullptr);
-
-    //! Discard changes to a file from source control API.  Blocks until completed
-    static bool RevertFile(const char* filename, QWidget* parentWindow = nullptr);
-
-    //! Renames (moves) a file through the source control API.  Blocks until completed
-    static bool RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow = nullptr);
-
-    //! Deletes a file using source control API.  Blocks until completed.
-    static bool DeleteFromSourceControl(const char* filename, QWidget* parentWindow = nullptr);
-
-    //! Attempts to get the latest version of a file from source control.  Blocks until completed
-    static bool GetLatestFromSourceControl(const char* filename, QWidget* parentWindow = nullptr);
-
-    //! Gather information about a file using the source control API.  Blocks until completed
-    static bool GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow = nullptr);
-
-    //! Creates this directory if it doesn't exist. Returns false if the director doesn't exist and couldn't be created.
-    static bool CreateDirectory(const char* dir);
-
-    //! Makes a backup file.
-    static void BackupFile(const char* filename);
-
-    //! Makes a backup file, marked with a datestamp, e.g. myfile.20071014.093320.xml
-    //! If bUseBackupSubDirectory is true, moves backup file into a relative subdirectory "backups"
-    static void BackupFileDated(const char* filename, bool bUseBackupSubDirectory = false);
-
-    // ! Added deltree as a copy from the function found in Crypak.
-    static bool Deltree(const char* szFolder, bool bRecurse);
-
-    // Checks if a file or directory exist.
-    // We are using 3 functions here in order to make the names more instructive for the programmers.
-    // Those functions only work for OS files and directories.
-    static bool   Exists(const QString& strPath, bool boDirectory, IFileUtil::FileDesc* pDesc = nullptr);
-    static bool   FileExists(const QString& strFilePath, IFileUtil::FileDesc* pDesc = nullptr);
-    static bool   PathExists(const QString& strPath);
-    static bool   GetDiskFileSize(const char* pFilePath, uint64& rOutSize);
-
-    // This function should be used only with physical files.
-    static bool   IsFileExclusivelyAccessable(const QString& strFilePath);
-
-    // Creates the entire path, if needed.
-    static bool   CreatePath(const QString& strPath);
-
-    // Attempts to delete a file (if read only it will set its attributes to normal first).
-    static bool   DeleteFile(const QString& strPath);
-
-    // Attempts to remove a directory (if read only it will set its attributes to normal first).
-    static bool     RemoveDirectory(const QString& strPath);
-
-    // Calls predicate() with each entry in the directory
-    static void     ForEach(const QString& path, std::function<void(const QString&)> predicate, bool recurse = true);
-
-    //! Copies all the elements from the source directory to the target directory.
-    //! It doesn't copy the source folder to the target folder, only it's contents.
-    //! THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
-    //! The ignore list can either take a single string of a file name or folder name or it can take PIPE separated names ("something|somethingelse")
-    //! It is not a pattern match, merely a file or folder name match.
-    static IFileUtil::ECopyTreeResult   CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false, const char* const ignoreFilesAndFolders = nullptr);
-
-    //////////////////////////////////////////////////////////////////////////
-    // @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
-    // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
-    static IFileUtil::ECopyTreeResult   CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = nullptr, bool* pbCancel = nullptr);
-
-
-    // As we don't have a FileUtil interface here, we have to duplicate some code :-( in order to keep
-    // function calls clean.
-    // Moves all the elements from the source directory to the target directory.
-    // It doesn't move the source folder to the target folder, only it's contents.
-    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
-    static IFileUtil::ECopyTreeResult   MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false);
-
-    // Show Popup Menu with file commands include Source Control commands
-    // filename: a name of file without path
-    // fullGamePath: a game path to folder like "/Game/Objects" without filename
-    // wnd: pointer to window class, can be nullptr
-    // isSelected: output value indicated if Select menu item was chosen, if pointer is 0 - no Select menu item.
-    // pItems: you can specify additional menu items and get the result of selection using this parameter.
-    // return false if source control operation failed
-    static QString PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent);
-    static QString PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent, bool* pIsSelected, const QStringList& extraItemsFront);
-    static QString PopupQMenu(const QString& filename, const QString& fullGamePath, QWidget* parent, bool* pIsSelected, const QStringList& extraItemsFront, const QStringList& extraItemsBack);
-
-    static void PopulateQMenu(QWidget* caller, QMenu* menu, const QString& filename, const QString& fullGamePath);
-
-    static void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false);
-
-    // Get file attributes include source control attributes if available
-    static uint32 GetAttributes(const char* filename, bool bUseSourceControl = true);
-
-    // Returns true if the files have the same content, false otherwise
-    static bool CompareFiles(const QString& strFilePath1, const QString& strFilePath2);
-
-    // Sort Columns( Ascending/Descending )
-    static bool SortAscendingFileNames(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
-    static bool SortDescendingFileNames(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
-    static bool SortAscendingDates(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
-    static bool SortDescendingDates(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
-    static bool SortAscendingSizes(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
-    static bool SortDescendingSizes(const IFileUtil::FileDesc& desc1, const IFileUtil::FileDesc& desc2);
-
-    // Return true is the filepath is a absolute path
-    static bool IsAbsPath(const QString& filepath);
-
-private:
-    // True means to use the custom file dialog, false means to use the smart file open dialog.
-    static bool s_singleFileDlgPref[IFileUtil::EFILE_TYPE_LAST];
-    static bool s_multiFileDlgPref[IFileUtil::EFILE_TYPE_LAST];
-
-    // Keep this variant of this method private! pIsSelected is captured in a lambda, and so requires menu use exec() and never use show()
-    static void PopulateQMenu(QWidget* caller, QMenu* menu, const QString& filename, const QString& fullGamePath, bool* pIsSelected);
-
-    static bool ExtractDccFilenameFromAssetDatabase(const QString& assetFilename, QString& dccFilename);
-    static bool ExtractDccFilenameUsingNamingConventions(const QString& assetFilename, QString& dccFilename);
-};
-
-class CAutoRestorePrimaryCDRoot
-{
-public:
-    ~CAutoRestorePrimaryCDRoot();
-};
-
-//
-// A helper for creating a temp file to write to, then copying that over the destination
-// file only if it changes (to avoid requiring the user to check out source controlled
-// file unnecessarily)
-//
-class SANDBOX_API CTempFileHelper
-{
-public:
-    CTempFileHelper(const char* pFileName);
-    ~CTempFileHelper();
-
-    // Gets the path to the temp file that should be written to
-    const QString& GetTempFilePath() { return m_tempFileName; }
-
-    // After the temp file has been written and closed, this should be called to update
-    // the destination file.
-    // If bBackup is true CFileUtil::BackupFile will be called if the file has changed.
-    bool UpdateFile(bool bBackup);
-
-private:
-    QString m_fileName;
-    QString m_tempFileName;
-};
diff --git a/Code/Sandbox/Editor/Util/FileUtil_impl.cpp b/Code/Sandbox/Editor/Util/FileUtil_impl.cpp
deleted file mode 100644
index f323d3794c..0000000000
--- a/Code/Sandbox/Editor/Util/FileUtil_impl.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "FileUtil_impl.h"
-
-bool CFileUtil_impl::ScanDirectory(const QString& path, const QString& fileSpec, FileArray& files, bool recursive, bool addDirAlso, ScanDirectoryUpdateCallBack updateCB, bool bSkipPaks)
-{
-    return CFileUtil::ScanDirectory(path, fileSpec, files, recursive, addDirAlso, updateCB, bSkipPaks);
-}
-
-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);
-}
-
-bool CFileUtil_impl::CalculateDccFilename(const QString& assetFilename, QString& dccFilename)
-{
-    return CFileUtil::CalculateDccFilename(assetFilename, dccFilename);
-}
-
-void CFileUtil_impl::FormatFilterString(QString& filter)
-{
-    CFileUtil::FormatFilterString(filter);
-}
-
-bool CFileUtil_impl::SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName)
-{
-    return CFileUtil::SelectSaveFile(fileFilter, defaulExtension, startFolder, fileName);
-}
-
-bool CFileUtil_impl::OverwriteFile(const QString& filename)
-{
-    return CFileUtil::OverwriteFile(filename);
-}
-
-bool CFileUtil_impl::CheckoutFile(const char* filename, QWidget* parentWindow)
-{
-    return CFileUtil::CheckoutFile(filename, parentWindow);
-}
-
-bool CFileUtil_impl::RevertFile(const char* filename, QWidget* parentWindow)
-{
-    return CFileUtil::RevertFile(filename, parentWindow);
-}
-
-bool CFileUtil_impl::RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow)
-{
-    return CFileUtil::RenameFile(sourceFile, targetFile, parentWindow);
-}
-
-bool CFileUtil_impl::DeleteFromSourceControl(const char* filename, QWidget* parentWindow)
-{
-    return CFileUtil::DeleteFromSourceControl(filename, parentWindow);
-}
-
-bool CFileUtil_impl::GetLatestFromSourceControl(const char* filename, QWidget* parentWindow)
-{
-    return CFileUtil::GetLatestFromSourceControl(filename, parentWindow);
-}
-
-bool CFileUtil_impl::GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow)
-{
-    return CFileUtil::GetFileInfoFromSourceControl(filename, fileInfo, parentWindow);
-}
-
-void CFileUtil_impl::CreateDirectory(const char* dir)
-{
-    CFileUtil::CreateDirectory(dir);
-}
-
-void CFileUtil_impl::BackupFile(const char* filename)
-{
-    CFileUtil::BackupFile(filename);
-}
-
-void CFileUtil_impl::BackupFileDated(const char* filename, bool bUseBackupSubDirectory)
-{
-    CFileUtil::BackupFileDated(filename, bUseBackupSubDirectory);
-}
-
-bool CFileUtil_impl::Deltree(const char* szFolder, bool bRecurse)
-{
-    return CFileUtil::Deltree(szFolder, bRecurse);
-}
-
-bool CFileUtil_impl::Exists(const QString& strPath, bool boDirectory, FileDesc* pDesc)
-{
-    return CFileUtil::Exists(strPath, boDirectory, pDesc);
-}
-
-bool CFileUtil_impl::FileExists(const QString& strFilePath, FileDesc* pDesc)
-{
-    return CFileUtil::FileExists(strFilePath, pDesc);
-}
-
-bool CFileUtil_impl::PathExists(const QString& strPath)
-{
-    return CFileUtil::PathExists(strPath);
-}
-
-bool CFileUtil_impl::GetDiskFileSize(const char* pFilePath, uint64& rOutSize)
-{
-    return CFileUtil::GetDiskFileSize(pFilePath, rOutSize);
-}
-
-bool CFileUtil_impl::IsFileExclusivelyAccessable(const QString& strFilePath)
-{
-    return CFileUtil::IsFileExclusivelyAccessable(strFilePath);
-}
-
-bool CFileUtil_impl::CreatePath(const QString& strPath)
-{
-    return CFileUtil::CreatePath(strPath);
-}
-
-bool CFileUtil_impl::DeleteFile(const QString& strPath)
-{
-    return CFileUtil::DeleteFile(strPath);
-}
-
-bool CFileUtil_impl::RemoveDirectory(const QString& strPath)
-{
-    return CFileUtil::RemoveDirectory(strPath);
-}
-
-IFileUtil::ECopyTreeResult CFileUtil_impl::CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse, bool boConfirmOverwrite)
-{
-    return CFileUtil::CopyTree(strSourceDirectory, strTargetDirectory, boRecurse, boConfirmOverwrite);
-}
-
-IFileUtil::ECopyTreeResult CFileUtil_impl::CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite, ProgressRoutine pfnProgress, bool* pbCancel)
-{
-    return CFileUtil::CopyFile(strSourceFile, strTargetFile, boConfirmOverwrite, pfnProgress, pbCancel);
-}
-
-IFileUtil::ECopyTreeResult CFileUtil_impl::MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse, bool boConfirmOverwrite)
-{
-    return CFileUtil::MoveTree(strSourceDirectory, strTargetDirectory, boRecurse, boConfirmOverwrite);
-}
-
-void CFileUtil_impl::GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase, bool bMakeUnixPath)
-{
-    CFileUtil::GatherAssetFilenamesFromLevel(rOutFilenames, bMakeLowerCase, bMakeUnixPath);
-}
-
-uint32 CFileUtil_impl::GetAttributes(const char* filename, bool bUseSourceControl)
-{
-    return CFileUtil::GetAttributes(filename, bUseSourceControl);
-}
-
-bool CFileUtil_impl::CompareFiles(const QString& strFilePath1, const QString& strFilePath2)
-{
-    return CFileUtil::CompareFiles(strFilePath1, strFilePath2);
-}
-
-QString CFileUtil_impl::GetPath(const QString& path)
-{
-    return Path::GetPath(path);
-}
-
-
diff --git a/Code/Sandbox/Editor/Util/FileUtil_impl.h b/Code/Sandbox/Editor/Util/FileUtil_impl.h
deleted file mode 100644
index 9acc152974..0000000000
--- a/Code/Sandbox/Editor/Util/FileUtil_impl.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "Include/IFileUtil.h"
-
-#ifdef DeleteFile
-#undef DeleteFile
-#endif
-
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
-
-#ifdef RemoveDirectory
-#undef RemoveDirectory
-#endif
-
-#ifdef CopyFile
-#undef CopyFile
-#endif
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class SANDBOX_API CFileUtil_impl
-    : public IFileUtil
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    bool ScanDirectory(const QString& path, const QString& fileSpec, FileArray& files, bool recursive = true, bool addDirAlso = false, ScanDirectoryUpdateCallBack updateCB = nullptr, bool bSkipPaks = false) override;
-
-    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
-    bool CalculateDccFilename(const QString& assetFilename, QString& dccFilename) override;
-
-    //! Reformat filter string for (MFC) CFileDialog style file filtering
-    void FormatFilterString(QString& filter) override;
-
-    bool SelectSaveFile(const QString& fileFilter, const QString& defaulExtension, const QString& startFolder, QString& fileName) override;
-
-    //! Attempt to make a file writable
-    bool OverwriteFile(const QString& filename) override;
-
-    //! Checks out the file from source control API.  Blocks until completed
-    bool CheckoutFile(const char* filename, QWidget* parentWindow = nullptr) override;
-
-    //! Discard changes to a file from source control API.  Blocks until completed
-    bool RevertFile(const char* filename, QWidget* parentWindow = nullptr) override;
-
-    //! Renames (moves) a file through the source control API.  Blocks until completed
-    bool RenameFile(const char* sourceFile, const char* targetFile, QWidget* parentWindow = nullptr) override;
-
-    //! Deletes a file using source control API.  Blocks until completed.
-    bool DeleteFromSourceControl(const char* filename, QWidget* parentWindow = nullptr) override;
-
-    //! Attempts to get the latest version of a file from source control.  Blocks until completed
-    bool GetLatestFromSourceControl(const char* filename, QWidget* parentWindow = nullptr) override;
-
-    //! Gather information about a file using the source control API.  Blocks until completed
-    bool GetFileInfoFromSourceControl(const char* filename, AzToolsFramework::SourceControlFileInfo& fileInfo, QWidget* parentWindow = nullptr) override;
-
-    //! Creates this directory.
-    void CreateDirectory(const char* dir) override;
-
-    //! Makes a backup file.
-    void BackupFile(const char* filename) override;
-
-    //! Makes a backup file, marked with a datestamp, e.g. myfile.20071014.093320.xml
-    //! If bUseBackupSubDirectory is true, moves backup file into a relative subdirectory "backups"
-    void BackupFileDated(const char* filename, bool bUseBackupSubDirectory = false) override;
-
-    // ! Added deltree as a copy from the function found in Crypak.
-    bool Deltree(const char* szFolder, bool bRecurse) override;
-
-    // Checks if a file or directory exist.
-    // We are using 3 functions here in order to make the names more instructive for the programmers.
-    // Those functions only work for OS files and directories.
-    bool Exists(const QString& strPath, bool boDirectory, FileDesc* pDesc = nullptr) override;
-    bool FileExists(const QString& strFilePath, FileDesc* pDesc = nullptr) override;
-    bool PathExists(const QString& strPath) override;
-    bool GetDiskFileSize(const char* pFilePath, uint64& rOutSize) override;
-
-    // This function should be used only with physical files.
-    bool IsFileExclusivelyAccessable(const QString& strFilePath) override;
-
-    // Creates the entire path, if needed.
-    bool CreatePath(const QString& strPath) override;
-
-    // Attempts to delete a file (if read only it will set its attributes to normal first).
-    bool DeleteFile(const QString& strPath) override;
-
-    // Attempts to remove a directory (if read only it will set its attributes to normal first).
-    bool RemoveDirectory(const QString& strPath) override;
-
-    // Copies all the elements from the source directory to the target directory.
-    // It doesn't copy the source folder to the target folder, only it's contents.
-    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
-    ECopyTreeResult CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
-    // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
-    ECopyTreeResult CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = NULL, bool* pbCancel = NULL) override;
-
-    // As we don't have a FileUtil interface here, we have to duplicate some code :-( in order to keep
-    // function calls clean.
-    // Moves all the elements from the source directory to the target directory.
-    // It doesn't move the source folder to the target folder, only it's contents.
-    // THIS FUNCTION IS NOT DESIGNED FOR MULTI-THREADED USAGE
-    ECopyTreeResult MoveTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) override;
-
-    void GatherAssetFilenamesFromLevel(std::set<QString>& rOutFilenames, bool bMakeLowerCase = false, bool bMakeUnixPath = false) override;
-
-    // Get file attributes include source control attributes if available
-    uint32 GetAttributes(const char* filename, bool bUseSourceControl = true) override;
-
-    // Returns true if the files have the same content, false otherwise
-    bool CompareFiles(const QString& strFilePath1, const QString& strFilePath2) override;
-
-    // Extract path from full specified file path.
-    QString GetPath(const QString& path) override;
-};
-
diff --git a/Code/Sandbox/Editor/Util/GdiUtil.cpp b/Code/Sandbox/Editor/Util/GdiUtil.cpp
deleted file mode 100644
index 8dd46d8f1f..0000000000
--- a/Code/Sandbox/Editor/Util/GdiUtil.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "GdiUtil.h"
-
-// Qt
-#include <QPainter>
-#include <QMessageBox>
-
-bool ComputeThumbsLayoutInfo(float aContainerWidth, float aThumbWidth, float aMargin, UINT aThumbCount, UINT& rThumbsPerRow, float& rNewMargin)
-{
-    rThumbsPerRow = 0;
-    rNewMargin = 0;
-
-    if (aThumbWidth <= 0 || aMargin <= 0 || (aThumbWidth + aMargin * 2) <= 0)
-    {
-        return false;
-    }
-
-    if (aContainerWidth <= 0)
-    {
-        return true;
-    }
-
-    rThumbsPerRow = (int) aContainerWidth / (aThumbWidth + aMargin * 2);
-
-    if ((aThumbWidth + aMargin * 2) * aThumbCount < aContainerWidth)
-    {
-        rNewMargin = aMargin;
-    }
-    else
-    {
-        if (rThumbsPerRow > 0)
-        {
-            rNewMargin = (aContainerWidth - rThumbsPerRow * aThumbWidth);
-
-            if (rNewMargin > 0)
-            {
-                rNewMargin = (float)rNewMargin / rThumbsPerRow / 2.0f;
-            }
-        }
-    }
-
-    return true;
-}
-
-QColor ScaleColor(const QColor& c, float aScale)
-{
-    QColor aColor = c;
-    if (!aColor.isValid())
-    {
-        // help out scaling, by starting at very low black
-        aColor = QColor(1, 1, 1);
-    }
-
-    int r = aColor.red();
-    int g = aColor.green();
-    int b = aColor.blue();
-
-    r *= aScale;
-    g *= aScale;
-    b *= aScale;
-
-    return QColor(CLAMP(r, 0, 255), CLAMP(g, 0, 255), CLAMP(b, 0, 255));
-}
-
-CAlphaBitmap::CAlphaBitmap()
-{
-    m_width = m_height = 0;
-}
-
-CAlphaBitmap::~CAlphaBitmap()
-{
-    Free();
-}
-
-bool CAlphaBitmap::Create(void* pData, UINT aWidth, UINT aHeight, bool bVerticalFlip, bool bPremultiplyAlpha)
-{
-    if (!aWidth || !aHeight)
-    {
-        return false;
-    }
-
-    m_bmp = QImage(aWidth, aHeight, QImage::Format_RGBA8888);
-    if (m_bmp.isNull())
-    {
-        return false;
-    }
-
-    std::vector<UINT> vBuffer;
-
-    if (pData)
-    {
-        // copy over the raw 32bpp data
-        bVerticalFlip = !bVerticalFlip; // in Qt, the flip is not required. Still, keep the API behaving the same
-        if (bVerticalFlip)
-        {
-            UINT nBufLen = aWidth * aHeight;
-            vBuffer.resize(nBufLen);
-
-            if (IsBadReadPtr(pData, nBufLen * 4))
-            {
-                //TODO: remove after testing alot the browser, it doesnt happen anymore
-                QMessageBox::critical(QApplication::activeWindow(), QString(), QObject::tr("Bad image data ptr!"));
-                Free();
-                return false;
-            }
-
-            assert(!vBuffer.empty());
-
-            if (vBuffer.empty())
-            {
-                Free();
-                return false;
-            }
-
-            UINT scanlineSize = aWidth * 4;
-
-            for (UINT i = 0, iCount = aHeight; i < iCount; ++i)
-            {
-                // top scanline position
-                UINT* pTopScanPos = (UINT*)&vBuffer[0] + i * aWidth;
-                // bottom scanline position
-                UINT* pBottomScanPos = (UINT*)pData + (aHeight - i - 1) * aWidth;
-
-                // save a scanline from top
-                memcpy(pTopScanPos, pBottomScanPos, scanlineSize);
-            }
-
-            pData = &vBuffer[0];
-        }
-
-        // premultiply alpha, AlphaBlend GDI expects it
-        if (bPremultiplyAlpha)
-        {
-            for (UINT y = 0; y < aHeight; ++y)
-            {
-                BYTE* pPixel = (BYTE*) pData + aWidth * 4 * y;
-
-                for (UINT x = 0; x < aWidth; ++x)
-                {
-                    pPixel[0] = ((int)pPixel[0] * pPixel[3] + 127) >> 8;
-                    pPixel[1] = ((int)pPixel[1] * pPixel[3] + 127) >> 8;
-                    pPixel[2] = ((int)pPixel[2] * pPixel[3] + 127) >> 8;
-                    pPixel += 4;
-                }
-            }
-        }
-
-        memcpy(m_bmp.bits(), pData, aWidth * aHeight * 4);
-
-        if (m_bmp.isNull())
-        {
-            return false;
-        }
-    }
-    else
-    {
-        m_bmp.fill(Qt::transparent);
-    }
-
-    // we dont need this screen DC anymore
-    m_width = aWidth;
-    m_height = aHeight;
-
-    return true;
-}
-
-QImage& CAlphaBitmap::GetBitmap()
-{
-    return m_bmp;
-}
-
-void CAlphaBitmap::Free()
-{
-
-}
-
-UINT CAlphaBitmap::GetWidth()
-{
-    return m_width;
-}
-
-UINT CAlphaBitmap::GetHeight()
-{
-    return m_height;
-}
-
-void CheckerboardFillRect(QPainter* pGraphics, const QRect& rRect, int checkDiameter, const QColor& aColor1, const QColor& aColor2)
-{
-    pGraphics->save();
-    pGraphics->setClipRect(rRect);
-    // Create a checkerboard background for easier readability
-    pGraphics->fillRect(rRect, aColor1);
-    QBrush lightBrush(aColor2);
-
-    // QRect bottom/right methods are short one unit for legacy reasons. Compute bottomr/right of the rectange ourselves to get the full size.
-    const int rectRight = rRect.x() + rRect.width();
-    const int rectBottom = rRect.y() + rRect.height();
-
-    for (int i = rRect.left(); i < rectRight; i += checkDiameter)
-    {
-        for (int j = rRect.top(); j < rectBottom; j += checkDiameter)
-        {
-            if ((i / checkDiameter) % 2 ^ (j / checkDiameter) % 2)
-            {
-                pGraphics->fillRect(QRect(i, j, checkDiameter, checkDiameter), lightBrush);
-            }
-        }
-    }
-    pGraphics->restore();
-}
diff --git a/Code/Sandbox/Editor/Util/GdiUtil.h b/Code/Sandbox/Editor/Util/GdiUtil.h
deleted file mode 100644
index d8890cbaca..0000000000
--- a/Code/Sandbox/Editor/Util/GdiUtil.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Utilitarian classes for double buffer GDI rendering and 32bit bitmaps
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_GDIUTIL_H
-#define CRYINCLUDE_EDITOR_UTIL_GDIUTIL_H
-#pragma once
-
-//! function used to compute thumbs per row and spacing, used in asset browser and other tools where thumb layout is needed and maybe GDI canvas used
-//! \param aContainerWidth the thumbs' container width
-//! \param aThumbWidth the thumb image width
-//! \param aMargin the thumb default minimum horizontal margin
-//! \param aThumbCount the thumb count
-//! \param rThumbsPerRow returned thumb count per single row
-//! \param rNewMargin returned new computed margin between thumbs
-//! \note The margin between thumbs will grow/shrink dynamically to keep up with the thumb count per row
-bool ComputeThumbsLayoutInfo(float aContainerWidth, float aThumbWidth, float aMargin, UINT aThumbCount, UINT& rThumbsPerRow, float& rNewMargin);
-
-QColor ScaleColor(const QColor& coor, float aScale);
-
-//! This class loads alpha-channel bitmaps and holds a DC for use with AlphaBlend function
-class CRYEDIT_API CAlphaBitmap
-{
-public:
-
-    CAlphaBitmap();
-    ~CAlphaBitmap();
-
-    //! creates the bitmap from raw 32bpp data
-    //! \param pData the 32bpp raw image data, RGBA, can be NULL and it would create just an empty bitmap
-    //! \param aWidth the bitmap width
-    //! \param aHeight the bitmap height
-    bool            Create(void* pData, UINT aWidth, UINT aHeight, bool bVerticalFlip = false, bool bPremultiplyAlpha = false);
-    //! \return the actual bitmap
-    QImage&    GetBitmap();
-    //! free the bitmap and DC
-    void            Free();
-    //! \return bitmap width
-    UINT            GetWidth();
-    //! \return bitmap height
-    UINT            GetHeight();
-
-protected:
-
-    QImage m_bmp;
-    UINT        m_width, m_height;
-};
-
-//! Fill a rectangle with a checkerboard pattern.
-//! \param pGraphics The Graphics object used for drawing
-//! \param rRect The rectangle to be filled
-//! \param checkDiameter the diameter of the check squares
-//! \param aColor1 the color that starts in the top left corner check square
-//! \param aColor2 the second color used for check squares
-void CheckerboardFillRect(QPainter* pGraphics, const QRect& rRect, int checkDiameter, const QColor& aColor1, const QColor& aColor2);
-#endif // CRYINCLUDE_EDITOR_UTIL_GDIUTIL_H
diff --git a/Code/Sandbox/Editor/Util/GeometryUtil.cpp b/Code/Sandbox/Editor/Util/GeometryUtil.cpp
deleted file mode 100644
index f26b000ec4..0000000000
--- a/Code/Sandbox/Editor/Util/GeometryUtil.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "GeometryUtil.h"
-
-#if 0
-struct SPointSorter
-{
-    SPointSorter(const Vec3& pt)
-        : pt(pt) {}
-    bool operator()(const Vec3& lhs, const Vec3& rhs)
-    {
-        float isLeft = IsLeft(pt, lhs, rhs);
-        if (isLeft > 0.0f)
-        {
-            return true;
-        }
-        else if (isLeft < 0.0f)
-        {
-            return false;
-        }
-        else
-        {
-            return (lhs - pt).GetLengthSquared2D() < (rhs - pt).GetLengthSquared2D();
-        }
-    }
-    const Vec3 pt;
-};
-
-//===================================================================
-// ConvexHull2D
-// Implements Graham's scan
-//===================================================================
-void ConvexHull2DGraham(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_AI);
-    const unsigned nPtsIn = ptsIn.size();
-    if (nPtsIn < 3)
-    {
-        ptsOut = ptsIn;
-        return;
-    }
-    unsigned iBotRight = 0;
-    for (unsigned iPt = 1; iPt < nPtsIn; ++iPt)
-    {
-        if (ptsIn[iPt].y < ptsIn[iBotRight].y)
-        {
-            iBotRight = iPt;
-        }
-        else if (ptsIn[iPt].y == ptsIn[iBotRight].y && ptsIn[iPt].x < ptsIn[iBotRight].x)
-        {
-            iBotRight = iPt;
-        }
-    }
-
-    static std::vector<Vec3> ptsSorted; // avoid memory allocation
-    ptsSorted.assign(ptsIn.begin(), ptsIn.end());
-
-    std::swap(ptsSorted[0], ptsSorted[iBotRight]);
-    {
-        FRAME_PROFILER("SORT Graham", gEnv->pSystem, PROFILE_AI)
-        std::sort(ptsSorted.begin() + 1, ptsSorted.end(), SPointSorter(ptsSorted[0]));
-    }
-    ptsSorted.erase(std::unique(ptsSorted.begin(), ptsSorted.end(), ptEqual), ptsSorted.end());
-
-    const unsigned nPtsSorted = ptsSorted.size();
-    if (nPtsSorted < 3)
-    {
-        ptsOut = ptsSorted;
-        return;
-    }
-
-    ptsOut.resize(0);
-    ptsOut.push_back(ptsSorted[0]);
-    ptsOut.push_back(ptsSorted[1]);
-    unsigned int i = 2;
-    while (i < nPtsSorted)
-    {
-        if (ptsOut.size() <= 1)
-        {
-            AIWarning("Badness in ConvexHull2D");
-            AILogComment("i = %d ptsIn = ", i);
-            for (unsigned j = 0; j < ptsIn.size(); ++j)
-            {
-                AILogComment("%6.3f, %6.3f, %6.3f", ptsIn[j].x, ptsIn[j].y, ptsIn[j].z);
-            }
-            AILogComment("ptsSorted = ");
-            for (unsigned j = 0; j < ptsSorted.size(); ++j)
-            {
-                AILogComment("%6.3f, %6.3f, %6.3f", ptsSorted[j].x, ptsSorted[j].y, ptsSorted[j].z);
-            }
-            ptsOut.resize(0);
-            return;
-        }
-        const Vec3& pt1 = ptsOut[ptsOut.size() - 1];
-        const Vec3& pt2 = ptsOut[ptsOut.size() - 2];
-        const Vec3& p = ptsSorted[i];
-        float isLeft = IsLeft(pt2, pt1, p);
-        if (isLeft > 0.0f)
-        {
-            ptsOut.push_back(p);
-            ++i;
-        }
-        else if (isLeft < 0.0f)
-        {
-            ptsOut.pop_back();
-        }
-        else
-        {
-            ptsOut.pop_back();
-            ptsOut.push_back(p);
-            ++i;
-        }
-    }
-}
-#endif
-
-//===================================================================
-// IsLeft: tests if a point is Left|On|Right of an infinite line.
-//    Input:  three points P0, P1, and P2
-//    Return: >0 for P2 left of the line through P0 and P1
-//            =0 for P2 on the line
-//            <0 for P2 right of the line
-//===================================================================
-inline float IsLeft(Vec3 P0, Vec3 P1, const Vec3& P2)
-{
-    bool swap = false;
-    if (P0.x < P1.x)
-    {
-        swap = true;
-    }
-    else if (P0.x == P1.x && P0.y < P1.y)
-    {
-        swap = true;
-    }
-
-    if (swap)
-    {
-        std::swap(P0, P1);
-    }
-
-    float res = (P1.x - P0.x) * (P2.y - P0.y) - (P2.x - P0.x) * (P1.y - P0.y);
-    const float tol = 0.0000f;
-    if (res > tol || res < -tol)
-    {
-        return swap ? -res : res;
-    }
-    else
-    {
-        return 0.0f;
-    }
-}
-
-inline bool ptEqual(const Vec3& lhs, const Vec3& rhs)
-{
-    const float tol = 0.01f;
-    return (fabs(lhs.x - rhs.x) < tol) && (fabs(lhs.y - rhs.y) < tol);
-}
-
-inline float IsLeftAndrew(const Vec3& p0, const Vec3& p1, const Vec3& p2)
-{
-    return (p1.x - p0.x) * (p2.y - p0.y) - (p2.x - p0.x) * (p1.y - p0.y);
-}
-
-inline bool PointSorterAndrew(const Vec3& lhs, const Vec3& rhs)
-{
-    if (lhs.x < rhs.x)
-    {
-        return true;
-    }
-    if (lhs.x > rhs.x)
-    {
-        return false;
-    }
-    return lhs.y < rhs.y;
-}
-
-//===================================================================
-// ConvexHull2D
-// Implements Andrew's algorithm
-//
-// Copyright 2001, softSurfer (www.softsurfer.com)
-// This code may be freely used and modified for any purpose
-// providing that this copyright notice is included with it.
-// SoftSurfer makes no warranty for this code, and cannot be held
-// liable for any real or imagined damage resulting from its use.
-// Users of this code must verify correctness for their application.
-//===================================================================
-SANDBOX_API void ConvexHull2DAndrew(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn)
-{
-    FUNCTION_PROFILER(gEnv->pSystem, PROFILE_AI);
-    const int n = (int)ptsIn.size();
-    if (n < 3)
-    {
-        ptsOut = ptsIn;
-        return;
-    }
-
-    std::vector<Vec3> P = ptsIn;
-    {
-        FRAME_PROFILER("SORT Andrew", gEnv->pSystem, PROFILE_AI)
-        std::sort(P.begin(), P.end(), PointSorterAndrew);
-    }
-
-    // the output array ptsOut[] will be used as the stack
-    int i;
-
-    ptsOut.clear();
-    ptsOut.reserve(P.size());
-
-    // Get the indices of points with min x-coord and min|max y-coord
-    int minmin = 0, minmax;
-    float xmin = P[0].x;
-    for (i = 1; i < n; i++)
-    {
-        if (P[i].x != xmin)
-        {
-            break;
-        }
-    }
-
-    minmax = i - 1;
-    if (minmax == n - 1)
-    {
-        // degenerate case: all x-coords == xmin
-        ptsOut.push_back(P[minmin]);
-        if (P[minmax].y != P[minmin].y) // a nontrivial segment
-        {
-            ptsOut.push_back(P[minmax]);
-        }
-        ptsOut.push_back(P[minmin]);           // add polygon endpoint
-        return;
-    }
-
-    // Get the indices of points with max x-coord and min|max y-coord
-    int maxmin, maxmax = n - 1;
-    float xmax = P[n - 1].x;
-    for (i = n - 2; i >= 0; i--)
-    {
-        if (P[i].x != xmax)
-        {
-            break;
-        }
-    }
-    maxmin = i + 1;
-
-    // Compute the lower hull on the stack H
-    ptsOut.push_back(P[minmin]);      // push minmin point onto stack
-    i = minmax;
-    while (++i <= maxmin)
-    {
-        // the lower line joins P[minmin] with P[maxmin]
-        if (IsLeftAndrew(P[minmin], P[maxmin], P[i]) >= 0 && i < maxmin)
-        {
-            continue;          // ignore P[i] above or on the lower line
-        }
-        while ((int)ptsOut.size() > 1) // there are at least 2 points on the stack
-        {
-            // test if P[i] is left of the line at the stack top
-            if (IsLeftAndrew(ptsOut[ptsOut.size() - 2], ptsOut.back(), P[i]) > 0)
-            {
-                break;         // P[i] is a new hull vertex
-            }
-            else
-            {
-                ptsOut.pop_back(); // pop top point off stack
-            }
-        }
-        ptsOut.push_back(P[i]);       // push P[i] onto stack
-    }
-
-    // Next, compute the upper hull on the stack H above the bottom hull
-    if (maxmax != maxmin)      // if distinct xmax points
-    {
-        ptsOut.push_back(P[maxmax]);  // push maxmax point onto stack
-    }
-    int bot = (int)ptsOut.size() - 1;                 // the bottom point of the upper hull stack
-    i = maxmin;
-    while (--i >= minmax)
-    {
-        // the upper line joins P[maxmax] with P[minmax]
-        if (IsLeftAndrew(P[maxmax], P[minmax], P[i]) >= 0 && i > minmax)
-        {
-            continue;          // ignore P[i] below or on the upper line
-        }
-        while ((int)ptsOut.size() > bot + 1)    // at least 2 points on the upper stack
-        {
-            // test if P[i] is left of the line at the stack top
-            if (IsLeftAndrew(ptsOut[ptsOut.size() - 2], ptsOut.back(), P[i]) > 0)
-            {
-                break;         // P[i] is a new hull vertex
-            }
-            else
-            {
-                ptsOut.pop_back();         // pop top po2int off stack
-            }
-        }
-        ptsOut.push_back(P[i]);       // push P[i] onto stack
-    }
-    if (minmax != minmin)
-    {
-        ptsOut.push_back(P[minmin]);  // push joining endpoint onto stack
-    }
-    if (!ptsOut.empty() && ptEqual(ptsOut.front(), ptsOut.back()))
-    {
-        ptsOut.pop_back();
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/GeometryUtil.h b/Code/Sandbox/Editor/Util/GeometryUtil.h
deleted file mode 100644
index a97ceb2c54..0000000000
--- a/Code/Sandbox/Editor/Util/GeometryUtil.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Geometry utilities
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_GEOMETRYUTIL_H
-#define CRYINCLUDE_EDITOR_UTIL_GEOMETRYUTIL_H
-#pragma once
-void ConvexHull2DGraham(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn);
-//! Generates 2D convex hull from ptsIn using Andrew's algorithm.
-SANDBOX_API void ConvexHull2DAndrew(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn);
-
-//! Generates 2D convex hull from ptsIn
-inline void ConvexHull2D(std::vector<Vec3>& ptsOut, const std::vector<Vec3>& ptsIn)
-{
-    // [Mikko] Note: The convex hull calculation is bound by the sorting.
-    // The sort in Andrew's seems to be about 3-4x faster than Graham's--using Andrew's for now.
-    ConvexHull2DAndrew(ptsOut, ptsIn);
-}
-#endif // CRYINCLUDE_EDITOR_UTIL_GEOMETRYUTIL_H
diff --git a/Code/Sandbox/Editor/Util/GuidUtil.cpp b/Code/Sandbox/Editor/Util/GuidUtil.cpp
deleted file mode 100644
index 13f0526531..0000000000
--- a/Code/Sandbox/Editor/Util/GuidUtil.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "GuidUtil.h"
-
-//////////////////////////////////////////////////////////////////////////
-const GUID GuidUtil::NullGuid = {
-    0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }
-};
diff --git a/Code/Sandbox/Editor/Util/GuidUtil.h b/Code/Sandbox/Editor/Util/GuidUtil.h
deleted file mode 100644
index 5fec45779b..0000000000
--- a/Code/Sandbox/Editor/Util/GuidUtil.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Utility functions to work with GUIDs.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_GUIDUTIL_H
-#define CRYINCLUDE_EDITOR_UTIL_GUIDUTIL_H
-#pragma once
-
-#include "AzCore/Math/Uuid.h"
-
-struct GuidUtil
-{
-    //! Convert GUID to string in the valid format.
-    //! The valid format for a GUID is {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} where X is a hex digit.
-    static const char* ToString(REFGUID guid);
-    //! Convert from guid string in valid format to GUID class.
-    static GUID FromString(const char* guidString);
-    static bool IsEmpty(REFGUID guid);
-
-    static const GUID NullGuid;
-};
-
-/** Used to compare GUID keys.
-*/
-struct guid_less_predicate
-{
-    bool operator()(REFGUID guid1, REFGUID guid2) const
-    {
-        return memcmp(&guid1, &guid2, sizeof(GUID)) < 0;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-inline bool GuidUtil::IsEmpty(REFGUID guid)
-{
-    return guid == NullGuid;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline const char* GuidUtil::ToString(REFGUID guid)
-{
-    static char guidString[64];
-    sprintf_s(guidString, "{%.8X-%.4X-%.4X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X}", guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1],
-        guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
-    return guidString;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline GUID GuidUtil::FromString(const char* guidString)
-{
-    GUID guid;
-    unsigned int d[8];
-    memset(&d, 0, sizeof(guid));
-    guid.Data1 = 0;
-    guid.Data2 = 0;
-    guid.Data3 = 0;
-    azsscanf(guidString, "{%8" SCNx32 "-%4hX-%4hX-%2X%2X-%2X%2X%2X%2X%2X%2X}",
-        &guid.Data1, &guid.Data2, &guid.Data3, &d[0], &d[1], &d[2], &d[3], &d[4], &d[5], &d[6], &d[7]);
-    guid.Data4[0] = d[0];
-    guid.Data4[1] = d[1];
-    guid.Data4[2] = d[2];
-    guid.Data4[3] = d[3];
-    guid.Data4[4] = d[4];
-    guid.Data4[5] = d[5];
-    guid.Data4[6] = d[6];
-    guid.Data4[7] = d[7];
-
-    return guid;
-}
-
-#endif // CRYINCLUDE_EDITOR_UTIL_GUIDUTIL_H
diff --git a/Code/Sandbox/Editor/Util/IObservable.h b/Code/Sandbox/Editor/Util/IObservable.h
deleted file mode 100644
index 81188909ec..0000000000
--- a/Code/Sandbox/Editor/Util/IObservable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Handy macro when working with observers in interfaces
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_IOBSERVABLE_H
-#define CRYINCLUDE_EDITOR_UTIL_IOBSERVABLE_H
-#pragma once
-#define DEFINE_OBSERVABLE_PURE_METHODS(observerClassName)               \
-    virtual bool RegisterObserver(observerClassName * pObserver) = 0;   \
-    virtual bool UnregisterObserver(observerClassName * pObserver) = 0; \
-    virtual void UnregisterAllObservers() = 0;
-#endif // CRYINCLUDE_EDITOR_UTIL_IOBSERVABLE_H
diff --git a/Code/Sandbox/Editor/Util/IXmlHistoryManager.h b/Code/Sandbox/Editor/Util/IXmlHistoryManager.h
deleted file mode 100644
index d98658967d..0000000000
--- a/Code/Sandbox/Editor/Util/IXmlHistoryManager.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_IXMLHISTORYMANAGER_H
-#define CRYINCLUDE_EDITOR_UTIL_IXMLHISTORYMANAGER_H
-#pragma once
-
-
-// Helper class to handle Redo/Undo on set of Xml nodes
-struct IXmlUndoEventHandler
-{
-    virtual bool SaveToXml(XmlNodeRef& xmlNode) = 0;
-    virtual bool LoadFromXml(const XmlNodeRef& xmlNode) = 0;
-    virtual bool ReloadFromXml(const XmlNodeRef& xmlNode) = 0;
-};
-
-struct IXmlHistoryEventListener
-{
-    enum EHistoryEventType
-    {
-        eHET_HistoryDeleted,
-        eHET_HistoryCleared,
-        eHET_HistorySaved,
-
-        eHET_VersionChanged,
-        eHET_VersionAdded,
-
-        eHET_HistoryInvalidate,
-
-        eHET_HistoryGroupChanged,
-        eHET_HistoryGroupAdded,
-        eHET_HistoryGroupRemoved,
-    };
-    virtual void OnEvent(EHistoryEventType event, void* pData = NULL) = 0;
-};
-
-struct IXmlHistoryView
-{
-    virtual bool LoadXml(int typeId, const XmlNodeRef& xmlNode, IXmlUndoEventHandler*& pUndoEventHandler, uint32 userindex) = 0;
-    virtual void UnloadXml(int typeId) = 0;
-};
-
-struct IXmlHistoryManager
-{
-    // Undo/Redo
-    virtual bool Undo() = 0;
-    virtual bool Redo() = 0;
-    virtual bool Goto(int historyNum) = 0;
-    virtual void RecordUndo(IXmlUndoEventHandler* pEventHandler, const char* desc) = 0;
-    virtual void UndoEventHandlerDestroyed(IXmlUndoEventHandler* pEventHandler, uint32 typeId = 0, bool destoryForever = false) = 0;
-    virtual void RestoreUndoEventHandler(IXmlUndoEventHandler* pEventHandler, uint32 typeId) = 0;
-
-    virtual void RegisterEventListener(IXmlHistoryEventListener* pEventListener) = 0;
-    virtual void UnregisterEventListener(IXmlHistoryEventListener* pEventListener) = 0;
-
-    // History
-    virtual void ClearHistory(bool flagAsSaved = false) = 0;
-    virtual int GetVersionCount() const = 0;
-    virtual const string& GetVersionDesc(int number) const = 0;
-    virtual int GetCurrentVersionNumber() const = 0;
-
-    // Views
-    virtual void RegisterView(IXmlHistoryView* pView) = 0;
-    virtual void UnregisterView(IXmlHistoryView* pView) = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_IXMLHISTORYMANAGER_H
diff --git a/Code/Sandbox/Editor/Util/Image.cpp b/Code/Sandbox/Editor/Util/Image.cpp
deleted file mode 100644
index 781eb6aaa6..0000000000
--- a/Code/Sandbox/Editor/Util/Image.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Image implementation,
-
-
-#include "EditorDefs.h"
-
-#include "Image.h"
-
-
-bool CImageEx::ConvertToFloatImage(CFloatImage& dstImage)
-{
-    uint32 pixelMask;
-    float intToFloat;
-
-    switch (GetFormat())
-    {
-    case eTF_Unknown:
-    case eTF_R8G8B8A8:
-        pixelMask = std::numeric_limits<uint8>::max();
-        intToFloat = static_cast<float>(pixelMask);
-        break;
-    case eTF_R16G16:
-        pixelMask = std::numeric_limits<uint16>::max();
-        intToFloat = static_cast<float>(pixelMask);
-        break;
-    default:
-        return false;
-        break;
-    }
-
-    dstImage.Allocate(GetWidth(), GetHeight());
-
-    uint32* srcPixel = GetData();
-    float* dstPixel = dstImage.GetData();
-
-    for (int pixel = 0; pixel < (GetHeight() * GetWidth()); pixel++)
-    {
-        dstPixel[pixel] = clamp_tpl(static_cast<float>(srcPixel[pixel] & pixelMask) / intToFloat, 0.0f, 1.0f);
-    }
-
-    return true;
-}
-
-void CImageEx::SwapRedAndBlue()
-{
-    if (!IsValid())
-    {
-        return;
-    }
-    // Set the loop pointers
-    uint32* pPixData = GetData();
-    uint32* pPixDataEnd = pPixData + GetWidth() * GetHeight();
-    // Switch R and B
-    while (pPixData != pPixDataEnd)
-    {
-        // Extract the bits, shift them, put them back and advance to the next pixel
-        *pPixData = (*pPixData & 0xFF000000) | ((*pPixData & 0x00FF0000) >> 16) | (*pPixData & 0x0000FF00) | ((*pPixData & 0x000000FF) << 16);
-        ++pPixData;
-    }
-}
-
-void CImageEx::ReverseUpDown()
-{
-    if (!IsValid())
-    {
-        return;
-    }
-
-    uint32* pPixData = GetData();
-    uint32* pReversePix = new uint32[GetWidth() * GetHeight()];
-
-    for (int i = GetHeight() - 1, i2 = 0; i >= 0; i--, i2++)
-    {
-        for (int k = 0; k < GetWidth(); k++)
-        {
-            pReversePix[i2 * GetWidth() + k] = pPixData[i * GetWidth() + k];
-        }
-    }
-
-    Attach(pReversePix, GetWidth(), GetHeight());
-}
-
-void CImageEx::FillAlpha(unsigned char value)
-{
-    if (!IsValid())
-    {
-        return;
-    }
-    // Set the loop pointers
-    uint32* pPixData = GetData();
-    uint32* pPixDataEnd = pPixData + GetWidth() * GetHeight();
-    while (pPixData != pPixDataEnd)
-    {
-        *pPixData = (*pPixData & 0x00FFFFFF) | (value << 24);
-        ++pPixData;
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/Image.h b/Code/Sandbox/Editor/Util/Image.h
deleted file mode 100644
index c87f0dc03f..0000000000
--- a/Code/Sandbox/Editor/Util/Image.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Generic image class
-
-
-#include <ITexture.h>
-#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGE_H
-#define CRYINCLUDE_EDITOR_UTIL_IMAGE_H
-#pragma once
-#include "MemoryBlock.h"
-
-
-#include "Util/XmlArchive.h"
-
-enum class ImageRotationDegrees
-{
-    Rotate0,
-    Rotate90,
-    Rotate180,
-    Rotate270
-};
-
-/*!
- *  Templated image class.
- */
-
-template <class T>
-class TImage
-{
-public:
-    TImage()
-        : m_data(0)
-        , m_width(0)
-        , m_height(0)
-        , m_bHasAlphaChannel(false)
-        , m_bIsLimitedHDR(false)
-        , m_bIsCubemap(false)
-        , m_bIsSRGB(true)
-        , m_nNumberOfMipmaps(1)
-        , m_format(eTF_Unknown)
-        , m_strDccFilename("")
-    {
-    }
-    virtual ~TImage() {}
-
-    T&  ValueAt(int x, int y) { return m_data[x + y * m_width]; }
-    const T& ValueAt(int x, int y) const { return m_data[x + y * m_width]; }
-
-    const T& ValueAtSafe(int x, int y) const
-    {
-        static T zero = 0;
-        if (0 <= x && x < m_width && 0 <= y && y < m_height)
-        {
-            return m_data[x + y * m_width];
-        }
-        return zero;
-    }
-
-    T*  GetData() const { return m_data; }
-    int GetWidth() const { return m_width; }
-    int GetHeight() const { return m_height; }
-
-    bool                    HasAlphaChannel() const { return m_bHasAlphaChannel; }
-    bool                    IsLimitedHDR() const { return m_bIsLimitedHDR; }
-    bool                    IsCubemap() const { return m_bIsCubemap; }
-    unsigned int  GetNumberOfMipMaps() const { return m_nNumberOfMipmaps; }
-
-    // Returns:
-    //  size in bytes
-    int GetSize() const { return m_width * m_height * sizeof(T); }
-
-    bool IsValid() const { return m_data != 0; }
-
-    void Attach(T* data, int width, int height)
-    {
-        assert(data);
-        m_memory = new CMemoryBlock();
-        m_memory->Attach(data, width * height * sizeof(T));
-        m_data = data;
-        m_width = width;
-        m_height = height;
-        m_strDccFilename = "";
-    }
-    void Attach(const TImage<T>& img)
-    {
-        assert(img.IsValid());
-        m_memory = img.m_memory;
-        m_data = (T*)m_memory->GetBuffer();
-        m_width = img.m_width;
-        m_height = img.m_height;
-        m_strDccFilename = img.m_strDccFilename;
-    }
-    void Detach()
-    {
-        m_memory = 0;
-        m_data = 0;
-        m_width = 0;
-        m_height = 0;
-        m_strDccFilename = "";
-    }
-
-    bool Allocate(int width, int height)
-    {
-        if (width < 1)
-        {
-            width = 1;
-        }
-        if (height < 1)
-        {
-            height = 1;
-        }
-
-        if (m_data && (m_width == width && m_height == height))
-        {
-            return true;
-        }
-
-        // New memory block.
-        m_memory = new CMemoryBlock();
-        m_memory->Allocate(width * height * sizeof(T)); // +width for crash safety.
-        m_data = (T*)m_memory->GetBuffer();
-        m_width = width;
-        m_height = height;
-        if (!m_data)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    void Release()
-    {
-        m_memory = 0;
-        m_data = 0;
-        m_width = 0;
-        m_height = 0;
-        m_strDccFilename = "";
-    }
-
-    // Copy operator.
-    void Copy(const TImage<T>& img)
-    {
-        if (!img.IsValid())
-        {
-            return;
-        }
-        if (m_width != img.GetWidth() || m_height != img.GetHeight())
-        {
-            Allocate(img.GetWidth(), img.GetHeight());
-        }
-        *m_memory = *img.m_memory;
-        m_data = (T*)m_memory->GetBuffer();
-        m_strDccFilename = img.m_strDccFilename;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void Clear()
-    {
-        Fill(0);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void Fill(unsigned char c)
-    {
-        if (IsValid())
-        {
-            memset(GetData(), c, GetSize());
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void GetSubImage(int x1, int y1, int width, int height, TImage<T>& img) const
-    {
-        int size = width * height;
-        img.Allocate(width, height);
-        for (int y = 0; y < height; y++)
-        {
-            for (int x = 0; x < width; x++)
-            {
-                img.ValueAt(x, y) = ValueAtSafe(x1 + x, y1 + y);
-            }
-        }
-    }
-    void SetSubImage(int x1, int y1, const TImage<T>& subImage, float heightOffset, float fClamp)
-    {
-        int width = subImage.GetWidth();
-        int height = subImage.GetHeight();
-        FitSubRect(x1, y1, width, height);
-
-        if (width <= 0 || height <= 0)
-        {
-            return;
-        }
-
-        if (fClamp < 0.0f)
-        {
-            for (int y = 0; y < height; y++)
-            {
-                for (int x = 0; x < width; x++)
-                {
-                    ValueAt(x1 + x, y1 + y) = subImage.ValueAt(x, y) + heightOffset;
-                }
-            }
-        }
-        else
-        {
-            T TClamp = fClamp;
-            for (int y = 0; y < height; y++)
-            {
-                for (int x = 0; x < width; x++)
-                {
-                    ValueAt(x1 + x, y1 + y) = clamp_tpl(f32(subImage.ValueAt(x, y) + heightOffset), 0.0f, f32(TClamp));
-                }
-            }
-        }
-    }
-
-    void SetSubImage(int x1, int y1, const TImage<T>& subImage)
-    {
-        int width = subImage.GetWidth();
-        int height = subImage.GetHeight();
-        FitSubRect(x1, y1, width, height);
-        if (width <= 0 || height <= 0)
-        {
-            return;
-        }
-
-        for (int y = 0; y < height; y++)
-        {
-            for (int x = 0; x < width; x++)
-            {
-                ValueAt(x1 + x, y1 + y) = subImage.ValueAt(x, y);
-            }
-        }
-    }
-
-    void FitSubRect(int& x1, int& y1, int& width, int& height)
-    {
-        if (x1 < 0)
-        {
-            width = width + x1;
-            x1 = 0;
-        }
-        if (y1 < 0)
-        {
-            height = height + y1;
-            y1 = 0;
-        }
-        if (x1 + width > m_width)
-        {
-            width = m_width - x1;
-        }
-        if (y1 + height > m_height)
-        {
-            height = m_height - y1;
-        }
-    }
-
-    //! Compress image to memory block.
-    void Compress(CMemoryBlock& mem) const
-    {
-        assert(IsValid());
-        m_memory->Compress(mem);
-    }
-
-    //! Uncompress image from memory block.
-    bool Uncompress(const CMemoryBlock& mem)
-    {
-        assert(IsValid());
-        // New memory block.
-        _smart_ptr<CMemoryBlock> temp = new CMemoryBlock();
-        mem.Uncompress(*temp);
-        bool bValid = (GetSize() == m_memory->GetSize())
-            || ((GetSize() + m_width * sizeof(T)) == m_memory->GetSize());
-        if (bValid)
-        {
-            m_memory = temp;
-            m_data = (T*)m_memory->GetBuffer();
-        }
-        return bValid;
-        //assert( GetSize() == m_memory.GetSize() );
-    }
-
-    void SetHasAlphaChannel(bool bHasAlphaChannel) { m_bHasAlphaChannel = bHasAlphaChannel; }
-    void SetIsLimitedHDR(bool bIsLimitedHDR) { m_bIsLimitedHDR = bIsLimitedHDR; }
-    void SetIsCubemap(bool bIsCubemap) { m_bIsCubemap = bIsCubemap; }
-    void SetNumberOfMipMaps(unsigned int nNumberOfMips) { m_nNumberOfMipmaps = nNumberOfMips; }
-
-    void Serialize(CXmlArchive& ar);
-
-    void SetFormatDescription(const QString& str) { m_formatDescription = str; };
-    const QString& GetFormatDescription() const { return m_formatDescription; };
-
-    void SetFormat(ETEX_Format format) { m_format = format; }
-    ETEX_Format GetFormat() const { return m_format; }
-
-    void SetSRGB(bool bEnable) { m_bIsSRGB = bEnable; }
-    bool GetSRGB() const { return m_bIsSRGB; }
-
-    void SetDccFilename(const QString& str) { m_strDccFilename = str; };
-    const QString& GetDccFilename() const { return m_strDccFilename; }
-
-    // RotateOrt() - orthonormal image rotation
-    void RotateOrt(const TImage<T>& img, ImageRotationDegrees degrees)
-    {
-        if (!img.IsValid())
-        {
-            return;
-        }
-
-        int width;
-        int height;
-
-        if (degrees == ImageRotationDegrees::Rotate90 || degrees == ImageRotationDegrees::Rotate270)
-        {
-            width = img.GetHeight();
-            height = img.GetWidth();
-        }
-        else
-        {
-            width = img.GetWidth();
-            height = img.GetHeight();
-        }
-
-        if (m_width != width || m_height != height)
-        {
-            Allocate(width, height);
-        }
-
-        for (int y = 0; y < m_height; y++)
-        {
-            for (int x = 0; x < m_width; x++)
-            {
-                if (degrees == ImageRotationDegrees::Rotate90)
-                {
-                    ValueAt(x, y) = img.ValueAt(m_height - y - 1, x);
-                }
-                else if (degrees == ImageRotationDegrees::Rotate180)
-                {
-                    ValueAt(x, y) = img.ValueAt(m_width - x - 1, m_height - y - 1);
-                }
-                else if (degrees == ImageRotationDegrees::Rotate270)
-                {
-                    ValueAt(x, y) = img.ValueAt(y, m_width - x - 1);
-                }
-                else
-                {
-                    ValueAt(x, y) = img.ValueAt(x, y);
-                }
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void ScaleToFit(const TImage<T>& img)
-    {
-        uint32 x, y, u, v;
-        T* destRow, *dest, *src, *sourceRow;
-
-        if (!img.IsValid())
-        {
-            return;
-        }
-
-        const uint32 srcW = img.GetWidth();
-        const uint32 srcH = img.GetHeight();
-
-        const uint32 trgW = GetWidth();
-        const uint32 trgH = GetHeight();
-
-        const uint32 xratio = trgW > 0 ? (srcW << 16) / trgW : 1;
-        const uint32 yratio = trgH > 0 ? (srcH << 16) / trgH : 1;
-
-        src = img.GetData();
-        destRow = GetData();
-
-        v = 0;
-        for (y = 0; y < trgH; y++)
-        {
-            u = 0;
-            sourceRow = src + (v >> 16) * srcW;
-            dest = destRow;
-            for (x = 0; x < trgW; x++)
-            {
-                *dest++ = sourceRow[u >> 16];
-                u += xratio;
-            }
-            v += yratio;
-            destRow += trgW;
-        }
-    }
-
-
-private:
-    // Restrict use of copy constructor.
-    TImage(const TImage<T>& img);
-    TImage<T>& operator=(const TImage<T>& img);
-
-
-    //! Memory holding image data.
-    _smart_ptr<CMemoryBlock> m_memory;
-
-    T*  m_data;
-    int m_width;
-    int m_height;
-    bool m_bHasAlphaChannel;
-    bool m_bIsLimitedHDR;
-    bool m_bIsCubemap;
-    bool m_bIsSRGB;
-    unsigned int m_nNumberOfMipmaps;
-    QString m_formatDescription;
-    QString m_strDccFilename;
-    ETEX_Format m_format;
-};
-
-template <class T>
-void    TImage<T>::Serialize(CXmlArchive& ar)
-{
-    if (ar.bLoading)
-    {
-        // Loading
-        ar.root->getAttr("ImageWidth", m_width);
-        ar.root->getAttr("ImageHeight", m_height);
-        ar.root->getAttr("Mipmaps", m_nNumberOfMipmaps);
-        ar.root->getAttr("IsCubemap", m_bIsCubemap);
-        bool bIsSRGB;
-        if (ar.root->getAttr("IsSRGB", bIsSRGB))
-        {
-            m_bIsSRGB = bIsSRGB;
-        }
-        ar.root->getAttr("dccFilename", m_strDccFilename);
-        int format;
-        if (ar.root->getAttr("format", format))
-        {
-            m_format = (ETEX_Format)format;
-        }
-        else
-        {
-            m_format = eTF_Unknown;
-        }
-        Allocate(m_width, m_height);
-        void* pData = 0;
-        int nDataSize = 0;
-        bool bHaveBlock = ar.pNamedData->GetDataBlock(ar.root->getTag(), pData, nDataSize);
-        if (bHaveBlock && nDataSize == GetSize())
-        {
-            m_data = (T*)pData;
-        }
-    }
-    else
-    {
-        // Saving.
-        ar.root->setAttr("ImageWidth", m_width);
-        ar.root->setAttr("ImageHeight", m_height);
-        ar.root->setAttr("Mipmaps", m_nNumberOfMipmaps);
-        ar.root->setAttr("IsCubemap", m_bIsCubemap);
-        ar.root->setAttr("IsSRGB", m_bIsSRGB);
-        ar.root->setAttr("format", (int)m_format);
-        ar.root->setAttr("dccFilename", m_strDccFilename);
-
-        ar.pNamedData->AddDataBlock(ar.root->getTag(), (void*)m_data, GetSize());
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Define types of most commonly used images.
-//////////////////////////////////////////////////////////////////////////
-typedef TImage<float> CFloatImage;
-typedef TImage<unsigned char> CByteImage;
-typedef TImage<unsigned short> CWordImage;
-
-//////////////////////////////////////////////////////////////////////////
-class CImageEx
-    : public TImage < unsigned int >
-{
-public:
-    CImageEx()
-        : TImage() { m_bGetHistogramEqualization = false; };
-
-    EDITOR_CORE_API bool ConvertToFloatImage(CFloatImage& dstImage);
-
-    EDITOR_CORE_API void SwapRedAndBlue();
-    EDITOR_CORE_API void ReverseUpDown();
-    EDITOR_CORE_API void FillAlpha(unsigned char value = 0xff);
-
-    // request histogram equalization for HDRs
-    void SetHistogramEqualization(bool bHistogramEqualization) { m_bGetHistogramEqualization = bHistogramEqualization; }
-    bool GetHistogramEqualization() { return m_bGetHistogramEqualization; }
-
-private:
-    bool m_bGetHistogramEqualization;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_IMAGE_H
diff --git a/Code/Sandbox/Editor/Util/ImageASC.cpp b/Code/Sandbox/Editor/Util/ImageASC.cpp
deleted file mode 100644
index 46f53fd07b..0000000000
--- a/Code/Sandbox/Editor/Util/ImageASC.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ImageASC.h"
-
-// Editor
-#include "Util/Image.h"
-
-//---------------------------------------------------------------------------
-
-bool CImageASC::Save(const QString& fileName, const CFloatImage& image)
-{
-    // There are two types of ARCGrid file formats - binary (ADF) and ASCII (ASC).
-    // See here:  https://en.wikipedia.org/wiki/Esri_grid
-
-    uint32 width = image.GetWidth();
-    uint32 height = image.GetHeight();
-    float* pixels = image.GetData();
-
-    string fileHeader;
-    fileHeader.Format(
-        // Number of columns and rows in the data
-        "ncols %d\n"
-        "nrows %d\n"
-
-        // The coordinates of the bottom-left corner.
-        // These numbers represent coordinates on a globe, so this choice of values is arbitrary.
-        "xllcorner 0.0\n"
-        "yllcorner 0.0\n"
-
-        // The size of each grid square.
-        // The problem is that cellsize represents the size of a square on a grid being projected onto a globe.
-        // This number can be used to convert size to degrees, based on where on the globe it appears.
-        // We don't have a real-world location associated with our data, so this size choice is arbitrary.
-        "cellsize 0.0003\n"
-
-        // The value used for missing data.  Since we shouldn't have any missing data, we'll choose a value that can't appear below.
-        "nodata_value -1\n"
-        , width, height);
-
-    FILE* file = nullptr;
-    azfopen(&file, fileName.toUtf8().data(), "wt");
-    if (!file)
-    {
-        return false;
-    }
-
-    // First print the file header
-    fprintf(file, fileHeader.c_str());
-
-    // Then print all the pixels.
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
-        {
-            fprintf(file, "%.7f ", pixels[x + y * width]);
-        }
-        fprintf(file, "\n");
-    }
-
-    fclose(file);
-    return true;
-}
-
-//---------------------------------------------------------------------------
-
-bool CImageASC::Load(const QString& fileName, CFloatImage& image)
-{
-    FILE* file = nullptr;
-    azfopen(&file, fileName.toUtf8().data(), "rt");
-    if (!file)
-    {
-        return false;
-    }
-
-    const char seps[] = " \r\n\t";
-    char* token;
-
-    int32 width = 0;
-    int32 height = 0;
-    float nodataValue = 0.0f;
-
-    bool validData = true;
-
-    // Read the file into memory
-
-    fseek(file, 0, SEEK_END);
-    int fileSize = ftell(file);
-    fseek(file, 0, SEEK_SET);
-
-    char* str = new char[fileSize];
-    fread(str, fileSize, 1, file);
-
-    // Break all of the values in the file apart into tokens.
-
-    char* nextToken = nullptr;
-    token = azstrtok(str, 0, seps, &nextToken);
-
-    // ncols = grid width
-    validData = validData && (azstricmp(token, "ncols") == 0);
-    token = azstrtok(NULL, 0, seps, &nextToken);
-    width = atoi(token);
-
-    // nrows = grid height
-    token = azstrtok(NULL, 0, seps, &nextToken);
-    validData = validData && (azstricmp(token, "nrows") == 0);
-    token = azstrtok(NULL, 0, seps, &nextToken);
-    height = atoi(token);
-
-    // xllcorner = leftmost coordinate.  (Skip, we don't care about it)
-    token = azstrtok(NULL, 0, seps, &nextToken);
-    validData = validData && (azstricmp(token, "xllcorner") == 0);
-    token = azstrtok(NULL, 0, seps, &nextToken);
-
-    // yllcorner = bottommost coordinate.  (Skip, we don't care about it)
-    token = azstrtok(NULL, 0, seps, &nextToken);
-    validData = validData && (azstricmp(token, "yllcorner") == 0);
-    token = azstrtok(NULL, 0, seps, &nextToken);
-
-    // cellsize = size of each grid cell.  (Skip, we don't care about it)
-    token = azstrtok(NULL, 0, seps, &nextToken);
-    validData = validData && (azstricmp(token, "cellsize") == 0);
-    token = azstrtok(NULL, 0, seps, &nextToken);
-
-    // nodata_value = the value used for missing data.  We'll replace these with 0 height.
-    token = azstrtok(NULL, 0, seps, &nextToken);
-    validData = validData && (azstricmp(token, "nodata_value") == 0);
-    token = azstrtok(NULL, 0, seps, &nextToken);
-    nodataValue = atof(token);
-
-    if (!validData)
-    {
-        // Bad file. not supported asc.
-        delete[]str;
-        fclose(file);
-        return false;
-    }
-
-    image.Allocate(width, height);
-
-    // Read in the pixel data
-
-    float* p = image.GetData();
-    int size = width * height;
-    int i = 0;
-    float pixelValue;
-    float maxPixel = 0.0f;
-    while (token != NULL && i < size)
-    {
-        token = azstrtok(NULL, 0, seps, &nextToken);
-        if (token != NULL)
-        {
-            // Negative heights aren't supported, clamp to 0.
-            pixelValue = max(0.0, atof(token));
-
-            // If this is a location we specifically don't have data for, set it to 0.
-            if (pixelValue == nodataValue)
-            {
-                pixelValue = 0.0f;
-            }
-
-            *p++ = pixelValue;
-            maxPixel = max(maxPixel, pixelValue);
-            i++;
-        }
-    }
-
-    if (maxPixel > 0.0f)
-    {
-        // Scale our range down to 0 - 1
-        float* pp = image.GetData();
-        for (i = 0; i < size; i++)
-        {
-            pp[i] = clamp_tpl(pp[i] / maxPixel, 0.0f, 1.0f);
-        }
-    }
-
-    delete[]str;
-
-    fclose(file);
-
-    return true;
-}
-
diff --git a/Code/Sandbox/Editor/Util/ImageASC.h b/Code/Sandbox/Editor/Util/ImageASC.h
deleted file mode 100644
index a9ff707f18..0000000000
--- a/Code/Sandbox/Editor/Util/ImageASC.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEASC_H
-#define CRYINCLUDE_EDITOR_UTIL_IMAGEASC_H
-#pragma once
-
-#include "Util/Image.h"
-
-class SANDBOX_API CImageASC
-{
-public:
-    bool Load(const QString& fileName, CFloatImage& outImage);
-    bool Save(const QString& fileName, const CFloatImage& image);
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEASC_H
diff --git a/Code/Sandbox/Editor/Util/ImageBT.cpp b/Code/Sandbox/Editor/Util/ImageBT.cpp
deleted file mode 100644
index 9aef6c48a2..0000000000
--- a/Code/Sandbox/Editor/Util/ImageBT.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "ImageBT.h"
-
-//---------------------------------------------------------------------------
-// Load and save the VTP Binary Terrain (BT) format, documented here:
-// http://vterrain.org/Implementation/Formats/BT.html
-
-// This structure represents a binary layout in the file.  To direct load & save it, we need to remove all structure memory padding
-#pragma pack(push,1)
-struct BtHeader
-{
-    char headerTag[7];                  // Should be "binterr"
-    char headerTagVersion[3];           // Should be "1.3"
-    int32 columns;                      // # of columns in the heightfield
-    int32 rows;                         // # of rows in the heightfield
-    int16 bytesPerPoint;                // bytes per height value, either 2 for signed ints or 4 for floats
-    int16 isFloatingPointData;          // 1 if height values are floats, 0 for 16-bit signed ints
-    int16 horizUnits;                   // 0 if degrees, 1 if meters, 2 if international feet, 3 if US survey feet
-    int16 utmZone;                      // UTM projection zone 1 to 60 or -1 to -60 (see https://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system )
-    int16 datum;                        // Datum value (6001 to 6094), see http://www.epsg.org/
-    double leftExtent;                  // left coordinate projection of the file
-    double rightExtent;                 // right coordinate projection of the file
-    double bottomExtent;                // bottom coordinate projection of the file
-    double topExtent;                   // top coordinate projection of the file
-    int16 externalProjection;           // 1 if projection is in an external .prj file, 0 if it's contained in the header
-    float scale;                        // vertical units in meters.  0.0 should be treated as 1.0
-    char unused[190];
-};
-#pragma pack(pop)
-
-bool CImageBT::Save(const QString& fileName, const CFloatImage& image)
-{
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-
-    float *pixels = image.GetData();
-
-    // Create a header with reasonable default values.
-    BtHeader header =
-    {
-        {'b', 'i', 'n', 't', 'e', 'r', 'r'},
-        {'1', '.', '3' },
-        width,
-        height,
-        sizeof(float),          // we'll use floats to make sure we can capture the full potential range of heightfield values
-        1,                      // use floats
-        1,                      // units are meters
-        0,                      // no UTM projection zone
-        6326,                   // WGS84 Datum value.  Recommended by VTP as the default if you don't care about Datum values.
-        0.0,                    // set the left extent to 0?
-        double(width),                  // set the right extent to the width? (assumes 1 m per pixel)
-        double(height),                 // set the bottom extent to the height? (assumes 1 m per pixel)
-        0.0,                    // set the top extent to 0?
-        0,                      // no external prj file
-        1.0f
-    };
-
-    memset(header.unused, 0, sizeof(header.unused));
-
-    FILE* file = nullptr;
-    azfopen(&file, fileName.toUtf8().data(), "wb");
-    if (!file)
-    {
-        return false;
-    }
-
-    fwrite(&header, sizeof(header), 1, file);
-    for (int32 y = 0; y < height; y++)
-    {
-        for (int32 x = 0; x < width; x++)
-        {
-            float heightmapValue = pixels[(y * width) + x];
-            fwrite(&heightmapValue, sizeof(float), 1, file);
-        }
-    }
-
-    fclose(file);
-    return true;
-}
-
-//---------------------------------------------------------------------------
-
-bool CImageBT::Load(const QString& fileName, CFloatImage& image)
-{
-    FILE* file = nullptr;
-    azfopen(&file, fileName.toUtf8().data(), "rb");
-    if (!file)
-    {
-        return false;
-    }
-
-    // Get the file size
-
-    fseek(file, 0, SEEK_END);
-    int fileSize = ftell(file);
-    fseek(file, 0, SEEK_SET);
-
-    // Our file needs to be at least as big as the BT file header.
-    if (fileSize < sizeof(BtHeader))
-    {
-        return false;
-    }
-
-    // Get the BT header data
-    BtHeader header;
-    memset(&header, 0, sizeof(BtHeader)); // C4701 potentially uninitialized local variable 'header' used
-    bool validData = true;
-    validData = validData && (fread(&header, sizeof(BtHeader), 1, file) != 0);
-
-    // Do some quick error-checking on the header to make sure it meets our expectations
-
-    // Does the header have the right header tag? (binterr1.0 - binterr1.3)
-    validData = validData && (memcmp(header.headerTag, "binterr", sizeof(header.headerTag)) == 0);
-    validData = validData && (header.headerTagVersion[0] == '1') && (header.headerTagVersion[1] == '.') && (header.headerTagVersion[2] >= '0') && (header.headerTagVersion[2] <= '3');
-
-    // Will the grid fit into a reasonable image size?
-    validData = validData && (header.columns >= 0) && (header.columns < 65536);
-    validData = validData && (header.rows >= 0) && (header.rows < 65536);
-
-    // Do we either have 32-bit floats or 16-bit ints?
-    validData = validData && (((header.isFloatingPointData == 1) && (header.bytesPerPoint == 4)) || ((header.isFloatingPointData == 0) && (header.bytesPerPoint == 2)));
-
-    // Is the remaining data exactly the size needed to fill our image?
-    validData = validData && ((fileSize - sizeof(BtHeader)) == (header.columns * header.rows * header.bytesPerPoint));
-
-    if (!validData)
-    {
-        fclose(file);
-        return false;
-    }
-
-    if (header.scale == 0.0f)
-    {
-        header.scale = 1.0f;
-    }
-
-    // The BT format defines the data as stored in column-first order, from bottom to top.  
-    // However, some BT files store the data in row-first order, from top to bottom.
-    // There isn't anything that clearly specifies which type of file it is.  If you load it the wrong way, 
-    // the data will look like a bunch of wavy stripes.
-    // The only difference I've found in test files is datum values above 8000, which appears to be an invalid value for datum
-    // (it should be 6001-6904 according to the BT definition)
-    const int invalidDatumValueDenotingColumnFirstData = 8000;
-    bool isColumnFirstData = (header.datum >= invalidDatumValueDenotingColumnFirstData) ? true : false;
-    float height = 0.0f;
-    int imageWidth, imageHeight;
-
-    if (isColumnFirstData)
-    {
-        imageWidth = header.rows;
-        imageHeight = header.columns;
-    }
-    else
-    {
-        imageWidth = header.columns;
-        imageHeight = header.rows;
-    }
-
-
-    image.Allocate(imageWidth, imageHeight);
-    float* p = image.GetData();
-    float maxPixel = 0.0f;
-
-    // Read in the pixel data
-    for (int32 y = 0; y < imageHeight; y++)
-    {
-        for (int32 x = 0; x < imageWidth; x++)
-        {
-            if (header.isFloatingPointData)
-            {
-                fread(&height, sizeof(float), 1, file);
-            }
-            else
-            {
-                int16 intHeight = 0;
-                fread(&intHeight, sizeof(int16), 1, file);
-                height = static_cast<float>(intHeight);
-            }
-            // Scale based on what our header defines, and clamp the values to positive range, negatives not supported
-            p[(y * imageWidth) + x] = max((height * header.scale), 0.0f);
-            maxPixel = max(maxPixel, p[(y * imageWidth) + x]);
-        }
-    }
-
-    // Scale our range down to 0 - 1
-    if (maxPixel > 0.0f)
-    {
-        p = image.GetData();
-        for (int32 i = 0; i < (imageWidth * imageHeight); i++)
-        {
-            p[i] = clamp_tpl(p[i] / maxPixel, 0.0f, 1.0f);
-        }
-    }
-
-    fclose(file);
-    return true;
-}
-
diff --git a/Code/Sandbox/Editor/Util/ImageBT.h b/Code/Sandbox/Editor/Util/ImageBT.h
deleted file mode 100644
index 48fd3cd117..0000000000
--- a/Code/Sandbox/Editor/Util/ImageBT.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEBT_H
-#define CRYINCLUDE_EDITOR_UTIL_IMAGEBT_H
-#pragma once
-
-#include "Util/Image.h"
-
-class SANDBOX_API CImageBT
-{
-public:
-    bool Load(const QString& fileName, CFloatImage& outImage);
-    bool Save(const QString& fileName, const CFloatImage& image);
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEBT_H
diff --git a/Code/Sandbox/Editor/Util/ImageGif.cpp b/Code/Sandbox/Editor/Util/ImageGif.cpp
deleted file mode 100644
index 524c36855d..0000000000
--- a/Code/Sandbox/Editor/Util/ImageGif.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ImageGif.h"
-
-// Editor
-#include "Util/Image.h"
-
-//---------------------------------------------------------------------------
-
-#define NEXTBYTE      (*ptr++)
-#define IMAGESEP      0x2c
-#define GRAPHIC_EXT   0xf9
-#define PLAINTEXT_EXT 0x01
-#define APPLICATION_EXT 0xff
-#define COMMENT_EXT   0xfe
-#define START_EXTENSION 0x21
-#define INTERLACEMASK 0x40
-#define COLORMAPMASK  0x80
-#define CHK(x) x
-
-#pragma pack(push,1)
-struct SGIFRGBcolor
-{
-    uint8 red, green, blue;
-};
-struct SGIFRGBPixel
-{
-    uint8 red, green, blue, alpha;
-};
-#pragma pack(pop)
-
-static int BitOffset = 0,       /* Bit Offset of next code */
-           XC = 0, YC = 0, /* Output X and Y coords of current pixel */
-           Pass = 0,    /* Used by output routine if interlaced pic */
-           OutCount = 0, /* Decompressor output 'stack count' */
-           RWidth, RHeight, /* screen dimensions */
-           Width, Height, /* image dimensions */
-           LeftOfs, TopOfs, /* image offset */
-           BitsPerPixel, /* Bits per pixel, read from GIF header */
-           BytesPerScanline, /* bytes per scanline in output raster */
-           ColorMapSize, /* number of colors */
-           Background,  /* background color */
-           CodeSize,    /* Code size, read from GIF header */
-           InitCodeSize, /* Starting code size, used during Clear */
-           Code,    /* Value returned by ReadCode */
-           MaxCode,     /* limiting value for current code size */
-           ClearCode,   /* GIF clear code */
-           EOFCode,     /* GIF end-of-information code */
-           CurCode, OldCode, InCode, /* Decompressor variables */
-           FirstFree,   /* First free code, generated per GIF spec */
-           FreeCode,    /* Decompressor, next free slot in hash table*/
-           FinChar,     /* Decompressor variable */
-           BitMask,     /* AND mask for data size */
-           ReadMask;    /* Code AND mask for current code size */
-
-static bool Interlace, HasColormap;
-
-static SGIFRGBPixel* Image;     /* The result array */
-static SGIFRGBcolor* Palette;       /* The palette that is used */
-static uint8* IndexImage;
-
-static uint8* Raster;           /* The raster data stream, unblocked */
-
-static uint8 used[256];
-static int  numused;
-
-const char* id87 = "GIF87a";
-const char* id89 = "GIF89a";
-
-static int   log2 (int);
-
-/* Fetch the next code from the raster data stream.  The codes can be
- * any length from 3 to 12 bits, packed into 8-bit bytes, so we have to
- * maintain our location in the Raster array as a BIT Offset.  We compute
- * the uint8 Offset into the raster array by dividing this by 8, pick up
- * three bytes, compute the bit Offset into our 24-bit chunk, shift to
- * bring the desired code to the bottom, then mask it off and return it.
- */
-inline int ReadCode (void)
-{
-    int RawCode, ByteOffset;
-
-    ByteOffset = BitOffset / 8;
-    RawCode    = Raster[ByteOffset] + (0x100 * Raster[ByteOffset + 1]);
-
-    if (CodeSize >= 8)
-    {
-        RawCode += (0x10000 * Raster[ByteOffset + 2]);
-    }
-
-    RawCode  >>= (BitOffset % 8);
-    BitOffset += CodeSize;
-
-    return RawCode & ReadMask;
-}
-
-inline void AddToPixel (uint8 Index)
-{
-    if (YC < Height)
-    {
-        SGIFRGBPixel* p = Image + YC * BytesPerScanline + XC;
-        p->red = Palette[Index].red;
-        p->green = Palette[Index].green;
-        p->blue = Palette[Index].blue;
-        p->alpha = 0;
-        IndexImage[YC * BytesPerScanline + XC] = Index;
-    }
-
-    if (!used[Index])
-    {
-        used[Index] = 1;
-        numused++;
-    }
-
-    /* Update the X-coordinate, and if it overflows, update the Y-coordinate */
-
-    if (++XC == Width)
-    {
-        /* If a non-interlaced picture, just increment YC to the next scan line.
-         * If it's interlaced, deal with the interlace as described in the GIF
-         * spec.  Put the decoded scan line out to the screen if we haven't gone
-         * past the bottom of it
-         */
-
-        XC = 0;
-        if (!Interlace)
-        {
-            YC++;
-        }
-        else
-        {
-            switch (Pass)
-            {
-            case 0:
-                YC += 8;
-                if (YC >= Height)
-                {
-                    Pass++;
-                    YC = 4;
-                }
-                break;
-            case 1:
-                YC += 8;
-                if (YC >= Height)
-                {
-                    Pass++;
-                    YC = 2;
-                }
-                break;
-            case 2:
-                YC += 4;
-                if (YC >= Height)
-                {
-                    Pass++;
-                    YC = 1;
-                }
-                break;
-            case 3:
-                YC += 2;
-                break;
-            default:
-                break;
-            }
-        }
-    }
-}
-
-bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
-{
-    bool ret = false;
-
-    std::vector<uint8> data;
-    CCryFile file;
-    if (!file.Open(fileName.toUtf8().data(), "rb"))
-    {
-        CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
-        return false;
-    }
-    long filesize = file.GetLength();
-
-    data.resize(filesize);
-    uint8* ptr = &data[0];
-
-    file.ReadRaw(ptr, filesize);
-
-    /* Detect if this is a GIF file */
-    if (strncmp ((char*)ptr, "GIF87a", 6) && strncmp ((char*)ptr, "GIF89a", 6))
-    {
-        CLogFile::FormatLine("Bad GIF file format %s", fileName.toUtf8().data());
-        return false;
-    }
-
-    int                numcols;
-    unsigned  char ch, ch1;
-    uint8* ptr1;
-    int   i;
-    short transparency = -1;
-
-    TImage<uint8> outImageIndex;
-
-    /* The hash table used by the decompressor */
-    int* Prefix;
-    int* Suffix;
-
-    /* An output array used by the decompressor */
-    int* OutCode;
-
-    CHK (Prefix = new int [4096]);
-    CHK (Suffix = new int [4096]);
-    CHK (OutCode = new int [1025]);
-
-    BitOffset = 0;
-    XC = YC = 0;
-    Pass = 0;
-    OutCount = 0;
-
-    Palette = NULL;
-    CHK (Raster = new uint8 [filesize]);
-
-    if (strncmp((char*) ptr, id87, 6))
-    {
-        if (strncmp((char*) ptr, id89, 6))
-        {
-            CLogFile::FormatLine("Bad GIF file format %s",fileName.toUtf8().data());
-            goto cleanup;
-        }
-    }
-
-    ptr += 6;
-
-    /* Get variables from the GIF screen descriptor */
-
-    ch           = NEXTBYTE;
-    RWidth       = ch + 0x100 * NEXTBYTE;     /* screen dimensions... not used. */
-    ch           = NEXTBYTE;
-    RHeight      = ch + 0x100 * NEXTBYTE;
-
-    ch           = NEXTBYTE;
-    HasColormap  = ((ch & COLORMAPMASK) ? true : false);
-
-    BitsPerPixel = (ch & 7) + 1;
-    numcols      = ColorMapSize = 1 << BitsPerPixel;
-    BitMask      = ColorMapSize - 1;
-
-    Background   = NEXTBYTE;            /* background color... not used. */
-
-    if (NEXTBYTE)           /* supposed to be NULL */
-    {
-        CLogFile::FormatLine("Bad GIF file format %s", fileName.toUtf8().data());
-        goto cleanup;
-    }
-
-    /* Read in global colormap. */
-    SGIFRGBcolor mspPal[1024];
-
-    if (HasColormap)
-    {
-        for (i = 0; i < ColorMapSize; i++)
-        {
-            mspPal[i].red = NEXTBYTE;
-            mspPal[i].green = NEXTBYTE;
-            mspPal[i].blue = NEXTBYTE;
-            used[i]  = 0;
-        }
-        Palette = mspPal;
-
-        numused = 0;
-    }     /* else no colormap in GIF file */
-
-    /* look for image separator */
-
-    for (ch = NEXTBYTE; ch != IMAGESEP; ch = NEXTBYTE)
-    {
-        i = ch;
-        if (ch != START_EXTENSION)
-        {
-            CLogFile::FormatLine("Bad GIF file format %s", fileName.toUtf8().data());
-            goto cleanup;
-        }
-
-        /* handle image extensions */
-        switch (ch = NEXTBYTE)
-        {
-        case GRAPHIC_EXT:
-            ch = NEXTBYTE;
-            if (ptr[0] & 0x1)
-            {
-                transparency = ptr[3];       /* transparent color index */
-            }
-            ptr += ch;
-            break;
-        case PLAINTEXT_EXT:
-            break;
-        case APPLICATION_EXT:
-            break;
-        case COMMENT_EXT:
-            break;
-        default:
-        {
-            CLogFile::FormatLine("Invalid GIF89 extension %s", fileName.toUtf8().data());
-            goto cleanup;
-        }
-        }
-
-        ch = NEXTBYTE;
-        while (ch)
-        {
-            ptr += ch;
-            ch = NEXTBYTE;
-        }
-    }
-
-    //if (transparency >= 0)
-    //mfSet_transparency(transparency);
-
-    /* Now read in values from the image descriptor */
-
-    ch        = NEXTBYTE;
-    LeftOfs   = ch + 0x100 * NEXTBYTE;
-    ch        = NEXTBYTE;
-    TopOfs    = ch + 0x100 * NEXTBYTE;
-    ch        = NEXTBYTE;
-    Width     = ch + 0x100 * NEXTBYTE;
-    ch        = NEXTBYTE;
-    Height    = ch + 0x100 * NEXTBYTE;
-    Interlace = ((NEXTBYTE & INTERLACEMASK) ? true : false);
-
-    // Set the dimensions which will also allocate the image data
-    // buffer.
-    outImage.Allocate(Width, Height);
-    //mfSet_dimensions (Width, Height);
-    Image = (SGIFRGBPixel*)outImage.GetData();
-    outImageIndex.Allocate(Width, Height);
-    IndexImage = outImageIndex.GetData();
-
-    /* Note that I ignore the possible existence of a local color map.
-    * I'm told there aren't many files around that use them, and the spec
-    * says it's defined for future use.  This could lead to an error
-    * reading some files.
-    */
-
-    /* Start reading the raster data. First we get the intial code size
-    * and compute decompressor constant values, based on this code size.
-    */
-
-    CodeSize  = NEXTBYTE;
-    ClearCode = (1 << CodeSize);
-    EOFCode   = ClearCode + 1;
-    FreeCode  = FirstFree = ClearCode + 2;
-
-    /* The GIF spec has it that the code size is the code size used to
-    * compute the above values is the code size given in the file, but the
-    * code size used in compression/decompression is the code size given in
-    * the file plus one. (thus the ++).
-    */
-
-    CodeSize++;
-    InitCodeSize = CodeSize;
-    MaxCode      = (1 << CodeSize);
-    ReadMask     = MaxCode - 1;
-
-    /* Read the raster data.  Here we just transpose it from the GIF array
-    * to the Raster array, turning it from a series of blocks into one long
-    * data stream, which makes life much easier for ReadCode().
-    */
-
-    ptr1 = Raster;
-    do
-    {
-        ch = ch1 = NEXTBYTE;
-        while (ch--)
-        {
-            *ptr1++ = NEXTBYTE;
-        }
-        if ((ptr1 - Raster) > filesize)
-        {
-            CLogFile::FormatLine("Corrupted GIF file (unblock) %s", fileName.toUtf8().data());
-            goto cleanup;
-        }
-    }
-    while (ch1);
-
-    BytesPerScanline    = Width;
-
-
-    /* Decompress the file, continuing until you see the GIF EOF code.
-    * One obvious enhancement is to add checking for corrupt files here.
-    */
-
-    Code = ReadCode ();
-    while (Code != EOFCode)
-    {
-        /* Clear code sets everything back to its initial value, then reads the
-        * immediately subsequent code as uncompressed data.
-        */
-
-        if (Code == ClearCode)
-        {
-            CodeSize = InitCodeSize;
-            MaxCode  = (1 << CodeSize);
-            ReadMask = MaxCode - 1;
-            FreeCode = FirstFree;
-            CurCode  = OldCode = Code = ReadCode();
-            FinChar  = CurCode & BitMask;
-            AddToPixel (FinChar);
-        }
-        else
-        {
-            /* If not a clear code, then must be data: save same as CurCode and InCode */
-            CurCode = InCode = Code;
-
-            /* If greater or equal to FreeCode, not in the hash table yet;
-            * repeat the last character decoded
-            */
-
-            if (CurCode >= FreeCode)
-            {
-                CurCode = OldCode;
-                OutCode[OutCount++] = FinChar;
-            }
-
-            /* Unless this code is raw data, pursue the chain pointed to by CurCode
-            * through the hash table to its end; each code in the chain puts its
-            * associated output code on the output queue.
-            */
-
-            while (CurCode > BitMask)
-            {
-                if (OutCount > 1024)
-                {
-                    CLogFile::FormatLine("Corrupted GIF file (OutCount) %s", fileName.toUtf8().data());
-                    goto cleanup;
-                }
-                OutCode[OutCount++] = Suffix[CurCode];
-                CurCode = Prefix[CurCode];
-            }
-
-            /* The last code in the chain is treated as raw data. */
-
-            FinChar             = CurCode & BitMask;
-            OutCode[OutCount++] = FinChar;
-
-            /* Now we put the data out to the Output routine.
-            * It's been stacked LIFO, so deal with it that way...
-            */
-
-            for (i = OutCount - 1; i >= 0; i--)
-            {
-                AddToPixel (OutCode[i]);
-            }
-            OutCount = 0;
-
-            /* Build the hash table on-the-fly. No table is stored in the file. */
-
-            Prefix[FreeCode] = OldCode;
-            Suffix[FreeCode] = FinChar;
-            OldCode          = InCode;
-
-            /* Point to the next slot in the table.  If we exceed the current
-            * MaxCode value, increment the code size unless it's already 12.  If it
-            * is, do nothing: the next code decompressed better be CLEAR
-            */
-
-            FreeCode++;
-            if (FreeCode >= MaxCode)
-            {
-                if (CodeSize < 12)
-                {
-                    CodeSize++;
-                    MaxCode *= 2;
-                    ReadMask = (1 << CodeSize) - 1;
-                }
-            }
-        }
-        Code = ReadCode ();
-    }
-
-    ret = true;
-
-cleanup:
-    if (Raster)
-    {
-        CHK (delete [] Raster);
-    }
-    if (Prefix)
-    {
-        CHK (delete [] Prefix);
-    }
-    if (Suffix)
-    {
-        CHK (delete [] Suffix);
-    }
-    if (OutCode)
-    {
-        CHK (delete [] OutCode);
-    }
-    return ret;
-}
diff --git a/Code/Sandbox/Editor/Util/ImageGif.h b/Code/Sandbox/Editor/Util/ImageGif.h
deleted file mode 100644
index 2c16916e6e..0000000000
--- a/Code/Sandbox/Editor/Util/ImageGif.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEGIF_H
-#define CRYINCLUDE_EDITOR_UTIL_IMAGEGIF_H
-#pragma once
-
-class CImageEx;
-
-class CImageGif
-{
-public:
-    bool Load(const QString& fileName, CImageEx& outImage);
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEGIF_H
diff --git a/Code/Sandbox/Editor/Util/ImageHistogram.cpp b/Code/Sandbox/Editor/Util/ImageHistogram.cpp
deleted file mode 100644
index 3ad5777f49..0000000000
--- a/Code/Sandbox/Editor/Util/ImageHistogram.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-#include "ImageHistogram.h"
-
-CImageHistogram::CImageHistogram()
-    : m_imageFormat(eImageFormat_32BPP_RGBA)
-{
-    ClearHistogram();
-}
-
-CImageHistogram::~CImageHistogram()
-{
-}
-
-void CImageHistogram::ComputeHistogram(BYTE* pImageData, UINT aWidth, UINT aHeight, EImageFormat aFormat)
-{
-    ClearHistogram();
-    UINT r, g, b, a;
-    int lumIndex = 0;
-    UINT pixelCount = aWidth * aHeight;
-
-    m_imageFormat = aFormat;
-
-    while (pixelCount--)
-    {
-        r = g = b = a = 0;
-
-        switch (aFormat)
-        {
-        case eImageFormat_32BPP_RGBA:
-        {
-            r = *pImageData;
-            g = *(pImageData + 1);
-            b = *(pImageData + 2);
-            a = *(pImageData + 3);
-            pImageData += 4;
-            break;
-        }
-
-        case eImageFormat_32BPP_BGRA:
-        {
-            b = *pImageData;
-            g = *(pImageData + 1);
-            r = *(pImageData + 2);
-            a = *(pImageData + 3);
-            pImageData += 4;
-            break;
-        }
-
-        case eImageFormat_32BPP_ARGB:
-        {
-            a = *(pImageData);
-            r = *(pImageData + 1);
-            g = *(pImageData + 2);
-            b = *(pImageData + 3);
-            pImageData += 4;
-            break;
-        }
-
-        case eImageFormat_32BPP_ABGR:
-        {
-            a = *(pImageData);
-            b = *(pImageData + 1);
-            g = *(pImageData + 2);
-            r = *(pImageData + 3);
-            pImageData += 4;
-            break;
-        }
-
-        case eImageFormat_24BPP_RGB:
-        {
-            r = *pImageData;
-            g = *(pImageData + 1);
-            b = *(pImageData + 2);
-            pImageData += 3;
-            break;
-        }
-
-        case eImageFormat_24BPP_BGR:
-        {
-            r = *pImageData;
-            g = *(pImageData + 1);
-            b = *(pImageData + 2);
-            pImageData += 3;
-            break;
-        }
-
-        case eImageFormat_8BPP:
-        {
-            r = *pImageData;
-            ++pImageData;
-            break;
-        }
-        }
-
-        ++m_count[0][r];
-        ++m_count[1][g];
-        ++m_count[2][b];
-        ++m_count[3][a];
-
-        lumIndex = (r + b + g) / 3;
-        lumIndex = CLAMP(lumIndex, 0, kNumColorLevels - 1);
-        ++m_lumCount[lumIndex];
-
-        if (m_maxCount[0] < m_count[0][r])
-        {
-            m_maxCount[0] = m_count[0][r];
-        }
-
-        if (m_maxCount[1] < m_count[1][g])
-        {
-            m_maxCount[1] = m_count[1][g];
-        }
-
-        if (m_maxCount[2] < m_count[2][b])
-        {
-            m_maxCount[2] = m_count[2][b];
-        }
-
-        if (m_maxCount[3] < m_count[3][a])
-        {
-            m_maxCount[3] = m_count[3][a];
-        }
-
-        if (m_maxLumCount < m_lumCount[lumIndex])
-        {
-            m_maxLumCount = m_lumCount[lumIndex];
-        }
-    }
-
-    ComputeStatisticsForChannel(0);
-    ComputeStatisticsForChannel(1);
-    ComputeStatisticsForChannel(2);
-    ComputeStatisticsForChannel(3);
-
-    m_meanAvg = (m_mean[0] + m_mean[1] + m_mean[2]) / 3;
-    m_stdDevAvg = (m_stdDev[0] + m_stdDev[1] + m_stdDev[2]) / 3;
-    m_medianAvg = (m_median[0] + m_median[1] + m_median[2]) / 3;
-}
-
-void CImageHistogram::ClearHistogram()
-{
-    const int kSize = kNumColorLevels * sizeof(UINT);
-
-    memset(m_count[0], 0, kSize);
-    memset(m_count[1], 0, kSize);
-    memset(m_count[2], 0, kSize);
-    memset(m_count[3], 0, kSize);
-    memset(m_lumCount, 0, kSize);
-    m_maxCount[0] = 0;
-    m_maxCount[1] = 0;
-    m_maxCount[2] = 0;
-    m_maxCount[3] = 0;
-    m_maxLumCount = 0;
-    memset(m_mean, 0, kNumChannels * sizeof(float));
-    memset(m_stdDev, 0, kNumChannels * sizeof(float));
-    memset(m_median, 0, kNumChannels * sizeof(float));
-    m_meanAvg = m_stdDevAvg = m_medianAvg = 0;
-}
-
-void CImageHistogram::CopyComputedDataFrom(CImageHistogram* histogram)
-{
-    const int kSize = kNumColorLevels * sizeof(UINT);
-
-    memcpy(m_count[0], histogram->m_count[0], kSize);
-    memcpy(m_count[1], histogram->m_count[1], kSize);
-    memcpy(m_count[2], histogram->m_count[2], kSize);
-    memcpy(m_count[3], histogram->m_count[3], kSize);
-    memcpy(m_lumCount, histogram->m_lumCount, kSize);
-    memcpy(m_maxCount, histogram->m_maxCount, kNumChannels * sizeof(UINT));
-    memcpy(m_mean, histogram->m_mean, kNumChannels * sizeof(float));
-    memcpy(m_stdDev, histogram->m_stdDev, kNumChannels * sizeof(float));
-    memcpy(m_median, histogram->m_median, kNumChannels * sizeof(float));
-    m_maxLumCount = histogram->m_maxLumCount;
-    m_meanAvg = histogram->m_meanAvg;
-    m_stdDevAvg = histogram->m_stdDevAvg;
-    m_medianAvg = histogram->m_medianAvg;
-    m_imageFormat = histogram->m_imageFormat;
-}
-
-void CImageHistogram::ComputeStatisticsForChannel(int aIndex)
-{
-    int hits = 0;
-    int total = 0;
-
-    //
-    // mean
-    // std deviation
-    //
-    for (size_t i = 0; i < kNumColorLevels; ++i)
-    {
-        hits = m_count[aIndex][i];
-        m_mean[aIndex] += i * hits;
-        m_stdDev[aIndex] += i * i * hits;
-        total += hits;
-    }
-
-    total = (total ? total : 1);
-    m_mean[aIndex] = (float)m_mean[aIndex] / total;
-    m_stdDev[aIndex] = m_stdDev[aIndex] / total - m_mean[aIndex] * m_mean[aIndex];
-    m_stdDev[aIndex] = m_stdDev[aIndex] <= 0 ? 0 : sqrtf(m_stdDev[aIndex]);
-
-    int halfTotal = total / 2;
-    int median = 0, v = 0;
-
-    // find median value
-    for (; median < kNumColorLevels; ++median)
-    {
-        v += m_count[aIndex][median];
-
-        if (v >= halfTotal)
-        {
-            break;
-        }
-    }
-
-    m_median[aIndex] = median;
-}
diff --git a/Code/Sandbox/Editor/Util/ImageHistogram.h b/Code/Sandbox/Editor/Util/ImageHistogram.h
deleted file mode 100644
index aa22985598..0000000000
--- a/Code/Sandbox/Editor/Util/ImageHistogram.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEHISTOGRAM_H
-#define CRYINCLUDE_EDITOR_UTIL_IMAGEHISTOGRAM_H
-#pragma once
-
-#include "Include/EditorCoreAPI.h"
-
-class EDITOR_CORE_API CImageHistogram
-{
-public:
-    static const int kNumChannels = 4;
-    static const int kNumColorLevels = 256;
-
-    enum EImageFormat
-    {
-        eImageFormat_8BPP,
-        eImageFormat_24BPP_RGB,
-        eImageFormat_24BPP_BGR,
-        eImageFormat_32BPP_RGBA,
-        eImageFormat_32BPP_BGRA,
-        eImageFormat_32BPP_ARGB,
-        eImageFormat_32BPP_ABGR
-    };
-
-    CImageHistogram();
-    virtual ~CImageHistogram();
-
-    // Description:
-    //  Compute the histogram of an image
-    // Arguments:
-    //  pImageData - the image data
-    //  aWidth - the width of the image in pixels
-    //  aHeight - the height of the image in pixels
-    //  aBitsPerPixel - the number of bits per pixel, currently supported: 8 (monochrome), 24 (RGB) and 32 (RGBA)
-    void ComputeHistogram(BYTE* pImageData, unsigned int aWidth, unsigned int aHeight, EImageFormat aFormat = eImageFormat_32BPP_RGBA);
-    void ClearHistogram();
-    void CopyComputedDataFrom(CImageHistogram* histogram);
-
-protected:
-    void ComputeStatisticsForChannel(int aIndex);
-
-public:
-    unsigned int    m_count[kNumChannels][kNumColorLevels];
-    unsigned int    m_lumCount[kNumColorLevels];
-    unsigned int    m_maxCount[kNumChannels];
-    unsigned int    m_maxLumCount;
-    float           m_mean[kNumChannels], m_stdDev[kNumChannels], m_median[kNumChannels];
-    float           m_meanAvg, m_stdDevAvg, m_medianAvg;
-    EImageFormat    m_imageFormat;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEHISTOGRAM_H
diff --git a/Code/Sandbox/Editor/Util/ImagePainter.cpp b/Code/Sandbox/Editor/Util/ImagePainter.cpp
deleted file mode 100644
index 3d14684593..0000000000
--- a/Code/Sandbox/Editor/Util/ImagePainter.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ImagePainter.h"
-
-// Editor
-#include "Terrain/Heightmap.h"
-#include "Terrain/Layer.h"
-
-SEditorPaintBrush::SEditorPaintBrush(CHeightmap& rHeightmap, CLayer& rLayer,
-    const bool bMaskByLayerSettings, const uint32 dwLayerIdMask, const bool bFlood)
-    : bBlended(true)
-    , m_rHeightmap(rHeightmap)
-    , m_rLayer(rLayer)
-    , m_cFilterColor(1, 1, 1)
-    , m_dwLayerIdMask(dwLayerIdMask)
-    , m_bFlood(bFlood)
-{
-    if (bMaskByLayerSettings)
-    {
-        m_fMinAltitude = m_rLayer.GetLayerStart();
-        m_fMaxAltitude = m_rLayer.GetLayerEnd();
-        m_fMinSlope = tan(m_rLayer.GetLayerMinSlopeAngle() / 90.1f * g_PI / 2.0f);    // 0..90 -> 0..~1/0
-        m_fMaxSlope = tan(m_rLayer.GetLayerMaxSlopeAngle() / 90.1f * g_PI / 2.0f);    // 0..90 -> 0..~1/0
-    }
-    else
-    {
-        m_fMinAltitude = -FLT_MAX;
-        m_fMaxAltitude = FLT_MAX;
-        m_fMinSlope = 0;
-        m_fMaxSlope = FLT_MAX;
-    }
-}
-
-float SEditorPaintBrush::GetMask(const float fX, const float fY) const
-{
-    // Our expectation is that fX and fY are values of [0, 1) (i.e. includes 0, excludes 1).  
-    // We're mapping this back to an int range where the width & height are generally powers of 2.  So for example, we're mapping to 0 - 1023.  
-    // To preserve maximum precision in our floats, and for ease of understanding, we're going to expect that our floats actually represent 
-    // the 0 - 1024 range (i.e. 1 is 1024, not 1023), so that way each increment of a float is 1/1024 instead of 1/1023.  This means that a value 
-    // of 1 that's passed in is off the right edge of our range and technically invalid, so we'll just clamp if that happens.
-    int iX = AZStd::clamp(static_cast<uint64>(fX * m_rHeightmap.GetWidth()), static_cast<uint64>(0), static_cast<uint64>(m_rHeightmap.GetWidth() - 1));
-    int iY = AZStd::clamp(static_cast<uint64>(fY * m_rHeightmap.GetHeight()), static_cast<uint64>(0), static_cast<uint64>(m_rHeightmap.GetHeight() - 1));
-
-    float fAltitude = m_rHeightmap.GetZInterpolated(fX * m_rHeightmap.GetWidth(), fY * m_rHeightmap.GetHeight());
-
-    // Check if altitude is within brush min/max altitude
-    if (fAltitude < m_fMinAltitude || fAltitude > m_fMaxAltitude)
-    {
-        return 0;
-    }
-
-    float fSlope = m_rHeightmap.GetAccurateSlope(fX * m_rHeightmap.GetWidth(), fY * m_rHeightmap.GetHeight());
-
-    // Check if slope is within brush min/max slope
-    if (fSlope < m_fMinSlope || fSlope > m_fMaxSlope)
-    {
-        return 0;
-    }
-
-    //  Soft slope test
-    //  float fSlopeAplha = 1.f;
-    //  fSlopeAplha *= CLAMP((m_fMaxSlope-fSlope)*4 + 0.25f,0,1);
-    //  fSlopeAplha *= CLAMP((fSlope-m_fMinSlope)*4 + 0.25f,0,1);
-
-    if (m_dwLayerIdMask != 0xffffffff)
-    {
-        LayerWeight weight = m_rHeightmap.GetLayerWeightAt(iX, iY);
-
-        if ((weight.PrimaryId() & CLayer::e_undefined) != m_dwLayerIdMask)
-        {
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CImagePainter::PaintBrush(const float fpx, const float fpy, TImage<LayerWeight>& image, const SEditorPaintBrush& brush)
-{
-    float fX = fpx * image.GetWidth(), fY = fpy * image.GetHeight();
-
-    // By using 1/width and 1/height as our scale, this means we're expecting to generate values of [0, 1).
-    // i.e. we're expecting to generate 0/width to (width-1)/width, and 0/height to (height-1)/height.
-    // This aligns with the expectations of how GetMask() will use these values.
-    const float fScaleX = 1.0f / image.GetWidth();
-    const float fScaleY = 1.0f / image.GetHeight();
-
-    ////////////////////////////////////////////////////////////////////////
-    // Draw an attenuated spot on the map
-    ////////////////////////////////////////////////////////////////////////
-    float fMaxDist, fAttenuation, fYSquared;
-    float fHardness = brush.hardness;
-
-    unsigned int pos;
-
-    LayerWeight* sourceData = image.GetData();
-
-    // Calculate the maximum distance
-    fMaxDist = brush.fRadius * image.GetWidth();
-
-    assert(image.GetWidth() == image.GetHeight());
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-
-    int iMinX = (int)floor(fX - fMaxDist), iMinY = (int)floor(fY - fMaxDist);
-    int iMaxX = (int)ceil(fX + fMaxDist), iMaxY = (int)ceil(fY + fMaxDist);
-
-    for (int iPosY = iMinY; iPosY <= iMaxY; iPosY++)
-    {
-        // Skip invalid locations
-        if (iPosY < 0 || iPosY > height - 1)
-        {
-            continue;
-        }
-
-        float fy = (float)iPosY - fY;
-
-        // Precalculate
-        fYSquared = (float)(fy * fy);
-
-        for (int iPosX = iMinX; iPosX <= iMaxX; iPosX++)
-        {
-            float fx = (float)iPosX - fX;
-
-            // Skip invalid locations
-            if (iPosX < 0 || iPosX > width - 1)
-            {
-                continue;
-            }
-
-            // Only circle.
-            float dist = sqrtf(fYSquared + fx * fx);
-            if (!brush.m_bFlood && dist > fMaxDist)
-            {
-                continue;
-            }
-
-            float fMask = brush.GetMask(iPosX * fScaleX, iPosY * fScaleY);
-
-            if (fMask < 0.5f)
-            {
-                continue;
-            }
-
-
-            // Calculate the array index
-            pos = iPosX + iPosY * width;
-
-            // Calculate attenuation factor
-            fAttenuation = brush.m_bFlood ? 1.0f : 1.0f - __min(1.0f, dist / fMaxDist);
-
-            float h = static_cast<float>(sourceData[pos].GetWeight(brush.color) / 255.0f);
-            float dh = 1.0f - h;
-            float fh = clamp_tpl((fAttenuation) * dh * fHardness + h, 0.0f, 1.0f);
-
-            // A non-zero distance between our weight sample and the center point of the brush
-            // can cause fAttenuation to be ~0.999, so if h (the current weight) is 254, any
-            // value less than 1 * dh will give us a value between 254 and 255.
-            // As we convert from 0-1 back to 0-255 number ranges, it's important to round
-            // instead of truncating so that we don't have to have an exact distance of 0
-            // to reach a value of 255.  
-            uint8 weight = static_cast<uint8>(clamp_tpl(round(fh * 255.0f), 0.0f, 255.0f));
-
-            sourceData[pos].SetWeight(brush.color, weight);
-        }
-    }
-}
-
-
-void CImagePainter::PaintBrushWithPattern(const float fpx, const float fpy, CImageEx& outImageBGR,
-    const uint32 dwOffsetX, const uint32 dwOffsetY, const float fScaleX, const float fScaleY,
-    const SEditorPaintBrush& brush, const CImageEx& imgPattern)
-{
-    float fX = fpx * fScaleX, fY = fpy * fScaleY;
-
-    ////////////////////////////////////////////////////////////////////////
-    // Draw an attenuated spot on the map
-    ////////////////////////////////////////////////////////////////////////
-    float fMaxDist, fAttenuation, fYSquared;
-    float fHardness = brush.hardness;
-
-    unsigned int pos;
-
-    uint32* srcBGR = outImageBGR.GetData();
-    uint32* pat = imgPattern.GetData();
-
-    int value = brush.color;
-
-    // Calculate the maximum distance
-    fMaxDist = brush.fRadius;
-
-    int width = outImageBGR.GetWidth();
-    int height = outImageBGR.GetHeight();
-
-    int patwidth = imgPattern.GetWidth();
-    int patheight = imgPattern.GetHeight();
-
-    int iMinX = (int)floor(fX - fMaxDist), iMinY = (int)floor(fY - fMaxDist);
-    int iMaxX = (int)ceil(fX + fMaxDist), iMaxY = (int)ceil(fY + fMaxDist);
-
-    bool bSRGB = imgPattern.GetSRGB();
-
-    for (int iPosY = iMinY; iPosY < iMaxY; iPosY++)
-    {
-        // Skip invalid locations
-        if (iPosY - dwOffsetY < 0 || iPosY - dwOffsetY > height - 1)
-        {
-            continue;
-        }
-
-        float fy = (float)iPosY - fY;
-
-        // Precalculate
-        fYSquared = (float)(fy * fy);
-
-        int32 iPatY = ((uint32)iPosY) % patheight;
-        assert(iPatY >= 0 && iPatY < patheight);
-
-        for (int iPosX = iMinX; iPosX < iMaxX; iPosX++)
-        {
-            float fx = (float)iPosX - fX;
-
-            // Skip invalid locations
-            if (iPosX - dwOffsetX < 0 || iPosX - dwOffsetX > width - 1)
-            {
-                continue;
-            }
-
-            // Only circle.
-            float dist = sqrtf(fYSquared + fx * fx);
-
-            if (!brush.m_bFlood && dist > fMaxDist)
-            {
-                continue;
-            }
-
-            // Calculate the array index
-            pos = (iPosX - dwOffsetX) + (iPosY - dwOffsetY) * width;
-
-            // Calculate attenuation factor
-            fAttenuation = brush.m_bFlood ? 1.0f : 1.0f - __min(1.0f, dist / fMaxDist);
-            assert(fAttenuation >= 0.0f && fAttenuation <= 1.0f);
-
-            // Note that GetMask expects a range of [0, 1), so it's correct to divide by
-            // fScaleX and fScaleY instead of (fScaleX-1) and (fScaleY-1).
-            float fMask = brush.GetMask(iPosX / fScaleX, iPosY / fScaleY);
-
-            uint32 cDstPixBGR = srcBGR[pos];
-
-            int32 iPatX = ((uint32)iPosX) % patwidth;
-            assert(iPatX >= 0 && iPatX < patwidth);
-
-            uint32 cSrcPix = pat[iPatX + iPatY * patwidth];
-
-            float s = fAttenuation * fHardness * fMask;
-            assert(s >= 0.0f && s <= 1.0f);
-            if (fcmp(s, 0))
-            {
-                // If the blend would be entirely biased to the pixel in outImage then don't modify anything
-                // (The logic below is susceptible to floating point inaccuracy and would change the pixel
-                // even though it is not supposed to)
-                continue;
-            }
-
-            const float fRecip255 = 1.0f / 255.0f;
-
-            // Convert Src to Linear Space (Src is pattern texture, can be in linear or gamma space)
-            ColorF cSrc = ColorF(GetRValue(cSrcPix), GetGValue(cSrcPix), GetBValue(cSrcPix)) * fRecip255;
-            if (bSRGB)
-            {
-                cSrc.srgb2rgb();
-            }
-
-            ColorF cMtl = brush.m_cFilterColor;
-            cMtl.srgb2rgb();
-
-            cSrc *= cMtl;
-            cSrc.clamp(0.0f, 1.0f);
-
-            // Convert Dst to Linear Space ( Dst is always in gamma space ), and load from BGR -> RGB
-            ColorF cDst = ColorF(GetBValue(cDstPixBGR), GetGValue(cDstPixBGR), GetRValue(cDstPixBGR)) * fRecip255;
-            cDst.srgb2rgb();
-
-            // Linear space blend
-            ColorF cOut = cSrc * s + cDst * (1.0f - s);
-
-            // Convert final result to gamma space and put back in [0..255] range
-            cOut.rgb2srgb();
-            cOut *= 255.0f;
-
-            // Save the blended result as BGR
-            // It's important to round as we go from float back to int.  If we just truncate,
-            // we'll end up with consistently darker colors.
-            srcBGR[pos] = RGB(round(cOut.b), round(cOut.g), round(cOut.r));
-        }
-    }
-}
-
-
-void CImagePainter::FillWithPattern(CImageEx& outImage, const uint32 dwOffsetX, const uint32 dwOffsetY,
-    const CImageEx& imgPattern)
-{
-    unsigned int pos;
-
-    uint32* src = outImage.GetData();
-    uint32* pat = imgPattern.GetData();
-
-    int width = outImage.GetWidth();
-    int height = outImage.GetHeight();
-
-    int patwidth = imgPattern.GetWidth();
-    int patheight = imgPattern.GetHeight();
-
-    if (patheight == 0 || patwidth == 0)
-    {
-        return;
-    }
-
-    for (int iPosY = 0; iPosY < height; iPosY++)
-    {
-        int32 iPatY = ((uint32)iPosY + dwOffsetY) % patheight;
-        assert(iPatY >= 0 && iPatY < patheight);
-
-        for (int iPosX = 0; iPosX < width; iPosX++)
-        {
-            // Calculate the array index
-            pos = iPosX + iPosY * width;
-
-            int32 iPatX = ((uint32)iPosX + dwOffsetX) % patwidth;
-            assert(iPatX >= 0 && iPatX < patwidth);
-
-            uint32 cSrc = pat[iPatX + iPatY * patwidth];
-
-            src[pos] = cSrc;
-        }
-    }
-}
-
diff --git a/Code/Sandbox/Editor/Util/ImagePainter.h b/Code/Sandbox/Editor/Util/ImagePainter.h
deleted file mode 100644
index f91c04c4a1..0000000000
--- a/Code/Sandbox/Editor/Util/ImagePainter.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGEPAINTER_H
-#define CRYINCLUDE_EDITOR_UTIL_IMAGEPAINTER_H
-#pragma once
-
-#include "Util/Image.h"
-
-struct LayerWeight;
-
-// Brush structure used for painting.
-struct SANDBOX_API SEditorPaintBrush
-{
-    // constructor
-    SEditorPaintBrush(class CHeightmap& rHeightmap, class CLayer& rLayer,
-                const bool bMaskByLayerSettings, const uint32 dwLayerIdMask, const bool bFlood);
-
-    CHeightmap&            m_rHeightmap;        // for mask support
-    unsigned char           color;                  // Painting color
-    float                           fRadius;                // outer radius (0..1 for the whole terrain size)
-    float                           hardness;               // 0-1 hardness of brush
-    bool                            bBlended;               // true=shades of the value are stores, false=the value is either stored or not
-    bool                            m_bFlood;                   // true=fills square area without attenuation, false=fills circle area with attenuation
-    uint32                      m_dwLayerIdMask;// reference Value for the mask, 0xffffffff if not used
-    CLayer&                    m_rLayer;                // layer we paint with
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    ColorF                      m_cFilterColor; // (1,1,1) if not used, multiplied with brightness
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    // Arguments:
-    //   fX - 0..1 in the whole terrain
-    //   fY - 0..1 in the whole terrain
-    // Return:
-    //   0=paint there 0% .. 1=paint there 100%
-    float GetMask(const float fX, const float fY) const;
-
-protected: // --------------------------------------------------------------------------
-
-    float                           m_fMinSlope;                // in m per m
-    float                           m_fMaxSlope;                // in m per me
-    float                           m_fMinAltitude;         // in m
-    float                           m_fMaxAltitude;         // in m
-};
-
-// Contains image painting functions.
-class CImagePainter
-{
-public:
-
-    // Paint spot on image at position px,py with specified paint brush parameters (to a layer)
-    // Arguments:
-    //   fpx - 0..1 in the whole terrain (used for the mask)
-    //   fpy - 0..1 in the whole terrain (used for the mask)
-    SANDBOX_API void PaintBrush(const float fpx, const float fpy, TImage<LayerWeight>& image, const SEditorPaintBrush& brush);
-
-    // Paint spot with pattern (to an RGB image)
-    // real spot is drawn to (fpx-dwOffsetX,fpy-dwOffsetY) - to get the pattern working we need this info split up like this
-    // Arguments:
-    //   fpx - 0..1 in the whole terrain (used for the mask)
-    //   fpy - 0..1 in the whole terrain (used for the mask)
-    void PaintBrushWithPattern(const float fpx, const float fpy, CImageEx& outImage, const uint32 dwOffsetX, const uint32 dwOffsetY,
-        const float fScaleX, const float fScaleY, const SEditorPaintBrush& brush, const CImageEx& imgPattern);
-
-    //
-    void FillWithPattern(CImageEx& outImage, const uint32 dwOffsetX, const uint32 dwOffsetY, const CImageEx& imgPattern);
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_IMAGEPAINTER_H
diff --git a/Code/Sandbox/Editor/Util/ImageTIF.cpp b/Code/Sandbox/Editor/Util/ImageTIF.cpp
deleted file mode 100644
index 988bc8cf27..0000000000
--- a/Code/Sandbox/Editor/Util/ImageTIF.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "ImageTIF.h"
-
-/// libTiff
-#include <tiffio.h>  // TIFF library
-
-// Function prototypes
-static tsize_t libtiffDummyReadProc (thandle_t fd, tdata_t buf, tsize_t size);
-static tsize_t libtiffDummyWriteProc (thandle_t fd, tdata_t buf, tsize_t size);
-static toff_t libtiffDummySizeProc(thandle_t fd);
-static toff_t libtiffDummySeekProc (thandle_t fd, toff_t off, int i);
-//static int libtiffDummyCloseProc (thandle_t fd);
-
-// Structure used to pass state to our in-memory TIFF file callbacks
-struct MemImage
-{
-    uint8 *buffer;
-    uint32 offset;
-    uint32 size;
-};
-
-
-/////////////////// Callbacks to libtiff
-
-static int libtiffDummyMapFileProc(thandle_t, tdata_t*, toff_t*)
-{
-    return 0;
-}
-
-static void libtiffDummyUnmapFileProc(thandle_t, tdata_t, toff_t)
-{
-}
-
-static toff_t libtiffDummySizeProc(thandle_t fd)
-{
-    MemImage *memImage = static_cast<MemImage *>(fd);
-    return memImage->size;
-}
-
-static tsize_t
-libtiffDummyReadProc (thandle_t fd, tdata_t buf, tsize_t size)
-{
-    MemImage *memImage = static_cast<MemImage *>(fd);
-    tsize_t nBytesLeft = memImage->size - memImage->offset;
-
-    if (size > nBytesLeft)
-    {
-        size = nBytesLeft;
-    }
-
-    memcpy(buf, &memImage->buffer[memImage->offset], size);
-
-    memImage->offset += size;
-
-    // Return the amount of data read
-    return size;
-}
-
-static tsize_t
-libtiffDummyWriteProc ([[maybe_unused]] thandle_t fd, [[maybe_unused]] tdata_t buf, tsize_t size)
-{
-    return (size);
-}
-
-static toff_t
-libtiffDummySeekProc (thandle_t fd, toff_t off, int i)
-{
-    MemImage *memImage = static_cast<MemImage *>(fd);
-    switch (i)
-    {
-    case SEEK_SET:
-        memImage->offset = off;
-        break;
-
-    case SEEK_CUR:
-        memImage->offset += off;
-        break;
-
-    case SEEK_END:
-        memImage->offset = memImage->size - off;
-        break;
-
-    default:
-        memImage->offset = off;
-        break;
-    }
-
-    // This appears to return the location that it went to
-    return memImage->offset;
-}
-
-static int
-libtiffDummyCloseProc ([[maybe_unused]] thandle_t fd)
-{
-    // Return a zero meaning all is well
-    return 0;
-}
-
-bool CImageTIF::Load(const QString& fileName, CImageEx& outImage)
-{
-    CCryFile file;
-    if (!file.Open(fileName.toUtf8().data(), "rb"))
-    {
-        CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
-        return false;
-    }
-
-    MemImage memImage;
-
-    std::vector<uint8> data;
-
-    memImage.size = file.GetLength();
-
-    data.resize(memImage.size);
-    memImage.buffer = &data[0];
-    memImage.offset = 0;
-
-    file.ReadRaw(memImage.buffer, memImage.size);
-
-
-    // Open the dummy document (which actually only exists in memory)
-    TIFF* tif = TIFFClientOpen (fileName.toUtf8().data(), "rm", (thandle_t)&memImage, libtiffDummyReadProc,
-            libtiffDummyWriteProc, libtiffDummySeekProc,
-            libtiffDummyCloseProc, libtiffDummySizeProc, libtiffDummyMapFileProc, libtiffDummyUnmapFileProc);
-
-    //  TIFF* tif = TIFFOpen(fileName,"r");
-
-    bool bRet = false;
-
-    if (tif)
-    {
-        uint32 dwWidth, dwHeight;
-        size_t npixels;
-        uint32* raster;
-        char* dccfilename = NULL;
-
-        TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &dwWidth);
-        TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &dwHeight);
-        TIFFGetField(tif, TIFFTAG_IMAGEDESCRIPTION, &dccfilename);
-
-        npixels = dwWidth * dwHeight;
-
-        raster = (uint32*)_TIFFmalloc((tsize_t)(npixels * sizeof(uint32)));
-
-        if (raster)
-        {
-            if (TIFFReadRGBAImage(tif, dwWidth, dwHeight, raster, 0))
-            {
-                if (outImage.Allocate(dwWidth, dwHeight))
-                {
-                    char* dest = (char*)outImage.GetData();
-                    uint32 dwPitch = dwWidth * 4;
-
-                    for (uint32 dwY = 0; dwY < dwHeight; ++dwY)
-                    {
-                        char* src2 = (char*)&raster[(dwHeight - 1 - dwY) * dwWidth];
-                        char* dest2 = &dest[dwPitch * dwY];
-
-                        memcpy(dest2, src2, dwWidth * 4);
-                    }
-
-                    if (dccfilename)
-                    {
-                        outImage.SetDccFilename(dccfilename);
-                    }
-
-                    bRet = true;
-                }
-            }
-
-            _TIFFfree(raster);
-        }
-
-        TIFFClose(tif);
-    }
-
-    if (!bRet)
-    {
-        outImage.Detach();
-    }
-
-    return bRet;
-}
-
-bool CImageTIF::Load(const QString& fileName, CFloatImage& outImage)
-{
-    // Defined in GeoTIFF format - http://web.archive.org/web/20160403164508/http://www.remotesensing.org/geotiff/spec/geotiffhome.html
-    // Used to get the X, Y, Z scales from a GeoTIFF file
-    static const int GEOTIFF_MODELPIXELSCALE_TAG = 33550;
-
-    
-    CCryFile file;
-    if (!file.Open(fileName.toUtf8().data(), "rb"))
-    {
-        CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
-        return false;
-    }
-
-    MemImage memImage;
-
-    std::vector<uint8> data;
-
-    memImage.size = file.GetLength();
-
-    data.resize(memImage.size);
-    memImage.buffer = &data[0];
-    memImage.offset = 0;
-
-    file.ReadRaw(memImage.buffer, memImage.size);
-
-
-    // Open the dummy document (which actually only exists in memory)
-    TIFF* tif = TIFFClientOpen(fileName.toUtf8().data(), "rm", (thandle_t)&memImage, libtiffDummyReadProc,
-        libtiffDummyWriteProc, libtiffDummySeekProc,
-        libtiffDummyCloseProc, libtiffDummySizeProc, libtiffDummyMapFileProc, libtiffDummyUnmapFileProc);
-
-    //  TIFF* tif = TIFFOpen(fileName,"r");
-
-    bool bRet = false;
-
-    if (tif)
-    {
-        uint32 width = 0, height = 0;
-        uint16 spp = 0, bpp = 0, format = 0;
-        char* dccfilename = NULL;
-
-        TIFFGetField(tif, TIFFTAG_IMAGEDESCRIPTION, &dccfilename);
-
-        TIFFGetFieldDefaulted(tif, TIFFTAG_IMAGEWIDTH, &width);
-        TIFFGetFieldDefaulted(tif, TIFFTAG_IMAGELENGTH, &height);
-
-        TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bpp);     // how many bits each color component is.  typically 8-bit, but could be 16-bit.
-        TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &spp);   // how many color components per pixel?  1=greyscale, 3=RGB, 4=RGBA
-        TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &format);   // format of the pixel data - int, uint, float.  
-
-        // There are two types of 32-bit floating point TIF semantics.  Paint programs tend to use values in the 0.0 - 1.0 range.
-        // GeoTIFF files use values where 1.0 = 1 meter by default, but also have an optional ZScale parameter to provide additional
-        // scaling control.
-
-        // By default, we'll assume this is a regular TIFF that we want to leave in the 0.0 - 1.0 range.
-        float pixelValueScale = 1.0f;
-
-        // Check to see if it's a GeoTIFF, and if so, whether or not it has the ZScale parameter.
-        uint32 tagCount = 0;
-        double *pixelScales = NULL;
-        if (TIFFGetField(tif, GEOTIFF_MODELPIXELSCALE_TAG, &tagCount, &pixelScales) == 1)
-        {
-            // if there's an xyz scale, and the Z scale isn't 0, let's use it.
-            if ((tagCount == 3) && (pixelScales != NULL) && (pixelScales[2] != 0.0f))
-            {
-                pixelValueScale = static_cast<float>(pixelScales[2]);
-            }
-        }
-
-        uint32 linesize = TIFFScanlineSize(tif);
-        uint8* linebuf = static_cast<uint8*>(_TIFFmalloc(linesize));
-
-        // We assume that a scanline has all of the samples in it.  Validate the assumption.
-        assert(linesize == (width * (bpp / 8) * spp));
-
-        // Aliases for linebuf to make it easier to pull different types out of the scanline.
-        uint16* linebufUint16 = reinterpret_cast<uint16*>(linebuf);
-        uint32* linebufUint32 = reinterpret_cast<uint32*>(linebuf);
-        float* linebufFloat = reinterpret_cast<float*>(linebuf);
-
-        if (linebuf)
-        {
-            if (outImage.Allocate(width, height))
-            {
-                float* dest = outImage.GetData();
-                bRet = true;
-
-                float maxPixelValue = 0.0f;
-
-                for (uint32 y = 0; y < height; y++)
-                {
-                    TIFFReadScanline(tif, linebuf, y);
-
-                    // For each pixel, we either scale or clamp the values to a 16-bit range.  It is asymmetric behaviour, but based
-                    // on assumptions about the input data:
-                    // 8-bit values are scaled up because 8-bit textures used as heightmaps are usually scaled-down 16-bit values.
-                    // 32-bit values may or may not need to scale down, depending on the intended authoring range.  Our assumption
-                    // is that they were most likely authored with the intent of 1:1 value translations.
-
-                    for (uint32 x = 0; x < width; x++)
-                    {
-                        switch (bpp)
-                        {
-                            case 8:
-                                // Scale 0-255 to 0.0 - 1.0
-                                dest[(y * width) + x] = static_cast<float>(linebuf[x * spp]) / static_cast<float>(std::numeric_limits<uint8>::max());
-                                break;
-                            case 16:
-                                // Scale 0-65535 to 0.0 - 1.0
-                                dest[(y * width) + x] = static_cast<float>(linebufUint16[x * spp]) / static_cast<float>(std::numeric_limits<uint16>::max());
-                                break;
-                            case 32:
-                                // 32-bit values could be ints or floats.
-
-                                if (format == SAMPLEFORMAT_INT)
-                                {
-                                    // Scale 0-max int32 to 0.0 - 1.0
-                                    dest[(y * width) + x] = clamp_tpl(static_cast<float>(linebufUint32[x * spp]) / static_cast<float>(std::numeric_limits<int32>::max()), 0.0f, 1.0f);
-                                }
-                                else if (format == SAMPLEFORMAT_UINT)
-                                {
-                                    // Scale 0-max uint32 to 0.0 - 1.0
-                                    dest[(y * width) + x] = clamp_tpl(static_cast<float>(linebufUint32[x * spp]) / static_cast<float>(std::numeric_limits<uint32>::max()), 0.0f, 1.0f);
-                                }
-                                else if (format == SAMPLEFORMAT_IEEEFP)
-                                {
-                                    dest[(y * width) + x] = linebufFloat[x * spp] * pixelValueScale;
-                                }
-                                else
-                                {
-                                    // Unknown / unsupported format.
-                                    bRet = false;
-                                }
-                                break;
-                            default:
-                                // Unknown / unsupported format.
-                                bRet = false;
-                                break;
-                        }
-
-                        maxPixelValue = max(maxPixelValue, dest[(y * width) + x]);
-                    }
-                }
-
-                if (dccfilename)
-                {
-                    outImage.SetDccFilename(dccfilename);
-                }
-
-                // If this is a GeoTIFF using 32-bit floats, we will end up outside the 0.0 - 1.0 range.  Let's scale it back down to 0.0 - 1.0.
-                if (maxPixelValue > 1.0f)
-                {
-                    for (uint32 y = 0; y < height; y++)
-                    {
-                        for (uint32 x = 0; x < width; x++)
-                        {
-                            dest[(y * width) + x] = dest[(y * width) + x] / maxPixelValue;
-                        }
-                    }
-                }
-            }
-
-            _TIFFfree(linebuf);
-        }
-
-        TIFFClose(tif);
-    }
-
-    if (!bRet)
-    {
-        outImage.Detach();
-    }
-
-    return bRet;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageTIF::SaveRAW(const QString& fileName, const void* pData, int width, int height, int bytesPerChannel, int numChannels, bool bFloat, const char* preset)
-{
-    if (bFloat && (bytesPerChannel != 2 && bytesPerChannel != 4))
-    {
-        bFloat = false;
-    }
-
-    bool bRet = false;
-
-    CFileUtil::OverwriteFile(fileName);
-    TIFF* tif = TIFFOpen(fileName.toUtf8().data(), "wb");
-    if (tif)
-    {
-        TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
-        TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
-        TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, numChannels);
-        TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bytesPerChannel * 8);
-        TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-        TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
-        TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
-        TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, (numChannels == 1) ? PHOTOMETRIC_MINISBLACK : PHOTOMETRIC_RGB);
-        TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
-        if (bFloat)
-        {
-            TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP);
-        }
-
-        if (preset && preset[0])
-        {
-            string tiffphotoshopdata, valueheader;
-            string presetkeyvalue = string("/preset=") + string(preset);
-
-            valueheader.push_back('\x1C');
-            valueheader.push_back('\x02');
-            valueheader.push_back('\x28');
-            valueheader.push_back((presetkeyvalue.size() >> 8) & 0xFF);
-            valueheader.push_back((presetkeyvalue.size()) & 0xFF);
-            valueheader.append(presetkeyvalue);
-
-            tiffphotoshopdata.push_back('8');
-            tiffphotoshopdata.push_back('B');
-            tiffphotoshopdata.push_back('I');
-            tiffphotoshopdata.push_back('M');
-            tiffphotoshopdata.push_back('\x04');
-            tiffphotoshopdata.push_back('\x04');
-            tiffphotoshopdata.push_back('\x00');
-            tiffphotoshopdata.push_back('\x00');
-
-            tiffphotoshopdata.push_back((valueheader.size() >> 24) & 0xFF);
-            tiffphotoshopdata.push_back((valueheader.size() >> 16) & 0xFF);
-            tiffphotoshopdata.push_back((valueheader.size() >> 8) & 0xFF);
-            tiffphotoshopdata.push_back((valueheader.size()) & 0xFF);
-            tiffphotoshopdata.append(valueheader);
-
-            TIFFSetField(tif, TIFFTAG_PHOTOSHOP, tiffphotoshopdata.size(), tiffphotoshopdata.c_str());
-        }
-
-        size_t pitch = width * bytesPerChannel * numChannels;
-        char* raster = (char*) _TIFFmalloc((tsize_t)(pitch * height));
-        memcpy(raster, pData, pitch * height);
-
-        bRet = true;
-        for (int h = 0; h < height; ++h)
-        {
-            size_t offset = h * pitch;
-            int err = TIFFWriteScanline(tif, raster + offset, h, 0);
-            if (err < 0)
-            {
-                bRet = false;
-                break;
-            }
-        }
-        _TIFFfree(raster);
-        TIFFClose(tif);
-    }
-    return bRet;
-}
-
-const char* CImageTIF::GetPreset(const QString& fileName)
-{
-    std::vector<uint8> data;
-    CCryFile file;
-    if (!file.Open(fileName.toUtf8().data(), "rb"))
-    {
-        CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
-        return NULL;
-    }
-
-    MemImage memImage;
-
-    memImage.size = file.GetLength();
-
-    data.resize(memImage.size);
-    memImage.buffer = &data[0];
-    memImage.offset = 0;
-
-    file.ReadRaw(memImage.buffer, memImage.size);
-
-    TIFF* tif = TIFFClientOpen (fileName.toUtf8().data(), "rm", (thandle_t)&memImage, libtiffDummyReadProc,
-            libtiffDummyWriteProc, libtiffDummySeekProc,
-            libtiffDummyCloseProc, libtiffDummySizeProc, libtiffDummyMapFileProc, libtiffDummyUnmapFileProc);
-
-    string strReturn;
-    char* preset = NULL;
-    int size;
-    if (tif)
-    {
-        TIFFGetField(tif, TIFFTAG_PHOTOSHOP, &size, &preset);
-        for (int i = 0; i < size; ++i)
-        {
-            if (!strncmp((preset + i), "preset", 6))
-            {
-                char* presetoffset = preset + i;
-                strReturn = presetoffset;
-                if (strReturn.find('/') != -1)
-                {
-                    strReturn = strReturn.substr(0, strReturn.find('/'));
-                }
-
-                break;
-            }
-        }
-        TIFFClose(tif);
-    }
-    return strReturn.c_str();
-}
diff --git a/Code/Sandbox/Editor/Util/ImageTIF.h b/Code/Sandbox/Editor/Util/ImageTIF.h
deleted file mode 100644
index 26132aec92..0000000000
--- a/Code/Sandbox/Editor/Util/ImageTIF.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_IMAGETIF_H
-#define CRYINCLUDE_EDITOR_UTIL_IMAGETIF_H
-#pragma once
-
-#include "Util/Image.h"
-
-class SANDBOX_API CImageTIF
-{
-public:
-    bool Load(const QString& fileName, CImageEx& outImage);
-    bool Load(const QString& fileName, CFloatImage& outImage);
-    bool SaveRAW(const QString& fileName, const void* pData, int width, int height, int bytesPerChannel, int numChannels, bool bFloat, const char* preset);
-    static const char* GetPreset(const QString& fileName);
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_IMAGETIF_H
diff --git a/Code/Sandbox/Editor/Util/ImageUtil.cpp b/Code/Sandbox/Editor/Util/ImageUtil.cpp
deleted file mode 100644
index fa2631342d..0000000000
--- a/Code/Sandbox/Editor/Util/ImageUtil.cpp
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Image utilities implementation.
-
-
-#include "EditorDefs.h"
-
-#include "ImageUtil.h"
-
-// Editor
-#include "Util/ImageGif.h"
-#include "Util/ImageTIF.h"
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::Save(const QString& strFileName, CImageEx& inImage)
-{
-    QImage imgBitmap;
-
-    ImageToQImage(inImage, imgBitmap);
-
-    // Explicitly set the pixels per meter in our images to a consistent default.
-    // The normal default is 96 pixels per inch, or 3780 pixels per meter.
-    // However, the Windows scaling display setting can cause these numbers to vary
-    // on different machines, producing output files that have slightly different
-    // headers from machine to machine, which often isn't desirable.
-    const int defaultPixelsPerMeter = 3780;
-    imgBitmap.setDotsPerMeterX(defaultPixelsPerMeter);
-    imgBitmap.setDotsPerMeterY(defaultPixelsPerMeter);
-    
-    return imgBitmap.save(strFileName);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::SaveBitmap(const QString& szFileName, CImageEx& inImage)
-{
-    return Save(szFileName, inImage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::SaveJPEG(const QString& strFileName, CImageEx& inImage)
-{
-    return Save(strFileName, inImage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::Load(const QString& fileName, CImageEx& image)
-{
-    QImage imgBitmap(fileName);
-
-    if (imgBitmap.isNull())
-    {
-        CLogFile::FormatLine("Invalid file:  %s", fileName.toUtf8().data());
-        return false;
-    }
-
-    return QImageToImage(imgBitmap, image);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::LoadJPEG(const QString& strFileName, CImageEx& outImage)
-{
-    return CImageUtil::Load(strFileName, outImage);
-}
-
-//===========================================================================
-bool CImageUtil::LoadBmp(const QString& fileName, CImageEx& image)
-{
-    return CImageUtil::Load(fileName, image);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::SavePGM(const QString& fileName, const CImageEx& image)
-{
-    // There are two types of PGM ("Portable Grey Map") files - "raw" (binary) and "plain" (ASCII).  This function supports the "plain PGM"  format.
-    // See http://netpbm.sourceforge.net/doc/pgm.html or https://en.wikipedia.org/wiki/Netpbm_format for the definition.
-
-    uint32 width = image.GetWidth();
-    uint32 height = image.GetHeight();
-    uint32* pixels = image.GetData();
-
-    // Create the file header.
-    string fileHeader;
-    fileHeader.Format(
-        // P2 = PGM header for ASCII output.  (P5 is PGM header for binary output)
-        "P2\n"
-        // width and height of the image
-        "%d %d\n"
-        // The maximum grey value in the file.  (i.e. the max value for any given pixel below)
-        "65535\n"
-        , width, height);
-
-    FILE* file = nullptr;
-    azfopen(&file, fileName.toUtf8().data(), "wt");
-    if (!file)
-    {
-        return false;
-    }
-
-    // First print the file header
-    fprintf(file, fileHeader.c_str());
-
-    // Then print all the pixels.
-    for (int32 y = 0; y < height; y++)
-    {
-        for (int32 x = 0; x < width; x++)
-        {
-            fprintf(file, "%d ", pixels[x + (y * width)]);
-        }
-        fprintf(file, "\n");
-    }
-
-    fclose(file);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::LoadPGM(const QString& fileName, CImageEx& image)
-{
-    FILE* file = nullptr;
-    azfopen(&file, fileName.toUtf8().data(), "rt");
-    if (!file)
-    {
-        return false;
-    }
-
-    const char seps[] = " \n\t\r";
-    char* token;
-
-
-    int32 width = 0;
-    int32 height = 0;
-    int32 numColors = 1;
-
-
-    fseek(file, 0, SEEK_END);
-    int fileSize = ftell(file);
-    fseek(file, 0, SEEK_SET);
-
-    char* str = new char[fileSize];
-    fread(str, fileSize, 1, file);
-
-    char* nextToken = nullptr;
-    token = azstrtok(str, 0, seps, &nextToken);
-
-    while (token != NULL && token[0] == '#')
-    {
-        if (token != NULL && token[0] == '#')
-        {
-            azstrtok(NULL, 0, "\n", &nextToken);
-        }
-        token = azstrtok(NULL, 0, seps, &nextToken);
-    }
-    if (azstricmp(token, "P2") != 0)
-    {
-        // Bad file. not supported pgm.
-        delete[]str;
-        fclose(file);
-        return false;
-    }
-
-    do
-    {
-        token = azstrtok(NULL, 0, seps, &nextToken);
-        if (token != NULL && token[0] == '#')
-        {
-            azstrtok(NULL, 0, "\n", &nextToken);
-        }
-    } while (token != NULL && token[0] == '#');
-    width = atoi(token);
-
-    do
-    {
-        token = azstrtok(NULL, 0, seps, &nextToken);
-        if (token != NULL && token[0] == '#')
-        {
-            azstrtok(NULL, 0, "\n", &nextToken);
-        }
-    } while (token != NULL && token[0] == '#');
-    height = atoi(token);
-
-    do
-    {
-        token = azstrtok(NULL, 0, seps, &nextToken);
-        if (token != NULL && token[0] == '#')
-        {
-            azstrtok(NULL, 0, "\n", &nextToken);
-        }
-    } while (token != NULL && token[0] == '#');
-    numColors = atoi(token);
-
-    image.Allocate(width, height);
-
-    uint32* p = image.GetData();
-    int size = width * height;
-    int i = 0;
-    while (token != NULL && i < size)
-    {
-        do
-        {
-            token = azstrtok(NULL, 0, seps, &nextToken);
-        } while (token != NULL && token[0] == '#');
-        *p++ = atoi(token);
-        i++;
-    }
-
-    delete[]str;
-
-    fclose(file);
-
-    // If we have 16-bit greyscale values that we're storing into 32-bit pixels, denote it with an appropriate texture type.
-    if (numColors > 255)
-    {
-        image.SetFormat(eTF_R16G16);
-    }
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss)
-{
-    char drive[_MAX_DRIVE];
-    char dir[_MAX_DIR];
-    char fname[_MAX_FNAME];
-    char ext[_MAX_EXT];
-
-    if (pQualityLoss)
-    {
-        *pQualityLoss = false;
-    }
-
-    _splitpath_s(fileName.toUtf8().data(), drive, dir, fname, ext);
-
-    // Only DDS has explicit sRGB flag - we'll assume by default all formats are stored in gamma space
-    image.SetSRGB(true);
-
-    if (azstricmp(ext, ".bmp") == 0)
-    {
-        return LoadBmp(fileName, image);
-    }
-    else if (azstricmp(ext, ".tif") == 0)
-    {
-        return CImageTIF().Load(fileName, image);
-    }
-    else if (azstricmp(ext, ".jpg") == 0)
-    {
-        if (pQualityLoss)
-        {
-            *pQualityLoss = true;     // we assume JPG has quality loss
-        }
-        return LoadJPEG(fileName, image);
-    }
-    else if (azstricmp(ext, ".gif") == 0)
-    {
-        return CImageGif().Load(fileName, image);
-    }
-    else if (azstricmp(ext, ".pgm") == 0)
-    {
-        return LoadPGM(fileName, image);
-    }
-    else if (azstricmp(ext, ".png") == 0)
-    {
-        return CImageUtil::Load(fileName, image);
-    }
-    else
-    {
-        return CImageUtil::Load(fileName, image);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::SaveImage(const QString& fileName, CImageEx& image)
-{
-    char drive[_MAX_DRIVE];
-    char dir[_MAX_DIR];
-    char fname[_MAX_FNAME];
-    char ext[_MAX_EXT];
-
-    // Remove the read-only attribute so the file can be overwritten.
-    QFile(fileName).setPermissions(QFile::ReadUser | QFile::WriteUser);
-
-    _splitpath_s(fileName.toUtf8().data(), drive, dir, fname, ext);
-    if (azstricmp(ext, ".bmp") == 0)
-    {
-        return SaveBitmap(fileName, image);
-    }
-    else if (azstricmp(ext, ".jpg") == 0)
-    {
-        return SaveJPEG(fileName, image);
-    }
-    else if (azstricmp(ext, ".pgm") == 0)
-    {
-        return SavePGM(fileName, image);
-    }
-    else
-    {
-        return Save(fileName, image);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage)
-{
-    trgImage.ScaleToFit(srcImage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode)
-{
-    uint32* pSrcData = srcImage.GetData();
-    int nSrcWidth = srcImage.GetWidth();
-    int nSrcHeight = srcImage.GetHeight();
-    int nTrgWidth = srcImage.GetWidth() >> 1;
-    int nTrgHeight = srcImage.GetHeight() >> 1;
-
-    // reallocate target
-    trgImage.Release();
-    trgImage.Allocate(nTrgWidth, nTrgHeight);
-    uint32* pDstData = trgImage.GetData();
-
-    // values in this filter are the log2 of the actual multiplicative values .. see DXCFILTER_BLUR3X3 for the used 3x3 filter
-    static int filter[3][3] =
-    {
-        {0, 1, 0},
-        {1, 2, 1},
-        {0, 1, 0}
-    };
-
-    for (int i = 0; i < nTrgHeight; i++)
-    {
-        for (int j = 0; j < nTrgWidth; j++)
-        {
-            // filter3x3
-            int x = j << 1;
-            int y = i << 1;
-
-            int r, g, b, a;
-            r = b = g = a = 0;
-            uint32 col;
-
-            if (eAddressingMode == IImageUtil::WRAP) // TODO: this condition could be compile-time static by making it a template arg
-            {
-                for (int ii = 0; ii < 3; ii++)
-                {
-                    for (int jj = 0; jj < 3; jj++)
-                    {
-                        col = pSrcData[((y + nSrcHeight + ii - 1) % nSrcHeight) * nSrcWidth + ((x + nSrcWidth + jj - 1) % nSrcWidth)];
-
-                        r += (col        & 0xff) << filter[ii][jj];
-                        g += ((col >> 8)  & 0xff) << filter[ii][jj];
-                        b += ((col >> 16) & 0xff) << filter[ii][jj];
-                        a += ((col >> 24) & 0xff) << filter[ii][jj];
-                    }
-                }
-            }
-            else
-            {
-                assert(eAddressingMode == IImageUtil::CLAMP);
-                for (int ii = 0; ii < 3; ii++)
-                {
-                    for (int jj = 0; jj < 3; jj++)
-                    {
-                        int x1 = clamp_tpl<int>((x + jj), 0, nSrcWidth - 1);
-                        int y1 = clamp_tpl<int>((y + ii), 0, nSrcHeight - 1);
-                        col = pSrcData[ y1 * nSrcWidth + x1];
-
-                        r += (col        & 0xff) << filter[ii][jj];
-                        g += ((col >> 8)  & 0xff) << filter[ii][jj];
-                        b += ((col >> 16) & 0xff) << filter[ii][jj];
-                        a += ((col >> 24) & 0xff) << filter[ii][jj];
-                    }
-                }
-            }
-
-            // the sum of the multiplicative values here is 16 so we shift by 4 bits
-            r >>= 4;
-            g >>= 4;
-            b >>= 4;
-            a >>= 4;
-
-            uint32 res = r + (g << 8) + (b << 16) + (a << 24);
-
-            *pDstData++ = res;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage)
-{
-    trgImage.ScaleToFit(srcImage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage)
-{
-    uint32 x, y, u, v;
-    unsigned int* destRow, * dest, * src, * sourceRow;
-
-    uint32 srcW = srcImage.GetWidth();
-    uint32 srcH = srcImage.GetHeight();
-
-    uint32 trgHalfW = trgImage.GetWidth() / 2;
-    uint32 trgH = trgImage.GetHeight();
-
-    uint32 xratio = trgHalfW > 0 ? (srcW << 16) / trgHalfW : 1;
-    uint32 yratio = trgH > 0 ? (srcH << 16) / trgH : 1;
-
-    src = srcImage.GetData();
-    destRow = trgImage.GetData();
-
-    v = 0;
-    for (y = 0; y < trgH; y++)
-    {
-        u = 0;
-        sourceRow = src + (v >> 16) * srcW;
-        dest = destRow;
-        for (x = 0; x < trgHalfW; x++)
-        {
-            *(dest + trgHalfW) = sourceRow[u >> 16];
-            *dest++ = sourceRow[u >> 16];
-            u += xratio;
-        }
-        v += yratio;
-        destRow += trgHalfW * 2;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::SmoothImage(CByteImage& image, int numSteps)
-{
-    assert(numSteps > 0);
-    uint8* buf = image.GetData();
-    int w = image.GetWidth();
-    int h = image.GetHeight();
-
-    for (int steps = 0; steps < numSteps; steps++)
-    {
-        // Smooth the image.
-        for (int y = 1; y < h - 1; y++)
-        {
-            // Precalculate for better speed
-            uint8* ptr = &buf[y * w + 1];
-
-            for (int x = 1; x < w - 1; x++)
-            {
-                // Smooth it out
-                *ptr =
-                    (
-                        (uint32)ptr[1] +
-                        ptr[w] +
-                        ptr[-1] +
-                        ptr[-w] +
-                        ptr[w + 1] +
-                        ptr[w - 1] +
-                        ptr[-w + 1] +
-                        ptr[-w - 1]
-                    ) >> 3;
-
-                // Next pixel
-                ptr++;
-            }
-        }
-    }
-}
-
-unsigned char CImageUtil::GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image)
-{
-    //  assert(image.IsValid());        if(!image.IsValid())return(0);      // this shouldn't be
-
-    DWORD x = (DWORD)(iniX256) >> 8;
-    DWORD y = (DWORD)(iniY256) >> 8;
-
-    if (x >= image.GetWidth() - 1 || y >= image.GetHeight() - 1)
-    {
-        return image.ValueAt(x, y);                                                          // border is not filtered, 255 to get in range 0..1
-    }
-    DWORD rx = (DWORD)(iniX256) & 0xff;       // fractional aprt
-    DWORD ry = (DWORD)(iniY256) & 0xff;       // fractional aprt
-
-    DWORD top = (DWORD)image.ValueAt((int)x, (int)y) * (256 - rx)                      // left top
-        + (DWORD)image.ValueAt((int)x + 1, (int)y) * rx;                                            // right top
-
-    DWORD bottom = (DWORD)image.ValueAt((int)x, (int)y + 1) * (256 - rx)              // left bottom
-        + (DWORD)image.ValueAt((int)x + 1, (int)y + 1) * rx;                                        // right bottom
-
-    return (unsigned char)((top * (256 - ry) + bottom * ry) >> 16);
-}
-
-bool CImageUtil::QImageToImage(const QImage& bitmap, CImageEx& image)
-{
-
-    QImage convertedBitmap;
-    const QImage *srcBitmap = &bitmap;
-    
-    if (bitmap.format() != QImage::Format_RGBA8888)
-    {
-        convertedBitmap = bitmap.convertToFormat(QImage::Format_RGBA8888);
-        srcBitmap = &convertedBitmap;
-    }
-
-    if (image.Allocate(srcBitmap->width(), srcBitmap->height()) == false)
-    {
-        return false;
-    }
-
-    AZStd::copy(srcBitmap->bits(), srcBitmap->bits() + (srcBitmap->width() * srcBitmap->height() * sizeof(uint32)), reinterpret_cast<uint8*>(image.GetData()));
-
-    return true;
-}
-
-bool CImageUtil::ImageToQImage(const CImageEx& image, QImage& bitmapObj)
-{
-    bitmapObj = QImage(image.GetWidth(), image.GetHeight(), QImage::Format_RGBA8888);
-    AZStd::copy(image.GetData(), image.GetData() + image.GetWidth() * image.GetHeight(), reinterpret_cast<uint32*>(bitmapObj.bits()));
-
-    return true;
-}
diff --git a/Code/Sandbox/Editor/Util/ImageUtil.h b/Code/Sandbox/Editor/Util/ImageUtil.h
deleted file mode 100644
index 38fd0c0df6..0000000000
--- a/Code/Sandbox/Editor/Util/ImageUtil.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Image utilities.
-
-
-#pragma once
-
-#include <Include/IImageUtil.h>
-
-/*!
- *  Utility Class to manipulate images.
- */
-class SANDBOX_API CImageUtil
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Image loading.
-    //////////////////////////////////////////////////////////////////////////
-    //! Load image, detect image type by file extension.
-    // Arguments:
-    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
-    static bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0);
-    //! Save image, detect image type by file extension.
-    static bool SaveImage(const QString& fileName, CImageEx& image);
-
-    // General image fucntions
-    static bool LoadJPEG(const QString& strFileName, CImageEx& image);
-    static bool SaveJPEG(const QString& strFileName, CImageEx& image);
-
-    static bool SaveBitmap(const QString& szFileName, CImageEx& image);
-    static bool LoadBmp(const QString& file, CImageEx& image);
-
-    //! Save image in PGM format.
-    static bool SavePGM(const QString& fileName, const CImageEx& image);
-    //! Load image in PGM format.
-    static bool LoadPGM(const QString& fileName, CImageEx& image);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Image scaling.
-    //////////////////////////////////////////////////////////////////////////
-    //! Scale source image to fit size of target image.
-    static void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage);
-    //! Scale source image to fit size of target image.
-    static void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage);
-    //! Scale source image to fit twice side by side in target image.
-    static void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage);
-    //! Scale source image twice down image with filering
-
-    static void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode = IImageUtil::WRAP);
-
-    //! Smooth image.
-    static void SmoothImage(CByteImage& image, int numSteps);
-
-    //////////////////////////////////////////////////////////////////////////
-    // filtered lookup
-    //////////////////////////////////////////////////////////////////////////
-
-    //! behaviour outside of the texture is not defined
-    //! \param iniX in fix point 24.8
-    //! \param iniY in fix point 24.8
-    //! \return 0..255
-    static unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image);
-
-    static bool QImageToImage(const QImage& bitmap, CImageEx& image);
-    static bool ImageToQImage(const CImageEx& image, QImage& bitmapObj);
-
-private:
-    static bool Load(const QString& fileName, CImageEx& image);
-    static bool Save(const QString& strFileName, CImageEx& inImage);
-};
-
diff --git a/Code/Sandbox/Editor/Util/ImageUtil_impl.cpp b/Code/Sandbox/Editor/Util/ImageUtil_impl.cpp
deleted file mode 100644
index 367045955e..0000000000
--- a/Code/Sandbox/Editor/Util/ImageUtil_impl.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ImageUtil_impl.h"
-
-// Editor
-#include "Util/ImageUtil.h"
-
-bool CImageUtil_impl::LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss)
-{
-    return CImageUtil::LoadImage(fileName, image, pQualityLoss);
-}
-
-bool CImageUtil_impl::SaveImage(const QString& fileName, CImageEx& image)
-{
-    return CImageUtil::SaveImage(fileName, image);
-}
-
-bool CImageUtil_impl::LoadJPEG(const QString& strFileName, CImageEx& image)
-{
-    return CImageUtil::LoadJPEG(strFileName, image);
-}
-
-bool CImageUtil_impl::SaveJPEG(const QString& strFileName, CImageEx& image)
-{
-    return CImageUtil::SaveJPEG(strFileName, image);
-}
-
-bool CImageUtil_impl::SaveBitmap(const QString& szFileName, CImageEx& image)
-{
-    return CImageUtil::SaveBitmap(szFileName, image);
-}
-
-bool CImageUtil_impl::LoadBmp(const QString& file, CImageEx& image)
-{
-    return CImageUtil::LoadBmp(file, image);
-}
-
-bool CImageUtil_impl::SavePGM(const QString& fileName, const CImageEx& image)
-{
-    return CImageUtil::SavePGM(fileName, image);
-}
-
-bool CImageUtil_impl::LoadPGM(const QString& fileName, CImageEx& image)
-{
-    return CImageUtil::LoadPGM(fileName, image);
-}
-
-void CImageUtil_impl::ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage)
-{
-    CImageUtil::ScaleToFit(srcImage, trgImage);
-}
-
-void CImageUtil_impl::ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage)
-{
-    CImageUtil::ScaleToFit(srcImage, trgImage);
-}
-
-void CImageUtil_impl::ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage)
-{
-    CImageUtil::ScaleToDoubleFit(srcImage, trgImage);
-}
-
-void CImageUtil_impl::DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode)
-{
-    CImageUtil::DownScaleSquareTextureTwice(srcImage, trgImage, eAddressingMode);
-}
-
-void CImageUtil_impl::SmoothImage(CByteImage& image, int numSteps)
-{
-    CImageUtil::SmoothImage(image, numSteps);
-}
-
-unsigned char CImageUtil_impl::GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image)
-{
-    return CImageUtil::GetBilinearFilteredAt(iniX256, iniY256, image);
-}
diff --git a/Code/Sandbox/Editor/Util/ImageUtil_impl.h b/Code/Sandbox/Editor/Util/ImageUtil_impl.h
deleted file mode 100644
index 01d9f06629..0000000000
--- a/Code/Sandbox/Editor/Util/ImageUtil_impl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H
-#define CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H
-#pragma once
-
-#include "Include/IImageUtil.h"
-
-class CImageUtil_impl
-    : public IImageUtil
-{
-public:
-    CImageUtil_impl(){}
-    ~CImageUtil_impl(){}
-
-    //! Load image, detect image type by file extension.
-    // Arguments:
-    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
-    virtual bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0) override;
-
-    //! Save image, detect image type by file extension.
-    virtual bool SaveImage(const QString& fileName, CImageEx& image) override;
-
-    // General image fucntions
-    virtual bool LoadJPEG(const QString& strFileName, CImageEx& image) override;
-
-    virtual bool SaveJPEG(const QString& strFileName, CImageEx& image) override;
-
-    virtual bool SaveBitmap(const QString& szFileName, CImageEx& image) override;
-
-    virtual bool LoadBmp(const QString& file, CImageEx& image) override;
-
-    virtual bool SavePGM(const QString& fileName, const CImageEx& image) override;
-
-    virtual bool LoadPGM(const QString& fileName, CImageEx& image) override;
-
-    //! Scale source image to fit size of target image.
-    virtual void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage) override;
-
-    //! Scale source image to fit size of target image.
-    virtual void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage) override;
-
-    //! Scale source image to fit twice side by side in target image.
-    virtual void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage) override;
-
-    //! Scale source image twice down image with filtering
-    enum _EAddrMode
-    {
-        WRAP, CLAMP
-    };
-    virtual void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage,
-        IImageUtil::_EAddrMode eAddressingMode = IImageUtil::WRAP) override;
-
-    //! Smooth image.
-    virtual void SmoothImage(CByteImage& image, int numSteps) override;
-
-    //! behavior outside of the texture is not defined
-    //! \param iniX in fix point 24.8
-    //! \param iniY in fix point 24.8
-    //! \return 0..255
-    virtual unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image) override;
-};
-#endif // CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H
diff --git a/Code/Sandbox/Editor/Util/IndexedFiles.cpp b/Code/Sandbox/Editor/Util/IndexedFiles.cpp
deleted file mode 100644
index f36801cd17..0000000000
--- a/Code/Sandbox/Editor/Util/IndexedFiles.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Tagged files database for 'SmartFileOpen' dialog
-
-#include "EditorDefs.h"
-
-#include "IndexedFiles.h"
-
-volatile TIntAtomic CIndexedFiles::s_bIndexingDone;
-CIndexedFiles* CIndexedFiles::s_pIndexedFiles = NULL;
-
-bool CIndexedFiles::m_startedFileIndexing = false;
-
-void CIndexedFiles::Initialize(const QString& path, IFileUtil::ScanDirectoryUpdateCallBack updateCB)
-{
-    m_files.clear();
-    m_pathToIndex.clear();
-    m_tags.clear();
-    m_rootPath = path;
-
-    bool anyFiles = CFileUtil::ScanDirectory(path, "*.*", m_files, true, true, updateCB);
-
-    if (anyFiles == false)
-    {
-        m_files.clear();
-        return;
-    }
-
-    if (updateCB)
-    {
-        updateCB("Parsing & tagging...");
-    }
-
-    for (int i = 0; i < m_files.size(); ++i)
-    {
-        m_pathToIndex[m_files[i].filename] = i;
-    }
-
-    PrepareTagTable();
-
-    InvokeUpdateCallbacks();
-}
-
-void CIndexedFiles::AddFile(const IFileUtil::FileDesc& path)
-{
-    assert(m_pathToIndex.find(path.filename) == m_pathToIndex.end());
-    m_files.push_back(path);
-    m_pathToIndex[path.filename] = m_files.size() - 1;
-    QStringList tags;
-    GetTags(tags, path.filename);
-    for (int k = 0; k < tags.size(); ++k)
-    {
-        m_tags[tags[k]].insert(m_files.size() - 1);
-    }
-}
-
-void CIndexedFiles::RemoveFile(const QString& path)
-{
-    if (m_pathToIndex.find(path) == m_pathToIndex.end())
-    {
-        return;
-    }
-    std::map<QString, int>::iterator itr = m_pathToIndex.find(path);
-    int index = itr->second;
-    m_pathToIndex.erase(itr);
-    m_files.erase(m_files.begin() + index);
-    QStringList tags;
-    GetTags(tags, path);
-    for (int k = 0; k < tags.size(); ++k)
-    {
-        m_tags[tags[k]].erase(index);
-    }
-}
-
-void CIndexedFiles::Refresh(const QString& path, bool recursive)
-{
-    IFileUtil::FileArray files;
-    bool anyFiles = CFileUtil::ScanDirectory(m_rootPath, Path::Make(path, "*.*"), files, recursive, recursive ? true : false);
-
-    if (anyFiles == false)
-    {
-        return;
-    }
-
-    for (int i = 0; i < files.size(); ++i)
-    {
-        if (m_pathToIndex.find(files[i].filename) == m_pathToIndex.end())
-        {
-            AddFile(files[i]);
-        }
-    }
-
-    InvokeUpdateCallbacks();
-}
-
-void CIndexedFiles::GetFilesWithTags(IFileUtil::FileArray& files, const QStringList& tags) const
-{
-    files.clear();
-    if (tags.empty())
-    {
-        return;
-    }
-    int_set candidates;
-    TagTable::const_iterator i;
-    // Gets candidate files from the first tag.
-    for (i = m_tags.begin(); i != m_tags.end(); ++i)
-    {
-        if (i->first.startsWith(tags[0]))
-        {
-            candidates.insert(i->second.begin(), i->second.end());
-        }
-    }
-    // Reduces the candidates further using additional tags, if any.
-    for (int k = 1; k < tags.size(); ++k)
-    {
-        // Gathers the filter set.
-        int_set filter;
-        for (i = m_tags.begin(); i != m_tags.end(); ++i)
-        {
-            if (i->first.startsWith(tags[k]))
-            {
-                filter.insert(i->second.begin(), i->second.end());
-            }
-        }
-
-        // Filters the candidates using it.
-        for (int_set::iterator m = candidates.begin(); m != candidates.end(); )
-        {
-            if (filter.find(*m) == filter.end())
-            {
-                int_set::iterator target = m;
-                ++m;
-                candidates.erase(target);
-            }
-            else
-            {
-                ++m;
-            }
-        }
-    }
-    // Outputs the result.
-    files.reserve(candidates.size());
-    for (int_set::const_iterator m = candidates.begin(); m != candidates.end(); ++m)
-    {
-        files.push_back(m_files[*m]);
-    }
-}
-
-void CIndexedFiles::GetTags(QStringList& tags, const QString& path) const
-{
-    tags = path.split(QRegularExpression(QStringLiteral(R"([\\/.])")), Qt::SkipEmptyParts);
-}
-
-void CIndexedFiles::GetTagsOfPrefix(QStringList& tags, const QString& prefix) const
-{
-    tags.clear();
-    TagTable::const_iterator i;
-    for (i = m_tags.begin(); i != m_tags.end(); ++i)
-    {
-        if (i->first.startsWith(prefix))
-        {
-            tags.push_back(i->first);
-        }
-    }
-}
-
-void CIndexedFiles::PrepareTagTable()
-{
-    QStringList tags;
-    for (int i = 0; i < m_files.size(); ++i)
-    {
-        GetTags(tags, m_files[i].filename);
-        for (int k = 0; k < tags.size(); ++k)
-        {
-            m_tags[tags[k]].insert(i);
-        }
-    }
-}
-
-void CIndexedFiles::AddUpdateCallback(std::function<void()> updateCallback)
-{
-    CryAutoLock<CryMutex> lock(m_updateCallbackMutex);
-
-    m_updateCallbacks.push_back(updateCallback);
-}
-
-void CIndexedFiles::InvokeUpdateCallbacks()
-{
-    CryAutoLock<CryMutex> lock(m_updateCallbackMutex);
-
-    for (auto updateCallback : m_updateCallbacks)
-    {
-        updateCallback();
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/IndexedFiles.h b/Code/Sandbox/Editor/Util/IndexedFiles.h
deleted file mode 100644
index 844dd35bd5..0000000000
--- a/Code/Sandbox/Editor/Util/IndexedFiles.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Tagged files database for 'SmartFileOpen' dialog
-//
-// Notice      : Refer  SmartFileOpenDialog h
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_INDEXEDFILES_H
-#define CRYINCLUDE_EDITOR_UTIL_INDEXEDFILES_H
-#pragma once
-
-
-#include "FileUtil.h"
-#include <functional>
-
-class CIndexedFiles
-{
-    friend class CFileIndexingThread;
-public:
-    static CIndexedFiles& GetDB()
-    {
-        if (!s_pIndexedFiles)
-        {
-            assert(!"CIndexedFiles not created! Make sure you use CIndexedFiles::GetDB() after CIndexedFiles::StartFileIndexing() is called.");
-        }
-        assert(s_pIndexedFiles);
-        return *s_pIndexedFiles;
-    }
-
-    static bool HasFileIndexingDone()
-    { return s_bIndexingDone > 0; }
-
-    static void Create()
-    {
-        assert(!s_pIndexedFiles);
-        s_pIndexedFiles = new CIndexedFiles;
-    }
-
-    static void Destroy()
-    {
-        SAFE_DELETE(s_pIndexedFiles);
-    }
-
-    static void StartFileIndexing()
-    {
-        assert(s_bIndexingDone == 0);
-        assert(s_pIndexedFiles);
-
-        if (!s_pIndexedFiles)
-        {
-            return;
-        }
-
-        GetFileIndexingThread().Start(-1, "FileIndexing");
-        m_startedFileIndexing = true;
-    }
-
-    static void AbortFileIndexing()
-    {
-        if (!m_startedFileIndexing)
-        {
-            return;
-        }
-
-        if (HasFileIndexingDone() == false)
-        {
-            GetFileIndexingThread().Abort();
-        }
-        m_startedFileIndexing = false;
-    }
-
-    static void RegisterCallback(std::function<void()> callback)
-    {
-        assert(s_pIndexedFiles);
-        if (!s_pIndexedFiles)
-        {
-            return;
-        }
-
-        s_pIndexedFiles->AddUpdateCallback(callback);
-    }
-
-public:
-    void Initialize(const QString& path, IFileUtil::ScanDirectoryUpdateCallBack updateCB = NULL);
-
-    // Adds a new file to the database.
-    void AddFile(const IFileUtil::FileDesc& path);
-    // Removes a no-longer-existing file from the database.
-    void RemoveFile(const QString& path);
-    // Refreshes this database for the subdirectory.
-    void Refresh(const QString& path, bool recursive = true);
-
-    void GetFilesWithTags(IFileUtil::FileArray& files, const QStringList& tags) const;
-
-    //! This method returns all the tags which start with a given prefix.
-    //! It is useful for the tag auto-completion.
-    void GetTagsOfPrefix(QStringList& tags, const QString& prefix) const;
-
-    uint32 GetTotalCount() const
-    { return (uint32)m_files.size(); }
-
-private:
-    static bool m_startedFileIndexing;
-
-    std::vector <std::function<void()> > m_updateCallbacks;
-    IFileUtil::FileArray m_files;
-    std::map<QString, int> m_pathToIndex;
-    typedef std::set<int, std::less<int> > int_set;
-    typedef std::map<QString, int_set, std::less<QString> > TagTable;
-    TagTable m_tags;
-    QString m_rootPath;
-
-    void GetTags(QStringList& tags, const QString& path) const;
-    void PrepareTagTable();
-
-    CryMutex m_updateCallbackMutex;
-
-    void AddUpdateCallback(std::function<void()> updateCallback);
-    void InvokeUpdateCallbacks();
-
-    // A done flag for the background file indexing
-    static volatile TIntAtomic s_bIndexingDone;
-    // A thread for the background file indexing
-    class CFileIndexingThread
-        : public CryThread<CFileIndexingThread>
-    {
-    public:
-        virtual void Run()
-        {
-            CIndexedFiles::GetDB().Initialize("@assets@", CallBack);
-            CryInterlockedAdd(CIndexedFiles::s_bIndexingDone.Addr(), 1);
-        }
-
-        CFileIndexingThread()
-            : m_abort(false) {}
-
-        void Abort()
-        {
-            m_abort = true;
-            WaitForThread();
-        }
-
-        virtual ~CFileIndexingThread()
-        {
-            Abort();
-        }
-    private:
-        bool m_abort;
-        static bool CallBack([[maybe_unused]] const QString& msg)
-        {
-            if (CIndexedFiles::GetFileIndexingThread().m_abort)
-            {
-                return false;
-            }
-            return true;
-        }
-    };
-
-    static CFileIndexingThread& GetFileIndexingThread()
-    {
-        static CFileIndexingThread s_fileIndexingThread;
-
-        return s_fileIndexingThread;
-    }
-
-    // A global database for tagged files
-    static CIndexedFiles* s_pIndexedFiles;
-};
-#endif // CRYINCLUDE_EDITOR_UTIL_INDEXEDFILES_H
diff --git a/Code/Sandbox/Editor/Util/KDTree.cpp b/Code/Sandbox/Editor/Util/KDTree.cpp
deleted file mode 100644
index 486f0cc177..0000000000
--- a/Code/Sandbox/Editor/Util/KDTree.cpp
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "KDTree.h"
-
-#include <IStatObj.h>
-
-class KDTreeNode
-{
-public:
-    KDTreeNode()
-    {
-        pChildren[0] = NULL;
-        pChildren[1] = NULL;
-        pVertexIndices = NULL;
-    }
-    ~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] == NULL && pChildren[1] == NULL;
-    }
-    KDTreeNode* GetChild(uint32 nIndex) const
-    {
-        if (nIndex > 1)
-        {
-            return NULL;
-        }
-        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(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 == NULL)
-        {
-            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 == NULL)
-        {
-            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 = NULL;
-}
-
-CKDTree::~CKDTree()
-{
-    if (m_pRootNode)
-    {
-        delete m_pRootNode;
-    }
-}
-
-bool CKDTree::Build(IStatObj* pStatObj)
-{
-    if (pStatObj == NULL)
-    {
-        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(m_StatObjectList.size()); i < iStatObjSize; ++i)
-    {
-        IIndexedMesh* pMesh = m_StatObjectList[i].pStatObj->GetIndexedMesh(true);
-        if (pMesh == NULL)
-        {
-            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 == NULL)
-    {
-        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() && nObjIndex >= 0);
-
-            const SStatObj* pStatObjInfo = &(m_StatObjectList[nObjIndex]);
-
-            IIndexedMesh* pMesh = m_StatObjectList[nObjIndex].pStatObj->GetIndexedMesh();
-            if (pMesh == NULL)
-            {
-                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/Sandbox/Editor/Util/KDTree.h b/Code/Sandbox/Editor/Util/KDTree.h
deleted file mode 100644
index 89b2d3b4df..0000000000
--- a/Code/Sandbox/Editor/Util/KDTree.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * 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;
-        _smart_ptr<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/Sandbox/Editor/Util/Mailer.h b/Code/Sandbox/Editor/Util/Mailer.h
deleted file mode 100644
index 73b0280a30..0000000000
--- a/Code/Sandbox/Editor/Util/Mailer.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_MAILER_H
-#define CRYINCLUDE_EDITOR_UTIL_MAILER_H
-#pragma once
-
-
-//////////////////////////////////////////////////////////////////////////
-class CMailer
-{
-public:
-    static bool SendMail(const char* _subject,                // E-Mail Subject
-        const char* _messageBody,         // Message Text
-        const std::vector<const char*>& _recipients,  // All Recipients' Addresses
-        const std::vector<const char*>& _attachments, // All File Attachments
-        bool bShowDialog);   // Whether to allow editing by user
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_MAILER_H
diff --git a/Code/Sandbox/Editor/Util/Math.h b/Code/Sandbox/Editor/Util/Math.h
deleted file mode 100644
index eec3ccecfe..0000000000
--- a/Code/Sandbox/Editor/Util/Math.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Various math and geometry related functions.
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_MATH_H
-#define CRYINCLUDE_EDITOR_UTIL_MATH_H
-#pragma once
-
-
-//! Half PI
-#define PI_HALF (3.1415926535897932384626433832795f / 2.0f)
-
-//! Epsilon for vector comparasion.
-#define FLOAT_EPSILON 0.000001f
-
-//////////////////////////////////////////////////////////////////////////
-/** Compare two vectors if they are equal.
-*/
-inline bool IsVectorsEqual(const Vec3& v1, const Vec3& v2, const float aEpsilon = FLOAT_EPSILON)
-{
-    return (fabs(v2.x - v1.x) < aEpsilon && fabs(v2.y - v1.y) < aEpsilon && fabs(v2.z - v1.z) < aEpsilon);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Math utilities.
-//////////////////////////////////////////////////////////////////////////
-inline float PointToLineDistance2D(const Vec3& p1, const Vec3& p2, const Vec3& p3)
-{
-    float dx = p2.x - p1.x;
-    float dy = p2.y - p1.y;
-    if (dx + dy == 0)
-    {
-        return (float)sqrt((p3.x - p1.x) * (p3.x - p1.x) + (p3.y - p1.y) * (p3.y - p1.y));
-    }
-    float u = ((p3.x - p1.x) * dx + (p3.y - p1.y) * dy) / (dx * dx + dy * dy);
-    if (u < 0)
-    {
-        return (float)sqrt((p3.x - p1.x) * (p3.x - p1.x) + (p3.y - p1.y) * (p3.y - p1.y));
-    }
-    else if (u > 1)
-    {
-        return (float)sqrt((p3.x - p2.x) * (p3.x - p2.x) + (p3.y - p2.y) * (p3.y - p2.y));
-    }
-    else
-    {
-        float x = p1.x + u * dx;
-        float y = p1.y + u * dy;
-        return (float)sqrt((p3.x - x) * (p3.x - x) + (p3.y - y) * (p3.y - y));
-    }
-}
-
-inline float PointToLineDistance(const Vec3& p1, const Vec3& p2, const Vec3& p3)
-{
-    Vec3 d = p2 - p1;
-    float u = d.Dot(p3 - p1) / (d).GetLengthSquared();
-    if (u < 0)
-    {
-        return (p3 - p1).GetLength();
-    }
-    else if (u > 1)
-    {
-        return (p3 - p2).GetLength();
-    }
-    else
-    {
-        Vec3 p = p1 + u * d;
-        return (p3 - p).GetLength();
-    }
-}
-
-/** Calculate distance between point and line.
-    @param p1 Source line point.
-    @param p2 Target line point.
-    @param p3 Point to find intersecion with.
-    @param intersectPoint Intersection point on the line.
-    @return Distance between point and line.
-*/
-inline float PointToLineDistance(const Vec3& p1, const Vec3& p2, const Vec3& p3, Vec3& intersectPoint)
-{
-    Vec3 d = p2 - p1;
-    float fLength2 = d.GetLengthSquared();
-
-    if (fLength2 < 0.00001f)
-    {
-        // p1-p2 is degenerated to a point
-        intersectPoint = p1;
-        return (p3 - p1).GetLength();
-    }
-
-    float u = d.Dot(p3 - p1) / fLength2;
-    if (u < 0)
-    {
-        intersectPoint = p1;
-        return (p3 - p1).GetLength();
-    }
-    else if (u > 1)
-    {
-        intersectPoint = p2;
-        return (p3 - p2).GetLength();
-    }
-    else
-    {
-        Vec3 p = p1 + u * d;
-        intersectPoint = p;
-        return (p3 - p).GetLength();
-    }
-}
-
-/**
-    Function: LineLineIntersect( const Vec3 &p1, const Vec3 &p2, const Vec3 &p3, const Vec3 &p4, Vec3 &pa, Vec3 &pb, float &mua, float &mub )
-    paulbourke.net/
-    Copyright Paul Bourke or a third party contributor where indicated.  This source code may be freely used provided credits are given to the author.
-
-    Calculate the line segment PaPb that is the shortest route between
-    two lines P1P2 and P3P4. Calculate also the values of mua and mub where
-      Pa = P1 + mua (P2 - P1)
-      Pb = P3 + mub (P4 - P3)
-
-    @param p1 Source point of first line.
-    @param p2 Target point of first line.
-    @param p3 Source point of second line.
-    @param p4 Target point of second line.
-    @return FALSE if no solution exists.
-*/
-inline bool LineLineIntersect(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4,
-    Vec3& pa, Vec3& pb, float& mua, float& mub)
-{
-    Vec3 p13, p43, p21;
-    float d1343, d4321, d1321, d4343, d2121;
-    float numer, denom;
-
-    p13.x = p1.x - p3.x;
-    p13.y = p1.y - p3.y;
-    p13.z = p1.z - p3.z;
-    p43.x = p4.x - p3.x;
-    p43.y = p4.y - p3.y;
-    p43.z = p4.z - p3.z;
-    if (fabs(p43.x)  < LINE_EPS && fabs(p43.y)  < LINE_EPS && fabs(p43.z)  < LINE_EPS)
-    {
-        return false;
-    }
-    p21.x = p2.x - p1.x;
-    p21.y = p2.y - p1.y;
-    p21.z = p2.z - p1.z;
-    if (fabs(p21.x)  < LINE_EPS && fabs(p21.y)  < LINE_EPS && fabs(p21.z)  < LINE_EPS)
-    {
-        return false;
-    }
-
-    d1343 = p13.x * p43.x + p13.y * p43.y + p13.z * p43.z;
-    d4321 = p43.x * p21.x + p43.y * p21.y + p43.z * p21.z;
-    d1321 = p13.x * p21.x + p13.y * p21.y + p13.z * p21.z;
-    d4343 = p43.x * p43.x + p43.y * p43.y + p43.z * p43.z;
-    d2121 = p21.x * p21.x + p21.y * p21.y + p21.z * p21.z;
-
-    denom = d2121 * d4343 - d4321 * d4321;
-    if (fabs(denom) < LINE_EPS)
-    {
-        return false;
-    }
-    numer = d1343 * d4321 - d1321 * d4343;
-
-    mua = numer / denom;
-    mub = (d1343 + d4321 * (mua)) / d4343;
-
-    pa.x = p1.x + mua * p21.x;
-    pa.y = p1.y + mua * p21.y;
-    pa.z = p1.z + mua * p21.z;
-    pb.x = p3.x + mub * p43.x;
-    pb.y = p3.y + mub * p43.y;
-    pb.z = p3.z + mub * p43.z;
-
-    return true;
-}
-
-/*!
-        Calculates shortest distance between ray and a arbitary line segment.
-        @param raySrc Source point of ray.
-        @param rayTrg Target point of ray.
-        @param p1 First point of line segment.
-        @param p2 Second point of line segment.
-        @param intersectPoint This parameter returns nearest point on line segment to ray.
-        @return distance fro ray to line segment.
-*/
-inline float RayToLineDistance(const Vec3& raySrc, const Vec3& rayTrg, const Vec3& p1, const Vec3& p2, Vec3& nearestPoint)
-{
-    Vec3 intPnt;
-    Vec3 rayLineP1 = raySrc;
-    Vec3 rayLineP2 = rayTrg;
-    Vec3 pa, pb;
-    float ua, ub;
-
-    if (!LineLineIntersect(p1, p2, rayLineP1, rayLineP2, pa, pb, ua, ub))
-    {
-        return FLT_MAX;
-    }
-
-    float d = 0;
-    if (ua < 0)
-    {
-        d = PointToLineDistance(rayLineP1, rayLineP2, p1, intPnt);
-    }
-    else if (ua > 1)
-    {
-        d = PointToLineDistance(rayLineP1, rayLineP2, p2, intPnt);
-    }
-    else
-    {
-        intPnt = rayLineP1 + ub * (rayLineP2 - rayLineP1);
-        d = (pb - pa).GetLength();
-    }
-    nearestPoint = intPnt;
-    return d;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline Matrix34 MatrixFromVector(const Vec3& dir, const Vec3& up = Vec3(0, 0, 1.0f), float rollAngle = 0)
-{
-    // LookAt transform.
-    Vec3 xAxis, yAxis, zAxis;
-    Vec3 upVector = up;
-
-    if (dir.IsZero())
-    {
-        Matrix33 tm;
-        tm.SetIdentity();
-        return tm;
-    }
-
-    yAxis = dir.GetNormalized();
-
-    if (yAxis.x == 0 && yAxis.y == 0)
-    {
-        upVector.Set(-yAxis.z, 0, 0);
-    }
-
-    xAxis = upVector.Cross(yAxis).GetNormalized();
-    zAxis = xAxis.Cross(yAxis).GetNormalized();
-
-    Matrix33 tm;
-    tm.SetFromVectors(xAxis, yAxis, zAxis);
-
-    if (rollAngle != 0)
-    {
-        Matrix33 RollMtx;
-        RollMtx.SetRotationY(rollAngle);
-
-        // Matrix multiply.
-        tm = RollMtx * tm;
-    }
-
-    return tm;
-}
-
-//TODO: could we include this function in the core engine math Intersect namespace ?
-namespace Intersect
-{
-    //! handy function for Ray AABB intersection, the Ray object is created inside
-    inline uint8 Ray_AABB(const Vec3& rRayStart, const Vec3& rRayDir, const AABB& rBox, Vec3& rOutPt)
-    {
-        return Ray_AABB(Ray(rRayStart, rRayDir), rBox, rOutPt);
-    }
-
-    //! Check if ray intersect edge of bounding box.
-    //! @param epsilonDist if distance between ray and egde is less then this epsilon then edge was intersected.
-    //! @param dist Distance between ray and edge.
-    //! @param intPnt intersection point.
-    inline bool Ray_AABBEdge(const Vec3& raySrc, const Vec3& rayDir, const AABB& aabb, float epsilonDist, float& dist, Vec3& intPnt)
-    {
-        // Check 6 group lines.
-        Vec3 rayTrg = raySrc + rayDir * 10000.0f;
-        Vec3 pnt[12];
-
-        float d[12];
-
-        // Near
-        d[0] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.max.z), Vec3(aabb.max.x, aabb.min.y, aabb.max.z), pnt[0]);
-        d[1] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.max.y, aabb.max.z), Vec3(aabb.max.x, aabb.max.y, aabb.max.z), pnt[1]);
-        d[2] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.max.z), Vec3(aabb.min.x, aabb.max.y, aabb.max.z), pnt[2]);
-        d[3] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.max.x, aabb.min.y, aabb.max.z), Vec3(aabb.max.x, aabb.max.y, aabb.max.z), pnt[3]);
-
-        // Far
-        d[4] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.min.z), Vec3(aabb.max.x, aabb.min.y, aabb.min.z), pnt[4]);
-        d[5] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.max.y, aabb.min.z), Vec3(aabb.max.x, aabb.max.y, aabb.min.z), pnt[5]);
-        d[6] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.min.z), Vec3(aabb.min.x, aabb.max.y, aabb.min.z), pnt[6]);
-        d[7] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.max.x, aabb.min.y, aabb.min.z), Vec3(aabb.max.x, aabb.max.y, aabb.min.z), pnt[7]);
-
-        // Sides.
-        d[8] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.min.y, aabb.min.z), Vec3(aabb.min.x, aabb.min.y, aabb.max.z), pnt[8]);
-        d[9] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.max.x, aabb.min.y, aabb.min.z), Vec3(aabb.max.x, aabb.min.y, aabb.max.z), pnt[9]);
-        d[10] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.min.x, aabb.max.y, aabb.min.z), Vec3(aabb.min.x, aabb.max.y, aabb.max.z), pnt[10]);
-        d[11] = RayToLineDistance(raySrc, rayTrg, Vec3(aabb.max.x, aabb.max.y, aabb.min.z), Vec3(aabb.max.x, aabb.max.y, aabb.max.z), pnt[11]);
-
-        dist = FLT_MAX;
-        for (int i = 0; i < 12; i++)
-        {
-            if (d[i] < dist)
-            {
-                dist = d[i];
-                intPnt = pnt[i];
-            }
-        }
-        if (dist < epsilonDist)
-        {
-            return true;
-        }
-        return false;
-    }
-};
-
-inline int gcd(int a, int b)
-{
-    int c = a % b;
-    while (c != 0)
-    {
-        a = b;
-        b = c;
-        c = a % b;
-    }
-    return b;
-}
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_MATH_H
diff --git a/Code/Sandbox/Editor/Util/MemoryBlock.cpp b/Code/Sandbox/Editor/Util/MemoryBlock.cpp
deleted file mode 100644
index 6fe579a717..0000000000
--- a/Code/Sandbox/Editor/Util/MemoryBlock.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "MemoryBlock.h"
-#include "Include/ILogFile.h"
-#include <zlib.h>
-
-#include <QMessageBox>
-#include <QApplication>
-
-//////////////////////////////////////////////////////////////////////////
-CMemoryBlock::CMemoryBlock()
-    : m_buffer(0)
-    , m_size(0)
-    , m_uncompressedSize(0)
-    , m_owns(false)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMemoryBlock::CMemoryBlock(const CMemoryBlock& mem)
-{
-    *this = mem;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMemoryBlock::~CMemoryBlock()
-{
-    Free();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMemoryBlock& CMemoryBlock::operator=(const CMemoryBlock& mem)
-{
-    if (mem.GetSize() > 0)
-    {
-        // Do not reallocate.
-        if (mem.GetSize() > GetSize())
-        {
-            if (!Allocate(mem.GetSize()))
-            {
-                return *this;
-            }
-        }
-        Copy(mem.GetBuffer(), mem.GetSize());
-    }
-    else
-    {
-        m_buffer = 0;
-        m_size = 0;
-        m_owns = false;
-    }
-    m_uncompressedSize = mem.m_uncompressedSize;
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CMemoryBlock::Allocate(int size, int uncompressedSize)
-{
-    assert(size > 0);
-    if (m_buffer)
-    {
-        m_buffer = realloc(m_buffer, size);
-    }
-    else
-    {
-        m_buffer = malloc(size);
-    }
-    if (!m_buffer)
-    {
-        QString str;
-        str = QStringLiteral("CMemoryBlock::Allocate failed to allocate %1Mb of Memory").arg(size / (1024 * 1024));
-        CryLogAlways(str.toUtf8().data());
-
-        QMessageBox::critical(QApplication::activeWindow(), QString(), str + QString("\r\nSandbox will try to reduce its working memory set to free memory for this allocation."));
-        GetIEditor()->ReduceMemory();
-        if (m_buffer)
-        {
-            m_buffer = realloc(m_buffer, size);
-        }
-        else
-        {
-            m_buffer = malloc(size);
-        }
-        if (!m_buffer)
-        {
-            GetIEditor()->GetLogFile()->Warning("Reducing working memory set failed, Sandbox must quit");
-        }
-        else
-        {
-            GetIEditor()->GetLogFile()->Warning("Reducing working memory set succeeded\r\nSandbox may become unstable, it is advised to save the level and restart editor.");
-        }
-    }
-
-    m_owns = true;
-    m_size = size;
-    m_uncompressedSize = uncompressedSize;
-    // Check if allocation failed.
-    if (m_buffer == 0)
-    {
-        return false;
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMemoryBlock::Free()
-{
-    if (m_buffer && m_owns)
-    {
-        free(m_buffer);
-    }
-    m_buffer = 0;
-    m_owns = false;
-    m_size = 0;
-    m_uncompressedSize = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMemoryBlock::Copy(void* src, int size)
-{
-    assert(size <= m_size);
-    memcpy(m_buffer, src, size);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMemoryBlock::Attach(void* buffer, int size, int uncompressedSize)
-{
-    Free();
-    m_owns = false;
-    m_buffer = buffer;
-    m_size = size;
-    m_uncompressedSize = uncompressedSize;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMemoryBlock::Detach()
-{
-    Free();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMemoryBlock::Compress(CMemoryBlock& toBlock) const
-{
-    // Cannot compress to itself.
-    assert(this != &toBlock);
-    unsigned long destSize = m_size * 2 + 128;
-    CMemoryBlock temp;
-    temp.Allocate(destSize);
-
-    compress((unsigned char*)temp.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), m_size);
-
-    toBlock.Allocate(destSize);
-    toBlock.Copy(temp.GetBuffer(), destSize);
-    toBlock.m_uncompressedSize = GetSize();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMemoryBlock::Uncompress(CMemoryBlock& toBlock) const
-{
-    assert(this != &toBlock);
-    toBlock.Allocate(m_uncompressedSize);
-    toBlock.m_uncompressedSize = 0;
-    unsigned long destSize = m_uncompressedSize;
-#if !defined(NDEBUG)
-    int result =
-#endif
-        uncompress((unsigned char*)toBlock.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), GetSize());
-    assert(result == Z_OK);
-    assert(destSize == m_uncompressedSize);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CMemoryBlock::Serialize(CArchive& ar)
-{
-    if (ar.IsLoading())
-    {
-        int size;
-        // Loading.
-        ar >> size;
-        if (size != m_size)
-        {
-            Allocate(size);
-        }
-        m_size = size;
-        ar >> m_uncompressedSize;
-        ar.Read(m_buffer, m_size);
-    }
-    else
-    {
-        // Saving.
-        ar << m_size;
-        ar << m_uncompressedSize;
-        ar.Write(m_buffer, m_size);
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/MemoryBlock.h b/Code/Sandbox/Editor/Util/MemoryBlock.h
deleted file mode 100644
index da7b076114..0000000000
--- a/Code/Sandbox/Editor/Util/MemoryBlock.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Memory block helper used with ZLib
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_MEMORYBLOCK_H
-#define CRYINCLUDE_EDITOR_UTIL_MEMORYBLOCK_H
-#pragma once
-#include "RefCountBase.h"
-
-#include "Include/EditorCoreAPI.h"
-struct IEditor;
-class CArchive;
-
-class EDITOR_CORE_API CMemoryBlock
-    : public CRefCountBase
-{
-public:
-    CMemoryBlock();
-    CMemoryBlock(const CMemoryBlock& mem);
-    ~CMemoryBlock();
-
-    CMemoryBlock& operator=(const CMemoryBlock& mem);
-
-    //! Allocate or reallocate memory for this block.
-    //! @param size Amount of memory in bytes to allocate.
-    //! @return true if the allocation succeeded.
-    bool Allocate(int size, int uncompressedSize = 0);
-
-    //! Frees memory allocated in this block (if owned).
-    //! Just clears internal references (if unowned).
-    void Free();
-
-    //! Attach memory buffer to this block.
-    //! Ownership is not transferred; this buffer will not be deleted by CMemoryBlock
-    void Attach(void* buffer, int size, int uncompressedSize = 0);
-
-    //! Detach memory buffer that was previously attached.
-    //! Note: Implemented as Free()
-    void Detach();
-
-    //! Returns amount of allocated memory in this block.
-    int GetSize() const { return m_size; }
-
-    //! Returns amount of allocated memory in this block.
-    int GetUncompressedSize() const { return m_uncompressedSize; }
-
-    void* GetBuffer() const { return m_buffer; };
-
-    //! Copy memory range to memory block.
-    void Copy(void* src, int size);
-
-    //! Compress this memory block to specified memory block.
-    //! @param toBlock target memory block where compressed result will be stored.
-    void Compress(CMemoryBlock& toBlock) const;
-
-    //! Uncompress this memory block to specified memory block.
-    //! @param toBlock target memory block where compressed result will be stored.
-    void Uncompress(CMemoryBlock& toBlock) const;
-
-    //! Serialize memory block to archive.
-    void Serialize(CArchive& ar);
-
-    //! Is MemoryBlock is empty.
-    bool IsEmpty() const { return m_buffer == 0; }
-
-private:
-    void* m_buffer;
-    int m_size;
-    //! If not 0, memory block is compressed.
-    int m_uncompressedSize;
-    //! True if memory block owns its memory.
-    bool m_owns;
-};
-#endif // CRYINCLUDE_EDITOR_UTIL_MEMORYBLOCK_H
diff --git a/Code/Sandbox/Editor/Util/ModalWindowDismisser.cpp b/Code/Sandbox/Editor/Util/ModalWindowDismisser.cpp
deleted file mode 100644
index f6325903c6..0000000000
--- a/Code/Sandbox/Editor/Util/ModalWindowDismisser.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-// Description : Utility for dismissing every modal windows
-
-#include "EditorDefs.h"
-
-#include "ModalWindowDismisser.h"
-
-// Qt
-#include <QDialog>
-#include <QTimer>
-
-ModalWindowDismisser::ModalWindowDismisser()
-{
-    qApp->installEventFilter(this);
-}
-
-ModalWindowDismisser::~ModalWindowDismisser()
-{
-    if (qApp)
-    {
-        qApp->removeEventFilter(this);
-    }
-}
-
-void ModalWindowDismisser::DismissWindows()
-{
-    for (QDialog* dialog : m_windows)
-    {
-        dialog->close();
-    }
-    m_windows.clear();
-    m_dissmiss = false;
-}
-
-bool ModalWindowDismisser::eventFilter(QObject* object, QEvent* event)
-{
-    if (QDialog* dialog = qobject_cast<QDialog*>(object))
-    {
-        if (dialog->isModal())
-        {
-            if (event->type() == QEvent::Show)
-            {
-                auto it = AZStd::find(m_windows.begin(), m_windows.end(), dialog);
-                if (it == m_windows.end())
-                {
-                    m_windows.push_back(dialog);
-                }
-                if (!m_dissmiss)
-                {
-                    // Closing the window at the same moment is opened leads to crashes and is unstable,
-                    // so do it after a long 1 ms
-                    QTimer::singleShot(1, this, &ModalWindowDismisser::DismissWindows);
-                    m_dissmiss = true;
-                }
-            }
-            else if (event->type() == QEvent::Close)
-            {
-                auto it = AZStd::find(m_windows.begin(), m_windows.end(), dialog);
-                if (it != m_windows.end())
-                {
-                    m_windows.erase(it);
-                }
-            }
-        }
-    }
-    return false;
-}
diff --git a/Code/Sandbox/Editor/Util/ModalWindowDismisser.h b/Code/Sandbox/Editor/Util/ModalWindowDismisser.h
deleted file mode 100644
index d825dab597..0000000000
--- a/Code/Sandbox/Editor/Util/ModalWindowDismisser.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-// Description : Utility for dismissing every modal windows
-#pragma once
-
-#include <QObject>
-
-class QDialog;
-
-class ModalWindowDismisser
-    : public QObject
-{
-public:
-    ModalWindowDismisser();
-    ~ModalWindowDismisser();
-
-private:
-    void DismissWindows();
-    bool eventFilter(QObject* object, QEvent* event) override;
-
-    std::vector<QDialog*> m_windows;
-    bool m_dissmiss = false;
-};
diff --git a/Code/Sandbox/Editor/Util/NamedData.cpp b/Code/Sandbox/Editor/Util/NamedData.cpp
deleted file mode 100644
index 44f7f5342b..0000000000
--- a/Code/Sandbox/Editor/Util/NamedData.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Collection of Named data blocks.
-
-
-#include "EditorDefs.h"
-
-#include "NamedData.h"
-
-// Editor
-#include "Util/CryMemFile.h"    // for CryMemFile
-#include "Util/PakFile.h"       // for CPakFile
-
-
-//////////////////////////////////////////////////////////////////////////
-CNamedData::CNamedData()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CNamedData::~CNamedData()
-{
-    Clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CNamedData::AddDataBlock(const QString& blockName, void*   pData, int nSize, bool bCompress)
-{
-    assert(pData);
-    assert(nSize > 0);
-
-    DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
-    if (pBlock)
-    {
-        delete pBlock;
-    }
-
-    pBlock = new DataBlock();
-
-    pBlock->bFastCompression = !bCompress;
-
-    bCompress = false;
-
-    if (bCompress)
-    {
-        pBlock->bCompressed = true;
-        CMemoryBlock temp;
-        temp.Attach(pData, nSize);
-        temp.Compress(pBlock->compressedData);
-    }
-    else
-    {
-        pBlock->bCompressed = false;
-        pBlock->data.Allocate(nSize);
-        pBlock->data.Copy(pData, nSize);
-    }
-    m_blocks[blockName] = pBlock;
-}
-
-void CNamedData::AddDataBlock(const QString& blockName, CMemoryBlock& mem)
-{
-    DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
-    if (pBlock)
-    {
-        delete pBlock;
-    }
-    pBlock = new DataBlock();
-
-    pBlock->bFastCompression = false;
-
-    if (mem.GetUncompressedSize() != 0)
-    {
-        // This is compressed block.
-        pBlock->bCompressed = true;
-        pBlock->compressedData = mem;
-    }
-    else
-    {
-        pBlock->bCompressed = false;
-        pBlock->data = mem;
-    }
-    m_blocks[blockName] = pBlock;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CNamedData::Clear()
-{
-    for (TBlocks::iterator it = m_blocks.begin(); it != m_blocks.end(); ++it)
-    {
-        delete it->second;
-    }
-    m_blocks.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CNamedData::GetDataBlock(const QString& blockName, void*& pData, int& nSize)
-{
-    pData = 0;
-    nSize = 0;
-
-    bool bUncompressed = false;
-    CMemoryBlock* mem = GetDataBlock(blockName, bUncompressed);
-    if (mem)
-    {
-        pData = mem->GetBuffer();
-        nSize = mem->GetSize();
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CMemoryBlock* CNamedData::GetDataBlock(const QString& blockName, bool& bCompressed)
-{
-    DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
-    if (!pBlock)
-    {
-        return 0;
-    }
-
-    if (bCompressed)
-    {
-        // Return compressed data.
-        if (!pBlock->compressedData.IsEmpty())
-        {
-            return &pBlock->compressedData;
-        }
-    }
-    else
-    {
-        // Return normal data.
-        if (!pBlock->data.IsEmpty())
-        {
-            return &pBlock->data;
-        }
-        else
-        {
-            // Uncompress compressed block.
-            if (!pBlock->compressedData.IsEmpty())
-            {
-                pBlock->compressedData.Uncompress(pBlock->data);
-                return &pBlock->data;
-            }
-        }
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CNamedData::Serialize(CArchive& ar)
-{
-    if (ar.IsStoring())
-    {
-        int iSize = m_blocks.size();
-        ar << iSize;
-
-        for (TBlocks::iterator it = m_blocks.begin(); it != m_blocks.end(); it++)
-        {
-            QString key = it->first;
-            DataBlock* pBlock = it->second;
-
-            unsigned int nOriginalSize;
-            unsigned int nSizeFlags;
-            unsigned int flags = 0;
-
-            if (pBlock->bCompressed)
-            {
-                nOriginalSize = pBlock->compressedData.GetUncompressedSize();
-                // Compressed data.
-                unsigned long destSize = pBlock->compressedData.GetSize();
-                void* dest = pBlock->compressedData.GetBuffer();
-                nSizeFlags = destSize | (1 << 31);
-
-                ar << key;
-                ar << nSizeFlags; // Current size of data + 1 bit for compressed flag.
-                ar << nOriginalSize;    // Size of uncompressed data.
-                ar << flags;    // Some additional flags.
-                ar.Write(dest, destSize);
-            }
-            else
-            {
-                nOriginalSize = pBlock->data.GetSize();
-                void* dest = pBlock->data.GetBuffer();
-
-                nSizeFlags = nOriginalSize;
-                ar << key;
-                ar << nSizeFlags;
-                ar << nOriginalSize;    // Size of uncompressed data.
-                ar << flags;    // Some additional flags.
-                ar.Write(dest, nOriginalSize);
-            }
-        }
-    }
-    else
-    {
-        Clear();
-
-        int iSize;
-        ar >> iSize;
-
-        for (int i = 0; i < iSize && ar.status() == QDataStream::Ok; i++)
-        {
-            QString key;
-            unsigned int nSizeFlags = 0;
-            unsigned int nSize = 0;
-            unsigned int nOriginalSize = 0;
-            unsigned int flags = 0;
-            bool bCompressed = false;
-
-            DataBlock* pBlock = new DataBlock();
-
-            ar >> key;
-            ar >> nSizeFlags;
-            ar >> nOriginalSize;
-            ar >> flags;
-
-            nSize = nSizeFlags & (~(1 << 31));
-            bCompressed = (nSizeFlags & (1 << 31)) != 0;
-
-            if (nSize)
-            {
-                if (bCompressed)
-                {
-                    pBlock->compressedData.Allocate(nSize, nOriginalSize);
-                    void* pSrcData = pBlock->compressedData.GetBuffer();
-                    // Read compressed data.
-                    ar.Read(pSrcData, nSize);
-                }
-                else
-                {
-                    pBlock->data.Allocate(nSize);
-                    void* pSrcData = pBlock->data.GetBuffer();
-
-                    // Read uncompressed data.
-                    ar.Read(pSrcData, nSize);
-                }
-            }
-            m_blocks[key] = pBlock;
-        }
-    }
-
-    return ar.status() == QDataStream::Ok;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CNamedData::Save(CPakFile& pakFile)
-{
-    for (TBlocks::iterator it = m_blocks.begin(); it != m_blocks.end(); it++)
-    {
-        QString key = it->first;
-        DataBlock* pBlock = it->second;
-        if (!pBlock->bCompressed)
-        {
-            QString filename = key + ".editor_data";
-            pakFile.UpdateFile(filename.toUtf8().data(), pBlock->data, true, pBlock->bFastCompression ? AZ::IO::INestedArchive::LEVEL_FASTEST : AZ::IO::INestedArchive::LEVEL_BETTER);
-        }
-        else
-        {
-            int nOriginalSize = pBlock->compressedData.GetUncompressedSize();
-            CCryMemFile memFile;
-            // Write uncompressed data size.
-            memFile.Write(&nOriginalSize, sizeof(nOriginalSize));
-            // Write compressed data.
-            memFile.Write(pBlock->compressedData.GetBuffer(), pBlock->compressedData.GetSize());
-            pakFile.UpdateFile((key + ".editor_datac").toUtf8().data(), memFile, false);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CNamedData::Load(const QString& levelPath, [[maybe_unused]] CPakFile& pakFile)
-{
-    int i;
-    IFileUtil::FileArray files;
-    CFileUtil::ScanDirectory(levelPath, "*.editor_data", files, false);
-    for (i = 0; i < files.size(); i++)
-    {
-        QString filename = files[i].filename;
-        CCryFile cfile;
-        if (cfile.Open(Path::Make(levelPath, filename).toUtf8().data(), "rb"))
-        {
-            int fileSize = cfile.GetLength();
-            if (fileSize > 0)
-            {
-                QString key = Path::GetFileName(filename);
-                // Read data block.
-                DataBlock* pBlock = new DataBlock();
-                pBlock->data.Allocate(fileSize);
-                cfile.ReadRaw(pBlock->data.GetBuffer(), fileSize);
-                m_blocks[key] = pBlock;
-            }
-        }
-    }
-    files.clear();
-    // Scan compressed data.
-    CFileUtil::ScanDirectory(levelPath, "*.editor_datac", files, false);
-    for (i = 0; i < files.size(); i++)
-    {
-        QString filename = files[i].filename;
-        CCryFile cfile;
-        if (cfile.Open(Path::Make(levelPath, filename).toUtf8().data(), "rb"))
-        {
-            int fileSize = cfile.GetLength();
-            if (fileSize > 0)
-            {
-                // Read uncompressed data size.
-                int nOriginalSize = 0;
-                cfile.ReadType(&nOriginalSize);
-                // Read uncompressed data.
-                int nDataSize = fileSize - sizeof(nOriginalSize);
-
-                QString key = Path::GetFileName(filename);
-                // Read data block.
-                DataBlock* pBlock = new DataBlock();
-                pBlock->compressedData.Allocate(nDataSize, nOriginalSize);
-                cfile.ReadRaw(pBlock->compressedData.GetBuffer(), nDataSize);
-                m_blocks[key] = pBlock;
-            }
-        }
-    }
-
-    return true;
-}
-
-void CNamedData::SaveToFiles(const QString& rootPath)
-{
-    for (TBlocks::iterator it = m_blocks.begin(); it != m_blocks.end(); it++)
-    {
-        QString key = it->first;
-        DataBlock* pBlock = it->second;
-        QString filename = rootPath + key;
-
-        if (pBlock->bCompressed)
-        {
-            filename += ".editor_datac";
-
-            CCryFile file(filename.toUtf8().data(), "wb");
-
-            int nOriginalSize = pBlock->compressedData.GetUncompressedSize();
-            file.Write(&nOriginalSize, sizeof(nOriginalSize));
-            file.Write(pBlock->compressedData.GetBuffer(), pBlock->compressedData.GetSize());
-        }
-        else
-        {
-            filename += ".editor_data";
-            CCryFile file(filename.toUtf8().data(), "wb");
-            file.Write(pBlock->data.GetBuffer(), pBlock->data.GetSize());
-        }
-    }
-}
-
-void CNamedData::LoadFromFiles(const QString& rootPath)
-{
-    // TODO: Unify code paths in a nicer way!
-    CPakFile dummyPak;
-    Load(rootPath, dummyPak);
-}
-
-CNamedData::DataBlock::DataBlock()
-{
-}
diff --git a/Code/Sandbox/Editor/Util/NamedData.h b/Code/Sandbox/Editor/Util/NamedData.h
deleted file mode 100644
index c4c08d3bbf..0000000000
--- a/Code/Sandbox/Editor/Util/NamedData.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Collection of Named data blocks
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_NAMEDDATA_H
-#define CRYINCLUDE_EDITOR_UTIL_NAMEDDATA_H
-#pragma once
-#include "MemoryBlock.h"
-#include "QtUtil.h"
-
-class CPakFile;
-
-class CNamedData
-{
-public:
-    CNamedData();
-    virtual ~CNamedData();
-    void AddDataBlock(const QString& blockName, void*   pData, int nSize, bool bCompress = true);
-    void AddDataBlock(const QString& blockName, CMemoryBlock& block);
-    //! Returns uncompressed block data.
-    bool GetDataBlock(const QString& blockName, void*& pData, int& nSize);
-    //! Returns raw data block in original form (Compressed or Uncompressed).
-    CMemoryBlock* GetDataBlock(const QString& blockName, bool& bCompressed);
-
-    void Clear();
-
-public:
-    virtual bool Serialize(CArchive& ar);
-
-    //! Save named data to pak file.
-    void Save(CPakFile& pakFile);
-    //! Load named data from pak file.
-    bool Load(const QString& levelPath, CPakFile& pakFile);
-
-    void SaveToFiles(const QString& rootPath);
-    void LoadFromFiles(const QString& rootPath);
-
-private:
-    struct DataBlock
-    {
-        DataBlock();
-        QString blockName;
-        CMemoryBlock data;
-        CMemoryBlock compressedData;
-        //! This block is compressed.
-        bool bCompressed;
-        bool bFastCompression;
-    };
-    typedef std::map<QString, DataBlock*, stl::less_stricmp<QString> > TBlocks;
-    TBlocks m_blocks;
-};
-#endif // CRYINCLUDE_EDITOR_UTIL_NAMEDDATA_H
diff --git a/Code/Sandbox/Editor/Util/Observable.h b/Code/Sandbox/Editor/Util/Observable.h
deleted file mode 100644
index 8e0b561033..0000000000
--- a/Code/Sandbox/Editor/Util/Observable.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : This file declares templates to be used when a class can
-//               have a list of observers to feed
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_OBSERVABLE_H
-#define CRYINCLUDE_EDITOR_UTIL_OBSERVABLE_H
-#pragma once
-
-#include <vector>
-
-//! Observable template class, holds a list of observers which can be called at once using the helper defines
-template<class T>
-class CObservable
-{
-public:
-    // Description:
-    //      Register a new observer for the class, will check if not already added
-    // Return:
-    //      true - if the observer was successfully added to the list
-    //      false - if the observer is already in the list
-    bool RegisterObserver(T* pObserver)
-    {
-        if (m_observers.end() != std::find(m_observers.begin(), m_observers.end(), pObserver))
-        {
-            return false;
-        }
-
-        m_observers.push_back(pObserver);
-
-        return true;
-    }
-
-    // Description:
-    //      Unregister an observer from the list
-    // Return:
-    //      true - if the observer was successfuly removed
-    //      false - if the observer is not in the list
-    bool UnregisterObserver(T* pObserver)
-    {
-        typename std::vector<T*>::iterator iter;
-
-        if (m_observers.end() == (iter = std::find(m_observers.begin(), m_observers.end(), pObserver)))
-        {
-            return false;
-        }
-
-        m_observers.erase(iter);
-
-        return true;
-    }
-
-    // Description:
-    //      Uregister all the observers
-    void UnregisterAllObservers()
-    {
-        m_observers.clear();
-    }
-
-protected:
-    std::vector<T*> m_observers;
-};
-
-//
-// Helper defines to ease the process of calling the methods of all observers in the list
-//
-
-// Description:
-//      Call the method of the observers, this must be used inside the subject class
-// Example: CALL_OBSERVERS_METHOD(OnStuffHappened(120, "NO!"))
-#define CALL_OBSERVERS_METHOD(methodCall)                                                                                \
-    { for (size_t iObs = 0, iObsCount = m_observers.size(); iObs < iObsCount; ++iObs) { m_observers[iObs]->methodCall; } \
-    }
-
-// Description:
-//      Call the method of the observers, this can be used outside the subject class
-// Example: CALL_OBSERVERS_METHOD_OF(pSomeObservableSubject, OnStuffHappened(120, "NO!"))
-#define CALL_OBSERVERS_METHOD_OF(pObservable, methodCall)                                                                                          \
-    { for (size_t iObs = 0, iObsCount = pObservable->m_observers.size(); iObs < iObsCount; ++iObs) { pObservable->m_observers[iObs]->methodCall; } \
-    }
-
-// Description:
-//      Call the method of the observers, this can be called using a custom vector of observers
-// Example: CALL_SPECIFIED_OBSERVERS_LIST_METHOD(vMyPreciousSpecialObservers, OnStuffHappened(120, "NO!"))
-#define CALL_SPECIFIED_OBSERVERS_LIST_METHOD(vObservers, methodCall)                                                   \
-    { for (size_t iObs = 0, iObsCount = vObservers.size(); iObs < iObsCount; ++iObs) { vObservers[iObs]->methodCall; } \
-    }
-
-// Description:
-//      Implement the observable methods when the user class is inheriting from a virtual interface using the observable methods
-#define IMPLEMENT_OBSERVABLE_METHODS(observerClassName)                                                                                       \
-    virtual bool RegisterObserver(observerClassName * pObserver) { return CObservable<observerClassName>::RegisterObserver(pObserver); };     \
-    virtual bool UnregisterObserver(observerClassName * pObserver) { return CObservable<observerClassName>::UnregisterObserver(pObserver); }; \
-    virtual void UnregisterAllObservers() { CObservable<observerClassName>::UnregisterAllObservers(); };
-#endif // CRYINCLUDE_EDITOR_UTIL_OBSERVABLE_H
diff --git a/Code/Sandbox/Editor/Util/PakFile.cpp b/Code/Sandbox/Editor/Util/PakFile.cpp
deleted file mode 100644
index 073b4c710e..0000000000
--- a/Code/Sandbox/Editor/Util/PakFile.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "PakFile.h"
-
-// AzFramework
-#include <AzFramework/Archive/INestedArchive.h>
-#include <AzFramework/Archive/IArchive.h>
-
-// Editor
-#include "Util/CryMemFile.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-CPakFile::CPakFile()
-    : m_pArchive(NULL)
-    , m_pCryPak(NULL)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CPakFile::CPakFile(AZ::IO::IArchive* pCryPak)
-    : m_pArchive(NULL)
-    , m_pCryPak(pCryPak)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-CPakFile::~CPakFile()
-{
-    Close();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CPakFile::CPakFile(const char* filename)
-{
-    m_pArchive = NULL;
-    Open(filename);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CPakFile::Close()
-{
-    m_pArchive = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CPakFile::Open(const char* filename, bool bAbsolutePath)
-{
-    if (m_pArchive)
-    {
-        Close();
-    }
-
-    auto pCryPak = m_pCryPak ? m_pCryPak : GetIEditor()->GetSystem()->GetIPak();
-    if (pCryPak == NULL)
-    {
-        return false;
-    }
-
-    if (bAbsolutePath)
-    {
-        m_pArchive = pCryPak->OpenArchive(filename, nullptr, AZ::IO::INestedArchive::FLAGS_ABSOLUTE_PATHS);
-    }
-    else
-    {
-        m_pArchive = pCryPak->OpenArchive(filename);
-    }
-    if (m_pArchive)
-    {
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CPakFile::OpenForRead(const char* filename)
-{
-    if (m_pArchive)
-    {
-        Close();
-    }
-    auto pCryPak = m_pCryPak ? m_pCryPak : GetIEditor()->GetSystem()->GetIPak();
-    if (pCryPak == NULL)
-    {
-        return false;
-    }
-    m_pArchive = pCryPak->OpenArchive(filename, nullptr, AZ::IO::INestedArchive::FLAGS_OPTIMIZED_READ_ONLY | AZ::IO::INestedArchive::FLAGS_ABSOLUTE_PATHS);
-    if (m_pArchive)
-    {
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CPakFile::UpdateFile(const char* filename, CCryMemFile& file, bool bCompress)
-{
-    if (m_pArchive)
-    {
-        int nSize = file.GetLength();
-
-        UpdateFile(filename, file.GetMemPtr(), nSize, bCompress);
-        file.Close();
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CPakFile::UpdateFile(const char* filename, CMemoryBlock& mem, bool bCompress, int nCompressLevel)
-{
-    if (m_pArchive)
-    {
-        return UpdateFile(filename, mem.GetBuffer(), mem.GetSize(), bCompress, nCompressLevel);
-    }
-    return false;
-}
-
-/////////////////////////////////////////////////////////////////////////
-bool CPakFile::UpdateFile(const char* filename, void* pBuffer, int nSize, bool bCompress, int nCompressLevel)
-{
-    if (m_pArchive)
-    {
-        if (bCompress)
-        {
-            return 0 == m_pArchive->UpdateFile(filename, pBuffer, nSize, AZ::IO::INestedArchive::METHOD_DEFLATE, nCompressLevel);
-        }
-        else
-        {
-            return 0 == m_pArchive->UpdateFile(filename, pBuffer, nSize);
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CPakFile::RemoveFile(const char* filename)
-{
-    if (m_pArchive)
-    {
-        return m_pArchive->RemoveFile(filename);
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CPakFile::RemoveDir(const char* directory)
-{
-    if (m_pArchive)
-    {
-        return m_pArchive->RemoveDir(directory);
-    }
-    return false;
-}
diff --git a/Code/Sandbox/Editor/Util/PakFile.h b/Code/Sandbox/Editor/Util/PakFile.h
deleted file mode 100644
index 60dd2752bc..0000000000
--- a/Code/Sandbox/Editor/Util/PakFile.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_PAKFILE_H
-#define CRYINCLUDE_EDITOR_UTIL_PAKFILE_H
-#pragma once
-
-
-#include <AzFramework/Archive/INestedArchive.h>
-
-class CCryMemFile;
-
-// forward references.
-namespace AZ::IO
-{
-    struct IArchive;
-}
-/*! CPakFile Wraps game implementation of INestedArchive.
-        Used for storing multiple files into zip archive file.
-*/
-class SANDBOX_API CPakFile
-{
-public:
-    CPakFile();
-    CPakFile(AZ::IO::IArchive* pCryPak);
-    ~CPakFile();
-    //! Opens archive for writing.
-    explicit CPakFile(const char* filename);
-    //! Opens archive for writing.
-    bool Open(const char* filename, bool bAbsolutePath = true);
-    //! Opens archive for reading only.
-    bool OpenForRead(const char* filename);
-
-    void Close();
-    //! Adds or update file in archive.
-    bool UpdateFile(const char* filename, CCryMemFile& file, bool bCompress = true);
-    //! Adds or update file in archive.
-    bool UpdateFile(const char* filename, CMemoryBlock& mem, bool bCompress = true, int nCompressLevel = AZ::IO::INestedArchive::LEVEL_BETTER);
-    //! Adds or update file in archive.
-    bool UpdateFile(const char* filename, void* pBuffer, int nSize, bool bCompress = true, int nCompressLevel = AZ::IO::INestedArchive::LEVEL_BETTER);
-    //! Remove file from archive.
-    bool RemoveFile(const char* filename);
-    //! Remove dir from archive.
-    bool RemoveDir(const char* directory);
-
-    //! Return archive of this pak file wrapper.
-    AZ::IO::INestedArchive* GetArchive() { return m_pArchive.get(); };
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    AZStd::intrusive_ptr<AZ::IO::INestedArchive> m_pArchive;
-    AZ::IO::IArchive* m_pCryPak;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_PAKFILE_H
diff --git a/Code/Sandbox/Editor/Util/PathUtil.cpp b/Code/Sandbox/Editor/Util/PathUtil.cpp
deleted file mode 100644
index 6d7be423ea..0000000000
--- a/Code/Sandbox/Editor/Util/PathUtil.cpp
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "PathUtil.h"
-
-#include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h> // for ebus events
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/API/ApplicationAPI.h>
-
-#include <QRegularExpression>
-
-namespace
-{
-    string g_currentModName; // folder name only!
-}
-
-namespace Path
-{
-    //////////////////////////////////////////////////////////////////////////
-    void SplitPath(const QString& rstrFullPathFilename, QString& rstrDriveLetter, QString& rstrDirectory, QString& rstrFilename, QString& rstrExtension)
-    {
-        string          strFullPathString(rstrFullPathFilename.toUtf8().data());
-        string          strDriveLetter;
-        string          strDirectory;
-        string          strFilename;
-        string          strExtension;
-
-        char*           szPath((char*)strFullPathString.c_str());
-        char*           pchLastPosition(szPath);
-        char*           pchCurrentPosition(szPath);
-        char*           pchAuxPosition(szPath);
-
-        // Directory named filenames containing ":" are invalid, so we can assume if there is a :
-        // it will be the drive name.
-        pchCurrentPosition = strchr(pchLastPosition, ':');
-        if (pchCurrentPosition == NULL)
-        {
-            rstrDriveLetter = "";
-        }
-        else
-        {
-            strDriveLetter.assign(pchLastPosition, pchCurrentPosition + 1);
-            pchLastPosition = pchCurrentPosition + 1;
-        }
-
-        pchCurrentPosition = strrchr(pchLastPosition, '\\');
-        pchAuxPosition = strrchr(pchLastPosition, '/');
-        if ((pchCurrentPosition == NULL) && (pchAuxPosition == NULL))
-        {
-            rstrDirectory = "";
-        }
-        else
-        {
-            // Since NULL is < valid pointer, so this will work.
-            if (pchAuxPosition > pchCurrentPosition)
-            {
-                pchCurrentPosition = pchAuxPosition;
-            }
-            strDirectory.assign(pchLastPosition, pchCurrentPosition + 1);
-            pchLastPosition = pchCurrentPosition + 1;
-        }
-
-        pchCurrentPosition = strrchr(pchLastPosition, '.');
-        if (pchCurrentPosition == NULL)
-        {
-            rstrExtension = "";
-            strFilename.assign(pchLastPosition);
-        }
-        else
-        {
-            strExtension.assign(pchCurrentPosition);
-            strFilename.assign(pchLastPosition, pchCurrentPosition);
-        }
-
-        rstrDriveLetter = strDriveLetter;
-        rstrDirectory = strDirectory;
-        rstrFilename = strFilename;
-        rstrExtension = strExtension;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void GetDirectoryQueue(const QString& rstrSourceDirectory, QStringList& rcstrDirectoryTree)
-    {
-        string                      strCurrentDirectoryName;
-        string                      strSourceDirectory(rstrSourceDirectory.toUtf8().data());
-        const char*             szSourceDirectory(strSourceDirectory.c_str());
-        const char*             pchCurrentPosition(szSourceDirectory);
-        const char*             pchLastPosition(szSourceDirectory);
-
-        rcstrDirectoryTree.clear();
-
-        if (strSourceDirectory.empty())
-        {
-            return;
-        }
-
-        // It removes as many slashes the path has in its start...
-        // MAYBE and just maybe we should consider paths starting with
-        // more than 2 slashes invalid paths...
-        while ((*pchLastPosition == '\\') || (*pchLastPosition == '/'))
-        {
-            ++pchLastPosition;
-            ++pchCurrentPosition;
-        }
-
-        do
-        {
-            pchCurrentPosition = strpbrk(pchLastPosition, "\\/");
-            if (pchCurrentPosition == NULL)
-            {
-                break;
-            }
-            strCurrentDirectoryName.assign(pchLastPosition, pchCurrentPosition);
-            pchLastPosition = pchCurrentPosition + 1;
-            // Again, here we are skipping as many consecutive slashes.
-            while ((*pchLastPosition == '\\') || (*pchLastPosition == '/'))
-            {
-                ++pchLastPosition;
-            }
-
-
-            rcstrDirectoryTree.push_back(strCurrentDirectoryName.c_str());
-        } while (true);
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void ConvertSlashToBackSlash(QString& rstrStringToConvert)
-    {
-        rstrStringToConvert.replace('/', '\\');
-        rstrStringToConvert = CaselessPaths(rstrStringToConvert);
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void ConvertBackSlashToSlash(QString& rstrStringToConvert)
-    {
-        rstrStringToConvert.replace('\\', '/');
-        rstrStringToConvert = CaselessPaths(rstrStringToConvert);
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void SurroundWithQuotes(QString& rstrSurroundString)
-    {
-        QString strSurroundString(rstrSurroundString);
-
-        if (!strSurroundString.isEmpty())
-        {
-            if (strSurroundString[0] != '\"')
-            {
-                strSurroundString.insert(0, "\"");
-            }
-            if (strSurroundString[strSurroundString.size() - 1] != '\"')
-            {
-                strSurroundString.insert(strSurroundString.size(), "\"");
-            }
-        }
-        else
-        {
-            strSurroundString.insert(0, "\"");
-            strSurroundString.insert(strSurroundString.size(), "\"");
-        }
-        rstrSurroundString = strSurroundString;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    QString GetExecutableFullPath()
-    {
-        return QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
-    }
-    //////////////////////////////////////////////////////////////////////////
-    QString GetWindowsTempDirectory()
-    {
-        return QDir::tempPath();
-    }
-    //////////////////////////////////////////////////////////////////////////
-    QString GetEngineRootPath()
-    {
-        const char* engineRoot;
-        EBUS_EVENT_RESULT(engineRoot, AzFramework::ApplicationRequests::Bus, GetEngineRoot);
-        return QString(engineRoot);
-    }
-    
-    //////////////////////////////////////////////////////////////////////////
-    QString& ReplaceFilename(const QString& strFilepath, const QString& strFilename, QString& strOutputFilename, bool bCallCaselessPath)
-    {
-        QString strDriveLetter;
-        QString strDirectory;
-        QString strOriginalFilename;
-        QString strExtension;
-
-        SplitPath(strFilepath, strDriveLetter, strDirectory, strOriginalFilename, strExtension);
-
-        strOutputFilename = strDriveLetter;
-        strOutputFilename += strDirectory;
-        strOutputFilename += strFilename;
-        strOutputFilename += strExtension;
-
-        if (bCallCaselessPath)
-        {
-            strOutputFilename = CaselessPaths(strOutputFilename);
-        }
-        return strOutputFilename;
-    }
-
-    bool IsFolder(const char* pPath)
-    {
-        DWORD attrs = GetFileAttributes(pPath);
-
-        if (attrs == FILE_ATTRIBUTE_DIRECTORY)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    QString GetUserSandboxFolder()
-    {
-        return QString::fromUtf8("@user@/Sandbox/");
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    QString GetResolvedUserSandboxFolder()
-    {
-        char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
-        gEnv->pFileIO->ResolvePath(GetUserSandboxFolder().toUtf8().data(), resolvedPath, AZ_MAX_PATH_LEN);
-        return QString::fromLatin1(resolvedPath);
-    }
-
-    // internal function, you should use GetEditingGameDataFolder instead.
-    AZStd::string GetGameAssetsFolder()
-    {
-        const char* resultValue = nullptr;
-        EBUS_EVENT_RESULT(resultValue, AzToolsFramework::AssetSystemRequestBus, GetAbsoluteDevGameFolderPath);
-        if (!resultValue)
-        {
-            if ((gEnv) && (gEnv->pFileIO))
-            {
-                resultValue = gEnv->pFileIO->GetAlias("@devassets@");
-            }
-        }
-
-        if (!resultValue)
-        {
-            resultValue = ".";
-        }
-
-        return resultValue;
-    }
-
-    /// Get the data folder
-    AZStd::string GetEditingGameDataFolder()
-    {
-        // query the editor root.  The bus exists in case we want tools to be able to override this.
-
-
-        if (g_currentModName.empty())
-        {
-            return GetGameAssetsFolder();
-        }
-        AZStd::string str(GetGameAssetsFolder());
-        str += "Mods\\";
-        str += g_currentModName;
-        return str;
-    }
-
-    //! Get the root folder (in source control or other writable assets) where you should save root data.
-    AZStd::string GetEditingRootFolder()
-    {
-        const char* resultValue = nullptr;
-        EBUS_EVENT_RESULT(resultValue, AzToolsFramework::AssetSystemRequestBus, GetAbsoluteDevRootFolderPath);
-
-        if (!resultValue)
-        {
-            if ((gEnv) && (gEnv->pFileIO))
-            {
-                resultValue = gEnv->pFileIO->GetAlias("@devassets@");
-            }
-        }
-        if (!resultValue)
-        {
-            resultValue = ".";
-        }
-        return resultValue;
-    }
-
-
-    AZStd::string MakeModPathFromGamePath(const char* relGamePath)
-    {
-        return GetEditingGameDataFolder() + "\\" + relGamePath;
-    }
-
-    QString FullPathToLevelPath(const QString& path)
-    {
-        if (path.isEmpty())
-        {
-            return "";
-        }
-
-        QString relGamePath;
-
-        if (!QFileInfo(path).isRelative())
-        {
-            relGamePath = GetRelativePath(path);
-        }
-        else
-        {
-            relGamePath = path;
-        }
-
-        QString levelpath = GetIEditor()->GetLevelFolder();
-        QString str = levelpath;
-        str.replace('/', '\\');
-        levelpath = CaselessPaths(str);
-
-        // Create relative path
-        QString relLevelPath = QDir(levelpath).relativeFilePath(relGamePath);
-        if (relLevelPath.isEmpty())
-        {
-            assert(0);
-            return path;
-        }
-
-        relLevelPath.remove(QRegularExpression(QStringLiteral(R"(^[\\/.]*)")));
-        return relLevelPath;
-    }
-
-    QString Make(const QString& path, const QString& file)
-    {
-        if (gEnv->pCryPak->IsAbsPath(file.toUtf8().data()))
-        {
-            return file;
-        }
-        return CaselessPaths(AddPathSlash(path) + file);
-    }
-
-    QString GetRelativePath(const QString& fullPath, bool bRelativeToGameFolder /*= false*/)
-    {
-        if (fullPath.isEmpty())
-        {
-            return "";
-        }
-
-        bool relPathfound = false;
-        AZStd::string relativePath;
-        AZStd::string fullAssetPath(fullPath.toUtf8().data());
-        EBUS_EVENT_RESULT(relPathfound, AzToolsFramework::AssetSystemRequestBus, GetRelativeProductPathFromFullSourceOrProductPath, fullAssetPath, relativePath);
-
-        if (relPathfound)
-        {
-            // do not normalize this path, it will already be an appropriate asset ID.
-            return CaselessPaths(relativePath.c_str());
-        }
-
-        char rootpath[_MAX_PATH] = { 0 };
-        azstrcpy(rootpath, _MAX_PATH, Path::GetEditingRootFolder().c_str());
-
-        if (bRelativeToGameFolder)
-        {
-            azstrcpy(rootpath, _MAX_PATH, Path::GetEditingGameDataFolder().c_str());
-        }
-
-        QString rootPathNormalized(rootpath);
-        QString srcPathNormalized(fullPath);
-
-#if defined(AZ_PLATFORM_WINDOWS)
-        // avoid confusing PathRelativePathTo
-        rootPathNormalized.replace('/', '\\');
-        srcPathNormalized.replace('/', '\\');
-#endif
-
-        // Create relative path
-        char resolvedSrcPath[AZ_MAX_PATH_LEN] = { 0 };
-        AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(srcPathNormalized.toUtf8().data(), resolvedSrcPath, AZ_MAX_PATH_LEN);
-        QByteArray path = QDir(rootPathNormalized).relativeFilePath(resolvedSrcPath).toUtf8();
-        if (path.isEmpty())
-        {
-            return fullPath;
-        }
-
-        // The following code is required because the windows PathRelativePathTo function will always return "./SomePath" instead of just "SomePath"
-        // Only remove single dot (.) and slash parts of a path, never the double dot (..)
-        const char* pBuffer = path.data();
-        bool bHasDot = false;
-        while (*pBuffer && pBuffer != path.end())
-        {
-            switch (*pBuffer)
-            {
-            case '.':
-                if (bHasDot)
-                {
-                    // Found a double dot, rewind and stop removing
-                    pBuffer--;
-                    break;
-                }
-            // Fall through intended
-            case '/':
-            case '\\':
-                bHasDot = (*pBuffer == '.');
-                pBuffer++;
-                continue;
-            }
-            break;
-        }
-
-        QString relPath = pBuffer;
-        return CaselessPaths(relPath);
-    }
-
-    QString GamePathToFullPath(const QString& path)
-    {
-        using namespace AzToolsFramework;
-        AZ_Warning("GamePathToFullPath", path.size() <= AZ_MAX_PATH_LEN, "Path exceeds maximum path length of %d", AZ_MAX_PATH_LEN);
-        if ((gEnv) && (gEnv->pFileIO) && gEnv->pCryPak && path.size() <= AZ_MAX_PATH_LEN)
-        {
-            // first, adjust the file name for mods:
-            bool fullPathfound = false;
-            AZStd::string assetFullPath;
-            AZStd::string adjustedFilePath = path.toUtf8().data();
-            AssetSystemRequestBus::BroadcastResult(fullPathfound, &AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath, adjustedFilePath, assetFullPath);
-            if (fullPathfound)
-            {
-                //if the bus message succeeds than normalize and lowercase the path
-                AzFramework::StringFunc::Path::Normalize(assetFullPath);
-                return assetFullPath.c_str();
-            }
-            // if the bus message didn't succeed, 'guess' the source assets:
-            else
-            {
-                // Not all systems have been converted to use local paths. Some editor files save XML files directly, and a full or correctly aliased path is already passed in.
-                // If the path passed in exists already, then return the resolved filepath
-                if (AZ::IO::FileIOBase::GetDirectInstance()->Exists(adjustedFilePath.c_str()))
-                {
-                    char resolvedPath[AZ_MAX_PATH_LEN + PathUtil::maxAliasLength] = { 0 };
-                    AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(adjustedFilePath.c_str(), resolvedPath, AZ_MAX_PATH_LEN + PathUtil::maxAliasLength);
-                    return QString::fromUtf8(resolvedPath);
-                }
-                // if we get here it means that the Asset Processor does not know about this file.  most of the time we should never get here
-                // the rest of this code just does a bunch of heuristic guesses in case of missing files or if the user has hand-edited
-                // the asset cache by moving files in via some other means or external process.
-                if (adjustedFilePath[0] != '@')
-                {
-                    const char* prefix = (adjustedFilePath[0] == '/' || adjustedFilePath[0] == '\\') ? "@devassets@" : "@devassets@/";
-                    adjustedFilePath = prefix + adjustedFilePath;
-                }
-
-                char szAdjustedFile[AZ_MAX_PATH_LEN + PathUtil::maxAliasLength] = { 0 };
-                gEnv->pFileIO->ResolvePath(adjustedFilePath.c_str(), szAdjustedFile, AZ_ARRAY_SIZE(szAdjustedFile));
-
-                if ((azstrnicmp(szAdjustedFile, "@devassets@", 11) == 0) && ((szAdjustedFile[11] == '/') || (szAdjustedFile[11] == '\\')))
-                {
-                    if (!gEnv->pCryPak->IsFileExist(szAdjustedFile))
-                    {
-                        AZStd::string newName(szAdjustedFile);
-                        AzFramework::StringFunc::Replace(newName, "@devassets@", "@devroot@/engine", false);
-                        
-                        if (gEnv->pCryPak->IsFileExist(newName.c_str()))
-                        {
-                            azstrcpy(szAdjustedFile, AZ_ARRAY_SIZE(szAdjustedFile), newName.c_str());
-                        }
-                        else
-                        {
-                            // getting tricky here, try @devroot@ alone, in case its 'editor'
-                            AzFramework::StringFunc::Replace(newName, "@devassets@", "@devroot@", false);
-                            if (gEnv->pCryPak->IsFileExist(szAdjustedFile))
-                            {
-                                azstrcpy(szAdjustedFile, AZ_ARRAY_SIZE(szAdjustedFile), newName.c_str());
-                            }
-                            // give up, best guess is just @devassets@
-                        }
-                    }
-                }
-
-                // we should very rarely actually get to this point in the code.
-
-                // szAdjustedFile may contain an alias at this point. (@assets@/blah.whatever)
-                // there is a case in which the loose asset exists only within a pak file for some reason
-                // this is not recommended but it is possible.in that case, we want to return the original szAdjustedFile
-                // without touching it or resolving it so that crypak can open it successfully.
-                char adjustedPath[AZ_MAX_PATH_LEN + PathUtil::maxAliasLength] = { 0 };
-                if (gEnv->pFileIO->ResolvePath(szAdjustedFile, adjustedPath, AZ_MAX_PATH_LEN + PathUtil::maxAliasLength)) // resolve to full path
-                {
-                    if ((gEnv->pCryPak->IsFileExist(adjustedPath)) || (!gEnv->pCryPak->IsFileExist(szAdjustedFile)))
-                    {
-                        // note that if we get here, then EITHER
-                        // the file exists as a loose asset in the actual adjusted path
-                        // OR the file does not exist in the original passed-in aliased name (like '@assets@/whatever')
-                        // in which case we may as well just resolve the path to a full path and return it.
-                        assetFullPath = adjustedPath;
-                        AzFramework::StringFunc::Path::Normalize(assetFullPath);
-                        azstrcpy(szAdjustedFile, AZ_MAX_PATH_LEN + PathUtil::maxAliasLength, assetFullPath.c_str());
-                    }
-                    // if the above case succeeded then it means that the file does NOT exist loose
-                    // but DOES exist in a pak, in which case we leave szAdjustedFile with the alias on the front of it, meaning
-                    // fopens via crypak will actually succeed.
-                }
-                return szAdjustedFile;
-            }
-        }
-        else
-        {
-            return "";
-        }
-    }
-
-    QString ToUnixPath(const QString& strPath, bool bCallCaselessPath)
-    {
-        QString str = strPath;
-        str.replace('\\', '/');
-        return bCallCaselessPath ? CaselessPaths(str) : str;
-    }
-
-    QString RemoveBackslash(QString path)
-    {
-        if (path.isEmpty())
-        {
-            return path;
-        }
-
-        int iLenMinus1 = path.length() - 1;
-        QChar cLastChar = path[iLenMinus1];
-
-        if (cLastChar == '\\' || cLastChar == '/')
-        {
-            return CaselessPaths(path.mid(0, iLenMinus1));
-        }
-
-        return CaselessPaths(path);
-    }
-
-    QString SubDirectoryCaseInsensitive(const QString& path, const QStringList& parts)
-    {
-        if (parts.isEmpty())
-        {
-            return path;
-        }
-
-        QStringList modifiedParts = parts;
-        auto currentPart = modifiedParts.takeFirst();
-
-        // case insensitive iterator
-        QDirIterator it(path);
-        while (it.hasNext())
-        {
-            it.next();
-            // the current part already exists, use it, case doesn't matter
-            auto actualName = it.fileName();
-            if (QString::compare(actualName, currentPart, Qt::CaseInsensitive) == 0)
-            {
-                return SubDirectoryCaseInsensitive(QDir(path).absoluteFilePath(actualName), modifiedParts);
-            }
-        }
-        // the current path doesn't exist yet, so just create the complete path in one rush
-        return QDir(path).absoluteFilePath(parts.join('/'));
-    }
-}
-
diff --git a/Code/Sandbox/Editor/Util/PathUtil.h b/Code/Sandbox/Editor/Util/PathUtil.h
deleted file mode 100644
index 45c701b937..0000000000
--- a/Code/Sandbox/Editor/Util/PathUtil.h
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Utility functions to simplify working with paths.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_PATHUTIL_H
-#define CRYINCLUDE_EDITOR_UTIL_PATHUTIL_H
-#pragma once
-
-#include <CryPath.h>
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <shlwapi.h>
-#endif
-#include <Include/EditorCoreAPI.h>
-
-#include <AzCore/IO/SystemFile.h> // for max path
-#include <AzCore/std/string/string.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-
-#include <QRegularExpression>
-#include <QDir>
-
-class QString;
-class QStringList;
-
-namespace Path
-{
-    //! creates an absolute path from a relative game path, used for saving game files.
-    //! Example: Libs/Some/tokens.xml to c:/game/engine/GameName/Mods/ModName/Libs/Some/tokens.xml
-    //! If you're not working on a mod, it will return it with the game folder prepended.
-    //! This is the function you should use at all times to convert an asset ID to a full writable editor path.
-    EDITOR_CORE_API AZStd::string MakeModPathFromGamePath(const char* input);
-
-    //! Get the data folder where assets should be saved.
-    //! if we're working on a mod, will return the mod's root (absolute path, with no slash at the end)
-    //! if not, will return the default game root (absolute path, with no slash at the end)
-    //! always returns a full path
-    EDITOR_CORE_API AZStd::string GetEditingGameDataFolder();
-
-    //! Get the root folder (in source control or other writable assets) where you should save root data.
-    EDITOR_CORE_API AZStd::string GetEditingRootFolder();
-
-    //! Set the current mod NAME for editing purposes.  After doing this the above functions will take this into account
-    //! name only, please!
-    EDITOR_CORE_API void SetModName(const char* input);
-
-
-    //! converts path to lowercase given the cvar for ed_lowercasepaths
-    inline QString CaselessPaths(const QString& strPath)
-    {
-        ICVar* pCvar = gEnv->pConsole->GetCVar("ed_lowercasepaths");
-        if (pCvar)
-        {
-            int uselowercase = pCvar->GetIVal();
-            if (uselowercase)
-            {
-                QString str = strPath;
-                str = str.toLower();
-                return str;
-            }
-        }
-        return strPath;
-    }
-
-    //! Split full file name to path and filename
-    //! @param filepath [IN] Full file name inclusing path.
-    //! @param path [OUT] Extracted file path.
-    //! @param file [OUT] Extracted file (with extension).
-    inline void Split(const QString& filepath, QString& path, QString& file)
-    {
-        char path_buffer[_MAX_PATH];
-        char drive[_MAX_DRIVE];
-        char dir[_MAX_DIR];
-        char fname[_MAX_FNAME];
-        char ext[_MAX_EXT];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath.toUtf8().data(), drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), fname, AZ_ARRAY_SIZE(fname), ext, AZ_ARRAY_SIZE(ext));
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
-        path = path_buffer;
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), 0, 0, fname, ext);
-#else
-        _splitpath(filepath.toUtf8().data(), drive, dir, fname, ext);
-        _makepath(path_buffer, drive, dir, 0, 0);
-        path = path_buffer;
-        _makepath(path_buffer, 0, 0, fname, ext);
-#endif
-        file = path_buffer;
-    }
-    inline void Split(const string& filepath, string& path, string& file)
-    {
-        char path_buffer[_MAX_PATH];
-        char drive[_MAX_DRIVE];
-        char dir[_MAX_DIR];
-        char fname[_MAX_FNAME];
-        char ext[_MAX_EXT];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath, drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), 0, 0, 0, 0);
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
-        path = path_buffer;
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), 0, 0, fname, ext);
-#else
-        _splitpath(filepath, drive, dir, fname, ext);
-        _makepath(path_buffer, drive, dir, 0, 0);
-        path = path_buffer;
-        _makepath(path_buffer, 0, 0, fname, ext);
-#endif
-        file = path_buffer;
-    }
-
-    //! Split full file name to path and filename
-    //! @param filepath [IN] Full file name inclusing path.
-    //! @param path [OUT] Extracted file path.
-    //! @param filename [OUT] Extracted file (without extension).
-    //! @param ext [OUT] Extracted files extension.
-    inline void Split(const QString& filepath, QString& path, QString& filename, QString& fext)
-    {
-        char path_buffer[_MAX_PATH];
-        char drive[_MAX_DRIVE];
-        char dir[_MAX_DIR];
-        char fname[_MAX_FNAME];
-        char ext[_MAX_EXT];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath.toUtf8().data(), drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), fname, AZ_ARRAY_SIZE(fname), ext, AZ_ARRAY_SIZE(ext));
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
-#else
-        _splitpath(filepath.toUtf8().data(), drive, dir, fname, ext);
-        _makepath(path_buffer, drive, dir, 0, 0);
-#endif
-        path = path_buffer;
-        filename = fname;
-        fext = ext;
-    }
-    inline void Split(const string& filepath, string& path, string& filename, string& fext)
-    {
-        char path_buffer[_MAX_PATH];
-        char drive[_MAX_DRIVE];
-        char dir[_MAX_DIR];
-        char fname[_MAX_FNAME];
-        char ext[_MAX_EXT];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath, drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), fname, AZ_ARRAY_SIZE(fname), ext, AZ_ARRAY_SIZE(ext));
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
-#else
-        _splitpath(filepath, drive, dir, fname, ext);
-        _makepath(path_buffer, drive, dir, 0, 0);
-#endif
-        path = path_buffer;
-        filename = fname;
-        fext = ext;
-    }
-
-    //! Split path into segments
-    //! @param filepath [IN] path
-    inline QStringList SplitIntoSegments(const QString& path)
-    {
-        return path.split(QRegularExpression(QStringLiteral(R"([\\/])")), Qt::SkipEmptyParts);
-    }
-
-    //! Extract extension from full specified file path.
-    inline QString GetExt(const QString& filepath)
-    {
-        char ext[_MAX_EXT];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath.toUtf8().data(), 0, 0, 0, 0, 0, 0, ext, AZ_ARRAY_SIZE(ext));
-#else
-        _splitpath(filepath.toUtf8().data(), 0, 0, 0, ext);
-#endif
-        if (ext[0] == '.')
-        {
-            return ext + 1;
-        }
-
-        return ext;
-    }
-
-    //! Extract path from full specified file path.
-    inline QString GetPath(const QString& filepath)
-    {
-        char path_buffer[_MAX_PATH];
-        char drive[_MAX_DRIVE];
-        char dir[_MAX_DIR];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath.toUtf8().data(), drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), 0, 0, 0, 0);
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, 0, 0);
-#else
-        _splitpath(filepath.toUtf8().data(), drive, dir, 0, 0);
-        _makepath(path_buffer, drive, dir, 0, 0);
-#endif
-        return CaselessPaths(path_buffer);
-    }
-
-    //! Extract file name with extension from full specified file path.
-    inline QString GetFile(const QString& filepath)
-    {
-        char path_buffer[_MAX_PATH];
-        char fname[_MAX_FNAME];
-        char ext[_MAX_EXT];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath.toUtf8().data(), 0, 0, 0, 0, fname, AZ_ARRAY_SIZE(fname), ext, AZ_ARRAY_SIZE(ext));
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), 0, 0, fname, ext);
-#else
-        _splitpath(filepath.toUtf8().data(), 0, 0, fname, ext);
-        _makepath(path_buffer, 0, 0, fname, ext);
-#endif
-        return CaselessPaths(path_buffer);
-    }
-
-    //! Extract file name without extension from full specified file path.
-    inline QString GetFileName(const QString& filepath)
-    {
-        char fname[_MAX_FNAME];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath.toUtf8().data(), 0, 0, 0, 0, fname, AZ_ARRAY_SIZE(fname), 0, 0);
-#else
-        _splitpath(filepath.toUtf8().data(), 0, 0, fname, 0);
-#endif
-        return fname;
-    }
-
-    inline bool EndsWithSlash(QString path)
-    {
-        return (path.endsWith(QStringLiteral("\\")) || path.endsWith(QStringLiteral("/")));
-    }
-    
-    template<size_t size>
-    inline bool EndsWithSlash(CryStackStringT<char, size>* path)
-    {
-        if ((!path) || (path->empty()))
-        {
-            return false;
-        }
-        
-        if (
-            ((*path)[path->size() - 1] != '\\') ||
-            ((*path)[path->size() - 1] != '/') 
-            )
-        {
-            return true;
-        }
-        
-        return false;
-    }
-
-    //! add a backslash if needed
-    inline QString AddBackslash(QString path)
-    {
-        if (path.isEmpty() || EndsWithSlash(path))
-        {
-            return path;
-        }
-
-        return CaselessPaths(path + "\\");
-    }
-
-    //! add a slash if needed
-    inline QString AddSlash(const QString& path)
-    {
-        if (path.isEmpty() || EndsWithSlash(path))
-        {
-            return path;
-        }
-
-        return CaselessPaths(path + "/");
-    }
-
-    template<size_t size>
-    inline void AddBackslash(CryStackStringT<char, size>* path)
-    {
-        if (path->empty())
-        {
-            return;
-        }
-        if (!EndsWithSlash(path))
-        {
-            (*path) += '\\';
-        }
-    }
-
-    template<size_t size>
-    inline void AddSlash(CryStackStringT<char, size>* path)
-    {
-        if (path->empty())
-        {
-            return;
-        }
-        if (!EndsWithSlash(path))
-        {
-            (*path) += '/';
-        }
-    }
-
-    inline QString AddPathSlash(const QString& path)
-    {
-#if defined(AZ_PLATFORM_WINDOWS)
-        return AddBackslash(path);
-#else
-        return AddSlash(path);
-#endif
-    }
-
-    //! Replace extension for given file.
-    inline QString ReplaceExtension(const QString& filepath, const QString& ext)
-    {
-        AZStd::string newPath = filepath.toUtf8().data();
-        AzFramework::StringFunc::Path::ReplaceExtension(newPath, ext.toUtf8().data());
-        QString returnString(newPath.c_str());
-        return CaselessPaths(returnString);
-    }
-
-    //! Replace extension for given file.
-    inline QString RemoveExtension(const QString& filepath)
-    {
-        char path_buffer[_MAX_PATH];
-        char drive[_MAX_DRIVE];
-        char dir[_MAX_DIR];
-        char fname[_MAX_FNAME];
-#ifdef AZ_COMPILER_MSVC
-        _splitpath_s(filepath.toUtf8().data(), drive, AZ_ARRAY_SIZE(drive), dir, AZ_ARRAY_SIZE(dir), fname, AZ_ARRAY_SIZE(fname), 0, 0);
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), drive, dir, fname, 0);
-#else
-        _splitpath(filepath.toUtf8().data(), drive, dir, fname, 0);
-        _makepath(path_buffer, drive, dir, fname, 0);
-#endif
-        return path_buffer;
-    }
-
-    //! Makes a fully specified file path from path and file name.
-    inline QString Make(const QString& dir, const QString& filename, const QString& ext)
-    {
-        char path_buffer[_MAX_PATH];
-#ifdef AZ_COMPILER_MSVC
-        _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), NULL, dir.toUtf8().data(), filename.toUtf8().data(), ext.toUtf8().data());
-#else
-        _makepath(path_buffer, NULL, dir.toUtf8().data(), filename.toUtf8().data(), ext.toUtf8().data());
-#endif
-        return CaselessPaths(path_buffer);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    EDITOR_CORE_API QString GetRelativePath(const QString& fullPath, bool bRelativeToGameFolder = false);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Description:
-    // given the assetID of a produced asset, constructs the full path to the SOURCE ASSET that was used to produce it.
-    // Ex. Objects/box.dds will be converted to C:\Test\Game\Objects\box.tif (or bmp or whatever)
-    EDITOR_CORE_API QString GamePathToFullPath(const QString& path);
-
-    //////////////////////////////////////////////////////////////////////////
-    inline QString FullPathToGamePath(const QString& path)
-    {
-        return CaselessPaths(GetRelativePath(path, true));
-    }
-    inline string FullPathToGamePath(const char* path)
-    {
-        return CaselessPaths(GetRelativePath(path, true)).toUtf8().data();
-    }
-
-    QString FullPathToLevelPath(const QString& path);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Description:
-    // Turn any path into an asset ID.
-
-    inline QString MakeGamePath(const QString& path)
-    {
-        QString fullpath = Path::GamePathToFullPath(path);
-
-        // if its in a mod, we still want the 'asset id' of it.
-        QString dataFolder = Path::AddPathSlash(QString(Path::GetEditingGameDataFolder().c_str()));
-        if (fullpath.length() > dataFolder.length() && QString::compare(fullpath, dataFolder, Qt::CaseInsensitive) == 0)
-        {
-            fullpath = fullpath.right(fullpath.length() - dataFolder.length());
-            fullpath.replace('\\', '/'); // Slashes use for game files.
-            return fullpath;
-        }
-
-        fullpath = GetRelativePath(path, true);
-        if (fullpath.isEmpty())
-        {
-            fullpath = path;
-        }
-        fullpath.replace('\\', '/'); // Slashes use for game files.
-        return CaselessPaths(fullpath);
-    }
-
-
-    inline QString GetAudioLocalizationFolder(bool returnAbsolutePath)
-    {
-        // Omit the trailing slash!
-        QString sLocalizationFolder(QString(PathUtil::GetLocalizationFolder()).left(static_cast<int>(PathUtil::GetLocalizationFolder().size()) - 1));
-
-        if (!sLocalizationFolder.isEmpty())
-        {
-            sLocalizationFolder = returnAbsolutePath ? (QString(Path::GetEditingGameDataFolder().c_str()) + "/" + sLocalizationFolder + "/dialog/") : sLocalizationFolder + "/dialog/";
-        }
-        else
-        {
-            gEnv->pSystem->Warning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, VALIDATOR_FLAG_AUDIO, 0, "The localization folder is not set! Please make sure it is by checking the setting of cvar \"sys_localization_folder\"!");
-        }
-
-        return sLocalizationFolder;
-    }
-
-    //! Returns the aliased path to the user Sandbox folder
-    EDITOR_CORE_API QString GetUserSandboxFolder();
-
-    //! Returns the resolved, non-aliased path to the user Sandbox folder
-    EDITOR_CORE_API QString GetResolvedUserSandboxFolder();
-
-    //! Convert a path to the uniform form.
-    EDITOR_CORE_API QString ToUnixPath(const QString& strPath, bool bCallCaselessPath = true);
-
-    //! Makes a fully specified file path from path and file name.
-    EDITOR_CORE_API QString Make(const QString& path, const QString& file);
-
-    // This had to be created because _splitpath is too dumb about console drives.
-    EDITOR_CORE_API void SplitPath(const QString& rstrFullPathFilename, QString& rstrDriveLetter, QString& rstrDirectory, QString& rstrFilename, QString& rstrExtension);
-
-    // Requires a path from Splithpath: no drive letter and backslash at the end.
-    EDITOR_CORE_API void GetDirectoryQueue(const QString& rstrSourceDirectory, QStringList& rcstrDirectoryTree);
-
-    // Converts all slashes to backslashes so MS things won't complain.
-    EDITOR_CORE_API void ConvertSlashToBackSlash(QString& rstrStringToConvert);
-
-    // Converts backslashes into forward slashes.
-    EDITOR_CORE_API void ConvertBackSlashToSlash(QString& rstrStringToConvert);
-
-    // Surrounds a string with quotes if necessary. This is useful for calling other programs.
-    EDITOR_CORE_API void SurroundWithQuotes(QString& rstrSurroundString);
-
-    // Gets the temporary directory path (which may not exist).
-    EDITOR_CORE_API QString GetWindowsTempDirectory();
-
-    // This function returns the full path used to run the editor.
-    EDITOR_CORE_API QString GetExecutableFullPath();
-
-    // This function returns the engine's root path
-    EDITOR_CORE_API QString GetEngineRootPath();
-
-    // This function replaces the filename from a path, keeping extension and directory/drive path.
-    // WARNING: do not use the same variable in the last parameter and in any of the others.
-    EDITOR_CORE_API QString& ReplaceFilename(const QString& strFilepath, const QString& strFilename, QString& strOutputFilename, bool bCallCaselessPath = true);
-
-    //! \return true if the given path is a folder and not a file
-    EDITOR_CORE_API bool IsFolder(const char* pPath);
-
-    EDITOR_CORE_API void ConvertSlashToBackSlash(QString& str);
-    EDITOR_CORE_API void ConvertBackSlashToSlash(QString& str);
-    EDITOR_CORE_API QString RemoveBackslash(QString path);
-
-    /*
-     * Returns the complete path of the subdirectories in parts inside of path. If
-     * one of the parts already exists but in different upper and lower case, the resulting
-     * path will contain that one. Note that the directory is not created!
-     */
-    EDITOR_CORE_API QString SubDirectoryCaseInsensitive(const QString& path, const QStringList& parts);
-};
-
-inline QString operator /(const QString& first, const QString& second)
-{
-    return Path::Make(first, second);
-}
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_PATHUTIL_H
diff --git a/Code/Sandbox/Editor/Util/PredefinedAspectRatios.cpp b/Code/Sandbox/Editor/Util/PredefinedAspectRatios.cpp
deleted file mode 100644
index f6892e1791..0000000000
--- a/Code/Sandbox/Editor/Util/PredefinedAspectRatios.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "PredefinedAspectRatios.h"
-
-// Editor
-#include "Settings.h"
-
-CPredefinedAspectRatios::CPredefinedAspectRatios()
-{
-    m_aspectRatios.reserve(10);
-
-    AddAspectRatio(5, 4);
-    AddAspectRatio(4, 3);
-    AddAspectRatio(3, 2);
-    AddAspectRatio(16, 10);
-    AddAspectRatio(16, 9);
-    AddAspectRatio(1.85f, 1);
-    AddAspectRatio(2.39f, 1);
-}
-
-CPredefinedAspectRatios::~CPredefinedAspectRatios()
-{
-}
-
-void CPredefinedAspectRatios::AddAspectRatio(float x, int y)
-{
-    if (y == 0)
-    {
-        return;
-    }
-
-    SAspectRatio aspectRatio;
-    aspectRatio.name = QStringLiteral("%1:%2").arg(x, 0, 'f', 2).arg(y);
-    aspectRatio.value = x / y;
-
-    m_aspectRatios.push_back(aspectRatio);
-}
-
-void CPredefinedAspectRatios::AddAspectRatio(int x, int y)
-{
-    if (y == 0)
-    {
-        return;
-    }
-
-    SAspectRatio aspectRatio;
-    aspectRatio.name = QStringLiteral("%1:%2").arg(x).arg(y);
-    aspectRatio.value = float( x ) / y;
-
-    m_aspectRatios.push_back(aspectRatio);
-}
-
-
-float CPredefinedAspectRatios::GetCurrentValue() const
-{
-    return gSettings.viewports.fDefaultAspectRatio;
-}
-
-bool CPredefinedAspectRatios::IsEmpty() const
-{
-    return m_aspectRatios.empty();
-}
-
-size_t CPredefinedAspectRatios::GetCount() const
-{
-    return m_aspectRatios.size();
-}
-
-
-const QString& CPredefinedAspectRatios::GetName(size_t aspectRatioId) const
-{
-    bool validAspectRatioId = (aspectRatioId < GetCount());
-    assert(validAspectRatioId);
-    if (!validAspectRatioId)
-    {
-        static QString dummyAspectRatioName("1:1");
-        return dummyAspectRatioName;
-    }
-
-    const SAspectRatio& aspectRatio = m_aspectRatios[ aspectRatioId ];
-
-    return aspectRatio.name;
-}
-
-float CPredefinedAspectRatios::GetValue(size_t aspectRatioId) const
-{
-    bool validAspectRatioId = (aspectRatioId < GetCount());
-    assert(validAspectRatioId);
-    if (!validAspectRatioId)
-    {
-        return 1;
-    }
-
-    const SAspectRatio& aspectRatio = m_aspectRatios[ aspectRatioId ];
-
-    return aspectRatio.value;
-}
-
-bool CPredefinedAspectRatios::IsCurrent(size_t aspectRatioId) const
-{
-    float selectedValue = GetValue(aspectRatioId);
-    float currentValue = GetCurrentValue();
-
-    const float THRESHOLD = 0.01f;
-
-    bool valuesCloseEnough = (fabs(selectedValue - currentValue) <= THRESHOLD);
-
-    return valuesCloseEnough;
-}
diff --git a/Code/Sandbox/Editor/Util/PredefinedAspectRatios.h b/Code/Sandbox/Editor/Util/PredefinedAspectRatios.h
deleted file mode 100644
index 2967f6ec53..0000000000
--- a/Code/Sandbox/Editor/Util/PredefinedAspectRatios.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_PREDEFINEDASPECTRATIOS_H
-#define CRYINCLUDE_EDITOR_UTIL_PREDEFINEDASPECTRATIOS_H
-#pragma once
-
-
-#include <vector>
-
-class CPredefinedAspectRatios
-{
-public:
-    CPredefinedAspectRatios();
-    virtual ~CPredefinedAspectRatios();
-
-    void AddAspectRatio(float x, int y);
-    void AddAspectRatio(int x, int y);
-
-    float GetCurrentValue() const;
-
-    bool IsEmpty() const;
-    size_t GetCount() const;
-
-    const QString& GetName(size_t aspectRatioId) const;
-    float GetValue(size_t aspectRatioId) const;
-    bool IsCurrent(size_t aspectRatioId) const;
-
-private:
-    struct SAspectRatio
-    {
-        QString name;
-        float value;
-    };
-    std::vector< SAspectRatio > m_aspectRatios;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_PREDEFINEDASPECTRATIOS_H
diff --git a/Code/Sandbox/Editor/Util/RefCountBase.h b/Code/Sandbox/Editor/Util/RefCountBase.h
deleted file mode 100644
index 24e5999c19..0000000000
--- a/Code/Sandbox/Editor/Util/RefCountBase.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Reference counted base object.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_REFCOUNTBASE_H
-#define CRYINCLUDE_EDITOR_UTIL_REFCOUNTBASE_H
-#pragma once
-
-#include <Include/EditorCoreAPI.h>
-
-//! Derive from this class to get reference counting in your class.
-class EDITOR_CORE_API CRefCountBase
-{
-public:
-    CRefCountBase() {}
-
-    //! Add a new reference to this object.
-    int AddRef()
-    {
-        m_nRefCount++;
-        return m_nRefCount;
-    }
-
-    //! Release reference to this object.
-    //! When the reference count reaches zero, the object is deleted.
-    int Release()
-    {
-        int refs = --m_nRefCount;
-        if (m_nRefCount == 0)
-        {
-            delete this;
-        }
-        else if (m_nRefCount < 0)
-        {
-            CryFatalError("Negative ref count");
-        }
-        return refs;
-    }
-
-protected:
-    virtual ~CRefCountBase() {}
-
-private:
-    int m_nRefCount = 0;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_REFCOUNTBASE_H
diff --git a/Code/Sandbox/Editor/Util/StringHelpers.cpp b/Code/Sandbox/Editor/Util/StringHelpers.cpp
deleted file mode 100644
index e8d51b71fa..0000000000
--- a/Code/Sandbox/Editor/Util/StringHelpers.cpp
+++ /dev/null
@@ -1,1058 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <platform.h>
-#include "StringHelpers.h"
-#include "Util.h"
-#include "StringUtils.h" // From CryCommon
-#include "UnicodeFunctions.h"
-#include <cctype>
-#include <algorithm>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>   // WideCharToMultibyte(), CP_UTF8, etc.
-#endif
-
-#include <AzCore/Casting/numeric_cast.h>
-
-static inline char ToLower(const char c)
-{
-    return tolower(c);
-}
-
-static inline wchar_t ToLower(const wchar_t c)
-{
-    return towlower(c);
-}
-
-
-static inline char ToUpper(const char c)
-{
-    return toupper(c);
-}
-
-static inline wchar_t ToUpper(const wchar_t c)
-{
-    return towupper(c);
-}
-
-
-static inline int Vscprintf(const char* format, va_list argList)
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    return _vscprintf(format, argList);
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-    int retval;
-    va_list argcopy;
-    va_copy(argcopy, argList);
-    retval = azvsnprintf(NULL, 0, format, argcopy);
-    va_end(argcopy);
-    return retval;
-#else
-    #error Not supported!
-#endif
-}
-
-static inline int Vscprintf(const wchar_t* format, va_list argList)
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    return _vscwprintf(format, argList);
-#elif AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-    int retval;
-    va_list argcopy;
-    va_copy(argcopy, argList);
-    retval = azvsnwprintf(NULL, 0, format, argcopy);
-    va_end(argcopy);
-    return retval;
-#else
-    #error Not supported!
-#endif
-}
-
-
-static inline int Vsnprintf_s(char* str, size_t sizeInBytes, [[maybe_unused]] size_t count, const char* format, va_list argList)
-{
-    return azvsnprintf(str, sizeInBytes, format, argList);
-}
-
-static inline int Vsnprintf_s(wchar_t* str, size_t sizeInBytes, [[maybe_unused]] size_t count, const wchar_t* format, va_list argList)
-{
-    return azvsnwprintf(str, sizeInBytes, format, argList);
-}
-
-
-int StringHelpers::Compare(const string& str0, const string& str1)
-{
-    const size_t minLength = Util::getMin(str0.length(), str1.length());
-    const int result = std::memcmp(str0.c_str(), str1.c_str(), minLength);
-    if (result)
-    {
-        return result;
-    }
-    else
-    {
-        return (str0.length() == str1.length())
-               ? 0
-               : ((str0.length() < str1.length()) ? -1 : +1);
-    }
-}
-
-int StringHelpers::Compare(const wstring& str0, const wstring& str1)
-{
-    const size_t minLength = Util::getMin(str0.length(), str1.length());
-    for (size_t i = 0; i < minLength; ++i)
-    {
-        const wchar_t c0 = str0[i];
-        const wchar_t c1 = str1[i];
-        if (c0 != c1)
-        {
-            return (c0 < c1) ? -1 : 1;
-        }
-    }
-
-    return (str0.length() == str1.length())
-           ? 0
-           : ((str0.length() < str1.length()) ? -1 : +1);
-}
-
-
-int StringHelpers::CompareIgnoreCase(const string& str0, const string& str1)
-{
-    const size_t minLength = Util::getMin(str0.length(), str1.length());
-    const int result = azmemicmp(str0.c_str(), str1.c_str(), minLength);
-    if (result)
-    {
-        return result;
-    }
-    else
-    {
-        return (str0.length() == str1.length())
-               ? 0
-               : ((str0.length() < str1.length()) ? -1 : +1);
-    }
-}
-
-int StringHelpers::CompareIgnoreCase(const wstring& str0, const wstring& str1)
-{
-    const size_t minLength = Util::getMin(str0.length(), str1.length());
-    for (size_t i = 0; i < minLength; ++i)
-    {
-        const wchar_t c0 = towlower(str0[i]);
-        const wchar_t c1 = towlower(str1[i]);
-        if (c0 != c1)
-        {
-            return (c0 < c1) ? -1 : 1;
-        }
-    }
-
-    return (str0.length() == str1.length())
-           ? 0
-           : ((str0.length() < str1.length()) ? -1 : +1);
-}
-
-
-bool StringHelpers::Equals(const string& str0, const string& str1)
-{
-    if (str0.length() != str1.length())
-    {
-        return false;
-    }
-    return std::memcmp(str0.c_str(), str1.c_str(), str1.length()) == 0;
-}
-
-bool StringHelpers::Equals(const wstring& str0, const wstring& str1)
-{
-    if (str0.length() != str1.length())
-    {
-        return false;
-    }
-    return std::memcmp(str0.c_str(), str1.c_str(), str1.length() * sizeof(wstring::value_type)) == 0;
-}
-
-
-bool StringHelpers::EqualsIgnoreCase(const string& str0, const string& str1)
-{
-    if (str0.length() != str1.length())
-    {
-        return false;
-    }
-    return azmemicmp(str0.c_str(), str1.c_str(), str1.length()) == 0;
-}
-
-bool StringHelpers::EqualsIgnoreCase(const wstring& str0, const wstring& str1)
-{
-    const size_t str1Length = str1.length();
-    if (str0.length() != str1Length)
-    {
-        return false;
-    }
-    for (size_t i = 0; i < str1Length; ++i)
-    {
-        if (towlower(str0[i]) != towlower(str1[i]))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-
-bool StringHelpers::StartsWith(const string& str, const string& pattern)
-{
-    if (str.length() < pattern.length())
-    {
-        return false;
-    }
-    return std::memcmp(str.c_str(), pattern.c_str(), pattern.length()) == 0;
-}
-
-bool StringHelpers::StartsWith(const wstring& str, const wstring& pattern)
-{
-    if (str.length() < pattern.length())
-    {
-        return false;
-    }
-    return std::memcmp(str.c_str(), pattern.c_str(), pattern.length() * sizeof(wstring::value_type)) == 0;
-}
-
-
-bool StringHelpers::StartsWithIgnoreCase(const string& str, const string& pattern)
-{
-    if (str.length() < pattern.length())
-    {
-        return false;
-    }
-    return azmemicmp(str.c_str(), pattern.c_str(), pattern.length()) == 0;
-}
-
-bool StringHelpers::StartsWithIgnoreCase(const wstring& str, const wstring& pattern)
-{
-    const size_t patternLength = pattern.length();
-    if (str.length() < patternLength)
-    {
-        return false;
-    }
-    for (size_t i = 0; i < patternLength; ++i)
-    {
-        if (towlower(str[i]) != towlower(pattern[i]))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-
-bool StringHelpers::EndsWith(const string& str, const string& pattern)
-{
-    if (str.length() < pattern.length())
-    {
-        return false;
-    }
-    return std::memcmp(str.c_str() + str.length() - pattern.length(), pattern.c_str(), pattern.length()) == 0;
-}
-
-bool StringHelpers::EndsWith(const wstring& str, const wstring& pattern)
-{
-    if (str.length() < pattern.length())
-    {
-        return false;
-    }
-    return std::memcmp(str.c_str() + str.length() - pattern.length(), pattern.c_str(), pattern.length() * sizeof(wstring::value_type)) == 0;
-}
-
-
-bool StringHelpers::EndsWithIgnoreCase(const string& str, const string& pattern)
-{
-    if (str.length() < pattern.length())
-    {
-        return false;
-    }
-    return azmemicmp(str.c_str() + str.length() - pattern.length(), pattern.c_str(), pattern.length()) == 0;
-}
-
-bool StringHelpers::EndsWithIgnoreCase(const wstring& str, const wstring& pattern)
-{
-    const size_t patternLength = pattern.length();
-    if (str.length() < patternLength)
-    {
-        return false;
-    }
-    for (size_t i = str.length() - patternLength, j = 0; i < patternLength; ++i, ++j)
-    {
-        if (towlower(str[i]) != towlower(pattern[j]))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-
-bool StringHelpers::Contains(const string& str, const string& pattern)
-{
-    const size_t patternLength = pattern.length();
-    if (str.length() < patternLength)
-    {
-        return false;
-    }
-    const size_t n = str.length() - patternLength + 1;
-    for (size_t i = 0; i < n; ++i)
-    {
-        if (std::memcmp(str.c_str() + i, pattern.c_str(), patternLength) == 0)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool StringHelpers::Contains(const wstring& str, const wstring& pattern)
-{
-    const size_t patternLength = pattern.length();
-    if (str.length() < patternLength)
-    {
-        return false;
-    }
-    const size_t n = str.length() - patternLength + 1;
-    for (size_t i = 0; i < n; ++i)
-    {
-        if (std::memcmp(str.c_str() + i, pattern.c_str(), patternLength * sizeof(wstring::value_type)) == 0)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-bool StringHelpers::ContainsIgnoreCase(const string& str, const string& pattern)
-{
-    const size_t patternLength = pattern.length();
-    if (str.length() < patternLength)
-    {
-        return false;
-    }
-    const size_t n = str.length() - patternLength + 1;
-    for (size_t i = 0; i < n; ++i)
-    {
-        if (azmemicmp(str.c_str() + i, pattern.c_str(), patternLength) == 0)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool StringHelpers::ContainsIgnoreCase(const wstring& str, const wstring& pattern)
-{
-    const size_t patternLength = pattern.length();
-    if (patternLength == 0)
-    {
-        return true;
-    }
-    if (str.length() < patternLength)
-    {
-        return false;
-    }
-
-    const wstring::value_type firstPatternLetter = towlower(pattern[0]);
-    const size_t n = str.length() - patternLength + 1;
-    for (size_t i = 0; i < n; ++i)
-    {
-        bool match = true;
-        for (size_t j = 0; j < patternLength; ++j)
-        {
-            if (towlower(str[i + j]) != towlower(pattern[j]))
-            {
-                match = false;
-                break;
-            }
-        }
-        if (match)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool StringHelpers::MatchesWildcards(const string& str, const string& wildcards)
-{
-    using namespace CryStringUtils_Internal;
-    return MatchesWildcards_Tpl<SCharComparatorCaseSensitive>(str.c_str(), wildcards.c_str());
-}
-
-bool StringHelpers::MatchesWildcards(const wstring& str, const wstring& wildcards)
-{
-    using namespace CryStringUtils_Internal;
-    return MatchesWildcards_Tpl<SCharComparatorCaseSensitive>(str.c_str(), wildcards.c_str());
-}
-
-bool StringHelpers::MatchesWildcardsIgnoreCase(const string& str, const string& wildcards)
-{
-    using namespace CryStringUtils_Internal;
-    return MatchesWildcards_Tpl<SCharComparatorCaseInsensitive>(str.c_str(), wildcards.c_str());
-}
-
-bool StringHelpers::MatchesWildcardsIgnoreCase(const wstring& str, const wstring& wildcards)
-{
-    using namespace CryStringUtils_Internal;
-    return MatchesWildcards_Tpl<SCharComparatorCaseInsensitive>(str.c_str(), wildcards.c_str());
-}
-
-
-template <class TS>
-static inline bool MatchesWildcardsIgnoreCaseExt_Tpl(const TS& str, const TS& wildcards, std::vector<TS>& wildcardMatches)
-{
-    const typename TS::value_type* savedStrBegin = 0;
-    const typename TS::value_type* savedStrEnd = 0;
-    const typename TS::value_type* savedWild = 0;
-    size_t savedWildCount = 0;
-
-    const typename TS::value_type* pStr = str.c_str();
-    const typename TS::value_type* pWild = wildcards.c_str();
-    size_t wildCount = 0;
-
-    while ((*pStr) && (*pWild != '*'))
-    {
-        if (*pWild == '?')
-        {
-            wildcardMatches.push_back(TS(pStr, pStr + 1));
-            ++wildCount;
-        }
-        else if (ToLower(*pWild) != ToLower(*pStr))
-        {
-            wildcardMatches.resize(wildcardMatches.size() - wildCount);
-            return false;
-        }
-        ++pWild;
-        ++pStr;
-    }
-
-    while (*pStr)
-    {
-        if (*pWild == '*')
-        {
-            if (!pWild[1])
-            {
-                wildcardMatches.push_back(TS(pStr));
-                return true;
-            }
-            savedWild = pWild++;
-            savedStrBegin = pStr;
-            savedStrEnd = pStr;
-            savedWildCount = wildCount;
-            wildcardMatches.push_back(TS(savedStrBegin, savedStrEnd));
-            ++wildCount;
-        }
-        else if (*pWild == '?')
-        {
-            wildcardMatches.push_back(TS(pStr, pStr + 1));
-            ++wildCount;
-            ++pWild;
-            ++pStr;
-        }
-        else if (ToLower(*pWild) == ToLower(*pStr))
-        {
-            ++pWild;
-            ++pStr;
-        }
-        else
-        {
-            wildcardMatches.resize(wildcardMatches.size() - (wildCount - savedWildCount));
-            wildCount = savedWildCount;
-            ++savedStrEnd;
-            pWild = savedWild + 1;
-            pStr = savedStrEnd;
-            wildcardMatches.push_back(TS(savedStrBegin, savedStrEnd));
-            ++wildCount;
-        }
-    }
-
-    while (*pWild == '*')
-    {
-        ++pWild;
-        wildcardMatches.push_back(TS());
-        ++wildCount;
-    }
-
-    if (*pWild)
-    {
-        wildcardMatches.resize(wildcardMatches.size() - wildCount);
-        return false;
-    }
-
-    return true;
-}
-
-bool StringHelpers::MatchesWildcardsIgnoreCaseExt(const string& str, const string& wildcards, std::vector<string>& wildcardMatches)
-{
-    return MatchesWildcardsIgnoreCaseExt_Tpl(str, wildcards, wildcardMatches);
-}
-
-bool StringHelpers::MatchesWildcardsIgnoreCaseExt(const wstring& str, const wstring& wildcards, std::vector<wstring>& wildcardMatches)
-{
-    return MatchesWildcardsIgnoreCaseExt_Tpl(str, wildcards, wildcardMatches);
-}
-
-
-string StringHelpers::TrimLeft(const string& s)
-{
-    const size_t first = s.find_first_not_of(" \r\t");
-    return (first == s.npos) ? string() : s.substr(first);
-}
-
-wstring StringHelpers::TrimLeft(const wstring& s)
-{
-    const size_t first = s.find_first_not_of(L" \r\t");
-    return (first == s.npos) ? wstring() : s.substr(first);
-}
-
-
-string StringHelpers::TrimRight(const string& s)
-{
-    const size_t last = s.find_last_not_of(" \r\t");
-    return (last == s.npos) ? s : s.substr(0, last + 1);
-}
-
-wstring StringHelpers::TrimRight(const wstring& s)
-{
-    const size_t last = s.find_last_not_of(L" \r\t");
-    return (last == s.npos) ? s : s.substr(0, last + 1);
-}
-
-
-string StringHelpers::Trim(const string& s)
-{
-    return TrimLeft(TrimRight(s));
-}
-
-wstring StringHelpers::Trim(const wstring& s)
-{
-    return TrimLeft(TrimRight(s));
-}
-
-
-template <class TS>
-static inline TS RemoveDuplicateSpaces_Tpl(const TS& s)
-{
-    TS res;
-    bool spaceFound = false;
-
-    for (size_t i = 0, n = s.length(); i < n; ++i)
-    {
-        if ((s[i] == ' ') || (s[i] == '\r') || (s[i] == '\t'))
-        {
-            spaceFound = true;
-        }
-        else
-        {
-            if (spaceFound)
-            {
-                res += ' ';
-                spaceFound = false;
-            }
-            res += s[i];
-        }
-    }
-
-    if (spaceFound)
-    {
-        res += ' ';
-    }
-    return res;
-}
-
-string StringHelpers::RemoveDuplicateSpaces(const string& s)
-{
-    return RemoveDuplicateSpaces_Tpl(s);
-}
-
-wstring StringHelpers::RemoveDuplicateSpaces(const wstring& s)
-{
-    return RemoveDuplicateSpaces_Tpl(s);
-}
-
-
-template <class TS>
-static inline TS MakeLowerCase_Tpl(const TS& s)
-{
-    TS copy;
-    copy.reserve(s.length());
-    for (typename TS::const_iterator it = s.begin(), end = s.end(); it != end; ++it)
-    {
-        copy.append(1, ToLower(*it));
-    }
-    return copy;
-}
-
-string StringHelpers::MakeLowerCase(const string& s)
-{
-    return MakeLowerCase_Tpl(s);
-}
-
-wstring StringHelpers::MakeLowerCase(const wstring& s)
-{
-    return MakeLowerCase_Tpl(s);
-}
-
-
-template <class TS>
-static inline TS MakeUpperCase_Tpl(const TS& s)
-{
-    TS copy;
-    copy.reserve(s.length());
-    for (typename TS::const_iterator it = s.begin(), end = s.end(); it != end; ++it)
-    {
-        copy.append(1, ToUpper(*it));
-    }
-    return copy;
-}
-
-string StringHelpers::MakeUpperCase(const string& s)
-{
-    return MakeUpperCase_Tpl(s);
-}
-
-wstring StringHelpers::MakeUpperCase(const wstring& s)
-{
-    return MakeUpperCase_Tpl(s);
-}
-
-
-template <class TS>
-static inline TS Replace_Tpl(const TS& s, const typename TS::value_type oldChar, const typename TS::value_type newChar)
-{
-    TS copy;
-    copy.reserve(s.length());
-    for (typename TS::const_iterator it = s.begin(), end = s.end(); it != end; ++it)
-    {
-        const typename TS::value_type c = (*it);
-        copy.append(1, ((c == oldChar) ? newChar : c));
-    }
-    return copy;
-}
-
-string StringHelpers::Replace(const string& s, char oldChar, char newChar)
-{
-    return Replace_Tpl(s, oldChar, newChar);
-}
-
-wstring StringHelpers::Replace(const wstring& s, wchar_t oldChar, wchar_t newChar)
-{
-    return Replace_Tpl(s, oldChar, newChar);
-}
-
-
-void StringHelpers::ConvertStringByRef(string& out, const string& in)
-{
-    out = in;
-}
-
-void StringHelpers::ConvertStringByRef(wstring& out, const string& in)
-{
-    Unicode::Convert(out, in);
-}
-
-void StringHelpers::ConvertStringByRef(string& out, const wstring& in)
-{
-    Unicode::Convert(out, in);
-}
-
-void StringHelpers::ConvertStringByRef(wstring& out, const wstring& in)
-{
-    out = in;
-}
-
-
-template <class TS>
-static inline void Split_Tpl(const TS& str, const TS& separator, bool bReturnEmptyPartsToo, std::vector<TS>& outParts)
-{
-    if (str.empty())
-    {
-        return;
-    }
-
-    if (separator.empty())
-    {
-        for (size_t i = 0; i < str.length(); ++i)
-        {
-            outParts.push_back(str.substr(i, 1));
-        }
-        return;
-    }
-
-    size_t partStart = 0;
-
-    for (;; )
-    {
-        const size_t pos = str.find(separator, partStart);
-        if (pos == TS::npos)
-        {
-            break;
-        }
-        if (bReturnEmptyPartsToo || (pos > partStart))
-        {
-            outParts.push_back(str.substr(partStart, pos - partStart));
-        }
-        partStart = pos + separator.length();
-    }
-
-    if (bReturnEmptyPartsToo || (partStart < str.length()))
-    {
-        outParts.push_back(str.substr(partStart, str.length() - partStart));
-    }
-}
-
-
-template <class TS>
-static inline void SplitByAnyOf_Tpl(const TS& str, const TS& separators, bool bReturnEmptyPartsToo, std::vector<TS>& outParts)
-{
-    if (str.empty())
-    {
-        return;
-    }
-
-    if (separators.empty())
-    {
-        for (size_t i = 0; i < str.length(); ++i)
-        {
-            outParts.push_back(str.substr(i, 1));
-        }
-        return;
-    }
-
-    size_t partStart = 0;
-
-    for (;; )
-    {
-        const size_t pos = str.find_first_of(separators, partStart);
-        if (pos == TS::npos)
-        {
-            break;
-        }
-        if (bReturnEmptyPartsToo || (pos > partStart))
-        {
-            outParts.push_back(str.substr(partStart, pos - partStart));
-        }
-        partStart = pos + 1;
-    }
-
-    if (bReturnEmptyPartsToo || (partStart < str.length()))
-    {
-        outParts.push_back(str.substr(partStart, str.length() - partStart));
-    }
-}
-
-
-
-void StringHelpers::Split(const string& str, const string& separator, bool bReturnEmptyPartsToo, std::vector<string>& outParts)
-{
-    Split_Tpl(str, separator, bReturnEmptyPartsToo, outParts);
-}
-
-void StringHelpers::Split(const wstring& str, const wstring& separator, bool bReturnEmptyPartsToo, std::vector<wstring>& outParts)
-{
-    Split_Tpl(str, separator, bReturnEmptyPartsToo, outParts);
-}
-
-
-void StringHelpers::SplitByAnyOf(const string& str, const string& separators, bool bReturnEmptyPartsToo, std::vector<string>& outParts)
-{
-    SplitByAnyOf_Tpl(str, separators, bReturnEmptyPartsToo, outParts);
-}
-
-void StringHelpers::SplitByAnyOf(const wstring& str, const wstring& separators, bool bReturnEmptyPartsToo, std::vector<wstring>& outParts)
-{
-    SplitByAnyOf_Tpl(str, separators, bReturnEmptyPartsToo, outParts);
-}
-
-
-template <class TS>
-static inline TS FormatVA_Tpl(const typename TS::value_type* const format, va_list parg)
-{
-    if ((format == 0) || (format[0] == 0))
-    {
-        return TS();
-    }
-
-    std::vector<typename TS::value_type> bf;
-    size_t capacity = 0;
-
-    size_t wantedCapacity = Vscprintf(format, parg);
-    wantedCapacity += 2;  // '+ 2' to prevent uncertainty when Vsnprintf_s() returns 'size - 1'
-
-    for (;; )
-    {
-        if (wantedCapacity > capacity)
-        {
-            capacity = wantedCapacity;
-            bf.resize(capacity + 1);
-        }
-
-        const int countWritten = Vsnprintf_s(&bf[0], capacity + 1, _TRUNCATE, format, parg);
-
-        if ((countWritten >= 0) && (capacity > (size_t)countWritten + 1))
-        {
-            bf[countWritten] = 0;
-            return TS(&bf[0]);
-        }
-
-        wantedCapacity = capacity * 2;
-    }
-}
-
-string StringHelpers::FormatVA(const char* const format, va_list parg)
-{
-    return FormatVA_Tpl<string>(format, parg);
-}
-
-wstring StringHelpers::FormatVA(const wchar_t* const format, va_list parg)
-{
-    return FormatVA_Tpl<wstring>(format, parg);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-template <class TC>
-static inline void SafeCopy_Tpl(TC* const pDstBuffer, const size_t dstBufferSizeInBytes, const TC* const pSrc)
-{
-    if (dstBufferSizeInBytes >= sizeof(TC))
-    {
-        const size_t n = dstBufferSizeInBytes / sizeof(TC) - 1;
-        size_t i;
-        for (i = 0; i < n && pSrc[i]; ++i)
-        {
-            pDstBuffer[i] = pSrc[i];
-        }
-        pDstBuffer[i] = 0;
-    }
-}
-
-template <class TC>
-static inline void SafeCopyPadZeros_Tpl(TC* const pDstBuffer, const size_t dstBufferSizeInBytes, const TC* const pSrc)
-{
-    if (dstBufferSizeInBytes > 0)
-    {
-        const size_t n = (dstBufferSizeInBytes < sizeof(TC)) ? 0 : dstBufferSizeInBytes / sizeof(TC) - 1;
-        size_t i;
-        for (i = 0; i < n && pSrc[i]; ++i)
-        {
-            pDstBuffer[i] = pSrc[i];
-        }
-        memset(&pDstBuffer[i], 0, dstBufferSizeInBytes - i * sizeof(TC));
-    }
-}
-
-
-void StringHelpers::SafeCopy(char* const pDstBuffer, const size_t dstBufferSizeInBytes, const char* const pSrc)
-{
-    SafeCopy_Tpl<char>(pDstBuffer, dstBufferSizeInBytes, pSrc);
-}
-
-void StringHelpers::SafeCopy(wchar_t* const pDstBuffer, const size_t dstBufferSizeInBytes, const wchar_t* const pSrc)
-{
-    SafeCopy_Tpl<wchar_t>(pDstBuffer, dstBufferSizeInBytes, pSrc);
-}
-
-
-void StringHelpers::SafeCopyPadZeros(char* const pDstBuffer, const size_t dstBufferSizeInBytes, const char* const pSrc)
-{
-    SafeCopyPadZeros_Tpl<char>(pDstBuffer, dstBufferSizeInBytes, pSrc);
-}
-
-void StringHelpers::SafeCopyPadZeros(wchar_t* const pDstBuffer, const size_t dstBufferSizeInBytes, const wchar_t* const pSrc)
-{
-    SafeCopyPadZeros_Tpl<wchar_t>(pDstBuffer, dstBufferSizeInBytes, pSrc);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-bool StringHelpers::Utf16ContainsAsciiOnly(const wchar_t* wstr)
-{
-    while (*wstr)
-    {
-        if (*wstr > 127 || *wstr < 0)
-        {
-            return false;
-        }
-        ++wstr;
-    }
-    return true;
-}
-
-
-string StringHelpers::ConvertAsciiUtf16ToAscii(const wchar_t* wstr)
-{
-    const size_t len = wcslen(wstr);
-
-    string result;
-    result.reserve(len);
-
-    for (size_t i = 0; i < len; ++i)
-    {
-        result.push_back(wstr[i] & 0x7F);
-    }
-
-    return result;
-}
-
-
-wstring StringHelpers::ConvertAsciiToUtf16(const char* str)
-{
-    const size_t len = strlen(str);
-
-    wstring result;
-    result.reserve(len);
-
-    for (size_t i = 0; i < len; ++i)
-    {
-        result.push_back(str[i] & 0x7F);
-    }
-
-    return result;
-}
-
-#if defined(AZ_PLATFORM_WINDOWS)
-static string ConvertUtf16ToMultibyte(const wchar_t* wstr, uint codePage, char badChar)
-{
-    if (wstr[0] == 0)
-    {
-        return string();
-    }
-
-    const int len = aznumeric_caster(wcslen(wstr));
-
-    // Request needed buffer size, in bytes
-    int neededByteCount = WideCharToMultiByte(
-            codePage,
-            0,
-            wstr,
-            len,
-            0,
-            0,
-            ((badChar && codePage != CP_UTF8) ? &badChar : NULL),
-            NULL);
-    if (neededByteCount <= 0)
-    {
-        return string();
-    }
-    ++neededByteCount; // extra space for terminating zero
-
-    std::vector<char> buffer(neededByteCount);
-
-    const int byteCount = WideCharToMultiByte(
-            codePage,
-            0,
-            wstr,
-            len,
-            &buffer[0], // output buffer
-            neededByteCount - 1, // size of the output buffer in bytes
-            ((badChar && codePage != CP_UTF8) ? &badChar : NULL),
-            NULL);
-    if (byteCount != neededByteCount - 1)
-    {
-        return string();
-    }
-
-    buffer[byteCount] = 0;
-
-    return string(&buffer[0]);
-}
-
-
-static wstring ConvertMultibyteToUtf16(const char* str, uint codePage)
-{
-    if (str[0] == 0)
-    {
-        return wstring();
-    }
-
-    const int len = aznumeric_caster(strlen(str));
-
-    // Request needed buffer size, in characters
-    int neededCharCount = MultiByteToWideChar(
-            codePage,
-            0,
-            str,
-            len,
-            0,
-            0);
-    if (neededCharCount <= 0)
-    {
-        return wstring();
-    }
-    ++neededCharCount; // extra space for terminating zero
-
-    std::vector<wchar_t> wbuffer(neededCharCount);
-
-    const int charCount = MultiByteToWideChar(
-            codePage,
-            0,
-            str,
-            len,
-            &wbuffer[0], // output buffer
-            neededCharCount - 1); // size of the output buffer in characters
-    if (charCount != neededCharCount - 1)
-    {
-        return wstring();
-    }
-
-    wbuffer[charCount] = 0;
-
-    return wstring(&wbuffer[0]);
-}
-
-
-wstring StringHelpers::ConvertUtf8ToUtf16(const char* str)
-{
-    return ConvertMultibyteToUtf16(str, CP_UTF8);
-}
-
-
-string StringHelpers::ConvertUtf16ToUtf8(const wchar_t* wstr)
-{
-    return ConvertUtf16ToMultibyte(wstr, CP_UTF8, 0);
-}
-
-
-wstring StringHelpers::ConvertAnsiToUtf16(const char* str)
-{
-    return ConvertMultibyteToUtf16(str, CP_ACP);
-}
-
-
-string StringHelpers::ConvertUtf16ToAnsi(const wchar_t* wstr, char badChar)
-{
-    return ConvertUtf16ToMultibyte(wstr, CP_ACP, badChar);
-}
-#endif  //AZ_PLATFORM_WINDOWS
-
-string StringHelpers::ConvertAnsiToAscii(const char* str, char badChar)
-{
-    const size_t len = strlen(str);
-
-    string result;
-    result.reserve(len);
-
-    for (size_t i = 0; i < len; ++i)
-    {
-        char c = str[i];
-        if (c < 0 || c > 127)
-        {
-            c = badChar;
-        }
-        result.push_back(c);
-    }
-
-    return result;
-}
-
-// eof
diff --git a/Code/Sandbox/Editor/Util/StringHelpers.h b/Code/Sandbox/Editor/Util/StringHelpers.h
deleted file mode 100644
index e0eb8550a3..0000000000
--- a/Code/Sandbox/Editor/Util/StringHelpers.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMONTOOLS_STRINGHELPERS_H
-#define CRYINCLUDE_CRYCOMMONTOOLS_STRINGHELPERS_H
-#pragma once
-
-#include <CryString.h>
-
-namespace StringHelpers
-{
-    // compares two strings to see if they are the same or different, case sensitive
-    // returns 0 if the strings are the same, a -1 if the first string is bigger, or a 1 if the second string is bigger
-    int Compare(const string& str0, const string& str1);
-    int Compare(const wstring& str0, const wstring& str1);
-
-    // compares two strings to see if they are the same or different, case is ignored
-    // returns 0 if the strings are the same, a -1 if the first string is bigger, or a 1 if the second string is bigger
-    int CompareIgnoreCase(const string& str0, const string& str1);
-    int CompareIgnoreCase(const wstring& str0, const wstring& str1);
-
-    // compares two strings to see if they are the same, case senstive
-    // returns true if they are the same or false if they are different
-    bool Equals(const string& str0, const string& str1);
-    bool Equals(const wstring& str0, const wstring& str1);
-
-    // compares two strings to see if they are the same, case is ignored
-    // returns true if they are the same or false if they are different
-    bool EqualsIgnoreCase(const string& str0, const string& str1);
-    bool EqualsIgnoreCase(const wstring& str0, const wstring& str1);
-
-    // checks to see if a string starts with a specified string, case sensitive
-    // returns true if the string does start with a specified string or false if it does not
-    bool StartsWith(const string& str, const string& pattern);
-    bool StartsWith(const wstring& str, const wstring& pattern);
-
-    // checks to see if a string starts with a specified string, case is ignored
-    // returns true if the string does start with a specified string or false if it does not
-    bool StartsWithIgnoreCase(const string& str, const string& pattern);
-    bool StartsWithIgnoreCase(const wstring& str, const wstring& pattern);
-
-    // checks to see if a string ends with a specified string, case sensitive
-    // returns true if the string does end with a specified string or false if it does not
-    bool EndsWith(const string& str, const string& pattern);
-    bool EndsWith(const wstring& str, const wstring& pattern);
-
-    // checks to see if a string ends with a specified string, case is ignored
-    // returns true if the string does end with a specified string or false if it does not
-    bool EndsWithIgnoreCase(const string& str, const string& pattern);
-    bool EndsWithIgnoreCase(const wstring& str, const wstring& pattern);
-
-    // checks to see if a string contains a specified string, case sensitive
-    // returns true if the string does contain the specified string or false if it does not
-    bool Contains(const string& str, const string& pattern);
-    bool Contains(const wstring& str, const wstring& pattern);
-
-    // checks to see if a string contains a specified string, case is ignored
-    // returns true if the string does contain the specified string or false if it does not
-    bool ContainsIgnoreCase(const string& str, const string& pattern);
-    bool ContainsIgnoreCase(const wstring& str, const wstring& pattern);
-
-    // checks to see if a string contains a wildcard string pattern, case sensitive
-    // returns true if the string does match the wildcard string pattern or false if it does not
-    bool MatchesWildcards(const string& str, const string& wildcards);
-    bool MatchesWildcards(const wstring& str, const wstring& wildcards);
-
-    // checks to see if a string contains a wildcard string pattern, case is ignored
-    // returns true if the string does match the wildcard string pattern or false if it does not
-    bool MatchesWildcardsIgnoreCase(const string& str, const string& wildcards);
-    bool MatchesWildcardsIgnoreCase(const wstring& str, const wstring& wildcards);
-
-    bool MatchesWildcardsIgnoreCaseExt(const string& str, const string& wildcards, std::vector<string>& wildcardMatches);
-    bool MatchesWildcardsIgnoreCaseExt(const wstring& str, const wstring& wildcards, std::vector<wstring>& wildcardMatches);
-
-    string TrimLeft(const string& s);
-    wstring TrimLeft(const wstring& s);
-
-    string TrimRight(const string& s);
-    wstring TrimRight(const wstring& s);
-
-    string Trim(const string& s);
-    wstring Trim(const wstring& s);
-
-    string RemoveDuplicateSpaces(const string& s);
-    wstring RemoveDuplicateSpaces(const wstring& s);
-
-    // converts a string with upper case characters to be all lower case
-    // returns the string in all lower case
-    string MakeLowerCase(const string& s);
-    wstring MakeLowerCase(const wstring& s);
-
-    // converts a string with lower case characters to be all upper case
-    // returns the string in all upper case
-    string MakeUpperCase(const string& s);
-    wstring MakeUpperCase(const wstring& s);
-
-    // replace a specified character in a string with a specified replacement character
-    // returns string with specified character replaced
-    string Replace(const string& s, char oldChar, char newChar);
-    wstring Replace(const wstring& s, wchar_t oldChar, wchar_t newChar);
-
-    void ConvertStringByRef(string& out, const string& in);
-    void ConvertStringByRef(wstring& out, const string& in);
-    void ConvertStringByRef(string& out, const wstring& in);
-    void ConvertStringByRef(wstring& out, const wstring& in);
-
-    template <typename O, typename I>
-    O ConvertString(const I& in)
-    {
-        O out;
-        ConvertStringByRef(out, in);
-        return out;
-    }
-    
-    void Split(const string& str, const string& separator, bool bReturnEmptyPartsToo, std::vector<string>& outParts);
-    void Split(const wstring& str, const wstring& separator, bool bReturnEmptyPartsToo, std::vector<wstring>& outParts);
-
-    void SplitByAnyOf(const string& str, const string& separators, bool bReturnEmptyPartsToo, std::vector<string>& outParts);
-    void SplitByAnyOf(const wstring& str, const wstring& separators, bool bReturnEmptyPartsToo, std::vector<wstring>& outParts);
-
-    string FormatVA(const char* const format, va_list parg);
-    wstring FormatVA(const wchar_t* const format, va_list parg);
-
-    inline string Format(const char* const format, ...)
-    {
-        if ((format == 0) || (format[0] == 0))
-        {
-            return string();
-        }
-        va_list parg;
-        va_start(parg, format);
-        const string result = FormatVA(format, parg);
-        va_end(parg);
-        return result;
-    }
-
-    inline wstring Format(const wchar_t* const format, ...)
-    {
-        if ((format == 0) || (format[0] == 0))
-        {
-            return wstring();
-        }
-        va_list parg;
-        va_start(parg, format);
-        const wstring result = FormatVA(format, parg);
-        va_end(parg);
-        return result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void SafeCopy(char* const pDstBuffer, const size_t dstBufferSizeInBytes, const char* const pSrc);
-    void SafeCopy(wchar_t* const pDstBuffer, const size_t dstBufferSizeInBytes, const wchar_t* const pSrc);
-
-    void SafeCopyPadZeros(char* const pDstBuffer, const size_t dstBufferSizeInBytes, const char* const pSrc);
-    void SafeCopyPadZeros(wchar_t* const pDstBuffer, const size_t dstBufferSizeInBytes, const wchar_t* const pSrc);
-
-    //////////////////////////////////////////////////////////////////////////
-
-    // ASCII
-    // ANSI (system default Windows ANSI code page)
-    // UTF-8
-    // UTF-16
-
-    // ASCII -> UTF-16
-
-    bool Utf16ContainsAsciiOnly(const wchar_t* wstr);
-    string ConvertAsciiUtf16ToAscii(const wchar_t* wstr);
-    wstring ConvertAsciiToUtf16(const char* str);
-
-    // UTF-8 <-> UTF-16
-#if defined(AZ_PLATFORM_WINDOWS)
-    wstring ConvertUtf8ToUtf16(const char* str);
-    string ConvertUtf16ToUtf8(const wchar_t* wstr);
-
-    inline string ConvertUtfToUtf8(const char* str)
-    {
-        return string(str);
-    }
-
-    inline string ConvertUtfToUtf8(const wchar_t* wstr)
-    {
-        return ConvertUtf16ToUtf8(wstr);
-    }
-
-    inline wstring ConvertUtfToUtf16(const char* str)
-    {
-        return ConvertUtf8ToUtf16(str);
-    }
-
-    inline wstring ConvertUtfToUtf16(const wchar_t* wstr)
-    {
-        return wstring(wstr);
-    }
-
-    // ANSI <-> UTF-8, UTF-16
-
-    wstring ConvertAnsiToUtf16(const char* str);
-    string ConvertUtf16ToAnsi(const wchar_t* wstr, char badChar);
-
-    inline string ConvertAnsiToUtf8(const char* str)
-    {
-        return ConvertUtf16ToUtf8(ConvertAnsiToUtf16(str).c_str());
-    }
-    inline string ConvertUtf8ToAnsi(const char* str, char badChar)
-    {
-        return ConvertUtf16ToAnsi(ConvertUtf8ToUtf16(str).c_str(), badChar);
-    }
-#endif
-
-    // ANSI -> ASCII
-    string ConvertAnsiToAscii(const char* str, char badChar);
-}
-#endif // CRYINCLUDE_CRYCOMMONTOOLS_STRINGHELPERS_H
diff --git a/Code/Sandbox/Editor/Util/StringNoCasePredicate.h b/Code/Sandbox/Editor/Util/StringNoCasePredicate.h
deleted file mode 100644
index d6fd46e25a..0000000000
--- a/Code/Sandbox/Editor/Util/StringNoCasePredicate.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Utility class to help in STL algorithms on containers with
-//               CStrings when intending to use case insensitive searches or sorting for
-//               example.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_STRINGNOCASEPREDICATE_H
-#define CRYINCLUDE_EDITOR_UTIL_STRINGNOCASEPREDICATE_H
-#pragma once
-
-/*
-Utility class to help in STL algorithms on containers with CStrings
-when intending to use case insensitive searches or sorting for example.
-
-e.g.
-std::vector< CString > v;
-...
-std::sort( v.begin(), v.end(), CStringNoCasePredicate::LessThan() );
-std::find_if( v.begin(), v.end(), CStringNoCasePredicate::Equal( stringImLookingFor ) );
-*/
-class CStringNoCasePredicate
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    struct Equal
-    {
-        Equal(const QString& referenceString)
-            : m_referenceString(referenceString)
-        {
-        }
-
-        bool operator() (const QString& arg) const
-        {
-            return (m_referenceString.compare(arg, Qt::CaseInsensitive) == 0);
-        }
-
-    private:
-        const QString& m_referenceString;
-    };
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    struct LessThan
-    {
-        bool operator() (const QString& arg1, const QString& arg2) const
-        {
-            return (arg1.CompareNoCase(arg2) < 0);
-        }
-    };
-    //////////////////////////////////////////////////////////////////////////
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_STRINGNOCASEPREDICATE_H
diff --git a/Code/Sandbox/Editor/Util/TRefCountBase.h b/Code/Sandbox/Editor/Util/TRefCountBase.h
deleted file mode 100644
index bcd7f44fbd..0000000000
--- a/Code/Sandbox/Editor/Util/TRefCountBase.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Reference counted base object.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_TREFCOUNTBASE_H
-#define CRYINCLUDE_EDITOR_UTIL_TREFCOUNTBASE_H
-#pragma once
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-//////////////////////////////////////////////////////////////////////////
-//! Derive from this class to get reference counting for your class.
-//////////////////////////////////////////////////////////////////////////
-template <class ParentClass>
-class CRYEDIT_API TRefCountBase
-    : public ParentClass
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    TRefCountBase() { m_nRefCount = 0; };
-
-    //! Add new refrence to this object.
-    unsigned long AddRef()
-    {
-        m_nRefCount++;
-        return m_nRefCount;
-    };
-
-    //! Release refrence to this object.
-    //! when reference count reaches zero, object is deleted.
-    unsigned long Release()
-    {
-        int refs = --m_nRefCount;
-        if (m_nRefCount <= 0)
-        {
-            delete this;
-        }
-        return refs;
-    }
-
-protected:
-    virtual ~TRefCountBase() {};
-
-private:
-    int m_nRefCount;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_TREFCOUNTBASE_H
diff --git a/Code/Sandbox/Editor/Util/Triangulate.cpp b/Code/Sandbox/Editor/Util/Triangulate.cpp
deleted file mode 100644
index ba533c8d56..0000000000
--- a/Code/Sandbox/Editor/Util/Triangulate.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "Triangulate.h"
-
-// this file is essentially a wrapper for a portion of the MIT-licenced
-// ConvexDecomposition library by John W. Ratcliff mailto:jratcliffscarab@gmail.com.
-// it contains no code from that library, it just provides it with the required types, then includes the
-// portion we need.
-
-static const float TRIANGULATION_EPSILON = 0.0000000001f;
-
-#define MEMALLOC_MALLOC malloc
-#define MEMALLOC_FREE free
-
-namespace TriInternal
-{
-    class TVec;
-    typedef double NxF64;
-    typedef float NxF32;
-    typedef unsigned char NxU8;
-    typedef unsigned int NxU32;
-    typedef int NxI32;
-    typedef unsigned int TU32;
-
-    typedef std::vector< TVec >  TVecVector;
-    typedef std::vector< NxU32 >  TU32Vector;
-    #include "Contrib/NvFloatMath.inl"
-}
-
-#undef MEMALLOC_MALLOC
-#undef MEMALLOC_FREE
-
-namespace Triangulator
-{
-    // given the contour of a triangle, triangulate it, and return the result
-    // as a set of triangles
-    // return false if you fail to triangulate it.
-    bool Triangulate(const VectorOfVectors& contour, VectorOfVectors& result)
-    {
-        TriInternal::CTriangulator tri;
-        for (auto pt : contour)
-        {
-            tri.addPoint(pt.x, pt.y, pt.z);
-        }
-        TriInternal::NxU32 tricount = 0;
-        TriInternal::NxU32* indices = tri.triangulate(tricount, TRIANGULATION_EPSILON);
-        if (!indices)
-        {
-            return false;
-        }
-
-        for (TriInternal::NxU32 currentIdx = 0; currentIdx < tricount * 3; ++currentIdx)
-        {
-            TriInternal::NxU32 indexValue = *indices++;
-            result.push_back(contour[indexValue]);
-        }
-
-        return result.size() > 2;
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/Triangulate.h b/Code/Sandbox/Editor/Util/Triangulate.h
deleted file mode 100644
index 6ac05fed3e..0000000000
--- a/Code/Sandbox/Editor/Util/Triangulate.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_TRIANGULATE_H
-#define CRYINCLUDE_EDITOR_UTIL_TRIANGULATE_H
-#pragma once
-
-#include <vector>
-#include "Cry_Vector3.h"
-
-// you pass in a vector of vec3 (the contour of a shape) and it outputs a vector of vec3 (being the triangles)
-
-namespace Triangulator
-{
-    typedef std::vector< Vec3 > VectorOfVectors;
-    bool Triangulate(const VectorOfVectors& contour, VectorOfVectors& result);
-};
-
-
-#endif
diff --git a/Code/Sandbox/Editor/Util/UIEnumerations.cpp b/Code/Sandbox/Editor/Util/UIEnumerations.cpp
deleted file mode 100644
index ebd4952ad1..0000000000
--- a/Code/Sandbox/Editor/Util/UIEnumerations.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : This file implements the container for the assotiaon of
-//               enumeration name to enumeration values
-
-
-#include "EditorDefs.h"
-
-#include "UIEnumerations.h"
-
-//////////////////////////////////////////////////////////////////////////
-CUIEnumerations& CUIEnumerations::GetUIEnumerationsInstance()
-{
-    static CUIEnumerations  oGeneralProxy;
-    return oGeneralProxy;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CUIEnumerations::TDValuesContainer& CUIEnumerations::GetStandardNameContainer()
-{
-    static TDValuesContainer    cValuesContainer;
-    static bool                             boInit(false);
-
-    if (!boInit)
-    {
-        boInit = true;
-
-        XmlNodeRef                          oRootNode;
-        XmlNodeRef                          oEnumaration;
-        XmlNodeRef                          oEnumerationItem;
-
-        int                                         nNumberOfEnumarations(0);
-        int                                         nCurrentEnumaration(0);
-
-        int                                         nNumberOfEnumerationItems(0);
-        int                                         nCurrentEnumarationItem(0);
-
-        oRootNode = GetISystem()->GetXmlUtils()->LoadXmlFromFile("Editor\\PropertyEnumerations.xml");
-        nNumberOfEnumarations = oRootNode ? oRootNode->getChildCount() : 0;
-
-        for (nCurrentEnumaration = 0; nCurrentEnumaration < nNumberOfEnumarations; ++nCurrentEnumaration)
-        {
-            TDValues    cValues;
-            oEnumaration = oRootNode->getChild(nCurrentEnumaration);
-
-            nNumberOfEnumerationItems = oEnumaration->getChildCount();
-            for (nCurrentEnumarationItem = 0; nCurrentEnumarationItem < nNumberOfEnumerationItems; ++nCurrentEnumarationItem)
-            {
-                oEnumerationItem = oEnumaration->getChild(nCurrentEnumarationItem);
-
-                const char* szKey(NULL);
-                const char* szValue(NULL);
-                oEnumerationItem->getAttributeByIndex(0, &szKey, &szValue);
-
-                cValues.push_back(szValue);
-            }
-
-            const char* szKey(NULL);
-            const char* szValue(NULL);
-            oEnumaration->getAttributeByIndex(0, &szKey, &szValue);
-
-            cValuesContainer.insert(TDValuesContainer::value_type(szValue, cValues));
-        }
-    }
-
-    return cValuesContainer;
-}
-//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Sandbox/Editor/Util/UIEnumerations.h b/Code/Sandbox/Editor/Util/UIEnumerations.h
deleted file mode 100644
index e6346d8c0e..0000000000
--- a/Code/Sandbox/Editor/Util/UIEnumerations.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : This file declares the container for the assotiaon of
-//               enumeration name to enumeration values
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_UIENUMERATIONS_H
-#define CRYINCLUDE_EDITOR_UTIL_UIENUMERATIONS_H
-#pragma once
-
-
-class CUIEnumerations
-{
-public:
-    // For XML standard values.
-    typedef QStringList                    TDValues;
-    typedef std::map<QString, TDValues>      TDValuesContainer;
-protected:
-private:
-
-public:
-    static CUIEnumerations& GetUIEnumerationsInstance();
-
-    TDValuesContainer&      GetStandardNameContainer();
-protected:
-private:
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_UIENUMERATIONS_H
diff --git a/Code/Sandbox/Editor/Util/UndoUtil.cpp b/Code/Sandbox/Editor/Util/UndoUtil.cpp
deleted file mode 100644
index b474afb8e5..0000000000
--- a/Code/Sandbox/Editor/Util/UndoUtil.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "UndoUtil.h"
-#include "Include/EditorCoreAPI.h"
-
-CUndo::CUndo(const char* description)
-    : m_bCancelled(false)
-{
-    if (!IsRecording())
-    {
-        GetIEditor()->BeginUndo();
-        azstrncpy(m_description, scDescSize, description, scDescSize);
-        m_description[scDescSize - 1] = '\0';
-        m_bStartedRecord = true;
-    }
-    else
-    {
-        m_bStartedRecord = false;
-    }
-};
-
-CUndo::~CUndo()
-{
-    if (m_bStartedRecord)
-    {
-        if (m_bCancelled)
-        {
-            GetIEditor()->CancelUndo();
-        }
-        else
-        {
-            GetIEditor()->AcceptUndo(m_description);
-        }
-    }
-};
-
-bool CUndo::IsRecording()
-{
-    if (IEditor* editor = GetIEditor())
-    {
-        return editor->IsUndoRecording();
-    }
-
-    return false;
-}
-
-bool CUndo::IsSuspended()
-{
-    if (IEditor* editor = GetIEditor())
-    {
-        return editor->IsUndoSuspended();
-    }
-
-    return false;
-}
-
-void CUndo::Record(IUndoObject* undo)
-{
-    if (IEditor* editor = GetIEditor())
-    {
-        editor->RecordUndo(undo);
-    }
-}
-
-CUndoSuspend::CUndoSuspend()
-{
-    if (IEditor* editor = GetIEditor())
-    {
-        editor->SuspendUndo();
-    }
-};
-
-CUndoSuspend::~CUndoSuspend()
-{
-    if (IEditor* editor = GetIEditor())
-    {
-        editor->ResumeUndo();
-    }
-};
diff --git a/Code/Sandbox/Editor/Util/UndoUtil.h b/Code/Sandbox/Editor/Util/UndoUtil.h
deleted file mode 100644
index 4a04d931e8..0000000000
--- a/Code/Sandbox/Editor/Util/UndoUtil.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_CORE_UTIL_UNDO_UTIL_H
-#define CRYINCLUDE_EDITOR_CORE_UTIL_UNDO_UTIL_H
-#pragma once
-
-#include "Include/EditorCoreAPI.h"
-
-struct IUndoObject;
-class EDITOR_CORE_API CUndo
-{
-public:
-    CUndo(const char* description);
-
-    ~CUndo();
-
-    void Cancel() { m_bCancelled = true; }
-
-    //! Check if undo is recording.
-    static bool IsRecording();
-
-    //! Check if undo is suspended.
-    static bool IsSuspended();
-
-    //! Record specified object.
-    static void Record(IUndoObject* undo);
-
-private:
-    static const uint32 scDescSize = 256;
-    char m_description[scDescSize];
-    bool m_bCancelled;
-    bool m_bStartedRecord;
-};
-
-//! CUndoSuspend is a utility undo class
-//! Define instance of this class in block of code where you want to suspend undo operations
-class EDITOR_CORE_API CUndoSuspend
-{
-public:
-    CUndoSuspend();
-
-    ~CUndoSuspend();
-};
-
-#endif // CRYINCLUDE_EDITOR_CORE_UTIL_UNDO_UTIL_H
diff --git a/Code/Sandbox/Editor/Util/Util.h b/Code/Sandbox/Editor/Util/Util.h
deleted file mode 100644
index a096160ec5..0000000000
--- a/Code/Sandbox/Editor/Util/Util.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMONTOOLS_UTIL_H
-#define CRYINCLUDE_CRYCOMMONTOOLS_UTIL_H
-#pragma once
-
-
-#include <cstring>  // memset()
-
-#ifndef BIT
-#define BIT(x) (1 << (x))
-#endif
-
-
-union IntOrPtr
-{
-    int m_int;
-    unsigned int m_uint;
-    void* m_pVoid;
-    char* m_pChar;
-
-    void setZero()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    bool operator==(const IntOrPtr& a) const
-    {
-        return memcmp(this, &a, sizeof(*this)) == 0;
-    }
-
-    bool operator!=(const IntOrPtr& a) const
-    {
-        return memcmp(this, &a, sizeof(*this)) != 0;
-    }
-};
-
-
-namespace Util
-{
-    // note: names 'getMin' and 'getMax' (instead of usual 'min' and 'max') are
-    // used to avoid conflicts with global and/or user's #define of 'min' and 'max'
-
-    template<class T>
-    inline const T& getMin(const T& a, const T& b)
-    {
-        return (a < b) ? a : b;
-    }
-
-    template<class T>
-    inline const T& getMax(const T& a, const T& b)
-    {
-        return (a < b) ? b : a;
-    }
-
-    template<class T>
-    inline const T& getMin(const T& a, const T& b, const T& c)
-    {
-        return (a < b)
-               ? ((a < c) ? a : c)
-               : ((b < c) ? b : c);
-    }
-
-    template<class T>
-    inline const T& getMax(const T& a, const T& b, const T& c)
-    {
-        return (a < b)
-               ? ((b < c) ? c : b)
-               : ((a < c) ? c : a);
-    }
-
-
-    template<class T>
-    inline const T& getClamped(const T& a, const T& a_min, const T& a_max)
-    {
-        if (a < a_min)
-        {
-            return a_min;
-        }
-        if (a_max < a)
-        {
-            return a_max;
-        }
-        return a;
-    }
-
-    // note: name 'clampMinMax' (instead of usual 'clamp') is used
-    // to avoid conflicts with global and/or user's #define of 'clamp'
-    template<class T>
-    inline void clampMinMax(T& a, const T& a_min, const T& a_max)
-    {
-        if (a < a_min)
-        {
-            a = a_min;
-        }
-        else if (a_max < a)
-        {
-            a = a_max;
-        }
-    }
-
-    template<class T>
-    inline void clampMin(T& a, const T& a_min)
-    {
-        if (a < a_min)
-        {
-            a = a_min;
-        }
-    }
-
-    template<class T>
-    inline void clampMax(T& a, const T& a_max)
-    {
-        if (a_max < a)
-        {
-            a = a_max;
-        }
-    }
-
-
-    template <class TInteger>
-    inline bool isPowerOfTwo(TInteger x)
-    {
-        return (x & (x - 1)) == 0;
-    }
-
-
-    template <class TInteger>
-    inline TInteger getCeiledPowerOfTwo(TInteger x)
-    {
-        x = x - 1;
-
-#pragma warning(push)
-#pragma warning(disable : 4293)
-        if (sizeof(TInteger) > 0)
-        {
-            x |= x >> 1;
-        }
-        if (sizeof(TInteger) > 0)
-        {
-            x |= x >> 2;
-        }
-        if (sizeof(TInteger) > 0)
-        {
-            x |= x >> 4;
-        }
-        if (sizeof(TInteger) > 1)
-        {
-            x |= x >> 8;
-        }
-        if (sizeof(TInteger) > 2)
-        {
-            x |= x >> 16;
-        }
-        if (sizeof(TInteger) > 4)
-        {
-            x |= x >> 32;
-        }
-#pragma warning(pop)
-
-        return x + 1;
-    }
-
-
-    template <class TInteger>
-    inline TInteger getFlooredPowerOfTwo(TInteger x)
-    {
-        if (!isPowerOfTwo(x))
-        {
-            x = getCeiledPowerOfTwo(x) >> 1;
-        }
-
-        return x;
-    }
-
-
-    template <class T>
-    inline T square(T x)
-    {
-        return x * x;
-    }
-
-
-    template <class T>
-    inline T cube(T x)
-    {
-        return x * x * x;
-    }
-} // namespace Util
-
-#endif // CRYINCLUDE_CRYCOMMONTOOLS_UTIL_H
diff --git a/Code/Sandbox/Editor/Util/Variable.cpp b/Code/Sandbox/Editor/Util/Variable.cpp
deleted file mode 100644
index 07e372556e..0000000000
--- a/Code/Sandbox/Editor/Util/Variable.cpp
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "Variable.h"
-#include "UIEnumsDatabase.h"
-
-#include "UsedResources.h"              // for CUsedResources
-
-//////////////////////////////////////////////////////////////////////////
-CVarBlock* CVarBlock::Clone(bool bRecursive) const
-{
-    CVarBlock* vb = new CVarBlock;
-    for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-    {
-        IVariable* var = *it;
-        vb->AddVariable(var->Clone(bRecursive));
-    }
-    return vb;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::CopyValues(const CVarBlock* fromVarBlock)
-{
-    // Copy all variables.
-    int numSrc = fromVarBlock->GetNumVariables();
-    int numTrg = GetNumVariables();
-    for (int i = 0; i < numSrc && i < numTrg; i++)
-    {
-        GetVariable(i)->CopyValue(fromVarBlock->GetVariable(i));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::CopyValuesByName(CVarBlock* fromVarBlock)
-{
-    // Copy values using saving and loading to/from xml.
-    XmlNodeRef node = XmlHelpers::CreateXmlNode("Temp");
-    fromVarBlock->Serialize(node, false);
-    Serialize(node, true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::OnSetValues()
-{
-    for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-    {
-        IVariable* var = *it;
-        var->OnSetValue(true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::SetRecreateSplines()
-{
-    for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-    {
-        IVariable* var = *it;
-        var->SetFlagRecursive(IVariable::UI_CREATE_SPLINE);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::AddVariable(IVariable* var)
-{
-    //assert( !strstr(var->GetName(), " ") ); // spaces not allowed because of serialization
-    m_vars.push_back(var);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::AddVariable(IVariable* pVar, const char* varName, unsigned char dataType)
-{
-    if (varName)
-    {
-        pVar->SetName(varName);
-    }
-    pVar->SetDataType(dataType);
-    AddVariable(pVar);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::AddVariable(CVariableBase& var, const char* varName, unsigned char dataType)
-{
-    if (varName)
-    {
-        var.SetName(varName);
-    }
-    var.SetDataType(dataType);
-    AddVariable(&var);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CVarBlock::DeleteVariable(IVariable* var, bool bRecursive)
-{
-    bool found = stl::find_and_erase(m_vars, var);
-
-    if (!found && bRecursive)
-    {
-        for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            if ((*it)->DeleteVariable(var, bRecursive))
-            {
-                return true;
-            }
-        }
-    }
-
-    return found;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CVarBlock::IsContainsVariable(IVariable* pVar, bool bRecursive) const
-{
-    for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-    {
-        if (*it == pVar)
-        {
-            return true;
-        }
-    }
-
-    // If not found search childs.
-    if (bRecursive)
-    {
-        // Search all top level variables.
-        for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            if ((*it)->IsContainsVariable(pVar))
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-namespace
-{
-    IVariable* FindVariable(const char* name, bool bRecursive, bool bHumanName, const std::vector<IVariablePtr>& vars)
-    {
-        // Search all top level variables.
-        for (std::vector<IVariablePtr>::const_iterator it = vars.begin(); it != vars.end(); ++it)
-        {
-            IVariable* var = *it;
-            if (bHumanName && QString::compare(var->GetHumanName(), name, Qt::CaseInsensitive) == 0)
-            {
-                return var;
-            }
-            else if (!bHumanName && QString::compare(var->GetName(), name) == 0)
-            {
-                return var;
-            }
-        }
-
-        // If not found search childs.
-        if (bRecursive)
-        {
-            // Search all top level variables.
-            for (std::vector<IVariablePtr>::const_iterator it = vars.begin(); it != vars.end(); ++it)
-            {
-                IVariable* var = *it;
-                IVariable* found = var->FindVariable(name, bRecursive, bHumanName);
-                if (found)
-                {
-                    return found;
-                }
-            }
-        }
-
-        return nullptr;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IVariable* CVarBlock::FindVariable(const char* name, bool bRecursive, bool bHumanName) const
-{
-    return ::FindVariable(name, bRecursive, bHumanName, m_vars);
-}
-
-//////////////////////////////////////////////////////////////////////////
-IVariable* CVariableArray::FindVariable(const char* name, bool bRecursive, bool bHumanName) const
-{
-    return ::FindVariable(name, bRecursive, bHumanName, m_vars);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::Serialize(XmlNodeRef vbNode, bool load)
-{
-    if (load)
-    {
-        // Loading.
-        QString name;
-        for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            IVariable* var = *it;
-            if (var->GetNumVariables())
-            {
-                XmlNodeRef child = vbNode->findChild(var->GetName().toUtf8().data());
-                if (child)
-                {
-                    var->Serialize(child, load);
-                }
-            }
-            else
-            {
-                var->Serialize(vbNode, load);
-            }
-        }
-    }
-    else
-    {
-        // Saving.
-        for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            IVariable* var = *it;
-            if (var->GetNumVariables())
-            {
-                XmlNodeRef child = vbNode->newChild(var->GetName().toUtf8().data());
-                var->Serialize(child, load);
-            }
-            else
-            {
-                var->Serialize(vbNode, load);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::ReserveNumVariables(int numVars)
-{
-    m_vars.reserve(numVars);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::WireVar(IVariable* src, IVariable* trg, bool bWire)
-{
-    if (bWire)
-    {
-        src->Wire(trg);
-    }
-    else
-    {
-        src->Unwire(trg);
-    }
-    int numSrcVars = src->GetNumVariables();
-    if (numSrcVars > 0)
-    {
-        int numTrgVars = trg->GetNumVariables();
-        for (int i = 0; i < numSrcVars && i < numTrgVars; i++)
-        {
-            WireVar(src->GetVariable(i), trg->GetVariable(i), bWire);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::Wire(CVarBlock* toVarBlock)
-{
-    Variables::iterator tit = toVarBlock->m_vars.begin();
-    Variables::iterator sit = m_vars.begin();
-    for (; sit != m_vars.end() && tit != toVarBlock->m_vars.end(); ++sit, ++tit)
-    {
-        IVariable* src = *sit;
-        IVariable* trg = *tit;
-        WireVar(src, trg, true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::Unwire(CVarBlock* toVarBlock)
-{
-    Variables::iterator tit = toVarBlock->m_vars.begin();
-    Variables::iterator sit = m_vars.begin();
-    for (; sit != m_vars.end() && tit != toVarBlock->m_vars.end(); ++sit, ++tit)
-    {
-        IVariable* src = *sit;
-        IVariable* trg = *tit;
-        WireVar(src, trg, false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::AddOnSetCallback(IVariable::OnSetCallback* func)
-{
-    for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-    {
-        IVariable* var = *it;
-        SetCallbackToVar(func, var, true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::RemoveOnSetCallback(IVariable::OnSetCallback* func)
-{
-    for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-    {
-        IVariable* var = *it;
-        SetCallbackToVar(func, var, false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::SetCallbackToVar(IVariable::OnSetCallback* func, IVariable* pVar, bool bAdd)
-{
-    if (bAdd)
-    {
-        pVar->AddOnSetCallback(func);
-    }
-    else
-    {
-        pVar->RemoveOnSetCallback(func);
-    }
-    int numVars = pVar->GetNumVariables();
-    if (numVars > 0)
-    {
-        for (int i = 0; i < numVars; i++)
-        {
-            SetCallbackToVar(func, pVar->GetVariable(i), bAdd);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::GatherUsedResources(CUsedResources& resources)
-{
-    for (int i = 0; i < GetNumVariables(); i++)
-    {
-        IVariable* pVar = GetVariable(i);
-        GatherUsedResourcesInVar(pVar, resources);
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::EnableUpdateCallbacks(bool boEnable)
-{
-    for (int i = 0; i < GetNumVariables(); i++)
-    {
-        IVariable* pVar = GetVariable(i);
-        pVar->EnableUpdateCallbacks(boEnable);
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::GatherUsedResourcesInVar(IVariable* pVar, CUsedResources& resources)
-{
-    int type = pVar->GetDataType();
-    if (type == IVariable::DT_FILE || type == IVariable::DT_OBJECT || type == IVariable::DT_TEXTURE)
-    {
-        // this is file.
-        QString filename;
-        pVar->Get(filename);
-        if (!filename.isEmpty())
-        {
-            resources.Add(filename.toUtf8().data());
-        }
-    }
-
-    for (int i = 0; i < pVar->GetNumVariables(); i++)
-    {
-        GatherUsedResourcesInVar(pVar->GetVariable(i), resources);
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-inline bool CompareNames(const IVariable* pVar1, const IVariable* pVar2)
-{
-    return (QString::compare(pVar1->GetHumanName(), pVar2->GetHumanName(), Qt::CaseInsensitive) < 0);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CVarBlock::Sort()
-{
-    std::sort(m_vars.begin(), m_vars.end(), CompareNames);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-CVarObject::CVarObject()
-{}
-
-//////////////////////////////////////////////////////////////////////////
-CVarObject::~CVarObject()
-{}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::AddVariable(CVariableBase& var, const QString& varName, VarOnSetCallback* cb, unsigned char dataType)
-{
-    if (!m_vars)
-    {
-        m_vars = new CVarBlock;
-    }
-    var.AddRef(); // Variables are local and must not be released by CVarBlock.
-    var.SetName(varName);
-    var.SetDataType(dataType);
-    if (cb)
-    {
-        var.AddOnSetCallback(cb);
-    }
-    m_vars->AddVariable(&var);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::AddVariable(CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb, unsigned char dataType)
-{
-    if (!m_vars)
-    {
-        m_vars = new CVarBlock;
-    }
-    var.AddRef(); // Variables are local and must not be released by CVarBlock.
-    var.SetName(varName);
-    var.SetHumanName(varHumanName);
-    var.SetDataType(dataType);
-    if (cb)
-    {
-        var.AddOnSetCallback(cb);
-    }
-    m_vars->AddVariable(&var);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::AddVariable(CVariableArray& table, CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb, unsigned char dataType)
-{
-    if (!m_vars)
-    {
-        m_vars = new CVarBlock;
-    }
-    var.AddRef(); // Variables are local and must not be released by CVarBlock.
-    var.SetName(varName);
-    var.SetHumanName(varHumanName);
-    var.SetDataType(dataType);
-    if (cb)
-    {
-        var.AddOnSetCallback(cb);
-    }
-    table.AddVariable(&var);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::RemoveVariable(IVariable* var)
-{
-    if (m_vars != NULL)
-    {
-        m_vars->DeleteVariable(var);
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::EnableUpdateCallbacks(bool boEnable)
-{
-    if (m_vars != NULL)
-    {
-        m_vars->EnableUpdateCallbacks(boEnable);
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::OnSetValues()
-{
-    if (m_vars != NULL)
-    {
-        m_vars->OnSetValues();
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::ReserveNumVariables(int numVars)
-{
-    if (m_vars != NULL)
-    {
-        m_vars->ReserveNumVariables(numVars);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::CopyVariableValues(CVarObject* sourceObject)
-{
-    // Check if compatible types.
-    assert(metaObject() == sourceObject->metaObject());
-    if (m_vars != NULL && sourceObject->m_vars != NULL)
-    {
-        m_vars->CopyValues(sourceObject->m_vars);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CVarObject::Serialize(XmlNodeRef node, bool load)
-{
-    if (m_vars)
-    {
-        m_vars->Serialize(node, load);
-    }
-}
-
-
-CVarGlobalEnumList::CVarGlobalEnumList(CUIEnumsDatabase_SEnum* pEnum)
-    : m_pEnum(pEnum)
-{
-}
-
-CVarGlobalEnumList::CVarGlobalEnumList(const QString& enumName)
-{
-    m_pEnum = GetIEditor()->GetUIEnumsDatabase()->FindEnum(enumName);
-}
-
-//! Get the name of specified value in enumeration.
-QString CVarGlobalEnumList::GetItemName(uint index)
-{
-    if (!m_pEnum || index >= m_pEnum->strings.size())
-    {
-        return QString();
-    }
-    return m_pEnum->strings[index];
-}
-
-QString CVarGlobalEnumList::NameToValue(const QString& name)
-{
-    if (m_pEnum)
-    {
-        return m_pEnum->NameToValue(name);
-    }
-    else
-    {
-        return name;
-    }
-}
-
-QString CVarGlobalEnumList::ValueToName(const QString& value)
-{
-    if (m_pEnum)
-    {
-        return m_pEnum->ValueToName(value);
-    }
-    else
-    {
-        return value;
-    }
-}
-
diff --git a/Code/Sandbox/Editor/Util/Variable.h b/Code/Sandbox/Editor/Util/Variable.h
deleted file mode 100644
index d5beab1cda..0000000000
--- a/Code/Sandbox/Editor/Util/Variable.h
+++ /dev/null
@@ -1,1892 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_VARIABLE_H
-#define CRYINCLUDE_EDITOR_UTIL_VARIABLE_H
-#pragma once
-
-
-#include "RefCountBase.h"
-
-#include "Include/EditorCoreAPI.h"
-
-#include <QObject>
-AZ_PUSH_DISABLE_WARNING(4458, "-Wunknown-warning-option")
-#include <QtUtilWin.h>
-AZ_POP_DISABLE_WARNING
-#include <QVariant>
-
-inline const char* to_c_str(const char* str) { return str; }
-#define MAX_VAR_STRING_LENGTH 4096
-
-struct IVarEnumList;
-struct ISplineInterpolator;
-class CUsedResources;
-struct IVariable;
-
-namespace
-{
-    template<typename T>
-    T nextNiceNumberBelow(T number);
-
-    template<typename T>
-    T nextNiceNumberAbove(T number)
-    {
-        if (number == 0)
-        {
-            return 0;
-        }
-        if (number < 0)
-        {
-            return -nextNiceNumberBelow(-number);
-        }
-
-        // number = 8000
-        auto l = log10(number);   // 3.90
-        AZ::s64 i = aznumeric_cast<AZ::s64>(l); // 3
-        int f = aznumeric_cast<int>(pow(10, l - i));   // 10^0.9 = 8
-        f = f < 2 ? 2 : f < 5 ? 5 : 10; // f -> 10
-        return aznumeric_cast<T>(pow(10, i) * f);
-    }
-
-    template<typename T>
-    T nextNiceNumberBelow(T number)
-    {
-        if (number == 0)
-        {
-            return 0;
-        }
-        if (number < 0)
-        {
-            return -nextNiceNumberAbove(-number);
-        }
-
-        // number = 8000
-        auto l = log10(number);   // 3.90
-        AZ::s64 i = aznumeric_cast<AZ::s64>(l); // 3
-        int f = aznumeric_cast<int>(pow(10, l - i));   // 10^0.9 = 8
-        f = f > 5 ? 5 : f > 2 ? 2 : 1;  // f -> 5
-        return aznumeric_cast<T>(pow(10, i) * f);
-    }
-}
-
-/** IVariableContainer
- *  Interface for all classes that hold child variables
- */
-struct IVariableContainer
-    : public CRefCountBase
-{
-    //! Add child variable
-    virtual void AddVariable(IVariable* var) = 0;
-
-    //! Delete specific variable
-    virtual bool DeleteVariable(IVariable* var, bool recursive = false) = 0;
-
-    //! Delete all variables
-    virtual void DeleteAllVariables() = 0;
-
-    //! Gets number of variables
-    virtual int GetNumVariables() const = 0;
-
-    //! Get variable at index
-    virtual IVariable* GetVariable(int index) const = 0;
-
-    //! Returns true if var block contains specified variable.
-    virtual bool IsContainsVariable(IVariable* pVar, bool bRecursive = false) const = 0;
-
-    //! Find variable by name.
-    virtual IVariable* FindVariable(const char* name, bool bRecursive = false, bool bHumanName = false) const = 0;
-
-    //! Return true if variable block is empty (Does not have any vars).
-    virtual bool IsEmpty() const = 0;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-/** IVariable is the variant variable interface.
- */
-struct IVariable
-    : public IVariableContainer
-{
-    /** Type of data stored in variable.
-    */
-    enum EType
-    {
-        UNKNOWN,            //!< Unknown parameter type.
-        INT,                //!< Integer property.
-        BOOL,               //!< Boolean property.
-        FLOAT,              //!< Float property.
-        VECTOR2,            //!< Vector property.
-        VECTOR,             //!< Vector property.
-        VECTOR4,            //!< Vector property.
-        QUAT,               //!< Quaternion property.
-        STRING,             //!< String property.
-        ARRAY,              //!< Array of parameters.
-        FLOW_CUSTOM_DATA,   //!< FLow graph custom data
-        DOUBLE              //!< Double property.
-    };
-
-    //! Type of data hold by variable.
-    enum EDataType
-    {
-        DT_SIMPLE = 0, //!< Standard param type.
-        DT_BOOLEAN,
-        DT_PERCENT,     //!< Percent data type, (Same as simple but value is from 0-1 and UI will be from 0-100).
-        DT_COLOR,
-        DT_ANGLE,
-        DT_FILE,
-        DT_TEXTURE,
-        DT_ANIMATION,
-        DT_OBJECT,
-        DT_SHADER,
-        DT_LOCAL_STRING,
-        DT_EQUIP,
-        DT_REVERBPRESET,
-        DT_DEPRECATED0, // formerly DT_MATERIAL
-        DT_MATERIALLOOKUP,
-        DT_EXTARRAY,    // Extendable Array
-        DT_SEQUENCE,    // Movie Sequence (DEPRECATED, use DT_SEQUENCE_ID, instead.)
-        DT_MISSIONOBJ,  // Mission Objective
-        DT_USERITEMCB,  // Use a callback GetItemsCallback in user data of variable
-        DT_UIENUM,          // Edit as enum, uses CUIEnumsDatabase to lookup the enum to value pairs and combobox in GUI.
-        DT_SEQUENCE_ID, // Movie Sequence
-        DT_LIGHT_ANIMATION, // Light Animation Node in the global Light Animation Set
-        DT_PARTICLE_EFFECT,
-        DT_GEOM_CACHE, // Geometry cache
-        DT_DEPRECATED, // formerly DT_FLARE
-        DT_AUDIO_TRIGGER,
-        DT_AUDIO_SWITCH,
-        DT_AUDIO_SWITCH_STATE,
-        DT_AUDIO_RTPC,
-        DT_AUDIO_ENVIRONMENT,
-        DT_AUDIO_PRELOAD_REQUEST,
-        DT_UI_ELEMENT,
-        DT_COLORA,      // DT_COLOR with alpha channel
-        DT_MOTION,      // Motion animation asset
-        DT_CURVE = BIT(7),  // Combined with other types
-    };
-
-    // Flags that can used with variables.
-    enum EFlags
-    {
-        // User interface related flags.
-        UI_DISABLED          = BIT(0),  //!< This variable will be disabled in UI.
-        UI_BOLD              = BIT(1),  //!< Variable name in properties will be bold.
-        UI_SHOW_CHILDREN     = BIT(2),  //!< Display children in parent field.
-        UI_USE_GLOBAL_ENUMS  = BIT(3),  //!< Use CUIEnumsDatabase to fetch enums for this variable name.
-        UI_INVISIBLE         = BIT(4),  //!< This variable will not be displayed in the UI
-        UI_ROLLUP2           = BIT(5),  //!< Prefer right roll-up bar for extended property control.
-        UI_COLLAPSED         = BIT(6),  //!< Category collapsed by default.
-        UI_UNSORTED          = BIT(7),  //!< Do not sort list-box alphabetically.
-        UI_EXPLICIT_STEP     = BIT(8),  //!< Use the step size set in the variable for the UI directly.
-        UI_NOT_DISPLAY_VALUE = BIT(9),  //!< The UI will display an empty string where it would normally draw the variable value.
-        UI_HIGHLIGHT_EDITED  = BIT(10), //!< Edited (non-default value) properties show highlight color.
-        UI_AUTO_EXPAND       = BIT(11), //!< Category expanded by default. to auto-expand child in ReflectedPropertyCtrl.
-        UI_CREATE_SPLINE     = BIT(12), //!< To indicate the spline need to be re-created. This is usually because the data was changed directly through the data address
-    };
-
-    typedef AZStd::function<void(IVariable*)> OnSetCallback;
-    using OnSetEnumCallback = OnSetCallback;
-
-    // Store IGetCustomItems into IVariable's UserData and set datatype to
-    // DT_USERITEMCB
-    // RefCounting is NOT handled by IVariable!
-    struct IGetCustomItems
-        : public CRefCountBase
-    {
-        struct SItem
-        {
-            SItem() {}
-            SItem(const QString& name, const QString& desc = QString())
-                : name(name)
-                , desc(desc) {}
-            SItem(const char* name, const char* desc = "")
-                : name(name)
-                , desc(desc) {}
-            QString name;
-            QString desc;
-        };
-        virtual bool GetItems (IVariable* /* pVar */, std::vector<SItem>& /* items */, QString& /* outDialogTitle */) = 0;
-        virtual bool UseTree() = 0;
-        virtual const char* GetTreeSeparator() = 0;
-    };
-
-    //! Get name of parameter.
-    virtual QString GetName() const = 0;
-    //! Set name of parameter.
-    virtual void SetName(const QString& name) = 0;
-
-    //! Get human readable name of parameter (Normally same as name).
-    virtual QString GetHumanName() const = 0;
-    //! Set human readable name of parameter (name without prefix).
-    virtual void SetHumanName(const QString& name) = 0;
-
-    //! Get variable description.
-    virtual QString GetDescription() const = 0;
-    //! Set variable description.
-    virtual void SetDescription(const char* desc) = 0;
-    //! Set variable description.
-    virtual void SetDescription(const QString& desc) = 0;
-
-    //! Get parameter type.
-    virtual EType   GetType() const = 0;
-    //! Get size of parameter.
-    virtual int GetSize() const = 0;
-
-    //! Type of data stored in this variable.
-    virtual unsigned char   GetDataType() const = 0;
-    virtual void SetDataType(unsigned char dataType) = 0;
-
-    virtual void SetUserData(const QVariant &data) = 0;
-    virtual QVariant GetUserData() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Flags
-    //////////////////////////////////////////////////////////////////////////
-    //! Set variable flags, (Limited to 16 flags).
-    virtual void SetFlags(int flags) = 0;
-    virtual int  GetFlags() const = 0;
-    virtual void SetFlagRecursive(EFlags flag) = 0;
-
-    /////////////////////////////////////////////////////////////////////////////
-    // Set methods.
-    /////////////////////////////////////////////////////////////////////////////
-    virtual void Set(int value) = 0;
-    virtual void Set(bool value) = 0;
-    virtual void Set(float value) = 0;
-    virtual void Set(double value) = 0;
-    virtual void Set(const Vec2& value) = 0;
-    virtual void Set(const Vec3& value) = 0;
-    virtual void Set(const Vec4& value) = 0;
-    virtual void Set(const Ang3& value) = 0;
-    virtual void Set(const Quat& value) = 0;
-    virtual void Set(const QString& value) = 0;
-    virtual void Set(const char* value) = 0;
-    virtual void SetDisplayValue(const QString& value) = 0;
-
-    // Called when value updated by any means (including internally).
-    virtual void OnSetValue(bool bRecursive) = 0;
-
-    /////////////////////////////////////////////////////////////////////////////
-    // Get methods.
-    /////////////////////////////////////////////////////////////////////////////
-    virtual void Get(int& value) const  = 0;
-    virtual void Get(bool& value) const  = 0;
-    virtual void Get(float& value) const  = 0;
-    virtual void Get(double& value) const = 0;
-    virtual void Get(Vec2& value) const  = 0;
-    virtual void Get(Vec3& value) const  = 0;
-    virtual void Get(Vec4& value) const  = 0;
-    virtual void Get(Ang3& value) const  = 0;
-    virtual void Get(Quat& value) const  = 0;
-    virtual void Get(QString& value) const = 0;
-    virtual QString GetDisplayValue() const = 0;
-    virtual bool HasDefaultValue() const = 0;
-
-    //! reset value to default value
-    virtual void ResetToDefault() = 0;
-
-    //! Return cloned value of variable.
-    virtual IVariable* Clone(bool bRecursive) const = 0;
-
-    //! Copy variable value from specified variable.
-    //! This method executed always recursively on all sub hierarchy of variables,
-    //! In Array vars, will never create new variables, only copy values of corresponding childs.
-    //! @param fromVar Source variable to copy value from.
-    virtual void CopyValue(IVariable* fromVar) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Value Limits.
-    //////////////////////////////////////////////////////////////////////////
-    //! Set value limits.
-    virtual void SetLimits([[maybe_unused]] float fMin, [[maybe_unused]] float fMax, [[maybe_unused]] float fStep = 0.f, [[maybe_unused]] bool bHardMin = true, [[maybe_unused]] bool bHardMax = true) {}
-    //! Get value limits.
-    virtual void GetLimits([[maybe_unused]] float& fMin, [[maybe_unused]] float& fMax, [[maybe_unused]] float& fStep, [[maybe_unused]] bool& bHardMin, [[maybe_unused]] bool& bHardMax) {}
-    void GetLimits(float& fMin, float& fMax)
-    {
-        float f;
-        bool b;
-        GetLimits(fMin, fMax, f, b, b);
-    }
-    virtual bool HasCustomLimits() { return false; }
-
-    virtual void EnableNotifyWithoutValueChange([[maybe_unused]] bool bFlag){}
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Wire/Unwire variables.
-    //////////////////////////////////////////////////////////////////////////
-    //! Wire variable, wired variable will be changed when this var changes.
-    virtual void Wire(IVariable* targetVar) = 0;
-    //! Unwire variable.
-    virtual void Unwire(IVariable* targetVar) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Assign on set callback.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void AddOnSetCallback(OnSetCallback* func) = 0;
-    virtual void RemoveOnSetCallback(OnSetCallback* func) = 0;
-    virtual void ClearOnSetCallbacks() {}
-
-    //////////////////////////////////////////////////////////////////////////
-    // Assign callback triggered when enums change.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void AddOnSetEnumCallback(OnSetEnumCallback* func) = 0;
-    virtual void RemoveOnSetEnumCallback(OnSetCallback* func) = 0;
-    virtual void ClearOnSetEnumCallbacks() {}
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Retrieve pointer to selection list used by variable.
-    virtual IVarEnumList* GetEnumList() const { return 0; }
-    virtual ISplineInterpolator* GetSpline() { return 0; }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Serialize variable to XML.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void Serialize(XmlNodeRef node, bool load) = 0;
-
-    // From CObject, (not implemented)
-    virtual void Serialize([[maybe_unused]] CArchive& ar) {}
-
-    //////////////////////////////////////////////////////////////////////////
-    // Disables the update callbacks for certain operations in order to avoid
-    // too many function calls when not needed.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void EnableUpdateCallbacks(bool boEnable) = 0;
-
-    // Setup to true to force save Undo in case the value the same.
-    virtual void SetForceModified([[maybe_unused]] bool bForceModified) {}
-};
-
-// Smart pointer to this parameter.
-typedef _smart_ptr<IVariable> IVariablePtr;
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-/**
- **************************************************************************************
- * CVariableBase implements IVariable interface and provide default implementation
- * for basic IVariable functionality (Name, Flags, etc...)
- * CVariableBase cannot be instantiated directly and should be used as the base class for
- * actual Variant implementation classes.
- ***************************************************************************************
- */
-class EDITOR_CORE_API CVariableBase
-    : public IVariable
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    virtual ~CVariableBase() {}
-
-    void SetName(const QString& name) { m_name = name; };
-    //! Get name of parameter.
-    QString GetName() const { return m_name; };
-
-    QString GetHumanName() const
-    {
-        if (!m_humanName.isEmpty())
-        {
-            return m_humanName;
-        }
-        return m_name;
-    }
-    void SetHumanName(const QString& name) { m_humanName = name; }
-
-    void SetDescription(const char* desc) { m_description = desc; };
-    void SetDescription(const QString& desc) { m_description = desc; };
-
-    //! Get name of parameter.
-    QString GetDescription() const { return m_description; };
-
-    EType   GetType() const { return IVariable::UNKNOWN; };
-    int GetSize() const { return sizeof(*this); };
-
-    unsigned char   GetDataType() const { return m_dataType; };
-    void SetDataType(unsigned char dataType) { m_dataType = dataType; }
-
-    void SetFlags(int flags) { m_flags = flags; }
-    int  GetFlags() const { return m_flags; }
-    void  SetFlagRecursive(EFlags flag) { m_flags |= flag; }
-
-    void SetUserData(const QVariant &data){ m_userData = data; };
-    QVariant GetUserData() const { return m_userData; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set methods.
-    //////////////////////////////////////////////////////////////////////////
-    void Set([[maybe_unused]] int value)                   { assert(0); }
-    void Set([[maybe_unused]] bool value)                  { assert(0); }
-    void Set([[maybe_unused]] float value)                 { assert(0); }
-    void Set([[maybe_unused]] double value)                { assert(0); }
-    void Set([[maybe_unused]] const Vec2& value)           { assert(0); }
-    void Set([[maybe_unused]] const Vec3& value)           { assert(0); }
-    void Set([[maybe_unused]] const Vec4& value)           { assert(0); }
-    void Set([[maybe_unused]] const Ang3& value)           { assert(0); }
-    void Set([[maybe_unused]] const Quat& value)           { assert(0); }
-    void Set([[maybe_unused]] const QString& value)        { assert(0); }
-    void Set([[maybe_unused]] const char* value)            { assert(0); }
-    void SetDisplayValue(const QString& value)    { Set(value); }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Get methods.
-    //////////////////////////////////////////////////////////////////////////
-    void Get([[maybe_unused]] int& value) const        { assert(0); }
-    void Get([[maybe_unused]] bool& value) const       { assert(0); }
-    void Get([[maybe_unused]] float& value) const      { assert(0); }
-    void Get([[maybe_unused]] double& value) const     { assert(0); }
-    void Get([[maybe_unused]] Vec2& value) const       { assert(0); }
-    void Get([[maybe_unused]] Vec3& value) const       { assert(0); }
-    void Get([[maybe_unused]] Vec4& value) const       { assert(0); }
-    void Get([[maybe_unused]] Ang3& value) const       { assert(0); }
-    void Get([[maybe_unused]] Quat& value) const       { assert(0); }
-    void Get([[maybe_unused]] QString& value) const    { assert(0); }
-    QString GetDisplayValue() const     { QString val; Get(val); return val; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // IVariableContainer functions
-    //////////////////////////////////////////////////////////////////////////
-    virtual void AddVariable([[maybe_unused]] IVariable* var) { assert(0); }
-
-    virtual bool DeleteVariable([[maybe_unused]] IVariable* var, [[maybe_unused]] bool recursive = false) { return false; }
-    virtual void DeleteAllVariables() {}
-
-    virtual int GetNumVariables() const { return 0; }
-    virtual IVariable* GetVariable([[maybe_unused]] int index) const { return nullptr; }
-
-    virtual bool IsContainsVariable([[maybe_unused]] IVariable* pVar, [[maybe_unused]] bool bRecursive = false) const { return false; }
-
-    virtual IVariable* FindVariable([[maybe_unused]] const char* name, [[maybe_unused]] bool bRecursive = false, [[maybe_unused]] bool bHumanName = false) const { return nullptr; }
-
-    virtual bool IsEmpty() const { return true; }
-
-    //////////////////////////////////////////////////////////////////////////
-    void Wire(IVariable* var)
-    {
-        m_wiredVars.push_back(var);
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void Unwire(IVariable* var)
-    {
-        if (!var)
-        {
-            // Unwire all.
-            m_wiredVars.clear();
-        }
-        else
-        {
-            stl::find_and_erase(m_wiredVars, var);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void AddOnSetCallback(OnSetCallback* func)
-    {
-        if (!stl::find(m_onSetFuncs, func))
-        {
-            m_onSetFuncs.push_back(func);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void RemoveOnSetCallback(OnSetCallback* func)
-    {
-        stl::find_and_erase(m_onSetFuncs, func);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void ClearOnSetCallbacks()
-    {
-        m_onSetFuncs.clear();
-    }
-
-    void AddOnSetEnumCallback(OnSetEnumCallback* func) override
-    {
-        if (!stl::find(m_onSetEnumFuncs, func))
-        {
-            m_onSetEnumFuncs.push_back(func);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void RemoveOnSetEnumCallback(OnSetCallback* func)
-    {
-        stl::find_and_erase(m_onSetEnumFuncs, func);
-    }
-
-    void ClearOnSetEnumCallbacks() override
-    {
-        m_onSetEnumFuncs.clear();
-    }
-
-
-    virtual void OnSetValue([[maybe_unused]] bool bRecursive)
-    {
-        // If have wired variables or OnSet callback, process them.
-        // Send value to wired variable.
-        for (CVariableBase::WiredList::iterator it = m_wiredVars.begin(); it != m_wiredVars.end(); ++it)
-        {
-            if (m_bForceModified)
-            {
-                (*it)->SetForceModified(true);
-            }
-
-            // Copy value to wired vars.
-            (*it)->CopyValue(this);
-        }
-
-        if (!m_boUpdateCallbacksEnabled)
-        {
-            return;
-        }
-
-        // Call on set callback.
-        for (auto it = m_onSetFuncs.begin(); it != m_onSetFuncs.end(); ++it)
-        {
-            // Call on set callback.
-            (*it)->operator()(this);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void Serialize(XmlNodeRef node, bool load)
-    {
-        if (load)
-        {
-            if (node->haveAttr(m_name.toUtf8().data()))
-            {
-                Set(node->getAttr(m_name.toUtf8().data()));
-            }
-        }
-        else
-        {
-            // Saving.
-            QString str;
-            Get(str);
-            node->setAttr(m_name.toUtf8().data(), str.toUtf8().data());
-        }
-    }
-
-    virtual void EnableUpdateCallbacks(bool boEnable){m_boUpdateCallbacksEnabled = boEnable; };
-    virtual void SetForceModified(bool bForceModified) { m_bForceModified = bForceModified; }
-protected:
-    // Constructor.
-    CVariableBase()
-        : m_dataType(DT_SIMPLE)
-        , m_flags(0)
-        , m_boUpdateCallbacksEnabled(true)
-        , m_bForceModified(false)
-    {
-    }
-
-    // Copy constructor.
-    CVariableBase(const CVariableBase& var)
-    {
-        m_name = var.m_name;
-        m_humanName = var.m_humanName;
-        m_description = var.m_description;
-        m_flags = var.m_flags;
-        m_dataType = var.m_dataType;
-        m_userData = var.m_userData;
-        m_boUpdateCallbacksEnabled = true;
-        m_bForceModified = var.m_bForceModified;
-        // Never copy callback function or wired variables they are private to specific variable,
-    }
-
-    // Not allow.
-    CVariableBase& operator=([[maybe_unused]] const CVariableBase& var)
-    {
-        return *this;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Variables.
-    //////////////////////////////////////////////////////////////////////////
-    typedef std::vector<OnSetCallback*> OnSetCallbackList;
-    typedef std::vector<IVariablePtr> WiredList;
-    using OnSetEnumCallbackList = std::vector<OnSetEnumCallback*>;
-
-    QString m_name;
-    QString m_humanName;
-    QString m_description;
-
-    //! Optional userdata pointer
-    QVariant m_userData;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //! Extended data (Extended data is never copied, it's always private to this variable).
-    WiredList m_wiredVars;
-    OnSetCallbackList m_onSetFuncs;
-    OnSetEnumCallbackList m_onSetEnumFuncs;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    uint16 m_flags;
-    //! Limited to 8 flags.
-    unsigned char m_dataType;
-
-    bool m_boUpdateCallbacksEnabled;
-
-    bool m_bForceModified;
-};
-
-/**
- **************************************************************************************
- * CVariableArray implements variable of type array of IVariables.
- ***************************************************************************************
- */
-class EDITOR_CORE_API CVariableArray
-    : public CVariableBase
-{
-public:
-    CVariableArray(){}
-
-    //! Get name of parameter.
-    virtual EType   GetType() const { return IVariable::ARRAY; };
-    virtual int     GetSize() const { return sizeof(CVariableArray); };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set methods.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void Set(const QString& value)
-    {
-        if (m_strValue != value)
-        {
-            m_strValue = value;
-            OnSetValue(false);
-        }
-    }
-    void OnSetValue(bool bRecursive)
-    {
-        CVariableBase::OnSetValue(bRecursive);
-        if (bRecursive)
-        {
-            for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-            {
-                (*it)->OnSetValue(true);
-            }
-        }
-    }
-    void SetFlagRecursive(EFlags flag)
-    {
-        CVariableBase::SetFlagRecursive(flag);
-        for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            (*it)->SetFlagRecursive(flag);
-        }
-    }
-    //////////////////////////////////////////////////////////////////////////
-    // Get methods.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void Get(QString& value) const { value = m_strValue; }
-
-    virtual bool HasDefaultValue() const
-    {
-        for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            if (!(*it)->HasDefaultValue())
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    virtual void ResetToDefault()
-    {
-        for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            (*it)->ResetToDefault();
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    IVariable* Clone(bool bRecursive) const
-    {
-        CVariableArray* var = new CVariableArray(*this);
-
-        // m_vars was shallow-duplicated, clone elements.
-        for (int i = 0; i < m_vars.size(); i++)
-        {
-            var->m_vars[i] = m_vars[i]->Clone(bRecursive);
-        }
-        return var;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void CopyValue(IVariable* fromVar)
-    {
-        assert(fromVar);
-        if (fromVar->GetType() != IVariable::ARRAY)
-        {
-            return;
-        }
-        int numSrc = fromVar->GetNumVariables();
-        int numTrg = static_cast<int>(m_vars.size());
-        for (int i = 0; i < numSrc && i < numTrg; i++)
-        {
-            // Copy Every child variable.
-            m_vars[i]->CopyValue(fromVar->GetVariable(i));
-        }
-        QString strValue;
-        fromVar->Get(strValue);
-        Set(strValue);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual int GetNumVariables() const { return static_cast<int>(m_vars.size()); }
-
-    virtual IVariable* GetVariable(int index) const
-    {
-        assert(index >= 0 && index < (int)m_vars.size());
-        return m_vars[index];
-    }
-
-    virtual void AddVariable(IVariable* var)
-    {
-        m_vars.push_back(var);
-    }
-
-    virtual bool DeleteVariable(IVariable* var, bool recursive /*=false*/)
-    {
-        bool found = stl::find_and_erase(m_vars, var);
-        if (!found && recursive)
-        {
-            for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-            {
-                if ((*it)->DeleteVariable(var, recursive))
-                {
-                    return true;
-                }
-            }
-        }
-        return found;
-    }
-
-    virtual void DeleteAllVariables()
-    {
-        m_vars.clear();
-    }
-
-    virtual bool IsContainsVariable(IVariable* pVar, bool bRecursive) const
-    {
-        for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            if (*it == pVar)
-            {
-                return true;
-            }
-        }
-
-        // If not found search childs.
-        if (bRecursive)
-        {
-            // Search all top level variables.
-            for (Variables::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-            {
-                if ((*it)->IsContainsVariable(pVar))
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    virtual IVariable* FindVariable(const char* name, bool bRecursive, bool bHumanName) const;
-
-    virtual bool IsEmpty() const
-    {
-        return m_vars.empty();
-    }
-
-    void Serialize(XmlNodeRef node, bool load)
-    {
-        if (load)
-        {
-            // Loading.
-            QString name;
-            for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-            {
-                IVariable* var = *it;
-                if (var->GetNumVariables())
-                {
-                    XmlNodeRef child = node->findChild(var->GetName().toUtf8().data());
-                    if (child)
-                    {
-                        var->Serialize(child, load);
-                    }
-                }
-                else
-                {
-                    var->Serialize(node, load);
-                }
-            }
-        }
-        else
-        {
-            // Saving.
-            for (Variables::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-            {
-                IVariable* var = *it;
-                if (var->GetNumVariables())
-                {
-                    XmlNodeRef child = node->newChild(var->GetName().toUtf8().data());
-                    var->Serialize(child, load);
-                }
-                else
-                {
-                    var->Serialize(node, load);
-                }
-            }
-        }
-    }
-
-protected:
-    typedef std::vector<IVariablePtr> Variables;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Variables m_vars;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //! Any string value displayed in properties.
-    QString m_strValue;
-};
-
-/** var_type namespace includes type definitions needed for CVariable implementaton.
- */
-namespace var_type
-{
-    //////////////////////////////////////////////////////////////////////////
-    template <int TypeID, bool IsStandart, bool IsInteger, bool IsSigned, bool SupportsRange>
-    struct type_traits_base
-    {
-        static int type() { return TypeID; };
-        //! Return true if standard C++ type.
-        static bool is_standart() { return IsStandart; };
-        static bool is_integer() { return IsInteger; };
-        static bool is_signed() { return IsSigned; };
-        static bool supports_range() { return SupportsRange; };
-    };
-
-    template <class Type>
-    struct type_traits
-        : public type_traits_base<IVariable::UNKNOWN, false, false, false, false> {};
-
-    // Types specialization.
-    template<>
-    struct type_traits<int>
-        : public type_traits_base<IVariable::INT, true, true, true, true> {};
-    template<>
-    struct type_traits<bool>
-        : public type_traits_base<IVariable::BOOL, true, true, false, true> {};
-    template<>
-    struct type_traits<float>
-        : public type_traits_base<IVariable::FLOAT, true, false, false, true> {};
-    template<>
-    struct type_traits<double>
-        : public type_traits_base<IVariable::DOUBLE, true, false, false, true>{};
-    template<>
-    struct type_traits<Vec2>
-        : public type_traits_base<IVariable::VECTOR2, false, false, false, false> {};
-    template<>
-    struct type_traits<Vec3>
-        : public type_traits_base<IVariable::VECTOR, false, false, false, false> {};
-    template<>
-    struct type_traits<Vec4>
-        : public type_traits_base<IVariable::VECTOR4, false, false, false, false> {};
-    template<>
-    struct type_traits<Quat>
-        : public type_traits_base<IVariable::QUAT, false, false, false, false> {};
-    template<>
-    struct type_traits<QString>
-        : public type_traits_base<IVariable::STRING, false, false, false, false> {};
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // General one type to another type convertor class.
-    //////////////////////////////////////////////////////////////////////////
-    struct type_convertor
-    {
-        template <class From, class To>
-        void operator()([[maybe_unused]] const From& from, [[maybe_unused]] To& to) const { assert(0); }
-
-        void operator()(const int& from, int& to) const { to = from; }
-        void operator()(const int& from, bool& to) const { to = from != 0; }
-        void operator()(const int& from, float& to) const { to = (float)from; }
-        //////////////////////////////////////////////////////////////////////////
-        void operator()(const bool& from, int& to) const { to = from; }
-        void operator()(const bool& from, bool& to) const { to = from; }
-        void operator()(const bool& from, float& to) const { to = from; }
-        //////////////////////////////////////////////////////////////////////////
-        void operator()(const float& from, int& to) const { to = (int)from; }
-        void operator()(const float& from, bool& to) const { to = from != 0; }
-        void operator()(const float& from, float& to) const { to = from; }
-
-        void operator()(const double& from, int& to) const { to = (int)from; }
-        void operator()(const double& from, bool& to) const { to = from != 0; }
-        void operator()(const double& from, float& to) const { to = aznumeric_cast<float>(from); }
-
-        void operator()(const Vec2& from, Vec2& to) const { to = from; }
-        void operator()(const Vec3& from, Vec3& to) const { to = from; }
-        void operator()(const Vec4& from, Vec4& to) const { to = from; }
-        void operator()(const Quat& from, Quat& to) const { to = from; }
-        void operator()(const QString& from, QString& to) const { to = from; }
-
-        void operator()(bool value, QString& to) const { to = QString::number((value) ? (int)1 : (int)0); }
-        void operator()(int value, QString& to) const { to = QString::number(value); }
-        void operator()(float value, QString& to) const { to = QString::number(value); };
-        void operator()(double value, QString& to) const { to = QString::number(value); };
-        void operator()(const Vec2& value, QString& to) const { to = QString::fromLatin1("%1,%2").arg(value.x).arg(value.y); }
-        void operator()(const Vec3& value, QString& to) const { to = QString::fromLatin1("%1,%2,%3").arg(value.x).arg(value.y).arg(value.z); }
-        void operator()(const Vec4& value, QString& to) const { to = QString::fromLatin1("%1,%2,%3,%4").arg(value.x).arg(value.y).arg(value.z).arg(value.w); }
-        void operator()(const Ang3& value, QString& to) const { to = QString::fromLatin1("%1,%2,%3").arg(value.x).arg(value.y).arg(value.z); }
-        void operator()(const Quat& value, QString& to) const { to = QString::fromLatin1("%1,%2,%3,%4").arg(value.w).arg(value.v.x).arg(value.v.y).arg(value.v.z); }
-
-        void operator()(const QString& from, int& value) const { value = from.toInt(); }
-        void operator()(const QString& from, bool& value) const { value = from.toInt() != 0; }
-        void operator()(const QString& from, float& value) const { value = from.toFloat(); }
-        void operator()(const QString& from, Vec2& value) const
-        {
-            QStringList parts = from.split(QStringLiteral(","));
-            while (parts.size() < 2)
-            {
-                parts.push_back(QString());
-            }
-            value.x = parts[0].toFloat();
-            value.y = parts[1].toFloat();
-        };
-        void operator()(const QString& from, Vec3& value) const
-        {
-            QStringList parts = from.split(QStringLiteral(","));
-            while (parts.size() < 3)
-            {
-                parts.push_back(QString());
-            }
-            value.x = parts[0].toFloat();
-            value.y = parts[1].toFloat();
-            value.z = parts[2].toFloat();
-        };
-        void operator()(const QString& from, Vec4& value) const
-        {
-            QStringList parts = from.split(QStringLiteral(","));
-            while (parts.size() < 4)
-            {
-                parts.push_back(QString());
-            }
-            value.x = parts[0].toFloat();
-            value.y = parts[1].toFloat();
-            value.z = parts[2].toFloat();
-            value.w = parts[3].toFloat();
-        };
-        void operator()(const QString& from, Ang3& value) const
-        {
-            QStringList parts = from.split(QStringLiteral(","));
-            while (parts.size() < 3)
-            {
-                parts.push_back(QString());
-            }
-            value.x = parts[0].toFloat();
-            value.y = parts[1].toFloat();
-            value.z = parts[2].toFloat();
-        };
-        void operator()(const QString& from, Quat& value) const
-        {
-            QStringList parts = from.split(QStringLiteral(","));
-            while (parts.size() < 4)
-            {
-                parts.push_back(QString());
-            }
-            value.w = parts[0].toFloat();
-            value.v.x = parts[1].toFloat();
-            value.v.y = parts[2].toFloat();
-            value.v.z = parts[3].toFloat();
-        };
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Custom comparison functions for different variable type's values,.
-    //////////////////////////////////////////////////////////////////////////
-    template <class Type>
-    inline bool compare(const Type& arg1, const Type& arg2)
-    {
-        return arg1 == arg2;
-    };
-    inline bool compare(const Vec2& v1, const Vec2& v2)
-    {
-        return v1.x == v2.x && v1.y == v2.y;
-    }
-    inline bool compare(const Vec3& v1, const Vec3& v2)
-    {
-        return v1.x == v2.x && v1.y == v2.y && v1.z == v2.z;
-    }
-    inline bool compare(const Vec4& v1, const Vec4& v2)
-    {
-        return v1.x == v2.x && v1.y == v2.y && v1.z == v2.z && v1.w == v2.w;
-    }
-    inline bool compare(const Ang3& v1, const Ang3& v2)
-    {
-        return v1.x == v2.x && v1.y == v2.y && v1.z == v2.z;
-    }
-    inline bool compare(const Quat& q1, const Quat& q2)
-    {
-        return q1.v.x == q2.v.x && q1.v.y == q2.v.y && q1.v.z == q2.v.z && q1.w == q2.w;
-    }
-    inline bool compare(const char* s1, const char* s2)
-    {
-        return strcmp(s1, s2) == 0;
-    }
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // Custom Initialization functions for different variable type's values,.
-    //////////////////////////////////////////////////////////////////////////
-    template <class Type>
-    inline void init(Type& val)
-    {
-        val = 0;
-    };
-    inline void init(Vec2& val)   {   val.x = 0; val.y = 0;   };
-    inline void init(Vec3& val)   {   val.x = 0; val.y = 0; val.z = 0; };
-    inline void init(Vec4& val)   {   val.x = 0; val.y = 0; val.z = 0; val.w = 0;  };
-    inline void init(Ang3& val)   {   val.x = 0; val.y = 0; val.z = 0; };
-    inline void init(Quat& val)
-    {
-        val.v.x = 0;
-        val.v.y = 0;
-        val.v.z = 0;
-        val.w = 0;
-    };
-    inline void init(const char*& val)
-    {
-        val = "";
-    };
-    inline void init([[maybe_unused]] QString& val)
-    {
-        // self initializing.
-    }
-    //////////////////////////////////////////////////////////////////////////
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Void variable does not contain any value.
-//////////////////////////////////////////////////////////////////////////
-class CVariableVoid
-    : public CVariableBase
-{
-public:
-    CVariableVoid(){};
-    virtual EType GetType() const { return IVariable::UNKNOWN; };
-    virtual IVariable* Clone([[maybe_unused]] bool bRecursive) const { return new CVariableVoid(*this); }
-    virtual void CopyValue([[maybe_unused]] IVariable* fromVar) {};
-    virtual bool HasDefaultValue() const { return true; }
-    virtual void ResetToDefault() {};
-protected:
-    CVariableVoid(const CVariableVoid& v)
-        : CVariableBase(v) {};
-};
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-class CVariable
-    : public CVariableBase
-{
-    typedef CVariable<T> Self;
-public:
-    // Constructor.
-    CVariable()
-        : m_valueMin(0.0f)
-        , m_valueMax(100.0f)
-        , m_valueStep(0.0f)
-        , m_bHardMin(false)
-        , m_bHardMax(false)
-        , m_customLimits(false)
-    {
-        // Initialize value to zero or empty string.
-        var_type::init(m_valueDef);
-    }
-
-    explicit CVariable(const T& set)
-        : CVariable()
-    {
-        var_type::init(m_valueDef);   // Update F32NAN values in Debud mode
-        SetValue(set);
-    }
-
-    //! Get name of parameter.
-    virtual EType   GetType() const { return (EType)var_type::type_traits<T>::type(); };
-    virtual int     GetSize() const { return sizeof(T); };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Set methods.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void Set(int value)                           { SetValue(value); }
-    virtual void Set(bool value)                      { SetValue(value); }
-    virtual void Set(float value)                     { SetValue(value); }
-    virtual void Set(double value)                { SetValue(value); }
-    virtual void Set(const Vec2& value)           { SetValue(value); }
-    virtual void Set(const Vec3& value)           { SetValue(value); }
-    virtual void Set(const Vec4& value)           { SetValue(value); }
-    virtual void Set(const Ang3& value)           { SetValue(value); }
-    virtual void Set(const Quat& value)           { SetValue(value); }
-    virtual void Set(const QString& value)    { SetValue(value); }
-    virtual void Set(const char* value)      { SetValue(QString(value)); }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Get methods.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void Get(int& value) const                        { GetValue(value); }
-    virtual void Get(bool& value) const                   { GetValue(value); }
-    virtual void Get(float& value) const                  { GetValue(value); }
-    virtual void Get(double& value) const                  { GetValue(value); }
-    virtual void Get(Vec2& value) const                   { GetValue(value); }
-    virtual void Get(Vec3& value) const                   { GetValue(value); }
-    virtual void Get(Vec4& value) const                   { GetValue(value); }
-    virtual void Get(Quat& value) const                   { GetValue(value); }
-    virtual void Get(QString& value) const                { GetValue(value); }
-    virtual bool HasDefaultValue() const
-    {
-        T defval;
-        var_type::init(defval);
-        return m_valueDef == defval;
-    }
-
-    virtual void ResetToDefault()
-    {
-        T defval;
-        var_type::init(defval);
-        SetValue(defval);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Limits.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetLimits(float fMin, float fMax, float fStep = 0.f, bool bHardMin = true, bool bHardMax = true)
-    {
-        m_valueMin = fMin;
-        m_valueMax = fMax;
-        m_valueStep = fStep;
-        m_bHardMin = bHardMin;
-        m_bHardMax = bHardMax;
-
-        // Flag to determine when this variable has custom limits set
-        m_customLimits = true;
-    }
-
-    virtual void GetLimits(float& fMin, float& fMax, float& fStep, bool& bHardMin, bool& bHardMax)
-    {
-        if (!m_customLimits && var_type::type_traits<T>::supports_range())
-        {
-            float value;
-            GetValue(value);
-            if (value > m_valueMax && !m_bHardMax)
-            {
-                SetLimits(m_valueMin, nextNiceNumberAbove(value), 0.0, false, false);
-            }
-            if (value < m_valueMin && !m_bHardMin)
-            {
-                SetLimits(nextNiceNumberBelow(value), m_valueMax, 0.0, false, false);
-            }
-        }
-
-        fMin = m_valueMin;
-        fMax = m_valueMax;
-        fStep = m_valueStep;
-        bHardMin = m_bHardMin;
-        bHardMax = m_bHardMax;
-    }
-    void ClearLimits()
-    {
-        SetLimits(0.0f, 0.0f, 0.0f, false, false);
-        m_customLimits = false;
-    }
-
-    virtual bool HasCustomLimits()
-    {
-        return m_customLimits;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Access operators.
-    //////////////////////////////////////////////////////////////////////////
-
-    //! Cast to held type.
-    operator T const& () const {
-        return m_valueDef;
-    }
-
-    //! Assign operator for variable.
-    void operator=(const T& value) { SetValue(value); }
-
-    //////////////////////////////////////////////////////////////////////////
-    IVariable* Clone([[maybe_unused]] bool bRecursive) const
-    {
-        Self* var = new Self(*this);
-        return var;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void CopyValue(IVariable* fromVar)
-    {
-        assert(fromVar);
-        T val;
-        fromVar->Get(val);
-        SetValue(val);
-    }
-
-protected:
-
-    //////////////////////////////////////////////////////////////////////////
-    template <class P>
-    void SetValue(const P& value)
-    {
-        T newValue = T();
-        //var_type::type_convertor<P,T> convertor;
-        var_type::type_convertor convertor;
-        convertor(value, newValue);
-
-        // compare old and new values.
-        if (m_bForceModified || !var_type::compare(m_valueDef, newValue))
-        {
-            m_valueDef = newValue;
-            m_bForceModified = false;
-            OnSetValue(false);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    template <class P>
-    void GetValue(P& value) const
-    {
-        var_type::type_convertor convertor;
-        convertor(m_valueDef, value);
-    }
-
-protected:
-    T m_valueDef;
-    bool m_customLimits;
-    bool m_bResolving;
-    unsigned char m_bHardMin : 1;
-    unsigned char m_bHardMax : 1;
-    // Min/Max value.
-    float m_valueMin, m_valueMax, m_valueStep;
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-/**
-**************************************************************************************
-* CVariableArray implements variable of type array of IVariables.
-***************************************************************************************
-*/
-template <class T>
-class TVariableArray
-    : public CVariable<T>
-{
-    typedef TVariableArray<T> Self;
-public:
-    using CVariable<T>::GetType;
-    TVariableArray()
-        : CVariable<T>() {};
-    // Copy Constructor.
-    TVariableArray(const Self& var)
-        : CVariable<T>(var)
-    {}
-
-    //! Get name of parameter.
-    virtual int     GetSize() const { return sizeof(Self); };
-
-    virtual bool HasDefaultValue() const
-    {
-        for (Vars::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            if (!(*it)->HasDefaultValue())
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    virtual void ResetToDefault()
-    {
-        for (Vars::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            (*it)->ResetToDefault();
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    IVariable* Clone(bool bRecursive) const
-    {
-        Self* var = new Self(*this);
-        for (Vars::const_iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-        {
-            var->m_vars.push_back((*it)->Clone(bRecursive));
-        }
-        return var;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void CopyValue(IVariable* fromVar)
-    {
-        assert(fromVar);
-        if (fromVar->GetType() != GetType())
-        {
-            return;
-        }
-        CVariable<T>::CopyValue(fromVar);
-        int numSrc = fromVar->GetNumVariables();
-        int numTrg = m_vars.size();
-        for (int i = 0; i < numSrc && i < numTrg; i++)
-        {
-            // Copy Every child variable.
-            m_vars[i]->CopyValue(fromVar->GetVariable(i));
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    int GetNumVariables() const { return m_vars.size(); }
-    IVariable* GetVariable(int index) const
-    {
-        assert(index >= 0 && index < (int)m_vars.size());
-        return m_vars[index];
-    }
-    void AddVariable(IVariable* var) { m_vars.push_back(var); }
-    void DeleteAllVariables() { m_vars.clear(); }
-
-    //////////////////////////////////////////////////////////////////////////
-    void Serialize(XmlNodeRef node, bool load)
-    {
-        CVariable<T>::Serialize(node, load);
-        if (load)
-        {
-            // Loading.
-            QString name;
-            for (Vars::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-            {
-                IVariable* var = *it;
-                if (var->GetNumVariables())
-                {
-                    XmlNodeRef child = node->findChild(var->GetName().toUtf8().data());
-                    if (child)
-                    {
-                        var->Serialize(child, load);
-                    }
-                }
-                else
-                {
-                    var->Serialize(node, load);
-                }
-            }
-        }
-        else
-        {
-            // Saving.
-            for (Vars::iterator it = m_vars.begin(); it != m_vars.end(); ++it)
-            {
-                IVariable* var = *it;
-                if (var->GetNumVariables())
-                {
-                    XmlNodeRef child = node->newChild(var->GetName().toUtf8().data());
-                    var->Serialize(child, load);
-                }
-                else
-                {
-                    var->Serialize(node, load);
-                }
-            }
-        }
-    }
-
-protected:
-    typedef std::vector<IVariablePtr> Vars;
-    Vars m_vars;
-};
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-//! Selection list shown in combo box, for enumerated variable.
-struct IVarEnumList
-    : public CRefCountBase
-{
-    //! Get the name of specified value in enumeration, or NULL if out of range.
-    virtual QString GetItemName(uint index) = 0;
-};
-typedef _smart_ptr<IVarEnumList> IVarEnumListPtr;
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING;
-//! Selection list shown in combo box, for enumerated variable.
-template <class T>
-class CVarEnumListBase
-    : public IVarEnumList
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    CVarEnumListBase(){}
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual T NameToValue(const QString& name) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    virtual QString ValueToName(T const& value) = 0;
-
-    //! Add new item to the selection.
-    virtual void AddItem(const QString& name, const T& value) = 0;
-
-    template <class TVal>
-    static bool IsValueEqual(const TVal& v1, const TVal& v2)
-    {
-        return v1 == v2;
-    }
-    static bool IsValueEqual(const QString& v1, const QString& v2)
-    {
-        // Case insensitive compare.
-        return QString::compare(v1, v2, Qt::CaseInsensitive) == 0;
-    }
-
-protected:
-    virtual ~CVarEnumListBase() {};
-    friend class _smart_ptr<CVarEnumListBase<T> >;
-};
-
-struct CUIEnumsDatabase_SEnum;
-
-//////////////////////////////////////////////////////////////////////////
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class EDITOR_CORE_API CVarGlobalEnumList
-    : public CVarEnumListBase<QString>
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    CVarGlobalEnumList(CUIEnumsDatabase_SEnum* pEnum);
-    CVarGlobalEnumList(const QString& enumName);
-
-    //! Get the name of specified value in enumeration.
-    virtual QString GetItemName(uint index);
-
-    virtual QString NameToValue(const QString& name);
-    virtual QString ValueToName(const QString& value);
-
-    //! Don't add anything to a global enum database
-    virtual void AddItem([[maybe_unused]] const QString& name, [[maybe_unused]] const QString& value) {}
-
-private:
-    CUIEnumsDatabase_SEnum* m_pEnum;
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-//! Selection list shown in combo box, for enumerated variable.
-template <class T>
-class CVarEnumList
-    : public CVarEnumListBase<T>
-{
-public:
-    using CVarEnumListBase<T>::IsValueEqual;
-    CVarEnumList(){}
-    struct Item
-    {
-        QString name;
-        T value;
-    };
-    QString GetItemName(uint index)
-    {
-        if (index >= m_items.size())
-        {
-            return NULL;
-        }
-        return m_items[index].name;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    T NameToValue(const QString& name)
-    {
-        for (int i = 0; i < m_items.size(); i++)
-        {
-            if (name == m_items[i].name)
-            {
-                return m_items[i].value;
-            }
-        }
-        return T();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    QString ValueToName(T const& value)
-    {
-        for (int i = 0; i < m_items.size(); i++)
-        {
-            if (CVarEnumListBase<T>::IsValueEqual(value, m_items[i].value))
-            {
-                return m_items[i].name;
-            }
-        }
-        return "";
-    }
-
-    //! Add new item to the selection.
-    void AddItem(const QString& name, const T& value)
-    {
-        Item item;
-        item.name = name;
-        item.value = value;
-        m_items.push_back(item);
-    };
-
-protected:
-    ~CVarEnumList() {};
-
-private:
-    std::vector<Item> m_items;
-};
-
-//////////////////////////////////////////////////////////////////////////////////
-// CVariableEnum is the same as CVariable but it display enumerated values in UI
-//////////////////////////////////////////////////////////////////////////////////
-template <class T>
-class CVariableEnum
-    : public CVariable<T>
-{
-public:
-    using CVariable<T>::SetValue;
-    using CVariable<T>::GetFlags;
-    using CVariable<T>::OnSetValue;
-    using CVariable<T>::Set;
-    using CVariable<T>::m_valueDef;
-    using CVariable<T>::m_onSetEnumFuncs;
-    //////////////////////////////////////////////////////////////////////////
-    CVariableEnum(){}
-
-    //! Assign operator for variable.
-    void operator=(const T& value) { CVariable<T>::SetValue(value); }
-
-    //! Add new item to the enumeration.
-    void AddEnumItem(const char* name, const T& value)
-    {
-        AddEnumItem(QString(name), value);
-    };
-    //! Add new item to the enumeration.
-    void AddEnumItem(const QString& name, const T& value)
-    {
-        if (GetFlags() & IVariable::UI_USE_GLOBAL_ENUMS)  // don't think adding makes sense
-        {
-            return;
-        }
-        if (!m_enum)
-        {
-            m_enum = new CVarEnumList<T>();
-        }
-        m_enum->AddItem(name, value);
-        OnEnumsChanged();
-    };
-    void SetEnumList(CVarEnumListBase<T>* enumList)
-    {
-        m_enum = enumList;
-        OnSetValue(false);
-        OnEnumsChanged();
-    }
-    IVarEnumList* GetEnumList() const
-    {
-        return m_enum;
-    }
-    //////////////////////////////////////////////////////////////////////////
-    IVariable* Clone([[maybe_unused]] bool bRecursive) const
-    {
-        CVariableEnum<T>* var = new CVariableEnum<T>(*this);
-        return var;
-    }
-
-    virtual QString GetDisplayValue() const
-    {
-        if (m_enum)
-        {
-            return m_enum->ValueToName(m_valueDef);
-        }
-        else
-        {
-            return CVariable<T>::GetDisplayValue();
-        }
-    }
-
-    virtual void SetDisplayValue(const QString& value)
-    {
-        if (m_enum)
-        {
-            Set(m_enum->NameToValue(value));
-        }
-        else
-        {
-            Set(value);
-        }
-    }
-
-protected:
-    void OnEnumsChanged()
-    {
-        // Call on set callback.
-        for (auto it = m_onSetEnumFuncs.begin(); it != m_onSetEnumFuncs.end(); ++it)
-        {
-            // Call on set callback.
-            (*it)->operator()(this);
-        }
-    }
-
-    // Copy Constructor.
-    CVariableEnum(const CVariableEnum<T>& var)
-        : CVariable<T>(var)
-    {
-        m_enum = var.m_enum;
-    }
-private:
-    _smart_ptr<CVarEnumListBase<T> > m_enum;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Smart pointers to variables.
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-template <class T, class TVar>
-struct CSmartVariableBase
-{
-    typedef TVar VarType;
-
-    CSmartVariableBase() { pVar = new VarType(); }
-
-    operator T const& () const {
-        VarType* pV = pVar;
-        return *pV;
-    }
-    //void operator=( const T& value ) { VarType *pV = pVar; *pV = value; }
-
-    // Compare with pointer to variable.
-    bool operator==(IVariable* pV) { return pVar == pV; }
-    bool operator!=(IVariable* pV) { return pVar != pV; }
-
-    operator VarType&() {
-        VarType* pV = pVar;
-        return *pV;
-    }                                                        // Cast to CVariableBase&
-    VarType& operator*() const { return *pVar; }
-    VarType* operator->(void) const { return pVar; }
-
-    VarType* GetVar() const { return pVar; };
-
-protected:
-    _smart_ptr<VarType> pVar;
-};
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-struct CSmartVariable
-    : public CSmartVariableBase<T, CVariable<T> >
-{
-    using CSmartVariableBase<T, CVariable<T> >::pVar;
-    void operator=(const T& value) { CVariable<T>* pV = pVar; *pV = value; }
-};
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-struct CSmartVariableArrayT
-    : public CSmartVariableBase<T, TVariableArray<T> >
-{
-    using CSmartVariableBase<T, TVariableArray<T> >::pVar;
-    void operator=(const T& value) { TVariableArray<T>* pV = pVar; *pV = value; }
-};
-
-//////////////////////////////////////////////////////////////////////////
-template <class T>
-struct CSmartVariableEnum
-    : public CSmartVariableBase<T, CVariableEnum<T> >
-{
-    using CSmartVariableBase<T, CVariableEnum<T> >::pVar;
-    CSmartVariableEnum(){}
-    void operator=(const T& value) { CVariableEnum<T>* pV = pVar; *pV = value; }
-    void AddEnumItem(const QString& name, const T& value)
-    {
-        pVar->AddEnumItem(name, value);
-    };
-    void SetEnumList(CVarEnumListBase<T>* enumList)
-    {
-        pVar->EnableUpdateCallbacks(false);
-        pVar->SetEnumList(enumList);
-        pVar->EnableUpdateCallbacks(true);
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-struct CSmartVariableArray
-{
-    typedef CVariableArray VarType;
-
-    CSmartVariableArray() { pVar = new VarType(); }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Access operators.
-    //////////////////////////////////////////////////////////////////////////
-    operator VarType&() {
-        VarType* pV = pVar;
-        return *pV;
-    }
-
-    VarType& operator*() const { return *pVar; }
-    VarType* operator->(void) const { return pVar; }
-
-    VarType* GetVar() const { return pVar; };
-
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    _smart_ptr<VarType> pVar;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-//////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class EDITOR_CORE_API CVarBlock
-    : public IVariableContainer
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    // Dtor.
-    virtual ~CVarBlock() {}
-    //! Add variable to block.
-    virtual void AddVariable(IVariable* var);
-    //! Remove variable from block
-    virtual bool DeleteVariable(IVariable* var, bool bRecursive = false);
-
-    void AddVariable(IVariable* pVar, const char* varName, unsigned char dataType = IVariable::DT_SIMPLE);
-    // This used from smart variable pointer.
-    void AddVariable(CVariableBase& var, const char* varName, unsigned char dataType = IVariable::DT_SIMPLE);
-
-    //! Returns number of variables in block.
-    virtual int GetNumVariables() const { return static_cast<int>(m_vars.size()); }
-
-    //! Get pointer to stored variable by index.
-    virtual IVariable* GetVariable(int index) const
-    {
-        assert(index >= 0 && index < m_vars.size());
-        return m_vars[index];
-    }
-
-    // Clear all vars from VarBlock.
-    virtual void DeleteAllVariables() { m_vars.clear(); };
-
-    //! Return true if variable block is empty (Does not have any vars).
-    virtual bool IsEmpty() const { return m_vars.empty(); }
-
-    // Returns true if var block contains specified variable.
-    virtual bool IsContainsVariable(IVariable* pVar, bool bRecursive = true) const;
-
-    //! Find variable by name.
-    virtual IVariable* FindVariable(const char* name, bool bRecursive = true, bool bHumanName = false) const;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Clone var block.
-    CVarBlock* Clone(bool bRecursive) const;
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Copy variable values from specified var block.
-    //! Do not create new variables, only copy values of existing ones.
-    //! Should only be used to copy identical var blocks (eg. not Array type var copied to String type var)
-    //! @param fromVarBlock Source variable block that contain copied values, must be identical to this var block.
-    void CopyValues(const CVarBlock* fromVarBlock);
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Copy variable values from specified var block.
-    //! Do not create new variables, only copy values of existing ones.
-    //! Can be used to copy slightly different var blocks, matching performed by variable name.
-    //! @param fromVarBlock Source variable block that contain copied values.
-    void CopyValuesByName(CVarBlock* fromVarBlock);
-
-    void OnSetValues();
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Set UI_CREATE_SPLINE flags for all the varialbes in this Var Block.
-    //! This is because when the data was changed for a spline variable, the spline need to be recreated to reflect the change.
-    //! Set the flag to notify the spline variable.
-    void SetRecreateSplines();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Wire/Unwire other variable blocks.
-    //////////////////////////////////////////////////////////////////////////
-    //! Wire to other variable block.
-    //! Only equivalent VarBlocks can be wired (same number of variables with same type).
-    //! Recursive wiring of array variables is supported.
-    void Wire(CVarBlock* toVarBlock);
-    //! Unwire var block.
-    void Unwire(CVarBlock* varBlock);
-
-    //! Add this callback to every variable in block (recursively).
-    void AddOnSetCallback(IVariable::OnSetCallback* func);
-    //! Remove this callback from every variable in block (recursively).
-    void RemoveOnSetCallback(IVariable::OnSetCallback* func);
-
-    //////////////////////////////////////////////////////////////////////////
-    void Serialize(XmlNodeRef vbNode, bool load);
-
-    void ReserveNumVariables(int numVars);
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Gather resources in this variable block.
-    virtual void GatherUsedResources(CUsedResources& resources);
-
-    void EnableUpdateCallbacks(bool boEnable);
-    IVariable* FindChildVar(const char* name, IVariable* pParentVar) const;
-
-    void Sort();
-
-protected:
-    void SetCallbackToVar(IVariable::OnSetCallback* func, IVariable* pVar, bool bAdd);
-    void WireVar(IVariable* src, IVariable* trg, bool bWire);
-    void GatherUsedResourcesInVar(IVariable* pVar, CUsedResources& resources);
-
-    typedef std::vector<IVariablePtr> Variables;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Variables m_vars;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-typedef _smart_ptr<CVarBlock> CVarBlockPtr;
-
-//////////////////////////////////////////////////////////////////////////
-class EDITOR_CORE_API CVarObject
-    : public QObject
-    , public CRefCountBase
-{
-public:
-    typedef IVariable::OnSetCallback VarOnSetCallback;
-
-    CVarObject();
-    ~CVarObject();
-
-    void Serialize(XmlNodeRef node, bool load);
-    CVarBlock* GetVarBlock() const { return m_vars; };
-
-    void AddVariable(CVariableBase& var, const QString& varName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
-    void AddVariable(CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
-    void AddVariable(CVariableArray& table, CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
-    void ReserveNumVariables(int numVars);
-    void RemoveVariable(IVariable* var);
-
-    void EnableUpdateCallbacks(bool boEnable);
-    void OnSetValues();
-protected:
-    //! Copy values of variables from other VarObject.
-    //! Source object must be of same type.
-    void CopyVariableValues(CVarObject* sourceObject);
-
-private:
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    CVarBlockPtr m_vars;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-Q_DECLARE_METATYPE(IVariable *);
-
-#endif // CRYINCLUDE_EDITOR_UTIL_VARIABLE_H
diff --git a/Code/Sandbox/Editor/Util/VariablePropertyType.cpp b/Code/Sandbox/Editor/Util/VariablePropertyType.cpp
deleted file mode 100644
index 25eef2d3c2..0000000000
--- a/Code/Sandbox/Editor/Util/VariablePropertyType.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "VariablePropertyType.h"
-
-#include "Variable.h"
-#include "UIEnumsDatabase.h"
-#include "IEditor.h"
-
-namespace Prop
-{
-    struct
-    {
-        int dataType;
-        const char* name;
-        PropertyType type;
-        int image;
-    } static s_propertyTypeNames[] =
-    {
-        { IVariable::DT_SIMPLE, "Bool", ePropertyBool, 2 },
-        { IVariable::DT_SIMPLE, "Int", ePropertyInt, 0 },
-        { IVariable::DT_SIMPLE, "Float", ePropertyFloat, 0 },
-        { IVariable::DT_SIMPLE, "Vector", ePropertyVector2, 10 },
-        { IVariable::DT_SIMPLE, "Vector", ePropertyVector, 10 },
-        { IVariable::DT_SIMPLE, "Vector", ePropertyVector4, 10 },
-        { IVariable::DT_SIMPLE, "String", ePropertyString, 3 },
-        { IVariable::DT_PERCENT, "Float", ePropertyInt, 13 },
-        { IVariable::DT_BOOLEAN, "Boolean", ePropertyBool, 2 },
-        { IVariable::DT_COLOR, "Color", ePropertyColor, 1 },
-        { IVariable::DT_COLORA, "ColorA", ePropertyColor, 1 },
-        { IVariable::DT_CURVE | IVariable::DT_PERCENT, "FloatCurve", ePropertyFloatCurve, 13 },
-        { IVariable::DT_CURVE | IVariable::DT_COLOR, "ColorCurve", ePropertyColorCurve, 1 },
-        { IVariable::DT_ANGLE, "Angle", ePropertyAngle, 0 },
-        { IVariable::DT_FILE, "File", ePropertyFile, 7 },
-        { IVariable::DT_TEXTURE, "Texture", ePropertyTexture, 4 },
-        { IVariable::DT_ANIMATION, "Animation", ePropertyAnimation, -1 },
-        { IVariable::DT_MOTION, "Motion", ePropertyMotion, -1 },
-        { IVariable::DT_OBJECT, "Model", ePropertyModel, 5 },
-        { IVariable::DT_SIMPLE, "Selection", ePropertySelection, -1 },
-        { IVariable::DT_SIMPLE, "List", ePropertyList, -1 },
-        { IVariable::DT_SHADER, "Shader", ePropertyShader, 9 },
-        { IVariable::DT_DEPRECATED0, "DEPRECATED", ePropertyDeprecated2, -1 },
-        { IVariable::DT_EQUIP, "Equip", ePropertyEquip, 11 },
-        { IVariable::DT_REVERBPRESET, "ReverbPreset", ePropertyReverbPreset, 11 },
-        { IVariable::DT_LOCAL_STRING, "LocalString", ePropertyLocalString, 3 },
-        { IVariable::DT_SEQUENCE, "Sequence", ePropertySequence, -1 },
-        { IVariable::DT_MISSIONOBJ, "Mission Objective", ePropertyMissionObj, -1 },
-        { IVariable::DT_USERITEMCB, "User", ePropertyUser, -1 },
-        { IVariable::DT_SEQUENCE_ID, "SequenceId", ePropertySequenceId, -1 },
-        { IVariable::DT_LIGHT_ANIMATION, "LightAnimation", ePropertyLightAnimation, -1 },
-        { IVariable::DT_PARTICLE_EFFECT, "ParticleEffect", ePropertyParticleName, 3 },
-        { IVariable::DT_GEOM_CACHE, "Geometry Cache", ePropertyGeomCache, 5 },
-        { IVariable::DT_AUDIO_TRIGGER, "Audio Trigger", ePropertyAudioTrigger, 6 },
-        { IVariable::DT_AUDIO_SWITCH, "Audio Switch", ePropertyAudioSwitch, 6 },
-        { IVariable::DT_AUDIO_SWITCH_STATE, "Audio Switch", ePropertyAudioSwitchState, 6 },
-        { IVariable::DT_AUDIO_RTPC, "Audio Realtime Parameter Control", ePropertyAudioRTPC, 6 },
-        { IVariable::DT_AUDIO_ENVIRONMENT, "Audio Environment", ePropertyAudioEnvironment, 6 },
-        { IVariable::DT_AUDIO_PRELOAD_REQUEST, "Audio Preload Request", ePropertyAudioPreloadRequest, 6 },
-        { IVariable::DT_SIMPLE, "Custom", ePropertyFlowCustomData, -1 },
-        { IVariable::DT_UI_ELEMENT, "UiElement", ePropertyUiElement, -1 }
-    };
-
-    static const int NumPropertyTypes = sizeof(s_propertyTypeNames) / sizeof(s_propertyTypeNames[0]);
-
-    Description::Description()
-        : m_type(ePropertyInvalid)
-        , m_numImages(-1)
-        , m_enumList(NULL)
-        , m_rangeMin(0)
-        , m_rangeMax(100)
-        , m_step(0)
-        , m_bHardMin(false)
-        , m_bHardMax(false)
-        , m_valueMultiplier(1)
-        , m_pEnumDBItem(NULL)
-    {
-    }
-
-    Description::Description(IVariable* pVar)
-        : m_type(ePropertyInvalid)
-        , m_numImages(-1)
-        , m_enumList(NULL)
-        , m_rangeMin(0)
-        , m_rangeMax(100)
-        , m_step(0)
-        , m_bHardMin(false)
-        , m_bHardMax(false)
-        , m_valueMultiplier(1)
-        , m_pEnumDBItem(NULL)
-    {
-        if (!pVar)
-        {
-            return;
-        }
-
-        const int type = (int)pVar->GetDataType();
-
-        if (type != IVariable::DT_SIMPLE)
-        {
-            m_type = GetType(type);
-            m_numImages = GetNumImages(pVar);
-        }
-
-        m_name = pVar->GetHumanName();
-        m_enumList = pVar->GetEnumList();
-
-        if (m_enumList != NULL)
-        {
-            m_type = ePropertySelection;
-        }
-
-        if (m_type == ePropertyInvalid)
-        {
-            switch (pVar->GetType())
-            {
-            case IVariable::INT:
-                m_type = ePropertyInt;
-                break;
-            case IVariable::BOOL:
-                m_type = ePropertyBool;
-                break;
-            case IVariable::FLOAT:
-                m_type = ePropertyFloat;
-                break;
-            case IVariable::VECTOR2:
-                m_type = ePropertyVector2;
-                break;
-            case IVariable::VECTOR4:
-                m_type = ePropertyVector4;
-                break;
-            case IVariable::VECTOR:
-                m_type = ePropertyVector;
-                break;
-            case IVariable::STRING:
-                m_type = ePropertyString;
-                break;
-            case IVariable::FLOW_CUSTOM_DATA:
-                m_type = ePropertyFlowCustomData;
-                break;
-            default:
-                break;
-            }
-
-            m_numImages = Prop::GetNumImages(m_type);
-        }
-
-        // Get variable limits.
-        pVar->GetLimits(m_rangeMin, m_rangeMax, m_step, m_bHardMin, m_bHardMax);
-
-        // Check if value is percents.
-        if (type == IVariable::DT_PERCENT)
-        {
-            // Scale all values by 100.
-            m_valueMultiplier = 100;
-        }
-        else if (type == IVariable::DT_ANGLE)
-        {
-            // Scale radians to degrees.
-            m_valueMultiplier = RAD2DEG(1);
-            m_rangeMin = max(-360.0f, m_rangeMin);
-            m_rangeMax = min(360.0f, m_rangeMax);
-        }
-        else if (type == IVariable::DT_UIENUM)
-        {
-            m_pEnumDBItem = GetIEditor()->GetUIEnumsDatabase()->FindEnum(m_name);
-        }
-
-
-        const bool useExplicitStep = (pVar->GetFlags() & IVariable::UI_EXPLICIT_STEP);
-        if (!useExplicitStep)
-        {
-            // Limit step size to 1000.
-            int nPrec = max(3 - int(log(m_rangeMax - m_rangeMin) / log(10.f)), 0);
-            m_step = max(m_step, powf(10.f, -nPrec));
-        }
-    }
-
-    const char* GetName(int dataType)
-    {
-        for (int i = 0; i < NumPropertyTypes; i++)
-        {
-            if (dataType == s_propertyTypeNames[i].type)
-            {
-                return s_propertyTypeNames[i].name;
-            }
-        }
-
-        return "";
-    }
-
-    PropertyType GetType(int dataType)
-    {
-        for (int i = 0; i < NumPropertyTypes; i++)
-        {
-            if (dataType == s_propertyTypeNames[i].dataType)
-            {
-                return s_propertyTypeNames[i].type;
-            }
-        }
-
-        return ePropertyInvalid;
-    }
-
-    PropertyType GetType(const IVariable* var)
-    {
-        assert(var);
-        if (!var)
-        {
-            return ePropertyInvalid;
-        }
-
-        const int dataType = (int)var->GetDataType();
-
-        for (int i = 0; i < NumPropertyTypes; i++)
-        {
-            if (dataType == s_propertyTypeNames[i].dataType)
-            {
-                return s_propertyTypeNames[i].type;
-            }
-        }
-
-        return ePropertyInvalid;
-    }
-
-    PropertyType GetType(const char* type)
-    {
-        assert(type);
-        if (!type)
-        {
-            return ePropertyInvalid;
-        }
-
-        for (int i = 0; i < NumPropertyTypes; i++)
-        {
-            if (azstricmp(type, s_propertyTypeNames[i].name) == 0)
-            {
-                return s_propertyTypeNames[i].type;
-            }
-        }
-
-        return ePropertyInvalid;
-    }
-
-    // look up image by property type
-    int GetNumImages(int propertyType)
-    {
-        for (int i = 0; i < NumPropertyTypes; i++)
-        {
-            if (propertyType == s_propertyTypeNames[i].type)
-            {
-                return s_propertyTypeNames[i].image;
-            }
-        }
-
-        return -1;
-    }
-
-    // look up image by data type
-    int GetNumImages(const IVariable* var)
-    {
-        assert(var);
-        if (!var)
-        {
-            return -1;
-        }
-
-        const int dataType = (int)var->GetDataType();
-
-        for (int i = 0; i < NumPropertyTypes; i++)
-        {
-            if (dataType == s_propertyTypeNames[i].dataType)
-            {
-                return s_propertyTypeNames[i].image;
-            }
-        }
-
-        return -1;
-    }
-
-    int GetNumImages(const char* type)
-    {
-        assert(type);
-        if (!type)
-        {
-            return -1;
-        }
-
-        for (int i = 0; i < NumPropertyTypes; i++)
-        {
-            if (azstricmp(type, s_propertyTypeNames[i].name) == 0)
-            {
-                return s_propertyTypeNames[i].image;
-            }
-        }
-
-        return -1;
-    }
-
-    const char* GetPropertyTypeToResourceType(PropertyType type)
-    {
-        // The strings below are names used together with
-        // REGISTER_RESOURCE_SELECTOR. See IResourceSelector.h.
-        switch (type)
-        {
-        case ePropertyModel:
-            return "Model";
-        case ePropertyGeomCache:
-            return "GeomCache";
-        case ePropertyAudioTrigger:
-            return "AudioTrigger";
-        case ePropertyAudioSwitch:
-            return "AudioSwitch";
-        case ePropertyAudioSwitchState:
-            return "AudioSwitchState";
-        case ePropertyAudioRTPC:
-            return "AudioRTPC";
-        case ePropertyAudioEnvironment:
-            return "AudioEnvironment";
-        case ePropertyAudioPreloadRequest:
-            return "AudioPreloadRequest";
-        default:
-            return 0;
-        }
-    }
-}
diff --git a/Code/Sandbox/Editor/Util/VariablePropertyType.h b/Code/Sandbox/Editor/Util/VariablePropertyType.h
deleted file mode 100644
index dc41db8f8a..0000000000
--- a/Code/Sandbox/Editor/Util/VariablePropertyType.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-//! All possible property types.
-#ifndef CRYINCLUDE_EDITOR_UTIL_PROPERTYDEFINITION_H
-#define CRYINCLUDE_EDITOR_UTIL_PROPERTYDEFINITION_H
-#pragma once
-
-#include "Include/EditorCoreAPI.h"
-#include "Variable.h"
-
-enum PropertyType
-{
-    ePropertyInvalid = 0,
-    ePropertyTable = 1,
-    ePropertyBool = 2,
-    ePropertyInt,
-    ePropertyFloat,
-    ePropertyVector2,
-    ePropertyVector,
-    ePropertyVector4,
-    ePropertyString,
-    ePropertyColor,
-    ePropertyAngle,
-    ePropertyFloatCurve,
-    ePropertyColorCurve,
-    ePropertyFile,
-    ePropertyTexture,
-    ePropertyAnimation,
-    ePropertyModel,
-    ePropertySelection,
-    ePropertyList,
-    ePropertyShader,
-    ePropertyDeprecated2, // formerly ePropertyMaterial
-    ePropertyEquip,
-    ePropertyReverbPreset,
-    ePropertyLocalString,
-    ePropertyDeprecated0, // formerly ePropertyCustomAction
-    ePropertyGameToken,
-    ePropertySequence,
-    ePropertyMissionObj,
-    ePropertyUser,
-    ePropertySequenceId,
-    ePropertyLightAnimation,
-    ePropertyDeprecated1, // formerly ePropertyFlare
-    ePropertyParticleName,
-    ePropertyGeomCache,
-    ePropertyAudioTrigger,
-    ePropertyAudioSwitch,
-    ePropertyAudioSwitchState,
-    ePropertyAudioRTPC,
-    ePropertyAudioEnvironment,
-    ePropertyAudioPreloadRequest,
-    ePropertyFlowCustomData,
-    ePropertyUiElement,
-    ePropertyMotion
-};
-
-namespace Prop
-{
-    struct EDITOR_CORE_API Description
-    {
-        Description();
-        Description(IVariable* pVar);
-
-        PropertyType m_type;
-        int m_numImages;
-        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        IVarEnumListPtr m_enumList;
-        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        float m_rangeMin;
-        float m_rangeMax;
-        float m_step;
-        bool m_bHardMin;
-        bool m_bHardMax;
-        QString m_name;
-        float m_valueMultiplier;
-        CUIEnumsDatabase_SEnum* m_pEnumDBItem;
-    };
-
-    EDITOR_CORE_API const char* GetName(int dataType);
-
-    EDITOR_CORE_API PropertyType GetType(int dataType);
-    EDITOR_CORE_API PropertyType GetType(const IVariable* var);
-    EDITOR_CORE_API PropertyType GetType(const char* type);
-
-    EDITOR_CORE_API int GetNumImages(int dataType);
-    EDITOR_CORE_API int GetNumImages(const IVariable* var);
-    EDITOR_CORE_API int GetNumImages(const char* type);
-
-    EDITOR_CORE_API const char* GetPropertyTypeToResourceType(PropertyType type);
-}
-
-#endif // CRYINCLUDE_EDITOR_UTIL_PROPERTYDEFINITION_H
diff --git a/Code/Sandbox/Editor/Util/XmlArchive.cpp b/Code/Sandbox/Editor/Util/XmlArchive.cpp
deleted file mode 100644
index dc13a3d8d7..0000000000
--- a/Code/Sandbox/Editor/Util/XmlArchive.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "XmlArchive.h"
-
-// Editor
-#include "PakFile.h"
-
-//////////////////////////////////////////////////////////////////////////
-// 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)
-{
-    _smart_ptr<IXmlStringData> pXmlStrData = root->getXMLData(5000000);
-
-    // Save xml file.
-    QString xmlFilename = "Level.editor_xml";
-    pakFile.UpdateFile(xmlFilename.toUtf8().data(), (void*)pXmlStrData->GetString(), pXmlStrData->GetStringLength());
-
-    if (pakFile.GetArchive())
-    {
-        CLogFile::FormatLine("Saving pak file %s", (const char*)pakFile.GetArchive()->GetFullPath());
-    }
-
-    pNamedData->Save(pakFile);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlArchive::LoadFromPak(const QString& levelPath, CPakFile& pakFile)
-{
-    QString xmlFilename = QDir(levelPath).absoluteFilePath("Level.editor_xml");
-    root = XmlHelpers::LoadXmlFromFile(xmlFilename.toUtf8().data());
-    if (!root)
-    {
-        return false;
-    }
-
-    return pNamedData->Load(levelPath, pakFile);
-}
diff --git a/Code/Sandbox/Editor/Util/XmlArchive.h b/Code/Sandbox/Editor/Util/XmlArchive.h
deleted file mode 100644
index d3e41d47d8..0000000000
--- a/Code/Sandbox/Editor/Util/XmlArchive.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Stores XML in MFC archive.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_XMLARCHIVE_H
-#define CRYINCLUDE_EDITOR_UTIL_XMLARCHIVE_H
-#pragma once
-
-
-#include "NamedData.h"
-#include "EditorUtils.h"
-
-class CPakFile;
-/*!
- *  CXmlArcive used to stores XML in MFC archive.
- */
-class CXmlArchive
-{
-public:
-    XmlNodeRef  root;
-    CNamedData* pNamedData;
-    bool                bLoading;
-    bool                bOwnNamedData;
-
-    CXmlArchive()
-    {
-        bLoading = false;
-        bOwnNamedData = true;
-        pNamedData = new CNamedData;
-    };
-    explicit CXmlArchive(const QString& xmlRoot)
-    {
-        bLoading = false;
-        bOwnNamedData = true;
-        pNamedData = new CNamedData;
-        root = XmlHelpers::CreateXmlNode(xmlRoot.toUtf8().data());
-    };
-    ~CXmlArchive()
-    {
-        if (bOwnNamedData)
-        {
-            delete pNamedData;
-        }
-    };
-    CXmlArchive(const CXmlArchive& ar) { *this = ar; }
-    CXmlArchive& operator=(const CXmlArchive& ar)
-    {
-        root = ar.root;
-        pNamedData = ar.pNamedData;
-        bLoading = ar.bLoading;
-        bOwnNamedData = false;
-        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);
-    bool LoadFromPak(const QString& levelPath, CPakFile& pakFile);
-};
-
-
-#endif // CRYINCLUDE_EDITOR_UTIL_XMLARCHIVE_H
diff --git a/Code/Sandbox/Editor/Util/XmlHistoryManager.cpp b/Code/Sandbox/Editor/Util/XmlHistoryManager.cpp
deleted file mode 100644
index fc932c96d8..0000000000
--- a/Code/Sandbox/Editor/Util/XmlHistoryManager.cpp
+++ /dev/null
@@ -1,874 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "XmlHistoryManager.h"
-
-////////////////////////////////////////////////////////////////////////////
-SXmlHistory::SXmlHistory(CXmlHistoryManager* pManager, const XmlNodeRef& xmlBaseVersion, uint32 typeId)
-    : m_pManager(pManager)
-    , m_typeId(typeId)
-    , m_DeletedVersion(-1)
-    , m_SavedVersion(-1)
-{
-    int newVersionNumber = m_pManager->GetCurrentVersionNumber() + (m_pManager->IsPreparedForNextVersion() ? 1 : 0);
-    m_xmlVersionList[ newVersionNumber ] = xmlBaseVersion;
-}
-
-////////////////////////////////////////////////////////////////////////////
-void SXmlHistory::AddToHistory(const XmlNodeRef& newXmlVersion)
-{
-    int newVersionNumber = m_pManager->IncrementVersion(this);
-    m_xmlVersionList[ newVersionNumber ] = newXmlVersion;
-}
-
-////////////////////////////////////////////////////////////////////////////
-const XmlNodeRef& SXmlHistory::Undo(bool* bVersionExist)
-{
-    m_pManager->Undo();
-    return GetCurrentVersion(bVersionExist);
-}
-
-////////////////////////////////////////////////////////////////////////////
-const XmlNodeRef& SXmlHistory::Redo()
-{
-    m_pManager->Redo();
-    return GetCurrentVersion();
-}
-
-////////////////////////////////////////////////////////////////////////////
-const XmlNodeRef& SXmlHistory::GetCurrentVersion(bool* bVersionExist, int* iVersionNumber) const
-{
-    int currentVersion = m_pManager->GetCurrentVersionNumber();
-
-    TXmlVersionMap::const_iterator it = m_xmlVersionList.begin();
-    TXmlVersionMap::const_iterator previt = m_xmlVersionList.begin();
-    while (it != m_xmlVersionList.end())
-    {
-        if (it->first > currentVersion)
-        {
-            break;
-        }
-        previt = it;
-        ++it;
-    }
-
-    if (bVersionExist)
-    {
-        *bVersionExist = currentVersion >= m_xmlVersionList.begin()->first;
-    }
-    if (iVersionNumber)
-    {
-        *iVersionNumber = previt->first;
-    }
-
-    return previt->second;
-}
-
-////////////////////////////////////////////////////////////////////////////
-bool SXmlHistory::IsModified() const
-{
-    int currVersion;
-    GetCurrentVersion(NULL, &currVersion);
-    return m_SavedVersion != currVersion;
-}
-
-////////////////////////////////////////////////////////////////////////////
-void SXmlHistory::FlagAsDeleted()
-{
-    assert(m_pManager->IsPreparedForNextVersion());
-    m_DeletedVersion = m_pManager->GetCurrentVersionNumber() + 1;
-    m_SavedVersion = -1;
-}
-
-////////////////////////////////////////////////////////////////////////////
-void SXmlHistory::FlagAsSaved()
-{
-    if (Exist())
-    {
-        int currVersion;
-        GetCurrentVersion(NULL, &currVersion);
-        m_SavedVersion = currVersion;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-bool SXmlHistory::Exist() const
-{
-    //  int currentVersion = m_pManager->GetCurrentVersionNumber();
-    //  bool deleted = m_DeletedVersion != -1 && currentVersion >= m_DeletedVersion;
-    //  bool exist = currentVersion >= m_xmlVersionList.begin()->first;
-    //  return !deleted && exist;
-    int currentVersion = m_pManager->GetCurrentVersionNumber();
-    return currentVersion >= m_xmlVersionList.begin()->first && (m_DeletedVersion == -1 || currentVersion < m_DeletedVersion);
-}
-
-////////////////////////////////////////////////////////////////////////////
-void SXmlHistory::ClearRedo()
-{
-    int currentVersion = m_pManager->GetCurrentVersionNumber();
-    if (m_DeletedVersion > currentVersion + (m_pManager->IsPreparedForNextVersion() ? 1 : 0))
-    {
-        m_DeletedVersion = -1;
-    }
-    TXmlVersionMap::iterator it = m_xmlVersionList.begin();
-    for (; it != m_xmlVersionList.end(); ++it)
-    {
-        if (it->first > currentVersion)
-        {
-            break;
-        }
-    }
-    if (it != m_xmlVersionList.end())
-    {
-        ++it;
-        while (it != m_xmlVersionList.end())
-        {
-            m_xmlVersionList.erase(it++);
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////
-void SXmlHistory::ClearHistory(bool flagAsSaved)
-{
-    bool wasModified = !flagAsSaved && IsModified();
-    m_DeletedVersion = Exist() ? -1 : 0;
-    ClearRedo();
-    XmlNodeRef latest = m_xmlVersionList.rbegin()->second;
-    m_xmlVersionList.clear();
-    m_xmlVersionList[ 0 ] = latest;
-    m_SavedVersion = wasModified ? -1 : 0;
-}
-
-////////////////////////////////////////////////////////////////////////////
-SXmlHistoryGroup::SXmlHistoryGroup(CXmlHistoryManager* pManager, uint32 typeId)
-    : m_pManager(pManager)
-    , m_typeId(typeId)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////
-SXmlHistory* SXmlHistoryGroup::GetHistory(int index) const
-{
-    THistoryList::const_iterator it = m_List.begin();
-    while (index > 0 && it != m_List.end())
-    {
-        ++it;
-        if ((*it)->Exist())
-        {
-            --index;
-        }
-    }
-    return it != m_List.end() ? *it : NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////
-int SXmlHistoryGroup::GetHistoryCount() const
-{
-    int count = 0;
-    for (THistoryList::const_iterator it = m_List.begin(); it != m_List.end(); ++it)
-    {
-        if ((*it)->Exist())
-        {
-            count++;
-        }
-    }
-    return count;
-}
-
-////////////////////////////////////////////////////////////////////////////
-SXmlHistory* SXmlHistoryGroup::GetHistoryByTypeId(uint32 typeId, int index /*= 0*/) const
-{
-    for (int i = 0; i < GetHistoryCount(); ++i)
-    {
-        SXmlHistory* pHistory = GetHistory(i);
-        if (pHistory->GetTypeId() == typeId)
-        {
-            index--;
-        }
-        if (index == -1)
-        {
-            return pHistory;
-        }
-    }
-    return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////
-int SXmlHistoryGroup::GetHistoryCountByTypeId(uint32 typeId) const
-{
-    int res = 0;
-    for (int i = 0; i < GetHistoryCount(); ++i)
-    {
-        if (GetHistory(i)->GetTypeId() == typeId)
-        {
-            res++;
-        }
-    }
-    return res;
-}
-
-////////////////////////////////////////////////////////////////////////////
-int SXmlHistoryGroup::CreateXmlHistory(uint32 typeId, const XmlNodeRef& xmlBaseVersion)
-{
-    if (m_pManager)
-    {
-        m_List.push_back(m_pManager->CreateXmlHistory(typeId, xmlBaseVersion));
-        return m_List.size() - 1;
-    }
-    return -1;
-}
-
-////////////////////////////////////////////////////////////////////////////
-int SXmlHistoryGroup::GetHistoryIndex(const SXmlHistory* pHistory) const
-{
-    int index = 0;
-    for (THistoryList::const_iterator it = m_List.begin(); it != m_List.end(); ++it)
-    {
-        if (*it == pHistory)
-        {
-            return index;
-        }
-        index++;
-    }
-    return -1;
-}
-
-////////////////////////////////////////////////////////////////////////////
-CXmlHistoryManager::CXmlHistoryManager()
-    : m_CurrentVersion(0)
-    , m_LatestVersion(0)
-    , m_pExclusiveListener(NULL)
-    , m_RecordNextVersion(false)
-    , m_pExActiveGroup(NULL)
-    , m_bIsActiveGroupEx(false)
-{
-    m_pNullGroup = new SXmlHistoryGroup(this, (uint32) - 1);
-}
-
-CXmlHistoryManager::~CXmlHistoryManager()
-{
-    delete m_pNullGroup;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-bool CXmlHistoryManager::Undo()
-{
-    if (m_CurrentVersion > 0)
-    {
-        int prevVersion = m_CurrentVersion;
-        const SXmlHistoryGroup* pPrevCurrGroup = GetActiveGroup();
-        m_CurrentVersion--;
-        ReloadCurrentVersion(pPrevCurrGroup, prevVersion);
-        return true;
-    }
-    return false;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-bool CXmlHistoryManager::Redo()
-{
-    if (m_CurrentVersion < m_LatestVersion)
-    {
-        int prevVersion = m_CurrentVersion;
-        const SXmlHistoryGroup* pPrevCurrGroup = GetActiveGroup();
-        m_CurrentVersion++;
-        ReloadCurrentVersion(pPrevCurrGroup, prevVersion);
-        return true;
-    }
-    return false;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-bool CXmlHistoryManager::Goto(int historyNum)
-{
-    if (historyNum >= 0 && historyNum <= m_LatestVersion)
-    {
-        int prevVersion = m_CurrentVersion;
-        const SXmlHistoryGroup* pPrevCurrGroup = GetActiveGroup();
-        m_CurrentVersion = historyNum;
-        ReloadCurrentVersion(pPrevCurrGroup, prevVersion);
-        return true;
-    }
-    return false;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RecordUndo(IXmlUndoEventHandler* pEventHandler, const char* desc)
-{
-    ClearRedo();
-    SXmlHistory* pChangedXml = m_UndoEventHandlerMap[ pEventHandler ].CurrentData;
-    assert(pChangedXml);
-
-    XmlNodeRef newData = gEnv->pSystem->CreateXmlNode();
-#if !defined(NDEBUG)
-    bool bRes =
-#endif
-        pEventHandler->SaveToXml(newData);
-    assert(bRes);
-
-    TXmlHistotyGroupPtrList activeGroups = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
-
-    pChangedXml->AddToHistory(newData);
-    m_UndoEventHandlerMap[ pEventHandler ].HistoryData[ m_CurrentVersion ] = pChangedXml;
-    m_HistoryInfoMap[ m_CurrentVersion ].HistoryDescription = desc;
-    m_HistoryInfoMap[ m_CurrentVersion ].IsNullUndo = false;
-    m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups = activeGroups;
-    m_HistoryInfoMap[ m_CurrentVersion ].HistoryInvalidated = false;
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_VersionAdded);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::UndoEventHandlerDestroyed(IXmlUndoEventHandler* pEventHandler, uint32 typeId /*= 0*/, bool destoryForever /*= false*/)
-{
-    if (destoryForever)
-    {
-        UnregisterUndoEventHandler(pEventHandler);
-    }
-    else
-    {
-        m_InvalidHandlerMap[typeId] = pEventHandler;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RestoreUndoEventHandler(IXmlUndoEventHandler* pEventHandler, uint32 typeId)
-{
-    TInvalidUndoEventListener::iterator it = m_InvalidHandlerMap.find(typeId);
-    if (it != m_InvalidHandlerMap.end())
-    {
-        IXmlUndoEventHandler* pLastHandler = it->second;
-        TUndoEventHandlerMap::iterator lastit = m_UndoEventHandlerMap.find(pLastHandler);
-        if (lastit != m_UndoEventHandlerMap.end())
-        {
-            m_UndoEventHandlerMap[pEventHandler] = lastit->second;
-            m_UndoEventHandlerMap.erase(lastit);
-        }
-        m_InvalidHandlerMap.erase(it);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RegisterEventListener(IXmlHistoryEventListener* pEventListener)
-{
-    stl::push_back_unique(m_EventListener, pEventListener);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::UnregisterEventListener(IXmlHistoryEventListener* pEventListener)
-{
-    m_EventListener.remove(pEventListener);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::PrepareForNextVersion()
-{
-    assert(!m_RecordNextVersion);
-    m_RecordNextVersion = true;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RecordNextVersion(SXmlHistory* pHistory, XmlNodeRef newData, const char* undoDesc /*= NULL*/)
-{
-    assert(m_RecordNextVersion);
-    RegisterUndoEventHandler(this, pHistory);
-    m_newHistoryData = newData;
-    RecordUndo(this, undoDesc ? undoDesc : "<UNDEFINED>");
-    m_RecordNextVersion = false;
-    m_HistoryInfoMap[ m_CurrentVersion ].HistoryInvalidated = true;
-    UnregisterUndoEventHandler(this);
-    SetActiveGroupInt(GetActiveGroup());
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryInvalidate);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-bool CXmlHistoryManager::SaveToXml(XmlNodeRef& xmlNode)
-{
-    assert(m_newHistoryData);
-    xmlNode = m_newHistoryData;
-    return true;
-}
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::ClearHistory(bool flagAsSaved)
-{
-    TXmlHistotyGroupPtrList activeGropus = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
-    for (TXmlHistoryList::iterator it = m_XmlHistoryList.begin(); it != m_XmlHistoryList.end(); ++it)
-    {
-        it->ClearHistory(flagAsSaved);
-    }
-
-    SetActiveGroup(NULL);
-
-    m_CurrentVersion = 0;
-    m_LatestVersion = 0;
-
-    m_UndoEventHandlerMap.clear();
-    m_HistoryInfoMap.clear();
-
-    m_HistoryInfoMap[ 0 ].HistoryDescription = "New History";
-    m_HistoryInfoMap[ 0 ].ActiveGroups = activeGropus;
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryCleared);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-const string& CXmlHistoryManager::GetVersionDesc(int number) const
-{
-    THistoryInfoMap::const_iterator it = m_HistoryInfoMap.find(number);
-    if (it != m_HistoryInfoMap.end())
-    {
-        return it->second.HistoryDescription;
-    }
-
-    static string undef("UNDEFINED");
-    return undef;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RegisterView(IXmlHistoryView* pView)
-{
-    stl::push_back_unique(m_Views, pView);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::UnregisterView(IXmlHistoryView* pView)
-{
-    m_Views.remove(pView);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-SXmlHistoryGroup* CXmlHistoryManager::CreateXmlGroup(uint32 typeId)
-{
-    m_Groups.push_back(SXmlHistoryGroup(this, typeId));
-    return &(*m_Groups.rbegin());
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::AddXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc /*= NULL*/)
-{
-    RecordUndoInternal(undoDesc ? undoDesc : "New XML Group added");
-    m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups.push_back(pGroup);
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupAdded, (void*)pGroup);
-}
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc /*= NULL*/)
-{
-    bool unload = m_HistoryInfoMap[ m_CurrentVersion ].CurrGroup == pGroup;
-    RecordUndoInternal(undoDesc ? undoDesc : "XML Group deleted");
-    TXmlHistotyGroupPtrList& list = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
-    stl::find_and_erase(list, pGroup);
-    if (unload)
-    {
-        SetActiveGroupInt(NULL);
-    }
-    m_HistoryInfoMap[ m_CurrentVersion ].CurrGroup = m_pNullGroup;
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupRemoved, (void*)pGroup);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::SetActiveGroup(const SXmlHistoryGroup* pGroup, const char* displayName /*= NULL*/, const TGroupIndexMap& groupIndex /*= TGroupIndexMap()*/, bool setExternal /*= false*/)
-{
-    TGroupIndexMap userIndex;
-    const SXmlHistoryGroup* pActiveGroup = GetActiveGroup(userIndex);
-    if (pGroup != pActiveGroup || userIndex != groupIndex || setExternal)
-    {
-        const bool isEx = m_CurrentVersion != m_LatestVersion || setExternal;
-        m_pExActiveGroup = const_cast<SXmlHistoryGroup*>(pGroup);
-        m_ExCurrentIndex = groupIndex;
-        m_bIsActiveGroupEx = true;
-        SetActiveGroupInt(pGroup, displayName, !isEx, groupIndex);
-        m_bIsActiveGroupEx = isEx;
-    }
-}
-
-void CXmlHistoryManager::SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const char* displayName /*= NULL*/, bool bRecordNullUndo /*= false*/, const TGroupIndexMap& groupIndex /*= TGroupIndexMap()*/)
-{
-    UnloadInt();
-
-    TEventHandlerList eventHandler;
-    string undoDesc;
-
-    if (pGroup)
-    {
-        for (TViews::iterator it = m_Views.begin(); it != m_Views.end(); ++it)
-        {
-            IXmlHistoryView* pView = *it;
-
-            std::map<uint32, int> userIndexCount;
-
-            for (SXmlHistoryGroup::THistoryList::const_iterator history = pGroup->m_List.begin(); history != pGroup->m_List.end(); ++history)
-            {
-                std::map<uint32, int>::iterator it2 = userIndexCount.find((*history)->GetTypeId());
-                if (it2 == userIndexCount.end())
-                {
-                    userIndexCount[ (*history)->GetTypeId() ] = 0;
-                }
-                uint32 userindex = userIndexCount[ (*history)->GetTypeId() ];
-                IXmlUndoEventHandler* pEventHandler = NULL;
-                TGroupIndexMap::const_iterator indexIter = groupIndex.find((*history)->GetTypeId());
-                if (indexIter == groupIndex.end() || indexIter->second == userindex)
-                {
-                    if ((*history)->Exist())
-                    {
-                        if (pView->LoadXml((*history)->GetTypeId(), (*history)->GetCurrentVersion(), pEventHandler, userindex))
-                        {
-                            if (pEventHandler)
-                            {
-                                m_UndoHandlerViewMap[ pEventHandler ] = pView;
-                                RegisterUndoEventHandler(pEventHandler, *history);
-                                eventHandler.push_back(pEventHandler);
-                            }
-                        }
-                    }
-                }
-                if ((*history)->Exist())
-                {
-                    userIndexCount[ (*history)->GetTypeId() ]++;
-                }
-            }
-        }
-        undoDesc.Format("Changed View to \"%s\"", displayName ? displayName : "UNDEFINED");
-    }
-    else
-    {
-        undoDesc = "Unloaded Views";
-        for (TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.begin(); it != m_UndoEventHandlerMap.end(); ++it)
-        {
-            eventHandler.push_back(it->first);
-        }
-        pGroup = m_pNullGroup;
-    }
-
-    if (bRecordNullUndo)
-    {
-        RecordNullUndo(eventHandler, undoDesc.c_str());
-        m_HistoryInfoMap[ m_CurrentVersion ].CurrGroup = pGroup;
-        m_HistoryInfoMap[ m_CurrentVersion ].CurrUserIndex = groupIndex;
-    }
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupChanged);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-const SXmlHistoryGroup* CXmlHistoryManager::GetActiveGroup() const
-{
-    TGroupIndexMap userIndex;
-    return GetActiveGroup(userIndex);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-const SXmlHistoryGroup* CXmlHistoryManager::GetActiveGroup(TGroupIndexMap& currUserIndex /*out*/) const
-{
-    if (m_bIsActiveGroupEx)
-    {
-        currUserIndex = m_ExCurrentIndex;
-        return m_pExActiveGroup;
-    }
-
-    int currVersion = m_CurrentVersion;
-    do
-    {
-        THistoryInfoMap::const_iterator it = m_HistoryInfoMap.find(currVersion);
-        if (it != m_HistoryInfoMap.end())
-        {
-            const SXmlHistoryGroup* pGroup = it->second.CurrGroup;
-            if (it != m_HistoryInfoMap.end() && pGroup)
-            {
-                currUserIndex = it->second.CurrUserIndex;
-                return pGroup == m_pNullGroup ? NULL : pGroup;
-            }
-        }
-        currVersion--;
-    } while (currVersion >= 0);
-    return NULL;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-SXmlHistory* CXmlHistoryManager::CreateXmlHistory(uint32 typeId, const XmlNodeRef& xmlBaseVersion)
-{
-    m_XmlHistoryList.push_back(SXmlHistory(this, xmlBaseVersion, typeId));
-    return &(*m_XmlHistoryList.rbegin());
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::DeleteXmlHistory(const SXmlHistory* pXmlHistry)
-{
-    for (TXmlHistoryList::iterator it = m_XmlHistoryList.begin(); it != m_XmlHistoryList.end(); ++it)
-    {
-        if (&(*it) == pXmlHistry)
-        {
-            m_XmlHistoryList.erase(it);
-            return;
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::UnloadInt()
-{
-    for (TViews::iterator it = m_Views.begin(); it != m_Views.end(); ++it)
-    {
-        IXmlHistoryView* pView = *it;
-        pView->UnloadXml(-1);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-namespace
-{
-    template< class T >
-    void ClearAfterVersion(T& container, int version)
-    {
-        auto foundit = container.end();
-        do
-        {
-            auto it = container.find(version);
-            if (it != container.end())
-            {
-                foundit = it;
-                break;
-            }
-            version--;
-        } while (version >= 0);
-        if (foundit != container.end())
-        {
-            for (auto it = ++foundit; it != container.end(); )
-            {
-                container.erase(it++);
-            }
-        }
-    }
-}
-
-void CXmlHistoryManager::ClearRedo()
-{
-    ClearAfterVersion(m_HistoryInfoMap, m_CurrentVersion);
-    for (TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.begin(); it != m_UndoEventHandlerMap.end(); ++it)
-    {
-        ClearAfterVersion(it->second.HistoryData, m_CurrentVersion);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::DeleteAll()
-{
-    ClearHistory();
-    m_Groups.clear();
-    m_UndoEventHandlerMap.clear();
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryDeleted);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::FlagHistoryAsSaved()
-{
-    for (TXmlHistoryList::iterator it = m_XmlHistoryList.begin(); it != m_XmlHistoryList.end(); ++it)
-    {
-        it->FlagAsSaved();
-    }
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistorySaved);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RecordNullUndo(const TEventHandlerList& eventHandler, const char* desc, bool isNull /*= true*/)
-{
-    TXmlHistotyGroupPtrList activeGroups = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
-
-    // if current version is already null undo, overwrite it instead of create a new version
-    if (m_HistoryInfoMap[ m_CurrentVersion ].IsNullUndo && isNull)
-    {
-        assert(m_CurrentVersion);
-        m_CurrentVersion--;
-    }
-
-    ClearRedo();
-    IncrementVersion();
-
-    for (TEventHandlerList::const_iterator it = eventHandler.begin(); it != eventHandler.end(); ++it)
-    {
-        SXmlHistory* pChangedXml = m_UndoEventHandlerMap[ *it ].CurrentData;
-        m_UndoEventHandlerMap[ *it ].HistoryData[ m_CurrentVersion ] = pChangedXml;
-    }
-    m_HistoryInfoMap[ m_CurrentVersion ].HistoryDescription = desc;
-    m_HistoryInfoMap[ m_CurrentVersion ].IsNullUndo = isNull;
-    m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups = activeGroups;
-    m_HistoryInfoMap[ m_CurrentVersion ].HistoryInvalidated = false;
-    NotifyUndoEventListener(IXmlHistoryEventListener::eHET_VersionAdded);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::ReloadCurrentVersion(const SXmlHistoryGroup* pPrevGroup, int prevVersion)
-{
-    m_bIsActiveGroupEx = false;
-    const SXmlHistoryGroup* pActiveGroup = GetActiveGroup();
-
-    bool bInvalidated = false;
-    int start = min(prevVersion, m_CurrentVersion);
-    int end = max(prevVersion, m_CurrentVersion);
-    for (int i = start; i <= end; ++i)
-    {
-        if (m_HistoryInfoMap[i].HistoryInvalidated)
-        {
-            bInvalidated = true;
-            break;
-        }
-    }
-
-    if (!bInvalidated && pPrevGroup == pActiveGroup)
-    {
-        for (TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.begin(); it != m_UndoEventHandlerMap.end(); ++it)
-        {
-            IXmlUndoEventHandler* pEventHandler = it->first;
-            if (!IsEventHandlerValid(pEventHandler))
-            {
-                assert(false);
-                continue;
-            }
-            SXmlHistory* pXmlHistory = GetLatestHistory(m_UndoEventHandlerMap[ pEventHandler ]);  /*m_UndoEventHandlerMap[ pEventHandler ].HistoryData[ m_CurrentVersion ];*/
-            if (pXmlHistory)
-            {
-                if (pXmlHistory->Exist())
-                {
-                    pEventHandler->ReloadFromXml(pXmlHistory->GetCurrentVersion());
-                }
-            }
-        }
-        NotifyUndoEventListener(IXmlHistoryEventListener::eHET_VersionChanged);
-    }
-    else
-    {
-        SetActiveGroupInt(pActiveGroup);
-    }
-
-    if (bInvalidated)
-    {
-        NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryInvalidate);
-    }
-
-    TXmlHistotyGroupPtrList oldActiveGroups = m_HistoryInfoMap[ prevVersion ].ActiveGroups;
-    TXmlHistotyGroupPtrList newActiveGroups = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;
-
-    RemoveListFromList(newActiveGroups, oldActiveGroups);
-    RemoveListFromList(oldActiveGroups, m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups);
-
-    for (TXmlHistotyGroupPtrList::iterator it = newActiveGroups.begin(); it != newActiveGroups.end(); ++it)
-    {
-        NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupAdded, (void*) *it);
-    }
-
-    for (TXmlHistotyGroupPtrList::iterator it = oldActiveGroups.begin(); it != oldActiveGroups.end(); ++it)
-    {
-        NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupRemoved, (void*) *it);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RemoveListFromList(TXmlHistotyGroupPtrList& list, const TXmlHistotyGroupPtrList& removeList)
-{
-    for (TXmlHistotyGroupPtrList::const_iterator rit = removeList.begin(); rit != removeList.end(); ++rit)
-    {
-        for (TXmlHistotyGroupPtrList::iterator it = list.begin(); it != list.end(); ++it)
-        {
-            if (*it == *rit)
-            {
-                list.erase(it);
-                break;
-            }
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-SXmlHistory* CXmlHistoryManager::GetLatestHistory(SUndoEventHandlerData& eventHandlerData)
-{
-    int currVersion = m_CurrentVersion;
-    do
-    {
-        THistoryVersionMap::iterator it = eventHandlerData.HistoryData.find(currVersion);
-        if (it != eventHandlerData.HistoryData.end())
-        {
-            return it->second;
-        }
-        currVersion--;
-    } while (currVersion >= 0);
-    return NULL;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::NotifyUndoEventListener(IXmlHistoryEventListener::EHistoryEventType event, void* pData)
-{
-    if (m_pExclusiveListener)
-    {
-        m_pExclusiveListener->OnEvent(event, pData);
-    }
-    else
-    {
-        for (TEventListener::iterator it = m_EventListener.begin(); it != m_EventListener.end(); ++it)
-        {
-            (*it)->OnEvent(event, pData);
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-int CXmlHistoryManager::IncrementVersion([[maybe_unused]] SXmlHistory* pXmlHistry)
-{
-    for (TXmlHistoryList::iterator it = m_XmlHistoryList.begin(); it != m_XmlHistoryList.end(); ++it)
-    {
-        it->ClearRedo();
-    }
-    return IncrementVersion();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-int CXmlHistoryManager::IncrementVersion()
-{
-    m_CurrentVersion++;
-    m_LatestVersion = m_CurrentVersion;
-    return m_CurrentVersion;
-}
-
-////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RegisterUndoEventHandler(IXmlUndoEventHandler* pEventHandler, SXmlHistory* pXmlData)
-{
-    m_UndoEventHandlerMap[ pEventHandler ].CurrentData = pXmlData;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::UnregisterUndoEventHandler(IXmlUndoEventHandler* pEventHandler)
-{
-    TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.find(pEventHandler);
-    if (it != m_UndoEventHandlerMap.end())
-    {
-        m_UndoEventHandlerMap.erase(it);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RecordUndoInternal(const char* desc)
-{
-    TEventHandlerList eventHandler;
-    for (TUndoEventHandlerMap::iterator it = m_UndoEventHandlerMap.begin(); it != m_UndoEventHandlerMap.end(); ++it)
-    {
-        eventHandler.push_back(it->first);
-    }
-    RecordNullUndo(eventHandler, desc, false);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-bool CXmlHistoryManager::IsEventHandlerValid(IXmlUndoEventHandler* pEventHandler)
-{
-    for (TInvalidUndoEventListener::iterator it = m_InvalidHandlerMap.begin(); it != m_InvalidHandlerMap.end(); ++it)
-    {
-        if (it->second == pEventHandler)
-        {
-            return false;
-        }
-    }
-    return true;
-}
diff --git a/Code/Sandbox/Editor/Util/XmlHistoryManager.h b/Code/Sandbox/Editor/Util/XmlHistoryManager.h
deleted file mode 100644
index 4783bce085..0000000000
--- a/Code/Sandbox/Editor/Util/XmlHistoryManager.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_XMLHISTORYMANAGER_H
-#define CRYINCLUDE_EDITOR_UTIL_XMLHISTORYMANAGER_H
-#pragma once
-
-
-#include "IXmlHistoryManager.h"
-
-class CXmlHistoryManager;
-
-struct SXmlHistory
-{
-public:
-    SXmlHistory(CXmlHistoryManager* pManager, const XmlNodeRef& xmlBaseVersion, uint32 typeId);
-
-    void AddToHistory(const XmlNodeRef& newXmlVersion);
-
-    const XmlNodeRef& Undo(bool* bVersionExist = NULL);
-    const XmlNodeRef& Redo();
-    const XmlNodeRef& GetCurrentVersion(bool* bVersionExist = NULL, int* iVersionNumber = NULL) const;
-    bool IsModified() const;
-    uint32 GetTypeId() const {return m_typeId; }
-    void FlagAsDeleted();
-    void FlagAsSaved();
-    bool Exist() const;
-
-private:
-    friend class CXmlHistoryManager;
-
-    void ClearRedo();
-    void ClearHistory(bool flagAsSaved);
-
-private:
-    CXmlHistoryManager* m_pManager;
-    uint32 m_typeId;
-    int m_DeletedVersion;
-    int m_SavedVersion;
-
-    typedef std::map< int, XmlNodeRef > TXmlVersionMap;
-    TXmlVersionMap m_xmlVersionList;
-};
-
-
-struct SXmlHistoryGroup
-{
-    SXmlHistoryGroup(CXmlHistoryManager* pManager, uint32 typeId);
-
-    SXmlHistory* GetHistory(int index) const;
-    int GetHistoryCount() const;
-
-    SXmlHistory* GetHistoryByTypeId(uint32 typeId, int index = 0) const;
-    int GetHistoryCountByTypeId(uint32 typeId) const;
-
-    int CreateXmlHistory(uint32 typeId, const XmlNodeRef& xmlBaseVersion);
-    uint32 GetTypeId() const {return m_typeId; }
-
-    int GetHistoryIndex(const SXmlHistory* pHistory) const;
-
-private:
-    friend class CXmlHistoryManager;
-    CXmlHistoryManager* m_pManager;
-    uint32 m_typeId;
-
-    typedef std::list< SXmlHistory* > THistoryList;
-    THistoryList m_List;
-};
-
-typedef std::map<uint32, int> TGroupIndexMap;
-
-
-class CXmlHistoryManager
-    : public IXmlHistoryManager
-    , public IXmlUndoEventHandler
-{
-public:
-    CXmlHistoryManager();
-    ~CXmlHistoryManager();
-
-    // Undo/Redo
-    bool Undo();
-    bool Redo();
-    bool Goto(int historyNum);
-    void RecordUndo(IXmlUndoEventHandler* pEventHandler, const char* desc);
-    void UndoEventHandlerDestroyed(IXmlUndoEventHandler* pEventHandler, uint32 typeId = 0, bool destoryForever = false);
-    void RestoreUndoEventHandler(IXmlUndoEventHandler* pEventHandler, uint32 typeId);
-
-    void PrepareForNextVersion();
-    void RecordNextVersion(SXmlHistory* pHistory, XmlNodeRef newData, const char* undoDesc = NULL);
-    bool IsPreparedForNextVersion() const {return m_RecordNextVersion; }
-
-    void RegisterEventListener(IXmlHistoryEventListener* pEventListener);
-    void UnregisterEventListener(IXmlHistoryEventListener* pEventListener);
-    void SetExclusiveListener(IXmlHistoryEventListener* pEventListener) { m_pExclusiveListener = pEventListener; }
-
-    // History
-    void ClearHistory(bool flagAsSaved = false);
-    int GetVersionCount() const { return m_LatestVersion; }
-    const string& GetVersionDesc(int number) const;
-    int GetCurrentVersionNumber() const { return m_CurrentVersion; }
-
-    // Views
-    void RegisterView(IXmlHistoryView* pView);
-    void UnregisterView(IXmlHistoryView* pView);
-
-    // Xml History Groups
-    SXmlHistoryGroup* CreateXmlGroup(uint32 typeId);
-    void SetActiveGroup(const SXmlHistoryGroup* pGroup, const char* displayName = NULL, const TGroupIndexMap& groupIndex = TGroupIndexMap(), bool setExternal = false);
-    const SXmlHistoryGroup* GetActiveGroup() const;
-    const SXmlHistoryGroup* GetActiveGroup(TGroupIndexMap& currUserIndex /*out*/) const;
-    void AddXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc = NULL);
-    void RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc = NULL);
-
-    void DeleteAll();
-
-    void FlagHistoryAsSaved();
-
-    virtual bool SaveToXml(XmlNodeRef& xmlNode);
-    virtual bool LoadFromXml([[maybe_unused]] const XmlNodeRef& xmlNode) { return false; };
-    virtual bool ReloadFromXml([[maybe_unused]] const XmlNodeRef& xmlNode) { return false; };
-
-private:
-    typedef std::list< SXmlHistory > TXmlHistoryList;
-    TXmlHistoryList m_XmlHistoryList;
-    int m_CurrentVersion;
-    int m_LatestVersion;
-    SXmlHistoryGroup* m_pNullGroup; // hack for unload view ...
-    XmlNodeRef m_newHistoryData;
-    bool m_RecordNextVersion;
-    bool m_bIsActiveGroupEx;
-    SXmlHistoryGroup* m_pExActiveGroup;
-    TGroupIndexMap m_ExCurrentIndex;
-
-    typedef std::list< SXmlHistoryGroup > TXmlHistotyGroupList;
-    TXmlHistotyGroupList m_Groups;
-
-    // event listener
-    typedef std::list< IXmlHistoryEventListener* > TEventListener;
-    TEventListener m_EventListener;
-    IXmlHistoryEventListener* m_pExclusiveListener;
-
-    // views
-    typedef std::list< IXmlHistoryView* > TViews;
-    TViews m_Views;
-
-    typedef std::list< const SXmlHistoryGroup* > TXmlHistotyGroupPtrList;
-    // history
-    struct SHistoryInfo
-    {
-        SHistoryInfo()
-            : IsNullUndo(false)
-            , CurrGroup(NULL)
-            , HistoryInvalidated(false) {}
-
-        const SXmlHistoryGroup* CurrGroup;
-        TGroupIndexMap CurrUserIndex;
-        string HistoryDescription;
-        bool IsNullUndo;
-        bool HistoryInvalidated;
-        TXmlHistotyGroupPtrList ActiveGroups;
-    };
-    typedef std::map< int, SHistoryInfo > THistoryInfoMap;
-    THistoryInfoMap m_HistoryInfoMap;
-
-    // undo event handler
-    typedef std::map< int, SXmlHistory* > THistoryVersionMap;
-    struct SUndoEventHandlerData
-    {
-        SUndoEventHandlerData()
-            : CurrentData(NULL) {}
-
-        SXmlHistory* CurrentData;
-        THistoryVersionMap HistoryData;
-    };
-    typedef std::map< IXmlUndoEventHandler*, SUndoEventHandlerData > TUndoEventHandlerMap;
-    TUndoEventHandlerMap m_UndoEventHandlerMap;
-
-    typedef std::map< IXmlUndoEventHandler*, IXmlHistoryView* > TUndoHandlerViewMap;
-    TUndoHandlerViewMap m_UndoHandlerViewMap;
-
-    typedef std::map< uint32, IXmlUndoEventHandler* > TInvalidUndoEventListener;
-    TInvalidUndoEventListener m_InvalidHandlerMap;
-
-private:
-    friend struct SXmlHistory;
-    friend struct SXmlHistoryGroup;
-
-    int IncrementVersion(SXmlHistory* pXmlHistry);
-    int IncrementVersion();
-    SXmlHistory* CreateXmlHistory(uint32 typeId, const XmlNodeRef& xmlBaseVersion);
-    void DeleteXmlHistory(const SXmlHistory* pXmlHistry);
-
-    void RegisterUndoEventHandler(IXmlUndoEventHandler* pEventHandler, SXmlHistory* pXmlData);
-    void UnregisterUndoEventHandler(IXmlUndoEventHandler* pEventHandler);
-    typedef std::list< IXmlUndoEventHandler* > TEventHandlerList;
-    void RecordNullUndo(const TEventHandlerList& eventHandler, const char* desc, bool isNull = true);
-    void ReloadCurrentVersion(const SXmlHistoryGroup* pPrevGroup, int prevVersion);
-    SXmlHistory* GetLatestHistory(SUndoEventHandlerData& eventHandlerData);
-    void NotifyUndoEventListener(IXmlHistoryEventListener::EHistoryEventType event, void* pData = NULL);
-
-    void SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const char* displayName = NULL, bool bRecordNullUndo = false, const TGroupIndexMap& groupIndex = TGroupIndexMap());
-    void UnloadInt();
-    void ClearRedo();
-
-    void RecordUndoInternal(const char* desc);
-    void RemoveListFromList(TXmlHistotyGroupPtrList& list, const TXmlHistotyGroupPtrList& removeList);
-
-    bool IsEventHandlerValid(IXmlUndoEventHandler* pEventHandler);
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_XMLHISTORYMANAGER_H
diff --git a/Code/Sandbox/Editor/Util/XmlTemplate.cpp b/Code/Sandbox/Editor/Util/XmlTemplate.cpp
deleted file mode 100644
index 3d788e17e9..0000000000
--- a/Code/Sandbox/Editor/Util/XmlTemplate.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CXmlTemplate implementation.
-
-#include "EditorDefs.h"
-
-#include "XmlTemplate.h"
-
-//////////////////////////////////////////////////////////////////////////
-// CXmlTemplate implementation
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTemplate::GetValues(XmlNodeRef& node, const XmlNodeRef& fromNode)
-{
-    assert(node != 0 && fromNode != 0);
-
-    if (!node)
-    {
-        gEnv->pLog->LogError("CXmlTemplate::GetValues invalid node. Possible problems with Editor folder.");
-        return;
-    }
-
-    for (int i = 0; i < node->getChildCount(); i++)
-    {
-        XmlNodeRef prop = node->getChild(i);
-
-        if (prop->getChildCount() == 0)
-        {
-            QString value;
-            if (fromNode->getAttr(prop->getTag(), value))
-            {
-                prop->setAttr("Value", value.toUtf8().data());
-            }
-        }
-        else
-        {
-            // Have childs.
-            XmlNodeRef fromNodeChild = fromNode->findChild(prop->getTag());
-            if (fromNodeChild)
-            {
-                CXmlTemplate::GetValues(prop, fromNodeChild);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTemplate::SetValues(const XmlNodeRef& node, XmlNodeRef& toNode)
-{
-    assert(node != 0 && toNode != 0);
-
-    toNode->removeAllAttributes();
-    toNode->removeAllChilds();
-
-    assert(node);
-    if (!node)
-    {
-        gEnv->pLog->LogError("CXmlTemplate::SetValues invalid node. Possible problems with Editor folder.");
-        return;
-    }
-
-    for (int i = 0; i < node->getChildCount(); i++)
-    {
-        XmlNodeRef prop = node->getChild(i);
-        if (prop)
-        {
-            if (prop->getChildCount() > 0)
-            {
-                XmlNodeRef childToNode = toNode->newChild(prop->getTag());
-                if (childToNode)
-                {
-                    CXmlTemplate::SetValues(prop, childToNode);
-                }
-            }
-            else
-            {
-                QString value;
-                prop->getAttr("Value", value);
-                toNode->setAttr(prop->getTag(), value.toUtf8().data());
-            }
-        }
-        else
-        {
-            assert(!"NULL returned from node->GetChild()");
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CXmlTemplate::SetValues(const XmlNodeRef& node, XmlNodeRef& toNode, const XmlNodeRef& modifiedNode)
-{
-    assert(node != 0 && toNode != 0 && modifiedNode != 0);
-
-    for (int i = 0; i < node->getChildCount(); i++)
-    {
-        XmlNodeRef prop = node->getChild(i);
-        if (prop)
-        {
-            if (prop->getChildCount() > 0)
-            {
-                XmlNodeRef childToNode = toNode->findChild(prop->getTag());
-                if (childToNode)
-                {
-                    if (CXmlTemplate::SetValues(prop, childToNode, modifiedNode))
-                    {
-                        return true;
-                    }
-                }
-            }
-            else if (prop == modifiedNode)
-            {
-                QString value;
-                prop->getAttr("Value", value);
-                toNode->setAttr(prop->getTag(), value.toUtf8().data());
-                return true;
-            }
-        }
-        else
-        {
-            assert(!"NULL returned from node->GetChild()");
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTemplate::AddParam(XmlNodeRef& templ, const char* sName, bool value)
-{
-    XmlNodeRef param = templ->newChild(sName);
-    param->setAttr("type", "Bool");
-    param->setAttr("value", value);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTemplate::AddParam(XmlNodeRef& templ, const char* sName, int value, int min, int max)
-{
-    XmlNodeRef param = templ->newChild(sName);
-    param->setAttr("type", "Int");
-    param->setAttr("value", value);
-    param->setAttr("min", min);
-    param->setAttr("max", max);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTemplate::AddParam(XmlNodeRef& templ, const char* sName, float value, float min, float max)
-{
-    XmlNodeRef param = templ->newChild(sName);
-    param->setAttr("type", "Float");
-    param->setAttr("value", value);
-    param->setAttr("min", min);
-    param->setAttr("max", max);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTemplate::AddParam(XmlNodeRef& templ, const char* sName, const char* sValue)
-{
-    XmlNodeRef param = templ->newChild(sName);
-    param->setAttr("type", "String");
-    param->setAttr("value", sValue);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-//
-// CXmlTemplateRegistry implementation
-//
-//////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////
-CXmlTemplateRegistry::CXmlTemplateRegistry()
-{}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTemplateRegistry::LoadTemplates(const QString& path)
-{
-    m_templates.Clear();
-
-    QString dir = Path::AddPathSlash(path);
-
-    IFileUtil::FileArray files;
-    CFileUtil::ScanDirectory(dir, "*.xml", files, false);
-
-    for (int k = 0; k < files.size(); k++)
-    {
-        XmlNodeRef child;
-        // Construct the full filepath of the current file
-        XmlNodeRef node = XmlHelpers::LoadXmlFromFile((dir + files[k].filename).toUtf8().data());
-        if (node != 0 && node->isTag("Templates"))
-        {
-            QString name;
-            for (int i = 0; i < node->getChildCount(); i++)
-            {
-                child = node->getChild(i);
-                AddTemplate(child->getTag(), child);
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlTemplateRegistry::AddTemplate(const QString& name, XmlNodeRef& tmpl)
-{
-    m_templates[name] = tmpl;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CXmlTemplateRegistry::FindTemplate(const QString& name)
-{
-    XmlNodeRef node;
-    if (m_templates.Find(name, node))
-    {
-        return node;
-    }
-    return 0;
-}
diff --git a/Code/Sandbox/Editor/Util/XmlTemplate.h b/Code/Sandbox/Editor/Util/XmlTemplate.h
deleted file mode 100644
index 73ed46b766..0000000000
--- a/Code/Sandbox/Editor/Util/XmlTemplate.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CXmlTemplate declaration.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_XMLTEMPLATE_H
-#define CRYINCLUDE_EDITOR_UTIL_XMLTEMPLATE_H
-#pragma once
-
-
-/*!
- *  CXmlTemplate is XML base template of parameters.
- *
- */
-class CXmlTemplate
-{
-public:
-    //! Scans properties of XML template,
-    //! for each property try to find corresponding attribute in specified XML node, and copy
-    //! value to Value attribute of template.
-    static void GetValues(XmlNodeRef& templateNode, const XmlNodeRef& fromNode);
-
-    //! Scans properties of XML template, fetch Value attribute of each and put as Attribute in
-    //! specified XML node.
-    static void SetValues(const XmlNodeRef& templateNode, XmlNodeRef& toNode);
-    static bool SetValues(const XmlNodeRef& templateNode, XmlNodeRef& toNode, const XmlNodeRef& modifiedNode);
-
-    //! Add parameter to template.
-    static void AddParam(XmlNodeRef& templ, const char* paramName, bool value);
-    static void AddParam(XmlNodeRef& templ, const char* paramName, int value, int min = 0, int max = 10000);
-    static void AddParam(XmlNodeRef& templ, const char* paramName, float value, float min = -10000, float max = 10000);
-    static void AddParam(XmlNodeRef& templ, const char* paramName, const char* sValue);
-};
-
-/*!
- *  CXmlTemplateRegistry is a collection of all registred templates.
- */
-class CXmlTemplateRegistry
-{
-public:
-    CXmlTemplateRegistry();
-
-    void LoadTemplates(const QString& path);
-    void AddTemplate(const QString& name, XmlNodeRef& tmpl);
-
-    XmlNodeRef FindTemplate(const QString& name);
-
-private:
-    StdMap<QString, XmlNodeRef> m_templates;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTIL_XMLTEMPLATE_H
diff --git a/Code/Sandbox/Editor/Util/bitarray.h b/Code/Sandbox/Editor/Util/bitarray.h
deleted file mode 100644
index 4d929ddb8b..0000000000
--- a/Code/Sandbox/Editor/Util/bitarray.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Array of m_bits.
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_BITARRAY_H
-#define CRYINCLUDE_EDITOR_UTIL_BITARRAY_H
-#pragma once
-
-
-//////////////////////////////////////////////////////////////////////////
-//
-// CBitArray is similar to std::vector but faster to clear.
-//
-//////////////////////////////////////////////////////////////////////////
-class CBitArray
-{
-public:
-    struct BitReference
-    {
-        uint32* p;
-        uint32 mask;
-        BitReference(uint32* __x, uint32 __y)
-            : p(__x)
-            , mask(__y) {}
-
-
-    public:
-        BitReference()
-            : p(0)
-            , mask(0) {}
-
-        operator bool() const {
-            return !(!(*p & mask));
-        }
-        BitReference& operator=(bool __x)
-        {
-            if (__x)
-            {
-                * p |= mask;
-            }
-            else
-            {
-                * p &= ~mask;
-            }
-            return *this;
-        }
-        BitReference& operator=(const BitReference& __x) { return *this = bool(__x);  }
-        bool operator==(const BitReference& __x) const { return bool(*this) == bool(__x); }
-        bool operator<(const BitReference& __x) const { return !bool(*this) && bool(__x);   }
-        BitReference& operator |= (bool __x)
-        {
-            if (__x)
-            {
-                * p |= mask;
-            }
-            return *this;
-        }
-        BitReference& operator &= (bool __x)
-        {
-            if (!__x)
-            {
-                * p &= ~mask;
-            }
-            return *this;
-        }
-        void flip() {* p ^= mask; }
-    };
-
-    CBitArray() { m_base = NULL; m_bits = NULL; m_size = 0; m_numBits = 0; };
-    CBitArray(int numBits)    { resize(numBits); };
-    ~CBitArray()
-    {
-        if (m_base)
-        {
-            free(m_base);
-        }
-    };
-
-    void    resize(int c)
-    {
-        m_numBits = c;
-        int newSize = ((c + 63) & (~63)) >> 5;
-        if (newSize > m_size)
-        {
-            Alloc(newSize);
-        }
-    }
-    int size() const { return m_numBits; };
-    bool empty() const { return m_numBits == 0; };
-
-    //////////////////////////////////////////////////////////////////////////
-    void set()
-    {
-        memset(m_bits, 0xFFFFFFFF, m_size * sizeof(uint32));  // Set all bits.
-    }
-    //////////////////////////////////////////////////////////////////////////
-    void set(int numBits)
-    {
-        int num = (numBits >> 3) + 1;
-        if (num > (m_size * sizeof(uint32)))
-        {
-            num = m_size * sizeof(uint32);
-        }
-        memset(m_bits, 0xFFFFFFFF, num);    // Reset num bits.
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void clear()
-    {
-        memset(m_bits, 0, m_size * sizeof(uint32));   // Reset all bits.
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    void    clear(int numBits)
-    {
-        int num = (numBits >> 3) + 1;
-        if (num > (m_size * sizeof(uint32)))
-        {
-            num = m_size * sizeof(uint32);
-        }
-        memset(m_bits, 0, num); // Reset num bits.
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Check if all bits are 0.
-    bool is_zero() const
-    {
-        for (int i = 0; i < m_size; i++)
-        {
-            if (m_bits[i] != 0)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    // Count number of set bits.
-    int count_bits()    const
-    {
-        int c = 0;
-        for (int i = 0; i < m_size; i++)
-        {
-            uint32 v = m_bits[i];
-            for (int j = 0; j < 32; j++)
-            {
-                if (v & (1 << (j & 0x1F)))
-                {
-                    c++;                        // if bit set increase bit count.
-                }
-            }
-        }
-        return c;
-    }
-
-    BitReference operator[](int pos) { return BitReference(&m_bits[index(pos)], shift(pos)); }
-    const BitReference operator[](int pos) const { return BitReference(&m_bits[index(pos)], shift(pos)); }
-
-    //////////////////////////////////////////////////////////////////////////
-    void swap(CBitArray& bitarr)
-    {
-        std::swap(m_base, bitarr.m_base);
-        std::swap(m_bits, bitarr.m_bits);
-        std::swap(m_size, bitarr.m_size);
-    }
-
-    CBitArray&  operator =(const CBitArray& b)
-    {
-        if (m_size != b.m_size)
-        {
-            Alloc(b.m_size);
-        }
-        memcpy(m_bits, b.m_bits, m_size * sizeof(uint32));
-        return *this;
-    }
-
-    bool    checkByte(int pos) const {    return reinterpret_cast<char*>(m_bits)[pos] != 0; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Compresses this bit array into the specified one.
-    // Uses run length encoding compression.
-    void    compress(CBitArray& b) const
-    {
-        int i, countz, compsize, bsize;
-        char* out;
-        char* in;
-
-        bsize = m_size * 4;
-        compsize = 0;
-        in = (char*)m_bits;
-        for (i = 0; i < bsize; i++)
-        {
-            compsize++;
-            if (in[i] == 0)
-            {
-                countz = 1;
-                while (++i < bsize)
-                {
-                    if (in[i] == 0 && countz != 255)
-                    {
-                        countz++;
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-                i--;
-                compsize++;
-            }
-        }
-        b.resize((compsize + 1) << 3);
-        out = (char*)b.m_bits;
-        in = (char*)m_bits;
-        *out++ = bsize;
-        for (i = 0; i < bsize; i++)
-        {
-            *out++ = in[i];
-            if (in[i] == 0)
-            {
-                countz = 1;
-                while (++i < bsize)
-                {
-                    if (in[i] == 0 && countz != 255)
-                    {
-                        countz++;
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-                i--;
-                *out++ = countz;
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Decompress specified bit array in to this one.
-    // Uses run length encoding compression.
-    void    decompress(CBitArray& b)
-    {
-        int raw, decompressed, c;
-        char* out, * in;
-
-        in = (char*)m_bits;
-        out = (char*)b.m_bits;
-        decompressed = 0;
-        raw = *in++;
-        while (decompressed < raw)
-        {
-            if (*in != 0)
-            {
-                *out++ = *in++;
-                decompressed++;
-            }
-            else
-            {
-                in++;
-                c = *in++;
-                decompressed += c;
-                while (c)
-                {
-                    *out++ = 0;
-                    c--;
-                }
-                ;
-            }
-        }
-        m_numBits = decompressed;
-    }
-
-    void    CopyFromMem(const char* src, int size)
-    {
-        Alloc(size);
-        memcpy(m_bits, src, size);
-    }
-    int     CopyToMem(char* trg)
-    {
-        memcpy(trg, m_bits, m_size);
-        return m_size;
-    }
-
-private:
-    void* m_base;
-    uint32* m_bits;
-    int     m_size;
-    int     m_numBits;
-
-    void    Alloc(int s)
-    {
-        if (m_base)
-        {
-            free(m_base);
-        }
-        m_size = s;
-        m_base = (char*)malloc(m_size * sizeof(uint32) + 32);
-        m_bits = (uint32*)(((UINT_PTR)m_base + 31) & (~31));    // align by 32.
-        memset(m_bits, 0, m_size * sizeof(uint32));   // Reset all bits.
-    }
-    uint32  shift(int pos) const
-    {
-        return (1 << (pos & 0x1F));
-    }
-    uint32  index(int pos) const
-    {
-        return pos >> 5;
-    }
-
-    friend  int concatBitarray(CBitArray& b1, CBitArray& b2, CBitArray& test, CBitArray& res);
-};
-
-inline  int concatBitarray(CBitArray& b1, CBitArray& b2, CBitArray& test, CBitArray& res)
-{
-    unsigned int b, any;
-    any = 0;
-    for (int i = 0; i < b1.size(); i++)
-    {
-        b = b1.m_bits[i] & b2.m_bits[i];
-        any |= (b & (~test.m_bits[i])); // test if any different from test(i) bit set.
-        res.m_bits[i] = b;
-    }
-    return any;
-}
-
-#endif // CRYINCLUDE_EDITOR_UTIL_BITARRAY_H
diff --git a/Code/Sandbox/Editor/Util/fastlib.h b/Code/Sandbox/Editor/Util/fastlib.h
deleted file mode 100644
index cc3816e55f..0000000000
--- a/Code/Sandbox/Editor/Util/fastlib.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_FASTLIB_H
-#define CRYINCLUDE_EDITOR_UTIL_FASTLIB_H
-#pragma once
-
-__forceinline int RoundFloatToInt(float fValue)
-{
-    return (int)(fValue + 0.5f);
-}
-
-__forceinline int __stdcall FloatToIntRet(float fValue)
-{
-    return (int)(fValue + 0.5f);
-}
-
-__forceinline int ftoi(float fValue)
-{
-    return (int)(fValue);
-}
-
-__forceinline unsigned int __stdcall ifloor(float fValue)
-{
-    return ftoi(floor(fValue));
-}
-
-#endif // CRYINCLUDE_EDITOR_UTIL_FASTLIB_H
diff --git a/Code/Sandbox/Editor/Util/smartptr.h b/Code/Sandbox/Editor/Util/smartptr.h
deleted file mode 100644
index b29de14df7..0000000000
--- a/Code/Sandbox/Editor/Util/smartptr.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_SMARTPTR_H
-#define CRYINCLUDE_EDITOR_UTIL_SMARTPTR_H
-#pragma once
-
-#include <CryCommon/smartptr.h>
-
-#define TSmartPtr _smart_ptr
-
-/** Use this to define smart pointers of classes.
-        For example:
-        class CNode : public CRefCountBase {};
-        SMARTPTRTypeYPEDEF( CNode );
-        {
-            CNodePtr node; // Smart pointer.
-        }
-*/
-
-#define SMARTPTR_TYPEDEF(Class) typedef TSmartPtr<Class> Class##Ptr
-
-#endif // CRYINCLUDE_EDITOR_UTIL_SMARTPTR_H
diff --git a/Code/Sandbox/Editor/ViewManager.cpp b/Code/Sandbox/Editor/ViewManager.cpp
deleted file mode 100644
index 2a3702bc33..0000000000
--- a/Code/Sandbox/Editor/ViewManager.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation of the CViewManager class.
-
-
-#include "EditorDefs.h"
-
-#include "ViewManager.h"
-
-// AzCore
-#include <AzCore/std/smart_ptr/make_shared.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
-
-// Editor
-#include "Settings.h"
-#include "MainWindow.h"
-#include "LayoutWnd.h"
-#include "2DViewport.h"
-#include "TopRendererWnd.h"
-#include "RenderViewport.h"
-#include "EditorViewportWidget.h"
-#include "CryEditDoc.h"
-
-#include <AzCore/Console/IConsole.h>
-
-AZ_CVAR(bool, ed_useAtomNativeViewport, true, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Atom-native Editor viewport (experimental, not yet stable");
-
-bool CViewManager::IsMultiViewportEnabled()
-{
-    // Enable multi-viewport for legacy renderer, or if we're using the new fully Atom-native viewport
-    return ed_useAtomNativeViewport;
-}
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-CViewManager::CViewManager()
-{
-    m_zoomFactor = 1;
-
-    m_origin2D(0, 0, 0);
-    m_zoom2D = 1.0f;
-
-    m_cameraObjectId = GUID_NULL;
-
-    m_updateRegion.min = Vec3(-100000, -100000, -100000);
-    m_updateRegion.max = Vec3(100000, 100000, 100000);
-
-    m_pSelectedView = NULL;
-
-    m_nGameViewports = 0;
-    m_bGameViewportsUpdated = false;
-
-    QtViewOptions viewportOptions;
-    viewportOptions.paneRect = QRect(0, 0, 400, 400);
-    viewportOptions.canHaveMultipleInstances = true;
-
-    viewportOptions.viewportType = ET_ViewportXY;
-    RegisterQtViewPane<C2DViewport_XY>(GetIEditor(), "Top", LyViewPane::CategoryViewport, viewportOptions);
-
-    viewportOptions.viewportType = ET_ViewportXZ;
-    RegisterQtViewPane<C2DViewport_XZ>(GetIEditor(), "Front", LyViewPane::CategoryViewport, viewportOptions);
-
-    viewportOptions.viewportType = ET_ViewportYZ;
-    RegisterQtViewPane<C2DViewport_YZ>(GetIEditor(), "Left", LyViewPane::CategoryViewport, viewportOptions);
-
-    viewportOptions.viewportType = ET_ViewportCamera;
-    if (ed_useAtomNativeViewport)
-    {
-        RegisterQtViewPaneWithName<EditorViewportWidget>(GetIEditor(), "Perspective", LyViewPane::CategoryViewport, viewportOptions);
-    }
-    else
-    {
-        RegisterQtViewPaneWithName<CRenderViewport>(GetIEditor(), "Perspective", LyViewPane::CategoryViewport, viewportOptions);
-    }
-
-    viewportOptions.viewportType = ET_ViewportMap;
-    RegisterQtViewPane<QTopRendererWnd>(GetIEditor(), "Map", LyViewPane::CategoryViewport, viewportOptions);
-
-    GetIEditor()->RegisterNotifyListener(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-CViewManager::~CViewManager()
-{
-    GetIEditor()->UnregisterNotifyListener(this);
-
-    m_viewports.clear();
-}
-
-void CViewManager::ReleaseView(CViewport* pViewport)
-{
-    pViewport->DestroyWindow();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::RegisterViewport(CViewport* pViewport)
-{
-    pViewport->SetViewManager(this);
-    m_viewports.push_back(pViewport);
-
-    // the type of added viewport can be changed later
-    m_bGameViewportsUpdated = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::UnregisterViewport(CViewport* pViewport)
-{
-    if (m_pSelectedView == pViewport)
-    {
-        m_pSelectedView = NULL;
-    }
-    stl::find_and_erase(m_viewports, pViewport);
-    m_bGameViewportsUpdated = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CViewport* CViewManager::GetViewport(EViewportType type) const
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Returns the first view which has a render window of a specific
-    // type attached
-    ////////////////////////////////////////////////////////////////////////
-    for (int i = 0; i < m_viewports.size(); i++)
-    {
-        if (m_viewports[i]->GetType() == type)
-        {
-            return m_viewports[i];
-        }
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CViewport* CViewManager::GetViewport(const QString& name) const
-{
-    for (int i = 0; i < m_viewports.size(); i++)
-    {
-        if (QString::compare(m_viewports[i]->GetName(), name, Qt::CaseInsensitive) == 0)
-        {
-            return m_viewports[i];
-        }
-    }
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::SetZoomFactor(float zoom)
-{
-    m_zoomFactor = zoom;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::UpdateViews(int flags)
-{
-    // Update each attached view,
-    for (int i = 0; i < m_viewports.size(); i++)
-    {
-        m_viewports[i]->UpdateContent(flags);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::ResetViews()
-{
-    // Reset each attached view,
-    for (int i = 0; i < m_viewports.size(); i++)
-    {
-m_viewports[i]->ResetContent();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::IdleUpdate()
-{
-    // Update each attached view,
-    for (int i = 0; i < m_viewports.size(); i++)
-    {
-        if (m_viewports[i]->GetType() != ET_ViewportCamera || (GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady()))
-        {
-            m_viewports[i]->Update();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void    CViewManager::SetAxisConstrain(int axis)
-{
-    for (int i = 0; i < m_viewports.size(); i++)
-    {
-        m_viewports[i]->SetAxisConstrain(axis);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CLayoutWnd* CViewManager::GetLayout() const
-{
-    return MainWindow::instance()->GetLayout();
-}
-
-void CViewManager::SetZoom2D(float zoom)
-{
-    m_zoom2D = zoom;
-    if (m_zoom2D > 460.0f)
-    {
-        m_zoom2D = 460.0f;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::Cycle2DViewport()
-{
-    GetLayout()->Cycle2DViewport();
-}
-
-//////////////////////////////////////////////////////////////////////////
-CViewport* CViewManager::GetViewportAtPoint(const QPoint& point) const
-{
-    QWidget* widget = QApplication::widgetAt(point);
-    return qobject_cast<QtViewport*>(widget);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::SelectViewport(CViewport* pViewport)
-{
-    // Audio: Handle viewport change for listeners
-
-    if (m_pSelectedView != NULL && m_pSelectedView != pViewport)
-    {
-        m_pSelectedView->SetSelected(false);
-
-    }
-
-    m_pSelectedView = pViewport;
-
-    if (m_pSelectedView != NULL)
-    {
-        m_pSelectedView->SetSelected(true);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-CViewport* CViewManager::GetGameViewport() const
-{
-    if (CRenderViewport::GetPrimaryViewport())
-    {
-        return CRenderViewport::GetPrimaryViewport();
-    }
-
-    return GetViewport(ET_ViewportCamera);;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CViewManager::GetNumberOfGameViewports()
-{
-    if (m_bGameViewportsUpdated)
-    {
-        return m_nGameViewports;
-    }
-
-    m_nGameViewports = 0;
-    for (int i = 0; i < m_viewports.size(); ++i)
-    {
-        if (m_viewports[i]->GetType() == ET_ViewportCamera)
-        {
-            ++m_nGameViewports;
-        }
-    }
-    m_bGameViewportsUpdated = true;
-
-    return m_nGameViewports;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CViewManager::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnIdleUpdate:
-        IdleUpdate();
-        break;
-    case eNotify_OnUpdateViewports:
-        UpdateViews();
-        break;
-    }
-}
-
-AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> CViewManager::GetManipulatorManager()
-{
-    return m_manipulatorManager;
-}
diff --git a/Code/Sandbox/Editor/ViewManager.h b/Code/Sandbox/Editor/ViewManager.h
deleted file mode 100644
index 4c4558a5ad..0000000000
--- a/Code/Sandbox/Editor/ViewManager.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : interface for the CViewManager class.
-
-
-#ifndef CRYINCLUDE_EDITOR_VIEWMANAGER_H
-#define CRYINCLUDE_EDITOR_VIEWMANAGER_H
-
-#pragma once
-
-#include "Cry_Geo.h"
-#include "Viewport.h"
-#include "Include/IViewPane.h"
-#include "QtViewPaneManager.h"
-// forward declaration.
-class CLayoutWnd;
-class CViewport;
-
-namespace AzToolsFramework
-{
-    class ManipulatorManager;
-}
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-/** Manages set of viewports.
-*/
-class SANDBOX_API CViewManager
-    : public IEditorNotifyListener
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    static bool IsMultiViewportEnabled();
-
-    void ReleaseView(CViewport* pViewport);
-
-    CViewport* GetViewport(EViewportType type) const;
-    CViewport* GetViewport(const QString& name) const;
-
-    //! Find viewport at Screen point.
-    CViewport* GetViewportAtPoint(const QPoint& point) const;
-
-    void SelectViewport(CViewport* pViewport);
-    CViewport* GetSelectedViewport() const { return m_pSelectedView; }
-
-    void    SetAxisConstrain(int axis);
-
-    void    SetZoomFactor(float zoom);
-    float   GetZoomFactor() const { return m_zoomFactor; }
-
-    //! Reset all views.
-    void    ResetViews();
-    //! Update all views.
-    void    UpdateViews(int flags = 0xFFFFFFFF);
-
-    void SetUpdateRegion(const AABB& updateRegion) { m_updateRegion = updateRegion; };
-    const AABB& GetUpdateRegion() { return m_updateRegion; };
-
-    /** Get 2D viewports origin.
-    */
-    Vec3 GetOrigin2D() const { return m_origin2D; }
-
-    /** Assign 2D viewports origin.
-    */
-    void SetOrigin2D(const Vec3& org) { m_origin2D = org; };
-
-    /** Assign zoom factor for 2d viewports.
-    */
-    void SetZoom2D(float zoom);
-
-    /** Get zoom factor of 2d viewports.
-    */
-    float GetZoom2D() const { return m_zoom2D; };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Get currently active camera object id.
-    REFGUID GetCameraObjectId() const { return m_cameraObjectId; };
-    //! Sets currently active camera object id.
-    void SetCameraObjectId(REFGUID cameraObjectId) { m_cameraObjectId = cameraObjectId; };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Get number of currently existing viewports.
-    virtual int GetViewCount() { return m_viewports.size(); };
-    //! Get viewport by index.
-    //! @param index 0 <= index < GetViewportCount()
-    virtual CViewport* GetView(int index) { return m_viewports[index]; }
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Get current layout window.
-    //! @return Pointer to the layout window, can be NULL.
-    virtual CLayoutWnd* GetLayout() const;
-
-    //! Cycle between different 2D viewports type on same view pane.
-    virtual void Cycle2DViewport();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Retrieve main game viewport, where the full game is rendered in 3D.
-    CViewport* GetGameViewport() const;
-
-    //! Get number of Game Viewports
-    int GetNumberOfGameViewports();
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
-    AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> GetManipulatorManager();
-
-private:
-    friend class CEditorImpl;
-    friend class QtViewport;
-
-    void IdleUpdate();
-    void RegisterViewport(CViewport* vp);
-    void UnregisterViewport(CViewport* vp);
-
-private:
-    CViewManager();
-    ~CViewManager();
-    //////////////////////////////////////////////////////////////////////////
-    //FIELDS.
-    float   m_zoomFactor;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    AABB m_updateRegion;
-
-    //! Origin of 2d viewports.
-    Vec3 m_origin2D;
-    //! Zoom of 2d viewports.
-    float m_zoom2D;
-
-    //! Id of camera object.
-    GUID m_cameraObjectId;
-
-    int m_nGameViewports;
-    bool m_bGameViewportsUpdated;
-
-    //! Array of currently existing viewports.
-    std::vector<CViewport*> m_viewports;
-
-    CViewport* m_pSelectedView;
-
-    AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITOR_VIEWMANAGER_H
diff --git a/Code/Sandbox/Editor/ViewPane.cpp b/Code/Sandbox/Editor/ViewPane.cpp
deleted file mode 100644
index fc4a4a3b58..0000000000
--- a/Code/Sandbox/Editor/ViewPane.cpp
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation file
-
-
-#include "EditorDefs.h"
-
-#include "ViewPane.h"
-
-// Qt
-#include <QDebug>
-#include <QLabel>
-#include <QLayout>
-#include <QMouseEvent>
-#include <QScrollArea>
-#include <QToolBar>
-
-// AzCore
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzQtComponents/Components/Style.h>
-
-// AzFramework
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzCore/Interface/Interface.h>
-
-// Editor
-#include "ViewManager.h"
-#include "Settings.h"
-#include "LayoutWnd.h"
-#include "Viewport.h"
-#include "LayoutConfigDialog.h"
-#include "TopRendererWnd.h"
-#include "UserMessageDefines.h"
-#include "MainWindow.h"
-#include "QtViewPaneManager.h"
-#include "EditorViewportWidget.h"
-
-//////////////////////////////////////////////////////////////////////////
-// ViewportTitleExpanderWatcher
-//////////////////////////////////////////////////////////////////////////
-class ViewportTitleExpanderWatcher
-    : public QObject
-{
-public:
-    ViewportTitleExpanderWatcher(QObject* parent = nullptr, CViewportTitleDlg* viewportDlg = nullptr)
-        : QObject(parent)
-        , m_viewportDlg(viewportDlg)
-    {
-    }
-
-    bool eventFilter(QObject* obj, QEvent* event) override
-    {
-        if (m_viewportDlg)
-        {
-            switch (event->type())
-            {
-                case QEvent::MouseButtonPress:
-                case QEvent::MouseButtonRelease:
-                case QEvent::MouseButtonDblClick:
-                {
-                    if (qobject_cast<QToolButton*>(obj))
-                    {
-                        auto mouseEvent = static_cast<QMouseEvent*>(event);
-                        auto expansion = qobject_cast<QToolButton*>(obj);
-
-                        expansion->setPopupMode(QToolButton::InstantPopup);
-                        auto menu = new QMenu(expansion);
-
-                        auto toolbar = qobject_cast<QToolBar*>(expansion->parentWidget());
-
-                        auto toolWidgets = toolbar->findChildren<QWidget*>();
-
-                        if (toolWidgets.count() > 0)
-                        {
-                            for (auto toolWidget : toolWidgets)
-                            {
-                                if (AzQtComponents::Style::hasClass(toolWidget, "expanderMenu_hide"))
-                                {
-                                    continue;
-                                }
-
-                                // Handle labels with submenus
-                                if (auto toolLabel = qobject_cast<QLabel*>(toolWidget))
-                                {
-                                    if (!toolLabel->isVisible())
-                                    {
-                                        // Manually turn the custom context menus into submenus
-                                        if (toolLabel->objectName() == "m_fovStaticCtrl")
-                                        {
-                                            QAction* newAction = menu->addMenu(m_viewportDlg->GetFovMenu());
-                                            newAction->setText(QString("FOV: %1").arg(toolLabel->text()));
-                                        }
-                                        else if (toolLabel->objectName() == "m_ratioStaticCtrl")
-                                        {
-                                            QAction* newAction = menu->addMenu(m_viewportDlg->GetAspectMenu());
-                                            newAction->setText(QString("Ratio: %1").arg(toolLabel->text()));
-                                        }
-                                        else if (toolLabel->objectName() == "m_sizeStaticCtrl")
-                                        {
-                                            QAction* newAction = menu->addMenu(m_viewportDlg->GetResolutionMenu());
-                                            newAction->setText(QString("%1").arg(toolLabel->text()));
-                                        }
-                                        else
-                                        {
-                                            // Don't add actions for other Labels
-                                            continue;
-                                        }
-                                    }
-                                }
-
-                                // Handle ToolButtons
-                                if (auto toolButton = qobject_cast<QToolButton*>(toolWidget))
-                                {
-                                    if (!toolButton->isVisible() && !toolButton->text().isEmpty())
-                                    {
-                                        QAction* action = new QAction(toolButton->text(), menu);
-
-                                        action->setEnabled(toolButton->isEnabled());
-                                        action->setCheckable(toolButton->isCheckable());
-                                        action->setChecked(toolButton->isChecked());
-
-                                        connect(action, &QAction::triggered, toolButton, &QToolButton::clicked);
-
-                                        menu->addAction(action);
-                                    }
-                                }
-                            }
-                        }
-
-                        menu->exec(mouseEvent->globalPos());
-                        return true;
-                    }
-
-                    break;
-                }
-            }
-        }
-
-        return QObject::eventFilter(obj, event);
-    }
-
-private:
-    CViewportTitleDlg* m_viewportDlg = nullptr;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CLayoutViewPane
-//////////////////////////////////////////////////////////////////////////
-CLayoutViewPane::CLayoutViewPane(QWidget* parent)
-    : AzQtComponents::ToolBarArea(parent)
-    , m_viewportTitleDlg(this)
-    , m_expanderWatcher(new ViewportTitleExpanderWatcher(this, &m_viewportTitleDlg))
-{
-    m_viewport = 0;
-    m_active = 0;
-    m_nBorder = VIEW_BORDER;
-
-    m_bFullscreen = false;
-    m_viewportTitleDlg.SetViewPane(this);
-
-    // Set up an optional scrollable area for our viewport.  We'll use this for times that we want a fixed-size
-    // viewport independent of main window size.
-    m_viewportScrollArea = new QScrollArea(this);
-    m_viewportScrollArea->setContentsMargins(QMargins());
-    m_viewportScrollArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
-    QWidget* viewportContainer = m_viewportTitleDlg.findChild<QWidget*>(QStringLiteral("ViewportTitleDlgContainer"));
-    QToolBar* toolbar = CreateToolBarFromWidget(viewportContainer,
-                                                Qt::TopToolBarArea,
-                                                QStringLiteral("Viewport Settings"));
-    toolbar->setMovable(false);
-    toolbar->installEventFilter(&m_viewportTitleDlg);
-    toolbar->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(toolbar, &QWidget::customContextMenuRequested, &m_viewportTitleDlg, &QWidget::customContextMenuRequested);
-
-    setContextMenuPolicy(Qt::NoContextMenu);
-
-    if (QToolButton* expansion = AzQtComponents::ToolBar::getToolBarExpansionButton(toolbar))
-    {
-        expansion->installEventFilter(m_expanderWatcher);
-    }
-
-    m_id = -1;
-}
-
-CLayoutViewPane::~CLayoutViewPane() 
-{ 
-    if (m_viewportScrollArea)
-    {
-        // We only ever add m_viewport into our scroll area, which we manage separately,
-        // so make sure to take it back before deleting m_scrollArea.  Otherwise it will
-        // try and get deleted as a part of deleting m_scrollArea.
-        m_viewportScrollArea->takeWidget();
-        delete m_viewportScrollArea;
-    }
-    OnDestroy(); 
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::SetViewClass(const QString& sClass)
-{
-    if (m_viewport && m_viewPaneClass == sClass)
-    {
-        return;
-    }
-    m_viewPaneClass = sClass;
-
-    ReleaseViewport();
-
-    QWidget* newPane = QtViewPaneManager::instance()->CreateWidget(sClass);
-    if (newPane)
-    {
-        newPane->setProperty("IsViewportWidget", true);
-        connect(newPane, &QWidget::windowTitleChanged, &m_viewportTitleDlg, &CViewportTitleDlg::SetTitle, Qt::UniqueConnection);
-        AttachViewport(newPane);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString CLayoutViewPane::GetViewClass() const
-{
-    return m_viewPaneClass;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::OnDestroy()
-{
-    ReleaseViewport();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::SwapViewports(CLayoutViewPane* pView)
-{
-    QWidget* pViewport = pView->GetViewport();
-    QWidget* pViewportOld = m_viewport;
-
-    std::swap(m_viewPaneClass, pView->m_viewPaneClass);
-
-    AttachViewport(pViewport);
-    pView->AttachViewport(pViewportOld);
-}
-
-void CLayoutViewPane::SetViewportExpansionPolicy(ViewportExpansionPolicy policy)
-{
-    m_viewportPolicy = policy;
-
-    switch (policy)
-    {
-        // If the requested policy is "FixedSize", wrap our viewport area in a scrollable
-        // region so that we can always make the viewport a guaranteed fixed size regardless of the
-        // main window size.  The scrollable area will auto-resize with the main window, but the
-        // viewport won't.
-        case ViewportExpansionPolicy::FixedSize:
-            {
-                QWidget* scrollViewport = m_viewportScrollArea->viewport();
-                m_viewportScrollArea->setWidget(m_viewport);
-                m_viewport->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-                // For some reason, the QScrollArea is adding a margin all around our viewable area,
-                // so we'll shrink our viewport by an appropriate offset (twice the margin thickness) 
-                // so that it continues to fit without requiring scroll bars after switching size policies.
-                m_viewport->resize(m_viewport->width() - (scrollViewport->x() * 2), m_viewport->height() - (scrollViewport->y() * 2));
-                SetMainWidget(m_viewportScrollArea);
-                update();
-
-            }
-            break;
-        // If the requested policy is "AutoExpand", just put the viewport area directly in the ViewPane.
-        // It will auto-resize with the main window, but requests to change the viewport size might not 
-        // result in the exact size being requested, depending on main window size and layout.
-        case ViewportExpansionPolicy::AutoExpand:
-            {
-                m_viewport->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-                SetMainWidget(m_viewport);
-                update();
-            }
-            break;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::AttachViewport(QWidget* pViewport)
-{
-    if (pViewport == m_viewport)
-    {
-        return;
-    }
-
-    DisconnectRenderViewportInteractionRequestBus();
-    m_viewport = pViewport;
-    if (pViewport)
-    {
-        SetViewportExpansionPolicy(ViewportExpansionPolicy::AutoExpand);
-
-        if (QtViewport* vp = qobject_cast<QtViewport*>(pViewport))
-        {
-            vp->SetViewportId(GetId());
-            vp->SetViewPane(this);
-            if (CRenderViewport* renderViewport = viewport_cast<CRenderViewport*>(vp))
-            {
-                renderViewport->ConnectViewportInteractionRequestBus();
-            }
-            if (EditorViewportWidget* renderViewport = viewport_cast<EditorViewportWidget*>(vp))
-            {
-                renderViewport->ConnectViewportInteractionRequestBus();
-            }
-        }
-
-        m_viewport->setVisible(true);
-
-        setWindowTitle(m_viewPaneClass);
-        m_viewportTitleDlg.SetTitle(pViewport->windowTitle());
-
-        if (QtViewport* vp = qobject_cast<QtViewport*>(pViewport))
-        {
-            OnFOVChanged(vp->GetFOV());
-        }
-        else
-        {
-            OnFOVChanged(gSettings.viewports.fDefaultFov);
-        }
-
-        m_viewportTitleDlg.OnViewportSizeChanged(pViewport->width(), pViewport->height());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::DetachViewport()
-{
-    DisconnectRenderViewportInteractionRequestBus();
-    OnFOVChanged(gSettings.viewports.fDefaultFov);
-    m_viewport = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::ReleaseViewport()
-{
-    if (m_viewport)
-    {
-        DisconnectRenderViewportInteractionRequestBus();
-        m_viewport->deleteLater();
-        m_viewport = 0;
-    }
-}
-
-void CLayoutViewPane::DisconnectRenderViewportInteractionRequestBus()
-{
-    if (QtViewport* vp = qobject_cast<QtViewport*>(m_viewport))
-    {
-        if (CRenderViewport* renderViewport = viewport_cast<CRenderViewport*>(vp))
-        {
-            renderViewport->DisconnectViewportInteractionRequestBus();
-        }
-        if (EditorViewportWidget* renderViewport = viewport_cast<EditorViewportWidget*>(vp))
-        {
-            renderViewport->DisconnectViewportInteractionRequestBus();
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::ResizeViewport(int width, int height)
-{
-    if (!m_viewport)
-    {
-        return;
-    }
-
-    // Get our MainWidget, which will either be the viewport or a scrollable area around the
-    // viewport, depending on which expansion policy we've chosen.
-    QWidget* mainWidget = GetMainWidget();
-    if (!mainWidget)
-    {
-        mainWidget = m_viewport;
-    }
-
-    // If our main widget is a scroll area, specifically get the size of the viewable area within the scroll area.
-    // This way, even if we currently have scroll bars visible, we'll try to resize our main window and scroll area
-    // to make the entire viewport visible.
-    QSize mainWidgetSize = mainWidget->size();
-    if (QScrollArea* scrollArea = qobject_cast<QScrollArea*>(mainWidget))
-    {
-        mainWidgetSize = scrollArea->viewport()->size();
-    }
-
-    // Make sure our requestedSize stays within "legal" bounds.
-    const QSize requestedSize = QSize(AZ::GetClamp(width, MIN_VIEWPORT_RES, MAX_VIEWPORT_RES), 
-                                      AZ::GetClamp(height, MIN_VIEWPORT_RES, MAX_VIEWPORT_RES));
-
-    // The delta between our current and requested size is going to be used to try and resize the main window
-    // (either growing or shrinking) by the exact same amount so that the new viewport size is still completely
-    // visible without needing to adjust any other widget sizes.  
-    // Note that we're specifically taking the delta from the main widget, not the viewport.
-    // In the "AutoResize" case, this will still directly take the delta from our viewport, but in the
-    // "FixedSize" case we need to take the delta from the scroll area's viewable area size, since that's actually 
-    // the one we need to grow/shrink proportional to.
-    const QSize deltaSize = requestedSize - mainWidgetSize;
-
-    // Do nothing if the new size is the same as the old size.
-    if (deltaSize == QSize(0, 0))
-    {
-        return;
-    }
-
-    MainWindow* mainWindow = MainWindow::instance();
-
-    // We need to adjust the main window size to make it larger/smaller as appropriate
-    // to fit the newly-resized viewport, so start by making sure it isn't maximized.
-    if (mainWindow->isMaximized())
-    {
-        mainWindow->showNormal();
-    }
-
-    // Resize our main window by the amount that we want our viewport to change.
-    // This is intended to grow our viewport by the same amount.  However, this logic is a 
-    // little flawed and should get revisited at some point:
-    // 1) It's possible that the mainWindow won't actually change to the requested size, if the requested
-    // size is larger than the current display resolution (Qt::SetGeometry will fire a second resize event
-    // that shrinks the mainWindow back to the display resolution and will emit a warning in debug builds),
-    // or smaller than the minimum size allowed by the various widgets in the window.
-    // 2) If LayoutWnd contains multiple viewports, the delta change of the main window will affect the delta
-    // size of LayoutWnd, which is then divided proportionately among the multiple viewports, so the 1:1 size
-    // assumption in the logic below isn't correct in the multi-viewport case.
-    // 3) Sometimes Qt will just change this by 1 pixel (either smaller or bigger) with a second subsequent
-    // resize event for no apparent reason.
-    // 4) The layout of the docked windows *around* the viewport widget can affect how it grows and shrinks,
-    // so even if you try to change the size of the layout widget, it might auto-resize afterwards to fill any
-    // gaps between it and other widgets (console window, entity inspector, etc).
-    mainWindow->move(0, 0);
-    mainWindow->resize(mainWindow->size() + deltaSize);
-
-    // We can avoid the problems above by using the "FixedSize" policy.  If we've chosen this policy, we'll make
-    // the viewport a scrollable region that's exactly the resolution requested here.  This is useful for screenshots
-    // in automation testing among other things, since this way we can guarantee the resolution of the screenshot matches
-    // the resolution of any golden images we're comparing against.
-    if (m_viewportPolicy == ViewportExpansionPolicy::FixedSize)
-    {
-        m_viewport->resize(requestedSize);
-        update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::SetAspectRatio(unsigned int x, unsigned int y)
-{
-    if (x == 0 || y == 0)
-    {
-        return;
-    }
-
-    const QRect viewportRect = m_viewport->rect();
-
-    // Round height to nearest multiple of y aspect, then scale width according to ratio
-    const unsigned int height = ((viewportRect.height() + y - 1) / y) * y;
-    const unsigned int width = height / y * x;
-
-    ResizeViewport(width, height);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::SetViewportFOV(float fov)
-{
-    if (CRenderViewport* pRenderViewport = qobject_cast<CRenderViewport*>(m_viewport))
-    {
-        pRenderViewport->SetFOV(DEG2RAD(fov));
-
-        // if viewport camera is active, make selected fov new default
-        if (pRenderViewport->GetViewManager()->GetCameraObjectId() == GUID_NULL)
-        {
-            gSettings.viewports.fDefaultFov = DEG2RAD(fov);
-        }
-    }
-    if (EditorViewportWidget* pRenderViewport = qobject_cast<EditorViewportWidget*>(m_viewport))
-    {
-        pRenderViewport->SetFOV(DEG2RAD(fov));
-
-        // if viewport camera is active, make selected fov new default
-        if (pRenderViewport->GetViewManager()->GetCameraObjectId() == GUID_NULL)
-        {
-            gSettings.viewports.fDefaultFov = DEG2RAD(fov);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::ToggleMaximize()
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Switch in and out of fullscreen mode for a edit view
-    ////////////////////////////////////////////////////////////////////////
-    CLayoutWnd* wnd = GetIEditor()->GetViewManager()->GetLayout();
-    if (wnd)
-    {
-        wnd->MaximizeViewport(GetId());
-    }
-    setFocus();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::OnMenuLayoutConfig()
-{
-    if (GetIEditor()->IsInGameMode())
-    {
-        // you may not change your viewports while game mode is running.
-        CryLog("You may not change viewport configuration while in game mode.");
-        return;
-    }
-
-    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-    if (layout)
-    {
-        CLayoutConfigDialog dlg;
-        dlg.SetLayout(layout->GetLayout());
-        if (dlg.exec() == QDialog::Accepted)
-        {
-            // Will kill this Pane. so must be last line in this function.
-            layout->CreateLayout(dlg.GetLayout());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::OnMenuViewSelected(const QString& paneName)
-{
-    if (GetIEditor()->IsInGameMode())
-    {
-        CryLog("You may not change viewport configuration while in game mode.");
-        // you may not change your viewports while game mode is running.
-        return;
-    }
-
-    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-    if (layout)
-    {
-        layout->BindViewport(this, paneName);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::OnMenuMaximized()
-{
-    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-    if (m_viewport && layout)
-    {
-        layout->MaximizeViewport(GetId());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::ShowTitleMenu()
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Process clicks on the view buttons and the menu button
-    ////////////////////////////////////////////////////////////////////////
-    // Only continue when we have a viewport.
-
-    // Create pop up menu.
-    QMenu root(this);
-    if (QtViewport* vp = qobject_cast<QtViewport*>(m_viewport))
-    {
-        vp->OnTitleMenu(&root);
-    }
-
-    if (!root.isEmpty())
-    {
-        root.addSeparator();
-    }
-
-    CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-    QAction* action = root.addAction(tr("Maximized"));
-    if (layout)
-    {
-        connect(action, &QAction::triggered, layout, &CLayoutWnd::MaximizeViewport);
-    }
-    action->setChecked(IsFullscreen());
-
-    action = root.addAction(tr("Configure Layout..."));
-    if (!CViewManager::IsMultiViewportEnabled())
-    {
-        action->setDisabled(true);
-    }
-
-    // NOTE: this must be a QueuedConnection, so that it executes after the menu is deleted.
-    // Changing the layout can cause the current "this" pointer to be deleted
-    // and since we've made the "this" pointer the menu's parent,
-    // it gets deleted when the "this" pointer is deleted. Since it's not a heap object,
-    // that causes a crash. Using a QueuedConnection forces the layout config to happen
-    // after the QMenu is cleaned up on the stack.
-    connect(action, &QAction::triggered, this, &CLayoutViewPane::OnMenuLayoutConfig, Qt::QueuedConnection);
-
-#ifdef FEATURE_ORTHOGRAPHIC_VIEW
-    QMenu* viewsMenu = root.addMenu(tr("Viewport Type"));
-    
-    QtViewPanes viewports = QtViewPaneManager::instance()->GetRegisteredViewportPanes();
-
-    for (auto it = viewports.cbegin(), end = viewports.cend(); it != end; ++it)
-    {
-        const QtViewPane& pane = *it;
-        action = viewsMenu->addAction(pane.m_name);
-        action->setCheckable(true);
-        action->setChecked(m_viewPaneClass == pane.m_name);
-        connect(action, &QAction::triggered, [pane, this] { OnMenuViewSelected(pane.m_name); });
-    }
-#endif
-    root.exec(QCursor::pos());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::mouseDoubleClickEvent(QMouseEvent* event)
-{
-    if (event->button() == Qt::LeftButton)
-    {
-        ToggleMaximize();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::focusInEvent([[maybe_unused]] QFocusEvent* event)
-{
-    // Forward SetFocus call to child viewport.
-    if (m_viewport)
-    {
-        m_viewport->setFocus();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::SetFullscren(bool f)
-{
-    m_bFullscreen = f;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::SetFocusToViewport()
-{
-    if (m_viewport)
-    {
-        m_viewport->window()->activateWindow();
-        m_viewport->setFocus();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CLayoutViewPane::OnFOVChanged(float fov)
-{
-    m_viewportTitleDlg.OnViewportFOVChanged(fov);
-}
-
-//////////////////////////////////////////////////////////////////////////
-namespace
-{
-    AZ::Vector2 PyGetViewPortSize()
-    {
-        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
-        if (viewPane && viewPane->GetViewport())
-        {
-            const QRect rcViewport = viewPane->GetViewport()->rect();
-            return AZ::Vector2(rcViewport.width(), rcViewport.height());
-        }
-        else
-        {
-            return AZ::Vector2();
-        }
-    }
-
-    void PySetViewPortSize(int width, int height)
-    {
-        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
-        if (viewPane)
-        {
-            viewPane->ResizeViewport(width, height);
-        }
-    }
-
-    static void PyUpdateViewPort()
-    {
-        GetIEditor()->UpdateViews(eRedrawViewports);
-    }
-
-    void PyResizeViewport(int width, int height)
-    {
-        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
-
-        if (viewPane)
-        {
-            viewPane->ResizeViewport(width, height);
-        }
-    }
-
-    void PyBindViewport(const char* viewportName)
-    {
-        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
-        if (viewPane)
-        {
-            GetIEditor()->GetViewManager()->GetLayout()->BindViewport(viewPane, viewportName);
-        }
-    }
-
-    void PySetViewportExpansionPolicy(const char* policy)
-    {
-        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
-        if (viewPane)
-        {
-            if (AzFramework::StringFunc::Equal(policy, "AutoExpand"))
-            {
-                viewPane->SetViewportExpansionPolicy(CLayoutViewPane::ViewportExpansionPolicy::AutoExpand);
-            }
-            else if (AzFramework::StringFunc::Equal(policy, "FixedSize"))
-            {
-                viewPane->SetViewportExpansionPolicy(CLayoutViewPane::ViewportExpansionPolicy::FixedSize);
-            }
-        }
-    }
-
-    const char* PyGetViewportExpansionPolicy()
-    {
-        CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
-        if (viewPane)
-        {
-            switch (viewPane->GetViewportExpansionPolicy())
-            {
-                case CLayoutViewPane::ViewportExpansionPolicy::AutoExpand: return "AutoExpand";
-                case CLayoutViewPane::ViewportExpansionPolicy::FixedSize: return "FixedSize";
-            }
-        }
-
-        return "";
-    }
-
-    unsigned int PyGetViewportCount()
-    {
-        CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-        return layout ? layout->GetViewPaneCount() : 0;
-    }
-
-    unsigned int PyGetActiveViewport()
-    {
-        CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-        if (layout)
-        {
-            CLayoutViewPane* viewPane = MainWindow::instance()->GetActiveView();
-
-            for (unsigned int index = 0; index < layout->GetViewPaneCount(); index++)
-            {
-                if (viewPane == layout->GetViewPaneByIndex(index))
-                {
-                    return index;
-                }
-            }
-        }
-
-        AZ_Error("Main", false, "No active viewport found.");
-        return 0;
-    }
-
-    void PySetActiveViewport(unsigned int viewportIndex)
-    {
-        bool success = false;
-        CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-        if (layout)
-        {
-            CLayoutViewPane* viewPane = layout->GetViewPaneByIndex(viewportIndex);
-            if (viewPane)
-            {
-                viewPane->SetFocusToViewport();
-                MainWindow::instance()->SetActiveView(viewPane);
-                success = true;
-            }
-        }
-        AZ_Error("Main", success, "Active viewport was not set successfully.");
-    }
-
-    unsigned int PyGetViewPaneLayout()
-    {
-        CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-        return layout ? layout->GetLayout() : ET_Layout0;
-    }
-
-    void PySetViewPaneLayout(unsigned int layoutId)
-    {
-        if ((layoutId >= ET_Layout0) && (layoutId <= ET_Layout8))
-        {
-            CLayoutWnd* layout = GetIEditor()->GetViewManager()->GetLayout();
-            if (layout)
-            {
-                layout->CreateLayout(static_cast<EViewLayout>(layoutId));
-            }
-        }
-        else
-        {
-            AZ_Error("Main", false, "Invalid layout (%u), only values from %u to %u are valid.", layoutId, ET_Layout0, ET_Layout8);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-namespace AzToolsFramework
-{
-    void ViewPanePythonFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.general' module
-            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
-            };
-            addLegacyGeneral(behaviorContext->Method("get_viewport_size", PyGetViewPortSize, nullptr, "Get the width and height of the active viewport."));
-            addLegacyGeneral(behaviorContext->Method("set_viewport_size", PySetViewPortSize, nullptr, "Set the width and height of the active viewport."));
-            addLegacyGeneral(behaviorContext->Method("update_viewport", PyUpdateViewPort, nullptr, "Update all visible SDK viewports."));
-            addLegacyGeneral(behaviorContext->Method("resize_viewport", PyResizeViewport, nullptr, "Resizes the viewport resolution to a given width & height."));
-            addLegacyGeneral(behaviorContext->Method("bind_viewport", PyBindViewport, nullptr, "Binds the viewport to a specific view like 'Top', 'Front', 'Perspective'."));
-            addLegacyGeneral(behaviorContext->Method("get_viewport_expansion_policy", PyGetViewportExpansionPolicy, nullptr, "Returns whether viewports are auto-resized with the main window ('AutoExpand') or if they remain a fixed size ('FixedSize')."));
-            addLegacyGeneral(behaviorContext->Method("set_viewport_expansion_policy", PySetViewportExpansionPolicy, nullptr, "Sets whether viewports are auto-resized with the main window ('AutoExpand') or if they remain a fixed size ('FixedSize')."));
-            addLegacyGeneral(behaviorContext->Method("get_viewport_count", PyGetViewportCount, nullptr, "Get the total number of viewports."));
-            addLegacyGeneral(behaviorContext->Method("get_active_viewport", PyGetActiveViewport, nullptr, "Get the active viewport index."));
-            addLegacyGeneral(behaviorContext->Method("set_active_viewport", PySetActiveViewport, nullptr, "Set the active viewport by index."));
-            addLegacyGeneral(behaviorContext->Method("get_view_pane_layout", PyGetViewPaneLayout, nullptr, "Get the active view pane layout."));
-            addLegacyGeneral(behaviorContext->Method("set_view_pane_layout", PySetViewPaneLayout, nullptr, "Set the active view pane layout."));
-        }
-    }
-}
-
-#include <moc_ViewPane.cpp>
diff --git a/Code/Sandbox/Editor/ViewPane.h b/Code/Sandbox/Editor/ViewPane.h
deleted file mode 100644
index 1618fcb7b8..0000000000
--- a/Code/Sandbox/Editor/ViewPane.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_VIEWPANE_H
-#define CRYINCLUDE_EDITOR_VIEWPANE_H
-
-#pragma once
-// ViewPane.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include "ViewportTitleDlg.h"
-
-#include <AzQtComponents/Components/ToolBarArea.h>
-#include <AzCore/Component/Component.h>
-#include <Include/SandboxAPI.h>
-#endif
-
-class CViewport;
-class QToolBar;
-class QScrollArea;
-class ViewportTitleExpanderWatcher;
-
-/////////////////////////////////////////////////////////////////////////////
-// CViewPane view
-
-class CLayoutViewPane
-    : public AzQtComponents::ToolBarArea
-{
-    Q_OBJECT
-public:
-    CLayoutViewPane(QWidget* parent = nullptr);
-    virtual ~CLayoutViewPane();
-
-    // Operations
-public:
-    // Set get this pane id.
-    void SetId(int id) { m_id = id; }
-    int GetId() { return m_id; }
-
-    void SetViewClass(const QString& sClass);
-    QString GetViewClass() const;
-
-    //! Assign viewport to this pane.
-    void SwapViewports(CLayoutViewPane* pView);
-
-    void AttachViewport(QWidget* pViewport);
-    //! Detach viewport from this pane.
-    void DetachViewport();
-    // Releases and destroy attached viewport.
-    void ReleaseViewport();
-
-    void SetFullscren(bool f);
-    bool IsFullscreen() const { return m_bFullscreen; }
-
-    QWidget* GetViewport() { return m_viewport; }
-
-    //////////////////////////////////////////////////////////////////////////
-    bool IsActiveView() const { return m_active; }
-
-    void ShowTitleMenu();
-    void ToggleMaximize();
-
-    void SetFocusToViewport();
-
-    void ResizeViewport(int width, int height);
-    void SetAspectRatio(unsigned int x, unsigned int y);
-    void SetViewportFOV(float fov);
-    void OnFOVChanged(float fov);
-
-    enum class ViewportExpansionPolicy
-    {
-        AutoExpand,
-        FixedSize
-    };
-
-    ViewportExpansionPolicy GetViewportExpansionPolicy() { return m_viewportPolicy; }
-
-    //! Determine whether the viewport will be a fixed-size (scrollable if necessary) 
-    //! independent of the main window size, or auto-expanding based directly on the main window size.
-    void SetViewportExpansionPolicy(ViewportExpansionPolicy policy);
-
-protected:
-    void OnMenuLayoutConfig();
-    void OnMenuViewSelected(const QString& paneName);
-    void OnMenuMaximized();
-
-    void mouseDoubleClickEvent(QMouseEvent* event) override;
-    void OnDestroy();
-    void focusInEvent(QFocusEvent* event) override;
-
-    void DisconnectRenderViewportInteractionRequestBus();
-
-private:
-    static constexpr int MIN_VIEWPORT_RES = 64;
-    static constexpr int MAX_VIEWPORT_RES = 8192;
-    static constexpr int MAX_CLASSVIEWS = 100;
-    static constexpr int VIEW_BORDER = 0;
-
-    enum TitleMenuCommonCommands
-    {
-        ID_MAXIMIZED = 50000,
-        ID_LAYOUT_CONFIG,
-
-        FIRST_ID_CLASSVIEW,
-        LAST_ID_CLASSVIEW = FIRST_ID_CLASSVIEW + MAX_CLASSVIEWS - 1
-    };
-
-    QString m_viewPaneClass;
-    bool m_bFullscreen;
-    CViewportTitleDlg m_viewportTitleDlg;
-
-    int m_id;
-    int m_nBorder;
-    int m_titleHeight;
-
-    QWidget* m_viewport;
-    QScrollArea* m_viewportScrollArea = nullptr;
-    ViewportExpansionPolicy m_viewportPolicy = ViewportExpansionPolicy::AutoExpand;
-    ViewportTitleExpanderWatcher* m_expanderWatcher;
-    bool m_active;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-namespace AzToolsFramework
-{
-    //! A component to reflect scriptable commands for the Editor
-    class ViewPanePythonFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(ViewPanePythonFuncsHandler, "{25C99C8F-4440-4656-ABC4-32134F496CC1}")
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-} // namespace AzToolsFramework
-
-#endif // CRYINCLUDE_EDITOR_VIEWPANE_H
diff --git a/Code/Sandbox/Editor/Viewport.cpp b/Code/Sandbox/Editor/Viewport.cpp
deleted file mode 100644
index 69325808a5..0000000000
--- a/Code/Sandbox/Editor/Viewport.cpp
+++ /dev/null
@@ -1,1525 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "Viewport.h"
-
-// Qt
-#include <QPainter>
-
-// AzQtComponents
-#include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
-
-#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
-
-// Editor
-#include "ViewManager.h"
-#include "Include/ITransformManipulator.h"
-#include "Include/HitContext.h"
-#include "Objects/ObjectManager.h"
-#include "Util/3DConnexionDriver.h"
-#include "PluginManager.h"
-#include "Include/IRenderListener.h"
-#include "GameEngine.h"
-#include "Settings.h"
-
-
-#ifdef LoadCursor
-#undef LoadCursor
-#endif
-
-//////////////////////////////////////////////////////////////////////
-// Viewport drag and drop support
-//////////////////////////////////////////////////////////////////////
-
-void QtViewport::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt)
-{
-    context.m_hitLocation = AZ::Vector3::CreateZero();
-
-    PreWidgetRendering(); // required so that the current render cam is set.
-
-    Vec3 pos = Vec3(ZERO);
-    HitContext hit;
-    if (HitTest(pt, hit))
-    {
-        pos = hit.raySrc + hit.rayDir * hit.dist;
-        pos = SnapToGrid(pos);
-    }
-    else
-    {
-        bool hitTerrain;
-        pos = ViewToWorld(pt, &hitTerrain);
-        if (hitTerrain)
-        {
-            pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y);
-        }
-        pos = SnapToGrid(pos);
-    }
-    context.m_hitLocation = AZ::Vector3(pos.x, pos.y, pos.z);
-
-    PostWidgetRendering();
-}
-
-
-void QtViewport::dragEnterEvent(QDragEnterEvent* event)
-{
-    if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
-    {
-        return;
-    }
-
-    // first use the legacy pathway, which assumes its always okay as long as any callback is installed
-    if (m_dropCallback)
-    {
-        event->setDropAction(Qt::CopyAction);
-        event->setAccepted(true);
-    }
-    else
-    {
-        // new bus-based way of doing it (install a listener!)
-        using namespace AzQtComponents;
-        ViewportDragContext context;
-        BuildDragDropContext(context, event->pos());
-        DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragEnter, event, context);
-    }
-}
-
-void QtViewport::dragMoveEvent(QDragMoveEvent* event)
-{
-    if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
-    {
-        return;
-    }
-
-    // first use the legacy pathway, which assumes its always okay as long as any callback is installed
-    if (m_dropCallback)
-    {
-        event->setDropAction(Qt::CopyAction);
-        event->setAccepted(true);
-    }
-    else
-    {
-        // new bus-based way of doing it (install a listener!)
-        using namespace AzQtComponents;
-        ViewportDragContext context;
-        BuildDragDropContext(context, event->pos());
-        DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragMove, event, context);
-    }
-}
-
-void QtViewport::dropEvent(QDropEvent* event)
-{
-    using namespace AzQtComponents;
-    if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
-    {
-        return;
-    }
-
-    // first use the legacy pathway, which assumes its always okay as long as any callback is installed
-    if (m_dropCallback)
-    {
-        m_dropCallback(this, event->pos().x(), event->pos().y(), m_dropCallbackCustom);
-        event->setAccepted(true);
-    }
-    else
-    {
-        // new bus-based way of doing it (install a listener!)
-        ViewportDragContext context;
-        BuildDragDropContext(context, event->pos());
-        DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::Drop, event, context);
-    }
-}
-
-void QtViewport::dragLeaveEvent(QDragLeaveEvent* event)
-{
-    using namespace AzQtComponents;
-    DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragLeave, event);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-float CViewport::GetFOV() const
-{
-    return gSettings.viewports.fDefaultFov;
-}
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-bool QtViewport::m_bDegradateQuality = false;
-
-QtViewport::QtViewport(QWidget* parent)
-    : QWidget(parent)
-    , m_renderOverlay(this)
-{
-    m_cViewMenu.addMenu(tr("&View Options"))->addAction(tr("&Fullscreen"));
-    //connect(action, &QAction::triggered, );
-    m_selectionTolerance = 0;
-    m_fGridZoom = 1.0f;
-
-    m_nLastUpdateFrame = 0;
-    m_nLastMouseMoveFrame = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Init standard cursors.
-    //////////////////////////////////////////////////////////////////////////
-    m_hCurrCursor = QCursor();
-    m_hCursor[STD_CURSOR_DEFAULT] = QCursor(Qt::ArrowCursor);
-    m_hCursor[STD_CURSOR_HIT] = CMFCUtils::LoadCursor(IDC_POINTER_OBJHIT);
-    m_hCursor[STD_CURSOR_MOVE] = CMFCUtils::LoadCursor(IDC_POINTER_OBJECT_MOVE);
-    m_hCursor[STD_CURSOR_ROTATE] = CMFCUtils::LoadCursor(IDC_POINTER_OBJECT_ROTATE);
-    m_hCursor[STD_CURSOR_SCALE] = CMFCUtils::LoadCursor(IDC_POINTER_OBJECT_SCALE);
-    m_hCursor[STD_CURSOR_SEL_PLUS] = CMFCUtils::LoadCursor(IDC_POINTER_PLUS);
-    m_hCursor[STD_CURSOR_SEL_MINUS] = CMFCUtils::LoadCursor(IDC_POINTER_MINUS);
-    m_hCursor[STD_CURSOR_SUBOBJ_SEL] = CMFCUtils::LoadCursor(IDC_POINTER_SO_SELECT);
-    m_hCursor[STD_CURSOR_SUBOBJ_SEL_PLUS] = CMFCUtils::LoadCursor(IDC_POINTER_SO_SELECT_PLUS);
-    m_hCursor[STD_CURSOR_SUBOBJ_SEL_MINUS] = CMFCUtils::LoadCursor(IDC_POINTER_SO_SELECT_MINUS);
-
-    m_activeAxis = AXIS_TERRAIN;
-
-    for (int i = 0; i < LAST_COORD_SYSTEM; i++)
-    {
-        m_constructionMatrix[i].SetIdentity();
-    }
-    m_viewTM.SetIdentity();
-    m_screenTM.SetIdentity();
-
-    m_pMouseOverObject = 0;
-
-    m_bAdvancedSelectMode = false;
-
-    m_pVisibleObjectsCache = new CBaseObjectsCache;
-
-    m_constructionPlane.SetPlane(Vec3_OneZ, Vec3_Zero);
-    m_constructionPlaneAxisX = Vec3_Zero;
-    m_constructionPlaneAxisY = Vec3_Zero;
-
-    GetIEditor()->GetViewManager()->RegisterViewport(this);
-
-    m_nCurViewportID = MAX_NUM_VIEWPORTS - 1;
-    m_dropCallback = nullptr; // Leroy@Conffx
-
-    setMouseTracking(true);
-    setFocusPolicy(Qt::StrongFocus);
-
-    // Create drop target to handle Qt drop events.
-    setAcceptDrops(true);
-
-    m_renderOverlay.setVisible(true);
-    m_renderOverlay.setUpdatesEnabled(false);
-    m_renderOverlay.setMouseTracking(true);
-    m_renderOverlay.setObjectName("renderOverlay");
-    m_renderOverlay.winId(); // Force the render overlay to create a backing native window
-
-    m_viewportUi.InitializeViewportUi(this, &m_renderOverlay);
-
-    setAcceptDrops(true);
-}
-
-//////////////////////////////////////////////////////////////////////////
-QtViewport::~QtViewport()
-{
-    delete m_pVisibleObjectsCache;
-
-    GetIEditor()->GetViewManager()->UnregisterViewport(this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::ScreenToClient(QPoint& pPoint) const
-{
-    pPoint = mapFromGlobal(pPoint);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::GetDimensions(int* pWidth, int* pHeight) const
-{
-    if (pWidth)
-    {
-        *pWidth = width();
-    }
-    if (pHeight)
-    {
-        *pHeight = height();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::RegisterRenderListener(IRenderListener*    piListener)
-{
-#ifdef _DEBUG
-    size_t nCount(0);
-    size_t nTotal(0);
-
-    nTotal = m_cRenderListeners.size();
-    for (nCount = 0; nCount < nTotal; ++nCount)
-    {
-        if (m_cRenderListeners[nCount] == piListener)
-        {
-            assert(!"Registered the same RenderListener multiple times.");
-            break;
-        }
-    }
-#endif //_DEBUG
-    m_cRenderListeners.push_back(piListener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::UnregisterRenderListener(IRenderListener*  piListener)
-{
-    size_t nCount(0);
-    size_t nTotal(0);
-
-    nTotal = m_cRenderListeners.size();
-    for (nCount = 0; nCount < nTotal; ++nCount)
-    {
-        if (m_cRenderListeners[nCount] == piListener)
-        {
-            m_cRenderListeners.erase(m_cRenderListeners.begin() + nCount);
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::IsRenderListenerRegistered(IRenderListener*    piListener)
-{
-    size_t nCount(0);
-    size_t nTotal(0);
-
-    nTotal = m_cRenderListeners.size();
-    for (nCount = 0; nCount < nTotal; ++nCount)
-    {
-        if (m_cRenderListeners[nCount] == piListener)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::AddPostRenderer(IPostRenderer* pPostRenderer)
-{
-    stl::push_back_unique(m_postRenderers, pPostRenderer);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::RemovePostRenderer(IPostRenderer* pPostRenderer)
-{
-    PostRenderers::iterator itr = m_postRenderers.begin();
-    PostRenderers::iterator end = m_postRenderers.end();
-    for (; itr != end; ++itr)
-    {
-        if (*itr == pPostRenderer)
-        {
-            break;
-        }
-    }
-
-    if (itr != end)
-    {
-        m_postRenderers.erase(itr);
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnMouseWheel([[maybe_unused]] Qt::KeyboardModifiers modifiers, short zDelta, [[maybe_unused]] const QPoint& pt)
-{
-    if (zDelta != 0)
-    {
-        float z = GetZoomFactor() + (zDelta / 120.0f) * 0.5f;
-
-        SetZoomFactor(z);
-        GetIEditor()->GetViewManager()->SetZoomFactor(z);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-QString QtViewport::GetName() const
-{
-    return windowTitle();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::SetName(const QString& name)
-{
-    setWindowTitle(name);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::resizeEvent(QResizeEvent* event)
-{
-    QWidget::resizeEvent(event);
-    m_renderOverlay.setGeometry(rect());
-    Update();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::leaveEvent(QEvent* event)
-{
-    QWidget::leaveEvent(event);
-    MouseCallback(eMouseLeave, QPoint(), Qt::KeyboardModifiers(), Qt::MouseButtons());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::paintEvent([[maybe_unused]] QPaintEvent* event)
-{
-    QPainter painter(this);
-
-    // Fill the entire client area
-    painter.fillRect(rect(), QColor(0xf0, 0xf0, 0xf0));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnActivate()
-{
-    ////////////////////////////////////////////////////////////////////////
-    // Make this edit window the current one
-    ////////////////////////////////////////////////////////////////////////
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnDeactivate()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::ResetContent()
-{
-    m_pMouseOverObject = 0;
-
-    // Need to clear visual object cache.
-    // Right after loading new level, some code(e.g. OnMouseMove) access invalid
-    // previous level object before cache updated.
-    GetVisibleObjectsCache()->ClearObjects();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::UpdateContent(int flags)
-{
-    if (flags & eRedrawViewports)
-    {
-        update();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::Update()
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-    m_viewportUi.Update();
-
-    m_bAdvancedSelectMode = false;
-    bool bSpaceClick = false;
-    {
-        bSpaceClick = CheckVirtualKey(Qt::Key_Space) & !CheckVirtualKey(Qt::Key_Shift) /*& !CheckVirtualKey(Qt::Key_Control)*/;
-    }
-    if (bSpaceClick && hasFocus())
-    {
-        m_bAdvancedSelectMode = true;
-    }
-
-    m_nLastUpdateFrame++;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QPoint QtViewport::WorldToView(const Vec3& wp) const
-{
-    return QPoint(wp.x, wp.y);
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 QtViewport::WorldToView3D(const Vec3& wp, [[maybe_unused]] int nFlags) const
-{
-    QPoint p = WorldToView(wp);
-    Vec3 out;
-    out.x = p.x();
-    out.y = p.y();
-    out.z = wp.z;
-    return out;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3    QtViewport::ViewToWorld(const QPoint& vp, bool* pCollideWithTerrain, [[maybe_unused]] bool onlyTerrain, [[maybe_unused]] bool bSkipVegetation, [[maybe_unused]] bool bTestRenderMesh, [[maybe_unused]] bool* collideWithObject) const
-{
-    Vec3 wp;
-    wp.x = vp.x();
-    wp.y = vp.y();
-    wp.z = 0;
-    if (pCollideWithTerrain)
-    {
-        *pCollideWithTerrain = true;
-    }
-    return wp;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3    QtViewport::ViewToWorldNormal([[maybe_unused]] const QPoint& vp, [[maybe_unused]] bool onlyTerrain, [[maybe_unused]] bool bTestRenderMesh)
-{
-    return Vec3(0, 0, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void    QtViewport::ViewToWorldRay([[maybe_unused]] const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const
-{
-    raySrc(0, 0, 0);
-    rayDir(0, 0, -1);
-}
-
-void QtViewport::mousePressEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonDown(event->modifiers(), event->pos());
-        break;
-    case Qt::MiddleButton:
-        OnMButtonDown(event->modifiers(), event->pos());
-        break;
-    case Qt::RightButton:
-        OnRButtonDown(event->modifiers(), event->pos());
-        break;
-    }
-}
-
-void QtViewport::mouseReleaseEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonUp(event->modifiers(), event->pos());
-        break;
-    case Qt::MiddleButton:
-        OnMButtonUp(event->modifiers(), event->pos());
-        break;
-    case Qt::RightButton:
-        OnRButtonUp(event->modifiers(), event->pos());
-        break;
-    }
-
-    // For MFC compatibility, send a spurious move event after a button release.
-    // CryDesigner depends on this behaviour
-    mouseMoveEvent(event);
-}
-
-void QtViewport::mouseDoubleClickEvent(QMouseEvent* event)
-{
-    switch (event->button())
-    {
-    case Qt::LeftButton:
-        OnLButtonDblClk(event->modifiers(), event->pos());
-        break;
-    case Qt::MiddleButton:
-        OnMButtonDblClk(event->modifiers(), event->pos());
-        break;
-    case Qt::RightButton:
-        OnRButtonDblClk(event->modifiers(), event->pos());
-        break;
-    }
-}
-
-void QtViewport::mouseMoveEvent(QMouseEvent* event)
-{
-    OnMouseMove(event->modifiers(), event->buttons(), event->pos());
-    OnSetCursor();
-}
-
-void QtViewport::wheelEvent(QWheelEvent* event)
-{
-    OnMouseWheel(event->modifiers(), event->angleDelta().y(), event->position().toPoint());
-    event->accept();
-}
-
-void QtViewport::keyPressEvent(QKeyEvent* event)
-{
-    int nativeKey = event->nativeVirtualKey();
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    // nativeVirtualKey is always zero on macOS, therefore we
-    // need to manually set the nativeKey based on the Qt key
-    switch (event->key())
-    {
-        case Qt::Key_Control:
-            nativeKey = VK_CONTROL;
-            break;
-        case Qt::Key_Alt:
-            nativeKey = VK_MENU;
-            break;
-        case Qt::Key_QuoteLeft:
-            nativeKey = VK_OEM_3;
-            break;
-        case Qt::Key_BracketLeft:
-            nativeKey = VK_OEM_4;
-            break;
-        case Qt::Key_BracketRight:
-            nativeKey = VK_OEM_6;
-            break;
-        case Qt::Key_Comma:
-            nativeKey = VK_OEM_COMMA;
-            break;
-        case Qt::Key_Period:
-            nativeKey = VK_OEM_PERIOD;
-            break;
-        case Qt::Key_Escape:
-            nativeKey = VK_ESCAPE;
-            break;
-    }
-#endif
-    OnKeyDown(nativeKey, 1, event->nativeModifiers());
-}
-
-void QtViewport::keyReleaseEvent(QKeyEvent* event)
-{
-    int nativeKey = event->nativeVirtualKey();
-#if AZ_TRAIT_OS_PLATFORM_APPLE
-    // nativeVirtualKey is always zero on macOS, therefore we
-    // need to manually set the nativeKey based on the Qt key
-    switch (event->key())
-    {
-        case Qt::Key_Control:
-            nativeKey = VK_CONTROL;
-            break;
-        case Qt::Key_Alt:
-            nativeKey = VK_MENU;
-            break;
-        case Qt::Key_QuoteLeft:
-            nativeKey = VK_OEM_3;
-            break;
-        case Qt::Key_BracketLeft:
-            nativeKey = VK_OEM_4;
-            break;
-        case Qt::Key_BracketRight:
-            nativeKey = VK_OEM_6;
-            break;
-        case Qt::Key_Comma:
-            nativeKey = VK_OEM_COMMA;
-            break;
-        case Qt::Key_Period:
-            nativeKey = VK_OEM_PERIOD;
-            break;
-        case Qt::Key_Escape:
-            nativeKey = VK_ESCAPE;
-            break;
-    }
-#endif
-    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()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::ResetSelectionRegion()
-{
-    AABB box(Vec3(0, 0, 0), Vec3(0, 0, 0));
-    GetIEditor()->SetSelectedRegion(box);
-    m_selectedRect = QRect();
-}
-
-void QtViewport::SetSelectionRectangle(const QRect& rect)
-{
-    m_selectedRect = rect.normalized();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect)
-{
-    Vec3 org;
-    AABB box;
-    box.Reset();
-
-    //adjust QRect bottom and right corner once before extracting bottom/right coordinates
-    const QRect correctedRect = rect.adjusted(0, 0, 1, 1);
-    Vec3 p1 = ViewToWorld(correctedRect.topLeft());
-    Vec3 p2 = ViewToWorld(correctedRect.bottomRight());
-    org = p1;
-    // Calculate selection volume.
-    if (!bNormalizeRect)
-    {
-        box.Add(p1);
-        box.Add(p2);
-    }
-    else
-    {
-        const QRect rc = correctedRect.normalized();
-        box.Add(ViewToWorld(rc.topLeft()));
-        box.Add(ViewToWorld(rc.topRight()));
-        box.Add(ViewToWorld(rc.bottomLeft()));
-        box.Add(ViewToWorld(rc.bottomRight()));
-    }
-
-    box.min.z = -10000;
-    box.max.z = 10000;
-    GetIEditor()->SetSelectedRegion(box);
-
-    // Show marker position in the status bar
-    float w = box.max.x - box.min.x;
-    float h = box.max.y - box.min.y;
-    char szNewStatusText[512];
-    sprintf_s(szNewStatusText, "X:%g Y:%g Z:%g  W:%g H:%g", org.x, org.y, org.z, w, h);
-    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)
-{
-    setCursor(hCursor);
-    m_cursorStr = cursorString;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::SetCurrentCursor(EStdCursor stdCursor, const QString& cursorString)
-{
-    QCursor hCursor = m_hCursor[stdCursor];
-    setCursor(hCursor);
-    m_cursorStr = cursorString;
-}
-
-void QtViewport::SetSupplementaryCursorStr(const QString& str)
-{
-    m_cursorSupplementaryStr = str;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::SetCurrentCursor(EStdCursor stdCursor)
-{
-    QCursor hCursor = m_hCursor[stdCursor];
-    setCursor(hCursor);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::SetCursorString(const QString& cursorString)
-{
-    m_cursorStr = cursorString;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::ResetCursor()
-{
-    SetCurrentCursor(STD_CURSOR_DEFAULT, QString());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::SetConstructionOrigin(const Vec3& worldPos)
-{
-    Matrix34 tm;
-    tm.SetIdentity();
-    tm.SetTranslation(worldPos);
-    SetConstructionMatrix(COORDS_LOCAL, tm);
-    SetConstructionMatrix(COORDS_PARENT, tm);
-    SetConstructionMatrix(COORDS_USERDEFINED, tm);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::SetConstructionMatrix(RefCoordSys coordSys, const Matrix34& xform)
-{
-    m_constructionMatrix[coordSys] = xform;
-    m_constructionMatrix[coordSys].OrthonormalizeFast(); // Remove scale component from matrix.
-    if (coordSys == COORDS_LOCAL)
-    {
-        m_constructionMatrix[COORDS_VIEW].SetTranslation(xform.GetTranslation());
-        m_constructionMatrix[COORDS_WORLD].SetTranslation(xform.GetTranslation());
-        m_constructionMatrix[COORDS_USERDEFINED].SetIdentity();
-        m_constructionMatrix[COORDS_USERDEFINED].SetTranslation(xform.GetTranslation());
-        m_constructionMatrix[COORDS_PARENT] = xform;
-    }
-    MakeConstructionPlane(GetAxisConstrain());
-}
-
-//////////////////////////////////////////////////////////////////////////
-const Matrix34& QtViewport::GetConstructionMatrix(RefCoordSys coordSys)
-{
-    if (coordSys == COORDS_VIEW)
-    {
-        return m_constructionMatrix[COORDS_WORLD];
-    }
-    return m_constructionMatrix[coordSys];
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::AssignConstructionPlane(const Vec3& p1, const Vec3& p2, const Vec3& p3)
-{
-    m_constructionPlane.SetPlane(p1, p2, p3);
-    m_constructionPlaneAxisX = p3 - p1;
-    m_constructionPlaneAxisY = p2 - p1;
-}
-
-//////////////////////////////////////////////////////////////////////////
-HWND QtViewport::renderOverlayHWND() const
-{
-    return reinterpret_cast<HWND>(m_renderOverlay.winId());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::setRenderOverlayVisible(bool visible)
-{
-    m_renderOverlay.setVisible(visible);
-}
-
-bool QtViewport::isRenderOverlayVisible() const
-{
-    return m_renderOverlay.isVisible();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::MakeConstructionPlane(int axis)
-{
-    QPoint cursorPos;
-    if (m_mouseCaptured)
-    {
-        cursorPos = m_cMouseDownPos;
-    }
-    else
-    {
-        cursorPos = QCursor::pos();
-        ScreenToClient(cursorPos);
-    }
-
-    Vec3 raySrc(Vec3_Zero), rayDir(Vec3_OneX);
-    ViewToWorldRay(cursorPos, raySrc, rayDir);
-
-    int coordSys = GetIEditor()->GetReferenceCoordSys();
-
-    Vec3 xAxis(Vec3_OneX);
-    Vec3 yAxis(Vec3_OneY);
-    Vec3 zAxis(Vec3_OneZ);
-
-    xAxis = m_constructionMatrix[coordSys].TransformVector(xAxis);
-    yAxis = m_constructionMatrix[coordSys].TransformVector(yAxis);
-    zAxis = m_constructionMatrix[coordSys].TransformVector(zAxis);
-
-    Vec3 pos = m_constructionMatrix[coordSys].GetTranslation();
-
-    if (axis == AXIS_X)
-    {
-        // X direction.
-        Vec3 n;
-        float d1 = fabs(rayDir.Dot(yAxis));
-        float d2 = fabs(rayDir.Dot(zAxis));
-        if (d1 > d2)
-        {
-            n = yAxis;
-        }
-        else
-        {
-            n = zAxis;
-        }
-        if (rayDir.Dot(n) < 0)
-        {
-            n = -n;                    // face construction plane to the ray.
-        }
-        //Vec3 n = Vec3(0,0,1);
-        Vec3 v1 = n.Cross(xAxis);
-        Vec3 v2 = n.Cross(v1);
-        AssignConstructionPlane(pos, pos + v2, pos + v1);
-    }
-    else if (axis == AXIS_Y)
-    {
-        // Y direction.
-        Vec3 n;
-        float d1 = fabs(rayDir.Dot(xAxis));
-        float d2 = fabs(rayDir.Dot(zAxis));
-        if (d1 > d2)
-        {
-            n = xAxis;
-        }
-        else
-        {
-            n = zAxis;
-        }
-        if (rayDir.Dot(n) < 0)
-        {
-            n = -n;                    // face construction plane to the ray.
-        }
-        Vec3 v1 = n.Cross(yAxis);
-        Vec3 v2 = n.Cross(v1);
-        AssignConstructionPlane(pos, pos + v2, pos + v1);
-    }
-    else if (axis == AXIS_Z)
-    {
-        // Z direction.
-        Vec3 n;
-        float d1 = fabs(rayDir.Dot(xAxis));
-        float d2 = fabs(rayDir.Dot(yAxis));
-        if (d1 > d2)
-        {
-            n = xAxis;
-        }
-        else
-        {
-            n = yAxis;
-        }
-        if (rayDir.Dot(n) < 0)
-        {
-            n = -n;                    // face construction plane to the ray.
-        }
-        Vec3 v1 = n.Cross(zAxis);
-        Vec3 v2 = n.Cross(v1);
-        AssignConstructionPlane(pos, pos + v2, pos + v1);
-    }
-    else if (axis == AXIS_XY)
-    {
-        AssignConstructionPlane(pos, pos + yAxis, pos + xAxis);
-    }
-    else if (axis == AXIS_XZ)
-    {
-        AssignConstructionPlane(pos, pos + zAxis, pos + xAxis);
-    }
-    else if (axis == AXIS_YZ)
-    {
-        AssignConstructionPlane(pos, pos + zAxis, pos + yAxis);
-    }
-    else
-    {
-        AssignConstructionPlane(pos, pos + yAxis, pos + xAxis);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 QtViewport::MapViewToCP(const QPoint& point, int axis)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    if (axis == AXIS_TERRAIN)
-    {
-        return SnapToGrid(ViewToWorld(point));
-    }
-
-    MakeConstructionPlane(axis);
-
-    Vec3 raySrc(Vec3_Zero), rayDir(Vec3_OneX);
-    ViewToWorldRay(point, raySrc, rayDir);
-    
-    Vec3 v;
-
-    Ray ray(raySrc, rayDir);
-    if (!Intersect::Ray_Plane(ray, m_constructionPlane, v))
-    {
-        Plane inversePlane = m_constructionPlane;
-        inversePlane.n = -inversePlane.n;
-        inversePlane.d = -inversePlane.d;
-        if (!Intersect::Ray_Plane(ray, inversePlane, v))
-        {
-            v = Vec3_Zero;
-        }
-    }
-
-    // Snap value to grid.
-    v = SnapToGrid(v);
-
-    return v;
-}
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 QtViewport::GetCPVector(const Vec3& p1, const Vec3& p2, int axis)
-{
-    Vec3 v = p2 - p1;
-
-    int coordSys = GetIEditor()->GetReferenceCoordSys();
-
-    Vec3 xAxis(Vec3_OneX);
-    Vec3 yAxis(Vec3_OneY);
-    Vec3 zAxis(Vec3_OneZ);
-
-    // In local coordinate system transform axises by construction matrix.
-    xAxis = m_constructionMatrix[coordSys].TransformVector(xAxis);
-    yAxis = m_constructionMatrix[coordSys].TransformVector(yAxis);
-    zAxis = m_constructionMatrix[coordSys].TransformVector(zAxis);
-
-    if (axis == AXIS_X || axis == AXIS_Y || axis == AXIS_Z)
-    {
-        // Project vector v on transformed axis x,y or z.
-        Vec3 axisVector;
-        if (axis == AXIS_X)
-        {
-            axisVector = xAxis;
-        }
-        if (axis == AXIS_Y)
-        {
-            axisVector = yAxis;
-        }
-        if (axis == AXIS_Z)
-        {
-            axisVector = zAxis;
-        }
-
-        // Project vector on construction plane into the one of axises.
-        v = v.Dot(axisVector) * axisVector;
-    }
-    else if (axis == AXIS_XY)
-    {
-        // Project vector v on transformed plane x/y.
-        Vec3 planeNormal = xAxis.Cross(yAxis);
-        Vec3 projV = v.Dot(planeNormal) * planeNormal;
-        v = v - projV;
-    }
-    else if (axis == AXIS_XZ)
-    {
-        // Project vector v on transformed plane x/y.
-        Vec3 planeNormal = xAxis.Cross(zAxis);
-        Vec3 projV = v.Dot(planeNormal) * planeNormal;
-        v = v - projV;
-    }
-    else if (axis == AXIS_YZ)
-    {
-        // Project vector v on transformed plane x/y.
-        Vec3 planeNormal = yAxis.Cross(zAxis);
-        Vec3 projV = v.Dot(planeNormal) * planeNormal;
-        v = v - projV;
-    }
-    else if (axis == AXIS_TERRAIN)
-    {
-        v.z = 0;
-    }
-    return v;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::SetAxisConstrain(int axis)
-{
-    m_activeAxis = axis;
-};
-
-AzToolsFramework::ViewportInteraction::MouseInteraction QtViewport::BuildMouseInteraction(
-    [[maybe_unused]] Qt::MouseButtons buttons, [[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
-{
-    // Implemented by sub-class
-    return AzToolsFramework::ViewportInteraction::MouseInteraction();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
-{
-    Vec3 raySrc(0, 0, 0), rayDir(1, 0, 0);
-    ViewToWorldRay(point, hitInfo.raySrc, hitInfo.rayDir);
-    hitInfo.view = this;
-    hitInfo.point2d = point;
-    if (m_bAdvancedSelectMode)
-    {
-        hitInfo.bUseSelectionHelpers = true;
-    }
-
-    const int viewportId = GetViewportId();
-
-    AzToolsFramework::EntityIdList visibleEntityIds;
-    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Event(
-        viewportId,
-        &AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequests::FindVisibleEntities,
-        visibleEntityIds);
-
-    // Look through all visible entities to find the closest one to the specified mouse point
-    using namespace AzToolsFramework::ViewportInteraction;
-    AZ::EntityId entityIdUnderCursor;
-    float closestDistance = std::numeric_limits<float>::max();
-    MouseInteraction mouseInteraction = BuildMouseInteraction(QGuiApplication::mouseButtons(),
-        QGuiApplication::queryKeyboardModifiers(),
-        point);
-    for (auto entityId : visibleEntityIds)
-    {
-        using AzFramework::ViewportInfo;
-        // Check if components provide an aabb
-        if (const AZ::Aabb aabb = AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, ViewportInfo{ viewportId });
-            aabb.IsValid())
-        {
-            // Coarse grain check
-            if (AzToolsFramework::AabbIntersectMouseRay(mouseInteraction, aabb))
-            {
-                // If success, pick against specific component
-                if (AzToolsFramework::PickEntity(
-                    entityId, mouseInteraction,
-                    closestDistance, viewportId))
-                {
-                    entityIdUnderCursor = entityId;
-                }
-            }
-        }
-    }
-
-    // If we hit a valid Entity, then store the distance in the HitContext
-    // so that the caller can use this for calculations
-    if (entityIdUnderCursor.IsValid())
-    {
-        hitInfo.dist = closestDistance;
-        return true;
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::SetZoomFactor(float fZoomFactor)
-{
-    m_fZoomFactor = fZoomFactor;
-    if (gSettings.viewports.bSync2DViews && GetType() != ET_ViewportCamera && GetType() != ET_ViewportModel)
-    {
-        GetViewManager()->SetZoom2D(fZoomFactor);
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-float QtViewport::GetZoomFactor() const
-{
-    if (gSettings.viewports.bSync2DViews && GetType() != ET_ViewportCamera && GetType() != ET_ViewportModel)
-    {
-        m_fZoomFactor = GetViewManager()->GetZoom2D();
-    }
-    return m_fZoomFactor;
-};
-
-//////////////////////////////////////////////////////////////////////////
-Vec3 QtViewport::SnapToGrid(const Vec3& vec)
-{
-    return vec;
-}
-
-float QtViewport::GetGridStep() const
-{
-    return 0.0f;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::BeginUndo()
-{
-    DegradateQuality(true);
-    GetIEditor()->BeginUndo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::AcceptUndo(const QString& undoDescription)
-{
-    DegradateQuality(false);
-    GetIEditor()->AcceptUndo(undoDescription);
-    GetIEditor()->UpdateViews(eUpdateObjects);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::CancelUndo()
-{
-    DegradateQuality(false);
-    GetIEditor()->CancelUndo();
-    GetIEditor()->UpdateViews(eUpdateObjects);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::RestoreUndo()
-{
-    GetIEditor()->RestoreUndo();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::IsUndoRecording() const
-{
-    return GetIEditor()->IsUndoRecording();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::DegradateQuality(bool bEnable)
-{
-    m_bDegradateQuality = bEnable;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QSize QtViewport::GetIdealSize() const
-{
-    return QSize(0, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::IsBoundsVisible([[maybe_unused]] const AABB& box) const
-{
-    // Always visible in standard implementation.
-    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
-{
-    QPoint p1 = WorldToView(lineP1);
-    QPoint p2 = WorldToView(lineP2);
-
-    return PointToLineDistance2D(
-        Vec3(p1.x(), p1.y(), 0), 
-        Vec3(p2.x(), p2.y(), 0), 
-        Vec3(point.x(), point.y(), 0));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::GetPerpendicularAxis(EAxis* pAxis, bool* pIs2D) const
-{
-    EViewportType vpType = GetType();
-    switch (vpType)
-    {
-    case ET_ViewportXY:
-        if (pIs2D)
-        {
-            *pIs2D = true;
-        }
-        if (pAxis)
-        {
-            *pAxis = AXIS_Z;
-        }
-        break;
-    case ET_ViewportXZ:
-        if (pIs2D)
-        {
-            *pIs2D = true;
-        }
-        if (pAxis)
-        {
-            *pAxis = AXIS_Y;
-        }
-        break;
-    case ET_ViewportYZ:
-        if (pIs2D)
-        {
-            *pIs2D = true;
-        }
-        if (pAxis)
-        {
-            *pAxis = AXIS_X;
-        }
-        break;
-    case ET_ViewportMap:
-    case ET_ViewportZ:
-        if (pIs2D)
-        {
-            *pIs2D = true;
-        }
-        break;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::GetAdvancedSelectModeFlag()
-{
-    return m_bAdvancedSelectMode;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::MouseCallback(EMouseEvent event, const QPoint& point, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::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;
-    }
-
-    // RAII wrapper for Pre / PostWidgetRendering calls.
-    // It also tracks the times a mouse callback potentially created a new viewport context.
-    struct ScopedProcessingMouseCallback
-    {
-        explicit ScopedProcessingMouseCallback(QtViewport* viewport)
-            : m_viewport(viewport)
-        {
-            m_viewport->m_processingMouseCallbacksCounter++;
-            m_viewport->PreWidgetRendering();
-        }
-
-        ~ScopedProcessingMouseCallback()
-        {
-            m_viewport->PostWidgetRendering();
-            m_viewport->m_processingMouseCallbacksCounter--;
-        }
-
-        QtViewport* m_viewport;
-    };
-
-    ScopedProcessingMouseCallback scopedProcessingMouseCallback(this);
-
-    //////////////////////////////////////////////////////////////////////////
-    // 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)
-{
-    FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-
-
-    size_t nCount(0);
-    size_t nTotal(0);
-
-    nTotal = m_cRenderListeners.size();
-    for (nCount = 0; nCount < nTotal; ++nCount)
-    {
-        m_cRenderListeners[nCount]->Render(rstDisplayContext);
-    }
-}
-//////////////////////////////////////////////////////////////////////////
-#if defined(AZ_PLATFORM_WINDOWS)
-void QtViewport::OnRawInput([[maybe_unused]] UINT wParam, HRAWINPUT lParam)
-{
-    static C3DConnexionDriver* p3DConnexionDriver = 0;
-
-    if (GetType() == ET_ViewportCamera)
-    {
-        if (!p3DConnexionDriver)
-        {
-            p3DConnexionDriver = (C3DConnexionDriver*)GetIEditor()->GetPluginManager()->GetPluginByGUID("{AD109901-9128-4ffd-8E67-137CB2B1C41B}");
-        }
-        if (p3DConnexionDriver)
-        {
-            S3DConnexionMessage msg;
-            if (p3DConnexionDriver->GetInputMessageData((LPARAM)lParam, msg))
-            {
-                if (msg.bGotTranslation || msg.bGotRotation)
-                {
-                    static int all6DOFs[6] = { 0 };
-                    if (msg.bGotTranslation)
-                    {
-                        all6DOFs[0] = msg.raw_translation[0];
-                        all6DOFs[1] = msg.raw_translation[1];
-                        all6DOFs[2] = msg.raw_translation[2];
-                    }
-                    if (msg.bGotRotation)
-                    {
-                        all6DOFs[3] = msg.raw_rotation[0];
-                        all6DOFs[4] = msg.raw_rotation[1];
-                        all6DOFs[5] = msg.raw_rotation[2];
-                    }
-
-                    Matrix34 viewTM = GetViewTM();
-
-                    // Scale axis according to CVars
-                    ICVar* sys_scale3DMouseTranslation = gEnv->pConsole->GetCVar("sys_scale3DMouseTranslation");
-                    ICVar* sys_Scale3DMouseYPR = gEnv->pConsole->GetCVar("sys_Scale3DMouseYPR");
-                    float fScaleYPR = sys_Scale3DMouseYPR->GetFVal();
-
-                    float s = 0.01f * gSettings.cameraMoveSpeed;
-                    Vec3 t = Vec3(s * all6DOFs[0], -s * all6DOFs[1], -s * all6DOFs[2] * 0.5f);
-                    t *= sys_scale3DMouseTranslation->GetFVal();
-
-                    float as = 0.001f * gSettings.cameraMoveSpeed;
-                    Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(viewTM));
-                    ypr.x += -all6DOFs[5] * as * fScaleYPR;
-                    ypr.y = 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 = viewTM * Matrix34::CreateTranslationMat(t);
-
-                    SetViewTM(viewTM);
-                }
-            }
-        }
-    }
-}
-#endif
-//////////////////////////////////////////////////////////////////////////
-float QtViewport::GetFOV() const
-{
-    return gSettings.viewports.fDefaultFov;
-}
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir)
-{
-    m_vp = vp;
-    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/Sandbox/Editor/Viewport.h b/Code/Sandbox/Editor/Viewport.h
deleted file mode 100644
index 2b66b0a6d6..0000000000
--- a/Code/Sandbox/Editor/Viewport.h
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : interface for the CViewport class.
-
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzToolsFramework/Viewport/ViewportTypes.h>
-#include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
-#include <Cry_Color.h>
-#include "IPostRenderer.h"
-#include "Include/IDisplayViewport.h"
-#include "Include/SandboxAPI.h"
-
-#include <QMenu>
-#include <QPointer>
-
-#if defined(Q_OS_WIN)
-#include <QtWinExtras/qwinfunctions.h>
-#endif
-
-#include <AzCore/Math/Uuid.h>
-#include <IEditor.h>
-#endif
-
-namespace AzQtComponents
-{
-    class ViewportDragContext;
-}
-
-// forward declarations.
-class CBaseObject;
-struct DisplayContext;
-class CCryEditDoc;
-class CLayoutViewPane;
-class CViewManager;
-class CBaseObjectsCache;
-struct HitContext;
-struct IRenderListener;
-class CImageEx;
-class QMenu;
-struct IDataBaseItem;
-
-/** Type of viewport.
-*/
-enum EViewportType
-{
-    ET_ViewportUnknown = 0,
-    ET_ViewportXY,
-    ET_ViewportXZ,
-    ET_ViewportYZ,
-    ET_ViewportCamera,
-    ET_ViewportMap,
-    ET_ViewportModel,
-    ET_ViewportZ, //!< Z Only viewport.
-    ET_ViewportUI,
-
-    ET_ViewportLast,
-};
-
-//////////////////////////////////////////////////////////////////////////
-// Standart cursors viewport can display.
-//////////////////////////////////////////////////////////////////////////
-enum EStdCursor
-{
-    STD_CURSOR_DEFAULT,
-    STD_CURSOR_HIT,
-    STD_CURSOR_MOVE,
-    STD_CURSOR_ROTATE,
-    STD_CURSOR_SCALE,
-    STD_CURSOR_SEL_PLUS,
-    STD_CURSOR_SEL_MINUS,
-    STD_CURSOR_SUBOBJ_SEL,
-    STD_CURSOR_SUBOBJ_SEL_PLUS,
-    STD_CURSOR_SUBOBJ_SEL_MINUS,
-    STD_CURSOR_HAND,
-
-    STD_CURSOR_GAME,
-
-    STD_CURSOR_LAST,
-};
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-class SANDBOX_API CViewport
-    : public IDisplayViewport
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
-    typedef void(* DropCallback)(CViewport* viewport, int ptx, int pty, void* custom);
-
-    virtual ~CViewport() {}
-
-    virtual void SetActiveWindow() = 0;
-
-    // Changed my view manager.
-    void SetViewManager(CViewManager* viewMgr) { m_viewManager = viewMgr; };
-
-    //! Access to view manager.
-    CViewManager* GetViewManager() const { return m_viewManager; };
-
-    virtual void RegisterRenderListener(IRenderListener*    piListener) = 0;
-    virtual bool UnregisterRenderListener(IRenderListener*  piListener) = 0;
-    virtual bool IsRenderListenerRegistered(IRenderListener*    piListener) = 0;
-
-    virtual void AddPostRenderer(IPostRenderer* pPostRenderer) = 0;
-    virtual bool RemovePostRenderer(IPostRenderer* pPostRenderer) = 0;
-
-    virtual BOOL DestroyWindow() { return FALSE; }
-
-    /** Get type of this viewport.
-    */
-    virtual EViewportType GetType() const { return ET_ViewportUnknown; }
-    /** Must be overriden in derived classes.
-    */
-    virtual void SetType(EViewportType type) = 0;
-
-    /** Get name of viewport
-    */
-    virtual QString GetName() const = 0;
-
-    virtual void SetSelected([[maybe_unused]] bool const bSelect){}
-
-    //! Resets current selection region.
-    virtual void ResetSelectionRegion() = 0;
-    //! Set 2D selection rectangle.
-    virtual void SetSelectionRectangle(const QRect& rect) = 0;
-    inline void SetSelectionRectangle(const QPoint& startMousePosition, const QPoint& currentMousePosition)
-    {
-        // QRect's bottom/right are width - 1, height - 1, so when specifying the right position
-        // directly in a QRect, we need to offset it by -1.
-        SetSelectionRectangle(QRect(startMousePosition, currentMousePosition - QPoint(1, 1)));
-    }
-    //! Return 2D selection rectangle.
-    virtual QRect GetSelectionRectangle() const = 0;
-    //! Called when dragging selection rectangle.
-    virtual void OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect = false) = 0;
-    void OnDragSelectRectangle(const QPoint& startMousePosition, const QPoint& currentMousePosition, bool bNormalizeRect = false)
-    {
-        // QRect's bottom/right are width - 1, height - 1, so when specifying the right position
-        // directly in a QRect, we need to offset it by -1.
-        OnDragSelectRectangle(QRect(startMousePosition, currentMousePosition - QPoint(1, 1)), bNormalizeRect);
-    }
-
-    virtual void ResetContent() = 0;
-    virtual void UpdateContent(int flags) = 0;
-
-    virtual void SetAxisConstrain(int axis) = 0;
-    int GetAxisConstrain() const { return GetIEditor()->GetAxisConstrains(); };
-
-    virtual Vec3 SnapToGrid(const Vec3& vec) = 0;
-
-    //! Get selection procision tolerance.
-    virtual float GetSelectionTolerance() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // View matrix.
-    //////////////////////////////////////////////////////////////////////////
-    //! Set current view matrix,
-    //! This is a matrix that transforms from world to view space.
-    virtual void SetViewTM(const Matrix34& tm) { m_viewTM = tm; };
-
-    //! Get current view matrix.
-    //! This is a matrix that transforms from world space to view space.
-    virtual const Matrix34& GetViewTM() const { return m_viewTM; };
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Get current screen matrix.
-    //! Screen matrix transform from World space to Screen space.
-    virtual const Matrix34& GetScreenTM() const
-    {
-        return m_screenTM;
-    }
-
-    virtual Vec3 MapViewToCP(const QPoint& point) = 0;
-
-    //! Map viewport position to world space position.
-    virtual Vec3        ViewToWorld(const QPoint& vp, bool* pCollideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const = 0;
-    //! Convert point on screen to world ray.
-    virtual void        ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const = 0;
-    //! Get normal for viewport position
-    virtual Vec3        ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) = 0;
-
-    virtual Vec3 GetCPVector(const Vec3& p1, const Vec3& p2, int axis) = 0;
-    virtual Vec3 GetCPVector(const Vec3& p1, const Vec3& p2) { return GetCPVector(p1, p2, GetAxisConstrain()); }
-
-    //! Performs hit testing of 2d point in view to find which object hit.
-    virtual bool HitTest(const QPoint& point, HitContext& hitInfo) = 0;
-
-    virtual void MakeConstructionPlane(int axis) = 0;
-
-    // Access to the member m_bAdvancedSelectMode so interested modules can know its value.
-    virtual bool GetAdvancedSelectModeFlag() = 0;
-
-    virtual void ToggleCameraObject() {}
-    virtual bool IsSequenceCamera() const { return false;  }
-
-    //! Center viewport on selection.
-    virtual void CenterOnSelection() = 0;
-    virtual void CenterOnAABB(const AABB& aabb) = 0;
-
-    virtual void CenterOnSliceInstance() = 0;
-
-    /** Set ID of this viewport
-    */
-    virtual void SetViewportId(int id) { m_nCurViewportID = id; };
-
-    /** Get ID of this viewport
-    */
-    virtual int GetViewportId() const { return m_nCurViewportID; };
-
-    // Store final Game Matrix ready for editor
-    void SetGameTM(const Matrix34& tm) { m_gameTM = tm; };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Drag and drop support on viewports.
-    // To be overrided in derived classes.
-    //////////////////////////////////////////////////////////////////////////
-    virtual bool CanDrop([[maybe_unused]] const QPoint& point, [[maybe_unused]] IDataBaseItem* pItem) { return false; };
-    virtual void Drop([[maybe_unused]] const QPoint& point, [[maybe_unused]] IDataBaseItem* pItem) {};
-    virtual void SetGlobalDropCallback(DropCallback dropCallback, void* dropCallbackCustom)
-    {
-        m_dropCallback = dropCallback;
-        m_dropCallbackCustom = dropCallbackCustom;
-    }
-
-    virtual void SetConstructionMatrix(RefCoordSys coordSys, const Matrix34& xform) = 0;
-
-    virtual void BeginUndo() = 0;
-    virtual void AcceptUndo(const QString& undoDescription) = 0;
-    virtual void CancelUndo() = 0;
-    virtual void RestoreUndo() = 0;
-    virtual bool IsUndoRecording() const = 0;
-
-    virtual void CaptureMouse() {};
-    virtual void SetCapture() { CaptureMouse(); }
-    virtual void ReleaseMouse() {};
-
-    virtual void ResetCursor() = 0;
-    virtual void SetCursor(const QCursor& cursor) = 0;
-
-    virtual void SetCurrentCursor(EStdCursor stdCursor) = 0;
-    virtual void SetCurrentCursor(EStdCursor stdCursor, const QString& str) = 0;
-    virtual void SetSupplementaryCursorStr(const QString& str) = 0;
-    virtual void SetCursorString(const QString& str) = 0;
-
-    virtual void SetFocus() = 0;
-    virtual void Invalidate(BOOL bErase = 1) = 0;
-
-    // Is overridden by RenderViewport
-    virtual void SetFOV([[maybe_unused]] float fov) {}
-    virtual float GetFOV() const;
-
-    virtual QObject* qobject() { return nullptr; }
-    virtual QWidget* widget() { return nullptr; }
-
-    virtual void OnTitleMenu([[maybe_unused]] QMenu* menu) {}
-
-    void SetViewPane(CLayoutViewPane* viewPane) { m_viewPane = viewPane; }
-
-    //Child classes can override these to provide extra logic that wraps
-    //widget rendering. Needed by the RenderViewport to handle raycasts 
-    //from screen-space to world-space. 
-    virtual void PreWidgetRendering() {}
-    virtual void PostWidgetRendering() {}
-
-    virtual CViewport *asCViewport() { return this; }
-
-protected:
-    CLayoutViewPane* m_viewPane = nullptr;
-    CViewManager* m_viewManager;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    // Viewport matrix.
-    Matrix34 m_viewTM;
-    // Screen Matrix
-    Matrix34 m_screenTM;
-    int m_nCurViewportID;
-    // Final game view matrix before drpping back to editor
-    Matrix34 m_gameTM;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    // Custom drop callback (Leroy@Conffx)
-    DropCallback m_dropCallback;
-    void* m_dropCallbackCustom;
-};
-
-template<typename T>
-typename std::enable_if<std::is_base_of<QObject, typename std::remove_cv<typename std::remove_pointer<T>::type>::type>::value, T>::type
-viewport_cast(CViewport* viewport)
-{
-    if (viewport == nullptr)
-    {
-        return nullptr;
-    }
-    if (QObject* obj = viewport->qobject())
-    {
-        return qobject_cast<T>(obj);
-    }
-    else
-    {
-        return nullptr;
-    }
-}
-
-/** Base class for all Editor Viewports.
-*/
-class SANDBOX_API QtViewport
-    : public QWidget
-    , public CViewport
-{
-    Q_OBJECT
-public:
-    QObject* qobject() override { return this; }
-    QWidget* widget() override { return this; }
-
-    template<typename T>
-    static const GUID& GetClassID()
-    {
-        static GUID guid = [] {
-            return AZ::Uuid::CreateRandom();
-        } ();
-        return guid;
-    }
-
-    QtViewport(QWidget* parent = nullptr);
-    virtual ~QtViewport();
-
-    void SetActiveWindow() override { activateWindow(); }
-
-    //! Called while window is idle.
-    virtual void Update();
-
-    /** Set name of this viewport.
-    */
-    void SetName(const QString& name);
-
-    /** Get name of viewport
-    */
-    QString GetName() const;
-
-    virtual void SetFocus() { setFocus(); }
-    virtual void Invalidate([[maybe_unused]] BOOL bErase = 1) { update(); }
-
-    // Is overridden by RenderViewport
-    virtual void SetFOV([[maybe_unused]] float fov) {}
-    virtual float GetFOV() const;
-
-    // Must be overridden in derived classes.
-    // Returns:
-    //   e.g. 4.0/3.0
-    virtual float GetAspectRatio() const = 0;
-    virtual void GetDimensions(int* pWidth, int* pHeight) const;
-    virtual void ScreenToClient(QPoint& pPoint) const override;
-
-    virtual void ResetContent();
-    virtual void UpdateContent(int flags);
-
-    //! Set current zoom factor for this viewport.
-    virtual void SetZoomFactor(float fZoomFactor);
-
-    //! Get current zoom factor for this viewport.
-    virtual float GetZoomFactor() const;
-
-    virtual void OnActivate();
-    virtual void OnDeactivate();
-
-    //! Map world space position to viewport position.
-    virtual QPoint   WorldToView(const Vec3& wp) const override;
-
-    //! Map world space position to 3D viewport position.
-    virtual Vec3    WorldToView3D(const Vec3& wp, int nFlags = 0) const;
-
-    //! Map viewport position to world space position.
-    virtual Vec3 ViewToWorld(const QPoint& vp, bool* pCollideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
-    //! Convert point on screen to world ray.
-    virtual void        ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
-    //! Get normal for viewport position
-    virtual Vec3        ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
-
-    //! Map view point to world space using current construction plane.
-    Vec3 MapViewToCP(const QPoint& point) override { return MapViewToCP(point, GetAxisConstrain()); }
-    virtual Vec3 MapViewToCP(const QPoint& point, int axis);
-
-    //! This method return a vector (p2-p1) in world space alligned to construction plane and restriction axises.
-    //! p1 and p2 must be given in world space and lie on construction plane.
-    virtual Vec3 GetCPVector(const Vec3& p1, const Vec3& p2, int axis);
-
-    //! Snap any given 3D world position to grid lines if snap is enabled.
-    Vec3 SnapToGrid(const Vec3& vec) override;
-    virtual float GetGridStep() const;
-
-    //! 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.
-    virtual float GetScreenScaleFactor([[maybe_unused]] const Vec3& worldPoint) const { return 1; };
-
-    void SetAxisConstrain(int axis);
-
-    /// Take raw input and create a final mouse interaction.
-    /// @attention Do not map **point** from widget to viewport explicitly,
-    /// this is handled internally by BuildMouseInteraction - just pass directly.
-    virtual AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Selection.
-    //////////////////////////////////////////////////////////////////////////
-    //! Resets current selection region.
-    virtual void ResetSelectionRegion();
-    //! Set 2D selection rectangle.
-    void SetSelectionRectangle(const QRect& rect) override;
-
-    //! Return 2D selection rectangle.
-    QRect GetSelectionRectangle() const override { return m_selectedRect; };
-    //! Called when dragging selection rectangle.
-    void OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect = false) override;
-    //! Get selection procision tolerance.
-    float GetSelectionTolerance() const { return m_selectionTolerance; }
-    //! Center viewport on selection.
-    void CenterOnSelection() override {}
-    void CenterOnAABB([[maybe_unused]] const AABB& aabb) override {}
-
-    virtual void CenterOnSliceInstance() {}
-
-    //! Performs hit testing of 2d point in view to find which object hit.
-    bool HitTest(const QPoint& point, HitContext& hitInfo) 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;
-
-    // Access to the member m_bAdvancedSelectMode so interested modules can know its value.
-    bool GetAdvancedSelectModeFlag();
-
-    virtual void GetPerpendicularAxis(EAxis* pAxis, bool* pIs2D) const;
-    virtual const ::Plane* GetConstructionPlane() const { return &m_constructionPlane; }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    //! Set construction plane from given position construction matrix refrence coord system and axis settings.
-    //////////////////////////////////////////////////////////////////////////
-    void MakeConstructionPlane(int axis) override;
-    virtual void SetConstructionMatrix(RefCoordSys coordSys, const Matrix34& xform);
-    virtual const Matrix34& GetConstructionMatrix(RefCoordSys coordSys);
-    // Set simple construction plane origin.
-    void SetConstructionOrigin(const Vec3& worldPos);
-    //////////////////////////////////////////////////////////////////////////
-
-    void DegradateQuality(bool bEnable);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Undo for viewpot operations.
-    void BeginUndo();
-    void AcceptUndo(const QString& undoDescription);
-    void CancelUndo();
-    void RestoreUndo();
-    bool IsUndoRecording() const;
-    //////////////////////////////////////////////////////////////////////////
-
-    //! Get prefered original size for this viewport.
-    //! if 0, then no preference.
-    virtual QSize GetIdealSize() const;
-
-    //! Check if world space bounding box is visible in this view.
-    virtual bool IsBoundsVisible(const AABB& box) const;
-
-    //////////////////////////////////////////////////////////////////////////
-
-    void SetCursor(const QCursor& cursor)
-    {
-        setCursor(cursor);
-    }
-
-    // Set`s current cursor string.
-    void SetCurrentCursor(const QCursor& hCursor, const QString& cursorString);
-    virtual void SetCurrentCursor(EStdCursor stdCursor, const QString& cursorString);
-    void SetCurrentCursor(EStdCursor stdCursor);
-    virtual void SetCursorString(const QString& cursorString);
-    void ResetCursor();
-    void SetSupplementaryCursorStr(const QString& str);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Return visble objects cache.
-    CBaseObjectsCache* GetVisibleObjectsCache() { return m_pVisibleObjectsCache; };
-
-    void RegisterRenderListener(IRenderListener*    piListener);
-    bool UnregisterRenderListener(IRenderListener*  piListener);
-    bool IsRenderListenerRegistered(IRenderListener*    piListener);
-
-    void AddPostRenderer(IPostRenderer* pPostRenderer);
-    bool RemovePostRenderer(IPostRenderer* pPostRenderer);
-
-    void CaptureMouse() override { m_mouseCaptured = true;  QWidget::grabMouse(); }
-    void ReleaseMouse() override { m_mouseCaptured = false;  QWidget::releaseMouse(); }
-
-    virtual void setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir);
-    virtual void setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir);
-    QPoint m_vp;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    Vec3 m_raySrc;
-    Vec3 m_rayDir;
-
-    // Greater than 0 while running MouseCallback() function. It needs to be a counter
-    // because of recursive calls to MouseCallback(). It's used to make an exception
-    // during the SScopedCurrentContext count check of m_cameraSetForWidgetRenderingCount.
-    int m_processingMouseCallbacksCounter = 0;
-
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-protected:
-    friend class CViewManager;
-    bool IsVectorInValidRange(const Vec3& v) const { return fabs(v.x) < 1e+8 && fabs(v.y) < 1e+8 && fabs(v.z) < 1e+8; }
-    void AssignConstructionPlane(const Vec3& p1, const Vec3& p2, const Vec3& p3);
-    HWND renderOverlayHWND() const;
-    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;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void mouseDoubleClickEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void wheelEvent(QWheelEvent* event) override;
-    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);
-#if defined(AZ_PLATFORM_WINDOWS)
-    void OnRawInput(UINT wParam, HRAWINPUT lParam);
-#endif
-    void OnSetCursor();
-
-    virtual void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt);
-    void dragEnterEvent(QDragEnterEvent* event) override;
-    void dragMoveEvent(QDragMoveEvent* event) override;
-    void dragLeaveEvent(QDragLeaveEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
-
-    //Child classes can override these to provide extra logic that wraps
-    //widget rendering. Needed by the RenderViewport to handle raycasts
-    //from screen-space to world-space.
-    virtual void PreWidgetRendering() {}
-    virtual void PostWidgetRendering() {}
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    AzToolsFramework::ViewportUi::ViewportUiManager m_viewportUi;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    float m_selectionTolerance;
-    QMenu m_cViewMenu;
-
-    mutable float m_fZoomFactor;
-
-    QPoint m_cMouseDownPos;
-
-    //! Current selected rectangle.
-    QRect m_selectedRect;
-
-    int m_activeAxis;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    //! Current construction plane.
-    ::Plane m_constructionPlane;
-    Vec3 m_constructionPlaneAxisX;
-    Vec3 m_constructionPlaneAxisY;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    // When true selection helpers will be shown and hit tested against.
-    bool m_bAdvancedSelectMode;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Standard cursors.
-    //////////////////////////////////////////////////////////////////////////
-    QCursor m_hCursor[STD_CURSOR_LAST];
-    QCursor m_hCurrCursor;
-
-    //! Mouse is over this object.
-    CBaseObject* m_pMouseOverObject;
-    QString m_cursorStr;
-    QString m_cursorSupplementaryStr;
-
-    static bool m_bDegradateQuality;
-
-    // Grid size modifier due to zoom.
-    float m_fGridZoom;
-
-    int m_nLastUpdateFrame;
-    int m_nLastMouseMoveFrame;
-
-    CBaseObjectsCache* m_pVisibleObjectsCache;
-
-    QRect m_rcClient;
-
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    // Same construction matrix is shared by all viewports.
-    Matrix34 m_constructionMatrix[LAST_COORD_SYSTEM];
-
-    std::vector<IRenderListener*>           m_cRenderListeners;
-
-    typedef std::vector<_smart_ptr<IPostRenderer> > PostRenderers;
-    PostRenderers   m_postRenderers;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-protected:
-    bool m_mouseCaptured = false;
-
-private:
-    QWidget m_renderOverlay;
-};
diff --git a/Code/Sandbox/Editor/ViewportManipulatorController.cpp b/Code/Sandbox/Editor/ViewportManipulatorController.cpp
deleted file mode 100644
index 6a8189b668..0000000000
--- a/Code/Sandbox/Editor/ViewportManipulatorController.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ViewportManipulatorController.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/Viewport/ScreenGeometry.h>
-#include <AzCore/Script/ScriptTimePoint.h>
-
-#include <QApplication>
-
-static const auto ManipulatorPriority = AzFramework::ViewportControllerPriority::Highest;
-static const auto InteractionPriority = AzFramework::ViewportControllerPriority::High;
-
-namespace SandboxEditor
-{
-    ViewportManipulatorControllerInstance::ViewportManipulatorControllerInstance(
-        AzFramework::ViewportId viewport, ViewportManipulatorController* controller)
-        : AzFramework::MultiViewportControllerInstanceInterface<ViewportManipulatorController>(viewport, controller)
-    {
-    }
-
-    AzToolsFramework::ViewportInteraction::MouseButton ViewportManipulatorControllerInstance::GetMouseButton(
-        const AzFramework::InputChannel& inputChannel)
-    {
-        using AzToolsFramework::ViewportInteraction::MouseButton;
-        using InputButton = AzFramework::InputDeviceMouse::Button;
-        const auto& id = inputChannel.GetInputChannelId();
-        if (id == InputButton::Left)
-        {
-            return MouseButton::Left;
-        }
-        if (id == InputButton::Middle)
-        {
-            return MouseButton::Middle;
-        }
-        if (id == InputButton::Right)
-        {
-            return MouseButton::Right;
-        }
-        return MouseButton::None;
-    }
-
-    bool ViewportManipulatorControllerInstance::IsMouseMove(const AzFramework::InputChannel& inputChannel)
-    {
-        return inputChannel.GetInputChannelId() == AzFramework::InputDeviceMouse::SystemCursorPosition;
-    }
-
-    AzToolsFramework::ViewportInteraction::KeyboardModifier ViewportManipulatorControllerInstance::GetKeyboardModifier(
-        const AzFramework::InputChannel& inputChannel)
-    {
-        using AzToolsFramework::ViewportInteraction::KeyboardModifier;
-        using Key = AzFramework::InputDeviceKeyboard::Key;
-        const auto& id = inputChannel.GetInputChannelId();
-        if (id == Key::ModifierAltL || id == Key::ModifierAltR)
-        {
-            return KeyboardModifier::Alt;
-        }
-        if (id == Key::ModifierCtrlL || id == Key::ModifierCtrlR)
-        {
-            return KeyboardModifier::Ctrl;
-        }
-        if (id == Key::ModifierShiftL || id == Key::ModifierShiftR)
-        {
-            return KeyboardModifier::Shift;
-        }
-        return KeyboardModifier::None;
-    }
-
-    bool ViewportManipulatorControllerInstance::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
-    {
-        // We only care about manipulator and viewport interaction events
-        if (event.m_priority != ManipulatorPriority && event.m_priority != InteractionPriority)
-        {
-            return false;
-        }
-
-        using InteractionBus = AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-        using namespace AzToolsFramework::ViewportInteraction;
-        using AzFramework::InputChannel;
-
-        bool interactionHandled = false;
-        float wheelDelta = 0.0f;
-        AZStd::optional<MouseButton> overrideButton;
-        AZStd::optional<MouseEvent> eventType;
-
-        // Because we receive events multiple times at separate priorities for manipulator events and
-        // viewport interaction events, we want to avoid updating our "last tick state" until we're on our last event,
-        // which currently is the low priority Interaction processor.
-        const bool finishedProcessingEvents = event.m_priority == InteractionPriority;
-
-        const auto state = event.m_inputChannel.GetState();
-        if (IsMouseMove(event.m_inputChannel))
-        {
-            // Cache the ray trace results when doing manipulator interaction checks, no need to recalculate after
-            if (event.m_priority == ManipulatorPriority)
-            {
-                AzFramework::ScreenPoint screenPosition = AzFramework::ScreenPoint(0, 0);
-                ViewportMouseCursorRequestBus::EventResult(
-                    screenPosition, GetViewportId(), &ViewportMouseCursorRequestBus::Events::ViewportCursorScreenPosition);
-
-                m_mouseInteraction.m_mousePick.m_screenCoordinates = screenPosition;
-                AZStd::optional<ProjectedViewportRay> ray;
-                ViewportInteractionRequestBus::EventResult(
-                    ray, GetViewportId(), &ViewportInteractionRequestBus::Events::ViewportScreenToWorldRay, screenPosition);
-
-                if (ray.has_value())
-                {
-                    m_mouseInteraction.m_mousePick.m_rayOrigin = ray.value().origin;
-                    m_mouseInteraction.m_mousePick.m_rayDirection = ray.value().direction;
-                }
-            }
-            eventType = MouseEvent::Move;
-        }
-        else if (auto mouseButton = GetMouseButton(event.m_inputChannel); mouseButton != MouseButton::None)
-        {
-            const AZ::u32 mouseButtonValue = static_cast<AZ::u32>(mouseButton);
-            overrideButton = mouseButton;
-            if (state == InputChannel::State::Began)
-            {
-                m_mouseInteraction.m_mouseButtons.m_mouseButtons |= mouseButtonValue;
-                if (IsDoubleClick(mouseButton))
-                {
-                    // Only remove the double click flag once we're done processing both Manipulator and Interaction events
-                    if (event.m_priority == InteractionPriority)
-                    {
-                        m_pendingDoubleClicks.erase(mouseButton);
-                    }
-                    eventType = MouseEvent::DoubleClick;
-                }
-                else
-                {
-                    // 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;
-                    }
-                    eventType = MouseEvent::Down;
-                }
-            }
-            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.
-                if (m_mouseInteraction.m_mouseButtons.m_mouseButtons & mouseButtonValue)
-                {
-                    // Erase the button from our state if we're done processing events.
-                    if (event.m_priority == InteractionPriority)
-                    {
-                        m_mouseInteraction.m_mouseButtons.m_mouseButtons &= ~mouseButtonValue;
-                    }
-                    eventType = MouseEvent::Up;
-                }
-            }
-        }
-        else if (auto keyboardModifier = GetKeyboardModifier(event.m_inputChannel); keyboardModifier != KeyboardModifier::None)
-        {
-            if (state == InputChannel::State::Began || state == InputChannel::State::Updated)
-            {
-                m_mouseInteraction.m_keyboardModifiers.m_keyModifiers |= static_cast<AZ::u32>(keyboardModifier);
-            }
-            else if (state == InputChannel::State::Ended)
-            {
-                m_mouseInteraction.m_keyboardModifiers.m_keyModifiers &= ~static_cast<AZ::u32>(keyboardModifier);
-            }
-        }
-        else if (event.m_inputChannel.GetInputChannelId() == AzFramework::InputDeviceMouse::Movement::Z)
-        {
-            if (state == InputChannel::State::Began || state == InputChannel::State::Updated)
-            {
-                eventType = MouseEvent::Wheel;
-                wheelDelta = event.m_inputChannel.GetValue();
-            }
-        }
-
-        if (eventType)
-        {
-            MouseInteraction mouseInteraction = m_mouseInteraction;
-            if (overrideButton)
-            {
-                mouseInteraction.m_mouseButtons.m_mouseButtons = static_cast<AZ::u32>(overrideButton.value());
-            }
-
-            mouseInteraction.m_interactionId.m_viewportId = GetViewportId();
-
-            // Depending on priority, we dispatch to either the manipulator or viewport interaction event
-            const auto& targetInteractionEvent = event.m_priority == ManipulatorPriority
-                ? &InteractionBus::Events::InternalHandleMouseManipulatorInteraction
-                : &InteractionBus::Events::InternalHandleMouseViewportInteraction;
-
-            const auto mouseInteractionEvent = [mouseInteraction, event = eventType.value(), wheelDelta] {
-                switch (event)
-                {
-                case MouseEvent::Up:
-                case MouseEvent::Down:
-                case MouseEvent::Move:
-                case MouseEvent::DoubleClick:
-                    return MouseInteractionEvent(AZStd::move(mouseInteraction), event);
-                case MouseEvent::Wheel:
-                    return MouseInteractionEvent(AZStd::move(mouseInteraction), wheelDelta);
-                }
-
-                AZ_Assert(false, "Unhandled MouseEvent");
-                return MouseInteractionEvent(MouseInteraction{}, MouseEvent::Up);
-            }();
-
-            InteractionBus::EventResult(
-                interactionHandled, AzToolsFramework::GetEntityContextId(), targetInteractionEvent, mouseInteractionEvent);
-        }
-
-        return interactionHandled;
-    }
-
-    void ViewportManipulatorControllerInstance::ResetInputChannels()
-    {
-        m_pendingDoubleClicks.clear();
-        m_mouseInteraction = AzToolsFramework::ViewportInteraction::MouseInteraction();
-    }
-
-    void ViewportManipulatorControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
-    {
-        m_curTime = event.m_time;
-    }
-
-    bool ViewportManipulatorControllerInstance::IsDoubleClick(AzToolsFramework::ViewportInteraction::MouseButton button) const
-    {
-        auto clickIt = m_pendingDoubleClicks.find(button);
-        if (clickIt == m_pendingDoubleClicks.end())
-        {
-            return false;
-        }
-        const double doubleClickThresholdMilliseconds = qApp->doubleClickInterval();
-        return (m_curTime.GetMilliseconds() - clickIt->second.GetMilliseconds()) < doubleClickThresholdMilliseconds;
-    }
-} //namespace SandboxEditor
diff --git a/Code/Sandbox/Editor/ViewportManipulatorController.h b/Code/Sandbox/Editor/ViewportManipulatorController.h
deleted file mode 100644
index 0a5350c6e4..0000000000
--- a/Code/Sandbox/Editor/ViewportManipulatorController.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzFramework/Viewport/ViewportId.h>
-#include <AzFramework/Viewport/MultiViewportController.h>
-#include <AzFramework/Input/Events/InputChannelEventListener.h>
-#include <AzToolsFramework/Viewport/ViewportTypes.h>
-
-namespace SandboxEditor
-{
-    class ViewportManipulatorControllerInstance;
-    using ViewportManipulatorController = AzFramework::MultiViewportController<ViewportManipulatorControllerInstance, AzFramework::ViewportControllerPriority::DispatchToAllPriorities>;
-
-    class ViewportManipulatorControllerInstance final
-        : public AzFramework::MultiViewportControllerInstanceInterface<ViewportManipulatorController>
-    {
-    public:
-        explicit ViewportManipulatorControllerInstance(AzFramework::ViewportId viewport, ViewportManipulatorController* controller);
-
-        bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
-        void ResetInputChannels() override;
-        void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
-
-    private:
-        bool IsDoubleClick(AzToolsFramework::ViewportInteraction::MouseButton) const;
-
-        static AzToolsFramework::ViewportInteraction::MouseButton GetMouseButton(const AzFramework::InputChannel& inputChannel);
-        static bool IsMouseMove(const AzFramework::InputChannel& inputChannel);
-        static AzToolsFramework::ViewportInteraction::KeyboardModifier GetKeyboardModifier(const AzFramework::InputChannel& inputChannel);
-
-        AzToolsFramework::ViewportInteraction::MouseInteraction m_mouseInteraction;
-        AZStd::unordered_map<AzToolsFramework::ViewportInteraction::MouseButton, AZ::ScriptTimePoint> m_pendingDoubleClicks;
-        AZ::ScriptTimePoint m_curTime;
-    };
-} //namespace SandboxEditor
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.cpp b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
deleted file mode 100644
index 9b6693fea1..0000000000
--- a/Code/Sandbox/Editor/ViewportTitleDlg.cpp
+++ /dev/null
@@ -1,1021 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : CViewportTitleDlg implementation file
-
-#if !defined(Q_MOC_RUN)
-#include "EditorDefs.h"
-
-#include "ViewportTitleDlg.h"
-
-// Qt
-#include <QInputDialog>
-
-#include <AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h>
-
-// CryCommon
-#include <CryCommon/SFunctor.h>
-
-// Editor
-#include "Settings.h"
-#include "ViewPane.h"
-#include "DisplaySettings.h"
-#include "CustomResolutionDlg.h"
-#include "CustomAspectRatioDlg.h"
-#include "Include/IObjectManager.h"
-#include "UsedResources.h"
-#include "Objects/SelectionGroup.h"
-#include "UsedResources.h"
-#include "Include/IObjectManager.h"
-#include "ActionManager.h"
-#include "MainWindow.h"
-#include "GameEngine.h"
-#include "MathConversion.h"
-#include "EditorViewportSettings.h"
-
-#include <AzCore/std/algorithm.h>
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzToolsFramework/Viewport/ViewportMessages.h>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_ViewportTitleDlg.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#endif //!defined(Q_MOC_RUN)
-
-// CViewportTitleDlg dialog
-
-inline namespace Helpers
-{
-    void ToggleHelpers()
-    {
-        const bool newValue = !GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
-        GetIEditor()->GetDisplaySettings()->DisplayHelpers(newValue);
-        GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
-
-        if (newValue == false)
-        {
-            GetIEditor()->GetObjectManager()->SendEvent(EVENT_HIDE_HELPER);
-        }
-        AzToolsFramework::ViewportInteraction::ViewportSettingsNotificationBus::Broadcast(
-            &AzToolsFramework::ViewportInteraction::ViewportSettingNotifications::OnDrawHelpersChanged, newValue);
-    }
-
-    bool IsHelpersShown()
-    {
-        return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
-    }
-}
-
-namespace
-{
-    class CViewportTitleDlgDisplayInfoHelper
-        : public QObject
-        , public AZ::AtomBridge::AtomViewportInfoDisplayNotificationBus::Handler
-    {
-        Q_OBJECT
-
-    public:
-        CViewportTitleDlgDisplayInfoHelper(CViewportTitleDlg* parent)
-            : QObject(parent)
-        {
-            AZ::AtomBridge::AtomViewportInfoDisplayNotificationBus::Handler::BusConnect();
-        }
-
-    signals:
-        void ViewportInfoStatusUpdated(int newIndex);
-
-    private:
-        void OnViewportInfoDisplayStateChanged(AZ::AtomBridge::ViewportInfoDisplayState state)
-        {
-            emit ViewportInfoStatusUpdated(static_cast<int>(state));
-        }
-    };
-} //end anonymous namespace
-
-CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
-    : QWidget(pParent)
-    , m_ui(new Ui::ViewportTitleDlg)
-{
-    auto container = new QWidget(this);
-    m_ui->setupUi(container);
-    auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-    layout->addWidget(container);
-    container->setObjectName("ViewportTitleDlgContainer");
-
-    m_prevMoveSpeed = 0;
-
-    m_pViewPane = nullptr;
-    GetIEditor()->RegisterNotifyListener(this);
-    GetISystem()->GetISystemEventDispatcher()->RegisterListener(this);
-
-    LoadCustomPresets("FOVPresets", "FOVPreset", m_customFOVPresets);
-    LoadCustomPresets("AspectRatioPresets", "AspectRatioPreset", m_customAspectRatioPresets);
-    LoadCustomPresets("ResPresets", "ResPreset", m_customResPresets);
-
-    // audio request setup
-    m_oMuteAudioRequest.pData = &m_oMuteAudioRequestData;
-    m_oUnmuteAudioRequest.pData = &m_oUnmuteAudioRequestData;
-
-    SetupCameraDropdownMenu();
-    SetupResolutionDropdownMenu();
-    SetupViewportInformationMenu();
-    SetupHelpersButton();
-    SetupOverflowMenu();
-
-    Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, gSettings.bMuteAudio ? m_oMuteAudioRequest : m_oUnmuteAudioRequest);
-
-    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);
-}
-
-void CViewportTitleDlg::SetupCameraDropdownMenu()
-{
-    // Setup the camera dropdown menu
-    QMenu* cameraMenu = new QMenu(this);
-    cameraMenu->addMenu(GetFovMenu());
-    m_ui->m_cameraMenu->setMenu(cameraMenu);
-    m_ui->m_cameraMenu->setPopupMode(QToolButton::InstantPopup);
-    QAction* gotoPositionAction = new QAction("Go to position", cameraMenu);
-    connect(gotoPositionAction, &QAction::triggered, this, &CViewportTitleDlg::OnBnClickedGotoPosition);
-    cameraMenu->addAction(gotoPositionAction);
-    cameraMenu->addSeparator();
-
-    auto cameraSpeedActionWidget = new QWidgetAction(cameraMenu);
-    auto cameraSpeedContainer = new QWidget(cameraMenu);
-    auto cameraSpeedLabel = new QLabel(tr("Camera Speed"), cameraMenu);
-    m_cameraSpeed = new QComboBox(cameraMenu);
-    m_cameraSpeed->setEditable(true);
-    m_cameraSpeed->setValidator(new QDoubleValidator(m_minSpeed, m_maxSpeed, m_numDecimals, m_cameraSpeed));
-    m_cameraSpeed->installEventFilter(this);
-
-    QHBoxLayout* cameraSpeedLayout = new QHBoxLayout;
-    cameraSpeedLayout->addWidget(cameraSpeedLabel);
-    cameraSpeedLayout->addWidget(m_cameraSpeed);
-    cameraSpeedContainer->setLayout(cameraSpeedLayout);
-    cameraSpeedActionWidget->setDefaultWidget(cameraSpeedContainer);
-
-    // Save off the move speed here since setting up the combo box can cause it to update values in the background.
-    const float cameraMoveSpeed = SandboxEditor::UsingNewCameraSystem() ? SandboxEditor::CameraTranslateSpeed() : gSettings.cameraMoveSpeed;
-
-    // Populate the presets in the ComboBox
-    for (float presetValue : m_speedPresetValues)
-    {
-        m_cameraSpeed->addItem(QString().setNum(presetValue, 'f', m_numDecimals), presetValue);
-    }
-
-    auto comboBoxTextChanged = static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged);
-
-    SetSpeedComboBox(cameraMoveSpeed);
-    m_cameraSpeed->setInsertPolicy(QComboBox::InsertAtBottom);
-    m_cameraSpeed->setDuplicatesEnabled(false);
-    connect(m_cameraSpeed, comboBoxTextChanged, this, &CViewportTitleDlg::OnUpdateMoveSpeedText);
-    connect(m_cameraSpeed->lineEdit(), &QLineEdit::returnPressed, this, &CViewportTitleDlg::OnSpeedComboBoxEnter);
-
-    cameraMenu->addAction(cameraSpeedActionWidget);
-}
-
-void CViewportTitleDlg::SetupResolutionDropdownMenu()
-{
-    // Setup the resolution dropdown menu
-    QMenu* resolutionMenu = new QMenu(this);
-    resolutionMenu->addMenu(GetAspectMenu());
-    resolutionMenu->addMenu(GetResolutionMenu());
-    m_ui->m_resolutionMenu->setMenu(resolutionMenu);
-    m_ui->m_resolutionMenu->setPopupMode(QToolButton::InstantPopup);
-}
-
-void CViewportTitleDlg::SetupViewportInformationMenu()
-{
-    // Setup the debug information button
-    m_ui->m_debugInformationMenu->setMenu(GetViewportInformationMenu());
-    connect(m_ui->m_debugInformationMenu, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleDisplayInfo);
-    m_ui->m_debugInformationMenu->setPopupMode(QToolButton::MenuButtonPopup);
-
-}
-
-void CViewportTitleDlg::SetupHelpersButton()
-{
-    connect(m_ui->m_helpers, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleHelpers);
-    m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
-}
-
-void CViewportTitleDlg::SetupOverflowMenu()
-{
-    // Setup the overflow menu
-    QMenu* overFlowMenu = new QMenu(this);
-
-    m_audioMuteAction = new QAction("Mute Audio", overFlowMenu);
-    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);
-    connect(m_enableGridSnappingAction, &QAction::triggered, this, &CViewportTitleDlg::OnGridSnappingToggled);
-    m_enableGridSnappingAction->setCheckable(true);
-    overFlowMenu->addAction(m_enableGridSnappingAction);
-
-    m_gridSizeActionWidget = new QWidgetAction(overFlowMenu);
-    m_gridSpinBox = new AzQtComponents::DoubleSpinBox();
-    m_gridSpinBox->setValue(SandboxEditor::GridSnappingSize());
-    m_gridSpinBox->setMinimum(1e-2f);
-    m_gridSpinBox->setToolTip(tr("Grid size"));
-
-    QObject::connect(
-        m_gridSpinBox, QOverload<double>::of(&AzQtComponents::DoubleSpinBox::valueChanged), this, &CViewportTitleDlg::OnGridSpinBoxChanged);
-
-    m_gridSizeActionWidget->setDefaultWidget(m_gridSpinBox);
-    overFlowMenu->addAction(m_gridSizeActionWidget);
-
-    overFlowMenu->addSeparator();
-
-    m_enableAngleSnappingAction = new QAction("Enable Angle Snapping", overFlowMenu);
-    connect(m_enableAngleSnappingAction, &QAction::triggered, this, &CViewportTitleDlg::OnAngleSnappingToggled);
-    m_enableAngleSnappingAction->setCheckable(true);
-    overFlowMenu->addAction(m_enableAngleSnappingAction);
-
-    m_angleSizeActionWidget = new QWidgetAction(overFlowMenu);
-    m_angleSpinBox = new AzQtComponents::DoubleSpinBox();
-    m_angleSpinBox->setValue(SandboxEditor::AngleSnappingSize());
-    m_angleSpinBox->setMinimum(1e-2f);
-    m_angleSpinBox->setToolTip(tr("Angle Snapping"));
-
-    QObject::connect(
-        m_angleSpinBox, QOverload<double>::of(&AzQtComponents::DoubleSpinBox::valueChanged), this,
-        &CViewportTitleDlg::OnAngleSpinBoxChanged);
-
-    m_angleSizeActionWidget->setDefaultWidget(m_angleSpinBox);
-    overFlowMenu->addAction(m_angleSizeActionWidget);
-
-    m_ui->m_overflowBtn->setMenu(overFlowMenu);
-    m_ui->m_overflowBtn->setPopupMode(QToolButton::InstantPopup);
-    connect(overFlowMenu, &QMenu::aboutToShow, this, &CViewportTitleDlg::UpdateOverFlowMenuState);
-
-    UpdateMuteActionText();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::SetViewPane(CLayoutViewPane* pViewPane)
-{
-    if (m_pViewPane)
-        m_pViewPane->disconnect(this);
-    m_pViewPane = pViewPane;
-    if (m_pViewPane)
-        connect(this, &QWidget::customContextMenuRequested, m_pViewPane, &CLayoutViewPane::ShowTitleMenu);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnInitDialog()
-{
-    m_ui->m_titleBtn->setText(m_title);
-
-    // Add a child parented to us that listens for r_displayInfo changes.
-    auto displayInfoHelper = new CViewportTitleDlgDisplayInfoHelper(this);
-    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 = metrics.boundingRect("-9999.99").width() * m_fieldWidthMultiplier;
-
-    m_cameraSpeed->setFixedWidth(width);
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::SetTitle(const QString& title)
-{
-    m_title = title;
-    m_ui->m_titleBtn->setText(m_title);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnMaximize()
-{
-    if (m_pViewPane)
-    {
-        m_pViewPane->ToggleMaximize();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnToggleHelpers()
-{
-    Helpers::ToggleHelpers();
-    m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
-}
-
-void CViewportTitleDlg::SetNoViewportInfo()
-{
-    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
-        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::NoInfo);
-}
-
-void CViewportTitleDlg::SetNormalViewportInfo()
-{
-    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
-        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::NormalInfo);
-}
-
-void CViewportTitleDlg::SetFullViewportInfo()
-{
-    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
-        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::FullInfo);
-}
-
-void CViewportTitleDlg::SetCompactViewportInfo()
-{
-    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
-        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, AZ::AtomBridge::ViewportInfoDisplayState::CompactInfo);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::UpdateDisplayInfo()
-{
-    if (m_viewportInformationMenu == nullptr)
-    {
-        // Nothing to update, just return;
-        return;
-    }
-
-    AZ::AtomBridge::ViewportInfoDisplayState state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
-    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::BroadcastResult(
-        state,
-        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState
-    );
-
-    m_noInformationAction->setChecked(false);
-    m_normalInformationAction->setChecked(false);
-    m_fullInformationAction->setChecked(false);
-    m_compactInformationAction->setChecked(false);
-
-    switch (state)
-    {
-        case AZ::AtomBridge::ViewportInfoDisplayState::NormalInfo:
-            {
-                m_normalInformationAction->setChecked(true);
-                break;
-            }
-        case AZ::AtomBridge::ViewportInfoDisplayState::FullInfo:
-            {
-                m_fullInformationAction->setChecked(true);
-                break;
-            }
-        case AZ::AtomBridge::ViewportInfoDisplayState::CompactInfo:
-            {
-                m_compactInformationAction->setChecked(true);
-                break;
-            }
-        case AZ::AtomBridge::ViewportInfoDisplayState::NoInfo:
-        default:
-            {
-                m_noInformationAction->setChecked(true);
-                break;
-            }
-    }
-
-    m_ui->m_debugInformationMenu->setChecked(state != AZ::AtomBridge::ViewportInfoDisplayState::NoInfo);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnToggleDisplayInfo()
-{
-    AZ::AtomBridge::ViewportInfoDisplayState state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
-    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::BroadcastResult(
-        state, &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState);
-    state = aznumeric_cast<AZ::AtomBridge::ViewportInfoDisplayState>(
-        (aznumeric_cast<int>(state) + 1) % aznumeric_cast<int>(AZ::AtomBridge::ViewportInfoDisplayState::Invalid));
-    // SetDisplayState will fire OnViewportInfoDisplayStateChanged and notify us, no need to call UpdateDisplayInfo.
-    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
-        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState, state);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::AddFOVMenus(QMenu* menu, std::function<void(float)> callback, const QStringList& customPresets)
-{
-    static const float fovs[] = {
-        10.0f,
-        20.0f,
-        40.0f,
-        55.0f,
-        60.0f,
-        70.0f,
-        80.0f,
-        90.0f
-    };
-
-    static const size_t fovCount = sizeof(fovs) / sizeof(fovs[0]);
-
-    for (size_t i = 0; i < fovCount; ++i)
-    {
-        const float fov = fovs[i];
-        QAction* action = menu->addAction(QString::number(fov));
-        connect(action, &QAction::triggered, action, [fov, callback](){ callback(fov); });
-    }
-
-    menu->addSeparator();
-
-    if (!customPresets.empty())
-    {
-        for (size_t i = 0; i < customPresets.size(); ++i)
-        {
-            if (customPresets[i].isEmpty())
-            {
-                break;
-            }
-
-            float fov = gSettings.viewports.fDefaultFov;
-            bool ok;
-            float f = customPresets[i].toDouble(&ok);
-            if (ok)
-            {
-                fov = std::max(1.0f, f);
-                fov = std::min(120.0f, f);
-                QAction* action = menu->addAction(customPresets[i]);
-                connect(action, &QAction::triggered, action, [fov, callback](){ callback(fov); });
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnMenuFOVCustom()
-{
-    bool ok;
-    int fov = QInputDialog::getInt(this, tr("Custom FOV"), QString(), 60, 1, 120, 1, &ok);
-
-    if (ok)
-    {
-        m_pViewPane->SetViewportFOV(fov);
-
-        // Update the custom presets.
-        const QString text = QString::number(fov);
-        UpdateCustomPresets(text, m_customFOVPresets);
-        SaveCustomPresets("FOVPresets", "FOVPreset", m_customFOVPresets);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::CreateFOVMenu()
-{
-    if (!m_fovMenu)
-    {
-        m_fovMenu = new QMenu("FOV", this);
-    }
-
-    m_fovMenu->clear();
-
-    AddFOVMenus(m_fovMenu, [this](float f) { m_pViewPane->SetViewportFOV(f); }, m_customFOVPresets);
-    if (!m_fovMenu->isEmpty())
-    {
-        m_fovMenu->addSeparator();
-    }
-
-    QAction* action = m_fovMenu->addAction(tr("Custom..."));
-    connect(action, &QAction::triggered, this, &CViewportTitleDlg::OnMenuFOVCustom);
-}
-
-QMenu* const CViewportTitleDlg::GetFovMenu()
-{
-    CreateFOVMenu();
-    return m_fovMenu;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::AddAspectRatioMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets)
-{
-    static const std::pair<unsigned int, unsigned int> ratios[] = {
-        std::pair<unsigned int, unsigned int>(16, 9),
-        std::pair<unsigned int, unsigned int>(16, 10),
-        std::pair<unsigned int, unsigned int>(4, 3),
-        std::pair<unsigned int, unsigned int>(5, 4)
-    };
-
-    static const size_t ratioCount = sizeof(ratios) / sizeof(ratios[0]);
-
-    for (size_t i = 0; i < ratioCount; ++i)
-    {
-        int width = ratios[i].first;
-        int height = ratios[i].second;
-        QAction* action = menu->addAction(QString("%1:%2").arg(width).arg(height));
-        connect(action, &QAction::triggered, action, [width, height, callback]() {callback(width, height); });
-    }
-
-    menu->addSeparator();
-
-    for (size_t i = 0; i < customPresets.size(); ++i)
-    {
-        if (customPresets[i].isEmpty())
-        {
-            break;
-        }
-
-        static QRegularExpression regex(QStringLiteral("^(\\d+):(\\d+)$"));
-        QRegularExpressionMatch matches = regex.match(customPresets[i]);
-        if (matches.hasMatch())
-        {
-            bool ok;
-            unsigned int width = matches.captured(1).toInt(&ok);
-            Q_ASSERT(ok);
-            unsigned int height = matches.captured(2).toInt(&ok);
-            Q_ASSERT(ok);
-            QAction* action = menu->addAction(customPresets[i]);
-            connect(action, &QAction::triggered, action, [width, height, callback]() {callback(width, height); });
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnMenuAspectRatioCustom()
-{
-    const QRect viewportRect = m_pViewPane->GetViewport()->rect();
-    const unsigned int width = viewportRect.width();
-    const unsigned int height = viewportRect.height();
-
-    int whGCD = gcd(width, height);
-    CCustomAspectRatioDlg aspectRatioInputDialog(width / whGCD, height / whGCD, this);
-
-    if (aspectRatioInputDialog.exec() == QDialog::Accepted)
-    {
-        const unsigned int aspectX = aspectRatioInputDialog.GetX();
-        const unsigned int aspectY = aspectRatioInputDialog.GetY();
-
-        m_pViewPane->SetAspectRatio(aspectX, aspectY);
-
-        // Update the custom presets.
-        UpdateCustomPresets(QString::fromLatin1("%1:%2").arg(aspectX).arg(aspectY), m_customAspectRatioPresets);
-        SaveCustomPresets("AspectRatioPresets", "AspectRatioPreset", m_customAspectRatioPresets);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::CreateAspectMenu()
-{
-    if (m_aspectMenu == nullptr)
-    {
-        m_aspectMenu = new QMenu("Aspect Ratio");
-    }
-
-    m_aspectMenu->clear();
-
-    AddAspectRatioMenus(m_aspectMenu, [this](int width, int height) {m_pViewPane->SetAspectRatio(width, height); }, m_customAspectRatioPresets);
-    if (!m_aspectMenu->isEmpty())
-    {
-        m_aspectMenu->addSeparator();
-    }
-
-    QAction* customAction = m_aspectMenu->addAction(tr("Custom..."));
-    connect(customAction, &QAction::triggered, this, &CViewportTitleDlg::OnMenuAspectRatioCustom);
-}
-
-QMenu* const CViewportTitleDlg::GetAspectMenu()
-{
-    CreateAspectMenu();
-    return m_aspectMenu;
-}
-
-QMenu* const CViewportTitleDlg::GetViewportInformationMenu()
-{
-    CreateViewportInformationMenu();
-    return m_viewportInformationMenu;
-}
-
-void CViewportTitleDlg::CreateViewportInformationMenu()
-{
-    if (m_viewportInformationMenu == nullptr)
-    {
-        m_viewportInformationMenu = new QMenu("Viewport Information");
-
-        m_noInformationAction = new QAction(tr("None"), m_viewportInformationMenu);
-        m_noInformationAction->setCheckable(true);
-        connect(m_noInformationAction, &QAction::triggered, this, &CViewportTitleDlg::SetNoViewportInfo);
-        m_viewportInformationMenu->addAction(m_noInformationAction);
-
-        m_normalInformationAction = new QAction(tr("Normal"), m_viewportInformationMenu);
-        m_normalInformationAction->setCheckable(true);
-        connect(m_normalInformationAction, &QAction::triggered, this, &CViewportTitleDlg::SetNormalViewportInfo);
-        m_viewportInformationMenu->addAction(m_normalInformationAction);
-
-        m_fullInformationAction = new QAction(tr("Full"), m_viewportInformationMenu);
-        m_fullInformationAction->setCheckable(true);
-        connect(m_fullInformationAction, &QAction::triggered, this, &CViewportTitleDlg::SetFullViewportInfo);
-        m_viewportInformationMenu->addAction(m_fullInformationAction);
-
-        m_compactInformationAction = new QAction(tr("Compact"), m_viewportInformationMenu);
-        m_compactInformationAction->setCheckable(true);
-        connect(m_compactInformationAction, &QAction::triggered, this, &CViewportTitleDlg::SetCompactViewportInfo);
-        m_viewportInformationMenu->addAction(m_compactInformationAction);
-
-        UpdateDisplayInfo();
-    }
-}
-
-void CViewportTitleDlg::AddResolutionMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets)
-{
-    static const CRenderViewport::SResolution resolutions[] = {
-        CRenderViewport::SResolution(1280, 720),
-        CRenderViewport::SResolution(1920, 1080),
-        CRenderViewport::SResolution(2560, 1440),
-        CRenderViewport::SResolution(2048, 858),
-        CRenderViewport::SResolution(1998, 1080),
-        CRenderViewport::SResolution(3840, 2160)
-    };
-
-    static const size_t resolutionCount = sizeof(resolutions) / sizeof(resolutions[0]);
-
-    for (size_t i = 0; i < resolutionCount; ++i)
-    {
-        const int width = resolutions[i].width;
-        const int height = resolutions[i].height;
-        const QString text = QString::fromLatin1("%1 x %2").arg(width).arg(height);
-        QAction* action = menu->addAction(text);
-        connect(action, &QAction::triggered, action, [width, height, callback](){ callback(width, height); });
-    }
-
-    menu->addSeparator();
-
-    for (size_t i = 0; i < customPresets.size(); ++i)
-    {
-        if (customPresets[i].isEmpty())
-        {
-            break;
-        }
-
-        static QRegularExpression regex(QStringLiteral("^(\\d+) x (\\d+)$"));
-        QRegularExpressionMatch matches = regex.match(customPresets[i]);
-        if (matches.hasMatch())
-        {
-            bool ok;
-            int width = matches.captured(1).toInt(&ok);
-            Q_ASSERT(ok);
-            int height = matches.captured(2).toInt(&ok);
-            Q_ASSERT(ok);
-            QAction* action = menu->addAction(customPresets[i]);
-            connect(action, &QAction::triggered, action, [width, height, callback](){ callback(width, height); });
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnMenuResolutionCustom()
-{
-    const QRect rectViewport = m_pViewPane->GetViewport()->rect();
-    CCustomResolutionDlg resDlg(rectViewport.width(), rectViewport.height(), parentWidget());
-    if (resDlg.exec() == QDialog::Accepted)
-    {
-        m_pViewPane->ResizeViewport(resDlg.GetWidth(), resDlg.GetHeight());
-        // Update the custom presets.
-        const QString text = QString::fromLatin1("%1 x %2").arg(resDlg.GetWidth()).arg(resDlg.GetHeight());
-        UpdateCustomPresets(text, m_customResPresets);
-        SaveCustomPresets("ResPresets", "ResPreset", m_customResPresets);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::CreateResolutionMenu()
-{
-    if (!m_resolutionMenu)
-    {
-        m_resolutionMenu = new QMenu("Resolution");
-    }
-
-    m_resolutionMenu->clear();
-
-    AddResolutionMenus(m_resolutionMenu, [this](int width, int height) { m_pViewPane->ResizeViewport(width, height); }, m_customResPresets);
-    if (!m_resolutionMenu->isEmpty())
-    {
-        m_resolutionMenu->addSeparator();
-    }
-
-    QAction* action = m_resolutionMenu->addAction(tr("Custom..."));
-    connect(action, &QAction::triggered, this, &CViewportTitleDlg::OnMenuResolutionCustom);
-}
-
-QMenu* const CViewportTitleDlg::GetResolutionMenu()
-{
-    CreateResolutionMenu();
-    return m_resolutionMenu;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnViewportSizeChanged(int width, int height)
-{
-    m_resolutionMenu->setTitle(QString::fromLatin1("Resolution:  %1 x %2").arg(width).arg(height));
-
-    if (width != 0 && height != 0)
-    {
-        // Calculate greatest common divider of width & height
-        int whGCD = gcd(width, height);
-
-        m_aspectMenu->setTitle(QString::fromLatin1("Ratio:  %1:%2").arg(width / whGCD).arg(height / whGCD));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnViewportFOVChanged(float fov)
-{
-    const float degFOV = RAD2DEG(fov);
-    if (m_fovMenu)
-    {
-        m_fovMenu->setTitle(QString::fromLatin1("FOV:  %1%2").arg(qRound(degFOV)).arg(QString(QByteArray::fromPercentEncoding("%C2%B0"))));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewportTitleDlg::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-    case eNotify_OnDisplayRenderUpdate:
-        m_ui->m_helpers->setChecked(Helpers::IsHelpersShown());
-        break;
-    case eNotify_OnBeginGameMode:
-    case eNotify_OnEndGameMode:
-        UpdateMuteActionText();
-        break;
-    }
-}
-
-void CViewportTitleDlg::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam)
-{
-    if (event == ESYSTEM_EVENT_RESIZE)
-    {
-        if (m_pViewPane)
-        {
-            const int eventWidth = static_cast<int>(wparam);
-            const int eventHeight = static_cast<int>(lparam);
-            const QWidget* viewport = m_pViewPane->GetViewport();
-
-            // This should eventually be converted to an EBus to make it easy to connect to the correct viewport 
-            // sending the event.  But for now, just detect that we've gotten width/height values that match our 
-            // associated viewport
-            if (viewport && (eventWidth == viewport->width()) && (eventHeight == viewport->height()))
-            {
-                OnViewportSizeChanged(eventWidth, eventHeight);
-            }
-        }
-    }
-}
-
-void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets)
-{
-    QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
-    settings.beginGroup(section);
-    outCustompresets = settings.value(keyName).toStringList();
-    settings.endGroup();
-}
-
-void CViewportTitleDlg::SaveCustomPresets(const QString& section, const QString& keyName, const QStringList& custompresets)
-{
-    QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
-    settings.beginGroup(section);
-    settings.setValue(keyName, custompresets);
-    settings.endGroup();
-}
-
-void CViewportTitleDlg::UpdateCustomPresets(const QString& text, QStringList& custompresets)
-{
-    custompresets.removeAll(text);
-    custompresets.push_front(text);
-    if (custompresets.size() > MAX_NUM_CUSTOM_PRESETS)
-    {
-        custompresets.erase(custompresets.begin() + MAX_NUM_CUSTOM_PRESETS, custompresets.end()); // QList doesn't have resize()
-    }
-}
-
-bool CViewportTitleDlg::eventFilter(QObject* object, QEvent* event)
-{
-    if (object == m_cameraSpeed)
-    {
-        if (event->type() == QEvent::FocusIn)
-        {
-            QTimer::singleShot(
-                0, this,
-                [this]
-                {
-                    m_cameraSpeed->lineEdit()->selectAll();
-                });
-        }
-
-        return m_cameraSpeed->eventFilter(object, event);
-    }
-
-    bool consumeEvent = false;
-
-    // These events are forwarded from the toolbar that took ownership of our widgets
-    if (event->type() == QEvent::MouseButtonDblClick)
-    {
-        QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
-        if (mouseEvent->button() == Qt::LeftButton)
-        {
-            OnMaximize();
-            consumeEvent = true;
-        }
-    }
-    else if (event->type() == QEvent::FocusIn)
-    {
-        parentWidget()->setFocus();
-    }
-
-    return QWidget::eventFilter(object, event) || consumeEvent;
-}
-
-void CViewportTitleDlg::OnBnClickedGotoPosition()
-{
-    emit ActionTriggered(ID_DISPLAY_GOTOPOSITION);
-}
-
-void CViewportTitleDlg::OnBnClickedMuteAudio()
-{
-    gSettings.bMuteAudio = !gSettings.bMuteAudio;
-
-    Audio::AudioSystemRequestBus::Broadcast(
-        &Audio::AudioSystemRequestBus::Events::PushRequest, gSettings.bMuteAudio ? m_oMuteAudioRequest : m_oUnmuteAudioRequest);
-
-    UpdateMuteActionText();
-}
-
-void CViewportTitleDlg::UpdateMuteActionText()
-{
-    m_audioMuteAction->setText(gSettings.bMuteAudio ? tr("Un-mute Audio") : tr("Mute Audio"));
-}
-
-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)
-    {
-        fVal = int_round(fVal / fStep) * fStep;
-    }
-    return fVal;
-}
-
-void CViewportTitleDlg::SetSpeedComboBox(double value)
-{
-    value = AZStd::clamp(Round(value, m_speedStep), m_minSpeed, m_maxSpeed);
-
-    int index = m_cameraSpeed->findData(value);
-    if (index != -1)
-    {
-        m_cameraSpeed->setCurrentIndex(index);
-    }
-    else
-    {
-        m_cameraSpeed->lineEdit()->setText(QString().setNum(value, 'f', m_numDecimals));
-    }
-}
-
-void CViewportTitleDlg::OnSpeedComboBoxEnter()
-{
-    m_cameraSpeed->clearFocus();
-}
-
-void CViewportTitleDlg::OnUpdateMoveSpeedText(const QString& text)
-{
-    if (SandboxEditor::UsingNewCameraSystem())
-    {
-        SandboxEditor::SetCameraTranslateSpeed(aznumeric_cast<float>(Round(text.toDouble(), m_speedStep)));
-    }
-    else
-    {
-        gSettings.cameraMoveSpeed = aznumeric_cast<float>(Round(text.toDouble(), m_speedStep));
-    }
-}
-
-void CViewportTitleDlg::CheckForCameraSpeedUpdate()
-{
-    if (const float currentCameraMoveSpeed =
-            SandboxEditor::UsingNewCameraSystem() ? SandboxEditor::CameraTranslateSpeed() : gSettings.cameraMoveSpeed;
-        currentCameraMoveSpeed != m_prevMoveSpeed && !m_cameraSpeed->lineEdit()->hasFocus())
-    {
-        m_prevMoveSpeed = currentCameraMoveSpeed;
-        SetSpeedComboBox(currentCameraMoveSpeed);
-    }
-}
-
-void CViewportTitleDlg::OnGridSnappingToggled()
-{
-    m_gridSizeActionWidget->setEnabled(m_enableGridSnappingAction->isChecked());
-    MainWindow::instance()->GetActionManager()->GetAction(ID_SNAP_TO_GRID)->trigger();
-}
-
-void CViewportTitleDlg::OnAngleSnappingToggled()
-{
-    m_angleSizeActionWidget->setEnabled(m_enableAngleSnappingAction->isChecked());
-    MainWindow::instance()->GetActionManager()->GetAction(ID_SNAPANGLE)->trigger();
-}
-
-void CViewportTitleDlg::OnGridSpinBoxChanged(double value)
-{
-    SandboxEditor::SetGridSnappingSize(value);
-}
-
-void CViewportTitleDlg::OnAngleSpinBoxChanged(double value)
-{
-    SandboxEditor::SetAngleSnappingSize(value);
-}
-
-void CViewportTitleDlg::UpdateOverFlowMenuState()
-{
-    bool gridSnappingActive = MainWindow::instance()->GetActionManager()->GetAction(ID_SNAP_TO_GRID)->isChecked();
-    {
-        QSignalBlocker signalBlocker(m_enableGridSnappingAction);
-        m_enableGridSnappingAction->setChecked(gridSnappingActive);
-    }
-    m_gridSizeActionWidget->setEnabled(gridSnappingActive);
-
-    bool angleSnappingActive = MainWindow::instance()->GetActionManager()->GetAction(ID_SNAPANGLE)->isChecked();
-    {
-        QSignalBlocker signalBlocker(m_enableAngleSnappingAction);
-        m_enableAngleSnappingAction->setChecked(angleSnappingActive);
-    }
-    m_angleSizeActionWidget->setEnabled(angleSnappingActive);
-}
-
-namespace
-{
-    void PyToggleHelpers()
-    {
-        GetIEditor()->GetDisplaySettings()->DisplayHelpers(!GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
-        GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
-
-        if (GetIEditor()->GetDisplaySettings()->IsDisplayHelpers() == false)
-        {
-            GetIEditor()->GetObjectManager()->SendEvent(EVENT_HIDE_HELPER);
-        }
-    }
-
-    bool PyIsHelpersShown()
-    {
-        return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
-    }
-}
-
-namespace AzToolsFramework
-{
-    void ViewportTitleDlgPythonFuncsHandler::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
-        {
-            // this will put these methods into the 'azlmbr.legacy.general' module
-            auto addLegacyGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
-            {
-                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Attribute(AZ::Script::Attributes::Category, "Legacy/Editor")
-                    ->Attribute(AZ::Script::Attributes::Module, "legacy.general");
-            };
-            addLegacyGeneral(behaviorContext->Method("toggle_helpers", PyToggleHelpers, nullptr, "Toggles the display of helpers."));
-            addLegacyGeneral(behaviorContext->Method("is_helpers_shown", PyIsHelpersShown, nullptr, "Gets the display state of helpers."));
-        }
-    }
-}
-
-#include "ViewportTitleDlg.moc"
-#include <moc_ViewportTitleDlg.cpp>
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.h b/Code/Sandbox/Editor/ViewportTitleDlg.h
deleted file mode 100644
index ab208d3792..0000000000
--- a/Code/Sandbox/Editor/ViewportTitleDlg.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_VIEWPORTTITLEDLG_H
-#define CRYINCLUDE_EDITOR_VIEWPORTTITLEDLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "RenderViewport.h"
-#include <AzCore/Component/Component.h>
-
-#include <IAudioSystem.h>
-
-#include <functional>
-#include <QSharedPointer>
-#include <QWidgetAction>
-#include <QComboBox>
-
-#include <AzQtComponents/Components/Widgets/SpinBox.h>
-
-#include <HMDBus.h>
-#endif
-
-// CViewportTitleDlg dialog
-class CLayoutViewPane;
-class CPopupMenuItem;
-
-class QAbstractButton;
-class QMenu;
-
-struct ICVar;
-
-namespace Ui
-{
-    class ViewportTitleDlg;
-}
-
-//////////////////////////////////////////////////////////////////////////
-class CViewportTitleDlg
-    : public QWidget
-    , public IEditorNotifyListener
-    , public ISystemEventListener
-    , public AZ::VR::VREventBus::Handler
-{
-    Q_OBJECT
-public:
-    CViewportTitleDlg(QWidget* pParent = nullptr);   // standard constructor
-    virtual ~CViewportTitleDlg();
-
-    void SetViewPane(CLayoutViewPane* pViewPane);
-    void SetTitle(const QString& title);
-    void OnViewportSizeChanged(int width, int height);
-    void OnViewportFOVChanged(float fov);
-
-    static void AddFOVMenus(QMenu* menu, std::function<void(float)> callback, const QStringList& customPresets);
-    static void AddAspectRatioMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets);
-    static void AddResolutionMenus(QMenu* menu, std::function<void(int, int)> callback, const QStringList& customPresets);
-
-    static void LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets);
-    static void SaveCustomPresets(const QString& section, const QString& keyName, const QStringList& custompresets);
-    static void UpdateCustomPresets(const QString& text, QStringList& custompresets);
-
-    bool eventFilter(QObject* object, QEvent* event) override;
-
-    void SetSpeedComboBox(double value);
-
-    QMenu* const GetFovMenu();
-    QMenu* const GetAspectMenu();
-    QMenu* const GetResolutionMenu();
-
-Q_SIGNALS:
-    void ActionTriggered(int command);
-
-protected:
-    virtual void OnInitDialog();
-
-    virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
-
-    void OnMaximize();
-    void OnToggleHelpers();
-    void UpdateDisplayInfo();
-
-    //////////////////////////////////////////////////////////////////////////
-    /// VR Event Bus Implementation
-    //////////////////////////////////////////////////////////////////////////
-    void OnHMDInitialized() override;
-    void OnHMDShutdown() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    void SetupCameraDropdownMenu();
-    void SetupResolutionDropdownMenu();
-    void SetupViewportInformationMenu();
-    void SetupOverflowMenu();
-    void SetupHelpersButton();
-
-    QString m_title;
-
-    CLayoutViewPane* m_pViewPane;
-
-    static const int MAX_NUM_CUSTOM_PRESETS = 10;
-    QStringList m_customResPresets;
-    QStringList m_customFOVPresets;
-    QStringList m_customAspectRatioPresets;
-
-    float m_prevMoveSpeed;
-
-    // Speed combobox/lineEdit settings
-    double m_minSpeed = 0.01;
-    double m_maxSpeed = 100.0;
-    double m_speedStep = 0.001;
-    int m_numDecimals = 3;
-
-    // Speed presets
-    float m_speedPresetValues[4] = { 0.01f, 0.1f, 1.0f, 10.0f };
-
-    double m_fieldWidthMultiplier = 1.8;
-
-
-    void OnMenuFOVCustom();
-
-    void CreateFOVMenu();
-
-    void OnMenuAspectRatioCustom();
-    void CreateAspectMenu();
-
-    void OnMenuResolutionCustom();
-    void CreateResolutionMenu();
-
-    void CreateViewportInformationMenu();
-    QMenu* const GetViewportInformationMenu();
-    void SetNoViewportInfo();
-    void SetNormalViewportInfo();
-    void SetFullViewportInfo();
-    void SetCompactViewportInfo();
-
-    void OnBnClickedGotoPosition();
-    void OnBnClickedMuteAudio();
-    void OnBnClickedEnableVR();
-
-    void UpdateMuteActionText();
-
-    void OnToggleDisplayInfo();
-
-    void OnSpeedComboBoxEnter();
-    void OnUpdateMoveSpeedText(const QString&);
-
-    void CheckForCameraSpeedUpdate();
-
-    void OnGridSnappingToggled();
-    void OnAngleSnappingToggled();
-
-    void OnGridSpinBoxChanged(double value);
-    void OnAngleSpinBoxChanged(double value);
-
-    void UpdateOverFlowMenuState();
-
-    QMenu* m_fovMenu = nullptr;
-    QMenu* m_aspectMenu = nullptr;
-    QMenu* m_resolutionMenu = nullptr;
-    QMenu* m_viewportInformationMenu = nullptr;
-    QAction* m_noInformationAction = nullptr;
-    QAction* m_normalInformationAction = nullptr;
-    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;
-    AzQtComponents::DoubleSpinBox* m_gridSpinBox = nullptr;
-    AzQtComponents::DoubleSpinBox* m_angleSpinBox = nullptr;
-    QWidgetAction* m_gridSizeActionWidget = nullptr;
-    QWidgetAction* m_angleSizeActionWidget = nullptr;
-
-    Audio::SAudioRequest m_oMuteAudioRequest;
-    Audio::SAudioManagerRequestData<Audio::eAMRT_MUTE_ALL> m_oMuteAudioRequestData;
-    Audio::SAudioRequest m_oUnmuteAudioRequest;
-    Audio::SAudioManagerRequestData<Audio::eAMRT_UNMUTE_ALL> m_oUnmuteAudioRequestData;
-
-
-    QScopedPointer<Ui::ViewportTitleDlg> m_ui;
-};
-
-namespace AzToolsFramework
-{
-    //! A component to reflect scriptable commands for the Editor
-    class ViewportTitleDlgPythonFuncsHandler
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(ViewportTitleDlgPythonFuncsHandler, "{2D686C2D-04F0-4C96-B432-0702E774062E}")
-
-        SANDBOX_API static void Reflect(AZ::ReflectContext* context);
-
-        // AZ::Component ...
-        void Activate() override {}
-        void Deactivate() override {}
-    };
-
-} // namespace AzToolsFramework
-
-
-#endif // CRYINCLUDE_EDITOR_VIEWPORTTITLEDLG_H
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.ui b/Code/Sandbox/Editor/ViewportTitleDlg.ui
deleted file mode 100644
index 7d8e9d50d4..0000000000
--- a/Code/Sandbox/Editor/ViewportTitleDlg.ui
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ViewportTitleDlg</class>
- <widget class="QWidget" name="ViewportTitleDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>648</width>
-    <height>29</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>29</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>29</height>
-   </size>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0,0,0,0,0,0,0">
-   <property name="leftMargin">
-    <number>10</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="m_titleBtn">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="contextMenuPolicy">
-      <enum>Qt::NoContextMenu</enum>
-     </property>
-     <property name="text">
-      <string>Static</string>
-     </property>
-     <property name="indent">
-      <number>11</number>
-     </property>
-    </widget>
-   </item>
-   <item>
-     <widget class="QToolButton" name="m_cameraMenu">
-       <property name="icon">
-         <iconset>
-           <normaloff>:/Menu/camera.svg</normaloff>:/Menu/camera.svg
-         </iconset>
-       </property>
-     </widget>
-   </item>   
-   <item>
-     <widget class="QToolButton" name="m_debugInformationMenu">
-       <property name="icon">
-         <iconset>
-           <normaloff>:/Menu/debug.svg</normaloff>:/Menu/debug.svg
-         </iconset>
-       </property>
-       <property name="checkable">
-         <bool>true</bool>
-       </property>
-     </widget>
-   </item>   
-   <item>
-     <widget class="QToolButton" name="m_helpers">
-       <property name="icon">
-         <iconset>
-           <normaloff>:/Menu/helpers.svg</normaloff>:/Menu/helpers.svg
-         </iconset>
-       </property>
-       <property name="checkable">
-         <bool>true</bool>
-       </property>
-     </widget>
-   </item>   
-   <item>
-     <widget class="QToolButton" name="m_resolutionMenu">
-       <property name="icon">
-         <iconset>
-           <normaloff>:/Menu/resolution.svg</normaloff>:/Menu/resolution.svg
-         </iconset>
-       </property>
-     </widget>
-   </item>
-   <item>
-     <widget class="QToolButton" name="m_overflowBtn">
-       <property name="icon">
-         <iconset>
-           <normaloff>:/Menu/menu.svg</normaloff>:/Menu/menu.svg
-         </iconset>
-       </property>
-     </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AzQtComponents::ButtonDivider</class>
-   <extends>QWidget</extends>
-   <header>AzQtComponents/Components/ButtonDivider.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
-  <resources>
-    <include location="../../Framework/AzQtComponents/AzQtComponents/Images/resources.qrc"/>
-  </resources>
-  <connections/>
-</ui>
diff --git a/Code/Sandbox/Editor/WaitProgress.cpp b/Code/Sandbox/Editor/WaitProgress.cpp
deleted file mode 100644
index 2ebfe81663..0000000000
--- a/Code/Sandbox/Editor/WaitProgress.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "WaitProgress.h"
-
-#include "MainWindow.h"         // for MainWindow
-#include "CryEdit.h"            // for EditorIdleProcessingBus
-#include "MainStatusBar.h"      // for MainStatusBar
-
-#include <QProgressBar>
-
-bool CWaitProgress::m_bInProgressNow = false;
-
-CWaitProgress::CWaitProgress(const QString& lpszText, bool bStart)
-    : m_strText(lpszText)
-    , m_bStarted(false)
-    , m_progressBar(nullptr)
-{
-    m_bIgnore = false;
-
-    if (bStart)
-    {
-        Start();
-    }
-}
-
-CWaitProgress::~CWaitProgress()
-{
-    if (m_bStarted)
-    {
-        Stop();
-    }
-}
-
-void CWaitProgress::Start()
-{
-    if (m_bStarted)
-    {
-        Stop();
-    }
-
-    if (m_bInProgressNow)
-    {
-        // Do not affect previously started progress bar.
-        m_bIgnore = true;
-        m_bStarted = false;
-        return;
-    }
-
-    // display text in the status bar
-    GetIEditor()->SetStatusText(m_strText);
-
-    // switch on wait cursor
-    qApp->setOverrideCursor(Qt::BusyCursor);
-
-    m_bStarted = true;
-    m_percent = 0;
-
-    // because Idle Processing was constantly adding new events that made the event loop in Step() spin forever...
-    EditorIdleProcessingBus::Broadcast(&EditorIdleProcessing::DisableIdleProcessing); 
-}
-
-void CWaitProgress::Stop()
-{
-    if (!m_bStarted)
-    {
-        return;
-    }
-
-    delete m_progressBar;
-    m_progressBar = nullptr;
-
-    // switch off wait cursor
-    qApp->restoreOverrideCursor();
-    m_bInProgressNow = false;
-    m_bStarted = false;
-
-    EditorIdleProcessingBus::Broadcast(&EditorIdleProcessing::EnableIdleProcessing);
-}
-
-bool CWaitProgress::Step(int nPercentage)
-{
-    if (m_bIgnore)
-    {
-        return true;
-    }
-
-    if (!m_bStarted)
-    {
-        Start();
-    }
-
-    if (m_percent == nPercentage)
-    {
-        return true;
-    }
-
-    m_percent = nPercentage;
-
-    if (nPercentage >= 0)
-    {
-        if (nPercentage > 100)
-        {
-            nPercentage = 100;
-        }
-
-        // create or update a progress control in the status bar
-        if (!m_progressBar)
-        {
-            CreateProgressControl();
-        }
-
-        if (m_progressBar)
-        {
-            m_progressBar->setValue(nPercentage);
-        }
-    }
-
-    // Use the oportunity to process windows messages here.
-    static const AZ::u64 TIMEOUT_MS = 1;
-    qApp->processEvents(QEventLoop::AllEvents, TIMEOUT_MS);
-
-    return true;
-}
-
-void CWaitProgress::SetText(const QString& lpszText)
-{
-    if (m_bIgnore)
-    {
-        return;
-    }
-
-    m_strText = lpszText;
-    GetIEditor()->SetStatusText(m_strText);
-}
-
-void CWaitProgress::CreateProgressControl()
-{
-    assert(m_progressBar == nullptr);
-
-    MainStatusBar* statusBar = MainWindow::instance()->StatusBar();
-    m_progressBar = new QProgressBar();
-    m_progressBar->setRange(0, 100);
-    statusBar->insertWidget(1, m_progressBar, 250);
-
-    m_bInProgressNow = true;
-}
diff --git a/Code/Sandbox/Editor/WaitProgress.h b/Code/Sandbox/Editor/WaitProgress.h
deleted file mode 100644
index da04a053ef..0000000000
--- a/Code/Sandbox/Editor/WaitProgress.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-////////////////////////////////////////////////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2002-2012.
-// -------------------------------------------------------------------------
-//  File name:   waitprogress.h
-//  Created:     10/5/2002 by Timur.
-//  Description: CWaitProgress class adds information about lengthy process
-//      Usage:
-//
-//      CWaitProgress wait;
-//      wait.SetText("Long");
-//      wait.SetProgress(35); // 35 percent.
-//
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_EDITOR_WAITPROGRESS_H
-#define CRYINCLUDE_EDITOR_WAITPROGRESS_H
-
-class QProgressBar;
-
-#include <QString>
-
-class CWaitProgress
-{
-public:
-    CWaitProgress(const QString& lpszText, bool bStart = true);
-    ~CWaitProgress();
-
-    void Start();
-    void Stop();
-    //! @return true to continue, false to abort lengthy operation.
-    bool Step(int nPercentage = -1);
-    void SetText(const QString& lpszText);
-
-protected:
-    void CreateProgressControl();
-
-    QString m_strText;
-    bool m_bStarted;
-    bool m_bIgnore;
-    int m_percent;
-    QProgressBar* m_progressBar;
-    static bool m_bInProgressNow;
-};
-#endif // CRYINCLUDE_EDITOR_WAITPROGRESS_H
diff --git a/Code/Sandbox/Editor/WelcomeScreen/DefaultActiveProject.png b/Code/Sandbox/Editor/WelcomeScreen/DefaultActiveProject.png
deleted file mode 100644
index 89c3a7cd47..0000000000
--- a/Code/Sandbox/Editor/WelcomeScreen/DefaultActiveProject.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:263e95489560dac6e5944ef3caba13e598f83ddead324b943ad7735ba015e1a9
-size 70727
diff --git a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.cpp b/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
deleted file mode 100644
index 5a037c8a98..0000000000
--- a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "WelcomeScreenDialog.h"
-
-// Qt
-#include <QTableWidget>
-#include <QTableWidgetItem>
-#include <QToolTip>
-#include <QMenu>
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QScreen>
-#include <QDesktopWidget>
-#include <QTimer>
-#include <QDateTime>
-
-#include <AzCore/Utils/Utils.h>
-
-// AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
-
-// AzToolsFramework
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-
-// AzQtComponents
-#include <AzQtComponents/Components/Widgets/CheckBox.h>
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-
-// Editor
-#include "Settings.h"
-#include "MainWindow.h"
-#include "CryEdit.h"
-#include "LevelFileDialog.h"
-
-// NewsShared
-#include <NewsShared/ResourceManagement/ResourceManifest.h>     // for News::ResourceManifest
-#include <NewsShared/Qt/ArticleViewContainer.h>                 // for News::ArticleViewContainer
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <WelcomeScreen/ui_WelcomeScreenDialog.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-using namespace AzQtComponents;
-
-#define WMSEVENTNAME "WMSEvent"
-#define WMSEVENTOPERATION "operation"
-
-static int GetSmallestScreenHeight()
-{
-    int smallestHeight = -1;
-    for (QScreen* screen : QApplication::screens())
-    {
-        int screenHeight = screen->availableGeometry().height();
-        if ((smallestHeight < 0) || (smallestHeight > screenHeight))
-        {
-            smallestHeight = screenHeight;
-        }
-    }
-
-    return smallestHeight;
-}
-
-WelcomeScreenDialog::WelcomeScreenDialog(QWidget* pParent)
-    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, pParent), Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint | Qt::WindowTitleHint)
-    , ui(new Ui::WelcomeScreenDialog)
-    , m_pRecentList(nullptr)
-{
-    ui->setupUi(this);
-
-    ui->recentLevelTable->setColumnCount(3);
-    ui->recentLevelTable->setMouseTracking(true);
-    ui->recentLevelTable->setContextMenuPolicy(Qt::CustomContextMenu);
-    ui->recentLevelTable->horizontalHeader()->hide();
-    ui->recentLevelTable->verticalHeader()->hide();
-    ui->recentLevelTable->setSelectionBehavior(QAbstractItemView::SelectRows);
-    ui->recentLevelTable->setSelectionMode(QAbstractItemView::SingleSelection);
-    ui->recentLevelTable->setIconSize(QSize(20, 20));
-    installEventFilter(this);
-
-    auto projectName = AZ::Utils::GetProjectName();
-    ui->currentProjectName->setText(projectName.c_str());
-
-    ui->newLevelButton->setDefault(true);
-
-    // Hide these buttons until the new functionality is added
-    ui->gridButton->hide();
-    ui->objectListButton->hide();
-    ui->switchProjectButton->hide();
-
-    connect(ui->recentLevelTable, &QWidget::customContextMenuRequested, this, &WelcomeScreenDialog::OnShowContextMenu);
-
-    connect(ui->recentLevelTable, &QTableWidget::entered, this, &WelcomeScreenDialog::OnShowToolTip);
-    connect(ui->recentLevelTable, &QTableWidget::clicked, this, &WelcomeScreenDialog::OnRecentLevelTableItemClicked);
-
-    connect(ui->newLevelButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnNewLevelBtnClicked);
-    connect(ui->levelFileLabel, &QLabel::linkActivated, this, &WelcomeScreenDialog::OnNewLevelLabelClicked);
-    connect(ui->openLevelButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnOpenLevelBtnClicked);
-
-    // Adjust the height, if need be
-    // Do it in the constructor so that the WindowDecoratorWrapper handles it correctly
-    int smallestHeight = GetSmallestScreenHeight();
-    if (smallestHeight < geometry().height())
-    {
-        const int SOME_PADDING_IN_PIXELS = 90;
-        int difference = geometry().height() - (smallestHeight - SOME_PADDING_IN_PIXELS);
-
-        QRect newGeometry = geometry().adjusted(0, difference / 2, 0, -difference / 2);
-        setMinimumSize(minimumSize().width(), newGeometry.height());
-        resize(newGeometry.size());
-    }
-
-    m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
-}
-
-
-WelcomeScreenDialog::~WelcomeScreenDialog()
-{
-    delete ui;
-}
-
-void WelcomeScreenDialog::done(int result)
-{
-    QDialog::done(result);
-}
-
-const QString& WelcomeScreenDialog::GetLevelPath()
-{
-    return m_levelPath;
-}
-
-bool WelcomeScreenDialog::eventFilter(QObject *watched, QEvent *event)
-{
-    if (event->type() == QEvent::Show)
-    {
-        ui->recentLevelTable->horizontalHeader()->resizeSection(0, ui->nameLabel->width());
-        ui->recentLevelTable->horizontalHeader()->resizeSection(1, ui->modifiedLabel->width());
-        ui->recentLevelTable->horizontalHeader()->resizeSection(2, ui->typeLabel->width());
-    }
-
-    return QDialog::eventFilter(watched, event);
-}
-
-void WelcomeScreenDialog::SetRecentFileList(RecentFileList* pList)
-{
-    if (!pList)
-    {
-        return;
-    }
-
-    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);
-    gamePath = Path::ToUnixPath(gamePath.toLower());
-    gamePath = Path::AddSlash(gamePath);
-
-    QString sCurDir = (Path::GetEditingGameDataFolder() + QDir::separator().toLatin1()).c_str();
-    int nCurDir = sCurDir.length();
-
-    int recentListSize = pList->GetSize();
-    int currentRow = 0;
-    ui->recentLevelTable->setRowCount(recentListSize);
-     for (int i = 0; i < recentListSize; ++i)
-    {
-        const QString& recentFile = pList->m_arrNames[i];
-        if (recentFile.endsWith(m_levelExtension))
-        {
-            if (CFileUtil::Exists(recentFile, false))
-            {
-                QString sCurEntryDir = recentFile.left(nCurDir);
-                if (sCurEntryDir.compare(sCurDir, Qt::CaseInsensitive) == 0)
-                {
-                    QString fullPath = recentFile;
-                    const QString name = Path::GetFile(fullPath);
-
-                    Path::ConvertSlashToBackSlash(fullPath);
-                    fullPath = Path::ToUnixPath(fullPath.toLower());
-                    fullPath = Path::AddSlash(fullPath);
-
-                    if (fullPath.contains(gamePath))
-                    {
-                        if (gSettings.prefabSystem)
-                        {
-                            QIcon icon;
-                            icon.addFile(QString::fromUtf8(":/Level/level.svg"), QSize(), QIcon::Normal, QIcon::Off);
-                            ui->recentLevelTable->setItem(currentRow, 0, new QTableWidgetItem(icon, name));
-                        }
-                        else
-                        {
-                            ui->recentLevelTable->setItem(currentRow, 0, new QTableWidgetItem(name));
-                        }
-                        QFileInfo file(recentFile);
-                        QDateTime dateTime = file.lastModified();
-                        QString date = QLocale::system().toString(dateTime.date(), QLocale::ShortFormat) + " " +
-                            QLocale::system().toString(dateTime.time(), QLocale::LongFormat);
-                        ui->recentLevelTable->setItem(currentRow, 1, new QTableWidgetItem(date));
-                        ui->recentLevelTable->setItem(currentRow++, 2, new QTableWidgetItem(tr("Level")));
-                        m_levels.push_back(std::make_pair(name, recentFile));
-                    }
-                }
-            }
-        }
-    }
-    ui->recentLevelTable->setRowCount(currentRow);
-    ui->recentLevelTable->setMinimumHeight(currentRow * ui->recentLevelTable->verticalHeader()->defaultSectionSize());
-    ui->recentLevelTable->setMaximumHeight(currentRow * ui->recentLevelTable->verticalHeader()->defaultSectionSize());
-    ui->levelFileLabel->setVisible(currentRow ? false : true);
-
-    ui->recentLevelTable->setCurrentIndex(QModelIndex());
-}
-
-
-void WelcomeScreenDialog::RemoveLevelEntry(int index)
-{
-    TNamePathPair levelPath = m_levels[index];
-
-    ui->recentLevelTable->removeRow(index);
-    m_levels.erase(m_levels.begin() + index);
-
-
-    if (!m_pRecentList)
-    {
-        return;
-    }
-
-    for (int i = 0; i < m_pRecentList->GetSize(); ++i)
-    {
-        QString fullPath = m_pRecentList->m_arrNames[i];
-        QString fullPath2 = levelPath.second;
-
-        // path from recent list
-        Path::ConvertSlashToBackSlash(fullPath);
-        fullPath = Path::ToUnixPath(fullPath.toLower());
-        fullPath = Path::AddPathSlash(fullPath);
-
-        // path from our dashboard list
-        Path::ConvertSlashToBackSlash(fullPath2);
-        fullPath2 = Path::ToUnixPath(fullPath2.toLower());
-        fullPath2 = Path::AddPathSlash(fullPath2);
-
-        if (fullPath == fullPath2)
-        {
-            m_pRecentList->Remove(index);
-            break;
-        }
-    }
-
-    m_pRecentList->WriteList();
-}
-
-
-void WelcomeScreenDialog::OnShowToolTip(const QModelIndex& index)
-{
-    const QString& fullPath = m_levels[index.row()].second;
-
-    QToolTip::showText(QCursor::pos(), QString("Open level: %1").arg(fullPath));
-}
-
-
-void WelcomeScreenDialog::OnShowContextMenu(const QPoint& pos)
-{
-    QModelIndex index = ui->recentLevelTable->indexAt(pos);
-    if (index.isValid())
-    {
-        QString level = ui->recentLevelTable->itemAt(pos)->text();
-
-        QPoint globalPos = ui->recentLevelTable->viewport()->mapToGlobal(pos);
-
-        QMenu contextMenu;
-        contextMenu.addAction(QString("Remove " + level + " from recent list"));
-        QAction* selectedItem = contextMenu.exec(globalPos);
-        if (selectedItem)
-        {
-            RemoveLevelEntry(index.row());
-        }
-    }
-}
-
-void WelcomeScreenDialog::OnNewLevelBtnClicked([[maybe_unused]] bool checked)
-{
-    m_levelPath = "new";
-    accept();
-}
-
-void WelcomeScreenDialog::OnNewLevelLabelClicked([[maybe_unused]] const QString& path)
-{
-    OnNewLevelBtnClicked(true);
-}
-
-void WelcomeScreenDialog::OnOpenLevelBtnClicked([[maybe_unused]] bool checked)
-{
-    CLevelFileDialog dlg(true, this);
-
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        m_levelPath = dlg.GetFileName();
-        accept();
-    }
-}
-
-void WelcomeScreenDialog::OnRecentLevelTableItemClicked(const QModelIndex& modelIndex)
-{
-    int index = modelIndex.row();
-
-    if (index >= 0 && index < m_levels.size())
-    {
-        m_levelPath = m_levels[index].second;
-        accept();
-    }
-}
-
-void WelcomeScreenDialog::OnCloseBtnClicked([[maybe_unused]] bool checked)
-{
-    accept();
-}
-
-void WelcomeScreenDialog::previewAreaScrolled()
-{
-    //this should only be reported once per session
-    if (m_messageScrollReported)
-    {
-        return;
-    }
-    m_messageScrollReported = true;
-}
-
-#include <WelcomeScreen/moc_WelcomeScreenDialog.cpp>
diff --git a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.h b/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.h
deleted file mode 100644
index 363fac57f8..0000000000
--- a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include "NewsShared/LogType.h"
-#include "NewsShared/ErrorCodes.h"
-#endif
-
-namespace News {
-    class ResourceManifest;
-    class ArticleViewContainer;
-}
-
-namespace Ui {
-    class WelcomeScreenDialog;
-}
-
-class QStringListModel;
-class RecentFileList;
-
-class WelcomeScreenDialog
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    WelcomeScreenDialog(QWidget* pParent = nullptr);
-    ~WelcomeScreenDialog();
-
-    const QString& GetLevelPath();
-    void SetRecentFileList(RecentFileList* pList);
-
-    bool eventFilter(QObject *watched, QEvent *event) override;
-
-public Q_SLOTS:
-    void done(int result) override;
-
-private:
-    typedef std::pair<QString, QString> TNamePathPair;
-    typedef std::vector<TNamePathPair> TNameFullPathArray;
-
-    Ui::WelcomeScreenDialog* ui;
-
-    QString m_levelPath;
-    TNameFullPathArray m_levels;
-    RecentFileList* m_pRecentList;
-    const char* m_levelExtension = nullptr;
-    bool m_messageScrollReported = false;
-
-    void RemoveLevelEntry(int index);
-
-    void OnShowToolTip(const QModelIndex& index);
-    void OnShowContextMenu(const QPoint& point);
-    void OnNewLevelBtnClicked(bool checked);
-    void OnNewLevelLabelClicked(const QString& checked);
-    void OnOpenLevelBtnClicked(bool checked);
-    void OnRecentLevelTableItemClicked(const QModelIndex& index);
-    void OnCloseBtnClicked(bool checked);
-
-    void SyncFail(News::ErrorCode error);
-    void SyncSuccess();
-
-private Q_SLOTS:
-    void previewAreaScrolled();
-};
-
diff --git a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.qrc b/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.qrc
deleted file mode 100644
index 9e8ff62f48..0000000000
--- a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-  <qresource prefix="WelcomeScreenDialog">
-    <file>DefaultActiveProject.png</file>
-  </qresource>
-</RCC>
diff --git a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.ui b/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.ui
deleted file mode 100644
index 680b411121..0000000000
--- a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.ui
+++ /dev/null
@@ -1,638 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>WelcomeScreenDialog</class>
- <widget class="QWidget" name="WelcomeScreenDialog">
-  <property name="enabled">
-   <bool>true</bool>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>945</width>
-    <height>639</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>945</width>
-    <height>639</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>945</width>
-    <height>639</height>
-   </size>
-  </property>
-  <property name="focusPolicy">
-   <enum>Qt::TabFocus</enum>
-  </property>
-  <property name="windowTitle">
-   <string>Welcome to O3DE</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true"/>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="bodyContainer">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QWidget" name="articleViewContainerRoot" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>183</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>183</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <layout class="QVBoxLayout" name="newsContainerLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>10</number>
-        </property>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <property name="leftMargin">
-           <number>15</number>
-          </property>
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_2">
-            <property name="spacing">
-             <number>10</number>
-            </property>
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="currentProjectLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Active project</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="activeProjectIcon">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>126</width>
-                <height>167</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>126</width>
-                <height>167</height>
-               </size>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="WelcomeScreenDialog.qrc">:/WelcomeScreenDialog/DefaultActiveProject.png</pixmap>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="currentProjectName">
-              <property name="text">
-               <string>MyGame</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="verticalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <property name="leftMargin">
-           <number>15</number>
-          </property>
-          <property name="rightMargin">
-           <number>15</number>
-          </property>
-          <item>
-           <widget class="QPushButton" name="switchProjectButton">
-            <property name="text">
-             <string>Switch project...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QWidget" name="levelViewFTUEContainer" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>762</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>762</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_12">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <property name="leftMargin">
-         <number>20</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>20</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <item alignment="Qt::AlignTop">
-         <widget class="QWidget" name="levelViewContainer" native="true">
-          <layout class="QVBoxLayout" name="verticalLayout_3">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <property name="leftMargin">
-            <number>16</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>16</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="openALevelLabel">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>48</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>48</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Recent Files</string>
-             </property>
-             <property name="indent">
-              <number>-1</number>
-             </property>
-             <property name="fontStyle" stdset="0">
-              <string>sectionTitle</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QWidget" name="levelViewListContainer" native="true">
-             <layout class="QVBoxLayout" name="levelViewListContainer_layout">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <property name="leftMargin">
-               <number>16</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>0</number>
-              </property>
-              <property name="bottomMargin">
-               <number>0</number>
-              </property>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QWidget" name="horizontalWidget" native="true">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <layout class="QHBoxLayout" name="levelControlContainer">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <property name="leftMargin">
-               <number>0</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>0</number>
-              </property>
-              <property name="bottomMargin">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QPushButton" name="newLevelButton">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>156</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>156</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Create new...</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::Fixed</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>24</width>
-                  <height>0</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QPushButton" name="openLevelButton">
-                <property name="minimumSize">
-                 <size>
-                  <width>156</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>156</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Open...</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QToolButton" name="objectListButton">
-                <property name="text">
-                 <string>...</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc">
-                  <normaloff>:/stylesheet/img/UI20/toolbar/Object_list.svg</normaloff>:/stylesheet/img/UI20/toolbar/Object_list.svg</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>24</width>
-                  <height>24</height>
-                 </size>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="gridButton">
-                <property name="text">
-                 <string>...</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc">
-                  <normaloff>:/stylesheet/img/UI20/toolbar/Grid.svg</normaloff>:/stylesheet/img/UI20/toolbar/Grid.svg</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>24</width>
-                  <height>24</height>
-                 </size>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <spacer name="verticalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="2,2,1">
-             <property name="leftMargin">
-              <number>6</number>
-             </property>
-             <item>
-              <widget class="QLabel" name="nameLabel">
-               <property name="text">
-                <string>Name</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="modifiedLabel">
-               <property name="text">
-                <string>Last modified</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="typeLabel">
-               <property name="text">
-                <string>Type</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0,0">
-          <property name="leftMargin">
-           <number>16</number>
-          </property>
-          <property name="topMargin">
-           <number>16</number>
-          </property>
-          <property name="rightMargin">
-           <number>16</number>
-          </property>
-          <item>
-           <widget class="QLabel" name="levelFileLabel">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>No level file created yet for this project. &lt;a href=&quot;#&quot;&gt;Create one&lt;/a&gt; now.</string>
-            </property>
-            <property name="textFormat">
-             <enum>Qt::RichText</enum>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QTableWidget" name="recentLevelTable">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="styleSheet">
-             <string notr="true"/>
-            </property>
-            <property name="horizontalScrollBarPolicy">
-             <enum>Qt::ScrollBarAlwaysOff</enum>
-            </property>
-            <property name="columnCount">
-             <number>3</number>
-            </property>
-            <attribute name="horizontalHeaderVisible">
-             <bool>false</bool>
-            </attribute>
-            <attribute name="horizontalHeaderStretchLastSection">
-             <bool>false</bool>
-            </attribute>
-            <attribute name="verticalHeaderVisible">
-             <bool>false</bool>
-            </attribute>
-            <attribute name="verticalHeaderMinimumSectionSize">
-             <number>1</number>
-            </attribute>
-            <attribute name="verticalHeaderDefaultSectionSize">
-             <number>48</number>
-            </attribute>
-            <attribute name="verticalHeaderHighlightSections">
-             <bool>false</bool>
-            </attribute>
-            <attribute name="verticalHeaderStretchLastSection">
-             <bool>false</bool>
-            </attribute>
-            <column/>
-            <column/>
-            <column/>
-           </widget>
-          </item>
-          <item>
-           <spacer name="verticalSpacer_4">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="Line" name="line_4">
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>1</height>
-           </size>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">color: &quot;black&quot;</string>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Plain</enum>
-          </property>
-          <property name="lineWidth">
-           <number>0</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="WelcomeScreenDialog.qrc"/>
-  <include location="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/Code/Sandbox/Editor/WinWidgetId.h b/Code/Sandbox/Editor/WinWidgetId.h
deleted file mode 100644
index c6b65e4d61..0000000000
--- a/Code/Sandbox/Editor/WinWidgetId.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-enum class WinWidgetId
-{
-    NONE = 0,
-    ACTIVE_DEPLOYMENT,
-    PROFILE_SELECTOR,
-    ADD_PROFILE,
-    INITIALIZE_PROJECT,
-    // ALL VALIDS ABOVE HERE
-    NUM_WIN_WIDGET_IDS
-};
diff --git a/Code/Sandbox/Editor/WindowObserver_mac.h b/Code/Sandbox/Editor/WindowObserver_mac.h
deleted file mode 100644
index 6832fef2f0..0000000000
--- a/Code/Sandbox/Editor/WindowObserver_mac.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <objc/objc.h>
-#include <QObject>
-
-class QWindow;
-
-namespace Editor
-{
-    class WindowObserver
-        : public QObject
-    {
-        Q_OBJECT
-    public:
-        explicit WindowObserver(QWindow* window, QObject* parent);
-
-        virtual ~WindowObserver();
-
-    public slots:
-        void setWindowIsMoving(bool isMoving);
-        void setWindowIsResizing(bool isResizing);
-
-    signals:
-        void windowIsMovingOrResizingChanged(bool isMovingOrResizing);
-
-    private:
-        bool m_windowIsMoving;
-        bool m_windowIsResizing;
-
-        id m_windowObserver;
-    };
-} // namespace editor
diff --git a/Code/Sandbox/Editor/WindowObserver_mac.mm b/Code/Sandbox/Editor/WindowObserver_mac.mm
deleted file mode 100644
index 3a8276f967..0000000000
--- a/Code/Sandbox/Editor/WindowObserver_mac.mm
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "WindowObserver_mac.h"
-
-#include <AppKit/AppKit.h>
-
-#include <QApplication>
-#include <QtGui/qpa/qplatformnativeinterface.h>
-
-
-@interface NSWindowObserver : NSObject
-{
-    Editor::WindowObserver* m_observer;
-    NSWindow* m_window;
-}
-@end
-
-@implementation NSWindowObserver
-
-- (id)initWithWindow:(NSWindow*)window :(Editor::WindowObserver*)observer
-{
-    if ((self = [super init])) {
-        m_observer = observer;
-        m_window = window;
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(onWindowWillMove)
-                                                     name:NSWindowWillMoveNotification
-                                                   object:m_window];
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(onWindowDidMove)
-                                                     name:NSWindowDidMoveNotification
-                                                   object:m_window];
-
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(onWindowWillStartLiveResize)
-                                                     name:NSWindowWillStartLiveResizeNotification
-                                                   object:m_window];
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(onWindowDidLiveResize)
-                                                     name:NSWindowDidEndLiveResizeNotification
-                                                   object:m_window];
-
-    }
-    return self;
-}
-
--(void) dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    [super dealloc];
-}
-
-- (void)onWindowWillMove
-{
-    m_observer->setWindowIsMoving(true);
-    // This notification only indicates that the window is likely to move because the used clicked
-    // the title bar. If the user releases the mouse without moving the title bar we won't receive
-    // a NSWindowDidMoveNotification, so we add an additional observer to check the state of the
-    // mouse. Note that we don't care whether the window moved or not, we just want to be able to
-    // disable rendering when it is likely
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(onWindowDidUpdate:)
-                                                 name:NSWindowDidUpdateNotification
-                                               object:m_window];
-}
-
-- (void)onWindowDidMove
-{
-    m_observer->setWindowIsMoving(false);
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:NSWindowDidUpdateNotification
-                                                  object:m_window];
-}
-
-- (void)onWindowDidUpdate:(NSNotification*)notification
-{
-    static const unsigned long leftMouseButton = 1;  // a value of 1 << 0 corresponds to the left mouse button
-
-    if (([NSEvent pressedMouseButtons] & leftMouseButton) == 0)
-    {
-        m_observer->setWindowIsMoving(false);
-        [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                        name:NSWindowDidUpdateNotification
-                                                      object:m_window];
-    }
-}
-
-- (void)onWindowWillStartLiveResize
-{
-    m_observer->setWindowIsResizing(true);
-}
-
-- (void)onWindowDidLiveResize
-{
-    m_observer->setWindowIsResizing(false);
-}
-
-@end
-
-namespace Editor
-{
-    WindowObserver::WindowObserver(QWindow* window, QObject* parent)
-        : QObject(parent)
-        , m_windowIsMoving(false)
-        , m_windowIsResizing(false)
-        , m_windowObserver(nullptr)
-    {
-        if (!window)
-        {
-            return;
-        }
-
-        QPlatformNativeInterface* nativeInterface = QApplication::platformNativeInterface();
-        NSWindow* nsWindow = static_cast<NSWindow*>(nativeInterface->nativeResourceForWindow("nswindow", window));
-        if (nsWindow == nullptr)
-        {
-            return;
-        }
-
-        m_windowObserver = [[NSWindowObserver alloc] initWithWindow:nsWindow:this];
-    }
-
-    WindowObserver::~WindowObserver()
-    {
-        if (m_windowObserver != nil)
-        {
-            [m_windowObserver release];
-            m_windowObserver = nil;
-        }
-    }
-
-    void WindowObserver::setWindowIsMoving(bool isMoving)
-    {
-        if (isMoving == m_windowIsMoving)
-        {
-            return;
-        }
-
-        const bool wasMovingOrResizing = m_windowIsMoving || m_windowIsResizing;
-        m_windowIsMoving = isMoving;
-        const bool isMovingOrResizing = m_windowIsMoving || m_windowIsResizing;
-
-        if (isMovingOrResizing != wasMovingOrResizing)
-        {
-            emit windowIsMovingOrResizingChanged(isMovingOrResizing);
-        }
-    }
-
-    void WindowObserver::setWindowIsResizing(bool isResizing)
-    {
-        if (isResizing == m_windowIsResizing)
-        {
-            return;
-        }
-
-        const bool wasMovingOrResizing = m_windowIsMoving || m_windowIsResizing;
-        m_windowIsResizing = isResizing;
-        const bool isMovingOrResizing = m_windowIsMoving || m_windowIsResizing;
-
-        if (isMovingOrResizing != wasMovingOrResizing)
-        {
-            emit windowIsMovingOrResizingChanged(isMovingOrResizing);
-        }
-    }
-}
-
-#include <moc_WindowObserver_mac.cpp>
diff --git a/Code/Sandbox/Editor/WipFeatureManager.cpp b/Code/Sandbox/Editor/WipFeatureManager.cpp
deleted file mode 100644
index f060064c1b..0000000000
--- a/Code/Sandbox/Editor/WipFeatureManager.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "WipFeatureManager.h"
-
-#ifdef USE_WIP_FEATURES_MANAGER
-#include "WipFeaturesDlg.h"
-
-#if defined(AZ_PLATFORM_WINDOWS)
-const char* CWipFeatureManager::kWipFeaturesFilename = "@user@\\Editor\\UI\\WipFeatures.xml";
-#else
-const char* CWipFeatureManager::kWipFeaturesFilename = "@user@/Editor/UI/WipFeatures.xml";
-#endif
-CWipFeatureManager* CWipFeatureManager::s_pInstance = NULL;
-
-static void WipFeatureVarChange(ICVar* pVar)
-{
-    QString strParams = pVar->GetString();
-    QStringList params;
-
-    SplitString(strParams, params, ' ');
-
-    if (strParams == "edit")
-    {
-        static CWipFeaturesDlg dlg;
-
-        dlg.show();
-
-        return;
-    }
-
-    if (params.size() >= 2)
-    {
-        QString featName = params[0].trimmed();
-        QString attr = params[1].trimmed();
-
-        if (featName.isEmpty())
-        {
-            return;
-        }
-
-        int id = featName.toInt();
-
-        // if all features
-        if (featName == "*")
-        {
-            if (attr == "enable")
-            {
-                CWipFeatureManager::Instance()->EnableAllFeatures(true);
-            }
-            else
-            if (attr == "disable")
-            {
-                CWipFeatureManager::Instance()->EnableAllFeatures(false);
-            }
-            else
-            if (attr == "hide")
-            {
-                CWipFeatureManager::Instance()->ShowAllFeatures(false);
-            }
-            else
-            if (attr == "show")
-            {
-                CWipFeatureManager::Instance()->ShowAllFeatures(true);
-            }
-            else
-            if (attr == "safemode")
-            {
-                CWipFeatureManager::Instance()->SetAllFeaturesSafeMode(true);
-            }
-            else
-            if (attr == "fullmode")
-            {
-                CWipFeatureManager::Instance()->SetAllFeaturesSafeMode(false);
-            }
-            else
-            {
-                CWipFeatureManager::Instance()->SetAllFeaturesParams(attr.toUtf8().data());
-            }
-
-            return;
-        }
-
-        if (attr == "enable")
-        {
-            CWipFeatureManager::Instance()->EnableFeature(id, true);
-        }
-        else
-        if (attr == "disable")
-        {
-            CWipFeatureManager::Instance()->EnableFeature(id, false);
-        }
-        else
-        if (attr == "hide")
-        {
-            CWipFeatureManager::Instance()->ShowFeature(id, false);
-        }
-        else
-        if (attr == "show")
-        {
-            CWipFeatureManager::Instance()->ShowFeature(id, true);
-        }
-        else
-        if (attr == "safemode")
-        {
-            CWipFeatureManager::Instance()->SetFeatureSafeMode(id, true);
-        }
-        else
-        if (attr == "fullmode")
-        {
-            CWipFeatureManager::Instance()->SetFeatureSafeMode(id, false);
-        }
-        else
-        {
-            CWipFeatureManager::Instance()->SetFeatureParams(id, attr.toUtf8().data());
-        }
-    }
-}
-
-CWipFeatureManager::CWipFeatureManager()
-{
-    m_bEnabled = true;
-}
-
-CWipFeatureManager::~CWipFeatureManager()
-{
-}
-
-bool CWipFeatureManager::Init(bool bLoadXml)
-{
-    if (!gEnv)
-    {
-        return false;
-    }
-
-    IConsole* pConsole = gEnv->pConsole;
-
-    if (!pConsole)
-    {
-        return false;
-    }
-
-    REGISTER_CVAR2_CB("e_wipfeature", (const char**)&CWipFeatureManager::Instance()->m_consoleCmdParams, "", VF_ALWAYSONCHANGE | VF_CHEAT, "wipfeature <featureName> enable|disable|hide|show|safemode|fullmode", WipFeatureVarChange);
-
-    if (bLoadXml)
-    {
-        CWipFeatureManager::Instance()->Load();
-    }
-
-    return true;
-}
-
-void CWipFeatureManager::Shutdown()
-{
-    CWipFeatureManager::Instance()->Save();
-    delete s_pInstance;
-    s_pInstance = NULL;
-}
-
-bool CWipFeatureManager::Load(const char* pFilename, bool bClearExisting)
-{
-    if (!GetISystem())
-    {
-        return false;
-    }
-
-    XmlNodeRef root = GetISystem()->LoadXmlFromFile(pFilename);
-
-    if (!root)
-    {
-        return false;
-    }
-
-    if (bClearExisting)
-    {
-        m_features.clear();
-    }
-
-    Log("Loading WIP features file: '%s'...", pFilename);
-
-    for (size_t i = 0, iCount = root->getChildCount(); i < iCount; ++i)
-    {
-        SWipFeatureInfo wf;
-        XmlNodeRef node = root->getChild(i);
-        XmlString str;
-
-        node->getAttr("id", wf.m_id);
-        node->getAttr("displayName", str);
-        wf.m_displayName = str;
-        node->getAttr("visible", wf.m_bVisible);
-        node->getAttr("enabled", wf.m_bEnabled);
-        node->getAttr("safeMode", wf.m_bSafeMode);
-        node->getAttr("params", str);
-        wf.m_params = str;
-        wf.m_bLoadedFromXml = true;
-
-        TWipFeatures::iterator iter = m_features.find(wf.m_id);
-
-        if (iter == m_features.end())
-        {
-            m_features[wf.m_id] = wf;
-        }
-        else
-        {
-            m_features[wf.m_id].m_bVisible = wf.m_bVisible;
-            m_features[wf.m_id].m_bEnabled = wf.m_bEnabled;
-            m_features[wf.m_id].m_bSafeMode = wf.m_bSafeMode;
-            m_features[wf.m_id].m_params = wf.m_params;
-        }
-    }
-
-    Log("Loaded %d WIP features.", m_features.size());
-
-    return true;
-}
-
-bool CWipFeatureManager::Save(const char* pFilename)
-{
-    if (!gEnv)
-    {
-        return false;
-    }
-
-    if (!GetISystem())
-    {
-        return false;
-    }
-
-    ISystem* pISystem = GetISystem();
-
-    XmlNodeRef root = pISystem->CreateXmlNode("features");
-
-    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
-    {
-        SWipFeatureInfo& wf = iter->second;
-        XmlNodeRef node = root->createNode("feature");
-
-        node->setAttr("id", wf.m_id);
-        node->setAttr("displayName", wf.m_displayName.c_str());
-        node->setAttr("visible", wf.m_bVisible);
-        node->setAttr("enabled", wf.m_bEnabled);
-        node->setAttr("safeMode", wf.m_bSafeMode);
-        node->setAttr("params", wf.m_params.c_str());
-
-        root->addChild(node);
-    }
-
-    root->saveToFile(pFilename);
-
-    return true;
-}
-
-int CWipFeatureManager::RegisterFeature(const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams, bool bSaveToXml)
-{
-    int aMaxId = -1;
-
-    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
-    {
-        if (iter->first > aMaxId)
-        {
-            aMaxId = iter->first;
-        }
-    }
-
-    ++aMaxId;
-    SetFeature(aMaxId, pDisplayName, bVisible, bEnabled, bSafeMode, pParams, bSaveToXml);
-
-    return aMaxId;
-}
-
-void CWipFeatureManager::SetFeature(int aFeatureId, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams, bool bSaveToXml)
-{
-    m_features[aFeatureId].m_id = aFeatureId;
-    m_features[aFeatureId].m_displayName = pDisplayName;
-    m_features[aFeatureId].m_bVisible = bVisible;
-    m_features[aFeatureId].m_bEnabled = bEnabled;
-    m_features[aFeatureId].m_bSafeMode = bSafeMode;
-    m_features[aFeatureId].m_bSaveToXml = bSaveToXml;
-    m_features[aFeatureId].m_params = pParams;
-
-    if (m_features[aFeatureId].m_pfnUpdateFeature)
-    {
-        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, &bVisible, &bEnabled, &bSafeMode, pParams);
-    }
-}
-
-void CWipFeatureManager::SetDefaultFeatureStates(int aFeatureId, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams)
-{
-    TWipFeatures::iterator iter = m_features.find(aFeatureId);
-
-    // set feature if not existing
-    if (iter == m_features.end() || (iter != m_features.end() && !iter->second.m_bLoadedFromXml))
-    {
-        m_features[aFeatureId].m_id = aFeatureId;
-        m_features[aFeatureId].m_displayName = pDisplayName;
-        m_features[aFeatureId].m_bVisible = bVisible;
-        m_features[aFeatureId].m_bEnabled = bEnabled;
-        m_features[aFeatureId].m_bSafeMode = bSafeMode;
-        m_features[aFeatureId].m_params = pParams;
-    }
-    else
-    if (iter != m_features.end() && iter->second.m_bLoadedFromXml)
-    {
-        m_features[aFeatureId].m_id = aFeatureId;
-        m_features[aFeatureId].m_displayName = pDisplayName;
-    }
-
-    if (m_features[aFeatureId].m_pfnUpdateFeature)
-    {
-        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, &bVisible, &bEnabled, &bSafeMode, pParams);
-    }
-}
-
-bool CWipFeatureManager::IsFeatureVisible(int aFeatureId)
-{
-    return m_features[aFeatureId].m_bVisible || !m_bEnabled;
-}
-
-bool CWipFeatureManager::IsFeatureEnabled(int aFeatureId)
-{
-    return m_features[aFeatureId].m_bEnabled || !m_bEnabled;
-}
-
-bool CWipFeatureManager::IsFeatureInSafeMode(int aFeatureId)
-{
-    if (!m_bEnabled)
-    {
-        return false;
-    }
-
-    return m_features[aFeatureId].m_bSafeMode;
-}
-
-const char* CWipFeatureManager::GetFeatureParams(int aFeatureId)
-{
-    return m_features[aFeatureId].m_params.c_str();
-}
-
-void CWipFeatureManager::ShowFeature(int aFeatureId, bool bShow)
-{
-    m_features[aFeatureId].m_bVisible = bShow;
-
-    if (m_features[aFeatureId].m_pfnUpdateFeature)
-    {
-        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, &bShow, NULL, NULL, NULL);
-    }
-}
-
-void CWipFeatureManager::EnableFeature(int aFeatureId, bool bEnable)
-{
-    m_features[aFeatureId].m_bEnabled = bEnable;
-
-    if (m_features[aFeatureId].m_pfnUpdateFeature)
-    {
-        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, &bEnable, NULL, NULL);
-    }
-}
-
-void CWipFeatureManager::SetFeatureSafeMode(int aFeatureId, bool bSafeMode)
-{
-    m_features[aFeatureId].m_bSafeMode = bSafeMode;
-
-    if (m_features[aFeatureId].m_pfnUpdateFeature)
-    {
-        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, NULL, &bSafeMode, NULL);
-    }
-}
-
-void CWipFeatureManager::SetFeatureParams(int aFeatureId, const char* pParams)
-{
-    m_features[aFeatureId].m_params = pParams;
-
-    if (m_features[aFeatureId].m_pfnUpdateFeature)
-    {
-        m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, NULL, NULL, pParams);
-    }
-}
-
-void CWipFeatureManager::ShowAllFeatures(bool bShow)
-{
-    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
-    {
-        iter->second.m_bVisible = bShow;
-
-        if (iter->second.m_pfnUpdateFeature)
-        {
-            iter->second.m_pfnUpdateFeature(iter->first, &bShow, NULL, NULL, NULL);
-        }
-    }
-}
-
-void CWipFeatureManager::EnableAllFeatures(bool bEnable)
-{
-    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
-    {
-        iter->second.m_bEnabled = bEnable;
-
-        if (iter->second.m_pfnUpdateFeature)
-        {
-            iter->second.m_pfnUpdateFeature(iter->first, NULL, &bEnable, NULL, NULL);
-        }
-    }
-}
-
-void CWipFeatureManager::SetAllFeaturesSafeMode(bool bSafeMode)
-{
-    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
-    {
-        iter->second.m_bSafeMode = bSafeMode;
-
-        if (iter->second.m_pfnUpdateFeature)
-        {
-            iter->second.m_pfnUpdateFeature(iter->first, NULL, NULL, &bSafeMode, NULL);
-        }
-    }
-}
-
-void CWipFeatureManager::SetAllFeaturesParams(const char* pParams)
-{
-    for (TWipFeatures::iterator iter = m_features.begin(), iterEnd = m_features.end(); iter != iterEnd; ++iter)
-    {
-        iter->second.m_params = pParams;
-
-        if (iter->second.m_pfnUpdateFeature)
-        {
-            iter->second.m_pfnUpdateFeature(iter->first, NULL, NULL, NULL, pParams);
-        }
-    }
-}
-
-void CWipFeatureManager::EnableManager(bool bEnable)
-{
-    m_bEnabled = bEnable;
-}
-
-void CWipFeatureManager::SetFeatureUpdateCallback(int aFeatureId, TWipFeatureUpdateCallback pfnUpdate)
-{
-    m_features[aFeatureId].m_pfnUpdateFeature = pfnUpdate;
-}
-
-std::map<int, CWipFeatureManager::SWipFeatureInfo>&  CWipFeatureManager::GetFeatures()
-{
-    return m_features;
-}
-
-#endif
diff --git a/Code/Sandbox/Editor/WipFeatureManager.h b/Code/Sandbox/Editor/WipFeatureManager.h
deleted file mode 100644
index 5c563e4664..0000000000
--- a/Code/Sandbox/Editor/WipFeatureManager.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_WIPFEATUREMANAGER_H
-#define CRYINCLUDE_EDITOR_WIPFEATUREMANAGER_H
-#pragma once
-
-/*
-    This class is used to control work in progress features at runtime, so QA can test even if the end user will not see those features
-    You can use the console command: e_wipfeature <numeric featureId> enable|disable|hide|show|safemode|fullmode
-    ******************************************************************************************************************************************
-    *** GOOD TO KNOW: "e_wipfeature edit" console command will display the WIP dialog and you can control the features from there
-    ******************************************************************************************************************************************
-*/
-
-// undef this define to spot all wip feature usages within the editor at compile time
-#define USE_WIP_FEATURES_MANAGER
-
-#ifdef USE_WIP_FEATURES_MANAGER
-
-// use this to register new wip features, usage from inside functions
-// @param id is the numeric unique id of the feature, its good to have all feature ids in an enum in one file
-// @param bVisible is the feature visible by default
-// @param bEnabled is the feature enabled (usually visual enable like non-grayed) by default
-// @param bSafeMode is the feature operating in some sort of safe mode (the safe mode behavior defined by the feature itself)
-// @param pTWipFeatureUpdateCallback callback of type TWipFeatureUpdateCallback for when a feature state (visible,enabled and so on) was modified
-#define REGISTER_WIP_FEATURE(id, bVisible, bEnabled, bSafeMode, pTWipFeatureUpdateCallback) \
-    static CWipFeatureManager::CWipFeatureRegisterer s_wipFeatureRegisterer_##id(id, ""#id, bVisible, bEnabled, bSafeMode, pTWipFeatureUpdateCallback);
-
-#define IS_WIP_FEATURE_VISIBLE(id) CWipFeatureManager::Instance()->IsFeatureVisible(id)
-#define IS_WIP_FEATURE_ENABLED(id) CWipFeatureManager::Instance()->IsFeatureEnabled(id)
-#define IS_WIP_FEATURE_SAFEMODE(id) CWipFeatureManager::Instance()->IsFeatureInSafeMode(id)
-
-// The feature manager singleton itself
-class CWipFeatureManager
-{
-public:
-
-    static const char* kWipFeaturesFilename;
-
-    // Used to register a callback function to update the state of features whitin the editor
-    // pbVisible, pbEnabled, pbSafeMode, pParams - if the pointer is NULL, then that attribute was not changed
-    typedef void (* TWipFeatureUpdateCallback)(int aFeatureId, const bool* const pbVisible, const bool* const pbEnabled, const bool* const pbSafeMode, const char* pParams);
-
-    // wip feature registerer auto create object, used for static auto feature creation with the REGISTER_WIP_FEATURE macro
-    class CWipFeatureRegisterer
-    {
-    public:
-
-        CWipFeatureRegisterer(int id, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, TWipFeatureUpdateCallback pTWipFeatureUpdateCallback)
-        {
-            CWipFeatureManager::Instance()->SetFeatureUpdateCallback(id, pTWipFeatureUpdateCallback);
-            CWipFeatureManager::Instance()->SetDefaultFeatureStates(id, pDisplayName, bVisible, bEnabled, bSafeMode);
-        }
-    };
-
-    struct SWipFeatureInfo
-    {
-        SWipFeatureInfo()
-            : m_id(0)
-            , m_displayName("")
-            , m_bVisible(true)
-            , m_bEnabled(true)
-            , m_bSafeMode(false)
-            , m_pfnUpdateFeature(NULL)
-            , m_bLoadedFromXml(false)
-        {}
-
-        int         m_id;
-        string  m_displayName, m_params;
-        bool        m_bVisible, m_bEnabled, m_bSafeMode,
-        // if true, this feature will be saved into the xml file when Save(...) will be called
-                    m_bSaveToXml, m_bLoadedFromXml;
-        TWipFeatureUpdateCallback   m_pfnUpdateFeature;
-    };
-
-    typedef std::map<int, SWipFeatureInfo> TWipFeatures;
-
-private:
-
-    CWipFeatureManager();
-    ~CWipFeatureManager();
-
-    static CWipFeatureManager* s_pInstance;
-
-public:
-
-    static CWipFeatureManager* Instance()
-    {
-        if (!s_pInstance)
-        {
-            s_pInstance = new CWipFeatureManager();
-            assert(s_pInstance);
-        }
-
-        return s_pInstance;
-    }
-
-    static bool Init(bool bLoadXml = true);
-    static void Shutdown();
-
-    bool Load(const char* pFilename = kWipFeaturesFilename, bool bClearExisting = true);
-    bool Save(const char* pFilename = kWipFeaturesFilename);
-
-    // Register a new feature
-    // @return a new feature ID
-    int     RegisterFeature(const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams = "", bool bSaveToXml = true);
-    // Set an existing feature
-    void    SetFeature(int aFeatureId, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams = "", bool bSaveToXml = true);
-    // Create a new feature, but it will take into account the existing feature info from the loaded XML file, with persistent settings, if any
-    void    SetDefaultFeatureStates(int aFeatureId, const char* pDisplayName, bool bVisible, bool bEnabled, bool bSafeMode, const char* pParams = "");
-    bool    IsFeatureVisible(int aFeatureId);
-    bool    IsFeatureEnabled(int aFeatureId);
-    bool    IsFeatureInSafeMode(int aFeatureId);
-    const char* GetFeatureParams(int aFeatureId);
-
-    void ShowFeature(int aFeatureId, bool bShow = true);
-    void EnableFeature(int aFeatureId, bool bEnable = true);
-    void SetFeatureSafeMode(int aFeatureId, bool bSafeMode);
-    void SetFeatureParams(int aFeatureId, const char* pParams);
-
-    void ShowAllFeatures(bool bShow = true);
-    void EnableAllFeatures(bool bEnable = true);
-    void SetAllFeaturesSafeMode(bool bSafeMode);
-    void SetAllFeaturesParams(const char* pParams);
-
-    // if manager is disabled, then all queries about feature enable/visible/fullmode states will return true always
-    void EnableManager(bool bEnable = true);
-
-    void SetFeatureUpdateCallback(int aFeatureId, TWipFeatureUpdateCallback pfnUpdate);
-    TWipFeatures&   GetFeatures();
-
-private:
-
-    static const int kMaxWipCmdSize = 200;
-
-    TWipFeatures    m_features;
-    char                    m_consoleCmdParams[kMaxWipCmdSize];
-    bool                    m_bEnabled;
-};
-
-#else
-
-//
-// no WIP feature manager in production build
-//
-#define REGISTER_WIP_FEATURE
-#define IS_WIP_FEATURE_VISIBLE(id) true
-#define IS_WIP_FEATURE_ENABLED(id) true
-#define IS_WIP_FEATURE_SAFEMODE(id) true
-
-#endif //USE_WIP_FEATURES_MANAGER
-#endif // CRYINCLUDE_EDITOR_WIPFEATUREMANAGER_H
diff --git a/Code/Sandbox/Editor/WipFeaturesDlg.cpp b/Code/Sandbox/Editor/WipFeaturesDlg.cpp
deleted file mode 100644
index aae1073955..0000000000
--- a/Code/Sandbox/Editor/WipFeaturesDlg.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "WipFeatureManager.h"
-
-#include "WipFeaturesDlg.h"
-
-// Qt
-#include <QDialog>
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include "ui_WipFeaturesDlg.h"
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-#ifdef USE_WIP_FEATURES_MANAGER
-
-// CWipFeaturesDlg dialog
-
-class WipFeaturesModel
-    : public QAbstractTableModel
-{
-public:
-    WipFeaturesModel(QObject* parent = nullptr)
-        : QAbstractTableModel(parent)
-    {
-    }
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        return parent.isValid() ? 0 : CWipFeatureManager::Instance()->GetFeatures().size();
-    }
-
-    int columnCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        return parent.isValid() ? 0 : 5;
-    }
-
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override
-    {
-        if (orientation != Qt::Horizontal || section >= columnCount())
-        {
-            return QVariant();
-        }
-
-
-        switch (role)
-        {
-        case Qt::TextAlignmentRole:
-            return section == 0 ? Qt::AlignLeft : Qt::AlignCenter;
-        case Qt::DisplayRole:
-            switch (section)
-            {
-            case 0:
-                return tr("Name");
-            case 1:
-                return tr("Id");
-            case 2:
-                return tr("Visible");
-            case 3:
-                return tr("Enabled");
-            case 4:
-                return tr("SafeMode");
-            default:
-                return QVariant();
-            }
-        default:
-            return QVariant();
-        }
-    }
-
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override
-    {
-        if (!index.isValid() || index.column() >= columnCount(index.parent()) || index.row() >= rowCount(index.parent()))
-        {
-            return false;
-        }
-
-        if (role != Qt::EditRole || !value.canConvert<bool>())
-        {
-            return false;
-        }
-
-        auto it = CWipFeatureManager::Instance()->GetFeatures().begin();
-        std::advance(it, index.row());
-
-        auto id = it->first;
-
-        switch (index.column())
-        {
-        case 2:
-            CWipFeatureManager::Instance()->ShowFeature(id, value.toBool());
-            break;
-        case 3:
-            CWipFeatureManager::Instance()->EnableFeature(id, value.toBool());
-            break;
-        case 4:
-            CWipFeatureManager::Instance()->SetFeatureSafeMode(id, value.toBool());
-            break;
-        default:
-            return false;
-        }
-
-        emit dataChanged(index, index);
-        return true;
-    }
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
-    {
-        if (!index.isValid() || index.column() >= columnCount(index.parent()) || index.row() >= rowCount(index.parent()))
-        {
-            return QVariant();
-        }
-
-        if (role == Qt::TextAlignmentRole)
-        {
-            return headerData(index.column(), Qt::Horizontal, role);
-        }
-
-        if (role != Qt::DisplayRole)
-        {
-            return QVariant();
-        }
-
-        auto it = CWipFeatureManager::Instance()->GetFeatures().begin();
-        std::advance(it, index.row());
-
-        auto feature = it->second;
-
-        switch (index.column())
-        {
-        case 0:
-            return QString(feature.m_displayName.c_str());
-        case 1:
-            return feature.m_id;
-        case 2:
-            return feature.m_bVisible ? tr("X") : QString();
-        case 3:
-            return feature.m_bEnabled ? tr("X") : QString();
-        case 4:
-            return feature.m_bSafeMode ? tr("X") : QString();
-        default:
-            return QVariant();
-        }
-    }
-};
-
-CWipFeaturesDlg::CWipFeaturesDlg(QWidget* pParent /*=NULL*/)
-    : QDialog(pParent)
-    , m_ui(new Ui::WipFeaturesDlg)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    setFixedSize(size());
-
-    OnInitDialog();
-
-    connect(m_ui->buttonShow, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonShow);
-    connect(m_ui->buttonHide, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonHide);
-    connect(m_ui->buttonEnable, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonEnable);
-    connect(m_ui->buttonDisable, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonDisable);
-    connect(m_ui->buttonSafeMode, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonSafemode);
-    connect(m_ui->buttonNormalMode, &QPushButton::clicked, this, &CWipFeaturesDlg::OnBnClickedButtonNormalmode);
-}
-
-CWipFeaturesDlg::~CWipFeaturesDlg()
-{
-}
-
-// CWipFeaturesDlg message handlers
-
-void CWipFeaturesDlg::OnInitDialog()
-{
-    m_ui->m_lstFeatures->setModel(new WipFeaturesModel(this));
-    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(0, 300);
-    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(1, 70);
-    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(2, 70);
-    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(3, 70);
-    m_ui->m_lstFeatures->horizontalHeader()->resizeSection(4, 70);
-}
-
-void CWipFeaturesDlg::OnBnClickedButtonShow()
-{
-    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
-    {
-        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 2), true);
-    }
-}
-
-void CWipFeaturesDlg::OnBnClickedButtonHide()
-{
-    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
-    {
-        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 2), false);
-    }
-}
-
-void CWipFeaturesDlg::OnBnClickedButtonEnable()
-{
-    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
-    {
-        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 3), true);
-    }
-}
-
-void CWipFeaturesDlg::OnBnClickedButtonDisable()
-{
-    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
-    {
-        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 3), false);
-    }
-}
-
-void CWipFeaturesDlg::OnBnClickedButtonSafemode()
-{
-    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
-    {
-        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 4), true);
-    }
-}
-
-void CWipFeaturesDlg::OnBnClickedButtonNormalmode()
-{
-    for (auto index : m_ui->m_lstFeatures->selectionModel()->selectedRows())
-    {
-        m_ui->m_lstFeatures->model()->setData(index.sibling(index.row(), 4), false);
-    }
-}
-
-#include <moc_WipFeaturesDlg.cpp>
-
-#endif // USE_WIP_FEATURES_MANAGER
diff --git a/Code/Sandbox/Editor/WipFeaturesDlg.h b/Code/Sandbox/Editor/WipFeaturesDlg.h
deleted file mode 100644
index 966df27033..0000000000
--- a/Code/Sandbox/Editor/WipFeaturesDlg.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_EDITOR_WIPFEATURESDLG_H
-#define CRYINCLUDE_EDITOR_WIPFEATURESDLG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-#ifdef USE_WIP_FEATURES_MANAGER
-
-// CWipFeaturesDlg dialog
-
-namespace Ui
-{
-    class WipFeaturesDlg;
-}
-
-class CWipFeaturesDlg
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CWipFeaturesDlg(QWidget* pParent = NULL);   // standard constructor
-    virtual ~CWipFeaturesDlg();
-
-private:
-    void OnInitDialog();
-    void OnBnClickedButtonShow();
-    void OnBnClickedButtonHide();
-    void OnBnClickedButtonEnable();
-    void OnBnClickedButtonDisable();
-    void OnBnClickedButtonSafemode();
-    void OnBnClickedButtonNormalmode();
-
-private:
-    QScopedPointer<Ui::WipFeaturesDlg> m_ui;
-};
-
-#else
-
-class CWipFeaturesDlg
-    : public QDialog
-{
-    Q_OBJECT
-};
-
-#endif // USE_WIP_FEATURES_MANAGER
-
-#endif // CRYINCLUDE_EDITOR_WIPFEATURESDLG_H
diff --git a/Code/Sandbox/Editor/editor_core_files.cmake b/Code/Sandbox/Editor/editor_core_files.cmake
deleted file mode 100644
index 360d23e9fd..0000000000
--- a/Code/Sandbox/Editor/editor_core_files.cmake
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    BaseLibrary.h
-    BaseLibraryItem.h
-    UsedResources.h
-    UIEnumsDatabase.h
-    Include/EditorCoreAPI.cpp
-    Include/IErrorReport.h
-    Include/IBaseLibraryManager.h
-    Include/IFileUtil.h
-    Include/EditorCoreAPI.h
-    Include/IEditorMaterial.h
-    Include/IEditorMaterialManager.h
-    Include/IImageUtil.h
-    Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
-    Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
-    Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
-    Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
-    Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
-    Controls/ReflectedPropertyControl/ReflectedVar.cpp
-    Controls/ReflectedPropertyControl/ReflectedVar.h
-    Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
-    Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
-    Controls/QBitmapPreviewDialog.cpp
-    Controls/QBitmapPreviewDialog.h
-    Controls/QBitmapPreviewDialog.ui
-    Controls/QBitmapPreviewDialogImp.cpp
-    Controls/QBitmapPreviewDialogImp.h
-    Controls/QToolTipWidget.h
-    Controls/QToolTipWidget.cpp
-    BaseLibraryItem.cpp
-    BaseLibrary.cpp
-    UsedResources.cpp
-    UIEnumsDatabase.cpp
-    LyViewPaneNames.h
-    QtViewPaneManager.cpp
-    QtViewPaneManager.h
-    ErrorRecorder.cpp
-    ErrorRecorder.h
-    ErrorDialog.cpp
-    ErrorDialog.h
-    ErrorDialog.ui
-    Clipboard.cpp
-    Util/MemoryBlock.cpp
-    Util/Variable.cpp
-    Util/UndoUtil.cpp
-    Util/VariablePropertyType.cpp
-    Clipboard.h
-    Util/MemoryBlock.h
-    Util/Variable.h
-    Util/UndoUtil.h
-    Util/VariablePropertyType.h
-    Util/RefCountBase.h
-    Util/PathUtil.h
-    Util/PathUtil.cpp
-    Util/ImageHistogram.cpp
-    Util/Image.cpp
-    Util/ImageHistogram.h
-    Util/Image.h
-    Util/ColorUtils.cpp
-    Util/ColorUtils.h
-    Undo/Undo.cpp
-    Undo/IUndoManagerListener.h
-    Undo/IUndoObject.h
-    Undo/Undo.h
-    Undo/UndoVariableChange.h
-    WinWidgetId.h
-    QtUI/ColorButton.cpp
-    QtUI/ColorButton.h
-    QtUtil.h
-    QtUtilWin.h
-    QtViewPane.h
-)
diff --git a/Code/Sandbox/Editor/editor_core_test_files.cmake b/Code/Sandbox/Editor/editor_core_test_files.cmake
deleted file mode 100644
index 77ea029565..0000000000
--- a/Code/Sandbox/Editor/editor_core_test_files.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Core/Tests/test_Main.cpp
-    Core/Tests/test_Archive.cpp
-    Core/Tests/test_PathUtil.cpp
-)
diff --git a/Code/Sandbox/Editor/editor_darwin_files.cmake b/Code/Sandbox/Editor/editor_darwin_files.cmake
deleted file mode 100644
index 8b4af2cbe2..0000000000
--- a/Code/Sandbox/Editor/editor_darwin_files.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    gui_info.plist
-)
diff --git a/Code/Sandbox/Editor/editor_files.cmake b/Code/Sandbox/Editor/editor_files.cmake
deleted file mode 100644
index 3d1da74d3c..0000000000
--- a/Code/Sandbox/Editor/editor_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    main.cpp
-    Style/Editor.qss
-    Style/resources.qrc
-    EditorCryEdit.rc
-)
diff --git a/Code/Sandbox/Editor/editor_headers_files.cmake b/Code/Sandbox/Editor/editor_headers_files.cmake
deleted file mode 100644
index 768b1fa721..0000000000
--- a/Code/Sandbox/Editor/editor_headers_files.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-)
diff --git a/Code/Sandbox/Editor/editor_lib_files.cmake b/Code/Sandbox/Editor/editor_lib_files.cmake
deleted file mode 100644
index 7d5bda3ddf..0000000000
--- a/Code/Sandbox/Editor/editor_lib_files.cmake
+++ /dev/null
@@ -1,842 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Translations/editor_en-us.ts
-    Translations/assetbrowser_en-us.ts
-    DPIAware.xml
-    res/AVI_Recorder.bmp
-    res/ConsoleToolbar.bmp
-    res/CryEdit.ico
-    res/CryEdit.rc2
-    res/CryEditDoc.ico
-    res/Cursor_2.cur
-    res/Mouse.cur
-    res/Preferences.bmp
-    res/Toolbar.bmp
-    res/TreeView.bmp
-    res/VisualLog_PlayerButtons.bmp
-    res/ab_toolbar.bmp
-    res/about_dark.bmp
-    res/anim.bmp
-    res/animatio.bmp
-    res/animations_tree_soundevent.bmp
-    res/animflag_inside_pak.bmp
-    res/animflag_on_disk.bmp
-    res/animtree.bmp
-    res/arhitype_tree.bmp
-    res/arr_addkey.cur
-    res/arrow.cur
-    res/arrow_down.cur
-    res/arrow_down_black.ico
-    res/arrow_downright.cur
-    res/arrow_up.cur
-    res/arrow_up_black.ico
-    res/arrow_upright.cur
-    res/arrowcop.cur
-    res/assetIsDraggable.ico
-    res/avi_reco.bmp
-    res/ball_disabled.ico
-    res/ball_offline.ico
-    res/ball_online.ico
-    res/ball_pending.ico
-    res/bitmap5.bmp
-    res/bitmap6.bmp
-    res/bmp00001.bmp
-    res/bmp00002.bmp
-    res/bmp00003.bmp
-    res/bmp00005.bmp
-    res/bmp00006.bmp
-    res/bmp00007.bmp
-    res/bmp00008.bmp
-    res/bmp00009.bmp
-    res/bmp00010.bmp
-    res/bmp00011.bmp
-    res/bmp00012.bmp
-    res/bmp00013.bmp
-    res/bmp00014.bmp
-    res/bmp00015.bmp
-    res/bmp00016.bmp
-    res/bmp00017.bmp
-    res/bmp00019.bmp
-    res/bmp00020.bmp
-    res/bmp00024.bmp
-    res/bmp00025.bmp
-    res/bmp00026.bmp
-    res/bmp00027.bmp
-    res/bmp00028.bmp
-    res/bmp00029.bmp
-    res/bmp00030.bmp
-    res/bmp00031.bmp
-    res/brush24bpp.bmp
-    res/ce_animations_toolbar.bmp
-    res/character_parts_bar.bmp
-    res/charedit.bmp
-    res/clapperboard_cancel.bmp
-    res/clapperboard_ready.bmp
-    res/clone.ico
-    res/cur00001.cur
-    res/cur00002.cur
-    res/cur00003.cur
-    res/cur00004.cur
-    res/cur00005.cur
-    res/cursor1.cur
-    res/cursor2.cur
-    res/db_gametoken.bmp
-    res/db_library_bar.bmp
-    res/db_library_item_bar.bmp
-    res/db_music.bmp
-    res/db_music_logic.bmp
-    res/db_standart.bmp
-    res/down_arr.ico
-    res/down_arrow.ico
-    res/dynamichelp.bmp
-    res/edit_mod.bmp
-    res/editwithbutton.bmp
-    res/editwithbutton_dark.bmp
-    res/entitybar.bmp
-    res/error_report.bmp
-    res/expand1.ico
-    res/expand2.ico
-    res/faceit_playbar.bmp
-    res/faceit_slidersbar.bmp
-    res/faceit_spline_bar.bmp
-    res/facejoystickbar.bmp
-    res/facesequence_bar.bmp
-    res/facialsequence_bar.bmp
-    res/feedback.ico
-    res/file_browse.ico
-    res/filesimage.bmp
-    res/filestatus.bmp
-    res/folder.ico
-    res/fopen_back.ico
-    res/fopen_up.ico
-    res/grid.ico
-    res/handDrag.cur
-    res/hit.cur
-    res/ico00001.ico
-    res/ico00002.ico
-    res/icon1.ico
-    res/icon_delete.ico
-    res/icon_export.ico
-    res/icon_import.ico
-    res/icon_new.ico
-    res/icon_pause.ico
-    res/icon_play.ico
-    res/icon_question.bmp
-    res/icon_question.ico
-    res/idb_.bmp
-    res/layouts.bmp
-    res/lc_connecting.ico
-    res/lc_running.ico
-    res/leftright.cur
-    res/litebulb.bmp
-    res/lock_sel.bmp
-    res/locksele.bmp
-    res/logo.bmp
-    res/mainfram.bmp
-    res/mann_tagdef_toolbar.bmp
-    res/mann_tagdef_tree.bmp
-    res/material.bmp
-    res/material_browser.bmp
-    res/materialbar.bmp
-    res/maximize.ico
-    res/minus.ico
-    res/model_viewport_dock.bmp
-    res/model_viewport_fullscreen.bmp
-    res/musictree.bmp
-    res/nodrop.cur
-    res/object_move.cur
-    res/object_rotate.cur
-    res/object_scale.cur
-    res/objectsbrowser.bmp
-    res/panel_ve.bmp
-    res/panel_veg.bmp
-    res/particles_tree.bmp
-    res/particlesbar.bmp
-    res/pick.bmp
-    res/pick_cursor.cur
-    res/plus.ico
-    res/pointerDragItem.cur
-    res/pointerHit.cur
-    res/pointer_.cur
-    res/pointer_flatten.cur
-    res/pointer_getheight.cur
-    res/pointer_link.cur
-    res/pointer_linknow.cur
-    res/pointer_minus.cur
-    res/pointer_plus.cur
-    res/pointer_smooth.cur
-    res/pointer_so_sel_plus.cur
-    res/pointer_so_select.cur
-    res/proceduralmaterial_toolbar.bmp
-    res/progslider_end.bmp
-    res/progslider_marker.bmp
-    res/progslider_start.bmp
-    res/progslider_thumb.bmp
-    res/progslider_track.bmp
-    res/properties.bmp
-    res/psd.ico
-    res/rename.ico
-    res/replace.ico
-    res/ribbon_system_button.png
-    res/sandbox_dark.bmp
-    res/sb_welcome_dark.bmp
-    res/selectobj.bmp
-    res/seq_1_colour_keys.bmp
-    res/seq_2_colour_keys.bmp
-    res/seq_3_colour_keys.bmp
-    res/seq_4_colour_keys.bmp
-    res/seq_5_colour_keys.bmp
-    res/seq_6_colour_keys.bmp
-    res/seq_7_colour_keys.bmp
-    res/sequencer_keys.bmp
-    res/sequencer_nodes.bmp
-    res/soundfiles.bmp
-    res/soundmood.bmp
-    res/soundpre.bmp
-    res/spline_edit_bar.bmp
-    res/splineextrabar.bmp
-    res/status_mem_low1.ico
-    res/status_mem_low2.ico
-    res/status_mem_ok.ico
-    res/stdviews.bmp
-    res/subobjseltype.bmp
-    res/sw_mapbar.bmp
-    res/sw_toolbar.bmp
-    res/tiff.ico
-    res/toolbar1.bmp
-    res/toolbar2.bmp
-    res/toolbox.bmp
-    res/trackvie.bmp
-    res/trackview.bmp
-    res/trackview_key.bmp
-    res/trackview_keys.bmp
-    res/trackview_nodes.bmp
-    res/trackview_play.bmp
-    res/trackview_view.bmp
-    res/tree_vie.bmp
-    res/uieditor_main.bmp
-    res/up_arrow.ico
-    res/veed_tree.bmp
-    res/vegetati.bmp
-    res/vegtree.bmp
-    res/video_record.ico
-    res/warning16x16.ico
-    res/water.bmp
-    res/work_in_progress_icon.ico
-    res/CryEngineLogo.bmp
-    res/MannFileManagerImageList.bmp
-    res/infobar/CameraCollision-default.svg
-    res/infobar/GotoLocation-default.svg
-    res/infobar/LockScale-default.svg
-    res/infobar/LockSelection-default.svg
-    res/infobar/Mute-default.svg
-    res/infobar/NoPlayerSync-default.svg
-    res/infobar/NoPlayerSync-selected.svg
-    res/infobar/Pause-default.svg
-    res/infobar/PausePlay-default.svg
-    res/infobar/PhysicsCol-default.svg
-    res/infobar/VR-default.svg
-    res/infobar/XYZ-default.svg
-    Plugin.cpp
-    Plugin.h
-    PluginManager.cpp
-    PluginManager.h
-    IEditor.h
-    IEditorImpl.cpp
-    IEditorImpl.h
-    CryEditPy.cpp
-    CryEdit.cpp
-    CryEdit.h
-    CVarMenu.cpp
-    CVarMenu.h
-    EditorToolsApplication.cpp
-    EditorToolsApplication.h
-    EditorToolsApplicationAPI.h
-    Core/EditorMetricsPlainTextNameRegistration.cpp
-    Core/EditorMetricsPlainTextNameRegistration.h
-    MainWindow.cpp
-    MainWindow.h
-    MainWindow.qrc
-    Core/QtEditorApplication.cpp
-    Core/QtEditorApplication.h
-    Core/LevelEditorMenuHandler.cpp
-    Core/LevelEditorMenuHandler.h
-    StartupTraceHandler.cpp
-    StartupTraceHandler.h
-    LevelTreeModel.cpp
-    LevelTreeModel.h
-    Include/Command.h
-    Include/HitContext.h
-    Include/IAnimationCompressionManager.h
-    Include/IAssetItem.h
-    Include/IAssetItemDatabase.h
-    Include/ICommandManager.h
-    Include/IConsoleConnectivity.h
-    Include/IDataBaseItem.h
-    Include/IDataBaseLibrary.h
-    Include/IDataBaseManager.h
-    Include/IDisplayViewport.h
-    Include/IEditorClassFactory.h
-    Include/IEventLoopHook.h
-    Include/IExportManager.h
-    Include/IGizmoManager.h
-    Include/IIconManager.h
-    Include/ILogFile.h
-    Include/IKeyTimeSet.h
-    Include/IObjectManager.h
-    Include/IPlugin.h
-    Include/IPreferencesPage.h
-    Include/IRenderListener.h
-    Include/IResourceSelectorHost.h
-    Include/ISourceControl.h
-    Include/ISubObjectSelectionReferenceFrameCalculator.h
-    Include/ITextureDatabaseUpdater.h
-    Include/ITransformManipulator.h
-    Include/IViewPane.h
-    Include/ObjectEvent.h
-    Util/AffineParts.cpp
-    Objects/BaseObject.cpp
-    Objects/BaseObject.h
-    Animation/AnimationBipedBoneNames.cpp
-    Animation/AnimationBipedBoneNames.h
-    AnimationContext.cpp
-    AnimationContext.h
-    AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
-    AzAssetBrowser/AzAssetBrowserRequestHandler.h
-    AzAssetBrowser/AzAssetBrowserWindow.cpp
-    AzAssetBrowser/AzAssetBrowserWindow.h
-    AzAssetBrowser/AzAssetBrowserWindow.ui
-    AssetDatabase/AssetDatabaseLocationListener.h
-    AssetDatabase/AssetDatabaseLocationListener.cpp
-    AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
-    AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
-    AssetImporter/AssetImporterManager/AssetImporterManager.cpp
-    AssetImporter/AssetImporterManager/AssetImporterManager.h
-    AssetImporter/UI/FilesAlreadyExistDialog.cpp
-    AssetImporter/UI/FilesAlreadyExistDialog.h
-    AssetImporter/UI/FilesAlreadyExistDialog.ui
-    AssetImporter/UI/ProcessingAssetsDialog.cpp
-    AssetImporter/UI/ProcessingAssetsDialog.h
-    AssetImporter/UI/ProcessingAssetsDialog.ui
-    AssetImporter/UI/SelectDestinationDialog.cpp
-    AssetImporter/UI/SelectDestinationDialog.h
-    AssetImporter/UI/SelectDestinationDialog.ui
-    AssetEditor/AssetEditorRequestsHandler.cpp
-    AssetEditor/AssetEditorRequestsHandler.h
-    AssetEditor/AssetEditorWindow.cpp
-    AssetEditor/AssetEditorWindow.h
-    AssetEditor/AssetEditorWindow.ui
-    Commands/CommandManager.cpp
-    Commands/CommandManager.h
-    Controls/BitmapToolTip.cpp
-    Controls/BitmapToolTip.h
-    Controls/ColorGradientCtrl.cpp
-    Controls/ColorGradientCtrl.h
-    Controls/ConsoleSCB.cpp
-    Controls/ConsoleSCB.h
-    Controls/ConsoleSCB.ui
-    Controls/ConsoleSCB.qrc
-    Controls/FolderTreeCtrl.cpp
-    Controls/FolderTreeCtrl.h
-    Controls/HotTrackingTreeCtrl.cpp
-    Controls/HotTrackingTreeCtrl.h
-    Controls/ImageHistogramCtrl.cpp
-    Controls/ImageHistogramCtrl.h
-    Controls/ImageListCtrl.cpp
-    Controls/ImageListCtrl.h
-    Controls/MultiMonHelper.cpp
-    Controls/MultiMonHelper.h
-    Controls/NumberCtrl.cpp
-    Controls/NumberCtrl.h
-    Controls/NumberCtrl.h
-    Controls/SplineCtrl.cpp
-    Controls/SplineCtrl.h
-    Controls/SplineCtrlEx.cpp
-    Controls/SplineCtrlEx.h
-    Controls/TextEditorCtrl.cpp
-    Controls/TextEditorCtrl.h
-    Controls/TimelineCtrl.cpp
-    Controls/TimelineCtrl.h
-    Controls/WndGridHelper.h
-    Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
-    Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
-    Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
-    Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
-    Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
-    Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
-    Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
-    Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
-    Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
-    Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
-    Controls/ReflectedPropertyControl/PropertyCtrl.cpp
-    Controls/ReflectedPropertyControl/PropertyCtrl.h
-    Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
-    Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
-    MainStatusBar.cpp
-    MainStatusBar.h
-    MainStatusBarItems.h
-    CrtDebug.cpp
-    CryEdit.rc
-    CryEditDoc.cpp
-    CryEditDoc.h
-    EditorDefs.h
-    GameEngine.cpp
-    GameEngine.h
-    Include/SandboxAPI.h
-    LogFile.cpp
-    LogFile.h
-    Resource.h
-    UserMessageDefines.h
-    ActionManager.cpp
-    ActionManager.h
-    ShortcutDispatcher.cpp
-    ShortcutDispatcher.h
-    BaseLibraryManager.cpp
-    BaseLibraryItem.h
-    BaseLibraryManager.h
-    CheckOutDialog.cpp
-    CheckOutDialog.h
-    CheckOutDialog.ui
-    ConsoleDialog.cpp
-    ConsoleDialog.h
-    CustomAspectRatioDlg.cpp
-    CustomAspectRatioDlg.ui
-    CustomAspectRatioDlg.h
-    CustomResolutionDlg.cpp
-    CustomResolutionDlg.ui
-    CustomResolutionDlg.h
-    ErrorReportDialog.ui
-    ErrorReportDialog.cpp
-    ErrorReportDialog.h
-    GenericSelectItemDialog.ui
-    GenericSelectItemDialog.cpp
-    GenericSelectItemDialog.h
-    GotoPositionDlg.cpp
-    GotoPositionDlg.h
-    GotoPositionDlg.ui
-    LayoutConfigDialog.cpp
-    LayoutConfigDialog.h
-    LayoutConfigDialog.ui
-    LayoutConfigDialog.qrc
-    LevelFileDialog.cpp
-    LevelFileDialog.qrc
-    LevelFileDialog.h
-    LevelFileDialog.ui
-    QuickAccessBar.cpp
-    QuickAccessBar.h
-    QuickAccessBar.ui
-    ResizeResolutionDialog.cpp
-    ResizeResolutionDialog.h
-    ResizeResolutionDialog.ui
-    SelectEAXPresetDlg.cpp
-    SelectEAXPresetDlg.h
-    SelectEAXPresetDlg.ui
-    SelectLightAnimationDialog.cpp
-    SelectLightAnimationDialog.h
-    SelectSequenceDialog.cpp
-    SelectSequenceDialog.h
-    StartupLogoDialog.cpp
-    StartupLogoDialog.h
-    StartupLogoDialog.ui
-    StartupLogoDialog.qrc
-    StringDlg.cpp
-    StringDlg.h
-    ToolbarCustomizationDialog.ui
-    ToolbarCustomizationDialog.cpp
-    ToolbarCustomizationDialog.h
-    ToolbarManager.h
-    ToolbarManager.cpp
-    ToolsConfigPage.cpp
-    ToolsConfigPage.h
-    ToolsConfigPage.ui
-    IconListDialog.ui
-    UndoDropDown.cpp
-    UndoDropDown.h
-    DimensionsDialog.cpp
-    DimensionsDialog.h
-    DimensionsDialog.ui
-    NewLevelDialog.cpp
-    NewLevelDialog.h
-    NewLevelDialog.ui
-    Dialogs/PythonScriptsDialog.cpp
-    Dialogs/PythonScriptsDialog.h
-    Dialogs/PythonScriptsDialog.ui
-    Dialogs/Generic/UserOptions.cpp
-    Dialogs/Generic/UserOptions.h
-    EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
-    EditMode/SubObjectSelectionReferenceFrameCalculator.h
-    Export/ExportManager.cpp
-    Export/ExportManager.h
-    Export/OBJExporter.cpp
-    Export/OBJExporter.h
-    Export/OCMExporter.cpp
-    Export/OCMExporter.h
-    EditorFileMonitor.cpp
-    EditorFileMonitor.h
-    Include/IEditorFileMonitor.h
-    GameExporter.cpp
-    GameResourcesExporter.cpp
-    GameExporter.h
-    GameResourcesExporter.h
-    Geometry/TriMesh.cpp
-    Geometry/TriMesh.h
-    AboutDialog.h
-    AboutDialog.ui
-    DocMultiArchive.h
-    EditMode/DeepSelection.h
-    FBXExporterDialog.h
-    FileTypeUtils.h
-    GridUtils.h
-    IObservable.h
-    IPostRenderer.h
-    LightmapCompiler/SimpleTriangleRasterizer.h
-    ToolBox.h
-    TrackViewNewSequenceDialog.h
-    UndoConfigSpec.h
-    UndoViewPosition.h
-    UndoViewRotation.h
-    Util/GeometryUtil.h
-    Util/IXmlHistoryManager.h
-    Util/KDTree.h
-    Util/XmlHistoryManager.h
-    WipFeaturesDlg.h
-    WipFeaturesDlg.ui
-    WipFeaturesDlg.qrc
-    LevelIndependentFileMan.cpp
-    LevelIndependentFileMan.h
-    LogFileImpl.cpp
-    LogFileImpl.h
-    Objects/ClassDesc.cpp
-    Objects/ClassDesc.h
-    Objects/IEntityObjectListener.h
-    Objects/SelectionGroup.cpp
-    Objects/SelectionGroup.h
-    Objects/SubObjSelection.cpp
-    Objects/SubObjSelection.h
-    Objects/ObjectLoader.cpp
-    Objects/ObjectLoader.h
-    Objects/ObjectManager.cpp
-    Objects/ObjectManager.h
-    Objects/ObjectManagerLegacyUndo.cpp
-    Objects/ObjectManagerLegacyUndo.h
-    Objects/DisplayContext.cpp
-    Objects/DisplayContext.h
-    Objects/EntityObject.cpp
-    Objects/EntityObject.h
-    Objects/AxisGizmo.cpp
-    Objects/Gizmo.cpp
-    Objects/GizmoManager.cpp
-    Objects/LineGizmo.cpp
-    Objects/TrackGizmo.cpp
-    Objects/AxisGizmo.h
-    Objects/Gizmo.h
-    Objects/GizmoManager.h
-    Objects/LineGizmo.h
-    Objects/TrackGizmo.h
-    PythonEditorFuncs.cpp
-    PythonEditorFuncs.h
-    QtUI/QCollapsibleGroupBox.h
-    QtUI/QCollapsibleGroupBox.cpp
-    QtUI/ClickableLabel.h
-    QtUI/ClickableLabel.cpp
-    QtUI/PixmapLabelPreview.h
-    QtUI/PixmapLabelPreview.cpp
-    QtUI/WaitCursor.h
-    QtUI/WaitCursor.cpp
-    RenderHelpers/AxisHelper.cpp
-    RenderHelpers/AxisHelper.h
-    CustomizeKeyboardDialog.h
-    CustomizeKeyboardDialog.cpp
-    CustomizeKeyboardDialog.ui
-    KeyboardCustomizationSettings.h
-    KeyboardCustomizationSettings.cpp
-    Settings.cpp
-    SettingsManager.cpp
-    SettingsManagerDialog.cpp
-    PreferencesStdPages.h
-    PreferencesStdPages.cpp
-    EditorPreferencesPageGeneral.h
-    EditorPreferencesPageGeneral.cpp
-    EditorPreferencesPageFiles.h
-    EditorPreferencesPageFiles.cpp
-    EditorPreferencesPageViewportGeneral.h
-    EditorPreferencesPageViewportGeneral.cpp
-    EditorPreferencesPageViewportGizmo.h
-    EditorPreferencesPageViewportGizmo.cpp
-    EditorPreferencesPageViewportMovement.h
-    EditorPreferencesPageViewportMovement.cpp
-    EditorPreferencesPageViewportDebug.h
-    EditorPreferencesPageViewportDebug.cpp
-    EditorPreferencesPageExperimentalLighting.h
-    EditorPreferencesPageExperimentalLighting.cpp
-    EditorPreferencesPageAWS.h
-    EditorPreferencesPageAWS.cpp
-    EditorPreferencesDialog.h
-    EditorPreferencesDialog.cpp
-    EditorPreferencesDialog.ui
-    EditorPreferencesTreeWidgetItem.h
-    EditorPreferencesTreeWidgetItem.cpp
-    EditorPreferencesTreeWidgetItemDelegate.h
-    EditorPreferencesTreeWidgetItemDelegate.cpp
-    Settings.h
-    SettingsManager.h
-    SettingsManagerDialog.h
-    SettingsManagerDialog.ui
-    GraphicsSettingsDialog.h
-    GraphicsSettingsDialog.cpp
-    graphicssettingsdialog.ui
-    AboutDialog.cpp
-    ErrorReportTableModel.h
-    ErrorReportTableModel.cpp
-    EditMode/DeepSelection.cpp
-    FBXExporterDialog.cpp
-    FBXExporterDialog.ui
-    FileTypeUtils.cpp
-    LightmapCompiler/SimpleTriangleRasterizer.cpp
-    ResourceSelectorHost.cpp
-    ResourceSelectorHost.h
-    ToolBox.cpp
-    TrackViewNewSequenceDialog.cpp
-    TrackViewNewSequenceDialog.ui
-    UndoConfigSpec.cpp
-    UndoViewPosition.cpp
-    UndoViewRotation.cpp
-    WipFeatureManager.cpp
-    WipFeatureManager.h
-    WipFeaturesDlg.cpp
-    Dialogs/ErrorsDlg.cpp
-    Dialogs/ErrorsDlg.h
-    Dialogs/ErrorsDlg.ui
-    DisplaySettings.cpp
-    DisplaySettings.h
-    DisplaySettingsPythonFuncs.h
-    DisplaySettingsPythonFuncs.cpp
-    ErrorReport.cpp
-    ErrorReport.h
-    IconManager.cpp
-    IconManager.h
-    LevelInfo.cpp
-    LevelInfo.h
-    ProcessInfo.cpp
-    ProcessInfo.h
-    Report.h
-    SurfaceTypeValidator.cpp
-    SurfaceTypeValidator.h
-    TrackView/AtomOutputFrameCapture.cpp
-    TrackView/AtomOutputFrameCapture.h
-    TrackView/TrackViewDialog.qrc
-    TrackView/TrackViewDialog.cpp
-    TrackView/TrackViewDialog.h
-    TrackView/TrackViewDopeSheetBase.cpp
-    TrackView/TrackViewDopeSheetBase.h
-    TrackView/TrackViewDoubleSpinBox.cpp
-    TrackView/TrackViewDoubleSpinBox.h
-    TrackView/TrackViewPythonFuncs.h
-    TrackView/TrackViewPythonFuncs.cpp
-    TrackView/TrackViewSequenceManager.cpp
-    TrackView/TrackViewSequenceManager.h
-    TrackView/TrackViewUndo.cpp
-    TrackView/TrackViewUndo.h
-    TrackView/CommentNodeAnimator.cpp
-    TrackView/DirectorNodeAnimator.cpp
-    TrackView/CommentNodeAnimator.h
-    TrackView/DirectorNodeAnimator.h
-    TrackViewExportKeyTimeDlg.cpp
-    TrackViewExportKeyTimeDlg.ui
-    TrackView/SequenceBatchRenderDialog.cpp
-    TrackView/TrackViewCurveEditor.cpp
-    TrackView/TrackViewFindDlg.cpp
-    TrackView/TrackViewKeyPropertiesDlg.cpp
-    TrackView/TrackViewNodes.cpp
-    TrackView/TrackViewNodes.ui
-    TrackView/TrackViewSplineCtrl.cpp
-    TrackView/TrackViewTimeline.cpp
-    TrackView/TVCustomizeTrackColorsDialog.ui
-    TrackViewFBXImportPreviewDialog.cpp
-    TrackViewFBXImportPreviewDialog.ui
-    TrackViewExportKeyTimeDlg.h
-    TrackView/SequenceBatchRenderDialog.h
-    TrackView/SequenceBatchRenderDialog.ui
-    TrackView/TrackViewCurveEditor.h
-    TrackView/TrackViewCurveEditor.ui
-    TrackView/TrackViewFindDlg.h
-    TrackView/TrackViewFindDlg.ui
-    TrackView/TrackViewKeyPropertiesDlg.h
-    TrackView/TrackViewNodes.h
-    TrackView/TrackViewSplineCtrl.h
-    TrackView/TrackViewTimeline.h
-    TrackView/TVCustomizeTrackColorsDlg.cpp
-    TrackView/TVCustomizeTrackColorsDlg.h
-    TrackViewFBXImportPreviewDialog.h
-    TrackView/2DBezierKeyUIControls.cpp
-    TrackView/AssetBlendKeyUIControls.cpp
-    TrackView/CaptureKeyUIControls.cpp
-    TrackView/CharacterKeyUIControls.cpp
-    TrackView/ConsoleKeyUIControls.cpp
-    TrackView/EventKeyUIControls.cpp
-    TrackView/GotoKeyUIControls.cpp
-    TrackView/SelectKeyUIControls.cpp
-    TrackView/SequenceKeyUIControls.cpp
-    TrackView/SoundKeyUIControls.cpp
-    TrackView/TrackEventKeyUIControls.cpp
-    TrackView/TrackViewTrackPropsDlg.ui
-    TrackView/TVEventsDialog.cpp
-    TrackView/TVEventsDialog.ui
-    TrackView/TVSequenceProps.cpp
-    TrackView/CommentKeyUIControls.cpp
-    TrackView/ScreenFaderKeyUIControls.cpp
-    TrackView/TimeRangeKeyUIControls.cpp
-    TrackView/TVEventsDialog.h
-    TrackView/TVSequenceProps.h
-    TrackView/TVSequenceProps.ui
-    TrackView/TrackViewAnimNode.cpp
-    TrackView/TrackViewTrack.cpp
-    TrackView/TrackViewNode.cpp
-    TrackView/TrackViewSequence.cpp
-    TrackView/TrackViewNodeFactories.cpp
-    TrackView/TrackViewEventNode.cpp
-    TrackView/TrackViewAnimNode.h
-    TrackView/TrackViewTrack.h
-    TrackView/TrackViewNode.h
-    TrackView/TrackViewSequence.h
-    TrackView/TrackViewNodeFactories.h
-    TrackView/TrackViewEventNode.h
-    ConfigGroup.cpp
-    ConfigGroup.h
-    Util/AffineParts.h
-    Util/AutoLogTime.cpp
-    Util/AutoLogTime.h
-    Util/AutoDirectoryRestoreFileDialog.h
-    Util/AutoDirectoryRestoreFileDialog.cpp
-    Util/CryMemFile.h
-    Util/DynamicArray2D.cpp
-    Util/DynamicArray2D.h
-    Util/EditorAutoLevelLoadTest.cpp
-    Util/EditorAutoLevelLoadTest.h
-    Util/EditorUtils.cpp
-    Util/EditorUtils.h
-    Util/FileEnum.cpp
-    Util/FileEnum.h
-    Util/FileUtil.cpp
-    Util/FileUtil.h
-    Util/GdiUtil.cpp
-    Util/GdiUtil.h
-    Util/GeometryUtil.cpp
-    Util/GuidUtil.cpp
-    Util/GuidUtil.h
-    Util/IObservable.h
-    Util/IndexedFiles.cpp
-    Util/IndexedFiles.h
-    Util/KDTree.cpp
-    Util/Mailer.h
-    Util/NamedData.cpp
-    Util/NamedData.h
-    Util/Observable.h
-    Util/PakFile.cpp
-    Util/PakFile.h
-    Util/PredefinedAspectRatios.cpp
-    Util/PredefinedAspectRatios.h
-    Util/StringHelpers.cpp
-    Util/StringHelpers.h
-    Util/StringNoCasePredicate.h
-    Util/TRefCountBase.h
-    Util/Triangulate.cpp
-    Util/Triangulate.h
-    Util/Util.h
-    Util/XmlArchive.cpp
-    Util/XmlArchive.h
-    Util/XmlHistoryManager.cpp
-    Util/XmlTemplate.cpp
-    Util/XmlTemplate.h
-    Util/bitarray.h
-    Util/fastlib.h
-    Util/smartptr.h
-    WaitProgress.cpp
-    WaitProgress.h
-    Util/FileUtil_impl.h
-    Util/FileUtil_impl.cpp
-    Util/ImageUtil_impl.h
-    Util/ImageUtil_impl.cpp
-    Util/ColumnSortProxyModel.h
-    Util/ColumnSortProxyModel.cpp
-    Util/AbstractGroupProxyModel.h
-    Util/AbstractGroupProxyModel.cpp
-    Util/AbstractSortModel.h
-    Util/AbstractSortModel.cpp
-    Util/ColumnGroupProxyModel.h
-    Util/ColumnGroupProxyModel.cpp
-    Util/ColumnGroupHeaderView.h
-    Util/ColumnGroupHeaderView.cpp
-    Util/ColumnGroupItemDelegate.h
-    Util/ColumnGroupItemDelegate.cpp
-    Util/ColumnGroupTreeView.h
-    Util/ColumnGroupTreeView.cpp
-    Util/ModalWindowDismisser.h
-    Util/ModalWindowDismisser.cpp
-    Util/3DConnexionDriver.cpp
-    Util/3DConnexionDriver.h
-    Util/FileChangeMonitor.cpp
-    Util/FileChangeMonitor.h
-    Util/ImageUtil.cpp
-    Util/ImageUtil.h
-    Util/ImageASC.cpp
-    Util/ImageASC.h
-    Util/ImageBT.cpp
-    Util/ImageBT.h
-    Util/ImageGif.cpp
-    Util/ImageGif.h
-    Util/ImageTIF.cpp
-    Util/ImageTIF.h
-    Util/Math.h
-    Util/UIEnumerations.cpp
-    Util/UIEnumerations.h
-    WelcomeScreen/WelcomeScreenDialog.h
-    WelcomeScreen/WelcomeScreenDialog.cpp
-    WelcomeScreen/WelcomeScreenDialog.ui
-    WelcomeScreen/WelcomeScreenDialog.qrc
-    2DViewport.cpp
-    2DViewport.h
-    LayoutWnd.cpp
-    LayoutWnd.h
-    EditorViewportWidget.cpp
-    EditorViewportWidget.h
-    EditorViewportSettings.cpp
-    EditorViewportSettings.h
-    EditorViewportCamera.cpp
-    EditorViewportCamera.h
-    ViewportManipulatorController.cpp
-    ViewportManipulatorController.h
-    LegacyViewportCameraController.cpp
-    LegacyViewportCameraController.h
-    RenderViewport.cpp
-    RenderViewport.h
-    TopRendererWnd.cpp
-    TopRendererWnd.h
-    ViewManager.cpp
-    ViewManager.h
-    ViewPane.cpp
-    ViewPane.h
-    Viewport.cpp
-    Viewport.h
-    ViewportTitleDlg.cpp
-    ViewportTitleDlg.ui
-    ViewportTitleDlg.h
-    EditorEnvironment.cpp
-    EditorEnvironment.h
-    IEditorPanelUtils.h
-    EditorPanelUtils.h
-    EditorPanelUtils.cpp
-)
-
-
-set(SKIP_UNITY_BUILD_INCLUSION_FILES
-    TrackView/TrackViewPythonFuncs.cpp
-    Core/LevelEditorMenuHandler.cpp
-    Util/AffineParts.cpp
-)
diff --git a/Code/Sandbox/Editor/editor_lib_terrain_files.cmake b/Code/Sandbox/Editor/editor_lib_terrain_files.cmake
deleted file mode 100644
index bf94391707..0000000000
--- a/Code/Sandbox/Editor/editor_lib_terrain_files.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    TerrainPainterPanel.cpp
-    TerrainPainterPanel.h
-    TerrainPainterPanel.ui
-    NewTerrainDialog.cpp
-    NewTerrainDialog.h
-    NewTerrainDialog.ui
-    TerrainTextureExport.cpp
-    TerrainTextureExport.h
-    TerrainTextureExport.ui
-    Terrain/Clouds.cpp
-    Terrain/GenerationParam.cpp
-    Terrain/GenerationParam.ui
-    Terrain/Heightmap.cpp
-    Terrain/Layer.cpp
-    Terrain/Noise.cpp
-    Terrain/PythonTerrainFuncs.cpp
-    Terrain/PythonTerrainLayerFuncs.cpp
-    Terrain/RGBLayer.cpp
-    Terrain/SurfaceType.cpp
-    Terrain/TerrainConverter.cpp
-    Terrain/TerrainGrid.cpp
-    Terrain/TerrainLayerTexGen.cpp
-    Terrain/TerrainLightGen.cpp
-    Terrain/TerrainManager.cpp
-    Terrain/TerrainTexGen.cpp
-    Terrain/TextureCompression.cpp
-    Terrain/MacroTextureExporter.cpp
-    Terrain/Clouds.h
-    Terrain/GenerationParam.h
-    Terrain/Heightmap.h
-    Terrain/Layer.h
-    Terrain/LayerWeight.h
-    Terrain/Noise.h
-    Terrain/RGBLayer.h
-    Terrain/SurfaceType.h
-    Terrain/TerrainConverter.h
-    Terrain/TerrainGrid.h
-    Terrain/TerrainLayerTexGen.h
-    Terrain/TerrainLightGen.h
-    Terrain/TerrainManager.h
-    Terrain/TerrainTexGen.h
-    Terrain/LayerWeight.cpp
-    Terrain/TextureCompression.h
-    Terrain/MacroTextureExporter.h
-    TerrainDialog.cpp
-    TerrainDialog.h
-    TerrainDialog.ui
-    TerrainTexture.cpp
-    TerrainTexture.h
-    TerrainTexture.ui
-    Terrain/SkyAccessibility/HeightmapAccessibility.h
-    Terrain/SkyAccessibility/HorizonTracker.h
-    TerrainHolePanel.cpp
-    TerrainHoleTool.cpp
-    TerrainHolePanel.h
-    TerrainHolePanel.ui
-    TerrainHoleTool.h
-    TerrainMiniMapTool.cpp
-    TerrainMiniMapTool.h
-    TerrainMiniMapPanel.ui
-    TerrainModifyPanel.cpp
-    TerrainModifyPanel.h
-    TerrainModifyPanel.ui
-    TerrainModifyTool.cpp
-    TerrainModifyTool.h
-    TerrainMoveTool.cpp
-    TerrainMoveToolPanel.cpp
-    TerrainMoveTool.h
-    TerrainMoveToolPanel.h
-    TerrainMoveToolPanel.ui
-    TerrainTexturePainter.cpp
-    TerrainTexturePainter.h
-    Util/ImagePainter.cpp
-    Util/ImagePainter.h
-)
diff --git a/Code/Sandbox/Editor/editor_lib_test_files.cmake b/Code/Sandbox/Editor/editor_lib_test_files.cmake
deleted file mode 100644
index c7361c46cb..0000000000
--- a/Code/Sandbox/Editor/editor_lib_test_files.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Lib/Tests/IEditorMock.h
-    Lib/Tests/test_ClickableLabel.cpp
-    Lib/Tests/test_CryEditPythonBindings.cpp
-    Lib/Tests/test_CryEditDocPythonBindings.cpp
-    Lib/Tests/test_EditorPythonBindings.cpp
-    Lib/Tests/test_EditorUtils.cpp
-    Lib/Tests/test_Main.cpp
-    Lib/Tests/test_MainWindowPythonBindings.cpp
-    Lib/Tests/test_ObjectManagerPythonBindings.cpp
-    Lib/Tests/test_TrackViewPythonBindings.cpp
-    Lib/Tests/test_ViewPanePythonBindings.cpp
-    Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
-    Lib/Tests/test_DisplaySettingsPythonBindings.cpp
-    DisplaySettingsPythonFuncs.cpp
-    DisplaySettingsPythonFuncs.h
-)
diff --git a/Code/Sandbox/Editor/editor_lib_test_terrain_files.cmake b/Code/Sandbox/Editor/editor_lib_test_terrain_files.cmake
deleted file mode 100644
index 9eb47bcd46..0000000000
--- a/Code/Sandbox/Editor/editor_lib_test_terrain_files.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Lib/Tests/test_TerrainModifyPythonBindings.cpp
-    Lib/Tests/test_TerrainPythonBindings.cpp
-    Lib/Tests/test_TerrainLayerPythonBindings.cpp
-    Lib/Tests/test_TerrainPainterPythonBindings.cpp
-    Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
-    Lib/Tests/test_TerrainTexturePythonBindings.cpp
-    Terrain/Tests/test_Terrain.cpp
-)
diff --git a/Code/Sandbox/Editor/editor_win_files.cmake b/Code/Sandbox/Editor/editor_win_files.cmake
deleted file mode 100644
index c278ce4e78..0000000000
--- a/Code/Sandbox/Editor/editor_win_files.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Resource.h
-    EditorCryEdit.rc
-    res/lyeditor.ico
-)
diff --git a/Code/Sandbox/Editor/main.cpp b/Code/Sandbox/Editor/main.cpp
deleted file mode 100644
index cfd7db05a3..0000000000
--- a/Code/Sandbox/Editor/main.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Module/DynamicModuleHandle.h>
-#include <AzFramework/ProjectManager/ProjectManager.h>
-
-int main(int argc, char* argv[])
-{
-    // Verify a project path can be found, launch the project manager and shut down otherwise
-    if (AzFramework::ProjectManager::CheckProjectPathProvided(argc, argv) == AzFramework::ProjectManager::ProjectPathCheckResult::ProjectManagerLaunched)
-    {
-        return 2;
-    }
-    using CryEditMain = int (*)(int, char*[]);
-    constexpr const char CryEditMainName[] = "CryEditMain";
-
-    AZ::Environment::Attach(AZ::Environment::GetInstance());
-    AZ::AllocatorInstance<AZ::OSAllocator>::Create();
-
-    auto handle = AZ::DynamicModuleHandle::Create("EditorLib");
-    [[maybe_unused]] const bool loaded = handle->Load(true);
-    AZ_Assert(loaded, "EditorLib could not be loaded");
-
-    int ret = 1;
-    if (auto fn = handle->GetFunction<CryEditMain>(CryEditMainName); fn != nullptr)
-    {
-        ret = AZStd::invoke(fn, argc, argv);
-    }
-
-    handle = {};
-    AZ::AllocatorInstance<AZ::OSAllocator>::Destroy();
-    AZ::Environment::Detach();
-    return ret;
-}
diff --git a/Code/Sandbox/Editor/res/CryEngineLogo.bmp b/Code/Sandbox/Editor/res/CryEngineLogo.bmp
deleted file mode 100644
index dd2ea18ecc..0000000000
--- a/Code/Sandbox/Editor/res/CryEngineLogo.bmp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97f4004da6ec1bf07d522d6675f814e53e36923a45084ff5d7e4113e293d4fec
-size 117656
diff --git a/Code/Sandbox/Editor/splashscreen_1_27.png b/Code/Sandbox/Editor/splashscreen_1_27.png
deleted file mode 100644
index 698861250a..0000000000
--- a/Code/Sandbox/Editor/splashscreen_1_27.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c48b708abfe9e77e7bd1418812373637c57a77980ab6943168e25f075b1ef55a
-size 846775
diff --git a/Code/Sandbox/Plugins/CMakeLists.txt b/Code/Sandbox/Plugins/CMakeLists.txt
deleted file mode 100644
index 43c6c3ad8c..0000000000
--- a/Code/Sandbox/Plugins/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-add_subdirectory(EditorCommon)
-add_subdirectory(ComponentEntityEditorPlugin)
-add_subdirectory(FFMPEGPlugin)
-add_subdirectory(ProjectSettingsTool)
-add_subdirectory(PerforcePlugin)
-add_subdirectory(EditorAssetImporter)
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
deleted file mode 100644
index adb02ba55e..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ComponentEntityEditorPlugin MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY EditorPlugins
-    AUTOMOC
-    AUTOUIC
-    AUTORCC
-    FILES_CMAKE
-        componententityeditorplugin_files.cmake
-    COMPILE_DEFINITIONS
-        PRIVATE
-            PLUGIN_EXPORTS
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Core
-            AZ::AzCore
-            AZ::AzToolsFramework
-            Legacy::CryCommon
-            Legacy::EditorLib
-            AZ::AtomCore
-            Gem::Atom_RPI.Public
-            Gem::AtomToolsFramework.Static
-            Gem::LmbrCentral.Editor
-    RUNTIME_DEPENDENCIES
-        Gem::LmbrCentral.Editor
-)
-
-ly_add_dependencies(Editor ComponentEntityEditorPlugin)
-set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::ComponentEntityEditorPlugin>)
-
-################################################################################
-# Tests
-################################################################################
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-    ly_add_target(
-        NAME ComponentEntityEditorPlugin.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        AUTOMOC
-        FILES_CMAKE
-            componententityeditorplugin_test_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                3rdParty::Qt::Core
-                3rdParty::Qt::Gui
-                3rdParty::Qt::Widgets
-                AZ::AzTest
-                AZ::AzToolsFramework
-                AZ::AzToolsFrameworkTestCommon
-                Legacy::CryCommon
-                Legacy::EditorLib
-                Gem::LmbrCentral.Editor
-        RUNTIME_DEPENDENCIES
-            Gem::LmbrCentral.Editor
-    )
-    ly_add_googletest(
-        NAME Legacy::ComponentEntityEditorPlugin.Tests
-    )
-endif()
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp
deleted file mode 100644
index 2bb39043b2..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-#include "ComponentEntityEditorPlugin.h"
-
-#include <LyViewPaneNames.h>
-#include "IResourceSelectorHost.h"
-
-#include "UI/QComponentEntityEditorMainWindow.h"
-#include "UI/QComponentEntityEditorOutlinerWindow.h"
-#include "UI/QComponentLevelEntityEditorMainWindow.h"
-#include "UI/ComponentPalette/ComponentPaletteSettings.h"
-#include "UI/ComponentPalette/ComponentPaletteWindow.h"
-
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/EntityUtils.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/containers/vector.h>
-
-#include <AzFramework/API/ApplicationAPI.h>
-
-#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx>
-
-#include "SandboxIntegration.h"
-#include "Objects/ComponentEntityObject.h"
-
-namespace ComponentEntityEditorPluginInternal
-{
-    void RegisterSandboxObjects()
-    {
-        GetIEditor()->GetClassFactory()->RegisterClass(new CTemplateObjectClassDesc<CComponentEntityObject>("ComponentEntity", "", "", OBJTYPE_AZENTITY, 201, "*.entity"));
-
-        AZ::SerializeContext* serializeContext = nullptr;
-        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-        AZ_Assert(serializeContext, "Serialization context not available");
-
-        if (serializeContext)
-        {
-            ComponentPaletteSettings::Reflect(serializeContext);
-        }
-    }
-
-    void UnregisterSandboxObjects()
-    {
-        GetIEditor()->GetClassFactory()->UnregisterClass("ComponentEntity");
-    }
-
-
-    void CheckComponentDeclarations()
-    {
-        AZ::SerializeContext* serializeContext = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
-        if (!serializeContext)
-        {
-            return;
-        }
-
-        // Catch the common mistake of reflecting a Component to SerializeContext
-        // without declaring how it inherits from AZ::Component.
-
-        // Collect violators so we can list them all in one message, rather than raising N popups.
-        AZStd::vector<AZ::ComponentDescriptor*> componentsLackingBaseClass;
-
-        AZ::EBusAggregateResults<AZ::ComponentDescriptor*> allComponentDescriptors;
-        AZ::ComponentDescriptorBus::BroadcastResult(allComponentDescriptors, &AZ::ComponentDescriptorBus::Events::GetDescriptor);
-        for (AZ::ComponentDescriptor* componentDescriptor : allComponentDescriptors.values)
-        {
-            const AZ::TypeId& componentTypeId = componentDescriptor->GetUuid();
-            const AZ::TypeId& typeOfAZComponent = azrtti_typeid<AZ::Component>();
-
-            if (const AZ::SerializeContext::ClassData* serializeData = serializeContext->FindClassData(componentTypeId))
-            {
-                if (!AZ::EntityUtils::CheckIfClassIsDeprecated(serializeContext, componentTypeId)
-                    && !AZ::EntityUtils::CheckDeclaresSerializeBaseClass(serializeContext, typeOfAZComponent, componentTypeId))
-                {
-                    componentsLackingBaseClass.push_back(componentDescriptor);
-                }
-            }
-        }
-
-        AZStd::string message;
-
-        for (AZ::ComponentDescriptor* componentDescriptor : componentsLackingBaseClass)
-        {
-            message.append(AZStd::string::format("- %s %s\n",
-                componentDescriptor->GetName(),
-                componentDescriptor->GetUuid().ToString<AZStd::string>().c_str()));
-        }
-
-        if (!message.empty())
-        {
-            message.insert(0, "Programmer error:\nClasses deriving from AZ::Component are not declaring their base class to SerializeContext.\n"
-                              "This will cause unexpected behavior such as components shifting around, or duplicating themselves.\n"
-                              "Affected components:\n");
-            message.append("\nReflection code should look something like this:\n"
-                "serializeContext->Class<MyComponent, AZ::Component, ... (other base classes, if any) ...>()"
-                "\nMake sure the Reflect function is called for all base classes as well.");
-
-            // this happens during startup, and its a programmer error - so during startup, make it an error, so it shows as a pretty noisy
-            // popup box.  Its important that programmers fix this, before they submit their code, so that data corruption / data loss does 
-            // not occur.
-            AZ_Error("Serialize", false, message.c_str());
-        }
-    }
-} // end namespace ComponentEntityEditorPluginInternal
-
-ComponentEntityEditorPlugin::ComponentEntityEditorPlugin([[maybe_unused]] IEditor* editor)
-    : m_registered(false)
-{
-    m_appListener = new SandboxIntegrationManager();
-    m_appListener->Setup();
-
-    using namespace AzToolsFramework;
-
-    ViewPaneOptions inspectorOptions;
-    inspectorOptions.canHaveMultipleInstances = true;
-    inspectorOptions.preferedDockingArea = Qt::RightDockWidgetArea;
-    RegisterViewPane<QComponentEntityEditorInspectorWindow>(
-        LyViewPane::EntityInspector,
-        LyViewPane::CategoryTools,
-        inspectorOptions);
-
-    ViewPaneOptions pinnedInspectorOptions;
-    pinnedInspectorOptions.canHaveMultipleInstances = true;
-    pinnedInspectorOptions.preferedDockingArea = Qt::NoDockWidgetArea;
-    pinnedInspectorOptions.paneRect = QRect(50, 50, 400, 700);
-    pinnedInspectorOptions.showInMenu = false;
-    RegisterViewPane<QComponentEntityEditorInspectorWindow>(
-        LyViewPane::EntityInspectorPinned,
-        LyViewPane::CategoryTools,
-        pinnedInspectorOptions);
-
-    bool prefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    if (prefabSystemEnabled)
-    {
-        // Add the new Outliner to the Tools Menu
-
-        ViewPaneOptions outlinerOptions;
-        outlinerOptions.canHaveMultipleInstances = true;
-        outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
-
-        RegisterViewPane<QEntityOutlinerWindow>(
-            LyViewPane::EntityOutliner,
-            LyViewPane::CategoryTools,
-            outlinerOptions);
-    }
-    else
-    {
-        ViewPaneOptions levelInspectorOptions;
-        levelInspectorOptions.canHaveMultipleInstances = false;
-        levelInspectorOptions.preferedDockingArea = Qt::RightDockWidgetArea;
-        levelInspectorOptions.paneRect = QRect(50, 50, 400, 700);
-        RegisterViewPane<QComponentLevelEntityEditorInspectorWindow>(
-            LyViewPane::LevelInspector, LyViewPane::CategoryTools, levelInspectorOptions);
-
-        // Add the Legacy Outliner to the Tools Menu
-        ViewPaneOptions outlinerOptions;
-        outlinerOptions.canHaveMultipleInstances = true;
-        outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
-
-        // this pane was originally introduced with this name, so layout settings are all saved with that name, despite the preview label being removed.
-        outlinerOptions.saveKeyName = "Entity Outliner (PREVIEW)";
-
-        RegisterViewPane<QComponentEntityEditorOutlinerWindow>(
-            LyViewPane::EntityOutliner,
-            LyViewPane::CategoryTools,
-            outlinerOptions);
-
-        AzToolsFramework::ViewPaneOptions options;
-        options.preferedDockingArea = Qt::NoDockWidgetArea;
-        RegisterViewPane<SliceRelationshipWidget>(LyViewPane::SliceRelationships, LyViewPane::CategoryTools, options);
-    }
-
-    RegisterModuleResourceSelectors(GetIEditor()->GetResourceSelectorHost());
-
-    ComponentEntityEditorPluginInternal::RegisterSandboxObjects();
-
-    // Check for common mistakes in component declarations
-    ComponentEntityEditorPluginInternal::CheckComponentDeclarations();
-
-    m_registered = true;
-}
-
-void ComponentEntityEditorPlugin::Release()
-{
-    if (m_registered)
-    {
-        using namespace AzToolsFramework;
-
-        UnregisterViewPane(LyViewPane::EntityInspector);
-        UnregisterViewPane(LyViewPane::EntityOutliner);
-        UnregisterViewPane(LyViewPane::EntityInspectorPinned);
-
-        ComponentEntityEditorPluginInternal::UnregisterSandboxObjects();
-    }
-
-    m_appListener->Teardown();
-    delete m_appListener;
-
-    delete this;
-}
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.h
deleted file mode 100644
index 6f67cd0854..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#include <IEditor.h>
-#include <Include/IPlugin.h>
-
-//------------------------------------------------------------------
-class ComponentEntityEditorPlugin
-    : public IPlugin
-{
-public:
-    ComponentEntityEditorPlugin(IEditor* editor);
-    virtual ~ComponentEntityEditorPlugin() = default;
-
-    void Release() override;
-    void ShowAbout() override {}
-    const char* GetPluginGUID() override { return "{11B0041C-BC34-4827-A3E4-AB7458FFF678}"; }
-    DWORD GetPluginVersion() override { return 1; }
-    const char* GetPluginName() override { return "ComponentEntityEditor"; }
-    bool CanExitNow() override { return true; }
-    void OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId) override {}
-
-private:
-    bool m_registered;
-    class SandboxIntegrationManager* m_appListener;
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
deleted file mode 100644
index 04c10efa40..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// Engine
-/////////////////////////////////////////////////////////////////////////////
-#include <Cry_Math.h>
-#include <ISystem.h>
-#include <ISerialize.h>
-#include <CryName.h>
-#include <EditorDefs.h>
-#include <Resource.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// STL
-/////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-#include <algorithm>
-
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
deleted file mode 100644
index ab8455c4ae..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
+++ /dev/null
@@ -1,1044 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "ComponentEntityObject.h"
-
-
-#include "Settings.h"
-#include "IIconManager.h"
-#include "Include/IObjectManager.h"
-#include "Objects/SelectionGroup.h"
-
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Serialization/Utils.h>
-#include <AzCore/std/string/string.h>
-#include <AzCore/Math/Transform.h>
-
-#include <AzFramework/Viewport/DisplayContextRequestBus.h>
-#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-#include <AzToolsFramework/Commands/PreemptiveUndoCache.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-#include <AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorLockComponent.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h>
-#include <AzToolsFramework/ToolsComponents/SelectionComponent.h>
-#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
-#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
-#include <AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.h>
-#include <AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h>
-#include <AzToolsFramework/Undo/UndoCacheInterface.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
-#include <LmbrCentral/Rendering/MaterialOwnerBus.h>
-
-#include <IDisplayViewport.h>
-#include <MathConversion.h>
-#include <TrackView/TrackViewAnimNode.h>
-#include <ViewManager.h>
-#include <Viewport.h>
-
-/**
- * Scalars for icon drawing behavior.
- */
-static const int s_kIconSize              = 36;       /// Icon display size (in pixels)
-static const float s_kIconMaxWorldDist    = 200.f;    /// Icons are culled past this range
-static const float s_kIconMinScale        = 0.1f;     /// Minimum scale for icons in the distance
-static const float s_kIconMaxScale        = 1.0f;     /// Maximum scale for icons near the camera
-static const float s_kIconCloseDist       = 3.f;      /// Distance at which icons are at maximum scale
-static const float s_kIconFarDist         = 40.f;     /// Distance at which icons are at minimum scale
-
-CComponentEntityObject::CComponentEntityObject()
-    : m_hasIcon(false)
-    , m_entityIconVisible(false)
-    , m_iconOnlyHitTest(false)
-    , m_drawAccents(true)
-    , m_accentType(AzToolsFramework::EntityAccentType::None)
-    , m_isIsolated(false)
-    , m_iconTexture(nullptr)
-{
-}
-
-CComponentEntityObject::~CComponentEntityObject()
-{
-    DeleteEntity();
-}
-
-bool CComponentEntityObject::Init(IEditor* ie, CBaseObject* copyFrom, const QString& file)
-{
-    SetColor(RGB(0, 255, 0));
-    SetTextureIcon(GetClassDesc()->GetTextureIconId());
-
-    // Sandbox does not serialize this object with others in the layer.
-    SetFlags(OBJFLAG_DONT_SAVE);
-
-    const bool result = CEntityObject::Init(ie, copyFrom, file);
-
-    return result;
-}
-
-void CComponentEntityObject::UpdatePreemptiveUndoCache()
-{
-    using namespace AzToolsFramework;
-
-    auto undoCacheInterface = AZ::Interface<UndoSystem::UndoCacheInterface>::Get();
-    if (undoCacheInterface)
-    {
-        undoCacheInterface->UpdateCache(m_entityId);
-    }
-}
-
-void CComponentEntityObject::AssignEntity(AZ::Entity* entity, bool destroyOld)
-{
-    const AZ::EntityId newEntityId = entity ? entity->GetId() : AZ::EntityId();
-
-    if (m_entityId.IsValid())
-    {
-        AZ::TransformNotificationBus::Handler::BusDisconnect();
-        LmbrCentral::RenderBoundsNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::ComponentEntityEditorRequestBus::Handler::BusDisconnect();
-        AZ::EntityBus::Handler::BusDisconnect();
-        AzToolsFramework::ComponentEntityObjectRequestBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorLockComponentNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler::BusDisconnect();
-
-        if (destroyOld && m_entityId != newEntityId)
-        {
-            EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, DestroyEditorEntity, m_entityId);
-        }
-
-        m_entityId.SetInvalid();
-    }
-
-    if (entity)
-    {
-        m_entityId = entity->GetId();
-
-        // note: GetObjectManager() will always be valid during normal operation but
-        // will not exist when running unit tests
-        if (IObjectManager* objectManager = GetObjectManager())
-        {
-            // Use the entity id to generate a GUID for this CEO because we need it to stay consistent for systems
-            // that register by GUID such as undo/redo since our own undo/redo system constantly recreates CEOs
-            GUID entityBasedGUID;
-            entityBasedGUID.Data1 = 0;
-            entityBasedGUID.Data2 = 0;
-            entityBasedGUID.Data3 = 0;
-            static_assert(sizeof(m_entityId) >= sizeof(entityBasedGUID.Data4), "The data contained in entity Id should fit inside Data4, if not switch to some other method of conversion to GUID");
-            memcpy(&entityBasedGUID.Data4, &m_entityId, sizeof(entityBasedGUID.Data4));
-
-            objectManager->ChangeObjectId(GetId(), entityBasedGUID);
-
-            // Synchronize sandbox name to new entity's name.
-            {
-                EditorActionScope nameChange(m_nameReentryGuard);
-                SetName(QString(entity->GetName().c_str()));
-            }
-        }
-
-        EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, AddRequiredComponents, *entity);
-
-        AZ::TransformNotificationBus::Handler::BusConnect(m_entityId);
-        LmbrCentral::RenderBoundsNotificationBus::Handler::BusConnect(m_entityId);
-        AzToolsFramework::ComponentEntityEditorRequestBus::Handler::BusConnect(m_entityId);
-        AZ::EntityBus::Handler::BusConnect(m_entityId);
-        AzToolsFramework::ComponentEntityObjectRequestBus::Handler::BusConnect(this);
-        AzToolsFramework::EditorLockComponentNotificationBus::Handler::BusConnect(m_entityId);
-        AzToolsFramework::EditorVisibilityNotificationBus::Handler::BusConnect(m_entityId);
-        AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler::BusConnect(m_entityId);
-
-        // Synchronize transform to Sandbox.
-        AzToolsFramework::Components::TransformComponent* transformComponent =
-            entity->FindComponent<AzToolsFramework::Components::TransformComponent>();
-        if (transformComponent)
-        {
-            OnTransformChanged(transformComponent->GetLocalTM(), transformComponent->GetWorldTM());
-        }
-    }
-
-    RefreshVisibilityAndLock();
-}
-
-void CComponentEntityObject::RefreshVisibilityAndLock()
-{
-    using AzToolsFramework::EditorEntityInfoRequestBus;
-    using AzToolsFramework::EditorEntityLockComponentNotificationBus;
-    using AzToolsFramework::EditorEntityVisibilityNotificationBus;
-
-    // Lock state is tracked in 3 places:
-    // EditorLockComponent, EditorEntityModel, and ComponentEntityObject.
-    // Entities in layers have additional behavior in relation to lock state, if the layer is locked it supersedes the entity's lock state.
-    // The viewport controls for manipulating entities are disabled during lock state here in ComponentEntityObject using the OBJFLAG_FROZEN.
-    // In this case, the lock behavior should include the layer hierarchy as well, if the layer is locked this entity can't move.
-    // EditorEntityModel can report this information.
-    bool locked = false;
-    EditorEntityInfoRequestBus::EventResult(
-        locked, m_entityId, &EditorEntityInfoRequestBus::Events::IsLocked);
-
-    EditorEntityLockComponentNotificationBus::Event(
-        m_entityId, &EditorEntityLockComponentNotificationBus::Events::OnEntityLockChanged, locked);
-
-    // OBJFLAG_HIDDEN should match EditorVisibilityComponent's VisibilityFlag.
-    // Visibility state is similar to lock state in the number of areas it can be set / tracked. See the comment about the lock state above.
-    bool visibility = true;
-    EditorEntityInfoRequestBus::EventResult(
-        visibility, m_entityId, &EditorEntityInfoRequestBus::Events::IsVisible);
-
-    EditorEntityVisibilityNotificationBus::Event(
-        m_entityId, &EditorEntityVisibilityNotificationBus::Events::OnEntityVisibilityChanged, visibility);
-}
-
-void CComponentEntityObject::SetName(const QString& name)
-{
-    if (m_nameReentryGuard)
-    {
-        EditorActionScope nameChange(m_nameReentryGuard);
-
-        AZ::Entity* entity = nullptr;
-        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
-
-        if (entity)
-        {
-            entity->SetName(name.toUtf8().data());
-        }
-    }
-
-    CEntityObject::SetName(name);
-}
-
-void CComponentEntityObject::DeleteEntity()
-{
-    AssignEntity(nullptr);
-
-    CEntityObject::DeleteEntity();
-}
-
-float CComponentEntityObject::GetRadius()
-{
-    static const float s_defaultRadius = 0.5f;
-    return s_defaultRadius;
-}
-
-void CComponentEntityObject::SetSelected(bool bSelect)
-{
-    CEntityObject::SetSelected(bSelect);
-
-    if (m_selectionReentryGuard)
-    {
-        // Ignore event when received from the tools app, since the action is originating in Sandbox.
-        EditorActionScope selectionChange(m_selectionReentryGuard);
-
-        // Pass the action to the tools application.
-        if (bSelect)
-        {
-            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::MarkEntitySelected, m_entityId);
-        }
-        else
-        {
-            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::MarkEntityDeselected, m_entityId);
-        }
-    }
-
-    bool anySelected = false;
-    
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(anySelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
-
-    if (!anySelected)
-    {
-        GetIEditor()->Notify(eNotify_OnEntitiesDeselected);
-    }
-    else
-    {
-        GetIEditor()->Notify(eNotify_OnEntitiesSelected);
-    }
-}
-
-void CComponentEntityObject::SetHighlight(bool bHighlight)
-{
-    CEntityObject::SetHighlight(bHighlight);
-
-    if (m_entityId.IsValid())
-    {
-        EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, SetEntityHighlighted, m_entityId, 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)
-    {
-        EditorActionScope selectionChange(m_nameReentryGuard);
-
-        SetName(QString(name.c_str()));
-    }
-}
-
-void CComponentEntityObject::AttachChild(CBaseObject* child, bool /*bKeepPos*/)
-{
-    if (child->GetType() == OBJTYPE_AZENTITY)
-    {
-        CComponentEntityObject* childComponentEntity = static_cast<CComponentEntityObject*>(child);
-        AZ::EntityId childEntityId = childComponentEntity->GetAssociatedEntityId();
-        if (childEntityId.IsValid())
-        {
-            // The action is originating from Sandbox, so ignore the return event.
-            EditorActionScope parentChange(childComponentEntity->m_parentingReentryGuard);
-
-            {
-                AzToolsFramework::ScopedUndoBatch undoBatch("Editor Parent");
-                EBUS_EVENT_ID(childEntityId, AZ::TransformBus, SetParent, m_entityId);
-                undoBatch.MarkEntityDirty(childEntityId);
-            }
-
-            EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values);
-        }
-    }
-}
-
-void CComponentEntityObject::DetachAll(bool /*bKeepPos*/)
-{
-}
-
-void CComponentEntityObject::DetachThis(bool /*bKeepPos*/)
-{
-    if (m_parentingReentryGuard)
-    {
-        EditorActionScope parentChange(m_parentingReentryGuard);
-
-        if (m_entityId.IsValid())
-        {
-            AzToolsFramework::ScopedUndoBatch undoBatch("Editor Unparent");
-            EBUS_EVENT_ID(m_entityId, AZ::TransformBus, SetParent, AZ::EntityId());
-            undoBatch.MarkEntityDirty(m_entityId);
-        }
-
-        EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values);
-    }
-}
-
-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);
-}
-
-void CComponentEntityObject::SetFrozen(bool frozen)
-{
-    if (m_lockedReentryGuard)
-    {
-        EditorActionScope flagChange(m_lockedReentryGuard);
-        AzToolsFramework::SetEntityLockState(m_entityId, frozen);
-    }
-}
-
-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);
-}
-
-void CComponentEntityObject::OnEntityIconChanged(const AZ::Data::AssetId& entityIconAssetId)
-{
-    (void)entityIconAssetId;
-    SetupEntityIcon();
-}
-
-void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldParent, [[maybe_unused]] AZ::EntityId newParent)
-{
-}
-
-void CComponentEntityObject::OnRenderBoundsReset()
-{
-    CEntityObject::InvalidateTM(0);
-}
-
-void CComponentEntityObject::SetSandboxObjectAccent(AzToolsFramework::EntityAccentType accent)
-{
-    m_accentType = accent;
-    AzToolsFramework::EditorComponentSelectionNotificationsBus::Event(m_entityId,
-        &AzToolsFramework::EditorComponentSelectionNotificationsBus::Events::OnAccentTypeChanged, m_accentType);
-}
-
-void CComponentEntityObject::SetSandBoxObjectIsolated(bool isIsolated)
-{
-    m_isIsolated = isIsolated;
-    GetIEditor()->GetObjectManager()->InvalidateVisibleList();
-}
-
-bool CComponentEntityObject::IsSandBoxObjectIsolated()
-{
-    return m_isIsolated;
-}
-
-bool CComponentEntityObject::SetPos(const Vec3& pos, int flags)
-{
-    bool isAzEditorTransformLocked = false;
-    AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(isAzEditorTransformLocked, m_entityId,
-        &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
-
-    bool lockTransformOnUserInput = isAzEditorTransformLocked && (flags & eObjectUpdateFlags_UserInput);
-
-    if (IsLayer() || lockTransformOnUserInput)
-    {
-        return false;
-    }
-    if ((flags & eObjectUpdateFlags_MoveTool) || (flags & eObjectUpdateFlags_UserInput))
-    {
-        // If we have a parent also in the selection set, don't allow the move tool to manipulate our position.
-        if (IsNonLayerAncestorSelected())
-        {
-            return false;
-        }
-    }
-
-    return CEntityObject::SetPos(pos, flags);
-}
-
-bool CComponentEntityObject::SetRotation(const Quat& rotate, int flags)
-{
-    bool isAzEditorTransformLocked = false;
-    AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(isAzEditorTransformLocked, m_entityId,
-        &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
-
-    bool lockTransformOnUserInput = isAzEditorTransformLocked && (flags & eObjectUpdateFlags_UserInput);
-
-    if (IsLayer() || lockTransformOnUserInput)
-    {
-        return false;
-    }
-    if (flags & eObjectUpdateFlags_UserInput)
-    {
-        // If we have a parent also in the selection set, don't allow the rotate tool to manipulate our position.
-        if (IsNonLayerAncestorSelected())
-        {
-            return false;
-        }
-    }
-
-    return CEntityObject::SetRotation(rotate, flags);
-}
-
-bool CComponentEntityObject::SetScale(const Vec3& scale, int flags)
-{
-    bool isAzEditorTransformLocked = false;
-    AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(isAzEditorTransformLocked, m_entityId,
-        &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
-
-    bool lockTransformOnUserInput = isAzEditorTransformLocked && (flags & eObjectUpdateFlags_UserInput);
-
-    if (IsLayer() || lockTransformOnUserInput)
-    {
-        return false;
-    }
-    if ((flags & eObjectUpdateFlags_ScaleTool) || (flags & eObjectUpdateFlags_UserInput))
-    {
-        // If we have a parent also in the selection set, don't allow the scale tool to manipulate our position.
-        if (IsNonLayerAncestorSelected())
-        {
-            return false;
-        }
-    }
-
-    return CEntityObject::SetScale(scale, flags);
-}
-
-bool CComponentEntityObject::IsNonLayerAncestorSelected() const
-{
-    AZ::EntityId parentId;
-    AZ::TransformBus::EventResult(parentId, m_entityId, &AZ::TransformBus::Events::GetParentId);
-    while (parentId.IsValid())
-    {
-        CComponentEntityObject* parentObject = CComponentEntityObject::FindObjectForEntity(parentId);
-        if (parentObject && parentObject->IsSelected())
-        {
-            bool isLayerEntity = false;
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-                isLayerEntity,
-                parentObject->GetAssociatedEntityId(),
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-            if (!isLayerEntity)
-            {
-                return true;
-            }
-        }
-
-        AZ::EntityId currentParentId = parentId;
-        parentId.SetInvalid();
-        AZ::TransformBus::EventResult(parentId, currentParentId, &AZ::TransformBus::Events::GetParentId);
-    }
-
-    return false;
-}
-
-bool CComponentEntityObject::IsLayer() const
-{
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        m_entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-    return isLayerEntity;
-}
-
-bool CComponentEntityObject::IsAncestorIconDrawingAtSameLocation() const
-{
-    if (m_entityId.IsValid())
-    {
-        AZ::EntityId parentId;
-        AZ::TransformBus::EventResult(parentId, m_entityId, &AZ::TransformBus::Events::GetParentId);
-        if (!parentId.IsValid())
-        {
-            return false;
-        }
-
-        AZ::Vector3 worldTranslation;
-        AZ::TransformBus::EventResult(worldTranslation, m_entityId, &AZ::TransformBus::Events::GetWorldTranslation);
-
-        while (parentId.IsValid())
-        {
-            AZ::Vector3 parentTranslation;
-            AZ::TransformBus::EventResult(parentTranslation, parentId, &AZ::TransformBus::Events::GetWorldTranslation);
-
-            if (parentTranslation.GetDistanceSq(worldTranslation) < 0.01f)
-            {
-                CComponentEntityObject* parentObject = CComponentEntityObject::FindObjectForEntity(parentId);
-                if (parentObject && !parentObject->IsSelected() && parentObject->IsEntityIconVisible())
-                {
-                    // An ancestor in the same location that's not selected and has icon visible has been found
-                    return true;
-                }
-            }
-
-            AZ::EntityId currentParentId = parentId;
-            parentId.SetInvalid();
-            AZ::TransformBus::EventResult(parentId, currentParentId, &AZ::TransformBus::Events::GetParentId);
-        }
-    }
-    return false;
-}
-
-bool CComponentEntityObject::IsDescendantSelectedAtSameLocation() const
-{
-    if (m_entityId.IsValid())
-    {
-        if (GetObjectManager()->GetSelection() && GetObjectManager()->GetSelection()->GetCount() == 0)
-        {
-            return false;
-        }
-
-        AZ::Vector3 worldTranslation;
-        AZ::TransformBus::EventResult(worldTranslation, m_entityId, &AZ::TransformBus::Events::GetWorldTranslation);
-
-        // For each descendant, check if it's selected and if so if it's located at the same location as we are
-        AzToolsFramework::EntityIdList descendantIds;
-        AZ::TransformBus::EventResult(descendantIds, m_entityId, &AZ::TransformBus::Events::GetAllDescendants);
-        for (AZ::EntityId entityId : descendantIds)
-        {
-            CComponentEntityObject* descendantObject = CComponentEntityObject::FindObjectForEntity(entityId);
-            if (descendantObject && descendantObject->IsSelected())
-            {
-                // Check if this entity is at the exact location of us
-                AZ::Vector3 entityTranslation;
-                AZ::TransformBus::EventResult(entityTranslation, entityId, &AZ::TransformBus::Events::GetWorldTranslation);
-                if (entityTranslation.GetDistanceSq(worldTranslation) < 0.01f)
-                {
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-
-void CComponentEntityObject::InvalidateTM(int nWhyFlags)
-{
-    CEntityObject::InvalidateTM(nWhyFlags);
-
-    if (m_transformReentryGuard)
-    {
-        EditorActionScope transformChange(m_transformReentryGuard);
-
-        if (m_entityId.IsValid())
-        {
-            Matrix34 worldTransform = GetWorldTM();
-            EBUS_EVENT_ID(m_entityId, AZ::TransformBus, SetWorldTM, LYTransformToAZTransform(worldTransform));
-        }
-    }
-}
-
-void CComponentEntityObject::OnTransformChanged([[maybe_unused]] const AZ::Transform& local, const AZ::Transform& world)
-{
-    if (m_transformReentryGuard) // Ignore if action originated from Sandbox.
-    {
-        EditorActionScope transformChange(m_transformReentryGuard);
-        Matrix34 worlTM = AZTransformToLYTransform(world);
-        SetLocalTM(worlTM, eObjectUpdateFlags_Animated);
-    }
-}
-
-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 = entityScreenPos.x();
-            const float screenPosY = 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(AZ::Debug::ProfileCategory::Entity);
-
-    if (m_iconOnlyHitTest)
-    {
-        return false;
-    }
-
-    if (m_entityId.IsValid())
-    {
-        // Pick against bounding box/geometry
-        AABB bounds(AABB::RESET);
-        GetBoundBox(bounds);
-        if (!bounds.IsReset())
-        {
-            Vec3 hitPos;
-            if (Intersect::Ray_AABB(Ray(hc.raySrc, hc.rayDir), bounds, hitPos))
-            {
-                bool rayIntersection = false;
-                bool preciseSelectionRequired = false;
-                float closestDistance = std::numeric_limits<float>::max();
-
-                const int viewportId = GetIEditor()->GetViewManager()->GetGameViewport()->GetViewportId();
-                AzToolsFramework::EditorComponentSelectionRequestsBus::EnumerateHandlersId(m_entityId,
-                    [&hc, &closestDistance, &rayIntersection, &preciseSelectionRequired, viewportId](
-                        AzToolsFramework::EditorComponentSelectionRequests* handler) -> bool
-                {
-                    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
-
-                    if (handler->SupportsEditorRayIntersect())
-                    {
-                        float distance = std::numeric_limits<float>::max();
-                        preciseSelectionRequired = true;
-                        const bool intersection = handler->EditorSelectionIntersectRayViewport(
-                            { viewportId }, LYVec3ToAZVec3(hc.raySrc), LYVec3ToAZVec3(hc.rayDir), distance);
-
-                        rayIntersection = rayIntersection || intersection;
-
-                        if (intersection && distance < closestDistance)
-                        {
-                            closestDistance = distance;
-                        }
-                    }
-
-                    return true; // iterate over all handlers
-                });
-
-                hc.object = this;
-
-                if (preciseSelectionRequired)
-                {
-                    hc.dist = closestDistance;
-                    return rayIntersection;
-                }
-
-                hc.dist = (hitPos - hc.raySrc).GetLength();
-                return true;
-
-            }
-
-            return false;
-        }
-    }
-
-    const Vec3 origin = GetWorldPos();
-    const float radius = GetRadius();
-
-    Vec3 w = origin - hc.raySrc;
-    Vec3 wcross = hc.rayDir.Cross(w);
-    const float d = wcross.GetLengthSquared();
-
-    if (d < square(radius) + hc.distanceTolerance &&
-        w.GetLengthSquared() > square(radius))
-    {
-        Vec3 i0;
-        hc.object = this;
-        if (Intersect::Ray_SphereFirst(Ray(hc.raySrc, hc.rayDir), ::Sphere(origin, radius), i0))
-        {
-            hc.dist = hc.raySrc.GetDistance(i0);
-            return true;
-        }
-        hc.dist = hc.raySrc.GetDistance(origin);
-        return true;
-    }
-
-    return false;
-}
-
-void CComponentEntityObject::GetBoundBox(AABB& box)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Entity);
-
-    box.Reset();
-
-    const AZ::EntityId entityId = m_entityId;
-    if (entityId.IsValid())
-    {
-        CViewport* gameViewport = GetIEditor()->GetViewManager()->GetGameViewport();
-        const int viewportId =  gameViewport ? gameViewport->GetViewportId() : -1;
-
-        if (const AZ::Aabb bound =
-                AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, AzFramework::ViewportInfo{viewportId});
-            bound.IsValid())
-        {
-            box.Add(AZVec3ToLYVec3(bound.GetMin()));
-            box.Add(AZVec3ToLYVec3(bound.GetMax()));
-            return;
-        }
-    }
-
-    CBaseObject::GetBoundBox(box);
-}
-
-void CComponentEntityObject::GetLocalBounds(AABB& box)
-{
-    box.Reset();
-
-    float r = GetRadius();
-    box.min = -Vec3(r, r, r);
-    box.max = Vec3(r, r, r);
-}
-
-XmlNodeRef CComponentEntityObject::Export([[maybe_unused]] const QString& levelPath, [[maybe_unused]] XmlNodeRef& xmlNode)
-{
-    // All component entities are serialized out in a separate pass, so they can be
-    // loaded en-masse rather than individually. As such, we don't export them
-    // alongside Cry Entities.
-    return XmlNodeRef();
-}
-
-CComponentEntityObject* CComponentEntityObject::FindObjectForEntity(AZ::EntityId id)
-{
-    CEntityObject* object = nullptr;
-    EBUS_EVENT_ID_RESULT(object, id, AzToolsFramework::ComponentEntityEditorRequestBus, GetSandboxObject);
-
-    if (object && (object->GetType() == OBJTYPE_AZENTITY))
-    {
-        return static_cast<CComponentEntityObject*>(object);
-    }
-
-    return nullptr;
-}
-
-void CComponentEntityObject::Display(DisplayContext& dc)
-{
-    if (!(dc.flags & DISPLAY_2D))
-    {
-        m_entityIconVisible = false;
-    }
-
-    bool displaySelectionHelper = false;
-    if (!CanBeDrawn(dc, displaySelectionHelper))
-    {
-        return;
-    }
-
-    DrawDefault(dc);
-
-    bool showIcons = m_hasIcon;
-    if (showIcons)
-    {
-        SEditorSettings* editorSettings = GetIEditor()->GetEditorSettings();
-        if (!editorSettings->viewports.bShowIcons && !editorSettings->viewports.bShowSizeBasedIcons)
-        {
-            showIcons = false;
-        }
-    }
-
-    if (m_entityId.IsValid())
-    {
-        // Draw link to parent if this or the parent object are selected.
-        {
-            AZ::EntityId parentId;
-            EBUS_EVENT_ID_RESULT(parentId, m_entityId, AZ::TransformBus, GetParentId);
-            if (parentId.IsValid())
-            {
-                bool isParentVisible = false;
-                AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isParentVisible, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
-
-                CComponentEntityObject* parentObject = CComponentEntityObject::FindObjectForEntity(parentId);
-                if (isParentVisible && (IsSelected() || (parentObject && parentObject->IsSelected())))
-                {
-                    const QColor kLinkColorParent(0, 255, 255);
-                    const QColor kLinkColorChild(0, 0, 255);
-
-                    AZ::Vector3 parentTranslation;
-                    EBUS_EVENT_ID_RESULT(parentTranslation, parentId, AZ::TransformBus, GetWorldTranslation);
-                    dc.DrawLine(AZVec3ToLYVec3(parentTranslation), GetWorldTM().GetTranslation(), kLinkColorParent, kLinkColorChild);
-                }
-            }
-        }
-
-        // Don't draw icons if we have an ancestor in the same location that has an icon - makes sure
-        // ancestor icons draw on top and are able to be selected over children. Also check if a descendant
-        // is selected at the same location. In cases of entity hierarchies where numerous ancestors have
-        // no position offset, we need this so the ancestors don't draw over us when we're selected
-        if (showIcons)
-        {
-            if ((dc.flags & DISPLAY_2D) ||
-                IsSelected() ||
-                IsAncestorIconDrawingAtSameLocation() ||
-                IsDescendantSelectedAtSameLocation())
-            {
-                showIcons = false;
-            }
-        }
-
-        // Allow components to override in-editor visualization.
-        {
-            const AzFramework::DisplayContextRequestGuard displayContextGuard(dc);
-
-            AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
-            AzFramework::DebugDisplayRequestBus::Bind(
-                debugDisplayBus, AzFramework::g_defaultSceneEntityDebugDisplayId);
-            AZ_Assert(debugDisplayBus, "Invalid DebugDisplayRequestBus.");
-
-            AzFramework::DebugDisplayRequests* debugDisplay =
-                AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
-
-            AzFramework::EntityDebugDisplayEventBus::Event(
-                m_entityId, &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport,
-                AzFramework::ViewportInfo{ dc.GetView()->asCViewport()->GetViewportId() },
-                *debugDisplay);
-        }
-    }
-}
-
-void CComponentEntityObject::DrawDefault(DisplayContext& dc, const QColor& labelColor)
-{
-    CEntityObject::DrawDefault(dc, labelColor);
-
-    DrawAccent(dc);
-}
-
-IStatObj* CComponentEntityObject::GetIStatObj()
-{
-    return nullptr;
-}
-
-bool CComponentEntityObject::IsIsolated() const
-{
-    return m_isIsolated;
-}
-
-bool CComponentEntityObject::IsSelected() const
-{
-    return AzToolsFramework::IsSelected(m_entityId);
-}
-
-bool CComponentEntityObject::IsSelectable() const
-{
-    return AzToolsFramework::IsSelectableInViewport(m_entityId);
-}
-
-void CComponentEntityObject::SetWorldPos(const Vec3& pos, int flags)
-{
-    // Layers, by design, are not supposed to be moveable. Layers are intended to just be a grouping
-    // mechanism to allow teams to cleanly split their level into working zones, and a moveable position
-    // complicates that behavior more than it helps.
-    // Unfortunately component entity objects have a position under the hood, so prevent layers from moving here.
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        m_entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-
-    bool isAzEditorTransformLocked = false;
-    AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(isAzEditorTransformLocked, m_entityId,
-        &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
-
-    bool lockTransformOnUserInput = isAzEditorTransformLocked && (flags & eObjectUpdateFlags_UserInput);
-
-    if (isLayerEntity || lockTransformOnUserInput)
-    {
-        return;
-    }
-    CEntityObject::SetWorldPos(pos, flags);
-}
-
-void CComponentEntityObject::OnContextMenu(QMenu* /*pMenu*/)
-{
-    // Deliberately bypass the base class implementation (CEntityObject::OnContextMenu()).
-}
-
-void CComponentEntityObject::SetupEntityIcon()
-{
-    bool hideIconInViewport = false;
-    m_hasIcon = false;
-
-    AzToolsFramework::EditorEntityIconComponentRequestBus::EventResult(hideIconInViewport, m_entityId, &AzToolsFramework::EditorEntityIconComponentRequestBus::Events::IsEntityIconHiddenInViewport);
-
-    if (!hideIconInViewport)
-    {
-        AzToolsFramework::EditorEntityIconComponentRequestBus::EventResult(m_icon, m_entityId, &AzToolsFramework::EditorEntityIconComponentRequestBus::Events::GetEntityIconPath);
-
-        if (!m_icon.empty())
-        {
-            m_hasIcon = true;
-
-            // ToDo: Get from Atom?
-            // int textureId = GetIEditor()->GetIconManager()->GetIconTexture(m_icon.c_str());
-            m_iconTexture = nullptr;
-        }
-    }
-}
-
-void CComponentEntityObject::DrawAccent(DisplayContext& dc)
-{
-    if (!m_drawAccents)
-    {
-        return;
-    }
-
-    switch (m_accentType)
-    {
-        case AzToolsFramework::EntityAccentType::None:
-        {
-            if (dc.flags & DISPLAY_2D)
-            {
-                dc.SetColor(0.941f, 0.764f, 0.176f); // Yellow
-            }
-            else
-            {
-                return;
-            }
-            break;
-        }
-        case AzToolsFramework::EntityAccentType::Hover:
-        {
-            dc.SetColor(0, 1, 0); // Green
-            break;
-        }
-        case AzToolsFramework::EntityAccentType::Selected:
-        {
-            dc.SetColor(1, 0, 0); // Red
-            break;
-        }
-        case AzToolsFramework::EntityAccentType::ParentSelected:
-        {
-            dc.SetColor(1, 0.549f, 0); // Orange
-            break;
-        }
-        case AzToolsFramework::EntityAccentType::SliceSelected:
-        {
-            dc.SetColor(0.117f, 0.565f, 1); // Blue
-            break;
-        }
-        default:
-        {
-            dc.SetColor(1, 0.0784f, 0.576f); // Pink
-            break;
-        }
-    }
-
-    // if there are no explicit handlers, default to show the aabb when the mouse is over or the entity is selected.
-    // this will be the case with newly added entities without explicit handlers attached (no components).
-    if (!AzToolsFramework::EditorComponentSelectionRequestsBus::HasHandlers(m_entityId))
-    {
-        AABB box;
-        GetBoundBox(box);
-        dc.DrawWireBox(box.min, box.max);
-    }
-}
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
deleted file mode 100644
index 5330537f26..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_COMPONENTENTITYOBJECT_H
-#define CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_COMPONENTENTITYOBJECT_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Component/EntityBus.h>
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorLockComponentBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-
-#include <QtViewPane.h>
-
-#include "../Editor/Objects/EntityObject.h"
-#include <LmbrCentral/Rendering/RenderBoundsBus.h>
-#endif
-
-class QMenu;
-
-/**
-* Sandbox representation of component entities (AZ::Entity).
-*/
-class CComponentEntityObject
-    : public CEntityObject
-    , private AzToolsFramework::EditorLockComponentNotificationBus::Handler
-    , private AzToolsFramework::EditorVisibilityNotificationBus::Handler
-    , private AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler
-    , private AZ::TransformNotificationBus::Handler
-    , private LmbrCentral::RenderBoundsNotificationBus::Handler
-    , private AzToolsFramework::ComponentEntityEditorRequestBus::Handler
-    , private AzToolsFramework::ComponentEntityObjectRequestBus::Handler
-    , private AZ::EntityBus::Handler
-{
-public:
-    CComponentEntityObject();
-    ~CComponentEntityObject();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Overrides from CEntityObject/CBaseObject.
-    //////////////////////////////////////////////////////////////////////////
-    bool Init(IEditor* ie, CBaseObject* prev, const QString& file) override;
-    void InitVariables() override {};
-    bool SetPos(const Vec3& pos, int flags = 0) override;
-    bool SetRotation(const Quat& rotate, int flags) override;
-    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;
-
-    void SetWorldPos(const Vec3& pos, int flags = 0) override;
-
-    // Always returns false as Component entity highlighting (accenting) is taken care of elsewhere
-    bool IsHighlighted() { return false; }
-    // Component entity highlighting (accenting) is taken care of elsewhere
-    void DrawHighlight(DisplayContext& /*dc*/) {};
-
-    // 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; }
-
-
-
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // AZ::EntityBus::Handler
-    void OnEntityNameChanged(const AZStd::string& name) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorLockComponentNotificationBus::Handler
-    void OnEntityLockChanged(bool locked) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorVisibilityNotificationBus::Handler
-    void OnEntityVisibilityChanged(bool flag) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorEntityIconComponentNotificationBus::Handler
-    void OnEntityIconChanged(const AZ::Data::AssetId& entityIconAssetId) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    //! AZ::TransformNotificationBus::Handler
-    void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-    void OnParentChanged(AZ::EntityId oldParent, AZ::EntityId newParent) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    //! RenderBoundsNotificationBus
-    void OnRenderBoundsReset() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    //! ComponentEntityEditorRequestBus
-    CEntityObject* GetSandboxObject() override { return this; }
-    bool IsSandboxObjectHighlighted() override { return IsHighlighted(); }
-    void SetSandboxObjectAccent(AzToolsFramework::EntityAccentType accent) override;
-    void SetSandBoxObjectIsolated(bool isIsolated) override;
-    bool IsSandBoxObjectIsolated() override;
-    void RefreshVisibilityAndLock() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    //! ComponentEntityObjectRequestBus
-    AZ::EntityId GetAssociatedEntityId() override { return m_entityId; }
-    void UpdatePreemptiveUndoCache() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    void AssignEntity(AZ::Entity* entity, bool destroyOld = true);
-
-    bool IsEntityIconVisible() const { return m_entityIconVisible; }
-
-    static CComponentEntityObject* FindObjectForEntity(AZ::EntityId id);
-
-protected:
-    friend class CTemplateObjectClassDesc<CComponentEntityObject>;
-    friend class SandboxIntegrationManager;
-
-    static const GUID& GetClassID()
-    {
-        // {70650EB8-B1BD-4DC8-AC28-7CD767D7BB30}
-        static const GUID guid = {
-            0x70650EB8, 0xB1BD, 0x4DC8, { 0xac, 0x28, 0x7c, 0xd7, 0x67, 0xd7, 0xbb, 0x30 }
-        };
-        return guid;
-    }
-
-    float GetRadius();
-
-    void DeleteThis() { delete this; };
-
-    bool IsNonLayerAncestorSelected() const;
-    bool IsLayer() const;
-
-    bool IsAncestorIconDrawingAtSameLocation() const;
-
-    bool IsDescendantSelectedAtSameLocation() const;
-
-    void SetupEntityIcon();
-
-    void DrawAccent(DisplayContext& dc);
-
-    class EditorActionGuard
-    {
-    public:
-
-        EditorActionGuard()
-            : m_count(0) {}
-
-        void Enter()    { ++m_count; }
-        void Exit()     { --m_count; }
-
-        //! \return true if the guard passes.
-        operator bool() const {
-            return m_count <= 0;
-        }
-
-    private:
-
-        int m_count;
-    };
-
-    class EditorActionScope
-    {
-    public:
-
-        EditorActionScope(EditorActionGuard& guard)
-            : m_guard(guard)
-        {
-            m_guard.Enter();
-        }
-
-        ~EditorActionScope()
-        {
-            m_guard.Exit();
-        }
-
-    private:
-
-        EditorActionGuard& m_guard;
-    };
-
-    EditorActionGuard m_lockedReentryGuard;
-    EditorActionGuard m_nameReentryGuard;
-    EditorActionGuard m_selectionReentryGuard;
-    EditorActionGuard m_visibilityFlagReentryGuard;
-    EditorActionGuard m_transformReentryGuard;
-    EditorActionGuard m_parentingReentryGuard;
-
-    AzToolsFramework::EntityAccentType m_accentType;
-
-    //! Whether we have have a valid icon path in \ref m_icon
-    bool m_hasIcon;
-
-    //! Whether this component entity icon is visible
-    bool m_entityIconVisible;
-
-    //! Whether to only use this object's icon for hit tests. When enabled, we ignore hit tests
-    //! against the geometry of the object
-    bool m_iconOnlyHitTest;
-
-    //! Whether to draw accents for this object (accents include selection wireframe bounding boxes)
-    bool m_drawAccents;
-
-    //! Indicate if an entity is isolated when the editor is in Isolation Mode.
-    bool m_isIsolated;
-
-    //! EntityId that this editor object represents/is tied to
-    AZ::EntityId m_entityId;
-
-    //! Path to component entity icon for this object
-    AZStd::string m_icon;
-    ITexture* m_iconTexture;
-
-    //! Displays viewport icon for this entity.
-    //! \returns whether an icon is being displayed
-    bool DisplayEntityIcon(
-        DisplayContext& dc, AzFramework::DebugDisplayRequests& debugDisplay);
-};
-
-#endif // CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_COMPONENTENTITYOBJECT_H
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
deleted file mode 100644
index 05b6bf86f1..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ /dev/null
@@ -1,2046 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "SandboxIntegration.h"
-
-#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>
-#include <AzCore/Slice/SliceComponent.h>
-#include <AzCore/std/functional.h>
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/algorithm.h>
-#include <AzCore/std/numeric.h>
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Outcome/Outcome.h>
-#include <AzCore/Interface/Interface.h>
-#include <AzFramework/API/ApplicationAPI.h>
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/Entity/EntityContextBus.h>
-#include <AzFramework/Physics/Material.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/Visibility/BoundsBus.h>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <AzToolsFramework/API/EditorEntityAPI.h>
-#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
-#include <AzToolsFramework/Commands/EntityStateCommand.h>
-#include <AzToolsFramework/Commands/SelectionCommand.h>
-#include <AzToolsFramework/Commands/SliceDetachEntityCommand.h>
-#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
-#include <AzToolsFramework/Slice/SliceRequestBus.h>
-#include <AzToolsFramework/Slice/SliceUtilities.h>
-#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
-#include <AzToolsFramework/ToolsComponents/EditorLayerComponent.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityComponent.h>
-#include <AzToolsFramework/Undo/UndoSystem.h>
-#include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h>
-#include <AzToolsFramework/UI/Layer/AddToLayerMenu.h>
-#include <AzToolsFramework/UI/Prefab/PrefabIntegrationInterface.h>
-#include <AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
-#include <AzToolsFramework/UI/Layer/NameConflictWarning.hxx>
-#include <AzToolsFramework/ViewportSelection/EditorHelpers.h>
-#include <MathConversion.h>
-
-#include <Atom/RPI.Public/ViewportContext.h>
-#include <Atom/RPI.Public/ViewportContextBus.h>
-#include <AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h>
-
-
-#include "Objects/ComponentEntityObject.h"
-#include "ISourceControl.h"
-#include "UI/QComponentEntityEditorMainWindow.h"
-
-#include <LmbrCentral/Rendering/EditorLightComponentBus.h>
-#include <LmbrCentral/Scripting/TagComponentBus.h>
-#include <LmbrCentral/Scripting/EditorTagComponentBus.h>
-
-// Sandbox imports.
-#include <Editor/ActionManager.h>
-#include <Editor/CryEditDoc.h>
-#include <Editor/GameEngine.h>
-#include <Editor/DisplaySettings.h>
-#include <Editor/IconManager.h>
-#include <Editor/Settings.h>
-#include <Editor/StringDlg.h>
-#include <Editor/QtViewPaneManager.h>
-#include <Editor/EditorViewportSettings.h>
-#include <IResourceSelectorHost.h>
-#include "CryEdit.h"
-
-#include <QMenu>
-#include <QAction>
-#include <QWidgetAction>
-#include <QHBoxLayout>
-#include "MainWindow.h"
-
-#include "Include/IObjectManager.h"
-
-#include <AzCore/std/algorithm.h>
-
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Gathers all selected entities, culling any that have an ancestor in the selection.
-void GetSelectedEntitiesSetWithFlattenedHierarchy(AzToolsFramework::EntityIdSet& out)
-{
-    AzToolsFramework::EntityIdList entities;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-        entities,
-        &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    for (const AZ::EntityId& entityId : entities)
-    {
-        bool selectionIncludesTransformHeritage = false;
-        AZ::EntityId parent = entityId;
-        do
-        {
-            AZ::EntityId nextParentId;
-            AZ::TransformBus::EventResult(
-                /*result*/ nextParentId,
-                /*address*/ parent,
-                &AZ::TransformBus::Events::GetParentId);
-            parent = nextParentId;
-            if (!parent.IsValid())
-            {
-                break;
-            }
-            for (const AZ::EntityId& parentCheck : entities)
-            {
-                if (parentCheck == parent)
-                {
-                    selectionIncludesTransformHeritage = true;
-                    break;
-                }
-            }
-        } while (parent.IsValid() && !selectionIncludesTransformHeritage);
-
-        if (!selectionIncludesTransformHeritage)
-        {
-            out.insert(entityId);
-        }
-    }
-}
-
-SandboxIntegrationManager::SandboxIntegrationManager()
-    : m_inObjectPickMode(false)
-    , m_startedUndoRecordingNestingLevel(0)
-    , m_dc(nullptr)
-    , m_notificationWindowManager(new AzToolsFramework::SliceOverridesNotificationWindowManager())
-{
-    // Required to receive events from the Cry Engine undo system
-    GetIEditor()->GetUndoManager()->AddListener(this);
-
-    // Only create the PrefabIntegrationManager if prefabs are enabled
-    bool prefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-    if (prefabSystemEnabled)
-    {
-        m_prefabIntegrationManager = aznew AzToolsFramework::Prefab::PrefabIntegrationManager();
-    }
-}
-
-SandboxIntegrationManager::~SandboxIntegrationManager()
-{
-    GetIEditor()->GetUndoManager()->RemoveListener(this);
-
-    delete m_prefabIntegrationManager;
-    m_prefabIntegrationManager = nullptr;
-}
-
-void SandboxIntegrationManager::Setup()
-{
-    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-    AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusConnect();
-    AzToolsFramework::EditorRequests::Bus::Handler::BusConnect();
-    AzToolsFramework::EditorWindowRequests::Bus::Handler::BusConnect();
-    AzToolsFramework::EditorContextMenuBus::Handler::BusConnect();
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
-    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
-
-    AzFramework::DisplayContextRequestBus::Handler::BusConnect();
-
-    MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_FILE_SAVE_SLICE_TO_ROOT, [this]() {
-        SaveSlice(false);
-    });
-    MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_FILE_SAVE_SELECTED_SLICE, [this]() {
-        SaveSlice(true);
-    });
-
-    // Keep a reference to the interface EditorEntityUiInterface.
-    // This is used to register layer entities to their UI handler when the layer component is activated.
-    m_editorEntityUiInterface = AZ::Interface<AzToolsFramework::EditorEntityUiInterface>::Get();
-
-    AZ_Assert((m_editorEntityUiInterface != nullptr),
-        "SandboxIntegrationManager requires a EditorEntityUiInterface instance to be present on Setup().");
-
-    bool prefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-    if (prefabSystemEnabled)
-    {
-        m_prefabIntegrationInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabIntegrationInterface>::Get();
-        AZ_Assert(
-            (m_prefabIntegrationInterface != nullptr),
-            "SandboxIntegrationManager requires a PrefabIntegrationInterface instance to be present on Setup().");
-    }
-
-    m_editorEntityAPI = AZ::Interface<AzToolsFramework::EditorEntityAPI>::Get();
-    AZ_Assert(m_editorEntityAPI, "SandboxIntegrationManager requires an EditorEntityAPI instance to be present on Setup().");
-
-    AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler::BusConnect();
-}
-
-void SandboxIntegrationManager::SaveSlice(const bool& QuickPushToFirstLevel)
-{
-    AzToolsFramework::EntityIdList selectedEntities;
-    GetSelectedEntities(selectedEntities);
-    if (selectedEntities.size() == 0)
-    {
-        m_notificationWindowManager->CreateNotificationWindow(AzToolsFramework::SliceOverridesNotificationWindow::EType::TypeError, "Nothing selected - Select a slice entity with overrides and try again");
-        return;
-    }
-
-    AzToolsFramework::EntityIdList relevantEntities;
-    AZ::u32 entitiesInSlices;
-    AZStd::vector<AZ::SliceComponent::SliceInstanceAddress> sliceInstances;
-    GetEntitiesInSlices(selectedEntities, entitiesInSlices, sliceInstances);
-    if (entitiesInSlices > 0)
-    {
-        // Gather the set of relevant entities from the selected entities and all descendants
-        AzToolsFramework::EntityIdSet relevantEntitiesSet;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(relevantEntitiesSet,
-            &AzToolsFramework::ToolsApplicationRequestBus::Events::GatherEntitiesAndAllDescendents, selectedEntities);
-
-        relevantEntities.reserve(relevantEntitiesSet.size());
-        for (AZ::EntityId& id : relevantEntitiesSet)
-        {
-            relevantEntities.push_back(id);
-        }
-    }
-
-    int numEntitiesToAdd = 0;
-    int numEntitiesToRemove = 0;
-    int numEntitiesToUpdate = 0;
-    if (AzToolsFramework::SliceUtilities::SaveSlice(relevantEntities, numEntitiesToAdd, numEntitiesToRemove, numEntitiesToUpdate, QuickPushToFirstLevel))
-    {
-        if (numEntitiesToAdd > 0 || numEntitiesToRemove > 0 || numEntitiesToUpdate > 0)
-        {
-            m_notificationWindowManager->CreateNotificationWindow(
-                AzToolsFramework::SliceOverridesNotificationWindow::EType::TypeSuccess,
-                QString("Save slice to parent - %1 saved successfully").arg(numEntitiesToUpdate + numEntitiesToAdd + numEntitiesToRemove));
-        }
-        else
-        {
-            m_notificationWindowManager->CreateNotificationWindow(
-                AzToolsFramework::SliceOverridesNotificationWindow::EType::TypeError,
-                "Selected has no overrides - Select a slice entity with overrides and try again");
-        }
-    }
-    else
-    {
-        m_notificationWindowManager->CreateNotificationWindow(
-            AzToolsFramework::SliceOverridesNotificationWindow::EType::TypeError,
-            "Save slice to parent - Failed");
-    }
-}
-
-// This event handler is queued on main thread.
-void SandboxIntegrationManager::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
-{
-    bool prefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    if (!prefabSystemEnabled)
-    {
-        AZ::SliceComponent* editorRootSlice = nullptr;
-        AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(
-            editorRootSlice, &AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::GetEditorRootSlice);
-        AZ_Assert(editorRootSlice, "Editor root slice missing!");
-
-        for (auto restoreItr = m_sliceAssetDeletionErrorRestoreInfos.begin(); restoreItr != m_sliceAssetDeletionErrorRestoreInfos.end();)
-        {
-            if (restoreItr->m_assetId == assetId)
-            {
-                for (const auto& entityRestore : restoreItr->m_entityRestoreInfos)
-                {
-                    const AZ::EntityId& entityId = entityRestore.first;
-                    const AZ::SliceComponent::EntityRestoreInfo& restoreInfo = entityRestore.second;
-
-                    AZ::Entity* entity = editorRootSlice->FindEntity(entityId);
-                    if (entity)
-                    {
-                        AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
-                            &AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::RestoreSliceEntity, entity, restoreInfo,
-                            AzToolsFramework::SliceEntityRestoreType::Detached);
-                    }
-                    else
-                    {
-                        AZ_Error(
-                            "DetachSliceEntity", entity, "Unable to find previous detached entity of Id %s. Cannot undo \"Detach\" action.",
-                            entityId.ToString().c_str());
-                    }
-                }
-
-                restoreItr = m_sliceAssetDeletionErrorRestoreInfos.erase(restoreItr);
-            }
-            else
-            {
-                restoreItr++;
-            }
-        }
-    }
-}
-
-// No mutex is used for now because the only 
-// operation writing to shared resource is queued on main thread.
-void SandboxIntegrationManager::OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& assetInfo)
-{
-    bool isPrefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    // Check to see if the removed slice asset has any instance in the level, then check if 
-    // those dangling instances are directly under the root slice (not sub-slices). If yes,
-    // detach them and save necessary information so they can be restored when their slice asset
-    // comes back.
-
-    if (!isPrefabSystemEnabled && assetInfo.m_assetType == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
-    {
-        AZ::SliceComponent* rootSlice = nullptr;
-        AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(rootSlice,
-            &AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::GetEditorRootSlice);
-        AZ_Assert(rootSlice, "Editor root slice missing!");
-
-        AZStd::vector<AZ::EntityId> entitiesToDetach;
-        const AZ::SliceComponent::SliceList& subSlices = rootSlice->GetSlices();
-        for (const AZ::SliceComponent::SliceReference& subSliceRef : subSlices)
-        {
-            if (subSliceRef.GetSliceAsset().GetId() == assetId)
-            {
-                for (const AZ::SliceComponent::SliceInstance& sliceInst : subSliceRef.GetInstances())
-                {
-                    const AZ::SliceComponent::InstantiatedContainer* instContainer = sliceInst.GetInstantiated();
-                    for (AZ::Entity* entity : instContainer->m_entities)
-                    {
-                        entitiesToDetach.emplace_back(entity->GetId());
-                    }
-                }
-            }
-        }
-
-        AZ_Error("Editor", false, "The slice asset %s is deleted from disk, to prevent further data corruption, all of its root level slice instances are detached. "
-            "Restoring the slice asset on disk will revert the detaching operation.", assetInfo.m_relativePath.c_str());
-
-        AZ::SystemTickBus::QueueFunction([this, assetId, entitiesToDetach]() {
-            AZStd::vector<AZStd::pair<AZ::EntityId, AZ::SliceComponent::EntityRestoreInfo>> restoreInfos;
-            bool detachSuccess = false;
-            AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-                detachSuccess, &AzToolsFramework::ToolsApplicationRequestBus::Events::DetachEntities, entitiesToDetach, restoreInfos);
-            if (detachSuccess)
-            {
-                m_sliceAssetDeletionErrorRestoreInfos.emplace_back(assetId, AZStd::move(restoreInfos));
-            }
-        });
-    }
-}
-
-void SandboxIntegrationManager::GetEntitiesInSlices(
-    const AzToolsFramework::EntityIdList& selectedEntities,
-    AZ::u32& entitiesInSlices,
-    AZStd::vector<AZ::SliceComponent::SliceInstanceAddress>& sliceInstances)
-{
-    // Identify all slice instances affected by the selected entity set.
-    entitiesInSlices = 0;
-    for (const AZ::EntityId& entityId : selectedEntities)
-    {
-        AZ::SliceComponent::SliceInstanceAddress sliceAddress;
-        AzFramework::SliceEntityRequestBus::EventResult(sliceAddress, entityId,
-            &AzFramework::SliceEntityRequestBus::Events::GetOwningSlice);
-
-        if (sliceAddress.IsValid())
-        {
-            ++entitiesInSlices;
-
-            if (sliceInstances.end() == AZStd::find(sliceInstances.begin(), sliceInstances.end(), sliceAddress))
-            {
-                sliceInstances.push_back(sliceAddress);
-            }
-        }
-    }
-}
-
-void SandboxIntegrationManager::Teardown()
-{
-    AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler::BusDisconnect();
-    AzFramework::DisplayContextRequestBus::Handler::BusDisconnect();
-    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorContextMenuBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorWindowRequests::Bus::Handler::BusDisconnect();
-    AzToolsFramework::EditorRequests::Bus::Handler::BusDisconnect();
-    AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusDisconnect();
-}
-
-void SandboxIntegrationManager::SetDC(DisplayContext* dc)
-{
-    m_dc = dc;
-}
-
-DisplayContext* SandboxIntegrationManager::GetDC()
-{
-    return m_dc;
-}
-
-void SandboxIntegrationManager::OnBeginUndo([[maybe_unused]] const char* label)
-{
-    AzToolsFramework::UndoSystem::URSequencePoint* currentBatch = nullptr;
-    EBUS_EVENT_RESULT(currentBatch, AzToolsFramework::ToolsApplicationRequests::Bus, GetCurrentUndoBatch);
-
-    AZ_Assert(currentBatch, "No undo batch is active.");
-
-    // Only generate a Sandbox placeholder for root-level undo batches.
-    if (nullptr == currentBatch->GetParent())
-    {
-        // start Cry Undo
-        if (!CUndo::IsRecording())
-        {
-            GetIEditor()->BeginUndo();
-            // flag that we started recording the undo batch
-            m_startedUndoRecordingNestingLevel = 1;
-        }
-
-    }
-    else
-    {
-        if (m_startedUndoRecordingNestingLevel)
-        {
-            // if we previously started recording the undo, increment the nesting level so we can
-            // detect when we need to accept the undo in OnEndUndo()
-            m_startedUndoRecordingNestingLevel++;
-        }
-    }
-}
-
-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));
-    }
-    if (m_startedUndoRecordingNestingLevel)
-    {
-        m_startedUndoRecordingNestingLevel--;
-        if (m_startedUndoRecordingNestingLevel == 0)
-        {
-            if (changed)
-            {
-                // only accept the undo batch that we initially started undo recording on
-                GetIEditor()->AcceptUndo(label);
-            }
-            else
-            {
-                GetIEditor()->CancelUndo();
-            }
-        }
-    }
-}
-
-void SandboxIntegrationManager::EntityParentChanged(
-    const AZ::EntityId entityId,
-    const AZ::EntityId newParentId,
-    const AZ::EntityId oldParentId)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-    if (m_unsavedEntities.find(entityId) != m_unsavedEntities.end())
-    {
-        // New layers need the level to be saved.
-        bool isEntityLayer = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            isEntityLayer,
-            entityId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-        if (isEntityLayer)
-        {
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-                entityId,
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLevelSaveDependency);
-        }
-        // Don't need to track any other unsaved changes, this is a new entity that hasn't been saved yet.
-        return;
-    }
-
-    // If an entity is moved to or from a layer, then that layer can only safely be saved when the other layer or level saves, to prevent
-    // accidental duplication of entities.
-    // This logic doesn't clear the dependency flag if an entity changes parents multiple times between saves, so if an entity visits many layers
-    // 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;
-        }
-
-        bool isOldAncestorLayer = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            isOldAncestorLayer,
-            oldAncestor,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-        if (isOldAncestorLayer)
-        {
-            oldLayer = oldAncestor;
-            break;
-        }
-
-        // Must pass in an invalid id, because if no parent then nothing will modify the id variable to be invalid and stop at the no-parent case
-        AZ::EntityId nextParentId;
-        AZ::TransformBus::EventResult(
-            /*result*/ nextParentId,
-            /*address*/ oldAncestor,
-            &AZ::TransformBus::Events::GetParentId);
-        oldAncestor = nextParentId;
-    } while (oldAncestor.IsValid());
-
-    AZ::EntityId newAncestors = newParentId;
-    AZ::EntityId newAncestor = newParentId;
-
-    bool isGoingToRootScene = false;
-    AZ::EntityId newLayer;
-    do
-    {
-        if (!newAncestor.IsValid())
-        {
-            isGoingToRootScene = true;
-            break;
-        }
-
-        bool isNewAncestorLayer = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            isNewAncestorLayer,
-            newAncestor,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-        if (isNewAncestorLayer)
-        {
-            newLayer = newAncestor;
-            break;
-        }
-        // The parent may not be connected to the bus yet, so start with an invalid entity ID
-        // to prevent an infinite loop.
-        AZ::EntityId ancestorParent;
-        AZ::TransformBus::EventResult(
-            /*result*/ ancestorParent,
-            /*address*/ newAncestor,
-            &AZ::TransformBus::Events::GetParentId);
-        newAncestor = ancestorParent;
-    } while (newAncestor.IsValid());
-
-    if (oldLayer.IsValid() && newLayer != oldLayer)
-    {
-        if (newLayer.IsValid())
-        {
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-                oldLayer,
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLayerSaveDependency,
-                newLayer);
-        }
-        else
-        {
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-                oldLayer,
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLevelSaveDependency);
-        }
-    }
-
-    if (newLayer.IsValid() && newLayer != oldLayer)
-    {
-        if (oldLayer.IsValid())
-        {
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-                newLayer,
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLayerSaveDependency,
-                oldLayer);
-        }
-        else
-        {
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-                newLayer,
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::AddLevelSaveDependency);
-        }
-    }
-}
-
-void SandboxIntegrationManager::OnSaveLevel()
-{
-    m_unsavedEntities.clear();
-}
-
-int SandboxIntegrationManager::GetMenuPosition() const
-{
-    return aznumeric_cast<int>(AzToolsFramework::EditorContextMenuOrdering::TOP);
-}
-
-void SandboxIntegrationManager::PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags)
-{
-    if (!IsLevelDocumentOpen())
-    {
-        return;
-    }
-
-    if (flags & AzToolsFramework::EditorEvents::eECMF_USE_VIEWPORT_CENTER)
-    {
-        CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
-        int width = 0;
-        int height = 0;
-        // If there is no 3D Viewport active to aid in the positioning of context menu
-        // operations, we don't need to store anything but default values here. Any code
-        // using these numbers for placement should default to the origin when there's
-        // no 3D viewport to raycast into.
-        if (view)
-        {
-            view->GetDimensions(&width, &height);
-        }
-        m_contextMenuViewPoint.Set(width / 2, height / 2);
-    }
-    else
-    {
-        m_contextMenuViewPoint = point;
-    }
-
-    CGameEngine* gameEngine = GetIEditor()->GetGameEngine();
-    if (!gameEngine || !gameEngine->IsLevelLoaded())
-    {
-        return;
-    }
-
-    menu->setToolTipsVisible(true);
-
-    AzToolsFramework::EntityIdList selected;
-    GetSelectedOrHighlightedEntities(selected);
-
-    QAction* action = nullptr;
-
-    action = menu->addAction(QObject::tr("Create entity"));
-    QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_NewEntity(); });
-
-    if (selected.size() == 1)
-    {
-        action = menu->addAction(QObject::tr("Create child entity"));
-        QObject::connect(action, &QAction::triggered, action, [selected]
-        {
-            EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, CreateNewEntityAsChild, selected.front());
-        });
-    }
-
-    bool prefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    if (!prefabSystemEnabled)
-    {
-        menu->addSeparator();
-
-        action = menu->addAction(QObject::tr("Create layer"));
-        QObject::connect(action, &QAction::triggered, [this] { ContextMenu_NewLayer(); });
-
-        AzToolsFramework::EntityIdList entities;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-            entities,
-            &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-        SetupLayerContextMenu(menu);
-        AzToolsFramework::EntityIdSet flattenedSelection = AzToolsFramework::GetCulledEntityHierarchy(entities);
-        AzToolsFramework::SetupAddToLayerMenu(menu, flattenedSelection, [this] { return ContextMenu_NewLayer(); });
-
-        SetupSliceContextMenu(menu);
-    }
-
-    action = menu->addAction(QObject::tr("Duplicate"));
-    QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_Duplicate(); });
-    if (selected.size() == 0)
-    {
-        action->setDisabled(true);
-    }
-
-    if (!prefabSystemEnabled)
-    {
-        action = menu->addAction(QObject::tr("Delete"));
-        QObject::connect(action, &QAction::triggered, action, [this] { ContextMenu_DeleteSelected(); });
-        if (selected.size() == 0)
-        {
-            action->setDisabled(true);
-        }
-    }
-
-    menu->addSeparator();
-
-    if (selected.size() > 0)
-    {
-        action = menu->addAction(QObject::tr("Open pinned Inspector"));
-        QObject::connect(action, &QAction::triggered, action, [this, selected]
-        {
-            AzToolsFramework::EntityIdSet pinnedEntities(selected.begin(), selected.end());
-            OpenPinnedInspector(pinnedEntities);
-        });
-        if (selected.size() > 0)
-        {
-            action = menu->addAction(QObject::tr("Find in Entity Outliner"));
-            QObject::connect(action, &QAction::triggered, [this, selected]
-            {
-                AzToolsFramework::EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::OnFocusInEntityOutliner, selected);
-            });
-        }
-        menu->addSeparator();
-    }
-}
-
-void SandboxIntegrationManager::OpenPinnedInspector(const AzToolsFramework::EntityIdSet& entities)
-{
-    QDockWidget* dockWidget = InstanceViewPane(LyViewPane::EntityInspectorPinned);
-    if (dockWidget)
-    {
-        QComponentEntityEditorInspectorWindow* editor = static_cast<QComponentEntityEditorInspectorWindow*>(dockWidget->widget());
-        if (editor && editor->GetPropertyEditor())
-        {
-            editor->GetPropertyEditor()->SetOverrideEntityIds(entities);
-
-            AZStd::string widgetTitle;
-            if (entities.size() == 1)
-            {
-                AZStd::string entityName;
-                AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationBus::Events::GetEntityName, *entities.begin());
-                widgetTitle = AZStd::string::format("%s Inspector", entityName.c_str());
-
-                QObject::connect(editor->GetPropertyEditor(), &AzToolsFramework::EntityPropertyEditor::SelectedEntityNameChanged, [dockWidget](const AZ::EntityId& /*entityId*/, const AZStd::string& name)
-                {
-                    AZStd::string newTitle = AZStd::string::format("%s Inspector", name.c_str());
-                    dockWidget->setWindowTitle(newTitle.c_str());
-                });
-            }
-            else
-            {
-                widgetTitle = AZStd::string::format("%zu Entities - Inspector", entities.size());
-            }
-
-            dockWidget->setWindowTitle(widgetTitle.c_str());
-        }
-    }
-}
-
-void SandboxIntegrationManager::ClosePinnedInspector(AzToolsFramework::EntityPropertyEditor* editor)
-{
-    QWidget* currentWidget = editor->parentWidget();
-    while (currentWidget)
-    {
-        QDockWidget* dockWidget = qobject_cast<QDockWidget*>(currentWidget);
-        if (dockWidget)
-        {
-            QtViewPaneManager::instance()->ClosePaneInstance(LyViewPane::EntityInspectorPinned, dockWidget);
-            return;
-        }
-        currentWidget = currentWidget->parentWidget();
-    }
-}
-
-void SandboxIntegrationManager::SetupLayerContextMenu(QMenu* menu)
-{
-    // First verify that the selection contains some layers.
-    AzToolsFramework::EntityIdList selectedEntities;
-    GetSelectedOrHighlightedEntities(selectedEntities);
-
-    // Nothing selected, no layer context menus to add.
-    if (selectedEntities.empty())
-    {
-        return;
-    }
-
-    AZStd::unordered_set<AZ::EntityId> layersInSelection;
-
-    for (AZ::EntityId entityId : selectedEntities)
-    {
-        bool isLayerEntity = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            isLayerEntity,
-            entityId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-        if (isLayerEntity)
-        {
-            layersInSelection.insert(entityId);
-        }
-    }
-
-    // No layers directly selected, do not add context, even if a selected entity
-    // is a child of a layer.
-    if (layersInSelection.empty())
-    {
-        return;
-    }
-
-    menu->addSeparator();
-
-    const int selectedLayerCount = layersInSelection.size();
-    QString saveTitle = QObject::tr("Save layer");
-    if(selectedLayerCount > 1)
-    {
-        saveTitle = QObject::tr("Save %0 layers").arg(selectedLayerCount);
-    }
-
-    QAction* saveLayerAction = menu->addAction(saveTitle);
-    saveLayerAction->setToolTip(QObject::tr("Save the selected layers."));
-    QObject::connect(saveLayerAction, &QAction::triggered, [this, layersInSelection] { ContextMenu_SaveLayers(layersInSelection); });
-
-    if (layersInSelection.size() == 1)
-    {
-        const AZ::EntityId& id = *layersInSelection.begin();
-        AZ::Outcome<AZStd::string, AZStd::string> layerFullFilePathResult = AZ::Failure(AZStd::string());
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            layerFullFilePathResult,
-            id,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GetLayerFullFilePath,
-            Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName()));
-
-        // Only add option to find the layer in the Asset Browser if the layer has been saved to disk
-        if (layerFullFilePathResult.IsSuccess())
-        {
-            AZStd::string fullFilePath = layerFullFilePathResult.GetValue();
-
-            QAction* findLayerAssetAction = menu->addAction(QObject::tr("Find layer in Asset Browser"));
-            findLayerAssetAction->setToolTip(QObject::tr("Selects this layer in the Asset Browser"));
-            QObject::connect(findLayerAssetAction, &QAction::triggered, [this, fullFilePath] {
-                QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetBrowser);
-
-                AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(
-                    &AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Events::ClearFilter);
-
-                AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(
-                    &AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Events::SelectFileAtPath,
-                    fullFilePath);
-            });
-        }
-    }
-}
-
-void SandboxIntegrationManager::SetupSliceContextMenu(QMenu* menu)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    AzToolsFramework::EntityIdList selectedEntities;
-    GetSelectedOrHighlightedEntities(selectedEntities);
-
-    menu->addSeparator();
-
-    if (!selectedEntities.empty())
-    {
-        bool anySelectedEntityFromExistingSlice = false;
-        bool layerInSelection = false;
-        for (AZ::EntityId entityId : selectedEntities)
-        {
-            if (!anySelectedEntityFromExistingSlice)
-            {
-                AZ::SliceComponent::SliceInstanceAddress sliceAddress(nullptr, nullptr);
-                AzFramework::SliceEntityRequestBus::EventResult(sliceAddress, entityId,
-                    &AzFramework::SliceEntityRequestBus::Events::GetOwningSlice);
-                if (sliceAddress.GetReference())
-                {
-                    anySelectedEntityFromExistingSlice = true;
-                }
-            }
-            if (!layerInSelection)
-            {
-                bool isLayerEntity = false;
-                AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-                    isLayerEntity,
-                    entityId,
-                    &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-                if (isLayerEntity)
-                {
-                    layerInSelection = true;
-                }
-            }
-            // Everything being searched for was found, so exit the loop.
-            if (layerInSelection && anySelectedEntityFromExistingSlice)
-            {
-                break;
-            }
-        }
-
-        // Layers can't be in slices.
-        if (!layerInSelection)
-        {
-            QAction* createAction = menu->addAction(QObject::tr("Create slice..."));
-            createAction->setToolTip(QObject::tr("Creates a slice out of the currently selected entities."));
-            if (anySelectedEntityFromExistingSlice)
-            {
-                QObject::connect(createAction, &QAction::triggered, createAction, [this, selectedEntities] { ContextMenu_MakeSlice(selectedEntities); });
-            }
-            else
-            {
-                QObject::connect(createAction, &QAction::triggered, createAction, [this, selectedEntities] { ContextMenu_InheritSlice(selectedEntities); });
-            }
-        }
-    }
-
-    QAction* instantiateAction = menu->addAction(QObject::tr("Instantiate slice..."));
-    instantiateAction->setToolTip(QObject::tr("Instantiates a pre-existing slice asset into the level"));
-    QObject::connect(instantiateAction, &QAction::triggered, instantiateAction, [this] { ContextMenu_InstantiateSlice(); });
-
-    AzToolsFramework::EditorEvents::Bus::Broadcast(&AzToolsFramework::EditorEvents::Bus::Events::PopulateEditorGlobalContextMenu_SliceSection, menu, AZ::Vector2::CreateZero(),
-        AzToolsFramework::EditorEvents::eECMF_HIDE_ENTITY_CREATION | AzToolsFramework::EditorEvents::eECMF_USE_VIEWPORT_CENTER);
-
-    if (selectedEntities.empty())
-    {
-        return;
-    }
-
-    AZ::u32 entitiesInSlices;
-    AZStd::vector<AZ::SliceComponent::SliceInstanceAddress> sliceInstances;
-    GetEntitiesInSlices(selectedEntities, entitiesInSlices, sliceInstances);
-    // Offer slice-related options if any selected entities belong to slice instances.
-    if (0 == entitiesInSlices)
-    {
-        return;
-    }
-
-    // Setup push and revert options (quick push and 'advanced' push UI).
-    SetupSliceContextMenu_Modify(menu, selectedEntities, entitiesInSlices);
-
-    menu->addSeparator();
-
-    // PopulateFindSliceMenu takes a callback to run when a slice is selected, which is called before the slice is selected in the asset browser.
-    // This is so the AssetBrowser can be opened first, which can only be done from a Sandbox module. PopulateFindSliceMenu exists in the AzToolsFramework
-    // module in SliceUtilities, so it can share logic with similar menus, like Quick Push.
-    // Similarly, it takes a callback for the SliceRelationshipView.
-    AzToolsFramework::SliceUtilities::PopulateSliceSubMenus(*menu, selectedEntities,
-        []
-    {
-        // This will open the AssetBrowser if it's not open, and do nothing if it's already opened.
-        QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetBrowser);
-    },
-        []
-    {
-        //open SliceRelationshipView if necessary, and populate it
-        QtViewPaneManager::instance()->OpenPane(LyViewPane::SliceRelationships);
-    });
-}
-
-void SandboxIntegrationManager::SetupSliceContextMenu_Modify(QMenu* menu, const AzToolsFramework::EntityIdList& selectedEntities, [[maybe_unused]] const AZ::u32 numEntitiesInSlices)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    using namespace AzToolsFramework;
-
-    // Gather the set of relevant entities from the selected entities and all descendants
-    AzToolsFramework::EntityIdSet relevantEntitiesSet;
-    EBUS_EVENT_RESULT(relevantEntitiesSet, AzToolsFramework::ToolsApplicationRequests::Bus, GatherEntitiesAndAllDescendents, selectedEntities);
-    AzToolsFramework::EntityIdList relevantEntities;
-    relevantEntities.reserve(relevantEntitiesSet.size());
-    for (AZ::EntityId& id : relevantEntitiesSet)
-    {
-        relevantEntities.push_back(id);
-    }
-
-    SliceUtilities::PopulateQuickPushMenu(*menu, relevantEntities);
-
-    SliceUtilities::PopulateDetachMenu(*menu, selectedEntities, relevantEntitiesSet);
-
-    bool canRevert = false;
-
-    for (AZ::EntityId id : relevantEntitiesSet)
-    {
-        bool entityHasOverrides = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(entityHasOverrides, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceEntityOverrides);
-        if (entityHasOverrides)
-        {
-            canRevert = true;
-            break;
-        }
-    }
-
-    QAction* revertAction = menu->addAction(QObject::tr("Revert overrides"));
-    revertAction->setToolTip(QObject::tr("Revert all slice entities and their children to their last saved state."));
-
-    QObject::connect(revertAction, &QAction::triggered, [this, relevantEntities]
-    {
-        ContextMenu_ResetToSliceDefaults(relevantEntities);
-    });
-
-    revertAction->setEnabled(canRevert);
-}
-
-void SandboxIntegrationManager::HandleObjectModeSelection(const AZ::Vector2& point, [[maybe_unused]] int flags, bool& handled)
-{
-    // Todo - Use a custom "edit tool". This will eliminate the need for this bus message entirely, which technically
-    // makes this feature less intrusive on Sandbox.
-    // UPDATE: This is now provided by EditorPickEntitySelection when the new Viewport Interaction Model changes are enabled.
-    if (m_inObjectPickMode)
-    {
-        CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
-        const QPoint viewPoint(point.GetX(), point.GetY());
-
-        HitContext hitInfo;
-        hitInfo.view = view;
-        if (view->HitTest(viewPoint, hitInfo))
-        {
-            if (hitInfo.object && (hitInfo.object->GetType() == OBJTYPE_AZENTITY))
-            {
-                CComponentEntityObject* entityObject = static_cast<CComponentEntityObject*>(hitInfo.object);
-                AzToolsFramework::EditorPickModeRequestBus::Broadcast(
-                    &AzToolsFramework::EditorPickModeRequests::PickModeSelectEntity, entityObject->GetAssociatedEntityId());
-            }
-        }
-
-        AzToolsFramework::EditorPickModeRequestBus::Broadcast(
-            &AzToolsFramework::EditorPickModeRequests::StopEntityPickMode);
-
-        handled = true;
-    }
-}
-
-void SandboxIntegrationManager::UpdateObjectModeCursor(AZ::u32& cursorId, AZStd::string& cursorStr)
-{
-    if (m_inObjectPickMode)
-    {
-        cursorId = static_cast<AZ::u64>(STD_CURSOR_HAND);
-        cursorStr = "Pick an entity...";
-    }
-}
-
-void SandboxIntegrationManager::OnEntityPickModeStarted()
-{
-    m_inObjectPickMode = true;
-
-    // Currently this object pick mode is activated only via PropertyEntityIdCtrl picker.
-    // When the picker button is clicked, we transfer focus to the viewport so the
-    // spacebar can still be used to activate selection helpers.
-    if (CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport())
-    {
-        view->SetFocus();
-    }
-}
-
-void SandboxIntegrationManager::OnEntityPickModeStopped()
-{
-    m_inObjectPickMode = false;
-}
-
-void SandboxIntegrationManager::CreateEditorRepresentation(AZ::Entity* entity)
-{
-    IEditor* editor = GetIEditor();
-
-    if (CComponentEntityObject* existingObject = CComponentEntityObject::FindObjectForEntity(entity->GetId()))
-    {
-        // Refresh sandbox object if one already exists for this AZ::EntityId.
-        existingObject->AssignEntity(entity, false);
-        return;
-    }
-
-    CBaseObjectPtr object = editor->NewObject("ComponentEntity", "", entity->GetName().c_str(), 0.f, 0.f, 0.f, false);
-
-    if (object)
-    {
-        static_cast<CComponentEntityObject*>(object.get())->AssignEntity(entity);
-
-        // If this object type was hidden by category, re-display it.
-        int hideMask = editor->GetDisplaySettings()->GetObjectHideMask();
-        hideMask = hideMask & ~(object->GetType());
-        editor->GetDisplaySettings()->SetObjectHideMask(hideMask);
-    }
-}
-
-bool SandboxIntegrationManager::DestroyEditorRepresentation(AZ::EntityId entityId, bool deleteAZEntity)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-    IEditor* editor = GetIEditor();
-    if (editor->GetObjectManager())
-    {
-        CEntityObject* object = nullptr;
-        EBUS_EVENT_ID_RESULT(object, entityId, AzToolsFramework::ComponentEntityEditorRequestBus, GetSandboxObject);
-
-        if (object && (object->GetType() == OBJTYPE_AZENTITY))
-        {
-            static_cast<CComponentEntityObject*>(object)->AssignEntity(nullptr, deleteAZEntity);
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "SandboxIntegrationManager::DestroyEditorRepresentation:ObjManagerDeleteObject");
-                editor->GetObjectManager()->DeleteObject(object);
-            }
-            return true;
-        }
-    }
-
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SandboxIntegrationManager::GoToSelectedOrHighlightedEntitiesInViewports()
-{
-    AzToolsFramework::EntityIdList entityIds;
-    GetSelectedOrHighlightedEntities(entityIds);
-    GoToEntitiesInViewports(entityIds);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SandboxIntegrationManager::GoToSelectedEntitiesInViewports()
-{
-    AzToolsFramework::EntityIdList entityIds;
-    GetSelectedEntities(entityIds);
-    GoToEntitiesInViewports(entityIds);
-}
-
-bool SandboxIntegrationManager::CanGoToSelectedEntitiesInViewports()
-{
-    AzToolsFramework::EntityIdList entityIds;
-    GetSelectedEntities(entityIds);
-
-    if (entityIds.size() == 0)
-    {
-        return false;
-    }
-
-    for (const AZ::EntityId& entityId : entityIds)
-    {
-        if (CanGoToEntityOrChildren(entityId))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool SandboxIntegrationManager::CanGoToEntityOrChildren(const AZ::EntityId& entityId) const
-{
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-    // If this entity is not a layer
-    if (!isLayerEntity)
-    {
-        // check if the entity exists to determine if we can go to it (e.g. system & internal entities are not visible in the viewport)
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, entityId);
-        return entity != nullptr;
-    }
-
-    AZStd::vector<AZ::EntityId> layerChildren;
-    AZ::TransformBus::EventResult(
-        /*result*/ layerChildren,
-        /*address*/ entityId,
-        &AZ::TransformBus::Events::GetChildren);
-
-    for (const AZ::EntityId& childId : layerChildren)
-    {
-        if (CanGoToEntityOrChildren(childId))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-AZ::Vector3 SandboxIntegrationManager::GetWorldPositionAtViewportCenter()
-{
-    if (GetIEditor() && GetIEditor()->GetViewManager())
-    {
-        CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
-        if (view)
-        {
-            int width, height;
-            view->GetDimensions(&width, &height);
-            return LYVec3ToAZVec3(view->ViewToWorld(QPoint(width / 2, height / 2)));
-        }
-    }
-
-    return AZ::Vector3::CreateZero();
-}
-
-int SandboxIntegrationManager::GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath)
-{
-    return GetIEditor()->GetIconManager()->GetIconTexture(entityIconPath.c_str());
-}
-
-void SandboxIntegrationManager::ClearRedoStack()
-{
-    // We have two separate undo systems that are assumed to be kept in sync,
-    // So here we tell the legacy Undo system to clear the redo stack and at the same time
-    // tell the new AZ undo system to clear redo stack ("slice" the stack)
-
-    // Clear legacy redo stack
-    GetIEditor()->ClearRedoStack();
-
-    // Clear AZ redo stack
-    AzToolsFramework::UndoSystem::UndoStack* undoStack = nullptr;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(undoStack, &AzToolsFramework::ToolsApplicationRequestBus::Events::GetUndoStack);
-    if (undoStack)
-    {
-        undoStack->Slice();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void SandboxIntegrationManager::CloneSelection(bool& handled)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-    AzToolsFramework::EntityIdList entities;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-        entities,
-        &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    AzToolsFramework::EntityIdSet duplicationSet = AzToolsFramework::GetCulledEntityHierarchy(entities);
-
-    if (!duplicationSet.empty())
-    {
-        bool prefabSystemEnabled = false;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-        if (prefabSystemEnabled)
-        {
-            m_editorEntityAPI->DuplicateSelected();
-            handled = true;
-        }
-        else
-        {
-            AZStd::unordered_set<AZ::EntityId> clonedEntities;
-            handled = AzToolsFramework::CloneInstantiatedEntities(duplicationSet, clonedEntities);
-            m_unsavedEntities.insert(clonedEntities.begin(), clonedEntities.end());
-        }
-    }
-    else
-    {
-        handled = false;
-    }
-}
-
-void SandboxIntegrationManager::DeleteSelectedEntities([[maybe_unused]] const bool includeDescendants)
-{
-    AzToolsFramework::EntityIdList selectedEntityIds;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-        selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::DeleteEntitiesAndAllDescendants, selectedEntityIds);
-}
-
-AZ::EntityId SandboxIntegrationManager::CreateNewEntity(AZ::EntityId parentId)
-{
-    AZ::Vector3 position = AZ::Vector3::CreateZero();
-
-    bool parentIsValid = parentId.IsValid();
-    if (parentIsValid)
-    {
-        // If a valid parent is a Layer, we should get our position from the viewport as all Layers are positioned at 0,0,0.
-        bool parentIsLayer = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            parentIsLayer,
-            parentId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-        parentIsValid = !parentIsLayer;
-    }
-    // If we have an invalid parent, base new entity's position on the viewport.
-    if (!parentIsValid)
-    {
-        position = GetWorldPositionAtViewportCenter();
-    }
-    return CreateNewEntityAtPosition(position, parentId);
-}
-
-AZ::EntityId SandboxIntegrationManager::CreateNewEntityAsChild(AZ::EntityId parentId)
-{
-    AZ_Assert(parentId.IsValid(), "Entity created as a child of an invalid parent entity.");
-    auto newEntityId = CreateNewEntity(parentId);
-
-    // Some modules need to know that this special action has taken place; broadcast an event.
-    ToolsApplicationEvents::Bus::Broadcast(&ToolsApplicationEvents::EntityCreatedAsChild, newEntityId, parentId);
-    return newEntityId;
-}
-
-AZ::EntityId SandboxIntegrationManager::CreateNewEntityAtPosition(const AZ::Vector3& pos, AZ::EntityId parentId)
-{
-    using namespace AzToolsFramework;
-
-    bool prefabSystemEnabled = false;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
-    AZ::EntityId newEntityId;
-
-    if (!prefabSystemEnabled)
-    {
-        const AZStd::string name = AZStd::string::format("Entity%d", GetIEditor()->GetObjectManager()->GetObjectCount() + 1);
-        EditorEntityContextRequestBus::BroadcastResult(newEntityId, &EditorEntityContextRequests::CreateNewEditorEntity, name.c_str());
-
-        if (newEntityId.IsValid())
-        {
-            m_unsavedEntities.insert(newEntityId);
-
-            AZ::Transform transform = AZ::Transform::CreateIdentity();
-            transform.SetTranslation(pos);
-            if (parentId.IsValid())
-            {
-                AZ::TransformBus::Event(newEntityId, &AZ::TransformInterface::SetParent, parentId);
-                AZ::TransformBus::Event(newEntityId, &AZ::TransformInterface::SetLocalTM, transform);
-            }
-            else
-            {
-                AZ::TransformBus::Event(newEntityId, &AZ::TransformInterface::SetWorldTM, transform);
-            }
-
-            // Select the new entity (and deselect others).
-            AzToolsFramework::EntityIdList selection = {newEntityId};
-
-            ScopedUndoBatch undo("New Entity");
-            auto selectionCommand = AZStd::make_unique<AzToolsFramework::SelectionCommand>(selection, "");
-            selectionCommand->SetParent(undo.GetUndoBatch());
-            selectionCommand.release();
-
-            EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, SetSelectedEntities, selection);
-        }
-    }
-    else
-    {
-        newEntityId =  m_prefabIntegrationInterface->CreateNewEntityAtPosition(pos, parentId);
-    }
-    return newEntityId;
-}
-
-AzFramework::EntityContextId SandboxIntegrationManager::GetEntityContextId()
-{
-    AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
-    AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetEditorEntityContextId);
-
-    return editorEntityContextId;
-}
-
-//////////////////////////////////////////////////////////////////////////
-QWidget* SandboxIntegrationManager::GetAppMainWindow()
-{
-    return MainWindow::instance();
-}
-
-QWidget* SandboxIntegrationManager::GetMainWindow()
-{
-    return MainWindow::instance();
-}
-
-IEditor* SandboxIntegrationManager::GetEditor()
-{
-    return GetIEditor();
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool SandboxIntegrationManager::GetUndoSliceOverrideSaveValue()
-{
-    return GetIEditor()->GetEditorSettings()->m_undoSliceOverrideSaveValue;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool SandboxIntegrationManager::GetShowCircularDependencyError()
-{
-    return GetIEditor()->GetEditorSettings()->m_showCircularDependencyError;
-}
-
-void SandboxIntegrationManager::SetShowCircularDependencyError(const bool& showCircularDependencyError)
-{
-    GetIEditor()->GetEditorSettings()->m_showCircularDependencyError = showCircularDependencyError;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SandboxIntegrationManager::LaunchLuaEditor(const char* files)
-{
-    CCryEditApp::instance()->OpenLUAEditor(files);
-}
-
-bool SandboxIntegrationManager::IsLevelDocumentOpen()
-{
-    return (GetIEditor() && GetIEditor()->GetDocument() && GetIEditor()->GetDocument()->IsDocumentReady());
-}
-
-AZStd::string SandboxIntegrationManager::GetLevelName()
-{
-    return AZStd::string(GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().constData());
-}
-
-AZStd::string SandboxIntegrationManager::SelectResource(const AZStd::string& resourceType, const AZStd::string& previousValue)
-{
-    SResourceSelectorContext context;
-    context.parentWidget = GetMainWindow();
-    context.typeName = resourceType.c_str();
-
-    QString resource = GetEditor()->GetResourceSelectorHost()->SelectResource(context, previousValue.c_str());
-    return AZStd::string(resource.toUtf8().constData());
-}
-
-void SandboxIntegrationManager::OnContextReset()
-{
-    // Deselect everything.
-    EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus, SetSelectedEntities, AzToolsFramework::EntityIdList());
-
-    std::vector<CBaseObject*> objects;
-    objects.reserve(128);
-    IObjectManager* objectManager = GetIEditor()->GetObjectManager();
-    objectManager->FindObjectsOfType(OBJTYPE_AZENTITY, objects);
-    for (CBaseObject* object : objects)
-    {
-        CComponentEntityObject* componentEntity = static_cast<CComponentEntityObject*>(object);
-        componentEntity->AssignEntity(nullptr, false);
-        objectManager->DeleteObject(componentEntity);
-    }
-}
-
-void SandboxIntegrationManager::OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/)
-{
-    // The instantiated slice isn't valid. Other systems will report this as an error.
-    // Bail out here, this is nothing to track in this case.
-    if (!sliceAddress.GetInstance())
-    {
-        return;
-    }
-
-    const AZ::SliceComponent::EntityIdToEntityIdMap& sliceInstanceEntityIdMap = sliceAddress.GetInstance()->GetEntityIdMap();
-
-    for (const auto& sliceInstantEntityIdPair : sliceInstanceEntityIdMap)
-    {
-        // The second in the pair is the local instance's entity ID.
-        m_unsavedEntities.insert(sliceInstantEntityIdPair.second);
-    }
-}
-
-void SandboxIntegrationManager::OnLayerComponentActivated(AZ::EntityId entityId)
-{
-    m_editorEntityUiInterface->RegisterEntity(entityId, m_layerUiOverrideHandler.GetHandlerId());
-}
-
-void SandboxIntegrationManager::OnLayerComponentDeactivated(AZ::EntityId entityId)
-{
-    m_editorEntityUiInterface->UnregisterEntity(entityId);
-}
-
-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)
-    {
-        const QPoint viewPoint(m_contextMenuViewPoint.GetX(), m_contextMenuViewPoint.GetY());
-        worldPosition = LYVec3ToAZVec3(view->SnapToGrid(view->ViewToWorld(viewPoint)));
-    }
-
-    CreateNewEntityAtPosition(worldPosition);
-}
-
-AZ::EntityId SandboxIntegrationManager::ContextMenu_NewLayer()
-{
-    const int objectCount = GetIEditor()->GetObjectManager()->GetObjectCount();
-    const AZStd::string name = AZStd::string::format("Layer%d", objectCount + 1);
-
-    // Make sure the color is created fully opaque.
-    static QColor newLayerDefaultColor = GetIEditor()->GetColorByName("NewLayerDefaultColor");
-    AZ::Color newLayerColor(
-        aznumeric_cast<float>(newLayerDefaultColor.redF()),
-        aznumeric_cast<float>(newLayerDefaultColor.greenF()),
-        aznumeric_cast<float>(newLayerDefaultColor.blueF()),
-        aznumeric_cast<float>(newLayerDefaultColor.alphaF()));
-
-    AZ::EntityId newEntityId = AzToolsFramework::Layers::EditorLayerComponent::CreateLayerEntity(
-        name, newLayerColor, AzToolsFramework::Layers::LayerProperties::SaveFormat::Xml);
-    if (!newEntityId.IsValid())
-    {
-        // CreateLayerEntity already handled reporting errors if it couldn't make a new layer.
-        return AZ::EntityId();
-    }
-    m_unsavedEntities.insert(newEntityId);
-
-    return newEntityId;
-}
-
-void SandboxIntegrationManager::ContextMenu_SaveLayers(const AZStd::unordered_set<AZ::EntityId>& layers)
-{
-    AZStd::unordered_map<AZStd::string, int> nameConflictMapping;
-    for (AZ::EntityId layerEntityId : layers)
-    {
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-            layerEntityId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::UpdateLayerNameConflictMapping,
-            nameConflictMapping);
-    }
-
-    if (!nameConflictMapping.empty())
-    {
-        AzToolsFramework::Layers::NameConflictWarning* nameConflictWarning = new AzToolsFramework::Layers::NameConflictWarning(GetMainWindow(), nameConflictMapping);
-        nameConflictWarning->exec();
-        return;
-    }
-
-    AZStd::unordered_set<AZ::EntityId> allLayersToSave(layers);
-    bool mustSaveLevel = false;
-    bool mustSaveOtherContent = false;
-
-    for (AZ::EntityId layerEntityId : layers)
-    {
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            mustSaveOtherContent,
-            layerEntityId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GatherSaveDependencies,
-            allLayersToSave,
-            mustSaveLevel);
-    }
-
-    if (mustSaveOtherContent)
-    {
-        QWidget* mainWindow = nullptr;
-        AzToolsFramework::EditorRequestBus::BroadcastResult(
-            mainWindow,
-            &AzToolsFramework::EditorRequestBus::Events::GetMainWindow);
-        QMessageBox saveAdditionalContentMessage(mainWindow);
-        saveAdditionalContentMessage.setWindowTitle(QObject::tr("Unsaved content"));
-        saveAdditionalContentMessage.setText(QObject::tr("You have moved entities to or from the layer(s) that you are trying to save."));
-        if (mustSaveLevel)
-        {
-            saveAdditionalContentMessage.setInformativeText(QObject::tr("The level and all layers will be saved."));
-
-        }
-        else
-        {
-            saveAdditionalContentMessage.setInformativeText(QObject::tr("All relevant layers will be saved."));
-        }
-        saveAdditionalContentMessage.setIcon(QMessageBox::Warning);
-        saveAdditionalContentMessage.setStandardButtons(QMessageBox::Save | QMessageBox::Cancel);
-        saveAdditionalContentMessage.setDefaultButton(QMessageBox::Save);
-        int saveAdditionalContentMessageResult = saveAdditionalContentMessage.exec();
-        switch (saveAdditionalContentMessageResult)
-        {
-        case QMessageBox::Cancel:
-            // The user chose to cancel this operation.
-            return;
-        case QMessageBox::Save:
-        default:
-            break;
-        }
-
-        if (mustSaveLevel)
-        {
-            // Saving the level causes all layers to save.
-            GetIEditor()->GetDocument()->Save();
-            return;
-        }
-    }
-
-    QString levelAbsoluteFolder = Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName());
-
-    // Not used here, but needed for the ebus event.
-    AZStd::vector<AZ::Entity*> layerEntities;
-    AZ::SliceComponent::SliceReferenceToInstancePtrs instancesInLayers;
-    for (AZ::EntityId layerEntityId : allLayersToSave)
-    {
-        AzToolsFramework::Layers::LayerResult layerSaveResult(AzToolsFramework::Layers::LayerResult::CreateSuccess());
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            layerSaveResult,
-            layerEntityId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::WriteLayerAndGetEntities,
-            levelAbsoluteFolder,
-            layerEntities,
-            instancesInLayers);
-
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-            layerEntityId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::RestoreEditorData);
-        layerSaveResult.MessageResult();
-
-        m_unsavedEntities.erase(layerEntityId);
-    }
-
-    // Update the unsaved entities list so these entities are no longer tracked as unsaved.
-    for (const AZ::Entity* entity : layerEntities)
-    {
-        m_unsavedEntities.erase(entity->GetId());
-    }
-}
-
-void SandboxIntegrationManager::ContextMenu_MakeSlice(AzToolsFramework::EntityIdList entities)
-{
-    QChar bulletChar(0x2022);
-
-    QMessageBox createSliceBox(GetMainWindow());
-    createSliceBox.setWindowTitle(QObject::tr("Create Slice"));
-    createSliceBox.setText(QString(QObject::tr("Your selection contains slice instances. What kind of slice do you want to create?"))
-        + "\n\n" + QString(bulletChar) + " " + "Fresh slice that doesn't inherit existing slice references."
-        + "\n" + QString(bulletChar) + " " + "Nested slice that inherits existing slice references."
-        + "\n\n");
-    createSliceBox.setIcon(QMessageBox::Warning);
-    
-    QPushButton* freshSliceButton = createSliceBox.addButton(QObject::tr("Fresh Slice"), QMessageBox::ActionRole);
-    QPushButton* nestedSliceButton = createSliceBox.addButton(QObject::tr("Nested Slice"), QMessageBox::ActionRole);
-    createSliceBox.addButton(QMessageBox::Cancel);
-
-    createSliceBox.exec();
-
-    if (createSliceBox.clickedButton() == freshSliceButton)
-    {
-        MakeSliceFromEntities(entities, false, GetIEditor()->GetEditorSettings()->sliceSettings.dynamicByDefault);
-    }
-    else if (createSliceBox.clickedButton() == nestedSliceButton)
-    {
-        ContextMenu_InheritSlice(entities);
-    }
-}
-
-void SandboxIntegrationManager::ContextMenu_InheritSlice(AzToolsFramework::EntityIdList entities)
-{
-    MakeSliceFromEntities(entities, true, GetIEditor()->GetEditorSettings()->sliceSettings.dynamicByDefault);
-}
-void SandboxIntegrationManager::ContextMenu_InstantiateSlice()
-{
-    AssetSelectionModel selection = AssetSelectionModel::AssetTypeSelection("Slice");
-    BrowseForAssets(selection);
-
-    if (selection.IsValid())
-    {
-        auto product = azrtti_cast<const ProductAssetBrowserEntry*>(selection.GetResult());
-        AZ_Assert(product, "Incorrect entry type selected. Expected product.");
-     
-        InstantiateSliceFromAssetId(product->GetAssetId());
-    }
-}
-
-void SandboxIntegrationManager::InstantiateSliceFromAssetId(const AZ::Data::AssetId& assetId)
-{
-    AZ::Transform sliceWorldTransform = AZ::Transform::CreateIdentity();
-
-    CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
-    // If we don't have a viewport active to aid in placement, the slice
-    // will be instantiated at the origin.
-    if (view)
-    {
-        const QPoint viewPoint(m_contextMenuViewPoint.GetX(), m_contextMenuViewPoint.GetY());
-        sliceWorldTransform = AZ::Transform::CreateTranslation(LYVec3ToAZVec3(view->SnapToGrid(view->ViewToWorld(viewPoint))));
-    }
-
-    AzToolsFramework::SliceRequestBus::Broadcast(&AzToolsFramework::SliceRequests::InstantiateSliceFromAssetId, assetId, sliceWorldTransform);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Returns true if at least one non-layer entity was found.
-bool CollectEntityBoundingBoxesForZoom(const AZ::EntityId& entityId, AABB& selectionBounds)
-{
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-
-    if (isLayerEntity)
-    {
-        // If a layer is in the selection, zoom to its children and ignore the layer itself.
-        AZStd::vector<AZ::EntityId> layerChildren;
-        AZ::TransformBus::EventResult(
-            /*result*/ layerChildren,
-            /*address*/ entityId,
-            &AZ::TransformBus::Events::GetChildren);
-        bool childResults = false;
-        for (const AZ::EntityId& childId : layerChildren)
-        {
-            if (CollectEntityBoundingBoxesForZoom(childId, selectionBounds))
-            {
-                // At least one child is not a layer.
-                childResults = true;
-            }
-        }
-        return childResults;
-    }
-    else
-    {
-        AABB entityBoundingBox;
-        CEntityObject* componentEntityObject = nullptr;
-        AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(
-            /*result*/ componentEntityObject,
-            /*address*/ entityId,
-            &AzToolsFramework::ComponentEntityEditorRequestBus::Events::GetSandboxObject);
-
-        if (componentEntityObject)
-        {
-            componentEntityObject->GetBoundBox(entityBoundingBox);
-            selectionBounds.Add(entityBoundingBox.min);
-            selectionBounds.Add(entityBoundingBox.max);
-        }
-        return true;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SandboxIntegrationManager::GoToEntitiesInViewports(const AzToolsFramework::EntityIdList& entityIds)
-{
-    if (entityIds.empty())
-    {
-        return;
-    }
-
-    if (SandboxEditor::UsingNewCameraSystem())
-    {
-        const AZ::Aabb aabb = AZStd::accumulate(
-            AZStd::begin(entityIds), AZStd::end(entityIds), AZ::Aabb::CreateNull(), [](AZ::Aabb acc, const AZ::EntityId entityId) {
-                const AZ::Aabb aabb = AzFramework::CalculateEntityWorldBoundsUnion(AzToolsFramework::GetEntityById(entityId));
-                acc.AddAabb(aabb);
-                return acc;
-            });
-
-        float radius;
-        AZ::Vector3 center;
-        aabb.GetAsSphere(center, radius);
-
-        // minimum center size is 40cm
-        const float minSelectionRadius = 0.4f;
-        const float selectionSize = AZ::GetMax(minSelectionRadius, radius);
-
-        auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
-
-        const int viewCount = GetIEditor()->GetViewManager()->GetViewCount(); // legacy call
-        for (int viewIndex = 0; viewIndex < viewCount; ++viewIndex)
-        {
-            if (auto viewportContext = viewportContextManager->GetViewportContextById(viewIndex))
-            {
-                const AZ::Transform cameraTransform = viewportContext->GetCameraTransform();
-                const AZ::Vector3 forward = (center - cameraTransform.GetTranslation()).GetNormalized();
-
-                // move camera 25% further back than required
-                const float centerScale = 1.25f;
-                // compute new camera transform
-                const float fov = AzFramework::RetrieveFov(viewportContext->GetCameraProjectionMatrix());
-                const float fovScale = (1.0f / AZStd::tan(fov * 0.5f));
-                const float distanceToLookAt = selectionSize * fovScale * centerScale;
-                const AZ::Transform nextCameraTransform =
-                    AZ::Transform::CreateLookAt(aabb.GetCenter() - (forward * distanceToLookAt), aabb.GetCenter());
-
-                AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
-                    viewportContext->GetId(),
-                    &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, nextCameraTransform,
-                    distanceToLookAt);
-            }
-        }
-    }
-    else
-    {
-        AABB selectionBounds;
-        selectionBounds.Reset();
-        bool entitiesAvailableForGoTo = false;
-
-        for (const AZ::EntityId& entityId : entityIds)
-        {
-            if (CollectEntityBoundingBoxesForZoom(entityId, selectionBounds))
-            {
-                entitiesAvailableForGoTo = true;
-            }
-        }
-
-        if (entitiesAvailableForGoTo)
-        {
-            int numViews = GetIEditor()->GetViewManager()->GetViewCount();
-            for (int viewIndex = 0; viewIndex < numViews; ++viewIndex)
-            {
-                CViewport* viewport = GetIEditor()->GetViewManager()->GetView(viewIndex);
-                if (viewport)
-                {
-                    viewport->CenterOnAABB(selectionBounds);
-                }
-            }
-        }
-    }
-}
-
-void SandboxIntegrationManager::ContextMenu_SelectSlice()
-{
-    AzToolsFramework::EntityIdList selectedEntities;
-    GetSelectedOrHighlightedEntities(selectedEntities);
-
-    AzToolsFramework::EntityIdList newSelectedEntities;
-
-    for (const AZ::EntityId& entityId : selectedEntities)
-    {
-        AZ::SliceComponent::SliceInstanceAddress sliceAddress;
-        AzFramework::SliceEntityRequestBus::EventResult(sliceAddress, entityId,
-            &AzFramework::SliceEntityRequestBus::Events::GetOwningSlice);
-
-        if (sliceAddress.IsValid())
-        {
-            const AZ::SliceComponent::InstantiatedContainer* instantiated = sliceAddress.GetInstance()->GetInstantiated();
-
-            if (instantiated)
-            {
-                for (AZ::Entity* entityInSlice : instantiated->m_entities)
-                {
-                    newSelectedEntities.push_back(entityInSlice->GetId());
-                }
-            }
-        }
-    }
-
-    EBUS_EVENT(AzToolsFramework::ToolsApplicationRequests::Bus,
-        SetSelectedEntities, newSelectedEntities);
-}
-
-void SandboxIntegrationManager::ContextMenu_PushEntitiesToSlice(AzToolsFramework::EntityIdList entities,
-    AZ::SliceComponent::EntityAncestorList ancestors,
-    AZ::Data::AssetId targetAncestorId,
-    bool affectEntireHierarchy)
-{
-    (void)ancestors;
-    (void)targetAncestorId;
-    (void)affectEntireHierarchy;
-
-    AZ::SerializeContext* serializeContext = NULL;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(serializeContext, "No serialize context");
-
-    AzToolsFramework::SliceUtilities::PushEntitiesModal(GetMainWindow(), entities, serializeContext);
-}
-
-void SandboxIntegrationManager::ContextMenu_Duplicate()
-{
-    bool handled = true;
-    AzToolsFramework::EditorRequestBus::Broadcast(&AzToolsFramework::EditorRequests::CloneSelection, handled);
-}
-
-void SandboxIntegrationManager::ContextMenu_DeleteSelected()
-{
-    DeleteSelectedEntities(true);
-}
-
-void SandboxIntegrationManager::ContextMenu_ResetToSliceDefaults(AzToolsFramework::EntityIdList entities)
-{
-    AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
-        &AzToolsFramework::SliceEditorEntityOwnershipServiceRequests::ResetEntitiesToSliceDefaults, entities);
-}
-
-void SandboxIntegrationManager::GetSelectedEntities(AzToolsFramework::EntityIdList& entities)
-{
-    EBUS_EVENT_RESULT(entities,
-        AzToolsFramework::ToolsApplicationRequests::Bus,
-        GetSelectedEntities);
-}
-
-void SandboxIntegrationManager::GetSelectedOrHighlightedEntities(AzToolsFramework::EntityIdList& entities)
-{
-    AzToolsFramework::EntityIdList selectedEntities;
-    AzToolsFramework::EntityIdList highlightedEntities;
-
-    EBUS_EVENT_RESULT(selectedEntities,
-        AzToolsFramework::ToolsApplicationRequests::Bus,
-        GetSelectedEntities);
-
-    EBUS_EVENT_RESULT(highlightedEntities,
-        AzToolsFramework::ToolsApplicationRequests::Bus,
-        GetHighlightedEntities);
-
-    entities = AZStd::move(selectedEntities);
-
-    for (AZ::EntityId highlightedId : highlightedEntities)
-    {
-        if (entities.end() == AZStd::find(entities.begin(), entities.end(), highlightedId))
-        {
-            entities.push_back(highlightedId);
-        }
-    }
-}
-
-AZStd::string SandboxIntegrationManager::GetComponentEditorIcon(const AZ::Uuid& componentType, AZ::Component* component)
-{
-    AZStd::string iconPath = GetComponentIconPath(componentType, AZ::Edit::Attributes::Icon, component);
-    return iconPath;
-}
-
-AZStd::string SandboxIntegrationManager::GetComponentIconPath(const AZ::Uuid& componentType,
-    AZ::Crc32 componentIconAttrib, AZ::Component* component)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    if (componentIconAttrib != AZ::Edit::Attributes::Icon
-        && componentIconAttrib != AZ::Edit::Attributes::ViewportIcon
-        && componentIconAttrib != AZ::Edit::Attributes::HideIcon)
-    {
-        AZ_Warning("SandboxIntegration", false, "Unrecognized component icon attribute!");
-    }
-
-    // return blank path if component shouldn't have icon at all
-    AZStd::string iconPath;
-
-    AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(serializeContext, "No serialize context");
-
-    auto classData = serializeContext->FindClassData(componentType);
-    if (classData && classData->m_editData)
-    {
-        // check if component icon should be hidden
-        bool hideIcon = false;
-
-        auto editorElementData = classData->m_editData->FindElementData(AZ::Edit::ClassElements::EditorData);
-        if (editorElementData)
-        {
-            if (auto hideIconAttribute = editorElementData->FindAttribute(AZ::Edit::Attributes::HideIcon))
-            {
-                auto hideIconAttributeData = azdynamic_cast<const AZ::Edit::AttributeData<bool>*>(hideIconAttribute);
-                if (hideIconAttributeData)
-                {
-                    hideIcon = hideIconAttributeData->Get(nullptr);
-                }
-            }
-        }
-
-        if (!hideIcon)
-        {
-            // component should have icon. start with default
-            iconPath = GetDefaultComponentEditorIcon();
-
-            // check for specific icon
-            if (editorElementData)
-            {
-                if (auto iconAttribute = editorElementData->FindAttribute(componentIconAttrib))
-                {
-                    if (auto iconAttributeData = azdynamic_cast<const AZ::Edit::AttributeData<const char*>*>(iconAttribute))
-                    {
-                        AZStd::string iconAttributeValue = iconAttributeData->Get(component);
-                        if (!iconAttributeValue.empty())
-                        {
-                            iconPath = AZStd::move(iconAttributeValue);
-                        }
-                    }
-
-                    auto iconOverrideAttribute = editorElementData->FindAttribute(AZ::Edit::Attributes::DynamicIconOverride);
-
-                    // If it has an override and we're given an instance, then get any potential override from the instance here
-                    if (component &&
-                        (componentIconAttrib == AZ::Edit::Attributes::Icon || componentIconAttrib == AZ::Edit::Attributes::ViewportIcon) &&
-                        iconOverrideAttribute)
-                    {
-                        AZStd::string iconValue;
-                        AZ::AttributeReader iconReader(const_cast<AZ::Component*>(component), iconOverrideAttribute);
-                        iconReader.Read<AZStd::string>(iconValue);
-
-                        if (!iconValue.empty())
-                        {
-                            iconPath = AZStd::move(iconValue);
-                        }
-                    }
-                }
-            }
-            // If Qt doesn't know where the relative path is we have to use the more expensive full path
-            if (!QFile::exists(QString(iconPath.c_str())))
-            {
-                // use absolute path if possible
-                AZStd::string iconFullPath;
-                bool pathFound = false;
-                using AssetSysReqBus = AzToolsFramework::AssetSystemRequestBus;
-                AssetSysReqBus::BroadcastResult(
-                    pathFound, &AssetSysReqBus::Events::GetFullSourcePathFromRelativeProductPath,
-                    iconPath, iconFullPath);
-                if (pathFound)
-                {
-                    iconPath = AZStd::move(iconFullPath);
-                }
-            }
-        }
-    }
-
-    return iconPath;
-}
-
-void SandboxIntegrationManager::UndoStackFlushed()
-{
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::FlushUndo);
-}
-
-void SandboxIntegrationManager::MakeSliceFromEntities(const AzToolsFramework::EntityIdList& entities, bool inheritSlices, bool setAsDynamic)
-{
-    // expand the list of entities to include all transform descendant entities
-    AzToolsFramework::EntityIdSet entitiesAndDescendants;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(entitiesAndDescendants,
-        &AzToolsFramework::ToolsApplicationRequestBus::Events::GatherEntitiesAndAllDescendents, entities);
-
-    const AZStd::string slicesAssetsPath = "@devassets@/Slices";
-
-    if (!gEnv->pFileIO->Exists(slicesAssetsPath.c_str()))
-    {
-        gEnv->pFileIO->CreatePath(slicesAssetsPath.c_str());
-    }
-
-    char path[AZ_MAX_PATH_LEN] = { 0 };
-    gEnv->pFileIO->ResolvePath(slicesAssetsPath.c_str(), path, AZ_MAX_PATH_LEN);
-    AzToolsFramework::SliceUtilities::MakeNewSlice(entitiesAndDescendants, path, inheritSlices, setAsDynamic);
-}
-
-void SandboxIntegrationManager::RegisterViewPane(const char* name, const char* category, const AzToolsFramework::ViewPaneOptions& viewOptions, const WidgetCreationFunc& widgetCreationFunc)
-{
-    QtViewPaneManager::instance()->RegisterPane(name, category, widgetCreationFunc, viewOptions);
-}
-
-void SandboxIntegrationManager::RegisterCustomViewPane(const char* name, const char* category, const AzToolsFramework::ViewPaneOptions& viewOptions)
-{
-    QtViewPaneManager::instance()->RegisterPane(name, category, nullptr, viewOptions);
-}
-
-void SandboxIntegrationManager::UnregisterViewPane(const char* name)
-{
-    QtViewPaneManager::instance()->UnregisterPane(name);
-}
-
-QWidget* SandboxIntegrationManager::GetViewPaneWidget(const char* viewPaneName)
-{
-    return FindViewPane<QWidget>(viewPaneName);
-}
-
-void SandboxIntegrationManager::OpenViewPane(const char* paneName)
-{
-    const QtViewPane* pane = QtViewPaneManager::instance()->OpenPane(paneName);
-    if (pane)
-    {
-        pane->m_dockWidget->raise();
-        pane->m_dockWidget->activateWindow();
-    }
-}
-
-QDockWidget* SandboxIntegrationManager::InstanceViewPane(const char* paneName)
-{
-    return QtViewPaneManager::instance()->InstancePane(paneName);
-}
-
-void SandboxIntegrationManager::CloseViewPane(const char* paneName)
-{
-    QtViewPaneManager::instance()->ClosePane(paneName);
-}
-
-void SandboxIntegrationManager::BrowseForAssets(AssetSelectionModel& selection)
-{
-    AssetBrowserComponentRequestBus::Broadcast(&AssetBrowserComponentRequests::PickAssets, selection, GetMainWindow());
-}
-
-bool SandboxIntegrationManager::DisplayHelpersVisible()
-{
-    return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers();
-}
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
deleted file mode 100644
index ffe69326a8..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H
-#define CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H
-
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Slice/SliceBus.h>
-#include <AzCore/Slice/SliceComponent.h>
-#include <AzCore/Math/Uuid.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzFramework/Asset/AssetCatalogBus.h>
-#include <AzFramework/Entity/EntityDebugDisplayBus.h>
-#include <AzFramework/Viewport/DisplayContextRequestBus.h>
-#include <AzToolsFramework/API/EditorWindowRequestBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-#include <AzToolsFramework/UI/Layer/LayerUiHandler.h>
-#include <AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h>
-#include <AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx>
-#include <AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
-#include <AzToolsFramework/Viewport/ViewportMessages.h>
-
-// Sandbox imports.
-#include "../Editor/ViewManager.h"
-#include "../Editor/Viewport.h"
-#include "../Editor/Undo/IUndoManagerListener.h"
-#include "../Editor/Undo/IUndoObject.h"
-
-#include <QApplication>
-#include <QPointer>
-
-/**
-* Integration of ToolsApplication behavior and Cry undo/redo and selection systems
-* with respect to component entity operations.
-*
-* Undo/Redo
-* - CToolsApplicationUndoLink represents a component application undo operation within
-*   the Sandbox undo system. When an undo-able component operation is performed, we
-*   intercept ToolsApplicationEventBus::OnBeginUndo()/OnEndUndo() events, and in turn
-*   create and register a link instance.
-* - When the user attempts to undo/redo a CToolsApplicationUndoLink event in Sandbox,
-*   CToolsApplicationUndoLink::Undo()/Redo() is invoked, and the request is passed
-*   to the component application via ToolsApplicationRequestBus::OnUndoPressed/OnRedoPressed,
-*   where restoration of the previous entity snapshot is handled.
-*
-* AzToolsFramework::ToolsApplication Extensions
-* - Provides engine UI customizations, such as using the engine's built in asset browser
-*   when assigning asset references to component properties.
-* - Handles component edit-time display requests (using the editor's drawing context).
-* - Handles source control requests from AZ components or component-related UI.
-*/
-
-namespace AZ::Data
-{
-    class AssetInfo;
-}
-
-class CToolsApplicationUndoLink;
-
-class QMenu;
-class QWidget;
-class CComponentEntityObject;
-class CHyperGraph;
-
-namespace AzToolsFramework
-{
-    class EditorEntityAPI;
-    class EditorEntityUiInterface;
-
-    namespace AssetBrowser
-    {
-        class AssetSelectionModel;
-    }
-
-    namespace Prefab
-    {
-        class PrefabIntegrationInterface;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-class SandboxIntegrationManager
-    : private AzToolsFramework::ToolsApplicationEvents::Bus::Handler
-    , private AzToolsFramework::EditorRequests::Bus::Handler
-    , private AzToolsFramework::EditorPickModeNotificationBus::Handler
-    , private AzToolsFramework::EditorContextMenuBus::Handler
-    , private AzToolsFramework::EditorWindowRequests::Bus::Handler
-    , private AzFramework::AssetCatalogEventBus::Handler
-    , private AzFramework::DisplayContextRequestBus::Handler
-    , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
-    , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
-    , private IUndoManagerListener
-    , private AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler
-{
-public:
-
-    SandboxIntegrationManager();
-    ~SandboxIntegrationManager();
-
-    void Setup();
-    void Teardown();
-
-private:
-
-    //////////////////////////////////////////////////////////////////////////
-    // AssetCatalogEventBus::Handler
-    void OnCatalogAssetAdded(const AZ::Data::AssetId& assetId) override;
-    void OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& assetInfo) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::ToolsApplicationEvents::Bus::Handler overrides
-    void OnBeginUndo(const char* label) override;
-    void OnEndUndo(const char* label, bool changed) override;
-    void EntityParentChanged(
-        AZ::EntityId entityId,
-        AZ::EntityId newParentId,
-        AZ::EntityId oldParentId) override;
-    void OnSaveLevel() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorRequests::Bus::Handler overrides
-    void RegisterViewPane(const char* name, const char* category, const AzToolsFramework::ViewPaneOptions& viewOptions, const WidgetCreationFunc& widgetCreationFunc) override;
-    void RegisterCustomViewPane(const char* name, const char* category, const AzToolsFramework::ViewPaneOptions& viewOptions) override;
-    void UnregisterViewPane(const char* name) override;
-    QWidget* GetViewPaneWidget(const char* viewPaneName) override;
-    void OpenViewPane(const char* paneName) override;
-    QDockWidget* InstanceViewPane(const char* paneName) override;
-    void CloseViewPane(const char* paneName) override;
-    void BrowseForAssets(AzToolsFramework::AssetBrowser::AssetSelectionModel& selection) override;
-    void HandleObjectModeSelection(const AZ::Vector2& point, int flags, bool& handled) override;
-    void UpdateObjectModeCursor(AZ::u32& cursorId, AZStd::string& cursorStr) override;
-    void CreateEditorRepresentation(AZ::Entity* entity) override;
-    bool DestroyEditorRepresentation(AZ::EntityId entityId, bool deleteAZEntity) override;
-    void CloneSelection(bool& handled) override;
-    void DeleteSelectedEntities(bool includeDescendants) override;
-    AZ::EntityId CreateNewEntity(AZ::EntityId parentId = AZ::EntityId()) override;
-    AZ::EntityId CreateNewEntityAsChild(AZ::EntityId parentId) override;
-    AZ::EntityId CreateNewEntityAtPosition(const AZ::Vector3& /*pos*/, AZ::EntityId parentId = AZ::EntityId()) override;
-    AzFramework::EntityContextId GetEntityContextId() override;
-    QWidget* GetMainWindow() override;
-    IEditor* GetEditor() override;
-    bool GetUndoSliceOverrideSaveValue() override;
-    bool GetShowCircularDependencyError() override;
-    void SetShowCircularDependencyError(const bool& showCircularDependencyError) override;
-    void LaunchLuaEditor(const char* files) override;
-    bool IsLevelDocumentOpen() override;
-    AZStd::string GetLevelName() override;
-    AZStd::string SelectResource(const AZStd::string& resourceType, const AZStd::string& previousValue) override;
-    void OpenPinnedInspector(const AzToolsFramework::EntityIdSet& entities) override;
-    void ClosePinnedInspector(AzToolsFramework::EntityPropertyEditor* editor) override;
-    void GoToSelectedOrHighlightedEntitiesInViewports() override;
-    void GoToSelectedEntitiesInViewports() override;
-    bool CanGoToSelectedEntitiesInViewports() override;
-    AZ::Vector3 GetWorldPositionAtViewportCenter() override;
-    void InstantiateSliceFromAssetId(const AZ::Data::AssetId& assetId) override;
-    void ClearRedoStack() override;
-    int GetIconTextureIdFromEntityIconPath(const AZStd::string& entityIconPath) override;
-    bool DisplayHelpersVisible() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorWindowRequests::Bus::Handler
-    QWidget* GetAppMainWindow() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    // EditorPickModeNotificationBus
-    void OnEntityPickModeStarted() override;
-    void OnEntityPickModeStopped() override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorContextMenu::Bus::Handler overrides
-    void PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags) override;
-    int GetMenuPosition() const;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    // AzToolsFramework::EditorEntityContextNotificationBus::Handler
-    void OnContextReset() override;
-    //////////////////////////////////////////////////////////////////////////
-
-    //////////////////////////////////////////////////////////////////////////
-    /// AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
-    void OnSliceInstantiated(
-        const AZ::Data::AssetId& sliceAssetId,
-        AZ::SliceComponent::SliceInstanceAddress& sliceAddress,
-        const AzFramework::SliceInstantiationTicket& ticket) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    // AzFramework::DisplayContextRequestBus (and @deprecated EntityDebugDisplayRequestBus)
-    // AzFramework::DisplayContextRequestBus
-    void SetDC(DisplayContext* dc) override;
-    DisplayContext* GetDC() override;
-
-    // Context menu handlers.
-    void ContextMenu_NewEntity();
-    AZ::EntityId ContextMenu_NewLayer();
-    void ContextMenu_SaveLayers(const AZStd::unordered_set<AZ::EntityId>& layers);
-    void ContextMenu_MakeSlice(AzToolsFramework::EntityIdList entities);
-    void ContextMenu_InheritSlice(AzToolsFramework::EntityIdList entities);
-    void ContextMenu_InstantiateSlice();
-    void ContextMenu_SelectSlice();
-    void ContextMenu_PushEntitiesToSlice(AzToolsFramework::EntityIdList entities,
-        AZ::SliceComponent::EntityAncestorList ancestors,
-        AZ::Data::AssetId targetAncestorId,
-        bool affectEntireHierarchy);
-    void ContextMenu_Duplicate();
-    void ContextMenu_DeleteSelected();
-    void ContextMenu_ResetToSliceDefaults(AzToolsFramework::EntityIdList entities);
-
-    void MakeSliceFromEntities(const AzToolsFramework::EntityIdList& entities, bool inheritSlices, bool setAsDynamic);
-
-    void GetSelectedEntities(AzToolsFramework::EntityIdList& entities);
-    void GetSelectedOrHighlightedEntities(AzToolsFramework::EntityIdList& entities);
-
-    AZStd::string GetDefaultComponentViewportIcon() override
-    {
-        return m_defaultComponentViewportIconLocation;
-    }
-
-    AZStd::string GetDefaultComponentEditorIcon() override
-    {
-        return m_defaultComponentIconLocation;
-    }
-
-    AZStd::string GetDefaultEntityIcon() override
-    {
-        return m_defaultEntityIconLocation;
-    }
-
-    AZStd::string GetComponentEditorIcon(const AZ::Uuid& componentType, AZ::Component* component) override;
-    AZStd::string GetComponentIconPath(const AZ::Uuid& componentType, AZ::Crc32 componentIconAttrib, AZ::Component* component) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // IUndoManagerListener
-    // Listens for Cry Undo System events.
-    void UndoStackFlushed() override;
-
-    // EditorLayerRequestBus...
-    void OnLayerComponentActivated(AZ::EntityId entityId) override;
-    void OnLayerComponentDeactivated(AZ::EntityId entityId) override;
-
-private:
-    // Right click context menu when a layer is included in the selection.
-    void SetupLayerContextMenu(QMenu* menu);
-    void SetupSliceContextMenu(QMenu* menu);
-    void SetupSliceContextMenu_Modify(QMenu* menu, const AzToolsFramework::EntityIdList& selectedEntities, const AZ::u32 numEntitiesInSlices);
-    void SaveSlice(const bool& QuickPushToFirstLevel);
-    void GetEntitiesInSlices(const AzToolsFramework::EntityIdList& selectedEntities, AZ::u32& entitiesInSlices, AZStd::vector<AZ::SliceComponent::SliceInstanceAddress>& sliceInstances);
-
-    void GoToEntitiesInViewports(const AzToolsFramework::EntityIdList& entityIds);
-
-    bool CanGoToEntityOrChildren(const AZ::EntityId& entityId) const;
-
-    // This struct exists to help handle the error case where slice assets are 
-    // accidentally deleted from disk but their instances are still in the editing level.
-    struct SliceAssetDeletionErrorInfo
-    {
-        SliceAssetDeletionErrorInfo() = default;
-
-        SliceAssetDeletionErrorInfo(AZ::Data::AssetId assetId, AZStd::vector<AZStd::pair<AZ::EntityId, AZ::SliceComponent::EntityRestoreInfo>>&& entityRestoreInfos) 
-            : m_assetId(assetId)
-            , m_entityRestoreInfos(AZStd::move(entityRestoreInfos))
-        { }
-
-        AZ::Data::AssetId m_assetId;
-        AZStd::vector<AZStd::pair<AZ::EntityId, AZ::SliceComponent::EntityRestoreInfo>> m_entityRestoreInfos;
-    };
-
-private:
-    AZ::Vector2 m_contextMenuViewPoint;
-    AZ::Vector3 m_sliceWorldPos;
-
-    int m_inObjectPickMode;
-    short m_startedUndoRecordingNestingLevel;   // used in OnBegin/EndUndo to ensure we only accept undo's we started recording
-
-    AzToolsFramework::SliceOverridesNotificationWindowManager* m_notificationWindowManager;
-
-    DisplayContext* m_dc;
-
-    AZStd::vector<SliceAssetDeletionErrorInfo> m_sliceAssetDeletionErrorRestoreInfos;
-
-    // Tracks new entities that have not yet been saved.
-    AZStd::unordered_set<AZ::EntityId> m_unsavedEntities;
-
-    const AZStd::string m_defaultComponentIconLocation = "Icons/Components/Component_Placeholder.svg";
-    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.png";
-    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.png";
-
-    bool m_debugDisplayBusImplementationActive = false;
-
-    AzToolsFramework::Prefab::PrefabIntegrationManager* m_prefabIntegrationManager = nullptr;
-
-    AzToolsFramework::EditorEntityUiInterface* m_editorEntityUiInterface = nullptr;
-    AzToolsFramework::Prefab::PrefabIntegrationInterface* m_prefabIntegrationInterface = nullptr;
-    AzToolsFramework::EditorEntityAPI* m_editorEntityAPI = nullptr;
-
-    // Overrides UI styling and behavior for Layer Entities
-    AzToolsFramework::LayerUiHandler m_layerUiOverrideHandler;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CToolsApplicationUndoLink
-    : public IUndoObject
-{
-public:
-
-    CToolsApplicationUndoLink(const char* description)
-        : m_description(description)
-    {
-    }
-
-    int GetSize() override
-    {
-        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.
-
-        // Restore previous focus after applying the undo.
-        QPointer<QWidget> w = QApplication::focusWidget();
-
-        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::UndoPressed);
-
-        // Slice the redo stack if this wasn't due to explicit undo command
-        if (!bUndo)
-        {
-            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::FlushRedo);
-        }
-
-        if (!w.isNull())
-        {
-            w->setFocus(Qt::OtherFocusReason);
-        }
-    }
-
-    void Redo() override
-    {
-        // Restore previous focus after applying the undo.
-        QPointer<QWidget> w = QApplication::focusWidget();
-
-        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::RedoPressed);
-
-        if (!w.isNull())
-        {
-            w->setFocus(Qt::OtherFocusReason);
-        }
-    }
-
-    AZStd::string m_description;
-};
-
-#endif // CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Tests/ComponentEntityObjectStateTests.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Tests/ComponentEntityObjectStateTests.cpp
deleted file mode 100644
index 42e055f36c..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Tests/ComponentEntityObjectStateTests.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/UnitTest/TestTypes.h>
-#include <AzTest/AzTest.h>
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
-
-#include <Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h>
-
-using namespace AzToolsFramework;
-
-namespace UnitTest
-{
-    class ComponentEntityObjectVisibilityFixture
-        : public ToolsApplicationFixture
-        , private EditorEntityVisibilityNotificationBus::Router
-        , private EditorEntityInfoNotificationBus::Handler
-    {
-    public:
-        void SetUpEditorFixtureImpl() override
-        {
-            EditorEntityVisibilityNotificationBus::Router::BusRouterConnect();
-            EditorEntityInfoNotificationBus::Handler::BusConnect();
-        }
-
-        void TearDownEditorFixtureImpl() override
-        {
-            EditorEntityInfoNotificationBus::Handler::BusDisconnect();
-            EditorEntityVisibilityNotificationBus::Router::BusRouterDisconnect();
-        }
-
-        TestEditorActions m_editorActions;
-        AZ::EntityId m_layerId;
-
-    private:
-        // EditorEntityVisibilityNotificationBus ...
-        void OnEntityVisibilityChanged(bool /*visibility*/) override
-        {
-        }
-
-        // EditorEntityInfoNotificationBus ...
-        void OnEntityInfoUpdatedVisibility(AZ::EntityId /*entityId*/, bool /*visible*/) override
-        {
-        }
-    };
-
-    TEST_F(ComponentEntityObjectVisibilityFixture, ViewportComponentEntityObjectRespectsLayerVisibility)
-    {
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Given
-        AZ::Entity* entityA = nullptr;
-        const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
-        AZ::Entity* entityB = nullptr;
-        const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
-        AZ::Entity* entityC = nullptr;
-        const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
-
-        m_layerId = CreateEditorLayerEntity("Layer");
-
-        entityA->Deactivate();
-        entityB->Deactivate();
-        entityC->Deactivate();
-
-        CComponentEntityObject componentEntityObjectA;
-        componentEntityObjectA.AssignEntity(entityA);
-
-        CComponentEntityObject componentEntityObjectB;
-        componentEntityObjectB.AssignEntity(entityB);
-
-        CComponentEntityObject componentEntityObjectC;
-        componentEntityObjectC.AssignEntity(entityC);
-
-        entityC->Activate();
-        entityB->Activate();
-        entityA->Activate();
-
-        AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
-        AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
-        AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // When
-        SetEntityVisibility(a, false);
-        SetEntityVisibility(b, false);
-        SetEntityVisibility(c, false);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Then
-        EXPECT_TRUE(componentEntityObjectA.IsHidden());
-        EXPECT_TRUE(componentEntityObjectB.IsHidden());
-        EXPECT_TRUE(componentEntityObjectC.IsHidden());
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // When
-        SetEntityVisibility(a, true);
-        SetEntityVisibility(b, true);
-        SetEntityVisibility(c, true);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Then
-        EXPECT_FALSE(componentEntityObjectA.IsHidden());
-        EXPECT_FALSE(componentEntityObjectB.IsHidden());
-        EXPECT_FALSE(componentEntityObjectC.IsHidden());
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // When
-        SetEntityVisibility(m_layerId, false);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Then
-        EXPECT_TRUE(componentEntityObjectA.IsHidden());
-        EXPECT_TRUE(componentEntityObjectB.IsHidden());
-        EXPECT_TRUE(componentEntityObjectC.IsHidden());
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    }
-
-    TEST_F(ComponentEntityObjectVisibilityFixture, ComponentEntityObjectDoesNotOverrideVisibility)
-    {
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Given
-        AZ::Entity* entityA = nullptr;
-        const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
-        AZ::Entity* entityB = nullptr;
-        const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
-        AZ::Entity* entityC = nullptr;
-        const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
-
-        m_layerId = CreateEditorLayerEntity("Layer");
-
-        entityA->Deactivate();
-        entityB->Deactivate();
-        entityC->Deactivate();
-
-        CComponentEntityObject componentEntityObjectA;
-        componentEntityObjectA.AssignEntity(entityA);
-
-        CComponentEntityObject componentEntityObjectB;
-        componentEntityObjectB.AssignEntity(entityB);
-
-        CComponentEntityObject componentEntityObjectC;
-        componentEntityObjectC.AssignEntity(entityC);
-
-        entityC->Activate();
-        entityB->Activate();
-        entityA->Activate();
-
-        AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
-        AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
-        AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // When
-        SetEntityVisibility(m_layerId, false);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Then
-        EXPECT_TRUE(componentEntityObjectA.IsHidden());
-        EXPECT_TRUE(componentEntityObjectB.IsHidden());
-        EXPECT_TRUE(componentEntityObjectC.IsHidden());
-
-        EXPECT_TRUE(IsEntitySetToBeVisible(a));
-        EXPECT_FALSE(IsEntityVisible(a));
-
-        EXPECT_TRUE(IsEntitySetToBeVisible(a));
-        EXPECT_FALSE(IsEntityVisible(b));
-
-        EXPECT_TRUE(IsEntitySetToBeVisible(a));
-        EXPECT_FALSE(IsEntityVisible(c));
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    }
-
-    TEST_F(ComponentEntityObjectVisibilityFixture, ViewportComponentEntityObjectRespectsLayerLock)
-    {
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Given
-        AZ::Entity* entityA = nullptr;
-        const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
-        AZ::Entity* entityB = nullptr;
-        const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
-        AZ::Entity* entityC = nullptr;
-        const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
-
-        m_layerId = CreateEditorLayerEntity("Layer");
-
-        entityA->Deactivate();
-        entityB->Deactivate();
-        entityC->Deactivate();
-
-        CComponentEntityObject componentEntityObjectA;
-        componentEntityObjectA.AssignEntity(entityA);
-
-        CComponentEntityObject componentEntityObjectB;
-        componentEntityObjectB.AssignEntity(entityB);
-
-        CComponentEntityObject componentEntityObjectC;
-        componentEntityObjectC.AssignEntity(entityC);
-
-        entityC->Activate();
-        entityB->Activate();
-        entityA->Activate();
-
-        AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
-        AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
-        AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // When
-        SetEntityLockState(a, true);
-        SetEntityLockState(b, true);
-        SetEntityLockState(c, true);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Then
-        EXPECT_TRUE(componentEntityObjectA.IsFrozen());
-        EXPECT_TRUE(componentEntityObjectB.IsFrozen());
-        EXPECT_TRUE(componentEntityObjectC.IsFrozen());
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // When
-        SetEntityLockState(a, false);
-        SetEntityLockState(b, false);
-        SetEntityLockState(c, false);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Then
-        EXPECT_FALSE(componentEntityObjectA.IsFrozen());
-        EXPECT_FALSE(componentEntityObjectB.IsFrozen());
-        EXPECT_FALSE(componentEntityObjectC.IsFrozen());
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // When
-        SetEntityLockState(m_layerId, true);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        // Then
-        EXPECT_TRUE(componentEntityObjectA.IsFrozen());
-        EXPECT_TRUE(componentEntityObjectB.IsFrozen());
-        EXPECT_TRUE(componentEntityObjectC.IsFrozen());
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    }
-} // namespace UnitTest
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Tests/test_Main.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Tests/test_Main.cpp
deleted file mode 100644
index 460f7c8d0b..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Tests/test_Main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include <AzTest/AzTest.h>
-#include <AzCore/Memory/SystemAllocator.h>
-
-#include <QApplication>
-
-using namespace AZ;
-
-// Handle asserts
-class ToolsFrameworkHook
-    : public AZ::Test::ITestEnvironment
-{
-public:
-    void SetupEnvironment() override
-    {
-        AllocatorInstance<SystemAllocator>::Create();
-    }
-
-    void TeardownEnvironment() override
-    {
-        AllocatorInstance<SystemAllocator>::Destroy();
-    }
-};
-
-AZTEST_EXPORT int AZ_UNIT_TEST_HOOK_NAME(int argc, char** argv)
-{
-    ::testing::InitGoogleMock(&argc, argv);
-    QApplication app(argc, argv);
-    AZ::Test::printUnusedParametersWarning(argc, argv);
-    AZ::Test::addTestEnvironments({ new ToolsFrameworkHook });
-    int result = RUN_ALL_TESTS();
-    return result;
-}
-
-IMPLEMENT_TEST_EXECUTABLE_MAIN();
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp
deleted file mode 100644
index b6e2805151..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp
+++ /dev/null
@@ -1,758 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "CryEdit.h"
-#include "AssetCatalogModel.h"
-#include "Objects/ComponentEntityObject.h"
-
-#include <ISourceControl.h>
-#include <IEditor.h>
-#include <qevent.h>
-#include <qmimedata.h>
-
-#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>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
-#include <AzCore/Slice/SliceAsset.h>
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Asset/AssetManagerBus.h>
-#include <AzCore/Asset/AssetTypeInfoBus.h>
-
-#include <AzFramework/API/ApplicationAPI.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h>
-#include <AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h>
-#include <AzToolsFramework/ToolsComponents/ScriptEditorComponent.h>
-#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
-#include <AzToolsFramework/Commands/EntityStateCommand.h>
-
-#include <QTimer>
-
-
-///////////////////////////////////////////////////////////////////////////////
-// AssetCatalogModelWorkerThread
-///////////////////////////////////////////////////////////////////////////////
-
-AssetCatalogModelWorkerThread::AssetCatalogModelWorkerThread(AssetCatalogModel* catalog, QThread* returnThread)
-    : m_catalog(catalog)
-    , m_returnThread(returnThread)
-{
-    connect(this, &QThread::started, this, &AssetCatalogModelWorkerThread::startJob);
-    connect(m_catalog, &AssetCatalogModel::LoadComplete, this, &AssetCatalogModelWorkerThread::ReturnToThread);
-}
-
-void AssetCatalogModelWorkerThread::ReturnToThread()
-{
-    quit();
-}
-
-void AssetCatalogModelWorkerThread::startJob()
-{
-    disconnect(this, &QThread::started, this, &AssetCatalogModelWorkerThread::startJob);
-    m_catalog->StartProcessingAssets();
-    QTimer::singleShot(0, m_catalog, &AssetCatalogModel::ProcessAssets);
-}
-
-void AssetCatalogModelWorkerThread::run()
-{
-    exec();
-
-    disconnect(m_catalog, &AssetCatalogModel::LoadComplete, this, &AssetCatalogModelWorkerThread::ReturnToThread);
-    m_catalog->moveToThread(m_returnThread);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// AssetCatalogEntry
-///////////////////////////////////////////////////////////////////////////////
-bool AssetCatalogEntry::operator<(const QStandardItem& other) const
-{
-    //  Set directories as always less than files.
-    bool leftIsDir = data(FolderRole).toBool();
-    bool rightIsDir = other.data(FolderRole).toBool();
-
-    if (leftIsDir != rightIsDir)
-    {
-        return leftIsDir;
-    }
-
-    QVariant leftName = data(Qt::DisplayRole);
-    QVariant rightName = other.data(Qt::DisplayRole);
-
-    return leftName.toString().compare(rightName.toString(), Qt::CaseInsensitive) < 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// AssetCatalogModel
-///////////////////////////////////////////////////////////////////////////////
-AssetCatalogModel::AssetCatalogModel(QObject* parent)
-    : QStandardItemModel(parent)
-    , m_canProcessAssets(true)
-{
-    AZStd::string allExtensions;
-    AZStd::vector<AZ::Data::AssetType> assetTypes;
-    //  Discover all types that the Asset system recognizes.
-    //  Create a one-to-many map that associates extensions with AssetTypes.
-    EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, GetHandledAssetTypes, assetTypes);
-    for (auto type : assetTypes)
-    {
-        AZStd::vector<AZStd::string> extensions;
-        allExtensions.clear();
-        EBUS_EVENT_ID(type, AZ::AssetTypeInfoBus, GetAssetTypeExtensions, extensions);
-        for (int i = 0; i < extensions.size(); i++)
-        {
-            if (i > 0)
-            {
-                allExtensions += ";";
-            }
-            allExtensions += ".";   //  Adding dots to all extensions to be able to separate full extensions from substrings, i.e. "bin" and input"bin"dings.
-            allExtensions += extensions[i].c_str();
-        }
-        if (!allExtensions.empty())
-        {
-            auto existingEntry = m_extensionToAssetType.find(allExtensions);
-            if (existingEntry != m_extensionToAssetType.end())
-            {
-                existingEntry->second.push_back(type);
-            }
-            else
-            {
-                m_extensionToAssetType.insert(AZStd::make_pair(allExtensions, AZStd::vector<AZ::Uuid> {type}));
-            }
-        }
-    }
-
-    //  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.");
-
-    serializeContext->EnumerateDerived<AZ::Component>([this](const AZ::SerializeContext::ClassData* classData, const AZ::Uuid&) -> bool
-        {
-            if (classData->m_editData)
-            {
-                AZ::Data::AssetType assetType;
-                const AZ::Edit::ElementData* element = classData->m_editData->FindElementData(AZ::Edit::ClassElements::EditorData);
-                if (element)
-                {
-                    const AZ::Edit::Attribute* assetTypeAttribute = element->FindAttribute(AZ::Edit::Attributes::PrimaryAssetType);
-                    if (assetTypeAttribute)
-                    {
-                        auto* assetTypeData = azdynamic_cast<const AZ::Edit::AttributeData<AZ::Uuid>*>(assetTypeAttribute);
-                        if (assetTypeData)
-                        {
-                            assetType = assetTypeData->Get(nullptr);
-                            m_assetTypeToComponent[assetType] = classData->m_azRtti->GetTypeId();
-                        }
-                    }
-                    else
-                    {
-                        assetType = AZ::Data::AssetType::CreateNull();
-                    }
-
-                    if (!assetType.IsNull())
-                    {
-                        const AZ::Edit::Attribute* iconAttribute = element->FindAttribute(AZ_CRC("Icon"));
-                        if (iconAttribute)
-                        {
-                            auto* iconAttributeData = azdynamic_cast<const AZ::Edit::AttributeData<const char*>*>(iconAttribute);
-                            if (iconAttributeData)
-                            {
-                                QIcon icon(iconAttributeData->Get(nullptr));
-                                if (!icon.isNull())
-                                {
-                                    m_assetTypeToIcon[assetType] = icon;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            return true;
-        });
-}
-AssetCatalogModel::~AssetCatalogModel()
-{
-    AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
-}
-
-AZ::Data::AssetType AssetCatalogModel::GetAssetType(QString filename) const
-{
-    AZ::Data::AssetType returnType = AZ::Uuid::CreateNull();
-
-    //  Compare file extensions with the map created from the asset database.
-    int dotIndex = filename.lastIndexOf('.');
-    if (dotIndex >= 0)
-    {
-        QString extension = filename.mid(dotIndex);
-        for (auto pair : m_extensionToAssetType)
-        {
-            QString qExtensions = pair.first.c_str();
-            if (qExtensions.indexOf(extension) >= 0)
-            {
-                if (pair.second.size() > 1)
-                {
-                    //  There are multiple types with this extension. Check each handler to see if they can handle this data type.
-                    AZStd::string azFilename = filename.toStdString().c_str();
-                    EBUS_EVENT(AzFramework::ApplicationRequests::Bus, MakePathAssetRootRelative, azFilename);
-                    AZ::Data::AssetId assetId;
-                    EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, azFilename.c_str(), AZ::Data::s_invalidAssetType, false);
-
-                    for (AZ::Uuid type : pair.second)
-                    {
-                        const AZ::Data::AssetHandler* handler = AZ::Data::AssetManager::Instance().GetHandler(type);
-                        if (handler && handler->CanHandleAsset(assetId))
-                        {
-                            returnType = type;
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    returnType = pair.second[0];
-                    break;
-                }
-            }
-        }
-    }
-
-    return returnType;
-}
-
-QStandardItem* AssetCatalogModel::GetPath(QString& path, bool createIfNeeded, QStandardItem* parent)
-{
-    if (!parent)
-    {
-        parent = invisibleRootItem();
-    }
-    QString cleanPath = path.replace("\\", "/");
-    while (cleanPath.startsWith("/"))
-    {
-        cleanPath = cleanPath.mid(1);
-    }
-    while (cleanPath.endsWith("/"))
-    {
-        cleanPath.chop(1);
-    }
-
-    QString currentFolder;
-    QString restOfPath;
-
-    int slashIdx = cleanPath.indexOf('/', 1);
-    if (slashIdx < 0)
-    {
-        currentFolder = cleanPath;
-        restOfPath.clear();
-    }
-    else
-    {
-        currentFolder = cleanPath.left(slashIdx);
-        restOfPath = cleanPath.mid(slashIdx + 1);
-    }
-
-    if (currentFolder.isEmpty())
-    {
-        return parent;
-    }
-
-    for (int i = 0; i < parent->rowCount(); i++)
-    {
-        QString name = parent->child(i)->data(Qt::DisplayRole).toString();
-        bool isFolder = parent->child(i)->data(AssetCatalogEntry::FolderRole).toBool();
-
-        if (currentFolder == name && isFolder)
-        {
-            if (restOfPath.isEmpty())
-            {
-                return parent->child(i);
-            }
-            else
-            {
-                return GetPath(restOfPath, createIfNeeded, parent->child(i));
-            }
-        }
-    }
-
-    if (createIfNeeded)
-    {
-        QString fullpath = parent->data(AssetCatalogEntry::FilePathRole).toString();
-        fullpath += currentFolder + "/";
-        AssetCatalogEntry* folder = new AssetCatalogEntry();
-        folder->setData(currentFolder, Qt::DisplayRole);
-        folder->setData(fullpath, AssetCatalogEntry::FilePathRole);
-        folder->setData(true, AssetCatalogEntry::FolderRole);
-        folder->setData(true, AssetCatalogEntry::VisibilityRole);
-
-        parent->appendRow(folder);
-
-        if (restOfPath.isEmpty())
-        {
-            return folder;
-        }
-        else
-        {
-            return GetPath(restOfPath, createIfNeeded, folder);
-        }
-    }
-    else
-    {
-        return nullptr;
-    }
-}
-
-AssetCatalogEntry* AssetCatalogModel::FindAsset(QString assetPath)
-{
-    QString path;
-    QString asset;
-
-    //  Separate file name and folder name.
-    int slashIdx = assetPath.lastIndexOf('/');
-    if (slashIdx < 0)
-    {
-        asset = assetPath;
-        path.clear();
-    }
-    else
-    {
-        path = assetPath.left(slashIdx);
-        asset = assetPath.mid(slashIdx + 1);
-    }
-
-    QStandardItem* folder = GetPath(path, false);
-
-    if (folder)
-    {
-        for (int i = 0; i < folder->rowCount(); i++)
-        {
-            QString name = folder->child(i)->data(Qt::DisplayRole).toString();
-            if (name == asset)
-            {
-                AssetCatalogEntry* entry = static_cast<AssetCatalogEntry*>(folder->child(i));
-                return entry;
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-AssetCatalogEntry* AssetCatalogModel::AddAsset(QString assetPath, AZ::Data::AssetId id)
-{
-    QString path;
-    QString asset;
-
-    //  Separate file name and folder name.
-    int slashIdx = assetPath.lastIndexOf('/');
-    if (slashIdx < 0)
-    {
-        asset = assetPath;
-        path.clear();
-    }
-    else
-    {
-        path = assetPath.left(slashIdx);
-        asset = assetPath.mid(slashIdx + 1);
-    }
-
-    QRegExp mipMapExtension("\\.dds\\.\\d+a?$");    // Files that end with ".dds.#", with an optional "a"
-    if (asset.contains(mipMapExtension))
-    {
-        //  Mip map files should be ignored by the file browser.
-        //  This is a temporary solution until texture streams are refactored.
-        return nullptr;
-    }
-
-    QStandardItem* folder = GetPath(path, true);
-
-    QString fullPath = folder->data(AssetCatalogEntry::FilePathRole).toString() + asset;
-    AZ::Data::AssetType assetType = GetAssetType(fullPath);
-    AZ::Uuid            classId = AZ::Uuid::CreateNull();
-    auto it = m_assetTypeToComponent.find(assetType);
-    if (it != m_assetTypeToComponent.end())
-    {
-        classId = it->second;
-    }
-
-    AssetCatalogEntry* entry = new AssetCatalogEntry();
-    entry->setData(asset, Qt::DisplayRole);
-    entry->setData(fullPath, AssetCatalogEntry::FilePathRole);
-    entry->setData(false, AssetCatalogEntry::FolderRole);
-    entry->setData(true, AssetCatalogEntry::VisibilityRole);
-
-    entry->m_assetId = id;
-    entry->m_assetType = assetType;
-    entry->m_classId = classId;
-
-    if (!assetType.IsNull())
-    {
-        auto iconIt = m_assetTypeToIcon.find(assetType);
-        if (iconIt == m_assetTypeToIcon.end())
-        {
-            //  The m_assetTypeToIcon map was seeded with icons for known asset types.
-            //  If we come across an asset type that is not associated with a component,
-            //  we'll get its icon from OS if we can. This will help users recognize files more easily.
-            QFileInfo fileInfo(m_rootPath + fullPath);
-            QIcon fileIcon = m_iconProvider.icon(fileInfo);
-            //  Now, make a deep copy for OS-provided icons. On Windows 10, there seems to be an issue with
-            //  icons' memory being reclaimed and crashing the Editor.
-            QSize size = fileIcon.actualSize(QSize(16, 16));
-            QIcon deepCopy = fileIcon.pixmap(size).copy(0, 0, size.width(), size.height());
-            
-            if (!fileIcon.isNull())
-            {
-                m_assetTypeToIcon[assetType] = deepCopy;
-            }
-        }
-    }
-
-    folder->appendRow(entry);
-
-    return entry;
-}
-
-AssetCatalogEntry* AssetCatalogModel::RemoveAsset(QString assetPath)
-{
-    AssetCatalogEntry* entry = FindAsset(assetPath);
-    if (entry)
-    {
-        QStandardItem* parent = entry->parent();
-        if (parent)
-        {
-            parent->removeRow(entry->row());
-            AssetCatalogEntry* folder = static_cast<AssetCatalogEntry*>(parent);
-            return folder;
-        }
-    }
-
-    return nullptr;
-}
-
-void AssetCatalogModel::LoadDatabase()
-{
-    clear();
-
-    AZStd::string assetRootFolder;
-    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
-    {
-        settingsRegistry->Get(assetRootFolder, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheRootFolder);
-    }
-    m_rootPath = assetRootFolder.c_str();
-
-    auto startCB = []() {};
-
-    auto enumerateCB = [this](const AZ::Data::AssetId id, const AZ::Data::AssetInfo& assetInfo)
-        {
-            DatabaseEntry* entry = new DatabaseEntry(id, assetInfo.m_relativePath.c_str());
-            m_fileCache.push_back(entry);
-        };
-
-    auto endCB = [this]()
-        {
-            m_fileCacheCurrentIndex = 0;
-            Q_EMIT UpdateProgress(0);
-            Q_EMIT SetTotalProgress(m_fileCache.size());
-        };
-
-    EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, EnumerateAssets, startCB, enumerateCB, endCB);
-
-    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-
-    m_canProcessAssets = true;
-}
-
-void AssetCatalogModel::ProcessAssets()
-{
-    if (m_fileCacheCurrentIndex >= m_fileCache.size())
-    {
-        sort(0);
-        m_fileCache.clear();
-        Q_EMIT LoadComplete();
-    }
-    else
-    {
-        for (int i = 0; m_canProcessAssets && i < ASSET_CATALOG_BATCH_SIZE && m_fileCacheCurrentIndex < m_fileCache.size(); i++, m_fileCacheCurrentIndex++)
-        {
-            AddAsset(m_fileCache[m_fileCacheCurrentIndex]->m_path, m_fileCache[m_fileCacheCurrentIndex]->m_id);
-        }
-        Q_EMIT UpdateProgress(m_fileCacheCurrentIndex);
-
-        if (m_canProcessAssets)
-        {
-            QTimer::singleShot(1, this, &AssetCatalogModel::ProcessAssets);
-        }
-    }
-}
-
-void AssetCatalogModel::StartProcessingAssets()
-{
-    m_canProcessAssets = true;
-}
-
-void AssetCatalogModel::StopProcessingAssets()
-{
-    m_canProcessAssets = false;
-}
-
-
-void AssetCatalogModel::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
-{
-    AZ::Data::AssetInfo assetInfo;
-    EBUS_EVENT_RESULT(assetInfo, AZ::Data::AssetCatalogRequestBus, GetAssetInfoById, assetId);
-
-    // note that this will get called twice, once with the real assetId and once with legacy assetId.
-    // we only want to add the real asset to the list, in which the assetId passed in is equal to the final assetId returned
-    // otherwise, you look up assetId (and its a legacy assetId) and the actual asset will be different.
-    if ((assetInfo.m_assetId.IsValid()) && (assetInfo.m_assetId == assetId))
-    {
-        AssetCatalogEntry* asset = AddAsset(assetInfo.m_relativePath.c_str(), assetInfo.m_assetId);
-        if (asset)
-        {
-            Q_EMIT itemChanged(asset);
-        }
-    }
-}
-
-void AssetCatalogModel::OnCatalogAssetRemoved(const AZ::Data::AssetId& /*assetId*/, const AZ::Data::AssetInfo& assetInfo)
-{
-    AssetCatalogEntry* asset = RemoveAsset(assetInfo.m_relativePath.c_str());
-    if (asset)
-    {
-        Q_EMIT itemChanged(asset);
-    }
-}
-
-QVariant AssetCatalogModel::data(const QModelIndex& index, int role) const
-{
-    QStandardItem* item = itemFromIndex(index);
-    if (item && role == Qt::DecorationRole)
-    {
-        AssetCatalogEntry* entry = static_cast<AssetCatalogEntry*>(item);
-        auto it = m_assetTypeToIcon.find(entry->m_assetType);
-        if (it != m_assetTypeToIcon.end())
-        {
-            return it->second;
-        }
-
-        bool isFolder = item->data(AssetCatalogEntry::FolderRole).toBool();
-        return isFolder ? m_iconProvider.icon(QFileIconProvider::Folder) : m_iconProvider.icon(QFileIconProvider::File);
-    }
-
-    return QStandardItemModel::data(index, role);
-}
-
-QMimeData* AssetCatalogModel::mimeData(const QModelIndexList& indexes) const
-{
-    AssetCatalogEntry* item = static_cast<AssetCatalogEntry*>(itemFromIndex(indexes[0]));
-    bool isFolder = item ? item->data(AssetCatalogEntry::FolderRole).toBool() : true;
-
-    if (isFolder)
-    {
-        return new QMimeData();
-    }
-
-    QString fullPath = item->data(AssetCatalogEntry::FilePathRole).toString();
-    QMimeData* mimeData = new QMimeData;
-
-    if (!item->m_assetType.IsNull() && item->m_assetId.IsValid())
-    {
-        //  This mime data is used to drag into PropertyAssetCtrl fields.
-        AzToolsFramework::EditorAssetMimeDataContainer mimeDataContainer;
-        mimeDataContainer.AddEditorAsset(item->m_assetId, item->m_assetType);
-        mimeDataContainer.AddToMimeData(mimeData);
-
-        // This mime data is used for spawning of entities with components and the adding of components through assets.
-        AzToolsFramework::ComponentAssetMimeDataContainer componentContainer;
-        componentContainer.AddComponentAsset(item->m_classId, item->m_assetId);
-        componentContainer.AddToMimeData(mimeData);
-    }
-    //  Also, add the filename, for untyped fields.
-    QList<QUrl> urls;
-    urls << QUrl::fromLocalFile(fullPath);
-    mimeData->setUrls(urls);
-
-    return mimeData;
-}
-
-QVariant AssetCatalogModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (role == Qt::DisplayRole && section == 0 && orientation == Qt::Horizontal)
-    {
-        return tr("Assets");
-    }
-
-    return QAbstractItemModel::headerData(section, orientation, role);
-}
-
-void AssetCatalogModel::SearchCriteriaChanged(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator)
-{
-    BuildFilter(criteriaList, filterOperator);
-    InvalidateFilter();
-}
-
-void AssetCatalogModel::BuildFilter(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator)
-{
-    ClearFilterRegExp();
-
-    if (criteriaList.size() > 0)
-    {
-        QString filter, tag, text;
-        for (int i = 0; i < criteriaList.size(); i++)
-        {
-            AzToolsFramework::SearchCriteriaButton::SplitTagAndText(criteriaList[i], tag, text);
-            if (tag.isEmpty())
-            {
-                tag = "null";
-            }
-
-            filter = m_filtersRegExp[tag.toStdString().c_str()].pattern();
-
-            if (filterOperator == AzToolsFramework::FilterOperatorType::Or)
-            {
-                if (filter.isEmpty())
-                {
-                    filter = text;
-                }
-                else
-                {
-                    filter += "|" + text;
-                }
-            }
-            else if (filterOperator == AzToolsFramework::FilterOperatorType::And)
-            {
-                filter += "(?=.*" + text + ")"; //  Using Lookaheads to produce an "and" effect.
-            }
-
-            SetFilterRegExp(tag.toStdString().c_str(), QRegExp(filter, Qt::CaseInsensitive));
-        }
-    }
-}
-
-void AssetCatalogModel::SetFilterRegExp(const AZStd::string& filterType, const QRegExp& regExp)
-{
-    m_filtersRegExp[filterType] = regExp;
-}
-
-void AssetCatalogModel::ClearFilterRegExp(const AZStd::string& filterType)
-{
-    if (filterType.empty())
-    {
-        for (auto& it : m_filtersRegExp)
-        {
-            it.second = QRegExp();
-        }
-    }
-    else
-    {
-        m_filtersRegExp[filterType] = QRegExp();
-    }
-}
-
-void AssetCatalogModel::InvalidateFilter()
-{
-    ApplyFilter(invisibleRootItem());
-}
-
-void AssetCatalogModel::ApplyFilter(QStandardItem* parent)
-{
-    //  Set the visibility as a breadth-first search of the tree.
-    //  This will allow us to also set our parents visible if we are visible
-    //  without a later search overriding us.
-    for (int i = 0; i < parent->rowCount(); i++)
-    {
-        QStandardItem* child = parent->child(i);
-        if (m_filtersRegExp["name"].isEmpty())
-        {
-            child->setData(true, AssetCatalogEntry::VisibilityRole);
-        }
-        else
-        {
-            QString assetname = child->data(Qt::DisplayRole).toString();
-            bool matchesFilter = assetname.contains(m_filtersRegExp["name"]);
-            child->setData(matchesFilter, AssetCatalogEntry::VisibilityRole);
-
-            if (matchesFilter)
-            {
-                //  Set all parents to visible.
-                QStandardItem* visiblityParent = parent;
-                bool isVisible = visiblityParent->data(AssetCatalogEntry::VisibilityRole).toBool();
-                while (!isVisible)    //  Checking isVisible gives us a short circuit for already visible folders.
-                {
-                    visiblityParent->setData(true, AssetCatalogEntry::VisibilityRole);
-                    visiblityParent = visiblityParent->parent();
-
-                    isVisible = visiblityParent ? visiblityParent->data(AssetCatalogEntry::VisibilityRole).toBool() : true;
-                }
-            }
-        }
-    }
-
-    //  Recurse through the children that are folders
-    for (int i = 0; i < parent->rowCount(); i++)
-    {
-        QStandardItem* child = parent->child(i);
-        bool isFolder = child->data(AssetCatalogEntry::FolderRole).toBool();
-        if (isFolder)
-        {
-            ApplyFilter(child);
-        }
-    }
-}
-
-QString AssetCatalogModel::FileName(const QModelIndex& index) const
-{
-    QStandardItem* item = itemFromIndex(index);
-    if (item)
-    {
-        return item->data(Qt::DisplayRole).toString();
-    }
-
-    return QString();
-}
-
-QString AssetCatalogModel::FilePath(const QModelIndex& index) const
-{
-    //  filePath contains the name of the file.
-    QStandardItem* item = itemFromIndex(index);
-    if (item)
-    {
-        QString fullPath = RootPath();
-        fullPath += item->data(AssetCatalogEntry::FilePathRole).toString();
-        return fullPath;
-    }
-
-    return QString();
-}
-
-AssetCatalogEntry* AssetCatalogModel::AssetData(const QModelIndex& index) const
-{
-    return static_cast<AssetCatalogEntry*>(itemFromIndex(index));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// End of context menu handling
-///////////////////////////////////////////////////////////////////////////////
-
-#include <UI/moc_AssetCatalogModel.cpp>
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.h
deleted file mode 100644
index 593418c82d..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QtGui/qstandarditemmodel.h>
-#include <QFileIconProvider>
-#include <QThread>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/std/containers/unordered_map.h>
-
-#include <AzFramework/Asset/AssetCatalogBus.h>
-#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-struct DatabaseEntry
-{
-public:
-    DatabaseEntry(AZ::Data::AssetId assetID, const char *assetPath)
-        : m_id(assetID)
-        , m_path(assetPath)
-    {}
-    AZ::Data::AssetId m_id;
-    QString m_path;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-class AssetCatalogEntry
-    : public QStandardItem
-{
-public:
-    //  This will be easier to store in the data, so that filters don't have to cast the item to get to it.
-    enum Roles
-    {
-        FileIconRole = Qt::DecorationRole,
-        FilePathRole = Qt::UserRole + 1,
-        VisibilityRole = Qt::UserRole + 2,
-        FolderRole = Qt::UserRole + 3
-    };
-
-    AssetCatalogEntry() {}
-    AZ_CLASS_ALLOCATOR(AssetCatalogEntry, AZ::SystemAllocator, 0);
-
-    bool operator<(const QStandardItem& other) const override;
-
-public:
-    AZ::Data::AssetId   m_assetId;      ///<  The unique ID of the asset in the asset database.
-    AZ::Data::AssetType m_assetType;    ///<  The type of the asset is used to validate on certain drop targets, like the PropertyAssetCtrl.
-    AZ::Uuid            m_classId;      ///<  If valid, the component that should be created when this asset is dragged onto creation-capable windows.
-};
-
-///////////////////////////////////////////////////////////////////////////////
-class AssetCatalogModel
-    : public QStandardItemModel
-    , public AzFramework::AssetCatalogEventBus::Handler
-{
-    Q_OBJECT
-
-public:
-    AZ_CLASS_ALLOCATOR(AssetCatalogModel, AZ::SystemAllocator, 0);
-
-    AssetCatalogModel(QObject* parent = 0);
-    ~AssetCatalogModel() override;
-
-    QString RootPath() const { return m_rootPath; }
-    void LoadDatabase();
-
-    QString FileName(const QModelIndex& index) const;
-    QString FilePath(const QModelIndex& index) const;
-    AssetCatalogEntry* AssetData(const QModelIndex& index) const;
-
-    //! Finds an asset. On success, returns a pointer to the item.
-    //! \retrun A valid pointer on success, nullptr on fail.
-    AssetCatalogEntry* FindAsset(QString assetPath);
-
-    //  QAbstractItemModel overrides
-    QVariant    data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    QMimeData* mimeData(const QModelIndexList& indexes) const override;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-
-    // AzFramework::AssetCatalogEventBus::Handler
-    void OnCatalogAssetAdded(const AZ::Data::AssetId& assetId) override;
-    void OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& assetInfo) override;
-
-Q_SIGNALS:
-    void LoadComplete();
-    void SetTotalProgress(int value);
-    void UpdateProgress(int value);
-
-public Q_SLOTS:
-    void SearchCriteriaChanged(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator);
-    void ProcessAssets();
-    void StartProcessingAssets();
-    void StopProcessingAssets();
-
-protected:
-    //! Adds an asset and returns a pointer to that new asset.
-    AssetCatalogEntry* AddAsset(QString assetPath, AZ::Data::AssetId id);
-    //! Removes an asset. On success, returns a pointer to the parent item. On failure, returns nullptr.
-    AssetCatalogEntry* RemoveAsset(QString assetPath);
-
-    void BuildFilter(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator);
-    void InvalidateFilter();
-    void SetFilterRegExp(const AZStd::string& filterType, const QRegExp& regExp);
-    void ClearFilterRegExp(const AZStd::string& filterType = AZStd::string());
-
-    AZ::Data::AssetType GetAssetType(QString filename) const;
-    QStandardItem* GetPath(QString& path, bool createIfNeeded, QStandardItem* parent = nullptr);
-
-    void ApplyFilter(QStandardItem* parent);
-
-    AZStd::unordered_map<AZ::Data::AssetType, QIcon> m_assetTypeToIcon;
-    AZStd::unordered_map<AZ::Uuid, AZ::Uuid> m_assetTypeToComponent;
-    AZStd::unordered_map<AZStd::string, AZStd::vector<AZ::Uuid>> m_extensionToAssetType;
-
-    QFileIconProvider   m_iconProvider;
-    QString             m_rootPath;
-
-    AzToolsFramework::FilterByCategoryMap m_filtersRegExp;
-
-    static const int ASSET_CATALOG_BATCH_SIZE = 50;
-
-    AZStd::vector<DatabaseEntry*> m_fileCache;   //  scratch space to get the registry data out of the AssetDatabase in quick fashion.
-    int                          m_fileCacheCurrentIndex;
-    bool                         m_canProcessAssets;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-class AssetCatalogModelWorkerThread
-    : public QThread
-{
-    Q_OBJECT
-
-public:
-    AssetCatalogModelWorkerThread(AssetCatalogModel* catalog, QThread* returnThread);
-
-    void startJob();
-
-public Q_SLOTS:
-    void ReturnToThread();
-
-protected:
-    void run() override;
-    //  These are pointers that this object will not own.
-    QThread* m_returnThread;
-    AssetCatalogModel* m_catalog;
-
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentEntityEditorOutlinerWindow.qrc b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentEntityEditorOutlinerWindow.qrc
deleted file mode 100644
index 07f79dcb5c..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentEntityEditorOutlinerWindow.qrc
+++ /dev/null
@@ -1,21 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="sort_a_to_z.svg">Icons/sort_a_to_z.svg</file>
-        <file alias="sort_manually.svg">Icons/sort_manually.svg</file>
-        <file alias="sort_z_to_a.svg">Icons/sort_z_to_a.svg</file>
-        
-        <file alias="visibility_default.svg">Icons/visibility_default.svg</file>
-        <file alias="visibility_default_hover.svg">Icons/visibility_default_hover.svg</file>
-        <file alias="visibility_default_transparent.svg">Icons/visibility_default_transparent.svg</file>
-        <file alias="visibility_on.svg">Icons/visibility_on.svg</file>
-        <file alias="visibility_on_hover.svg">Icons/visibility_on_hover.svg</file>
-        <file alias="visibility_on_transparent.svg">Icons/visibility_on_transparent.svg</file>
-        
-        <file alias="lock_default.svg">Icons/lock_default.svg</file>
-        <file alias="lock_default_hover.svg">Icons/lock_default_hover.svg</file>
-        <file alias="lock_default_transparent.svg">Icons/lock_default_transparent.svg</file>
-        <file alias="lock_on.svg">Icons/lock_on.svg</file>
-        <file alias="lock_on_hover.svg">Icons/lock_on_hover.svg</file>
-        <file alias="lock_on_transparent.svg">Icons/lock_on_transparent.svg</file>
-    </qresource>
-</RCC>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp
deleted file mode 100644
index d58ddb5746..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "CategoriesList.h"
-
-ComponentCategoryList::ComponentCategoryList(QWidget* parent /*= nullptr*/) 
-    : QTreeWidget(parent)
-{
-}
-
-void ComponentCategoryList::Init()
-{
-    setColumnCount(1);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    setDragDropMode(QAbstractItemView::DragDropMode::DragOnly);
-    setDragEnabled(true);
-    setSelectionMode(QAbstractItemView::ExtendedSelection);
-    setAllColumnsShowFocus(true);
-    setStyleSheet("QTreeWidget { selection-background-color: rgba(255,255,255,0.2); }");
-
-    QStringList headers;
-    headers << tr("Categories");
-    setHeaderLabels(headers);
-
-    const QString parentCategoryIconPath = QString("Icons/PropertyEditor/Browse_on.png");
-    const QString categoryIconPath = QString("Icons/PropertyEditor/Browse.png");
-
-    QTreeWidgetItem* allCategory = new QTreeWidgetItem(this);
-    allCategory->setText(0, "All");
-    allCategory->setIcon(0, QIcon(categoryIconPath));
-
-    // Need this briefly to collect the list of available categories.
-    ComponentDataModel dataModel(this);
-    for (const auto& cat : dataModel.GetCategories())
-    {
-        QString categoryString = QString(cat.c_str());
-        QStringList categories = categoryString.split('/', Qt::SkipEmptyParts);
-
-        QTreeWidgetItem* parent = nullptr;
-        QTreeWidgetItem* categoryWidget = nullptr;
-
-        for (const auto& categoryName : categories)
-        {
-            if (parent)
-            {
-                categoryWidget = new QTreeWidgetItem(parent);
-                categoryWidget->setIcon(0, QIcon(categoryIconPath));
-                
-                // Store the full category path in a user role because we'll need it to locate the actual category
-                categoryWidget->setData(0, Qt::UserRole, QVariant::fromValue(categoryString));
-            }
-            else
-            {
-                auto existingCategory = findItems(categoryName, Qt::MatchExactly);
-                if (existingCategory.empty())
-                {
-                    categoryWidget = new QTreeWidgetItem(this);
-                    categoryWidget->setIcon(0, QIcon(parentCategoryIconPath));
-                }
-                else
-                {
-                    categoryWidget = static_cast<QTreeWidgetItem*>(existingCategory.first());
-                    categoryWidget->setIcon(0, QIcon(parentCategoryIconPath));
-                }
-            }
-
-            parent = categoryWidget;
-
-            categoryWidget->setText(0, categoryName);
-        }
-    }
-
-    expandAll();
-
-    connect(this, &QTreeWidget::itemClicked, this, &ComponentCategoryList::OnItemClicked);
-}
-
-void ComponentCategoryList::OnItemClicked(QTreeWidgetItem* item, int /*column*/)
-{
-    QVariant userData = item->data(0, Qt::UserRole);
-    if (userData.isValid())
-    {
-        // Send in the full category path, not just the child category name
-        emit OnCategoryChange(userData.value<QString>().toStdString().c_str());
-    }
-    else
-    {
-        emit OnCategoryChange(item->text(0).toStdString().c_str());
-    }
-}
-
-#include <UI/ComponentPalette/moc_CategoriesList.cpp>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.h
deleted file mode 100644
index d33a3a1ee4..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "ComponentDataModel.h"
-#include <QTreeWidget>
-#endif
-
-//! ComponentCategoryList
-//! Provides a list of all reflected categories that users can select for quick
-//! filtering the filtered component list.
-class ComponentCategoryList : public QTreeWidget
-{
-    Q_OBJECT
-
-public:
-
-    AZ_CLASS_ALLOCATOR(ComponentCategoryList, AZ::SystemAllocator, 0);
-
-    explicit ComponentCategoryList(QWidget* parent = nullptr);
-
-    void Init();
-
-Q_SIGNALS:
-    void OnCategoryChange(const char* category);
-
-protected:
-
-    // Will emit OnCategoryChange signal
-    void OnItemClicked(QTreeWidgetItem* item, int column);
-
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.cpp
deleted file mode 100644
index fd70b4198f..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "ComponentDataModel.h"
-
-#include "Include/IObjectManager.h"
-#include "Objects/SelectionGroup.h"
-
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/Component/Component.h>
-#include <AzCore/Serialization/EditContext.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Commands/EntityStateCommand.h>
-#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
-#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-
-#include <Editor/IEditor.h>
-#include <Editor/Viewport.h>
-#include <Editor/ViewManager.h>
-#include <CryCommon/MathConversion.h>
-
-#include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
-
-#include <QMimeData>
-
-namespace
-{
-    // This is a helper function that given an object that derives from QAbstractItemModel, 
-    // it will request the model's "ClassDataRole" class data for an entry and use that 
-    // information to create a new entity with the selected components.
-    AZ::EntityId CreateEntityFromSelection(const QModelIndexList& selection, QAbstractItemModel* model)
-    {
-        AZ::Vector3 position = AZ::Vector3::CreateZero();
-        CViewport *view = GetIEditor()->GetViewManager()->GetGameViewport();
-        int width, height;
-        view->GetDimensions(&width, &height);
-        position = LYVec3ToAZVec3(view->ViewToWorld(QPoint(width / 2, height / 2)));
-
-        AZ::EntityId newEntityId;
-        EBUS_EVENT_RESULT(newEntityId, AzToolsFramework::EditorRequests::Bus, CreateNewEntityAtPosition, position, AZ::EntityId());
-        if (newEntityId.IsValid())
-        {
-            // Add all the selected components.
-            AZ::ComponentTypeList componentsToAdd;
-            for (auto index : selection)
-            {
-                // We only need to consider the first column, it's important that the data() function that 
-                // returns ComponentDataModel::ClassDataRole also does so for the first column.
-                if (index.column() != 0)
-                {
-                    continue;
-                }
-
-                QVariant classDataVariant = model->data(index, ComponentDataModel::ClassDataRole);
-                if (classDataVariant.isValid())
-                {
-                    const AZ::SerializeContext::ClassData* classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
-                    componentsToAdd.push_back(classData->m_typeId);
-                }
-            }
-
-            AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, AzToolsFramework::EntityIdList{ newEntityId }, componentsToAdd);
-
-            return newEntityId;
-        }
-
-        return AZ::EntityId();
-    }
-}
-
-namespace ComponentDataUtilities
-{
-    // This is a helper function to add the specified components to the selected entities, it relies on the provided
-    // QAbstractItemModel to determine the appropriate ClassData to use to create the components (given that some widgets
-    // may provide proxy models that alter the order).
-    void AddComponentsToSelectedEntities(const QModelIndexList& selectedComponents, QAbstractItemModel* model)
-    {
-        AzToolsFramework::EntityIdList selectedEntities;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-        if (selectedEntities.empty())
-        {
-            return;
-        }
-
-        // Add all the selected components.
-        AZ::ComponentTypeList componentsToAdd;
-        for (auto index : selectedComponents)
-        {
-            // We only need to consider the first column, it's important that the data() function that 
-            // returns ComponentDataModel::ClassDataRole also does so for the first column.
-            if (index.column() != 0)
-            {
-                continue;
-            }
-
-            QVariant classDataVariant = model->data(index, ComponentDataModel::ClassDataRole);
-            if (classDataVariant.isValid())
-            {
-                const AZ::SerializeContext::ClassData* classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
-                componentsToAdd.push_back(classData->m_typeId);
-            }
-        }
-
-        AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, selectedEntities, componentsToAdd);
-    }
-}
-
-
-// ComponentDataModel
-//////////////////////////////////////////////////////////////////////////
-
-ComponentDataModel::ComponentDataModel(QObject* parent)
-    : QAbstractTableModel(parent)
-{
-    AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(serializeContext, "Failed to acquire application serialize context.");
-
-    serializeContext->EnumerateDerived<AZ::Component>([this](const AZ::SerializeContext::ClassData* classData, const AZ::Uuid&) -> bool
-    {
-        bool allowed = false;
-        bool hidden = false;
-        AZStd::string category = "Miscellaneous";
-
-        if (classData->m_editData)
-        {
-            for (const AZ::Edit::ElementData& element : classData->m_editData->m_elements)
-            {
-                if (element.m_elementId == AZ::Edit::ClassElements::EditorData)
-                {
-                    AZStd::string iconPath;
-                    EBUS_EVENT_RESULT(iconPath, AzToolsFramework::EditorRequests::Bus, GetComponentEditorIcon, classData->m_typeId, nullptr);
-                    if (!iconPath.empty())
-                    {
-                        m_componentIcons[classData->m_typeId] = QIcon(iconPath.c_str());
-                    }
-
-                    for (const AZ::Edit::AttributePair& attribPair : element.m_attributes)
-                    {
-                        if (attribPair.first == AZ::Edit::Attributes::AppearsInAddComponentMenu)
-                        {
-                            if (auto data = azdynamic_cast<AZ::Edit::AttributeData<AZ::Crc32>*>(attribPair.second))
-                            {
-                                if (data->Get(nullptr) == AZ_CRC("Game"))
-                                {
-                                    allowed = true;
-                                }
-                            }
-                        }
-                        else if (attribPair.first == AZ::Edit::Attributes::AddableByUser)
-                        {
-                            // skip this component if user is not allowed to add it directly
-                            if (auto data = azdynamic_cast<AZ::Edit::AttributeData<bool>*>(attribPair.second))
-                            {
-                                if (!data->Get(nullptr))
-                                {
-                                    hidden = true;
-                                }
-                            }
-                        }
-                        else if (attribPair.first == AZ::Edit::Attributes::Category)
-                        {
-                            if (auto data = azdynamic_cast<AZ::Edit::AttributeData<const char*>*>(attribPair.second))
-                            {
-                                category = data->Get(nullptr);
-                            }
-                        }
-                    }
-
-                    break;
-                }
-            }
-        }
-
-        if (allowed && !hidden)
-        {
-            m_componentList.push_back(classData);
-            m_componentMap[category].push_back(classData);
-            m_categories.insert(category);
-        }
-
-        return true;
-    });
-
-    // we'd like viewport events
-    AzQtComponents::DragAndDropEventsBus::Handler::BusConnect(AzQtComponents::DragAndDropContexts::EditorViewport);
-}
-
-ComponentDataModel::~ComponentDataModel()
-{
-    AzQtComponents::DragAndDropEventsBus::Handler::BusDisconnect();
-}
-
-Qt::ItemFlags ComponentDataModel::flags([[maybe_unused]] const QModelIndex &index) const
-{
-    return Qt::ItemFlags(
-        Qt::ItemIsEnabled |
-        Qt::ItemIsDragEnabled |
-        Qt::ItemIsDropEnabled |
-        Qt::ItemIsSelectable);
-}
-
-const AZ::SerializeContext::ClassData* ComponentDataModel::GetClassData(const QModelIndex& index) const
-{
-    int row = index.row();
-    if (row < 0 || row >= m_componentList.size())
-    {
-        return nullptr;
-    }
-
-    return m_componentList[row];
-}
-
-const char* ComponentDataModel::GetCategory(const AZ::SerializeContext::ClassData* classData)
-{
-    if (classData)
-    {
-        if (auto editorDataElement = classData->m_editData->FindElementData(AZ::Edit::ClassElements::EditorData))
-        {
-            if (auto categoryAttribute = editorDataElement->FindAttribute(AZ::Edit::Attributes::Category))
-            {
-                if (auto categoryData = azdynamic_cast<AZ::Edit::AttributeData<const char*>*>(categoryAttribute))
-                {
-                    const char* result = categoryData->Get(nullptr);
-                    if (result)
-                    {
-                        return result;
-                    }
-                }
-            }
-        }
-    }
-
-    return "";
-}
-
-
-QModelIndex ComponentDataModel::index(int row, int column, const QModelIndex &parent /*= QModelIndex()*/) const
-{
-    if (row >= rowCount(parent) || column >= columnCount(parent))
-    {
-        return QModelIndex();
-    }
-
-    return createIndex(row, column, (void*)(m_componentList[row]));
-}
-
-QModelIndex ComponentDataModel::parent([[maybe_unused]] const QModelIndex &child) const
-{
-    return QModelIndex();
-}
-
-int ComponentDataModel::rowCount([[maybe_unused]] const QModelIndex &parent /*= QModelIndex()*/) const
-{
-    return m_componentList.size();
-}
-
-int ComponentDataModel::columnCount([[maybe_unused]] const QModelIndex &parent /*= QModelIndex()*/) const
-{
-    return ColumnIndex::Count;
-}
-
-QVariant ComponentDataModel::data(const QModelIndex &index, int role /*= Qt::DisplayRole*/) const
-{
-    if (index.isValid())
-    {
-        const AZ::SerializeContext::ClassData* classData = m_componentList[index.row()];
-        if (!classData)
-        {
-            return QVariant();
-        }
-
-        switch (role)
-        {
-        case ClassDataRole:
-            if (index.column() == 0) // Only get data for one column
-            {
-                return QVariant::fromValue<void*>(reinterpret_cast<void*>(const_cast<AZ::SerializeContext::ClassData*>(classData)));
-            }
-            break;
-
-        case Qt::DisplayRole:
-        {
-            if (index.column() == ColumnIndex::Name)
-            {
-                return QVariant(classData->m_editData->m_name);
-            }
-            else
-                if (index.column() == ColumnIndex::Category)
-                {
-                    if (auto editorDataElement = classData->m_editData->FindElementData(AZ::Edit::ClassElements::EditorData))
-                    {
-                        if (auto categoryAttribute = editorDataElement->FindAttribute(AZ::Edit::Attributes::Category))
-                        {
-                            if (auto categoryData = azdynamic_cast<const AZ::Edit::AttributeData<const char*>*>(categoryAttribute))
-                            {
-                                return QVariant(categoryData->Get(nullptr));
-                            }
-                        }
-                    }
-                }
-
-        }
-        break;
-
-        case Qt::ToolTipRole:
-        {
-            return QVariant(classData->m_editData->m_description);
-        }
-
-        case Qt::DecorationRole:
-        {
-            if (index.column() == ColumnIndex::Icon)
-            {
-                auto iconIterator = m_componentIcons.find(classData->m_typeId);
-                if (iconIterator != m_componentIcons.end())
-                {
-                    return iconIterator->second;
-                }
-            }
-        }
-        break;
-
-        default:
-            break;
-        }
-    }
-
-    return QVariant();
-}
-
-QMimeData* ComponentDataModel::mimeData(const QModelIndexList& indices) const
-{
-    QModelIndexList list;
-
-    // Filter out columns we are not interested in.
-    for (const QModelIndex& index : indices)
-    {
-        if (index.column() == 0)
-        {
-            list.push_back(index);
-        }
-    }
-
-    AZStd::vector<const AZ::SerializeContext::ClassData*> sortedList;
-    for (QModelIndex index : list)
-    {
-        QVariant classDataVariant = index.data(ComponentDataModel::ClassDataRole);
-        if (classDataVariant.isValid())
-        {
-            const AZ::SerializeContext::ClassData* classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
-            sortedList.push_back(classData);
-        }
-    }
-
-    QMimeData* mimeData = nullptr;
-    if (!sortedList.empty())
-    {
-        mimeData = AzToolsFramework::ComponentTypeMimeData::Create(sortedList).release();
-    }
-
-    return mimeData;
-}
-
-bool ComponentDataModel::CanAcceptDragAndDropEvent(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) const
-{
-    using namespace AzToolsFramework;
-    using namespace AzQtComponents;
-
-    // if a listener with a higher priority already claimed this event, do not touch it.
-    if ((!event) || (event->isAccepted()) || (!event->mimeData()))
-    {
-        return false;
-    }
-
-    ViewportDragContext* contextVP = azrtti_cast<ViewportDragContext*>(&context);
-    if (!contextVP)
-    {
-        // not a viewport event.  This is for some other GUI such as the main window itself.
-        return false;
-    }
-
-    AZStd::vector<const AZ::SerializeContext::ClassData*> componentClassDataList;
-    return AzToolsFramework::ComponentTypeMimeData::Get(event->mimeData(), componentClassDataList);
-}
-
-void ComponentDataModel::DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context)
-{
-    if (CanAcceptDragAndDropEvent(event, context))
-    {
-        event->setDropAction(Qt::CopyAction);
-        event->setAccepted(true);
-        // opportunities to show special highlights, or ghosted entities or previews here.
-    }
-}
-
-void ComponentDataModel::DragMove(QDragMoveEvent* event, AzQtComponents::DragAndDropContextBase& context)
-{
-    if (CanAcceptDragAndDropEvent(event, context))
-    {
-        event->setDropAction(Qt::CopyAction);
-        event->setAccepted(true);
-        // opportunities to update special highlights, or ghosted entities or previews here.
-    }
-}
-
-void ComponentDataModel::DragLeave(QDragLeaveEvent* /*event*/)
-{
-    // opportunities to remove ghosted entities or previews here.
-}
-
-void ComponentDataModel::Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context)
-{
-    using namespace AzToolsFramework;
-    using namespace AzQtComponents;
-
-    // ALWAYS CHECK - you are not the only one connected to this bus, and someone else may have already
-    // handled the event or accepted the drop - it might not contain types relevant to you.
-    // you still get informed about the drop event in case you did some stuff in your gui and need to clean it up.
-    if (!CanAcceptDragAndDropEvent(event, context))
-    {
-        return;
-    }
-
-    // note that the above call already checks all the pointers such as event, or whether context is a VP context, mimetype, etc
-    ViewportDragContext* contextVP = azrtti_cast<ViewportDragContext*>(&context);
-
-    // we don't get given this action by Qt unless we already returned accepted from one of the other ones (such as drag move of drag enter)
-    event->setDropAction(Qt::CopyAction);
-    event->setAccepted(true);
-
-    AzToolsFramework::ScopedUndoBatch undo("Create entity from components");
-    const AZStd::string name = AZStd::string::format("Entity%d", GetIEditor()->GetObjectManager()->GetObjectCount());
-
-    AZ::Entity* newEntity = aznew AZ::Entity(name.c_str());
-    if (newEntity)
-    {
-        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequests::AddRequiredComponents, *newEntity);
-        auto* transformComponent = newEntity->FindComponent<AzToolsFramework::Components::TransformComponent>();
-        if (transformComponent)
-        {
-            transformComponent->SetWorldTM(AZ::Transform::CreateTranslation(contextVP->m_hitLocation));
-        }
-
-        // Add the entity to the editor context, which activates it and creates the sandbox object.
-        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(&AzToolsFramework::EditorEntityContextRequests::AddEditorEntity, newEntity);
-
-        // Prepare undo command last so it captures the final state of the entity.
-        AzToolsFramework::EntityCreateCommand* command = aznew AzToolsFramework::EntityCreateCommand(static_cast<AZ::u64>(newEntity->GetId()));
-        command->Capture(newEntity);
-        command->SetParent(undo.GetUndoBatch());
-
-        // Only need to add components to the new entity
-        AzToolsFramework::EntityIdList entities = { newEntity->GetId() };
-
-        AZStd::vector<const AZ::SerializeContext::ClassData*> componentClassDataList;
-        AzToolsFramework::ComponentTypeMimeData::Get(event->mimeData(), componentClassDataList);
-
-        AZ::ComponentTypeList componentsToAdd;
-        for (auto classData : componentClassDataList)
-        {
-            if (!classData)
-            {
-                continue;
-            }
-
-            componentsToAdd.push_back(classData->m_typeId);
-        }
-
-        AzToolsFramework::EntityCompositionRequests::AddComponentsOutcome addedComponentsResult = AZ::Failure(AZStd::string("Failed to call AddComponentsToEntities on EntityCompositionRequestBus"));
-        AzToolsFramework::EntityCompositionRequestBus::BroadcastResult(addedComponentsResult, &AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, entities, componentsToAdd);
-
-        ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::AddDirtyEntity, newEntity->GetId());
-        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, entities);
-    }
-}
-
-AZ::EntityId ComponentDataProxyModel::NewEntityFromSelection(const QModelIndexList& selection)
-{
-    return CreateEntityFromSelection(selection, this);
-}
-
-AZ::EntityId ComponentDataModel::NewEntityFromSelection(const QModelIndexList& selection)
-{
-    return CreateEntityFromSelection(selection, this);
-}
-
-bool ComponentDataProxyModel::filterAcceptsRow(int sourceRow, [[maybe_unused]] const QModelIndex &sourceParent) const
-{
-    if (m_selectedCategory.empty() && !filterRegExp().isValid())
-        return true;
-
-    ComponentDataModel* dataModel = static_cast<ComponentDataModel*>(sourceModel());
-    if (sourceRow < 0 || sourceRow >= dataModel->GetComponents().size())
-    {
-        return false;
-    }
-
-    const AZ::SerializeContext::ClassData* classData = dataModel->GetComponents()[sourceRow];
-    if (!classData)
-    {
-        return false;
-    }
-
-    // Get Category
-    if (!m_selectedCategory.empty())
-    {
-        AZStd::string currentCateogry = ComponentDataModel::GetCategory(classData);
-
-        if (AzFramework::StringFunc::Find(currentCateogry.c_str(), m_selectedCategory.c_str()))
-        {
-            return false;
-        }
-    }
-
-    if (filterRegExp().isValid())
-    {
-        QString componentName = QString::fromUtf8(classData->m_editData->m_name);
-        return componentName.contains(filterRegExp());
-    }
-
-    return true;
-}
-
-void ComponentDataProxyModel::SetSelectedCategory(const AZStd::string& category)
-{
-    m_selectedCategory = category;
-    invalidate();
-}
-
-void ComponentDataProxyModel::ClearSelectedCategory()
-{
-    m_selectedCategory.clear();
-    invalidate();
-}
-
-#include "UI/ComponentPalette/moc_ComponentDataModel.cpp"
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.h
deleted file mode 100644
index 661094e728..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentDataModel.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QAbstractTableModel>
-#include <QSortFilterProxyModel>
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/std/containers/set.h>
-#include <AzCore/std/containers/vector.h>
-
-#include <AzQtComponents/Buses/DragAndDrop.h>
-#endif
-
-namespace ComponentDataUtilities
-{
-    // Given a list of selected components, use the provided model to get the components to add to any selected entities.
-    void AddComponentsToSelectedEntities(const QModelIndexList& selectedComponents, QAbstractItemModel* model);
-}
-
-class CViewport;
-
-//! ComponentDataModel
-//! Holds the data required to display components in a table, this includes component name, categories, icons.
-class ComponentDataModel 
-    : public QAbstractTableModel
-    , protected AzQtComponents::DragAndDropEventsBus::Handler // its okay if more than one of these is installed, the first one gets it.
-{
-    Q_OBJECT
-
-public:
-    AZ_CLASS_ALLOCATOR(ComponentDataModel, AZ::SystemAllocator, 0);
-
-    using ComponentClassList = AZStd::vector<const AZ::SerializeContext::ClassData*>;
-    using ComponentCategorySet = AZStd::set<AZStd::string>;
-    using ComponentClassMap = AZStd::unordered_map<AZStd::string, AZStd::vector<const AZ::SerializeContext::ClassData*>>;
-    using ComponentIconMap = AZStd::unordered_map<AZ::Uuid, QIcon>;
-
-    enum ColumnIndex
-    {
-        Icon,
-        Category,
-        Name,
-        Count
-    };
-
-    enum CustomRoles
-    {
-        ClassDataRole = Qt::UserRole + 1
-    };
-
-    ComponentDataModel(QObject* parent = nullptr);
-    ~ComponentDataModel() override;
-
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex &child) const override;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
-    Qt::ItemFlags flags(const QModelIndex &index) const override;
-
-    QMimeData* mimeData(const QModelIndexList& indexes) const override;
-
-    const AZ::SerializeContext::ClassData* GetClassData(const QModelIndex&) const;
-
-    AZ::EntityId NewEntityFromSelection(const QModelIndexList& selection);
-
-    static const char* GetCategory(const AZ::SerializeContext::ClassData* classData);
-
-    ComponentClassList& GetComponents() { return m_componentList; }
-    ComponentCategorySet& GetCategories() { return m_categories; }
-
-protected:
-    //////////////////////////////////////////////////////////////////////////
-    // AzQtComponents::DragAndDropEventsBus::Handler
-    //////////////////////////////////////////////////////////////////////////
-    void DragEnter(QDragEnterEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
-    void DragMove(QDragMoveEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
-    void DragLeave(QDragLeaveEvent* event) override;
-    void Drop(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) override;
-    bool CanAcceptDragAndDropEvent(QDropEvent* event, AzQtComponents::DragAndDropContextBase& context) const;
-
-    ComponentClassList m_componentList;
-    ComponentClassMap m_componentMap;
-    ComponentIconMap m_componentIcons;
-    ComponentCategorySet m_categories;
-};
-
-//! ComponentDataProxyModel
-//! FilterProxy for the ComponentDataModel is used along with the search criteria to filter the 
-//! list of components based on tags and/or selected category.
-class ComponentDataProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-public:
-    AZ_CLASS_ALLOCATOR(ComponentDataProxyModel, AZ::SystemAllocator, 0);
-
-    ComponentDataProxyModel(QObject* parent = nullptr)
-        : QSortFilterProxyModel(parent)
-    {}
-
-    // Creates a new entity and adds the selected components to it.
-    // It is specialized here to ensure it uses the correct indices according to the sorted data.
-    AZ::EntityId NewEntityFromSelection(const QModelIndexList& selection);
-
-    // Filters rows according to the specifed tags and/or selected category
-    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-
-    // Set the category to filter by.
-    void SetSelectedCategory(const AZStd::string& category);
-    void ClearSelectedCategory();
-
-protected:
-
-    AZStd::string m_selectedCategory;
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteSettings.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteSettings.h
deleted file mode 100644
index ea419498e3..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteSettings.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/RTTI/ReflectContext.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/UserSettings/UserSettings.h>
-
-//=============================================================================
-
-class ComponentPaletteSettings
-    : public AZ::UserSettings
-{
-public:
-    AZ_CLASS_ALLOCATOR(ComponentPaletteSettings, AZ::SystemAllocator, 0);
-    AZ_RTTI(ComponentPaletteSettings, "{BAC3BABA-6DF1-4EEE-AFF1-6A84AD1820A1}", AZ::UserSettings);
-
-    AZStd::vector<AZ::Uuid> m_favorites;
-
-    void SetFavorites(AZStd::vector<AZ::Uuid>&& componentIds)
-    {
-        m_favorites = AZStd::move(componentIds);
-    }
-
-    void RemoveFavorites(const AZStd::vector<AZ::Uuid>& componentIds)
-    {
-        for (const AZ::Uuid& componentId : componentIds)
-        {
-            auto favoriteIterator = AZStd::find(m_favorites.begin(), m_favorites.end(), componentId);
-            AZ_Assert(favoriteIterator != m_favorites.end(), "Component Palette Favorite not found.");
-
-            if (favoriteIterator != m_favorites.end())
-            {
-                m_favorites.erase(favoriteIterator);
-            }
-        }
-    }
-
-    static const char* GetSettingsFile()
-    {
-        static const char* settingsFile("@user@/editor/componentpalette.usersettings");
-        return settingsFile;
-    }
-
-    static void Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
-        {
-            serializeContext->Class<ComponentPaletteSettings>()
-                ->Version(1)
-                ->Field("m_favorites", &ComponentPaletteSettings::m_favorites)
-                ;
-        }
-    }
-};
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.cpp
deleted file mode 100644
index b5923aed29..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "ComponentPaletteWindow.h"
-#include "ComponentDataModel.h"
-#include "FavoriteComponentList.h"
-#include "FilteredComponentList.h"
-#include "CategoriesList.h"
-
-#include <LyViewPaneNames.h>
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-
-#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
-#include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-
-#include <QLabel>
-
-ComponentPaletteWindow::ComponentPaletteWindow(QWidget* parent)
-    : QMainWindow(parent)
-{
-    Init();
-}
-
-void ComponentPaletteWindow::Init()
-{
-    layout()->setSizeConstraint(QLayout::SetMinimumSize);
-
-    QVBoxLayout* layout = new QVBoxLayout();
-    layout->setSizeConstraint(QLayout::SetMinimumSize);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setSpacing(0);
-
-    QHBoxLayout* gridLayout = new QHBoxLayout(NULL);
-    gridLayout->setSizeConstraint(QLayout::SetMaximumSize);
-    gridLayout->setContentsMargins(0, 0, 0, 0);
-    gridLayout->setSpacing(0);
-
-    m_filterWidget = new AzToolsFramework::SearchCriteriaWidget(this);
-    
-    QStringList tags;
-    tags << tr("name");
-    m_filterWidget->SetAcceptedTags(tags, tags[0]);
-    layout->addLayout(gridLayout, 1);
-
-    // Left Panel
-    QVBoxLayout* leftPaneLayout = new QVBoxLayout(this);
-
-    // Favorites
-    leftPaneLayout->addWidget(new QLabel(tr("Favorites")));
-    leftPaneLayout->addWidget(new QLabel(tr("Drag components here to add favorites.")));
-    FavoritesList* favorites = new FavoritesList();
-    favorites->Init();
-    leftPaneLayout->addWidget(favorites);
-
-    // Categories
-    m_categoryListWidget = new ComponentCategoryList();
-    m_categoryListWidget->Init();
-    leftPaneLayout->addWidget(m_categoryListWidget);
-    gridLayout->addLayout(leftPaneLayout);
-
-    // Right Panel
-    QVBoxLayout* rightPanelLayout = new QVBoxLayout(this);
-    gridLayout->addLayout(rightPanelLayout);
-
-    // Component list
-    m_componentListWidget = new FilteredComponentList(this);
-    m_componentListWidget->Init();
-
-    rightPanelLayout->addWidget(new QLabel(tr("Components")));
-    rightPanelLayout->addWidget(m_filterWidget, 0, Qt::AlignTop);
-    rightPanelLayout->addWidget(m_componentListWidget);
-
-    // The main window
-    QWidget* window = new QWidget();
-    window->setLayout(layout);
-    setCentralWidget(window);
-
-    connect(m_categoryListWidget, &ComponentCategoryList::OnCategoryChange, m_componentListWidget, &FilteredComponentList::SetCategory);
-    connect(m_filterWidget, &AzToolsFramework::SearchCriteriaWidget::SearchCriteriaChanged, m_componentListWidget, &FilteredComponentList::SearchCriteriaChanged);
-
-}
-
-void ComponentPaletteWindow::keyPressEvent(QKeyEvent* event)
-{
-    if (event->modifiers().testFlag(Qt::ControlModifier) && event->key() == Qt::Key_F)
-    {
-        m_filterWidget->SelectTextEntryBox();
-    }
-    else
-    {
-        QMainWindow::keyPressEvent(event);
-    }
-}
-
-void ComponentPaletteWindow::RegisterViewClass()
-{
-    using namespace AzToolsFramework;
-
-    ViewPaneOptions options;
-    options.canHaveMultipleInstances = true;
-    RegisterViewPane<ComponentPaletteWindow>("Component Palette", LyViewPane::CategoryOther, options);
-}
-
-#include <UI/ComponentPalette/moc_ComponentPaletteWindow.cpp>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.h
deleted file mode 100644
index 5ddaef49c6..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteWindow.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QMainWindow>
-#endif
-
-namespace AzToolsFramework
-{
-    class SearchCriteriaWidget;
-}
-
-class ComponentCategoryList;
-class FilteredComponentList;
-class ComponentDataModel;
-
-//! ComponentPaletteWindow
-//! Provides a window with controls related to the Component Entity system. It provides an intuitive and organized 
-//! set of controls to display, sort, filter components. It provides mechanisms for creating entities by dragging
-//! and dropping components into the viewport as well as from context menus.
-class ComponentPaletteWindow
-    : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-
-    explicit ComponentPaletteWindow(QWidget* parent = 0);
-
-    void Init();
-
-    static const GUID& GetClassID()
-    {
-        // {4236998F-1138-466D-9DF5-6533BFA1DFCA}
-        static const GUID guid =
-        {
-            0x4236998F, 0x1138, 0x466D, { 0x9D, 0xF5, 0x65, 0x33, 0xBF, 0xA1, 0xDF, 0xCA }
-        };
-        return guid;
-    }
-
-    static void RegisterViewClass();
-
-protected:
-    ComponentCategoryList* m_categoryListWidget;
-    FilteredComponentList* m_componentListWidget;
-    AzToolsFramework::SearchCriteriaWidget* m_filterWidget;
-
-    void keyPressEvent(QKeyEvent* event) override;
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.cpp
deleted file mode 100644
index e63eab4184..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "FavoriteComponentList.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <Editor/CryEditDoc.h>
-#include <Editor/ViewManager.h>
-
-#include <QHeaderView>
-#include <QMimeData>
-
-// FavoritesList
-//////////////////////////////////////////////////////////////////////////
-
-FavoritesList::FavoritesList(QWidget* parent /*= nullptr*/) 
-    : FilteredComponentList(parent)
-{
-}
-
-FavoritesList::~FavoritesList()
-{
-    FavoriteComponentListRequestBus::Handler::BusDisconnect();
-}
-
-void FavoritesList::Init()
-{
-    FavoriteComponentListRequestBus::Handler::BusConnect();
-
-    FavoritesDataModel* favoritesDataModel = new FavoritesDataModel(this);
-    
-    setModel(favoritesDataModel);
-
-    horizontalHeader()->setSectionResizeMode(ComponentDataModel::ColumnIndex::Name, QHeaderView::Stretch);
-
-    setShowGrid(false);
-
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection);
-    setStyleSheet("QTableView { selection-background-color: rgba(255,255,255,0.2); }");
-    setGridStyle(Qt::PenStyle::NoPen);
-    verticalHeader()->hide();
-    horizontalHeader()->hide();
-    setSelectionBehavior(QAbstractItemView::SelectionBehavior::SelectRows);
-    setShowGrid(false);
-    setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
-    setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-
-    setColumnWidth(ComponentDataModel::ColumnIndex::Icon, 32);
-    hideColumn(ComponentDataModel::ColumnIndex::Category);
-
-    setDragDropMode(QAbstractItemView::DragDrop);
-    setAcceptDrops(true);
-
-    horizontalHeader()->setSectionResizeMode(ComponentDataModel::ColumnIndex::Icon, QHeaderView::ResizeToContents);
-    setColumnWidth(ComponentDataModel::ColumnIndex::Icon, 32);
-
-    horizontalHeader()->setSectionResizeMode(ComponentDataModel::ColumnIndex::Category, QHeaderView::Stretch);
-    setColumnWidth(ComponentDataModel::ColumnIndex::Category, 90);
-
-    // Context menu
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(this, &QWidget::customContextMenuRequested, this, &FavoritesList::ShowContextMenu);
-}
-
-void FavoritesList::ShowContextMenu(const QPoint& pos)
-{
-    // Only show if a level is loaded
-    if (!GetIEditor() || GetIEditor()->IsInGameMode())
-    {
-        return;
-    }
-
-    if ( model()->rowCount() == 0)
-    {
-        return;
-    }
-
-    QMenu contextMenu(tr("Context menu"), this);
-
-    QAction actionNewEntity(tr("Make entity with selected favorites"), this);
-    QAction actionAddToSelection(this);
-    if (GetIEditor()->GetDocument()->IsDocumentReady())
-    {
-        QObject::connect(&actionNewEntity, &QAction::triggered, this, [&] { ContextMenu_NewEntity(); });
-        contextMenu.addAction(&actionNewEntity);
-
-        AzToolsFramework::EntityIdList selectedEntities;
-        EBUS_EVENT_RESULT(selectedEntities, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
-
-        if (!selectedEntities.empty())
-        {
-            QString addToSelection = selectedEntities.size() > 1 ? tr("Add to selected entities") : tr("Add to selected entity");
-            actionAddToSelection.setText(addToSelection);
-
-            QObject::connect(&actionAddToSelection, &QAction::triggered, this, [&] { ContextMenu_AddToSelectedEntities(); });
-            contextMenu.addAction(&actionAddToSelection);
-        }
-
-        contextMenu.addSeparator();
-    }
-
-    QAction action(tr("Remove"), this);
-    QObject::connect(&action, &QAction::triggered, this, [&] { ContextMenu_RemoveSelectedFavorites(); });
-    contextMenu.addAction(&action);
-
-    contextMenu.exec(mapToGlobal(pos));
-}
-
-void FavoritesList::ContextMenu_RemoveSelectedFavorites()
-{
-    FavoritesDataModel* dataModel = qobject_cast<FavoritesDataModel*>(model());
-    if (!selectedIndexes().empty())
-    {
-        dataModel->Remove(selectedIndexes());
-    }
-}
-
-void FavoritesList::rowsInserted([[maybe_unused]] const QModelIndex& parent, [[maybe_unused]] int start, [[maybe_unused]] int end)
-{
-    resizeRowToContents(0);
-}
-
-void FavoritesList::AddFavorites(const AZStd::vector<const AZ::SerializeContext::ClassData*>& classDataContainer)
-{
-    for (const AZ::SerializeContext::ClassData* classData : classDataContainer)
-    {
-        if (classData)
-        {
-            FavoritesDataModel* dataModel = qobject_cast<FavoritesDataModel*>(model());
-            dataModel->AddFavorite(classData);
-        }
-    }
-}
-
-void FavoritesList::dragEnterEvent(QDragEnterEvent* event)
-{
-    if (event->mimeData()->hasFormat(AzToolsFramework::ComponentTypeMimeData::GetMimeType()))
-    {
-        event->acceptProposedAction();
-    }
-}
-
-void FavoritesList::dragMoveEvent(QDragMoveEvent* event)
-{
-    if (event->source() == this)
-    {
-        event->ignore();
-    }
-    else
-    {
-        event->accept();
-    }
-}
-
-// FavoritesDataModel
-//////////////////////////////////////////////////////////////////////////
-
-int FavoritesDataModel::rowCount([[maybe_unused]] const QModelIndex &parent /*= QModelIndex()*/) const
-{
-    return m_favorites.size();
-}
-
-int FavoritesDataModel::columnCount([[maybe_unused]] const QModelIndex &parent /*= QModelIndex()*/) const
-{
-    return ColumnIndex::Count;
-}
-
-void FavoritesDataModel::SaveState()
-{
-    AZStd::vector<AZ::Uuid> favorites;
-    for (const AZ::SerializeContext::ClassData* classData : m_favorites)
-    {
-        favorites.push_back(classData->m_typeId);
-    }
-    m_settings->SetFavorites(AZStd::move(favorites));
-
-
-    // Write the settings to file...
-    AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(serializeContext, "Serialize Context is null!");
-
-    char settingsPath[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(ComponentPaletteSettings::GetSettingsFile(), settingsPath, AZ_MAX_PATH_LEN);
-
-    bool result = m_provider.Save(settingsPath, serializeContext);
-    (void)result;
-    AZ_Warning("ComponentPaletteSettings", result, "Failed to Save the Component Palette Settings!");
-}
-
-void FavoritesDataModel::LoadState()
-{
-    // It is necessary to Load the settings file *before* you call UserSettings::CreateFind!
-    AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(serializeContext, "Serialize Context is null!");
-
-    char settingsPath[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(ComponentPaletteSettings::GetSettingsFile(), settingsPath, AZ_MAX_PATH_LEN);
-
-    bool result = m_provider.Load(settingsPath, serializeContext);
-    (void)result;
-
-
-    // Create (if no file was found) or find the settings, this will populate the m_settings->m_favorites list.
-    m_settings = AZ::UserSettings::CreateFind<ComponentPaletteSettings>(AZ_CRC("ComponentPaletteSettings", 0x481d355b), m_providerId);
-
-    // Add favorites to the data model from loaded settings
-    for (const AZ::Uuid& favorite : m_settings->m_favorites)
-    {
-        const AZ::SerializeContext::ClassData* classData = serializeContext->FindClassData(favorite);
-        if (classData)
-        {
-            AddFavorite(classData, false);
-        }
-    }
-}
-
-void FavoritesDataModel::Remove(const QModelIndexList& indices)
-{
-    beginResetModel();
-
-    auto newFavorites = m_favorites;
-
-    // swap here
-    for (auto index : indices)
-    {
-        // we're only dealing with columns and they're the only thing with class data anyways
-        if (index.column() == 0)
-        {
-            QVariant classDataVariant = index.data(ComponentDataModel::ClassDataRole);
-            if (classDataVariant.isValid())
-            {
-                const AZ::SerializeContext::ClassData* classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
-                newFavorites.removeAll(classData);
-
-                AZ_TracePrintf("Debug", "Removing: %s\n", classData->m_editData->m_name);
-            }
-        }
-    }
-
-    m_favorites.swap(newFavorites);
-
-    endResetModel();
-
-    SaveState();
-}
-
-QModelIndex FavoritesDataModel::index(int row, int column, const QModelIndex &parent) const
-{
-    if (!hasIndex(row, column, parent))
-    {
-        return QModelIndex();
-    }
-
-    if (row >= rowCount(parent) || column >= columnCount(parent))
-    {
-        return QModelIndex();
-    }
-
-    return createIndex(row, column, (void*)(m_favorites[row]));
-}
-
-QVariant FavoritesDataModel::data(const QModelIndex &index, int role /*= Qt::DisplayRole*/) const
-{
-    if (!index.isValid())
-    {
-        return QVariant();
-    }
-
-    const AZ::SerializeContext::ClassData* classData = m_favorites[index.row()];
-    if (!classData)
-    {
-        return QVariant();
-    }
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-    {
-        if (index.column() == ComponentDataModel::ColumnIndex::Name)
-        {
-            if (m_favorites.empty())
-            {
-                return QVariant(tr("You have 0 favorites.\nDrag some components here."));
-            }
-
-            return QVariant(classData->m_editData->m_name);
-        }
-    }
-    break;
-
-    case Qt::DecorationRole:
-    {
-        if (index.column() == ColumnIndex::Icon)
-        {
-            const AZ::SerializeContext::ClassData* iconClassData = m_favorites[index.row()];
-            auto iconIterator = m_componentIcons.find(iconClassData->m_typeId);
-            if (iconIterator != m_componentIcons.end())
-            {
-                return iconIterator->second;
-            }
-
-            return QVariant();
-        }
-    }
-    break;
-
-    case ClassDataRole:
-        if (index.column() == 0) // Only get data for one column
-        {
-            return QVariant::fromValue<void*>(reinterpret_cast<void*>(const_cast<AZ::SerializeContext::ClassData*>(classData)));
-        }
-        break;
-
-    default:
-        break;
-    }
-
-    return ComponentDataModel::data(index, role);
-    
-}
-
-void FavoritesDataModel::SetSavedStateKey([[maybe_unused]] AZ::u32 key)
-{
-}
-
-FavoritesDataModel::FavoritesDataModel(QWidget* parent /*= nullptr*/) 
-    : ComponentDataModel(parent)
-    , m_providerId(AZ_CRC("ComponentPaletteSettingsProviderId"))
-{
-    m_provider.Activate(m_providerId);
-    LoadState();
-}
-
-FavoritesDataModel::~FavoritesDataModel()
-{
-    m_provider.Deactivate();
-}
-
-void FavoritesDataModel::AddFavorite(const AZ::SerializeContext::ClassData* classData, bool updateSettings)
-{
-    beginResetModel();
-
-    if (m_favorites.indexOf(classData) < 0)
-    {
-        m_favorites.push_back(classData);
-    }
-
-    endResetModel();
-
-    if (updateSettings)
-    {
-        SaveState();
-    }
-}
-
-bool FavoritesDataModel::dropMimeData(const QMimeData *data, Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, [[maybe_unused]] const QModelIndex &parent)
-{
-    if (action == Qt::IgnoreAction)
-    {
-        return true;
-    }
-
-    if (data && data->hasFormat(AzToolsFramework::ComponentTypeMimeData::GetMimeType()))
-    {
-        AzToolsFramework::ComponentTypeMimeData::ClassDataContainer classDataContainer;
-        AzToolsFramework::ComponentTypeMimeData::Get(data, classDataContainer);
-
-        for (const AZ::SerializeContext::ClassData* classData : classDataContainer)
-        {
-            if (classData)
-            {
-                AddFavorite(classData);
-            }
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-#include <UI/ComponentPalette/moc_FavoriteComponentList.cpp>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.h
deleted file mode 100644
index 0621e24e07..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FavoriteComponentList.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "ComponentDataModel.h"
-#include "FilteredComponentList.h"
-#include "ComponentPaletteSettings.h"
-
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/UserSettings/UserSettingsProvider.h>
-#include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
-#include <AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h>
-#endif
-
-//! FavoriteComponentListRequest
-//! Bus that provides a way for external features to record favorites
-class FavoriteComponentListRequest : public AZ::EBusTraits
-{
-public:
-    virtual void AddFavorites(const AZStd::vector<const AZ::SerializeContext::ClassData*>&) = 0;
-};
-
-using FavoriteComponentListRequestBus = AZ::EBus<FavoriteComponentListRequest>;
-
-
-//! FavoritesDataModel 
-//! Stores the list of component class data to display in the favorites control, offers persistence through user settings.
-class FavoritesDataModel 
-    : public ComponentDataModel
-{
-    Q_OBJECT
-
-public:
-
-    AZ_CLASS_ALLOCATOR(FavoritesDataModel, AZ::SystemAllocator, 0);
-
-    FavoritesDataModel(QWidget* parent = nullptr);
-    ~FavoritesDataModel() override;
-
-    //! Add a favorite component
-    //! \param classData The ClassData information for the component to store as favorite
-    //! \param updateSettings Optional parameter used to determine if the persistent settings need to be updated.
-    void AddFavorite(const AZ::SerializeContext::ClassData* classData, bool updateSettings = true);
-
-    //! Remove all the specified items from the table
-    //! \param indices List of indices to remove from favorites
-    void Remove(const QModelIndexList& indices);
-
-    //! Save the list of favorite components to user settings
-    void SaveState();
-    
-    //! Load the list of favorite components from user settings
-    void LoadState();
-
-protected:
-
-    void SetSavedStateKey(AZ::u32 key);
-
-    // Qt handlers
-    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
-
-    // List of component class data
-    QList<const AZ::SerializeContext::ClassData*> m_favorites;
-
-    // The Palette settings and provider information for saving out the Favorites list
-    AZStd::intrusive_ptr<ComponentPaletteSettings> m_settings;
-    AZ::UserSettingsProvider m_provider;
-    AZ::u32 m_providerId;
-};
-
-
-//! FavoritesList
-//! User customized list of favorite components, provides persistence.
-class FavoritesList 
-    : public FilteredComponentList
-    , FavoriteComponentListRequestBus::Handler
-{
-    Q_OBJECT
-
-public:
-
-    explicit FavoritesList(QWidget* parent = nullptr);
-    ~FavoritesList() override;
-
-    void Init() override;
-
-protected:
-
-    //////////////////////////////////////////////////////////////////////////
-    // FavoriteComponentListRequestBus
-    void AddFavorites(const AZStd::vector<const AZ::SerializeContext::ClassData*>& classDataContainer) override;
-    //////////////////////////////////////////////////////////////////////////
-
-    void rowsInserted(const QModelIndex& parent, int start, int end);
-
-    // Context menu handlers
-    void ShowContextMenu(const QPoint&);
-    void ContextMenu_RemoveSelectedFavorites();
-
-    // Validate data being dragged in
-    void dragEnterEvent(QDragEnterEvent * event) override;
-    void dragMoveEvent(QDragMoveEvent* event) override;
-
-    //! Handler used when dropping PaletteItems into the Viewport.
-    static void DragDropHandler(CViewport* viewport, int ptx, int pty, void* custom);
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.cpp
deleted file mode 100644
index 82fee98ccb..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "ComponentDataModel.h"
-#include "FavoriteComponentList.h"
-#include "FilteredComponentList.h"
-
-#include "CryCommon/MathConversion.h"
-#include "Editor/IEditor.h"
-#include "Editor/ViewManager.h"
-#include <Editor/CryEditDoc.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-#include <QHeaderView>
-
-void FilteredComponentList::Init()
-{
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    setDragDropMode(QAbstractItemView::DragDropMode::DragOnly);
-    setDragEnabled(true);
-
-    setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection);
-    setStyleSheet("QTreeWidget { selection-background-color: rgba(255,255,255,0.2); }");
-    setGridStyle(Qt::PenStyle::NoPen);
-    verticalHeader()->hide();
-    horizontalHeader()->hide();
-    setSelectionBehavior(QAbstractItemView::SelectionBehavior::SelectRows);
-    setAcceptDrops(false);
-
-    m_componentDataModel = new ComponentDataModel(this);
-    ComponentDataProxyModel* componentDataProxyModel = new ComponentDataProxyModel(this);
-    componentDataProxyModel->setSourceModel(m_componentDataModel);
-    setModel(componentDataProxyModel);
-
-    QHeaderView* horizontalHeaderView = horizontalHeader();
-    horizontalHeaderView->setSectionResizeMode(ComponentDataModel::ColumnIndex::Icon, QHeaderView::ResizeToContents);
-    horizontalHeaderView->setSectionResizeMode(ComponentDataModel::ColumnIndex::Name, QHeaderView::Stretch);
-
-    setColumnWidth(ComponentDataModel::ColumnIndex::Icon, 32);
-    setShowGrid(false);
-
-    setColumnWidth(ComponentDataModel::ColumnIndex::Name, 90);
-    setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
-
-    sortByColumn(ComponentDataModel::ColumnIndex::Name, Qt::AscendingOrder);
-    hideColumn(ComponentDataModel::ColumnIndex::Category);
-
-    connect(model(), &QAbstractItemModel::rowsInserted, this, &FilteredComponentList::rowsInserted);
-    connect(model(), &QAbstractItemModel::rowsRemoved, this, &FilteredComponentList::rowsAboutToBeRemoved);
-
-    connect(model(), SIGNAL(modelReset()), SLOT(modelReset()));
-
-
-    // Context menu
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(this, &QWidget::customContextMenuRequested, this, &FilteredComponentList::ShowContextMenu);
-}
-
-void FilteredComponentList::ContextMenu_NewEntity()
-{
-    AZ::EntityId entityId;
-
-    auto proxyDataModel = qobject_cast<ComponentDataProxyModel*>(model());
-    if (proxyDataModel)
-    {
-        entityId = proxyDataModel->NewEntityFromSelection(selectedIndexes());
-    }
-    else
-    {
-        auto dataModel = qobject_cast<ComponentDataModel*>(model());
-        if (dataModel)
-        {
-            entityId = dataModel->NewEntityFromSelection(selectedIndexes());
-        }
-    }
-}
-
-
-void FilteredComponentList::ContextMenu_AddToFavorites()
-{
-    AZStd::vector<const AZ::SerializeContext::ClassData*> componentsToAdd;
-    for (auto index : selectedIndexes())
-    {
-        QVariant classDataVariant = index.data(ComponentDataModel::ClassDataRole);
-        if (classDataVariant.isValid())
-        {
-            auto classData = reinterpret_cast<const AZ::SerializeContext::ClassData*>(classDataVariant.value<void*>());
-            componentsToAdd.push_back(classData);
-        }
-    }
-
-    if (!componentsToAdd.empty())
-    {
-        EBUS_EVENT(FavoriteComponentListRequestBus, AddFavorites, componentsToAdd);
-    }
-}
-
-void FilteredComponentList::ContextMenu_AddToSelectedEntities()
-{
-    ComponentDataUtilities::AddComponentsToSelectedEntities(selectedIndexes(), model());
-}
-
-void FilteredComponentList::ShowContextMenu(const QPoint& pos)
-{
-    QMenu contextMenu(tr("Context menu"), this);
-
-    QAction actionNewEntity(tr("Create new entity with selected components"), this);
-    if (GetIEditor()->GetDocument()->IsDocumentReady())
-    {
-        QObject::connect(&actionNewEntity, &QAction::triggered, this, [this] { ContextMenu_NewEntity();  });
-        contextMenu.addAction(&actionNewEntity);
-    }
-
-    QAction actionAddFavorite(tr("Add to favorites"), this);
-    QObject::connect(&actionAddFavorite, &QAction::triggered, this, [this] { ContextMenu_AddToFavorites(); });
-    contextMenu.addAction(&actionAddFavorite);
-
-    QAction actionAddToSelection(this);
-    if (GetIEditor()->GetDocument()->IsDocumentReady())
-    {
-        AzToolsFramework::EntityIdList selectedEntities;
-        EBUS_EVENT_RESULT(selectedEntities, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
-
-        if (!selectedEntities.empty())
-        {
-            QString addToSelection = selectedEntities.size() > 1 ? tr("Add to selected entities") : tr("Add to selected entity");
-
-            actionAddToSelection.setText(addToSelection);
-            QObject::connect(&actionAddToSelection, &QAction::triggered, this, [this] { ContextMenu_AddToSelectedEntities(); });
-            contextMenu.addAction(&actionAddToSelection);
-        }
-    }
-    // TODO: Requires information panel implementation LMBR-28174
-    //QAction actionHelp(tr("Help"), this);
-    //QObject::connect(&actionHelp, &QAction::triggered, this, [&] {});
-    //contextMenu.addAction(&actionHelp);
-
-    contextMenu.exec(mapToGlobal(pos));
-}
-
-void FilteredComponentList::modelReset()
-{
-    // Ensure that the category column is hidden
-    hideColumn(ComponentDataModel::ColumnIndex::Category);
-}
-
-FilteredComponentList::FilteredComponentList(QWidget* parent /*= nullptr*/)
-    : QTableView(parent)
-{
-}
-
-FilteredComponentList::~FilteredComponentList()
-{
-}
-
-void FilteredComponentList::SearchCriteriaChanged(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator)
-{
-    setUpdatesEnabled(false);
-
-    auto dataModel = qobject_cast<ComponentDataProxyModel*>(model());
-    if (dataModel)
-    {
-        // Go through the list of items and show/hide as needed due to filter.
-        QString filter;
-        for (const auto& criteria : criteriaList)
-        {
-            QString tag, text;
-            AzToolsFramework::SearchCriteriaButton::SplitTagAndText(criteria, tag, text);
-            AppendFilter(filter, text, filterOperator);
-        }
-
-        dataModel->setFilterRegExp(QRegExp(filter, Qt::CaseSensitivity::CaseInsensitive));
-    }
-
-    setUpdatesEnabled(true);
-}
-
-void FilteredComponentList::SetCategory(const char* category)
-{
-    auto dataModel = qobject_cast<ComponentDataProxyModel*>(model());
-    if (dataModel)
-    {
-        if (!category || category[0] == 0 || azstricmp(category, "All") == 0)
-        {
-            dataModel->ClearSelectedCategory();
-        }
-        else
-        {
-            dataModel->SetSelectedCategory(category);
-        }
-    }
-
-    // Note: this ensures the category column remains hidden
-    hideColumn(ComponentDataModel::ColumnIndex::Category);
-}
-
-void FilteredComponentList::BuildFilter(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator)
-{
-    ClearFilterRegExp();
-
-    for (const auto& criteria : criteriaList)
-    {
-        QString tag, text;
-        AzToolsFramework::SearchCriteriaButton::SplitTagAndText(criteria, tag, text);
-        if (tag.isEmpty())
-        {
-            tag = "null";
-        }
-
-        QString filter = m_filtersRegExp[tag.toStdString().c_str()].pattern();
-
-        AppendFilter(filter, text, filterOperator);
-
-        SetFilterRegExp(tag.toStdString().c_str(), QRegExp(filter, Qt::CaseInsensitive));
-    }
-}
-
-void FilteredComponentList::AppendFilter(QString& filter, const QString& text, AzToolsFramework::FilterOperatorType filterOperator)
-{
-    if (filterOperator == AzToolsFramework::FilterOperatorType::Or)
-    {
-        if (filter.isEmpty())
-        {
-            filter = text;
-        }
-        else
-        {
-            filter += "|" + text;
-        }
-    }
-    else if (filterOperator == AzToolsFramework::FilterOperatorType::And)
-    {
-        //using lookaheads to produce an "and" effect.
-        filter += "(?=.*" + text + ")";
-    }
-}
-
-void FilteredComponentList::SetFilterRegExp(const AZStd::string& filterType, const QRegExp& regExp)
-{
-    m_filtersRegExp[filterType] = regExp;
-}
-
-void FilteredComponentList::ClearFilterRegExp(const AZStd::string& filterType /*= AZStd::string()*/)
-{
-    if (filterType.empty())
-    {
-        for (auto& it : m_filtersRegExp)
-        {
-            it.second = QRegExp();
-        }
-    }
-    else
-    {
-        m_filtersRegExp[filterType] = QRegExp();
-    }
-}
-
-#include <UI/ComponentPalette/moc_FilteredComponentList.cpp>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.h
deleted file mode 100644
index 4603018d8b..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/FilteredComponentList.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QTableView>
-#include <QWidget>
-
-#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
-#include <AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx>
-#include <AzCore/Serialization/SerializeContext.h>
-#include "ComponentDataModel.h"
-#endif
-
-namespace AZ
-{
-    class SerializeContext;
-    class ClassData;
-}
-
-class ComponentDataModel;
-
-//! FilteredComponentList
-//! Provides a list of components that can be filtered according to search criteria provided and/or from
-//! a category selection control.
-class FilteredComponentList 
-    : public QTableView
-{
-    Q_OBJECT
-
-public:
-
-    explicit FilteredComponentList(QWidget* parent = nullptr);
-
-    ~FilteredComponentList() override;
-
-    virtual void Init();
-
-    void SearchCriteriaChanged(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator);
-
-    void SetCategory(const char* category);
-
-protected:
-
-    // Filtering support
-    void BuildFilter(QStringList& criteriaList, AzToolsFramework::FilterOperatorType filterOperator);
-    void AppendFilter(QString& filter, const QString& text, AzToolsFramework::FilterOperatorType filterOperator);
-    void SetFilterRegExp(const AZStd::string& filterType, const QRegExp& regExp);
-    void ClearFilterRegExp(const AZStd::string& filterType = AZStd::string());
-
-    // Context menu handlers 
-    void ShowContextMenu(const QPoint&);
-    void ContextMenu_NewEntity();
-    void ContextMenu_AddToFavorites();
-    void ContextMenu_AddToSelectedEntities();
-
-    void modelReset();
-
-    AzToolsFramework::FilterByCategoryMap m_filtersRegExp;
-    ComponentDataModel* m_componentDataModel;
-
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.cpp
deleted file mode 100644
index 0c85566ed9..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "InformationPanel.h"
-
-// TODO: LMBR-28174
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.h
deleted file mode 100644
index 4dbf0e0867..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/InformationPanel.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-// TODO: LMBR-28174
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg
deleted file mode 100644
index 36cceef9e3..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
-    <title>Outliner / vis &amp; lock / lock / Default - hover</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Outliner-/-vis-&amp;-lock-/-lock-/-Default---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M7.62646385,1.48235749 C9.42626113,1.48235749 10.8852851,2.94138146 10.8852851,4.74117875 L10.8843498,7.34735749 L12.8405779,7.34823575 L12.8405779,14.5176425 L2.41234985,14.5176425 L2.41234985,7.34823575 L9.58134985,7.34735749 L9.5817566,4.74117875 C9.5817566,3.66130038 8.70634222,2.78588599 7.62646385,2.78588599 C7.21874475,2.78588599 6.62971236,2.90054702 6.14480925,3.34844343 C6.01584142,3.46756874 5.88452781,3.71832946 5.75086844,4.10072562 L4.38428828,4.10072562 C4.43323512,3.87757947 4.47506118,3.7202004 4.50976646,3.62858842 C4.59003595,3.41669999 4.80061604,3.0404071 4.86756375,2.94801197 C5.78155489,1.68660458 6.73091609,1.48235749 7.62646385,1.48235749 Z M11.5370494,8.65176425 L3.71587835,8.65176425 L3.71587835,13.214114 L11.5370494,13.214114 L11.5370494,8.65176425 Z M8.2782281,9.95529275 L8.2782281,11.9105855 L6.9746996,11.9105855 L6.9746996,9.95529275 L8.2782281,9.95529275 Z" id="Combined-Shape-Copy-4" fill="#17A3CD"></path>
-    </g>
-</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg
deleted file mode 100644
index 410f751568..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
-    <title>Outliner / vis &amp; lock /lock / on - hover</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Outliner-/-vis-&amp;-lock-/lock-/-on---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M8,1.53182564 C9.78613703,1.53182564 11.2340872,2.97977579 11.2340872,4.76591282 L11.2340872,7.35318256 L13.1745395,7.35318256 L13.1745395,14.4681744 L2.82546052,14.4681744 L2.82546052,7.35318256 L4.76591282,7.35318256 L4.76591282,4.76591282 C4.76591282,2.97977579 6.21386297,1.53182564 8,1.53182564 Z M8.64681744,9.94045231 L7.35318256,9.94045231 L7.35318256,11.8809046 L8.64681744,11.8809046 L8.64681744,9.94045231 Z M8,2.82546052 C6.92831778,2.82546052 6.05954769,3.69423061 6.05954769,4.76591282 L6.05954769,4.76591282 L6.05954769,7.35318256 L9.94045231,7.35318256 L9.94045231,4.76591282 C9.94045231,3.69423061 9.07168222,2.82546052 8,2.82546052 Z" id="Combined-Shape" fill="#17A3CD"></path>
-    </g>
-</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg
deleted file mode 100644
index ae7f899c78..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
-    <title>Outliner / vis &amp; lock /visible / Default - hover</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Outliner-/-vis-&amp;-lock-/visible-/-Default---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group-9" transform="translate(0.500000, 3.500000)" fill="#17A3CD">
-            <path d="M7.31366902,0.423140577 C8.81176272,0.423140577 11.0671071,1.77422153 14.0797023,4.47638343 C11.0671071,7.17854533 8.81176272,8.52962629 7.31366902,8.52962629 C5.81557532,8.52962629 3.56731657,7.17854533 0.568892758,4.47638343 C3.56731657,1.77422153 5.81557532,0.423140577 7.31366902,0.423140577 Z M7.32429752,1.43645129 C5.64538935,1.43645129 4.28436537,2.79747527 4.28436537,4.47638343 C4.28436537,6.15529159 5.64538935,7.51631557 7.32429752,7.51631557 C9.00320568,7.51631557 10.3642297,6.15529159 10.3642297,4.47638343 C10.3642297,2.79747527 9.00320568,1.43645129 7.32429752,1.43645129 Z M7.32429752,2.449762 C8.44356962,2.449762 9.35091894,3.35711132 9.35091894,4.47638343 C9.35091894,5.59565554 8.44356962,6.50300486 7.32429752,6.50300486 C6.20502541,6.50300486 5.29767609,5.59565554 5.29767609,4.47638343 C5.29767609,3.35711132 6.20502541,2.449762 7.32429752,2.449762 Z" id="Combined-Shape-Copy-2"></path>
-        </g>
-    </g>
-</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg
deleted file mode 100644
index a02fd53198..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
-    <title>Outliner / vis &amp; lock / visible / on - hover</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Outliner-/-vis-&amp;-lock-/-visible-/-on---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Sky-Icon-/-System-/-View" fill="#17A3CD">
-            <path d="M12.0662207,5.86712992 C12.858042,6.44428281 13.7248573,7.1552395 14.6666667,8 C11.6936446,10.6666667 9.46792606,12 7.98951112,12 C7.51688042,12 6.96858989,11.8637332 6.34463953,11.5911997 L7.07876759,10.8559032 C7.36903278,10.9494633 7.67861466,11 8,11 C9.65685425,11 11,9.65685425 11,8 C11,7.67861466 10.9494633,7.36903278 10.8559032,7.07876759 Z M7.98951112,4 C8.76679076,4 9.75063645,4.36855358 10.9410482,5.10566074 L10.1454186,5.90305312 C9.60073119,5.34585444 8.84075491,5 8,5 C6.34314575,5 5,6.34314575 5,8 C5,8.84036125 5.34553064,9.60001949 5.90227058,10.1446534 L5.11233104,10.9366587 C4.02637979,10.2706404 2.76671388,9.29175412 1.33333333,8 C4.29237025,5.33333333 6.51109618,4 7.98951112,4 Z M10.0073333,7.926 L10.0102404,8 C10.0102404,9.1045695 9.1125175,10 8.00512019,10 C7.98181012,10 7.95859295,9.99960325 7.9354751,9.99881616 L10.0073333,7.926 Z M8.00512019,6 C8.5686887,6 9.07795318,6.23190942 9.44222587,6.60527205 L6.6105304,9.43702678 C6.23403952,9.07344399 6,8.56398363 6,8 C6,6.8954305 6.89772289,6 8.00512019,6 Z" id="Combined-Shape"></path>
-            <polygon id="Rectangle-25" transform="translate(7.522750, 7.541445) rotate(45.000000) translate(-7.522750, -7.541445) " points="6.80375237 0.92856205 8.2417471 0.925883489 8.2197393 14.1570058 6.80375237 14.1278886"></polygon>
-        </g>
-    </g>
-</svg>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss
deleted file mode 100644
index 93c8faa6f1..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-OutlinerWidget #m_display_options
-{
-    qproperty-icon: url(:/stylesheet/img/UI20/menu-centered.svg);
-    qproperty-iconSize: 16px 16px;
-    qproperty-flat: true;
-}
-
-OutlinerWidget QWidget[PulseHighlight="true"]
-{
-    background-color: #D9822E;
-}
-
-OutlinerWidget QTreeView
-{
-    selection-background-color: transparent;
-}
-
-OutlinerWidget QTreeView::branch:hover
-, OutlinerWidget QTreeView::item:hover
-{
-    background: rgba(255, 255, 255, 30);
-}
-
-OutlinerWidget QTreeView::branch:selected
-, OutlinerWidget QTreeView::item:selected
-, OutlinerWidget QTreeView::branch:selected:active
-, OutlinerWidget QTreeView::item:selected:active
-{
-    background: rgba(255, 255, 255, 45);
-}
-
-
-/* --- VISIBILITY AND LOCK --- */
-
-OutlinerCheckBox
-{
-    border: 0px solid transparent;
-    border-radius: 0px;
-    spacing: 0px;
-    padding: 0px;
-    line-height: 0px;
-    font-size: 0px;
-    margin: 0px;
-    background-color: none;
-    max-height: 20px;
-    max-width: 18px;
-}
-
-OutlinerCheckBox::indicator
-{
-    width: 16px;
-    height: 16px;
-    image-position:center;
-
-    border: 1px solid transparent;
-    image: none;
-    spacing: 0px;
-    padding: 0px;
-    line-height: 0px;
-    font-size: 0px;
-    margin: 0;
-}
-
-OutlinerCheckBox#VisibilityMixed::indicator:checked
-, OutlinerCheckBox#VisibilityMixed::indicator:unchecked
-, OutlinerCheckBox#VisibilityMixed::indicator:indeterminate
-, OutlinerCheckBox#VisibilityMixedHover::indicator:checked
-, OutlinerCheckBox#VisibilityMixedHover::indicator:unchecked
-, OutlinerCheckBox#VisibilityMixedHover::indicator:indeterminate
-, OutlinerCheckBox#LockMixed::indicator:checked
-, OutlinerCheckBox#LockMixed::indicator:unchecked
-, OutlinerCheckBox#LockMixed::indicator:indeterminate
-, OutlinerCheckBox#LockMixedHover::indicator:checked
-, OutlinerCheckBox#LockMixedHover::indicator:unchecked
-, OutlinerCheckBox#LockMixedHover::indicator:indeterminate
-{
-    background: rgba(0, 0, 0, 80);
-    border-radius: 5px;
-    padding-bottom: 1px;
-}
-
-
-/* --- VISIBILITY --- */
-
-OutlinerCheckBox#Visibility::indicator:checked
-, OutlinerCheckBox#VisibilityMixed::indicator:checked
-{
-    image: url(:/visibility_default.svg);
-}
-
-OutlinerCheckBox#Visibility::indicator:unchecked
-, OutlinerCheckBox#VisibilityMixed::indicator:unchecked
-{
-    image: url(:/visibility_on.svg);
-}
-
-OutlinerCheckBox#VisibilityLayerOverride::indicator:checked
-{
-    image: url(:/visibility_default_transparent.svg);
-}
-
-OutlinerCheckBox#VisibilityLayerOverride::indicator:unchecked
-{
-    image: url(:/visibility_on_transparent.svg);
-}
-
-OutlinerCheckBox#VisibilityHover::indicator:checked
-, OutlinerCheckBox#VisibilityMixedHover::indicator:checked
-, OutlinerCheckBox#VisibilityLayerOverrideHover::indicator:checked
-{
-    image: url(:/visibility_default_hover.svg);
-}
-
-OutlinerCheckBox#VisibilityHover::indicator:unchecked
-, OutlinerCheckBox#VisibilityMixedHover::indicator:unchecked
-, OutlinerCheckBox#VisibilityLayerOverrideHover::indicator:unchecked
-{
-    image: url(:/visibility_on_hover.svg);
-}
-
-
-/* --- LOCK --- */
-
-OutlinerCheckBox#Lock::indicator:checked
-, OutlinerCheckBox#LockMixed::indicator:checked
-{
-    image: url(:/lock_on.svg);
-}
-
-OutlinerCheckBox#Lock::indicator:unchecked
-, OutlinerCheckBox#LockMixed::indicator:unchecked
-{
-    image: url(:/lock_default.svg);
-}
-
-OutlinerCheckBox#LockLayerOverride::indicator:checked
-{
-    image: url(:/lock_on_transparent.svg);
-}
-
-OutlinerCheckBox#LockLayerOverride::indicator:unchecked
-{
-    image: url(:/lock_default_transparent.svg);
-}
-
-OutlinerCheckBox#LockHover::indicator:checked
-, OutlinerCheckBox#LockMixedHover::indicator:checked
-, OutlinerCheckBox#LockLayerOverrideHover::indicator:checked
-{
-    image: url(:/lock_on_hover.svg);
-}
-
-OutlinerCheckBox#LockHover::indicator:unchecked
-, OutlinerCheckBox#LockMixedHover::indicator:unchecked
-, OutlinerCheckBox#LockLayerOverrideHover::indicator:unchecked
-{
-    image: url(:/lock_default_hover.svg);
-}
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerCacheBus.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerCacheBus.h
deleted file mode 100644
index b9f5c3d9af..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerCacheBus.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <QModelIndex>
-
-#include <AzCore/Slice/SliceComponent.h>
-#include <AzCore/EBus/EBus.h>
-
-class OutlinerCacheRequests
-    : public AZ::EBusTraits
-{
-public:
-    /// Request selection of the item at the given cache index
-    virtual void SelectOutlinerCache( QModelIndex index ) = 0;
-
-    /// Request deselection of the item at the given cache index
-    virtual void DeselectOutlinerCache(QModelIndex index) = 0;
-};
-
-/// \ref EditorVisibilityRequests
-using OutlinerCacheRequestBus = AZ::EBus<OutlinerCacheRequests>;
-
-/**
-* Messages dispatched when an entity has sustained changes that require
-* it be redrawn in the outliner.
-*/
-class OutlinerCacheNotifications
-    : public AZ::EBusTraits
-{
-public:
-    /// The entity has changed in such a way that its outliner representation has changed and should be redrawn
-    /// invalidate now is true if the item needs to be redrawn immediately.
-    virtual void EntityCacheChanged(const AZ::EntityId& /*entityId*/) {}
-
-    /// The outliner cache item associated with the given entity has been selected
-    /// and is requesting that a notification be sent to the tree view.
-    /// These requests should be handled, considered, and either acted on or queued
-    virtual void EntityCacheSelectionRequest(const AZ::EntityId&  /*entityId*/) {}
-
-    /// The outliner cache item associated with the given entity has been deselected
-    /// and is requesting that the a notification be sent to the tree view.
-    /// These requests should be handled, considered, and either acted on or queued
-    virtual void EntityCacheDeselectionRequest(const AZ::EntityId&  /*entityId*/) {}
-};
-
-/// \ref EditorVisibilityNotifications
-using OutlinerCacheNotificationBus = AZ::EBus<OutlinerCacheNotifications>;
-
-class OutlinerModelNotifications
-    : public AZ::EBusTraits
-{
-public:
-
-    /// The outliner cache item associated with the given entity has been selected
-    /// and is requesting that a notification be sent to the tree view.
-    /// These requests should be handled, considered, and either acted on or queued
-    virtual void ModelEntitySelectionChanged(const AZStd::unordered_set<AZ::EntityId>& /*selectedEntityIdList*/, const AZStd::unordered_set<AZ::EntityId>& /*deselectedEntityIdList*/) {}
-    virtual void QueueScrollToNewContent(const AZ::EntityId& /*entityId*/) {}
-};
-
-/// \ref EditorVisibilityNotifications
-using OutlinerModelNotificationBus = AZ::EBus<OutlinerModelNotifications>;
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp
deleted file mode 100644
index 2c868e98d9..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "OutlinerDisplayOptionsMenu.h"
-
-#include <QIcon>
-
-
-namespace EntityOutliner
-{
-    DisplayOptionsMenu::DisplayOptionsMenu(QWidget* parent)
-        : QMenu(parent)
-    {
-        auto sortManually = addAction(QIcon(QStringLiteral(":/sort_manually.svg")), tr("Sort: Manually"));
-        sortManually->setData(static_cast<int>(DisplaySortMode::Manually));
-        sortManually->setCheckable(true);
-
-        auto sortAtoZ = addAction(QIcon(QStringLiteral(":/sort_a_to_z.svg")), tr("Sort: A to Z"));
-        sortAtoZ->setData(static_cast<int>(DisplaySortMode::AtoZ));
-        sortAtoZ->setCheckable(true);
-
-        auto sortZtoA = addAction(QIcon(QStringLiteral(":/sort_z_to_a.svg")), tr("Sort: Z to A"));
-        sortZtoA->setData(static_cast<int>(DisplaySortMode::ZtoA));
-        sortZtoA->setCheckable(true);
-
-        addSeparator();
-
-        auto autoScroll = addAction(tr("Scroll to Selected"));
-        autoScroll->setCheckable(true);
-
-        auto autoExpand = addAction(tr("Expand Selected"));
-        autoExpand->setCheckable(true);
-
-        auto sortGroup = new QActionGroup(this);
-        sortGroup->addAction(sortManually);
-        sortGroup->addAction(sortAtoZ);
-        sortGroup->addAction(sortZtoA);
-
-        sortManually->setChecked(true);
-        autoScroll->setChecked(true);
-        autoExpand->setChecked(true);
-
-        connect(sortGroup, &QActionGroup::triggered, this, &DisplayOptionsMenu::OnSortModeSelected);
-        connect(autoScroll, &QAction::toggled, this, &DisplayOptionsMenu::OnAutoScrollToggle);
-        connect(autoExpand, &QAction::toggled, this, &DisplayOptionsMenu::OnAutoExpandToggle);
-    }
-
-    void DisplayOptionsMenu::OnSortModeSelected(QAction* action)
-    {
-        const auto sortMode = static_cast<DisplaySortMode>(action->data().toInt());
-        emit OnSortModeChanged(sortMode);
-    }
-
-    void DisplayOptionsMenu::OnAutoScrollToggle(bool checked)
-    {
-        emit OnOptionToggled(DisplayOption::AutoScroll, checked);
-    }
-
-    void DisplayOptionsMenu::OnAutoExpandToggle(bool checked)
-    {
-        emit OnOptionToggled(DisplayOption::AutoExpand, checked);
-    }
-}
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.h
deleted file mode 100644
index 95ec8ae7b4..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QMenu>
-
-#endif
-
-class QAction;
-
-namespace Ui
-{
-    class OutlinerDisplayOptions;
-}
-
-namespace EntityOutliner
-{
-    enum class DisplaySortMode : unsigned char
-    {
-        Manually,
-        AtoZ,
-        ZtoA
-    };
-
-    enum class DisplayOption : unsigned char
-    {
-        AutoScroll,
-        AutoExpand
-    };
-
-    class DisplayOptionsMenu 
-        : public QMenu
-    {
-        Q_OBJECT // AUTOMOC
-
-    public:
-        DisplayOptionsMenu(QWidget* parent = nullptr);
-        ~DisplayOptionsMenu() = default;
-
-    signals:
-        void OnSortModeChanged(DisplaySortMode sortMode);
-        void OnOptionToggled(DisplayOption option, bool enabled);
-
-    private:
-        void OnSortModeSelected(QAction* action);
-
-        void OnAutoScrollToggle(bool checked);
-        void OnAutoExpandToggle(bool checked);
-    };
-}
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
deleted file mode 100644
index f72ab6d572..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
+++ /dev/null
@@ -1,2689 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "OutlinerListModel.hxx"
-
-#include <QtCore/QMimeData>
-#include <QFontMetrics>
-#include <QtGui/QPainter>
-#include <QtWidgets/QStyleOption>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QStyle>
-#include <QtWidgets/QMessageBox>
-#include <QGuiApplication>
-#include <QStyleOptionButton>
-#include <QTimer>
-#include <QBitmap>
-#include <QTextDocument>
-#include <QPainterPath>
-
-#include <AzCore/Asset/AssetManager.h>
-#include <AzCore/Asset/AssetManagerBus.h>
-#include <AzCore/Asset/AssetTypeInfoBus.h>
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/Debug/Profiler.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzCore/Slice/SliceAsset.h>
-
-#include <AzFramework/StringFunc/StringFunc.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/EntityCompositionRequestBus.h>
-#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
-#include <AzToolsFramework/Slice/SliceUtilities.h>
-#include <AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h>
-#include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
-#include <AzToolsFramework/ToolsComponents/EditorEntityIdContainer.h>
-#include <AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorLockComponentBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorOnlyEntityComponentBus.h>
-#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
-#include <AzToolsFramework/ToolsComponents/SelectionComponent.h>
-#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-
-#include "OutlinerDisplayOptionsMenu.h"
-#include "OutlinerSortFilterProxyModel.hxx"
-#include "OutlinerTreeView.hxx"
-#include "Include/ICommandManager.h"
-#include "Include/IObjectManager.h"
-#include "OutlinerCacheBus.h"
-
-#include <Editor/CryEditDoc.h>
-#include <AzCore/Outcome/Outcome.h>
-
-////////////////////////////////////////////////////////////////////////////
-// OutlinerListModel
-////////////////////////////////////////////////////////////////////////////
-
-bool OutlinerListModel::s_paintingName = false;
-
-OutlinerListModel::OutlinerListModel(QObject* parent)
-    : QAbstractItemModel(parent)
-    , m_entitySelectQueue()
-    , m_entityExpandQueue()
-    , m_entityChangeQueue()
-    , m_entityChangeQueued(false)
-    , m_entityLayoutQueued(false)
-    , m_entityExpansionState()
-    , m_entityFilteredState()
-{
-}
-
-OutlinerListModel::~OutlinerListModel()
-{
-    AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
-    AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusDisconnect();
-    AzToolsFramework::EntityCompositionNotificationBus::Handler::BusDisconnect();
-    AZ::EntitySystemBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorEntityRuntimeActivationChangeNotificationBus::Handler::BusDisconnect();
-}
-
-void OutlinerListModel::Initialize()
-{
-    AzToolsFramework::EditorEntityRuntimeActivationChangeNotificationBus::Handler::BusConnect();
-    AzToolsFramework::ToolsApplicationEvents::Bus::Handler::BusConnect();
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
-    AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
-    AzToolsFramework::EntityCompositionNotificationBus::Handler::BusConnect();
-    AZ::EntitySystemBus::Handler::BusConnect();
-}
-
-int OutlinerListModel::rowCount(const QModelIndex& parent) const
-{
-    auto parentId = GetEntityFromIndex(parent);
-
-    AZStd::size_t childCount = 0;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(childCount, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildCount);
-    return (int)childCount;
-}
-
-int OutlinerListModel::columnCount(const QModelIndex& /*parent*/) const
-{
-    return ColumnCount;
-}
-
-QModelIndex OutlinerListModel::index(int row, int column, const QModelIndex& parent) const
-{
-    // sanity check
-    if (!hasIndex(row, column, parent) || (parent.isValid() && parent.column() != 0) || (row < 0 || row >= rowCount(parent)))
-    {
-        return QModelIndex();
-    }
-
-    auto parentId = GetEntityFromIndex(parent);
-
-    AZ::EntityId childId;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(childId, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChild, row);
-    return GetIndexFromEntity(childId, column);
-}
-
-QVariant OutlinerListModel::data(const QModelIndex& index, int role) const
-{
-    auto id = GetEntityFromIndex(index);
-    if (id.IsValid())
-    {
-        switch (index.column())
-        {
-        case ColumnName:
-            return dataForName(index, role);
-
-        case ColumnVisibilityToggle:
-            return dataForVisibility(index, role);
-
-        case ColumnLockToggle:
-            return dataForLock(index, role);
-
-        case ColumnSortIndex:
-            return dataForSortIndex(index, role);
-        }
-    }
-
-    return QVariant();
-}
-
-QMap<int, QVariant> OutlinerListModel::itemData(const QModelIndex &index) const
-{
-    QMap<int, QVariant> roles = QAbstractItemModel::itemData(index);
-    for (int i = Qt::UserRole; i < RoleCount; ++i)
-    {
-        QVariant variantData = data(index, i);
-        if (variantData.isValid())
-        {
-            roles.insert(i, variantData);
-        }
-    }
-
-    return roles;
-}
-
-QVariant OutlinerListModel::dataForAll(const QModelIndex& index, int role) const
-{
-    auto id = GetEntityFromIndex(index);
-
-    switch (role)
-    {
-    case EntityIdRole:
-        return (AZ::u64)id;
-
-    case SliceBackgroundRole:
-    {
-        bool isSliceRoot = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceRoot, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceRoot);
-        bool isSliceEntity = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceEntity, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceEntity);
-        bool isSubsliceRoot = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSubsliceRoot, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSubsliceRoot);
-        return (isSliceRoot || isSubsliceRoot) && isSliceEntity;
-    }
-
-    case SliceEntityOverrideRole:
-    {
-        bool entityHasOverrides = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(entityHasOverrides, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceAnyOverrides);
-        return entityHasOverrides;
-    }
-
-    case SelectedRole:
-    {
-        bool isSelected = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSelected, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSelected);
-        return isSelected;
-    }
-
-    case ChildSelectedRole:
-        return HasSelectedDescendant(id);
-
-    case PartiallyVisibleRole:
-        return !AreAllDescendantsSameVisibleState(id);
-
-    case PartiallyLockedRole:
-        return !AreAllDescendantsSameLockState(id);
-
-    case InLockedLayerRole:
-        return IsInLayerWithProperty(id, LayerProperty::Locked);
-
-    case InInvisibleLayerRole:
-        return IsInLayerWithProperty(id, LayerProperty::Invisible);
-
-    case ChildCountRole:
-    {
-        AZStd::size_t childCount = 0;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(childCount, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildCount);
-        return (int)childCount;
-    }
-
-    case ExpandedRole:
-        return IsExpanded(id);
-
-    case VisibilityRole:
-        return !IsFiltered(id);
-    }
-
-    return QVariant();
-}
-
-QVariant OutlinerListModel::dataForName(const QModelIndex& index, int role) const
-{
-    auto id = GetEntityFromIndex(index);
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-    case Qt::EditRole:
-    {
-        AZStd::string name;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(name, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetName);
-        QString label{ name.data() };
-        if (s_paintingName && !m_filterString.empty())
-        {
-            // highlight characters in filter
-            int highlightTextIndex = 0;
-            do
-            {
-                highlightTextIndex = label.lastIndexOf(QString(m_filterString.c_str()), highlightTextIndex - 1, Qt::CaseInsensitive);
-                if (highlightTextIndex >= 0)
-                {
-                    const QString BACKGROUND_COLOR{ "#707070" };
-                    label.insert(highlightTextIndex + m_filterString.length(), "</span>");
-                    label.insert(highlightTextIndex, "<span style=\"background-color: " + BACKGROUND_COLOR + "\">");
-                }
-            } while(highlightTextIndex > 0);
-        }
-        return label;
-    }
-
-    case Qt::ToolTipRole:
-    {
-        return GetEntityTooltip(id);
-    }
-
-    case EntityTypeRole:
-    {
-        bool isSliceRoot = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceRoot, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceRoot);
-        bool isSliceEntity = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceEntity, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceEntity);
-        bool isSubsliceRoot = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSubsliceRoot, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSubsliceRoot);
-
-        bool isLayerEntity = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            isLayerEntity,
-            id,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-
-        if (isLayerEntity)
-        {
-            return LayerType;
-        }
-        else if (isSliceEntity)
-        {
-            return (isSliceRoot | isSubsliceRoot) ? SliceHandleType : SliceEntityType;
-        }
-
-        // Guaranteed to return a valid type.
-        return EntityType;
-    }
-
-    case LayerColorRole:
-    {
-        QColor layerColor;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            layerColor,
-            id,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GetLayerColor);
-        return layerColor;
-    }
-
-    case Qt::ForegroundRole:
-    {
-        // We use the parent's palette because the GUI Application palette is returning the wrong colors
-        auto parentWidgetPtr = static_cast<QWidget*>(QObject::parent());
-        return QBrush(parentWidgetPtr->palette().color(QPalette::Text));
-    }
-
-    case Qt::DecorationRole:
-    {
-        return GetEntityIcon(id);
-    }
-    }
-
-    return dataForAll(index, role);
-}
-
-QVariant OutlinerListModel::GetEntityIcon(const AZ::EntityId& id) const
-{
-    AZ::Entity* entity = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
-
-    // build the icon name based on the entity type and state
-    QString iconName;
-
-    bool isSliceEntity = false;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSliceEntity, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceEntity);
-
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        id,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-
-
-    if (isLayerEntity)
-    {
-        // There is only one layer icon, it does not have multiple states like entities.
-        return QIcon(QPixmap(QString(":/Icons/layer_icon.svg")));
-    }
-    else if (isSliceEntity)
-    {
-        iconName = "Slice_Entity";
-
-        bool hasSliceEntityOverrides = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(hasSliceEntityOverrides, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceEntityPropertyOverridesInTopLevel);
-
-        if (hasSliceEntityOverrides)
-        {
-            iconName += "_Modified";
-        }
-    }
-    else
-    {
-        iconName = "Entity";
-    }
-
-    bool isEditorOnly = false;
-    AzToolsFramework::EditorOnlyEntityComponentRequestBus::EventResult(isEditorOnly, id, &AzToolsFramework::EditorOnlyEntityComponentRequests::IsEditorOnlyEntity);
-
-    const bool isInitiallyActive = entity ? entity->IsRuntimeActiveByDefault() : true;
-
-    if (isEditorOnly)
-    {
-        iconName += "_Editor_Only";
-    }
-    else if (!isInitiallyActive)
-    {
-        iconName += "_Not_Active";
-    }
-
-    QPixmap entityIcon = QPixmap(QString(":/Icons/%1.svg").arg(iconName));
-
-    // Draw a circle at the bottom right corner of the icon when the entity's children have overrides.
-    bool hasSliceChildrenOverrides = false;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(hasSliceChildrenOverrides, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceChildrenOverrides);
-
-    if (hasSliceChildrenOverrides && isSliceEntity)
-    {
-        QBitmap mask = entityIcon.mask();
-        QPainter maskPainter(&mask);
-        maskPainter.drawEllipse(entityIcon.width() - maskDiameter, entityIcon.height() - maskDiameter, maskDiameter, maskDiameter);
-        entityIcon.setMask(mask);
-
-        QPainter iconPainter(&entityIcon);
-        iconPainter.setPen(Qt::transparent);
-        iconPainter.setBrush(QBrush(circleIconColor));
-        iconPainter.drawEllipse(entityIcon.width() - circleIconDiameter, entityIcon.height() - circleIconDiameter, circleIconDiameter, circleIconDiameter);
-    }
-
-    return QIcon(entityIcon);
-}
-
-QVariant OutlinerListModel::GetEntityTooltip(const AZ::EntityId& id) const
-{
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        id,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-
-    if (isLayerEntity)
-    {
-        bool isLayerNameValid = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            isLayerNameValid,
-            id,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::IsLayerNameValid);
-        if (!isLayerNameValid)
-        {
-            return "Layer names at the same level of the hierarchy must be unique before you can save them.";
-        }
-
-        AZ::Outcome<AZStd::string, AZStd::string> layerFullNameResult(
-            AZ::Failure(AZStd::string("Unable to get the layer's file name with an extension.")));
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            layerFullNameResult,
-            id,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GetLayerFullFileName);
-        if (!layerFullNameResult.IsSuccess())
-        {
-            return layerFullNameResult.GetError().c_str();
-        }
-
-        QString layerTooltip = layerFullNameResult.GetValue().c_str();
-
-        bool hasUnsavedChanges = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            hasUnsavedChanges,
-            id,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasUnsavedChanges);
-        if (hasUnsavedChanges)
-        {
-            layerTooltip = QObject::tr("%1(Unsaved)").arg(layerTooltip);
-        }
-
-        QString levelAbsoluteFolder = Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName());
-        bool doesLayerFileExistOnDisk = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            doesLayerFileExistOnDisk,
-            id,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::DoesLayerFileExistOnDisk,
-            levelAbsoluteFolder);
-        if (doesLayerFileExistOnDisk)
-        {
-            layerTooltip = QObject::tr("Unsaved layer");
-        }
-
-        return layerTooltip;
-    }
-
-
-    AZStd::string sliceAssetName;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(sliceAssetName, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetSliceAssetName);
-
-    bool isEditorOnly = false;
-    AzToolsFramework::EditorOnlyEntityComponentRequestBus::EventResult(isEditorOnly, id, &AzToolsFramework::EditorOnlyEntityComponentRequests::IsEditorOnlyEntity);
-
-    QString tooltip = !sliceAssetName.empty() ? QString("Slice asset: %1").arg(sliceAssetName.data()) : QString("Slice asset: This entity is not part of a slice.");
-
-
-    bool hasCyclicDependency = false;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(hasCyclicDependency, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasCyclicDependency);
-    if (hasCyclicDependency)
-    {
-        tooltip = QObject::tr("Circular dependency detected. Cannot save instances of a slice inside of itself. Other valid overrides can be saved as normal.");
-    }
-    else
-    if (isEditorOnly)
-    {
-        tooltip = QString("(%1) %2").arg(tr("Editor-only"), tooltip);
-    }
-    else
-    {
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
-        if (!entity->IsRuntimeActiveByDefault())
-        {
-            tooltip = QString("(%1) %2").arg(tr("Not Active on Start"), tooltip);
-        }
-    }
-
-    return tooltip;
-}
-
-QVariant OutlinerListModel::dataForVisibility(const QModelIndex& index, int role) const
-{
-    auto id = GetEntityFromIndex(index);
-
-    switch (role)
-    {
-        case Qt::CheckStateRole:
-        {
-            return AzToolsFramework::IsEntitySetToBeVisible(id) ? Qt::Checked : Qt::Unchecked;
-        }
-        case Qt::ToolTipRole:
-        {
-            return QString("Show/Hide Entity");
-        }
-        case Qt::SizeHintRole:
-        {
-            return QSize(20, 20);
-        }
-    }
-
-    return dataForAll(index, role);
-}
-
-QVariant OutlinerListModel::dataForLock(const QModelIndex& index, int role) const
-{
-    auto id = GetEntityFromIndex(index);
-
-    switch (role)
-    {
-        case Qt::CheckStateRole:
-        {
-            bool isLocked = false;
-            // Lock state is tracked in 3 places:
-            // EditorLockComponent, EditorEntityModel, and ComponentEntityObject.
-            // In addition to that, entities that are in layers can have the layer's lock state override their own.
-            // Retrieving the lock state from the lock component is ideal for drawing the lock icon in the outliner because
-            // the outliner needs to show that specific entity's lock state, and not the actual final lock state including the layer behavior.
-            // The EditorLockComponent only knows about the specific entity's lock state and not the hierarchy.
-            AzToolsFramework::EditorLockComponentRequestBus::EventResult(
-                isLocked, id, &AzToolsFramework::EditorLockComponentRequests::GetLocked);
-
-            return isLocked ? Qt::Checked : Qt::Unchecked;
-        }
-        case Qt::ToolTipRole:
-        {
-            return QString("Lock/Unlock Entity (Locked means the entity cannot be moved in the viewport)");
-        }
-        case Qt::SizeHintRole:
-        {
-            return QSize(20, 20);
-        }
-    }
-
-    return dataForAll(index, role);
-}
-
-QVariant OutlinerListModel::dataForSortIndex(const QModelIndex& index, int role) const
-{
-    auto id = GetEntityFromIndex(index);
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-        AZ::u64 sortIndex = 0;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(sortIndex, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetIndexForSorting);
-        return sortIndex;
-    }
-
-    return dataForAll(index, role);
-}
-
-bool OutlinerListModel::setData(const QModelIndex& index, const QVariant& value, int role)
-{
-    switch (role)
-    {
-    case Qt::CheckStateRole:
-    {
-        if (value.canConvert<Qt::CheckState>())
-        {
-            const auto entityId = GetEntityFromIndex(index);
-            switch (index.column())
-            {
-                case ColumnVisibilityToggle:
-                    AzToolsFramework::ToggleEntityVisibility(entityId);
-                    break;
-
-                case ColumnLockToggle:
-                    AzToolsFramework::ToggleEntityLockState(entityId);
-                    break;
-            }
-        }
-    }
-    break;
-
-    case Qt::EditRole:
-    {
-        if (index.column() == ColumnName && !value.toString().isEmpty())
-        {
-            auto id = GetEntityFromIndex(index);
-            if (id.IsValid())
-            {
-                AZ::Entity* entity = nullptr;
-                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, id);
-
-                if (entity)
-                {
-                    AZStd::string oldName = entity->GetName();
-                    AZStd::string newName = value.toString().toUtf8().constData();
-
-                    if (oldName != newName)
-                    {
-                        AzToolsFramework::ScopedUndoBatch undo("Rename Entity");
-
-                        entity->SetName(newName);
-                        undo.MarkEntityDirty(entity->GetId());
-
-                        EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_EntireTree);
-                    }
-                }
-                else
-                {
-                    AZStd::string name;
-                    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(name, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetName);
-                    AZ_Assert(entity, "Outliner entry cannot locate entity with name: %s", name.c_str());
-                }
-            }
-        }
-    }
-    break;
-    }
-
-    return QAbstractItemModel::setData(index, value, role);
-}
-
-QModelIndex OutlinerListModel::parent(const QModelIndex& index) const
-{
-    // invalid indices have no parent
-    if (!index.isValid())
-    {
-        return QModelIndex();
-    }
-
-    auto id = GetEntityFromIndex(index);
-    if (id.IsValid())
-    {
-        AZ::EntityId parentId;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, id, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-        return GetIndexFromEntity(parentId, index.column());
-    }
-    return QModelIndex();
-}
-
-Qt::ItemFlags OutlinerListModel::flags(const QModelIndex& index) const
-{
-    Qt::ItemFlags itemFlags = QAbstractItemModel::flags(index);
-    switch (index.column())
-    {
-    case ColumnVisibilityToggle:
-    case ColumnLockToggle:
-        itemFlags |= Qt::ItemIsEnabled;
-        break;
-
-    case ColumnName:
-        itemFlags |= Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsEditable;
-        break;
-
-    default:
-        itemFlags |= Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
-        break;
-    }
-
-    return itemFlags;
-}
-
-Qt::DropActions OutlinerListModel::supportedDropActions() const
-{
-    return Qt::CopyAction;
-}
-
-Qt::DropActions OutlinerListModel::supportedDragActions() const
-{
-    return Qt::CopyAction;
-}
-
-
-bool OutlinerListModel::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
-{
-    if (data)
-    {
-        if (canDropMimeDataForEntityIds(data, action, row, column, parent))
-        {
-            return true;
-        }
-
-        if (CanDropMimeDataAssets(data, action, row, column, parent))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool OutlinerListModel::canDropMimeDataForEntityIds(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
-{
-    (void)action;
-    (void)column;
-    (void)row;
-
-    if (!data || !data->hasFormat(AzToolsFramework::EditorEntityIdContainer::GetMimeType()) || column > 0)
-    {
-        return false;
-    }
-
-    QByteArray arrayData = data->data(AzToolsFramework::EditorEntityIdContainer::GetMimeType());
-
-    AzToolsFramework::EditorEntityIdContainer entityIdListContainer;
-    if (!entityIdListContainer.FromBuffer(arrayData.constData(), arrayData.size()))
-    {
-        return false;
-    }
-
-    AZ::EntityId newParentId = GetEntityFromIndex(parent);
-    if (!CanReparentEntities(newParentId, entityIdListContainer.m_entityIds))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-// Expected behavior when dropping an entity in the outliner view model:
-//  DragEntity onto DropEntity, neither in each other's hierarchy:
-//      DropEntity becomes parent of DragEntity
-//  DragEntity onto DropEntity, DropEntity is DragEntity's parent:
-//      DragEntity sets its parent to DropEntity's parent.
-//  DragEntity onto DropEntity, DragEntity is DropEntity's parent:
-//      No change occurs.
-//  DragEntity onto DropEntity, DropEntity is DragEntity's grandfather (or deeper):
-//      DragEntity's parent becomes DropEntity.
-//  DragEntity onto DropEntity, DragEntity is DropEntity's grandfather (or deeper):
-//      No change occurs.
-//  DragEntity onto DragEntity
-//      No change occurs.
-//  DragEntity and DragEntityChild onto DropEntity:
-//      DragEntity behaves as define previously.
-//      DragEntityChild behaves as a second DragEntity, following normal drag rules.
-//      Example: DragEntity and DragEntityChild dropped onto DragEntity:
-//          DragEntity has no change occur.
-//          DragEntityChild follows the rule "DragEntity onto DropEntity, DropEntity is DragEntity's parent"
-bool OutlinerListModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
-{
-    if (action == Qt::IgnoreAction)
-    {
-        return true;
-    }
-
-    if (parent.isValid() && row == -1 && column == -1)
-    {
-        // Handle drop from the component palette window.
-        if (data->hasFormat(AzToolsFramework::ComponentTypeMimeData::GetMimeType()))
-        {
-            return dropMimeDataComponentPalette(data, action, row, column, parent);
-        }
-    }
-
-    if (data->hasFormat(AzToolsFramework::AssetBrowser::AssetBrowserEntry::GetMimeType()))
-    {
-        return DropMimeDataAssets(data, action, row, column, parent);
-    }
-
-    if (data->hasFormat(AzToolsFramework::EditorEntityIdContainer::GetMimeType()))
-    {
-        return dropMimeDataEntities(data, action, row, column, parent);
-    }
-
-    return QAbstractItemModel::dropMimeData(data, action, row, column, parent);
-}
-
-bool OutlinerListModel::dropMimeDataComponentPalette(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
-{
-    (void)action;
-    (void)row;
-    (void)column;
-
-    AZ::EntityId dropTargetId = GetEntityFromIndex(parent);
-    AzToolsFramework::EntityIdList entityIds{ dropTargetId };
-
-    AzToolsFramework::ComponentTypeMimeData::ClassDataContainer classDataContainer;
-    AzToolsFramework::ComponentTypeMimeData::Get(data, classDataContainer);
-
-    AZ::ComponentTypeList componentsToAdd;
-    for (const auto& classData : classDataContainer)
-    {
-        if (classData)
-        {
-            componentsToAdd.push_back(classData->m_typeId);
-        }
-    }
-
-    AzToolsFramework::EntityCompositionRequests::AddComponentsOutcome addedComponentsResult = AZ::Failure(AZStd::string("Failed to call AddComponentsToEntities on EntityCompositionRequestBus"));
-    AzToolsFramework::EntityCompositionRequestBus::BroadcastResult(addedComponentsResult, &AzToolsFramework::EntityCompositionRequests::AddComponentsToEntities, entityIds, componentsToAdd);
-
-    if (addedComponentsResult.IsSuccess())
-    {
-        AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(&AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay, AzToolsFramework::Refresh_EntireTree_NewContent);
-    }
-
-    return false;
-}
-
-
-void OutlinerListModel::DecodeAssetMimeData(const QMimeData* data, AZStd::vector<ComponentAssetPair>& componentAssetPairs, SliceAssetList& sliceAssets) const
-{
-    using namespace AzToolsFramework;
-
-    AZStd::vector<AssetBrowser::AssetBrowserEntry*> entries;
-    AssetBrowser::AssetBrowserEntry::FromMimeData(data, entries);
-
-    AZStd::vector<const AssetBrowser::ProductAssetBrowserEntry*> products;
-    products.reserve(entries.size());
-
-    // Look at all products and determine if they have an associated component.
-    // If so, store the componentType->assetId pair.
-    for (AssetBrowser::AssetBrowserEntry* entry : entries)
-    {
-        products.clear();
-        const AssetBrowser::ProductAssetBrowserEntry* browserEntry = azrtti_cast<const AssetBrowser::ProductAssetBrowserEntry*>(entry);
-        if (browserEntry)
-        {
-            products.push_back(browserEntry);
-        }
-        else
-        {
-            entry->GetChildren<AssetBrowser::ProductAssetBrowserEntry>(products);
-        }
-        for (const auto* product : products)
-        {
-            if (product->GetAssetType() == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
-            {
-                sliceAssets.push_back(product->GetAssetId());
-            }
-            else
-            {
-                bool canCreateComponent = false;
-                AZ::AssetTypeInfoBus::EventResult(canCreateComponent, product->GetAssetType(), &AZ::AssetTypeInfo::CanCreateComponent, product->GetAssetId());
-
-                AZ::TypeId componentType;
-                AZ::AssetTypeInfoBus::EventResult(componentType, product->GetAssetType(), &AZ::AssetTypeInfo::GetComponentTypeId);
-
-                if (canCreateComponent && !componentType.IsNull())
-                {
-                    componentAssetPairs.push_back(AZStd::make_pair(componentType, product->GetAssetId()));
-                }
-            }
-        }
-    }
-}
-
-bool OutlinerListModel::CanDropMimeDataAssets(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
-{
-    (void)action;
-    (void)column;
-    (void)row;
-    (void)parent;
-
-    using namespace AzToolsFramework;
-
-    if (data->hasFormat(AssetBrowser::AssetBrowserEntry::GetMimeType()))
-    {
-        ComponentAssetPairs componentAssetPairs;
-        SliceAssetList sliceAssets;
-        DecodeAssetMimeData(data, componentAssetPairs, sliceAssets);
-
-        return (!componentAssetPairs.empty() || !sliceAssets.empty());
-    }
-
-    return false;
-}
-
-bool OutlinerListModel::DropMimeDataAssets(const QMimeData* data, [[maybe_unused]] Qt::DropAction action, int row, [[maybe_unused]] int column, const QModelIndex& parent)
-{
-    using namespace AzToolsFramework;
-
-    ComponentAssetPairs componentAssetPairs;
-    SliceAssetList sliceAssets;
-    DecodeAssetMimeData(data, componentAssetPairs, sliceAssets);
-
-    ScopedUndoBatch undo("Create/Modify Entities for Asset Drop");
-
-    AZ::Vector3 viewportCenter = AZ::Vector3::CreateZero();
-    EditorRequestBus::BroadcastResult(viewportCenter, &EditorRequestBus::Events::GetWorldPositionAtViewportCenter);
-
-    AZ::EntityId assignParentId = GetEntityFromIndex(parent);
-
-    for (const AZ::Data::AssetId& sliceAssetId : sliceAssets)
-    {
-        // Queue a slice instantiation for each dragged slice.
-        AZ::Data::Asset<AZ::SliceAsset> sliceAsset =
-            AZ::Data::AssetManager::Instance().FindOrCreateAsset<AZ::SliceAsset>(sliceAssetId, AZ::Data::AssetLoadBehavior::Default);
-        if (sliceAsset)
-        {
-            //make sure dropped slices get put in the correct position
-            ToolsApplicationNotificationBus::Broadcast(
-                &ToolsApplicationNotificationBus::Events::SetEntityInstantiationPosition, assignParentId, GetEntityFromIndex(index(row, 0, parent)));
-
-            SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
-                &SliceEditorEntityOwnershipServiceRequestBus::Events::InstantiateEditorSlice,
-                sliceAsset, AZ::Transform::CreateTranslation(viewportCenter));
-
-        }
-    }
-
-    if (componentAssetPairs.empty())
-    {
-        return false;
-    }
-
-    QWidget* mainWindow = nullptr;
-    EditorRequests::Bus::BroadcastResult(mainWindow, &EditorRequests::GetMainWindow);
-
-    // Only resolve an existing if the drop was directly on it. Otherwise we'll create a new entity.
-    AZ::EntityId targetEntityId = (row < 0) ? GetEntityFromIndex(parent) : AZ::EntityId();
-    bool createdNewEntity = false;
-
-    // Shift modifier enables creating a child entity from the asset.
-    if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
-    {
-        assignParentId = targetEntityId;
-        targetEntityId.SetInvalid();
-    }
-
-    if (!targetEntityId.IsValid())
-    {
-        // Only set the entity instantiation position if a new entity will be created. Otherwise, the next entity to be created will be given this position.
-        ToolsApplicationNotificationBus::Broadcast(
-            &ToolsApplicationNotificationBus::Events::SetEntityInstantiationPosition, assignParentId, GetEntityFromIndex(index(row, 0, parent)));
-
-        EditorRequests::Bus::BroadcastResult(targetEntityId, &EditorRequests::CreateNewEntity, assignParentId);
-        if (!targetEntityId.IsValid())
-        {
-            // Clear the entity instantiation position because this entity failed to be created.
-            // Otherwise, the next entity to be created will be given the wrong parent in the outliner.
-            ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::ClearEntityInstantiationPosition);
-            QMessageBox::warning(mainWindow, tr("Asset Drop Failed"), tr("A new entity could not be created for the specified asset."));
-            return false;
-        }
-
-        createdNewEntity = true;
-    }
-
-    AZ::Entity* targetEntity = nullptr;
-    AZ::ComponentApplicationBus::BroadcastResult(targetEntity, &AZ::ComponentApplicationBus::Events::FindEntity, targetEntityId);
-    if (!targetEntity)
-    {
-        QMessageBox::warning(mainWindow, tr("Asset Drop Failed"), tr("Failed to locate target entity."));
-        return false;
-    }
-
-    // Batch-add all the components.
-    AZ::ComponentTypeList componentsToAdd;
-    componentsToAdd.reserve(componentAssetPairs.size());
-    for (const ComponentAssetPair& pair : componentAssetPairs)
-    {
-        const AZ::TypeId& componentType = pair.first;
-
-        componentsToAdd.push_back(componentType);
-    }
-
-    AZStd::vector<AZ::EntityId> entityIds = { targetEntityId };
-    EntityCompositionRequests::AddComponentsOutcome addComponentsOutcome = AZ::Failure(AZStd::string());
-    EntityCompositionRequestBus::BroadcastResult(addComponentsOutcome, &EntityCompositionRequests::AddComponentsToEntities, entityIds, componentsToAdd);
-
-    if (!addComponentsOutcome.IsSuccess())
-    {
-        QMessageBox::warning(mainWindow, tr("Asset Drop Failed"),
-            QStringLiteral("Components could not be added to the target entity \"%1\".\n\nDetails:\n%2.")
-            .arg(targetEntity->GetName().c_str())
-            .arg(addComponentsOutcome.GetError().c_str()));
-
-        if (createdNewEntity)
-        {
-            EditorEntityContextRequestBus::Broadcast(&EditorEntityContextRequests::DestroyEditorEntity, targetEntityId);
-        }
-
-        return false;
-    }
-
-    // Assign asset associated with each created component.
-    for (const ComponentAssetPair& pair : componentAssetPairs)
-    {
-        const AZ::TypeId& componentType = pair.first;
-        const AZ::Data::AssetId& assetId = pair.second;
-
-        // Name the entity after the first asset.
-        if (createdNewEntity && &pair == &componentAssetPairs.front())
-        {
-            AZStd::string assetPath;
-            EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetId);
-            if (!assetPath.empty())
-            {
-                AZStd::string entityName;
-                AzFramework::StringFunc::Path::GetFileName(assetPath.c_str(), entityName);
-                targetEntity->SetName(entityName);
-            }
-        }
-
-        AZ::Component* componentAdded = targetEntity->FindComponent(componentType);
-        if (componentAdded)
-        {
-            Components::EditorComponentBase* editorComponent = GetEditorComponent(componentAdded);
-            if (editorComponent)
-            {
-                editorComponent->SetPrimaryAsset(assetId);
-            }
-        }
-    }
-
-    if (createdNewEntity)
-    {
-        const AzToolsFramework::EntityIdList selection = { targetEntityId };
-        ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selection);
-    }
-
-    if (AzToolsFramework::IsSelected(targetEntityId))
-    {
-        ToolsApplicationEvents::Bus::Broadcast(&ToolsApplicationEvents::InvalidatePropertyDisplay, Refresh_EntireTree_NewContent);
-    }
-
-    return true;
-}
-
-bool OutlinerListModel::dropMimeDataEntities(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
-{
-    (void)action;
-    (void)column;
-
-    QByteArray arrayData = data->data(AzToolsFramework::EditorEntityIdContainer::GetMimeType());
-
-    AzToolsFramework::EditorEntityIdContainer entityIdListContainer;
-    if (!entityIdListContainer.FromBuffer(arrayData.constData(), arrayData.size()))
-    {
-        return false;
-    }
-
-    AZ::EntityId newParentId = GetEntityFromIndex(parent);
-    AZ::EntityId beforeEntityId = GetEntityFromIndex(index(row, 0, parent));
-    AzToolsFramework::EntityIdList topLevelEntityIds;
-    topLevelEntityIds.reserve(entityIdListContainer.m_entityIds.size());
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::FindTopLevelEntityIdsInactive, entityIdListContainer.m_entityIds, topLevelEntityIds);
-    if (!ReparentEntities(newParentId, topLevelEntityIds, beforeEntityId))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool OutlinerListModel::CanReparentEntities(const AZ::EntityId& newParentId, const AzToolsFramework::EntityIdList &selectedEntityIds) const
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    if (selectedEntityIds.empty())
-    {
-        return false;
-    }
-
-    // Ignore entities not owned by the editor context. It is assumed that all entities belong
-    // to the same context since multiple selection doesn't span across views.
-    for (const AZ::EntityId& entityId : selectedEntityIds)
-    {
-        bool isEditorEntity = false;
-        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, entityId);
-        if (!isEditorEntity)
-        {
-            return false;
-        }
-
-        bool isEntityEditable = true;
-        EBUS_EVENT_RESULT(isEntityEditable, AzToolsFramework::ToolsApplicationRequests::Bus, IsEntityEditable, entityId);
-        if (!isEntityEditable)
-        {
-            return false;
-        }
-
-        // when in a forced sort mode, reject reordering under the same parent
-        if (m_sortMode != EntityOutliner::DisplaySortMode::Manually)
-        {
-            AZ::EntityId currentParentId;
-            AZ::TransformBus::EventResult(currentParentId, entityId, &AZ::TransformBus::Events::GetParentId);
-            if (currentParentId == newParentId)
-            {
-                return false;
-            }
-        }
-
-        if (newParentId.IsValid())
-        {
-            bool isLayerEntity = false;
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-                isLayerEntity,
-                entityId,
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-            // Layers can only have other layers as parents, or have no parent.
-            if (isLayerEntity)
-            {
-                bool newParentIsLayer = false;
-                AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-                    newParentIsLayer,
-                    newParentId,
-                    &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-                if (!newParentIsLayer)
-                {
-                    return false;
-                }
-            }
-        }
-    }
-
-    //Only check the entity pointer if the entity id is valid because
-    //we want to allow dragging items to unoccupied parts of the tree to un-parent them
-    if (newParentId.IsValid())
-    {
-        AZ::Entity* newParentEntity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(newParentEntity, &AZ::ComponentApplicationRequests::FindEntity, newParentId);
-        if (!newParentEntity)
-        {
-            return false;
-        }
-    }
-
-    //reject dragging on to yourself or your children
-    AZ::EntityId currParentId = newParentId;
-    while (currParentId.IsValid())
-    {
-        if (AZStd::find(selectedEntityIds.begin(), selectedEntityIds.end(), currParentId) != selectedEntityIds.end())
-        {
-            return false;
-        }
-
-        AZ::EntityId tempParentId;
-        AZ::TransformBus::EventResult(tempParentId, currParentId, &AZ::TransformBus::Events::GetParentId);
-        currParentId = tempParentId;
-    }
-
-    return true;
-}
-
-bool OutlinerListModel::ReparentEntities(const AZ::EntityId& newParentId, const AzToolsFramework::EntityIdList &selectedEntityIds, const AZ::EntityId& beforeEntityId)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    if (!CanReparentEntities(newParentId, selectedEntityIds))
-    {
-        return false;
-    }
-
-    m_isFilterDirty = true;
-
-    AzToolsFramework::ScopedUndoBatch undo("Reparent Entities");
-    //capture child entity order before re-parent operation, which will automatically add order info if not present
-    AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(newParentId);
-
-    // The new parent is dirty due to sort change(s)
-    undo.MarkEntityDirty(AzToolsFramework::GetEntityIdForSortInfo(newParentId));
-
-    AzToolsFramework::EntityIdList processedEntityIds;
-    {
-        AzToolsFramework::ScopedUndoBatch undo2("Reparent Entities");
-
-        for (AZ::EntityId entityId : selectedEntityIds)
-        {
-            AZ::EntityId oldParentId;
-            EBUS_EVENT_ID_RESULT(oldParentId, entityId, AZ::TransformBus, GetParentId);
-
-            if (oldParentId != newParentId
-                && AzToolsFramework::SliceUtilities::IsReparentNonTrivial(entityId, newParentId))
-            {
-                AzToolsFramework::SliceUtilities::ReparentNonTrivialSliceInstanceHierarchy(entityId, newParentId);
-            }
-            else
-            {
-                //  Guarding this to prevent the entity from being marked dirty when the parent doesn't change.
-                EBUS_EVENT_ID(entityId, AZ::TransformBus, SetParent, newParentId);
-            }
-
-            // The old parent is dirty due to sort change
-            undo2.MarkEntityDirty(AzToolsFramework::GetEntityIdForSortInfo(oldParentId));
-
-            // The reparented entity is dirty due to parent change
-            undo2.MarkEntityDirty(entityId);
-
-            processedEntityIds.push_back(entityId);
-
-            AzToolsFramework::ComponentEntityEditorRequestBus::Event(
-                entityId, &AzToolsFramework::ComponentEntityEditorRequestBus::Events::RefreshVisibilityAndLock);
-        }
-
-        GetIEditor()->GetObjectManager()->InvalidateVisibleList();
-    }
-
-    //search for the insertion entity in the order array
-    auto beforeEntityItr = AZStd::find(entityOrderArray.begin(), entityOrderArray.end(), beforeEntityId);
-
-    //replace order info matching selection with bad values rather than remove to preserve layout
-    for (auto& id : entityOrderArray)
-    {
-        if (AZStd::find(processedEntityIds.begin(), processedEntityIds.end(), id) != processedEntityIds.end())
-        {
-            id = AZ::EntityId();
-        }
-    }
-
-    if (newParentId.IsValid())
-    {
-        //if adding to a valid parent entity, insert at the found entity location or at the head of the container
-        auto insertItr = beforeEntityItr != entityOrderArray.end() ? beforeEntityItr : entityOrderArray.begin();
-        entityOrderArray.insert(insertItr, processedEntityIds.begin(), processedEntityIds.end());
-    }
-    else
-    {
-        //if adding to an invalid parent entity (the root), insert at the found entity location or at the tail of the container
-        auto insertItr = beforeEntityItr != entityOrderArray.end() ? beforeEntityItr : entityOrderArray.end();
-        entityOrderArray.insert(insertItr, processedEntityIds.begin(), processedEntityIds.end());
-    }
-
-    //remove placeholder entity ids
-    entityOrderArray.erase(AZStd::remove(entityOrderArray.begin(), entityOrderArray.end(), AZ::EntityId()), entityOrderArray.end());
-
-    //update order array
-    AzToolsFramework::SetEntityChildOrder(newParentId, entityOrderArray);
-
-    // reselect the entities to ensure they're visible if appropriate
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, processedEntityIds);
-
-    EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values);
-    return true;
-}
-
-QMimeData* OutlinerListModel::mimeData(const QModelIndexList& indexes) const
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    AZ::TypeId uuid1 = AZ::AzTypeInfo<AZ::Entity>::Uuid();
-    AZ::TypeId uuid2 = AZ::AzTypeInfo<AzToolsFramework::EditorEntityIdContainer>::Uuid();
-
-    AzToolsFramework::EditorEntityIdContainer entityIdList;
-    for (const QModelIndex& index : indexes)
-    {
-        if (index.column() == 0) // ignore all but one cell in row
-        {
-            AZ::EntityId entityId = GetEntityFromIndex(index);
-            if (entityId.IsValid())
-            {
-                entityIdList.m_entityIds.push_back(entityId);
-            }
-        }
-    }
-    if (entityIdList.m_entityIds.empty())
-    {
-        return nullptr;
-    }
-
-    AZStd::vector<char> encoded;
-    if (!entityIdList.ToBuffer(encoded))
-    {
-        return nullptr;
-    }
-
-    QMimeData* mimeDataPtr = new QMimeData();
-    QByteArray encodedData;
-    encodedData.resize((int)encoded.size());
-    memcpy(encodedData.data(), encoded.data(), encoded.size());
-
-    mimeDataPtr->setData(AzToolsFramework::EditorEntityIdContainer::GetMimeType(), encodedData);
-    return mimeDataPtr;
-}
-
-QStringList OutlinerListModel::mimeTypes() const
-{
-    QStringList list = QAbstractItemModel::mimeTypes();
-    list.append(AzToolsFramework::EditorEntityIdContainer::GetMimeType());
-    list.append(AzToolsFramework::ComponentTypeMimeData::GetMimeType());
-    list.append(AzToolsFramework::ComponentAssetMimeDataContainer::GetMimeType());
-    return list;
-}
-
-void OutlinerListModel::QueueEntityUpdate(AZ::EntityId entityId)
-{
-    if (m_layoutResetQueued)
-    {
-        return;
-    }
-    if (!m_entityChangeQueued)
-    {
-        m_entityChangeQueued = true;
-        QTimer::singleShot(0, this, &OutlinerListModel::ProcessEntityUpdates);
-    }
-    m_entityChangeQueue.insert(entityId);
-}
-
-void OutlinerListModel::QueueAncestorUpdate(AZ::EntityId entityId)
-{
-    //primarily needed for ancestors that reflect child state (selected, locked, hidden)
-    AZ::EntityId parentId;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-    for (AZ::EntityId currentId = parentId; currentId.IsValid(); currentId = parentId)
-    {
-        QueueEntityUpdate(currentId);
-        parentId.SetInvalid();
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, currentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-    }
-}
-
-void OutlinerListModel::QueueEntityToExpand(AZ::EntityId entityId, bool expand)
-{
-    m_entityExpansionState[entityId] = expand;
-    m_entityExpandQueue.insert(entityId);
-    QueueEntityUpdate(entityId);
-}
-
-// Helper struct for tracking a range of indices.
-struct ModelIndexRange
-{
-public:
-    QModelIndex m_start;
-    QModelIndex m_end;
-};
-
-
-void OutlinerListModel::ProcessEntityUpdates()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    m_entityChangeQueued = false;
-    if (m_layoutResetQueued)
-    {
-        return;
-    }
-
-    {
-        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:ExpandQueue");
-        for (auto entityId : m_entityExpandQueue)
-        {
-            emit ExpandEntity(entityId, IsExpanded(entityId));
-        };
-        m_entityExpandQueue.clear();
-    }
-
-    {
-        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:SelectQueue");
-        for (auto entityId : m_entitySelectQueue)
-        {
-            emit SelectEntity(entityId, AzToolsFramework::IsSelected(entityId));
-        };
-        m_entitySelectQueue.clear();
-    }
-
-    if (!m_entityChangeQueue.empty())
-    {
-        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:ChangeQueue");
-
-        // its faster to just do a bulk data change than to carefully pick out indices
-        // so we'll just merge all ranges into a single range rather than try to make gaps
-        QModelIndex firstChangeIndex;
-        QModelIndex lastChangeIndex;
-
-        for (auto entityId : m_entityChangeQueue)
-        {
-            auto myIndex = GetIndexFromEntity(entityId, ColumnName);
-            if ((!firstChangeIndex.isValid())||(firstChangeIndex.row() > myIndex.row()))
-            {
-                firstChangeIndex = myIndex;
-            }
-            
-            if ((!lastChangeIndex.isValid())||(lastChangeIndex.row() < myIndex.row()))
-            {
-                // expand it to be the last column:
-                lastChangeIndex = myIndex;
-            }
-        }
-
-        if (firstChangeIndex.isValid())
-        {
-            // expand to cover all visible columns:
-            lastChangeIndex = createIndex(lastChangeIndex.row(), VisibleColumnCount - 1, lastChangeIndex.internalPointer());
-            emit dataChanged(firstChangeIndex, lastChangeIndex);
-        }
-        
-        m_entityChangeQueue.clear();
-    }
-
-    {
-        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:LayoutChanged");
-        if (m_entityLayoutQueued)
-        {
-            emit layoutAboutToBeChanged();
-            emit layoutChanged();
-        }
-        m_entityLayoutQueued = false;
-    }
-
-    {
-        AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::Editor, "OutlinerListModel::ProcessEntityUpdates:InvalidateFilter");
-        if (m_isFilterDirty)
-        {
-            InvalidateFilter();
-        }
-    }
-}
-
-void OutlinerListModel::OnEntityInfoResetBegin()
-{
-    emit EnableSelectionUpdates(false);
-    beginResetModel();
-}
-
-void OutlinerListModel::OnEntityInfoResetEnd()
-{
-    m_layoutResetQueued = true;
-    endResetModel();
-    QTimer::singleShot(0, this, &OutlinerListModel::ProcessEntityInfoResetEnd);
-}
-
-void OutlinerListModel::ProcessEntityInfoResetEnd()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    m_layoutResetQueued = false;
-    m_entityChangeQueued = false;
-    m_entityChangeQueue.clear();
-    QueueEntityUpdate(AZ::EntityId());
-    emit EnableSelectionUpdates(true);
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedAddChildBegin(AZ::EntityId parentId, AZ::EntityId childId)
-{
-    //add/remove operations trigger selection change signals which assert and break undo/redo operations in progress in inspector etc.
-    //so disallow selection updates until change is complete
-    emit EnableSelectionUpdates(false);
-    auto parentIndex = GetIndexFromEntity(parentId);
-    auto childIndex = GetIndexFromEntity(childId);
-    beginInsertRows(parentIndex, childIndex.row(), childIndex.row());
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedAddChildEnd(AZ::EntityId parentId, AZ::EntityId childId)
-{
-    (void)parentId;
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    endInsertRows();
-
-    //expand ancestors if a new descendant is already selected
-    if ((AzToolsFramework::IsSelected(childId) || HasSelectedDescendant(childId)) && !m_dropOperationInProgress)
-    {
-        ExpandAncestors(childId);
-    }
-
-    //restore selection and expansion state for previously registered entity ids (for the view/model only)
-    RestoreDescendantSelection(childId);
-    RestoreDescendantExpansion(childId);
-
-    //must refresh partial lock/visibility of parents
-    m_isFilterDirty = true;
-    QueueAncestorUpdate(childId);
-    emit EnableSelectionUpdates(true);
-}
-
-void OutlinerListModel::OnEntityRuntimeActivationChanged(AZ::EntityId entityId, bool activeOnStart)
-{
-    AZ_UNUSED(activeOnStart);
-    QueueEntityUpdate(entityId);
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedRemoveChildBegin(AZ::EntityId parentId, AZ::EntityId childId)
-{
-    //add/remove operations trigger selection change signals which assert and break undo/redo operations in progress in inspector etc.
-    //so disallow selection updates until change is complete
-    emit EnableSelectionUpdates(false);
-    auto parentIndex = GetIndexFromEntity(parentId);
-    auto childIndex = GetIndexFromEntity(childId);
-    beginResetModel();
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedRemoveChildEnd(AZ::EntityId parentId, AZ::EntityId childId)
-{
-    (void)childId;
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-    endResetModel();
-
-    //must refresh partial lock/visibility of parents
-    m_isFilterDirty = true;
-    QueueAncestorUpdate(parentId);
-    emit EnableSelectionUpdates(true);
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedOrderBegin(AZ::EntityId parentId, AZ::EntityId childId, AZ::u64 index)
-{
-    (void)parentId;
-    (void)childId;
-    (void)index;
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedOrderEnd(AZ::EntityId parentId, AZ::EntityId childId, AZ::u64 index)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    (void)index;
-    m_entityLayoutQueued = true;
-    QueueEntityUpdate(parentId);
-    QueueEntityUpdate(childId);
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedSelection(AZ::EntityId entityId, bool selected)
-{
-    //update all ancestors because they will show highlight if ancestor is selected
-    QueueAncestorUpdate(entityId);
-
-    //expand ancestors upon new selection
-    if (selected && m_autoExpandEnabled)
-    {
-        ExpandAncestors(entityId);
-    }
-
-    //notify observers
-    emit SelectEntity(entityId, selected);
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedLocked(AZ::EntityId entityId, bool /*locked*/)
-{
-    //update all ancestors because they will show partial state for descendants
-    QueueEntityUpdate(entityId);
-    QueueAncestorUpdate(entityId);
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedVisibility(AZ::EntityId entityId, bool /*visible*/)
-{
-    //update all ancestors because they will show partial state for descendants
-    QueueEntityUpdate(entityId);
-    QueueAncestorUpdate(entityId);
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedName(AZ::EntityId entityId, const AZStd::string& name)
-{
-    (void)name;
-    QueueEntityUpdate(entityId);
-
-    bool isSelected = false;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-        isSelected, &AzToolsFramework::ToolsApplicationRequests::IsSelected, entityId);
-
-    if (isSelected)
-    {
-        // Ask the system to scroll to the entity in case it is off screen after the rename
-        OutlinerModelNotificationBus::Broadcast(&OutlinerModelNotifications::QueueScrollToNewContent, entityId);
-    }
-}
-
-void OutlinerListModel::OnEntityInfoUpdatedUnsavedChanges(AZ::EntityId entityId)
-{
-    QueueEntityUpdate(entityId);
-}
-
-void OutlinerListModel::OnEntityInfoUpdateSliceOwnership(AZ::EntityId entityId)
-{
-    QueueEntityUpdate(entityId);
-}
-
-QString OutlinerListModel::GetSliceAssetName(const AZ::EntityId& entityId) const
-{
-    AZStd::string sliceAssetName;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(sliceAssetName, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetSliceAssetName);
-    return QString(sliceAssetName.data());
-}
-
-QModelIndex OutlinerListModel::GetIndexFromEntity(const AZ::EntityId& entityId, int column) const
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-    if (entityId.IsValid())
-    {
-        AZ::EntityId parentId;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-
-        AZStd::size_t row = 0;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(row, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildIndex, entityId);
-        return createIndex(static_cast<int>(row), column, static_cast<AZ::u64>(entityId));
-    }
-
-    return QModelIndex();
-}
-
-AZ::EntityId OutlinerListModel::GetEntityFromIndex(const QModelIndex& index) const
-{
-    return index.isValid() ? AZ::EntityId(static_cast<AZ::u64>(index.internalId())) : AZ::EntityId();
-}
-
-void OutlinerListModel::SearchStringChanged(const AZStd::string& filter)
-{
-    m_isFilterDirty = true;
-    if (filter.size() > 0)
-    {
-        CacheSelectionIfAppropriate();
-    }
-
-    m_filterString = filter;
-    InvalidateFilter();
-
-    RestoreSelectionIfAppropriate();
-}
-
-void OutlinerListModel::SearchFilterChanged(const AZStd::vector<ComponentTypeValue>& componentFilters)
-{
-    m_isFilterDirty = true;
-    if (componentFilters.size() > 0)
-    {
-        CacheSelectionIfAppropriate();
-    }
-
-    m_componentFilters = AZStd::move(componentFilters);
-    InvalidateFilter();
-
-    RestoreSelectionIfAppropriate();
-}
-
-bool OutlinerListModel::ShouldOverrideUnfilteredSelection()
-{
-    AzToolsFramework::EntityIdList currentSelection;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(currentSelection, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-
-    // If new selection is greater, then we need to override
-    if (currentSelection.size() > m_unfilteredSelectionEntityIds.size())
-    {
-        return true;
-    }
-
-    for (auto& entityId : currentSelection)
-    {
-        // If one element in the current selection doesn't exist in our unfiltered selection, we need to override with the new selection
-        auto it = AZStd::find(m_unfilteredSelectionEntityIds.begin(), m_unfilteredSelectionEntityIds.end(), entityId);
-        if (it == m_unfilteredSelectionEntityIds.end())
-        {
-            return true;
-        }
-    }
-
-    if (currentSelection.empty())
-    {
-        for (auto& entityId : m_unfilteredSelectionEntityIds)
-        {
-            // If any of the entities are visible, then the user must have forcibly cleared selection
-            if (!IsFiltered(entityId))
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-void OutlinerListModel::CacheSelectionIfAppropriate()
-{
-    if (ShouldOverrideUnfilteredSelection())
-    {
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(m_unfilteredSelectionEntityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-    }
-}
-
-void OutlinerListModel::RestoreSelectionIfAppropriate()
-{
-    if (m_unfilteredSelectionEntityIds.size() > 0)
-    {
-        // Store these in a temp list so it doesn't get cleared mid-loop by external logic
-        AzToolsFramework::EntityIdList tempList = m_unfilteredSelectionEntityIds;
-
-        for (auto& entityId : tempList)
-        {
-            if (!IsFiltered(entityId))
-            {
-                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::MarkEntitySelected, entityId);
-            }
-        }
-
-        m_unfilteredSelectionEntityIds = tempList;
-    }
-
-    if (m_unfilteredSelectionEntityIds.size() > 0 && m_componentFilters.size() == 0 && m_filterString.size() == 0)
-    {
-        m_unfilteredSelectionEntityIds.clear();
-    }
-}
-
-void OutlinerListModel::AfterEntitySelectionChanged(const AzToolsFramework::EntityIdList&, const AzToolsFramework::EntityIdList&)
-{
-    if (m_unfilteredSelectionEntityIds.size() > 0)
-    {
-        if (ShouldOverrideUnfilteredSelection())
-        {
-            m_unfilteredSelectionEntityIds.clear();
-        }
-    }
-}
-
-void OutlinerListModel::OnEntityExpanded(const AZ::EntityId& entityId)
-{
-    m_isFilterDirty = true;
-    m_entityExpansionState[entityId] = true;
-    QueueEntityUpdate(entityId);
-}
-
-void OutlinerListModel::OnEntityCollapsed(const AZ::EntityId& entityId)
-{
-    m_isFilterDirty = true;
-    m_entityExpansionState[entityId] = false;
-    QueueEntityUpdate(entityId);
-}
-
-void OutlinerListModel::InvalidateFilter()
-{
-    FilterEntity(AZ::EntityId());
-
-    // Emit data changed directly as it is immediately valid
-    auto modelIndex = GetIndexFromEntity(AZ::EntityId());
-    if (modelIndex.isValid())
-    {
-        emit dataChanged(modelIndex, modelIndex, { VisibilityRole });
-    }
-    m_isFilterDirty = false;
-}
-
-void OutlinerListModel::OnEditorEntityDuplicated(const AZ::EntityId& oldEntity, const AZ::EntityId& newEntity)
-{
-    AZStd::list_iterator<AZStd::pair<AZ::EntityId, bool>> expansionIter = m_entityExpansionState.find(oldEntity);
-    QueueEntityToExpand(newEntity, expansionIter != m_entityExpansionState.end() && expansionIter->second);
-}
-
-void OutlinerListModel::ExpandAncestors(const AZ::EntityId& entityId)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    //typically to reveal selected entities, expand all parent entities
-    if (entityId.IsValid())
-    {
-        AZ::EntityId parentId;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-        QueueEntityToExpand(parentId, true);
-        ExpandAncestors(parentId);
-    }
-}
-
-bool OutlinerListModel::IsExpanded(const AZ::EntityId& entityId) const
-{
-    auto expandedItr = m_entityExpansionState.find(entityId);
-    return expandedItr != m_entityExpansionState.end() && expandedItr->second;
-}
-
-void OutlinerListModel::RestoreDescendantExpansion(const AZ::EntityId& entityId)
-{
-    //re-expand/collapse entities in the model that may have been previously removed or rearranged, resulting in new model indices
-    if (entityId.IsValid())
-    {
-        QueueEntityToExpand(entityId, IsExpanded(entityId));
-
-        AzToolsFramework::EntityIdList children;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
-        for (auto childId : children)
-        {
-            RestoreDescendantExpansion(childId);
-        }
-    }
-}
-
-void OutlinerListModel::RestoreDescendantSelection(const AZ::EntityId& entityId)
-{
-    //re-select entities in the model that may have been previously removed or rearranged, resulting in new model indices
-    if (entityId.IsValid())
-    {
-        m_entitySelectQueue.insert(entityId);
-        QueueEntityUpdate(entityId);
-
-        AzToolsFramework::EntityIdList children;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
-        for (auto childId : children)
-        {
-            RestoreDescendantSelection(childId);
-        }
-    }
-}
-
-bool OutlinerListModel::FilterEntity(const AZ::EntityId& entityId)
-{
-    bool isFilterMatch = true;
-
-    if (m_filterString.size() > 0)
-    {
-        AZStd::string name;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(name, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetName);
-
-        if (AzFramework::StringFunc::Find(name.c_str(), m_filterString.c_str()) == AZStd::string::npos
-            && AZStd::to_string(static_cast<AZ::u64>(entityId)) != m_filterString)
-        {
-            isFilterMatch = false;
-        }
-        else
-        {
-            QueueEntityUpdate(entityId);
-        }
-    }
-
-    int numberOfGlobalFlags = 0;
-    // First check if any of the global flags are valid
-    if (isFilterMatch && m_componentFilters.size() > 0)
-    {
-        int globalFlags = 0;
-
-        for (ComponentTypeValue& componentType : m_componentFilters)
-        {
-            if (componentType.m_globalVal >= 0)
-            {
-                switch (componentType.m_globalVal)
-                {
-                case 0:
-                    globalFlags |= static_cast<int>(GlobalSearchCriteriaFlags::Unlocked);
-                    break;
-                case 1:
-                    globalFlags |= static_cast<int>(GlobalSearchCriteriaFlags::Locked);
-                    break;
-                case 2:
-                    globalFlags |= static_cast<int>(GlobalSearchCriteriaFlags::Visible);
-                    break;
-                case 3:
-                    globalFlags |= static_cast<int>(GlobalSearchCriteriaFlags::Hidden);
-                    break;
-                }
-                ++numberOfGlobalFlags;
-            }
-        }
-        if ((globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Unlocked)) && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Locked)))
-        {
-            globalFlags &= (static_cast<int>(GlobalSearchCriteriaFlags::Visible) | static_cast<int>(GlobalSearchCriteriaFlags::Hidden));
-        }
-        if ((globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Visible)) && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Hidden)))
-        {
-            globalFlags &= (static_cast<int>(GlobalSearchCriteriaFlags::Unlocked) | static_cast<int>(GlobalSearchCriteriaFlags::Locked));
-        }
-        if (globalFlags)
-        {
-            bool visibleFlag = false;
-            AzToolsFramework::EditorVisibilityRequestBus::EventResult(visibleFlag, entityId, &AzToolsFramework::EditorVisibilityRequests::GetVisibilityFlag);
-            if (visibleFlag && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Hidden)))
-            {
-                isFilterMatch = false;
-            }
-            if (!visibleFlag && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Visible)))
-            {
-                isFilterMatch = false;
-            }
-            bool isLocked = false;
-            AzToolsFramework::EditorLockComponentRequestBus::EventResult(isLocked, entityId, &AzToolsFramework::EditorLockComponentRequests::GetLocked);
-            if (isLocked && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Unlocked)))
-            {
-                isFilterMatch = false;
-            }
-            if (!isLocked && (globalFlags & static_cast<int>(GlobalSearchCriteriaFlags::Locked)))
-            {
-                isFilterMatch = false;
-            }
-        }
-    }
-
-    // If we matched the filter string and have any component filters, make sure we match those too
-    if (isFilterMatch && m_componentFilters.size() > numberOfGlobalFlags)
-    {
-        bool hasMatchingComponent = false;
-
-        for (ComponentTypeValue& componentType : m_componentFilters)
-        {
-            if (componentType.m_globalVal < 0)
-            {
-            if (AzToolsFramework::EntityHasComponentOfType(entityId, componentType.m_uuid, true, true))
-                {
-                    hasMatchingComponent = true;
-                    break;
-                }
-            }
-        }
-
-        isFilterMatch &= hasMatchingComponent;
-    }
-
-    AzToolsFramework::EntityIdList children;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
-    for (auto childId : children)
-    {
-        isFilterMatch |= FilterEntity(childId);
-    }
-
-    // If we now match the filter and we previously didn't and we're set in an expanded state
-    // we need to queue an expand again so that the treeview state matches our internal saved state
-    if (isFilterMatch && m_entityFilteredState[entityId] && IsExpanded(entityId))
-    {
-        QueueEntityToExpand(entityId, true);
-    }
-
-    m_entityFilteredState[entityId] = !isFilterMatch;
-
-    return isFilterMatch;
-}
-
-bool OutlinerListModel::IsFiltered(const AZ::EntityId& entityId) const
-{
-    auto hiddenItr = m_entityFilteredState.find(entityId);
-    return hiddenItr != m_entityFilteredState.end() && hiddenItr->second;
-}
-
-void OutlinerListModel::EnableAutoExpand(bool enable)
-{
-    m_autoExpandEnabled = enable;
-}
-
-void OutlinerListModel::SetDropOperationInProgress(bool inProgress)
-{
-    m_dropOperationInProgress = inProgress;
-}
-
-bool OutlinerListModel::HasSelectedDescendant(const AZ::EntityId& entityId) const
-{
-    //TODO result can be cached in mutable map and cleared when any descendant changes to avoid recursion in deep hierarchies
-    AzToolsFramework::EntityIdList children;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
-    for (auto childId : children)
-    {
-        bool isSelected = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isSelected, childId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSelected);
-        if (isSelected || HasSelectedDescendant(childId))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool OutlinerListModel::AreAllDescendantsSameLockState(const AZ::EntityId& entityId) const
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    //TODO result can be cached in mutable map and cleared when any descendant changes to avoid recursion in deep hierarchies
-    bool isLocked = false;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isLocked, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsJustThisEntityLocked);
-
-    AzToolsFramework::EntityIdList children;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
-    for (auto childId : children)
-    {
-        bool isLockedChild = false;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(isLockedChild, childId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsJustThisEntityLocked);
-        if (isLocked != isLockedChild || !AreAllDescendantsSameLockState(childId))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-bool OutlinerListModel::AreAllDescendantsSameVisibleState(const AZ::EntityId& entityId) const
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    //TODO result can be cached in mutable map and cleared when any descendant changes to avoid recursion in deep hierarchies
-
-    bool isVisible = AzToolsFramework::IsEntitySetToBeVisible(entityId);
-
-    AzToolsFramework::EntityIdList children;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(children, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetChildren);
-    for (auto childId : children)
-    {
-        bool isVisibleChild = AzToolsFramework::IsEntitySetToBeVisible(childId);
-        if (isVisible != isVisibleChild || !AreAllDescendantsSameVisibleState(childId))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-bool OutlinerListModel::IsInLayerWithProperty(AZ::EntityId entityId, const LayerProperty& layerProperty) const
-{
-    while (entityId.IsValid())
-    {
-        AZ::EntityId parentId;
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-            parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-
-        bool isParentLayer = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            isParentLayer,
-            parentId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-
-        if (isParentLayer)
-        {
-            if (layerProperty == LayerProperty::Locked)
-            {
-                bool isParentLayerLocked = false;
-                AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-                    isParentLayerLocked, parentId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsJustThisEntityLocked);
-                if (isParentLayerLocked)
-                {
-                    return true;
-                }
-                // If this layer wasn't locked, keep checking the hierarchy, a layer above this one may be locked.
-            }
-            else if (layerProperty == LayerProperty::Invisible)
-            {
-                bool isParentVisible = AzToolsFramework::IsEntitySetToBeVisible(parentId);
-                if (!isParentVisible)
-                {
-                    return true;
-                }
-                // If this layer was visible, keep checking the hierarchy, a layer above this one may be invisible.
-            }
-        }
-
-        entityId = parentId;
-    }
-    return false;
-}
-
-void OutlinerListModel::OnEntityInitialized(const AZ::EntityId& entityId)
-{
-    bool isEditorEntity = false;
-    AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, entityId);
-    if (!isEditorEntity)
-    {
-        return;
-    }
-
-    if (!m_beginStartPlayInEditor && (m_filterString.size() > 0 || m_componentFilters.size() > 0))
-    {
-        m_isFilterDirty = true;
-        emit ReapplyFilter();
-    }
-}
-
-void OutlinerListModel::OnEntityCompositionChanged(const AzToolsFramework::EntityIdList& /*entityIds*/)
-{
-    if (m_componentFilters.size() > 0)
-    {
-        m_isFilterDirty = true;
-        emit ReapplyFilter();
-    }
-}
-
-void OutlinerListModel::OnContextReset()
-{
-    if (m_filterString.size() > 0 || m_componentFilters.size() > 0)
-    {
-        m_isFilterDirty = true;
-        emit ResetFilter();
-    }
-}
-
-void OutlinerListModel::OnStartPlayInEditorBegin()
-{
-    m_beginStartPlayInEditor = true;
-}
-
-void OutlinerListModel::OnStartPlayInEditor()
-{
-    m_beginStartPlayInEditor = false;
-}
-
-////////////////////////////////////////////////////////////////////////////
-// OutlinerItemDelegate
-////////////////////////////////////////////////////////////////////////////
-OutlinerItemDelegate::OutlinerItemDelegate(QWidget* parent)
-    : QStyledItemDelegate(parent)
-    , m_visibilityCheckBoxes(parent, "Visibility", OutlinerListModel::PartiallyVisibleRole, OutlinerListModel::InInvisibleLayerRole)
-    , m_lockCheckBoxes(parent, "Lock", OutlinerListModel::PartiallyLockedRole, OutlinerListModel::InLockedLayerRole)
-{
-}
-
-void OutlinerItemDelegate::DrawLayerStripeAndBorder(QPainter* painter, int stripeX, int top, int bottom, QColor layerBorderColor, QColor layerColor) const
-{
-    if (!painter)
-    {
-        return;
-    }
-    painter->save();
-    painter->setRenderHint(QPainter::Antialiasing, false);
-    QPen layerPen;
-    layerPen.setWidthF(OutlinerListModel::GetLayerStripeWidth());
-    layerPen.setColor(layerBorderColor);
-    painter->setPen(layerPen);
-
-    QLine layerStripeLine(stripeX, top, stripeX, bottom);
-    painter->drawLine(layerStripeLine);
-
-    layerPen.setColor(layerColor);
-    // Draw the line a little taller so it connects to the top of the layer
-    layerStripeLine.translate(OutlinerListModel::GetLayerStripeWidth(), 0);
-    painter->setPen(layerPen);
-    painter->drawLine(layerStripeLine);
-
-    painter->restore();
-}
-
-void OutlinerItemDelegate::DrawLayerUI(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index,
-const AZ::EntityId& entityId, bool isSelected, bool isHovered) const
-{
-    if (!painter)
-    {
-        return;
-    }
-
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-    QColor layerColor;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        layerColor,
-        entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::GetLayerColor);
-
-    const QTreeView* outlinerTreeView(qobject_cast<const QTreeView*>(option.widget));
-    int indentation = outlinerTreeView->indentation();
-
-    bool isFirstColumn = index.column() == OutlinerListModel::ColumnName;
-    bool hasVisibleChildren = index.data(OutlinerListModel::ExpandedRole).value<bool>() && index.model()->hasChildren(index);
-
-    if (isLayerEntity && isFirstColumn)
-    {
-        DrawLayerStripeAndBorder(
-            painter,
-            option.rect.left(),
-            option.rect.top(),
-            option.rect.bottom(),
-            m_outlinerConfig.layerBorderBottomColor,
-            layerColor);
-    }
-
-    bool isInLayer = false;
-
-    // Start by assuming this row is the last in a layer, because it's easier to check if it's not the last in the layer.
-    bool continueCheckingLastInLayer = true;
-    QModelIndex lastInLayerIndex(index);
-    int indentationIfLastInLayer = 0;
-
-    QModelIndex nameColumn = index.sibling(index.row(), OutlinerListModel::Column::ColumnName);
-    QModelIndex sibling = index.sibling(index.row() + 1, index.column());
-
-    // This row can't be the last in a layer if it has children and is expanded.
-    if (index.model()->hasChildren(nameColumn) && nameColumn.data(OutlinerListModel::ExpandedRole).value<bool>())
-    {
-        continueCheckingLastInLayer = false;
-        lastInLayerIndex = QModelIndex();
-    }
-    else if (sibling.isValid())
-    {
-        // If the entity is a layer and has a sibling, but did not have children it's the last entity in the layer.
-        continueCheckingLastInLayer = false;
-        if (!isLayerEntity)
-        {
-            // If this entity has a sibling in the next row and isn't a layer itself, then it can't be the last entity in a layer.
-            lastInLayerIndex = QModelIndex();
-        }
-    }
-
-    int ancestorIndentation = 0;
-    QModelIndex previousAncestor = index;
-
-    for (QModelIndex ancestorIndex = index.parent(); ancestorIndex.isValid(); ancestorIndex = ancestorIndex.parent())
-    {
-        ancestorIndentation -= indentation;
-        OutlinerListModel::EntryType ancestorEntryType =
-            OutlinerListModel::EntryType(ancestorIndex.data(OutlinerListModel::EntityTypeRole).value<int>());
-        if (ancestorEntryType == OutlinerListModel::LayerType && !isInLayer)
-        {
-            isInLayer = true;
-        }
-
-        if (continueCheckingLastInLayer && ancestorEntryType == OutlinerListModel::LayerType)
-        {
-            // If this ancestor is a layer, and our previous ancestor does not have a sibling, then the index is the last in the layer.
-            indentationIfLastInLayer = ancestorIndentation;
-            QModelIndex previousAncestorSibling = previousAncestor.sibling(previousAncestor.row() + 1, previousAncestor.column());
-            if (previousAncestorSibling.isValid())
-            {
-                lastInLayerIndex = QModelIndex();
-            }
-        }
-
-        if (isInLayer)
-        {
-            continueCheckingLastInLayer = false;
-        }
-
-        if (ancestorEntryType == OutlinerListModel::LayerType && isFirstColumn)
-        {
-            QColor ancestorLayerColor = ancestorIndex.data(OutlinerListModel::LayerColorRole).value<QColor>();
-            int stripeX = option.rect.left() + ancestorIndentation;
-            DrawLayerStripeAndBorder(
-                painter,
-                stripeX,
-                option.rect.top() - m_layerDividerLineHeight,
-                option.rect.bottom(),
-                m_outlinerConfig.layerBorderBottomColor,
-                ancestorLayerColor);
-        }
-
-        previousAncestor = ancestorIndex;
-    }
-    // If this entity is the last entity in a layer at the root of the outliner, but is not a root entity itself,
-    // then adjust the indentation one more time for that.
-    if (continueCheckingLastInLayer && index.parent().isValid())
-    {
-        indentationIfLastInLayer -= indentation;
-    }
-
-    const bool isLayerOrInLayer = isLayerEntity || isInLayer;
-
-    if (isLayerOrInLayer)
-    {
-        painter->save();
-        painter->setRenderHint(QPainter::Antialiasing, false);
-
-        QPainterPath layerBGPath;
-        QRect layerBGRect(option.rect);
-        if (isFirstColumn && isLayerEntity)
-        {
-            layerBGRect.setLeft(layerBGRect.left() + indentation + OutlinerListModel::GetLayerStripeWidth());
-        }
-        layerBGPath.addRect(layerBGRect);
-        QColor layerBG = isLayerEntity ? m_outlinerConfig.layerBGColor : m_outlinerConfig.layerChildBGColor;
-        if (isSelected)
-        {
-            layerBG = m_outlinerConfig.selectedLayerBGColor;
-        }
-        else if (isHovered)
-        {
-            layerBG = m_outlinerConfig.hoveredLayerBGColor;
-        }
-        painter->fillPath(layerBGPath, layerBG);
-
-        QPoint lineBottomLeft(option.rect.bottomLeft());
-        if (isLayerEntity)
-        {
-            QPoint lineTopLeft(option.rect.topLeft());
-
-            if (isFirstColumn)
-            {
-                lineTopLeft.setX(lineTopLeft.x() + OutlinerListModel::GetLayerStripeWidth());
-            }
-            QPen topLinePen(m_outlinerConfig.layerBorderTopColor, m_layerDividerLineHeight);
-            painter->setPen(topLinePen);
-            painter->drawLine(lineTopLeft, option.rect.topRight());
-        }
-        // Each layer entity has a line drawn on the bottom, and the last entity in the layer has the same line drawn.
-        if (isLayerEntity || lastInLayerIndex.isValid())
-        {
-            if (isFirstColumn)
-            {
-                lineBottomLeft.setX(lineBottomLeft.x() + indentationIfLastInLayer);
-                // Leave room for the 2 layer stripes on the first child to connect to the layer box.
-                if (hasVisibleChildren)
-                {
-                    lineBottomLeft.setX(lineBottomLeft.x() + OutlinerListModel::GetLayerStripeWidth());
-                }
-                else if (!isLayerEntity)
-                {
-                    // Ensure that the bottom line closes all containing layers.
-                    lineBottomLeft.setX(lineBottomLeft.x() + ancestorIndentation + indentation);
-                }
-            }
-            int dividerLineHeight = m_layerDividerLineHeight;
-            QPen bottomLinePen(m_outlinerConfig.layerBorderBottomColor, dividerLineHeight);
-            painter->setPen(bottomLinePen);
-            painter->drawLine(lineBottomLeft, option.rect.bottomRight());
-        }
-
-        painter->restore();
-    }
-}
-
-QString OutlinerItemDelegate::GetLayerInfoString(const AZ::EntityId& entityId) const
-{
-    QString result;
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-    if (!isLayerEntity)
-    {
-        return result;
-    }
-
-    bool hasUnsavedLayerChanges = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        hasUnsavedLayerChanges,
-        entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasUnsavedChanges);
-
-    if (hasUnsavedLayerChanges)
-    {
-        result = QObject::tr("*");
-    }
-
-    bool isLayerNameValid = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerNameValid,
-        entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::IsLayerNameValid);
-
-    if (!isLayerNameValid)
-    {
-        result = QObject::tr("<font color=\"red\">(!)</font> %1").arg(result);
-    }
-
-    return result;
-}
-
-int OutlinerItemDelegate::GetEntityNameVerticalOffset(const AZ::EntityId& entityId) const
-{
-    // Start with a slight offset so that the entity name better aligns to the middle of the row.
-    // The default vertical alignment ends up looking a little low on the row.
-    const int entityNameOffset = -1;
-    bool isLayerEntity = false;
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity,
-        entityId,
-        &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-    if (!isLayerEntity)
-    {
-        return entityNameOffset;
-    }
-    // Layers draw a divider over the bottom of the row, so adjust the text rect to account for that.
-    return -m_layerDividerLineHeight + entityNameOffset;
-}
-
-OutlinerItemDelegate::CheckboxGroup::CheckboxGroup(QWidget* parent, AZStd::string prefix, const OutlinerListModel::Roles mixedRole, const OutlinerListModel::Roles layerRole)
-    : m_default(parent)
-    , m_mixed(parent)
-    , m_layerOverride(parent)
-    , m_defaultHover(parent)
-    , m_mixedHover(parent)
-    , m_layerOverrideHover(parent)
-    , m_mixedRole(mixedRole)
-    , m_layerRole(layerRole)
-{
-    m_default.setObjectName(prefix.data());
-    m_mixed.setObjectName((prefix + "Mixed").data());
-    m_layerOverride.setObjectName((prefix + "LayerOverride").data());
-
-    m_defaultHover.setObjectName((prefix + "Hover").data());
-    m_mixedHover.setObjectName((prefix + "MixedHover").data());
-    m_layerOverrideHover.setObjectName((prefix + "LayerOverrideHover").data());
-}
-
-OutlinerCheckBox* OutlinerItemDelegate::CheckboxGroup::SelectCheckboxToRender(const QModelIndex& index, bool isHovered)
-{
-    // LayerOverride
-    if (index.data(m_layerRole).value<bool>())
-    {
-        if (isHovered)
-        {
-            return &m_layerOverrideHover;
-        }
-        else
-        {
-            return &m_layerOverride;
-        }
-    }
-    // Mixed
-    else if (index.data(m_mixedRole).value<bool>())
-    {
-        if (isHovered)
-        {
-            return &m_mixedHover;
-        }
-        else
-        {
-            return &m_mixed;
-        }
-    }
-    //Default
-    if (isHovered)
-    {
-        return &m_defaultHover;
-    }
-    else
-    {
-        return &m_default;
-    }
-}
-
-void OutlinerItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-    bool entityHasOverrides = false, childrenHaveOverrides = false, isSliceEntity = false, isLayerEntity = false;
-
-    AZ::EntityId entityId(index.data(OutlinerListModel::EntityIdRole).value<AZ::u64>());
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-        isSliceEntity, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsSliceEntity);
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-        entityHasOverrides, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceEntityOverrides);
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
-        childrenHaveOverrides, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::HasSliceChildrenOverrides);
-    AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-        isLayerEntity, entityId, &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-
-    const bool sliceHasOverrides = (entityHasOverrides || childrenHaveOverrides);
-
-    const bool isSelected = (option.state & QStyle::State_Selected);
-    const bool isHovered = (option.state & QStyle::State_MouseOver) && (option.state & QStyle::State_Enabled);
-    if (isSelected || isHovered)
-    {
-        bool selectedOrHoveredIsLayerEntity = false;
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-            selectedOrHoveredIsLayerEntity,
-            entityId,
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-
-        QRect selectionRect = option.rect;
-        if (selectedOrHoveredIsLayerEntity && index.column() == OutlinerListModel::ColumnName)
-        {
-            selectionRect.setLeft(selectionRect.left() + OutlinerTreeView::GetLayerSquareSize());
-        }
-
-        QPainterPath path;
-        path.addRect(option.rect);
-        if (isSelected)
-        {
-            painter->fillPath(path, m_outlinerConfig.outlinerSelectionColor);
-        }
-        else
-        {
-            painter->fillPath(path, m_outlinerConfig.outlinerHoverColor);
-        }
-    }
-
-    DrawLayerUI(painter, option, index, entityId, isSelected, isHovered);
-
-    QPalette checkboxPalette;
-    QColor transparentColor(0, 0, 0, 0);
-    checkboxPalette.setColor(QPalette::Window, transparentColor);
-
-    const bool isSliceRoot = index.data(OutlinerListModel::SliceBackgroundRole).value<bool>();
-    const int slicePillCornerRadius = 4;
-
-    // We're only using these check boxes as renderers so their actual state doesn't matter.
-    // We can set it right before we draw using information from the model data.
-    if (index.column() == OutlinerListModel::ColumnVisibilityToggle)
-    {
-        painter->save();
-        painter->translate(option.rect.topLeft());
-
-        OutlinerCheckBox* checkboxToRender = m_visibilityCheckBoxes.SelectCheckboxToRender(index, isHovered);
-        checkboxToRender->setChecked(index.data(Qt::CheckStateRole).value<Qt::CheckState>() == Qt::Checked);
-        checkboxToRender->setPalette(checkboxPalette);
-        checkboxToRender->render(painter);
-
-        painter->restore();
-        return;
-    }
-
-    if (index.column() == OutlinerListModel::ColumnLockToggle)
-    {
-        painter->save();
-        painter->translate(option.rect.topLeft());
-
-        OutlinerCheckBox* checkboxToRender = m_lockCheckBoxes.SelectCheckboxToRender(index, isHovered);
-        checkboxToRender->setChecked(index.data(Qt::CheckStateRole).value<Qt::CheckState>() == Qt::Checked);
-        checkboxToRender->setPalette(checkboxPalette);
-        checkboxToRender->render(painter);
-
-        painter->restore();
-        return;
-    }
-
-    QStyleOptionViewItem customOptions{ option };
-    if (customOptions.state & QStyle::State_HasFocus)
-    {
-        //  Do not draw the focus rectangle in this column.
-        customOptions.state ^= QStyle::State_HasFocus;
-    }
-
-    auto backgroundBoxRect = option.rect;
-
-    backgroundBoxRect.setX(backgroundBoxRect.x() + 0.5);
-    backgroundBoxRect.setY(backgroundBoxRect.y() + 2.5);
-    backgroundBoxRect.setWidth(backgroundBoxRect.width() - 1.0);
-    backgroundBoxRect.setHeight(backgroundBoxRect.height() - 1.0);
-
-    const qreal sliceBorderHeight = 0.8f;
-
-    // Draw this Slice Handle Accent if the item is not selected before the
-    // entry is drawn.
-    if (!isSelected)
-    {
-        if (isSliceRoot)
-        {
-            painter->save();
-            painter->setRenderHint(QPainter::Antialiasing);
-            QPainterPath path;
-            path.addRoundedRect(backgroundBoxRect, slicePillCornerRadius, slicePillCornerRadius);
-            QPen pen(m_outlinerConfig.sliceRootBorderColor, 1);
-            painter->setPen(pen);
-            painter->fillPath(path, m_outlinerConfig.sliceRootBackgroundColor);
-            painter->restore();
-        }
-
-        // Draw a dashed line around any visible, collapsed entry in the outliner that has
-        // children underneath it currently selected.
-        if (!index.data(OutlinerListModel::ExpandedRole).template value<bool>()
-            && index.data(OutlinerListModel::ChildSelectedRole).template value<bool>())
-        {
-            QPainterPath path;
-
-            if (isSliceRoot)
-            {
-                path.addRoundedRect(backgroundBoxRect, slicePillCornerRadius, slicePillCornerRadius);
-            }
-            else
-            {
-                auto newRect = option.rect;
-                newRect.setHeight(newRect.height() - 1.0);
-                path.addRect(newRect);
-            }
-
-            // Get the foreground color of the current object to draw our sub-object-selected box
-            auto targetColor = index.data(Qt::ForegroundRole).value<QBrush>().color();
-            if (isSliceEntity)
-            {
-                targetColor = (sliceHasOverrides ? m_outlinerConfig.sliceOverrideColor : m_outlinerConfig.sliceEntityColor);
-            }
-            QPen pen(targetColor, 1);
-
-            // Alter the dash pattern available for better visual appeal
-            QVector<qreal> dashes;
-            dashes << 8 << 2;
-            pen.setStyle(Qt::PenStyle::DashLine);
-            pen.setDashPattern(dashes);
-
-            painter->save();
-            painter->setRenderHint(QPainter::Antialiasing);
-            painter->setPen(pen);
-            painter->drawPath(path);
-            painter->restore();
-        }
-    }
-    else
-    {
-        //draw slice root background
-        if (isSliceRoot)
-        {
-            painter->save();
-            painter->setRenderHint(QPainter::Antialiasing);
-            QPainterPath path;
-            path.addRoundedRect(backgroundBoxRect, 4, 4);
-            QPen pen(m_outlinerConfig.selectedSliceRootBorderColor, sliceBorderHeight);
-            painter->setPen(pen);
-            painter->fillPath(path, m_outlinerConfig.selectedSliceRootBackgroundColor);
-            painter->drawPath(path);
-            painter->restore();
-        }
-    }
-
-    if (index.column() == OutlinerListModel::ColumnName)
-    {
-        OutlinerListModel::s_paintingName = true;
-        // standard painter can't handle rich text so we have to handle it
-        painter->save();
-        painter->setRenderHint(QPainter::Antialiasing);
-
-#if (QT_VERSION < QT_VERSION_CHECK(5, 11, 0))
-        QStyleOptionViewItemV4 optionV4{ customOptions };
-#else
-        QStyleOptionViewItem optionV4{ customOptions };
-#endif
-        initStyleOption(&optionV4, index);
-        optionV4.state &= ~(QStyle::State_HasFocus | QStyle::State_Selected);
-
-        // get the rich text and save for later
-
-        QString layerInfoString = GetLayerInfoString(entityId);
-
-        QRect textRect = optionV4.widget->style()->proxy()->subElementRect(QStyle::SE_ItemViewItemText, &optionV4);
-
-        QRegularExpression htmlMarkupRegex("<[^>]*>");
-
-        // Start with the raw rich text for the entity name.
-        QString entityNameRichText = optionV4.text;
-
-        // If there is any HTML markup in the entity name, don't elide.
-        if (!htmlMarkupRegex.match(entityNameRichText).hasMatch())
-        {
-            QFontMetrics fontMetrics(optionV4.font);
-            int textWidthAvailable = textRect.width();
-            // Qt uses "..." for elide, but there doesn't seem to be a way to retrieve this exact string from Qt.
-            // Subtract the elide string from the width available, so it can actually appear.
-            textWidthAvailable -= fontMetrics.horizontalAdvance(QObject::tr("..."));
-            if (!layerInfoString.isEmpty())
-            {
-                // The layer info string includes HTML markup, which can cause an issue computing the width.
-                // The markup on the layer text is light (just color for now, may include italic or bold later), so
-                // an approximate width is computed by taking the width of the non-HTML portion of the string and padding it a bit.
-                QString htmlStripped = layerInfoString;
-                htmlStripped.remove(htmlMarkupRegex);
-                const float layerInfoPadding = 1.2f;
-                textWidthAvailable -= fontMetrics.horizontalAdvance(htmlStripped) * layerInfoPadding;
-            }
-
-            entityNameRichText = fontMetrics.elidedText(optionV4.text, Qt::TextElideMode::ElideRight, textWidthAvailable);
-        }
-
-        if (!layerInfoString.isEmpty())
-        {
-            entityNameRichText = QObject::tr("%1%2").arg(entityNameRichText).arg(layerInfoString);
-        }
-
-        // delete the text from the item so we can use the standard painter to draw the icon
-        optionV4.text.clear();
-        optionV4.widget->style()->drawControl(QStyle::CE_ItemViewItem, &optionV4, painter);
-
-        // Now we setup a Text Document so it can draw the rich text
-        QTextDocument textDoc;
-        textDoc.setDefaultFont(optionV4.font);
-        textDoc.setDefaultStyleSheet("body {color: white}");
-        textDoc.setHtml("<body>" + entityNameRichText + "</body>");
-        int verticalOffset = GetEntityNameVerticalOffset(entityId);
-        painter->translate(textRect.topLeft() + QPoint(0, verticalOffset));
-        textDoc.setTextWidth(textRect.width());
-        textDoc.drawContents(painter, QRectF(0, 0, textRect.width(), textRect.height()));
-
-        painter->restore();
-        OutlinerListModel::s_paintingName = false;
-    }
-    else
-    {
-        QStyledItemDelegate::paint(painter, customOptions, index);
-    }
-}
-
-QSize OutlinerItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-    // Get the height of a tall character...
-    // we do this only once per 'tick'
-    if (m_cachedBoundingRectOfTallCharacter.isNull())
-    {
-        m_cachedBoundingRectOfTallCharacter = option.fontMetrics.boundingRect("|");
-        // schedule it to be reset so that if font changes sometime soon, it updates.
-        auto resetFunction = [this]() 
-        { 
-            m_cachedBoundingRectOfTallCharacter = QRect(); 
-        };
-
-        QTimer::singleShot(0, resetFunction);
-    }
-  
-    // And add 8 to it gives the outliner roughly the visible spacing we're looking for.
-    QSize sh = QSize(0, m_cachedBoundingRectOfTallCharacter.height() + OutlinerListModel::s_OutlinerSpacing);
-
-    if (index.column() == OutlinerListModel::ColumnVisibilityToggle || index.column() == OutlinerListModel::ColumnLockToggle)
-    {
-        sh.setWidth(m_toggleColumnWidth);
-    }
-
-    return sh;
-}
-
-bool OutlinerItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index)
-{
-    if (event->type() == QEvent::MouseButtonPress &&
-        (index.column() == OutlinerListModel::Column::ColumnVisibilityToggle || index.column() == OutlinerListModel::Column::ColumnLockToggle))
-    {
-        // Do not propagate click to TreeView if the user clicks the visibility or lock toggles
-        // This prevents selection from changing if a toggle is clicked
-        return true;
-    }
-
-    return QStyledItemDelegate::editorEvent(event, model, option, index);
-}
-
-OutlinerCheckBox::OutlinerCheckBox(QWidget* parent)
-    : QCheckBox(parent)
-{
-    ensurePolished();
-    hide();
-}
-
-void OutlinerCheckBox::draw(QPainter* painter)
-{
-    QStyleOptionButton opt;
-    initStyleOption(&opt);
-    opt.rect.setWidth(m_toggleColumnWidth);
-    style()->drawControl(QStyle::CE_CheckBox, &opt, painter, this);
-}
-
-#include <UI/Outliner/moc_OutlinerListModel.cpp>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.hxx b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.hxx
deleted file mode 100644
index 77b9cbeca0..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.hxx
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef OUTLINER_VIEW_MODEL_H
-#define OUTLINER_VIEW_MODEL_H
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/base.h>
-
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QStyledItemDelegate>
-#include <QtWidgets/QCheckBox>
-#include <QtCore/QRect>
-
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/Component/EntityBus.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.hxx>
-#include "OutlinerSearchWidget.h"
-
-#include <AzToolsFramework/ToolsComponents/EditorLockComponentBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/API/EntityCompositionNotificationBus.h>
-#include <AzToolsFramework/Entity/EditorEntityRuntimeActivationBus.h>
-#endif
-
-#pragma once
-
-namespace EntityOutliner
-{
-    enum class DisplaySortMode : unsigned char;
-}
-
-//! Model for items in the OutlinerTreeView.
-//! Each item represents an Entity.
-//! Items are parented in the tree according to their transform hierarchy.
-class OutlinerListModel
-    : public QAbstractItemModel
-    , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
-    , private AzToolsFramework::EditorEntityInfoNotificationBus::Handler
-    , private AzToolsFramework::ToolsApplicationEvents::Bus::Handler
-    , private AzToolsFramework::EntityCompositionNotificationBus::Handler
-    , private AzToolsFramework::EditorEntityRuntimeActivationChangeNotificationBus::Handler
-    , private AZ::EntitySystemBus::Handler
-{
-    Q_OBJECT;
-
-public:
-    AZ_CLASS_ALLOCATOR(OutlinerListModel, AZ::SystemAllocator, 0);
-
-    //! Columns of data to display about each Entity.
-    enum Column
-    {
-        ColumnName,                 //!< Entity name
-        ColumnVisibilityToggle,     //!< Visibility Icons
-        ColumnLockToggle,           //!< Lock Icons
-        ColumnSortIndex,            //!< Index of sort order
-        ColumnCount                 //!< Total number of columns
-    };
-
-    // Note: the ColumnSortIndex column isn't shown, hence the -1 and the need for a separate counter.
-    // A wrong column count number causes refresh issues and hover mismatch on model update.
-    static const int VisibleColumnCount = ColumnCount - 1;
-
-    enum EntryType
-    {
-        EntityType,
-        SliceEntityType,
-        SliceHandleType,
-        LayerType
-    };
-
-    enum Roles
-    {
-        VisibilityRole = Qt::UserRole + 1,
-        SliceBackgroundRole,
-        SliceEntityOverrideRole,
-        EntityIdRole,
-        EntityTypeRole,
-        LayerColorRole,
-        SelectedRole,
-        ChildSelectedRole,
-        PartiallyVisibleRole,
-        PartiallyLockedRole,
-        InLockedLayerRole,
-        InInvisibleLayerRole,
-        ChildCountRole,
-        ExpandedRole,
-        RoleCount
-    };
-
-    enum EntityIcon
-    {
-        SliceHandleIcon,            // Icon used to decorate slice handles
-        BrokenSliceHandleIcon,      // Icon used to decorate broken slice handles
-        SliceEntityIcon,            // Icon used to decorate entities that are part of a slice instantiation
-        StandardEntityIcon          // Icon used to decorate entities that are not part of a slice instantiation
-    };
-
-    enum class GlobalSearchCriteriaFlags : int
-    {
-        Unlocked = 1 << static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::Unlocked),
-        Locked = 1 << static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::Locked),
-        Visible = 1 << static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::Visible),
-        Hidden = 1 << static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::Hidden)
-    };
-
-    struct ComponentTypeValue
-    {
-        AZ::Uuid m_uuid;
-        int m_globalVal;
-    };
-
-    // Spacing is appropriate and matches the outliner concept work from the UI team.
-    static const int s_OutlinerSpacing = 5;
-
-    static bool s_paintingName;
-
-    OutlinerListModel(QObject* parent = nullptr);
-    ~OutlinerListModel();
-
-    void Initialize();
-
-    // Qt overrides.
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex&) const override;
-    QVariant data(const QModelIndex& index, int role) const override;
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex& index) const override;
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-    Qt::DropActions supportedDropActions() const override;
-    Qt::DropActions supportedDragActions() const override;
-    bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
-    bool canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const override;
-
-    QMimeData* mimeData(const QModelIndexList& indexes) const override;
-    QStringList mimeTypes() const override;
-
-    QString GetSliceAssetName(const AZ::EntityId& entityId) const;
-
-    QModelIndex GetIndexFromEntity(const AZ::EntityId& entityId, int column = 0) const;
-    AZ::EntityId GetEntityFromIndex(const QModelIndex& index) const;
-
-    bool FilterEntity(const AZ::EntityId& entityId);
-
-    void EnableAutoExpand(bool enable);
-
-    AZStd::string GetFilterString() const
-    {
-        return m_filterString;
-    }
-
-    static int GetLayerStripeWidth()
-    {
-        return 1;
-    }
-
-    void SetSortMode(EntityOutliner::DisplaySortMode sortMode) { m_sortMode = sortMode; }
-    void SetDropOperationInProgress(bool inProgress);
-Q_SIGNALS:
-    void ExpandEntity(const AZ::EntityId& entityId, bool expand);
-    void SelectEntity(const AZ::EntityId& entityId, bool select);
-    void EnableSelectionUpdates(bool enable);
-    void ResetFilter();
-    void ReapplyFilter();
-
-    public Q_SLOTS:
-    void SearchStringChanged(const AZStd::string& filter);
-    void SearchFilterChanged(const AZStd::vector<ComponentTypeValue>& componentFilters);
-    void OnEntityExpanded(const AZ::EntityId& entityId);
-    void OnEntityCollapsed(const AZ::EntityId& entityId);
-
-    // Buffer Processing Slots - These are called using single-shot events when the buffers begin to fill.
-    bool CanReparentEntities(const AZ::EntityId& newParentId, const AzToolsFramework::EntityIdList& selectedEntityIds) const;
-    bool ReparentEntities(const AZ::EntityId& newParentId, const AzToolsFramework::EntityIdList& selectedEntityIds, const AZ::EntityId& beforeEntityId = AZ::EntityId());
-
-    //! Use the current filter setting and re-evaluate the filter.
-    void InvalidateFilter();
-
-protected:
-
-    //! Editor entity context notification bus
-    void OnEditorEntityDuplicated(const AZ::EntityId& oldEntity, const AZ::EntityId& newEntity) override;
-    void OnContextReset() override;
-    void OnStartPlayInEditorBegin() override;
-    void OnStartPlayInEditor() override;
-
-    bool m_beginStartPlayInEditor = false;
-
-    void QueueEntityUpdate(AZ::EntityId entityId);
-    void QueueAncestorUpdate(AZ::EntityId entityId);
-    void QueueEntityToExpand(AZ::EntityId entityId, bool expand);
-    void ProcessEntityUpdates();
-    void ProcessEntityInfoResetEnd();
-    AZStd::unordered_set<AZ::EntityId> m_entitySelectQueue;
-    AZStd::unordered_set<AZ::EntityId> m_entityExpandQueue;
-    AZStd::unordered_set<AZ::EntityId> m_entityChangeQueue;
-    bool m_entityChangeQueued;
-    bool m_entityLayoutQueued;
-    bool m_dropOperationInProgress = false;
-
-    bool m_autoExpandEnabled = true;
-    bool m_layoutResetQueued = false;
-
-    AZStd::string m_filterString;
-    AZStd::vector<ComponentTypeValue> m_componentFilters;
-    bool m_isFilterDirty = true;
-
-    void OnEntityCompositionChanged(const AzToolsFramework::EntityIdList& entityIds) override;
-
-    void OnEntityInitialized(const AZ::EntityId& entityId) override;
-    void AfterEntitySelectionChanged(const AzToolsFramework::EntityIdList&, const AzToolsFramework::EntityIdList&) override;
-
-    //! AzToolsFramework::EditorEntityInfoNotificationBus::Handler
-    //! Get notifications when the EditorEntityInfo changes so we can update our model
-    void OnEntityInfoResetBegin() override;
-    void OnEntityInfoResetEnd() override;
-    void OnEntityInfoUpdatedAddChildBegin(AZ::EntityId parentId, AZ::EntityId childId) override;
-    void OnEntityInfoUpdatedAddChildEnd(AZ::EntityId parentId, AZ::EntityId childId) override;
-    void OnEntityInfoUpdatedRemoveChildBegin(AZ::EntityId parentId, AZ::EntityId childId) override;
-    void OnEntityInfoUpdatedRemoveChildEnd(AZ::EntityId parentId, AZ::EntityId childId) override;
-    void OnEntityInfoUpdatedOrderBegin(AZ::EntityId parentId, AZ::EntityId childId, AZ::u64 index) override;
-    void OnEntityInfoUpdatedOrderEnd(AZ::EntityId parentId, AZ::EntityId childId, AZ::u64 index) override;
-    void OnEntityInfoUpdatedSelection(AZ::EntityId entityId, bool selected) override;
-    void OnEntityInfoUpdatedLocked(AZ::EntityId entityId, bool locked) override;
-    void OnEntityInfoUpdatedVisibility(AZ::EntityId entityId, bool visible) override;
-    void OnEntityInfoUpdatedName(AZ::EntityId entityId, const AZStd::string& name) override;
-    void OnEntityInfoUpdateSliceOwnership(AZ::EntityId entityId) override;
-    void OnEntityInfoUpdatedUnsavedChanges(AZ::EntityId entityId) override;
-
-    // AzToolsFramework::EditorEntityRuntimeActivationChangeNotificationBus::Handler
-    void OnEntityRuntimeActivationChanged(AZ::EntityId entityId, bool activeOnStart) override;
-
-    // Drag/Drop of components from Component Palette.
-    bool dropMimeDataComponentPalette(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
-
-    // Drag/Drop of entities.
-    bool canDropMimeDataForEntityIds(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const;
-    bool dropMimeDataEntities(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
-
-    // Drag/Drop of assets from asset browser.
-    using ComponentAssetPair = AZStd::pair<AZ::TypeId, AZ::Data::AssetId>;
-    using ComponentAssetPairs = AZStd::vector<ComponentAssetPair>;
-    using SliceAssetList = AZStd::vector<AZ::Data::AssetId>;
-    void DecodeAssetMimeData(const QMimeData* data, ComponentAssetPairs& componentAssetPairs, SliceAssetList& sliceAssets) const;
-    bool DropMimeDataAssets(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
-    bool CanDropMimeDataAssets(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const;
-
-    QMap<int, QVariant> itemData(const QModelIndex &index) const;
-    QVariant dataForAll(const QModelIndex& index, int role) const;
-    QVariant dataForName(const QModelIndex& index, int role) const;
-    QVariant dataForVisibility(const QModelIndex& index, int role) const;
-    QVariant dataForLock(const QModelIndex& index, int role) const;
-    QVariant dataForSortIndex(const QModelIndex& index, int role) const;
-
-    //! Request a hierarchy expansion
-    void ExpandAncestors(const AZ::EntityId& entityId);
-    bool IsExpanded(const AZ::EntityId& entityId) const;
-    AZStd::unordered_map<AZ::EntityId, bool> m_entityExpansionState;
-
-    void RestoreDescendantExpansion(const AZ::EntityId& entityId);
-    void RestoreDescendantSelection(const AZ::EntityId& entityId);
-
-    bool IsFiltered(const AZ::EntityId& entityId) const;
-    AZStd::unordered_map<AZ::EntityId, bool> m_entityFilteredState;
-
-    bool HasSelectedDescendant(const AZ::EntityId& entityId) const;
-
-    bool AreAllDescendantsSameLockState(const AZ::EntityId& entityId) const;
-    bool AreAllDescendantsSameVisibleState(const AZ::EntityId& entityId) const;
-
-    enum LayerProperty
-    {
-        Locked,
-        Invisible
-    };
-    bool IsInLayerWithProperty(AZ::EntityId entityId, const LayerProperty& layerProperty) const;
-
-    // These are needed until we completely disassociated selection control from the outliner state to
-    // keep track of selection state before/during/after filtering and searching
-    AzToolsFramework::EntityIdList m_unfilteredSelectionEntityIds;
-    void CacheSelectionIfAppropriate();
-    void RestoreSelectionIfAppropriate();
-    bool ShouldOverrideUnfilteredSelection();
-
-    EntityOutliner::DisplaySortMode m_sortMode;
-
-private:
-    QVariant GetEntityIcon(const AZ::EntityId& id) const;
-    QVariant GetEntityTooltip(const AZ::EntityId& id) const;
-
-    const char* circleIconColor = "#ff7b00";
-    const int circleIconDiameter = 5;
-    const int maskDiameter = 8;
-};
-
-class OutlinerCheckBox : public QCheckBox
-{
-   Q_OBJECT
-
-public:
-    explicit OutlinerCheckBox(QWidget* parent = nullptr);
-
-    void draw(QPainter* painter);
-
-private:
-    const int m_toggleColumnWidth = 16;
-};
-
-/*!
-* OutlinerItemDelegate exists to render custom item-types.
-* Other item-types render in the default fashion.
-*/
-class OutlinerItemDelegate
-    : public QStyledItemDelegate
-{
-public:
-    AZ_CLASS_ALLOCATOR(OutlinerItemDelegate, AZ::SystemAllocator, 0);
-
-    OutlinerItemDelegate(QWidget* parent = nullptr);
-
-    // Qt overrides
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-
-protected:
-    bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index) override;
-
-private:
-    // The layer stripe is a continuous line from the layer's color box to the last entity in the layer.
-    // Two layer stripes are drawn, one in the color of the layer and other in the border box color.
-    void DrawLayerStripeAndBorder(QPainter* painter, int stripeX, int top, int bottom, QColor layerBorderColor, QColor layerColor) const;
-
-    // Draws all UI related to layers for the current row.
-    void DrawLayerUI(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, const AZ::EntityId& entityId,
-        bool isSelected, bool isHovered) const;
-
-    // Layers with unsaved changes, and layers with errors, have additional text added to their strings.
-    QString GetLayerInfoString(const AZ::EntityId& entityId) const;
-
-    // Entity names are offset vertically if they are in a layer, and generally to better line up with icons.
-    int GetEntityNameVerticalOffset(const AZ::EntityId& entityId) const;
-
-    struct CheckboxGroup
-    {
-        OutlinerCheckBox m_default;
-        OutlinerCheckBox m_mixed;
-        OutlinerCheckBox m_layerOverride;
-
-        OutlinerCheckBox m_defaultHover;
-        OutlinerCheckBox m_mixedHover;
-        OutlinerCheckBox m_layerOverrideHover;
-
-        CheckboxGroup(QWidget* parent, AZStd::string prefix, OutlinerListModel::Roles mixed, OutlinerListModel::Roles layer);
-        OutlinerCheckBox* SelectCheckboxToRender(const QModelIndex& index, bool isHovered);
-
-    private:
-        OutlinerListModel::Roles m_mixedRole;
-        OutlinerListModel::Roles m_layerRole;
-    };
-
-    // Mutability added because these are being used ONLY as renderers
-    // for custom check boxes. The decision of whether or not to draw
-    // them checked is tracked by the individual entities and items in
-    // the hierarchy cache.
-    mutable CheckboxGroup m_visibilityCheckBoxes;
-    mutable CheckboxGroup m_lockCheckBoxes;
-
-    const int m_layerDividerLineHeight = 1;
-    const int m_lastEntityInLayerDividerLineHeight = 1;
-    const int m_toggleColumnWidth = 16;
-
-    // this is a cache, and is hence mutable
-    mutable QRect m_cachedBoundingRectOfTallCharacter;
-
-    struct OutlinerListModelColorConfig
-    {
-        QColor outlinerSelectionColor = QColor(255, 255, 255, 45);
-        QColor outlinerHoverColor = QColor(255, 255, 255, 30);
-        QColor layerBGColor = "#2F2F2F";
-        QColor layerChildBGColor = "#333333";
-        QColor layerBorderTopColor = "#515151";
-        QColor layerBorderBottomColor = "#252525";
-        QColor selectedLayerBGColor = "#676767"; 
-        QColor hoveredLayerBGColor = "#4B4B4B";
-        QColor sliceRootBackgroundColor = "#1E252F";
-        QColor sliceRootBorderColor = "#1E252F";
-        QColor selectedSliceRootBackgroundColor = "#47487B";
-        QColor selectedSliceRootBorderColor = "#2F306D";
-        QColor sliceEntityColor = "#4285F4";
-        QColor sliceOverrideColor = "#FF7B00";
-        int visibilityColumnWidth = 20;
-        int lockColumnWidth = 20;
-    };
-
-    OutlinerListModelColorConfig m_outlinerConfig;
-};
-
-Q_DECLARE_METATYPE(AZ::ComponentTypeList); // allows type to be stored by QVariable
-
-#endif
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.cpp
deleted file mode 100644
index 32234e5588..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "OutlinerSearchWidget.h"
-
-#include <AzQtComponents/Components/FlowLayout.h>
-#include <AzQtComponents/Components/StyleManager.h>
-#include <QLabel>
-#include <QTreeView>
-#include <QTextDocument>
-#include <QPainter>
-#include <QToolButton>
-
-namespace AzQtComponents
-{
-    OutlinerIcons::OutlinerIcons()
-    {
-        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Unlocked)] = QIcon(QString(":Icons/unlocked.svg"));
-        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Locked)] = QIcon(QString(":Icons/locked.svg"));
-        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Visible)] = QIcon(QString(":Icons/visb.svg"));
-        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Hidden)] = QIcon(QString(":Icons/visb_hidden.svg"));
-        m_globalIcons[static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::Separator)] = QIcon();
-    }
-
-    OutlinerSearchTypeSelector::OutlinerSearchTypeSelector(QWidget* parent)
-        : SearchTypeSelector(parent)
-    {
-    }
-
-    bool OutlinerSearchTypeSelector::filterItemOut(const QModelIndex& sourceIndex, bool filteredByBase)
-    {
-        auto* currItem = m_model->itemFromIndex(sourceIndex);
-        if (currItem != nullptr)
-        {
-            int unfilteredIndex = getUnfilteredDataIndex(currItem);
-            if (unfilteredIndex >= 0 && unfilteredIndex < aznumeric_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter))
-            {
-                // never filter out the categories before FirstRealFilter (unlocked/locked, visible/hidden, etc.)
-                return false;
-            }
-        }
-        // no special case, return the result of the base filter
-        return filteredByBase;
-    }
-
-    void OutlinerSearchTypeSelector::initItem(QStandardItem* item, const SearchTypeFilter& filter, int unfilteredDataIndex)
-    {
-        SearchTypeSelector::initItem(item, filter, unfilteredDataIndex);
-        if (filter.displayName == "--------")
-        {
-            item->setCheckable(false);
-        }
-
-        if (unfilteredDataIndex >= 0 && unfilteredDataIndex < static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter))
-        {
-            item->setIcon(OutlinerIcons::GetInstance().GetIcon(unfilteredDataIndex));
-        }
-    }
-
-    int OutlinerSearchTypeSelector::GetNumFixedItems()
-    {
-        return static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter);
-    }
-
-    OutlinerCriteriaButton::OutlinerCriteriaButton(QString labelText, QWidget* parent, int index)
-        : FilterCriteriaButton(labelText, parent)
-    {
-        if (index >= 0 && index < static_cast<int>(OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter))
-        {
-            QLabel* icon = new QLabel(this);
-            icon->setStyleSheet(m_tagLabel->styleSheet() + "border: 0px; background-color: transparent;");
-            icon->setPixmap(OutlinerIcons::GetInstance().GetIcon(index).pixmap(10, 10));
-            m_frameLayout->insertWidget(0, icon);
-        }
-    }
-
-    OutlinerSearchWidget::OutlinerSearchWidget(QWidget* parent)
-        : FilteredSearchWidget(parent, true)
-    {
-        SetupOwnSelector(new OutlinerSearchTypeSelector(assetTypeSelectorButton()));
-
-        const SearchTypeFilterList globalMenu{
-            {"Global Settings", "Unlocked"},
-            {"Global Settings", "Locked"},
-            {"Global Settings", "Visible"},
-            {"Global Settings", "Hidden"},
-            {"Global Settings", "--------"}
-        };
-        int value = 0;
-        for (const SearchTypeFilter& filter : globalMenu)
-        {
-            AddTypeFilter(filter.category, filter.displayName, QVariant::fromValue<AZ::Uuid>(AZ::Uuid::Create()), value);
-            ++value;
-        }
-    }
-
-    OutlinerSearchWidget::~OutlinerSearchWidget()
-    {
-        delete m_delegate;
-        m_delegate = nullptr;
-
-        delete m_selector;
-        m_selector = nullptr;
-    }
-
-    void OutlinerSearchWidget::SetupPaintDelegates()
-    {
-        m_delegate = new OutlinerSearchItemDelegate(m_selector->GetTree());
-        m_selector->GetTree()->setItemDelegate(m_delegate);
-        m_delegate->SetSelector(m_selector);
-    }
-
-    FilterCriteriaButton* OutlinerSearchWidget::createCriteriaButton(const SearchTypeFilter& filter, int filterIndex)
-    {
-        return new OutlinerCriteriaButton(filter.displayName, this, filterIndex);
-    }
-
-    OutlinerSearchItemDelegate::OutlinerSearchItemDelegate(QWidget* parent) : QStyledItemDelegate(parent)
-    {
-    }
-
-    void OutlinerSearchItemDelegate::PaintRichText(QPainter* painter, QStyleOptionViewItem& opt, QString& text) const
-    {
-        int textDocDrawYOffset = 3;
-        QPoint paintertextDocRenderOffset = QPoint(-2, -1);
-
-        QTextDocument textDoc;
-        textDoc.setDefaultFont(opt.font);
-        opt.palette.color(QPalette::Text);
-        textDoc.setDefaultStyleSheet("body {color: " + opt.palette.color(QPalette::Text).name() + "}");
-        textDoc.setHtml("<body>" + text + "</body>");
-        QRect textRect = opt.widget->style()->proxy()->subElementRect(QStyle::SE_ItemViewItemText, &opt);
-        painter->translate(textRect.topLeft() - paintertextDocRenderOffset);
-        textDoc.setTextWidth(textRect.width());
-        textDoc.drawContents(painter, QRectF(0, textDocDrawYOffset, textRect.width(), textRect.height() + textDocDrawYOffset));
-    }
-
-    void OutlinerSearchItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
-                                           const QModelIndex& index) const
-    {
-        bool isGlobalOption = false;
-        painter->save();
-
-        QStyleOptionViewItem opt = option;
-        initStyleOption(&opt, index);
-
-        const QWidget* widget = option.widget;
-        QStyle* style = widget ? widget->style() : QApplication::style();
-        if (!opt.icon.isNull())
-        {
-            // Draw the icon if there is one.
-            QRect r = style->subElementRect(QStyle::SubElement::SE_ItemViewItemDecoration, &opt, widget);
-            r.setX(-r.width());
-
-            QIcon::Mode mode = QIcon::Normal;
-            QIcon::State state = QIcon::On;
-            opt.icon.paint(painter, r, opt.decorationAlignment, mode, state);
-
-            opt.icon = QIcon();
-            opt.decorationSize = QSize(0, 0);
-            isGlobalOption = true;
-        }
-
-        // Handle the separator
-        if (opt.text.contains("-------"))
-        {
-            // Draw this item as a solid line.
-            painter->setPen(QColor(FilteredSearchWidget::GetSeparatorColor()));
-            painter->drawLine(0, opt.rect.center().y() + 3, opt.rect.right(), opt.rect.center().y() + 4);
-        }
-        else
-        {
-            if (m_selector->GetFilterString().length() > 0 && !isGlobalOption && opt.features & QStyleOptionViewItem::ViewItemFeature::HasCheckIndicator)
-            {
-                // Create rich text menu text to show filterstring
-                QString label{ opt.text };
-                opt.text = "";
-
-                style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget);
-
-                int highlightTextIndex = 0;
-                do
-                {
-                    // Find filter term within the text.
-                    highlightTextIndex = label.lastIndexOf(m_selector->GetFilterString(), highlightTextIndex - 1, Qt::CaseInsensitive);
-                    if (highlightTextIndex >= 0)
-                    {
-                        // Insert background-color terminator at appropriate place to return to normal text.
-                        label.insert(highlightTextIndex + m_selector->GetFilterString().length(), "</span>");
-                        // Insert background-color command at appropriate place to highlight filter term.
-                        label.insert(highlightTextIndex, "<span style=\"background-color: " + FilteredSearchWidget::GetBackgroundColor() + "\">");
-                    }
-                } while (highlightTextIndex > 0);// Repeat in case there are multiple occurrences.
-                PaintRichText(painter, opt, label);  
-            }
-            else
-            {          
-                // There's no filter to apply, just draw it.
-                QString label = opt.text;
-                opt.text = "";
-                style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget);
-                PaintRichText(painter, opt, label);
-            }
-        }
-
-        painter->restore();
-    }
-
-    QSize OutlinerSearchItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
-    {
-        QStyleOptionViewItem opt = option;
-        initStyleOption(&opt, index);
-
-        if (opt.text.contains("-------"))
-        {
-            return QSize(0, 6);
-        }
-        return QStyledItemDelegate::sizeHint(option, index);
-    }
-
-}
-
-#include <UI/Outliner/moc_OutlinerSearchWidget.cpp>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.h
deleted file mode 100644
index bff94bb527..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzQtComponents/AzQtComponentsAPI.h>
-
-#include <AzQtComponents/Components/FilteredSearchWidget.h>
-
-#include <QStyledItemDelegate>
-#include <QStandardItem>
-#endif
-
-#if !defined(DEFINED_QMETATYPE_UUID)
-#define DEFINED_QMETATYPE_UUID
-
-Q_DECLARE_METATYPE(AZ::Uuid);
-#endif
-
-namespace Ui
-{
-    class OutlinerSearchWidget;
-}
-
-namespace AzQtComponents
-{
-    class OutlinerSearchItemDelegate;
-
-    class OutlinerSearchTypeSelector
-        : public SearchTypeSelector
-    {
-    public:
-        OutlinerSearchTypeSelector(QWidget* parent = nullptr);
-
-    protected:
-        // override the logic of accepting filter categories
-        bool filterItemOut(const QModelIndex& sourceIndex, bool filteredByBase) override;
-        void initItem(QStandardItem* item, const SearchTypeFilter& filter, int unfilteredDataIndex) override;
-        int GetNumFixedItems() override;
-    };
-
-    class OutlinerCriteriaButton
-        : public FilterCriteriaButton
-    {
-        Q_OBJECT
-
-    public:
-        explicit OutlinerCriteriaButton(QString labelText, QWidget* parent = nullptr, int index = -1);
-   };
-
-    class OutlinerSearchWidget
-        : public FilteredSearchWidget
-    {
-        Q_OBJECT
-    public:
-        explicit OutlinerSearchWidget(QWidget* parent = nullptr);
-        ~OutlinerSearchWidget() override;
-
-        FilterCriteriaButton* createCriteriaButton(const SearchTypeFilter& filter, int filterIndex) override;
-
-        enum class GlobalSearchCriteria : int
-        {
-            Unlocked,
-            Locked,
-            Visible,
-            Hidden,
-            Separator,
-            FirstRealFilter
-        };
-    protected:
-        void SetupPaintDelegates() override;
-    private:
-        OutlinerSearchItemDelegate* m_delegate = nullptr;
-    };
-
-    class OutlinerIcons
-    {
-    public:
-        static OutlinerIcons& GetInstance()
-        {
-            static OutlinerIcons instance;
-            return instance;
-        }
-        OutlinerIcons(OutlinerIcons const &) = delete;
-        void operator=(OutlinerIcons const &) = delete;
-
-        QIcon& GetIcon(int iconWanted) { return m_globalIcons[iconWanted]; }
-    private:
-        OutlinerIcons();
-
-        QIcon m_globalIcons[static_cast<int>(AzQtComponents::OutlinerSearchWidget::GlobalSearchCriteria::FirstRealFilter)];
-    };
-
-    class OutlinerSearchItemDelegate : public QStyledItemDelegate
-    {
-    public:
-        explicit OutlinerSearchItemDelegate(QWidget* parent = nullptr);
-
-        void PaintRichText(QPainter* painter, QStyleOptionViewItem& opt, QString& text) const;
-        void SetSelector(SearchTypeSelector* selector) { m_selector = selector; }
-
-        // QStyleItemDelegate overrides.
-        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-
-    private:
-        SearchTypeSelector* m_selector = nullptr;
-    };
-}
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.cpp
deleted file mode 100644
index 3fd562ce4b..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "OutlinerSortFilterProxyModel.hxx"
-
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/Component/Entity.h>
-
-#include "OutlinerListModel.hxx"
-
-OutlinerSortFilterProxyModel::OutlinerSortFilterProxyModel(QObject* pParent)
-    : QSortFilterProxyModel(pParent)
-{
-}
-
-void OutlinerSortFilterProxyModel::UpdateFilter()
-{
-    invalidateFilter();
-}
-
-bool OutlinerSortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
-{
-    QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
-    QVariant visibilityData = sourceModel()->data(index, OutlinerListModel::VisibilityRole);
-    return visibilityData.isValid() ? visibilityData.toBool() : true;
-}
-
-bool OutlinerSortFilterProxyModel::lessThan(const QModelIndex& leftIndex, const QModelIndex& rightIndex) const
-{
-    return sourceModel()->data(leftIndex).toString() < sourceModel()->data(rightIndex).toString();
-}
-
-void OutlinerSortFilterProxyModel::sort(int /*column*/, Qt::SortOrder /*order*/)
-{
-    // override any attempts to change sort
-    QSortFilterProxyModel::sort(OutlinerListModel::ColumnSortIndex, Qt::SortOrder::AscendingOrder);
-}
-
-#include <UI/Outliner/moc_OutlinerSortFilterProxyModel.cpp>
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.hxx b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.hxx
deleted file mode 100644
index e8f877ef79..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef OUTLINER_SORT_FILTER_PROXY_MODEL_H
-#define OUTLINER_SORT_FILTER_PROXY_MODEL_H
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/base.h>
-#include <QtCore/QSortFilterProxyModel>
-#include <AzCore/Memory/SystemAllocator.h>
-#endif
-
-#pragma once
-
-/*!
-    * Enables the Outliner to filter entries based on search string.
-    * Enables the Outliner to do custom sorting on entries.
-    */
-class OutlinerSortFilterProxyModel
-    : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-public:
-    AZ_CLASS_ALLOCATOR(OutlinerSortFilterProxyModel, AZ::SystemAllocator, 0);
-
-    OutlinerSortFilterProxyModel(QObject* pParent = nullptr);
-
-    void UpdateFilter();
-
-    // Qt overrides
-    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
-    bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
-    void sort(int column, Qt::SortOrder order) override;
-
-private:
-    QString m_filterName;
-};
-
-#endif
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.cpp
deleted file mode 100644
index 97f9c2e516..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "OutlinerTreeView.hxx"
-#include "OutlinerListModel.hxx"
-
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/std/sort.h>
-#include <AzCore/std/algorithm.h>
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-#include <AzQtComponents/Components/Style.h>
-
-#include <QDrag>
-#include <QPainter>
-#include <QHeaderView>
-
-OutlinerTreeView::OutlinerTreeView(QWidget* pParent)
-    : QTreeView(pParent)
-    , m_queuedMouseEvent(nullptr)
-    , m_draggingUnselectedItem(false)
-{
-    setUniformRowHeights(true);
-    setHeaderHidden(true);
-}
-
-OutlinerTreeView::~OutlinerTreeView()
-{
-    ClearQueuedMouseEvent();
-}
-
-void OutlinerTreeView::setAutoExpandDelay(int delay)
-{
-    m_expandOnlyDelay = delay;
-}
-
-void OutlinerTreeView::ClearQueuedMouseEvent()
-{
-    if (m_queuedMouseEvent)
-    {
-        delete m_queuedMouseEvent;
-        m_queuedMouseEvent = nullptr;
-    }
-}
-
-void OutlinerTreeView::mousePressEvent(QMouseEvent* event)
-{
-    //postponing normal mouse pressed logic until mouse is released or dragged
-    //this means selection occurs on mouse released now
-    //this is to support drag/drop of non-selected items
-    ClearQueuedMouseEvent();
-    m_queuedMouseEvent = new QMouseEvent(*event);
-}
-
-void OutlinerTreeView::mouseReleaseEvent(QMouseEvent* event)
-{
-    if (m_queuedMouseEvent && !m_draggingUnselectedItem)
-    {
-        // mouseMoveEvent will set the state to be DraggingState, which will make Qt ignore 
-        // mousePressEvent in QTreeViewPrivate::expandOrCollapseItemAtPos. So we manually 
-        // and temporarily set it to EditingState.
-        QAbstractItemView::State stateBefore = QAbstractItemView::state();
-        QAbstractItemView::setState(QAbstractItemView::State::EditingState);
-
-        //treat this as a mouse pressed event to process selection etc
-        processQueuedMousePressedEvent(m_queuedMouseEvent);
-
-        QAbstractItemView::setState(stateBefore);
-    }
-
-    ClearQueuedMouseEvent();
-    m_draggingUnselectedItem = false;
-
-    QTreeView::mouseReleaseEvent(event);
-}
-
-void OutlinerTreeView::mouseDoubleClickEvent(QMouseEvent* event)
-{
-    //cancel pending mouse press
-    ClearQueuedMouseEvent();
-    QTreeView::mouseDoubleClickEvent(event);
-}
-
-void OutlinerTreeView::mouseMoveEvent(QMouseEvent* event)
-{
-    // Store selection mode
-    QAbstractItemView::SelectionMode selectionModeBefore = selectionMode();
-
-    // Disable selection for the pending click so selection is maintained for dragging
-    setSelectionMode(QAbstractItemView::NoSelection);
-
-    // If a mouse event is queued, treat this as a mouse pressed event to process everything
-    // but selection, but use the position data from the mousePress message
-    if (m_queuedMouseEvent)
-    {
-        processQueuedMousePressedEvent(m_queuedMouseEvent);
-    }
-
-    // Process mouse movement as normal, potentially triggering drag and drop
-    QTreeView::mouseMoveEvent(event);
-
-    // Restore selection state
-    setSelectionMode(selectionModeBefore);
-}
-
-void OutlinerTreeView::focusInEvent(QFocusEvent* event)
-{
-    //cancel pending mouse press
-    ClearQueuedMouseEvent();
-    QTreeView::focusInEvent(event);
-}
-
-void OutlinerTreeView::focusOutEvent(QFocusEvent* event)
-{
-    //cancel pending mouse press
-    ClearQueuedMouseEvent();
-    QTreeView::focusOutEvent(event);
-}
-
-void OutlinerTreeView::startDrag(Qt::DropActions supportedActions)
-{
-    //if we are attempting to drag an unselected item then we must special case drag and drop logic
-    //QAbstractItemView::startDrag only supports selected items
-    if (m_queuedMouseEvent)
-    {
-        QModelIndex index = indexAt(m_queuedMouseEvent->pos());
-        if (!index.isValid() || index.column() != 0)
-        {
-            return;
-        }
-
-        if (!selectionModel()->isSelected(index))
-        {
-            startCustomDrag({ index }, supportedActions);
-            return;
-        }
-    }
-
-    if (!selectionModel()->selectedIndexes().empty())
-    {
-        startCustomDrag(selectionModel()->selectedIndexes(), supportedActions);
-        return;
-    }
-}
-
-void OutlinerTreeView::dragMoveEvent(QDragMoveEvent* event)
-{
-    if (m_expandOnlyDelay >= 0)
-    {
-        m_expandTimer.start(m_expandOnlyDelay, this);
-    }
-
-    QTreeView::dragMoveEvent(event);
-}
-
-void OutlinerTreeView::dropEvent(QDropEvent* event)
-{
-    emit ItemDropped();
-    QTreeView::dropEvent(event);
-
-    m_draggingUnselectedItem = false;
-}
-
-QColor OutlinerTreeView::GetHierarchyLineColor(bool isSliceEntity, bool isSelected) const
-{
-    if (isSliceEntity)
-    {
-        if (isSelected)
-        {
-            return m_colorConfig.hierarchyLinesSlicesSelected;
-        }
-        else
-        {
-            return m_colorConfig.hierarchyLinesSlices;
-        }
-    }
-    else
-    {
-        if (isSelected)
-        {
-            return m_colorConfig.hierarchyLinesNonSliceEntitiesSelected;
-        }
-        else
-        {
-            return m_colorConfig.hierarchyLinesNonSliceEntities;
-        }
-    }
-}
-
-void OutlinerTreeView::DrawLayerUI(QPainter* painter, const QRect& rect, const QModelIndex& index) const
-{
-    bool isSelected = selectionModel()->isSelected(index);
-
-    QColor layerBranchesBGColor = isSelected ? m_colorConfig.layerChildBGSelectionColor : m_colorConfig.layerChildBackgroundColor;
-
-    painter->save();
-    painter->setRenderHint(QPainter::RenderHint::Antialiasing, false);
-
-    bool hasLayerAncestor = false;
-    for (QModelIndex ancestorIndex = index.parent(); ancestorIndex.isValid(); ancestorIndex = ancestorIndex.parent())
-    {
-        auto ancestorType = OutlinerListModel::EntryType(ancestorIndex.data(OutlinerListModel::EntityTypeRole).value<int>());
-        if (ancestorType == OutlinerListModel::LayerType)
-        {
-            hasLayerAncestor = true;
-            break;
-        }
-    }
-
-    if (hasLayerAncestor)
-    {
-        QPainterPath layerBGPath;
-        QRect layerBGRect(rect);
-        layerBGRect.setLeft(layerBGRect.left() + indentation());
-        layerBGPath.addRect(layerBGRect);
-        painter->fillPath(layerBGPath, layerBranchesBGColor);
-    }
-
-    OutlinerListModel::EntryType indexEntryType = OutlinerListModel::EntryType(index.data(OutlinerListModel::EntityTypeRole).value<int>());
-    if (indexEntryType == OutlinerListModel::LayerType)
-    {
-        QColor layerColor = index.data(OutlinerListModel::LayerColorRole).value<QColor>();
-        QPainterPath layerIconPath;
-        const int layerSquareSize = GetLayerSquareSize();
-        QPoint layerBoxOffset(1 + OutlinerListModel::GetLayerStripeWidth()*2, (rect.height() - layerSquareSize) / 2);
-        QRect layerIconRect(rect.topRight() + layerBoxOffset, QSize(layerSquareSize, layerSquareSize));
-        layerIconPath.addRect(layerIconRect);
-        painter->fillPath(layerIconPath, layerColor);
-    }
-
-    painter->restore();
-}
-
-void OutlinerTreeView::drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const
-{
-    DrawLayerUI(painter, rect, index);
-
-    // Make sure the base class is called after the layer rect is drawn,
-    // so that the foldout arrow draws on top of the layer color.
-    QTreeView::drawBranches(painter, rect, index);
-
-    // No need to draw connecting lines if this has no parent.
-    if (!index.parent().isValid())
-    {
-        return;
-    }
-
-    QPen branchLinePen;
-    branchLinePen.setWidthF(m_branchLineWidth);
-
-    int lineBaseX = rect.right();
-    QModelIndex previousIndex = index;
-    for (QModelIndex ancestorIndex = index.parent(); ancestorIndex.isValid(); ancestorIndex = ancestorIndex.parent())
-    {
-        auto ancestorType = OutlinerListModel::EntryType(ancestorIndex.data(OutlinerListModel::EntityTypeRole).value<int>());
-        bool isSliceEntity = ancestorType == OutlinerListModel::SliceEntityType || ancestorType == OutlinerListModel::SliceHandleType;
-        bool isSelected = selectionModel()->isSelected(index);
-        branchLinePen.setColor(GetHierarchyLineColor(isSliceEntity, isSelected));
-
-        // Layers don't have connecting lines drawn.
-        if (ancestorType == OutlinerListModel::LayerType)
-        {
-            // Layers can only have other layers as parents, so once a layer is found in a hierarchy
-            // the line drawing can stop.
-            break;
-        }
-        painter->save();
-        painter->setRenderHint(QPainter::RenderHint::Antialiasing, false);
-        painter->setPen(branchLinePen);
-        int rectHalfHeight = rect.height() / 2;
-        if (previousIndex == index)
-        {
-            // draw a horizontal line from the parent branch to the item
-            // if the item has children offset the drawn line to compensate for drawn expander buttons
-            bool hasChildren = previousIndex.model()->index(0, 0, previousIndex).isValid();
-            int horizontalLineY = rect.top() + rectHalfHeight;
-            int horizontalLineLeft = rect.right() - indentation() * 1.5f;
-            int horizontalLineRight = hasChildren ? (lineBaseX - indentation()) : (lineBaseX - indentation() * 0.5f);
-            painter->drawLine(horizontalLineLeft, horizontalLineY, horizontalLineRight, horizontalLineY);
-        }
-
-        // draw a vertical line segment connecting parent to child and child to child
-        // if this is the last item, only draw half the line to terminate the segment
-        bool hasNext = previousIndex.sibling(previousIndex.row() + 1, previousIndex.column()).isValid();
-        if (hasNext || previousIndex == index)
-        {
-            int verticalLineX = lineBaseX - indentation() * 1.5f;
-            int verticalLineTop = rect.top();
-            int verticalLineBottom = hasNext ? rect.bottom() : rect.bottom() - rectHalfHeight;
-            painter->drawLine(verticalLineX, verticalLineTop, verticalLineX, verticalLineBottom);
-        }
-
-        painter->restore();
-
-        lineBaseX -= indentation();
-        previousIndex = ancestorIndex;
-    }
-}
-
-void OutlinerTreeView::timerEvent(QTimerEvent* event)
-{
-    if (event->timerId() == m_expandTimer.timerId())
-    {
-        //duplicates functionality from QTreeView, but won't collapse an already expanded item
-        QPoint pos = this->viewport()->mapFromGlobal(QCursor::pos());
-        if (state() == QAbstractItemView::DraggingState && this->rect().contains(pos))
-        {
-            QModelIndex index = indexAt(pos);
-            if (!isExpanded(index))
-            {
-                setExpanded(index, true);
-            }
-        }
-        m_expandTimer.stop();
-    }
-
-    QTreeView::timerEvent(event);
-}
-
-void OutlinerTreeView::processQueuedMousePressedEvent(QMouseEvent* event)
-{
-    //interpret the mouse event as a button press
-    QMouseEvent mousePressedEvent(
-        QEvent::MouseButtonPress,
-        event->localPos(),
-        event->windowPos(),
-        event->screenPos(),
-        event->button(),
-        event->buttons(),
-        event->modifiers(),
-        event->source());
-    QTreeView::mousePressEvent(&mousePressedEvent);
-}
-
-void OutlinerTreeView::startCustomDrag(const QModelIndexList& indexList, Qt::DropActions supportedActions)
-{
-    m_draggingUnselectedItem = true;
-
-    //sort by container entity depth and order in hierarchy for proper drag image and drop order
-    QModelIndexList indexListSorted = indexList;
-    AZStd::unordered_map<AZ::EntityId, AZStd::list<AZ::u64>> locations;
-    for (auto index : indexListSorted)
-    {
-        AZ::EntityId entityId(index.data(OutlinerListModel::EntityIdRole).value<AZ::u64>());
-        AzToolsFramework::GetEntityLocationInHierarchy(entityId, locations[entityId]);
-    }
-    AZStd::sort(indexListSorted.begin(), indexListSorted.end(), [&locations](const QModelIndex& index1, const QModelIndex& index2) {
-        AZ::EntityId e1(index1.data(OutlinerListModel::EntityIdRole).value<AZ::u64>());
-        AZ::EntityId e2(index2.data(OutlinerListModel::EntityIdRole).value<AZ::u64>());
-        const auto& locationsE1 = locations[e1];
-        const auto& locationsE2 = locations[e2];
-        return AZStd::lexicographical_compare(locationsE1.begin(), locationsE1.end(), locationsE2.begin(), locationsE2.end());
-    });
-
-    //get the data for the unselected item(s)
-    QMimeData* mimeData = model()->mimeData(indexListSorted);
-    if (mimeData)
-    {
-        //initiate drag/drop for the item
-        QDrag* drag = new QDrag(this);
-        drag->setPixmap(QPixmap::fromImage(createDragImage(indexListSorted)));
-        drag->setMimeData(mimeData);
-        Qt::DropAction defDropAction = Qt::IgnoreAction;
-        if (defaultDropAction() != Qt::IgnoreAction && (supportedActions & defaultDropAction()))
-        {
-            defDropAction = defaultDropAction();
-        }
-        else if (supportedActions & Qt::CopyAction && dragDropMode() != QAbstractItemView::InternalMove)
-        {
-            defDropAction = Qt::CopyAction;
-        }
-        drag->exec(supportedActions, defDropAction);
-    }
-}
-
-QImage OutlinerTreeView::createDragImage(const QModelIndexList& indexList)
-{
-    //generate a drag image of the item icon and text, normally done internally, and inaccessible 
-    QRect rect(0, 0, 0, 0);
-    for (auto index : indexList)
-    {
-        if (index.column() != 0)
-        {
-            continue;
-        }
-        QRect itemRect = visualRect(index);
-        rect.setHeight(rect.height() + itemRect.height());
-        rect.setWidth(AZStd::GetMax(rect.width(), itemRect.width()));
-    }
-
-    QImage dragImage(rect.size(), QImage::Format_ARGB32_Premultiplied);
-
-    QPainter dragPainter(&dragImage);
-    dragPainter.setCompositionMode(QPainter::CompositionMode_Source);
-    dragPainter.fillRect(dragImage.rect(), Qt::transparent);
-    dragPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-    dragPainter.setOpacity(0.35f);
-    dragPainter.fillRect(rect, QColor("#222222"));
-    dragPainter.setOpacity(1.0f);
-
-    int imageY = 0;
-    for (auto index : indexList)
-    {
-        if (index.column() != 0)
-        {
-            continue;
-        }
-
-        QRect itemRect = visualRect(index);
-        dragPainter.drawPixmap(QPoint(0, imageY),
-            model()->data(index, Qt::DecorationRole).value<QIcon>().pixmap(QSize(16, 16)));
-        dragPainter.setPen(
-            model()->data(index, Qt::ForegroundRole).value<QBrush>().color());
-        dragPainter.setFont(
-            font());
-        dragPainter.drawText(QRect(20, imageY, rect.width() - 20, rect.height()),
-            model()->data(index, Qt::DisplayRole).value<QString>());
-        imageY += itemRect.height();
-    }
-
-    dragPainter.end();
-    return dragImage;
-}
-
-#include <UI/Outliner/moc_OutlinerTreeView.cpp>
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.hxx b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.hxx
deleted file mode 100644
index e85582cf78..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.hxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef OUTLINER_TREE_VIEW_H
-#define OUTLINER_TREE_VIEW_H
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/base.h>
-#include <AzCore/Memory/SystemAllocator.h>
-
-#include <QBasicTimer>
-#include <QEvent>
-#include <QTreeView>
-#endif
-
-#pragma once
-class QFocusEvent;
-class QMouseEvent;
-class OutlinerTreeViewModel;
-
-//! This class largely exists to emit events for the OutlinerWidget to listen in on.
-//! The logic for these events is best off not happening within the tree itself,
-//! so it can be re-used in other interfaces.
-//! The OutlinerWidget's need for these events is largely based on the concept of
-//! delaying the Editor selection from updating with mouse interaction to
-//! allow for dragging and dropping of entities from the outliner into the property editor
-//! of other entities. If the selection updates instantly, this would never be possible.
-class OutlinerTreeView
-    : public QTreeView
-{
-    Q_OBJECT;
-public:
-    AZ_CLASS_ALLOCATOR(OutlinerTreeView, AZ::SystemAllocator, 0);
-
-    OutlinerTreeView(QWidget* pParent = NULL);
-    virtual ~OutlinerTreeView();
-
-    void setAutoExpandDelay(int delay);
-
-    static int GetLayerSquareSize() { return 20; }
-Q_SIGNALS:
-    void ItemDropped();
-
-protected:
-    // Qt overrides
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
-    void mouseDoubleClickEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void focusInEvent(QFocusEvent* event) override;
-    void focusOutEvent(QFocusEvent* event) override;
-    void startDrag(Qt::DropActions supportedActions) override;
-    void dragMoveEvent(QDragMoveEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
-
-    void drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const override;
-
-    void timerEvent(QTimerEvent* event) override;
-private:
-    void ClearQueuedMouseEvent();
-
-    void processQueuedMousePressedEvent(QMouseEvent* event);
-
-    void startCustomDrag(const QModelIndexList& indexList, Qt::DropActions supportedActions);
-
-    QImage createDragImage(const QModelIndexList& indexList);
-
-    void DrawLayerUI(QPainter* painter, const QRect& rect, const QModelIndex& index) const;
-
-    QMouseEvent* m_queuedMouseEvent;
-    bool m_draggingUnselectedItem; // This is set when an item is dragged outside its bounding box.
-
-    int m_expandOnlyDelay = -1;
-    QBasicTimer m_expandTimer;
-    
-    const int m_branchLineWidth = 1;
-
-    QColor GetHierarchyLineColor(bool isSliceEntity, bool isSelected) const;
-
-    struct OutlinerTreeViewColorConfig
-    {
-        QColor hierarchyLinesSlices = "#7B7B7B";
-        QColor hierarchyLinesSlicesSelected = "#7B7B7B";
-        QColor hierarchyLinesNonSliceEntities = "transparent";
-        QColor hierarchyLinesNonSliceEntitiesSelected = "transparent";
-
-        QColor layerChildBGSelectionColor = "#464747";
-        QColor layerChildBackgroundColor = "#333333";
-    };
-
-    OutlinerTreeViewColorConfig m_colorConfig;
-};
-
-#endif
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
deleted file mode 100644
index 7d62b072a2..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
+++ /dev/null
@@ -1,1457 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "MainWindow.h"                     // for MainWindow
-
-#include "OutlinerListModel.hxx"
-#include "OutlinerSortFilterProxyModel.hxx"
-#include "OutlinerWidget.hxx"
-#include "OutlinerDisplayOptionsMenu.h"
-#include "Objects/SelectionGroup.h"
-
-#include <AzCore/Asset/AssetManagerBus.h>
-#include <AzCore/Component/ComponentApplication.h>
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Component/EntityUtils.h>
-#include <AzCore/Debug/Profiler.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/Utils.h>
-#include <AzCore/Settings//SettingsRegistryMergeUtils.h>
-#include <AzCore/Slice/SliceComponent.h>
-#include <AzCore/std/sort.h>
-
-#include <AzQtComponents/Utilities/QtViewPaneEffects.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/Commands/SelectionCommand.h>
-#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.hxx>
-
-#include <QGraphicsOpacityEffect>
-#include <QLabel>
-#include <QToolButton>
-#include <QMenu>
-#include <QDir>
-#include <QPainter>
-#include <QApplication>
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QTimer>
-#include <QHeaderView>
-#include <QInputDialog>
-
-#include <UI/Outliner/ui_OutlinerWidget.h>
-#include <AzQtComponents/Components/StyleManager.h>
-#include <AzQtComponents/Utilities/QtPluginPaths.h>
-
-namespace
-{
-    const int queuedChangeDelay = 16; // milliseconds
-
-    using EntityIdCompareFunc = AZStd::function<bool(AZ::EntityId, AZ::EntityId)>;
-
-    bool CompareEntitiesForSorting(AZ::EntityId leftEntityId, AZ::EntityId rightEntityId, EntityOutliner::DisplaySortMode sortMode)
-    {
-        AZ::Entity* leftEntity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(leftEntity, &AZ::ComponentApplicationBus::Events::FindEntity, leftEntityId);
-        AZ_Assert(leftEntity, "Could not find entity with id %d", leftEntityId);
-        if (!leftEntity)
-        {
-            return false;
-        }
-
-        AZ::Entity* rightEntity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(rightEntity, &AZ::ComponentApplicationBus::Events::FindEntity, rightEntityId);
-        AZ_Assert(rightEntity, "Could not find entity with id %d", rightEntityId);
-        if (!rightEntity)
-        {
-            return true;
-        }
-
-        const int compareResult = azstricmp(leftEntity->GetName().c_str(), rightEntity->GetName().c_str());
-        const bool isSame = (compareResult == 0);
-
-        if (sortMode == EntityOutliner::DisplaySortMode::AtoZ)
-        {
-            return (isSame ? 
-                leftEntityId < rightEntityId : 
-                compareResult < 0);
-        }
-        else
-        {
-            return (isSame ? 
-                leftEntityId > rightEntityId : 
-                compareResult > 0);
-        }
-    }
-
-    void SortEntityChildren(AZ::EntityId entityId, const EntityIdCompareFunc& comparer, AzToolsFramework::EntityOrderArray* newEntityOrder = nullptr)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-        AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(entityId);
-        AZStd::sort(entityOrderArray.begin(), entityOrderArray.end(), comparer);
-        AzToolsFramework::SetEntityChildOrder(entityId, entityOrderArray);
-
-        if (newEntityOrder)
-        {
-            *newEntityOrder = AZStd::move(entityOrderArray);
-        }
-    }
-
-    void SortEntityChildrenRecursively(AZ::EntityId entityId, const EntityIdCompareFunc& comparer)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-        AzToolsFramework::EntityOrderArray entityOrderArray;
-        SortEntityChildren(entityId, comparer, &entityOrderArray);
-
-        for (const AZ::EntityId& childId : entityOrderArray)
-        {
-            SortEntityChildrenRecursively(childId, comparer);
-        }
-    }
-}
-
-OutlinerWidget::OutlinerWidget(QWidget* pParent, Qt::WindowFlags flags)
-    : QWidget(pParent, flags)
-    , m_gui(nullptr)
-    , m_listModel(nullptr)
-    , m_proxyModel(nullptr)
-    , m_selectionContextId(0)
-    , m_selectedEntityIds()
-    , m_inObjectPickMode(false)
-    , m_scrollToNewContentQueued(false)
-    , m_scrollToEntityId()
-    , m_entitiesToSelect()
-    , m_entitiesToDeselect()
-    , m_selectionChangeQueued(false)
-    , m_selectionChangeInProgress(false)
-    , m_enableSelectionUpdates(true)
-    , m_scrollToSelectedEntity(true)
-    , m_expandSelectedEntity(true)
-    , m_focusInEntityOutliner(false)
-    , m_displayOptionsMenu(new EntityOutliner::DisplayOptionsMenu(this))
-    , m_entitiesToSort()
-    , m_sortMode(EntityOutliner::DisplaySortMode::Manually)
-    , m_sortContentQueued(false)
-    , m_dropOperationInProgress(false)
-{
-    m_gui = new Ui::OutlinerWidgetUI();
-    m_gui->setupUi(this);
-
-
-    AZ::IO::FixedMaxPath engineRootPath;
-    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
-    {
-        settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
-    }
-    QDir rootDir = QString::fromUtf8(engineRootPath.c_str(), aznumeric_cast<int>(engineRootPath.Native().size()));
-    const auto pathOnDisk = rootDir.absoluteFilePath(QStringLiteral("Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/"));
-    const auto qrcPath = QStringLiteral(":/EntityOutliner/");
-
-    // Setting the style sheet using both methods allows faster style iteration speed for
-    // developers. The style will be loaded from a Qt Resource file if Editor is installed, but
-    // developers with the file on disk will be able to modify the style and have it automatically
-    // reloaded.
-    AzQtComponents::StyleManager::addSearchPaths("EntityOutliner", pathOnDisk, qrcPath, engineRootPath);
-    AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral("EntityOutliner:EntityOutliner.qss"));
-
-    m_listModel = aznew OutlinerListModel(this);
-    m_listModel->SetSortMode(m_sortMode);
-
-    const int autoExpandDelayMilliseconds = 2500;
-    m_gui->m_objectTree->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    m_gui->m_objectTree->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);
-    m_gui->m_objectTree->setAutoExpandDelay(autoExpandDelayMilliseconds);
-    m_gui->m_objectTree->setDragEnabled(true);
-    m_gui->m_objectTree->setDropIndicatorShown(true);
-    m_gui->m_objectTree->setAcceptDrops(true);
-    m_gui->m_objectTree->setDragDropOverwriteMode(false);
-    m_gui->m_objectTree->setDragDropMode(QAbstractItemView::DragDrop);
-    m_gui->m_objectTree->setDefaultDropAction(Qt::CopyAction);
-    m_gui->m_objectTree->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_gui->m_objectTree->setAutoScrollMargin(20);
-
-    // custom item delegate
-    m_gui->m_objectTree->setItemDelegate(aznew OutlinerItemDelegate(m_gui->m_objectTree));
-
-    m_proxyModel = aznew OutlinerSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_listModel);
-    m_gui->m_objectTree->setModel(m_proxyModel);
-
-    // Link up signals for informing the model of tree changes using the proxy as an intermediary
-    connect(m_gui->m_objectTree, &QTreeView::clicked, this, &OutlinerWidget::OnTreeItemClicked);
-    connect(m_gui->m_objectTree, &QTreeView::expanded, this, &OutlinerWidget::OnTreeItemExpanded);
-    connect(m_gui->m_objectTree, &QTreeView::collapsed, this, &OutlinerWidget::OnTreeItemCollapsed);
-    connect(m_gui->m_objectTree, &OutlinerTreeView::ItemDropped, this, &OutlinerWidget::OnDropEvent);
-    connect(m_listModel, &OutlinerListModel::ExpandEntity, this, &OutlinerWidget::OnExpandEntity);
-    connect(m_listModel, &OutlinerListModel::SelectEntity, this, &OutlinerWidget::OnSelectEntity);
-    connect(m_listModel, &OutlinerListModel::EnableSelectionUpdates, this, &OutlinerWidget::OnEnableSelectionUpdates);
-    connect(m_listModel, &OutlinerListModel::ResetFilter, this, &OutlinerWidget::ClearFilter);
-    connect(m_listModel, &OutlinerListModel::ReapplyFilter, this, &OutlinerWidget::InvalidateFilter);
-
-    QToolButton* display_options = new QToolButton(this);
-    display_options->setObjectName(QStringLiteral("m_display_options"));
-    display_options->setPopupMode(QToolButton::InstantPopup);
-    display_options->setAutoRaise(true);
-
-    m_gui->m_searchWidget->AddWidgetToSearchWidget(display_options);
-
-    // Set the display options menu
-    display_options->setMenu(m_displayOptionsMenu);
-    connect(m_displayOptionsMenu, &EntityOutliner::DisplayOptionsMenu::OnSortModeChanged, this, &OutlinerWidget::OnSortModeChanged);
-    connect(m_displayOptionsMenu, &EntityOutliner::DisplayOptionsMenu::OnOptionToggled, this, &OutlinerWidget::OnDisplayOptionChanged);
-
-    // Sorting is performed in a very specific way by the proxy model.
-    // Disable sort indicator so user isn't confused by the fact
-    // that they can't actually change how sorting works.
-    m_gui->m_objectTree->hideColumn(OutlinerListModel::ColumnSortIndex);
-    m_gui->m_objectTree->setSortingEnabled(true);
-    m_gui->m_objectTree->header()->setSortIndicatorShown(false);
-    m_gui->m_objectTree->header()->setStretchLastSection(false);
-
-    // resize the icon columns so that the Visibility and Lock toggle icon columns stay right-justified
-    m_gui->m_objectTree->header()->setSectionResizeMode(OutlinerListModel::ColumnName, QHeaderView::Stretch);
-    m_gui->m_objectTree->header()->setSectionResizeMode(OutlinerListModel::ColumnVisibilityToggle, QHeaderView::ResizeToContents);
-    m_gui->m_objectTree->header()->resizeSection(OutlinerListModel::ColumnLockToggle, 24);
-
-    connect(m_gui->m_objectTree->selectionModel(),
-        &QItemSelectionModel::selectionChanged,
-        this,
-        &OutlinerWidget::OnSelectionChanged);
-
-    connect(m_gui->m_searchWidget, &AzQtComponents::FilteredSearchWidget::TextFilterChanged, this, &OutlinerWidget::OnSearchTextChanged);
-    connect(m_gui->m_searchWidget, &AzQtComponents::FilteredSearchWidget::TypeFilterChanged, this, &OutlinerWidget::OnFilterChanged);
-
-    AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-
-    if (serializeContext)
-    {
-        AzToolsFramework::ComponentPaletteUtil::ComponentDataTable componentDataTable;
-        AzToolsFramework::ComponentPaletteUtil::ComponentIconTable componentIconTable;
-        AZStd::vector<AZ::ComponentServiceType> serviceFilter;
-
-        AzToolsFramework::ComponentPaletteUtil::BuildComponentTables(serializeContext, AzToolsFramework::AppearsInGameComponentMenu, serviceFilter, componentDataTable, componentIconTable);
-
-        for (const auto& categoryPair : componentDataTable)
-        {
-            const auto& componentMap = categoryPair.second;
-            for (const auto& componentPair : componentMap)
-            {
-                m_gui->m_searchWidget->AddTypeFilter(categoryPair.first, componentPair.first, QVariant::fromValue<AZ::Uuid>(componentPair.second->m_typeId));
-            }
-        }
-    }
-
-    SetupActions();
-
-    m_emptyIcon = QIcon();
-    m_clearIcon = QIcon(":/AssetBrowser/Resources/close.png");
-
-    m_listModel->Initialize();
-
-    AzToolsFramework::EditorPickModeNotificationBus::Handler::BusConnect(AzToolsFramework::GetEntityContextId());
-    EntityHighlightMessages::Bus::Handler::BusConnect();
-    OutlinerModelNotificationBus::Handler::BusConnect();
-    ToolsApplicationEvents::Bus::Handler::BusConnect();
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
-    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
-    AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
-            AzToolsFramework::GetEntityContextId());
-    AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
-}
-
-OutlinerWidget::~OutlinerWidget()
-{
-    AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorPickModeNotificationBus::Handler::BusDisconnect();
-    EntityHighlightMessages::Bus::Handler::BusDisconnect();
-    OutlinerModelNotificationBus::Handler::BusDisconnect();
-    ToolsApplicationEvents::Bus::Handler::BusDisconnect();
-    AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
-    AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
-
-    delete m_listModel;
-    delete m_gui;
-}
-
-// Users should be able to drag an entity in the outliner without selecting it.
-// This is useful to allow for dragging entities into AZ::EntityId fields in the component editor.
-// There are two obvious ways to allow for this:
-//  1-Update selection behavior in the outliner's tree view to not occur until mouse release.
-//  2-Revert outliner's selection to the Editor's selection on drag actions and focus loss.
-//      Also, copy outliner's tree view selection to the Editor's selection on mouse release.
-//  Currently, the first behavior is implemented.
-void OutlinerWidget::OnSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
-{
-    if (m_selectionChangeInProgress || !m_enableSelectionUpdates)
-    {
-        return;
-    }
-
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-    AzToolsFramework::EntityIdList newlySelected;
-    ExtractEntityIdsFromSelection(selected, newlySelected);
-
-    AzToolsFramework::EntityIdList newlyDeselected;
-    ExtractEntityIdsFromSelection(deselected, newlyDeselected);
-
-    AzToolsFramework::ScopedUndoBatch undo("Select Entity");
-
-    // initialize the selection command here to store the current selection before
-    // new entities are selected or deselected below
-    // (SelectionCommand calls GetSelectedEntities in the constructor)
-    auto selectionCommand =
-        AZStd::make_unique<AzToolsFramework::SelectionCommand>(AZStd::vector<AZ::EntityId>{}, "");
-
-    // Add the newly selected and deselected entities from the outliner to the appropriate selection buffer.
-    for (const AZ::EntityId& entityId : newlySelected)
-    {
-        m_entitiesSelectedByOutliner.insert(entityId);
-    }
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::MarkEntitiesSelected, newlySelected);
-
-    for (const AZ::EntityId& entityId : newlyDeselected)
-    {
-        m_entitiesDeselectedByOutliner.insert(entityId);
-    }
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::MarkEntitiesDeselected, newlyDeselected);
-
-    // call GetSelectedEntities again after all changes, and then update the selection
-    // command  so the 'after' state is valid and up to date
-    AzToolsFramework::EntityIdList selectedEntities;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-        selectedEntities, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
-
-    selectionCommand->UpdateSelection(selectedEntities);
-
-    selectionCommand->SetParent(undo.GetUndoBatch());
-    selectionCommand.release();
-
-    m_entitiesDeselectedByOutliner.clear();
-    m_entitiesSelectedByOutliner.clear();
-}
-
-void OutlinerWidget::EntityHighlightRequested(AZ::EntityId entityId)
-{
-    if (!entityId.IsValid())
-    {
-        return;
-    }
-
-    // Pulse opacity and duration are hardcoded. It'd be great to sample this from designer-provided settings,
-    // such as the globally-applied stylesheet.
-    const float pulseOpacityStart = 0.5f;
-    const int pulseLengthMilliseconds = 500;
-
-    // Highlighting an entity in the outliner is accomplished by:
-    //  1. Make sure the entity's row is actually visible.
-    //      Accomplished with the handy "scrollTo" command.
-    //  2. Create a single colored widget
-    //      accomplished through setting the style sheet with a new background color.
-    //  3. Apply an graphics opacity effect to this widget, so it can be made transparent.
-    //  4. Creating a property animation to modify the opacity value over time, deleting the widget at 0 opacity.
-    //  5. Setting this QWidget as an "index widget" to overlay over the entity row to be highlighted.
-
-    const QModelIndex proxyIndex = GetIndexFromEntityId(entityId);
-    if (!proxyIndex.isValid())
-    {
-        return;
-    }
-
-    // Scrolling to the entity will make sure that it is visible.
-    // This will automatically open parents.
-    m_gui->m_objectTree->scrollTo(proxyIndex);
-
-    QWidget* testWidget = new QWidget(m_gui->m_objectTree);
-
-    testWidget->setProperty("PulseHighlight", true);
-
-    QGraphicsOpacityEffect* effect = new QGraphicsOpacityEffect(testWidget);
-    effect->setOpacity(pulseOpacityStart);
-    testWidget->setGraphicsEffect(effect);
-
-    QPropertyAnimation* anim = new QPropertyAnimation(testWidget);
-    anim->setTargetObject(effect);
-    anim->setPropertyName("opacity");
-    anim->setDuration(pulseLengthMilliseconds);
-    anim->setStartValue(effect->opacity());
-    anim->setEndValue(0);
-    anim->setEasingCurve(QEasingCurve::OutQuad);
-    anim->start(QAbstractAnimation::DeleteWhenStopped);
-
-    // Make sure to clean up the indexWidget when the anim is deleted
-    connect(anim, &QObject::destroyed, this, [this, entityId, testWidget]()
-    {
-        const QModelIndex proxyIndex = GetIndexFromEntityId(entityId);
-        if (proxyIndex.isValid())
-        {
-            QWidget* currentWidget = m_gui->m_objectTree->indexWidget(proxyIndex);
-            if (currentWidget == testWidget)
-            {
-                m_gui->m_objectTree->setIndexWidget(proxyIndex, nullptr);
-            }
-        }
-    });
-
-    m_gui->m_objectTree->setIndexWidget(proxyIndex, testWidget);
-}
-
-// Currently a "strong highlight" request is handled by replacing the current selection with the requested entity.
-void OutlinerWidget::EntityStrongHighlightRequested(AZ::EntityId entityId)
-{
-    // This can be sent from the Entity Inspector, and changing the selection can affect the state of that control
-    // so use singleShot with 0 to queue the response until any other events sent to the Entity Inspector have been processed
-    QTimer::singleShot(0, this, [entityId, this]() {
-        const QModelIndex proxyIndex = GetIndexFromEntityId(entityId);
-        if (!proxyIndex.isValid())
-        {
-            return;
-        }
-
-        // Scrolling to the entity will make sure that it is visible.
-        // This will automatically open parents.
-        m_gui->m_objectTree->scrollTo(proxyIndex);
-
-        // Not setting "ignoreSignal" because this will set both outliner and world selections.
-        m_gui->m_objectTree->selectionModel()->select(proxyIndex, QItemSelectionModel::ClearAndSelect);
-    });
-}
-
-void OutlinerWidget::QueueUpdateSelection()
-{
-    if (!m_selectionChangeQueued)
-    {
-        QTimer::singleShot(0, this, &OutlinerWidget::UpdateSelection);
-        m_selectionChangeQueued = true;
-    }
-}
-
-void OutlinerWidget::UpdateSelection()
-{
-    if (m_selectionChangeQueued)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-        m_selectionChangeInProgress = true;
-
-        if (m_entitiesToDeselect.size() >= 1000)
-        {
-            // Calling Deselect for a large number of items is very slow,
-            // use a single ClearAndSelect call instead.
-            AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "OutlinerWidget::ModelEntitySelectionChanged:ClearAndSelect");
-
-            AzToolsFramework::EntityIdList selectedEntities;
-            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
-            // it is expected that BuildSelectionFrom Entities results in the actual row-and-column selection.
-            m_gui->m_objectTree->selectionModel()->select(
-                BuildSelectionFromEntities(selectedEntities), QItemSelectionModel::ClearAndSelect);
-        }
-        else
-        {
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "OutlinerWidget::ModelEntitySelectionChanged:Deselect");
-                m_gui->m_objectTree->selectionModel()->select(
-                    BuildSelectionFromEntities(m_entitiesToDeselect), QItemSelectionModel::Deselect);
-            }
-            {
-                AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "OutlinerWidget::ModelEntitySelectionChanged:Select");
-                m_gui->m_objectTree->selectionModel()->select(
-                    BuildSelectionFromEntities(m_entitiesToSelect), QItemSelectionModel::Select);
-            }
-        }
-
-        // Scroll to selected entity when selecting from viewport
-        if (m_entitiesToSelect.size() > 0 && m_scrollToSelectedEntity)
-        {
-            QueueScrollToNewContent(*m_entitiesToSelect.begin());
-        }
-
-        m_gui->m_objectTree->update();
-        m_entitiesToSelect.clear();
-        m_entitiesToDeselect.clear();
-        m_selectionChangeQueued = false;
-        m_selectionChangeInProgress = false;
-    }
-}
-
-template <class EntityIdCollection>
-QItemSelection OutlinerWidget::BuildSelectionFromEntities(const EntityIdCollection& entityIds)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    QItemSelection selection;
-
-    for (const auto& entityId : entityIds)
-    {
-        const QModelIndex startOfRow = GetIndexFromEntityId(entityId);
-        
-        if (startOfRow.isValid())
-        {
-            // we select from start of row to end of row (ie, the last column), not just the first cell
-            const QModelIndex endOfRow = m_proxyModel->index(startOfRow.row(), m_proxyModel->columnCount() - 1, startOfRow.parent());
-            selection.select(startOfRow, endOfRow);
-        }
-    }
-
-    return selection;
-}
-
-void OutlinerWidget::contextMenuEvent(QContextMenuEvent* event)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-
-    bool isDocumentOpen = false;
-    EBUS_EVENT_RESULT(isDocumentOpen, AzToolsFramework::EditorRequests::Bus, IsLevelDocumentOpen);
-    if (!isDocumentOpen)
-    {
-        return;
-    }
-
-    QMenu* contextMenu = new QMenu(this);
-
-    // Populate global context menu.
-
-    AzToolsFramework::EditorContextMenuBus::Broadcast(&AzToolsFramework::EditorContextMenuEvents::PopulateEditorGlobalContextMenu,
-        contextMenu,
-        AZ::Vector2::CreateZero(),
-        AzToolsFramework::EditorEvents::eECMF_HIDE_ENTITY_CREATION | AzToolsFramework::EditorEvents::eECMF_USE_VIEWPORT_CENTER);
-
-    PrepareSelection();
-
-    // Remove the "Find in Entity Outliner" option from the context menu
-    for (QAction* action : contextMenu->actions())
-    {
-        if (action->text() == "Find in Entity Outliner")
-        {
-            contextMenu->removeAction(action);
-            break;
-        }
-    }
-
-    //register rename menu action
-    if (!m_selectedEntityIds.empty())
-    {
-        contextMenu->addSeparator();
-
-        contextMenu->addAction(m_actionToRenameSelection);
-
-        if (m_selectedEntityIds.size() == 1)
-        {
-            AZ::EntityId entityId = m_selectedEntityIds[0];
-
-            AZ::EntityId parentId;
-            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-
-            AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(parentId);
-
-            if (entityOrderArray.size() > 1)
-            {
-                if (AZStd::find(entityOrderArray.begin(), entityOrderArray.end(), entityId) != entityOrderArray.end())
-                {
-                    if (entityOrderArray.front() != entityId)
-                    {
-                        contextMenu->addAction(m_actionToMoveEntityUp);
-                    }
-
-                    if (entityOrderArray.back() != entityId)
-                    {
-                        contextMenu->addAction(m_actionToMoveEntityDown);
-                    }
-                }
-            }
-        }
-
-        contextMenu->addSeparator();
-
-        bool canGoToEntitiesInViewport = true;
-        AzToolsFramework::EditorRequestBus::BroadcastResult(canGoToEntitiesInViewport, &AzToolsFramework::EditorRequestBus::Events::CanGoToSelectedEntitiesInViewports);
-        if (!canGoToEntitiesInViewport)
-        {
-            m_actionGoToEntitiesInViewport->setEnabled(false);
-            m_actionGoToEntitiesInViewport->setToolTip(QObject::tr("The selection contains no entities that exist in the viewport."));
-        }
-        else
-        {
-            m_actionGoToEntitiesInViewport->setEnabled(true);
-            m_actionGoToEntitiesInViewport->setToolTip(QObject::tr("Moves the viewports to the bounding box for the selection."));
-        }
-        contextMenu->addAction(m_actionGoToEntitiesInViewport);        
-    }
-
-    // Register actions related to slice root selection in Outlinear list.
-    {
-        contextMenu->addSeparator();
-
-        QMenu* selectSliceRootMenu = new QMenu(contextMenu);
-        contextMenu->addMenu(selectSliceRootMenu);
-
-        selectSliceRootMenu->setTitle(QObject::tr("Select slice root"));
-        selectSliceRootMenu->setToolTip(QObject::tr("Selects a slice root in the Outliner list."));
-
-        selectSliceRootMenu->addAction(m_actionToSelectTopSliceRoot);
-        selectSliceRootMenu->addAction(m_actionToSelectSliceRootAboveSelection);
-        selectSliceRootMenu->addAction(m_actionToSelectSliceRootBelowSelection);
-        selectSliceRootMenu->addAction(m_actionToSelectBottomSliceRoot);
-
-        {
-            bool entitySelected = !m_selectedEntityIds.empty();
-            m_actionToSelectSliceRootAboveSelection->setEnabled(entitySelected);
-            m_actionToSelectSliceRootBelowSelection->setEnabled(entitySelected);
-        }
-        
-        contextMenu->addSeparator();
-    }
-
-    contextMenu->exec(event->globalPos());
-    delete contextMenu;
-}
-
-QString OutlinerWidget::FindCommonSliceAssetName(const AZStd::vector<AZ::EntityId>& entityList) const
-{
-    if (entityList.size() > 0)
-    {
-        //  Check if all selected items are in the same slice
-        QString commonSliceName = m_listModel->GetSliceAssetName(entityList.front());
-        if (!commonSliceName.isEmpty())
-        {
-            bool hasCommonSliceName = true;
-            for (const AZ::EntityId& id : entityList)
-            {
-                QString sliceName = m_listModel->GetSliceAssetName(id);
-
-                if (sliceName != commonSliceName)
-                {
-                    hasCommonSliceName = false;
-                    break;
-                }
-            }
-
-            if (hasCommonSliceName)
-            {
-                return commonSliceName;
-            }
-        }
-    }
-
-    return QString();
-}
-
-AzFramework::EntityContextId OutlinerWidget::GetPickModeEntityContextId()
-{
-    AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
-    EBUS_EVENT_RESULT(editorEntityContextId, AzToolsFramework::EditorRequests::Bus, GetEntityContextId);
-
-    return editorEntityContextId;
-}
-
-void OutlinerWidget::PrepareSelection()
-{
-    m_selectedEntityIds.clear();
-    EBUS_EVENT_RESULT(m_selectedEntityIds, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
-}
-
-void OutlinerWidget::DoCreateEntity()
-{
-    PrepareSelection();
-
-    if (m_selectedEntityIds.empty())
-    {
-        DoCreateEntityWithParent(AZ::EntityId());
-        return;
-    }
-
-    if (m_selectedEntityIds.size() == 1)
-    {
-        DoCreateEntityWithParent(m_selectedEntityIds.front());
-        return;
-    }
-}
-
-void OutlinerWidget::DoCreateEntityWithParent(const AZ::EntityId& parentId)
-{
-    PrepareSelection();
-
-    AZ::EntityId entityId;
-    EBUS_EVENT_RESULT(entityId, AzToolsFramework::EditorRequests::Bus, CreateNewEntity, parentId);
-}
-
-void OutlinerWidget::DoShowSlice()
-{
-    PrepareSelection();
-
-    if (!m_selectedEntityIds.empty())
-    {
-        QString commonSliceName = FindCommonSliceAssetName(m_selectedEntityIds);
-        if (!commonSliceName.isEmpty())
-        {
-            EBUS_EVENT(AzToolsFramework::ToolsApplicationEvents::Bus, ShowAssetInBrowser, commonSliceName.toStdString().c_str());
-        }
-    }
-}
-
-void OutlinerWidget::DoDuplicateSelection()
-{
-    PrepareSelection();
-
-    if (!m_selectedEntityIds.empty())
-    {
-        AzToolsFramework::ScopedUndoBatch undo("Duplicate Entity(s)");
-
-        bool handled = false;
-        EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, CloneSelection, handled);
-    }
-}
-
-void OutlinerWidget::DoDeleteSelection()
-{
-    PrepareSelection();
-
-    EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, DeleteSelectedEntities, false);
-
-    PrepareSelection();
-}
-
-void OutlinerWidget::DoDeleteSelectionAndDescendants()
-{
-    PrepareSelection();
-
-    EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, DeleteSelectedEntities, true);
-
-    PrepareSelection();
-}
-
-void OutlinerWidget::DoRenameSelection()
-{
-    PrepareSelection();
-
-    if (m_selectedEntityIds.size() == 1)
-    {
-        const QModelIndex proxyIndex = GetIndexFromEntityId(m_selectedEntityIds.front());
-        if (proxyIndex.isValid())
-        {
-            m_gui->m_objectTree->setCurrentIndex(proxyIndex);
-            m_gui->m_objectTree->QTreeView::edit(proxyIndex);
-        }
-    }
-    else
-    {
-        bool okPressed = false;
-        QString outputText = QInputDialog::getText(this, tr("Rename"), tr("Name:"), QLineEdit::Normal, tr(""), &okPressed);
-        if (okPressed && !outputText.isEmpty())
-        {
-            AZStd::string newName(outputText.toUtf8().constData());
-
-            AzToolsFramework::ScopedUndoBatch undo("Rename Entities");
-            bool entitiesRenamed = false;
-
-            for (AZ::EntityId entityId : m_selectedEntityIds)
-            {
-                AZ::Entity* entity = nullptr;
-                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, entityId);
-
-                if (entity)
-                {
-                    AZStd::string_view oldName = entity->GetName();
-
-                    if (oldName != newName)
-                    {
-                        entity->SetName(newName);
-                        undo.MarkEntityDirty(entity->GetId());
-                        entitiesRenamed = true;
-                    }
-                }
-            }
-
-            if (entitiesRenamed)
-            {
-                // In all other cases during a rename it triggers an entireTree refresh, so we're going to do the same here
-                AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast(
-                    &AzToolsFramework::ToolsApplicationEvents::Bus::Events::InvalidatePropertyDisplay,
-                    AzToolsFramework::Refresh_EntireTree);
-            }
-        }
-    }
-}
-
-void OutlinerWidget::DoMoveEntityUp()
-{
-    PrepareSelection();
-
-    if (m_selectedEntityIds.size() != 1)
-    {
-        return;
-    }
-
-    AZ::EntityId entityId = m_selectedEntityIds[0];
-    AZ_Assert(entityId.IsValid(), "Invalid entity selected to move up");
-    if (!entityId.IsValid())
-    {
-        return;
-    }
-
-    AZ::EntityId parentId;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-
-    AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(parentId);
-
-    auto entityItr = AZStd::find(entityOrderArray.begin(), entityOrderArray.end(), entityId);
-    if (entityOrderArray.empty() || entityOrderArray.front() == entityId || entityItr == entityOrderArray.end())
-    {
-        return;
-    }
-
-    AzToolsFramework::ScopedUndoBatch undo("Move Entity Up");
-
-    // Parent is dirty due to sort change
-    undo.MarkEntityDirty(AzToolsFramework::GetEntityIdForSortInfo(parentId));
-
-    AZStd::swap(*entityItr, *(entityItr - 1));
-    AzToolsFramework::SetEntityChildOrder(parentId, entityOrderArray);
-}
-
-void OutlinerWidget::DoMoveEntityDown()
-{
-    PrepareSelection();
-
-    if (m_selectedEntityIds.size() != 1)
-    {
-        return;
-    }
-
-    AZ::EntityId entityId = m_selectedEntityIds[0];
-    AZ_Assert(entityId.IsValid(), "Invalid entity selected to move down");
-    if (!entityId.IsValid())
-    {
-        return;
-    }
-
-    AZ::EntityId parentId;
-    AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-
-    AzToolsFramework::EntityOrderArray entityOrderArray = AzToolsFramework::GetEntityChildOrder(parentId);
-
-    auto entityItr = AZStd::find(entityOrderArray.begin(), entityOrderArray.end(), entityId);
-    if (entityOrderArray.empty() || entityOrderArray.back() == entityId || entityItr == entityOrderArray.end())
-    {
-        return;
-    }
-
-    AzToolsFramework::ScopedUndoBatch undo("Move Entity Down");
-
-    // Parent is dirty due to sort change
-    undo.MarkEntityDirty(AzToolsFramework::GetEntityIdForSortInfo(parentId));
-
-    AZStd::swap(*entityItr, *(entityItr + 1));
-    AzToolsFramework::SetEntityChildOrder(parentId, entityOrderArray);
-}
-
-void OutlinerWidget::GoToEntitiesInViewport()
-{
-    AzToolsFramework::EditorRequestBus::Broadcast(&AzToolsFramework::EditorRequestBus::Events::GoToSelectedEntitiesInViewports);
-}
-
-void OutlinerWidget::DoSelectSliceRootNextToSelection(bool isTraversalUpwards)
-{
-    const auto treeView = m_gui->m_objectTree;
-
-    QModelIndex currentIdx = treeView->currentIndex();
-    if (!currentIdx.isValid())
-    {
-        return;
-    }
-
-    AZ::EntityId currentEntityId;
-    bool currentIdxSelected = false;
-    currentEntityId = GetEntityIdFromIndex(currentIdx);
-
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-        currentIdxSelected, &AzToolsFramework::ToolsApplicationRequests::IsSelected, currentEntityId);
-
-    if (!currentIdxSelected)
-    {
-        return;
-    }
-
-    AZStd::function<QModelIndex(QModelIndex)> getNextIdxFunction =
-        AZStd::bind(isTraversalUpwards ? &QTreeView::indexAbove : &QTreeView::indexBelow, treeView, AZStd::placeholders::_1);
-    QModelIndex nextIdx = getNextIdxFunction(currentIdx);
-    bool foundSliceRoot = false;
-
-    while (nextIdx.isValid() && !foundSliceRoot)
-    {
-        currentIdx = nextIdx;
-        currentEntityId = GetEntityIdFromIndex(currentIdx);
-
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            foundSliceRoot, &AzToolsFramework::ToolsApplicationRequests::IsSliceRootEntity, currentEntityId);
-
-        nextIdx = getNextIdxFunction(currentIdx);
-    }
-
-    if (foundSliceRoot)
-    {
-        SetIndexAsCurrentAndSelected(currentIdx);
-    }
-}
-
-void OutlinerWidget::DoSelectSliceRootAboveSelection()
-{
-    DoSelectSliceRootNextToSelection(true);
-}
-
-
-void OutlinerWidget::DoSelectSliceRootBelowSelection()
-{
-    DoSelectSliceRootNextToSelection(false);
-}
-
-void OutlinerWidget::DoSelectEdgeSliceRoot(bool shouldSelectTopMostSlice)
-{
-    const auto treeView = m_gui->m_objectTree;
-    const auto itemModel = treeView->model();
-    if (itemModel->rowCount() == 0)
-    {
-        return;
-    }
-
-    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
-    {
-        currentIdx = itemModel->index(itemModel->rowCount() - 1, OutlinerListModel::ColumnName);
-        while (itemModel->rowCount(currentIdx) > 0 && treeView->isExpanded(currentIdx))
-        {
-            currentIdx = itemModel->index(itemModel->rowCount(currentIdx) - 1, OutlinerListModel::ColumnName, currentIdx);
-        }
-
-        getNextIdxFunction =
-            AZStd::bind(&QTreeView::indexAbove, treeView, AZStd::placeholders::_1);
-    }
-
-    QModelIndex nextIdx = currentIdx;
-    bool foundSliceRoot = false;
-    AZ::EntityId currentEntityId;
-    do
-    {
-        currentIdx = nextIdx;
-        currentEntityId = GetEntityIdFromIndex(currentIdx);
-
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            foundSliceRoot, &AzToolsFramework::ToolsApplicationRequests::IsSliceRootEntity, currentEntityId);
-        nextIdx = getNextIdxFunction(currentIdx);
-    } while (nextIdx.isValid() && !foundSliceRoot);
-
-    if (foundSliceRoot)
-    {
-        SetIndexAsCurrentAndSelected(currentIdx);
-    }
-}
-
-
-void OutlinerWidget::DoSelectTopSliceRoot()
-{
-    DoSelectEdgeSliceRoot(true);
-}
-
-void OutlinerWidget::DoSelectBottomSliceRoot()
-{
-    DoSelectEdgeSliceRoot(false);
-}
-
-void OutlinerWidget::SetIndexAsCurrentAndSelected(const QModelIndex& index)
-{
-    m_gui->m_objectTree->setCurrentIndex(index);
-
-    AZ::EntityId entityId = GetEntityIdFromIndex(index);
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::SetSelectedEntities, AzToolsFramework::EntityIdList{ entityId });
-}
-
-void OutlinerWidget::SetupActions()
-{
-    m_actionToShowSlice = new QAction(tr("Show Slice"), this);
-    m_actionToShowSlice->setShortcut(tr("Ctrl+Shift+F"));
-    m_actionToShowSlice->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToShowSlice, &QAction::triggered, this, &OutlinerWidget::DoShowSlice);
-    addAction(m_actionToShowSlice);
-
-    m_actionToCreateEntity = new QAction(tr("Create Entity"), this);
-    m_actionToCreateEntity->setShortcut(tr("Ctrl+Alt+N"));
-    m_actionToCreateEntity->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToCreateEntity, &QAction::triggered, this, &OutlinerWidget::DoCreateEntity);
-    addAction(m_actionToCreateEntity);
-
-    m_actionToDeleteSelection = new QAction(tr("Delete"), this);
-    m_actionToDeleteSelection->setShortcut(QKeySequence("Shift+Delete"));
-    m_actionToDeleteSelection->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToDeleteSelection, &QAction::triggered, this, &OutlinerWidget::DoDeleteSelection);
-    addAction(m_actionToDeleteSelection);
-
-    m_actionToDeleteSelectionAndDescendants = new QAction(tr("Delete Selection And Descendants"), this);
-    m_actionToDeleteSelectionAndDescendants->setShortcut(QKeySequence::Delete);
-    m_actionToDeleteSelectionAndDescendants->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToDeleteSelectionAndDescendants, &QAction::triggered, this, &OutlinerWidget::DoDeleteSelectionAndDescendants);
-    addAction(m_actionToDeleteSelectionAndDescendants);
-
-    m_actionToRenameSelection = new QAction(tr("Rename"), this);
-#ifdef AZ_PLATFORM_MAC
-    // "Alt+Return" translates to Option+Return on macOS
-    m_actionToRenameSelection->setShortcut(tr("Alt+Return"));
-#else
-    m_actionToRenameSelection->setShortcut(tr("F2"));
-#endif
-    m_actionToRenameSelection->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToRenameSelection, &QAction::triggered, this, &OutlinerWidget::DoRenameSelection);
-    addAction(m_actionToRenameSelection);
-
-    m_actionToMoveEntityUp = new QAction(tr("Move up"), this);
-    m_actionToMoveEntityUp->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToMoveEntityUp, &QAction::triggered, this, &OutlinerWidget::DoMoveEntityUp);
-    addAction(m_actionToMoveEntityUp);
-
-    m_actionToMoveEntityDown = new QAction(tr("Move down"), this);
-    m_actionToMoveEntityDown->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToMoveEntityDown, &QAction::triggered, this, &OutlinerWidget::DoMoveEntityDown);
-    addAction(m_actionToMoveEntityDown);
-
-    m_actionGoToEntitiesInViewport = new QAction(tr("Find in viewport"), this);
-    m_actionGoToEntitiesInViewport->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionGoToEntitiesInViewport, &QAction::triggered, this, &OutlinerWidget::GoToEntitiesInViewport);
-    addAction(m_actionGoToEntitiesInViewport);
-
-    m_actionToSelectSliceRootAboveSelection = new QAction(tr("Up"), this);
-    m_actionToSelectSliceRootAboveSelection->setToolTip(tr("Select the first slice root above the selection in the Outliner list."));
-    m_actionToSelectSliceRootAboveSelection->setShortcut(QKeySequence("Ctrl+Up"));
-    m_actionToSelectSliceRootAboveSelection->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToSelectSliceRootAboveSelection, &QAction::triggered, this, &OutlinerWidget::DoSelectSliceRootAboveSelection);
-    addAction(m_actionToSelectSliceRootAboveSelection);
-
-    m_actionToSelectSliceRootBelowSelection = new QAction(tr("Down"), this);
-    m_actionToSelectSliceRootBelowSelection->setToolTip(tr("Select the first slice root below the selection in the Outliner list."));
-    m_actionToSelectSliceRootBelowSelection->setShortcut(QKeySequence("Ctrl+Down"));
-    m_actionToSelectSliceRootBelowSelection->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToSelectSliceRootBelowSelection, &QAction::triggered, this, &OutlinerWidget::DoSelectSliceRootBelowSelection);
-    addAction(m_actionToSelectSliceRootBelowSelection);
-
-    m_actionToSelectTopSliceRoot = new QAction(tr("Top"), this);
-    m_actionToSelectTopSliceRoot->setToolTip(tr("Select the slice root at the top of the Outliner list."));
-    m_actionToSelectTopSliceRoot->setShortcut(QKeySequence("Ctrl+Home"));
-    m_actionToSelectTopSliceRoot->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToSelectTopSliceRoot, &QAction::triggered, this, &OutlinerWidget::DoSelectTopSliceRoot);
-    addAction(m_actionToSelectTopSliceRoot);
-
-    m_actionToSelectBottomSliceRoot = new QAction(tr("Bottom"), this);
-    m_actionToSelectBottomSliceRoot->setToolTip(tr("Select the slice root at the bottom of the Outliner list."));
-    m_actionToSelectBottomSliceRoot->setShortcut(QKeySequence("Ctrl+End"));
-    m_actionToSelectBottomSliceRoot->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    connect(m_actionToSelectBottomSliceRoot, &QAction::triggered, this, &OutlinerWidget::DoSelectBottomSliceRoot);
-    addAction(m_actionToSelectBottomSliceRoot);
-}
-
-void OutlinerWidget::SelectSliceRoot()
-{
-   MainWindow::instance()->OnGotoSliceRoot();
-}
-
-void OutlinerWidget::OnEntityPickModeStarted()
-{
-    m_gui->m_objectTree->setDragEnabled(false);
-    m_gui->m_objectTree->setSelectionMode(QAbstractItemView::NoSelection);
-    m_gui->m_objectTree->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    m_inObjectPickMode = true;
-}
-
-void OutlinerWidget::OnEntityPickModeStopped()
-{
-    m_gui->m_objectTree->setDragEnabled(true);
-    m_gui->m_objectTree->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    m_gui->m_objectTree->setEditTriggers(QAbstractItemView::SelectedClicked | QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);
-    m_inObjectPickMode = false;
-}
-
-void OutlinerWidget::OnTreeItemClicked(const QModelIndex &index)
-{
-    if (m_inObjectPickMode)
-    {
-        const AZ::EntityId entityId = GetEntityIdFromIndex(index);
-        if (entityId.IsValid())
-        {
-            AzToolsFramework::EditorPickModeRequestBus::Broadcast(
-                &AzToolsFramework::EditorPickModeRequests::PickModeSelectEntity, entityId);
-        }
-
-        AzToolsFramework::EditorPickModeRequestBus::Broadcast(
-            &AzToolsFramework::EditorPickModeRequests::StopEntityPickMode);
-    }
-
-    switch (index.column())
-    {
-        case OutlinerListModel::ColumnVisibilityToggle:
-        case OutlinerListModel::ColumnLockToggle:
-            // Don't care passing an explicit check state as the model is just toggling on its own
-            m_gui->m_objectTree->model()->setData(index, Qt::CheckState(), Qt::CheckStateRole);
-            break;
-    }
-}
-
-void OutlinerWidget::OnTreeItemExpanded(const QModelIndex &index)
-{
-    m_listModel->OnEntityExpanded(GetEntityIdFromIndex(index));
-}
-
-void OutlinerWidget::OnTreeItemCollapsed(const QModelIndex &index)
-{
-    m_listModel->OnEntityCollapsed(GetEntityIdFromIndex(index));
-}
-
-void OutlinerWidget::OnExpandEntity(const AZ::EntityId& entityId, bool expand)
-{
-    m_gui->m_objectTree->setExpanded(GetIndexFromEntityId(entityId), expand);
-}
-
-void OutlinerWidget::OnSelectEntity(const AZ::EntityId& entityId, bool selected)
-{
-    if (selected)
-    {
-        if (m_entitiesSelectedByOutliner.find(entityId) == m_entitiesSelectedByOutliner.end())
-        {
-            m_entitiesToSelect.insert(entityId);
-            m_entitiesToDeselect.erase(entityId);
-        }
-    }
-    else
-    {
-        if (m_entitiesDeselectedByOutliner.find(entityId) == m_entitiesDeselectedByOutliner.end())
-        {
-            m_entitiesToSelect.erase(entityId);
-            m_entitiesToDeselect.insert(entityId);
-        }
-    }
-    QueueUpdateSelection();
-}
-
-void OutlinerWidget::OnEnableSelectionUpdates(bool enable)
-{
-    m_enableSelectionUpdates = enable;
-}
-
-void OutlinerWidget::OnDropEvent()
-{
-    m_dropOperationInProgress = true;
-    m_listModel->SetDropOperationInProgress(true);
-}
-
-void OutlinerWidget::OnEditorEntityCreated(const AZ::EntityId& entityId)
-{
-    QueueContentUpdateSort(entityId);
-    QueueScrollToNewContent(entityId);
- 
-    // When a new entity is created we need to make sure to apply the filter
-    m_listModel->FilterEntity(entityId);
-}
-
-void OutlinerWidget::ScrollToNewContent()
-{
-    m_scrollToNewContentQueued = false;
-    
-    // Scroll to the parent entity when auto-expand is disabled and the user doesn't click on the "Find in Entity Outliner" option in the context menu
-    if (!m_expandSelectedEntity && !m_focusInEntityOutliner)
-    {
-        AZ::EntityId parentId = m_scrollToEntityId;
-        while (parentId.IsValid())
-        {
-            m_scrollToEntityId = parentId;
-            parentId.SetInvalid();
-            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, m_scrollToEntityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-        }
-    }
-
-    const QModelIndex proxyIndex = GetIndexFromEntityId(m_scrollToEntityId);
-    if (!proxyIndex.isValid())
-    {
-        QueueScrollToNewContent(m_scrollToEntityId);
-        return;
-    }
-
-    m_gui->m_objectTree->scrollTo(proxyIndex, QAbstractItemView::PositionAtTop);
-    m_focusInEntityOutliner = false;
-}
-
-void OutlinerWidget::QueueScrollToNewContent(const AZ::EntityId& entityId)
-{
-    if (m_dropOperationInProgress)
-    {
-        //don't scroll as the result of a drop operation, in order to stop new parent auto expanding. You can only drop in visible areas anyway. 
-        m_dropOperationInProgress = false;
-        m_listModel->SetDropOperationInProgress(false);
-        return;
-    }
-
-    if (entityId.IsValid())
-    {
-        m_scrollToEntityId = entityId;
-        if (!m_scrollToNewContentQueued)
-        {
-            m_scrollToNewContentQueued = true;
-            QTimer::singleShot(queuedChangeDelay, this, &OutlinerWidget::ScrollToNewContent);
-        }
-    }
-}
-
-AZ::EntityId OutlinerWidget::GetEntityIdFromIndex(const QModelIndex& index) const
-{
-    if (index.isValid())
-    {
-        const QModelIndex modelIndex = m_proxyModel->mapToSource(index);
-        if (modelIndex.isValid())
-        {
-            return m_listModel->GetEntityFromIndex(modelIndex);
-        }
-    }
-
-    return AZ::EntityId();
-}
-
-QModelIndex OutlinerWidget::GetIndexFromEntityId(const AZ::EntityId& entityId) const
-{
-    if (entityId.IsValid())
-    {
-        QModelIndex modelIndex = m_listModel->GetIndexFromEntity(entityId, 0);
-        if (modelIndex.isValid())
-        {
-            return m_proxyModel->mapFromSource(modelIndex);
-        }
-    }
-
-    return QModelIndex();
-}
-
-void OutlinerWidget::ExtractEntityIdsFromSelection(const QItemSelection& selection, AzToolsFramework::EntityIdList& entityIdList) const
-{
-    entityIdList.reserve(selection.indexes().count());
-    for (const auto& index : selection.indexes())
-    {
-        // Skip any column except the main name column...
-        if (index.column() == OutlinerListModel::ColumnName)
-        {
-            const AZ::EntityId entityId = GetEntityIdFromIndex(index);
-            if (entityId.IsValid())
-            {
-                entityIdList.push_back(entityId);
-            }
-        }
-    }
-}
-
-void OutlinerWidget::OnSearchTextChanged(const QString& activeTextFilter)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-    AZStd::string filterString = activeTextFilter.toUtf8().data();
-
-    m_listModel->SearchStringChanged(filterString);
-    m_proxyModel->UpdateFilter();
-}
-
-void OutlinerWidget::OnFilterChanged(const AzQtComponents::SearchTypeFilterList& activeTypeFilters)
-{
-    AZStd::vector<OutlinerListModel::ComponentTypeValue> componentFilters;
-    componentFilters.reserve(activeTypeFilters.count());
-
-    for (auto filter : activeTypeFilters)
-    {
-        OutlinerListModel::ComponentTypeValue value;
-        value.m_uuid = qvariant_cast<AZ::Uuid>(filter.metadata);
-        value.m_globalVal = filter.globalFilterValue;
-        componentFilters.push_back(value);
-    }
-
-    m_listModel->SearchFilterChanged(componentFilters);
-    m_proxyModel->UpdateFilter();
-}
-
-void OutlinerWidget::InvalidateFilter()
-{
-    m_listModel->InvalidateFilter();
-    m_proxyModel->UpdateFilter();
-}
-
-void OutlinerWidget::ClearFilter()
-{
-    m_gui->m_searchWidget->ClearTextFilter();
-    m_gui->m_searchWidget->ClearTypeFilter();
-}
-
-void OutlinerWidget::OnStartPlayInEditor()
-{
-    setEnabled(false);
-}
-
-void OutlinerWidget::OnStopPlayInEditor()
-{
-    setEnabled(true);
-}
-
-static void SetEntityOutlinerState(Ui::OutlinerWidgetUI* entityOutlinerUi, const bool on)
-{
-    AzQtComponents::SetWidgetInteractEnabled(entityOutlinerUi->m_objectTree, on);
-    AzQtComponents::SetWidgetInteractEnabled(entityOutlinerUi->m_searchWidget, on);
-}
-
-void OutlinerWidget::EnteredComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
-{
-    SetEntityOutlinerState(m_gui, false);
-    setEnabled(false);
-}
-
-void OutlinerWidget::LeftComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
-{
-    setEnabled(true);
-    SetEntityOutlinerState(m_gui, true);
-}
-
-void OutlinerWidget::OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, AZ::SliceComponent::SliceInstanceAddress& sliceAddress, const AzFramework::SliceInstantiationTicket& /*ticket*/)
-{
-    const AZ::SliceComponent::SliceReference* reference = sliceAddress.GetReference();
-    const AZ::SliceComponent::SliceInstance* instance = sliceAddress.GetInstance();
-    if (reference && instance)
-    {
-        // guard against special case slices (e.g. default slice) that produce technically valid, but garbage, slice instances
-        const AZ::SliceComponent::SliceReference::SliceInstances& sliceInstances = reference->GetInstances();
-        if (sliceInstances.find(*instance) != sliceInstances.end())
-        {
-            for (const AZ::Entity* entity : instance->GetInstantiated()->m_entities)
-            {
-                QueueContentUpdateSort(entity->GetId());
-            }
-        }
-    }
-}
-
-void OutlinerWidget::OnEntityInfoUpdatedAddChildEnd(AZ::EntityId /*parentId*/, AZ::EntityId childId)
-{
-    QueueContentUpdateSort(childId);
-}
-
-void OutlinerWidget::OnEntityInfoUpdatedName(AZ::EntityId entityId, const AZStd::string& /*name*/)
-{
-    QueueContentUpdateSort(entityId);   
-}
-
-void OutlinerWidget::QueueContentUpdateSort(const AZ::EntityId& entityId)
-{
-    if (m_sortMode != EntityOutliner::DisplaySortMode::Manually && entityId.IsValid())
-    {
-        m_entitiesToSort.insert(entityId);
-        if (!m_sortContentQueued)
-        {
-            m_sortContentQueued = true;
-            QTimer::singleShot(queuedChangeDelay, this, &OutlinerWidget::SortContent);
-        }
-    }
-}
-
-void OutlinerWidget::SortContent()
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-
-    m_sortContentQueued = false;
-
-    // kick out early if we somehow managed to get here with manual sorting set
-    if (m_sortMode == EntityOutliner::DisplaySortMode::Manually)
-    {
-        m_entitiesToSort.clear();
-        return;
-    }
-
-    AzToolsFramework::EntityIdSet parentsToSort;
-    for (const AZ::EntityId& entityId : m_entitiesToSort)
-    {
-        AZ::EntityId parentId; 
-        AzToolsFramework::EditorEntityInfoRequestBus::EventResult(parentId, entityId, &AzToolsFramework::EditorEntityInfoRequestBus::Events::GetParent);
-        parentsToSort.insert(parentId);
-    }
-    m_entitiesToSort.clear();
-
-    auto comparer = AZStd::bind(&CompareEntitiesForSorting, AZStd::placeholders::_1, AZStd::placeholders::_2, m_sortMode);
-    for (const AZ::EntityId& entityId : parentsToSort)
-    {
-        SortEntityChildren(entityId, comparer);
-    }
-}
-
-void OutlinerWidget::OnSortModeChanged(EntityOutliner::DisplaySortMode sortMode)
-{
-    if (m_sortMode == sortMode)
-    {
-        return;
-    }
-
-    if (sortMode != EntityOutliner::DisplaySortMode::Manually)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
-        auto comparer = AZStd::bind(&CompareEntitiesForSorting, AZStd::placeholders::_1, AZStd::placeholders::_2, sortMode);
-        SortEntityChildrenRecursively(AZ::EntityId(), comparer);
-    }
-
-    m_sortMode = sortMode;
-    m_listModel->SetSortMode(m_sortMode);
-}
-
-void OutlinerWidget::OnDisplayOptionChanged(EntityOutliner::DisplayOption displayOption, bool enable)
-{
-    switch (displayOption)
-    {
-        case EntityOutliner::DisplayOption::AutoScroll:
-            m_scrollToSelectedEntity = enable;
-            break;
-
-        case EntityOutliner::DisplayOption::AutoExpand:
-            m_expandSelectedEntity = enable;
-            m_listModel->EnableAutoExpand(enable);
-            break;
-
-        default:
-            AZ_Assert(false, "Unknown display option event received (%d)", static_cast<int>(displayOption));
-            break;
-    }
-}
-
-void OutlinerWidget::OnFocusInEntityOutliner(const AzToolsFramework::EntityIdList& entityIdList)
-{
-    m_focusInEntityOutliner = true;
-
-    QModelIndex firstSelectedEntityIndex = GetIndexFromEntityId(entityIdList.front());
-    for (const AZ::EntityId& entityId : entityIdList)
-    {
-        QModelIndex index = GetIndexFromEntityId(entityId);
-        firstSelectedEntityIndex = index < firstSelectedEntityIndex ? index : firstSelectedEntityIndex;
-    }
-
-    QueueScrollToNewContent(GetEntityIdFromIndex(firstSelectedEntityIndex));
-}
-
-#include <UI/Outliner/moc_OutlinerWidget.cpp>
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx
deleted file mode 100644
index ea28892847..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef OUTLINER_VIEW_H
-#define OUTLINER_VIEW_H
-
-#if !defined(Q_MOC_RUN)
-#include "OutlinerCacheBus.h"
-
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/base.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
-#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
-#include <AzToolsFramework/ToolsMessaging/EntityHighlightBus.h>
-#include <AzToolsFramework/UI/SearchWidget/SearchWidgetTypes.hxx>
-#include "OutlinerSearchWidget.h"
-
-#include <QWidget>
-#include <QtGui/QIcon>
-#endif
-
-#pragma once
-
-class QAction;
-
-namespace Ui
-{
-    class OutlinerWidgetUI;
-}
-
-class QItemSelection;
-
-class OutlinerListModel;
-class OutlinerSortFilterProxyModel;
-
-namespace EntityOutliner
-{
-    class DisplayOptionsMenu;
-    enum class DisplaySortMode : unsigned char;
-    enum class DisplayOption : unsigned char;
-}
-
-class OutlinerWidget
-    : public QWidget
-    , private AzToolsFramework::EditorPickModeNotificationBus::Handler
-    , private AzToolsFramework::EntityHighlightMessages::Bus::Handler
-    , private OutlinerModelNotificationBus::Handler
-    , private AzToolsFramework::ToolsApplicationEvents::Bus::Handler
-    , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
-    , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler
-    , private AzToolsFramework::EditorEntityInfoNotificationBus::Handler
-    , private AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler
-{
-    Q_OBJECT;
-public:
-    AZ_CLASS_ALLOCATOR(OutlinerWidget, AZ::SystemAllocator, 0)
-
-    OutlinerWidget(QWidget* pParent = NULL, Qt::WindowFlags flags = Qt::WindowFlags());
-    virtual ~OutlinerWidget();
-
-private Q_SLOTS:
-    void OnSelectionChanged(const QItemSelection&, const QItemSelection&);
-
-    void OnSearchTextChanged(const QString& activeTextFilter);
-    void OnFilterChanged(const AzQtComponents::SearchTypeFilterList& activeTypeFilters);
-
-    void OnSortModeChanged(EntityOutliner::DisplaySortMode sortMode);
-    void OnDisplayOptionChanged(EntityOutliner::DisplayOption displayOption, bool enable);
-
-private:
-    void contextMenuEvent(QContextMenuEvent* event) override;
-
-    QString FindCommonSliceAssetName(const AZStd::vector<AZ::EntityId>& entityList) const;
-
-    AzFramework::EntityContextId GetPickModeEntityContextId();
-
-    // EntityHighlightMessages
-    virtual void EntityHighlightRequested(AZ::EntityId) override;
-    virtual void EntityStrongHighlightRequested(AZ::EntityId) override;
-
-    // EditorPickModeNotificationBus
-    void OnEntityPickModeStarted() override;
-    void OnEntityPickModeStopped() override;
-
-    // SliceEditorEntityOwnershipServiceNotificationBus
-    void OnSliceInstantiated(const AZ::Data::AssetId& /*sliceAssetId*/, AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/, const AzFramework::SliceInstantiationTicket& /*ticket*/) override;
-
-    // EditorEntityContextNotificationBus
-    void OnEditorEntityCreated(const AZ::EntityId& entityId) override;
-    void OnStartPlayInEditor() override;
-    void OnStopPlayInEditor() override;
-    void OnFocusInEntityOutliner(const AzToolsFramework::EntityIdList& entityIdList) override;
-
-    /// AzToolsFramework::EditorEntityInfoNotificationBus implementation
-    void OnEntityInfoUpdatedAddChildEnd(AZ::EntityId /*parentId*/, AZ::EntityId /*childId*/) override;
-    void OnEntityInfoUpdatedName(AZ::EntityId entityId, const AZStd::string& /*name*/) override;
-
-    // EditorComponentModeNotificationBus
-    void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
-    void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
-
-    // Build a selection object from the given entities. Entities already in the Widget's selection buffers are ignored.
-    template <class EntityIdCollection>
-    QItemSelection BuildSelectionFromEntities(const EntityIdCollection& entityIds);
-
-    Ui::OutlinerWidgetUI* m_gui;
-    OutlinerListModel* m_listModel;
-    OutlinerSortFilterProxyModel* m_proxyModel;
-    AZ::u64 m_selectionContextId;
-    AZStd::vector<AZ::EntityId> m_selectedEntityIds;
-
-    void PrepareSelection();
-    void DoCreateEntity();
-    void DoCreateEntityWithParent(const AZ::EntityId& parentId);
-    void DoShowSlice();
-    void DoDuplicateSelection();
-    void DoDeleteSelection();
-    void DoDeleteSelectionAndDescendants();
-    void DoRenameSelection();
-    void DoMoveEntityUp();
-    void DoMoveEntityDown();
-    void GoToEntitiesInViewport();
-
-    void DoSelectSliceRootAboveSelection();
-    void DoSelectSliceRootBelowSelection();
-    void DoSelectTopSliceRoot();
-    void DoSelectBottomSliceRoot();
-
-    void DoSelectSliceRootNextToSelection(bool above);
-    void DoSelectEdgeSliceRoot(bool top);
-
-    void SetIndexAsCurrentAndSelected(const QModelIndex& index);
-
-    void SetupActions();
-    void SelectSliceRoot();
-
-    QAction* m_actionToShowSlice;
-    QAction* m_actionToCreateEntity;
-    QAction* m_actionToDeleteSelection;
-    QAction* m_actionToDeleteSelectionAndDescendants;
-    QAction* m_actionToRenameSelection;
-    QAction* m_actionToReparentSelection;
-    QAction* m_actionToMoveEntityUp;
-    QAction* m_actionToMoveEntityDown;
-    QAction* m_actionGoToEntitiesInViewport;
-
-    QAction* m_actionToSelectSliceRootAboveSelection;
-    QAction* m_actionToSelectSliceRootBelowSelection;
-    QAction* m_actionToSelectTopSliceRoot;
-    QAction* m_actionToSelectBottomSliceRoot;
-
-    void OnTreeItemClicked(const QModelIndex &index);
-    void OnTreeItemExpanded(const QModelIndex &index);
-    void OnTreeItemCollapsed(const QModelIndex &index);
-    void OnExpandEntity(const AZ::EntityId& entityId, bool expand);
-    void OnSelectEntity(const AZ::EntityId& entityId, bool selected);
-    void OnEnableSelectionUpdates(bool enable);
-    void OnDropEvent();
-    bool m_inObjectPickMode;
-
-    void InvalidateFilter();
-    void ClearFilter();
-
-    AZ::EntityId GetEntityIdFromIndex(const QModelIndex& index) const;
-    QModelIndex GetIndexFromEntityId(const AZ::EntityId& entityId) const;
-    void ExtractEntityIdsFromSelection(const QItemSelection& selection, AzToolsFramework::EntityIdList& entityIdList) const;
-
-    // AzToolsFramework::OutlinerModelNotificationBus::Handler
-    // Receive notification from the outliner model that we should scroll
-    // to a given entity
-    void QueueScrollToNewContent(const AZ::EntityId& entityId) override;
-
-    void ScrollToNewContent();
-    bool m_scrollToNewContentQueued;
-    bool m_scrollToSelectedEntity;
-    bool m_dropOperationInProgress;
-    bool m_expandSelectedEntity;
-    bool m_focusInEntityOutliner;
-    AZ::EntityId m_scrollToEntityId;
-
-    void QueueUpdateSelection();
-    void UpdateSelection();
-    AzToolsFramework::EntityIdSet m_entitiesToSelect;
-    AzToolsFramework::EntityIdSet m_entitiesToDeselect;
-    AzToolsFramework::EntityIdSet m_entitiesSelectedByOutliner;
-    AzToolsFramework::EntityIdSet m_entitiesDeselectedByOutliner;
-    bool m_selectionChangeQueued;
-    bool m_selectionChangeInProgress;
-    bool m_enableSelectionUpdates;
-
-    QIcon m_emptyIcon;
-    QIcon m_clearIcon;
-
-    void QueueContentUpdateSort(const AZ::EntityId& entityId);
-    void SortContent();
-
-    EntityOutliner::DisplayOptionsMenu* m_displayOptionsMenu;
-    AzToolsFramework::EntityIdSet m_entitiesToSort;
-    EntityOutliner::DisplaySortMode m_sortMode;
-    bool m_sortContentQueued;
-};
-
-#endif
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.cpp
deleted file mode 100644
index 7ebab4b05b..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "UI/QComponentEntityEditorMainWindow.h"
-
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
-#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
-
-#include <QVBoxLayout>
-
-QComponentEntityEditorInspectorWindow::QComponentEntityEditorInspectorWindow(QWidget* parent)
-    : QMainWindow(parent)
-    , m_propertyEditor(nullptr)
-{
-    gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
-
-    Init();
-}
-
-QComponentEntityEditorInspectorWindow::~QComponentEntityEditorInspectorWindow()
-{
-    gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
-}
-
-void QComponentEntityEditorInspectorWindow::OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-}
-
-void QComponentEntityEditorInspectorWindow::Init()
-{
-    QVBoxLayout* layout = new QVBoxLayout();
-
-    m_propertyEditor = new AzToolsFramework::EntityPropertyEditor(nullptr);
-    layout->addWidget(m_propertyEditor);
-
-    QWidget* window = new QWidget();
-    window->setLayout(layout);
-    setCentralWidget(window);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// End of context menu handling
-///////////////////////////////////////////////////////////////////////////////
-
-#include <UI/moc_QComponentEntityEditorMainWindow.cpp>
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.h
deleted file mode 100644
index d79700963d..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorMainWindow.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QMainWindow>
-
-#include <AzCore/Serialization/SerializeContext.h>
-#endif
-
-class QObjectPropertyModel;
-class PropertyInfo;
-
-namespace AZ
-{
-    class Entity;
-}
-
-namespace AzToolsFramework
-{
-    class ReflectedPropertyEditor;
-    class EntityPropertyEditor;
-}
-
-// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
-class QComponentEntityEditorInspectorWindow
-    : public QMainWindow
-    , public ISystemEventListener
-{
-    Q_OBJECT
-
-public:
-    explicit QComponentEntityEditorInspectorWindow(QWidget* parent = 0);
-    ~QComponentEntityEditorInspectorWindow();
-
-    void Init();
-
-    // Used to receive events from widgets where SIGNALS aren't available or implemented yet.
-    // Required override.
-    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
-
-    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
-    // make sure you pick a unique GUID
-    static const GUID& GetClassID()
-    {
-        // {D7FEC1E3-8898-4D1F-8A9C-F8A161AF6746}
-        static const GUID guid =
-        {
-            0xD7FEC1E3, 0x8898, 0x4D1F, { 0x8a, 0x9c, 0xf8, 0xa1, 0x61, 0xaf, 0x67, 0x46 }
-        };
-        return guid;
-    }
-
-    AzToolsFramework::EntityPropertyEditor* GetPropertyEditor() { return m_propertyEditor; }
-
-private:
-
-    AzToolsFramework::EntityPropertyEditor* m_propertyEditor;
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.cpp
deleted file mode 100644
index 6d23b719c5..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "CryEdit.h"
-#include "UI/QComponentEntityEditorOutlinerWindow.h"
-#include "UI/Outliner/OutlinerWidget.hxx"
-
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx>
-
-#include <QVBoxLayout>
-
-QComponentEntityEditorOutlinerWindow::QComponentEntityEditorOutlinerWindow(QWidget* parent)
-    : QMainWindow(parent)
-    , m_outlinerWidget(nullptr)
-{
-    gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
-
-    Init();
-}
-
-QComponentEntityEditorOutlinerWindow::~QComponentEntityEditorOutlinerWindow()
-{
-    gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
-}
-
-void QComponentEntityEditorOutlinerWindow::OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-}
-
-void QComponentEntityEditorOutlinerWindow::Init()
-{
-    QVBoxLayout* layout = new QVBoxLayout();
-
-    m_outlinerWidget = new OutlinerWidget(nullptr);
-    layout->addWidget(m_outlinerWidget);
-
-    QWidget* window = new QWidget();
-    window->setLayout(layout);
-    setCentralWidget(window);
-}
-
-QEntityOutlinerWindow::QEntityOutlinerWindow(QWidget* parent)
-    : QMainWindow(parent)
-    , m_outlinerWidget(nullptr)
-{
-    gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
-
-    Init();
-}
-
-QEntityOutlinerWindow::~QEntityOutlinerWindow()
-{
-    gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
-}
-
-void QEntityOutlinerWindow::OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-{
-}
-
-void QEntityOutlinerWindow::Init()
-{
-    QVBoxLayout* layout = new QVBoxLayout();
-
-    m_outlinerWidget = new AzToolsFramework::EntityOutlinerWidget(nullptr);
-    layout->addWidget(m_outlinerWidget);
-
-    QWidget* window = new QWidget();
-    window->setLayout(layout);
-    setCentralWidget(window);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// End of context menu handling
-///////////////////////////////////////////////////////////////////////////////
-
-#include <UI/moc_QComponentEntityEditorOutlinerWindow.cpp>
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.h
deleted file mode 100644
index 911a671d45..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QMainWindow>
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#endif
-
-class QObjectPropertyModel;
-class PropertyInfo;
-
-namespace AZ
-{
-    class Entity;
-}
-
-namespace AzToolsFramework
-{
-    class EntityOutlinerWidget;
-}
-
-class OutlinerWidget;
-
-// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
-class QComponentEntityEditorOutlinerWindow
-    : public QMainWindow
-    , public ISystemEventListener
-{
-    Q_OBJECT
-
-public:
-    explicit QComponentEntityEditorOutlinerWindow(QWidget* parent = 0);
-    ~QComponentEntityEditorOutlinerWindow();
-
-    void Init();
-
-    // Used to receive events from widgets where SIGNALS aren't available or implemented yet.
-    // Required override.
-    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
-
-    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
-    // make sure you pick a unique GUID
-    static const GUID& GetClassID()
-    {
-        // {A2B58C0B-811A-4773-A057-A02D4BB9A293}
-        static const GUID guid =
-        {
-            0xA2B58C0B, 0x811A, 0x4773, { 0xa0, 0x57, 0xa0, 0x2d, 0x4b, 0xb9, 0xa2, 0x93 }
-        };
-        return guid;
-    }
-
-private:
-    OutlinerWidget* m_outlinerWidget;
-};
-
-// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
-class QEntityOutlinerWindow
-    : public QMainWindow
-    , public ISystemEventListener
-{
-    Q_OBJECT
-
-public:
-    explicit QEntityOutlinerWindow(QWidget* parent = 0);
-    ~QEntityOutlinerWindow();
-
-    void Init();
-
-    // Used to receive events from widgets where SIGNALS aren't available or implemented yet.
-    // Required override.
-    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
-
-    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
-    // make sure you pick a unique GUID
-    static const GUID& GetClassID()
-    {
-        // {CEE50D0E-46A8-4CB4-9C5F-DCD374A78032}
-        static const GUID guid =
-        {
-            0xcee50d0e, 0x46a8, 0x4cb4, { 0x9c, 0x5f, 0xdc, 0xd3, 0x74, 0xa7, 0x80, 0x32 }
-        };
-        return guid;
-    }
-
-private:
-    AzToolsFramework::EntityOutlinerWidget* m_outlinerWidget;
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.cpp
deleted file mode 100644
index 05e582a6be..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-#include "UI/QComponentLevelEntityEditorMainWindow.h"
-
-#include <AzCore/Component/Entity.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
-#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-
-#include <QVBoxLayout>
-
-QComponentLevelEntityEditorInspectorWindow::QComponentLevelEntityEditorInspectorWindow(QWidget* parent)
-    : QMainWindow(parent)
-    , m_propertyEditor(nullptr)
-{
-    GetIEditor()->RegisterNotifyListener(this);
-    AzToolsFramework::SliceMetadataEntityContextNotificationBus::Handler::BusConnect();
-
-    Init();
-}
-
-QComponentLevelEntityEditorInspectorWindow::~QComponentLevelEntityEditorInspectorWindow()
-{
-    AzToolsFramework::SliceMetadataEntityContextNotificationBus::Handler::BusDisconnect();
-    GetIEditor()->UnregisterNotifyListener(this);
-}
-
-void QComponentLevelEntityEditorInspectorWindow::Init()
-{
-    QVBoxLayout* layout = new QVBoxLayout();
-
-    m_propertyEditor = new AzToolsFramework::EntityPropertyEditor(nullptr, Qt::WindowFlags(), true);
-    layout->addWidget(m_propertyEditor);
-
-    // On initialization, notify our property editor about the root metadata entity if it exists
-    RefreshPropertyEditor();
-
-    QWidget* window = new QWidget();
-    window->setLayout(layout);
-    setCentralWidget(window);
-}
-
-void QComponentLevelEntityEditorInspectorWindow::OnMetadataEntityAdded(AZ::EntityId entityId)
-{
-    AZ::EntityId rootSliceMetaDataEntity = GetRootMetaDataEntityId();
-    if (rootSliceMetaDataEntity == entityId)
-    {
-        AzToolsFramework::EntityIdSet entities;
-        entities.insert(rootSliceMetaDataEntity);
-        m_propertyEditor->SetOverrideEntityIds(entities);
-    }
-}
-
-void QComponentLevelEntityEditorInspectorWindow::RefreshPropertyEditor()
-{
-    AZ::EntityId rootSliceMetaDataEntity = GetRootMetaDataEntityId();
-    OnMetadataEntityAdded(rootSliceMetaDataEntity);
-}
-
-AZ::EntityId QComponentLevelEntityEditorInspectorWindow::GetRootMetaDataEntityId() const
-{
-    AZ::EntityId levelEntityId;
-    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(levelEntityId, &AzToolsFramework::ToolsApplicationRequests::GetCurrentLevelEntityId);
-    return levelEntityId;
-}
-
-void QComponentLevelEntityEditorInspectorWindow::OnEditorNotifyEvent(EEditorNotifyEvent event)
-{
-    switch (event)
-    {
-            // Refresh the Level Component Property Editor any time we start or end
-            // a level creation or load.
-            case eNotify_OnBeginLoad:
-            case eNotify_OnEndLoad:
-            case eNotify_OnBeginCreate:
-            case eNotify_OnEndCreate:
-                RefreshPropertyEditor();
-                break;
-            default:
-                break;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// End of context menu handling
-///////////////////////////////////////////////////////////////////////////////
-
-#include <UI/moc_QComponentLevelEntityEditorMainWindow.cpp>
-
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.h
deleted file mode 100644
index 7f3ad51d83..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentLevelEntityEditorMainWindow.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QMainWindow>
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <Editor/IEditor.h>
-#include <AzToolsFramework/Slice/SliceMetadataEntityContextBus.h>
-#endif
-
-class QObjectPropertyModel;
-class PropertyInfo;
-
-namespace AZ
-{
-    class Entity;
-}
-
-namespace AzToolsFramework
-{
-    class ReflectedPropertyEditor;
-    class EntityPropertyEditor;
-}
-
-// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
-class QComponentLevelEntityEditorInspectorWindow
-    : public QMainWindow
-    , public AzToolsFramework::SliceMetadataEntityContextNotificationBus::Handler
-    , private IEditorNotifyListener
-{
-    Q_OBJECT
-
-public:
-    explicit QComponentLevelEntityEditorInspectorWindow(QWidget* parent = 0);
-    ~QComponentLevelEntityEditorInspectorWindow();
-
-    void Init();
-
-    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
-    // make sure you pick a unique GUID
-    static const GUID& GetClassID()
-    {
-        //{F539C646-7FC6-4AF4-BB58-F8A161AF6746}
-        static const GUID guid =
-        {
-            0xF539C646, 0x7FC6, 0x4AF4, { 0x8a, 0x9c, 0xf8, 0xa1, 0x61, 0xaf, 0x67, 0x46 }
-        };
-        return guid;
-    }
-
-    AzToolsFramework::EntityPropertyEditor* GetPropertyEditor() { return m_propertyEditor; }
-
-private:
-    void OnMetadataEntityAdded(AZ::EntityId /*entityId*/) override;
-
-    void RefreshPropertyEditor();
-
-    AZ::EntityId GetRootMetaDataEntityId() const;
-
-    //////////////////////////////////////////////////////////////////////////
-    // IEditorEventListener
-    void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
-
-    AzToolsFramework::EntityPropertyEditor* m_propertyEditor;
-};
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake
deleted file mode 100644
index 989c482dfd..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    dllmain.cpp
-    ComponentEntityEditorPlugin.h
-    ComponentEntityEditorPlugin.cpp
-    SandboxIntegration.h
-    SandboxIntegration.cpp
-    ComponentEntityEditorPlugin_precompiled.h
-    UI/ComponentEntityEditorOutlinerWindow.qrc
-    UI/QComponentEntityEditorMainWindow.h
-    UI/QComponentEntityEditorMainWindow.cpp
-    UI/QComponentLevelEntityEditorMainWindow.h
-    UI/QComponentLevelEntityEditorMainWindow.cpp
-    UI/QComponentEntityEditorOutlinerWindow.h
-    UI/QComponentEntityEditorOutlinerWindow.cpp
-    UI/AssetCatalogModel.h
-    UI/AssetCatalogModel.cpp
-    UI/ComponentPalette/CategoriesList.h
-    UI/ComponentPalette/CategoriesList.cpp
-    UI/ComponentPalette/ComponentDataModel.h
-    UI/ComponentPalette/ComponentDataModel.cpp
-    UI/ComponentPalette/ComponentPaletteSettings.h
-    UI/ComponentPalette/ComponentPaletteWindow.h
-    UI/ComponentPalette/ComponentPaletteWindow.cpp
-    UI/ComponentPalette/FavoriteComponentList.h
-    UI/ComponentPalette/FavoriteComponentList.cpp
-    UI/ComponentPalette/FilteredComponentList.h
-    UI/ComponentPalette/FilteredComponentList.cpp
-    UI/ComponentPalette/InformationPanel.h
-    UI/ComponentPalette/InformationPanel.cpp
-    UI/Outliner/OutlinerDisplayOptionsMenu.h
-    UI/Outliner/OutlinerDisplayOptionsMenu.cpp
-    UI/Outliner/OutlinerTreeView.hxx
-    UI/Outliner/OutlinerTreeView.cpp
-    UI/Outliner/OutlinerWidget.hxx
-    UI/Outliner/OutlinerWidget.cpp
-    UI/Outliner/OutlinerCacheBus.h
-    UI/Outliner/OutlinerListModel.hxx
-    UI/Outliner/OutlinerListModel.cpp
-    UI/Outliner/OutlinerSearchWidget.h
-    UI/Outliner/OutlinerSearchWidget.cpp
-    UI/Outliner/OutlinerSortFilterProxyModel.hxx
-    UI/Outliner/OutlinerSortFilterProxyModel.cpp
-    UI/Outliner/OutlinerWidget.ui
-    UI/Outliner/resources.qrc
-    UI/Outliner/EntityOutliner.qss
-    Objects/ComponentEntityObject.h
-    Objects/ComponentEntityObject.cpp
-)
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_test_files.cmake b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_test_files.cmake
deleted file mode 100644
index 3bbd9d1789..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_test_files.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Tests/test_Main.cpp
-    Tests/ComponentEntityObjectStateTests.cpp
-    Objects/ComponentEntityObject.h
-    Objects/ComponentEntityObject.cpp
-)
diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/dllmain.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/dllmain.cpp
deleted file mode 100644
index dd47a57a87..0000000000
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/dllmain.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-// All plugins suffer from the following warning:
-//  warning C4273: 'GetIEditor' : inconsistent dll linkage
-// GetIEditor() is forward-declared using EDITOR_CORE_API, which without EDITOR_CORE set,
-// results in dllimport rather than dllexport. This define ensure it's consistently and
-// properly defined for export.
-#define EDITOR_CORE
-
-#include <platform.h>
-
-#include <IEditor.h>
-#include <Include/IPlugin.h>
-#include <Include/IEditorClassFactory.h>
-#include "ComponentEntityEditorPlugin.h"
-
-#if AZ_TRAIT_OS_PLATFORM_APPLE || defined(AZ_PLATFORM_LINUX)
-typedef HANDLE HINSTANCE;
-#define DLL_PROCESS_ATTACH 1
-#endif
-
-IEditor* g_pEditor = nullptr;
-
-//------------------------------------------------------------------
-PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
-{
-    g_pEditor = pInitParam->pIEditorInterface;
-    ISystem* pSystem = pInitParam->pIEditorInterface->GetSystem();
-    ModuleInitISystem(pSystem, "ComponentEntityEditorPlugin");
-    return new ComponentEntityEditorPlugin(g_pEditor);
-}
-
-//------------------------------------------------------------------
-HINSTANCE g_hInstance = 0;
-BOOL __stdcall DllMain(HINSTANCE hinstDLL, ULONG fdwReason, [[maybe_unused]] LPVOID lpvReserved)
-{
-    if (fdwReason == DLL_PROCESS_ATTACH)
-    {
-        g_hInstance = hinstDLL;
-    }
-
-    return TRUE;
-}
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp
deleted file mode 100644
index 27db7e1ddf..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorAssetImporter_precompiled.h"
-#include <AssetBrowserContextProvider.h>
-#include <AssetImporterPlugin.h>
-#include <QtCore/QMimeData>
-#include <QMenu>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h> // for ebus events
-#include <AzFramework/StringFunc/StringFunc.h>
-
-namespace AZ
-{
-    using namespace AzToolsFramework::AssetBrowser;
-
-    AssetBrowserContextProvider::AssetBrowserContextProvider()
-    {
-        BusConnect();
-    }
-
-    AssetBrowserContextProvider::~AssetBrowserContextProvider()
-    {
-        BusDisconnect();
-    }
-
-    bool AssetBrowserContextProvider::HandlesSource(const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry* entry) const
-    {
-        AZStd::unordered_set<AZStd::string> extensions;
-        EBUS_EVENT(AZ::SceneAPI::Events::AssetImportRequestBus, GetSupportedFileExtensions, extensions);
-        if (extensions.empty())
-        {
-            return false;
-        }
-
-        AZStd::string targetExtension = entry->GetExtension();
-
-        for (const AZStd::string& potentialExtension : extensions)
-        {
-            const char* extension = potentialExtension.c_str();
-
-            if (AzFramework::StringFunc::Equal(extension, targetExtension.c_str()))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    void AssetBrowserContextProvider::AddSourceFileOpeners([[maybe_unused]] const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers)
-    {
-        using namespace AzToolsFramework;
-
-        if (const SourceAssetBrowserEntry* source = SourceAssetBrowserEntry::GetSourceByUuid(sourceUUID))
-        {
-            if (!HandlesSource(source))
-            {
-                return;
-            }
-        }
-        else
-        {
-            // its not something we can actually open if its not a source file at all
-            return;
-        }
-
-        openers.push_back({ "O3DE_FBX_Settings_Edit", "Edit Settings...", QIcon(), [](const char* fullSourceFileNameInCallback, const AZ::Uuid& /*sourceUUID*/)
-        {
-            AZStd::string sourceName(fullSourceFileNameInCallback); // because the below call absolutely requires a AZStd::string.
-            AssetImporterPlugin::GetInstance()->EditImportSettings(sourceName);
-        } });
-    }
-
-    AzToolsFramework::AssetBrowser::SourceFileDetails AssetBrowserContextProvider::GetSourceFileDetails(const char* fullSourceFileName)
-    {
-        AZStd::string extensionString;
-        if (AzFramework::StringFunc::Path::GetExtension(fullSourceFileName, extensionString, true))
-        {
-            // this does include the "." in the extension.
-            AZStd::unordered_set<AZStd::string> extensions;
-            EBUS_EVENT(AZ::SceneAPI::Events::AssetImportRequestBus, GetSupportedFileExtensions, extensions);
-            for (AZStd::string potentialExtension : extensions)
-            {
-                if (AzFramework::StringFunc::Equal(extensionString.c_str(), potentialExtension.c_str()))
-                {
-                    return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/FBX_16.png");
-                }
-            }
-        }
-
-        return AzToolsFramework::AssetBrowser::SourceFileDetails();
-    }
-}
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.h b/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.h
deleted file mode 100644
index 42b525492c..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
-
-class QMimeData;
-
-namespace AzToolsFramework
-{
-    namespace AssetBrowser
-    {
-        class SourceAssetBrowserEntry;
-        class AssetBrowserEntry;
-    }
-}
-
-namespace AZ
-{
-    class AssetBrowserContextProvider
-        : public AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
-    {
-    public:
-        AssetBrowserContextProvider();
-        ~AssetBrowserContextProvider() override;
-     
-        /////////////////////////////////////////////////////////////////////////////////////////////////////
-        // AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
-        void AddSourceFileOpeners(const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers) override;
-        AzToolsFramework::AssetBrowser::SourceFileDetails GetSourceFileDetails(const char* fullSourceFileName) override;
-        /////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    protected:
-        bool HandlesSource(const AzToolsFramework::AssetBrowser::SourceAssetBrowserEntry* entry) const; // return true if we care about this kind of source file.
-    };
-}
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterDocument.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterDocument.cpp
deleted file mode 100644
index e1df9b01d8..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterDocument.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorAssetImporter_precompiled.h"
-#include <AssetImporterDocument.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/SceneCore/Export/MtlMaterialExporter.h>
-#include <Util/PathUtil.h>
-#include <GFxFramework/MaterialIO/IMaterial.h>
-#include <SceneAPI/SceneCore/Containers/Views/PairIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/FilterIterator.h>
-#include <SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h>
-#include <SceneAPI/SceneCore/DataTypes/Rules/IMaterialRule.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/ISkeletonGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h>
-#include <SceneAPI/SceneCore/DataTypes/ManifestBase/ISceneNodeSelectionList.h>
-#include <SceneAPI/SceneCore/Events/SceneSerializationBus.h>
-#include <SceneAPI/SceneCore/Utilities/SceneGraphSelector.h>
-#include <SceneAPI/SceneCore/Utilities/FileUtilities.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <IEditor.h>
-#include <ISourceControl.h>
-#include <QFile>
-#include <QWidget>
-#include <QMessageBox>
-#include <QPushButton>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-
-#include <ActionOutput.h>
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-
-AssetImporterDocument::AssetImporterDocument()
-{
-}
-
-bool AssetImporterDocument::LoadScene(const AZStd::string& sceneFullPath)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    namespace SceneEvents = AZ::SceneAPI::Events;
-    SceneEvents::SceneSerializationBus::BroadcastResult(m_scene, &SceneEvents::SceneSerializationBus::Events::LoadScene, sceneFullPath, AZ::Uuid::CreateNull());
-    return !!m_scene;
-}
-
-void AssetImporterDocument::SaveScene(AZStd::shared_ptr<AZ::ActionOutput>& output, AZ::SaveCompleteCallback onSaveComplete)
-{
-    if (!m_scene)
-    {
-        if (output)
-        {
-            output->AddError("No scene file was loaded.");
-        }
-
-        if (onSaveComplete)
-        {
-            onSaveComplete(false);
-        }
-
-        return;
-    }
-
-    m_saveRunner = AZStd::make_shared<AZ::AsyncSaveRunner>();
-
-    // Add a no-op saver to put the FBX into source control. The benefit of doing it this way
-    //  rather than invoking the SourceControlCommands bus directly is that we enable ourselves
-    //  to have a single callback point for fbx & the manifest.
-    auto fbxNoOpSaver = m_saveRunner->GenerateController();
-    fbxNoOpSaver->AddSaveOperation(m_scene->GetSourceFilename(), nullptr);
-
-    // Save the manifest
-    SaveManifest();
-
-    m_saveRunner->Run(output,
-        [this, onSaveComplete](bool success)
-        {
-            if (onSaveComplete)
-            {
-                onSaveComplete(success);
-            }
-
-            m_saveRunner = nullptr;
-    }, AZ::AsyncSaveRunner::ControllerOrder::Sequential);
-}
-
-void AssetImporterDocument::ClearScene()
-{
-    m_scene.reset();
-}
-
-void AssetImporterDocument::SaveManifest()
-{
-    // Create the save controller and add the save operation for the manifest job to it
-    AZStd::shared_ptr<AZ::SaveOperationController> saveController = m_saveRunner->GenerateController();
-
-    saveController->AddSaveOperation(m_scene->GetManifestFilename(),
-        [this](const AZStd::string& fullPath, const AZStd::shared_ptr<AZ::ActionOutput>& actionOutput) -> bool
-        {
-            AZ_UNUSED(actionOutput);
-            return m_scene->GetManifest().SaveToFile(fullPath.c_str());
-        });
-}
-
-AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& AssetImporterDocument::GetScene()
-{
-    return m_scene;
-}
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterDocument.h b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterDocument.h
deleted file mode 100644
index 409f2bdb53..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterDocument.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Asset Importer Document hosts FBX back-end data storage and access,
-// loading and saving APIs.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include <string>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/list.h>
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/map.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <SaveUtilities/AsyncSaveRunner.h>
-
-class QWidget;
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace DataTypes
-        {
-            class ISceneNodeGroup;
-            class IMeshGroup;
-            class ISkeletonGroup;
-            class ISkinGroup;
-            class IAnimationGroup;
-            class IMaterialRule;
-            class IActorGroup;
-            class IEFXMotionGroup;
-        }
-    }
-}
-
-class AssetImporterDocument
-{
-public:
-    AssetImporterDocument();
-    virtual ~AssetImporterDocument() = default;
-
-    bool LoadScene(const AZStd::string& sceneFullPath);
-    void SaveScene(AZStd::shared_ptr<AZ::ActionOutput>& output, AZ::SaveCompleteCallback onSaveComplete);
-    void ClearScene();
-
-    AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& GetScene();
-    
-protected:
-    void SaveManifest();
-
-    AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene> m_scene;
-    AZStd::shared_ptr<AZ::AsyncSaveRunner> m_saveRunner;
-};
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp
deleted file mode 100644
index 2e59e43c4a..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorAssetImporter_precompiled.h"
-#include <AssetImporterPlugin.h>
-#include <AssetImporterWindow.h>
-#include <QtViewPaneManager.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <LyViewPaneNames.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-
-AssetImporterPlugin* AssetImporterPlugin::s_instance;
-
-AssetImporterPlugin::AssetImporterPlugin(IEditor* editor)
-    : m_editor(editor)
-    , m_toolName(LyViewPane::SceneSettings)
-    , m_assetBrowserContextProvider()
-    , m_sceneSerializationHandler()
-{
-    s_instance = this;
-
-    m_sceneUIModule = LoadSceneLibrary("SceneUI", true);
-
-    m_sceneSerializationHandler.Activate();
-    
-    AzToolsFramework::ViewPaneOptions opt;
-    opt.isPreview = true;
-    opt.showInMenu = false; // this view pane is used to display scene settings, but the user never opens it directly through the Tools menu
-    opt.saveKeyName = "Scene Settings (PREVIEW)"; // user settings for this pane were originally saved with PREVIEW, so ensure that's how they are loaded as well, even after the PREVIEW is removed from the name
-    AzToolsFramework::RegisterViewPane<AssetImporterWindow>(m_toolName.c_str(), LyViewPane::CategoryTools, opt);
-
-    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-        &AzToolsFramework::ToolsApplicationRequests::CreateAndAddEntityFromComponentTags,
-        AZStd::vector<AZ::Crc32>({ AZ::SceneAPI::Events::AssetImportRequest::GetAssetImportRequestComponentTag() }), "AssetImportersEntity");
-}
-
-void AssetImporterPlugin::Release()
-{
-    AzToolsFramework::UnregisterViewPane(m_toolName.c_str());
-    m_sceneSerializationHandler.Deactivate();
-
-    auto uninit = m_sceneUIModule->GetFunction<AZ::UninitializeDynamicModuleFunction>(AZ::UninitializeDynamicModuleFunctionName);
-    if (uninit)
-    {
-        (*uninit)();
-    }
-    m_sceneUIModule.reset();
-}
-
-AZStd::unique_ptr<AZ::DynamicModuleHandle> AssetImporterPlugin::LoadSceneLibrary(const char* name, bool explicitInit)
-{
-    using ReflectFunc = void(*)(AZ::SerializeContext*);
-
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> module = AZ::DynamicModuleHandle::Create(name);
-    if (module)
-    {
-        module->Load(false);
-
-        if (explicitInit)
-        {
-            // Explicitly initialize all modules. Because we're loading them twice (link time, and now-time), we need to explicitly uninit them.
-            auto init = module->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
-            if (init)
-            {
-                (*init)(AZ::Environment::GetInstance());
-            }
-        }
-
-        ReflectFunc reflect = module->GetFunction<ReflectFunc>("Reflect");
-        if (reflect)
-        {
-            (*reflect)(nullptr);
-        }
-        return module;
-    }
-    else
-    {
-        AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to initialize library '%s'", name);
-        return nullptr;
-    }
-}
-
-void AssetImporterPlugin::EditImportSettings(const AZStd::string& sourceFilePath)
-{
-    const QtViewPane* assetImporterPane = GetIEditor()->OpenView(m_toolName.c_str());
-
-    if(!assetImporterPane)
-    {
-        return;
-    }
-
-    AssetImporterWindow* assetImporterWindow = qobject_cast<AssetImporterWindow*>(assetImporterPane->Widget());
-    if (!assetImporterWindow)
-    {
-        return;
-    }
-
-    assetImporterWindow->OpenFile(sourceFilePath);
-}
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.h b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.h
deleted file mode 100644
index 1491532ad3..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Asset Importer Sandbox Plugin
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include <IEditor.h>
-#include <Include/IPlugin.h>
-#include <AzCore/Module/DynamicModuleHandle.h>
-#include <AssetBrowserContextProvider.h>
-#include <SceneSerializationHandler.h>
-
-class AssetImporterPlugin
-    : public IPlugin
-{
-    // Create plugin instance, only accessible to CreatePluginInstance
-    // If you need instance, use static GetInstance()
-    friend IPlugin* ::CreatePluginInstance(PLUGIN_INIT_PARAM* initParam);
-    AssetImporterPlugin(IEditor* editor);
-
-public:
-    // Get the singleton instance of the plugin
-    static AssetImporterPlugin* GetInstance()
-    {
-        return s_instance;
-    }
-
-    // Get the editor used to create this plugin
-    IEditor* GetIEditor()
-    {
-        return m_editor;
-    }
-
-    const string& GetToolName() const
-    {
-        return m_toolName;
-    }
-
-    /////////////////////////////////////////////////////////////////////////////
-    // IPlugin implementation
-    void Release() override;
-    void ShowAbout() override
-    {
-    }
-    const char* GetPluginGUID() override
-    {
-        return "{0abf28f2-ef56-4ac9-a459-175abb40d649}";
-    }
-    DWORD GetPluginVersion() override
-    {
-        return 1;
-    }
-    const char* GetPluginName() override
-    {
-        return "QtAssetImporter";
-    }
-    bool CanExitNow() override
-    {
-        return true;
-    }
-    void OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId) override
-    {
-    }
-    /////////////////////////////////////////////////////////////////////////////
-
-    void EditImportSettings(const AZStd::string& sourceFilePath);
-
-private:
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> LoadSceneLibrary(const char* name, bool explicitInit);
-    
-    // Singleton instance
-    static AssetImporterPlugin* s_instance;
-
-    // Dependency DLL Handles
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> m_sceneUIModule;
-    
-    // The editor used to construct the plugin
-    IEditor* const m_editor;
-
-    // Tool name
-    string m_toolName;
-
-    // Context provider for the Asset Browser
-    AZ::AssetBrowserContextProvider m_assetBrowserContextProvider;
-    AZ::SceneSerializationHandler m_sceneSerializationHandler;
-};
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterWindow.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterWindow.cpp
deleted file mode 100644
index 4fced9b535..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterWindow.cpp
+++ /dev/null
@@ -1,552 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorAssetImporter_precompiled.h"
-#include <AssetImporterWindow.h>
-#include <ui_AssetImporterWindow.h>
-#include <AssetImporterPlugin.h>
-#include <ImporterRootDisplay.h>
-
-#include <QTimer>
-#include <QFile>
-#include <QFileDialog>
-#include <QCloseEvent>
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QUrl>
-#include <QDockWidget>
-#include <QLabel>
-
-class IXMLDOMDocumentPtr; // Needed for settings.h
-class CXTPDockingPaneLayout; // Needed for settings.h
-#include <Settings.h>
-
-#include <AzQtComponents/Components/StylesheetPreprocessor.h>
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/std/functional.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzCore/std/string/conversions.h>
-#include <Util/PathUtil.h>
-#include <ActionOutput.h>
-
-#include <SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h>
-#include <SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.h>
-#include <SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.h>
-#include <SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.h>
-#include <SceneAPI/SceneUI/SceneWidgets/ManifestWidget.h>
-#include <SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-const char* AssetImporterWindow::s_documentationWebAddress = "http://docs.aws.amazon.com/lumberyard/latest/userguide/char-fbx-importer.html";
-const AZ::Uuid AssetImporterWindow::s_browseTag = AZ::Uuid::CreateString("{C240D2E1-BFD2-4FFA-BB5B-CC0FA389A5D3}");
-
-void MakeUserFriendlySourceAssetPath(QString& out, const QString& sourcePath)
-{
-    char devAssetsRoot[AZ_MAX_PATH_LEN] = { 0 };
-    if (!gEnv->pFileIO->ResolvePath("@devroot@", devAssetsRoot, AZ_MAX_PATH_LEN))
-    {
-        out = sourcePath;
-        return;
-    }
-
-    AZStd::replace(devAssetsRoot, devAssetsRoot + AZ_MAX_PATH_LEN- 1, AZ_WRONG_FILESYSTEM_SEPARATOR, AZ_CORRECT_FILESYSTEM_SEPARATOR);
- 
-    // Find if the sourcePathArray is a sub directory of the devAssets folder 
-    // Keep reference to sourcePathArray long enough to use in PathView
-    QByteArray sourcePathArray = sourcePath.toUtf8();
-    AZ::IO::PathView sourcePathRootView(sourcePathArray.data());
-    AZ::IO::PathView devAssetsRootView(devAssetsRoot);
-    auto [sourcePathIter, devAssetsIter] = AZStd::mismatch(sourcePathRootView.begin(), sourcePathRootView.end(),
-        devAssetsRootView.begin(), devAssetsRootView.end());
-    // If the devAssets path iterator is not equal to the end, then there was a mismistch while comparing it
-    // against the source path indicating that the source path is not a sub-directory
-    if (devAssetsIter != devAssetsRootView.end())
-    {
-        out = sourcePath;
-        return;
-    }
-
-    int offset = aznumeric_cast<int>(strlen(devAssetsRoot));
-    if (sourcePath.at(offset) == AZ_CORRECT_FILESYSTEM_SEPARATOR)
-    {
-        ++offset;
-    }
-    out = sourcePath.right(sourcePath.length() - offset);
-
-}
-
-AssetImporterWindow::AssetImporterWindow()
-    : AssetImporterWindow(nullptr)
-{
-}
-
-AssetImporterWindow::AssetImporterWindow(QWidget* parent)
-    : QMainWindow(parent)
-    , ui(new Ui::AssetImporterWindow)
-    , m_assetImporterDocument(new AssetImporterDocument())
-    , m_serializeContext(nullptr)
-    , m_rootDisplay(nullptr)
-    , m_overlay(nullptr)
-    , m_isClosed(false)
-    , m_processingOverlayIndex(AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex)
-{
-    Init();
-}
-
-AssetImporterWindow::~AssetImporterWindow()
-{
-    AZ_Assert(m_processingOverlayIndex == AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex, 
-        "Processing overlay (and potentially background thread) still active at destruction.");
-    AZ_Assert(!m_processingOverlay, "Processing overlay (and potentially background thread) still active at destruction.");
-}
-
-void AssetImporterWindow::OpenFile(const AZStd::string& filePath)
-{
-    if (m_processingOverlay)
-    {
-        QMessageBox::warning(this, "In progress", "Please wait for the previous task to complete before opening a new file.");
-        return;
-    }
-
-    if (!m_overlay->CanClose())
-    {
-        QMessageBox::warning(this, "In progress", "Unable to close one or more windows at this time.");
-        return;
-    }
-
-    // Make sure we are not browsing *over* a current editing operation
-    if (!IsAllowedToChangeSourceFile())
-    {
-        // Issue will already have been reported to the user.
-        return;
-    }
-
-    if (!m_overlay->PopAllLayers())
-    {
-        QMessageBox::warning(this, "In progress", "Unable to close one or more windows at this time.");
-        return;
-    }
-    
-    OpenFileInternal(filePath);
-}
-
-void AssetImporterWindow::closeEvent(QCloseEvent* ev)
-{
-    if (m_isClosed)
-    {
-        return;
-    }
-
-    if (m_processingOverlay)
-    {
-        AZ_Assert(m_processingOverlayIndex != AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex, 
-            "Processing overlay present, but not the index in the overlay for it.");
-        if (m_processingOverlay->HasProcessingCompleted())
-        {
-            if (m_overlay->PopLayer(m_processingOverlayIndex))
-            {
-                m_processingOverlayIndex = AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex;
-                m_processingOverlay.reset(nullptr);
-            }
-            else
-            {
-                QMessageBox::critical(this, "Processing In Progress", "Unable to close the result window at this time.", 
-                    QMessageBox::Ok, QMessageBox::Ok);
-                ev->ignore();
-                return;
-            }
-        }
-        else
-        {
-            QMessageBox::critical(this, "Processing In Progress", "Please wait until processing has completed to try again.", 
-                QMessageBox::Ok, QMessageBox::Ok);
-            ev->ignore();
-            return;
-        }
-    }
-
-    if (!m_overlay->CanClose())
-    {
-        QMessageBox::critical(this, "Unable to close", "Unable to close one or more windows at this time.",
-            QMessageBox::Ok, QMessageBox::Ok);
-        ev->ignore();
-        return;
-    }
-
-    if (!IsAllowedToChangeSourceFile())
-    {
-        ev->ignore();
-        return;
-    }
-
-    ev->accept();
-    m_isClosed = true;
-}
-
-void AssetImporterWindow::Init()
-{
-    // Serialization and reflection framework setup
-    EBUS_EVENT_RESULT(m_serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
-    AZ_Assert(m_serializeContext, "Serialization context not available");
-
-    // Load the style sheets
-    AzQtComponents::StylesheetPreprocessor styleSheetProcessor(nullptr);
-
-    AZStd::string mainWindowQSSPath = Path::GetEditingRootFolder() + "\\Editor\\Styles\\AssetImporterWindow.qss";
-    QFile mainWindowStyleSheetFile(mainWindowQSSPath.c_str());
-    if (mainWindowStyleSheetFile.open(QFile::ReadOnly))
-    {
-        setStyleSheet(styleSheetProcessor.ProcessStyleSheet(mainWindowStyleSheetFile.readAll()));
-    }
-
-    ui->setupUi(this);
-
-    if (!gSettings.enableSceneInspector)
-    {
-        ui->m_actionInspect->setVisible(false);
-    }
-    
-    ResetMenuAccess(WindowState::InitialNothingLoaded);
-
-    // Setup the overlay system, and set the root to be the root display. The root display has the browse,
-    //  the Import button & the cancel button, which are handled here by the window.
-    m_overlay.reset(aznew AZ::SceneAPI::UI::OverlayWidget(this));
-    m_rootDisplay.reset(aznew ImporterRootDisplay(m_serializeContext));
-    connect(m_rootDisplay.data(), &ImporterRootDisplay::UpdateClicked, this, &AssetImporterWindow::UpdateClicked);
-    
-    connect(m_overlay.data(), &AZ::SceneAPI::UI::OverlayWidget::LayerAdded, this, &AssetImporterWindow::OverlayLayerAdded);
-    connect(m_overlay.data(), &AZ::SceneAPI::UI::OverlayWidget::LayerRemoved, this, &AssetImporterWindow::OverlayLayerRemoved);
-
-    m_overlay->SetRoot(m_rootDisplay.data());
-    ui->m_mainArea->layout()->addWidget(m_overlay.data());
-
-    // Filling the initial browse prompt text to be programmatically set from available extensions
-    AZStd::unordered_set<AZStd::string> extensions;
-    EBUS_EVENT(AZ::SceneAPI::Events::AssetImportRequestBus, GetSupportedFileExtensions, extensions);
-    AZ_Assert(!extensions.empty(), "No file extensions defined for assets.");
-    if (!extensions.empty())
-    {
-        for (AZStd::string& extension : extensions)
-        {
-            extension = extension.substr(1);
-            AZStd::to_upper(extension.begin(), extension.end());
-        }
-
-        AZStd::string joinedExtensions;
-        AzFramework::StringFunc::Join(joinedExtensions, extensions.begin(), extensions.end(), " or ");
-
-        AZStd::string firstLineText = 
-            AZStd::string::format(
-                "%s files are available for use after placing them in any folder within your game project. "
-                "These files will automatically be processed and may be accessed via the Asset Browser. <a href=\"%s\">Learn more...</a>",
-                joinedExtensions.c_str(), s_documentationWebAddress);
-
-        ui->m_initialPromptFirstLine->setText(firstLineText.c_str());
-
-        AZStd::string secondLineText = 
-            AZStd::string::format("To adjust the %s settings, right-click the file in the Asset Browser and select \"Edit Settings\" from the context menu.", joinedExtensions.c_str());
-        ui->m_initialPromptSecondLine->setText(secondLineText.c_str());
-    }
-    else
-    {
-        AZStd::string firstLineText = 
-            AZStd::string::format(
-                "Files are available for use after placing them in any folder within your game project. "
-                "These files will automatically be processed and may be accessed via the Asset Browser. <a href=\"%s\">Learn more...</a>", s_documentationWebAddress);
-
-        ui->m_initialPromptFirstLine->setText(firstLineText.c_str());
-
-        AZStd::string secondLineText = "To adjust the settings, right-click the file in the Asset Browser and select \"Edit Settings\" from the context menu.";
-        ui->m_initialPromptSecondLine->setText(secondLineText.c_str());
-
-        // Hide the initial browse container so we can show the error (it will be shown again when the overlay pops)
-        ui->m_initialBrowseContainer->hide();
-
-        QMessageBox::critical(this, "No Extensions Detected",
-            "No importable file types were detected. This likely means an internal error has taken place which has broken the "
-            "registration of valid import types (e.g. FBX). This type of issue requires engineering support.");
-    }
-}
-
-void AssetImporterWindow::OpenFileInternal(const AZStd::string& filePath)
-{
-    using namespace AZ::SceneAPI::SceneUI;
-
-    auto asyncLoadHandler = AZStd::make_shared<AZ::SceneAPI::SceneUI::AsyncOperationProcessingHandler>(
-        s_browseTag,
-        [this, filePath]()
-        { 
-            m_assetImporterDocument->LoadScene(filePath); 
-        },
-        [this]()
-        {
-            HandleAssetLoadingCompleted(); 
-        }, this);
-
-    m_processingOverlay.reset(new ProcessingOverlayWidget(m_overlay.data(), ProcessingOverlayWidget::Layout::Loading, s_browseTag));
-    m_processingOverlay->SetAndStartProcessingHandler(asyncLoadHandler);
-    m_processingOverlay->SetAutoCloseOnSuccess(true);
-    connect(m_processingOverlay.data(), &AZ::SceneAPI::SceneUI::ProcessingOverlayWidget::Closing, this, &AssetImporterWindow::ClearProcessingOverlay);
-    m_processingOverlayIndex = m_processingOverlay->PushToOverlay();
-}
-
-bool AssetImporterWindow::IsAllowedToChangeSourceFile()
-{
-    if (!m_rootDisplay->HasUnsavedChanges())
-    {
-        return true;
-    }
-
-    QMessageBox messageBox(QMessageBox::Icon::NoIcon, "Unsaved changes", 
-        "You have unsaved changes. Do you want to discard those changes?",
-        QMessageBox::StandardButton::Discard | QMessageBox::StandardButton::Cancel, this);
-    messageBox.exec();
-    QMessageBox::StandardButton choice = static_cast<QMessageBox::StandardButton>(messageBox.result());
-    return choice == QMessageBox::StandardButton::Discard;
-}
-
-void AssetImporterWindow::UpdateClicked()
-{
-    using namespace AZ::SceneAPI::SceneUI;
-
-    // There are specific measures in place to block re-entry, applying asserts to be safe
-    if (m_processingOverlay)
-    {
-        AZ_Assert(!m_processingOverlay, "Attempted to update asset while processing is in progress.");
-        return;
-    }
-
-    m_processingOverlay.reset(new ProcessingOverlayWidget(m_overlay.data(), ProcessingOverlayWidget::Layout::Exporting, s_browseTag));
-    connect(m_processingOverlay.data(), &ProcessingOverlayWidget::Closing, this, &AssetImporterWindow::ClearProcessingOverlay);
-    m_processingOverlayIndex = m_processingOverlay->PushToOverlay();
-
-    // We need to block closing of the overlay until source control operations are complete
-    m_processingOverlay->BlockClosing();
-
-    m_processingOverlay->OnSetStatusMessage("Saving settings...");
-    bool isSourceControlActive = false;
-    {
-        using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
-        SCRequestBus::BroadcastResult(isSourceControlActive, &SCRequestBus::Events::IsActive);
-    }
-
-    AZStd::shared_ptr<AZ::ActionOutput> output = AZStd::make_shared<AZ::ActionOutput>();
-    m_assetImporterDocument->SaveScene(output,
-        [output, this, isSourceControlActive](bool wasSuccessful)
-        {
-            if (output->HasAnyWarnings())
-            {
-                AZ_TracePrintf(AZ::SceneAPI::Utilities::WarningWindow, "%s", output->BuildWarningMessage().c_str());
-            }
-            if (output->HasAnyErrors())
-            {
-                AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "%s", output->BuildErrorMessage().c_str());
-            }
-
-            if (wasSuccessful)
-            {
-                if (!isSourceControlActive)
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::SuccessWindow, "Saving complete");
-                }
-                else
-                {
-                    AZ_TracePrintf(AZ::SceneAPI::Utilities::SuccessWindow, "Saving & source control operations complete");
-                }
-
-                m_rootDisplay->HandleSaveWasSuccessful();
-
-                // Don't attach the job processor until all files are saved.
-                m_processingOverlay->SetAndStartProcessingHandler(AZStd::make_shared<ExportJobProcessingHandler>(s_browseTag, m_fullSourcePath));
-            }
-            else
-            {
-                // This kind of failure means that it's possible the jobs will never actually start,
-                //  so we act like the processing is complete to make it so the user won't be stuck
-                //  in the processing UI in that case.
-                m_processingOverlay->OnProcessingComplete();
-            }
-
-            // Blocking is only used for the period saving is happening. The ExportJobProcessingHandler will inform
-            // the overlay widget when the AP is done with processing, which will also block closing until done.
-            m_processingOverlay->UnblockClosing();
-        }
-    );
-}
-
-void AssetImporterWindow::OnSceneResetRequested()
-{
-    using namespace AZ::SceneAPI::Events;
-    using namespace AZ::SceneAPI::SceneUI;
-    using namespace AZ::SceneAPI::Utilities;
-
-    auto asyncLoadHandler = AZStd::make_shared<AZ::SceneAPI::SceneUI::AsyncOperationProcessingHandler>(
-        s_browseTag,
-        [this]()
-        {
-            m_assetImporterDocument->GetScene()->GetManifest().Clear();
-
-            AZ::SceneAPI::Events::ProcessingResultCombiner result;
-            EBUS_EVENT_RESULT(result, AssetImportRequestBus, UpdateManifest, *m_assetImporterDocument->GetScene(),
-                AssetImportRequest::ManifestAction::ConstructDefault, AssetImportRequest::RequestingApplication::Editor);
-
-            // Specifically using success, because ignore would be an invalid case.
-            // Whenever we do construct default, it should always be done
-            if (result.GetResult() == ProcessingResult::Success)
-            {
-                AZ_TracePrintf(SuccessWindow, "Successfully reset the manifest.");
-            }
-            else
-            {
-                m_assetImporterDocument->ClearScene();
-                AZ_TracePrintf(ErrorWindow, "Manifest reset returned in '%s'", 
-                    result.GetResult() == ProcessingResult::Failure ? "Failure" : "Ignored");
-            }
-        },
-        [this]()
-        {
-            m_rootDisplay->HandleSceneWasReset(m_assetImporterDocument->GetScene());
-        }, this);
-
-    m_processingOverlay.reset(new ProcessingOverlayWidget(m_overlay.data(), ProcessingOverlayWidget::Layout::Resetting, s_browseTag));
-    m_processingOverlay->SetAndStartProcessingHandler(asyncLoadHandler);
-    m_processingOverlay->SetAutoCloseOnSuccess(true);
-    connect(m_processingOverlay.data(), &ProcessingOverlayWidget::Closing, this, &AssetImporterWindow::ClearProcessingOverlay);
-    m_processingOverlayIndex = m_processingOverlay->PushToOverlay();
-}
-
-void AssetImporterWindow::ResetMenuAccess(WindowState state)
-{
-    if (state == WindowState::FileLoaded)
-    {
-        ui->m_actionResetSettings->setEnabled(true);
-        ui->m_actionInspect->setEnabled(true);
-    }
-    else
-    {
-        ui->m_actionResetSettings->setEnabled(false);
-        ui->m_actionInspect->setEnabled(false);
-    }
-}
-
-void AssetImporterWindow::OnOpenDocumentation()
-{
-    QDesktopServices::openUrl(QString(s_documentationWebAddress));
-}
-
-void AssetImporterWindow::OnInspect()
-{
-    AZ::SceneAPI::UI::OverlayWidgetButtonList buttons;
-    AZ::SceneAPI::UI::OverlayWidgetButton closeButton;
-    closeButton.m_text = "Close";
-    closeButton.m_triggersPop = true;
-    buttons.push_back(&closeButton);
-
-    QLabel* label = new QLabel("Please close the inspector to continue editing the settings.");
-    label->setWordWrap(true);
-    label->setAlignment(Qt::AlignCenter);
-
-    // make sure the inspector doesn't outlive the AssetImporterWindow, since we own the data it will be inspecting.
-    auto* theInspectWidget = aznew AZ::SceneAPI::UI::SceneGraphInspectWidget(*m_assetImporterDocument->GetScene());
-    QObject::connect(this, &QObject::destroyed, theInspectWidget, [theInspectWidget]() { theInspectWidget->window()->close(); } );
-    
-    m_overlay->PushLayer(label, theInspectWidget, "Scene Inspector", buttons);
-}
-
-void AssetImporterWindow::OverlayLayerAdded()
-{
-    setCursor(Qt::WaitCursor);
-    ResetMenuAccess(WindowState::OverlayShowing);
-}
-
-void AssetImporterWindow::OverlayLayerRemoved()
-{
-    if (m_isClosed && !m_overlay->IsAtRoot())
-    {
-        return;
-    }
-
-    setCursor(Qt::ArrowCursor);
-
-    // Reset menu access
-    if (m_assetImporterDocument->GetScene())
-    {
-        ResetMenuAccess(WindowState::FileLoaded);
-    }
-    else
-    {
-        ResetMenuAccess(WindowState::InitialNothingLoaded);
-        
-        ui->m_initialBrowseContainer->show();
-        m_rootDisplay->hide();
-    }
-}
-
-void AssetImporterWindow::SetTitle(const char* filePath)
-{
-    QWidget* dock = parentWidget();
-    while (dock)
-    {
-        QDockWidget* converted = qobject_cast<QDockWidget*>(dock);
-        if (converted)
-        {
-            AZStd::string extension;
-            if (AzFramework::StringFunc::Path::GetExtension(filePath, extension, false))
-            {
-                extension[0] = toupper(extension[0]);
-                for (size_t i = 1; i < extension.size(); ++i)
-                {
-                    extension[i] = tolower(extension[i]);
-                }
-            }
-            else
-            {
-                extension = "Scene";
-            }
-            AZStd::string fileName;
-            AzFramework::StringFunc::Path::GetFileName(filePath, fileName);
-            converted->setWindowTitle(QString("%1 Settings (PREVIEW) - %2").arg(extension.c_str(), fileName.c_str()));
-            break;
-        }
-        else
-        {
-            dock = dock->parentWidget();
-        }
-    }
-}
-
-void AssetImporterWindow::HandleAssetLoadingCompleted()
-{
-    if (!m_assetImporterDocument->GetScene())
-    {
-        AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to load scene.");
-        return;
-    }
-
-    m_fullSourcePath = m_assetImporterDocument->GetScene()->GetSourceFilename();
-    SetTitle(m_fullSourcePath.c_str());
-
-    QString userFriendlyFileName;
-    MakeUserFriendlySourceAssetPath(userFriendlyFileName, m_fullSourcePath.c_str());
-    m_rootDisplay->SetSceneDisplay(userFriendlyFileName, m_assetImporterDocument->GetScene());
-
-    // Once we've browsed to something successfully, we need to hide the initial browse button layer and
-    //  show the main area where all the actual work takes place
-    ui->m_initialBrowseContainer->hide();
-    m_rootDisplay->show();
-}
-
-void AssetImporterWindow::ClearProcessingOverlay()
-{
-    m_processingOverlayIndex = AZ::SceneAPI::UI::OverlayWidget::s_invalidOverlayIndex;
-    m_processingOverlay.reset(nullptr);
-}
-
-#include <moc_AssetImporterWindow.cpp>
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterWindow.h b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterWindow.h
deleted file mode 100644
index ffa1fc267e..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterWindow.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Asset Importer Qt Interface
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if !defined(Q_MOC_RUN)
-#include <QMainWindow>
-#include <AssetImporterDocument.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#endif
-
-namespace AZStd
-{
-    class thread;
-}
-
-namespace Ui
-{
-    class AssetImporterWindow;
-}
-
-namespace AZ
-{
-    class Module;
-
-    namespace SceneAPI
-    {
-        namespace UI
-        {
-            class OverlayWidget;
-        }
-        namespace SceneUI
-        {
-            class ProcessingOverlayWidget;
-        }
-    }
-}
-
-class ImporterRootDisplay;
-class QCloseEvent;
-class QMenu;
-class QAction;
-
-class AssetImporterWindow
-    : public QMainWindow
-{
-    Q_OBJECT
-public:
-    AssetImporterWindow();
-    explicit AssetImporterWindow(QWidget* parent);
-    ~AssetImporterWindow();
-
-    // This implementation is required for unregister/register on "RegisterQtViewPane"
-    static const GUID& GetClassID()
-    {
-        // {c50c09d6-5bfa-4d49-8542-e350656ed1bc}
-        static const GUID guid = {
-            0xc50c09d6, 0x5bfa, 0x4d49, { 0x85, 0x42, 0xe3, 0x50, 0x65, 0x6e, 0xd1, 0xbc }
-        };
-        return guid;
-    }
-    
-    void OpenFile(const AZStd::string& filePath);
-    
-    void closeEvent(QCloseEvent* ev);
-
-public slots:
-    void OnSceneResetRequested();
-    void OnOpenDocumentation();
-    void OnInspect();
-
-private:
-    void Init();
-    void OpenFileInternal(const AZStd::string& filePath);
-    bool IsAllowedToChangeSourceFile();
-    
-    enum class WindowState
-    {
-        InitialNothingLoaded,
-        FileLoaded,
-        OverlayShowing
-    };
-
-    void ResetMenuAccess(WindowState state);
-    void SetTitle(const char* filePath);
-    void HandleAssetLoadingCompleted();
-    void ClearProcessingOverlay();
-
-private slots:
-    void UpdateClicked();
-    
-    void OverlayLayerAdded();
-    void OverlayLayerRemoved();
-
-private:
-    static const AZ::Uuid s_browseTag;
-    static const char* s_documentationWebAddress;
-
-    QScopedPointer<Ui::AssetImporterWindow> ui;
-    QScopedPointer<AssetImporterDocument> m_assetImporterDocument;
-    QScopedPointer<AZ::SceneAPI::UI::OverlayWidget> m_overlay;
-
-    AZ::SerializeContext* m_serializeContext;
-    AZStd::string m_fullSourcePath;
-
-    QScopedPointer<ImporterRootDisplay> m_rootDisplay;
-    bool m_isClosed;
-
-    int m_processingOverlayIndex;
-    QSharedPointer<AZ::SceneAPI::SceneUI::ProcessingOverlayWidget> m_processingOverlay;
-};
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/CMakeLists.txt b/Code/Sandbox/Plugins/EditorAssetImporter/CMakeLists.txt
deleted file mode 100644
index 26d8e5093b..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME EditorAssetImporter MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY EditorPlugins
-    AUTOMOC
-    AUTOUIC
-    FILES_CMAKE
-        editorassetimporter_files.cmake
-    COMPILE_DEFINITIONS
-        PRIVATE
-            PLUGIN_EXPORTS
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Core
-            3rdParty::Qt::Widgets
-            AZ::AzCore
-            AZ::AzToolsFramework
-            AZ::SceneCore
-            AZ::SceneUI
-            AZ::SceneData
-            AZ::GFxFramework
-            Legacy::CryCommon
-            Legacy::EditorLib
-            Legacy::EditorCommon
-)
-
-ly_add_dependencies(Editor EditorAssetImporter)
-set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::EditorAssetImporter>)
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h b/Code/Sandbox/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h
deleted file mode 100644
index 16785f74d7..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/EditorAssetImporter_precompiled.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// CryTek
-/////////////////////////////////////////////////////////////////////////////
-#include <platform.h>
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/ImporterRootDisplay.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/ImporterRootDisplay.cpp
deleted file mode 100644
index 567db6ba56..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/ImporterRootDisplay.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorAssetImporter_precompiled.h"
-#include <ImporterRootDisplay.h>
-#include <ui_ImporterRootDisplay.h>
-
-#include <IEditor.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h>
-#include <SceneAPI/SceneUI/SceneWidgets/ManifestWidget.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-ImporterRootDisplay::ImporterRootDisplay(AZ::SerializeContext* serializeContext, QWidget* parent)
-    : QWidget(parent)
-    , ui(new Ui::ImporterRootDisplay())
-    , m_manifestWidget(new AZ::SceneAPI::UI::ManifestWidget(serializeContext))
-    , m_hasUnsavedChanges(false)
-{
-    ui->setupUi(this);
-    ui->m_manifestWidgetAreaLayout->addWidget(m_manifestWidget.data());
-
-    ui->m_updateButton->setEnabled(false);
-    ui->m_updateButton->setProperty("class", "Primary");
-
-    connect(ui->m_updateButton, &QPushButton::clicked, this, &ImporterRootDisplay::UpdateClicked);
-
-    BusConnect();
-}
-
-ImporterRootDisplay::~ImporterRootDisplay()
-{
-    BusDisconnect();
-    delete ui;
-}
-
-AZ::SceneAPI::UI::ManifestWidget* ImporterRootDisplay::GetManifestWidget()
-{
-    return m_manifestWidget.data();
-}
-
-void ImporterRootDisplay::SetSceneDisplay(const QString& headerText, const AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& scene)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    if (!scene)
-    {
-        AZ_Assert(scene, "No scene provided to display.");
-        return;
-    }
-
-    ui->m_filePathText->setText(headerText);
-
-    HandleSceneWasReset(scene);
-
-    ui->m_updateButton->setEnabled(false);
-    m_hasUnsavedChanges = false;
-}
-
-void ImporterRootDisplay::HandleSceneWasReset(const AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& scene)
-{
-    AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-    // Don't accept updates while the widget is being filled in.
-    BusDisconnect();
-    m_manifestWidget->BuildFromScene(scene);
-    BusConnect();
-}
-
-void ImporterRootDisplay::HandleSaveWasSuccessful()
-{
-    ui->m_updateButton->setEnabled(false);
-    m_hasUnsavedChanges = false;
-}
-
-bool ImporterRootDisplay::HasUnsavedChanges() const
-{
-    return m_hasUnsavedChanges;
-}
-
-void ImporterRootDisplay::ObjectUpdated(const AZ::SceneAPI::Containers::Scene& scene, const AZ::SceneAPI::DataTypes::IManifestObject* /*target*/, void* /*sender*/)
-{
-    if (m_manifestWidget)
-    {
-        if (&scene == m_manifestWidget->GetScene().get())
-        {
-            m_hasUnsavedChanges = true;
-            ui->m_updateButton->setEnabled(true);
-        }
-    }
-}
-
-#include <moc_ImporterRootDisplay.cpp>
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/ImporterRootDisplay.h b/Code/Sandbox/Plugins/EditorAssetImporter/ImporterRootDisplay.h
deleted file mode 100644
index f98614fb6d..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/ImporterRootDisplay.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#if !defined(Q_MOC_RUN)
-#include <QWidget>
-#include <QScopedPointer>
-
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/Memory/SystemAllocator.h>
-
-#include <SceneAPI/SceneCore/Events/ManifestMetaInfoBus.h>
-#include <SceneAPI/SceneUI/SceneUIConfiguration.h>
-#endif
-
-class QAction;
-class QMenu;
-
-namespace AZ
-{
-    class SerializeContext;
-
-    namespace SceneAPI
-    {
-        namespace Containers
-        {
-            class Scene;
-        }
-
-        namespace UI
-        {
-            class ManifestWidget;
-
-        }
-    }
-}
-
-namespace Ui
-{
-    class ImporterRootDisplay;
-}
-
-class ImporterRootDisplay 
-    : public QWidget
-    , public AZ::SceneAPI::Events::ManifestMetaInfoBus::Handler
-{
-    Q_OBJECT
-
-public:
-    AZ_CLASS_ALLOCATOR(ImporterRootDisplay, AZ::SystemAllocator, 0)
-
-    ImporterRootDisplay(AZ::SerializeContext* serializeContext, QWidget* parent = nullptr);
-
-    ~ImporterRootDisplay();
-
-    AZ::SceneAPI::UI::ManifestWidget* GetManifestWidget();
-
-    void SetSceneDisplay(const QString& headerText, const AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& scene);
-    void HandleSceneWasReset(const AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene>& scene);
-    void HandleSaveWasSuccessful();
-    bool HasUnsavedChanges() const;
-
-
-signals:
-    void UpdateClicked();
-
-private:
-    // ManifestMetaInfoBus
-    void ObjectUpdated(const AZ::SceneAPI::Containers::Scene& scene, const AZ::SceneAPI::DataTypes::IManifestObject* target, void* sender) override;
-
-    Ui::ImporterRootDisplay* ui;
-    QScopedPointer<AZ::SceneAPI::UI::ManifestWidget> m_manifestWidget;
-    bool m_hasUnsavedChanges;
-};
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/Main.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/Main.cpp
deleted file mode 100644
index bfb1df732a..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/Main.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Asset Importer Sandbox Plugin Instance Creation
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include "EditorAssetImporter_precompiled.h"
-#include "AssetImporterPlugin.h"
-
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-#include <AzCore/Memory/SystemAllocator.h>
-
-PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
-{
-    IEditor* editor = pInitParam->pIEditorInterface;
-    SetIEditor(editor);
-    ISystem* system = pInitParam->pIEditorInterface->GetSystem();
-    ModuleInitISystem(system, "QtAssetImporter");
-    return new AssetImporterPlugin(editor);
-}
-
-
-#if !defined(AZ_MONOLITHIC_BUILD)
-
-#if defined(AZ_PLATFORM_WINDOWS)
-HINSTANCE g_hInstance = 0;
-BOOL __stdcall DllMain(HINSTANCE hinstDLL, ULONG fdwReason, [[maybe_unused]] LPVOID lpvReserved)
-{
-    if (fdwReason == DLL_PROCESS_ATTACH)
-    {
-        g_hInstance = hinstDLL;
-    }
-
-    return TRUE;
-}
-#endif
-
-#endif // !defined(AZ_MONOLITHIC_BUILD)
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/SceneSerializationHandler.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/SceneSerializationHandler.cpp
deleted file mode 100644
index df46507809..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/SceneSerializationHandler.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorAssetImporter_precompiled.h"
-#include <AzCore/IO/SystemFile.h>
-#include <AzCore/std/algorithm.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneSerializationHandler.h>
-
-namespace AZ
-{
-    SceneSerializationHandler::~SceneSerializationHandler()
-    {
-        Deactivate();
-    }
-
-    void SceneSerializationHandler::Activate()
-    {
-        BusConnect();
-    }
-
-    void SceneSerializationHandler::Deactivate()
-    {
-        BusDisconnect();
-    }
-
-    AZStd::shared_ptr<SceneAPI::Containers::Scene> SceneSerializationHandler::LoadScene(
-        const AZStd::string& filePath, Uuid sceneSourceGuid)
-    {
-        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
-        namespace Utilities = AZ::SceneAPI::Utilities;
-        using AZ::SceneAPI::Events::AssetImportRequest;
-
-        CleanSceneMap();
-
-        AZ_TraceContext("File", filePath);
-        if (!IsValidExtension(filePath))
-        {
-            return nullptr;
-        }
-
-        AZStd::string cleanPath = filePath;
-        if (AzFramework::StringFunc::Path::IsRelative(filePath.c_str()))
-        {
-            const char* absolutePath = nullptr;
-            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(absolutePath, 
-                &AzToolsFramework::AssetSystemRequestBus::Events::GetAbsoluteDevRootFolderPath);
-            AZ_Assert(absolutePath, "Unable to retrieve the dev folder path");
-            AzFramework::StringFunc::Path::Join(absolutePath, cleanPath.c_str(), cleanPath);
-        }
-        else
-        {
-            // Normalizing is not needed if the path is relative as Join(...) will also normalize.
-            AzFramework::StringFunc::Path::Normalize(cleanPath);
-        }
-
-        auto sceneIt = m_scenes.find(cleanPath);
-        if (sceneIt != m_scenes.end())
-        {
-            AZStd::shared_ptr<SceneAPI::Containers::Scene> scene = sceneIt->second.lock();
-            if (scene)
-            {
-                return scene;
-            }
-            // There's a small window in between which the scene was closed after searching for
-            //      it in the scene map. In this case continue and simply reload the scene.
-        }
-
-        if (!AZ::IO::SystemFile::Exists(cleanPath.c_str()))
-        {
-            AZ_TracePrintf(Utilities::ErrorWindow, "No file exists at given source path.");
-            return nullptr;
-        }
-
-        if (sceneSourceGuid.IsNull())
-        {
-            bool result = false;
-            AZ::Data::AssetInfo info;
-            AZStd::string watchFolder;
-            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(result, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, cleanPath.c_str(), info, watchFolder);
-            if (!result)
-            {
-                AZ_TracePrintf(Utilities::ErrorWindow, "Failed to retrieve file info needed to determine the uuid of the source file.");
-                return nullptr;
-            }
-            sceneSourceGuid = info.m_assetId.m_guid;
-        }
-
-        AZStd::shared_ptr<SceneAPI::Containers::Scene> scene = 
-            AssetImportRequest::LoadSceneFromVerifiedPath(cleanPath, sceneSourceGuid, AssetImportRequest::RequestingApplication::Editor);
-        if (!scene)
-        {
-            AZ_TracePrintf(Utilities::ErrorWindow, "Failed to load the requested scene.");
-            return nullptr;
-        }
-
-        m_scenes.emplace(AZStd::move(cleanPath), scene);
-        
-        return scene;
-    }
-
-    bool SceneSerializationHandler::IsValidExtension(const AZStd::string& filePath) const
-    {
-        namespace Utilities = AZ::SceneAPI::Utilities;
-
-        if (AZ::SceneAPI::Events::AssetImportRequest::IsManifestExtension(filePath.c_str()))
-        {
-            AZ_TracePrintf(Utilities::ErrorWindow, "Provided path contains the manifest path, not the path to the source file.");
-            return false;
-        }
-
-        if (!AZ::SceneAPI::Events::AssetImportRequest::IsSceneFileExtension(filePath.c_str()))
-        {
-            AZ_TracePrintf(Utilities::ErrorWindow, "Provided path doesn't contain an extension supported by the SceneAPI.");
-            return false;
-        }
-
-        return true;
-    }
-
-    void SceneSerializationHandler::CleanSceneMap()
-    {
-        for (auto it = m_scenes.begin(); it != m_scenes.end(); )
-        {
-            if (it->second.expired())
-            {
-                it = m_scenes.erase(it);
-            }
-            else
-            {
-                ++it;
-            }
-        }
-    }
-} // namespace AZ
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/SceneSerializationHandler.h b/Code/Sandbox/Plugins/EditorAssetImporter/SceneSerializationHandler.h
deleted file mode 100644
index 717fe600a0..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/SceneSerializationHandler.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/std/smart_ptr/weak_ptr.h>
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Events/SceneSerializationBus.h>
-
-namespace AZ
-{
-    class SceneSerializationHandler
-        : public SceneAPI::Events::SceneSerializationBus::Handler
-    {
-    public:
-        ~SceneSerializationHandler() override;
-
-        void Activate();
-        void Deactivate();
-
-        AZStd::shared_ptr<SceneAPI::Containers::Scene> LoadScene(
-            const AZStd::string& sceneFilePath, Uuid sceneSourceGuid) override;
-
-    private:
-        bool IsValidExtension(const AZStd::string& filePath) const;
-        void CleanSceneMap();
-
-        AZStd::unordered_map<AZStd::string, AZStd::weak_ptr<SceneAPI::Containers::Scene>> m_scenes;
-    };
-} // namespace AZ
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/editorassetimporter_files.cmake b/Code/Sandbox/Plugins/EditorAssetImporter/editorassetimporter_files.cmake
deleted file mode 100644
index 7180de932a..0000000000
--- a/Code/Sandbox/Plugins/EditorAssetImporter/editorassetimporter_files.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    AssetImporterWindow.h
-    AssetImporterWindow.cpp
-    AssetImporterPlugin.h
-    AssetImporterPlugin.cpp
-    AssetImporterDocument.h
-    AssetImporterDocument.cpp
-    ImporterRootDisplay.h
-    ImporterRootDisplay.cpp
-    AssetBrowserContextProvider.h
-    AssetBrowserContextProvider.cpp
-    SceneSerializationHandler.h
-    SceneSerializationHandler.cpp
-    Main.cpp
-    EditorAssetImporter_precompiled.h
-    AssetImporter.qrc
-    AssetImporterWindow.ui
-    ImporterRootDisplay.ui
-)
diff --git a/Code/Sandbox/Plugins/EditorCommon/ActionOutput.cpp b/Code/Sandbox/Plugins/EditorCommon/ActionOutput.cpp
deleted file mode 100644
index fc297b550b..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/ActionOutput.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorCommon_precompiled.h"
-#include <ActionOutput.h>
-#include <QWidget>
-
-namespace AZ
-{
-    ActionOutput::ActionOutput()
-        : m_errorCount(0)
-        , m_warningCount(0)
-    {
-    }
-
-    void ActionOutput::AddError(const AZStd::string& error)
-    {
-        AddError(error, "");
-    }
-
-    void ActionOutput::AddError(const AZStd::string& error, const AZStd::string& details)
-    {
-        m_errorToDetails[error].push_back(details);
-        ++m_errorCount;
-    }
-
-    bool ActionOutput::HasAnyErrors() const
-    {
-        return m_errorCount > 0;
-    }
-
-    AZStd::string ActionOutput::BuildErrorMessage() const
-    {
-        return BuildMessage(m_errorToDetails);
-    }
-
-    void ActionOutput::AddWarning(const AZStd::string& warning)
-    {
-        AddWarning(warning, "");
-    }
-
-    void ActionOutput::AddWarning(const AZStd::string& warning, const AZStd::string& details)
-    {
-        m_warningToDetails[warning].push_back(details);
-        ++m_warningCount;
-    }
-
-    bool ActionOutput::HasAnyWarnings() const
-    {
-        return m_warningCount > 0;
-    }
-
-    AZStd::string ActionOutput::BuildWarningMessage() const
-    {
-        return BuildMessage(m_warningToDetails);
-    }
-
-    AZStd::string ActionOutput::BuildMessage(const IssueToDetails& issues) const
-    {
-        AZStd::string message;
-        for (const auto& it : issues)
-        {
-            message += it.first;
-            message += ":\n";
-            const DetailList& details = it.second;
-            for (size_t i = 0; i < details.size(); ++i)
-            {
-                message += "    ";
-                message += details[i];
-                message += "\n";
-            }
-
-            message += "\n";
-        }
-
-        return message;
-    }
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/ActionOutput.h b/Code/Sandbox/Plugins/EditorCommon/ActionOutput.h
deleted file mode 100644
index 83842622c0..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/ActionOutput.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/map.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <EditorCommonAPI.h>
-
-namespace AZ
-{
-    // Stores the error output from save actions. Pairs error messages with a "details" context. That way if you could
-    //  do something like:
-    //      output->AddError("Failed to save file", fileName);
-    //
-    //  Then if that error gets added a few times with different files, the final error message will be aggregated as
-    //  follows:
-    //     Failed to save file:
-    //          thing1.cdf
-    //          thing2.chr
-    class EDITOR_COMMON_API ActionOutput
-    {
-    public:
-        using DetailList = AZStd::vector<AZStd::string>;
-        using IssueToDetails = AZStd::map<AZStd::string, DetailList>;
-
-        ActionOutput();
-
-        void AddError(const AZStd::string& error);
-        void AddError(const AZStd::string& error, const AZStd::string& details);
-        bool HasAnyErrors() const;
-        AZStd::string BuildErrorMessage() const;
-
-        void AddWarning(const AZStd::string& error);
-        void AddWarning(const AZStd::string& error, const AZStd::string& details);
-        bool HasAnyWarnings() const;
-        AZStd::string BuildWarningMessage() const;
-
-    private:
-        AZStd::string BuildMessage(const IssueToDetails& issues) const;
-
-        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        IssueToDetails m_errorToDetails;
-        IssueToDetails m_warningToDetails;
-        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        int m_errorCount;
-        int m_warningCount;
-    };
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/AxisHelper.cpp b/Code/Sandbox/Plugins/EditorCommon/AxisHelper.cpp
deleted file mode 100644
index ae03e43476..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/AxisHelper.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorCommon_precompiled.h"
-#include "../../Editor/RenderHelpers/AxisHelperShared.inl"
diff --git a/Code/Sandbox/Plugins/EditorCommon/CMakeLists.txt b/Code/Sandbox/Plugins/EditorCommon/CMakeLists.txt
deleted file mode 100644
index 4dfe9efe9a..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-# Header only target to prevent linkage against editor libraries when it is not needed. Eventually the targets that depend
-# on editor headers should cleanup dependencies and interact with the editor through buses or other mechanisms
-ly_add_target(
-    NAME EditorCommon.Headers HEADERONLY
-    NAMESPACE Legacy
-    FILES_CMAKE
-        editorcommon_files.cmake
-    INCLUDE_DIRECTORIES
-        INTERFACE
-            .
-)
-
-ly_add_target(
-    NAME EditorCommon SHARED
-    NAMESPACE Legacy
-    AUTOMOC
-    AUTORCC
-    FILES_CMAKE
-        editorcommon_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    COMPILE_DEFINITIONS
-        PRIVATE
-            EDITOR_COMMON_EXPORTS
-        INTERFACE
-            EDITOR_COMMON_IMPORTS
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::zlib
-            3rdParty::Qt::Core
-            3rdParty::Qt::Widgets
-            Legacy::CryCommon
-            Legacy::EditorCore
-            AZ::AzCore
-            AZ::AzToolsFramework
-            AZ::AzQtComponents
-)
diff --git a/Code/Sandbox/Plugins/EditorCommon/Cry_LegacyPhysUtils.h b/Code/Sandbox/Plugins/EditorCommon/Cry_LegacyPhysUtils.h
deleted file mode 100644
index bee078f602..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/Cry_LegacyPhysUtils.h
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-// Copied utils functions from CryPhysics that are used by non-physics systems
-// This functions will be eventually removed, DO *NOT* use these functions
-// TO-DO: Re-implement users using new code
-// LY-109806
-
-#pragma once
-
-#include "Cry_Math.h"
-
-namespace LegacyCryPhysicsUtils
-{
-    namespace polynomial_tpl_IMPL
-    {
-        template<class ftype, int degree>
-        class polynomial_tpl
-        {
-        public:
-            explicit polynomial_tpl() { denom = (ftype)1; };
-            explicit polynomial_tpl(ftype op) { zero(); data[degree] = op; }
-            AZ_FORCE_INLINE polynomial_tpl& zero()
-            {
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[i] = 0;
-                }
-                denom = (ftype)1;
-                return *this;
-            }
-            polynomial_tpl(const polynomial_tpl<ftype, degree>& src) { *this = src; }
-            polynomial_tpl& operator=(const polynomial_tpl<ftype, degree>& src)
-            {
-                denom = src.denom;
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[i] = src.data[i];
-                }
-                return *this;
-            }
-            template<int degree1>
-            AZ_FORCE_INLINE polynomial_tpl& operator=(const polynomial_tpl<ftype, degree1>& src)
-            {
-                int i;
-                denom = src.denom;
-                for (i = 0; i <= min(degree, degree1); i++)
-                {
-                    data[i] = src.data[i];
-                }
-                for (; i < degree; i++)
-                {
-                    data[i] = 0;
-                }
-                return *this;
-            }
-            AZ_FORCE_INLINE polynomial_tpl& set(ftype* pdata)
-            {
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[degree - i] = pdata[i];
-                }
-                return *this;
-            }
-
-            AZ_FORCE_INLINE ftype& operator[](int idx) { return data[idx]; }
-
-            void calc_deriviative(polynomial_tpl<ftype, degree>& deriv, int curdegree = degree) const;
-
-            AZ_FORCE_INLINE polynomial_tpl& fixsign()
-            {
-                ftype sg = sgnnz(denom);
-                denom *= sg;
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[i] *= sg;
-                }
-                return *this;
-            }
-
-            int findroots(ftype start, ftype end, ftype* proots, int nIters = 20, int curdegree = degree, bool noDegreeCheck = false) const;
-            int nroots(ftype start, ftype end) const;
-
-            AZ_FORCE_INLINE ftype eval(ftype x) const
-            {
-                ftype res = 0;
-                for (int i = degree; i >= 0; i--)
-                {
-                    res = res * x + data[i];
-                }
-                return res;
-            }
-            AZ_FORCE_INLINE ftype eval(ftype x, int subdegree) const
-            {
-                ftype res = data[subdegree];
-                for (int i = subdegree - 1; i >= 0; i--)
-                {
-                    res = res * x + data[i];
-                }
-                return res;
-            }
-
-            AZ_FORCE_INLINE polynomial_tpl& operator+=(ftype op) { data[0] += op * denom; return *this; }
-            AZ_FORCE_INLINE polynomial_tpl& operator-=(ftype op) { data[0] -= op * denom; return *this; }
-            AZ_FORCE_INLINE polynomial_tpl operator*(ftype op) const
-            {
-                polynomial_tpl<ftype, degree> res;
-                res.denom = denom;
-                for (int i = 0; i <= degree; i++)
-                {
-                    res.data[i] = data[i] * op;
-                }
-                return res;
-            }
-            AZ_FORCE_INLINE polynomial_tpl& operator*=(ftype op)
-            {
-                for (int i = 0; i <= degree; i++)
-                {
-                    data[i] *= op;
-                }
-                return *this;
-            }
-            AZ_FORCE_INLINE polynomial_tpl operator/(ftype op) const
-            {
-                polynomial_tpl<ftype, degree> res = *this;
-                res.denom = denom * op;
-                return res;
-            }
-            AZ_FORCE_INLINE polynomial_tpl& operator/=(ftype op) { denom *= op;   return *this; }
-
-            AZ_FORCE_INLINE polynomial_tpl<ftype, degree * 2> sqr() const { return *this * *this; }
-
-            ftype denom;
-            ftype data[degree + 1];
-        };
-
-        template <class ftype>
-        struct tagPolyE
-        {
-            inline static ftype polye() { return (ftype)1E-10; }
-        };
-
-        template<>
-        inline float tagPolyE<float>::polye() { return 1e-6f; }
-
-        template <class ftype>
-        inline ftype polye() { return tagPolyE<ftype>::polye(); }
-
-        // Don't use this macro; use AZStd::max instead. This is only here to make the template const arguments below readable
-        // and because Visual Studio 2013 doesn't have a const_expr version of std::max
-        #define deprecated_degmax(degree1, degree2) (((degree1) > (degree2)) ? (degree1) : (degree2))
-
-        template<class ftype, int degree>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator+(const polynomial_tpl<ftype, degree>& pn, ftype op)
-        {
-            polynomial_tpl<ftype, degree> res = pn;
-            res.data[0] += op * res.denom;
-            return res;
-        }
-        template<class ftype, int degree>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator-(const polynomial_tpl<ftype, degree>& pn, ftype op)
-        {
-            polynomial_tpl<ftype, degree> res = pn;
-            res.data[0] -= op * res.denom;
-            return res;
-        }
-
-        template<class ftype, int degree>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator+(ftype op, const polynomial_tpl<ftype, degree>& pn)
-        {
-            polynomial_tpl<ftype, degree> res = pn;
-            res.data[0] += op * res.denom;
-            return res;
-        }
-        template<class ftype, int degree>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree> operator-(ftype op, const polynomial_tpl<ftype, degree>& pn)
-        {
-            polynomial_tpl<ftype, degree> res = pn;
-            res.data[0] -= op * res.denom;
-            for (int i = 0; i <= degree; i++)
-            {
-                res.data[i] = -res.data[i];
-            }
-            return res;
-        }
-        template<class ftype, int degree>
-        polynomial_tpl<ftype, degree * 2> AZ_FORCE_INLINE psqr(const polynomial_tpl<ftype, degree>& op) { return op * op; }
-
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> operator+(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> res;
-            int i;
-            for (i = 0; i <= min(degree1, degree2); i++)
-            {
-                res.data[i] = op1.data[i] * op2.denom + op2.data[i] * op1.denom;
-            }
-            for (; i <= degree1; i++)
-            {
-                res.data[i] = op1.data[i] * op2.denom;
-            }
-            for (; i <= degree2; i++)
-            {
-                res.data[i] = op2.data[i] * op1.denom;
-            }
-            res.denom = op1.denom * op2.denom;
-            return res;
-        }
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> operator-(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            polynomial_tpl<ftype, deprecated_degmax(degree1, degree2)> res;
-            int i;
-            for (i = 0; i <= min(degree1, degree2); i++)
-            {
-                res.data[i] = op1.data[i] * op2.denom - op2.data[i] * op1.denom;
-            }
-            for (; i <= degree1; i++)
-            {
-                res.data[i] = op1.data[i] * op2.denom;
-            }
-            for (; i <= degree2; i++)
-            {
-                res.data[i] = op2.data[i] * op1.denom;
-            }
-            res.denom = op1.denom * op2.denom;
-            return res;
-        }
-
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1>& operator+=(polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            for (int i = 0; i < min(degree1, degree2); i++)
-            {
-                op1.data[i] = op1.data[i] * op2.denom + op2.data[i] * op1.denom;
-            }
-            op1.denom *= op2.denom;
-            return op1;
-        }
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1>& operator-=(polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            for (int i = 0; i < min(degree1, degree2); i++)
-            {
-                op1.data[i] = op1.data[i] * op2.denom - op2.data[i] * op1.denom;
-            }
-            op1.denom *= op2.denom;
-            return op1;
-        }
-
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1 + degree2> operator*(const polynomial_tpl<ftype, degree1>& op1, const polynomial_tpl<ftype, degree2>& op2)
-        {
-            polynomial_tpl<ftype, degree1 + degree2> res;
-            res.zero();
-            int j;
-            switch (degree1)
-            {
-            case 8:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[8 + j] += op1.data[8] * op2.data[j];
-                }
-            case 7:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[7 + j] += op1.data[7] * op2.data[j];
-                }
-            case 6:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[6 + j] += op1.data[6] * op2.data[j];
-                }
-            case 5:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[5 + j] += op1.data[5] * op2.data[j];
-                }
-            case 4:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[4 + j] += op1.data[4] * op2.data[j];
-                }
-            case 3:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[3 + j] += op1.data[3] * op2.data[j];
-                }
-            case 2:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[2 + j] += op1.data[2] * op2.data[j];
-                }
-            case 1:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[1 + j] += op1.data[1] * op2.data[j];
-                }
-            case 0:
-                for (j = 0; j <= degree2; j++)
-                {
-                    res.data[0 + j] += op1.data[0] * op2.data[j];
-                }
-            }
-            res.denom = op1.denom * op2.denom;
-            return res;
-        }
-
-
-        template <class ftype>
-        AZ_FORCE_INLINE void polynomial_divide(const polynomial_tpl<ftype, 8>& num, const polynomial_tpl<ftype, 8>& den, polynomial_tpl<ftype, 8>& quot,
-            polynomial_tpl<ftype, 8>& rem, int degree1, int degree2)
-        {
-            int i, j, k, l;
-            ftype maxel;
-            for (i = 0; i <= degree1; i++)
-            {
-                rem.data[i] = num.data[i];
-            }
-            for (i = 0; i <= degree1 - degree2; i++)
-            {
-                quot.data[i] = 0;
-            }
-            for (i = 1, maxel = fabs_tpl(num.data[0]); i <= degree1; i++)
-            {
-                maxel = max(maxel, num.data[i]);
-            }
-            for (maxel *= polye<ftype>(); degree1 >= 0 && fabs_tpl(num.data[degree1]) < maxel; degree1--)
-            {
-                ;
-            }
-            for (i = 1, maxel = fabs_tpl(den.data[0]); i <= degree2; i++)
-            {
-                maxel = max(maxel, den.data[i]);
-            }
-            for (maxel *= polye<ftype>(); degree2 >= 0 && fabs_tpl(den.data[degree2]) < maxel; degree2--)
-            {
-                ;
-            }
-            rem.denom = num.denom;
-            quot.denom = (ftype)1;
-            if (degree1 < 0 || degree2 < 0)
-            {
-                return;
-            }
-
-            for (k = degree1 - degree2, l = degree1; l >= degree2; l--, k--)
-            {
-                quot.data[k] = rem.data[l] * den.denom;
-                quot.denom *= den.data[degree2];
-                for (i = degree1 - degree2; i > k; i--)
-                {
-                    quot.data[i] *= den.data[degree2];
-                }
-                for (i = degree2 - 1, j = l - 1; i >= 0; i--, j--)
-                {
-                    rem.data[j] = rem.data[j] * den.data[degree2] - den.data[i] * rem.data[l];
-                }
-                for (; j >= 0; j--)
-                {
-                    rem.data[j] *= den.data[degree2];
-                }
-                rem.denom *= den.data[degree2];
-            }
-        }
-
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree1 - degree2> operator/(const polynomial_tpl<ftype, degree1>& num, const polynomial_tpl<ftype, degree2>& den)
-        {
-            polynomial_tpl<ftype, degree1 - degree2> quot;
-            polynomial_tpl<ftype, degree1> rem;
-            polynomial_divide((polynomial_tpl<ftype, 8>&)num, (polynomial_tpl<ftype, 8>&)den, (polynomial_tpl<ftype, 8>&)quot,
-                (polynomial_tpl<ftype, 8>&)rem, degree1, degree2);
-            return quot;
-        }
-        template <class ftype, int degree1, int degree2>
-        AZ_FORCE_INLINE polynomial_tpl<ftype, degree2 - 1> operator%(const polynomial_tpl<ftype, degree1>& num, const polynomial_tpl<ftype, degree2>& den)
-        {
-            polynomial_tpl<ftype, degree1 - degree2> quot;
-            polynomial_tpl<ftype, degree1> rem;
-            polynomial_divide((polynomial_tpl<ftype, 8>&)num, (polynomial_tpl<ftype, 8>&)den, (polynomial_tpl<ftype, 8>&)quot,
-                (polynomial_tpl<ftype, 8>&)rem, degree1, degree2);
-            return (polynomial_tpl<ftype, degree2 - 1>&)rem;
-        }
-
-        template <class ftype, int degree>
-        AZ_FORCE_INLINE void polynomial_tpl<ftype, degree>::calc_deriviative(polynomial_tpl<ftype, degree>& deriv, int curdegree) const
-        {
-            for (int i = 0; i < curdegree; i++)
-            {
-                deriv.data[i] = data[i + 1] * (i + 1);
-            }
-            deriv.denom = denom;
-        }
-
-        template<typename to_t, typename from_t>
-        to_t* convert_type(from_t* input)
-        {
-            typedef union
-            {
-                to_t* to;
-                from_t* from;
-            } convert_union;
-            convert_union u;
-            u.from = input;
-            return u.to;
-        }
-
-        template <class ftype, int degree>
-        AZ_FORCE_INLINE int polynomial_tpl<ftype, degree>::nroots(ftype start, ftype end) const
-        {
-            polynomial_tpl<ftype, degree> f[degree + 1];
-            int i, j, sg_a, sg_b;
-            ftype val, prevval;
-
-            calc_deriviative(f[0]);
-            polynomial_divide(*convert_type<polynomial_tpl<ftype, 8> >(this), *convert_type< polynomial_tpl<ftype, 8> >(&f[0]), *convert_type<polynomial_tpl<ftype, 8> >(&f[degree]),
-                *convert_type<polynomial_tpl<ftype, 8> >(&f[1]), degree, degree - 1);
-            f[1].denom = -f[1].denom;
-            for (i = 2; i < degree; i++)
-            {
-                polynomial_divide(*convert_type<polynomial_tpl<ftype, 8> >(&f[i - 2]), *convert_type<polynomial_tpl<ftype, 8> >(&f[i - 1]), *convert_type<polynomial_tpl<ftype, 8> >(&f[degree]),
-                    *convert_type<polynomial_tpl<ftype, 8> >(&f[i]), degree + 1 - i, degree - i);
-                f[i].denom = -f[i].denom;
-                if (fabs_tpl(f[i].denom) > (ftype)1E10)
-                {
-                    for (j = 0; j <= degree - 1 - i; j++)
-                    {
-                        f[i].data[j] *= (ftype)1E-10;
-                    }
-                    f[i].denom *= (ftype)1E-10;
-                }
-            }
-
-            prevval = eval(start) * denom;
-            for (i = sg_a = 0; i < degree; i++, prevval = val)
-            {
-                val = f[i].eval(start, degree - 1 - i) * f[i].denom;
-                sg_a += isneg(val * prevval);
-            }
-
-            prevval = eval(end) * denom;
-            for (i = sg_b = 0; i < degree; i++, prevval = val)
-            {
-                val = f[i].eval(end, degree - 1 - i) * f[i].denom;
-                sg_b += isneg(val * prevval);
-            }
-
-            return fabs_tpl(sg_a - sg_b);
-        }
-
-        template<class ftype>
-        AZ_FORCE_INLINE ftype cubert_tpl(ftype x) { return fabs_tpl(x) > (ftype)1E-20 ? exp_tpl(log_tpl(fabs_tpl(x)) * (ftype)(1.0 / 3)) * sgnnz(x) : x; }
-        template<class ftype>
-        AZ_FORCE_INLINE ftype pow_tpl(ftype x, ftype pow) { return fabs_tpl(x) > (ftype)1E-20 ? exp_tpl(log_tpl(fabs_tpl(x)) * pow) * sgnnz(x) : x; }
-        template<class ftype>
-        AZ_FORCE_INLINE void swap(ftype* ptr, int i, int j) { ftype t = ptr[i]; ptr[i] = ptr[j]; ptr[j] = t; }
-
-        template <class ftype, int maxdegree>
-        int polynomial_tpl<ftype, maxdegree>::findroots(ftype start, ftype end, ftype* proots, [[maybe_unused]] int nIters, int degree, bool noDegreeCheck) const
-        {
-            AZ_UNUSED(nIters);
-            int i, j, nRoots = 0;
-            ftype maxel;
-            if (!noDegreeCheck)
-            {
-                for (i = 1, maxel = fabs_tpl(data[0]); i <= degree; i++)
-                {
-                    maxel = max(maxel, data[i]);
-                }
-                for (maxel *= polye<ftype>(); degree > 0 && fabs_tpl(data[degree]) <= maxel; degree--)
-                {
-                    ;
-                }
-            }
-
-            if constexpr (maxdegree >= 1)
-            {
-                if (degree == 1)
-                {
-                    proots[0] = data[0] / data[1];
-                    nRoots = 1;
-                }
-            }
-
-            if constexpr (maxdegree >= 2)
-            {
-                if (degree == 2)
-                {
-                    ftype a, b, c, d, bound[2], sg;
-
-                    a = data[2];
-                    b = data[1];
-                    c = data[0];
-                    d = aznumeric_cast<ftype>(sgnnz(a));
-                    a *= d;
-                    b *= d;
-                    c *= d;
-                    d = b * b - a * c * 4;
-                    bound[0] = start * a * 2 + b;
-                    bound[1] = end * a * 2 + b;
-                    sg = aznumeric_cast<ftype>((sgnnz(bound[0] * bound[1]) + 1) >> 1);
-                    bound[0] *= bound[0];
-                    bound[1] *= bound[1];
-                    bound[isneg(fabs_tpl(bound[1]) - fabs_tpl(bound[0]))] *= sg;
-
-                    if (isnonneg(d) & inrange(d, bound[0], bound[1]))
-                    {
-                        d = sqrt_tpl(d);
-                        a = (ftype)0.5 / a;
-                        proots[nRoots] = (-b - d) * a;
-                        nRoots += inrange(proots[nRoots], start, end);
-                        proots[nRoots] = (-b + d) * a;
-                        nRoots += inrange(proots[nRoots], start, end);
-                    }
-                }
-            }
-
-            if constexpr (maxdegree >= 3)
-            {
-                if (degree == 3)
-                {
-                    ftype t, a, b, c, a3, p, q, Q, Qr, Ar, Ai, phi;
-
-                    t = (ftype)1.0 / data[3];
-                    a = data[2] * t;
-                    b = data[1] * t;
-                    c = data[0] * t;
-                    a3 = a * (ftype)(1.0 / 3);
-                    p = b - a * a3;
-                    q = (a3 * b - c) * (ftype)0.5 - cube(a3);
-                    Q = cube(p * (ftype)(1.0 / 3)) + q * q;
-                    Qr = sqrt_tpl(fabs_tpl(Q));
-
-                    if (Q > 0)
-                    {
-                        proots[0] = cubert_tpl(q + Qr) + cubert_tpl(q - Qr) - a3;
-                        nRoots = 1;
-                    }
-                    else
-                    {
-                        phi = atan2_tpl(Qr, q) * (ftype)(1.0 / 3);
-                        t = pow_tpl(Qr * Qr + q * q, (ftype)(1.0 / 6));
-                        Ar = t * cos_tpl(phi);
-                        Ai = t * sin_tpl(phi);
-                        proots[0] = 2 * Ar - a3;
-                        proots[1] = aznumeric_cast<ftype>(-Ar + Ai * sqrt3 - a3);
-                        proots[2] = aznumeric_cast<ftype>(-Ar - Ai * sqrt3 - a3);
-                        i = idxmax3(proots);
-                        swap(proots, i, 2);
-                        i = isneg(proots[0] - proots[1]);
-                        swap(proots, i, 1);
-                        nRoots = 3;
-                    }
-                }
-            }
-
-            if constexpr (maxdegree >= 4)
-            {
-                if (degree == 4)
-                {
-                    ftype t, a3, a2, a1, a0, y, R, D, E, subroots[3];
-                    const ftype e = (ftype)1E-9;
-
-                    t = (ftype)1.0 / data[4];
-                    a3 = data[3] * t;
-                    a2 = data[2] * t;
-                    a1 = data[1] * t;
-                    a0 = data[0] * t;
-                    polynomial_tpl<ftype, 3> p3aux;
-                    ftype kp3aux[] = { 1, -a2, a1 * a3 - 4 * a0, 4 * a2 * a0 - a1 * a1 - a3 * a3 * a0 };
-                    p3aux.set(kp3aux);
-                    if (!p3aux.findroots((ftype)-1E20, (ftype)1E20, subroots))
-                    {
-                        return 0;
-                    }
-                    R = a3 * a3 * (ftype)0.25 - a2 + (y = subroots[0]);
-
-                    if (R > -e)
-                    {
-                        if (R < e)
-                        {
-                            D = E = a3 * a3 * (ftype)(3.0 / 4) - 2 * a2;
-                            t = y * y - 4 * a0;
-                            if (t < -e)
-                            {
-                                return 0;
-                            }
-                            t = 2 * sqrt_tpl(max((ftype)0, t));
-                        }
-                        else
-                        {
-                            R = sqrt_tpl(max((ftype)0, R));
-                            D = E = a3 * a3 * (ftype)(3.0 / 4) - R * R - 2 * a2;
-                            t = (4 * a3 * a2 - 8 * a1 - a3 * a3 * a3) / R * (ftype)0.25;
-                        }
-                        if (D + t > -e)
-                        {
-                            D = sqrt_tpl(max((ftype)0, D + t));
-                            proots[nRoots++] = a3 * (ftype)-0.25 + (R - D) * (ftype)0.5;
-                            proots[nRoots++] = a3 * (ftype)-0.25 + (R + D) * (ftype)0.5;
-                        }
-                        if (E - t > -e)
-                        {
-                            E = sqrt_tpl(max((ftype)0, E - t));
-                            proots[nRoots++] = a3 * (ftype)-0.25 - (R + E) * (ftype)0.5;
-                            proots[nRoots++] = a3 * (ftype)-0.25 - (R - E) * (ftype)0.5;
-                        }
-                        if (nRoots == 4)
-                        {
-                            i = idxmax3(proots);
-                            if (proots[3] < proots[i])
-                            {
-                                swap(proots, i, 3);
-                            }
-                            i = idxmax3(proots);
-                            swap(proots, i, 2);
-                            i = isneg(proots[0] - proots[1]);
-                            swap(proots, i, 1);
-                        }
-                    }
-                }
-            }
-
-            if constexpr (maxdegree > 4)
-            {
-                if (degree > 4)
-                {
-                    ftype roots[maxdegree + 1], prevroot, val, prevval[2], curval, bound[2], middle;
-                    polynomial_tpl<ftype, maxdegree> deriv;
-                    int nExtremes, iter, iBound;
-                    calc_deriviative(deriv);
-
-                    // find a subset of deriviative extremes between start and end
-                    for (nExtremes = deriv.findroots(start, end, roots + 1, nIters, degree - 1) + 1; nExtremes > 1 && roots[nExtremes - 1] > end; nExtremes--)
-                    {
-                        ;
-                    }
-                    for (i = 1; i < nExtremes && roots[i] < start; i++)
-                    {
-                        ;
-                    }
-                    roots[i - 1] = start;
-                    PREFAST_ASSUME(nExtremes < maxdegree + 1);
-                    roots[nExtremes++] = end;
-
-                    for (prevroot = start, prevval[0] = eval(start, degree), nRoots = 0; i < nExtremes; prevval[0] = val, prevroot = roots[i++])
-                    {
-                        val = eval(roots[i], degree);
-                        if (val * prevval[0] < 0)
-                        {
-                            // we have exactly one root between prevroot and roots[i]
-                            bound[0] = prevroot;
-                            bound[1] = roots[i];
-                            iter = 0;
-                            do
-                            {
-                                middle = (bound[0] + bound[1]) * (ftype)0.5;
-                                curval = eval(middle, degree);
-                                iBound = isneg(prevval[0] * curval);
-                                bound[iBound] = middle;
-                                prevval[iBound] = curval;
-                            } while (++iter < nIters);
-                            proots[nRoots++] = middle;
-                        }
-                    }
-                }
-            }
-
-            for (i = 0; i < nRoots && proots[i] < start; i++)
-            {
-                ;
-            }
-            for (; nRoots > i&& proots[nRoots - 1] > end; nRoots--)
-            {
-                ;
-            }
-            for (j = i; j < nRoots; j++)
-            {
-                proots[j - i] = proots[j];
-            }
-
-            return nRoots - i;
-        }
-    } // namespace polynomial_tpl_IMPL
-    template<class ftype, int degree>
-    using polynomial_tpl = polynomial_tpl_IMPL::polynomial_tpl<ftype, degree>;
-
-    typedef polynomial_tpl<real, 3> P3;
-    typedef polynomial_tpl<real, 2> P2;
-    typedef polynomial_tpl<real, 1> P1;
-    typedef polynomial_tpl<float, 3> P3f;
-    typedef polynomial_tpl<float, 2> P2f;
-    typedef polynomial_tpl<float, 1> P1f;
-} // namespace LegacyCryPhysicsUtils
diff --git a/Code/Sandbox/Plugins/EditorCommon/DeepFilterProxyModel.cpp b/Code/Sandbox/Plugins/EditorCommon/DeepFilterProxyModel.cpp
deleted file mode 100644
index e788275436..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DeepFilterProxyModel.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "DeepFilterProxyModel.h"
-#include <QPalette>
-
-DeepFilterProxyModel::DeepFilterProxyModel(QObject* parent)
-    : QSortFilterProxyModel(parent)
-{
-}
-
-void DeepFilterProxyModel::setFilterString(const QString& filter)
-{
-    m_filter = filter;
-    m_filterParts = m_filter.split(' ', Qt::SkipEmptyParts);
-    m_acceptCache.clear();
-}
-
-void DeepFilterProxyModel::invalidate()
-{
-    QSortFilterProxyModel::invalidate();
-    m_acceptCache.clear();
-}
-
-QVariant DeepFilterProxyModel::data(const QModelIndex& index, int role) const
-{
-    if (role == Qt::ForegroundRole)
-    {
-        QModelIndex sourceIndex = mapToSource(index);
-        if (matchFilter(sourceIndex.row(), sourceIndex.parent()))
-        {
-            return QSortFilterProxyModel::data(index, role);
-        }
-        else
-        {
-            return QPalette().color(QPalette::Disabled, QPalette::Text);
-        }
-    }
-    else
-    {
-        return QSortFilterProxyModel::data(index, role);
-    }
-}
-
-
-void DeepFilterProxyModel::setFilterWildcard(const QString& pattern)
-{
-    m_acceptCache.clear();
-    QSortFilterProxyModel::setFilterWildcard(pattern);
-}
-
-bool DeepFilterProxyModel::matchFilter(int sourceRow, const QModelIndex& sourceParent) const
-{
-    int columnCount = sourceModel()->columnCount(sourceParent);
-    for (int i = 0; i < m_filterParts.size(); ++i)
-    {
-        bool atLeastOneContains = false;
-        for (int j = 0; j < columnCount; ++j)
-        {
-            QModelIndex index = sourceModel()->index(sourceRow, j, sourceParent);
-            QVariant data = sourceModel()->data(index, Qt::DisplayRole);
-            QString str(data.toString());
-            if (str.isEmpty())
-            {
-                if (m_filterParts.empty())
-                {
-                    atLeastOneContains = true;
-                }
-            }
-            else if (str.contains(m_filterParts[i], Qt::CaseInsensitive))
-            {
-                atLeastOneContains = true;
-            }
-        }
-        if (!atLeastOneContains)
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-bool DeepFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
-{
-    if (matchFilter(sourceRow, sourceParent))
-    {
-        return true;
-    }
-
-    if (hasAcceptedChildrenCached(sourceRow, sourceParent))
-    {
-        return true;
-    }
-
-    return false;
-}
-
-bool DeepFilterProxyModel::hasAcceptedChildrenCached(int sourceRow, const QModelIndex& sourceParent) const
-{
-    std::pair<QModelIndex, int> indexId = std::make_pair(sourceParent, sourceRow);
-    TAcceptCache::iterator it = m_acceptCache.find(indexId);
-    if (it == m_acceptCache.end())
-    {
-        bool result = hasAcceptedChildren(sourceRow, sourceParent);
-        m_acceptCache[indexId] = result;
-        return result;
-    }
-    else
-    {
-        return it->second;
-    }
-}
-
-bool DeepFilterProxyModel::hasAcceptedChildren(int sourceRow, const QModelIndex& sourceParent) const
-{
-    QModelIndex item = sourceModel()->index(sourceRow, 0, sourceParent);
-    if (!item.isValid())
-    {
-        return false;
-    }
-
-    int childCount = item.model()->rowCount(item);
-    if (childCount == 0)
-    {
-        return false;
-    }
-
-    for (int i = 0; i < childCount; ++i)
-    {
-        if (filterAcceptsRow(i, item))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-QModelIndex DeepFilterProxyModel::findFirstMatchingIndex(const QModelIndex& root)
-{
-    int rowCount = this->rowCount(root);
-    for (int i = 0; i < rowCount; ++i)
-    {
-        QModelIndex index = this->index(i, 0, root);
-        if (!index.isValid())
-        {
-            continue;
-        }
-        QModelIndex sourceIndex = mapToSource(index);
-        if (!sourceIndex.isValid())
-        {
-            continue;
-        }
-        if (matchFilter(sourceIndex.row(), sourceIndex.parent()))
-        {
-            return index;
-        }
-
-        QModelIndex child = findFirstMatchingIndex(index);
-        if (child.isValid())
-        {
-            return child;
-        }
-    }
-    return QModelIndex();
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/DeepFilterProxyModel.h b/Code/Sandbox/Plugins/EditorCommon/DeepFilterProxyModel.h
deleted file mode 100644
index 8590da093b..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DeepFilterProxyModel.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITORCOMMON_DEEPFILTERPROXYMODEL_H
-#define CRYINCLUDE_EDITORCOMMON_DEEPFILTERPROXYMODEL_H
-#pragma once
-
-#include <QSortFilterProxyModel>
-#include <QModelIndex>
-#include <QStringList>
-#include "EditorCommonAPI.h"
-
-class EDITOR_COMMON_API DeepFilterProxyModel
-    : public QSortFilterProxyModel
-{
-public:
-    DeepFilterProxyModel(QObject* parent);
-
-    void setFilterString(const QString& filter);
-    void invalidate();
-
-    QVariant data(const QModelIndex& index, int role) const override;
-
-    void setFilterWildcard(const QString& pattern);
-
-    bool matchFilter(int source_row, const QModelIndex& source_parent) const;
-    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
-    bool hasAcceptedChildrenCached(int source_row, const QModelIndex& source_parent) const;
-    bool hasAcceptedChildren(int source_row, const QModelIndex& source_parent) const;
-
-    QModelIndex findFirstMatchingIndex(const QModelIndex& root);
-
-private:
-    QString m_filter;
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    QStringList m_filterParts;
-    typedef std::map<std::pair<QModelIndex, int>, bool> TAcceptCache;
-    mutable TAcceptCache m_acceptCache;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-#endif // CRYINCLUDE_EDITORCOMMON_DEEPFILTERPROXYMODEL_H
diff --git a/Code/Sandbox/Plugins/EditorCommon/DisplayContext.cpp b/Code/Sandbox/Plugins/EditorCommon/DisplayContext.cpp
deleted file mode 100644
index fdeaad17e9..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DisplayContext.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorCommon_precompiled.h"
-#include "../../Editor/Objects/DisplayContextShared.inl"
diff --git a/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.cpp b/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.cpp
deleted file mode 100644
index 9e48e9f988..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "DockTitleBarWidget.h"
-#include <QStyle>
-#include <QStyleOptionToolButton>
-#include <AzCore/Casting/numeric_cast.h>
-
-namespace DockTitleBarInterpolate
-{
-    static QColor Interpolate(const QColor& a, const QColor& b, float k)
-    {
-        float mk = 1.0f - k;
-        return QColor(aznumeric_cast<int>(a.red() * mk + b.red() * k),
-            aznumeric_cast<int>(a.green() * mk + b.green() * k),
-            aznumeric_cast<int>(a.blue() * mk + b.blue() * k),
-            aznumeric_cast<int>(a.alpha() * mk + b.alpha() * k));
-    }
-}
-
-class CDockWidgetTitleButton
-    : public QAbstractButton
-{
-public:
-    CDockWidgetTitleButton(QWidget* parent);
-
-    QSize sizeHint() const;
-    QSize minimumSizeHint() const { return sizeHint(); }
-
-protected:
-    void enterEvent(QEvent* ev);
-    void leaveEvent(QEvent* ev);
-    void paintEvent(QPaintEvent* ev);
-};
-
-class CTitleBarText
-    : public QWidget
-{
-public:
-
-    CTitleBarText(QWidget* parent, QDockWidget* dockWidget)
-        : QWidget(parent)
-        , m_dockWidget(dockWidget)
-    {
-        QFont font;
-        font.setBold(true);
-        setFont(font);
-    }
-
-    void paintEvent([[maybe_unused]] QPaintEvent* ev) override
-    {
-        QPainter p(this);
-        p.setRenderHint(QPainter::Antialiasing, true);
-        QRect r = rect().adjusted(2, 2, -3, -3);
-        p.translate(0.5f, 0.5f);
-        QColor color = DockTitleBarInterpolate::Interpolate(palette().color(QPalette::Window), palette().color(QPalette::Shadow), 0.2f);
-        p.setBrush(QBrush(color));
-        p.setPen(Qt::NoPen);
-        p.drawRoundedRect(r, 4, 4, Qt::AbsoluteSize);
-        p.setPen(QPen(palette().color(QPalette::WindowText)));
-        QTextOption textOption(Qt::AlignLeft | Qt::AlignVCenter);
-        textOption.setWrapMode(QTextOption::NoWrap);
-        p.drawText(r.adjusted(4, 0, 0, 0), m_dockWidget->windowTitle(), textOption);
-    }
-private:
-    QDockWidget* m_dockWidget;
-};
-
-
-// ---------------------------------------------------------------------------
-
-CDockWidgetTitleButton::CDockWidgetTitleButton(QWidget* parent)
-    : QAbstractButton(parent)
-{
-    setFocusPolicy(Qt::NoFocus);
-}
-
-QSize CDockWidgetTitleButton::sizeHint() const
-{
-    ensurePolished();
-
-    int size = 2 * style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin, 0, this);
-    if (!icon().isNull())
-    {
-        int iconSize = style()->pixelMetric(QStyle::PM_SmallIconSize, 0, this);
-        QSize sz = icon().actualSize(QSize(iconSize, iconSize));
-        size += qMax(sz.width(), sz.height());
-    }
-
-    return QSize(size, size);
-}
-
-void CDockWidgetTitleButton::enterEvent(QEvent* ev)
-{
-    if (isEnabled())
-    {
-        update();
-    }
-    QAbstractButton::enterEvent(ev);
-}
-
-void CDockWidgetTitleButton::leaveEvent(QEvent* ev)
-{
-    if (isEnabled())
-    {
-        update();
-    }
-    QAbstractButton::leaveEvent(ev);
-}
-
-void CDockWidgetTitleButton::paintEvent([[maybe_unused]] QPaintEvent* ev)
-{
-    QPainter painter(this);
-
-    QStyleOptionToolButton opt;
-    opt.state = QStyle::State_AutoRaise;
-    opt.init(this);
-    opt.state |= QStyle::State_AutoRaise;
-
-    if (isEnabled() && underMouse() && !isChecked() && !isDown())
-    {
-        opt.state |= QStyle::State_Raised;
-    }
-    if (isChecked())
-    {
-        opt.state |= QStyle::State_On;
-    }
-    if (isDown())
-    {
-        opt.state |= QStyle::State_Sunken;
-    }
-    if (opt.state & (QStyle::State_Raised | QStyle::State_Sunken))
-    {
-        style()->drawPrimitive(QStyle::PE_PanelButtonTool, &opt, &painter, this);
-    }
-
-    opt.icon = icon();
-    opt.subControls = QStyle::SubControls();
-    opt.activeSubControls = QStyle::SubControls();
-    opt.features = QStyleOptionToolButton::None;
-    opt.arrowType = Qt::NoArrow;
-    int size = style()->pixelMetric(QStyle::PM_SmallIconSize, 0, this);
-    opt.iconSize = QSize(size, size);
-    style()->drawComplexControl(QStyle::CC_ToolButton, &opt, &painter, this);
-}
-
-// ---------------------------------------------------------------------------
-
-CDockTitleBarWidget::CDockTitleBarWidget(QDockWidget* dockWidget)
-    : m_dockWidget(dockWidget)
-{
-    CTitleBarText* textWidget = new CTitleBarText(this, dockWidget);
-
-    m_layout = new QBoxLayout(QBoxLayout::LeftToRight);
-    m_layout->setContentsMargins(0, 0, 0, 0);
-    m_layout->setSpacing(0);
-    m_layout->addWidget(textWidget, 1);
-
-    QStyleOptionDockWidget opt;
-    opt.initFrom(dockWidget);
-    opt.closable = dockWidget->features() & QDockWidget::DockWidgetClosable;
-    opt.movable = dockWidget->features() & QDockWidget::DockWidgetMovable;
-    opt.floatable = dockWidget->features() & QDockWidget::DockWidgetFloatable;
-
-    m_buttonLayout = new QBoxLayout(QBoxLayout::LeftToRight);
-    m_buttonLayout->setContentsMargins(0, 0, 0, 0);
-    m_buttonLayout->setSpacing(0);
-    m_layout->addLayout(m_buttonLayout, 0);
-
-    m_floatButton = new CDockWidgetTitleButton(dockWidget);
-    m_floatButton->setIcon(QIcon("Icons/float.png"));
-    m_floatButton->setVisible(opt.floatable);
-    m_floatButton->setToolTip("Toggle Floating");
-    connect(m_floatButton, SIGNAL(clicked()), SLOT(OnFloatButtonPressed()));
-    m_layout->addWidget(m_floatButton, 0);
-
-    m_closeButton = new CDockWidgetTitleButton(dockWidget);
-    // close.png is a standard icon that looks similar to one in Fusion theme but
-    // uses alpha so it can be used on dark theme as well.
-    // style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, dockWidget)
-    QIcon closeIcon("Icons/close.png");
-    m_closeButton->setIcon(closeIcon);
-    m_closeButton->setVisible(opt.closable);
-    m_closeButton->setToolTip("Close");
-    connect(m_closeButton, SIGNAL(clicked()), SLOT(OnCloseButtonPressed()));
-    m_layout->addWidget(m_closeButton, 0);
-
-    setLayout(m_layout);
-}
-
-void CDockTitleBarWidget::AddCustomButton(const QIcon& icon, const char* tooltip, int id)
-{
-    SCustomButton slot;
-    slot.button = new CDockWidgetTitleButton(m_dockWidget);
-    slot.button->setIcon(icon);
-    slot.button->setToolTip(tooltip);
-    connect(slot.button, SIGNAL(clicked()), SLOT(OnCustomButtonPressed()));
-    slot.id = id;
-    m_buttonLayout->addWidget(slot.button, 0);
-    m_customButtons.push_back(slot);
-}
-
-void CDockTitleBarWidget::OnFloatButtonPressed()
-{
-    m_dockWidget->setFloating(!m_dockWidget->isFloating());
-}
-
-void CDockTitleBarWidget::OnCloseButtonPressed()
-{
-    m_dockWidget->close();
-}
-
-void CDockTitleBarWidget::OnCustomButtonPressed()
-{
-    QObject* button = sender();
-    for (size_t i = 0; i < m_customButtons.size(); ++i)
-    {
-        if (button == m_customButtons[i].button)
-        {
-            SignalCustomButtonPressed(m_customButtons[i].id);
-            break;
-        }
-    }
-}
-
-
-#include <moc_DockTitleBarWidget.cpp>
diff --git a/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.h b/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.h
deleted file mode 100644
index 8dc0246013..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "EditorCommonAPI.h"
-#include <QAbstractButton>
-#include <QWidget>
-#include <QPainter>
-#include <QDockWidget>
-#include <QBoxLayout>
-
-#include <vector>
-#endif
-
-class EDITOR_COMMON_API CDockTitleBarWidget
-    : public QWidget
-{
-    Q_OBJECT
-public:
-    CDockTitleBarWidget(QDockWidget* dockWidget);
-
-    QSize sizeHint() const override
-    {
-        QFontMetrics fm(font());
-        return QSize(40, fm.height() + 8);
-    }
-
-    void AddCustomButton(const QIcon& icon, const char* tooltip, int id);
-signals:
-    void SignalCustomButtonPressed(int id);
-private slots:
-    void OnCloseButtonPressed();
-    void OnFloatButtonPressed();
-    void OnCustomButtonPressed();
-private:
-    QDockWidget* m_dockWidget;
-    QBoxLayout* m_layout;
-    QBoxLayout* m_buttonLayout;
-
-    QAbstractButton* m_floatButton;
-    QAbstractButton* m_closeButton;
-
-    struct SCustomButton
-    {
-        int id;
-        QAbstractButton* button;
-    };
-    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    std::vector<SCustomButton> m_customButtons;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
diff --git a/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp b/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp
deleted file mode 100644
index 545c0327ba..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorCommon_precompiled.h"
-#include "Ruler.h"
-
-#include <QPainter>
-#include <QPalette>
-#include <AzCore/Casting/numeric_cast.h>
-
-namespace DrawingPrimitives
-{
-    enum
-    {
-        RULER_MIN_PIXELS_PER_TICK = 3,
-    };
-
-    std::vector<STick> CalculateTicks(uint size, Range visibleRange, Range rulerRange, int* pRulerPrecision, Range* pScreenRulerRange)
-    {
-        std::vector<STick> ticks;
-
-        if (size == 0)
-        {
-            if (pRulerPrecision)
-            {
-                *pRulerPrecision = 0;
-            }
-
-            return ticks;
-        }
-
-        const float pixelsPerUnit = visibleRange.Length() > 0.0f ? (float)size / visibleRange.Length() : 1.0f;
-
-        const float startTime = rulerRange.start;
-        const float endTime = rulerRange.end;
-        const float totalDuration = endTime - startTime;
-
-        const float ticksMinPower = log10f(RULER_MIN_PIXELS_PER_TICK);
-        const float ticksPowerDelta = ticksMinPower - log10f(pixelsPerUnit);
-
-        const int digitsAfterPoint = max(-int(ceil(ticksPowerDelta)) - 1, 0);
-        if (pRulerPrecision)
-        {
-            *pRulerPrecision = digitsAfterPoint;
-        }
-
-        const float scaleStep = powf(10.0f, ceil(ticksPowerDelta));
-        const float scaleStepPixels = scaleStep * pixelsPerUnit;
-        const int numMarkers = int(totalDuration / scaleStep) + 1;
-
-        const float startTimeRound = int(startTime / scaleStep) * scaleStep;
-        const int startOffsetMod = int(startTime / scaleStep) % 10;
-        const int scaleOffsetPixels = aznumeric_cast<int>((startTime - startTimeRound) * pixelsPerUnit);
-
-        const int startX = aznumeric_cast<int>((rulerRange.start - visibleRange.start) * pixelsPerUnit);
-        const int endX = aznumeric_cast<int>(startX + (numMarkers - 1) * scaleStepPixels - scaleOffsetPixels);
-
-        if (pScreenRulerRange)
-        {
-            *pScreenRulerRange = Range(aznumeric_cast<float>(startX), aznumeric_cast<float>(endX));
-        }
-
-        const int startLoop = std::max((int)((scaleOffsetPixels - startX) / scaleStepPixels) - 1, 0);
-        const int endLoop = std::min((int)((size + scaleOffsetPixels - startX) / scaleStepPixels) + 1, numMarkers);
-
-        for (int i = startLoop; i < endLoop; ++i)
-        {
-            STick tick;
-
-            const int x = aznumeric_cast<int>(startX + i * scaleStepPixels - scaleOffsetPixels);
-            const float value = startTimeRound + i * scaleStep;
-
-            tick.m_bTenth = (startOffsetMod + i) % 10 != 0;
-            tick.m_position = x;
-            tick.m_value = value;
-
-            ticks.push_back(tick);
-        }
-
-        return ticks;
-    }
-
-    QColor Interpolate(const QColor& a, const QColor& b, float k)
-    {
-        float mk = 1.0f - k;
-        return QColor(aznumeric_cast<int>(a.red() * mk  + b.red() * k),
-            aznumeric_cast<int>(a.green() * mk + b.green() * k),
-            aznumeric_cast<int>(a.blue() * mk + b.blue() * k),
-            aznumeric_cast<int>(a.alpha() * mk + b.alpha() * k));
-    }
-
-    void DrawTicks(const std::vector<STick>& ticks, QPainter& painter, const QPalette& palette, const STickOptions& options)
-    {
-        QColor midDark = DrawingPrimitives::Interpolate(palette.color(QPalette::Dark), palette.color(QPalette::Button), 0.5f);
-        painter.setPen(QPen(midDark));
-
-        const int height = options.m_rect.height();
-        const int top = options.m_rect.top();
-
-        for (const STick& tick : ticks)
-        {
-            const int x = tick.m_position + options.m_rect.left();
-
-            if (tick.m_bTenth)
-            {
-                painter.drawLine(QPoint(x, top + height - options.m_markHeight / 2), QPoint(x, top + height));
-            }
-            else
-            {
-                painter.drawLine(QPoint(x, top + height - options.m_markHeight), QPoint(x, top + height));
-            }
-        }
-    }
-
-    void DrawTicks(QPainter& painter, const QPalette& palette, const SRulerOptions& options)
-    {
-        const std::vector<STick> ticks = CalculateTicks(options.m_rect.width(), options.m_visibleRange, options.m_rulerRange, nullptr, nullptr);
-        DrawTicks(ticks, painter, palette, options);
-    }
-
-    void DrawRuler(QPainter& painter, const QPalette& palette, const SRulerOptions& options, int* pRulerPrecision)
-    {
-        int rulerPrecision;
-        Range screenRulerRange;
-        const std::vector<STick> ticks = CalculateTicks(options.m_rect.width(), options.m_visibleRange, options.m_rulerRange, &rulerPrecision, &screenRulerRange);
-
-        if (pRulerPrecision)
-        {
-            *pRulerPrecision = rulerPrecision;
-        }
-
-        if (options.m_shadowSize > 0)
-        {
-            QRect shadowRect = QRect(options.m_rect.left(), options.m_rect.height(), options.m_rect.width(), options.m_shadowSize);
-            QLinearGradient upperGradient(shadowRect.left(), shadowRect.top(), shadowRect.left(), shadowRect.bottom());
-            upperGradient.setColorAt(0.0f, QColor(0, 0, 0, 128));
-            upperGradient.setColorAt(1.0f, QColor(0, 0, 0, 0));
-            QBrush upperBrush(upperGradient);
-            painter.fillRect(shadowRect, upperBrush);
-        }
-
-        painter.fillRect(options.m_rect, DrawingPrimitives::Interpolate(palette.color(QPalette::Button), palette.color(QPalette::Midlight), 0.25f));
-        if (options.m_drawBackgroundCallback)
-        {
-            options.m_drawBackgroundCallback();
-        }
-
-        QColor midDark = DrawingPrimitives::Interpolate(palette.color(QPalette::Dark), palette.color(QPalette::Button), 0.5f);
-        painter.setPen(QPen(midDark));
-
-        QFont font;
-        font.setPixelSize(10);
-        painter.setFont(font);
-
-
-        char format[16] = "";
-        sprintf_s(format, "%%.%df", rulerPrecision);
-
-        const int height = options.m_rect.height();
-        const int top = options.m_rect.top();
-
-        QString str;
-        for (const STick& tick : ticks)
-        {
-            const int x = tick.m_position + options.m_rect.left();
-            const float value = tick.m_value;
-
-            if (tick.m_bTenth)
-            {
-                painter.drawLine(QPoint(x, top + height - options.m_markHeight / 2), QPoint(x, top + height));
-            }
-            else
-            {
-                painter.drawLine(QPoint(x, top + height - options.m_markHeight), QPoint(x, top + height));
-                painter.setPen(palette.color(QPalette::Disabled, QPalette::Text));
-                str.asprintf(format, value);
-                painter.drawText(QPoint(x + 2, top + height - options.m_markHeight + 1), str);
-                painter.setPen(midDark);
-            }
-        }
-
-        painter.setPen(QPen(palette.color(QPalette::Dark)));
-        painter.drawLine(QPoint(aznumeric_cast<int>(options.m_rect.left() + screenRulerRange.start), 0), QPoint(aznumeric_cast<int>(options.m_rect.left() + screenRulerRange.start), options.m_rect.top() + height));
-        painter.drawLine(QPoint(aznumeric_cast<int>(options.m_rect.left() + screenRulerRange.end), 0), QPoint(aznumeric_cast<int>(options.m_rect.left() + screenRulerRange.end), options.m_rect.top() + height));
-    }
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/Ruler.h b/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/Ruler.h
deleted file mode 100644
index bd747f1c05..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/Ruler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "Range.h"
-
-#include <functional>
-#include <vector>
-#include <QRect>
-
-class QPainter;
-class QPalette;
-
-namespace DrawingPrimitives
-{
-    struct SRulerOptions;
-    typedef std::function<void()> TDrawCallback;
-
-    struct SRulerOptions
-    {
-        QRect m_rect;
-        Range m_visibleRange;
-        Range m_rulerRange;
-        int m_textXOffset;
-        int m_textYOffset;
-        int m_markHeight;
-        int m_shadowSize;
-
-        TDrawCallback m_drawBackgroundCallback;
-    };
-
-    struct STick
-    {
-        bool m_bTenth;
-        int m_position;
-        float m_value;
-    };
-
-    typedef SRulerOptions STickOptions;
-
-    std::vector<STick> CalculateTicks(uint size, Range visibleRange, Range rulerRange, int* pRulerPrecision, Range* pScreenRulerRange);
-    void DrawTicks(const std::vector<STick>& ticks, QPainter& painter, const QPalette& palette, const STickOptions& options);
-    void DrawTicks(QPainter& painter, const QPalette& palette, const STickOptions& options);
-    void DrawRuler(QPainter& painter, const QPalette& palette, const SRulerOptions& options, int* pRulerPrecision);
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp b/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp
deleted file mode 100644
index 909d935aa7..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorCommon_precompiled.h"
-#include "TimeSlider.h"
-
-#include <QPainter>
-#include <QPalette>
-
-namespace DrawingPrimitives
-{
-    void DrawTimeSlider(QPainter& painter, const QPalette& palette, const STimeSliderOptions& options)
-    {
-        QString text = QString::number(options.m_time, 'f', options.m_precision + 1);
-
-        QFontMetrics fm(painter.font());
-        const int textWidth = fm.horizontalAdvance(text) + fm.height();
-        const int markerHeight = fm.height();
-
-        const int thumbX = options.m_position;
-        const bool fits = thumbX + textWidth < options.m_rect.right();
-
-        const QRect timeRect(fits ? thumbX : thumbX - textWidth, 3, textWidth, fm.height());
-        painter.fillRect(timeRect.adjusted(fits ? 0 : -1, 0, fits ? 1 : 0, 0), options.m_bHasFocus ? palette.highlight() : palette.shadow());
-        painter.setPen(palette.color(QPalette::HighlightedText));
-        painter.drawText(timeRect.adjusted(fits ? 0 : aznumeric_cast<int>(markerHeight * 0.2f), -1, fits ? aznumeric_cast<int>(-markerHeight * 0.2f) : 0, 0), text, QTextOption(fits ? Qt::AlignRight : Qt::AlignLeft));
-
-        painter.setPen(palette.color(QPalette::Text));
-        painter.drawLine(QPointF(thumbX, 0), QPointF(thumbX, options.m_rect.height()));
-        QPointF points[3] =
-        {
-            QPointF(thumbX,  markerHeight),
-            QPointF(thumbX - markerHeight * 0.66f, 0),
-            QPointF(thumbX + markerHeight * 0.66f, 0)
-        };
-
-        painter.setBrush(palette.base());
-        painter.setPen(palette.color(QPalette::Text));
-        painter.drawPolygon(points, 3);
-    }
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.h b/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.h
deleted file mode 100644
index e2e7c442f8..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "Range.h"
-
-#include <QRect>
-
-class QPainter;
-class QPalette;
-
-namespace DrawingPrimitives
-{
-    struct STimeSliderOptions
-    {
-        QRect m_rect;
-        int m_precision;
-        int m_position;
-        float m_time;
-        bool m_bHasFocus;
-    };
-
-    void DrawTimeSlider(QPainter& painter, const QPalette& palette, const STimeSliderOptions& options);
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.cpp b/Code/Sandbox/Plugins/EditorCommon/EditorCommon.cpp
deleted file mode 100644
index 03cbcfeb07..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorCommon_precompiled.h"
-
-#include <platform.h>
-#include "EditorCommon.h"
-
-#include "EditorCommonAPI.h"
-
-CEditorCommonApp::CEditorCommonApp()
-{
-}
-
-
-void EDITOR_COMMON_API InitializeEditorCommon([[maybe_unused]] IEditor* editor)
-{
-}
-
-void EDITOR_COMMON_API UninitializeEditorCommon()
-{
-}
-
-void EDITOR_COMMON_API InitializeEditorCommonISystem(ISystem* pSystem)
-{
-    ModuleInitISystem(pSystem, "EditorCommon");
-}
-
-void EDITOR_COMMON_API UninitializeEditorCommonISystem(ISystem* pSystem)
-{
-    ModuleShutdownISystem(pSystem);
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.h b/Code/Sandbox/Plugins/EditorCommon/EditorCommon.h
deleted file mode 100644
index 6a60ddd934..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-#ifndef CRYINCLUDE_EDITORCOMMON_EDITORCOMMON_H
-#define CRYINCLUDE_EDITORCOMMON_EDITORCOMMON_H
-
-class CEditorCommonApp
-{
-public:
-    CEditorCommonApp();
-};
-
-#endif // CRYINCLUDE_EDITORCOMMON_EDITORCOMMON_H
diff --git a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc b/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc
deleted file mode 100644
index ebb41f1192..0000000000
Binary files a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc and /dev/null differ
diff --git a/Code/Sandbox/Plugins/EditorCommon/EditorCommonAPI.h b/Code/Sandbox/Plugins/EditorCommon/EditorCommonAPI.h
deleted file mode 100644
index f1a406f96a..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/EditorCommonAPI.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_EDITORCOMMON_EDITORCOMMONAPI_H
-#define CRYINCLUDE_EDITORCOMMON_EDITORCOMMONAPI_H
-
-#include <AzCore/PlatformDef.h>
-
-#if defined(EDITOR_COMMON_EXPORTS)
-
-#define EDITOR_COMMON_API AZ_DLL_EXPORT
-
-#elif defined(EDITOR_COMMON_IMPORTS)
-
-#define EDITOR_COMMON_API AZ_DLL_IMPORT
-
-#else
-
-#define EDITOR_COMMON_API
-
-#endif
-
-struct IEditor;
-struct ISystem;
-
-void EDITOR_COMMON_API InitializeEditorCommon(IEditor* editor);
-void EDITOR_COMMON_API UninitializeEditorCommon();
-
-void EDITOR_COMMON_API InitializeEditorCommonISystem(ISystem* pSystem);
-void EDITOR_COMMON_API UninitializeEditorCommonISystem(ISystem* pSystem);
-
-#endif // CRYINCLUDE_EDITORCOMMON_EDITORCOMMONAPI_H
diff --git a/Code/Sandbox/Plugins/EditorCommon/EditorCommon_precompiled.h b/Code/Sandbox/Plugins/EditorCommon/EditorCommon_precompiled.h
deleted file mode 100644
index 2d1a9e9285..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/EditorCommon_precompiled.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN
-#endif
-
-// These redicilous dependencies are needed just to be able to use
-// Sandbox gizmos drawing and hit-testing code =(
-
-#include "ISystem.h"
-#include "Include/EditorCoreAPI.h"
-#include "Util/EditorUtils.h"
-
diff --git a/Code/Sandbox/Plugins/EditorCommon/QtViewPane.cpp b/Code/Sandbox/Plugins/EditorCommon/QtViewPane.cpp
deleted file mode 100644
index 70b5a68561..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/QtViewPane.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorCommon_precompiled.h"
-#include "platform.h"
-
-#pragma warning(disable: 4266) // disabled warning from afk overrides
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
-#include <afxwin.h>
-#include <vector>
-
-#include "QtViewPane.h"
-
-#include "Include/IViewPane.h"
-#include "Util/RefCountBase.h"
-#include "QtWinMigrate/qwinwidget.h"
-
-#include <QWidget>
-#include <QEvent>
-#include <QApplication>
-#include <QCloseEvent>
-#include <QHBoxLayout>
-
-#include "QtUtil.h"
-
-// ugly dependencies:
-#pragma warning(push)
-#pragma warning(disable: 4244) // warning C4244: 'argument' : conversion from 'A' to 'B', possible loss of data
-#include "Functor.h"
-class CXmlArchive;
-#include <IRenderer.h>
-#include "Util/PathUtil.h"
-#pragma warning(pop)
-// ^^^
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-
diff --git a/Code/Sandbox/Plugins/EditorCommon/Resource.h b/Code/Sandbox/Plugins/EditorCommon/Resource.h
deleted file mode 100644
index fba44530f6..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/Resource.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by EditorCommon.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-
-#define _APS_NEXT_RESOURCE_VALUE    1000
-#define _APS_NEXT_CONTROL_VALUE     1000
-#define _APS_NEXT_SYMED_VALUE       1000
-#define _APS_NEXT_COMMAND_VALUE     32771
-#endif
-#endif
diff --git a/Code/Sandbox/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp b/Code/Sandbox/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp
deleted file mode 100644
index edc90bbd26..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorCommon_precompiled.h"
-#include <SaveUtilities/AsyncSaveRunner.h>
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-#include <AzCore/IO/SystemFile.h>
-#include <ActionOutput.h>
-
-namespace AZ
-{
-    /* -------------------------- *
-     * == Save Operation Cache == *
-     * -------------------------- */
-
-    SaveOperationController::SaveOperationCache::SaveOperationCache(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation, SaveOperationController& owner, bool isDelete)
-        : m_fullSavePath(fullPath)
-        , m_saveOperation(saveOperation)
-        , m_owner(owner)
-        , m_isDelete(isDelete)
-    {
-    }
-
-    void SaveOperationController::SaveOperationCache::Run(const AZStd::shared_ptr<ActionOutput>& actionOutput)
-    {
-        if (m_isDelete)
-        {
-            RunDelete(actionOutput);
-            return;
-        }
-        // Create the callback to pass to the SourceControlAPI
-        AzToolsFramework::SourceControlResponseCallback callback =
-        [this, actionOutput](bool success, const AzToolsFramework::SourceControlFileInfo& info)
-        {
-            if (success || !info.IsReadOnly())
-            {
-                if (m_saveOperation && !m_saveOperation(m_fullSavePath, actionOutput))
-                {
-                    success = false;
-
-                    if (actionOutput)
-                    {
-                        actionOutput->AddError("Failed to save entries/dependencies", m_fullSavePath);
-                    }
-                }
-            }
-
-            if (!success && actionOutput)
-            {
-                AZStd::string message;
-                AZStd::string details = m_fullSavePath;
-
-                // If there's no attempt to save any data it's assumed that this function was called to add an existing file to source control.
-                //      Rather than report this as an error, report it as a warning as no data was lost.
-                bool reportAsWarning = !m_saveOperation;
-                bool moreDetails = true;
-
-                // Be more specific with errors so as to give the user the best chance at fixing them
-                if (!info.HasFlag(AzToolsFramework::SCF_OpenByUser))
-                {
-                    if (info.HasFlag(AzToolsFramework::SCF_OutOfDate))
-                    {
-                        message = "The file being worked on doesn't contain the latest changes from source control";
-                        moreDetails = false;
-                    }
-                    else if (info.IsLockedByOther())
-                    {
-                        message = "The file is already exclusively opened by another user";
-                        details = info.m_StatusUser + " -> " + m_fullSavePath;
-                        moreDetails = false;
-                    }
-                    else if (info.m_status == AzToolsFramework::SourceControlStatus::SCS_ProviderIsDown)
-                    {
-                        message = "Failed to put entries/dependencies into source control as the provider is not available.\n";
-                    }
-                    else if (info.m_status == AzToolsFramework::SourceControlStatus::SCS_CertificateInvalid)
-                    {
-                        message = "Failed to put entries/dependencies into source control as the source control has an invalid certificate.\n";
-                    }
-                    else if (info.m_status == AzToolsFramework::SourceControlStatus::SCS_ProviderError)
-                    {
-                        message = "Failed to put entries/dependencies into source control as the provider reported an error.\n";
-                    }
-                    else if (!info.IsManaged())
-                    {
-                        message = "Failed to put entries/dependencies into source control as they are outside the current workspace mapping.\n";
-                        reportAsWarning = true;
-                    }
-                    else
-                    {
-                        message = "Make sure the disk is not full or the file is not write-protected or not currently in use.\n";
-                    }
-                }
-                else
-                {
-                    message = "File marked as 'Open By User' but still failed.\n";
-                }
-
-                if (moreDetails)
-                {
-                    message += "Please see the source control icon in the status bar for further details";
-                }
-
-                if (reportAsWarning)
-                {
-                    actionOutput->AddWarning(message, details);
-                    success = true;
-                }
-                else
-                {
-                    actionOutput->AddError(message, details);
-                }
-            }
-
-            m_owner.HandleOperationComplete(this, success);
-        };
-
-        using SCCommandBus = AzToolsFramework::SourceControlCommandBus;
-        SCCommandBus::Broadcast(&SCCommandBus::Events::RequestEdit, m_fullSavePath.c_str(), true, callback);
-    }
-
-    void SaveOperationController::SaveOperationCache::RunDelete(const AZStd::shared_ptr<ActionOutput>& actionOutput)
-    {
-        // Create the callback to pass to the SourceControlAPI
-        AzToolsFramework::SourceControlResponseCallback callback =
-            [this, actionOutput](bool success, const AzToolsFramework::SourceControlFileInfo& info)
-        {
-            if (success || !info.IsManaged())
-            {
-                success = true;
-                if (m_saveOperation && !m_saveOperation(m_fullSavePath, actionOutput))
-                {
-                    success = false;
-
-                    if (actionOutput)
-                    {
-                        actionOutput->AddError("Failed to delete entry", m_fullSavePath.c_str());
-                    }
-                }
-            }
-            else if (actionOutput)
-            {
-                // Be more specific with errors so as to give the user the best chance at fixing them
-                if (!info.HasFlag(AzToolsFramework::SCF_OpenByUser))
-                {
-                    if (info.HasFlag(AzToolsFramework::SourceControlFlags::SCF_OutOfDate))
-                    {
-                        actionOutput->AddError("Source Control Issue - You do not have latest changes from source control for file", m_fullSavePath);
-                    }
-                    else if (info.IsLockedByOther())
-                    {
-                        actionOutput->AddError("Source Control Issue - File exclusively opened by another user", info.m_StatusUser + " -> " + m_fullSavePath);
-                    }
-                    else if (info.m_status == AzToolsFramework::SourceControlStatus::SCS_ProviderIsDown
-                        || info.m_status == AzToolsFramework::SourceControlStatus::SCS_CertificateInvalid
-                        || info.m_status == AzToolsFramework::SourceControlStatus::SCS_ProviderError)
-                    {
-                        actionOutput->AddError("Source Control Issue - Failed to remove file from source control, check your connection to your source control service", m_fullSavePath.c_str());
-                    }
-                    else
-                    {
-                        actionOutput->AddError("Unknown Issue with source control.", m_fullSavePath);
-                    }
-                }
-                else
-                {
-                    actionOutput->AddError("Source Control Issue - File marked as 'Open By User' but still failed.", m_fullSavePath);
-                }
-            }
-
-            m_owner.HandleOperationComplete(this, success);
-        };
-
-        using SCCommandBus = AzToolsFramework::SourceControlCommandBus;
-        SCCommandBus::Broadcast(&SCCommandBus::Events::RequestDelete, m_fullSavePath.c_str(), callback);
-    }
-
-    /* ------------------------------- *
-     * == Save Operation Controller == *
-     * ------------------------------- */
-
-    SaveOperationController::SaveOperationController(AsyncSaveRunner& owner)
-        : m_owner(owner)
-        , m_completedCount(0)
-    {
-    }
-
-    void SaveOperationController::AddDeleteOperation(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation)
-    {
-        m_allSaveOperations.push_back(AZStd::make_shared<SaveOperationCache>(fullPath, saveOperation, *this, true));
-    }
-
-    void SaveOperationController::AddSaveOperation(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation)
-    {
-        m_allSaveOperations.push_back(AZStd::make_shared<SaveOperationCache>(fullPath, saveOperation, *this));
-    }
-
-    void SaveOperationController::SetOnCompleteCallback(SaveCompleteCallback onThisRunnerComplete)
-    {
-        m_onSaveComplete = onThisRunnerComplete;
-    }
-    void SaveOperationController::RunAll(const AZStd::shared_ptr<ActionOutput>& actionOutput)
-    {
-        m_completedCount = 0;
-
-        // If for some reason there are no save operations in this controller, then we need
-        //  to notify the runner and return so that this controller can be properly counted
-        //  as being completed.
-        if (m_allSaveOperations.empty())
-        {
-            m_owner.HandleRunnerFinished(this, true);
-            return;
-        }
-
-        for (AZStd::shared_ptr<SaveOperationCache>& saveOperation : m_allSaveOperations)
-        {
-            saveOperation->Run(actionOutput);
-        }
-    }
-
-    void SaveOperationController::HandleOperationComplete([[maybe_unused]] SaveOperationCache* saveOperation, bool success)
-    {
-        if (!success)
-        {
-            m_currentSaveResult = false;
-        }
-
-        AZ_Assert(AZStd::find_if(m_allSaveOperations.begin(), m_allSaveOperations.end(),
-            [saveOperation](const AZStd::shared_ptr<SaveOperationCache>& target) -> bool
-            {
-                return target.get() == saveOperation;
-            }) != m_allSaveOperations.end(), 
-            "Attempting to cleanup completed save operation failed. Operation not found. Target file was: '%s'", 
-            saveOperation->m_fullSavePath.c_str());
-        
-        m_completedCount++;
-        if (m_completedCount >= m_allSaveOperations.size())
-        {
-            if (m_onSaveComplete)
-            {
-                m_onSaveComplete(m_currentSaveResult);
-            }
-
-            m_owner.HandleRunnerFinished(this, m_currentSaveResult);
-        }
-    }
-
-    /* ----------------------- *
-     * == Async Save Runner == *
-     * ----------------------- */
-
-    AZStd::shared_ptr<SaveOperationController> AsyncSaveRunner::GenerateController()
-    {
-        AZStd::shared_ptr<SaveOperationController> saveEntryController = AZStd::make_shared<SaveOperationController>(*this);
-        m_allSaveControllers.push_back(saveEntryController);
-        return saveEntryController;
-    }
-
-    void AsyncSaveRunner::Run(const AZStd::shared_ptr<ActionOutput>& actionOutput, SaveCompleteCallback onSaveAllComplete, ControllerOrder order)
-    {
-        m_counter = 0;
-        m_order = order;
-        m_actionOutput = actionOutput;
-        m_onSaveAllComplete = onSaveAllComplete;
-
-        // If for some reason there are no save operations in this runner, then we need to run
-        //  the callback now and return so that the caller is properly notified.
-        if (m_allSaveControllers.empty())
-        {
-            if (m_onSaveAllComplete)
-            {
-                m_onSaveAllComplete(true);
-            }
-
-            return;
-        }
-
-        if (order == ControllerOrder::Random)
-        {
-            for (auto& saveOp : m_allSaveControllers)
-            {
-                saveOp->RunAll(actionOutput);
-            }
-        }
-        else if (order == ControllerOrder::Sequential)
-        {
-            m_allSaveControllers[0]->RunAll(actionOutput);
-        }
-        else
-        {
-            AZ_Assert(false, "Invalid ControllerOrder: %i", order);
-        }
-    }
-    void AsyncSaveRunner::HandleRunnerFinished([[maybe_unused]] SaveOperationController* runner, bool success)
-    {
-        if (!success)
-        {
-            m_allWereSuccessfull = false;
-        }
-
-        if (m_order == ControllerOrder::Random)
-        {
-            AZ_Assert(AZStd::find_if(m_allSaveControllers.begin(), m_allSaveControllers.end(),
-                [runner](const AZStd::shared_ptr<SaveOperationController>& target) -> bool 
-                { 
-                    return target.get() == runner; 
-                }) != m_allSaveControllers.end(), "Attempting to cleanup completed save runner failed");
-            
-            m_counter++;
-        }
-        else if (m_order == ControllerOrder::Sequential)
-        {
-            AZ_Assert(m_counter < m_allSaveControllers.size(), 
-                "Counter for save controllers has become invalid (%i vs. %i).", static_cast<int>(m_counter), m_allSaveControllers.size());
-            AZ_Assert(m_allSaveControllers[m_counter].get() == runner, "Completed incorrect save runner for index %i.", static_cast<int>(m_counter));
-
-            m_counter++;
-            if (m_counter < m_allSaveControllers.size())
-            {
-                m_allSaveControllers[m_counter]->RunAll(m_actionOutput);
-            }
-        }
-        else
-        {
-            AZ_Assert(false, "Invalid ControllerOrder: %i", m_order);
-        }
-
-        if (m_counter >= m_allSaveControllers.size())
-        {
-            m_actionOutput.reset();
-            if (m_onSaveAllComplete)
-            {
-                m_onSaveAllComplete(m_allWereSuccessfull);
-            }
-        }
-    }
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.h b/Code/Sandbox/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.h
deleted file mode 100644
index bc8aa0027a..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.h
+++ /dev/null
@@ -1,168 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/functional.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/std/containers/vector.h>
-#include <EditorCommonAPI.h>
-
-/*
-------------------
-AsyncSaveRunner:
-------------------
-== Overview ==
-This class is meant to be a container for 1-n save operations that need to work with async source control commands. The asynchronous aspect of the SourceControlBus becomes
-much more difficult when you have many operations because there is a management problem in knowing how soon until all commands have completed. This class will provide you
-with an easy to use interface for specifying the save operations, and providing a single callback to be called once all those operations have been completed.
-
-== Note ==
-This class accepts lambdas and operates asynchronously. While the callbacks will be called on the main thread, **YOU MUST GUARANTEE LIFETIME YOURSELF**
-
-== Usage ==
-To use this class, you need to guarantee the lifetime of the save runner. The best way to do that is to store it as a member variable in the class that runs the save. Storing
-it in a pointer type (or smart-pointer type) will help you control it's lifetime and memory.
-
-Once you have a guaranteed lifetime AsyncSaveRunner, you'll build SaveOperationController instances that will manage all of your individual save operations, and will
-run the source control pieces for you. This allows you to focus on specifying the pieces you care about.
-
-This is easiest to see why you would want that, would be a 'Save All' scenario.
-Lets imagine a save function that saves an item, which consists of saving a "header" file and an "entry" file:
-    void SaveItem(int index)
-    {
-        auto item = m_items[index];
-
-        auto controller = m_saveRunner->GenerateController();
-        controller->AddSaveOperation(m_headerSaver.getPath(), [item](const AZStd::string& fullPath, const AZStd::shared_ptr<ActionOutput>& actionOutput)->bool
-            {
-                return item->headerSaver.save();
-            }
-        );
-
-        controller->AddSaveOperation(m_entry.getPath(), [item](const AZStd::string& fullPath, const AZStd::shared_ptr<ActionOutput>& actionOutput)->bool
-            {
-                return item->entry.save();
-            }
-        );
-    }
-
-You can see that the AsyncSaveRunner was used to make a save operation controller, called 'controller' and that controller was filled out with save operations.
-If it was desired, you could even add a callback per controller to know when each controller is finished (in case you have to run a custom notification or something
-on the item).
-
-You could imagine SaveItem being called 1-n times, adding more and more SaveOperationController instances to the AsyncSaveRunner. Once the runner is all filled out
-you call run on it and pass it a callback. This callback will only be called once. This leaves our example to look like this:
-
-    void SaveAll(AZStd::shared_ptr<AZ::ActionOutput> output, AZ::SaveCompleteCallback onComplete)
-    {
-        m_saveRunner = AZStd::make_shared<AZ::AsyncSaveRunner>();
-        for(int index = 0; index < m_numItems; ++index)
-        {
-            Saveitem(index);
-        }
-
-        m_saveRunner->Run(output,
-            [this](bool success)
-            {
-                m_saveRunner = nullptr;
-
-                if(onComplete)
-                {
-                    onComplete(success);
-                }
-            }
-        );
-    }
-*/
-
-namespace AZ
-{
-    class ActionOutput;
-
-    using SaveCompleteCallback = AZStd::function<void(bool success)>;
-    using SynchronousSaveOperation = AZStd::function<bool(const AZStd::string& fullPath, const AZStd::shared_ptr<ActionOutput>& actionOutput)>;
-
-    class AsyncSaveRunner;
-
-    // Stores a cache of synchronous save operations, and runs them on completion of asynchronous source control operations.
-    class EDITOR_COMMON_API SaveOperationController
-    {
-    public:
-        explicit SaveOperationController(AsyncSaveRunner& owner);
-        void AddSaveOperation(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation);
-        void AddDeleteOperation(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation);
-        void SetOnCompleteCallback(SaveCompleteCallback onThisRunnerComplete);
-
-        void RunAll(const AZStd::shared_ptr<ActionOutput>& actionOutput);
-
-        // Caches all synchronous save operations and associated data. Controlled by a SaveOperationController.
-        class SaveOperationCache
-        {
-        public:
-            SaveOperationCache(const AZStd::string& fullPath, SynchronousSaveOperation saveOperation, SaveOperationController& owner, bool isDelete = false);
-
-            void Run(const AZStd::shared_ptr<ActionOutput>& actionOutput);
-            void RunDelete(const AZStd::shared_ptr<ActionOutput>& actionOutput);
-            friend class SaveOperationController;
-
-        private:
-            AZStd::string m_fullSavePath;
-            SynchronousSaveOperation m_saveOperation;
-            SaveOperationController& m_owner;
-            bool m_isDelete;
-        };
-
-        void HandleOperationComplete(SaveOperationCache* saveOperation, bool success);
-
-        friend class SaveRunner;
-
-    private:
-        AsyncSaveRunner& m_owner;
-        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        AZStd::vector<AZStd::shared_ptr<SaveOperationCache>> m_allSaveOperations;
-        SaveCompleteCallback m_onSaveComplete;
-        AZStd::atomic<size_t> m_completedCount;
-        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        bool m_currentSaveResult = true;
-    };
-
-    // Builds, stores and executes SaveOperationController instances
-    class EDITOR_COMMON_API AsyncSaveRunner
-    {
-    public:
-        enum class ControllerOrder
-        {
-            // Random will run controllers at once and completion will happen randomly.
-            Random,
-            // Controllers are executed in order, waiting for one controller before starting
-            //      the next one. Controllers internally will still have their executions
-            //      complete in random order.
-            Sequential
-        };
-
-        AZStd::shared_ptr<SaveOperationController> GenerateController();
-        void Run(const AZStd::shared_ptr<ActionOutput>& actionOutput, SaveCompleteCallback onSaveAllComplete, ControllerOrder order);
-
-    private:
-        friend class SaveOperationController;
-        void HandleRunnerFinished(SaveOperationController* runner, bool success);
-
-        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        AZStd::vector<AZStd::shared_ptr<SaveOperationController>> m_allSaveControllers;
-        SaveCompleteCallback m_onSaveAllComplete;
-        AZStd::shared_ptr<ActionOutput> m_actionOutput;
-        // If controller order is random this keeps track of the number of completed tasks, if the order is sequential it
-        //      keeps track of the currently executing controller.
-        AZStd::atomic<size_t> m_counter;
-        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        ControllerOrder m_order;
-        bool m_allWereSuccessfull = true;
-    };
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/UiEditorDLLBus.h b/Code/Sandbox/Plugins/EditorCommon/UiEditorDLLBus.h
deleted file mode 100644
index d5f93f8133..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/UiEditorDLLBus.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <LyShine/UiBase.h>
-
-class UndoStack;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that the UI Editor needs to implement
-class UiEditorDLLInterface
-    : public AZ::EBusTraits
-{
-public: // member functions
-
-    virtual ~UiEditorDLLInterface(){}
-
-    //! Get the selected elements in the UiEditor
-    virtual LyShine::EntityArray GetSelectedElements() = 0;
-
-    //! Get the id of the active Canvas the UiEditor
-    virtual AZ::EntityId GetActiveCanvasId() = 0;
-
-    //! Get the active undo stack for the UI Editor
-    virtual UndoStack* GetActiveUndoStack() = 0;
-
-    //! Soft-switch to the given file.  Note that this should prompt for unsaved changes, etc.
-    virtual void OpenSourceCanvasFile(QString absolutePathToFile) = 0;
-
-public: // static member functions
-
-    static const char* GetUniqueName() { return "UiEditorDLLInterface"; }
-};
-
-typedef AZ::EBus<UiEditorDLLInterface> UiEditorDLLBus;
diff --git a/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidget.h b/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidget.h
deleted file mode 100644
index 608aa44556..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidget.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "EditorCommonAPI.h"
-#include "IEditor.h"
-
-
-#include <WinWidget/WinWidgetManager.h>
-#include <Core/QtEditorApplication.h>
-#include <QWidget>
-
-namespace WinWidget
-{
-    template<class TWidget>
-    bool RegisterWinWidget()
-    {
-        static QWidget* winWidget {nullptr}; // Must declare outside of lambda
-
-        WinWidget::WinWidgetManager::WinWidgetCreateCall createCall = []() -> QWidget*
-            {
-                if (!winWidget)
-                {
-                    winWidget = new QWidget(GetIEditor()->GetEditorMainWindow());
-                }
-                
-                // Ensure only one instance of each window type exists
-                QList<TWidget*> existingWidgets = winWidget->findChildren<TWidget*>();
-                if (existingWidgets.size() > 0) // Note that the list should contain 0 or 1 entries
-                { 
-                    if (existingWidgets.first()->isVisible())
-                    {
-                        return nullptr; // TWidget type already in use - continue using it and don't create another
-                    }
-                    delete existingWidgets.first(); // Closed TWidget - remove
-                }
-
-                TWidget* createWidget = new TWidget(winWidget);
-
-                createWidget->Display();
-                return winWidget;
-            };
-
-        return GetIEditor()->GetWinWidgetManager()->RegisterWinWidget(TWidget::GetWWId(), createCall);
-    }
-
-    template<class TWidget>
-    void UnregisterWinWidget()
-    {
-        GetIEditor()->GetWinWidgetManager()->UnregisterWinWidget(TWidget::GetWWId());
-    }
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp b/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp
deleted file mode 100644
index 8bafee313b..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorCommon_precompiled.h"
-#include <WinWidget/WinWidgetManager.h>
-
-namespace WinWidget
-{
-    WinWidgetManager::WinWidgetManager()
-        : m_createCalls(size_t(WinWidgetId::NUM_WIN_WIDGET_IDS) + 1)
-    {
-    }
-
-    size_t WinWidgetManager::GetIndexForId(WinWidgetId thisId) const
-    {
-        size_t thisIndex = static_cast<size_t>(thisId);
-        if (thisIndex >= m_createCalls.size())
-        {
-            return 0;
-        }
-        return thisIndex;
-    }
-
-    WinWidgetManager::WinWidgetCreateCall WinWidgetManager::GetCreateCall(WinWidgetId thisId) const
-    {
-        size_t thisIndex = GetIndexForId(thisId);
-        if (!thisIndex)
-        {
-            return nullptr;
-        }
-        return m_createCalls[thisIndex];
-    }
-
-    bool WinWidgetManager::RegisterWinWidget(WinWidgetId thisId, WinWidgetCreateCall createCall)
-    {
-        size_t thisIndex = GetIndexForId(thisId);
-        if (m_createCalls[thisIndex] != nullptr)
-        {
-            return false;
-        }
-        m_createCalls[thisIndex] = createCall;
-        return true;
-    }
-
-    bool WinWidgetManager::UnregisterWinWidget(WinWidgetId thisId)
-    {
-        size_t thisIndex = GetIndexForId(thisId);
-        if (m_createCalls[thisIndex] == nullptr)
-        {
-            return false;
-        }
-        m_createCalls[thisIndex] = nullptr;
-        return true;
-    }
-
-
-    QWidget* WinWidgetManager::OpenWinWidget(WinWidgetId createId) const
-    {
-        WinWidgetManager::WinWidgetCreateCall createCall = GetCreateCall(createId);
-        if (!createCall)
-        {
-            return nullptr;
-        }
-        return createCall();
-    }
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidgetManager.h b/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidgetManager.h
deleted file mode 100644
index 02236bfda6..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/WinWidget/WinWidgetManager.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <WinWidgetId.h>
-#include "EditorCommonAPI.h"
-
-#include <vector>
-#include <functional>
-
-namespace WinWidget
-{
-    class EDITOR_COMMON_API WinWidgetManager
-    {
-    public:
-        using WinWidgetCreateCall = std::function<QWidget*()>;
-
-        WinWidgetManager();
-        ~WinWidgetManager() {}
-
-        bool RegisterWinWidget(WinWidgetId thisId, WinWidgetCreateCall createCall);
-        bool UnregisterWinWidget(WinWidgetId thisId);
-
-        QWidget* OpenWinWidget(WinWidgetId) const;
-    private:
-        WinWidgetCreateCall GetCreateCall(WinWidgetId thisId) const;
-        size_t GetIndexForId(WinWidgetId thisId) const;
-
-        AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        std::vector<WinWidgetCreateCall> m_createCalls;
-        AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    };
-}
diff --git a/Code/Sandbox/Plugins/EditorCommon/editorcommon_files.cmake b/Code/Sandbox/Plugins/EditorCommon/editorcommon_files.cmake
deleted file mode 100644
index 087a60adb1..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/editorcommon_files.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    EditorCommon.h
-    EditorCommon.cpp
-    EditorCommon.rc
-    EditorCommonAPI.h
-    EditorCommon_precompiled.h
-    ActionOutput.h
-    ActionOutput.cpp
-    UiEditorDLLBus.h
-    DockTitleBarWidget.cpp
-    DockTitleBarWidget.h
-    SaveUtilities/AsyncSaveRunner.h
-    SaveUtilities/AsyncSaveRunner.cpp
-    AxisHelper.cpp
-    DisplayContext.cpp
-    DeepFilterProxyModel.cpp
-    DeepFilterProxyModel.h
-    Resource.h
-    DrawingPrimitives/Ruler.cpp
-    DrawingPrimitives/Ruler.h
-    DrawingPrimitives/TimeSlider.cpp
-    DrawingPrimitives/TimeSlider.h
-    WinWidget/WinWidget.h
-    WinWidget/WinWidgetManager.h
-    WinWidget/WinWidgetManager.cpp
-)
diff --git a/Code/Sandbox/Plugins/EditorCommon/stdafx.cpp b/Code/Sandbox/Plugins/EditorCommon/stdafx.cpp
deleted file mode 100644
index 06d0311a38..0000000000
--- a/Code/Sandbox/Plugins/EditorCommon/stdafx.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// stdafx.cpp : source file that includes just the standard includes
-// EditorCommon.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "EditorCommon_precompiled.h"
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/CMakeLists.txt b/Code/Sandbox/Plugins/FFMPEGPlugin/CMakeLists.txt
deleted file mode 100644
index dd52fda360..0000000000
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME FFMPEGPlugin MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY EditorPlugins
-    FILES_CMAKE
-        ffmpegplugin_files.cmake
-    COMPILE_DEFINITIONS
-        PRIVATE
-            PLUGIN_EXPORTS
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-            Legacy::CryCommon
-            Legacy::EditorLib
-)
-
-ly_add_dependencies(Editor FFMPEGPlugin)
-set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::FFMPEGPlugin>)
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp b/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp
deleted file mode 100644
index b7ccd6ce40..0000000000
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "FFMPEGPlugin_precompiled.h"
-#include "FFMPEGPlugin.h"
-#include "CryString.h"
-typedef CryStringT<char> string;
-#include "Include/ICommandManager.h"
-#include "Util/PathUtil.h"
-
-#include <QCoreApplication>
-#include <QSettings>
-#include <QProcess>
-
-namespace PluginInfo
-{
-    const char* kName = "FFMPEG Writer";
-    const char* kGUID = "{D2A3A44A-00FF-4341-90BA-89A473F44A65}";
-    const int kVersion = 1;
-}
-
-void CFFMPEGPlugin::Release()
-{
-    GetIEditor()->GetICommandManager()->UnregisterCommand(COMMAND_MODULE, COMMAND_NAME);
-    delete this;
-}
-
-void CFFMPEGPlugin::ShowAbout()
-{
-}
-
-const char* CFFMPEGPlugin::GetPluginGUID()
-{
-    return PluginInfo::kGUID;
-}
-
-DWORD CFFMPEGPlugin::GetPluginVersion()
-{
-    return PluginInfo::kVersion;
-}
-
-const char* CFFMPEGPlugin::GetPluginName()
-{
-    return PluginInfo::kName;
-}
-
-bool CFFMPEGPlugin::CanExitNow()
-{
-    return true;
-}
-
-static void Command_FFMPEGEncode(const char* input, const char* output, const char* codec, int bitRateinKb, int fps, const char* etc)
-{
-    QString ffmpegExectablePath = CFFMPEGPlugin::GetFFMPEGExectablePath();
-    QString ffmpegCmdLine = QStringLiteral("\"%1\" -r %2 -i \"%3\" -vcodec %4 -b %5k -r %6 %7 -strict experimental -y \"%8\"")
-        .arg(ffmpegExectablePath, QString::number(fps), input, codec, QString::number(bitRateinKb), QString::number(fps), etc, output);
-    GetIEditor()->GetSystem()->GetILog()->Log("Executing \"%s\" from FFMPEGPlugin...", ffmpegCmdLine.toUtf8().data());
-    QString outTxt;
-    GetIEditor()->ExecuteConsoleApp(ffmpegCmdLine, outTxt, true, true);
-    GetIEditor()->GetSystem()->GetILog()->Log("FFMPEG execution done.");
-}
-
-QString CFFMPEGPlugin::GetFFMPEGExectablePath()
-{
-    // the FFMPEG exe could be in a number of possible locations
-    // our preferred location is from the path in the registry @
-    // "Software\\Amazon\\Lumberyard\\Settings"
-    // in a value called "FFMPEG_PLUGIN"
-
-    // if its not there, try the current folder and a few others
-    // see what can be found!
-    QString ffmpegExectablePath;
-
-    QSettings settings("Amazon", "Lumberyard");
-    settings.beginGroup("Settings");
-    ffmpegExectablePath = settings.value("FFMPEG_PLUGIN").toString();
-
-    if (ffmpegExectablePath.isEmpty() || !QFile::exists(ffmpegExectablePath))
-    {
-        QString path = qApp->applicationDirPath();
-        QString checkPath;
-
-        const char* possibleLocations[] = {
-            "rc/ffmpeg",
-            "editorplugins/ffmpeg",
-            "../editor/plugins/ffmpeg",
-        };
-
-        for (int idx = 0; idx < 3; ++idx)
-        {
-#if defined(AZ_PLATFORM_WINDOWS)
-            checkPath = QStringLiteral("%1/%2.exe").arg(path, possibleLocations[idx]);
-#else
-            checkPath = QStringLiteral("%1/%2").arg(path, possibleLocations[idx]);
-#endif
-            if (QFile::exists(checkPath))
-            {
-                ffmpegExectablePath = checkPath;
-                break;
-            }
-        }
-
-        if (ffmpegExectablePath.isEmpty())
-        {
-#if defined(AZ_PLATFORM_WINDOWS)
-            ffmpegExectablePath = "ffmpeg.exe";
-#else
-            ffmpegExectablePath = "ffmpeg";
-#endif
-            // try the current folder if all else fails, this will also work if its in the PATH somehow.
-        }
-    }
-
-    return ffmpegExectablePath;
-}
-
-bool CFFMPEGPlugin::RuntimeTest()
-{
-    QString ffmpegExectablePath = CFFMPEGPlugin::GetFFMPEGExectablePath();
-    return QProcess::startDetached(QStringLiteral("\"%1\" -version").arg(ffmpegExectablePath), {});
-}
-
-void CFFMPEGPlugin::RegisterTheCommand()
-{
-    using namespace AZStd::placeholders;
-    CommandManagerHelper::RegisterCommand<const char*, const char*, const char*, int, int, const char*>(
-        GetIEditor()->GetICommandManager(),
-        COMMAND_MODULE, COMMAND_NAME, "Encodes a video using ffmpeg.",
-        "plugin.ffmpeg_encode 'input.avi' 'result.mov' 'libx264' 200 30",
-        AZStd::bind(Command_FFMPEGEncode, _1, _2, _3, _4, _5, _6));
-}
-
-void CFFMPEGPlugin::OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId)
-{
-}
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.h b/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.h
deleted file mode 100644
index f16853cbe8..0000000000
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-//////////////////////////////////  CRYTEK  ////////////////////////////////
-//
-//  Crytek Engine Source File.
-//  Copyright (C), Crytek Studios, 2011.
-// -------------------------------------------------------------------------
-//  File Name        : FFMPEGPlugin.h
-//  Author           : Jaewon Jung
-//  Time of creation : 8/10/2011   16:33
-//  Compilers        : VS2008
-//  Description      :
-// -------------------------------------------------------------------------
-////////////////////////////////////////////////////////////////////////////
-#ifndef CRYINCLUDE_FFMPEGPLUGIN_FFMPEGPLUGIN_H
-#define CRYINCLUDE_FFMPEGPLUGIN_FFMPEGPLUGIN_H
-#include <Include/IPlugin.h>
-
-#define COMMAND_MODULE "plugin"
-#define COMMAND_NAME "ffmpeg_encode"
-
-class CFFMPEGPlugin
-    : public IPlugin
-{
-public:
-    void Release();
-    void ShowAbout();
-    const char* GetPluginGUID();
-    DWORD GetPluginVersion();
-    const char* GetPluginName();
-    bool CanExitNow();
-    static QString GetFFMPEGExectablePath();
-    static bool RuntimeTest();
-    static void RegisterTheCommand();
-    void OnEditorNotify(EEditorNotifyEvent aEventId);
-};
-#endif // CRYINCLUDE_FFMPEGPLUGIN_FFMPEGPLUGIN_H
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h b/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
deleted file mode 100644
index 63b56c133d..0000000000
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <platform.h>
-
-
-/////////////////////////////////////////////////////////////////////////////
-// STL
-/////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-#include <algorithm>
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <ISystem.h>
-#include "Util/EditorUtils.h"
-#include "EditorCoreAPI.h"
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake b/Code/Sandbox/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake
deleted file mode 100644
index 150cff82fc..0000000000
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/ffmpegplugin_files.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    FFMPEGPlugin.rc
-    main.cpp
-    FFMPEGPlugin_precompiled.h
-    FFMPEGPlugin.cpp
-    FFMPEGPlugin.h
-)
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/main.cpp b/Code/Sandbox/Plugins/FFMPEGPlugin/main.cpp
deleted file mode 100644
index 3efb69fa84..0000000000
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/main.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "FFMPEGPlugin_precompiled.h"
-#include "FFMPEGPlugin.h"
-#include "Include/IEditorClassFactory.h"
-
-
-PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
-{
-    if (pInitParam->pluginVersion != SANDBOX_PLUGIN_SYSTEM_VERSION)
-    {
-        pInitParam->outErrorCode = IPlugin::eError_VersionMismatch;
-        return 0;
-    }
-
-    ModuleInitISystem(GetIEditor()->GetSystem(), "FFMPEGPlugin");
-    GetIEditor()->GetSystem()->GetILog()->Log("FFMPEG plugin: CreatePluginInstance");
-
-    // Make sure the ffmpeg command can be executed before registering the command
-    if (!CFFMPEGPlugin::RuntimeTest())
-    {
-        AZStd::string msg =
-            "FFMPEG plugin: Failed to execute FFmepg. Please run Setup Assistant, "
-            "go to the 'Optional software' section of the 'Install software' tab, "
-            "and make sure the FFmpeg executable is correctly configured.";
-        GetIEditor()->GetSystem()->GetILog()->Log(msg.c_str());
-    }
-    else
-    {
-        CFFMPEGPlugin::RegisterTheCommand();
-    }
-
-    return new CFFMPEGPlugin;
-}
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/resource.h b/Code/Sandbox/Plugins/FFMPEGPlugin/resource.h
deleted file mode 100644
index 432df62428..0000000000
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/resource.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by FFMPEGPlugin.rc
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/CMakeLists.txt b/Code/Sandbox/Plugins/PerforcePlugin/CMakeLists.txt
deleted file mode 100644
index 0b2db1afed..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/Platform/${PAL_PLATFORM_NAME}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) # For PAL_TRAIT_BUILD_P4PLUGIN_SUPPORTED
-
-if(NOT PAL_TRAIT_BUILD_P4PLUGIN_SUPPORTED)
-    return()
-endif()
-
-ly_add_target(
-    NAME PerforcePlugin MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY EditorPlugins
-    AUTOMOC
-    AUTOUIC
-    FILES_CMAKE
-        perforceplugin_files.cmake
-    COMPILE_DEFINITIONS
-        PRIVATE
-            PLUGIN_EXPORTS
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-            Legacy::CryCommon
-            Legacy::EditorLib
-)
-
-ly_add_dependencies(Editor PerforcePlugin)
-set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::PerforcePlugin>)
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PasswordDlg.cpp b/Code/Sandbox/Plugins/PerforcePlugin/PasswordDlg.cpp
deleted file mode 100644
index b043c12150..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/PasswordDlg.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "PerforcePlugin_precompiled.h"
-#include "PerforcePlugin.h"
-#include "PasswordDlg.h"
-#include <ui_settings.h> // generated
-
-
-#include <AzQtComponents/Components/Widgets/CheckBox.h>
-#include <AzToolsFramework/UI/UICore/ProgressShield.hxx>
-
-#include <QTimer>
-#include <AzCore/std/bind/bind.h>
-
-namespace PerforceConnection
-{
-    const char* const PerforceUser = "P4USER";
-    const char* const PerforceServer = "P4PORT";
-    const char* const PerforceClient = "P4CLIENT";
-    const char* const PerforceCharset = "P4CHARSET";
-
-    using namespace AzToolsFramework;
-    PerforceConfigDialog::PerforceConfigDialog(QWidget* parent)
-        : QDialog(parent)
-    {
-        this->setWindowFlags(Qt::Dialog
-            | Qt::MSWindowsFixedSizeDialogHint
-            | Qt::WindowStaysOnTopHint);
-        m_ui = new Ui::P4SettingsDialog();
-        m_ui->setupUi(this);
-
-        {   
-            SourceControlState state = SourceControlState::Disabled;
-            SourceControlConnectionRequestBus::BroadcastResult(state, &SourceControlConnectionRequestBus::Events::GetSourceControlState);
-
-            bool onlineMode = state == SourceControlState::Disabled ? false : true;
-            AzQtComponents::CheckBox::applyToggleSwitchStyle(m_ui->workOnlineCheckbox);
-            m_ui->workOnlineCheckbox->setChecked(onlineMode);
-        }
-    }
-
-    void PerforceConfigDialog::RetrieveSettings()
-    {
-        m_retrievedSettings.insert_key(PerforceClient);
-        m_retrievedSettings.insert_key(PerforceUser);
-        m_retrievedSettings.insert_key(PerforceServer);
-        m_retrievedSettings.insert_key(PerforceCharset);
-
-        setEnabled(false);
-
-        int numSettingsToGet = m_retrievedSettings.size();
-
-        auto applySettingResultFunction = [this, &numSettingsToGet](AZStd::string setting, const SourceControlSettingInfo& info) -> void
-        {
-            m_retrievedSettings[setting] = info;
-            --numSettingsToGet;
-        };
-        
-        using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
-        for (const auto& kvp : m_retrievedSettings)
-        {
-            auto boundLocal = AZStd::bind<void>(applySettingResultFunction, kvp.first.c_str(), AZStd::placeholders::_1);
-            SCRequestBus::Broadcast(&SCRequestBus::Events::GetConnectionSetting, kvp.first.c_str(), boundLocal);
-        }
-
-        auto waitForAllSettings = [&numSettingsToGet](int&, int&)
-        {
-            return numSettingsToGet == 0;
-        };
-        // Wait for completion
-        ProgressShield::LegacyShowAndWait(this, tr("Getting settings"), waitForAllSettings);
-
-        // wrinkle in the plan - charset might have (SERVER)charset applied to it.  So ask for one more.
-        m_charsetKey = PerforceCharset;
-        if (m_retrievedSettings[PerforceServer].IsAvailable())
-        {
-            AZStd::string charsetNameWithServerAddress = AZStd::string::format("P4_%s_CHARSET", m_retrievedSettings[PerforceServer].m_value.c_str());
-            // ask for one more
-            numSettingsToGet = 1;
-            auto boundLocal = AZStd::bind<void>(applySettingResultFunction, charsetNameWithServerAddress.c_str(), AZStd::placeholders::_1);
-            SCRequestBus::Broadcast(&SCRequestBus::Events::GetConnectionSetting, charsetNameWithServerAddress.c_str(), boundLocal);
-            ProgressShield::LegacyShowAndWait(this, tr("Getting settings"), waitForAllSettings);
-
-            // did we get a value?
-            if (m_retrievedSettings[charsetNameWithServerAddress].IsAvailable())
-            {
-                m_charsetKey = charsetNameWithServerAddress;
-            }
-        }
-
-        // which CHARSET do we pick?  we prefer (servername) charset, but will fall back to just P4CHARSET
-        for (const auto& value : m_retrievedSettings)
-        {
-            const AZStd::string& settingName = value.first;
-            const SourceControlSettingInfo& info = value.second;
-            ApplyValueToControl(GetControlForSetting(settingName), info);
-        }
-
-        setEnabled(true);
-    }
-
-    QLineEdit* PerforceConfigDialog::GetControlForSetting(const AZStd::string& settingName) const
-    {
-        if (settingName == PerforceClient)
-        {
-            return m_ui->workspaceEdit;
-        }
-        else if (settingName == PerforceUser)
-        {
-            return m_ui->userEdit;
-        }
-        else if (settingName == PerforceServer)
-        {
-            return m_ui->serverEdit;
-        }
-        else if (settingName == m_charsetKey)
-        {
-            return m_ui->charsetEdit;
-        }
-        return nullptr;
-    }
-
-    PerforceConfigDialog::~PerforceConfigDialog()
-    {
-        delete m_ui;
-    }
-
-    void PerforceConfigDialog::ApplyValueToControl(QLineEdit* targetControl, const SourceControlSettingInfo& value)
-    {
-        if (targetControl)
-        {
-            if (value.IsAvailable())
-            {
-                targetControl->setText(QString::fromUtf8(value.m_value.c_str()));
-            }
-            else
-            {
-                targetControl->setText(QString(""));
-            }
-
-            if (value.IsSettable())
-            {
-                targetControl->setReadOnly(false);
-                targetControl->setEnabled(true);
-                targetControl->setToolTip("");
-            }
-            else
-            {
-                targetControl->setReadOnly(true);
-                targetControl->setEnabled(false);
-                QString toolTip;
-                QString ttDescStart("Cannot change this value - it is currently being overridden by");
-                if (value.m_status == SourceControlSettingStatus::Config)
-                {
-                    if (!value.m_context.empty())
-                    {
-                        toolTip = tr("%1 config file: %2.").arg(ttDescStart).arg(QString::fromUtf8(value.m_context.c_str()));
-                    }
-                    else
-                    {
-                        toolTip = tr("%1 a config file.").arg(ttDescStart);
-                    }
-                }
-                else
-                {
-                    toolTip = tr("%1 your system environment.  Please check your environment variables in your system's control panel").arg(ttDescStart);
-                }
-                targetControl->setToolTip(toolTip);
-            }
-        }
-    }
-
-    void PerforceConfigDialog::on_workOnlineCheckbox_toggled(bool newState)
-    {
-        m_ui->workspaceEdit->setEnabled(false);
-        m_ui->userEdit->setEnabled(false);
-        m_ui->serverEdit->setEnabled(false);
-        m_ui->charsetEdit->setEnabled(false);
-
-        if (newState)
-        {
-            // we only fetch settings if we are working online.
-            QTimer::singleShot(0, this, &PerforceConfigDialog::RetrieveSettings);
-        }
-        else
-        {
-            m_ui->workspaceEdit->setText(tr("(offline)"));
-            m_ui->userEdit->setText(tr("(offline)"));
-            m_ui->serverEdit->setText(tr("(offline)"));
-            m_ui->charsetEdit->setText(tr("(offline)"));
-        }
-    }
-
-    void PerforceConfigDialog::Apply()
-    {
-        bool onlineMode = m_ui->workOnlineCheckbox->isChecked();
-        {
-            using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
-            SCRequestBus::Broadcast(&SCRequestBus::Events::EnableSourceControl, onlineMode);
-        }
-
-        if (onlineMode)
-        {
-            // work online!
-            // apply all the settings.
-            // you may only apply some of the settings - the ones that are either 'set' or 'unset'
-            // only set values that are not already that value
-            // and charset is special in that you must set it as eitehr CHARSET or override the server.
-            ApplySetting(PerforceUser);
-            ApplySetting(PerforceServer);
-            ApplySetting(PerforceClient);
-            ApplySetting(m_charsetKey.c_str());
-        }
-    }
-
-    bool PerforceConfigDialog::ApplySetting(const char* key)
-    {
-        if (!m_retrievedSettings[key].IsSettable())
-        {
-            return false;
-        }
-
-        QLineEdit* source = GetControlForSetting(key);
-        if (!source)
-        {
-            return false;
-        }
-
-        AZStd::string newValue = source->text().toUtf8().data();
-        if (newValue.empty())
-        {
-            return false;
-        }
-
-        if (newValue == m_retrievedSettings[key].m_value)
-        {
-            return false;
-        }
-
-        // again, charset is special in that it can under certain circumstances take the form P4_SERVERNAME_CHARSET instead of just P4CHARSET
-
-        if (m_charsetKey == key)
-        {
-            // if its already P4CHARSET then we don't care.
-            if (m_charsetKey != PerforceCharset)
-            {
-                QLineEdit* hostSource = GetControlForSetting(PerforceServer);
-                if (!hostSource)
-                {
-                    return false;
-                }
-                m_charsetKey = AZStd::string::format("P4_%s_CHARSET", hostSource->text().toUtf8().data());
-                key = m_charsetKey.c_str();
-
-            }
-        }
-
-        bool succeeded = false;
-        bool complete = false;
-        auto respCallback = [&succeeded, &complete, newValue](const SourceControlSettingInfo& info)
-        {
-            succeeded = (info.m_value == newValue);
-            complete = true;
-        };
-
-        auto waitForDone = [&complete](int&, int&)
-        {
-            return complete;
-        };
-        
-        using SCRequestBus = AzToolsFramework::SourceControlConnectionRequestBus;
-        SCRequestBus::Broadcast(&SCRequestBus::Events::SetConnectionSetting, key, newValue.c_str(), respCallback);
-        ProgressShield::LegacyShowAndWait(this, tr("Applying settings"), waitForDone);
-
-        return succeeded;
-    }
-
-    bool OpenPasswordDlg()
-    {
-        PerforceConfigDialog dialog;
-
-        if (dialog.exec() == QDialog::Accepted)
-        {
-            dialog.Apply();
-            return true;
-        }
-        return false;
-    }
-} // namespace PerforceConnection
-
-#include <moc_PasswordDlg.cpp>
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PasswordDlg.h b/Code/Sandbox/Plugins/PerforcePlugin/PasswordDlg.h
deleted file mode 100644
index accf23a485..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/PasswordDlg.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QString>
-#include <AzToolsFramework/SourceControl/SourceControlAPI.h> // for SouceControlSettingInfo
-#endif
-
-class QLineEdit;
-
-namespace Ui {
-    class P4SettingsDialog;
-} // namespace Ui
-
-namespace PerforceConnection
-{
-    class PerforceConfigDialog
-        : public QDialog
-    {
-        Q_OBJECT
-    public:
-        PerforceConfigDialog(QWidget* pParent = nullptr);
-        virtual ~PerforceConfigDialog();
-
-        bool GetWorkOffline() const;
-        void SetWorkOffline(bool value);
-
-    public Q_SLOTS:
-        void RetrieveSettings();
-        // auto-bound slots
-        void on_workOnlineCheckbox_toggled(bool newState);
-
-        void Apply();
-
-    private:
-        Ui::P4SettingsDialog* m_ui;
-
-        AZStd::unordered_map<AZStd::string, AzToolsFramework::SourceControlSettingInfo> m_retrievedSettings;
-        AZStd::string m_charsetKey;
-
-        void ApplyValueToControl(QLineEdit* targetControl, const AzToolsFramework::SourceControlSettingInfo& value);
-        bool ApplySetting(const char* key);
-        QLineEdit* GetControlForSetting(const AZStd::string& settingName) const;
-    };
-
-    bool OpenPasswordDlg();
-} // namespace PerforceConnection
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.cpp b/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.cpp
deleted file mode 100644
index 6dc9a19d4f..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "PerforcePlugin_precompiled.h"
-#include "PerforcePlugin.h"
-#include "PerforceSourceControl.h"
-#include "Include/ISourceControl.h"
-#include "Include/IEditorClassFactory.h"
-
-extern CPerforceSourceControl* g_pPerforceControl;
-
-namespace PluginInfo
-{
-    const char* kName = "Perforce Client";
-    const char* kGUID = "{FD5F1023-8F02-4051-89FA-DF1F038863A2}";
-    const int kVersion = 1;
-}
-
-void CPerforcePlugin::Release()
-{
-    GetIEditor()->GetClassFactory()->UnregisterClass(g_pPerforceControl->ClassName().toUtf8().data());
-    delete this;
-}
-
-void CPerforcePlugin::ShowAbout()
-{
-}
-
-const char* CPerforcePlugin::GetPluginGUID()
-{
-    return PluginInfo::kGUID;
-}
-
-DWORD CPerforcePlugin::GetPluginVersion()
-{
-    return PluginInfo::kVersion;
-}
-
-const char* CPerforcePlugin::GetPluginName()
-{
-    return PluginInfo::kName;
-}
-
-bool CPerforcePlugin::CanExitNow()
-{
-    return true;
-}
-
-void CPerforcePlugin::Serialize([[maybe_unused]] FILE* hFile, [[maybe_unused]] bool bIsStoring)
-{
-}
-
-void CPerforcePlugin::ResetContent()
-{
-}
-
-bool CPerforcePlugin::CreateUIElements()
-{
-    return true;
-}
-
-void CPerforcePlugin::OnEditorNotify(EEditorNotifyEvent aEventId)
-{
-    if (eNotify_OnInit == aEventId)
-    {
-        g_pPerforceControl->Init();
-    }
-}
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.h b/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.h
deleted file mode 100644
index 9f83e237d4..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_PERFORCEPLUGIN_PERFORCEPLUGIN_H
-#define CRYINCLUDE_PERFORCEPLUGIN_PERFORCEPLUGIN_H
-#pragma once
-
-
-#include <Include/IPlugin.h>
-
-class CPerforcePlugin
-    : public IPlugin
-{
-public:
-    void Release();
-    void ShowAbout();
-    const char* GetPluginGUID();
-    DWORD GetPluginVersion();
-    const char* GetPluginName();
-    bool CanExitNow();
-    void Serialize(FILE* hFile, bool bIsStoring);
-    void ResetContent();
-    bool CreateUIElements();
-    void OnEditorNotify(EEditorNotifyEvent aEventId);
-};
-
-#endif // CRYINCLUDE_PERFORCEPLUGIN_PERFORCEPLUGIN_H
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h b/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
deleted file mode 100644
index 091263f843..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <platform.h>
-#include "Util/EditorUtils.h"
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PerforceSourceControl.cpp b/Code/Sandbox/Plugins/PerforcePlugin/PerforceSourceControl.cpp
deleted file mode 100644
index 0fa164a40c..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/PerforceSourceControl.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "PerforcePlugin_precompiled.h"
-#include "CryFile.h"
-#include "PerforceSourceControl.h"
-#include "PasswordDlg.h"
-
-#include <QSettings>
-#include <QDir>
-#include <QFile>
-#include <QProcess>
-#include <QApplication>
-#include <QTimer>
-
-#include <Util/PathUtil.h>
-#include <AzCore/base.h>
-
-namespace
-{
-    CryCriticalSection g_cPerforceValues;
-}
-
-////////////////////////////////////////////////////////////
-ULONG STDMETHODCALLTYPE CPerforceSourceControl::Release()
-{
-    if ((--m_ref) == 0)
-    {
-        g_cPerforceValues.Lock();
-        delete this;
-        g_cPerforceValues.Unlock();
-        return 0;
-    }
-    else
-    {
-        return m_ref;
-    }
-}
-
-void CPerforceSourceControl::Init()
-{
-    UpdateSourceControlState();
-}
-
-void CPerforceSourceControl::ShowSettings()
-{
-    if (PerforceConnection::OpenPasswordDlg())
-    {
-        UpdateSourceControlState();
-    }
-}
-
-void CPerforceSourceControl::SetSourceControlState(SourceControlState state)
-{
-    AUTO_LOCK(g_cPerforceValues);
-
-    switch (state)
-    {
-        case SourceControlState::Disabled:
-            m_connectionState = ConnectivityState::Disconnected;
-            break;
-
-        case SourceControlState::Active:
-            m_connectionState = ConnectivityState::Connected;
-            break;
-
-        case SourceControlState::ConfigurationInvalid:
-            m_connectionState = ConnectivityState::BadConfiguration;
-            break;
-
-        default:
-            break;
-    }
-}
-
-void CPerforceSourceControl::UpdateSourceControlState()
-{
-    using namespace AzToolsFramework;
-
-    SourceControlState state = SourceControlState::Disabled;
-    SourceControlConnectionRequestBus::BroadcastResult(state,
-        &SourceControlConnectionRequestBus::Events::GetSourceControlState);
-
-    SetSourceControlState(state);
-}
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/PerforceSourceControl.h b/Code/Sandbox/Plugins/PerforcePlugin/PerforceSourceControl.h
deleted file mode 100644
index f951ae0eea..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/PerforceSourceControl.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include "IEditorClassFactory.h"
-#include "Include/IEditorClassFactory.h"
-
-#include "Include/ISourceControl.h"
-
-
-class CPerforceSourceControl
-    : public ISourceControl
-    , public IClassDesc
-{
-public:
-    // constructor
-    CPerforceSourceControl() = default;
-    virtual ~CPerforceSourceControl() = default;
-
-    void Init();
-
-    // ISourceControl
-    void SetSourceControlState(SourceControlState state) override;
-    ConnectivityState GetConnectivityState() override { return m_connectionState; };
-    void ShowSettings() override;
-
-    // from IClassDesc
-    virtual ESystemClassID SystemClassID() { return ESYSTEM_CLASS_SCM_PROVIDER; };
-    REFGUID ClassID()
-    {
-        // {3c209e66-0728-4d43-897d-168962d5c8b5}
-        static const GUID guid = {
-            0x3c209e66, 0x0728, 0x4d43, { 0x89, 0x7d, 0x16, 0x89, 0x62, 0xd5, 0xc8, 0xb5 }
-        };
-        return guid;
-    }
-    virtual QString ClassName() { return "Perforce source control"; };
-    virtual QString Category() { return "SourceControl"; };
-    virtual void ShowAbout() {};
-
-    // from IUnknown
-    HRESULT STDMETHODCALLTYPE QueryInterface(const IID& riid, void** ppvObj)
-    {
-        if (riid == __uuidof(ISourceControl) /* && m_pIntegrator*/)
-        {
-            *ppvObj = this;
-            return S_OK;
-        }
-        return E_NOINTERFACE;
-    }
-    ULONG STDMETHODCALLTYPE AddRef() { return ++m_ref; };
-    ULONG STDMETHODCALLTYPE Release();
-
-private:
-    void UpdateSourceControlState();
-
-    ULONG m_ref{ 0 };
-    ConnectivityState m_connectionState{ ConnectivityState::Disconnected };
-};
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/Platform/Linux/PAL_linux.cmake b/Code/Sandbox/Plugins/PerforcePlugin/Platform/Linux/PAL_linux.cmake
deleted file mode 100644
index 95bb1bbe1f..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/Platform/Linux/PAL_linux.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(PAL_TRAIT_BUILD_P4PLUGIN_SUPPORTED FALSE)
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/Platform/Mac/PAL_mac.cmake b/Code/Sandbox/Plugins/PerforcePlugin/Platform/Mac/PAL_mac.cmake
deleted file mode 100644
index 160d454295..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/Platform/Mac/PAL_mac.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(PAL_TRAIT_BUILD_P4PLUGIN_SUPPORTED TRUE)
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/Platform/Windows/PAL_windows.cmake b/Code/Sandbox/Plugins/PerforcePlugin/Platform/Windows/PAL_windows.cmake
deleted file mode 100644
index 160d454295..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/Platform/Windows/PAL_windows.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(PAL_TRAIT_BUILD_P4PLUGIN_SUPPORTED TRUE)
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/main.cpp b/Code/Sandbox/Plugins/PerforcePlugin/main.cpp
deleted file mode 100644
index 1f232d6f39..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/main.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "PerforcePlugin_precompiled.h"
-
-#include "PerforcePlugin.h"
-
-#include "Include/ISourceControl.h"
-#include "Include/IEditorClassFactory.h"
-#include "PerforceSourceControl.h"
-
-#include <AzCore/PlatformDef.h>
-
-CPerforceSourceControl* g_pPerforceControl = 0;
-
-
-PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
-{
-    if (pInitParam->pluginVersion != SANDBOX_PLUGIN_SYSTEM_VERSION)
-    {
-        pInitParam->outErrorCode = IPlugin::eError_VersionMismatch;
-        return 0;
-    }
-
-    ModuleInitISystem(GetIEditor()->GetSystem(), "PerforcePlugin");
-    g_pPerforceControl = new CPerforceSourceControl();
-    pInitParam->pIEditorInterface->GetClassFactory()->RegisterClass(g_pPerforceControl);
-    return new CPerforcePlugin();
-}
-
-#ifdef AZ_PLATFORM_WINDOWS
-HINSTANCE g_hInstance = 0;
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, ULONG fdwReason, [[maybe_unused]] LPVOID lpvReserved)
-{
-    if (fdwReason == DLL_PROCESS_ATTACH)
-    {
-        g_hInstance = hinstDLL;
-        //DisableThreadLibraryCalls(hInstance);
-    }
-
-    return(TRUE);
-}
-#endif
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/perforceplugin_files.cmake b/Code/Sandbox/Plugins/PerforcePlugin/perforceplugin_files.cmake
deleted file mode 100644
index f86e1b4fd9..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/perforceplugin_files.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    settings.ui
-    main.cpp
-    PasswordDlg.cpp
-    PasswordDlg.h
-    PerforcePlugin.cpp
-    PerforcePlugin.h
-    PerforcePlugin.qrc
-    PerforceSourceControl.cpp
-    PerforceSourceControl.h
-    resource.h
-    PerforcePlugin_precompiled.h
-)
diff --git a/Code/Sandbox/Plugins/PerforcePlugin/resource.h b/Code/Sandbox/Plugins/PerforcePlugin/resource.h
deleted file mode 100644
index f1e8c222a9..0000000000
--- a/Code/Sandbox/Plugins/PerforcePlugin/resource.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#define IDI_P4                          104
-#define IDI_P4_ERROR                    106
-#define IDC_ERROR                       1004
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        107
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1010
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/CMakeLists.txt b/Code/Sandbox/Plugins/ProjectSettingsTool/CMakeLists.txt
deleted file mode 100644
index 312f4699b3..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME ProjectSettingsTool MODULE
-    NAMESPACE Legacy
-    OUTPUT_SUBDIRECTORY EditorPlugins
-    AUTOMOC
-    AUTOUIC
-    FILES_CMAKE
-        projectsettingstool_files.cmake
-    COMPILE_DEFINITIONS
-        PRIVATE
-            PLUGIN_EXPORTS
-            SANDBOX_IMPORTS
-            EDITOR_COMMON_IMPORTS
-    BUILD_DEPENDENCIES
-        PRIVATE
-            3rdParty::Qt::Core
-            3rdParty::Qt::Gui
-            3rdParty::Qt::Widgets
-            AZ::AzCore
-            AZ::AzToolsFramework
-            Legacy::CryCommon
-            Legacy::EditorLib
-            Legacy::EditorCommon
-)
-
-ly_add_dependencies(Editor ProjectSettingsTool)
-set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::ProjectSettingsTool>)
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp
deleted file mode 100644
index edd6623382..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "DefaultImageValidator.h"
-
-#include "PropertyImagePreview.h"
-
-// Error for no default image set in overrides
-const static char* noDefaultImageError = "Default must be set if not all dpi overrides are set";
-
-namespace ProjectSettingsTool
-{
-    DefaultImageValidator::DefaultImageValidator(const FunctorValidator& validator)
-        : FunctorValidator(validator.Functor())
-    {
-    }
-
-    QValidator::State DefaultImageValidator::validate(QString& input, [[maybe_unused]] int& pos) const
-    {
-        return ValidateWithErrors(input).first;
-    }
-
-    FunctorValidator::ReturnType DefaultImageValidator::ValidateWithErrors(const QString& input) const
-    {
-        ReturnType result = m_functor(input);
-        if (result.first == QValidator::Acceptable)
-        {
-            if (input.isEmpty())
-            {
-                int numCustoms = 0;
-                // Check all specific overrides to see if any are set
-                for (const PropertyImagePreviewCtrl* preview : m_specificOverrides)
-                {
-                    if (!preview->GetValue().isEmpty())
-                    {
-                        ++numCustoms;
-                    }
-                }
-                if (numCustoms != 0 && numCustoms != m_specificOverrides.size())
-                {
-                    return FunctorValidator::ReturnType(QValidator::Intermediate, tr(noDefaultImageError));
-                }
-            }
-        }
-
-        return result;
-    }
-
-    void DefaultImageValidator::AddOverride(PropertyImagePreviewCtrl* preview)
-    {
-        m_specificOverrides.push_back(preview);
-    }
-} // namespace ProjectSettingsTool
-#include <moc_DefaultImageValidator.cpp>
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/DefaultImageValidator.h b/Code/Sandbox/Plugins/ProjectSettingsTool/DefaultImageValidator.h
deleted file mode 100644
index 500dfc2b53..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/DefaultImageValidator.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "FunctorValidator.h"
-
-#include <AzCore/std/containers/list.h>
-#endif
-
-namespace ProjectSettingsTool
-{
-    // Forward Declaration
-    class PropertyImagePreviewCtrl;
-
-    class DefaultImageValidator
-        : public FunctorValidator
-    {
-        Q_OBJECT
-
-    public:
-        DefaultImageValidator(const FunctorValidator& validator);
-
-        QValidator::State validate(QString& input, int& pos) const override;
-        ReturnType ValidateWithErrors(const QString& input) const override;
-        // Adds a specific override to the list for this default override
-        void AddOverride(PropertyImagePreviewCtrl* preview);
-
-    protected:
-        AZStd::list<const PropertyImagePreviewCtrl*> m_specificOverrides;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/FunctorValidator.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/FunctorValidator.cpp
deleted file mode 100644
index 59345756bd..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/FunctorValidator.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "FunctorValidator.h"
-
-namespace ProjectSettingsTool
-{
-    FunctorValidator::FunctorValidator(FunctorType functor)
-        : QValidator()
-        , m_functor(functor)
-    {
-    }
-
-    FunctorValidator::FunctorValidator()
-        : QValidator()
-        , m_functor(nullptr)
-    {
-    }
-
-    QValidator::State FunctorValidator::validate(QString& input, [[maybe_unused]] int& pos) const
-    {
-        return m_functor(input).first;
-    }
-
-    FunctorValidator::ReturnType FunctorValidator::ValidateWithErrors(const QString& input) const
-    {
-        return m_functor(input);
-    }
-
-    FunctorValidator::FunctorType FunctorValidator::Functor() const
-    {
-        return m_functor;
-    }
-} // namespace ProjectSettingsTool
-
-#include <moc_FunctorValidator.cpp>
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/FunctorValidator.h b/Code/Sandbox/Plugins/ProjectSettingsTool/FunctorValidator.h
deleted file mode 100644
index 03da188570..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/FunctorValidator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/std/utils.h>
-
-#include <QValidator>
-#endif
-
-
-namespace ProjectSettingsTool
-{
-    class FunctorValidator
-        : public QValidator
-    {
-        Q_OBJECT
-
-    public:
-        typedef AZStd::pair<QValidator::State, const QString> ReturnType;
-        typedef ReturnType(* FunctorType)(const QString&);
-
-        FunctorValidator(FunctorType functor);
-
-        // Validates using QValidates api
-        QValidator::State validate(QString& input, int& pos) const override;
-        // Validates and returns the result with an error string if one occurred
-        virtual ReturnType ValidateWithErrors(const QString& input) const;
-        // Returns the function used to validate
-        FunctorType Functor() const;
-
-    protected:
-        FunctorValidator();
-
-        // The function to use for validating
-        FunctorType m_functor;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/LastPathBus.h b/Code/Sandbox/Plugins/ProjectSettingsTool/LastPathBus.h
deleted file mode 100644
index 7a4375d6da..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/LastPathBus.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-
-namespace ProjectSettingsTool
-{
-    class LastPathTraits
-        : public AZ::EBusTraits
-    {
-    public:
-        using Bus = AZ::EBus<LastPathTraits>;
-
-        // Bus Configuration
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-        virtual QString GetLastImagePath() = 0;
-        virtual void SetLastImagePath(const QString& path) = 0;
-    };
-
-    typedef AZ::EBus<LastPathTraits> LastPathBus;
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings.h
deleted file mode 100644
index aca6ebf2be..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "PlatformSettings_Android.h"
-#include "PlatformSettings_Base.h"
-#include "PlatformSettings_Ios.h"
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp
deleted file mode 100644
index c2b1685dbb..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PlatformSettings_Android.h"
-
-#include "PlatformSettings_common.h"
-#include "Validators.h"
-
-namespace ProjectSettingsTool
-{
-    static const char* defaultImageTooltip = "Default image used if a specific DPI override is not given.";
-    static void* xmlFunctor = reinterpret_cast<void*>(&SelectXmlFromFileDialog);
-
-    void AndroidIcons::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            serialize->Class<AndroidIcons>()
-                ->Version(1)
-                ->Field("default", &AndroidIcons::m_default)
-                ->Field("mdpi", &AndroidIcons::m_mdpi)
-                ->Field("hdpi", &AndroidIcons::m_hdpi)
-                ->Field("xhdpi", &AndroidIcons::m_xhdpi)
-                ->Field("xxhdpi", &AndroidIcons::m_xxhdpi)
-                ->Field("xxxhdpi", &AndroidIcons::m_xxxhdpi)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<AndroidIcons>("Icons", "All icon overrides for android.")
-                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_default, "Default", defaultImageTooltip)
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidIconDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_mdpi, "Medium Dpi (48px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<48>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "mdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_hdpi, "High Dpi (72px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<72>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "hdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_xhdpi, "XHigh Dpi (96px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<96>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "xhdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_xxhdpi, "XXHigh Dpi (144px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<144>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "xxhdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidIcons::m_xxxhdpi, "XXXHigh Dpi (192px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<192>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidIcons, "xxxhdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidIconDefault)
-                ;
-            }
-        }
-    }
-
-    void AndroidLandscapeSplashscreens::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            serialize->Class<AndroidLandscapeSplashscreens>()
-                ->Version(1)
-                ->Field("default", &AndroidLandscapeSplashscreens::m_default)
-                ->Field("mdpi", &AndroidLandscapeSplashscreens::m_mdpi)
-                ->Field("hdpi", &AndroidLandscapeSplashscreens::m_hdpi)
-                ->Field("xhdpi", &AndroidLandscapeSplashscreens::m_xhdpi)
-                ->Field("xxhdpi", &AndroidLandscapeSplashscreens::m_xxhdpi)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<AndroidLandscapeSplashscreens>("Landscape", "All landscape splashscreen overrides for Android.")
-                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_default, "Default", defaultImageTooltip)
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidLandDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_mdpi, "Medium Dpi", "Suggested 1024 x 640 png.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidLandscape, "mdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidLandDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_hdpi, "High Dpi", "Suggested 1280 x 800 png.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidLandscape, "hdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidLandDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_xhdpi, "XHigh Dpi", "Suggested 1920 x 1200 png.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidLandscape, "xhdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidLandDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidLandscapeSplashscreens::m_xxhdpi, "XXHigh Dpi", "Suggested 2560 x 1600 png.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidLandscape, "xxhdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidLandDefault)
-                ;
-            }
-        }
-    }
-
-    void AndroidPortraitSplashscreens::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            serialize->Class<AndroidPortraitSplashscreens>()
-                ->Version(1)
-                ->Field("default", &AndroidPortraitSplashscreens::m_default)
-                ->Field("mdpi", &AndroidPortraitSplashscreens::m_mdpi)
-                ->Field("hdpi", &AndroidPortraitSplashscreens::m_hdpi)
-                ->Field("xhdpi", &AndroidPortraitSplashscreens::m_xhdpi)
-                ->Field("xxhdpi", &AndroidPortraitSplashscreens::m_xxhdpi)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<AndroidPortraitSplashscreens>("Portrait", "All portrait splashscreen overrides for Android.")
-                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_default, "Default", defaultImageTooltip)
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidPortDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_mdpi, "Medium Dpi", "Suggested 640 x 1024 png.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidPortrait, "mdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidPortDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_hdpi, "High Dpi", "Suggested 800 x 1280 png.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidPortrait, "hdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidPortDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_xhdpi, "XHigh Dpi", "Suggested 1200 x 1920 png.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidPortrait, "xhdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidPortDefault)
-                    ->DataElement(Handlers::ImagePreview, &AndroidPortraitSplashscreens::m_xxhdpi, "XXHigh Dpi", "Suggested 1600 x 2560 png.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidPngOrEmpty))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::AndroidPortrait, "xxhdpi"))
-                        ->Attribute(Attributes::DefaultImagePreview, Identfiers::AndroidPortDefault)
-                ;
-            }
-        }
-    }
-
-    void AndroidSplashscreens::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            AndroidLandscapeSplashscreens::Reflect(context);
-            AndroidPortraitSplashscreens::Reflect(context);
-
-            serialize->Class<AndroidSplashscreens>()
-                ->Version(1)
-                ->Field("land", &AndroidSplashscreens::m_landscapeSplashscreens)
-                ->Field("port", &AndroidSplashscreens::m_portraitSplashscreens)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<AndroidSplashscreens>("Splashscreens", "All splashscreen overrides for Android.")
-                    ->DataElement(0, &AndroidSplashscreens::m_landscapeSplashscreens)
-                    ->DataElement(0, &AndroidSplashscreens::m_portraitSplashscreens)
-                ;
-            }
-        }
-    }
-
-    void AndroidSettings::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            AndroidIcons::Reflect(context);
-            AndroidSplashscreens::Reflect(context);
-
-            serialize->Class<AndroidSettings>()
-                ->Version(1)
-                ->Field("package_name", &AndroidSettings::m_packageName)
-                ->Field("version_name", &AndroidSettings::m_versionName)
-                ->Field("version_number", &AndroidSettings::m_versionNumber)
-                ->Field("orientation", &AndroidSettings::m_orientation)
-                ->Field("app_public_key", &AndroidSettings::m_appPublicKey)
-                ->Field("app_obfuscator_salt", &AndroidSettings::m_appObfuscatorSalt)
-                ->Field("rc_pak_job", &AndroidSettings::m_rcPakJob)
-                ->Field("rc_obb_job", &AndroidSettings::m_rcObbJob)
-                ->Field("use_main_obb", &AndroidSettings::m_useMainObb)
-                ->Field("use_patch_obb", &AndroidSettings::m_usePatchObb)
-                ->Field("enable_key_screen_on", &AndroidSettings::m_enableKeyScreenOn)
-                ->Field("disable_immersive_mode", &AndroidSettings::m_disableImmersiveMode)
-                ->Field("icons", &AndroidSettings::m_icons)
-                ->Field("splash_screen", &AndroidSettings::m_splashscreens)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<AndroidSettings>("Android Settings", "All settings related to Android not already defined by base settings.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_packageName, "Package Name", "Android application package identifier. Used for generating the project specific Java activity class and in the AndroidManifest.xml. Must be in dot separated format.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PackageName))
-                        ->Attribute(Attributes::LinkOptional, true)
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidPackageName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosBundleIdentifer)
-                    ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_versionName, "Version Name", "Human readable version number. Used to set the \"android: versionName\" tag in the AndroidManifest.xml and ultimately what will be displayed in the App Store.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
-                        ->Attribute(Attributes::LinkOptional, true)
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidVersionName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosVersionName)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_versionNumber, "Version Number", "Internal application version number. Used to set the \"android:versionCode\" tag in the AndroidManifest.xml.")
-                        ->Attribute(AZ::Edit::Attributes::Min, 1)
-                        ->Attribute(AZ::Edit::Attributes::Max, Validators::maxAndroidVersion)
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &AndroidSettings::m_orientation, "Orientation", "Desired orientation of the Android application. Used to set the \"android:screenOrientation\" tag in the AndroidManifest.xml.")
-                        ->Attribute(AZ::Edit::Attributes::StringList, AZStd::vector<AZStd::string>
-                        {
-                            "landscape",
-                            "portrait",
-                            "reverseLandscape",
-                            "reversePortrait",
-                            "sensorLandscape",
-                            "sensorPortrait",
-                            "sensor",
-                            "fullSensor",
-                            "noSensor",
-                            "userLandscape",
-                            "userPortrait",
-                            "user",
-                            "fullUser",
-                            "locked",
-                            "behind",
-                            "unspecified"
-                        })
-                    ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_appPublicKey, "Public App Key", "The application license key provided by Google Play. Required for using APK expansion files or other Google Play Services.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PublicAppKeyOrEmpty))
-                        ->Attribute(Attributes::Obfuscated, true)
-                    ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_appObfuscatorSalt, "App Obfuscation Salt", "Application specific salt value for (un)obfuscation when using APK expansion files.")
-                        ->Attribute(Attributes::Obfuscated, true)
-                    ->DataElement(Handlers::FileSelect, &AndroidSettings::m_rcPakJob, "Rc Job PAK Override", "Path to the RC job XML file used to override the normal PAK files generation used in release builds. Path must be relative to <build dir>.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidXmlOrEmpty))
-                        ->Attribute(Attributes::SelectFunction, xmlFunctor)
-                    ->DataElement(Handlers::FileSelect, &AndroidSettings::m_rcObbJob, "Rc Job APK Override", "Path to the RC job XML file used to override the normal APK Expansion file(s) generation used in release builds. Path must be relative to <build dir>.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::ValidXmlOrEmpty))
-                        ->Attribute(Attributes::SelectFunction, xmlFunctor)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_useMainObb, "Use Main APK", "Specify if the \"Main\" APK Expansion file should be used.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_usePatchObb, "Use Patch APK", "Specify if the \"Patch\" APK Expansion file should be used.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_enableKeyScreenOn, "Enable Screen Wake Lock", "Enabled or disable the screen wake lock (device won't go to sleep while the application is running).")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_disableImmersiveMode, "Disable Immersive Mode", "Disable hiding of top and bottom system bars.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_icons)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_splashscreens)
-                ;
-            }
-        }
-    }
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Android.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Android.h
deleted file mode 100644
index 60fac39149..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Android.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Serialization/EditContext.h>
-
-namespace ProjectSettingsTool
-{
-    class AndroidIcons
-    {
-    public:
-        AZ_TYPE_INFO(AndroidIcons, "{D807ABEA-9C79-4EDD-B418-9A823E812C9A}");
-        AZ_CLASS_ALLOCATOR(AndroidIcons, AZ::SystemAllocator, 0);
-
-        AndroidIcons()
-            : m_default("")
-            , m_mdpi("")
-            , m_hdpi("")
-            , m_xhdpi("")
-            , m_xxhdpi("")
-            , m_xxxhdpi("")
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZStd::string m_default;
-        AZStd::string m_mdpi;
-        AZStd::string m_hdpi;
-        AZStd::string m_xhdpi;
-        AZStd::string m_xxhdpi;
-        AZStd::string m_xxxhdpi;
-    };
-
-    class AndroidLandscapeSplashscreens
-    {
-    public:
-        AZ_TYPE_INFO(AndroidLandscapeSplashscreens, "{37888881-5050-47B6-9EB4-A408FD27D397}");
-        AZ_CLASS_ALLOCATOR(AndroidIcons, AZ::SystemAllocator, 0);
-
-        AndroidLandscapeSplashscreens()
-            : m_default("")
-            , m_mdpi("")
-            , m_hdpi("")
-            , m_xhdpi("")
-            , m_xxhdpi("")
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZStd::string m_default;
-        AZStd::string m_mdpi;
-        AZStd::string m_hdpi;
-        AZStd::string m_xhdpi;
-        AZStd::string m_xxhdpi;
-    };
-
-    class AndroidPortraitSplashscreens
-    {
-    public:
-        AZ_TYPE_INFO(AndroidPortraitSplashscreens, "{2AADA22F-B5A3-440C-A592-FB923BC66878}");
-        AZ_CLASS_ALLOCATOR(AndroidPortraitSplashscreens, AZ::SystemAllocator, 0);
-
-        AndroidPortraitSplashscreens()
-            : m_default("")
-            , m_mdpi("")
-            , m_hdpi("")
-            , m_xhdpi("")
-            , m_xxhdpi("")
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZStd::string m_default;
-        AZStd::string m_mdpi;
-        AZStd::string m_hdpi;
-        AZStd::string m_xhdpi;
-        AZStd::string m_xxhdpi;
-    };
-
-    class AndroidSplashscreens
-    {
-    public:
-        AZ_TYPE_INFO(AndroidSplashscreens, "{95985732-F45B-436A-86BC-7AE5249FF520}");
-        AZ_CLASS_ALLOCATOR(AndroidSplashscreens, AZ::SystemAllocator, 0);
-
-        AndroidSplashscreens()
-            : m_landscapeSplashscreens()
-            , m_portraitSplashscreens()
-        {}
-
-        AndroidLandscapeSplashscreens m_landscapeSplashscreens;
-        AndroidPortraitSplashscreens m_portraitSplashscreens;
-
-        static void Reflect(AZ::ReflectContext* context);
-    };
-
-    class AndroidSettings
-    {
-    public:
-        AZ_TYPE_INFO(AndroidSettings, "{5D57D014-4939-4D86-B862-AF35BAC705DC}");
-        AZ_CLASS_ALLOCATOR(AndroidSettings, AZ::SystemAllocator, 0);
-
-        AndroidSettings()
-            : m_packageName("")
-            , m_versionName("")
-            , m_versionNumber(1)
-            , m_orientation("landscape")
-            , m_appPublicKey("")
-            , m_appObfuscatorSalt("")
-            , m_rcPakJob("")
-            , m_rcObbJob("")
-            , m_useMainObb(false)
-            , m_usePatchObb(false)
-            , m_enableKeyScreenOn(false)
-            , m_disableImmersiveMode(false)
-            , m_icons()
-            , m_splashscreens()
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZStd::string m_packageName;
-        AZStd::string m_versionName;
-        int m_versionNumber;
-        AZStd::string m_orientation;
-        AZStd::string m_appPublicKey;
-        AZStd::string m_appObfuscatorSalt;
-        AZStd::string m_rcPakJob;
-        AZStd::string m_rcObbJob;
-        bool m_useMainObb;
-        bool m_usePatchObb;
-        bool m_enableKeyScreenOn;
-        bool m_disableImmersiveMode;
-        AndroidIcons m_icons;
-        AndroidSplashscreens m_splashscreens;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp
deleted file mode 100644
index 25b95bc368..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PlatformSettings_Base.h"
-
-#include "PlatformSettings_common.h"
-#include "Validators.h"
-
-namespace ProjectSettingsTool
-{
-    void BaseSettings::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            serialize->Class<BaseSettings>()
-                ->Version(2)
-                ->Field("project_name", &BaseSettings::m_projectName)
-                ->Field("product_name", &BaseSettings::m_productName)
-                ->Field("executable_name", &BaseSettings::m_executableName)
-                ->Field("project_path", &BaseSettings::m_projectPath)
-                ->Field("project_output_folder", &BaseSettings::m_projectOutputFolder)
-                ->Field("code_folder", &BaseSettings::m_codeFolder)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<BaseSettings>("Project Settings", "All core settings for the game project and package and deployment.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_projectName, "Project Name", "The name of the project.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProjectName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosBundleName)
-                    ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_productName, "Product Name", "The project's user facing name.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IsNotEmpty))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProductName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosDisplayName)
-                    ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_executableName, "Executable Name", "The project launcher's name.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::ExecutableName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosExecutableName)
-                    ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_projectPath, "Project Path", "The project root folder path .")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileNameOrEmpty))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProductName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::ExecutableName)
-                    ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_projectOutputFolder, "Output Folder", "The folder the packed project will be exported to.")
-                    ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_codeFolder, "Code Folder (legacy)", "A legacy setting specifing the folder for this project's code.")
-                ;
-            }
-        }
-    }
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Base.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Base.h
deleted file mode 100644
index 8773d78c9d..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Base.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Serialization/EditContext.h>
-
-namespace ProjectSettingsTool
-{
-    class BaseSettings
-    {
-    public:
-        AZ_TYPE_INFO(BaseSettings, "{3202E013-46EC-4E97-989A-84934CA15C59}");
-        AZ_CLASS_ALLOCATOR(BaseSettings, AZ::SystemAllocator, 0);
-
-        BaseSettings()
-            : m_projectName("")
-            , m_productName("")
-            , m_executableName("")
-            , m_projectPath("")
-            , m_sysDllGame("")
-            , m_projectOutputFolder("")
-            , m_codeFolder("")
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZStd::string m_projectName;
-        AZStd::string m_productName;
-        AZStd::string m_executableName;
-        AZStd::string m_projectPath;
-        AZStd::string m_sysDllGame;
-        AZStd::string m_projectOutputFolder;
-        AZStd::string m_codeFolder;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp
deleted file mode 100644
index bc54719f50..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PlatformSettings_Ios.h"
-
-#include "PlatformSettings_common.h"
-#include "Validators.h"
-
-namespace ProjectSettingsTool
-{
-    namespace Icons
-    {
-        static const char* appStore = "iOSAppStoreIcon1024x1024";
-        static const char* iphoneApp120 = "iPhoneAppIcon120x120";
-        static const char* iphoneApp180 = "iPhoneAppIcon180x180";
-        static const char* iphoneNotification40 = "iPhoneNotificationIcon40x40";
-        static const char* iphoneNotification60 = "iPhoneNotificationIcon60x60";
-        static const char* iphoneSettings58 = "iPhoneSettingsIcon58x58";
-        static const char* iphoneSettings87 = "iPhoneSettingsIcon87x87";
-        static const char* iphoneSpotlight80 = "iPhoneSpotlightIcon80x80";
-        static const char* iphoneSpotlight120 = "iPhoneSpotlightIcon120x120";
-        static const char* ipadApp76 = "iPadAppIcon76x76";
-        static const char* ipadApp152 = "iPadAppIcon152x152";
-        static const char* ipadProApp = "iPadProAppIcon167x167";
-        static const char* ipadNotification20 = "iPadNotificationIcon20x20";
-        static const char* ipadNotification40 = "iPadNotificationIcon40x40";
-        static const char* ipadSettings29 = "iPadSettingsIcon29x29";
-        static const char* ipadSettings58 = "iPadSettingsIcon58x58";
-        static const char* ipadSpotlight40 = "iPadSpotlightIcon40x40";
-        static const char* ipadSpotlight80 = "iPadSpotlightIcon80x80";
-    };
-
-    void IosIcons::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            serialize->Class<IosIcons>()
-                ->Version(1)
-                ->Field(Icons::appStore, &IosIcons::m_appStore)
-                ->Field(Icons::iphoneApp120, &IosIcons::m_iphoneApp120)
-                ->Field(Icons::iphoneApp180, &IosIcons::m_iphoneApp180)
-                ->Field(Icons::iphoneNotification40, &IosIcons::m_iphoneNotification40)
-                ->Field(Icons::iphoneNotification60, &IosIcons::m_iphoneNotification60)
-                ->Field(Icons::iphoneSettings58, &IosIcons::m_iphoneSettings58)
-                ->Field(Icons::iphoneSettings87, &IosIcons::m_iphoneSettings87)
-                ->Field(Icons::iphoneSpotlight80, &IosIcons::m_iphoneSpotlight80)
-                ->Field(Icons::iphoneSpotlight120, &IosIcons::m_iphoneSpotlight120)
-                ->Field(Icons::ipadApp76, &IosIcons::m_ipadApp76)
-                ->Field(Icons::ipadApp152, &IosIcons::m_ipadApp152)
-                ->Field(Icons::ipadProApp, &IosIcons::m_ipadProApp)
-                ->Field(Icons::ipadNotification20, &IosIcons::m_ipadNotification20)
-                ->Field(Icons::ipadNotification40, &IosIcons::m_ipadNotification40)
-                ->Field(Icons::ipadSettings29, &IosIcons::m_ipadSettings29)
-                ->Field(Icons::ipadSettings58, &IosIcons::m_ipadSettings58)
-                ->Field(Icons::ipadSpotlight40, &IosIcons::m_ipadSpotlight40)
-                ->Field(Icons::ipadSpotlight80, &IosIcons::m_ipadSpotlight80)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<IosIcons>("Icons", "All png icon overrides for iOS.")
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_appStore, "App Store (1024px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1024>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::appStore))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneApp120, "iPhone App (120px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<120>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneApp120))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneApp180, "iPhone App (180px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<180>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneApp180))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneNotification40, "iPhone Notification (40px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<40>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneNotification40))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneNotification60, "iPhone Notification (60px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<60>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneNotification60))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneSettings58, "iPhone Settings (58px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<58>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneSettings58))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneSettings87, "iPhone Settings (87px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<87>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneSettings87))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneSpotlight80, "iPhone Spotlight (80px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<80>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneSpotlight80))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_iphoneSpotlight120, "iPhone Spotlight (120px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<120>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::iphoneSpotlight120))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadApp76, "iPad App (76px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<76>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadApp76))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadApp152, "iPad App (152px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<152>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadApp152))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadProApp, "iPad Pro App (167px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<167>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadProApp))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadNotification20, "iPad Notification (20px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<20>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadNotification20))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadNotification40, "iPad Notification (40px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<40>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadNotification40))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadSettings29, "iPad Settings (29px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<29>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadSettings29))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadSettings58, "iPad Settings (58px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<58>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadSettings58))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadSpotlight40, "iPad Spotlight (40px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<40>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadSpotlight40))
-                    ->DataElement(Handlers::ImagePreview, &IosIcons::m_ipadSpotlight80, "iPad Spotlight (80px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<80>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosIcons, Icons::ipadSpotlight80))
-                ;
-            }
-        }
-    }
-
-    namespace Launchscreens
-    {
-        static const char* iphone640x960 = "iPhoneLaunchImage640x960";
-        static const char* iphone640x1136 = "iPhoneLaunchImage640x1136";
-        static const char* iphone750x1334 = "iPhoneLaunchImage750x1334";
-        static const char* iphone1125x2436 = "iPhoneLaunchImage1125x2436";
-        static const char* iphone2436x1125 = "iPhoneLaunchImage2436x1125";
-        static const char* iphone1242x2208 = "iPhoneLaunchImage1242x2208";
-        static const char* iphone2208x1242 = "iPhoneLaunchImage2208x1242";
-        static const char* ipad768x1024 = "iPadLaunchImage768x1024";
-        static const char* ipad1024x768 = "iPadLaunchImage1024x768";
-        static const char* ipad1536x2048 = "iPadLaunchImage1536x2048";
-        static const char* ipad2048x1536 = "iPadLaunchImage2048x1536";
-    } // namespace Launchscreens
-
-    void IosLaunchscreens::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            serialize->Class<IosLaunchscreens>()
-                ->Version(1)
-                ->Field(Launchscreens::iphone640x960, &IosLaunchscreens::m_iphone640x960)
-                ->Field(Launchscreens::iphone640x1136, &IosLaunchscreens::m_iphone640x1136)
-                ->Field(Launchscreens::iphone750x1334, &IosLaunchscreens::m_iphone750x1334)
-                ->Field(Launchscreens::iphone1125x2436, &IosLaunchscreens::m_iphone1125x2436)
-                ->Field(Launchscreens::iphone2436x1125, &IosLaunchscreens::m_iphone2436x1125)
-                ->Field(Launchscreens::iphone1242x2208, &IosLaunchscreens::m_iphone1242x2208)
-                ->Field(Launchscreens::iphone2208x1242, &IosLaunchscreens::m_iphone2208x1242)
-                ->Field(Launchscreens::ipad768x1024, &IosLaunchscreens::m_ipad768x1024)
-                ->Field(Launchscreens::ipad1024x768, &IosLaunchscreens::m_ipad1024x768)
-                ->Field(Launchscreens::ipad1536x2048, &IosLaunchscreens::m_ipad1536x2048)
-                ->Field(Launchscreens::ipad2048x1536, &IosLaunchscreens::m_ipad2048x1536)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<IosLaunchscreens>("Launchscreens", "All png launchscreen overrides for iOS.")
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone640x960, "iPhone (640x960px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<640, 960>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone640x960))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone640x1136, "iPhone (640x1136px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<640, 1136>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone640x1136))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone750x1334, "iPhone (750x1334px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<750, 1334>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone750x1334))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone1125x2436, "iPhone (1125x2436px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1125, 2436>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone1125x2436))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone2436x1125, "iPhone (2436x1125px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<2436, 1125>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone2436x1125))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone1242x2208, "iPhone (1242x2208px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1242, 2208>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone1242x2208))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_iphone2208x1242, "iPhone (2208x1242px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<2208, 1242>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::iphone2208x1242))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_ipad768x1024, "iPad (768x1024px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<768, 1024>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::ipad768x1024))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_ipad1024x768, "iPad (1024x768px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1024, 768>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::ipad1024x768))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_ipad1536x2048, "iPad (1536x2048px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<1536, 2048>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::ipad1536x2048))
-                    ->DataElement(Handlers::ImagePreview, &IosLaunchscreens::m_ipad2048x1536, "iPad (2048x1536px)", "")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PngImageSetSizeOrEmpty<2048, 1536>))
-                        ->Attribute(Attributes::DefaultPath, GenDefaultImagePath(ImageGroup::IosLaunchScreens, Launchscreens::ipad2048x1536))
-                ;
-            }
-        }
-    }
-
-    void IosOrientations::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            serialize->Class<IosOrientations>()
-                ->Version(1)
-                ->Field("UIInterfaceOrientationLandscapeRight", &IosOrientations::m_landscapeRight)
-                ->Field("UIInterfaceOrientationLandscapeLeft", &IosOrientations::m_landscapeLeft)
-                ->Field("UIInterfaceOrientationPortrait", &IosOrientations::m_portraitBottom)
-                ->Field("UIInterfaceOrientationPortraitUpsideDown", &IosOrientations::m_portraitTop)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<IosOrientations>("Orientations", "All supported orientations for iOS.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosOrientations::m_landscapeRight, "Landscape (right home button)", "Enable landscape orientation with home button on right side of device.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosOrientations::m_landscapeLeft, "Landscape (left home button)", "Enable landscape orientation with home button on left side of device.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosOrientations::m_portraitBottom, "Portrait (bottom home button)", "Enable portrait orientation with home button on bottom of device.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosOrientations::m_portraitTop, "Portrait (top home button)", "Enable portrait orientation with home button on top of device.")
-                ;
-            }
-        }
-    }
-
-    void IosSettings::Reflect(AZ::ReflectContext* context)
-    {
-        AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serialize)
-        {
-            IosOrientations::Reflect(context);
-            IosIcons::Reflect(context);
-            IosLaunchscreens::Reflect(context);
-
-            serialize->Class<IosSettings>()
-                ->Version(1)
-                ->Field("CFBundleName", &IosSettings::m_bundleName)
-                ->Field("CFBundleDisplayName", &IosSettings::m_bundleDisplayName)
-                ->Field("CFBundleExecutable", &IosSettings::m_executableName)
-                ->Field("CFBundleIdentifier", &IosSettings::m_bundleIdentifier)
-                ->Field("CFBundleShortVersionString", &IosSettings::m_versionName)
-                ->Field("CFBundleVersion", &IosSettings::m_versionNumber)
-                ->Field("CFBundleDevelopmentRegion", &IosSettings::m_developmentRegion)
-                ->Field("UIRequiresFullScreen", &IosSettings::m_requiresFullscreen)
-                ->Field("UIStatusBarHidden", &IosSettings::m_hideStatusBar)
-                ->Field("UISupportedInterfaceOrientations", &IosSettings::m_iphoneOrientations)
-                ->Field("UISupportedInterfaceOrientations~ipad", &IosSettings::m_ipadOrientations)
-                ->Field("icons", &IosSettings::m_icons)
-                ->Field("launchscreens", &IosSettings::m_launchscreens)
-            ;
-
-            AZ::EditContext* editContext = serialize->GetEditContext();
-            if (editContext)
-            {
-                editContext->Class<IosSettings>("Ios Settings", "All settings iOS settings.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleName, "Bundle Name", "The name of the bundle.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosBundleName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::ProjectName)
-                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleDisplayName, "Display Name", "The user visible name of the bundle.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IsNotEmpty))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosDisplayName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::ProductName)
-                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_executableName, "Executable Name", "Name of the bundle's executable file.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosExecutableName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::ExecutableName)
-                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleIdentifier, "Bundle Identifier", "Uniquely identifies the bundle. Should be in reverse-DNS format.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PackageName))
-                        ->Attribute(Attributes::LinkOptional, true)
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosBundleIdentifer)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::AndroidPackageName)
-                    ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_versionName, "Version Name", "The release version number string for the app. Displayed in the app store.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
-                        ->Attribute(Attributes::LinkOptional, true)
-                        ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosVersionName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::AndroidVersionName)
-                    ->DataElement(Handlers::QValidatedLineEdit, &IosSettings::m_versionNumber, "Version Number", "The build version number string for the bundle.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &IosSettings::m_developmentRegion, "Development Region", "The default language and region for the app.")
-                        ->Attribute(AZ::Edit::Attributes::StringList, AZStd::vector<AZStd::string>
-                        {
-                            "en_US",
-                            "en_CA",
-                            "fr_CA",
-                            "zh_CN",
-                            "fr_FR",
-                            "de_DE",
-                            "it_IT",
-                            "ja_JP",
-                            "ko_KR",
-                            "zh_TW",
-                            "en_GB"
-                        })
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_requiresFullscreen, "Requires Fullscreen", "Specifies whether the app is required to run in fullscreen mode.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_hideStatusBar, "Hide Status Bar", "Specifies whether the status bar is initially hidden when the app launches.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_iphoneOrientations, "iPhone Orientations", "Enable support for iPhone orientations.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_ipadOrientations, "iPad Orientations", "Enable support for iPad orientations.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_icons)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &IosSettings::m_launchscreens)
-                ;
-            }
-        }
-    }
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Ios.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Ios.h
deleted file mode 100644
index 6691842bf1..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Ios.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Serialization/EditContext.h>
-
-namespace ProjectSettingsTool
-{
-    class IosIcons
-    {
-    public:
-        AZ_TYPE_INFO(IosIcons, "{A57F9F23-36F5-4425-B40A-56D60119E5C9}");
-        AZ_CLASS_ALLOCATOR(IosIcons, AZ::SystemAllocator, 0);
-
-        IosIcons()
-            : m_appStore("")
-            , m_iphoneApp120("")
-            , m_iphoneApp180("")
-            , m_iphoneNotification40("")
-            , m_iphoneNotification60("")
-            , m_iphoneSettings58("")
-            , m_iphoneSettings87("")
-            , m_iphoneSpotlight80("")
-            , m_iphoneSpotlight120("")
-            , m_ipadApp76("")
-            , m_ipadApp152("")
-            , m_ipadProApp("")
-            , m_ipadNotification20("")
-            , m_ipadNotification40("")
-            , m_ipadSettings29("")
-            , m_ipadSettings58("")
-            , m_ipadSpotlight40("")
-            , m_ipadSpotlight80("")
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZStd::string m_appStore;
-        AZStd::string m_iphoneApp120;
-        AZStd::string m_iphoneApp180;
-        AZStd::string m_iphoneNotification40;
-        AZStd::string m_iphoneNotification60;
-        AZStd::string m_iphoneSettings58;
-        AZStd::string m_iphoneSettings87;
-        AZStd::string m_iphoneSpotlight80;
-        AZStd::string m_iphoneSpotlight120;
-        AZStd::string m_ipadApp76;
-        AZStd::string m_ipadApp152;
-        AZStd::string m_ipadProApp;
-        AZStd::string m_ipadNotification20;
-        AZStd::string m_ipadNotification40;
-        AZStd::string m_ipadSettings29;
-        AZStd::string m_ipadSettings58;
-        AZStd::string m_ipadSpotlight40;
-        AZStd::string m_ipadSpotlight80;
-    };
-
-    class IosLaunchscreens
-    {
-    public:
-        AZ_TYPE_INFO(IosLaunchscreens, "{1A34706F-9558-4081-9898-33758B026629}");
-        AZ_CLASS_ALLOCATOR(IosLaunchscreens, AZ::SystemAllocator, 0);
-
-        IosLaunchscreens()
-            : m_iphone640x960("")
-            , m_iphone640x1136("")
-            , m_iphone750x1334("")
-            , m_iphone1125x2436("")
-            , m_iphone2436x1125("")
-            , m_iphone1242x2208("")
-            , m_iphone2208x1242("")
-            , m_ipad768x1024("")
-            , m_ipad1024x768("")
-            , m_ipad1536x2048("")
-            , m_ipad2048x1536("")
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZStd::string m_iphone640x960;
-        AZStd::string m_iphone640x1136;
-        AZStd::string m_iphone750x1334;
-        AZStd::string m_iphone1125x2436;
-        AZStd::string m_iphone2436x1125;
-        AZStd::string m_iphone1242x2208;
-        AZStd::string m_iphone2208x1242;
-        AZStd::string m_ipad768x1024;
-        AZStd::string m_ipad1024x768;
-        AZStd::string m_ipad1536x2048;
-        AZStd::string m_ipad2048x1536;
-    };
-
-    class IosOrientations
-    {
-    public:
-        AZ_TYPE_INFO(IosOrientations, "{A42CDF2E-CCE1-4D93-9D4E-2270CFC0F2ED}");
-        AZ_CLASS_ALLOCATOR(IosOrientations, AZ::SystemAllocator, 0);
-
-        IosOrientations()
-            : m_landscapeRight(false)
-            , m_landscapeLeft(false)
-            , m_portraitBottom(false)
-            , m_portraitTop(false)
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        bool m_landscapeRight;
-        bool m_landscapeLeft;
-        bool m_portraitBottom;
-        bool m_portraitTop;
-    };
-
-    class IosSettings
-    {
-    public:
-        AZ_TYPE_INFO(IosSettings, "{9EDF051E-0158-4ADE-92A3-B7AC230E0114}");
-        AZ_CLASS_ALLOCATOR(IosSettings, AZ::SystemAllocator, 0);
-
-        IosSettings()
-            : m_bundleName("")
-            , m_bundleDisplayName("")
-            , m_executableName("")
-            , m_bundleIdentifier("com.amazon.o3de.UnknownProject")
-            , m_versionName("1.0.0")
-            , m_versionNumber("1.0.0")
-            , m_developmentRegion("en_US")
-            , m_requiresFullscreen(false)
-            , m_hideStatusBar(false)
-            , m_iphoneOrientations()
-            , m_ipadOrientations()
-            , m_icons()
-            , m_launchscreens()
-        {}
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        AZStd::string m_bundleName;
-        AZStd::string m_bundleDisplayName;
-        AZStd::string m_executableName;
-        AZStd::string m_bundleIdentifier;
-        AZStd::string m_versionName;
-        AZStd::string m_versionNumber;
-        AZStd::string m_developmentRegion;
-        bool m_requiresFullscreen;
-        bool m_hideStatusBar;
-        IosOrientations m_iphoneOrientations;
-        IosOrientations m_ipadOrientations;
-        IosIcons m_icons;
-        IosLaunchscreens m_launchscreens;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_common.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_common.h
deleted file mode 100644
index 266655aa1b..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_common.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Math/Crc.h>
-
-#include "Utils.h"
-
-namespace ProjectSettingsTool
-{
-    namespace Attributes
-    {
-        static const AZ::Crc32 FuncValidator = AZ_CRC("FuncValidator");
-        static const AZ::Crc32 SelectFunction = AZ_CRC("SelectFunction");
-        static const AZ::Crc32 LinkOptional = AZ_CRC("LinkOptional");
-        static const AZ::Crc32 Obfuscated = AZ_CRC("ObfuscatedText");
-        // Used as a tooltip and for distinguising linked properties
-        static const AZ::Crc32 PropertyIdentfier = AZ_CRC("PropertyIdentfier");
-        static const AZ::Crc32 LinkedProperty = AZ_CRC("LinkedProperty");
-        static const AZ::Crc32 DefaultPath = AZ_CRC("DefaultPath");
-        static const AZ::Crc32 DefaultImagePreview = AZ_CRC("DefaultImagePreview");
-        static const AZ::Crc32 ObfuscatedText = AZ_CRC("ObfuscatedText");
-        static const AZ::Crc32 ClearButton = AZ_CRC("ClearButton");
-        static const AZ::Crc32 RemovableReadOnly = AZ_CRC("RemovableReadOnly");
-    } // namespace Attributes
-
-    namespace Handlers
-    {
-        static const AZ::Crc32 ImagePreview = AZ_CRC("ImagePreview");
-        static const AZ::Crc32 LinkedLineEdit = AZ_CRC("LinkedLineEdit");
-        static const AZ::Crc32 FileSelect = AZ_CRC("FileSelect");
-        static const AZ::Crc32 QValidatedLineEdit = AZ_CRC("QValLineEdit");
-        static const AZ::Crc32 QValidatedBrowseEdit = AZ_CRC("QValBrowseEdit");
-    } // namespace Handlers
-
-    namespace Identfiers
-    {
-        static const char* ProjectName = "Base - Project Name";
-        static const char* ProductName = "Base - Product Name";
-        static const char* ExecutableName = "Base - Executable Name";
-
-        static const char* AndroidPackageName = "Android - Package Name";
-        static const char* AndroidVersionName = "Android - Version Name";
-        static const char* AndroidIconDefault = "Android - Icon Default";
-        static const char* AndroidLandDefault = "Android - Land Default";
-        static const char* AndroidPortDefault = "Android - Port Default";
-
-        static const char* IosBundleName = "iOS - Bundle Name";
-        static const char* IosDisplayName = "iOS - Display Name";
-        static const char* IosExecutableName = "iOS - Executable Name";
-        static const char* IosBundleIdentifer = "iOS - Bundle Identifer";
-        static const char* IosVersionName = "iOS - Version Name";
-    } // namespace Identfiers
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/Platforms.h b/Code/Sandbox/Plugins/ProjectSettingsTool/Platforms.h
deleted file mode 100644
index cfa3e8a633..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/Platforms.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-namespace ProjectSettingsTool
-{
-    enum class PlatformId
-    {
-        Base,
-        Android,
-        Ios,
-
-        NumPlatformIds
-    };
-
-    enum class PlatformDataType
-    {
-        ProjectJson,
-        Plist,
-
-        NumPlatformDataTypes
-    };
-
-    struct Platform
-    {
-        PlatformId m_id;
-        PlatformDataType m_type;
-    };
-
-    const Platform Platforms[static_cast<unsigned>(PlatformId::NumPlatformIds)]
-    {
-        Platform{ PlatformId::Base, PlatformDataType::ProjectJson },
-        Platform{ PlatformId::Android, PlatformDataType::ProjectJson },
-        Platform{ PlatformId::Ios, PlatformDataType::Plist }
-    };
-    
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlistDictionary.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PlistDictionary.cpp
deleted file mode 100644
index bc54d0703b..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlistDictionary.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PlistDictionary.h"
-
-
-namespace ProjectSettingsTool
-{
-    using namespace AZ;
-    using XmlDocument = rapidxml::xml_document<char>;
-    using XmlNode = rapidxml::xml_node<char>;
-
-    PlistDictionary::PlistDictionary(XmlDocument* plist)
-        : m_document(plist)
-        , m_dict(plist->first_node("plist")->first_node("dict"))
-    {
-    }
-
-    XmlNode* PlistDictionary::MakeNode(const char* name, const char* value)
-    {
-        return m_document->allocate_node
-        (
-            rapidxml::node_element,
-            m_document->allocate_string(name),
-            m_document->allocate_string(value)
-        );
-    }
-
-    XmlNode* PlistDictionary::MakeNode()
-    {
-        return m_document->allocate_node(rapidxml::node_element);
-    }
-
-    XmlNode* PlistDictionary::GetPropertyKeyNode(const char* key)
-    {
-        XmlNode* keyNode = m_dict->first_node("key");
-        // Look for the key in pList's interesting structure
-        while (keyNode)
-        {
-            if (strcmp(keyNode->value(), key) == 0)
-            {
-                break;
-            }
-
-            keyNode = keyNode->next_sibling("key");
-        }
-
-        // Returns key if found otherwise nullptr
-        return keyNode;
-    }
-
-    XmlNode* PlistDictionary::GetPropertyValueNode(const char* key)
-    {
-        XmlNode* keyNode = GetPropertyKeyNode(key);
-
-        // Key found return data node
-        if (keyNode != nullptr)
-        {
-            return keyNode->next_sibling();
-        }
-        // Failed to find key return nullptr
-         return nullptr;
-    }
-
-    XmlNode* PlistDictionary::AddProperty(const char* key)
-    {
-        m_dict->append_node(MakeNode("key", key));
-        XmlNode* data = MakeNode();
-        m_dict->append_node(data);
-        return data;
-    }
-
-    void PlistDictionary::RemoveProperty(const char* key)
-    {
-        XmlNode* keyNode = GetPropertyKeyNode(key);
-
-        if (keyNode != nullptr)
-        {
-            XmlNode* dataNode = keyNode->next_sibling();
-
-            m_dict->remove_node(keyNode);
-            m_dict->remove_node(dataNode);
-        }
-    }
-
-    const char* PlistDictionary::GetPropertyValue(const char* key)
-    {
-        XmlNode* valueNode = GetPropertyValueNode(key);
-        return valueNode != nullptr ? GetPropertyValue(valueNode) : nullptr;
-    }
-
-    const char* PlistDictionary::GetPropertyValue(XmlNode* node)
-    {
-        return node->value_size() > 0 ? node->value() : nullptr;
-    }
-
-    const char* PlistDictionary::GetPropertyValueName(const char* key)
-    {
-        XmlNode* valueNode = GetPropertyValueNode(key);
-        return valueNode != nullptr ? GetPropertyValueName(valueNode) : nullptr;
-    }
-
-    const char* PlistDictionary::GetPropertyValueName(XmlNode* node)
-    {
-        return node->name_size() > 0 ? node->name() : nullptr;
-    }
-
-    XmlNode* PlistDictionary::SetPropertyValue(const char* key, const char* newValue)
-    {
-        XmlNode* dataNode = GetPropertyValueNode(key);
-        if (dataNode == nullptr)
-        {
-            dataNode = AddProperty(key);
-            SetPropertyValueName(dataNode, "string");
-        }
-        SetPropertyValue(dataNode, newValue);
-
-        return dataNode;
-    }
-
-    void PlistDictionary::SetPropertyValue(XmlNode* node, const char* newValue)
-    {
-        node->value(m_document->allocate_string(newValue));
-    }
-
-    XmlNode* PlistDictionary::SetPropertyValueName(const char* key, const char* newName)
-    {
-        XmlNode* dataNode = GetPropertyValueNode(key);
-        if (dataNode == nullptr)
-        {
-            dataNode = AddProperty(key);
-        }
-        SetPropertyValueName(dataNode, newName);
-
-        return dataNode;
-    }
-
-    void PlistDictionary::SetPropertyValueName(XmlNode* node, const char* newName)
-    {
-        node->name(m_document->allocate_string(newName));
-    }
-
-    bool PlistDictionary::ContainsValidDict(XmlDocument* plist)
-    {
-        XmlNode* node = plist->first_node("plist");
-        if (node != nullptr)
-        {
-            node = node->first_node("dict");
-            if (node != nullptr)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PlistDictionary.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PlistDictionary.h
deleted file mode 100644
index ceea9416fb..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PlistDictionary.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/XML/rapidxml.h>
-
-namespace ProjectSettingsTool
-{
-    // Wraps a plist dict node with a friendly api to allow lookups and other actions in it
-    class PlistDictionary
-    {
-    public:
-        // Constructs the dictionary wrapper
-        PlistDictionary(AZ::rapidxml::xml_document<char>* plist);
-
-        // Allocates a new node with given name and value
-        AZ::rapidxml::xml_node<char>* MakeNode(const char* name, const char* value);
-        AZ::rapidxml::xml_node<char>* MakeNode();
-
-        // Returns pointer to property data node
-        AZ::rapidxml::xml_node<char>* GetPropertyValueNode(const char* key);
-
-        // Creates a new property and returns pointer to its value node
-        AZ::rapidxml::xml_node<char>* AddProperty(const char* key);
-        // Removes property from dictionary
-        void RemoveProperty(const char* key);
-
-        // Returns pointer to property data value or nullptr if it is empty
-        const char* GetPropertyValue(const char* key);
-        const char* GetPropertyValue(AZ::rapidxml::xml_node<char>* node);
-
-        // Returns pointer to property data name or nullptr if it is empty
-        const char* GetPropertyValueName(const char* key);
-        const char* GetPropertyValueName(AZ::rapidxml::xml_node<char>* node);
-
-        // Changes value of property data and creates it if it doesn't exist
-        AZ::rapidxml::xml_node<char>* SetPropertyValue(const char* key, const char* newValue);
-        void SetPropertyValue(AZ::rapidxml::xml_node<char>* node, const char* newValue);
-
-        // Changes name of property data and creates it if it doesn't exist
-        AZ::rapidxml::xml_node<char>* SetPropertyValueName(const char* key, const char* newName);
-        void SetPropertyValueName(AZ::rapidxml::xml_node<char>* node, const char* newName);
-
-        // Checks to make sure a plist file has a valid dictionary
-        static bool ContainsValidDict(AZ::rapidxml::xml_document<char>* plist);
-
-    protected:
-        // Returns pointer to property key node
-        AZ::rapidxml::xml_node<char>* GetPropertyKeyNode(const char* key);
-
-
-        // pList dictionary is found in
-        AZ::rapidxml::xml_document<char>* m_document;
-        // The dictionary of properties
-        AZ::rapidxml::xml_node<char>* m_dict;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp
deleted file mode 100644
index b2d354a91c..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "ProjectSettingsContainer.h"
-
-#include <AzCore/JSON/prettywriter.h>
-#include <AzCore/JSON/stringbuffer.h>
-#include <AzCore/XML/rapidxml_print.h>
-
-#include <Util/FileUtil.h>
-
-namespace ProjectSettingsTool
-{
-    using namespace AZ;
-    using StringOutcome = Outcome<void, AZStd::string>;
-    using XmlDocument = rapidxml::xml_document<char>;
-    using XmlNode = rapidxml::xml_node<char>;
-
-    const int xmlFlags = rapidxml::parse_doctype_node | rapidxml::parse_declaration_node | rapidxml::parse_no_data_nodes;
-
-    SettingsError::SettingsError(const AZStd::string& error, const AZStd::string& reason)
-    {
-        m_error = error;
-        m_reason = reason;
-    }
-
-    StringOutcome WriteConfigFile(const AZStd::string& fileName, const AZStd::string& fileContents)
-    {
-        using AZ::IO::SystemFile;
-        const char* filePath = fileName.c_str();
-
-        // Attempt to make file writable or check it out in source control
-        if (CFileUtil::OverwriteFile(filePath))
-        {
-            if (!CFileUtil::CreateDirectory(fileName.substr(0, fileName.find_last_of('/')).data()))
-            {
-                return AZ::Failure(AZStd::string::format("Could not create the directory for file \"%s\".", filePath));
-            }
-
-            SystemFile settingsFile;
-            if (!settingsFile.Open(filePath, SystemFile::SF_OPEN_WRITE_ONLY | SystemFile::SF_OPEN_CREATE))
-            {
-                return AZ::Failure(AZStd::string::format("Failed to open settings file %s for write.", filePath));
-            }
-
-            if (settingsFile.Write(fileContents.c_str(), fileContents.size()) != fileContents.size())
-            {
-                return AZ::Failure(AZStd::string::format("Failed to write to file %s.", filePath));
-            }
-
-
-            settingsFile.Close();
-            return AZ::Success();
-        }
-
-        return AZ::Failure(AZStd::string::format("Could not check out or make file writable: \"%s\".", filePath));
-    }
-
-    StringOutcome ReadConfigFile(const AZStd::string& fileName, AZStd::string& fileContents)
-    {
-        using AZ::IO::SystemFile;
-        const char* filePath = fileName.c_str();
-
-        if (!SystemFile::Exists(filePath))
-        {
-            return AZ::Failure(AZStd::string::format("%s file doesn't exist.", filePath));
-        }
-
-        SystemFile settingsFile;
-        if (!settingsFile.Open(filePath, SystemFile::SF_OPEN_READ_ONLY))
-        {
-            return AZ::Failure(AZStd::string::format("Failed to open settings file %s.", filePath));
-        }
-
-        fileContents = AZStd::string(settingsFile.Length(), '\0');
-        settingsFile.Read(fileContents.size(), fileContents.data());
-
-        settingsFile.Close();
-        return AZ::Success();
-    }
-
-
-    ProjectSettingsContainer::ProjectSettingsContainer(const AZStd::string& projectJsonFileName, PlistInitVector& plistPaths)
-        : m_projectJson(JsonSettings{ projectJsonFileName, "", AZStd::make_unique<rapidjson::Document>() })
-    {
-        LoadProjectJsonData();
-
-        for (PlatformAndPath& plistInfo : plistPaths)
-        {
-            m_pListsMap.insert(AZStd::pair<PlatformId, PlistSettings>(
-                plistInfo.first,
-                PlistSettings{ plistInfo.second, "", AZStd::make_unique<XmlDocument>() }));
-
-            // We will have to find it then because unique_ptrs are not copy constructible
-            // And a move constructor would copy large strings
-            LoadPlist(m_pListsMap.find(plistInfo.first)->second);
-        }
-    }
-
-    ProjectSettingsContainer::~ProjectSettingsContainer()
-    {
-    }
-
-    ProjectSettingsContainer::PlistSettings* ProjectSettingsContainer::GetPlistSettingsForPlatform(const Platform& plat)
-    {
-        PlistSettings* result = nullptr;
-
-        if (plat.m_type == PlatformDataType::Plist)
-        {
-            auto iter = m_pListsMap.find(plat.m_id);
-
-            if (iter != m_pListsMap.end())
-            {
-                result = &iter->second;
-            }
-            else
-            {
-                AZ_Assert(false, "Failed to find pList for platform.");
-            }
-        }
-
-        return result;
-    }
-
-    bool ProjectSettingsContainer::IsPlistPlatform(const Platform& plat)
-    {
-        if (plat.m_type == PlatformDataType::Plist)
-        {
-            auto iter = m_pListsMap.find(plat.m_id);
-
-            if (iter != m_pListsMap.end())
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    AZ::Outcome<void, SettingsError> ProjectSettingsContainer::GetError()
-    {
-        if (!m_errors.empty())
-        {
-            SettingsError error = m_errors.front();
-            m_errors.pop();
-
-            return AZ::Failure(error);
-        }
-        return AZ::Success();
-    }
-
-    void ProjectSettingsContainer::SavePlatformData(const Platform& plat)
-    {
-        PlistSettings* plistSettings = GetPlistSettingsForPlatform(plat);
-        if (plistSettings != nullptr)
-        {
-            SavePlist(*plistSettings);
-        }
-        else
-        {
-            SaveProjectJsonData();
-        }
-    }
-
-    void ProjectSettingsContainer::SaveProjectJsonData()
-    {
-        // Needed to write a document out to a string
-        rapidjson::StringBuffer jsonDataBuffer;
-        // Use pretty writer so it can be read easier
-        rapidjson::PrettyWriter<rapidjson::StringBuffer> jsonDatawriter(jsonDataBuffer);
-
-        m_projectJson.m_document->Accept(jsonDatawriter);
-        const AZStd::string jsonDataString = jsonDataBuffer.GetString();
-
-        StringOutcome outcome = WriteConfigFile(m_projectJson.m_path, jsonDataString);
-
-        if (!outcome.IsSuccess())
-        {
-            m_errors.push(SettingsError("Failed to save project.json", outcome.GetError()));
-        }
-    }
-
-    void ProjectSettingsContainer::ReloadProjectJsonData()
-    {
-        m_projectJson.m_document.reset(new rapidjson::Document);
-        LoadProjectJsonData();
-    }
-
-    void ProjectSettingsContainer::SavePlistsData()
-    {
-        for (AZStd::pair<PlatformId, PlistSettings>& plist : m_pListsMap)
-        {
-            LoadPlist(plist.second);
-        }
-    }
-
-    void ProjectSettingsContainer::SavePlistData(const Platform& plat)
-    {
-        PlistSettings* settings = GetPlistSettingsForPlatform(plat);
-        if (settings != nullptr)
-        {
-            SavePlist(*settings);
-        }
-    }
-
-    void ProjectSettingsContainer::ReloadPlistData()
-    {
-        for (AZStd::pair<PlatformId, PlistSettings>& plist : m_pListsMap)
-        {
-            PlistSettings& plistSettings = plist.second;
-
-            plistSettings.m_document.reset(new XmlDocument());
-            LoadPlist(plistSettings);
-        }
-    }
-
-    rapidjson::Document& ProjectSettingsContainer::GetProjectJsonDocument()
-    {
-        return *m_projectJson.m_document.get();
-    }
-
-    AZ::Outcome<rapidjson::Value*, void> ProjectSettingsContainer::GetProjectJsonValue(const char* key)
-    {
-        // Try to find member
-        rapidjson::Document& settings = *m_projectJson.m_document;
-        rapidjson::Value::MemberIterator memberIterator = settings.FindMember(key);
-        if (memberIterator != settings.MemberEnd())
-        {
-            return AZ::Success(&memberIterator->value);
-        }
-        else
-        {
-            settings.AddMember(rapidjson::Value(key, settings.GetAllocator()),
-                rapidjson::Value(rapidjson::kNullType), settings.GetAllocator());
-            return AZ::Success(&settings.FindMember(key)->value);
-        }
-    }
-
-    AZStd::unique_ptr<PlistDictionary> ProjectSettingsContainer::GetPlistDictionary(const Platform& plat)
-    {
-        if (plat.m_type == PlatformDataType::Plist)
-        {
-            PlistSettings* settings = GetPlistSettingsForPlatform(plat);
-            if (settings != nullptr)
-            {
-
-                if (PlistDictionary::ContainsValidDict(settings->m_document.get()))
-                {
-                    return AZStd::make_unique<PlistDictionary>(settings->m_document.get());
-                }
-                else
-                {
-                    //TODO: Query user if they would like to remake a valid plist then do it
-                    AZStd::string platformName;
-                    switch (plat.m_id)
-                    {
-                    case PlatformId::Ios:
-                        platformName = "iOS";
-                        break;
-                    default:
-                        platformName = "unknown";
-                        break;
-                    }
-                    AZ_Assert(false, "%s pList is in invalid state.", platformName.c_str());
-                    return nullptr;
-                }
-            }
-        }
-        
-        AZ_Assert(false, "This platform does not use pLists to store data.");
-        return nullptr;
-    }
-
-    rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>& ProjectSettingsContainer::GetProjectJsonAllocator()
-    {
-        return m_projectJson.m_document->GetAllocator();
-    }
-
-    const char* ProjectSettingsContainer::GetFailedLoadingPlistText()
-    {   
-        return "Failed to load info.plist"; 
-    }
-
-    void ProjectSettingsContainer::LoadProjectJsonData()
-    {
-        StringOutcome outcome = ReadConfigFile(m_projectJson.m_path, m_projectJson.m_rawData);
-        if (!outcome.IsSuccess())
-        {
-            m_errors.push(SettingsError("Failed to load project.json", outcome.GetError()));
-        }
-
-        m_projectJson.m_document->Parse(m_projectJson.m_rawData.c_str());
-    }
-
-    // Loads info.plist for iOS from disk
-    void ProjectSettingsContainer::LoadPlist(PlistSettings& plistSettings)
-    {
-        StringOutcome outcome = ReadConfigFile(plistSettings.m_path, plistSettings.m_rawData);
-        if (!outcome.IsSuccess())
-        {
-            m_errors.push(SettingsError(GetFailedLoadingPlistText(), outcome.GetError()));
-        }
-
-        plistSettings.m_document->parse<xmlFlags>(plistSettings.m_rawData.data());
-    }
-
-    void ProjectSettingsContainer::SavePlist(PlistSettings& plistSettings)
-    {
-        // Needed to write a document out to a string
-        AZStd::string xmlDocString;
-        rapidxml::print(std::back_inserter(xmlDocString), *plistSettings.m_document);
-
-        StringOutcome outcome = WriteConfigFile(plistSettings.m_path, xmlDocString);
-
-        if (!outcome.IsSuccess())
-        {
-            m_errors.push(SettingsError("Failed to save info.pList", outcome.GetError()));
-        }
-    }
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h
deleted file mode 100644
index feadafbba0..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "Platforms.h"
-#include "PlistDictionary.h"
-
-#include <AzCore/JSON/document.h>
-#include <AzCore/Outcome/Outcome.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/std/string/string.h>
-
-#include <AzFramework/StringFunc/StringFunc.h>
-
-
-namespace ProjectSettingsTool
-{
-
-    struct SettingsError
-    {
-        SettingsError(const AZStd::string& error, const AZStd::string& reason);
-
-        // The error that occurred
-        AZStd::string m_error;
-        // The reason the error occurred
-        AZStd::string m_reason;
-    };
-
-    // Loads, saves, and provides access to all of the project settings files
-    class ProjectSettingsContainer
-    {
-    public:
-        typedef AZStd::pair<PlatformId, AZStd::string> PlatformAndPath;
-        typedef AZStd::vector<PlatformAndPath> PlistInitVector;
-
-        template<class DocType>
-        struct PlatformSettings
-        {
-            // File path to document
-            AZStd::string m_path;
-            // Raw string loaded from file
-            AZStd::string m_rawData;
-            // The document itself
-            AZStd::unique_ptr<DocType> m_document;
-
-        };
-
-        using JsonSettings = PlatformSettings<rapidjson::Document>;
-        using PlistSettings = PlatformSettings<AZ::rapidxml::xml_document<char>>;
-
-        // Constructs the main manager of a document
-        ProjectSettingsContainer(const AZStd::string& projectJsonFileName, PlistInitVector& plistPaths);
-
-        // Used to destroy valueDoesNotExist
-        ~ProjectSettingsContainer();
-
-        // Returns the PlistSettings for given platform
-        PlistSettings* GetPlistSettingsForPlatform(const Platform& plat);
-        // Returns true if PlistSettings are found for platform
-        bool IsPlistPlatform(const Platform& plat);
-
-        // Gets the earliest error not seen
-        AZ::Outcome<void, SettingsError> GetError();
-        // Save settings for given platform
-        void SavePlatformData(const Platform& plat);
-        // Saves project.json to disk
-        void SaveProjectJsonData();
-        // Reloads Project.json from disk
-        void ReloadProjectJsonData();
-        // Save all pLists back to disk
-        void SavePlistsData();
-        // Save platform's plist data back to disk
-        void SavePlistData(const Platform& plat);
-        // Reloads all plists from disk
-        void ReloadPlistData();
-        // Returns a reference to the project.json Document
-        rapidjson::Document& GetProjectJsonDocument();
-        // Gets reference to value in project.json
-        // returns null type if not found
-        AZ::Outcome<rapidjson::Value*, void> GetProjectJsonValue(const char* key);
-
-        AZStd::unique_ptr<PlistDictionary> GetPlistDictionary(const Platform& plat);
-
-        // Returns the allocator used by ProjectJson
-        rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>& GetProjectJsonAllocator();
-
-        static const char* GetFailedLoadingPlistText();
-
-
-    protected:
-        // Loads project.json from disk
-        void LoadProjectJsonData();
-        // Loads info.plist from filePath into given document
-        void LoadPlist(PlistSettings& plistSettings);
-        void SavePlist(PlistSettings& plistSettings);
-
-        // Errors that have occurred
-        AZStd::queue<SettingsError> m_errors;
-        // The project.json document
-        JsonSettings m_projectJson;
-        // A map to all of the loaded pLists
-        AZStd::unordered_map<PlatformId, PlistSettings> m_pListsMap;
-
-
-    private:
-        AZ_DISABLE_COPY_MOVE(ProjectSettingsContainer);
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp
deleted file mode 100644
index 9110a7e826..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "ProjectSettingsSerialization.h"
-
-#include "PlatformSettings_common.h"
-
-#include <AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-
-// Needed to overwrite ios icons and launchscreens
-#include <Util/FileUtil.h>
-
-namespace ProjectSettingsTool
-{
-    using XmlNode = AZ::rapidxml::xml_node<char>;
-
-    const char* stringStr = "string";
-    const char* arrayStr = "array";
-    const char* trueStr = "true";
-    const char* noDocumentError = "No json or xml document to use for Project Settings Tool serialization.";
-
-    Serializer::Serializer(AzToolsFramework::InstanceDataNode* root)
-        : m_root(root)
-        , m_jsonDoc(nullptr)
-        , m_jsonRoot(nullptr)
-        , m_idString(AZ::SerializeTypeInfo<AZStd::string>::GetUuid())
-        , m_idInt(AZ::SerializeTypeInfo<int>::GetUuid())
-        , m_idBool(AZ::SerializeTypeInfo<bool>::GetUuid())
-    {}
-
-    Serializer::Serializer(AzToolsFramework::InstanceDataNode* root, rapidjson::Document* doc, rapidjson::Value* jsonRoot)
-        : Serializer(root)
-    {
-        SetDocumentRoot(doc);
-        if (jsonRoot != nullptr)
-        {
-            SetJsonRoot(jsonRoot);
-        }
-        else
-        {
-            SetJsonRoot(doc);
-        }
-    }
-
-    Serializer::Serializer(AzToolsFramework::InstanceDataNode* root, AZStd::unique_ptr<PlistDictionary> dict)
-        : Serializer(root)
-    {
-        SetDocumentRoot(AZStd::move(dict));
-    }
-
-    void Serializer::SetDocumentRoot(rapidjson::Document* doc)
-    {
-        m_jsonDoc = doc;
-    }
-
-    void Serializer::SetJsonRoot(rapidjson::Value* jsonRoot)
-    {
-        m_jsonRoot = jsonRoot;
-    }
-
-    void Serializer::SetDocumentRoot(AZStd::unique_ptr<PlistDictionary> dict)
-    {
-        m_plistDict = AZStd::move(dict);
-    }
-
-    bool Serializer::UiEqualToSettings() const
-    {
-        if (m_jsonRoot != nullptr)
-        {
-            return UiEqualToJson(m_jsonRoot);
-        }
-        else if (m_plistDict)
-        {
-            return UiEqualToPlist(m_root);
-        }
-        else
-        {
-            AZ_Assert(false, noDocumentError);
-            return false;
-        }
-    }
-
-    void Serializer::LoadFromSettings()
-    {
-        if (m_jsonRoot != nullptr)
-        {
-            LoadFromSettings(m_jsonRoot);
-        }
-        else if (m_plistDict)
-        {
-            LoadFromSettings(m_root);
-        }
-        else
-        {
-            AZ_Assert(false, noDocumentError);
-        }
-    }
-
-    void Serializer::SaveToSettings()
-    {
-        if (m_jsonRoot != nullptr)
-        {
-            SaveToSettings(m_jsonRoot);
-        }
-        else if (m_plistDict)
-        {
-            SaveToSettings(m_root);
-        }
-        else
-        {
-            AZ_Assert(false, noDocumentError);
-        }
-    }
-
-    bool Serializer::UiEqualToJson(rapidjson::Value* root) const
-    {
-        return UiEqualToJson(root, m_root);
-    }
-
-    void Serializer::LoadFromSettings(rapidjson::Value* root)
-    {
-        LoadFromSettings(root, m_root);
-    }
-
-    void Serializer::SaveToSettings(rapidjson::Value* root)
-    {
-        // This value needs to be an object to add members
-        if (!root->IsObject())
-        {
-            root->SetObject();
-        }
-        SaveToSettings(root, m_root);
-    }
-
-    bool Serializer::UiEqualToJson(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node) const
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                auto childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    bool noDocElement = true;
-                    rapidjson::Value::MemberIterator jsonMember;
-                    const char* propertyName = childMeta->m_name;
-
-                    // If there is a json object try to find the member
-                    if (root != nullptr)
-                    {
-                        jsonMember = root->FindMember(propertyName);
-
-                        if (jsonMember != root->MemberEnd())
-                        {
-                            noDocElement = false;
-                        }
-                    }
-
-                    AZ::Uuid type = childMeta->m_typeId;
-                    if (m_idString == type)
-                    {
-                        AZStd::string uiValue;
-                        childNode.Read(uiValue);
-
-                        if (!uiValue.empty() && !noDocElement)
-                        {
-                            if (jsonMember->value.IsString())
-                            {
-                                if (uiValue != jsonMember->value.GetString())
-                                {
-                                    return false;
-                                }
-                            }
-                            else
-                            {
-                                return false;
-                            }
-                        }
-                        else if (uiValue.empty() != noDocElement)
-                        {
-                            return false;
-                        }
-                    }
-                    else if (m_idInt == type)
-                    {
-                        int uiValue;
-                        childNode.Read(uiValue);
-
-                        if (!noDocElement)
-                        {
-                            if (jsonMember->value.IsInt())
-                            {
-                                if (uiValue != jsonMember->value.GetInt())
-                                {
-                                    return false;
-                                }
-                            }
-                            else
-                            {
-                                return false;
-                            }
-                        }
-                        else
-                        {
-                            return false;
-                        }
-                    }
-                    else if (m_idBool == type)
-                    {
-                        bool uiValue;
-                        childNode.Read(uiValue);
-
-                        if (uiValue)
-                        {
-                            if (!noDocElement)
-                            {
-                                if (jsonMember->value.IsString())
-                                {
-                                    AZStd::string expectedJsonValue = trueStr;
-                                    if (expectedJsonValue != jsonMember->value.GetString())
-                                    {
-                                        return false;
-                                    }
-                                }
-                                else
-                                {
-                                    return false;
-                                }
-                            }
-                            else
-                            {
-                                return false;
-                            }
-                        }
-                        else if (!noDocElement)
-                        {
-                            return false;
-                        }
-                    }
-                    // Should be a class with members instead of base data type
-                    else
-                    {
-                        rapidjson::Value* jsonNode = nullptr;
-                        if (!noDocElement)
-                        {
-                            jsonNode = &jsonMember->value;
-                        }
-                        // Drill into class
-                        if (!UiEqualToJson(jsonNode, &childNode))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool Serializer::UiEqualToPlist(AzToolsFramework::InstanceDataNode* node) const
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                auto childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    bool noDocElement = true;
-                    const char* propertyName = childMeta->m_name;
-                    XmlNode* plistNode = m_plistDict->GetPropertyValueNode(propertyName);
-
-                    if (plistNode != nullptr)
-                    {
-                        noDocElement = false;
-                    }
-
-                    AZ::Uuid type = childMeta->m_typeId;
-                    if (m_idString == type)
-                    {
-                        AZStd::string uiValue;
-                        childNode.Read(uiValue);
-
-                        if (!uiValue.empty() && !noDocElement)
-                        {
-                            if (AZStd::string(plistNode->name()) == stringStr)
-                            {
-                                if (uiValue != plistNode->value())
-                                {
-                                    return false;
-                                }
-                            }
-                            else
-                            {
-                                return false;
-                            }
-                        }
-                        else if (uiValue.empty() != noDocElement)
-                        {
-                            return false;
-                        }
-                    }
-                    else if (m_idBool == type)
-                    {
-                        bool uiValue;
-                        childNode.Read(uiValue);
-
-                        if (uiValue)
-                        {
-                            if (!noDocElement)
-                            {
-                                if (AZStd::string(plistNode->name()) != trueStr)
-                                {
-                                    return false;
-                                }
-                            }
-                            else
-                            {
-                                return false;
-                            }
-                        }
-                        else if (!noDocElement)
-                        {
-                            return false;
-                        }
-                    }
-                    else if (AZStd::string(childNode.GetClassMetadata()->m_name) == "IosOrientations")
-                    {
-                        // Enter even if nullptr to make sure all values should be false
-                        if (plistNode == nullptr || AZStd::string(plistNode->name()) == arrayStr)
-                        {
-                            if (!UiEqualToPlistArray(plistNode, &childNode))
-                            {
-                                return false;
-                            }
-                        }
-                        else
-                        {
-                            return false;
-                        }
-                    }
-                    else
-                    {
-                        if (!UiEqualToPlistImages(&childNode))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool Serializer::UiEqualToPlistArray(AZ::rapidxml::xml_node<char>* array, AzToolsFramework::InstanceDataNode* node) const
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                const AZ::SerializeContext::ClassElement* childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    AZ::Uuid type = childMeta->m_typeId;
-                    if (m_idBool == type)
-                    {
-                        const char* propertyName = childMeta->m_name;
-                        bool uiValue;
-                        childNode.Read(uiValue);
-
-                        bool found = false;
-                        if (array != nullptr)
-                        {
-                            for (XmlNode* plistNode = array->first_node(); plistNode != nullptr; plistNode = plistNode->next_sibling())
-                            {
-                                if (AZStd::string(plistNode->value()) == propertyName)
-                                {
-                                    if (!uiValue)
-                                    {
-                                        return false;
-                                    }
-                                    else
-                                    {
-                                        found = true;
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-                        if (uiValue && !found)
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool Serializer::UiEqualToPlistImages(AzToolsFramework::InstanceDataNode* node) const
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                auto childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    AZ::Uuid type = childMeta->m_typeId;
-
-                    if (m_idString == type)
-                    {
-                        AZStd::string uiValue;
-                        childNode.Read(uiValue);
-
-                        if (!uiValue.empty())
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    void Serializer::LoadFromSettings(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node)
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                auto childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    const char* propertyName = childMeta->m_name;
-                    AZ::Uuid type = childMeta->m_typeId;
-
-                    if (root != nullptr)
-                    {
-                        rapidjson::Value::MemberIterator jsonMember = root->FindMember(propertyName);
-
-                        if (jsonMember != root->MemberEnd())
-                        {
-                            rapidjson::Value& jsonNode = jsonMember->value;
-
-                            if (m_idString == type)
-                            {
-                                if (jsonNode.IsString())
-                                {
-                                    AZStd::string jsonValue = jsonNode.GetString();
-                                    childNode.Write(jsonValue);
-                                }
-                            }
-                            else if (m_idInt == type)
-                            {
-                                if (jsonNode.IsInt())
-                                {
-                                    int jsonValue = jsonNode.GetInt();
-                                    childNode.Write(jsonValue);
-                                }
-                            }
-                            else if (m_idBool == type)
-                            {
-                                if (jsonNode.IsString())
-                                {
-                                    bool value = false;
-                                    AZStd::string jsonValue = jsonNode.GetString();
-
-                                    if (jsonValue == trueStr)
-                                    {
-                                        value = true;
-                                    }
-                                    childNode.Write(value);
-                                }
-                            }
-                            // Should be a class with members instead of base data type
-                            else
-                            {
-                                if (jsonNode.IsObject())
-                                {
-                                    // Drill into class
-                                    LoadFromSettings(&jsonNode, &childNode);
-                                }
-                            }
-                        }
-                        else
-                        {
-                            SetDefaults(childNode, type);
-                        }
-                    }
-                    else
-                    {
-                        SetDefaults(childNode, type);
-                    }
-                }
-            }
-        }
-    }
-
-    void Serializer::SaveToSettings(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node)
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                auto childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    const char* propertyName = childMeta->m_name;
-                    rapidjson::Value::MemberIterator jsonMember = root->FindMember(propertyName);
-
-                    if (jsonMember == root->MemberEnd())
-                    {
-                        root->AddMember(rapidjson::Value(propertyName, m_jsonDoc->GetAllocator())
-                            , rapidjson::Value(rapidjson::Type::kNullType)
-                            , m_jsonDoc->GetAllocator());
-                        jsonMember = root->FindMember(propertyName);
-                    }
-                    rapidjson::Value& jsonNode = jsonMember->value;
-
-                    AZ::Uuid type = childMeta->m_typeId;
-                    if (m_idString == type)
-                    {
-                        AZStd::string uiValue;
-                        childNode.Read(uiValue);
-
-                        if (!uiValue.empty())
-                        {
-                            jsonNode.SetString(uiValue.data(), m_jsonDoc->GetAllocator());
-                        }
-                        else
-                        {
-                            root->RemoveMember(propertyName);
-                        }
-                    }
-                    else if (m_idInt == type)
-                    {
-                        int uiValue;
-                        childNode.Read(uiValue);
-                        jsonNode.SetInt(uiValue);
-                    }
-                    else if (m_idBool == type)
-                    {
-                        bool uiValue;
-                        childNode.Read(uiValue);
-
-                        if (uiValue)
-                        {
-                            jsonNode.SetString(trueStr, m_jsonDoc->GetAllocator());
-                        }
-                        else
-                        {
-                            root->RemoveMember(propertyName);
-                        }
-                    }
-                    // Should be a class with members instead of base data type
-                    else
-                    {
-                        // This value needs to be an object to add members
-                        if (!jsonNode.IsObject())
-                        {
-                            jsonNode.SetObject();
-                        }
-                        // Drill into class
-                        SaveToSettings(&jsonNode, &childNode);
-
-                        if (jsonNode.ObjectEmpty())
-                        {
-                            root->RemoveMember(propertyName);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    void Serializer::LoadFromSettings(AzToolsFramework::InstanceDataNode* node)
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                const AZ::SerializeContext::ClassElement* childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    const char* propertyName = childMeta->m_name;
-                    XmlNode* plistNode = m_plistDict->GetPropertyValueNode(propertyName);
-                    AZ::Uuid type = childMeta->m_typeId;
-
-                    if (plistNode != nullptr)
-                    {
-                        if (m_idString == type)
-                        {
-                            if (AZStd::string(plistNode->name()) == stringStr)
-                            {
-                                AZStd::string plistValue = plistNode->value();
-                                childNode.Write(plistValue);
-                            }
-                        }
-                        else if (m_idBool == type)
-                        {
-                            if (AZStd::string(plistNode->name()) == trueStr)
-                            {
-                                childNode.Write(true);
-                            }
-                        }
-                        else if (AZStd::string(childNode.GetClassMetadata()->m_name) == "IosOrientations")
-                        {
-                            // Make sure it seems like an array in plist as well
-                            if (AZStd::string(plistNode->name()) == arrayStr)
-                            {
-                                LoadOrientations(plistNode, &childNode);
-                            }
-                        }
-                        else
-                        {
-                            SetClassToDefaults(&childNode);
-                        }
-                    }
-                    else
-                    {
-                        SetDefaults(childNode, type);
-                    }
-                }
-            }
-        }
-    }
-
-    void Serializer::LoadOrientations(XmlNode* array, AzToolsFramework::InstanceDataNode* node)
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                const AZ::SerializeContext::ClassElement* childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    const char* propertyName = childMeta->m_name;
-
-                    bool found = false;
-                    if (array != nullptr)
-                    {
-                        for (XmlNode* plistNode = array->first_node(); plistNode != nullptr; plistNode = plistNode->next_sibling())
-                        {
-                            if (AZStd::string(plistNode->value()) == propertyName)
-                            {
-                                AZ::Uuid type = childMeta->m_typeId;
-
-                                if (m_idBool == type)
-                                {
-                                    if (AZStd::string(plistNode->name()) == stringStr)
-                                    {
-                                        childNode.Write(true);
-                                        found = true;
-                                    }
-                                }
-                                else
-                                {
-                                    AZ_Assert(false, "Unsupported type \"%s\" found in array.", childMeta->m_editData->m_name)
-                                }
-                                break;
-                            }
-                        }
-                    }
-                    if (!found)
-                    {
-                        childNode.Write(false);
-                    }
-                }
-            }
-        }
-    }
-
-    void Serializer::SetClassToDefaults(AzToolsFramework::InstanceDataNode* node)
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                auto childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    AZ::Uuid type = childMeta->m_typeId;
-
-                    SetDefaults(childNode, type);
-                }
-            }
-        }
-    }
-
-    void Serializer::SetDefaults(AzToolsFramework::InstanceDataNode& node, const AZ::Uuid& type)
-    {
-        if (m_idString == type)
-        {
-            node.Write(AZStd::string(""));
-            return;
-        }
-        else if (m_idBool == type)
-        {
-            node.Write(false);
-            return;
-        }
-        else if (m_idInt == type)
-        {
-            node.Write(0);
-            return;
-        }
-
-        if (AZStd::string(node.GetClassMetadata()->m_name) == "IosOrientations")
-        {
-            LoadOrientations(nullptr, &node);
-        }
-        else
-        {
-            SetClassToDefaults(&node);
-        }
-    }
-
-    void Serializer::SaveToSettings(AzToolsFramework::InstanceDataNode* node)
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                auto childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    const char* propertyName = childMeta->m_name;
-
-                    AZ::Uuid type = childMeta->m_typeId;
-
-                    if (m_idString == type)
-                    {
-                        AZStd::string uiValue;
-                        childNode.Read(uiValue);
-
-                        if (!uiValue.empty())
-                        {
-                            m_plistDict->SetPropertyValue(propertyName, uiValue.data());
-                        }
-                        else
-                        {
-                            m_plistDict->RemoveProperty(propertyName);
-                        }
-                    }
-                    else if (m_idBool == type)
-                    {
-                        bool uiValue;
-                        childNode.Read(uiValue);
-
-                        if (uiValue)
-                        {
-                            m_plistDict->SetPropertyValueName(propertyName, trueStr);
-                            m_plistDict->SetPropertyValue(propertyName, "");
-                        }
-                        else
-                        {
-                            m_plistDict->RemoveProperty(propertyName);
-                        }
-                    }
-                    else if (AZStd::string(childNode.GetClassMetadata()->m_name) == "IosOrientations")
-                    {
-                        XmlNode* plistNode = m_plistDict->GetPropertyValueNode(propertyName);
-                        if (plistNode == nullptr)
-                        {
-                            plistNode = m_plistDict->SetPropertyValueName(propertyName, arrayStr);
-                        }
-                        // Make sure the plist says this is an array type
-                        if (AZStd::string(plistNode->name()) == arrayStr)
-                        {
-                            if (!SaveOrientations(plistNode, &childNode))
-                            {
-                                m_plistDict->RemoveProperty(propertyName);
-                            }
-                        }
-                    }
-                    //Assume this is a class with image overrides
-                    else
-                    {
-                        OverwriteImages(&childNode);
-                    }
-                }
-            }
-        }
-    }
-
-    bool Serializer::SaveOrientations(XmlNode* array, AzToolsFramework::InstanceDataNode* node)
-    {
-        bool anyEnabled = false;
-
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                const AZ::SerializeContext::ClassElement* childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    AZ::Uuid type = childMeta->m_typeId;
-                    if (m_idBool == type)
-                    {
-                        const char* propertyName = childMeta->m_name;
-                        bool uiValue;
-                        childNode.Read(uiValue);
-
-                        if (uiValue)
-                        {
-                            anyEnabled = true;
-                        }
-
-                        bool found = false;
-                        for (XmlNode* plistNode = array->first_node(); plistNode != nullptr; plistNode = plistNode->next_sibling())
-                        {
-                            if (AZStd::string(plistNode->value()) == propertyName)
-                            {
-                                if (!uiValue)
-                                {
-                                    array->remove_node(plistNode);
-                                }
-                                else
-                                {
-                                    found = true;
-                                }
-                                break;
-                            }
-                        }
-                        if (uiValue && !found)
-                        {
-                            array->append_node(m_plistDict->MakeNode(stringStr, propertyName));
-                        }
-                    }
-                }
-            }
-        }
-
-        return anyEnabled;
-    }
-
-    void Serializer::OverwriteImages(AzToolsFramework::InstanceDataNode* node)
-    {
-        const AZ::SerializeContext::ClassData* baseMeta = node->GetClassMetadata();
-        if (baseMeta)
-        {
-            for (AzToolsFramework::InstanceDataNode& childNode : node->GetChildren())
-            {
-                auto childMeta = childNode.GetElementMetadata();
-                if (childMeta)
-                {
-                    AZ::Uuid type = childMeta->m_typeId;
-
-                    if (m_idString == type)
-                    {
-                        AZStd::string uiValue;
-                        childNode.Read(uiValue);
-
-                        if (!uiValue.empty())
-                        {
-                            AZ::Edit::ElementData* childEditMeta = childMeta->m_editData;
-
-                            if (childEditMeta != nullptr)
-                            {
-                                AZ::AttributeId handlerType = childEditMeta->m_elementId;
-
-                                // Special handling for iOS image overrides, the source images must be overwritten.
-                                if (handlerType == Handlers::ImagePreview)
-                                {
-                                    AZ::Edit::Attribute* defaultPathAttr = childEditMeta->FindAttribute(Attributes::DefaultPath);
-                                    if (defaultPathAttr != nullptr)
-                                    {
-                                        AzToolsFramework::PropertyAttributeReader reader(defaultPathAttr->GetContextData(), defaultPathAttr);
-                                        AZStd::string defaultPath;
-                                        if (reader.Read<AZStd::string>(defaultPath))
-                                        {
-                                            QString defaultPathQString = defaultPath.data();
-                                            CFileUtil::OverwriteFile(defaultPathQString);
-                                            CFileUtil::CopyFile(QString(uiValue.data()), defaultPathQString);
-                                            // Clear the property so this isn't overwritten again for no reason
-                                            childNode.Write(AZStd::string(""));
-                                        }
-                                    }
-                                    else
-                                    {
-                                        AZ_Assert(false, "Could not find default path for \"%s\". Cannot override image.", childMeta->m_name)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        AZ_Assert(false, "Unsupported type \"%s\" found in what should be image overrides.", childMeta->m_editData->m_name);
-                    }
-                }
-            }
-        }
-    }
-}   // ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.h b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.h
deleted file mode 100644
index 7586381966..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "PlistDictionary.h"
-
-#include <AzCore/JSON/document.h>
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-
-namespace AzToolsFramework
-{
-    class InstanceDataNode;
-}
-
-namespace ProjectSettingsTool
-{
-    class Serializer
-    {
-    public:
-        Serializer(AzToolsFramework::InstanceDataNode* root, rapidjson::Document* doc, rapidjson::Value* jsonRoot = nullptr);
-        Serializer(AzToolsFramework::InstanceDataNode* root, AZStd::unique_ptr<PlistDictionary> dict);
-        // Sets Json document
-        void SetDocumentRoot(rapidjson::Document* doc);
-        // Sets Json root
-        void SetJsonRoot(rapidjson::Value* jsonRoot);
-        // Sets pList dictionary
-        void SetDocumentRoot(AZStd::unique_ptr<PlistDictionary> dict);
-        // Returns true if all properties in ui are equal to settings
-        bool UiEqualToSettings() const;
-        // Loads properties into the ui from the settings
-        void LoadFromSettings();
-        // Saves properties from the ui to the settings
-        void SaveToSettings();
-        bool UiEqualToJson(rapidjson::Value* root) const;
-        void LoadFromSettings(rapidjson::Value* root);
-        void SaveToSettings(rapidjson::Value* root);
-
-
-    protected:
-        bool UiEqualToJson(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node) const;
-        bool UiEqualToPlist(AzToolsFramework::InstanceDataNode* node) const;
-        bool UiEqualToPlistArray(AZ::rapidxml::xml_node<char>* array, AzToolsFramework::InstanceDataNode* node) const;
-        bool UiEqualToPlistImages(AzToolsFramework::InstanceDataNode* node) const;
-        void LoadFromSettings(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node);
-        void LoadFromSettings(AzToolsFramework::InstanceDataNode* node);
-        void LoadOrientations(AZ::rapidxml::xml_node<char>* array, AzToolsFramework::InstanceDataNode* node);
-        void SetDefaults(AzToolsFramework::InstanceDataNode& node, const AZ::Uuid& type);
-        void SetClassToDefaults(AzToolsFramework::InstanceDataNode* node);
-        void SaveToSettings(rapidjson::Value* root, AzToolsFramework::InstanceDataNode* node);
-        void SaveToSettings(AzToolsFramework::InstanceDataNode* node);
-        bool SaveOrientations(AZ::rapidxml::xml_node<char>* array, AzToolsFramework::InstanceDataNode* node);
-        void OverwriteImages(AzToolsFramework::InstanceDataNode* node);
-
-        // The RPE root relative to the document's root
-        AzToolsFramework::InstanceDataNode* m_root;
-        // The Json document if using Json for this RPE
-        rapidjson::Document* m_jsonDoc;
-        // The root of the json for this serializer
-        rapidjson::Value* m_jsonRoot;
-        // The pList Dictionary wrapper if using a pList for this RPE
-        AZStd::unique_ptr<PlistDictionary> m_plistDict;
-
-    private:
-        Serializer(AzToolsFramework::InstanceDataNode* root);
-
-        // Uuid for AZStd::string
-        const AZ::Uuid m_idString;
-        // Uuid for int
-        const AZ::Uuid m_idInt;
-        // Uuid for bool
-        const AZ::Uuid m_idBool;
-    };
-}   // ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
deleted file mode 100644
index bc685d9d2d..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "ProjectSettingsToolWindow.h"
-#include "ui_ProjectSettingsToolWidget.h"
-
-#include "DefaultImageValidator.h"
-#include "PlatformSettings.h"
-#include "ProjectSettingsContainer.h"
-#include "ProjectSettingsValidator.h"
-#include "PropertyImagePreview.h"
-#include "PropertyFileSelect.h"
-#include "PropertyLinked.h"
-#include "Utils.h"
-#include "ValidationHandler.h"
-
-#include <AzCore/Component/ComponentApplicationBus.h>
-
-#include "AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h"
-#include <AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h>
-#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
-#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <Util/FileUtil.h>
-
-#include <QMessageBox>
-#include <QCloseEvent>
-#include <QScrollBar>
-#include <QTimer>
-
-// The object name in json for android
-const static char* androidSettings = "android_settings";
-static bool g_serializeRegistered = false;
-
-namespace ProjectSettingsTool
-{
-    using XmlNode = AZ::rapidxml::xml_node<char>;
-
-    ProjectSettingsToolWindow::ProjectSettingsToolWindow(QWidget* parent)
-        : QWidget(parent)
-        , LastPathBus::Handler()
-        , m_ui(new Ui::ProjectSettingsToolWidget())
-        , m_reconfigureProcess()
-        , m_devRoot(GetDevRoot())
-        , m_projectRoot(GetProjectRoot())
-        , m_projectName(GetProjectName())
-        , m_plistsInitVector(
-            PlatformEnabled(PlatformId::Ios) ?
-            ProjectSettingsContainer::PlistInitVector({
-                ProjectSettingsContainer::PlatformAndPath
-                { PlatformId::Ios, m_projectRoot + PlatformResourcesFolder(PlatformId::Ios) }
-                })
-            :
-                ProjectSettingsContainer::PlistInitVector())
-        , m_settingsContainer(AZStd::make_unique<ProjectSettingsContainer>(m_projectRoot + "/project.json", m_plistsInitVector))
-        , m_validator(AZStd::make_unique<Validator>())
-        , m_platformProperties()
-        , m_platformPropertyEditors()
-        , m_propertyHandlers()
-        , m_validationHandler(AZStd::make_unique<ValidationHandler>())
-        , m_linkHandler(nullptr)
-        // The default path to select images at
-        , m_lastImagesPath(QStringLiteral("%1Code%2/Resources")
-            .arg(m_projectRoot.c_str()
-            , m_projectName.c_str()))
-        , m_invalidState(false)
-    {
-        // Shows any and all errors that occurred during serialization with option to quit out on each one.
-        ShowAllErrorsThenExitIfInvalid();
-
-        if (!g_serializeRegistered)
-        {
-            ReflectPlatformClasses();
-            g_serializeRegistered = true;
-        }
-
-        InitializeUi();
-        RegisterHandlersAndBusses();
-        AddAllPlatformsToUi();
-        MakeSerializers();
-        if (m_invalidState)
-        {
-            // Exit for safety
-            return;
-        }
-
-        LoadPropertiesFromSettings();
-        m_linkHandler->LinkAllProperties();
-
-        // Hide the iOS tab if that platform is not enabled.
-        if (!PlatformEnabled(PlatformId::Ios))
-        {
-            m_ui->platformTabs->removeTab(m_ui->platformTabs->indexOf(m_ui->iosTab));
-        }
-    }
-
-    ProjectSettingsToolWindow::~ProjectSettingsToolWindow()
-    {
-        UnregisterHandlersAndBusses();
-    }
-
-    QString ProjectSettingsToolWindow::GetLastImagePath()
-    {
-        return m_lastImagesPath;
-    }
-
-    void ProjectSettingsToolWindow::SetLastImagePath(const QString& path)
-    {
-        m_lastImagesPath = path;
-    }
-
-    FunctorValidator* ProjectSettingsToolWindow::GetValidator(FunctorValidator::FunctorType functor)
-    {
-        return m_validator->GetQValidator(functor);
-    }
-
-    void ProjectSettingsToolWindow::TrackValidator(FunctorValidator* validator)
-    {
-        m_validator->TrackThisValidator(validator);
-    }
-
-    void ProjectSettingsToolWindow::ReflectPlatformClasses()
-    {
-        AZ::SerializeContext* context = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-        BaseSettings::Reflect(context);
-        AndroidSettings::Reflect(context);
-        IosSettings::Reflect(context);
-    }
-
-    void ProjectSettingsToolWindow::RegisterHandlersAndBusses()
-    {
-        m_propertyHandlers.push_back(PropertyFuncValLineEditHandler::Register(m_validationHandler.get()));
-        m_propertyHandlers.push_back(PropertyFuncValBrowseEditHandler::Register(m_validationHandler.get()));
-        m_propertyHandlers.push_back(PropertyFileSelectHandler::Register(m_validationHandler.get()));
-        m_propertyHandlers.push_back(PropertyImagePreviewHandler::Register(m_validationHandler.get()));
-        m_linkHandler = PropertyLinkedHandler::Register(m_validationHandler.get());
-        m_propertyHandlers.push_back(m_linkHandler);
-        LastPathBus::Handler::BusConnect();
-        ValidatorBus::Handler::BusConnect();
-    }
-
-    void ProjectSettingsToolWindow::UnregisterHandlersAndBusses()
-    {
-        ValidatorBus::Handler::BusDisconnect();
-        LastPathBus::Handler::BusDisconnect();
-
-        for (AzToolsFramework::PropertyHandlerBase* handler : m_propertyHandlers)
-        {
-            AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
-                &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::UnregisterPropertyType,
-                handler);
-            delete handler;
-        }
-    }
-
-    void ProjectSettingsToolWindow::MakeSerializerJson(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, rapidjson::Document* doc)
-    {
-        m_platformSerializers[static_cast<unsigned>(plat.m_id)] = AZStd::make_unique<Serializer>(hierarchy.GetRoot(), doc);
-    }
-
-    void ProjectSettingsToolWindow::MakeSerializerJsonNonRoot(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, rapidjson::Document* doc, rapidjson::Value* jsonRoot)
-    {
-        m_platformSerializers[static_cast<unsigned>(plat.m_id)] = AZStd::make_unique<Serializer>(hierarchy.GetRoot(), doc, jsonRoot);
-    }
-
-    void ProjectSettingsToolWindow::MakeSerializerPlist(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, PlistDictionary* dict)
-    {
-        m_platformSerializers[static_cast<unsigned>(plat.m_id)] = AZStd::make_unique<Serializer>(hierarchy.GetRoot(), AZStd::unique_ptr<PlistDictionary>(dict));
-    }
-
-    void ProjectSettingsToolWindow::closeEvent(QCloseEvent* event)
-    {
-        if (!m_invalidState)
-        {
-            // Check if ui is loaded
-            if (m_ui->saveButton != nullptr)
-            {
-                // Save button is used as an inverse bool to tell if configure is being run or settings are being saved
-                if (m_ui->saveButton->isEnabled())
-                {
-                    if (!UiEqualToSettings())
-                    {
-                        int result = QMessageBox::question
-                        (
-                            this,
-                            tr("Warning"),
-                            tr("There are currently unsaved changes. Are you sure you want to cancel?"),
-                            QMessageBox::Yes,
-                            QMessageBox::No
-                        );
-
-
-                        if (QMessageBox::Yes == result)
-                        {
-                            QWidget::closeEvent(event);
-                        }
-                        else
-                        {
-                            event->setAccepted(false);
-                        }
-                    }
-                    else
-                    {
-                        QWidget::closeEvent(event);
-                    }
-                }
-                else
-                {
-                    QMessageBox::information
-                    (
-                        this,
-                        tr("Info"),
-                        tr("Cannot close until settings have been reconfigured."),
-                        QMessageBox::Ok
-                    );
-
-                    event->setAccepted(false);
-                }
-            }
-            else
-            {
-                QWidget::closeEvent(event);
-            }
-        }
-        else
-        {
-            QWidget::closeEvent(event);
-        }
-    }
-
-    void ProjectSettingsToolWindow::ForceClose()
-    {
-        m_invalidState = true;
-        // Potentially called from the constructor, when the widget/window aren't properly set up, so delay this until after it's all setup
-        QTimer::singleShot(0, this, [this]() {window()->close();} );
-    }
-
-    bool ProjectSettingsToolWindow::IfErrorShowThenExit()
-    {
-        // Grabs the earliest unseen error popping it off the error queue
-        AZ::Outcome<void, SettingsError> error = m_settingsContainer->GetError();
-        if (!error.IsSuccess())
-        {
-            bool shouldAbort = error.GetError().m_error == m_settingsContainer->GetFailedLoadingPlistText();
-            QMessageBox::StandardButton result = QMessageBox::critical
-            (
-                this,
-                error.GetError().m_error.c_str(),
-                error.GetError().m_reason.c_str(),
-                shouldAbort ? QMessageBox::Abort : QMessageBox::StandardButtons(QMessageBox::Ok | QMessageBox::Abort),
-                shouldAbort ? QMessageBox::Abort : QMessageBox::Ok
-            );
-            if (result == QMessageBox::Abort)
-            {
-                ForceClose();
-            }
-            return true;
-        }
-        return false;
-    }
-
-    void ProjectSettingsToolWindow::ShowAllErrorsThenExitIfInvalid()
-    {
-        while (IfErrorShowThenExit())
-        {
-            if (m_invalidState)
-            {
-                // Exit for safety
-                return;
-            }
-        }
-    }
-
-    void ProjectSettingsToolWindow::InitializeUi()
-    {
-        // setup
-        m_ui->setupUi(this);
-
-        AzQtComponents::TabWidget::applySecondaryStyle(m_ui->platformTabs, false);
-
-        ResizeTabs(m_ui->platformTabs->currentIndex());
-
-        m_ui->reconfigureLog->hide();
-
-        // connects
-        connect
-        (
-            &m_reconfigureProcess,
-            static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
-            this,
-            [this]()
-            {
-                m_ui->saveButton->setEnabled(true);
-                m_ui->reloadButton->setEnabled(true);
-                m_ui->reconfigureLog->insertPlainText(tr("\n Reconfiguration Finished"));
-                QScrollBar* scrollbar = m_ui->reconfigureLog->verticalScrollBar();
-                scrollbar->setValue(scrollbar->maximum());
-            }
-        );
-
-        connect(&m_reconfigureProcess, &QProcess::readyReadStandardOutput, this,
-            [this]()
-            {
-                m_ui->reconfigureLog->insertPlainText(m_reconfigureProcess.readAllStandardOutput());
-                if (!m_ui->reconfigureLog->textCursor().hasSelection())
-                {
-                    QScrollBar* scrollbar = m_ui->reconfigureLog->verticalScrollBar();
-                    scrollbar->setValue(scrollbar->maximum());
-                }
-            });
-        connect(&m_reconfigureProcess, &QProcess::readyReadStandardError, this,
-            [this]()
-            {
-                m_ui->reconfigureLog->insertPlainText(m_reconfigureProcess.readAllStandardError());
-                if (!m_ui->reconfigureLog->textCursor().hasSelection())
-                {
-                    QScrollBar* scrollbar = m_ui->reconfigureLog->verticalScrollBar();
-                    scrollbar->setValue(scrollbar->maximum());
-                }
-            });
-
-        connect(m_ui->platformTabs, &QTabWidget::currentChanged,
-            this, &ProjectSettingsToolWindow::ResizeTabs);
-
-        connect(m_ui->saveButton, &QPushButton::clicked, this,
-            &ProjectSettingsToolWindow::SaveSettingsFromUi);
-        connect(m_ui->reloadButton, &QPushButton::clicked, this,
-            &ProjectSettingsToolWindow::ReloadUiFromSettings);
-    }
-
-    void ProjectSettingsToolWindow::ResizeTabs(int index)
-    {
-        for (int i = 0; i < m_ui->platformTabs->count(); i++)
-        {
-            if (i != index)
-            {
-                m_ui->platformTabs->widget(i)->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-            }
-        }
-
-        // resize for current tab
-        m_ui->platformTabs->widget(index)->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-        m_ui->platformTabs->widget(index)->resize(m_ui->platformTabs->widget(index)->minimumSizeHint());
-        m_ui->platformTabs->widget(index)->adjustSize();
-    }
-
-    void ProjectSettingsToolWindow::AddAllPlatformsToUi()
-    {
-        for (int plat = 0; plat < static_cast<unsigned long long>(PlatformId::NumPlatformIds); ++plat)
-        {
-            AddPlatformToUi(Platforms[plat]);
-        }
-    }
-
-    void ProjectSettingsToolWindow::AddPlatformToUi(const Platform& plat)
-    {
-        AZ::SerializeContext* context = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-        QWidget* parent = nullptr;
-        void* dataForPropertyEditor = nullptr;
-        AZ::TypeId dataTypeID;
-        switch (plat.m_id)
-        {
-        case PlatformId::Base:
-            parent = m_ui->baseSettingsGroupBox;
-            dataForPropertyEditor = &m_platformProperties.base;
-            dataTypeID = m_platformProperties.base.TYPEINFO_Uuid();
-            break;
-        case PlatformId::Android:
-            parent = m_ui->androidTab;
-            dataForPropertyEditor = &m_platformProperties.android;
-            dataTypeID = m_platformProperties.android.TYPEINFO_Uuid();
-            break;
-        case PlatformId::Ios:
-            parent = m_ui->iosTab;
-            dataForPropertyEditor = &m_platformProperties.ios;
-            dataTypeID = m_platformProperties.ios.TYPEINFO_Uuid();
-            break;
-        default:
-            AZ_Assert(false, "Cannot add unknown platform to ui.");
-        }
-
-        unsigned platIdValue = static_cast<unsigned>(plat.m_id);
-
-        m_platformPropertyEditors[platIdValue] = aznew AzToolsFramework::ReflectedPropertyEditor(parent);
-        parent->layout()->addWidget(m_platformPropertyEditors[platIdValue]);
-
-        m_platformPropertyEditors[platIdValue]->Setup(context, nullptr, false);
-        m_platformPropertyEditors[platIdValue]->AddInstance(dataForPropertyEditor, dataTypeID);
-        m_platformPropertyEditors[platIdValue]->setVisible(true);
-        m_platformPropertyEditors[platIdValue]->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-        m_platformPropertyEditors[platIdValue]->SetHideRootProperties(false);
-        m_platformPropertyEditors[platIdValue]->SetDynamicEditDataProvider(nullptr);
-        m_platformPropertyEditors[platIdValue]->ExpandAll();
-        m_platformPropertyEditors[platIdValue]->InvalidateAll();
-    }
-
-    const char* GetPlatformKey(const Platform& plat)
-    {
-        switch (plat.m_id)
-        {
-        case PlatformId::Android:
-            return androidSettings;
-        default:
-            return "";
-        }
-    }
-
-    void ProjectSettingsToolWindow::MakeSerializers()
-    {
-        for (int plat = 0; plat < static_cast<unsigned long long>(PlatformId::NumPlatformIds); ++plat)
-        {
-            if (PlatformEnabled(static_cast<PlatformId>(plat)))
-            {
-                MakePlatformSerializer(Platforms[plat]);
-            }
-        }
-    }
-
-    void ProjectSettingsToolWindow::MakePlatformSerializer(const Platform& plat)
-    {
-        unsigned platIdValue = static_cast<unsigned>(plat.m_id);
-
-        switch (plat.m_id)
-        {
-        case PlatformId::Base:
-            m_platformPropertyEditors[platIdValue]->EnumerateInstances(AZStd::bind
-                (
-                    &ProjectSettingsToolWindow::MakeSerializerJson,
-                    this,
-                    plat,
-                    AZStd::placeholders::_1,
-                    &m_settingsContainer->GetProjectJsonDocument()
-                ));
-            break;
-        case PlatformId::Android:
-            m_platformPropertyEditors[platIdValue]->EnumerateInstances(AZStd::bind
-                (
-                    &ProjectSettingsToolWindow::MakeSerializerJsonNonRoot,
-                    this,
-                    plat,
-                    AZStd::placeholders::_1,
-                    &m_settingsContainer->GetProjectJsonDocument(),
-                    m_settingsContainer->GetProjectJsonValue(GetPlatformKey(plat)).GetValue()
-                ));
-            break;
-        case PlatformId::Ios:
-        {
-            PlistDictionary* dict = m_settingsContainer->GetPlistDictionary(plat).release();
-            if (dict == nullptr)
-            {
-                QMessageBox::critical
-                (
-                    this,
-                    "Critical",
-                    "Ios pList is invalid. Project Settings Tool must close.",
-                    QMessageBox::Abort
-                );
-                ForceClose();
-            }
-
-            m_platformPropertyEditors[platIdValue]->EnumerateInstances(AZStd::bind
-            (
-                &ProjectSettingsToolWindow::MakeSerializerPlist,
-                this,
-                plat,
-                AZStd::placeholders::_1,
-                // All arguments must be copy constructible so this must be released
-                dict
-            ));
-            break;
-        }
-        default:
-            AZ_Assert(false, "Cannot make serializer for unknown platform.");
-            break;
-        }
-    }
-
-    void ProjectSettingsToolWindow::LoadPropertiesFromSettings()
-    {
-        // Disable all fields links
-
-        for (int plat = 0; plat < static_cast<unsigned long long>(PlatformId::NumPlatformIds); ++plat)
-        {
-            if (PlatformEnabled(static_cast<PlatformId>(plat)))
-            {
-                LoadPropertiesFromPlatformSettings(Platforms[plat]);
-            }
-        }
-    }
-
-    void ProjectSettingsToolWindow::LoadPropertiesFromPlatformSettings(const Platform& plat)
-    {
-        unsigned platIdValue = static_cast<unsigned>(plat.m_id);
-        m_platformSerializers[platIdValue]->LoadFromSettings();
-        m_platformPropertyEditors[platIdValue]->InvalidateValues();
-    }
-
-    bool ProjectSettingsToolWindow::UiEqualToSettings()
-    {
-        for (int plat = 0; plat < static_cast<unsigned long long>(PlatformId::NumPlatformIds); ++plat)
-        {
-            if (PlatformEnabled(static_cast<PlatformId>(plat)))
-            {
-                if (!UiEqualToPlatformSettings(Platforms[plat]))
-                {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool ProjectSettingsToolWindow::UiEqualToPlatformSettings(const Platform& plat)
-    {
-        return m_platformSerializers[static_cast<unsigned>(plat.m_id)]->UiEqualToSettings();
-    }
-
-    bool ProjectSettingsToolWindow::ValidateAllProperties()
-    {
-        return m_validationHandler->AllValid();
-    }
-
-    void ProjectSettingsToolWindow::SaveSettingsFromUi()
-    {
-        bool anySaves = false;
-        const unsigned long long numPlatforms = static_cast<unsigned long long>(PlatformId::NumPlatformIds);
-        bool needToSavePlat[numPlatforms] = {false};
-
-        for (int plat = 0; plat < numPlatforms; ++plat)
-        {
-            if (PlatformEnabled(static_cast<PlatformId>(plat)))
-            {
-                const Platform& platform = Platforms[plat];
-                if (!UiEqualToPlatformSettings(platform))
-                {
-                    needToSavePlat[plat] = true;
-                    anySaves = true;
-                }
-            }
-        }
-
-        if (anySaves)
-        {
-            // Keeps queued button presses from getting in
-            if (m_ui->saveButton->isEnabled())
-            {
-                m_ui->saveButton->setEnabled(false);
-                m_ui->reloadButton->setEnabled(false);
-
-                if (ValidateAllProperties())
-                {
-                    bool projectJsonChanged = false;
-
-                    for (int plat = 0; plat < numPlatforms; ++plat)
-                    {
-                        const Platform& platform = Platforms[plat];
-
-                        if (needToSavePlat[plat])
-                        {
-                            m_platformSerializers[plat]->SaveToSettings();
-                            if (m_settingsContainer->IsPlistPlatform(platform))
-                            {
-                                m_settingsContainer->SavePlistData(platform);
-                            }
-                            else
-                            {
-                                projectJsonChanged = true;
-                            }
-                        }
-                    }
-                    if (projectJsonChanged)
-                    {
-                        m_settingsContainer->SaveProjectJsonData();
-                    }
-
-                    ShowAllErrorsThenExitIfInvalid();
-
-                    m_ui->reconfigureLog->setText("");
-                    int result = QMessageBox::question
-                        (
-                        this,
-                        tr("Reconfigure Project"),
-                        tr("For new settings to be applied the project must be reconfigured. Would you like run configure now?"),
-                        QMessageBox::Yes,
-                        QMessageBox::No
-                        );
-
-                    if (QMessageBox::Yes == result)
-                    {
-                        m_ui->reconfigureLog->show();
-                    #if defined(AZ_PLATFORM_WINDOWS)
-                        m_reconfigureProcess.start("cmd.exe", { QString("/C %1").arg("lmbr_waf.bat configure") });
-                    #elif defined(AZ_PLATFORM_MAC) || defined(AZ_PLATFORM_LINUX)
-                        m_reconfigureProcess.start("/bin/sh", { QString("%1").arg("lmbr_waf.sh configure") });
-                    #else
-                        #error "Needs to be implemented"
-                    #endif
-                    }
-                    else
-                    {
-                        m_ui->reloadButton->setEnabled(true);
-                        m_ui->saveButton->setEnabled(true);
-                    }
-                }
-                // Show a message box telling user settings failed to save
-                else
-                {
-                    QMessageBox::critical(this, tr("Failed To Save"), tr("Failed to save due to invalid settings."));
-                    m_ui->reloadButton->setEnabled(true);
-                    m_ui->saveButton->setEnabled(true);
-                }
-            }
-        }
-    }
-
-    void ProjectSettingsToolWindow::SaveSettingsFromPlatformUi(const Platform& plat)
-    {
-        m_platformSerializers[static_cast<unsigned>(plat.m_id)]->SaveToSettings();
-        m_settingsContainer->SavePlatformData(plat);
-        ShowAllErrorsThenExitIfInvalid();
-    }
-
-    void ProjectSettingsToolWindow::ReloadUiFromSettings()
-    {
-        if (!UiEqualToSettings())
-        {
-            int result = QMessageBox::warning
-                (
-                this,
-                tr("Reload Settings"),
-                tr("Are you sure you would like to reload settings from file? All changes will be lost."),
-                QMessageBox::Reset,
-                QMessageBox::Cancel);
-
-            if (result == QMessageBox::Reset)
-            {
-                m_settingsContainer->ReloadProjectJsonData();
-                m_settingsContainer->ReloadPlistData();
-                MakeSerializers();
-
-                // Disable links to avoid overwriting values while loading
-                m_linkHandler->DisableAllPropertyLinks();
-                LoadPropertiesFromSettings();
-
-                // Re-enable them then mirror
-                m_linkHandler->EnableAllPropertyLinks();
-                m_linkHandler->EnableOptionalLinksIfAllPropertiesEqual();
-                m_linkHandler->MirrorAllLinkedProperties();
-
-                // Mark any invalid fields loaded from file
-                ValidateAllProperties();
-            }
-        }
-    }
-
-    bool ProjectSettingsToolWindow::PlatformEnabled(PlatformId platformId)
-    {
-        // iOS can be disabled if the plist file is missing
-        if (platformId == PlatformId::Ios)
-        {
-            const AZStd::string filename = m_projectRoot + PlatformResourcesFolder(platformId);
-            return CFileUtil::FileExists(filename.c_str());
-        }
-
-        return true;
-    }
-
-    const char* ProjectSettingsToolWindow::PlatformResourcesFolder(PlatformId platformId)
-    {
-        if (platformId == PlatformId::Ios)
-        {
-            const AZStd::string firstfilename = m_projectRoot + "/Gem/Resources/Platform/iOS/Info.plist";
-            if (CFileUtil::FileExists(firstfilename.c_str()))
-            {
-                return "/Gem/Resources/Platform/iOS/Info.plist";
-            }
-            else
-            {
-                const AZStd::string filename = m_projectRoot + "/Gem/Resources/IOSLauncher/Info.plist";
-                if (CFileUtil::FileExists(filename.c_str()))
-                {
-                    return "/Gem/Resources/IOSLauncher/Info.plist";
-                }
-            }
-        }
-
-        return nullptr;
-    }
-
-#include <moc_ProjectSettingsToolWindow.cpp>
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h
deleted file mode 100644
index 4e05216cf2..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "LastPathBus.h"
-#include "Platforms.h"
-#include "PlatformSettings.h"
-#include "ProjectSettingsContainer.h"
-#include "ProjectSettingsSerialization.h"
-#include "ValidatorBus.h"
-
-#include <QProcess>
-#include <QScopedPointer>
-#include <QWidget>
-#endif
-
-// Forward Declares
-namespace Ui
-{
-    class ProjectSettingsToolWidget;
-}
-
-namespace AzToolsFramework
-{
-    class InstanceDataHierarchy;
-    class PropertyHandlerBase;
-    class ReflectedPropertyEditor;
-}
-
-namespace ProjectSettingsTool
-{
-    //Forward Declares
-    class Validator;
-    class ValidationHandler;
-    class PropertyLinkedHandler;
-
-    struct Properties
-    {
-        BaseSettings base;
-        AndroidSettings android;
-        IosSettings ios;
-    };
-
-    // Main window for Project Settings tool
-    class ProjectSettingsToolWindow
-        : public QWidget
-        , public LastPathBus::Handler
-        , public ValidatorBus::Handler
-
-    {
-        Q_OBJECT
-    public:
-        static const GUID& GetClassID()
-        {
-            // {0DC1B7D9-B660-41C3-91F1-A643EE65AADF}
-            static const GUID guid = {
-                0x0dc1b7d9, 0xb660, 0x41c3, { 0x91, 0xf1, 0xa6, 0x43, 0xee, 0x65, 0xaa, 0xdf }
-            };
-            return guid;
-        }
-
-        ProjectSettingsToolWindow(QWidget* parent = nullptr);
-        ~ProjectSettingsToolWindow();
-
-        // Ebuses
-        QString GetLastImagePath() override;
-        void SetLastImagePath(const QString& path) override;
-
-        FunctorValidator* GetValidator(FunctorValidator::FunctorType) override;
-        void TrackValidator(FunctorValidator*) override;
-
-        static void ReflectPlatformClasses();
-
-    private:
-        AZ_DISABLE_COPY_MOVE(ProjectSettingsToolWindow);
-
-        void closeEvent(QCloseEvent* event) override;
-        // Close the window now because an error occurred
-        void ForceClose();
-
-        // Un/Registers and dis/connect handlers and buses
-        void RegisterHandlersAndBusses();
-        void UnregisterHandlersAndBusses();
-
-        void InitializeUi();
-
-        // Used to make the serializers for settings
-        void MakeSerializerJson(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, rapidjson::Document* doc);
-        void MakeSerializerJsonNonRoot(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, rapidjson::Document* doc, rapidjson::Value* jsonRoot);
-        void MakeSerializerPlist(const Platform& plat, AzToolsFramework::InstanceDataHierarchy& hierarchy, PlistDictionary* dict);
-
-        // Shows an error dialog if an error has occurred while loading settings then exits if users chooses
-        // Returns true if there was an error
-        bool IfErrorShowThenExit();
-        // Loop through all errors then exit if the user chooses to abort or window is in invalid state
-        void ShowAllErrorsThenExitIfInvalid();
-
-        // Resizes TabWidget to size of current tab instead of largest tab
-        void ResizeTabs(int index);
-
-        // Add all platforms into the ui
-        void AddAllPlatformsToUi();
-        // Add given platform into the ui
-        void AddPlatformToUi(const Platform& plat);
-        // Makes all serializers
-        void MakeSerializers();
-        // Makes the serializer for specified platform
-        void MakePlatformSerializer(const Platform& plat);
-
-        // Replace values in ui with those read from settings
-        void LoadPropertiesFromSettings();
-        // Load properties for specified platform from file
-        void LoadPropertiesFromPlatformSettings(const Platform& plat);
-
-        // Checks if ui is the same as all settings
-        bool UiEqualToSettings();
-        // Checks if platform is the same as settings
-        bool UiEqualToPlatformSettings(const Platform& plat);
-
-        // Checks if all properties are valid, if any are not returns false, also sets warnings on those properties
-        bool ValidateAllProperties();
-
-        // Replace values in settings with those from ui and save to file
-        void SaveSettingsFromUi();
-        // Saves all properties for specified platform from to file
-        void SaveSettingsFromPlatformUi(const Platform& plat);
-
-        // Reload settings files and replace the values in ui with them
-        void ReloadUiFromSettings();
-
-        // returns true if the platform is enabled
-        bool PlatformEnabled(PlatformId platformId);
-
-        // returns the resource folder
-        const char* PlatformResourcesFolder(PlatformId platformId);
-
-        // The ui for the window
-        QScopedPointer<Ui::ProjectSettingsToolWidget> m_ui;
-
-        // The process used to reconfigure settings
-        QProcess m_reconfigureProcess;
-
-        AZStd::string m_devRoot;
-        AZStd::string m_projectRoot;
-        AZStd::string m_projectName;
-
-        // Used to initialize the settings container's pLists
-        ProjectSettingsContainer::PlistInitVector m_plistsInitVector;
-
-        // Container to manage settings files per platform
-        AZStd::unique_ptr<ProjectSettingsContainer> m_settingsContainer;
-        // Allows lookup and contains all allocated QValidators
-        AZStd::unique_ptr<Validator> m_validator;
-
-        Properties m_platformProperties;
-        AzToolsFramework::ReflectedPropertyEditor* m_platformPropertyEditors[static_cast<unsigned>(PlatformId::NumPlatformIds)];
-        AZStd::unique_ptr<Serializer> m_platformSerializers[static_cast<unsigned>(PlatformId::NumPlatformIds)];
-
-        // Pointers to all handlers to they can be unregistered and deleted
-        AZStd::vector<AzToolsFramework::PropertyHandlerBase*> m_propertyHandlers;
-        AZStd::unique_ptr<ValidationHandler> m_validationHandler;
-        PropertyLinkedHandler* m_linkHandler;
-
-        // Last path used when browsing for images in icons or splash
-        QString m_lastImagesPath;
-        bool m_invalidState;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
deleted file mode 100644
index e1e5f5b1dc..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// Engine
-/////////////////////////////////////////////////////////////////////////////
-#include <ISystem.h>
-#include <Cry_Math.h>
-
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp
deleted file mode 100644
index 635847b5ed..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "ProjectSettingsValidator.h"
-
-#include "Validators.h"
-
-namespace ProjectSettingsTool
-{
-    Validator::Validator()
-    {}
-
-    Validator::~Validator()
-    {
-        for (AZStd::pair<FunctorValidator::FunctorType, FunctorValidator*>& pair : m_validatorToQValidator)
-        {
-            delete pair.second;
-        }
-        for (FunctorValidator* qValidator : m_otherValidators)
-        {
-            delete qValidator;
-        }
-    }
-
-    FunctorValidator* Validator::GetQValidator(FunctorValidator::FunctorType validator)
-    {
-        if (validator != nullptr)
-        {
-            auto iter = m_validatorToQValidator.find(validator);
-
-            if (iter != m_validatorToQValidator.end())
-            {
-                return iter->second;
-            }
-            else
-            {
-                FunctorValidator* qValidator = new FunctorValidator(validator);
-                m_validatorToQValidator.insert(
-                    AZStd::pair<FunctorValidator::FunctorType, FunctorValidator*>(validator, qValidator));
-
-                return qValidator;
-            }
-        }
-        else
-        {
-            return nullptr;
-        }
-    }
-
-    void Validator::TrackThisValidator(FunctorValidator* validator)
-    {
-        m_otherValidators.push_back(validator);
-    }
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsValidator.h b/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsValidator.h
deleted file mode 100644
index 8f0bf15e6d..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ProjectSettingsValidator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "FunctorValidator.h"
-
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/containers/unordered_map.h>
-
-
-namespace ProjectSettingsTool
-{
-    class Validator
-    {
-    public:
-        typedef FunctorValidator::ReturnType ValidatorReturnType;
-        typedef FunctorValidator::FunctorType ValidatorType;
-
-        Validator();
-        ~Validator();
-
-        // Finds the QValidator for a given validator or makes one and returns it
-        FunctorValidator* GetQValidator(FunctorValidator::FunctorType validator);
-        // Tracks this QValidator and deletes it in the destructor
-        void TrackThisValidator(FunctorValidator* validator);
-
-    private:
-        typedef AZStd::unordered_map<FunctorValidator::FunctorType, FunctorValidator*> ValidatorToQValidatorType;
-        typedef AZStd::list<FunctorValidator*> QValidatorList;
-
-        AZ_DISABLE_COPY_MOVE(Validator);
-
-        // Maps validator functions to QValidators
-        ValidatorToQValidatorType m_validatorToQValidator;
-        // Tracks allocations of other QValidators so they don't leak
-        QValidatorList m_otherValidators;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp
deleted file mode 100644
index e75b546493..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PropertyFileSelect.h"
-
-#include "PlatformSettings_common.h"
-#include "ValidationHandler.h"
-
-#include <QLayout>
-#include <QPushButton>
-#include <QLineEdit>
-
-namespace ProjectSettingsTool
-{
-    PropertyFileSelectCtrl::PropertyFileSelectCtrl(QWidget* pParent)
-        : PropertyFuncValBrowseEditCtrl(pParent)
-        , m_selectFunctor(nullptr)
-    {
-        // Turn on clear button by default
-        browseEdit()->setClearButtonEnabled(true);
-
-        connect(browseEdit(), &AzQtComponents::BrowseEdit::attachedButtonTriggered, this, &PropertyFileSelectCtrl::SelectFile);
-    }
-
-    void PropertyFileSelectCtrl::SelectFile()
-    {
-        if (m_selectFunctor != nullptr)
-        {
-            QString path = m_selectFunctor(browseEdit()->text());
-            if (!path.isEmpty())
-            {
-                SetValueUser(path);
-            }
-        }
-        else
-        {
-            AZ_Assert(false, "No file select functor set.");
-        }
-    }
-
-    void PropertyFileSelectCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-    {
-        if (attrib == Attributes::SelectFunction)
-        {
-            void* functor = nullptr;
-            if (attrValue->Read<void*>(functor))
-            {
-                // This is guaranteed type safe elsewhere so this is safe
-                m_selectFunctor = reinterpret_cast<FileSelectFuncType>(functor);
-            }
-        }
-        else
-        {
-            PropertyFuncValBrowseEditCtrl::ConsumeAttribute(attrib, attrValue, debugName);
-        }
-    }
-
-    //  Handler  ///////////////////////////////////////////////////////////////////
-
-    PropertyFileSelectHandler::PropertyFileSelectHandler(ValidationHandler* valHdlr)
-        : AzToolsFramework::PropertyHandler<AZStd::string, PropertyFileSelectCtrl>()
-        , m_validationHandler(valHdlr)
-    {}
-
-    AZ::u32 PropertyFileSelectHandler::GetHandlerName(void) const
-    {
-        return Handlers::FileSelect;
-    }
-
-    QWidget* PropertyFileSelectHandler::CreateGUI(QWidget* pParent)
-    {
-        PropertyFileSelectCtrl* ctrl = aznew PropertyFileSelectCtrl(pParent);
-        m_validationHandler->AddValidatorCtrl(ctrl);
-        return ctrl;
-    }
-
-    void PropertyFileSelectHandler::ConsumeAttribute(PropertyFileSelectCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-    {
-        GUI->ConsumeAttribute(attrib, attrValue, debugName);
-    }
-
-    void PropertyFileSelectHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyFileSelectCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        instance = GUI->GetValue().toUtf8().data();
-    }
-
-    bool PropertyFileSelectHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyFileSelectCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        GUI->SetValue(instance.data());
-        GUI->ForceValidate();
-        return true;
-    }
-
-    PropertyFileSelectHandler* PropertyFileSelectHandler::Register(ValidationHandler* valHdlr)
-    {
-        PropertyFileSelectHandler* handler = aznew PropertyFileSelectHandler(valHdlr);
-        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
-            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
-            handler);
-        return handler;
-    }
-} // namespace ProjectSettingsTool
-
-#include <moc_PropertyFileSelect.cpp>
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFileSelect.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFileSelect.h
deleted file mode 100644
index ae09bb92bd..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFileSelect.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "PropertyFuncValBrowseEdit.h"
-#endif
-
-// Forward declare
-class QPushButton;
-
-namespace ProjectSettingsTool
-{
-    // Forward declare
-    class ValidationHandler;
-
-    class PropertyFileSelectCtrl
-        : public PropertyFuncValBrowseEditCtrl
-    {
-        Q_OBJECT
-
-    public:
-        typedef QString(* FileSelectFuncType)(const QString&);
-
-        PropertyFileSelectCtrl(QWidget* pParent = nullptr);
-
-        virtual void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-
-    protected:
-        void SelectFile();
-
-        QPushButton* m_selectButton;
-        FileSelectFuncType m_selectFunctor;
-    };
-
-    class PropertyFileSelectHandler
-        : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyFileSelectCtrl>
-    {
-        AZ_CLASS_ALLOCATOR(PropertyFileSelectHandler, AZ::SystemAllocator, 0);
-
-    public:
-        PropertyFileSelectHandler(ValidationHandler* valHdlr);
-
-        AZ::u32 GetHandlerName(void) const override;
-        // Need to unregister ourselves
-        bool AutoDelete() const override { return false; }
-
-        QWidget* CreateGUI(QWidget* pParent) override;
-        void ConsumeAttribute(PropertyFileSelectCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-        void WriteGUIValuesIntoProperty(size_t index, PropertyFileSelectCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-        bool ReadValuesIntoGUI(size_t index, PropertyFileSelectCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-        static PropertyFileSelectHandler* Register(ValidationHandler* valHdlr);
-
-    private:
-        ValidationHandler* m_validationHandler;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp
deleted file mode 100644
index f732167cdc..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PropertyFuncValBrowseEdit.h"
-#include "PlatformSettings_common.h"
-#include "ValidationHandler.h"
-#include "ValidatorBus.h"
-
-#include <AzToolsFramework/UI/PropertyEditor/PropertyQTConstants.h>
-
-#include <QLineEdit>
-#include <QHBoxLayout>
-
-namespace ProjectSettingsTool
-{
-    PropertyFuncValBrowseEditCtrl::PropertyFuncValBrowseEditCtrl(QWidget* pParent)
-        : QWidget(pParent)
-        , m_validator(nullptr)
-    {
-        QHBoxLayout* layout = new QHBoxLayout(this);
-        m_browseEdit = new AzQtComponents::BrowseEdit(this);
-
-        layout->setSpacing(4);
-        layout->setContentsMargins(1, 0, 1, 0);
-        layout->addWidget(m_browseEdit);
-
-        browseEdit()->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
-        browseEdit()->setMinimumWidth(AzToolsFramework::PropertyQTConstant_MinimumWidth);
-        browseEdit()->setFixedHeight(AzToolsFramework::PropertyQTConstant_DefaultHeight);
-
-        browseEdit()->setFocusPolicy(Qt::StrongFocus);
-
-        setLayout(layout);
-        setFocusProxy(browseEdit());
-        setFocusPolicy(browseEdit()->focusPolicy());
-
-        m_browseEdit->setClearButtonEnabled(true);
-        connect(m_browseEdit, &AzQtComponents::BrowseEdit::textChanged, this, &PropertyFuncValBrowseEditCtrl::ValueChangedByUser);
-        connect(m_browseEdit, &AzQtComponents::BrowseEdit::textChanged, this, &PropertyFuncValBrowseEditCtrl::ValidateAndShowErrors);
-        connect(m_browseEdit, &AzQtComponents::BrowseEdit::textChanged, this, [this]([[maybe_unused]] const QString& text)
-            {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, this);
-            });
-    }
-
-    QString PropertyFuncValBrowseEditCtrl::GetValue() const
-    {
-        return m_browseEdit->text();
-    }
-
-    void PropertyFuncValBrowseEditCtrl::SetValue(const QString& value)
-    {
-        m_browseEdit->setText(value);
-    }
-
-    void PropertyFuncValBrowseEditCtrl::SetValueUser(const QString& value)
-    {
-        SetValue(value);
-
-        emit ValueChangedByUser();
-    }
-
-    FunctorValidator* PropertyFuncValBrowseEditCtrl::GetValidator()
-    {
-        return m_validator;
-    }
-
-    void PropertyFuncValBrowseEditCtrl::SetValidator(FunctorValidator* validator)
-    {
-        m_browseEdit->lineEdit()->setValidator(validator);
-        m_validator = validator;
-    }
-
-    void PropertyFuncValBrowseEditCtrl::SetValidator(FunctorValidator::FunctorType validator)
-    {
-        FunctorValidator* val = nullptr;
-        ValidatorBus::BroadcastResult(
-            val,
-            &ValidatorBus::Handler::GetValidator,
-            validator);
-
-        SetValidator(val);
-    }
-
-    bool PropertyFuncValBrowseEditCtrl::ValidateAndShowErrors()
-    {
-        if (m_validator)
-        {
-            FunctorValidator::ReturnType result = m_validator->ValidateWithErrors(m_browseEdit->text());
-            if (result.first == QValidator::Acceptable)
-            {
-                m_browseEdit->lineEdit()->setToolTip("");
-                return true;
-            }
-            else
-            {
-                m_browseEdit->lineEdit()->setToolTip(result.second);
-                m_browseEdit->lineEdit()->setReadOnly(false);
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }
-    }
-
-    void PropertyFuncValBrowseEditCtrl::ForceValidate()
-    {
-        // Triggers update for errors
-        m_browseEdit->lineEdit()->textChanged(m_browseEdit->text());
-    }
-
-    void PropertyFuncValBrowseEditCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, [[maybe_unused]] const char* debugName)
-    {
-        if (attrib == Attributes::FuncValidator)
-        {
-            void* validator = nullptr;
-            if (attrValue->Read<void*>(validator))
-            {
-                if (validator != nullptr)
-                {
-                    SetValidator(reinterpret_cast<FunctorValidator::FunctorType>(validator));
-                }
-            }
-        }
-        else if (attrib == Attributes::ClearButton)
-        {
-            bool enable = false;
-            if (attrValue->Read<bool>(enable))
-            {
-                m_browseEdit->lineEdit()->setClearButtonEnabled(enable);
-            }
-        }
-        else if (attrib == Attributes::RemovableReadOnly)
-        {
-            bool readOnly = false;
-            if (attrValue->Read<bool>(readOnly))
-            {
-                m_browseEdit->lineEdit()->setReadOnly(readOnly);
-            }
-        }
-        else if (attrib == Attributes::ObfuscatedText)
-        {
-            bool obfus = false;
-            if (attrValue->Read<bool>(obfus) && obfus)
-            {
-                m_browseEdit->lineEdit()->setEchoMode(QLineEdit::Password);
-            }
-        }
-    }
-
-    AzQtComponents::BrowseEdit* PropertyFuncValBrowseEditCtrl::browseEdit()
-    {
-        return m_browseEdit;
-    }
-
-    //  Handler  ///////////////////////////////////////////////////////////////////
-
-    PropertyFuncValBrowseEditHandler::PropertyFuncValBrowseEditHandler(ValidationHandler* valHdlr)
-        : AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValBrowseEditCtrl>()
-        , m_validationHandler(valHdlr
-            )
-    {}
-
-    AZ::u32 PropertyFuncValBrowseEditHandler::GetHandlerName(void) const
-    {
-        return Handlers::QValidatedBrowseEdit;
-    }
-
-    QWidget* PropertyFuncValBrowseEditHandler::CreateGUI(QWidget* pParent)
-    {
-        PropertyFuncValBrowseEditCtrl* ctrl = aznew PropertyFuncValBrowseEditCtrl(pParent);
-        m_validationHandler->AddValidatorCtrl(ctrl);
-        return ctrl;
-    }
-
-    void PropertyFuncValBrowseEditHandler::ConsumeAttribute(PropertyFuncValBrowseEditCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-    {
-        GUI->ConsumeAttribute(attrib, attrValue, debugName);
-    }
-
-    void PropertyFuncValBrowseEditHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyFuncValBrowseEditCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        instance = GUI->GetValue().toUtf8().data();
-    }
-
-    bool PropertyFuncValBrowseEditHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyFuncValBrowseEditCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        GUI->SetValue(instance.data());
-        GUI->ForceValidate();
-        return true;
-    }
-
-    PropertyFuncValBrowseEditHandler* PropertyFuncValBrowseEditHandler::Register(ValidationHandler* valHdlr)
-    {
-        PropertyFuncValBrowseEditHandler* handler = aznew PropertyFuncValBrowseEditHandler(valHdlr);
-        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
-            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
-            handler);
-        return handler;
-    }
-} // namespace ProjectSettingsTool
-
-#include <moc_PropertyFuncValBrowseEdit.cpp>
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.h
deleted file mode 100644
index bd85b88b97..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "FunctorValidator.h"
-
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
-
-#include <AzQtComponents/Components/Widgets/BrowseEdit.h>
-#endif
-
-namespace ProjectSettingsTool
-{
-    // Forward Declare
-    class ValidationHandler;
-
-    class PropertyFuncValBrowseEditCtrl
-        : public QWidget
-    {
-        Q_OBJECT
-
-    public:
-        AZ_CLASS_ALLOCATOR(PropertyFuncValBrowseEditCtrl, AZ::SystemAllocator, 0);
-
-        PropertyFuncValBrowseEditCtrl(QWidget* pParent = nullptr);
-
-        virtual QString GetValue() const;
-        // Sets value programmtically and triggers validation
-        virtual void SetValue(const QString& value);
-        // Sets value as if user set it
-        void SetValueUser(const QString& value);
-        // Returns pointer to the validator used
-        FunctorValidator* GetValidator();
-        // Sets the validator for the lineedit
-        void SetValidator(FunctorValidator* validator);
-        // Sets the validator for the linedit
-        void SetValidator(FunctorValidator::FunctorType validator);
-        // Returns false if invalid and returns shows error as tooltip
-        bool ValidateAndShowErrors();
-        // Forces the values to up validated and style updated
-        void ForceValidate();
-
-        // Returns a pointer to the BrowseEdit object.
-        AzQtComponents::BrowseEdit* browseEdit();
-
-        virtual void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName);
-
-    signals:
-        void ValueChangedByUser();
-
-    protected:
-        // Keeps track of the validator so no const_casts must be done
-        FunctorValidator* m_validator;
-
-        AzQtComponents::BrowseEdit* m_browseEdit = nullptr;
-    };
-
-    class PropertyFuncValBrowseEditHandler
-        : public AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValBrowseEditCtrl>
-    {
-        AZ_CLASS_ALLOCATOR(PropertyFuncValBrowseEditHandler, AZ::SystemAllocator, 0);
-
-    public:
-        PropertyFuncValBrowseEditHandler(ValidationHandler* valHdlr);
-
-        AZ::u32 GetHandlerName(void) const override;
-        // Need to unregister ourselves
-        bool AutoDelete() const override { return false; }
-
-        QWidget* CreateGUI(QWidget* pParent) override;
-        void ConsumeAttribute(PropertyFuncValBrowseEditCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-        void WriteGUIValuesIntoProperty(size_t index, PropertyFuncValBrowseEditCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-        bool ReadValuesIntoGUI(size_t index, PropertyFuncValBrowseEditCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-        static PropertyFuncValBrowseEditHandler* Register(ValidationHandler* valHdlr);
-
-    private:
-        ValidationHandler* m_validationHandler;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp
deleted file mode 100644
index 13f7ac5f92..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PropertyFuncValLineEdit.h"
-
-#include "PlatformSettings_common.h"
-#include "ValidationHandler.h"
-#include "ValidatorBus.h"
-
-#include <QLineEdit>
-
-namespace ProjectSettingsTool
-{
-    PropertyFuncValLineEditCtrl::PropertyFuncValLineEditCtrl(QWidget* pParent)
-        : AzToolsFramework::PropertyStringLineEditCtrl(pParent)
-        , m_validator(nullptr)
-    {
-        connect(m_pLineEdit, &QLineEdit::textEdited, this, &PropertyFuncValLineEditCtrl::ValueChangedByUser);
-        connect(m_pLineEdit, &QLineEdit::textChanged, this, &PropertyFuncValLineEditCtrl::ValidateAndShowErrors);
-        connect(m_pLineEdit, &QLineEdit::textChanged, this, [this]([[maybe_unused]] const QString& text)
-            {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, this);
-            });
-    }
-
-    QString PropertyFuncValLineEditCtrl::GetValue() const
-    {
-        return m_pLineEdit->text();
-    }
-
-    void PropertyFuncValLineEditCtrl::SetValue(const QString& value)
-    {
-        m_pLineEdit->setText(value);
-    }
-
-    void PropertyFuncValLineEditCtrl::SetValueUser(const QString& value)
-    {
-        SetValue(value);
-
-        emit ValueChangedByUser();
-    }
-
-    FunctorValidator* PropertyFuncValLineEditCtrl::GetValidator()
-    {
-        return m_validator;
-    }
-
-    void PropertyFuncValLineEditCtrl::SetValidator(FunctorValidator* validator)
-    {
-        m_pLineEdit->setValidator(validator);
-        m_validator = validator;
-    }
-
-    void PropertyFuncValLineEditCtrl::SetValidator(FunctorValidator::FunctorType validator)
-    {
-        FunctorValidator* val = nullptr;
-        ValidatorBus::BroadcastResult(
-            val,
-            &ValidatorBus::Handler::GetValidator,
-            validator);
-
-        SetValidator(val);
-    }
-
-    bool PropertyFuncValLineEditCtrl::ValidateAndShowErrors()
-    {
-        if (m_validator)
-        {
-            FunctorValidator::ReturnType result = m_validator->ValidateWithErrors(m_pLineEdit->text());
-            if (result.first == QValidator::Acceptable)
-            {
-                m_pLineEdit->setToolTip("");
-                return true;
-            }
-            else
-            {
-                m_pLineEdit->setToolTip(result.second);
-                m_pLineEdit->setReadOnly(false);
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }
-    }
-
-    void PropertyFuncValLineEditCtrl::ForceValidate()
-    {
-        // Triggers update for errors
-        m_pLineEdit->textChanged(m_pLineEdit->text());
-    }
-
-    void PropertyFuncValLineEditCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, [[maybe_unused]] const char* debugName)
-    {
-        if (attrib == Attributes::FuncValidator)
-        {
-            void* validator = nullptr;
-            if (attrValue->Read<void*>(validator))
-            {
-                if (validator != nullptr)
-                {
-                    SetValidator(reinterpret_cast<FunctorValidator::FunctorType>(validator));
-                }
-            }
-        }
-        else if (attrib == Attributes::ClearButton)
-        {
-            bool enable = false;
-            if (attrValue->Read<bool>(enable))
-            {
-                m_pLineEdit->setClearButtonEnabled(enable);
-            }
-        }
-        else if (attrib == Attributes::RemovableReadOnly)
-        {
-            bool readOnly = false;
-            if (attrValue->Read<bool>(readOnly))
-            {
-                m_pLineEdit->setReadOnly(readOnly);
-            }
-        }
-        else if (attrib == Attributes::ObfuscatedText)
-        {
-            bool obfus = false;
-            if (attrValue->Read<bool>(obfus) && obfus)
-            {
-                m_pLineEdit->setEchoMode(QLineEdit::Password);
-            }
-        }
-    }
-
-    //  Handler  ///////////////////////////////////////////////////////////////////
-
-    PropertyFuncValLineEditHandler::PropertyFuncValLineEditHandler(ValidationHandler* valHdlr)
-        : AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValLineEditCtrl>()
-        , m_validationHandler(valHdlr
-            )
-    {}
-
-    AZ::u32 PropertyFuncValLineEditHandler::GetHandlerName(void) const
-    {
-        return Handlers::QValidatedLineEdit;
-    }
-
-    QWidget* PropertyFuncValLineEditHandler::CreateGUI(QWidget* pParent)
-    {
-        PropertyFuncValLineEditCtrl* ctrl = aznew PropertyFuncValLineEditCtrl(pParent);
-        m_validationHandler->AddValidatorCtrl(ctrl);
-        return ctrl;
-    }
-
-    void PropertyFuncValLineEditHandler::ConsumeAttribute(PropertyFuncValLineEditCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-    {
-        GUI->ConsumeAttribute(attrib, attrValue, debugName);
-    }
-
-    void PropertyFuncValLineEditHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyFuncValLineEditCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        instance = GUI->GetValue().toUtf8().data();
-    }
-
-    bool PropertyFuncValLineEditHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyFuncValLineEditCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        GUI->SetValue(instance.data());
-        GUI->ForceValidate();
-        return true;
-    }
-
-    PropertyFuncValLineEditHandler* PropertyFuncValLineEditHandler::Register(ValidationHandler* valHdlr)
-    {
-        PropertyFuncValLineEditHandler* handler = aznew PropertyFuncValLineEditHandler(valHdlr);
-        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
-            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
-            handler);
-        return handler;
-    }
-} // namespace ProjectSettingsTool
-
-#include <moc_PropertyFuncValLineEdit.cpp>
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.h
deleted file mode 100644
index 9f62e1e856..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "FunctorValidator.h"
-
-#include <AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.hxx>
-#endif
-
-namespace ProjectSettingsTool
-{
-    // Forward Declare
-    class ValidationHandler;
-
-    class PropertyFuncValLineEditCtrl
-        : public AzToolsFramework::PropertyStringLineEditCtrl
-    {
-        Q_OBJECT
-
-    public:
-        PropertyFuncValLineEditCtrl(QWidget* pParent = nullptr);
-
-        virtual QString GetValue() const;
-        // Sets value programmtically and triggers validation
-        virtual void SetValue(const QString& value);
-        // Sets value as if user set it
-        void SetValueUser(const QString& value);
-        // Returns pointer to the validator used
-        FunctorValidator* GetValidator();
-        // Sets the validator for the lineedit
-        void SetValidator(FunctorValidator* validator);
-        // Sets the validator for the linedit
-        void SetValidator(FunctorValidator::FunctorType validator);
-        // Returns false if invalid and returns shows error as tooltip
-        bool ValidateAndShowErrors();
-        // Forces the values to up validated and style updated
-        void ForceValidate();
-
-        virtual void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName);
-
-    signals:
-        void ValueChangedByUser();
-
-    protected:
-        // Keeps track of the validator so no const_casts must be done
-        FunctorValidator* m_validator;
-    };
-
-    class PropertyFuncValLineEditHandler
-        : public AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValLineEditCtrl>
-    {
-        AZ_CLASS_ALLOCATOR(PropertyFuncValLineEditHandler, AZ::SystemAllocator, 0);
-
-    public:
-        PropertyFuncValLineEditHandler(ValidationHandler* valHdlr);
-
-        AZ::u32 GetHandlerName(void) const override;
-        // Need to unregister ourselves
-        bool AutoDelete() const override { return false; }
-
-        QWidget* CreateGUI(QWidget* pParent) override;
-        void ConsumeAttribute(PropertyFuncValLineEditCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-        void WriteGUIValuesIntoProperty(size_t index, PropertyFuncValLineEditCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-        bool ReadValuesIntoGUI(size_t index, PropertyFuncValLineEditCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-        static PropertyFuncValLineEditHandler* Register(ValidationHandler* valHdlr);
-
-    private:
-        ValidationHandler* m_validationHandler;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp
deleted file mode 100644
index d60c30ad80..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PropertyImagePreview.h"
-
-#include "DefaultImageValidator.h"
-#include "PlatformSettings_common.h"
-#include "Utils.h"
-#include "ValidationHandler.h"
-#include "ValidatorBus.h"
-
-#include <QBoxLayout>
-#include <QDir>
-#include <QLineEdit>
-
-namespace ProjectSettingsTool
-{
-    // Max width/length of preview in pixels
-    static const int maxPreviewDim = 96;
-
-    PropertyImagePreviewCtrl::PropertyImagePreviewCtrl(QWidget* parent)
-        : PropertyFuncValBrowseEditCtrl(parent)
-        , m_defaultImagePreview(nullptr)
-        , m_defaultPath("")
-    {
-        QLayout* myLayout = layout();
-        QBoxLayout* boxLayout = qobject_cast<QBoxLayout*>(myLayout);
-
-        m_preview = new QLabel(this);
-        m_preview->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-        m_preview->setFixedSize(QSize(maxPreviewDim, maxPreviewDim));
-
-        if (boxLayout != nullptr)
-        {
-            boxLayout->insertWidget(0, m_preview);
-        }
-        else
-        {
-            AZ_Assert(false, "Expected QBoxLayout type not found in lineedit control.");
-            myLayout->addWidget(m_preview);
-        }
-
-        connect(this->m_browseEdit, &AzQtComponents::BrowseEdit::attachedButtonTriggered, this, [this]()
-        {
-            QString path = SelectImageFromFileDialog(browseEdit()->text());
-            if (!path.isEmpty())
-            {
-                SetValueUser(path);
-            }
-        });
- 
-        connect(browseEdit(), &AzQtComponents::BrowseEdit::textChanged, this, &PropertyImagePreviewCtrl::LoadPreview);
-    }
-
-    void PropertyImagePreviewCtrl::SetValue(const QString& path)
-    {
-        browseEdit()->setText(path);
-
-        // Preview will not be shown if path is set to empty because it has not changed so call it here
-        LoadPreview();
-    }
-
-    const QString& PropertyImagePreviewCtrl::DefaultImagePath() const
-    {
-        return m_defaultPath;
-    }
-
-    void PropertyImagePreviewCtrl::SetDefaultImagePath(const QString& newPath)
-    {
-        m_defaultPath = newPath;
-    }
-
-    void PropertyImagePreviewCtrl::SetDefaultImagePreview(PropertyImagePreviewCtrl* imageSelect)
-    {
-        if (m_defaultImagePreview == nullptr)
-        {
-            m_defaultImagePreview = imageSelect;
-           connect(imageSelect, &PropertyFuncValBrowseEditCtrl::ValueChangedByUser, this, &PropertyImagePreviewCtrl::LoadPreview);
-        }
-        else
-        {
-            AZ_Assert(false, "Default image preview already set.");
-        }
-    }
-
-    PropertyImagePreviewCtrl* PropertyImagePreviewCtrl::DefaultImagePreview() const
-    {
-        return m_defaultImagePreview;
-    }
-
-    void PropertyImagePreviewCtrl::AddOverrideToValidator(PropertyImagePreviewCtrl* preview)
-    {
-        qobject_cast<DefaultImageValidator*>(m_validator)->AddOverride(preview);
-        connect(browseEdit(), &AzQtComponents::BrowseEdit::textChanged, this, &PropertyImagePreviewCtrl::ForceValidate);
-    }
-
-    void PropertyImagePreviewCtrl::LoadPreview()
-    {
-        QString currentPath = browseEdit()->text();
-        const QString* imagePath = nullptr;
-
-        if (!currentPath.isEmpty())
-        {
-            imagePath = &currentPath;
-        }
-        else
-        {
-            if (m_defaultImagePreview != nullptr)
-            {
-                currentPath = browseEdit()->text();
-            }
-            if (!currentPath.isEmpty())
-            {
-                imagePath = &currentPath;
-            }
-            else
-            {
-                imagePath = &m_defaultPath;
-            }
-        }
-
-        QDir dirPath(*imagePath);
-
-        // Keeps image from showing when no extension is given
-        if (!imagePath->isEmpty() && dirPath.isReadable())
-        {
-            // Image loaded from file
-            QImage originalImage;
-            // Scaled image
-            QImage processedImage;
-            // The image to be displayed
-            QImage* finalImage;
-            bool validImage = originalImage.load(*imagePath);
-
-            if (validImage)
-            {
-                //Scale down any images larger than 128 on either dimension
-                if (originalImage.height() > maxPreviewDim || originalImage.width() > maxPreviewDim)
-                {
-                    processedImage = originalImage.scaled(maxPreviewDim, maxPreviewDim,
-                        Qt::KeepAspectRatio, Qt::SmoothTransformation);
-                    finalImage = &processedImage;
-                }
-                else
-                {
-                    finalImage = &originalImage;
-                }
-
-                m_preview->setPixmap(QPixmap::fromImage(*finalImage));
-            }
-            // Failed to load image so set the preview to nothing
-            else
-            {
-                m_preview->setPixmap(QPixmap());
-            }
-        }
-        // Nothing valid set preview to nothing
-        else
-        {
-            m_preview->setPixmap(QPixmap());
-        }
-    }
-
-    void PropertyImagePreviewCtrl::UpgradeToDefaultValidator()
-    {
-        DefaultImageValidator* newValidator = new DefaultImageValidator(*m_validator);
-        SetValidator(newValidator);
-        // Track the memory allocated for this validator so its deleted
-        ValidatorBus::Broadcast(
-            &ValidatorBus::Handler::TrackValidator,
-            newValidator);
-    }
-
-    void PropertyImagePreviewCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-    {
-        if (attrib == Attributes::DefaultPath)
-        {
-            AZStd::string path;
-            if (attrValue->Read<AZStd::string>(path))
-            {
-                m_defaultPath = path.data();
-            }
-        }
-        else 
-        {
-            PropertyFuncValBrowseEditCtrl::ConsumeAttribute(attrib, attrValue, debugName);
-        }
-    }
-
-    //  Handler  ///////////////////////////////////////////////////////////////////
-
-    PropertyImagePreviewHandler::PropertyImagePreviewHandler(ValidationHandler* valHdlr)
-        : AzToolsFramework::PropertyHandler<AZStd::string, PropertyImagePreviewCtrl>()
-        , m_validationHandler(valHdlr)
-    {}
-
-    AZ::u32 PropertyImagePreviewHandler::GetHandlerName(void) const
-    {
-        return Handlers::ImagePreview;
-    }
-
-    QWidget* PropertyImagePreviewHandler::CreateGUI(QWidget* pParent)
-    {
-        PropertyImagePreviewCtrl* ctrl = aznew PropertyImagePreviewCtrl(pParent);
-        m_validationHandler->AddValidatorCtrl(ctrl);
-        return ctrl;
-    }
-
-    void PropertyImagePreviewHandler::ConsumeAttribute(PropertyImagePreviewCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-    {
-        //This means we are using this as a default image preview
-        if (attrib == Attributes::PropertyIdentfier)
-        {
-            AZStd::string ident;
-            if (attrValue->Read<AZStd::string>(ident))
-            {
-                GUI->UpgradeToDefaultValidator();
-                m_identToCtrl.insert(AZStd::pair<AZStd::string, PropertyImagePreviewCtrl*>(ident, GUI));
-            }
-        }
-        else if (attrib == Attributes::DefaultImagePreview)
-        {
-            AZStd::string ident;
-            if (attrValue->Read<AZStd::string>(ident))
-            {
-                auto defaultPreview = m_identToCtrl.find(ident);
-                if (defaultPreview != m_identToCtrl.end())
-                {
-                    defaultPreview->second->AddOverrideToValidator(GUI);
-                    GUI->SetDefaultImagePreview(defaultPreview->second);
-                }
-                else
-                {
-                    AZ_Assert(false, "Default image select \"%s\" not found.", ident.data());
-                }
-            }
-        }
-        else
-        {
-            GUI->ConsumeAttribute(attrib, attrValue, debugName);
-        }
-    }
-
-    void PropertyImagePreviewHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyImagePreviewCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        instance = GUI->GetValue().toUtf8().data();
-    }
-
-    bool PropertyImagePreviewHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyImagePreviewCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        GUI->SetValue(instance.data());
-        GUI->ForceValidate();
-        return true;
-    }
-
-    PropertyImagePreviewHandler* PropertyImagePreviewHandler::Register(ValidationHandler* valHdlr)
-    {
-        PropertyImagePreviewHandler* handler = aznew PropertyImagePreviewHandler(valHdlr);
-        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
-            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
-            handler);
-        return handler;
-    }
-} // namespace ProjectSettingsTool
-
-#include <moc_PropertyImagePreview.cpp>
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyImagePreview.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyImagePreview.h
deleted file mode 100644
index b0054b59b7..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyImagePreview.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "PropertyFileSelect.h"
-
-#include <AzCore/base.h>
-#include <AzCore/std/containers/unordered_map.h>
-#include <QLabel>
-#endif
-
-// Forward Declaration
-class QValidator;
-
-namespace ProjectSettingsTool
-{
-    // Forward Declaration
-    class ValidationHandler;
-
-    // Used to select a png image from a file dialog then display it
-    class PropertyImagePreviewCtrl
-        : public PropertyFuncValBrowseEditCtrl
-    {
-        Q_OBJECT
-
-    public:
-        PropertyImagePreviewCtrl(QWidget* parent = nullptr);
-
-        // Sets path for the image preview
-        void SetValue(const QString& path) override;
-        // Returns path for the default image preview
-        const QString& DefaultImagePath() const;
-        // Sets path for the default image preview
-        void SetDefaultImagePath(const QString& newPath);
-        // Sets the default image preview control to use for image previews
-        void SetDefaultImagePreview(PropertyImagePreviewCtrl* imageSelect);
-        // Returns current default image select control pointer
-        PropertyImagePreviewCtrl* DefaultImagePreview() const;
-        // Add a specific image override to the default image selects validator
-        void AddOverrideToValidator(PropertyImagePreviewCtrl* preview);
-        // Loads a preview of the image at the current path or default if path isEmpty
-        void LoadPreview();
-        // Upgrades the Validator to a DefaultImageValidator
-        void UpgradeToDefaultValidator();
-
-        virtual void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-
-    protected:
-        AZ_DISABLE_COPY_MOVE(PropertyImagePreviewCtrl);
-
-        void emitSelectClicked();
-
-        // Default image select to use
-        PropertyImagePreviewCtrl* m_defaultImagePreview;
-        // Full Path to default image preview
-        QString m_defaultPath;
-        // Displays the image preview
-        QLabel* m_preview;
-    };
-
-    class PropertyImagePreviewHandler
-        : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyImagePreviewCtrl>
-    {
-        AZ_CLASS_ALLOCATOR(PropertyImagePreviewHandler, AZ::SystemAllocator, 0);
-
-    public:
-        PropertyImagePreviewHandler(ValidationHandler* valHdlr);
-
-        AZ::u32 GetHandlerName(void) const override;
-        // Need to unregister ourselves
-        bool AutoDelete() const override { return false; }
-
-        QWidget* CreateGUI(QWidget* pParent) override;
-        void ConsumeAttribute(PropertyImagePreviewCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-        void WriteGUIValuesIntoProperty(size_t index, PropertyImagePreviewCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-        bool ReadValuesIntoGUI(size_t index, PropertyImagePreviewCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-        static PropertyImagePreviewHandler* Register(ValidationHandler* valHdlr);
-
-    private:
-        AZStd::unordered_map<AZStd::string, PropertyImagePreviewCtrl*> m_identToCtrl;
-        ValidationHandler* m_validationHandler;
-    };
-} // namespace ProjectSettingsTool
-
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyLinked.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyLinked.cpp
deleted file mode 100644
index c4078a51b9..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyLinked.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "PropertyLinked.h"
-
-#include "PlatformSettings_common.h"
-#include "ValidationHandler.h"
-
-#include <QLayout>
-#include <QPushButton>
-#include <QLineEdit>
-
-namespace ProjectSettingsTool
-{
-    PropertyLinkedCtrl::PropertyLinkedCtrl(QWidget* pParent)
-        : PropertyFuncValLineEditCtrl(pParent)
-        , m_linkButton(nullptr)
-        , m_linkedProperty(nullptr)
-        , m_linkEnabled(false)
-    {
-        connect(this, &PropertyFuncValLineEditCtrl::ValueChangedByUser, this, &PropertyLinkedCtrl::MirrorToLinkedProperty);
-    }
-
-    void PropertyLinkedCtrl::SetLinkedProperty(PropertyLinkedCtrl* property)
-    {
-        m_linkedProperty = property;
-        m_linkEnabled = true;
-    }
-
-    void PropertyLinkedCtrl::SetLinkTooltip(const QString& tip)
-    {
-        if (m_linkButton != nullptr)
-        {
-            m_linkButton->setToolTip("Linked to " + tip);
-        }
-    }
-
-    void PropertyLinkedCtrl::MakeLinkButton()
-    {
-        QLayout* myLayout = layout();
-        QIcon icon;
-        icon.addFile("://link.svg", QSize(), QIcon::Normal, QIcon::On);
-        icon.addFile("://broken_link.svg", QSize(), QIcon::Normal, QIcon::Off);
-
-        m_linkButton = new QPushButton(this);
-        m_linkButton->setIcon(icon);
-        m_linkButton->setCheckable(true);
-        m_linkButton->setFlat(true);
-        m_linkButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-        m_linkButton->setFixedSize(QSize(16, 16));
-        m_linkButton->setContentsMargins(0, 0, 0, 0);
-        m_linkButton->setToolTip("Linked to...");
-        myLayout->addWidget(m_linkButton);
-
-        connect(m_linkButton, &QPushButton::clicked, this, &PropertyLinkedCtrl::MirrorLinkButtonState);
-    }
-
-    bool PropertyLinkedCtrl::LinkIsOptional()
-    {
-        return m_linkButton;
-    }
-
-    void PropertyLinkedCtrl::SetOptionalLink(bool linked)
-    {
-        m_linkButton->setChecked(linked);
-    }
-
-    void PropertyLinkedCtrl::MirrorToLinkedProperty()
-    {
-        if (m_linkEnabled && m_linkedProperty != nullptr)
-        {
-            m_linkedProperty->MirrorToLinkedPropertyRecursive(this, m_pLineEdit->text());
-        }
-    }
-
-    void PropertyLinkedCtrl::MirrorToLinkedPropertyRecursive(PropertyLinkedCtrl* caller, const QString& value)
-    {
-        if (caller != this)
-        {
-            if (m_linkButton == nullptr || m_linkButton->isChecked())
-            {
-                // Stop Property from mirroring again
-                m_linkEnabled = false;
-                m_pLineEdit->setText(value);
-                m_linkEnabled = true;
-            }
-            if (m_linkedProperty != nullptr)
-            {
-                m_linkedProperty->MirrorToLinkedPropertyRecursive(caller, value);
-            }
-        }
-    }
-
-    void PropertyLinkedCtrl::MirrorLinkButtonState(bool checked)
-    {
-        if (m_linkedProperty != nullptr)
-        {
-            m_linkedProperty->MirrorLinkButtonStateRecursive(this, checked);
-
-            // Mirror value of property linked was enabled on to all linked fields
-            if (checked)
-            {
-                MirrorToLinkedProperty();
-            }
-        }
-    }
-
-    void PropertyLinkedCtrl::MirrorLinkButtonStateRecursive(PropertyLinkedCtrl* caller, bool state)
-    {
-        if (caller != this)
-        {
-            if (m_linkButton != nullptr)
-            {
-                m_linkButton->setChecked(state);
-            }
-            if (m_linkedProperty != nullptr)
-            {
-                m_linkedProperty->MirrorLinkButtonStateRecursive(caller, state);
-            }
-        }
-    }
-
-    bool PropertyLinkedCtrl::AllLinkedPropertiesEqual()
-    {
-        if (m_linkedProperty != nullptr)
-        {
-            return m_linkedProperty->AllLinkedPropertiesEqual(this, m_pLineEdit->text());
-        }
-        // No linked property so must be equal
-        else
-        {
-            return true;
-        }
-    }
-
-    bool PropertyLinkedCtrl::AllLinkedPropertiesEqual(PropertyLinkedCtrl* caller, const QString& value)
-    {
-        if (caller != this)
-        {
-            // Not equal
-            if (m_pLineEdit->text() != value)
-            {
-                return false;
-            }
-            if (m_linkedProperty != nullptr)
-            {
-                return m_linkedProperty->AllLinkedPropertiesEqual(caller, value);
-            }
-            // All checked properties were equal
-            else
-            {
-                return true;
-            }
-        }
-        // All properties were equal
-        else
-        {
-            return true;
-        }
-    }
-
-    void PropertyLinkedCtrl::SetLinkEnabled(bool enabled)
-    {
-        m_linkEnabled = enabled;
-    }
-
-    void PropertyLinkedCtrl::ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-    {
-        if (attrib == Attributes::LinkOptional && m_linkButton == nullptr)
-        {
-            bool optional = false;
-            if (attrValue->Read<bool>(optional) && optional)
-            {
-                MakeLinkButton();
-            }
-        }
-        else
-        {
-            PropertyFuncValLineEditCtrl::ConsumeAttribute(attrib, attrValue, debugName);
-        }
-    }
-
-    //  Handler  ///////////////////////////////////////////////////////////////////
-
-    PropertyLinkedHandler::PropertyLinkedHandler(ValidationHandler* valHdlr)
-        : AzToolsFramework::PropertyHandler<AZStd::string, PropertyLinkedCtrl>()
-        , m_validationHandler(valHdlr)
-    {}
-
-    AZ::u32 PropertyLinkedHandler::GetHandlerName(void) const
-    {
-        return Handlers::LinkedLineEdit;
-    }
-
-    QWidget* PropertyLinkedHandler::CreateGUI(QWidget* pParent)
-    {
-        PropertyLinkedCtrl* ctrl = aznew PropertyLinkedCtrl(pParent);
-        m_validationHandler->AddValidatorCtrl(ctrl);
-        return ctrl;
-    }
-
-    void PropertyLinkedHandler::ConsumeAttribute(PropertyLinkedCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-    {
-        if (attrib == Attributes::PropertyIdentfier)
-        {
-            AZStd::string ident;
-            if (attrValue->Read<AZStd::string>(ident))
-            {
-                m_identToCtrl.insert(AZStd::pair<AZStd::string, PropertyLinkedCtrl*>(ident, GUI));
-
-                auto result = m_ctrlToIdentAndLink.find(GUI);
-                if (result != m_ctrlToIdentAndLink.end())
-                {
-                    result->second.identifier = ident;
-                }
-                else
-                {
-                    m_ctrlToIdentAndLink.insert(AZStd::pair<PropertyLinkedCtrl*, IdentAndLink>(GUI, IdentAndLink{ ident, "" }));
-                    m_ctrlInitOrder.push_back(GUI);
-                }
-            }
-        }
-        else if (attrib == Attributes::LinkedProperty)
-        {
-            AZStd::string linked;
-            if (attrValue->Read<AZStd::string>(linked))
-            {
-                auto result = m_ctrlToIdentAndLink.find(GUI);
-                if (result != m_ctrlToIdentAndLink.end())
-                {
-                    result->second.linkedIdentifier = linked;
-                }
-                else
-                {
-                    m_ctrlToIdentAndLink.insert(AZStd::pair<PropertyLinkedCtrl*, IdentAndLink>(GUI, IdentAndLink{ "", linked }));
-                    m_ctrlInitOrder.push_back(GUI);
-                }
-
-                GUI->SetLinkTooltip(linked.data());
-            }
-        }
-        else
-        {
-            GUI->ConsumeAttribute(attrib, attrValue, debugName);
-        }
-    }
-
-    void PropertyLinkedHandler::WriteGUIValuesIntoProperty([[maybe_unused]] size_t index, PropertyLinkedCtrl* GUI, property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        instance = GUI->GetValue().toUtf8().data();
-    }
-
-    bool PropertyLinkedHandler::ReadValuesIntoGUI([[maybe_unused]] size_t index, PropertyLinkedCtrl* GUI, const property_t& instance, [[maybe_unused]] AzToolsFramework::InstanceDataNode* node)
-    {
-        GUI->SetValue(instance.data());
-        GUI->ForceValidate();
-        return true;
-    }
-
-    PropertyLinkedHandler* PropertyLinkedHandler::Register(ValidationHandler* valHdlr)
-    {
-        PropertyLinkedHandler* handler = aznew PropertyLinkedHandler(valHdlr);
-        AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(
-            &AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Handler::RegisterPropertyType,
-            handler);
-        return handler;
-    }
-
-    void PropertyLinkedHandler::LinkAllProperties()
-    {
-        // Link all the properties
-        for (PropertyLinkedCtrl* ctrlPointer : m_ctrlInitOrder)
-        {
-            auto property = m_ctrlToIdentAndLink.find(ctrlPointer);
-            auto link = m_identToCtrl.find(property->second.linkedIdentifier);
-            if (link != m_identToCtrl.end())
-            {
-                property->first->SetLinkedProperty(link->second);
-                //Force mirror non-optional links.
-                property->first->MirrorToLinkedProperty();
-            }
-            else
-            {
-                AZ_Assert(false, "Property \"%s\" not found while linking to \"%s\".", property->second.linkedIdentifier.data(), property->second.identifier.data());
-            }
-        }
-        // Enable optional links if all properties in link chain are the same value
-        EnableOptionalLinksIfAllPropertiesEqual();
-    }
-
-    void PropertyLinkedHandler::EnableOptionalLinksIfAllPropertiesEqual()
-    {
-        // Enable optional links if all properties in link chain are the same value
-        for (const AZStd::pair<PropertyLinkedCtrl*, IdentAndLink>& property : m_ctrlToIdentAndLink)
-        {
-            if (property.first->LinkIsOptional())
-            {
-                property.first->SetOptionalLink(property.first->AllLinkedPropertiesEqual());
-            }
-        }
-    }
-
-    void PropertyLinkedHandler::MirrorAllLinkedProperties()
-    {
-        for (PropertyLinkedCtrl* ctrlPointer : m_ctrlInitOrder)
-        {
-            ctrlPointer->MirrorToLinkedProperty();
-        }
-    }
-
-    void PropertyLinkedHandler::DisableAllPropertyLinks()
-    {
-        for (PropertyLinkedCtrl* ctrlPointer : m_ctrlInitOrder)
-        {
-            ctrlPointer->SetLinkEnabled(false);
-        }
-    }
-
-    void PropertyLinkedHandler::EnableAllPropertyLinks()
-    {
-        for (PropertyLinkedCtrl* ctrlPointer : m_ctrlInitOrder)
-        {
-            ctrlPointer->SetLinkEnabled(true);
-        }
-    }
-} // namespace ProjectSettingsTool
-
-#include <moc_PropertyLinked.cpp>
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyLinked.h b/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyLinked.h
deleted file mode 100644
index 05f5bb6459..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/PropertyLinked.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include "PropertyFuncValLineEdit.h"
-
-#include <AzCore/std/containers/unordered_map.h>
-#endif
-
-// Forward declares
-class QPushButton;
-
-namespace ProjectSettingsTool
-{
-    // Forward declare
-    class ValidationHandler;
-
-    class PropertyLinkedCtrl
-        : public PropertyFuncValLineEditCtrl
-    {
-        Q_OBJECT
-
-    public:
-        typedef QString(* FileSelectFuncType)(const QString&);
-
-        PropertyLinkedCtrl(QWidget* pParent = nullptr);
-
-        // Set property this will mirror its values to
-        void SetLinkedProperty(PropertyLinkedCtrl* property);
-        // Set the tooltip on the link button so the user can see what property this is linked to
-        void SetLinkTooltip(const QString& tip);
-        // Returns true if all linked properties are equal
-        bool AllLinkedPropertiesEqual();
-        // Returns true if links are optional on this
-        bool LinkIsOptional();
-        // Set the option link state to given bool
-        void SetOptionalLink(bool linked);
-        // Tries to mirror the value to all linked properties
-        void MirrorToLinkedProperty();
-        // Enabled/disables link regardless of type
-        void SetLinkEnabled(bool enabled);
-
-        void ConsumeAttribute(AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-
-    protected:
-        void MakeLinkButton();
-        void MirrorToLinkedPropertyRecursive(PropertyLinkedCtrl* caller, const QString& value);
-        // Tries to mirror the link button state to all linked properties
-        void MirrorLinkButtonState(bool checked);
-        void MirrorLinkButtonStateRecursive(PropertyLinkedCtrl* caller, bool state);
-        // Returns true if all linked properties are equal
-        bool AllLinkedPropertiesEqual(PropertyLinkedCtrl* caller, const QString& value);
-
-        QPushButton* m_linkButton;
-        PropertyLinkedCtrl* m_linkedProperty;
-        bool m_linkEnabled;
-    };
-
-    class PropertyLinkedHandler
-        : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyLinkedCtrl>
-    {
-        AZ_CLASS_ALLOCATOR(PropertyLinkedHandler, AZ::SystemAllocator, 0);
-
-    public:
-        PropertyLinkedHandler(ValidationHandler* valHdlr);
-
-        AZ::u32 GetHandlerName(void) const override;
-        // Need to unregister ourselves
-        bool AutoDelete() const override { return false; }
-
-        QWidget* CreateGUI(QWidget* pParent) override;
-        void ConsumeAttribute(PropertyLinkedCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
-        void WriteGUIValuesIntoProperty(size_t index, PropertyLinkedCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-        bool ReadValuesIntoGUI(size_t index, PropertyLinkedCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
-        void LinkAllProperties();
-        void EnableOptionalLinksIfAllPropertiesEqual();
-        void MirrorAllLinkedProperties();
-        void DisableAllPropertyLinks();
-        void EnableAllPropertyLinks();
-        static PropertyLinkedHandler* Register(ValidationHandler* valHdlr);
-
-    private:
-        struct IdentAndLink
-        {
-            AZStd::string identifier;
-            AZStd::string linkedIdentifier;
-        };
-        // Map of identifiers to controls
-        AZStd::unordered_map<AZStd::string, PropertyLinkedCtrl*> m_identToCtrl;
-
-        // Map of controls to identifiers and their linked control's identifiers
-        AZStd::unordered_map<PropertyLinkedCtrl*, IdentAndLink> m_ctrlToIdentAndLink;
-        // Keeps track of the order ctrls were initialized
-        AZStd::vector<PropertyLinkedCtrl*> m_ctrlInitOrder;
-        // Tracks all validating properties
-        ValidationHandler* m_validationHandler;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/Utils.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/Utils.cpp
deleted file mode 100644
index c056696fe0..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/Utils.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "Utils.h"
-#include "LastPathBus.h"
-
-#include <AzCore/IO/SystemFile.h>
-#include <AzCore/std/algorithm.h>
-#include <AzCore/Utils/Utils.h>
-
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-
-#include <QFileDialog>
-
-
-namespace
-{
-    template<typename StringType>
-    void ToUnixPath(StringType& path)
-    {
-        AZStd::replace(path.begin(), path.end(), '\\', '/');
-    }
-
-    template<typename StringType>
-    StringType GetAbsoluteDevRoot()
-    {
-        const char* devRoot = nullptr;
-        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
-            devRoot,
-            &AzToolsFramework::AssetSystemRequestBus::Handler::GetAbsoluteDevRootFolderPath);
-
-        if (!devRoot)
-        {
-            return "";
-        }
-
-        StringType devRootString(devRoot);
-        ToUnixPath(devRootString);
-        return devRootString;
-    }
-
-    template<typename StringType>
-    StringType GetAbsoluteProjectRoot()
-    {
-        const char* projectRoot = nullptr;
-        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
-            projectRoot,
-            &AzToolsFramework::AssetSystemRequestBus::Handler::GetAbsoluteDevGameFolderPath);
-
-        if (!projectRoot)
-        {
-            return "";
-        }
-
-        StringType projectRootString(projectRoot);
-        ToUnixPath(projectRootString);
-        return projectRootString;
-    }
-
-    template<typename StringType>
-    StringType GetProjectName();
-
-    template<>
-    AZStd::string GetProjectName()
-    {
-        auto projectName = AZ::Utils::GetProjectName();
-        return AZStd::string{projectName.c_str()};
-    }
-
-    template<>
-    QString GetProjectName()
-    {
-        auto projectName = AZ::Utils::GetProjectName();
-        return QString::fromUtf8(projectName.c_str(), aznumeric_cast<int>(projectName.size()));
-    }
-}
-
-namespace ProjectSettingsTool
-{
-    void* ConvertFunctorToVoid(AZStd::pair<QValidator::State, const QString> (*func)(const QString&))
-    {
-        return reinterpret_cast<void*>(func);
-    }
-
-    AZStd::string GetDevRoot()
-    {
-        return GetAbsoluteDevRoot<AZStd::string>();
-    }
-    AZStd::string GetProjectRoot()
-    {
-        return GetAbsoluteProjectRoot<AZStd::string>();
-    }
-
-    AZStd::string GetProjectName()
-    {
-        return ::GetProjectName<AZStd::string>();
-    }
-
-    QString SelectXmlFromFileDialog(const QString& currentFile)
-    {
-        // The selected file must be relative to this path
-        QString defaultPath = GetAbsoluteDevRoot<QString>();
-        QString startPath;
-
-        // Choose the starting path for file dialog
-        if (currentFile != "")
-        {
-            if (currentFile.contains(defaultPath))
-            {
-                startPath = currentFile;
-            }
-            else
-            {
-                startPath = defaultPath + currentFile;
-            }
-        }
-        else
-        {
-            startPath = defaultPath;
-        }
-
-        QString pickedPath = QFileDialog::getOpenFileName(nullptr, QObject::tr("Select Override"),
-            startPath, QObject::tr("Extensible Markup Language file (*.xml)"));
-        ToUnixPath(pickedPath);
-
-        // Remove the default relative path
-        if (pickedPath.contains(defaultPath))
-        {
-            pickedPath = pickedPath.mid(defaultPath.length());
-        }
-
-        return pickedPath;
-    }
-
-    QString SelectImageFromFileDialog(const QString& currentFile)
-    {
-        QString defaultPath = QStringLiteral("%1Code%2/Resources/").arg(GetAbsoluteDevRoot<QString>(), ::GetProjectName<QString>());
-
-        QString startPath;
-
-        // Choose the starting path for file dialog
-        if (currentFile != "")
-        {
-            if (QDir::isAbsolutePath(currentFile))
-            {
-                startPath = currentFile;
-            }
-            else
-            {
-                startPath = defaultPath + currentFile;
-            }
-        }
-        else
-        {
-            LastPathBus::BroadcastResult(
-                startPath,
-                &LastPathBus::Handler::GetLastImagePath);
-        }
-
-        QString pickedPath = QFileDialog::getOpenFileName(nullptr, QObject::tr("Select Image"),
-            startPath, QObject::tr("Image file (*.png)"));
-        ToUnixPath(pickedPath);
-
-        if (!pickedPath.isEmpty())
-        {
-            LastPathBus::Broadcast(
-                &LastPathBus::Handler::SetLastImagePath,
-                pickedPath.left(pickedPath.lastIndexOf('/')));
-        }
-
-        // Remove the default relative path if it is used
-        if (pickedPath.contains(defaultPath))
-        {
-            pickedPath = pickedPath.mid(defaultPath.length());
-        }
-
-        return pickedPath;
-    }
-
-    AZStd::string GenDefaultImagePath(ImageGroup group, AZStd::string size)
-    {
-        AZStd::string root;
-        // Android
-        if (group <= ImageGroup::AndroidPortrait)
-        {
-            root = GetDevRoot() + "/Code/Tools/Android/ProjectBuilder/app_";
-        }
-        //Ios
-        else
-        {
-            using AZ::IO::SystemFile;
-            root = GetProjectRoot() + "/Gem/Resources/Platform/iOS/Images.xcassets/";
-            if (!SystemFile::Exists(root.c_str()))
-            {
-                root = GetProjectRoot() + "/Gem/Resources/IOSLauncher/Images.xcassets/";
-            }
-        }
-
-        AZStd::string groupStr;
-        switch (group)
-        {
-        case ImageGroup::AndroidIcons:
-            groupStr = "icon-";
-            break;
-        case ImageGroup::AndroidLandscape:
-            groupStr = "splash-land-";
-            break;
-        case ImageGroup::AndroidPortrait:
-            groupStr = "splash-port-";
-            break;
-        case ImageGroup::IosIcons:
-            groupStr = "AppIcon.appiconset/";
-            break;
-        case ImageGroup::IosLaunchScreens:
-            groupStr = "LaunchImage.launchimage/";
-            break;
-        default:
-            AZ_Assert(false, "Unknown ImageGroup.");
-            break;
-        }
-
-        return root + groupStr + size + ".png";
-    }
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/Utils.h b/Code/Sandbox/Plugins/ProjectSettingsTool/Utils.h
deleted file mode 100644
index 7b21ccc2f1..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/Utils.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/std/string/string.h>
-
-#include <QString>
-#include <QValidator>
-
-
-namespace ProjectSettingsTool
-{
-    void* ConvertFunctorToVoid(AZStd::pair<QValidator::State, const QString>(*func)(const QString&));
-    AZStd::string GetDevRoot();
-    AZStd::string GetProjectRoot();
-    AZStd::string GetProjectName();
-
-    // Open file dialogs for each file type and return the result
-    // CurrentFile is where the dialog opens
-    QString SelectXmlFromFileDialog(const QString& currentFile);
-    QString SelectImageFromFileDialog(const QString& currentFile);
-
-    enum class ImageGroup
-    {
-        AndroidIcons,
-        AndroidLandscape,
-        AndroidPortrait,
-        IosIcons,
-        IosLaunchScreens
-    };
-
-    AZStd::string GenDefaultImagePath(ImageGroup group, AZStd::string size);
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ValidationHandler.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/ValidationHandler.cpp
deleted file mode 100644
index 6ecde10d9f..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ValidationHandler.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-
-#include "ValidationHandler.h"
-
-#include "PropertyFuncValLineEdit.h"
-#include "PropertyFuncValBrowseEdit.h"
-
-namespace ProjectSettingsTool
-{
-    void ValidationHandler::AddValidatorCtrl(PropertyFuncValLineEditCtrl* ctrl)
-    {
-        m_validators.push_back(ctrl);
-    }
-
-    void ValidationHandler::AddValidatorCtrl(PropertyFuncValBrowseEditCtrl* ctrl)
-    {
-        m_browseEditValidators.push_back(ctrl);
-    }
-
-    bool ValidationHandler::AllValid()
-    {
-        for (PropertyFuncValLineEditCtrl* ctrl : m_validators)
-        {
-            if (!ctrl->ValidateAndShowErrors())
-            {
-                return false;
-            }
-        }
-
-        for (PropertyFuncValBrowseEditCtrl* ctrl : m_browseEditValidators)
-        {
-            if (!ctrl->ValidateAndShowErrors())
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ValidationHandler.h b/Code/Sandbox/Plugins/ProjectSettingsTool/ValidationHandler.h
deleted file mode 100644
index a02ab29c75..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ValidationHandler.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/std/containers/vector.h>
-
-namespace ProjectSettingsTool
-{
-    // Forward Declare
-    class PropertyFuncValLineEditCtrl;
-    class PropertyFuncValBrowseEditCtrl;
-
-    class ValidationHandler
-    {
-    public:
-        void AddValidatorCtrl(PropertyFuncValLineEditCtrl* ctrl);
-        void AddValidatorCtrl(PropertyFuncValBrowseEditCtrl* ctrl);
-        bool AllValid();
-    private:
-        AZStd::vector<PropertyFuncValLineEditCtrl*> m_validators;
-        AZStd::vector<PropertyFuncValBrowseEditCtrl*> m_browseEditValidators;
-    };
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/ValidatorBus.h b/Code/Sandbox/Plugins/ProjectSettingsTool/ValidatorBus.h
deleted file mode 100644
index fde91c2e7f..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/ValidatorBus.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "FunctorValidator.h"
-
-#include <AzCore/EBus/EBus.h>
-
-namespace ProjectSettingsTool
-{
-    class ValidatorTraits
-        : public AZ::EBusTraits
-    {
-    public:
-        using Bus = AZ::EBus<ValidatorTraits>;
-
-        // Bus Configuration
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-
-        virtual FunctorValidator* GetValidator(FunctorValidator::FunctorType) = 0;
-        virtual void TrackValidator(FunctorValidator*) = 0;
-    };
-
-    typedef AZ::EBus<ValidatorTraits> ValidatorBus;
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/Validators.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/Validators.cpp
deleted file mode 100644
index 51525d5d96..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/Validators.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ProjectSettingsTool_precompiled.h"
-#include "Validators.h"
-
-#include <QDir>
-#include <QMimeDatabase>
-#include <QRegularExpression>
-
-#define STANDARD_SUCCESS ProjectSettingsTool::FunctorValidator::ReturnType(QValidator::Acceptable, "");
-
-namespace 
-{
-    typedef ProjectSettingsTool::FunctorValidator::ReturnType RetType;
-
-    static const int noMaxLength = -1;
-    static const int maxIosVersionLength = 18;
-    static const int androidPublicAppKeyLength = 392;
-    static const char* xmlRelativePath = "Code/Tools/RC/Config/rc/";
-    static const char* xmlMimeType = "application/xml";
-    static const char* stringEmpty = "String is empty";
-
-    // Returns true if string is valid android package and apple bundle identifier
-    RetType RegularExpressionValidator(const QString& pattern, const QString& name, int maxLength = noMaxLength)
-    {
-        if (maxLength != noMaxLength && name.length() > maxLength)
-        {
-            return RetType(QValidator::Invalid, QObject::tr("Cannot be longer than %1 characters.")
-                    .arg(QString::number(maxLength)));
-        }
-        else if (name.isEmpty())
-        {
-            return RetType(QValidator::Intermediate, QObject::tr(stringEmpty));
-        }
-
-        QRegularExpression regex(pattern);
-
-        QRegularExpressionMatch match = regex.match(name, 0, QRegularExpression::PartialPreferCompleteMatch);
-
-        if (match.hasMatch())
-        {
-            if (match.capturedLength(0) == name.length())
-            {
-                return STANDARD_SUCCESS;
-            }
-            else
-            {
-                return RetType(QValidator::Intermediate, "Input incorrect.");
-            }
-        }
-        if (match.hasPartialMatch())
-        {
-            return RetType(QValidator::Intermediate, QObject::tr("Partially matches requirements."));
-        }
-        else
-        {
-            return RetType(QValidator::Invalid, QObject::tr("Fails to match requirements at all."));
-        }
-    }
-}
-
-namespace ProjectSettingsTool
-{
-    namespace Validators
-    {
-        namespace Internal
-        {
-            // Returns true if file is readable and the correct mime type
-            RetType FileReadableAndCorrectType(const QString& path, const QString& fileType)
-            {
-                QDir dirPath(path);
-
-                if (dirPath.isReadable())
-                {
-                    QMimeDatabase mimeDB;
-                    QMimeType mimeType = mimeDB.mimeTypeForFile(path);
-
-                    if (mimeType.name() == fileType)
-                    {
-                        return STANDARD_SUCCESS;
-                    }
-                    else
-                    {
-                        return RetType(QValidator::Intermediate, QObject::tr("File type should be %1, but is %2.")
-                                .arg(fileType).arg(mimeType.name()));
-                    }
-                }
-                else
-                {
-                    return RetType(QValidator::Intermediate, QObject::tr("File is not readable."));
-                }
-            }
-        } // namespace Internal
-
-
-        // Returns true if valid cross platform file or directory name
-        RetType FileName(const QString& name)
-        {
-            // There was a known issue on android with '.' used in directory names
-            // causing problems so it has been omitted from use
-            return RegularExpressionValidator("[\\w,-]+", name);
-        }
-
-        RetType FileNameOrEmpty(const QString& name)
-        {
-            if (IsNotEmpty(name).first == QValidator::Acceptable)
-            {
-                return FileName(name);
-            }
-            else
-            {
-                return STANDARD_SUCCESS;
-            }
-        }
-
-        // Returns true if string isn't empty
-        RetType IsNotEmpty(const QString& value)
-        {
-            if (!value.isEmpty())
-            {
-                return STANDARD_SUCCESS;
-            }
-            else
-            {
-                return RetType(QValidator::Intermediate, QObject::tr(stringEmpty));
-            }
-        }
-
-        // Returns true if string is valid as a boolean
-        RetType BoolString(const QString& value)
-        {
-            if (value == "true" || value == "false")
-            {
-                return STANDARD_SUCCESS;
-            }
-
-            return RetType(QValidator::Invalid, QObject::tr("Invalid bool string."));
-        }
-
-        // Returns true if string is valid android package and apple bundle identifier
-        RetType PackageName(const QString& name)
-        {
-            return RegularExpressionValidator("[a-zA-Z][A-Za-z0-9]*(\\.[a-zA-Z][A-Za-z0-9]*)+", name);
-        }
-
-        // Returns true if valid android version number
-        RetType VersionNumber(const QString& value)
-        {
-            // Error handling built in already
-            int ver = value.toInt();
-
-            if (0 >= ver)
-            {
-                return RetType(QValidator::Invalid, QObject::tr("Version must be greater than 0."));
-            }
-            else if (ver > maxAndroidVersion)
-            {
-                return RetType(QValidator::Invalid, QObject::tr("Version must be less than or equal to %1.")
-                        .arg(QString::number(maxAndroidVersion)));
-            }
-            else
-            {
-                return STANDARD_SUCCESS;
-            }
-        }
-
-        // Returns true if valid ios version number
-        RetType IOSVersionNumber(const QString& value)
-        {
-            return RegularExpressionValidator
-                       ("(0|[1-9][0-9]{0,8}|[1-2][0-1][0-9]{0,8})(\\.(0|[1-9][0-9]{0,8}|[1-2][0-1][0-9]{0,8})){0,2}",
-                       value,
-                       maxIosVersionLength);
-        }
-
-        // Returns true if Public App Key is valid length
-        RetType PublicAppKeyOrEmpty(const QString& value)
-        {
-            // If anyone knows that public app keys are not always 392 chars long
-            // then this MUST be changed
-            if (value.isEmpty() || value.length() == androidPublicAppKeyLength)
-            {
-                return STANDARD_SUCCESS;
-            }
-            else
-            {
-                return RetType(QValidator::Intermediate, QObject::tr("App key should be %1 characters long.")
-                        .arg(QString::number(androidPublicAppKeyLength)));
-            }
-        }
-        // Returns true if path is empty or a valid xml file relative to <build dir>
-        RetType ValidXmlOrEmpty(const QString& path)
-        {
-            if (IsNotEmpty(path).first == QValidator::Acceptable)
-            {
-                return Internal::FileReadableAndCorrectType(xmlRelativePath + path, xmlMimeType);
-            }
-            else
-            {
-                return STANDARD_SUCCESS;
-            }
-        }
-
-        // Returns true if path is empty or a valid png file
-        RetType ValidPngOrEmpty(const QString& path)
-        {
-            if (IsNotEmpty(path).first == QValidator::Acceptable)
-            {
-                return Internal::FileReadableAndCorrectType(path, pngMimeType);
-            }
-            else
-            {
-                return STANDARD_SUCCESS;
-            }
-        }
-    } // namespace Validators
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/Validators.h b/Code/Sandbox/Plugins/ProjectSettingsTool/Validators.h
deleted file mode 100644
index 9013ae30f3..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/Validators.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include "FunctorValidator.h"
-
-namespace ProjectSettingsTool
-{
-    namespace Validators
-    {
-        namespace Internal 
-        {
-            // Returns true if file is readable and the correct mime type
-            FunctorValidator::ReturnType FileReadableAndCorrectType(const QString& path, const QString& fileType);
-        }
-
-        static const int maxAndroidVersion = 2100000000;
-
-        // Returns true if valid cross platform file or directory name
-        FunctorValidator::ReturnType FileName(const QString& name);
-        // Returns true if valid cross platform file or directory name or empty
-        FunctorValidator::ReturnType FileNameOrEmpty(const QString& name);
-        // Returns true if string isn't empty
-        FunctorValidator::ReturnType IsNotEmpty(const QString& value);
-        // Returns true if string is valid as a boolean
-        FunctorValidator::ReturnType BoolString(const QString& value);
-        // Returns true if string is valid android package and apple bundle identifier
-        FunctorValidator::ReturnType PackageName(const QString& name);
-        // Returns true if valid android version number
-        FunctorValidator::ReturnType VersionNumber(const QString& value);
-        // Returns true if valid ios version number
-        FunctorValidator::ReturnType IOSVersionNumber(const QString& value);
-        // Returns true if Public App Key is valid length
-        FunctorValidator::ReturnType PublicAppKeyOrEmpty(const QString& value);
-        // Returns true if path is empty or a valid xml file relative to <build dir>
-        FunctorValidator::ReturnType ValidXmlOrEmpty(const QString& path);
-        // Returns true if path is empty or a valid png file
-        FunctorValidator::ReturnType ValidPngOrEmpty(const QString& path);
-        // Returns true if path is empty or valid png file with specified dimensions
-        template <int imageWidth, int imageHeight = imageWidth>
-        FunctorValidator::ReturnType PngImageSetSizeOrEmpty(const QString& path);
-    } // namespace Validators
-} // namespace ProjectSettingsTool
-
-#include "Validators_impl.h"
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/Validators_impl.h b/Code/Sandbox/Plugins/ProjectSettingsTool/Validators_impl.h
deleted file mode 100644
index 577eb4b4f4..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/Validators_impl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <QImage>
-
-namespace ProjectSettingsTool
-{
-    namespace Validators
-    {
-        static const char* pngMimeType = "image/png";
-
-        // Returns true if path is empty or valid png file with specified dimensions
-        template <int imageWidth, int imageHeight>
-        FunctorValidator::ReturnType PngImageSetSizeOrEmpty(const QString& path)
-        {
-            using RetType = FunctorValidator::ReturnType;
-
-            if (IsNotEmpty(path).first != QValidator::Acceptable)
-            {
-                return FunctorValidator::ReturnType(QValidator::Acceptable, "");
-            }
-            else
-            {
-                RetType correct = Internal::FileReadableAndCorrectType(path, pngMimeType);
-
-                if (correct.first)
-                {
-                    QImage image(path);
-
-                    if (imageWidth == image.width() && imageHeight == image.height())
-                    {
-                        return FunctorValidator::ReturnType(QValidator::Acceptable, "");
-                    }
-                    else
-                    {
-                        return RetType(QValidator::Intermediate, QObject::tr("Image is not %1x%2 pixels.")
-                                .arg(QString::number(imageWidth)).arg(QString::number(imageHeight)));
-                    }
-                }
-                else
-                {
-                    return correct;
-                }
-            }
-        }
-    } // namespace Validators
-} // namespace ProjectSettingsTool
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/main.cpp b/Code/Sandbox/Plugins/ProjectSettingsTool/main.cpp
deleted file mode 100644
index c4fa47f684..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/main.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "ProjectSettingsTool_precompiled.h"
-
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/ViewPaneOptions.h>
-
-#include <Include/IPlugin.h>
-
-#include "ProjectSettingsToolWindow.h"
-#include "../Editor/LyViewPaneNames.h"
-
-
-class ProjectSettingsToolPlugin
-    : public IPlugin
-{
-public:
-    ProjectSettingsToolPlugin([[maybe_unused]] IEditor* editor)
-    {
-        AzToolsFramework::ViewPaneOptions options;
-        options.showInMenu = false;
-        AzToolsFramework::RegisterViewPane<ProjectSettingsTool::ProjectSettingsToolWindow>(LyViewPane::ProjectSettingsTool, LyViewPane::ProjectSettingsTool, options);
-    }
-
-    void Release() override
-    {
-        AzToolsFramework::UnregisterViewPane(LyViewPane::ProjectSettingsTool);
-        delete this;
-    }
-
-    void ShowAbout() override {}
-
-    const char* GetPluginGUID() override { return "{C5B96A1A-036A-46F9-B7F0-5DF93494F988}"; }
-    DWORD GetPluginVersion() override { return 1; }
-    const char* GetPluginName() override { return "ProjectSettingsTool"; }
-    bool CanExitNow() override { return true; }
-    void OnEditorNotify([[maybe_unused]] EEditorNotifyEvent aEventId) override {}
-};
-
-PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
-{
-    ISystem* pSystem = pInitParam->pIEditorInterface->GetSystem();
-    ModuleInitISystem(pSystem, "ProjectSettingsTool");
-    // the above line initializes the gEnv global variable if necessary, and also makes GetIEditor() and other similar functions work correctly.
-
-    return new ProjectSettingsToolPlugin(GetIEditor());
-}
-
-#if defined(AZ_PLATFORM_WINDOWS)
-HINSTANCE g_hInstance = 0;
-BOOL __stdcall DllMain(HINSTANCE hinstDLL, ULONG fdwReason, [[maybe_unused]] LPVOID lpvReserved)
-{
-    if (fdwReason == DLL_PROCESS_ATTACH)
-    {
-        g_hInstance = hinstDLL;
-    }
-
-    return TRUE;
-}
-#endif
diff --git a/Code/Sandbox/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake b/Code/Sandbox/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
deleted file mode 100644
index ddeac31150..0000000000
--- a/Code/Sandbox/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    main.cpp
-    ProjectSettingsTool_precompiled.h
-    DefaultImageValidator.cpp
-    DefaultImageValidator.h
-    FunctorValidator.cpp
-    FunctorValidator.h
-    LastPathBus.h
-    Platforms.h
-    PlatformSettings.h
-    PlatformSettings_Android.cpp
-    PlatformSettings_Android.h
-    PlatformSettings_Base.cpp
-    PlatformSettings_Base.h
-    PlatformSettings_common.h
-    PlatformSettings_Ios.cpp
-    PlatformSettings_Ios.h
-    PlistDictionary.cpp
-    PlistDictionary.h
-    ProjectSettingsContainer.cpp
-    ProjectSettingsContainer.h
-    ProjectSettingsSerialization.cpp
-    ProjectSettingsSerialization.h
-    ProjectSettingsTool.qrc
-    ProjectSettingsToolWidget.ui
-    ProjectSettingsToolWindow.cpp
-    ProjectSettingsToolWindow.h
-    ProjectSettingsValidator.cpp
-    ProjectSettingsValidator.h
-    PropertyFileSelect.cpp
-    PropertyFileSelect.h
-    PropertyFuncValBrowseEdit.cpp
-    PropertyFuncValBrowseEdit.h
-    PropertyFuncValLineEdit.cpp
-    PropertyFuncValLineEdit.h
-    PropertyImagePreview.cpp
-    PropertyImagePreview.h
-    PropertyLinked.cpp
-    PropertyLinked.h
-    Utils.cpp
-    Utils.h
-    ValidationHandler.cpp
-    ValidationHandler.h
-    ValidatorBus.h
-    Validators.cpp
-    Validators.h
-    Validators_impl.h
-)
diff --git a/Code/Tools/AWSNativeSDKInit/CMakeLists.txt b/Code/Tools/AWSNativeSDKInit/CMakeLists.txt
index 2d85e796a4..48ae3691be 100644
--- a/Code/Tools/AWSNativeSDKInit/CMakeLists.txt
+++ b/Code/Tools/AWSNativeSDKInit/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_files.cmake b/Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_files.cmake
index 6fef805893..da24797b81 100644
--- a/Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_files.cmake
+++ b/Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSLogSystemInterface.h b/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSLogSystemInterface.h
index ba1c5884ae..90533abc16 100644
--- a/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSLogSystemInterface.h
+++ b/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSLogSystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSMemoryInterface.h b/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSMemoryInterface.h
index 2d85358b99..6d7ddb3ebf 100644
--- a/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSMemoryInterface.h
+++ b/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSMemoryInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSNativeSDKInit.h b/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSNativeSDKInit.h
index 7524f40515..c73963ba35 100644
--- a/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSNativeSDKInit.h
+++ b/Code/Tools/AWSNativeSDKInit/include/AWSNativeSDKInit/AWSNativeSDKInit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp b/Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp
index 76fbb7b44e..12698d021b 100644
--- a/Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp
+++ b/Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AWSNativeSDKInit/source/AWSMemoryInterface.cpp b/Code/Tools/AWSNativeSDKInit/source/AWSMemoryInterface.cpp
index c78b57991a..b38d229631 100644
--- a/Code/Tools/AWSNativeSDKInit/source/AWSMemoryInterface.cpp
+++ b/Code/Tools/AWSNativeSDKInit/source/AWSMemoryInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp b/Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp
index 8ec944031b..97802a1516 100644
--- a/Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp
+++ b/Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AWSNativeSDKInit/source/Platform/Android/platform_android_files.cmake b/Code/Tools/AWSNativeSDKInit/source/Platform/Android/platform_android_files.cmake
index 3ecd6f22d1..0ec1f30fea 100644
--- a/Code/Tools/AWSNativeSDKInit/source/Platform/Android/platform_android_files.cmake
+++ b/Code/Tools/AWSNativeSDKInit/source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AWSNativeSDKInit/source/Platform/Common/Default/AWSNativeSDKInit_Default.cpp b/Code/Tools/AWSNativeSDKInit/source/Platform/Common/Default/AWSNativeSDKInit_Default.cpp
index bf9b7070e2..d38c3507d5 100644
--- a/Code/Tools/AWSNativeSDKInit/source/Platform/Common/Default/AWSNativeSDKInit_Default.cpp
+++ b/Code/Tools/AWSNativeSDKInit/source/Platform/Common/Default/AWSNativeSDKInit_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AWSNativeSDKInit/source/Platform/Linux/platform_linux_files.cmake b/Code/Tools/AWSNativeSDKInit/source/Platform/Linux/platform_linux_files.cmake
index 3ecd6f22d1..0ec1f30fea 100644
--- a/Code/Tools/AWSNativeSDKInit/source/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Tools/AWSNativeSDKInit/source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AWSNativeSDKInit/source/Platform/Mac/platform_mac_files.cmake b/Code/Tools/AWSNativeSDKInit/source/Platform/Mac/platform_mac_files.cmake
index 3ecd6f22d1..0ec1f30fea 100644
--- a/Code/Tools/AWSNativeSDKInit/source/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Tools/AWSNativeSDKInit/source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AWSNativeSDKInit/source/Platform/Windows/platform_windows_files.cmake b/Code/Tools/AWSNativeSDKInit/source/Platform/Windows/platform_windows_files.cmake
index 3ecd6f22d1..0ec1f30fea 100644
--- a/Code/Tools/AWSNativeSDKInit/source/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Tools/AWSNativeSDKInit/source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AWSNativeSDKInit/source/Platform/iOS/platform_ios_files.cmake b/Code/Tools/AWSNativeSDKInit/source/Platform/iOS/platform_ios_files.cmake
index 3ecd6f22d1..0ec1f30fea 100644
--- a/Code/Tools/AWSNativeSDKInit/source/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Tools/AWSNativeSDKInit/source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Android/ProjectBuilder/ProjectActivity.java b/Code/Tools/Android/ProjectBuilder/ProjectActivity.java
index ab1eadb126..c1ce080b83 100644
--- a/Code/Tools/Android/ProjectBuilder/ProjectActivity.java
+++ b/Code/Tools/Android/ProjectBuilder/ProjectActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/CMakeLists.txt b/Code/Tools/AssetBundler/CMakeLists.txt
index 289905255d..8aad0b830a 100644
--- a/Code/Tools/AssetBundler/CMakeLists.txt
+++ b/Code/Tools/AssetBundler/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/Platform/Linux/PAL_linux.cmake b/Code/Tools/AssetBundler/Platform/Linux/PAL_linux.cmake
index 0499b5d3cd..b98656c564 100644
--- a/Code/Tools/AssetBundler/Platform/Linux/PAL_linux.cmake
+++ b/Code/Tools/AssetBundler/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/Platform/Linux/assetbundlergui_linux_files.cmake b/Code/Tools/AssetBundler/Platform/Linux/assetbundlergui_linux_files.cmake
index 87d1da1cec..fa1e3e8629 100644
--- a/Code/Tools/AssetBundler/Platform/Linux/assetbundlergui_linux_files.cmake
+++ b/Code/Tools/AssetBundler/Platform/Linux/assetbundlergui_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp b/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp
index d8c367a2ab..76379a4bf0 100644
--- a/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp
+++ b/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/Platform/Mac/PAL_mac.cmake b/Code/Tools/AssetBundler/Platform/Mac/PAL_mac.cmake
index 0499b5d3cd..b98656c564 100644
--- a/Code/Tools/AssetBundler/Platform/Mac/PAL_mac.cmake
+++ b/Code/Tools/AssetBundler/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/Platform/Mac/assetbundlergui_mac_files.cmake b/Code/Tools/AssetBundler/Platform/Mac/assetbundlergui_mac_files.cmake
index 86c8917a41..46b2cab58b 100644
--- a/Code/Tools/AssetBundler/Platform/Mac/assetbundlergui_mac_files.cmake
+++ b/Code/Tools/AssetBundler/Platform/Mac/assetbundlergui_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/Platform/Mac/source/utils/GUIApplicationManager_OSX.cpp b/Code/Tools/AssetBundler/Platform/Mac/source/utils/GUIApplicationManager_OSX.cpp
index d8c367a2ab..76379a4bf0 100644
--- a/Code/Tools/AssetBundler/Platform/Mac/source/utils/GUIApplicationManager_OSX.cpp
+++ b/Code/Tools/AssetBundler/Platform/Mac/source/utils/GUIApplicationManager_OSX.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/Platform/Windows/PAL_windows.cmake b/Code/Tools/AssetBundler/Platform/Windows/PAL_windows.cmake
index 0499b5d3cd..b98656c564 100644
--- a/Code/Tools/AssetBundler/Platform/Windows/PAL_windows.cmake
+++ b/Code/Tools/AssetBundler/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/Platform/Windows/assetbundlergui_windows_files.cmake b/Code/Tools/AssetBundler/Platform/Windows/assetbundlergui_windows_files.cmake
index eb2d845d61..006ae7bea4 100644
--- a/Code/Tools/AssetBundler/Platform/Windows/assetbundlergui_windows_files.cmake
+++ b/Code/Tools/AssetBundler/Platform/Windows/assetbundlergui_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/Platform/Windows/source/utils/GUIApplicationManager_Win.cpp b/Code/Tools/AssetBundler/Platform/Windows/source/utils/GUIApplicationManager_Win.cpp
index f9723008fb..cb53797fb4 100644
--- a/Code/Tools/AssetBundler/Platform/Windows/source/utils/GUIApplicationManager_Win.cpp
+++ b/Code/Tools/AssetBundler/Platform/Windows/source/utils/GUIApplicationManager_Win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/assetbundler_exe_files.cmake b/Code/Tools/AssetBundler/assetbundler_exe_files.cmake
index 27bc857d44..baa200aacd 100644
--- a/Code/Tools/AssetBundler/assetbundler_exe_files.cmake
+++ b/Code/Tools/AssetBundler/assetbundler_exe_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/assetbundlerbatch_exe_files.cmake b/Code/Tools/AssetBundler/assetbundlerbatch_exe_files.cmake
index 27c7de8545..59edf3cfd5 100644
--- a/Code/Tools/AssetBundler/assetbundlerbatch_exe_files.cmake
+++ b/Code/Tools/AssetBundler/assetbundlerbatch_exe_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/assetbundlerbatch_files.cmake b/Code/Tools/AssetBundler/assetbundlerbatch_files.cmake
index 02731afe87..63a1854ad9 100644
--- a/Code/Tools/AssetBundler/assetbundlerbatch_files.cmake
+++ b/Code/Tools/AssetBundler/assetbundlerbatch_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/assetbundlerbatch_test_files.cmake b/Code/Tools/AssetBundler/assetbundlerbatch_test_files.cmake
index 3e2611c889..5fc1cb3af1 100644
--- a/Code/Tools/AssetBundler/assetbundlerbatch_test_files.cmake
+++ b/Code/Tools/AssetBundler/assetbundlerbatch_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/assetbundlergui_files.cmake b/Code/Tools/AssetBundler/assetbundlergui_files.cmake
index ce99dc176f..029409d01d 100644
--- a/Code/Tools/AssetBundler/assetbundlergui_files.cmake
+++ b/Code/Tools/AssetBundler/assetbundlergui_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetBundler/source/main.cpp b/Code/Tools/AssetBundler/source/main.cpp
index 4bfa86842e..2f5631e2a4 100644
--- a/Code/Tools/AssetBundler/source/main.cpp
+++ b/Code/Tools/AssetBundler/source/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.cpp b/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.cpp
index cba749677e..02d57a214d 100644
--- a/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.cpp
+++ b/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.h b/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.h
index dd79301155..c49aa01f63 100644
--- a/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.h
+++ b/Code/Tools/AssetBundler/source/models/AssetBundlerAbstractFileTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.cpp b/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.cpp
index 84e9cbd242..02e982c8b0 100644
--- a/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.cpp
+++ b/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.h b/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.h
index e1b29f49e6..8ec3ed929f 100644
--- a/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.h
+++ b/Code/Tools/AssetBundler/source/models/AssetBundlerFileTableFilterModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.cpp b/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.cpp
index 78ff61ff7c..025284a722 100644
--- a/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.cpp
+++ b/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.h b/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.h
index 53e703b537..5622209c63 100644
--- a/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.h
+++ b/Code/Tools/AssetBundler/source/models/AssetListFileTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/AssetListTableModel.cpp b/Code/Tools/AssetBundler/source/models/AssetListTableModel.cpp
index 2748d323ae..e6b74f9506 100644
--- a/Code/Tools/AssetBundler/source/models/AssetListTableModel.cpp
+++ b/Code/Tools/AssetBundler/source/models/AssetListTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/AssetListTableModel.h b/Code/Tools/AssetBundler/source/models/AssetListTableModel.h
index d249b1f72a..cfa4eb589f 100644
--- a/Code/Tools/AssetBundler/source/models/AssetListTableModel.h
+++ b/Code/Tools/AssetBundler/source/models/AssetListTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/BundleFileListModel.cpp b/Code/Tools/AssetBundler/source/models/BundleFileListModel.cpp
index 514734c94d..0ecef3cf8b 100644
--- a/Code/Tools/AssetBundler/source/models/BundleFileListModel.cpp
+++ b/Code/Tools/AssetBundler/source/models/BundleFileListModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/BundleFileListModel.h b/Code/Tools/AssetBundler/source/models/BundleFileListModel.h
index 0de09c82ca..dd908a9551 100644
--- a/Code/Tools/AssetBundler/source/models/BundleFileListModel.h
+++ b/Code/Tools/AssetBundler/source/models/BundleFileListModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/RulesFileTableModel.cpp b/Code/Tools/AssetBundler/source/models/RulesFileTableModel.cpp
index 2a9dcd3be3..e34a6a5613 100644
--- a/Code/Tools/AssetBundler/source/models/RulesFileTableModel.cpp
+++ b/Code/Tools/AssetBundler/source/models/RulesFileTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/RulesFileTableModel.h b/Code/Tools/AssetBundler/source/models/RulesFileTableModel.h
index 5af7da48ec..afc7301856 100644
--- a/Code/Tools/AssetBundler/source/models/RulesFileTableModel.h
+++ b/Code/Tools/AssetBundler/source/models/RulesFileTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.cpp b/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.cpp
index b125a5ef4f..fe57c92a11 100644
--- a/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.cpp
+++ b/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.h b/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.h
index 18c8ba0e77..040d581797 100644
--- a/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.h
+++ b/Code/Tools/AssetBundler/source/models/SeedListFileTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/SeedListTableModel.cpp b/Code/Tools/AssetBundler/source/models/SeedListTableModel.cpp
index 5b21ac00da..051716ee08 100644
--- a/Code/Tools/AssetBundler/source/models/SeedListTableModel.cpp
+++ b/Code/Tools/AssetBundler/source/models/SeedListTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/models/SeedListTableModel.h b/Code/Tools/AssetBundler/source/models/SeedListTableModel.h
index be9f6fb8d8..914a1a2f54 100644
--- a/Code/Tools/AssetBundler/source/models/SeedListTableModel.h
+++ b/Code/Tools/AssetBundler/source/models/SeedListTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/AddSeedDialog.cpp b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.cpp
index 87961cb96b..a1b8f83395 100644
--- a/Code/Tools/AssetBundler/source/ui/AddSeedDialog.cpp
+++ b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/AddSeedDialog.h b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.h
index 5f6fccd9fd..000ad2c4c7 100644
--- a/Code/Tools/AssetBundler/source/ui/AddSeedDialog.h
+++ b/Code/Tools/AssetBundler/source/ui/AddSeedDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.cpp
index 7bb2f38b00..a5f2f256fd 100644
--- a/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.cpp
+++ b/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.h b/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.h
index 6293188a1c..d1b383c0e1 100644
--- a/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.h
+++ b/Code/Tools/AssetBundler/source/ui/AssetBundlerTabWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.cpp
index 0117a50e1f..5aabbfbca6 100644
--- a/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.cpp
+++ b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.h b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.h
index bf381e2753..72e61a9711 100644
--- a/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.h
+++ b/Code/Tools/AssetBundler/source/ui/AssetListTabWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.cpp
index edef96bfc5..bdf5f07478 100644
--- a/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.cpp
+++ b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.h b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.h
index ef36fe8c48..72774d29c1 100644
--- a/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.h
+++ b/Code/Tools/AssetBundler/source/ui/BundleListTabWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.cpp b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.cpp
index bcffda7130..5bfb163b96 100644
--- a/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.cpp
+++ b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.h b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.h
index 4a296317e4..e02533813e 100644
--- a/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.h
+++ b/Code/Tools/AssetBundler/source/ui/ComparisonDataWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/EditSeedDialog.cpp b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.cpp
index 0406cb44c0..61cac828ec 100644
--- a/Code/Tools/AssetBundler/source/ui/EditSeedDialog.cpp
+++ b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/EditSeedDialog.h b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.h
index f8b5782f4d..78d4da4916 100644
--- a/Code/Tools/AssetBundler/source/ui/EditSeedDialog.h
+++ b/Code/Tools/AssetBundler/source/ui/EditSeedDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.cpp b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.cpp
index bd724f0f0e..4b28cfdc8b 100644
--- a/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.cpp
+++ b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.h b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.h
index 06fc173ff1..4b2948eae3 100644
--- a/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.h
+++ b/Code/Tools/AssetBundler/source/ui/GenerateBundlesModal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/MainWindow.cpp b/Code/Tools/AssetBundler/source/ui/MainWindow.cpp
index 0846a1e995..ea8b2456b9 100644
--- a/Code/Tools/AssetBundler/source/ui/MainWindow.cpp
+++ b/Code/Tools/AssetBundler/source/ui/MainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/MainWindow.h b/Code/Tools/AssetBundler/source/ui/MainWindow.h
index fec26253d5..86af90e3eb 100644
--- a/Code/Tools/AssetBundler/source/ui/MainWindow.h
+++ b/Code/Tools/AssetBundler/source/ui/MainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/NewFileDialog.cpp b/Code/Tools/AssetBundler/source/ui/NewFileDialog.cpp
index e2548d9f46..cb63f0e9a4 100644
--- a/Code/Tools/AssetBundler/source/ui/NewFileDialog.cpp
+++ b/Code/Tools/AssetBundler/source/ui/NewFileDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/NewFileDialog.h b/Code/Tools/AssetBundler/source/ui/NewFileDialog.h
index 2f28c26e17..78def818c0 100644
--- a/Code/Tools/AssetBundler/source/ui/NewFileDialog.h
+++ b/Code/Tools/AssetBundler/source/ui/NewFileDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp
index dea74434ab..8fafcf06a9 100644
--- a/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp
+++ b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.h b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.h
index 882df8dcb6..562e192314 100644
--- a/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.h
+++ b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/RulesTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.cpp
index d197be080a..69535d1d17 100644
--- a/Code/Tools/AssetBundler/source/ui/RulesTabWidget.cpp
+++ b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/RulesTabWidget.h b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.h
index 6e9d070099..bee04db1ea 100644
--- a/Code/Tools/AssetBundler/source/ui/RulesTabWidget.h
+++ b/Code/Tools/AssetBundler/source/ui/RulesTabWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/SeedTabWidget.cpp b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.cpp
index 516ba1bb46..9c8d8e1f06 100644
--- a/Code/Tools/AssetBundler/source/ui/SeedTabWidget.cpp
+++ b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/SeedTabWidget.h b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.h
index 2bdd8d7b23..b093bebbaf 100644
--- a/Code/Tools/AssetBundler/source/ui/SeedTabWidget.h
+++ b/Code/Tools/AssetBundler/source/ui/SeedTabWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qss b/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qss
index d125968da8..ee7465181b 100644
--- a/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qss
+++ b/Code/Tools/AssetBundler/source/ui/style/AssetBundler.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp
index cbc082f67b..dccc1977f4 100644
--- a/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp
+++ b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.h b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.h
index 9a7b0d5915..9924774381 100644
--- a/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.h
+++ b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/utils/applicationManager.cpp b/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
index 4763b237d2..66974ca6a8 100644
--- a/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
+++ b/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/utils/applicationManager.h b/Code/Tools/AssetBundler/source/utils/applicationManager.h
index 71fcbdd0c4..673c9ddc0e 100644
--- a/Code/Tools/AssetBundler/source/utils/applicationManager.h
+++ b/Code/Tools/AssetBundler/source/utils/applicationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/utils/utils.cpp b/Code/Tools/AssetBundler/source/utils/utils.cpp
index f137716283..604a780f1d 100644
--- a/Code/Tools/AssetBundler/source/utils/utils.cpp
+++ b/Code/Tools/AssetBundler/source/utils/utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/source/utils/utils.h b/Code/Tools/AssetBundler/source/utils/utils.h
index d1edbf9739..fd07b266cc 100644
--- a/Code/Tools/AssetBundler/source/utils/utils.h
+++ b/Code/Tools/AssetBundler/source/utils/utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/tests/UtilsTests.cpp b/Code/Tools/AssetBundler/tests/UtilsTests.cpp
index e5886adc54..e54a6ac848 100644
--- a/Code/Tools/AssetBundler/tests/UtilsTests.cpp
+++ b/Code/Tools/AssetBundler/tests/UtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp b/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
index d6833c79b2..a0c94c1754 100644
--- a/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
+++ b/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/tests/main.h b/Code/Tools/AssetBundler/tests/main.h
index 4836a763e9..334e27e263 100644
--- a/Code/Tools/AssetBundler/tests/main.h
+++ b/Code/Tools/AssetBundler/tests/main.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetBundler/tests/tests_main.cpp b/Code/Tools/AssetBundler/tests/tests_main.cpp
index 9c0be26695..3c4f57c7dc 100644
--- a/Code/Tools/AssetBundler/tests/tests_main.cpp
+++ b/Code/Tools/AssetBundler/tests/tests_main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderApplication.cpp b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderApplication.cpp
index 7e4b66a578..0222f7c977 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderApplication.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderApplication.h b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderApplication.h
index 70eb261563..532d7bd23c 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderApplication.h
+++ b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.cpp b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.cpp
index 6760d27f74..64a4c98ad6 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.h b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.h
index adea735d39..969427334b 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.h
+++ b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderInfo.cpp b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderInfo.cpp
index 3623d98574..3f70b1dd8a 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderInfo.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderInfo.h b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderInfo.h
index 2a17bd8c7a..07bd55a2b1 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderInfo.h
+++ b/Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/CMakeLists.txt b/Code/Tools/AssetProcessor/AssetBuilder/CMakeLists.txt
index e153c9b5fd..c9d149ef6c 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/CMakeLists.txt
+++ b/Code/Tools/AssetProcessor/AssetBuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/AssetBuilder/Platform/Linux/AssetBuilderApplication_linux.cpp b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Linux/AssetBuilderApplication_linux.cpp
index d907642600..6111d146ba 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/Platform/Linux/AssetBuilderApplication_linux.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Linux/AssetBuilderApplication_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/Platform/Linux/asset_builder_linux_files.cmake b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Linux/asset_builder_linux_files.cmake
index 6a3c2abeab..7b61e81be4 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/Platform/Linux/asset_builder_linux_files.cmake
+++ b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Linux/asset_builder_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/AssetBuilder/Platform/Mac/AssetBuilderApplication_mac.cpp b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Mac/AssetBuilderApplication_mac.cpp
index d907642600..6111d146ba 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/Platform/Mac/AssetBuilderApplication_mac.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Mac/AssetBuilderApplication_mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/Platform/Mac/asset_builder_mac_files.cmake b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Mac/asset_builder_mac_files.cmake
index ca6d325dcf..5f359f1618 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/Platform/Mac/asset_builder_mac_files.cmake
+++ b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Mac/asset_builder_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/AssetBuilder/Platform/Windows/AssetBuilderApplication_windows.cpp b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Windows/AssetBuilderApplication_windows.cpp
index b5e5fef3a7..8f4ddf4c4e 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/Platform/Windows/AssetBuilderApplication_windows.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Windows/AssetBuilderApplication_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/Platform/Windows/asset_builder_windows_files.cmake b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Windows/asset_builder_windows_files.cmake
index 102642cff0..810a86f3ba 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/Platform/Windows/asset_builder_windows_files.cmake
+++ b/Code/Tools/AssetProcessor/AssetBuilder/Platform/Windows/asset_builder_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/AssetBuilder/Tests/AssetBuilderApplicationTests.cpp b/Code/Tools/AssetProcessor/AssetBuilder/Tests/AssetBuilderApplicationTests.cpp
index ecc7cfdda3..1eafa7c085 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/Tests/AssetBuilderApplicationTests.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/Tests/AssetBuilderApplicationTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.cpp b/Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.cpp
index 0a94883b31..3369066495 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.h b/Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.h
index 4d38759ef0..c98be70256 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.h
+++ b/Code/Tools/AssetProcessor/AssetBuilder/TraceMessageHook.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilder/asset_builder_darwin_files.cmake b/Code/Tools/AssetProcessor/AssetBuilder/asset_builder_darwin_files.cmake
index 136b8da031..73559e1a73 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/asset_builder_darwin_files.cmake
+++ b/Code/Tools/AssetProcessor/AssetBuilder/asset_builder_darwin_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/AssetBuilder/asset_builder_files.cmake b/Code/Tools/AssetProcessor/AssetBuilder/asset_builder_files.cmake
index 83a40364f8..107b790520 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/asset_builder_files.cmake
+++ b/Code/Tools/AssetProcessor/AssetBuilder/asset_builder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/AssetBuilder/main.cpp b/Code/Tools/AssetProcessor/AssetBuilder/main.cpp
index 188a2c6073..3e4f1b6b52 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/main.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilder/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderBusses.h b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderBusses.h
index 208a8cb1be..bb5b17ee0d 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderBusses.h
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderBusses.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderEBusHelper.h b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderEBusHelper.h
index 06434e6879..1f480d6e55 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderEBusHelper.h
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderEBusHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
index 869215ec00..9da09c119c 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
index ac36700f99..f1fe3ae901 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/SerializationDependencies.cpp b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/SerializationDependencies.cpp
index 1b8fb16f57..bbe1608db0 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/SerializationDependencies.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/SerializationDependencies.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/SerializationDependencies.h b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/SerializationDependencies.h
index 4fa42e4d9c..6cebabdb72 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/SerializationDependencies.h
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/SerializationDependencies.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt b/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt
index cba64b830e..2e0e92af2a 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/AssetBuilderSDK/assetbuilder_files.cmake b/Code/Tools/AssetProcessor/AssetBuilderSDK/assetbuilder_files.cmake
index 9753350361..7a3cc831ec 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/assetbuilder_files.cmake
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/assetbuilder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/CMakeLists.txt b/Code/Tools/AssetProcessor/CMakeLists.txt
index fa6f63e3a8..2e6d3cb1b5 100644
--- a/Code/Tools/AssetProcessor/CMakeLists.txt
+++ b/Code/Tools/AssetProcessor/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Linux/AssetProcessor_Traits_Linux.h b/Code/Tools/AssetProcessor/Platform/Linux/AssetProcessor_Traits_Linux.h
index 9ae9b82ae2..a26538e661 100644
--- a/Code/Tools/AssetProcessor/Platform/Linux/AssetProcessor_Traits_Linux.h
+++ b/Code/Tools/AssetProcessor/Platform/Linux/AssetProcessor_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Linux/AssetProcessor_Traits_Platform.h b/Code/Tools/AssetProcessor/Platform/Linux/AssetProcessor_Traits_Platform.h
index 54a6ebf1b9..f4d38978ee 100644
--- a/Code/Tools/AssetProcessor/Platform/Linux/AssetProcessor_Traits_Platform.h
+++ b/Code/Tools/AssetProcessor/Platform/Linux/AssetProcessor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_gui_linux_files.cmake b/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_gui_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_gui_linux_files.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_gui_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_linux.cmake b/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_linux.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_linux_files.cmake b/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_linux_files.cmake
index fefcb63b8b..4e529f1e16 100644
--- a/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_linux_files.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Linux/assetprocessor_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp b/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp
index 6f976b160a..c2a6774116 100644
--- a/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp
+++ b/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Linux/native/resource.h b/Code/Tools/AssetProcessor/Platform/Linux/native/resource.h
index 8cd7c2bc49..3e58e34b39 100644
--- a/Code/Tools/AssetProcessor/Platform/Linux/native/resource.h
+++ b/Code/Tools/AssetProcessor/Platform/Linux/native/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Mac.h b/Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Mac.h
index e2e36b1233..e9269e79ac 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Mac.h
+++ b/Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Platform.h b/Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Platform.h
index 9a34e0a48c..87a42bfe1a 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Platform.h
+++ b/Code/Tools/AssetProcessor/Platform/Mac/AssetProcessor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_gui_mac_files.cmake b/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_gui_mac_files.cmake
index 382b3138cc..0713de3200 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_gui_mac_files.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_gui_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake b/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake
index 64bcc75baf..da749112dd 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac_files.cmake b/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac_files.cmake
index 7acdbb2246..0fbd903b8c 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac_files.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Mac/assetprocessor_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_macos.cpp b/Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_macos.cpp
index c873d2fdfb..81a19ce98c 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_macos.cpp
+++ b/Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_macos.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_win.cpp b/Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_win.cpp
index 96844578b7..b0517f27a4 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_win.cpp
+++ b/Code/Tools/AssetProcessor/Platform/Mac/native/FileWatcher/FileWatcher_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Mac/native/resource.h b/Code/Tools/AssetProcessor/Platform/Mac/native/resource.h
index 8cd7c2bc49..3e58e34b39 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/native/resource.h
+++ b/Code/Tools/AssetProcessor/Platform/Mac/native/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.h b/Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.h
index 16ef8b8dc5..23380d63c1 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.h
+++ b/Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.mm b/Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.mm
index 5c76b3e1e6..96820e6305 100644
--- a/Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.mm
+++ b/Code/Tools/AssetProcessor/Platform/Mac/native/utilities/MacDockIconHandler.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Platform.h b/Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Platform.h
index 4ca72b8f27..c8fccd156b 100644
--- a/Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Platform.h
+++ b/Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Windows.h b/Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Windows.h
index 2daf4e2bfc..d29ec9ae20 100644
--- a/Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Windows.h
+++ b/Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_gui_windows_files.cmake b/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_gui_windows_files.cmake
index 8eef0b6148..8edeb2bfa8 100644
--- a/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_gui_windows_files.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_gui_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_windows.cmake b/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_windows.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_windows.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_windows_files.cmake b/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_windows_files.cmake
index cb00bca797..53724bf052 100644
--- a/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_windows_files.cmake
+++ b/Code/Tools/AssetProcessor/Platform/Windows/assetprocessor_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/Platform/Windows/native/FileWatcher/FileWatcher_win.cpp b/Code/Tools/AssetProcessor/Platform/Windows/native/FileWatcher/FileWatcher_win.cpp
index 96844578b7..b0517f27a4 100644
--- a/Code/Tools/AssetProcessor/Platform/Windows/native/FileWatcher/FileWatcher_win.cpp
+++ b/Code/Tools/AssetProcessor/Platform/Windows/native/FileWatcher/FileWatcher_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/Platform/Windows/native/resource.h b/Code/Tools/AssetProcessor/Platform/Windows/native/resource.h
index 8cd7c2bc49..3e58e34b39 100644
--- a/Code/Tools/AssetProcessor/Platform/Windows/native/resource.h
+++ b/Code/Tools/AssetProcessor/Platform/Windows/native/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/assetprocessor_batch_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_batch_files.cmake
index 267edac4b1..3d1a8a9065 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_batch_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_batch_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/assetprocessor_gui_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_gui_files.cmake
index 4ea184edda..cdc089c321 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_gui_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_gui_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/assetprocessor_static_batch_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_static_batch_files.cmake
index 28fa0a9784..de4d799b6a 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_static_batch_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_static_batch_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
index fabb8119b9..589eaf8f8f 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
index 84959654fe..b7e504ee6e 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
index b218678dbe..3a334d2065 100644
--- a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.h b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.h
index 09634ade07..642aba511e 100644
--- a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.h
+++ b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.h
@@ -2,7 +2,7 @@
 #define ASSETPROCESSOR_ASSETDATABASE_H
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
index c0d6159a8b..09aa9e475c 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h
index eac5cd0ff0..ba0cef563b 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/AssetData.h b/Code/Tools/AssetProcessor/native/AssetManager/AssetData.h
index 8b1879c44c..e7713fce1a 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetData.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp b/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp
index 59a96fcee8..3a1d2c209e 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.h b/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.h
index e76c56efe2..bea01b6462 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/ControlRequestHandler.cpp b/Code/Tools/AssetProcessor/native/AssetManager/ControlRequestHandler.cpp
index 2245416be6..1b03d09f95 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/ControlRequestHandler.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/ControlRequestHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/ControlRequestHandler.h b/Code/Tools/AssetProcessor/native/AssetManager/ControlRequestHandler.h
index 6ef5c4eb71..c9d4d08148 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/ControlRequestHandler.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/ControlRequestHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.cpp b/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.cpp
index 66faded3bc..ccdbcc2a8e 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.h b/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.h
index 6036089a43..32b3a12e86 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.cpp b/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.cpp
index fb56accc22..36b789b2e2 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.h b/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.h
index 408d080140..920f52c817 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/PathDependencyManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
index 014ffc677a..1d411026b9 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.h b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.h
index 2195284ffe..6c4904f104 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
index 5b107557ce..91abc032f2 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
index d6a121069c..93a5dedc5e 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.cpp
index affc471053..09b1f3153f 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
index 8402f98187..53e9e9b963 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetScanner.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetScanner.cpp
index d338aa68ae..26399196e4 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScanner.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScanner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetScanner.h b/Code/Tools/AssetProcessor/native/AssetManager/assetScanner.h
index 377f6b3b37..91253d90b9 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScanner.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScanner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.cpp
index d7767f82f5..cb66d107dc 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.h b/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.h
index 028a023cba..78ee18373a 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScannerWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetManager/assetdata.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetdata.cpp
index 9169691ed1..9dc0633649 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetdata.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetdata.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetProcessorBatchBuildTarget.cpp b/Code/Tools/AssetProcessor/native/AssetProcessorBatchBuildTarget.cpp
index 6d75bac7ec..6c6d681813 100644
--- a/Code/Tools/AssetProcessor/native/AssetProcessorBatchBuildTarget.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetProcessorBatchBuildTarget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/AssetProcessorBuildTarget.cpp b/Code/Tools/AssetProcessor/native/AssetProcessorBuildTarget.cpp
index e29ccc42db..2dceb34c2e 100644
--- a/Code/Tools/AssetProcessor/native/AssetProcessorBuildTarget.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetProcessorBuildTarget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.cpp b/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.cpp
index 47c7e8c94c..c1ae2f60c0 100644
--- a/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.cpp
+++ b/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.h b/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.h
index 66053c349b..f13fc44f34 100644
--- a/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.h
+++ b/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/FileServer/fileServer.cpp b/Code/Tools/AssetProcessor/native/FileServer/fileServer.cpp
index 6c4e2ed74b..573948542c 100644
--- a/Code/Tools/AssetProcessor/native/FileServer/fileServer.cpp
+++ b/Code/Tools/AssetProcessor/native/FileServer/fileServer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/FileServer/fileServer.h b/Code/Tools/AssetProcessor/native/FileServer/fileServer.h
index ecfad9cd66..f7b0b805cc 100644
--- a/Code/Tools/AssetProcessor/native/FileServer/fileServer.h
+++ b/Code/Tools/AssetProcessor/native/FileServer/fileServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.cpp b/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.cpp
index 79542d42b2..5fc6ce6ac0 100644
--- a/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.cpp
+++ b/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.h b/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.h
index e513836fe4..950544e2eb 100644
--- a/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.h
+++ b/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcherAPI.h b/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcherAPI.h
index 7e63eefde4..abc64114b8 100644
--- a/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcherAPI.h
+++ b/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcherAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
index 20dc9990f1..87bb0dfc24 100644
--- a/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
+++ b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.h b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.h
index 7e102b41b6..e9c9282413 100644
--- a/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.h
+++ b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/assetprocessor.h b/Code/Tools/AssetProcessor/native/assetprocessor.h
index 404ddce9ca..1ffbb0dde8 100644
--- a/Code/Tools/AssetProcessor/native/assetprocessor.h
+++ b/Code/Tools/AssetProcessor/native/assetprocessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/connection/connection.cpp b/Code/Tools/AssetProcessor/native/connection/connection.cpp
index 6e91aac61b..bbd984344f 100644
--- a/Code/Tools/AssetProcessor/native/connection/connection.cpp
+++ b/Code/Tools/AssetProcessor/native/connection/connection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/connection/connection.h b/Code/Tools/AssetProcessor/native/connection/connection.h
index d86f7d6791..34f78deec6 100644
--- a/Code/Tools/AssetProcessor/native/connection/connection.h
+++ b/Code/Tools/AssetProcessor/native/connection/connection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/connection/connectionManager.cpp b/Code/Tools/AssetProcessor/native/connection/connectionManager.cpp
index 2f9c2169ed..c0b16af722 100644
--- a/Code/Tools/AssetProcessor/native/connection/connectionManager.cpp
+++ b/Code/Tools/AssetProcessor/native/connection/connectionManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/connection/connectionManager.h b/Code/Tools/AssetProcessor/native/connection/connectionManager.h
index 1ce8cf2d1c..ca876d07bd 100644
--- a/Code/Tools/AssetProcessor/native/connection/connectionManager.h
+++ b/Code/Tools/AssetProcessor/native/connection/connectionManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/connection/connectionMessages.h b/Code/Tools/AssetProcessor/native/connection/connectionMessages.h
index 2cdff5634b..0718b1d15b 100644
--- a/Code/Tools/AssetProcessor/native/connection/connectionMessages.h
+++ b/Code/Tools/AssetProcessor/native/connection/connectionMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/connection/connectionworker.cpp b/Code/Tools/AssetProcessor/native/connection/connectionworker.cpp
index 12c584e4ce..01ffbdffcd 100644
--- a/Code/Tools/AssetProcessor/native/connection/connectionworker.cpp
+++ b/Code/Tools/AssetProcessor/native/connection/connectionworker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/connection/connectionworker.h b/Code/Tools/AssetProcessor/native/connection/connectionworker.h
index 48962b8900..6ed4049dba 100644
--- a/Code/Tools/AssetProcessor/native/connection/connectionworker.h
+++ b/Code/Tools/AssetProcessor/native/connection/connectionworker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/main_batch.cpp b/Code/Tools/AssetProcessor/native/main_batch.cpp
index c2ed9d5bfb..945119daae 100644
--- a/Code/Tools/AssetProcessor/native/main_batch.cpp
+++ b/Code/Tools/AssetProcessor/native/main_batch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/main_gui.cpp b/Code/Tools/AssetProcessor/native/main_gui.cpp
index d8a6b44a04..537270e97c 100644
--- a/Code/Tools/AssetProcessor/native/main_gui.cpp
+++ b/Code/Tools/AssetProcessor/native/main_gui.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/precompiled.h b/Code/Tools/AssetProcessor/native/precompiled.h
index 52ba500d07..3b4f041458 100644
--- a/Code/Tools/AssetProcessor/native/precompiled.h
+++ b/Code/Tools/AssetProcessor/native/precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.cpp
index 79a104bc29..44e9fb9920 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.h b/Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.h
index d9f4f4b7bb..d19c7fc0f6 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/JobsModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
index e54603c400..8f342776c9 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.h b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.h
index 5f3c118784..040f72f772 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.cpp
index 3d04560ba7..6187ba606c 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.h b/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.h
index d3428217a6..cdebd08e14 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/RCJobSortFilterProxyModel.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/RCJobSortFilterProxyModel.cpp
index be0fbdffbd..3de4d15325 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCJobSortFilterProxyModel.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCJobSortFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/RCJobSortFilterProxyModel.h b/Code/Tools/AssetProcessor/native/resourcecompiler/RCJobSortFilterProxyModel.h
index 2e31d13a1c..f1c0bd170e 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCJobSortFilterProxyModel.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCJobSortFilterProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/RCQueueSortModel.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/RCQueueSortModel.cpp
index aa9993c26e..b44a5fd3aa 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCQueueSortModel.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCQueueSortModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/RCQueueSortModel.h b/Code/Tools/AssetProcessor/native/resourcecompiler/RCQueueSortModel.h
index a63598f9cf..f3a942eff2 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCQueueSortModel.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCQueueSortModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/rccontroller.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/rccontroller.cpp
index 4c6446d470..581b9c70ac 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/rccontroller.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rccontroller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/rccontroller.h b/Code/Tools/AssetProcessor/native/resourcecompiler/rccontroller.h
index cace90a0a2..bc81774f6f 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/rccontroller.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rccontroller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp
index f31a7d6380..b65ed10212 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.h b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.h
index 0a5bee43eb..b84cfa4d2d 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp
index 72aa44e16d..63dff8d914 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h
index 57f6c26562..ba4b8be688 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerManager.cpp b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerManager.cpp
index e660c12a71..6fb83ea861 100644
--- a/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerManager.cpp
+++ b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerManager.h b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerManager.h
index 8d13b8007b..96013d435a 100644
--- a/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerManager.h
+++ b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerMessages.h b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerMessages.h
index 05c8ced803..243a19fe10 100644
--- a/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerMessages.h
+++ b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerModel.cpp b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerModel.cpp
index 23eb0d0224..36971d4dfb 100644
--- a/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerModel.cpp
+++ b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerModel.h b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerModel.h
index 05d74e6cc4..660f01fbba 100644
--- a/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerModel.h
+++ b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerjob.cpp b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerjob.cpp
index 7ad5440d3b..a9849b3444 100644
--- a/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerjob.cpp
+++ b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerjob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerjob.h b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerjob.h
index 86ccf008ca..c49ffdf57e 100644
--- a/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerjob.h
+++ b/Code/Tools/AssetProcessor/native/shadercompiler/shadercompilerjob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp b/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
index 790948fd79..de6e65b416 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp b/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
index cc22347428..aa4d5539b7 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.cpp b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.cpp
index 7de5c84673..2b80a3acbf 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -9,6 +9,7 @@
 
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
+#include <AzCore/IO/FileIOEventBus.h>
 
 #include "BaseAssetProcessorTest.h"
 #include <native/utilities/BatchApplicationManager.h>
@@ -52,11 +53,13 @@ namespace AssetProcessor
     };
 
     class LegacyTestAdapter : public AssetProcessorTest,
-        public ::testing::WithParamInterface<std::string>
+        public ::testing::WithParamInterface<std::string>,
+        public AZ::IO::FileIOEventBus::Handler
     {
         void SetUp() override
         {
             AssetProcessorTest::SetUp();
+            AZ::IO::FileIOEventBus::Handler::BusConnect();
             
             static int numParams = 1;
             static char processName[] = {"AssetProcessorBatch"};
@@ -77,9 +80,18 @@ namespace AssetProcessor
         void TearDown() override
         {
             m_application.reset();
+            AZ::IO::FileIOEventBus::Handler::BusDisconnect();
             AssetProcessorTest::TearDown();
         }
 
+        void OnError(
+            [[maybe_unused]] const AZ::IO::SystemFile* file,
+            [[maybe_unused]] const char* fileName,
+            [[maybe_unused]] int errorCode) override
+        {
+            AZ_Error("LegacyTestAdapter", false, "File error detected with %s with code %d", fileName, errorCode);
+        }
+
         AZStd::unique_ptr<UnitTestAppManager> m_application;
 
     };
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
index a14f852675..24a409fe3b 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/BaseAssetProcessorTest.h b/Code/Tools/AssetProcessor/native/tests/BaseAssetProcessorTest.h
index c4807f24f2..629763474d 100644
--- a/Code/Tools/AssetProcessor/native/tests/BaseAssetProcessorTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/BaseAssetProcessorTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/BuilderConfiguration/BuilderConfigurationTests.cpp b/Code/Tools/AssetProcessor/native/tests/BuilderConfiguration/BuilderConfigurationTests.cpp
index 0dd8ba4ff2..38ef040be2 100644
--- a/Code/Tools/AssetProcessor/native/tests/BuilderConfiguration/BuilderConfigurationTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/BuilderConfiguration/BuilderConfigurationTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.cpp b/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.cpp
index 2f27890c22..b3a52fca7b 100644
--- a/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.h b/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.h
index 25e89c0df0..5db09a82f6 100644
--- a/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.h
+++ b/Code/Tools/AssetProcessor/native/tests/FileProcessor/FileProcessorTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp b/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp
index 0a1670de5b..367dfa9678 100644
--- a/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.h b/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.h
index 0c54edd974..3eb22b50a2 100644
--- a/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.h
+++ b/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/InternalBuilders/SettingsRegistryBuilderTests.cpp b/Code/Tools/AssetProcessor/native/tests/InternalBuilders/SettingsRegistryBuilderTests.cpp
index b9d999958d..e54da7458f 100644
--- a/Code/Tools/AssetProcessor/native/tests/InternalBuilders/SettingsRegistryBuilderTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/InternalBuilders/SettingsRegistryBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/MissingDependencyScannerTests.cpp b/Code/Tools/AssetProcessor/native/tests/MissingDependencyScannerTests.cpp
index 94b331032e..89c2ec52ac 100644
--- a/Code/Tools/AssetProcessor/native/tests/MissingDependencyScannerTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/MissingDependencyScannerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/PathDependencyManagerTests.cpp b/Code/Tools/AssetProcessor/native/tests/PathDependencyManagerTests.cpp
index b3d5af502a..2d0106f887 100644
--- a/Code/Tools/AssetProcessor/native/tests/PathDependencyManagerTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/PathDependencyManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp b/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
index e451047b6d..5629241250 100644
--- a/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/AssetBuilderSDKBehaviorTests.cpp b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/AssetBuilderSDKBehaviorTests.cpp
index fda006f77b..107bf204bf 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/AssetBuilderSDKBehaviorTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/AssetBuilderSDKBehaviorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/SerializationDependenciesTests.cpp b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/SerializationDependenciesTests.cpp
index e9a39bed47..f8c4d61ac9 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/SerializationDependenciesTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/SerializationDependenciesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp
index ec65e90d7a..cd846b22c6 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.h b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.h
index 4b1d504cdf..8c2364da60 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetdatabase/AssetDatabaseTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetdatabase/AssetDatabaseTest.cpp
index 0a9316f7e3..1a9779f853 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetdatabase/AssetDatabaseTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetdatabase/AssetDatabaseTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
index e00a9c3513..4e98a1a259 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.h b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.h
index f2c91e4856..c86973eaf7 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.cpp b/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.cpp
index be3ca7841f..0e5a1b9556 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.h b/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.h
index 0e53d22358..59ace7fd2b 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.h
+++ b/Code/Tools/AssetProcessor/native/tests/assetscanner/AssetScannerTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
index f34cab7005..1d0821f30f 100644
--- a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h
index 5a2971e613..274587c1a1 100644
--- a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h
+++ b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.cpp b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.cpp
index 0245e0e9e8..00b75168db 100644
--- a/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.h b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.h
index 647e0cf688..1dcacdb386 100644
--- a/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCBuilderTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp
index 15138095b0..2af884726c 100644
--- a/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.h b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.h
index ab6bf85160..d9d15b64ee 100644
--- a/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCControllerTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCJobTest.cpp b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCJobTest.cpp
index 3cd7c34a60..8a9c65573b 100644
--- a/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCJobTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCJobTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCJobTest.h b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCJobTest.h
index 0ab332865e..a022f6fd44 100644
--- a/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCJobTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/resourcecompiler/RCJobTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/test_main.cpp b/Code/Tools/AssetProcessor/native/tests/test_main.cpp
index 1120104df3..2fd78b7751 100644
--- a/Code/Tools/AssetProcessor/native/tests/test_main.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/test_main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/utilities/JobModelTest.cpp b/Code/Tools/AssetProcessor/native/tests/utilities/JobModelTest.cpp
index 85bdc5b53f..66993eec3a 100644
--- a/Code/Tools/AssetProcessor/native/tests/utilities/JobModelTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/utilities/JobModelTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/utilities/JobModelTest.h b/Code/Tools/AssetProcessor/native/tests/utilities/JobModelTest.h
index 752c5d8a2c..5f99bfae07 100644
--- a/Code/Tools/AssetProcessor/native/tests/utilities/JobModelTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/utilities/JobModelTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/tests/utilities/assetUtilsTest.cpp b/Code/Tools/AssetProcessor/native/tests/utilities/assetUtilsTest.cpp
index ea1cf2ce6f..327f860a61 100644
--- a/Code/Tools/AssetProcessor/native/tests/utilities/assetUtilsTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/utilities/assetUtilsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/AssetDetailsPanel.cpp b/Code/Tools/AssetProcessor/native/ui/AssetDetailsPanel.cpp
index e30924b4de..c2113714b1 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetDetailsPanel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/AssetDetailsPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/AssetDetailsPanel.h b/Code/Tools/AssetProcessor/native/ui/AssetDetailsPanel.h
index c2a25941b4..d54ff017f1 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetDetailsPanel.h
+++ b/Code/Tools/AssetProcessor/native/ui/AssetDetailsPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/AssetTreeFilterModel.cpp b/Code/Tools/AssetProcessor/native/ui/AssetTreeFilterModel.cpp
index 1737449cba..83f01ff239 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeFilterModel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeFilterModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/AssetTreeFilterModel.h b/Code/Tools/AssetProcessor/native/ui/AssetTreeFilterModel.h
index 52be99561e..0cc3629221 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeFilterModel.h
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeFilterModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.cpp b/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.cpp
index e69d9f3818..25b27f9230 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.h b/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.h
index 242867c42d..396a9685e6 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.h
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.cpp b/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.cpp
index fbe2878ec2..baec0f9fd1 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.h b/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.h
index e34bbcea01..874169f8c6 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.h
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/ConnectionEditDialog.cpp b/Code/Tools/AssetProcessor/native/ui/ConnectionEditDialog.cpp
index 53cd889ce0..79ba21e0a9 100644
--- a/Code/Tools/AssetProcessor/native/ui/ConnectionEditDialog.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/ConnectionEditDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/ConnectionEditDialog.h b/Code/Tools/AssetProcessor/native/ui/ConnectionEditDialog.h
index d835cbeac7..f5f77a97b3 100644
--- a/Code/Tools/AssetProcessor/native/ui/ConnectionEditDialog.h
+++ b/Code/Tools/AssetProcessor/native/ui/ConnectionEditDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/GoToButton.cpp b/Code/Tools/AssetProcessor/native/ui/GoToButton.cpp
index 6bc9ea303c..a66d45bcee 100644
--- a/Code/Tools/AssetProcessor/native/ui/GoToButton.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/GoToButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/GoToButton.h b/Code/Tools/AssetProcessor/native/ui/GoToButton.h
index 13029751a6..86b19c00ed 100644
--- a/Code/Tools/AssetProcessor/native/ui/GoToButton.h
+++ b/Code/Tools/AssetProcessor/native/ui/GoToButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.cpp b/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.cpp
index 90766bb9fa..60a3f44376 100644
--- a/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.h b/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.h
index aa08ae81ba..2356fa2f06 100644
--- a/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.h
+++ b/Code/Tools/AssetProcessor/native/ui/JobTreeViewItemDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/MainWindow.cpp b/Code/Tools/AssetProcessor/native/ui/MainWindow.cpp
index af5b16a2a2..e208454d29 100644
--- a/Code/Tools/AssetProcessor/native/ui/MainWindow.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/MainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/MainWindow.h b/Code/Tools/AssetProcessor/native/ui/MainWindow.h
index 3f770d9dbb..d2cc4769bb 100644
--- a/Code/Tools/AssetProcessor/native/ui/MainWindow.h
+++ b/Code/Tools/AssetProcessor/native/ui/MainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.cpp b/Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.cpp
index d5ec717764..a2db2cbe43 100644
--- a/Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.h b/Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.h
index 0220789e20..1b499761e9 100644
--- a/Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.h
+++ b/Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeItemData.cpp b/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeItemData.cpp
index 1c02ef92e5..3a2fb5fc07 100644
--- a/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeItemData.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeItemData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeItemData.h b/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeItemData.h
index 46da2123fc..23fa6e6c84 100644
--- a/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeItemData.h
+++ b/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeItemData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeModel.cpp b/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeModel.cpp
index 6c936420f4..474c2e4582 100644
--- a/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeModel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeModel.h b/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeModel.h
index cf59705cf9..f95961ac57 100644
--- a/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeModel.h
+++ b/Code/Tools/AssetProcessor/native/ui/ProductAssetTreeModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/SourceAssetDetailsPanel.cpp b/Code/Tools/AssetProcessor/native/ui/SourceAssetDetailsPanel.cpp
index e90f05209f..7adb767a21 100644
--- a/Code/Tools/AssetProcessor/native/ui/SourceAssetDetailsPanel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/SourceAssetDetailsPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/SourceAssetDetailsPanel.h b/Code/Tools/AssetProcessor/native/ui/SourceAssetDetailsPanel.h
index 5f430d9e54..439651fc9b 100644
--- a/Code/Tools/AssetProcessor/native/ui/SourceAssetDetailsPanel.h
+++ b/Code/Tools/AssetProcessor/native/ui/SourceAssetDetailsPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.cpp b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.cpp
index 9a451aeb25..bc3641120c 100644
--- a/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.h b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.h
index 1a8823b673..9598486905 100644
--- a/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.h
+++ b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeItemData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp
index 3b0f197bdb..52130e8ba7 100644
--- a/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.h b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.h
index 6fd6a47b08..ed9f497b27 100644
--- a/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.h
+++ b/Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qrc b/Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qrc
index 564d7a2132..eeaa6ad9da 100644
--- a/Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qrc
+++ b/Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qrc
@@ -17,5 +17,6 @@
         <file>AssetProcessor_arrow_up.svg</file>
         <file>AssetProcessor_refresh.png</file>
         <file>o3de_assetprocessor.png</file>
+        <file>o3de_assetprocessor_taskbar.svg</file>
     </qresource>
 </RCC>
diff --git a/Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qss b/Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qss
index e428363a7d..1e787ad052 100644
--- a/Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qss
+++ b/Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/style/AssetsTab.qss b/Code/Tools/AssetProcessor/native/ui/style/AssetsTab.qss
index 023198251d..1981c84aac 100644
--- a/Code/Tools/AssetProcessor/native/ui/style/AssetsTab.qss
+++ b/Code/Tools/AssetProcessor/native/ui/style/AssetsTab.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/style/LogsTab.qss b/Code/Tools/AssetProcessor/native/ui/style/LogsTab.qss
index be10bbe96e..9403a6dd60 100644
--- a/Code/Tools/AssetProcessor/native/ui/style/LogsTab.qss
+++ b/Code/Tools/AssetProcessor/native/ui/style/LogsTab.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/ui/style/o3de_assetprocessor_taskbar.svg b/Code/Tools/AssetProcessor/native/ui/style/o3de_assetprocessor_taskbar.svg
new file mode 100644
index 0000000000..7b637fc7c7
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/ui/style/o3de_assetprocessor_taskbar.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M11.3,2.9c-0.6,0-1.2,0-1.8,0.1C7.9,3.2,6.4,4,5.2,5.2l2,1.9c3.3-3.4,9.3-1,9.3,3.9h-2.7l4.1,4.1L22,11h-2.7
+		C19.3,6.3,15.3,3.1,11.3,2.9L11.3,2.9z M0,11h2.7c0,7.2,9.1,10.9,14.1,5.8l-2-1.9c-3.3,3.4-9.3,1-9.3-3.9h2.7L4.1,6.9
+		C4.1,6.9,0,11,0,11z"/>
+</g>
+</svg>
diff --git a/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.cpp
index 3f44fc59cd..976182a422 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.h
index 61f6a1e3f5..81c19fb6e9 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessingStateDataUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
index 99f496b839..1919fd73ba 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h
index d5a5e25da3..59166353a4 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.cpp
index ad73821c2d..49736c0563 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.h
index 31f56f9a83..f61de7e2f5 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.cpp
index 73683081b3..ced8ccc408 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.h
index 212a0d06aa..9ee7b115ad 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetRequestHandlerUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.cpp
index 2e2e4a4323..5e3ea205dd 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.h
index 967c3b49a4..6881af90c0 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetScannerUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/BuilderSDKUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/BuilderSDKUnitTests.cpp
index 9dd945ae0a..cce7e0e783 100644
--- a/Code/Tools/AssetProcessor/native/unittests/BuilderSDKUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/BuilderSDKUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/ConnectionManagerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/ConnectionManagerUnitTests.cpp
index e15391898c..4a8e61ea28 100644
--- a/Code/Tools/AssetProcessor/native/unittests/ConnectionManagerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/ConnectionManagerUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/ConnectionManagerUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/ConnectionManagerUnitTests.h
index 8c981d8dcc..ac99af3178 100644
--- a/Code/Tools/AssetProcessor/native/unittests/ConnectionManagerUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/ConnectionManagerUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
index ed244ad43c..200354e84c 100644
--- a/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.h
index 42c62ff80c..d897d61a23 100644
--- a/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.cpp
index 9f8e8484a8..2ffe6a7996 100644
--- a/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.h
index b6d2d1b534..47f181b05d 100644
--- a/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/FileWatcherUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.cpp b/Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.cpp
index 3cd7f14237..0333420ebb 100644
--- a/Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.h b/Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.h
index 9486cdb84b..423c393a9b 100644
--- a/Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.h
+++ b/Code/Tools/AssetProcessor/native/unittests/MockApplicationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h b/Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h
index 515a69373d..27a7ca8280 100644
--- a/Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h
+++ b/Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
index f1b3c8c37a..bae7bd7473 100644
--- a/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.h
index cfc0e8b69d..cf22fed6d3 100644
--- a/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
index 15868a9941..c20dc92e8c 100644
--- a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.h
index 65675c3aff..eaa3a76597 100644
--- a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/ShaderCompilerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/ShaderCompilerUnitTests.cpp
index 544ffd8066..62de53773e 100644
--- a/Code/Tools/AssetProcessor/native/unittests/ShaderCompilerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/ShaderCompilerUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/ShaderCompilerUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/ShaderCompilerUnitTests.h
index e133ec98c3..3ae891681f 100644
--- a/Code/Tools/AssetProcessor/native/unittests/ShaderCompilerUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/ShaderCompilerUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp b/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp
index 40fbd3eaa8..90d6125212 100644
--- a/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.h b/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.h
index 525b46f5d9..9c76a35370 100644
--- a/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.h
+++ b/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp
index de2e111d3d..7657930a37 100644
--- a/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.h b/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.h
index a402453e2a..6a60116ab7 100644
--- a/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.h
+++ b/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
index 9648824627..28d1850b40 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -446,7 +446,7 @@ void ApplicationManager::PopulateApplicationDependencies()
     // any of those should cause AP to drop.
     for (const QString& pathName : { "CrySystem",
                                      "SceneCore", "SceneData",
-                                     "FbxSceneBuilder", "AzQtComponents"
+                                     "SceneBuilder", "AzQtComponents"
                                      })
     {
         QString pathWithPlatformExtension = pathName + QString(AZ_DYNAMIC_LIBRARY_EXTENSION);
@@ -639,7 +639,7 @@ bool ApplicationManager::Activate()
 
 QString ApplicationManager::GetOrganizationName() const
 {
-    return "Amazon";
+    return "O3DE";
 }
 
 QString ApplicationManager::GetApplicationName() const
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.h b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.h
index f5d3c61474..6a30cbb919 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.h
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerAPI.h b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerAPI.h
index b5e90421bc..4da75565d9 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerAPI.h
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
index c9c6b124c6..7ac957c6b7 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h
index c76405e6cd..be730d2eae 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ApplicationServer.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationServer.cpp
index 0a087cf1d2..e9933c354e 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationServer.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationServer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ApplicationServer.h b/Code/Tools/AssetProcessor/native/utilities/ApplicationServer.h
index c3950fab50..f5c9ac7938 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationServer.h
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/AssetBuilderInfo.cpp b/Code/Tools/AssetProcessor/native/utilities/AssetBuilderInfo.cpp
index c7bc903d79..c459722b99 100644
--- a/Code/Tools/AssetProcessor/native/utilities/AssetBuilderInfo.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/AssetBuilderInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/AssetBuilderInfo.h b/Code/Tools/AssetProcessor/native/utilities/AssetBuilderInfo.h
index 1b4cde2780..4f9963b31d 100644
--- a/Code/Tools/AssetProcessor/native/utilities/AssetBuilderInfo.h
+++ b/Code/Tools/AssetProcessor/native/utilities/AssetBuilderInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.cpp b/Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.cpp
index 3ed49c4961..3e77a494ea 100644
--- a/Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.h b/Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.h
index 69c9e85fef..fecd53ca08 100644
--- a/Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.h
+++ b/Code/Tools/AssetProcessor/native/utilities/AssetServerHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/AssetUtilEBusHelper.h b/Code/Tools/AssetProcessor/native/utilities/AssetUtilEBusHelper.h
index b9ed664ede..bfd394d9f6 100644
--- a/Code/Tools/AssetProcessor/native/utilities/AssetUtilEBusHelper.h
+++ b/Code/Tools/AssetProcessor/native/utilities/AssetUtilEBusHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BatchApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationManager.cpp
index 5ed950c8ad..337bcd39d1 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BatchApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BatchApplicationManager.h b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationManager.h
index 9275e329aa..598818f9ad 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BatchApplicationManager.h
+++ b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.cpp b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.cpp
index 15ce9afa0b..df14422067 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.h b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.h
index 7ed3768664..0c57d300dd 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.h
+++ b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationBus.h b/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationBus.h
index af7d2d1f69..c538df845a 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationBus.h
+++ b/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationManager.cpp
index c532b3d8e0..fbf3b0001d 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationManager.h b/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationManager.h
index 2cd60505bc..49bc04cfa6 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationManager.h
+++ b/Code/Tools/AssetProcessor/native/utilities/BuilderConfigurationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp
index 08ae9b94eb..363fdf7d55 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h
index 5728e230c0..b1c5690bf1 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h
+++ b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/BuilderManager.inl b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.inl
index a18389a1a9..2da985ca04 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.inl
+++ b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ByteArrayStream.cpp b/Code/Tools/AssetProcessor/native/utilities/ByteArrayStream.cpp
index 7e741684b5..c0c7ec76b6 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ByteArrayStream.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ByteArrayStream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ByteArrayStream.h b/Code/Tools/AssetProcessor/native/utilities/ByteArrayStream.h
index 717dd83f95..7a451f5263 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ByteArrayStream.h
+++ b/Code/Tools/AssetProcessor/native/utilities/ByteArrayStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp b/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp
index fff526d6b9..981e04a100 100644
--- a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h b/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h
index 24bea5ec3f..ffd0d6cbf6 100644
--- a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h
+++ b/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp
index 8faa0e4d6e..01c2e21f28 100644
--- a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -268,10 +268,9 @@ bool GUIApplicationManager::Run()
         trayIconMenu->addAction(quitAction);
 #endif
 
-        m_trayIcon = new QSystemTrayIcon(m_mainWindow);
+        m_trayIcon = new QSystemTrayIcon(QIcon(":/o3de_assetprocessor_taskbar.svg"), m_mainWindow);
         m_trayIcon->setContextMenu(trayIconMenu);
         m_trayIcon->setToolTip(QObject::tr("O3DE Asset Processor"));
-        m_trayIcon->setIcon(QIcon(":/o3de_assetprocessor.png"));
         m_trayIcon->show();
         QObject::connect(m_trayIcon, &QSystemTrayIcon::activated, m_mainWindow, [&, wrapper](QSystemTrayIcon::ActivationReason reason)
             {
diff --git a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.h b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.h
index 0ce84629cb..bb164ff2f6 100644
--- a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.h
+++ b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/GUIApplicationServer.cpp b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationServer.cpp
index 9a98156989..737bb3b1e3 100644
--- a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationServer.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationServer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/GUIApplicationServer.h b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationServer.h
index e1900ccc58..3aab0d9145 100644
--- a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationServer.h
+++ b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/IniConfiguration.cpp b/Code/Tools/AssetProcessor/native/utilities/IniConfiguration.cpp
index e351acb53d..575b440fbb 100644
--- a/Code/Tools/AssetProcessor/native/utilities/IniConfiguration.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/IniConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/IniConfiguration.h b/Code/Tools/AssetProcessor/native/utilities/IniConfiguration.h
index c3b9207369..b3995b8e45 100644
--- a/Code/Tools/AssetProcessor/native/utilities/IniConfiguration.h
+++ b/Code/Tools/AssetProcessor/native/utilities/IniConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/JobDiagnosticTracker.cpp b/Code/Tools/AssetProcessor/native/utilities/JobDiagnosticTracker.cpp
index 2466c3dfee..e33b00d115 100644
--- a/Code/Tools/AssetProcessor/native/utilities/JobDiagnosticTracker.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/JobDiagnosticTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/JobDiagnosticTracker.h b/Code/Tools/AssetProcessor/native/utilities/JobDiagnosticTracker.h
index 5364b148d2..4239c0cc53 100644
--- a/Code/Tools/AssetProcessor/native/utilities/JobDiagnosticTracker.h
+++ b/Code/Tools/AssetProcessor/native/utilities/JobDiagnosticTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/LineByLineDependencyScanner.cpp b/Code/Tools/AssetProcessor/native/utilities/LineByLineDependencyScanner.cpp
index 8dd53f047f..850a3852a4 100644
--- a/Code/Tools/AssetProcessor/native/utilities/LineByLineDependencyScanner.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/LineByLineDependencyScanner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/LineByLineDependencyScanner.h b/Code/Tools/AssetProcessor/native/utilities/LineByLineDependencyScanner.h
index edce9fca4b..8a05e367cd 100644
--- a/Code/Tools/AssetProcessor/native/utilities/LineByLineDependencyScanner.h
+++ b/Code/Tools/AssetProcessor/native/utilities/LineByLineDependencyScanner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/LogPanel.cpp b/Code/Tools/AssetProcessor/native/utilities/LogPanel.cpp
index f1fd202469..c335404704 100644
--- a/Code/Tools/AssetProcessor/native/utilities/LogPanel.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/LogPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/LogPanel.h b/Code/Tools/AssetProcessor/native/utilities/LogPanel.h
index e370b1aa3f..4933e58009 100644
--- a/Code/Tools/AssetProcessor/native/utilities/LogPanel.h
+++ b/Code/Tools/AssetProcessor/native/utilities/LogPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.cpp b/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.cpp
index 7f69974d19..a8aa5a6821 100644
--- a/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.h b/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.h
index 3e05b809c3..e4206d64a7 100644
--- a/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.h
+++ b/Code/Tools/AssetProcessor/native/utilities/MissingDependencyScanner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
index a7e172c7fc..9f89e89268 100644
--- a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
index c8ea99fea8..a3a17d98b2 100644
--- a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
+++ b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/PotentialDependencies.h b/Code/Tools/AssetProcessor/native/utilities/PotentialDependencies.h
index 1905ac0f56..cf548f4c1b 100644
--- a/Code/Tools/AssetProcessor/native/utilities/PotentialDependencies.h
+++ b/Code/Tools/AssetProcessor/native/utilities/PotentialDependencies.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/SpecializedDependencyScanner.h b/Code/Tools/AssetProcessor/native/utilities/SpecializedDependencyScanner.h
index f990090c61..a31dbd3cf7 100644
--- a/Code/Tools/AssetProcessor/native/utilities/SpecializedDependencyScanner.h
+++ b/Code/Tools/AssetProcessor/native/utilities/SpecializedDependencyScanner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ThreadHelper.cpp b/Code/Tools/AssetProcessor/native/utilities/ThreadHelper.cpp
index ef88c36532..8c2a07613c 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ThreadHelper.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ThreadHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/ThreadHelper.h b/Code/Tools/AssetProcessor/native/utilities/ThreadHelper.h
index 4598937757..ac9f49297a 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ThreadHelper.h
+++ b/Code/Tools/AssetProcessor/native/utilities/ThreadHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/UnitTestShaderCompilerServer.cpp b/Code/Tools/AssetProcessor/native/utilities/UnitTestShaderCompilerServer.cpp
index e0c2a44ff7..1f6f4eb4ec 100644
--- a/Code/Tools/AssetProcessor/native/utilities/UnitTestShaderCompilerServer.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/UnitTestShaderCompilerServer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/UnitTestShaderCompilerServer.h b/Code/Tools/AssetProcessor/native/utilities/UnitTestShaderCompilerServer.h
index d1f6bfe759..03f25f1099 100644
--- a/Code/Tools/AssetProcessor/native/utilities/UnitTestShaderCompilerServer.h
+++ b/Code/Tools/AssetProcessor/native/utilities/UnitTestShaderCompilerServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
index 904e049c71..c241b52084 100644
--- a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/assetUtils.h b/Code/Tools/AssetProcessor/native/utilities/assetUtils.h
index 0b829318b9..d6739fc544 100644
--- a/Code/Tools/AssetProcessor/native/utilities/assetUtils.h
+++ b/Code/Tools/AssetProcessor/native/utilities/assetUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/windowscreen.cpp b/Code/Tools/AssetProcessor/native/utilities/windowscreen.cpp
index 071d519c05..b549510dbe 100644
--- a/Code/Tools/AssetProcessor/native/utilities/windowscreen.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/windowscreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AssetProcessor/native/utilities/windowscreen.h b/Code/Tools/AssetProcessor/native/utilities/windowscreen.h
index 486dfdfead..a687cd8b4d 100644
--- a/Code/Tools/AssetProcessor/native/utilities/windowscreen.h
+++ b/Code/Tools/AssetProcessor/native/utilities/windowscreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/CMakeLists.txt b/Code/Tools/AzTestRunner/CMakeLists.txt
index 40df8624a2..465d0f7ef8 100644
--- a/Code/Tools/AzTestRunner/CMakeLists.txt
+++ b/Code/Tools/AzTestRunner/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Android/native_app_glue_include.c b/Code/Tools/AzTestRunner/Platform/Android/native_app_glue_include.c
index 5a968aab31..1139b244f9 100644
--- a/Code/Tools/AzTestRunner/Platform/Android/native_app_glue_include.c
+++ b/Code/Tools/AzTestRunner/Platform/Android/native_app_glue_include.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/Platform/Android/platform_android.cmake b/Code/Tools/AzTestRunner/Platform/Android/platform_android.cmake
index 80ccce0b65..3e7cbc049c 100644
--- a/Code/Tools/AzTestRunner/Platform/Android/platform_android.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Android/platform_android.cpp b/Code/Tools/AzTestRunner/Platform/Android/platform_android.cpp
index 5142157f0d..14e68ab900 100644
--- a/Code/Tools/AzTestRunner/Platform/Android/platform_android.cpp
+++ b/Code/Tools/AzTestRunner/Platform/Android/platform_android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/Platform/Android/platform_android_files.cmake b/Code/Tools/AzTestRunner/Platform/Android/platform_android_files.cmake
index 06366bec50..3042d42652 100644
--- a/Code/Tools/AzTestRunner/Platform/Android/platform_android_files.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Android/platform_traits_android.cmake b/Code/Tools/AzTestRunner/Platform/Android/platform_traits_android.cmake
index 3aacde3802..da2c167142 100644
--- a/Code/Tools/AzTestRunner/Platform/Android/platform_traits_android.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Android/platform_traits_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Common/platform_host_main.cpp b/Code/Tools/AzTestRunner/Platform/Common/platform_host_main.cpp
index be9c0d69f7..b64ab4407e 100644
--- a/Code/Tools/AzTestRunner/Platform/Common/platform_host_main.cpp
+++ b/Code/Tools/AzTestRunner/Platform/Common/platform_host_main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/Platform/Common/platform_host_posix.cpp b/Code/Tools/AzTestRunner/Platform/Common/platform_host_posix.cpp
index bacc29340a..e79c9c5ccf 100644
--- a/Code/Tools/AzTestRunner/Platform/Common/platform_host_posix.cpp
+++ b/Code/Tools/AzTestRunner/Platform/Common/platform_host_posix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/Platform/Linux/platform_linux.cmake b/Code/Tools/AzTestRunner/Platform/Linux/platform_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Tools/AzTestRunner/Platform/Linux/platform_linux.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Linux/platform_linux_files.cmake b/Code/Tools/AzTestRunner/Platform/Linux/platform_linux_files.cmake
index 607f877249..0989dfeea0 100644
--- a/Code/Tools/AzTestRunner/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Linux/platform_traits_linux.cmake b/Code/Tools/AzTestRunner/Platform/Linux/platform_traits_linux.cmake
index 666caa5855..6ea3b3d543 100644
--- a/Code/Tools/AzTestRunner/Platform/Linux/platform_traits_linux.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Linux/platform_traits_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Mac/platform_mac.cmake b/Code/Tools/AzTestRunner/Platform/Mac/platform_mac.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Tools/AzTestRunner/Platform/Mac/platform_mac.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Mac/platform_mac_files.cmake b/Code/Tools/AzTestRunner/Platform/Mac/platform_mac_files.cmake
index 607f877249..0989dfeea0 100644
--- a/Code/Tools/AzTestRunner/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Mac/platform_traits_mac.cmake b/Code/Tools/AzTestRunner/Platform/Mac/platform_traits_mac.cmake
index 666caa5855..6ea3b3d543 100644
--- a/Code/Tools/AzTestRunner/Platform/Mac/platform_traits_mac.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Mac/platform_traits_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Windows/platform_traits_windows.cmake b/Code/Tools/AzTestRunner/Platform/Windows/platform_traits_windows.cmake
index 666caa5855..6ea3b3d543 100644
--- a/Code/Tools/AzTestRunner/Platform/Windows/platform_traits_windows.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Windows/platform_traits_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Windows/platform_windows.cmake b/Code/Tools/AzTestRunner/Platform/Windows/platform_windows.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Tools/AzTestRunner/Platform/Windows/platform_windows.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/Windows/platform_windows.cpp b/Code/Tools/AzTestRunner/Platform/Windows/platform_windows.cpp
index 37fc2f1530..9b6091b303 100644
--- a/Code/Tools/AzTestRunner/Platform/Windows/platform_windows.cpp
+++ b/Code/Tools/AzTestRunner/Platform/Windows/platform_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/Platform/Windows/platform_windows_files.cmake b/Code/Tools/AzTestRunner/Platform/Windows/platform_windows_files.cmake
index a6021cf274..d0353b09e6 100644
--- a/Code/Tools/AzTestRunner/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/iOS/Launcher_iOS.mm b/Code/Tools/AzTestRunner/Platform/iOS/Launcher_iOS.mm
index f55ff9b4fc..2efefd54fd 100644
--- a/Code/Tools/AzTestRunner/Platform/iOS/Launcher_iOS.mm
+++ b/Code/Tools/AzTestRunner/Platform/iOS/Launcher_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/Platform/iOS/TestLauncherTarget.mm b/Code/Tools/AzTestRunner/Platform/iOS/TestLauncherTarget.mm
index e17b130147..b7b5b0dc37 100644
--- a/Code/Tools/AzTestRunner/Platform/iOS/TestLauncherTarget.mm
+++ b/Code/Tools/AzTestRunner/Platform/iOS/TestLauncherTarget.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/Platform/iOS/platform_ios.cmake b/Code/Tools/AzTestRunner/Platform/iOS/platform_ios.cmake
index 1870ad32be..8f0a229c14 100644
--- a/Code/Tools/AzTestRunner/Platform/iOS/platform_ios.cmake
+++ b/Code/Tools/AzTestRunner/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/iOS/platform_ios_files.cmake b/Code/Tools/AzTestRunner/Platform/iOS/platform_ios_files.cmake
index d4b2e46b74..7036c2e248 100644
--- a/Code/Tools/AzTestRunner/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Tools/AzTestRunner/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/Platform/iOS/platform_traits_ios.cmake b/Code/Tools/AzTestRunner/Platform/iOS/platform_traits_ios.cmake
index 666caa5855..6ea3b3d543 100644
--- a/Code/Tools/AzTestRunner/Platform/iOS/platform_traits_ios.cmake
+++ b/Code/Tools/AzTestRunner/Platform/iOS/platform_traits_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/aztestrunner_files.cmake b/Code/Tools/AzTestRunner/aztestrunner_files.cmake
index 37f169f782..e9cce66175 100644
--- a/Code/Tools/AzTestRunner/aztestrunner_files.cmake
+++ b/Code/Tools/AzTestRunner/aztestrunner_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/aztestrunner_test_files.cmake b/Code/Tools/AzTestRunner/aztestrunner_test_files.cmake
index ee8357d070..5394ef0937 100644
--- a/Code/Tools/AzTestRunner/aztestrunner_test_files.cmake
+++ b/Code/Tools/AzTestRunner/aztestrunner_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/AzTestRunner/src/aztestrunner.h b/Code/Tools/AzTestRunner/src/aztestrunner.h
index 4ad0447838..9d21a13b2d 100644
--- a/Code/Tools/AzTestRunner/src/aztestrunner.h
+++ b/Code/Tools/AzTestRunner/src/aztestrunner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/src/main.cpp b/Code/Tools/AzTestRunner/src/main.cpp
index ab2682e60a..c6d887244f 100644
--- a/Code/Tools/AzTestRunner/src/main.cpp
+++ b/Code/Tools/AzTestRunner/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/AzTestRunner/test/RunnerTest.cpp b/Code/Tools/AzTestRunner/test/RunnerTest.cpp
index 6ea51058fa..759946ab07 100644
--- a/Code/Tools/AzTestRunner/test/RunnerTest.cpp
+++ b/Code/Tools/AzTestRunner/test/RunnerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CMakeLists.txt b/Code/Tools/CMakeLists.txt
index 171eba29b8..6c025a0543 100644
--- a/Code/Tools/CMakeLists.txt
+++ b/Code/Tools/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/CMakeLists.txt b/Code/Tools/CrashHandler/CMakeLists.txt
index d43960a42c..22d37b2c5d 100644
--- a/Code/Tools/CrashHandler/CMakeLists.txt
+++ b/Code/Tools/CrashHandler/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Platform/Android/CrashHandler_Traits_Android.h b/Code/Tools/CrashHandler/Platform/Android/CrashHandler_Traits_Android.h
index 2ca908a12c..51d0ff7766 100644
--- a/Code/Tools/CrashHandler/Platform/Android/CrashHandler_Traits_Android.h
+++ b/Code/Tools/CrashHandler/Platform/Android/CrashHandler_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Android/CrashHandler_Traits_Platform.h b/Code/Tools/CrashHandler/Platform/Android/CrashHandler_Traits_Platform.h
index 346dc60b9b..df4a82dff5 100644
--- a/Code/Tools/CrashHandler/Platform/Android/CrashHandler_Traits_Platform.h
+++ b/Code/Tools/CrashHandler/Platform/Android/CrashHandler_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Android/PAL_android.cmake b/Code/Tools/CrashHandler/Platform/Android/PAL_android.cmake
index 570a4d1592..0c07a18151 100644
--- a/Code/Tools/CrashHandler/Platform/Android/PAL_android.cmake
+++ b/Code/Tools/CrashHandler/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Platform/CrashHandler_mac.cpp b/Code/Tools/CrashHandler/Platform/CrashHandler_mac.cpp
index 72679fe065..e74311c24b 100644
--- a/Code/Tools/CrashHandler/Platform/CrashHandler_mac.cpp
+++ b/Code/Tools/CrashHandler/Platform/CrashHandler_mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/CrashHandler_win.cpp b/Code/Tools/CrashHandler/Platform/CrashHandler_win.cpp
index ffd9339a84..47841e1d04 100644
--- a/Code/Tools/CrashHandler/Platform/CrashHandler_win.cpp
+++ b/Code/Tools/CrashHandler/Platform/CrashHandler_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Linux/CrashHandler_Traits_Linux.h b/Code/Tools/CrashHandler/Platform/Linux/CrashHandler_Traits_Linux.h
index 2ca908a12c..51d0ff7766 100644
--- a/Code/Tools/CrashHandler/Platform/Linux/CrashHandler_Traits_Linux.h
+++ b/Code/Tools/CrashHandler/Platform/Linux/CrashHandler_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Linux/CrashHandler_Traits_Platform.h b/Code/Tools/CrashHandler/Platform/Linux/CrashHandler_Traits_Platform.h
index 8b4e08d91d..b6c4bfd5b8 100644
--- a/Code/Tools/CrashHandler/Platform/Linux/CrashHandler_Traits_Platform.h
+++ b/Code/Tools/CrashHandler/Platform/Linux/CrashHandler_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Linux/PAL_linux.cmake b/Code/Tools/CrashHandler/Platform/Linux/PAL_linux.cmake
index 570a4d1592..0c07a18151 100644
--- a/Code/Tools/CrashHandler/Platform/Linux/PAL_linux.cmake
+++ b/Code/Tools/CrashHandler/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Platform/Mac/CrashHandler_Traits_Mac.h b/Code/Tools/CrashHandler/Platform/Mac/CrashHandler_Traits_Mac.h
index 2ca908a12c..51d0ff7766 100644
--- a/Code/Tools/CrashHandler/Platform/Mac/CrashHandler_Traits_Mac.h
+++ b/Code/Tools/CrashHandler/Platform/Mac/CrashHandler_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Mac/CrashHandler_Traits_Platform.h b/Code/Tools/CrashHandler/Platform/Mac/CrashHandler_Traits_Platform.h
index c60b3bc385..e5afa2fd54 100644
--- a/Code/Tools/CrashHandler/Platform/Mac/CrashHandler_Traits_Platform.h
+++ b/Code/Tools/CrashHandler/Platform/Mac/CrashHandler_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Mac/PAL_mac.cmake b/Code/Tools/CrashHandler/Platform/Mac/PAL_mac.cmake
index 570a4d1592..0c07a18151 100644
--- a/Code/Tools/CrashHandler/Platform/Mac/PAL_mac.cmake
+++ b/Code/Tools/CrashHandler/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Platform/Windows/CrashHandler_Traits_Platform.h b/Code/Tools/CrashHandler/Platform/Windows/CrashHandler_Traits_Platform.h
index d9724a4dc1..2ae9c33985 100644
--- a/Code/Tools/CrashHandler/Platform/Windows/CrashHandler_Traits_Platform.h
+++ b/Code/Tools/CrashHandler/Platform/Windows/CrashHandler_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Windows/CrashHandler_Traits_Windows.h b/Code/Tools/CrashHandler/Platform/Windows/CrashHandler_Traits_Windows.h
index c22879f4eb..3ffc1e77b9 100644
--- a/Code/Tools/CrashHandler/Platform/Windows/CrashHandler_Traits_Windows.h
+++ b/Code/Tools/CrashHandler/Platform/Windows/CrashHandler_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/Windows/PAL_windows.cmake b/Code/Tools/CrashHandler/Platform/Windows/PAL_windows.cmake
index 2ec4e2d13c..8360363c3d 100644
--- a/Code/Tools/CrashHandler/Platform/Windows/PAL_windows.cmake
+++ b/Code/Tools/CrashHandler/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Platform/Windows/crash_handler_windows_files.cmake b/Code/Tools/CrashHandler/Platform/Windows/crash_handler_windows_files.cmake
index 3097d796ee..16aff06747 100644
--- a/Code/Tools/CrashHandler/Platform/Windows/crash_handler_windows_files.cmake
+++ b/Code/Tools/CrashHandler/Platform/Windows/crash_handler_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Platform/Windows/platform_windows_files.cmake b/Code/Tools/CrashHandler/Platform/Windows/platform_windows_files.cmake
index f688b1f068..59251ada42 100644
--- a/Code/Tools/CrashHandler/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Tools/CrashHandler/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Platform/iOS/CrashHandler_Traits_Platform.h b/Code/Tools/CrashHandler/Platform/iOS/CrashHandler_Traits_Platform.h
index 1a3128bd22..71cdc8d4ff 100644
--- a/Code/Tools/CrashHandler/Platform/iOS/CrashHandler_Traits_Platform.h
+++ b/Code/Tools/CrashHandler/Platform/iOS/CrashHandler_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/iOS/CrashHandler_Traits_iOS.h b/Code/Tools/CrashHandler/Platform/iOS/CrashHandler_Traits_iOS.h
index 2ca908a12c..51d0ff7766 100644
--- a/Code/Tools/CrashHandler/Platform/iOS/CrashHandler_Traits_iOS.h
+++ b/Code/Tools/CrashHandler/Platform/iOS/CrashHandler_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Platform/iOS/PAL_ios.cmake b/Code/Tools/CrashHandler/Platform/iOS/PAL_ios.cmake
index 570a4d1592..0c07a18151 100644
--- a/Code/Tools/CrashHandler/Platform/iOS/PAL_ios.cmake
+++ b/Code/Tools/CrashHandler/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Shared/CrashHandler.cpp b/Code/Tools/CrashHandler/Shared/CrashHandler.cpp
index 94e61fe933..bf675a6804 100644
--- a/Code/Tools/CrashHandler/Shared/CrashHandler.cpp
+++ b/Code/Tools/CrashHandler/Shared/CrashHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Shared/CrashHandler.h b/Code/Tools/CrashHandler/Shared/CrashHandler.h
index 1d490623c8..7237992362 100644
--- a/Code/Tools/CrashHandler/Shared/CrashHandler.h
+++ b/Code/Tools/CrashHandler/Shared/CrashHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Support/CMakeLists.txt b/Code/Tools/CrashHandler/Support/CMakeLists.txt
index 14b7d446cc..427a57b49e 100644
--- a/Code/Tools/CrashHandler/Support/CMakeLists.txt
+++ b/Code/Tools/CrashHandler/Support/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Support/crash_handler_support_files.cmake b/Code/Tools/CrashHandler/Support/crash_handler_support_files.cmake
index b30482cc9a..8c1bbeba7a 100644
--- a/Code/Tools/CrashHandler/Support/crash_handler_support_files.cmake
+++ b/Code/Tools/CrashHandler/Support/crash_handler_support_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Support/include/CrashSupport.h b/Code/Tools/CrashHandler/Support/include/CrashSupport.h
index 36b8da6fd8..f9364f211f 100644
--- a/Code/Tools/CrashHandler/Support/include/CrashSupport.h
+++ b/Code/Tools/CrashHandler/Support/include/CrashSupport.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Support/platform/Windows/crash_handler_support_windows_files.cmake b/Code/Tools/CrashHandler/Support/platform/Windows/crash_handler_support_windows_files.cmake
index 72b8647371..b040998de6 100644
--- a/Code/Tools/CrashHandler/Support/platform/Windows/crash_handler_support_windows_files.cmake
+++ b/Code/Tools/CrashHandler/Support/platform/Windows/crash_handler_support_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Support/platform/mac/CrashSupport_mac.cpp b/Code/Tools/CrashHandler/Support/platform/mac/CrashSupport_mac.cpp
index 37ff1f6f93..cf037f087d 100644
--- a/Code/Tools/CrashHandler/Support/platform/mac/CrashSupport_mac.cpp
+++ b/Code/Tools/CrashHandler/Support/platform/mac/CrashSupport_mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Support/platform/win/CrashSupport_win.cpp b/Code/Tools/CrashHandler/Support/platform/win/CrashSupport_win.cpp
index cfa3f8cfbf..d169a870ab 100644
--- a/Code/Tools/CrashHandler/Support/platform/win/CrashSupport_win.cpp
+++ b/Code/Tools/CrashHandler/Support/platform/win/CrashSupport_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Support/src/CrashSupport.cpp b/Code/Tools/CrashHandler/Support/src/CrashSupport.cpp
index e19a706a5a..ef91b9a7e7 100644
--- a/Code/Tools/CrashHandler/Support/src/CrashSupport.cpp
+++ b/Code/Tools/CrashHandler/Support/src/CrashSupport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/CMakeLists.txt b/Code/Tools/CrashHandler/Tools/CMakeLists.txt
index 0fdd56762a..9d1fc46096 100644
--- a/Code/Tools/CrashHandler/Tools/CMakeLists.txt
+++ b/Code/Tools/CrashHandler/Tools/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Tools/Platform/Windows/tools_crash_handler_windows_files.cmake b/Code/Tools/CrashHandler/Tools/Platform/Windows/tools_crash_handler_windows_files.cmake
index bc14c37980..4133a9719c 100644
--- a/Code/Tools/CrashHandler/Tools/Platform/Windows/tools_crash_handler_windows_files.cmake
+++ b/Code/Tools/CrashHandler/Tools/Platform/Windows/tools_crash_handler_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Tools/Platform/Windows/tools_crash_uploader_windows_files.cmake b/Code/Tools/CrashHandler/Tools/Platform/Windows/tools_crash_uploader_windows_files.cmake
index 683589455f..e6ff877b14 100644
--- a/Code/Tools/CrashHandler/Tools/Platform/Windows/tools_crash_uploader_windows_files.cmake
+++ b/Code/Tools/CrashHandler/Tools/Platform/Windows/tools_crash_uploader_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Tools/ToolsCrashHandler.cpp b/Code/Tools/CrashHandler/Tools/ToolsCrashHandler.cpp
index f6a7a3455c..8d209d400a 100644
--- a/Code/Tools/CrashHandler/Tools/ToolsCrashHandler.cpp
+++ b/Code/Tools/CrashHandler/Tools/ToolsCrashHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/ToolsCrashHandler.h b/Code/Tools/CrashHandler/Tools/ToolsCrashHandler.h
index 4d0033465b..1adad2878e 100644
--- a/Code/Tools/CrashHandler/Tools/ToolsCrashHandler.h
+++ b/Code/Tools/CrashHandler/Tools/ToolsCrashHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/ToolsCrashHandler_mac.cpp b/Code/Tools/CrashHandler/Tools/ToolsCrashHandler_mac.cpp
index a49a8e1c45..1498eacb0e 100644
--- a/Code/Tools/CrashHandler/Tools/ToolsCrashHandler_mac.cpp
+++ b/Code/Tools/CrashHandler/Tools/ToolsCrashHandler_mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/ToolsCrashHandler_win.cpp b/Code/Tools/CrashHandler/Tools/ToolsCrashHandler_win.cpp
index 9e82e15a68..ee7692c84c 100644
--- a/Code/Tools/CrashHandler/Tools/ToolsCrashHandler_win.cpp
+++ b/Code/Tools/CrashHandler/Tools/ToolsCrashHandler_win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/UI/submit_report.ui b/Code/Tools/CrashHandler/Tools/UI/submit_report.ui
index 872adac709..9e816ba73f 100644
--- a/Code/Tools/CrashHandler/Tools/UI/submit_report.ui
+++ b/Code/Tools/CrashHandler/Tools/UI/submit_report.ui
@@ -158,7 +158,7 @@
   </widget>
  </widget>
  <resources>
-  <include location="../../../../Sandbox/Editor/MainWindow.qrc"/>
+  <include location="../../../../Editor/MainWindow.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/Code/Tools/CrashHandler/Tools/Uploader/SendReportDialog.cpp b/Code/Tools/CrashHandler/Tools/Uploader/SendReportDialog.cpp
index 87bdb2d7a0..a253ea56ce 100644
--- a/Code/Tools/CrashHandler/Tools/Uploader/SendReportDialog.cpp
+++ b/Code/Tools/CrashHandler/Tools/Uploader/SendReportDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/Uploader/SendReportDialog.h b/Code/Tools/CrashHandler/Tools/Uploader/SendReportDialog.h
index bdef3fc366..61483411ee 100644
--- a/Code/Tools/CrashHandler/Tools/Uploader/SendReportDialog.h
+++ b/Code/Tools/CrashHandler/Tools/Uploader/SendReportDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.cpp b/Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.cpp
index de68198374..79b88d7c48 100644
--- a/Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.cpp
+++ b/Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.h b/Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.h
index 411268c242..71f28b702f 100644
--- a/Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.h
+++ b/Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/Uploader/platforms/posix/main.cpp b/Code/Tools/CrashHandler/Tools/Uploader/platforms/posix/main.cpp
index 74db3b9435..d43a793bc8 100644
--- a/Code/Tools/CrashHandler/Tools/Uploader/platforms/posix/main.cpp
+++ b/Code/Tools/CrashHandler/Tools/Uploader/platforms/posix/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/Uploader/platforms/win/main.cpp b/Code/Tools/CrashHandler/Tools/Uploader/platforms/win/main.cpp
index 7954abbb95..02ceb9afcf 100644
--- a/Code/Tools/CrashHandler/Tools/Uploader/platforms/win/main.cpp
+++ b/Code/Tools/CrashHandler/Tools/Uploader/platforms/win/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Tools/tools_crash_handler_files.cmake b/Code/Tools/CrashHandler/Tools/tools_crash_handler_files.cmake
index eb958068f7..729d2f8150 100644
--- a/Code/Tools/CrashHandler/Tools/tools_crash_handler_files.cmake
+++ b/Code/Tools/CrashHandler/Tools/tools_crash_handler_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Tools/tools_crash_uploader_files.cmake b/Code/Tools/CrashHandler/Tools/tools_crash_uploader_files.cmake
index bdac7d6a5f..9abe1ad446 100644
--- a/Code/Tools/CrashHandler/Tools/tools_crash_uploader_files.cmake
+++ b/Code/Tools/CrashHandler/Tools/tools_crash_uploader_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/Uploader/include/Uploader/BufferedDataStream.h b/Code/Tools/CrashHandler/Uploader/include/Uploader/BufferedDataStream.h
index 00e5c26cc1..7f4ea07adf 100644
--- a/Code/Tools/CrashHandler/Uploader/include/Uploader/BufferedDataStream.h
+++ b/Code/Tools/CrashHandler/Uploader/include/Uploader/BufferedDataStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Uploader/include/Uploader/CrashUploader.h b/Code/Tools/CrashHandler/Uploader/include/Uploader/CrashUploader.h
index 32a73e8257..ecf11b3d38 100644
--- a/Code/Tools/CrashHandler/Uploader/include/Uploader/CrashUploader.h
+++ b/Code/Tools/CrashHandler/Uploader/include/Uploader/CrashUploader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Uploader/include/Uploader/FileStreamDataSource.h b/Code/Tools/CrashHandler/Uploader/include/Uploader/FileStreamDataSource.h
index bb725eba4c..698ebfd359 100644
--- a/Code/Tools/CrashHandler/Uploader/include/Uploader/FileStreamDataSource.h
+++ b/Code/Tools/CrashHandler/Uploader/include/Uploader/FileStreamDataSource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Uploader/src/BufferedDataStream.cpp b/Code/Tools/CrashHandler/Uploader/src/BufferedDataStream.cpp
index 103cf2b5d7..85a43d8462 100644
--- a/Code/Tools/CrashHandler/Uploader/src/BufferedDataStream.cpp
+++ b/Code/Tools/CrashHandler/Uploader/src/BufferedDataStream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp b/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp
index dc5fca4c7c..73fd41d395 100644
--- a/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp
+++ b/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/Uploader/src/FileStreamDataSource.cpp b/Code/Tools/CrashHandler/Uploader/src/FileStreamDataSource.cpp
index ddd7d48955..956144d61b 100644
--- a/Code/Tools/CrashHandler/Uploader/src/FileStreamDataSource.cpp
+++ b/Code/Tools/CrashHandler/Uploader/src/FileStreamDataSource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/CrashHandler/crash_handler_files.cmake b/Code/Tools/CrashHandler/crash_handler_files.cmake
index 39043fb41d..0579fa0c0e 100644
--- a/Code/Tools/CrashHandler/crash_handler_files.cmake
+++ b/Code/Tools/CrashHandler/crash_handler_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/CrashHandler/crash_uploader_support_files.cmake b/Code/Tools/CrashHandler/crash_uploader_support_files.cmake
index 4a613f0f0f..d22b17c3f4 100644
--- a/Code/Tools/CrashHandler/crash_uploader_support_files.cmake
+++ b/Code/Tools/CrashHandler/crash_uploader_support_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/DeltaCataloger/CMakeLists.txt b/Code/Tools/DeltaCataloger/CMakeLists.txt
index 92d7e4b05a..2f12f50afc 100644
--- a/Code/Tools/DeltaCataloger/CMakeLists.txt
+++ b/Code/Tools/DeltaCataloger/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/DeltaCataloger/Tests/tests_main.cpp b/Code/Tools/DeltaCataloger/Tests/tests_main.cpp
index 1d9cb7bf96..f34c970010 100644
--- a/Code/Tools/DeltaCataloger/Tests/tests_main.cpp
+++ b/Code/Tools/DeltaCataloger/Tests/tests_main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/DeltaCataloger/deltacataloger_files.cmake b/Code/Tools/DeltaCataloger/deltacataloger_files.cmake
index 2bc0ab4c8b..36ed8b5737 100644
--- a/Code/Tools/DeltaCataloger/deltacataloger_files.cmake
+++ b/Code/Tools/DeltaCataloger/deltacataloger_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/DeltaCataloger/deltacataloger_test_files.cmake b/Code/Tools/DeltaCataloger/deltacataloger_test_files.cmake
index d357afa85d..f643462064 100644
--- a/Code/Tools/DeltaCataloger/deltacataloger_test_files.cmake
+++ b/Code/Tools/DeltaCataloger/deltacataloger_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/DeltaCataloger/deltacataloger_win_files.cmake b/Code/Tools/DeltaCataloger/deltacataloger_win_files.cmake
index f07893add2..0d32443deb 100644
--- a/Code/Tools/DeltaCataloger/deltacataloger_win_files.cmake
+++ b/Code/Tools/DeltaCataloger/deltacataloger_win_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/DeltaCataloger/source/main.cpp b/Code/Tools/DeltaCataloger/source/main.cpp
index e496e3e96b..00d54f2885 100644
--- a/Code/Tools/DeltaCataloger/source/main.cpp
+++ b/Code/Tools/DeltaCataloger/source/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/GridHub/CMakeLists.txt b/Code/Tools/GridHub/CMakeLists.txt
index bb2f9fa9ef..30a29ea7e2 100644
--- a/Code/Tools/GridHub/CMakeLists.txt
+++ b/Code/Tools/GridHub/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/GridHub/GridHub/gridhub.cpp b/Code/Tools/GridHub/GridHub/gridhub.cpp
index 270325d56b..9c494e41fa 100644
--- a/Code/Tools/GridHub/GridHub/gridhub.cpp
+++ b/Code/Tools/GridHub/GridHub/gridhub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/GridHub/GridHub/gridhub.hxx b/Code/Tools/GridHub/GridHub/gridhub.hxx
index fc32a789ec..c8a9c336d4 100644
--- a/Code/Tools/GridHub/GridHub/gridhub.hxx
+++ b/Code/Tools/GridHub/GridHub/gridhub.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/GridHub/GridHub/main.cpp b/Code/Tools/GridHub/GridHub/main.cpp
index 56afa47158..5b35abff6c 100644
--- a/Code/Tools/GridHub/GridHub/main.cpp
+++ b/Code/Tools/GridHub/GridHub/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/GridHub/Platform/Linux/gridhub_linux_files.cmake b/Code/Tools/GridHub/Platform/Linux/gridhub_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Code/Tools/GridHub/Platform/Linux/gridhub_linux_files.cmake
+++ b/Code/Tools/GridHub/Platform/Linux/gridhub_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/GridHub/Platform/Linux/platform_linux.cmake b/Code/Tools/GridHub/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Tools/GridHub/Platform/Linux/platform_linux.cmake
+++ b/Code/Tools/GridHub/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/GridHub/Platform/Mac/gridhub_mac_files.cmake b/Code/Tools/GridHub/Platform/Mac/gridhub_mac_files.cmake
index caec1043b9..d36cb02e87 100644
--- a/Code/Tools/GridHub/Platform/Mac/gridhub_mac_files.cmake
+++ b/Code/Tools/GridHub/Platform/Mac/gridhub_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/GridHub/Platform/Mac/platform_mac.cmake b/Code/Tools/GridHub/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Tools/GridHub/Platform/Mac/platform_mac.cmake
+++ b/Code/Tools/GridHub/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/GridHub/Platform/Windows/gridhub_windows_files.cmake b/Code/Tools/GridHub/Platform/Windows/gridhub_windows_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Code/Tools/GridHub/Platform/Windows/gridhub_windows_files.cmake
+++ b/Code/Tools/GridHub/Platform/Windows/gridhub_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/GridHub/Platform/Windows/platform_windows.cmake b/Code/Tools/GridHub/Platform/Windows/platform_windows.cmake
index a3af578d12..724222b437 100644
--- a/Code/Tools/GridHub/Platform/Windows/platform_windows.cmake
+++ b/Code/Tools/GridHub/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/GridHub/gridhub_files.cmake b/Code/Tools/GridHub/gridhub_files.cmake
index 5b539730e6..ee4c60f9b6 100644
--- a/Code/Tools/GridHub/gridhub_files.cmake
+++ b/Code/Tools/GridHub/gridhub_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/CMakeLists.txt b/Code/Tools/News/CMakeLists.txt
index d60a91b9cc..78c5774ef0 100644
--- a/Code/Tools/News/CMakeLists.txt
+++ b/Code/Tools/News/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/NewsBuilder/CMakeLists.txt b/Code/Tools/News/NewsBuilder/CMakeLists.txt
index eb8d514c60..218f4e28f5 100644
--- a/Code/Tools/News/NewsBuilder/CMakeLists.txt
+++ b/Code/Tools/News/NewsBuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/NewsBuilder/EndpointManager.cpp b/Code/Tools/News/NewsBuilder/EndpointManager.cpp
index 6ef3af1065..0b2ea4dd5c 100644
--- a/Code/Tools/News/NewsBuilder/EndpointManager.cpp
+++ b/Code/Tools/News/NewsBuilder/EndpointManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/EndpointManager.h b/Code/Tools/News/NewsBuilder/EndpointManager.h
index fbfbd2bf2b..cc44951d16 100644
--- a/Code/Tools/News/NewsBuilder/EndpointManager.h
+++ b/Code/Tools/News/NewsBuilder/EndpointManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Platform/Android/PAL_android.cmake b/Code/Tools/News/NewsBuilder/Platform/Android/PAL_android.cmake
index 9914df67d0..929d864fc4 100644
--- a/Code/Tools/News/NewsBuilder/Platform/Android/PAL_android.cmake
+++ b/Code/Tools/News/NewsBuilder/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/NewsBuilder/Platform/Linux/PAL_linux.cmake b/Code/Tools/News/NewsBuilder/Platform/Linux/PAL_linux.cmake
index 9914df67d0..929d864fc4 100644
--- a/Code/Tools/News/NewsBuilder/Platform/Linux/PAL_linux.cmake
+++ b/Code/Tools/News/NewsBuilder/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/NewsBuilder/Platform/Mac/PAL_mac.cmake b/Code/Tools/News/NewsBuilder/Platform/Mac/PAL_mac.cmake
index 9914df67d0..929d864fc4 100644
--- a/Code/Tools/News/NewsBuilder/Platform/Mac/PAL_mac.cmake
+++ b/Code/Tools/News/NewsBuilder/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/NewsBuilder/Platform/Windows/PAL_windows.cmake b/Code/Tools/News/NewsBuilder/Platform/Windows/PAL_windows.cmake
index f144bf0e49..180b7b9492 100644
--- a/Code/Tools/News/NewsBuilder/Platform/Windows/PAL_windows.cmake
+++ b/Code/Tools/News/NewsBuilder/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/NewsBuilder/Platform/iOS/PAL_ios.cmake b/Code/Tools/News/NewsBuilder/Platform/iOS/PAL_ios.cmake
index 9914df67d0..929d864fc4 100644
--- a/Code/Tools/News/NewsBuilder/Platform/iOS/PAL_ios.cmake
+++ b/Code/Tools/News/NewsBuilder/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.cpp b/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.cpp
index 8fa6bdbf38..2872a714e8 100644
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.h b/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.h
index 55f8e72bb8..7f8d482e3f 100644
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.h
+++ b/Code/Tools/News/NewsBuilder/Qt/ArticleDetails.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.cpp b/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.cpp
index e10ce2ae97..586978a562 100644
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.h b/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.h
index abb49d0797..1df42198c3 100644
--- a/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.h
+++ b/Code/Tools/News/NewsBuilder/Qt/ArticleDetailsContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.cpp b/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.cpp
index 73f37140ed..bf77a89895 100644
--- a/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.h b/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.h
index 6f4a4ccf21..94712ca768 100644
--- a/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.h
+++ b/Code/Tools/News/NewsBuilder/Qt/BuilderArticleViewContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.cpp b/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.cpp
index d63375c23e..5e698eea97 100644
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.h b/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.h
index edaeac6144..c8b014c167 100644
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.h
+++ b/Code/Tools/News/NewsBuilder/Qt/EndpointEntryView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.cpp b/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.cpp
index 1ff8ddbf2b..e28245b895 100644
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.h b/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.h
index 2f5cb2b30b..c6362a06af 100644
--- a/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.h
+++ b/Code/Tools/News/NewsBuilder/Qt/EndpointManagerView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/ImageItem.cpp b/Code/Tools/News/NewsBuilder/Qt/ImageItem.cpp
index e818f627c0..1566b8309d 100644
--- a/Code/Tools/News/NewsBuilder/Qt/ImageItem.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/ImageItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/ImageItem.h b/Code/Tools/News/NewsBuilder/Qt/ImageItem.h
index 0d8875bd8e..ba883bc736 100644
--- a/Code/Tools/News/NewsBuilder/Qt/ImageItem.h
+++ b/Code/Tools/News/NewsBuilder/Qt/ImageItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/LogContainer.cpp b/Code/Tools/News/NewsBuilder/Qt/LogContainer.cpp
index 9a4140eb5d..5efda641db 100644
--- a/Code/Tools/News/NewsBuilder/Qt/LogContainer.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/LogContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/LogContainer.h b/Code/Tools/News/NewsBuilder/Qt/LogContainer.h
index c9fcecb328..8f46f3b406 100644
--- a/Code/Tools/News/NewsBuilder/Qt/LogContainer.h
+++ b/Code/Tools/News/NewsBuilder/Qt/LogContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.cpp b/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.cpp
index cd6fa24736..5cbb510dd6 100644
--- a/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.h b/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.h
index 4203ad9f8b..61e25bda1b 100644
--- a/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.h
+++ b/Code/Tools/News/NewsBuilder/Qt/NewsBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.cpp b/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.cpp
index 5ef43def5b..1b92f91e42 100644
--- a/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.h b/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.h
index 26862d4cbc..6cd6771514 100644
--- a/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.h
+++ b/Code/Tools/News/NewsBuilder/Qt/QCustomMessageBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/SelectImage.cpp b/Code/Tools/News/NewsBuilder/Qt/SelectImage.cpp
index fb2e798d0d..7a9e427f4b 100644
--- a/Code/Tools/News/NewsBuilder/Qt/SelectImage.cpp
+++ b/Code/Tools/News/NewsBuilder/Qt/SelectImage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/Qt/SelectImage.h b/Code/Tools/News/NewsBuilder/Qt/SelectImage.h
index f9a15f9074..5fc80cfe5a 100644
--- a/Code/Tools/News/NewsBuilder/Qt/SelectImage.h
+++ b/Code/Tools/News/NewsBuilder/Qt/SelectImage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.cpp b/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.cpp
index 95f94ebfbb..0a845216fe 100644
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.cpp
+++ b/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.h b/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.h
index 3bc3dcb0e1..b6c20df571 100644
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.h
+++ b/Code/Tools/News/NewsBuilder/ResourceManagement/BuilderResourceManifest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.cpp b/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.cpp
index 7021878842..63cdb46218 100644
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.cpp
+++ b/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.h b/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.h
index a800b4e27e..8928e9e19d 100644
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.h
+++ b/Code/Tools/News/NewsBuilder/ResourceManagement/DeleteDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.cpp b/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.cpp
index 308d1098be..a16ec48851 100644
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.cpp
+++ b/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.h b/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.h
index 906b276358..ba4533b0c0 100644
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.h
+++ b/Code/Tools/News/NewsBuilder/ResourceManagement/ImageDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.cpp b/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.cpp
index b63b30df3c..699959ed85 100644
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.cpp
+++ b/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.h b/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.h
index e4de17cddf..71a7732c1e 100644
--- a/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.h
+++ b/Code/Tools/News/NewsBuilder/ResourceManagement/UploadDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/S3Connector.cpp b/Code/Tools/News/NewsBuilder/S3Connector.cpp
index 4b7df592f9..a54b6fa8f8 100644
--- a/Code/Tools/News/NewsBuilder/S3Connector.cpp
+++ b/Code/Tools/News/NewsBuilder/S3Connector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/S3Connector.h b/Code/Tools/News/NewsBuilder/S3Connector.h
index ce4cdae457..d0404bfddb 100644
--- a/Code/Tools/News/NewsBuilder/S3Connector.h
+++ b/Code/Tools/News/NewsBuilder/S3Connector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/UidGenerator.cpp b/Code/Tools/News/NewsBuilder/UidGenerator.cpp
index 439ba8b23f..060f593996 100644
--- a/Code/Tools/News/NewsBuilder/UidGenerator.cpp
+++ b/Code/Tools/News/NewsBuilder/UidGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/UidGenerator.h b/Code/Tools/News/NewsBuilder/UidGenerator.h
index 0a6a707069..825df9e340 100644
--- a/Code/Tools/News/NewsBuilder/UidGenerator.h
+++ b/Code/Tools/News/NewsBuilder/UidGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/main.cpp b/Code/Tools/News/NewsBuilder/main.cpp
index e120768280..6a43c681b1 100644
--- a/Code/Tools/News/NewsBuilder/main.cpp
+++ b/Code/Tools/News/NewsBuilder/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsBuilder/news_builder_files.cmake b/Code/Tools/News/NewsBuilder/news_builder_files.cmake
index 7fcaea7d83..c46e66a357 100644
--- a/Code/Tools/News/NewsBuilder/news_builder_files.cmake
+++ b/Code/Tools/News/NewsBuilder/news_builder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/News/NewsShared/ErrorCodes.h b/Code/Tools/News/NewsShared/ErrorCodes.h
index 64f0d5ecf8..444e0c6f67 100644
--- a/Code/Tools/News/NewsShared/ErrorCodes.h
+++ b/Code/Tools/News/NewsShared/ErrorCodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/LogType.h b/Code/Tools/News/NewsShared/LogType.h
index 80570638b7..92834adc58 100644
--- a/Code/Tools/News/NewsShared/LogType.h
+++ b/Code/Tools/News/NewsShared/LogType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/Qt/ArticleErrorView.cpp b/Code/Tools/News/NewsShared/Qt/ArticleErrorView.cpp
index 898e6cbf41..6f2a7e3c9c 100644
--- a/Code/Tools/News/NewsShared/Qt/ArticleErrorView.cpp
+++ b/Code/Tools/News/NewsShared/Qt/ArticleErrorView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/Qt/ArticleErrorView.h b/Code/Tools/News/NewsShared/Qt/ArticleErrorView.h
index 0f098f7644..3130690dc1 100644
--- a/Code/Tools/News/NewsShared/Qt/ArticleErrorView.h
+++ b/Code/Tools/News/NewsShared/Qt/ArticleErrorView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/Qt/ArticleView.cpp b/Code/Tools/News/NewsShared/Qt/ArticleView.cpp
index 8ca71776ed..082a29d38a 100644
--- a/Code/Tools/News/NewsShared/Qt/ArticleView.cpp
+++ b/Code/Tools/News/NewsShared/Qt/ArticleView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/Qt/ArticleView.h b/Code/Tools/News/NewsShared/Qt/ArticleView.h
index 5e517f84d6..16a29732f0 100644
--- a/Code/Tools/News/NewsShared/Qt/ArticleView.h
+++ b/Code/Tools/News/NewsShared/Qt/ArticleView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.cpp b/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.cpp
index 0fd7eeac87..1d718d1bb8 100644
--- a/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.cpp
+++ b/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.h b/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.h
index 458077af94..c0ae3b2701 100644
--- a/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.h
+++ b/Code/Tools/News/NewsShared/Qt/ArticleViewContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/Qt/KeepInTouchView.cpp b/Code/Tools/News/NewsShared/Qt/KeepInTouchView.cpp
index 64f69d66ef..43c32c43fc 100644
--- a/Code/Tools/News/NewsShared/Qt/KeepInTouchView.cpp
+++ b/Code/Tools/News/NewsShared/Qt/KeepInTouchView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/Qt/KeepInTouchView.h b/Code/Tools/News/NewsShared/Qt/KeepInTouchView.h
index f79e487cb9..5d5c6a9e36 100644
--- a/Code/Tools/News/NewsShared/Qt/KeepInTouchView.h
+++ b/Code/Tools/News/NewsShared/Qt/KeepInTouchView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.cpp b/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.cpp
index ccee650c11..c26d2357d7 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.cpp
+++ b/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.h b/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.h
index ca8ef907c4..c0ca459cf4 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.h
+++ b/Code/Tools/News/NewsShared/ResourceManagement/ArticleDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.cpp b/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.cpp
index de5eba673b..0d21a18c05 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.cpp
+++ b/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.h b/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.h
index ae585a1baa..3d56037543 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.h
+++ b/Code/Tools/News/NewsShared/ResourceManagement/Descriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.cpp b/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.cpp
index 72743f2c58..5e71c8f10b 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.cpp
+++ b/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.h b/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.h
index f58ec610cf..286e66c4ac 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.h
+++ b/Code/Tools/News/NewsShared/ResourceManagement/JsonDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.cpp b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.cpp
index 1abc20ed2d..e70285fd31 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.cpp
+++ b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.h b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.h
index a4230c6f21..6a7c93a51f 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.h
+++ b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloadManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.cpp b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.cpp
index 938f34ae25..0139ec5344 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.cpp
+++ b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.h b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.h
index edb5dd7886..0dcc86e951 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.h
+++ b/Code/Tools/News/NewsShared/ResourceManagement/QtDownloader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/Resource.cpp b/Code/Tools/News/NewsShared/ResourceManagement/Resource.cpp
index 92a717ed95..d40b66d6d7 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/Resource.cpp
+++ b/Code/Tools/News/NewsShared/ResourceManagement/Resource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/Resource.h b/Code/Tools/News/NewsShared/ResourceManagement/Resource.h
index 562a9d76ac..1174fea788 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/Resource.h
+++ b/Code/Tools/News/NewsShared/ResourceManagement/Resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.cpp b/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.cpp
index 04f7c5a523..969c4ec8f1 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.cpp
+++ b/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.h b/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.h
index f7bed3d5b1..3a0f31de8f 100644
--- a/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.h
+++ b/Code/Tools/News/NewsShared/ResourceManagement/ResourceManifest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/News/news_shared_files.cmake b/Code/Tools/News/news_shared_files.cmake
index f7c1262a52..2f20029068 100644
--- a/Code/Tools/News/news_shared_files.cmake
+++ b/Code/Tools/News/news_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/CMakeLists.txt b/Code/Tools/ProjectManager/CMakeLists.txt
index fc3fcc351c..ceabbbd1ed 100644
--- a/Code/Tools/ProjectManager/CMakeLists.txt
+++ b/Code/Tools/ProjectManager/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Android/PAL_android.cmake b/Code/Tools/ProjectManager/Platform/Android/PAL_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Tools/ProjectManager/Platform/Android/PAL_android.cmake
+++ b/Code/Tools/ProjectManager/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Common/Clang/projectmanager_clang.cmake b/Code/Tools/ProjectManager/Platform/Common/Clang/projectmanager_clang.cmake
index e5c49c47cd..89a2dfa866 100644
--- a/Code/Tools/ProjectManager/Platform/Common/Clang/projectmanager_clang.cmake
+++ b/Code/Tools/ProjectManager/Platform/Common/Clang/projectmanager_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Common/MSVC/projectmanager_msvc.cmake b/Code/Tools/ProjectManager/Platform/Common/MSVC/projectmanager_msvc.cmake
index 002a8c63ef..e7e2742b9d 100644
--- a/Code/Tools/ProjectManager/Platform/Common/MSVC/projectmanager_msvc.cmake
+++ b/Code/Tools/ProjectManager/Platform/Common/MSVC/projectmanager_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Linux/PAL_linux.cmake b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/PAL_linux.cmake
+++ b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake
index 5ccb16a784..e8085de555 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake
+++ b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -7,4 +7,5 @@
 
 set(FILES
     Python_linux.cpp
+    ProjectBuilderWorker_linux.cpp
 )
diff --git a/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_tests_files.cmake b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_tests_files.cmake
index 44a79aeb13..f130838aad 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_tests_files.cmake
+++ b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp
new file mode 100644
index 0000000000..71ade6a009
--- /dev/null
+++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp
@@ -0,0 +1,19 @@
+/*
+ * 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 <ProjectBuilderWorker.h>
+
+namespace O3DE::ProjectManager
+{
+    AZ::Outcome<void, QString> ProjectBuilderWorker::BuildProjectForPlatform()
+    {
+        QString error = tr("Automatic building on Linux not currently supported!");
+        QStringToAZTracePrint(error);
+        return AZ::Failure(error);
+    }
+    
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Test_Traits_Linux.h b/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Test_Traits_Linux.h
index 634b6271f9..122783a3bc 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Test_Traits_Linux.h
+++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Test_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Test_Traits_Platform.h b/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Test_Traits_Platform.h
index f0e5832b01..6f732d11ea 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Test_Traits_Platform.h
+++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Test_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/Linux/Python_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/Python_linux.cpp
index 507baa5801..755bb26c03 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/Python_linux.cpp
+++ b/Code/Tools/ProjectManager/Platform/Linux/Python_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/Mac/PAL_mac.cmake b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/PAL_mac.cmake
+++ b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake
index 93b5848b4f..01d6b5f112 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake
+++ b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -7,4 +7,5 @@
 
 set(FILES
     Python_mac.cpp
+    ProjectBuilderWorker_mac.cpp
 )
diff --git a/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_tests_files.cmake b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_tests_files.cmake
index 9ba11556f4..83db835e8b 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_tests_files.cmake
+++ b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp
new file mode 100644
index 0000000000..bb14bfea6b
--- /dev/null
+++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp
@@ -0,0 +1,19 @@
+/*
+ * 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 <ProjectBuilderWorker.h>
+
+namespace O3DE::ProjectManager
+{
+    AZ::Outcome<void, QString> ProjectBuilderWorker::BuildProjectForPlatform()
+    {
+        QString error = tr("Automatic building on MacOS not currently supported!");
+        QStringToAZTracePrint(error);
+        return AZ::Failure(error);
+    }
+    
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Test_Traits_Mac.h b/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Test_Traits_Mac.h
index f2965bd3fc..6c3dd46a76 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Test_Traits_Mac.h
+++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Test_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Test_Traits_Platform.h b/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Test_Traits_Platform.h
index beea09b815..86faa4ea06 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Test_Traits_Platform.h
+++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Test_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/Mac/Python_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/Python_mac.cpp
index 45bf24b363..17e29ccf1e 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/Python_mac.cpp
+++ b/Code/Tools/ProjectManager/Platform/Mac/Python_mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/Windows/PAL_windows.cmake b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows.cmake
index c1d9d8b6b5..db62374d57 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/PAL_windows.cmake
+++ b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake
index 34be367381..eb45c61807 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake
+++ b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -7,4 +7,5 @@
 
 set(FILES
     Python_windows.cpp
+    ProjectBuilderWorker_windows.cpp
 )
diff --git a/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_tests_files.cmake b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_tests_files.cmake
index dbe2f59dc1..42352646b8 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_tests_files.cmake
+++ b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Platform/Windows/ProjectBuilderWorker_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectBuilderWorker_windows.cpp
new file mode 100644
index 0000000000..87a8a6c0ec
--- /dev/null
+++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectBuilderWorker_windows.cpp
@@ -0,0 +1,175 @@
+/*
+ * 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 <ProjectBuilderWorker.h>
+#include <ProjectManagerDefs.h>
+#include <PythonBindingsInterface.h>
+
+#include <QDir>
+#include <QFile>
+#include <QProcess>
+#include <QProcessEnvironment>
+#include <QTextStream>
+#include <QThread>
+
+namespace O3DE::ProjectManager
+{
+    AZ::Outcome<void, QString> ProjectBuilderWorker::BuildProjectForPlatform()
+    {
+        // Check if we are trying to cancel task
+        if (QThread::currentThread()->isInterruptionRequested())
+        {
+            QStringToAZTracePrint(BuildCancelled);
+            return AZ::Failure(BuildCancelled);
+        }
+
+        QFile logFile(GetLogFilePath());
+        if (!logFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
+        {
+            QString error = tr("Failed to open log file.");
+            QStringToAZTracePrint(error);
+            return AZ::Failure(error);
+        }
+
+        EngineInfo engineInfo;
+
+        AZ::Outcome<EngineInfo> engineInfoResult = PythonBindingsInterface::Get()->GetEngineInfo();
+        if (engineInfoResult.IsSuccess())
+        {
+            engineInfo = engineInfoResult.GetValue();
+        }
+        else
+        {
+            QString error = tr("Failed to get engine info.");
+            QStringToAZTracePrint(error);
+            return AZ::Failure(error);
+        }
+
+        QTextStream logStream(&logFile);
+        if (QThread::currentThread()->isInterruptionRequested())
+        {
+            logFile.close();
+            QStringToAZTracePrint(BuildCancelled);
+            return AZ::Failure(BuildCancelled);
+        }
+
+        // Show some kind of progress with very approximate estimates
+        UpdateProgress(++m_progressEstimate);
+
+        QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment());
+        // Append cmake path to PATH incase it is missing
+        QDir cmakePath(engineInfo.m_path);
+        cmakePath.cd("cmake/runtime/bin");
+        QString pathValue = currentEnvironment.value("PATH");
+        pathValue += ";" + cmakePath.path();
+        currentEnvironment.insert("PATH", pathValue);
+
+        m_configProjectProcess = new QProcess(this);
+        m_configProjectProcess->setProcessChannelMode(QProcess::MergedChannels);
+        m_configProjectProcess->setWorkingDirectory(m_projectInfo.m_path);
+        m_configProjectProcess->setProcessEnvironment(currentEnvironment);
+
+        m_configProjectProcess->start(
+            "cmake",
+            QStringList{ "-B", QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix), "-S", m_projectInfo.m_path, "-G",
+                         "Visual Studio 16", "-DLY_3RDPARTY_PATH=" + engineInfo.m_thirdPartyPath });
+
+        if (!m_configProjectProcess->waitForStarted())
+        {
+            QString error = tr("Configuring project failed to start.");
+            QStringToAZTracePrint(error);
+            return AZ::Failure(error);
+        }
+        bool containsGeneratingDone = false;
+        while (m_configProjectProcess->waitForReadyRead(MaxBuildTimeMSecs))
+        {
+            QString configOutput = m_configProjectProcess->readAllStandardOutput();
+
+            if (configOutput.contains("Generating done"))
+            {
+                containsGeneratingDone = true;
+            }
+
+            logStream << configOutput;
+            logStream.flush();
+
+            UpdateProgress(qMin(++m_progressEstimate, 19));
+
+            if (QThread::currentThread()->isInterruptionRequested())
+            {
+                logFile.close();
+                m_configProjectProcess->close();
+                QStringToAZTracePrint(BuildCancelled);
+                return AZ::Failure(BuildCancelled);
+            }
+        }
+
+        if (m_configProjectProcess->exitCode() != 0 || !containsGeneratingDone)
+        {
+            QString error = tr("Configuring project failed. See log for details.");
+            QStringToAZTracePrint(error);
+            return AZ::Failure(error);
+        }
+
+        UpdateProgress(++m_progressEstimate);
+
+        m_buildProjectProcess = new QProcess(this);
+        m_buildProjectProcess->setProcessChannelMode(QProcess::MergedChannels);
+        m_buildProjectProcess->setWorkingDirectory(m_projectInfo.m_path);
+        m_buildProjectProcess->setProcessEnvironment(currentEnvironment);
+
+        m_buildProjectProcess->start(
+            "cmake",
+            QStringList{ "--build", QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix), "--target",
+                         m_projectInfo.m_projectName + ".GameLauncher", "Editor", "--config", "profile" });
+
+        if (!m_buildProjectProcess->waitForStarted())
+        {
+            QString error = tr("Building project failed to start.");
+            QStringToAZTracePrint(error);
+            return AZ::Failure(error);
+        }
+
+        // There are a lot of steps when building so estimate around 800 more steps ((100 - 20) * 10) remaining
+        m_progressEstimate = 200;
+        while (m_buildProjectProcess->waitForReadyRead(MaxBuildTimeMSecs))
+        {
+            logStream << m_buildProjectProcess->readAllStandardOutput();
+            logStream.flush();
+
+            // Show 1% progress for every 10 steps completed
+            UpdateProgress(qMin(++m_progressEstimate / 10, 99));
+
+            if (QThread::currentThread()->isInterruptionRequested())
+            {
+                // QProcess is unable to kill its child processes so we need to ask the operating system to do that for us
+                QProcess killBuildProcess;
+                killBuildProcess.setProcessChannelMode(QProcess::MergedChannels);
+                killBuildProcess.start(
+                    "cmd.exe", QStringList{ "/C", "taskkill", "/pid", QString::number(m_buildProjectProcess->processId()), "/f", "/t" });
+                killBuildProcess.waitForFinished();
+
+                logStream << "Killing Project Build.";
+                logStream << killBuildProcess.readAllStandardOutput();
+                m_buildProjectProcess->kill();
+                logFile.close();
+                QStringToAZTracePrint(BuildCancelled);
+                return AZ::Failure(BuildCancelled);
+            }
+        }
+
+        if (m_configProjectProcess->exitCode() != 0)
+        {
+            QString error = tr("Building project failed. See log for details.");
+            QStringToAZTracePrint(error);
+            return AZ::Failure(error);
+        }
+
+        return AZ::Success();
+    }
+
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Test_Traits_Platform.h b/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Test_Traits_Platform.h
index 1639941f86..aaf66ddf15 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Test_Traits_Platform.h
+++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Test_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Test_Traits_Windows.h b/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Test_Traits_Windows.h
index f2965bd3fc..6c3dd46a76 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Test_Traits_Windows.h
+++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Test_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/Windows/Python_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/Python_windows.cpp
index bc4358dc2d..9c6e483c37 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/Python_windows.cpp
+++ b/Code/Tools/ProjectManager/Platform/Windows/Python_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Platform/iOS/PAL_ios.cmake b/Code/Tools/ProjectManager/Platform/iOS/PAL_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Code/Tools/ProjectManager/Platform/iOS/PAL_ios.cmake
+++ b/Code/Tools/ProjectManager/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
index efc01802b7..d6a2476e83 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
@@ -463,6 +463,21 @@ QProgressBar::chunk {
     font-weight: 600;
 }
 
+#GemCatalogHeaderLabel {
+    font-size: 12px;
+    color: #FFFFFF;
+}
+
+#GemCatalogHeaderShowCountLabel {
+    font-size: 12px;
+    font: italic;
+    color: #FFFFFF;
+}
+
+#GemCatalogListView {
+    background-color: #333333;
+}
+
 /************** Gem Catalog (Inspector) **************/
 
 #GemCatalogInspector {
diff --git a/Code/Tools/ProjectManager/Source/Application.cpp b/Code/Tools/ProjectManager/Source/Application.cpp
index dd0a3447c3..3f46929f76 100644
--- a/Code/Tools/ProjectManager/Source/Application.cpp
+++ b/Code/Tools/ProjectManager/Source/Application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/Application.h b/Code/Tools/ProjectManager/Source/Application.h
index d1688f93b9..c9449e5845 100644
--- a/Code/Tools/ProjectManager/Source/Application.h
+++ b/Code/Tools/ProjectManager/Source/Application.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
index 3c3afba106..9c0b4726ed 100644
--- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,7 @@
 #include <PythonBindingsInterface.h>
 #include <NewProjectSettingsScreen.h>
 #include <ScreenHeaderWidget.h>
+#include <GemCatalog/GemModel.h>
 #include <GemCatalog/GemCatalogScreen.h>
 
 #include <QDialogButtonBox>
@@ -46,6 +47,40 @@ namespace O3DE::ProjectManager
         m_stack->addWidget(m_gemCatalogScreen);
         vLayout->addWidget(m_stack);
 
+        // When there are multiple project templates present, we re-gather the gems when changing the selected the project template.
+        connect(m_newProjectSettingsScreen, &NewProjectSettingsScreen::OnTemplateSelectionChanged, this, [=](int oldIndex, [[maybe_unused]] int newIndex)
+            {
+                const GemModel* gemModel = m_gemCatalogScreen->GetGemModel();
+                const QVector<QModelIndex> toBeAdded = gemModel->GatherGemsToBeAdded();
+                const QVector<QModelIndex> toBeRemoved = gemModel->GatherGemsToBeRemoved();
+                if (!toBeAdded.isEmpty() || !toBeRemoved.isEmpty())
+                {
+                    // In case the user enabled or disabled any gem and the current selection does not match the default from the
+                    // // project template anymore, we need to ask the user if they want to proceed as their modifications will be lost.
+                    const QString title = tr("Modifications will be lost");
+                    const QString text = tr("You selected a new project template after modifying the enabled gems.\n\n"
+                        "All modifications will be lost and the default from the new project template will be used.\n\n"
+                        "Do you want to proceed?");
+                    if (QMessageBox::warning(this, title, text, QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
+                    {
+                        // The users wants to proceed. Reinitialize based on the newly selected project template.
+                        ReinitGemCatalogForSelectedTemplate();
+                    }
+                    else
+                    {
+                        // Roll-back to the previously selected project template and
+                        // block signals so that we don't end up in this same callback again.
+                        m_newProjectSettingsScreen->SelectProjectTemplate(oldIndex, /*blockSignals=*/true);
+                    }
+                }
+                else
+                {
+                    // In case the user did not enable or disable any gem and the currently enabled gems matches the previously selected
+                    // ones from the project template, we can just reinitialize based on the newly selected project template.
+                    ReinitGemCatalogForSelectedTemplate();
+                }
+            });
+
         QDialogButtonBox* buttons = new QDialogButtonBox();
         buttons->setObjectName("footer");
         vLayout->addWidget(buttons);
@@ -81,10 +116,8 @@ namespace O3DE::ProjectManager
             currentScreen->NotifyCurrentScreen();
         }
 
-        // Gather the gems from the project template. When we will have multiple project templates, we need to re-gather them
-        // on changing the template and let the user know that any further changes on top of the template will be lost.
-        QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath();
-        m_gemCatalogScreen->ReinitForProject(projectTemplatePath + "/Template", /*isNewProject=*/true);
+        // Gather the enabled gems from the default project template when starting the create new project workflow.
+        ReinitGemCatalogForSelectedTemplate();
     }
 
     void CreateProjectCtrl::HandleBackButton()
@@ -223,4 +256,9 @@ namespace O3DE::ProjectManager
         }
     }
 
+    void CreateProjectCtrl::ReinitGemCatalogForSelectedTemplate()
+    {
+        const QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath();
+        m_gemCatalogScreen->ReinitForProject(projectTemplatePath + "/Template", /*isNewProject=*/true);
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.h b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.h
index 0c87b58b78..c453e2d500 100644
--- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.h
+++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -40,6 +40,7 @@ namespace O3DE::ProjectManager
 #ifdef TEMPLATE_GEM_CONFIGURATION_ENABLED
         void OnChangeScreenRequest(ProjectManagerScreen screen);
         void HandleSecondaryButton();
+        void ReinitGemCatalogForSelectedTemplate();
 #endif // TEMPLATE_GEM_CONFIGURATION_ENABLED
 
     private:
diff --git a/Code/Tools/ProjectManager/Source/EngineInfo.cpp b/Code/Tools/ProjectManager/Source/EngineInfo.cpp
index 9ee4d4ea0b..20cb755356 100644
--- a/Code/Tools/ProjectManager/Source/EngineInfo.cpp
+++ b/Code/Tools/ProjectManager/Source/EngineInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/EngineInfo.h b/Code/Tools/ProjectManager/Source/EngineInfo.h
index ff3f356c02..2dd15e8756 100644
--- a/Code/Tools/ProjectManager/Source/EngineInfo.h
+++ b/Code/Tools/ProjectManager/Source/EngineInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
index 8b232048a7..296b28e2b9 100644
--- a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
index 037492852c..9868045cb4 100644
--- a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
+++ b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/FormBrowseEditWidget.cpp b/Code/Tools/ProjectManager/Source/FormBrowseEditWidget.cpp
index 667513022e..a81c65719c 100644
--- a/Code/Tools/ProjectManager/Source/FormBrowseEditWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/FormBrowseEditWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -21,4 +21,9 @@ namespace O3DE::ProjectManager
         connect(browseButton, &QPushButton::pressed, this, &FormBrowseEditWidget::HandleBrowseButton);
         m_frameLayout->addWidget(browseButton); 
     }
+
+    FormBrowseEditWidget::FormBrowseEditWidget(const QString& labelText, QWidget* parent)
+        : FormBrowseEditWidget(labelText, "", parent)
+    {
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/FormBrowseEditWidget.h b/Code/Tools/ProjectManager/Source/FormBrowseEditWidget.h
index ec5a4dd968..26dbb43bba 100644
--- a/Code/Tools/ProjectManager/Source/FormBrowseEditWidget.h
+++ b/Code/Tools/ProjectManager/Source/FormBrowseEditWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -20,6 +20,7 @@ namespace O3DE::ProjectManager
 
     public:
         explicit FormBrowseEditWidget(const QString& labelText, const QString& valueText = "", QWidget* parent = nullptr);
+        explicit FormBrowseEditWidget(const QString& labelText = "", QWidget* parent = nullptr);
         ~FormBrowseEditWidget() = default;
 
     protected slots:
diff --git a/Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.cpp b/Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.cpp
index d9f80351e2..1f3f1e34c1 100644
--- a/Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -15,8 +15,9 @@
 namespace O3DE::ProjectManager
 {
     FormFolderBrowseEditWidget::FormFolderBrowseEditWidget(const QString& labelText, const QString& valueText, QWidget* parent)
-        : FormBrowseEditWidget(labelText, valueText, parent)
+        : FormBrowseEditWidget(labelText, parent)
     {
+        setText(valueText);
     }
 
     void FormFolderBrowseEditWidget::HandleBrowseButton()
@@ -30,8 +31,14 @@ namespace O3DE::ProjectManager
         QString directory = QDir::toNativeSeparators(QFileDialog::getExistingDirectory(this, tr("Browse"), defaultPath));
         if (!directory.isEmpty())
         {
-            m_lineEdit->setText(directory);
+            setText(directory);
         }
 
     }
+
+    void FormFolderBrowseEditWidget::setText(const QString& text)
+    {
+        QString path = QDir::toNativeSeparators(text);
+        FormBrowseEditWidget::setText(path);
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.h b/Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.h
index d9f489b348..d8ef5edd4f 100644
--- a/Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.h
+++ b/Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -22,6 +22,8 @@ namespace O3DE::ProjectManager
         explicit FormFolderBrowseEditWidget(const QString& labelText, const QString& valueText = "", QWidget* parent = nullptr);
         ~FormFolderBrowseEditWidget() = default;
 
+        void setText(const QString& text) override;
+
     protected:
         void HandleBrowseButton() override;
     };
diff --git a/Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.cpp b/Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.cpp
index 570ba40f2b..5592ae18c2 100644
--- a/Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.h b/Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.h
index 5bb9039693..306499a904 100644
--- a/Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.h
+++ b/Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/FormLineEditWidget.cpp b/Code/Tools/ProjectManager/Source/FormLineEditWidget.cpp
index b06ae08274..11932e6d5b 100644
--- a/Code/Tools/ProjectManager/Source/FormLineEditWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/FormLineEditWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -123,4 +123,14 @@ namespace O3DE::ProjectManager
             child->style()->polish(child);
         }
     }
+
+    void FormLineEditWidget::setText(const QString& text)
+    {
+        m_lineEdit->setText(text);
+    }
+
+    void FormLineEditWidget::mousePressEvent([[maybe_unused]] QMouseEvent* event)
+    {
+        m_lineEdit->setFocus();
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/FormLineEditWidget.h b/Code/Tools/ProjectManager/Source/FormLineEditWidget.h
index d6cf39bdb5..cc8c0e3685 100644
--- a/Code/Tools/ProjectManager/Source/FormLineEditWidget.h
+++ b/Code/Tools/ProjectManager/Source/FormLineEditWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -15,6 +15,7 @@ QT_FORWARD_DECLARE_CLASS(QLineEdit)
 QT_FORWARD_DECLARE_CLASS(QLabel)
 QT_FORWARD_DECLARE_CLASS(QFrame)
 QT_FORWARD_DECLARE_CLASS(QHBoxLayout)
+QT_FORWARD_DECLARE_CLASS(QMouseEvent)
 
 namespace AzQtComponents
 {
@@ -39,6 +40,8 @@ namespace O3DE::ProjectManager
         //! Returns a pointer to the underlying LineEdit.
         QLineEdit* lineEdit() const;
 
+        virtual void setText(const QString& text);
+
     protected:
         QLabel* m_errorLabel = nullptr;
         QFrame* m_frame = nullptr;
@@ -51,6 +54,8 @@ namespace O3DE::ProjectManager
         void onFocusOut();
 
     private:
+        void mousePressEvent(QMouseEvent* event) override;
+
         void refreshStyle();
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
index 8fb35b906c..3c8ae5fcc3 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
index dc8f687b31..8270d5e4ae 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index 21edb8c4fe..4ca94f6081 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
index b218f52397..b7fcf8446e 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -30,6 +30,8 @@ namespace O3DE::ProjectManager
         void ReinitForProject(const QString& projectPath, bool isNewProject);
         bool EnableDisableGemsForProject(const QString& projectPath);
 
+        GemModel* GetGemModel() const { return m_gemModel; }
+
     private:
         void FillModel(const QString& projectPath, bool isNewProject);
 
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
index d509a66ee2..753371ba52 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.h
index eabeb05649..8d911f4b39 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp
index fb6a2b5761..2f6491a77d 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
index be813ede3c..6c9580b19a 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
index fd298b0146..e3ec010e12 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
index 6b2fce59aa..9d2d92feac 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
index 04540f891a..035fcb7181 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -77,14 +77,14 @@ namespace O3DE::ProjectManager
         QString gemName = GemModel::GetName(modelIndex);
         QFont gemNameFont(options.font);
         const int firstColumnMaxTextWidth = s_summaryStartX - 30;
-        gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
         gemNameFont.setPixelSize(s_gemNameFontSize);
         gemNameFont.setBold(true);
+        gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
         QRect gemNameRect = GetTextRect(gemNameFont, gemName, s_gemNameFontSize);
         gemNameRect.moveTo(contentRect.left(), contentRect.top());
-
         painter->setFont(gemNameFont);
         painter->setPen(m_textColor);
+        gemNameRect = painter->boundingRect(gemNameRect, Qt::TextSingleLine, gemName);
         painter->drawText(gemNameRect, Qt::TextSingleLine, gemName);
 
         // Gem creator
@@ -95,6 +95,7 @@ namespace O3DE::ProjectManager
 
         painter->setFont(standardFont);
         painter->setPen(m_linkColor);
+        gemCreatorRect = painter->boundingRect(gemCreatorRect, Qt::TextSingleLine, gemCreator);
         painter->drawText(gemCreatorRect, Qt::TextSingleLine, gemCreator);
 
         // Gem summary
@@ -130,6 +131,17 @@ namespace O3DE::ProjectManager
             return false;
         }
 
+        if (event->type() == QEvent::KeyPress)
+        {
+            auto keyEvent = static_cast<const QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Space)
+            {
+                const bool isAdded = GemModel::IsAdded(modelIndex);
+                GemModel::SetIsAdded(*model, modelIndex, !isAdded);
+                return true;
+            }
+        }
+
         if (event->type() == QEvent::MouseButtonPress)
         {
             QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
index 7bc54a9002..07c25a5ad4 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
index d2586bb62b..5e2f93c2fc 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -31,7 +31,7 @@ namespace O3DE::ProjectManager
         topLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
 
         QLabel* showCountLabel = new QLabel();
-        showCountLabel->setStyleSheet("font-size: 12px; font: italic;");
+        showCountLabel->setObjectName("GemCatalogHeaderShowCountLabel");
         topLayout->addWidget(showCountLabel);
         connect(proxyModel, &GemSortFilterProxyModel::OnInvalidated, this, [=]
             {
@@ -57,27 +57,27 @@ namespace O3DE::ProjectManager
         QHBoxLayout* columnHeaderLayout = new QHBoxLayout();
         columnHeaderLayout->setAlignment(Qt::AlignLeft);
 
-        const int gemNameStartX = GemItemDelegate::s_itemMargins.left() + GemItemDelegate::s_contentMargins.left() - 3;
+        const int gemNameStartX = GemItemDelegate::s_itemMargins.left() + GemItemDelegate::s_contentMargins.left() - 1;
         columnHeaderLayout->addSpacing(gemNameStartX);
 
         QLabel* gemNameLabel = new QLabel(tr("Gem Name"));
-        gemNameLabel->setStyleSheet("font-size: 12px;");
+        gemNameLabel->setObjectName("GemCatalogHeaderLabel");
         columnHeaderLayout->addWidget(gemNameLabel);
 
-        columnHeaderLayout->addSpacing(77);
+        columnHeaderLayout->addSpacing(89);
 
         QLabel* gemSummaryLabel = new QLabel(tr("Gem Summary"));
-        gemSummaryLabel->setStyleSheet("font-size: 12px;");
+        gemSummaryLabel->setObjectName("GemCatalogHeaderLabel");
         columnHeaderLayout->addWidget(gemSummaryLabel);
 
         QSpacerItem* horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
         columnHeaderLayout->addSpacerItem(horizontalSpacer);
 
         QLabel* gemSelectedLabel = new QLabel(tr("Selected"));
-        gemSelectedLabel->setStyleSheet("font-size: 12px;");
+        gemSelectedLabel->setObjectName("GemCatalogHeaderLabel");
         columnHeaderLayout->addWidget(gemSelectedLabel);
 
-        columnHeaderLayout->addSpacing(60);
+        columnHeaderLayout->addSpacing(65);
 
         vLayout->addLayout(columnHeaderLayout);
     }
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h
index 7ebd1d950f..a9b3b3aa36 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp
index 3bb429b697..657dcce691 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -14,10 +14,9 @@ namespace O3DE::ProjectManager
     GemListView::GemListView(QAbstractItemModel* model, QItemSelectionModel* selectionModel, QWidget* parent)
         : QListView(parent)
     {
+        setObjectName("GemCatalogListView");
         setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
 
-        setStyleSheet("background-color: #333333;");
-
         setModel(model);
         setSelectionModel(selectionModel);
         setItemDelegate(new GemItemDelegate(model, this));
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.h
index 43472bac80..51913c42bc 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
index 2a599658ea..8d1e263a66 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
index d128687572..49fb5c6f37 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDelegate.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDelegate.cpp
index 65500791c7..8a89f8b047 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDelegate.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDelegate.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDelegate.h
index cfd3ddba13..60822741bc 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDelegate.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDialog.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDialog.cpp
index 44f1c828be..5690c0bd1f 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDialog.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDialog.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDialog.h
index 0f861d8a46..7c2d84a943 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDialog.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementFilterProxyModel.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementFilterProxyModel.cpp
index a4cebda284..b596b8767f 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementFilterProxyModel.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementFilterProxyModel.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementFilterProxyModel.h
index 2da1325f60..8f3706bd62 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementFilterProxyModel.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementFilterProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementListView.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementListView.cpp
index f0634ef61a..06351e51f0 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementListView.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementListView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementListView.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementListView.h
index b5a6b029b8..23dab413a2 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementListView.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemRequirementListView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp
index 1f1ca507c0..832aeb5178 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h
index f8c66db249..0d176bf017 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/LinkWidget.cpp b/Code/Tools/ProjectManager/Source/LinkWidget.cpp
index 5069ae6508..b30d23d240 100644
--- a/Code/Tools/ProjectManager/Source/LinkWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/LinkWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/LinkWidget.h b/Code/Tools/ProjectManager/Source/LinkWidget.h
index 24ad718be3..e576e324c7 100644
--- a/Code/Tools/ProjectManager/Source/LinkWidget.h
+++ b/Code/Tools/ProjectManager/Source/LinkWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
index 268edb679e..26e5e074e5 100644
--- a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -81,8 +81,14 @@ namespace O3DE::ProjectManager
                 {
                     if (button && button->property(k_templateIndexProperty).isValid())
                     {
-                        int projectIndex = button->property(k_templateIndexProperty).toInt();
-                        UpdateTemplateDetails(m_templates.at(projectIndex));
+                        int projectTemplateIndex = button->property(k_templateIndexProperty).toInt();
+                        if (m_selectedTemplateIndex != projectTemplateIndex)
+                        {
+                            const int oldIndex = m_selectedTemplateIndex;
+                            m_selectedTemplateIndex = projectTemplateIndex;
+                            UpdateTemplateDetails(m_templates.at(m_selectedTemplateIndex));
+                            emit OnTemplateSelectionChanged(/*oldIndex=*/oldIndex, /*newIndex=*/m_selectedTemplateIndex);
+                        }
                     }
                 });
 
@@ -115,7 +121,8 @@ namespace O3DE::ProjectManager
                     flowLayout->addWidget(templateButton);
                 }
 
-                m_projectTemplateButtonGroup->buttons().first()->setChecked(true);
+                // Select the first project template (default selection).
+                SelectProjectTemplate(0, /*blockSignals=*/true);
             }
             containerLayout->addWidget(templatesScrollArea);
         }
@@ -159,8 +166,9 @@ namespace O3DE::ProjectManager
 
     QString NewProjectSettingsScreen::GetProjectTemplatePath()
     {
-        const int templateIndex = m_projectTemplateButtonGroup->checkedButton()->property(k_templateIndexProperty).toInt();
-        return m_templates.at(templateIndex).m_path;
+        AZ_Assert(m_selectedTemplateIndex == m_projectTemplateButtonGroup->checkedButton()->property(k_templateIndexProperty).toInt(),
+            "Selected template index not in sync with the currently checked project template button.");
+        return m_templates.at(m_selectedTemplateIndex).m_path;
     }
 
     QFrame* NewProjectSettingsScreen::CreateTemplateDetails(int margin)
@@ -216,4 +224,27 @@ namespace O3DE::ProjectManager
         m_templateSummary->setText(templateInfo.m_summary);
         m_templateIncludedGems->Update(templateInfo.m_includedGems);
     }
+
+    void NewProjectSettingsScreen::SelectProjectTemplate(int index, bool blockSignals)
+    {
+        const QList<QAbstractButton*> buttons = m_projectTemplateButtonGroup->buttons();
+        if (index >= buttons.size())
+        {
+            return;
+        }
+
+        if (blockSignals)
+        {
+            m_projectTemplateButtonGroup->blockSignals(true);
+        }
+
+        QAbstractButton* button = buttons.at(index);
+        button->setChecked(true);
+        m_selectedTemplateIndex = button->property(k_templateIndexProperty).toInt();
+
+        if (blockSignals)
+        {
+            m_projectTemplateButtonGroup->blockSignals(false);
+        }
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h
index 0c5844d43c..d812bfd091 100644
--- a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h
+++ b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -22,6 +22,8 @@ namespace O3DE::ProjectManager
     class NewProjectSettingsScreen
         : public ProjectSettingsScreen
     {
+        Q_OBJECT
+
     public:
         explicit NewProjectSettingsScreen(QWidget* parent = nullptr);
         ~NewProjectSettingsScreen() = default;
@@ -31,6 +33,11 @@ namespace O3DE::ProjectManager
 
         void NotifyCurrentScreen() override;
 
+        void SelectProjectTemplate(int index, bool blockSignals = false);
+
+    signals:
+        void OnTemplateSelectionChanged(int oldIndex, int newIndex);
+
     private:
         QString GetDefaultProjectPath();
         QFrame* CreateTemplateDetails(int margin);
@@ -41,6 +48,7 @@ namespace O3DE::ProjectManager
         QLabel* m_templateSummary;
         TagContainerWidget* m_templateIncludedGems;
         QVector<ProjectTemplateInfo> m_templates;
+        int m_selectedTemplateIndex = -1;
 
         inline constexpr static int s_spacerSize = 20;
         inline constexpr static int s_templateDetailsContentMargin = 20;
diff --git a/Code/Tools/ProjectManager/Source/PathValidator.cpp b/Code/Tools/ProjectManager/Source/PathValidator.cpp
index e75f9518be..130f1ecfa5 100644
--- a/Code/Tools/ProjectManager/Source/PathValidator.cpp
+++ b/Code/Tools/ProjectManager/Source/PathValidator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/PathValidator.h b/Code/Tools/ProjectManager/Source/PathValidator.h
index 4375599fa9..bdf53324bb 100644
--- a/Code/Tools/ProjectManager/Source/PathValidator.h
+++ b/Code/Tools/ProjectManager/Source/PathValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectBuilder.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilder.cpp
deleted file mode 100644
index 4dfe46b3bf..0000000000
--- a/Code/Tools/ProjectManager/Source/ProjectBuilder.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <ProjectBuilder.h>
-#include <ProjectManagerDefs.h>
-#include <ProjectButtonWidget.h>
-#include <PythonBindingsInterface.h>
-
-#include <QProcess>
-#include <QFile>
-#include <QTextStream>
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QUrl>
-#include <QDir>
-#include <QProcessEnvironment>
-
-
-//#define MOCK_BUILD_PROJECT true 
-
-namespace O3DE::ProjectManager
-{
-    // QProcess::waitForFinished uses -1 to indicate that the process should not timeout
-    constexpr int MaxBuildTimeMSecs = -1;
-
-    ProjectBuilderWorker::ProjectBuilderWorker(const ProjectInfo& projectInfo)
-        : QObject()
-        , m_projectInfo(projectInfo)
-    {
-    }
-
-    void ProjectBuilderWorker::BuildProject()
-    {
-#ifdef MOCK_BUILD_PROJECT
-        for (int i = 0; i < 10; ++i)
-        {
-            QThread::sleep(1);
-            UpdateProgress(i * 10);
-        }
-        Done(m_projectPath);
-#else
-        EngineInfo engineInfo;
-
-        AZ::Outcome<EngineInfo> engineInfoResult = PythonBindingsInterface::Get()->GetEngineInfo();
-        if (engineInfoResult.IsSuccess())
-        {
-            engineInfo = engineInfoResult.GetValue();
-        }
-        else
-        {
-            emit Done(tr("Failed to get engine info."));
-            return;
-        }
-
-        // Show some kind of progress with very approximate estimates
-        UpdateProgress(1);
-
-        QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment());
-        // Append cmake path to PATH incase it is missing
-        QDir cmakePath(engineInfo.m_path);
-        cmakePath.cd("cmake/runtime/bin");
-        QString pathValue = currentEnvironment.value("PATH");
-        pathValue += ";" + cmakePath.path();
-        currentEnvironment.insert("PATH", pathValue);
-
-        QProcess configProjectProcess;
-        configProjectProcess.setProcessChannelMode(QProcess::MergedChannels);
-        configProjectProcess.setWorkingDirectory(m_projectInfo.m_path);
-        configProjectProcess.setProcessEnvironment(currentEnvironment);
-
-        configProjectProcess.start(
-            "cmake",
-            QStringList
-            {
-                "-B",
-                QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix),
-                "-S",
-                m_projectInfo.m_path,
-                "-G",
-                "Visual Studio 16",
-                "-DLY_3RDPARTY_PATH=" + engineInfo.m_thirdPartyPath
-            });
-
-        if (!configProjectProcess.waitForStarted())
-        {
-            emit Done(tr("Configuring project failed to start."));
-            return;
-        }
-        if (!configProjectProcess.waitForFinished(MaxBuildTimeMSecs))
-        {
-            WriteErrorLog(configProjectProcess.readAllStandardOutput());
-            emit Done(tr("Configuring project timed out. See log for details"));
-            return;
-        }
-
-        QString configProjectOutput(configProjectProcess.readAllStandardOutput());
-        if (configProjectProcess.exitCode() != 0 || !configProjectOutput.contains("Generating done"))
-        {
-            WriteErrorLog(configProjectOutput);
-            emit Done(tr("Configuring project failed. See log for details."));
-            return;
-        }
-
-        UpdateProgress(20);
-
-        QProcess buildProjectProcess;
-        buildProjectProcess.setProcessChannelMode(QProcess::MergedChannels);
-        buildProjectProcess.setWorkingDirectory(m_projectInfo.m_path);
-        buildProjectProcess.setProcessEnvironment(currentEnvironment);
-
-        buildProjectProcess.start(
-            "cmake",
-            QStringList
-            {
-                "--build",
-                QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix),
-                "--target",
-                m_projectInfo.m_projectName + ".GameLauncher",
-                "Editor",
-                "--config",
-                "profile"
-            });
-
-        if (!buildProjectProcess.waitForStarted())
-        {
-            emit Done(tr("Building project failed to start."));
-            return;
-        }
-        if (!buildProjectProcess.waitForFinished(MaxBuildTimeMSecs))
-        {
-            WriteErrorLog(configProjectProcess.readAllStandardOutput());
-            emit Done(tr("Building project timed out. See log for details"));
-            return;
-        }
-
-        QString buildProjectOutput(buildProjectProcess.readAllStandardOutput());
-        if (configProjectProcess.exitCode() != 0)
-        {
-            WriteErrorLog(buildProjectOutput);
-            emit Done(tr("Building project failed. See log for details."));
-        }
-        else
-        {
-            emit Done("");
-        }
-#endif
-    }
-
-    QString ProjectBuilderWorker::LogFilePath() const
-    {
-        QDir logFilePath(m_projectInfo.m_path);
-        logFilePath.cd(ProjectBuildPathPostfix);
-        return logFilePath.filePath(ProjectBuildErrorLogPathPostfix);
-    }
-
-    void ProjectBuilderWorker::WriteErrorLog(const QString& log)
-    {
-        QFile logFile(LogFilePath());
-        // Overwrite file with truncate
-        if (logFile.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text))
-        {
-            QTextStream output(&logFile);
-            output << log;
-            logFile.close();
-        }
-    }
-
-    ProjectBuilderController::ProjectBuilderController(const ProjectInfo& projectInfo, ProjectButton* projectButton, QWidget* parent)
-        : QObject()
-        , m_projectInfo(projectInfo)
-        , m_projectButton(projectButton)
-        , m_parent(parent)
-    {
-        m_worker = new ProjectBuilderWorker(m_projectInfo);
-        m_worker->moveToThread(&m_workerThread);
-
-        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);
-        connect(m_worker, &ProjectBuilderWorker::UpdateProgress, this, &ProjectBuilderController::UpdateUIProgress);
-    }
-
-    ProjectBuilderController::~ProjectBuilderController()
-    {
-        m_workerThread.quit();
-        m_workerThread.wait();
-    }
-
-    void ProjectBuilderController::Start()
-    {
-        m_workerThread.start();
-        UpdateUIProgress(0);
-    }
-
-    void ProjectBuilderController::SetProjectButton(ProjectButton* projectButton)
-    {
-        m_projectButton = projectButton;
-    }
-
-    QString ProjectBuilderController::GetProjectPath() const
-    {
-        return m_projectInfo.m_path;
-    }
-
-    void ProjectBuilderController::UpdateUIProgress(int progress)
-    {
-        if (m_projectButton)
-        {
-            m_projectButton->SetButtonOverlayText(QString("%1 (%2%)\n\n").arg(tr("Building Project..."), QString::number(progress)));
-            m_projectButton->SetProgressBarValue(progress);
-        }
-    }
-
-    void ProjectBuilderController::HandleResults(const QString& result)
-    {
-        if (!result.isEmpty())
-        {
-            if (result.contains(tr("log")))
-            {
-                QMessageBox::StandardButton openLog = QMessageBox::critical(
-                    m_parent,
-                    tr("Project Failed to Build!"),
-                    result + tr("\n\nWould you like to view log?"),
-                    QMessageBox::No | QMessageBox::Yes);
-
-                if (openLog == QMessageBox::Yes)
-                {
-                    // Open application assigned to this file type
-                    QDesktopServices::openUrl(QUrl("file:///" + m_worker->LogFilePath()));
-                }
-            }
-            else
-            {
-                QMessageBox::critical(m_parent, tr("Project Failed to Build!"), result);
-            }
-        }
-
-        emit Done();
-    }
-} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilder.h b/Code/Tools/ProjectManager/Source/ProjectBuilder.h
deleted file mode 100644
index c676eb5e7b..0000000000
--- a/Code/Tools/ProjectManager/Source/ProjectBuilder.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <ProjectInfo.h>
-
-#include <QThread>
-#endif
-
-namespace O3DE::ProjectManager
-{
-    QT_FORWARD_DECLARE_CLASS(ProjectButton)
-
-    class ProjectBuilderWorker : public QObject
-    {
-        Q_OBJECT
-
-    public:
-        explicit ProjectBuilderWorker(const ProjectInfo& projectInfo);
-        ~ProjectBuilderWorker() = default;
-
-        QString LogFilePath() const;
-
-    public slots:
-        void BuildProject();
-
-    signals:
-        void UpdateProgress(int progress);
-        void Done(QString result);
-
-    private:
-        void WriteErrorLog(const QString& log);
-
-        ProjectInfo m_projectInfo;
-    };
-
-    class ProjectBuilderController : public QObject
-    {
-        Q_OBJECT
-
-    public:
-        explicit ProjectBuilderController(const ProjectInfo& projectInfo, ProjectButton* projectButton, QWidget* parent = nullptr);
-        ~ProjectBuilderController();
-
-        void SetProjectButton(ProjectButton* projectButton);
-        QString GetProjectPath() const;
-
-    public slots:
-        void Start();
-        void UpdateUIProgress(int progress);
-        void HandleResults(const QString& result);
-
-    signals:
-        void Done();
-
-    private:
-        ProjectInfo m_projectInfo;
-        ProjectBuilderWorker* m_worker;
-        QThread m_workerThread;
-        ProjectButton* m_projectButton;
-        QWidget* m_parent;
-    };
-} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp
new file mode 100644
index 0000000000..00e2e5d68d
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp
@@ -0,0 +1,113 @@
+/*
+ * 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 <ProjectBuilderController.h>
+#include <ProjectBuilderWorker.h>
+#include <ProjectButtonWidget.h>
+
+#include <QMessageBox>
+#include <QDesktopServices>
+#include <QUrl>
+
+
+namespace O3DE::ProjectManager
+{
+    ProjectBuilderController::ProjectBuilderController(const ProjectInfo& projectInfo, ProjectButton* projectButton, QWidget* parent)
+        : QObject()
+        , m_projectInfo(projectInfo)
+        , m_projectButton(projectButton)
+        , m_lastProgress(0)
+        , m_parent(parent)
+    {
+        m_worker = new ProjectBuilderWorker(m_projectInfo);
+        m_worker->moveToThread(&m_workerThread);
+
+        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);
+        connect(m_worker, &ProjectBuilderWorker::UpdateProgress, this, &ProjectBuilderController::UpdateUIProgress);
+    }
+
+    ProjectBuilderController::~ProjectBuilderController()
+    {
+        m_workerThread.requestInterruption();
+        m_workerThread.quit();
+        m_workerThread.wait();
+    }
+
+    void ProjectBuilderController::Start()
+    {
+        m_workerThread.start();
+        UpdateUIProgress(0);
+    }
+
+    void ProjectBuilderController::SetProjectButton(ProjectButton* projectButton)
+    {
+        m_projectButton = projectButton;
+
+        if (projectButton)
+        {
+            projectButton->SetProjectButtonAction(tr("Cancel Build"), [this] { HandleCancel(); });
+
+            if (m_lastProgress != 0)
+            {
+                UpdateUIProgress(m_lastProgress);
+            }
+        }
+    }
+
+    const ProjectInfo& ProjectBuilderController::GetProjectInfo() const
+    {
+        return m_projectInfo;
+    }
+
+    void ProjectBuilderController::UpdateUIProgress(int progress)
+    {
+        m_lastProgress = progress;
+        if (m_projectButton)
+        {
+            m_projectButton->SetButtonOverlayText(QString("%1 (%2%)\n\n").arg(tr("Building Project..."), QString::number(progress)));
+            m_projectButton->SetProgressBarValue(progress);
+        }
+    }
+
+    void ProjectBuilderController::HandleResults(const QString& result)
+    {
+        if (!result.isEmpty())
+        {
+            if (result.contains(tr("log")))
+            {
+                QMessageBox::StandardButton openLog = QMessageBox::critical(
+                    m_parent,
+                    tr("Project Failed to Build!"),
+                    result + tr("\n\nWould you like to view log?"),
+                    QMessageBox::No | QMessageBox::Yes);
+
+                if (openLog == QMessageBox::Yes)
+                {
+                    // Open application assigned to this file type
+                    QDesktopServices::openUrl(QUrl("file:///" + m_worker->GetLogFilePath()));
+                }
+            }
+            else
+            {
+                QMessageBox::critical(m_parent, tr("Project Failed to Build!"), result);
+            }
+
+            emit Done(false);
+            return;
+        }
+
+        emit Done(true);
+    }
+
+    void ProjectBuilderController::HandleCancel()
+    {
+        m_workerThread.quit();
+        emit Done(false);
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.h b/Code/Tools/ProjectManager/Source/ProjectBuilderController.h
new file mode 100644
index 0000000000..c3e3026b34
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.h
@@ -0,0 +1,51 @@
+/*
+ * 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 <ProjectInfo.h>
+
+#include <QThread>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QProcess)
+
+namespace O3DE::ProjectManager
+{
+    QT_FORWARD_DECLARE_CLASS(ProjectButton)
+    QT_FORWARD_DECLARE_CLASS(ProjectBuilderWorker)
+
+    class ProjectBuilderController : public QObject
+    {
+        Q_OBJECT
+
+    public:
+        explicit ProjectBuilderController(const ProjectInfo& projectInfo, ProjectButton* projectButton, QWidget* parent = nullptr);
+        ~ProjectBuilderController();
+
+        void SetProjectButton(ProjectButton* projectButton);
+        const ProjectInfo& GetProjectInfo() const;
+
+    public slots:
+        void Start();
+        void UpdateUIProgress(int progress);
+        void HandleResults(const QString& result);
+        void HandleCancel();
+
+    signals:
+        void Done(bool success = true);
+
+    private:
+        ProjectInfo m_projectInfo;
+        ProjectBuilderWorker* m_worker;
+        QThread m_workerThread;
+        ProjectButton* m_projectButton;
+        QWidget* m_parent;
+
+        int m_lastProgress;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp
new file mode 100644
index 0000000000..45034686c3
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp
@@ -0,0 +1,71 @@
+/*
+ * 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 <ProjectBuilderWorker.h>
+#include <ProjectManagerDefs.h>
+
+#include <QDir>
+
+//#define MOCK_BUILD_PROJECT true
+
+namespace O3DE::ProjectManager
+{
+    const QString ProjectBuilderWorker::BuildCancelled = ProjectBuilderWorker::tr("Build Cancelled.");
+
+    ProjectBuilderWorker::ProjectBuilderWorker(const ProjectInfo& projectInfo)
+        : QObject()
+        , m_projectInfo(projectInfo)
+        , m_progressEstimate(0)
+    {
+    }
+
+    void ProjectBuilderWorker::BuildProject()
+    {
+#ifdef MOCK_BUILD_PROJECT
+        for (int i = 0; i < 10; ++i)
+        {
+            QThread::sleep(1);
+            UpdateProgress(i * 10);
+        }
+        Done("");
+#else
+        auto result = BuildProjectForPlatform();
+
+        if (result.IsSuccess())
+        {
+            emit Done();
+        }
+        else
+        {
+            emit Done(result.GetError());
+        }
+#endif
+    }
+
+    QString ProjectBuilderWorker::GetLogFilePath() const
+    {
+        QDir logFilePath(m_projectInfo.m_path);
+        // Make directories if they aren't on disk
+        if (!logFilePath.cd(ProjectBuildPathPostfix))
+        {
+            logFilePath.mkpath(ProjectBuildPathPostfix);
+            logFilePath.cd(ProjectBuildPathPostfix);
+
+        }
+        if (!logFilePath.cd(ProjectBuildPathCmakeFiles))
+        {
+            logFilePath.mkpath(ProjectBuildPathCmakeFiles);
+            logFilePath.cd(ProjectBuildPathCmakeFiles);
+        }
+        return logFilePath.filePath(ProjectBuildErrorLogName);
+    }
+
+    void ProjectBuilderWorker::QStringToAZTracePrint([[maybe_unused]] const QString& error)
+    {
+        AZ_TracePrintf("Project Manager", error.toStdString().c_str());
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.h b/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.h
new file mode 100644
index 0000000000..0557b21831
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.h
@@ -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
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <ProjectInfo.h>
+#include <AzCore/Outcome/Outcome.h>
+
+#include <QObject>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QProcess)
+
+namespace O3DE::ProjectManager
+{
+    class ProjectBuilderWorker : public QObject
+    {
+        // QProcess::waitForFinished uses -1 to indicate that the process should not timeout
+        static constexpr int MaxBuildTimeMSecs = -1;
+        // Build was cancelled
+        static const QString BuildCancelled;
+
+        Q_OBJECT
+
+    public:
+        explicit ProjectBuilderWorker(const ProjectInfo& projectInfo);
+        ~ProjectBuilderWorker() = default;
+
+        QString GetLogFilePath() const;
+
+    public slots:
+        void BuildProject();
+
+    signals:
+        void UpdateProgress(int progress);
+        void Done(QString result = "");
+
+    private:
+        AZ::Outcome<void, QString> BuildProjectForPlatform();
+        void QStringToAZTracePrint(const QString& error);
+
+        QProcess* m_configProjectProcess = nullptr;
+        QProcess* m_buildProjectProcess = nullptr;
+        ProjectInfo m_projectInfo;
+
+        int m_progressEstimate;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
index c7bc948e8d..68a43b3b52 100644
--- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -40,8 +40,8 @@ namespace O3DE::ProjectManager
         m_overlayLabel->setVisible(false);
         vLayout->addWidget(m_overlayLabel);
 
-        m_buildButton = new QPushButton(tr("Build Project"), this);
-        m_buildButton->setVisible(false);
+        m_actionButton = new QPushButton(tr("Project Action"), this);
+        m_actionButton->setVisible(false);
 
         m_progressBar = new QProgressBar(this);
         m_progressBar->setObjectName("labelButtonProgressBar");
@@ -78,9 +78,9 @@ namespace O3DE::ProjectManager
         return m_progressBar;
     }
 
-    QPushButton* LabelButton::GetBuildButton()
+    QPushButton* LabelButton::GetActionButton()
     {
-        return m_buildButton;
+        return m_actionButton;
     }
 
     ProjectButton::ProjectButton(const ProjectInfo& projectInfo, QWidget* parent, bool processing)
@@ -135,7 +135,6 @@ namespace O3DE::ProjectManager
 
     void ProjectButton::ProcessingSetup()
     {
-        m_projectImageLabel->GetOverlayLabel()->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
         m_projectImageLabel->SetEnabled(false);
         m_projectImageLabel->SetOverlayText(tr("Processing...\n\n"));
 
@@ -146,8 +145,6 @@ namespace O3DE::ProjectManager
 
     void ProjectButton::ReadySetup()
     {
-        connect(m_projectImageLabel->GetBuildButton(), &QPushButton::clicked, [this](){ emit BuildProject(m_projectInfo); });
-
         QMenu* menu = new QMenu(this);
         menu->addAction(tr("Edit Project Settings..."), this, [this]() { emit EditProject(m_projectInfo.m_path); });
         menu->addAction(tr("Build"), this, [this]() { emit BuildProject(m_projectInfo); });
@@ -168,18 +165,38 @@ namespace O3DE::ProjectManager
         m_projectFooter->layout()->addWidget(projectMenuButton);
     }
 
-    void ProjectButton::SetLaunchButtonEnabled(bool enabled)
+    void ProjectButton::SetProjectButtonAction(const QString& text, AZStd::function<void()> lambda)
     {
-        m_projectImageLabel->SetEnabled(enabled);
+        QPushButton* projectActionButton = m_projectImageLabel->GetActionButton();
+        if (!m_actionButtonConnection)
+        {
+            QSpacerItem* buttonSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+            m_projectImageLabel->layout()->addItem(buttonSpacer);
+            m_projectImageLabel->layout()->addWidget(projectActionButton);
+            projectActionButton->setVisible(true);
+        }
+        else
+        {
+            disconnect(m_actionButtonConnection);
+        }
+
+        projectActionButton->setText(text);
+        m_actionButtonConnection = connect(projectActionButton, &QPushButton::clicked, lambda);
     }
 
-    void ProjectButton::ShowBuildButton(bool show)
+    void ProjectButton::SetProjectBuildButtonAction()
     {
-        QSpacerItem* buttonSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding);
+        SetProjectButtonAction(tr("Build Project"), [this]() { emit BuildProject(m_projectInfo); });
+    }
 
-        m_projectImageLabel->layout()->addItem(buttonSpacer);
-        m_projectImageLabel->layout()->addWidget(m_projectImageLabel->GetBuildButton());
-        m_projectImageLabel->GetBuildButton()->setVisible(show);
+    void ProjectButton::BuildThisProject()
+    {
+        emit BuildProject(m_projectInfo);
+    }
+
+    void ProjectButton::SetLaunchButtonEnabled(bool enabled)
+    {
+        m_projectImageLabel->SetEnabled(enabled);
     }
 
     void ProjectButton::SetButtonOverlayText(const QString& text)
@@ -191,4 +208,9 @@ namespace O3DE::ProjectManager
     {
         m_projectImageLabel->GetProgressBar()->setValue(progress);
     }
+
+    LabelButton* ProjectButton::GetLabelButton()
+    {
+        return m_projectImageLabel;
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
index 5e2aa045e8..b3b4b2bcf6 100644
--- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
+++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -9,12 +9,15 @@
 
 #if !defined(Q_MOC_RUN)
 #include <ProjectInfo.h>
+#include <AzCore/std/functional.h>
 
 #include <QLabel>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QLayout>
 #endif
 
 QT_FORWARD_DECLARE_CLASS(QPixmap)
-QT_FORWARD_DECLARE_CLASS(QPushButton)
 QT_FORWARD_DECLARE_CLASS(QAction)
 QT_FORWARD_DECLARE_CLASS(QProgressBar)
 
@@ -34,7 +37,7 @@ namespace O3DE::ProjectManager
 
         QLabel* GetOverlayLabel();
         QProgressBar* GetProgressBar();
-        QPushButton* GetBuildButton();
+        QPushButton* GetActionButton();
 
     signals:
         void triggered();
@@ -45,7 +48,7 @@ namespace O3DE::ProjectManager
     private:
         QLabel* m_overlayLabel;
         QProgressBar* m_progressBar;
-        QPushButton* m_buildButton;
+        QPushButton* m_actionButton;
         bool m_enabled = true;
     };
 
@@ -58,10 +61,13 @@ namespace O3DE::ProjectManager
         explicit ProjectButton(const ProjectInfo& m_projectInfo, QWidget* parent = nullptr, bool processing = false);
         ~ProjectButton() = default;
 
+        void SetProjectButtonAction(const QString& text, AZStd::function<void()> lambda);
+        void SetProjectBuildButtonAction();
+
         void SetLaunchButtonEnabled(bool enabled);
-        void ShowBuildButton(bool show);
         void SetButtonOverlayText(const QString& text);
         void SetProgressBarValue(int progress);
+        LabelButton* GetLabelButton();
 
     signals:
         void OpenProject(const QString& projectName);
@@ -75,9 +81,12 @@ namespace O3DE::ProjectManager
         void BaseSetup();
         void ProcessingSetup();
         void ReadySetup();
+        void BuildThisProject();
 
         ProjectInfo m_projectInfo;
         LabelButton* m_projectImageLabel;
         QFrame* m_projectFooter;
+
+        QMetaObject::Connection m_actionButtonConnection;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectInfo.cpp b/Code/Tools/ProjectManager/Source/ProjectInfo.cpp
index a2fc82ae9c..1e335d9d67 100644
--- a/Code/Tools/ProjectManager/Source/ProjectInfo.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectInfo.h b/Code/Tools/ProjectManager/Source/ProjectInfo.h
index a792f91fa7..d78ef54c83 100644
--- a/Code/Tools/ProjectManager/Source/ProjectInfo.h
+++ b/Code/Tools/ProjectManager/Source/ProjectInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h b/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
index 1058dae68a..f74233db51 100644
--- a/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -14,6 +14,7 @@ namespace O3DE::ProjectManager
     inline constexpr static int ProjectPreviewImageHeight = 280;
 
     static const QString ProjectBuildPathPostfix = "build/windows_vs2019";
-    static const QString ProjectBuildErrorLogPathPostfix = "CMakeFiles/CMakeProjectBuildError.log";
+    static const QString ProjectBuildPathCmakeFiles = "CMakeFiles";
+    static const QString ProjectBuildErrorLogName = "CMakeProjectBuildError.log";
     static const QString ProjectPreviewImagePath = "preview.png";
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
index 173cd07720..3dc006b24c 100644
--- a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectManagerWindow.h b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.h
index 8adf108c5d..5b8f2f68f4 100644
--- a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.h
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp
index 7371307087..8be7e200f2 100644
--- a/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.h b/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.h
index fa6ebe642e..fdbdb82ef2 100644
--- a/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.h
+++ b/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectTemplateInfo.cpp b/Code/Tools/ProjectManager/Source/ProjectTemplateInfo.cpp
index 533353be24..76db878f98 100644
--- a/Code/Tools/ProjectManager/Source/ProjectTemplateInfo.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectTemplateInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectTemplateInfo.h b/Code/Tools/ProjectManager/Source/ProjectTemplateInfo.h
index d59d5a76de..c6262e4f0f 100644
--- a/Code/Tools/ProjectManager/Source/ProjectTemplateInfo.h
+++ b/Code/Tools/ProjectManager/Source/ProjectTemplateInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectUtils.cpp b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
index 5b93e4faca..f7a90f5e0c 100644
--- a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectUtils.h b/Code/Tools/ProjectManager/Source/ProjectUtils.h
index 17af6b132c..786ff34b88 100644
--- a/Code/Tools/ProjectManager/Source/ProjectUtils.h
+++ b/Code/Tools/ProjectManager/Source/ProjectUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp
index e079d97a8b..cc3e386118 100644
--- a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,7 +11,7 @@
 #include <ProjectButtonWidget.h>
 #include <PythonBindingsInterface.h>
 #include <ProjectUtils.h>
-#include <ProjectBuilder.h>
+#include <ProjectBuilderController.h>
 #include <ScreensCtrl.h>
 
 #include <AzQtComponents/Components/FlowLayout.h>
@@ -43,8 +43,6 @@
 #include <QDir>
 #include <QGuiApplication>
 
-//#define DISPLAY_PROJECT_DEV_DATA true 
-
 namespace O3DE::ProjectManager
 {
     ProjectsScreen::ProjectsScreen(QWidget* parent)
@@ -86,14 +84,13 @@ namespace O3DE::ProjectManager
             layout->setAlignment(Qt::AlignTop);
             frame->setLayout(layout);
 
-            QLabel* titleLabel = new QLabel(tr("Ready. Set. Create."), this);
+            QLabel* titleLabel = new QLabel(tr("Ready? Set. Create!"), this);
             titleLabel->setObjectName("titleLabel");
             layout->addWidget(titleLabel);
 
             QLabel* introLabel = new QLabel(this);
             introLabel->setObjectName("introLabel");
-            introLabel->setText(tr("Welcome to O3DE! Start something new by creating a project. Not sure what to create? \nExplore what's "
-                                   "available by downloading our sample project."));
+            introLabel->setText(tr("Welcome to O3DE! Start something new by creating a project."));
             layout->addWidget(introLabel);
 
             QHBoxLayout* buttonLayout = new QHBoxLayout();
@@ -165,43 +162,38 @@ namespace O3DE::ProjectManager
                 projectsScrollArea->setWidget(scrollWidget);
                 projectsScrollArea->setWidgetResizable(true);
 
-#ifndef DISPLAY_PROJECT_DEV_DATA
-                // Iterate once to insert building project first
-                if (!buildProjectPath.isEmpty())
+                QVector<ProjectInfo> nonProcessingProjects;
+                buildProjectPath = QDir::fromNativeSeparators(buildProjectPath);
+                for (auto& project : projectsResult.GetValue())
                 {
-                    buildProjectPath = QDir::fromNativeSeparators(buildProjectPath);
-                    for (auto project : projectsResult.GetValue())
+                    if (projectButton && !*projectButton)
                     {
                         if (QDir::fromNativeSeparators(project.m_path) == buildProjectPath)
                         {
-                            ProjectButton* buildingProjectButton = CreateProjectButton(project, flowLayout, true);
-
-                            if (projectButton)
-                            {
-                                *projectButton = buildingProjectButton;
-                            }
-
-                            break;
+                            *projectButton = CreateProjectButton(project, flowLayout, true);
+                            continue;
                         }
                     }
+
+                    nonProcessingProjects.append(project);
                 }
 
-                for (auto project : projectsResult.GetValue())
-#else
-                ProjectInfo project = projectsResult.GetValue().at(0);
-                for (int i = 0; i < 15; i++)
-#endif
+                for (auto& project : nonProcessingProjects)
                 {
-                    // Add all other projects skipping building project
-                    // Safe if no building project because it is just an empty string
-                    if (project.m_path != buildProjectPath)
-                    {
-                        ProjectButton* projectButtonWidget = CreateProjectButton(project, flowLayout);
+                    ProjectButton* projectButtonWidget = CreateProjectButton(project, flowLayout);
 
-                        if (RequiresBuildProjectIterator(project.m_path) != m_requiresBuild.end())
-                        {
-                            projectButtonWidget->ShowBuildButton(true);
-                        }
+                    if (BuildQueueContainsProject(project.m_path))
+                    {
+                        projectButtonWidget->SetProjectButtonAction(tr("Cancel Queued Build"),
+                            [this, project]
+                            {
+                                UnqueueBuildProject(project);
+                                SuggestBuildProjectMsg(project, false);
+                            });
+                    }
+                    else if (RequiresBuildProjectIterator(project.m_path) != m_requiresBuild.end())
+                    {
+                        projectButtonWidget->SetProjectBuildButtonAction();
                     }
                 }
 
@@ -243,9 +235,9 @@ namespace O3DE::ProjectManager
         // Make sure to update builder with latest Project Button
         if (m_currentBuilder)
         {
-            ProjectButton* projectButtonPtr;
+            ProjectButton* projectButtonPtr = nullptr;
 
-            m_projectsContent = CreateProjectsContent(m_currentBuilder->GetProjectPath(), &projectButtonPtr);
+            m_projectsContent = CreateProjectsContent(m_currentBuilder->GetProjectInfo().m_path, &projectButtonPtr);
             m_currentBuilder->SetProjectButton(projectButtonPtr);
         }
         else
@@ -413,17 +405,15 @@ namespace O3DE::ProjectManager
         }
     }
 
-    void ProjectsScreen::SuggestBuildProject(const ProjectInfo& projectInfo)
+    void ProjectsScreen::SuggestBuildProjectMsg(const ProjectInfo& projectInfo, bool showMessage)
     {
-        if (projectInfo.m_needsBuild)
+        if (RequiresBuildProjectIterator(projectInfo.m_path) == m_requiresBuild.end())
         {
-            if (RequiresBuildProjectIterator(projectInfo.m_path) == m_requiresBuild.end())
-            {
-                m_requiresBuild.append(projectInfo);
-            }
-            ResetProjectsContent();
+            m_requiresBuild.append(projectInfo);
         }
-        else
+        ResetProjectsContent();
+
+        if (showMessage)
         {
             QMessageBox::information(this,
                 tr("Project Should be rebuilt."),
@@ -431,6 +421,11 @@ namespace O3DE::ProjectManager
         }
     }
 
+    void ProjectsScreen::SuggestBuildProject(const ProjectInfo& projectInfo)
+    {
+        SuggestBuildProjectMsg(projectInfo, true);
+    }
+
     void ProjectsScreen::QueueBuildProject(const ProjectInfo& projectInfo)
     {
         auto requiredIter = RequiresBuildProjectIterator(projectInfo.m_path);
@@ -444,14 +439,22 @@ namespace O3DE::ProjectManager
             if (m_buildQueue.empty() && !m_currentBuilder)
             {
                 StartProjectBuild(projectInfo);
+                // Projects Content is already reset in fuction
             }
             else
             {
                 m_buildQueue.append(projectInfo);
+                ResetProjectsContent();
             }
         }
     }
 
+    void ProjectsScreen::UnqueueBuildProject(const ProjectInfo& projectInfo)
+    {
+        m_buildQueue.removeAll(projectInfo);
+        ResetProjectsContent();
+    }
+
     void ProjectsScreen::NotifyCurrentScreen()
     {
         if (ShouldDisplayFirstTimeContent())
@@ -482,7 +485,7 @@ namespace O3DE::ProjectManager
         return displayFirstTimeContent;
     }
 
-    void ProjectsScreen::StartProjectBuild(const ProjectInfo& projectInfo)
+    bool ProjectsScreen::StartProjectBuild(const ProjectInfo& projectInfo)
     {
         if (ProjectUtils::IsVS2019Installed())
         {
@@ -502,25 +505,42 @@ namespace O3DE::ProjectManager
             }
             else
             {
-                ProjectBuildDone();
+                SuggestBuildProjectMsg(projectInfo, false);
+                return false;
             }
+
+            return true;
         }
+
+        return false;
     }
 
-    void ProjectsScreen::ProjectBuildDone()
+    void ProjectsScreen::ProjectBuildDone(bool success)
     {
+        ProjectInfo currentBuilderProject;
+        if (!success)
+        {
+            currentBuilderProject = m_currentBuilder->GetProjectInfo();
+        }
+
         delete m_currentBuilder;
         m_currentBuilder = nullptr;
 
-        if (!m_buildQueue.empty())
+        if (!success)
         {
-            StartProjectBuild(m_buildQueue.front());
-            m_buildQueue.pop_front();
+            SuggestBuildProjectMsg(currentBuilderProject, false);
         }
-        else
+
+        if (!m_buildQueue.empty())
         {
-            ResetProjectsContent();
+            while (!StartProjectBuild(m_buildQueue.front()) && m_buildQueue.size() > 1)
+            {
+                m_buildQueue.pop_front();
+            }
+            m_buildQueue.pop_front();
         }
+
+        ResetProjectsContent();
     }
 
     QList<ProjectInfo>::iterator ProjectsScreen::RequiresBuildProjectIterator(const QString& projectPath)
diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.h b/Code/Tools/ProjectManager/Source/ProjectsScreen.h
index 2fbbd3ad82..1ca8448134 100644
--- a/Code/Tools/ProjectManager/Source/ProjectsScreen.h
+++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -37,7 +37,7 @@ namespace O3DE::ProjectManager
 
     protected:
         void NotifyCurrentScreen() override;
-        void ProjectBuildDone();
+        void SuggestBuildProjectMsg(const ProjectInfo& projectInfo, bool showMessage);
 
     protected slots:
         void HandleNewProjectButton();
@@ -50,6 +50,9 @@ namespace O3DE::ProjectManager
 
         void SuggestBuildProject(const ProjectInfo& projectInfo);
         void QueueBuildProject(const ProjectInfo& projectInfo);
+        void UnqueueBuildProject(const ProjectInfo& projectInfo);
+
+        void ProjectBuildDone(bool success = true);
 
         void paintEvent(QPaintEvent* event) override;
 
@@ -60,7 +63,7 @@ namespace O3DE::ProjectManager
         void ResetProjectsContent();
         bool ShouldDisplayFirstTimeContent();
 
-        void StartProjectBuild(const ProjectInfo& projectInfo);
+        bool StartProjectBuild(const ProjectInfo& projectInfo);
         QList<ProjectInfo>::iterator RequiresBuildProjectIterator(const QString& projectPath);
         bool BuildQueueContainsProject(const QString& projectPath);
         bool WarnIfInBuildQueue(const QString& projectPath);
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 599dc430b8..f8c45bedeb 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h
index 3075a9690d..1d98505457 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.h
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
index fb89c5e185..0adc842a05 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
+++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ScreenDefs.h b/Code/Tools/ProjectManager/Source/ScreenDefs.h
index 8547587f13..28311089cc 100644
--- a/Code/Tools/ProjectManager/Source/ScreenDefs.h
+++ b/Code/Tools/ProjectManager/Source/ScreenDefs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ScreenFactory.cpp b/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
index 17e90e71c4..698061360e 100644
--- a/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
+++ b/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ScreenFactory.h b/Code/Tools/ProjectManager/Source/ScreenFactory.h
index a6a79d85da..654d29c3b4 100644
--- a/Code/Tools/ProjectManager/Source/ScreenFactory.h
+++ b/Code/Tools/ProjectManager/Source/ScreenFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.cpp
index 37cdb91113..bce7bd6076 100644
--- a/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.h b/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.h
index 5398b9d20a..51567fce9e 100644
--- a/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.h
+++ b/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ScreenWidget.h b/Code/Tools/ProjectManager/Source/ScreenWidget.h
index bfaa5d61c5..a5c005902e 100644
--- a/Code/Tools/ProjectManager/Source/ScreenWidget.h
+++ b/Code/Tools/ProjectManager/Source/ScreenWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ScreensCtrl.cpp b/Code/Tools/ProjectManager/Source/ScreensCtrl.cpp
index ca3d882a54..fa474c05e7 100644
--- a/Code/Tools/ProjectManager/Source/ScreensCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/ScreensCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/ScreensCtrl.h b/Code/Tools/ProjectManager/Source/ScreensCtrl.h
index 28b26eda38..a93ad18da0 100644
--- a/Code/Tools/ProjectManager/Source/ScreensCtrl.h
+++ b/Code/Tools/ProjectManager/Source/ScreensCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/TagWidget.cpp b/Code/Tools/ProjectManager/Source/TagWidget.cpp
index 22c420ddae..1e9a1fc33b 100644
--- a/Code/Tools/ProjectManager/Source/TagWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/TagWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/TagWidget.h b/Code/Tools/ProjectManager/Source/TagWidget.h
index ba05c2a186..7ccabc7d37 100644
--- a/Code/Tools/ProjectManager/Source/TagWidget.h
+++ b/Code/Tools/ProjectManager/Source/TagWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
index b61c24b8ae..d20b91ac8e 100644
--- a/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/TemplateButtonWidget.h b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.h
index 5bc0f83eaa..2b2b3474c2 100644
--- a/Code/Tools/ProjectManager/Source/TemplateButtonWidget.h
+++ b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
index d130ab50ce..5bd6cc4552 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -215,22 +215,23 @@ namespace O3DE::ProjectManager
                 return false;
             }
 
-            // Update project if settings changed
+            // Check if project path has changed and move it
+            // Move project first to avoid trying to update settings at the new location before it has been moved there
+            if (newProjectSettings.m_path != m_projectInfo.m_path)
             {
-                auto result = PythonBindingsInterface::Get()->UpdateProject(newProjectSettings);
-                if (!result.IsSuccess())
+                if (!ProjectUtils::MoveProject(m_projectInfo.m_path, newProjectSettings.m_path))
                 {
-                    QMessageBox::critical(this, tr("Project update failed"), tr(result.GetError().c_str()));
+                    QMessageBox::critical(this, tr("Project move failed"), tr("Failed to move project."));
                     return false;
                 }
             }
 
-            // Check if project path has changed and move it
-            if (newProjectSettings.m_path != m_projectInfo.m_path)
+            // Update project if settings changed
             {
-                if (!ProjectUtils::MoveProject(m_projectInfo.m_path, newProjectSettings.m_path))
+                auto result = PythonBindingsInterface::Get()->UpdateProject(newProjectSettings);
+                if (!result.IsSuccess())
                 {
-                    QMessageBox::critical(this, tr("Project move failed"), tr("Failed to move project."));
+                    QMessageBox::critical(this, tr("Project update failed"), tr(result.GetError().c_str()));
                     return false;
                 }
             }
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h
index e9e06f7209..cf360d3dc7 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
index 0cc3f6047e..5fa1a96f55 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h
index 934779332f..e25cfa8d16 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/Source/main.cpp b/Code/Tools/ProjectManager/Source/main.cpp
index e3460dd67f..2e6e06e765 100644
--- a/Code/Tools/ProjectManager/Source/main.cpp
+++ b/Code/Tools/ProjectManager/Source/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/project_manager_app_files.cmake b/Code/Tools/ProjectManager/project_manager_app_files.cmake
index a1dbd18686..6f064381cd 100644
--- a/Code/Tools/ProjectManager/project_manager_app_files.cmake
+++ b/Code/Tools/ProjectManager/project_manager_app_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/project_manager_files.cmake b/Code/Tools/ProjectManager/project_manager_files.cmake
index 3fb45f3531..a5632f082c 100644
--- a/Code/Tools/ProjectManager/project_manager_files.cmake
+++ b/Code/Tools/ProjectManager/project_manager_files.cmake
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -39,8 +39,10 @@ set(FILES
     Source/ProjectInfo.cpp
     Source/ProjectUtils.h
     Source/ProjectUtils.cpp
-    Source/ProjectBuilder.h
-    Source/ProjectBuilder.cpp
+    Source/ProjectBuilderWorker.h
+    Source/ProjectBuilderWorker.cpp
+    Source/ProjectBuilderController.h
+    Source/ProjectBuilderController.cpp
     Source/UpdateProjectSettingsScreen.h
     Source/UpdateProjectSettingsScreen.cpp
     Source/NewProjectSettingsScreen.h
diff --git a/Code/Tools/ProjectManager/project_manager_tests_files.cmake b/Code/Tools/ProjectManager/project_manager_tests_files.cmake
index 20c5a223d8..90fbe5db5c 100644
--- a/Code/Tools/ProjectManager/project_manager_tests_files.cmake
+++ b/Code/Tools/ProjectManager/project_manager_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/ProjectManager/tests/ApplicationTests.cpp b/Code/Tools/ProjectManager/tests/ApplicationTests.cpp
index e5e2dcf08f..450ea88066 100644
--- a/Code/Tools/ProjectManager/tests/ApplicationTests.cpp
+++ b/Code/Tools/ProjectManager/tests/ApplicationTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/tests/PythonBindingsTests.cpp b/Code/Tools/ProjectManager/tests/PythonBindingsTests.cpp
index 4fe6ba4654..eb59068f78 100644
--- a/Code/Tools/ProjectManager/tests/PythonBindingsTests.cpp
+++ b/Code/Tools/ProjectManager/tests/PythonBindingsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/tests/UtilsTests.cpp b/Code/Tools/ProjectManager/tests/UtilsTests.cpp
index 3d9530da58..51f7162278 100644
--- a/Code/Tools/ProjectManager/tests/UtilsTests.cpp
+++ b/Code/Tools/ProjectManager/tests/UtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/ProjectManager/tests/main.cpp b/Code/Tools/ProjectManager/tests/main.cpp
index 9d6bbc2cd7..f9499f9afe 100644
--- a/Code/Tools/ProjectManager/tests/main.cpp
+++ b/Code/Tools/ProjectManager/tests/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/PythonBindingsExample/CMakeLists.txt b/Code/Tools/PythonBindingsExample/CMakeLists.txt
index 4150470296..df450770fa 100644
--- a/Code/Tools/PythonBindingsExample/CMakeLists.txt
+++ b/Code/Tools/PythonBindingsExample/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/PythonBindingsExample/pythonbindingsexample_app_files.cmake b/Code/Tools/PythonBindingsExample/pythonbindingsexample_app_files.cmake
index 2bc0ab4c8b..36ed8b5737 100644
--- a/Code/Tools/PythonBindingsExample/pythonbindingsexample_app_files.cmake
+++ b/Code/Tools/PythonBindingsExample/pythonbindingsexample_app_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/PythonBindingsExample/pythonbindingsexample_files.cmake b/Code/Tools/PythonBindingsExample/pythonbindingsexample_files.cmake
index c732806058..fddfcc0466 100644
--- a/Code/Tools/PythonBindingsExample/pythonbindingsexample_files.cmake
+++ b/Code/Tools/PythonBindingsExample/pythonbindingsexample_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/PythonBindingsExample/pythonbindingsexample_tests_files.cmake b/Code/Tools/PythonBindingsExample/pythonbindingsexample_tests_files.cmake
index 037f6b452f..5180357346 100644
--- a/Code/Tools/PythonBindingsExample/pythonbindingsexample_tests_files.cmake
+++ b/Code/Tools/PythonBindingsExample/pythonbindingsexample_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/PythonBindingsExample/source/Application.cpp b/Code/Tools/PythonBindingsExample/source/Application.cpp
index 0601179182..9fdcab4c12 100644
--- a/Code/Tools/PythonBindingsExample/source/Application.cpp
+++ b/Code/Tools/PythonBindingsExample/source/Application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/PythonBindingsExample/source/Application.h b/Code/Tools/PythonBindingsExample/source/Application.h
index afbcd4f05a..ff42533f04 100644
--- a/Code/Tools/PythonBindingsExample/source/Application.h
+++ b/Code/Tools/PythonBindingsExample/source/Application.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/PythonBindingsExample/source/ApplicationParameters.cpp b/Code/Tools/PythonBindingsExample/source/ApplicationParameters.cpp
index 4b994c6c64..929f4456bf 100644
--- a/Code/Tools/PythonBindingsExample/source/ApplicationParameters.cpp
+++ b/Code/Tools/PythonBindingsExample/source/ApplicationParameters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/PythonBindingsExample/source/ApplicationParameters.h b/Code/Tools/PythonBindingsExample/source/ApplicationParameters.h
index fbde1978cb..7d1b258bac 100644
--- a/Code/Tools/PythonBindingsExample/source/ApplicationParameters.h
+++ b/Code/Tools/PythonBindingsExample/source/ApplicationParameters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/PythonBindingsExample/source/Platform/Common/Clang/pythonbindingsexample_clang.cmake b/Code/Tools/PythonBindingsExample/source/Platform/Common/Clang/pythonbindingsexample_clang.cmake
index e75bb7f45a..fb29e53c94 100644
--- a/Code/Tools/PythonBindingsExample/source/Platform/Common/Clang/pythonbindingsexample_clang.cmake
+++ b/Code/Tools/PythonBindingsExample/source/Platform/Common/Clang/pythonbindingsexample_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/PythonBindingsExample/source/Platform/Common/MSVC/pythonbindingsexample_msvc.cmake b/Code/Tools/PythonBindingsExample/source/Platform/Common/MSVC/pythonbindingsexample_msvc.cmake
index 8727d11eab..bf44d5754d 100644
--- a/Code/Tools/PythonBindingsExample/source/Platform/Common/MSVC/pythonbindingsexample_msvc.cmake
+++ b/Code/Tools/PythonBindingsExample/source/Platform/Common/MSVC/pythonbindingsexample_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/PythonBindingsExample/source/main.cpp b/Code/Tools/PythonBindingsExample/source/main.cpp
index 73f380db8c..402b0f2436 100644
--- a/Code/Tools/PythonBindingsExample/source/main.cpp
+++ b/Code/Tools/PythonBindingsExample/source/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/PythonBindingsExample/tests/ApplicationTests.cpp b/Code/Tools/PythonBindingsExample/tests/ApplicationTests.cpp
index f99d4c7f84..9356725b53 100644
--- a/Code/Tools/PythonBindingsExample/tests/ApplicationTests.cpp
+++ b/Code/Tools/PythonBindingsExample/tests/ApplicationTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/PythonBindingsExample/tests/TestMain.cpp b/Code/Tools/PythonBindingsExample/tests/TestMain.cpp
index daba5dc657..fce6c9e9a2 100644
--- a/Code/Tools/PythonBindingsExample/tests/TestMain.cpp
+++ b/Code/Tools/PythonBindingsExample/tests/TestMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/PythonBindingsExample/tests/run_python_tests.bat b/Code/Tools/PythonBindingsExample/tests/run_python_tests.bat
index fef216277a..2d80c2a813 100644
--- a/Code/Tools/PythonBindingsExample/tests/run_python_tests.bat
+++ b/Code/Tools/PythonBindingsExample/tests/run_python_tests.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Code/Tools/PythonBindingsExample/tests/test_framework.py b/Code/Tools/PythonBindingsExample/tests/test_framework.py
index adc1e3b7b8..2079511e2e 100755
--- a/Code/Tools/PythonBindingsExample/tests/test_framework.py
+++ b/Code/Tools/PythonBindingsExample/tests/test_framework.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Code/Tools/PythonBindingsExample/tests/test_hello_tool.py b/Code/Tools/PythonBindingsExample/tests/test_hello_tool.py
index 7d16a5d881..2336a5bdbc 100755
--- a/Code/Tools/PythonBindingsExample/tests/test_hello_tool.py
+++ b/Code/Tools/PythonBindingsExample/tests/test_hello_tool.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Code/Tools/PythonBindingsExample/tool_dependencies.cmake b/Code/Tools/PythonBindingsExample/tool_dependencies.cmake
index 8b1a630bac..03da861928 100644
--- a/Code/Tools/PythonBindingsExample/tool_dependencies.cmake
+++ b/Code/Tools/PythonBindingsExample/tool_dependencies.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/RemoteConsole/CMakeLists.txt b/Code/Tools/RemoteConsole/CMakeLists.txt
index 22944db2ba..18dcdbaf23 100644
--- a/Code/Tools/RemoteConsole/CMakeLists.txt
+++ b/Code/Tools/RemoteConsole/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp b/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
index 18781b36e6..ec3951c558 100644
--- a/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
+++ b/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.h b/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.h
index 176fdc93aa..105f541c31 100644
--- a/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.h
+++ b/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Core/remoteconsolecore_files.cmake b/Code/Tools/RemoteConsole/Core/remoteconsolecore_files.cmake
index 9db37db76b..d948d83a39 100644
--- a/Code/Tools/RemoteConsole/Core/remoteconsolecore_files.cmake
+++ b/Code/Tools/RemoteConsole/Core/remoteconsolecore_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/RemoteConsole/Platform/Android/RemoteConsole_Traits_Android.h b/Code/Tools/RemoteConsole/Platform/Android/RemoteConsole_Traits_Android.h
index 2a0f2b01e3..62cc13cf8c 100644
--- a/Code/Tools/RemoteConsole/Platform/Android/RemoteConsole_Traits_Android.h
+++ b/Code/Tools/RemoteConsole/Platform/Android/RemoteConsole_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/Android/RemoteConsole_Traits_Platform.h b/Code/Tools/RemoteConsole/Platform/Android/RemoteConsole_Traits_Platform.h
index 2e5f5c5e98..0b09092627 100644
--- a/Code/Tools/RemoteConsole/Platform/Android/RemoteConsole_Traits_Platform.h
+++ b/Code/Tools/RemoteConsole/Platform/Android/RemoteConsole_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/Android/platform_android_files.cmake b/Code/Tools/RemoteConsole/Platform/Android/platform_android_files.cmake
index d8c1d08ff3..4ef3043145 100644
--- a/Code/Tools/RemoteConsole/Platform/Android/platform_android_files.cmake
+++ b/Code/Tools/RemoteConsole/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/RemoteConsole/Platform/Linux/RemoteConsole_Traits_Linux.h b/Code/Tools/RemoteConsole/Platform/Linux/RemoteConsole_Traits_Linux.h
index 2a0f2b01e3..62cc13cf8c 100644
--- a/Code/Tools/RemoteConsole/Platform/Linux/RemoteConsole_Traits_Linux.h
+++ b/Code/Tools/RemoteConsole/Platform/Linux/RemoteConsole_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/Linux/RemoteConsole_Traits_Platform.h b/Code/Tools/RemoteConsole/Platform/Linux/RemoteConsole_Traits_Platform.h
index 052d753e28..5e88ef1124 100644
--- a/Code/Tools/RemoteConsole/Platform/Linux/RemoteConsole_Traits_Platform.h
+++ b/Code/Tools/RemoteConsole/Platform/Linux/RemoteConsole_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/Linux/platform_linux_files.cmake b/Code/Tools/RemoteConsole/Platform/Linux/platform_linux_files.cmake
index b215cd76b7..7ae9810d7b 100644
--- a/Code/Tools/RemoteConsole/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Tools/RemoteConsole/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/RemoteConsole/Platform/Mac/RemoteConsole_Traits_Mac.h b/Code/Tools/RemoteConsole/Platform/Mac/RemoteConsole_Traits_Mac.h
index 2a0f2b01e3..62cc13cf8c 100644
--- a/Code/Tools/RemoteConsole/Platform/Mac/RemoteConsole_Traits_Mac.h
+++ b/Code/Tools/RemoteConsole/Platform/Mac/RemoteConsole_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/Mac/RemoteConsole_Traits_Platform.h b/Code/Tools/RemoteConsole/Platform/Mac/RemoteConsole_Traits_Platform.h
index 4189c249c5..062e2d332f 100644
--- a/Code/Tools/RemoteConsole/Platform/Mac/RemoteConsole_Traits_Platform.h
+++ b/Code/Tools/RemoteConsole/Platform/Mac/RemoteConsole_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/Mac/platform_mac_files.cmake b/Code/Tools/RemoteConsole/Platform/Mac/platform_mac_files.cmake
index 0ba12eb9c5..4e62368114 100644
--- a/Code/Tools/RemoteConsole/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Tools/RemoteConsole/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/RemoteConsole/Platform/Windows/RemoteConsole_Traits_Platform.h b/Code/Tools/RemoteConsole/Platform/Windows/RemoteConsole_Traits_Platform.h
index 4f640b13de..4bba9a18fb 100644
--- a/Code/Tools/RemoteConsole/Platform/Windows/RemoteConsole_Traits_Platform.h
+++ b/Code/Tools/RemoteConsole/Platform/Windows/RemoteConsole_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/Windows/RemoteConsole_Traits_Windows.h b/Code/Tools/RemoteConsole/Platform/Windows/RemoteConsole_Traits_Windows.h
index 2a0f2b01e3..62cc13cf8c 100644
--- a/Code/Tools/RemoteConsole/Platform/Windows/RemoteConsole_Traits_Windows.h
+++ b/Code/Tools/RemoteConsole/Platform/Windows/RemoteConsole_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/Windows/platform_windows_files.cmake b/Code/Tools/RemoteConsole/Platform/Windows/platform_windows_files.cmake
index 90d6ad0466..f69668845f 100644
--- a/Code/Tools/RemoteConsole/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Tools/RemoteConsole/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/RemoteConsole/Platform/iOS/RemoteConsole_Traits_Platform.h b/Code/Tools/RemoteConsole/Platform/iOS/RemoteConsole_Traits_Platform.h
index 92796e33cd..d01419c3ee 100644
--- a/Code/Tools/RemoteConsole/Platform/iOS/RemoteConsole_Traits_Platform.h
+++ b/Code/Tools/RemoteConsole/Platform/iOS/RemoteConsole_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/iOS/RemoteConsole_Traits_iOS.h b/Code/Tools/RemoteConsole/Platform/iOS/RemoteConsole_Traits_iOS.h
index 2a0f2b01e3..62cc13cf8c 100644
--- a/Code/Tools/RemoteConsole/Platform/iOS/RemoteConsole_Traits_iOS.h
+++ b/Code/Tools/RemoteConsole/Platform/iOS/RemoteConsole_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/RemoteConsole/Platform/iOS/platform_ios_files.cmake b/Code/Tools/RemoteConsole/Platform/iOS/platform_ios_files.cmake
index d80120bd96..9081267c71 100644
--- a/Code/Tools/RemoteConsole/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Tools/RemoteConsole/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/CMakeLists.txt b/Code/Tools/SceneAPI/CMakeLists.txt
index ca5e420cf9..f86fd71e28 100644
--- a/Code/Tools/SceneAPI/CMakeLists.txt
+++ b/Code/Tools/SceneAPI/CMakeLists.txt
@@ -1,11 +1,11 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
 #
 
-add_subdirectory(FbxSceneBuilder)
+add_subdirectory(SceneBuilder)
 add_subdirectory(SceneCore)
 add_subdirectory(SceneData)
 add_subdirectory(SceneUI)
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/CMakeLists.txt b/Code/Tools/SceneAPI/FbxSceneBuilder/CMakeLists.txt
deleted file mode 100644
index 29b81886c2..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if (NOT PAL_TRAIT_BUILD_HOST_TOOLS)
-    return()
-endif()
-
-ly_add_target(
-    NAME FbxSceneBuilder.Static STATIC
-    NAMESPACE AZ
-    FILES_CMAKE
-        fbxscenebuilder_files.cmake
-        Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-    COMPILE_DEFINITIONS
-        PRIVATE
-            FBX_SCENE_BUILDER_EXPORTS
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            ../..
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-            AZ::AzFramework
-        PUBLIC
-            AZ::AzToolsFramework
-            AZ::SceneCore
-            AZ::SceneData
-            AZ::SDKWrapper
-)
-
-ly_add_target(
-    NAME FbxSceneBuilder MODULE
-    NAMESPACE AZ
-    FILES_CMAKE
-        fbxscenebuilder_shared_files.cmake
-    COMPILE_DEFINITIONS
-        PRIVATE
-            FBX_SCENE_BUILDER_EXPORTS
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            ../..
-    BUILD_DEPENDENCIES
-        PUBLIC
-            AZ::FbxSceneBuilder.Static
-        PRIVATE
-            AZ::AzCore
-)
-
-ly_add_dependencies(AssetBuilder AZ::FbxSceneBuilder)
-
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    ly_add_target(
-        NAME FbxSceneBuilder.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE AZ
-        FILES_CMAKE
-            fbxscenebuilder_testing_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Tests
-        BUILD_DEPENDENCIES
-            PRIVATE
-                AZ::AzTest
-                AZ::FbxSceneBuilder
-    )
-    ly_add_googletest(
-        NAME AZ::FbxSceneBuilder.Tests
-    )
-endif()
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp
deleted file mode 100644
index 19b082a814..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#if !defined(AZ_MONOLITHIC_BUILD)
-
-#include <AzCore/Component/Component.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/Module/Environment.h>
-#include <SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h>
-
-#include <SceneAPI/FbxSceneBuilder/FbxImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            static AZStd::vector<AZ::ComponentDescriptor*> g_componentDescriptors;
-
-            void Reflect(AZ::SerializeContext* /*context*/)
-            {
-                // Descriptor registration is done in Reflect instead of Initialize because the ResourceCompilerScene initializes the libraries before
-                // there's an application.
-                using namespace AZ::SceneAPI;
-                using namespace AZ::SceneAPI::FbxSceneBuilder;
-
-                if (g_componentDescriptors.empty())
-                {
-                    // Global importer and behavior
-                    g_componentDescriptors.push_back(FbxSceneBuilder::FbxImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(FbxSceneImporter::FbxImportRequestHandler::CreateDescriptor());
-
-                    // Node and attribute importers
-                    g_componentDescriptors.push_back(AssImpBitangentStreamImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpColorStreamImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpMaterialImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpMeshImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpTangentStreamImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpTransformImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpUvMapImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpSkinImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpSkinWeightsImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpBoneImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpAnimationImporter::CreateDescriptor());
-                    g_componentDescriptors.push_back(AssImpBlendShapeImporter::CreateDescriptor());
-
-                    for (AZ::ComponentDescriptor* descriptor : g_componentDescriptors)
-                    {
-                        AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationBus::Handler::RegisterComponentDescriptor, descriptor);
-                    }
-                }
-            }
-
-            void ReflectBehavior([[maybe_unused]] AZ::BehaviorContext* context)
-            {
-                // stub in until LYN-1284 is done
-            }
-
-            void Activate()
-            {
-            }
-            
-            void Deactivate()
-            {
-            }
-
-            void Uninitialize()
-            {
-                if (!g_componentDescriptors.empty())
-                {
-                    for (AZ::ComponentDescriptor* descriptor : g_componentDescriptors)
-                    {
-                        descriptor->ReleaseDescriptor();
-                    }
-                    g_componentDescriptors.clear();
-                    g_componentDescriptors.shrink_to_fit();
-                }
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
-
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env)
-{
-    AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(env));
-}
-extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context)
-{
-    AZ::SceneAPI::FbxSceneBuilder::Reflect(context);
-}
-extern "C" AZ_DLL_EXPORT void ReflectBehavior(AZ::BehaviorContext* context)
-{
-    AZ::SceneAPI::FbxSceneBuilder::ReflectBehavior(context);
-}
-extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule()
-{
-    AZ::SceneAPI::FbxSceneBuilder::Uninitialize();
-    AZ::Environment::Detach();
-}
-
-#endif // !defined(AZ_MONOLITHIC_BUILD)
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp
deleted file mode 100644
index df725aed32..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h>
-#include <AzCore/Serialization/EditContextConstants.inl>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/Json/JsonSerialization.h>
-#include <AzCore/Settings/SettingsRegistry.h>
-#include <AzCore/StringFunc/StringFunc.h>
-#include <SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
-#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneImporter
-        {
-            void SceneImporterSettings::Reflect(AZ::ReflectContext* context)
-            {
-                if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext)
-                {
-                    serializeContext->Class<SceneImporterSettings>()
-                                    ->Version(2)
-                                    ->Field("SupportedFileTypeExtensions", &SceneImporterSettings::m_supportedFileTypeExtensions);
-                }
-            }
-
-            void FbxImportRequestHandler::Activate()
-            {
-                if (auto* settingsRegistry = AZ::SettingsRegistry::Get())
-                {
-                    settingsRegistry->GetObject(m_settings, "/O3DE/SceneAPI/AssetImporter");
-                }
-
-                BusConnect();
-            }
-
-            void FbxImportRequestHandler::Deactivate()
-            {
-                BusDisconnect();
-            }
-
-            void FbxImportRequestHandler::Reflect(ReflectContext* context)
-            {
-                SceneImporterSettings::Reflect(context);
-
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<FbxImportRequestHandler, AZ::Component>()->Version(1)->Attribute(
-                        AZ::Edit::Attributes::SystemComponentTags,
-                        AZStd::vector<AZ::Crc32>(
-                            {AssetBuilderSDK::ComponentTags::AssetBuilder,
-                            AssetImportRequest::GetAssetImportRequestComponentTag()}));
-                    
-                }
-            }
-
-            void FbxImportRequestHandler::GetSupportedFileExtensions(AZStd::unordered_set<AZStd::string>& extensions)
-            {
-                extensions.insert(m_settings.m_supportedFileTypeExtensions.begin(), m_settings.m_supportedFileTypeExtensions.end());
-            }
-
-            Events::LoadingResult FbxImportRequestHandler::LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, [[maybe_unused]] RequestingApplication requester)
-            {
-                AZStd::string extension;
-                StringFunc::Path::GetExtension(path.c_str(), extension);
-                AZStd::to_lower(extension.begin(), extension.end());
-                
-                if (!m_settings.m_supportedFileTypeExtensions.contains(extension))
-                {
-                    return Events::LoadingResult::Ignored;
-                }
-
-                scene.SetSource(path, guid);
-
-                // Push contexts
-                Events::ProcessingResultCombiner contextResult;
-                contextResult += Events::Process<Events::PreImportEventContext>(path);
-                contextResult += Events::Process<Events::ImportEventContext>(path, scene);
-                contextResult += Events::Process<Events::PostImportEventContext>(scene);
-
-                if (contextResult.GetResult() == Events::ProcessingResult::Success)
-                {
-                    return Events::LoadingResult::AssetLoaded;
-                }
-                else
-                {
-                    return Events::LoadingResult::AssetFailure;
-                }
-            }
-
-            void FbxImportRequestHandler::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
-            {
-                provided.emplace_back(AZ_CRC_CE("AssetImportRequestHandler"));
-            }
-        } // namespace Import
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h
deleted file mode 100644
index 77224ad749..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/SceneCore/Components/BehaviorComponent.h>
-#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneImporter
-        {
-            struct SceneImporterSettings
-            {
-                AZ_TYPE_INFO(SceneImporterSettings, "{8BB6C7AD-BF99-44DC-9DA1-E7AD3F03DC10}");
-                
-                static void Reflect(AZ::ReflectContext* context);
-
-                AZStd::unordered_set<AZStd::string> m_supportedFileTypeExtensions;
-            };
-
-            class FbxImportRequestHandler
-                : public AZ::Component
-                , public Events::AssetImportRequestBus::Handler
-            {
-            public:
-                AZ_COMPONENT(FbxImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}");
-
-                ~FbxImportRequestHandler() override = default;
-
-                void Activate() override;
-                void Deactivate() override;
-                static void Reflect(ReflectContext* context);
-
-                void GetSupportedFileExtensions(AZStd::unordered_set<AZStd::string>& extensions) override;
-                Events::LoadingResult LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid,
-                    RequestingApplication requester) override;
-
-                static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided);
-
-            private:
-
-                SceneImporterSettings m_settings;
-
-                static constexpr const char* SettingsFilename = "AssetImporterSettings.json";
-            };
-        } // namespace FbxSceneImporter
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.cpp
deleted file mode 100644
index 22b4a5a7ca..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/Debug/Trace.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/containers/queue.h>
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/FbxImporter.h>
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneData/GraphData/TransformData.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            struct QueueNode
-            {
-                std::shared_ptr<SDKNode::NodeWrapper> m_node;
-                Containers::SceneGraph::NodeIndex m_parent;
-
-                QueueNode() = delete;
-                QueueNode(std::shared_ptr<SDKNode::NodeWrapper>&& node, Containers::SceneGraph::NodeIndex parent)
-                    : m_node(std::move(node))
-                    , m_parent(parent)
-                {
-                }
-            };
-
-            FbxImporter::FbxImporter()
-                : m_sceneSystem(new FbxSceneSystem())
-            {
-                m_sceneWrapper = AZStd::make_unique<AssImpSDKWrapper::AssImpSceneWrapper>();
-                BindToCall(&FbxImporter::ImportProcessing);
-            }
-
-            void FbxImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<FbxImporter, SceneCore::LoadingComponent>()->Version(2); // SPEC-5776
-                }
-            }
-
-            Events::ProcessingResult FbxImporter::ImportProcessing(Events::ImportEventContext& context)
-            {
-                m_sceneWrapper->Clear();
-
-                if (!m_sceneWrapper->LoadSceneFromFile(context.GetInputDirectory().c_str()))
-                {
-                    return Events::ProcessingResult::Failure;
-                }
-
-                typedef AZStd::function<bool(Containers::Scene & scene)> ConvertFunc;
-                ConvertFunc convertFunc;
-                m_sceneSystem->Set(m_sceneWrapper.get());
-                if (!azrtti_istypeof<AssImpSDKWrapper::AssImpSceneWrapper>(m_sceneWrapper.get()))
-                {
-                    return Events::ProcessingResult::Failure;
-                }
-
-                convertFunc = AZStd::bind(&FbxImporter::ConvertFbxScene, this, AZStd::placeholders::_1);
-                
-                if (convertFunc(context.GetScene()))
-                {
-                    return Events::ProcessingResult::Success;
-                }
-                else
-                {
-                    return Events::ProcessingResult::Failure;
-                }
-            }
-
-            bool FbxImporter::ConvertFbxScene(Containers::Scene& scene) const
-            {
-                std::shared_ptr<SDKNode::NodeWrapper> fbxRoot = m_sceneWrapper->GetRootNode();
-                if (!fbxRoot)
-                {
-                    return false;
-                }
-
-                const AssImpSDKWrapper::AssImpSceneWrapper* assImpSceneWrapper = azrtti_cast <AssImpSDKWrapper::AssImpSceneWrapper*>(m_sceneWrapper.get());
-
-                AZStd::pair<AssImpSDKWrapper::AssImpSceneWrapper::AxisVector, int32_t> upAxisAndSign = assImpSceneWrapper->GetUpVectorAndSign();
-
-                if (upAxisAndSign.second <= 0)
-                {
-                    AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Negative scene orientation is not a currently supported orientation.");
-                    return false;
-                }
-                switch (upAxisAndSign.first)
-                {
-                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::X:
-                    scene.SetOriginalSceneOrientation(Containers::Scene::SceneOrientation::XUp);
-                    break;
-                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Y:
-                    scene.SetOriginalSceneOrientation(Containers::Scene::SceneOrientation::YUp);
-                    break;
-                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Z:
-                    scene.SetOriginalSceneOrientation(Containers::Scene::SceneOrientation::ZUp);
-                    break;
-                default:
-                    AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unknown scene orientation, %d.", upAxisAndSign.first);
-                    AZ_Assert(false, "Unknown scene orientation, %d.", upAxisAndSign.first);
-                    break;
-                }
-
-                AZStd::queue<FbxSceneBuilder::QueueNode> nodes;
-                nodes.emplace(AZStd::move(fbxRoot), scene.GetGraph().GetRoot());
-                RenamedNodesMap nodeNameMap;
-
-                while (!nodes.empty())
-                {
-                    FbxSceneBuilder::QueueNode& node = nodes.front();
-                    AZ_Assert(node.m_node, "Empty asset importer node queued");
-                    if (!nodeNameMap.RegisterNode(node.m_node, scene.GetGraph(), node.m_parent))
-                    {
-                        AZ_TracePrintf(Utilities::ErrorWindow, "Failed to register asset importer node in name table.");
-                        // Skip this node since it could not be registered
-                        nodes.pop();
-                        continue;
-                    }
-                    AZStd::string nodeName = nodeNameMap.GetNodeName(node.m_node);
-                    SanitizeNodeName(nodeName);
-
-                    AZ_TraceContext("SceneAPI Node Name", nodeName);
-                    Containers::SceneGraph::NodeIndex newNode = scene.GetGraph().AddChild(node.m_parent, nodeName.c_str());
-
-                    AZ_Error(Utilities::ErrorWindow, newNode.IsValid(), "Failed to add Asset Importer node to scene graph");
-                    if (!newNode.IsValid())
-                    {
-                        continue;
-                    }
-
-                    AssImpNodeEncounteredContext sourceNodeEncountered(scene, newNode, *assImpSceneWrapper, *m_sceneSystem, nodeNameMap, *azrtti_cast<AZ::AssImpSDKWrapper::AssImpNodeWrapper*>(node.m_node.get()));
-                    Events::ProcessingResultCombiner nodeResult;
-                    nodeResult += Events::Process(sourceNodeEncountered);
-
-                    // If no importer created data, we still create an empty node that may eventually contain a transform
-                    if (sourceNodeEncountered.m_createdData.empty())
-                    {
-                        AZ_Assert(nodeResult.GetResult() != Events::ProcessingResult::Success,
-                            "Importers returned success but no data was created");
-                        AZStd::shared_ptr<DataTypes::IGraphObject> nullData(nullptr);
-                        sourceNodeEncountered.m_createdData.emplace_back(nullData);
-                        nodeResult += Events::ProcessingResult::Success;
-                    }
-
-                    // Create single node since only one piece of graph data was created
-                    if (sourceNodeEncountered.m_createdData.size() == 1)
-                    {
-                        AZ_Assert(nodeResult.GetResult() != Events::ProcessingResult::Ignored,
-                            "An importer created data, but did not return success");
-                        if (nodeResult.GetResult() == Events::ProcessingResult::Failure)
-                        {
-                            AZ_TracePrintf(Utilities::ErrorWindow, "One or more importers failed to create data.");
-                        }
-
-                        AssImpSceneDataPopulatedContext dataProcessed(sourceNodeEncountered,
-                            sourceNodeEncountered.m_createdData[0], nodeName.c_str());
-                        Events::ProcessingResult result = AddDataNodeWithContexts(dataProcessed);
-                        if (result != Events::ProcessingResult::Failure)
-                        {
-                            newNode = dataProcessed.m_currentGraphPosition;
-                        }
-                    }
-                    // Create an empty parent node and place all data under it. The remaining
-                    // tree will be built off of this as the logical parent
-                    else
-                    {
-                        AZ_Assert(nodeResult.GetResult() != Events::ProcessingResult::Ignored,
-                            "%i importers created data, but did not return success",
-                            sourceNodeEncountered.m_createdData.size());
-                        if (nodeResult.GetResult() == Events::ProcessingResult::Failure)
-                        {
-                            AZ_TracePrintf(Utilities::ErrorWindow, "One or more importers failed to create data.");
-                        }
-
-                        size_t offset = nodeName.length();
-                        for (size_t i = 0; i < sourceNodeEncountered.m_createdData.size(); ++i)
-                        {
-                            nodeName += '_';
-                            nodeName += AZStd::to_string(aznumeric_cast<AZ::u64>(i + 1));
-
-                            Containers::SceneGraph::NodeIndex subNode =
-                                scene.GetGraph().AddChild(newNode, nodeName.c_str());
-                            AZ_Assert(subNode.IsValid(), "Failed to create new scene sub node");
-                            AssImpSceneDataPopulatedContext dataProcessed(sourceNodeEncountered,
-                                sourceNodeEncountered.m_createdData[i], nodeName);
-                            dataProcessed.m_currentGraphPosition = subNode;
-                            AddDataNodeWithContexts(dataProcessed);
-
-                            // Remove the temporary extension again.
-                            nodeName.erase(offset, nodeName.length() - offset);
-                        }
-                    }
-
-                    AZ_Assert(nodeResult.GetResult() == Events::ProcessingResult::Success,
-                        "No importers successfully added processed scene data.");
-                    AZ_Assert(newNode != node.m_parent,
-                        "Failed to update current graph position during data processing.");
-
-                    int childCount = node.m_node->GetChildCount();
-                    for (int i = 0; i < childCount; ++i)
-                    {
-                        std::shared_ptr<AssImpSDKWrapper::AssImpNodeWrapper> child = std::make_shared<AssImpSDKWrapper::AssImpNodeWrapper>(node.m_node->GetChild(i)->GetAssImpNode());
-                        if (child)
-                        {
-                            nodes.emplace(AZStd::move(child), newNode);
-                        }
-                    }
-
-                    nodes.pop();
-                };
-
-                Events::ProcessingResult result = Events::Process<AssImpFinalizeSceneContext>(scene, *assImpSceneWrapper, *m_sceneSystem, nodeNameMap);
-                if (result == Events::ProcessingResult::Failure)
-                {
-                    return false;
-                }
-
-                return true;
-            }
-
-            void FbxImporter::SanitizeNodeName(AZStd::string& nodeName) const
-            {
-                // Replace % with something else so it is safe for use in printfs.
-                AZStd::replace(nodeName.begin(), nodeName.end(), '%', '_');
-            }
-
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.h
deleted file mode 100644
index fb2dd35477..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneSystem.h>
-#include <SceneAPI/SDKWrapper/SceneWrapper.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace Containers
-        {
-            class Scene;
-        }
-
-        namespace FbxSceneBuilder
-        {
-            class FbxImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(FbxImporter, "{D5EE21B6-8B73-45BF-B711-31346E0BEDB3}", SceneCore::LoadingComponent);
-
-                FbxImporter();
-                ~FbxImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportProcessing(Events::ImportEventContext& context);
-
-            protected:
-                bool ConvertFbxScene(Containers::Scene& scene) const;
-                void SanitizeNodeName(AZStd::string& nodeName) const;
-
-                AZStd::unique_ptr<SDKScene::SceneWrapperBase> m_sceneWrapper;
-                AZStd::shared_ptr<FbxSceneSystem> m_sceneSystem;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneBuilderConfiguration.h b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneBuilderConfiguration.h
deleted file mode 100644
index a3ba6cedca..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneBuilderConfiguration.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/PlatformDef.h>
-
-#if defined(AZ_MONOLITHIC_BUILD)
-    #define FBX_SCENE_BUILDER_API
-#else
-    #ifdef FBX_SCENE_BUILDER_EXPORTS
-        #define FBX_SCENE_BUILDER_API AZ_DLL_EXPORT
-    #else
-        #define FBX_SCENE_BUILDER_API AZ_DLL_IMPORT
-    #endif
-#endif // AZ_MONOLITHIC_BUILD
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.cpp
deleted file mode 100644
index d764a39ae6..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Math/Vector3.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneSystem.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
-#include <assimp/scene.h>
-
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        FbxSceneSystem::FbxSceneSystem() :
-            m_unitSizeInMeters(1.0f),
-            m_originalUnitSizeInMeters(1.0f),
-            m_adjustTransform(nullptr),
-            m_adjustTransformInverse(nullptr)
-        {
-        }
-
-        void FbxSceneSystem::Set(const SDKScene::SceneWrapperBase* fbxScene)
-        {
-            // Get unit conversion factor to meter.
-            if (!azrtti_istypeof<AssImpSDKWrapper::AssImpSceneWrapper>(fbxScene))
-            {
-                return;
-            }
-
-            const AssImpSDKWrapper::AssImpSceneWrapper* assImpScene = azrtti_cast<const AssImpSDKWrapper::AssImpSceneWrapper*>(fbxScene);
-
-            // If either meta data piece is not available, the default of 1 will be used.
-            assImpScene->GetAssImpScene()->mMetaData->Get("UnitScaleFactor", m_unitSizeInMeters);
-            assImpScene->GetAssImpScene()->mMetaData->Get("OriginalUnitScaleFactor", m_originalUnitSizeInMeters);
-
-            /* Conversion factor for converting from centimeters to meters */
-            m_unitSizeInMeters = m_unitSizeInMeters * .01f;
-
-            AZStd::pair<AssImpSDKWrapper::AssImpSceneWrapper::AxisVector, int32_t> upAxisAndSign = assImpScene->GetUpVectorAndSign();
-
-            if (upAxisAndSign.second <= 0)
-            {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Negative scene orientation is not a currently supported orientation.");
-                return;
-            }
-
-            AZStd::pair<AssImpSDKWrapper::AssImpSceneWrapper::AxisVector, int32_t> frontAxisAndSign = assImpScene->GetFrontVectorAndSign();
-
-            if (upAxisAndSign.first != AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Z &&
-                upAxisAndSign.first != AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Unknown)
-            {
-                AZ::Matrix4x4 currentCoordMatrix = AZ::Matrix4x4::CreateIdentity();
-                //(UpVector = +Z, FrontVector = +Y, CoordSystem = -X(RightHanded))
-                AZ::Matrix4x4 targetCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
-                    AZ::Vector4(-1, 0, 0, 0),
-                    AZ::Vector4(0, 0, 1, 0),
-                    AZ::Vector4(0, 1, 0, 0),
-                    AZ::Vector4(0, 0, 0, 1));
-
-                switch (upAxisAndSign.first)
-                {
-                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::X: {
-                    if (frontAxisAndSign.second == 1)
-                    {
-                        currentCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
-                            AZ::Vector4(0, -1, 0, 0),
-                            AZ::Vector4(1, 0, 0, 0),
-                            AZ::Vector4(0, 0, 1, 0),
-                            AZ::Vector4(0, 0, 0, 1));
-                    }
-                    else
-                    {
-                        currentCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
-                            AZ::Vector4(0, 1, 0, 0),
-                            AZ::Vector4(1, 0, 0, 0),
-                            AZ::Vector4(0, 0, -1, 0),
-                            AZ::Vector4(0, 0, 0, 1));
-                    }
-                }
-                break;
-                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Y: {
-                    if (frontAxisAndSign.second == 1)
-                    {
-                        currentCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
-                            AZ::Vector4(1, 0, 0, 0),
-                            AZ::Vector4(0, 1, 0, 0),
-                            AZ::Vector4(0, 0, 1, 0),
-                            AZ::Vector4(0, 0, 0, 1));
-                    }
-                    else
-                    {
-                        currentCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
-                            AZ::Vector4(-1, 0, 0, 0),
-                            AZ::Vector4(0, 1, 0, 0),
-                            AZ::Vector4(0, 0, -1, 0),
-                            AZ::Vector4(0, 0, 0, 1));
-                    }
-                }
-                break;
-                }
-                AZ::Matrix4x4 inverse = currentCoordMatrix.GetInverseTransform();
-                AZ::Matrix4x4 adjustmatrix = targetCoordMatrix * currentCoordMatrix.GetInverseTransform();
-                m_adjustTransform.reset(new DataTypes::MatrixType(AssImpSDKWrapper::AssImpTypeConverter::ToTransform(adjustmatrix)));
-                m_adjustTransformInverse.reset(new DataTypes::MatrixType(m_adjustTransform->GetInverseFull()));
-            }
-        }
-
-        void FbxSceneSystem::SwapVec3ForUpAxis(Vector3& swapVector) const
-        {
-            if (m_adjustTransform)
-            {
-                swapVector = *m_adjustTransform * swapVector;
-            }
-        }
-
-        void FbxSceneSystem::SwapTransformForUpAxis(DataTypes::MatrixType& inOutTransform) const
-        {
-            if (m_adjustTransform)
-            {
-                inOutTransform = (*m_adjustTransform * inOutTransform) * *m_adjustTransformInverse;
-            }
-        }
-
-        void FbxSceneSystem::ConvertUnit(Vector3& scaleVector) const
-        {
-            scaleVector *= m_unitSizeInMeters;
-        }
-
-        void FbxSceneSystem::ConvertUnit(DataTypes::MatrixType& inOutTransform) const
-        {
-            Vector3 translation = inOutTransform.GetTranslation();
-            translation *= m_unitSizeInMeters;
-            inOutTransform.SetTranslation(translation);
-        }
-
-        void FbxSceneSystem::ConvertBoneUnit(DataTypes::MatrixType& inOutTransform) const
-        {
-
-
-            // Need to scale translation explicitly as MultiplyByScale won't change the translation component
-            // and we need to convert to meter unit
-            Vector3 translation = inOutTransform.GetTranslation();
-            translation *= m_unitSizeInMeters;
-            inOutTransform.SetTranslation(translation);
-        }
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.h b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.h
deleted file mode 100644
index f5aa10e16a..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneBuilderConfiguration.h>
-#include <SceneAPI/SceneCore/DataTypes/MatrixType.h>
-
-namespace AZ
-{
-    class Vector3;
-
-    namespace SDKScene
-    {
-        class SceneWrapperBase;
-    }
-
-    namespace SceneAPI
-    {
-        class FBX_SCENE_BUILDER_API FbxSceneSystem
-        {
-        public:
-            FbxSceneSystem();
-
-            void Set(const SDKScene::SceneWrapperBase* sceneWrapper);
-            void SwapVec3ForUpAxis(Vector3& swapVector) const;
-            void SwapTransformForUpAxis(DataTypes::MatrixType& inOutTransform) const;
-            void ConvertUnit(Vector3& scaleVector) const;
-            void ConvertUnit(DataTypes::MatrixType& inOutTransform) const;
-            void ConvertBoneUnit(DataTypes::MatrixType& inOutTransform) const;
-
-            //! Get effect unit size in meters of this Fbx Scene, internally FBX saves it in the following manner
-            //! GlobalSettings:  {
-            //!     P : "UnitScaleFactor", "double", "Number", "", 2.54
-            float GetUnitSizeInMeters() const { return m_unitSizeInMeters; }
-            //! Get original unit size in meters of this Fbx Scene, internally FBX saves it in the following manner
-            //! GlobalSettings:  {
-            //!     P : "OriginalUnitScaleFactor", "double", "Number", "", 2.54
-            float GetOriginalUnitSizeInMeters() const { return m_originalUnitSizeInMeters; }
-
-        protected:
-            float m_unitSizeInMeters = 1;
-            float m_originalUnitSizeInMeters = 1;
-
-            AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-            AZStd::unique_ptr<DataTypes::MatrixType> m_adjustTransform;
-            AZStd::unique_ptr<DataTypes::MatrixType> m_adjustTransformInverse;
-            AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-        };
-    }
-};
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.cpp
deleted file mode 100644
index 2ce7a384ad..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            AssImpImportContext::AssImpImportContext(const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                const FbxSceneSystem& sourceSceneSystem,
-                AssImpSDKWrapper::AssImpNodeWrapper& sourceNode)
-                : m_sourceScene(sourceScene)
-                , m_sourceSceneSystem(sourceSceneSystem)
-                , m_sourceNode(sourceNode)
-            {
-            }
-
-            AssImpNodeEncounteredContext::AssImpNodeEncounteredContext(Containers::Scene& scene,
-                Containers::SceneGraph::NodeIndex currentGraphPosition,
-                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                const FbxSceneSystem& sourceSceneSystem,
-                RenamedNodesMap& nodeNameMap,
-                AssImpSDKWrapper::AssImpNodeWrapper& sourceNode)
-                : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode)
-                , NodeEncounteredContext(scene, currentGraphPosition, nodeNameMap)
-            {
-            }
-
-            AssImpNodeEncounteredContext::AssImpNodeEncounteredContext(
-                Events::ImportEventContext& parent,
-                Containers::SceneGraph::NodeIndex currentGraphPosition,
-                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                const FbxSceneSystem& sourceSceneSystem,
-                RenamedNodesMap& nodeNameMap,
-                AssImpSDKWrapper::AssImpNodeWrapper& sourceNode)
-                : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode)
-                , NodeEncounteredContext(parent.GetScene(), currentGraphPosition, nodeNameMap)
-            {
-            }
-
-            AssImpSceneDataPopulatedContext::AssImpSceneDataPopulatedContext(AssImpNodeEncounteredContext& parent,
-                const AZStd::shared_ptr<DataTypes::IGraphObject>& graphData, const AZStd::string& dataName)
-                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
-                , SceneDataPopulatedContextBase(parent, graphData, dataName)
-            {
-            }
-
-            AssImpSceneDataPopulatedContext::AssImpSceneDataPopulatedContext(Containers::Scene& scene,
-                Containers::SceneGraph::NodeIndex currentGraphPosition,
-                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                const FbxSceneSystem& sourceSceneSystem,
-                RenamedNodesMap& nodeNameMap,
-                AssImpSDKWrapper::AssImpNodeWrapper& sourceNode,
-                const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData, const AZStd::string& dataName)
-                : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode)
-                , SceneDataPopulatedContextBase(scene, currentGraphPosition, nodeNameMap, nodeData, dataName)
-            {
-            }
-
-            AssImpSceneNodeAppendedContext::AssImpSceneNodeAppendedContext(AssImpSceneDataPopulatedContext& parent,
-                Containers::SceneGraph::NodeIndex newIndex)
-                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
-                , SceneNodeAppendedContextBase(parent.m_scene, newIndex, parent.m_nodeNameMap)
-            {
-            }
-
-            AssImpSceneNodeAppendedContext::AssImpSceneNodeAppendedContext(Containers::Scene& scene,
-                Containers::SceneGraph::NodeIndex currentGraphPosition,
-                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                const FbxSceneSystem& sourceSceneSystem,
-                RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode)
-                : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode)
-                , SceneNodeAppendedContextBase(scene, currentGraphPosition, nodeNameMap)
-            {
-            }
-
-            AssImpSceneAttributeDataPopulatedContext::AssImpSceneAttributeDataPopulatedContext(AssImpSceneNodeAppendedContext& parent, const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData, const Containers::SceneGraph::NodeIndex attributeNodeIndex, const AZStd::string& dataName)
-                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
-                , SceneAttributeDataPopulatedContextBase(parent, nodeData, attributeNodeIndex, dataName)
-            {
-            }
-
-            AssImpSceneAttributeNodeAppendedContext::AssImpSceneAttributeNodeAppendedContext(AssImpSceneAttributeDataPopulatedContext& parent, Containers::SceneGraph::NodeIndex newIndex)
-                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
-                , SceneAttributeNodeAppendedContextBase(parent, newIndex)
-            {
-            }
-
-            AssImpSceneNodeAddedAttributesContext::AssImpSceneNodeAddedAttributesContext(AssImpSceneNodeAppendedContext& parent)
-                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
-                , SceneNodeAddedAttributesContextBase(parent)
-            {
-            }
-
-            AssImpSceneNodeFinalizeContext::AssImpSceneNodeFinalizeContext(AssImpSceneNodeAddedAttributesContext& parent)
-                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
-                , SceneNodeFinalizeContextBase(parent)
-            {
-            }
-
-            
-
-            AssImpFinalizeSceneContext::AssImpFinalizeSceneContext(Containers::Scene& scene,
-                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                const FbxSceneSystem& sourceSceneSystem,
-                RenamedNodesMap& nodeNameMap)
-                : FinalizeSceneContextBase(scene, nodeNameMap)
-                , m_sourceScene(sourceScene)
-                , m_sourceSceneSystem(sourceSceneSystem)
-            {
-            }
-
-        } // namespace SceneAPI
-    } // namespace FbxSceneBuilder
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h b/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h
deleted file mode 100644
index db8db25a01..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-
-namespace AZ
-{
-    namespace AssImpSDKWrapper
-    {
-        class AssImpNodeWrapper;
-        class AssImpSceneWrapper;
-    }
-    
-    namespace SceneAPI
-    {
-        class FbxSceneSystem;
-        namespace FbxSceneBuilder
-        {
-            class RenamedNodesMap;
-
-            //  AssImpImportContext
-            //  Base structure containing common data needed for all import contexts
-            //  Member Variables:
-            //      m_sourceNode - AssImp node being used for data processing.
-            struct AssImpImportContext
-            {
-                AZ_RTTI(AssImpImportContext, "{B1076AFF-991B-423C-8D3E-D5C9230434AB}");
-
-                AssImpImportContext(const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                    const FbxSceneSystem& sourceSceneSystem,
-                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode);
-
-                const AssImpSDKWrapper::AssImpSceneWrapper& m_sourceScene;
-                AssImpSDKWrapper::AssImpNodeWrapper& m_sourceNode;
-                const FbxSceneSystem& m_sourceSceneSystem; // Needed for unit and axis conversion
-            };
-
-            //  AssImpNodeEncounteredContext
-            //  Context pushed to indicate that a new AssImp Node has been found and any
-            //  importers that have means to process the contained data should do so
-            struct AssImpNodeEncounteredContext
-                : public AssImpImportContext
-                , public NodeEncounteredContext
-            {
-                AZ_RTTI(AssImpNodeEncounteredContext, "{C2305BC5-EAEC-4515-BAD6-45E63C3FBD3D}", AssImpImportContext, NodeEncounteredContext);
-
-                AssImpNodeEncounteredContext(Containers::Scene& scene,
-                    Containers::SceneGraph::NodeIndex currentGraphPosition,
-                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                    const FbxSceneSystem& sourceSceneSystem,
-                    RenamedNodesMap& nodeNameMap,
-                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode);
-
-                AssImpNodeEncounteredContext(Events::ImportEventContext& parent,
-                    Containers::SceneGraph::NodeIndex currentGraphPosition,
-                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                    const FbxSceneSystem& sourceSceneSystem,
-                    RenamedNodesMap& nodeNameMap,
-                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode);
-            };
-
-            //  AssImpSceneDataPopulatedContext
-            //  Context pushed to indicate that a piece of scene data has been fully 
-            //  processed and any importers that wish to place it within the scene graph
-            //  may now do so.
-            struct AssImpSceneDataPopulatedContext
-                : public AssImpImportContext
-                , public SceneDataPopulatedContextBase
-            {
-                AZ_RTTI(AssImpSceneDataPopulatedContext, "{888DA37E-4234-4990-AD50-E6E54AFA9C35}", AssImpImportContext, SceneDataPopulatedContextBase);
-
-                AssImpSceneDataPopulatedContext(AssImpNodeEncounteredContext& parent,
-                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
-                    const AZStd::string& dataName);
-
-                AssImpSceneDataPopulatedContext(Containers::Scene& scene,
-                    Containers::SceneGraph::NodeIndex currentGraphPosition,
-                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                    const FbxSceneSystem& sourceSceneSystem,
-                    RenamedNodesMap& nodeNameMap,
-                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode,
-                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
-                    const AZStd::string& dataName);
-            };
-
-            //  AssImpSceneNodeAppendedContext
-            //  Context pushed to indicate that data has been added to the scene graph. 
-            //  Generally created due to the insertion of a node during SceneDataPopulatedContext
-            //  processing.
-            struct AssImpSceneNodeAppendedContext
-                : public AssImpImportContext
-                , public SceneNodeAppendedContextBase
-            {
-                AZ_RTTI(AssImpSceneNodeAppendedContext, "{9C8B688E-8ECD-4EF0-9AC6-21BBCFE8F5A3}", AssImpImportContext, SceneNodeAppendedContextBase);
-
-                AssImpSceneNodeAppendedContext(AssImpSceneDataPopulatedContext& parent, Containers::SceneGraph::NodeIndex newIndex);
-                AssImpSceneNodeAppendedContext(Containers::Scene& scene,
-                    Containers::SceneGraph::NodeIndex currentGraphPosition,
-                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                    const FbxSceneSystem& sourceSceneSystem,
-                    RenamedNodesMap& nodeNameMap,
-                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode);
-            };
-
-            // AssImpSceneAttributeDataPopulatedContext
-            // Context pushed to indicate that attribute data has been found and processed
-            struct AssImpSceneAttributeDataPopulatedContext
-                : public AssImpImportContext
-                , public SceneAttributeDataPopulatedContextBase
-            {
-                AZ_RTTI(AssImpSceneAttributeDataPopulatedContext, "{A5EFB485-2F36-4214-972B-0EFF4EFBF33D}", AssImpImportContext, SceneAttributeDataPopulatedContextBase);
-
-                AssImpSceneAttributeDataPopulatedContext(AssImpSceneNodeAppendedContext& parent,
-                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
-                    const Containers::SceneGraph::NodeIndex attributeNodeIndex,const AZStd::string& dataName);
-            };
-
-            // AssImpSceneAttributeNodeAppendedContext
-            // Context pushed to indicate that an attribute node has been added to the scene graph
-            struct AssImpSceneAttributeNodeAppendedContext
-                : public AssImpImportContext
-                , public SceneAttributeNodeAppendedContextBase
-            {
-                AZ_RTTI(AssImpSceneAttributeNodeAppendedContext, "{96FDC405-2D3B-4030-A301-B3A2B5432498}", AssImpImportContext, SceneAttributeNodeAppendedContextBase);
-
-                AssImpSceneAttributeNodeAppendedContext(AssImpSceneAttributeDataPopulatedContext& parent, Containers::SceneGraph::NodeIndex newIndex);
-            };
-
-            //  AssImpSceneNodeAddedAttributesContext
-            //  Context pushed to indicate that all attribute processors have completed their
-            //  work for a specific data node.
-            struct AssImpSceneNodeAddedAttributesContext
-                : public AssImpImportContext
-                , public SceneNodeAddedAttributesContextBase
-            {
-                AZ_RTTI(AssImpSceneNodeAddedAttributesContext, "{D305EAA5-5F16-4AAD-805D-DF07A1B355B9}", AssImpImportContext, SceneNodeAddedAttributesContextBase);
-
-                AssImpSceneNodeAddedAttributesContext(AssImpSceneNodeAppendedContext& parent);
-            };
-
-            //  AssImpSceneNodeFinalizeContext
-            //  Context pushed last after all other contexts for a scene node to allow any
-            //  post-processing needed for an importer.
-            struct AssImpSceneNodeFinalizeContext
-                : public AssImpImportContext
-                , public SceneNodeFinalizeContextBase
-            {
-                AZ_RTTI(AssImpSceneNodeFinalizeContext, "{FD8B4AD5-3735-4D55-9455-504AB1DCA655}", AssImpImportContext, SceneNodeFinalizeContextBase);
-
-                AssImpSceneNodeFinalizeContext(AssImpSceneNodeAddedAttributesContext& parent);
-            };
-
-            //  AssImpFinalizeSceneContext
-            //  Context pushed after the scene has been fully created. This can be used to finalize pending work
-            //  such as resolving named links.
-            struct AssImpFinalizeSceneContext
-                : public FinalizeSceneContextBase
-            {
-                AZ_RTTI(AssImpFinalizeSceneContext, "{6B23A54A-44BF-4661-A130-6B4D06A57B9F}", FinalizeSceneContextBase);
-
-                AssImpFinalizeSceneContext(
-                    Containers::Scene& scene,
-                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
-                    const FbxSceneSystem& sourceSceneSystem,
-                    RenamedNodesMap& nodeNameMap);
-
-                const AssImpSDKWrapper::AssImpSceneWrapper& m_sourceScene;
-                const FbxSceneSystem& m_sourceSceneSystem; // Needed for unit and axis conversion
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
-
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.cpp
deleted file mode 100644
index 2e3a2803f0..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h>
-#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            ImportContext::ImportContext(Containers::Scene& scene,
-                Containers::SceneGraph::NodeIndex currentGraphPosition,
-                RenamedNodesMap& nodeNameMap)
-                : m_scene(scene)
-                , m_currentGraphPosition(currentGraphPosition)
-                , m_nodeNameMap(nodeNameMap)
-            {
-            }
-
-            ImportContext::ImportContext(Containers::Scene& scene, RenamedNodesMap& nodeNameMap)
-                : m_scene(scene)
-                , m_nodeNameMap(nodeNameMap)
-            {
-                m_currentGraphPosition = Containers::SceneGraph::NodeIndex();
-            }
-
-            NodeEncounteredContext::NodeEncounteredContext(Containers::Scene& scene,
-                Containers::SceneGraph::NodeIndex currentGraphPosition,
-                RenamedNodesMap& nodeNameMap)
-                : ImportContext(scene, currentGraphPosition, nodeNameMap)
-            {
-            }
-
-            NodeEncounteredContext::NodeEncounteredContext(
-                Events::ImportEventContext& parent, Containers::SceneGraph::NodeIndex currentGraphPosition,
-                RenamedNodesMap& nodeNameMap)
-                : ImportContext(parent.GetScene(), currentGraphPosition, nodeNameMap)
-            {
-            }
-
-            SceneDataPopulatedContextBase::SceneDataPopulatedContextBase(NodeEncounteredContext& parent,
-                const AZStd::shared_ptr<DataTypes::IGraphObject>& graphData, const AZStd::string& dataName)
-                : ImportContext(parent.m_scene, parent.m_currentGraphPosition, parent.m_nodeNameMap)
-                , m_graphData(graphData)
-                , m_dataName(dataName)
-            {
-            }
-
-            SceneDataPopulatedContextBase::SceneDataPopulatedContextBase(Containers::Scene& scene,
-                Containers::SceneGraph::NodeIndex currentGraphPosition,
-                RenamedNodesMap& nodeNameMap,
-                const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData, const AZStd::string& dataName)
-                : ImportContext(scene, currentGraphPosition, nodeNameMap)
-                , m_graphData(nodeData)
-                , m_dataName(dataName)
-            {
-            }
-
-            SceneNodeAppendedContextBase::SceneNodeAppendedContextBase(SceneDataPopulatedContextBase& parent,
-                Containers::SceneGraph::NodeIndex newIndex)
-                : ImportContext(parent.m_scene, newIndex, parent.m_nodeNameMap)
-            {
-            }
-
-            SceneNodeAppendedContextBase::SceneNodeAppendedContextBase(Containers::Scene& scene,
-                Containers::SceneGraph::NodeIndex currentGraphPosition, RenamedNodesMap& nodeNameMap)
-                : ImportContext(scene, currentGraphPosition, nodeNameMap)
-            {
-            }
-
-            SceneAttributeDataPopulatedContextBase::SceneAttributeDataPopulatedContextBase(SceneNodeAppendedContextBase& parent,
-                const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
-                const Containers::SceneGraph::NodeIndex attributeNodeIndex, const AZStd::string& dataName)
-                : ImportContext(parent.m_scene, attributeNodeIndex, parent.m_nodeNameMap)
-                , m_graphData(nodeData)
-                , m_dataName(dataName)
-            {
-            }
-
-            SceneAttributeNodeAppendedContextBase::SceneAttributeNodeAppendedContextBase(SceneAttributeDataPopulatedContextBase& parent, Containers::SceneGraph::NodeIndex newIndex)
-                : ImportContext(parent.m_scene, newIndex, parent.m_nodeNameMap)
-            {
-            }
-
-            SceneNodeAddedAttributesContextBase::SceneNodeAddedAttributesContextBase(SceneNodeAppendedContextBase& parent)
-                : ImportContext(parent.m_scene, parent.m_currentGraphPosition, parent.m_nodeNameMap)
-            {
-            }
-
-            SceneNodeFinalizeContextBase::SceneNodeFinalizeContextBase(SceneNodeAddedAttributesContextBase& parent)
-                : ImportContext(parent.m_scene, parent.m_currentGraphPosition, parent.m_nodeNameMap)
-            {
-            }
-
-            FinalizeSceneContextBase::FinalizeSceneContextBase(Containers::Scene& scene, RenamedNodesMap& nodeNameMap)
-                : ImportContext(scene, nodeNameMap)
-            {
-            }
-        } // namespace SceneAPI
-    } // namespace FbxSceneBuilder
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h b/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h
deleted file mode 100644
index 9a63305d16..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-
-
-namespace AZ
-{    
-    namespace SceneAPI
-    {
-        namespace Containers
-        {
-            class Scene;
-        }
-
-        namespace DataTypes
-        {
-            class IGraphObject;
-        }
-
-        namespace Events
-        {
-            class ImportEventContext;
-        }
-
-        namespace FbxSceneBuilder
-        {
-            class RenamedNodesMap;
-
-            //  ImportContext
-            //  Base structure containing common data needed for all import contexts
-            struct ImportContext
-                : public Events::ICallContext
-            {
-                AZ_RTTI(ImportContext, "{68E546D5-9B79-4293-AD37-4A4BA688892F}", Events::ICallContext);
-
-                ImportContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, 
-                    RenamedNodesMap& nodeNameMap);
-                ImportContext(Containers::Scene& scene, RenamedNodesMap& nodeNameMap);
-
-                Containers::Scene& m_scene;
-                Containers::SceneGraph::NodeIndex m_currentGraphPosition;
-                RenamedNodesMap& m_nodeNameMap; // Map of the nodes that have received a new name.
-            };
-
-            //  NodeEncounteredContext
-            //  Context pushed to indicate that a new Node has been found and any
-            //  importers that have means to process the contained data should do so
-            //  Member Variables:
-            //      m_createdData - out container that importers must add their created data
-            //          to.
-            struct NodeEncounteredContext
-                : public ImportContext
-            {
-                AZ_RTTI(NodeEncounteredContext, "{40C31D76-7101-4ACD-8849-0D6D0AF62855}", ImportContext);
-
-                NodeEncounteredContext(Containers::Scene& scene,
-                    Containers::SceneGraph::NodeIndex currentGraphPosition,
-                    RenamedNodesMap& nodeNameMap);
-
-                NodeEncounteredContext(Events::ImportEventContext& parent,
-                    Containers::SceneGraph::NodeIndex currentGraphPosition,
-                    RenamedNodesMap& nodeNameMap);
-
-                AZStd::vector<AZStd::shared_ptr<DataTypes::IGraphObject>> m_createdData;
-            };
-
-            //  SceneDataPopulatedContextBase
-            //  Context pushed to indicate that a piece of scene data has been fully 
-            //  processed and any importers that wish to place it within the scene graph
-            //  may now do so.
-            //  Member Variables:
-            //      m_graphData - the piece of data that should be inserted in the graph
-            //      m_dataName - the name that should be used as the basis for the scene node
-            //          name
-            struct SceneDataPopulatedContextBase
-                : public ImportContext
-            {
-                AZ_RTTI(SceneDataPopulatedContextBase, "{5F4CE8D2-EEAC-49F7-8065-0B6372162D6F}", ImportContext);
-
-                SceneDataPopulatedContextBase(NodeEncounteredContext& parent,
-                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
-                    const AZStd::string& dataName);
-
-                SceneDataPopulatedContextBase(Containers::Scene& scene,
-                    Containers::SceneGraph::NodeIndex currentGraphPosition,
-                    RenamedNodesMap& nodeNameMap,
-                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData, const AZStd::string& dataName);
-
-                const AZStd::shared_ptr<DataTypes::IGraphObject>& m_graphData;
-                const AZStd::string m_dataName;
-            };
-
-            //  SceneNodeAppendedContextBase
-            //  Context pushed to indicate that data has been added to the scene graph. 
-            //  Generally created due to the insertion of a node during SceneDataPopulatedContextBase
-            //  processing.
-            struct SceneNodeAppendedContextBase
-                : public ImportContext
-            {
-                AZ_RTTI(SceneNodeAppendedContextBase, "{0A69FB6C-2B1B-46E7-AEC3-C4B8ABBFDD69}", ImportContext);
-
-                SceneNodeAppendedContextBase(SceneDataPopulatedContextBase& parent, Containers::SceneGraph::NodeIndex newIndex);
-                SceneNodeAppendedContextBase(Containers::Scene& scene,
-                    Containers::SceneGraph::NodeIndex currentGraphPosition, RenamedNodesMap& nodeNameMap);
-            };
-
-            // SceneAttributeDataPopulatedContextBase
-            // Context pushed to indicate that attribute data has been found and processed
-            struct SceneAttributeDataPopulatedContextBase
-                : public ImportContext
-            {
-                AZ_RTTI(SceneAttributeDataPopulatedContextBase, "{DA133E14-0770-435B-9A4E-38679367F56C}", ImportContext);
-
-                SceneAttributeDataPopulatedContextBase(SceneNodeAppendedContextBase& parent,
-                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
-                    const Containers::SceneGraph::NodeIndex attributeNodeIndex, const AZStd::string& dataName);
-
-                const AZStd::shared_ptr<DataTypes::IGraphObject>& m_graphData;
-                const AZStd::string m_dataName;
-            };
-
-            // SceneAttributeNodeAppendedContextBase
-            // Context pushed to indicate that an attribute node has been added to the scene graph
-            struct SceneAttributeNodeAppendedContextBase
-                : public ImportContext
-            {
-                AZ_RTTI(SceneAttributeNodeAppendedContextBase, "{8A382A1E-CFE7-47D2-BA5B-CFDF1FB9F03D}", ImportContext);
-
-                SceneAttributeNodeAppendedContextBase(SceneAttributeDataPopulatedContextBase& parent,
-                    Containers::SceneGraph::NodeIndex newIndex);
-            };
-
-            //  SceneNodeAddedAttributesContextBase
-            //  Context pushed to indicate that all attribute processors have completed their
-            //  work for a specific data node.
-            struct SceneNodeAddedAttributesContextBase
-                : public ImportContext
-            {
-                AZ_RTTI(SceneNodeAddedAttributesContextBase, "{65B97E48-16A0-4BBD-B364-CFDA9E3600B6}", ImportContext);
-
-                SceneNodeAddedAttributesContextBase(SceneNodeAppendedContextBase& parent);
-            };
-
-            //  SceneNodeFinalizeContextBase
-            //  Context pushed last after all other contexts for a scene node to allow any
-            //  post-processing needed for an importer.
-            struct SceneNodeFinalizeContextBase
-                : public ImportContext
-            {
-                AZ_RTTI(SceneNodeFinalizeContextBase, "{F2C7D1BC-8065-423E-9212-241EB426A2BB}", ImportContext);
-
-                SceneNodeFinalizeContextBase(SceneNodeAddedAttributesContextBase& parent);
-            };
-
-            //  FinalizeSceneContextBase
-            //  Context pushed after the scene has been fully created. This can be used to finalize pending work
-            //  such as resolving named links.
-            struct FinalizeSceneContextBase
-                : public ImportContext
-            {
-                AZ_RTTI(FinalizeSceneContextBase, "{91C54F51-9B4D-4C61-956C-9D530725D737}", ImportContext);
-
-                FinalizeSceneContextBase(Containers::Scene& scene, RenamedNodesMap& nodeNameMap);
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
-
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.cpp
deleted file mode 100644
index e5dd401c5f..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.cpp
+++ /dev/null
@@ -1,675 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include <AssImpTypeConverter.h>
-#include <assimp/mesh.h>
-#include <assimp/scene.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/algorithm.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneSystem.h>
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneData/GraphData/AnimationData.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            const char* AssImpAnimationImporter::s_animationNodeName = "animation";
-
-            // Downstream only supports 30 frames per second sample rate. Adjusting to 60 doubles the
-            // length of the animations, they still play back at 30 frames per second.
-            const double AssImpAnimationImporter::s_defaultTimeStepBetweenFrames = 1.0 / 30.0;
-
-            AZ::u32 GetNumKeyFrames(AZ::u32 keysSize, double duration, double ticksPerSecond)
-            {
-                if (AZ::IsClose(ticksPerSecond, 0))
-                {
-                    AZ_Warning("AnimationImporter", false, "Animation ticks per second should not be zero, defaulting to %d keyframes for animation.", keysSize);
-                    return keysSize;
-                }
-
-                const double totalTicks = duration / ticksPerSecond;
-                AZ::u32 numKeys = keysSize;
-                // +1 because the animation is from [0, duration] - we have a keyframe at the end of the duration which needs to be included
-                double totalFramesAtDefaultTimeStep = totalTicks / AssImpAnimationImporter::s_defaultTimeStepBetweenFrames + 1;
-                if (!AZ::IsClose(totalFramesAtDefaultTimeStep, numKeys, 1))
-                {
-                    numKeys = AZStd::ceilf(totalFramesAtDefaultTimeStep);
-                }
-                return numKeys;
-            }
-
-            double GetTimeForFrame(AZ::u32 frame, double ticksPerSecond)
-            {
-                return frame * AssImpAnimationImporter::s_defaultTimeStepBetweenFrames * ticksPerSecond;
-            }
-
-            // Helper class to store key data, when translating from AssImp layout to the engine's scene format.
-            struct KeyData
-            {
-                KeyData(float value, float time) :
-                    mValue(value),
-                    mTime(time)
-                {
-
-                }
-
-                bool operator<(const KeyData& other) const
-                {
-                    return mTime < other.mTime;
-                }
-
-                float mValue = 0;
-                float mTime = 0;
-            };
-
-            template<class T>
-            void LerpTemplate(T& start, const T& end, float t)
-            {
-                start = start * (1.0f - t) + end * t;
-            }
-
-            template<>
-            void LerpTemplate(aiQuaternion& start, const aiQuaternion& end, float t)
-            {
-                aiQuaternion::Interpolate(start, start, end, t);
-            }
-
-            template<>
-            void LerpTemplate(float& start, const float& end, float t)
-            {
-                start = AZ::Lerp(start, end, t);
-            }
-
-            template<class KeyContainerType, class FrameValueType>
-            bool SampleKeyFrame(FrameValueType& result, const KeyContainerType& keys, AZ::u32 numKeys, double time, AZ::u32& lastIndex)
-            {
-                if (numKeys == 0)
-                {
-                    AZ_Error("AnimationImporter", numKeys > 0, "Animation key set must have at least 1 key");
-                    return false;
-                }
-                if (numKeys == 1)
-                {
-                    result = keys[0].mValue;
-                    return true;
-                }
-
-                while (lastIndex < numKeys - 1 && time >= keys[lastIndex + 1].mTime)
-                {
-                    ++lastIndex;
-                }
-                result = keys[lastIndex].mValue;
-                if (lastIndex < numKeys - 1)
-                {
-                    auto nextValue = keys[lastIndex + 1].mValue;
-                    float normalizedTimeBetweenFrames = 0;
-                    if (keys[lastIndex + 1].mTime != keys[lastIndex].mTime)
-                    {
-                        normalizedTimeBetweenFrames =
-                            (time - keys[lastIndex].mTime) / (keys[lastIndex + 1].mTime - keys[lastIndex].mTime);
-                    }
-                    else
-                    {
-                        AZ_Warning("AnimationImporter", false,
-                            "Animation has keys with duplicate time %5.5f, at indices %d and %d. The second will be ignored.",
-                            keys[lastIndex].mTime,
-                            lastIndex,
-                            lastIndex + 1);
-                    }
-                    LerpTemplate(result, nextValue, normalizedTimeBetweenFrames);
-                }
-                return true;
-            }
-
-            AssImpAnimationImporter::AssImpAnimationImporter()
-            {
-                BindToCall(&AssImpAnimationImporter::ImportAnimation);
-            }
-
-            void AssImpAnimationImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpAnimationImporter, SceneCore::LoadingComponent>()->Version(5); // [LYN-4226] Invert PostRotation matrix in animation chains
-                }
-            }
-
-            AZStd::string GetName(const aiMeshAnim* anim)
-            {
-                return anim->mName.C_Str();
-            }
-
-            AZStd::string GetName(const aiNodeAnim* anim)
-            {
-                return anim->mNodeName.C_Str();
-            }
-
-            AZStd::string GetName(const aiMeshMorphAnim* anim)
-            {
-                return anim->mName.C_Str();
-            }
-
-            struct ConsolidatedNodeAnim
-            {
-                ConsolidatedNodeAnim() = default;
-                ConsolidatedNodeAnim(const ConsolidatedNodeAnim& other) = delete;
-
-                ConsolidatedNodeAnim(ConsolidatedNodeAnim&& other) noexcept
-                    : mNumPositionKeys{ other.mNumPositionKeys },
-                      mPositionKeys{ other.mPositionKeys },
-                      mNumRotationKeys{ other.mNumRotationKeys },
-                      mRotationKeys{ other.mRotationKeys },
-                      mNumScalingKeys{ other.mNumScalingKeys },
-                      mScalingKeys{ other.mScalingKeys },
-                      m_ownedPositionKeys{ std::move(other.m_ownedPositionKeys) },
-                      m_ownedScalingKeys{ std::move(other.m_ownedScalingKeys) },
-                      m_ownedRotationKeys{ std::move(other.m_ownedRotationKeys) },
-                      mPreState{ other.mPreState },
-                      mPostState{ other.mPostState }
-                {
-                }
-
-                ConsolidatedNodeAnim& operator=(const ConsolidatedNodeAnim& other) = delete;
-
-                ConsolidatedNodeAnim& operator=(ConsolidatedNodeAnim&& other) noexcept
-                {
-                    if (this == &other)
-                    {
-                        return *this;
-                    }
-
-                    mNumPositionKeys = other.mNumPositionKeys;
-                    mPositionKeys = other.mPositionKeys;
-                    mNumRotationKeys = other.mNumRotationKeys;
-                    mRotationKeys = other.mRotationKeys;
-                    mNumScalingKeys = other.mNumScalingKeys;
-                    mScalingKeys = other.mScalingKeys;
-                    m_ownedPositionKeys = std::move(other.m_ownedPositionKeys);
-                    m_ownedScalingKeys = std::move(other.m_ownedScalingKeys);
-                    m_ownedRotationKeys = std::move(other.m_ownedRotationKeys);
-                    mPreState = other.mPreState;
-                    mPostState = other.mPostState;
-
-                    return *this;
-                }
-
-                // These variables are named using AssImp naming convention for consistency
-                AZ::u32 mNumPositionKeys{};
-                aiVectorKey* mPositionKeys{};
-                
-                AZ::u32 mNumRotationKeys{};
-                aiQuatKey* mRotationKeys{};
-
-                AZ::u32 mNumScalingKeys{};
-                aiVectorKey* mScalingKeys{};
-                
-                AZStd::vector<aiVectorKey> m_ownedPositionKeys{};
-                AZStd::vector<aiVectorKey> m_ownedScalingKeys{};
-                AZStd::vector<aiQuatKey> m_ownedRotationKeys{};
-
-                aiAnimBehaviour mPreState{};
-                aiAnimBehaviour mPostState{};
-            };
-
-            AZStd::pair<const aiAnimation*, ConsolidatedNodeAnim> MakeMyPair(const aiAnimation* animation, const aiNodeAnim* anim)
-            {
-                ConsolidatedNodeAnim consolidatedNodeAnim{};
-
-                consolidatedNodeAnim.mNumRotationKeys = anim->mNumRotationKeys;
-                consolidatedNodeAnim.mNumPositionKeys = anim->mNumPositionKeys;
-                consolidatedNodeAnim.mNumScalingKeys = anim->mNumScalingKeys;
-                consolidatedNodeAnim.mRotationKeys = anim->mRotationKeys;
-                consolidatedNodeAnim.mPositionKeys = anim->mPositionKeys;
-                consolidatedNodeAnim.mScalingKeys = anim->mScalingKeys;
-                
-                return {animation, AZStd::move(consolidatedNodeAnim)};
-            }
-
-            auto MakeMyPair(const aiAnimation* animation, const aiMeshAnim* anim)
-            {
-                return AZStd::make_pair(animation, anim);
-            }
-
-            auto MakeMyPair(const aiAnimation* animation, const aiMeshMorphAnim* anim)
-            {
-                return AZStd::make_pair(animation, anim);
-            }
-            Events::ProcessingResult AssImpAnimationImporter::ImportAnimation(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", "Animation");
-
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                // Add check for animation layers at the scene level.
-                
-                if (!scene->HasAnimations() || IsPivotNode(currentNode->mName))
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                AZStd::unordered_multimap<AZStd::string, AZStd::pair<const aiAnimation*, ConsolidatedNodeAnim>> boneAnimations;
-                typedef AZStd::pair<const aiAnimation*, const aiMeshMorphAnim*> AnimAndMorphAnim;
-                typedef AZStd::unordered_map<AZStd::string, AnimAndMorphAnim> ChannelToMorphAnim;
-                typedef AZStd::unordered_map<AZStd::string, ChannelToMorphAnim> NodeToChannelToMorphAnim;
-                NodeToChannelToMorphAnim meshMorphAnimations;
-
-                // Goes through all the animation channels of a given type and adds them to a map so we can easily find
-                // all the animations for a given node
-                // In the case of bone animations, the data is copied into a ConsolidatedNodeAnim so we can
-                // do fix-ups later without affecting the original data
-                auto mapAnimationsFunc = [](AZ::u32 numChannels, auto** channels, const aiAnimation* animation, auto& map)
-                {
-                    map.reserve(numChannels);
-
-                    for (AZ::u32 channelIndex = 0; channelIndex < numChannels; ++channelIndex)
-                    {
-                        auto* nodeAnim = channels[channelIndex];
-                        AZStd::string name = GetName(nodeAnim);
-
-                        map.emplace(name, MakeMyPair(animation, nodeAnim));
-                    }
-                };
-
-                for (AZ::u32 animIndex = 0; animIndex < scene->mNumAnimations; ++animIndex)
-                {
-                    const aiAnimation* animation = scene->mAnimations[animIndex];
-                    if (animation->mTicksPerSecond == 0)
-                    {
-                        AZ_Error(
-                            "AnimationImporter", false,
-                            "Animation name %s has a sample rate of 0 ticks per second and cannot be processed.",
-                            animation->mName.C_Str());
-                        return Events::ProcessingResult::Failure;
-                    }
-                    
-                    mapAnimationsFunc(animation->mNumChannels, animation->mChannels, animation, boneAnimations);
-
-                    for (AZ::u32 channelIndex = 0; channelIndex < animation->mNumMorphMeshChannels; ++channelIndex)
-                    {
-                        auto* nodeAnim = animation->mMorphMeshChannels[channelIndex];
-                        AZStd::string name = GetName(nodeAnim);
-
-                        AZStd::vector<AZStd::string> meshNodeNameAndChannel;
-
-                        // Morph target animations include the channel in the name,
-                        // so if a mesh is named Mesh01, the morph target for the first channel
-                        // will be named Mesh01*0
-                        AZ::StringFunc::Tokenize(name, meshNodeNameAndChannel, '*');
-
-                        if (meshNodeNameAndChannel.size() != 2)
-                        {
-                            AZ_Error(
-                                "AnimationImporter", false,
-                                "Morph animation name %s was not in the expected format of: node name, asterisk, node channel. "
-                                "Example: 'NodeName*0'",
-                                name.c_str());
-                            continue;
-                        }
-
-                        AZStd::string meshNodeName(meshNodeNameAndChannel[0]);
-                        AZStd::string channel(meshNodeNameAndChannel[1]);
-                        meshMorphAnimations[meshNodeName][channel] = AnimAndMorphAnim(animation, nodeAnim);
-                    }
-                }
-
-                // Go through all the bone animations and find any that reference a pivot node
-                // We'll make a new node anim and store all the combined animation channels there
-                // with the name set to the base bone name
-                decltype(boneAnimations) combinedAnimations;
-
-                for (auto&& animation : boneAnimations)
-                {
-                    size_t pos = AZ::StringFunc::Find(animation.first, PivotNodeMarker, 0);
-                    
-                    if (pos != animation.first.npos)
-                    {
-                        AZStd::string_view name, part;
-                        SplitPivotNodeName(aiString(animation.first.c_str()), pos, name, part);
-                        
-                        auto&& iterator = combinedAnimations.find(name);
-                    
-                        if (iterator == combinedAnimations.end())
-                        {
-                            combinedAnimations.emplace(AZStd::string(name), AZStd::move(animation.second));
-                            iterator = combinedAnimations.find(name);
-                        }
-                    
-                        if (iterator != combinedAnimations.end())
-                        {
-                            auto& existingNode = iterator->second.second;
-                            auto&& src = animation.second.second;
-                            
-                            if (part == "Translation")
-                            {
-                                existingNode.mNumPositionKeys = src.mNumPositionKeys;
-                                existingNode.mPositionKeys = src.mPositionKeys;
-                            }
-                            else if (part == "Rotation")
-                            {
-                                existingNode.mNumRotationKeys = src.mNumRotationKeys;
-                                existingNode.mRotationKeys = src.mRotationKeys;
-                            }
-                            else if (part == "Scaling")
-                            {
-                                existingNode.mNumScalingKeys = src.mNumScalingKeys;
-                                existingNode.mScalingKeys = src.mScalingKeys;
-                            }
-                        }
-                    }
-                }
-
-                if (!combinedAnimations.empty())
-                {
-                    boneAnimations.swap(combinedAnimations);
-                }
-
-                Events::ProcessingResultCombiner combinedAnimationResult;
-                if (context.m_sourceNode.ContainsMesh())
-                {
-                    const aiMesh* firstMesh = scene->mMeshes[currentNode->mMeshes[0]];
-                    if (NodeToChannelToMorphAnim::iterator channelsForMeshName = meshMorphAnimations.find(firstMesh->mName.C_Str());
-                        channelsForMeshName != meshMorphAnimations.end())
-                    {
-                        const auto [nodeIterName, channels] = *channelsForMeshName;
-                        for (const auto& [channel, animAndMorphAnim] : channels)
-                        {
-                            const auto& [animation, morphAnimation] = animAndMorphAnim;
-                            combinedAnimationResult += ImportBlendShapeAnimation(
-                                context, animation, morphAnimation, firstMesh);
-                        }
-                    }
-                }
-
-                AZStd::string nodeName = s_animationNodeName;
-                RenamedNodesMap::SanitizeNodeName(nodeName, context.m_scene.GetGraph(), context.m_currentGraphPosition);
-                AZ_TraceContext("Animation node name", nodeName);
-
-                // If there are no bone animations, but there are mesh animations,
-                // then a stub animation needs to be created so the exporter can create the exported morph target animation.
-                if (boneAnimations.empty() && !meshMorphAnimations.empty())
-                {
-                    const aiAnimation* animation = scene->mAnimations[0];
-                    for (AZ::u32 channelIndex = 0; channelIndex < animation->mNumMorphMeshChannels; ++channelIndex)
-                    {
-                        const aiMeshMorphAnim* nodeAnim = animation->mMorphMeshChannels[channelIndex];
-                        // Morph animations need a regular animation on the node, as well.
-                        // If there is no bone animation on the current node, then generate one here.
-                        AZStd::shared_ptr<SceneData::GraphData::AnimationData> createdAnimationData =
-                            AZStd::make_shared<SceneData::GraphData::AnimationData>();
-
-                        const size_t numKeyframes = GetNumKeyFrames(
-                            nodeAnim->mNumKeys,
-                            animation->mDuration,
-                            animation->mTicksPerSecond);
-                        createdAnimationData->ReserveKeyFrames(numKeyframes);
-
-                        const double timeStepBetweenFrames = 1.0 / animation->mTicksPerSecond;
-                        createdAnimationData->SetTimeStepBetweenFrames(timeStepBetweenFrames);
-
-                        // Set every frame of the animation to the start location of the node.
-                        aiMatrix4x4 combinedTransform = GetConcatenatedLocalTransform(currentNode);
-                        DataTypes::MatrixType localTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(combinedTransform);
-                        context.m_sourceSceneSystem.SwapTransformForUpAxis(localTransform);
-                        context.m_sourceSceneSystem.ConvertUnit(localTransform);
-                        for (AZ::u32 time = 0; time <= numKeyframes; ++time)
-                        {
-                            createdAnimationData->AddKeyFrame(localTransform);
-                        }
-
-                        const AZStd::string stubBoneAnimForMorphName(AZStd::string::format("%s%s", nodeName.c_str(), nodeAnim->mName.C_Str()));
-                        Containers::SceneGraph::NodeIndex addNode = context.m_scene.GetGraph().AddChild(
-                            context.m_currentGraphPosition, stubBoneAnimForMorphName.c_str(), AZStd::move(createdAnimationData));
-                        context.m_scene.GetGraph().MakeEndPoint(addNode);
-                    }
-                    
-                    return combinedAnimationResult.GetResult();
-                }
-
-                AZStd::unordered_set<AZStd::string> boneList;
-
-                for (int meshIndex = 0; meshIndex < scene->mNumMeshes; ++meshIndex)
-                {
-                    aiMesh* mesh = scene->mMeshes[meshIndex];
-
-                    for (int boneIndex = 0; boneIndex < mesh->mNumBones; ++boneIndex)
-                    {
-                        aiBone* bone = mesh->mBones[boneIndex];
-
-                        boneList.insert(bone->mName.C_Str());
-                    }
-                }
-
-                decltype(boneAnimations) fillerAnimations;
-
-                // Go through all the animations and make sure we create placeholder animations for any bones missing them
-                for (auto&& anim : boneAnimations)
-                {
-                    for (auto boneName : boneList)
-                    {
-                        if (!IsPivotNode(aiString(boneName.c_str())))
-                        {
-                            if (!boneAnimations.contains(boneName) &&
-                                !fillerAnimations.contains(boneName))
-                            {
-                                // Create 1 key for each type that just copies the current transform
-                                ConsolidatedNodeAnim emptyAnimation;
-                                auto node = scene->mRootNode->FindNode(boneName.c_str());
-                                aiMatrix4x4 globalTransform = GetConcatenatedLocalTransform(node);
-
-                                aiVector3D position, scale;
-                                aiQuaternion rotation;
-
-                                globalTransform.Decompose(scale, rotation, position);
-
-                                emptyAnimation.mNumRotationKeys = emptyAnimation.mNumPositionKeys = emptyAnimation.mNumScalingKeys = 1;
-
-                                emptyAnimation.m_ownedPositionKeys.emplace_back(0, position);
-                                emptyAnimation.mPositionKeys = emptyAnimation.m_ownedPositionKeys.data();
-
-                                emptyAnimation.m_ownedRotationKeys.emplace_back(0, rotation);
-                                emptyAnimation.mRotationKeys = emptyAnimation.m_ownedRotationKeys.data();
-
-                                emptyAnimation.m_ownedScalingKeys.emplace_back(0, scale);
-                                emptyAnimation.mScalingKeys = emptyAnimation.m_ownedScalingKeys.data();
-                                
-                                fillerAnimations.insert(
-                                    AZStd::make_pair(boneName, AZStd::make_pair(anim.second.first, AZStd::move(emptyAnimation))));
-                            }
-                        }
-                    }
-                }
-
-                boneAnimations.insert(AZStd::make_move_iterator(fillerAnimations.begin()), AZStd::make_move_iterator(fillerAnimations.end()));
-
-                auto animItr = boneAnimations.equal_range(currentNode->mName.C_Str());
-
-                if (animItr.first == animItr.second)
-                {
-                    return combinedAnimationResult.GetResult();
-                }
-                
-                bool onlyOne = false;
-
-                for (auto it = animItr.first; it != animItr.second; ++it)
-                {
-                    if (onlyOne)
-                    {
-                        AZ_Error("AnimationImporter", false, "Bone %s has multiple animations.  Only 1 animation per bone is supported", currentNode->mName.C_Str());
-                        break;
-                    }
-
-                    const aiAnimation* animation = it->second.first;
-                    const ConsolidatedNodeAnim* anim = &it->second.second;
-
-                    // We don't currently handle having a different number of keys, with 1 exception:
-                    // 1 key is essentially a constant so we do handle that case
-                    if ((anim->mNumPositionKeys != anim->mNumRotationKeys && anim->mNumPositionKeys > 1 && anim->mNumRotationKeys > 1) ||
-                        (anim->mNumPositionKeys != anim->mNumScalingKeys && anim->mNumPositionKeys > 1 && anim->mNumScalingKeys > 1) ||
-                        (anim->mNumRotationKeys != anim->mNumScalingKeys && anim->mNumRotationKeys > 1 && anim->mNumScalingKeys > 1))
-                    {
-                        AZ_Error("AnimationImporter", false, "Bone Animation with different number of position (%d)/rotation (%d)/scaling (%d) keys not supported",
-                            anim->mNumPositionKeys, anim->mNumRotationKeys, anim->mNumScalingKeys);
-                        return Events::ProcessingResult::Failure;
-                    }
-
-                    // Resample the animations at a fixed time step. This matches the behaviour of
-                    // the previous SDK used. Longer term, this could be data driven, or based on the
-                    // smallest time step between key frames.
-                    // AssImp has an animation->mTicksPerSecond and animation->mDuration, but those
-                    // are less predictable than just using a fixed time step.
-                    // AssImp documentation claims animation->mDuration is the duration of the animation in ticks, but
-                    // not all animations we've tested follow that pattern. Sometimes duration is in seconds.
-                    const size_t numKeyFrames = GetNumKeyFrames(
-                        AZStd::max(AZStd::max(anim->mNumScalingKeys, anim->mNumPositionKeys), anim->mNumRotationKeys),
-                        animation->mDuration,
-                        animation->mTicksPerSecond);
-
-                    AZStd::shared_ptr<SceneData::GraphData::AnimationData> createdAnimationData =
-                       AZStd::make_shared<SceneData::GraphData::AnimationData>();
-                    createdAnimationData->ReserveKeyFrames(numKeyFrames);
-                    createdAnimationData->SetTimeStepBetweenFrames(s_defaultTimeStepBetweenFrames);
-
-                    AZ::u32 lastScaleIndex = 0;
-                    AZ::u32 lastPositionIndex = 0;
-                    AZ::u32 lastRotationIndex = 0;
-                    for (AZ::u32 frame = 0; frame < numKeyFrames; ++frame)
-                    {
-                        const double time = GetTimeForFrame(frame, animation->mTicksPerSecond);
-
-                        aiVector3D scale(1.0f, 1.0f, 1.0f);
-                        aiVector3D position(0.0f, 0.0f, 0.0f);
-                        aiQuaternion rotation(1.0f, 0.0f, 0.0f, 0.0f);
-                        if (!SampleKeyFrame(scale, anim->mScalingKeys, anim->mNumScalingKeys, time, lastScaleIndex) ||
-                            !SampleKeyFrame(position, anim->mPositionKeys, anim->mNumPositionKeys, time, lastPositionIndex) ||
-                            !SampleKeyFrame(rotation, anim->mRotationKeys, anim->mNumRotationKeys, time, lastRotationIndex))
-                        {
-                            return Events::ProcessingResult::Failure;
-                        }
-                        
-                        aiMatrix4x4 transform(scale, rotation, position);
-                        DataTypes::MatrixType animTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(transform);
-
-                        context.m_sourceSceneSystem.SwapTransformForUpAxis(animTransform);
-                        context.m_sourceSceneSystem.ConvertBoneUnit(animTransform);
-                        
-                        createdAnimationData->AddKeyFrame(animTransform);
-                    }
-
-                    Containers::SceneGraph::NodeIndex addNode = context.m_scene.GetGraph().AddChild(
-                        context.m_currentGraphPosition, nodeName.c_str(), AZStd::move(createdAnimationData));
-                    context.m_scene.GetGraph().MakeEndPoint(addNode);
-                    
-                    onlyOne = true;
-                }
-                
-                combinedAnimationResult += Events::ProcessingResult::Success;
-                return combinedAnimationResult.GetResult();
-            }
-
-            Events::ProcessingResult AssImpAnimationImporter::ImportBlendShapeAnimation(
-                AssImpSceneNodeAppendedContext& context,
-                const aiAnimation* animation,
-                const aiMeshMorphAnim* meshMorphAnim,
-                const aiMesh* mesh)
-            {
-                if (meshMorphAnim->mNumKeys == 0)
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-                Events::ProcessingResultCombiner combinedAnimationResult;
-
-                // In:
-                //  Key index
-                //      Time
-                //      Values in AssImp, Channel in FBX SDK
-                //      Weights in AssImp, Values in FBX SDK
-                //      Num values & weights
-
-                // Out:
-                // One BlendShapeAnimationData per value (Channel in FBX SDK) index
-                //      SetTimeStepBetweenFrames set on the animation data
-                //      Keyframes. Weights (Values in FBX SDK) per key time.
-                //      Keyframes generated for every single frame of the animation.
-                typedef AZStd::map<int, AZStd::vector<KeyData>> ValueToKeyDataMap;
-                ValueToKeyDataMap valueToKeyDataMap;
-                // Key time can be less than zero, normalize to have zero be the lowest time.
-                double keyOffset = 0;
-                for (int keyIdx = 0; keyIdx < meshMorphAnim->mNumKeys; keyIdx++)
-                {
-                    aiMeshMorphKey& key = meshMorphAnim->mKeys[keyIdx];
-                    for (int valIdx = 0; valIdx < key.mNumValuesAndWeights; ++valIdx)
-                    {
-                        int currentValue = key.mValues[valIdx];
-                        KeyData thisKey(key.mWeights[valIdx], key.mTime);
-                        valueToKeyDataMap[currentValue].insert(
-                        AZStd::upper_bound(valueToKeyDataMap[currentValue].begin(), valueToKeyDataMap[currentValue].end(),thisKey),
-                            thisKey);
-                        if (key.mTime < keyOffset)
-                        {
-                            keyOffset = key.mTime;
-                        }
-                    }
-                }
-
-                for (const auto& [meshIdx, keys] : valueToKeyDataMap)
-                {
-                    AZStd::shared_ptr<SceneData::GraphData::BlendShapeAnimationData> morphAnimNode =
-                        AZStd::make_shared<SceneData::GraphData::BlendShapeAnimationData>();
-
-                    const size_t numKeyFrames = GetNumKeyFrames(keys.size(), animation->mDuration, animation->mTicksPerSecond);
-                    morphAnimNode->ReserveKeyFrames(numKeyFrames);
-                    morphAnimNode->SetTimeStepBetweenFrames(s_defaultTimeStepBetweenFrames);
-
-                    aiAnimMesh* aiAnimMesh = mesh->mAnimMeshes[meshIdx];
-                    AZStd::string_view nodeName(aiAnimMesh->mName.C_Str());
-
-                    const AZ::u32 maxKeys = keys.size();
-                    AZ::u32 keyIdx = 0;
-                    for (AZ::u32 frame = 0; frame < numKeyFrames; ++frame)
-                    {
-                        const double time = GetTimeForFrame(frame, animation->mTicksPerSecond);
-
-                        float weight = 0;
-                        if (!SampleKeyFrame(weight, keys, keys.size(), time + keyOffset, keyIdx))
-                        {
-                            return Events::ProcessingResult::Failure;
-                        }
-
-                        morphAnimNode->AddKeyFrame(weight);
-                    }
-
-                    const size_t dotIndex = nodeName.find_last_of('.');
-                    nodeName = nodeName.substr(dotIndex + 1);
-
-                    morphAnimNode->SetBlendShapeName(nodeName.data());
-
-                    AZStd::string animNodeName(AZStd::string::format("%s_%s", s_animationNodeName, nodeName.data()));
-                    Containers::SceneGraph::NodeIndex addNode = context.m_scene.GetGraph().AddChild(
-                        context.m_currentGraphPosition, animNodeName.c_str(), AZStd::move(morphAnimNode));
-                    context.m_scene.GetGraph().MakeEndPoint(addNode);
-
-                }
-
-                return Events::ProcessingResult::Success;
-            }
-
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.h
deleted file mode 100644
index 3d2faf3e9f..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-
-struct aiAnimation;
-struct aiMesh;
-struct aiMeshMorphAnim;
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpAnimationImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpAnimationImporter, "{93b3f4e3-6fcd-42b9-a74e-5923f76d25c7}", SceneCore::LoadingComponent);
-
-                AssImpAnimationImporter();
-                ~AssImpAnimationImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportAnimation(AssImpSceneNodeAppendedContext& context);
-                Events::ProcessingResult ImportBlendShapeAnimation(
-                    AssImpSceneNodeAppendedContext& context,
-                    const aiAnimation* animation,
-                    const aiMeshMorphAnim* meshMorphAnim,
-                    const aiMesh* mesh);
-
-                static const double s_defaultTimeStepBetweenFrames;
-
-            protected:
-                static const char* s_animationNodeName;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.cpp
deleted file mode 100644
index b317c3cfa2..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/SceneData/GraphData/MeshVertexBitangentData.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-#include <assimp/scene.h>
-#include <assimp/mesh.h>
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            const char* AssImpBitangentStreamImporter::m_defaultNodeName = "Bitangent";
-
-            AssImpBitangentStreamImporter::AssImpBitangentStreamImporter()
-            {
-                BindToCall(&AssImpBitangentStreamImporter::ImportBitangentStreams);
-            }
-
-            void AssImpBitangentStreamImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpBitangentStreamImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-3250
-                }
-            }
-
-            Events::ProcessingResult AssImpBitangentStreamImporter::ImportBitangentStreams(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", m_defaultNodeName);
-                if (!context.m_sourceNode.ContainsMesh())
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                const auto meshHasTangentsAndBitangents = [&scene](const unsigned int meshIndex)
-                {
-                    return scene->mMeshes[meshIndex]->HasTangentsAndBitangents();
-                };
-
-                // If there are no bitangents on any meshes, there's nothing to import in this function.
-                const bool anyMeshHasTangentsAndBitangents = AZStd::any_of(currentNode->mMeshes, currentNode->mMeshes + currentNode->mNumMeshes, meshHasTangentsAndBitangents);
-                if (!anyMeshHasTangentsAndBitangents)
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                // AssImp nodes with multiple meshes on them occur when AssImp split a mesh on material.
-                // This logic recombines those meshes to minimize the changes needed to replace FBX SDK with AssImp, FBX SDK did not separate meshes,
-                // and the engine has code to do this later.
-                const bool allMeshesHaveTangentsAndBitangents = AZStd::all_of(currentNode->mMeshes, currentNode->mMeshes + currentNode->mNumMeshes, meshHasTangentsAndBitangents);
-                if (!allMeshesHaveTangentsAndBitangents)
-                {
-                    AZ_Error(
-                        Utilities::ErrorWindow, false,
-                        "Node with name %s has meshes with and without bitangents. "
-                            "Placeholder incorrect bitangents will be generated to allow the data to process, "
-                            "but the source art needs to be fixed to correct this. Either apply bitangents to all meshes on this node, "
-                            "or remove all bitangents from all meshes on this node.",
-                        currentNode->mName.C_Str());
-                }
-
-                const uint64_t vertexCount = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
-
-                AZStd::shared_ptr<SceneData::GraphData::MeshVertexBitangentData> bitangentStream =
-                    AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexBitangentData>();
-                // AssImp only has one bitangentStream per mesh.
-                bitangentStream->SetBitangentSetIndex(0);
-
-                bitangentStream->SetTangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::FromFbx);
-                bitangentStream->ReserveContainerSpace(vertexCount);
-                for (int sdkMeshIndex = 0; sdkMeshIndex < currentNode->mNumMeshes; ++sdkMeshIndex)
-                {
-                    const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[sdkMeshIndex]];
-
-                    for (int v = 0; v < mesh->mNumVertices; ++v)
-                    {
-                        if (!mesh->HasTangentsAndBitangents())
-                        {
-                            // This node has mixed meshes with and without bitangents.
-                            // An error was already thrown above. Output stub bitangents so
-                            // the mesh can still be output in some form, even if the data isn't correct.
-                            // The bitangent count needs to match the vertex count on the associated mesh node.
-                            bitangentStream->AppendBitangent(Vector3::CreateAxisY());
-                        }
-                        else
-                        {
-                            const Vector3 bitangent(
-                                AssImpSDKWrapper::AssImpTypeConverter::ToVector3(mesh->mBitangents[v]));
-                            bitangentStream->AppendBitangent(bitangent);
-                        }
-                    }
-                }
-
-                Containers::SceneGraph::NodeIndex newIndex =
-                    context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, m_defaultNodeName);
-
-                Events::ProcessingResult bitangentResults;
-                AssImpSceneAttributeDataPopulatedContext dataPopulated(context, bitangentStream, newIndex, m_defaultNodeName);
-                bitangentResults = Events::Process(dataPopulated);
-
-                if (bitangentResults != Events::ProcessingResult::Failure)
-                {
-                    bitangentResults = AddAttributeDataNodeWithContexts(dataPopulated);
-                }
-                return bitangentResults;
-            }
-
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.h
deleted file mode 100644
index 7625c0f483..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpBitangentStreamImporter : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpBitangentStreamImporter, "{49FC818A-956F-43DA-BBAC-73198E0C5A1F}", SceneCore::LoadingComponent);
-
-                AssImpBitangentStreamImporter();
-                ~AssImpBitangentStreamImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportBitangentStreams(AssImpSceneNodeAppendedContext& context);
-
-            protected:
-                static const char* m_defaultNodeName;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.cpp
deleted file mode 100644
index a8d1c2d730..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneSystem.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SceneData/GraphData/SkinMeshData.h>
-#include <SceneAPI/SceneData/GraphData/BlendShapeData.h>
-#include <assimp/scene.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            AssImpBlendShapeImporter::AssImpBlendShapeImporter()
-            {
-                BindToCall(&AssImpBlendShapeImporter::ImportBlendShapes);
-            }
-
-            void AssImpBlendShapeImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpBlendShapeImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-2576
-                }
-            }
-
-            Events::ProcessingResult AssImpBlendShapeImporter::ImportBlendShapes(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", "Blend Shapes");
-                int numMesh = context.m_sourceNode.GetAssImpNode()->mNumMeshes;
-                bool animMeshExists = false;
-                for (int idx = 0; idx < numMesh; idx++)
-                {
-                    int meshId = context.m_sourceNode.GetAssImpNode()->mMeshes[idx];
-                    aiMesh* aiMesh = context.m_sourceScene.GetAssImpScene()->mMeshes[meshId];
-                    if (aiMesh->mNumAnimMeshes)
-                    {
-                        animMeshExists = true;
-                        break;
-                    }
-                }
-
-                if (!animMeshExists)
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                GetMeshDataFromParentResult meshDataResult(GetMeshDataFromParent(context));
-                if (!meshDataResult.IsSuccess())
-                {
-                    return meshDataResult.GetError();
-                }
-
-                Events::ProcessingResultCombiner combinedBlendShapeResult;
-
-                // 1. Loop through meshes & anims
-                //      Create storage: Anim to meshes
-                // 2. Loop through anims & meshes
-                //      Create an anim mesh for each anim, with meshes re-combined.
-                // AssImp separates meshes that have multiple materials.
-                // This code re-combines them to match previous FBX SDK behavior,
-                // so they can be separated by engine code instead.
-                AZStd::map<AZStd::string_view, AZStd::vector<AZStd::pair<int, int>>> animToMeshToAnimMeshIndices;
-                for (int nodeMeshIdx = 0; nodeMeshIdx < numMesh; nodeMeshIdx++)
-                {
-                    int sceneMeshIdx = context.m_sourceNode.GetAssImpNode()->mMeshes[nodeMeshIdx];
-                    const aiMesh* aiMesh = context.m_sourceScene.GetAssImpScene()->mMeshes[sceneMeshIdx];
-                    for (int animIdx = 0; animIdx < aiMesh->mNumAnimMeshes; animIdx++)
-                    {
-                        aiAnimMesh* aiAnimMesh = aiMesh->mAnimMeshes[animIdx];
-                        animToMeshToAnimMeshIndices[aiAnimMesh->mName.C_Str()].emplace_back(nodeMeshIdx, animIdx);
-                    }
-                }
-
-                for (const auto& animToMeshIndex : animToMeshToAnimMeshIndices)
-                {
-                    AZStd::shared_ptr<SceneData::GraphData::BlendShapeData> blendShapeData =
-                        AZStd::make_shared<SceneData::GraphData::BlendShapeData>();
-
-                    // Some DCC tools, like Maya, include a full path separated by '.' in the node names.
-                    // For example, "cone_skin_blendShapeNode.cone_squash"
-                    // Downstream processing doesn't want anything but the last part of that node name,
-                    // so find the last '.' and remove anything before it.
-                    AZStd::string nodeName(animToMeshIndex.first);
-                    size_t dotIndex = nodeName.rfind('.');
-                    if (dotIndex != AZStd::string::npos)
-                    {
-                        nodeName.erase(0, dotIndex + 1);
-                    }
-                    int vertexOffset = 0;
-                    RenamedNodesMap::SanitizeNodeName(nodeName, context.m_scene.GetGraph(), context.m_currentGraphPosition, "BlendShape");
-                    AZ_TraceContext("Blend shape name", nodeName);
-                    for (const auto& meshIndex : animToMeshIndex.second)
-                    {
-                        int sceneMeshIdx = context.m_sourceNode.GetAssImpNode()->mMeshes[meshIndex.first];
-                        const aiMesh* aiMesh = context.m_sourceScene.GetAssImpScene()->mMeshes[sceneMeshIdx];
-                        const aiAnimMesh* aiAnimMesh = aiMesh->mAnimMeshes[meshIndex.second];
-
-                        AZStd::bitset<SceneData::GraphData::BlendShapeData::MaxNumUVSets> uvSetUsedFlags;
-                        for (AZ::u8 uvSetIndex = 0; uvSetIndex < SceneData::GraphData::BlendShapeData::MaxNumUVSets; ++uvSetIndex)
-                        {
-                            uvSetUsedFlags.set(uvSetIndex, aiAnimMesh->HasTextureCoords(uvSetIndex));
-                        }
-                        AZStd::bitset<SceneData::GraphData::BlendShapeData::MaxNumColorSets> colorSetUsedFlags;
-                        for (AZ::u8 colorSetIndex = 0; colorSetIndex < SceneData::GraphData::BlendShapeData::MaxNumColorSets;
-                             ++colorSetIndex)
-                        {
-                            colorSetUsedFlags.set(colorSetIndex, aiAnimMesh->HasVertexColors(colorSetIndex));
-                        }
-                        blendShapeData->ReserveData(
-                            aiAnimMesh->mNumVertices, aiAnimMesh->HasTangentsAndBitangents(), uvSetUsedFlags, colorSetUsedFlags);
-
-                        for (int vertIdx = 0; vertIdx < aiAnimMesh->mNumVertices; ++vertIdx)
-                        {
-                            AZ::Vector3 vertex(AssImpSDKWrapper::AssImpTypeConverter::ToVector3(aiAnimMesh->mVertices[vertIdx]));
-                   
-                            context.m_sourceSceneSystem.SwapVec3ForUpAxis(vertex);
-                            context.m_sourceSceneSystem.ConvertUnit(vertex);
-
-                            blendShapeData->AddPosition(vertex);
-                            blendShapeData->SetVertexIndexToControlPointIndexMap(vertIdx + vertexOffset, vertIdx + vertexOffset);
-
-                            // Add normals
-                            if (aiAnimMesh->HasNormals())
-                            {
-                                AZ::Vector3 normal(AssImpSDKWrapper::AssImpTypeConverter::ToVector3(aiAnimMesh->mNormals[vertIdx]));
-                                context.m_sourceSceneSystem.SwapVec3ForUpAxis(normal);
-                                normal.NormalizeSafe();
-                                blendShapeData->AddNormal(normal);
-                            }
-
-                            // Add tangents and bitangents
-                            if (aiAnimMesh->HasTangentsAndBitangents())
-                            {
-                                // Vector4's constructor that takes in a vector3 sets w to 1.0f automatically.
-                                const AZ::Vector4 tangent(AssImpSDKWrapper::AssImpTypeConverter::ToVector3(aiAnimMesh->mTangents[vertIdx]));
-                                const AZ::Vector3 bitangent = AssImpSDKWrapper::AssImpTypeConverter::ToVector3(aiAnimMesh->mBitangents[vertIdx]);
-                                blendShapeData->AddTangentAndBitangent(tangent, bitangent);
-                            }
-
-                            // Add UVs
-                            for (AZ::u8 uvSetIdx = 0; uvSetIdx < SceneData::GraphData::BlendShapeData::MaxNumUVSets; ++uvSetIdx)
-                            {
-                                if (aiAnimMesh->HasTextureCoords(uvSetIdx))
-                                {
-                                    const AZ::Vector2 vertexUV(
-                                        aiAnimMesh->mTextureCoords[uvSetIdx][vertIdx].x,
-                                        // The engine's V coordinate is reverse of how it's stored in assImp.
-                                        1.0f - aiAnimMesh->mTextureCoords[uvSetIdx][vertIdx].y);
-                                    blendShapeData->AddUV(vertexUV, uvSetIdx);
-                                }
-                            }
-
-                            // Add colors
-                            for (AZ::u8 colorSetIdx = 0; colorSetIdx < SceneData::GraphData::BlendShapeData::MaxNumColorSets; ++colorSetIdx)
-                            {
-                                if (aiAnimMesh->HasVertexColors(colorSetIdx))
-                                {
-                                    SceneAPI::DataTypes::Color color =
-                                        AssImpSDKWrapper::AssImpTypeConverter::ToColor(aiAnimMesh->mColors[colorSetIdx][vertIdx]);
-                                    blendShapeData->AddColor(color, colorSetIdx);
-                                }
-                            }
-                        }
-
-                        // aiAnimMesh just has a list of positions for vertices. The face indices are on the original mesh.
-                        for (int faceIdx = 0; faceIdx < aiMesh->mNumFaces; ++faceIdx)
-                        {
-                            aiFace face = aiMesh->mFaces[faceIdx];
-                            DataTypes::IBlendShapeData::Face blendFace;
-                            if (face.mNumIndices != 3)
-                            {
-                                // AssImp should have triangulated everything, so if this happens then someone has
-                                // probably changed AssImp's import settings. The engine only supports triangles.
-                                AZ_Error(
-                                    Utilities::ErrorWindow, false,
-                                    "Mesh for node %s has a face with %d vertices, only 3 vertices are supported per face.",
-                                    nodeName.c_str(),
-                                    face.mNumIndices);
-                                continue;
-                            }
-                            for (int idx = 0; idx < face.mNumIndices; ++idx)
-                            {
-                                blendFace.vertexIndex[idx] = face.mIndices[idx] + vertexOffset;
-                            }
-
-                            blendShapeData->AddFace(blendFace);
-                        }
-                        vertexOffset += aiMesh->mNumVertices;
-
-
-                    }
-
-
-                    // Report problem if no vertex or face converted to MeshData
-                    if (blendShapeData->GetVertexCount() <= 0 || blendShapeData->GetFaceCount() <= 0)
-                    {
-                        AZ_Error(Utilities::ErrorWindow, false, "Missing geometry data in blendshape node %s.", nodeName.c_str());
-                        return Events::ProcessingResult::Failure;
-                    }
-
-                    Containers::SceneGraph::NodeIndex newIndex =
-                        context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, nodeName.c_str());
-
-                    Events::ProcessingResult blendShapeResult;
-                    AssImpSceneAttributeDataPopulatedContext dataPopulated(context, blendShapeData, newIndex, nodeName);
-                    blendShapeResult = Events::Process(dataPopulated);
-
-                    if (blendShapeResult != Events::ProcessingResult::Failure)
-                    {
-                        blendShapeResult = AddAttributeDataNodeWithContexts(dataPopulated);
-                    }
-                    combinedBlendShapeResult += blendShapeResult;
-                }
-
-                return combinedBlendShapeResult.GetResult();
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.h
deleted file mode 100644
index 6f1b6d475e..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpBlendShapeImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpBlendShapeImporter, "{B0F7174B-9863-4C03-BFB2-83BF29B1A2DD}", SceneCore::LoadingComponent);
-
-                AssImpBlendShapeImporter();
-                ~AssImpBlendShapeImporter() override = default;
-                
-                static void Reflect(ReflectContext* context);
-                
-                Events::ProcessingResult ImportBlendShapes(AssImpSceneNodeAppendedContext& context);
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.cpp
deleted file mode 100644
index 1828919c46..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneSystem.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneData/GraphData/BoneData.h>
-#include <SceneAPI/SceneData/GraphData/RootBoneData.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            AssImpBoneImporter::AssImpBoneImporter()
-            {
-                BindToCall(&AssImpBoneImporter::ImportBone);
-            }
-
-            void AssImpBoneImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpBoneImporter, SceneCore::LoadingComponent>()->Version(1);
-                }
-            }
-
-            void EnumBonesInNode(
-                const aiScene* scene, const aiNode* node, AZStd::unordered_map<AZStd::string, const aiNode*>& mainBoneList,
-                AZStd::unordered_map<AZStd::string, const aiBone*>& boneLookup)
-            {
-                /* From AssImp Documentation
-                    a) Create a map or a similar container to store which nodes are necessary for the skeleton. Pre-initialise it for all nodes with a "no".
-                    b) For each bone in the mesh:
-                    b1) Find the corresponding node in the scene's hierarchy by comparing their names.
-                    b2) Mark this node as "yes" in the necessityMap.
-                    b3) Mark all of its parents the same way until you 1) find the mesh's node or 2) the parent of the mesh's node.
-                    c) Recursively iterate over the node hierarchy
-                    c1) If the node is marked as necessary, copy it into the skeleton and check its children
-                    c2) If the node is marked as not necessary, skip it and do not iterate over its children. 
-                 */
-
-                for (unsigned meshIndex = 0; meshIndex < node->mNumMeshes; ++meshIndex)
-                {
-                    const aiMesh* mesh = scene->mMeshes[node->mMeshes[meshIndex]];
-
-                    for (unsigned boneIndex = 0; boneIndex < mesh->mNumBones; ++boneIndex)
-                    {
-                        const aiBone* bone = mesh->mBones[boneIndex];
-
-                        const aiNode* boneNode = scene->mRootNode->FindNode(bone->mName);
-                        const aiNode* boneParent = boneNode->mParent;
-
-                        mainBoneList[bone->mName.C_Str()] = boneNode;
-                        boneLookup[bone->mName.C_Str()] = bone;
-
-                        while (boneParent && boneParent != node && boneParent != node->mParent && boneParent != scene->mRootNode)
-                        {
-                            mainBoneList[boneParent->mName.C_Str()] = boneParent;
-
-                            boneParent = boneParent->mParent;
-                        }
-                    }
-                }
-            }
-
-            void EnumChildren(
-                const aiScene* scene, const aiNode* node, AZStd::unordered_map<AZStd::string, const aiNode*>& mainBoneList,
-                AZStd::unordered_map<AZStd::string, const aiBone*>& boneLookup)
-            {
-                EnumBonesInNode(scene, node, mainBoneList, boneLookup);
-
-                for (unsigned childIndex = 0; childIndex < node->mNumChildren; ++childIndex)
-                {
-                    const aiNode* child = node->mChildren[childIndex];
-                    
-                    EnumChildren(scene, child, mainBoneList, boneLookup);
-                }
-            }
-
-            aiMatrix4x4 CalculateWorldTransform(const aiNode* currentNode)
-            {
-                aiMatrix4x4 transform = {};
-                const aiNode* iteratingNode = currentNode;
-                
-                while (iteratingNode)
-                {
-                    transform = iteratingNode->mTransformation * transform;
-                    iteratingNode = iteratingNode->mParent;
-                }
-
-                return transform;
-            }
-
-            Events::ProcessingResult AssImpBoneImporter::ImportBone(AssImpNodeEncounteredContext& context)
-            {
-                AZ_TraceContext("Importer", "Bone");
-
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                if (IsPivotNode(currentNode->mName))
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                bool isBone = false;
-                
-                {
-                    AZStd::unordered_map<AZStd::string, const aiNode*> mainBoneList;
-                    AZStd::unordered_map<AZStd::string, const aiBone*> boneLookup;
-                    EnumChildren(scene, scene->mRootNode, mainBoneList, boneLookup);
-
-                    if (mainBoneList.find(currentNode->mName.C_Str()) != mainBoneList.end())
-                    {
-                        isBone = true;
-                    }
-
-                    // If we have an animation, the bones will be listed in there
-                    if (!isBone)
-                    {
-                        for(unsigned animIndex = 0; animIndex < scene->mNumAnimations; ++animIndex)
-                        {
-                            aiAnimation* animation = scene->mAnimations[animIndex];
-
-                            for (unsigned channelIndex = 0; channelIndex < animation->mNumChannels; ++channelIndex)
-                            {
-                                aiNodeAnim* nodeAnim = animation->mChannels[channelIndex];
-
-                                if (nodeAnim->mNodeName == currentNode->mName)
-                                {
-                                    isBone = true;
-                                    break;
-                                }
-                            }
-
-                            if (isBone)
-                            {
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                if(!isBone)
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                // If the current scene node (our eventual parent) contains bone data, we are not a root bone
-                AZStd::shared_ptr<SceneData::GraphData::BoneData> createdBoneData;
-
-                if (NodeHasAncestorOfType(
-                        context.m_scene.GetGraph(), context.m_currentGraphPosition, DataTypes::IBoneData::TYPEINFO_Uuid()))
-                {
-                    createdBoneData = AZStd::make_shared<SceneData::GraphData::BoneData>();
-                }
-                else
-                {
-                    createdBoneData = AZStd::make_shared<SceneData::GraphData::RootBoneData>();
-                }
-                
-                aiMatrix4x4 transform = CalculateWorldTransform(currentNode);
-                
-                SceneAPI::DataTypes::MatrixType globalTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(transform);
-
-                context.m_sourceSceneSystem.SwapTransformForUpAxis(globalTransform);
-                context.m_sourceSceneSystem.ConvertBoneUnit(globalTransform);
-
-                createdBoneData->SetWorldTransform(globalTransform);
-
-                context.m_createdData.push_back(AZStd::move(createdBoneData));
-
-                return Events::ProcessingResult::Success;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h
deleted file mode 100644
index f1371c8d11..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpBoneImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpBoneImporter, "{E7A62DE7-B660-4920-BF91-32738175D5A7}", SceneCore::LoadingComponent);
-
-                AssImpBoneImporter();
-                ~AssImpBoneImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-                
-                Events::ProcessingResult ImportBone(AssImpNodeEncounteredContext& context);
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.cpp
deleted file mode 100644
index 83fe50919e..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/numeric.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SceneData/GraphData/MeshVertexColorData.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-#include <assimp/scene.h>
-#include <assimp/mesh.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            const char* AssImpColorStreamImporter::m_defaultNodeName = "Col";
-
-            AssImpColorStreamImporter::AssImpColorStreamImporter()
-            {
-                BindToCall(&AssImpColorStreamImporter::ImportColorStreams);
-            }
-
-            void AssImpColorStreamImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpColorStreamImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-3250
-                }
-            }
-
-            Events::ProcessingResult AssImpColorStreamImporter::ImportColorStreams(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", m_defaultNodeName);
-                if (!context.m_sourceNode.ContainsMesh())
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                // This node has at least one mesh, verify that the color channel counts are the same for all meshes.
-                const int expectedColorChannels = scene->mMeshes[currentNode->mMeshes[0]]->GetNumColorChannels();
-                const bool allMeshesHaveSameNumberOfColorChannels =
-                    AZStd::all_of(currentNode->mMeshes + 1, currentNode->mMeshes + currentNode->mNumMeshes, [scene, expectedColorChannels](const unsigned int meshIndex)
-                        {
-                            return scene->mMeshes[meshIndex]->GetNumColorChannels() == expectedColorChannels;
-                        });
-
-                AZ_Error(
-                    Utilities::ErrorWindow,
-                    allMeshesHaveSameNumberOfColorChannels,
-                    "Color channel counts for node %s has meshes with different color channel counts. "
-                    "The color channel count for the first mesh will be used, and placeholder incorrect color values "
-                    "will be generated to allow the data to process, but the source art needs to be fixed to correct this. "
-                    "All meshes on this node should have the same number of color channels.",
-                    currentNode->mName.C_Str());
-
-                if (expectedColorChannels == 0)
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                const uint64_t vertexCount = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
-
-                Events::ProcessingResultCombiner combinedVertexColorResults;
-                for (int colorSetIndex = 0; colorSetIndex < expectedColorChannels; ++colorSetIndex)
-                {
-
-                    AZStd::shared_ptr<SceneData::GraphData::MeshVertexColorData> vertexColors =
-                        AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexColorData>();
-                    vertexColors->ReserveContainerSpace(vertexCount);
-
-                    for (int sdkMeshIndex = 0; sdkMeshIndex < currentNode->mNumMeshes; ++sdkMeshIndex)
-                    {
-                        const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[sdkMeshIndex]];
-                        for (int v = 0; v < mesh->mNumVertices; ++v)
-                        {
-                            if (colorSetIndex < mesh->GetNumColorChannels())
-                            {
-                                AZ::SceneAPI::DataTypes::Color vertexColor(
-                                    AssImpSDKWrapper::AssImpTypeConverter::ToColor(mesh->mColors[colorSetIndex][v]));
-                                vertexColors->AppendColor(vertexColor);
-                            }
-                            else
-                            {
-                                // An error was already emitted if this mesh has less color channels
-                                // than other meshes on the parent node. Append an arbitrary color value, fully opaque black,
-                                // so the mesh can still be processed.
-                                // It's better to let the engine load a partially valid mesh than to completely fail.
-                                vertexColors->AppendColor(AZ::SceneAPI::DataTypes::Color(0.0f,0.0f,0.0f,1.0f));
-                            }
-                        }
-                    }
-
-                    AZStd::string nodeName(AZStd::string::format("%s%d", m_defaultNodeName, colorSetIndex));
-                    Containers::SceneGraph::NodeIndex newIndex =
-                        context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, nodeName.c_str());
-
-                    Events::ProcessingResult colorMapResults;
-                    AssImpSceneAttributeDataPopulatedContext dataPopulated(context, vertexColors, newIndex, nodeName.c_str());
-                    colorMapResults = Events::Process(dataPopulated);
-
-                    if (colorMapResults != Events::ProcessingResult::Failure)
-                    {
-                        colorMapResults = AddAttributeDataNodeWithContexts(dataPopulated);
-                    }
-
-                    combinedVertexColorResults += colorMapResults;
-                }
-                return combinedVertexColorResults.GetResult();
-            }
-
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.h
deleted file mode 100644
index 2e98f397d9..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpColorStreamImporter : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpColorStreamImporter, "{071F4764-F3B0-438A-9CB7-19A1248F3B54}", SceneCore::LoadingComponent);
-
-                AssImpColorStreamImporter();
-                ~AssImpColorStreamImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportColorStreams(AssImpSceneNodeAppendedContext& context);
-
-            protected:
-                static const char* m_defaultNodeName;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.cpp
deleted file mode 100644
index 95025851f7..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h>
-
-#include <AzCore/Debug/Trace.h>
-#include <AzCore/StringFunc/StringFunc.h>
-
-#include <assimp/scene.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            bool IsSkinnedMesh(const aiNode& node, const aiScene& scene)
-            {
-                unsigned boneCount = 0;
-
-                for (unsigned mesh = 0; mesh < node.mNumMeshes; ++mesh)
-                {
-                    if (scene.mMeshes[node.mMeshes[mesh]]->HasBones())
-                    {
-                        ++boneCount;
-                    }
-                }
-
-                if (boneCount > 1 && boneCount != node.mNumMeshes)
-                {
-                    AZ_Error("AssImpImporterUtilities", false, "Node has %d meshes but only %d are skinned.  "
-                        "This is unexpected and may result in errors", node.mNumMeshes, boneCount);
-                }
-
-                return boneCount > 0;
-            }
-
-            bool IsPivotNode(const aiString& nodeName, size_t* pos)
-            {
-                AZStd::string_view name(nodeName.C_Str(), nodeName.length);
-
-                size_t myPos;
-
-                if (!pos)
-                {
-                    pos = &myPos;
-                }
-
-                *pos = AZ::StringFunc::Find(name, PivotNodeMarker);
-
-                return *pos != name.npos;
-            }
-
-            void SplitPivotNodeName(const aiString& nodeName, size_t pivotPos, AZStd::string_view& baseNodeName, AZStd::string_view& pivotType)
-            {
-                AZStd::string_view nodeNameView(nodeName.data, nodeName.length);
-                baseNodeName = AZStd::string_view(nodeNameView.substr(0, pivotPos));
-                pivotType = AZStd::string_view(nodeNameView.substr(pivotPos + sizeof PivotNodeMarker - 1));
-            }
-
-            aiMatrix4x4 GetConcatenatedLocalTransform(const aiNode* currentNode)
-            {
-                const aiNode* parent = currentNode->mParent;
-                aiMatrix4x4 combinedTransform = currentNode->mTransformation;
-
-                while (parent)
-                {
-                    size_t pos;
-
-                    if (IsPivotNode(parent->mName, &pos))
-                    {
-                        combinedTransform = parent->mTransformation * combinedTransform;
-                        parent = parent->mParent;
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-
-                return combinedTransform;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h
deleted file mode 100644
index 26e65f9cda..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <assimp/matrix4x4.h>
-#include <AzCore/std/string/string.h>
-
-struct aiNode;
-struct aiScene;
-struct aiString;
-
-
-namespace AZ::SceneAPI::FbxSceneBuilder
-{
-    inline constexpr char PivotNodeMarker[] = "_$AssimpFbx$_";
-
-    bool IsSkinnedMesh(const aiNode& node, const aiScene& scene);
-
-    // Checks if a node name is a pivot node and optionally returns the position in the name of the pivot marker (for splitting out the parts later)
-    bool IsPivotNode(const aiString& nodeName, size_t* pos = nullptr);
-
-    // Returns the bone name and type of a pivot node
-    void SplitPivotNodeName(const aiString& nodeName, size_t pivotPos, AZStd::string_view& baseNodeName, AZStd::string_view& pivotType);
-
-    // Gets the entire, combined local transform for a node taking pivot nodes into account.  When pivot nodes are not used, this just returns the node's transform
-    aiMatrix4x4 GetConcatenatedLocalTransform(const aiNode* currentNode);
-} // namespace AZ
-
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.cpp
deleted file mode 100644
index 6ae53a87b9..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpMaterialWrapper.h>
-#include <SceneAPI/SceneData/GraphData/MaterialData.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneCore/Events/ProcessingResult.h>
-#include <assimp/scene.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            AssImpMaterialImporter::AssImpMaterialImporter()
-            {
-                BindToCall(&AssImpMaterialImporter::ImportMaterials);
-            }
-
-            void AssImpMaterialImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpMaterialImporter, SceneCore::LoadingComponent>()->Version(1);
-                }
-            }
-
-            Events::ProcessingResult AssImpMaterialImporter::ImportMaterials(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", "Material");
-                if (!context.m_sourceNode.ContainsMesh())
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                Events::ProcessingResultCombiner combinedMaterialImportResults;
-
-                AZStd::unordered_map<int, AZStd::shared_ptr<SceneData::GraphData::MaterialData>> materialMap;
-                for (int idx = 0; idx < context.m_sourceNode.m_assImpNode->mNumMeshes; ++idx)
-                {
-                    int meshIndex = context.m_sourceNode.m_assImpNode->mMeshes[idx];
-                    const aiMesh* assImpMesh = context.m_sourceScene.GetAssImpScene()->mMeshes[meshIndex];
-                    AZ_Assert(assImpMesh, "Asset Importer Mesh should not be null.");
-                    int materialIndex = assImpMesh->mMaterialIndex;
-                    AZ_TraceContext("Material Index", materialIndex);
-
-                    auto matFound = materialMap.find(materialIndex);
-
-                    AZStd::shared_ptr<SceneData::GraphData::MaterialData> material;
-                    AZStd::string materialName;
-
-                    if (matFound == materialMap.end())
-                    {
-                        std::shared_ptr<AssImpSDKWrapper::AssImpMaterialWrapper> assImpMaterial =
-                            std::shared_ptr<AssImpSDKWrapper::AssImpMaterialWrapper>(new AssImpSDKWrapper::AssImpMaterialWrapper(context.m_sourceScene.GetAssImpScene()->mMaterials[materialIndex]));
-
-                        materialName = assImpMaterial->GetName().c_str();
-                        RenamedNodesMap::SanitizeNodeName(materialName, context.m_scene.GetGraph(), context.m_currentGraphPosition, "Material");
-                        AZ_TraceContext("Material Name", materialName);
-
-                        material = AZStd::make_shared<SceneData::GraphData::MaterialData>();
-
-                        material->SetMaterialName(assImpMaterial->GetName());
-                        material->SetTexture(DataTypes::IMaterialData::TextureMapType::Diffuse,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Diffuse)).c_str());
-                        material->SetTexture(DataTypes::IMaterialData::TextureMapType::Specular,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Specular)).c_str());
-                        material->SetTexture(DataTypes::IMaterialData::TextureMapType::Bump,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Bump)).c_str());
-                        material->SetTexture(DataTypes::IMaterialData::TextureMapType::Normal,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Normal)).c_str());
-                        material->SetUniqueId(assImpMaterial->GetUniqueId());
-                        material->SetDiffuseColor(assImpMaterial->GetDiffuseColor());
-                        material->SetSpecularColor(assImpMaterial->GetSpecularColor());
-                        material->SetEmissiveColor(assImpMaterial->GetEmissiveColor());
-                        material->SetShininess(assImpMaterial->GetShininess());
-
-                        material->SetUseColorMap(assImpMaterial->GetUseColorMap());
-                        material->SetBaseColor(assImpMaterial->GetBaseColor());
-
-                        material->SetUseMetallicMap(assImpMaterial->GetUseMetallicMap());
-                        material->SetMetallicFactor(assImpMaterial->GetMetallicFactor());
-                        material->SetTexture(
-                            DataTypes::IMaterialData::TextureMapType::Metallic,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Metallic).c_str()));
-
-                        material->SetUseRoughnessMap(assImpMaterial->GetUseRoughnessMap());
-                        material->SetRoughnessFactor(assImpMaterial->GetRoughnessFactor());
-                        material->SetTexture(
-                            DataTypes::IMaterialData::TextureMapType::Roughness,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Roughness).c_str()));
-
-                        material->SetUseEmissiveMap(assImpMaterial->GetUseEmissiveMap());
-                        material->SetEmissiveIntensity(assImpMaterial->GetEmissiveIntensity());
-
-                        material->SetUseAOMap(assImpMaterial->GetUseAOMap());
-                        material->SetTexture(
-                            DataTypes::IMaterialData::TextureMapType::AmbientOcclusion,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::AmbientOcclusion).c_str()));
-
-                        material->SetTexture(
-                            DataTypes::IMaterialData::TextureMapType::Emissive,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Emissive).c_str()));
-
-                        material->SetTexture(
-                            DataTypes::IMaterialData::TextureMapType::BaseColor,
-                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
-                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::BaseColor).c_str()));
-
-                        AZ_Assert(material, "Failed to allocate scene material data.");
-                        if (!material)
-                        {
-                            combinedMaterialImportResults += Events::ProcessingResult::Failure;
-                            continue;
-                        }
-
-                        materialMap[materialIndex] = material;
-                    }
-                    else
-                    {
-                        material = matFound->second;
-                        materialName = material.get()->GetMaterialName();
-                    }
-
-                    Events::ProcessingResult materialResult;
-                    Containers::SceneGraph::NodeIndex newIndex =
-                        context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, materialName.c_str());
-
-                    AZ_Assert(newIndex.IsValid(), "Failed to create SceneGraph node for attribute.");
-                    if (!newIndex.IsValid())
-                    {
-                        combinedMaterialImportResults += Events::ProcessingResult::Failure;
-                        continue;
-                    }
-
-                    AssImpSceneAttributeDataPopulatedContext dataPopulated(context, material, newIndex, materialName);
-                    materialResult = Events::Process(dataPopulated);
-
-                    if (materialResult != Events::ProcessingResult::Failure)
-                    {
-                        materialResult = SceneAPI::FbxSceneBuilder::AddAttributeDataNodeWithContexts(dataPopulated);
-                    }
-
-                    combinedMaterialImportResults += materialResult;
-                }
-
-                return combinedMaterialImportResults.GetResult();
-            }
-
-            AZStd::string AssImpMaterialImporter::ResolveTexturePath(const AZStd::string& sceneFilePath, const AZStd::string& textureFilePath) const
-            {
-                if (textureFilePath.empty())
-                {
-                    return textureFilePath;
-                }
-
-
-                AZStd::string texturePathRelativeToScene;
-                AZStd::string cleanedUpSceneFilePath(sceneFilePath);
-                AZ::StringFunc::Path::StripFullName(cleanedUpSceneFilePath);
-                AZ::StringFunc::Path::Join(cleanedUpSceneFilePath.c_str(), textureFilePath.c_str(), texturePathRelativeToScene);
-
-                // If the texture did start with marker to change directories upward, then it's relative to the FBX file,
-                // and that path needs to be resolved. It can't be resolved later. This was handled internally by FBX SDK,
-                // but is not handled by AssImp.
-                if (textureFilePath.starts_with(".."))
-                {
-                    // Not checking for the file existing because it may not be there yet.
-                    return texturePathRelativeToScene;
-                }
-
-                // The engine only supports relative paths to scan folders.
-                // FBX files may have paths to textures, relative to the FBX file. Check for those, first.
-                if (AZ::IO::FileIOBase::GetInstance()->Exists(texturePathRelativeToScene.c_str()))
-                {
-                    return texturePathRelativeToScene;
-                }
-
-
-                return textureFilePath;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h
deleted file mode 100644
index 5a13dc1c7a..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpMaterialImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpMaterialImporter, "{CD936FA9-17B8-40B9-AA3C-5F593BEFFC94}", SceneCore::LoadingComponent);
-
-                AssImpMaterialImporter();
-                ~AssImpMaterialImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportMaterials(AssImpSceneNodeAppendedContext& context);
-
-            private:
-                AZStd::string ResolveTexturePath(const AZStd::string& sceneFilePath, const AZStd::string& textureFilePath) const;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp
deleted file mode 100644
index 95c43a444f..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <assimp/scene.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            AssImpMeshImporter::AssImpMeshImporter()
-            {
-                BindToCall(&AssImpMeshImporter::ImportMesh);
-            }
-
-            void AssImpMeshImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpMeshImporter, SceneCore::LoadingComponent>()->Version(2);
-                }
-            }
-
-            Events::ProcessingResult AssImpMeshImporter::ImportMesh(AssImpNodeEncounteredContext& context)
-            {
-                AZ_TraceContext("Importer", "Mesh");
-
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                if (!context.m_sourceNode.ContainsMesh() || IsSkinnedMesh(*currentNode, *scene))
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                if (BuildSceneMeshFromAssImpMesh(currentNode, scene, context.m_sourceSceneSystem, context.m_createdData, [] {
-                        return AZStd::make_shared<SceneData::GraphData::MeshData>();
-                    }))
-                {
-                    return Events::ProcessingResult::Success;
-                }
-
-                return Events::ProcessingResult::Failure;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.h
deleted file mode 100644
index 95c748b209..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpMeshImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpMeshImporter, "{41611339-1D32-474A-A6A4-25CE4430AAFB}", SceneCore::LoadingComponent);
-
-                AssImpMeshImporter();
-                ~AssImpMeshImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportMesh(AssImpNodeEncounteredContext& context);
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.cpp
deleted file mode 100644
index d8a095b5ef..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <assimp/scene.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/SceneData/GraphData/SkinMeshData.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            AssImpSkinImporter::AssImpSkinImporter()
-            {
-                BindToCall(&AssImpSkinImporter::ImportSkin);
-            }
-
-            void AssImpSkinImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpSkinImporter, SceneCore::LoadingComponent>()->Version(1);
-                }
-            }
-
-            Events::ProcessingResult AssImpSkinImporter::ImportSkin(AssImpNodeEncounteredContext& context)
-            {
-                AZ_TraceContext("Importer", "Skin");
-
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                if (!context.m_sourceNode.ContainsMesh() || !IsSkinnedMesh(*currentNode, *scene))
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                if (BuildSceneMeshFromAssImpMesh(currentNode, scene, context.m_sourceSceneSystem, context.m_createdData, [] {
-                        return AZStd::make_shared<SceneData::GraphData::SkinMeshData>();
-                    }))
-                {
-                    return Events::ProcessingResult::Success;
-                }
-
-                return Events::ProcessingResult::Failure;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.h
deleted file mode 100644
index fbd59ead14..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpSkinImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpSkinImporter, "{8FBCA725-C04E-42B7-9669-82DB3BB0901F}", SceneCore::LoadingComponent);
-
-                AssImpSkinImporter();
-                ~AssImpSkinImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportSkin(AssImpNodeEncounteredContext& context);
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.cpp
deleted file mode 100644
index db81422a61..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
-#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SceneData/GraphData/SkinWeightData.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            const AZStd::string AssImpSkinWeightsImporter::s_skinWeightName = "SkinWeight_";
-
-            AssImpSkinWeightsImporter::AssImpSkinWeightsImporter()
-            {
-                BindToCall(&AssImpSkinWeightsImporter::ImportSkinWeights);
-                BindToCall(&AssImpSkinWeightsImporter::SetupNamedBoneLinks);
-            }
-
-            void AssImpSkinWeightsImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpSkinWeightsImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-2576
-                }
-            }
-
-            Events::ProcessingResult AssImpSkinWeightsImporter::ImportSkinWeights(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", "Skin Weights");
-
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                if(currentNode->mNumMeshes <= 0)
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                Events::ProcessingResultCombiner combinedSkinWeightsResult;
-
-                // Don't create this until a bone with weights is encountered
-                Containers::SceneGraph::NodeIndex weightsIndexForMesh;
-                AZStd::string skinWeightName;
-                AZStd::shared_ptr<SceneData::GraphData::SkinWeightData> skinWeightData;
-
-                const uint64_t totalVertices = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
-
-                int vertexCount = 0;
-                for(unsigned nodeMeshIndex = 0; nodeMeshIndex < currentNode->mNumMeshes; ++nodeMeshIndex)
-                {
-                    int sceneMeshIndex = currentNode->mMeshes[nodeMeshIndex];
-                    const aiMesh* mesh = scene->mMeshes[sceneMeshIndex];
-
-                    for(unsigned b = 0; b < mesh->mNumBones; ++b)
-                    {
-                        const aiBone* bone = mesh->mBones[b];
-
-                        if(bone->mNumWeights <= 0)
-                        {
-                            continue;
-                        }
-
-                        if (!weightsIndexForMesh.IsValid())
-                        {
-                            skinWeightName = s_skinWeightName;
-                            RenamedNodesMap::SanitizeNodeName(skinWeightName, context.m_scene.GetGraph(), context.m_currentGraphPosition);
-
-                            weightsIndexForMesh =
-                                context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, skinWeightName.c_str());
-
-                            AZ_Error("SkinWeightsImporter", weightsIndexForMesh.IsValid(), "Failed to create SceneGraph node for attribute.");
-                            if (!weightsIndexForMesh.IsValid())
-                            {
-                                combinedSkinWeightsResult += Events::ProcessingResult::Failure;
-                                continue;
-                            }
-                            skinWeightData = AZStd::make_shared<SceneData::GraphData::SkinWeightData>();
-                        }
-                        Pending pending;
-                        pending.m_bone = bone;
-                        pending.m_numVertices = totalVertices;
-                        pending.m_skinWeightData = skinWeightData;
-                        pending.m_vertOffset = vertexCount;
-                        m_pendingSkinWeights.push_back(pending);
-                    }
-                    vertexCount += mesh->mNumVertices;
-                }
-
-                Events::ProcessingResult skinWeightsResult;
-                AssImpSceneAttributeDataPopulatedContext dataPopulated(context, skinWeightData, weightsIndexForMesh, skinWeightName);
-                skinWeightsResult = Events::Process(dataPopulated);
-
-                if (skinWeightsResult != Events::ProcessingResult::Failure)
-                {
-                    skinWeightsResult = AddAttributeDataNodeWithContexts(dataPopulated);
-                }
-
-                combinedSkinWeightsResult += skinWeightsResult;
-
-                return combinedSkinWeightsResult.GetResult();
-            }
-
-            Events::ProcessingResult AssImpSkinWeightsImporter::SetupNamedBoneLinks(AssImpFinalizeSceneContext& /*context*/)
-            {
-                AZ_TraceContext("Importer", "Skin Weights");
-
-                for (auto& it : m_pendingSkinWeights)
-                {
-                    it.m_skinWeightData->ResizeContainerSpace(it.m_numVertices);
-
-                    AZStd::string boneName = it.m_bone->mName.C_Str();
-                    int boneId = it.m_skinWeightData->GetBoneId(boneName);
-
-                    for(unsigned weight = 0; weight < it.m_bone->mNumWeights; ++weight)
-                    {
-                        DataTypes::ISkinWeightData::Link link;
-                        link.boneId = boneId;
-                        link.weight = it.m_bone->mWeights[weight].mWeight;
-
-                        it.m_skinWeightData->AddAndSortLink(it.m_bone->mWeights[weight].mVertexId + it.m_vertOffset, link);
-                    }
-                }
-                const auto result = m_pendingSkinWeights.empty() ? Events::ProcessingResult::Ignored : Events::ProcessingResult::Success;
-                m_pendingSkinWeights.clear();
-                return result;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.h
deleted file mode 100644
index a442a90b39..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <assimp/scene.h>
-#include <AzCore/std/containers/vector.h>
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-#include <SceneAPI/SceneCore/DataTypes/GraphData/ISkinWeightData.h>
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        class FbxMeshWrapper;
-    }
-
-    namespace SceneData
-    {
-        namespace GraphData
-        {
-            class SkinWeightData;
-        }
-    }
-
-    namespace SceneAPI
-    {
-        namespace Events
-        {
-            class PostImportEventContext;
-        }
-
-        namespace FbxSceneBuilder
-        {
-            class AssImpSkinWeightsImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpSkinWeightsImporter, "{79B5E863-C155-473A-BC0D-B85F8D8303EB}", SceneCore::LoadingComponent);
-
-                AssImpSkinWeightsImporter();
-                ~AssImpSkinWeightsImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportSkinWeights(AssImpSceneNodeAppendedContext& context);
-                Events::ProcessingResult SetupNamedBoneLinks(AssImpFinalizeSceneContext& context);
-
-            protected:
-                struct Pending
-                {
-                    const aiBone* m_bone = nullptr;
-                    unsigned m_numVertices = 0;
-                    unsigned m_vertOffset = 0;
-                    AZStd::shared_ptr<SceneData::GraphData::SkinWeightData> m_skinWeightData;
-                };
-
-                //! List of skin weights that still need to be filled in. Setting the data for skin weights is
-                //! delayed until after the tree has been fully constructed as bones are linked by name, but until
-                //! the graph has been fully filled in, those names can change which would break the names recorded
-                //! for the skin.
-                AZStd::vector<Pending> m_pendingSkinWeights;
-
-                static const AZStd::string s_skinWeightName;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.cpp
deleted file mode 100644
index d762b21671..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/numeric.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/SceneData/GraphData/MeshVertexTangentData.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-#include <assimp/scene.h>
-#include <assimp/mesh.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            const char* AssImpTangentStreamImporter::m_defaultNodeName = "Tangent";
-
-            AssImpTangentStreamImporter::AssImpTangentStreamImporter()
-            {
-                BindToCall(&AssImpTangentStreamImporter::ImportTangentStreams);
-            }
-
-            void AssImpTangentStreamImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpTangentStreamImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-3250
-                }
-            }
-
-            Events::ProcessingResult AssImpTangentStreamImporter::ImportTangentStreams(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", m_defaultNodeName);
-                if (!context.m_sourceNode.ContainsMesh())
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-                
-                const auto meshHasTangentsAndBitangents = [&scene](const unsigned int meshIndex)
-                {
-                    return scene->mMeshes[meshIndex]->HasTangentsAndBitangents();
-                };
-
-                // If there are no tangents on any meshes, there's nothing to import in this function.
-                const bool anyMeshHasTangentsAndBitangents = AZStd::any_of(currentNode->mMeshes, currentNode->mMeshes + currentNode->mNumMeshes, meshHasTangentsAndBitangents);
-                if (!anyMeshHasTangentsAndBitangents)
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                // AssImp nodes with multiple meshes on them occur when AssImp split a mesh on material.
-                // This logic recombines those meshes to minimize the changes needed to replace FBX SDK with AssImp, FBX SDK did not separate meshes,
-                // and the engine has code to do this later.
-                const bool allMeshesHaveTangentsAndBitangents = AZStd::all_of(currentNode->mMeshes, currentNode->mMeshes + currentNode->mNumMeshes, meshHasTangentsAndBitangents);
-                if (!allMeshesHaveTangentsAndBitangents)
-                {
-                    AZ_Error(
-                        Utilities::ErrorWindow, false,
-                        "Node with name %s has meshes with and without tangents. "
-                            "Placeholder incorrect tangents will be generated to allow the data to process, "
-                            "but the source art needs to be fixed to correct this. Either apply tangents to all meshes on this node, "
-                            "or remove all tangents from all meshes on this node.",
-                        currentNode->mName.C_Str());
-                }
-
-                const uint64_t vertexCount = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
-
-                AZStd::shared_ptr<SceneData::GraphData::MeshVertexTangentData> tangentStream =
-                    AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexTangentData>();
-                // AssImp only has one tangentStream per mesh.
-                tangentStream->SetTangentSetIndex(0);
-
-                tangentStream->SetTangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::FromFbx);
-                tangentStream->ReserveContainerSpace(vertexCount);
-                for (int sdkMeshIndex = 0; sdkMeshIndex < currentNode->mNumMeshes; ++sdkMeshIndex)
-                {
-                    const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[sdkMeshIndex]];
-
-                    for (int v = 0; v < mesh->mNumVertices; ++v)
-                    {
-                        if (!mesh->HasTangentsAndBitangents())
-                        {
-                            // This node has mixed meshes with and without tangents.
-                            // An error was already thrown above. Output stub tangents so
-                            // the mesh can still be output in some form, even if the data isn't correct.
-                            // The tangent count needs to match the vertex count on the associated mesh node.
-                            tangentStream->AppendTangent(Vector4(0.f, 1.f, 0.f, 1.f));
-                        }
-                        else
-                        {
-                            const Vector4 tangent(
-                                AssImpSDKWrapper::AssImpTypeConverter::ToVector3(mesh->mTangents[v]));
-                            tangentStream->AppendTangent(tangent);
-                        }
-                    }
-                }
-
-                Containers::SceneGraph::NodeIndex newIndex =
-                    context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, m_defaultNodeName);
-
-                Events::ProcessingResult tangentResults;
-                AssImpSceneAttributeDataPopulatedContext dataPopulated(context, tangentStream, newIndex, m_defaultNodeName);
-                tangentResults = Events::Process(dataPopulated);
-
-                if (tangentResults != Events::ProcessingResult::Failure)
-                {
-                    tangentResults = AddAttributeDataNodeWithContexts(dataPopulated);
-                }
-                return tangentResults;
-            }
-
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.h
deleted file mode 100644
index 63e3ed4dc0..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpTangentStreamImporter : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpTangentStreamImporter, "{AB2D1D1E-5A19-40AF-B4F4-C652DD578F43}", SceneCore::LoadingComponent);
-
-                AssImpTangentStreamImporter();
-                ~AssImpTangentStreamImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportTangentStreams(AssImpSceneNodeAppendedContext& context);
-
-            protected:
-                static const char* m_defaultNodeName;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
deleted file mode 100644
index 5f9ffbd9b3..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.h>
-
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneSystem.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneData/GraphData/TransformData.h>
-#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-#include <assimp/scene.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            const char* AssImpTransformImporter::s_transformNodeName = "transform";
-
-            AssImpTransformImporter::AssImpTransformImporter()
-            {
-                BindToCall(&AssImpTransformImporter::ImportTransform);
-            }
-
-            void AssImpTransformImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpTransformImporter, SceneCore::LoadingComponent>()->Version(1);
-                }
-            }
-            
-            void GetAllBones(
-                const aiScene* scene, AZStd::unordered_multimap<AZStd::string, const aiBone*>& boneLookup)
-            {
-                for (unsigned meshIndex = 0; meshIndex < scene->mNumMeshes; ++meshIndex)
-                {
-                    const aiMesh* mesh = scene->mMeshes[meshIndex];
-
-                    for (unsigned boneIndex = 0; boneIndex < mesh->mNumBones; ++boneIndex)
-                    {
-                        const aiBone* bone = mesh->mBones[boneIndex];
-
-                        boneLookup.emplace(bone->mName.C_Str(), bone);
-                    }
-                }
-            }
-
-            Events::ProcessingResult AssImpTransformImporter::ImportTransform(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", "transform");
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                if (currentNode == scene->mRootNode || IsPivotNode(currentNode->mName))
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                AZStd::unordered_multimap<AZStd::string, const aiBone*> boneLookup;
-                GetAllBones(scene, boneLookup);
-
-                auto boneIterator = boneLookup.find(currentNode->mName.C_Str());
-                const bool isBone = boneIterator != boneLookup.end();
-                
-                DataTypes::MatrixType localTransform;
-
-                if (isBone)
-                {
-                    AZStd::vector<DataTypes::MatrixType> offsets, inverseOffsets;
-                    auto iteratingNode = currentNode;
-
-                    while (iteratingNode && boneLookup.count(iteratingNode->mName.C_Str()))
-                    {
-                        AZStd::string name = iteratingNode->mName.C_Str();
-
-                        auto range = boneLookup.equal_range(name);
-
-                        if (range.first != range.second)
-                        {
-                            // There can be multiple offsetMatrices for a given bone, we're only interested in grabbing the first one
-                            auto boneFirstOffsetMatrix = range.first->second->mOffsetMatrix;
-                            auto azMat = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(boneFirstOffsetMatrix);
-                            offsets.push_back(azMat);
-                            inverseOffsets.push_back(azMat.GetInverseFull());
-                        }
-
-                        iteratingNode = iteratingNode->mParent;
-                    }
-
-                    if (inverseOffsets.size() == 1)
-                    {
-                        // If this is the root bone, just use the inverseOffset, otherwise the equation below just results in the identity matrix
-                        localTransform = inverseOffsets[0];
-                    }
-                    else
-                    {
-                        localTransform = offsets.at(1) // parent bone offset
-                            * inverseOffsets.at(inverseOffsets.size() - 1) // Inverse of root bone offset
-                            * offsets.at(offsets.size() - 1) // Root bone offset
-                            * inverseOffsets.at(0); // Inverse of current node offset
-                    }
-                }
-                else
-                {
-                    localTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(GetConcatenatedLocalTransform(currentNode));
-                }
-
-                // Don't bother adding a node with the identity matrix
-                if (localTransform == DataTypes::MatrixType::Identity())
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                context.m_sourceSceneSystem.SwapTransformForUpAxis(localTransform);
-                context.m_sourceSceneSystem.ConvertUnit(localTransform);
-
-                AZStd::shared_ptr<SceneData::GraphData::TransformData> transformData =
-                    AZStd::make_shared<SceneData::GraphData::TransformData>(localTransform);
-                AZ_Error(SceneAPI::Utilities::ErrorWindow, transformData, "Failed to allocate transform data.");
-                if (!transformData)
-                {
-                    return Events::ProcessingResult::Failure;
-                }
-
-                // If it is non-endpoint data populated node, add a transform attribute
-                if (context.m_scene.GetGraph().HasNodeContent(context.m_currentGraphPosition))
-                {
-                    if (!context.m_scene.GetGraph().IsNodeEndPoint(context.m_currentGraphPosition))
-                    {
-                        AZStd::string nodeName = s_transformNodeName;
-                        RenamedNodesMap::SanitizeNodeName(nodeName, context.m_scene.GetGraph(), context.m_currentGraphPosition);
-                        AZ_TraceContext("Transform node name", nodeName);
-
-                        Containers::SceneGraph::NodeIndex newIndex =
-                            context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, nodeName.c_str());
-
-                        AZ_Error(SceneAPI::Utilities::ErrorWindow, newIndex.IsValid(), "Failed to create SceneGraph node for attribute.");
-                        if (!newIndex.IsValid())
-                        {
-                            return Events::ProcessingResult::Failure;
-                        }
-
-                        Events::ProcessingResult transformAttributeResult;
-                        AssImpSceneAttributeDataPopulatedContext dataPopulated(context, transformData, newIndex, nodeName);
-                        transformAttributeResult = Events::Process(dataPopulated);
-
-                        if (transformAttributeResult != Events::ProcessingResult::Failure)
-                        {
-                            transformAttributeResult = AddAttributeDataNodeWithContexts(dataPopulated);
-                        }
-
-                        return transformAttributeResult;
-                    }
-                }
-                else
-                {
-                    bool addedData = context.m_scene.GetGraph().SetContent(context.m_currentGraphPosition, transformData);
-
-                    AZ_Error(SceneAPI::Utilities::ErrorWindow, addedData, "Failed to add node data");
-                    return addedData ? Events::ProcessingResult::Success : Events::ProcessingResult::Failure;
-                }
-
-                return Events::ProcessingResult::Ignored;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.h
deleted file mode 100644
index 4e1bc8c05e..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpTransformImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpTransformImporter, "{A7494C53-5822-40EF-9B60-B1FF09FBFA59}", SceneCore::LoadingComponent);
-
-                AssImpTransformImporter();
-                ~AssImpTransformImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportTransform(AssImpSceneNodeAppendedContext& context);
-                static const char* s_transformNodeName;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp
deleted file mode 100644
index b92b86fa25..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/std/containers/array.h>
-#include <AzCore/std/numeric.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SceneData/GraphData/MeshVertexUVData.h>
-#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
-
-#include <assimp/scene.h>
-#include <assimp/mesh.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            const char* AssImpUvMapImporter::m_defaultNodeName = "UV";
-
-            AssImpUvMapImporter::AssImpUvMapImporter()
-            {
-                BindToCall(&AssImpUvMapImporter::ImportUvMaps);
-            }
-
-            void AssImpUvMapImporter::Reflect(ReflectContext* context)
-            {
-                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
-                if (serializeContext)
-                {
-                    serializeContext->Class<AssImpUvMapImporter, SceneCore::LoadingComponent>()->Version(4); // LYN-3250
-                }
-            }
-
-            Events::ProcessingResult AssImpUvMapImporter::ImportUvMaps(AssImpSceneNodeAppendedContext& context)
-            {
-                AZ_TraceContext("Importer", m_defaultNodeName);
-                if (!context.m_sourceNode.ContainsMesh())
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
-                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
-
-                // AssImp separates meshes that have multiple materials.
-                // This code re-combines them to match previous FBX SDK behavior,
-                // so they can be separated by engine code instead.
-                bool foundTextureCoordinates = false;
-                AZStd::array<int, AI_MAX_NUMBER_OF_TEXTURECOORDS> meshesPerTextureCoordinateIndex = {};
-                for (int localMeshIndex = 0; localMeshIndex < currentNode->mNumMeshes; ++localMeshIndex)
-                {
-                    aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[localMeshIndex]];
-                    for (int texCoordIndex = 0; texCoordIndex < meshesPerTextureCoordinateIndex.size(); ++texCoordIndex)
-                    {
-                        if (!mesh->mTextureCoords[texCoordIndex])
-                        {
-                            continue;
-                        }
-                        ++meshesPerTextureCoordinateIndex[texCoordIndex];
-                        foundTextureCoordinates = true;
-                    }
-                }
-
-                if (!foundTextureCoordinates)
-                {
-                    return Events::ProcessingResult::Ignored;
-                }
-
-                const uint64_t vertexCount = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
-
-                for (int texCoordIndex = 0; texCoordIndex < meshesPerTextureCoordinateIndex.size(); ++texCoordIndex)
-                {
-                    AZ_Error(
-                        Utilities::ErrorWindow,
-                        meshesPerTextureCoordinateIndex[texCoordIndex] == 0 ||
-                            meshesPerTextureCoordinateIndex[texCoordIndex] == currentNode->mNumMeshes,
-                        "Texture coordinate index %d for node %s is not on all meshes on this node. "
-                            "Placeholder arbitrary texture values will be generated to allow the data to process, but the source art "
-                            "needs to be fixed to correct this. All meshes on this node should have the same number of texture coordinate channels.",
-                        texCoordIndex,
-                        currentNode->mName.C_Str());
-                }
-
-                Events::ProcessingResultCombiner combinedUvMapResults;
-                for (int texCoordIndex = 0; texCoordIndex < meshesPerTextureCoordinateIndex.size(); ++texCoordIndex)
-                {
-                    // No meshes have this texture coordinate index, skip it.
-                    if (meshesPerTextureCoordinateIndex[texCoordIndex] == 0)
-                    {
-                        continue;
-                    }
-
-                    AZStd::shared_ptr<SceneData::GraphData::MeshVertexUVData> uvMap =
-                        AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexUVData>();
-                    uvMap->ReserveContainerSpace(vertexCount);
-                    bool customNameFound = false;
-                    AZStd::string name(AZStd::string::format("%s%d", m_defaultNodeName, texCoordIndex));
-                    for (int sdkMeshIndex = 0; sdkMeshIndex < currentNode->mNumMeshes; ++sdkMeshIndex)
-                    {
-                        const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[sdkMeshIndex]];
-                        if(mesh->mTextureCoords[texCoordIndex])
-                        {
-                            if (mesh->mTextureCoordsNames[texCoordIndex].length > 0)
-                            {
-                                if (!customNameFound)
-                                {
-                                    name = mesh->mTextureCoordsNames[texCoordIndex].C_Str();
-                                    customNameFound = true;
-                                }
-                                else
-                                {
-                                    AZ_Warning(Utilities::WarningWindow,
-                                        strcmp(name.c_str(), mesh->mTextureCoordsNames[texCoordIndex].C_Str()) == 0,
-                                        "Node %s has conflicting mesh coordinate names at index %d, %s and %s. Using %s.",
-                                        currentNode->mName.C_Str(),
-                                        texCoordIndex,
-                                        name.c_str(),
-                                        mesh->mTextureCoordsNames[texCoordIndex].C_Str(),
-                                        name.c_str());
-                                }
-                            }
-                        }
-
-                        for (int v = 0; v < mesh->mNumVertices; ++v)
-                        {
-                            if (mesh->mTextureCoords[texCoordIndex])
-                            {
-                                AZ::Vector2 vertexUV(
-                                    mesh->mTextureCoords[texCoordIndex][v].x,
-                                    // The engine's V coordinate is reverse of how it's stored in the FBX file.
-                                    1.0f - mesh->mTextureCoords[texCoordIndex][v].y);
-                                uvMap->AppendUV(vertexUV);
-                            }
-                            else
-                            {
-                                // An error was already emitted if the UV channels for all meshes on this node do not match.
-                                // Append an arbitrary UV value so that the mesh can still be processed.
-                                // It's better to let the engine load a partially valid mesh than to completely fail.
-                                uvMap->AppendUV(AZ::Vector2::CreateZero());
-                            }
-                        }
-                    }
-
-                    uvMap->SetCustomName(name.c_str());
-                    Containers::SceneGraph::NodeIndex newIndex =
-                        context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, name.c_str());
-
-                    Events::ProcessingResult uvMapResults;
-                    AssImpSceneAttributeDataPopulatedContext dataPopulated(context, uvMap, newIndex, name);
-                    uvMapResults = Events::Process(dataPopulated);
-
-                    if (uvMapResults != Events::ProcessingResult::Failure)
-                    {
-                        uvMapResults = AddAttributeDataNodeWithContexts(dataPopulated);
-                    }
-
-                    combinedUvMapResults += uvMapResults;
-
-                }
-
-                return combinedUvMapResults.GetResult();
-            }
-
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.h
deleted file mode 100644
index 0334fa01d1..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class AssImpUvMapImporter
-                : public SceneCore::LoadingComponent
-            {
-            public:
-                AZ_COMPONENT(AssImpUvMapImporter, "{BF02F231-848B-4CDB-9B11-55EEE15CFAA6}", SceneCore::LoadingComponent);
-
-                AssImpUvMapImporter();
-                ~AssImpUvMapImporter() override = default;
-
-                static void Reflect(ReflectContext* context);
-
-                Events::ProcessingResult ImportUvMaps(AssImpSceneNodeAppendedContext& context);
-
-            protected:
-                static const char* m_defaultNodeName;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.cpp
deleted file mode 100644
index 0b8c51d079..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.cpp
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Math/Transform.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/Views/PairIterator.h>
-#include <SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h>
-#include <SceneAPI/SceneData/GraphData/AnimationData.h>
-#include <SceneAPI/SceneData/GraphData/BoneData.h>
-#include <SceneAPI/SceneData/GraphData/MaterialData.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SceneData/GraphData/MeshVertexColorData.h>
-#include <SceneAPI/SceneData/GraphData/MeshVertexUVData.h>
-#include <SceneAPI/SceneData/GraphData/SkinWeightData.h>
-#include <SceneAPI/SceneData/GraphData/TransformData.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            static const float g_sceneUtilityEqualityEpsilon = 0.001f;
-
-            CoreProcessingResult AddDataNodeWithContexts(SceneDataPopulatedContextBase& dataPopulated)
-            {
-                AZ_TraceContext("Node Name", dataPopulated.m_dataName);
-                const char* nodeTypeName = dataPopulated.m_graphData ? dataPopulated.m_graphData->RTTI_GetTypeName() : "Null";
-                AZ_TraceContext("Node Type", (!nodeTypeName || nodeTypeName[0] == '\0' ? "Null" : nodeTypeName));
-                
-                Events::ProcessingResultCombiner nodeResults;
-                nodeResults += Events::Process(dataPopulated);
-
-                dataPopulated.m_scene.GetGraph().SetContent(dataPopulated.m_currentGraphPosition,
-                    AZStd::move(dataPopulated.m_graphData));
-
-                if (azrtti_istypeof<AssImpSceneDataPopulatedContext>(dataPopulated))
-                {
-                    AssImpSceneDataPopulatedContext* dataPopulatedContext = azrtti_cast<AssImpSceneDataPopulatedContext*>(&dataPopulated);
-                    AssImpSceneNodeAppendedContext nodeAppended(*dataPopulatedContext, dataPopulated.m_currentGraphPosition);
-                    nodeResults += Events::Process(nodeAppended);
-
-                    AssImpSceneNodeAddedAttributesContext addedAttributes(nodeAppended);
-                    nodeResults += Events::Process(addedAttributes);
-
-                    AssImpSceneNodeFinalizeContext finalizeNode(addedAttributes);
-                    nodeResults += Events::Process(finalizeNode);
-                }
-
-                return nodeResults.GetResult();
-            }
-
-            CoreProcessingResult AddAttributeDataNodeWithContexts(SceneAttributeDataPopulatedContextBase& dataPopulated)
-            {
-                AZ_TraceContext("Node Name", dataPopulated.m_dataName);
-                const char* nodeTypeName = dataPopulated.m_graphData ? dataPopulated.m_graphData->RTTI_GetTypeName() : "Null";
-                AZ_TraceContext("Node Type", (!nodeTypeName || nodeTypeName[0] == '\0' ? "Null" : nodeTypeName));
-
-                Events::ProcessingResultCombiner nodeResults;
-                nodeResults += Events::Process(dataPopulated);
-
-                dataPopulated.m_scene.GetGraph().MakeEndPoint(dataPopulated.m_currentGraphPosition);
-
-                dataPopulated.m_scene.GetGraph().SetContent(dataPopulated.m_currentGraphPosition,
-                    AZStd::move(dataPopulated.m_graphData));
-                if (azrtti_istypeof<AssImpSceneAttributeDataPopulatedContext>(dataPopulated))
-                {
-                    AssImpSceneAttributeDataPopulatedContext* dataPopulatedContext = azrtti_cast<AssImpSceneAttributeDataPopulatedContext*>(&dataPopulated);
-                    AssImpSceneAttributeNodeAppendedContext nodeAppended(*dataPopulatedContext, dataPopulated.m_currentGraphPosition);
-                    nodeResults += Events::Process(nodeAppended);
-                }
-
-                return nodeResults.GetResult();
-            }
-
-            bool AreSceneGraphsEqual(const CoreSceneGraph& lhsGraph, const CoreSceneGraph& rhsGraph)
-            {
-                auto lhsContentStorage = lhsGraph.GetContentStorage();
-                auto lhsNameStorage = lhsGraph.GetNameStorage();
-                
-                auto lhsNameContentView = Containers::Views::MakePairView(lhsNameStorage, lhsContentStorage);
-                Containers::SceneGraph::NodeIndex lhsRootIndex = lhsGraph.GetRoot();
-                auto lhsDownwardView =
-                    Containers::Views::MakeSceneGraphDownwardsView<Containers::Views::BreadthFirst>(lhsGraph, lhsRootIndex,
-                    lhsNameContentView.begin(), true);
-
-                auto rhsContentStorage = rhsGraph.GetContentStorage();
-                auto rhsNameStorage = rhsGraph.GetNameStorage();
-                
-                auto rhsNameContentView = Containers::Views::MakePairView(rhsNameStorage, rhsContentStorage);
-                Containers::SceneGraph::NodeIndex rhsRootIndex = rhsGraph.GetRoot();
-                auto rhsDownwardView =
-                    Containers::Views::MakeSceneGraphDownwardsView<Containers::Views::BreadthFirst>(rhsGraph, rhsRootIndex,
-                    rhsNameContentView.begin(), true);
-
-                auto lhsIt = lhsDownwardView.begin();
-                auto rhsIt = rhsDownwardView.begin();
-
-                while (lhsIt != lhsDownwardView.end() && rhsIt != rhsDownwardView.end())
-                {
-                    if (!IsGraphDataEqual(lhsIt->second, rhsIt->second))
-                    {
-                        return false;
-                    }
-                    if (lhsIt->first != rhsIt->first)
-                    {
-                        return false;
-                    }
-
-                    ++lhsIt;
-                    ++rhsIt;
-                }
-
-                return (lhsIt == lhsDownwardView.end() && rhsIt == rhsDownwardView.end());
-            }
-            
-            bool operator==(const SceneData::GraphData::MeshData& lhs,
-                const SceneData::GraphData::MeshData& rhs)
-            {
-                if (lhs.GetVertexCount() != rhs.GetVertexCount())
-                {
-                    return false;
-                }
-
-                if (lhs.HasNormalData() != rhs.HasNormalData())
-                {
-                    return false;
-                }
-
-                if (lhs.GetFaceCount() != rhs.GetFaceCount())
-                {
-                    return false;
-                }
-
-                bool hasNormals = lhs.HasNormalData();
-                unsigned int vertexCount = lhs.GetVertexCount();
-                for (unsigned int vertexIndex = 0; vertexIndex < vertexCount; ++vertexIndex)
-                {
-                    if (lhs.GetPosition(vertexIndex) != rhs.GetPosition(vertexIndex))
-                    {
-                        return false;
-                    }
-
-                    if (hasNormals && (lhs.GetNormal(vertexIndex) != rhs.GetNormal(vertexIndex)))
-                    {
-                        return false;
-                    }
-                }
-
-                unsigned int faceCount = lhs.GetFaceCount();
-                for (unsigned int faceIndex = 0; faceIndex < faceCount; ++faceIndex)
-                {
-                    if (lhs.GetFaceMaterialId(faceIndex) != rhs.GetFaceMaterialId(faceIndex))
-                    {
-                        return false;
-                    }
-
-                    if (lhs.GetFaceInfo(faceIndex) != rhs.GetFaceInfo(faceIndex))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-
-            bool operator==(const SceneData::GraphData::SkinWeightData& lhs,
-                const SceneData::GraphData::SkinWeightData& rhs)
-            {
-                if (lhs.GetVertexCount() != rhs.GetVertexCount())
-                {
-                    return false;
-                }
-
-                if (lhs.GetBoneCount() != rhs.GetBoneCount())
-                {
-                    return false;
-                }
-
-                size_t vertexCount = lhs.GetVertexCount();
-                for (size_t vertexIndex = 0; vertexIndex < vertexCount; ++vertexIndex)
-                {
-                    if (lhs.GetLinkCount(vertexIndex) != rhs.GetLinkCount(vertexIndex))
-                    {
-                        return false;
-                    }
-
-                    size_t linkCount = lhs.GetLinkCount(vertexIndex);
-                    for (size_t linkIndex = 0; linkIndex < linkCount; ++linkIndex)
-                    {
-                        const DataTypes::ISkinWeightData::Link lhsLink = lhs.GetLink(vertexIndex, linkIndex);
-                        const DataTypes::ISkinWeightData::Link rhsLink = rhs.GetLink(vertexIndex, linkIndex);
-
-                        if (lhsLink.boneId != rhsLink.boneId || !IsClose(lhsLink.weight, rhsLink.weight, g_sceneUtilityEqualityEpsilon))
-                        {
-                            return false;
-                        }
-
-                        if (lhs.GetBoneName(lhsLink.boneId) != rhs.GetBoneName(rhsLink.boneId))
-                        {
-                            return false;
-                        }
-                    }
-                }
-
-                return true;
-            }
-
-            bool operator==(const SceneData::GraphData::BoneData& lhs,
-                const SceneData::GraphData::BoneData& rhs)
-            {
-                return (lhs.GetWorldTransform() == rhs.GetWorldTransform());
-            }
-
-            bool operator==(const DataTypes::Color& lhs, const DataTypes::Color& rhs)
-            {
-                if (!IsClose(lhs.alpha, rhs.alpha, g_sceneUtilityEqualityEpsilon) ||
-                    !IsClose(lhs.blue, rhs.blue, g_sceneUtilityEqualityEpsilon) ||
-                    !IsClose(lhs.green, rhs.green, g_sceneUtilityEqualityEpsilon) ||
-                    !IsClose(lhs.red, rhs.red, g_sceneUtilityEqualityEpsilon))
-                {
-                    return false;
-                }
-
-                return true;
-            }
-
-            bool operator!=(const DataTypes::Color& lhs, const DataTypes::Color& rhs)
-            {
-                return !(lhs == rhs);
-            }
-
-            bool operator==(const SceneData::GraphData::MeshVertexColorData& lhs,
-                const SceneData::GraphData::MeshVertexColorData& rhs)
-            {
-                if (lhs.GetCount() != rhs.GetCount())
-                {
-                    return false;
-                }
-
-                size_t colorCount = lhs.GetCount();
-                for (size_t colorIndex = 0; colorIndex < colorCount; ++colorIndex)
-                {
-                    if (lhs.GetColor(colorIndex) != rhs.GetColor(colorIndex))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-
-            bool operator==(const SceneData::GraphData::MeshVertexUVData& lhs,
-                const SceneData::GraphData::MeshVertexUVData& rhs)
-            {
-                if (lhs.GetCount() != rhs.GetCount())
-                {
-                    return false;
-                }
-                size_t uvCount = lhs.GetCount();
-                for (size_t uvIndex = 0; uvIndex < uvCount; ++uvIndex)
-                {
-                    if (lhs.GetUV(uvIndex) != rhs.GetUV(uvIndex))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-
-            bool operator==(const SceneData::GraphData::MaterialData& lhs,
-                const SceneData::GraphData::MaterialData& rhs)
-            {
-                if (lhs.IsNoDraw() != rhs.IsNoDraw())
-                {
-                    return false;
-                }
-
-                if (lhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Diffuse) !=
-                    rhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Diffuse))
-                {
-                    return false;
-                }
-
-                if (lhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Specular) !=
-                    rhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Specular))
-                {
-                    return false;
-                }
-
-                if (lhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Bump) !=
-                    rhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Bump))
-                {
-                    return false;
-                }
-
-                return true;
-            }
-
-            bool operator==(const SceneData::GraphData::TransformData& lhs,
-                const SceneData::GraphData::TransformData& rhs)
-            {
-                return lhs.GetMatrix() == rhs.GetMatrix();
-            }
-
-            bool operator==(const SceneData::GraphData::AnimationData& lhs,
-                const SceneData::GraphData::AnimationData& rhs)
-            {
-                if (lhs.GetKeyFrameCount() != rhs.GetKeyFrameCount())
-                {
-                    return false;
-                }
-
-                size_t keyFrameCount = lhs.GetKeyFrameCount();
-                
-                for (size_t keyFrameIndex = 0; keyFrameIndex < keyFrameCount; ++keyFrameIndex)
-                {
-                    if (lhs.GetKeyFrame(keyFrameIndex) != rhs.GetKeyFrame(keyFrameIndex))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-
-            bool IsGraphDataEqual(const AZStd::shared_ptr<const DataTypes::IGraphObject>& lhs,
-                const AZStd::shared_ptr<const DataTypes::IGraphObject>& rhs)
-            {
-                // If both are null, they are considered equal
-                if (!lhs && !rhs)
-                {
-                    return true;
-                }
-
-                // If only one is null, they are considered not equal
-                if (!lhs || !rhs)
-                {
-                    return false;
-                }
-
-                // If they have disparate types they are considered not equal
-                if (lhs->RTTI_GetType() != rhs->RTTI_GetType())
-                {
-                    return false;
-                }
-
-                if (lhs->RTTI_IsTypeOf(SceneData::GraphData::BoneData::TYPEINFO_Uuid()))
-                {
-                    const SceneData::GraphData::BoneData* lhsBone = 
-                        azrtti_cast<const SceneData::GraphData::BoneData*>(lhs.get());
-                    const SceneData::GraphData::BoneData* rhsBone =
-                        azrtti_cast<const SceneData::GraphData::BoneData*>(rhs.get());
-
-                    return (*lhsBone == *rhsBone);
-                }
-                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::MeshData::TYPEINFO_Uuid()))
-                {
-                    const SceneData::GraphData::MeshData* lhsMesh =
-                        azrtti_cast<const SceneData::GraphData::MeshData*>(lhs.get());
-                    const SceneData::GraphData::MeshData* rhsMesh =
-                        azrtti_cast<const SceneData::GraphData::MeshData*>(rhs.get());
-
-                    return (*lhsMesh == *rhsMesh);
-                }
-                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::SkinWeightData::TYPEINFO_Uuid()))
-                {
-                    const SceneData::GraphData::SkinWeightData* lhsSkinWeights =
-                        azrtti_cast<const SceneData::GraphData::SkinWeightData*>(lhs.get());
-                    const SceneData::GraphData::SkinWeightData* rhsSkinWeights =
-                        azrtti_cast<const SceneData::GraphData::SkinWeightData*>(rhs.get());
-
-                    return (*lhsSkinWeights == *rhsSkinWeights);
-                }
-                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::MeshVertexColorData::TYPEINFO_Uuid()))
-                {
-                    const SceneData::GraphData::MeshVertexColorData* lhsColorData =
-                        azrtti_cast<const SceneData::GraphData::MeshVertexColorData*>(lhs.get());
-                    const SceneData::GraphData::MeshVertexColorData* rhsColorData =
-                        azrtti_cast<const SceneData::GraphData::MeshVertexColorData*>(rhs.get());
-
-                    return (*lhsColorData == *rhsColorData);
-                }
-                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::MeshVertexUVData::TYPEINFO_Uuid()))
-                {
-                    const SceneData::GraphData::MeshVertexUVData* lhsUVData =
-                        azrtti_cast<const SceneData::GraphData::MeshVertexUVData*>(lhs.get());
-                    const SceneData::GraphData::MeshVertexUVData* rhsUVData =
-                        azrtti_cast<const SceneData::GraphData::MeshVertexUVData*>(rhs.get());
-
-                    return (*lhsUVData == *rhsUVData);
-                }
-                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::MaterialData::TYPEINFO_Uuid()))
-                {
-                    const SceneData::GraphData::MaterialData* lhsMaterialData =
-                        azrtti_cast<const SceneData::GraphData::MaterialData*>(lhs.get());
-                    const SceneData::GraphData::MaterialData* rhsMaterialData =
-                        azrtti_cast<const SceneData::GraphData::MaterialData*>(rhs.get());
-
-                    return (*lhsMaterialData == *rhsMaterialData);
-                }
-                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::TransformData::TYPEINFO_Uuid()))
-                {
-                    const SceneData::GraphData::TransformData* lhsTransform =
-                        azrtti_cast<const SceneData::GraphData::TransformData*>(lhs.get());
-                    const SceneData::GraphData::TransformData* rhsTransform =
-                        azrtti_cast<const SceneData::GraphData::TransformData*>(rhs.get());
-
-                    return (*lhsTransform == *rhsTransform);
-                }
-                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::AnimationData::TYPEINFO_Uuid()))
-                {
-                    const SceneData::GraphData::AnimationData* lhsAnimation =
-                        azrtti_cast<const SceneData::GraphData::AnimationData*>(lhs.get());
-                    const SceneData::GraphData::AnimationData* rhsAnimation =
-                        azrtti_cast<const SceneData::GraphData::AnimationData*>(rhs.get());
-
-                    return (*lhsAnimation == *rhsAnimation);
-                }
-
-
-                return true;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h
deleted file mode 100644
index c035630ea6..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/DataTypes/MatrixType.h>
-#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
-
-namespace AZ
-{
-    struct Uuid;
-
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            struct FbxImportContext;
-
-            using CoreScene = Containers::Scene;
-            using CoreSceneGraph = Containers::SceneGraph;
-            using CoreGraphNodeIndex = Containers::SceneGraph::NodeIndex;
-            using CoreProcessingResult = Events::ProcessingResult;
-
-            inline bool NodeIsOfType(const CoreSceneGraph& graph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid);
-            inline bool NodeParentIsOfType(const CoreSceneGraph& graph, CoreGraphNodeIndex nodeIndex, 
-                const AZ::Uuid& uuid);
-            inline bool NodeHasAncestorOfType(const CoreSceneGraph& graph, CoreGraphNodeIndex nodeIndex,
-                const AZ::Uuid& uuid);
-            CoreProcessingResult AddDataNodeWithContexts(SceneDataPopulatedContextBase& dataContext);
-            CoreProcessingResult AddAttributeDataNodeWithContexts(SceneAttributeDataPopulatedContextBase& dataContext);
-            bool AreSceneGraphsEqual(const CoreSceneGraph& lhsGraph, const CoreSceneGraph& rhsGraph);
-            inline bool AreScenesEqual(const CoreScene& lhs, const CoreScene& rhs);
-
-            bool IsGraphDataEqual(const AZStd::shared_ptr<const DataTypes::IGraphObject>& lhs,
-                const AZStd::shared_ptr<const DataTypes::IGraphObject>& rhs);
-
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
-
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.inl>
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.inl b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.inl
deleted file mode 100644
index f04497613b..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.inl
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/DataTypes/IGraphObject.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            bool NodeIsOfType(const CoreSceneGraph& sceneGraph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid)
-            {
-                if (nodeIndex.IsValid() && sceneGraph.HasNodeContent(nodeIndex) &&
-                    sceneGraph.GetNodeContent(nodeIndex)->RTTI_IsTypeOf(uuid))
-                {
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            bool NodeParentIsOfType(const CoreSceneGraph& sceneGraph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid)
-            {
-                CoreGraphNodeIndex parentIndex = sceneGraph.GetNodeParent(nodeIndex);
-                return NodeIsOfType(sceneGraph, parentIndex, uuid);
-            }
-
-            bool NodeHasAncestorOfType(const CoreSceneGraph& sceneGraph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid)
-            {
-                CoreGraphNodeIndex parentIndex = sceneGraph.GetNodeParent(nodeIndex);
-                while (parentIndex.IsValid())
-                {
-                    if (NodeIsOfType(sceneGraph, parentIndex, uuid))
-                    {
-                        return true;
-                    }
-                    parentIndex = sceneGraph.GetNodeParent(parentIndex);
-                }
-
-                return false;
-            }
-
-            bool AreScenesEqual(const CoreScene& lhs, const CoreScene& rhs)
-            {
-                if (lhs.GetGraph().GetNodeCount() != rhs.GetGraph().GetNodeCount())
-                {
-                    return false;
-                }
-
-                if (!AreSceneGraphsEqual(lhs.GetGraph(), rhs.GetGraph()))
-                {
-                    return false;
-                }
-
-                return true;
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp
deleted file mode 100644
index b691964a74..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <assimp/mesh.h>
-#include <assimp/scene.h>
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/std/numeric.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <SceneAPI/FbxSceneBuilder/FbxSceneSystem.h>
-#include <SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SceneData/GraphData/BlendShapeData.h>
-#include <SceneAPI/SceneData/GraphData/BoneData.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-
-namespace AZ::SceneAPI::FbxSceneBuilder
-{
-    bool BuildSceneMeshFromAssImpMesh(const aiNode* currentNode, const aiScene* scene, const FbxSceneSystem& sceneSystem, AZStd::vector<AZStd::shared_ptr<DataTypes::IGraphObject>>& meshes,
-        const AZStd::function<AZStd::shared_ptr<SceneData::GraphData::MeshData>()>& makeMeshFunc)
-    {
-        AZStd::unordered_map<int, int> assImpMatIndexToLYIndex;
-        int lyMeshIndex = 0;
-
-        if(!currentNode || !scene)
-        {
-            return false;
-        }
-        auto newMesh = makeMeshFunc();
-
-        newMesh->SetUnitSizeInMeters(sceneSystem.GetUnitSizeInMeters());
-        newMesh->SetOriginalUnitSizeInMeters(sceneSystem.GetOriginalUnitSizeInMeters());
-
-        // AssImp separates meshes that have multiple materials.
-        // This code re-combines them to match previous FBX SDK behavior,
-        // so they can be separated by engine code instead.
-        int vertOffset = 0;
-        for (int m = 0; m < currentNode->mNumMeshes; ++m)
-        {
-            const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[m]];
-
-            // Lumberyard materials are created in order based on mesh references in the scene
-            if (assImpMatIndexToLYIndex.find(mesh->mMaterialIndex) == assImpMatIndexToLYIndex.end())
-            {
-                assImpMatIndexToLYIndex.insert(AZStd::pair<int, int>(mesh->mMaterialIndex, lyMeshIndex++));
-            }
-
-            for (int vertIdx = 0; vertIdx < mesh->mNumVertices; ++vertIdx)
-            {
-                AZ::Vector3 vertex(mesh->mVertices[vertIdx].x, mesh->mVertices[vertIdx].y, mesh->mVertices[vertIdx].z);
-
-                sceneSystem.SwapVec3ForUpAxis(vertex);
-                sceneSystem.ConvertUnit(vertex);
-                newMesh->AddPosition(vertex);
-                newMesh->SetVertexIndexToControlPointIndexMap(vertIdx + vertOffset, vertIdx + vertOffset);
-
-                if (mesh->HasNormals())
-                {
-                    AZ::Vector3 normal(mesh->mNormals[vertIdx].x, mesh->mNormals[vertIdx].y, mesh->mNormals[vertIdx].z);
-                    sceneSystem.SwapVec3ForUpAxis(normal);
-                    normal.NormalizeSafe();
-                    newMesh->AddNormal(normal);
-                }
-            }
-
-            for (int faceIdx = 0; faceIdx < mesh->mNumFaces; ++faceIdx)
-            {
-                aiFace face = mesh->mFaces[faceIdx];
-                AZ::SceneAPI::DataTypes::IMeshData::Face meshFace;
-                if (face.mNumIndices != 3)
-                {
-                    // AssImp should have triangulated everything, so if this happens then someone has
-                    // probably changed AssImp's import settings. The engine only supports triangles.
-                    AZ_Error(Utilities::ErrorWindow, false,
-                        "Mesh on node %s has a face with %d vertices, only 3 vertices are supported per face.",
-                        currentNode->mName.C_Str(),
-                        face.mNumIndices);
-                    continue;
-                }
-                for (int idx = 0; idx < face.mNumIndices; ++idx)
-                {
-                    meshFace.vertexIndex[idx] = face.mIndices[idx] + vertOffset;
-                }
-
-                newMesh->AddFace(meshFace, assImpMatIndexToLYIndex[mesh->mMaterialIndex]);
-            }
-            vertOffset += mesh->mNumVertices;
-
-        }
-        meshes.push_back(newMesh);
-
-        return true;
-    }
-
-    GetMeshDataFromParentResult GetMeshDataFromParent(AssImpSceneNodeAppendedContext& context)
-    {
-        const DataTypes::IGraphObject* const parentData =
-            context.m_scene.GetGraph().GetNodeContent(context.m_currentGraphPosition).get();
-
-        if (!parentData)
-        {
-            AZ_Error(Utilities::ErrorWindow, false,
-                "GetMeshDataFromParent failed because the parent was null, it should only be called with a valid parent node");
-            return AZ::Failure(Events::ProcessingResult::Failure);
-        }
-
-        if (!parentData->RTTI_IsTypeOf(SceneData::GraphData::MeshData::TYPEINFO_Uuid()))
-        {
-            // The parent node may contain bone information and not mesh information, skip it.
-            if (parentData->RTTI_IsTypeOf(SceneData::GraphData::BoneData::TYPEINFO_Uuid()))
-            {
-                // Return the ignore processing result in the failure.
-                return AZ::Failure(Events::ProcessingResult::Ignored);
-            }
-            AZ_Error(Utilities::ErrorWindow, false,
-                "Tried to get mesh data from parent for non-mesh parent data");
-            return AZ::Failure(Events::ProcessingResult::Failure);
-        }
-
-        const SceneData::GraphData::MeshData* const parentMeshData =
-            azrtti_cast<const SceneData::GraphData::MeshData* const>(parentData);
-        return AZ::Success(parentMeshData);
-    }
-
-    uint64_t GetVertexCountForAllMeshesOnNode(const aiNode& node, const aiScene& scene)
-    {
-        return AZStd::accumulate(node.mMeshes, node.mMeshes + node.mNumMeshes, uint64_t{ 0u },
-            [&scene](auto runningTotal, unsigned int meshIndex)
-            {
-                return runningTotal + scene.mMeshes[meshIndex]->mNumVertices;
-            });
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h
deleted file mode 100644
index 60e08177b7..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <SceneAPI/SceneCore/Events/ProcessingResult.h>
-
-struct aiNode;
-struct aiScene;
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        class FbxMeshWrapper;
-    }
-
-    namespace SceneData
-    {
-        namespace GraphData
-        {
-            class MeshData;
-            class BlendShapeData;
-        }
-    }
-
-    namespace SceneAPI
-    {
-        namespace DataTypes
-        {
-            class IGraphObject;
-        }
-        struct AssImpSceneNodeAppendedContext;
-        class FbxSceneSystem;
-
-        namespace FbxSceneBuilder
-        {
-            bool BuildSceneMeshFromAssImpMesh(const aiNode* currentNode, const aiScene* scene, const FbxSceneSystem& sceneSystem, AZStd::vector<AZStd::shared_ptr<DataTypes::IGraphObject>>& meshes,
-                const AZStd::function<AZStd::shared_ptr<SceneData::GraphData::MeshData>()>& makeMeshFunc);
-
-            typedef AZ::Outcome<const SceneData::GraphData::MeshData* const, Events::ProcessingResult> GetMeshDataFromParentResult;
-            GetMeshDataFromParentResult GetMeshDataFromParent(AssImpSceneNodeAppendedContext& context);
-
-            // If a node in the original scene file has a mesh with multiple materials on it, the associated AssImp
-            // node will have multiple meshes on it, broken apart per material. This returns the total number
-            // of vertices on all meshes on the given node.
-            uint64_t GetVertexCountForAllMeshesOnNode(const aiNode& node, const aiScene& scene);
-        }
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.cpp
deleted file mode 100644
index d5dd8fae3f..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/std/algorithm.h>
-#include <AzCore/std/string/conversions.h>
-#include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            bool RenamedNodesMap::SanitizeNodeName(AZStd::string& name, const Containers::SceneGraph& graph,
-                Containers::SceneGraph::NodeIndex parentNode, const char* defaultName)
-            {
-                AZ_TraceContext("Node name", name);
-                const AZStd::string originalNodeName(name);
-
-                bool isNameUpdated = false;
-                // Nodes can't have an empty name, except of the root, otherwise nodes can't be referenced.
-                if (name.empty())
-                {
-                    name = defaultName;
-                    isNameUpdated = true;
-                }
-
-                // The scene graph uses an arbitrary character (by default dot) to separate the names of the parents
-                // therefore that character can't be used in the name.
-                AZStd::replace_if(name.begin(), name.end(),
-                    [&isNameUpdated](char c) -> bool
-                {
-                    if (c == Containers::SceneGraph::GetNodeSeperationCharacter())
-                    {
-                        isNameUpdated = true;
-                        return true;
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }, '_');
-
-                // Nodes under a particular parent have to be unique. Multiple nodes can share the same name, but they
-                // can't reference the same parent in that case. This is to make sure the node can be quickly found as
-                // the full path will be unique. To fix any issues, an index is appended.
-                size_t index = 1;
-                const size_t offset = name.length();
-                while (graph.Find(parentNode, name).IsValid())
-                {
-                    // Remove the previously tried extension.
-                    name.erase(offset, name.length() - offset);
-
-                    name += ('_');
-                    name += AZStd::to_string(aznumeric_cast<u64>(index));
-                    index++;
-                    isNameUpdated = true;
-                }
-
-                if (isNameUpdated)
-                {
-                    AZ_TraceContext("New node name", name);
-                    AZ_TracePrintf(Utilities::WarningWindow, "The name of the node '%s' was invalid or conflicting and was updated to '%s'.",
-                        originalNodeName.c_str(), name.c_str());
-                }
-
-                return isNameUpdated;
-            }
-
-            bool RenamedNodesMap::RegisterNode(const std::shared_ptr<SDKNode::NodeWrapper>& node, const Containers::SceneGraph& graph,
-                Containers::SceneGraph::NodeIndex parentNode, const char* defaultName)
-            {
-                return node ? RegisterNode(*node, graph, parentNode, defaultName) : false;
-            }
-
-            bool RenamedNodesMap::RegisterNode(const std::shared_ptr<const SDKNode::NodeWrapper>& node, const Containers::SceneGraph& graph,
-                Containers::SceneGraph::NodeIndex parentNode, const char* defaultName)
-            {
-                return node ? RegisterNode(*node, graph, parentNode, defaultName) : false;
-            }
-
-            bool RenamedNodesMap::RegisterNode(const SDKNode::NodeWrapper& node, const Containers::SceneGraph& graph,
-                Containers::SceneGraph::NodeIndex parentNode, const char* defaultName)
-            {
-                AZStd::string name = node.GetName();
-                if (SanitizeNodeName(name, graph, parentNode, defaultName))
-                {
-                    AZ_TraceContext("New node name", name);
-                    
-                    // Only register if the name is updated, otherwise the name in the fbx node can be returned.
-                    auto entry = m_idToName.find(node.GetUniqueId());
-                    if (entry == m_idToName.end())
-                    {
-                        m_idToName.insert(AZStd::make_pair(node.GetUniqueId(), AZStd::move(name)));
-                        return true;
-                    }
-                    else
-                    {
-                        AZ_TraceContext("Previous name", entry->second);
-                        if (entry->second == name)
-                        {
-                            return true;
-                        }
-                        else
-                        {
-                            AZ_Assert(false, "Node has already been registered with a different name.");
-                            return false;
-                        }
-                    }
-                }
-                else
-                {
-                    return true;
-                }
-            }
-            
-            const char* RenamedNodesMap::GetNodeName(const std::shared_ptr<SDKNode::NodeWrapper>& node) const
-            {
-                return node ? GetNodeName(*node) : "<invalid>";
-            }
-
-            const char* RenamedNodesMap::GetNodeName(const std::shared_ptr<const SDKNode::NodeWrapper>& node) const
-            {
-                return node ? GetNodeName(*node) : "<invalid>";
-            }
-
-            const char* RenamedNodesMap::GetNodeName(const AZStd::shared_ptr<SDKNode::NodeWrapper>& node) const
-            {
-                return node ? GetNodeName(*node) : "<invalid>";
-            }
-
-            const char* RenamedNodesMap::GetNodeName(const AZStd::shared_ptr<const SDKNode::NodeWrapper>& node) const
-            {
-                return node ? GetNodeName(*node) : "<invalid>";
-            }
-
-            const char* RenamedNodesMap::GetNodeName(const SDKNode::NodeWrapper& node) const
-            {
-                auto entry = m_idToName.find(node.GetUniqueId());
-                if (entry != m_idToName.end())
-                {
-                    return entry->second.c_str();
-                }
-                else
-                {
-                    return node.GetName();
-                }
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h
deleted file mode 100644
index 012f0febab..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <memory>
-#include <AzCore/std/containers/unordered_map.h>
-#include <AzCore/std/string/string.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SDKWrapper/NodeWrapper.h>
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        class FbxNodeWrapper;
-    }
-
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            class RenamedNodesMap
-            {
-            public:
-                //! Checks if the provided name is valid for the position in the graph and makes corrections if
-                //! problems are found.
-                //! @param name The name of the node in the scene graph.
-                //! @param graph The scene graph the node will be added to.
-                //! @param parentNode The node that will be the intended parent for the the node who's name is being checked.
-                //! @param defaultName If the provided name is empty, the defaultName will be used.
-                //! @return True if the name was updated otherwise false.
-                static bool SanitizeNodeName(AZStd::string& name, const Containers::SceneGraph& graph,
-                    Containers::SceneGraph::NodeIndex parentNode, const char* defaultName = "unnamed");
-                
-                //! Register the name for later reference. If the name needs to be sanitized, the sanitized name will be stored.
-                //! @param node The node that's to be registered.
-                //! @param graph The scene graph the node will be added to.
-                //! @param parentNode The node that will be the intended parent for the the node who's name is being checked.
-                //! @param defaultName If the provided name is empty, the defaultName will be used.
-                //! @return True if the node was successfully registered.
-                bool RegisterNode(const std::shared_ptr<SDKNode::NodeWrapper>& node, const Containers::SceneGraph& graph,
-                    Containers::SceneGraph::NodeIndex parentNode, const char* defaultName = "unnamed");
-                bool RegisterNode(const std::shared_ptr<const SDKNode::NodeWrapper>& node, const Containers::SceneGraph& graph,
-                    Containers::SceneGraph::NodeIndex parentNode, const char* defaultName = "unnamed");
-                bool RegisterNode(const SDKNode::NodeWrapper& node, const Containers::SceneGraph& graph,
-                    Containers::SceneGraph::NodeIndex parentNode, const char* defaultName = "unnamed");
-
-                //! Returns the name of the given node, which may be sanitized if this was needed.
-                const char* GetNodeName(const std::shared_ptr<SDKNode::NodeWrapper>& node) const;
-                const char* GetNodeName(const std::shared_ptr<const SDKNode::NodeWrapper>& node) const;
-                const char* GetNodeName(const AZStd::shared_ptr<SDKNode::NodeWrapper>& node) const;
-                const char* GetNodeName(const AZStd::shared_ptr<const SDKNode::NodeWrapper>& node) const;
-                const char* GetNodeName(const SDKNode::NodeWrapper& node) const;
-            private:
-
-                AZStd::unordered_map<u64, AZStd::string> m_idToName;
-            };
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Linux/platform_linux_files.cmake b/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Linux/platform_linux_files.cmake
deleted file mode 100644
index e3f589e1b5..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Linux/platform_linux_files.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    ../../../SceneCore/Containers/SceneManifest.h
-    ../../../SceneCore/Containers/SceneManifest.inl
-    ../../../SceneCore/Containers/SceneManifest.cpp
-    ../../../SceneCore/Events/AssetImportRequest.cpp
-    ../../../SceneCore/Events/AssetImportRequest.h
-    ../../../SceneCore/Events/CallProcessorBinder.cpp
-    ../../../SceneCore/Events/CallProcessorBinder.h
-    ../../../SceneData/GraphData/MeshVertexUVData.h
-    ../../../SceneData/GraphData/MeshVertexUVData.cpp
-    ../../../SceneData/GraphData/MeshVertexColorData.h
-    ../../../SceneData/GraphData/MeshVertexColorData.cpp
-    ../../../SceneData/GraphData/BoneData.h
-    ../../../SceneData/GraphData/BoneData.cpp
-    ../../../SceneData/GraphData/MeshData.h
-    ../../../SceneData/GraphData/MeshData.cpp
-    ../../../SceneData/GraphData/SkinWeightData.h
-    ../../../SceneData/GraphData/SkinWeightData.cpp
-    ../../../SceneData/GraphData/MaterialData.h
-    ../../../SceneData/GraphData/MaterialData.cpp
-    ../../../SceneData/GraphData/AnimationData.h
-    ../../../SceneData/GraphData/AnimationData.cpp
-    ../../../SceneData/GraphData/BlendShapeData.h
-    ../../../SceneData/GraphData/BlendShapeData.cpp
-)
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Mac/platform_mac_files.cmake b/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Mac/platform_mac_files.cmake
deleted file mode 100644
index e3f589e1b5..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Mac/platform_mac_files.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    ../../../SceneCore/Containers/SceneManifest.h
-    ../../../SceneCore/Containers/SceneManifest.inl
-    ../../../SceneCore/Containers/SceneManifest.cpp
-    ../../../SceneCore/Events/AssetImportRequest.cpp
-    ../../../SceneCore/Events/AssetImportRequest.h
-    ../../../SceneCore/Events/CallProcessorBinder.cpp
-    ../../../SceneCore/Events/CallProcessorBinder.h
-    ../../../SceneData/GraphData/MeshVertexUVData.h
-    ../../../SceneData/GraphData/MeshVertexUVData.cpp
-    ../../../SceneData/GraphData/MeshVertexColorData.h
-    ../../../SceneData/GraphData/MeshVertexColorData.cpp
-    ../../../SceneData/GraphData/BoneData.h
-    ../../../SceneData/GraphData/BoneData.cpp
-    ../../../SceneData/GraphData/MeshData.h
-    ../../../SceneData/GraphData/MeshData.cpp
-    ../../../SceneData/GraphData/SkinWeightData.h
-    ../../../SceneData/GraphData/SkinWeightData.cpp
-    ../../../SceneData/GraphData/MaterialData.h
-    ../../../SceneData/GraphData/MaterialData.cpp
-    ../../../SceneData/GraphData/AnimationData.h
-    ../../../SceneData/GraphData/AnimationData.cpp
-    ../../../SceneData/GraphData/BlendShapeData.h
-    ../../../SceneData/GraphData/BlendShapeData.cpp
-)
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Windows/platform_windows_files.cmake b/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Windows/platform_windows_files.cmake
deleted file mode 100644
index 768b1fa721..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Windows/platform_windows_files.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-)
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/FbxImporterUtilitiesTests.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/FbxImporterUtilitiesTests.cpp
deleted file mode 100644
index 652cbcf362..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/FbxImporterUtilitiesTests.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzTest/AzTest.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h>
-#include <SceneAPI/SceneCore/Containers/Scene.h>
-#include <SceneAPI/SceneCore/DataTypes/IGraphObject.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-#include <SceneAPI/SceneData/GraphData/BoneData.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_EmptySceneGraphs_ReturnsTrue)
-            {
-                Containers::SceneGraph lhsGraph;
-                Containers::SceneGraph rhsGraph;
-
-                bool sceneGraphsEqual =
-                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
-
-                EXPECT_TRUE(sceneGraphsEqual);
-            }
-
-            TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeBothNull_ReturnsTrue)
-            {
-                Containers::SceneGraph lhsGraph;
-                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild");
-                Containers::SceneGraph rhsGraph;
-                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild");
-
-                bool sceneGraphsEqual =
-                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
-
-                EXPECT_TRUE(sceneGraphsEqual);
-            }
-
-            TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeSameType_ReturnsTrue)
-            {
-                Containers::SceneGraph lhsGraph;
-                AZStd::shared_ptr<DataTypes::IGraphObject> lhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
-                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild", AZStd::move(lhsData));
-                Containers::SceneGraph rhsGraph;
-                AZStd::shared_ptr<DataTypes::IGraphObject> rhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
-                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild", AZStd::move(rhsData));
-
-                bool sceneGraphsEqual =
-                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
-
-                EXPECT_TRUE(sceneGraphsEqual);
-            }
-
-            TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeOneNull_ReturnsFalse)
-            {
-                Containers::SceneGraph lhsGraph;
-                AZStd::shared_ptr<DataTypes::IGraphObject> lhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
-                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild", AZStd::move(lhsData));
-                Containers::SceneGraph rhsGraph;
-                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild");
-
-                bool sceneGraphsEqual =
-                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
-
-                EXPECT_FALSE(sceneGraphsEqual);
-            }
-
-            TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeDifferentTypes_ReturnsFalse)
-            {
-                Containers::SceneGraph lhsGraph;
-                AZStd::shared_ptr<DataTypes::IGraphObject> lhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
-                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild", AZStd::move(lhsData));
-                Containers::SceneGraph rhsGraph;
-                AZStd::shared_ptr<DataTypes::IGraphObject> rhsData = AZStd::make_shared<SceneData::GraphData::BoneData>();
-                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild", AZStd::move(rhsData));
-
-                bool sceneGraphsEqual =
-                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
-
-                EXPECT_FALSE(sceneGraphsEqual);
-            }
-
-            TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameOneEmptyOneSingleNode_ReturnsFalse)
-            {
-                Containers::SceneGraph lhsGraph;
-                AZStd::shared_ptr<DataTypes::IGraphObject> lhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
-                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild", AZStd::move(lhsData));
-                Containers::SceneGraph rhsGraph;
-
-                bool sceneGraphsEqual =
-                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
-
-                EXPECT_FALSE(sceneGraphsEqual);
-            }
-
-            TEST(FbxImpoterUtilityTests, AreSceneGraphsEqual_DifferentNamesSingleNodeBothNull_ReturnsFalse)
-            {
-                Containers::SceneGraph lhsGraph;
-                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild");
-                Containers::SceneGraph rhsGraph;
-                rhsGraph.AddChild(rhsGraph.GetRoot(), "differentName");
-
-                bool sceneGraphsEqual =
-                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
-
-                EXPECT_FALSE(sceneGraphsEqual);
-            }
-
-            TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SecondGraphExtraChild_ReturnsFalse)
-            {
-                Containers::SceneGraph lhsGraph;
-                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild");
-                lhsGraph.AddChild(lhsGraph.GetRoot(), "extraTestChild");
-                Containers::SceneGraph rhsGraph;
-                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild");
-
-                bool sceneGraphsEqual =
-                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
-
-                EXPECT_FALSE(sceneGraphsEqual);
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp
deleted file mode 100644
index 6636deb44e..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzTest/AzTest.h>
-#include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
-#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
-#include <SceneAPI/SceneCore/DataTypes/IGraphObject.h>
-#include <SceneAPI/SceneData/GraphData/MeshData.h>
-
-namespace AZ
-{
-    namespace SceneAPI
-    {
-        namespace FbxSceneBuilder
-        {
-            TEST(RenamedNodesMapTests, SanitizeNodeName_ValidNameProvided_ReturnsFalseAndNameUnchanged)
-            {
-                Containers::SceneGraph graph;
-                AZStd::string name = "ValidName";
-
-                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot());
-
-                EXPECT_FALSE(result);
-                EXPECT_STREQ("ValidName", name.c_str());
-            }
-
-            TEST(RenamedNodesMapTests, SanitizeNodeName_NameWithInvalidCharacter_ReturnsTrueAndNameChanged)
-            {
-                Containers::SceneGraph graph;
-                AZStd::string check = "Valid";
-                check += Containers::SceneGraph::GetNodeSeperationCharacter();
-                check += "Name";
-                AZStd::string name = check;
-
-                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot());
-
-                EXPECT_TRUE(result);
-                EXPECT_STRNE(check.c_str(), name.c_str());
-            }
-
-            TEST(RenamedNodesMapTests, SanitizeNodeName_BlankName_ReturnsTrueAndNameSetToDefault)
-            {
-                Containers::SceneGraph graph;
-                AZStd::string name;
-
-                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot(), "Default");
-
-                EXPECT_TRUE(result);
-                EXPECT_STREQ("Default", name.c_str());
-            }
-
-            TEST(RenamedNodesMapTests, SanitizeNodeName_SingleCollision_ReturnsTrueAndNameHasAppendixOf1)
-            {
-                Containers::SceneGraph graph;
-                graph.AddChild(graph.GetRoot(), "Child");
-                AZStd::string name = "Child";
-
-                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot());
-
-                EXPECT_TRUE(result);
-                EXPECT_STREQ("Child_1", name.c_str());
-            }
-
-            TEST(RenamedNodesMapTests, SanitizeNodeName_MultipleCollisions_ReturnsTrueAndNameHasAppendixOf2)
-            {
-                Containers::SceneGraph graph;
-                auto child = graph.AddChild(graph.GetRoot(), "Child");
-                graph.AddSibling(child, "Child_1");
-                AZStd::string name = "Child";
-
-                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot());
-
-                EXPECT_TRUE(result);
-                EXPECT_STREQ("Child_2", name.c_str());
-            }
-        } // namespace FbxSceneBuilder
-    } // namespace SceneAPI
-} // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.cpp
deleted file mode 100644
index c1fcfcaa4b..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Casting/numeric_cast.h>
-#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h>
-#include <fbxsdk.h>
-#include <AzCore/Casting/lossy_cast.h>
-#include <AzCore/Casting/numeric_cast.h>
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        TestFbxMesh::TestFbxMesh()
-            : m_vertexControlPoints(nullptr)
-            , m_vertexCount(0)
-            , m_polygonVertexIndices(nullptr)
-            , m_materialIndices(new FbxLayerElementArrayTemplate<int>(eFbxInt))
-            , m_uvElements(FbxGeometryElementUV::Create(nullptr, "TestElements_UV"))
-            , m_vertexColorElements(FbxGeometryElementVertexColor::Create(nullptr, "TestElements_VertexColors"))
-            , m_expectedVertexCount(0)
-        {
-        }
-
-        int TestFbxMesh::GetDeformerCount() const
-        {
-            // For current test need, only have one skin for the mesh
-            return m_skin ? 1 : 0;
-        }
-
-        AZStd::shared_ptr<const FbxSkinWrapper> TestFbxMesh::GetSkin(int index) const
-        {
-            // For current test need, only have one skin for the mesh
-            return m_skin;
-        }
-
-        bool TestFbxMesh::GetMaterialIndices(FbxLayerElementArrayTemplate<int>** lockableArray) const
-        {
-            *lockableArray = m_materialIndices;
-            return true;
-        }
-
-        int TestFbxMesh::GetControlPointsCount() const
-        {
-            return static_cast<int>(m_vertexCount);
-        }
-
-        AZStd::vector<Vector3> TestFbxMesh::GetControlPoints() const
-        {
-            return m_vertexControlPoints;
-        }
-
-        int TestFbxMesh::GetPolygonCount() const
-        {
-            return static_cast<int>(m_polygonInfo.size());
-        }
-
-        int TestFbxMesh::GetPolygonSize(int polygonIndex) const
-        {
-            if (m_polygonInfo.find(polygonIndex) != m_polygonInfo.end())
-            {
-                return aznumeric_caster(m_polygonInfo.find(polygonIndex)->second.m_vertexCount);
-            }
-            return -1;
-        }
-
-        int* TestFbxMesh::GetPolygonVertices() const
-        {
-            return m_polygonVertexIndices;
-        }
-
-        int TestFbxMesh::GetPolygonVertexIndex(int polygonIndex) const
-        {
-            if (m_polygonInfo.find(polygonIndex) != m_polygonInfo.end())
-            {
-                return aznumeric_caster(m_polygonInfo.find(polygonIndex)->second.m_startVertexIndex);
-            }
-            return -1;
-        }
-
-        FbxUVWrapper TestFbxMesh::GetElementUV(int index)
-        {
-            (void)index;
-            return m_uvElements;
-        }
-
-        int TestFbxMesh::GetElementUVCount() const
-        {
-            return 1;
-        }
-
-        FbxVertexColorWrapper TestFbxMesh::GetElementVertexColor(int index)
-        {
-            (void)index;
-            return m_vertexColorElements;
-        }
-
-        int TestFbxMesh::GetElementVertexColorCount() const
-        {
-            return 1;
-        }
-
-        bool TestFbxMesh::GetPolygonVertexNormal(int polyIndex, int vertexIndex, Vector3& normal) const
-        {
-            normal = Vector3(1.0f, 0.0f, 0.0f);
-            return true;
-        }
-
-        void TestFbxMesh::CreateMesh(std::vector<AZ::Vector3>& points, std::vector<std::vector<int> >& polygonVertexIndices)
-        {
-            m_vertexControlPoints.clear();
-            m_materialIndices->Clear();
-            m_polygonInfo.clear();
-
-            // Create fbx control point (position) data, and associated material index data
-            m_vertexCount = aznumeric_caster(points.size());
-            m_vertexControlPoints.reserve(points.size());
-            for (unsigned int i = 0; i < points.size(); ++i)
-            {
-                m_vertexControlPoints.push_back(Vector3(points[i].GetX(), points[i].GetY(), points[i].GetZ()));
-                m_materialIndices->Add(i);
-            }
-
-            // Create fbx face data
-            m_expectedVertexCount = 0;
-            for (const std::vector<int>& onePolygonIndices : polygonVertexIndices)
-            {
-                for (const int& index : onePolygonIndices)
-                {
-                    m_expectedVertexCount++;
-                }
-            }
-            if (m_polygonVertexIndices)
-            {
-                delete m_polygonVertexIndices;
-            }
-            m_polygonVertexIndices = new int[m_expectedVertexCount];
-            size_t i = 0;
-            for (const std::vector<int>& onePolygonIndices : polygonVertexIndices)
-            {
-                m_polygonInfo.insert(std::make_pair<int, TestFbxPolygon>(aznumeric_caster(m_polygonInfo.size()),
-                        TestFbxPolygon(i, aznumeric_caster(onePolygonIndices.size()))));
-                for (const int& index : onePolygonIndices)
-                {
-                    m_polygonVertexIndices[i] = index;
-                    i++;
-                }
-            }
-        }
-
-        void TestFbxMesh::SetSkin(const AZStd::shared_ptr<FbxSkinWrapper>& skin)
-        {
-            m_skin = skin;
-        }
-
-        void TestFbxMesh::CreateExpectMeshInfo(std::vector<std::vector<int> >& expectedFaceVertexIndices)
-        {
-            m_expectedFaceVertexIndices = expectedFaceVertexIndices;
-        }
-
-        size_t TestFbxMesh::GetExpectedVetexCount() const
-        {
-            return m_expectedVertexCount;
-        }
-
-        size_t TestFbxMesh::GetExpectedFaceCount() const
-        {
-            return m_expectedFaceVertexIndices.size();
-        }
-
-        AZ::Vector3 TestFbxMesh::GetExpectedFaceVertexPosition(unsigned int faceIndex, unsigned int vertexIndex) const
-        {
-            return m_vertexControlPoints[m_expectedFaceVertexIndices[faceIndex][vertexIndex]];
-        }
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h
deleted file mode 100644
index f99008c436..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <vector>
-#include <unordered_map>
-#include <AzCore/Math/Vector3.h>
-#include <SceneAPI/FbxSDKWrapper/FbxMeshWrapper.h>
-#include <SceneAPI/FbxSDKWrapper/FbxSkinWrapper.h>
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        struct TestFbxPolygon
-        {
-            size_t m_startVertexIndex;
-            size_t m_vertexCount;
-
-            TestFbxPolygon(size_t startVertexIndex, size_t vertexCount)
-                : m_startVertexIndex(startVertexIndex)
-                , m_vertexCount(vertexCount)
-            {
-            }
-        };
-
-        // TestFbxMesh
-        //      FbxMesh Test Data creation
-        class TestFbxMesh
-            : public FbxMeshWrapper
-        {
-        public:
-            TestFbxMesh();
-            ~TestFbxMesh() override = default;
-
-            int GetDeformerCount() const override;
-            AZStd::shared_ptr<const FbxSkinWrapper> GetSkin(int index) const override;
-            bool GetMaterialIndices(FbxLayerElementArrayTemplate<int>** lockableArray) const override;
-
-            int GetControlPointsCount() const;
-            AZStd::vector<Vector3> GetControlPoints() const override;
-
-            int GetPolygonCount() const override;
-            int GetPolygonSize(int polygonIndex) const override;
-            int* GetPolygonVertices() const override;
-            int GetPolygonVertexIndex(int polygonIndex) const;
-
-            FbxUVWrapper GetElementUV(int index = 0) override;
-            int GetElementUVCount() const override;
-            FbxVertexColorWrapper GetElementVertexColor(int index = 0) override;
-            int GetElementVertexColorCount() const override;
-
-            bool GetPolygonVertexNormal(int polyIndex, int vertexIndex, Vector3& normal) const override;
-
-            // Create test data APIs
-            void CreateMesh(std::vector<AZ::Vector3>& points, std::vector<std::vector<int> >& polygonVertexIndices);
-            void CreateExpectMeshInfo(std::vector<std::vector<int> >& expectedFaceVertexIndices);
-            void SetSkin(const AZStd::shared_ptr<FbxSkinWrapper>& skin);
-
-            size_t GetExpectedVetexCount() const;
-            size_t GetExpectedFaceCount() const;
-            AZ::Vector3 GetExpectedFaceVertexPosition(unsigned int faceIndex, unsigned int vertexIndex) const;
-
-        protected:
-            AZStd::vector<Vector3> m_vertexControlPoints; // vertex positions
-            size_t m_vertexCount;
-            int* m_polygonVertexIndices; // store all polygons' vertex indices in sequence. Each index maps to a control point.
-            FbxLayerElementArrayTemplate<int>* m_materialIndices;
-            std::unordered_map<int, TestFbxPolygon> m_polygonInfo;
-
-            FbxUVWrapper m_uvElements;
-            FbxVertexColorWrapper m_vertexColorElements;
-            AZStd::shared_ptr<FbxSkinWrapper> m_skin;
-
-            // Expected converted data
-            unsigned int m_expectedVertexCount;
-            std::vector<std::vector<int> > m_expectedFaceVertexIndices;
-        };
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.cpp
deleted file mode 100644
index 63a6083f03..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h>
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        const std::shared_ptr<FbxMeshWrapper> TestFbxNode::GetMesh() const
-        {
-            return m_testFbxMesh;
-        }
-
-        const char* TestFbxNode::GetName() const
-        {
-            return m_name.c_str();
-        }
-
-        void TestFbxNode::SetMesh(std::shared_ptr<TestFbxMesh> testFbxMesh)
-        {
-            m_testFbxMesh = testFbxMesh;
-        }
-
-        void TestFbxNode::SetName(const char* name)
-        {
-            m_name = name;
-        }
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h
deleted file mode 100644
index 350e8095b0..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <SceneAPI/FbxSDKWrapper/FbxNodeWrapper.h>
-#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h>
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        // TestFbxNode
-        //      FbxNode Test Data creation
-        class TestFbxNode
-            : public FbxNodeWrapper
-        {
-        public:
-            ~TestFbxNode() override = default;
-
-            const std::shared_ptr<FbxMeshWrapper> GetMesh() const override;
-            const char* GetName() const override;
-
-            void SetMesh(std::shared_ptr<TestFbxMesh> testFbxMesh);
-            void SetName(const char* name);
-
-        protected:
-            std::shared_ptr<TestFbxMesh> m_testFbxMesh;
-            AZStd::string m_name;
-        };
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.cpp
deleted file mode 100644
index 816816158d..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Casting/numeric_cast.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.h>
-#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h>
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        const char* TestFbxSkin::GetName() const
-        {
-            return m_name.c_str();
-        }
-
-        int TestFbxSkin::GetClusterCount() const
-        {
-            return aznumeric_caster(m_links.size());
-        }
-
-        int TestFbxSkin::GetClusterControlPointIndicesCount(int index) const
-        {
-            return aznumeric_caster(m_controlPointIndices[index].size());
-        }
-
-        int TestFbxSkin::GetClusterControlPointIndex(int clusterIndex, int pointIndex) const
-        {
-            return m_controlPointIndices[clusterIndex][pointIndex];
-        }
-
-        double TestFbxSkin::GetClusterControlPointWeight(int clusterIndex, int pointIndex) const
-        {
-            return m_weights[clusterIndex][pointIndex];
-        }
-
-        AZStd::shared_ptr<const FbxNodeWrapper> TestFbxSkin::GetClusterLink(int index) const
-        {
-            return m_links[index];
-        }
-
-        void TestFbxSkin::SetName(const char* name)
-        {
-            m_name = name;
-        }
-
-        void TestFbxSkin::CreateSkinWeightData(AZStd::vector<AZStd::string>& boneNames, AZStd::vector<AZStd::vector<double>>& weights, AZStd::vector<AZStd::vector<int>>& controlPointIndices)
-        {
-            m_links.resize(boneNames.size());
-            for (size_t linkIndex = 0; linkIndex < boneNames.size(); ++linkIndex)
-            {
-                m_links[linkIndex] = AZStd::make_shared<FbxSDKWrapper::TestFbxNode>();
-                m_links[linkIndex]->SetName(boneNames[linkIndex].c_str());
-            }
-            m_weights = weights;
-            m_controlPointIndices = controlPointIndices;
-        }
-
-        void TestFbxSkin::CreateExpectSkinWeightData(AZStd::vector<AZStd::vector<int>>& boneIds, AZStd::vector<AZStd::vector<float>>& weights)
-        {
-            m_expectedBoneIds = boneIds;
-            m_expectedWeights = weights;
-        }
-
-        size_t TestFbxSkin::GetExpectedVertexCount() const
-        {
-            return m_expectedBoneIds.size();
-        }
-
-        size_t TestFbxSkin::GetExpectedLinkCount(size_t vertexIndex) const
-        {
-            return m_expectedBoneIds[vertexIndex].size();
-        }
-
-        int TestFbxSkin::GetExpectedSkinLinkBoneId(size_t vertexIndex, size_t linkIndex) const
-        {
-            return m_expectedBoneIds[vertexIndex][linkIndex];
-        }
-
-        float TestFbxSkin::GetExpectedSkinLinkWeight(size_t vertextIndex, size_t linkIndex) const
-        {
-            return m_expectedWeights[vertextIndex][linkIndex];
-        }
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.h b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.h
deleted file mode 100644
index 4806f5680b..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <SceneAPI/FbxSDKWrapper/FbxSkinWrapper.h>
-#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h>
-
-namespace AZ
-{
-    namespace FbxSDKWrapper
-    {
-        class TestFbxSkin
-            : public FbxSkinWrapper
-        {
-        public:
-            ~TestFbxSkin() override = default;
-
-            const char* GetName() const override;
-            int GetClusterCount() const override;
-            int GetClusterControlPointIndicesCount(int index) const override;
-            int GetClusterControlPointIndex(int clusterIndex, int pointIndex) const override;
-            double GetClusterControlPointWeight(int clusterIndex, int pointIndex) const override;
-            AZStd::shared_ptr<const FbxNodeWrapper> GetClusterLink(int index) const override;
-
-            void SetName(const char* name);
-            void CreateSkinWeightData(AZStd::vector<AZStd::string>& boneNames, AZStd::vector<AZStd::vector<double>>& weights, AZStd::vector<AZStd::vector<int>>& controlPointIndices);
-            void CreateExpectSkinWeightData(AZStd::vector<AZStd::vector<int>>& boneIds, AZStd::vector<AZStd::vector<float>>& weights);
-
-            size_t GetExpectedVertexCount() const;
-            size_t GetExpectedLinkCount(size_t vertexIndex) const;
-            int GetExpectedSkinLinkBoneId(size_t vertexIndex, size_t linkIndex) const;
-            float GetExpectedSkinLinkWeight(size_t vertexIndex, size_t linkIndex) const;
-
-        protected:
-            AZStd::string m_name;
-            AZStd::vector<AZStd::shared_ptr<FbxSDKWrapper::TestFbxNode>> m_links;
-            AZStd::vector<AZStd::vector<double>> m_weights;
-            AZStd::vector<AZStd::vector<int>> m_controlPointIndices;
-
-            AZStd::vector<AZStd::vector<int>> m_expectedBoneIds;
-            AZStd::vector<AZStd::vector<float>> m_expectedWeights;
-        };
-    }
-}
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestsMain.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestsMain.cpp
deleted file mode 100644
index d0714f7f93..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestsMain.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzTest/AzTest.h>
-
-#include <AzCore/Module/DynamicModuleHandle.h>
-#include <AzCore/Memory/SystemAllocator.h>
-
-class FbxSceneBuilderTestEnvironment
-    : public AZ::Test::ITestEnvironment
-{
-public:
-    virtual ~FbxSceneBuilderTestEnvironment()
-    {}
-
-protected:
-    void SetupEnvironment() override
-    {
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-
-        sceneCoreModule = AZ::DynamicModuleHandle::Create("SceneCore");
-        AZ_Assert(sceneCoreModule, "FbxSceneBuilder unit tests failed to create SceneCore module.");
-        bool loaded = sceneCoreModule->Load(false);
-        AZ_Assert(loaded, "FbxSceneBuilder unit tests failed to load SceneCore module.");
-        auto init = sceneCoreModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
-        AZ_Assert(init, "FbxSceneBuilder unit tests failed to find the initialization function the SceneCore module.");
-        (*init)(AZ::Environment::GetInstance());
-
-        sceneDataModule = AZ::DynamicModuleHandle::Create("SceneData");
-        AZ_Assert(sceneDataModule, "SceneData unit tests failed to create SceneData module.");
-        loaded = sceneDataModule->Load(false);
-        AZ_Assert(loaded, "FbxSceneBuilder unit tests failed to load SceneData module.");
-        init = sceneDataModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
-        AZ_Assert(init, "FbxSceneBuilder unit tests failed to find the initialization function the SceneData module.");
-        (*init)(AZ::Environment::GetInstance());
-    }
-
-    void TeardownEnvironment() override
-    {
-        auto uninit = sceneDataModule->GetFunction<AZ::UninitializeDynamicModuleFunction>(AZ::UninitializeDynamicModuleFunctionName);
-        AZ_Assert(uninit, "FbxSceneBuilder unit tests failed to find the uninitialization function the SceneData module.");
-        (*uninit)();
-        sceneDataModule.reset();
-        
-        uninit = sceneCoreModule->GetFunction<AZ::UninitializeDynamicModuleFunction>(AZ::UninitializeDynamicModuleFunctionName);
-        AZ_Assert(uninit, "FbxSceneBuilder unit tests failed to find the uninitialization function the SceneCore module.");
-        (*uninit)();
-        sceneCoreModule.reset();
-
-        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-    }
-
-private:
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> sceneCoreModule;
-    AZStd::unique_ptr<AZ::DynamicModuleHandle> sceneDataModule;
-};
-
-AZ_UNIT_TEST_HOOK(new FbxSceneBuilderTestEnvironment);
-
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_files.cmake b/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_files.cmake
deleted file mode 100644
index 4dddbc061c..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_files.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    FbxSceneBuilderConfiguration.h
-    FbxImportRequestHandler.h
-    FbxImportRequestHandler.cpp
-    FbxImporter.h
-    FbxImporter.cpp
-    FbxSceneSystem.h
-    FbxSceneSystem.cpp
-    ImportContexts/ImportContexts.h
-    ImportContexts/ImportContexts.cpp
-    ImportContexts/AssImpImportContexts.h
-    ImportContexts/AssImpImportContexts.cpp
-    Importers/Utilities/AssImpMeshImporterUtilities.h
-    Importers/Utilities/AssImpMeshImporterUtilities.cpp
-    Importers/Utilities/RenamedNodesMap.h
-    Importers/Utilities/RenamedNodesMap.cpp
-    Importers/AssImpAnimationImporter.h
-    Importers/AssImpAnimationImporter.cpp
-    Importers/AssImpBitangentStreamImporter.h
-    Importers/AssImpBitangentStreamImporter.cpp
-    Importers/AssImpBlendShapeImporter.h
-    Importers/AssImpBlendShapeImporter.cpp
-    Importers/AssImpBoneImporter.h
-    Importers/AssImpBoneImporter.cpp
-    Importers/AssImpColorStreamImporter.h
-    Importers/AssImpColorStreamImporter.cpp
-    Importers/AssImpImporterUtilities.h
-    Importers/AssImpImporterUtilities.cpp
-    Importers/AssImpMaterialImporter.h
-    Importers/AssImpMaterialImporter.cpp
-    Importers/AssImpMeshImporter.h
-    Importers/AssImpMeshImporter.cpp
-    Importers/AssImpSkinImporter.h
-    Importers/AssImpSkinImporter.cpp
-    Importers/AssImpSkinWeightsImporter.h
-    Importers/AssImpSkinWeightsImporter.cpp
-    Importers/AssImpTangentStreamImporter.h
-    Importers/AssImpTangentStreamImporter.cpp
-    Importers/AssImpTransformImporter.h
-    Importers/AssImpTransformImporter.cpp
-    Importers/AssImpUvMapImporter.h
-    Importers/AssImpUvMapImporter.cpp
-    Importers/AssImpAnimationImporter.h
-    Importers/AssImpAnimationImporter.cpp
-    Importers/ImporterUtilities.h
-    Importers/ImporterUtilities.cpp
-    Importers/ImporterUtilities.inl
-)
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_shared_files.cmake b/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_shared_files.cmake
deleted file mode 100644
index c476c71c04..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_shared_files.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    DllMain.cpp
-)
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_testing_files.cmake b/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_testing_files.cmake
deleted file mode 100644
index b9240d192e..0000000000
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_testing_files.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    Tests/TestsMain.cpp
-    Tests/Importers/FbxImporterUtilitiesTests.cpp
-    Tests/Importers/Utilities/RenamedNodesMapTests.cpp
-)
diff --git a/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp
index 80937fe6f5..de0e4f53a5 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.h
index 6d45120d52..1a1ec42e43 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.h
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp
index 194ce4ca0f..f1ae433bca 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -15,8 +15,8 @@ namespace AZ
 {
     namespace AssImpSDKWrapper
     {
-        AssImpNodeWrapper::AssImpNodeWrapper(aiNode* fbxNode)
-            :SDKNode::NodeWrapper(fbxNode)
+        AssImpNodeWrapper::AssImpNodeWrapper(aiNode* sourceNode)
+            :SDKNode::NodeWrapper(sourceNode)
         {
             AZ_Assert(m_assImpNode, "Asset Importer Node cannot be null");
         }
diff --git a/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h
index efc30e1899..a2345b09a8 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -18,7 +18,7 @@ namespace AZ
         {
         public:
             AZ_RTTI(AssImpNodeWrapper, "{1043260B-9076-49B7-AD38-EF62E85F7C1D}", SDKNode::NodeWrapper);
-            AssImpNodeWrapper(aiNode* fbxNode);
+            AssImpNodeWrapper(aiNode* sourceNode);
             ~AssImpNodeWrapper() override;
             const char* GetName() const override;
             AZ::u64 GetUniqueId() const override;
diff --git a/Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.cpp
index 0900b3d9ad..8a01d70094 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.cpp
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.h
index e65782b1cd..0850789a23 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.h
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.cpp b/Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.cpp
index 314ba37f7b..79b007b771 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.cpp
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.h b/Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.h
index e838accb8f..6e9e42b4bb 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.h
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SDKWrapper/CMakeLists.txt b/Code/Tools/SceneAPI/SDKWrapper/CMakeLists.txt
index 45fb49fe05..1dc0c5b316 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/CMakeLists.txt
+++ b/Code/Tools/SceneAPI/SDKWrapper/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp
index fe213670a2..9adc9b414e 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp
+++ b/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,29 +11,16 @@ namespace AZ
 {
     namespace SDKMaterial
     {
-        MaterialWrapper::MaterialWrapper(fbxsdk::FbxSurfaceMaterial* fbxMaterial)
-            :m_fbxMaterial(fbxMaterial)
-            , m_assImpMaterial(nullptr)
-        {
-        }
-
         MaterialWrapper::MaterialWrapper(aiMaterial* assImpMaterial)
-            :m_fbxMaterial(nullptr)
-            , m_assImpMaterial(assImpMaterial)
+            : m_assImpMaterial(assImpMaterial)
         {
         }
 
         MaterialWrapper::~MaterialWrapper()
         {
-            m_fbxMaterial = nullptr;
             m_assImpMaterial = nullptr;
         }
 
-        fbxsdk::FbxSurfaceMaterial* MaterialWrapper::GetFbxMaterial()
-        {
-            return m_fbxMaterial;
-        }
-
         aiMaterial* MaterialWrapper::GetAssImpMaterial()
         {
             return m_assImpMaterial;
diff --git a/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h
index 97bf030bba..4cdcd5a627 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h
+++ b/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,14 +10,8 @@
 #include <AzCore/std/string/string.h>
 #include <AzCore/Math/Vector3.h>
 
-namespace fbxsdk
-{
-    class FbxSurfaceMaterial;
-}
-
 struct aiMaterial;
 
-
 namespace AZ
 {
     namespace SDKMaterial
@@ -39,11 +33,9 @@ namespace AZ
                 BaseColor
             };
 
-            MaterialWrapper(fbxsdk::FbxSurfaceMaterial* fbxMaterial);
             MaterialWrapper(aiMaterial* assImpmaterial);
             virtual ~MaterialWrapper();
 
-            fbxsdk::FbxSurfaceMaterial* GetFbxMaterial();
             aiMaterial* GetAssImpMaterial();
 
             virtual AZStd::string GetName() const;
@@ -56,7 +48,6 @@ namespace AZ
             virtual float GetShininess() const;
 
         protected:
-            fbxsdk::FbxSurfaceMaterial* m_fbxMaterial = nullptr;
             aiMaterial* m_assImpMaterial = nullptr;
         };
     } // namespace SDKMaterial
diff --git a/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp
index 6e1e7b9d05..bdc428840c 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp
+++ b/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,29 +11,16 @@ namespace AZ
 {
     namespace SDKNode
     {
-        NodeWrapper::NodeWrapper(fbxsdk::FbxNode* fbxNode)
-            :m_fbxNode(fbxNode)
-            , m_assImpNode(nullptr)
-        {
-        }
-
         NodeWrapper::NodeWrapper(aiNode* aiNode)
-            :m_fbxNode(nullptr)
-            , m_assImpNode(aiNode)
+            : m_assImpNode(aiNode)
         {
         }
 
         NodeWrapper::~NodeWrapper()
         {
-            m_fbxNode = nullptr;
             m_assImpNode = nullptr;
         }
 
-        fbxsdk::FbxNode* NodeWrapper::GetFbxNode()
-        {
-            return m_fbxNode;
-        }
-
         aiNode* NodeWrapper::GetAssImpNode()
         {
             return m_assImpNode;
diff --git a/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h
index 70ef3cc7dc..abda330b10 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h
+++ b/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h
@@ -1,15 +1,11 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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>
-namespace fbxsdk
-{
-    class FbxNode;
-}
 
 struct aiNode;
 
@@ -23,7 +19,6 @@ namespace AZ
             AZ_RTTI(NodeWrapper, "{5EB0897B-9728-44B7-B056-BA34AAF14715}");
 
             NodeWrapper() = default;
-            NodeWrapper(fbxsdk::FbxNode* fbxNode);
             NodeWrapper(aiNode* aiNode);
             virtual ~NodeWrapper();
 
@@ -34,7 +29,6 @@ namespace AZ
                 Component_Z
             };
 
-            fbxsdk::FbxNode* GetFbxNode();
             aiNode* GetAssImpNode();
 
             virtual const char* GetName() const;
@@ -44,8 +38,6 @@ namespace AZ
             virtual int GetChildCount()const;
             virtual const std::shared_ptr<NodeWrapper> GetChild(int childIndex) const;
 
-
-            fbxsdk::FbxNode* m_fbxNode = nullptr;
             aiNode* m_assImpNode = nullptr;
         };
     } //namespace Node
diff --git a/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp
index 5275d5b4c3..e14173c163 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp
+++ b/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -12,15 +12,8 @@ namespace AZ
    {
       const char* SceneWrapperBase::s_defaultSceneName = "myScene";
 
-      SceneWrapperBase::SceneWrapperBase(fbxsdk::FbxScene* fbxScene)
-          :m_fbxScene(fbxScene)
-          , m_assImpScene(nullptr)
-      {
-      }
-
       SceneWrapperBase::SceneWrapperBase(aiScene* aiScene)
-          :m_fbxScene(nullptr)
-          , m_assImpScene(aiScene)
+          : m_assImpScene(aiScene)
       {
       }
 
@@ -47,11 +40,6 @@ namespace AZ
       {
       }
 
-      fbxsdk::FbxScene* SceneWrapperBase::GetFbxScene() const
-      {
-          return m_fbxScene;
-      }
-
       const aiScene* SceneWrapperBase::GetAssImpScene() const
       {
           return m_assImpScene;
diff --git a/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h
index 7bbe401c89..2a8c6d6c14 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h
+++ b/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -8,14 +8,9 @@
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/std/string/string.h>
 #include <SceneAPI/SDKWrapper/NodeWrapper.h>
-namespace fbxsdk
-{
-    class FbxScene;
-}
 
 struct aiScene;
 
-
 namespace AZ
 {
     namespace SDKScene
@@ -25,7 +20,6 @@ namespace AZ
         public:
             AZ_RTTI(SceneWrapperBase, "{703CD344-2C75-4F30-8CE2-6BDEF2511AFD}");
             SceneWrapperBase() = default;
-            SceneWrapperBase(fbxsdk::FbxScene* fbxScene);
             virtual ~SceneWrapperBase() = default;
             SceneWrapperBase(aiScene* aiScene);
 
@@ -37,10 +31,8 @@ namespace AZ
 
             virtual void Clear();
             
-            virtual fbxsdk::FbxScene* GetFbxScene() const;
             virtual const aiScene* GetAssImpScene() const;
 
-            fbxsdk::FbxScene* m_fbxScene = nullptr;
             const aiScene* m_assImpScene = nullptr;
 
             static const char* s_defaultSceneName;
diff --git a/Code/Tools/SceneAPI/SDKWrapper/sdkwrapper_files.cmake b/Code/Tools/SceneAPI/SDKWrapper/sdkwrapper_files.cmake
index 6a9ca722f9..1337820131 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/sdkwrapper_files.cmake
+++ b/Code/Tools/SceneAPI/SDKWrapper/sdkwrapper_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneBuilder/CMakeLists.txt b/Code/Tools/SceneAPI/SceneBuilder/CMakeLists.txt
new file mode 100644
index 0000000000..029a254527
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/CMakeLists.txt
@@ -0,0 +1,72 @@
+#
+# 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 PAL_TRAIT_BUILD_HOST_TOOLS)
+    return()
+endif()
+
+ly_add_target(
+    NAME SceneBuilder.Static STATIC
+    NAMESPACE AZ
+    FILES_CMAKE
+        scenebuilder_files.cmake
+        Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+    COMPILE_DEFINITIONS
+        PRIVATE
+            SCENE_BUILDER_EXPORTS
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            ../..
+    BUILD_DEPENDENCIES
+        PRIVATE
+            AZ::AzCore
+            AZ::AzFramework
+        PUBLIC
+            AZ::AzToolsFramework
+            AZ::SceneCore
+            AZ::SceneData
+            AZ::SDKWrapper
+)
+
+ly_add_target(
+    NAME SceneBuilder MODULE
+    NAMESPACE AZ
+    FILES_CMAKE
+        scenebuilder_shared_files.cmake
+    COMPILE_DEFINITIONS
+        PRIVATE
+            SCENE_BUILDER_EXPORTS
+    INCLUDE_DIRECTORIES
+        PUBLIC
+            ../..
+    BUILD_DEPENDENCIES
+        PUBLIC
+            AZ::SceneBuilder.Static
+        PRIVATE
+            AZ::AzCore
+)
+
+ly_add_dependencies(AssetBuilder AZ::SceneBuilder)
+
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+    ly_add_target(
+        NAME SceneBuilder.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+        NAMESPACE AZ
+        FILES_CMAKE
+            scenebuilder_testing_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                Tests
+        BUILD_DEPENDENCIES
+            PRIVATE
+                AZ::AzTest
+                AZ::SceneBuilder
+    )
+    ly_add_googletest(
+        NAME AZ::SceneBuilder.Tests
+    )
+endif()
diff --git a/Code/Tools/SceneAPI/SceneBuilder/DllMain.cpp b/Code/Tools/SceneAPI/SceneBuilder/DllMain.cpp
new file mode 100644
index 0000000000..2f6e0e1d07
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/DllMain.cpp
@@ -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
+ *
+ */
+
+#if !defined(AZ_MONOLITHIC_BUILD)
+
+#include <AzCore/Component/Component.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/Module/Environment.h>
+#include <SceneAPI/SceneBuilder/SceneImportRequestHandler.h>
+
+#include <SceneAPI/SceneBuilder/SceneImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            static AZStd::vector<AZ::ComponentDescriptor*> g_componentDescriptors;
+
+            void Reflect(AZ::SerializeContext* /*context*/)
+            {
+                // Descriptor registration is done in Reflect instead of Initialize because the ResourceCompilerScene initializes the libraries before
+                // there's an application.
+                using namespace AZ::SceneAPI;
+                using namespace AZ::SceneAPI::SceneBuilder;
+
+                if (g_componentDescriptors.empty())
+                {
+                    // Global importer and behavior
+                    g_componentDescriptors.push_back(SceneBuilder::SceneImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(SceneImportRequestHandler::CreateDescriptor());
+
+                    // Node and attribute importers
+                    g_componentDescriptors.push_back(AssImpBitangentStreamImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpColorStreamImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpMaterialImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpMeshImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpTangentStreamImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpTransformImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpUvMapImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpSkinImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpSkinWeightsImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpBoneImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpAnimationImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(AssImpBlendShapeImporter::CreateDescriptor());
+
+                    for (AZ::ComponentDescriptor* descriptor : g_componentDescriptors)
+                    {
+                        AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationBus::Handler::RegisterComponentDescriptor, descriptor);
+                    }
+                }
+            }
+
+            void ReflectBehavior([[maybe_unused]] AZ::BehaviorContext* context)
+            {
+                // stub in until LYN-1284 is done
+            }
+
+            void Activate()
+            {
+            }
+            
+            void Deactivate()
+            {
+            }
+
+            void Uninitialize()
+            {
+                if (!g_componentDescriptors.empty())
+                {
+                    for (AZ::ComponentDescriptor* descriptor : g_componentDescriptors)
+                    {
+                        descriptor->ReleaseDescriptor();
+                    }
+                    g_componentDescriptors.clear();
+                    g_componentDescriptors.shrink_to_fit();
+                }
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
+
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env)
+{
+    AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(env));
+}
+extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context)
+{
+    AZ::SceneAPI::SceneBuilder::Reflect(context);
+}
+extern "C" AZ_DLL_EXPORT void ReflectBehavior(AZ::BehaviorContext* context)
+{
+    AZ::SceneAPI::SceneBuilder::ReflectBehavior(context);
+}
+extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule()
+{
+    AZ::SceneAPI::SceneBuilder::Uninitialize();
+    AZ::Environment::Detach();
+}
+
+#endif // !defined(AZ_MONOLITHIC_BUILD)
diff --git a/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.cpp b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.cpp
new file mode 100644
index 0000000000..eea929f2f1
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.cpp
@@ -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
+ *
+ */
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            AssImpImportContext::AssImpImportContext(const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                const SceneSystem& sourceSceneSystem,
+                AssImpSDKWrapper::AssImpNodeWrapper& sourceNode)
+                : m_sourceScene(sourceScene)
+                , m_sourceSceneSystem(sourceSceneSystem)
+                , m_sourceNode(sourceNode)
+            {
+            }
+
+            AssImpNodeEncounteredContext::AssImpNodeEncounteredContext(Containers::Scene& scene,
+                Containers::SceneGraph::NodeIndex currentGraphPosition,
+                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                const SceneSystem& sourceSceneSystem,
+                RenamedNodesMap& nodeNameMap,
+                AssImpSDKWrapper::AssImpNodeWrapper& sourceNode)
+                : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode)
+                , NodeEncounteredContext(scene, currentGraphPosition, nodeNameMap)
+            {
+            }
+
+            AssImpNodeEncounteredContext::AssImpNodeEncounteredContext(
+                Events::ImportEventContext& parent,
+                Containers::SceneGraph::NodeIndex currentGraphPosition,
+                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                const SceneSystem& sourceSceneSystem,
+                RenamedNodesMap& nodeNameMap,
+                AssImpSDKWrapper::AssImpNodeWrapper& sourceNode)
+                : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode)
+                , NodeEncounteredContext(parent.GetScene(), currentGraphPosition, nodeNameMap)
+            {
+            }
+
+            AssImpSceneDataPopulatedContext::AssImpSceneDataPopulatedContext(AssImpNodeEncounteredContext& parent,
+                const AZStd::shared_ptr<DataTypes::IGraphObject>& graphData, const AZStd::string& dataName)
+                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
+                , SceneDataPopulatedContextBase(parent, graphData, dataName)
+            {
+            }
+
+            AssImpSceneDataPopulatedContext::AssImpSceneDataPopulatedContext(Containers::Scene& scene,
+                Containers::SceneGraph::NodeIndex currentGraphPosition,
+                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                const SceneSystem& sourceSceneSystem,
+                RenamedNodesMap& nodeNameMap,
+                AssImpSDKWrapper::AssImpNodeWrapper& sourceNode,
+                const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData, const AZStd::string& dataName)
+                : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode)
+                , SceneDataPopulatedContextBase(scene, currentGraphPosition, nodeNameMap, nodeData, dataName)
+            {
+            }
+
+            AssImpSceneNodeAppendedContext::AssImpSceneNodeAppendedContext(AssImpSceneDataPopulatedContext& parent,
+                Containers::SceneGraph::NodeIndex newIndex)
+                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
+                , SceneNodeAppendedContextBase(parent.m_scene, newIndex, parent.m_nodeNameMap)
+            {
+            }
+
+            AssImpSceneNodeAppendedContext::AssImpSceneNodeAppendedContext(Containers::Scene& scene,
+                Containers::SceneGraph::NodeIndex currentGraphPosition,
+                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                const SceneSystem& sourceSceneSystem,
+                RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode)
+                : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode)
+                , SceneNodeAppendedContextBase(scene, currentGraphPosition, nodeNameMap)
+            {
+            }
+
+            AssImpSceneAttributeDataPopulatedContext::AssImpSceneAttributeDataPopulatedContext(AssImpSceneNodeAppendedContext& parent, const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData, const Containers::SceneGraph::NodeIndex attributeNodeIndex, const AZStd::string& dataName)
+                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
+                , SceneAttributeDataPopulatedContextBase(parent, nodeData, attributeNodeIndex, dataName)
+            {
+            }
+
+            AssImpSceneAttributeNodeAppendedContext::AssImpSceneAttributeNodeAppendedContext(AssImpSceneAttributeDataPopulatedContext& parent, Containers::SceneGraph::NodeIndex newIndex)
+                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
+                , SceneAttributeNodeAppendedContextBase(parent, newIndex)
+            {
+            }
+
+            AssImpSceneNodeAddedAttributesContext::AssImpSceneNodeAddedAttributesContext(AssImpSceneNodeAppendedContext& parent)
+                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
+                , SceneNodeAddedAttributesContextBase(parent)
+            {
+            }
+
+            AssImpSceneNodeFinalizeContext::AssImpSceneNodeFinalizeContext(AssImpSceneNodeAddedAttributesContext& parent)
+                : AssImpImportContext(parent.m_sourceScene, parent.m_sourceSceneSystem, parent.m_sourceNode)
+                , SceneNodeFinalizeContextBase(parent)
+            {
+            }
+
+            
+
+            AssImpFinalizeSceneContext::AssImpFinalizeSceneContext(Containers::Scene& scene,
+                const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                const SceneSystem& sourceSceneSystem,
+                RenamedNodesMap& nodeNameMap)
+                : FinalizeSceneContextBase(scene, nodeNameMap)
+                , m_sourceScene(sourceScene)
+                , m_sourceSceneSystem(sourceSceneSystem)
+            {
+            }
+
+        } // namespace SceneAPI
+    } // namespace SceneBuilder
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h
new file mode 100644
index 0000000000..c620a8ced2
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h
@@ -0,0 +1,182 @@
+/*
+ * 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/std/string/string.h>
+#include <SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h>
+#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
+
+namespace AZ
+{
+    namespace AssImpSDKWrapper
+    {
+        class AssImpNodeWrapper;
+        class AssImpSceneWrapper;
+    }
+    
+    namespace SceneAPI
+    {
+        class SceneSystem;
+        namespace SceneBuilder
+        {
+            class RenamedNodesMap;
+
+            //  AssImpImportContext
+            //  Base structure containing common data needed for all import contexts
+            //  Member Variables:
+            //      m_sourceNode - AssImp node being used for data processing.
+            struct AssImpImportContext
+            {
+                AZ_RTTI(AssImpImportContext, "{B1076AFF-991B-423C-8D3E-D5C9230434AB}");
+
+                AssImpImportContext(const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                    const SceneSystem& sourceSceneSystem,
+                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode);
+
+                const AssImpSDKWrapper::AssImpSceneWrapper& m_sourceScene;
+                AssImpSDKWrapper::AssImpNodeWrapper& m_sourceNode;
+                const SceneSystem& m_sourceSceneSystem; // Needed for unit and axis conversion
+            };
+
+            //  AssImpNodeEncounteredContext
+            //  Context pushed to indicate that a new AssImp Node has been found and any
+            //  importers that have means to process the contained data should do so
+            struct AssImpNodeEncounteredContext
+                : public AssImpImportContext
+                , public NodeEncounteredContext
+            {
+                AZ_RTTI(AssImpNodeEncounteredContext, "{C2305BC5-EAEC-4515-BAD6-45E63C3FBD3D}", AssImpImportContext, NodeEncounteredContext);
+
+                AssImpNodeEncounteredContext(Containers::Scene& scene,
+                    Containers::SceneGraph::NodeIndex currentGraphPosition,
+                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                    const SceneSystem& sourceSceneSystem,
+                    RenamedNodesMap& nodeNameMap,
+                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode);
+
+                AssImpNodeEncounteredContext(Events::ImportEventContext& parent,
+                    Containers::SceneGraph::NodeIndex currentGraphPosition,
+                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                    const SceneSystem& sourceSceneSystem,
+                    RenamedNodesMap& nodeNameMap,
+                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode);
+            };
+
+            //  AssImpSceneDataPopulatedContext
+            //  Context pushed to indicate that a piece of scene data has been fully 
+            //  processed and any importers that wish to place it within the scene graph
+            //  may now do so.
+            struct AssImpSceneDataPopulatedContext
+                : public AssImpImportContext
+                , public SceneDataPopulatedContextBase
+            {
+                AZ_RTTI(AssImpSceneDataPopulatedContext, "{888DA37E-4234-4990-AD50-E6E54AFA9C35}", AssImpImportContext, SceneDataPopulatedContextBase);
+
+                AssImpSceneDataPopulatedContext(AssImpNodeEncounteredContext& parent,
+                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
+                    const AZStd::string& dataName);
+
+                AssImpSceneDataPopulatedContext(Containers::Scene& scene,
+                    Containers::SceneGraph::NodeIndex currentGraphPosition,
+                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                    const SceneSystem& sourceSceneSystem,
+                    RenamedNodesMap& nodeNameMap,
+                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode,
+                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
+                    const AZStd::string& dataName);
+            };
+
+            //  AssImpSceneNodeAppendedContext
+            //  Context pushed to indicate that data has been added to the scene graph. 
+            //  Generally created due to the insertion of a node during SceneDataPopulatedContext
+            //  processing.
+            struct AssImpSceneNodeAppendedContext
+                : public AssImpImportContext
+                , public SceneNodeAppendedContextBase
+            {
+                AZ_RTTI(AssImpSceneNodeAppendedContext, "{9C8B688E-8ECD-4EF0-9AC6-21BBCFE8F5A3}", AssImpImportContext, SceneNodeAppendedContextBase);
+
+                AssImpSceneNodeAppendedContext(AssImpSceneDataPopulatedContext& parent, Containers::SceneGraph::NodeIndex newIndex);
+                AssImpSceneNodeAppendedContext(Containers::Scene& scene,
+                    Containers::SceneGraph::NodeIndex currentGraphPosition,
+                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                    const SceneSystem& sourceSceneSystem,
+                    RenamedNodesMap& nodeNameMap,
+                    AssImpSDKWrapper::AssImpNodeWrapper& sourceNode);
+            };
+
+            // AssImpSceneAttributeDataPopulatedContext
+            // Context pushed to indicate that attribute data has been found and processed
+            struct AssImpSceneAttributeDataPopulatedContext
+                : public AssImpImportContext
+                , public SceneAttributeDataPopulatedContextBase
+            {
+                AZ_RTTI(AssImpSceneAttributeDataPopulatedContext, "{A5EFB485-2F36-4214-972B-0EFF4EFBF33D}", AssImpImportContext, SceneAttributeDataPopulatedContextBase);
+
+                AssImpSceneAttributeDataPopulatedContext(AssImpSceneNodeAppendedContext& parent,
+                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
+                    const Containers::SceneGraph::NodeIndex attributeNodeIndex,const AZStd::string& dataName);
+            };
+
+            // AssImpSceneAttributeNodeAppendedContext
+            // Context pushed to indicate that an attribute node has been added to the scene graph
+            struct AssImpSceneAttributeNodeAppendedContext
+                : public AssImpImportContext
+                , public SceneAttributeNodeAppendedContextBase
+            {
+                AZ_RTTI(AssImpSceneAttributeNodeAppendedContext, "{96FDC405-2D3B-4030-A301-B3A2B5432498}", AssImpImportContext, SceneAttributeNodeAppendedContextBase);
+
+                AssImpSceneAttributeNodeAppendedContext(AssImpSceneAttributeDataPopulatedContext& parent, Containers::SceneGraph::NodeIndex newIndex);
+            };
+
+            //  AssImpSceneNodeAddedAttributesContext
+            //  Context pushed to indicate that all attribute processors have completed their
+            //  work for a specific data node.
+            struct AssImpSceneNodeAddedAttributesContext
+                : public AssImpImportContext
+                , public SceneNodeAddedAttributesContextBase
+            {
+                AZ_RTTI(AssImpSceneNodeAddedAttributesContext, "{D305EAA5-5F16-4AAD-805D-DF07A1B355B9}", AssImpImportContext, SceneNodeAddedAttributesContextBase);
+
+                AssImpSceneNodeAddedAttributesContext(AssImpSceneNodeAppendedContext& parent);
+            };
+
+            //  AssImpSceneNodeFinalizeContext
+            //  Context pushed last after all other contexts for a scene node to allow any
+            //  post-processing needed for an importer.
+            struct AssImpSceneNodeFinalizeContext
+                : public AssImpImportContext
+                , public SceneNodeFinalizeContextBase
+            {
+                AZ_RTTI(AssImpSceneNodeFinalizeContext, "{FD8B4AD5-3735-4D55-9455-504AB1DCA655}", AssImpImportContext, SceneNodeFinalizeContextBase);
+
+                AssImpSceneNodeFinalizeContext(AssImpSceneNodeAddedAttributesContext& parent);
+            };
+
+            //  AssImpFinalizeSceneContext
+            //  Context pushed after the scene has been fully created. This can be used to finalize pending work
+            //  such as resolving named links.
+            struct AssImpFinalizeSceneContext
+                : public FinalizeSceneContextBase
+            {
+                AZ_RTTI(AssImpFinalizeSceneContext, "{6B23A54A-44BF-4661-A130-6B4D06A57B9F}", FinalizeSceneContextBase);
+
+                AssImpFinalizeSceneContext(
+                    Containers::Scene& scene,
+                    const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene,
+                    const SceneSystem& sourceSceneSystem,
+                    RenamedNodesMap& nodeNameMap);
+
+                const AssImpSDKWrapper::AssImpSceneWrapper& m_sourceScene;
+                const SceneSystem& m_sourceSceneSystem; // Needed for unit and axis conversion
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
+
diff --git a/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.cpp b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.cpp
new file mode 100644
index 0000000000..ae57ad5b9f
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.cpp
@@ -0,0 +1,107 @@
+/*
+ * 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 <SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h>
+#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            ImportContext::ImportContext(Containers::Scene& scene,
+                Containers::SceneGraph::NodeIndex currentGraphPosition,
+                RenamedNodesMap& nodeNameMap)
+                : m_scene(scene)
+                , m_currentGraphPosition(currentGraphPosition)
+                , m_nodeNameMap(nodeNameMap)
+            {
+            }
+
+            ImportContext::ImportContext(Containers::Scene& scene, RenamedNodesMap& nodeNameMap)
+                : m_scene(scene)
+                , m_nodeNameMap(nodeNameMap)
+            {
+                m_currentGraphPosition = Containers::SceneGraph::NodeIndex();
+            }
+
+            NodeEncounteredContext::NodeEncounteredContext(Containers::Scene& scene,
+                Containers::SceneGraph::NodeIndex currentGraphPosition,
+                RenamedNodesMap& nodeNameMap)
+                : ImportContext(scene, currentGraphPosition, nodeNameMap)
+            {
+            }
+
+            NodeEncounteredContext::NodeEncounteredContext(
+                Events::ImportEventContext& parent, Containers::SceneGraph::NodeIndex currentGraphPosition,
+                RenamedNodesMap& nodeNameMap)
+                : ImportContext(parent.GetScene(), currentGraphPosition, nodeNameMap)
+            {
+            }
+
+            SceneDataPopulatedContextBase::SceneDataPopulatedContextBase(NodeEncounteredContext& parent,
+                const AZStd::shared_ptr<DataTypes::IGraphObject>& graphData, const AZStd::string& dataName)
+                : ImportContext(parent.m_scene, parent.m_currentGraphPosition, parent.m_nodeNameMap)
+                , m_graphData(graphData)
+                , m_dataName(dataName)
+            {
+            }
+
+            SceneDataPopulatedContextBase::SceneDataPopulatedContextBase(Containers::Scene& scene,
+                Containers::SceneGraph::NodeIndex currentGraphPosition,
+                RenamedNodesMap& nodeNameMap,
+                const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData, const AZStd::string& dataName)
+                : ImportContext(scene, currentGraphPosition, nodeNameMap)
+                , m_graphData(nodeData)
+                , m_dataName(dataName)
+            {
+            }
+
+            SceneNodeAppendedContextBase::SceneNodeAppendedContextBase(SceneDataPopulatedContextBase& parent,
+                Containers::SceneGraph::NodeIndex newIndex)
+                : ImportContext(parent.m_scene, newIndex, parent.m_nodeNameMap)
+            {
+            }
+
+            SceneNodeAppendedContextBase::SceneNodeAppendedContextBase(Containers::Scene& scene,
+                Containers::SceneGraph::NodeIndex currentGraphPosition, RenamedNodesMap& nodeNameMap)
+                : ImportContext(scene, currentGraphPosition, nodeNameMap)
+            {
+            }
+
+            SceneAttributeDataPopulatedContextBase::SceneAttributeDataPopulatedContextBase(SceneNodeAppendedContextBase& parent,
+                const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
+                const Containers::SceneGraph::NodeIndex attributeNodeIndex, const AZStd::string& dataName)
+                : ImportContext(parent.m_scene, attributeNodeIndex, parent.m_nodeNameMap)
+                , m_graphData(nodeData)
+                , m_dataName(dataName)
+            {
+            }
+
+            SceneAttributeNodeAppendedContextBase::SceneAttributeNodeAppendedContextBase(SceneAttributeDataPopulatedContextBase& parent, Containers::SceneGraph::NodeIndex newIndex)
+                : ImportContext(parent.m_scene, newIndex, parent.m_nodeNameMap)
+            {
+            }
+
+            SceneNodeAddedAttributesContextBase::SceneNodeAddedAttributesContextBase(SceneNodeAppendedContextBase& parent)
+                : ImportContext(parent.m_scene, parent.m_currentGraphPosition, parent.m_nodeNameMap)
+            {
+            }
+
+            SceneNodeFinalizeContextBase::SceneNodeFinalizeContextBase(SceneNodeAddedAttributesContextBase& parent)
+                : ImportContext(parent.m_scene, parent.m_currentGraphPosition, parent.m_nodeNameMap)
+            {
+            }
+
+            FinalizeSceneContextBase::FinalizeSceneContextBase(Containers::Scene& scene, RenamedNodesMap& nodeNameMap)
+                : ImportContext(scene, nodeNameMap)
+            {
+            }
+        } // namespace SceneAPI
+    } // namespace SceneBuilder
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h
new file mode 100644
index 0000000000..db873f5eae
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h
@@ -0,0 +1,179 @@
+/*
+ * 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/std/string/string.h>
+#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
+#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+
+
+namespace AZ
+{    
+    namespace SceneAPI
+    {
+        namespace Containers
+        {
+            class Scene;
+        }
+
+        namespace DataTypes
+        {
+            class IGraphObject;
+        }
+
+        namespace Events
+        {
+            class ImportEventContext;
+        }
+
+        namespace SceneBuilder
+        {
+            class RenamedNodesMap;
+
+            //  ImportContext
+            //  Base structure containing common data needed for all import contexts
+            struct ImportContext
+                : public Events::ICallContext
+            {
+                AZ_RTTI(ImportContext, "{68E546D5-9B79-4293-AD37-4A4BA688892F}", Events::ICallContext);
+
+                ImportContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, 
+                    RenamedNodesMap& nodeNameMap);
+                ImportContext(Containers::Scene& scene, RenamedNodesMap& nodeNameMap);
+
+                Containers::Scene& m_scene;
+                Containers::SceneGraph::NodeIndex m_currentGraphPosition;
+                RenamedNodesMap& m_nodeNameMap; // Map of the nodes that have received a new name.
+            };
+
+            //  NodeEncounteredContext
+            //  Context pushed to indicate that a new Node has been found and any
+            //  importers that have means to process the contained data should do so
+            //  Member Variables:
+            //      m_createdData - out container that importers must add their created data
+            //          to.
+            struct NodeEncounteredContext
+                : public ImportContext
+            {
+                AZ_RTTI(NodeEncounteredContext, "{40C31D76-7101-4ACD-8849-0D6D0AF62855}", ImportContext);
+
+                NodeEncounteredContext(Containers::Scene& scene,
+                    Containers::SceneGraph::NodeIndex currentGraphPosition,
+                    RenamedNodesMap& nodeNameMap);
+
+                NodeEncounteredContext(Events::ImportEventContext& parent,
+                    Containers::SceneGraph::NodeIndex currentGraphPosition,
+                    RenamedNodesMap& nodeNameMap);
+
+                AZStd::vector<AZStd::shared_ptr<DataTypes::IGraphObject>> m_createdData;
+            };
+
+            //  SceneDataPopulatedContextBase
+            //  Context pushed to indicate that a piece of scene data has been fully 
+            //  processed and any importers that wish to place it within the scene graph
+            //  may now do so.
+            //  Member Variables:
+            //      m_graphData - the piece of data that should be inserted in the graph
+            //      m_dataName - the name that should be used as the basis for the scene node
+            //          name
+            struct SceneDataPopulatedContextBase
+                : public ImportContext
+            {
+                AZ_RTTI(SceneDataPopulatedContextBase, "{5F4CE8D2-EEAC-49F7-8065-0B6372162D6F}", ImportContext);
+
+                SceneDataPopulatedContextBase(NodeEncounteredContext& parent,
+                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
+                    const AZStd::string& dataName);
+
+                SceneDataPopulatedContextBase(Containers::Scene& scene,
+                    Containers::SceneGraph::NodeIndex currentGraphPosition,
+                    RenamedNodesMap& nodeNameMap,
+                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData, const AZStd::string& dataName);
+
+                const AZStd::shared_ptr<DataTypes::IGraphObject>& m_graphData;
+                const AZStd::string m_dataName;
+            };
+
+            //  SceneNodeAppendedContextBase
+            //  Context pushed to indicate that data has been added to the scene graph. 
+            //  Generally created due to the insertion of a node during SceneDataPopulatedContextBase
+            //  processing.
+            struct SceneNodeAppendedContextBase
+                : public ImportContext
+            {
+                AZ_RTTI(SceneNodeAppendedContextBase, "{0A69FB6C-2B1B-46E7-AEC3-C4B8ABBFDD69}", ImportContext);
+
+                SceneNodeAppendedContextBase(SceneDataPopulatedContextBase& parent, Containers::SceneGraph::NodeIndex newIndex);
+                SceneNodeAppendedContextBase(Containers::Scene& scene,
+                    Containers::SceneGraph::NodeIndex currentGraphPosition, RenamedNodesMap& nodeNameMap);
+            };
+
+            // SceneAttributeDataPopulatedContextBase
+            // Context pushed to indicate that attribute data has been found and processed
+            struct SceneAttributeDataPopulatedContextBase
+                : public ImportContext
+            {
+                AZ_RTTI(SceneAttributeDataPopulatedContextBase, "{DA133E14-0770-435B-9A4E-38679367F56C}", ImportContext);
+
+                SceneAttributeDataPopulatedContextBase(SceneNodeAppendedContextBase& parent,
+                    const AZStd::shared_ptr<DataTypes::IGraphObject>& nodeData,
+                    const Containers::SceneGraph::NodeIndex attributeNodeIndex, const AZStd::string& dataName);
+
+                const AZStd::shared_ptr<DataTypes::IGraphObject>& m_graphData;
+                const AZStd::string m_dataName;
+            };
+
+            // SceneAttributeNodeAppendedContextBase
+            // Context pushed to indicate that an attribute node has been added to the scene graph
+            struct SceneAttributeNodeAppendedContextBase
+                : public ImportContext
+            {
+                AZ_RTTI(SceneAttributeNodeAppendedContextBase, "{8A382A1E-CFE7-47D2-BA5B-CFDF1FB9F03D}", ImportContext);
+
+                SceneAttributeNodeAppendedContextBase(SceneAttributeDataPopulatedContextBase& parent,
+                    Containers::SceneGraph::NodeIndex newIndex);
+            };
+
+            //  SceneNodeAddedAttributesContextBase
+            //  Context pushed to indicate that all attribute processors have completed their
+            //  work for a specific data node.
+            struct SceneNodeAddedAttributesContextBase
+                : public ImportContext
+            {
+                AZ_RTTI(SceneNodeAddedAttributesContextBase, "{65B97E48-16A0-4BBD-B364-CFDA9E3600B6}", ImportContext);
+
+                SceneNodeAddedAttributesContextBase(SceneNodeAppendedContextBase& parent);
+            };
+
+            //  SceneNodeFinalizeContextBase
+            //  Context pushed last after all other contexts for a scene node to allow any
+            //  post-processing needed for an importer.
+            struct SceneNodeFinalizeContextBase
+                : public ImportContext
+            {
+                AZ_RTTI(SceneNodeFinalizeContextBase, "{F2C7D1BC-8065-423E-9212-241EB426A2BB}", ImportContext);
+
+                SceneNodeFinalizeContextBase(SceneNodeAddedAttributesContextBase& parent);
+            };
+
+            //  FinalizeSceneContextBase
+            //  Context pushed after the scene has been fully created. This can be used to finalize pending work
+            //  such as resolving named links.
+            struct FinalizeSceneContextBase
+                : public ImportContext
+            {
+                AZ_RTTI(FinalizeSceneContextBase, "{91C54F51-9B4D-4C61-956C-9D530725D737}", ImportContext);
+
+                FinalizeSceneContextBase(Containers::Scene& scene, RenamedNodesMap& nodeNameMap);
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
+
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp
new file mode 100644
index 0000000000..e7726de502
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp
@@ -0,0 +1,675 @@
+/*
+ * 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 <AssImpTypeConverter.h>
+#include <assimp/mesh.h>
+#include <assimp/scene.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/algorithm.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/StringFunc/StringFunc.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/SceneSystem.h>
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneData/GraphData/AnimationData.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            const char* AssImpAnimationImporter::s_animationNodeName = "animation";
+
+            // Downstream only supports 30 frames per second sample rate. Adjusting to 60 doubles the
+            // length of the animations, they still play back at 30 frames per second.
+            const double AssImpAnimationImporter::s_defaultTimeStepBetweenFrames = 1.0 / 30.0;
+
+            AZ::u32 GetNumKeyFrames(AZ::u32 keysSize, double duration, double ticksPerSecond)
+            {
+                if (AZ::IsClose(ticksPerSecond, 0))
+                {
+                    AZ_Warning("AnimationImporter", false, "Animation ticks per second should not be zero, defaulting to %d keyframes for animation.", keysSize);
+                    return keysSize;
+                }
+
+                const double totalTicks = duration / ticksPerSecond;
+                AZ::u32 numKeys = keysSize;
+                // +1 because the animation is from [0, duration] - we have a keyframe at the end of the duration which needs to be included
+                double totalFramesAtDefaultTimeStep = totalTicks / AssImpAnimationImporter::s_defaultTimeStepBetweenFrames + 1;
+                if (!AZ::IsClose(totalFramesAtDefaultTimeStep, numKeys, 1))
+                {
+                    numKeys = AZStd::ceilf(totalFramesAtDefaultTimeStep);
+                }
+                return numKeys;
+            }
+
+            double GetTimeForFrame(AZ::u32 frame, double ticksPerSecond)
+            {
+                return frame * AssImpAnimationImporter::s_defaultTimeStepBetweenFrames * ticksPerSecond;
+            }
+
+            // Helper class to store key data, when translating from AssImp layout to the engine's scene format.
+            struct KeyData
+            {
+                KeyData(float value, float time) :
+                    mValue(value),
+                    mTime(time)
+                {
+
+                }
+
+                bool operator<(const KeyData& other) const
+                {
+                    return mTime < other.mTime;
+                }
+
+                float mValue = 0;
+                float mTime = 0;
+            };
+
+            template<class T>
+            void LerpTemplate(T& start, const T& end, float t)
+            {
+                start = start * (1.0f - t) + end * t;
+            }
+
+            template<>
+            void LerpTemplate(aiQuaternion& start, const aiQuaternion& end, float t)
+            {
+                aiQuaternion::Interpolate(start, start, end, t);
+            }
+
+            template<>
+            void LerpTemplate(float& start, const float& end, float t)
+            {
+                start = AZ::Lerp(start, end, t);
+            }
+
+            template<class KeyContainerType, class FrameValueType>
+            bool SampleKeyFrame(FrameValueType& result, const KeyContainerType& keys, AZ::u32 numKeys, double time, AZ::u32& lastIndex)
+            {
+                if (numKeys == 0)
+                {
+                    AZ_Error("AnimationImporter", numKeys > 0, "Animation key set must have at least 1 key");
+                    return false;
+                }
+                if (numKeys == 1)
+                {
+                    result = keys[0].mValue;
+                    return true;
+                }
+
+                while (lastIndex < numKeys - 1 && time >= keys[lastIndex + 1].mTime)
+                {
+                    ++lastIndex;
+                }
+                result = keys[lastIndex].mValue;
+                if (lastIndex < numKeys - 1)
+                {
+                    auto nextValue = keys[lastIndex + 1].mValue;
+                    float normalizedTimeBetweenFrames = 0;
+                    if (keys[lastIndex + 1].mTime != keys[lastIndex].mTime)
+                    {
+                        normalizedTimeBetweenFrames =
+                            (time - keys[lastIndex].mTime) / (keys[lastIndex + 1].mTime - keys[lastIndex].mTime);
+                    }
+                    else
+                    {
+                        AZ_Warning("AnimationImporter", false,
+                            "Animation has keys with duplicate time %5.5f, at indices %d and %d. The second will be ignored.",
+                            keys[lastIndex].mTime,
+                            lastIndex,
+                            lastIndex + 1);
+                    }
+                    LerpTemplate(result, nextValue, normalizedTimeBetweenFrames);
+                }
+                return true;
+            }
+
+            AssImpAnimationImporter::AssImpAnimationImporter()
+            {
+                BindToCall(&AssImpAnimationImporter::ImportAnimation);
+            }
+
+            void AssImpAnimationImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpAnimationImporter, SceneCore::LoadingComponent>()->Version(5); // [LYN-4226] Invert PostRotation matrix in animation chains
+                }
+            }
+
+            AZStd::string GetName(const aiMeshAnim* anim)
+            {
+                return anim->mName.C_Str();
+            }
+
+            AZStd::string GetName(const aiNodeAnim* anim)
+            {
+                return anim->mNodeName.C_Str();
+            }
+
+            AZStd::string GetName(const aiMeshMorphAnim* anim)
+            {
+                return anim->mName.C_Str();
+            }
+
+            struct ConsolidatedNodeAnim
+            {
+                ConsolidatedNodeAnim() = default;
+                ConsolidatedNodeAnim(const ConsolidatedNodeAnim& other) = delete;
+
+                ConsolidatedNodeAnim(ConsolidatedNodeAnim&& other) noexcept
+                    : mNumPositionKeys{ other.mNumPositionKeys },
+                      mPositionKeys{ other.mPositionKeys },
+                      mNumRotationKeys{ other.mNumRotationKeys },
+                      mRotationKeys{ other.mRotationKeys },
+                      mNumScalingKeys{ other.mNumScalingKeys },
+                      mScalingKeys{ other.mScalingKeys },
+                      m_ownedPositionKeys{ std::move(other.m_ownedPositionKeys) },
+                      m_ownedScalingKeys{ std::move(other.m_ownedScalingKeys) },
+                      m_ownedRotationKeys{ std::move(other.m_ownedRotationKeys) },
+                      mPreState{ other.mPreState },
+                      mPostState{ other.mPostState }
+                {
+                }
+
+                ConsolidatedNodeAnim& operator=(const ConsolidatedNodeAnim& other) = delete;
+
+                ConsolidatedNodeAnim& operator=(ConsolidatedNodeAnim&& other) noexcept
+                {
+                    if (this == &other)
+                    {
+                        return *this;
+                    }
+
+                    mNumPositionKeys = other.mNumPositionKeys;
+                    mPositionKeys = other.mPositionKeys;
+                    mNumRotationKeys = other.mNumRotationKeys;
+                    mRotationKeys = other.mRotationKeys;
+                    mNumScalingKeys = other.mNumScalingKeys;
+                    mScalingKeys = other.mScalingKeys;
+                    m_ownedPositionKeys = std::move(other.m_ownedPositionKeys);
+                    m_ownedScalingKeys = std::move(other.m_ownedScalingKeys);
+                    m_ownedRotationKeys = std::move(other.m_ownedRotationKeys);
+                    mPreState = other.mPreState;
+                    mPostState = other.mPostState;
+
+                    return *this;
+                }
+
+                // These variables are named using AssImp naming convention for consistency
+                AZ::u32 mNumPositionKeys{};
+                aiVectorKey* mPositionKeys{};
+                
+                AZ::u32 mNumRotationKeys{};
+                aiQuatKey* mRotationKeys{};
+
+                AZ::u32 mNumScalingKeys{};
+                aiVectorKey* mScalingKeys{};
+                
+                AZStd::vector<aiVectorKey> m_ownedPositionKeys{};
+                AZStd::vector<aiVectorKey> m_ownedScalingKeys{};
+                AZStd::vector<aiQuatKey> m_ownedRotationKeys{};
+
+                aiAnimBehaviour mPreState{};
+                aiAnimBehaviour mPostState{};
+            };
+
+            AZStd::pair<const aiAnimation*, ConsolidatedNodeAnim> MakeMyPair(const aiAnimation* animation, const aiNodeAnim* anim)
+            {
+                ConsolidatedNodeAnim consolidatedNodeAnim{};
+
+                consolidatedNodeAnim.mNumRotationKeys = anim->mNumRotationKeys;
+                consolidatedNodeAnim.mNumPositionKeys = anim->mNumPositionKeys;
+                consolidatedNodeAnim.mNumScalingKeys = anim->mNumScalingKeys;
+                consolidatedNodeAnim.mRotationKeys = anim->mRotationKeys;
+                consolidatedNodeAnim.mPositionKeys = anim->mPositionKeys;
+                consolidatedNodeAnim.mScalingKeys = anim->mScalingKeys;
+                
+                return {animation, AZStd::move(consolidatedNodeAnim)};
+            }
+
+            auto MakeMyPair(const aiAnimation* animation, const aiMeshAnim* anim)
+            {
+                return AZStd::make_pair(animation, anim);
+            }
+
+            auto MakeMyPair(const aiAnimation* animation, const aiMeshMorphAnim* anim)
+            {
+                return AZStd::make_pair(animation, anim);
+            }
+            Events::ProcessingResult AssImpAnimationImporter::ImportAnimation(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", "Animation");
+
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                // Add check for animation layers at the scene level.
+                
+                if (!scene->HasAnimations() || IsPivotNode(currentNode->mName))
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                AZStd::unordered_multimap<AZStd::string, AZStd::pair<const aiAnimation*, ConsolidatedNodeAnim>> boneAnimations;
+                typedef AZStd::pair<const aiAnimation*, const aiMeshMorphAnim*> AnimAndMorphAnim;
+                typedef AZStd::unordered_map<AZStd::string, AnimAndMorphAnim> ChannelToMorphAnim;
+                typedef AZStd::unordered_map<AZStd::string, ChannelToMorphAnim> NodeToChannelToMorphAnim;
+                NodeToChannelToMorphAnim meshMorphAnimations;
+
+                // Goes through all the animation channels of a given type and adds them to a map so we can easily find
+                // all the animations for a given node
+                // In the case of bone animations, the data is copied into a ConsolidatedNodeAnim so we can
+                // do fix-ups later without affecting the original data
+                auto mapAnimationsFunc = [](AZ::u32 numChannels, auto** channels, const aiAnimation* animation, auto& map)
+                {
+                    map.reserve(numChannels);
+
+                    for (AZ::u32 channelIndex = 0; channelIndex < numChannels; ++channelIndex)
+                    {
+                        auto* nodeAnim = channels[channelIndex];
+                        AZStd::string name = GetName(nodeAnim);
+
+                        map.emplace(name, MakeMyPair(animation, nodeAnim));
+                    }
+                };
+
+                for (AZ::u32 animIndex = 0; animIndex < scene->mNumAnimations; ++animIndex)
+                {
+                    const aiAnimation* animation = scene->mAnimations[animIndex];
+                    if (animation->mTicksPerSecond == 0)
+                    {
+                        AZ_Error(
+                            "AnimationImporter", false,
+                            "Animation name %s has a sample rate of 0 ticks per second and cannot be processed.",
+                            animation->mName.C_Str());
+                        return Events::ProcessingResult::Failure;
+                    }
+                    
+                    mapAnimationsFunc(animation->mNumChannels, animation->mChannels, animation, boneAnimations);
+
+                    for (AZ::u32 channelIndex = 0; channelIndex < animation->mNumMorphMeshChannels; ++channelIndex)
+                    {
+                        auto* nodeAnim = animation->mMorphMeshChannels[channelIndex];
+                        AZStd::string name = GetName(nodeAnim);
+
+                        AZStd::vector<AZStd::string> meshNodeNameAndChannel;
+
+                        // Morph target animations include the channel in the name,
+                        // so if a mesh is named Mesh01, the morph target for the first channel
+                        // will be named Mesh01*0
+                        AZ::StringFunc::Tokenize(name, meshNodeNameAndChannel, '*');
+
+                        if (meshNodeNameAndChannel.size() != 2)
+                        {
+                            AZ_Error(
+                                "AnimationImporter", false,
+                                "Morph animation name %s was not in the expected format of: node name, asterisk, node channel. "
+                                "Example: 'NodeName*0'",
+                                name.c_str());
+                            continue;
+                        }
+
+                        AZStd::string meshNodeName(meshNodeNameAndChannel[0]);
+                        AZStd::string channel(meshNodeNameAndChannel[1]);
+                        meshMorphAnimations[meshNodeName][channel] = AnimAndMorphAnim(animation, nodeAnim);
+                    }
+                }
+
+                // Go through all the bone animations and find any that reference a pivot node
+                // We'll make a new node anim and store all the combined animation channels there
+                // with the name set to the base bone name
+                decltype(boneAnimations) combinedAnimations;
+
+                for (auto&& animation : boneAnimations)
+                {
+                    size_t pos = AZ::StringFunc::Find(animation.first, PivotNodeMarker, 0);
+                    
+                    if (pos != animation.first.npos)
+                    {
+                        AZStd::string_view name, part;
+                        SplitPivotNodeName(aiString(animation.first.c_str()), pos, name, part);
+                        
+                        auto&& iterator = combinedAnimations.find(name);
+                    
+                        if (iterator == combinedAnimations.end())
+                        {
+                            combinedAnimations.emplace(AZStd::string(name), AZStd::move(animation.second));
+                            iterator = combinedAnimations.find(name);
+                        }
+                    
+                        if (iterator != combinedAnimations.end())
+                        {
+                            auto& existingNode = iterator->second.second;
+                            auto&& src = animation.second.second;
+                            
+                            if (part == "Translation")
+                            {
+                                existingNode.mNumPositionKeys = src.mNumPositionKeys;
+                                existingNode.mPositionKeys = src.mPositionKeys;
+                            }
+                            else if (part == "Rotation")
+                            {
+                                existingNode.mNumRotationKeys = src.mNumRotationKeys;
+                                existingNode.mRotationKeys = src.mRotationKeys;
+                            }
+                            else if (part == "Scaling")
+                            {
+                                existingNode.mNumScalingKeys = src.mNumScalingKeys;
+                                existingNode.mScalingKeys = src.mScalingKeys;
+                            }
+                        }
+                    }
+                }
+
+                if (!combinedAnimations.empty())
+                {
+                    boneAnimations.swap(combinedAnimations);
+                }
+
+                Events::ProcessingResultCombiner combinedAnimationResult;
+                if (context.m_sourceNode.ContainsMesh())
+                {
+                    const aiMesh* firstMesh = scene->mMeshes[currentNode->mMeshes[0]];
+                    if (NodeToChannelToMorphAnim::iterator channelsForMeshName = meshMorphAnimations.find(firstMesh->mName.C_Str());
+                        channelsForMeshName != meshMorphAnimations.end())
+                    {
+                        const auto [nodeIterName, channels] = *channelsForMeshName;
+                        for (const auto& [channel, animAndMorphAnim] : channels)
+                        {
+                            const auto& [animation, morphAnimation] = animAndMorphAnim;
+                            combinedAnimationResult += ImportBlendShapeAnimation(
+                                context, animation, morphAnimation, firstMesh);
+                        }
+                    }
+                }
+
+                AZStd::string nodeName = s_animationNodeName;
+                RenamedNodesMap::SanitizeNodeName(nodeName, context.m_scene.GetGraph(), context.m_currentGraphPosition);
+                AZ_TraceContext("Animation node name", nodeName);
+
+                // If there are no bone animations, but there are mesh animations,
+                // then a stub animation needs to be created so the exporter can create the exported morph target animation.
+                if (boneAnimations.empty() && !meshMorphAnimations.empty())
+                {
+                    const aiAnimation* animation = scene->mAnimations[0];
+                    for (AZ::u32 channelIndex = 0; channelIndex < animation->mNumMorphMeshChannels; ++channelIndex)
+                    {
+                        const aiMeshMorphAnim* nodeAnim = animation->mMorphMeshChannels[channelIndex];
+                        // Morph animations need a regular animation on the node, as well.
+                        // If there is no bone animation on the current node, then generate one here.
+                        AZStd::shared_ptr<SceneData::GraphData::AnimationData> createdAnimationData =
+                            AZStd::make_shared<SceneData::GraphData::AnimationData>();
+
+                        const size_t numKeyframes = GetNumKeyFrames(
+                            nodeAnim->mNumKeys,
+                            animation->mDuration,
+                            animation->mTicksPerSecond);
+                        createdAnimationData->ReserveKeyFrames(numKeyframes);
+
+                        const double timeStepBetweenFrames = 1.0 / animation->mTicksPerSecond;
+                        createdAnimationData->SetTimeStepBetweenFrames(timeStepBetweenFrames);
+
+                        // Set every frame of the animation to the start location of the node.
+                        aiMatrix4x4 combinedTransform = GetConcatenatedLocalTransform(currentNode);
+                        DataTypes::MatrixType localTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(combinedTransform);
+                        context.m_sourceSceneSystem.SwapTransformForUpAxis(localTransform);
+                        context.m_sourceSceneSystem.ConvertUnit(localTransform);
+                        for (AZ::u32 time = 0; time <= numKeyframes; ++time)
+                        {
+                            createdAnimationData->AddKeyFrame(localTransform);
+                        }
+
+                        const AZStd::string stubBoneAnimForMorphName(AZStd::string::format("%s%s", nodeName.c_str(), nodeAnim->mName.C_Str()));
+                        Containers::SceneGraph::NodeIndex addNode = context.m_scene.GetGraph().AddChild(
+                            context.m_currentGraphPosition, stubBoneAnimForMorphName.c_str(), AZStd::move(createdAnimationData));
+                        context.m_scene.GetGraph().MakeEndPoint(addNode);
+                    }
+                    
+                    return combinedAnimationResult.GetResult();
+                }
+
+                AZStd::unordered_set<AZStd::string> boneList;
+
+                for (int meshIndex = 0; meshIndex < scene->mNumMeshes; ++meshIndex)
+                {
+                    aiMesh* mesh = scene->mMeshes[meshIndex];
+
+                    for (int boneIndex = 0; boneIndex < mesh->mNumBones; ++boneIndex)
+                    {
+                        aiBone* bone = mesh->mBones[boneIndex];
+
+                        boneList.insert(bone->mName.C_Str());
+                    }
+                }
+
+                decltype(boneAnimations) fillerAnimations;
+
+                // Go through all the animations and make sure we create placeholder animations for any bones missing them
+                for (auto&& anim : boneAnimations)
+                {
+                    for (auto boneName : boneList)
+                    {
+                        if (!IsPivotNode(aiString(boneName.c_str())))
+                        {
+                            if (!boneAnimations.contains(boneName) &&
+                                !fillerAnimations.contains(boneName))
+                            {
+                                // Create 1 key for each type that just copies the current transform
+                                ConsolidatedNodeAnim emptyAnimation;
+                                auto node = scene->mRootNode->FindNode(boneName.c_str());
+                                aiMatrix4x4 globalTransform = GetConcatenatedLocalTransform(node);
+
+                                aiVector3D position, scale;
+                                aiQuaternion rotation;
+
+                                globalTransform.Decompose(scale, rotation, position);
+
+                                emptyAnimation.mNumRotationKeys = emptyAnimation.mNumPositionKeys = emptyAnimation.mNumScalingKeys = 1;
+
+                                emptyAnimation.m_ownedPositionKeys.emplace_back(0, position);
+                                emptyAnimation.mPositionKeys = emptyAnimation.m_ownedPositionKeys.data();
+
+                                emptyAnimation.m_ownedRotationKeys.emplace_back(0, rotation);
+                                emptyAnimation.mRotationKeys = emptyAnimation.m_ownedRotationKeys.data();
+
+                                emptyAnimation.m_ownedScalingKeys.emplace_back(0, scale);
+                                emptyAnimation.mScalingKeys = emptyAnimation.m_ownedScalingKeys.data();
+                                
+                                fillerAnimations.insert(
+                                    AZStd::make_pair(boneName, AZStd::make_pair(anim.second.first, AZStd::move(emptyAnimation))));
+                            }
+                        }
+                    }
+                }
+
+                boneAnimations.insert(AZStd::make_move_iterator(fillerAnimations.begin()), AZStd::make_move_iterator(fillerAnimations.end()));
+
+                auto animItr = boneAnimations.equal_range(currentNode->mName.C_Str());
+
+                if (animItr.first == animItr.second)
+                {
+                    return combinedAnimationResult.GetResult();
+                }
+                
+                bool onlyOne = false;
+
+                for (auto it = animItr.first; it != animItr.second; ++it)
+                {
+                    if (onlyOne)
+                    {
+                        AZ_Error("AnimationImporter", false, "Bone %s has multiple animations.  Only 1 animation per bone is supported", currentNode->mName.C_Str());
+                        break;
+                    }
+
+                    const aiAnimation* animation = it->second.first;
+                    const ConsolidatedNodeAnim* anim = &it->second.second;
+
+                    // We don't currently handle having a different number of keys, with 1 exception:
+                    // 1 key is essentially a constant so we do handle that case
+                    if ((anim->mNumPositionKeys != anim->mNumRotationKeys && anim->mNumPositionKeys > 1 && anim->mNumRotationKeys > 1) ||
+                        (anim->mNumPositionKeys != anim->mNumScalingKeys && anim->mNumPositionKeys > 1 && anim->mNumScalingKeys > 1) ||
+                        (anim->mNumRotationKeys != anim->mNumScalingKeys && anim->mNumRotationKeys > 1 && anim->mNumScalingKeys > 1))
+                    {
+                        AZ_Error("AnimationImporter", false, "Bone Animation with different number of position (%d)/rotation (%d)/scaling (%d) keys not supported",
+                            anim->mNumPositionKeys, anim->mNumRotationKeys, anim->mNumScalingKeys);
+                        return Events::ProcessingResult::Failure;
+                    }
+
+                    // Resample the animations at a fixed time step. This matches the behaviour of
+                    // the previous SDK used. Longer term, this could be data driven, or based on the
+                    // smallest time step between key frames.
+                    // AssImp has an animation->mTicksPerSecond and animation->mDuration, but those
+                    // are less predictable than just using a fixed time step.
+                    // AssImp documentation claims animation->mDuration is the duration of the animation in ticks, but
+                    // not all animations we've tested follow that pattern. Sometimes duration is in seconds.
+                    const size_t numKeyFrames = GetNumKeyFrames(
+                        AZStd::max(AZStd::max(anim->mNumScalingKeys, anim->mNumPositionKeys), anim->mNumRotationKeys),
+                        animation->mDuration,
+                        animation->mTicksPerSecond);
+
+                    AZStd::shared_ptr<SceneData::GraphData::AnimationData> createdAnimationData =
+                       AZStd::make_shared<SceneData::GraphData::AnimationData>();
+                    createdAnimationData->ReserveKeyFrames(numKeyFrames);
+                    createdAnimationData->SetTimeStepBetweenFrames(s_defaultTimeStepBetweenFrames);
+
+                    AZ::u32 lastScaleIndex = 0;
+                    AZ::u32 lastPositionIndex = 0;
+                    AZ::u32 lastRotationIndex = 0;
+                    for (AZ::u32 frame = 0; frame < numKeyFrames; ++frame)
+                    {
+                        const double time = GetTimeForFrame(frame, animation->mTicksPerSecond);
+
+                        aiVector3D scale(1.0f, 1.0f, 1.0f);
+                        aiVector3D position(0.0f, 0.0f, 0.0f);
+                        aiQuaternion rotation(1.0f, 0.0f, 0.0f, 0.0f);
+                        if (!SampleKeyFrame(scale, anim->mScalingKeys, anim->mNumScalingKeys, time, lastScaleIndex) ||
+                            !SampleKeyFrame(position, anim->mPositionKeys, anim->mNumPositionKeys, time, lastPositionIndex) ||
+                            !SampleKeyFrame(rotation, anim->mRotationKeys, anim->mNumRotationKeys, time, lastRotationIndex))
+                        {
+                            return Events::ProcessingResult::Failure;
+                        }
+                        
+                        aiMatrix4x4 transform(scale, rotation, position);
+                        DataTypes::MatrixType animTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(transform);
+
+                        context.m_sourceSceneSystem.SwapTransformForUpAxis(animTransform);
+                        context.m_sourceSceneSystem.ConvertBoneUnit(animTransform);
+                        
+                        createdAnimationData->AddKeyFrame(animTransform);
+                    }
+
+                    Containers::SceneGraph::NodeIndex addNode = context.m_scene.GetGraph().AddChild(
+                        context.m_currentGraphPosition, nodeName.c_str(), AZStd::move(createdAnimationData));
+                    context.m_scene.GetGraph().MakeEndPoint(addNode);
+                    
+                    onlyOne = true;
+                }
+                
+                combinedAnimationResult += Events::ProcessingResult::Success;
+                return combinedAnimationResult.GetResult();
+            }
+
+            Events::ProcessingResult AssImpAnimationImporter::ImportBlendShapeAnimation(
+                AssImpSceneNodeAppendedContext& context,
+                const aiAnimation* animation,
+                const aiMeshMorphAnim* meshMorphAnim,
+                const aiMesh* mesh)
+            {
+                if (meshMorphAnim->mNumKeys == 0)
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+                Events::ProcessingResultCombiner combinedAnimationResult;
+
+                // In:
+                //  Key index
+                //      Time
+                //      Values in AssImp, Channel in FBX SDK
+                //      Weights in AssImp, Values in FBX SDK
+                //      Num values & weights
+
+                // Out:
+                // One BlendShapeAnimationData per value (Channel in FBX SDK) index
+                //      SetTimeStepBetweenFrames set on the animation data
+                //      Keyframes. Weights (Values in FBX SDK) per key time.
+                //      Keyframes generated for every single frame of the animation.
+                typedef AZStd::map<int, AZStd::vector<KeyData>> ValueToKeyDataMap;
+                ValueToKeyDataMap valueToKeyDataMap;
+                // Key time can be less than zero, normalize to have zero be the lowest time.
+                double keyOffset = 0;
+                for (int keyIdx = 0; keyIdx < meshMorphAnim->mNumKeys; keyIdx++)
+                {
+                    aiMeshMorphKey& key = meshMorphAnim->mKeys[keyIdx];
+                    for (int valIdx = 0; valIdx < key.mNumValuesAndWeights; ++valIdx)
+                    {
+                        int currentValue = key.mValues[valIdx];
+                        KeyData thisKey(key.mWeights[valIdx], key.mTime);
+                        valueToKeyDataMap[currentValue].insert(
+                        AZStd::upper_bound(valueToKeyDataMap[currentValue].begin(), valueToKeyDataMap[currentValue].end(),thisKey),
+                            thisKey);
+                        if (key.mTime < keyOffset)
+                        {
+                            keyOffset = key.mTime;
+                        }
+                    }
+                }
+
+                for (const auto& [meshIdx, keys] : valueToKeyDataMap)
+                {
+                    AZStd::shared_ptr<SceneData::GraphData::BlendShapeAnimationData> morphAnimNode =
+                        AZStd::make_shared<SceneData::GraphData::BlendShapeAnimationData>();
+
+                    const size_t numKeyFrames = GetNumKeyFrames(keys.size(), animation->mDuration, animation->mTicksPerSecond);
+                    morphAnimNode->ReserveKeyFrames(numKeyFrames);
+                    morphAnimNode->SetTimeStepBetweenFrames(s_defaultTimeStepBetweenFrames);
+
+                    aiAnimMesh* aiAnimMesh = mesh->mAnimMeshes[meshIdx];
+                    AZStd::string_view nodeName(aiAnimMesh->mName.C_Str());
+
+                    const AZ::u32 maxKeys = keys.size();
+                    AZ::u32 keyIdx = 0;
+                    for (AZ::u32 frame = 0; frame < numKeyFrames; ++frame)
+                    {
+                        const double time = GetTimeForFrame(frame, animation->mTicksPerSecond);
+
+                        float weight = 0;
+                        if (!SampleKeyFrame(weight, keys, keys.size(), time + keyOffset, keyIdx))
+                        {
+                            return Events::ProcessingResult::Failure;
+                        }
+
+                        morphAnimNode->AddKeyFrame(weight);
+                    }
+
+                    const size_t dotIndex = nodeName.find_last_of('.');
+                    nodeName = nodeName.substr(dotIndex + 1);
+
+                    morphAnimNode->SetBlendShapeName(nodeName.data());
+
+                    AZStd::string animNodeName(AZStd::string::format("%s_%s", s_animationNodeName, nodeName.data()));
+                    Containers::SceneGraph::NodeIndex addNode = context.m_scene.GetGraph().AddChild(
+                        context.m_currentGraphPosition, animNodeName.c_str(), AZStd::move(morphAnimNode));
+                    context.m_scene.GetGraph().MakeEndPoint(addNode);
+
+                }
+
+                return Events::ProcessingResult::Success;
+            }
+
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h
new file mode 100644
index 0000000000..c8e7415378
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.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 <SceneAPI/SceneCore/Components/LoadingComponent.h>
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+
+struct aiAnimation;
+struct aiMesh;
+struct aiMeshMorphAnim;
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpAnimationImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpAnimationImporter, "{93b3f4e3-6fcd-42b9-a74e-5923f76d25c7}", SceneCore::LoadingComponent);
+
+                AssImpAnimationImporter();
+                ~AssImpAnimationImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportAnimation(AssImpSceneNodeAppendedContext& context);
+                Events::ProcessingResult ImportBlendShapeAnimation(
+                    AssImpSceneNodeAppendedContext& context,
+                    const aiAnimation* animation,
+                    const aiMeshMorphAnim* meshMorphAnim,
+                    const aiMesh* mesh);
+
+                static const double s_defaultTimeStepBetweenFrames;
+
+            protected:
+                static const char* s_animationNodeName;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.cpp
new file mode 100644
index 0000000000..3acbaba9cc
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.cpp
@@ -0,0 +1,130 @@
+/*
+ * 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/SerializeContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneData/GraphData/MeshVertexBitangentData.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+
+#include <assimp/scene.h>
+#include <assimp/mesh.h>
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            const char* AssImpBitangentStreamImporter::m_defaultNodeName = "Bitangent";
+
+            AssImpBitangentStreamImporter::AssImpBitangentStreamImporter()
+            {
+                BindToCall(&AssImpBitangentStreamImporter::ImportBitangentStreams);
+            }
+
+            void AssImpBitangentStreamImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpBitangentStreamImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-3250
+                }
+            }
+
+            Events::ProcessingResult AssImpBitangentStreamImporter::ImportBitangentStreams(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", m_defaultNodeName);
+                if (!context.m_sourceNode.ContainsMesh())
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                const auto meshHasTangentsAndBitangents = [&scene](const unsigned int meshIndex)
+                {
+                    return scene->mMeshes[meshIndex]->HasTangentsAndBitangents();
+                };
+
+                // If there are no bitangents on any meshes, there's nothing to import in this function.
+                const bool anyMeshHasTangentsAndBitangents = AZStd::any_of(currentNode->mMeshes, currentNode->mMeshes + currentNode->mNumMeshes, meshHasTangentsAndBitangents);
+                if (!anyMeshHasTangentsAndBitangents)
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                // AssImp nodes with multiple meshes on them occur when AssImp split a mesh on material.
+                // This logic recombines those meshes to minimize the changes needed to replace FBX SDK with AssImp, FBX SDK did not separate meshes,
+                // and the engine has code to do this later.
+                const bool allMeshesHaveTangentsAndBitangents = AZStd::all_of(currentNode->mMeshes, currentNode->mMeshes + currentNode->mNumMeshes, meshHasTangentsAndBitangents);
+                if (!allMeshesHaveTangentsAndBitangents)
+                {
+                    AZ_Error(
+                        Utilities::ErrorWindow, false,
+                        "Node with name %s has meshes with and without bitangents. "
+                            "Placeholder incorrect bitangents will be generated to allow the data to process, "
+                            "but the source art needs to be fixed to correct this. Either apply bitangents to all meshes on this node, "
+                            "or remove all bitangents from all meshes on this node.",
+                        currentNode->mName.C_Str());
+                }
+
+                const uint64_t vertexCount = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
+
+                AZStd::shared_ptr<SceneData::GraphData::MeshVertexBitangentData> bitangentStream =
+                    AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexBitangentData>();
+                // AssImp only has one bitangentStream per mesh.
+                bitangentStream->SetBitangentSetIndex(0);
+
+                bitangentStream->SetTangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
+                bitangentStream->ReserveContainerSpace(vertexCount);
+                for (int sdkMeshIndex = 0; sdkMeshIndex < currentNode->mNumMeshes; ++sdkMeshIndex)
+                {
+                    const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[sdkMeshIndex]];
+
+                    for (int v = 0; v < mesh->mNumVertices; ++v)
+                    {
+                        if (!mesh->HasTangentsAndBitangents())
+                        {
+                            // This node has mixed meshes with and without bitangents.
+                            // An error was already thrown above. Output stub bitangents so
+                            // the mesh can still be output in some form, even if the data isn't correct.
+                            // The bitangent count needs to match the vertex count on the associated mesh node.
+                            bitangentStream->AppendBitangent(Vector3::CreateAxisY());
+                        }
+                        else
+                        {
+                            const Vector3 bitangent(
+                                AssImpSDKWrapper::AssImpTypeConverter::ToVector3(mesh->mBitangents[v]));
+                            bitangentStream->AppendBitangent(bitangent);
+                        }
+                    }
+                }
+
+                Containers::SceneGraph::NodeIndex newIndex =
+                    context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, m_defaultNodeName);
+
+                Events::ProcessingResult bitangentResults;
+                AssImpSceneAttributeDataPopulatedContext dataPopulated(context, bitangentStream, newIndex, m_defaultNodeName);
+                bitangentResults = Events::Process(dataPopulated);
+
+                if (bitangentResults != Events::ProcessingResult::Failure)
+                {
+                    bitangentResults = AddAttributeDataNodeWithContexts(dataPopulated);
+                }
+                return bitangentResults;
+            }
+
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h
new file mode 100644
index 0000000000..a5359ab7db
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpBitangentStreamImporter : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpBitangentStreamImporter, "{49FC818A-956F-43DA-BBAC-73198E0C5A1F}", SceneCore::LoadingComponent);
+
+                AssImpBitangentStreamImporter();
+                ~AssImpBitangentStreamImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportBitangentStreams(AssImpSceneNodeAppendedContext& context);
+
+            protected:
+                static const char* m_defaultNodeName;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.cpp
new file mode 100644
index 0000000000..efd5744378
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.cpp
@@ -0,0 +1,239 @@
+/*
+ * 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/SerializeContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/SceneSystem.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneData/GraphData/SkinMeshData.h>
+#include <SceneAPI/SceneData/GraphData/BlendShapeData.h>
+#include <assimp/scene.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            AssImpBlendShapeImporter::AssImpBlendShapeImporter()
+            {
+                BindToCall(&AssImpBlendShapeImporter::ImportBlendShapes);
+            }
+
+            void AssImpBlendShapeImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpBlendShapeImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-2576
+                }
+            }
+
+            Events::ProcessingResult AssImpBlendShapeImporter::ImportBlendShapes(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", "Blend Shapes");
+                int numMesh = context.m_sourceNode.GetAssImpNode()->mNumMeshes;
+                bool animMeshExists = false;
+                for (int idx = 0; idx < numMesh; idx++)
+                {
+                    int meshId = context.m_sourceNode.GetAssImpNode()->mMeshes[idx];
+                    aiMesh* aiMesh = context.m_sourceScene.GetAssImpScene()->mMeshes[meshId];
+                    if (aiMesh->mNumAnimMeshes)
+                    {
+                        animMeshExists = true;
+                        break;
+                    }
+                }
+
+                if (!animMeshExists)
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                GetMeshDataFromParentResult meshDataResult(GetMeshDataFromParent(context));
+                if (!meshDataResult.IsSuccess())
+                {
+                    return meshDataResult.GetError();
+                }
+
+                Events::ProcessingResultCombiner combinedBlendShapeResult;
+
+                // 1. Loop through meshes & anims
+                //      Create storage: Anim to meshes
+                // 2. Loop through anims & meshes
+                //      Create an anim mesh for each anim, with meshes re-combined.
+                // AssImp separates meshes that have multiple materials.
+                // This code re-combines them to match previous FBX SDK behavior,
+                // so they can be separated by engine code instead.
+                AZStd::map<AZStd::string_view, AZStd::vector<AZStd::pair<int, int>>> animToMeshToAnimMeshIndices;
+                for (int nodeMeshIdx = 0; nodeMeshIdx < numMesh; nodeMeshIdx++)
+                {
+                    int sceneMeshIdx = context.m_sourceNode.GetAssImpNode()->mMeshes[nodeMeshIdx];
+                    const aiMesh* aiMesh = context.m_sourceScene.GetAssImpScene()->mMeshes[sceneMeshIdx];
+                    for (int animIdx = 0; animIdx < aiMesh->mNumAnimMeshes; animIdx++)
+                    {
+                        aiAnimMesh* aiAnimMesh = aiMesh->mAnimMeshes[animIdx];
+                        animToMeshToAnimMeshIndices[aiAnimMesh->mName.C_Str()].emplace_back(nodeMeshIdx, animIdx);
+                    }
+                }
+
+                for (const auto& animToMeshIndex : animToMeshToAnimMeshIndices)
+                {
+                    AZStd::shared_ptr<SceneData::GraphData::BlendShapeData> blendShapeData =
+                        AZStd::make_shared<SceneData::GraphData::BlendShapeData>();
+
+                    // Some DCC tools, like Maya, include a full path separated by '.' in the node names.
+                    // For example, "cone_skin_blendShapeNode.cone_squash"
+                    // Downstream processing doesn't want anything but the last part of that node name,
+                    // so find the last '.' and remove anything before it.
+                    AZStd::string nodeName(animToMeshIndex.first);
+                    size_t dotIndex = nodeName.rfind('.');
+                    if (dotIndex != AZStd::string::npos)
+                    {
+                        nodeName.erase(0, dotIndex + 1);
+                    }
+                    int vertexOffset = 0;
+                    RenamedNodesMap::SanitizeNodeName(nodeName, context.m_scene.GetGraph(), context.m_currentGraphPosition, "BlendShape");
+                    AZ_TraceContext("Blend shape name", nodeName);
+                    for (const auto& meshIndex : animToMeshIndex.second)
+                    {
+                        int sceneMeshIdx = context.m_sourceNode.GetAssImpNode()->mMeshes[meshIndex.first];
+                        const aiMesh* aiMesh = context.m_sourceScene.GetAssImpScene()->mMeshes[sceneMeshIdx];
+                        const aiAnimMesh* aiAnimMesh = aiMesh->mAnimMeshes[meshIndex.second];
+
+                        AZStd::bitset<SceneData::GraphData::BlendShapeData::MaxNumUVSets> uvSetUsedFlags;
+                        for (AZ::u8 uvSetIndex = 0; uvSetIndex < SceneData::GraphData::BlendShapeData::MaxNumUVSets; ++uvSetIndex)
+                        {
+                            uvSetUsedFlags.set(uvSetIndex, aiAnimMesh->HasTextureCoords(uvSetIndex));
+                        }
+                        AZStd::bitset<SceneData::GraphData::BlendShapeData::MaxNumColorSets> colorSetUsedFlags;
+                        for (AZ::u8 colorSetIndex = 0; colorSetIndex < SceneData::GraphData::BlendShapeData::MaxNumColorSets;
+                             ++colorSetIndex)
+                        {
+                            colorSetUsedFlags.set(colorSetIndex, aiAnimMesh->HasVertexColors(colorSetIndex));
+                        }
+                        blendShapeData->ReserveData(
+                            aiAnimMesh->mNumVertices, aiAnimMesh->HasTangentsAndBitangents(), uvSetUsedFlags, colorSetUsedFlags);
+
+                        for (int vertIdx = 0; vertIdx < aiAnimMesh->mNumVertices; ++vertIdx)
+                        {
+                            AZ::Vector3 vertex(AssImpSDKWrapper::AssImpTypeConverter::ToVector3(aiAnimMesh->mVertices[vertIdx]));
+                   
+                            context.m_sourceSceneSystem.SwapVec3ForUpAxis(vertex);
+                            context.m_sourceSceneSystem.ConvertUnit(vertex);
+
+                            blendShapeData->AddPosition(vertex);
+                            blendShapeData->SetVertexIndexToControlPointIndexMap(vertIdx + vertexOffset, vertIdx + vertexOffset);
+
+                            // Add normals
+                            if (aiAnimMesh->HasNormals())
+                            {
+                                AZ::Vector3 normal(AssImpSDKWrapper::AssImpTypeConverter::ToVector3(aiAnimMesh->mNormals[vertIdx]));
+                                context.m_sourceSceneSystem.SwapVec3ForUpAxis(normal);
+                                normal.NormalizeSafe();
+                                blendShapeData->AddNormal(normal);
+                            }
+
+                            // Add tangents and bitangents
+                            if (aiAnimMesh->HasTangentsAndBitangents())
+                            {
+                                // Vector4's constructor that takes in a vector3 sets w to 1.0f automatically.
+                                const AZ::Vector4 tangent(AssImpSDKWrapper::AssImpTypeConverter::ToVector3(aiAnimMesh->mTangents[vertIdx]));
+                                const AZ::Vector3 bitangent = AssImpSDKWrapper::AssImpTypeConverter::ToVector3(aiAnimMesh->mBitangents[vertIdx]);
+                                blendShapeData->AddTangentAndBitangent(tangent, bitangent);
+                            }
+
+                            // Add UVs
+                            for (AZ::u8 uvSetIdx = 0; uvSetIdx < SceneData::GraphData::BlendShapeData::MaxNumUVSets; ++uvSetIdx)
+                            {
+                                if (aiAnimMesh->HasTextureCoords(uvSetIdx))
+                                {
+                                    const AZ::Vector2 vertexUV(
+                                        aiAnimMesh->mTextureCoords[uvSetIdx][vertIdx].x,
+                                        // The engine's V coordinate is reverse of how it's stored in assImp.
+                                        1.0f - aiAnimMesh->mTextureCoords[uvSetIdx][vertIdx].y);
+                                    blendShapeData->AddUV(vertexUV, uvSetIdx);
+                                }
+                            }
+
+                            // Add colors
+                            for (AZ::u8 colorSetIdx = 0; colorSetIdx < SceneData::GraphData::BlendShapeData::MaxNumColorSets; ++colorSetIdx)
+                            {
+                                if (aiAnimMesh->HasVertexColors(colorSetIdx))
+                                {
+                                    SceneAPI::DataTypes::Color color =
+                                        AssImpSDKWrapper::AssImpTypeConverter::ToColor(aiAnimMesh->mColors[colorSetIdx][vertIdx]);
+                                    blendShapeData->AddColor(color, colorSetIdx);
+                                }
+                            }
+                        }
+
+                        // aiAnimMesh just has a list of positions for vertices. The face indices are on the original mesh.
+                        for (int faceIdx = 0; faceIdx < aiMesh->mNumFaces; ++faceIdx)
+                        {
+                            aiFace face = aiMesh->mFaces[faceIdx];
+                            DataTypes::IBlendShapeData::Face blendFace;
+                            if (face.mNumIndices != 3)
+                            {
+                                // AssImp should have triangulated everything, so if this happens then someone has
+                                // probably changed AssImp's import settings. The engine only supports triangles.
+                                AZ_Error(
+                                    Utilities::ErrorWindow, false,
+                                    "Mesh for node %s has a face with %d vertices, only 3 vertices are supported per face.",
+                                    nodeName.c_str(),
+                                    face.mNumIndices);
+                                continue;
+                            }
+                            for (int idx = 0; idx < face.mNumIndices; ++idx)
+                            {
+                                blendFace.vertexIndex[idx] = face.mIndices[idx] + vertexOffset;
+                            }
+
+                            blendShapeData->AddFace(blendFace);
+                        }
+                        vertexOffset += aiMesh->mNumVertices;
+
+
+                    }
+
+
+                    // Report problem if no vertex or face converted to MeshData
+                    if (blendShapeData->GetVertexCount() <= 0 || blendShapeData->GetFaceCount() <= 0)
+                    {
+                        AZ_Error(Utilities::ErrorWindow, false, "Missing geometry data in blendshape node %s.", nodeName.c_str());
+                        return Events::ProcessingResult::Failure;
+                    }
+
+                    Containers::SceneGraph::NodeIndex newIndex =
+                        context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, nodeName.c_str());
+
+                    Events::ProcessingResult blendShapeResult;
+                    AssImpSceneAttributeDataPopulatedContext dataPopulated(context, blendShapeData, newIndex, nodeName);
+                    blendShapeResult = Events::Process(dataPopulated);
+
+                    if (blendShapeResult != Events::ProcessingResult::Failure)
+                    {
+                        blendShapeResult = AddAttributeDataNodeWithContexts(dataPopulated);
+                    }
+                    combinedBlendShapeResult += blendShapeResult;
+                }
+
+                return combinedBlendShapeResult.GetResult();
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h
new file mode 100644
index 0000000000..a5fbd1b817
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpBlendShapeImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpBlendShapeImporter, "{B0F7174B-9863-4C03-BFB2-83BF29B1A2DD}", SceneCore::LoadingComponent);
+
+                AssImpBlendShapeImporter();
+                ~AssImpBlendShapeImporter() override = default;
+                
+                static void Reflect(ReflectContext* context);
+                
+                Events::ProcessingResult ImportBlendShapes(AssImpSceneNodeAppendedContext& context);
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.cpp
new file mode 100644
index 0000000000..1e46485f1d
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.cpp
@@ -0,0 +1,175 @@
+/*
+ * 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/SerializeContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/StringFunc/StringFunc.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/SceneSystem.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneData/GraphData/BoneData.h>
+#include <SceneAPI/SceneData/GraphData/RootBoneData.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            AssImpBoneImporter::AssImpBoneImporter()
+            {
+                BindToCall(&AssImpBoneImporter::ImportBone);
+            }
+
+            void AssImpBoneImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpBoneImporter, SceneCore::LoadingComponent>()->Version(2);
+                }
+            }
+
+            void MakeBoneMap(const aiScene* scene, AZStd::unordered_map<AZStd::string, const aiBone*>& boneLookup)
+            {
+                AZStd::queue<const aiNode*> queue;
+                AZStd::unordered_set<AZStd::string> nodesWithNoMesh;
+
+                queue.push(scene->mRootNode);
+
+                while (!queue.empty())
+                {
+                    const aiNode* currentNode = queue.front();
+                    queue.pop();
+
+                    if (currentNode->mNumMeshes == 0)
+                    {
+                        nodesWithNoMesh.emplace(currentNode->mName.C_Str());
+                    }
+
+                    for (int childIndex = 0; childIndex < currentNode->mNumChildren; ++childIndex)
+                    {
+                        queue.push(currentNode->mChildren[childIndex]);
+                    }
+                }
+
+                for (unsigned int meshIndex = 0; meshIndex < scene->mNumMeshes; ++meshIndex)
+                {
+                    const aiMesh* mesh = scene->mMeshes[meshIndex];
+
+                    for (unsigned int boneIndex = 0; boneIndex < mesh->mNumBones; ++boneIndex)
+                    {
+                        const aiBone* bone = mesh->mBones[boneIndex];
+
+                        if (nodesWithNoMesh.contains(bone->mName.C_Str()))
+                        {
+                            boneLookup.emplace(bone->mName.C_Str(), bone);
+                        }
+                    }
+                }
+            }
+
+            aiMatrix4x4 CalculateWorldTransform(const aiNode* currentNode)
+            {
+                aiMatrix4x4 transform = {};
+                const aiNode* iteratingNode = currentNode;
+                
+                while (iteratingNode)
+                {
+                    transform = iteratingNode->mTransformation * transform;
+                    iteratingNode = iteratingNode->mParent;
+                }
+
+                return transform;
+            }
+
+            Events::ProcessingResult AssImpBoneImporter::ImportBone(AssImpNodeEncounteredContext& context)
+            {
+                AZ_TraceContext("Importer", "Bone");
+
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                if (IsPivotNode(currentNode->mName))
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                bool isBone = false;
+                
+                {
+                    AZStd::unordered_map<AZStd::string, const aiBone*> boneLookup;
+                    MakeBoneMap(scene, boneLookup);
+
+                    isBone = boneLookup.contains(currentNode->mName.C_Str());
+
+                    // If we have an animation, the bones will be listed in there
+                    if (!isBone)
+                    {
+                        for(unsigned animIndex = 0; animIndex < scene->mNumAnimations; ++animIndex)
+                        {
+                            aiAnimation* animation = scene->mAnimations[animIndex];
+
+                            for (unsigned channelIndex = 0; channelIndex < animation->mNumChannels; ++channelIndex)
+                            {
+                                aiNodeAnim* nodeAnim = animation->mChannels[channelIndex];
+
+                                if (nodeAnim->mNodeName == currentNode->mName)
+                                {
+                                    isBone = true;
+                                    break;
+                                }
+                            }
+
+                            if (isBone)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if(!isBone)
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                // If the current scene node (our eventual parent) contains bone data, we are not a root bone
+                AZStd::shared_ptr<SceneData::GraphData::BoneData> createdBoneData;
+
+                if (NodeHasAncestorOfType(
+                        context.m_scene.GetGraph(), context.m_currentGraphPosition, DataTypes::IBoneData::TYPEINFO_Uuid()))
+                {
+                    createdBoneData = AZStd::make_shared<SceneData::GraphData::BoneData>();
+                }
+                else
+                {
+                    createdBoneData = AZStd::make_shared<SceneData::GraphData::RootBoneData>();
+                }
+                
+                aiMatrix4x4 transform = CalculateWorldTransform(currentNode);
+                
+                SceneAPI::DataTypes::MatrixType globalTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(transform);
+
+                context.m_sourceSceneSystem.SwapTransformForUpAxis(globalTransform);
+                context.m_sourceSceneSystem.ConvertBoneUnit(globalTransform);
+
+                createdBoneData->SetWorldTransform(globalTransform);
+
+                context.m_createdData.push_back(AZStd::move(createdBoneData));
+
+                return Events::ProcessingResult::Success;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h
new file mode 100644
index 0000000000..10b5964cdf
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpBoneImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpBoneImporter, "{E7A62DE7-B660-4920-BF91-32738175D5A7}", SceneCore::LoadingComponent);
+
+                AssImpBoneImporter();
+                ~AssImpBoneImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+                
+                Events::ProcessingResult ImportBone(AssImpNodeEncounteredContext& context);
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.cpp
new file mode 100644
index 0000000000..c1720ec362
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.cpp
@@ -0,0 +1,131 @@
+/*
+ * 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/SerializeContext.h>
+#include <AzCore/std/numeric.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneData/GraphData/MeshVertexColorData.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+
+#include <assimp/scene.h>
+#include <assimp/mesh.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            const char* AssImpColorStreamImporter::m_defaultNodeName = "Col";
+
+            AssImpColorStreamImporter::AssImpColorStreamImporter()
+            {
+                BindToCall(&AssImpColorStreamImporter::ImportColorStreams);
+            }
+
+            void AssImpColorStreamImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpColorStreamImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-3250
+                }
+            }
+
+            Events::ProcessingResult AssImpColorStreamImporter::ImportColorStreams(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", m_defaultNodeName);
+                if (!context.m_sourceNode.ContainsMesh())
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                // This node has at least one mesh, verify that the color channel counts are the same for all meshes.
+                const int expectedColorChannels = scene->mMeshes[currentNode->mMeshes[0]]->GetNumColorChannels();
+                const bool allMeshesHaveSameNumberOfColorChannels =
+                    AZStd::all_of(currentNode->mMeshes + 1, currentNode->mMeshes + currentNode->mNumMeshes, [scene, expectedColorChannels](const unsigned int meshIndex)
+                        {
+                            return scene->mMeshes[meshIndex]->GetNumColorChannels() == expectedColorChannels;
+                        });
+
+                AZ_Error(
+                    Utilities::ErrorWindow,
+                    allMeshesHaveSameNumberOfColorChannels,
+                    "Color channel counts for node %s has meshes with different color channel counts. "
+                    "The color channel count for the first mesh will be used, and placeholder incorrect color values "
+                    "will be generated to allow the data to process, but the source art needs to be fixed to correct this. "
+                    "All meshes on this node should have the same number of color channels.",
+                    currentNode->mName.C_Str());
+
+                if (expectedColorChannels == 0)
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                const uint64_t vertexCount = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
+
+                Events::ProcessingResultCombiner combinedVertexColorResults;
+                for (int colorSetIndex = 0; colorSetIndex < expectedColorChannels; ++colorSetIndex)
+                {
+
+                    AZStd::shared_ptr<SceneData::GraphData::MeshVertexColorData> vertexColors =
+                        AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexColorData>();
+                    vertexColors->ReserveContainerSpace(vertexCount);
+
+                    for (int sdkMeshIndex = 0; sdkMeshIndex < currentNode->mNumMeshes; ++sdkMeshIndex)
+                    {
+                        const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[sdkMeshIndex]];
+                        for (int v = 0; v < mesh->mNumVertices; ++v)
+                        {
+                            if (colorSetIndex < mesh->GetNumColorChannels())
+                            {
+                                AZ::SceneAPI::DataTypes::Color vertexColor(
+                                    AssImpSDKWrapper::AssImpTypeConverter::ToColor(mesh->mColors[colorSetIndex][v]));
+                                vertexColors->AppendColor(vertexColor);
+                            }
+                            else
+                            {
+                                // An error was already emitted if this mesh has less color channels
+                                // than other meshes on the parent node. Append an arbitrary color value, fully opaque black,
+                                // so the mesh can still be processed.
+                                // It's better to let the engine load a partially valid mesh than to completely fail.
+                                vertexColors->AppendColor(AZ::SceneAPI::DataTypes::Color(0.0f,0.0f,0.0f,1.0f));
+                            }
+                        }
+                    }
+
+                    AZStd::string nodeName(AZStd::string::format("%s%d", m_defaultNodeName, colorSetIndex));
+                    Containers::SceneGraph::NodeIndex newIndex =
+                        context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, nodeName.c_str());
+
+                    Events::ProcessingResult colorMapResults;
+                    AssImpSceneAttributeDataPopulatedContext dataPopulated(context, vertexColors, newIndex, nodeName.c_str());
+                    colorMapResults = Events::Process(dataPopulated);
+
+                    if (colorMapResults != Events::ProcessingResult::Failure)
+                    {
+                        colorMapResults = AddAttributeDataNodeWithContexts(dataPopulated);
+                    }
+
+                    combinedVertexColorResults += colorMapResults;
+                }
+                return combinedVertexColorResults.GetResult();
+            }
+
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h
new file mode 100644
index 0000000000..c871a93c63
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpColorStreamImporter : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpColorStreamImporter, "{071F4764-F3B0-438A-9CB7-19A1248F3B54}", SceneCore::LoadingComponent);
+
+                AssImpColorStreamImporter();
+                ~AssImpColorStreamImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportColorStreams(AssImpSceneNodeAppendedContext& context);
+
+            protected:
+                static const char* m_defaultNodeName;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.cpp
new file mode 100644
index 0000000000..929fde19eb
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.cpp
@@ -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
+ *
+ */
+
+#include <SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h>
+
+#include <AzCore/Debug/Trace.h>
+#include <AzCore/StringFunc/StringFunc.h>
+
+#include <assimp/scene.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            bool IsSkinnedMesh(const aiNode& node, const aiScene& scene)
+            {
+                unsigned boneCount = 0;
+
+                for (unsigned mesh = 0; mesh < node.mNumMeshes; ++mesh)
+                {
+                    if (scene.mMeshes[node.mMeshes[mesh]]->HasBones())
+                    {
+                        ++boneCount;
+                    }
+                }
+
+                if (boneCount > 1 && boneCount != node.mNumMeshes)
+                {
+                    AZ_Error("AssImpImporterUtilities", false, "Node has %d meshes but only %d are skinned.  "
+                        "This is unexpected and may result in errors", node.mNumMeshes, boneCount);
+                }
+
+                return boneCount > 0;
+            }
+
+            bool IsPivotNode(const aiString& nodeName, size_t* pos)
+            {
+                AZStd::string_view name(nodeName.C_Str(), nodeName.length);
+
+                size_t myPos;
+
+                if (!pos)
+                {
+                    pos = &myPos;
+                }
+
+                *pos = AZ::StringFunc::Find(name, PivotNodeMarker);
+
+                return *pos != name.npos;
+            }
+
+            void SplitPivotNodeName(const aiString& nodeName, size_t pivotPos, AZStd::string_view& baseNodeName, AZStd::string_view& pivotType)
+            {
+                AZStd::string_view nodeNameView(nodeName.data, nodeName.length);
+                baseNodeName = AZStd::string_view(nodeNameView.substr(0, pivotPos));
+                pivotType = AZStd::string_view(nodeNameView.substr(pivotPos + sizeof PivotNodeMarker - 1));
+            }
+
+            aiMatrix4x4 GetConcatenatedLocalTransform(const aiNode* currentNode)
+            {
+                const aiNode* parent = currentNode->mParent;
+                aiMatrix4x4 combinedTransform = currentNode->mTransformation;
+
+                while (parent)
+                {
+                    size_t pos;
+
+                    if (IsPivotNode(parent->mName, &pos))
+                    {
+                        combinedTransform = parent->mTransformation * combinedTransform;
+                        parent = parent->mParent;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                return combinedTransform;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h
new file mode 100644
index 0000000000..deba1b0279
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <assimp/matrix4x4.h>
+#include <AzCore/std/string/string.h>
+
+struct aiNode;
+struct aiScene;
+struct aiString;
+
+
+namespace AZ::SceneAPI::SceneBuilder
+{
+    inline constexpr char PivotNodeMarker[] = "_$AssimpFbx$_";
+
+    bool IsSkinnedMesh(const aiNode& node, const aiScene& scene);
+
+    // Checks if a node name is a pivot node and optionally returns the position in the name of the pivot marker (for splitting out the parts later)
+    bool IsPivotNode(const aiString& nodeName, size_t* pos = nullptr);
+
+    // Returns the bone name and type of a pivot node
+    void SplitPivotNodeName(const aiString& nodeName, size_t pivotPos, AZStd::string_view& baseNodeName, AZStd::string_view& pivotType);
+
+    // Gets the entire, combined local transform for a node taking pivot nodes into account.  When pivot nodes are not used, this just returns the node's transform
+    aiMatrix4x4 GetConcatenatedLocalTransform(const aiNode* currentNode);
+} // namespace AZ
+
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.cpp
new file mode 100644
index 0000000000..f2194c352b
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.cpp
@@ -0,0 +1,210 @@
+/*
+ * 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 <SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h>
+#include <AzCore/IO/FileIO.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/StringFunc/StringFunc.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpMaterialWrapper.h>
+#include <SceneAPI/SceneData/GraphData/MaterialData.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <SceneAPI/SceneCore/Events/ProcessingResult.h>
+#include <assimp/scene.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            AssImpMaterialImporter::AssImpMaterialImporter()
+            {
+                BindToCall(&AssImpMaterialImporter::ImportMaterials);
+            }
+
+            void AssImpMaterialImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpMaterialImporter, SceneCore::LoadingComponent>()->Version(1);
+                }
+            }
+
+            Events::ProcessingResult AssImpMaterialImporter::ImportMaterials(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", "Material");
+                if (!context.m_sourceNode.ContainsMesh())
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                Events::ProcessingResultCombiner combinedMaterialImportResults;
+
+                AZStd::unordered_map<int, AZStd::shared_ptr<SceneData::GraphData::MaterialData>> materialMap;
+                for (int idx = 0; idx < context.m_sourceNode.m_assImpNode->mNumMeshes; ++idx)
+                {
+                    int meshIndex = context.m_sourceNode.m_assImpNode->mMeshes[idx];
+                    const aiMesh* assImpMesh = context.m_sourceScene.GetAssImpScene()->mMeshes[meshIndex];
+                    AZ_Assert(assImpMesh, "Asset Importer Mesh should not be null.");
+                    int materialIndex = assImpMesh->mMaterialIndex;
+                    AZ_TraceContext("Material Index", materialIndex);
+
+                    auto matFound = materialMap.find(materialIndex);
+
+                    AZStd::shared_ptr<SceneData::GraphData::MaterialData> material;
+                    AZStd::string materialName;
+
+                    if (matFound == materialMap.end())
+                    {
+                        std::shared_ptr<AssImpSDKWrapper::AssImpMaterialWrapper> assImpMaterial =
+                            std::shared_ptr<AssImpSDKWrapper::AssImpMaterialWrapper>(new AssImpSDKWrapper::AssImpMaterialWrapper(context.m_sourceScene.GetAssImpScene()->mMaterials[materialIndex]));
+
+                        materialName = assImpMaterial->GetName().c_str();
+                        RenamedNodesMap::SanitizeNodeName(materialName, context.m_scene.GetGraph(), context.m_currentGraphPosition, "Material");
+                        AZ_TraceContext("Material Name", materialName);
+
+                        material = AZStd::make_shared<SceneData::GraphData::MaterialData>();
+
+                        material->SetMaterialName(assImpMaterial->GetName());
+                        material->SetTexture(DataTypes::IMaterialData::TextureMapType::Diffuse,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Diffuse)).c_str());
+                        material->SetTexture(DataTypes::IMaterialData::TextureMapType::Specular,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Specular)).c_str());
+                        material->SetTexture(DataTypes::IMaterialData::TextureMapType::Bump,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Bump)).c_str());
+                        material->SetTexture(DataTypes::IMaterialData::TextureMapType::Normal,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Normal)).c_str());
+                        material->SetUniqueId(assImpMaterial->GetUniqueId());
+                        material->SetDiffuseColor(assImpMaterial->GetDiffuseColor());
+                        material->SetSpecularColor(assImpMaterial->GetSpecularColor());
+                        material->SetEmissiveColor(assImpMaterial->GetEmissiveColor());
+                        material->SetShininess(assImpMaterial->GetShininess());
+
+                        material->SetUseColorMap(assImpMaterial->GetUseColorMap());
+                        material->SetBaseColor(assImpMaterial->GetBaseColor());
+
+                        material->SetUseMetallicMap(assImpMaterial->GetUseMetallicMap());
+                        material->SetMetallicFactor(assImpMaterial->GetMetallicFactor());
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::Metallic,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Metallic).c_str()));
+
+                        material->SetUseRoughnessMap(assImpMaterial->GetUseRoughnessMap());
+                        material->SetRoughnessFactor(assImpMaterial->GetRoughnessFactor());
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::Roughness,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Roughness).c_str()));
+
+                        material->SetUseEmissiveMap(assImpMaterial->GetUseEmissiveMap());
+                        material->SetEmissiveIntensity(assImpMaterial->GetEmissiveIntensity());
+
+                        material->SetUseAOMap(assImpMaterial->GetUseAOMap());
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::AmbientOcclusion,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::AmbientOcclusion).c_str()));
+
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::Emissive,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Emissive).c_str()));
+
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::BaseColor,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::BaseColor).c_str()));
+
+                        AZ_Assert(material, "Failed to allocate scene material data.");
+                        if (!material)
+                        {
+                            combinedMaterialImportResults += Events::ProcessingResult::Failure;
+                            continue;
+                        }
+
+                        materialMap[materialIndex] = material;
+                    }
+                    else
+                    {
+                        material = matFound->second;
+                        materialName = material.get()->GetMaterialName();
+                    }
+
+                    Events::ProcessingResult materialResult;
+                    Containers::SceneGraph::NodeIndex newIndex =
+                        context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, materialName.c_str());
+
+                    AZ_Assert(newIndex.IsValid(), "Failed to create SceneGraph node for attribute.");
+                    if (!newIndex.IsValid())
+                    {
+                        combinedMaterialImportResults += Events::ProcessingResult::Failure;
+                        continue;
+                    }
+
+                    AssImpSceneAttributeDataPopulatedContext dataPopulated(context, material, newIndex, materialName);
+                    materialResult = Events::Process(dataPopulated);
+
+                    if (materialResult != Events::ProcessingResult::Failure)
+                    {
+                        materialResult = SceneAPI::SceneBuilder::AddAttributeDataNodeWithContexts(dataPopulated);
+                    }
+
+                    combinedMaterialImportResults += materialResult;
+                }
+
+                return combinedMaterialImportResults.GetResult();
+            }
+
+            AZStd::string AssImpMaterialImporter::ResolveTexturePath(const AZStd::string& sceneFilePath, const AZStd::string& textureFilePath) const
+            {
+                if (textureFilePath.empty())
+                {
+                    return textureFilePath;
+                }
+
+
+                AZStd::string texturePathRelativeToScene;
+                AZStd::string cleanedUpSceneFilePath(sceneFilePath);
+                AZ::StringFunc::Path::StripFullName(cleanedUpSceneFilePath);
+                AZ::StringFunc::Path::Join(cleanedUpSceneFilePath.c_str(), textureFilePath.c_str(), texturePathRelativeToScene);
+
+                // If the texture did start with marker to change directories upward, then it's relative to the scene file,
+                // and that path needs to be resolved. It can't be resolved later. This was handled internally by FBX SDK,
+                // but is not handled by AssImp.
+                if (textureFilePath.starts_with(".."))
+                {
+                    // Not checking for the file existing because it may not be there yet.
+                    return texturePathRelativeToScene;
+                }
+
+                // The engine only supports relative paths to scan folders.
+                // Scene files may have paths to textures, relative to the scene file. Check for those, first.
+                if (AZ::IO::FileIOBase::GetInstance()->Exists(texturePathRelativeToScene.c_str()))
+                {
+                    return texturePathRelativeToScene;
+                }
+
+
+                return textureFilePath;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h
new file mode 100644
index 0000000000..e4e75eff3c
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpMaterialImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpMaterialImporter, "{CD936FA9-17B8-40B9-AA3C-5F593BEFFC94}", SceneCore::LoadingComponent);
+
+                AssImpMaterialImporter();
+                ~AssImpMaterialImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportMaterials(AssImpSceneNodeAppendedContext& context);
+
+            private:
+                AZStd::string ResolveTexturePath(const AZStd::string& sceneFilePath, const AZStd::string& textureFilePath) const;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.cpp
new file mode 100644
index 0000000000..b3c4cf68db
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <assimp/scene.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            AssImpMeshImporter::AssImpMeshImporter()
+            {
+                BindToCall(&AssImpMeshImporter::ImportMesh);
+            }
+
+            void AssImpMeshImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpMeshImporter, SceneCore::LoadingComponent>()->Version(2);
+                }
+            }
+
+            Events::ProcessingResult AssImpMeshImporter::ImportMesh(AssImpNodeEncounteredContext& context)
+            {
+                AZ_TraceContext("Importer", "Mesh");
+
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                if (!context.m_sourceNode.ContainsMesh() || IsSkinnedMesh(*currentNode, *scene))
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                if (BuildSceneMeshFromAssImpMesh(currentNode, scene, context.m_sourceSceneSystem, context.m_createdData, [] {
+                        return AZStd::make_shared<SceneData::GraphData::MeshData>();
+                    }))
+                {
+                    return Events::ProcessingResult::Success;
+                }
+
+                return Events::ProcessingResult::Failure;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h
new file mode 100644
index 0000000000..2337400d13
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpMeshImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpMeshImporter, "{41611339-1D32-474A-A6A4-25CE4430AAFB}", SceneCore::LoadingComponent);
+
+                AssImpMeshImporter();
+                ~AssImpMeshImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportMesh(AssImpNodeEncounteredContext& context);
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.cpp
new file mode 100644
index 0000000000..5dff07aae7
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <assimp/scene.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneData/GraphData/SkinMeshData.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            AssImpSkinImporter::AssImpSkinImporter()
+            {
+                BindToCall(&AssImpSkinImporter::ImportSkin);
+            }
+
+            void AssImpSkinImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpSkinImporter, SceneCore::LoadingComponent>()->Version(1);
+                }
+            }
+
+            Events::ProcessingResult AssImpSkinImporter::ImportSkin(AssImpNodeEncounteredContext& context)
+            {
+                AZ_TraceContext("Importer", "Skin");
+
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                if (!context.m_sourceNode.ContainsMesh() || !IsSkinnedMesh(*currentNode, *scene))
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                if (BuildSceneMeshFromAssImpMesh(currentNode, scene, context.m_sourceSceneSystem, context.m_createdData, [] {
+                        return AZStd::make_shared<SceneData::GraphData::SkinMeshData>();
+                    }))
+                {
+                    return Events::ProcessingResult::Success;
+                }
+
+                return Events::ProcessingResult::Failure;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h
new file mode 100644
index 0000000000..31548d670d
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpSkinImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpSkinImporter, "{8FBCA725-C04E-42B7-9669-82DB3BB0901F}", SceneCore::LoadingComponent);
+
+                AssImpSkinImporter();
+                ~AssImpSkinImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportSkin(AssImpNodeEncounteredContext& context);
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.cpp
new file mode 100644
index 0000000000..532a397f88
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.cpp
@@ -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
+ *
+ */
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h>
+#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneData/GraphData/SkinWeightData.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            const AZStd::string AssImpSkinWeightsImporter::s_skinWeightName = "SkinWeight_";
+
+            AssImpSkinWeightsImporter::AssImpSkinWeightsImporter()
+            {
+                BindToCall(&AssImpSkinWeightsImporter::ImportSkinWeights);
+                BindToCall(&AssImpSkinWeightsImporter::SetupNamedBoneLinks);
+            }
+
+            void AssImpSkinWeightsImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpSkinWeightsImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-2576
+                }
+            }
+
+            Events::ProcessingResult AssImpSkinWeightsImporter::ImportSkinWeights(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", "Skin Weights");
+
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                if(currentNode->mNumMeshes <= 0)
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                Events::ProcessingResultCombiner combinedSkinWeightsResult;
+
+                // Don't create this until a bone with weights is encountered
+                Containers::SceneGraph::NodeIndex weightsIndexForMesh;
+                AZStd::string skinWeightName;
+                AZStd::shared_ptr<SceneData::GraphData::SkinWeightData> skinWeightData;
+
+                const uint64_t totalVertices = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
+
+                int vertexCount = 0;
+                for(unsigned nodeMeshIndex = 0; nodeMeshIndex < currentNode->mNumMeshes; ++nodeMeshIndex)
+                {
+                    int sceneMeshIndex = currentNode->mMeshes[nodeMeshIndex];
+                    const aiMesh* mesh = scene->mMeshes[sceneMeshIndex];
+
+                    for(unsigned b = 0; b < mesh->mNumBones; ++b)
+                    {
+                        const aiBone* bone = mesh->mBones[b];
+
+                        if(bone->mNumWeights <= 0)
+                        {
+                            continue;
+                        }
+
+                        if (!weightsIndexForMesh.IsValid())
+                        {
+                            skinWeightName = s_skinWeightName;
+                            RenamedNodesMap::SanitizeNodeName(skinWeightName, context.m_scene.GetGraph(), context.m_currentGraphPosition);
+
+                            weightsIndexForMesh =
+                                context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, skinWeightName.c_str());
+
+                            AZ_Error("SkinWeightsImporter", weightsIndexForMesh.IsValid(), "Failed to create SceneGraph node for attribute.");
+                            if (!weightsIndexForMesh.IsValid())
+                            {
+                                combinedSkinWeightsResult += Events::ProcessingResult::Failure;
+                                continue;
+                            }
+                            skinWeightData = AZStd::make_shared<SceneData::GraphData::SkinWeightData>();
+                        }
+                        Pending pending;
+                        pending.m_bone = bone;
+                        pending.m_numVertices = totalVertices;
+                        pending.m_skinWeightData = skinWeightData;
+                        pending.m_vertOffset = vertexCount;
+                        m_pendingSkinWeights.push_back(pending);
+                    }
+                    vertexCount += mesh->mNumVertices;
+                }
+
+                Events::ProcessingResult skinWeightsResult;
+                AssImpSceneAttributeDataPopulatedContext dataPopulated(context, skinWeightData, weightsIndexForMesh, skinWeightName);
+                skinWeightsResult = Events::Process(dataPopulated);
+
+                if (skinWeightsResult != Events::ProcessingResult::Failure)
+                {
+                    skinWeightsResult = AddAttributeDataNodeWithContexts(dataPopulated);
+                }
+
+                combinedSkinWeightsResult += skinWeightsResult;
+
+                return combinedSkinWeightsResult.GetResult();
+            }
+
+            Events::ProcessingResult AssImpSkinWeightsImporter::SetupNamedBoneLinks(AssImpFinalizeSceneContext& /*context*/)
+            {
+                AZ_TraceContext("Importer", "Skin Weights");
+
+                for (auto& it : m_pendingSkinWeights)
+                {
+                    it.m_skinWeightData->ResizeContainerSpace(it.m_numVertices);
+
+                    AZStd::string boneName = it.m_bone->mName.C_Str();
+                    int boneId = it.m_skinWeightData->GetBoneId(boneName);
+
+                    for(unsigned weight = 0; weight < it.m_bone->mNumWeights; ++weight)
+                    {
+                        DataTypes::ISkinWeightData::Link link;
+                        link.boneId = boneId;
+                        link.weight = it.m_bone->mWeights[weight].mWeight;
+
+                        it.m_skinWeightData->AddAndSortLink(it.m_bone->mWeights[weight].mVertexId + it.m_vertOffset, link);
+                    }
+                }
+                const auto result = m_pendingSkinWeights.empty() ? Events::ProcessingResult::Ignored : Events::ProcessingResult::Success;
+                m_pendingSkinWeights.clear();
+                return result;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h
new file mode 100644
index 0000000000..be54db5530
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h
@@ -0,0 +1,68 @@
+/*
+ * 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 <assimp/scene.h>
+#include <AzCore/std/containers/vector.h>
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+#include <SceneAPI/SceneCore/DataTypes/GraphData/ISkinWeightData.h>
+
+namespace AZ
+{
+    namespace SceneData
+    {
+        namespace GraphData
+        {
+            class SkinWeightData;
+        }
+    }
+
+    namespace SceneAPI
+    {
+        namespace Events
+        {
+            class PostImportEventContext;
+        }
+
+        namespace SceneBuilder
+        {
+            class AssImpSkinWeightsImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpSkinWeightsImporter, "{79B5E863-C155-473A-BC0D-B85F8D8303EB}", SceneCore::LoadingComponent);
+
+                AssImpSkinWeightsImporter();
+                ~AssImpSkinWeightsImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportSkinWeights(AssImpSceneNodeAppendedContext& context);
+                Events::ProcessingResult SetupNamedBoneLinks(AssImpFinalizeSceneContext& context);
+
+            protected:
+                struct Pending
+                {
+                    const aiBone* m_bone = nullptr;
+                    unsigned m_numVertices = 0;
+                    unsigned m_vertOffset = 0;
+                    AZStd::shared_ptr<SceneData::GraphData::SkinWeightData> m_skinWeightData;
+                };
+
+                //! List of skin weights that still need to be filled in. Setting the data for skin weights is
+                //! delayed until after the tree has been fully constructed as bones are linked by name, but until
+                //! the graph has been fully filled in, those names can change which would break the names recorded
+                //! for the skin.
+                AZStd::vector<Pending> m_pendingSkinWeights;
+
+                static const AZStd::string s_skinWeightName;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.cpp
new file mode 100644
index 0000000000..074ca79281
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.cpp
@@ -0,0 +1,132 @@
+/*
+ * 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/SerializeContext.h>
+#include <AzCore/std/numeric.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneData/GraphData/MeshVertexTangentData.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+
+#include <assimp/scene.h>
+#include <assimp/mesh.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            const char* AssImpTangentStreamImporter::m_defaultNodeName = "Tangent";
+
+            AssImpTangentStreamImporter::AssImpTangentStreamImporter()
+            {
+                BindToCall(&AssImpTangentStreamImporter::ImportTangentStreams);
+            }
+
+            void AssImpTangentStreamImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpTangentStreamImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-3250
+                }
+            }
+
+            Events::ProcessingResult AssImpTangentStreamImporter::ImportTangentStreams(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", m_defaultNodeName);
+                if (!context.m_sourceNode.ContainsMesh())
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+                
+                const auto meshHasTangentsAndBitangents = [&scene](const unsigned int meshIndex)
+                {
+                    return scene->mMeshes[meshIndex]->HasTangentsAndBitangents();
+                };
+
+                // If there are no tangents on any meshes, there's nothing to import in this function.
+                const bool anyMeshHasTangentsAndBitangents = AZStd::any_of(currentNode->mMeshes, currentNode->mMeshes + currentNode->mNumMeshes, meshHasTangentsAndBitangents);
+                if (!anyMeshHasTangentsAndBitangents)
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                // AssImp nodes with multiple meshes on them occur when AssImp split a mesh on material.
+                // This logic recombines those meshes to minimize the changes needed to replace FBX SDK with AssImp, FBX SDK did not separate meshes,
+                // and the engine has code to do this later.
+                const bool allMeshesHaveTangentsAndBitangents = AZStd::all_of(currentNode->mMeshes, currentNode->mMeshes + currentNode->mNumMeshes, meshHasTangentsAndBitangents);
+                if (!allMeshesHaveTangentsAndBitangents)
+                {
+                    AZ_Error(
+                        Utilities::ErrorWindow, false,
+                        "Node with name %s has meshes with and without tangents. "
+                            "Placeholder incorrect tangents will be generated to allow the data to process, "
+                            "but the source art needs to be fixed to correct this. Either apply tangents to all meshes on this node, "
+                            "or remove all tangents from all meshes on this node.",
+                        currentNode->mName.C_Str());
+                }
+
+                const uint64_t vertexCount = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
+
+                AZStd::shared_ptr<SceneData::GraphData::MeshVertexTangentData> tangentStream =
+                    AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexTangentData>();
+                // AssImp only has one tangentStream per mesh.
+                tangentStream->SetTangentSetIndex(0);
+
+                tangentStream->SetTangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
+                tangentStream->ReserveContainerSpace(vertexCount);
+                for (int sdkMeshIndex = 0; sdkMeshIndex < currentNode->mNumMeshes; ++sdkMeshIndex)
+                {
+                    const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[sdkMeshIndex]];
+
+                    for (int v = 0; v < mesh->mNumVertices; ++v)
+                    {
+                        if (!mesh->HasTangentsAndBitangents())
+                        {
+                            // This node has mixed meshes with and without tangents.
+                            // An error was already thrown above. Output stub tangents so
+                            // the mesh can still be output in some form, even if the data isn't correct.
+                            // The tangent count needs to match the vertex count on the associated mesh node.
+                            tangentStream->AppendTangent(Vector4(0.f, 1.f, 0.f, 1.f));
+                        }
+                        else
+                        {
+                            const Vector4 tangent(
+                                AssImpSDKWrapper::AssImpTypeConverter::ToVector3(mesh->mTangents[v]));
+                            tangentStream->AppendTangent(tangent);
+                        }
+                    }
+                }
+
+                Containers::SceneGraph::NodeIndex newIndex =
+                    context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, m_defaultNodeName);
+
+                Events::ProcessingResult tangentResults;
+                AssImpSceneAttributeDataPopulatedContext dataPopulated(context, tangentStream, newIndex, m_defaultNodeName);
+                tangentResults = Events::Process(dataPopulated);
+
+                if (tangentResults != Events::ProcessingResult::Failure)
+                {
+                    tangentResults = AddAttributeDataNodeWithContexts(dataPopulated);
+                }
+                return tangentResults;
+            }
+
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h
new file mode 100644
index 0000000000..6cd830a8b5
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpTangentStreamImporter : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpTangentStreamImporter, "{AB2D1D1E-5A19-40AF-B4F4-C652DD578F43}", SceneCore::LoadingComponent);
+
+                AssImpTangentStreamImporter();
+                ~AssImpTangentStreamImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportTangentStreams(AssImpSceneNodeAppendedContext& context);
+
+            protected:
+                static const char* m_defaultNodeName;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.cpp
new file mode 100644
index 0000000000..09f8575351
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.cpp
@@ -0,0 +1,203 @@
+/*
+ * 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 <SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h>
+
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/SceneSystem.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <SceneAPI/SceneData/GraphData/TransformData.h>
+#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <assimp/scene.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            const char* AssImpTransformImporter::s_transformNodeName = "transform";
+
+            AssImpTransformImporter::AssImpTransformImporter()
+            {
+                BindToCall(&AssImpTransformImporter::ImportTransform);
+            }
+
+            void AssImpTransformImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpTransformImporter, SceneCore::LoadingComponent>()->Version(1);
+                }
+            }
+            
+            void GetAllBones(const aiScene* scene, AZStd::unordered_multimap<AZStd::string, const aiBone*>& boneLookup)
+            {
+                AZStd::queue<const aiNode*> queue;
+                AZStd::unordered_set<AZStd::string> nodesWithNoMesh;
+
+                queue.push(scene->mRootNode);
+
+                while (!queue.empty())
+                {
+                    const aiNode* currentNode = queue.front();
+                    queue.pop();
+
+                    if (currentNode->mNumMeshes == 0)
+                    {
+                        nodesWithNoMesh.emplace(currentNode->mName.C_Str());
+                    }
+
+                    for (int childIndex = 0; childIndex < currentNode->mNumChildren; ++childIndex)
+                    {
+                        queue.push(currentNode->mChildren[childIndex]);
+                    }
+                }
+
+                for (unsigned meshIndex = 0; meshIndex < scene->mNumMeshes; ++meshIndex)
+                {
+                    const aiMesh* mesh = scene->mMeshes[meshIndex];
+
+                    for (unsigned boneIndex = 0; boneIndex < mesh->mNumBones; ++boneIndex)
+                    {
+                        const aiBone* bone = mesh->mBones[boneIndex];
+
+                        if (nodesWithNoMesh.contains(bone->mName.C_Str()))
+                        {
+                            boneLookup.emplace(bone->mName.C_Str(), bone);
+                        }
+                    }
+                }
+            }
+
+            Events::ProcessingResult AssImpTransformImporter::ImportTransform(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", "transform");
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                if (currentNode == scene->mRootNode || IsPivotNode(currentNode->mName))
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                AZStd::unordered_multimap<AZStd::string, const aiBone*> boneLookup;
+                GetAllBones(scene, boneLookup);
+
+                auto boneIterator = boneLookup.find(currentNode->mName.C_Str());
+                const bool isBone = boneIterator != boneLookup.end();
+                
+                DataTypes::MatrixType localTransform;
+
+                if (isBone)
+                {
+                    AZStd::vector<DataTypes::MatrixType> offsets, inverseOffsets;
+                    auto iteratingNode = currentNode;
+
+                    while (iteratingNode && boneLookup.count(iteratingNode->mName.C_Str()))
+                    {
+                        AZStd::string name = iteratingNode->mName.C_Str();
+
+                        auto range = boneLookup.equal_range(name);
+
+                        if (range.first != range.second)
+                        {
+                            // There can be multiple offsetMatrices for a given bone, we're only interested in grabbing the first one
+                            auto boneFirstOffsetMatrix = range.first->second->mOffsetMatrix;
+                            auto azMat = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(boneFirstOffsetMatrix);
+                            offsets.push_back(azMat);
+                            inverseOffsets.push_back(azMat.GetInverseFull());
+                        }
+
+                        iteratingNode = iteratingNode->mParent;
+                    }
+
+                    if (inverseOffsets.size() == 1)
+                    {
+                        // If this is the root bone, just use the inverseOffset, otherwise the equation below just results in the identity matrix
+                        localTransform = inverseOffsets[0];
+                    }
+                    else
+                    {
+                        localTransform = offsets.at(1) // parent bone offset
+                            * inverseOffsets.at(inverseOffsets.size() - 1) // Inverse of root bone offset
+                            * offsets.at(offsets.size() - 1) // Root bone offset
+                            * inverseOffsets.at(0); // Inverse of current node offset
+                    }
+                }
+                else
+                {
+                    localTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(GetConcatenatedLocalTransform(currentNode));
+                }
+
+                // Don't bother adding a node with the identity matrix
+                if (localTransform == DataTypes::MatrixType::Identity())
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                context.m_sourceSceneSystem.SwapTransformForUpAxis(localTransform);
+                context.m_sourceSceneSystem.ConvertUnit(localTransform);
+
+                AZStd::shared_ptr<SceneData::GraphData::TransformData> transformData =
+                    AZStd::make_shared<SceneData::GraphData::TransformData>(localTransform);
+                AZ_Error(SceneAPI::Utilities::ErrorWindow, transformData, "Failed to allocate transform data.");
+                if (!transformData)
+                {
+                    return Events::ProcessingResult::Failure;
+                }
+
+                // If it is non-endpoint data populated node, add a transform attribute
+                if (context.m_scene.GetGraph().HasNodeContent(context.m_currentGraphPosition))
+                {
+                    if (!context.m_scene.GetGraph().IsNodeEndPoint(context.m_currentGraphPosition))
+                    {
+                        AZStd::string nodeName = s_transformNodeName;
+                        RenamedNodesMap::SanitizeNodeName(nodeName, context.m_scene.GetGraph(), context.m_currentGraphPosition);
+                        AZ_TraceContext("Transform node name", nodeName);
+
+                        Containers::SceneGraph::NodeIndex newIndex =
+                            context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, nodeName.c_str());
+
+                        AZ_Error(SceneAPI::Utilities::ErrorWindow, newIndex.IsValid(), "Failed to create SceneGraph node for attribute.");
+                        if (!newIndex.IsValid())
+                        {
+                            return Events::ProcessingResult::Failure;
+                        }
+
+                        Events::ProcessingResult transformAttributeResult;
+                        AssImpSceneAttributeDataPopulatedContext dataPopulated(context, transformData, newIndex, nodeName);
+                        transformAttributeResult = Events::Process(dataPopulated);
+
+                        if (transformAttributeResult != Events::ProcessingResult::Failure)
+                        {
+                            transformAttributeResult = AddAttributeDataNodeWithContexts(dataPopulated);
+                        }
+
+                        return transformAttributeResult;
+                    }
+                }
+                else
+                {
+                    bool addedData = context.m_scene.GetGraph().SetContent(context.m_currentGraphPosition, transformData);
+
+                    AZ_Error(SceneAPI::Utilities::ErrorWindow, addedData, "Failed to add node data");
+                    return addedData ? Events::ProcessingResult::Success : Events::ProcessingResult::Failure;
+                }
+
+                return Events::ProcessingResult::Ignored;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h
new file mode 100644
index 0000000000..f6afa4742c
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpTransformImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpTransformImporter, "{A7494C53-5822-40EF-9B60-B1FF09FBFA59}", SceneCore::LoadingComponent);
+
+                AssImpTransformImporter();
+                ~AssImpTransformImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportTransform(AssImpSceneNodeAppendedContext& context);
+                static const char* s_transformNodeName;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.cpp
new file mode 100644
index 0000000000..f8319330ac
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.cpp
@@ -0,0 +1,180 @@
+/*
+ * 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/Math/Vector2.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/containers/array.h>
+#include <AzCore/std/numeric.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneData/GraphData/MeshVertexUVData.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+
+#include <assimp/scene.h>
+#include <assimp/mesh.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            const char* AssImpUvMapImporter::m_defaultNodeName = "UV";
+
+            AssImpUvMapImporter::AssImpUvMapImporter()
+            {
+                BindToCall(&AssImpUvMapImporter::ImportUvMaps);
+            }
+
+            void AssImpUvMapImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<AssImpUvMapImporter, SceneCore::LoadingComponent>()->Version(4); // LYN-3250
+                }
+            }
+
+            Events::ProcessingResult AssImpUvMapImporter::ImportUvMaps(AssImpSceneNodeAppendedContext& context)
+            {
+                AZ_TraceContext("Importer", m_defaultNodeName);
+                if (!context.m_sourceNode.ContainsMesh())
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+                const aiNode* currentNode = context.m_sourceNode.GetAssImpNode();
+                const aiScene* scene = context.m_sourceScene.GetAssImpScene();
+
+                // AssImp separates meshes that have multiple materials.
+                // This code re-combines them to match previous FBX SDK behavior,
+                // so they can be separated by engine code instead.
+                bool foundTextureCoordinates = false;
+                AZStd::array<int, AI_MAX_NUMBER_OF_TEXTURECOORDS> meshesPerTextureCoordinateIndex = {};
+                for (int localMeshIndex = 0; localMeshIndex < currentNode->mNumMeshes; ++localMeshIndex)
+                {
+                    aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[localMeshIndex]];
+                    for (int texCoordIndex = 0; texCoordIndex < meshesPerTextureCoordinateIndex.size(); ++texCoordIndex)
+                    {
+                        if (!mesh->mTextureCoords[texCoordIndex])
+                        {
+                            continue;
+                        }
+                        ++meshesPerTextureCoordinateIndex[texCoordIndex];
+                        foundTextureCoordinates = true;
+                    }
+                }
+
+                if (!foundTextureCoordinates)
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
+
+                const uint64_t vertexCount = GetVertexCountForAllMeshesOnNode(*currentNode, *scene);
+
+                for (int texCoordIndex = 0; texCoordIndex < meshesPerTextureCoordinateIndex.size(); ++texCoordIndex)
+                {
+                    AZ_Error(
+                        Utilities::ErrorWindow,
+                        meshesPerTextureCoordinateIndex[texCoordIndex] == 0 ||
+                            meshesPerTextureCoordinateIndex[texCoordIndex] == currentNode->mNumMeshes,
+                        "Texture coordinate index %d for node %s is not on all meshes on this node. "
+                            "Placeholder arbitrary texture values will be generated to allow the data to process, but the source art "
+                            "needs to be fixed to correct this. All meshes on this node should have the same number of texture coordinate channels.",
+                        texCoordIndex,
+                        currentNode->mName.C_Str());
+                }
+
+                Events::ProcessingResultCombiner combinedUvMapResults;
+                for (int texCoordIndex = 0; texCoordIndex < meshesPerTextureCoordinateIndex.size(); ++texCoordIndex)
+                {
+                    // No meshes have this texture coordinate index, skip it.
+                    if (meshesPerTextureCoordinateIndex[texCoordIndex] == 0)
+                    {
+                        continue;
+                    }
+
+                    AZStd::shared_ptr<SceneData::GraphData::MeshVertexUVData> uvMap =
+                        AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexUVData>();
+                    uvMap->ReserveContainerSpace(vertexCount);
+                    bool customNameFound = false;
+                    AZStd::string name(AZStd::string::format("%s%d", m_defaultNodeName, texCoordIndex));
+                    for (int sdkMeshIndex = 0; sdkMeshIndex < currentNode->mNumMeshes; ++sdkMeshIndex)
+                    {
+                        const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[sdkMeshIndex]];
+                        if(mesh->mTextureCoords[texCoordIndex])
+                        {
+                            if (mesh->mTextureCoordsNames[texCoordIndex].length > 0)
+                            {
+                                if (!customNameFound)
+                                {
+                                    name = mesh->mTextureCoordsNames[texCoordIndex].C_Str();
+                                    customNameFound = true;
+                                }
+                                else
+                                {
+                                    AZ_Warning(Utilities::WarningWindow,
+                                        strcmp(name.c_str(), mesh->mTextureCoordsNames[texCoordIndex].C_Str()) == 0,
+                                        "Node %s has conflicting mesh coordinate names at index %d, %s and %s. Using %s.",
+                                        currentNode->mName.C_Str(),
+                                        texCoordIndex,
+                                        name.c_str(),
+                                        mesh->mTextureCoordsNames[texCoordIndex].C_Str(),
+                                        name.c_str());
+                                }
+                            }
+                        }
+
+                        for (int v = 0; v < mesh->mNumVertices; ++v)
+                        {
+                            if (mesh->mTextureCoords[texCoordIndex])
+                            {
+                                AZ::Vector2 vertexUV(
+                                    mesh->mTextureCoords[texCoordIndex][v].x,
+                                    // The engine's V coordinate is reverse of how it's coming in from the SDK.
+                                    1.0f - mesh->mTextureCoords[texCoordIndex][v].y);
+                                uvMap->AppendUV(vertexUV);
+                            }
+                            else
+                            {
+                                // An error was already emitted if the UV channels for all meshes on this node do not match.
+                                // Append an arbitrary UV value so that the mesh can still be processed.
+                                // It's better to let the engine load a partially valid mesh than to completely fail.
+                                uvMap->AppendUV(AZ::Vector2::CreateZero());
+                            }
+                        }
+                    }
+
+                    uvMap->SetCustomName(name.c_str());
+                    Containers::SceneGraph::NodeIndex newIndex =
+                        context.m_scene.GetGraph().AddChild(context.m_currentGraphPosition, name.c_str());
+
+                    Events::ProcessingResult uvMapResults;
+                    AssImpSceneAttributeDataPopulatedContext dataPopulated(context, uvMap, newIndex, name);
+                    uvMapResults = Events::Process(dataPopulated);
+
+                    if (uvMapResults != Events::ProcessingResult::Failure)
+                    {
+                        uvMapResults = AddAttributeDataNodeWithContexts(dataPopulated);
+                    }
+
+                    combinedUvMapResults += uvMapResults;
+
+                }
+
+                return combinedUvMapResults.GetResult();
+            }
+
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h
new file mode 100644
index 0000000000..249e305a50
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class AssImpUvMapImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(AssImpUvMapImporter, "{BF02F231-848B-4CDB-9B11-55EEE15CFAA6}", SceneCore::LoadingComponent);
+
+                AssImpUvMapImporter();
+                ~AssImpUvMapImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportUvMaps(AssImpSceneNodeAppendedContext& context);
+
+            protected:
+                static const char* m_defaultNodeName;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.cpp
new file mode 100644
index 0000000000..48c00f5114
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.cpp
@@ -0,0 +1,434 @@
+/*
+ * 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/Math/Transform.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneCore/Containers/Views/PairIterator.h>
+#include <SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h>
+#include <SceneAPI/SceneData/GraphData/AnimationData.h>
+#include <SceneAPI/SceneData/GraphData/BoneData.h>
+#include <SceneAPI/SceneData/GraphData/MaterialData.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneData/GraphData/MeshVertexColorData.h>
+#include <SceneAPI/SceneData/GraphData/MeshVertexUVData.h>
+#include <SceneAPI/SceneData/GraphData/SkinWeightData.h>
+#include <SceneAPI/SceneData/GraphData/TransformData.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            static const float g_sceneUtilityEqualityEpsilon = 0.001f;
+
+            CoreProcessingResult AddDataNodeWithContexts(SceneDataPopulatedContextBase& dataPopulated)
+            {
+                AZ_TraceContext("Node Name", dataPopulated.m_dataName);
+                const char* nodeTypeName = dataPopulated.m_graphData ? dataPopulated.m_graphData->RTTI_GetTypeName() : "Null";
+                AZ_TraceContext("Node Type", (!nodeTypeName || nodeTypeName[0] == '\0' ? "Null" : nodeTypeName));
+                
+                Events::ProcessingResultCombiner nodeResults;
+                nodeResults += Events::Process(dataPopulated);
+
+                dataPopulated.m_scene.GetGraph().SetContent(dataPopulated.m_currentGraphPosition,
+                    AZStd::move(dataPopulated.m_graphData));
+
+                if (azrtti_istypeof<AssImpSceneDataPopulatedContext>(dataPopulated))
+                {
+                    AssImpSceneDataPopulatedContext* dataPopulatedContext = azrtti_cast<AssImpSceneDataPopulatedContext*>(&dataPopulated);
+                    AssImpSceneNodeAppendedContext nodeAppended(*dataPopulatedContext, dataPopulated.m_currentGraphPosition);
+                    nodeResults += Events::Process(nodeAppended);
+
+                    AssImpSceneNodeAddedAttributesContext addedAttributes(nodeAppended);
+                    nodeResults += Events::Process(addedAttributes);
+
+                    AssImpSceneNodeFinalizeContext finalizeNode(addedAttributes);
+                    nodeResults += Events::Process(finalizeNode);
+                }
+
+                return nodeResults.GetResult();
+            }
+
+            CoreProcessingResult AddAttributeDataNodeWithContexts(SceneAttributeDataPopulatedContextBase& dataPopulated)
+            {
+                AZ_TraceContext("Node Name", dataPopulated.m_dataName);
+                const char* nodeTypeName = dataPopulated.m_graphData ? dataPopulated.m_graphData->RTTI_GetTypeName() : "Null";
+                AZ_TraceContext("Node Type", (!nodeTypeName || nodeTypeName[0] == '\0' ? "Null" : nodeTypeName));
+
+                Events::ProcessingResultCombiner nodeResults;
+                nodeResults += Events::Process(dataPopulated);
+
+                dataPopulated.m_scene.GetGraph().MakeEndPoint(dataPopulated.m_currentGraphPosition);
+
+                dataPopulated.m_scene.GetGraph().SetContent(dataPopulated.m_currentGraphPosition,
+                    AZStd::move(dataPopulated.m_graphData));
+                if (azrtti_istypeof<AssImpSceneAttributeDataPopulatedContext>(dataPopulated))
+                {
+                    AssImpSceneAttributeDataPopulatedContext* dataPopulatedContext = azrtti_cast<AssImpSceneAttributeDataPopulatedContext*>(&dataPopulated);
+                    AssImpSceneAttributeNodeAppendedContext nodeAppended(*dataPopulatedContext, dataPopulated.m_currentGraphPosition);
+                    nodeResults += Events::Process(nodeAppended);
+                }
+
+                return nodeResults.GetResult();
+            }
+
+            bool AreSceneGraphsEqual(const CoreSceneGraph& lhsGraph, const CoreSceneGraph& rhsGraph)
+            {
+                auto lhsContentStorage = lhsGraph.GetContentStorage();
+                auto lhsNameStorage = lhsGraph.GetNameStorage();
+                
+                auto lhsNameContentView = Containers::Views::MakePairView(lhsNameStorage, lhsContentStorage);
+                Containers::SceneGraph::NodeIndex lhsRootIndex = lhsGraph.GetRoot();
+                auto lhsDownwardView =
+                    Containers::Views::MakeSceneGraphDownwardsView<Containers::Views::BreadthFirst>(lhsGraph, lhsRootIndex,
+                    lhsNameContentView.begin(), true);
+
+                auto rhsContentStorage = rhsGraph.GetContentStorage();
+                auto rhsNameStorage = rhsGraph.GetNameStorage();
+                
+                auto rhsNameContentView = Containers::Views::MakePairView(rhsNameStorage, rhsContentStorage);
+                Containers::SceneGraph::NodeIndex rhsRootIndex = rhsGraph.GetRoot();
+                auto rhsDownwardView =
+                    Containers::Views::MakeSceneGraphDownwardsView<Containers::Views::BreadthFirst>(rhsGraph, rhsRootIndex,
+                    rhsNameContentView.begin(), true);
+
+                auto lhsIt = lhsDownwardView.begin();
+                auto rhsIt = rhsDownwardView.begin();
+
+                while (lhsIt != lhsDownwardView.end() && rhsIt != rhsDownwardView.end())
+                {
+                    if (!IsGraphDataEqual(lhsIt->second, rhsIt->second))
+                    {
+                        return false;
+                    }
+                    if (lhsIt->first != rhsIt->first)
+                    {
+                        return false;
+                    }
+
+                    ++lhsIt;
+                    ++rhsIt;
+                }
+
+                return (lhsIt == lhsDownwardView.end() && rhsIt == rhsDownwardView.end());
+            }
+            
+            bool operator==(const SceneData::GraphData::MeshData& lhs,
+                const SceneData::GraphData::MeshData& rhs)
+            {
+                if (lhs.GetVertexCount() != rhs.GetVertexCount())
+                {
+                    return false;
+                }
+
+                if (lhs.HasNormalData() != rhs.HasNormalData())
+                {
+                    return false;
+                }
+
+                if (lhs.GetFaceCount() != rhs.GetFaceCount())
+                {
+                    return false;
+                }
+
+                bool hasNormals = lhs.HasNormalData();
+                unsigned int vertexCount = lhs.GetVertexCount();
+                for (unsigned int vertexIndex = 0; vertexIndex < vertexCount; ++vertexIndex)
+                {
+                    if (lhs.GetPosition(vertexIndex) != rhs.GetPosition(vertexIndex))
+                    {
+                        return false;
+                    }
+
+                    if (hasNormals && (lhs.GetNormal(vertexIndex) != rhs.GetNormal(vertexIndex)))
+                    {
+                        return false;
+                    }
+                }
+
+                unsigned int faceCount = lhs.GetFaceCount();
+                for (unsigned int faceIndex = 0; faceIndex < faceCount; ++faceIndex)
+                {
+                    if (lhs.GetFaceMaterialId(faceIndex) != rhs.GetFaceMaterialId(faceIndex))
+                    {
+                        return false;
+                    }
+
+                    if (lhs.GetFaceInfo(faceIndex) != rhs.GetFaceInfo(faceIndex))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            bool operator==(const SceneData::GraphData::SkinWeightData& lhs,
+                const SceneData::GraphData::SkinWeightData& rhs)
+            {
+                if (lhs.GetVertexCount() != rhs.GetVertexCount())
+                {
+                    return false;
+                }
+
+                if (lhs.GetBoneCount() != rhs.GetBoneCount())
+                {
+                    return false;
+                }
+
+                size_t vertexCount = lhs.GetVertexCount();
+                for (size_t vertexIndex = 0; vertexIndex < vertexCount; ++vertexIndex)
+                {
+                    if (lhs.GetLinkCount(vertexIndex) != rhs.GetLinkCount(vertexIndex))
+                    {
+                        return false;
+                    }
+
+                    size_t linkCount = lhs.GetLinkCount(vertexIndex);
+                    for (size_t linkIndex = 0; linkIndex < linkCount; ++linkIndex)
+                    {
+                        const DataTypes::ISkinWeightData::Link lhsLink = lhs.GetLink(vertexIndex, linkIndex);
+                        const DataTypes::ISkinWeightData::Link rhsLink = rhs.GetLink(vertexIndex, linkIndex);
+
+                        if (lhsLink.boneId != rhsLink.boneId || !IsClose(lhsLink.weight, rhsLink.weight, g_sceneUtilityEqualityEpsilon))
+                        {
+                            return false;
+                        }
+
+                        if (lhs.GetBoneName(lhsLink.boneId) != rhs.GetBoneName(rhsLink.boneId))
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+
+            bool operator==(const SceneData::GraphData::BoneData& lhs,
+                const SceneData::GraphData::BoneData& rhs)
+            {
+                return (lhs.GetWorldTransform() == rhs.GetWorldTransform());
+            }
+
+            bool operator==(const DataTypes::Color& lhs, const DataTypes::Color& rhs)
+            {
+                if (!IsClose(lhs.alpha, rhs.alpha, g_sceneUtilityEqualityEpsilon) ||
+                    !IsClose(lhs.blue, rhs.blue, g_sceneUtilityEqualityEpsilon) ||
+                    !IsClose(lhs.green, rhs.green, g_sceneUtilityEqualityEpsilon) ||
+                    !IsClose(lhs.red, rhs.red, g_sceneUtilityEqualityEpsilon))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            bool operator!=(const DataTypes::Color& lhs, const DataTypes::Color& rhs)
+            {
+                return !(lhs == rhs);
+            }
+
+            bool operator==(const SceneData::GraphData::MeshVertexColorData& lhs,
+                const SceneData::GraphData::MeshVertexColorData& rhs)
+            {
+                if (lhs.GetCount() != rhs.GetCount())
+                {
+                    return false;
+                }
+
+                size_t colorCount = lhs.GetCount();
+                for (size_t colorIndex = 0; colorIndex < colorCount; ++colorIndex)
+                {
+                    if (lhs.GetColor(colorIndex) != rhs.GetColor(colorIndex))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            bool operator==(const SceneData::GraphData::MeshVertexUVData& lhs,
+                const SceneData::GraphData::MeshVertexUVData& rhs)
+            {
+                if (lhs.GetCount() != rhs.GetCount())
+                {
+                    return false;
+                }
+                size_t uvCount = lhs.GetCount();
+                for (size_t uvIndex = 0; uvIndex < uvCount; ++uvIndex)
+                {
+                    if (lhs.GetUV(uvIndex) != rhs.GetUV(uvIndex))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            bool operator==(const SceneData::GraphData::MaterialData& lhs,
+                const SceneData::GraphData::MaterialData& rhs)
+            {
+                if (lhs.IsNoDraw() != rhs.IsNoDraw())
+                {
+                    return false;
+                }
+
+                if (lhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Diffuse) !=
+                    rhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Diffuse))
+                {
+                    return false;
+                }
+
+                if (lhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Specular) !=
+                    rhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Specular))
+                {
+                    return false;
+                }
+
+                if (lhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Bump) !=
+                    rhs.GetTexture(DataTypes::IMaterialData::TextureMapType::Bump))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            bool operator==(const SceneData::GraphData::TransformData& lhs,
+                const SceneData::GraphData::TransformData& rhs)
+            {
+                return lhs.GetMatrix() == rhs.GetMatrix();
+            }
+
+            bool operator==(const SceneData::GraphData::AnimationData& lhs,
+                const SceneData::GraphData::AnimationData& rhs)
+            {
+                if (lhs.GetKeyFrameCount() != rhs.GetKeyFrameCount())
+                {
+                    return false;
+                }
+
+                size_t keyFrameCount = lhs.GetKeyFrameCount();
+                
+                for (size_t keyFrameIndex = 0; keyFrameIndex < keyFrameCount; ++keyFrameIndex)
+                {
+                    if (lhs.GetKeyFrame(keyFrameIndex) != rhs.GetKeyFrame(keyFrameIndex))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            bool IsGraphDataEqual(const AZStd::shared_ptr<const DataTypes::IGraphObject>& lhs,
+                const AZStd::shared_ptr<const DataTypes::IGraphObject>& rhs)
+            {
+                // If both are null, they are considered equal
+                if (!lhs && !rhs)
+                {
+                    return true;
+                }
+
+                // If only one is null, they are considered not equal
+                if (!lhs || !rhs)
+                {
+                    return false;
+                }
+
+                // If they have disparate types they are considered not equal
+                if (lhs->RTTI_GetType() != rhs->RTTI_GetType())
+                {
+                    return false;
+                }
+
+                if (lhs->RTTI_IsTypeOf(SceneData::GraphData::BoneData::TYPEINFO_Uuid()))
+                {
+                    const SceneData::GraphData::BoneData* lhsBone = 
+                        azrtti_cast<const SceneData::GraphData::BoneData*>(lhs.get());
+                    const SceneData::GraphData::BoneData* rhsBone =
+                        azrtti_cast<const SceneData::GraphData::BoneData*>(rhs.get());
+
+                    return (*lhsBone == *rhsBone);
+                }
+                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::MeshData::TYPEINFO_Uuid()))
+                {
+                    const SceneData::GraphData::MeshData* lhsMesh =
+                        azrtti_cast<const SceneData::GraphData::MeshData*>(lhs.get());
+                    const SceneData::GraphData::MeshData* rhsMesh =
+                        azrtti_cast<const SceneData::GraphData::MeshData*>(rhs.get());
+
+                    return (*lhsMesh == *rhsMesh);
+                }
+                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::SkinWeightData::TYPEINFO_Uuid()))
+                {
+                    const SceneData::GraphData::SkinWeightData* lhsSkinWeights =
+                        azrtti_cast<const SceneData::GraphData::SkinWeightData*>(lhs.get());
+                    const SceneData::GraphData::SkinWeightData* rhsSkinWeights =
+                        azrtti_cast<const SceneData::GraphData::SkinWeightData*>(rhs.get());
+
+                    return (*lhsSkinWeights == *rhsSkinWeights);
+                }
+                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::MeshVertexColorData::TYPEINFO_Uuid()))
+                {
+                    const SceneData::GraphData::MeshVertexColorData* lhsColorData =
+                        azrtti_cast<const SceneData::GraphData::MeshVertexColorData*>(lhs.get());
+                    const SceneData::GraphData::MeshVertexColorData* rhsColorData =
+                        azrtti_cast<const SceneData::GraphData::MeshVertexColorData*>(rhs.get());
+
+                    return (*lhsColorData == *rhsColorData);
+                }
+                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::MeshVertexUVData::TYPEINFO_Uuid()))
+                {
+                    const SceneData::GraphData::MeshVertexUVData* lhsUVData =
+                        azrtti_cast<const SceneData::GraphData::MeshVertexUVData*>(lhs.get());
+                    const SceneData::GraphData::MeshVertexUVData* rhsUVData =
+                        azrtti_cast<const SceneData::GraphData::MeshVertexUVData*>(rhs.get());
+
+                    return (*lhsUVData == *rhsUVData);
+                }
+                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::MaterialData::TYPEINFO_Uuid()))
+                {
+                    const SceneData::GraphData::MaterialData* lhsMaterialData =
+                        azrtti_cast<const SceneData::GraphData::MaterialData*>(lhs.get());
+                    const SceneData::GraphData::MaterialData* rhsMaterialData =
+                        azrtti_cast<const SceneData::GraphData::MaterialData*>(rhs.get());
+
+                    return (*lhsMaterialData == *rhsMaterialData);
+                }
+                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::TransformData::TYPEINFO_Uuid()))
+                {
+                    const SceneData::GraphData::TransformData* lhsTransform =
+                        azrtti_cast<const SceneData::GraphData::TransformData*>(lhs.get());
+                    const SceneData::GraphData::TransformData* rhsTransform =
+                        azrtti_cast<const SceneData::GraphData::TransformData*>(rhs.get());
+
+                    return (*lhsTransform == *rhsTransform);
+                }
+                else if (lhs->RTTI_IsTypeOf(SceneData::GraphData::AnimationData::TYPEINFO_Uuid()))
+                {
+                    const SceneData::GraphData::AnimationData* lhsAnimation =
+                        azrtti_cast<const SceneData::GraphData::AnimationData*>(lhs.get());
+                    const SceneData::GraphData::AnimationData* rhsAnimation =
+                        azrtti_cast<const SceneData::GraphData::AnimationData*>(rhs.get());
+
+                    return (*lhsAnimation == *rhsAnimation);
+                }
+
+
+                return true;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.h
new file mode 100644
index 0000000000..c85812b420
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.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 <SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
+#include <SceneAPI/SceneCore/DataTypes/MatrixType.h>
+#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
+
+namespace AZ
+{
+    struct Uuid;
+
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            struct SceneImportContext;
+
+            using CoreScene = Containers::Scene;
+            using CoreSceneGraph = Containers::SceneGraph;
+            using CoreGraphNodeIndex = Containers::SceneGraph::NodeIndex;
+            using CoreProcessingResult = Events::ProcessingResult;
+
+            inline bool NodeIsOfType(const CoreSceneGraph& graph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid);
+            inline bool NodeParentIsOfType(const CoreSceneGraph& graph, CoreGraphNodeIndex nodeIndex, 
+                const AZ::Uuid& uuid);
+            inline bool NodeHasAncestorOfType(const CoreSceneGraph& graph, CoreGraphNodeIndex nodeIndex,
+                const AZ::Uuid& uuid);
+            CoreProcessingResult AddDataNodeWithContexts(SceneDataPopulatedContextBase& dataContext);
+            CoreProcessingResult AddAttributeDataNodeWithContexts(SceneAttributeDataPopulatedContextBase& dataContext);
+            bool AreSceneGraphsEqual(const CoreSceneGraph& lhsGraph, const CoreSceneGraph& rhsGraph);
+            inline bool AreScenesEqual(const CoreScene& lhs, const CoreScene& rhs);
+
+            bool IsGraphDataEqual(const AZStd::shared_ptr<const DataTypes::IGraphObject>& lhs,
+                const AZStd::shared_ptr<const DataTypes::IGraphObject>& rhs);
+
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
+
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.inl>
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.inl b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.inl
new file mode 100644
index 0000000000..3cbade4c98
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.inl
@@ -0,0 +1,68 @@
+/*
+ * 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 <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneCore/DataTypes/IGraphObject.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            bool NodeIsOfType(const CoreSceneGraph& sceneGraph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid)
+            {
+                if (nodeIndex.IsValid() && sceneGraph.HasNodeContent(nodeIndex) &&
+                    sceneGraph.GetNodeContent(nodeIndex)->RTTI_IsTypeOf(uuid))
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            bool NodeParentIsOfType(const CoreSceneGraph& sceneGraph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid)
+            {
+                CoreGraphNodeIndex parentIndex = sceneGraph.GetNodeParent(nodeIndex);
+                return NodeIsOfType(sceneGraph, parentIndex, uuid);
+            }
+
+            bool NodeHasAncestorOfType(const CoreSceneGraph& sceneGraph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid)
+            {
+                CoreGraphNodeIndex parentIndex = sceneGraph.GetNodeParent(nodeIndex);
+                while (parentIndex.IsValid())
+                {
+                    if (NodeIsOfType(sceneGraph, parentIndex, uuid))
+                    {
+                        return true;
+                    }
+                    parentIndex = sceneGraph.GetNodeParent(parentIndex);
+                }
+
+                return false;
+            }
+
+            bool AreScenesEqual(const CoreScene& lhs, const CoreScene& rhs)
+            {
+                if (lhs.GetGraph().GetNodeCount() != rhs.GetGraph().GetNodeCount())
+                {
+                    return false;
+                }
+
+                if (!AreSceneGraphsEqual(lhs.GetGraph(), rhs.GetGraph()))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp
new file mode 100644
index 0000000000..5c42122056
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.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 <assimp/mesh.h>
+#include <assimp/scene.h>
+#include <AzCore/Casting/numeric_cast.h>
+#include <AzCore/std/numeric.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <SceneAPI/SceneBuilder/SceneSystem.h>
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <SceneAPI/SceneData/GraphData/BlendShapeData.h>
+#include <SceneAPI/SceneData/GraphData/BoneData.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+
+namespace AZ::SceneAPI::SceneBuilder
+{
+    bool BuildSceneMeshFromAssImpMesh(const aiNode* currentNode, const aiScene* scene, const SceneSystem& sceneSystem, AZStd::vector<AZStd::shared_ptr<DataTypes::IGraphObject>>& meshes,
+        const AZStd::function<AZStd::shared_ptr<SceneData::GraphData::MeshData>()>& makeMeshFunc)
+    {
+        AZStd::unordered_map<int, int> assImpMatIndexToLYIndex;
+        int lyMeshIndex = 0;
+
+        if(!currentNode || !scene)
+        {
+            return false;
+        }
+        auto newMesh = makeMeshFunc();
+
+        newMesh->SetUnitSizeInMeters(sceneSystem.GetUnitSizeInMeters());
+        newMesh->SetOriginalUnitSizeInMeters(sceneSystem.GetOriginalUnitSizeInMeters());
+
+        // AssImp separates meshes that have multiple materials.
+        // This code re-combines them to match previous FBX SDK behavior,
+        // so they can be separated by engine code instead.
+        int vertOffset = 0;
+        for (int m = 0; m < currentNode->mNumMeshes; ++m)
+        {
+            const aiMesh* mesh = scene->mMeshes[currentNode->mMeshes[m]];
+
+            // Lumberyard materials are created in order based on mesh references in the scene
+            if (assImpMatIndexToLYIndex.find(mesh->mMaterialIndex) == assImpMatIndexToLYIndex.end())
+            {
+                assImpMatIndexToLYIndex.insert(AZStd::pair<int, int>(mesh->mMaterialIndex, lyMeshIndex++));
+            }
+
+            for (int vertIdx = 0; vertIdx < mesh->mNumVertices; ++vertIdx)
+            {
+                AZ::Vector3 vertex(mesh->mVertices[vertIdx].x, mesh->mVertices[vertIdx].y, mesh->mVertices[vertIdx].z);
+
+                sceneSystem.SwapVec3ForUpAxis(vertex);
+                sceneSystem.ConvertUnit(vertex);
+                newMesh->AddPosition(vertex);
+                newMesh->SetVertexIndexToControlPointIndexMap(vertIdx + vertOffset, vertIdx + vertOffset);
+
+                if (mesh->HasNormals())
+                {
+                    AZ::Vector3 normal(mesh->mNormals[vertIdx].x, mesh->mNormals[vertIdx].y, mesh->mNormals[vertIdx].z);
+                    sceneSystem.SwapVec3ForUpAxis(normal);
+                    normal.NormalizeSafe();
+                    newMesh->AddNormal(normal);
+                }
+            }
+
+            for (int faceIdx = 0; faceIdx < mesh->mNumFaces; ++faceIdx)
+            {
+                aiFace face = mesh->mFaces[faceIdx];
+                AZ::SceneAPI::DataTypes::IMeshData::Face meshFace;
+                if (face.mNumIndices != 3)
+                {
+                    // AssImp should have triangulated everything, so if this happens then someone has
+                    // probably changed AssImp's import settings. The engine only supports triangles.
+                    AZ_Error(Utilities::ErrorWindow, false,
+                        "Mesh on node %s has a face with %d vertices, only 3 vertices are supported per face.",
+                        currentNode->mName.C_Str(),
+                        face.mNumIndices);
+                    continue;
+                }
+                for (int idx = 0; idx < face.mNumIndices; ++idx)
+                {
+                    meshFace.vertexIndex[idx] = face.mIndices[idx] + vertOffset;
+                }
+
+                newMesh->AddFace(meshFace, assImpMatIndexToLYIndex[mesh->mMaterialIndex]);
+            }
+            vertOffset += mesh->mNumVertices;
+
+        }
+        meshes.push_back(newMesh);
+
+        return true;
+    }
+
+    GetMeshDataFromParentResult GetMeshDataFromParent(AssImpSceneNodeAppendedContext& context)
+    {
+        const DataTypes::IGraphObject* const parentData =
+            context.m_scene.GetGraph().GetNodeContent(context.m_currentGraphPosition).get();
+
+        if (!parentData)
+        {
+            AZ_Error(Utilities::ErrorWindow, false,
+                "GetMeshDataFromParent failed because the parent was null, it should only be called with a valid parent node");
+            return AZ::Failure(Events::ProcessingResult::Failure);
+        }
+
+        if (!parentData->RTTI_IsTypeOf(SceneData::GraphData::MeshData::TYPEINFO_Uuid()))
+        {
+            // The parent node may contain bone information and not mesh information, skip it.
+            if (parentData->RTTI_IsTypeOf(SceneData::GraphData::BoneData::TYPEINFO_Uuid()))
+            {
+                // Return the ignore processing result in the failure.
+                return AZ::Failure(Events::ProcessingResult::Ignored);
+            }
+            AZ_Error(Utilities::ErrorWindow, false,
+                "Tried to get mesh data from parent for non-mesh parent data");
+            return AZ::Failure(Events::ProcessingResult::Failure);
+        }
+
+        const SceneData::GraphData::MeshData* const parentMeshData =
+            azrtti_cast<const SceneData::GraphData::MeshData* const>(parentData);
+        return AZ::Success(parentMeshData);
+    }
+
+    uint64_t GetVertexCountForAllMeshesOnNode(const aiNode& node, const aiScene& scene)
+    {
+        return AZStd::accumulate(node.mMeshes, node.mMeshes + node.mNumMeshes, uint64_t{ 0u },
+            [&scene](auto runningTotal, unsigned int meshIndex)
+            {
+                return runningTotal + scene.mMeshes[meshIndex]->mNumVertices;
+            });
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h
new file mode 100644
index 0000000000..b04777134f
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h
@@ -0,0 +1,49 @@
+/*
+ * 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 <SceneAPI/SceneCore/Events/ProcessingResult.h>
+
+struct aiNode;
+struct aiScene;
+
+namespace AZ
+{
+    namespace SceneData
+    {
+        namespace GraphData
+        {
+            class MeshData;
+            class BlendShapeData;
+        }
+    }
+
+    namespace SceneAPI
+    {
+        namespace DataTypes
+        {
+            class IGraphObject;
+        }
+        struct AssImpSceneNodeAppendedContext;
+        class SceneSystem;
+
+        namespace SceneBuilder
+        {
+            bool BuildSceneMeshFromAssImpMesh(const aiNode* currentNode, const aiScene* scene, const SceneSystem& sceneSystem, AZStd::vector<AZStd::shared_ptr<DataTypes::IGraphObject>>& meshes,
+                const AZStd::function<AZStd::shared_ptr<SceneData::GraphData::MeshData>()>& makeMeshFunc);
+
+            typedef AZ::Outcome<const SceneData::GraphData::MeshData* const, Events::ProcessingResult> GetMeshDataFromParentResult;
+            GetMeshDataFromParentResult GetMeshDataFromParent(AssImpSceneNodeAppendedContext& context);
+
+            // If a node in the original scene file has a mesh with multiple materials on it, the associated AssImp
+            // node will have multiple meshes on it, broken apart per material. This returns the total number
+            // of vertices on all meshes on the given node.
+            uint64_t GetVertexCountForAllMeshesOnNode(const aiNode& node, const aiScene& scene);
+        }
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.cpp
new file mode 100644
index 0000000000..a85e3686de
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.cpp
@@ -0,0 +1,158 @@
+/*
+ * 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/Casting/numeric_cast.h>
+#include <AzCore/std/algorithm.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            bool RenamedNodesMap::SanitizeNodeName(AZStd::string& name, const Containers::SceneGraph& graph,
+                Containers::SceneGraph::NodeIndex parentNode, const char* defaultName)
+            {
+                AZ_TraceContext("Node name", name);
+                const AZStd::string originalNodeName(name);
+
+                bool isNameUpdated = false;
+                // Nodes can't have an empty name, except of the root, otherwise nodes can't be referenced.
+                if (name.empty())
+                {
+                    name = defaultName;
+                    isNameUpdated = true;
+                }
+
+                // The scene graph uses an arbitrary character (by default dot) to separate the names of the parents
+                // therefore that character can't be used in the name.
+                AZStd::replace_if(name.begin(), name.end(),
+                    [&isNameUpdated](char c) -> bool
+                {
+                    if (c == Containers::SceneGraph::GetNodeSeperationCharacter())
+                    {
+                        isNameUpdated = true;
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }, '_');
+
+                // Nodes under a particular parent have to be unique. Multiple nodes can share the same name, but they
+                // can't reference the same parent in that case. This is to make sure the node can be quickly found as
+                // the full path will be unique. To fix any issues, an index is appended.
+                size_t index = 1;
+                const size_t offset = name.length();
+                while (graph.Find(parentNode, name).IsValid())
+                {
+                    // Remove the previously tried extension.
+                    name.erase(offset, name.length() - offset);
+
+                    name += ('_');
+                    name += AZStd::to_string(aznumeric_cast<u64>(index));
+                    index++;
+                    isNameUpdated = true;
+                }
+
+                if (isNameUpdated)
+                {
+                    AZ_TraceContext("New node name", name);
+                    AZ_TracePrintf(Utilities::WarningWindow, "The name of the node '%s' was invalid or conflicting and was updated to '%s'.",
+                        originalNodeName.c_str(), name.c_str());
+                }
+
+                return isNameUpdated;
+            }
+
+            bool RenamedNodesMap::RegisterNode(const std::shared_ptr<SDKNode::NodeWrapper>& node, const Containers::SceneGraph& graph,
+                Containers::SceneGraph::NodeIndex parentNode, const char* defaultName)
+            {
+                return node ? RegisterNode(*node, graph, parentNode, defaultName) : false;
+            }
+
+            bool RenamedNodesMap::RegisterNode(const std::shared_ptr<const SDKNode::NodeWrapper>& node, const Containers::SceneGraph& graph,
+                Containers::SceneGraph::NodeIndex parentNode, const char* defaultName)
+            {
+                return node ? RegisterNode(*node, graph, parentNode, defaultName) : false;
+            }
+
+            bool RenamedNodesMap::RegisterNode(const SDKNode::NodeWrapper& node, const Containers::SceneGraph& graph,
+                Containers::SceneGraph::NodeIndex parentNode, const char* defaultName)
+            {
+                AZStd::string name = node.GetName();
+                if (SanitizeNodeName(name, graph, parentNode, defaultName))
+                {
+                    AZ_TraceContext("New node name", name);
+                    
+                    // Only register if the name is updated, otherwise the name in the source scene's node can be returned.
+                    auto entry = m_idToName.find(node.GetUniqueId());
+                    if (entry == m_idToName.end())
+                    {
+                        m_idToName.insert(AZStd::make_pair(node.GetUniqueId(), AZStd::move(name)));
+                        return true;
+                    }
+                    else
+                    {
+                        AZ_TraceContext("Previous name", entry->second);
+                        if (entry->second == name)
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            AZ_Assert(false, "Node has already been registered with a different name.");
+                            return false;
+                        }
+                    }
+                }
+                else
+                {
+                    return true;
+                }
+            }
+            
+            const char* RenamedNodesMap::GetNodeName(const std::shared_ptr<SDKNode::NodeWrapper>& node) const
+            {
+                return node ? GetNodeName(*node) : "<invalid>";
+            }
+
+            const char* RenamedNodesMap::GetNodeName(const std::shared_ptr<const SDKNode::NodeWrapper>& node) const
+            {
+                return node ? GetNodeName(*node) : "<invalid>";
+            }
+
+            const char* RenamedNodesMap::GetNodeName(const AZStd::shared_ptr<SDKNode::NodeWrapper>& node) const
+            {
+                return node ? GetNodeName(*node) : "<invalid>";
+            }
+
+            const char* RenamedNodesMap::GetNodeName(const AZStd::shared_ptr<const SDKNode::NodeWrapper>& node) const
+            {
+                return node ? GetNodeName(*node) : "<invalid>";
+            }
+
+            const char* RenamedNodesMap::GetNodeName(const SDKNode::NodeWrapper& node) const
+            {
+                auto entry = m_idToName.find(node.GetUniqueId());
+                if (entry != m_idToName.end())
+                {
+                    return entry->second.c_str();
+                }
+                else
+                {
+                    return node.GetName();
+                }
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h
new file mode 100644
index 0000000000..1428731469
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <memory>
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/std/string/string.h>
+#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
+#include <SceneAPI/SDKWrapper/NodeWrapper.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            class RenamedNodesMap
+            {
+            public:
+                //! Checks if the provided name is valid for the position in the graph and makes corrections if
+                //! problems are found.
+                //! @param name The name of the node in the scene graph.
+                //! @param graph The scene graph the node will be added to.
+                //! @param parentNode The node that will be the intended parent for the the node who's name is being checked.
+                //! @param defaultName If the provided name is empty, the defaultName will be used.
+                //! @return True if the name was updated otherwise false.
+                static bool SanitizeNodeName(AZStd::string& name, const Containers::SceneGraph& graph,
+                    Containers::SceneGraph::NodeIndex parentNode, const char* defaultName = "unnamed");
+                
+                //! Register the name for later reference. If the name needs to be sanitized, the sanitized name will be stored.
+                //! @param node The node that's to be registered.
+                //! @param graph The scene graph the node will be added to.
+                //! @param parentNode The node that will be the intended parent for the the node who's name is being checked.
+                //! @param defaultName If the provided name is empty, the defaultName will be used.
+                //! @return True if the node was successfully registered.
+                bool RegisterNode(const std::shared_ptr<SDKNode::NodeWrapper>& node, const Containers::SceneGraph& graph,
+                    Containers::SceneGraph::NodeIndex parentNode, const char* defaultName = "unnamed");
+                bool RegisterNode(const std::shared_ptr<const SDKNode::NodeWrapper>& node, const Containers::SceneGraph& graph,
+                    Containers::SceneGraph::NodeIndex parentNode, const char* defaultName = "unnamed");
+                bool RegisterNode(const SDKNode::NodeWrapper& node, const Containers::SceneGraph& graph,
+                    Containers::SceneGraph::NodeIndex parentNode, const char* defaultName = "unnamed");
+
+                //! Returns the name of the given node, which may be sanitized if this was needed.
+                const char* GetNodeName(const std::shared_ptr<SDKNode::NodeWrapper>& node) const;
+                const char* GetNodeName(const std::shared_ptr<const SDKNode::NodeWrapper>& node) const;
+                const char* GetNodeName(const AZStd::shared_ptr<SDKNode::NodeWrapper>& node) const;
+                const char* GetNodeName(const AZStd::shared_ptr<const SDKNode::NodeWrapper>& node) const;
+                const char* GetNodeName(const SDKNode::NodeWrapper& node) const;
+            private:
+
+                AZStd::unordered_map<u64, AZStd::string> m_idToName;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Platform/Linux/platform_linux_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/Platform/Linux/platform_linux_files.cmake
new file mode 100644
index 0000000000..086f882c8e
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Platform/Linux/platform_linux_files.cmake
@@ -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
+#
+#
+
+set(FILES
+    ../../../SceneCore/Containers/SceneManifest.h
+    ../../../SceneCore/Containers/SceneManifest.inl
+    ../../../SceneCore/Containers/SceneManifest.cpp
+    ../../../SceneCore/Events/AssetImportRequest.cpp
+    ../../../SceneCore/Events/AssetImportRequest.h
+    ../../../SceneCore/Events/CallProcessorBinder.cpp
+    ../../../SceneCore/Events/CallProcessorBinder.h
+    ../../../SceneData/GraphData/MeshVertexUVData.h
+    ../../../SceneData/GraphData/MeshVertexUVData.cpp
+    ../../../SceneData/GraphData/MeshVertexColorData.h
+    ../../../SceneData/GraphData/MeshVertexColorData.cpp
+    ../../../SceneData/GraphData/BoneData.h
+    ../../../SceneData/GraphData/BoneData.cpp
+    ../../../SceneData/GraphData/MeshData.h
+    ../../../SceneData/GraphData/MeshData.cpp
+    ../../../SceneData/GraphData/SkinWeightData.h
+    ../../../SceneData/GraphData/SkinWeightData.cpp
+    ../../../SceneData/GraphData/MaterialData.h
+    ../../../SceneData/GraphData/MaterialData.cpp
+    ../../../SceneData/GraphData/AnimationData.h
+    ../../../SceneData/GraphData/AnimationData.cpp
+    ../../../SceneData/GraphData/BlendShapeData.h
+    ../../../SceneData/GraphData/BlendShapeData.cpp
+)
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Platform/Mac/platform_mac_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/Platform/Mac/platform_mac_files.cmake
new file mode 100644
index 0000000000..086f882c8e
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Platform/Mac/platform_mac_files.cmake
@@ -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
+#
+#
+
+set(FILES
+    ../../../SceneCore/Containers/SceneManifest.h
+    ../../../SceneCore/Containers/SceneManifest.inl
+    ../../../SceneCore/Containers/SceneManifest.cpp
+    ../../../SceneCore/Events/AssetImportRequest.cpp
+    ../../../SceneCore/Events/AssetImportRequest.h
+    ../../../SceneCore/Events/CallProcessorBinder.cpp
+    ../../../SceneCore/Events/CallProcessorBinder.h
+    ../../../SceneData/GraphData/MeshVertexUVData.h
+    ../../../SceneData/GraphData/MeshVertexUVData.cpp
+    ../../../SceneData/GraphData/MeshVertexColorData.h
+    ../../../SceneData/GraphData/MeshVertexColorData.cpp
+    ../../../SceneData/GraphData/BoneData.h
+    ../../../SceneData/GraphData/BoneData.cpp
+    ../../../SceneData/GraphData/MeshData.h
+    ../../../SceneData/GraphData/MeshData.cpp
+    ../../../SceneData/GraphData/SkinWeightData.h
+    ../../../SceneData/GraphData/SkinWeightData.cpp
+    ../../../SceneData/GraphData/MaterialData.h
+    ../../../SceneData/GraphData/MaterialData.cpp
+    ../../../SceneData/GraphData/AnimationData.h
+    ../../../SceneData/GraphData/AnimationData.cpp
+    ../../../SceneData/GraphData/BlendShapeData.h
+    ../../../SceneData/GraphData/BlendShapeData.cpp
+)
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Platform/Windows/platform_windows_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/Platform/Windows/platform_windows_files.cmake
new file mode 100644
index 0000000000..ea5912045e
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Platform/Windows/platform_windows_files.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(FILES
+)
diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneBuilderConfiguration.h b/Code/Tools/SceneAPI/SceneBuilder/SceneBuilderConfiguration.h
new file mode 100644
index 0000000000..aee0ed7f47
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/SceneBuilderConfiguration.h
@@ -0,0 +1,20 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/PlatformDef.h>
+
+#if defined(AZ_MONOLITHIC_BUILD)
+    #define SCENE_BUILDER_API
+#else
+    #ifdef SCENE_BUILDER_EXPORTS
+        #define SCENE_BUILDER_API AZ_DLL_EXPORT
+    #else
+        #define SCENE_BUILDER_API AZ_DLL_IMPORT
+    #endif
+#endif // AZ_MONOLITHIC_BUILD
diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.cpp b/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.cpp
new file mode 100644
index 0000000000..2881b355cd
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.cpp
@@ -0,0 +1,103 @@
+/*
+ * 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 <AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h>
+#include <AzCore/Serialization/EditContextConstants.inl>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/Json/JsonSerialization.h>
+#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/StringFunc/StringFunc.h>
+#include <SceneAPI/SceneBuilder/SceneImportRequestHandler.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
+#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        void SceneImporterSettings::Reflect(AZ::ReflectContext* context)
+        {
+            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext)
+            {
+                serializeContext->Class<SceneImporterSettings>()
+                                ->Version(2)
+                                ->Field("SupportedFileTypeExtensions", &SceneImporterSettings::m_supportedFileTypeExtensions);
+            }
+        }
+
+        void SceneImportRequestHandler::Activate()
+        {
+            if (auto* settingsRegistry = AZ::SettingsRegistry::Get())
+            {
+                settingsRegistry->GetObject(m_settings, "/O3DE/SceneAPI/AssetImporter");
+            }
+
+            BusConnect();
+        }
+
+        void SceneImportRequestHandler::Deactivate()
+        {
+            BusDisconnect();
+        }
+
+        void SceneImportRequestHandler::Reflect(ReflectContext* context)
+        {
+            SceneImporterSettings::Reflect(context);
+
+            SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+            if (serializeContext)
+            {
+                serializeContext->Class<SceneImportRequestHandler, AZ::Component>()->Version(1)->Attribute(
+                    AZ::Edit::Attributes::SystemComponentTags,
+                    AZStd::vector<AZ::Crc32>(
+                        {AssetBuilderSDK::ComponentTags::AssetBuilder,
+                        AssetImportRequest::GetAssetImportRequestComponentTag()}));
+                    
+            }
+        }
+
+        void SceneImportRequestHandler::GetSupportedFileExtensions(AZStd::unordered_set<AZStd::string>& extensions)
+        {
+            extensions.insert(m_settings.m_supportedFileTypeExtensions.begin(), m_settings.m_supportedFileTypeExtensions.end());
+        }
+
+        Events::LoadingResult SceneImportRequestHandler::LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, [[maybe_unused]] RequestingApplication requester)
+        {
+            AZStd::string extension;
+            StringFunc::Path::GetExtension(path.c_str(), extension);
+            AZStd::to_lower(extension.begin(), extension.end());
+                
+            if (!m_settings.m_supportedFileTypeExtensions.contains(extension))
+            {
+                return Events::LoadingResult::Ignored;
+            }
+
+            scene.SetSource(path, guid);
+
+            // Push contexts
+            Events::ProcessingResultCombiner contextResult;
+            contextResult += Events::Process<Events::PreImportEventContext>(path);
+            contextResult += Events::Process<Events::ImportEventContext>(path, scene);
+            contextResult += Events::Process<Events::PostImportEventContext>(scene);
+
+            if (contextResult.GetResult() == Events::ProcessingResult::Success)
+            {
+                return Events::LoadingResult::AssetLoaded;
+            }
+            else
+            {
+                return Events::LoadingResult::AssetFailure;
+            }
+        }
+
+        void SceneImportRequestHandler::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
+        {
+            provided.emplace_back(AZ_CRC_CE("AssetImportRequestHandler"));
+        }
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.h b/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.h
new file mode 100644
index 0000000000..f59f197683
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.h
@@ -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
+ *
+ */
+
+#pragma once
+
+#include <SceneAPI/SceneCore/Components/BehaviorComponent.h>
+#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        struct SceneImporterSettings
+        {
+            AZ_TYPE_INFO(SceneImporterSettings, "{8BB6C7AD-BF99-44DC-9DA1-E7AD3F03DC10}");
+                
+            static void Reflect(AZ::ReflectContext* context);
+
+            AZStd::unordered_set<AZStd::string> m_supportedFileTypeExtensions;
+        };
+
+        class SceneImportRequestHandler
+            : public AZ::Component
+            , public Events::AssetImportRequestBus::Handler
+        {
+        public:
+            AZ_COMPONENT(SceneImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}");
+
+            ~SceneImportRequestHandler() override = default;
+
+            void Activate() override;
+            void Deactivate() override;
+            static void Reflect(ReflectContext* context);
+
+            void GetSupportedFileExtensions(AZStd::unordered_set<AZStd::string>& extensions) override;
+            Events::LoadingResult LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid,
+                RequestingApplication requester) override;
+
+            static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided);
+
+        private:
+
+            SceneImporterSettings m_settings;
+
+            static constexpr const char* SettingsFilename = "AssetImporterSettings.json";
+        };
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.cpp
new file mode 100644
index 0000000000..cd6ffb8b29
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.cpp
@@ -0,0 +1,251 @@
+/*
+ * 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/Casting/numeric_cast.h>
+#include <AzCore/Debug/Trace.h>
+#include <AzCore/Math/Transform.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/containers/queue.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzToolsFramework/Debug/TraceContext.h>
+#include <SceneAPI/SceneBuilder/SceneImporter.h>
+#include <SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <SceneAPI/SceneData/GraphData/TransformData.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            struct QueueNode
+            {
+                std::shared_ptr<SDKNode::NodeWrapper> m_node;
+                Containers::SceneGraph::NodeIndex m_parent;
+
+                QueueNode() = delete;
+                QueueNode(std::shared_ptr<SDKNode::NodeWrapper>&& node, Containers::SceneGraph::NodeIndex parent)
+                    : m_node(std::move(node))
+                    , m_parent(parent)
+                {
+                }
+            };
+
+            SceneImporter::SceneImporter()
+                : m_sceneSystem(new SceneSystem())
+            {
+                m_sceneWrapper = AZStd::make_unique<AssImpSDKWrapper::AssImpSceneWrapper>();
+                BindToCall(&SceneImporter::ImportProcessing);
+            }
+
+            void SceneImporter::Reflect(ReflectContext* context)
+            {
+                SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<SceneImporter, SceneCore::LoadingComponent>()->Version(2); // SPEC-5776
+                }
+            }
+
+            Events::ProcessingResult SceneImporter::ImportProcessing(Events::ImportEventContext& context)
+            {
+                m_sceneWrapper->Clear();
+
+                if (!m_sceneWrapper->LoadSceneFromFile(context.GetInputDirectory().c_str()))
+                {
+                    return Events::ProcessingResult::Failure;
+                }
+
+                typedef AZStd::function<bool(Containers::Scene & scene)> ConvertFunc;
+                ConvertFunc convertFunc;
+                m_sceneSystem->Set(m_sceneWrapper.get());
+                if (!azrtti_istypeof<AssImpSDKWrapper::AssImpSceneWrapper>(m_sceneWrapper.get()))
+                {
+                    return Events::ProcessingResult::Failure;
+                }
+
+                convertFunc = AZStd::bind(&SceneImporter::ConvertScene, this, AZStd::placeholders::_1);
+                
+                if (convertFunc(context.GetScene()))
+                {
+                    return Events::ProcessingResult::Success;
+                }
+                else
+                {
+                    return Events::ProcessingResult::Failure;
+                }
+            }
+
+            bool SceneImporter::ConvertScene(Containers::Scene& scene) const
+            {
+                std::shared_ptr<SDKNode::NodeWrapper> sceneRoot = m_sceneWrapper->GetRootNode();
+                if (!sceneRoot)
+                {
+                    return false;
+                }
+
+                const AssImpSDKWrapper::AssImpSceneWrapper* assImpSceneWrapper = azrtti_cast <AssImpSDKWrapper::AssImpSceneWrapper*>(m_sceneWrapper.get());
+
+                AZStd::pair<AssImpSDKWrapper::AssImpSceneWrapper::AxisVector, int32_t> upAxisAndSign = assImpSceneWrapper->GetUpVectorAndSign();
+
+                if (upAxisAndSign.second <= 0)
+                {
+                    AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Negative scene orientation is not a currently supported orientation.");
+                    return false;
+                }
+                switch (upAxisAndSign.first)
+                {
+                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::X:
+                    scene.SetOriginalSceneOrientation(Containers::Scene::SceneOrientation::XUp);
+                    break;
+                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Y:
+                    scene.SetOriginalSceneOrientation(Containers::Scene::SceneOrientation::YUp);
+                    break;
+                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Z:
+                    scene.SetOriginalSceneOrientation(Containers::Scene::SceneOrientation::ZUp);
+                    break;
+                default:
+                    AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unknown scene orientation, %d.", upAxisAndSign.first);
+                    AZ_Assert(false, "Unknown scene orientation, %d.", upAxisAndSign.first);
+                    break;
+                }
+
+                AZStd::queue<SceneBuilder::QueueNode> nodes;
+                nodes.emplace(AZStd::move(sceneRoot), scene.GetGraph().GetRoot());
+                RenamedNodesMap nodeNameMap;
+
+                while (!nodes.empty())
+                {
+                    SceneBuilder::QueueNode& node = nodes.front();
+                    AZ_Assert(node.m_node, "Empty asset importer node queued");
+                    if (!nodeNameMap.RegisterNode(node.m_node, scene.GetGraph(), node.m_parent))
+                    {
+                        AZ_TracePrintf(Utilities::ErrorWindow, "Failed to register asset importer node in name table.");
+                        // Skip this node since it could not be registered
+                        nodes.pop();
+                        continue;
+                    }
+                    AZStd::string nodeName = nodeNameMap.GetNodeName(node.m_node);
+                    SanitizeNodeName(nodeName);
+
+                    AZ_TraceContext("SceneAPI Node Name", nodeName);
+                    Containers::SceneGraph::NodeIndex newNode = scene.GetGraph().AddChild(node.m_parent, nodeName.c_str());
+
+                    AZ_Error(Utilities::ErrorWindow, newNode.IsValid(), "Failed to add Asset Importer node to scene graph");
+                    if (!newNode.IsValid())
+                    {
+                        continue;
+                    }
+
+                    AssImpNodeEncounteredContext sourceNodeEncountered(scene, newNode, *assImpSceneWrapper, *m_sceneSystem, nodeNameMap, *azrtti_cast<AZ::AssImpSDKWrapper::AssImpNodeWrapper*>(node.m_node.get()));
+                    Events::ProcessingResultCombiner nodeResult;
+                    nodeResult += Events::Process(sourceNodeEncountered);
+
+                    // If no importer created data, we still create an empty node that may eventually contain a transform
+                    if (sourceNodeEncountered.m_createdData.empty())
+                    {
+                        AZ_Assert(nodeResult.GetResult() != Events::ProcessingResult::Success,
+                            "Importers returned success but no data was created");
+                        AZStd::shared_ptr<DataTypes::IGraphObject> nullData(nullptr);
+                        sourceNodeEncountered.m_createdData.emplace_back(nullData);
+                        nodeResult += Events::ProcessingResult::Success;
+                    }
+
+                    // Create single node since only one piece of graph data was created
+                    if (sourceNodeEncountered.m_createdData.size() == 1)
+                    {
+                        AZ_Assert(nodeResult.GetResult() != Events::ProcessingResult::Ignored,
+                            "An importer created data, but did not return success");
+                        if (nodeResult.GetResult() == Events::ProcessingResult::Failure)
+                        {
+                            AZ_TracePrintf(Utilities::ErrorWindow, "One or more importers failed to create data.");
+                        }
+
+                        AssImpSceneDataPopulatedContext dataProcessed(sourceNodeEncountered,
+                            sourceNodeEncountered.m_createdData[0], nodeName.c_str());
+                        Events::ProcessingResult result = AddDataNodeWithContexts(dataProcessed);
+                        if (result != Events::ProcessingResult::Failure)
+                        {
+                            newNode = dataProcessed.m_currentGraphPosition;
+                        }
+                    }
+                    // Create an empty parent node and place all data under it. The remaining
+                    // tree will be built off of this as the logical parent
+                    else
+                    {
+                        AZ_Assert(nodeResult.GetResult() != Events::ProcessingResult::Ignored,
+                            "%i importers created data, but did not return success",
+                            sourceNodeEncountered.m_createdData.size());
+                        if (nodeResult.GetResult() == Events::ProcessingResult::Failure)
+                        {
+                            AZ_TracePrintf(Utilities::ErrorWindow, "One or more importers failed to create data.");
+                        }
+
+                        size_t offset = nodeName.length();
+                        for (size_t i = 0; i < sourceNodeEncountered.m_createdData.size(); ++i)
+                        {
+                            nodeName += '_';
+                            nodeName += AZStd::to_string(aznumeric_cast<AZ::u64>(i + 1));
+
+                            Containers::SceneGraph::NodeIndex subNode =
+                                scene.GetGraph().AddChild(newNode, nodeName.c_str());
+                            AZ_Assert(subNode.IsValid(), "Failed to create new scene sub node");
+                            AssImpSceneDataPopulatedContext dataProcessed(sourceNodeEncountered,
+                                sourceNodeEncountered.m_createdData[i], nodeName);
+                            dataProcessed.m_currentGraphPosition = subNode;
+                            AddDataNodeWithContexts(dataProcessed);
+
+                            // Remove the temporary extension again.
+                            nodeName.erase(offset, nodeName.length() - offset);
+                        }
+                    }
+
+                    AZ_Assert(nodeResult.GetResult() == Events::ProcessingResult::Success,
+                        "No importers successfully added processed scene data.");
+                    AZ_Assert(newNode != node.m_parent,
+                        "Failed to update current graph position during data processing.");
+
+                    int childCount = node.m_node->GetChildCount();
+                    for (int i = 0; i < childCount; ++i)
+                    {
+                        std::shared_ptr<AssImpSDKWrapper::AssImpNodeWrapper> child = std::make_shared<AssImpSDKWrapper::AssImpNodeWrapper>(node.m_node->GetChild(i)->GetAssImpNode());
+                        if (child)
+                        {
+                            nodes.emplace(AZStd::move(child), newNode);
+                        }
+                    }
+
+                    nodes.pop();
+                };
+
+                Events::ProcessingResult result = Events::Process<AssImpFinalizeSceneContext>(scene, *assImpSceneWrapper, *m_sceneSystem, nodeNameMap);
+                if (result == Events::ProcessingResult::Failure)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            void SceneImporter::SanitizeNodeName(AZStd::string& nodeName) const
+            {
+                // Replace % with something else so it is safe for use in printfs.
+                AZStd::replace(nodeName.begin(), nodeName.end(), '%', '_');
+            }
+
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.h b/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.h
new file mode 100644
index 0000000000..669ae7abdd
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.h
@@ -0,0 +1,51 @@
+/*
+ * 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/smart_ptr/unique_ptr.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
+#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
+#include <SceneAPI/SceneCore/Events/ImportEventContext.h>
+#include <SceneAPI/SceneBuilder/SceneSystem.h>
+#include <SceneAPI/SDKWrapper/SceneWrapper.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace Containers
+        {
+            class Scene;
+        }
+
+        namespace SceneBuilder
+        {
+            class SceneImporter
+                : public SceneCore::LoadingComponent
+            {
+            public:
+                AZ_COMPONENT(SceneImporter, "{D5EE21B6-8B73-45BF-B711-31346E0BEDB3}", SceneCore::LoadingComponent);
+
+                SceneImporter();
+                ~SceneImporter() override = default;
+
+                static void Reflect(ReflectContext* context);
+
+                Events::ProcessingResult ImportProcessing(Events::ImportEventContext& context);
+
+            protected:
+                bool ConvertScene(Containers::Scene& scene) const;
+                void SanitizeNodeName(AZStd::string& nodeName) const;
+
+                AZStd::unique_ptr<SDKScene::SceneWrapperBase> m_sceneWrapper;
+                AZStd::shared_ptr<SceneSystem> m_sceneSystem;
+            };
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.cpp b/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.cpp
new file mode 100644
index 0000000000..8adb0ac0c0
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.cpp
@@ -0,0 +1,153 @@
+/*
+ * 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/Math/Vector3.h>
+#include <SceneAPI/SceneBuilder/SceneSystem.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
+#include <assimp/scene.h>
+
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        SceneSystem::SceneSystem() :
+            m_unitSizeInMeters(1.0f),
+            m_originalUnitSizeInMeters(1.0f),
+            m_adjustTransform(nullptr),
+            m_adjustTransformInverse(nullptr)
+        {
+        }
+
+        void SceneSystem::Set(const SDKScene::SceneWrapperBase* scene)
+        {
+            // Get unit conversion factor to meter.
+            if (!azrtti_istypeof<AssImpSDKWrapper::AssImpSceneWrapper>(scene))
+            {
+                return;
+            }
+
+            const AssImpSDKWrapper::AssImpSceneWrapper* assImpScene = azrtti_cast<const AssImpSDKWrapper::AssImpSceneWrapper*>(scene);
+
+            // If either meta data piece is not available, the default of 1 will be used.
+            assImpScene->GetAssImpScene()->mMetaData->Get("UnitScaleFactor", m_unitSizeInMeters);
+            assImpScene->GetAssImpScene()->mMetaData->Get("OriginalUnitScaleFactor", m_originalUnitSizeInMeters);
+
+            /* Conversion factor for converting from centimeters to meters */
+            m_unitSizeInMeters = m_unitSizeInMeters * .01f;
+
+            AZStd::pair<AssImpSDKWrapper::AssImpSceneWrapper::AxisVector, int32_t> upAxisAndSign = assImpScene->GetUpVectorAndSign();
+
+            if (upAxisAndSign.second <= 0)
+            {
+                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Negative scene orientation is not a currently supported orientation.");
+                return;
+            }
+
+            AZStd::pair<AssImpSDKWrapper::AssImpSceneWrapper::AxisVector, int32_t> frontAxisAndSign = assImpScene->GetFrontVectorAndSign();
+
+            if (upAxisAndSign.first != AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Z &&
+                upAxisAndSign.first != AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Unknown)
+            {
+                AZ::Matrix4x4 currentCoordMatrix = AZ::Matrix4x4::CreateIdentity();
+                //(UpVector = +Z, FrontVector = +Y, CoordSystem = -X(RightHanded))
+                AZ::Matrix4x4 targetCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
+                    AZ::Vector4(-1, 0, 0, 0),
+                    AZ::Vector4(0, 0, 1, 0),
+                    AZ::Vector4(0, 1, 0, 0),
+                    AZ::Vector4(0, 0, 0, 1));
+
+                switch (upAxisAndSign.first)
+                {
+                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::X: {
+                    if (frontAxisAndSign.second == 1)
+                    {
+                        currentCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
+                            AZ::Vector4(0, -1, 0, 0),
+                            AZ::Vector4(1, 0, 0, 0),
+                            AZ::Vector4(0, 0, 1, 0),
+                            AZ::Vector4(0, 0, 0, 1));
+                    }
+                    else
+                    {
+                        currentCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
+                            AZ::Vector4(0, 1, 0, 0),
+                            AZ::Vector4(1, 0, 0, 0),
+                            AZ::Vector4(0, 0, -1, 0),
+                            AZ::Vector4(0, 0, 0, 1));
+                    }
+                }
+                break;
+                case AssImpSDKWrapper::AssImpSceneWrapper::AxisVector::Y: {
+                    if (frontAxisAndSign.second == 1)
+                    {
+                        currentCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
+                            AZ::Vector4(1, 0, 0, 0),
+                            AZ::Vector4(0, 1, 0, 0),
+                            AZ::Vector4(0, 0, 1, 0),
+                            AZ::Vector4(0, 0, 0, 1));
+                    }
+                    else
+                    {
+                        currentCoordMatrix = AZ::Matrix4x4::CreateFromColumns(
+                            AZ::Vector4(-1, 0, 0, 0),
+                            AZ::Vector4(0, 1, 0, 0),
+                            AZ::Vector4(0, 0, -1, 0),
+                            AZ::Vector4(0, 0, 0, 1));
+                    }
+                }
+                break;
+                }
+                AZ::Matrix4x4 inverse = currentCoordMatrix.GetInverseTransform();
+                AZ::Matrix4x4 adjustmatrix = targetCoordMatrix * currentCoordMatrix.GetInverseTransform();
+                m_adjustTransform.reset(new DataTypes::MatrixType(AssImpSDKWrapper::AssImpTypeConverter::ToTransform(adjustmatrix)));
+                m_adjustTransformInverse.reset(new DataTypes::MatrixType(m_adjustTransform->GetInverseFull()));
+            }
+        }
+
+        void SceneSystem::SwapVec3ForUpAxis(Vector3& swapVector) const
+        {
+            if (m_adjustTransform)
+            {
+                swapVector = *m_adjustTransform * swapVector;
+            }
+        }
+
+        void SceneSystem::SwapTransformForUpAxis(DataTypes::MatrixType& inOutTransform) const
+        {
+            if (m_adjustTransform)
+            {
+                inOutTransform = (*m_adjustTransform * inOutTransform) * *m_adjustTransformInverse;
+            }
+        }
+
+        void SceneSystem::ConvertUnit(Vector3& scaleVector) const
+        {
+            scaleVector *= m_unitSizeInMeters;
+        }
+
+        void SceneSystem::ConvertUnit(DataTypes::MatrixType& inOutTransform) const
+        {
+            Vector3 translation = inOutTransform.GetTranslation();
+            translation *= m_unitSizeInMeters;
+            inOutTransform.SetTranslation(translation);
+        }
+
+        void SceneSystem::ConvertBoneUnit(DataTypes::MatrixType& inOutTransform) const
+        {
+
+
+            // Need to scale translation explicitly as MultiplyByScale won't change the translation component
+            // and we need to convert to meter unit
+            Vector3 translation = inOutTransform.GetTranslation();
+            translation *= m_unitSizeInMeters;
+            inOutTransform.SetTranslation(translation);
+        }
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.h b/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.h
new file mode 100644
index 0000000000..48c5dd152c
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.h
@@ -0,0 +1,56 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <SceneAPI/SceneBuilder/SceneBuilderConfiguration.h>
+#include <SceneAPI/SceneCore/DataTypes/MatrixType.h>
+
+namespace AZ
+{
+    class Vector3;
+
+    namespace SDKScene
+    {
+        class SceneWrapperBase;
+    }
+
+    namespace SceneAPI
+    {
+        class SCENE_BUILDER_API SceneSystem
+        {
+        public:
+            SceneSystem();
+
+            void Set(const SDKScene::SceneWrapperBase* sceneWrapper);
+            void SwapVec3ForUpAxis(Vector3& swapVector) const;
+            void SwapTransformForUpAxis(DataTypes::MatrixType& inOutTransform) const;
+            void ConvertUnit(Vector3& scaleVector) const;
+            void ConvertUnit(DataTypes::MatrixType& inOutTransform) const;
+            void ConvertBoneUnit(DataTypes::MatrixType& inOutTransform) const;
+
+            //! Get effect unit size in meters of this scene, internally FBX saves it in the following manner
+            //! GlobalSettings:  {
+            //!     P : "UnitScaleFactor", "double", "Number", "", 2.54
+            float GetUnitSizeInMeters() const { return m_unitSizeInMeters; }
+            //! Get original unit size in meters of this scene, internally FBX saves it in the following manner
+            //! GlobalSettings:  {
+            //!     P : "OriginalUnitScaleFactor", "double", "Number", "", 2.54
+            float GetOriginalUnitSizeInMeters() const { return m_originalUnitSizeInMeters; }
+
+        protected:
+            float m_unitSizeInMeters = 1;
+            float m_originalUnitSizeInMeters = 1;
+
+            AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+            AZStd::unique_ptr<DataTypes::MatrixType> m_adjustTransform;
+            AZStd::unique_ptr<DataTypes::MatrixType> m_adjustTransformInverse;
+            AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+        };
+    }
+};
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/SceneImporterUtilitiesTests.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/SceneImporterUtilitiesTests.cpp
new file mode 100644
index 0000000000..f26ae4f5e3
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/SceneImporterUtilitiesTests.cpp
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzTest/AzTest.h>
+#include <SceneAPI/SceneBuilder/Importers/ImporterUtilities.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneCore/DataTypes/IGraphObject.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneData/GraphData/BoneData.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_EmptySceneGraphs_ReturnsTrue)
+            {
+                Containers::SceneGraph lhsGraph;
+                Containers::SceneGraph rhsGraph;
+
+                bool sceneGraphsEqual =
+                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
+
+                EXPECT_TRUE(sceneGraphsEqual);
+            }
+
+            TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeBothNull_ReturnsTrue)
+            {
+                Containers::SceneGraph lhsGraph;
+                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild");
+                Containers::SceneGraph rhsGraph;
+                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild");
+
+                bool sceneGraphsEqual =
+                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
+
+                EXPECT_TRUE(sceneGraphsEqual);
+            }
+
+            TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeSameType_ReturnsTrue)
+            {
+                Containers::SceneGraph lhsGraph;
+                AZStd::shared_ptr<DataTypes::IGraphObject> lhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
+                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild", AZStd::move(lhsData));
+                Containers::SceneGraph rhsGraph;
+                AZStd::shared_ptr<DataTypes::IGraphObject> rhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
+                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild", AZStd::move(rhsData));
+
+                bool sceneGraphsEqual =
+                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
+
+                EXPECT_TRUE(sceneGraphsEqual);
+            }
+
+            TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeOneNull_ReturnsFalse)
+            {
+                Containers::SceneGraph lhsGraph;
+                AZStd::shared_ptr<DataTypes::IGraphObject> lhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
+                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild", AZStd::move(lhsData));
+                Containers::SceneGraph rhsGraph;
+                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild");
+
+                bool sceneGraphsEqual =
+                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
+
+                EXPECT_FALSE(sceneGraphsEqual);
+            }
+
+            TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeDifferentTypes_ReturnsFalse)
+            {
+                Containers::SceneGraph lhsGraph;
+                AZStd::shared_ptr<DataTypes::IGraphObject> lhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
+                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild", AZStd::move(lhsData));
+                Containers::SceneGraph rhsGraph;
+                AZStd::shared_ptr<DataTypes::IGraphObject> rhsData = AZStd::make_shared<SceneData::GraphData::BoneData>();
+                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild", AZStd::move(rhsData));
+
+                bool sceneGraphsEqual =
+                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
+
+                EXPECT_FALSE(sceneGraphsEqual);
+            }
+
+            TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameOneEmptyOneSingleNode_ReturnsFalse)
+            {
+                Containers::SceneGraph lhsGraph;
+                AZStd::shared_ptr<DataTypes::IGraphObject> lhsData = AZStd::make_shared<SceneData::GraphData::MeshData>();
+                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild", AZStd::move(lhsData));
+                Containers::SceneGraph rhsGraph;
+
+                bool sceneGraphsEqual =
+                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
+
+                EXPECT_FALSE(sceneGraphsEqual);
+            }
+
+            TEST(SceneImpoterUtilityTests, AreSceneGraphsEqual_DifferentNamesSingleNodeBothNull_ReturnsFalse)
+            {
+                Containers::SceneGraph lhsGraph;
+                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild");
+                Containers::SceneGraph rhsGraph;
+                rhsGraph.AddChild(rhsGraph.GetRoot(), "differentName");
+
+                bool sceneGraphsEqual =
+                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
+
+                EXPECT_FALSE(sceneGraphsEqual);
+            }
+
+            TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SecondGraphExtraChild_ReturnsFalse)
+            {
+                Containers::SceneGraph lhsGraph;
+                lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild");
+                lhsGraph.AddChild(lhsGraph.GetRoot(), "extraTestChild");
+                Containers::SceneGraph rhsGraph;
+                rhsGraph.AddChild(rhsGraph.GetRoot(), "testChild");
+
+                bool sceneGraphsEqual =
+                    (AreSceneGraphsEqual(lhsGraph, rhsGraph) && AreSceneGraphsEqual(rhsGraph, lhsGraph));
+
+                EXPECT_FALSE(sceneGraphsEqual);
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp
new file mode 100644
index 0000000000..6b1279cccc
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzTest/AzTest.h>
+#include <SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h>
+#include <SceneAPI/SceneCore/Containers/SceneGraph.h>
+#include <SceneAPI/SceneCore/DataTypes/IGraphObject.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneBuilder
+        {
+            TEST(RenamedNodesMapTests, SanitizeNodeName_ValidNameProvided_ReturnsFalseAndNameUnchanged)
+            {
+                Containers::SceneGraph graph;
+                AZStd::string name = "ValidName";
+
+                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot());
+
+                EXPECT_FALSE(result);
+                EXPECT_STREQ("ValidName", name.c_str());
+            }
+
+            TEST(RenamedNodesMapTests, SanitizeNodeName_NameWithInvalidCharacter_ReturnsTrueAndNameChanged)
+            {
+                Containers::SceneGraph graph;
+                AZStd::string check = "Valid";
+                check += Containers::SceneGraph::GetNodeSeperationCharacter();
+                check += "Name";
+                AZStd::string name = check;
+
+                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot());
+
+                EXPECT_TRUE(result);
+                EXPECT_STRNE(check.c_str(), name.c_str());
+            }
+
+            TEST(RenamedNodesMapTests, SanitizeNodeName_BlankName_ReturnsTrueAndNameSetToDefault)
+            {
+                Containers::SceneGraph graph;
+                AZStd::string name;
+
+                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot(), "Default");
+
+                EXPECT_TRUE(result);
+                EXPECT_STREQ("Default", name.c_str());
+            }
+
+            TEST(RenamedNodesMapTests, SanitizeNodeName_SingleCollision_ReturnsTrueAndNameHasAppendixOf1)
+            {
+                Containers::SceneGraph graph;
+                graph.AddChild(graph.GetRoot(), "Child");
+                AZStd::string name = "Child";
+
+                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot());
+
+                EXPECT_TRUE(result);
+                EXPECT_STREQ("Child_1", name.c_str());
+            }
+
+            TEST(RenamedNodesMapTests, SanitizeNodeName_MultipleCollisions_ReturnsTrueAndNameHasAppendixOf2)
+            {
+                Containers::SceneGraph graph;
+                auto child = graph.AddChild(graph.GetRoot(), "Child");
+                graph.AddSibling(child, "Child_1");
+                AZStd::string name = "Child";
+
+                bool result = RenamedNodesMap::SanitizeNodeName(name, graph, graph.GetRoot());
+
+                EXPECT_TRUE(result);
+                EXPECT_STREQ("Child_2", name.c_str());
+            }
+        } // namespace SceneBuilder
+    } // namespace SceneAPI
+} // namespace AZ
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.cpp
new file mode 100644
index 0000000000..5ffde190e9
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.cpp
@@ -0,0 +1,180 @@
+/*
+ * 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/Casting/numeric_cast.h>
+#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h>
+#include <fbxsdk.h>
+#include <AzCore/Casting/lossy_cast.h>
+#include <AzCore/Casting/numeric_cast.h>
+
+namespace AZ
+{
+    namespace FbxSDKWrapper
+    {
+        TestFbxMesh::TestFbxMesh()
+            : m_vertexControlPoints(nullptr)
+            , m_vertexCount(0)
+            , m_polygonVertexIndices(nullptr)
+            , m_materialIndices(new FbxLayerElementArrayTemplate<int>(eFbxInt))
+            , m_uvElements(FbxGeometryElementUV::Create(nullptr, "TestElements_UV"))
+            , m_vertexColorElements(FbxGeometryElementVertexColor::Create(nullptr, "TestElements_VertexColors"))
+            , m_expectedVertexCount(0)
+        {
+        }
+
+        int TestFbxMesh::GetDeformerCount() const
+        {
+            // For current test need, only have one skin for the mesh
+            return m_skin ? 1 : 0;
+        }
+
+        AZStd::shared_ptr<const FbxSkinWrapper> TestFbxMesh::GetSkin(int index) const
+        {
+            // For current test need, only have one skin for the mesh
+            return m_skin;
+        }
+
+        bool TestFbxMesh::GetMaterialIndices(FbxLayerElementArrayTemplate<int>** lockableArray) const
+        {
+            *lockableArray = m_materialIndices;
+            return true;
+        }
+
+        int TestFbxMesh::GetControlPointsCount() const
+        {
+            return static_cast<int>(m_vertexCount);
+        }
+
+        AZStd::vector<Vector3> TestFbxMesh::GetControlPoints() const
+        {
+            return m_vertexControlPoints;
+        }
+
+        int TestFbxMesh::GetPolygonCount() const
+        {
+            return static_cast<int>(m_polygonInfo.size());
+        }
+
+        int TestFbxMesh::GetPolygonSize(int polygonIndex) const
+        {
+            if (m_polygonInfo.find(polygonIndex) != m_polygonInfo.end())
+            {
+                return aznumeric_caster(m_polygonInfo.find(polygonIndex)->second.m_vertexCount);
+            }
+            return -1;
+        }
+
+        int* TestFbxMesh::GetPolygonVertices() const
+        {
+            return m_polygonVertexIndices;
+        }
+
+        int TestFbxMesh::GetPolygonVertexIndex(int polygonIndex) const
+        {
+            if (m_polygonInfo.find(polygonIndex) != m_polygonInfo.end())
+            {
+                return aznumeric_caster(m_polygonInfo.find(polygonIndex)->second.m_startVertexIndex);
+            }
+            return -1;
+        }
+
+        FbxUVWrapper TestFbxMesh::GetElementUV(int index)
+        {
+            (void)index;
+            return m_uvElements;
+        }
+
+        int TestFbxMesh::GetElementUVCount() const
+        {
+            return 1;
+        }
+
+        FbxVertexColorWrapper TestFbxMesh::GetElementVertexColor(int index)
+        {
+            (void)index;
+            return m_vertexColorElements;
+        }
+
+        int TestFbxMesh::GetElementVertexColorCount() const
+        {
+            return 1;
+        }
+
+        bool TestFbxMesh::GetPolygonVertexNormal(int polyIndex, int vertexIndex, Vector3& normal) const
+        {
+            normal = Vector3(1.0f, 0.0f, 0.0f);
+            return true;
+        }
+
+        void TestFbxMesh::CreateMesh(std::vector<AZ::Vector3>& points, std::vector<std::vector<int> >& polygonVertexIndices)
+        {
+            m_vertexControlPoints.clear();
+            m_materialIndices->Clear();
+            m_polygonInfo.clear();
+
+            // Create fbx control point (position) data, and associated material index data
+            m_vertexCount = aznumeric_caster(points.size());
+            m_vertexControlPoints.reserve(points.size());
+            for (unsigned int i = 0; i < points.size(); ++i)
+            {
+                m_vertexControlPoints.push_back(Vector3(points[i].GetX(), points[i].GetY(), points[i].GetZ()));
+                m_materialIndices->Add(i);
+            }
+
+            // Create fbx face data
+            m_expectedVertexCount = 0;
+            for (const std::vector<int>& onePolygonIndices : polygonVertexIndices)
+            {
+                for (const int& index : onePolygonIndices)
+                {
+                    m_expectedVertexCount++;
+                }
+            }
+            if (m_polygonVertexIndices)
+            {
+                delete m_polygonVertexIndices;
+            }
+            m_polygonVertexIndices = new int[m_expectedVertexCount];
+            size_t i = 0;
+            for (const std::vector<int>& onePolygonIndices : polygonVertexIndices)
+            {
+                m_polygonInfo.insert(std::make_pair<int, TestFbxPolygon>(aznumeric_caster(m_polygonInfo.size()),
+                        TestFbxPolygon(i, aznumeric_caster(onePolygonIndices.size()))));
+                for (const int& index : onePolygonIndices)
+                {
+                    m_polygonVertexIndices[i] = index;
+                    i++;
+                }
+            }
+        }
+
+        void TestFbxMesh::SetSkin(const AZStd::shared_ptr<FbxSkinWrapper>& skin)
+        {
+            m_skin = skin;
+        }
+
+        void TestFbxMesh::CreateExpectMeshInfo(std::vector<std::vector<int> >& expectedFaceVertexIndices)
+        {
+            m_expectedFaceVertexIndices = expectedFaceVertexIndices;
+        }
+
+        size_t TestFbxMesh::GetExpectedVetexCount() const
+        {
+            return m_expectedVertexCount;
+        }
+
+        size_t TestFbxMesh::GetExpectedFaceCount() const
+        {
+            return m_expectedFaceVertexIndices.size();
+        }
+
+        AZ::Vector3 TestFbxMesh::GetExpectedFaceVertexPosition(unsigned int faceIndex, unsigned int vertexIndex) const
+        {
+            return m_vertexControlPoints[m_expectedFaceVertexIndices[faceIndex][vertexIndex]];
+        }
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.h b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.h
new file mode 100644
index 0000000000..077e387e08
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.h
@@ -0,0 +1,85 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <vector>
+#include <unordered_map>
+#include <AzCore/Math/Vector3.h>
+#include <SceneAPI/FbxSDKWrapper/FbxMeshWrapper.h>
+#include <SceneAPI/FbxSDKWrapper/FbxSkinWrapper.h>
+
+namespace AZ
+{
+    namespace FbxSDKWrapper
+    {
+        struct TestFbxPolygon
+        {
+            size_t m_startVertexIndex;
+            size_t m_vertexCount;
+
+            TestFbxPolygon(size_t startVertexIndex, size_t vertexCount)
+                : m_startVertexIndex(startVertexIndex)
+                , m_vertexCount(vertexCount)
+            {
+            }
+        };
+
+        // TestFbxMesh
+        //      FbxMesh Test Data creation
+        class TestFbxMesh
+            : public FbxMeshWrapper
+        {
+        public:
+            TestFbxMesh();
+            ~TestFbxMesh() override = default;
+
+            int GetDeformerCount() const override;
+            AZStd::shared_ptr<const FbxSkinWrapper> GetSkin(int index) const override;
+            bool GetMaterialIndices(FbxLayerElementArrayTemplate<int>** lockableArray) const override;
+
+            int GetControlPointsCount() const;
+            AZStd::vector<Vector3> GetControlPoints() const override;
+
+            int GetPolygonCount() const override;
+            int GetPolygonSize(int polygonIndex) const override;
+            int* GetPolygonVertices() const override;
+            int GetPolygonVertexIndex(int polygonIndex) const;
+
+            FbxUVWrapper GetElementUV(int index = 0) override;
+            int GetElementUVCount() const override;
+            FbxVertexColorWrapper GetElementVertexColor(int index = 0) override;
+            int GetElementVertexColorCount() const override;
+
+            bool GetPolygonVertexNormal(int polyIndex, int vertexIndex, Vector3& normal) const override;
+
+            // Create test data APIs
+            void CreateMesh(std::vector<AZ::Vector3>& points, std::vector<std::vector<int> >& polygonVertexIndices);
+            void CreateExpectMeshInfo(std::vector<std::vector<int> >& expectedFaceVertexIndices);
+            void SetSkin(const AZStd::shared_ptr<FbxSkinWrapper>& skin);
+
+            size_t GetExpectedVetexCount() const;
+            size_t GetExpectedFaceCount() const;
+            AZ::Vector3 GetExpectedFaceVertexPosition(unsigned int faceIndex, unsigned int vertexIndex) const;
+
+        protected:
+            AZStd::vector<Vector3> m_vertexControlPoints; // vertex positions
+            size_t m_vertexCount;
+            int* m_polygonVertexIndices; // store all polygons' vertex indices in sequence. Each index maps to a control point.
+            FbxLayerElementArrayTemplate<int>* m_materialIndices;
+            std::unordered_map<int, TestFbxPolygon> m_polygonInfo;
+
+            FbxUVWrapper m_uvElements;
+            FbxVertexColorWrapper m_vertexColorElements;
+            AZStd::shared_ptr<FbxSkinWrapper> m_skin;
+
+            // Expected converted data
+            unsigned int m_expectedVertexCount;
+            std::vector<std::vector<int> > m_expectedFaceVertexIndices;
+        };
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.cpp
new file mode 100644
index 0000000000..8824070ff4
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.cpp
@@ -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
+ *
+ */
+#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h>
+
+namespace AZ
+{
+    namespace FbxSDKWrapper
+    {
+        const std::shared_ptr<FbxMeshWrapper> TestFbxNode::GetMesh() const
+        {
+            return m_testFbxMesh;
+        }
+
+        const char* TestFbxNode::GetName() const
+        {
+            return m_name.c_str();
+        }
+
+        void TestFbxNode::SetMesh(std::shared_ptr<TestFbxMesh> testFbxMesh)
+        {
+            m_testFbxMesh = testFbxMesh;
+        }
+
+        void TestFbxNode::SetName(const char* name)
+        {
+            m_name = name;
+        }
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.h b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.h
new file mode 100644
index 0000000000..8ba9d6f036
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.h
@@ -0,0 +1,36 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <SceneAPI/FbxSDKWrapper/FbxNodeWrapper.h>
+#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h>
+
+namespace AZ
+{
+    namespace FbxSDKWrapper
+    {
+        // TestFbxNode
+        //      FbxNode Test Data creation
+        class TestFbxNode
+            : public FbxNodeWrapper
+        {
+        public:
+            ~TestFbxNode() override = default;
+
+            const std::shared_ptr<FbxMeshWrapper> GetMesh() const override;
+            const char* GetName() const override;
+
+            void SetMesh(std::shared_ptr<TestFbxMesh> testFbxMesh);
+            void SetName(const char* name);
+
+        protected:
+            std::shared_ptr<TestFbxMesh> m_testFbxMesh;
+            AZStd::string m_name;
+        };
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.cpp
new file mode 100644
index 0000000000..dbd3c175b7
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.cpp
@@ -0,0 +1,90 @@
+/*
+ * 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/Casting/numeric_cast.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.h>
+#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h>
+
+namespace AZ
+{
+    namespace FbxSDKWrapper
+    {
+        const char* TestFbxSkin::GetName() const
+        {
+            return m_name.c_str();
+        }
+
+        int TestFbxSkin::GetClusterCount() const
+        {
+            return aznumeric_caster(m_links.size());
+        }
+
+        int TestFbxSkin::GetClusterControlPointIndicesCount(int index) const
+        {
+            return aznumeric_caster(m_controlPointIndices[index].size());
+        }
+
+        int TestFbxSkin::GetClusterControlPointIndex(int clusterIndex, int pointIndex) const
+        {
+            return m_controlPointIndices[clusterIndex][pointIndex];
+        }
+
+        double TestFbxSkin::GetClusterControlPointWeight(int clusterIndex, int pointIndex) const
+        {
+            return m_weights[clusterIndex][pointIndex];
+        }
+
+        AZStd::shared_ptr<const FbxNodeWrapper> TestFbxSkin::GetClusterLink(int index) const
+        {
+            return m_links[index];
+        }
+
+        void TestFbxSkin::SetName(const char* name)
+        {
+            m_name = name;
+        }
+
+        void TestFbxSkin::CreateSkinWeightData(AZStd::vector<AZStd::string>& boneNames, AZStd::vector<AZStd::vector<double>>& weights, AZStd::vector<AZStd::vector<int>>& controlPointIndices)
+        {
+            m_links.resize(boneNames.size());
+            for (size_t linkIndex = 0; linkIndex < boneNames.size(); ++linkIndex)
+            {
+                m_links[linkIndex] = AZStd::make_shared<FbxSDKWrapper::TestFbxNode>();
+                m_links[linkIndex]->SetName(boneNames[linkIndex].c_str());
+            }
+            m_weights = weights;
+            m_controlPointIndices = controlPointIndices;
+        }
+
+        void TestFbxSkin::CreateExpectSkinWeightData(AZStd::vector<AZStd::vector<int>>& boneIds, AZStd::vector<AZStd::vector<float>>& weights)
+        {
+            m_expectedBoneIds = boneIds;
+            m_expectedWeights = weights;
+        }
+
+        size_t TestFbxSkin::GetExpectedVertexCount() const
+        {
+            return m_expectedBoneIds.size();
+        }
+
+        size_t TestFbxSkin::GetExpectedLinkCount(size_t vertexIndex) const
+        {
+            return m_expectedBoneIds[vertexIndex].size();
+        }
+
+        int TestFbxSkin::GetExpectedSkinLinkBoneId(size_t vertexIndex, size_t linkIndex) const
+        {
+            return m_expectedBoneIds[vertexIndex][linkIndex];
+        }
+
+        float TestFbxSkin::GetExpectedSkinLinkWeight(size_t vertextIndex, size_t linkIndex) const
+        {
+            return m_expectedWeights[vertextIndex][linkIndex];
+        }
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.h b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.h
new file mode 100644
index 0000000000..6c741479a8
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.h
@@ -0,0 +1,49 @@
+#pragma once
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <SceneAPI/FbxSDKWrapper/FbxSkinWrapper.h>
+#include <SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h>
+
+namespace AZ
+{
+    namespace FbxSDKWrapper
+    {
+        class TestFbxSkin
+            : public FbxSkinWrapper
+        {
+        public:
+            ~TestFbxSkin() override = default;
+
+            const char* GetName() const override;
+            int GetClusterCount() const override;
+            int GetClusterControlPointIndicesCount(int index) const override;
+            int GetClusterControlPointIndex(int clusterIndex, int pointIndex) const override;
+            double GetClusterControlPointWeight(int clusterIndex, int pointIndex) const override;
+            AZStd::shared_ptr<const FbxNodeWrapper> GetClusterLink(int index) const override;
+
+            void SetName(const char* name);
+            void CreateSkinWeightData(AZStd::vector<AZStd::string>& boneNames, AZStd::vector<AZStd::vector<double>>& weights, AZStd::vector<AZStd::vector<int>>& controlPointIndices);
+            void CreateExpectSkinWeightData(AZStd::vector<AZStd::vector<int>>& boneIds, AZStd::vector<AZStd::vector<float>>& weights);
+
+            size_t GetExpectedVertexCount() const;
+            size_t GetExpectedLinkCount(size_t vertexIndex) const;
+            int GetExpectedSkinLinkBoneId(size_t vertexIndex, size_t linkIndex) const;
+            float GetExpectedSkinLinkWeight(size_t vertexIndex, size_t linkIndex) const;
+
+        protected:
+            AZStd::string m_name;
+            AZStd::vector<AZStd::shared_ptr<FbxSDKWrapper::TestFbxNode>> m_links;
+            AZStd::vector<AZStd::vector<double>> m_weights;
+            AZStd::vector<AZStd::vector<int>> m_controlPointIndices;
+
+            AZStd::vector<AZStd::vector<int>> m_expectedBoneIds;
+            AZStd::vector<AZStd::vector<float>> m_expectedWeights;
+        };
+    }
+}
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Tests/TestsMain.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestsMain.cpp
new file mode 100644
index 0000000000..4b49c0ead8
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestsMain.cpp
@@ -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
+ *
+ */
+
+#include <AzTest/AzTest.h>
+
+#include <AzCore/Module/DynamicModuleHandle.h>
+#include <AzCore/Memory/SystemAllocator.h>
+
+class SceneBuilderTestEnvironment
+    : public AZ::Test::ITestEnvironment
+{
+public:
+    virtual ~SceneBuilderTestEnvironment()
+    {}
+
+protected:
+    void SetupEnvironment() override
+    {
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
+
+        sceneCoreModule = AZ::DynamicModuleHandle::Create("SceneCore");
+        AZ_Assert(sceneCoreModule, "SceneBuilder unit tests failed to create SceneCore module.");
+        bool loaded = sceneCoreModule->Load(false);
+        AZ_Assert(loaded, "SceneBuilder unit tests failed to load SceneCore module.");
+        auto init = sceneCoreModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
+        AZ_Assert(init, "SceneBuilder unit tests failed to find the initialization function the SceneCore module.");
+        (*init)(AZ::Environment::GetInstance());
+
+        sceneDataModule = AZ::DynamicModuleHandle::Create("SceneData");
+        AZ_Assert(sceneDataModule, "SceneData unit tests failed to create SceneData module.");
+        loaded = sceneDataModule->Load(false);
+        AZ_Assert(loaded, "SceneBuilder unit tests failed to load SceneData module.");
+        init = sceneDataModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
+        AZ_Assert(init, "SceneBuilder unit tests failed to find the initialization function the SceneData module.");
+        (*init)(AZ::Environment::GetInstance());
+    }
+
+    void TeardownEnvironment() override
+    {
+        auto uninit = sceneDataModule->GetFunction<AZ::UninitializeDynamicModuleFunction>(AZ::UninitializeDynamicModuleFunctionName);
+        AZ_Assert(uninit, "SceneBuilder unit tests failed to find the uninitialization function the SceneData module.");
+        (*uninit)();
+        sceneDataModule.reset();
+        
+        uninit = sceneCoreModule->GetFunction<AZ::UninitializeDynamicModuleFunction>(AZ::UninitializeDynamicModuleFunctionName);
+        AZ_Assert(uninit, "SceneBuilder unit tests failed to find the uninitialization function the SceneCore module.");
+        (*uninit)();
+        sceneCoreModule.reset();
+
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
+    }
+
+private:
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> sceneCoreModule;
+    AZStd::unique_ptr<AZ::DynamicModuleHandle> sceneDataModule;
+};
+
+AZ_UNIT_TEST_HOOK(new SceneBuilderTestEnvironment);
+
diff --git a/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_files.cmake
new file mode 100644
index 0000000000..5bd6748399
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_files.cmake
@@ -0,0 +1,55 @@
+#
+# 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
+    SceneBuilderConfiguration.h
+    SceneImportRequestHandler.h
+    SceneImportRequestHandler.cpp
+    SceneImporter.h
+    SceneImporter.cpp
+    SceneSystem.h
+    SceneSystem.cpp
+    ImportContexts/ImportContexts.h
+    ImportContexts/ImportContexts.cpp
+    ImportContexts/AssImpImportContexts.h
+    ImportContexts/AssImpImportContexts.cpp
+    Importers/Utilities/AssImpMeshImporterUtilities.h
+    Importers/Utilities/AssImpMeshImporterUtilities.cpp
+    Importers/Utilities/RenamedNodesMap.h
+    Importers/Utilities/RenamedNodesMap.cpp
+    Importers/AssImpAnimationImporter.h
+    Importers/AssImpAnimationImporter.cpp
+    Importers/AssImpBitangentStreamImporter.h
+    Importers/AssImpBitangentStreamImporter.cpp
+    Importers/AssImpBlendShapeImporter.h
+    Importers/AssImpBlendShapeImporter.cpp
+    Importers/AssImpBoneImporter.h
+    Importers/AssImpBoneImporter.cpp
+    Importers/AssImpColorStreamImporter.h
+    Importers/AssImpColorStreamImporter.cpp
+    Importers/AssImpImporterUtilities.h
+    Importers/AssImpImporterUtilities.cpp
+    Importers/AssImpMaterialImporter.h
+    Importers/AssImpMaterialImporter.cpp
+    Importers/AssImpMeshImporter.h
+    Importers/AssImpMeshImporter.cpp
+    Importers/AssImpSkinImporter.h
+    Importers/AssImpSkinImporter.cpp
+    Importers/AssImpSkinWeightsImporter.h
+    Importers/AssImpSkinWeightsImporter.cpp
+    Importers/AssImpTangentStreamImporter.h
+    Importers/AssImpTangentStreamImporter.cpp
+    Importers/AssImpTransformImporter.h
+    Importers/AssImpTransformImporter.cpp
+    Importers/AssImpUvMapImporter.h
+    Importers/AssImpUvMapImporter.cpp
+    Importers/AssImpAnimationImporter.h
+    Importers/AssImpAnimationImporter.cpp
+    Importers/ImporterUtilities.h
+    Importers/ImporterUtilities.cpp
+    Importers/ImporterUtilities.inl
+)
diff --git a/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_shared_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_shared_files.cmake
new file mode 100644
index 0000000000..2bb8abacff
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_shared_files.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
+#
+#
+
+set(FILES
+    DllMain.cpp
+)
diff --git a/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_testing_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_testing_files.cmake
new file mode 100644
index 0000000000..c4d970e4e3
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_testing_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/TestsMain.cpp
+    Tests/Importers/SceneImporterUtilitiesTests.cpp
+    Tests/Importers/Utilities/RenamedNodesMapTests.cpp
+)
diff --git a/Code/Tools/SceneAPI/SceneCore/CMakeLists.txt b/Code/Tools/SceneAPI/SceneCore/CMakeLists.txt
index f29f6406b3..54484455cb 100644
--- a/Code/Tools/SceneAPI/SceneCore/CMakeLists.txt
+++ b/Code/Tools/SceneAPI/SceneCore/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneCore/Components/BehaviorComponent.cpp b/Code/Tools/SceneAPI/SceneCore/Components/BehaviorComponent.cpp
index 20e51ba6ab..14cd4ba0ff 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/BehaviorComponent.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Components/BehaviorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/BehaviorComponent.h b/Code/Tools/SceneAPI/SceneCore/Components/BehaviorComponent.h
index f2ff11ba6a..bc23ab1702 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/BehaviorComponent.h
+++ b/Code/Tools/SceneAPI/SceneCore/Components/BehaviorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/ExportingComponent.cpp b/Code/Tools/SceneAPI/SceneCore/Components/ExportingComponent.cpp
index 117f2fe2c2..62daba1197 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/ExportingComponent.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Components/ExportingComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/ExportingComponent.h b/Code/Tools/SceneAPI/SceneCore/Components/ExportingComponent.h
index 92cfaa7d37..1d778e55bc 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/ExportingComponent.h
+++ b/Code/Tools/SceneAPI/SceneCore/Components/ExportingComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/GenerationComponent.cpp b/Code/Tools/SceneAPI/SceneCore/Components/GenerationComponent.cpp
index 2dd0e7f3b7..0f50a54fc9 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/GenerationComponent.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Components/GenerationComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/GenerationComponent.h b/Code/Tools/SceneAPI/SceneCore/Components/GenerationComponent.h
index 853d56cf14..e9176192ae 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/GenerationComponent.h
+++ b/Code/Tools/SceneAPI/SceneCore/Components/GenerationComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/LoadingComponent.cpp b/Code/Tools/SceneAPI/SceneCore/Components/LoadingComponent.cpp
index c65310ea14..14fc216b61 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/LoadingComponent.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Components/LoadingComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/LoadingComponent.h b/Code/Tools/SceneAPI/SceneCore/Components/LoadingComponent.h
index c5e3c0c192..0c9e0973ea 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/LoadingComponent.h
+++ b/Code/Tools/SceneAPI/SceneCore/Components/LoadingComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/RCExportingComponent.cpp b/Code/Tools/SceneAPI/SceneCore/Components/RCExportingComponent.cpp
index edb419e2c5..1c717876a8 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/RCExportingComponent.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Components/RCExportingComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/RCExportingComponent.h b/Code/Tools/SceneAPI/SceneCore/Components/RCExportingComponent.h
index 88ea14fb81..1628d527d5 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/RCExportingComponent.h
+++ b/Code/Tools/SceneAPI/SceneCore/Components/RCExportingComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/SceneSystemComponent.cpp b/Code/Tools/SceneAPI/SceneCore/Components/SceneSystemComponent.cpp
index 9129e29e73..e139a74c6b 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/SceneSystemComponent.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Components/SceneSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/SceneSystemComponent.h b/Code/Tools/SceneAPI/SceneCore/Components/SceneSystemComponent.h
index 4bc582ff61..ef2661523a 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/SceneSystemComponent.h
+++ b/Code/Tools/SceneAPI/SceneCore/Components/SceneSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/Utilities/EntityConstructor.cpp b/Code/Tools/SceneAPI/SceneCore/Components/Utilities/EntityConstructor.cpp
index b8415a5217..832e77b4ad 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/Utilities/EntityConstructor.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Components/Utilities/EntityConstructor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Components/Utilities/EntityConstructor.h b/Code/Tools/SceneAPI/SceneCore/Components/Utilities/EntityConstructor.h
index df0c54b596..d49122f72d 100644
--- a/Code/Tools/SceneAPI/SceneCore/Components/Utilities/EntityConstructor.h
+++ b/Code/Tools/SceneAPI/SceneCore/Components/Utilities/EntityConstructor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp b/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp
index 11bff26630..1cb01654da 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.h b/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.h
index cb8916d3b4..bb49b88ba7 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.cpp b/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.cpp
index 42c43b9e4f..8312852a3c 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.h b/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.h
index f890204dc7..0fc9cf770a 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.inl b/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.inl
index 5d8bf6c5de..ee5baef150 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/RuleContainer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Scene.cpp b/Code/Tools/SceneAPI/SceneCore/Containers/Scene.cpp
index 57f909d188..63efd4ec23 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Scene.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Scene.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Scene.h b/Code/Tools/SceneAPI/SceneCore/Containers/Scene.h
index 914e3012b7..fa8b98e5e4 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Scene.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Scene.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.cpp b/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.cpp
index 891f638d20..1893fafb3d 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.h b/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.h
index b2160fda32..3b62341dce 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -27,7 +27,7 @@ namespace AZ
         {
             class IGraphObject;
         }
-        namespace FbxSceneBuilder
+        namespace SceneBuilder
         {
             struct QueueNode;
             struct ImportContext;
@@ -58,8 +58,8 @@ namespace AZ
                 class NodeIndex
                 {
                     friend class SceneGraph;
-                    friend struct FbxSceneBuilder::QueueNode;
-                    friend struct FbxSceneBuilder::ImportContext;
+                    friend struct SceneBuilder::QueueNode;
+                    friend struct SceneBuilder::ImportContext;
                 public:
                     // Type needs to be able to store an index in a NodeHeader (currently 21-bits).
                     using IndexType = uint32_t;
diff --git a/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.inl b/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.inl
index 19c23fec4f..158ba60f91 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.cpp b/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.cpp
index 049a1f9f05..8d390c2c09 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.h b/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.h
index 5143b5e455..c7518b475d 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.inl b/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.inl
index b4de910009..5b1c1484f2 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/SceneManifest.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/Filters.h b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/Filters.h
index 15f71e1df7..0148e3d967 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/Filters.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/Filters.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/Filters.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/Filters.inl
index fb050c4579..9f3c1afbc1 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/Filters.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/Filters.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.h b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.h
index f652e4fdc1..fe70d8d0f4 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.inl
index ed80c42b97..8aeca4e750 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.cpp b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.cpp
index 81f4bcba9b..8820f524b9 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.h b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.h
index 545b1bbe28..9eb5d4cc91 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.inl
index e2ebae6f40..99bc4ad8ea 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneUtilities.cpp b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneUtilities.cpp
index f4d7623a26..9eb7236bfc 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneUtilities.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneUtilities.h b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneUtilities.h
index b79ac1617a..dcb143d696 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneUtilities.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/SceneUtilities.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/ConvertIterator.h b/Code/Tools/SceneAPI/SceneCore/Containers/Views/ConvertIterator.h
index 6d6de089bd..422c934474 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/ConvertIterator.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/ConvertIterator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/ConvertIterator.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Views/ConvertIterator.inl
index 681929047f..bdddd1ada6 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/ConvertIterator.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/ConvertIterator.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/FilterIterator.h b/Code/Tools/SceneAPI/SceneCore/Containers/Views/FilterIterator.h
index fca46d3609..60e15c8e3b 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/FilterIterator.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/FilterIterator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/FilterIterator.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Views/FilterIterator.inl
index 9720dced37..1c19278145 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/FilterIterator.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/FilterIterator.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/PairIterator.h b/Code/Tools/SceneAPI/SceneCore/Containers/Views/PairIterator.h
index 0a56a09679..34eb543e55 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/PairIterator.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/PairIterator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/PairIterator.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Views/PairIterator.inl
index 900d792339..525186cc8f 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/PairIterator.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/PairIterator.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h
index ca57c0dcde..2b22c7dd61 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.inl
index ba366f3b6a..d6ef6c5151 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphChildIterator.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h
index cc6346e208..a16779c555 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.inl
index 504dd499d0..90edee819c 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphDownwardsIterator.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.h b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.h
index 46c329c956..feb8979222 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.inl
index 16103aa98d..48e13945b4 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/SceneGraphUpwardsIterator.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/View.h b/Code/Tools/SceneAPI/SceneCore/Containers/Views/View.h
index 6f38ac8deb..90c781ae12 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/View.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/View.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Containers/Views/View.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Views/View.inl
index 2078f91372..f4a5bfbeb0 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Views/View.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Views/View.inl
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.cpp b/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.cpp
index c49274bf89..dae2515e0b 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h
index 8dd6b288c4..94cd587f32 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.inl b/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.inl
index 25ca18d52b..461b613103 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.inl
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/DataTypeUtilities.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IAnimationData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IAnimationData.h
index 96378f97e2..ff11ceb4f6 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IAnimationData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IAnimationData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IBlendShapeData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IBlendShapeData.h
index 86e9c9f016..46a5f021aa 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IBlendShapeData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IBlendShapeData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IBoneData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IBoneData.h
index 807ac23b4a..01d6bb5fe2 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IBoneData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IBoneData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMaterialData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMaterialData.h
index eb6c512e5a..66f62d45c2 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMaterialData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMaterialData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h
index 4cd5862324..7b8ea30c3c 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -80,11 +80,11 @@ namespace AZ
                 virtual unsigned int GetVertexIndex(int faceIndex, int vertexIndexInFace) const = 0;
                 static const int s_invalidMaterialId = 0;
 
-                // Set the unit size of the mesh, from the point of FBX SDK
+                // Set the unit size of the mesh, from the point of the source SDK
                 void SetUnitSizeInMeters(float size) { m_unitSizeInMeters = size; }
                 float GetUnitSizeInMeters() const { return m_unitSizeInMeters; }
 
-                // Set the original unit size of the mesh, from the point of FBX SDK
+                // Set the original unit size of the mesh, from the point of the source SDK
                 void SetOriginalUnitSizeInMeters(float size) { m_originalUnitSizeInMeters = size; }
                 float GetOriginalUnitSizeInMeters() const { return m_originalUnitSizeInMeters; }
 
diff --git a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexBitangentData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexBitangentData.h
index 3a3a820db7..d15a6664e8 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexBitangentData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexBitangentData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexColorData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexColorData.h
index c24edf51bb..4537b160e6 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexColorData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexColorData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
index e73be1a8a9..7f3895e5cb 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -23,9 +23,9 @@ namespace AZ
         {
             enum class TangentSpace
             {
-                FromFbx     = 0,
-                MikkT       = 1,
-                EMotionFX   = 2
+                FromSourceScene = 0,
+                MikkT           = 1,
+                EMotionFX       = 2
             };
 
             enum class BitangentMethod
diff --git a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexUVData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexUVData.h
index 431c988ade..89d09b9889 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexUVData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexUVData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/ISkinWeightData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/ISkinWeightData.h
index eb44744659..378aa59242 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/ISkinWeightData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/ISkinWeightData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/ITransform.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/ITransform.h
index 8c056fead1..f6496abd94 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/ITransform.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/ITransform.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h
index 55865e2347..268e1b27b8 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IAnimationGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IGroup.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IGroup.h
index e793f71738..7544d37a35 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IGroup.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h
index 173c547e88..fecfd11638 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISceneNodeGroup.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISceneNodeGroup.h
index 41777e636c..2c57d39878 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISceneNodeGroup.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISceneNodeGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISkeletonGroup.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISkeletonGroup.h
index 8b11f18f45..2ed759fa70 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISkeletonGroup.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISkeletonGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h
index d6a8d6e45f..43c401ac90 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Groups/ISkinGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/IGraphObject.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/IGraphObject.h
index 9719175d48..a17e5c5957 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/IGraphObject.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/IGraphObject.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/IManifestObject.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/IManifestObject.h
index 908dd57319..0b1474b20d 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/IManifestObject.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/IManifestObject.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/ManifestBase/ISceneNodeSelectionList.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/ManifestBase/ISceneNodeSelectionList.h
index 49737dc27b..5901963411 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/ManifestBase/ISceneNodeSelectionList.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/ManifestBase/ISceneNodeSelectionList.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/MatrixType.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/MatrixType.h
index a048237879..4de668936d 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/MatrixType.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/MatrixType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IBlendShapeRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IBlendShapeRule.h
index b5559c10cd..977079ab85 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IBlendShapeRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IBlendShapeRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IClothRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IClothRule.h
index f198e0a76a..2c4230a6d5 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IClothRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IClothRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ICommentRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ICommentRule.h
index feea6c6612..f57dddd0e1 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ICommentRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ICommentRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ICoordinateSystemRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ICoordinateSystemRule.h
index e0256386e2..6a284abd23 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ICoordinateSystemRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ICoordinateSystemRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ILodRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ILodRule.h
index 3bafb24577..921f76aa0c 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ILodRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ILodRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMaterialRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMaterialRule.h
index fc128b019e..8070a0082d 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMaterialRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMaterialRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h
index 05c8d6d828..6b46e1d15c 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IMeshAdvancedRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IRule.h
index a9ddf00f3d..b85d89bef2 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IScriptProcessorRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IScriptProcessorRule.h
index d01934044d..257fa53a17 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IScriptProcessorRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/IScriptProcessorRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ISkeletonProxyRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ISkeletonProxyRule.h
index a0e4999071..e5105a67e2 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ISkeletonProxyRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ISkeletonProxyRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ISkinRule.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ISkinRule.h
index 20a83cd068..21f165700c 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ISkinRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/Rules/ISkinRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/DllMain.cpp b/Code/Tools/SceneAPI/SceneCore/DllMain.cpp
index 348d2fde97..7874ada7be 100644
--- a/Code/Tools/SceneAPI/SceneCore/DllMain.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/DllMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.cpp b/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.cpp
index a1351307dd..a4de7ab41a 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h b/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h
index 72157de5b7..46b02bb515 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.cpp b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.cpp
index b0872522b6..ea6c8a4791 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.h b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.h
index c63bf8e240..5ca2d0cc18 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.inl b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.inl
index 5d6cc92710..83e37c5629 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBinder.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.cpp b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.cpp
index cea84b4e05..8b1b818c43 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.h b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.h
index 3c401d231c..5ac3a79eca 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.inl b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.inl
index c9a901a626..630c3b2f90 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Events/CallProcessorBus.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ExportEventContext.cpp b/Code/Tools/SceneAPI/SceneCore/Events/ExportEventContext.cpp
index 47181f08da..e9d6cc4d89 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ExportEventContext.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ExportEventContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ExportEventContext.h b/Code/Tools/SceneAPI/SceneCore/Events/ExportEventContext.h
index 89a65a47d4..aa38155604 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ExportEventContext.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ExportEventContext.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ExportProductList.cpp b/Code/Tools/SceneAPI/SceneCore/Events/ExportProductList.cpp
index 21998cc8f2..c3a9abcbd2 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ExportProductList.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ExportProductList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ExportProductList.h b/Code/Tools/SceneAPI/SceneCore/Events/ExportProductList.h
index f903a13f42..38deea3f9f 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ExportProductList.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ExportProductList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/GenerateEventContext.cpp b/Code/Tools/SceneAPI/SceneCore/Events/GenerateEventContext.cpp
index 5708a10a6a..0a0438f6f4 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/GenerateEventContext.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/GenerateEventContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/GenerateEventContext.h b/Code/Tools/SceneAPI/SceneCore/Events/GenerateEventContext.h
index 29cc8fd8ab..6836b40a92 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/GenerateEventContext.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/GenerateEventContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/GraphMetaInfoBus.h b/Code/Tools/SceneAPI/SceneCore/Events/GraphMetaInfoBus.h
index 404ed96f8b..e200cccf43 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/GraphMetaInfoBus.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/GraphMetaInfoBus.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ImportEventContext.cpp b/Code/Tools/SceneAPI/SceneCore/Events/ImportEventContext.cpp
index 4a4bdd3de8..707e0ef1e2 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ImportEventContext.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ImportEventContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ImportEventContext.h b/Code/Tools/SceneAPI/SceneCore/Events/ImportEventContext.h
index 225d1dbbc0..e5e7428cd1 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ImportEventContext.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ImportEventContext.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ManifestMetaInfoBus.cpp b/Code/Tools/SceneAPI/SceneCore/Events/ManifestMetaInfoBus.cpp
index 84723dcc0a..d4e72b673a 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ManifestMetaInfoBus.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ManifestMetaInfoBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ManifestMetaInfoBus.h b/Code/Tools/SceneAPI/SceneCore/Events/ManifestMetaInfoBus.h
index da71cd8061..100bdc9d99 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ManifestMetaInfoBus.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ManifestMetaInfoBus.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ProcessingResult.cpp b/Code/Tools/SceneAPI/SceneCore/Events/ProcessingResult.cpp
index b718b6745d..1a128d9b0d 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ProcessingResult.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ProcessingResult.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/ProcessingResult.h b/Code/Tools/SceneAPI/SceneCore/Events/ProcessingResult.h
index 83316d4334..1cc1b50668 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/ProcessingResult.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/ProcessingResult.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Events/SceneSerializationBus.h b/Code/Tools/SceneAPI/SceneCore/Events/SceneSerializationBus.h
index 838ba904f8..ccdc15bcf9 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/SceneSerializationBus.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/SceneSerializationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Export/MtlMaterialExporter.cpp b/Code/Tools/SceneAPI/SceneCore/Export/MtlMaterialExporter.cpp
index 07a0361636..75d74f369a 100644
--- a/Code/Tools/SceneAPI/SceneCore/Export/MtlMaterialExporter.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Export/MtlMaterialExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Export/MtlMaterialExporter.h b/Code/Tools/SceneAPI/SceneCore/Export/MtlMaterialExporter.h
index d0a2e4d8be..78cd2a5937 100644
--- a/Code/Tools/SceneAPI/SceneCore/Export/MtlMaterialExporter.h
+++ b/Code/Tools/SceneAPI/SceneCore/Export/MtlMaterialExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Import/ManifestImportRequestHandler.cpp b/Code/Tools/SceneAPI/SceneCore/Import/ManifestImportRequestHandler.cpp
index 7c5039c328..a4b002db7d 100644
--- a/Code/Tools/SceneAPI/SceneCore/Import/ManifestImportRequestHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Import/ManifestImportRequestHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Import/ManifestImportRequestHandler.h b/Code/Tools/SceneAPI/SceneCore/Import/ManifestImportRequestHandler.h
index e337c1536f..dc1ddc4433 100644
--- a/Code/Tools/SceneAPI/SceneCore/Import/ManifestImportRequestHandler.h
+++ b/Code/Tools/SceneAPI/SceneCore/Import/ManifestImportRequestHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/Containers/MockScene.h b/Code/Tools/SceneAPI/SceneCore/Mocks/Containers/MockScene.h
index 86e05cec21..2fa4494de2 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/Containers/MockScene.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/Containers/MockScene.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIBlendShapeData.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIBlendShapeData.h
index 6d0980686c..5a74fd4dd9 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIBlendShapeData.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIBlendShapeData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshData.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshData.h
index eb65ad79bc..be3dd9e0bf 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshData.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexColorData.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexColorData.h
index 0392a5ca46..de26281e96 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexColorData.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexColorData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexUVData.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexUVData.h
index 0a940ddd2c..078b13de9d 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexUVData.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockIMeshVertexUVData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockITransform.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockITransform.h
index 5f99ce3ff5..fcf08d02f6 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockITransform.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/GraphData/MockITransform.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIGroup.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIGroup.h
index b53ae3afec..804e169cc5 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIGroup.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIMeshGroup.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIMeshGroup.h
index 89aaa84f63..bfed32d283 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIMeshGroup.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Groups/MockIMeshGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h
index 17f1bc2136..0a9861b530 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/ManifestBase/MockISceneNodeSelectionList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/MockIGraphObject.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/MockIGraphObject.h
index 9f51e15443..14b03e9e24 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/MockIGraphObject.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/MockIGraphObject.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIBlendShapeRule.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIBlendShapeRule.h
index ffbb69ef99..8531c23eda 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIBlendShapeRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIBlendShapeRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIMeshAdvancedRule.h b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIMeshAdvancedRule.h
index a130cc18ff..0194033be9 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIMeshAdvancedRule.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/DataTypes/Rules/MockIMeshAdvancedRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Mocks/Events/MockAssetImportRequest.h b/Code/Tools/SceneAPI/SceneCore/Mocks/Events/MockAssetImportRequest.h
index c0c2f73155..5c28c2ff0e 100644
--- a/Code/Tools/SceneAPI/SceneCore/Mocks/Events/MockAssetImportRequest.h
+++ b/Code/Tools/SceneAPI/SceneCore/Mocks/Events/MockAssetImportRequest.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/SceneBuilderDependencyBus.h b/Code/Tools/SceneAPI/SceneCore/SceneBuilderDependencyBus.h
index c632f99da2..c6b2898c49 100644
--- a/Code/Tools/SceneAPI/SceneCore/SceneBuilderDependencyBus.h
+++ b/Code/Tools/SceneAPI/SceneCore/SceneBuilderDependencyBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/SceneCoreConfiguration.h b/Code/Tools/SceneAPI/SceneCore/SceneCoreConfiguration.h
index bbc092fdb5..16b5031e11 100644
--- a/Code/Tools/SceneAPI/SceneCore/SceneCoreConfiguration.h
+++ b/Code/Tools/SceneAPI/SceneCore/SceneCoreConfiguration.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.cpp b/Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.cpp
index 817538ee15..84395d3292 100644
--- a/Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.h b/Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.h
index c7c0cefaec..8dc831d3aa 100644
--- a/Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.h
+++ b/Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp
index 5e5a6086dd..e1c72bc8b4 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneGraphTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneGraphTests.cpp
index 9da5c9e9e2..37d4302197 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneGraphTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneGraphTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneManifestTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneManifestTests.cpp
index dbcbc0ac7e..e263b88164 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneManifestTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneManifestTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneTests.cpp
index 1305c4f18a..d5579f2a47 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Utilities/FiltersTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Utilities/FiltersTests.cpp
index 2150c6640f..153308666f 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Utilities/FiltersTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Utilities/FiltersTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/ConvertIteratorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/ConvertIteratorTests.cpp
index 17daab23ff..42be341c90 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/ConvertIteratorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/ConvertIteratorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/FilterIteratorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/FilterIteratorTests.cpp
index 726c3479f8..6be47c57bc 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/FilterIteratorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/FilterIteratorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorConformityTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorConformityTests.cpp
index 6b6843aece..023ecf2357 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorConformityTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorConformityTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorTestsBase.h b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorTestsBase.h
index 39c6295df6..94312ba012 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorTestsBase.h
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorTestsBase.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/PairIteratorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/PairIteratorTests.cpp
index 8c4e7a8dbd..c681718df8 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/PairIteratorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/PairIteratorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphChildIteratorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphChildIteratorTests.cpp
index a6e1c6136f..0332b4b4d2 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphChildIteratorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphChildIteratorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphDownwardsIteratorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphDownwardsIteratorTests.cpp
index e90a55e9e1..e57df2ad2e 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphDownwardsIteratorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphDownwardsIteratorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphUpwardsIteratorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphUpwardsIteratorTests.cpp
index 0c521890aa..c32ba6a69a 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphUpwardsIteratorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphUpwardsIteratorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/DataObjectTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/DataObjectTests.cpp
index 1a2edfd022..4d78480680 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/DataObjectTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/DataObjectTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Events/AssetImporterRequestTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Events/AssetImporterRequestTests.cpp
index 796da1b87b..bea11e0351 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Events/AssetImporterRequestTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Events/AssetImporterRequestTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Export/MaterialIOTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Export/MaterialIOTests.cpp
index c413ae7353..499373fedd 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Export/MaterialIOTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Export/MaterialIOTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/TestsMain.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/TestsMain.cpp
index 897842f52d..d4493d491a 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/TestsMain.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/TestsMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Utilities/PatternMatcherTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Utilities/PatternMatcherTests.cpp
index 4f29f9a7d2..2e49cdc2c7 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Utilities/PatternMatcherTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Utilities/PatternMatcherTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Tests/Utilities/SceneGraphSelectorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Utilities/SceneGraphSelectorTests.cpp
index d22abadf78..179df616a7 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Utilities/SceneGraphSelectorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Utilities/SceneGraphSelectorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.cpp b/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.cpp
index 50a88685a2..c8822a42d6 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h b/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h
index 462c97c608..c042578efa 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/CoordinateSystemConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.cpp b/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.cpp
index 900393f95a..b71f1d1a1c 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.h b/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.h
index b3dcd8386c..a83e901135 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.h
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.inl b/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.inl
index ebd3483149..30648e66b7 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/FileUtilities.cpp b/Code/Tools/SceneAPI/SceneCore/Utilities/FileUtilities.cpp
index f335eabc65..809ad153ee 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/FileUtilities.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/FileUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/FileUtilities.h b/Code/Tools/SceneAPI/SceneCore/Utilities/FileUtilities.h
index 89f4a7e307..742b013198 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/FileUtilities.h
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/FileUtilities.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/HashHelper.h b/Code/Tools/SceneAPI/SceneCore/Utilities/HashHelper.h
index 937614a5ab..4d341627d1 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/HashHelper.h
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/HashHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/PatternMatcher.cpp b/Code/Tools/SceneAPI/SceneCore/Utilities/PatternMatcher.cpp
index 84f2906491..d28597cade 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/PatternMatcher.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/PatternMatcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/PatternMatcher.h b/Code/Tools/SceneAPI/SceneCore/Utilities/PatternMatcher.h
index 562c60fc41..73eab08024 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/PatternMatcher.h
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/PatternMatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/Reporting.h b/Code/Tools/SceneAPI/SceneCore/Utilities/Reporting.h
index eba9d207f0..ba60fa1d62 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/Reporting.h
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/Reporting.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/SceneGraphSelector.cpp b/Code/Tools/SceneAPI/SceneCore/Utilities/SceneGraphSelector.cpp
index 8eaa3a9a4a..ebe77cc05d 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/SceneGraphSelector.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/SceneGraphSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/Utilities/SceneGraphSelector.h b/Code/Tools/SceneAPI/SceneCore/Utilities/SceneGraphSelector.h
index 515b9f7b7f..d264889e04 100644
--- a/Code/Tools/SceneAPI/SceneCore/Utilities/SceneGraphSelector.h
+++ b/Code/Tools/SceneAPI/SceneCore/Utilities/SceneGraphSelector.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneCore/scenecore_files.cmake b/Code/Tools/SceneAPI/SceneCore/scenecore_files.cmake
index 62162d3560..0702527465 100644
--- a/Code/Tools/SceneAPI/SceneCore/scenecore_files.cmake
+++ b/Code/Tools/SceneAPI/SceneCore/scenecore_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneCore/scenecore_testing_files.cmake b/Code/Tools/SceneAPI/SceneCore/scenecore_testing_files.cmake
index 1872225a63..255ced71d5 100644
--- a/Code/Tools/SceneAPI/SceneCore/scenecore_testing_files.cmake
+++ b/Code/Tools/SceneAPI/SceneCore/scenecore_testing_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneData/Behaviors/AnimationGroup.h b/Code/Tools/SceneAPI/SceneData/Behaviors/AnimationGroup.h
index 3b52ec5e1c..1f0744aa73 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/AnimationGroup.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/AnimationGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsAnimationGroup.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsAnimationGroup.cpp
index 9c7b29bb52..a27277cf64 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsAnimationGroup.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsAnimationGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsMeshGroup.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsMeshGroup.cpp
index aa392f622d..24cc6db49d 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsMeshGroup.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsMeshGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsSkeletonGroup.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsSkeletonGroup.cpp
index 01a652f45d..639d4a16b7 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsSkeletonGroup.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsSkeletonGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsSkinGroup.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsSkinGroup.cpp
index 3fe03f4178..8f82783199 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsSkinGroup.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsSkinGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/BlendShapeRuleBehavior.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/BlendShapeRuleBehavior.cpp
index de6c8edef5..e24e1001f1 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/BlendShapeRuleBehavior.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/BlendShapeRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/BlendShapeRuleBehavior.h b/Code/Tools/SceneAPI/SceneData/Behaviors/BlendShapeRuleBehavior.h
index 9fa2e01de9..405dcab342 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/BlendShapeRuleBehavior.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/BlendShapeRuleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.cpp
index 94967e9469..e2b70d5cd2 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.h b/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.h
index 077492a449..d23bb3892c 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/MaterialRuleBehavior.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/MaterialRuleBehavior.cpp
index bf17eeeea3..682a8212b3 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/MaterialRuleBehavior.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/MaterialRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/MaterialRuleBehavior.h b/Code/Tools/SceneAPI/SceneData/Behaviors/MaterialRuleBehavior.h
index bdbdabc475..524f96abe3 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/MaterialRuleBehavior.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/MaterialRuleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/MeshAdvancedRule.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/MeshAdvancedRule.cpp
index ecdd5baac9..2a050def60 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/MeshAdvancedRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/MeshAdvancedRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/MeshAdvancedRule.h b/Code/Tools/SceneAPI/SceneData/Behaviors/MeshAdvancedRule.h
index 6a3790126f..4b71283dd2 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/MeshAdvancedRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/MeshAdvancedRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/MeshGroup.h b/Code/Tools/SceneAPI/SceneData/Behaviors/MeshGroup.h
index ebe518c6f3..d5387030dc 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/MeshGroup.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/MeshGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/Registry.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/Registry.cpp
index 3a77a111a2..a8c43c65ed 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/Registry.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/Registry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/Registry.h b/Code/Tools/SceneAPI/SceneData/Behaviors/Registry.h
index f59b6ef69d..277b00251a 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/Registry.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/Registry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.cpp
index a5d77a16ba..5ae547b577 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.h b/Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.h
index 2ed26ba8e6..da11614459 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/SkeletonGroup.h b/Code/Tools/SceneAPI/SceneData/Behaviors/SkeletonGroup.h
index 9f259f44a8..24c70698f2 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/SkeletonGroup.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/SkeletonGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/SkinGroup.h b/Code/Tools/SceneAPI/SceneData/Behaviors/SkinGroup.h
index 5682400cb1..391d1e1bf2 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/SkinGroup.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/SkinGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.cpp
index db31f98e5a..b2fc1e66fe 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.h b/Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.h
index 0a4522dd87..15f6bc9a7b 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/CMakeLists.txt b/Code/Tools/SceneAPI/SceneData/CMakeLists.txt
index d2fba62bb4..63f0730020 100644
--- a/Code/Tools/SceneAPI/SceneData/CMakeLists.txt
+++ b/Code/Tools/SceneAPI/SceneData/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneData/DllMain.cpp b/Code/Tools/SceneAPI/SceneData/DllMain.cpp
index e7d04f4b19..8e1412cfa2 100644
--- a/Code/Tools/SceneAPI/SceneData/DllMain.cpp
+++ b/Code/Tools/SceneAPI/SceneData/DllMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/AnimationData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/AnimationData.cpp
index 38420f9b3e..9c968eafe6 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/AnimationData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/AnimationData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/AnimationData.h b/Code/Tools/SceneAPI/SceneData/GraphData/AnimationData.h
index 0b5c9b6d52..923d8a1fdf 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/AnimationData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/AnimationData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/BlendShapeData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/BlendShapeData.cpp
index 4e862c7c4d..b271106119 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/BlendShapeData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/BlendShapeData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/BlendShapeData.h b/Code/Tools/SceneAPI/SceneData/GraphData/BlendShapeData.h
index 1c7c812352..44ce184868 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/BlendShapeData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/BlendShapeData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/BoneData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/BoneData.cpp
index 777f1c8928..b1d68ad18b 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/BoneData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/BoneData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/BoneData.h b/Code/Tools/SceneAPI/SceneData/GraphData/BoneData.h
index 90fc5688a0..ac816dbb11 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/BoneData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/BoneData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp
index 0b1d7293e8..4163ce8b18 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h b/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h
index 687933ea7f..cb08253b87 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MeshData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshData.cpp
index 81573a4228..9bf1fc7632 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MeshData.h b/Code/Tools/SceneAPI/SceneData/GraphData/MeshData.h
index a5b1956e41..7b9528a288 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MeshDataPrimitiveUtils.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshDataPrimitiveUtils.cpp
index c5939aee7e..8546a916a5 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshDataPrimitiveUtils.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshDataPrimitiveUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MeshDataPrimitiveUtils.h b/Code/Tools/SceneAPI/SceneData/GraphData/MeshDataPrimitiveUtils.h
index 4add9b6bac..3256a4f16a 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshDataPrimitiveUtils.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshDataPrimitiveUtils.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
index 9288dfdc7b..0dca36763e 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -20,7 +20,7 @@ namespace AZ
                 SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
                 if (serializeContext)
                 {
-                    serializeContext->Class<MeshVertexBitangentData>()->Version(1);
+                    serializeContext->Class<MeshVertexBitangentData>()->Version(2);
                 }
 
                 BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context);
@@ -34,7 +34,7 @@ namespace AZ
                         ->Method("GetBitangentSetIndex", &MeshVertexBitangentData::GetBitangentSetIndex)
                         ->Method("GetTangentSpace", &MeshVertexBitangentData::GetTangentSpace)
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::EMotionFX>("EMotionFX")
-                        ->Enum<(int)SceneAPI::DataTypes::TangentSpace::FromFbx>("FromFbx")
+                        ->Enum<(int)SceneAPI::DataTypes::TangentSpace::FromSourceScene>("FromSourceScene")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::MikkT>("MikkT");
                 }
             }
diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.h b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.h
index d6d300b555..edf4184e94 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -50,7 +50,7 @@ namespace AZ
                 SCENE_DATA_API void GetDebugOutput(AZ::SceneAPI::Utilities::DebugOutput& output) const override;
             protected:
                 AZStd::vector<AZ::Vector3>              m_bitangents;
-                AZ::SceneAPI::DataTypes::TangentSpace   m_tangentSpace = AZ::SceneAPI::DataTypes::TangentSpace::FromFbx;
+                AZ::SceneAPI::DataTypes::TangentSpace   m_tangentSpace = AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene;
                 size_t                                  m_setIndex = 0;
             };
 
diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexColorData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexColorData.cpp
index 45fbf78993..6cb667adbd 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexColorData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexColorData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexColorData.h b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexColorData.h
index 28278d3183..22f3cb1c97 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexColorData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexColorData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
index 559a223435..cc9b9c8445 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -20,7 +20,7 @@ namespace AZ
                 SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
                 if (serializeContext)
                 {
-                    serializeContext->Class<MeshVertexTangentData>()->Version(1);
+                    serializeContext->Class<MeshVertexTangentData>()->Version(2);
                 }
 
                 BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context);
@@ -34,7 +34,7 @@ namespace AZ
                         ->Method("GetTangentSetIndex", &MeshVertexTangentData::GetTangentSetIndex)
                         ->Method("GetTangentSpace", &MeshVertexTangentData::GetTangentSpace)
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::EMotionFX>("EMotionFX")
-                        ->Enum<(int)SceneAPI::DataTypes::TangentSpace::FromFbx>("FromFbx")
+                        ->Enum<(int)SceneAPI::DataTypes::TangentSpace::FromSourceScene>("FromSourceScene")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::MikkT>("MikkT");
                 }
             }
diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.h b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.h
index e28090aa17..7936a16307 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -49,7 +49,7 @@ namespace AZ
                 SCENE_DATA_API void GetDebugOutput(AZ::SceneAPI::Utilities::DebugOutput& output) const override;
             protected:
                 AZStd::vector<AZ::Vector4>              m_tangents;
-                AZ::SceneAPI::DataTypes::TangentSpace   m_tangentSpace = AZ::SceneAPI::DataTypes::TangentSpace::FromFbx;
+                AZ::SceneAPI::DataTypes::TangentSpace   m_tangentSpace = AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene;
                 size_t                                  m_setIndex = 0;
             };
 
diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexUVData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexUVData.cpp
index 11dbe84f1f..e5c57f884f 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexUVData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexUVData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexUVData.h b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexUVData.h
index 2fa3c664d2..db4ae8eed5 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexUVData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexUVData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/RootBoneData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/RootBoneData.cpp
index bd3b9b5e0f..dc75f6d127 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/RootBoneData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/RootBoneData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/RootBoneData.h b/Code/Tools/SceneAPI/SceneData/GraphData/RootBoneData.h
index 57a609d1d8..38e573e72a 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/RootBoneData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/RootBoneData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/SkinMeshData.h b/Code/Tools/SceneAPI/SceneData/GraphData/SkinMeshData.h
index 56aa883a6a..80e80eadea 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/SkinMeshData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/SkinMeshData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.cpp
index ecc2024316..3e1757227e 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.h b/Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.h
index 0179a6df56..8d9145cf7e 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/TransformData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/TransformData.cpp
index ab3aabfd52..4595a9ee04 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/TransformData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/TransformData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/GraphData/TransformData.h b/Code/Tools/SceneAPI/SceneData/GraphData/TransformData.h
index 26f7516c04..adc3dacfca 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/TransformData.h
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/TransformData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.cpp b/Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.cpp
index 1fc92859d2..6c1ecbbc28 100644
--- a/Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.h b/Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.h
index d85301cf27..5e196b59e7 100644
--- a/Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.h
+++ b/Code/Tools/SceneAPI/SceneData/Groups/AnimationGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.cpp b/Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.cpp
index f0132122ea..f2f7405eed 100644
--- a/Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.h b/Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.h
index aaa9375b0e..c06c91a808 100644
--- a/Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.h
+++ b/Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.cpp b/Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.cpp
index fd3076de05..83fca4954d 100644
--- a/Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.h b/Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.h
index 934b8ae91a..b68ee3684f 100644
--- a/Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.h
+++ b/Code/Tools/SceneAPI/SceneData/Groups/SkeletonGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.cpp b/Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.cpp
index 55e69fa6a1..39785b1d6e 100644
--- a/Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.h b/Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.h
index 7e7b660dec..7ff46a85cd 100644
--- a/Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.h
+++ b/Code/Tools/SceneAPI/SceneData/Groups/SkinGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/ManifestBase/SceneNodeSelectionList.cpp b/Code/Tools/SceneAPI/SceneData/ManifestBase/SceneNodeSelectionList.cpp
index 62288b78eb..4113e4daa4 100644
--- a/Code/Tools/SceneAPI/SceneData/ManifestBase/SceneNodeSelectionList.cpp
+++ b/Code/Tools/SceneAPI/SceneData/ManifestBase/SceneNodeSelectionList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/ManifestBase/SceneNodeSelectionList.h b/Code/Tools/SceneAPI/SceneData/ManifestBase/SceneNodeSelectionList.h
index 103a4e4edd..40379c4d20 100644
--- a/Code/Tools/SceneAPI/SceneData/ManifestBase/SceneNodeSelectionList.h
+++ b/Code/Tools/SceneAPI/SceneData/ManifestBase/SceneNodeSelectionList.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp b/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
index 8b24d470ae..0ea5091419 100644
--- a/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.h b/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.h
index e2a4e9699d..379b988854 100644
--- a/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.h
+++ b/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Platform/Linux/platform_linux_files.cmake b/Code/Tools/SceneAPI/SceneData/Platform/Linux/platform_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Code/Tools/SceneAPI/SceneData/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Tools/SceneAPI/SceneData/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneData/Platform/Mac/platform_mac_files.cmake b/Code/Tools/SceneAPI/SceneData/Platform/Mac/platform_mac_files.cmake
index ab4fa27e96..7df1e1ec44 100644
--- a/Code/Tools/SceneAPI/SceneData/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Tools/SceneAPI/SceneData/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneData/Platform/Windows/platform_windows_files.cmake b/Code/Tools/SceneAPI/SceneData/Platform/Windows/platform_windows_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Code/Tools/SceneAPI/SceneData/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Tools/SceneAPI/SceneData/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneData/ReflectionRegistrar.cpp b/Code/Tools/SceneAPI/SceneData/ReflectionRegistrar.cpp
index 6af93bba6b..04018c7bd7 100644
--- a/Code/Tools/SceneAPI/SceneData/ReflectionRegistrar.cpp
+++ b/Code/Tools/SceneAPI/SceneData/ReflectionRegistrar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/ReflectionRegistrar.h b/Code/Tools/SceneAPI/SceneData/ReflectionRegistrar.h
index 6d0b19d9ee..e00edfa30b 100644
--- a/Code/Tools/SceneAPI/SceneData/ReflectionRegistrar.h
+++ b/Code/Tools/SceneAPI/SceneData/ReflectionRegistrar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/BlendShapeRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/BlendShapeRule.cpp
index 19076b6772..5cab1d9a7e 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/BlendShapeRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/BlendShapeRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/BlendShapeRule.h b/Code/Tools/SceneAPI/SceneData/Rules/BlendShapeRule.h
index 6cf5e9dc8d..3ce87cef8d 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/BlendShapeRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/BlendShapeRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/CommentRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/CommentRule.cpp
index cd4895572e..5b86f7c24d 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/CommentRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/CommentRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/CommentRule.h b/Code/Tools/SceneAPI/SceneData/Rules/CommentRule.h
index fb30d0c467..3a99055fc9 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/CommentRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/CommentRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.cpp
index 32eb7b9379..6876db8bee 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.h b/Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.h
index 5a4f98f1c4..c327b3fc45 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/LodRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/LodRule.cpp
index d0262e77bd..d8d861b991 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/LodRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/LodRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/LodRule.h b/Code/Tools/SceneAPI/SceneData/Rules/LodRule.h
index 8c8fe2c278..f94e61f346 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/LodRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/LodRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/MaterialRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/MaterialRule.cpp
index b15372a8d4..c04d01b61b 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/MaterialRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/MaterialRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/MaterialRule.h b/Code/Tools/SceneAPI/SceneData/Rules/MaterialRule.h
index fdf2d74d90..c275e00f88 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/MaterialRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/MaterialRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/ScriptProcessorRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/ScriptProcessorRule.cpp
index 65fcf95060..72f019c952 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/ScriptProcessorRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/ScriptProcessorRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/ScriptProcessorRule.h b/Code/Tools/SceneAPI/SceneData/Rules/ScriptProcessorRule.h
index 02ebc175f7..b477615f66 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/ScriptProcessorRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/ScriptProcessorRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/SkeletonProxyRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/SkeletonProxyRule.cpp
index a246e039bc..b782f4abe3 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/SkeletonProxyRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/SkeletonProxyRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/SkeletonProxyRule.h b/Code/Tools/SceneAPI/SceneData/Rules/SkeletonProxyRule.h
index 5d50a38322..ebb7b9a0f4 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/SkeletonProxyRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/SkeletonProxyRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.cpp
index 3f67a10f9c..551a2d29e4 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.h b/Code/Tools/SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.h
index 1f44a17bbd..5b81d5c8b4 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/SkinRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/SkinRule.cpp
index 08cc424d26..8813cbe2ed 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/SkinRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/SkinRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/SkinRule.h b/Code/Tools/SceneAPI/SceneData/Rules/SkinRule.h
index d6ee0d05b3..078c4a6905 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/SkinRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/SkinRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.cpp
index dca98140f0..045ead8090 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.h b/Code/Tools/SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.h
index cf76f28b3e..878d9b01a2 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.cpp
index fd994d2ec6..4b4fc04985 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -142,7 +142,7 @@ namespace AZ
                     return;
                 }
 
-                serializeContext->Class<TangentsRule, DataTypes::IRule>()->Version(1)
+                serializeContext->Class<TangentsRule, DataTypes::IRule>()->Version(2)
                     ->Field("tangentSpace", &TangentsRule::m_tangentSpace)
                     ->Field("bitangentMethod", &TangentsRule::m_bitangentMethod)
                     ->Field("normalize", &TangentsRule::m_normalize)
@@ -156,7 +156,7 @@ namespace AZ
                         ->Attribute("AutoExpand", true)
                         ->Attribute(AZ::Edit::Attributes::NameLabelOverride, "")
                         ->DataElement(AZ::Edit::UIHandlers::ComboBox, &AZ::SceneAPI::SceneData::TangentsRule::m_tangentSpace, "Tangent space", "Specify the tangent space used for normal map baking. Choose 'From Fbx' to extract the tangents and bitangents directly from the Fbx file. When there is no tangents rule or the Fbx has no tangents stored inside it, the 'MikkT' option will be used with orthogonal tangents of unit length, so with the normalize option enabled, using the first UV set.")
-                        ->EnumAttribute(AZ::SceneAPI::DataTypes::TangentSpace::FromFbx, "From Fbx")
+                        ->EnumAttribute(AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene, "From Source Scene")
                         ->EnumAttribute(AZ::SceneAPI::DataTypes::TangentSpace::MikkT, "MikkT")
                         ->EnumAttribute(AZ::SceneAPI::DataTypes::TangentSpace::EMotionFX, "EMotion FX")
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
diff --git a/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.h b/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.h
index 526ceb9f0f..66029f02ac 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/SceneDataConfiguration.h b/Code/Tools/SceneAPI/SceneData/SceneDataConfiguration.h
index 7b740659f2..bb37a315bb 100644
--- a/Code/Tools/SceneAPI/SceneData/SceneDataConfiguration.h
+++ b/Code/Tools/SceneAPI/SceneData/SceneDataConfiguration.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.cpp b/Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.cpp
index e98a4f5a78..66b355579c 100644
--- a/Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.cpp
+++ b/Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.h b/Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.h
index 6dde2bcefe..22b5adeb93 100644
--- a/Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.h
+++ b/Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/SceneData_darwin_files.cmake b/Code/Tools/SceneAPI/SceneData/SceneData_darwin_files.cmake
index 01cf15e996..c2bf68d4d2 100644
--- a/Code/Tools/SceneAPI/SceneData/SceneData_darwin_files.cmake
+++ b/Code/Tools/SceneAPI/SceneData/SceneData_darwin_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneData/SceneData_files.cmake b/Code/Tools/SceneAPI/SceneData/SceneData_files.cmake
index 2d682c40d7..1ad2491f52 100644
--- a/Code/Tools/SceneAPI/SceneData/SceneData_files.cmake
+++ b/Code/Tools/SceneAPI/SceneData/SceneData_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneData/SceneData_testing_files.cmake b/Code/Tools/SceneAPI/SceneData/SceneData_testing_files.cmake
index 5d76dffe99..4d62252e52 100644
--- a/Code/Tools/SceneAPI/SceneData/SceneData_testing_files.cmake
+++ b/Code/Tools/SceneAPI/SceneData/SceneData_testing_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneData/Tests/GraphData/GraphDataBehaviorTests.cpp b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/GraphDataBehaviorTests.cpp
index d56e184cea..f5b296aa5f 100644
--- a/Code/Tools/SceneAPI/SceneData/Tests/GraphData/GraphDataBehaviorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/GraphDataBehaviorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -83,7 +83,7 @@ namespace AZ
                         auto* bitangentData = AZStd::any_cast<AZ::SceneData::GraphData::MeshVertexBitangentData>(&data);
                         bitangentData->AppendBitangent(AZ::Vector3{0.12f, 0.34f, 0.56f});
                         bitangentData->AppendBitangent(AZ::Vector3{0.77f, 0.88f, 0.99f});
-                        bitangentData->SetTangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::FromFbx);
+                        bitangentData->SetTangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
                         bitangentData->SetBitangentSetIndex(1);
                         return true;
                     }
@@ -317,7 +317,7 @@ namespace AZ
                 ExpectExecute("TestExpectFloatEquals(bitangentData.y, 0.88)");
                 ExpectExecute("TestExpectFloatEquals(bitangentData.z, 0.99)");
                 ExpectExecute("TestExpectIntegerEquals(meshVertexBitangentData:GetBitangentSetIndex(), 1)");
-                ExpectExecute("TestExpectTrue(meshVertexBitangentData:GetTangentSpace(), MeshVertexBitangentData.FromFbx)");
+                ExpectExecute("TestExpectTrue(meshVertexBitangentData:GetTangentSpace(), MeshVertexBitangentData.FromSourceScene)");
             }
 
             TEST_F(GrapDatahBehaviorScriptTest, SceneGraph_MeshVertexTangentData_AccessWorks)
diff --git a/Code/Tools/SceneAPI/SceneData/Tests/GraphData/MeshDataPrimitiveUtilsTests.cpp b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/MeshDataPrimitiveUtilsTests.cpp
index 682c24ae36..368431ce85 100644
--- a/Code/Tools/SceneAPI/SceneData/Tests/GraphData/MeshDataPrimitiveUtilsTests.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/MeshDataPrimitiveUtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Tests/GraphData/MeshDataTests.cpp b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/MeshDataTests.cpp
index 7635633c10..1adec26000 100644
--- a/Code/Tools/SceneAPI/SceneData/Tests/GraphData/MeshDataTests.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/MeshDataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Tests/SceneManifest/SceneManifestRuleTests.cpp b/Code/Tools/SceneAPI/SceneData/Tests/SceneManifest/SceneManifestRuleTests.cpp
index b0aa2fa60e..d246e3a406 100644
--- a/Code/Tools/SceneAPI/SceneData/Tests/SceneManifest/SceneManifestRuleTests.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Tests/SceneManifest/SceneManifestRuleTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneData/Tests/TestsMain.cpp b/Code/Tools/SceneAPI/SceneData/Tests/TestsMain.cpp
index 68d408dd5e..b44516e4e4 100644
--- a/Code/Tools/SceneAPI/SceneData/Tests/TestsMain.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Tests/TestsMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/CMakeLists.txt b/Code/Tools/SceneAPI/SceneUI/CMakeLists.txt
index d5d40b3bc8..df9d21b71d 100644
--- a/Code/Tools/SceneAPI/SceneUI/CMakeLists.txt
+++ b/Code/Tools/SceneAPI/SceneUI/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.cpp b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.cpp
index fd3c7dc98b..b0701cab11 100644
--- a/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.h b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.h
index aa4df4a168..9599310328 100644
--- a/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.h
+++ b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.cpp b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.cpp
index a5c082d2c0..bc03258c0c 100644
--- a/Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.h b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.h
index 75fdeb8ba5..d60f755fd7 100644
--- a/Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.h
+++ b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h
index 5f1db50ba6..6056034be6 100644
--- a/Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidgetLayer.h b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidgetLayer.h
index 379a6bd7c2..5a23d31c29 100644
--- a/Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidgetLayer.h
+++ b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidgetLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.cpp b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.cpp
index d8c1780bf8..cf96ff5276 100644
--- a/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.h b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.h
index 4c4f8ac593..bfab1b2054 100644
--- a/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/CommonWidgets/ProcessingOverlayWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/DllMain.cpp b/Code/Tools/SceneAPI/SceneUI/DllMain.cpp
index 90f10fd816..f590adca3a 100644
--- a/Code/Tools/SceneAPI/SceneUI/DllMain.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/DllMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.cpp b/Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.cpp
index 5f979da7c6..296661721d 100644
--- a/Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.h b/Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.h
index 6fb68dd139..9f7695a680 100644
--- a/Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.cpp b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.cpp
index e6a656f6b8..25dcdb943e 100644
--- a/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.h b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.h
index 21be234792..5d3cd43932 100644
--- a/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.cpp b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.cpp
index 97f5a5b9a8..d1a70c1f90 100644
--- a/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.h b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.h
index de713ebb73..d8187fe340 100644
--- a/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.cpp b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.cpp
index 4c42c6a6d9..e7923906e7 100644
--- a/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.h b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.h
index cbb40733dc..bafe244c3f 100644
--- a/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.cpp b/Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.cpp
index bac3fabe60..7422a3904b 100644
--- a/Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.h b/Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.h
index 5e16d68c20..97b6c0b4f7 100644
--- a/Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.cpp
index b17b5c1f8b..11944e0b48 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.h
index ba4497a70d..ce5ee5708e 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderWidget.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderWidget.cpp
index 2628e9a1a3..d116a95f47 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderWidget.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderWidget.h
index 9cae91e757..7b2ccb4ce3 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.cpp
index bb014f49fc..0266626900 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.h
index cef4a92ee5..bccbd424fa 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameWidget.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameWidget.cpp
index 57d32733e9..ec68243c22 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameWidget.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameWidget.h
index eb0a3c7926..05507d61ed 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.cpp
index 27f853634b..f5ecb6dd3c 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.h
index 42096778cb..c38c973e42 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorWidget.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorWidget.cpp
index 6d8036e99d..3ddd29099a 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorWidget.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorWidget.h
index 0e86ee2d2e..421eefee92 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.cpp
index d154ac641a..3c00f6d317 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.h
index c55542adce..283b02ffac 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionWidget.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionWidget.cpp
index 68aed6b349..98b5e034fb 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionWidget.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionWidget.h
index 28fa46f67e..827f6be8fb 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.cpp
index 863e6a0ca6..9254a30261 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.h
index 1be0beb985..e4af6287ff 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionWidget.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionWidget.cpp
index 444abf7b9d..950778e4f3 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionWidget.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionWidget.h
index fa7d691488..ce1ef87601 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.cpp
index 1abaca05b9..331fc9e8ee 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.h
index 4ae70af4c1..e0dffeef1a 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowWidget.cpp b/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowWidget.cpp
index 82ccd2dc6d..a8103cf798 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowWidget.h b/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowWidget.h
index ed69a0632a..77c36028aa 100644
--- a/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/RowWidgets/TransformRowWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneUIConfiguration.h b/Code/Tools/SceneAPI/SceneUI/SceneUIConfiguration.h
index 9050cb4226..cf42b2857c 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneUIConfiguration.h
+++ b/Code/Tools/SceneAPI/SceneUI/SceneUIConfiguration.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneUIStandaloneAllocator.cpp b/Code/Tools/SceneAPI/SceneUI/SceneUIStandaloneAllocator.cpp
index d91dbeec26..1c802666f1 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneUIStandaloneAllocator.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/SceneUIStandaloneAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneUIStandaloneAllocator.h b/Code/Tools/SceneAPI/SceneUI/SceneUIStandaloneAllocator.h
index 9866512340..7fbf7ab038 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneUIStandaloneAllocator.h
+++ b/Code/Tools/SceneAPI/SceneUI/SceneUIStandaloneAllocator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneUI_files.cmake b/Code/Tools/SceneAPI/SceneUI/SceneUI_files.cmake
index 57c252b503..e892f5bb0f 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneUI_files.cmake
+++ b/Code/Tools/SceneAPI/SceneUI/SceneUI_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneUI/SceneUI_testing_files.cmake b/Code/Tools/SceneAPI/SceneUI/SceneUI_testing_files.cmake
index 018cb0c048..5f270be242 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneUI_testing_files.cmake
+++ b/Code/Tools/SceneAPI/SceneUI/SceneUI_testing_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.cpp b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.cpp
index f2fb1d6e79..d0dc287767 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.h b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.h
index feb5b45be5..a83d1e4e0b 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.cpp b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.cpp
index b39e1d17bf..692d36b4fc 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.h b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.h
index ad7efd1b3e..79fa7bebbc 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.h
+++ b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.cpp b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.cpp
index 0de8092f9a..8835768fc5 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.h b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.h
index c588591ca7..13369ebd94 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphInspectWidget.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphWidget.cpp b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphWidget.cpp
index ccdaf48959..2b812fe254 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphWidget.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphWidget.h b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphWidget.h
index 99c89e8351..c8bc4f45a5 100644
--- a/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphWidget.h
+++ b/Code/Tools/SceneAPI/SceneUI/SceneWidgets/SceneGraphWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/Tests/RowWidgets/TransformRowWidgetTests.cpp b/Code/Tools/SceneAPI/SceneUI/Tests/RowWidgets/TransformRowWidgetTests.cpp
index aa239ba132..e42e327d83 100644
--- a/Code/Tools/SceneAPI/SceneUI/Tests/RowWidgets/TransformRowWidgetTests.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/Tests/RowWidgets/TransformRowWidgetTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SceneAPI/SceneUI/Tests/TestsMain.cpp b/Code/Tools/SceneAPI/SceneUI/Tests/TestsMain.cpp
index 911241cee1..241ed9b373 100644
--- a/Code/Tools/SceneAPI/SceneUI/Tests/TestsMain.cpp
+++ b/Code/Tools/SceneAPI/SceneUI/Tests/TestsMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/Application.cpp b/Code/Tools/SerializeContextTools/Application.cpp
index 98224cceb8..410602a19d 100644
--- a/Code/Tools/SerializeContextTools/Application.cpp
+++ b/Code/Tools/SerializeContextTools/Application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/Application.h b/Code/Tools/SerializeContextTools/Application.h
index 31a2cce948..f3c9a3b7c3 100644
--- a/Code/Tools/SerializeContextTools/Application.h
+++ b/Code/Tools/SerializeContextTools/Application.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/CMakeLists.txt b/Code/Tools/SerializeContextTools/CMakeLists.txt
index 38affa9eb0..abf3d77e0d 100644
--- a/Code/Tools/SerializeContextTools/CMakeLists.txt
+++ b/Code/Tools/SerializeContextTools/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SerializeContextTools/Converter.cpp b/Code/Tools/SerializeContextTools/Converter.cpp
index 1914c8b841..d8faabe128 100644
--- a/Code/Tools/SerializeContextTools/Converter.cpp
+++ b/Code/Tools/SerializeContextTools/Converter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/Converter.h b/Code/Tools/SerializeContextTools/Converter.h
index ef4dd045f7..f20ad31c9d 100644
--- a/Code/Tools/SerializeContextTools/Converter.h
+++ b/Code/Tools/SerializeContextTools/Converter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/Dumper.cpp b/Code/Tools/SerializeContextTools/Dumper.cpp
index 1b8ee9a9e2..663a7a9572 100644
--- a/Code/Tools/SerializeContextTools/Dumper.cpp
+++ b/Code/Tools/SerializeContextTools/Dumper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/Dumper.h b/Code/Tools/SerializeContextTools/Dumper.h
index eadde699fd..c49ce55b9d 100644
--- a/Code/Tools/SerializeContextTools/Dumper.h
+++ b/Code/Tools/SerializeContextTools/Dumper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/Platform/Linux/PAL_linux.cmake b/Code/Tools/SerializeContextTools/Platform/Linux/PAL_linux.cmake
index 7b05dac9b0..84188fb3c9 100644
--- a/Code/Tools/SerializeContextTools/Platform/Linux/PAL_linux.cmake
+++ b/Code/Tools/SerializeContextTools/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SerializeContextTools/Platform/Mac/PAL_mac.cmake b/Code/Tools/SerializeContextTools/Platform/Mac/PAL_mac.cmake
index 859b64a84b..1e514a7d9b 100644
--- a/Code/Tools/SerializeContextTools/Platform/Mac/PAL_mac.cmake
+++ b/Code/Tools/SerializeContextTools/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SerializeContextTools/Platform/Windows/PAL_windows.cmake b/Code/Tools/SerializeContextTools/Platform/Windows/PAL_windows.cmake
index 859b64a84b..1e514a7d9b 100644
--- a/Code/Tools/SerializeContextTools/Platform/Windows/PAL_windows.cmake
+++ b/Code/Tools/SerializeContextTools/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/SerializeContextTools/SliceConverter.cpp b/Code/Tools/SerializeContextTools/SliceConverter.cpp
index 291db1b9e0..0ffe7427e7 100644
--- a/Code/Tools/SerializeContextTools/SliceConverter.cpp
+++ b/Code/Tools/SerializeContextTools/SliceConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -208,13 +208,6 @@ namespace AZ
         bool SliceConverter::ConvertSliceToPrefab(
             AZ::SerializeContext* serializeContext, AZ::IO::PathView outputPath, bool isDryRun, AZ::Entity* rootEntity)
         {
-            /* Given a root slice entity, we convert it to a prefab by doing the following:
-            * - Locate the SliceComponent
-            * - Take all the entities directly located on the slice, and put them into a prefab
-            * - Fix up any top-level entities to have the prefab container entity as their parent
-            * - If there are any nested slice instances, convert the nested slices to prefabs, then convert the instances.
-            */
-
             auto prefabSystemComponentInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabSystemComponentInterface>::Get();
 
             // Find the slice from the root entity.
@@ -233,23 +226,47 @@ namespace AZ
             sliceComponent->RemoveAllEntities(deleteEntities, removeEmptyInstances);
             AZ_Printf("Convert-Slice", "  Slice contains %zu entities.\n", sliceEntities.size());
 
-            // Create the Prefab with the entities from the slice.
+            // Create an empty Prefab as the start of our conversion.
             // The entities are added in a separate step so that we can give them deterministic entity aliases that match their entity Ids
             AZStd::unique_ptr<AzToolsFramework::Prefab::Instance> sourceInstance(
                 prefabSystemComponentInterface->CreatePrefab({}, {}, outputPath));
+
+            // Add entities into our prefab.
+            // In slice->prefab conversions, there's a chicken-and-egg problem that occurs with entity references, so we're initially
+            // going to add empty dummy entities with the right IDs and aliases.
+            // The problem is that we can have entities in this root list that have references to nested slice instance entities that we
+            // haven't created yet, and we will have nested slice entities that need to reference these entities as parents.
+            // If we create these entities as fully-formed first, they will fail to serialize correctly when adding each nested instance,
+            // due to the references not pointing to valid entities yet.  And if we *wait* to create these and build the nested instances
+            // first, they'll fail to serialize correctly due to referencing these as parents.
+            // So our solution is that we'll initially create these entities as empty placeholders with no references, *then* we'll build
+            // up the nested instances, *then* we'll finish building these entities out.
+
+            // prefabPlaceholderEntities will hold onto pointers to the entities we're building up in the prefab.  The prefab will own
+            // the lifetime of them, but we'll use the references here for convenient access.
+            AZStd::vector<AZ::Entity*> prefabPlaceholderEntities;
+            // entityAliases will hold onto the alias we want to use for each of those entities.  We'll need to use the same alias when
+            // we replace the entities at the end.
+            AZStd::vector<AZStd::string> entityAliases;
             for (auto& entity : sliceEntities)
             {
-                sourceInstance->AddEntity(*entity, AZStd::string::format("Entity_%s", entity->GetId().ToString().c_str()));
+                auto id = entity->GetId();
+                prefabPlaceholderEntities.emplace_back(aznew AZ::Entity(id));
+                entityAliases.emplace_back(AZStd::string::format("Entity_%s", id.ToString().c_str()));
+                sourceInstance->AddEntity(*(prefabPlaceholderEntities.back()), entityAliases.back());
+
+                // Save off a mapping of the original slice entity IDs to the new prefab template entity aliases.
+                // We'll need this mapping for fixing up all the entity references in this slice as well as any nested instances.
+                auto result = m_aliasIdMapper.emplace(id, SliceEntityMappingInfo(sourceInstance->GetTemplateId(), entityAliases.back()));
+                if (!result.second)
+                {
+                    AZ_Printf("Convert-Slice", "  Duplicate entity alias -> entity id entries found, conversion may not be successful.\n");
+                }
             }
 
             // Dispatch events here, because prefab creation might trigger asset loads in rare circumstances.
             AZ::Data::AssetManager::Instance().DispatchEvents();
 
-            // Fix up the container entity to have the proper components and fix up the slice entities to have the proper hierarchy
-            // with the container as the top-most parent.
-            AzToolsFramework::Prefab::EntityOptionalReference container = sourceInstance->GetContainerEntity();
-            FixPrefabEntities(container->get(), sliceEntities);
-
             // Keep track of the template Id we created, we're going to remove it at the end of slice file conversion to make sure
             // the data doesn't stick around between file conversions.
             auto templateId = sourceInstance->GetTemplateId();
@@ -260,26 +277,8 @@ namespace AZ
             }
             m_createdTemplateIds.emplace(templateId);
 
-            // Save off a mapping of the original slice entity IDs to the new prefab template entity aliases.
-            // When converting nested slices, this mapping will be needed to fix up the parent entity hierarchy correctly.
-            auto entityAliases = sourceInstance->GetEntityAliases();
-            for (auto& alias : entityAliases)
-            {
-                auto id = sourceInstance->GetEntityId(alias);
-                auto result = m_aliasIdMapper.emplace(id, SliceEntityMappingInfo(templateId, alias));
-                if (!result.second)
-                {
-                    AZ_Printf("Convert-Slice", "  Duplicate entity alias -> entity id entries found, conversion may not be successful.\n");
-                }
-            }
-
-            // Save off a mapping of the slice's metadata entity ID as well, even though we never converted the entity itself.
-            // This will help us better detect entity ID mapping errors for nested slice instances.
-            AZ::Entity* metadataEntity = sliceComponent->GetMetadataEntity();
-            constexpr bool isMetadataEntity = true;
-            m_aliasIdMapper.emplace(metadataEntity->GetId(), SliceEntityMappingInfo(templateId, "MetadataEntity", isMetadataEntity));
-
-            // Update the prefab template with the fixed-up data in our prefab instance.
+            // Save off the the first version of this prefab template with our empty placeholder entities.
+            // As it saves off, the entities will all change IDs during serialization / propagation, but the aliases will remain the same.
             AzToolsFramework::Prefab::PrefabDom prefabDom;
             bool storeResult = AzToolsFramework::Prefab::PrefabDomUtils::StoreInstanceInPrefabDom(*sourceInstance, prefabDom);
             if (storeResult == false)
@@ -288,10 +287,20 @@ namespace AZ
                 return false;
             }
             prefabSystemComponentInterface->UpdatePrefabTemplate(templateId, prefabDom);
+            AZ::Interface<AzToolsFramework::Prefab::InstanceUpdateExecutorInterface>::Get()->UpdateTemplateInstancesInQueue();
 
             // Dispatch events here, because prefab serialization might trigger asset loads in rare circumstances.
             AZ::Data::AssetManager::Instance().DispatchEvents();
 
+            // Save off a mapping of the slice's metadata entity ID as well, even though we never converted the entity itself.
+            // This will help us better detect entity ID mapping errors for nested slice instances.
+            AZ::Entity* metadataEntity = sliceComponent->GetMetadataEntity();
+            constexpr bool isMetadataEntity = true;
+            m_aliasIdMapper.emplace(metadataEntity->GetId(), SliceEntityMappingInfo(templateId, "MetadataEntity", isMetadataEntity));
+
+            // Also save off a mapping of the prefab's container entity ID.
+            m_aliasIdMapper.emplace(sourceInstance->GetContainerEntityId(), SliceEntityMappingInfo(templateId, "ContainerEntity"));
+
             // If this slice has nested slices, we need to loop through those, convert them to prefabs as well, and
             // set up the new nesting relationships correctly.
             const SliceComponent::SliceList& sliceList = sliceComponent->GetSlices();
@@ -305,6 +314,51 @@ namespace AZ
                 }
             }
 
+            // *After* converting the nested slices, remove our placeholder entities and replace them with the correct ones.
+            // The placeholder entity IDs will have changed from what we originally created, so we need to make sure our replacement
+            // entities have the same IDs and aliases as the placeholders so that any instance references that have already been fixed
+            // up continue to reference the correct entities here.
+            for (size_t curEntityIdx = 0; curEntityIdx < sliceEntities.size(); curEntityIdx++)
+            {
+                auto& sliceEntity = sliceEntities[curEntityIdx];
+                auto& prefabEntity = prefabPlaceholderEntities[curEntityIdx];
+                sliceEntity->SetId(prefabEntity->GetId());
+            }
+            // Remove and delete our placeholder entities.
+            // (By using an empty callback on DetachEntities, the unique_ptr will auto-delete the placeholder entities)
+            sourceInstance->DetachEntities([](AZStd::unique_ptr<AZ::Entity>){});
+            prefabPlaceholderEntities.clear();
+            for (size_t curEntityIdx = 0; curEntityIdx < sliceEntities.size(); curEntityIdx++)
+            {
+                sourceInstance->AddEntity(*(sliceEntities[curEntityIdx]), entityAliases[curEntityIdx]);
+            }
+
+            // Fix up the container entity to have the proper components and fix up the slice entities to have the proper hierarchy
+            // with the container as the top-most parent.
+            AzToolsFramework::Prefab::EntityOptionalReference container = sourceInstance->GetContainerEntity();
+            FixPrefabEntities(container->get(), sliceEntities);
+
+            // Also save off a mapping of the prefab's container entity ID.
+            m_aliasIdMapper.emplace(sourceInstance->GetContainerEntityId(), SliceEntityMappingInfo(templateId, "ContainerEntity"));
+
+            // Remap all of the entity references that exist in these top-level slice entities.
+            SliceComponent::InstantiatedContainer instantiatedEntities(false);
+            instantiatedEntities.m_entities = sliceEntities;
+            RemapIdReferences(m_aliasIdMapper, sourceInstance.get(), sourceInstance.get(), &instantiatedEntities, serializeContext);
+
+            // Finally, store the completed slice->prefab conversion back into the template.
+            storeResult = AzToolsFramework::Prefab::PrefabDomUtils::StoreInstanceInPrefabDom(*sourceInstance, prefabDom);
+            if (storeResult == false)
+            {
+                AZ_Printf("Convert-Slice", "  Failed to convert prefab instance data to a PrefabDom.\n");
+                return false;
+            }
+            prefabSystemComponentInterface->UpdatePrefabTemplate(templateId, prefabDom);
+            AZ::Interface<AzToolsFramework::Prefab::InstanceUpdateExecutorInterface>::Get()->UpdateTemplateInstancesInQueue();
+
+            // Dispatch events here, because prefab serialization might trigger asset loads in rare circumstances.
+            AZ::Data::AssetManager::Instance().DispatchEvents();
+
             if (isDryRun)
             {
                 PrintPrefab(templateId);
@@ -417,7 +471,7 @@ namespace AZ
 
                 auto instances = slice.GetInstances();
                 AZ_Printf(
-                    "Convert-Slice", "  Attaching %zu instances of nested slice '%s'.\n", instances.size(),
+                    "Convert-Slice", "Attaching %zu instances of nested slice '%s'.\n", instances.size(),
                     nestedPrefabPath.Native().c_str());
 
                 // Before processing any further, save off all the known entity IDs from all the instances and how they map back to
@@ -435,14 +489,20 @@ namespace AZ
                 }
 
                 // Now that we have all the entity ID mappings, convert all the instances.
+                size_t curInstance = 0;
                 for (auto& instance : instances)
                 {
+                    AZ_Printf("Convert-Slice", "  Converting instance %zu.\n", curInstance++);
                     bool instanceConvertResult = ConvertSliceInstance(instance, sliceAsset, nestedTemplate, sourceInstance);
                     if (!instanceConvertResult)
                     {
                         return false;
                     }
                 }
+
+                AZ_Printf(
+                    "Convert-Slice", "Finished attaching %zu instances of nested slice '%s'.\n", instances.size(),
+                    nestedPrefabPath.Native().c_str());
             }
 
             return true;
@@ -507,6 +567,10 @@ namespace AZ
                 return false;
             }
 
+            // Save off a mapping of the new nested Instance's container ID
+            m_aliasIdMapper.emplace(nestedInstance->GetContainerEntityId(),
+                SliceEntityMappingInfo(nestedInstance->GetTemplateId(), "ContainerEntity"));
+
             // Get the DOM for the unmodified nested instance.  This will be used later below for generating the correct patch
             // to the top-level template DOM.
             AzToolsFramework::Prefab::PrefabDom unmodifiedNestedInstanceDom;
@@ -595,7 +659,7 @@ namespace AZ
                     auto parentId = transformComponent->GetParentId();
                     if (parentId.IsValid())
                     {
-                        // Look to see if the parent ID exists in the same instance (i.e. an entity in the nested slice is a
+                        // Look to see if the parent ID exists in a different instance (i.e. an entity in the nested slice is a
                         // child of an entity in the containing slice).  If this case exists, we need to adjust the parents so that
                         // the child entity connects to the prefab container, and the *container* is the child of the entity in the
                         // containing slice.  (i.e. go from A->B to A->container->B)
@@ -607,6 +671,7 @@ namespace AZ
                             {
                                 if (topLevelInstance->GetTemplateId() == parentMappingInfo.m_templateId)
                                 {
+                                    // This entity has a parent from the topLevelInstance, so get its parent ID.
                                     parentId = topLevelInstance->GetEntityId(parentMappingInfo.m_entityAlias);
                                 }
                                 else
@@ -630,15 +695,23 @@ namespace AZ
                                 }
 
                                 // Set the container's parent to this entity's parent, and set this entity's parent to the container
-                                // auto newParentId = topLevelInstance->GetEntityId(parentMappingInfo.m_entityAlias);
                                 SetParentEntity(containerEntity->get(), parentId, false);
                                 onlySetIfInvalid = false;
                             }
+                            else
+                            {
+                                // If the parent ID is valid and exists inside the same slice instance (i.e. template IDs are equal)
+                                // then it's just a nested entity hierarchy inside the slice and we don't need to adjust anything.
+                                // "onlySetIfInvalid" will still be true, which means we won't change the parent ID below.
+                            }
+                        }
+                        else
+                        {
+                            // If the parent ID is set to something valid, but we can't find it in our ID mapper, something went wrong.
+                            // We'll assert, but don't change the container entity's parent below.
+                            AZ_Assert(false, "Could not find parent entity id: %s", parentId.ToString().c_str());
                         }
 
-                        // If the parent ID is valid, but NOT in the top-level instance, then it's just a nested hierarchy inside
-                        // the slice and we don't need to adjust anything.  "onlySetIfInvalid" will still be true, which means we
-                        // won't change the parent ID below.
                     }
 
                     SetParentEntity(*entity, containerEntityId, onlySetIfInvalid);
@@ -846,9 +919,10 @@ namespace AZ
                     {
                         auto entityEntry = idMapper.find(sourceId);
 
-                        // Since we've already remapped transform hierarchies to include container entities, it's possible that our entity
-                        // reference is pointing to a container, which means it won't be in our slice mapping table.  In that case, just
-                        // return it as-is.
+                        // The id mapping table should include all of our known slice entities, slice metadata entities, and prefab
+                        // container entities.  If we can't find the entity reference, it should either be because it's actually invalid
+                        // in the source data or because it's a transform parent id that we've already remapped prior to this point.
+                        // Either way, just keep it as-is and return it.
                         if (entityEntry == idMapper.end())
                         {
                             return sourceId;
@@ -876,6 +950,7 @@ namespace AZ
                             else
                             {
                                 AZ_Error("Convert-Slice", false, "  Couldn't find source ID %s", sourceId.ToString().c_str());
+                                newId = sourceId;
                             }
                         }
                         else
diff --git a/Code/Tools/SerializeContextTools/SliceConverter.h b/Code/Tools/SerializeContextTools/SliceConverter.h
index 88f69fb3e4..07fddc8fa1 100644
--- a/Code/Tools/SerializeContextTools/SliceConverter.h
+++ b/Code/Tools/SerializeContextTools/SliceConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/SliceConverterEditorEntityContextComponent.h b/Code/Tools/SerializeContextTools/SliceConverterEditorEntityContextComponent.h
index d308e01485..d3d10a997e 100644
--- a/Code/Tools/SerializeContextTools/SliceConverterEditorEntityContextComponent.h
+++ b/Code/Tools/SerializeContextTools/SliceConverterEditorEntityContextComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/Utilities.cpp b/Code/Tools/SerializeContextTools/Utilities.cpp
index 0f6933f045..9b068305c2 100644
--- a/Code/Tools/SerializeContextTools/Utilities.cpp
+++ b/Code/Tools/SerializeContextTools/Utilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/Utilities.h b/Code/Tools/SerializeContextTools/Utilities.h
index d7cf570854..36cadc1e26 100644
--- a/Code/Tools/SerializeContextTools/Utilities.h
+++ b/Code/Tools/SerializeContextTools/Utilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/main.cpp b/Code/Tools/SerializeContextTools/main.cpp
index cbfbcb314d..205ed3e603 100644
--- a/Code/Tools/SerializeContextTools/main.cpp
+++ b/Code/Tools/SerializeContextTools/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/SerializeContextTools/serializecontexttools_files.cmake b/Code/Tools/SerializeContextTools/serializecontexttools_files.cmake
index 09ba9223ed..acc1641236 100644
--- a/Code/Tools/SerializeContextTools/serializecontexttools_files.cmake
+++ b/Code/Tools/SerializeContextTools/serializecontexttools_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/CMakeLists.txt b/Code/Tools/Standalone/CMakeLists.txt
index 58d4985691..f2f4999ed6 100644
--- a/Code/Tools/Standalone/CMakeLists.txt
+++ b/Code/Tools/Standalone/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/Platform/Common/Unimplemented/Source/Driller/EvenTrace/EventTraceDataAggregator_Unimplemented.cpp b/Code/Tools/Standalone/Platform/Common/Unimplemented/Source/Driller/EvenTrace/EventTraceDataAggregator_Unimplemented.cpp
index 0b19244431..498ec05d4e 100644
--- a/Code/Tools/Standalone/Platform/Common/Unimplemented/Source/Driller/EvenTrace/EventTraceDataAggregator_Unimplemented.cpp
+++ b/Code/Tools/Standalone/Platform/Common/Unimplemented/Source/Driller/EvenTrace/EventTraceDataAggregator_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Platform/Common/Unimplemented/Source/StandaloneApplication_Unimplemented.cpp b/Code/Tools/Standalone/Platform/Common/Unimplemented/Source/StandaloneApplication_Unimplemented.cpp
index 62cc576117..10c6c7acce 100644
--- a/Code/Tools/Standalone/Platform/Common/Unimplemented/Source/StandaloneApplication_Unimplemented.cpp
+++ b/Code/Tools/Standalone/Platform/Common/Unimplemented/Source/StandaloneApplication_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Platform/Linux/lua_ide_linux_files.cmake b/Code/Tools/Standalone/Platform/Linux/lua_ide_linux_files.cmake
index 90131ecc18..b197d4537b 100644
--- a/Code/Tools/Standalone/Platform/Linux/lua_ide_linux_files.cmake
+++ b/Code/Tools/Standalone/Platform/Linux/lua_ide_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/Platform/Linux/profiler_linux_files.cmake b/Code/Tools/Standalone/Platform/Linux/profiler_linux_files.cmake
index f192754d22..5dba015243 100644
--- a/Code/Tools/Standalone/Platform/Linux/profiler_linux_files.cmake
+++ b/Code/Tools/Standalone/Platform/Linux/profiler_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/Platform/Mac/Source/Driller/EvenTrace/EventTraceDataAggregator_Mac.cpp b/Code/Tools/Standalone/Platform/Mac/Source/Driller/EvenTrace/EventTraceDataAggregator_Mac.cpp
index 4dce8f4878..009b726c1b 100644
--- a/Code/Tools/Standalone/Platform/Mac/Source/Driller/EvenTrace/EventTraceDataAggregator_Mac.cpp
+++ b/Code/Tools/Standalone/Platform/Mac/Source/Driller/EvenTrace/EventTraceDataAggregator_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Platform/Mac/Source/StandaloneApplication_Mac.cpp b/Code/Tools/Standalone/Platform/Mac/Source/StandaloneApplication_Mac.cpp
index 1630e4cd64..9d8f8ef7f4 100644
--- a/Code/Tools/Standalone/Platform/Mac/Source/StandaloneApplication_Mac.cpp
+++ b/Code/Tools/Standalone/Platform/Mac/Source/StandaloneApplication_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Platform/Mac/lua_ide_mac_files.cmake b/Code/Tools/Standalone/Platform/Mac/lua_ide_mac_files.cmake
index 1eed54fb97..3e017743ca 100644
--- a/Code/Tools/Standalone/Platform/Mac/lua_ide_mac_files.cmake
+++ b/Code/Tools/Standalone/Platform/Mac/lua_ide_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/Platform/Mac/profiler_mac_files.cmake b/Code/Tools/Standalone/Platform/Mac/profiler_mac_files.cmake
index c24b1cbf2e..60845d96d5 100644
--- a/Code/Tools/Standalone/Platform/Mac/profiler_mac_files.cmake
+++ b/Code/Tools/Standalone/Platform/Mac/profiler_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/Platform/Windows/Source/Driller/EvenTrace/EventTraceDataAggregator_Windows.cpp b/Code/Tools/Standalone/Platform/Windows/Source/Driller/EvenTrace/EventTraceDataAggregator_Windows.cpp
index f537b1ee69..85771ed4e9 100644
--- a/Code/Tools/Standalone/Platform/Windows/Source/Driller/EvenTrace/EventTraceDataAggregator_Windows.cpp
+++ b/Code/Tools/Standalone/Platform/Windows/Source/Driller/EvenTrace/EventTraceDataAggregator_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Platform/Windows/Source/StandaloneApplication_Windows.cpp b/Code/Tools/Standalone/Platform/Windows/Source/StandaloneApplication_Windows.cpp
index 6c4ac0a70a..265f8945e1 100644
--- a/Code/Tools/Standalone/Platform/Windows/Source/StandaloneApplication_Windows.cpp
+++ b/Code/Tools/Standalone/Platform/Windows/Source/StandaloneApplication_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Platform/Windows/lua_ide_windows_files.cmake b/Code/Tools/Standalone/Platform/Windows/lua_ide_windows_files.cmake
index af33aef159..1314849df4 100644
--- a/Code/Tools/Standalone/Platform/Windows/lua_ide_windows_files.cmake
+++ b/Code/Tools/Standalone/Platform/Windows/lua_ide_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/Platform/Windows/profiler_windows_files.cmake b/Code/Tools/Standalone/Platform/Windows/profiler_windows_files.cmake
index fb46a8fb3e..85b4553488 100644
--- a/Code/Tools/Standalone/Platform/Windows/profiler_windows_files.cmake
+++ b/Code/Tools/Standalone/Platform/Windows/profiler_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/Source/AssetDatabaseLocationListener.cpp b/Code/Tools/Standalone/Source/AssetDatabaseLocationListener.cpp
index aed7642c69..476b6657d4 100644
--- a/Code/Tools/Standalone/Source/AssetDatabaseLocationListener.cpp
+++ b/Code/Tools/Standalone/Source/AssetDatabaseLocationListener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/AssetDatabaseLocationListener.h b/Code/Tools/Standalone/Source/AssetDatabaseLocationListener.h
index 523e9f3a7c..1994d22500 100644
--- a/Code/Tools/Standalone/Source/AssetDatabaseLocationListener.h
+++ b/Code/Tools/Standalone/Source/AssetDatabaseLocationListener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
index 747e359c6d..9231400e72 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.hxx b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.hxx
index e6e3473a45..a278142f12 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/Annotations.cpp b/Code/Tools/Standalone/Source/Driller/Annotations/Annotations.cpp
index 46726e6a73..c402734a37 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/Annotations.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/Annotations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/Annotations.hxx b/Code/Tools/Standalone/Source/Driller/Annotations/Annotations.hxx
index c7061e96cd..0802a16149 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/Annotations.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/Annotations.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView.cpp b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView.cpp
index ae7f571d86..19ae075bc4 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView.hxx b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView.hxx
index 4e16e4f55e..b392051bbe 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView_Events.cpp b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView_Events.cpp
index e004f4da33..6728acd216 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView_Events.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView_Events.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView_Events.hxx b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView_Events.hxx
index b5b74d666d..7f2138444a 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView_Events.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsDataView_Events.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsHeaderView_Events.cpp b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsHeaderView_Events.cpp
index ba92bdebf9..47784b76b1 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsHeaderView_Events.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsHeaderView_Events.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsHeaderView_Events.hxx b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsHeaderView_Events.hxx
index c988ea76d5..1a80da59e8 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsHeaderView_Events.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationsHeaderView_Events.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/ConfigureAnnotationsWindow.cpp b/Code/Tools/Standalone/Source/Driller/Annotations/ConfigureAnnotationsWindow.cpp
index 05d978975f..75e34fea36 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/ConfigureAnnotationsWindow.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/ConfigureAnnotationsWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Annotations/ConfigureAnnotationsWindow.hxx b/Code/Tools/Standalone/Source/Driller/Annotations/ConfigureAnnotationsWindow.hxx
index 90b9b3912b..47796a604a 100644
--- a/Code/Tools/Standalone/Source/Driller/Annotations/ConfigureAnnotationsWindow.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Annotations/ConfigureAnnotationsWindow.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/AreaChart.cpp b/Code/Tools/Standalone/Source/Driller/AreaChart.cpp
index aa6eda3463..10032e5c2c 100644
--- a/Code/Tools/Standalone/Source/Driller/AreaChart.cpp
+++ b/Code/Tools/Standalone/Source/Driller/AreaChart.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/AreaChart.hxx b/Code/Tools/Standalone/Source/Driller/AreaChart.hxx
index 11ffb10a19..52855db99d 100644
--- a/Code/Tools/Standalone/Source/Driller/AreaChart.hxx
+++ b/Code/Tools/Standalone/Source/Driller/AreaChart.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Axis.cpp b/Code/Tools/Standalone/Source/Driller/Axis.cpp
index 8acb69cd35..51fd0fb556 100644
--- a/Code/Tools/Standalone/Source/Driller/Axis.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Axis.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Axis.hxx b/Code/Tools/Standalone/Source/Driller/Axis.hxx
index bbc180e871..19dadea6ef 100644
--- a/Code/Tools/Standalone/Source/Driller/Axis.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Axis.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/CSVExportSettings.h b/Code/Tools/Standalone/Source/Driller/CSVExportSettings.h
index 767b26a7ab..a8803c6701 100644
--- a/Code/Tools/Standalone/Source/Driller/CSVExportSettings.h
+++ b/Code/Tools/Standalone/Source/Driller/CSVExportSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataAggregator.cpp
index 3cc03b11fb..0ce93296ac 100644
--- a/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataAggregator.hxx b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataAggregator.hxx
index e6d753b146..ae7cec649e 100644
--- a/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataAggregator.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataAggregator.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataEvents.h b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataEvents.h
index 99a866c5d0..c95797aed5 100644
--- a/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataEvents.h
+++ b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataParser.cpp b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataParser.cpp
index 2720233551..3343ec6493 100644
--- a/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataParser.h b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataParser.h
index 6299353a7f..5620f4f6b0 100644
--- a/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataParser.h
+++ b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataView.cpp b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataView.cpp
index d03f7e5de7..990672a28e 100644
--- a/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataView.hxx b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataView.hxx
index e8daebb5ee..65c820e695 100644
--- a/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierDataView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Carrier/CarrierOperationTelemetryEvent.h b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierOperationTelemetryEvent.h
index cbc051e344..af8751f570 100644
--- a/Code/Tools/Standalone/Source/Driller/Carrier/CarrierOperationTelemetryEvent.h
+++ b/Code/Tools/Standalone/Source/Driller/Carrier/CarrierOperationTelemetryEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelConfigurationDialog.cpp b/Code/Tools/Standalone/Source/Driller/ChannelConfigurationDialog.cpp
index 51f9c8b152..7b1117b7cc 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelConfigurationDialog.cpp
+++ b/Code/Tools/Standalone/Source/Driller/ChannelConfigurationDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelConfigurationDialog.hxx b/Code/Tools/Standalone/Source/Driller/ChannelConfigurationDialog.hxx
index 8a7c1e45bb..f659f898cc 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelConfigurationDialog.hxx
+++ b/Code/Tools/Standalone/Source/Driller/ChannelConfigurationDialog.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelConfigurationWidget.cpp b/Code/Tools/Standalone/Source/Driller/ChannelConfigurationWidget.cpp
index 0e7d48b0ad..20b250c6a9 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelConfigurationWidget.cpp
+++ b/Code/Tools/Standalone/Source/Driller/ChannelConfigurationWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelConfigurationWidget.hxx b/Code/Tools/Standalone/Source/Driller/ChannelConfigurationWidget.hxx
index 9830623f04..52950ecf23 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelConfigurationWidget.hxx
+++ b/Code/Tools/Standalone/Source/Driller/ChannelConfigurationWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelControl.cpp b/Code/Tools/Standalone/Source/Driller/ChannelControl.cpp
index e034efb07c..37628de1bc 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelControl.cpp
+++ b/Code/Tools/Standalone/Source/Driller/ChannelControl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelControl.hxx b/Code/Tools/Standalone/Source/Driller/ChannelControl.hxx
index 14edad4702..b0cb675cd9 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelControl.hxx
+++ b/Code/Tools/Standalone/Source/Driller/ChannelControl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp b/Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
index eff028172f..69c7cc1b5f 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelDataView.hxx b/Code/Tools/Standalone/Source/Driller/ChannelDataView.hxx
index 0dda6a80f5..5bff5ceaa4 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelDataView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/ChannelDataView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelProfilerWidget.cpp b/Code/Tools/Standalone/Source/Driller/ChannelProfilerWidget.cpp
index acc9aa7b5c..863f9db826 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelProfilerWidget.cpp
+++ b/Code/Tools/Standalone/Source/Driller/ChannelProfilerWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChannelProfilerWidget.hxx b/Code/Tools/Standalone/Source/Driller/ChannelProfilerWidget.hxx
index 51a3980849..40a40bb5a5 100644
--- a/Code/Tools/Standalone/Source/Driller/ChannelProfilerWidget.hxx
+++ b/Code/Tools/Standalone/Source/Driller/ChannelProfilerWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChartNumberFormats.cpp b/Code/Tools/Standalone/Source/Driller/ChartNumberFormats.cpp
index f94e01cb70..761b531b53 100644
--- a/Code/Tools/Standalone/Source/Driller/ChartNumberFormats.cpp
+++ b/Code/Tools/Standalone/Source/Driller/ChartNumberFormats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChartNumberFormats.h b/Code/Tools/Standalone/Source/Driller/ChartNumberFormats.h
index f3fe9179ba..89071cbfff 100644
--- a/Code/Tools/Standalone/Source/Driller/ChartNumberFormats.h
+++ b/Code/Tools/Standalone/Source/Driller/ChartNumberFormats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChartTypes.cpp b/Code/Tools/Standalone/Source/Driller/ChartTypes.cpp
index 42c9c2f54a..e2e65415ba 100644
--- a/Code/Tools/Standalone/Source/Driller/ChartTypes.cpp
+++ b/Code/Tools/Standalone/Source/Driller/ChartTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/ChartTypes.hxx b/Code/Tools/Standalone/Source/Driller/ChartTypes.hxx
index 91ca915380..468f69d39a 100644
--- a/Code/Tools/Standalone/Source/Driller/ChartTypes.hxx
+++ b/Code/Tools/Standalone/Source/Driller/ChartTypes.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/CollapsiblePanel.cpp b/Code/Tools/Standalone/Source/Driller/CollapsiblePanel.cpp
index 53f4a105ac..795b30254e 100644
--- a/Code/Tools/Standalone/Source/Driller/CollapsiblePanel.cpp
+++ b/Code/Tools/Standalone/Source/Driller/CollapsiblePanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/CollapsiblePanel.hxx b/Code/Tools/Standalone/Source/Driller/CollapsiblePanel.hxx
index 9f0a9bb36d..71e98f4d40 100644
--- a/Code/Tools/Standalone/Source/Driller/CollapsiblePanel.hxx
+++ b/Code/Tools/Standalone/Source/Driller/CollapsiblePanel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/CombinedEventsControl.cpp b/Code/Tools/Standalone/Source/Driller/CombinedEventsControl.cpp
index 732002d482..c4710565a0 100644
--- a/Code/Tools/Standalone/Source/Driller/CombinedEventsControl.cpp
+++ b/Code/Tools/Standalone/Source/Driller/CombinedEventsControl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/CombinedEventsControl.hxx b/Code/Tools/Standalone/Source/Driller/CombinedEventsControl.hxx
index 3c0de81687..85c9d2dbb0 100644
--- a/Code/Tools/Standalone/Source/Driller/CombinedEventsControl.hxx
+++ b/Code/Tools/Standalone/Source/Driller/CombinedEventsControl.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/CustomizeCSVExportWidget.cpp b/Code/Tools/Standalone/Source/Driller/CustomizeCSVExportWidget.cpp
index 3ec61073be..b7b47f51f7 100644
--- a/Code/Tools/Standalone/Source/Driller/CustomizeCSVExportWidget.cpp
+++ b/Code/Tools/Standalone/Source/Driller/CustomizeCSVExportWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/CustomizeCSVExportWidget.hxx b/Code/Tools/Standalone/Source/Driller/CustomizeCSVExportWidget.hxx
index a8802c91b4..3128bb7518 100644
--- a/Code/Tools/Standalone/Source/Driller/CustomizeCSVExportWidget.hxx
+++ b/Code/Tools/Standalone/Source/Driller/CustomizeCSVExportWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DoubleListSelector.cpp b/Code/Tools/Standalone/Source/Driller/DoubleListSelector.cpp
index 701385b6de..986f41c849 100644
--- a/Code/Tools/Standalone/Source/Driller/DoubleListSelector.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DoubleListSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DoubleListSelector.hxx b/Code/Tools/Standalone/Source/Driller/DoubleListSelector.hxx
index 4f61854d49..c415cf6444 100644
--- a/Code/Tools/Standalone/Source/Driller/DoubleListSelector.hxx
+++ b/Code/Tools/Standalone/Source/Driller/DoubleListSelector.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerAggregator.cpp b/Code/Tools/Standalone/Source/Driller/DrillerAggregator.cpp
index 2ddbb3e1f6..1e4022be86 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DrillerAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerAggregator.hxx b/Code/Tools/Standalone/Source/Driller/DrillerAggregator.hxx
index 0ef07a4c45..c6b5fbb8ff 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerAggregator.hxx
+++ b/Code/Tools/Standalone/Source/Driller/DrillerAggregator.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerAggregatorOptions.hxx b/Code/Tools/Standalone/Source/Driller/DrillerAggregatorOptions.hxx
index 8dd5cd72cb..b6c08f2ccb 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerAggregatorOptions.hxx
+++ b/Code/Tools/Standalone/Source/Driller/DrillerAggregatorOptions.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp b/Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
index e55b6ec237..65e05a8cee 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.hxx b/Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.hxx
index b740524e82..168700a62a 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.hxx
+++ b/Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerContext.cpp b/Code/Tools/Standalone/Source/Driller/DrillerContext.cpp
index 3cbf128b8c..70be41cedf 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerContext.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DrillerContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerContext.h b/Code/Tools/Standalone/Source/Driller/DrillerContext.h
index ac06836f10..ba939f9a39 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerContext.h
+++ b/Code/Tools/Standalone/Source/Driller/DrillerContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerContextInterface.h b/Code/Tools/Standalone/Source/Driller/DrillerContextInterface.h
index cdbbbc2e9e..ce5e34bf1c 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerContextInterface.h
+++ b/Code/Tools/Standalone/Source/Driller/DrillerContextInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerDataContainer.cpp b/Code/Tools/Standalone/Source/Driller/DrillerDataContainer.cpp
index b2b733bf5e..c60e40e3dd 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerDataContainer.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DrillerDataContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerDataContainer.h b/Code/Tools/Standalone/Source/Driller/DrillerDataContainer.h
index 521991124a..9b8068efea 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerDataContainer.h
+++ b/Code/Tools/Standalone/Source/Driller/DrillerDataContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerDataTypes.h b/Code/Tools/Standalone/Source/Driller/DrillerDataTypes.h
index 9cd478c558..029c4a8bd7 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerDataTypes.h
+++ b/Code/Tools/Standalone/Source/Driller/DrillerDataTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerEvent.cpp b/Code/Tools/Standalone/Source/Driller/DrillerEvent.cpp
index 5bf03251e6..9d0ff44014 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerEvent.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DrillerEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerEvent.h b/Code/Tools/Standalone/Source/Driller/DrillerEvent.h
index ac010f8017..62799ae671 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerEvent.h
+++ b/Code/Tools/Standalone/Source/Driller/DrillerEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerMainWindow.cpp b/Code/Tools/Standalone/Source/Driller/DrillerMainWindow.cpp
index b6788b1857..fe6ac686b2 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerMainWindow.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DrillerMainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerMainWindow.hxx b/Code/Tools/Standalone/Source/Driller/DrillerMainWindow.hxx
index 4b680c2d01..67d0a0d6d4 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerMainWindow.hxx
+++ b/Code/Tools/Standalone/Source/Driller/DrillerMainWindow.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerMainWindowMessages.cpp b/Code/Tools/Standalone/Source/Driller/DrillerMainWindowMessages.cpp
index 121db190aa..a900fb1b2a 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerMainWindowMessages.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DrillerMainWindowMessages.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerMainWindowMessages.h b/Code/Tools/Standalone/Source/Driller/DrillerMainWindowMessages.h
index eb6f16f4ee..3c62b465e1 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerMainWindowMessages.h
+++ b/Code/Tools/Standalone/Source/Driller/DrillerMainWindowMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerNetworkMessages.h b/Code/Tools/Standalone/Source/Driller/DrillerNetworkMessages.h
index 9df18f9690..fe430b5963 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerNetworkMessages.h
+++ b/Code/Tools/Standalone/Source/Driller/DrillerNetworkMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerOperationTelemetryEvent.cpp b/Code/Tools/Standalone/Source/Driller/DrillerOperationTelemetryEvent.cpp
index 46de324f0e..eb422f9d12 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerOperationTelemetryEvent.cpp
+++ b/Code/Tools/Standalone/Source/Driller/DrillerOperationTelemetryEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/DrillerOperationTelemetryEvent.h b/Code/Tools/Standalone/Source/Driller/DrillerOperationTelemetryEvent.h
index 2ef6f69d84..8e9e2b81a7 100644
--- a/Code/Tools/Standalone/Source/Driller/DrillerOperationTelemetryEvent.h
+++ b/Code/Tools/Standalone/Source/Driller/DrillerOperationTelemetryEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataAggregator.cpp
index 0b0da422ff..9f36a6e857 100644
--- a/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataAggregator.h b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataAggregator.h
index 4c4057aea8..a6e8630db5 100644
--- a/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataAggregator.h
+++ b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataAggregator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataParser.cpp b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataParser.cpp
index 28fdc69b3a..c5a2c931d9 100644
--- a/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataParser.h b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataParser.h
index 1253503f3c..5d57a35579 100644
--- a/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataParser.h
+++ b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceDataParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceEvents.h b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceEvents.h
index 2dc15dc7cc..31a3667f4c 100644
--- a/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceEvents.h
+++ b/Code/Tools/Standalone/Source/Driller/EventTrace/EventTraceEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/FilteredListView.cpp b/Code/Tools/Standalone/Source/Driller/FilteredListView.cpp
index 161f1bf508..32f93b5238 100644
--- a/Code/Tools/Standalone/Source/Driller/FilteredListView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/FilteredListView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/FilteredListView.hxx b/Code/Tools/Standalone/Source/Driller/FilteredListView.hxx
index 6bd3a81589..10e34b0134 100644
--- a/Code/Tools/Standalone/Source/Driller/FilteredListView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/FilteredListView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/GenericCustomizeCSVExportWidget.cpp b/Code/Tools/Standalone/Source/Driller/GenericCustomizeCSVExportWidget.cpp
index 8ec2f3c97d..a9027ace40 100644
--- a/Code/Tools/Standalone/Source/Driller/GenericCustomizeCSVExportWidget.cpp
+++ b/Code/Tools/Standalone/Source/Driller/GenericCustomizeCSVExportWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/GenericCustomizeCSVExportWidget.hxx b/Code/Tools/Standalone/Source/Driller/GenericCustomizeCSVExportWidget.hxx
index fd2825027b..965640af9a 100644
--- a/Code/Tools/Standalone/Source/Driller/GenericCustomizeCSVExportWidget.hxx
+++ b/Code/Tools/Standalone/Source/Driller/GenericCustomizeCSVExportWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/IO/StreamerDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/IO/StreamerDataAggregator.cpp
index 069b20042a..99adf9626f 100644
--- a/Code/Tools/Standalone/Source/Driller/IO/StreamerDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/IO/StreamerDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/IO/StreamerDataParser.cpp b/Code/Tools/Standalone/Source/Driller/IO/StreamerDataParser.cpp
index 02840b06d1..9cb7c90c4b 100644
--- a/Code/Tools/Standalone/Source/Driller/IO/StreamerDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/IO/StreamerDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/IO/StreamerDataView.cpp b/Code/Tools/Standalone/Source/Driller/IO/StreamerDataView.cpp
index 6c56fd9b9e..37f08aabb7 100644
--- a/Code/Tools/Standalone/Source/Driller/IO/StreamerDataView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/IO/StreamerDataView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/IO/StreamerDrillerDialog.cpp b/Code/Tools/Standalone/Source/Driller/IO/StreamerDrillerDialog.cpp
index 49da091501..2034045ea5 100644
--- a/Code/Tools/Standalone/Source/Driller/IO/StreamerDrillerDialog.cpp
+++ b/Code/Tools/Standalone/Source/Driller/IO/StreamerDrillerDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/IO/StreamerEvents.cpp b/Code/Tools/Standalone/Source/Driller/IO/StreamerEvents.cpp
index 21c4eab12d..0fb70f12cf 100644
--- a/Code/Tools/Standalone/Source/Driller/IO/StreamerEvents.cpp
+++ b/Code/Tools/Standalone/Source/Driller/IO/StreamerEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataAggregator.cpp
index db718e56a8..c3b877a743 100644
--- a/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataAggregator.hxx b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataAggregator.hxx
index 373692b46d..329855fb4b 100644
--- a/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataAggregator.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataAggregator.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataParser.cpp b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataParser.cpp
index 52b8bd8506..5028869d3c 100644
--- a/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataParser.h b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataParser.h
index e9bf97673a..ebcf17a664 100644
--- a/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataParser.h
+++ b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataView.cpp b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataView.cpp
index 9473d80be1..ec909c136d 100644
--- a/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataView.hxx b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataView.hxx
index 5aca0c3e67..dfb097a966 100644
--- a/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Memory/MemoryDataView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Memory/MemoryEvents.cpp b/Code/Tools/Standalone/Source/Driller/Memory/MemoryEvents.cpp
index b21f0c4b10..a69bee6dc5 100644
--- a/Code/Tools/Standalone/Source/Driller/Memory/MemoryEvents.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Memory/MemoryEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Memory/MemoryEvents.h b/Code/Tools/Standalone/Source/Driller/Memory/MemoryEvents.h
index e5db499def..2ea2538cfd 100644
--- a/Code/Tools/Standalone/Source/Driller/Memory/MemoryEvents.h
+++ b/Code/Tools/Standalone/Source/Driller/Memory/MemoryEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataAggregator.cpp
index 32d71c44e9..886afe336c 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataAggregator.hxx b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataAggregator.hxx
index eda29db44a..9b8625c745 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataAggregator.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataAggregator.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataPanel.cpp b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataPanel.cpp
index 14d8e7cf3d..964cdeb343 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataPanel.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataPanel.hxx b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataPanel.hxx
index 2e83b65de6..0c21ace400 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataPanel.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataPanel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataParser.cpp b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataParser.cpp
index 25e5b6bcc0..b1bd484cec 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataParser.h b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataParser.h
index f6106cc280..9a749f2530 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataParser.h
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
index d8d4ca2c9d..d578883d24 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.hxx b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.hxx
index 20cbca7c24..c80e555236 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerEvents.cpp b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerEvents.cpp
index 5b6fbf533e..b356b7a7ad 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerEvents.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerEvents.h b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerEvents.h
index 8fb79c70f3..2f5f4905a9 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerEvents.h
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerOperationTelemetryEvent.h b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerOperationTelemetryEvent.h
index 2084381da6..9b99b7d57e 100644
--- a/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerOperationTelemetryEvent.h
+++ b/Code/Tools/Standalone/Source/Driller/Profiler/ProfilerOperationTelemetryEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/RacetrackChart.cpp b/Code/Tools/Standalone/Source/Driller/RacetrackChart.cpp
index de3fe6c3b1..f73550b8b9 100644
--- a/Code/Tools/Standalone/Source/Driller/RacetrackChart.cpp
+++ b/Code/Tools/Standalone/Source/Driller/RacetrackChart.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/RacetrackChart.hxx b/Code/Tools/Standalone/Source/Driller/RacetrackChart.hxx
index 608122c514..0ce1d9a784 100644
--- a/Code/Tools/Standalone/Source/Driller/RacetrackChart.hxx
+++ b/Code/Tools/Standalone/Source/Driller/RacetrackChart.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataAggregator.cpp
index 4ed12c9fe5..352107aca0 100644
--- a/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataAggregator.hxx b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataAggregator.hxx
index f7590873a9..48aed7b5aa 100644
--- a/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataAggregator.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataAggregator.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataParser.cpp b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataParser.cpp
index f57fd67fc8..c4d159f3fa 100644
--- a/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataParser.h b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataParser.h
index d9fa3f11f0..d33b1a44e5 100644
--- a/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataParser.h
+++ b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMDataParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMEvents.cpp b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMEvents.cpp
index caf8b37198..475f9fb04f 100644
--- a/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMEvents.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMEvents.h b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMEvents.h
index dde8f7607f..367ecc2a92 100644
--- a/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMEvents.h
+++ b/Code/Tools/Standalone/Source/Driller/Rendering/VRAM/VRAMEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.h b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.h
index 32822fb31e..51aac4f888 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.inl b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.inl
index e7faf391e1..4435215d45 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.inl
+++ b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewQObject.cpp b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewQObject.cpp
index 6cd88b6a05..0d5002e4df 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewQObject.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewQObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewQObject.hxx b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewQObject.hxx
index b50ace5b96..0402ccf03c 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewQObject.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewQObject.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewSavedState.h b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewSavedState.h
index c9b142d3e8..9fcacf411a 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewSavedState.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/BaseDetailViewSavedState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/OverallReplicaDetailView.cpp b/Code/Tools/Standalone/Source/Driller/Replica/OverallReplicaDetailView.cpp
index 17b35a46b4..d463bab9ba 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/OverallReplicaDetailView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/OverallReplicaDetailView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/OverallReplicaDetailView.hxx b/Code/Tools/Standalone/Source/Driller/Replica/OverallReplicaDetailView.hxx
index 70c285c8b8..2eec0509bf 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/OverallReplicaDetailView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Replica/OverallReplicaDetailView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaBandwidthChartData.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaBandwidthChartData.cpp
index dc0ee75a83..557aa3f912 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaBandwidthChartData.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaBandwidthChartData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaBandwidthChartData.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaBandwidthChartData.h
index f3432ba5a5..054b6b58f1 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaBandwidthChartData.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaBandwidthChartData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkTypeDetailView.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkTypeDetailView.cpp
index 6850768efe..e3012c9ca3 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkTypeDetailView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkTypeDetailView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkTypeDetailView.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkTypeDetailView.h
index 063b3c8ace..6309f7855e 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkTypeDetailView.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkTypeDetailView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkUsageDataContainers.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkUsageDataContainers.cpp
index 3e24c34e05..1b6e212579 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkUsageDataContainers.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkUsageDataContainers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkUsageDataContainers.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkUsageDataContainers.h
index cafd864b6a..994e5b7676 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkUsageDataContainers.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaChunkUsageDataContainers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregator.cpp
index 274fced111..bda37901d3 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregator.hxx b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregator.hxx
index 0fb64c0c39..85f2c635b3 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregator.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregator.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregatorConfigurationPanel.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregatorConfigurationPanel.cpp
index 55b2b3347a..abfed45ff8 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregatorConfigurationPanel.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregatorConfigurationPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregatorConfigurationPanel.hxx b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregatorConfigurationPanel.hxx
index 336fd9e4f6..80b067c917 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregatorConfigurationPanel.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataAggregatorConfigurationPanel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataEvents.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataEvents.h
index 9295c9a047..662f05b754 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataEvents.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataParser.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataParser.cpp
index d38bb501e3..c33234c74e 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataParser.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataParser.h
index 6e060b1ff3..0b4e2654b0 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataParser.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.cpp
index f4b8eadaba..488c878586 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.hxx b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.hxx
index 0e98b7e29d..ba9d263a1c 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDetailView.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDetailView.cpp
index 3b69184ad7..34a09857c3 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDetailView.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDetailView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDetailView.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDetailView.h
index f092332f4c..a034ac0873 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDetailView.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDetailView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayHelpers.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayHelpers.cpp
index 57b17a03bf..caebdd3f01 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayHelpers.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayHelpers.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayHelpers.h
index f97d005e7b..251407aaa6 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayHelpers.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayTypes.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayTypes.cpp
index 376e20311a..fd2ed1d310 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayTypes.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayTypes.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayTypes.h
index 6b16f8a916..16518b818d 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayTypes.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDisplayTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDrillerConfigToolbar.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDrillerConfigToolbar.cpp
index ff1492390e..44d90d82e5 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDrillerConfigToolbar.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDrillerConfigToolbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDrillerConfigToolbar.hxx b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDrillerConfigToolbar.hxx
index 465fad2c25..8d1bdc0b49 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDrillerConfigToolbar.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaDrillerConfigToolbar.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaOperationTelemetryEvent.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaOperationTelemetryEvent.h
index 55bfa76097..c37c884e55 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaOperationTelemetryEvent.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaOperationTelemetryEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaTreeViewModel.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaTreeViewModel.cpp
index 46f5be4da0..15ee5c290f 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaTreeViewModel.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaTreeViewModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaTreeViewModel.hxx b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaTreeViewModel.hxx
index 09136015d8..e9be8a9225 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaTreeViewModel.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaTreeViewModel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaUsageDataContainers.cpp b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaUsageDataContainers.cpp
index eb7e46fe4f..f2b633a950 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaUsageDataContainers.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaUsageDataContainers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Replica/ReplicaUsageDataContainers.h b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaUsageDataContainers.h
index e8922a747b..c62ea65f02 100644
--- a/Code/Tools/Standalone/Source/Driller/Replica/ReplicaUsageDataContainers.h
+++ b/Code/Tools/Standalone/Source/Driller/Replica/ReplicaUsageDataContainers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/StripChart.cpp b/Code/Tools/Standalone/Source/Driller/StripChart.cpp
index df3eafc2c7..376d6de0b7 100644
--- a/Code/Tools/Standalone/Source/Driller/StripChart.cpp
+++ b/Code/Tools/Standalone/Source/Driller/StripChart.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/StripChart.hxx b/Code/Tools/Standalone/Source/Driller/StripChart.hxx
index 5e55d5f0d7..6117ed95d4 100644
--- a/Code/Tools/Standalone/Source/Driller/StripChart.hxx
+++ b/Code/Tools/Standalone/Source/Driller/StripChart.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Trace/TraceDrillerDialog.cpp b/Code/Tools/Standalone/Source/Driller/Trace/TraceDrillerDialog.cpp
index 64feba7bfb..39b27474d9 100644
--- a/Code/Tools/Standalone/Source/Driller/Trace/TraceDrillerDialog.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Trace/TraceDrillerDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Trace/TraceDrillerDialog.hxx b/Code/Tools/Standalone/Source/Driller/Trace/TraceDrillerDialog.hxx
index 28f6b01cd7..a604fac8c4 100644
--- a/Code/Tools/Standalone/Source/Driller/Trace/TraceDrillerDialog.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Trace/TraceDrillerDialog.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataAggregator.cpp
index fe19fd79d2..da51477556 100644
--- a/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataAggregator.hxx b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataAggregator.hxx
index 1fc3537422..b733243eca 100644
--- a/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataAggregator.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataAggregator.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataParser.cpp b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataParser.cpp
index bee1a5491b..a7dcf5539b 100644
--- a/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataParser.h b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataParser.h
index e536356848..4d7e8b8491 100644
--- a/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataParser.h
+++ b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageDataParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageEvents.h b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageEvents.h
index 7ef9397aaa..ac53706c3d 100644
--- a/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageEvents.h
+++ b/Code/Tools/Standalone/Source/Driller/Trace/TraceMessageEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Trace/TraceOperationTelemetryEvent.h b/Code/Tools/Standalone/Source/Driller/Trace/TraceOperationTelemetryEvent.h
index 391d108a44..fed7e17994 100644
--- a/Code/Tools/Standalone/Source/Driller/Trace/TraceOperationTelemetryEvent.h
+++ b/Code/Tools/Standalone/Source/Driller/Trace/TraceOperationTelemetryEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataAggregator.cpp b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataAggregator.cpp
index 44f6d6cd0c..9ea7c17614 100644
--- a/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataAggregator.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataAggregator.hxx b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataAggregator.hxx
index b74211f9c3..c23fd61cde 100644
--- a/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataAggregator.hxx
+++ b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataAggregator.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataParser.cpp b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataParser.cpp
index 3418e3ec04..aad0f92e1d 100644
--- a/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataParser.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataParser.h b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataParser.h
index 5136dd3684..18d703714d 100644
--- a/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataParser.h
+++ b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedDataParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedEvents.h b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedEvents.h
index adb160f142..3b0661f32a 100644
--- a/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedEvents.h
+++ b/Code/Tools/Standalone/Source/Driller/Unsupported/UnsupportedEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Workspaces/Workspace.cpp b/Code/Tools/Standalone/Source/Driller/Workspaces/Workspace.cpp
index 7f485424f6..aa1cf09777 100644
--- a/Code/Tools/Standalone/Source/Driller/Workspaces/Workspace.cpp
+++ b/Code/Tools/Standalone/Source/Driller/Workspaces/Workspace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Driller/Workspaces/Workspace.h b/Code/Tools/Standalone/Source/Driller/Workspaces/Workspace.h
index 5705b4a6fb..687a45f76e 100644
--- a/Code/Tools/Standalone/Source/Driller/Workspaces/Workspace.h
+++ b/Code/Tools/Standalone/Source/Driller/Workspaces/Workspace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Editor/LuaEditor.cpp b/Code/Tools/Standalone/Source/Editor/LuaEditor.cpp
index 84152897e1..3375b94d40 100644
--- a/Code/Tools/Standalone/Source/Editor/LuaEditor.cpp
+++ b/Code/Tools/Standalone/Source/Editor/LuaEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Editor/LuaEditor.h b/Code/Tools/Standalone/Source/Editor/LuaEditor.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Code/Tools/Standalone/Source/Editor/LuaEditor.h
+++ b/Code/Tools/Standalone/Source/Editor/LuaEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Editor/ProfilerEditor.cpp b/Code/Tools/Standalone/Source/Editor/ProfilerEditor.cpp
index e899e2d53d..3d613ef282 100644
--- a/Code/Tools/Standalone/Source/Editor/ProfilerEditor.cpp
+++ b/Code/Tools/Standalone/Source/Editor/ProfilerEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Editor/ProfilerEditor.h b/Code/Tools/Standalone/Source/Editor/ProfilerEditor.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Code/Tools/Standalone/Source/Editor/ProfilerEditor.h
+++ b/Code/Tools/Standalone/Source/Editor/ProfilerEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Editor/Resource.h b/Code/Tools/Standalone/Source/Editor/Resource.h
index 175cb69e3e..5c860f9f05 100644
--- a/Code/Tools/Standalone/Source/Editor/Resource.h
+++ b/Code/Tools/Standalone/Source/Editor/Resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Editor/targetver.h b/Code/Tools/Standalone/Source/Editor/targetver.h
index 84d4fe2be8..750a1ef013 100644
--- a/Code/Tools/Standalone/Source/Editor/targetver.h
+++ b/Code/Tools/Standalone/Source/Editor/targetver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/BasicScriptChecker.h b/Code/Tools/Standalone/Source/LUA/BasicScriptChecker.h
index cde306556d..5412e31396 100644
--- a/Code/Tools/Standalone/Source/LUA/BasicScriptChecker.h
+++ b/Code/Tools/Standalone/Source/LUA/BasicScriptChecker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/BreakpointPanel.cpp b/Code/Tools/Standalone/Source/LUA/BreakpointPanel.cpp
index a6355ec2f8..ef60994adc 100644
--- a/Code/Tools/Standalone/Source/LUA/BreakpointPanel.cpp
+++ b/Code/Tools/Standalone/Source/LUA/BreakpointPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/BreakpointPanel.hxx b/Code/Tools/Standalone/Source/LUA/BreakpointPanel.hxx
index 1506b7e5f6..425cb818a7 100644
--- a/Code/Tools/Standalone/Source/LUA/BreakpointPanel.hxx
+++ b/Code/Tools/Standalone/Source/LUA/BreakpointPanel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/ClassReferenceFilter.cpp b/Code/Tools/Standalone/Source/LUA/ClassReferenceFilter.cpp
index 3100997143..fa254bfc8e 100644
--- a/Code/Tools/Standalone/Source/LUA/ClassReferenceFilter.cpp
+++ b/Code/Tools/Standalone/Source/LUA/ClassReferenceFilter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/ClassReferenceFilter.hxx b/Code/Tools/Standalone/Source/LUA/ClassReferenceFilter.hxx
index 0dbdf42372..32d64e1a0f 100644
--- a/Code/Tools/Standalone/Source/LUA/ClassReferenceFilter.hxx
+++ b/Code/Tools/Standalone/Source/LUA/ClassReferenceFilter.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/ClassReferencePanel.cpp b/Code/Tools/Standalone/Source/LUA/ClassReferencePanel.cpp
index 4cb49923d6..50ebe78e0f 100644
--- a/Code/Tools/Standalone/Source/LUA/ClassReferencePanel.cpp
+++ b/Code/Tools/Standalone/Source/LUA/ClassReferencePanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/ClassReferencePanel.hxx b/Code/Tools/Standalone/Source/LUA/ClassReferencePanel.hxx
index 7346e2e89a..eeb0c86a15 100644
--- a/Code/Tools/Standalone/Source/LUA/ClassReferencePanel.hxx
+++ b/Code/Tools/Standalone/Source/LUA/ClassReferencePanel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompleter.cpp b/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompleter.cpp
index b92405789f..58898a5473 100644
--- a/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompleter.cpp
+++ b/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompleter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompleter.hxx b/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompleter.hxx
index fe9b4f314c..d2bc2f79a2 100644
--- a/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompleter.hxx
+++ b/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompleter.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompletionModel.cpp b/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompletionModel.cpp
index 64be82f75b..01e9663940 100644
--- a/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompletionModel.cpp
+++ b/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompletionModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompletionModel.hxx b/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompletionModel.hxx
index 55a7253127..ccbd226453 100644
--- a/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompletionModel.hxx
+++ b/Code/Tools/Standalone/Source/LUA/CodeCompletion/LUACompletionModel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/DebugAttachmentButton.cpp b/Code/Tools/Standalone/Source/LUA/DebugAttachmentButton.cpp
index 8d00a6b268..cc1898a813 100644
--- a/Code/Tools/Standalone/Source/LUA/DebugAttachmentButton.cpp
+++ b/Code/Tools/Standalone/Source/LUA/DebugAttachmentButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/DebugAttachmentButton.hxx b/Code/Tools/Standalone/Source/LUA/DebugAttachmentButton.hxx
index 978440df02..6d91ecf3c8 100644
--- a/Code/Tools/Standalone/Source/LUA/DebugAttachmentButton.hxx
+++ b/Code/Tools/Standalone/Source/LUA/DebugAttachmentButton.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUABreakpointTrackerMessages.cpp b/Code/Tools/Standalone/Source/LUA/LUABreakpointTrackerMessages.cpp
index 4a1df323e3..49578ace72 100644
--- a/Code/Tools/Standalone/Source/LUA/LUABreakpointTrackerMessages.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUABreakpointTrackerMessages.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUABreakpointTrackerMessages.h b/Code/Tools/Standalone/Source/LUA/LUABreakpointTrackerMessages.h
index 4ee8b3c638..d4b7720d4a 100644
--- a/Code/Tools/Standalone/Source/LUA/LUABreakpointTrackerMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUABreakpointTrackerMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAContextControlMessages.h b/Code/Tools/Standalone/Source/LUA/LUAContextControlMessages.h
index 44ca515c77..665be59d74 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAContextControlMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAContextControlMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUADebuggerComponent.cpp b/Code/Tools/Standalone/Source/LUA/LUADebuggerComponent.cpp
index 880ff8d882..04aad2832f 100644
--- a/Code/Tools/Standalone/Source/LUA/LUADebuggerComponent.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUADebuggerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUADebuggerComponent.h b/Code/Tools/Standalone/Source/LUA/LUADebuggerComponent.h
index d25f4de3c3..41805fd84a 100644
--- a/Code/Tools/Standalone/Source/LUA/LUADebuggerComponent.h
+++ b/Code/Tools/Standalone/Source/LUA/LUADebuggerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUADebuggerMessages.h b/Code/Tools/Standalone/Source/LUA/LUADebuggerMessages.h
index 8140a53377..e7ad687291 100644
--- a/Code/Tools/Standalone/Source/LUA/LUADebuggerMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUADebuggerMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorBlockState.h b/Code/Tools/Standalone/Source/LUA/LUAEditorBlockState.h
index 6a563e1b28..302328aae9 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorBlockState.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorBlockState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorBreakpointWidget.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorBreakpointWidget.cpp
index 463a1e4e4a..c6bd1e01f1 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorBreakpointWidget.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorBreakpointWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorBreakpointWidget.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorBreakpointWidget.hxx
index b5f608b884..c58ccf38ec 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorBreakpointWidget.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorBreakpointWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorContext.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorContext.cpp
index 1b15f5cf94..b513e5dd8d 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorContext.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorContext.h b/Code/Tools/Standalone/Source/LUA/LUAEditorContext.h
index 8b8a81f64e..26af9cca86 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorContext.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorContextInterface.h b/Code/Tools/Standalone/Source/LUA/LUAEditorContextInterface.h
index 52cb5f3ede..7b6fb5ddbe 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorContextInterface.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorContextInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorContextMessages.h b/Code/Tools/Standalone/Source/LUA/LUAEditorContextMessages.h
index 368d4fc19a..bb00f429ae 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorContextMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorContextMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorDebuggerMessages.h b/Code/Tools/Standalone/Source/LUA/LUAEditorDebuggerMessages.h
index 8f37946e1a..8447d6fe40 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorDebuggerMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorDebuggerMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorFindDialog.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorFindDialog.cpp
index f8b2e13ab4..e023bf3046 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorFindDialog.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorFindDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorFindDialog.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorFindDialog.hxx
index a772294f27..e0821c7371 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorFindDialog.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorFindDialog.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorFindResults.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorFindResults.cpp
index 6921ed0336..c5c01e60c2 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorFindResults.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorFindResults.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorFindResults.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorFindResults.hxx
index 7247809104..f6fc243f8d 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorFindResults.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorFindResults.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorFoldingWidget.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorFoldingWidget.cpp
index 9aee6eb586..d93305ee0f 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorFoldingWidget.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorFoldingWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorFoldingWidget.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorFoldingWidget.hxx
index 849b70657c..10f416b73d 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorFoldingWidget.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorFoldingWidget.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorGoToLineDialog.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorGoToLineDialog.cpp
index d726efd7c8..3af34e5133 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorGoToLineDialog.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorGoToLineDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorGoToLineDialog.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorGoToLineDialog.hxx
index 978e6d5595..85be798b4f 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorGoToLineDialog.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorGoToLineDialog.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.cpp
index a276f440d1..d233c7e462 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.hxx
index edb9e59de8..73d334f7fc 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorPlainTextEdit.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorPlainTextEdit.cpp
index 49e08f2b3b..2482c1c2a8 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorPlainTextEdit.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorPlainTextEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorPlainTextEdit.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorPlainTextEdit.hxx
index 67fa7d7ace..bf17c76c5d 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorPlainTextEdit.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorPlainTextEdit.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorSettingsDialog.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorSettingsDialog.cpp
index d8240f47c8..6fd77a7dff 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorSettingsDialog.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorSettingsDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorSettingsDialog.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorSettingsDialog.hxx
index fb960dcf9b..d0ce075883 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorSettingsDialog.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorSettingsDialog.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorStyleMessages.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorStyleMessages.cpp
index 53a2b95e3f..ed0efe7d83 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorStyleMessages.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorStyleMessages.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorStyleMessages.h b/Code/Tools/Standalone/Source/LUA/LUAEditorStyleMessages.h
index f84e4c02c2..30ddad4111 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorStyleMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorStyleMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorSyntaxHighlighter.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorSyntaxHighlighter.cpp
index e18e911b33..4cff52956b 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorSyntaxHighlighter.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorSyntaxHighlighter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorSyntaxHighlighter.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorSyntaxHighlighter.hxx
index f4af0cce3c..f96f5cfb6e 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorSyntaxHighlighter.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorSyntaxHighlighter.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorView.cpp b/Code/Tools/Standalone/Source/LUA/LUAEditorView.cpp
index 3b8a876618..2c5ff7d13e 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorView.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorView.hxx b/Code/Tools/Standalone/Source/LUA/LUAEditorView.hxx
index 88569f885e..2540f6c1c9 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorView.hxx
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorView.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAEditorViewMessages.h b/Code/Tools/Standalone/Source/LUA/LUAEditorViewMessages.h
index ba2b55adfe..1f925e7228 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAEditorViewMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAEditorViewMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUALocalsTrackerMessages.h b/Code/Tools/Standalone/Source/LUA/LUALocalsTrackerMessages.h
index cf5ce97393..eb3efe9649 100644
--- a/Code/Tools/Standalone/Source/LUA/LUALocalsTrackerMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUALocalsTrackerMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAStackTrackerMessages.h b/Code/Tools/Standalone/Source/LUA/LUAStackTrackerMessages.h
index 488a4b6bb1..5dd67f3a64 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAStackTrackerMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAStackTrackerMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUATargetContextTrackerMessages.cpp b/Code/Tools/Standalone/Source/LUA/LUATargetContextTrackerMessages.cpp
index 8fa622912d..51728d7dbe 100644
--- a/Code/Tools/Standalone/Source/LUA/LUATargetContextTrackerMessages.cpp
+++ b/Code/Tools/Standalone/Source/LUA/LUATargetContextTrackerMessages.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUATargetContextTrackerMessages.h b/Code/Tools/Standalone/Source/LUA/LUATargetContextTrackerMessages.h
index 44a0385d8c..2ac2612885 100644
--- a/Code/Tools/Standalone/Source/LUA/LUATargetContextTrackerMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUATargetContextTrackerMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/LUAWatchesDebuggerMessages.h b/Code/Tools/Standalone/Source/LUA/LUAWatchesDebuggerMessages.h
index c25184805b..ab805bd4b0 100644
--- a/Code/Tools/Standalone/Source/LUA/LUAWatchesDebuggerMessages.h
+++ b/Code/Tools/Standalone/Source/LUA/LUAWatchesDebuggerMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/ScriptCheckerAPI.h b/Code/Tools/Standalone/Source/LUA/ScriptCheckerAPI.h
index 645421de3d..f93c100986 100644
--- a/Code/Tools/Standalone/Source/LUA/ScriptCheckerAPI.h
+++ b/Code/Tools/Standalone/Source/LUA/ScriptCheckerAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/StackPanel.cpp b/Code/Tools/Standalone/Source/LUA/StackPanel.cpp
index 1806bc3568..87dcdbf15f 100644
--- a/Code/Tools/Standalone/Source/LUA/StackPanel.cpp
+++ b/Code/Tools/Standalone/Source/LUA/StackPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/StackPanel.hxx b/Code/Tools/Standalone/Source/LUA/StackPanel.hxx
index fdcca97d68..bc2770cfc7 100644
--- a/Code/Tools/Standalone/Source/LUA/StackPanel.hxx
+++ b/Code/Tools/Standalone/Source/LUA/StackPanel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/TargetContextButton.cpp b/Code/Tools/Standalone/Source/LUA/TargetContextButton.cpp
index 3cd605fe93..4ac6f4ec34 100644
--- a/Code/Tools/Standalone/Source/LUA/TargetContextButton.cpp
+++ b/Code/Tools/Standalone/Source/LUA/TargetContextButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/TargetContextButton.hxx b/Code/Tools/Standalone/Source/LUA/TargetContextButton.hxx
index 67aa2f1b22..d0cd1f7696 100644
--- a/Code/Tools/Standalone/Source/LUA/TargetContextButton.hxx
+++ b/Code/Tools/Standalone/Source/LUA/TargetContextButton.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/WatchesPanel.cpp b/Code/Tools/Standalone/Source/LUA/WatchesPanel.cpp
index a4fcac9c94..991c1b3cd8 100644
--- a/Code/Tools/Standalone/Source/LUA/WatchesPanel.cpp
+++ b/Code/Tools/Standalone/Source/LUA/WatchesPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LUA/WatchesPanel.hxx b/Code/Tools/Standalone/Source/LUA/WatchesPanel.hxx
index 66d8b8d46a..a7c74e86b3 100644
--- a/Code/Tools/Standalone/Source/LUA/WatchesPanel.hxx
+++ b/Code/Tools/Standalone/Source/LUA/WatchesPanel.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LuaIDEApplication.cpp b/Code/Tools/Standalone/Source/LuaIDEApplication.cpp
index af5ddb796e..596089441d 100644
--- a/Code/Tools/Standalone/Source/LuaIDEApplication.cpp
+++ b/Code/Tools/Standalone/Source/LuaIDEApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/LuaIDEApplication.h b/Code/Tools/Standalone/Source/LuaIDEApplication.h
index 0d55ed9e48..68234adddc 100644
--- a/Code/Tools/Standalone/Source/LuaIDEApplication.h
+++ b/Code/Tools/Standalone/Source/LuaIDEApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/ProfilerApplication.cpp b/Code/Tools/Standalone/Source/ProfilerApplication.cpp
index d1f9991c73..022d1ccb18 100644
--- a/Code/Tools/Standalone/Source/ProfilerApplication.cpp
+++ b/Code/Tools/Standalone/Source/ProfilerApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/ProfilerApplication.h b/Code/Tools/Standalone/Source/ProfilerApplication.h
index e6d9ede820..34d0616e49 100644
--- a/Code/Tools/Standalone/Source/ProfilerApplication.h
+++ b/Code/Tools/Standalone/Source/ProfilerApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/StandaloneToolsApplication.cpp b/Code/Tools/Standalone/Source/StandaloneToolsApplication.cpp
index e9f2dc8137..f527540d1b 100644
--- a/Code/Tools/Standalone/Source/StandaloneToolsApplication.cpp
+++ b/Code/Tools/Standalone/Source/StandaloneToolsApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/StandaloneToolsApplication.h b/Code/Tools/Standalone/Source/StandaloneToolsApplication.h
index dffec7b182..307a3ac4db 100644
--- a/Code/Tools/Standalone/Source/StandaloneToolsApplication.h
+++ b/Code/Tools/Standalone/Source/StandaloneToolsApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Telemetry/TelemetryBus.h b/Code/Tools/Standalone/Source/Telemetry/TelemetryBus.h
index af89eb9e00..37c8490314 100644
--- a/Code/Tools/Standalone/Source/Telemetry/TelemetryBus.h
+++ b/Code/Tools/Standalone/Source/Telemetry/TelemetryBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.cpp b/Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.cpp
index 97bde7babf..a3a1bf0447 100644
--- a/Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.cpp
+++ b/Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.h b/Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.h
index 08ff9317e3..06e6cd1008 100644
--- a/Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.h
+++ b/Code/Tools/Standalone/Source/Telemetry/TelemetryComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Telemetry/TelemetryEvent.cpp b/Code/Tools/Standalone/Source/Telemetry/TelemetryEvent.cpp
index 7399ed89c2..90e86ff7dc 100644
--- a/Code/Tools/Standalone/Source/Telemetry/TelemetryEvent.cpp
+++ b/Code/Tools/Standalone/Source/Telemetry/TelemetryEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/Source/Telemetry/TelemetryEvent.h b/Code/Tools/Standalone/Source/Telemetry/TelemetryEvent.h
index 164e293761..a6c626a8e7 100644
--- a/Code/Tools/Standalone/Source/Telemetry/TelemetryEvent.h
+++ b/Code/Tools/Standalone/Source/Telemetry/TelemetryEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/StandaloneTools_precompiled.h b/Code/Tools/Standalone/StandaloneTools_precompiled.h
index ea2e8e3a68..f4771d3aed 100644
--- a/Code/Tools/Standalone/StandaloneTools_precompiled.h
+++ b/Code/Tools/Standalone/StandaloneTools_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/Standalone/lua_ide_files.cmake b/Code/Tools/Standalone/lua_ide_files.cmake
index 92da44e83a..600ee51713 100644
--- a/Code/Tools/Standalone/lua_ide_files.cmake
+++ b/Code/Tools/Standalone/lua_ide_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/profiler_files.cmake b/Code/Tools/Standalone/profiler_files.cmake
index 947c2f25ad..84fa8e81ec 100644
--- a/Code/Tools/Standalone/profiler_files.cmake
+++ b/Code/Tools/Standalone/profiler_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/standalone_tools_files.cmake b/Code/Tools/Standalone/standalone_tools_files.cmake
index 48a974b145..f93285a91a 100644
--- a/Code/Tools/Standalone/standalone_tools_files.cmake
+++ b/Code/Tools/Standalone/standalone_tools_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/Standalone/targetver.h b/Code/Tools/Standalone/targetver.h
index 84d4fe2be8..750a1ef013 100644
--- a/Code/Tools/Standalone/targetver.h
+++ b/Code/Tools/Standalone/targetver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/TestImpactFramework/CMakeLists.txt b/Code/Tools/TestImpactFramework/CMakeLists.txt
index ddf6494324..10450025c8 100644
--- a/Code/Tools/TestImpactFramework/CMakeLists.txt
+++ b/Code/Tools/TestImpactFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Frontend/CMakeLists.txt b/Code/Tools/TestImpactFramework/Frontend/CMakeLists.txt
index 769af4631d..8a89497a79 100644
--- a/Code/Tools/TestImpactFramework/Frontend/CMakeLists.txt
+++ b/Code/Tools/TestImpactFramework/Frontend/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Frontend/Console/CMakeLists.txt b/Code/Tools/TestImpactFramework/Frontend/Console/CMakeLists.txt
index 3918a015de..8a7acf8ce1 100644
--- a/Code/Tools/TestImpactFramework/Frontend/Console/CMakeLists.txt
+++ b/Code/Tools/TestImpactFramework/Frontend/Console/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Frontend/Console/Code/CMakeLists.txt b/Code/Tools/TestImpactFramework/Frontend/Console/Code/CMakeLists.txt
index 9340b454e5..d78afd7fd8 100644
--- a/Code/Tools/TestImpactFramework/Frontend/Console/Code/CMakeLists.txt
+++ b/Code/Tools/TestImpactFramework/Frontend/Console/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Frontend/Console/Code/Source/TestImpactConsole.cpp b/Code/Tools/TestImpactFramework/Frontend/Console/Code/Source/TestImpactConsole.cpp
index 25337f6f78..5f957f8349 100644
--- a/Code/Tools/TestImpactFramework/Frontend/Console/Code/Source/TestImpactConsole.cpp
+++ b/Code/Tools/TestImpactFramework/Frontend/Console/Code/Source/TestImpactConsole.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Code/Tools/TestImpactFramework/Frontend/Console/Code/testimpactframework_frontend_console_files.cmake b/Code/Tools/TestImpactFramework/Frontend/Console/Code/testimpactframework_frontend_console_files.cmake
index da135a5666..8944524252 100644
--- a/Code/Tools/TestImpactFramework/Frontend/Console/Code/testimpactframework_frontend_console_files.cmake
+++ b/Code/Tools/TestImpactFramework/Frontend/Console/Code/testimpactframework_frontend_console_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Platform/Android/PAL_android.cmake b/Code/Tools/TestImpactFramework/Platform/Android/PAL_android.cmake
index f8709d2270..557bd47ebe 100644
--- a/Code/Tools/TestImpactFramework/Platform/Android/PAL_android.cmake
+++ b/Code/Tools/TestImpactFramework/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Platform/Linux/PAL_linux.cmake b/Code/Tools/TestImpactFramework/Platform/Linux/PAL_linux.cmake
index f8709d2270..557bd47ebe 100644
--- a/Code/Tools/TestImpactFramework/Platform/Linux/PAL_linux.cmake
+++ b/Code/Tools/TestImpactFramework/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Platform/Mac/PAL_mac.cmake b/Code/Tools/TestImpactFramework/Platform/Mac/PAL_mac.cmake
index f8709d2270..557bd47ebe 100644
--- a/Code/Tools/TestImpactFramework/Platform/Mac/PAL_mac.cmake
+++ b/Code/Tools/TestImpactFramework/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Platform/Windows/PAL_windows.cmake b/Code/Tools/TestImpactFramework/Platform/Windows/PAL_windows.cmake
index 31a92ea988..bb658ec11f 100644
--- a/Code/Tools/TestImpactFramework/Platform/Windows/PAL_windows.cmake
+++ b/Code/Tools/TestImpactFramework/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Platform/iOS/PAL_ios.cmake b/Code/Tools/TestImpactFramework/Platform/iOS/PAL_ios.cmake
index f8709d2270..557bd47ebe 100644
--- a/Code/Tools/TestImpactFramework/Platform/iOS/PAL_ios.cmake
+++ b/Code/Tools/TestImpactFramework/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Runtime/CMakeLists.txt b/Code/Tools/TestImpactFramework/Runtime/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Code/Tools/TestImpactFramework/Runtime/CMakeLists.txt
+++ b/Code/Tools/TestImpactFramework/Runtime/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Runtime/Code/CMakeLists.txt b/Code/Tools/TestImpactFramework/Runtime/Code/CMakeLists.txt
index 1b33305518..d02ae480e3 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/CMakeLists.txt
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Runtime/Code/Source/Platform/Windows/platform_windows_files.cmake b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Platform/Windows/platform_windows_files.cmake
index 767e5b3efb..62eb59292c 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Code/Tools/TestImpactFramework/Runtime/Code/testimpactframework_runtime_files.cmake b/Code/Tools/TestImpactFramework/Runtime/Code/testimpactframework_runtime_files.cmake
index 30271ca4e9..7f6b24d5f0 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/testimpactframework_runtime_files.cmake
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/testimpactframework_runtime_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSClientAuth/CMakeLists.txt b/Gems/AWSClientAuth/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AWSClientAuth/CMakeLists.txt
+++ b/Gems/AWSClientAuth/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSClientAuth/Code/CMakeLists.txt b/Gems/AWSClientAuth/Code/CMakeLists.txt
index 559562a937..0b4d9ff8e1 100644
--- a/Gems/AWSClientAuth/Code/CMakeLists.txt
+++ b/Gems/AWSClientAuth/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthBus.h b/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthBus.h
index db3865e5ed..2a8b0435c4 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthBus.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthModule.h b/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthModule.h
index a6af567c78..1ed3cf6bb3 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthModule.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthResourceMappingConstants.h b/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthResourceMappingConstants.h
index fe2bd0f7c6..878cf0cf7d 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthResourceMappingConstants.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthResourceMappingConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthSystemComponent.h b/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthSystemComponent.h
index 579a882168..e9f108d52a 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthSystemComponent.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/AWSCognitoAuthenticationProvider.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AWSCognitoAuthenticationProvider.h
index 742f1888fe..0d3696f3d5 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AWSCognitoAuthenticationProvider.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AWSCognitoAuthenticationProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h
index ef1efcf104..23993e29af 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderInterface.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderInterface.h
index d5032790aa..9cba2227b1 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderInterface.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderManager.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderManager.h
index 8ef28f8d8c..d4cb66b1a4 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderManager.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h
index bac9edb7f4..17a3907846 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderTypes.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderTypes.h
index 3cac547134..85e7ae6688 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderTypes.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/GoogleAuthenticationProvider.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/GoogleAuthenticationProvider.h
index 433df4a91e..292cf2e80a 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/GoogleAuthenticationProvider.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/GoogleAuthenticationProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/LWAAuthenticationProvider.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/LWAAuthenticationProvider.h
index b98563dd04..8a4d68f67e 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/LWAAuthenticationProvider.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/LWAAuthenticationProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authentication/OAuthConstants.h b/Gems/AWSClientAuth/Code/Include/Private/Authentication/OAuthConstants.h
index ba40175ff1..1da25e559f 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authentication/OAuthConstants.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authentication/OAuthConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
index 7382fa1143..7be8df3796 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h
index ebec8db1a0..f9e64c949a 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
index adf5896404..42a59d3e0f 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/UserManagement/AWSCognitoUserManagementController.h b/Gems/AWSClientAuth/Code/Include/Private/UserManagement/AWSCognitoUserManagementController.h
index a0296997ca..b630824da4 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/UserManagement/AWSCognitoUserManagementController.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/UserManagement/AWSCognitoUserManagementController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h b/Gems/AWSClientAuth/Code/Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h
index e3b4ccd2fa..e8d4103bbe 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h
+++ b/Gems/AWSClientAuth/Code/Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationProviderBus.h b/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationProviderBus.h
index c8323ef4a2..d11588ad55 100644
--- a/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationProviderBus.h
+++ b/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationProviderBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationTokens.h b/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationTokens.h
index 84a19652d0..129a88e848 100644
--- a/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationTokens.h
+++ b/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationTokens.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Public/Authorization/AWSCognitoAuthorizationBus.h b/Gems/AWSClientAuth/Code/Include/Public/Authorization/AWSCognitoAuthorizationBus.h
index 5e08302e6b..c1306a6b18 100644
--- a/Gems/AWSClientAuth/Code/Include/Public/Authorization/AWSCognitoAuthorizationBus.h
+++ b/Gems/AWSClientAuth/Code/Include/Public/Authorization/AWSCognitoAuthorizationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Public/Authorization/ClientAuthAWSCredentials.h b/Gems/AWSClientAuth/Code/Include/Public/Authorization/ClientAuthAWSCredentials.h
index 4bba58a77e..c7d9c55480 100644
--- a/Gems/AWSClientAuth/Code/Include/Public/Authorization/ClientAuthAWSCredentials.h
+++ b/Gems/AWSClientAuth/Code/Include/Public/Authorization/ClientAuthAWSCredentials.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Include/Public/UserManagement/AWSCognitoUserManagementBus.h b/Gems/AWSClientAuth/Code/Include/Public/UserManagement/AWSCognitoUserManagementBus.h
index bb5ddfc91f..5447b68477 100644
--- a/Gems/AWSClientAuth/Code/Include/Public/UserManagement/AWSCognitoUserManagementBus.h
+++ b/Gems/AWSClientAuth/Code/Include/Public/UserManagement/AWSCognitoUserManagementBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/AWSClientAuthModule.cpp b/Gems/AWSClientAuth/Code/Source/AWSClientAuthModule.cpp
index cf15d9c079..dd6716681e 100644
--- a/Gems/AWSClientAuth/Code/Source/AWSClientAuthModule.cpp
+++ b/Gems/AWSClientAuth/Code/Source/AWSClientAuthModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/AWSClientAuthSystemComponent.cpp b/Gems/AWSClientAuth/Code/Source/AWSClientAuthSystemComponent.cpp
index d7e3a2274f..c8c16cd26f 100644
--- a/Gems/AWSClientAuth/Code/Source/AWSClientAuthSystemComponent.cpp
+++ b/Gems/AWSClientAuth/Code/Source/AWSClientAuthSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/Authentication/AWSCognitoAuthenticationProvider.cpp b/Gems/AWSClientAuth/Code/Source/Authentication/AWSCognitoAuthenticationProvider.cpp
index 721a54041d..482c9b1d9e 100644
--- a/Gems/AWSClientAuth/Code/Source/Authentication/AWSCognitoAuthenticationProvider.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authentication/AWSCognitoAuthenticationProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderInterface.cpp b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderInterface.cpp
index 7ced151604..0336d910ba 100644
--- a/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderInterface.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderManager.cpp b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderManager.cpp
index b878dd3db0..75f70932f1 100644
--- a/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderManager.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationTokens.cpp b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationTokens.cpp
index 6f39738c84..72746e7158 100644
--- a/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationTokens.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationTokens.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/Authentication/GoogleAuthenticationProvider.cpp b/Gems/AWSClientAuth/Code/Source/Authentication/GoogleAuthenticationProvider.cpp
index fee1bebf5f..3d180b17db 100644
--- a/Gems/AWSClientAuth/Code/Source/Authentication/GoogleAuthenticationProvider.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authentication/GoogleAuthenticationProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/Authentication/LWAAuthenticationProvider.cpp b/Gems/AWSClientAuth/Code/Source/Authentication/LWAAuthenticationProvider.cpp
index 8f52a8abe3..b8028ff769 100644
--- a/Gems/AWSClientAuth/Code/Source/Authentication/LWAAuthenticationProvider.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authentication/LWAAuthenticationProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp
index e1c9433972..9933492407 100644
--- a/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp
index 953b869b08..bffaf2440e 100644
--- a/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Source/UserManagement/AWSCognitoUserManagementController.cpp b/Gems/AWSClientAuth/Code/Source/UserManagement/AWSCognitoUserManagementController.cpp
index 9475d229f6..c591b5650f 100644
--- a/Gems/AWSClientAuth/Code/Source/UserManagement/AWSCognitoUserManagementController.cpp
+++ b/Gems/AWSClientAuth/Code/Source/UserManagement/AWSCognitoUserManagementController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
index e6d9c4f54a..eef29e2cb5 100644
--- a/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
+++ b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemTest.cpp b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemTest.cpp
index 98d3d27c19..05a750dc1b 100644
--- a/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/AWSClientAuthSystemComponentTest.cpp b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthSystemComponentTest.cpp
index aa7bcbea46..7a5ddc1f61 100644
--- a/Gems/AWSClientAuth/Code/Tests/AWSClientAuthSystemComponentTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthSystemComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/Authentication/AWSCognitoAuthenticationProviderTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authentication/AWSCognitoAuthenticationProviderTest.cpp
index d49cd9e15a..328f77b28f 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authentication/AWSCognitoAuthenticationProviderTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/Authentication/AWSCognitoAuthenticationProviderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerMock.h b/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerMock.h
index 3c00e4aeb1..0c2924e5f5 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerMock.h
+++ b/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerScriptCanvasBusTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerScriptCanvasBusTest.cpp
index 3552370255..fb233aeb5d 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerScriptCanvasBusTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerScriptCanvasBusTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerTest.cpp
index 11b7d4c45a..362efaf025 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/Authentication/AuthenticationProviderManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/Authentication/GoogleAuthenticationProviderTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authentication/GoogleAuthenticationProviderTest.cpp
index ebf1c7958e..f8b8399118 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authentication/GoogleAuthenticationProviderTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/Authentication/GoogleAuthenticationProviderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/Authentication/LWAAuthenticationProviderTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authentication/LWAAuthenticationProviderTest.cpp
index 1d45c5425b..cbbec30cb7 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authentication/LWAAuthenticationProviderTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/Authentication/LWAAuthenticationProviderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/Authorization/AWSClientAuthPersistentCognitoIdentityProviderTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authorization/AWSClientAuthPersistentCognitoIdentityProviderTest.cpp
index fe0e5da977..a3ef9db612 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authorization/AWSClientAuthPersistentCognitoIdentityProviderTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/Authorization/AWSClientAuthPersistentCognitoIdentityProviderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp
index e827855d79..93eda7cccf 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/Tests/UserManagement/AWSCognitoUserManagementControllerTest.cpp b/Gems/AWSClientAuth/Code/Tests/UserManagement/AWSCognitoUserManagementControllerTest.cpp
index 4e531902f5..88df892e4e 100644
--- a/Gems/AWSClientAuth/Code/Tests/UserManagement/AWSCognitoUserManagementControllerTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/UserManagement/AWSCognitoUserManagementControllerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSClientAuth/Code/awsclientauth_files.cmake b/Gems/AWSClientAuth/Code/awsclientauth_files.cmake
index 7adaf73a97..2983df418a 100644
--- a/Gems/AWSClientAuth/Code/awsclientauth_files.cmake
+++ b/Gems/AWSClientAuth/Code/awsclientauth_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake b/Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake
index 6d6d53d288..fd48dcbaa7 100644
--- a/Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake
+++ b/Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSClientAuth/Code/awsclientauth_test_files.cmake b/Gems/AWSClientAuth/Code/awsclientauth_test_files.cmake
index f8f8e9c29e..d091f0f14b 100644
--- a/Gems/AWSClientAuth/Code/awsclientauth_test_files.cmake
+++ b/Gems/AWSClientAuth/Code/awsclientauth_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSClientAuth/cdk/app.py b/Gems/AWSClientAuth/cdk/app.py
index 7ca3ffecdd..d412ae575d 100755
--- a/Gems/AWSClientAuth/cdk/app.py
+++ b/Gems/AWSClientAuth/cdk/app.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/auth/__init__.py b/Gems/AWSClientAuth/cdk/auth/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSClientAuth/cdk/auth/__init__.py
+++ b/Gems/AWSClientAuth/cdk/auth/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/auth/cognito_identity_pool_role.py b/Gems/AWSClientAuth/cdk/auth/cognito_identity_pool_role.py
index 2e5f124665..7f2b901960 100755
--- a/Gems/AWSClientAuth/cdk/auth/cognito_identity_pool_role.py
+++ b/Gems/AWSClientAuth/cdk/auth/cognito_identity_pool_role.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/auth/cognito_user_pool_sms_role.py b/Gems/AWSClientAuth/cdk/auth/cognito_user_pool_sms_role.py
index 6faa6c9a95..8f83ed109d 100755
--- a/Gems/AWSClientAuth/cdk/auth/cognito_user_pool_sms_role.py
+++ b/Gems/AWSClientAuth/cdk/auth/cognito_user_pool_sms_role.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/aws_client_auth/__init__.py b/Gems/AWSClientAuth/cdk/aws_client_auth/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSClientAuth/cdk/aws_client_auth/__init__.py
+++ b/Gems/AWSClientAuth/cdk/aws_client_auth/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/aws_client_auth/client_auth_stack.py b/Gems/AWSClientAuth/cdk/aws_client_auth/client_auth_stack.py
index c180778ac0..995d77265a 100755
--- a/Gems/AWSClientAuth/cdk/aws_client_auth/client_auth_stack.py
+++ b/Gems/AWSClientAuth/cdk/aws_client_auth/client_auth_stack.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/cognito/__init__.py b/Gems/AWSClientAuth/cdk/cognito/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSClientAuth/cdk/cognito/__init__.py
+++ b/Gems/AWSClientAuth/cdk/cognito/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/cognito/cognito_identity_pool.py b/Gems/AWSClientAuth/cdk/cognito/cognito_identity_pool.py
index 840e7696ee..8d551c61e7 100755
--- a/Gems/AWSClientAuth/cdk/cognito/cognito_identity_pool.py
+++ b/Gems/AWSClientAuth/cdk/cognito/cognito_identity_pool.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/cognito/cognito_user_pool.py b/Gems/AWSClientAuth/cdk/cognito/cognito_user_pool.py
index 2741e72d52..270f1cfce3 100755
--- a/Gems/AWSClientAuth/cdk/cognito/cognito_user_pool.py
+++ b/Gems/AWSClientAuth/cdk/cognito/cognito_user_pool.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/utils/__init__.py b/Gems/AWSClientAuth/cdk/utils/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSClientAuth/cdk/utils/__init__.py
+++ b/Gems/AWSClientAuth/cdk/utils/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/utils/constants.py b/Gems/AWSClientAuth/cdk/utils/constants.py
index 0dd740dec7..c264783cc1 100755
--- a/Gems/AWSClientAuth/cdk/utils/constants.py
+++ b/Gems/AWSClientAuth/cdk/utils/constants.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSClientAuth/cdk/utils/name_utils.py b/Gems/AWSClientAuth/cdk/utils/name_utils.py
index 2d47ae0dc1..dc3d9d0fcb 100755
--- a/Gems/AWSClientAuth/cdk/utils/name_utils.py
+++ b/Gems/AWSClientAuth/cdk/utils/name_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/CMakeLists.txt b/Gems/AWSCore/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AWSCore/CMakeLists.txt
+++ b/Gems/AWSCore/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt
index 43ab13105b..e6da67d2b3 100644
--- a/Gems/AWSCore/Code/CMakeLists.txt
+++ b/Gems/AWSCore/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h b/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h
index e00458b872..b7ddd213a6 100644
--- a/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h
+++ b/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/AWSCoreEditorSystemComponent.h b/Gems/AWSCore/Code/Include/Private/AWSCoreEditorSystemComponent.h
index d0a99f8ae1..4693cf0da1 100644
--- a/Gems/AWSCore/Code/Include/Private/AWSCoreEditorSystemComponent.h
+++ b/Gems/AWSCore/Code/Include/Private/AWSCoreEditorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/AWSCoreInternalBus.h b/Gems/AWSCore/Code/Include/Private/AWSCoreInternalBus.h
index 66bf0afd8b..c2c669c784 100644
--- a/Gems/AWSCore/Code/Include/Private/AWSCoreInternalBus.h
+++ b/Gems/AWSCore/Code/Include/Private/AWSCoreInternalBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/AWSCoreModule.h b/Gems/AWSCore/Code/Include/Private/AWSCoreModule.h
index 2a828b6238..570089fc58 100644
--- a/Gems/AWSCore/Code/Include/Private/AWSCoreModule.h
+++ b/Gems/AWSCore/Code/Include/Private/AWSCoreModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/AWSCoreSystemComponent.h b/Gems/AWSCore/Code/Include/Private/AWSCoreSystemComponent.h
index 68f79cfdd9..773904f304 100644
--- a/Gems/AWSCore/Code/Include/Private/AWSCoreSystemComponent.h
+++ b/Gems/AWSCore/Code/Include/Private/AWSCoreSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Configuration/AWSCoreConfiguration.h b/Gems/AWSCore/Code/Include/Private/Configuration/AWSCoreConfiguration.h
index 7ed7374415..42b828f450 100644
--- a/Gems/AWSCore/Code/Include/Private/Configuration/AWSCoreConfiguration.h
+++ b/Gems/AWSCore/Code/Include/Private/Configuration/AWSCoreConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Credential/AWSCVarCredentialHandler.h b/Gems/AWSCore/Code/Include/Private/Credential/AWSCVarCredentialHandler.h
index 3e486446d5..ac4f906aae 100644
--- a/Gems/AWSCore/Code/Include/Private/Credential/AWSCVarCredentialHandler.h
+++ b/Gems/AWSCore/Code/Include/Private/Credential/AWSCVarCredentialHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Credential/AWSCredentialManager.h b/Gems/AWSCore/Code/Include/Private/Credential/AWSCredentialManager.h
index dce0d2fd97..de05a2cb89 100644
--- a/Gems/AWSCore/Code/Include/Private/Credential/AWSCredentialManager.h
+++ b/Gems/AWSCore/Code/Include/Private/Credential/AWSCredentialManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Credential/AWSDefaultCredentialHandler.h b/Gems/AWSCore/Code/Include/Private/Credential/AWSDefaultCredentialHandler.h
index f6e4288442..cfa751c0f1 100644
--- a/Gems/AWSCore/Code/Include/Private/Credential/AWSDefaultCredentialHandler.h
+++ b/Gems/AWSCore/Code/Include/Private/Credential/AWSDefaultCredentialHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h b/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h
index 1220cf905c..10378ba5a8 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSAttributionServiceApi.h b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSAttributionServiceApi.h
index d6fc21b160..74709ae2bd 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSAttributionServiceApi.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSAttributionServiceApi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConsentDialog.h b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConsentDialog.h
index 88ba1b0f9a..dfa61199a1 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConsentDialog.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConsentDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConstant.h b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConstant.h
index 594f927028..b566557604 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConstant.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConstant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionManager.h b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionManager.h
index 5e4ad8c965..bcbfe4997f 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionManager.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -9,10 +9,15 @@
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/containers/vector.h>
 
-#include <AzCore/Settings/SettingsRegistryImpl.h>
 #include <Editor/Attribution/AWSAttributionServiceApi.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 
+
+namespace AZ
+{
+    class SettingsRegistryInterface;
+}
+
 namespace AWSCore
 {
     //! Manages operational metrics for AWS gems
@@ -49,7 +54,7 @@ namespace AWSCore
         // AzToolsFramework::EditorEvents interface implementation
         void NotifyMainWindowInitialized(QMainWindow* mainWindow) override;
 
-        AZStd::unique_ptr<AZ::SettingsRegistryImpl> m_settingsRegistry;
+        AZ::SettingsRegistryInterface* m_settingsRegistry;
     };
 
 } // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionMetric.h b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionMetric.h
index d28bd76469..59dc62650b 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionMetric.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionMetric.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionSystemComponent.h b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionSystemComponent.h
index 9ca798d327..dcc05210d9 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionSystemComponent.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
index 3567570175..f7a906eeda 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
index 3cb45ad521..48a6c610c4 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/AWSCoreEditor_Traits_Android.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/AWSCoreEditor_Traits_Android.h
index f0ca0aaa04..6cd98eb519 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/AWSCoreEditor_Traits_Android.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/AWSCoreEditor_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/AWSCoreEditor_Traits_Platform.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/AWSCoreEditor_Traits_Platform.h
index 463bc781f7..d8bc6cdea1 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/AWSCoreEditor_Traits_Platform.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/AWSCoreEditor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/platform_android_files.cmake b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/platform_android_files.cmake
index 48ff07372e..00a9b9a633 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/platform_android_files.cmake
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/AWSCoreEditor_Traits_Linux.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/AWSCoreEditor_Traits_Linux.h
index f0ca0aaa04..6cd98eb519 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/AWSCoreEditor_Traits_Linux.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/AWSCoreEditor_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/AWSCoreEditor_Traits_Platform.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/AWSCoreEditor_Traits_Platform.h
index 3f089abb7c..d82f061187 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/AWSCoreEditor_Traits_Platform.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/AWSCoreEditor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/platform_linux_files.cmake b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/platform_linux_files.cmake
index f554e81977..943dab719c 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/AWSCoreEditor_Traits_Mac.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/AWSCoreEditor_Traits_Mac.h
index f0ca0aaa04..6cd98eb519 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/AWSCoreEditor_Traits_Mac.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/AWSCoreEditor_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/AWSCoreEditor_Traits_Platform.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/AWSCoreEditor_Traits_Platform.h
index fdde74b5b3..2686751fbe 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/AWSCoreEditor_Traits_Platform.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/AWSCoreEditor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/platform_mac_files.cmake b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/platform_mac_files.cmake
index eaba90f154..b8f60bd4d2 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/AWSCoreEditor_Traits_Platform.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/AWSCoreEditor_Traits_Platform.h
index d40c72ed03..604b22ee87 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/AWSCoreEditor_Traits_Platform.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/AWSCoreEditor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/AWSCoreEditor_Traits_Windows.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/AWSCoreEditor_Traits_Windows.h
index 52871871fa..9807e26c3e 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/AWSCoreEditor_Traits_Windows.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/AWSCoreEditor_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/platform_windows_files.cmake b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/platform_windows_files.cmake
index 5c60aec7c1..06f5f6b1a5 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/AWSCoreEditor_Traits_Platform.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/AWSCoreEditor_Traits_Platform.h
index 25fd23143c..ff6de0410f 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/AWSCoreEditor_Traits_Platform.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/AWSCoreEditor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/AWSCoreEditor_Traits_iOS.h b/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/AWSCoreEditor_Traits_iOS.h
index f0ca0aaa04..6cd98eb519 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/AWSCoreEditor_Traits_iOS.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/AWSCoreEditor_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/platform_ios_files.cmake b/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/platform_ios_files.cmake
index d6641a9bf0..1bdb493905 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
index 9fd0cffda7..65fb3cb11f 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
index 4bdc62fd74..bd50232fa9 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h b/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h
index 88e8bb4ac6..efe2cd4556 100644
--- a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h
+++ b/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingManager.h b/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingManager.h
index e83d3e94cc..6f027d6557 100644
--- a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingManager.h
+++ b/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingUtils.h b/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingUtils.h
index 465e827550..71332c4b0c 100644
--- a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingUtils.h
+++ b/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/AWSCoreBus.h b/Gems/AWSCore/Code/Include/Public/AWSCoreBus.h
index 5bdd2567fa..f65c7a541a 100644
--- a/Gems/AWSCore/Code/Include/Public/AWSCoreBus.h
+++ b/Gems/AWSCore/Code/Include/Public/AWSCoreBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Credential/AWSCredentialBus.h b/Gems/AWSCore/Code/Include/Public/Credential/AWSCredentialBus.h
index 2e662895fb..de974721b2 100644
--- a/Gems/AWSCore/Code/Include/Public/Credential/AWSCredentialBus.h
+++ b/Gems/AWSCore/Code/Include/Public/Credential/AWSCredentialBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJob.h b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJob.h
index 413511b0cd..5a908929c4 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJob.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJobConfig.h b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJobConfig.h
index 30148cdf1b..12c020dee0 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJobConfig.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJobConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJob.h b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJob.h
index 1f6b34d843..321c84b299 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJob.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJobConfig.h b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJobConfig.h
index 5aae9be870..050a9fbde9 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJobConfig.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJobConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJob.h b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJob.h
index 73042a1bc0..5a6ad052ec 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJob.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJobConfig.h b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJobConfig.h
index 18ddec0d62..8ac58d21f2 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJobConfig.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJobConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/Error.h b/Gems/AWSCore/Code/Include/Public/Framework/Error.h
index 2bd6072673..42d31e09e3 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/Error.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/Error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/HttpClientComponent.h b/Gems/AWSCore/Code/Include/Public/Framework/HttpClientComponent.h
index 75c830d4f1..c85572cc51 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/HttpClientComponent.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/HttpClientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJob.h b/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJob.h
index 9645ae5c5a..91736b49c1 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJob.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJobConfig.h b/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJobConfig.h
index 7bc09af140..356edbf93d 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJobConfig.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJobConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/JobExecuter.h b/Gems/AWSCore/Code/Include/Public/Framework/JobExecuter.h
index d3ce553077..f7f8432523 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/JobExecuter.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/JobExecuter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/JsonObjectHandler.h b/Gems/AWSCore/Code/Include/Public/Framework/JsonObjectHandler.h
index 99413ffaf1..bddf7d2dc8 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/JsonObjectHandler.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/JsonObjectHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/JsonWriter.h b/Gems/AWSCore/Code/Include/Public/Framework/JsonWriter.h
index ef7e1fb377..4d13a4b5cb 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/JsonWriter.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/JsonWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/MultipartFormData.h b/Gems/AWSCore/Code/Include/Public/Framework/MultipartFormData.h
index b0c2b711eb..d1ad00f4e6 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/MultipartFormData.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/MultipartFormData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/RequestBuilder.h b/Gems/AWSCore/Code/Include/Public/Framework/RequestBuilder.h
index 3a0f2a4ecd..28b2bfed05 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/RequestBuilder.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/RequestBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJob.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJob.h
index 41c411ae76..88db445f8e 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJob.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJobConfig.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJobConfig.h
index b1a712420a..04f4dc985c 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJobConfig.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJobConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/ServiceJob.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceJob.h
index b414c5d781..6970fbb6fc 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceJob.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobConfig.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobConfig.h
index 2bf32d4b97..ff48bd6fa3 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobConfig.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h
index 99666715d7..daaeb312cc 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h
index 34c45e0899..39e81e142b 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJobConfig.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJobConfig.h
index a446e67698..11a9eed529 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJobConfig.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJobConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/Framework/Util.h b/Gems/AWSCore/Code/Include/Public/Framework/Util.h
index c272588b25..d30f0a3512 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/Util.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/Util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/ResourceMapping/AWSResourceMappingBus.h b/Gems/AWSCore/Code/Include/Public/ResourceMapping/AWSResourceMappingBus.h
index ca821e476c..b7cbc06e0a 100644
--- a/Gems/AWSCore/Code/Include/Public/ResourceMapping/AWSResourceMappingBus.h
+++ b/Gems/AWSCore/Code/Include/Public/ResourceMapping/AWSResourceMappingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h
index 706dd1d138..90163dd363 100644
--- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h
+++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
index 10d89f4f53..317d16dbe4 100644
--- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
+++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h
index 8ddd7d70b2..a8a807e7fb 100644
--- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h
+++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
index 9e2c2ba13a..6c3d0e0a93 100644
--- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
+++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h
index 422f75f0a6..8958425615 100644
--- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h
+++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp b/Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp
index ef55d7bb80..3dc5638199 100644
--- a/Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp
+++ b/Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/AWSCoreEditorSystemComponent.cpp b/Gems/AWSCore/Code/Source/AWSCoreEditorSystemComponent.cpp
index 92ddb0fc7a..275f4b40a5 100644
--- a/Gems/AWSCore/Code/Source/AWSCoreEditorSystemComponent.cpp
+++ b/Gems/AWSCore/Code/Source/AWSCoreEditorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/AWSCoreModule.cpp b/Gems/AWSCore/Code/Source/AWSCoreModule.cpp
index 297af89fa8..e56a10e504 100644
--- a/Gems/AWSCore/Code/Source/AWSCoreModule.cpp
+++ b/Gems/AWSCore/Code/Source/AWSCoreModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp b/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp
index 2a4916f2a1..5896e74b74 100644
--- a/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp
+++ b/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.cpp b/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.cpp
index 05671bc929..3e039cfa9f 100644
--- a/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.cpp
+++ b/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Configuration/AWSCoreConfiguration.cpp b/Gems/AWSCore/Code/Source/Configuration/AWSCoreConfiguration.cpp
index 403e7e775e..c6863e6f3d 100644
--- a/Gems/AWSCore/Code/Source/Configuration/AWSCoreConfiguration.cpp
+++ b/Gems/AWSCore/Code/Source/Configuration/AWSCoreConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.cpp b/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.cpp
index 9e9fcac681..d3e675244f 100644
--- a/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.cpp
+++ b/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Credential/AWSCredentialManager.cpp b/Gems/AWSCore/Code/Source/Credential/AWSCredentialManager.cpp
index b917fbae4e..9fd9b3cc25 100644
--- a/Gems/AWSCore/Code/Source/Credential/AWSCredentialManager.cpp
+++ b/Gems/AWSCore/Code/Source/Credential/AWSCredentialManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Credential/AWSDefaultCredentialHandler.cpp b/Gems/AWSCore/Code/Source/Credential/AWSDefaultCredentialHandler.cpp
index 7edb0fd840..c90728837a 100644
--- a/Gems/AWSCore/Code/Source/Credential/AWSDefaultCredentialHandler.cpp
+++ b/Gems/AWSCore/Code/Source/Credential/AWSDefaultCredentialHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.cpp b/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.cpp
index ca3d256ba0..db159e8815 100644
--- a/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Editor/Attribution/AWSAttributionServiceApi.cpp b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSAttributionServiceApi.cpp
index 55755e4e36..3bb1b53829 100644
--- a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSAttributionServiceApi.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSAttributionServiceApi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionConsentDialog.cpp b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionConsentDialog.cpp
index d67c53f389..48c3ba48df 100644
--- a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionConsentDialog.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionConsentDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -14,12 +14,12 @@ namespace AWSCore
 {
     constexpr const char* AWSAttributionConsentDialogTitle = "AWS Core Gem Usage Agreement";
     constexpr const char* AWSAttributionConsentDialogMessage = "<nobr>The AWS Core Gem has detected credentials for an Amazon Web Services account for this</nobr><br>\
-                           <nobr>instance of O3DE. <a href=\"https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-core/configuring-credentials\">Click here</a> to learn more about AWS integration, including how to</nobr><br>\
+                           <nobr>instance of O3DE. <a href=\"https://o3de.org/docs/user-guide/gems/reference/aws/aws-core/configuring-credentials\">Click here</a> to learn more about AWS integration, including how to</nobr><br>\
                            <nobr>manage your AWS credentials.</nobr><br><br>\
                            <nobr>Please note: when credentials are detected, AWS Core Gem sends telemetry data to AWS,</nobr><br>\
                            <nobr>which helps us improve AWS services for O3DE. You can change this setting below, and at</nobr><br>\
                            <nobr>any time in Settings: Global Preferences. Data sent is subject to the <a href=\"https://aws.amazon.com/privacy\">AWS Privacy Policy</a>.</nobr><br>\
-                           <nobr><a href=\"https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-core/telemetry-data-collection\">Click here</a> to learn more about what data is sent to AWS.</nobr>";
+                           <nobr><a href=\"https://o3de.org/docs/user-guide/gems/reference/aws/aws-core/telemetry-data-collection\">Click here</a> to learn more about what data is sent to AWS.</nobr>";
 
     constexpr const char* AWSAttributionConsentDialogCheckboxText = "Please share the information about my use of AWS Core Gem with AWS.";
 
diff --git a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp
index c649e509be..f2ff7ed816 100644
--- a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,6 +13,7 @@
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/PlatformId/PlatformId.h>
 #include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/Settings/SettingsRegistryImpl.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Utils/Utils.h>
 #include <AzCore/Jobs/JobFunction.h>
@@ -24,6 +25,7 @@
 
 #include <QSysInfo>
 #include <QMessageBox>
+#include <QCheckBox>
 
 
 namespace AWSCore
@@ -35,7 +37,7 @@ namespace AWSCore
     constexpr char AWSAttributionEnabledKey[] = "/Amazon/AWS/Preferences/AWSAttributionEnabled";
     constexpr char AWSAttributionDelaySecondsKey[] = "/Amazon/AWS/Preferences/AWSAttributionDelaySeconds";
     constexpr char AWSAttributionLastTimeStampKey[] = "/Amazon/AWS/Preferences/AWSAttributionLastTimeStamp";
-    constexpr char AWSAttributionConsentShown[] = "/Amazon/AWS/Preferences/AWSAttributionConsentShown";
+    constexpr char AWSAttributionConsentShownKey[] = "/Amazon/AWS/Preferences/AWSAttributionConsentShown";
     constexpr char AWSAttributionApiId[] = "2zxvvmv8d7";
     constexpr char AWSAttributionChinaApiId[] = "";
     constexpr char AWSAttributionApiStage[] = "prod";
@@ -43,18 +45,25 @@ namespace AWSCore
 
     AWSAttributionManager::AWSAttributionManager()
     {
-        m_settingsRegistry = AZStd::make_unique<AZ::SettingsRegistryImpl>();
+        m_settingsRegistry = AZ::SettingsRegistry::Get();
         AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
     }
 
     AWSAttributionManager::~AWSAttributionManager()
     {
         AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
-        m_settingsRegistry.reset();
+        m_settingsRegistry = nullptr;
     }
 
     void AWSAttributionManager::Init()
     {
+        bool consentShown;
+        // If override is used skip merging the settings file
+        if (m_settingsRegistry->Get(consentShown, AWSAttributionConsentShownKey))
+        {
+            return;
+        }
+
         AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
         AZ_Assert(fileIO, "File IO is not initialized.");
 
@@ -158,11 +167,11 @@ namespace AWSCore
     {
         AWSCoreAttributionConsentDialog* msgBox = aznew AWSCoreAttributionConsentDialog();
         int ret = msgBox->exec();
-        m_settingsRegistry->Set(AWSAttributionConsentShown, true);
+        m_settingsRegistry->Set(AWSAttributionConsentShownKey, true);
         switch (ret)
         {
         case QMessageBox::Save:
-            m_settingsRegistry->Set(AWSAttributionEnabledKey, msgBox->checkBox());
+            m_settingsRegistry->Set(AWSAttributionEnabledKey, msgBox->checkBox()->checkState() == Qt::Checked);
             break;
         case QMessageBox::Cancel:
         default:
@@ -260,7 +269,7 @@ namespace AWSCore
     bool AWSAttributionManager::CheckConsentShown()
     {
         bool consentShown = false;
-        m_settingsRegistry->Get(consentShown, AWSAttributionConsentShown);
+        m_settingsRegistry->Get(consentShown, AWSAttributionConsentShownKey);
         return consentShown;
     }
 
diff --git a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionMetric.cpp b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionMetric.cpp
index 241ee4afc5..d1cf2a326f 100644
--- a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionMetric.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionMetric.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionSystemComponent.cpp b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionSystemComponent.cpp
index e19f899905..cdfad4f533 100644
--- a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionSystemComponent.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
index 9c98498b1b..3ee0d2af3b 100644
--- a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
index e68d595d9d..d60c298d7e 100644
--- a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/AWSApiJob.cpp b/Gems/AWSCore/Code/Source/Framework/AWSApiJob.cpp
index c9b8ead2c1..8800094b95 100644
--- a/Gems/AWSCore/Code/Source/Framework/AWSApiJob.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/AWSApiJob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/AWSApiJobConfig.cpp b/Gems/AWSCore/Code/Source/Framework/AWSApiJobConfig.cpp
index 28c60bbdf2..a4f4697249 100644
--- a/Gems/AWSCore/Code/Source/Framework/AWSApiJobConfig.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/AWSApiJobConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/Error.cpp b/Gems/AWSCore/Code/Source/Framework/Error.cpp
index 5f07489889..e8b585baf3 100644
--- a/Gems/AWSCore/Code/Source/Framework/Error.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/Error.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/HttpRequestJob.cpp b/Gems/AWSCore/Code/Source/Framework/HttpRequestJob.cpp
index 87c5fea05c..59d5b4a052 100644
--- a/Gems/AWSCore/Code/Source/Framework/HttpRequestJob.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/HttpRequestJob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/HttpRequestJobConfig.cpp b/Gems/AWSCore/Code/Source/Framework/HttpRequestJobConfig.cpp
index a5493243cc..deef0f4bf3 100644
--- a/Gems/AWSCore/Code/Source/Framework/HttpRequestJobConfig.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/HttpRequestJobConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/JsonObjectHandler.cpp b/Gems/AWSCore/Code/Source/Framework/JsonObjectHandler.cpp
index 3987cc8dc5..7e4fbe1a12 100644
--- a/Gems/AWSCore/Code/Source/Framework/JsonObjectHandler.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/JsonObjectHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/MultipartFormData.cpp b/Gems/AWSCore/Code/Source/Framework/MultipartFormData.cpp
index 74bb43c254..aa77902ee0 100644
--- a/Gems/AWSCore/Code/Source/Framework/MultipartFormData.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/MultipartFormData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/RequestBuilder.cpp b/Gems/AWSCore/Code/Source/Framework/RequestBuilder.cpp
index 0509ae6dfb..688415f243 100644
--- a/Gems/AWSCore/Code/Source/Framework/RequestBuilder.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/RequestBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/ServiceJob.cpp b/Gems/AWSCore/Code/Source/Framework/ServiceJob.cpp
index e022e4ab3a..e110036857 100644
--- a/Gems/AWSCore/Code/Source/Framework/ServiceJob.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/ServiceJob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/Framework/ServiceJobConfig.cpp b/Gems/AWSCore/Code/Source/Framework/ServiceJobConfig.cpp
index b64b3a7f5e..488cede19b 100644
--- a/Gems/AWSCore/Code/Source/Framework/ServiceJobConfig.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/ServiceJobConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp
index 0dffe3ba5d..48e3ffad70 100644
--- a/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp
+++ b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingUtils.cpp b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingUtils.cpp
index 2c9af0877a..5b544f8fa9 100644
--- a/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingUtils.cpp
+++ b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp
index 572c896f8d..c25df555fc 100644
--- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp
+++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp
index 60720e0350..a7420654de 100644
--- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp
+++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp
index 669eae71db..aa397ca97c 100644
--- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp
+++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp
index 65289023c8..530c35cde2 100644
--- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp
+++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/AWSCoreSystemComponentTest.cpp b/Gems/AWSCore/Code/Tests/AWSCoreSystemComponentTest.cpp
index 372366f102..52acd7d6f5 100644
--- a/Gems/AWSCore/Code/Tests/AWSCoreSystemComponentTest.cpp
+++ b/Gems/AWSCore/Code/Tests/AWSCoreSystemComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/AWSCoreTest.cpp b/Gems/AWSCore/Code/Tests/AWSCoreTest.cpp
index 1c430045e3..d37cd92f15 100644
--- a/Gems/AWSCore/Code/Tests/AWSCoreTest.cpp
+++ b/Gems/AWSCore/Code/Tests/AWSCoreTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Configuration/AWSCoreConfigurationTest.cpp b/Gems/AWSCore/Code/Tests/Configuration/AWSCoreConfigurationTest.cpp
index f83fbdaba2..371e264f56 100644
--- a/Gems/AWSCore/Code/Tests/Configuration/AWSCoreConfigurationTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Configuration/AWSCoreConfigurationTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Credential/AWSCVarCredentialHandlerTest.cpp b/Gems/AWSCore/Code/Tests/Credential/AWSCVarCredentialHandlerTest.cpp
index a1b6e8cd0c..899a117f17 100644
--- a/Gems/AWSCore/Code/Tests/Credential/AWSCVarCredentialHandlerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Credential/AWSCVarCredentialHandlerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Credential/AWSCredentialBusTest.cpp b/Gems/AWSCore/Code/Tests/Credential/AWSCredentialBusTest.cpp
index 7b0ff1f072..133380f757 100644
--- a/Gems/AWSCore/Code/Tests/Credential/AWSCredentialBusTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Credential/AWSCredentialBusTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Credential/AWSDefaultCredentialHandlerTest.cpp b/Gems/AWSCore/Code/Tests/Credential/AWSDefaultCredentialHandlerTest.cpp
index 0eb0f5855d..2a6813cd90 100644
--- a/Gems/AWSCore/Code/Tests/Credential/AWSDefaultCredentialHandlerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Credential/AWSDefaultCredentialHandlerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorManagerTest.cpp b/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorManagerTest.cpp
index 6267ad7a2c..4b56d0ac3a 100644
--- a/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorManagerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorSystemComponentTest.cpp b/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorSystemComponentTest.cpp
index eb1fa1e6fd..581b45d860 100644
--- a/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorSystemComponentTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorSystemComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorTest.cpp b/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorTest.cpp
index 98d3d27c19..05a750dc1b 100644
--- a/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/AWSCoreEditorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSAttributionServiceApiTest.cpp b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSAttributionServiceApiTest.cpp
index 309aa28879..c61fbece98 100644
--- a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSAttributionServiceApiTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSAttributionServiceApiTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp
index b151596d48..4128edc1e2 100644
--- a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -253,7 +253,6 @@ namespace AWSAttributionUnitTest
         manager.MetricCheck();
 
         // THEN
-        m_settingsRegistry->MergeSettingsFile(m_resolvedSettingsPath.data(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, "");
         AZ::u64 timeStamp = 0;
         m_settingsRegistry->Get(timeStamp, "/Amazon/AWS/Preferences/AWSAttributionLastTimeStamp");
         ASSERT_TRUE(timeStamp == 0);
@@ -287,7 +286,6 @@ namespace AWSAttributionUnitTest
         manager.MetricCheck();
 
         // THEN
-        m_settingsRegistry->MergeSettingsFile(m_resolvedSettingsPath.data(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, "");
         AZ::u64 timeStamp = 0;
         m_settingsRegistry->Get(timeStamp, "/Amazon/AWS/Preferences/AWSAttributionLastTimeStamp");
         ASSERT_TRUE(timeStamp > 0);
@@ -324,7 +322,6 @@ namespace AWSAttributionUnitTest
         manager.MetricCheck();
 
         // THEN
-        m_settingsRegistry->MergeSettingsFile(m_resolvedSettingsPath.data(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, "");
         AZ::u64 timeStamp = 0;
         m_settingsRegistry->Get(timeStamp, "/Amazon/AWS/Preferences/AWSAttributionLastTimeStamp");
         ASSERT_TRUE(timeStamp > 0);
@@ -355,15 +352,14 @@ namespace AWSAttributionUnitTest
         AZ::u64 delayInSeconds = AZStd::chrono::duration_cast<AZStd::chrono::seconds>(AZStd::chrono::system_clock::now().time_since_epoch()).count();
         ASSERT_TRUE(m_settingsRegistry->Set("/Amazon/AWS/Preferences/AWSAttributionLastTimeStamp", delayInSeconds));
 
-        EXPECT_CALL(manager, SubmitMetric(testing::_)).Times(1);
-        EXPECT_CALL(m_moduleManagerRequestBusMock, EnumerateModules(testing::_)).Times(1);
+        EXPECT_CALL(manager, SubmitMetric(testing::_)).Times(0);
+        EXPECT_CALL(m_moduleManagerRequestBusMock, EnumerateModules(testing::_)).Times(0);
         EXPECT_CALL(m_credentialRequestBusMock, GetCredentialsProvider()).Times(1);
 
         // WHEN
         manager.MetricCheck();
 
         // THEN
-        m_settingsRegistry->MergeSettingsFile(m_resolvedSettingsPath.data(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, "");
         AZ::u64 timeStamp = 0;
         m_settingsRegistry->Get(timeStamp, "/Amazon/AWS/Preferences/AWSAttributionLastTimeStamp");
         ASSERT_TRUE(timeStamp == delayInSeconds);
@@ -396,7 +392,6 @@ namespace AWSAttributionUnitTest
         manager.MetricCheck();
 
         // THEN
-        m_settingsRegistry->MergeSettingsFile(m_resolvedSettingsPath.data(), AZ::SettingsRegistryInterface::Format::JsonMergePatch, "");
         AZ::u64 timeStamp = 0;
         m_settingsRegistry->Get(timeStamp, "/Amazon/AWS/Preferences/AWSAttributionLastTimeStamp");
         ASSERT_TRUE(timeStamp == 0);
diff --git a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionMetricTest.cpp b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionMetricTest.cpp
index f52314c98e..6b3e35b775 100644
--- a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionMetricTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionMetricTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionSystemComponentTest.cpp b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionSystemComponentTest.cpp
index b4e34fdc46..eaae801776 100644
--- a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionSystemComponentTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionSystemComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -8,6 +8,9 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzCore/Settings/SettingsRegistryImpl.h>
+#include <AzCore/Serialization/Json/JsonSystemComponent.h>
+#include <AzCore/Serialization/Json/RegistrationContext.h>
 #include <AzTest/AzTest.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 
@@ -65,7 +68,8 @@ namespace AWSCoreUnitTest
         MOCK_METHOD0(Deactivate, void());
     };
 
-    class AWSAttributionSystemComponentTest : public AWSCoreFixture
+    class AWSAttributionSystemComponentTest
+        : public AWSCoreFixture
     {
         void SetUp() override
         {
@@ -73,6 +77,7 @@ namespace AWSCoreUnitTest
             m_serializeContext = AZStd::make_unique<AZ::SerializeContext>();
             m_serializeContext->CreateEditContext();
             m_behaviorContext = AZStd::make_unique<AZ::BehaviorContext>();
+            AZ::JsonSystemComponent::Reflect(m_registrationContext.get());
 
             m_awsCoreComponentDescriptor.reset(AWSCoreSystemComponentMock::CreateDescriptor());
             m_awsCoreComponentDescriptor->Reflect(m_serializeContext.get());
@@ -82,6 +87,13 @@ namespace AWSCoreUnitTest
             m_componentDescriptor->Reflect(m_serializeContext.get());
             m_componentDescriptor->Reflect(m_behaviorContext.get());
 
+            m_settingsRegistry = AZStd::make_unique<AZ::SettingsRegistryImpl>();
+
+            m_settingsRegistry->SetContext(m_serializeContext.get());
+            m_settingsRegistry->SetContext(m_registrationContext.get());
+
+            AZ::SettingsRegistry::Register(m_settingsRegistry.get());
+
             m_entity = aznew AZ::Entity();
             m_awsCoreSystemComponentMock = aznew testing::NiceMock<AWSCoreSystemComponentMock>();
             m_entity->AddComponent(m_awsCoreSystemComponentMock);
@@ -101,6 +113,8 @@ namespace AWSCoreUnitTest
             m_awsCoreComponentDescriptor.reset();
             m_componentDescriptor.reset();
             m_behaviorContext.reset();
+            m_settingsRegistry.reset();
+            m_registrationContext.reset();
             m_serializeContext.reset();
             AWSCoreFixture::TearDown();
         }
@@ -113,8 +127,10 @@ namespace AWSCoreUnitTest
     private:
         AZStd::unique_ptr<AZ::SerializeContext> m_serializeContext;
         AZStd::unique_ptr<AZ::BehaviorContext> m_behaviorContext;
+        AZStd::unique_ptr<AZ::JsonRegistrationContext> m_registrationContext;
         AZStd::unique_ptr<AZ::ComponentDescriptor> m_componentDescriptor;
         AZStd::unique_ptr<AZ::ComponentDescriptor> m_awsCoreComponentDescriptor;
+        AZStd::shared_ptr<AZ::SettingsRegistryImpl> m_settingsRegistry;
     };
 
     TEST_F(AWSAttributionSystemComponentTest, SystemComponentInitActivate_Success)
diff --git a/Gems/AWSCore/Code/Tests/Editor/Platform/Linux/awscore_editor_tests_linux_files.cmake b/Gems/AWSCore/Code/Tests/Editor/Platform/Linux/awscore_editor_tests_linux_files.cmake
index b649cafbde..262cd86d20 100644
--- a/Gems/AWSCore/Code/Tests/Editor/Platform/Linux/awscore_editor_tests_linux_files.cmake
+++ b/Gems/AWSCore/Code/Tests/Editor/Platform/Linux/awscore_editor_tests_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Tests/Editor/Platform/Mac/awscore_editor_tests_mac_files.cmake b/Gems/AWSCore/Code/Tests/Editor/Platform/Mac/awscore_editor_tests_mac_files.cmake
index b649cafbde..262cd86d20 100644
--- a/Gems/AWSCore/Code/Tests/Editor/Platform/Mac/awscore_editor_tests_mac_files.cmake
+++ b/Gems/AWSCore/Code/Tests/Editor/Platform/Mac/awscore_editor_tests_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Tests/Editor/Platform/Windows/awscore_editor_tests_windows_files.cmake b/Gems/AWSCore/Code/Tests/Editor/Platform/Windows/awscore_editor_tests_windows_files.cmake
index ca4110b011..f73bc8ace6 100644
--- a/Gems/AWSCore/Code/Tests/Editor/Platform/Windows/awscore_editor_tests_windows_files.cmake
+++ b/Gems/AWSCore/Code/Tests/Editor/Platform/Windows/awscore_editor_tests_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
index 3301519959..b063f7c394 100644
--- a/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorUIFixture.h b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorUIFixture.h
index 908c7bcd3c..71918968e9 100644
--- a/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorUIFixture.h
+++ b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorUIFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp
index 6263be50c5..dfaa5ea945 100644
--- a/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/AWSApiClientJobConfigTest.cpp b/Gems/AWSCore/Code/Tests/Framework/AWSApiClientJobConfigTest.cpp
index b7424b5263..25b219f7e0 100644
--- a/Gems/AWSCore/Code/Tests/Framework/AWSApiClientJobConfigTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/AWSApiClientJobConfigTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/AWSApiJobConfigTest.cpp b/Gems/AWSCore/Code/Tests/Framework/AWSApiJobConfigTest.cpp
index 44bc82fed9..11079cbecd 100644
--- a/Gems/AWSCore/Code/Tests/Framework/AWSApiJobConfigTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/AWSApiJobConfigTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/HttpRequestJobTest.cpp b/Gems/AWSCore/Code/Tests/Framework/HttpRequestJobTest.cpp
index b898d72d83..af0368ae19 100644
--- a/Gems/AWSCore/Code/Tests/Framework/HttpRequestJobTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/HttpRequestJobTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/JsonObjectHandlerTest.cpp b/Gems/AWSCore/Code/Tests/Framework/JsonObjectHandlerTest.cpp
index 46f794430d..458385e303 100644
--- a/Gems/AWSCore/Code/Tests/Framework/JsonObjectHandlerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/JsonObjectHandlerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/JsonWriterTest.cpp b/Gems/AWSCore/Code/Tests/Framework/JsonWriterTest.cpp
index 21aecd266a..2d6bd67168 100644
--- a/Gems/AWSCore/Code/Tests/Framework/JsonWriterTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/JsonWriterTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/RequestBuilderTest.cpp b/Gems/AWSCore/Code/Tests/Framework/RequestBuilderTest.cpp
index f976e85245..346e04064d 100644
--- a/Gems/AWSCore/Code/Tests/Framework/RequestBuilderTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/RequestBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/ServiceClientJobConfigTest.cpp b/Gems/AWSCore/Code/Tests/Framework/ServiceClientJobConfigTest.cpp
index 939f132696..e5dd6d9040 100644
--- a/Gems/AWSCore/Code/Tests/Framework/ServiceClientJobConfigTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/ServiceClientJobConfigTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/ServiceJobUtilTest.cpp b/Gems/AWSCore/Code/Tests/Framework/ServiceJobUtilTest.cpp
index 196a824973..88ce234bff 100644
--- a/Gems/AWSCore/Code/Tests/Framework/ServiceJobUtilTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/ServiceJobUtilTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/ServiceRequestJobTest.cpp b/Gems/AWSCore/Code/Tests/Framework/ServiceRequestJobTest.cpp
index 3c42797082..efac656aae 100644
--- a/Gems/AWSCore/Code/Tests/Framework/ServiceRequestJobTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/ServiceRequestJobTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/Framework/UtilTest.cpp b/Gems/AWSCore/Code/Tests/Framework/UtilTest.cpp
index d3ca0b7747..f7a0cb2ce1 100644
--- a/Gems/AWSCore/Code/Tests/Framework/UtilTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Framework/UtilTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
index 53bbf08b48..424a5e2048 100644
--- a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingUtilsTest.cpp b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingUtilsTest.cpp
index e2f3d6951c..2565b56290 100644
--- a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingUtilsTest.cpp
+++ b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingUtilsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorDynamoDBTest.cpp b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorDynamoDBTest.cpp
index a1e3497a6c..49b3670bb0 100644
--- a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorDynamoDBTest.cpp
+++ b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorDynamoDBTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorLambdaTest.cpp b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorLambdaTest.cpp
index af7080f1d9..e64b1046ad 100644
--- a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorLambdaTest.cpp
+++ b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorLambdaTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorS3Test.cpp b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorS3Test.cpp
index ca036d27cc..cac0a042bc 100644
--- a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorS3Test.cpp
+++ b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorS3Test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp
index db9eb2c2ef..15ad297f9b 100644
--- a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp
+++ b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h b/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h
index b53c927cf0..78d377711b 100644
--- a/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h
+++ b/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/error_controller.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/error_controller.py
index d748023ccb..3353e498f4 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/error_controller.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/error_controller.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/import_resources_controller.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/import_resources_controller.py
index 85b4e093e0..8db8df3007 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/import_resources_controller.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/import_resources_controller.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/view_edit_controller.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/view_edit_controller.py
index 0855a16f59..66ba363b81 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/view_edit_controller.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/view_edit_controller.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/configuration_manager.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/configuration_manager.py
index 0ebe80f6bc..b6f0d9b370 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/configuration_manager.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/configuration_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/controller_manager.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/controller_manager.py
index 14ab0b8f0c..d6227698eb 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/controller_manager.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/controller_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/thread_manager.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/thread_manager.py
index 344a16faf2..f5ff039465 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/thread_manager.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/thread_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/view_manager.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/view_manager.py
index 7d9a2d4011..68f84a92c7 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/view_manager.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/manager/view_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/basic_resource_attributes.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/basic_resource_attributes.py
index 652431daa1..a29f741465 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/basic_resource_attributes.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/basic_resource_attributes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/configuration.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/configuration.py
index c11913b77c..7015c9fe16 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/configuration.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/configuration.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/constants.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/constants.py
index addcffd5bd..fc908f9fee 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/constants.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/constants.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/error_messages.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/error_messages.py
index 15a43bea21..d2308c44df 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/error_messages.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/error_messages.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/notification_label_text.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/notification_label_text.py
index 5b63069d8f..7ccaf50877 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/notification_label_text.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/notification_label_text.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_abstract_model.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_abstract_model.py
index 4f3bf09e2f..3670b90fe5 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_abstract_model.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_abstract_model.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_mapping_attributes.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_mapping_attributes.py
index ed27f91c7b..13fbcf23e7 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_mapping_attributes.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_mapping_attributes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_proxy_model.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_proxy_model.py
index db684fcf3f..deb6d36c70 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_proxy_model.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_proxy_model.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_table_model.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_table_model.py
index 6005bf2aff..6682f2b4de 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_table_model.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_table_model.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_tree_model.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_tree_model.py
index 74d6648444..e3d6ae4c4c 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_tree_model.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/resource_tree_model.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/view_size_constants.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/view_size_constants.py
index 1405a1b1fe..25331872c9 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/view_size_constants.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/model/view_size_constants.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/multithread/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/multithread/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/multithread/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/multithread/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/multithread/worker.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/multithread/worker.py
index 09f269943e..52518f3004 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/multithread/worker.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/multithread/worker.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
index 932a05583c..5f9fbcc64b 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/azqtcomponents_resources.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/azqtcomponents_resources.py
index cab07b9ab1..4007891a92 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/azqtcomponents_resources.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/azqtcomponents_resources.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss
index 2347272331..8f46ca9ce4 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -136,13 +136,13 @@ QPushButton#Primary
 QPushButton#Primary:hover
 {
     background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #44BAFF, stop:1 #4AB2F8);
-    border: 1px solid #00A1C9;
+    border: 1px solid #94D2FF;
 }
 
 QPushButton#Primary:pressed
 {
     background-color: #0073BB;
-    border: 1px solid #00A1C9;
+    border: 1px solid #1E70EB;
 }
 
 QPushButton#Primary:disabled
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/editormainwindow_resources.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/editormainwindow_resources.py
index e8020acfff..be02fa3670 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/editormainwindow_resources.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/editormainwindow_resources.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/test_import_resources_controller.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/test_import_resources_controller.py
index 15b0ae136e..a4731a70b9 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/test_import_resources_controller.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/test_import_resources_controller.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/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 ad9ef24119..33d6059634 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_configuration_manager.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_configuration_manager.py
index 9f3b37a21f..fcef87f054 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_configuration_manager.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_configuration_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_controller_manager.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_controller_manager.py
index 88e70ad2d0..15a92eae37 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_controller_manager.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_controller_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_thread_manager.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_thread_manager.py
index d6cfdae1c1..38b4fee685 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_thread_manager.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_thread_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_view_manager.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_view_manager.py
index 43ac8b8810..153a60c392 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_view_manager.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/manager/test_view_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/multithread/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/multithread/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/multithread/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/multithread/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/multithread/test_worker.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/multithread/test_worker.py
index 52651405f8..320761c2df 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/multithread/test_worker.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/multithread/test_worker.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_aws_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_aws_utils.py
index 0b23800f80..b3c88e0863 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_aws_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_aws_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/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 5246b4bcd9..c6791fb6f4 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/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 cc5f30bf09..be6f066c07 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/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 71546fe85c..03ea798176 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/aws_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/aws_utils.py
index 4031bd22eb..04dfb04250 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/aws_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/aws_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py
index 24b41a153e..852d6c927a 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py
index 951c55e2f4..9ea5e3868e 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py
index 0967489668..386dc422cb 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/__init__.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/__init__.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/common_view_components.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/common_view_components.py
index d2f74ec1fc..d736ebb658 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/common_view_components.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/common_view_components.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/error_page.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/error_page.py
index 4c11d4d925..301b2388d8 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/error_page.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/error_page.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/import_resources_page.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/import_resources_page.py
index 43be1cfd97..3035908697 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/import_resources_page.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/import_resources_page.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/view_edit_page.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/view_edit_page.py
index c65da19dd4..5439c2903a 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/view_edit_page.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/view/view_edit_page.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/Code/awscore_editor_files.cmake b/Gems/AWSCore/Code/awscore_editor_files.cmake
index 84c58dee67..5caeca1316 100644
--- a/Gems/AWSCore/Code/awscore_editor_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/awscore_editor_shared_files.cmake b/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
index bbac4f5244..d8c87a1169 100644
--- a/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/awscore_editor_tests_files.cmake b/Gems/AWSCore/Code/awscore_editor_tests_files.cmake
index db335d8816..ecdf09b8f4 100644
--- a/Gems/AWSCore/Code/awscore_editor_tests_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/awscore_files.cmake b/Gems/AWSCore/Code/awscore_files.cmake
index d67c8e2890..c1577ec1eb 100644
--- a/Gems/AWSCore/Code/awscore_files.cmake
+++ b/Gems/AWSCore/Code/awscore_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake b/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake
index 003fc094cd..d6799948a7 100644
--- a/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake
+++ b/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/awscore_shared_files.cmake b/Gems/AWSCore/Code/awscore_shared_files.cmake
index f256d472f7..326298a4b9 100644
--- a/Gems/AWSCore/Code/awscore_shared_files.cmake
+++ b/Gems/AWSCore/Code/awscore_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/Code/awscore_tests_files.cmake b/Gems/AWSCore/Code/awscore_tests_files.cmake
index 68fd773e79..50c7e5401f 100644
--- a/Gems/AWSCore/Code/awscore_tests_files.cmake
+++ b/Gems/AWSCore/Code/awscore_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/cdk/app.py b/Gems/AWSCore/cdk/app.py
index 94feafd46f..22da61fbae 100755
--- a/Gems/AWSCore/cdk/app.py
+++ b/Gems/AWSCore/cdk/app.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/cdk/constants.py b/Gems/AWSCore/cdk/constants.py
index 3b47a44245..dffe4163c8 100755
--- a/Gems/AWSCore/cdk/constants.py
+++ b/Gems/AWSCore/cdk/constants.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/cdk/core/aws_core.py b/Gems/AWSCore/cdk/core/aws_core.py
index 90bc8d5ab3..ff14884461 100755
--- a/Gems/AWSCore/cdk/core/aws_core.py
+++ b/Gems/AWSCore/cdk/core/aws_core.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/cdk/core/core_stack.py b/Gems/AWSCore/cdk/core/core_stack.py
index 070acf90b1..20db22ad84 100755
--- a/Gems/AWSCore/cdk/core/core_stack.py
+++ b/Gems/AWSCore/cdk/core/core_stack.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/cdk/core_stack_properties.py b/Gems/AWSCore/cdk/core_stack_properties.py
index 8af57c9c87..f794df0466 100755
--- a/Gems/AWSCore/cdk/core_stack_properties.py
+++ b/Gems/AWSCore/cdk/core_stack_properties.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/cdk/example/__init__.py b/Gems/AWSCore/cdk/example/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSCore/cdk/example/__init__.py
+++ b/Gems/AWSCore/cdk/example/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/cdk/example/auth.py b/Gems/AWSCore/cdk/example/auth.py
index 2a5f09f657..24f77a2fa1 100755
--- a/Gems/AWSCore/cdk/example/auth.py
+++ b/Gems/AWSCore/cdk/example/auth.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/cdk/example/dynamodb_table_seeder.py b/Gems/AWSCore/cdk/example/dynamodb_table_seeder.py
index 651279a386..5434a7d573 100755
--- a/Gems/AWSCore/cdk/example/dynamodb_table_seeder.py
+++ b/Gems/AWSCore/cdk/example/dynamodb_table_seeder.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSCore/cdk/example/example_resources_stack.py b/Gems/AWSCore/cdk/example/example_resources_stack.py
index edf0851b86..7afbd9bb4c 100755
--- a/Gems/AWSCore/cdk/example/example_resources_stack.py
+++ b/Gems/AWSCore/cdk/example/example_resources_stack.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSCore/cdk/example/lambda/lambda-handler.py b/Gems/AWSCore/cdk/example/lambda/lambda-handler.py
index 698333cdf2..57f8086491 100755
--- a/Gems/AWSCore/cdk/example/lambda/lambda-handler.py
+++ b/Gems/AWSCore/cdk/example/lambda/lambda-handler.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientTest.cpp
index fbda861c51..9ea7c6c5f8 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSGameLift/Code/AWSGameLiftServer/Tests/AWSGameLiftServerTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftServer/Tests/AWSGameLiftServerTest.cpp
index fbda861c51..9ea7c6c5f8 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftServer/Tests/AWSGameLiftServerTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftServer/Tests/AWSGameLiftServerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/CMakeLists.txt b/Gems/AWSMetrics/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AWSMetrics/CMakeLists.txt
+++ b/Gems/AWSMetrics/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSMetrics/Code/CMakeLists.txt b/Gems/AWSMetrics/Code/CMakeLists.txt
index fd99c7c222..150e226d14 100644
--- a/Gems/AWSMetrics/Code/CMakeLists.txt
+++ b/Gems/AWSMetrics/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -21,6 +21,7 @@ ly_add_target(
             AZ::AzFramework
         PUBLIC
             Gem::AWSCore
+            3rdParty::AWSNativeSDK::Core
 )
 
 ly_add_target( 
diff --git a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsConstant.h b/Gems/AWSMetrics/Code/Include/Private/AWSMetricsConstant.h
index 5e3c3896c4..6f361ee2fd 100644
--- a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsConstant.h
+++ b/Gems/AWSMetrics/Code/Include/Private/AWSMetricsConstant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/AWSMetricsModule.h b/Gems/AWSMetrics/Code/Include/Private/AWSMetricsModule.h
index c002f42ed4..c344817e3f 100644
--- a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsModule.h
+++ b/Gems/AWSMetrics/Code/Include/Private/AWSMetricsModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/AWSMetricsServiceApi.h b/Gems/AWSMetrics/Code/Include/Private/AWSMetricsServiceApi.h
index 68343839a9..50d828ac05 100644
--- a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsServiceApi.h
+++ b/Gems/AWSMetrics/Code/Include/Private/AWSMetricsServiceApi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/AWSMetricsSystemComponent.h b/Gems/AWSMetrics/Code/Include/Private/AWSMetricsSystemComponent.h
index 3d984ae68d..3ba37e5279 100644
--- a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsSystemComponent.h
+++ b/Gems/AWSMetrics/Code/Include/Private/AWSMetricsSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/ClientConfiguration.h b/Gems/AWSMetrics/Code/Include/Private/ClientConfiguration.h
index 409248694a..239d01b56c 100644
--- a/Gems/AWSMetrics/Code/Include/Private/ClientConfiguration.h
+++ b/Gems/AWSMetrics/Code/Include/Private/ClientConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/DefaultClientIdProvider.h b/Gems/AWSMetrics/Code/Include/Private/DefaultClientIdProvider.h
index ae976b4f85..20ae9c84c7 100644
--- a/Gems/AWSMetrics/Code/Include/Private/DefaultClientIdProvider.h
+++ b/Gems/AWSMetrics/Code/Include/Private/DefaultClientIdProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/GlobalStatistics.h b/Gems/AWSMetrics/Code/Include/Private/GlobalStatistics.h
index 410ed37032..51599b3dbd 100644
--- a/Gems/AWSMetrics/Code/Include/Private/GlobalStatistics.h
+++ b/Gems/AWSMetrics/Code/Include/Private/GlobalStatistics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/IdentityProvider.h b/Gems/AWSMetrics/Code/Include/Private/IdentityProvider.h
index de0cbdc105..845ac4442b 100644
--- a/Gems/AWSMetrics/Code/Include/Private/IdentityProvider.h
+++ b/Gems/AWSMetrics/Code/Include/Private/IdentityProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/MetricsAttribute.h b/Gems/AWSMetrics/Code/Include/Private/MetricsAttribute.h
index ffcf8dc3e8..5602fa14ba 100644
--- a/Gems/AWSMetrics/Code/Include/Private/MetricsAttribute.h
+++ b/Gems/AWSMetrics/Code/Include/Private/MetricsAttribute.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/MetricsEvent.h b/Gems/AWSMetrics/Code/Include/Private/MetricsEvent.h
index 752e7ad7db..f6c16e85ea 100644
--- a/Gems/AWSMetrics/Code/Include/Private/MetricsEvent.h
+++ b/Gems/AWSMetrics/Code/Include/Private/MetricsEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/MetricsEventBuilder.h b/Gems/AWSMetrics/Code/Include/Private/MetricsEventBuilder.h
index 59d761c477..a8fc20dfb7 100644
--- a/Gems/AWSMetrics/Code/Include/Private/MetricsEventBuilder.h
+++ b/Gems/AWSMetrics/Code/Include/Private/MetricsEventBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/MetricsManager.h b/Gems/AWSMetrics/Code/Include/Private/MetricsManager.h
index 632e1ddc3a..9f110c75e0 100644
--- a/Gems/AWSMetrics/Code/Include/Private/MetricsManager.h
+++ b/Gems/AWSMetrics/Code/Include/Private/MetricsManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Private/MetricsQueue.h b/Gems/AWSMetrics/Code/Include/Private/MetricsQueue.h
index 5652ff4dc4..36646f35cb 100644
--- a/Gems/AWSMetrics/Code/Include/Private/MetricsQueue.h
+++ b/Gems/AWSMetrics/Code/Include/Private/MetricsQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Include/Public/AWSMetricsBus.h b/Gems/AWSMetrics/Code/Include/Public/AWSMetricsBus.h
index bd3015fb5a..23c2e8c944 100644
--- a/Gems/AWSMetrics/Code/Include/Public/AWSMetricsBus.h
+++ b/Gems/AWSMetrics/Code/Include/Public/AWSMetricsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/AWSMetricsModule.cpp b/Gems/AWSMetrics/Code/Source/AWSMetricsModule.cpp
index 4e34081da6..f30afa494e 100644
--- a/Gems/AWSMetrics/Code/Source/AWSMetricsModule.cpp
+++ b/Gems/AWSMetrics/Code/Source/AWSMetricsModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/AWSMetricsServiceApi.cpp b/Gems/AWSMetrics/Code/Source/AWSMetricsServiceApi.cpp
index 989e9f2eef..539c0593d0 100644
--- a/Gems/AWSMetrics/Code/Source/AWSMetricsServiceApi.cpp
+++ b/Gems/AWSMetrics/Code/Source/AWSMetricsServiceApi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/AWSMetricsSystemComponent.cpp b/Gems/AWSMetrics/Code/Source/AWSMetricsSystemComponent.cpp
index 3a54c4c709..cbc10a1f04 100644
--- a/Gems/AWSMetrics/Code/Source/AWSMetricsSystemComponent.cpp
+++ b/Gems/AWSMetrics/Code/Source/AWSMetricsSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/ClientConfiguration.cpp b/Gems/AWSMetrics/Code/Source/ClientConfiguration.cpp
index e971ed4dab..504c02d920 100644
--- a/Gems/AWSMetrics/Code/Source/ClientConfiguration.cpp
+++ b/Gems/AWSMetrics/Code/Source/ClientConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/DefaultClientIdProvider.cpp b/Gems/AWSMetrics/Code/Source/DefaultClientIdProvider.cpp
index 0daf175a0c..f51497389d 100644
--- a/Gems/AWSMetrics/Code/Source/DefaultClientIdProvider.cpp
+++ b/Gems/AWSMetrics/Code/Source/DefaultClientIdProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/IdentityProvider.cpp b/Gems/AWSMetrics/Code/Source/IdentityProvider.cpp
index 38cace5f1a..4de262a852 100644
--- a/Gems/AWSMetrics/Code/Source/IdentityProvider.cpp
+++ b/Gems/AWSMetrics/Code/Source/IdentityProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/MetricsAttribute.cpp b/Gems/AWSMetrics/Code/Source/MetricsAttribute.cpp
index 375309a267..287e97c9a1 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsAttribute.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsAttribute.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/MetricsEvent.cpp b/Gems/AWSMetrics/Code/Source/MetricsEvent.cpp
index c48a8fb459..8a9499377b 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsEvent.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/MetricsEventBuilder.cpp b/Gems/AWSMetrics/Code/Source/MetricsEventBuilder.cpp
index 0ad1b6c671..abb6af8a1e 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsEventBuilder.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsEventBuilder.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/MetricsManager.cpp b/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
index 73717587cf..5779697010 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Source/MetricsQueue.cpp b/Gems/AWSMetrics/Code/Source/MetricsQueue.cpp
index cc5b082ee5..c95ce71573 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsQueue.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/AWSMetricsGemMock.h b/Gems/AWSMetrics/Code/Tests/AWSMetricsGemMock.h
index fa939ae406..77d3f5e5b8 100644
--- a/Gems/AWSMetrics/Code/Tests/AWSMetricsGemMock.h
+++ b/Gems/AWSMetrics/Code/Tests/AWSMetricsGemMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/AWSMetricsServiceApiTest.cpp b/Gems/AWSMetrics/Code/Tests/AWSMetricsServiceApiTest.cpp
index 5d07869569..7aac3fecfd 100644
--- a/Gems/AWSMetrics/Code/Tests/AWSMetricsServiceApiTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/AWSMetricsServiceApiTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/AWSMetricsSystemComponentTest.cpp b/Gems/AWSMetrics/Code/Tests/AWSMetricsSystemComponentTest.cpp
index 766286d55b..cc81b5ac9b 100644
--- a/Gems/AWSMetrics/Code/Tests/AWSMetricsSystemComponentTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/AWSMetricsSystemComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/AWSMetricsTest.cpp b/Gems/AWSMetrics/Code/Tests/AWSMetricsTest.cpp
index 98d3d27c19..05a750dc1b 100644
--- a/Gems/AWSMetrics/Code/Tests/AWSMetricsTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/AWSMetricsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/ClientIdProviderTest.cpp b/Gems/AWSMetrics/Code/Tests/ClientIdProviderTest.cpp
index f3f9da6bef..9c8ccf1556 100644
--- a/Gems/AWSMetrics/Code/Tests/ClientIdProviderTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/ClientIdProviderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/MetricsAttributeTest.cpp b/Gems/AWSMetrics/Code/Tests/MetricsAttributeTest.cpp
index 49b1806927..2dd800ff19 100644
--- a/Gems/AWSMetrics/Code/Tests/MetricsAttributeTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/MetricsAttributeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/MetricsEventBuilderTest.cpp b/Gems/AWSMetrics/Code/Tests/MetricsEventBuilderTest.cpp
index 72b63f9437..0d2f373389 100644
--- a/Gems/AWSMetrics/Code/Tests/MetricsEventBuilderTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/MetricsEventBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/MetricsEventTest.cpp b/Gems/AWSMetrics/Code/Tests/MetricsEventTest.cpp
index 491ad9d04d..ff0600398e 100644
--- a/Gems/AWSMetrics/Code/Tests/MetricsEventTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/MetricsEventTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/MetricsManagerTest.cpp b/Gems/AWSMetrics/Code/Tests/MetricsManagerTest.cpp
index 6a68b5b661..39d06dec66 100644
--- a/Gems/AWSMetrics/Code/Tests/MetricsManagerTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/MetricsManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/Tests/MetricsQueueTest.cpp b/Gems/AWSMetrics/Code/Tests/MetricsQueueTest.cpp
index 5c41fc0bd1..eb776fecde 100644
--- a/Gems/AWSMetrics/Code/Tests/MetricsQueueTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/MetricsQueueTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AWSMetrics/Code/awsmetrics_files.cmake b/Gems/AWSMetrics/Code/awsmetrics_files.cmake
index f8b44d055c..a468cd7cab 100644
--- a/Gems/AWSMetrics/Code/awsmetrics_files.cmake
+++ b/Gems/AWSMetrics/Code/awsmetrics_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake b/Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake
index cb45c245a8..05545a9f9a 100644
--- a/Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake
+++ b/Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSMetrics/Code/awsmetrics_tests_files.cmake b/Gems/AWSMetrics/Code/awsmetrics_tests_files.cmake
index 1361e8f478..63682cf2ed 100644
--- a/Gems/AWSMetrics/Code/awsmetrics_tests_files.cmake
+++ b/Gems/AWSMetrics/Code/awsmetrics_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AWSMetrics/cdk/app.py b/Gems/AWSMetrics/cdk/app.py
index fef341b543..48c7a072b3 100755
--- a/Gems/AWSMetrics/cdk/app.py
+++ b/Gems/AWSMetrics/cdk/app.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/__init__.py b/Gems/AWSMetrics/cdk/aws_metrics/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/__init__.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/auth.py b/Gems/AWSMetrics/cdk/aws_metrics/auth.py
index c3cc2ca497..af55b894f7 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/auth.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/auth.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_constants.py b/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_constants.py
index bdcd20da8a..9f4ccdd620 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_constants.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_constants.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_construct.py b/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_construct.py
index 13f99927dc..c1621eadc7 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_construct.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_construct.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_stack.py b/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_stack.py
index d0e1ffa0c4..a7c19c9ccd 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_stack.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/aws_metrics_stack.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/batch_analytics.py b/Gems/AWSMetrics/cdk/aws_metrics/batch_analytics.py
index 342f69f066..cbf837e696 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/batch_analytics.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/batch_analytics.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/batch_processing.py b/Gems/AWSMetrics/cdk/aws_metrics/batch_processing.py
index 22ec8ac721..31bff352cb 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/batch_processing.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/batch_processing.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/dashboard.py b/Gems/AWSMetrics/cdk/aws_metrics/dashboard.py
index 7c1cf6e03c..c8df1d05a9 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/dashboard.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/dashboard.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/data_ingestion.py b/Gems/AWSMetrics/cdk/aws_metrics/data_ingestion.py
index 42d3e008d6..04b3477d17 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/data_ingestion.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/data_ingestion.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/data_lake_integration.py b/Gems/AWSMetrics/cdk/aws_metrics/data_lake_integration.py
index f08ce71ce6..583e71af4a 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/data_lake_integration.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/data_lake_integration.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/lambdas/analytics_processing_lambda/analytics_processing.py b/Gems/AWSMetrics/cdk/aws_metrics/lambdas/analytics_processing_lambda/analytics_processing.py
index 2f26f04876..959703d926 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/lambdas/analytics_processing_lambda/analytics_processing.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/lambdas/analytics_processing_lambda/analytics_processing.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/lambdas/events_processing_lambda/events_processing.py b/Gems/AWSMetrics/cdk/aws_metrics/lambdas/events_processing_lambda/events_processing.py
index 613281c45e..d6a493e8ac 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/lambdas/events_processing_lambda/events_processing.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/lambdas/events_processing_lambda/events_processing.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/layout_widget_construct.py b/Gems/AWSMetrics/cdk/aws_metrics/layout_widget_construct.py
index db1b65d6f9..54d68d3b0d 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/layout_widget_construct.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/layout_widget_construct.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/__init__.py b/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/__init__.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/admin_policy_statements_builder.py b/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/admin_policy_statements_builder.py
index b68fcd5695..7595c70715 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/admin_policy_statements_builder.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/admin_policy_statements_builder.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/policy_statements_builder_interface.py b/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/policy_statements_builder_interface.py
index ec44ccafd4..80ac87e17b 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/policy_statements_builder_interface.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/policy_statements_builder_interface.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/user_policy_statements_builder.py b/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/user_policy_statements_builder.py
index 0218849642..bb5ea3e3de 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/user_policy_statements_builder.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/policy_statements_builder/user_policy_statements_builder.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AWSMetrics/cdk/aws_metrics/real_time_data_processing.py b/Gems/AWSMetrics/cdk/aws_metrics/real_time_data_processing.py
index d3b85adf21..1badcb9cad 100755
--- a/Gems/AWSMetrics/cdk/aws_metrics/real_time_data_processing.py
+++ b/Gems/AWSMetrics/cdk/aws_metrics/real_time_data_processing.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Achievements/CMakeLists.txt b/Gems/Achievements/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Achievements/CMakeLists.txt
+++ b/Gems/Achievements/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/CMakeLists.txt b/Gems/Achievements/Code/CMakeLists.txt
index ce3b111615..5aa52e5938 100644
--- a/Gems/Achievements/Code/CMakeLists.txt
+++ b/Gems/Achievements/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Include/Achievements/AchievementNotificationBus.h b/Gems/Achievements/Code/Include/Achievements/AchievementNotificationBus.h
index f3794f3d79..5e764a89da 100644
--- a/Gems/Achievements/Code/Include/Achievements/AchievementNotificationBus.h
+++ b/Gems/Achievements/Code/Include/Achievements/AchievementNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Achievements/Code/Include/Achievements/AchievementRequestBus.h b/Gems/Achievements/Code/Include/Achievements/AchievementRequestBus.h
index aa56bb5215..c76985f2a0 100644
--- a/Gems/Achievements/Code/Include/Achievements/AchievementRequestBus.h
+++ b/Gems/Achievements/Code/Include/Achievements/AchievementRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Achievements/Code/Source/AchievementsModule.cpp b/Gems/Achievements/Code/Source/AchievementsModule.cpp
index 3933688706..867a4c2815 100644
--- a/Gems/Achievements/Code/Source/AchievementsModule.cpp
+++ b/Gems/Achievements/Code/Source/AchievementsModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Achievements/Code/Source/AchievementsSystemComponent.cpp b/Gems/Achievements/Code/Source/AchievementsSystemComponent.cpp
index 6fcfecfd84..130e414f27 100644
--- a/Gems/Achievements/Code/Source/AchievementsSystemComponent.cpp
+++ b/Gems/Achievements/Code/Source/AchievementsSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Achievements/Code/Source/AchievementsSystemComponent.h b/Gems/Achievements/Code/Source/AchievementsSystemComponent.h
index de3818d8d7..1556b40599 100644
--- a/Gems/Achievements/Code/Source/AchievementsSystemComponent.h
+++ b/Gems/Achievements/Code/Source/AchievementsSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Achievements/Code/Source/Platform/Android/platform_android.cmake b/Gems/Achievements/Code/Source/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Achievements/Code/Source/Platform/Android/platform_android.cmake
+++ b/Gems/Achievements/Code/Source/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Achievements/Code/Source/Platform/Android/platform_android_files.cmake
index 3a063fbb59..f7713e7844 100644
--- a/Gems/Achievements/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Achievements/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/AppleTV/platform_appletv.cmake b/Gems/Achievements/Code/Source/Platform/AppleTV/platform_appletv.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Achievements/Code/Source/Platform/AppleTV/platform_appletv.cmake
+++ b/Gems/Achievements/Code/Source/Platform/AppleTV/platform_appletv.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/Common/Unimplemented/AchievementsSystemComponent_Unimplemented.cpp b/Gems/Achievements/Code/Source/Platform/Common/Unimplemented/AchievementsSystemComponent_Unimplemented.cpp
index a296c6da1e..66f174e588 100644
--- a/Gems/Achievements/Code/Source/Platform/Common/Unimplemented/AchievementsSystemComponent_Unimplemented.cpp
+++ b/Gems/Achievements/Code/Source/Platform/Common/Unimplemented/AchievementsSystemComponent_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Achievements/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/Achievements/Code/Source/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Achievements/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/Achievements/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Achievements/Code/Source/Platform/Linux/platform_linux_files.cmake
index 3a063fbb59..f7713e7844 100644
--- a/Gems/Achievements/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Achievements/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/Achievements/Code/Source/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Achievements/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/Achievements/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Achievements/Code/Source/Platform/Mac/platform_mac_files.cmake
index 3a063fbb59..f7713e7844 100644
--- a/Gems/Achievements/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Achievements/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/Achievements/Code/Source/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Achievements/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/Achievements/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Achievements/Code/Source/Platform/Windows/platform_windows_files.cmake
index 3a063fbb59..f7713e7844 100644
--- a/Gems/Achievements/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Achievements/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/iOS/platform_ios.cmake b/Gems/Achievements/Code/Source/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Achievements/Code/Source/Platform/iOS/platform_ios.cmake
+++ b/Gems/Achievements/Code/Source/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Achievements/Code/Source/Platform/iOS/platform_ios_files.cmake
index 3a063fbb59..f7713e7844 100644
--- a/Gems/Achievements/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Achievements/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/achievements_files.cmake b/Gems/Achievements/Code/achievements_files.cmake
index c4e18c9106..633638d02a 100644
--- a/Gems/Achievements/Code/achievements_files.cmake
+++ b/Gems/Achievements/Code/achievements_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Achievements/Code/achievements_shared_files.cmake b/Gems/Achievements/Code/achievements_shared_files.cmake
index db758b3dab..200cd7b3aa 100644
--- a/Gems/Achievements/Code/achievements_shared_files.cmake
+++ b/Gems/Achievements/Code/achievements_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetMemoryAnalyzer/CMakeLists.txt b/Gems/AssetMemoryAnalyzer/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AssetMemoryAnalyzer/CMakeLists.txt
+++ b/Gems/AssetMemoryAnalyzer/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetMemoryAnalyzer/Code/CMakeLists.txt b/Gems/AssetMemoryAnalyzer/Code/CMakeLists.txt
index de045d5327..c9c7baa5f4 100644
--- a/Gems/AssetMemoryAnalyzer/Code/CMakeLists.txt
+++ b/Gems/AssetMemoryAnalyzer/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetMemoryAnalyzer/Code/Include/AssetMemoryAnalyzer/AssetMemoryAnalyzerBus.h b/Gems/AssetMemoryAnalyzer/Code/Include/AssetMemoryAnalyzer/AssetMemoryAnalyzerBus.h
index e0f89fc6aa..3527a18af5 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Include/AssetMemoryAnalyzer/AssetMemoryAnalyzerBus.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Include/AssetMemoryAnalyzer/AssetMemoryAnalyzerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp
index 6da03a9269..64bdd51f39 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h
index 4ecc83fc21..810444d1bc 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerModule.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerModule.cpp
index 0ee1ad9e56..87443b04d6 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerModule.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp
index 59838ea36c..f5ed2ec36d 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.h b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.h
index dcc9e98f15..f0189d9b92 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
index 4899df5161..d424689241 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp
index 5a4b006794..702dad5d18 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.h b/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.h
index 75489115e9..8b0361931c 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp
index 351c1b73a1..c20d8b6cdc 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.h b/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.h
index 727aebd11f..3475926466 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
index d6f507c4f4..d5d5bb7039 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.h b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.h
index e06d4ab603..951ef45699 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp
index 66e48be350..ebfa5f0cf5 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.h b/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.h
index 50902306be..c9fbe1434e 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.h
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/Tests/AssetMemoryAnalyzerTest.cpp b/Gems/AssetMemoryAnalyzer/Code/Tests/AssetMemoryAnalyzerTest.cpp
index bc05e32ded..001cfe130b 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Tests/AssetMemoryAnalyzerTest.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Tests/AssetMemoryAnalyzerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake
index 41b72b91f6..d7f50ce09b 100644
--- a/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake
+++ b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_shared_files.cmake b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_shared_files.cmake
index 0c02f9e437..74163ddd3d 100644
--- a/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_shared_files.cmake
+++ b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_tests_files.cmake b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_tests_files.cmake
index 96fcbcde0f..e1d0529bee 100644
--- a/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_tests_files.cmake
+++ b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetValidation/CMakeLists.txt b/Gems/AssetValidation/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AssetValidation/CMakeLists.txt
+++ b/Gems/AssetValidation/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetValidation/Code/CMakeLists.txt b/Gems/AssetValidation/Code/CMakeLists.txt
index df700b8b0a..bfdaca9f25 100644
--- a/Gems/AssetValidation/Code/CMakeLists.txt
+++ b/Gems/AssetValidation/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetValidation/Code/Include/AssetValidation/AssetValidationBus.h b/Gems/AssetValidation/Code/Include/AssetValidation/AssetValidationBus.h
index 735abce4ec..b13708a410 100644
--- a/Gems/AssetValidation/Code/Include/AssetValidation/AssetValidationBus.h
+++ b/Gems/AssetValidation/Code/Include/AssetValidation/AssetValidationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Source/AssetSeedUtil.cpp b/Gems/AssetValidation/Code/Source/AssetSeedUtil.cpp
index 2c3735d346..ff3dff1d5c 100644
--- a/Gems/AssetValidation/Code/Source/AssetSeedUtil.cpp
+++ b/Gems/AssetValidation/Code/Source/AssetSeedUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Source/AssetSeedUtil.h b/Gems/AssetValidation/Code/Source/AssetSeedUtil.h
index 55537cf50f..bc15aa5c2e 100644
--- a/Gems/AssetValidation/Code/Source/AssetSeedUtil.h
+++ b/Gems/AssetValidation/Code/Source/AssetSeedUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Source/AssetSystemTestCommands.cpp b/Gems/AssetValidation/Code/Source/AssetSystemTestCommands.cpp
index 0b619c619a..e4d83d8a1a 100644
--- a/Gems/AssetValidation/Code/Source/AssetSystemTestCommands.cpp
+++ b/Gems/AssetValidation/Code/Source/AssetSystemTestCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Source/AssetSystemTestCommands.h b/Gems/AssetValidation/Code/Source/AssetSystemTestCommands.h
index a2a72ab426..2fbfd551bf 100644
--- a/Gems/AssetValidation/Code/Source/AssetSystemTestCommands.h
+++ b/Gems/AssetValidation/Code/Source/AssetSystemTestCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Source/AssetValidationModule.cpp b/Gems/AssetValidation/Code/Source/AssetValidationModule.cpp
index b917b6df51..6e79c8ba92 100644
--- a/Gems/AssetValidation/Code/Source/AssetValidationModule.cpp
+++ b/Gems/AssetValidation/Code/Source/AssetValidationModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp b/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp
index 812c7a8ac9..cec544c9d1 100644
--- a/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp
+++ b/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.h b/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.h
index 66bf8d353b..7eb4aeec26 100644
--- a/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.h
+++ b/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Tests/AssetValidationTest.cpp b/Gems/AssetValidation/Code/Tests/AssetValidationTest.cpp
index 9044c72f8a..bce754e24f 100644
--- a/Gems/AssetValidation/Code/Tests/AssetValidationTest.cpp
+++ b/Gems/AssetValidation/Code/Tests/AssetValidationTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h b/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
index 19b67a3efb..894d310d41 100644
--- a/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
+++ b/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AssetValidation/Code/assetvalidation_files.cmake b/Gems/AssetValidation/Code/assetvalidation_files.cmake
index 3611a38176..865d901433 100644
--- a/Gems/AssetValidation/Code/assetvalidation_files.cmake
+++ b/Gems/AssetValidation/Code/assetvalidation_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetValidation/Code/assetvalidation_shared_files.cmake b/Gems/AssetValidation/Code/assetvalidation_shared_files.cmake
index 998b12ba32..a5059321ae 100644
--- a/Gems/AssetValidation/Code/assetvalidation_shared_files.cmake
+++ b/Gems/AssetValidation/Code/assetvalidation_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AssetValidation/Code/assetvalidation_tests_files.cmake b/Gems/AssetValidation/Code/assetvalidation_tests_files.cmake
index 4eb71052b5..36f41a9f8f 100644
--- a/Gems/AssetValidation/Code/assetvalidation_tests_files.cmake
+++ b/Gems/AssetValidation/Code/assetvalidation_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/CMakeLists.txt b/Gems/Atom/Asset/CMakeLists.txt
index bd881f65c2..f1d75329d2 100644
--- a/Gems/Atom/Asset/CMakeLists.txt
+++ b/Gems/Atom/Asset/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/CMakeLists.txt b/Gems/Atom/Asset/ImageProcessingAtom/CMakeLists.txt
index 5e62e20750..1f5d8c540e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/CMakeLists.txt
+++ b/Gems/Atom/Asset/ImageProcessingAtom/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/CMakeLists.txt b/Gems/Atom/Asset/ImageProcessingAtom/Code/CMakeLists.txt
index 9b71d14be8..2c4719f9b2 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/CMakeLists.txt
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageObject.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageObject.h
index dbcb87e7c2..a3a99c2f7a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageObject.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingBus.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingBus.h
index c3b71020da..92999010e7 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingBus.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingEditorBus.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingEditorBus.h
index 290c3077ba..7d6c09524a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingEditorBus.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/ImageProcessingEditorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h
index 7c8d9598d1..e2d8c7b8e3 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
index 049530bcee..eb5f0a1629 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h
index ebc61c6930..3e08dc5e86 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp
index cdf15e2358..b85ef41967 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.h
index 8621d74187..2e39b7e97c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp
index 3c23e0d0a2..262efd5a8e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h
index 4a793ad39b..95f3e8c7ed 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h
index 3a76e84e97..9fbed1e5e0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp
index df2737eb12..c0c167476a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.h
index be3da28de2..d0093a6d5f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PlatformSettings.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PlatformSettings.h
index b15e2265d0..c25772a2de 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PlatformSettings.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PlatformSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp
index d976acc866..2b53fbd95f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.h
index 8738802623..28f507d282 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp
index 6ac24245f0..f323ba29ee 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.h
index 60f545c5ca..210dd82dad 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp
index 520858bca6..d4b6a2b85a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.h
index 8da0d1d907..c1b117e615 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp
index d97b8f011a..1f4dfb7ef8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.h
index 5cbef9a8a8..1327c0bc31 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp
index 04f58da019..f6461461a1 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.h
index 7bfa5db78f..8d269520cf 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp
index feb021eb72..9ce7e9e897 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.h
index a6f3ba5391..07b38235ee 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp
index 0d6c7f60a9..8817c55572 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.h
index 491e2394c7..1ea1593169 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h
index 4fe8ec1b6a..d6a1381e65 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
index f7c0ac0208..7e0161f519 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.h
index b5deaab91c..a81e5a8fee 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp
index c7ca90de93..db2e0e8ea0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.h
index d8e83932fb..796621e86d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp
index 00c5b45c66..22c87999aa 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.h
index 12d506ea32..a1798c651f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp
index 61d73cddeb..a40bc5ca49 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.h
index 135a8005da..aafa92924c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp
index 6aa1fff635..01bb94ba76 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp
index 6a03d44e1c..ecd5328f06 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
index b281a0a16a..7585cbd97e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp
index 02c78dd384..bdb455ec04 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h
index edc98dc8c8..515216866a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
index 53a5e35a14..151c34197b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp
index 9b11bc2d3c..bec32a18c6 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.h
index 845fb44f3e..abb53093f5 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Windows.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Windows.h
index 231ecc7aa6..5057008e1a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Windows.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp
index 57d3b1ea58..6cd48a02c2 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp
index 791d41b5dd..263d94cf90 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp
index ab177002bf..3878b38263 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.h
index 72575870ae..c35bc485a6 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp
index 8f017e4407..8ac39a8413 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp
index 407b00953a..a73e145b54 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h
index d1a3a9b6d2..a20c5cbe76 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
index f117b17384..ce23058fcc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.h
index f33411f5db..870646f6fa 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp
index 5de3704ecb..0fa1832cb6 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.h
index 366daf355f..8e55456381 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp
index a6332fb653..2b1e1a6e07 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.h
index 5b039caf44..25190d29b0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp
index 08cae62111..32d461db46 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.h
index 3a042b2497..3dd575c200 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp
index 25c2e65e94..19a100d126 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.h
index 2edfff8aa7..f853ecea86 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp
index 16c25110e3..14d2991fba 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.h
index 39a6a6ffef..6df7b3ef78 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
index 95e40c2c41..0cbf1b996a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.h
index d1641e07eb..f903b016a0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp
index 8a6c78f8f8..7adac7cdab 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.h
index ce01e3ef2d..a2b13fb740 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp
index 85c7dea6f2..0be72ce1d8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h
index 9343eb686f..0e3c0bc201 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderBaseType.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderBaseType.h
index 31d6ecccd0..639933e229 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderBaseType.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderBaseType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
index c90856749f..d24541eded 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.h
index ba8bc004f7..1141539ae8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
index 1c56dbd1d0..c4c49c1d3b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -414,7 +414,7 @@ namespace ImageProcessingAtom
 
             AZ::u32 marker = 0;
             fileLoadStream.Read(4, &marker);
-            if (marker == FOURCC_CExt) // marker for the start of Crytek Extended data
+            if (marker == FOURCC_CExt) // marker for the start of O3DE Extended data
             {
                 fileLoadStream.Read(4, &marker);
                 if (FOURCC_AttC == marker) // Attached Channel chunk
@@ -426,7 +426,7 @@ namespace ImageProcessingAtom
                     fileLoadStream.Read(4, &marker);
                 }
 
-                if (FOURCC_CEnd == marker) // marker for the end of Crytek Extended data
+                if (FOURCC_CEnd == marker) // marker for the end of O3DE Extended data
                 {
                     fileLoadStream.Read(4, &marker);
                 }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp
index fc92744195..47ee234ac7 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp
index 2973be65d2..889178121a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.h
index 22491c21e5..b9f0499178 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp
index 3266a3baeb..1fb2202d2a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
index e1918db9f2..2164723e93 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp
index 2d584239d9..5164ab9733 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp
index e02cdf2238..2c84b409c7 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.h
index 30083f30a1..6f5fa8d99f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
index 091431432a..c2894ceffc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/ImageProcessing_Traits_Android.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/ImageProcessing_Traits_Android.h
index 2d00c32b77..cfcf69a64c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/ImageProcessing_Traits_Android.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/ImageProcessing_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/ImageProcessing_Traits_Platform.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/ImageProcessing_Traits_Platform.h
index a833e9b966..9aadcc52db 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/ImageProcessing_Traits_Platform.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/ImageProcessing_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/platform_android_files.cmake
index 17dcf9bc46..abd8b6eeb1 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/Clang/imageprocessingatom_editor_static_clang.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/Clang/imageprocessingatom_editor_static_clang.cmake
index 1151dfe73c..ae1ab9ae23 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/Clang/imageprocessingatom_editor_static_clang.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/Clang/imageprocessingatom_editor_static_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/msvc/imageprocessingatom_editor_static_msvc.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/msvc/imageprocessingatom_editor_static_msvc.cmake
index 6786dfd811..e95772616a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/msvc/imageprocessingatom_editor_static_msvc.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/msvc/imageprocessingatom_editor_static_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Linux.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Linux.h
index 4197857643..7afb060e0e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Linux.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Platform.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Platform.h
index eddcc7ae97..bb7f77393f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Platform.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/platform_linux_files.cmake
index 47241c1207..8a0291dffe 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h
index ecb76d5e17..7e0c170b08 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Platform.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Platform.h
index 60241884e4..c94a30873f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Platform.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/platform_mac.cmake
index 0144df0e46..5b97784f99 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/platform_mac_files.cmake
index 17e78ccd41..dde926f6a7 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/ImageProcessing_Traits_Platform.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/ImageProcessing_Traits_Platform.h
index 19aea65681..54b727a570 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/ImageProcessing_Traits_Platform.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/ImageProcessing_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/ImageProcessing_Traits_Windows.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/ImageProcessing_Traits_Windows.h
index c5d28cc134..3d014c1147 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/ImageProcessing_Traits_Windows.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/ImageProcessing_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows.cmake
index da9cffe563..63a07dc94d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows_files.cmake
index 132132363e..41b21fbddc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_Platform.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_Platform.h
index 717ed604a0..bbb2684512 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_Platform.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h
index ecb76d5e17..7e0c170b08 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/platform_ios_files.cmake
index a9ada31511..54c6ae11e5 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp
index a0e33e28cd..a1d69ac13c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.h
index 6888801d01..b906a04915 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp
index ec43416249..c2bb085609 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.h
index ad8504a86d..47a1be8e64 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/AzDXGIFormat.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/AzDXGIFormat.h
index 7c5e1dfe21..658ff7ec71 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/AzDXGIFormat.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/AzDXGIFormat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
index 13f1c73985..d39b02f2f6 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -148,7 +148,7 @@ namespace ImageProcessingAtom
         AZ::u32 dwDepth;        // only if DDS_HEADER_FLAGS_VOLUME is set in dwHeaderFlags
         AZ::u32 dwMipMapCount;
         AZ::u32 dwAlphaBitDepth;
-        AZ::u32 dwReserved1;    // Crytek image flags
+        AZ::u32 dwReserved1;    // Image flags
         float fAvgBrightness;   // Average top mip brightness. Could be f16/half
         float cMinColor[4];
         float cMaxColor[4];
@@ -230,8 +230,8 @@ namespace ImageProcessingAtom
     };
 
     // chunk identifier
-    const static AZ::u32 FOURCC_CExt = IMAGE_BUIDER_MAKEFOURCC('C', 'E', 'x', 't');    // Crytek extension start
-    const static AZ::u32 FOURCC_CEnd = IMAGE_BUIDER_MAKEFOURCC('C', 'E', 'n', 'd');    // Crytek extension end
+    const static AZ::u32 FOURCC_CExt = IMAGE_BUIDER_MAKEFOURCC('C', 'E', 'x', 't');    // O3DE extension start
+    const static AZ::u32 FOURCC_CEnd = IMAGE_BUIDER_MAKEFOURCC('C', 'E', 'n', 'd');    // O3DE extension end
     const static AZ::u32 FOURCC_AttC = IMAGE_BUIDER_MAKEFOURCC('A', 't', 't', 'C');    // Chunk Attached Channel
 
     //Fourcc for pixel formats which aren't supported by dx10, such as astc formats, etc formats, pvrtc formats
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp
index f79c027f1a..87836d187c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.h
index 5dd7c37775..4b15f9e3e0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
index a78e0d3d0f..be98820442 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
index e6f5d06858..649b9e5f9b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
index fb9fe767ef..db9dc66e38 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
index 64efdde011..09884677b3 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
index 313c6cbdaa..49f13bf17e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
index 667fc9f8bc..4d2911ca4f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -350,7 +350,7 @@ namespace ImageProcessingAtom
         if (bOk && alphaImage && !hasSplitFlag)
         {
             //4 bytes extension tag, 4 bytes attached alpha tag, then 4 bytes of chunk size
-            fileSaveStream.Write(sizeof(FOURCC_CExt), &FOURCC_CExt); // marker for the start of Crytek Extended data
+            fileSaveStream.Write(sizeof(FOURCC_CExt), &FOURCC_CExt); // marker for the start of O3DE Extended data
             fileSaveStream.Write(sizeof(FOURCC_AttC), &FOURCC_AttC); // Attached Channel chunk
 
             uint32_t size = 0;
@@ -368,7 +368,7 @@ namespace ImageProcessingAtom
             fileSaveStream.Write(sizeBytes, &size);
             fileSaveStream.Seek(endPos, AZ::IO::GenericStream::ST_SEEK_BEGIN);
 
-            // marker for the end of Crytek Extended data
+            // marker for the end of O3DE Extended data
             fileSaveStream.Write(sizeof(FOURCC_CEnd), &FOURCC_CEnd);
         }
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.h
index f0a540f3ea..c52493309e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
index 3c07688cbc..edf4f26563 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.h
index 1036a3f0db..8aa1f768e8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h
index 960fd31cea..1f814b052a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
index 30e0573c16..60bada1449 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -202,7 +202,7 @@ namespace ImageProcessingAtom
         // Data in a Float format is floating point data.
         InitPixelFormat(ePixelFormat_R9G9B9E5, PixelFormatInfo(32, 3, false, "0", 1, 1, 1, 1, 32, false, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, FOURCC_DX10, ESampleType::eSampleType_Compressed, "R9G9B9E5", "32-bit RGB pixel format with shared exponent", false, true));
         InitPixelFormat(ePixelFormat_R32G32B32A32F, PixelFormatInfo(128, 4, true, "23", 1, 1, 1, 1, 128, false, DXGI_FORMAT_R32G32B32A32_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Float, "R32G32B32A32F", "four float channels", false, false));
-        InitPixelFormat(ePixelFormat_R32G32F, PixelFormatInfo(64, 2, false, "0", 1, 1, 1, 1, 64, false, DXGI_FORMAT_R32G32_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Float, "R32G32F", "two float channels", false, false)); // FIXME: This should be eTF_R32G32F, but CryTek did not add that enum to ITexture.h yet
+        InitPixelFormat(ePixelFormat_R32G32F, PixelFormatInfo(64, 2, false, "0", 1, 1, 1, 1, 64, false, DXGI_FORMAT_R32G32_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Float, "R32G32F", "two float channels", false, false)); // FIXME: This should be eTF_R32G32F, but that enum is not in ITexture.h yet
         InitPixelFormat(ePixelFormat_R32F, PixelFormatInfo(32, 1, false, "0", 1, 1, 1, 1, 32, false, DXGI_FORMAT_R32_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Float, "R32F", "one float channel", false, false));
         InitPixelFormat(ePixelFormat_R16G16B16A16F, PixelFormatInfo(64, 4, true, "10", 1, 1, 1, 1, 64, false, DXGI_FORMAT_R16G16B16A16_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Half, "R16G16B16A16F", "four half channels", false, false));
         InitPixelFormat(ePixelFormat_R16G16F, PixelFormatInfo(32, 2, false, "0", 1, 1, 1, 1, 32, false, DXGI_FORMAT_R16G16_FLOAT, FOURCC_DX10, ESampleType::eSampleType_Half, "R16G16F", "two half channel", false, false));
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h
index 468ea9b9d8..f65bb98c53 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
index 99f52ff569..0b1ed339aa 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h
index 3649bd1cc9..c145556d5b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
index 0a2a837539..2cd5468121 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
index 3fac9d933d..c00d102d70 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
index cc64eaeed9..3fc6843d5e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.h
index 8830f282ca..ee9792129e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
index 27c82b0fbd..d5434091f8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
index 5dea4e4ed9..157c99857a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_tests_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_tests_files.cmake
index 1ca83ff71b..266d771c82 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_tests_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_headers_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_headers_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_headers_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_headers_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_shared_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_shared_files.cmake
index 3815ee75a9..a1c668e30b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_shared_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessingatom_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp
index e8697c7c27..271013adef 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp
@@ -6,8 +6,7 @@
 //=============================================================================
 // (C) 2005 ATI Research, Inc., All rights reserved.
 //=============================================================================
-// modifications by Crytek GmbH
-// modifications by Amazon
+// Modified from original
 
 #include <ImageProcessing_precompiled.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h
index 056cb25425..53f32f8cd5 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h
@@ -5,8 +5,7 @@
 //=============================================================================
 // (C) 2005 ATI Research, Inc., All rights reserved.
 //=============================================================================
-// modifications by Crytek GmbH
-// modifications by Amazon
+// Modified from original
 
 #pragma once
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
index df31067af0..8264003b0b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
@@ -1,8 +1,7 @@
 //=============================================================================
 // (C) 2005 ATI Research, Inc., All rights reserved.
 //=============================================================================
-// modifications by Crytek GmbH 
-// modifications by Amazon
+// Modified from original
 
 #include <ImageProcessing_precompiled.h>
 #include "CCubeMapProcessor.h"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.h
index be54b98e6a..4a29e8621a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.h
@@ -6,8 +6,7 @@
 //--------------------------------------------------------------------------------------
 // (C) 2005 ATI Research, Inc., All rights reserved.
 //--------------------------------------------------------------------------------------
-// modifications by Crytek GmbH
-// modifications by Amazon
+// Modified from original
 
 #pragma once
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp
index 3b055699e2..f7da8a3c4a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -12,8 +12,7 @@
 //--------------------------------------------------------------------------------------
 // (C) 2005 ATI Research, Inc., All rights reserved.
 //--------------------------------------------------------------------------------------
-// modifications by Crytek GmbH
-// modifications by Amazon
+// Modified from original
 
 #include <ImageProcessing_precompiled.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
index 33644372a3..6ad8f68ebc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
@@ -5,8 +5,7 @@
 //--------------------------------------------------------------------------------------
 // (C) 2005 ATI Research, Inc., All rights reserved.
 //--------------------------------------------------------------------------------------
-// modifications by Crytek GmbH
-// modifications by Amazon
+// Modified from original
 
 #pragma once
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/VectorMacros.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/VectorMacros.h
index 7546457c79..ac4b598061 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/VectorMacros.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/VectorMacros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -15,7 +15,7 @@
 //--------------------------------------------------------------------------------------
 //  (C) 2001-2005 ATI Research, Inc.  All rights reserved.
 //--------------------------------------------------------------------------------------
-// modifications by Crytek GmbH
+// Modified from original
 
 //disable warning about doubles being converted down to float
 #pragma warning (disable : 4244 )
diff --git a/Gems/Atom/Asset/Shader/CMakeLists.txt b/Gems/Atom/Asset/Shader/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/Asset/Shader/CMakeLists.txt
+++ b/Gems/Atom/Asset/Shader/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/AzslcHeader.azsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/AzslcHeader.azsli
index 699ff9d77a..025ca94a80 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/AzslcHeader.azsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/AzslcHeader.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/PlatformHeader.hlsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/PlatformHeader.hlsli
index 1cdc858059..089b1be166 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/PlatformHeader.hlsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Android/Vulkan/PlatformHeader.hlsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Metal/AzslcHeader.azsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Metal/AzslcHeader.azsli
index cceb94a490..9613cb9e75 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Metal/AzslcHeader.azsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Metal/AzslcHeader.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Metal/PlatformHeader.hlsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Metal/PlatformHeader.hlsli
index ab83dc1ee0..ede38cc17f 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Metal/PlatformHeader.hlsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Metal/PlatformHeader.hlsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Null/AzslcHeader.azsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Null/AzslcHeader.azsli
index bc40b983b9..ab6c3a107a 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Null/AzslcHeader.azsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Mac/Null/AzslcHeader.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/DX12/AzslcHeader.azsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/DX12/AzslcHeader.azsli
index 610457fb17..20e979895d 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/DX12/AzslcHeader.azsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/DX12/AzslcHeader.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/DX12/PlatformHeader.hlsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/DX12/PlatformHeader.hlsli
index 7639178140..5075886081 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/DX12/PlatformHeader.hlsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/DX12/PlatformHeader.hlsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Null/AzslcHeader.azsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Null/AzslcHeader.azsli
index bc40b983b9..ab6c3a107a 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Null/AzslcHeader.azsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Null/AzslcHeader.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Vulkan/AzslcHeader.azsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Vulkan/AzslcHeader.azsli
index 3ae9997919..cf9a8526fb 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Vulkan/AzslcHeader.azsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Vulkan/AzslcHeader.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Vulkan/PlatformHeader.hlsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Vulkan/PlatformHeader.hlsli
index 1cdc858059..089b1be166 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Vulkan/PlatformHeader.hlsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/Windows/Vulkan/PlatformHeader.hlsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/iOS/Metal/AzslcHeader.azsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/iOS/Metal/AzslcHeader.azsli
index a4f79704ed..da5488e1cc 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/iOS/Metal/AzslcHeader.azsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/iOS/Metal/AzslcHeader.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/AZSL/Platform/iOS/Metal/PlatformHeader.hlsli b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/iOS/Metal/PlatformHeader.hlsli
index ab83dc1ee0..ede38cc17f 100644
--- a/Gems/Atom/Asset/Shader/Code/AZSL/Platform/iOS/Metal/PlatformHeader.hlsli
+++ b/Gems/Atom/Asset/Shader/Code/AZSL/Platform/iOS/Metal/PlatformHeader.hlsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/CMakeLists.txt b/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
index 7f11c2165b..1e946b6e1b 100644
--- a/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
+++ b/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderCapabilitiesConfigFile.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderCapabilitiesConfigFile.cpp
index 668f0a678d..2c54ea1086 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderCapabilitiesConfigFile.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderCapabilitiesConfigFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderCapabilitiesConfigFile.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderCapabilitiesConfigFile.h
index 57e16a1e29..a05bcbe0ff 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderCapabilitiesConfigFile.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderCapabilitiesConfigFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderConfig.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderConfig.cpp
index 01d6ee85f7..a5f9b567a3 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderConfig.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderConfig.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderConfig.h
index a253130349..df12bd4967 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderConfig.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AtomShaderConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslCompiler.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslCompiler.cpp
index eb2b029c3b..f816b29909 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslCompiler.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslCompiler.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslCompiler.h
index 240969d8b5..455b025eb6 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslCompiler.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslData.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslData.h
index c74dc6f3fe..ec8bea9baf 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslData.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderModule.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderModule.cpp
index bfe85100a7..c762c621bf 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderModule.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
index f1c2cb88b5..afa11d8e16 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.h
index c8d0bbf9bc..bff1d1695d 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/CommonTypes.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/CommonTypes.cpp
index fa05e4933f..1f25def555 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/CommonTypes.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/CommonTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/CommonTypes.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/CommonTypes.h
index 4bd2db27bc..fefee79dcf 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/CommonTypes.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/CommonTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/GlobalBuildOptions.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/GlobalBuildOptions.cpp
index b83e1acf94..b355ef8495 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/GlobalBuildOptions.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/GlobalBuildOptions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/GlobalBuildOptions.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/GlobalBuildOptions.h
index 114e467d79..5318e93aa5 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/GlobalBuildOptions.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/GlobalBuildOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
index 657d8e45f8..1d0754bdbb 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.h
index 753d3daa24..a229f6e33a 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/PrecompiledShaderBuilder.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/PrecompiledShaderBuilder.cpp
index c62907063c..be48a6c7bb 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/PrecompiledShaderBuilder.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/PrecompiledShaderBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/PrecompiledShaderBuilder.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/PrecompiledShaderBuilder.h
index 61679b08e0..25fa8637cb 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/PrecompiledShaderBuilder.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/PrecompiledShaderBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp
index db7c19e33f..11f94ad209 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.h
index 9404ceffea..5e28835900 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
index 64b23a4dab..8f31228a93 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.h
index 60c71a3460..8572d44aab 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderPlatformInterfaceRequest.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderPlatformInterfaceRequest.h
index 54078973dd..e8f3ec6642 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderPlatformInterfaceRequest.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderPlatformInterfaceRequest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
index a3f8306838..7e2540cf44 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.h
index d9e30a7675..be419c5ded 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/SrgLayoutUtility.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/SrgLayoutUtility.cpp
index 831e9778c5..3c1cf72a21 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/SrgLayoutUtility.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/SrgLayoutUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Editor/SrgLayoutUtility.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/SrgLayoutUtility.h
index c779a55fc2..bf77751c0e 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/SrgLayoutUtility.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/SrgLayoutUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/PAL_android.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/PAL_android.cmake
index 83d88fd062..53788c4aff 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Android.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Android.h
index 69808a5b74..a75759d5f6 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Android.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Platform.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Platform.h
index 3270c74931..5ed7a20959 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Platform.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/platform_android_files.cmake
index 991a894fcb..881f5d8d56 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/Clang/atom_asset_shader_static_clang.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/Clang/atom_asset_shader_static_clang.cmake
index e5c49c47cd..89a2dfa866 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/Clang/atom_asset_shader_static_clang.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/Clang/atom_asset_shader_static_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/MSVC/atom_asset_shader_static_msvc.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/MSVC/atom_asset_shader_static_msvc.cmake
index d330c47f38..fe1e0b2320 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/MSVC/atom_asset_shader_static_msvc.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/MSVC/atom_asset_shader_static_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp b/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
index e67e38f61b..04438a9b6c 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/PAL_linux.cmake
index 83d88fd062..53788c4aff 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Linux.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Linux.h
index 9b0dfcdcd2..5ea19fbb7c 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Linux.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Platform.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Platform.h
index 28f002e80a..899ccb8d7e 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Platform.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_builders_linux.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_builders_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_builders_linux.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_builders_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_linux_files.cmake
index ddefb39657..0577af4878 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/PAL_mac.cmake
index 29e2a92680..b65b726c76 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Mac.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Mac.h
index d50658a52c..12a002b59f 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Mac.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Platform.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Platform.h
index 8bb3d0d3bc..563f8e4555 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Platform.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_builders_mac.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_builders_mac.cmake
index 60a1b69902..76233560ef 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_builders_mac.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_builders_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_mac_files.cmake
index 2ba65d6d10..f29a2f3719 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/PAL_windows.cmake
index 29e2a92680..b65b726c76 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Platform.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Platform.h
index b472e0650d..ed6f90359a 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Platform.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Windows.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Windows.h
index bfb91eeea8..7fa9a5e33b 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Windows.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_builders_windows.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_builders_windows.cmake
index f82a537555..b0832a2439 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_builders_windows.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_builders_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_windows_files.cmake
index 698df6d4a1..f9e6e2ebf7 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/PAL_ios.cmake
index 83d88fd062..53788c4aff 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_Platform.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_Platform.h
index d2cfbf0fd4..a9fb0f9642 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_Platform.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_iOS.h b/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_iOS.h
index 69808a5b74..a75759d5f6 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_iOS.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/platform_ios_files.cmake
index 596787d63f..dbc109b921 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.cpp b/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.cpp
index 14157d2faf..0b3df369ef 100644
--- a/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.h b/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.h
index 107707ff6e..2f9bd72f07 100644
--- a/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.h
+++ b/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/Tests/SupervariantCmdArgumentTests.cpp b/Gems/Atom/Asset/Shader/Code/Tests/SupervariantCmdArgumentTests.cpp
index 3b3a94390d..4d1b81ad65 100644
--- a/Gems/Atom/Asset/Shader/Code/Tests/SupervariantCmdArgumentTests.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Tests/SupervariantCmdArgumentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_files.cmake b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_files.cmake
index c10b9f3e01..f29d79806a 100644
--- a/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_shared_files.cmake b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_shared_files.cmake
index c9c50ae762..45ce407fa8 100644
--- a/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_shared_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_stub_files.cmake b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_stub_files.cmake
index 2cfed2e165..bae9126874 100644
--- a/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_stub_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_stub_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_tests_files.cmake b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_tests_files.cmake
index 8efa949155..d42446d012 100644
--- a/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_tests_files.cmake
+++ b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Bootstrap/CMakeLists.txt b/Gems/Atom/Bootstrap/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/Bootstrap/CMakeLists.txt
+++ b/Gems/Atom/Bootstrap/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Bootstrap/Code/CMakeLists.txt b/Gems/Atom/Bootstrap/Code/CMakeLists.txt
index 359fc94447..7983c566f6 100644
--- a/Gems/Atom/Bootstrap/Code/CMakeLists.txt
+++ b/Gems/Atom/Bootstrap/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapNotificationBus.h b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapNotificationBus.h
index 16666554a8..13660f0e50 100644
--- a/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapNotificationBus.h
+++ b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapRequestBus.h b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapRequestBus.h
index 4ee3a6b6e5..f1f31e3419 100644
--- a/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapRequestBus.h
+++ b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/BootstrapRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/DefaultWindowBus.h b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/DefaultWindowBus.h
index aa206fb588..88ead847e1 100644
--- a/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/DefaultWindowBus.h
+++ b/Gems/Atom/Bootstrap/Code/Include/Atom/Bootstrap/DefaultWindowBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Bootstrap/Code/Source/BootstrapModule.cpp b/Gems/Atom/Bootstrap/Code/Source/BootstrapModule.cpp
index 739c28ce45..69b64c05e1 100644
--- a/Gems/Atom/Bootstrap/Code/Source/BootstrapModule.cpp
+++ b/Gems/Atom/Bootstrap/Code/Source/BootstrapModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
index 538293ca9a..e9a7630c78 100644
--- a/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
+++ b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.h b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.h
index 22f4d94c93..397b58c2c7 100644
--- a/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.h
+++ b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Bootstrap/Code/bootstrap_files.cmake b/Gems/Atom/Bootstrap/Code/bootstrap_files.cmake
index eda57eee1c..c5b7b44cd2 100644
--- a/Gems/Atom/Bootstrap/Code/bootstrap_files.cmake
+++ b/Gems/Atom/Bootstrap/Code/bootstrap_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Bootstrap/Code/bootstrap_headers_files.cmake b/Gems/Atom/Bootstrap/Code/bootstrap_headers_files.cmake
index 5c977767b0..92271f8663 100644
--- a/Gems/Atom/Bootstrap/Code/bootstrap_headers_files.cmake
+++ b/Gems/Atom/Bootstrap/Code/bootstrap_headers_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/CMakeLists.txt b/Gems/Atom/CMakeLists.txt
index fa786b04e9..3c7a6951f6 100644
--- a/Gems/Atom/CMakeLists.txt
+++ b/Gems/Atom/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Component/CMakeLists.txt b/Gems/Atom/Component/CMakeLists.txt
index d6b0b3ec5a..39d2272378 100644
--- a/Gems/Atom/Component/CMakeLists.txt
+++ b/Gems/Atom/Component/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Component/DebugCamera/CMakeLists.txt b/Gems/Atom/Component/DebugCamera/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/Component/DebugCamera/CMakeLists.txt
+++ b/Gems/Atom/Component/DebugCamera/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Component/DebugCamera/Code/CMakeLists.txt b/Gems/Atom/Component/DebugCamera/Code/CMakeLists.txt
index 7ad56a8b76..c9ccaab329 100644
--- a/Gems/Atom/Component/DebugCamera/Code/CMakeLists.txt
+++ b/Gems/Atom/Component/DebugCamera/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/ArcBallControllerBus.h b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/ArcBallControllerBus.h
index f5e3921651..e9c42c8726 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/ArcBallControllerBus.h
+++ b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/ArcBallControllerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/ArcBallControllerComponent.h b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/ArcBallControllerComponent.h
index 130977375b..d703c31a80 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/ArcBallControllerComponent.h
+++ b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/ArcBallControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraComponent.h b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraComponent.h
index 46f2c89bf6..46530ce0c6 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraComponent.h
+++ b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerBus.h b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerBus.h
index d0f249683d..125ec5a68b 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerBus.h
+++ b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerComponent.h b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerComponent.h
index 08206bd10c..4c227936be 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerComponent.h
+++ b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/NoClipControllerBus.h b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/NoClipControllerBus.h
index ddd17dd49c..58dae51896 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/NoClipControllerBus.h
+++ b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/NoClipControllerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/NoClipControllerComponent.h b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/NoClipControllerComponent.h
index e573a410bd..ce900b5a7c 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/NoClipControllerComponent.h
+++ b/Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/NoClipControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Source/ArcBallControllerComponent.cpp b/Gems/Atom/Component/DebugCamera/Code/Source/ArcBallControllerComponent.cpp
index 1a2738082d..69897a2bb6 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Source/ArcBallControllerComponent.cpp
+++ b/Gems/Atom/Component/DebugCamera/Code/Source/ArcBallControllerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Source/CameraComponent.cpp b/Gems/Atom/Component/DebugCamera/Code/Source/CameraComponent.cpp
index 6f29b5f7fe..375677829a 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Source/CameraComponent.cpp
+++ b/Gems/Atom/Component/DebugCamera/Code/Source/CameraComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Source/CameraControllerComponent.cpp b/Gems/Atom/Component/DebugCamera/Code/Source/CameraControllerComponent.cpp
index b30d634941..15fd1280b2 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Source/CameraControllerComponent.cpp
+++ b/Gems/Atom/Component/DebugCamera/Code/Source/CameraControllerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Source/DebugCameraUtils.cpp b/Gems/Atom/Component/DebugCamera/Code/Source/DebugCameraUtils.cpp
index 5e44c639a4..87f9efee18 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Source/DebugCameraUtils.cpp
+++ b/Gems/Atom/Component/DebugCamera/Code/Source/DebugCameraUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Source/DebugCameraUtils.h b/Gems/Atom/Component/DebugCamera/Code/Source/DebugCameraUtils.h
index 086f614e11..ccc22de9bb 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Source/DebugCameraUtils.h
+++ b/Gems/Atom/Component/DebugCamera/Code/Source/DebugCameraUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Source/Module.cpp b/Gems/Atom/Component/DebugCamera/Code/Source/Module.cpp
index de14a05ce0..c80ca30ea9 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Source/Module.cpp
+++ b/Gems/Atom/Component/DebugCamera/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/Source/NoClipControllerComponent.cpp b/Gems/Atom/Component/DebugCamera/Code/Source/NoClipControllerComponent.cpp
index f81137b2a2..019180312d 100644
--- a/Gems/Atom/Component/DebugCamera/Code/Source/NoClipControllerComponent.cpp
+++ b/Gems/Atom/Component/DebugCamera/Code/Source/NoClipControllerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Component/DebugCamera/Code/atom_component_debugcamera_files.cmake b/Gems/Atom/Component/DebugCamera/Code/atom_component_debugcamera_files.cmake
index 6616f5d4b8..b50768bfc2 100644
--- a/Gems/Atom/Component/DebugCamera/Code/atom_component_debugcamera_files.cmake
+++ b/Gems/Atom/Component/DebugCamera/Code/atom_component_debugcamera_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Component/DebugCamera/Code/atom_component_debugcamera_shared_files.cmake b/Gems/Atom/Component/DebugCamera/Code/atom_component_debugcamera_shared_files.cmake
index a93f67afd8..c686bffbe2 100644
--- a/Gems/Atom/Component/DebugCamera/Code/atom_component_debugcamera_shared_files.cmake
+++ b/Gems/Atom/Component/DebugCamera/Code/atom_component_debugcamera_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/CMakeLists.txt b/Gems/Atom/Feature/CMakeLists.txt
index 64b3003e1e..f1054844aa 100644
--- a/Gems/Atom/Feature/CMakeLists.txt
+++ b/Gems/Atom/Feature/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Assets/Materials/Special/ShadowCatcher.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Special/ShadowCatcher.azsl
index bb5a4673e9..a0564d645c 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Special/ShadowCatcher.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Special/ShadowCatcher.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Common.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Common.azsli
index cf699228c2..9d2d413bf4 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Common.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Common.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl
index d5eb7c3aaf..5a30a6e775 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
index 8e9b75e2ad..4150d213a0 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -324,16 +324,21 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
     // Finalize Lighting
     lightingData.FinalizeLighting(surface.transmission.tint);
 
+    PbrLightingOutput lightingOutput = GetPbrLightingOutput(surface, lightingData, alpha);
+
+    // ------- Opacity -------
+
     if (o_opacity_mode == OpacityMode::Blended || o_opacity_mode == OpacityMode::TintedTransparent)
     {
-        float fresnelAlpha = FresnelSchlickWithRoughness(lightingData.NdotV, alpha, surface.roughnessLinear).x; // Increase opacity at grazing angles.
+        // Increase opacity at grazing angles for surfaces with a low m_opacityAffectsSpecularFactor.
+        // For m_opacityAffectsSpecularFactor values close to 0, that indicates a transparent surface
+        // like glass, so it becomes less transparent at grazing angles. For m_opacityAffectsSpecularFactor
+        // values close to 1.0, that indicates the absence of a surface entirely, so this effect should
+        // not apply.
+        float fresnelAlpha = FresnelSchlickWithRoughness(lightingData.NdotV, alpha, surface.roughnessLinear).x;
         alpha = lerp(fresnelAlpha, alpha, MaterialSrg::m_opacityAffectsSpecularFactor);
     }
 
-    PbrLightingOutput lightingOutput = GetPbrLightingOutput(surface, lightingData, alpha);
-
-    // ------- Opacity -------
-
     // Note: lightingOutput rendertargets are not always used as named, particularly m_diffuseColor (target 0) and
     // m_specularColor (target 1). Comments below describe the differences when appropriate.
 
@@ -347,11 +352,13 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
         // It's done this way because surface transparency doesn't really change specular response (eg, glass).
 
         lightingOutput.m_diffuseColor.rgb *= lightingOutput.m_diffuseColor.w; // pre-multiply diffuse
-
+        
         // Add specular. m_opacityAffectsSpecularFactor controls how much the alpha masks out specular contribution.
         float3 specular = lightingOutput.m_specularColor.rgb;
         specular = lerp(specular, specular * lightingOutput.m_diffuseColor.w, MaterialSrg::m_opacityAffectsSpecularFactor);
         lightingOutput.m_diffuseColor.rgb += specular;
+
+        lightingOutput.m_diffuseColor.w = alpha;
     }
     else if (o_opacity_mode == OpacityMode::TintedTransparent)
     {
@@ -374,7 +381,7 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
         specular = lerp(specular, specular * lightingOutput.m_diffuseColor.w, MaterialSrg::m_opacityAffectsSpecularFactor);
         lightingOutput.m_diffuseColor.rgb += specular;
 
-        lightingOutput.m_specularColor.rgb = baseColor * (1.0 - lightingOutput.m_diffuseColor.w); 
+        lightingOutput.m_specularColor.rgb = baseColor * (1.0 - alpha); 
     }
     else
     {
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.azsl
index a24113b2d3..9eb9248253 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_SubsurfaceState.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_SubsurfaceState.lua
index 3c0290ef87..7ca796b825 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_SubsurfaceState.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_SubsurfaceState.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/AlphaInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/AlphaInput.azsli
index 4d25a38096..a9c94150e1 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/AlphaInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/AlphaInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/BaseColorInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/BaseColorInput.azsli
index 038ce35dbf..af87428b90 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/BaseColorInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/BaseColorInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/ClearCoatInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/ClearCoatInput.azsli
index 37bfe07501..44487afe91 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/ClearCoatInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/ClearCoatInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/DetailMapsCommonFunctor.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/DetailMapsCommonFunctor.lua
index 9d7bb10f5c..0dce3931c0 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/DetailMapsCommonFunctor.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/DetailMapsCommonFunctor.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/DetailMapsInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/DetailMapsInput.azsli
index f8227d54bd..dab066a8ce 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/DetailMapsInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/DetailMapsInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/EmissiveInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/EmissiveInput.azsli
index 9e42b302d6..775417583e 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/EmissiveInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/EmissiveInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/MetallicInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/MetallicInput.azsli
index c82f0896cf..e906a381f2 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/MetallicInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/MetallicInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/NormalInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/NormalInput.azsli
index 0641b54c98..e8f03f712f 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/NormalInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/NormalInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/OcclusionInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/OcclusionInput.azsli
index 7f9f53247f..dc66594aba 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/OcclusionInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/OcclusionInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/ParallaxInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/ParallaxInput.azsli
index 73d2edcf53..4ef8fed004 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/ParallaxInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/ParallaxInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/RoughnessInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/RoughnessInput.azsli
index 55edfdd9dd..da7c84b169 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/RoughnessInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/RoughnessInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/SpecularInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/SpecularInput.azsli
index b65173d905..2142bd11b3 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/SpecularInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/SpecularInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/SubsurfaceInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/SubsurfaceInput.azsli
index 43fd001e54..e4aa2c8570 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/SubsurfaceInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/SubsurfaceInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/TransmissionInput.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/TransmissionInput.azsli
index cde5e39915..3276904d28 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/TransmissionInput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/TransmissionInput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/UvSetCount.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/UvSetCount.azsli
index 71e8142eec..eb2ee3717d 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/UvSetCount.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/MaterialInputs/UvSetCount.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
index de58f4bdfa..0672f97c1d 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin_Common.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin_Common.azsli
index 59d5c0a277..ec050312ac 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin_Common.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin_Common.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin_WrinkleMaps.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin_WrinkleMaps.lua
index 23d5c702ab..c68e038343 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin_WrinkleMaps.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin_WrinkleMaps.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ClearCoatEnableFeature.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ClearCoatEnableFeature.lua
index 0f8f6974bc..dfb83052e5 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ClearCoatEnableFeature.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ClearCoatEnableFeature.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli
index f866f4432c..672debbdfc 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl
index 8904d073dc..7e031d1d3a 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Displacement.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Displacement.lua
index ec28eb514a..bd853693da 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Displacement.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Displacement.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
index cf30d3a594..918e1c6d68 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_LayerEnable.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_LayerEnable.lua
index 44963f3711..b3f371e67c 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_LayerEnable.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_LayerEnable.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ShaderEnable.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ShaderEnable.lua
index cc502ceb0d..51a75fe2e9 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ShaderEnable.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ShaderEnable.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl
index 3fa23f5b40..b974d27190 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ClearCoatEnableFeature.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ClearCoatEnableFeature.lua
index b6fe1c4801..6863de25e9 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ClearCoatEnableFeature.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ClearCoatEnableFeature.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ClearCoatState.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ClearCoatState.lua
index 6dd3db719b..baa1e4f5d7 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ClearCoatState.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ClearCoatState.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Common.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Common.azsli
index f0637c6675..b1e39ff3ad 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Common.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Common.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl
index abb92511fb..dd81c2a1ec 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_EmissiveState.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_EmissiveState.lua
index 8399c0562a..14b1ad2fff 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_EmissiveState.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_EmissiveState.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
index 2dfdd3681f..78d3320db2 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -251,17 +251,21 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
     // Finalize Lighting
     lightingData.FinalizeLighting();
 
+    PbrLightingOutput lightingOutput = GetPbrLightingOutput(surface, lightingData, alpha);
+
+    // ------- Opacity -------
 
     if (o_opacity_mode == OpacityMode::Blended || o_opacity_mode == OpacityMode::TintedTransparent)
     {
-        float fresnelAlpha = FresnelSchlickWithRoughness(lightingData.NdotV, alpha, surface.roughnessLinear).x; // Increase opacity at grazing angles.
+        // Increase opacity at grazing angles for surfaces with a low m_opacityAffectsSpecularFactor.
+        // For m_opacityAffectsSpecularFactor values close to 0, that indicates a transparent surface
+        // like glass, so it becomes less transparent at grazing angles. For m_opacityAffectsSpecularFactor
+        // values close to 1.0, that indicates the absence of a surface entirely, so this effect should
+        // not apply.
+        float fresnelAlpha = FresnelSchlickWithRoughness(lightingData.NdotV, alpha, surface.roughnessLinear).x;
         alpha = lerp(fresnelAlpha, alpha, MaterialSrg::m_opacityAffectsSpecularFactor);
     }
 
-    PbrLightingOutput lightingOutput = GetPbrLightingOutput(surface, lightingData, alpha);
-
-    // ------- Opacity -------
-
     if (o_opacity_mode == OpacityMode::Blended)
     {
         // [GFX_TODO ATOM-13187] PbrLighting shouldn't be writing directly to render targets. It's confusing when
@@ -277,6 +281,8 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
         float3 specular = lightingOutput.m_specularColor.rgb;
         specular = lerp(specular, specular * lightingOutput.m_diffuseColor.w, MaterialSrg::m_opacityAffectsSpecularFactor);
         lightingOutput.m_diffuseColor.rgb += specular;
+
+        lightingOutput.m_diffuseColor.w = alpha;
     }
     else if (o_opacity_mode == OpacityMode::TintedTransparent)
     {
@@ -299,7 +305,7 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
         specular = lerp(specular, specular * lightingOutput.m_diffuseColor.w, MaterialSrg::m_opacityAffectsSpecularFactor);
         lightingOutput.m_diffuseColor.rgb += specular;
 
-        lightingOutput.m_specularColor.rgb = baseColor * (1.0 - lightingOutput.m_diffuseColor.w); 
+        lightingOutput.m_specularColor.rgb = baseColor * (1.0 - alpha); 
     }
     else
     {
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityDoubleSided.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityDoubleSided.lua
index 91e96e2366..345436750d 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityDoubleSided.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityDoubleSided.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityMode.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityMode.lua
index b6c7b25179..c96c2ff585 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityMode.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityMode.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_LowEndForward.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_LowEndForward.azsl
index e8f232eb18..3ef31ded8e 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_LowEndForward.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_LowEndForward.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ParallaxState.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ParallaxState.lua
index 6c7e0d755e..7f3c5aed73 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ParallaxState.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ParallaxState.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Roughness.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Roughness.lua
index 2d2b97a224..9136bd0fc9 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Roughness.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Roughness.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ShaderEnable.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ShaderEnable.lua
index f8dfafb754..3437ddce54 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ShaderEnable.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ShaderEnable.lua
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.azsl
index 5526d8b206..5c5942a561 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Scripts/material_property_overrides_demo.lua b/Gems/Atom/Feature/Common/Assets/Scripts/material_property_overrides_demo.lua
index fe7a53716f..2721ebc4f9 100644
--- a/Gems/Atom/Feature/Common/Assets/Scripts/material_property_overrides_demo.lua
+++ b/Gems/Atom/Feature/Common/Assets/Scripts/material_property_overrides_demo.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Atom/Feature/Common/Assets/Scripts/material_property_overrides_demo.py b/Gems/Atom/Feature/Common/Assets/Scripts/material_property_overrides_demo.py
index 4508fc3fbd..6d0dbc8efd 100755
--- a/Gems/Atom/Feature/Common/Assets/Scripts/material_property_overrides_demo.py
+++ b/Gems/Atom/Feature/Common/Assets/Scripts/material_property_overrides_demo.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/BlendUtility.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/BlendUtility.azsli
index 9d01fe0ba2..930c24b074 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/BlendUtility.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/BlendUtility.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/AcesCg_To_LinearSrgb.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/AcesCg_To_LinearSrgb.azsli
index 59f9e4fe5c..5ad8330e04 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/AcesCg_To_LinearSrgb.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/AcesCg_To_LinearSrgb.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/Aces_To_AcesCg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/Aces_To_AcesCg.azsli
index 79185b6c8c..504a6c200e 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/Aces_To_AcesCg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/Aces_To_AcesCg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/CalculateLuminance_AcesCg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/CalculateLuminance_AcesCg.azsli
index dfe4140dfb..4165228470 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/CalculateLuminance_AcesCg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/CalculateLuminance_AcesCg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/CalculateLuminance_LinearSrgb.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/CalculateLuminance_LinearSrgb.azsli
index 07392bd5b8..6144c21c79 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/CalculateLuminance_LinearSrgb.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/CalculateLuminance_LinearSrgb.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/LinearSrgb_To_AcesCg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/LinearSrgb_To_AcesCg.azsli
index 8833ba5145..e5856898c2 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/LinearSrgb_To_AcesCg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/LinearSrgb_To_AcesCg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/LinearSrgb_To_Srgb.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/LinearSrgb_To_Srgb.azsli
index c3e99c888e..f67f272d7e 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/LinearSrgb_To_Srgb.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/LinearSrgb_To_Srgb.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/Srgb_To_LinearSrgb.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/Srgb_To_LinearSrgb.azsli
index 7e19820310..1b4f7a2267 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/Srgb_To_LinearSrgb.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/GeneratedTransforms/Srgb_To_LinearSrgb.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/TransformColor.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/TransformColor.azsli
index 5f8fde4f79..8d55e833bc 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/TransformColor.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ColorManagement/TransformColor.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/CoreLights/PhotometricValue.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/CoreLights/PhotometricValue.azsli
index 9585632772..e5df41eef8 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/CoreLights/PhotometricValue.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/CoreLights/PhotometricValue.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Decals/DecalTextureUtil.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Decals/DecalTextureUtil.azsli
index bde5fb163c..76e3cf555e 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Decals/DecalTextureUtil.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Decals/DecalTextureUtil.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/IndirectRendering.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/IndirectRendering.azsli
index d90b6c983a..d406c7b736 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/IndirectRendering.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/IndirectRendering.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/LightCulling/LightCullingShared.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/LightCulling/LightCullingShared.azsli
index 4c402181d3..248fdebf0d 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/LightCulling/LightCullingShared.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/LightCulling/LightCullingShared.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/LightCulling/LightCullingTileIterator.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/LightCulling/LightCullingTileIterator.azsli
index 4687dc380a..c4948dbef5 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/LightCulling/LightCullingTileIterator.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/LightCulling/LightCullingTileIterator.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/Filter.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/Filter.azsli
index 2367516fd1..90596b54cb 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/FilterPassSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/FilterPassSrg.azsli
index 5f37b9c966..11f610ae84 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/FilterPassSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/FilterPassSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/IntersectionTests.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/IntersectionTests.azsli
index e0229f7d78..8706d9b659 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/IntersectionTests.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/IntersectionTests.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/MatrixUtility.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/MatrixUtility.azsli
index ae1a23a350..de641b0db2 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/MatrixUtility.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/MatrixUtility.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/MorphTargets/MorphTargetCompression.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/MorphTargets/MorphTargetCompression.azsli
index c991af0ccb..c461af7413 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/MorphTargets/MorphTargetCompression.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/MorphTargets/MorphTargetCompression.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/AlphaUtils.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/AlphaUtils.azsli
index 6ed8ad3b0a..9cd5cd63ae 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/AlphaUtils.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/AlphaUtils.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/BackLighting.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/BackLighting.azsli
index 3831001633..14f88a2948 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Decals.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Decals.azsli
index ff8a7e069d..84c1a42505 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/DefaultObjectSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/DefaultObjectSrg.azsli
index a7f0925eea..9dff25cfb9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassOutput.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassOutput.azsli
index 5e168b74d7..b74efd521e 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassOutput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassOutput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassSrg.azsli
index 37b501e5ae..e96ec39ae3 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardSubsurfacePassOutput.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardSubsurfacePassOutput.azsli
index d9d90e172d..dd53578fe8 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardSubsurfacePassOutput.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardSubsurfacePassOutput.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Hammersley.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Hammersley.azsli
index 78175da1a8..a71229a16c 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Hammersley.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Hammersley.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/DualSpecularLighting.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/DualSpecularLighting.azsli
index 70bb9284de..2609e3b701 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/DualSpecularLighting.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/DualSpecularLighting.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/EnhancedLighting.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/EnhancedLighting.azsli
index 1b8d2c3001..0484e9fa41 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/EnhancedLighting.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/EnhancedLighting.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -28,7 +28,7 @@ float3 GetDiffuseLighting(Surface surface, LightingData lightingData, float3 lig
     }
     else
     {
-        diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight);
+        diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight, lightingData.diffuseResponse);
     }
 
     if(o_clearCoat_feature_enabled)
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/LightingData.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/LightingData.azsli
index dba3d5468e..a7b49aefd4 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/LightingData.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/LightingData.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/SkinLighting.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/SkinLighting.azsli
index a3c13459f4..b839fb7225 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/SkinLighting.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/SkinLighting.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -28,7 +28,7 @@ float3 GetDiffuseLighting(Surface surface, LightingData lightingData, float3 lig
     }
     else
     {
-        diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight);
+        diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight, lightingData.diffuseResponse);
     }
 
     if(o_clearCoat_feature_enabled)
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 fa754479a0..51eb9d324f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -20,7 +20,7 @@
 // Then define the Diffuse and Specular lighting functions
 float3 GetDiffuseLighting(Surface surface, LightingData lightingData, float3 lightIntensity, float3 dirToLight)
 {
-    float3 diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight);
+    float3 diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight, lightingData.diffuseResponse);
 
     if(o_clearCoat_feature_enabled)
     {
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingOptions.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingOptions.azsli
index 2c2d460129..dd27c05198 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingOptions.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingOptions.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingUtils.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingUtils.azsli
index 06ed3273d1..0f2469abe4 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/CapsuleLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/CapsuleLight.azsli
index e362ce3e0d..1db128237f 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/CapsuleLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/CapsuleLight.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli
index 9f62ef93c1..15c2fe8b58 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli
index 1fab069b59..7ddd57ec80 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 c31d4bb71e..698e6ddb50 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/LightTypesCommon.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/LightTypesCommon.azsli
index 89734efd4f..e87280f3b2 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/LightTypesCommon.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/LightTypesCommon.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Lights.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Lights.azsli
index 3e57d8fee8..1b3de12420 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Lights.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Lights.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 1c86767215..5211118947 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 acaacc6ba7..bbd3c1c9e3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 feb813a806..91981e4f4d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/SimplePointLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/SimplePointLight.azsli
index 98abc183b3..54946edcfb 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/SimplePointLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/SimplePointLight.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/SimpleSpotLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/SimpleSpotLight.azsli
index d1da7cee69..3245c2e243 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/SimpleSpotLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/SimpleSpotLight.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 31626b60b3..59b8ba3fc9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -21,10 +21,10 @@
 // ------- Diffuse Lighting -------
 
 //! Simple Lambertian BRDF. 
-float3 DiffuseLambertian(float3 albedo, float3 normal, float3 dirToLight)
+float3 DiffuseLambertian(float3 albedo, float3 normal, float3 dirToLight, float diffuseResponse)
 {
     float NdotL = saturate(dot(normal, dirToLight));
-    return albedo * NdotL * INV_PI;
+    return albedo * NdotL * INV_PI * diffuseResponse;
 }
 
 // Normalized Disney diffuse function taken from Frostbite's PBR course notes (page 10):
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Fresnel.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Fresnel.azsli
index 4586b804ab..54fe142394 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Fresnel.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Fresnel.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Ggx.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Ggx.azsli
index 22af02e7fa..81f25c609d 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Ggx.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Ggx.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/AnisotropicSurfaceData.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/AnisotropicSurfaceData.azsli
index 8db5f51444..35253db0bf 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/AnisotropicSurfaceData.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/AnisotropicSurfaceData.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/BasePbrSurfaceData.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/BasePbrSurfaceData.azsli
index c0a3531135..283f63e3f8 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/BasePbrSurfaceData.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/BasePbrSurfaceData.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/ClearCoatSurfaceData.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/ClearCoatSurfaceData.azsli
index 5c4bb62f9e..f944512a3a 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/ClearCoatSurfaceData.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/ClearCoatSurfaceData.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/DualSpecularSurface.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/DualSpecularSurface.azsli
index dd37f70c5a..d96aefbb00 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/DualSpecularSurface.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/DualSpecularSurface.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli
index a4c2fbe1f6..a77844a7b0 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli
index 263ed62f29..fa6cef3a5c 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli
index 99a31ee4d2..b189498536 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/TransmissionSurfaceData.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/TransmissionSurfaceData.azsli
index 67953be56b..51229dd953 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/TransmissionSurfaceData.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/TransmissionSurfaceData.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ParallaxMapping.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ParallaxMapping.azsli
index 92945facef..2c2f956f8f 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ParallaxMapping.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ParallaxMapping.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/Aces.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/Aces.azsli
index de81dc13e1..a3f7965bb4 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/Aces.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/Aces.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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: (MIT OR Apache-2.0) AND LicenseRef-ACES
  *
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/AcesColorSpaceConversion.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/AcesColorSpaceConversion.azsli
index 84b4ef7eac..14b246a90b 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/AcesColorSpaceConversion.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/AcesColorSpaceConversion.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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: (MIT OR Apache-2.0) AND LicenseRef-ACES
  *
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenPixelInfo.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenPixelInfo.azsli
index 9a45b0ac95..b7f3330b92 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenPixelInfo.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenPixelInfo.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertex.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertex.azsli
index 48d45718f3..ced7728381 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertex.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertex.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertexInfo.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertexInfo.azsli
index 94b0524111..2506f3412d 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertexInfo.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertexInfo.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertexUtil.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertexUtil.azsli
index e43da19edd..59471ac6fd 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertexUtil.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/FullscreenVertexUtil.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/GlyphData.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/GlyphData.azsli
index 33613a3e5c..27748fc324 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/GlyphData.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/GlyphData.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/GlyphRender.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/GlyphRender.azsli
index 1c8a649bd6..a2f8c0c55d 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/GlyphRender.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/GlyphRender.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/PostProcessUtil.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/PostProcessUtil.azsli
index 5cdfb65a82..b05eb1e59a 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/PostProcessUtil.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PostProcessing/PostProcessUtil.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingMaterialSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingMaterialSrg.azsli
index 000b9468c6..b3c230271a 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingMaterialSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingMaterialSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingMaterialUtils.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingMaterialUtils.azsli
index 4b21c28032..d345fa1fde 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingMaterialUtils.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingMaterialUtils.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneSrg.azsli
index c81426515d..ed1d014d6e 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneUtils.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneUtils.azsli
index b3cf1a5783..78e49a1e4c 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneUtils.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneUtils.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ScreenSpace/ScreenSpaceUtil.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ScreenSpace/ScreenSpaceUtil.azsli
index 6e8843d4ba..853bdc937c 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ScreenSpace/ScreenSpaceUtil.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ScreenSpace/ScreenSpaceUtil.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ShaderQualityOptions.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ShaderQualityOptions.azsli
index f4ee408a0b..a975f72203 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ShaderQualityOptions.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/ShaderQualityOptions.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/BicubicPcfFilters.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/BicubicPcfFilters.azsli
index 36ad75a99b..4911d3df1d 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/BicubicPcfFilters.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/BicubicPcfFilters.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/DirectionalLightShadow.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/DirectionalLightShadow.azsli
index 7b592d6458..4642d13f02 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/JitterTablePcf.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/JitterTablePcf.azsli
index f66852e472..bfafd6bd32 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/JitterTablePcf.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/JitterTablePcf.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli
index d7769c2382..80e23a43cf 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/Shadow.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/Shadow.azsli
index fa6d663521..9f45353cee 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/Shadow.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/Shadow.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ShadowmapAtlasLib.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ShadowmapAtlasLib.azsli
index 3815a6a7a8..b51ab95da7 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ShadowmapAtlasLib.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ShadowmapAtlasLib.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/SphericalHarmonicsUtility.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/SphericalHarmonicsUtility.azsli
index 974a857880..fecdcabffc 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/SphericalHarmonicsUtility.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/SphericalHarmonicsUtility.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/SrgSemantics.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/SrgSemantics.azsli
index e27455c9d2..e0c5434b46 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/SrgSemantics.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/SrgSemantics.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Vertex/VertexHelper.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Vertex/VertexHelper.azsli
index 711b64417e..9e9c643769 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Vertex/VertexHelper.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Vertex/VertexHelper.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/CoreLights/SceneSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/CoreLights/SceneSrg.azsli
index a68a224a11..35582ace4e 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/CoreLights/SceneSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/CoreLights/SceneSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/CoreLights/ViewSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/CoreLights/ViewSrg.azsli
index e1705ca014..b591525288 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/CoreLights/ViewSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/CoreLights/ViewSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/Decals/ViewSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/Decals/ViewSrg.azsli
index 598423c01e..d5924538ba 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/Decals/ViewSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/Decals/ViewSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/SceneSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/SceneSrg.azsli
index 8a4c646475..dbd027234a 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/SceneSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/SceneSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli
index 4a8bebe35e..27ee035b5c 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrg.azsli
index 9f114cbea1..6236ae2fba 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrgAll.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrgAll.azsli
index 7c5dae20ee..b9c6319eb5 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrgAll.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrgAll.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneTimeSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneTimeSrg.azsli
index 1a1e0afc40..76307dc360 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneTimeSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SceneTimeSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SkyBox/SceneSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SkyBox/SceneSrg.azsli
index cd02bd60dd..24e5d0aab5 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SkyBox/SceneSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/SkyBox/SceneSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrg.azsli
index a7ed19327f..cadc4e8956 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrgAll.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrgAll.azsli
index 8640b89f9a..5136b5d8fa 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrgAll.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrgAll.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomObject.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomObject.azsl
index 5df26f6bcb..6617f9a33b 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomObject.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomObject.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomObjectLit.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomObjectLit.azsl
index e8c8bd169f..8629a67f4d 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomObjectLit.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomObjectLit.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomWorld.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomWorld.azsl
index e424792fde..93b1cbd61e 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomWorld.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/AuxGeomWorld.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/ObjectSrg.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/ObjectSrg.azsli
index 8c12181aec..fcc7b98150 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/ObjectSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/ObjectSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/ObjectSrgLit.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/ObjectSrgLit.azsli
index 1e267c6f07..59fdb75416 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/ObjectSrgLit.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/AuxGeom/ObjectSrgLit.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/BRDFTexture/BRDFTextureCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/BRDFTexture/BRDFTextureCS.azsl
index 4379f539d1..325b53d311 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/BRDFTexture/BRDFTextureCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/BRDFTexture/BRDFTextureCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Checkerboard/CheckerboardColorResolveCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Checkerboard/CheckerboardColorResolveCS.azsl
index 322bc70dd4..81aa5f8015 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Checkerboard/CheckerboardColorResolveCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Checkerboard/CheckerboardColorResolveCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Depth/DepthPass.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Depth/DepthPass.azsl
index f38475f1ac..4a9d8ea62a 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Depth/DepthPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Depth/DepthPass.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseComposite.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseComposite.azsl
index 36730429b0..a3f049b108 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseComposite.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseComposite.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseComposite_nomsaa.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseComposite_nomsaa.azsl
index b7ad1ca1f6..130a295e06 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseComposite_nomsaa.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseComposite_nomsaa.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseGlobalFullscreen.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseGlobalFullscreen.azsl
index 38125172a6..d0a919c925 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseGlobalFullscreen.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseGlobalFullscreen.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseGlobalFullscreen_nomsaa.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseGlobalFullscreen_nomsaa.azsl
index 62bce01642..de4ef43d6e 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseGlobalFullscreen_nomsaa.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseGlobalFullscreen_nomsaa.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample.azsl
index 3013668b3b..81018b0766 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample_nomsaa.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample_nomsaa.azsl
index 5326faf23a..956d094483 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample_nomsaa.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample_nomsaa.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/ImGui/ImGui.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/ImGui/ImGui.azsl
index fb1b982998..647fc4671b 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/ImGui/ImGui.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/ImGui/ImGui.azsl
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCulling.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCulling.azsl
index 7b58a31683..f06e40134f 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCulling.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCulling.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingHeatmap.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingHeatmap.azsl
index 3ba2998ce0..225cb8c0b5 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingHeatmap.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingHeatmap.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingRemap.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingRemap.azsl
index 5c3c7cc165..fafae39991 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingRemap.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingRemap.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingTilePrepare.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingTilePrepare.azsl
index 0c05603d31..5cece4ec60 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingTilePrepare.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/LightCulling/LightCullingTilePrepare.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/LuxCore/RenderTexture.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/LuxCore/RenderTexture.azsl
index 6d63aa2ca6..21bfccaca4 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/LuxCore/RenderTexture.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/LuxCore/RenderTexture.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Math/GaussianFilterFloatHorizontal.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Math/GaussianFilterFloatHorizontal.azsl
index 8dc42cbc33..49ab007b88 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Math/GaussianFilterFloatHorizontal.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Math/GaussianFilterFloatHorizontal.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,7 +11,7 @@
 #include <Atom/Features/Math/FilterPassSrg.azsli>
 #include <Atom/Features/Shadow/ShadowmapAtlasLib.azsli>
 
-[numthreads(8,8,1)]
+[numthreads(16,16,1)]
 void MainCS(uint3 dispatchId: SV_DispatchThreadID)
 {
     const float3 inputSize = GetImageSize(FilterPassSrg::m_inputImage);
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Math/GaussianFilterFloatVertical.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Math/GaussianFilterFloatVertical.azsl
index 2d993c7af9..1326bc6c07 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Math/GaussianFilterFloatVertical.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Math/GaussianFilterFloatVertical.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,7 +11,7 @@
 #include <Atom/Features/Math/FilterPassSrg.azsli>
 #include <Atom/Features/Shadow/ShadowmapAtlasLib.azsli>
 
-[numthreads(8,8,1)]
+[numthreads(16,16,1)]
 void MainCS(uint3 dispatchId: SV_DispatchThreadID)
 {
     const float3 inputSize = GetImageSize(FilterPassSrg::m_inputImage);
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetCS.azsl
index 3328a85778..8958b105cd 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetSRG.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetSRG.azsli
index f7421d774f..7c2bcebac0 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetSRG.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/MorphTargets/MorphTargetSRG.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/MotionVector/CameraMotionVector.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/MotionVector/CameraMotionVector.azsl
index d77f4c664f..f1da0cf8dc 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/MotionVector/CameraMotionVector.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/MotionVector/CameraMotionVector.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/MotionVector/MeshMotionVector.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/MotionVector/MeshMotionVector.azsl
index a8c1359f68..8a32f014b9 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/MotionVector/MeshMotionVector.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/MotionVector/MeshMotionVector.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/AcesOutputTransformLut.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/AcesOutputTransformLut.azsl
index 875efc6aac..b3fb84a09b 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/AcesOutputTransformLut.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/AcesOutputTransformLut.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ApplyShaperLookupTable.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ApplyShaperLookupTable.azsl
index 92e15cbe7c..d957d3b27c 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ApplyShaperLookupTable.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ApplyShaperLookupTable.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BakeAcesOutputTransformLutCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BakeAcesOutputTransformLutCS.azsl
index 71a907103a..ead024ac99 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BakeAcesOutputTransformLutCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BakeAcesOutputTransformLutCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BlendColorGradingLuts.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BlendColorGradingLuts.azsl
index 9c9a804a4d..f05c1d6f41 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BlendColorGradingLuts.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BlendColorGradingLuts.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomBlurCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomBlurCS.azsl
index 065b825ad3..7c9db2dd58 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomBlurCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomBlurCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomCompositeCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomCompositeCS.azsl
index 508616bffb..6a6c7e5b6e 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomCompositeCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomCompositeCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomDownsampleCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomDownsampleCS.azsl
index 8c5d9a7f13..ff4074a64b 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomDownsampleCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/BloomDownsampleCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ContrastAdaptiveSharpening.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ContrastAdaptiveSharpening.azsl
index 9411c61f72..798229fc9e 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ContrastAdaptiveSharpening.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ContrastAdaptiveSharpening.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ConvertToAcescg.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ConvertToAcescg.azsl
index efd5d69d55..aadff9c0a4 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ConvertToAcescg.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ConvertToAcescg.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthDownsample.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthDownsample.azsl
index fdde01cdb6..66e10dddd2 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthDownsample.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthDownsample.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfField.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfField.azsli
index 46377ef8c4..e17d5206e7 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfField.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfField.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldBlurBokeh.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldBlurBokeh.azsl
index 931d1f6ba2..67373252a6 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldBlurBokeh.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldBlurBokeh.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldComposite.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldComposite.azsl
index 3a7ce1db2a..46d2ed385a 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldComposite.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldComposite.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldDownSample.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldDownSample.azsl
index ee339c35d7..6752551ceb 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldDownSample.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldDownSample.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldMask.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldMask.azsl
index 74e0fd1513..583cd08133 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldMask.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldMask.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldPrepare.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldPrepare.azsl
index 415d279a62..82fc711ace 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldPrepare.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldPrepare.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldWriteFocusDepthFromGpu.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldWriteFocusDepthFromGpu.azsl
index e540c1e53b..e8a835262b 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldWriteFocusDepthFromGpu.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthOfFieldWriteFocusDepthFromGpu.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthToLinearDepth.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthToLinearDepth.azsl
index cd10b60b42..af76a7bc23 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthToLinearDepth.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthToLinearDepth.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthUpsample.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthUpsample.azsl
index e4399becdf..c0010bc8ef 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthUpsample.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DepthUpsample.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DiffuseSpecularMerge.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DiffuseSpecularMerge.azsl
index 37fd566f13..c8275c7620 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DiffuseSpecularMerge.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DiffuseSpecularMerge.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DisplayMapper.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DisplayMapper.azsl
index c7558a9d02..91c730dad4 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DisplayMapper.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DisplayMapper.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DisplayMapperOnlyGammaCorrection.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DisplayMapperOnlyGammaCorrection.azsl
index 8200ce0b56..7bf9110e31 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DisplayMapperOnlyGammaCorrection.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DisplayMapperOnlyGammaCorrection.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DownsampleLuminanceMinAvgMaxCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DownsampleLuminanceMinAvgMaxCS.azsl
index ce14a62f77..df6260695a 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DownsampleLuminanceMinAvgMaxCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DownsampleLuminanceMinAvgMaxCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DownsampleMinAvgMaxCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DownsampleMinAvgMaxCS.azsl
index 086adf31c2..6ac2eef8da 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DownsampleMinAvgMaxCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/DownsampleMinAvgMaxCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/EyeAdaptation.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/EyeAdaptation.azsl
index 0d048a8c51..a71f260ff5 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/EyeAdaptation.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/EyeAdaptation.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/EyeAdaptationUtil.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/EyeAdaptationUtil.azsli
index c7e27dd26f..9cd86d1dfb 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/EyeAdaptationUtil.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/EyeAdaptationUtil.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurCommon.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurCommon.azsli
index d71abddc87..689c308b76 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurCommon.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurCommon.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurHor.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurHor.azsl
index d7eb1d0216..7065930e59 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurHor.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurHor.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurVer.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurVer.azsl
index 843f43af80..600393a17b 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurVer.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FastDepthAwareBlurVer.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FullscreenCopy.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FullscreenCopy.azsl
index 46047dd442..7ae1662d5a 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FullscreenCopy.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/FullscreenCopy.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LookModificationTransform.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LookModificationTransform.azsl
index 6b7e905633..aca344cd11 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LookModificationTransform.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LookModificationTransform.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHeatmap.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHeatmap.azsl
index 9bc1828331..0d44fb218c 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHeatmap.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHeatmap.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramCommon.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramCommon.azsli
index 0bd71a0790..6a6637e113 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramCommon.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramCommon.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramGenerator.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramGenerator.azsl
index 0bb8806627..1221dc8024 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramGenerator.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/LuminanceHistogramGenerator.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/MSAAResolveCustom.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/MSAAResolveCustom.azsl
index 828e8a46b5..df1e05eb25 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/MSAAResolveCustom.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/MSAAResolveCustom.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/MSAAResolveDepth.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/MSAAResolveDepth.azsl
index 6c1d7d0953..a291d40bd8 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/MSAAResolveDepth.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/MSAAResolveDepth.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ModulateTexture.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ModulateTexture.azsl
index b0350612e7..89286a2e2e 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ModulateTexture.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ModulateTexture.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/OutputTransform.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/OutputTransform.azsl
index 3f29b56cd2..f0e567a039 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/OutputTransform.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/OutputTransform.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAABlendingWeightCalculation.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAABlendingWeightCalculation.azsl
index f60aa4a03a..514a6da50d 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAABlendingWeightCalculation.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAABlendingWeightCalculation.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAConvertToPerceptualColor.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAConvertToPerceptualColor.azsl
index aba9fe7f87..21f93ad2ad 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAConvertToPerceptualColor.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAConvertToPerceptualColor.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAEdgeDetection.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAEdgeDetection.azsl
index 0a02f3258f..a341714431 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAEdgeDetection.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAEdgeDetection.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAANeighborhoodBlending.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAANeighborhoodBlending.azsl
index eb175f8c36..4b434c8995 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAANeighborhoodBlending.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAANeighborhoodBlending.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAUtils.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAUtils.azsli
index b5a8197c26..adba8e4e61 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAUtils.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SMAAUtils.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ScreenSpaceSubsurfaceScatteringCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ScreenSpaceSubsurfaceScatteringCS.azsl
index 43cd7549e5..564f2beda6 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ScreenSpaceSubsurfaceScatteringCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/ScreenSpaceSubsurfaceScatteringCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SsaoCompute.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SsaoCompute.azsl
index 45b8e74401..96d1cd35ae 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SsaoCompute.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/SsaoCompute.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/Taa.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/Taa.azsl
index 647ba0d22c..6f7c5bc7cf 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/Taa.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/Taa.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/UniformColor.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/UniformColor.azsl
index e8d7bc4dd9..6eea42f047 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/UniformColor.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/UniformColor.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionCommon.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionCommon.azsli
index e747eae2bb..72046b88dd 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionCommon.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionCommon.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionComposite.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionComposite.azsl
index a82b972241..3d5426a59f 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionComposite.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionComposite.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionComposite_nomsaa.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionComposite_nomsaa.azsl
index 45beab44e4..1735709b2d 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionComposite_nomsaa.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionComposite_nomsaa.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen.azsl
index 4604889d2c..eb48d8542d 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen_nomsaa.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen_nomsaa.azsl
index f7fb809555..c7dbfeeeea 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen_nomsaa.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen_nomsaa.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeBlendWeight.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeBlendWeight.azsl
index 3304ed4d01..e5621d692b 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeBlendWeight.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeBlendWeight.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderCommon.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderCommon.azsli
index e9b3be9206..2e74412be6 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderCommon.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderCommon.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderInner.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderInner.azsl
index 961428e15c..e9ee94ed32 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderInner.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderInner.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderObjectSrg.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderObjectSrg.azsli
index 9ea806a9a4..923e7fae81 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderObjectSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderObjectSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderOuter.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderOuter.azsl
index 2f6d5d71c5..16e65da80f 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderOuter.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderOuter.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeStencil.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeStencil.azsl
index b6cb9b0a80..29406d94a1 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeStencil.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeStencil.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli
index 312074a7a4..60bcda4170 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurHorizontal.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurHorizontal.azsl
index 2b56306ef1..e978eb9de1 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurHorizontal.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurHorizontal.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl
index b07c0396cf..4d1c55ef86 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl
index 1673d9d1cd..33523031bf 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl
index 5a6aaac5aa..551a8a587e 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsli
index 3698d4af48..74aa234a28 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/ScreenSpace/DeferredFog.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/ScreenSpace/DeferredFog.azsl
index 5a66e6601d..802d06fe69 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/ScreenSpace/DeferredFog.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/ScreenSpace/DeferredFog.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/DepthExponentiation.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/DepthExponentiation.azsl
index 7b4613d8fa..75330cc134 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/DepthExponentiation.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/DepthExponentiation.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -28,7 +28,7 @@ ShaderResourceGroup PassSrg : SRG_PerPass_WithFallback
     StructuredBuffer<FilterParameter> m_filterParameters;
 }
 
-[numthreads(8,8,1)]
+[numthreads(16,16,1)]
 void MainCS(uint3 dispatchId: SV_DispatchThreadID)
 {
     const float3 inputSize = GetImageSize(PassSrg::m_inputShadowmap);
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/Shadowmap.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/Shadowmap.azsl
index 044c59a96d..1be04282af 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/Shadowmap.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/Shadowmap.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningCS.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningCS.azsl
index 720121c721..fc5684fe7f 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningCS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningCS.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli
index fdbd869ca6..95802ddbb7 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/SkyBox/SkyBox.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/SkyBox/SkyBox.azsl
index b8ff5c2df8..64a1ebe76a 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/SkyBox/SkyBox.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/SkyBox/SkyBox.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/Shaders/SkyBox/SkyBox_TwoOutputs.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/SkyBox/SkyBox_TwoOutputs.azsl
index 9ad817b94b..1a8d4ceb5c 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/SkyBox/SkyBox_TwoOutputs.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/SkyBox/SkyBox_TwoOutputs.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake b/Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake
index d338ea9597..08f8318f21 100644
--- a/Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake
+++ b/Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Assets/generate_asset_cmake.bat b/Gems/Atom/Feature/Common/Assets/generate_asset_cmake.bat
index ab27429a9a..4a963ddcc5 100644
--- a/Gems/Atom/Feature/Common/Assets/generate_asset_cmake.bat
+++ b/Gems/Atom/Feature/Common/Assets/generate_asset_cmake.bat
@@ -1,5 +1,5 @@
 @ECHO off
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 
@@ -16,7 +16,7 @@ set OUTPUT_FILE=atom_feature_common_asset_files.cmake
 
 :: Write copyright header to top of file
 echo # > %OUTPUT_FILE%
-echo # Copyright (c) Contributors to the Open 3D Engine Project >> %OUTPUT_FILE%
+echo # 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. >> %OUTPUT_FILE%
 echo # >> %OUTPUT_FILE%
 echo # SPDX-License-Identifier: Apache-2.0 OR MIT >> %OUTPUT_FILE%
 echo # >> %OUTPUT_FILE%
diff --git a/Gems/Atom/Feature/Common/CMakeLists.txt b/Gems/Atom/Feature/Common/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/Feature/Common/CMakeLists.txt
+++ b/Gems/Atom/Feature/Common/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/CMakeLists.txt b/Gems/Atom/Feature/Common/Code/CMakeLists.txt
index c89a268981..60586da23e 100644
--- a/Gems/Atom/Feature/Common/Code/CMakeLists.txt
+++ b/Gems/Atom/Feature/Common/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h
index 8ab4e28293..2ebeb5563f 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Automation/AtomAutomationBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Automation/AtomAutomationBus.h
index ba2cfa64bd..62cbf36620 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Automation/AtomAutomationBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Automation/AtomAutomationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/AuxGeom/AuxGeomFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/AuxGeom/AuxGeomFeatureProcessor.h
index afb6772d1f..019ec56ecd 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/AuxGeom/AuxGeomFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/AuxGeom/AuxGeomFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/CapsuleLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/CapsuleLightFeatureProcessorInterface.h
index c5d44e78d2..46b8544bec 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/CapsuleLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/CapsuleLightFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/CoreLightsConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/CoreLightsConstants.h
index a9ea10974f..8f27cce2c4 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/CoreLightsConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/CoreLightsConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DirectionalLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DirectionalLightFeatureProcessorInterface.h
index 785431e1ad..3219227814 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DirectionalLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DirectionalLightFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h
index 27ffbd6e69..2c9f6b1727 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/EsmShadowmapsPassData.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/EsmShadowmapsPassData.h
index 6848f7656b..26a8a8f391 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/EsmShadowmapsPassData.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/EsmShadowmapsPassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PhotometricValue.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PhotometricValue.h
index 528240672a..07a83e4801 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PhotometricValue.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PhotometricValue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h
index b0a774ada9..8a3a189af5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PolygonLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PolygonLightFeatureProcessorInterface.h
index a4b456969b..6df246c104 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PolygonLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PolygonLightFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/QuadLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/QuadLightFeatureProcessorInterface.h
index 0c9f753227..9ec3f571b0 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/QuadLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/QuadLightFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/ShadowConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/ShadowConstants.h
index 6480734484..84b0c7d2df 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/ShadowConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/ShadowConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/SimplePointLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/SimplePointLightFeatureProcessorInterface.h
index b9519346da..2b6e1fd8d4 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/SimplePointLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/SimplePointLightFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/SimpleSpotLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/SimpleSpotLightFeatureProcessorInterface.h
index 84724eb91b..03b634e555 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/SimpleSpotLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/SimpleSpotLightFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Decals/DecalFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Decals/DecalFeatureProcessorInterface.h
index 5377b849c1..c08ba20d94 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Decals/DecalFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Decals/DecalFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessorInterface.h
index e8ca787636..d8b07e0b49 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h
index 11bf23348f..7df7571e6b 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformLutPass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformLutPass.h
index 5786122a29..80cc1871af 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformLutPass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformLutPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformPass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformPass.h
index d3616ca290..08fbe2f54e 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformPass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/ApplyShaperLookupTablePass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/ApplyShaperLookupTablePass.h
index 57c853338d..c3a5f07f90 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/ApplyShaperLookupTablePass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/ApplyShaperLookupTablePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/BakeAcesOutputTransformLutPass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/BakeAcesOutputTransformLutPass.h
index 606a8d921f..6d02de6a4d 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/BakeAcesOutputTransformLutPass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/BakeAcesOutputTransformLutPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperConfigurationDescriptor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperConfigurationDescriptor.h
index 6da39c3841..9387aa5cf3 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperConfigurationDescriptor.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperConfigurationDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperFeatureProcessorInterface.h
index aebb6b9912..edd1012c08 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperFullScreenPass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperFullScreenPass.h
index 9a08c8985d..efab74e27b 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperFullScreenPass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperFullScreenPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperPass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperPass.h
index 26c5e76931..037c70027f 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperPass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/OutputTransformPass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/OutputTransformPass.h
index b3aeb70394..79338a2a0f 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/OutputTransformPass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/OutputTransformPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImGui/ImGuiUtils.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImGui/ImGuiUtils.h
index fc5d254abf..c51c85c097 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImGui/ImGuiUtils.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImGui/ImGuiUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImGui/SystemBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImGui/SystemBus.h
index 114f7bebc6..ee0dd899c5 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImGui/SystemBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImGui/SystemBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessor.h
index 4934091757..e3c5a27f11 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessorInterface.h
index d97cae65ab..1480a3e38e 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ImageBasedLights/ImageBasedLightFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LookupTable/LookupTableAsset.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LookupTable/LookupTableAsset.h
index c16416ab1b..537ecd6010 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LookupTable/LookupTableAsset.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LookupTable/LookupTableAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/LuxCoreBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/LuxCoreBus.h
index eb6a83897e..e440049955 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/LuxCoreBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/LuxCoreBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/LuxCoreTexturePass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/LuxCoreTexturePass.h
index 36fef4864c..2bccfb2b8b 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/LuxCoreTexturePass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/LuxCoreTexturePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/RenderTexturePass.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/RenderTexturePass.h
index 4840812a6c..c604491501 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/RenderTexturePass.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/LuxCore/RenderTexturePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignment.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignment.h
index da89654c80..d82231cc2c 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignment.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignmentId.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignmentId.h
index 93f2c5e4b9..3d5b3b1e1a 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignmentId.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignmentId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessor.h
index 5ba4c635ad..5c02662a12 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessorInterface.h
index 4b09fa4e66..4ac4cae20e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/MorphTargets/MorphTargetInputBuffers.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/MorphTargets/MorphTargetInputBuffers.h
index 83421d60d9..4b51d82835 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/MorphTargets/MorphTargetInputBuffers.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/MorphTargets/MorphTargetInputBuffers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessorInterface.h
index fcd9f046bf..0c41bdac51 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/EndParams.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/EndParams.inl
index b563df5490..239779b3e1 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/EndParams.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/EndParams.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapAllCommon.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapAllCommon.inl
index becf40eb2d..ab3c519b81 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapAllCommon.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapAllCommon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapOverrideCommon.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapOverrideCommon.inl
index e9cc6c3bcb..b972e5c8c9 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapOverrideCommon.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapOverrideCommon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapOverrideEmpty.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapOverrideEmpty.inl
index 1a3dbb4769..7d047b7427 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapOverrideEmpty.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapOverrideEmpty.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapParamCommon.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapParamCommon.inl
index d4da3e9e5e..8e9451180a 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapParamCommon.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapParamCommon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapParamEmpty.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapParamEmpty.inl
index 5b699d45cc..775754a847 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapParamEmpty.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/MapParamEmpty.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/ParamMacrosHowTo.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/ParamMacrosHowTo.inl
index ce3970da31..5011a52134 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/ParamMacrosHowTo.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/ParamMacrosHowTo.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartOverrideBlend.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartOverrideBlend.inl
index 5ca3773841..b1213c72e1 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartOverrideBlend.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartOverrideBlend.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartOverrideEditorContext.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartOverrideEditorContext.inl
index 8067f80a50..d477c6f107 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartOverrideEditorContext.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartOverrideEditorContext.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamBehaviorContext.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamBehaviorContext.inl
index 218dd00758..30efb1bea1 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamBehaviorContext.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamBehaviorContext.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamCopySettingsFrom.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamCopySettingsFrom.inl
index 7473ce4088..bda09b3a05 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamCopySettingsFrom.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamCopySettingsFrom.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamCopySettingsTo.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamCopySettingsTo.inl
index 8bc7b6d636..d4a7d60f7b 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamCopySettingsTo.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamCopySettingsTo.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctions.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctions.inl
index 78e21daf0a..38b3c43e16 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctions.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctions.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsOverride.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsOverride.inl
index 2c13ce23b4..d5e9c82497 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsOverride.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsOverride.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsVirtual.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsVirtual.inl
index 61da32cc27..78db3206e3 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsVirtual.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsVirtual.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamMembers.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamMembers.inl
index 0981f667cb..3cd5c7da2e 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamMembers.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamMembers.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamSerializeContext.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamSerializeContext.inl
index 44d7500925..3d3b5785c1 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamSerializeContext.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamSerializeContext.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomConstants.h
index 7ae2336a02..a42ea1bef1 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomParams.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomParams.inl
index 6dc5ca1504..3beda71a3f 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomParams.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomParams.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomSettingsInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomSettingsInterface.h
index 74cc7e5410..e012a43d0c 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomSettingsInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Bloom/BloomSettingsInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldConstants.h
index c0685fc488..0a2803e5da 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldParams.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldParams.inl
index 84230809e6..94d7c9162c 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldParams.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldParams.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldSettingsInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldSettingsInterface.h
index 79c9878b27..9dea915bb5 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldSettingsInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/DepthOfField/DepthOfFieldSettingsInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlConstants.h
index edc53638e0..edecf09c72 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlParams.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlParams.inl
index dfb7c2dc44..8894e6df8c 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlParams.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlParams.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlSettingsInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlSettingsInterface.h
index 58e51b011c..0d0e14a343 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlSettingsInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/ExposureControl/ExposureControlSettingsInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/LookModification/LookModificationParams.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/LookModification/LookModificationParams.inl
index 4170ec4af7..4c8669bd4d 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/LookModification/LookModificationParams.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/LookModification/LookModificationParams.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/LookModification/LookModificationSettingsInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/LookModification/LookModificationSettingsInterface.h
index 70dc39a08e..19307f1f4b 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/LookModification/LookModificationSettingsInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/LookModification/LookModificationSettingsInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostFxLayerCategoriesConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostFxLayerCategoriesConstants.h
index fa7b65ed9f..6c551ec9e4 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostFxLayerCategoriesConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostFxLayerCategoriesConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessFeatureProcessorInterface.h
index b9952f0bbb..d6f9fc8418 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessParams.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessParams.inl
index 4986f662a8..26f84b4485 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessParams.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessParams.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessSettings.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessSettings.inl
index d4990ddb9e..4a4c1c9c11 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessSettings.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessSettings.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessSettingsInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessSettingsInterface.h
index d677389055..7bc18fe4f6 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessSettingsInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/PostProcessSettingsInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoConstants.h
index 43fd644b26..c2b09f6378 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoParams.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoParams.inl
index 877f941659..f60faa2dd1 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoParams.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoParams.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoSettingsInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoSettingsInterface.h
index c4ab494174..c498f68396 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoSettingsInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcess/Ssao/SsaoSettingsInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcessing/PostProcessingConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcessing/PostProcessingConstants.h
index 3e8c45511f..f1eea239fe 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcessing/PostProcessingConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcessing/PostProcessingConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcessing/SMAAFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcessing/SMAAFeatureProcessorInterface.h
index 6e1ebd2bf4..851555fd0b 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcessing/SMAAFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/PostProcessing/SMAAFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessor.h
index e75fe0509f..739bae0253 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessorInterface.h
index 5532f44b9a..60d8999c51 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ScreenSpace/DeferredFogParams.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ScreenSpace/DeferredFogParams.inl
index 5569da2ab4..bd48323864 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ScreenSpace/DeferredFogParams.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ScreenSpace/DeferredFogParams.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ScreenSpace/DeferredFogSettingsInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ScreenSpace/DeferredFogSettingsInterface.h
index fdba66adc1..0c47852d70 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ScreenSpace/DeferredFogSettingsInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ScreenSpace/DeferredFogSettingsInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Shadows/ProjectedShadowFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Shadows/ProjectedShadowFeatureProcessorInterface.h
index 71289119ac..37424b47e3 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Shadows/ProjectedShadowFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Shadows/ProjectedShadowFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorBus.h
index ebca4c698c..46035128dd 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorInterface.h
index 1e594499aa..96974c45be 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshInputBuffers.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshInputBuffers.h
index b5154ea174..e246f30773 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshInputBuffers.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshInputBuffers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshInstance.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshInstance.h
index ced3828452..fc7722d600 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshInstance.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshOutputStreamManagerInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshOutputStreamManagerInterface.h
index b6a8d5ec93..5e74c589e9 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshOutputStreamManagerInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshOutputStreamManagerInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshRenderProxyInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshRenderProxyInterface.h
index a8f00e9413..76bdbaa21f 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshRenderProxyInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshRenderProxyInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshShaderOptions.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshShaderOptions.h
index eb7b5a60e9..4df6bbfe2a 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshShaderOptions.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshShaderOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshStatsBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshStatsBus.h
index 6aede838d4..3b8721c7bc 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshStatsBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshStatsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshVertexStreams.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshVertexStreams.h
index b1683d6162..4901c2eb2a 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshVertexStreams.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkinnedMesh/SkinnedMeshVertexStreams.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxFeatureProcessorInterface.h
index 924276dcd9..e7dbb30797 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxFogBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxFogBus.h
index a5fd709f7c..f36ab7c6a1 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxFogBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxFogBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxLUT.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxLUT.h
index ec49ab2cc8..925a69c37f 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxLUT.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyBoxLUT.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyboxConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyboxConstants.h
index ac15636095..0f922a5dc8 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyboxConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyBox/SkyboxConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SphericalHarmonics/SphericalHarmonicsUtility.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SphericalHarmonics/SphericalHarmonicsUtility.h
index 5defcd657a..de50f76672 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SphericalHarmonics/SphericalHarmonicsUtility.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SphericalHarmonics/SphericalHarmonicsUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SphericalHarmonics/SphericalHarmonicsUtility.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SphericalHarmonics/SphericalHarmonicsUtility.inl
index 582cf72b86..a5fd9a8861 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SphericalHarmonics/SphericalHarmonicsUtility.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SphericalHarmonics/SphericalHarmonicsUtility.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/TransformService/TransformServiceFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/TransformService/TransformServiceFeatureProcessor.h
index 39200125cd..e69ad9bfd5 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/TransformService/TransformServiceFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/TransformService/TransformServiceFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/TransformService/TransformServiceFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/TransformService/TransformServiceFeatureProcessorInterface.h
index 2bbd7e9257..fb5b6b38c4 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/TransformService/TransformServiceFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/TransformService/TransformServiceFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorLightingPreset.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorLightingPreset.h
index e2529bfc56..6ac3ba163f 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorLightingPreset.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorLightingPreset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorModelPreset.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorModelPreset.h
index 9725d886ce..7140d8ac0d 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorModelPreset.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorModelPreset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.h
index 8da4a45ca3..db052e19aa 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.inl
index 4b6d03d749..7e2cc39677 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/FrameCaptureBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/FrameCaptureBus.h
index 30a2c2fc06..e783a03071 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/FrameCaptureBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/FrameCaptureBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/GpuBufferHandler.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/GpuBufferHandler.h
index ab9614da07..e35d513732 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/GpuBufferHandler.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/GpuBufferHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexableList.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexableList.h
index 9764375e23..3926578299 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexableList.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexableList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h
index c1587657fc..f72b10997d 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h
index d0a24ad2be..1cb5d0527a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h
index 4bfba427f2..da20269f06 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiSparseVector.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiSparseVector.h
index b1033565cb..1447beb44a 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiSparseVector.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiSparseVector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ProfilingCaptureBus.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ProfilingCaptureBus.h
index 7d61c99b43..4e668f2b22 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ProfilingCaptureBus.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ProfilingCaptureBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/SparseVector.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/SparseVector.h
index 3a10074c52..f16d7c69dc 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/SparseVector.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/SparseVector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Mocks/MockMeshFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Mocks/MockMeshFeatureProcessor.h
index 3b3d3d7b8d..281a29a74c 100644
--- a/Gems/Atom/Feature/Common/Code/Mocks/MockMeshFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Mocks/MockMeshFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ACES/AcesDisplayMapperFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/ACES/AcesDisplayMapperFeatureProcessor.cpp
index d482e4c2d5..e8faffd268 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ACES/AcesDisplayMapperFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ACES/AcesDisplayMapperFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h
index b956d111da..c8f380ff81 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawProcessorShared.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawProcessorShared.cpp
index 316eeed7a4..20a1175464 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawProcessorShared.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawProcessorShared.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawProcessorShared.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawProcessorShared.h
index 3578554368..54a30d8925 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawProcessorShared.h
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawProcessorShared.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp
index 2be6b562fc..7f9cd2b857 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -649,7 +649,6 @@ namespace AZ
             int32_t viewProjOverrideIndex)
         {
             AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzRender);
-            AZ_ATOM_PROFILE_FUNCTION("AuxGeom", "AuxGeomDrawQueue: DrawPrimitiveCommon");
 
             // grab a mutex lock for the rest of this function so that a commit cannot happen during it and
             // other threads can't add geometry during it
diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h
index 4b49d9fd31..731dbb1fbb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp
index a417f13c21..5f05436632 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
index 28935ea2ba..1756ca3650 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.h
index 35287b313a..3f7feddce9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
index 71ce1f6639..bb0533de43 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h
index bd699905aa..eb588bd5bd 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Builders/BuilderModule.cpp b/Gems/Atom/Feature/Common/Code/Source/Builders/BuilderModule.cpp
index 5c4e53b085..db750e2234 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Builders/BuilderModule.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Builders/BuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardColorResolvePass.cpp b/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardColorResolvePass.cpp
index 427997e180..ff7e1a797a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardColorResolvePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardColorResolvePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardColorResolvePass.h b/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardColorResolvePass.h
index a69cb79386..187cb9679b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardColorResolvePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardColorResolvePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.cpp b/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.cpp
index 569fd040d9..8d8fd1fded 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.h b/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.h
index ce156e35cd..a2083c9133 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CommonModule.cpp b/Gems/Atom/Feature/Common/Code/Source/CommonModule.cpp
index 9c757fb30d..0cc5b603d7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CommonModule.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CommonModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
index 95ff65fe14..506f75405b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.h
index 189b51b907..3f36828355 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp
index 0f51995eb9..11306ece76 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.h
index 89f69bd1f0..4311163175 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/CascadedShadowmapsPass.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CascadedShadowmapsPass.cpp
index 7cd6251d41..33bac80c00 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/CascadedShadowmapsPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CascadedShadowmapsPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/CascadedShadowmapsPass.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CascadedShadowmapsPass.h
index b6d5b91488..02a15f5b54 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/CascadedShadowmapsPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CascadedShadowmapsPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/CoreLightsSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CoreLightsSystemComponent.cpp
index 4200966c17..3c205b60fa 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/CoreLightsSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CoreLightsSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/CoreLightsSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CoreLightsSystemComponent.h
index e5e2cc49ba..e4266c5aa5 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/CoreLightsSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CoreLightsSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/DepthExponentiationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DepthExponentiationPass.cpp
index f249ca811a..667a4dee28 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DepthExponentiationPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DepthExponentiationPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/DepthExponentiationPass.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DepthExponentiationPass.h
index 6ad9a21bef..057bbbeaf1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DepthExponentiationPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DepthExponentiationPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
index 7738758cd6..29e5ec4fe4 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h
index 371980e8db..7ce29d2389 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
index 497b3b3077..694f47ccd1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
index 0201018c53..9faf0cb235 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/EsmShadowmapsPass.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/EsmShadowmapsPass.cpp
index 062972d541..750efaa54d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/EsmShadowmapsPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/EsmShadowmapsPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/EsmShadowmapsPass.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/EsmShadowmapsPass.h
index 10c0e617e8..8381d520ad 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/EsmShadowmapsPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/EsmShadowmapsPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/IndexedDataVector.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/IndexedDataVector.h
index 7e7636a950..b2268c1738 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/IndexedDataVector.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/IndexedDataVector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/IndexedDataVector.inl b/Gems/Atom/Feature/Common/Code/Source/CoreLights/IndexedDataVector.inl
index b7840bcbf8..d55b030bbc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/IndexedDataVector.inl
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/IndexedDataVector.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingConstants.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingConstants.h
index a49644f0f9..b548478350 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingPass.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingPass.cpp
index 31c4cc34fa..41b2b08e72 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingPass.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingPass.h
index d75ebdf51f..b6c012f363 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingRemap.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingRemap.cpp
index 21ad4bd76d..2ef53065eb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingRemap.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingRemap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingRemap.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingRemap.h
index ede2cca27a..7c3317bad3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingRemap.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingRemap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp
index 8ebbb0bd7b..1ba25f68be 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.h
index f3eb820017..55cd1bffd0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LtcCommon.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LtcCommon.cpp
index 69394b8ab3..56a88e9564 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LtcCommon.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LtcCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/LtcCommon.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LtcCommon.h
index 6af38f8a83..14d20319f8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LtcCommon.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LtcCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/PhotometricValue.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PhotometricValue.cpp
index 0b8870e078..dcac3df5f6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PhotometricValue.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PhotometricValue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp
index 4acb869d55..02476c7e3c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h
index 25e7c51743..a02e48e206 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp
index 8a076b6f99..37e2b6f23b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.h
index d6633ea865..145eea6b77 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/ProjectedShadowmapsPass.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ProjectedShadowmapsPass.cpp
index b78e1222e5..107318da87 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/ProjectedShadowmapsPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ProjectedShadowmapsPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/ProjectedShadowmapsPass.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ProjectedShadowmapsPass.h
index d19c3d840d..4b6a03e6d0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/ProjectedShadowmapsPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ProjectedShadowmapsPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp
index 134f194285..bd5db6fb34 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.h
index 1ba9e73318..d430b469ff 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/Shadow.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/Shadow.cpp
index bf7205b123..c601a4843a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/Shadow.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/Shadow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/Shadow.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/Shadow.h
index 4e20e125c6..33a9c1abe9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/Shadow.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/Shadow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapAtlas.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapAtlas.cpp
index 40f1fa047a..08cd0f68e0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapAtlas.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapAtlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapAtlas.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapAtlas.h
index d6295d5050..ccb9f353b6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapAtlas.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapAtlas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapPass.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapPass.cpp
index bbcacaaa7a..a1e3304d23 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapPass.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapPass.h
index 6542eb4702..4c49659d6d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/ShadowmapPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp
index 34c4b3ef23..4a73f3beb0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.h
index ed0e294ce2..e64b5c79ed 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp
index 953cc8aaae..2c57aec197 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.h
index 637b5306b5..bc05e10068 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Decals/AsyncLoadTracker.h b/Gems/Atom/Feature/Common/Code/Source/Decals/AsyncLoadTracker.h
index 2ab7027d1b..d1fa0d5c8d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/AsyncLoadTracker.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/AsyncLoadTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
index f35677adb4..1456f5bf30 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.h
index f297308856..151ffe4637 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArray.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArray.cpp
index ca8962a450..ed789cf4b1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArray.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArray.h b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArray.h
index 0ad4d8f871..e6dd11b71c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArray.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
index 046f5e8052..41aeab0fe7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.h
index 2653d3f23e..a391abb4e5 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.cpp
index 5fd47e44c0..cf98e7e2af 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.h
index 477d3ab2df..ddbee113be 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp
index 5f2f3a4714..e435de7799 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h
index 61ac68d37f..3c5c481fea 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp
index 43191f4644..e8c99a630f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.h
index 789308456f..0442edf5e9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp
index e2e30b6dfe..637c655074 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.h
index c92536e619..93be7af3c8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.cpp
index 354ddc4d10..f437b3a1ef 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.h
index ee42478533..b685f1b22a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp
index 2b80fbbd4a..93297fe336 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.h
index f2f057844f..4def1ed463 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp
index 956fa51947..5ceb8a197d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h
index 1369d12760..4d045ec62d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp
index d62fec1d7b..8079912363 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.h
index ebca861108..30686bd16f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.cpp
index b662153a99..c6464fcc72 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.h
index 00376fe8ee..0ad61bab22 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.cpp
index 91541c1757..6f6f83dda2 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.h
index 5984eb5940..9967811808 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.cpp
index 42fb95af12..3e808a99c1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.h
index 1804cb12f0..c399fac534 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridTextureReadback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformLutPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformLutPass.cpp
index bf8bdd311e..dfbfd8ba7e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformLutPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformLutPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformPass.cpp
index f9df2b6ab3..8998f7ced9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/ApplyShaperLookupTablePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/ApplyShaperLookupTablePass.cpp
index 166155b244..1b342a71c2 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/ApplyShaperLookupTablePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/ApplyShaperLookupTablePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/BakeAcesOutputTransformLutPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/BakeAcesOutputTransformLutPass.cpp
index 1ed26b1c6f..0abfb65bef 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/BakeAcesOutputTransformLutPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/BakeAcesOutputTransformLutPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperConfigurationDescriptor.cpp b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperConfigurationDescriptor.cpp
index 3af35a7869..3bd4c28ecb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperConfigurationDescriptor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperConfigurationDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperFullScreenPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperFullScreenPass.cpp
index f4d5a61382..a9f9d14e13 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperFullScreenPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperFullScreenPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperPass.cpp
index 11f7dfb13a..72040c379a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/OutputTransformPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/OutputTransformPass.cpp
index 714ae2d348..11ec86f025 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/OutputTransformPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DisplayMapper/OutputTransformPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.cpp
index 213261f84a..2f03aa759b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.h
index aa5d5970fd..e31602c8ea 100644
--- a/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
index fca7ca3a7c..a115bfa6e8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.h
index 4c73a440fb..472dd5da74 100644
--- a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
index 53a79d9146..66d0913691 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h
index cc12ca9b3c..9c75f65355 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiSystemComponent.cpp
index 91e4a4a045..234e7a4272 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiSystemComponent.h
index e5cc2f5ae4..07fa128d7e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp
index e60916ac3b..eb87b966fd 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LookupTable/LookupTableAsset.cpp b/Gems/Atom/Feature/Common/Code/Source/LookupTable/LookupTableAsset.cpp
index e9a2dfed2a..1b3f37129e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LookupTable/LookupTableAsset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LookupTable/LookupTableAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMaterial.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMaterial.cpp
index 114fe825de..fb19767754 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMaterial.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMaterial.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMaterial.h b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMaterial.h
index e86f9fee81..6e6348bf5e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMaterial.h
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMaterial.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMesh.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMesh.cpp
index 49a430fbbc..202188bfec 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMesh.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMesh.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMesh.h b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMesh.h
index 356a9beeaf..a87a161871 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMesh.h
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreMesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreObject.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreObject.cpp
index 9648a86899..6f90e434f1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreObject.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreObject.h b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreObject.h
index 1b4924d8f8..ce6ec027e0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreObject.h
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.cpp
index 9ad8beda1d..c0656ccf04 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.h b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.h
index 0c2c2c624c..9b2bddd19b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.h
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexture.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexture.cpp
index c43fa5c1bb..f8f7b1189c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexture.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexture.h b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexture.h
index 10007062bc..7cb87a85bf 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexture.h
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexturePass.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexturePass.cpp
index 14a6c77238..5faaba136e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexturePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreTexturePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/LuxCore/RenderTexturePass.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/RenderTexturePass.cpp
index 5c5a048b91..c0df9991ce 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/RenderTexturePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/RenderTexturePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctor.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctor.cpp
index ac5531a1cf..e1b1f5810b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctor.h b/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctor.h
index f4805181d0..5108f9572e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctorSourceData.cpp
index 439355613f..b44678e0b1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctorSourceData.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctorSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctorSourceData.h b/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctorSourceData.h
index c9b43d0a90..ce41b7fbc6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctorSourceData.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/ConvertEmissiveUnitFunctorSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctor.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctor.cpp
index 431cd09b81..d77b567982 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctor.h b/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctor.h
index b594500f6d..564e23c6b7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctorSourceData.cpp
index 251181d93f..a767b0534e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctorSourceData.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctorSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctorSourceData.h b/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctorSourceData.h
index 5778148dad..622095fcba 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctorSourceData.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/DrawListFunctorSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp
index 6cc90c5546..0cfe8292ca 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentId.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentId.cpp
index 8c70c6c143..0ed3deef83 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentId.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentSerializer.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentSerializer.cpp
index 5fb6ab4229..4906f5991e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentSerializer.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentSerializer.h b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentSerializer.h
index 2326ae6f6d..d63153fdf3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentSerializer.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignmentSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp
index 218adc8ed6..3c7c2be41c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.h
index 80475bd71c..6dff5fe9e4 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctor.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctor.cpp
index f7a78c417a..92b90b6fcf 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctor.h b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctor.h
index 6bcfd5a870..6086cf7480 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp
index 76ddd8f540..1f04f263c1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.h b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.h
index 4c0214caa2..5b19635e94 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctor.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctor.cpp
index c1d8d79b63..ebb2f4963e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctor.h b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctor.h
index 0c6a910844..b406542ff6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.cpp
index 98ae93a7ce..b8f193a561 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.h b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.h
index d109674b45..352512ddd1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctor.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctor.cpp
index 7381be4f47..5ac3cb7e83 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctor.h b/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctor.h
index 35a8584a80..d2c1c9767a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctorSourceData.cpp
index cb76e9c372..553e4ad627 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctorSourceData.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctorSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctorSourceData.h b/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctorSourceData.h
index e6219006e4..cb8ec81597 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctorSourceData.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/UseTextureFunctorSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Math/GaussianMathFilter.cpp b/Gems/Atom/Feature/Common/Code/Source/Math/GaussianMathFilter.cpp
index da54a9a2fa..1731dd55a1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Math/GaussianMathFilter.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Math/GaussianMathFilter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Math/GaussianMathFilter.h b/Gems/Atom/Feature/Common/Code/Source/Math/GaussianMathFilter.h
index bca154816d..278d669a76 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Math/GaussianMathFilter.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Math/GaussianMathFilter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Math/MathFilter.cpp b/Gems/Atom/Feature/Common/Code/Source/Math/MathFilter.cpp
index f66b50c2a6..8ea5cddbb3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Math/MathFilter.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Math/MathFilter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Math/MathFilter.h b/Gems/Atom/Feature/Common/Code/Source/Math/MathFilter.h
index 0ae208df0d..54cb1c68bb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Math/MathFilter.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Math/MathFilter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Math/MathFilterDescriptor.h b/Gems/Atom/Feature/Common/Code/Source/Math/MathFilterDescriptor.h
index f4eec6159c..ca6e519412 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Math/MathFilterDescriptor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Math/MathFilterDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
index 0321fd6954..0e02bf3629 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetComputePass.cpp b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetComputePass.cpp
index 9879c2092f..15a856df15 100644
--- a/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetComputePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetComputePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetComputePass.h b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetComputePass.h
index 3664ea8a57..ca04afcfae 100644
--- a/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetComputePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetComputePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.cpp b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.cpp
index 456e3620d1..f5d9d05ce2 100644
--- a/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.h b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.h
index dc0ef5a3aa..5d3632f94f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.h
+++ b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetInputBuffers.cpp b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetInputBuffers.cpp
index 4a1126c468..f6b91f649f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetInputBuffers.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetInputBuffers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlane.cpp b/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlane.cpp
index 1c8668fa7a..b096b391b7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlane.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlane.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlane.h b/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlane.h
index 06d61d682e..835255b199 100644
--- a/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlane.h
+++ b/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlane.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessor.cpp
index ec8b5bb7da..69b5f69de4 100644
--- a/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessor.h
index 45db176660..6a76309a35 100644
--- a/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Android/Atom_Feature_Traits_Android.h b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/Atom_Feature_Traits_Android.h
index 88fe123981..7c37290ccb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Android/Atom_Feature_Traits_Android.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/Atom_Feature_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Android/Atom_Feature_Traits_Platform.h b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/Atom_Feature_Traits_Platform.h
index 716a6e2169..a5964f22b7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Android/Atom_Feature_Traits_Platform.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/Atom_Feature_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Android/platform_android.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Android/platform_android.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/platform_android_files.cmake
index 2bbc253251..462fdfcf9f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Android/runtime_dependencies_clients.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/runtime_dependencies_clients.cmake
index 09f2742520..3e40f48401 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Android/runtime_dependencies_clients.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/runtime_dependencies_clients.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Android/runtime_dependencies_tools.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/runtime_dependencies_tools.cmake
index 32efa960cc..c515052a55 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Android/runtime_dependencies_tools.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Android/runtime_dependencies_tools.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Common/Clang/atom_feature_common_clang.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Common/Clang/atom_feature_common_clang.cmake
index 1d00c12f26..47285977c9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Common/Clang/atom_feature_common_clang.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Common/Clang/atom_feature_common_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Common/MSVC/atom_feature_common_msvc.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Common/MSVC/atom_feature_common_msvc.cmake
index 019851d457..d2ee0ef150 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Common/MSVC/atom_feature_common_msvc.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Common/MSVC/atom_feature_common_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/Atom_Feature_Traits_Linux.h b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/Atom_Feature_Traits_Linux.h
index 88fe123981..7c37290ccb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/Atom_Feature_Traits_Linux.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/Atom_Feature_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/Atom_Feature_Traits_Platform.h b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/Atom_Feature_Traits_Platform.h
index ac18eff278..de69b87a91 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/Atom_Feature_Traits_Platform.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/Atom_Feature_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/platform_linux_files.cmake
index d6588791cf..dc93aa9784 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/runtime_dependencies_clients.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/runtime_dependencies_clients.cmake
index 09f2742520..3e40f48401 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/runtime_dependencies_clients.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/runtime_dependencies_clients.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/runtime_dependencies_tools.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/runtime_dependencies_tools.cmake
index b99a351d84..34b476c9fc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/runtime_dependencies_tools.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Linux/runtime_dependencies_tools.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/Atom_Feature_Traits_Mac.h b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/Atom_Feature_Traits_Mac.h
index 88fe123981..7c37290ccb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/Atom_Feature_Traits_Mac.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/Atom_Feature_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/Atom_Feature_Traits_Platform.h b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/Atom_Feature_Traits_Platform.h
index 6924da03c4..ee85804524 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/Atom_Feature_Traits_Platform.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/Atom_Feature_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/platform_mac_files.cmake
index ad3fcccb25..921910421e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/runtime_dependencies_clients.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/runtime_dependencies_clients.cmake
index db808a66f0..358d6137ad 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/runtime_dependencies_clients.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/runtime_dependencies_clients.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/runtime_dependencies_tools.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/runtime_dependencies_tools.cmake
index 5c78ffb342..d3d2cb1e4d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/runtime_dependencies_tools.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Mac/runtime_dependencies_tools.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/Atom_Feature_Traits_Platform.h b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/Atom_Feature_Traits_Platform.h
index dfe1f72b73..fdfd081f43 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/Atom_Feature_Traits_Platform.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/Atom_Feature_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/Atom_Feature_Traits_Windows.h b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/Atom_Feature_Traits_Windows.h
index c5bb14ec41..105f74adfc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/Atom_Feature_Traits_Windows.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/Atom_Feature_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/LaunchLuxCoreUI_Windows.cpp b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/LaunchLuxCoreUI_Windows.cpp
index fe7380ff71..9b0808445a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/LaunchLuxCoreUI_Windows.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/LaunchLuxCoreUI_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake
index 872fe07e1e..a6577196dc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows_files.cmake
index 3beb05007c..f9e357640d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/runtime_dependencies_clients.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/runtime_dependencies_clients.cmake
index 8abe3b2938..9b2f90e617 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/runtime_dependencies_clients.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/runtime_dependencies_clients.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/runtime_dependencies_tools.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/runtime_dependencies_tools.cmake
index b99a351d84..34b476c9fc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/runtime_dependencies_tools.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/runtime_dependencies_tools.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/Atom_Feature_Traits_Platform.h b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/Atom_Feature_Traits_Platform.h
index 0258d0321e..923ac3a5bc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/Atom_Feature_Traits_Platform.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/Atom_Feature_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/Atom_Feature_Traits_iOS.h b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/Atom_Feature_Traits_iOS.h
index 88fe123981..7c37290ccb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/Atom_Feature_Traits_iOS.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/Atom_Feature_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/platform_ios.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/platform_ios.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/platform_ios_files.cmake
index 9925483473..5788dbcfe6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/runtime_dependencies_clients.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/runtime_dependencies_clients.cmake
index db808a66f0..358d6137ad 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/runtime_dependencies_clients.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/runtime_dependencies_clients.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/runtime_dependencies_tools.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/runtime_dependencies_tools.cmake
index 32efa960cc..c515052a55 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/runtime_dependencies_tools.cmake
+++ b/Gems/Atom/Feature/Common/Code/Source/Platform/iOS/runtime_dependencies_tools.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.cpp
index c2a469876e..ebf2aebb62 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.h
index f9548d60fd..eb61ab57d6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.cpp
index d83e56baa7..1521dddc60 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.h
index 7a357b0fc3..e7cbfd6def 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.cpp
index fbfbcb9687..a43faadf5e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.h
index 6b3233aac6..dbc78968b4 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp
index 8950a2f12b..aa8bb016df 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -40,7 +40,6 @@ namespace AZ
 
         void LookModificationSettings::ApplySettingsTo(LookModificationSettings* target, float alpha) const
         {
-            AZ_UNUSED(alpha);
             AZ_Assert(target != nullptr, "LookModificationSettings::ApplySettingsTo called with nullptr as argument.");
 
             auto lutAssetId = GetColorGradingLut();
@@ -48,20 +47,10 @@ namespace AZ
             {
                 Render::LutBlendItem lutBlend;
                 lutBlend.m_intensity = GetColorGradingLutIntensity();
-                lutBlend.m_overrideStrength = GetColorGradingLutOverride();
+                lutBlend.m_overrideStrength = GetColorGradingLutOverride() * alpha;
                 lutBlend.m_assetId = lutAssetId;
                 target->AddLutBlend(lutBlend);
             }
-
-            // Auto-gen code to blend individual params based on their override value onto target settings
-#define OVERRIDE_TARGET target
-#define OVERRIDE_ALPHA alpha
-
-#include <Atom/Feature/ParamMacros/StartOverrideBlend.inl>
-#include <Atom/Feature/PostProcess/LookModification/LookModificationParams.inl>
-#include <Atom/Feature/ParamMacros/EndParams.inl>
-#undef OVERRIDE_TARGET
-#undef OVERRIDE_ALPHA
         }
 
         void LookModificationSettings::Simulate(float deltaTime)
diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.h
index 53c71d8534..da793271d9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessBase.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessBase.cpp
index 63b9db19a3..db73702937 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessBase.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessBase.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessBase.h
index a46db8697d..3d76ccd7d3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessBase.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp
index 686c7092b7..ed83384d38 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.h
index cb8dff34ff..7dfb096153 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.cpp
index 245fae9e26..bec4857b3d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.h
index 2a70a5be42..41802c13e9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.cpp
index e4a17ff12b..82c13b0f32 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.h
index 4f8f485f2e..0a13ab980d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
index 7acc785be1..127411d92d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.h
index 68b298bc83..72cb356ce7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomBlurPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomBlurPass.cpp
index 2f24cfcceb..7daf810f0c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomBlurPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomBlurPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomBlurPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomBlurPass.h
index 152c1821cb..bd82104a7a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomBlurPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomBlurPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomCompositePass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomCompositePass.cpp
index c502ebe18f..fdfa285389 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomCompositePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomCompositePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomCompositePass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomCompositePass.h
index b965ffad8a..f3ea06ef88 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomCompositePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomCompositePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomDownsamplePass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomDownsamplePass.cpp
index f2a21c9daa..47515bd96d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomDownsamplePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomDownsamplePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomDownsamplePass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomDownsamplePass.h
index 3630519bda..365bba03a4 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomDownsamplePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomDownsamplePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomParentPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomParentPass.cpp
index 056288d430..161c58d4e8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomParentPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomParentPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomParentPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomParentPass.h
index 47166a36ef..70f01468c8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomParentPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/BloomParentPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldBokehBlurPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldBokehBlurPass.cpp
index 54a250769a..dd4abe95b6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldBokehBlurPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldBokehBlurPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldBokehBlurPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldBokehBlurPass.h
index 20ab816b9a..819af3f121 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldBokehBlurPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldBokehBlurPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCompositePass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCompositePass.cpp
index 14285ad304..4b6f3e9fb0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCompositePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCompositePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCompositePass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCompositePass.h
index c02cd3591d..5aaecf2963 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCompositePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCompositePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCopyFocusDepthToCpuPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCopyFocusDepthToCpuPass.cpp
index d2a2cbfd88..21aa5efb03 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCopyFocusDepthToCpuPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCopyFocusDepthToCpuPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCopyFocusDepthToCpuPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCopyFocusDepthToCpuPass.h
index 78dd30b1ce..a01a61d3e8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCopyFocusDepthToCpuPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldCopyFocusDepthToCpuPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldMaskPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldMaskPass.cpp
index a2079abd83..2f6d5995f7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldMaskPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldMaskPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldMaskPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldMaskPass.h
index fb3785db41..deb86302e8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldMaskPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldMaskPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldParentPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldParentPass.cpp
index bd923525a0..e77eb64123 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldParentPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldParentPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldParentPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldParentPass.h
index 47e7f1ef82..69a0cf0262 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldParentPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldParentPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldPencilMap.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldPencilMap.h
index 586d8e93f3..f7563885a2 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldPencilMap.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldPencilMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldReadBackFocusDepthPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldReadBackFocusDepthPass.cpp
index 2f538e5cdd..0d2e348118 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldReadBackFocusDepthPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldReadBackFocusDepthPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldReadBackFocusDepthPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldReadBackFocusDepthPass.h
index d9eafae367..b8bc7986c2 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldReadBackFocusDepthPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldReadBackFocusDepthPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldWriteFocusDepthFromGpuPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldWriteFocusDepthFromGpuPass.cpp
index 8fd2b9f99a..a099dc779c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldWriteFocusDepthFromGpuPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldWriteFocusDepthFromGpuPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldWriteFocusDepthFromGpuPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldWriteFocusDepthFromGpuPass.h
index 099da763f5..b8ac7a29f3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldWriteFocusDepthFromGpuPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthOfFieldWriteFocusDepthFromGpuPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthUpsamplePass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthUpsamplePass.cpp
index 92a5842207..7ead9f2981 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthUpsamplePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthUpsamplePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthUpsamplePass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthUpsamplePass.h
index 88a92dc461..71f61f3c1e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthUpsamplePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/DepthUpsamplePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/ExposureControlRenderProxy.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/ExposureControlRenderProxy.cpp
index a24812723b..af85e20533 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/ExposureControlRenderProxy.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/ExposureControlRenderProxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.cpp
index 059e1425b5..31185a22f8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.h
index 0d06dea331..9912a1dbf5 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/FastDepthAwareBlurPasses.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/FastDepthAwareBlurPasses.cpp
index ea70fe03e7..b046b55058 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/FastDepthAwareBlurPasses.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/FastDepthAwareBlurPasses.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/FastDepthAwareBlurPasses.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/FastDepthAwareBlurPasses.h
index daf09166c9..eeb204fe39 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/FastDepthAwareBlurPasses.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/FastDepthAwareBlurPasses.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationCompositePass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationCompositePass.cpp
index c066e5c7a2..7a18e0b7ed 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationCompositePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationCompositePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationCompositePass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationCompositePass.h
index 4cc08c8c38..3858afcc4b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationCompositePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationCompositePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationTransformPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationTransformPass.cpp
index 2acfe41dff..e4b2c97a37 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationTransformPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationTransformPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationTransformPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationTransformPass.h
index fd52e87aab..74515fb8b6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationTransformPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LookModificationTransformPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LuminanceHistogramGeneratorPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LuminanceHistogramGeneratorPass.cpp
index 21a528d5e8..06232fd60f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LuminanceHistogramGeneratorPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LuminanceHistogramGeneratorPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LuminanceHistogramGeneratorPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LuminanceHistogramGeneratorPass.h
index 270252e031..9f7e00d22b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LuminanceHistogramGeneratorPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/LuminanceHistogramGeneratorPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.cpp
index 5b2bfcf212..755ab5cd51 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.h
index ab91df34eb..b760db4e3a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/PostProcessingShaderOptionBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABasePass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABasePass.cpp
index 510c128709..879cc371f3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABasePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABasePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABasePass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABasePass.h
index 5f05d4ed53..4a01fce344 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABasePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABasePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABlendingWeightCalculationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABlendingWeightCalculationPass.cpp
index 99d384c199..d04d957eea 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABlendingWeightCalculationPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABlendingWeightCalculationPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABlendingWeightCalculationPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABlendingWeightCalculationPass.h
index 1e25bec110..d337ff19e8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABlendingWeightCalculationPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAABlendingWeightCalculationPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAACommon.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAACommon.h
index 41dac1505c..6b6653e905 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAACommon.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAACommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAConfigurationDescriptor.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAConfigurationDescriptor.cpp
index 2bb2dd81b2..41e99e1982 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAConfigurationDescriptor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAConfigurationDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAConfigurationDescriptor.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAConfigurationDescriptor.h
index f874406870..db4ea3bc92 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAConfigurationDescriptor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAConfigurationDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAEdgeDetectionPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAEdgeDetectionPass.cpp
index 5f72cbb69f..569c18865d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAEdgeDetectionPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAEdgeDetectionPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAEdgeDetectionPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAEdgeDetectionPass.h
index 946fc0c872..67bf303ba0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAEdgeDetectionPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAEdgeDetectionPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp
index 8c11ad6ad2..73d8d30830 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.h
index 6fe2bfe51a..3629b9caad 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAANeighborhoodBlendingPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAANeighborhoodBlendingPass.cpp
index 010c7420fc..d2c9a129d0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAANeighborhoodBlendingPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAANeighborhoodBlendingPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAANeighborhoodBlendingPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAANeighborhoodBlendingPass.h
index 7d3a56b83f..bdcf386b6f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAANeighborhoodBlendingPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAANeighborhoodBlendingPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SsaoPasses.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SsaoPasses.cpp
index 70d9cf632e..e622454210 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SsaoPasses.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SsaoPasses.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SsaoPasses.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SsaoPasses.h
index cc07cab7bd..f9e4c4f1a6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SsaoPasses.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SsaoPasses.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SubsurfaceScatteringPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SubsurfaceScatteringPass.cpp
index d1d74117cc..1e6a8b3e33 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SubsurfaceScatteringPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SubsurfaceScatteringPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SubsurfaceScatteringPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SubsurfaceScatteringPass.h
index 0d92f4f5c8..1097bad492 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SubsurfaceScatteringPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SubsurfaceScatteringPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp
index 12af53eab2..7fd304b062 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -172,9 +172,17 @@ namespace AZ::Render
         // The full path name is needed for the attachment image so it's not deduplicated from accumulation images in different pipelines.
         AZStd::string imageName = RPI::ConcatPassString(GetPathName(), attachment->m_path);
         auto attachmentImage = RPI::AttachmentImage::Create(*pool.get(), imageDesc, Name(imageName), nullptr, &viewDesc);
-        
-        attachment->m_path = attachmentImage->GetAttachmentId();
-        attachment->m_importedResource = attachmentImage;
+
+        if (attachmentImage)
+        {
+            attachment->m_path = attachmentImage->GetAttachmentId();
+            attachment->m_importedResource = attachmentImage;
+        }
+        else
+        {
+            AZ_Error("TaaPass", false, "TaaPass disabled because it is unable to create an attachment image.")
+            this->SetEnabled(false);
+        }
     }
 
     void TaaPass::SetupSubPixelOffsets(uint32_t haltonX, uint32_t haltonY, uint32_t length)
diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h
index 3435ddc764..d18f98d8b7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.cpp
index 64c1ddd676..ed3feb98af 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -141,7 +141,7 @@ namespace AZ
             static void Reflect(AZ::ReflectContext* context);
 
             CpuProfilingStatisticsSerializer() = default;
-            CpuProfilingStatisticsSerializer(RHI::CpuProfiler::TimeRegionMap& timeRegionMap);
+            CpuProfilingStatisticsSerializer(const RHI::CpuProfiler::TimeRegionMap& timeRegionMap);
 
             AZStd::vector<CpuProfilingStatisticsSerializerEntry> m_cpuProfilingStatisticsSerializerEntries;
         };
@@ -286,14 +286,17 @@ namespace AZ
 
         // --- CpuProfilingStatisticsSerializer ---
 
-        CpuProfilingStatisticsSerializer::CpuProfilingStatisticsSerializer(RHI::CpuProfiler::TimeRegionMap& timeRegionMap)
+        CpuProfilingStatisticsSerializer::CpuProfilingStatisticsSerializer(const RHI::CpuProfiler::TimeRegionMap& timeRegionMap)
         {
             // Create serializable entries
-            for (auto& treadEntry : timeRegionMap)
+            for (auto& threadEntry : timeRegionMap)
             {
-                for (auto& cachedRegionEntry : treadEntry.second)
+                for (auto& cachedRegionEntry : threadEntry.second)
                 {
-                    m_cpuProfilingStatisticsSerializerEntries.emplace_back(cachedRegionEntry.second);
+                    m_cpuProfilingStatisticsSerializerEntries.insert(
+                        m_cpuProfilingStatisticsSerializerEntries.end(),
+                        cachedRegionEntry.second.begin(),
+                        cachedRegionEntry.second.end());
                 }
             }
         }
@@ -545,8 +548,7 @@ namespace AZ
                 serializationSettings.m_keepDefaults = true;
 
                 // Get time Cpu profiled time regions
-                RHI::CpuProfiler::TimeRegionMap timeRegionMap;
-                RHI::CpuProfiler::Get()->FlushTimeRegionMap(timeRegionMap);
+                const RHI::CpuProfiler::TimeRegionMap& timeRegionMap = RHI::CpuProfiler::Get()->GetTimeRegionMap();
 
                 CpuProfilingStatisticsSerializer serializer(timeRegionMap);
                 const auto saveResult = JsonSerializationUtils::SaveObjectToFile(&serializer,
diff --git a/Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.h
index 5bfa6722d1..48658e542a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingAccelerationStructurePass.cpp b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingAccelerationStructurePass.cpp
index acdc5daf97..43a8171e2f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingAccelerationStructurePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingAccelerationStructurePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingAccelerationStructurePass.h b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingAccelerationStructurePass.h
index c1913fd965..c2397c55fc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingAccelerationStructurePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingAccelerationStructurePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
index f31c7a015e..bc10179b1d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h
index ec9784753a..58bd0a11ea 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPass.cpp b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPass.cpp
index 7f6dd25692..4966527e7e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPass.h b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPass.h
index dc7a29fdc7..2acbca81f6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPassData.h b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPassData.h
index 5cab8d7c01..d2a7e3f86b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPassData.h
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingPassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
index a6e96f0b49..d3b1ceca0c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -108,16 +108,29 @@ namespace AZ
 
         void ReflectionProbe::Simulate(uint32_t probeIndex)
         {
-            if (m_buildingCubeMap && m_environmentCubeMapPass->IsFinished())
+            if (m_buildingCubeMap)
             {
-                // all faces of the cubemap have been rendered, invoke the callback
-                m_callback(m_environmentCubeMapPass->GetTextureData(), m_environmentCubeMapPass->GetTextureFormat());
-
-                // remove the pipeline
-                m_scene->RemoveRenderPipeline(m_environmentCubeMapPipelineId);
-                m_environmentCubeMapPass = nullptr;
-
-                m_buildingCubeMap = false;
+                Data::Instance<RPI::ShaderResourceGroup> sceneSrg = m_scene->GetShaderResourceGroup();
+
+                if (m_environmentCubeMapPass->IsFinished())
+                {
+                    // all faces of the cubemap have been rendered, invoke the callback
+                    m_callback(m_environmentCubeMapPass->GetTextureData(), m_environmentCubeMapPass->GetTextureFormat());
+
+                    // remove the pipeline
+                    m_scene->RemoveRenderPipeline(m_environmentCubeMapPipelineId);
+                    m_environmentCubeMapPass = nullptr;
+
+                    // restore exposure
+                    sceneSrg->SetConstant(m_iblExposureConstantIndex, m_previousExposure);
+
+                    m_buildingCubeMap = false;
+                }
+                else
+                {
+                    // set exposure to 0.0 while baking the cubemap
+                    sceneSrg->SetConstant(m_iblExposureConstantIndex, 0.0f);
+                }
             }
 
             // track if we need to update culling based on changes to the draw packets or Srg
@@ -295,6 +308,10 @@ namespace AZ
             const RPI::Ptr<RPI::ParentPass>& rootPass = environmentCubeMapPipeline->GetRootPass();
             rootPass->AddChild(m_environmentCubeMapPass);
 
+            // store the current IBL exposure value
+            Data::Instance<RPI::ShaderResourceGroup> sceneSrg = m_scene->GetShaderResourceGroup();
+            m_previousExposure = sceneSrg->GetConstant<float>(m_iblExposureConstantIndex);
+
             m_scene->AddRenderPipeline(environmentCubeMapPipeline);
         }
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
index 79ae4f471c..6ffc549d5f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -169,6 +169,8 @@ 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;
             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 de4023da12..3ec7bd4186 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp
index 34b9b01e35..c4c54b9bf9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.h
index 932d31ccc0..1d42acca3c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.cpp
index 93dbd55c2d..ba53c7e45a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.h
index 9bbe9f3a2a..0907e941d8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -51,7 +51,7 @@ namespace AZ
             PassType m_passType;
             uint32_t m_mipLevel = 0;
             RHI::Size m_imageSize;
-            float m_outputScale = 0.0f;
+            float m_outputScale = 1.0f;
         };
     }   // namespace RPI
 }   // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp
index b9c07c1079..ab5eb17cb9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h
index c6b267e2be..e4bfd4fba4 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp
index 1e2e5bbf51..e4ce2cddfb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h
index c2b6a3fea8..a8509e5d1e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/RenderCommon.h b/Gems/Atom/Feature/Common/Code/Source/RenderCommon.h
index 00dd0aea4f..011172c29d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RenderCommon.h
+++ b/Gems/Atom/Feature/Common/Code/Source/RenderCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogPass.cpp
index 6d6e371810..4d275d8892 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogPass.h b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogPass.h
index b6cae2ee2e..fdad65b0d6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.cpp
index 44f8f50029..226e5804f1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.h b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.h
index a397cc3fb8..4fe67b37c8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
index 65c7644d54..cf69c9f7be 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -104,6 +104,7 @@ namespace AZ::Render
             m_shadowData.Release(id.GetIndex());
         }
 
+        m_filterParameterNeedsUpdate = true;
         m_shadowmapPassNeedsUpdate = true;
     }
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h
index 0d32f4f691..25a527b33a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshComputePass.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshComputePass.cpp
index e71053972e..d8c06173dc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshComputePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshComputePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshComputePass.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshComputePass.h
index 7bfe2a02d3..63278771bf 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshComputePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshComputePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshDispatchItem.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshDispatchItem.cpp
index deecd17d75..853fb74bba 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshDispatchItem.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshDispatchItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshDispatchItem.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshDispatchItem.h
index e4d51abbe0..f601d120c3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshDispatchItem.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshDispatchItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp
index 5921d68350..b5b40cf443 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.h
index 19ee7ce386..d0d82b3b2d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
index 2f30c7b61a..75d079c937 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInstance.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInstance.cpp
index 33b9cc5c80..c62a8e8a8f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInstance.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.cpp
index ff24122738..3cb572508e 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.h
index aa77415d9f..e4bb229d7f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp
index 957646ec17..e3d516c92b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.h
index 822313d962..ef82af0456 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshShaderOptionsCache.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshShaderOptionsCache.cpp
index 7427d380e3..82920e1cf5 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshShaderOptionsCache.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshShaderOptionsCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshShaderOptionsCache.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshShaderOptionsCache.h
index 0b9be26331..dcface47c6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshShaderOptionsCache.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshShaderOptionsCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshStatsCollector.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshStatsCollector.cpp
index 0f9c3715cf..a3bcf732e1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshStatsCollector.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshStatsCollector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshStatsCollector.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshStatsCollector.h
index 8a1522770e..b67bebf07d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshStatsCollector.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshStatsCollector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshSystemComponent.cpp
index 41aeb7f00f..2791a20876 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshSystemComponent.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshSystemComponent.h
index 2ff087bde1..2a520ea8ff 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshSystemComponent.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshVertexStreamProperties.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshVertexStreamProperties.cpp
index 0165c5da35..d9fdb5cf25 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshVertexStreamProperties.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshVertexStreamProperties.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshVertexStreamProperties.h b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshVertexStreamProperties.h
index 3b767ffb56..43e77cfe52 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshVertexStreamProperties.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshVertexStreamProperties.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp
index d8f3f9a5a6..b965ab1dd1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.h
index 92f5b154f7..cc836ba874 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFogSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFogSettings.cpp
index b87a1bd55b..304d8b43a3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFogSettings.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFogSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFogSettings.h b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFogSettings.h
index 1a7ab5161f..1545b806e9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFogSettings.h
+++ b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFogSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp
index 07559ef5fb..935c2bba17 100644
--- a/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp
index 9d6e0707ad..5e14f0df9d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp
index 6e24726d0e..b51209d227 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Utils/GpuBufferHandler.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/GpuBufferHandler.cpp
index bddc1c558f..f758cc9364 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/GpuBufferHandler.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/GpuBufferHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp
index b801403a91..7a8e71c5e6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp
index 94131ed71a..d2db17e971 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Tests/CommonTest.cpp b/Gems/Atom/Feature/Common/Code/Tests/CommonTest.cpp
index c02fd906b0..f5e1678546 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/CommonTest.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/CommonTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Tests/CoreLights/ShadowmapAtlasTest.cpp b/Gems/Atom/Feature/Common/Code/Tests/CoreLights/ShadowmapAtlasTest.cpp
index e759a9af50..911293dd71 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/CoreLights/ShadowmapAtlasTest.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/CoreLights/ShadowmapAtlasTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Tests/Decals/DecalTextureArrayTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/Decals/DecalTextureArrayTests.cpp
index 40f4899c69..3922ac91df 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/Decals/DecalTextureArrayTests.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/Decals/DecalTextureArrayTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Tests/IndexableListTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/IndexableListTests.cpp
index e17d31d7f5..fffdf84b2a 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/IndexableListTests.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/IndexableListTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp
index 263ed9f22b..825a37d54a 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Tests/SkinnedMesh/SkinnedMeshDispatchItemTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/SkinnedMesh/SkinnedMeshDispatchItemTests.cpp
index c9a07a25e0..c3b67b19c6 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/SkinnedMesh/SkinnedMeshDispatchItemTests.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/SkinnedMesh/SkinnedMeshDispatchItemTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/Tests/SparseVectorTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/SparseVectorTests.cpp
index e5a3a386f3..613334c772 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/SparseVectorTests.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/SparseVectorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Feature/Common/Code/atom_feature_common_builders_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_builders_files.cmake
index 81e94091e4..9aff58a080 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_builders_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_builders_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/atom_feature_common_editor_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_editor_files.cmake
index b99d23d442..1d6682cc09 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_editor_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake
index 708504a701..739e8be725 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/atom_feature_common_public_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_public_files.cmake
index 65c18eaef6..4376b5a270 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_public_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_public_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/atom_feature_common_shared_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_shared_files.cmake
index 9d4a7f70e1..3d256b29be 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_shared_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/atom_feature_common_staticlibrary_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_staticlibrary_files.cmake
index ef9e2a66a5..6decb0b07a 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_staticlibrary_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_staticlibrary_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake
index 87edfb46ae..eb8adf6ce9 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
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/CMakeLists.txt b/Gems/Atom/RHI/CMakeLists.txt
index 6cf52f790d..8021c2f117 100644
--- a/Gems/Atom/RHI/CMakeLists.txt
+++ b/Gems/Atom/RHI/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/CMakeLists.txt b/Gems/Atom/RHI/Code/CMakeLists.txt
index 1da362d1d3..046e0e98a9 100644
--- a/Gems/Atom/RHI/Code/CMakeLists.txt
+++ b/Gems/Atom/RHI/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderCompilerArguments.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderCompilerArguments.h
index bdb96bfa35..ed0ff3fb67 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderCompilerArguments.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderCompilerArguments.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderPlatformInterface.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderPlatformInterface.h
index b5cc3b9c23..d83fbf2267 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderPlatformInterface.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderPlatformInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderPlatformInterfaceBus.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderPlatformInterfaceBus.h
index 54c8756f75..6b6e5f8f9c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderPlatformInterfaceBus.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderPlatformInterfaceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/Utils.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/Utils.h
index 2dec6d3e30..9c7516f509 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/Utils.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AliasedHeapEnums.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AliasedHeapEnums.h
index 0252ce0bc7..a037a17b87 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AliasedHeapEnums.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AliasedHeapEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentEnums.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentEnums.h
index d3aadf90d9..36877f1ef3 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentEnums.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentId.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentId.h
index c68a52d8bd..4bd628d1d6 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentId.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentLoadStoreAction.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentLoadStoreAction.h
index 20cd9f1ab9..4e70080ea4 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentLoadStoreAction.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/AttachmentLoadStoreAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Base.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Base.h
index 7571438154..2c3bb25312 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Base.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
index 01a0a564f9..da6b968a00 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferDescriptor.h
index 32cef46d12..a874abd1b4 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferPoolDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferPoolDescriptor.h
index 8b6bc68ba9..6e87c85288 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferPoolDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferPoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferScopeAttachmentDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferScopeAttachmentDescriptor.h
index 663116cea6..54af9757ff 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferScopeAttachmentDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferScopeAttachmentDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferViewDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferViewDescriptor.h
index c575c37617..7f246cff61 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferViewDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferViewDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ClearValue.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ClearValue.h
index a4658aac44..551787f8ef 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ClearValue.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ClearValue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ConstantsLayout.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ConstantsLayout.h
index 36e158d445..09415f1bc2 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ConstantsLayout.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ConstantsLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/CpuTimingStatistics.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/CpuTimingStatistics.h
index 09d1da4096..e24ae8c0c7 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/CpuTimingStatistics.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/CpuTimingStatistics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceDescriptor.h
index e67766deb3..72a9fb728c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceFeatures.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceFeatures.h
index 2d816866f7..2018fd8bf4 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceFeatures.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceFeatures.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceLimits.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceLimits.h
index 9ccaa6a78b..b902f4ecb6 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceLimits.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/DeviceLimits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Format.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Format.h
index 54dcc98242..e3cb19cca0 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Format.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Format.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/FrameSchedulerEnums.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/FrameSchedulerEnums.h
index 6c32894bd4..279385541b 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/FrameSchedulerEnums.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/FrameSchedulerEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Handle.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Handle.h
index 6fd92324f4..b2c6b19085 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Handle.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Handle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageDescriptor.h
index a57ee85c00..67afd81ca5 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageEnums.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageEnums.h
index f0513c3e45..4fa5a3c53c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageEnums.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImagePoolDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImagePoolDescriptor.h
index 2d7ec7ca3e..511e4eaa2d 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImagePoolDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImagePoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageScopeAttachmentDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageScopeAttachmentDescriptor.h
index 6253aa61bf..8ed5bbce1e 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageScopeAttachmentDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageScopeAttachmentDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h
index 861c83a90f..c9c75efa5b 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageViewDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageViewDescriptor.h
index 9c1e3e7d66..4d978e1d77 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageViewDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageViewDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/IndirectBufferLayout.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/IndirectBufferLayout.h
index 85e74bf905..d24e256b58 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/IndirectBufferLayout.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/IndirectBufferLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/InputStreamLayout.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/InputStreamLayout.h
index 629664d358..9c9397f80c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/InputStreamLayout.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/InputStreamLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/InputStreamLayoutBuilder.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/InputStreamLayoutBuilder.h
index dbbdf0832a..c3e70e6a8d 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/InputStreamLayoutBuilder.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/InputStreamLayoutBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Interval.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Interval.h
index b3bbff33c7..235a89b745 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Interval.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Interval.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Limits.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Limits.h
index 3c9277816d..68edada5e5 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Limits.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Limits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryEnums.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryEnums.h
index 484dce7ba3..da72954734 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryEnums.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryStatistics.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryStatistics.h
index 17cb3eb2e6..85af09df1d 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryStatistics.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryStatistics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryUsage.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryUsage.h
index 2a4088e041..dd3b5fd537 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryUsage.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MemoryUsage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MultisampleState.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MultisampleState.h
index 0a379da6b6..a203ab500c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MultisampleState.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/MultisampleState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/NameIdReflectionMap.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/NameIdReflectionMap.h
index 2de6c530c8..7756e7d290 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/NameIdReflectionMap.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/NameIdReflectionMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Origin.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Origin.h
index a9bd7bdb20..06cc53c001 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Origin.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Origin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PhysicalDeviceDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PhysicalDeviceDescriptor.h
index 884e684af8..53269bdbc7 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PhysicalDeviceDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PhysicalDeviceDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PhysicalDeviceDriverInfoSerializer.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PhysicalDeviceDriverInfoSerializer.h
index ced5905807..df0615787a 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PhysicalDeviceDriverInfoSerializer.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PhysicalDeviceDriverInfoSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PipelineLayoutDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PipelineLayoutDescriptor.h
index 64fe7cd683..e95d748969 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PipelineLayoutDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PipelineLayoutDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PipelineLibraryData.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PipelineLibraryData.h
index 91cae94482..e3ae35c807 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PipelineLibraryData.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PipelineLibraryData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PlatformLimitsDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PlatformLimitsDescriptor.h
index c2b6a1412d..0916066592 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PlatformLimitsDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/PlatformLimitsDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/QueryPoolDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/QueryPoolDescriptor.h
index 0bcdb7566c..39aec0faea 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/QueryPoolDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/QueryPoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RHISystemDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RHISystemDescriptor.h
index 1908972a6f..d2b433bba3 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RHISystemDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RHISystemDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ReflectSystemComponent.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ReflectSystemComponent.h
index 1657709f37..0c2fe859cb 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ReflectSystemComponent.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ReflectSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderAttachmentLayout.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderAttachmentLayout.h
index 85c38c0bc0..486e720f1e 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderAttachmentLayout.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderAttachmentLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderAttachmentLayoutBuilder.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderAttachmentLayoutBuilder.h
index 040c099e78..e7f766353c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderAttachmentLayoutBuilder.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderAttachmentLayoutBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderStates.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderStates.h
index 160bdd8d1c..8d000edd5c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderStates.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/RenderStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ResolveScopeAttachmentDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ResolveScopeAttachmentDescriptor.h
index 88f01547a0..576cf41322 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ResolveScopeAttachmentDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ResolveScopeAttachmentDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ResourcePoolDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ResourcePoolDescriptor.h
index 641d0a80a1..bf9a2b6708 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ResourcePoolDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ResourcePoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/SamplerState.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/SamplerState.h
index 2f94708c05..93bbd5a108 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/SamplerState.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/SamplerState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Scissor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Scissor.h
index 7e9b8ba5c2..cb64f0a0a8 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Scissor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Scissor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeAttachmentDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeAttachmentDescriptor.h
index ba14a3080c..9ebca25e31 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeAttachmentDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeAttachmentDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeEnums.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeEnums.h
index ad49d2df73..e41e011a88 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeEnums.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeId.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeId.h
index 3e379c2797..cda4964f1a 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeId.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ScopeId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderDataMappings.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderDataMappings.h
index 49487c3f9d..c3ebcbefb3 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderDataMappings.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderDataMappings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderInputNameIndex.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderInputNameIndex.h
index 7e6c39f589..522bdc13bb 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderInputNameIndex.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderInputNameIndex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupLayout.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupLayout.h
index 60dfcce5a2..a4256d75ac 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupLayout.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.h
index e22cbe5bc1..f1a8ce8dba 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupPoolDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupPoolDescriptor.h
index 9fcb2c915c..2444b85891 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupPoolDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderResourceGroupPoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderSemantic.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderSemantic.h
index a75f958d5a..a37db97126 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderSemantic.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderSemantic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderStageFunction.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderStageFunction.h
index 1e63be5ed9..bb7aa05d60 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderStageFunction.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderStageFunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderStages.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderStages.h
index ebeba6b143..5fc19679d7 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderStages.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ShaderStages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Size.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Size.h
index bf4fac5ae4..acb780dde1 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Size.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Size.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/StreamingImagePoolDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/StreamingImagePoolDescriptor.h
index a3f58de777..e9319734c0 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/StreamingImagePoolDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/StreamingImagePoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/SwapChainDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/SwapChainDescriptor.h
index 7c1ed83ca7..aee89c9116 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/SwapChainDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/SwapChainDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientAttachmentStatistics.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientAttachmentStatistics.h
index cfe6f686a2..e8f25dee40 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientAttachmentStatistics.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientAttachmentStatistics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientBufferDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientBufferDescriptor.h
index fd1f0173a4..9af9207f5c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientBufferDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientBufferDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientImageDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientImageDescriptor.h
index 621fdac0f5..ab97c7d2ed 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientImageDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/TransientImageDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/UnifiedAttachmentDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/UnifiedAttachmentDescriptor.h
index 351f2ab6cf..b3497d665d 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/UnifiedAttachmentDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/UnifiedAttachmentDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/UnifiedScopeAttachmentDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/UnifiedScopeAttachmentDescriptor.h
index 49bece9edd..f3a7fdff1f 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/UnifiedScopeAttachmentDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/UnifiedScopeAttachmentDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Viewport.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Viewport.h
index 3938be742c..b902aa9eb6 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Viewport.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Viewport.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasedAttachmentAllocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasedAttachmentAllocator.h
index 7411f961d0..a20d817fd6 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasedAttachmentAllocator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasedAttachmentAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasedHeap.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasedHeap.h
index d959d3898d..b2d052cc54 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasedHeap.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasedHeap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasingBarrierTracker.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasingBarrierTracker.h
index 306016ffad..1ad4548a63 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasingBarrierTracker.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/AliasingBarrierTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Allocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Allocator.h
index 0353bc4d47..4b946d8aa1 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Allocator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Allocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/AsyncWorkQueue.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/AsyncWorkQueue.h
index 53a350d2b3..6ad8a9d306 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/AsyncWorkQueue.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/AsyncWorkQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Buffer.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Buffer.h
index 9e8babbe47..0dc9e6d9a9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Buffer.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferFrameAttachment.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferFrameAttachment.h
index 2894c73e26..9e7455df10 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferFrameAttachment.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferFrameAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferPool.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferPool.h
index 9e176d19e1..07489e45c9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferPool.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferPoolBase.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferPoolBase.h
index 4785a6118a..5fc7e845d5 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferPoolBase.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferPoolBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferProperty.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferProperty.h
index 451402947c..70eef7e29b 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferProperty.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferProperty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferScopeAttachment.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferScopeAttachment.h
index 55199501f0..11538e8aab 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferScopeAttachment.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferScopeAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferView.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferView.h
index 1b11b9ee3b..58e941da26 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferView.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/BufferView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandList.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandList.h
index 462225ab27..14cfa75f8d 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandList.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandListStates.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandListStates.h
index 6958ad41a1..a02a7ba442 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandListStates.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandListStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandListValidator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandListValidator.h
index 2ade49b33f..892544b811 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandListValidator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandListValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandQueue.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandQueue.h
index 226903056d..9ddb9b95ba 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandQueue.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ConstantsData.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ConstantsData.h
index a4a08eb4ed..5fd10212d4 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ConstantsData.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ConstantsData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/CopyItem.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/CopyItem.h
index 5e155e1998..be87585202 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/CopyItem.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/CopyItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfiler.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfiler.h
index e103116a8a..ebdfcdfe87 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfiler.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -60,7 +60,7 @@ namespace AZ
         class CpuProfiler
         {
         public:
-            using ThreadTimeRegionMap = AZStd::unordered_map<AZStd::string, CachedTimeRegion>;
+            using ThreadTimeRegionMap = AZStd::unordered_map<AZStd::string, AZStd::vector<CachedTimeRegion>>;
             using TimeRegionMap = AZStd::unordered_map<AZStd::thread_id, ThreadTimeRegionMap>;
 
             AZ_RTTI(CpuProfiler, "{127C1D0B-BE05-4E18-A8F6-24F3EED2ECA6}");
@@ -78,8 +78,8 @@ namespace AZ
             //! Ends a time region
             virtual void EndTimeRegion() = 0;
 
-            //! Flush cached regions from all threads to the passed parameter
-            virtual void FlushTimeRegionMap(TimeRegionMap& timeRegionMap) = 0;
+            //! Get the last frame's TimeRegionMap
+            virtual const TimeRegionMap& GetTimeRegionMap() const = 0;
 
             //! Enable/Disable the CpuProfiler
             virtual void SetProfilerEnabled(bool enabled) = 0;
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfilerImpl.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfilerImpl.h
index f6e7467949..eb35a29e26 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfilerImpl.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/CpuProfilerImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,10 +10,13 @@
 #include <Atom/RHI.Reflect/Base.h>
 
 #include <AzCore/Memory/OSAllocator.h>
+#include <AzCore/std/containers/map.h>
 #include <AzCore/std/parallel/mutex.h>
 #include <AzCore/std/parallel/shared_mutex.h>
 #include <AzCore/std/smart_ptr/intrusive_refcount.h>
 
+#include <Atom/RHI/FrameEventBus.h>
+
 namespace AZ
 {
     namespace RHI
@@ -70,6 +73,9 @@ namespace AZ
 
             // When the thread is terminated, it will flag itself for deletion
             AZStd::atomic_bool m_deleteFlag = false;
+
+            // Keep track of the regions that have hit the size limit so we don't have to lock to check
+            AZStd::map<AZStd::string, bool> m_hitSizeLimitMap;
         };
 
         //! CpuProfiler will keep track of the registered threads, and
@@ -77,6 +83,7 @@ namespace AZ
         //! cached regions, which are stored on a per thread frequency.
         class CpuProfilerImpl final
             : public CpuProfiler
+            , public FrameEventBus::Handler
         {
             friend class CpuTimingLocalStorage;
 
@@ -92,10 +99,12 @@ namespace AZ
             //! Unregisters the CpuProfilerImpl instance from the interface 
             void Shutdown();
 
+            void OnFrameBegin();
+
             //! CpuProfiler overrides...
             void BeginTimeRegion(TimeRegion& timeRegion) final;
             void EndTimeRegion() final;
-            void FlushTimeRegionMap(TimeRegionMap& timeRegionMap) final;
+            const TimeRegionMap& GetTimeRegionMap() const final;
             void SetProfilerEnabled(bool enabled) final;
             bool IsProfilerEnabled() const final;
 
@@ -104,8 +113,7 @@ namespace AZ
             void RegisterThreadStorage();
 
             // ThreadId -> ThreadTimeRegionMap
-            // When the user requests the cached time regions from the system, it will use this map as an intermediate
-            // storage point to flush each thread's cached regions into this map.
+            // On the start of each frame, this map will be updated with the last frame's profiling data. 
             TimeRegionMap m_timeRegionMap;
 
             // Set of registered threads when created
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/Device.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Device.h
index 80dc47081f..51f438ee74 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Device.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceBusTraits.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceBusTraits.h
index 0a420c38e3..d74dad6e30 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceBusTraits.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceBusTraits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceObject.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceObject.h
index e830098bf3..42e48b09c7 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceObject.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DispatchItem.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DispatchItem.h
index 27897ed704..10299413af 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DispatchItem.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DispatchItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DispatchRaysItem.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DispatchRaysItem.h
index 9d76a26629..d5e1c61057 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DispatchRaysItem.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DispatchRaysItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawFilterTagRegistry.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawFilterTagRegistry.h
index 7038e2e866..1555dbfc84 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawFilterTagRegistry.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawFilterTagRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawItem.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawItem.h
index dcc2e5fbce..f3b0df2b37 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawItem.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawList.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawList.h
index bfcdd0911c..0bfbc8fd59 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawList.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListContext.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListContext.h
index 135cc5f9f2..af5090c3dc 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListContext.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListTagRegistry.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListTagRegistry.h
index d7b35b0826..daba748dcb 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListTagRegistry.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawListTagRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacket.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacket.h
index d6b904a88b..e241bbc66e 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacket.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacketBuilder.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacketBuilder.h
index 4e686e723f..56a02531f5 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacketBuilder.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/DrawPacketBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h
index b9a52dc7aa..db8a927c71 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FactoryManagerBus.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FactoryManagerBus.h
index 66f0895e18..2aa3f280cb 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FactoryManagerBus.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FactoryManagerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Fence.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Fence.h
index 7425b5f04c..c87fbbe2cd 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Fence.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Fence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameAttachment.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameAttachment.h
index a82e48f134..b176f29b24 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameAttachment.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameEventBus.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameEventBus.h
index 1fe08ed925..e37fdbcafd 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameEventBus.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameEventBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraph.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraph.h
index 5c4157ab1e..da6e3eca01 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraph.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphAttachmentDatabase.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphAttachmentDatabase.h
index 64f1bcd635..ae750d2f9b 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphAttachmentDatabase.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphAttachmentDatabase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphAttachmentInterface.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphAttachmentInterface.h
index 95e4ebd725..f2a9dd6e2a 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphAttachmentInterface.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphAttachmentInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphBuilder.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphBuilder.h
index 9c375202ea..609afc38f1 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphBuilder.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphCompileContext.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphCompileContext.h
index 4cd0fd1678..85e49b053b 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphCompileContext.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphCompileContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphCompiler.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphCompiler.h
index b6d4755050..a56c73b90b 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphCompiler.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuteContext.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuteContext.h
index 3be7231819..0add1f4b71 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuteContext.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuteContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuteGroup.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuteGroup.h
index 6087da0503..786376b727 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuteGroup.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuteGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuter.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuter.h
index bc42f73a6c..caa0273b6a 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuter.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphExecuter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphInterface.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphInterface.h
index bf51d5d76c..51e7bb501e 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphInterface.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphLogger.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphLogger.h
index 3e9faab546..907013bf66 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphLogger.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameGraphLogger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameScheduler.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameScheduler.h
index c8b3e39dd0..2dc6159485 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameScheduler.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FrameScheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/FreeListAllocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/FreeListAllocator.h
index cf17192f37..ce57158688 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/FreeListAllocator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/FreeListAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Image.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Image.h
index 8f759ac613..923bc6492c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Image.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageFrameAttachment.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageFrameAttachment.h
index 0dcb660cca..756f068ec4 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageFrameAttachment.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageFrameAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ImagePool.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImagePool.h
index cfc8300126..c34ba7ecde 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ImagePool.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ImagePoolBase.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImagePoolBase.h
index c56cbea3c0..a15f86f7cb 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ImagePoolBase.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImagePoolBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageProperty.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageProperty.h
index 21657f2858..d995dac84c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageProperty.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageProperty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageScopeAttachment.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageScopeAttachment.h
index fdd1b75908..e77c7c253f 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageScopeAttachment.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageScopeAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageView.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageView.h
index bdbe9d9e78..9bd4f77c3e 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageView.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ImageView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
index 4f0a149e28..caaca6854b 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectArguments.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectArguments.h
index e8b7d33e7c..b38cd53827 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectArguments.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectArguments.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferSignature.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferSignature.h
index 3e47876332..2f867ab7a1 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferSignature.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferSignature.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferView.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferView.h
index 7ad3bc650e..df77d86bc9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferView.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferWriter.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferWriter.h
index 03ee992aa4..c26cd8d5f0 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferWriter.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectBufferWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/LinearAllocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/LinearAllocator.h
index 1531c8c934..240166b224 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/LinearAllocator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/LinearAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryAllocation.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryAllocation.h
index 43022db9c8..0c256f9767 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryAllocation.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryAllocation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryLinearSubAllocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryLinearSubAllocator.h
index eff1c527b7..2fcbeac9ea 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryLinearSubAllocator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryLinearSubAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryStatisticsBuilder.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryStatisticsBuilder.h
index fb2968df28..87dda52c5a 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryStatisticsBuilder.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryStatisticsBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryStatisticsBus.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryStatisticsBus.h
index 86b176393f..3acf535436 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryStatisticsBus.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemoryStatisticsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h
index de1d85ff50..a6009afac0 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Object.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Object.h
index cc67df3da6..5756db9338 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Object.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Object.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCache.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCache.h
index 00d1b1a794..3ecc93d0bd 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCache.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCollector.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCollector.h
index 4d4868f992..d49390ca43 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCollector.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCollector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectPool.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectPool.h
index ee31353c22..b902a4c68a 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectPool.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/PhysicalDevice.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/PhysicalDevice.h
index 82906ac3f6..1ce634b1bc 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/PhysicalDevice.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/PhysicalDevice.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineLibrary.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineLibrary.h
index ab72f52288..da381fe5d0 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineLibrary.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineState.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineState.h
index 70b4dfa711..552d6f6e80 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineState.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineStateCache.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineStateCache.h
index 7c843b9d2d..0dd105f9db 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineStateCache.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineStateCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineStateDescriptor.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineStateDescriptor.h
index dfae5292a6..fa4ff19ed0 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineStateDescriptor.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/PipelineStateDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/PoolAllocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/PoolAllocator.h
index 1355729f1a..76b1804bad 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/PoolAllocator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/PoolAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Query.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Query.h
index 7626671a6b..1a9a0c3f04 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Query.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/QueryPool.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/QueryPool.h
index c0a0c2c92b..9366bacc0c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/QueryPool.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/QueryPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/QueryPoolSubAllocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/QueryPoolSubAllocator.h
index 68805ce02e..28660cca41 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/QueryPoolSubAllocator.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/QueryPoolSubAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystem.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystem.h
index 1c8f0e92d1..eb622a6868 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystem.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystemInterface.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystemInterface.h
index 24855acb91..9123d53344 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystemInterface.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHISystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/RHIUtils.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHIUtils.h
index 4bbcf69a2b..0d3223b8a9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RHIUtils.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHIUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingAccelerationStructure.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingAccelerationStructure.h
index 1fee256e9a..031623eca3 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingAccelerationStructure.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingAccelerationStructure.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingBufferPools.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingBufferPools.h
index ce491363fd..cd2b1c2b16 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingBufferPools.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingBufferPools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingPipelineState.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingPipelineState.h
index 41d1e16965..225dcadad1 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingPipelineState.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingPipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingShaderTable.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingShaderTable.h
index eb7e153f48..9f4308f738 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingShaderTable.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingShaderTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ResolveScopeAttachment.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResolveScopeAttachment.h
index 1d2fc39593..c2ade28faf 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ResolveScopeAttachment.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResolveScopeAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Resource.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Resource.h
index ce6d97b980..18fd475216 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Resource.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourceInvalidateBus.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourceInvalidateBus.h
index eaee9bed83..214b133c71 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourceInvalidateBus.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourceInvalidateBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourcePool.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourcePool.h
index 8a79b9bea7..d0359f05b8 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourcePool.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourcePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourcePoolDatabase.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourcePoolDatabase.h
index 3fd900c2fb..88f260e0d5 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourcePoolDatabase.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourcePoolDatabase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourceView.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourceView.h
index 1f4c45f297..551044dd61 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourceView.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ResourceView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/Scope.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Scope.h
index 6c417a3958..d876df3ead 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Scope.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Scope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeAttachment.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeAttachment.h
index 28c72ddcc0..175a108ca9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeAttachment.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducer.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducer.h
index 4119cdaf02..ac0190914c 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducer.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducerEmpty.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducerEmpty.h
index 7668fa0b90..e9d2cba1b3 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducerEmpty.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducerEmpty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducerFunction.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducerFunction.h
index e8bba114ae..de6799e0f8 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducerFunction.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ScopeProducerFunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroup.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroup.h
index 9b42041045..f0ae4d42a9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroup.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupData.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupData.h
index 3244017019..a145ba7ece 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupData.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupInvalidateRegistry.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupInvalidateRegistry.h
index b4e9edc30d..fcd8a88484 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupInvalidateRegistry.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupInvalidateRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupPool.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupPool.h
index 2f87c63dc8..2bf2267dcd 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupPool.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/StreamBufferView.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/StreamBufferView.h
index e7cdc3be68..e036cbdde9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/StreamBufferView.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/StreamBufferView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/StreamingImagePool.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/StreamingImagePool.h
index f91abdd455..da99e0bec8 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/StreamingImagePool.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/StreamingImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChain.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChain.h
index 01f2a6eb40..ae4c0dce57 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChain.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChainFrameAttachment.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChainFrameAttachment.h
index e9547b0612..1a7e581d9b 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChainFrameAttachment.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChainFrameAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/TagRegistry.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/TagRegistry.h
index 62f5d1531d..06b66271ae 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/TagRegistry.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/TagRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ThreadLocalContext.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ThreadLocalContext.h
index 2c5777cc8d..9c1d4b85bf 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ThreadLocalContext.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ThreadLocalContext.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/TransientAttachmentPool.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/TransientAttachmentPool.h
index d635f6cae8..bca1f9f589 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/TransientAttachmentPool.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/TransientAttachmentPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/ValidationLayer.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ValidationLayer.h
index 1b1a30238f..a0ec991403 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ValidationLayer.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ValidationLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Include/Atom/RHI/interval_map.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/interval_map.h
index 6128180fb1..8f29203ed9 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/interval_map.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/interval_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Platform/Android/AtomRHITests_traits_android.cmake b/Gems/Atom/RHI/Code/Platform/Android/AtomRHITests_traits_android.cmake
index 2fec784677..b4574aef44 100644
--- a/Gems/Atom/RHI/Code/Platform/Android/AtomRHITests_traits_android.cmake
+++ b/Gems/Atom/RHI/Code/Platform/Android/AtomRHITests_traits_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/Platform/AppleTV/AtomRHITests_traits_appletv.cmake b/Gems/Atom/RHI/Code/Platform/AppleTV/AtomRHITests_traits_appletv.cmake
index 2fec784677..b4574aef44 100644
--- a/Gems/Atom/RHI/Code/Platform/AppleTV/AtomRHITests_traits_appletv.cmake
+++ b/Gems/Atom/RHI/Code/Platform/AppleTV/AtomRHITests_traits_appletv.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/Platform/Linux/AtomRHITests_traits_linux.cmake b/Gems/Atom/RHI/Code/Platform/Linux/AtomRHITests_traits_linux.cmake
index fba810177d..71f8932415 100644
--- a/Gems/Atom/RHI/Code/Platform/Linux/AtomRHITests_traits_linux.cmake
+++ b/Gems/Atom/RHI/Code/Platform/Linux/AtomRHITests_traits_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/Platform/Mac/AtomRHITests_traits_mac.cmake b/Gems/Atom/RHI/Code/Platform/Mac/AtomRHITests_traits_mac.cmake
index 62b155d29a..e9e9e34f44 100644
--- a/Gems/Atom/RHI/Code/Platform/Mac/AtomRHITests_traits_mac.cmake
+++ b/Gems/Atom/RHI/Code/Platform/Mac/AtomRHITests_traits_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/Platform/Windows/AtomRHITests_traits_windows.cmake b/Gems/Atom/RHI/Code/Platform/Windows/AtomRHITests_traits_windows.cmake
index 62b155d29a..e9e9e34f44 100644
--- a/Gems/Atom/RHI/Code/Platform/Windows/AtomRHITests_traits_windows.cmake
+++ b/Gems/Atom/RHI/Code/Platform/Windows/AtomRHITests_traits_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/Platform/iOS/AtomRHITests_traits_ios.cmake b/Gems/Atom/RHI/Code/Platform/iOS/AtomRHITests_traits_ios.cmake
index 2fec784677..b4574aef44 100644
--- a/Gems/Atom/RHI/Code/Platform/iOS/AtomRHITests_traits_ios.cmake
+++ b/Gems/Atom/RHI/Code/Platform/iOS/AtomRHITests_traits_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/Source/Module.cpp b/Gems/Atom/RHI/Code/Source/Module.cpp
index 1a7a4d21c2..96582191aa 100644
--- a/Gems/Atom/RHI/Code/Source/Module.cpp
+++ b/Gems/Atom/RHI/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Edit/ShaderCompilerArguments.cpp b/Gems/Atom/RHI/Code/Source/RHI.Edit/ShaderCompilerArguments.cpp
index 38f75b63a5..0801101178 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Edit/ShaderCompilerArguments.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Edit/ShaderCompilerArguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp b/Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp
index 8bda37b12f..c6f7485bd2 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.cpp b/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.cpp
index 49acf2f346..70ff7cad7a 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.h b/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.h
index fe328c3550..f8199617f6 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.h
+++ b/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryRegistrationFinalizerSystemComponent.cpp b/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryRegistrationFinalizerSystemComponent.cpp
index d057b2f318..c3baa6a96a 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryRegistrationFinalizerSystemComponent.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryRegistrationFinalizerSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryRegistrationFinalizerSystemComponent.h b/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryRegistrationFinalizerSystemComponent.h
index eab098d513..1c0faacd5b 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryRegistrationFinalizerSystemComponent.h
+++ b/Gems/Atom/RHI/Code/Source/RHI.Private/FactoryRegistrationFinalizerSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/AliasedHeapEnums.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/AliasedHeapEnums.cpp
index 00e6ebc039..9e426aeb51 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/AliasedHeapEnums.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/AliasedHeapEnums.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/AttachmentEnums.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/AttachmentEnums.cpp
index 3bccece123..18d473aa28 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/AttachmentEnums.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/AttachmentEnums.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/AttachmentLoadStoreAction.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/AttachmentLoadStoreAction.cpp
index 5a25717736..90db8794f6 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/AttachmentLoadStoreAction.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/AttachmentLoadStoreAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/Base.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Base.cpp
index 9cde1f22b3..fd7ba57b2a 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/Base.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferDescriptor.cpp
index 5c6f45bded..26018a7f85 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
index 8c8f257bd9..2eda20e69f 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferScopeAttachmentDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferScopeAttachmentDescriptor.cpp
index 6076a9c1ed..fa4266596e 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferScopeAttachmentDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferScopeAttachmentDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferViewDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferViewDescriptor.cpp
index 99ac4e5c91..cc20d42da6 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferViewDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/BufferViewDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ClearValue.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ClearValue.cpp
index e5cb394590..f6a4d365ec 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ClearValue.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ClearValue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ConstantsLayout.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ConstantsLayout.cpp
index 997137569e..3f9d9d9d63 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ConstantsLayout.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ConstantsLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/DeviceDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/DeviceDescriptor.cpp
index 8449c34324..7e246c1bdd 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/DeviceDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/DeviceDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/Format.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Format.cpp
index 17dbba1933..0ba4518f55 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/Format.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Format.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageDescriptor.cpp
index 55ea882bcd..ff28ff39a0 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImagePoolDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImagePoolDescriptor.cpp
index 9baf3c7d4b..b8a8cd25db 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImagePoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImagePoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageScopeAttachmentDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageScopeAttachmentDescriptor.cpp
index 8132d0a4d1..4e1e8c9fe5 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageScopeAttachmentDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageScopeAttachmentDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp
index 8b6e96183d..c21f2f3d8d 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageViewDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageViewDescriptor.cpp
index 372c1fe1c8..913808bb06 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageViewDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageViewDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/IndirectBufferLayout.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/IndirectBufferLayout.cpp
index 837f23ab7b..f7adfbee0f 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/IndirectBufferLayout.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/IndirectBufferLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/InputStreamLayout.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/InputStreamLayout.cpp
index 8c6745e8fd..f49ee9d083 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/InputStreamLayout.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/InputStreamLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/InputStreamLayoutBuilder.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/InputStreamLayoutBuilder.cpp
index 0ab6a179bb..3fecf6328c 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/InputStreamLayoutBuilder.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/InputStreamLayoutBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/Interval.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Interval.cpp
index f21904fdc8..45fae89f0a 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/Interval.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Interval.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/MemoryUsage.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/MemoryUsage.cpp
index 36923d0bfc..e52361761c 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/MemoryUsage.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/MemoryUsage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/MultisampleState.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/MultisampleState.cpp
index 6142d9e62b..92448e9cce 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/MultisampleState.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/MultisampleState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/Origin.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Origin.cpp
index 523dfa185b..ee49180793 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/Origin.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Origin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDescriptor.cpp
index 417cf06d5a..629f689c2e 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDriverInfoSerializer.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDriverInfoSerializer.cpp
index ce76d1d384..5866c2c151 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDriverInfoSerializer.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDriverInfoSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
index 999c66e9ad..24f993ef29 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/PipelineLibraryData.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PipelineLibraryData.cpp
index aac99dbe7b..6d8755cb0e 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/PipelineLibraryData.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PipelineLibraryData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
index e98df4284c..3fd6e1fe81 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/QueryPoolDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/QueryPoolDescriptor.cpp
index ee6bdc93b1..aafb7f0a3e 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/QueryPoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/QueryPoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/RHISystemDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/RHISystemDescriptor.cpp
index be159b8bf5..365ef7e53c 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/RHISystemDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/RHISystemDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
index bf3d7e0f9d..0ebd22135b 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderAttachmentLayout.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderAttachmentLayout.cpp
index 35125f32f7..3dbcb62268 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderAttachmentLayout.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderAttachmentLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderAttachmentLayoutBuilder.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderAttachmentLayoutBuilder.cpp
index 532b458e93..40e828c794 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderAttachmentLayoutBuilder.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderAttachmentLayoutBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderStates.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderStates.cpp
index 23d2380962..3566645fc5 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderStates.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/RenderStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ResolveScopeAttachmentDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ResolveScopeAttachmentDescriptor.cpp
index 30214359e8..68411ef1e5 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ResolveScopeAttachmentDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ResolveScopeAttachmentDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ResourcePoolDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ResourcePoolDescriptor.cpp
index 5e27042a34..4d20571a4d 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ResourcePoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ResourcePoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/SamplerState.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/SamplerState.cpp
index 87d5030b50..c422fb4eab 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/SamplerState.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/SamplerState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/Scissor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Scissor.cpp
index f033900ed2..fffd48bb30 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/Scissor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Scissor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ScopeAttachmentDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ScopeAttachmentDescriptor.cpp
index 512acb5ab1..570d6afaf3 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ScopeAttachmentDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ScopeAttachmentDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderDataMappings.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderDataMappings.cpp
index aa0b21b60e..09496bce20 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderDataMappings.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderDataMappings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderInputNameIndex.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderInputNameIndex.cpp
index 2fb68d51e0..fffb28f7dd 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderInputNameIndex.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderInputNameIndex.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupLayout.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupLayout.cpp
index 4b1fd4b241..00d639727d 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupLayout.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.cpp
index 131c1d4dad..bd18bca4af 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupPoolDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupPoolDescriptor.cpp
index c6e4ef7d9b..c29f42436c 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupPoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderResourceGroupPoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderSemantic.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderSemantic.cpp
index b82270ba53..52816632f3 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderSemantic.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderSemantic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderStageFunction.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
index 7444db915f..8e34550078 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/Size.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Size.cpp
index 0bca391834..54189ec233 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/Size.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Size.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/StreamingImagePoolDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/StreamingImagePoolDescriptor.cpp
index f1eb22327b..8678d08e7b 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/StreamingImagePoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/StreamingImagePoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/SwapChainDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/SwapChainDescriptor.cpp
index c42cddc453..dc8fbdb154 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/SwapChainDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/SwapChainDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/TransientBufferDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/TransientBufferDescriptor.cpp
index df8f783e28..65bdfc1619 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/TransientBufferDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/TransientBufferDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/TransientImageDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/TransientImageDescriptor.cpp
index c74ea53eef..3ee1a49abd 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/TransientImageDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/TransientImageDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/UnifiedAttachmentDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/UnifiedAttachmentDescriptor.cpp
index f0c4e23ee2..4d373711ea 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/UnifiedAttachmentDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/UnifiedAttachmentDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/UnifiedScopeAttachmentDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/UnifiedScopeAttachmentDescriptor.cpp
index 20611f4ffe..e9a37b4332 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/UnifiedScopeAttachmentDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/UnifiedScopeAttachmentDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI.Reflect/Viewport.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Viewport.cpp
index a857bca565..3419dc3f92 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/Viewport.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/Viewport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp
index fcc11c9a4c..ff73988cd7 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/Code/Source/RHI/AliasingBarrierTracker.cpp
index a48b55ba0e..21ec6892f2 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/AliasingBarrierTracker.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/AliasingBarrierTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Allocator.cpp b/Gems/Atom/RHI/Code/Source/RHI/Allocator.cpp
index 599c78c079..7ab0d2d602 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Allocator.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Allocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/AsyncWorkQueue.cpp b/Gems/Atom/RHI/Code/Source/RHI/AsyncWorkQueue.cpp
index 1a24422b36..7771ec9a3f 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/AsyncWorkQueue.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/AsyncWorkQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Code/Source/RHI/Buffer.cpp
index 7d201808c5..a264c23917 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Buffer.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/BufferFrameAttachment.cpp b/Gems/Atom/RHI/Code/Source/RHI/BufferFrameAttachment.cpp
index dd7283375d..f0f68f659b 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/BufferFrameAttachment.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/BufferFrameAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp
index e47ec9c1d5..ceea0307e4 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/BufferPoolBase.cpp b/Gems/Atom/RHI/Code/Source/RHI/BufferPoolBase.cpp
index 4a15bc3976..44f60fba69 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/BufferPoolBase.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/BufferPoolBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/BufferScopeAttachment.cpp b/Gems/Atom/RHI/Code/Source/RHI/BufferScopeAttachment.cpp
index 7250fc944f..beba702d47 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/BufferScopeAttachment.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/BufferScopeAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Code/Source/RHI/BufferView.cpp
index 774e5efd0c..166c82b615 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/BufferView.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/BufferView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Code/Source/RHI/CommandList.cpp
index d74f257711..32cf3f61f0 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/CommandList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp b/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp
index 406ca5325b..cbe5e81c51 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp
index da21370ccf..0b6d5bcfb4 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ConstantsData.cpp b/Gems/Atom/RHI/Code/Source/RHI/ConstantsData.cpp
index ef23fc3c73..e00896d44e 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ConstantsData.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ConstantsData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/CpuProfilerImpl.cpp b/Gems/Atom/RHI/Code/Source/RHI/CpuProfilerImpl.cpp
index 12690b3ba9..a69ad3f3af 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/CpuProfilerImpl.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/CpuProfilerImpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,6 +11,7 @@
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 
 #include <AzCore/Debug/Timer.h>
+#include <Atom/RHI/RHIUtils.h>
 
 namespace AZ
 {
@@ -78,6 +79,8 @@ namespace AZ
         {
             Interface<CpuProfiler>::Register(this);
             m_initialized = true;
+            Device* rhiDevice = GetRHIDevice().get();
+            FrameEventBus::Handler::BusConnect(rhiDevice);
         }
 
         void CpuProfilerImpl::Shutdown()
@@ -98,6 +101,7 @@ namespace AZ
             m_registeredThreads.clear();
             m_timeRegionMap.clear();
             m_initialized = false;
+            FrameEventBus::Handler::BusDisconnect();
         }
 
         void CpuProfilerImpl::BeginTimeRegion(TimeRegion& timeRegion)
@@ -132,26 +136,9 @@ namespace AZ
             }
         }
 
-        void CpuProfilerImpl::FlushTimeRegionMap(TimeRegionMap& timeRegionMap)
+        const CpuProfiler::TimeRegionMap& CpuProfilerImpl::GetTimeRegionMap() const 
         {
-            AZStd::unique_lock<AZStd::mutex> lock(m_threadRegisterMutex);
-
-            // Iterate through all the threads, and collect the thread's cached time regions
-            for (auto& threadLocal : m_registeredThreads)
-            {
-                CpuProfiler::ThreadTimeRegionMap& threadMapEntry = m_timeRegionMap[threadLocal->m_executingThreadId];
-                threadLocal->TryFlushCachedMap(threadMapEntry);
-            }
-
-            // Clear all TLS that flagged themselves to be deleted, meaning that the thread is already terminated
-            AZStd::remove_if(m_registeredThreads.begin(), m_registeredThreads.end(), [](const RHI::Ptr<CpuTimingLocalStorage>& thread)
-            {
-                return thread->m_deleteFlag.load();
-            });
-
-            // Flush all the cached time regions to the provided map
-            timeRegionMap = AZStd::move(m_timeRegionMap);
-            m_timeRegionMap.clear();
+            return m_timeRegionMap;
         }
 
         void CpuProfilerImpl::SetProfilerEnabled(bool enabled)
@@ -186,6 +173,32 @@ namespace AZ
             return m_enabled;
         }
 
+        void CpuProfilerImpl::OnFrameBegin()
+        {
+            if (!m_enabled)
+            {
+                return;
+            }
+            AZStd::unique_lock<AZStd::mutex> lock(m_threadRegisterMutex);
+
+            // Iterate through all the threads, and collect the thread's cached time regions
+            TimeRegionMap newMap;
+            for (auto& threadLocal : m_registeredThreads)
+            {
+                ThreadTimeRegionMap& threadMapEntry = newMap[threadLocal->m_executingThreadId];
+                threadLocal->TryFlushCachedMap(threadMapEntry);
+            }
+
+            // Clear all TLS that flagged themselves to be deleted, meaning that the thread is already terminated
+            AZStd::remove_if(m_registeredThreads.begin(), m_registeredThreads.end(), [](const RHI::Ptr<CpuTimingLocalStorage>& thread)
+            {
+                return thread->m_deleteFlag.load();
+            });
+
+            // Update our saved time regions to the last frame's collected data
+            m_timeRegionMap = AZStd::move(newMap);
+        }
+
 
         void CpuProfilerImpl::RegisterThreadStorage()
         {
@@ -261,6 +274,10 @@ namespace AZ
         // Gets called when region ends and all data is set
         void CpuTimingLocalStorage::AddCachedRegion(CachedTimeRegion&& timeRegionCached)
         {
+            if (m_hitSizeLimitMap[timeRegionCached.m_groupRegionName->m_regionName])
+            {
+                return;
+            }
             // Add an entry to the cached region
             m_cachedTimeRegions.push_back(timeRegionCached);
 
@@ -276,7 +293,13 @@ namespace AZ
                 // Add the cached regions to the map
                 for (auto& cachedTimeRegion : m_cachedTimeRegions)
                 {
-                    m_cachedTimeRegionMap[cachedTimeRegion.m_groupRegionName->m_regionName] = cachedTimeRegion;
+                    const AZStd::string regionName = cachedTimeRegion.m_groupRegionName->m_regionName;
+                    AZStd::vector<CachedTimeRegion>& regionVec = m_cachedTimeRegionMap[regionName];
+                    regionVec.push_back(cachedTimeRegion);
+                    if (regionVec.size() >= TimeRegionStackSize)
+                    {
+                        m_hitSizeLimitMap[cachedTimeRegion.m_groupRegionName->m_regionName] = true;
+                    }
                 }
 
                 // Clear the cached regions
@@ -295,6 +318,7 @@ namespace AZ
                 {
                     cachedTimeRegionMap = AZStd::move(m_cachedTimeRegionMap);
                     m_cachedTimeRegionMap.clear();
+                    m_hitSizeLimitMap.clear();
                 }
                 m_cachedTimeRegionMutex.unlock();
             }
diff --git a/Gems/Atom/RHI/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Code/Source/RHI/Device.cpp
index 2a2bbac41e..9893bd2443 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Device.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/DeviceObject.cpp b/Gems/Atom/RHI/Code/Source/RHI/DeviceObject.cpp
index c52799663d..81098d4a0c 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DeviceObject.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DeviceObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/DrawList.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawList.cpp
index 495d3e355e..26d516e6fb 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawList.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DrawList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/DrawListContext.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawListContext.cpp
index e8408e650c..0898a4e35d 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawListContext.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DrawListContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/DrawPacket.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawPacket.cpp
index b471a33db9..a04e6633ec 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawPacket.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DrawPacket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/DrawPacketBuilder.cpp b/Gems/Atom/RHI/Code/Source/RHI/DrawPacketBuilder.cpp
index babf1f3351..855b567ee2 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/DrawPacketBuilder.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/DrawPacketBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp
index cb3e79bc4b..b26a8caf5f 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/Code/Source/RHI/Fence.cpp
index faf12345f7..4beac51457 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Fence.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Fence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameAttachment.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameAttachment.cpp
index 19d0a425f5..21dc74d176 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameAttachment.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp
index 82675d6469..133035aca7 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp
index 722462c8ae..f995197b2c 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompileContext.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompileContext.cpp
index 2eb15dfc50..64d3f40669 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompileContext.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompileContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp
index 3b391721ee..e017a3c57f 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuteContext.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuteContext.cpp
index 806f089930..64d20d24a6 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuteContext.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuteContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuteGroup.cpp
index bdd3bd2397..f8bebb3248 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuteGroup.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuteGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp
index 5c7bff7dfe..c51287cfc2 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp
index 062179f0fe..f372480df8 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp
index 633cfa3e29..72cc167b32 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/FreeListAllocator.cpp b/Gems/Atom/RHI/Code/Source/RHI/FreeListAllocator.cpp
index 1c4d565845..f092417712 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FreeListAllocator.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FreeListAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Code/Source/RHI/Image.cpp
index d303cf2cbd..d185659a7f 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Image.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ImageFrameAttachment.cpp b/Gems/Atom/RHI/Code/Source/RHI/ImageFrameAttachment.cpp
index 3d7fe53e75..f524626466 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ImageFrameAttachment.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ImageFrameAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Code/Source/RHI/ImagePool.cpp
index 6e2d5560c2..92ac8d7fec 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ImagePool.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ImagePoolBase.cpp b/Gems/Atom/RHI/Code/Source/RHI/ImagePoolBase.cpp
index 58eb24864c..62f00bf9d2 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ImagePoolBase.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ImagePoolBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ImageScopeAttachment.cpp b/Gems/Atom/RHI/Code/Source/RHI/ImageScopeAttachment.cpp
index b0e9c59db5..b780d01405 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ImageScopeAttachment.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ImageScopeAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Code/Source/RHI/ImageView.cpp
index 001a41b106..f62b9ae296 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ImageView.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ImageView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/IndexBufferView.cpp b/Gems/Atom/RHI/Code/Source/RHI/IndexBufferView.cpp
index b55ebc9f2c..a3bee1b2cc 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/IndexBufferView.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/IndexBufferView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferSignature.cpp b/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferSignature.cpp
index 9658bd6cae..2e333570e3 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferSignature.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferSignature.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferView.cpp b/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferView.cpp
index c7638baf78..5416ffda06 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferView.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferWriter.cpp b/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferWriter.cpp
index bd8a69a4d7..2674ee5e4c 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferWriter.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/IndirectBufferWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/LinearAllocator.cpp b/Gems/Atom/RHI/Code/Source/RHI/LinearAllocator.cpp
index f45c79b2a8..72a20d5900 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/LinearAllocator.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/LinearAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/MemoryStatisticsBuilder.cpp b/Gems/Atom/RHI/Code/Source/RHI/MemoryStatisticsBuilder.cpp
index 547fc084bb..90f2a6d4aa 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/MemoryStatisticsBuilder.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/MemoryStatisticsBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Object.cpp b/Gems/Atom/RHI/Code/Source/RHI/Object.cpp
index b6cb2f8977..a398807f19 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Object.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Object.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Code/Source/RHI/PhysicalDevice.cpp
index 32d9d82efb..e10449c689 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/PhysicalDevice.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/PhysicalDevice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Code/Source/RHI/PipelineLibrary.cpp
index f653424c6e..8acfabe975 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/PipelineLibrary.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/PipelineLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Code/Source/RHI/PipelineState.cpp
index dddd9dba75..5a6070cd73 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/PipelineState.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/PipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/PipelineStateCache.cpp b/Gems/Atom/RHI/Code/Source/RHI/PipelineStateCache.cpp
index 9b87463cbb..49a4291316 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/PipelineStateCache.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/PipelineStateCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/PipelineStateDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI/PipelineStateDescriptor.cpp
index ae32f644d8..5719b3e06c 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/PipelineStateDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/PipelineStateDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/PoolAllocator.cpp b/Gems/Atom/RHI/Code/Source/RHI/PoolAllocator.cpp
index 4065982540..4c1d840463 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/PoolAllocator.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/PoolAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Code/Source/RHI/Query.cpp
index fbe7f11404..23b73cfcef 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Query.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Query.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Code/Source/RHI/QueryPool.cpp
index dcd42698b6..3155f038d8 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/QueryPool.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/QueryPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/QueryPoolSubAllocator.cpp b/Gems/Atom/RHI/Code/Source/RHI/QueryPoolSubAllocator.cpp
index 10295d5c6a..66464e75ce 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/QueryPoolSubAllocator.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/QueryPoolSubAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp b/Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp
index 457551529e..8d03d107ff 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/RHIUtils.cpp b/Gems/Atom/RHI/Code/Source/RHI/RHIUtils.cpp
index 8063c6d112..1ce512ef97 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/RHIUtils.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/RHIUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/RayTracingAccelerationStructure.cpp b/Gems/Atom/RHI/Code/Source/RHI/RayTracingAccelerationStructure.cpp
index a7f56a8538..717cddb8bc 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/RayTracingAccelerationStructure.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/RayTracingAccelerationStructure.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/RayTracingBufferPools.cpp b/Gems/Atom/RHI/Code/Source/RHI/RayTracingBufferPools.cpp
index 3f618ca56f..9db074e874 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/RayTracingBufferPools.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/RayTracingBufferPools.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/Code/Source/RHI/RayTracingPipelineState.cpp
index bc3e9825b3..5e5932456e 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/RayTracingPipelineState.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/RayTracingPipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/Code/Source/RHI/RayTracingShaderTable.cpp
index f848bbe4ab..0e8dd16da6 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/RayTracingShaderTable.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/RayTracingShaderTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ResolveScopeAttachment.cpp b/Gems/Atom/RHI/Code/Source/RHI/ResolveScopeAttachment.cpp
index e762431e86..37b107cafa 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ResolveScopeAttachment.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ResolveScopeAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Resource.cpp b/Gems/Atom/RHI/Code/Source/RHI/Resource.cpp
index 6a9ed83b12..caa365a60b 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Resource.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Resource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ResourcePool.cpp b/Gems/Atom/RHI/Code/Source/RHI/ResourcePool.cpp
index 3b68f6b131..93c1d61d2d 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ResourcePool.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ResourcePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ResourcePoolDatabase.cpp b/Gems/Atom/RHI/Code/Source/RHI/ResourcePoolDatabase.cpp
index bb5df43cf5..10aefdb96b 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ResourcePoolDatabase.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ResourcePoolDatabase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp b/Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp
index a950468de3..e89811c928 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Code/Source/RHI/Scope.cpp
index 5835f6d660..c5197e85ce 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Scope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ScopeAttachment.cpp b/Gems/Atom/RHI/Code/Source/RHI/ScopeAttachment.cpp
index d7832eb3f9..6c532542de 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ScopeAttachment.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ScopeAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ScopeProducer.cpp b/Gems/Atom/RHI/Code/Source/RHI/ScopeProducer.cpp
index ad034ca265..9cb045d951 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ScopeProducer.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ScopeProducer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroup.cpp
index 2a48c02c20..c634230573 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
index 62fe481f71..f2b57bf1e5 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupInvalidateRegistry.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupInvalidateRegistry.cpp
index e8859713f4..1b9b19f7cc 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupInvalidateRegistry.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupInvalidateRegistry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 8da7c878e3..a771b5c7c0 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/StreamBufferView.cpp b/Gems/Atom/RHI/Code/Source/RHI/StreamBufferView.cpp
index 216275c5f9..0cdeb21b70 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/StreamBufferView.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/StreamBufferView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp
index 26790c299b..8b204dc492 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp
index 9a810546b6..5d1d938fc8 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/SwapChainFrameAttachment.cpp b/Gems/Atom/RHI/Code/Source/RHI/SwapChainFrameAttachment.cpp
index 2fb0951028..19f5bb401e 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/SwapChainFrameAttachment.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/SwapChainFrameAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Code/Source/RHI/TransientAttachmentPool.cpp
index 14f612e6e1..0fdc000b44 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/TransientAttachmentPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Source/RHI/ValidationLayer.cpp b/Gems/Atom/RHI/Code/Source/RHI/ValidationLayer.cpp
index c59722fe01..e1416e231b 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ValidationLayer.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ValidationLayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/AllocatorTests.cpp b/Gems/Atom/RHI/Code/Tests/AllocatorTests.cpp
index 039c598b0a..c2b25cf9d6 100644
--- a/Gems/Atom/RHI/Code/Tests/AllocatorTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/AllocatorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Buffer.cpp b/Gems/Atom/RHI/Code/Tests/Buffer.cpp
index 46f4335048..2870ff22ca 100644
--- a/Gems/Atom/RHI/Code/Tests/Buffer.cpp
+++ b/Gems/Atom/RHI/Code/Tests/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Buffer.h b/Gems/Atom/RHI/Code/Tests/Buffer.h
index 0356ce233d..a0b889335a 100644
--- a/Gems/Atom/RHI/Code/Tests/Buffer.h
+++ b/Gems/Atom/RHI/Code/Tests/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/BufferPropertyTests.cpp b/Gems/Atom/RHI/Code/Tests/BufferPropertyTests.cpp
index 15081b8a49..84c571d458 100644
--- a/Gems/Atom/RHI/Code/Tests/BufferPropertyTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/BufferPropertyTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/BufferTests.cpp b/Gems/Atom/RHI/Code/Tests/BufferTests.cpp
index 824a4e187f..d9e7116d1d 100644
--- a/Gems/Atom/RHI/Code/Tests/BufferTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/BufferTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/ContainerTests.cpp b/Gems/Atom/RHI/Code/Tests/ContainerTests.cpp
index 0cf7929441..cccc64ad7d 100644
--- a/Gems/Atom/RHI/Code/Tests/ContainerTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/ContainerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Device.cpp b/Gems/Atom/RHI/Code/Tests/Device.cpp
index f73e329ff1..2ae3e3e83d 100644
--- a/Gems/Atom/RHI/Code/Tests/Device.cpp
+++ b/Gems/Atom/RHI/Code/Tests/Device.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Device.h b/Gems/Atom/RHI/Code/Tests/Device.h
index aafecad858..d24bad8ba8 100644
--- a/Gems/Atom/RHI/Code/Tests/Device.h
+++ b/Gems/Atom/RHI/Code/Tests/Device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/DrawPacketTests.cpp b/Gems/Atom/RHI/Code/Tests/DrawPacketTests.cpp
index cac1731c64..8190960197 100644
--- a/Gems/Atom/RHI/Code/Tests/DrawPacketTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/DrawPacketTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Factory.cpp b/Gems/Atom/RHI/Code/Tests/Factory.cpp
index e3d411a735..46baf4856e 100644
--- a/Gems/Atom/RHI/Code/Tests/Factory.cpp
+++ b/Gems/Atom/RHI/Code/Tests/Factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Factory.h b/Gems/Atom/RHI/Code/Tests/Factory.h
index 9380e024ca..527bf7c25b 100644
--- a/Gems/Atom/RHI/Code/Tests/Factory.h
+++ b/Gems/Atom/RHI/Code/Tests/Factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/FrameGraph.cpp b/Gems/Atom/RHI/Code/Tests/FrameGraph.cpp
index 9152b4b43d..11ece85453 100644
--- a/Gems/Atom/RHI/Code/Tests/FrameGraph.cpp
+++ b/Gems/Atom/RHI/Code/Tests/FrameGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/FrameGraph.h b/Gems/Atom/RHI/Code/Tests/FrameGraph.h
index 8694e06926..aa9790f8e2 100644
--- a/Gems/Atom/RHI/Code/Tests/FrameGraph.h
+++ b/Gems/Atom/RHI/Code/Tests/FrameGraph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/FrameGraphTests.cpp b/Gems/Atom/RHI/Code/Tests/FrameGraphTests.cpp
index de6dbebee7..097b0f6477 100644
--- a/Gems/Atom/RHI/Code/Tests/FrameGraphTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/FrameGraphTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/FrameSchedulerTests.cpp b/Gems/Atom/RHI/Code/Tests/FrameSchedulerTests.cpp
index 2cbbb560cb..269e4e73c6 100644
--- a/Gems/Atom/RHI/Code/Tests/FrameSchedulerTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/FrameSchedulerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/HashingTests.cpp b/Gems/Atom/RHI/Code/Tests/HashingTests.cpp
index 2ac5621a50..034ba83f79 100644
--- a/Gems/Atom/RHI/Code/Tests/HashingTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/HashingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Image.cpp b/Gems/Atom/RHI/Code/Tests/Image.cpp
index 26c8286908..4962e55ca0 100644
--- a/Gems/Atom/RHI/Code/Tests/Image.cpp
+++ b/Gems/Atom/RHI/Code/Tests/Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Image.h b/Gems/Atom/RHI/Code/Tests/Image.h
index 23ed031609..0f31281a24 100644
--- a/Gems/Atom/RHI/Code/Tests/Image.h
+++ b/Gems/Atom/RHI/Code/Tests/Image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/ImagePropertyTests.cpp b/Gems/Atom/RHI/Code/Tests/ImagePropertyTests.cpp
index ce499e8f0f..1c2533a675 100644
--- a/Gems/Atom/RHI/Code/Tests/ImagePropertyTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/ImagePropertyTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/ImageTests.cpp b/Gems/Atom/RHI/Code/Tests/ImageTests.cpp
index 193cdd5ada..789ffe3245 100644
--- a/Gems/Atom/RHI/Code/Tests/ImageTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/ImageTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/IndirectBuffer.cpp b/Gems/Atom/RHI/Code/Tests/IndirectBuffer.cpp
index b9e9f3c477..e7cee1055b 100644
--- a/Gems/Atom/RHI/Code/Tests/IndirectBuffer.cpp
+++ b/Gems/Atom/RHI/Code/Tests/IndirectBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/IndirectBuffer.h b/Gems/Atom/RHI/Code/Tests/IndirectBuffer.h
index 97af947c84..a3e5adad54 100644
--- a/Gems/Atom/RHI/Code/Tests/IndirectBuffer.h
+++ b/Gems/Atom/RHI/Code/Tests/IndirectBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/IndirectBufferTests.cpp b/Gems/Atom/RHI/Code/Tests/IndirectBufferTests.cpp
index 2d6df37519..b63e9dc5e3 100644
--- a/Gems/Atom/RHI/Code/Tests/IndirectBufferTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/IndirectBufferTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/InputStreamLayoutBuilderTests.cpp b/Gems/Atom/RHI/Code/Tests/InputStreamLayoutBuilderTests.cpp
index 42274926cb..01313efff2 100644
--- a/Gems/Atom/RHI/Code/Tests/InputStreamLayoutBuilderTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/InputStreamLayoutBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/IntervalMapTests.cpp b/Gems/Atom/RHI/Code/Tests/IntervalMapTests.cpp
index a95918be8a..4ffdf515af 100644
--- a/Gems/Atom/RHI/Code/Tests/IntervalMapTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/IntervalMapTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/NameIdReflectionMapTests.cpp b/Gems/Atom/RHI/Code/Tests/NameIdReflectionMapTests.cpp
index c3e1713740..f69d7f3085 100644
--- a/Gems/Atom/RHI/Code/Tests/NameIdReflectionMapTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/NameIdReflectionMapTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/PipelineState.cpp b/Gems/Atom/RHI/Code/Tests/PipelineState.cpp
index 054cfdf79c..a566099ca0 100644
--- a/Gems/Atom/RHI/Code/Tests/PipelineState.cpp
+++ b/Gems/Atom/RHI/Code/Tests/PipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/PipelineState.h b/Gems/Atom/RHI/Code/Tests/PipelineState.h
index 559bd45336..bdb3269120 100644
--- a/Gems/Atom/RHI/Code/Tests/PipelineState.h
+++ b/Gems/Atom/RHI/Code/Tests/PipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/PipelineStateTests.cpp b/Gems/Atom/RHI/Code/Tests/PipelineStateTests.cpp
index 82fcf3ba15..712efca658 100644
--- a/Gems/Atom/RHI/Code/Tests/PipelineStateTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/PipelineStateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Query.cpp b/Gems/Atom/RHI/Code/Tests/Query.cpp
index f9751ee9a1..e6b3619544 100644
--- a/Gems/Atom/RHI/Code/Tests/Query.cpp
+++ b/Gems/Atom/RHI/Code/Tests/Query.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Query.h b/Gems/Atom/RHI/Code/Tests/Query.h
index 14140fd426..0e82c982ef 100644
--- a/Gems/Atom/RHI/Code/Tests/Query.h
+++ b/Gems/Atom/RHI/Code/Tests/Query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/QueryTests.cpp b/Gems/Atom/RHI/Code/Tests/QueryTests.cpp
index afdfdffc38..1b01750468 100644
--- a/Gems/Atom/RHI/Code/Tests/QueryTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/QueryTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/RHITestFixture.h b/Gems/Atom/RHI/Code/Tests/RHITestFixture.h
index 2b082cfe44..cab0d16f5d 100644
--- a/Gems/Atom/RHI/Code/Tests/RHITestFixture.h
+++ b/Gems/Atom/RHI/Code/Tests/RHITestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/RenderAttachmentLayoutBuilderTests.cpp b/Gems/Atom/RHI/Code/Tests/RenderAttachmentLayoutBuilderTests.cpp
index 9dd3e23530..35a75bf158 100644
--- a/Gems/Atom/RHI/Code/Tests/RenderAttachmentLayoutBuilderTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/RenderAttachmentLayoutBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Scope.cpp b/Gems/Atom/RHI/Code/Tests/Scope.cpp
index 7e382c9c94..e438f29292 100644
--- a/Gems/Atom/RHI/Code/Tests/Scope.cpp
+++ b/Gems/Atom/RHI/Code/Tests/Scope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/Scope.h b/Gems/Atom/RHI/Code/Tests/Scope.h
index d17b114e90..7931c2e435 100644
--- a/Gems/Atom/RHI/Code/Tests/Scope.h
+++ b/Gems/Atom/RHI/Code/Tests/Scope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Code/Tests/ShaderResourceGroup.cpp
index f8ad2bd666..2e405727c6 100644
--- a/Gems/Atom/RHI/Code/Tests/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Code/Tests/ShaderResourceGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/ShaderResourceGroup.h b/Gems/Atom/RHI/Code/Tests/ShaderResourceGroup.h
index 142085c0a3..86600bebb2 100644
--- a/Gems/Atom/RHI/Code/Tests/ShaderResourceGroup.h
+++ b/Gems/Atom/RHI/Code/Tests/ShaderResourceGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/ShaderResourceGroupTests.cpp b/Gems/Atom/RHI/Code/Tests/ShaderResourceGroupTests.cpp
index fd1a5c0f47..0f9045dedc 100644
--- a/Gems/Atom/RHI/Code/Tests/ShaderResourceGroupTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/ShaderResourceGroupTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/ThreadTester.cpp b/Gems/Atom/RHI/Code/Tests/ThreadTester.cpp
index dd36a4917b..67d2b4562c 100644
--- a/Gems/Atom/RHI/Code/Tests/ThreadTester.cpp
+++ b/Gems/Atom/RHI/Code/Tests/ThreadTester.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/ThreadTester.h b/Gems/Atom/RHI/Code/Tests/ThreadTester.h
index ff008e168c..4d6541198e 100644
--- a/Gems/Atom/RHI/Code/Tests/ThreadTester.h
+++ b/Gems/Atom/RHI/Code/Tests/ThreadTester.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Code/Tests/TransientAttachmentPool.cpp
index 098b418809..3f3a3f7c1f 100644
--- a/Gems/Atom/RHI/Code/Tests/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/Code/Tests/TransientAttachmentPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/TransientAttachmentPool.h b/Gems/Atom/RHI/Code/Tests/TransientAttachmentPool.h
index 12ee08e4c8..723137573f 100644
--- a/Gems/Atom/RHI/Code/Tests/TransientAttachmentPool.h
+++ b/Gems/Atom/RHI/Code/Tests/TransientAttachmentPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/Tests/UtilsTests.cpp b/Gems/Atom/RHI/Code/Tests/UtilsTests.cpp
index 26ec3314ca..2d034ad239 100644
--- a/Gems/Atom/RHI/Code/Tests/UtilsTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/UtilsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Code/atom_rhi_edit_files.cmake b/Gems/Atom/RHI/Code/atom_rhi_edit_files.cmake
index 34f84a04c0..cda2b4bdc4 100644
--- a/Gems/Atom/RHI/Code/atom_rhi_edit_files.cmake
+++ b/Gems/Atom/RHI/Code/atom_rhi_edit_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/atom_rhi_private_files.cmake b/Gems/Atom/RHI/Code/atom_rhi_private_files.cmake
index 2bc60a54e8..f3535c58d3 100644
--- a/Gems/Atom/RHI/Code/atom_rhi_private_files.cmake
+++ b/Gems/Atom/RHI/Code/atom_rhi_private_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/atom_rhi_private_shared_files.cmake b/Gems/Atom/RHI/Code/atom_rhi_private_shared_files.cmake
index a93f67afd8..c686bffbe2 100644
--- a/Gems/Atom/RHI/Code/atom_rhi_private_shared_files.cmake
+++ b/Gems/Atom/RHI/Code/atom_rhi_private_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/atom_rhi_public_files.cmake b/Gems/Atom/RHI/Code/atom_rhi_public_files.cmake
index 887bbb8ee5..b489cbbbb4 100644
--- a/Gems/Atom/RHI/Code/atom_rhi_public_files.cmake
+++ b/Gems/Atom/RHI/Code/atom_rhi_public_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/atom_rhi_reflect_files.cmake b/Gems/Atom/RHI/Code/atom_rhi_reflect_files.cmake
index 7e3e23fead..fb1d7dd1a6 100644
--- a/Gems/Atom/RHI/Code/atom_rhi_reflect_files.cmake
+++ b/Gems/Atom/RHI/Code/atom_rhi_reflect_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Code/atom_rhi_tests_files.cmake b/Gems/Atom/RHI/Code/atom_rhi_tests_files.cmake
index c55b948200..5766431c13 100644
--- a/Gems/Atom/RHI/Code/atom_rhi_tests_files.cmake
+++ b/Gems/Atom/RHI/Code/atom_rhi_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/3rdParty/Findaftermath.cmake b/Gems/Atom/RHI/DX12/3rdParty/Findaftermath.cmake
index 3b985fb8cf..195a6798e0 100644
--- a/Gems/Atom/RHI/DX12/3rdParty/Findaftermath.cmake
+++ b/Gems/Atom/RHI/DX12/3rdParty/Findaftermath.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/3rdParty/Findpix.cmake b/Gems/Atom/RHI/DX12/3rdParty/Findpix.cmake
index 9cd3ffef43..263c81f856 100644
--- a/Gems/Atom/RHI/DX12/3rdParty/Findpix.cmake
+++ b/Gems/Atom/RHI/DX12/3rdParty/Findpix.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/3rdParty/Platform/Windows/aftermath_windows.cmake b/Gems/Atom/RHI/DX12/3rdParty/Platform/Windows/aftermath_windows.cmake
index 0f6b12e0db..0bec630dcc 100644
--- a/Gems/Atom/RHI/DX12/3rdParty/Platform/Windows/aftermath_windows.cmake
+++ b/Gems/Atom/RHI/DX12/3rdParty/Platform/Windows/aftermath_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/3rdParty/Platform/Windows/pix_windows.cmake b/Gems/Atom/RHI/DX12/3rdParty/Platform/Windows/pix_windows.cmake
index 68c5ab716a..e3e0070caf 100644
--- a/Gems/Atom/RHI/DX12/3rdParty/Platform/Windows/pix_windows.cmake
+++ b/Gems/Atom/RHI/DX12/3rdParty/Platform/Windows/pix_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/CMakeLists.txt b/Gems/Atom/RHI/DX12/CMakeLists.txt
index 17a38640d2..b26ec54418 100644
--- a/Gems/Atom/RHI/DX12/CMakeLists.txt
+++ b/Gems/Atom/RHI/DX12/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/CMakeLists.txt b/Gems/Atom/RHI/DX12/Code/CMakeLists.txt
index a47c77b741..cb3c942287 100644
--- a/Gems/Atom/RHI/DX12/Code/CMakeLists.txt
+++ b/Gems/Atom/RHI/DX12/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/Base.h b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/Base.h
index f3c63ad655..611045d075 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/Base.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/Base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/BufferPoolDescriptor.h b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/BufferPoolDescriptor.h
index e536d5bd94..1fb01799a6 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/BufferPoolDescriptor.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/BufferPoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/PipelineLayoutDescriptor.h b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/PipelineLayoutDescriptor.h
index 54252b8e68..d7a8c6d224 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/PipelineLayoutDescriptor.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/PipelineLayoutDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/PlatformLimitsDescriptor.h b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/PlatformLimitsDescriptor.h
index 3ac9a515bd..42a8f6b096 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/PlatformLimitsDescriptor.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/PlatformLimitsDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/ReflectSystemComponent.h b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/ReflectSystemComponent.h
index 019154794b..e57b44ec37 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/ReflectSystemComponent.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/ReflectSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/ShaderStageFunction.h b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/ShaderStageFunction.h
index 7faf3567e8..b80161c10e 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/ShaderStageFunction.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Atom/RHI.Reflect/DX12/ShaderStageFunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Platform/Android/platform_reflect_android_files.cmake b/Gems/Atom/RHI/DX12/Code/Include/Platform/Android/platform_reflect_android_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Platform/Android/platform_reflect_android_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Include/Platform/Android/platform_reflect_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Include/Platform/Linux/platform_reflect_linux_files.cmake b/Gems/Atom/RHI/DX12/Code/Include/Platform/Linux/platform_reflect_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Platform/Linux/platform_reflect_linux_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Include/Platform/Linux/platform_reflect_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Include/Platform/Mac/Atom/RHI.Reflect/DX12/Base_Platform.h b/Gems/Atom/RHI/DX12/Code/Include/Platform/Mac/Atom/RHI.Reflect/DX12/Base_Platform.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Platform/Mac/Atom/RHI.Reflect/DX12/Base_Platform.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Platform/Mac/Atom/RHI.Reflect/DX12/Base_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Platform/Mac/platform_reflect_mac_files.cmake b/Gems/Atom/RHI/DX12/Code/Include/Platform/Mac/platform_reflect_mac_files.cmake
index 4769c04512..0012c0ed70 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Platform/Mac/platform_reflect_mac_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Include/Platform/Mac/platform_reflect_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/Atom/RHI.Reflect/DX12/Base_Platform.h b/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/Atom/RHI.Reflect/DX12/Base_Platform.h
index faa2e0ddbc..476ac27b05 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/Atom/RHI.Reflect/DX12/Base_Platform.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/Atom/RHI.Reflect/DX12/Base_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/Atom/RHI.Reflect/DX12/Base_Windows.h b/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/Atom/RHI.Reflect/DX12/Base_Windows.h
index e9a5c7776d..c7411bfac9 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/Atom/RHI.Reflect/DX12/Base_Windows.h
+++ b/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/Atom/RHI.Reflect/DX12/Base_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/platform_reflect_windows_files.cmake b/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/platform_reflect_windows_files.cmake
index 76d52e68fe..fb81fef0a3 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/platform_reflect_windows_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Include/Platform/Windows/platform_reflect_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Include/Platform/iOS/platform_reflect_ios_files.cmake b/Gems/Atom/RHI/DX12/Code/Include/Platform/iOS/platform_reflect_ios_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/DX12/Code/Include/Platform/iOS/platform_reflect_ios_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Include/Platform/iOS/platform_reflect_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Android/PAL_android.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Android/PAL_android.cmake
index cd8861c104..34efee6cad 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
index f1bf1dad4a..b5f2865135 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
index 75a6e54270..8fb2d1f1c8 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Linux/PAL_linux.cmake
index cd8861c104..34efee6cad 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Linux/platform_builders_linux_files.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/PAL_mac.cmake
index cd8861c104..34efee6cad 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/RHI.Builders/BuilderModule_Mac.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/RHI.Builders/BuilderModule_Mac.cpp
index b9cdd6f50f..28609898bf 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/RHI.Builders/BuilderModule_Mac.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/RHI.Builders/BuilderModule_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/platform_builders_mac_files.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
index 59d53b877d..24bdfc4c43 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/PAL_windows.cmake
index 445a023d61..d9c002db66 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Platform.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Platform.h
index 4deeda4c44..cd809494f7 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Platform.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp
index 5bf2de1dc4..0748b1707e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.h
index ceda412f3b..3ef4a14d67 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Platform.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Platform.h
index 1be553d534..2841be5027 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Platform.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp
index 914cc8459c..9372b32ea1 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 6240fb334f..fd88b08f04 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Platform.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Platform.h
index 796140466b..a125749827 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Platform.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp
index fe5dd5edd4..07ba90336f 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.h
index fdb58b2183..e161a1afff 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp
index 19e5958d0d..5d80372c10 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.h
index bdd0c8cbcf..509f9849a3 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathHelpers.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathHelpers.h
index bf1a96877e..3243ad0a73 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathHelpers.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
index 08522c32e4..5b9341d972 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Platform.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Platform.h
index 7dab818cb5..8891f4a59a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Platform.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp
index 6d6ce42f71..111920594e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h
index 3d6201090f..c0916a84ee 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp
index c05fddf457..10678bafaa 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp
index d50d700686..6e8657c1ca 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp
index db78f3aff0..ce5a25540f 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h
index b355a23970..fc3773c4de 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_builders_windows_files.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
index 96a72e2072..730e96f6aa 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_private_windows.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_private_windows.cmake
index 67cd61b5d4..219abbee24 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_private_windows.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_private_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_private_windows_files.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_private_windows_files.cmake
index 2a9be65d29..afa3c50e98 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_private_windows_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/platform_private_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/Atom/RHI/DX12/Code/Source/Platform/iOS/PAL_ios.cmake
index cd8861c104..34efee6cad 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/BuilderModule.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/BuilderModule.cpp
index e4e3946f63..d24a91c71d 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/BuilderModule.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/BuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
index cd56bf87e8..a34e98191e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.h b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.h
index a0a32f16be..838db39ad5 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
index 79226d6763..3b41cca599 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
index 703ce2d61a..98dd8a60f3 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
index 4709edf245..1eede4f064 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
index 2618629539..5877b18a0c 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
index 5a0e437643..c14af2c0d7 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
index c700b44295..6cd6f05737 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/ShaderStageFunction.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
index 9c522f0396..2f8ff83bef 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp
index 1df24e637b..f77bf7a2d0 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h
index 650a3cb5b0..401d0675e9 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp
index 908513663f..1e63f15224 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.h
index 7c50defd57..e4e9200130 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
index d35f94a873..4fd8e06c32 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.h
index 8d781d7a34..2aae14517c 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
index a7ffe9aa2a..a032f59091 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp
index 4d3ced6ac4..27b1a7e666 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp
index 3d91b936ce..e1d48d91a6 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.h
index 3376457bef..71813d7add 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp
index 839432bd1b..6ee2226867 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.h
index ed09c10f8f..5580eab453 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp
index 64307e67dc..6365b77186 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.h
index e92317a1b7..0a63148906 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp
index 100fec3b48..bd13573c28 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.h
index a005626bf7..a20ec46784 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp
index 57f597a02d..eb63acd23a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.h
index 6bc0350ca3..4fef085319 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
index de80d68269..83ef4176b2 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h
index e944471266..715bb05d31 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
index b617dcaf88..60c4707576 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
index 97158e311c..18ba901c5a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp
index 007ebad941..7c55207a24 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h
index b9980e1a58..c236975185 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp
index f55a461027..c63a04cf17 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.h
index 6c8bc80e7c..415e12fff6 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
index c2384c7fab..d35e355807 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.h
index 8dc8cd6a57..ae59107062 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp
index dc1b217ea4..2e54844fc8 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h
index b833f3c953..820c516f4e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp
index a2910efacf..3debd58d2a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.h
index d437a4f74d..83ccb6c57d 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp
index 2767eb1a49..5f16e2cc16 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.h
index daec7dfb68..cdae5c6174 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp
index 5063de4bed..fc86f38d26 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.h
index bf4316f2ba..3cca2ecaa3 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp
index 6c459432e9..c5234fd515 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.h
index d3eda1f34d..86f15c6fad 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp
index fddb186b45..576060a500 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.h
index 205e428703..6091934e8e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp
index fd5ad9d6d8..21a9add45b 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h
index 1920f3acf6..751a44b695 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp
index cf526ccbb3..1917d8d199 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h
index f4c941c16a..b953a0c83a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp
index a8688de9bf..b00bf4844f 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.h
index 781f6a64f7..7b64fa587a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
index 7d93121290..88bc162114 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.h
index b17fa7f23c..e2e657bb31 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
index dd849bbe33..995935ef7a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
index bdf063c9e1..9e5a95826d 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp
index 6e30e7226d..51fa75afb8 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.h
index 7657ce940d..a6b9546d2c 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp
index ddf5253cc9..48b41a3f99 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.h
index 71afe9906e..32652c00a3 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp
index 5895c62576..1ded607837 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.h
index 4132e5c489..0963de3b49 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp
index c8a1bcc80a..e57191a8a2 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.h
index 161b96fcc8..63ca56f5c5 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp
index 70fabb3134..37bfbc9a54 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h
index 29831130ab..b14ad9f70a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp
index c347320f62..aa76435f1a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.h
index db613e40a7..31e1acd4d2 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Memory.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Memory.h
index a543e8b728..1e86555a4c 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Memory.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Memory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp
index 86173e6dd9..2147afc695 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.h
index db86318689..82552fe9d4 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/MemorySubAllocator.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemorySubAllocator.h
index 72f94c497b..0b8fe67d34 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemorySubAllocator.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemorySubAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp
index 8957ecd0c0..ab2bf1d802 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.h
index 73ff06ef77..a8b6903865 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp
index abdb5faa31..819d22cdaa 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h
index 5337f5bf3f..0f7fed3a63 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/PhysicalDevice.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/PhysicalDevice.h
index 7730de60f0..941e2900f5 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PhysicalDevice.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PhysicalDevice.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
index b73b28acf0..ebfe5ba4c9 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h
index 825a6c6b9b..00a31411eb 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp
index 3f9209f604..9fe5d2cf55 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.h
index ed20825544..310bacd352 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp
index 76cc0a91fe..9cb74af42a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.h
index 0a89a54a78..cc30308647 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp
index 95d09f13da..2ea51ada27 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.h
index fdda094d6c..466e106ecd 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp
index 073d4c828e..14ddbcddb5 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.h
index 246ae31ef3..25a7d71205 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp
index f7076aa81c..7a9e232abb 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.h
index 7a64b1785f..44c25c7f98 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp
index e891fbe807..e104cacf48 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h
index c9d3a84898..a6e429569b 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBufferPools.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBufferPools.h
index 98ca866f10..4d99651bd4 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBufferPools.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBufferPools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp
index ec959c6b2a..40862b9992 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h
index 33bd376a9d..def2b9e8e6 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
index 0f3a63eaf6..83e7b70d40 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.h
index f3c7c9c86f..9c7dbe2c83 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp
index fbe9c9d8e9..99fc1e125a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h
index c106dcfe88..60db5e001d 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ReleaseQueue.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/ReleaseQueue.h
index eebd987544..6556012d9c 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ReleaseQueue.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ReleaseQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ResourcePoolResolver.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/ResourcePoolResolver.h
index f420891251..0668f3a70a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ResourcePoolResolver.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ResourcePoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp
index a741e0b4f4..8fc42fd2be 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.h
index 02a947abef..c8fa516704 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
index f3c74901ef..3c1a5b2136 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.h
index 557c475d62..85fea3ec19 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp
index e33db21675..a1f15cc497 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.h
index cf70566409..01cfb03833 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 677c3ea0e6..71bc45b709 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.h
index 4cec5f0e95..647f8f5acc 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp
index 26a76fc3a9..2eb13c6ada 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.h
index f19cd6077b..68c69a1375 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp
index a7fbdf3aeb..95746b3475 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.h
index 9904c3eec5..7c1d25d2ba 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp
index 384842165d..be8fcf3b38 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h
index 1530ef53d1..7fdebaf1cb 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp
index 887e0a3cfc..30a63fd266 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.h
index 6b5969bed8..b6af10c019 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp
index 6ad529430a..48a90e9bfa 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.h
index de5a1c4a1b..efa5475175 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/Source/RHI/resource.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/resource.h
index b76ed5be95..6ea16f020d 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/resource.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_builders_common_shared_files.cmake b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_builders_common_shared_files.cmake
index 4e095404fc..7f092a62f8 100644
--- a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_builders_common_shared_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_builders_common_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake
index 8ff9a5eb16..7f739e20a3 100644
--- a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_shared_files.cmake b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_shared_files.cmake
index 3702f78cac..77fdf502a1 100644
--- a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_shared_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_reflect_common_files.cmake b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_reflect_common_files.cmake
index 23c8668062..9f2ca6d155 100644
--- a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_reflect_common_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_reflect_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_stub_module.cmake b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_stub_module.cmake
index 2cfed2e165..bae9126874 100644
--- a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_stub_module.cmake
+++ b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_stub_module.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/DX12/Code/empty.cmake b/Gems/Atom/RHI/DX12/Code/empty.cmake
index 59a98051c1..384905feb1 100644
--- a/Gems/Atom/RHI/DX12/Code/empty.cmake
+++ b/Gems/Atom/RHI/DX12/Code/empty.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/CMakeLists.txt b/Gems/Atom/RHI/Metal/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/RHI/Metal/CMakeLists.txt
+++ b/Gems/Atom/RHI/Metal/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/CMakeLists.txt b/Gems/Atom/RHI/Metal/Code/CMakeLists.txt
index ea47e3f5c8..2c6d659d3b 100644
--- a/Gems/Atom/RHI/Metal/Code/CMakeLists.txt
+++ b/Gems/Atom/RHI/Metal/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/Base.h b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/Base.h
index 0d91dedc04..77f0689006 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/Base.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/Base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/BufferPoolDescriptor.h b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/BufferPoolDescriptor.h
index 97aae17b2b..f19a4c9a2f 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/BufferPoolDescriptor.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/BufferPoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/PipelineLayoutDescriptor.h b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/PipelineLayoutDescriptor.h
index dc972455e6..98fce8416f 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/PipelineLayoutDescriptor.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/PipelineLayoutDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/PlatformLimitsDescriptor.h b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/PlatformLimitsDescriptor.h
index 3f54b7a319..cf54ecb7aa 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/PlatformLimitsDescriptor.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/PlatformLimitsDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/ReflectSystemComponent.h b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/ReflectSystemComponent.h
index 90b8aa4dbe..8bde5997d2 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/ReflectSystemComponent.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/ReflectSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/ShaderStageFunction.h b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/ShaderStageFunction.h
index 77e55d1353..ac918d248a 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/ShaderStageFunction.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Atom/RHI.Reflect/Metal/ShaderStageFunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Platform/Android/Atom_RHI_Metal_precompiled_Platform.h b/Gems/Atom/RHI/Metal/Code/Include/Platform/Android/Atom_RHI_Metal_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/Android/Atom_RHI_Metal_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/Android/Atom_RHI_Metal_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Platform/Linux/Atom_RHI_Metal_precompiled_Platform.h b/Gems/Atom/RHI/Metal/Code/Include/Platform/Linux/Atom_RHI_Metal_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/Linux/Atom_RHI_Metal_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/Linux/Atom_RHI_Metal_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Mac.h b/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Mac.h
index c770f522cd..fc3c2d4979 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Mac.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h b/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
index cf85f56358..19ee132f88 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/platform_builders_mac_files.cmake b/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/platform_builders_mac_files.cmake
index d448fdf4fa..74c99e16dd 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/platform_builders_mac_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/platform_builders_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/platform_private_mac_files.cmake b/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/platform_private_mac_files.cmake
index d448fdf4fa..74c99e16dd 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/platform_private_mac_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/platform_private_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Include/Platform/Windows/Atom_RHI_Metal_precompiled_Platform.h b/Gems/Atom/RHI/Metal/Code/Include/Platform/Windows/Atom_RHI_Metal_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/Windows/Atom_RHI_Metal_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/Windows/Atom_RHI_Metal_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h b/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
index cc031f5af4..9ad5e44c4a 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_iOS.h b/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_iOS.h
index f976e348f0..4a793f9d0c 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_iOS.h
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/platform_private_ios_files.cmake b/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/platform_private_ios_files.cmake
index ff7a24ac48..aef2cc13d5 100644
--- a/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/platform_private_ios_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/platform_private_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h b/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
index c926730b77..146b14f9b6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/Metal_Traits_Android.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/Metal_Traits_Android.h
index f3ab35b587..d9f286d907 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/Metal_Traits_Android.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/Metal_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/Metal_Traits_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/Metal_Traits_Platform.h
index f28180de05..25f94a04ae 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/Metal_Traits_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/Metal_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/PAL2_android.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/PAL2_android.cmake
index 526075d8bb..4cece234b4 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/PAL2_android.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Android/PAL2_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
index b76ed5be95..6ea16f020d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
index 56474a8a35..44940989e7 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/Metal_Traits_Linux.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/Metal_Traits_Linux.h
index f3ab35b587..d9f286d907 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/Metal_Traits_Linux.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/Metal_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/Metal_Traits_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/Metal_Traits_Platform.h
index 06588e12c2..6dd6e8b980 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/Metal_Traits_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/Metal_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/PAL2_linux.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/PAL2_linux.cmake
index 526075d8bb..4cece234b4 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/PAL2_linux.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/PAL2_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/platform_builders_linux_files.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/Metal_Traits_Mac.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/Metal_Traits_Mac.h
index 58cc9e176d..f8546a06f2 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/Metal_Traits_Mac.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/Metal_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/Metal_Traits_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/Metal_Traits_Platform.h
index 88ca22ad80..249ec8b909 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/Metal_Traits_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/Metal_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/PAL2_mac.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/PAL2_mac.cmake
index 5379a20b11..f19dcea221 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/PAL2_mac.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/PAL2_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp
index c0b8a6d4ae..d295dbdd92 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.h
index da0f16170e..df4153e8e1 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Platform.h
index c7834b9ef5..20cfb09dda 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Mac.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Mac.h
index 390e08129c..7b3f22835f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Mac.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Mac.mm b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Mac.mm
index 2a31cb6508..18c2801405 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Mac.mm
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Platform.h
index f1a7cbe523..3ce0abcaf2 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/MetalView_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp
index 35ce1ce931..de3bc23a11 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -144,6 +144,7 @@ namespace Platform
                 }
                 mappedData += request.m_byteOffset;                
                 response.m_data = mappedData;
+                buffer.SetMapRequestOffset(request.m_byteOffset);
                 break;
             }
             default:
@@ -159,6 +160,8 @@ namespace Platform
     {
         AZ::Metal::Buffer& buffer = static_cast<AZ::Metal::Buffer&>(bufferBase);
         //Ony need to handle MTLStorageModeManaged memory.
-        SynchronizeBufferOnCPU(buffer.GetMemoryView().GetGpuAddress<id<MTLBuffer>>(), buffer.GetMemoryView().GetOffset(), buffer.GetMemoryView().GetSize());
+        SynchronizeBufferOnCPU(buffer.GetMemoryView().GetGpuAddress<id<MTLBuffer>>(),
+                               buffer.GetMemoryView().GetOffset() + buffer.GetMapRequestOffset(),
+                               buffer.GetMemoryView().GetSize());
     }
 }
diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_builders_mac_files.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_mac.cmake
index 4929198f9b..9ce6275790 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_private_mac_files.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_private_mac_files.cmake
index 39f281e84d..b348c72efc 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_private_mac_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_private_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_shared_mac.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_shared_mac.cmake
index 8d27cb327e..bf2c19e533 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_shared_mac.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/platform_shared_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/Metal_Traits_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/Metal_Traits_Platform.h
index e7413f4938..43f07f6a4a 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/Metal_Traits_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/Metal_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/Metal_Traits_Windows.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/Metal_Traits_Windows.h
index f3ab35b587..d9f286d907 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/Metal_Traits_Windows.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/Metal_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/PAL2_windows.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/PAL2_windows.cmake
index 526075d8bb..4cece234b4 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/PAL2_windows.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/PAL2_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/RHI.Builders/BuilderModule_Windows.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/RHI.Builders/BuilderModule_Windows.cpp
index 08cff4b87c..90fd79f68b 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/RHI.Builders/BuilderModule_Windows.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/RHI.Builders/BuilderModule_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/platform_builders_windows_files.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
index 08e9c28c3d..161193a04f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/Metal_Traits_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/Metal_Traits_Platform.h
index 001f217658..3d9b0aeec6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/Metal_Traits_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/Metal_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/Metal_Traits_iOS.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/Metal_Traits_iOS.h
index 09b7023ddb..d954e2502d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/Metal_Traits_iOS.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/Metal_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/PAL2_ios.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/PAL2_ios.cmake
index 5379a20b11..f19dcea221 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/PAL2_ios.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/PAL2_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_Platform.h
index 2af3e5b578..af6a87c911 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp
index 308467d87f..a5233da500 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.h
index da0f16170e..df4153e8e1 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_Platform.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_Platform.h
index 385238c9a8..262eb23482 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_Platform.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_iOS.h b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_iOS.h
index 1816d8d0d9..c727b91791 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_iOS.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_iOS.mm b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_iOS.mm
index 4b7eab7ca9..2be273c22e 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_iOS.mm
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/MetalView_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp
index e4e28c4ad5..b7c309fba2 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_ios.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_ios.cmake
index 4929198f9b..9ce6275790 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_ios.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_private_ios_files.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_private_ios_files.cmake
index 461ea311d8..7ce3f4942e 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_private_ios_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_private_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_shared_ios.cmake b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_shared_ios.cmake
index 8d27cb327e..bf2c19e533 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_shared_ios.cmake
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/platform_shared_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/BuilderModule.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/BuilderModule.cpp
index 5e9f8fc605..302b5f43da 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/BuilderModule.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/BuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
index a614ad332d..aacb8d213b 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.h b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.h
index c8d16c67ce..935d2e6471 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
index 8f89e18671..e230447405 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
index dc079bc162..93520d5886 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
index 89b0dee47e..399f8e1d6b 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
index e4053d8f87..8358f4cb28 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
index 67b03932e8..f23dbd565d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
index be5a7ca437..69106efc9f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/ShaderStageFunction.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
index b0b726ca78..0f55b5802d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp
index ef990434a4..0e901107d2 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.h
index 86fa773274..83d58e7e66 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp
index 2bd6bc35ae..152d4195a5 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.h
index 76206a3b3b..8f3208fd14 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp
index 9606727936..3db2092fcb 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.h
index d5934ed278..76c9bee3f9 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp
index 21826c3f17..2641324486 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.h
index c749f506ab..a6dcb72d51 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp
index e655b859cb..3b9c38a01b 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -35,6 +35,16 @@ namespace AZ
             }
         }
 
+        void Buffer::SetMapRequestOffset(const uint32_t mapRequestOffset)
+        {
+            m_mapRequestOffset = mapRequestOffset;
+        }
+    
+        const uint32_t Buffer::GetMapRequestOffset() const
+        {
+            return m_mapRequestOffset;
+        }
+    
         void Buffer::ReportMemoryUsage(RHI::MemoryStatisticsBuilder& builder) const
         {
             //[GFX TODO][ATOM-493] - Report memory usage support
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.h
index 9e9971b73b..d0895f3cfe 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -32,6 +32,9 @@ namespace AZ
             const MemoryView& GetMemoryView() const;
             MemoryView& GetMemoryView();
             
+            void SetMapRequestOffset(const uint32_t mapRequestOffset);
+            const uint32_t GetMapRequestOffset() const;
+            
         private:
             Buffer() = default;
             friend class BufferPool;
@@ -57,6 +60,9 @@ namespace AZ
             
             // The number of resolve operations pending for this buffer.
             AZStd::atomic<uint32_t> m_pendingResolves = 0;
+            
+            // Offset related to the Map request. We need to cache it for cpu/gpu synchronization.
+            uint32_t m_mapRequestOffset = 0;
 
         };
     }
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp
index 5cd8a361ef..be27964194 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.h
index f7fba25e9b..beaab79a96 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp
index 0c388923a1..fdde4eb4a8 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.h
index 205342030a..c2f9201d39 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp
index b0b83596f6..498cf68015 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.h
index 0ed761aea6..f7e62b9643 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp
index ac1b146422..a9635701cc 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.h
index 5affab586a..58fb5102f3 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp
index 61c390d1a3..7d9c9f567e 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.h
index 8132459bdb..db6f121c96 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp
index 81729f5054..451f6b96a6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.h
index 6f22271926..349c60b307 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp
index ccd8dc85af..675a593bc8 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.h
index f07c938eb1..70678aed01 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp
index 6edb407852..f592a18358 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.h
index 69b7fafb33..313b2421b3 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp
index 772f0319ab..d8e1e98a23 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.h
index 01bd2a553f..254ec2b782 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.cpp
index ab593105e0..1656206b77 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.cpp
@@ -1,10 +1,11 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
  * 
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
 
+#include <Atom/RHI.Reflect/Base.h>
 #include <AzCore/Debug/EventTrace.h>
 #include <RHI/CommandQueue.h>
 
@@ -24,8 +25,35 @@ namespace AZ
         id <MTLCommandBuffer> CommandQueueCommandBuffer::AcquireMTLCommandBuffer()
         {
             AZ_Assert(m_mtlCommandBuffer==nil, "Previous command buffer was not commited");
+            
             //Create a new command buffer
-            m_mtlCommandBuffer = [m_hwQueue commandBuffer];
+#if defined(__IPHONE_14_0) || defined(__MAC_11_0)
+            if(@available(iOS 14.0, macOS 11.0, *))
+            {
+                if(RHI::BuildOptions::IsDebugBuild)
+                {
+                    //There is a perf cost associated with enhanced command buffer errors so only enabling them for debug builds.
+                    MTLCommandBufferDescriptor* mtlCommandBufferDesc = [[MTLCommandBufferDescriptor alloc] init];
+                    mtlCommandBufferDesc.errorOptions = MTLCommandBufferErrorOptionEncoderExecutionStatus;
+                    m_mtlCommandBuffer = [m_hwQueue commandBufferWithDescriptor:mtlCommandBufferDesc];
+
+                    [m_mtlCommandBuffer addCompletedHandler:^(id<MTLCommandBuffer> buffer)
+                     {
+                        // check command buffer's status for errors, print out all of its contents
+                        MTLCommandBufferStatus stat = buffer.status;
+                        if (stat == MTLCommandBufferStatusError)
+                        {
+                            NSLog(@"%@",buffer.error);
+                            abort();
+                        }
+                    }];
+                }
+            }
+#endif
+            if(m_mtlCommandBuffer == nil)
+            {
+                m_mtlCommandBuffer = [m_hwQueue commandBuffer];
+            }
             
             //we call retain here as this CB is active across the autoreleasepools of multiple threads. Calling
             //retain here means that if the current thread's autoreleasepool gets drained this CB will not die.
@@ -91,7 +119,7 @@ namespace AZ
                         AZ_Assert(false,"Insufficient memory");
                         break;
                     case MTLCommandBufferErrorInvalidResource:
-                        AZ_Assert(false,"The command buffer referenced an invlid resource. This error is most commonly caused when caller deletes a resource before executing a command buffer that refers to it");
+                        AZ_Assert(false,"This error is most commonly caused when the caller deletes a resource before executing a command buffer that refers to it. It would also trigger if the caller deletes the resource while the GPU is working on the command buffer");
                         break;
                     default:
                         break;
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.h
index 1dd26de804..9d8c418d80 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp
index 77f20484bd..2ab3124cc4 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.h
index c53cde8d5b..fc3b48057c 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
index 4cbec6a62a..a48e5f5bbf 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.h
index 8e6ece7dbb..b56cf97e0c 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp
index 387ebd6f27..5e23353b65 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -46,7 +46,7 @@ namespace AZ
         {
             {
                 ReleaseQueue::Descriptor releaseQueueDescriptor;
-                releaseQueueDescriptor.m_collectLatency = descriptor.m_frameCountMax - 1;
+                releaseQueueDescriptor.m_collectLatency = descriptor.m_frameCountMax;
                 m_releaseQueue.Init(releaseQueueDescriptor);
             }
              
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.h
index 7a2d62426c..f1e72ba8e1 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp
index 058f36653b..ec290e5ad5 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.h
index 0d90e7cac5..6b38ef412d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp
index 3e905c713d..24b2eb688f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.h
index 2de297213a..da6af4c5b8 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp
index 2d2bad328d..8f052b1f0c 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.h
index 4492490cb0..9095466090 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
index b34d8d2c9b..270c01c562 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.h
index af88f87589..cfd9bd78b8 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
index 38bd888622..4d2125ef3f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
index 8215328c56..d1bb323c88 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp
index cb31273e41..210e749509 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.h
index 803d241d8c..586d2f40ed 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp
index 5e6d3f78f0..2d0482256d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.h
index 748bc139d2..f5f6117cba 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp
index 7b305d7949..dba6488a64 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.h
index 790a5c736d..47c18bb3f5 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp
index 59b79f59d3..e4ce093ce6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.h
index f040df5e4e..74ba008bab 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp
index 916d1ba793..652f60e2fc 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -34,20 +34,40 @@ namespace AZ
             
             id<MTLTexture> mtlTexture = image.GetMemoryView().GetGpuAddress<id<MTLTexture>>();
             MTLPixelFormat textureFormat = ConvertPixelFormat(image.GetDescriptor().m_format);
-
+            MTLPixelFormat textureViewFormat = ConvertPixelFormat(viewDescriptor.m_overrideFormat);
+            
             id<MTLTexture>  textureView = nil;
-            if(viewDescriptor.m_overrideFormat != RHI::Format::Unknown)
+            bool isViewFormatDifferent = false;
+            //Check if we the viewformat differs from the base texture format
+            if(textureViewFormat != MTLPixelFormatInvalid)
+            {
+                isViewFormatDifferent = textureViewFormat!=textureFormat;
+            }
+                       
+            //Since we divide the array length of a cubemap by NumCubeMapSlices when creating the base texture
+            //we have to do reverse of that here
+            uint32_t textureLength = mtlTexture.arrayLength;
+            if(imgDesc.m_isCubemap)
+            {
+                textureLength = textureLength * RHI::ImageDescriptor::NumCubeMapSlices;
+            }
+            
+            //Create a new view if the format, mip range or slice range has changed
+            if( isViewFormatDifferent ||
+                levelRange.length != mtlTexture.mipmapLevelCount ||
+                sliceRange.length != textureLength)
             {
-                MTLPixelFormat textureViewFormat = ConvertPixelFormat(viewDescriptor.m_overrideFormat);
-                
-                //Create a unique texture if needed
-                if(textureFormat != textureViewFormat)
+                //Protection against creating a view with an invalid format
+                //If view format is invalid use the base texture's format
+                if(textureViewFormat == MTLPixelFormatInvalid)
                 {
-                    textureView = [mtlTexture newTextureViewWithPixelFormat : textureViewFormat
-                                                                  textureType : mtlTexture.textureType
-                                                                       levels : levelRange
-                                                                       slices : sliceRange];
+                    textureViewFormat = textureFormat;
                 }
+
+                textureView = [mtlTexture newTextureViewWithPixelFormat : textureViewFormat
+                                                            textureType : mtlTexture.textureType
+                                                                 levels : levelRange
+                                                                 slices : sliceRange];
             }
 
             if(!textureView)
@@ -112,20 +132,21 @@ namespace AZ
         {
             const Image& image = static_cast<const Image&>(resourceBase);
             const RHI::ImageDescriptor& imageDesc = image.GetDescriptor();
-            const RHI::ImageViewDescriptor& descriptor = GetDescriptor();
+            const RHI::ImageViewDescriptor& viewDescriptor = GetDescriptor();
             
             RHI::ImageSubresourceRange& range = m_imageSubresourceRange;
-            range.m_mipSliceMin = descriptor.m_mipSliceMin;
-            range.m_mipSliceMax = AZStd::min(descriptor.m_mipSliceMax, static_cast<uint16_t>(imageDesc.m_mipLevels - 1));
-            if (imageDesc.m_dimension == RHI::ImageDimension::Image3D)
+            range.m_mipSliceMin = viewDescriptor.m_mipSliceMin;
+            range.m_mipSliceMax = AZStd::min(viewDescriptor.m_mipSliceMax, static_cast<uint16_t>(imageDesc.m_mipLevels - 1));
+            range.m_arraySliceMin = viewDescriptor.m_arraySliceMin;
+            range.m_arraySliceMax = AZStd::min(viewDescriptor.m_arraySliceMax, static_cast<uint16_t>(imageDesc.m_arraySize - 1));
+
+            //The length value of the sliceRange parameter must be a multiple of 6 if the texture
+            //is of type MTLTextureTypeCube or MTLTextureTypeCubeArray. Hence we cant really make
+            //a subresource view for these types.
+            if(imageDesc.m_isCubemap)
             {
                 range.m_arraySliceMin = 0;
-                range.m_arraySliceMax = 0;
-            }
-            else
-            {
-                range.m_arraySliceMin = descriptor.m_arraySliceMin;
-                range.m_arraySliceMax = AZStd::min(descriptor.m_arraySliceMax, static_cast<uint16_t>(imageDesc.m_arraySize - 1));
+                range.m_arraySliceMax = static_cast<uint16_t>(imageDesc.m_arraySize - 1);
             }
         }
     
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.h
index 0609086ddb..2376cb5226 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -53,7 +53,6 @@ namespace AZ
             //Internally it may create a new MTLTexture object that reinterprets the original MTLTexture object from Image
             MemoryView m_memoryView;
             
-            RHI::ImageViewDescriptor m_descriptor;
             MTLPixelFormat m_format;
             RHI::ImageSubresourceRange m_imageSubresourceRange;
         };
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Memory.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Memory.h
index e21a015298..32abc0aa09 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Memory.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Memory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp
index 3ab8d23b20..65004f4fea 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.h
index 41f0da88d8..64b9be401f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MemorySubAllocator.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemorySubAllocator.h
index 933dd08760..a0f2f15f41 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemorySubAllocator.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemorySubAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryView.cpp
index 7b0c4f89ae..234b61dccf 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryView.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryView.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryView.h
index 7c9e3da455..2ff08ea2d6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryView.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp
index 49dca75ffa..3478d033b4 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
index 725362728f..b0e36c0284 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalCopyShaders.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalCopyShaders.h
index ea2a8fafe8..7bd4383d19 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalCopyShaders.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalCopyShaders.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalView.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalView.h
index 4ceb4b775e..9daa0bf0df 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalView.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalView.mm b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalView.mm
index 680f4de239..e1e1bcec8e 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalView.mm
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalView.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.h
index 01e9a19993..a6404e60bc 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm
index 602d8e070c..cb07113b00 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp
index 525b2a82ab..43b37599dd 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp
index b08ca3b425..61316d25b8 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.h
index 24b19e3e35..952046bdd9 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PhysicalDevice.cpp
index a6c0ad8ba4..8e2e66c4e7 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PhysicalDevice.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PhysicalDevice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/PhysicalDevice.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/PhysicalDevice.h
index 6bab7822a4..def167283f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PhysicalDevice.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PhysicalDevice.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp
index 7b2c8a7701..6002d96cb2 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.h
index b2005672a4..8c1032eabe 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp
index 787f7acb17..4bc81407e9 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.h
index 9f195f09fa..98790088f9 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp
index 4404546399..61068f66c9 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.h
index a8a54751d2..51b0823d9c 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp
index 949f3e02e5..9d0fc00c55 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.h
index 19c7873bdd..a1d40154bd 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp
index 53e697a1b4..c2ea8826bb 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.h
index 4f39cdae22..28d00aff9a 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ReleaseQueue.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/ReleaseQueue.h
index b6e4db9c76..c9445217d2 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ReleaseQueue.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ReleaseQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ResourcePoolResolver.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/ResourcePoolResolver.h
index 682cd9986b..db4b61e51c 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ResourcePoolResolver.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ResourcePoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp
index 00e5ed979b..bbd99b0fe0 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -180,13 +180,18 @@ namespace AZ
                             
                             if(!m_isWritingToSwapChainScope)
                             {
-                                if(renderTargetTexture.textureType == MTLTextureType3D)
+                                //Cubemap/cubemaparray and 3d textures have restrictions placed on them by the
+                                //drivers when creating a new texture view. Hence we cant get a view with subresource range
+                                //of the original texture. As a result in order to write into specific slice or depth plane
+                                //we specify it here. It also means that we cant write into these texturee types via a compute shader
+                                const RHI::ImageViewDescriptor& imgViewDescriptor = imageView->GetDescriptor();
+                                if(renderTargetTexture.textureType == MTLTextureTypeCube || renderTargetTexture.textureType == MTLTextureTypeCubeArray)
                                 {
-                                    m_renderPassDescriptor.colorAttachments[colorAttachmentIndex].depthPlane = imgViewDescriptor.m_depthSliceMin;
+                                    m_renderPassDescriptor.colorAttachments[colorAttachmentIndex].slice = imgViewDescriptor.m_arraySliceMin;
                                 }
-                                else
+                                else if(renderTargetTexture.textureType == MTLTextureType3D)
                                 {
-                                    m_renderPassDescriptor.colorAttachments[colorAttachmentIndex].slice = imgViewDescriptor.m_arraySliceMin;
+                                    m_renderPassDescriptor.colorAttachments[colorAttachmentIndex].depthPlane = imgViewDescriptor.m_depthSliceMin;
                                 }
                             }
                             
@@ -221,8 +226,6 @@ namespace AZ
                                 m_renderPassDescriptor.stencilAttachment.texture = imageViewMtlTexture;
                             }
                             
-                            m_renderPassDescriptor.depthAttachment.slice = imgViewDescriptor.m_arraySliceMin;
-                            
                             MTLRenderPassDepthAttachmentDescriptor* depthAttachment = m_renderPassDescriptor.depthAttachment;
                             MTLRenderPassStencilAttachmentDescriptor* stencilAttachment = m_renderPassDescriptor.stencilAttachment;
                             depthAttachment.loadAction = mtlLoadAction;
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.h
index 792fdee201..4e6f5afd10 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp
index e555b5f60b..20ac8c423e 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.h
index c57bd99268..934603d170 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
index ca3bdd974c..65409d3fe0 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.h
index d58f0a24e3..7950df3eee 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp
index fdaf78e5aa..9659bfa641 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.h
index 797b397b99..f030e6fe61 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp
index f915c724d4..6e34584144 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.h
index 5b3d2d6e48..816215034e 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp
index f8adc55125..31d23e5100 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.h
index 1df8d18d8a..c86bd1f7a5 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp
index 2939c4ab29..70dcddb651 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.h
index 5fe1ca5b11..0a5ee921bc 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp
index b26eac76de..11e4c85956 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.h
index 791bf26d74..8c03466591 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Util.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Util.cpp
index 34b2376680..3bb72860c4 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Util.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Util.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Source/RHI/Util.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Util.h
index b8ce9ef503..9c98a2fcbf 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Util.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/Tests/AtomRHIMetalTests.cpp b/Gems/Atom/RHI/Metal/Code/Tests/AtomRHIMetalTests.cpp
index 6187c7fdc7..acbaac9155 100644
--- a/Gems/Atom/RHI/Metal/Code/Tests/AtomRHIMetalTests.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Tests/AtomRHIMetalTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_common_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_common_files.cmake
index 69aca9cf73..92804d9f97 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_common_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_shared_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_shared_files.cmake
index 879b098c91..a3d41db133 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_shared_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_tests_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_tests_files.cmake
index 04270b2afa..e7e2b1cfdb 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_tests_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_builders_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
index 8540117ed5..b584d3d25f 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_common_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_common_files.cmake
index 16c60fac16..c41044070b 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_common_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_common_shared_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_common_shared_files.cmake
index 3702f78cac..77fdf502a1 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_common_shared_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_common_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_tests_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_tests_files.cmake
index 04270b2afa..e7e2b1cfdb 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_tests_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_private_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_reflect_common_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_reflect_common_files.cmake
index 3b7b5c521d..e9153b3e06 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_reflect_common_files.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_reflect_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_stub_module.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_stub_module.cmake
index 2cfed2e165..bae9126874 100644
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_stub_module.cmake
+++ b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_stub_module.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/CMakeLists.txt b/Gems/Atom/RHI/Null/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/RHI/Null/CMakeLists.txt
+++ b/Gems/Atom/RHI/Null/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/Code/CMakeLists.txt b/Gems/Atom/RHI/Null/Code/CMakeLists.txt
index 2efe379310..93bb328dfc 100644
--- a/Gems/Atom/RHI/Null/Code/CMakeLists.txt
+++ b/Gems/Atom/RHI/Null/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/Base.h b/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/Base.h
index 7cc0521d41..4444932bc1 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/Base.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/Base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/PipelineLayoutDescriptor.h b/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/PipelineLayoutDescriptor.h
index fb4498ba34..40d3d6876a 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/PipelineLayoutDescriptor.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/PipelineLayoutDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/ReflectSystemComponent.h b/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/ReflectSystemComponent.h
index 410998a45d..e2cd5675f8 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/ReflectSystemComponent.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/ReflectSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/ShaderStageFunction.h b/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/ShaderStageFunction.h
index c9eb1056c2..2e560ba2e7 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/ShaderStageFunction.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Atom/RHI.Reflect/Null/ShaderStageFunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Include/Platform/Android/Atom_RHI_Null_precompiled_Platform.h b/Gems/Atom/RHI/Null/Code/Include/Platform/Android/Atom_RHI_Null_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Platform/Android/Atom_RHI_Null_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Platform/Android/Atom_RHI_Null_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Include/Platform/Linux/Atom_RHI_Null_precompiled_Platform.h b/Gems/Atom/RHI/Null/Code/Include/Platform/Linux/Atom_RHI_Null_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Platform/Linux/Atom_RHI_Null_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Platform/Linux/Atom_RHI_Null_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Include/Platform/Mac/Atom_RHI_Null_precompiled_Platform.h b/Gems/Atom/RHI/Null/Code/Include/Platform/Mac/Atom_RHI_Null_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Platform/Mac/Atom_RHI_Null_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Platform/Mac/Atom_RHI_Null_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Include/Platform/Windows/Atom_RHI_Null_precompiled_Platform.h b/Gems/Atom/RHI/Null/Code/Include/Platform/Windows/Atom_RHI_Null_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Platform/Windows/Atom_RHI_Null_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Platform/Windows/Atom_RHI_Null_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Include/Platform/iOS/Atom_RHI_Null_precompiled_Platform.h b/Gems/Atom/RHI/Null/Code/Include/Platform/iOS/Atom_RHI_Null_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Null/Code/Include/Platform/iOS/Atom_RHI_Null_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Include/Platform/iOS/Atom_RHI_Null_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h b/Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
index 88ad899e47..62a44758c2 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Android/Null_Traits_Android.h b/Gems/Atom/RHI/Null/Code/Source/Platform/Android/Null_Traits_Android.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Android/Null_Traits_Android.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Android/Null_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Android/Null_Traits_Platform.h b/Gems/Atom/RHI/Null/Code/Source/Platform/Android/Null_Traits_Platform.h
index 11ab6a445f..432f5f8d65 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Android/Null_Traits_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Android/Null_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp b/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
index b76ed5be95..6ea16f020d 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp b/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
index 91cd1569a4..30bb1b60ac 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Linux/Null_Traits_Linux.h b/Gems/Atom/RHI/Null/Code/Source/Platform/Linux/Null_Traits_Linux.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Linux/Null_Traits_Linux.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Linux/Null_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Linux/Null_Traits_Platform.h b/Gems/Atom/RHI/Null/Code/Source/Platform/Linux/Null_Traits_Platform.h
index 7927b42b7f..5c9e23d7e4 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Linux/Null_Traits_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Linux/Null_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Mac/Null_Traits_Mac.h b/Gems/Atom/RHI/Null/Code/Source/Platform/Mac/Null_Traits_Mac.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Mac/Null_Traits_Mac.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Mac/Null_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Mac/Null_Traits_Platform.h b/Gems/Atom/RHI/Null/Code/Source/Platform/Mac/Null_Traits_Platform.h
index 8baff80745..1136b2bf3b 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Mac/Null_Traits_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Mac/Null_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Windows/Null_Traits_Platform.h b/Gems/Atom/RHI/Null/Code/Source/Platform/Windows/Null_Traits_Platform.h
index f2d63b6b1a..9542d19bc3 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Windows/Null_Traits_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Windows/Null_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/Windows/Null_Traits_Windows.h b/Gems/Atom/RHI/Null/Code/Source/Platform/Windows/Null_Traits_Windows.h
index ad49d2df73..e41e011a88 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/Windows/Null_Traits_Windows.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Windows/Null_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/iOS/Null_Traits_Platform.h b/Gems/Atom/RHI/Null/Code/Source/Platform/iOS/Null_Traits_Platform.h
index 0d2a812f8a..07cddddd71 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/iOS/Null_Traits_Platform.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/iOS/Null_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/Platform/iOS/Null_Traits_iOS.h b/Gems/Atom/RHI/Null/Code/Source/Platform/iOS/Null_Traits_iOS.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/Atom/RHI/Null/Code/Source/Platform/iOS/Null_Traits_iOS.h
+++ b/Gems/Atom/RHI/Null/Code/Source/Platform/iOS/Null_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/BuilderModule.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/BuilderModule.cpp
index d09124b17c..5c7cf319d1 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/BuilderModule.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/BuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
index 486d99380d..e5277fa522 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.h b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.h
index 4fe599db82..53f9df158e 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
index 1fb0b6cac6..4b1fb2c736 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
index 243ed0eb82..2779175efb 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
index 1a398057a9..069aeacddc 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/PipelineLayoutDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
index 3cab05c173..752130fd96 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/ShaderStageFunction.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
index 152e9291f0..1cffcd98ac 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp
index 994d8c6839..b834f0214a 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.h b/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.h
index 4b8c9d3dc0..5d068f8b05 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp
index 67501eaa8f..a1fc7f91c1 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.h b/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.h
index 10030d2c52..c1ece2ff7b 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp
index 9d68f16e39..f9d3444286 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.h b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.h
index a7d43a244b..9b891dcd15 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp
index 1d7c4de9cb..bc2874c9e3 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.h b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.h
index 650c4f03f8..e8c2d734bf 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp
index fef50e32c0..3b1aa99d90 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.h b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.h
index 23199d5d4e..93c88583a8 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp
index 4856a45d51..0a3876c1ad 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.h b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.h
index 82a9ea47c1..dfb875efae 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp
index cb3b8aa4c5..561b352916 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Device.h b/Gems/Atom/RHI/Null/Code/Source/RHI/Device.h
index b7c38682da..010ebc300b 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Device.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Device.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp
index 229e16a61e..a347958b7c 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.h b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.h
index 3138ab6ee2..052237b27e 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp
index a5a1306e8f..7f190bede0 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.h b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.h
index 48cf0d6b44..3a441250bc 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp
index 3df997464e..76e21a642d 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Image.h b/Gems/Atom/RHI/Null/Code/Source/RHI/Image.h
index 247e6324aa..02f19ce78b 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Image.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp
index 785437d7f5..ebcaf66dca 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.h b/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.h
index f43071820b..1c1b6ab06d 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp
index 6f0d3843a2..1c0fcd3077 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.h b/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.h
index a04158487d..14e790f4f7 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp
index 644a502af8..2589444f68 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp
index 2c3fc0d21d..b1f04db9fe 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.h b/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.h
index 931347e1f0..18b7a845e4 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp
index 312be055bf..66c65b253c 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.h b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.h
index fc2fd4ed4c..305965ca82 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp
index 2ee95a983a..ae7518674b 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.h b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.h
index 5dcb697cc5..3988828dc5 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp
index e5d11047f5..1cbead32c0 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Query.h b/Gems/Atom/RHI/Null/Code/Source/RHI/Query.h
index 833d94d36e..a26fee5424 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Query.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp
index 475ec27d43..211a6da47e 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.h b/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.h
index ea767cab50..48bc82a3c1 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp
index dabcd4a611..2cebc98090 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.h b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.h
index a854152dda..b0cd896085 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBufferPools.h b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBufferPools.h
index c463734356..a24fd618a9 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBufferPools.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBufferPools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.cpp
index c36b8d1fd8..dbb903e047 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.h b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.h
index ce7441c2a0..cb51dde813 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp
index 8d43ffb5c0..3ec7fcf432 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.h b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.h
index d83b35ee4d..4290748b1d 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp
index ca9f5c38d5..1f1dc9b356 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.h b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.h
index 5bd5749032..851efefd13 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp
index f87a4c04cc..8e2848e413 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.h b/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.h
index 0ba526ad28..f9d27e0f89 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp
index 40f68b24ea..dd82c49cb6 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.h b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.h
index 4e16ae44a5..0ed3cef532 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.cpp
index a63d9d08c3..a1b8ba9096 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.h b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.h
index 0eef4b0873..5a423a611f 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.cpp
index 11453269ca..d2a36c0006 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.h b/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.h
index 3b9a8b2c26..7d970767b5 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp
index fee2468203..2b70c08138 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.h b/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.h
index f338393666..dfd442ec38 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp
index a9a697567f..83b06d1650 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.h b/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.h
index 69d911a0ae..f6d15bc451 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.cpp
index be0d7bdbb7..c7f323edd3 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.h b/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.h
index e86a57271c..a1753e8714 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.h
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Null/Code/atom_rhi_null_builders_common_files.cmake b/Gems/Atom/RHI/Null/Code/atom_rhi_null_builders_common_files.cmake
index 69aca9cf73..92804d9f97 100644
--- a/Gems/Atom/RHI/Null/Code/atom_rhi_null_builders_common_files.cmake
+++ b/Gems/Atom/RHI/Null/Code/atom_rhi_null_builders_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/Code/atom_rhi_null_builders_shared_files.cmake b/Gems/Atom/RHI/Null/Code/atom_rhi_null_builders_shared_files.cmake
index 879b098c91..a3d41db133 100644
--- a/Gems/Atom/RHI/Null/Code/atom_rhi_null_builders_shared_files.cmake
+++ b/Gems/Atom/RHI/Null/Code/atom_rhi_null_builders_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake b/Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
index 169711b1c6..a7f2830358 100644
--- a/Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
+++ b/Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/Code/atom_rhi_null_private_common_files.cmake b/Gems/Atom/RHI/Null/Code/atom_rhi_null_private_common_files.cmake
index a567c1a0f0..ac6a22fb03 100644
--- a/Gems/Atom/RHI/Null/Code/atom_rhi_null_private_common_files.cmake
+++ b/Gems/Atom/RHI/Null/Code/atom_rhi_null_private_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/Code/atom_rhi_null_private_common_shared_files.cmake b/Gems/Atom/RHI/Null/Code/atom_rhi_null_private_common_shared_files.cmake
index 3702f78cac..77fdf502a1 100644
--- a/Gems/Atom/RHI/Null/Code/atom_rhi_null_private_common_shared_files.cmake
+++ b/Gems/Atom/RHI/Null/Code/atom_rhi_null_private_common_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/Code/atom_rhi_null_reflect_common_files.cmake b/Gems/Atom/RHI/Null/Code/atom_rhi_null_reflect_common_files.cmake
index f415f51033..1514d15fa6 100644
--- a/Gems/Atom/RHI/Null/Code/atom_rhi_null_reflect_common_files.cmake
+++ b/Gems/Atom/RHI/Null/Code/atom_rhi_null_reflect_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Null/Code/atom_rhi_null_stub_module.cmake b/Gems/Atom/RHI/Null/Code/atom_rhi_null_stub_module.cmake
index 2cfed2e165..bae9126874 100644
--- a/Gems/Atom/RHI/Null/Code/atom_rhi_null_stub_module.cmake
+++ b/Gems/Atom/RHI/Null/Code/atom_rhi_null_stub_module.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Registry/PhysicalDeviceDriverInfo.setreg b/Gems/Atom/RHI/Registry/PhysicalDeviceDriverInfo.setreg
index bfcca8a659..9b482e7a8a 100644
--- a/Gems/Atom/RHI/Registry/PhysicalDeviceDriverInfo.setreg
+++ b/Gems/Atom/RHI/Registry/PhysicalDeviceDriverInfo.setreg
@@ -1,5 +1,5 @@
 //
-// Copyright (c) Contributors to the Open 3D Engine Project
+// 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/Gems/Atom/RHI/Vulkan/3rdParty/Findglad_vulkan.cmake b/Gems/Atom/RHI/Vulkan/3rdParty/Findglad_vulkan.cmake
index ed048094dd..077eca467c 100644
--- a/Gems/Atom/RHI/Vulkan/3rdParty/Findglad_vulkan.cmake
+++ b/Gems/Atom/RHI/Vulkan/3rdParty/Findglad_vulkan.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Android/glad_vulkan_android.cmake b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Android/glad_vulkan_android.cmake
index b5d53cafaf..9243776ff8 100644
--- a/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Android/glad_vulkan_android.cmake
+++ b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Android/glad_vulkan_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Linux/glad_vulkan_linux.cmake b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Linux/glad_vulkan_linux.cmake
index c861d2785f..95b5e752cb 100644
--- a/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Linux/glad_vulkan_linux.cmake
+++ b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Linux/glad_vulkan_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Mac/glad_vulkan_mac.cmake b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Mac/glad_vulkan_mac.cmake
index 11424c2eab..4af54e446d 100644
--- a/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Mac/glad_vulkan_mac.cmake
+++ b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Mac/glad_vulkan_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Windows/glad_vulkan_windows.cmake b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Windows/glad_vulkan_windows.cmake
index 2b872af720..b5c2d42aea 100644
--- a/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Windows/glad_vulkan_windows.cmake
+++ b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Windows/glad_vulkan_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/CMakeLists.txt b/Gems/Atom/RHI/Vulkan/CMakeLists.txt
index 17a38640d2..b26ec54418 100644
--- a/Gems/Atom/RHI/Vulkan/CMakeLists.txt
+++ b/Gems/Atom/RHI/Vulkan/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt b/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt
index cb3d4f7ee7..3a57f96772 100644
--- a/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt
+++ b/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h
index 57158d8936..8a40b0e73b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/Glad/vulkan/vulkan.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/Glad/vulkan/vulkan.h
index a39223963b..3c5ccfecef 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/Glad/vulkan/vulkan.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/Glad/vulkan/vulkan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/Base.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/Base.h
index cdfd262eae..46fdf8c85c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/Base.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/Base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/BufferPoolDescriptor.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/BufferPoolDescriptor.h
index 63b6cc2b67..4eff9e6171 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/BufferPoolDescriptor.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/BufferPoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ImagePoolDescriptor.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ImagePoolDescriptor.h
index bc1d76726c..685b91d256 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ImagePoolDescriptor.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ImagePoolDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/PlatformLimitsDescriptor.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/PlatformLimitsDescriptor.h
index 14404f75fc..9400afa70c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/PlatformLimitsDescriptor.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/PlatformLimitsDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ReflectSystemComponent.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ReflectSystemComponent.h
index 837f1db04b..41be0aedf0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ReflectSystemComponent.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ReflectSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ShaderDescriptor.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ShaderDescriptor.h
index 8c90fdb68a..9fe17d9b26 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ShaderDescriptor.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ShaderDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ShaderStageFunction.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ShaderStageFunction.h
index 1544ee9066..97669a5c1a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ShaderStageFunction.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Reflect/Vulkan/ShaderStageFunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom/RHI.Loader/Glad/Vulkan_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom/RHI.Loader/Glad/Vulkan_Platform.h
index ad49d2df73..e41e011a88 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom/RHI.Loader/Glad/Vulkan_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom/RHI.Loader/Glad/Vulkan_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Android.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Android.h
index 65dc1ed7f8..f8985752bd 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Android.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
index 72ea02f59a..6904e85b97 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/platform_builders_android_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/platform_builders_android_files.cmake
index 4dd4a7a927..448d5b9637 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/platform_builders_android_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/platform_builders_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/platform_private_android_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/platform_private_android_files.cmake
index 4dd4a7a927..448d5b9637 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/platform_private_android_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/platform_private_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/AppleTV/Atom/RHI.Loader/Glad/Vulkan_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/AppleTV/Atom/RHI.Loader/Glad/Vulkan_Platform.h
index ad49d2df73..e41e011a88 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/AppleTV/Atom/RHI.Loader/Glad/Vulkan_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/AppleTV/Atom/RHI.Loader/Glad/Vulkan_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom/RHI.Loader/Glad/Vulkan_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom/RHI.Loader/Glad/Vulkan_Platform.h
index 424f249b8c..6aac0e8cf9 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom/RHI.Loader/Glad/Vulkan_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom/RHI.Loader/Glad/Vulkan_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Linux.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Linux.h
index c98479f01b..b1eda09bf5 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Linux.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
index 69a9b992c7..eaa1043371 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/platform_builders_linux_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/platform_builders_linux_files.cmake
index c1ecac092a..540958e30a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/platform_builders_linux_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/platform_builders_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/platform_private_linux_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/platform_private_linux_files.cmake
index c1ecac092a..540958e30a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/platform_private_linux_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/platform_private_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom/RHI.Loader/Glad/Vulkan_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom/RHI.Loader/Glad/Vulkan_Platform.h
index ad49d2df73..e41e011a88 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom/RHI.Loader/Glad/Vulkan_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom/RHI.Loader/Glad/Vulkan_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Mac.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Mac.h
index 2169e4cb24..b74e649103 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Mac.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
index 43bade07e7..c0e478a775 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/platform_builders_mac_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/platform_builders_mac_files.cmake
index c1ecac092a..540958e30a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/platform_builders_mac_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/platform_builders_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/platform_private_mac_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/platform_private_mac_files.cmake
index c660dd96f0..108d25ff8c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/platform_private_mac_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/platform_private_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom/RHI.Loader/Glad/Vulkan_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom/RHI.Loader/Glad/Vulkan_Platform.h
index ffc9605178..b8a79525de 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom/RHI.Loader/Glad/Vulkan_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom/RHI.Loader/Glad/Vulkan_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom/RHI.Loader/Glad/Vulkan_Windows.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom/RHI.Loader/Glad/Vulkan_Windows.h
index 5d5d1bd2c0..2d0cac9cbf 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom/RHI.Loader/Glad/Vulkan_Windows.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom/RHI.Loader/Glad/Vulkan_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
index 374258e1f8..13d7160cfc 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Windows.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Windows.h
index 0313f0c216..6bb109ae8b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Windows.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/platform_builders_windows_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/platform_builders_windows_files.cmake
index afb0011551..5f26c9bf3d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/platform_builders_windows_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/platform_builders_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/platform_private_windows_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/platform_private_windows_files.cmake
index afb0011551..5f26c9bf3d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/platform_private_windows_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/platform_private_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/Atom/RHI.Loader/Glad/Vulkan_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/Atom/RHI.Loader/Glad/Vulkan_Platform.h
index ad49d2df73..e41e011a88 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/Atom/RHI.Loader/Glad/Vulkan_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/Atom/RHI.Loader/Glad/Vulkan_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/Atom_RHI_Vulkan_precompiled_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/Atom_RHI_Vulkan_precompiled_Platform.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/Atom_RHI_Vulkan_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/Atom_RHI_Vulkan_precompiled_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/platform_builders_ios_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/platform_builders_ios_files.cmake
index c1ecac092a..540958e30a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/platform_builders_ios_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/platform_builders_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/platform_private_ios_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/platform_private_ios_files.cmake
index c1ecac092a..540958e30a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/platform_private_ios_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/iOS/platform_private_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h b/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
index 0caff42b9c..5deff32444 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/PAL_android.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/PAL_android.cmake
index 7d086786a1..4cf10855d3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp
index 15fb9aa32e..1dec884fd0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/Vulkan_Traits_Android.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/Vulkan_Traits_Android.h
index 4932548a11..af81068579 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/Vulkan_Traits_Android.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/Vulkan_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/Vulkan_Traits_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/Vulkan_Traits_Platform.h
index 077f06a4e8..cf580f562e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/Vulkan_Traits_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/Vulkan_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_builders_android_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_builders_android_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_builders_android_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_builders_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_glad_android_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_glad_android_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_glad_android_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_glad_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_private_android_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_private_android_files.cmake
index 2372330c9d..e66650bc75 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_private_android_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_private_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_private_static_android.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_private_static_android.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_private_static_android.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_private_static_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_reflect_android_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_reflect_android_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_reflect_android_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/platform_reflect_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
index f1bf1dad4a..b5f2865135 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Common/Unimplemented/Empty_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
index a225435fe4..be645cc673 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/PAL_linux.cmake
index 7d086786a1..4cf10855d3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI.Builders/BuilderModule_Linux.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI.Builders/BuilderModule_Linux.cpp
index 7ec7271dbc..1eece47e6b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI.Builders/BuilderModule_Linux.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI.Builders/BuilderModule_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp
index 995be4ee19..0d9019a689 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/Vulkan_Traits_Linux.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/Vulkan_Traits_Linux.h
index aeceb5c8a0..2aab99d439 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/Vulkan_Traits_Linux.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/Vulkan_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/Vulkan_Traits_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/Vulkan_Traits_Platform.h
index ab70e8c724..e7a7152a7c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/Vulkan_Traits_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/Vulkan_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_builders_linux_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
index dc407202ad..3ca8e19fda 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_builders_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_glad_linux_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_glad_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_glad_linux_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_glad_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_linux_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_linux_files.cmake
index 9b5f1caa24..c4f90bc1dc 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_linux_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_static_linux.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_static_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_static_linux.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_static_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_reflect_linux_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_reflect_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_reflect_linux_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_reflect_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/PAL_mac.cmake
index 72b9ef10c0..ef3603a066 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/RHI.Builders/BuilderModule_Mac.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/RHI.Builders/BuilderModule_Mac.cpp
index 130db66a09..f72ebb8efe 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/RHI.Builders/BuilderModule_Mac.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/RHI.Builders/BuilderModule_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/Vulkan_Traits_Mac.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/Vulkan_Traits_Mac.h
index aeceb5c8a0..2aab99d439 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/Vulkan_Traits_Mac.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/Vulkan_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/Vulkan_Traits_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/Vulkan_Traits_Platform.h
index 24fff98e0b..c81b0ca2bc 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/Vulkan_Traits_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/Vulkan_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_builders_mac_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
index 59d53b877d..24bdfc4c43 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_builders_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_glad_mac_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_glad_mac_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_glad_mac_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_glad_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_private_mac_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_private_mac_files.cmake
index 394dfcaf2d..e15b805b4f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_private_mac_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_private_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_private_static_mac.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_private_static_mac.cmake
index 569a14d20e..f2e48c3e91 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_private_static_mac.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_private_static_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_reflect_mac_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_reflect_mac_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_reflect_mac_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Mac/platform_reflect_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/PAL_windows.cmake
index 7d086786a1..4cf10855d3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI.Builders/BuilderModule_Windows.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI.Builders/BuilderModule_Windows.cpp
index ead68bdebe..fe48456075 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI.Builders/BuilderModule_Windows.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI.Builders/BuilderModule_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp
index d3d11121ad..ade7241987 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Platform.h
index 214d809d62..dac6c5a738 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Windows.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Windows.h
index 21887ad36d..f9e4e45639 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Windows.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_builders_windows_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
index 08e9c28c3d..161193a04f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_builders_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_glad_windows_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_glad_windows_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_glad_windows_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_glad_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_private_static_windows.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_private_static_windows.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_private_static_windows.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_private_static_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_private_windows_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_private_windows_files.cmake
index 86d78fb6fd..17f6c6d409 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_private_windows_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_private_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_reflect_windows_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_reflect_windows_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_reflect_windows_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/platform_reflect_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/PAL_ios.cmake
index 72b9ef10c0..ef3603a066 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/Vulkan_Traits_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/Vulkan_Traits_Platform.h
index d9094b8b9d..85a7ffb639 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/Vulkan_Traits_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/Vulkan_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/Vulkan_Traits_iOS.h b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/Vulkan_Traits_iOS.h
index b07648bf39..3a002e444f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/Vulkan_Traits_iOS.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/Vulkan_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_builders_ios_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_builders_ios_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_builders_ios_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_builders_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_glad_ios_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_glad_ios_files.cmake
index d745058dd0..0dac6bbc7a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_glad_ios_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_glad_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_private_ios_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_private_ios_files.cmake
index ccd88e8603..2ac5f086fe 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_private_ios_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_private_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_private_static_ios.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_private_static_ios.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_private_static_ios.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_private_static_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_reflect_ios_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_reflect_ios_files.cmake
index d745058dd0..0dac6bbc7a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_reflect_ios_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/iOS/platform_reflect_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
index 92b45c8c84..04a63f3d03 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.h
index 82d757751a..4abdde8dea 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
index e09a34c2dc..dd5b19490d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
index 645ad75720..9e80fef4ef 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterfaceSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/FunctionLoader.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/FunctionLoader.cpp
index 70fa2e2091..d9bbde9e3e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/FunctionLoader.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/FunctionLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/Glad/GladFunctionLoader.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/Glad/GladFunctionLoader.cpp
index 1523ecac5a..0ab9299000 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/Glad/GladFunctionLoader.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/Glad/GladFunctionLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/Glad/GladFunctionLoader.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/Glad/GladFunctionLoader.h
index 55389120e1..967b171d6b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/Glad/GladFunctionLoader.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Loader/Glad/GladFunctionLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
index 2fa945e205..5effa1d0b6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/BufferPoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ImagePoolDescriptor.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ImagePoolDescriptor.cpp
index dfeb89b047..e93f9f12f2 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ImagePoolDescriptor.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ImagePoolDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
index 871875f7e4..5542c2f21e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/PlatformLimitsDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
index 6f61f2ff7a..ffd112ff45 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ReflectSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ShaderDescriptor.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ShaderDescriptor.cpp
index a03abe3a50..e8a0710cbe 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ShaderDescriptor.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ShaderDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ShaderStageFunction.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
index c658ca1db3..9ae89edd3e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Reflect/ShaderStageFunction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp
index 8426c602c8..5c46b2f55a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.h
index 9d1b81c8d8..949b824d77 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp
index 4f8c52e884..e575f08ed6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.h
index 4a09b512da..007dd42fed 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp
index cfee2f2c59..f0824cd3aa 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.h
index e9050ce80f..ba82102e78 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp
index b74daa42cc..2dc32d0149 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.h
index 1d63642ef3..426f9966e7 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp
index 83bed04357..a4683512fc 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.h
index 3651d7ff7f..86477dfe2d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryAllocator.h
index b21530bf27..aac4ed5ee8 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryAllocator.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp
index 2c983212d6..11740621a8 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.h
index 88c37f83b9..899f70c8f0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryView.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryView.h
index aacd93a2b8..e8fd4d121d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryView.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp
index 3c808702a6..69118beffe 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.h
index 9b3bde6f9b..338363b8cc 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp
index 11b4bf6434..112f90f72a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.h
index 0323f1c58e..284831e882 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp
index 8e491e7f33..6b1ed57903 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h
index d0b848ade6..ff249ba676 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp
index 221f2b2515..cc89249072 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.h
index e002a234a0..da19b37302 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp
index 4ce570d714..b0f78f559c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.h
index 70f028268a..0fa8a8b850 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp
index 00cacf7a04..1a6ce942b9 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.h
index 507790ebfd..3663e56a11 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp
index 9c1de9a0e1..c19e1dc183 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.h
index 3bab6d76c7..434203155a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp
index a3ba57c6d2..0b16223c81 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.h
index 402d7fb366..5132b2bd9e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp
index 55dc6ebd9a..d7df4b1044 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.h
index dbd9395f0b..10032be8f7 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp
index 690ce5f056..3144e5635f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.h
index bedbbf9ff8..27d4907832 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp
index 6c1744712d..70f950bcc8 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.h
index 80677d00bd..f92fafe4b4 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp
index b71957644d..23bc2fa523 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.h
index f0c4c66b71..a20d5c35a4 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp
index 754262649a..9ab271303a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.h
index 52bc85d44d..1783ec5f5b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp
index 8aceb76a6f..67b5ed4487 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h
index 64c6348c0f..75a65afc73 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
index d6977ebf19..8aaffaab41 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.h
index ca8ac24ed1..50957655e7 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp
index 02fecfbb06..a183a6b463 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.h
index 977848d044..57c094b542 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Formats.inl b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Formats.inl
index d270a7394d..66c039d2f3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Formats.inl
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Formats.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp
index 3bdeeaa406..cf618fd2de 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.h
index e4f668c821..2b3e422aff 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp
index f1b6198fff..f5fa6e792e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.h
index fb9febd46e..1cec22c5d5 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
index 8863f3fed4..9ce9da9752 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.h
index d00f8872ce..530601e139 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp
index 90aad2fc5a..a69b99dc22 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.h
index 33d8c16809..7558a5fe02 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp
index b29de8c157..85381d77f5 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.h
index 185d437afe..16789b9a39 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
index 54eb88bffc..cef60103c4 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
index 60c6c973e5..79dc273bf6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp
index 7ec183288c..bd8776b2ea 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.h
index 39bd217ee2..74292969e5 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp
index cf1cc81cea..9c2a0f4002 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.h
index e1273c5a6e..d1297de26a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp
index c38514defc..7cdd35ee60 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.h
index adf0061eb0..26aeb8cf05 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
index 131b37b29b..88a02f90c7 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.h
index 1a47c0dc34..fb3d18a5a0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp
index a8978d0744..7586183b63 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.h
index 77ade601e3..7bcb21cd2d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp
index a633d45e4f..928247346d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.h
index 9234496048..32387d33d6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp
index db9f655489..88c5602e7f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.h
index 9175848c03..c3d70a71a2 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp
index 306ffe928c..aa3c77c261 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.h
index f07f95e604..2d320a8013 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp
index ef8cae9b77..d8e05be10a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.h
index a4d0c05b07..efb5895050 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp
index e3ff0df4b0..43a3d19805 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.h
index 7a91c39738..532dc51ff2 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
index 07da21cee0..a98aad801a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.h
index ef42f209ac..060cd8df69 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp
index d0e6444064..b7864e3bbe 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h
index 1babe100f0..4fb24125f6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryAllocator.h
index d77799d776..c3dbd41539 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryAllocator.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp
index 1b8a22caab..c16f28af27 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.h
index 69e17c96ce..63dc5a8afa 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h
index 5b7fdf63e8..6b09022485 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeView.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeView.h
index f386ad3356..c6d45c4970 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeView.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryView.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryView.h
index fb8631e96d..87fbd39f83 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryView.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp
index d4a70ee973..f11d0ed124 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.h
index 5f69a96583..f7289724da 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp
index d2ac22692d..8079bd10bf 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.h
index 112f0d419e..ed042653c0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp
index 8fa5cadae4..bfc0ec79dc 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
index 130b80db89..4aba0f6860 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.h
index b5b375e10e..0af50a8416 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp
index 18205e6016..36560868af 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.h
index 0272a5cc4b..e5790cf0e7 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp
index bf715e0885..d48dec6eee 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.h
index 9b5567cdfd..63f8149b98 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp
index 5bd83023dd..fb9cd8e4f1 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.h
index 0825abf9bd..270c5972f2 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp
index 7d8380d4f3..79958c6dd2 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.h
index a31c6ba4e5..f0a1b66d15 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp
index 25e54e2abb..0a3c11d4ba 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.h
index ca448b35f4..13022ac9ec 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp
index 265ea2b0c7..8b1aca881d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.h
index 13ef0872f9..d6784c8002 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp
index 92e891b886..555577bbfe 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.h
index cda1c555bc..897ec0a05c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp
index 2cfc1a955f..bfa5d8dbe0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.h
index 220fa44d5d..2d967e1f8f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp
index f39001e99f..719c7fc16a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h
index 5232f8fbf6..ce59c7f2c8 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBufferPools.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBufferPools.h
index 120509f6c1..a94a050e33 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBufferPools.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBufferPools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp
index 3a67b6b006..5894d3fdd5 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.h
index 548efaeaef..c8f77b2a59 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
index fce6027568..4dffc5c3da 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h
index 70a3c1b166..8bac2d57b4 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp
index 319d40c292..b6cd3fe04d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.h
index dc2689da00..b955a4d17d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp
index 7d680b2159..ac43ab0589 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h
index 9d68ebcc5d..c570eba572 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ReleaseContainer.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ReleaseContainer.h
index 05adcbac30..48492e5095 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ReleaseContainer.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ReleaseContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ReleaseQueue.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ReleaseQueue.h
index 0ac2ca46b6..423ab756f9 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ReleaseQueue.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ReleaseQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp
index dad85ab824..c66f2467a9 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h
index b0dc7fe270..5e30a0d23f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp
index 06c1d3abd0..403c6fec7a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.h
index 361aa8ed4b..d31d11553e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ResourcePoolResolver.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ResourcePoolResolver.h
index 89fe341e4e..8ee4c26d96 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ResourcePoolResolver.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ResourcePoolResolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp
index b7ee499660..2461ad183c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h
index 01508e807f..487d7b7b55 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp
index 73aeeca3f3..0189b6d325 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.h
index af23432f85..abd796d523 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp
index 751f66aecb..60137d0436 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h
index 8da0f97136..347a523376 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp
index e1c7868af6..9e3dfbbdc2 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.h
index 8c4cfad92d..8412ac7b07 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp
index f8bce1a44f..ffc04b99ff 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.h
index 27eb26b8a8..6b02461c63 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp
index d3a78716f1..527fbf3858 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.h
index 9b58e3bbb3..d8838f3556 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 84cc606989..4871b7027d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.h
index 497da0e7a2..9f38886738 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp
index 38cbc3d2ab..e009f1d29a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.h
index 664614c2fd..bedbccc01b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp
index 6486afe58d..613e280f98 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.h
index 61080a0d75..f89992965d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp
index 808b52c712..3c72b860d9 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
index 0007503517..d356d61cef 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.h
index 54d3873594..b77c305e46 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
index 33c7adbdd5..89e062fb20 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.h
index 3490ff064f..dc423f4af5 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp
index 0f0a4dd4a7..b659dd60af 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.h
index e925ff759a..4167a4d8de 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp
index 12fe8b9421..acb0a33a24 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.h
index b24068ed39..28a0111a64 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp
index d705ac5508..16f170226b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h
index 73ac064ca4..79053ddb40 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_builders_common_files.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_builders_common_files.cmake
index 69aca9cf73..92804d9f97 100644
--- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_builders_common_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_builders_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
index 39d4d3ffc6..8bd07760e0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_glad_files.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_glad_files.cmake
index 42278889d6..6c3be79d31 100644
--- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_glad_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_glad_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_private_common_files.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_private_common_files.cmake
index 7114b95dcd..c797386aa4 100644
--- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_private_common_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_private_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_private_common_shared_files.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_private_common_shared_files.cmake
index 3702f78cac..77fdf502a1 100644
--- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_private_common_shared_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_private_common_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_reflect_common_files.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_reflect_common_files.cmake
index d2d4ac3fce..a9a2aecccb 100644
--- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_reflect_common_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_reflect_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_stub_module.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_stub_module.cmake
index 2cfed2e165..bae9126874 100644
--- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_stub_module.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_stub_module.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Assets/Materials/DefaultMaterial.azsl b/Gems/Atom/RPI/Assets/Materials/DefaultMaterial.azsl
index 3ce597ffdb..a3379b620a 100644
--- a/Gems/Atom/RPI/Assets/Materials/DefaultMaterial.azsl
+++ b/Gems/Atom/RPI/Assets/Materials/DefaultMaterial.azsl
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Assets/Materials/DefaultMaterial_DepthPass.azsl b/Gems/Atom/RPI/Assets/Materials/DefaultMaterial_DepthPass.azsl
index b47d935415..047a8f14f1 100644
--- a/Gems/Atom/RPI/Assets/Materials/DefaultMaterial_DepthPass.azsl
+++ b/Gems/Atom/RPI/Assets/Materials/DefaultMaterial_DepthPass.azsl
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Assets/Shader/DecomposeMsImage.azsl b/Gems/Atom/RPI/Assets/Shader/DecomposeMsImage.azsl
index c455aa764f..30839e3ef3 100644
--- a/Gems/Atom/RPI/Assets/Shader/DecomposeMsImage.azsl
+++ b/Gems/Atom/RPI/Assets/Shader/DecomposeMsImage.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Assets/Shader/ImagePreview.azsl b/Gems/Atom/RPI/Assets/Shader/ImagePreview.azsl
index d625a133e3..3a328e3da7 100644
--- a/Gems/Atom/RPI/Assets/Shader/ImagePreview.azsl
+++ b/Gems/Atom/RPI/Assets/Shader/ImagePreview.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
index 2c89c5986c..d51225f569 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli
index 1e2765966a..4bb83a3464 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultObjectSrg.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultObjectSrg.azsli
index 5967abecef..bc848e3ab6 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultObjectSrg.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultObjectSrg.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli
index 28e6269ee6..f387fafdee 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Assets/atom_rpi_asset_files.cmake b/Gems/Atom/RPI/Assets/atom_rpi_asset_files.cmake
index a2755b2e65..f89ba6f434 100644
--- a/Gems/Atom/RPI/Assets/atom_rpi_asset_files.cmake
+++ b/Gems/Atom/RPI/Assets/atom_rpi_asset_files.cmake
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Assets/generate_asset_cmake.bat b/Gems/Atom/RPI/Assets/generate_asset_cmake.bat
index efa61c4b46..609d13e94d 100644
--- a/Gems/Atom/RPI/Assets/generate_asset_cmake.bat
+++ b/Gems/Atom/RPI/Assets/generate_asset_cmake.bat
@@ -1,5 +1,5 @@
 @ECHO off
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 
@@ -16,7 +16,7 @@ set OUTPUT_FILE=atom_rpi_asset_files.cmake
 
 :: Write copyright header to top of file
 echo # > %OUTPUT_FILE%
-echo # Copyright (c) Contributors to the Open 3D Engine Project >> %OUTPUT_FILE%
+echo # 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. >> %OUTPUT_FILE%
 echo # >> %OUTPUT_FILE%
 echo # SPDX-License-Identifier: Apache-2.0 OR MIT >> %OUTPUT_FILE%
 echo # >> %OUTPUT_FILE%
diff --git a/Gems/Atom/RPI/CMakeLists.txt b/Gems/Atom/RPI/CMakeLists.txt
index 9855348a0c..d4ab6e8516 100644
--- a/Gems/Atom/RPI/CMakeLists.txt
+++ b/Gems/Atom/RPI/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/CMakeLists.txt b/Gems/Atom/RPI/Code/CMakeLists.txt
index db4aed3ab9..71e5d82e48 100644
--- a/Gems/Atom/RPI/Code/CMakeLists.txt
+++ b/Gems/Atom/RPI/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetAliasesSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetAliasesSourceData.h
index 0e23035490..24b5685404 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetAliasesSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetAliasesSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h
index 6ccd3a4f86..798cbd531d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/ColorUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/ColorUtils.h
index 8f8f806630..8250c87ceb 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/ColorUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/ColorUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/ConvertibleSource.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/ConvertibleSource.h
index dda8561fd2..e171dbe46a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/ConvertibleSource.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/ConvertibleSource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonFileLoadContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonFileLoadContext.h
index ab39cf1ddd..ecdc311898 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonFileLoadContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonFileLoadContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonReportingHelper.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonReportingHelper.h
index 6f8cf810aa..84b019275f 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonReportingHelper.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonReportingHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonUtils.h
index 2d43c8d14d..16556ce9c8 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h
index dde65b5508..b603b474fd 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialConverterBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialConverterBus.h
index a73aebe5ed..75b24e28e0 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialConverterBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialConverterBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h
index 0b3fff785b..1372dd3c4e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.h
index daed3c71b6..1ae5c46fc2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.h
index 0ddc60f05d..9a7a34ab06 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyId.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyId.h
index 9ad8c2fd10..19124f2454 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyId.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertySerializer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertySerializer.h
index 889c300734..dc8d36e811 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertySerializer.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertySerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSerializer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSerializer.h
index 2efeef901e..227f2d90de 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSerializer.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h
index cdd7548122..06d17b8a4f 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.h
index 231fd971d1..92e815b230 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceData.h
index e9bf836dba..28f910661d 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h
index ee39c254c1..9284e7277c 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h
index f5e6e2d67c..d439704cef 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h
index 764e0174de..539d34f4f2 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/ResourcePool/ResourcePoolSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/ResourcePool/ResourcePoolSourceData.h
index ce0b63cc10..1eebae1c32 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/ResourcePool/ResourcePoolSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/ResourcePool/ResourcePoolSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderSourceData.h
index ffdf1a8c7b..005e5f3c4e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantAssetCreator.h
index 75a89cf0b5..9a74a2676b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h
index 72a11a6d86..04b06dd9a7 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantTreeAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantTreeAssetCreator.h
index 49dcbcc582..09aedde904 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantTreeAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantTreeAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AssetInitBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AssetInitBus.h
index 8ecf96149a..7607a23e4e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AssetInitBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AssetInitBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h
index 259ae8fd78..dd8fd0c31a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomFeatureProcessorInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomFeatureProcessorInterface.h
index 666a80a2ad..64a7e68caa 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomFeatureProcessorInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomFeatureProcessorInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h
index c6902f82ed..77a45ef7e7 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/Buffer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/Buffer.h
index 28def0c4c4..0edc74358b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/Buffer.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferPool.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferPool.h
index 7acd889f63..5c8c330cf4 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferPool.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferSystem.h
index e6e3b95c57..c173114336 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferSystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferSystemInterface.h
index f6df21a8a0..ebd4decc90 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferSystemInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Buffer/BufferSystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ColorManagement/TransformColor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ColorManagement/TransformColor.h
index bdc215f08d..558310ed6b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ColorManagement/TransformColor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ColorManagement/TransformColor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Culling.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Culling.h
index 4ede292b2d..72d0e3c69c 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Culling.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Culling.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicBuffer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicBuffer.h
index 8ad4762ac2..ec4af08bec 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicBuffer.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicBufferAllocator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicBufferAllocator.h
index cabbee841c..b389db0b50 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicBufferAllocator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicBufferAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
index c730dd1a9f..6c97695d6c 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h
index 40edb4b380..135eee0a84 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h
index 5e85fa7b29..4ec521f2b2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/FeatureProcessor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/FeatureProcessor.h
index f4350df615..bf7534b366 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/FeatureProcessor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/FeatureProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/FeatureProcessorFactory.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/FeatureProcessorFactory.h
index eab8899914..87a3f0787c 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/FeatureProcessorFactory.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/FeatureProcessorFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQuerySystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQuerySystem.h
index 9cbf7fbe57..dbde4ab638 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQuerySystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQuerySystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQuerySystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQuerySystemInterface.h
index 6e0c322b35..2e33022f3c 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQuerySystemInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQuerySystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQueryTypes.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQueryTypes.h
index b46f2baeb9..11dda3ee31 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQueryTypes.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/GpuQueryTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/Query.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/Query.h
index c4e0cbe36e..daa37d0be5 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/Query.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/Query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/QueryPool.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/QueryPool.h
index 69fe2b8082..249e97648f 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/QueryPool.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/QueryPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/TimestampQueryPool.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/TimestampQueryPool.h
index 8cf40de598..8989d708ed 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/TimestampQueryPool.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/GpuQuery/TimestampQueryPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImage.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImage.h
index f0a075bc4d..b66d07f85f 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImage.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImagePool.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImagePool.h
index 4c0c9b1f33..d25aa10894 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImagePool.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/DefaultStreamingImageController.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/DefaultStreamingImageController.h
index b0e9ad9de1..0db7631cc0 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/DefaultStreamingImageController.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/DefaultStreamingImageController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystem.h
index 7f273dc803..61000461b4 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h
index af3fb7af8b..1b0eafb576 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImage.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImage.h
index f174a64c2c..51bf719c0c 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImage.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImageContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImageContext.h
index e8a3e84b40..c846cff5e7 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImageContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImageContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImageController.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImageController.h
index 7f83dd0d6a..b4160f9091 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImageController.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImageController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImagePool.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImagePool.h
index 4dfc1387f7..8d20dc6e02 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImagePool.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/StreamingImagePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/Material.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/Material.h
index 75ed13420a..668ad670d2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/Material.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/Material.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/MaterialReloadNotificationBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/MaterialReloadNotificationBus.h
index 50a0ea24cc..d8fc6d7f2f 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/MaterialReloadNotificationBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/MaterialReloadNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/MaterialSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/MaterialSystem.h
index 2d55e5ac79..3de271c6ab 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/MaterialSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Material/MaterialSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/MeshDrawPacket.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/MeshDrawPacket.h
index 8b300bc77c..bf236cdba5 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/MeshDrawPacket.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/MeshDrawPacket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/Model.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/Model.h
index 33e11d69c2..38bdea857f 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/Model.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/Model.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLod.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLod.h
index db6f59804c..533c5381bb 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLod.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLodUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLodUtils.h
index c2bcec3901..5eb0ae7ada 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLodUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLodUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelSystem.h
index 9fee7d0ef7..ae34dbb76a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/UvStreamTangentBitmask.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/UvStreamTangentBitmask.h
index 93517ae6bb..f5048b77d6 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/UvStreamTangentBitmask.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/UvStreamTangentBitmask.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/AttachmentReadback.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/AttachmentReadback.h
index 451af53d33..9537265fbb 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/AttachmentReadback.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/AttachmentReadback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ComputePass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ComputePass.h
index 164491068f..2d4ac1395a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ComputePass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ComputePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/CopyPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/CopyPass.h
index 5362365840..bd9ec92381 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/CopyPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/CopyPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/FullscreenTrianglePass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/FullscreenTrianglePass.h
index 376641d196..58a12cdc97 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/FullscreenTrianglePass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/FullscreenTrianglePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/MSAAResolvePass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/MSAAResolvePass.h
index c118b02af1..60bb09cb6e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/MSAAResolvePass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/MSAAResolvePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ParentPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ParentPass.h
index bc99648628..a875eedf3b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ParentPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ParentPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h
index 7790f577d6..c6667e660a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassAttachment.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassAttachment.h
index 29ad892e97..3ccf31c9f8 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassAttachment.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassAttachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassDefines.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassDefines.h
index 5b8da6ac23..e61c557fbc 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassDefines.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassDefines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFactory.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFactory.h
index e829e889ee..02280b8277 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFactory.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFilter.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFilter.h
index 270ac5478c..be7596ef50 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassLibrary.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassLibrary.h
index eefad55f3f..4076cf8403 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassLibrary.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassSystem.h
index 6e680d092f..de57e2e3f6 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassSystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassSystemInterface.h
index a207921926..cc66a7c228 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassSystemInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassSystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassUtils.h
index bd817cec60..57f57c6046 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RasterPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RasterPass.h
index 6e6114e567..735b3930c8 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RasterPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RasterPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h
index 37e88b00ed..b13091082b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/DownsampleMipChainPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/DownsampleMipChainPass.h
index 9183e3f251..233d1d9eaf 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/DownsampleMipChainPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/DownsampleMipChainPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/EnvironmentCubeMapPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/EnvironmentCubeMapPass.h
index 9fb83501b0..21b3739f30 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/EnvironmentCubeMapPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/EnvironmentCubeMapPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h
index 86cab3f088..f855154975 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h
index f83c1d899c..0a689f2f74 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SelectorPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SelectorPass.h
index 97f49e4102..6b9559e824 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SelectorPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SelectorPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SwapChainPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SwapChainPass.h
index 404d4f4f5a..e7869d463c 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SwapChainPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/SwapChainPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/PipelineState.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/PipelineState.h
index 994aa6431e..49856b3712 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/PipelineState.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/PipelineState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
index 0f79ab140b..8f0d999ab6 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystemInterface.h
index c9845b519a..0c167b4e08 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystemInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h
index 32f05026d2..b89b14b78d 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RenderPipeline.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RenderPipeline.h
index a80d52be2a..ed455847ad 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RenderPipeline.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RenderPipeline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Scene.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Scene.h
index 1f39dd8b46..6c04e033a2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Scene.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Scene.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/SceneBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/SceneBus.h
index f64b2d77b0..6009deb266 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/SceneBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/SceneBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetrics.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetrics.h
index 2dc0ef7efb..64cfe440b1 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetrics.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetrics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetricsSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetricsSystem.h
index 128eae10ae..1fe0fcb705 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetricsSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetricsSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetricsSystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetricsSystemInterface.h
index e27b063856..f3632d9899 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetricsSystemInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Metrics/ShaderMetricsSystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Shader.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Shader.h
index 61803da608..100c7c32fb 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Shader.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/Shader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadDebugTracker.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadDebugTracker.h
index 55b0f33dc0..67e8fcfcc8 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadDebugTracker.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadDebugTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadNotificationBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadNotificationBus.h
index 3b037afeb6..4eaadfffa1 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadNotificationBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderResourceGroup.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderResourceGroup.h
index 9ad1a3ab2a..27fd0af551 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderResourceGroup.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderResourceGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderResourceGroupPool.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderResourceGroupPool.h
index 69ffb2dc52..1299782d40 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderResourceGroupPool.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderResourceGroupPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderSystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderSystem.h
index 1562fb606f..ff0aee291d 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderSystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderSystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderSystemInterface.h
index 4f4af476f7..92e719bb21 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderSystemInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderSystemInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariant.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariant.h
index 4b281efe9a..8416d0206a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariant.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariantAsyncLoader.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariantAsyncLoader.h
index 1b50f3cafb..840d5d5918 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariantAsyncLoader.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariantAsyncLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
index 13512471c7..f3500647fe 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewProviderBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewProviderBus.h
index dd12625c56..1fa75fbb25 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewProviderBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewProviderBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h
index a66df10643..982ef498a0 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextBus.h
index 6f0f480604..da0c850f3d 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextManager.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextManager.h
index cab0171b43..008565d178 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextManager.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/WindowContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/WindowContext.h
index 9d66821774..fc809c7d39 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/WindowContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/WindowContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/WindowContextBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/WindowContextBus.h
index 139d236e7c..8e4b887b77 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/WindowContextBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/WindowContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetHandler.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetHandler.h
index 165ba969e9..3b256b44ce 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetHandler.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetReference.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetReference.h
index 61559fc39c..f9325ac523 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetReference.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetReference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetUtils.h
index 135512603a..73dfecca04 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetUtils.inl b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetUtils.inl
index 665ab3ec23..cf4a9dc3d7 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetUtils.inl
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/AssetUtils.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/BuiltInAssetHandler.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/BuiltInAssetHandler.h
index a6dc19a0d4..f3b6775349 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/BuiltInAssetHandler.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/BuiltInAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/AssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/AssetCreator.h
index 0cd000d045..12d4a09395 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/AssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/AssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Base.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Base.h
index bcf22ef7b3..f8433d6f52 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Base.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAsset.h
index 50356413ac..fb57032bae 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAssetCreator.h
index b04d3b34bb..19ac35e299 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAssetView.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAssetView.h
index d4c7c72fed..ad95b984d2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAssetView.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Buffer/BufferAssetView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/FeatureProcessorDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/FeatureProcessorDescriptor.h
index be61677c46..a224ee877d 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/FeatureProcessorDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/FeatureProcessorDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/GpuQuerySystemDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/GpuQuerySystemDescriptor.h
index ff6bba0036..31ff39f584 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/GpuQuerySystemDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/GpuQuerySystemDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/AttachmentImageAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/AttachmentImageAsset.h
index d364c47984..1131de0e98 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/AttachmentImageAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/AttachmentImageAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/AttachmentImageAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/AttachmentImageAssetCreator.h
index 61357352c2..a10ec7c320 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/AttachmentImageAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/AttachmentImageAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/DefaultStreamingImageControllerAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/DefaultStreamingImageControllerAsset.h
index 1a4cff2d91..cccbc2df56 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/DefaultStreamingImageControllerAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/DefaultStreamingImageControllerAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/Image.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/Image.h
index b9de0bb1a3..a96dfcf850 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/Image.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/Image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageAsset.h
index fa6d94d719..99066811e2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageMipChainAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageMipChainAsset.h
index 5f734952a2..adcf4f6431 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageMipChainAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageMipChainAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageMipChainAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageMipChainAssetCreator.h
index 4b62496444..98dae8b639 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageMipChainAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageMipChainAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageSystemDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageSystemDescriptor.h
index fd57dfc63a..963ff01f74 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageSystemDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/ImageSystemDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAsset.h
index efb25cb667..0d8a10972e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetCreator.h
index 791af07bbc..dfb10af76b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h
index a07cbfa2b0..aa0f7296d7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageControllerAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageControllerAsset.h
index 815787c938..0cd5586dd5 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageControllerAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageControllerAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImagePoolAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImagePoolAsset.h
index 6d7024d164..ef6c8f1529 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImagePoolAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImagePoolAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImagePoolAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImagePoolAssetCreator.h
index 1589a7e3c3..92246ebe90 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImagePoolAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImagePoolAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Limits.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Limits.h
index 858d364c68..408abd83db 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Limits.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Limits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/LuaMaterialFunctor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/LuaMaterialFunctor.h
index 349b7dab01..0b53835af6 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/LuaMaterialFunctor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/LuaMaterialFunctor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAsset.h
index ef27a1818f..9b2d2dd1bf 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAssetCreator.h
index abb3e47ae6..e9bd3e3b06 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAssetCreatorCommon.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAssetCreatorCommon.h
index c79bbd9106..68b744e691 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAssetCreatorCommon.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialAssetCreatorCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialDynamicMetadata.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialDynamicMetadata.h
index a8119147c9..7ca03da60b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialDynamicMetadata.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialDynamicMetadata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h
index e705c2826f..f6d12fb989 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h
index 0208ebc1a1..bea01dc5e9 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertyDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertyDescriptor.h
index bd29380355..767f2ebcdf 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertyDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertyDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertyValue.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertyValue.h
index 8447568478..0a41d79927 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertyValue.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialPropertyValue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialTypeAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialTypeAsset.h
index dd8d0f4508..ed41056080 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialTypeAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialTypeAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialTypeAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialTypeAssetCreator.h
index d6932359a9..a12081e01a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialTypeAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialTypeAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/ShaderCollection.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/ShaderCollection.h
index 4285c42375..318989c066 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/ShaderCollection.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/ShaderCollection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelAsset.h
index c30116eea0..0a1d1e604b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelAssetCreator.h
index 79b8282a6e..2ad193d4e4 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelKdTree.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelKdTree.h
index 205d076060..cd3f1968bf 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelKdTree.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelKdTree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodAsset.h
index 7c412f9c20..1a206684de 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodAssetCreator.h
index cc0c99933d..fa215b7837 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodIndex.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodIndex.h
index 5424fa7621..5b5295aa88 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodIndex.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelLodIndex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetDelta.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetDelta.h
index d6f609a3e4..edfaea4962 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetDelta.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetDelta.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetMetaAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetMetaAsset.h
index 4f43328116..e399fed424 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetMetaAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetMetaAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetMetaAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetMetaAssetCreator.h
index f6c729ef64..9ba92d05e0 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetMetaAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/MorphTargetMetaAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/SkinMetaAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/SkinMetaAsset.h
index b145ba2ae9..aa1ff3789b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/SkinMetaAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/SkinMetaAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/SkinMetaAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/SkinMetaAssetCreator.h
index 2bf4e9357a..d8eac633e3 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/SkinMetaAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/SkinMetaAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/ComputePassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/ComputePassData.h
index ad17b84efb..f0bc6f29d2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/ComputePassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/ComputePassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/CopyPassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/CopyPassData.h
index a7a5705d6a..17e303fed1 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/CopyPassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/CopyPassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/DownsampleMipChainPassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/DownsampleMipChainPassData.h
index 73ccb4a158..dc2a6a1c22 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/DownsampleMipChainPassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/DownsampleMipChainPassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/EnvironmentCubeMapPassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/EnvironmentCubeMapPassData.h
index b91a3baa34..3f39d4e824 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/EnvironmentCubeMapPassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/EnvironmentCubeMapPassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/FullscreenTrianglePassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/FullscreenTrianglePassData.h
index 90e68597c8..e42a0128da 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/FullscreenTrianglePassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/FullscreenTrianglePassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassAsset.h
index ae1c60e2e2..672490a43e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassAttachmentReflect.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassAttachmentReflect.h
index 98c0cfb98d..353cfcbdaa 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassAttachmentReflect.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassAttachmentReflect.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassData.h
index 4c85debe1b..55e337a741 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassDescriptor.h
index 087fe7c15f..7ca664d0d7 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassName.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassName.h
index 1c1270edfe..d98ad13cb1 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassName.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassName.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassRequest.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassRequest.h
index d64c67e0be..6fcbd2e815 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassRequest.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassRequest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassTemplate.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassTemplate.h
index 0862e17d16..cd6aace53c 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassTemplate.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/PassTemplate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RasterPassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RasterPassData.h
index ce80eaf30f..e36b81f482 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RasterPassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RasterPassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RenderPassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RenderPassData.h
index 803a02a2b5..64cab367c9 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RenderPassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RenderPassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RenderToTexturePassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RenderToTexturePassData.h
index 3cbe15b500..84f6564ab4 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RenderToTexturePassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/RenderToTexturePassData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/RPISystemDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/RPISystemDescriptor.h
index 4ca3731494..fc3f3ccb31 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/RPISystemDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/RPISystemDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/ResourcePoolAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/ResourcePoolAsset.h
index 0a1339b171..a6545357ba 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/ResourcePoolAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/ResourcePoolAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/ResourcePoolAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/ResourcePoolAssetCreator.h
index 9c049fac73..d6a6135ded 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/ResourcePoolAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/ResourcePoolAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/IShaderVariantFinder.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/IShaderVariantFinder.h
index ec3d8a88a0..ce6099644f 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/IShaderVariantFinder.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/IShaderVariantFinder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/PrecompiledShaderAssetSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/PrecompiledShaderAssetSourceData.h
index 25c5240960..185e233db9 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/PrecompiledShaderAssetSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/PrecompiledShaderAssetSourceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAsset.h
index 31f210e67a..6a584e299c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAssetCreator.h
index 51f72e1f6a..95e0d01109 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAssetCreator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderCommonTypes.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderCommonTypes.h
index 41ec9ae37c..0ebfab86f7 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderCommonTypes.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderCommonTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderInputContract.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderInputContract.h
index 57e92477f0..0e81bcdedd 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderInputContract.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderInputContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionGroup.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionGroup.h
index dd43bcd933..1d1e015381 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionGroup.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionGroupLayout.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionGroupLayout.h
index 75da781bdf..f6b164e2aa 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionGroupLayout.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionGroupLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionTypes.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionTypes.h
index f13cdf7877..ebb3becfb2 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionTypes.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOptionTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOutputContract.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOutputContract.h
index c1cb02ee66..5809d4eb85 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOutputContract.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderOutputContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantAsset.h
index 4e11acdf4c..6201bfc2d0 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
index 7b55be89b6..07f98a6c4b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantTreeAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantTreeAsset.h
index 92f7b138a1..be5bb704a8 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantTreeAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantTreeAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/AnyAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/AnyAsset.h
index 52c5acc4c3..bb57d7c571 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/AnyAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/AnyAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/AssetAliases.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/AssetAliases.h
index e52bfd5a4b..9eb6e31216 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/AssetAliases.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/AssetAliases.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/PipelineRenderSettings.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/PipelineRenderSettings.h
index e04f6c626f..2e8204d9fc 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/PipelineRenderSettings.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/PipelineRenderSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/RenderPipelineDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/RenderPipelineDescriptor.h
index 66398d8fcd..5c9f143c7e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/RenderPipelineDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/RenderPipelineDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/SceneDescriptor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/SceneDescriptor.h
index c97e7496a5..7cb6e02f88 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/SceneDescriptor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/System/SceneDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Android/Atom_RPI_Traits_Android.h b/Gems/Atom/RPI/Code/Source/Platform/Android/Atom_RPI_Traits_Android.h
index e5c1403a4c..2857b3a7d6 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Android/Atom_RPI_Traits_Android.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/Android/Atom_RPI_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Android/Atom_RPI_Traits_Platform.h b/Gems/Atom/RPI/Code/Source/Platform/Android/Atom_RPI_Traits_Platform.h
index d94d484d1b..6bf8039f19 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Android/Atom_RPI_Traits_Platform.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/Android/Atom_RPI_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Android/PAL_android.cmake b/Gems/Atom/RPI/Code/Source/Platform/Android/PAL_android.cmake
index 25c80479a0..71dcbbbfbb 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Atom/RPI/Code/Source/Platform/Android/platform_android_files.cmake
index 5af9943848..adb786b9c7 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/Common/Unimplemented/BuilderModule_Stub.cpp b/Gems/Atom/RPI/Code/Source/Platform/Common/Unimplemented/BuilderModule_Stub.cpp
index 82b5194c26..a0d57af0cb 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Common/Unimplemented/BuilderModule_Stub.cpp
+++ b/Gems/Atom/RPI/Code/Source/Platform/Common/Unimplemented/BuilderModule_Stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Linux/Atom_RPI_Traits_Linux.h b/Gems/Atom/RPI/Code/Source/Platform/Linux/Atom_RPI_Traits_Linux.h
index e5c1403a4c..2857b3a7d6 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Linux/Atom_RPI_Traits_Linux.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/Linux/Atom_RPI_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Linux/Atom_RPI_Traits_Platform.h b/Gems/Atom/RPI/Code/Source/Platform/Linux/Atom_RPI_Traits_Platform.h
index e4182b879c..b10b5846fb 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Linux/Atom_RPI_Traits_Platform.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/Linux/Atom_RPI_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/Atom/RPI/Code/Source/Platform/Linux/PAL_linux.cmake
index 25c80479a0..71dcbbbfbb 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Atom/RPI/Code/Source/Platform/Linux/platform_linux_files.cmake
index faf4faf4f9..99ee269918 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/Mac/Atom_RPI_Traits_Mac.h b/Gems/Atom/RPI/Code/Source/Platform/Mac/Atom_RPI_Traits_Mac.h
index e5c1403a4c..2857b3a7d6 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Mac/Atom_RPI_Traits_Mac.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/Mac/Atom_RPI_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Mac/Atom_RPI_Traits_Platform.h b/Gems/Atom/RPI/Code/Source/Platform/Mac/Atom_RPI_Traits_Platform.h
index a68e26995e..ece4848759 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Mac/Atom_RPI_Traits_Platform.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/Mac/Atom_RPI_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/Atom/RPI/Code/Source/Platform/Mac/PAL_mac.cmake
index d63e82c32b..d7c360277f 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Atom/RPI/Code/Source/Platform/Mac/platform_mac_files.cmake
index c5cb13afb5..ad4f6a4997 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/Windows/Atom_RPI_Traits_Platform.h b/Gems/Atom/RPI/Code/Source/Platform/Windows/Atom_RPI_Traits_Platform.h
index 5f02b8662d..63dd5ffce0 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Windows/Atom_RPI_Traits_Platform.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/Windows/Atom_RPI_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Windows/Atom_RPI_Traits_Windows.h b/Gems/Atom/RPI/Code/Source/Platform/Windows/Atom_RPI_Traits_Windows.h
index 397ba846cc..d16333619c 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Windows/Atom_RPI_Traits_Windows.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/Windows/Atom_RPI_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/Atom/RPI/Code/Source/Platform/Windows/PAL_windows.cmake
index 72aee4b533..896f505d05 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Atom/RPI/Code/Source/Platform/Windows/platform_windows_files.cmake
index 3cea511780..00d7db5448 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/iOS/Atom_RPI_Traits_Platform.h b/Gems/Atom/RPI/Code/Source/Platform/iOS/Atom_RPI_Traits_Platform.h
index c29bc9daca..88ed5c5867 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/iOS/Atom_RPI_Traits_Platform.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/iOS/Atom_RPI_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/iOS/Atom_RPI_Traits_iOS.h b/Gems/Atom/RPI/Code/Source/Platform/iOS/Atom_RPI_Traits_iOS.h
index e5c1403a4c..2857b3a7d6 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/iOS/Atom_RPI_Traits_iOS.h
+++ b/Gems/Atom/RPI/Code/Source/Platform/iOS/Atom_RPI_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/Atom/RPI/Code/Source/Platform/iOS/PAL_ios.cmake
index 25c80479a0..71dcbbbfbb 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Atom/RPI/Code/Source/Platform/iOS/platform_ios_files.cmake
index d2382debc9..9d11131021 100644
--- a/Gems/Atom/RPI/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Atom/RPI/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.cpp
index e9fd9ec0d7..d21d2412fa 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.h
index d9de6c074f..316b75a4ca 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderModule.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderModule.cpp
index b38f3218c8..7d7552044a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderModule.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Common/AnyAssetBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Common/AnyAssetBuilder.cpp
index 817494de41..4eadf1e412 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Common/AnyAssetBuilder.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Common/AnyAssetBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Common/AnyAssetBuilder.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Common/AnyAssetBuilder.h
index 3e64b2ee5b..53a60077fa 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Common/AnyAssetBuilder.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Common/AnyAssetBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
index c370aadbcd..856e3cc9d8 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h
index 9599047411..7734a87b77 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp
index 92fa3d96d0..91c9803955 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -69,7 +69,7 @@ namespace AZ
         void MaterialAssetDependenciesComponent::ReportJobDependencies(SceneAPI::JobDependencyList& jobDependencyList, const char* platformIdentifier)
         {
             AssetBuilderSDK::SourceFileDependency materialTypeSource;
-            // Right now, FBX importing only supports a single material type, once that changes, this will have to be re-designed, see ATOM-3554
+            // Right now, scene file importing only supports a single material type, once that changes, this will have to be re-designed, see ATOM-3554
             RPI::MaterialConverterBus::BroadcastResult(materialTypeSource.m_sourceFileDependencyPath, &RPI::MaterialConverterBus::Events::GetMaterialTypePath);
 
             AssetBuilderSDK::JobDependency jobDependency;
@@ -94,7 +94,7 @@ namespace AZ
         {
             // [GFX TODO] I am suggesting we use the first two 16bits for different kind of assets generated from a Scene
             // For example, 0x10000 for mesh, 0x20000 for material, 0x30000 for animation, 0x40000 for scene graph and etc. 
-            // so the subid can be evaluated for reference across different assets generate within this fbx. 
+            // so the subid can be evaluated for reference across different assets generate within this scene file. 
             /*const uint32_t materialPrefix = 0x20000;
             AZ_Assert(materialPrefix > materialId, "materialId should be smaller than materialPrefix");
             return materialPrefix + materialId;*/
@@ -148,7 +148,7 @@ namespace AZ
                     // The source data for generating material asset
                     MaterialSourceData sourceData;
 
-                    // User hook to create their materials based on the data from Fbx pipeline
+                    // User hook to create their materials based on the data from the scene pipeline
                     bool result = false;
                     RPI::MaterialConverterBus::BroadcastResult(result, &RPI::MaterialConverterBus::Events::ConvertMaterial, *materialData, sourceData);
                     if (result)
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.h
index 5ebced902d..809ad092d9 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
index 8d0e8866cf..bfb0979d5c 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -995,7 +995,7 @@ namespace AZ
                 if (numInfluencesExcess > 0)
                 {
                     AZ_Warning(s_builderName, warnedExcessOfSkinInfluences,
-                        "Mesh %s has more skin influences (%d) than the maximum (%d). Skinning influences won't be normalized. Maximum number of skin influences can be increased with a Skin Modifier in FBX Settings.",
+                        "Mesh %s has more skin influences (%d) than the maximum (%d). Skinning influences won't be normalized. Maximum number of skin influences can be increased with a Skin Modifier in Scene Settings.",
                         sourceMesh.m_name.GetCStr(),
                         m_numSkinJointInfluencesPerVertex + numInfluencesExcess,
                         m_numSkinJointInfluencesPerVertex);
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.h
index 0980e1d530..0850b398b0 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.cpp
index 835128498d..b188d02414 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.h
index 1e31c6b541..b648653c58 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterContexts.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterContexts.cpp
index d33e4774ca..f2a513f360 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterContexts.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterContexts.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterContexts.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterContexts.h
index 55c3fd3237..adc3b6f16d 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterContexts.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterContexts.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp
index f6a1906d5b..e3a294209a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.h
index 08185f9d20..204480ee69 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.cpp
index 7acae7eb72..4097fabff4 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.h
index 89194c6c70..7604679505 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp
index d85b950680..b42f886715 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.h
index b07f728680..2186e7b54c 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetAliasesSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetAliasesSourceData.cpp
index bd196f81bf..56b61e0e66 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetAliasesSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetAliasesSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp
index fad1d781fd..c53bf63ac5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/ColorUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/ColorUtils.cpp
index 7bdc1e773a..07c09a57a0 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/ColorUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/ColorUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/ConvertibleSource.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/ConvertibleSource.cpp
index 79047738fe..8ea5bf1fbc 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/ConvertibleSource.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/ConvertibleSource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonFileLoadContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonFileLoadContext.cpp
index 2abd6b2009..e1bd5a16f9 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonFileLoadContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonFileLoadContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonReportingHelper.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonReportingHelper.cpp
index 36ef7edcba..2f321b0dad 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonReportingHelper.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonReportingHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonUtils.cpp
index 97160cc2d9..b525f03b5c 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/LuaMaterialFunctorSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/LuaMaterialFunctorSourceData.cpp
index 69b9ca02a5..63e323f9ee 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/LuaMaterialFunctorSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/LuaMaterialFunctorSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp
index ebd145b775..92e9a594cc 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.cpp
index 31b21be5c7..e32cdf12e3 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp
index 6c672d7a67..49894b7958 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyId.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyId.cpp
index 87f88cd16a..3a04c9af23 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyId.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertySerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertySerializer.cpp
index d19de8fabb..5ca8fff318 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertySerializer.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertySerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp
index 20e2bbc557..38a969dfb2 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceData.cpp
index 9460fd1d83..159b41fa6f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.cpp
index c07a0b0bd3..eee41fdf1b 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
index 939084d126..856550a15a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp
index 1747d5d93d..b526ccdcd7 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
index c771a8e873..0820cb32ca 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
index e8a465d0fc..d462993bb2 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderSourceData.cpp
index fefcab1be9..f5fa6b651c 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantAssetCreator.cpp
index 6b20116394..e0754adf7a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantListSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantListSourceData.cpp
index 57e5560bca..4c5ae47b92 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantListSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantListSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantTreeAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantTreeAssetCreator.cpp
index 07acab3e20..b6d454e818 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantTreeAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantTreeAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Editor/EditorModule.cpp b/Gems/Atom/RPI/Code/Source/RPI.Editor/EditorModule.cpp
index b361ba3c1c..40cce6d382 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Editor/EditorModule.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Editor/EditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Private/Module.cpp b/Gems/Atom/RPI/Code/Source/RPI.Private/Module.cpp
index 88eb9db155..274a34f2b8 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Private/Module.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Private/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Private/Module.h b/Gems/Atom/RPI/Code/Source/RPI.Private/Module.h
index 18d5f3ff98..96b288ce6a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Private/Module.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Private/Module.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Private/RPISystemComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Private/RPISystemComponent.cpp
index 60c066d310..2a9276f382 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Private/RPISystemComponent.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Private/RPISystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Private/RPISystemComponent.h b/Gems/Atom/RPI/Code/Source/RPI.Private/RPISystemComponent.h
index ccaf958de3..62b1d60c54 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Private/RPISystemComponent.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Private/RPISystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/AuxGeomFeatureProcessorInterface.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/AuxGeomFeatureProcessorInterface.cpp
index 381036dd7d..86bc5610b6 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/AuxGeomFeatureProcessorInterface.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/AuxGeomFeatureProcessorInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp
index e6d9b18484..17aa66a808 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferPool.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferPool.cpp
index 91b5d96281..bb2c27b577 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferPool.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferSystem.cpp
index a4f7e357c9..08b57611ea 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/AcesCg_To_LinearSrgb.inl b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/AcesCg_To_LinearSrgb.inl
index 6cf4337f99..fdb3fc81a4 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/AcesCg_To_LinearSrgb.inl
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/AcesCg_To_LinearSrgb.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/ColorConversionConstants.inl b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/ColorConversionConstants.inl
index dcc80e88f0..5d1f5d6969 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/ColorConversionConstants.inl
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/ColorConversionConstants.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/LinearSrgb_To_AcesCg.inl b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/LinearSrgb_To_AcesCg.inl
index f9493e887e..1500347d8e 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/LinearSrgb_To_AcesCg.inl
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/LinearSrgb_To_AcesCg.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/XYZ_To_AcesCg.inl b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/XYZ_To_AcesCg.inl
index 1ced8a21c6..7329f5a6d8 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/XYZ_To_AcesCg.inl
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/GeneratedTransforms/XYZ_To_AcesCg.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/TransformColor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/TransformColor.cpp
index 1d38648b66..f3bb1c79a2 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/TransformColor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ColorManagement/TransformColor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp
index e687c00abe..cd1b0e925a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicBuffer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicBuffer.cpp
index 3e4c77c7f9..bce665a6f6 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicBuffer.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicBufferAllocator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicBufferAllocator.cpp
index 2baab221e3..4738e33f67 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicBufferAllocator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicBufferAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
index 60a6a8397b..a9561112da 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawSystem.cpp
index 05867100a9..f937941edb 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/FeatureProcessor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/FeatureProcessor.cpp
index 1d29ed1520..187152ed73 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/FeatureProcessor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/FeatureProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/FeatureProcessorFactory.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/FeatureProcessorFactory.cpp
index 751049343c..f77267288c 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/FeatureProcessorFactory.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/FeatureProcessorFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQuerySystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQuerySystem.cpp
index 361e6c922f..bf3107cfdf 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQuerySystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQuerySystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQueryTypes.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQueryTypes.cpp
index be01420466..e93a5fe4da 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQueryTypes.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQueryTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/Query.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/Query.cpp
index d13ea88939..c9d3568360 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/Query.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/Query.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/QueryPool.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/QueryPool.cpp
index e3a5fb8fe8..f082720f50 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/QueryPool.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/QueryPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/TimestampQueryPool.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/TimestampQueryPool.cpp
index 8091b3e171..9e1e505e20 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/TimestampQueryPool.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/TimestampQueryPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Image/AttachmentImage.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/AttachmentImage.cpp
index b2b8c6e570..9c1f0df022 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/AttachmentImage.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/AttachmentImage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Image/AttachmentImagePool.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/AttachmentImagePool.cpp
index fdad9cf134..5dc61cec3a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/AttachmentImagePool.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/AttachmentImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Image/DefaultStreamingImageController.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/DefaultStreamingImageController.cpp
index c99bd53187..334d2e26a0 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/DefaultStreamingImageController.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/DefaultStreamingImageController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp
index 2b57361fca..d5e02f1619 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImage.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImage.cpp
index 477f183054..04098392b6 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImage.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageContext.cpp
index b9aefba2d2..d742e878a5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageController.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageController.cpp
index 51d974e004..6863a11ec2 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageController.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImagePool.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImagePool.cpp
index 1c81180c80..1824362398 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImagePool.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImagePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp
index 27801227a2..2aa6f14467 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Material/MaterialSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/MaterialSystem.cpp
index f31da46f18..c311cd7c29 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Material/MaterialSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/MaterialSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/MeshDrawPacket.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/MeshDrawPacket.cpp
index 73843c2d02..2a0f3fd906 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/MeshDrawPacket.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/MeshDrawPacket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -12,6 +12,7 @@
 #include <Atom/RPI.Public/Scene.h> 
 #include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
 #include <Atom/RHI/DrawPacketBuilder.h>
+#include <Atom/RHI/RHISystemInterface.h>
 #include <AzCore/Console/Console.h>
 
 namespace AZ
@@ -154,6 +155,40 @@ namespace AZ
             auto appendShader = [&](const ShaderCollection::Item& shaderItem)
             {
                 AZ_PROFILE_SCOPE(Debug::ProfileCategory::AzRender, "appendShader()");
+
+                // Skip the shader item without creating the shader instance
+                // if the mesh is not going to be rendered based on the draw tag
+                RHI::RHISystemInterface* rhiSystem = RHI::RHISystemInterface::Get();
+                RHI::DrawListTagRegistry* drawListTagRegistry = rhiSystem->GetDrawListTagRegistry();
+
+                // Use the explicit draw list override if exists.
+                RHI::DrawListTag drawListTag = shaderItem.GetDrawListTagOverride();
+
+                if (drawListTag.IsNull())
+                {
+                    Data::Asset<RPI::ShaderAsset> shaderAsset = shaderItem.GetShaderAsset();
+                    if (!shaderAsset.IsReady())
+                    {
+                        // The shader asset needs to be loaded before we can check the draw tag.
+                        // If it's not loaded yet, the instance database will do a blocking load
+                        // when we create the instance below, so might as well load it now.
+                        shaderAsset.QueueLoad();
+
+                        if (shaderAsset.IsLoading())
+                        {
+                            shaderAsset.BlockUntilLoadComplete();
+                        }
+                    }
+
+                    drawListTag = drawListTagRegistry->FindTag(shaderAsset->GetDrawListName());
+                }
+
+                if (!parentScene.HasOutputForPipelineState(drawListTag))
+                {
+                    // drawListTag not found in this scene, so don't render this item
+                    return false;
+                }
+
                 Data::Instance<Shader> shader = RPI::Shader::FindOrCreate(shaderItem.GetShaderAsset());
                 if (!shader)
                 {
@@ -243,21 +278,7 @@ namespace AZ
                     drawSrg->Compile();
                 }
 
-                // Use the default draw list tag from the shader variant.
-                RHI::DrawListTag drawListTag = shader->GetDrawListTag();
-
-                // Use the explicit draw list override if exist.
-                RHI::DrawListTag runtimeTag = shaderItem.GetDrawListTagOverride();
-                if (!runtimeTag.IsNull())
-                {
-                    drawListTag = runtimeTag;
-                }
-
-                if (!parentScene.ConfigurePipelineState(drawListTag, pipelineStateDescriptor))
-                {
-                    // drawListTag not found in this scene, so don't render this item
-                    return false;
-                }
+                parentScene.ConfigurePipelineState(drawListTag, pipelineStateDescriptor);
 
                 const RHI::PipelineState* pipelineState = shader->AcquirePipelineState(pipelineStateDescriptor);
                 if (!pipelineState)
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp
index 56e18f2dba..14d65d7800 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp
index c0b522c419..9a3d1be4b5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLodUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLodUtils.cpp
index 1b7f8ca064..b90fef6baa 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLodUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLodUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelSystem.cpp
index 63df8a9e0f..a7917524b7 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Model/UvStreamTangentBitmask.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/UvStreamTangentBitmask.cpp
index e4f0013dfe..0418d3fd39 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/UvStreamTangentBitmask.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/UvStreamTangentBitmask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp
index 7e94b4c7ad..793801de5b 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ComputePass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ComputePass.cpp
index e74ba7ac56..308a02cb82 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ComputePass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ComputePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/CopyPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/CopyPass.cpp
index d0af52da76..3be4702895 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/CopyPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/CopyPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/FullscreenTrianglePass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/FullscreenTrianglePass.cpp
index ef3ce362f5..5d3f6031c3 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/FullscreenTrianglePass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/FullscreenTrianglePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/MSAAResolvePass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/MSAAResolvePass.cpp
index 14ce79eeb5..7b11c35e85 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/MSAAResolvePass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/MSAAResolvePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ParentPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ParentPass.cpp
index f1521ee005..74537a50ec 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ParentPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ParentPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
index 1caefc9cf3..9d3a776b80 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassAttachment.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassAttachment.cpp
index 8a2dc85b7e..a7b0f05fff 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassAttachment.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassAttachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFactory.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFactory.cpp
index d83ee73db3..2fc96219cd 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFactory.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFilter.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFilter.cpp
index 3e6670eeac..033d55c1be 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFilter.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFilter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassLibrary.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassLibrary.cpp
index fb642f2b5a..29b753985f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassLibrary.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
index 12983b7ee3..91cc645947 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassUtils.cpp
index afd070dfb4..a7e5880d4f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RasterPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RasterPass.cpp
index 8a6b08827a..ee38c1e5ef 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RasterPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RasterPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
index 68dcbc2616..f82d4bd9ef 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/DownsampleMipChainPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/DownsampleMipChainPass.cpp
index 6410167763..3a97d99bba 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/DownsampleMipChainPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/DownsampleMipChainPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/EnvironmentCubeMapPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/EnvironmentCubeMapPass.cpp
index 15bcfc0eb8..8486ba79c5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/EnvironmentCubeMapPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/EnvironmentCubeMapPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
index 60a817d989..0241d6ec25 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/RenderToTexturePass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/RenderToTexturePass.cpp
index b2bddfc54d..8b4c9b8aab 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/RenderToTexturePass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/RenderToTexturePass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SelectorPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SelectorPass.cpp
index 97a41572d9..8032d40360 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SelectorPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SelectorPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SwapChainPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SwapChainPass.cpp
index a51e75e774..7a3bf3a011 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SwapChainPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/SwapChainPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/PipelineState.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/PipelineState.cpp
index a1e7a3bb3a..0538b728bc 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/PipelineState.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/PipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
index af9f7b34d3..f0ba300c7a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp
index 31f8301ff8..da2bf933dc 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
index c0dc88435a..a91dc3c211 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp
index 7487b8a2d3..dc37b3c609 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Metrics/ShaderMetrics.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Metrics/ShaderMetrics.cpp
index 49e9006490..906ecd05af 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Metrics/ShaderMetrics.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Metrics/ShaderMetrics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Metrics/ShaderMetricsSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Metrics/ShaderMetricsSystem.cpp
index 506bcd723d..114917b7b4 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Metrics/ShaderMetricsSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Metrics/ShaderMetricsSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
index 39634c7e0b..0ca6138122 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderReloadDebugTracker.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderReloadDebugTracker.cpp
index 8aa2afcaf4..34af9db0df 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderReloadDebugTracker.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderReloadDebugTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp
index e8cabc1785..2ccb7e783b 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroupPool.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroupPool.cpp
index 09c45b384e..d8c69cf8a0 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroupPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderSystem.cpp
index d87695b842..2796a6ba51 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariant.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariant.cpp
index ea21f796cd..beedb5919f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariant.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariant.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariantAsyncLoader.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariantAsyncLoader.cpp
index ac9e34fcea..825156cd3e 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariantAsyncLoader.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariantAsyncLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
index af530d8225..dbaf2363c4 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
index 03bea98584..23d5805c12 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContextManager.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContextManager.cpp
index 2ae6b29642..552304557f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContextManager.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContextManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Public/WindowContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/WindowContext.cpp
index 28ec95a8ec..7a5982c10d 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/WindowContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/WindowContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/AssetReference.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/AssetReference.cpp
index 9474dc2414..f29cc078e5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/AssetReference.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/AssetReference.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/AssetUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/AssetUtils.cpp
index c5c688365c..fe245da186 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/AssetUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/AssetUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/BuiltInAssetHandler.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/BuiltInAssetHandler.cpp
index 22bfc9babc..28dcef840f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/BuiltInAssetHandler.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Asset/BuiltInAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Base.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Base.cpp
index f6d4c1fa4c..2f36420558 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Base.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAsset.cpp
index e4550ef5ce..1d61fb098e 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetCreator.cpp
index 01928a1970..584a224012 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetView.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetView.cpp
index ef8d97ab01..935d60ba2f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetView.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/FeatureProcessorDescriptor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/FeatureProcessorDescriptor.cpp
index 9b5f494cfd..8ce1df7d4e 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/FeatureProcessorDescriptor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/FeatureProcessorDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/GpuQuerySystemDescriptor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/GpuQuerySystemDescriptor.cpp
index f4cf1583f9..5e97dab776 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/GpuQuerySystemDescriptor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/GpuQuerySystemDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/AttachmentImageAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/AttachmentImageAsset.cpp
index 76860083bf..e0f88a2b09 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/AttachmentImageAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/AttachmentImageAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/AttachmentImageAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/AttachmentImageAssetCreator.cpp
index 8caeecd8ae..22a7c88a8f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/AttachmentImageAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/AttachmentImageAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/DefaultStreamingImageControllerAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/DefaultStreamingImageControllerAsset.cpp
index 8b01f8a6ec..b11522ffe0 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/DefaultStreamingImageControllerAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/DefaultStreamingImageControllerAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/Image.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/Image.cpp
index d76f1d0605..ea5876b0d9 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/Image.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageAsset.cpp
index ef4e34f72c..eb079a20fd 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageMipChainAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageMipChainAsset.cpp
index e47a0a944e..5bc2e60237 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageMipChainAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageMipChainAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageMipChainAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageMipChainAssetCreator.cpp
index b4211bd850..4b1053d45c 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageMipChainAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageMipChainAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageSystemDescriptor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageSystemDescriptor.cpp
index 8d73fe9511..72741b098b 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageSystemDescriptor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/ImageSystemDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAsset.cpp
index fa5b53cdb3..a11de204d3 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetCreator.cpp
index 342d33b756..62d087e336 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp
index 046e7308d1..1d0fddbd38 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageControllerAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageControllerAsset.cpp
index 4510faf619..9046897968 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageControllerAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageControllerAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImagePoolAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImagePoolAsset.cpp
index 1511590bdc..f03eb48278 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImagePoolAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImagePoolAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImagePoolAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImagePoolAssetCreator.cpp
index db4cec3feb..aea70b977c 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImagePoolAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImagePoolAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
index d42deaa66e..5f9cd5c7ce 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
index 848259e43c..23b0c253da 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAssetCreator.cpp
index 3f07d0981d..dae44b38be 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAssetCreatorCommon.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAssetCreatorCommon.cpp
index 04aae0a1cf..bdb3553a20 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAssetCreatorCommon.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAssetCreatorCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialDynamicMetadata.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialDynamicMetadata.cpp
index e32b624ede..b7e2bddabf 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialDynamicMetadata.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialDynamicMetadata.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp
index d179b2fc3a..33d0657fbf 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertiesLayout.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertiesLayout.cpp
index 1d85c1d00f..224def7188 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertiesLayout.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertiesLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyDescriptor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyDescriptor.cpp
index 31e7aba4cb..3fa2b398d9 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyDescriptor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
index eab7a1ff7f..54dd18c6d4 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialTypeAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialTypeAsset.cpp
index 153f3cb4c9..d35b811075 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialTypeAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialTypeAsset.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialTypeAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialTypeAssetCreator.cpp
index 2091eb28c5..f6c49574eb 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialTypeAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialTypeAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/ShaderCollection.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/ShaderCollection.cpp
index 7448bdcb36..b7b9ca2d26 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/ShaderCollection.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/ShaderCollection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
index bf0e4eb584..eb4f5a53c0 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAssetCreator.cpp
index 0cd964bde3..82e15db7ad 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelKdTree.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelKdTree.cpp
index fd3ddfa4eb..54ec002893 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelKdTree.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelKdTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelLodAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelLodAsset.cpp
index 3b98d50a93..c686a9fc11 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelLodAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelLodAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelLodAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelLodAssetCreator.cpp
index dbbc1cc9c7..b8a9afa91a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelLodAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelLodAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetDelta.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetDelta.cpp
index c4e514edd5..60b4b77f76 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetDelta.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetDelta.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetMetaAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetMetaAsset.cpp
index 1190ae2dd4..7de13a6578 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetMetaAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetMetaAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetMetaAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetMetaAssetCreator.cpp
index 010305aa2b..d08dad6064 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetMetaAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/MorphTargetMetaAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/SkinMetaAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/SkinMetaAsset.cpp
index a617c27ef2..8dbee89393 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/SkinMetaAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/SkinMetaAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/SkinMetaAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/SkinMetaAssetCreator.cpp
index 9dfb03a3ff..871afe0a93 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/SkinMetaAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/SkinMetaAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassAsset.cpp
index 2971d365f3..5c83d70fe6 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassAttachmentReflect.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassAttachmentReflect.cpp
index 97df324eb1..52527f3afe 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassAttachmentReflect.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassAttachmentReflect.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassRequest.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassRequest.cpp
index ac24e54c9c..d1b9eebc56 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassRequest.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassRequest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassTemplate.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassTemplate.cpp
index cb0cfffa1c..34ebbbad66 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassTemplate.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Pass/PassTemplate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/RPISystemDescriptor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/RPISystemDescriptor.cpp
index e4be6e81fe..5d05d595c9 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/RPISystemDescriptor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/RPISystemDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/ResourcePoolAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/ResourcePoolAsset.cpp
index f48939abef..026820e952 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/ResourcePoolAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/ResourcePoolAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/ResourcePoolAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/ResourcePoolAssetCreator.cpp
index 640bedf622..6e1cfa95fb 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/ResourcePoolAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/ResourcePoolAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/PrecompiledShaderAssetSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/PrecompiledShaderAssetSourceData.cpp
index ad8da41ffa..1bf476cf07 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/PrecompiledShaderAssetSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/PrecompiledShaderAssetSourceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp
index 069c33e295..58d2a0e394 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetCreator.cpp
index 864419ca17..29d919bb4f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetVariant.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetVariant.cpp
index 00f0ceaab4..8b88a9055f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetVariant.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetVariant.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetVariantCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetVariantCreator.cpp
index ee3486c2c9..ac223cb6c5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetVariantCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAssetVariantCreator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderInputContract.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderInputContract.cpp
index ca32177187..67bffadec9 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderInputContract.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderInputContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroup.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroup.cpp
index e0960339fb..d06efb690f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroup.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroupLayout.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroupLayout.cpp
index 945409c5ed..7247b305b5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroupLayout.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroupLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOutputContract.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOutputContract.cpp
index 9213cf3ab1..da93644738 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOutputContract.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOutputContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderStageType.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderStageType.cpp
index 3c893552eb..e82ea882ad 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderStageType.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderStageType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantAsset.cpp
index e453036b4f..fd0ba511aa 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantKey.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantKey.cpp
index 62bad1d0e8..0018b23a31 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantKey.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantKey.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantTreeAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantTreeAsset.cpp
index eaedf11fe5..eb235a047a 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantTreeAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantTreeAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/AnyAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/AnyAsset.cpp
index 5673230691..f31fa00ebb 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/AnyAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/AnyAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/AssetAliases.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/AssetAliases.cpp
index 76599b5c4f..3fac520477 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/AssetAliases.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/AssetAliases.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/RenderPipelineDescriptor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/RenderPipelineDescriptor.cpp
index 34762e2543..5015e4e273 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/RenderPipelineDescriptor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/RenderPipelineDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/SceneDescriptor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/SceneDescriptor.cpp
index 31cbd68d7a..87c0a095b6 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/SceneDescriptor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/System/SceneDescriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests.Builders/AnyAssetBuilderTest.cpp b/Gems/Atom/RPI/Code/Tests.Builders/AnyAssetBuilderTest.cpp
index 3d628c1ce9..3c66380de4 100644
--- a/Gems/Atom/RPI/Code/Tests.Builders/AnyAssetBuilderTest.cpp
+++ b/Gems/Atom/RPI/Code/Tests.Builders/AnyAssetBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests.Builders/AtomRPIBuildersTests.cpp b/Gems/Atom/RPI/Code/Tests.Builders/AtomRPIBuildersTests.cpp
index 78091743cc..aa1e2fea28 100644
--- a/Gems/Atom/RPI/Code/Tests.Builders/AtomRPIBuildersTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests.Builders/AtomRPIBuildersTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.cpp b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.cpp
index 4ff85f244d..dc9c695a31 100644
--- a/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.cpp
+++ b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
index 40074589a1..3ee8b31bcd 100644
--- a/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
+++ b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests.Builders/PassBuilderTest.cpp b/Gems/Atom/RPI/Code/Tests.Builders/PassBuilderTest.cpp
index 00fd238224..85fddb9dfc 100644
--- a/Gems/Atom/RPI/Code/Tests.Builders/PassBuilderTest.cpp
+++ b/Gems/Atom/RPI/Code/Tests.Builders/PassBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests.Builders/ResourcePoolBuilderTest.cpp b/Gems/Atom/RPI/Code/Tests.Builders/ResourcePoolBuilderTest.cpp
index 2d36123837..52d4f670ea 100644
--- a/Gems/Atom/RPI/Code/Tests.Builders/ResourcePoolBuilderTest.cpp
+++ b/Gems/Atom/RPI/Code/Tests.Builders/ResourcePoolBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests.Editor/AtomRPIEditorTests.cpp b/Gems/Atom/RPI/Code/Tests.Editor/AtomRPIEditorTests.cpp
index c1a3f38d30..3aa2d146c6 100644
--- a/Gems/Atom/RPI/Code/Tests.Editor/AtomRPIEditorTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests.Editor/AtomRPIEditorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp b/Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp
index b49ffbd05f..e8587d5566 100644
--- a/Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.cpp b/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.cpp
index 8d46824339..ee3948a93c 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h b/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
index 83779a457d..be847f872f 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.cpp b/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.cpp
index 580637df6d..aeb1a89abf 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.h b/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.h
index bb7bd02f7a..a5c603bf51 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp b/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp
index c889daf1ae..3944254b9e 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.h b/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.h
index ec85b8b760..168a27d51d 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinderTests.cpp b/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinderTests.cpp
index 69a56d743d..8bd974456c 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinderTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.cpp b/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.cpp
index e1b94dd991..e8c4ffe231 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.h b/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.h
index 49689119f4..abe9cac3b4 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/RHI/Factory.cpp b/Gems/Atom/RPI/Code/Tests/Common/RHI/Factory.cpp
index b594beec6f..ecb9dd862f 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/RHI/Factory.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/RHI/Factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/RHI/Factory.h b/Gems/Atom/RPI/Code/Tests/Common/RHI/Factory.h
index 01599247e7..da5a532e1a 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/RHI/Factory.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/RHI/Factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.cpp b/Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.cpp
index a43c6b6d45..285b66107f 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.h b/Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.h
index b9d90f5275..e351f1e0fd 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp
index 1ca4d0728f..7e116e7917 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h
index 7ec15dc347..6a1db4ee07 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/SerializeTester.h b/Gems/Atom/RPI/Code/Tests/Common/SerializeTester.h
index 9de35e8342..7f443d3f31 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/SerializeTester.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/SerializeTester.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/TestFeatureProcessors.h b/Gems/Atom/RPI/Code/Tests/Common/TestFeatureProcessors.h
index 5b1cdb2199..29bf30c554 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/TestFeatureProcessors.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/TestFeatureProcessors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Common/TestUtils.h b/Gems/Atom/RPI/Code/Tests/Common/TestUtils.h
index 2416b72b00..09b6740433 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/TestUtils.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/TestUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp b/Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp
index 45ffa74b8e..f98dab8d16 100644
--- a/Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/LuaMaterialFunctorTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/LuaMaterialFunctorTests.cpp
index 808be49b70..6bdb2333ec 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/LuaMaterialFunctorTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/LuaMaterialFunctorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTestUtils.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTestUtils.cpp
index 219385b420..d394bfb2bb 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTestUtils.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTestUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTestUtils.h b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTestUtils.h
index 2f4de2e9ca..8361a3c0ba 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTestUtils.h
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTestUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp
index 90deaa461f..eb0498c700 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorSourceDataSerializerTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorSourceDataSerializerTests.cpp
index 21fae99bae..3e2cf3919d 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorSourceDataSerializerTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorSourceDataSerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorTests.cpp
index 63d91ca8ea..cda8ddd39e 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertySerializerTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertySerializerTests.cpp
index 1c9a5110c4..f4596fd8f7 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertySerializerTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertySerializerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertyValueSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertyValueSourceDataTests.cpp
index 85c69915e8..26d1d23b62 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertyValueSourceDataTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertyValueSourceDataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp
index 5586c33700..1e41d495c9 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
index 702f0f9145..97cc16cfc9 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp
index c8f6c22148..1207348bb9 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeSourceDataTests.cpp
index a558b5c0d3..63a60c69d1 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeSourceDataTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeSourceDataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
index 7bc9ed5d11..e727cbc18e 100644
--- a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Pass/PassTests.cpp b/Gems/Atom/RPI/Code/Tests/Pass/PassTests.cpp
index ba43b3239d..07beab91fc 100644
--- a/Gems/Atom/RPI/Code/Tests/Pass/PassTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Pass/PassTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/Shader/ShaderTests.cpp b/Gems/Atom/RPI/Code/Tests/Shader/ShaderTests.cpp
index 1649df34ac..9aab5c963f 100644
--- a/Gems/Atom/RPI/Code/Tests/Shader/ShaderTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Shader/ShaderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupBufferTests.cpp b/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupBufferTests.cpp
index edf68a19eb..7a74b72d66 100644
--- a/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupBufferTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupBufferTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupConstantBufferTests.cpp b/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupConstantBufferTests.cpp
index 617af7ae3e..9786706f71 100644
--- a/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupConstantBufferTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupConstantBufferTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupGeneralTests.cpp b/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupGeneralTests.cpp
index 9ab5835a7c..b6e811231c 100644
--- a/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupGeneralTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupGeneralTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupImageTests.cpp b/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupImageTests.cpp
index 40360b651b..e06b7f21d7 100644
--- a/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupImageTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/ShaderResourceGroup/ShaderResourceGroupImageTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/System/FeatureProcessorFactoryTests.cpp b/Gems/Atom/RPI/Code/Tests/System/FeatureProcessorFactoryTests.cpp
index ccbe657a65..24e2c62fd0 100644
--- a/Gems/Atom/RPI/Code/Tests/System/FeatureProcessorFactoryTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/System/FeatureProcessorFactoryTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/System/GpuQueryTests.cpp b/Gems/Atom/RPI/Code/Tests/System/GpuQueryTests.cpp
index 530345d63e..a2ac9b4a72 100644
--- a/Gems/Atom/RPI/Code/Tests/System/GpuQueryTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/System/GpuQueryTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/System/RenderPipelineTests.cpp b/Gems/Atom/RPI/Code/Tests/System/RenderPipelineTests.cpp
index ddaea38795..1db56b71ec 100644
--- a/Gems/Atom/RPI/Code/Tests/System/RenderPipelineTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/System/RenderPipelineTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/System/SceneTests.cpp b/Gems/Atom/RPI/Code/Tests/System/SceneTests.cpp
index f3dfd3adfa..32e54fff41 100644
--- a/Gems/Atom/RPI/Code/Tests/System/SceneTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/System/SceneTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/Tests/System/ViewTests.cpp b/Gems/Atom/RPI/Code/Tests/System/ViewTests.cpp
index d499b62939..359bea6a19 100644
--- a/Gems/Atom/RPI/Code/Tests/System/ViewTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/System/ViewTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/RPI/Code/atom_rpi_builders_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_builders_files.cmake
index 9888da7bc9..a3aaead2ad 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_builders_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_builders_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_builders_shared_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_builders_shared_files.cmake
index 7edf0c1a6b..405d217028 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_builders_shared_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_builders_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_builders_stub_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_builders_stub_files.cmake
index ba6bf13838..bc765a8e64 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_builders_stub_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_builders_stub_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_builders_tests_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_builders_tests_files.cmake
index 97645ed8f2..cc6542aa5b 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_builders_tests_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_builders_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake
index bd63ef8a13..3f7af56d7d 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_editor_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_editor_files.cmake
index 77c8cf1b29..4431d05843 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_editor_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_editor_tests_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_editor_tests_files.cmake
index 43ec1c6823..cecfb066a5 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_editor_tests_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_masked_occlusion_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_masked_occlusion_files.cmake
index 5291fff053..a637df7e5c 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_masked_occlusion_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_masked_occlusion_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_private_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_private_files.cmake
index 1b5838acfa..642a5fde37 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_private_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_private_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_private_shared_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_private_shared_files.cmake
index 4345a86402..fec9907b53 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_private_shared_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_private_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_public_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_public_files.cmake
index edef6ab1de..94160f6e46 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_public_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_public_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_reflect_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_reflect_files.cmake
index 94f5c758a2..f697b3c70e 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_reflect_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_reflect_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/atom_rpi_tests_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_tests_files.cmake
index 75f638414a..0d56504b2b 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_tests_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Code/rpi_shared_files.cmake b/Gems/Atom/RPI/Code/rpi_shared_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/RPI/Code/rpi_shared_files.cmake
+++ b/Gems/Atom/RPI/Code/rpi_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Tools/CMakeLists.txt b/Gems/Atom/RPI/Tools/CMakeLists.txt
index 9cb50067e0..bf70b6db47 100644
--- a/Gems/Atom/RPI/Tools/CMakeLists.txt
+++ b/Gems/Atom/RPI/Tools/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/RPI/Tools/README.txt b/Gems/Atom/RPI/Tools/README.txt
index 6bfeddf2e8..0744fd8fa6 100644
--- a/Gems/Atom/RPI/Tools/README.txt
+++ b/Gems/Atom/RPI/Tools/README.txt
@@ -1,4 +1,4 @@
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/RPI/Tools/__init__.py b/Gems/Atom/RPI/Tools/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/Gems/Atom/RPI/Tools/__init__.py
+++ b/Gems/Atom/RPI/Tools/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/RPI/Tools/atom_rpi_tools/pass_data.py b/Gems/Atom/RPI/Tools/atom_rpi_tools/pass_data.py
index 2a569ee553..a3f28973a8 100644
--- a/Gems/Atom/RPI/Tools/atom_rpi_tools/pass_data.py
+++ b/Gems/Atom/RPI/Tools/atom_rpi_tools/pass_data.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/__init__.py b/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/__init__.py
+++ b/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/test_pass_template.py b/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/test_pass_template.py
index 3fb10bee26..5cefce47bf 100644
--- a/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/test_pass_template.py
+++ b/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/test_pass_template.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/test_utils.py b/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/test_utils.py
index ddc6be0948..e12f2764a9 100644
--- a/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/test_utils.py
+++ b/Gems/Atom/RPI/Tools/atom_rpi_tools/tests/test_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/RPI/Tools/atom_rpi_tools/utils.py b/Gems/Atom/RPI/Tools/atom_rpi_tools/utils.py
index a3bb17a4be..8c3648c743 100644
--- a/Gems/Atom/RPI/Tools/atom_rpi_tools/utils.py
+++ b/Gems/Atom/RPI/Tools/atom_rpi_tools/utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/RPI/Tools/setup.py b/Gems/Atom/RPI/Tools/setup.py
index f521c9f2d0..b858bcdce4 100644
--- a/Gems/Atom/RPI/Tools/setup.py
+++ b/Gems/Atom/RPI/Tools/setup.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_Common.azsli b/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_Common.azsli
index 1c196523c5..22b1888af4 100644
--- a/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_Common.azsli
+++ b/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_Common.azsli
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_ForwardPass.azsl b/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_ForwardPass.azsl
index ca4be5d542..a995572555 100644
--- a/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_ForwardPass.azsl
+++ b/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_ForwardPass.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/TestData/TestData/Materials/Types/MinimalPBR_ForwardPass.azsl b/Gems/Atom/TestData/TestData/Materials/Types/MinimalPBR_ForwardPass.azsl
index 67d6230d63..4c5f6861a7 100644
--- a/Gems/Atom/TestData/TestData/Materials/Types/MinimalPBR_ForwardPass.azsl
+++ b/Gems/Atom/TestData/TestData/Materials/Types/MinimalPBR_ForwardPass.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/CMakeLists.txt b/Gems/Atom/Tools/AtomToolsFramework/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/CMakeLists.txt
+++ b/Gems/Atom/Tools/AtomToolsFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
index a2c246c287..5d38a4fc0b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalServer.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalServer.h
index ea10e24100..7ef73ebf1c 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalServer.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalSocket.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalSocket.h
index b76b817e69..2bd2d75fc4 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalSocket.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Communication/LocalSocket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h
index d67c8da4cc..d7b96d2942 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h
index 3a58ab72bd..5880dcd571 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicProperty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicPropertyGroup.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicPropertyGroup.h
index b5a79438a5..188851881a 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicPropertyGroup.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/DynamicProperty/DynamicPropertyGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorGroupHeaderWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorGroupHeaderWidget.h
index 0d097a631f..2038ed661f 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorGroupHeaderWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorGroupHeaderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorGroupWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorGroupWidget.h
index 0f150d94dd..2b5bb3b283 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorGroupWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorGroupWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorNotificationBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorNotificationBus.h
index 717607c792..0bf635e7cb 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorNotificationBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorPropertyGroupWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorPropertyGroupWidget.h
index de98b99e71..dc78ef4a02 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorPropertyGroupWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorPropertyGroupWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorRequestBus.h
index 5fe92353f5..72f92b2cd3 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorRequestBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorWidget.h
index fa9eb2cf2e..b1a720c11b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Inspector/InspectorWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
index f891c74a1e..14152b9018 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h
index e7c1b8b569..789de5579a 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
index 6731ea9761..543927d85f 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
index d4f412eafd..f639c7f72f 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
index 8f872de26a..c649031280 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.cpp
index a7ae022fee..1c0a870e2c 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h
index 1a1d30a787..cdca8d9537 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp
index ef1ca89299..31f2647268 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.h
index e658d634b5..5eae9181c1 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalServer.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalServer.cpp
index 6e5d17276f..6a0cae0395 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalServer.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalServer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalSocket.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalSocket.cpp
index 265a5ec12a..8cd226bf52 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalSocket.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Communication/LocalSocket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp
index 331dbb013d..4ec3bc16bf 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp
index f6bfa76e39..4f404d48f3 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicPropertyGroup.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicPropertyGroup.cpp
index 56009ca19c..d8855ae488 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicPropertyGroup.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicPropertyGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorGroupHeaderWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorGroupHeaderWidget.cpp
index 0c4dbbc95c..a1a26616fb 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorGroupHeaderWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorGroupHeaderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorGroupWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorGroupWidget.cpp
index cc917e1044..37f0b4e15b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorGroupWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorGroupWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorPropertyGroupWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorPropertyGroupWidget.cpp
index 8a7c6d5871..b6680b9018 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorPropertyGroupWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorPropertyGroupWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp
index cbe8b85b26..8ecdde3b9f 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
index 062d9b81be..c16b9a0e85 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp
index ad80091267..8db35affb1 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
index a875e496b7..6e4aa23ef1 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
index 0fb6001c62..529652e1a9 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
index 546422eaed..c8f640dfe0 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
index cbd8b2c64a..817840221a 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_shared_files.cmake b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_shared_files.cmake
index f3ac4a5824..95349635c4 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_shared_files.cmake
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/CMakeLists.txt b/Gems/Atom/Tools/CMakeLists.txt
index 59e95673fd..57a9a9c8c9 100644
--- a/Gems/Atom/Tools/CMakeLists.txt
+++ b/Gems/Atom/Tools/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/CMakeLists.txt b/Gems/Atom/Tools/MaterialEditor/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/Tools/MaterialEditor/CMakeLists.txt
+++ b/Gems/Atom/Tools/MaterialEditor/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
index a390a6761e..3e12485d67 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Core/MaterialDocumentFactoryRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Core/MaterialDocumentFactoryRequestBus.h
index b2113df5c3..07bc4270e8 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Core/MaterialDocumentFactoryRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Core/MaterialDocumentFactoryRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h
index dbdb769989..36fd30a32b 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentNotificationBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentNotificationBus.h
index 2acf722838..156346bcdd 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentNotificationBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h
index f4a434af35..366c941ef7 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSettings.h
index 712e0b2db0..bc8dd0372d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSettings.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSystemRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSystemRequestBus.h
index b90199d8cc..29b26a493b 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSystemRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSystemRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h
index ad92304f35..2e2e47c150 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportModule.h
index bebc15887f..5b1ae99a8f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportModule.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h
index 367c286556..da92b7cc93 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
index a204904b32..2aacbff21b 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportSettings.h
index 11d6dd8848..d90bfe41fe 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportSettings.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMetrics.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMetrics.h
index 138115fdb4..472e84b48a 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMetrics.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMetrics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h
index a3db00b7dd..c54250808c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowFactoryRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowFactoryRequestBus.h
index ab85e96ede..9d189d37eb 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowFactoryRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowFactoryRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h
index 0b84cdcfbb..570265da85 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowNotificationBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowNotificationBus.h
index 48923b0799..ac86372237 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowNotificationBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowRequestBus.h
index a06dc0560e..1d7fdbc6e9 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowSettings.h
index deeee308cf..ac7c088e36 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowSettings.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
index d541eb7076..35b835dc19 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h
index 26735431f4..41510fd2fa 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp
index e917d45fb6..26b0c34210 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp
index 6a68d1305c..d94b4b8b52 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp
index 811dd69845..1607e3a6cd 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h
index 9778328bcb..d0513fe616 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
index 983b7df872..a5435106c6 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
index b8f0d078ee..4d23cc640f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Android/PAL_android.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Android/PAL_android.cmake
index cd89180efa..5bcd605d84 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Android/platform_android_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Linux.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Linux.cpp
index db46c51184..b6e596507b 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Linux.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Linux.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Linux.h
index 3d24be2dc2..e713bab2e6 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Linux.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Platform.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Platform.h
index a43b4e5364..45aeadecb9 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Platform.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/PAL_linux.cmake
index 9d4b98ae81..bbbd15ab57 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/platform_linux_files.cmake
index 13684db0fe..dc8daef655 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/tool_dependencies_linux.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/tool_dependencies_linux.cmake
index 9b94acda14..65109e0bc8 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/tool_dependencies_linux.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/tool_dependencies_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Mac.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Mac.cpp
index db46c51184..b6e596507b 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Mac.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Traits_Mac.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Traits_Mac.h
index c336c52803..76c728b567 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Traits_Mac.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Traits_Platform.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Traits_Platform.h
index cd769ee481..e2871a65eb 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Traits_Platform.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/MaterialEditor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/PAL_mac.cmake
index 9d4b98ae81..bbbd15ab57 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/platform_mac_files.cmake
index d4a7b73ceb..18747c9176 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/tool_dependencies_mac.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/tool_dependencies_mac.cmake
index 9b94acda14..65109e0bc8 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/tool_dependencies_mac.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Mac/tool_dependencies_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Traits_Platform.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Traits_Platform.h
index 63b6b50943..de2c3a2a1b 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Traits_Platform.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Traits_Windows.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Traits_Windows.h
index eba595bb24..3f396ae0a1 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Traits_Windows.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Windows.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Windows.cpp
index f84d19ef6a..6a55d18f2f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Windows.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/MaterialEditor_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/PAL_windows.cmake
index 9d4b98ae81..bbbd15ab57 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/platform_windows_files.cmake
index e55074ed5f..a7a169de8c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/tool_dependencies_windows.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/tool_dependencies_windows.cmake
index 9e802b2f46..c285258429 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/tool_dependencies_windows.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Windows/tool_dependencies_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/iOS/PAL_ios.cmake
index cd89180efa..5bcd605d84 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/iOS/platform_ios_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp
index 4a17df06c1..2df43fc34a 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.h
index d5eaf80fa4..e30e33971e 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp
index 77615c4c61..718611660d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h
index 4105a50276..ea9c2994db 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp
index 070efd20ce..6a8a8d1906 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h
index eb32c62291..dbd9e7625c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
index 869535ed81..cec10d2caa 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h
index 501035a399..82e0c41043 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp
index 660ac6e78c..37da4f1680 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h
index ca8d026468..83cd43e46f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp
index ba18db5212..9db02a3c61 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h
index f1aa5ae1c4..3562be6dd4 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp
index 5c76bf5f51..045df65b74 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h
index eec25049ad..a1dd5b809d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp
index 42c6006d66..747eb3eb18 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h
index 4caf902e05..af9806eec7 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp
index b521dbe392..edd9c9bb5d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h
index efd36938c0..9579d797f7 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
index 54fd1cf828..a83bd71708 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
index bf72210b64..d700c7201f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp
index d741d61015..3b133d27b2 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
index 4e31f782b4..32b7fa70a7 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h
index e1b172f361..e126419c74 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp
index e67405ec5a..6137a9ad93 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.cpp
index 8d9816d350..e2bda2c755 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.h
index 0ec0b769de..d58c721a94 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp
index aa4aa34b4a..e37550b198 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h
index c182320945..2aa417da09 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp
index bacd8ffe86..b15995932d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h
index 5673d60cd2..d8dd1b9b2d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp
index 359b983581..4c498223a1 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h
index 6db125a422..2973957f0f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.cpp
index 92f97f3659..30ff76fd8c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.h
index 0ea9a4c839..f52ca98139 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialBrowserWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qss b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qss
index 00da666878..bb87883440 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qss
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp
index 5fa75759dc..95643f6e29 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.h
index 1065633f27..865fa69351 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
index 037e3727d7..7c3a912b95 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -63,7 +63,7 @@ namespace MaterialEditor
         auto mainWindowWrapper =
             new AzQtComponents::WindowDecorationWrapper(AzQtComponents::WindowDecorationWrapper::OptionAutoTitleBarButtons);
         mainWindowWrapper->setGuest(this);
-        mainWindowWrapper->enableSaveRestoreGeometry("amazon", "MaterialEditor", "mainWindowGeometry");
+        mainWindowWrapper->enableSaveRestoreGeometry("O3DE", "MaterialEditor", "mainWindowGeometry");
 
         // set the style sheet for RPE highlighting and other styling
         AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral(":/MaterialEditor.qss"));
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h
index c23cbfd466..165767ecc5 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp
index 06b510fba6..948482d19d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h
index 3ecbee19a5..cf52e0706f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp
index 88f164fbe1..23c865933f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp
index bbe5bc483a..840fcd12f6 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
index b005e76567..bfa01dc90d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
index 8a5309b1ca..c3288a6ae2 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp
index 97f28a4369..24cf0c7f85 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h
index 0947c9319a..945336b4a1 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp
index f190fe680e..57848cad06 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h
index 64d80c67e1..d24795e983 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp
index 2f0c323ac7..eab8da73ee 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h
index c7729d066b..82152344ea 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp
index cac61e13bc..8d00649539 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h
index b518f45557..5c8b045a34 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsDialog.cpp
index 9872eacc4f..ae330010a8 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsDialog.h
index 992c59e91d..24f4ed933c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsDialog.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.cpp
index c8c1c34d30..6c3a6a63aa 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h
index 752e408c96..e2fd9c8a16 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/StatusBar/StatusBarWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/StatusBar/StatusBarWidget.cpp
index 9ddacb9255..628bf5a6b4 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/StatusBar/StatusBarWidget.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/StatusBar/StatusBarWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/StatusBar/StatusBarWidget.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/StatusBar/StatusBarWidget.h
index 20144a5af4..43c2c5c77a 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/StatusBar/StatusBarWidget.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/StatusBar/StatusBarWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp
index 6ac200e010..03e753485c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h
index c99d72a784..b0ab817b9c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp
index e34257ed40..e68cc57126 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h
index 96f844a4dc..0b493dbe22 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp
index 8a38cdfdc1..8dc3b738a8 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h
index 2f7eaa1b9b..f4ec1e0c46 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp
index 950e62e6be..b0c6e6dfa6 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h
index b1e4902677..393d460952 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
index ab779d2277..d1b937fde0 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -24,8 +24,8 @@
 
 int main(int argc, char** argv)
 {
-    QApplication::setOrganizationName("Amazon");
-    QApplication::setOrganizationDomain("amazon.com");
+    QApplication::setOrganizationName("O3DE");
+    QApplication::setOrganizationDomain("o3de.org");
     QApplication::setApplicationName("O3DE Material Editor");
 
     AzQtComponents::PrepareQtPaths();
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/resource.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/resource.h
index 8cd7c2bc49..3e58e34b39 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/resource.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake
index 22ffcf0087..4dd8978f24 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_win_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_win_files.cmake
index 936d8f981b..c8a27c789c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_win_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_win_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake
index f91c173a27..a4e904a126 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake
index 5ee02c7a01..bd20f6bf08 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake
index 81423af183..fa9acc7b1d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Code/tool_dependencies.cmake b/Gems/Atom/Tools/MaterialEditor/Code/tool_dependencies.cmake
index acc7edcbd8..d3f48f6550 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/tool_dependencies.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/tool_dependencies.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/MaterialEditor/Scripts/GenerateAllMaterialScreenshots.py b/Gems/Atom/Tools/MaterialEditor/Scripts/GenerateAllMaterialScreenshots.py
index 13ed6569f2..7409ff1764 100755
--- a/Gems/Atom/Tools/MaterialEditor/Scripts/GenerateAllMaterialScreenshots.py
+++ b/Gems/Atom/Tools/MaterialEditor/Scripts/GenerateAllMaterialScreenshots.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/Tools/ShaderManagementConsole/CMakeLists.txt b/Gems/Atom/Tools/ShaderManagementConsole/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/CMakeLists.txt
+++ b/Gems/Atom/Tools/ShaderManagementConsole/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/CMakeLists.txt b/Gems/Atom/Tools/ShaderManagementConsole/Code/CMakeLists.txt
index f59f13156f..eba932eda9 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Core/ShaderManagementConsoleRequestBus.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Core/ShaderManagementConsoleRequestBus.h
index d78f03a2b4..252f5b672c 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Core/ShaderManagementConsoleRequestBus.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Core/ShaderManagementConsoleRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentModule.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentModule.h
index 6558492ca1..164045ed34 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentModule.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentNotificationBus.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentNotificationBus.h
index 3e3171d111..7055150a6c 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentNotificationBus.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentRequestBus.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentRequestBus.h
index 0232f02b03..30b5345a8e 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentRequestBus.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentSystemRequestBus.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentSystemRequestBus.h
index 4e54b5c4ab..dc71125ddd 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentSystemRequestBus.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Document/ShaderManagementConsoleDocumentSystemRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowModule.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowModule.h
index ba6bd38ca8..eb29626237 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowModule.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowNotificationBus.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowNotificationBus.h
index 286acd981a..31d1f68cc3 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowNotificationBus.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowRequestBus.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowRequestBus.h
index 8bc9c8afe4..b0e66bd4ba 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowRequestBus.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Include/Atom/Window/ShaderManagementConsoleWindowRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp
index 90dade93c7..00564b3bb6 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.h
index d5bc2b43ac..00b81bd6ef 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentModule.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentModule.cpp
index 0bd3dd572d..9291167479 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentModule.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.cpp
index b4961cab9b..ca40c8d558 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.h
index 02f0df283b..1ec1235c82 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/PAL_android.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/PAL_android.cmake
index 76ac7e4e1d..fba63af52d 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/platform_android_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/tool_dependencies_android.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/tool_dependencies_android.cmake
index 9b94acda14..65109e0bc8 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/tool_dependencies_android.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Android/tool_dependencies_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/PAL_linux.cmake
index 76ac7e4e1d..fba63af52d 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/platform_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/tool_dependencies_linux.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/tool_dependencies_linux.cmake
index 9b94acda14..65109e0bc8 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/tool_dependencies_linux.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Linux/tool_dependencies_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/PAL_mac.cmake
index 39fb2291b8..5528d88868 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Mac.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Mac.cpp
index f7dc30a35e..83e17d0aa7 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Mac.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Traits_Mac.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Traits_Mac.h
index ac0f30bf8c..5ee9fabe94 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Traits_Mac.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Traits_Platform.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Traits_Platform.h
index 3db16d9a5d..d6599b875b 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Traits_Platform.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/ShaderManagementConsole_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/platform_mac_files.cmake
index e23de1b1bc..f706bcf544 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/tool_dependencies_mac.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/tool_dependencies_mac.cmake
index 9b94acda14..65109e0bc8 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/tool_dependencies_mac.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Mac/tool_dependencies_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/PAL_windows.cmake
index 39fb2291b8..5528d88868 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Traits_Platform.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Traits_Platform.h
index b6fd796761..f7a884a79b 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Traits_Platform.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Traits_Windows.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Traits_Windows.h
index cd6d335d55..699d1ca3b1 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Traits_Windows.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Windows.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Windows.cpp
index 9298c2cdba..6638b41180 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Windows.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/ShaderManagementConsole_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/platform_windows_files.cmake
index 0e67645705..fa3b532156 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/tool_dependencies_windows.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/tool_dependencies_windows.cmake
index 9e802b2f46..c285258429 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/tool_dependencies_windows.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/Windows/tool_dependencies_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/PAL_ios.cmake
index 76ac7e4e1d..fba63af52d 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/platform_ios_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/tool_dependencies_ios.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/tool_dependencies_ios.cmake
index 9b94acda14..65109e0bc8 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/tool_dependencies_ios.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Platform/iOS/tool_dependencies_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp
index afa9de129b..770dd67116 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
index cdc569c69b..4ac0549076 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.cpp
index 596c7048a5..6580cb3395 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.h
index 5dddd34b44..7d7caffbcd 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserInteractions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserWidget.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserWidget.cpp
index cb14280a63..9e6cdf9608 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserWidget.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserWidget.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserWidget.h
index c071c32a44..68177ac23a 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserWidget.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleBrowserWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
index d1a6aecc22..103299a361 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h
index 0eae4c1172..0f8824f809 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.cpp
index 62230825da..a1d7cd01cb 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h
index 7ac9cfc5da..4c568c9f25 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowModule.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowModule.cpp
index e6197287f2..465cd32184 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowModule.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp
index a0bdc838d5..ec73be2715 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.h
index 00970631e4..87abba48a7 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp
index 05634103ae..d3130cd28a 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/resource.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/resource.h
index 8cd7c2bc49..3e58e34b39 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/resource.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
index 56849f5366..e674f733eb 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_win_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_win_files.cmake
index 4b2e7ca5d1..fdf1425194 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_win_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_win_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsoledocument_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsoledocument_files.cmake
index d6849fc77e..f75ab055d4 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsoledocument_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsoledocument_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsolewindow_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsolewindow_files.cmake
index d405ba1e17..ae3525f4f3 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsolewindow_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsolewindow_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Code/tool_dependencies.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/tool_dependencies.cmake
index acc7edcbd8..d3f48f6550 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/tool_dependencies.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/tool_dependencies.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py b/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
index 2c2ce7cb3b..eafe4efc66 100755
--- a/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Atom/Utils/CMakeLists.txt b/Gems/Atom/Utils/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Atom/Utils/CMakeLists.txt
+++ b/Gems/Atom/Utils/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Utils/Code/CMakeLists.txt b/Gems/Atom/Utils/Code/CMakeLists.txt
index 39928f314f..b164325557 100644
--- a/Gems/Atom/Utils/Code/CMakeLists.txt
+++ b/Gems/Atom/Utils/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Utils/Code/Include/Atom/Utils/AssetCollectionAsyncLoader.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/AssetCollectionAsyncLoader.h
index 792039fddd..16e666925d 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/AssetCollectionAsyncLoader.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/AssetCollectionAsyncLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/DdsFile.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/DdsFile.h
index 00c36faeba..4a46166611 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/DdsFile.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/DdsFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h
index cf8fdcd661..1dd2622603 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl
index eb62a6f092..7551cf50dc 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -9,6 +9,7 @@
 #include <Atom/RPI.Public/RPISystemInterface.h>
 #include <AzCore/IO/Path/Path_fwd.h>
 #include <AzCore/std/time.h>
+#include <AzCore/std/containers/set.h>
 
 namespace AZ
 {
@@ -30,6 +31,13 @@ namespace AZ
                 const AZStd::string threadIdText = AZStd::string::format("Thread: %zu", static_cast<size_t>(threadId));
                 ImGui::Text(threadIdText.c_str());
             }
+            inline float TicksToMs(AZStd::sys_time_t ticks)
+            {
+                // Note: converting to microseconds integer before converting to milliseconds float
+                const AZStd::sys_time_t ticksPerSecond = AZStd::GetTimeTicksPerSecond();
+                AZ_Assert(ticksPerSecond >= 1000, "Error in converting ticks to ms, expected ticksPerSecond >= 1000");
+                return static_cast<float>((ticks * 1000) / (ticksPerSecond / 1000)) / 1000.0f;
+            }
         }
 
         inline void ImGuiCpuProfiler::Draw(bool& keepDrawing, const AZ::RHI::CpuTimingStatistics& currentCpuTimingStatistics)
@@ -73,9 +81,7 @@ namespace AZ
 
                 const auto ShowTimeInMs = [ticksPerSecond](AZStd::sys_time_t duration)
                 {
-                    // Note: converting to microseconds integer before converting to milliseconds float
-                    const float timeInMs = static_cast<float>((duration * 1000) / (ticksPerSecond / 1000)) / 1000.0f;
-                    ImGui::Text("%.2f ms", timeInMs);
+                    ImGui::Text("%.2f ms", CpuProfilerImGuiHelper::TicksToMs(duration));
                 };
 
                 const auto ShowRow = [ticksPerSecond, &ShowTimeInMs](const char* regionLabel, AZStd::sys_time_t duration)
@@ -117,19 +123,36 @@ namespace AZ
                     ImGui::NextColumn();
 
                     // Draw the thread count label
-                    const AZStd::string threadLabel = AZStd::string::format("Threads: %u", static_cast<uint32_t>(regions.size()));
+                    AZStd::sys_time_t totalTime = 0;
+                    AZStd::set<AZStd::thread_id> threads;
+                    for (ThreadRegionEntry& entry : regions) // Find the thread count and total execution time for all threads
+                    {
+                        threads.insert(entry.m_threadId);
+                        totalTime += entry.m_endTick - entry.m_startTick;
+                    }
+                    const AZStd::string threadLabel = AZStd::string::format("Threads: %u", static_cast<uint32_t>(threads.size()));
                     ImGui::Text(threadLabel.c_str());
                     DrawRegionHoverMarker(regions);
                     ImGui::NextColumn();
 
-                    // Draw the region time label
-                    ShowTimeInMs(duration);
+                    // Draw the overall invocation count
+                    const AZStd::string invocationLabel = AZStd::string::format("Total calls: %u", static_cast<uint32_t>(regions.size()));
+                    ImGui::Text(invocationLabel.c_str());
+                    DrawRegionHoverMarker(regions);
+                    ImGui::NextColumn();
+
+                    // Draw the time labels (max and then total)
+                    const AZStd::string timeLabel =
+                        AZStd::string::format("%.2f ms max, %.2f ms total",
+                        CpuProfilerImGuiHelper::TicksToMs(duration),
+                        CpuProfilerImGuiHelper::TicksToMs(totalTime));
+                    ImGui::Text(timeLabel.c_str());
                     ImGui::NextColumn();
                 };
 
                 // Set column settings.
                 ImGui::Columns(2, "view", false);
-                ImGui::SetColumnWidth(0, 540.0f);
+                ImGui::SetColumnWidth(0, 660.0f);
                 ImGui::SetColumnWidth(1, 100.0f);
 
                 ShowRow("Frame to Frame Time", cpuTimingStatistics.m_frameToFrameTime);
@@ -152,14 +175,15 @@ namespace AZ
                         // Draw the regions
                         if (ImGui::TreeNodeEx(timeRegionMapEntry.first.c_str(), ImGuiTreeNodeFlags_DefaultOpen))
                         {
-                            ImGui::Columns(3, "view", false);
+                            ImGui::Columns(4, "view", false);
                             ImGui::SetColumnWidth(0, 400.0f);
                             ImGui::SetColumnWidth(1, 100.0f);
-                            ImGui::SetColumnWidth(2, 80.0f);
+                            ImGui::SetColumnWidth(2, 150.0f);
+                            ImGui::SetColumnWidth(3, 240.0f);
 
                             for (auto& reigon : timeRegionMapEntry.second)
                             {
-                                // Calculate the thread with the longest execution time
+                                // Calculate the region with the longest execution time
                                 AZStd::sys_time_t threadExecutionElapsed = 0;
                                 for (ThreadRegionEntry& entry : reigon.second)
                                 {
@@ -209,19 +233,21 @@ namespace AZ
             m_groupRegionMap.clear();
 
             // Get the latest TimeRegionMap
-            RHI::CpuProfiler::TimeRegionMap timeRegionMap;
-            RHI::CpuProfiler::Get()->FlushTimeRegionMap(timeRegionMap);
+            const RHI::CpuProfiler::TimeRegionMap& timeRegionMap = RHI::CpuProfiler::Get()->GetTimeRegionMap();
 
             // Iterate through all the cached regions from all threads, and add the entries to this map
-            for (auto& treadEntry : timeRegionMap)
+            for (auto& threadEntry : timeRegionMap)
             {
-                for (auto& cachedRegionEntry : treadEntry.second)
+                for (auto& cachedRegionEntry : threadEntry.second)
                 {
-                    RegionEntryMap& groupRegionEntry = m_groupRegionMap[cachedRegionEntry.second.m_groupRegionName->m_groupName];
-                    AZStd::vector<ThreadRegionEntry>& regionArray = groupRegionEntry[cachedRegionEntry.second.m_groupRegionName->m_regionName];
-                    RHI::CachedTimeRegion& cachedRegion = cachedRegionEntry.second;
+                    const AZStd::string& regionName = cachedRegionEntry.first;
+                    for (auto& cachedRegion : cachedRegionEntry.second)
+                    {
+                        const AZStd::string& groupName = cachedRegion.m_groupRegionName->m_groupName;
 
-                    regionArray.push_back({ treadEntry.first, cachedRegion.m_startTick, cachedRegion.m_endTick });
+                        m_groupRegionMap[groupName][regionName].push_back(
+                            { threadEntry.first, cachedRegion.m_startTick, cachedRegion.m_endTick });
+                    }
                 }
             }
         }
diff --git a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCullingDebug.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCullingDebug.h
index e41e2376e3..02a9beb16f 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCullingDebug.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCullingDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCullingDebug.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCullingDebug.inl
index f525130981..cea5b0be7f 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCullingDebug.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCullingDebug.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiFrameVisualizer.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiFrameVisualizer.h
index d87d794a35..ef7ada9beb 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiFrameVisualizer.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiFrameVisualizer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiFrameVisualizer.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiFrameVisualizer.inl
index d9fa30dbc9..ba133c979a 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiFrameVisualizer.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiFrameVisualizer.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.h
index 500c45cff4..2af3ff2764 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.inl
index bdaed85c63..94a5412391 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h
index c34d506b62..e735852926 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
index af4cbfe085..cd53131933 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiShaderMetrics.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiShaderMetrics.h
index c71cb25056..bed19c39f8 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiShaderMetrics.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiShaderMetrics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiShaderMetrics.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiShaderMetrics.inl
index 7b8c452f70..90e745068f 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiShaderMetrics.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiShaderMetrics.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiTransientAttachmentProfiler.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiTransientAttachmentProfiler.h
index 283d775e46..8d2bac281b 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiTransientAttachmentProfiler.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiTransientAttachmentProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiTransientAttachmentProfiler.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiTransientAttachmentProfiler.inl
index e5ce49300c..8963ef7402 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiTransientAttachmentProfiler.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiTransientAttachmentProfiler.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/ImageComparison.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImageComparison.h
index 1e81745f7b..bcbad23611 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImageComparison.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImageComparison.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/PpmFile.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/PpmFile.h
index 72849e5138..68bdc7bd34 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/PpmFile.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/PpmFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.h
index 822bbd216c..a2cdac75e6 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.inl
index a71eb8f33e..0b9a8b593f 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/Utils.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/Utils.h
index fd4cb0f240..e1caa2bfbf 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/Utils.h
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Include/Atom/Utils/Utils.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/Utils.inl
index 8abd386775..c1e93d7467 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/Utils.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/Utils.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Platform/Android/platform_android.cmake b/Gems/Atom/Utils/Code/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Utils/Code/Platform/Android/platform_android.cmake
+++ b/Gems/Atom/Utils/Code/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Utils/Code/Platform/Linux/platform_linux.cmake b/Gems/Atom/Utils/Code/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Utils/Code/Platform/Linux/platform_linux.cmake
+++ b/Gems/Atom/Utils/Code/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Utils/Code/Platform/Mac/platform_mac.cmake b/Gems/Atom/Utils/Code/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Utils/Code/Platform/Mac/platform_mac.cmake
+++ b/Gems/Atom/Utils/Code/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Utils/Code/Platform/Windows/platform_windows.cmake b/Gems/Atom/Utils/Code/Platform/Windows/platform_windows.cmake
index 0f4d24e88a..7106cdfd1f 100644
--- a/Gems/Atom/Utils/Code/Platform/Windows/platform_windows.cmake
+++ b/Gems/Atom/Utils/Code/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Utils/Code/Platform/iOS/platform_ios.cmake b/Gems/Atom/Utils/Code/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Atom/Utils/Code/Platform/iOS/platform_ios.cmake
+++ b/Gems/Atom/Utils/Code/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Utils/Code/Source/AssetCollectionAsyncLoader.cpp b/Gems/Atom/Utils/Code/Source/AssetCollectionAsyncLoader.cpp
index 1002f5909e..e6714fe9a4 100644
--- a/Gems/Atom/Utils/Code/Source/AssetCollectionAsyncLoader.cpp
+++ b/Gems/Atom/Utils/Code/Source/AssetCollectionAsyncLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Source/DdsFile.cpp b/Gems/Atom/Utils/Code/Source/DdsFile.cpp
index a63ef10d45..60495eb785 100644
--- a/Gems/Atom/Utils/Code/Source/DdsFile.cpp
+++ b/Gems/Atom/Utils/Code/Source/DdsFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Source/ImageComparison.cpp b/Gems/Atom/Utils/Code/Source/ImageComparison.cpp
index 0ebb8643df..216990c001 100644
--- a/Gems/Atom/Utils/Code/Source/ImageComparison.cpp
+++ b/Gems/Atom/Utils/Code/Source/ImageComparison.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Source/PpmFile.cpp b/Gems/Atom/Utils/Code/Source/PpmFile.cpp
index e630af4f01..2e545c4da8 100644
--- a/Gems/Atom/Utils/Code/Source/PpmFile.cpp
+++ b/Gems/Atom/Utils/Code/Source/PpmFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Source/Utils.cpp b/Gems/Atom/Utils/Code/Source/Utils.cpp
index ce3ede4b18..fa3605cb5a 100644
--- a/Gems/Atom/Utils/Code/Source/Utils.cpp
+++ b/Gems/Atom/Utils/Code/Source/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Tests/ImageComparisonTests.cpp b/Gems/Atom/Utils/Code/Tests/ImageComparisonTests.cpp
index 949b9fa31e..bca841cb48 100644
--- a/Gems/Atom/Utils/Code/Tests/ImageComparisonTests.cpp
+++ b/Gems/Atom/Utils/Code/Tests/ImageComparisonTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/Tests/StableDynamicArrayTests.cpp b/Gems/Atom/Utils/Code/Tests/StableDynamicArrayTests.cpp
index f77b81287d..eeb5d9a78d 100644
--- a/Gems/Atom/Utils/Code/Tests/StableDynamicArrayTests.cpp
+++ b/Gems/Atom/Utils/Code/Tests/StableDynamicArrayTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Atom/Utils/Code/atom_utils_files.cmake b/Gems/Atom/Utils/Code/atom_utils_files.cmake
index 299f9962f4..0eb18dd569 100644
--- a/Gems/Atom/Utils/Code/atom_utils_files.cmake
+++ b/Gems/Atom/Utils/Code/atom_utils_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Atom/Utils/Code/atom_utils_tests_files.cmake b/Gems/Atom/Utils/Code/atom_utils_tests_files.cmake
index 530af9df55..2029e31734 100644
--- a/Gems/Atom/Utils/Code/atom_utils_tests_files.cmake
+++ b/Gems/Atom/Utils/Code/atom_utils_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomContent/CMakeLists.txt b/Gems/AtomContent/CMakeLists.txt
index 9925d22de7..f16436c159 100644
--- a/Gems/AtomContent/CMakeLists.txt
+++ b/Gems/AtomContent/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomContent/ReferenceMaterials/CMakeLists.txt b/Gems/AtomContent/ReferenceMaterials/CMakeLists.txt
index ec9e3241c9..13506c2382 100644
--- a/Gems/AtomContent/ReferenceMaterials/CMakeLists.txt
+++ b/Gems/AtomContent/ReferenceMaterials/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomContent/ReferenceMaterials/Launch_Cmd.bat b/Gems/AtomContent/ReferenceMaterials/Launch_Cmd.bat
index 7b853eb7bc..c703c8148d 100644
--- a/Gems/AtomContent/ReferenceMaterials/Launch_Cmd.bat
+++ b/Gems/AtomContent/ReferenceMaterials/Launch_Cmd.bat
@@ -3,7 +3,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomContent/ReferenceMaterials/Launch_Maya_2020.bat b/Gems/AtomContent/ReferenceMaterials/Launch_Maya_2020.bat
index abcd4b1632..eb0ae8115d 100644
--- a/Gems/AtomContent/ReferenceMaterials/Launch_Maya_2020.bat
+++ b/Gems/AtomContent/ReferenceMaterials/Launch_Maya_2020.bat
@@ -4,7 +4,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomContent/ReferenceMaterials/Launch_WingIDE-7-1.bat b/Gems/AtomContent/ReferenceMaterials/Launch_WingIDE-7-1.bat
index daaee3c9d4..1c56dedb68 100644
--- a/Gems/AtomContent/ReferenceMaterials/Launch_WingIDE-7-1.bat
+++ b/Gems/AtomContent/ReferenceMaterials/Launch_WingIDE-7-1.bat
@@ -2,7 +2,7 @@
 :: Launches Wing IDE and the DccScriptingInterface Project Files
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomContent/ReferenceMaterials/Project_Env.bat b/Gems/AtomContent/ReferenceMaterials/Project_Env.bat
index a343294a4f..1d20d28399 100644
--- a/Gems/AtomContent/ReferenceMaterials/Project_Env.bat
+++ b/Gems/AtomContent/ReferenceMaterials/Project_Env.bat
@@ -2,7 +2,7 @@
 :: Sets up environment for Lumberyard DCC tools and code access
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomContent/Sponza/CMakeLists.txt b/Gems/AtomContent/Sponza/CMakeLists.txt
index fd347a4384..709fc02067 100644
--- a/Gems/AtomContent/Sponza/CMakeLists.txt
+++ b/Gems/AtomContent/Sponza/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomContent/Sponza/Project_Env.bat b/Gems/AtomContent/Sponza/Project_Env.bat
index 825e6f75d9..fefa5ec488 100644
--- a/Gems/AtomContent/Sponza/Project_Env.bat
+++ b/Gems/AtomContent/Sponza/Project_Env.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomContent/Sponza/Tools/Launch_Cmd.bat b/Gems/AtomContent/Sponza/Tools/Launch_Cmd.bat
index 11dcf27ff6..bc9673f989 100644
--- a/Gems/AtomContent/Sponza/Tools/Launch_Cmd.bat
+++ b/Gems/AtomContent/Sponza/Tools/Launch_Cmd.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomContent/Sponza/Tools/Maya/Launch_Maya_2020.bat b/Gems/AtomContent/Sponza/Tools/Maya/Launch_Maya_2020.bat
index 7cc8d37b76..5125a133c4 100644
--- a/Gems/AtomContent/Sponza/Tools/Maya/Launch_Maya_2020.bat
+++ b/Gems/AtomContent/Sponza/Tools/Maya/Launch_Maya_2020.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/AtomBridge/Assets/Shaders/LyShineUI.azsl b/Gems/AtomLyIntegration/AtomBridge/Assets/Shaders/LyShineUI.azsl
index b2f33cb555..b7f6b48151 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Assets/Shaders/LyShineUI.azsl
+++ b/Gems/AtomLyIntegration/AtomBridge/Assets/Shaders/LyShineUI.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Assets/Shaders/SimpleTextured.azsl b/Gems/AtomLyIntegration/AtomBridge/Assets/Shaders/SimpleTextured.azsl
index 3531992691..4cd8eded27 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Assets/Shaders/SimpleTextured.azsl
+++ b/Gems/AtomLyIntegration/AtomBridge/Assets/Shaders/SimpleTextured.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AtomLyIntegration/AtomBridge/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomBridge/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
index 64c6845b10..bd535dee72 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/AtomBridgeBus.h b/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/AtomBridgeBus.h
index 481bb4686f..b0483bb4a2 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/AtomBridgeBus.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/AtomBridgeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/FlyCameraInputBus.h b/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/FlyCameraInputBus.h
index 57e0ee4d6a..9829b10597 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/FlyCameraInputBus.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/FlyCameraInputBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/PerViewportDynamicDrawInterface.h b/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/PerViewportDynamicDrawInterface.h
index f40ac7dd90..0f70342fee 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/PerViewportDynamicDrawInterface.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/PerViewportDynamicDrawInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp
index 676ed097d6..674375ee0e 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeModule.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeModule.cpp
index fa6459bdd4..0fef7e12e6 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeModule.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeModule.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeModule.h
index 169c8513b7..5da1d69a07 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeModule.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
index 4b42e5973c..6926ad048c 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h
index 62e526872b..d59e9d66c0 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
index 19d4149cf8..7791e78d15 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -1168,7 +1168,7 @@ namespace AZ::AtomBridge
                 dir
             );
 
-            lines.AddLineSegment(ToWorldSpacePosition(pos), ToWorldSpacePosition(pos + dir * (radius * 0.2f))); // 0.2f comes from Code\Sandbox\Editor\Objects\DisplayContextShared.inl DisplayContext::DrawWireDisk
+            lines.AddLineSegment(ToWorldSpacePosition(pos), ToWorldSpacePosition(pos + dir * (radius * 0.2f))); // 0.2f comes from Code\Editor\Objects\DisplayContextShared.inl DisplayContext::DrawWireDisk
             lines.Draw(m_auxGeomPtr, m_rendState);
         }
     }
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
index e151e3459c..32d3e31aa9 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
@@ -1,7 +1,7 @@
 
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
index 11d9670e1f..27bbd25132 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h
index 4b0d5e8ab0..fa971f07a8 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
index ba6fed4651..c85ef167ea 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.h
index 32ad95e436..de36eb9222 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.cpp
index 0bde53f67e..2a87e6efdb 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.h
index f9eb54989a..c13b2834c4 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_runtime_deps.cmake
index 09f2742520..3e40f48401 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_runtime_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_runtime_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_tool_deps.cmake
index 32efa960cc..c515052a55 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_tool_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_tool_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_runtime_deps.cmake
index 09f2742520..3e40f48401 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_runtime_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_runtime_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake
index b99a351d84..34b476c9fc 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_runtime_deps.cmake
index db808a66f0..358d6137ad 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_runtime_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_runtime_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake
index 5c78ffb342..d3d2cb1e4d 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_runtime_deps.cmake
index 8abe3b2938..9b2f90e617 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_runtime_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_runtime_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake
index b99a351d84..34b476c9fc 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_runtime_deps.cmake
index db808a66f0..358d6137ad 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_runtime_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_runtime_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_tool_deps.cmake
index 32efa960cc..c515052a55 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_tool_deps.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_tool_deps.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake
index 141fa0f76d..323b83e65a 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_files.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_files.cmake
index c1b5259d4b..155673e710 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_files.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_shared_files.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_shared_files.cmake
index 68cc5538a5..26c1694089 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_shared_files.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/CMakeLists.txt b/Gems/AtomLyIntegration/AtomFont/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AtomLyIntegration/AtomFont/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomFont/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt
index 1e381b54b6..acd073b0ce 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
index aeb14ddaff..9fe3f2c25b 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
index 63aa2159a1..7cb971f9e0 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h
index 22357e5970..e6fd6785eb 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h
index dd034c365b..b40c05a783 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h
index 44c29520aa..4c9f5b283b 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontCommon.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontCommon.h
index 0a7816488b..77c9be5aaf 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontCommon.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontRenderer.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontRenderer.h
index 6aa0d3f9f0..7d5ba8c7ef 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontRenderer.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontRenderer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontTexture.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontTexture.h
index a0ec32c2d6..2a2bea72c3 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontTexture.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FontTexture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h
index e6d6d3dcdf..d1507ed7aa 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphCache.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphCache.h
index 1924cfce7d..69c3fbbdb5 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphCache.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/resource.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/resource.h
index 23a9212b5f..bcc8d1d6b0 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/resource.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/Android/platform_android_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Android/platform_android_files.cmake
index 7df300e916..5154736a21 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Android/platform_android_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FFontXML_Common.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FFontXML_Common.cpp
index 1b48624691..77a6d05e39 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FFontXML_Common.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FFontXML_Common.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp
index 593b192051..6d0999c3d3 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/Linux/platform_linux_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Linux/platform_linux_files.cmake
index 7df300e916..5154736a21 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/Mac/platform_mac_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Mac/platform_mac_files.cmake
index 7df300e916..5154736a21 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FFontXML_Windows.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FFontXML_Windows.cpp
index 85eb679e05..201ea06bc6 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FFontXML_Windows.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FFontXML_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp
index 5409b85725..3f2c73d741 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/platform_windows_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/platform_windows_files.cmake
index 7d25c061ba..b5b242c5de 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/Code/Platform/iOS/platform_ios_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/Platform/iOS/platform_ios_files.cmake
index 7df300e916..5154736a21 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
index 9c2954e583..114dbf62bb 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
index e396cc8b99..a33ed4b682 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.h b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.h
index 39b347f0e4..ae2487f351 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp
index fff39ee490..a317fe2d22 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
index 1ca44c6760..50b0adf294 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp
index 489f025d27..8797389fee 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h
index 2cac25d29b..1e1597a083 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp
index 1bf1694b6d..f22fe4c0bb 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp
index 3b893ac743..0665cc8524 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp
index 60a6f3a67c..35b5b3e308 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp
index 5ed82442f5..500afdc37e 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/Module.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/Module.cpp
index 05583ece12..e6b6df1a1a 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/Module.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/Source/Tests/test_Main.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/Tests/test_Main.cpp
index b1794447d1..6da80c58d6 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/Tests/test_Main.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/Tests/test_Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
index 1b00bfa2a0..28f23813e6 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomFont/Code/atomfont_test_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_test_files.cmake
index 09fd3de830..1f45f2966e 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/atomfont_test_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomImGuiTools/CMakeLists.txt b/Gems/AtomLyIntegration/AtomImGuiTools/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AtomLyIntegration/AtomImGuiTools/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomImGuiTools/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomImGuiTools/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomImGuiTools/Code/CMakeLists.txt
index 1b3d04ffee..e1cf0048b8 100644
--- a/Gems/AtomLyIntegration/AtomImGuiTools/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomImGuiTools/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsModule.cpp b/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsModule.cpp
index ea393f6439..6c9602d11f 100644
--- a/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsModule.cpp
+++ b/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.cpp b/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.cpp
index 7abb4b808d..a5f80489f4 100644
--- a/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.h b/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.h
index 1770ad245c..0e87700b0c 100644
--- a/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.h
+++ b/Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomImGuiTools/Code/atomimguitools_files.cmake b/Gems/AtomLyIntegration/AtomImGuiTools/Code/atomimguitools_files.cmake
index 73e4597d29..3a0bb8ff58 100644
--- a/Gems/AtomLyIntegration/AtomImGuiTools/Code/atomimguitools_files.cmake
+++ b/Gems/AtomLyIntegration/AtomImGuiTools/Code/atomimguitools_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomImGuiTools/Code/atomimguitools_shared_files.cmake b/Gems/AtomLyIntegration/AtomImGuiTools/Code/atomimguitools_shared_files.cmake
index 3784122993..671e5f2652 100644
--- a/Gems/AtomLyIntegration/AtomImGuiTools/Code/atomimguitools_shared_files.cmake
+++ b/Gems/AtomLyIntegration/AtomImGuiTools/Code/atomimguitools_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.azsl b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.azsl
index 4e548fb537..5121fee73c 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.azsl
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.azsl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayIcons/CMakeLists.txt b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/CMakeLists.txt
index 373ca15c8f..7b846631f3 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp
index 93c1340efc..305fad8ad0 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.h b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.h
index 2b64761837..8cb268d36a 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.h
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/Module.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/Module.cpp
index 85f6415583..745268924b 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/Module.cpp
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/atomviewportdisplayicons_files.cmake b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/atomviewportdisplayicons_files.cmake
index ecc5f46a18..81f135701f 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/atomviewportdisplayicons_files.cmake
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/atomviewportdisplayicons_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/CMakeLists.txt b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/CMakeLists.txt
index 160db45d12..0f652663b3 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Include/AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Include/AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h
index 85be0f5a50..bc906986d2 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Include/AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Include/AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
index 89e55d8c8f..5b14fbebb9 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.h b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.h
index 518911d286..13f42dd638 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.h
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/Module.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/Module.cpp
index f0c557ac8f..76b90b28ec 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/Module.cpp
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/Tests/test_Main.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/Tests/test_Main.cpp
index 6dc6a9a383..5bf92fbfdc 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/Tests/test_Main.cpp
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/Tests/test_Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/atomviewportdisplayinfo_files.cmake b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/atomviewportdisplayinfo_files.cmake
index 2a25450272..1d7d0820fb 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/atomviewportdisplayinfo_files.cmake
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/atomviewportdisplayinfo_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/atomviewportdisplayinfo_test_files.cmake b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/atomviewportdisplayinfo_test_files.cmake
index 09fd3de830..1f45f2966e 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/atomviewportdisplayinfo_test_files.cmake
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/atomviewportdisplayinfo_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CMakeLists.txt b/Gems/AtomLyIntegration/CMakeLists.txt
index d717873e92..798cacfb2e 100644
--- a/Gems/AtomLyIntegration/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyActorComponentConverter.py b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyActorComponentConverter.py
index f2ab7462f7..cf76bf8d8c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyActorComponentConverter.py
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyActorComponentConverter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyComponentConverter.py b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyComponentConverter.py
index 862790e0c5..09e5bb7413 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyComponentConverter.py
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyComponentConverter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyConversionHelpers.py b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyConversionHelpers.py
index 297693ad70..805c984797 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyConversionHelpers.py
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyConversionHelpers.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyMaterialComponentConverter.py b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyMaterialComponentConverter.py
index f42f1de0b6..02bee167bd 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyMaterialComponentConverter.py
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyMaterialComponentConverter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyMeshComponentConverter.py b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyMeshComponentConverter.py
index 50f0d44c80..b6db261199 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyMeshComponentConverter.py
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyMeshComponentConverter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyPointLightComponentConverter.py b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyPointLightComponentConverter.py
index b41df024f4..6719096515 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyPointLightComponentConverter.py
+++ b/Gems/AtomLyIntegration/CommonFeatures/Assets/Editor/Scripts/LegacyContentConversion/LegacyPointLightComponentConverter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/CommonFeatures/CMakeLists.txt b/Gems/AtomLyIntegration/CommonFeatures/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/CommonFeatures/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/CMakeLists.txt b/Gems/AtomLyIntegration/CommonFeatures/Code/CMakeLists.txt
index d8ecbf5cc5..6b3f15ec73 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h
index 766f18bc7c..adeb542d67 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h
index c7c4cd5721..fbb054ea34 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/CoreLightsConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/CoreLightsConstants.h
index b26f9166b7..b83b85043e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/CoreLightsConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/CoreLightsConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightBus.h
index 60377caf93..e240b31259 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightComponentConfig.h
index 3d4f2cf0ba..6e33ff545d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/DirectionalLightComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalBus.h
index 128f6234c0..d4b3d161b7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalComponentConfig.h
index 1f3abbfe29..0ec1abeae7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalConstants.h
index 9b57197762..8e5864b7c8 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Decals/DecalConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentBus.h
index 5f17c97d5e..00f0e516cc 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentConfig.h
index 7271b2e879..1315dee11b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentConstants.h
index 3d50a9c2f4..c1ecf9e0ff 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Grid/GridComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentBus.h
index 4555f7f30f..df03ab43a3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentConfig.h
index 6615a45a7a..4c4e3b8023 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentConstants.h
index 503ab87a71..6342a7e16e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ImageBasedLights/ImageBasedLightComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/EditorMaterialSystemComponentRequestBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/EditorMaterialSystemComponentRequestBus.h
index d3ee989280..2020d4c419 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/EditorMaterialSystemComponentRequestBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/EditorMaterialSystemComponentRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h
index bfdf6806e1..c101d0b43a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConfig.h
index 743c4956d1..062ab63047 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConstants.h
index 033a27efa4..99623c6d35 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h
index 71b04d900a..5e9b8e5125 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentConstants.h
index 1c69de1a6d..fb470ee943 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Mesh/MeshComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Bloom/BloomBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Bloom/BloomBus.h
index bf31c6969f..c9c8e9d3f5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Bloom/BloomBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Bloom/BloomBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Bloom/BloomComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Bloom/BloomComponentConfig.h
index c292e588ce..d1020623de 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Bloom/BloomComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Bloom/BloomComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DepthOfField/DepthOfFieldBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DepthOfField/DepthOfFieldBus.h
index 94ec5c6fdb..f13a3a88b6 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DepthOfField/DepthOfFieldBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DepthOfField/DepthOfFieldBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DepthOfField/DepthOfFieldComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DepthOfField/DepthOfFieldComponentConfig.h
index 87a58469ab..2196d53a4f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DepthOfField/DepthOfFieldComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DepthOfField/DepthOfFieldComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentBus.h
index 75a49c5ab2..488a125e38 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConfig.h
index 4bfb96d8ca..fdfa21f464 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConstants.h
index 388fdd22f3..89b74ffad8 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlBus.h
index e6437c76b1..c96a373763 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConfig.h
index cee8610d65..3570bf6d26 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConstants.h
index 33babd4665..bf5d2d1400 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConfig.h
index c63e4cbed4..ab64e2d307 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConstants.h
index 43a41ee46a..dcba5ba8ba 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationBus.h
index e24e13159a..853133e375 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationComponentConfig.h
index 7d02545a5d..db71f3d7d4 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationComponentConstants.h
index f73112d87b..28cd8cd4b7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/LookModification/LookModificationComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerBus.h
index ce09139015..fb4cc945d9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerCategoriesProviderRequestBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerCategoriesProviderRequestBus.h
index cc7c9e4cb4..b0d3c4eb13 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerCategoriesProviderRequestBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerCategoriesProviderRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConfig.h
index 5979049dc1..cb5eef91f7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConstants.h
index a8fee7455f..f91251e393 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxWeightRequestBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxWeightRequestBus.h
index ac9e10e089..389a74d7c0 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxWeightRequestBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/PostFxWeightRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConfig.h
index cc85c8a0bf..c75b1176fe 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConstants.h
index 35b71eef01..f94bb738e7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConfig.h
index a1009e55c0..0143e5acfc 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConstants.h
index 683e0fb5c0..7cb658b00a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Ssao/SsaoBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Ssao/SsaoBus.h
index 7d58cc8668..f008157287 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Ssao/SsaoBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Ssao/SsaoBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Ssao/SsaoComponentConfiguration.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Ssao/SsaoComponentConfiguration.h
index a6bd27a5f1..a048fd2f8c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Ssao/SsaoComponentConfiguration.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/Ssao/SsaoComponentConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ReflectionProbe/EditorReflectionProbeBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ReflectionProbe/EditorReflectionProbeBus.h
index f298431015..4b6a5368c7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ReflectionProbe/EditorReflectionProbeBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ReflectionProbe/EditorReflectionProbeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ScreenSpace/DeferredFogBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ScreenSpace/DeferredFogBus.h
index 3699052212..c114be7589 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ScreenSpace/DeferredFogBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ScreenSpace/DeferredFogBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ScreenSpace/DeferredFogComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ScreenSpace/DeferredFogComponentConfig.h
index 282efc608c..ef674df9fe 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ScreenSpace/DeferredFogComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/ScreenSpace/DeferredFogComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceComponentConfig.h
index 59886405c6..6556546b4e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceConstants.h
index f594a06227..4e0ec0da7a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceRequestBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceRequestBus.h
index f685b67180..9305ec8d58 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceRequestBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Scripting/EntityReferenceRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/HDRiSkyboxBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/HDRiSkyboxBus.h
index b3a59eb453..4feecc4e1d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/HDRiSkyboxBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/HDRiSkyboxBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/HDRiSkyboxComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/HDRiSkyboxComponentConfig.h
index 1130e55357..8d16bb4565 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/HDRiSkyboxComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/HDRiSkyboxComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/PhysicalSkyBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/PhysicalSkyBus.h
index 86703d0805..12c847dcc7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/PhysicalSkyBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/PhysicalSkyBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/PhysicalSkyComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/PhysicalSkyComponentConfig.h
index dd1ef62ebd..724a77732e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/PhysicalSkyComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyBox/PhysicalSkyComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Thumbnails/ThumbnailFeatureProcessorProviderBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Thumbnails/ThumbnailFeatureProcessorProviderBus.h
index 6b48a2c979..2c173ee5ee 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Thumbnails/ThumbnailFeatureProcessorProviderBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Thumbnails/ThumbnailFeatureProcessorProviderBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp
index cfed3d3fd0..cad8b6d0cd 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h
index afa5dd0855..b39b00c13d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
index 6b24736ada..4845a1daa1 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
index f7f0b69938..c068c71a5e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CommonFeaturesSystemComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CommonFeaturesSystemComponent.cpp
index aafcea7a99..2d01a50bde 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CommonFeaturesSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CommonFeaturesSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CommonFeaturesSystemComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CommonFeaturesSystemComponent.h
index 4eed13bf18..42e82ddcd1 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CommonFeaturesSystemComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CommonFeaturesSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponent.cpp
index 6d42158bda..4b8e35bc14 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponent.h
index 05b9285617..ed78a1782c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp
index 282636b8ad..6a908572b9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp
index c63295ffb9..d3cf6e8068 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h
index e22457cc93..a0dc8ea387 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.cpp
index 5b5dd87273..e8257acef0 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -69,7 +69,7 @@ namespace AZ
             if (isSelected)
             {
                 // Attenuation radius shape is just a capsule with the same internal height, but a radius of the attenuation radius.
-                float radius = CalculateAttenuationRadius(AreaLightComponentConfig::CutoffIntensity);
+                float radius = GetConfig()->m_attenuationRadius;
 
                 // Add on the caps for the attenuation radius
                 float scale = GetTransform().GetUniformScale();
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.h
index 1c9ef9975c..5a1cc01024 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponent.cpp
index 7ce6f5480c..de7e34eeea 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponent.h
index c633e98f27..c093dbbdd0 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentConfig.cpp
index b5f058931f..3923136bcc 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.cpp
index 918deeeaae..4552ce9ded 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.h
index 70e9b26158..dd40f30d5c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
index 7afe7ce17b..f46115dfce 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h
index da6f25112f..c51b84ed2e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
index 94e802f202..5dabd7317b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.h
index abd843daec..6d92d46e16 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
index 99c219fb78..8163dcfe20 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.h
index 23306a1296..6d2ddd4e77 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h
index 1d2a95a5b5..00792fb853 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.inl b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.inl
index 1374a0b121..36c53c8fab 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.inl
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h
index 05e4f56a02..7d55022839 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.cpp
index 6303bdbd52..0a712dda47 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -79,7 +79,7 @@ namespace AZ
                 debugDisplay.SetColor(color);
 
                 // Draw a Polygon for the attenuation radius
-                debugDisplay.DrawWireSphere(transform.GetTranslation(), CalculateAttenuationRadius(AreaLightComponentConfig::CutoffIntensity));
+                debugDisplay.DrawWireSphere(transform.GetTranslation(), GetConfig()->m_attenuationRadius);
                 debugDisplay.DrawArrow(transform.GetTranslation(), transform.GetTranslation() + transform.GetBasisZ());
             }
         }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.h
index e2b6934a9a..475454e533 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp
index 68eb8cb0c1..1818088d2d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -65,7 +65,7 @@ namespace AZ
                 debugDisplay.SetColor(color);
 
                 // Draw a quad for the attenuation radius
-                debugDisplay.DrawWireSphere(transform.GetTranslation(), CalculateAttenuationRadius(AreaLightComponentConfig::CutoffIntensity));
+                debugDisplay.DrawWireSphere(transform.GetTranslation(), GetConfig()->m_attenuationRadius);
             }
         }
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.h
index 53879bc8a9..9ad3165d6c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.cpp
index 05b697dbeb..ce198eb8e2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -48,9 +48,9 @@ namespace AZ
             if (isSelected)
             {
                 debugDisplay.SetColor(color);
-
+                
                 // Draw a sphere for the attenuation radius
-                debugDisplay.DrawWireSphere(transform.GetTranslation(), CalculateAttenuationRadius(AreaLightComponentConfig::CutoffIntensity));
+                debugDisplay.DrawWireSphere(transform.GetTranslation(), GetConfig()->m_attenuationRadius);
             }
         }
     } // namespace Render
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.h
index a3b7d86c5f..a0b0f1b5ce 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.cpp
index 8896535c4f..f6ec76b653 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.h
index 65a606eff2..960e7c21cb 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
index 23323d8ab3..5d5ed4c11d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -53,9 +53,9 @@ namespace AZ
             if (isSelected)
             {
                 debugDisplay.SetColor(color);
-
+                
                 // Draw a sphere for the attenuation radius
-                debugDisplay.DrawWireSphere(transform.GetTranslation(), CalculateAttenuationRadius(AreaLightComponentConfig::CutoffIntensity));
+                debugDisplay.DrawWireSphere(transform.GetTranslation(), GetConfig()->m_attenuationRadius);
             }
         }
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h
index 7afea2fe93..fbe4b53028 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponent.cpp
index 10fa1320d4..14fc30f626 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponent.h
index e1b35cdf09..82469db2f2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponentController.cpp
index 21b7694e85..4a9fce3dbf 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponentController.h
index ce1bf62412..b8bd491d99 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/DecalComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
index 9bd1149e95..43239ffd0a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.h
index ee6787bb29..791d985a33 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponent.cpp
index 75c52a8976..db7ba996e9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponent.h
index 170dc91f1c..92b3bd17ff 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConfig.cpp
index 91af1353a5..c1b605bc82 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConfig.h
index 4fe91668b0..dabb0d7f41 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConstants.h
index 008bf5e84d..00a7123397 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentController.cpp
index fc13b376d8..183c1ef3fc 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentController.h
index 2345d01580..2b46e5301b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseGlobalIlluminationComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponent.cpp
index 43e3847162..402430c2d7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponent.h
index 24ebea7bb5..f9d62a0980 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentConstants.h
index 6c5042f5d9..2422153207 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,8 +13,8 @@ namespace AZ
     {
         static constexpr const char* const DiffuseProbeGridComponentTypeId = "{9B900A04-192F-4F5E-AE31-762605D8159A}";
         static constexpr const char* const EditorDiffuseProbeGridComponentTypeId = "{F80086E1-ECE7-4E8C-B727-A750D10F7D83}";
-        static constexpr float DefaultDiffuseProbeGridSpacing = 4.0f;
-        static constexpr float DefaultDiffuseProbeGridExtents = 20.0f;
+        static constexpr float DefaultDiffuseProbeGridSpacing = 2.0f;
+        static constexpr float DefaultDiffuseProbeGridExtents = 8.0f;
         static constexpr float DefaultDiffuseProbeGridAmbientMultiplier = 1.0f;
         static constexpr float DefaultDiffuseProbeGridViewBias = 0.2f;
         static constexpr float DefaultDiffuseProbeGridNormalBias = 0.1f;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp
index 1577dffc02..8cf0a6a9ac 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -169,9 +169,20 @@ namespace AZ
 
             m_featureProcessor->SetMode(m_handle, m_configuration.m_runtimeMode);
 
-            // set box shape component dimensions from the configuration
-            // this will invoke the OnShapeChanged() handler and set the outer extents on the feature processor
-            m_boxShapeInterface->SetBoxDimensions(m_configuration.m_extents);
+            // if this is a new DiffuseProbeGrid entity and the box shape has not been changed (i.e., it's still unit sized)
+            // then use the default extents, otherwise use the current box shape extents
+            AZ::Vector3 extents(0.0f);
+            AZ::Vector3 boxDimensions = m_boxShapeInterface->GetBoxDimensions();
+            if (m_configuration.m_entityId == EntityId::InvalidEntityId && boxDimensions == AZ::Vector3(1.0f))
+            {
+                extents = m_configuration.m_extents;
+            }
+            else
+            {
+                extents = boxDimensions;
+            }
+
+            m_boxShapeInterface->SetBoxDimensions(extents);
         }
 
         void DiffuseProbeGridComponentController::OnAssetReady(Data::Asset<Data::AssetData> asset)
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.h
index d1a41fd526..28ca214b1e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -47,6 +47,8 @@ namespace AZ
             Data::Asset<RPI::StreamingImageAsset> m_bakedDistanceTextureAsset;
             Data::Asset<RPI::StreamingImageAsset> m_bakedRelocationTextureAsset;
             Data::Asset<RPI::StreamingImageAsset> m_bakedClassificationTextureAsset;
+
+            AZ::u64 m_entityId{ EntityId::InvalidEntityId };
         };
 
         class DiffuseProbeGridComponentController final
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.cpp
index 3e3491ad6f..9e4a7fed5c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.h
index 4231ed82b6..52c036500a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp
index 910c7735ac..74d8348c83 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -147,6 +147,9 @@ namespace AZ
             AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusConnect(GetEntityId());
             AZ::TickBus::Handler::BusConnect();
             AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
+
+            AZ::u64 entityId = (AZ::u64)GetEntityId();
+            m_controller.m_configuration.m_entityId = entityId;
         }
 
         void EditorDiffuseProbeGridComponent::Deactivate()
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.h
index 12d37a295e..f98e9b6daf 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.cpp
index f83474288d..1896ccf1f0 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.h
index fc39671db8..a877b8ce95 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
index 0b1a055f88..c166fa164e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.h
index 34344ebe85..c34b64625a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponent.cpp
index cb33afae57..c6d56f4939 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponent.h
index f2b9d6534d..61f23dff04 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentConfig.cpp
index 1432b6d6b8..1421d8cc39 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.cpp
index f8efadf329..5a870419e8 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.h
index 0e7ba76122..f5ce372906 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
index a963f2eb61..0a0ceeed4b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.h
index 6e5c4f21fc..7c134837f2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponent.cpp
index 948599ffd1..17f48831e3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponent.h
index 0f9813e30e..0c58e0de32 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentConfig.cpp
index ff5d6c68a2..acac9d8c9a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp
index 5673c36a45..3fae14ae7d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.h
index 60cfc17e99..c2d802a04f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
index fb2a1e28d1..4156e4904c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.h
index 3ebc7201d8..fd34d6ae1d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentExporter.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentExporter.cpp
index 0618712482..0a311a4a81 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentExporter.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -41,7 +41,7 @@ namespace AZ
                 AZStd::string label;
                 if (assetId.IsValid())
                 {
-                    // Material assets that are exported through the FBX pipeline have their filenames generated by adding
+                    // Material assets that are exported through the scene pipeline have their filenames generated by adding
                     // the DCC material name as a prefix and a unique number to the end of the source file name.
                     // Rather than storing the DCC material name inside of the material asset we can reproduce it by removing
                     // the prefix and suffix from the product file name.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentExporter.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentExporter.h
index fc7841bb05..8e6ae1f977 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentExporter.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
index d20a1c0e66..8749cb67ec 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
index 34b16f5d2d..e7d7ec9589 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp
index d5ea087dcc..416a2b7d94 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -172,6 +172,11 @@ namespace AZ
         void EditorMaterialComponentSlot::Clear()
         {
             m_materialAsset = {};
+            ClearOverrides();
+        }
+
+        void EditorMaterialComponentSlot::ClearOverrides()
+        {
             m_propertyOverrides = {};
             m_matModUvOverrides = {};
             OnMaterialChanged();
@@ -284,7 +289,7 @@ namespace AZ
 
             menu.addSeparator();
 
-            action = menu.addAction("Clear Material Instance Overrides", [this]() { m_propertyOverrides = {}; m_matModUvOverrides = {}; });
+            action = menu.addAction("Clear Material Instance Overrides", [this]() { ClearOverrides(); });
             action->setEnabled(!m_propertyOverrides.empty() || !m_matModUvOverrides.empty());
 
             menu.exec(QCursor::pos());
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.h
index 1b62e94225..96b2b67016 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -35,6 +35,7 @@ namespace AZ
             void OpenMaterialEditor() const;
             void SetDefaultAsset();
             void Clear();
+            void ClearOverrides();
             void OpenMaterialExporter();
             void OpenMaterialInspector();
             void OpenUvNameMapInspector();
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
index f6237b219b..33dd331bc3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -96,8 +96,11 @@ namespace AZ
 
             bool SaveSourceMaterialFromEditData(const AZStd::string& path, const MaterialEditData& editData)
             {
-                // Getting the source info for the material type file to make sure that it exists
-                // We also need to watch folder to generate a relative asset path for the material type
+                // Construct the material source data object that will be exported
+                AZ::RPI::MaterialSourceData exportData;
+                exportData.m_propertyLayoutVersion = editData.m_materialTypeSourceData.m_propertyLayout.m_version;
+
+                // Converting absolute material paths to relative paths
                 bool result = false;
                 AZ::Data::AssetInfo info;
                 AZStd::string watchFolder;
@@ -106,22 +109,30 @@ namespace AZ
                     editData.m_materialTypeSourcePath.c_str(), info, watchFolder);
                 if (!result)
                 {
-                    AZ_Error("AZ::Render::EditorMaterialComponentUtil", false, "Failed to get source file info and asset path while attempting to export: %s", path.c_str());
+                    AZ_Error(
+                        "AZ::Render::EditorMaterialComponentUtil", false,
+                        "Failed to get material type source file info while attempting to export: %s", path.c_str());
                     return false;
                 }
 
-                // Construct the material source data object that will be exported
-                AZ::RPI::MaterialSourceData exportData;
-                exportData.m_propertyLayoutVersion = editData.m_materialTypeSourceData.m_propertyLayout.m_version;
+                exportData.m_materialType = info.m_relativePath;
 
-                // Converting absolute material paths to asset relative paths
-                exportData.m_materialType = editData.m_materialTypeSourcePath;
-                AzFramework::ApplicationRequests::Bus::Broadcast(
-                    &AzFramework::ApplicationRequests::Bus::Events::MakePathRelative, exportData.m_materialType, watchFolder.c_str());
+                if (!editData.m_materialParentSourcePath.empty())
+                {
+                    result = false;
+                    AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+                        result, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath,
+                        editData.m_materialParentSourcePath.c_str(), info, watchFolder);
+                    if (!result)
+                    {
+                        AZ_Error(
+                            "AZ::Render::EditorMaterialComponentUtil", false,
+                            "Failed to get parent material source file info while attempting to export: %s", path.c_str());
+                        return false;
+                    }
 
-                exportData.m_parentMaterial = editData.m_materialParentSourcePath;
-                AzFramework::ApplicationRequests::Bus::Broadcast(
-                    &AzFramework::ApplicationRequests::Bus::Events::MakePathRelative, exportData.m_parentMaterial, watchFolder.c_str());
+                    exportData.m_parentMaterial = info.m_relativePath;
+                }
 
                 // Copy all of the properties from the material asset to the source data that will be exported
                 result = true;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.h
index 716a918a14..170b9b078e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp
index 4ee429c3de..3d3c86421c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.h
index 43a303abc1..018d247e2c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
index 11c6fc356f..a8d6270c7e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.h
index b5ecc45470..cee1318d6a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialBrowserInteractions.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialBrowserInteractions.cpp
index 2b2ce65caf..afba540562 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialBrowserInteractions.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialBrowserInteractions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialBrowserInteractions.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialBrowserInteractions.h
index c2c6c885d7..62503a0050 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialBrowserInteractions.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialBrowserInteractions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponent.cpp
index 2f8fa17324..629359cede 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponent.h
index f3bb425fc8..1b3d3929a4 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentConfig.cpp
index 9c89e495ef..38247c06ea 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp
index ded457c7e1..0c7c67e089 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.h
index 65cfa11f3d..720a03d9c0 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
index 5b30f5bc50..a850a5c9e8 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -100,7 +100,7 @@ namespace AZ
             {
                 return
                     GetAssetId(key, RPI::MaterialAsset::RTTI_Type()).IsValid() &&
-                    // in case it's a source fbx, it will contain both material and model products
+                    // in case it's a source scene file, it will contain both material and model products
                     // model thumbnails are handled by MeshThumbnail
                     !GetAssetId(key, RPI::ModelAsset::RTTI_Type()).IsValid();
             }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
index 6860acdff6..178c41a929 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
index f4277535ae..9fbab65d5e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.h
index a4afd76f8d..afe7ac1017 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshSystemComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshSystemComponent.cpp
index b40d9c31f8..c0c61ecc1d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshSystemComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshSystemComponent.h
index 1299ea0019..9683c9de02 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshSystemComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponent.cpp
index 59fa6733c8..fc08e60e97 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponent.h
index 9a1c664b3a..9499a2a4a5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp
index 5fc71ef357..aa5b810474 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.h
index 722aab0a19..b0c3dfc1a1 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
index 19506ca81f..586baa5084 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
index df4eacffca..aff4504744 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Module.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Module.cpp
index 35b4d2e5dc..cfbe132bf7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Module.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.cpp
index 9d9c7d8240..df9059c251 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.h
index 6e1129185e..b53ea410be 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponent.cpp
index 74b5c5170d..2266d37aa2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponent.h
index c10e852462..9a90b63bee 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentConstants.h
index 8750749941..bfa3d78f73 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp
index 64891cd46e..80baeb497f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.h
index 8e9efd686f..5c4dacb8d2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Android/platform_android_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/AppleTV/platform_appletv_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/AppleTV/platform_appletv_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/AppleTV/platform_appletv_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/AppleTV/platform_appletv_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Linux/platform_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Mac/platform_mac_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Windows/platform_windows_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/iOS/platform_ios_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponent.cpp
index 6c21d2425e..d9af5a53cb 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponent.h
index 3b5c02e2b1..15548d4d11 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentConfig.cpp
index a21720858c..baac2da039 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentController.cpp
index cc3a5cf7b1..ef76694552 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentController.h
index 35ddde7703..b2bf21d4c0 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/BloomComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
index 74b194e028..abd2cb5d8f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -60,8 +60,10 @@ namespace AZ
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                         ->Attribute(Edit::Attributes::ReadOnly, &BloomComponentConfig::ArePropertiesReadOnly)
 
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &BloomComponentConfig::m_intensity, "Intensity", "Brightness of bloom")
+                        ->DataElement(AZ::Edit::UIHandlers::Slider, &BloomComponentConfig::m_intensity, "Intensity", "Brightness of bloom")
                         ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
+                        ->Attribute(AZ::Edit::Attributes::Max, 10000.0f)
+                        ->Attribute(AZ::Edit::Attributes::SoftMax, 25.0f)
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                         ->Attribute(Edit::Attributes::ReadOnly, &BloomComponentConfig::ArePropertiesReadOnly)
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.h
index 86c37968fe..4192d31660 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponent.cpp
index 06396350c8..0ff835aa26 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponent.h
index e3bb6f9e19..ec2e5cba1b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentConfig.cpp
index e4465eb704..8fbda33734 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentController.cpp
index 3c8b822cfe..4b34ca795e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentController.h
index 1b1f8ee2dc..21f93d6382 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/DepthOfFieldComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
index 68310cc80d..fc4c4163c5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.h
index e1ea079cef..91c8732acd 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponent.cpp
index 184b863fe8..e7dbe4bbca 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponent.h
index a448706422..f5a827a010 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentConfig.cpp
index ef2e00ee97..1cd53473fc 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.cpp
index de9ceca267..6251393abe 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.h
index 67e2469cc9..c55f4b048b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
index 95ecdd70ac..2fc37e8bf2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.h
index c062a547eb..613c2ce9f1 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerCategoriesAsset.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerCategoriesAsset.cpp
index 554cc76182..8f215b4e12 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerCategoriesAsset.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerCategoriesAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerCategoriesAsset.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerCategoriesAsset.h
index d2a0e18e5c..c8939cf7af 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerCategoriesAsset.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerCategoriesAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
index d795c5eb91..35fc90c4b3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.h
index 5218cd4b55..6ecafd6ad3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxSystemComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxSystemComponent.cpp
index 98630b30cb..7ee565ff0a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxSystemComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxSystemComponent.h
index 50058de765..dbcf3d4109 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxSystemComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
index 1d9560a2ab..2712e07e60 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.h
index f9f85915c9..f60ef7e3d7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponent.cpp
index b0ca0e1463..dd2ada0db6 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponent.h
index 02e8f2216b..f0ea4803ac 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentConfig.cpp
index f745ee8479..06010b6f7d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentController.cpp
index 09c53d7b74..3c8f9a9be9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentController.h
index 8e52269439..d1901e0e90 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/ExposureControlComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
index cd31b570bd..ba08f25acb 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.h
index b5e163e52e..f3af9d2185 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponent.cpp
index 8bca3dbc37..d82670a8a4 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponent.h
index 68cff91f0b..a64fedb288 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConfig.cpp
index 88351c1a87..f21e64835a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierController.cpp
index 248dbd6dee..b84dd65da2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierController.h
index 94dc79ee10..7e9db0eca7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/GradientWeightModifierController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
index 8a74203544..e3f98cfa2e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.h
index 12fd9ff711..4673b4871a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponent.cpp
index 0942431275..7499a6a295 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponent.h
index a90e48e2b7..8c7f746b29 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentConfig.cpp
index 55c8162506..acf1551a9c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.cpp
index b5b5c5118d..4b1ac65f06 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.h
index 575427435f..53b8e6d853 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponent.cpp
index 50ef776e8f..983821afee 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponent.h
index 65750d99d3..00a38929b5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentConfig.cpp
index a41ee486e2..e73f74f09b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentController.cpp
index b86de6efaa..2a4781427e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentController.h
index cf2a80523f..6b782e93c2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/PostFxLayerComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
index e9dc2caec6..f5d2afcc15 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.h
index c91e8818e0..bb6ac5f97d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponent.cpp
index 8f32750f2e..d0f27d8f50 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponent.h
index fa9b5c8414..552ba81fde 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConfig.cpp
index 3c9d8feabe..c6c159d601 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentController.cpp
index 971fe604ed..5f5994226f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentController.h
index 50a5eaded3..3d4328cac3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/RadiusWeightModifierComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
index fe6c5abed4..4768be6e85 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.h
index bf5ad80816..e4bb8941db 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponent.cpp
index ec8bad8927..abbc897f2f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponent.h
index 1c8bc827af..c2a4d93fe2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConfig.cpp
index 8ec059544f..9b308aa2f6 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentController.cpp
index 7d0cf43c12..73f5380d8f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentController.h
index 5b476e7364..08eb2a7749 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/ShapeWeightModifierComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
index 26a71432d1..d72ed3e476 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.h
index 21b826ce09..eccbbffcc9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponent.cpp
index 1d75bc763d..9bb73ecbe9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponent.h
index b277134c0d..67891a042c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentConfig.cpp
index 7936f8ffdf..975cd9fff6 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentController.cpp
index b5b8bcdc66..51faf647ab 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentController.h
index 3899dfddf0..638050b4a3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/SsaoComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
index 20b1ae87b3..c107e13593 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.h
index 60d4d53730..5f7c7f31d8 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponent.cpp
index 8e4df4538b..d0589f35bc 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponent.h
index 165189d93b..0ea2b500ac 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentConstants.h
index bba7bdce22..55f4bc64ae 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentConstants.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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,5 +13,6 @@ namespace AZ
     {
         static constexpr const char* const ReflectionProbeComponentTypeId = "{E5D29F09-F974-45FE-A1D0-2126079D1021}";
         static constexpr const char* const EditorReflectionProbeComponentTypeId = "{6EBF2E41-2918-48B8-ACC3-FB115ED09E64}";
+        static constexpr float DefaultReflectionProbeExtents = 8.0f;
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
index ffa038cb5f..43cb6df1de 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -127,9 +127,21 @@ namespace AZ
             // set the visualization sphere option
             m_featureProcessor->ShowProbeVisualization(m_handle, m_configuration.m_showVisualization);
 
-            // update the outer extents from the box shape
-            // if the user already resized the box shape on this entity it will inherit those extents
-            UpdateOuterExtents();
+            // if this is a new ReflectionProbe entity and the box shape has not been changed (i.e., it's still unit sized)
+            // then set the shape to the default extents
+            AZ::Vector3 boxDimensions = m_boxShapeInterface->GetBoxDimensions();
+            if (m_configuration.m_entityId == EntityId::InvalidEntityId && boxDimensions == AZ::Vector3(1.0f))
+            {
+                AZ::Vector3 extents(m_configuration.m_outerWidth, m_configuration.m_outerLength, m_configuration.m_outerHeight);
+
+                // resize the box shape, this will invoke OnShapeChanged
+                m_boxShapeInterface->SetBoxDimensions(extents);
+            }
+            else
+            {
+                // update the outer extents from the box shape
+                UpdateOuterExtents();
+            }
 
             // set the inner extents
             m_featureProcessor->SetProbeInnerExtents(m_handle, AZ::Vector3(m_configuration.m_innerWidth, m_configuration.m_innerLength, m_configuration.m_innerHeight));
@@ -137,22 +149,11 @@ namespace AZ
             // load cubemap
             Data::Asset<RPI::StreamingImageAsset>& cubeMapAsset =
                 m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapAsset : m_configuration.m_authoredCubeMapAsset;
-            Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
-
-            const AZStd::string& relativePath =
-                m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapRelativePath : m_configuration.m_authoredCubeMapAsset.GetHint();
 
             if (cubeMapAsset.GetId().IsValid())
             {
-                if (cubeMapAsset.IsReady())
-                {
-                    Data::Instance<RPI::Image> image = RPI::StreamingImage::FindOrCreate(cubeMapAsset);
-                    m_featureProcessor->SetProbeCubeMap(m_handle, image, relativePath);
-                }
-                else
-                {
-                    cubeMapAsset.QueueLoad();
-                }
+                cubeMapAsset.QueueLoad();
+                Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
             }
         }
 
@@ -189,6 +190,18 @@ namespace AZ
             m_featureProcessor->SetProbeCubeMap(m_handle, image, relativePath);
         }
 
+        void ReflectionProbeComponentController::OnAssetReloaded(Data::Asset<Data::AssetData> asset)
+        {
+            if (m_configuration.m_useBakedCubemap)
+            {
+                m_configuration.m_bakedCubeMapAsset = asset;
+            }
+            else
+            {
+                m_configuration.m_authoredCubeMapAsset = asset;
+            }
+        }
+
         void ReflectionProbeComponentController::SetConfiguration(const ReflectionProbeComponentConfig& config)
         {
             m_configuration = config;
@@ -201,14 +214,25 @@ namespace AZ
 
         void ReflectionProbeComponentController::UpdateCubeMap()
         {
+            // disconnect the asset bus since we might reconnect with a different asset
+            Data::AssetBus::MultiHandler::BusDisconnect();
+
             Data::Asset<RPI::StreamingImageAsset>& cubeMapAsset =
                 m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapAsset : m_configuration.m_authoredCubeMapAsset;
 
-            const AZStd::string& relativePath =
-                m_configuration.m_useBakedCubemap ? m_configuration.m_bakedCubeMapRelativePath : m_configuration.m_authoredCubeMapAsset.GetHint();
+            if (cubeMapAsset.GetId().IsValid())
+            {
+                cubeMapAsset.QueueLoad();
 
-            Data::Instance<RPI::Image> image = RPI::StreamingImage::FindOrCreate(cubeMapAsset);
-            m_featureProcessor->SetProbeCubeMap(m_handle, image, relativePath);
+                // this will invoke OnAssetReady()
+                Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
+            }
+            else
+            {
+                // clear the current cubemap
+                Data::Instance<RPI::Image> image = nullptr;
+                m_featureProcessor->SetProbeCubeMap(m_handle, image, {});
+            }
         }
 
         void ReflectionProbeComponentController::OnTransformChanged([[maybe_unused]] const AZ::Transform& local, const AZ::Transform& world)
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h
index 66e5eb47b0..0532695ffb 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -14,6 +14,7 @@
 #include <Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessorInterface.h>
 #include <Atom/RPI.Public/Model/Model.h>
 #include <LmbrCentral/Shape/BoxShapeComponentBus.h>
+#include <ReflectionProbe/ReflectionProbeComponentConstants.h>
 
 namespace AZ
 {
@@ -50,12 +51,12 @@ namespace AZ
             AZ_CLASS_ALLOCATOR(ReflectionProbeComponentConfig, SystemAllocator, 0);
             static void Reflect(AZ::ReflectContext* context);
 
-            float m_outerHeight = 20.0f;
-            float m_outerLength = 20.0f;
-            float m_outerWidth = 20.0f;
-            float m_innerHeight = 20.0f;
-            float m_innerLength = 20.0f;
-            float m_innerWidth = 20.0f;
+            float m_outerHeight = DefaultReflectionProbeExtents;
+            float m_outerLength = DefaultReflectionProbeExtents;
+            float m_outerWidth = DefaultReflectionProbeExtents;
+            float m_innerHeight = DefaultReflectionProbeExtents;
+            float m_innerLength = DefaultReflectionProbeExtents;
+            float m_innerWidth = DefaultReflectionProbeExtents;
 
             bool m_useParallaxCorrection = true;
             bool m_showVisualization = true;
@@ -113,6 +114,7 @@ namespace AZ
 
             // Data::AssetBus overrides ...
             void OnAssetReady(Data::Asset<Data::AssetData> asset) override;
+            void OnAssetReloaded(Data::Asset<Data::AssetData> asset) override;
 
             // TransformNotificationBus overrides ...
             void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponent.cpp
index 2bd4fc8382..63f5274311 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponent.h
index 481bbeb077..debcafb324 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentConfig.cpp
index 9de5c9074a..5a32752d7c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentController.cpp
index 08b0e1a9e2..a1b6de16a9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentController.h
index 9c9bed9e16..1085366636 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/DeferredFogComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
index 7f397d5ee1..4d6ea44fb4 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.h
index 04b9f7e905..3bef5d169f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
index 3ba3e60bcb..9e200e757a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.h
index cb6eda509a..8f16b0ad3c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponent.cpp
index 1f29e13641..72c1c37392 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponent.h
index 85b109d9d4..0f7bf63fc1 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentConfig.cpp
index 5a12acda1a..2a0fc9dfc9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.cpp
index 1eb21e2b8d..18ab9ed547 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.h
index bdb0f50367..ed83a2b500 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.cpp
index 6390ed80b8..3d5521e60e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.h
index 7a02085dc1..c8dc8b04cf 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkinnedMesh/SkinnedMeshDebugDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
index b31c444028..d1cadfed56 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.h
index 4a12a49bb3..12c34d7807 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
index 2f21639afb..beeb17abfe 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.h
index 0d8ae66a84..506eb47f8f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponent.cpp
index d1dea1afd2..da06e853ca 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponent.h
index 00a9970acb..b3a3cf3144 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentConfig.cpp
index a5e8b6180d..075f10a61b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
index b3da125537..14bf4cda94 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.h
index 055e7b7802..0b9f52949d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponent.cpp
index f5d892b711..2f8c4d664f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponent.h
index 7276e80233..5bad9a26a5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentConfig.cpp
index 4ae687a268..1d55803080 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp
index 9b956efa39..b7fabdfde6 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.h
index 66de01d814..1f728ec78f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/EditorSurfaceDataMeshComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/EditorSurfaceDataMeshComponent.cpp
index a4ba1b8859..1c2fe92f59 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/EditorSurfaceDataMeshComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/EditorSurfaceDataMeshComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/EditorSurfaceDataMeshComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/EditorSurfaceDataMeshComponent.h
index 36323af3cc..0b36c59683 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/EditorSurfaceDataMeshComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/EditorSurfaceDataMeshComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/SurfaceDataMeshComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/SurfaceDataMeshComponent.cpp
index 4daedacdab..1024ea7698 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/SurfaceDataMeshComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/SurfaceDataMeshComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/SurfaceDataMeshComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/SurfaceDataMeshComponent.h
index 2e0cdcb460..d997a1982a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/SurfaceDataMeshComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SurfaceData/SurfaceDataMeshComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.cpp
index 59a9b4dcf9..c21799ea73 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.h
index 136ac7b677..e0d8b980dd 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewerFactory.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewerFactory.cpp
index 71fa8df95c..5f6fea2a84 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewerFactory.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewerFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewerFactory.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewerFactory.h
index 0bcc7ae285..837388e51b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewerFactory.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewerFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.cpp
index 7a3633be58..a8ae3656b6 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.h
index 60f28161cd..d217f62390 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/CommonThumbnailRenderer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererContext.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererContext.h
index 5a9ccfbd1f..2435b9c07e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererContext.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererData.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererData.h
index 5ddc5d7ca6..7df1286450 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererData.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
index a795b9a119..46d9b59edb 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.h
index e9cf94e2c9..d1e17d19be 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/CaptureStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/FindThumbnailToRenderStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/FindThumbnailToRenderStep.cpp
index 78d5241cfd..35899fefb0 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/FindThumbnailToRenderStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/FindThumbnailToRenderStep.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/FindThumbnailToRenderStep.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/FindThumbnailToRenderStep.h
index ccdcd9cc47..cf525e109c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/FindThumbnailToRenderStep.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/FindThumbnailToRenderStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.cpp
index 98ec4165b1..961d444532 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.h
index 3509024ed9..d0ae0de2af 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/InitializeStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
index 9ff3233d1b..3f441d43b1 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.h
index dbd1478370..32ec7b084a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ThumbnailRendererStep.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ThumbnailRendererStep.h
index 577f65197d..90695d4795 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ThumbnailRendererStep.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ThumbnailRendererStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/WaitForAssetsToLoadStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/WaitForAssetsToLoadStep.cpp
index 633b7338cb..87e989b2fd 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/WaitForAssetsToLoadStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/WaitForAssetsToLoadStep.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/WaitForAssetsToLoadStep.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/WaitForAssetsToLoadStep.h
index b0d15f2903..1a3e5fdb7a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/WaitForAssetsToLoadStep.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/WaitForAssetsToLoadStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/ThumbnailUtils.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/ThumbnailUtils.cpp
index 7a3cb2c95f..bc89321340 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/ThumbnailUtils.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/ThumbnailUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/ThumbnailUtils.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/ThumbnailUtils.h
index e428167f40..e9d5d10016 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/ThumbnailUtils.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/ThumbnailUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake
index 90daeabed8..d22bcfec4a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_files.cmake
index 4be8ee6d79..14c8e37808 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_public_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_public_files.cmake
index 69aa32c73e..f378cfe37d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_public_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_public_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_shared_files.cmake b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_shared_files.cmake
index a93f67afd8..c686bffbe2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_shared_files.cmake
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/EMotionFXAtom/CMakeLists.txt b/Gems/AtomLyIntegration/EMotionFXAtom/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt b/Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt
index 9abff7e67e..d42a283eea 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp
index 060596036b..7a32fdc385 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -95,7 +95,7 @@ namespace AZ
                         skinnedSubMesh.m_vertexCount = aznumeric_cast<uint32_t>(subMeshVertexCount);
                         lodVertexCount += aznumeric_cast<uint32_t>(subMeshVertexCount);
 
-                        // The default material id used by a sub-mesh is the guid of the source .fbx plus the subId which is a unique material ID from the scene API
+                        // The default material id used by a sub-mesh is the guid of the source scene file plus the subId which is a unique material ID from the scene API
                         AZ::u32 subId = modelMesh.GetMaterialAsset().GetId().m_subId;
                         AZ::Data::AssetId materialId{ actorAssetId.m_guid, subId };
 
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.h
index 53b70cca78..100d03e417 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorModule.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorModule.cpp
index 8a7f905fe1..f435ea5f88 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorModule.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorSystemComponent.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorSystemComponent.cpp
index c9cb6086cc..9271a47114 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorSystemComponent.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorSystemComponent.h
index e905d65bd0..a604b7cd4e 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorSystemComponent.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActor.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActor.cpp
index 2f5cfaee67..e38669b0a8 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActor.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActor.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActor.h
index 21b5be1fc6..a3fcfb7cc7 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActor.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
index 693241574e..0fbd12524b 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
index d8b306ef31..424ab952fb 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomBackend.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomBackend.cpp
index 8f44430951..b364f6eab9 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomBackend.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomBackend.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomBackend.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomBackend.h
index ae8af721b2..c25ed4b78d 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomBackend.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomBackend.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfx_atom_editor_files.cmake b/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfx_atom_editor_files.cmake
index 1d51786012..ab5b372208 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfx_atom_editor_files.cmake
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfx_atom_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfx_atom_files.cmake b/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfx_atom_files.cmake
index 782f1ee7cd..0bd2d3065d 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfx_atom_files.cmake
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfx_atom_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfxatom_shared_files.cmake b/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfxatom_shared_files.cmake
index 1d51786012..ab5b372208 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfxatom_shared_files.cmake
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/emotionfxatom_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/ImguiAtom/Assets/Shaders/ImGuiAtom/ImGuiAtom.azsl b/Gems/AtomLyIntegration/ImguiAtom/Assets/Shaders/ImGuiAtom/ImGuiAtom.azsl
index fd992f5a53..db9d4b6281 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Assets/Shaders/ImGuiAtom/ImGuiAtom.azsl
+++ b/Gems/AtomLyIntegration/ImguiAtom/Assets/Shaders/ImGuiAtom/ImGuiAtom.azsl
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/ImguiAtom/CMakeLists.txt b/Gems/AtomLyIntegration/ImguiAtom/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/ImguiAtom/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/ImguiAtom/Code/CMakeLists.txt b/Gems/AtomLyIntegration/ImguiAtom/Code/CMakeLists.txt
index 1001f5ca46..7016bb39ca 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.cpp b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.cpp
index 2145402fd6..4e92f32001 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.cpp
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h
index cde1051b82..7dc301ea73 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/DebugConsole.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomModule.cpp b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomModule.cpp
index e7d6d8b571..d7dea255e5 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomModule.cpp
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
index 5036ff945a..fd41ff45a5 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.h b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.h
index ab8fcf5fe8..e487c9a39a 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.h
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/Source/ImguiAtomSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/ImguiAtom/Code/imguiatom_files.cmake b/Gems/AtomLyIntegration/ImguiAtom/Code/imguiatom_files.cmake
index 31c1201ad2..47cc4f39c5 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/imguiatom_files.cmake
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/imguiatom_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/ImguiAtom/Code/imguiatom_shared_files.cmake b/Gems/AtomLyIntegration/ImguiAtom/Code/imguiatom_shared_files.cmake
index 9322440e29..c2d4ab1208 100644
--- a/Gems/AtomLyIntegration/ImguiAtom/Code/imguiatom_shared_files.cmake
+++ b/Gems/AtomLyIntegration/ImguiAtom/Code/imguiatom_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/CMakeLists.txt b/Gems/AtomLyIntegration/TechnicalArt/CMakeLists.txt
index 2aee56fb57..322cb67f87 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/.env b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/.env
index f56819c4cf..3f751e9269 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/.env
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/.env
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/CMakeLists.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/CMakeLists.txt
index 81f3b89b88..aead5b0eea 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/CMakeLists.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/CMakeLists.txt
index fc5c50378a..85692d831e 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Include/DccScriptingInterface/DCCScriptingInterfaceBus.h b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Include/DccScriptingInterface/DCCScriptingInterfaceBus.h
index ad3d8fd127..a46df59891 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Include/DccScriptingInterface/DCCScriptingInterfaceBus.h
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Include/DccScriptingInterface/DCCScriptingInterfaceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceModule.cpp b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceModule.cpp
index a3b056f0e0..51d7f801ee 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceModule.cpp
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceSystemComponent.cpp b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceSystemComponent.cpp
index aaa41404a0..49ae38b531 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceSystemComponent.h b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceSystemComponent.h
index 252a8a6d3a..a6df98f99b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceSystemComponent.h
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/Source/DCCScriptingInterfaceSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/dccscriptinginterface_files.cmake b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/dccscriptinginterface_files.cmake
index ba2c6c3ab2..937a7f5590 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/dccscriptinginterface_files.cmake
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/dccscriptinginterface_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/dccscriptinginterface_shared_files.cmake b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/dccscriptinginterface_shared_files.cmake
index 36c6f295f7..a0cc934eac 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/dccscriptinginterface_shared_files.cmake
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/dccscriptinginterface_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py
index 1400392f2c..7c62fb4110 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat
index 6d00debd54..6c58a14436 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Maya.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Maya.bat
index cc3cc88886..858899b187 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Maya.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Maya.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_PyCharm.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_PyCharm.bat
index e1eb5e9efc..93a457f292 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_PyCharm.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_PyCharm.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Python.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Python.bat
index cf7fcb4a88..aba279d9e9 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Python.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Python.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Qt.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Qt.bat
index 4d47d41dfd..e3032428ab 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Qt.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Qt.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Substance.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Substance.bat
index e42633ebce..2a0f9805e6 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Substance.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Substance.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_VScode.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_VScode.bat
index c24e4cf04c..8513d8599a 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_VScode.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_VScode.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_WingIDE.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_WingIDE.bat
index e87a4632ea..f181b871a9 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_WingIDE.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_WingIDE.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Env_Cmd.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Env_Cmd.bat
index 0d043ea8be..4e88f8e578 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Env_Cmd.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Env_Cmd.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_MayaPy_PyCharmPro.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_MayaPy_PyCharmPro.bat
index 022cf2c54d..6fd2966b0d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_MayaPy_PyCharmPro.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_MayaPy_PyCharmPro.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Maya_2020.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Maya_2020.bat
index 80c852f2ca..7de601f4c8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Maya_2020.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Maya_2020.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_PyCharmPro.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_PyCharmPro.bat
index c78f923b34..a5f0bf0b43 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_PyCharmPro.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_PyCharmPro.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_PyMin_Cmd.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_PyMin_Cmd.bat
index 33dc23dcd1..b81400b3d1 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_PyMin_Cmd.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_PyMin_Cmd.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Qt_PyMin_Cmd.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Qt_PyMin_Cmd.bat
index a34595e71c..4a5bd14898 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Qt_PyMin_Cmd.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_Qt_PyMin_Cmd.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_VScode.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_VScode.bat
index 35a0c9e2e6..907770353d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_VScode.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_VScode.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_WingIDE-7-1.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_WingIDE-7-1.bat
index 3938690414..3d99680fa7 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_WingIDE-7-1.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_WingIDE-7-1.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayaPy_2020.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayaPy_2020.bat
index b1c399fbbd..b9f9bd5e2b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayaPy_2020.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayaPy_2020.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayapy_WingIDE-7-1.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayapy_WingIDE-7-1.bat
index 8a24278072..5d8fc97cf9 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayapy_WingIDE-7-1.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayapy_WingIDE-7-1.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_pyBASE.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_pyBASE.bat
index 2bc09a555d..9bdb5e3d61 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_pyBASE.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_pyBASE.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_pyBASE_Cmd.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_pyBASE_Cmd.bat
index 5446fd1ff9..08ea6f1c4e 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_pyBASE_Cmd.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_pyBASE_Cmd.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Setuo_copy_oiio.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Setuo_copy_oiio.bat
index 7a34a52e5f..6107203b95 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Setuo_copy_oiio.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Setuo_copy_oiio.bat
@@ -1,6 +1,6 @@
 @echo off
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/__init__.py
index 35bdbbf6d1..00f4f0081a 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py
index ddfdd85aac..247e3e69b4 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/minspect.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/minspect.py
index e0681737e2..a2b645aac0 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/minspect.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/minspect.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Lumberyard/Scripts/set_menu.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Lumberyard/Scripts/set_menu.py
index 5cf09a204b..c38e8118ec 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Lumberyard/Scripts/set_menu.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Lumberyard/Scripts/set_menu.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/__init__.py
index 23da964606..d4aa8277e7 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/blender_materials.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/blender_materials.py
index 8b6e2e3b7d..9ec7eccd4b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/blender_materials.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/blender_materials.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/dcc_material_mapping.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/dcc_material_mapping.py
index b5860baafe..dc265190c4 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/dcc_material_mapping.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/dcc_material_mapping.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/drag_and_drop.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/drag_and_drop.py
index 8f6541d980..6a64189e1e 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/drag_and_drop.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/drag_and_drop.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py
index 9ed0f175bf..cb646168c6 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py
index c6a14b41f0..c99435216d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/max_materials.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/max_materials.py
index 66d1ad9800..38e684e81a 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/max_materials.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/max_materials.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/maya_materials.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/maya_materials.py
index 69452a0ee4..883b404bde 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/maya_materials.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/maya_materials.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/model.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/model.py
index 5bb569dc0a..11c36bcdb6 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/model.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/model.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/__init__.py
index f200e34385..67440f899d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/launcher.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/launcher.bat
index 84623b4d57..24bfb21605 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/launcher.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/launcher.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/main.py
index 17051f9016..363d3776f8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/main.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/process_fbx_file.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/process_fbx_file.py
index 595d9a0d20..9e811ea9b9 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/process_fbx_file.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/process_fbx_file.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standalone.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standalone.py
index b6de844689..db4ed160a5 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standalone.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standalone.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_Cmd.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_Cmd.bat
index a9ba966894..910d656c2a 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_Cmd.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_Cmd.bat
@@ -1,7 +1,7 @@
 :: coding:utf-8
 :: !/usr/bin/python
 ::
-:: Copyright (c) Contributors to the Open 3D Engine Project
+:: 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_Maya_2020.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_Maya_2020.bat
index 8df79b5dea..daeb0fb8a3 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_Maya_2020.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_Maya_2020.bat
@@ -1,7 +1,7 @@
 :: coding:utf-8
 :: !/usr/bin/python
 ::
-:: Copyright (c) Contributors to the Open 3D Engine Project
+:: 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_WingIDE-7-1.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_WingIDE-7-1.bat
index 6b3bc01489..cb274bbe50 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_WingIDE-7-1.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Launch_WingIDE-7-1.bat
@@ -1,7 +1,7 @@
 :: coding:utf-8
 :: !/usr/bin/python
 ::
-:: Copyright (c) Contributors to the Open 3D Engine Project
+:: 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Project_Env.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Project_Env.bat
index f5c1dc0b15..fd232f196b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Project_Env.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/Project_Env.bat
@@ -1,7 +1,7 @@
 :: coding:utf-8
 :: !/usr/bin/python
 ::
-:: Copyright (c) Contributors to the Open 3D Engine Project
+:: 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/__init__.py
index 8f2f3697d9..463b1ab6ab 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/cli_control.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/cli_control.py
index b9415e31db..ac8cbac2f6 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/cli_control.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/cli_control.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/constants.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/constants.py
index 2d60cf8252..6d17f60fc1 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/constants.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/constants.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/create_maya_files.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/create_maya_files.py
index bb74f6b65b..dcbe2ff30c 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/create_maya_files.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/create_maya_files.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/image_conversion.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/image_conversion.py
index e920abea01..9154b338ca 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/image_conversion.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/image_conversion.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/isolate_and_assign.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/isolate_and_assign.py
index 3c3fb5e2a5..50743d95b8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/isolate_and_assign.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/isolate_and_assign.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/lumberyard_data.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/lumberyard_data.py
index 5eca0bf4f3..1f6a43797d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/lumberyard_data.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/lumberyard_data.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py
index 7bd618b2b5..a7f1dd8bfb 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/test_command_port.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/test_command_port.py
index ab1fdeba11..cc09bcb725 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/test_command_port.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/test_command_port.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/utilities.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/utilities.py
index 94c29ca031..84ef5a4d72 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/utilities.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/utilities.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/__init__.py
index 37ebd47864..1db662a520 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py
index 17e3f8af68..e62543ed7d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/minspect.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/minspect.py
index 4b1dab5828..450eec64e5 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/minspect.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/minspect.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/__init__.py
index 43ff5d29bd..167ef99c22 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/atom_mat.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/atom_mat.py
index c2c6d26a27..8cb01f2994 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/atom_mat.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/atom_mat.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/fbx_to_atom.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/fbx_to_atom.py
index b7dc86788a..abd5c0945b 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/fbx_to_atom.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/fbx_to_atom.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/stingrayPBS_converter.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/stingrayPBS_converter.py
index db152c8ffc..4edc5f7ecf 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/stingrayPBS_converter.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/stingrayPBS_converter.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/stingrayPBS_converter_maya.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/stingrayPBS_converter_maya.py
index 0f56f12c25..d1d8c67d91 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/stingrayPBS_converter_maya.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/stingrayPBS_converter_maya.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/constants.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/constants.py
index 249b91728b..9ae02e7c93 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/constants.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/constants.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_callbacks.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_callbacks.py
index 2fa95eb248..46a6850780 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_callbacks.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_callbacks.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_defaults.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_defaults.py
index 0b1ecd8226..deba090476 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_defaults.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_defaults.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_menu.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_menu.py
index 3f514b3259..3eccb2d96e 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_menu.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_menu.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_shelf.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_shelf.py
index a3e5e7a3f2..203432da8f 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_shelf.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/set_shelf.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/setupPaths.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/setupPaths.py
index 97e3a5238d..21dd0c0640 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/setupPaths.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/setupPaths.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/userSetup.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/userSetup.py
index 41fd0a27b3..fb3b00caeb 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/userSetup.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/userSetup.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
index b4160b3b13..3538ccbd0d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
@@ -1,4 +1,4 @@
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Python/Tests/OpenImageIO/test_oiio.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Python/Tests/OpenImageIO/test_oiio.py
index 2547463dde..2b4cd29e0e 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Python/Tests/OpenImageIO/test_oiio.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Python/Tests/OpenImageIO/test_oiio.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/blender_materials.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/blender_materials.py
index 9ea65de685..79fc83a56d 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/blender_materials.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/blender_materials.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/cli_control.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/cli_control.py
index 97e461fee5..cd0c92f572 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/cli_control.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/cli_control.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/dcc_material_mapping.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/dcc_material_mapping.py
index e9b01e79cd..f53e953678 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/dcc_material_mapping.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/dcc_material_mapping.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/drag_and_drop.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/drag_and_drop.py
index 489dad5ad2..7ca5b94abc 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/drag_and_drop.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/drag_and_drop.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/launcher.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/launcher.bat
index d79db62df0..57e9a71367 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/launcher.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/launcher.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/main.py
index 10554377e8..d7ec13894b 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/main.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/max_materials.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/max_materials.py
index 5059980989..14ea1a45e6 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/max_materials.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/max_materials.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/maya_materials.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/maya_materials.py
index 5dcd269e27..5ddfb5207c 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/maya_materials.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/maya_materials.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/model.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/model.py
index 5bb569dc0a..11c36bcdb6 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/model.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/model.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/standalone.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/standalone.py
index de6b4b053c..3e5b4301dd 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/standalone.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/DCC_Material_Converter/standalone.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/Launcher/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/Launcher/main.py
index 327408303f..ff72546ee3 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/Launcher/main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/PythonTools/Launcher/main.py
@@ -3,7 +3,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/__init__.py
index 3d5d772db7..f40140be84 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/atom_material.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/atom_material.py
index d6f995096f..2cf2e6aac8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/atom_material.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/atom_material.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/bootstrap.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/bootstrap.py
index 050c3dee00..26f49a5b07 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/bootstrap.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/bootstrap.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sb_gui_main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sb_gui_main.py
index ae260aefee..e90e4593a8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sb_gui_main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sb_gui_main.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbs_to_sbsar.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbs_to_sbsar.py
index ae7d9b4b61..bb9efca169 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbs_to_sbsar.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbs_to_sbsar.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_info.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_info.py
index 61fe9bf6a6..a2fd64892b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_info.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_info.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_render.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_render.py
index 1cbc872714..8ad5725d59 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_render.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_render.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_utils.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_utils.py
index 0757578d64..354d330a0c 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_utils.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/sbsar_utils.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/substance_tools.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/substance_tools.py
index 71b38dd894..27d5557184 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/substance_tools.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/substance_tools.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/PyQt5_qtextedit_stdout.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/PyQt5_qtextedit_stdout.py
index edeae7232f..241541956b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/PyQt5_qtextedit_stdout.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/PyQt5_qtextedit_stdout.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/PySide2_qtextedit_stdout.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/PySide2_qtextedit_stdout.py
index 298349c9c1..1339d4655c 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/PySide2_qtextedit_stdout.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/PySide2_qtextedit_stdout.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/main.py
index 1ccc944bad..e46207724c 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/main.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/selection_dialog.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/selection_dialog.py
index af6a6d28a8..f3d677566a 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/selection_dialog.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/selection_dialog.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BaseStyleSheet.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BaseStyleSheet.qss
index 193bc3f10d..9dd7ead0fa 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BaseStyleSheet.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BaseStyleSheet.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BreadCrumbs.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BreadCrumbs.qss
index f983bdb796..e02e74fc36 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BreadCrumbs.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BreadCrumbs.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BrowseEdit.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BrowseEdit.qss
index b2586453e4..19455f41ec 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BrowseEdit.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/BrowseEdit.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Card.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Card.qss
index 4dad3dab72..9c1ca9d24e 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Card.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Card.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/CheckBox.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/CheckBox.qss
index 82fe83f16e..e16de0cea8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/CheckBox.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/CheckBox.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ColorPicker.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ColorPicker.qss
index 0a236f4a9d..9ea9afdd45 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ColorPicker.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ColorPicker.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ComboBox.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ComboBox.qss
index ef36b1cd33..952c77f86b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ComboBox.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ComboBox.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/LineEdit.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/LineEdit.qss
index af2766050f..9c9fdfc3e5 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/LineEdit.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/LineEdit.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Menu.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Menu.qss
index d84934fc6a..dd6b355612 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Menu.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Menu.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ProgressBar.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ProgressBar.qss
index 06a25b8543..eeb2cb8d50 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ProgressBar.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ProgressBar.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/PushButton.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/PushButton.qss
index f364132d8c..eb2f2e0d08 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/PushButton.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/PushButton.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/RadioButton.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/RadioButton.qss
index f2c58470b4..5d9bfeed4b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/RadioButton.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/RadioButton.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ScrollBar.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ScrollBar.qss
index fc7c9c8570..21c2612a83 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ScrollBar.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ScrollBar.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/SegmentControl.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/SegmentControl.qss
index a375147723..1773194866 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/SegmentControl.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/SegmentControl.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Slider.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Slider.qss
index 0510cbb2ec..110c08bf64 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Slider.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Slider.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/SpinBox.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/SpinBox.qss
index 57710f92ec..5b9ceaf454 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/SpinBox.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/SpinBox.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Text.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Text.qss
index 59dc0f8eae..09b1333326 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Text.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/Text.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ToolTip.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ToolTip.qss
index 5a96aacb96..fa89f2529f 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ToolTip.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/ToolTip.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/watchdog/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/watchdog/__init__.py
index 297860cc13..8c75164431 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/watchdog/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/watchdog/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/scripts/sbs_builder_main_SD.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/scripts/sbs_builder_main_SD.py
index f94abdcad5..6d3912656f 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/scripts/sbs_builder_main_SD.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/scripts/sbs_builder_main_SD.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.dev/readme.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.dev/readme.txt
index 693c6c6917..f2ecf01468 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.dev/readme.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.dev/readme.txt
@@ -1,4 +1,4 @@
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.idea/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.idea/main.py
index da6709fe33..ff24801071 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.idea/main.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/.idea/main.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # !/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/readme.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/readme.txt
index 923258ef54..a7a9320acf 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/readme.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Solutions/readme.txt
@@ -1,4 +1,4 @@
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/3dsmax/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/3dsmax/__init__.py
index 800438ee3d..a1173e44b9 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/3dsmax/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/3dsmax/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
index c335b94a3c..0d2d7e7b30 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/blender/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/blender/__init__.py
index 58cc7eeac2..4854361c59 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/blender/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/blender/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
index 347ac7046f..846e193db1 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
index dde76ce451..201e198d70 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/__init__.py
index 90b9a5ae89..1a105ca88d 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/__init__.py
index 51fea703b6..d2ead2bdb3 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/examples/maya_command_script.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/examples/maya_command_script.py
index bfb3eebb44..dc592e5436 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/examples/maya_command_script.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/examples/maya_command_script.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/__init__.py
index f5d526d296..44163b0b3e 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/hot_keys.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/hot_keys.py
index febf220e37..dc74df10cd 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/hot_keys.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/hot_keys.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/test.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/test.py
index e242441371..cd2c63a73f 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/test.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/ide/wing/test.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/__init__.py
index 31e222e29b..6fe3b347dc 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/__init__.py
index f914c2c06c..c2949b169e 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/maya_app.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/maya_app.py
index af09fe6745..a1bf66a964 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/maya_app.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/maya_app.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/running_state.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/running_state.py
index 1e323c1d25..27fee8e3b1 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/running_state.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dev/utils/check/running_state.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/env_base.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/env_base.py
index 825890488f..4ac09deb7c 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/env_base.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/env_base.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/env_bool.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/env_bool.py
index b306535628..fe45881b30 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/env_bool.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/env_bool.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/houdini/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/houdini/__init__.py
index 1b27f61d72..6b9d72a0b4 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/houdini/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/houdini/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/lumberyard/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/lumberyard/__init__.py
index 43b4ae3ef0..fb9bce354e 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/lumberyard/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/lumberyard/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/marmoset/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/marmoset/__init__.py
index bb9fc572e1..cc2af8c11f 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/marmoset/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/marmoset/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/__init__.py
index f9516434d6..2e0ad28125 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/__init__.py
index 05a8aa2e16..751d5a2a0e 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/event_callback_handler.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/event_callback_handler.py
index db67a95775..03d2075444 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/event_callback_handler.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/event_callback_handler.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/node_message_callback_handler.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/node_message_callback_handler.py
index b4ac9b4a7f..fee8cfb788 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/node_message_callback_handler.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/node_message_callback_handler.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/on_shader_rename.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/on_shader_rename.py
index 5798183b5f..603d09661c 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/on_shader_rename.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/callbacks/on_shader_rename.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/__init__.py
index 15f76d396e..7835590254 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/undo_context.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/undo_context.py
index f9010f90b2..24b34ed5d6 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/undo_context.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/undo_context.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/utils.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/utils.py
index a6b781fc0c..5d4361d725 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/utils.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/helpers/utils.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/toolbits/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/toolbits/__init__.py
index e8223e9191..b7f2a6529d 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/toolbits/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/toolbits/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/toolbits/detach.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/toolbits/detach.py
index 1de410f63d..47a341ddde 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/toolbits/detach.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/toolbits/detach.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/__init__.py
index a3765d1669..1e53c99d0b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/execute_wing_code.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/execute_wing_code.py
index ce506781b0..3b66f1461f 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/execute_wing_code.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/execute_wing_code.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/simple_command_port.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/simple_command_port.py
index 0ba8eb8645..e266aa9429 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/simple_command_port.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/simple_command_port.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/wing_to_maya.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/wing_to_maya.py
index f2be0a32d3..c2fd94a8c7 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/wing_to_maya.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/maya/utils/wing_to_maya.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/render/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/render/__init__.py
index 93c2390e4a..67bdb51334 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/render/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/render/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/return_stub.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/return_stub.py
index d7feed42e0..5d1006298a 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/return_stub.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/return_stub.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/__init__.py
index 2a5efa19ca..323ca78a65 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/__init__.py
index 7d7bd557fb..df4ee14c5a 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/core_utils.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/core_utils.py
index 6eab1d2f94..3ea0515b18 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/core_utils.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/core_utils.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/envar_utils.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/envar_utils.py
index a8c44d19c2..028acee34b 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/envar_utils.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/envar_utils.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py
index f4cfea393a..eb3060707d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/find_arg.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/find_arg.py
index 2da687f12a..2f0aa92f5b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/find_arg.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/find_arg.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/helpers.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/helpers.py
index 3ecaf5ee73..8c0bd5c42f 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/helpers.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/helpers.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/node.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/node.py
index d4e3b4e74b..39f569135b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/node.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/node.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/pathnode.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/pathnode.py
index 56f1ba7c35..456ec383ab 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/pathnode.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/pathnode.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth.py
index 14b0d5347a..77b30d9d76 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth_arg_kwarg.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth_arg_kwarg.py
index 7a125983bb..a9759dbb32 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth_arg_kwarg.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/synth_arg_kwarg.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/test_foo.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/test_foo.py
index 66fe90c759..0dba21dc79 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/test_foo.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/test_foo.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/__init__.py
index 7e5f4e49f2..0273b9931b 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/base_widget.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/base_widget.py
index bac5748522..2ca47221ae 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/base_widget.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/base_widget.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/custom_treemodel.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/custom_treemodel.py
index b6e767458d..32f4359835 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/custom_treemodel.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/custom_treemodel.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/help_menu.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/help_menu.py
index 73d9839a1e..4802e740da 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/help_menu.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/help_menu.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/pyside2_qtextedit_stdout.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/pyside2_qtextedit_stdout.py
index 222726c440..5485b4a661 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/pyside2_qtextedit_stdout.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/pyside2_qtextedit_stdout.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/pyside2_ui_utils.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/pyside2_ui_utils.py
index 17393f50af..603724bde9 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/pyside2_ui_utils.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/pyside2_ui_utils.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/qt_settings.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/qt_settings.py
index 934da0d78d..0a756aa91a 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/qt_settings.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/qt_settings.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BaseStyleSheet.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BaseStyleSheet.qss
index 193bc3f10d..9dd7ead0fa 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BaseStyleSheet.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BaseStyleSheet.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BreadCrumbs.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BreadCrumbs.qss
index f983bdb796..e02e74fc36 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BreadCrumbs.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BreadCrumbs.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BrowseEdit.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BrowseEdit.qss
index b2586453e4..19455f41ec 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BrowseEdit.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/BrowseEdit.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Card.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Card.qss
index 4dad3dab72..9c1ca9d24e 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Card.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Card.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/CheckBox.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/CheckBox.qss
index 82fe83f16e..e16de0cea8 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/CheckBox.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/CheckBox.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ColorPicker.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ColorPicker.qss
index 0a236f4a9d..9ea9afdd45 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ColorPicker.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ColorPicker.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ComboBox.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ComboBox.qss
index ef36b1cd33..952c77f86b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ComboBox.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ComboBox.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/LineEdit.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/LineEdit.qss
index af2766050f..9c9fdfc3e5 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/LineEdit.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/LineEdit.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Menu.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Menu.qss
index d84934fc6a..dd6b355612 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Menu.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Menu.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ProgressBar.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ProgressBar.qss
index 06a25b8543..eeb2cb8d50 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ProgressBar.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ProgressBar.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/PushButton.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/PushButton.qss
index f364132d8c..eb2f2e0d08 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/PushButton.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/PushButton.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/RadioButton.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/RadioButton.qss
index f2c58470b4..5d9bfeed4b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/RadioButton.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/RadioButton.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ScrollBar.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ScrollBar.qss
index fc7c9c8570..21c2612a83 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ScrollBar.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ScrollBar.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/SegmentControl.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/SegmentControl.qss
index a375147723..1773194866 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/SegmentControl.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/SegmentControl.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Slider.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Slider.qss
index 0510cbb2ec..110c08bf64 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Slider.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Slider.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/SpinBox.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/SpinBox.qss
index 57710f92ec..5b9ceaf454 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/SpinBox.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/SpinBox.qss
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Text.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Text.qss
index 59dc0f8eae..09b1333326 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Text.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/Text.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ToolTip.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ToolTip.qss
index 5a96aacb96..fa89f2529f 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ToolTip.qss
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/ToolTip.qss
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/templates.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/templates.py
index 66724b69fe..747f5b4c0e 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/templates.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/templates.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/substance/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/substance/__init__.py
index a0bad33866..c6500953ef 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/substance/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/substance/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
index 7785419e99..e05ae6192a 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/__init__.py
index a042e4cf21..51b55532f8 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/__init__.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/entry_test.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/entry_test.py
index d4fcec36b7..1b5bfc2664 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/entry_test.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/test/entry_test.py
@@ -1,7 +1,7 @@
 # coding:utf-8
 #!/usr/bin/python
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
index ce9febda6e..42a39cce26 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/setup.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/setup.py
index bbea49da8a..a1b1bdbe18 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/setup.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/setup.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AtomTressFX/CMakeLists.txt b/Gems/AtomTressFX/CMakeLists.txt
index 30503258bc..1fe051b062 100644
--- a/Gems/AtomTressFX/CMakeLists.txt
+++ b/Gems/AtomTressFX/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AtomTressFX/Tools/Maya/TressFX_Exporter.py b/Gems/AtomTressFX/Tools/Maya/TressFX_Exporter.py
index 1128799e00..85ef8b681e 100755
--- a/Gems/AtomTressFX/Tools/Maya/TressFX_Exporter.py
+++ b/Gems/AtomTressFX/Tools/Maya/TressFX_Exporter.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/CMakeLists.txt b/Gems/AudioEngineWwise/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AudioEngineWwise/CMakeLists.txt
+++ b/Gems/AudioEngineWwise/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/CMakeLists.txt b/Gems/AudioEngineWwise/Code/CMakeLists.txt
index d143b76a38..b53f93ce94 100644
--- a/Gems/AudioEngineWwise/Code/CMakeLists.txt
+++ b/Gems/AudioEngineWwise/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Android/AkPlatformFuncs_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Android/AkPlatformFuncs_Platform.h
index a464193bb1..310cec0e9a 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/AkPlatformFuncs_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/AkPlatformFuncs_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Android/AudioEngineWwise_Traits_Android.h b/Gems/AudioEngineWwise/Code/Platform/Android/AudioEngineWwise_Traits_Android.h
index b5b5126660..f9670755a1 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/AudioEngineWwise_Traits_Android.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/AudioEngineWwise_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Android/AudioEngineWwise_Traits_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Android/AudioEngineWwise_Traits_Platform.h
index 279e3850d5..f1f98889cd 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/AudioEngineWwise_Traits_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/AudioEngineWwise_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Android/AudioSystemImpl_wwise_Android.cpp b/Gems/AudioEngineWwise/Code/Platform/Android/AudioSystemImpl_wwise_Android.cpp
index 0fbc682aa2..ae4de09728 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/AudioSystemImpl_wwise_Android.cpp
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/AudioSystemImpl_wwise_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Android/FileIOHandler_wwise_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Android/FileIOHandler_wwise_Platform.h
index 9005a35b33..31abc16f6c 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/FileIOHandler_wwise_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/FileIOHandler_wwise_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Android/PAL_android.cmake b/Gems/AudioEngineWwise/Code/Platform/Android/PAL_android.cmake
index 9ec2c51a07..bd8ed51d44 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/PAL_android.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Android/platform_android.cmake b/Gems/AudioEngineWwise/Code/Platform/Android/platform_android.cmake
index ddb67e27b5..24640d6fc9 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/platform_android.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Android/platform_android_files.cmake b/Gems/AudioEngineWwise/Code/Platform/Android/platform_android_files.cmake
index 3eda8f7d26..265f08caf7 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Android/platform_android_files.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Common/Default/AkPlatformFuncs_Default.h b/Gems/AudioEngineWwise/Code/Platform/Common/Default/AkPlatformFuncs_Default.h
index c8cede9581..7d660c620b 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Common/Default/AkPlatformFuncs_Default.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Common/Default/AkPlatformFuncs_Default.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Common/Default/FileIOHandler_wwise_Default.cpp b/Gems/AudioEngineWwise/Code/Platform/Common/Default/FileIOHandler_wwise_Default.cpp
index 8c0a7fb67e..831a6f2ed8 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Common/Default/FileIOHandler_wwise_Default.cpp
+++ b/Gems/AudioEngineWwise/Code/Platform/Common/Default/FileIOHandler_wwise_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Common/Default/FileIOHandler_wwise_Default.h b/Gems/AudioEngineWwise/Code/Platform/Common/Default/FileIOHandler_wwise_Default.h
index 1eb944845d..c5bfbda9dd 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Common/Default/FileIOHandler_wwise_Default.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Common/Default/FileIOHandler_wwise_Default.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Common/MSVC/AkPlatformFuncs_Default.h b/Gems/AudioEngineWwise/Code/Platform/Common/MSVC/AkPlatformFuncs_Default.h
index bbbbe0905c..2ae470ed0d 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Common/MSVC/AkPlatformFuncs_Default.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Common/MSVC/AkPlatformFuncs_Default.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Common/Unimplemented/AudioEngineWwise_Unimplemented.cpp b/Gems/AudioEngineWwise/Code/Platform/Common/Unimplemented/AudioEngineWwise_Unimplemented.cpp
index 3cb3eca663..512e9f6e56 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Common/Unimplemented/AudioEngineWwise_Unimplemented.cpp
+++ b/Gems/AudioEngineWwise/Code/Platform/Common/Unimplemented/AudioEngineWwise_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Common/Unimplemented/AudioSystemImpl_wwise_Unimplemented.cpp b/Gems/AudioEngineWwise/Code/Platform/Common/Unimplemented/AudioSystemImpl_wwise_Unimplemented.cpp
index a0e085235d..0993237dd8 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Common/Unimplemented/AudioSystemImpl_wwise_Unimplemented.cpp
+++ b/Gems/AudioEngineWwise/Code/Platform/Common/Unimplemented/AudioSystemImpl_wwise_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Linux/AkPlatformFuncs_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Linux/AkPlatformFuncs_Platform.h
index a464193bb1..310cec0e9a 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Linux/AkPlatformFuncs_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Linux/AkPlatformFuncs_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Linux/AudioEngineWwise_Traits_Linux.h b/Gems/AudioEngineWwise/Code/Platform/Linux/AudioEngineWwise_Traits_Linux.h
index d00cd4c7a2..ab34c55087 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Linux/AudioEngineWwise_Traits_Linux.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Linux/AudioEngineWwise_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Linux/AudioEngineWwise_Traits_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Linux/AudioEngineWwise_Traits_Platform.h
index 70e07c592c..7397fb10bd 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Linux/AudioEngineWwise_Traits_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Linux/AudioEngineWwise_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Linux/FileIOHandler_wwise_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Linux/FileIOHandler_wwise_Platform.h
index 9005a35b33..31abc16f6c 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Linux/FileIOHandler_wwise_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Linux/FileIOHandler_wwise_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Linux/PAL_linux.cmake b/Gems/AudioEngineWwise/Code/Platform/Linux/PAL_linux.cmake
index 9ec2c51a07..bd8ed51d44 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Linux/PAL_linux.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Linux/platform_linux.cmake b/Gems/AudioEngineWwise/Code/Platform/Linux/platform_linux.cmake
index 288c41befc..1dc04c4e9e 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Linux/platform_linux.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Linux/platform_linux_files.cmake b/Gems/AudioEngineWwise/Code/Platform/Linux/platform_linux_files.cmake
index 3b96e9efdd..c00ed4396e 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Mac/AkPlatformFuncs_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Mac/AkPlatformFuncs_Platform.h
index a464193bb1..310cec0e9a 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Mac/AkPlatformFuncs_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Mac/AkPlatformFuncs_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Mac/AudioEngineWwise_Traits_Mac.h b/Gems/AudioEngineWwise/Code/Platform/Mac/AudioEngineWwise_Traits_Mac.h
index d00cd4c7a2..ab34c55087 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Mac/AudioEngineWwise_Traits_Mac.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Mac/AudioEngineWwise_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Mac/AudioEngineWwise_Traits_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Mac/AudioEngineWwise_Traits_Platform.h
index 6d373dac76..80a48a86c9 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Mac/AudioEngineWwise_Traits_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Mac/AudioEngineWwise_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Mac/FileIOHandler_wwise_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Mac/FileIOHandler_wwise_Platform.h
index 9005a35b33..31abc16f6c 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Mac/FileIOHandler_wwise_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Mac/FileIOHandler_wwise_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Mac/PAL_mac.cmake b/Gems/AudioEngineWwise/Code/Platform/Mac/PAL_mac.cmake
index 9ec2c51a07..bd8ed51d44 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Mac/PAL_mac.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Mac/platform_mac.cmake b/Gems/AudioEngineWwise/Code/Platform/Mac/platform_mac.cmake
index 4e47154e36..0755b15e54 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Mac/platform_mac.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Mac/platform_mac_files.cmake b/Gems/AudioEngineWwise/Code/Platform/Mac/platform_mac_files.cmake
index 76d8dea85d..f136f765d6 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Windows/AkPlatformFuncs_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Windows/AkPlatformFuncs_Platform.h
index 5664fb800b..5516e05f2e 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/AkPlatformFuncs_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/AkPlatformFuncs_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Windows/AudioEngineWwise_Traits_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Windows/AudioEngineWwise_Traits_Platform.h
index 0a797b11f4..5282e1f8df 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/AudioEngineWwise_Traits_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/AudioEngineWwise_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Windows/AudioEngineWwise_Traits_Windows.h b/Gems/AudioEngineWwise/Code/Platform/Windows/AudioEngineWwise_Traits_Windows.h
index 40b4367bee..51f35c248c 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/AudioEngineWwise_Traits_Windows.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/AudioEngineWwise_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Windows/AudioSystemImpl_wwise_Windows.cpp b/Gems/AudioEngineWwise/Code/Platform/Windows/AudioSystemImpl_wwise_Windows.cpp
index 996f5b9bb0..4324f050e6 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/AudioSystemImpl_wwise_Windows.cpp
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/AudioSystemImpl_wwise_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Windows/FileIOHandler_wwise_Platform.h b/Gems/AudioEngineWwise/Code/Platform/Windows/FileIOHandler_wwise_Platform.h
index 9005a35b33..31abc16f6c 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/FileIOHandler_wwise_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/FileIOHandler_wwise_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/Windows/PAL_windows.cmake b/Gems/AudioEngineWwise/Code/Platform/Windows/PAL_windows.cmake
index 9ec2c51a07..bd8ed51d44 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/PAL_windows.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Windows/platform_windows.cmake b/Gems/AudioEngineWwise/Code/Platform/Windows/platform_windows.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/platform_windows.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/Windows/platform_windows_files.cmake b/Gems/AudioEngineWwise/Code/Platform/Windows/platform_windows_files.cmake
index 9123b526ca..6d5d832d5f 100644
--- a/Gems/AudioEngineWwise/Code/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/iOS/AkPlatformFuncs_Platform.h b/Gems/AudioEngineWwise/Code/Platform/iOS/AkPlatformFuncs_Platform.h
index a464193bb1..310cec0e9a 100644
--- a/Gems/AudioEngineWwise/Code/Platform/iOS/AkPlatformFuncs_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/iOS/AkPlatformFuncs_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/iOS/AudioEngineWwise_Traits_Platform.h b/Gems/AudioEngineWwise/Code/Platform/iOS/AudioEngineWwise_Traits_Platform.h
index b15955b160..e604816c03 100644
--- a/Gems/AudioEngineWwise/Code/Platform/iOS/AudioEngineWwise_Traits_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/iOS/AudioEngineWwise_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/iOS/AudioEngineWwise_Traits_iOS.h b/Gems/AudioEngineWwise/Code/Platform/iOS/AudioEngineWwise_Traits_iOS.h
index b5b5126660..f9670755a1 100644
--- a/Gems/AudioEngineWwise/Code/Platform/iOS/AudioEngineWwise_Traits_iOS.h
+++ b/Gems/AudioEngineWwise/Code/Platform/iOS/AudioEngineWwise_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/iOS/FileIOHandler_wwise_Platform.h b/Gems/AudioEngineWwise/Code/Platform/iOS/FileIOHandler_wwise_Platform.h
index 9005a35b33..31abc16f6c 100644
--- a/Gems/AudioEngineWwise/Code/Platform/iOS/FileIOHandler_wwise_Platform.h
+++ b/Gems/AudioEngineWwise/Code/Platform/iOS/FileIOHandler_wwise_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Platform/iOS/PAL_ios.cmake b/Gems/AudioEngineWwise/Code/Platform/iOS/PAL_ios.cmake
index 9ec2c51a07..bd8ed51d44 100644
--- a/Gems/AudioEngineWwise/Code/Platform/iOS/PAL_ios.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/iOS/platform_ios.cmake b/Gems/AudioEngineWwise/Code/Platform/iOS/platform_ios.cmake
index 31f59f86e1..896fb3930b 100644
--- a/Gems/AudioEngineWwise/Code/Platform/iOS/platform_ios.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Platform/iOS/platform_ios_files.cmake b/Gems/AudioEngineWwise/Code/Platform/iOS/platform_ios_files.cmake
index 958e6e70f1..68a581a810 100644
--- a/Gems/AudioEngineWwise/Code/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/AudioEngineWwise/Code/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.cpp b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.cpp
index 1909b70ce2..5ff4136158 100644
--- a/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.h b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.h
index 42de24c600..383f536752 100644
--- a/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.h
+++ b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule.cpp b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule.cpp
index 6911d014c5..526b1fa2d8 100644
--- a/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule_Stub.cpp b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule_Stub.cpp
index a6e2b1c4e2..1f49d27d64 100644
--- a/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule_Stub.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseModule_Stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderComponent.cpp b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderComponent.cpp
index c90e05ceb1..4f715a57b1 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderComponent.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderComponent.h b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderComponent.h
index 4d77f63fc8..2156779170 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderComponent.h
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.cpp b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.cpp
index 488098bab4..5d80dcb37a 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.h b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.h
index 34c4a870ff..e67a314fc9 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.h
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderComponent.cpp b/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderComponent.cpp
index 466d07a42d..80c486ed71 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderComponent.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderComponent.h b/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderComponent.h
index 50144cbf33..730b903375 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderComponent.h
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderWorker.cpp b/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderWorker.cpp
index ff90d0fe36..c0c23381e0 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderWorker.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderWorker.h b/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderWorker.h
index 3e5b7bb4db..1c195a5449 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderWorker.h
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/WwiseBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemControl_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemControl_wwise.cpp
index 2a1f8723ce..192045cc1c 100644
--- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemControl_wwise.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemControl_wwise.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemControl_wwise.h b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemControl_wwise.h
index d8545e4ae5..d032b42db4 100644
--- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemControl_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemControl_wwise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp
index b585c00f19..43de57bbca 100644
--- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h
index 005123d20f..d61def26af 100644
--- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp b/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp
index 4b1b725d60..44712654a2 100644
--- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.h b/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.h
index f82b8f68d6..6ff8ea70c3 100644
--- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.h
+++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/ATLEntities_wwise.h b/Gems/AudioEngineWwise/Code/Source/Engine/ATLEntities_wwise.h
index e3363828d9..3f80ca6766 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/ATLEntities_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/ATLEntities_wwise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputFile.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputFile.cpp
index 1b47bcbbfc..7579f38e1b 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputFile.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputFile.h b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputFile.h
index bd3eeb67d6..83f19e2b6c 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputFile.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputMicrophone.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputMicrophone.cpp
index a8ef7f9f2c..3caa2090f0 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputMicrophone.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputMicrophone.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputMicrophone.h b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputMicrophone.h
index 916138c504..b044458a45 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputMicrophone.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputMicrophone.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputStream.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputStream.cpp
index 0f0458b2fe..b06ebbfb0c 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputStream.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputStream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputStream.h b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputStream.h
index 3e9c19891b..84a5a4b221 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputStream.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/AudioInputStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/WavParser.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/WavParser.cpp
index 27c4492524..474285ee65 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/WavParser.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/WavParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/WavParser.h b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/WavParser.h
index 06bf7ed850..b919d2ccfb 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/WavParser.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioInput/WavParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioSourceManager.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSourceManager.cpp
index 3d5a09a44f..3bdc75bc10 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioSourceManager.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSourceManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioSourceManager.h b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSourceManager.h
index a976b0394a..ee4ab5ea02 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioSourceManager.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSourceManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImplCVars.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImplCVars.cpp
index c81c8cda2e..614d6cc7d5 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImplCVars.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImplCVars.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImplCVars.h b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImplCVars.h
index 09d8574769..c14b89d56c 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImplCVars.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImplCVars.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp
index 00a565f746..bd9c2b8cf1 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.h b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.h
index 21a403fdb8..d836469282 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.cpp
index 304f532a00..579f3eb84b 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.h b/Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.h
index cd5fd06bc8..cd3c65b27b 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/Common_wwise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.cpp
index 25d8bb9ea4..8e06e2fcaf 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.h b/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.h
index f3a04ef649..c790ae5c34 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/FileIOHandler_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/FileIOHandler_wwise.cpp
index 4b89760308..c947ae225f 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/FileIOHandler_wwise.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/FileIOHandler_wwise.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/FileIOHandler_wwise.h b/Gems/AudioEngineWwise/Code/Source/Engine/FileIOHandler_wwise.h
index 9857052e3b..a44a690667 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/FileIOHandler_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/FileIOHandler_wwise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Source/Engine/PluginRegistration_wwise.h b/Gems/AudioEngineWwise/Code/Source/Engine/PluginRegistration_wwise.h
index 84f9fe1428..567dccd62a 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/PluginRegistration_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/PluginRegistration_wwise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Tests/AudioControlBuilderTest.cpp b/Gems/AudioEngineWwise/Code/Tests/AudioControlBuilderTest.cpp
index e06d5c7fcb..dad32f8a5f 100644
--- a/Gems/AudioEngineWwise/Code/Tests/AudioControlBuilderTest.cpp
+++ b/Gems/AudioEngineWwise/Code/Tests/AudioControlBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseBuilderTest.cpp b/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseBuilderTest.cpp
index ca81f85cfe..a7b43a4433 100644
--- a/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseBuilderTest.cpp
+++ b/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseEditorTest.cpp b/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseEditorTest.cpp
index 552bc919f8..15dd2a477e 100644
--- a/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseEditorTest.cpp
+++ b/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseEditorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseTest.cpp b/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseTest.cpp
index 224bdb9d97..cb3cc529f4 100644
--- a/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseTest.cpp
+++ b/Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioEngineWwise/Code/audioenginewwise_editor_files.cmake b/Gems/AudioEngineWwise/Code/audioenginewwise_editor_files.cmake
index 33e7247b76..5fa6bd686c 100644
--- a/Gems/AudioEngineWwise/Code/audioenginewwise_editor_files.cmake
+++ b/Gems/AudioEngineWwise/Code/audioenginewwise_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/audioenginewwise_editor_shared_files.cmake b/Gems/AudioEngineWwise/Code/audioenginewwise_editor_shared_files.cmake
index 03a1295fa1..ae4f647df2 100644
--- a/Gems/AudioEngineWwise/Code/audioenginewwise_editor_shared_files.cmake
+++ b/Gems/AudioEngineWwise/Code/audioenginewwise_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/audioenginewwise_editor_tests_files.cmake b/Gems/AudioEngineWwise/Code/audioenginewwise_editor_tests_files.cmake
index 11255ee20a..f1e0a38663 100644
--- a/Gems/AudioEngineWwise/Code/audioenginewwise_editor_tests_files.cmake
+++ b/Gems/AudioEngineWwise/Code/audioenginewwise_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/audioenginewwise_files.cmake b/Gems/AudioEngineWwise/Code/audioenginewwise_files.cmake
index c64a1cb030..648a9ce239 100644
--- a/Gems/AudioEngineWwise/Code/audioenginewwise_files.cmake
+++ b/Gems/AudioEngineWwise/Code/audioenginewwise_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/audioenginewwise_shared_files.cmake b/Gems/AudioEngineWwise/Code/audioenginewwise_shared_files.cmake
index e038580ed5..19e2a69fe2 100644
--- a/Gems/AudioEngineWwise/Code/audioenginewwise_shared_files.cmake
+++ b/Gems/AudioEngineWwise/Code/audioenginewwise_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/audioenginewwise_stub_files.cmake b/Gems/AudioEngineWwise/Code/audioenginewwise_stub_files.cmake
index 2eb937755d..91cb05af62 100644
--- a/Gems/AudioEngineWwise/Code/audioenginewwise_stub_files.cmake
+++ b/Gems/AudioEngineWwise/Code/audioenginewwise_stub_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Code/audioenginewwise_tests_files.cmake b/Gems/AudioEngineWwise/Code/audioenginewwise_tests_files.cmake
index 8a7f66c219..723b0129a1 100644
--- a/Gems/AudioEngineWwise/Code/audioenginewwise_tests_files.cmake
+++ b/Gems/AudioEngineWwise/Code/audioenginewwise_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioEngineWwise/Tools/WwiseATLGen/wwise_atl_gen_tool.py b/Gems/AudioEngineWwise/Tools/WwiseATLGen/wwise_atl_gen_tool.py
index 4eb893234e..c9639a17f6 100755
--- a/Gems/AudioEngineWwise/Tools/WwiseATLGen/wwise_atl_gen_tool.py
+++ b/Gems/AudioEngineWwise/Tools/WwiseATLGen/wwise_atl_gen_tool.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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,7 +13,7 @@ import sys
 
 
 __version__ = '0.1.0'
-__copyright__ = 'Copyright (c) Contributors to the Open 3D Engine Project.'
+__copyright__ = '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..'
 
 
 all_events = set()
diff --git a/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/__init__.py b/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/__init__.py
+++ b/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/bank_info_parser.py b/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/bank_info_parser.py
index 231225244d..10e6d0e667 100755
--- a/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/bank_info_parser.py
+++ b/Gems/AudioEngineWwise/Tools/WwiseAuthoringScripts/bank_info_parser.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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,7 +13,7 @@ from xml.etree import ElementTree
 
 
 __version__ = '0.1.0'
-__copyright__ = 'Copyright (c) Contributors to the Open 3D Engine Project.'
+__copyright__ = '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..'
 
 metadata_file_extension = '.bankdeps'
 metadata_version = '1.0'
diff --git a/Gems/AudioEngineWwise/Tools/WwiseConfig/setup_wwise_config.py b/Gems/AudioEngineWwise/Tools/WwiseConfig/setup_wwise_config.py
index 36233cf6be..7cac7e247d 100755
--- a/Gems/AudioEngineWwise/Tools/WwiseConfig/setup_wwise_config.py
+++ b/Gems/AudioEngineWwise/Tools/WwiseConfig/setup_wwise_config.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
@@ -14,7 +14,7 @@ import sys
 
 
 __version__ = '0.1.0'
-__copyright__ = 'Copyright (c) Contributors to the Open 3D Engine Project.'
+__copyright__ = '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..'
 
 wwise_versions = dict()
 project_platforms = dict()
diff --git a/Gems/AudioSystem/CMakeLists.txt b/Gems/AudioSystem/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AudioSystem/CMakeLists.txt
+++ b/Gems/AudioSystem/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/CMakeLists.txt b/Gems/AudioSystem/Code/CMakeLists.txt
index aaadf0ef9e..e3fda7080a 100644
--- a/Gems/AudioSystem/Code/CMakeLists.txt
+++ b/Gems/AudioSystem/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Include/Editor/ACETypes.h b/Gems/AudioSystem/Code/Include/Editor/ACETypes.h
index 19ed3b1dfc..3a46a338a0 100644
--- a/Gems/AudioSystem/Code/Include/Editor/ACETypes.h
+++ b/Gems/AudioSystem/Code/Include/Editor/ACETypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Editor/IAudioConnection.h b/Gems/AudioSystem/Code/Include/Editor/IAudioConnection.h
index fd2f32d62f..ea5802c34b 100644
--- a/Gems/AudioSystem/Code/Include/Editor/IAudioConnection.h
+++ b/Gems/AudioSystem/Code/Include/Editor/IAudioConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Editor/IAudioSystemControl.h b/Gems/AudioSystem/Code/Include/Editor/IAudioSystemControl.h
index f4dcb9942d..9c21a23f58 100644
--- a/Gems/AudioSystem/Code/Include/Editor/IAudioSystemControl.h
+++ b/Gems/AudioSystem/Code/Include/Editor/IAudioSystemControl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Editor/IAudioSystemEditor.h b/Gems/AudioSystem/Code/Include/Editor/IAudioSystemEditor.h
index d0509c8eea..d62041aaff 100644
--- a/Gems/AudioSystem/Code/Include/Editor/IAudioSystemEditor.h
+++ b/Gems/AudioSystem/Code/Include/Editor/IAudioSystemEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Engine/ATLCommon.h b/Gems/AudioSystem/Code/Include/Engine/ATLCommon.h
index f6633950ca..c912cf7bcf 100644
--- a/Gems/AudioSystem/Code/Include/Engine/ATLCommon.h
+++ b/Gems/AudioSystem/Code/Include/Engine/ATLCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Engine/ATLEntityData.h b/Gems/AudioSystem/Code/Include/Engine/ATLEntityData.h
index ee9179382a..eb296070aa 100644
--- a/Gems/AudioSystem/Code/Include/Engine/ATLEntityData.h
+++ b/Gems/AudioSystem/Code/Include/Engine/ATLEntityData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Engine/AudioAllocators.h b/Gems/AudioSystem/Code/Include/Engine/AudioAllocators.h
index 8e8ed3468a..9fd5454489 100644
--- a/Gems/AudioSystem/Code/Include/Engine/AudioAllocators.h
+++ b/Gems/AudioSystem/Code/Include/Engine/AudioAllocators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Engine/AudioFileUtils.h b/Gems/AudioSystem/Code/Include/Engine/AudioFileUtils.h
index 03d52e8ad6..c813f22164 100644
--- a/Gems/AudioSystem/Code/Include/Engine/AudioFileUtils.h
+++ b/Gems/AudioSystem/Code/Include/Engine/AudioFileUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Engine/AudioLogger.h b/Gems/AudioSystem/Code/Include/Engine/AudioLogger.h
index aec7fa3952..375cf18bba 100644
--- a/Gems/AudioSystem/Code/Include/Engine/AudioLogger.h
+++ b/Gems/AudioSystem/Code/Include/Engine/AudioLogger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Engine/AudioRingBuffer.h b/Gems/AudioSystem/Code/Include/Engine/AudioRingBuffer.h
index 4f41ffb8d4..b6ad57f51b 100644
--- a/Gems/AudioSystem/Code/Include/Engine/AudioRingBuffer.h
+++ b/Gems/AudioSystem/Code/Include/Engine/AudioRingBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Include/Engine/IAudioSystemImplementation.h b/Gems/AudioSystem/Code/Include/Engine/IAudioSystemImplementation.h
index de5f1c04b3..2d2db187cb 100644
--- a/Gems/AudioSystem/Code/Include/Engine/IAudioSystemImplementation.h
+++ b/Gems/AudioSystem/Code/Include/Engine/IAudioSystemImplementation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Android/AudioSystem_Traits_Android.h b/Gems/AudioSystem/Code/Platform/Android/AudioSystem_Traits_Android.h
index 726d4af81a..1882780e85 100644
--- a/Gems/AudioSystem/Code/Platform/Android/AudioSystem_Traits_Android.h
+++ b/Gems/AudioSystem/Code/Platform/Android/AudioSystem_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Android/AudioSystem_Traits_Platform.h b/Gems/AudioSystem/Code/Platform/Android/AudioSystem_Traits_Platform.h
index 9ed7b86929..b882e623a8 100644
--- a/Gems/AudioSystem/Code/Platform/Android/AudioSystem_Traits_Platform.h
+++ b/Gems/AudioSystem/Code/Platform/Android/AudioSystem_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Android/platform_android.cmake b/Gems/AudioSystem/Code/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/AudioSystem/Code/Platform/Android/platform_android.cmake
+++ b/Gems/AudioSystem/Code/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/Android/platform_android_files.cmake b/Gems/AudioSystem/Code/Platform/Android/platform_android_files.cmake
index cddb805955..d3631dfa13 100644
--- a/Gems/AudioSystem/Code/Platform/Android/platform_android_files.cmake
+++ b/Gems/AudioSystem/Code/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/Common/Default/AudioSystemGemSystemComponent_default.cpp b/Gems/AudioSystem/Code/Platform/Common/Default/AudioSystemGemSystemComponent_default.cpp
index cfd75ec511..b1da5516f8 100644
--- a/Gems/AudioSystem/Code/Platform/Common/Default/AudioSystemGemSystemComponent_default.cpp
+++ b/Gems/AudioSystem/Code/Platform/Common/Default/AudioSystemGemSystemComponent_default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Linux/AudioSystem_Traits_Linux.h b/Gems/AudioSystem/Code/Platform/Linux/AudioSystem_Traits_Linux.h
index 476dfea073..b2c65d2f42 100644
--- a/Gems/AudioSystem/Code/Platform/Linux/AudioSystem_Traits_Linux.h
+++ b/Gems/AudioSystem/Code/Platform/Linux/AudioSystem_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Linux/AudioSystem_Traits_Platform.h b/Gems/AudioSystem/Code/Platform/Linux/AudioSystem_Traits_Platform.h
index 9f04cfe9d9..04af04c032 100644
--- a/Gems/AudioSystem/Code/Platform/Linux/AudioSystem_Traits_Platform.h
+++ b/Gems/AudioSystem/Code/Platform/Linux/AudioSystem_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Linux/platform_linux.cmake b/Gems/AudioSystem/Code/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/AudioSystem/Code/Platform/Linux/platform_linux.cmake
+++ b/Gems/AudioSystem/Code/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/Linux/platform_linux_files.cmake b/Gems/AudioSystem/Code/Platform/Linux/platform_linux_files.cmake
index 60ae1bc8a0..69c0955bed 100644
--- a/Gems/AudioSystem/Code/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/AudioSystem/Code/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/Mac/AudioSystem_Traits_Mac.h b/Gems/AudioSystem/Code/Platform/Mac/AudioSystem_Traits_Mac.h
index 476dfea073..b2c65d2f42 100644
--- a/Gems/AudioSystem/Code/Platform/Mac/AudioSystem_Traits_Mac.h
+++ b/Gems/AudioSystem/Code/Platform/Mac/AudioSystem_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Mac/AudioSystem_Traits_Platform.h b/Gems/AudioSystem/Code/Platform/Mac/AudioSystem_Traits_Platform.h
index e5ec15fbd9..874a9e2765 100644
--- a/Gems/AudioSystem/Code/Platform/Mac/AudioSystem_Traits_Platform.h
+++ b/Gems/AudioSystem/Code/Platform/Mac/AudioSystem_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Mac/platform_mac.cmake b/Gems/AudioSystem/Code/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/AudioSystem/Code/Platform/Mac/platform_mac.cmake
+++ b/Gems/AudioSystem/Code/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/Mac/platform_mac_files.cmake b/Gems/AudioSystem/Code/Platform/Mac/platform_mac_files.cmake
index 4fd04f3b6a..ca4ccb88a1 100644
--- a/Gems/AudioSystem/Code/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/AudioSystem/Code/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/Windows/AudioSystem_Traits_Platform.h b/Gems/AudioSystem/Code/Platform/Windows/AudioSystem_Traits_Platform.h
index 893c6dc739..845d1bc0d2 100644
--- a/Gems/AudioSystem/Code/Platform/Windows/AudioSystem_Traits_Platform.h
+++ b/Gems/AudioSystem/Code/Platform/Windows/AudioSystem_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Windows/AudioSystem_Traits_Windows.h b/Gems/AudioSystem/Code/Platform/Windows/AudioSystem_Traits_Windows.h
index 171c9bafd5..a652d1cbc8 100644
--- a/Gems/AudioSystem/Code/Platform/Windows/AudioSystem_Traits_Windows.h
+++ b/Gems/AudioSystem/Code/Platform/Windows/AudioSystem_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/Windows/platform_windows.cmake b/Gems/AudioSystem/Code/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/AudioSystem/Code/Platform/Windows/platform_windows.cmake
+++ b/Gems/AudioSystem/Code/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/Windows/platform_windows_files.cmake b/Gems/AudioSystem/Code/Platform/Windows/platform_windows_files.cmake
index fa941729ca..ac7d6adcc0 100644
--- a/Gems/AudioSystem/Code/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/AudioSystem/Code/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/iOS/AudioSystem_Traits_Platform.h b/Gems/AudioSystem/Code/Platform/iOS/AudioSystem_Traits_Platform.h
index ce7bec780e..3cc1451ba1 100644
--- a/Gems/AudioSystem/Code/Platform/iOS/AudioSystem_Traits_Platform.h
+++ b/Gems/AudioSystem/Code/Platform/iOS/AudioSystem_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/iOS/AudioSystem_Traits_iOS.h b/Gems/AudioSystem/Code/Platform/iOS/AudioSystem_Traits_iOS.h
index 8e98073fbc..da5c831f14 100644
--- a/Gems/AudioSystem/Code/Platform/iOS/AudioSystem_Traits_iOS.h
+++ b/Gems/AudioSystem/Code/Platform/iOS/AudioSystem_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Platform/iOS/platform_ios.cmake b/Gems/AudioSystem/Code/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/AudioSystem/Code/Platform/iOS/platform_ios.cmake
+++ b/Gems/AudioSystem/Code/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Platform/iOS/platform_ios_files.cmake b/Gems/AudioSystem/Code/Platform/iOS/platform_ios_files.cmake
index 7ae5866449..63604352b3 100644
--- a/Gems/AudioSystem/Code/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/AudioSystem/Code/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp b/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp
index 1f780920c1..64846617b2 100644
--- a/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp
+++ b/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.h b/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.h
index 3ca37de53b..174bd18355 100644
--- a/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.h
+++ b/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/AudioSystemModule.cpp b/Gems/AudioSystem/Code/Source/AudioSystemModule.cpp
index 292b7e6e31..9a3787b19e 100644
--- a/Gems/AudioSystem/Code/Source/AudioSystemModule.cpp
+++ b/Gems/AudioSystem/Code/Source/AudioSystemModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/AudioSystemModule_Stub.cpp b/Gems/AudioSystem/Code/Source/AudioSystemModule_Stub.cpp
index def277f2c2..7477c33f9b 100644
--- a/Gems/AudioSystem/Code/Source/AudioSystemModule_Stub.cpp
+++ b/Gems/AudioSystem/Code/Source/AudioSystemModule_Stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ACEEnums.h b/Gems/AudioSystem/Code/Source/Editor/ACEEnums.h
index 64bdcd7839..2d06dcdffa 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ACEEnums.h
+++ b/Gems/AudioSystem/Code/Source/Editor/ACEEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp
index cd88b53945..a9371bedd1 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.h b/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.h
index e31e7b01b5..646160aa37 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.h
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
index ba1f3ba4ae..8d07c890fc 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.h b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.h
index 11f2e4d3e8..3bd033861b 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.h
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp
index 78ca889fe3..c2cf4f893f 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.h b/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.h
index 6246869218..7025f7c9b9 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.h
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp
index 971be95f1f..ac3d7c30a2 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControl.h b/Gems/AudioSystem/Code/Source/Editor/AudioControl.h
index 1d9b2735be..957f2dd2e5 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControl.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlFilters.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlFilters.cpp
index 4d1e06175a..558ef6c38c 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlFilters.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlFilters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlFilters.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlFilters.h
index 39055e8afa..707f2bfe57 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlFilters.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlFilters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp
index 1b2024ea1e..438053237c 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.h
index 1419231b63..2d38b4e7ed 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
index 095e1e19ab..22ca35ce90 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h
index 46ae0ba35e..c3be779432 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
index 6ffcdb0262..b386c745db 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
index d0ef20706a..5c00a06491 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp
index 0b8ccea34a..01f8045922 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.h
index 08812295d5..4f6d26efe5 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.cpp
index 5f9aecf8c6..405f1a4e80 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.h
index f5b74c1b19..20065f6db0 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
index e72a19cc5b..57460e461d 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp
index 56b5a12a7d..321e7a7b1c 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.h b/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.h
index 8cdc1e6b00..1a2df6e0a9 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
index 9badca9ea6..e3332b4ccc 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h
index 9005ccb802..8a23023d98 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h
+++ b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp b/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp
index 976b4ee9f4..4c89fe8fcd 100644
--- a/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.h b/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.h
index 903f32f5e9..7b7ddb7371 100644
--- a/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.h
+++ b/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QATLControlsTreeModel.cpp b/Gems/AudioSystem/Code/Source/Editor/QATLControlsTreeModel.cpp
index e15dd97dfa..a7ea803f94 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QATLControlsTreeModel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/QATLControlsTreeModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QATLControlsTreeModel.h b/Gems/AudioSystem/Code/Source/Editor/QATLControlsTreeModel.h
index 98f8d11a9d..0e0f366b06 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QATLControlsTreeModel.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QATLControlsTreeModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QAudioControlEditorIcons.h b/Gems/AudioSystem/Code/Source/Editor/QAudioControlEditorIcons.h
index be84f7b047..923eabccfa 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QAudioControlEditorIcons.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QAudioControlEditorIcons.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QAudioControlTreeWidget.cpp b/Gems/AudioSystem/Code/Source/Editor/QAudioControlTreeWidget.cpp
index 3ed1c74cca..77421f6a77 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QAudioControlTreeWidget.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/QAudioControlTreeWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QAudioControlTreeWidget.h b/Gems/AudioSystem/Code/Source/Editor/QAudioControlTreeWidget.h
index 1e8ca576a0..49f25e1fa6 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QAudioControlTreeWidget.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QAudioControlTreeWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QConnectionListWidget.h b/Gems/AudioSystem/Code/Source/Editor/QConnectionListWidget.h
index 59dde7737c..3feaa1a043 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QConnectionListWidget.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QConnectionListWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
index 1acf2d9899..08e4e1ce4c 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h
index 02e3eba360..918cf1d8cd 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QSimpleAudioControlListWidget.cpp b/Gems/AudioSystem/Code/Source/Editor/QSimpleAudioControlListWidget.cpp
index dfddaab5a1..219483971c 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QSimpleAudioControlListWidget.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/QSimpleAudioControlListWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QSimpleAudioControlListWidget.h b/Gems/AudioSystem/Code/Source/Editor/QSimpleAudioControlListWidget.h
index e968a18f37..8c6a8eaa38 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QSimpleAudioControlListWidget.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QSimpleAudioControlListWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QTreeWidgetFilter.cpp b/Gems/AudioSystem/Code/Source/Editor/QTreeWidgetFilter.cpp
index 0434e184fa..c2ea84c612 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QTreeWidgetFilter.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/QTreeWidgetFilter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Editor/QTreeWidgetFilter.h b/Gems/AudioSystem/Code/Source/Editor/QTreeWidgetFilter.h
index 8e8a070914..f4aba6441c 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QTreeWidgetFilter.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QTreeWidgetFilter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATL.cpp b/Gems/AudioSystem/Code/Source/Engine/ATL.cpp
index a1452ac378..02b69bc204 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATL.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/ATL.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATL.h b/Gems/AudioSystem/Code/Source/Engine/ATL.h
index 22d1b4e790..4d3c86e08c 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATL.h
+++ b/Gems/AudioSystem/Code/Source/Engine/ATL.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.cpp b/Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.cpp
index eafb8f6411..29a529ed28 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.h b/Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.h
index 4ad0e4dcf2..f17dfe2b6c 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.h
+++ b/Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATLComponents.cpp b/Gems/AudioSystem/Code/Source/Engine/ATLComponents.cpp
index 75988f221c..a2244823eb 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATLComponents.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/ATLComponents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATLComponents.h b/Gems/AudioSystem/Code/Source/Engine/ATLComponents.h
index 2ed316d617..c7c983d2ee 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATLComponents.h
+++ b/Gems/AudioSystem/Code/Source/Engine/ATLComponents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATLEntities.cpp b/Gems/AudioSystem/Code/Source/Engine/ATLEntities.cpp
index edc8ec4c04..42ae16e6e5 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATLEntities.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/ATLEntities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATLEntities.h b/Gems/AudioSystem/Code/Source/Engine/ATLEntities.h
index 2bd43fa33c..b946936c54 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATLEntities.h
+++ b/Gems/AudioSystem/Code/Source/Engine/ATLEntities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATLUtils.cpp b/Gems/AudioSystem/Code/Source/Engine/ATLUtils.cpp
index e2ddecf260..5dc62544fa 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATLUtils.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/ATLUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/ATLUtils.h b/Gems/AudioSystem/Code/Source/Engine/ATLUtils.h
index 2e5ad263e5..95449bf448 100644
--- a/Gems/AudioSystem/Code/Source/Engine/ATLUtils.h
+++ b/Gems/AudioSystem/Code/Source/Engine/ATLUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/AudioInternalInterfaces.h b/Gems/AudioSystem/Code/Source/Engine/AudioInternalInterfaces.h
index 2755a90d25..a61ab28c67 100644
--- a/Gems/AudioSystem/Code/Source/Engine/AudioInternalInterfaces.h
+++ b/Gems/AudioSystem/Code/Source/Engine/AudioInternalInterfaces.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/AudioProxy.cpp b/Gems/AudioSystem/Code/Source/Engine/AudioProxy.cpp
index 6cd457023a..6e0d2df2a4 100644
--- a/Gems/AudioSystem/Code/Source/Engine/AudioProxy.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/AudioProxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/AudioProxy.h b/Gems/AudioSystem/Code/Source/Engine/AudioProxy.h
index 9e61798042..b54138b382 100644
--- a/Gems/AudioSystem/Code/Source/Engine/AudioProxy.h
+++ b/Gems/AudioSystem/Code/Source/Engine/AudioProxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/AudioRequests.cpp b/Gems/AudioSystem/Code/Source/Engine/AudioRequests.cpp
index 4dd87e980d..7fa406fb85 100644
--- a/Gems/AudioSystem/Code/Source/Engine/AudioRequests.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/AudioRequests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/AudioSystem.cpp b/Gems/AudioSystem/Code/Source/Engine/AudioSystem.cpp
index 8be7671703..d65d27667f 100644
--- a/Gems/AudioSystem/Code/Source/Engine/AudioSystem.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/AudioSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/AudioSystem.h b/Gems/AudioSystem/Code/Source/Engine/AudioSystem.h
index 89a0e7ea8f..fe37175d41 100644
--- a/Gems/AudioSystem/Code/Source/Engine/AudioSystem.h
+++ b/Gems/AudioSystem/Code/Source/Engine/AudioSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp b/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp
index fc1bac2e12..4749da5568 100644
--- a/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.h b/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.h
index fb3a93e736..a9b62f10b3 100644
--- a/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.h
+++ b/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/SoundCVars.cpp b/Gems/AudioSystem/Code/Source/Engine/SoundCVars.cpp
index d233dc1abd..83e1139495 100644
--- a/Gems/AudioSystem/Code/Source/Engine/SoundCVars.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/SoundCVars.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Source/Engine/SoundCVars.h b/Gems/AudioSystem/Code/Source/Engine/SoundCVars.h
index 7d66228512..7cb7c5712c 100644
--- a/Gems/AudioSystem/Code/Source/Engine/SoundCVars.h
+++ b/Gems/AudioSystem/Code/Source/Engine/SoundCVars.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Tests/AudioSystemEditorTest.cpp b/Gems/AudioSystem/Code/Tests/AudioSystemEditorTest.cpp
index aa5df70fe8..74c67263a7 100644
--- a/Gems/AudioSystem/Code/Tests/AudioSystemEditorTest.cpp
+++ b/Gems/AudioSystem/Code/Tests/AudioSystemEditorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Tests/AudioSystemTest.cpp b/Gems/AudioSystem/Code/Tests/AudioSystemTest.cpp
index 09aee29acd..7dc9e1f5b3 100644
--- a/Gems/AudioSystem/Code/Tests/AudioSystemTest.cpp
+++ b/Gems/AudioSystem/Code/Tests/AudioSystemTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Tests/Mocks/ATLEntitiesMock.h b/Gems/AudioSystem/Code/Tests/Mocks/ATLEntitiesMock.h
index ead239b305..84309bc645 100644
--- a/Gems/AudioSystem/Code/Tests/Mocks/ATLEntitiesMock.h
+++ b/Gems/AudioSystem/Code/Tests/Mocks/ATLEntitiesMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Tests/Mocks/FileCacheManagerMock.h b/Gems/AudioSystem/Code/Tests/Mocks/FileCacheManagerMock.h
index 0bf090e406..e57cff16f6 100644
--- a/Gems/AudioSystem/Code/Tests/Mocks/FileCacheManagerMock.h
+++ b/Gems/AudioSystem/Code/Tests/Mocks/FileCacheManagerMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Tests/Mocks/IAudioSystemImplementationMock.h b/Gems/AudioSystem/Code/Tests/Mocks/IAudioSystemImplementationMock.h
index 8c27b46139..4daf0862e5 100644
--- a/Gems/AudioSystem/Code/Tests/Mocks/IAudioSystemImplementationMock.h
+++ b/Gems/AudioSystem/Code/Tests/Mocks/IAudioSystemImplementationMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/Tests/WaveTable48000Sine.h b/Gems/AudioSystem/Code/Tests/WaveTable48000Sine.h
index a43ac9752d..a788398272 100644
--- a/Gems/AudioSystem/Code/Tests/WaveTable48000Sine.h
+++ b/Gems/AudioSystem/Code/Tests/WaveTable48000Sine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AudioSystem/Code/audiosystem_editor_files.cmake b/Gems/AudioSystem/Code/audiosystem_editor_files.cmake
index 6554d61756..19692856c2 100644
--- a/Gems/AudioSystem/Code/audiosystem_editor_files.cmake
+++ b/Gems/AudioSystem/Code/audiosystem_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/audiosystem_editor_shared_files.cmake b/Gems/AudioSystem/Code/audiosystem_editor_shared_files.cmake
index 4193043ddd..9eafb6683d 100644
--- a/Gems/AudioSystem/Code/audiosystem_editor_shared_files.cmake
+++ b/Gems/AudioSystem/Code/audiosystem_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/audiosystem_editor_tests_files.cmake b/Gems/AudioSystem/Code/audiosystem_editor_tests_files.cmake
index 80c8029d40..42280168a7 100644
--- a/Gems/AudioSystem/Code/audiosystem_editor_tests_files.cmake
+++ b/Gems/AudioSystem/Code/audiosystem_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/audiosystem_files.cmake b/Gems/AudioSystem/Code/audiosystem_files.cmake
index 243d9861c7..73840578a9 100644
--- a/Gems/AudioSystem/Code/audiosystem_files.cmake
+++ b/Gems/AudioSystem/Code/audiosystem_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/audiosystem_shared_files.cmake b/Gems/AudioSystem/Code/audiosystem_shared_files.cmake
index 5de54c9e22..32029d8b4a 100644
--- a/Gems/AudioSystem/Code/audiosystem_shared_files.cmake
+++ b/Gems/AudioSystem/Code/audiosystem_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/audiosystem_stub_files.cmake b/Gems/AudioSystem/Code/audiosystem_stub_files.cmake
index 46c03de10f..f5c7ff3fff 100644
--- a/Gems/AudioSystem/Code/audiosystem_stub_files.cmake
+++ b/Gems/AudioSystem/Code/audiosystem_stub_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AudioSystem/Code/audiosystem_tests_files.cmake b/Gems/AudioSystem/Code/audiosystem_tests_files.cmake
index eeb3f7788c..acf675a741 100644
--- a/Gems/AudioSystem/Code/audiosystem_tests_files.cmake
+++ b/Gems/AudioSystem/Code/audiosystem_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AutomatedLauncherTesting/CMakeLists.txt b/Gems/AutomatedLauncherTesting/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/AutomatedLauncherTesting/CMakeLists.txt
+++ b/Gems/AutomatedLauncherTesting/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AutomatedLauncherTesting/Code/CMakeLists.txt b/Gems/AutomatedLauncherTesting/Code/CMakeLists.txt
index c6c044afdb..41c81bc3f1 100644
--- a/Gems/AutomatedLauncherTesting/Code/CMakeLists.txt
+++ b/Gems/AutomatedLauncherTesting/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AutomatedLauncherTesting/Code/Include/AutomatedLauncherTesting/AutomatedLauncherTestingBus.h b/Gems/AutomatedLauncherTesting/Code/Include/AutomatedLauncherTesting/AutomatedLauncherTestingBus.h
index 77b596ac34..f5cad4827c 100644
--- a/Gems/AutomatedLauncherTesting/Code/Include/AutomatedLauncherTesting/AutomatedLauncherTestingBus.h
+++ b/Gems/AutomatedLauncherTesting/Code/Include/AutomatedLauncherTesting/AutomatedLauncherTestingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingModule.cpp b/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingModule.cpp
index c8d0817238..4dfad2ecbd 100644
--- a/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingModule.cpp
+++ b/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingSystemComponent.cpp b/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingSystemComponent.cpp
index 52722e13bf..fd1e0b5a54 100644
--- a/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingSystemComponent.cpp
+++ b/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingSystemComponent.h b/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingSystemComponent.h
index 3db5161300..6ab5ed710e 100644
--- a/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingSystemComponent.h
+++ b/Gems/AutomatedLauncherTesting/Code/Source/AutomatedLauncherTestingSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AutomatedLauncherTesting/Code/Source/SpawnDynamicSlice.cpp b/Gems/AutomatedLauncherTesting/Code/Source/SpawnDynamicSlice.cpp
index 88dac70eaa..3b555d58a0 100644
--- a/Gems/AutomatedLauncherTesting/Code/Source/SpawnDynamicSlice.cpp
+++ b/Gems/AutomatedLauncherTesting/Code/Source/SpawnDynamicSlice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AutomatedLauncherTesting/Code/Source/SpawnDynamicSlice.h b/Gems/AutomatedLauncherTesting/Code/Source/SpawnDynamicSlice.h
index 20f707c962..1bc161ca90 100644
--- a/Gems/AutomatedLauncherTesting/Code/Source/SpawnDynamicSlice.h
+++ b/Gems/AutomatedLauncherTesting/Code/Source/SpawnDynamicSlice.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/AutomatedLauncherTesting/Code/automatedlaunchertesting_files.cmake b/Gems/AutomatedLauncherTesting/Code/automatedlaunchertesting_files.cmake
index f8a0ee8971..f6c1942225 100644
--- a/Gems/AutomatedLauncherTesting/Code/automatedlaunchertesting_files.cmake
+++ b/Gems/AutomatedLauncherTesting/Code/automatedlaunchertesting_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/AutomatedLauncherTesting/Code/automatedlaunchertesting_shared_files.cmake b/Gems/AutomatedLauncherTesting/Code/automatedlaunchertesting_shared_files.cmake
index c86f138d10..e810bc132f 100644
--- a/Gems/AutomatedLauncherTesting/Code/automatedlaunchertesting_shared_files.cmake
+++ b/Gems/AutomatedLauncherTesting/Code/automatedlaunchertesting_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/CMakeLists.txt b/Gems/Blast/CMakeLists.txt
index 0baf19674a..d7e8a04473 100644
--- a/Gems/Blast/CMakeLists.txt
+++ b/Gems/Blast/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/CMakeLists.txt b/Gems/Blast/Code/CMakeLists.txt
index b3fccc8211..eb9f965780 100644
--- a/Gems/Blast/Code/CMakeLists.txt
+++ b/Gems/Blast/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/Editor/ConfigurationWidget.cpp b/Gems/Blast/Code/Editor/ConfigurationWidget.cpp
index 6768f1dc1c..a7ab82bf41 100644
--- a/Gems/Blast/Code/Editor/ConfigurationWidget.cpp
+++ b/Gems/Blast/Code/Editor/ConfigurationWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Editor/ConfigurationWidget.h b/Gems/Blast/Code/Editor/ConfigurationWidget.h
index 8aa423e5a3..a1e87422db 100644
--- a/Gems/Blast/Code/Editor/ConfigurationWidget.h
+++ b/Gems/Blast/Code/Editor/ConfigurationWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Editor/EditorWindow.cpp b/Gems/Blast/Code/Editor/EditorWindow.cpp
index 9f1da0763a..a162041cbb 100644
--- a/Gems/Blast/Code/Editor/EditorWindow.cpp
+++ b/Gems/Blast/Code/Editor/EditorWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Editor/EditorWindow.h b/Gems/Blast/Code/Editor/EditorWindow.h
index d25dd368dd..4c960672bf 100644
--- a/Gems/Blast/Code/Editor/EditorWindow.h
+++ b/Gems/Blast/Code/Editor/EditorWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Editor/MaterialIdWidget.cpp b/Gems/Blast/Code/Editor/MaterialIdWidget.cpp
index f495f0b0cb..9942578fc1 100644
--- a/Gems/Blast/Code/Editor/MaterialIdWidget.cpp
+++ b/Gems/Blast/Code/Editor/MaterialIdWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Editor/MaterialIdWidget.h b/Gems/Blast/Code/Editor/MaterialIdWidget.h
index 1735d8b071..ae1138f221 100644
--- a/Gems/Blast/Code/Editor/MaterialIdWidget.h
+++ b/Gems/Blast/Code/Editor/MaterialIdWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Editor/SettingsWidget.cpp b/Gems/Blast/Code/Editor/SettingsWidget.cpp
index 7f9a9d630f..14848fa5f7 100644
--- a/Gems/Blast/Code/Editor/SettingsWidget.cpp
+++ b/Gems/Blast/Code/Editor/SettingsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Editor/SettingsWidget.h b/Gems/Blast/Code/Editor/SettingsWidget.h
index 0cc1cf8857..4e7b1bd1d6 100644
--- a/Gems/Blast/Code/Editor/SettingsWidget.h
+++ b/Gems/Blast/Code/Editor/SettingsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Include/Blast/BlastActor.h b/Gems/Blast/Code/Include/Blast/BlastActor.h
index 8c78bc51f9..91f3457505 100644
--- a/Gems/Blast/Code/Include/Blast/BlastActor.h
+++ b/Gems/Blast/Code/Include/Blast/BlastActor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Include/Blast/BlastActorData.h b/Gems/Blast/Code/Include/Blast/BlastActorData.h
index 7a523277cb..e408867c51 100644
--- a/Gems/Blast/Code/Include/Blast/BlastActorData.h
+++ b/Gems/Blast/Code/Include/Blast/BlastActorData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Include/Blast/BlastDebug.h b/Gems/Blast/Code/Include/Blast/BlastDebug.h
index 616e47a305..2530eb4217 100644
--- a/Gems/Blast/Code/Include/Blast/BlastDebug.h
+++ b/Gems/Blast/Code/Include/Blast/BlastDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Include/Blast/BlastFamilyComponentBus.h b/Gems/Blast/Code/Include/Blast/BlastFamilyComponentBus.h
index bd5b227d45..9dae3e4c18 100644
--- a/Gems/Blast/Code/Include/Blast/BlastFamilyComponentBus.h
+++ b/Gems/Blast/Code/Include/Blast/BlastFamilyComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Include/Blast/BlastMaterial.h b/Gems/Blast/Code/Include/Blast/BlastMaterial.h
index f3b8cdd6c6..32fda2ea0f 100644
--- a/Gems/Blast/Code/Include/Blast/BlastMaterial.h
+++ b/Gems/Blast/Code/Include/Blast/BlastMaterial.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Include/Blast/BlastSystemBus.h b/Gems/Blast/Code/Include/Blast/BlastSystemBus.h
index bb5b12bbed..7d129d2b39 100644
--- a/Gems/Blast/Code/Include/Blast/BlastSystemBus.h
+++ b/Gems/Blast/Code/Include/Blast/BlastSystemBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Include/PxSmartPtr.h b/Gems/Blast/Code/Include/PxSmartPtr.h
index 717d3b6dc2..fb476f12ba 100644
--- a/Gems/Blast/Code/Include/PxSmartPtr.h
+++ b/Gems/Blast/Code/Include/PxSmartPtr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Platform/Android/PAL_android.cmake b/Gems/Blast/Code/Platform/Android/PAL_android.cmake
index b3822d6dcc..9dc5e67275 100644
--- a/Gems/Blast/Code/Platform/Android/PAL_android.cmake
+++ b/Gems/Blast/Code/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/Platform/Linux/PAL_linux.cmake b/Gems/Blast/Code/Platform/Linux/PAL_linux.cmake
index b3822d6dcc..9dc5e67275 100644
--- a/Gems/Blast/Code/Platform/Linux/PAL_linux.cmake
+++ b/Gems/Blast/Code/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/Platform/Mac/PAL_mac.cmake b/Gems/Blast/Code/Platform/Mac/PAL_mac.cmake
index b3822d6dcc..9dc5e67275 100644
--- a/Gems/Blast/Code/Platform/Mac/PAL_mac.cmake
+++ b/Gems/Blast/Code/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/Platform/Windows/PAL_windows.cmake b/Gems/Blast/Code/Platform/Windows/PAL_windows.cmake
index 30755f83d2..7dfb9cb9b2 100644
--- a/Gems/Blast/Code/Platform/Windows/PAL_windows.cmake
+++ b/Gems/Blast/Code/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/Platform/iOS/PAL_ios.cmake b/Gems/Blast/Code/Platform/iOS/PAL_ios.cmake
index b3822d6dcc..9dc5e67275 100644
--- a/Gems/Blast/Code/Platform/iOS/PAL_ios.cmake
+++ b/Gems/Blast/Code/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/Source/Actor/BlastActorDesc.h b/Gems/Blast/Code/Source/Actor/BlastActorDesc.h
index de0e461c11..c99c4c87cb 100644
--- a/Gems/Blast/Code/Source/Actor/BlastActorDesc.h
+++ b/Gems/Blast/Code/Source/Actor/BlastActorDesc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Actor/BlastActorFactory.cpp b/Gems/Blast/Code/Source/Actor/BlastActorFactory.cpp
index ea27eb2a37..178e0c9d02 100644
--- a/Gems/Blast/Code/Source/Actor/BlastActorFactory.cpp
+++ b/Gems/Blast/Code/Source/Actor/BlastActorFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Actor/BlastActorFactory.h b/Gems/Blast/Code/Source/Actor/BlastActorFactory.h
index f27d309704..626285a48e 100644
--- a/Gems/Blast/Code/Source/Actor/BlastActorFactory.h
+++ b/Gems/Blast/Code/Source/Actor/BlastActorFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Actor/BlastActorImpl.cpp b/Gems/Blast/Code/Source/Actor/BlastActorImpl.cpp
index 75c22d985f..abc6319d3a 100644
--- a/Gems/Blast/Code/Source/Actor/BlastActorImpl.cpp
+++ b/Gems/Blast/Code/Source/Actor/BlastActorImpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Actor/BlastActorImpl.h b/Gems/Blast/Code/Source/Actor/BlastActorImpl.h
index f3c65545d9..dd58249869 100644
--- a/Gems/Blast/Code/Source/Actor/BlastActorImpl.h
+++ b/Gems/Blast/Code/Source/Actor/BlastActorImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Actor/EntityProvider.cpp b/Gems/Blast/Code/Source/Actor/EntityProvider.cpp
index 493902436b..2bd0807120 100644
--- a/Gems/Blast/Code/Source/Actor/EntityProvider.cpp
+++ b/Gems/Blast/Code/Source/Actor/EntityProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Actor/EntityProvider.h b/Gems/Blast/Code/Source/Actor/EntityProvider.h
index efb023e18c..35d147d4ed 100644
--- a/Gems/Blast/Code/Source/Actor/EntityProvider.h
+++ b/Gems/Blast/Code/Source/Actor/EntityProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Actor/ShapesProvider.cpp b/Gems/Blast/Code/Source/Actor/ShapesProvider.cpp
index 4af40e1683..d973054eec 100644
--- a/Gems/Blast/Code/Source/Actor/ShapesProvider.cpp
+++ b/Gems/Blast/Code/Source/Actor/ShapesProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Actor/ShapesProvider.h b/Gems/Blast/Code/Source/Actor/ShapesProvider.h
index 99a9988844..a7a2fc4e9b 100644
--- a/Gems/Blast/Code/Source/Actor/ShapesProvider.h
+++ b/Gems/Blast/Code/Source/Actor/ShapesProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Asset/BlastAsset.cpp b/Gems/Blast/Code/Source/Asset/BlastAsset.cpp
index d6a95872cc..932bb79bcb 100644
--- a/Gems/Blast/Code/Source/Asset/BlastAsset.cpp
+++ b/Gems/Blast/Code/Source/Asset/BlastAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -62,7 +62,7 @@ namespace Blast
         }
         else
         {
-            // in this case we'll want to extract the physics meshes from the fbx.
+            // in this case we'll want to extract the physics meshes from the scene file.
             // We don't necessarily have access to the mesh data though, so if we want to support this,
             // we'll need to come up with a way to associate with the mesh data
             // See BlastAssetModel in the SDK sample for how to create that data
diff --git a/Gems/Blast/Code/Source/Asset/BlastAsset.h b/Gems/Blast/Code/Source/Asset/BlastAsset.h
index 622a56380b..b7335117b3 100644
--- a/Gems/Blast/Code/Source/Asset/BlastAsset.h
+++ b/Gems/Blast/Code/Source/Asset/BlastAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Asset/BlastAssetHandler.cpp b/Gems/Blast/Code/Source/Asset/BlastAssetHandler.cpp
index 64e309e0fb..4f73b1a19c 100644
--- a/Gems/Blast/Code/Source/Asset/BlastAssetHandler.cpp
+++ b/Gems/Blast/Code/Source/Asset/BlastAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Asset/BlastAssetHandler.h b/Gems/Blast/Code/Source/Asset/BlastAssetHandler.h
index 4e559f52a7..311cb6650a 100644
--- a/Gems/Blast/Code/Source/Asset/BlastAssetHandler.h
+++ b/Gems/Blast/Code/Source/Asset/BlastAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Asset/BlastSliceAsset.cpp b/Gems/Blast/Code/Source/Asset/BlastSliceAsset.cpp
index 01e93ec32c..e1fec56c05 100644
--- a/Gems/Blast/Code/Source/Asset/BlastSliceAsset.cpp
+++ b/Gems/Blast/Code/Source/Asset/BlastSliceAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Asset/BlastSliceAsset.h b/Gems/Blast/Code/Source/Asset/BlastSliceAsset.h
index ba27d06469..d3cbb7a135 100644
--- a/Gems/Blast/Code/Source/Asset/BlastSliceAsset.h
+++ b/Gems/Blast/Code/Source/Asset/BlastSliceAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/BlastModule.cpp b/Gems/Blast/Code/Source/BlastModule.cpp
index c21f884d7f..354f1a169f 100644
--- a/Gems/Blast/Code/Source/BlastModule.cpp
+++ b/Gems/Blast/Code/Source/BlastModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/BlastModuleUnsupported.cpp b/Gems/Blast/Code/Source/BlastModuleUnsupported.cpp
index 7a4d149c69..f99e9dfb18 100644
--- a/Gems/Blast/Code/Source/BlastModuleUnsupported.cpp
+++ b/Gems/Blast/Code/Source/BlastModuleUnsupported.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Common/BlastInterfaces.h b/Gems/Blast/Code/Source/Common/BlastInterfaces.h
index 449a0f3020..0f70a6fec8 100644
--- a/Gems/Blast/Code/Source/Common/BlastInterfaces.h
+++ b/Gems/Blast/Code/Source/Common/BlastInterfaces.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Common/BlastMaterial.cpp b/Gems/Blast/Code/Source/Common/BlastMaterial.cpp
index a3b5f615f0..c369c99b1f 100644
--- a/Gems/Blast/Code/Source/Common/BlastMaterial.cpp
+++ b/Gems/Blast/Code/Source/Common/BlastMaterial.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Common/Utils.h b/Gems/Blast/Code/Source/Common/Utils.h
index 0d4adc8d34..2d034e9498 100644
--- a/Gems/Blast/Code/Source/Common/Utils.h
+++ b/Gems/Blast/Code/Source/Common/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Components/BlastFamilyComponent.cpp b/Gems/Blast/Code/Source/Components/BlastFamilyComponent.cpp
index c071f2998e..ab3af2b655 100644
--- a/Gems/Blast/Code/Source/Components/BlastFamilyComponent.cpp
+++ b/Gems/Blast/Code/Source/Components/BlastFamilyComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Components/BlastFamilyComponent.h b/Gems/Blast/Code/Source/Components/BlastFamilyComponent.h
index 31a1a39c09..67d8f78992 100644
--- a/Gems/Blast/Code/Source/Components/BlastFamilyComponent.h
+++ b/Gems/Blast/Code/Source/Components/BlastFamilyComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Components/BlastFamilyComponentNotificationBusHandler.cpp b/Gems/Blast/Code/Source/Components/BlastFamilyComponentNotificationBusHandler.cpp
index 0173cd08d7..9b1ea9ffaf 100644
--- a/Gems/Blast/Code/Source/Components/BlastFamilyComponentNotificationBusHandler.cpp
+++ b/Gems/Blast/Code/Source/Components/BlastFamilyComponentNotificationBusHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Components/BlastFamilyComponentNotificationBusHandler.h b/Gems/Blast/Code/Source/Components/BlastFamilyComponentNotificationBusHandler.h
index 0b7487f97c..66aa744ac7 100644
--- a/Gems/Blast/Code/Source/Components/BlastFamilyComponentNotificationBusHandler.h
+++ b/Gems/Blast/Code/Source/Components/BlastFamilyComponentNotificationBusHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Components/BlastMeshDataComponent.cpp b/Gems/Blast/Code/Source/Components/BlastMeshDataComponent.cpp
index 41265ad0aa..fd7e16c689 100644
--- a/Gems/Blast/Code/Source/Components/BlastMeshDataComponent.cpp
+++ b/Gems/Blast/Code/Source/Components/BlastMeshDataComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Components/BlastMeshDataComponent.h b/Gems/Blast/Code/Source/Components/BlastMeshDataComponent.h
index 0ebbe18d87..f98f86cade 100644
--- a/Gems/Blast/Code/Source/Components/BlastMeshDataComponent.h
+++ b/Gems/Blast/Code/Source/Components/BlastMeshDataComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp b/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp
index b2c74a5738..5001274a33 100644
--- a/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp
+++ b/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Components/BlastSystemComponent.h b/Gems/Blast/Code/Source/Components/BlastSystemComponent.h
index 68ff4f586c..bb030ade86 100644
--- a/Gems/Blast/Code/Source/Components/BlastSystemComponent.h
+++ b/Gems/Blast/Code/Source/Components/BlastSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp b/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp
index db88dc4a23..ffef4e5088 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.h b/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.h
index 27245c4575..5a2b4c1d84 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.h
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastFamilyComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp b/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp
index 322d8a0706..99fd82285b 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.h b/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.h
index 02f19e54a7..bc7b837671 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.h
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.cpp b/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.cpp
index 0d87892f0e..9985bfd0f9 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.h b/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.h
index 1cd24a675d..b6976ac276 100644
--- a/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.h
+++ b/Gems/Blast/Code/Source/Editor/EditorBlastSliceAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Editor/EditorSystemComponent.cpp b/Gems/Blast/Code/Source/Editor/EditorSystemComponent.cpp
index ab030a990c..ea41bcd81f 100644
--- a/Gems/Blast/Code/Source/Editor/EditorSystemComponent.cpp
+++ b/Gems/Blast/Code/Source/Editor/EditorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h b/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h
index ab597701f1..fe3e1f8fd5 100644
--- a/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h
+++ b/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/ActorRenderManager.cpp b/Gems/Blast/Code/Source/Family/ActorRenderManager.cpp
index ca1ace7b65..0a4857fa25 100644
--- a/Gems/Blast/Code/Source/Family/ActorRenderManager.cpp
+++ b/Gems/Blast/Code/Source/Family/ActorRenderManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/ActorRenderManager.h b/Gems/Blast/Code/Source/Family/ActorRenderManager.h
index 22cfe6e68d..c4037bb638 100644
--- a/Gems/Blast/Code/Source/Family/ActorRenderManager.h
+++ b/Gems/Blast/Code/Source/Family/ActorRenderManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/ActorTracker.cpp b/Gems/Blast/Code/Source/Family/ActorTracker.cpp
index 9b383a3fd6..479e526f60 100644
--- a/Gems/Blast/Code/Source/Family/ActorTracker.cpp
+++ b/Gems/Blast/Code/Source/Family/ActorTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/ActorTracker.h b/Gems/Blast/Code/Source/Family/ActorTracker.h
index a81ba58981..91914eeec1 100644
--- a/Gems/Blast/Code/Source/Family/ActorTracker.h
+++ b/Gems/Blast/Code/Source/Family/ActorTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/BlastFamily.h b/Gems/Blast/Code/Source/Family/BlastFamily.h
index 51016de56e..1c97d0d90a 100644
--- a/Gems/Blast/Code/Source/Family/BlastFamily.h
+++ b/Gems/Blast/Code/Source/Family/BlastFamily.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/BlastFamilyImpl.cpp b/Gems/Blast/Code/Source/Family/BlastFamilyImpl.cpp
index cfb9b6ba60..7eecd85c6d 100644
--- a/Gems/Blast/Code/Source/Family/BlastFamilyImpl.cpp
+++ b/Gems/Blast/Code/Source/Family/BlastFamilyImpl.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/BlastFamilyImpl.h b/Gems/Blast/Code/Source/Family/BlastFamilyImpl.h
index 019a8c95b0..4c93ee6517 100644
--- a/Gems/Blast/Code/Source/Family/BlastFamilyImpl.h
+++ b/Gems/Blast/Code/Source/Family/BlastFamilyImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/DamageManager.cpp b/Gems/Blast/Code/Source/Family/DamageManager.cpp
index fe34c63495..ce9ec7af1c 100644
--- a/Gems/Blast/Code/Source/Family/DamageManager.cpp
+++ b/Gems/Blast/Code/Source/Family/DamageManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/Family/DamageManager.h b/Gems/Blast/Code/Source/Family/DamageManager.h
index d3691f933d..8b88344372 100644
--- a/Gems/Blast/Code/Source/Family/DamageManager.h
+++ b/Gems/Blast/Code/Source/Family/DamageManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/StdAfx.cpp b/Gems/Blast/Code/Source/StdAfx.cpp
index c875b3c106..4343b68bae 100644
--- a/Gems/Blast/Code/Source/StdAfx.cpp
+++ b/Gems/Blast/Code/Source/StdAfx.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Source/StdAfx.h b/Gems/Blast/Code/Source/StdAfx.h
index 4badd2450e..5c0746868b 100644
--- a/Gems/Blast/Code/Source/StdAfx.h
+++ b/Gems/Blast/Code/Source/StdAfx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Tests/ActorRenderManagerTest.cpp b/Gems/Blast/Code/Tests/ActorRenderManagerTest.cpp
index 6affb64588..5e59959e42 100644
--- a/Gems/Blast/Code/Tests/ActorRenderManagerTest.cpp
+++ b/Gems/Blast/Code/Tests/ActorRenderManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Tests/BlastActorTest.cpp b/Gems/Blast/Code/Tests/BlastActorTest.cpp
index 11c187e04b..a078a07fe8 100644
--- a/Gems/Blast/Code/Tests/BlastActorTest.cpp
+++ b/Gems/Blast/Code/Tests/BlastActorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Tests/BlastFamilyTest.cpp b/Gems/Blast/Code/Tests/BlastFamilyTest.cpp
index bda4d56974..b81ea2049d 100644
--- a/Gems/Blast/Code/Tests/BlastFamilyTest.cpp
+++ b/Gems/Blast/Code/Tests/BlastFamilyTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Tests/BlastTest.cpp b/Gems/Blast/Code/Tests/BlastTest.cpp
index 676c6316b5..c615bd9d59 100644
--- a/Gems/Blast/Code/Tests/BlastTest.cpp
+++ b/Gems/Blast/Code/Tests/BlastTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Tests/DamageManagerTest.cpp b/Gems/Blast/Code/Tests/DamageManagerTest.cpp
index df7f5a4525..4eca0fd010 100644
--- a/Gems/Blast/Code/Tests/DamageManagerTest.cpp
+++ b/Gems/Blast/Code/Tests/DamageManagerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Tests/Editor/EditorBlastSliceAssetHandlerTest.cpp b/Gems/Blast/Code/Tests/Editor/EditorBlastSliceAssetHandlerTest.cpp
index 7324f6b06a..9c22f1eeb4 100644
--- a/Gems/Blast/Code/Tests/Editor/EditorBlastSliceAssetHandlerTest.cpp
+++ b/Gems/Blast/Code/Tests/Editor/EditorBlastSliceAssetHandlerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Tests/Editor/EditorTestMain.cpp b/Gems/Blast/Code/Tests/Editor/EditorTestMain.cpp
index 676c6316b5..c615bd9d59 100644
--- a/Gems/Blast/Code/Tests/Editor/EditorTestMain.cpp
+++ b/Gems/Blast/Code/Tests/Editor/EditorTestMain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/Tests/Mocks/BlastMocks.h b/Gems/Blast/Code/Tests/Mocks/BlastMocks.h
index 20d94bac0a..586c431976 100644
--- a/Gems/Blast/Code/Tests/Mocks/BlastMocks.h
+++ b/Gems/Blast/Code/Tests/Mocks/BlastMocks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Blast/Code/blast_editor_files.cmake b/Gems/Blast/Code/blast_editor_files.cmake
index 12a08075da..b3867de4c6 100644
--- a/Gems/Blast/Code/blast_editor_files.cmake
+++ b/Gems/Blast/Code/blast_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/blast_editor_shared_files.cmake b/Gems/Blast/Code/blast_editor_shared_files.cmake
index 007942b3c5..3182f31175 100644
--- a/Gems/Blast/Code/blast_editor_shared_files.cmake
+++ b/Gems/Blast/Code/blast_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/blast_editor_tests_files.cmake b/Gems/Blast/Code/blast_editor_tests_files.cmake
index e1029f0f96..ca8cf5c38f 100644
--- a/Gems/Blast/Code/blast_editor_tests_files.cmake
+++ b/Gems/Blast/Code/blast_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/blast_files.cmake b/Gems/Blast/Code/blast_files.cmake
index 0baa713b5c..c3e2e8c244 100644
--- a/Gems/Blast/Code/blast_files.cmake
+++ b/Gems/Blast/Code/blast_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/blast_shared_files.cmake b/Gems/Blast/Code/blast_shared_files.cmake
index 007942b3c5..3182f31175 100644
--- a/Gems/Blast/Code/blast_shared_files.cmake
+++ b/Gems/Blast/Code/blast_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/blast_stub_files.cmake b/Gems/Blast/Code/blast_stub_files.cmake
index 26073dc079..fa2810a5fb 100644
--- a/Gems/Blast/Code/blast_stub_files.cmake
+++ b/Gems/Blast/Code/blast_stub_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/blast_tests_files.cmake b/Gems/Blast/Code/blast_tests_files.cmake
index 709f4c611f..2719a99b4c 100644
--- a/Gems/Blast/Code/blast_tests_files.cmake
+++ b/Gems/Blast/Code/blast_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Code/blast_unsupported.cmake b/Gems/Blast/Code/blast_unsupported.cmake
index 5f40fa91c8..1980c168d3 100644
--- a/Gems/Blast/Code/blast_unsupported.cmake
+++ b/Gems/Blast/Code/blast_unsupported.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Blast/Editor/Scripts/asset_builder_blast.py b/Gems/Blast/Editor/Scripts/asset_builder_blast.py
index 781d73d3bc..795a6ec13f 100755
--- a/Gems/Blast/Editor/Scripts/asset_builder_blast.py
+++ b/Gems/Blast/Editor/Scripts/asset_builder_blast.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Blast/Editor/Scripts/bootstrap.py b/Gems/Blast/Editor/Scripts/bootstrap.py
index bdcaa8891b..de7b05485e 100755
--- a/Gems/Blast/Editor/Scripts/bootstrap.py
+++ b/Gems/Blast/Editor/Scripts/bootstrap.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/Camera/CMakeLists.txt b/Gems/Camera/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Camera/CMakeLists.txt
+++ b/Gems/Camera/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Camera/Code/CMakeLists.txt b/Gems/Camera/Code/CMakeLists.txt
index 96d73530e7..2b9c31f698 100644
--- a/Gems/Camera/Code/CMakeLists.txt
+++ b/Gems/Camera/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Camera/Code/Source/CameraComponent.cpp b/Gems/Camera/Code/Source/CameraComponent.cpp
index 6246d74e5e..81f7802004 100644
--- a/Gems/Camera/Code/Source/CameraComponent.cpp
+++ b/Gems/Camera/Code/Source/CameraComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/CameraComponent.h b/Gems/Camera/Code/Source/CameraComponent.h
index 8060cceaf2..91fe892a70 100644
--- a/Gems/Camera/Code/Source/CameraComponent.h
+++ b/Gems/Camera/Code/Source/CameraComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/CameraComponentController.cpp b/Gems/Camera/Code/Source/CameraComponentController.cpp
index 63ebbd667a..29df270e95 100644
--- a/Gems/Camera/Code/Source/CameraComponentController.cpp
+++ b/Gems/Camera/Code/Source/CameraComponentController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -101,9 +101,9 @@ namespace Camera
             OnTransformChanged(localTransform, worldTransform);
 
             // Push the Atom camera after we make sure we're up-to-date with our component's transform to ensure the viewport reads the correct state
+            UpdateCamera();
             atomViewportRequests->PushView(contextName, m_atomCamera);
             AZ::RPI::ViewportContextNotificationBus::Handler::BusConnect(contextName);
-            UpdateCamera();
         }
     }
 
diff --git a/Gems/Camera/Code/Source/CameraComponentController.h b/Gems/Camera/Code/Source/CameraComponentController.h
index 2766d1e0ca..0ec615a1c6 100644
--- a/Gems/Camera/Code/Source/CameraComponentController.h
+++ b/Gems/Camera/Code/Source/CameraComponentController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/CameraComponentConverter.cpp b/Gems/Camera/Code/Source/CameraComponentConverter.cpp
index 9009237c97..1be286e58a 100644
--- a/Gems/Camera/Code/Source/CameraComponentConverter.cpp
+++ b/Gems/Camera/Code/Source/CameraComponentConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp b/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp
index 3e3c044c74..27a732adc6 100644
--- a/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp
+++ b/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/CameraEditorSystemComponent.h b/Gems/Camera/Code/Source/CameraEditorSystemComponent.h
index 4437270673..dc1cd19258 100644
--- a/Gems/Camera/Code/Source/CameraEditorSystemComponent.h
+++ b/Gems/Camera/Code/Source/CameraEditorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/CameraGem.cpp b/Gems/Camera/Code/Source/CameraGem.cpp
index a7692a86d4..44650988c7 100644
--- a/Gems/Camera/Code/Source/CameraGem.cpp
+++ b/Gems/Camera/Code/Source/CameraGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/CameraViewRegistrationBus.h b/Gems/Camera/Code/Source/CameraViewRegistrationBus.h
index 5fba4cd1dd..d55602e74d 100644
--- a/Gems/Camera/Code/Source/CameraViewRegistrationBus.h
+++ b/Gems/Camera/Code/Source/CameraViewRegistrationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/Camera_precompiled.h b/Gems/Camera/Code/Source/Camera_precompiled.h
index 3f7c2e94bc..707737d1bd 100644
--- a/Gems/Camera/Code/Source/Camera_precompiled.h
+++ b/Gems/Camera/Code/Source/Camera_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/EditorCameraComponent.cpp b/Gems/Camera/Code/Source/EditorCameraComponent.cpp
index fed49fd3ca..255db33153 100644
--- a/Gems/Camera/Code/Source/EditorCameraComponent.cpp
+++ b/Gems/Camera/Code/Source/EditorCameraComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -26,8 +26,10 @@ namespace Camera
 
     void EditorCameraComponent::Activate()
     {
-        auto controllerConfig = m_controller.GetConfiguration();
+        // Ensure our Editor Entity ID is up-to-date to sync camera configurations between Edit & Game mode.
+        CameraComponentConfig controllerConfig = m_controller.GetConfiguration();
         controllerConfig.m_editorEntityId = GetEntityId().operator AZ::u64();
+        m_controller.SetConfiguration(controllerConfig);
 
         // Call base class activate, which in turn calls Activate on our controller.
         EditorCameraComponentBase::Activate();
diff --git a/Gems/Camera/Code/Source/EditorCameraComponent.h b/Gems/Camera/Code/Source/EditorCameraComponent.h
index 0357c86446..aa4d6d13c9 100644
--- a/Gems/Camera/Code/Source/EditorCameraComponent.h
+++ b/Gems/Camera/Code/Source/EditorCameraComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp
index d8346ced23..5dcdd9f111 100644
--- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp
+++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.h b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.h
index 2154787d4f..c2b8146eb8 100644
--- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.h
+++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
index c8fd1eca9b..193bbdea3f 100644
--- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
+++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/Tests/CameraEditorUITests.cpp b/Gems/Camera/Code/Tests/CameraEditorUITests.cpp
index 0f69475f67..191c05c8e9 100644
--- a/Gems/Camera/Code/Tests/CameraEditorUITests.cpp
+++ b/Gems/Camera/Code/Tests/CameraEditorUITests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Camera/Code/camera_editor_files.cmake b/Gems/Camera/Code/camera_editor_files.cmake
index 0877bdcc02..cfe843b006 100644
--- a/Gems/Camera/Code/camera_editor_files.cmake
+++ b/Gems/Camera/Code/camera_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Camera/Code/camera_files.cmake b/Gems/Camera/Code/camera_files.cmake
index 4a0603101a..85179aa686 100644
--- a/Gems/Camera/Code/camera_files.cmake
+++ b/Gems/Camera/Code/camera_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Camera/Code/camera_shared_files.cmake b/Gems/Camera/Code/camera_shared_files.cmake
index ff56e5e7bf..028e27bdd4 100644
--- a/Gems/Camera/Code/camera_shared_files.cmake
+++ b/Gems/Camera/Code/camera_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CameraFramework/CMakeLists.txt b/Gems/CameraFramework/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/CameraFramework/CMakeLists.txt
+++ b/Gems/CameraFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CameraFramework/Code/CMakeLists.txt b/Gems/CameraFramework/Code/CMakeLists.txt
index a348598951..2d13950c18 100644
--- a/Gems/CameraFramework/Code/CMakeLists.txt
+++ b/Gems/CameraFramework/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CameraFramework/Code/Include/CameraFramework/ICameraLookAtBehavior.h b/Gems/CameraFramework/Code/Include/CameraFramework/ICameraLookAtBehavior.h
index f4547cc4dc..ce723963b0 100644
--- a/Gems/CameraFramework/Code/Include/CameraFramework/ICameraLookAtBehavior.h
+++ b/Gems/CameraFramework/Code/Include/CameraFramework/ICameraLookAtBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CameraFramework/Code/Include/CameraFramework/ICameraSubComponent.h b/Gems/CameraFramework/Code/Include/CameraFramework/ICameraSubComponent.h
index ca7a699ac2..ccc4f2b8a2 100644
--- a/Gems/CameraFramework/Code/Include/CameraFramework/ICameraSubComponent.h
+++ b/Gems/CameraFramework/Code/Include/CameraFramework/ICameraSubComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CameraFramework/Code/Include/CameraFramework/ICameraTargetAcquirer.h b/Gems/CameraFramework/Code/Include/CameraFramework/ICameraTargetAcquirer.h
index 875dc71c8e..aece68523d 100644
--- a/Gems/CameraFramework/Code/Include/CameraFramework/ICameraTargetAcquirer.h
+++ b/Gems/CameraFramework/Code/Include/CameraFramework/ICameraTargetAcquirer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CameraFramework/Code/Include/CameraFramework/ICameraTransformBehavior.h b/Gems/CameraFramework/Code/Include/CameraFramework/ICameraTransformBehavior.h
index a559ef2088..b1ebc7a087 100644
--- a/Gems/CameraFramework/Code/Include/CameraFramework/ICameraTransformBehavior.h
+++ b/Gems/CameraFramework/Code/Include/CameraFramework/ICameraTransformBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp b/Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp
index 05cba7a892..fe837db76f 100644
--- a/Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp
+++ b/Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.h b/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.h
index abb8d454a7..10305b3c2f 100644
--- a/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.h
+++ b/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CameraFramework/Code/Source/CameraRigComponent.cpp b/Gems/CameraFramework/Code/Source/CameraRigComponent.cpp
index 2d65692763..b52f1b9340 100644
--- a/Gems/CameraFramework/Code/Source/CameraRigComponent.cpp
+++ b/Gems/CameraFramework/Code/Source/CameraRigComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CameraFramework/Code/Source/CameraRigComponent.h b/Gems/CameraFramework/Code/Source/CameraRigComponent.h
index 0adea49d80..a0b2d6a94c 100644
--- a/Gems/CameraFramework/Code/Source/CameraRigComponent.h
+++ b/Gems/CameraFramework/Code/Source/CameraRigComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CameraFramework/Code/cameraframework_files.cmake b/Gems/CameraFramework/Code/cameraframework_files.cmake
index 844e971e07..071adff0e1 100644
--- a/Gems/CameraFramework/Code/cameraframework_files.cmake
+++ b/Gems/CameraFramework/Code/cameraframework_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CameraFramework/Code/cameraframework_shared_files.cmake b/Gems/CameraFramework/Code/cameraframework_shared_files.cmake
index 5eefd39914..d99851c3b2 100644
--- a/Gems/CameraFramework/Code/cameraframework_shared_files.cmake
+++ b/Gems/CameraFramework/Code/cameraframework_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CertificateManager/CMakeLists.txt b/Gems/CertificateManager/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/CertificateManager/CMakeLists.txt
+++ b/Gems/CertificateManager/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CertificateManager/Code/CMakeLists.txt b/Gems/CertificateManager/Code/CMakeLists.txt
index 9c0d786cdc..922ef64a0b 100644
--- a/Gems/CertificateManager/Code/CMakeLists.txt
+++ b/Gems/CertificateManager/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CertificateManager/Code/CertificateManager_files.cmake b/Gems/CertificateManager/Code/CertificateManager_files.cmake
index 91064f4c4f..4128f6e44f 100644
--- a/Gems/CertificateManager/Code/CertificateManager_files.cmake
+++ b/Gems/CertificateManager/Code/CertificateManager_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CertificateManager/Code/Include/CertificateManager/DataSource/FileDataSourceBus.h b/Gems/CertificateManager/Code/Include/CertificateManager/DataSource/FileDataSourceBus.h
index 7fc8105dc5..7ab831f426 100644
--- a/Gems/CertificateManager/Code/Include/CertificateManager/DataSource/FileDataSourceBus.h
+++ b/Gems/CertificateManager/Code/Include/CertificateManager/DataSource/FileDataSourceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CertificateManager/Code/Include/CertificateManager/DataSource/IDataSource.h b/Gems/CertificateManager/Code/Include/CertificateManager/DataSource/IDataSource.h
index 8ad44851ec..e09c9d18d3 100644
--- a/Gems/CertificateManager/Code/Include/CertificateManager/DataSource/IDataSource.h
+++ b/Gems/CertificateManager/Code/Include/CertificateManager/DataSource/IDataSource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CertificateManager/Code/Include/CertificateManager/ICertificateManagerGem.h b/Gems/CertificateManager/Code/Include/CertificateManager/ICertificateManagerGem.h
index 260bf24648..c3138b039e 100644
--- a/Gems/CertificateManager/Code/Include/CertificateManager/ICertificateManagerGem.h
+++ b/Gems/CertificateManager/Code/Include/CertificateManager/ICertificateManagerGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CertificateManager/Code/Source/CertificateManagerGem.cpp b/Gems/CertificateManager/Code/Source/CertificateManagerGem.cpp
index ca3b610b1e..e8ddadccc6 100644
--- a/Gems/CertificateManager/Code/Source/CertificateManagerGem.cpp
+++ b/Gems/CertificateManager/Code/Source/CertificateManagerGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CertificateManager/Code/Source/CertificateManagerGem.h b/Gems/CertificateManager/Code/Source/CertificateManagerGem.h
index 83c4dd0152..b501e18351 100644
--- a/Gems/CertificateManager/Code/Source/CertificateManagerGem.h
+++ b/Gems/CertificateManager/Code/Source/CertificateManagerGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CertificateManager/Code/Source/DataSource/FileDataSource.cpp b/Gems/CertificateManager/Code/Source/DataSource/FileDataSource.cpp
index 076254f947..9fe48d0a3d 100644
--- a/Gems/CertificateManager/Code/Source/DataSource/FileDataSource.cpp
+++ b/Gems/CertificateManager/Code/Source/DataSource/FileDataSource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CertificateManager/Code/Source/DataSource/FileDataSource.h b/Gems/CertificateManager/Code/Source/DataSource/FileDataSource.h
index ced6914016..ce218a4e9e 100644
--- a/Gems/CertificateManager/Code/Source/DataSource/FileDataSource.h
+++ b/Gems/CertificateManager/Code/Source/DataSource/FileDataSource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CertificateManager/Code/certificatemanager_shared_files.cmake b/Gems/CertificateManager/Code/certificatemanager_shared_files.cmake
index f20f0f6402..a73cba2bbd 100644
--- a/Gems/CertificateManager/Code/certificatemanager_shared_files.cmake
+++ b/Gems/CertificateManager/Code/certificatemanager_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/CMakeLists.txt b/Gems/CrashReporting/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/CrashReporting/CMakeLists.txt
+++ b/Gems/CrashReporting/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/CMakeLists.txt b/Gems/CrashReporting/Code/CMakeLists.txt
index 9cf4b1d02e..40dcf86a6f 100644
--- a/Gems/CrashReporting/Code/CMakeLists.txt
+++ b/Gems/CrashReporting/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/Include/CrashReporting/GameCrashHandler.h b/Gems/CrashReporting/Code/Include/CrashReporting/GameCrashHandler.h
index b3f6be6c0b..daa65dbcbf 100644
--- a/Gems/CrashReporting/Code/Include/CrashReporting/GameCrashHandler.h
+++ b/Gems/CrashReporting/Code/Include/CrashReporting/GameCrashHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/Include/CrashReporting/GameCrashUploader.h b/Gems/CrashReporting/Code/Include/CrashReporting/GameCrashUploader.h
index 43b37e796c..a4aa48c241 100644
--- a/Gems/CrashReporting/Code/Include/CrashReporting/GameCrashUploader.h
+++ b/Gems/CrashReporting/Code/Include/CrashReporting/GameCrashUploader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/Platform/Android/PAL_android.cmake b/Gems/CrashReporting/Code/Platform/Android/PAL_android.cmake
index 570a4d1592..0c07a18151 100644
--- a/Gems/CrashReporting/Code/Platform/Android/PAL_android.cmake
+++ b/Gems/CrashReporting/Code/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/Platform/Common/UnixLike/GameCrashUploader_UnixLike.cpp b/Gems/CrashReporting/Code/Platform/Common/UnixLike/GameCrashUploader_UnixLike.cpp
index 057f209ffd..ae6b8b2cf6 100644
--- a/Gems/CrashReporting/Code/Platform/Common/UnixLike/GameCrashUploader_UnixLike.cpp
+++ b/Gems/CrashReporting/Code/Platform/Common/UnixLike/GameCrashUploader_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/Platform/Common/UnixLike/main_UnixLike.cpp b/Gems/CrashReporting/Code/Platform/Common/UnixLike/main_UnixLike.cpp
index 9640efa064..90a14fba09 100644
--- a/Gems/CrashReporting/Code/Platform/Common/UnixLike/main_UnixLike.cpp
+++ b/Gems/CrashReporting/Code/Platform/Common/UnixLike/main_UnixLike.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/Platform/Linux/PAL_linux.cmake b/Gems/CrashReporting/Code/Platform/Linux/PAL_linux.cmake
index 570a4d1592..0c07a18151 100644
--- a/Gems/CrashReporting/Code/Platform/Linux/PAL_linux.cmake
+++ b/Gems/CrashReporting/Code/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/Platform/Mac/PAL_mac.cmake b/Gems/CrashReporting/Code/Platform/Mac/PAL_mac.cmake
index 570a4d1592..0c07a18151 100644
--- a/Gems/CrashReporting/Code/Platform/Mac/PAL_mac.cmake
+++ b/Gems/CrashReporting/Code/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/Platform/Windows/GameCrashHandler_windows.cpp b/Gems/CrashReporting/Code/Platform/Windows/GameCrashHandler_windows.cpp
index 8d90e65cc3..1401b8d4c0 100644
--- a/Gems/CrashReporting/Code/Platform/Windows/GameCrashHandler_windows.cpp
+++ b/Gems/CrashReporting/Code/Platform/Windows/GameCrashHandler_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/Platform/Windows/GameCrashUploader_windows.cpp b/Gems/CrashReporting/Code/Platform/Windows/GameCrashUploader_windows.cpp
index 6a1250b3aa..8e7107f241 100644
--- a/Gems/CrashReporting/Code/Platform/Windows/GameCrashUploader_windows.cpp
+++ b/Gems/CrashReporting/Code/Platform/Windows/GameCrashUploader_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/Platform/Windows/PAL_windows.cmake b/Gems/CrashReporting/Code/Platform/Windows/PAL_windows.cmake
index 2ec4e2d13c..8360363c3d 100644
--- a/Gems/CrashReporting/Code/Platform/Windows/PAL_windows.cmake
+++ b/Gems/CrashReporting/Code/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/Platform/Windows/crashreporting_static_windows_files.cmake b/Gems/CrashReporting/Code/Platform/Windows/crashreporting_static_windows_files.cmake
index ba897960a8..fb626007b2 100644
--- a/Gems/CrashReporting/Code/Platform/Windows/crashreporting_static_windows_files.cmake
+++ b/Gems/CrashReporting/Code/Platform/Windows/crashreporting_static_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/Platform/Windows/game_crash_uploader_windows_files.cmake b/Gems/CrashReporting/Code/Platform/Windows/game_crash_uploader_windows_files.cmake
index 615d9eb1f0..e3863889cb 100644
--- a/Gems/CrashReporting/Code/Platform/Windows/game_crash_uploader_windows_files.cmake
+++ b/Gems/CrashReporting/Code/Platform/Windows/game_crash_uploader_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/Platform/Windows/main_windows.cpp b/Gems/CrashReporting/Code/Platform/Windows/main_windows.cpp
index 276fd4a244..2dfac96f35 100644
--- a/Gems/CrashReporting/Code/Platform/Windows/main_windows.cpp
+++ b/Gems/CrashReporting/Code/Platform/Windows/main_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/Platform/iOS/PAL_ios.cmake b/Gems/CrashReporting/Code/Platform/iOS/PAL_ios.cmake
index 570a4d1592..0c07a18151 100644
--- a/Gems/CrashReporting/Code/Platform/iOS/PAL_ios.cmake
+++ b/Gems/CrashReporting/Code/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/Source/GameCrashHandler.cpp b/Gems/CrashReporting/Code/Source/GameCrashHandler.cpp
index d48f73f663..292d3cdc39 100644
--- a/Gems/CrashReporting/Code/Source/GameCrashHandler.cpp
+++ b/Gems/CrashReporting/Code/Source/GameCrashHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/Source/GameCrashUploader.cpp b/Gems/CrashReporting/Code/Source/GameCrashUploader.cpp
index 80b6c44778..aba84549fc 100644
--- a/Gems/CrashReporting/Code/Source/GameCrashUploader.cpp
+++ b/Gems/CrashReporting/Code/Source/GameCrashUploader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CrashReporting/Code/crashreporting_static_files.cmake b/Gems/CrashReporting/Code/crashreporting_static_files.cmake
index 7de4244353..f587e5adfc 100644
--- a/Gems/CrashReporting/Code/crashreporting_static_files.cmake
+++ b/Gems/CrashReporting/Code/crashreporting_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CrashReporting/Code/game_crash_uploader_files.cmake b/Gems/CrashReporting/Code/game_crash_uploader_files.cmake
index e372077fc9..df95eed58f 100644
--- a/Gems/CrashReporting/Code/game_crash_uploader_files.cmake
+++ b/Gems/CrashReporting/Code/game_crash_uploader_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CustomAssetExample/CMakeLists.txt b/Gems/CustomAssetExample/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/CustomAssetExample/CMakeLists.txt
+++ b/Gems/CustomAssetExample/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CustomAssetExample/Code/CMakeLists.txt b/Gems/CustomAssetExample/Code/CMakeLists.txt
index 2447ff7d6d..52bb8d4c99 100644
--- a/Gems/CustomAssetExample/Code/CMakeLists.txt
+++ b/Gems/CustomAssetExample/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderComponent.cpp b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderComponent.cpp
index 8be5d9fca9..c69132ef9f 100644
--- a/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderComponent.cpp
+++ b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderComponent.h b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderComponent.h
index e700e8a4a1..5ca353bb6f 100644
--- a/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderComponent.h
+++ b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderWorker.cpp b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderWorker.cpp
index e2ebfc0fc1..404bde5003 100644
--- a/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderWorker.cpp
+++ b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderWorker.h b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderWorker.h
index f56ca8722b..7175ab7b3f 100644
--- a/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderWorker.h
+++ b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/Builder/CustomAssetExampleBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CustomAssetExample/Code/Source/CustomAssetExample/CustomAssetExampleEditorModule.cpp b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/CustomAssetExampleEditorModule.cpp
index 6d827c0e78..9c8e6b4be4 100644
--- a/Gems/CustomAssetExample/Code/Source/CustomAssetExample/CustomAssetExampleEditorModule.cpp
+++ b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/CustomAssetExampleEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CustomAssetExample/Code/Source/CustomAssetExample/CustomAssetExampleModule.cpp b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/CustomAssetExampleModule.cpp
index 9d6ad2307b..1b5e802201 100644
--- a/Gems/CustomAssetExample/Code/Source/CustomAssetExample/CustomAssetExampleModule.cpp
+++ b/Gems/CustomAssetExample/Code/Source/CustomAssetExample/CustomAssetExampleModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/CustomAssetExample/Code/customassetexample_editor_files.cmake b/Gems/CustomAssetExample/Code/customassetexample_editor_files.cmake
index 66eeb931ce..5d033123c3 100644
--- a/Gems/CustomAssetExample/Code/customassetexample_editor_files.cmake
+++ b/Gems/CustomAssetExample/Code/customassetexample_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/CustomAssetExample/Code/customassetexample_shared_files.cmake b/Gems/CustomAssetExample/Code/customassetexample_shared_files.cmake
index 5565e2205f..b9043faab6 100644
--- a/Gems/CustomAssetExample/Code/customassetexample_shared_files.cmake
+++ b/Gems/CustomAssetExample/Code/customassetexample_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/DebugDraw/CMakeLists.txt b/Gems/DebugDraw/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/DebugDraw/CMakeLists.txt
+++ b/Gems/DebugDraw/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/DebugDraw/Code/CMakeLists.txt b/Gems/DebugDraw/Code/CMakeLists.txt
index 52462c27fc..897614ad92 100644
--- a/Gems/DebugDraw/Code/CMakeLists.txt
+++ b/Gems/DebugDraw/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/DebugDraw/Code/Include/DebugDraw/DebugDrawBus.h b/Gems/DebugDraw/Code/Include/DebugDraw/DebugDrawBus.h
index 00cb37d2f0..f2c144c194 100644
--- a/Gems/DebugDraw/Code/Include/DebugDraw/DebugDrawBus.h
+++ b/Gems/DebugDraw/Code/Include/DebugDraw/DebugDrawBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp
index ca987c3d7c..ce64e7ed91 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.h b/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.h
index 6976acb8dc..92a57444af 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.h
+++ b/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawModule.cpp b/Gems/DebugDraw/Code/Source/DebugDrawModule.cpp
index aa4a0624b6..13628a1ac4 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawModule.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp
index 6d0cc0a0a7..405a96dac4 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.h b/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.h
index 820cb34480..848e72a3f9 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.h
+++ b/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp
index 2da77e451d..1e4b8d3975 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.h b/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.h
index 076a50955c..302d156fd6 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.h
+++ b/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp
index 83e9d85022..fe8fc8e44a 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.h b/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.h
index 32f897919c..bb3a1728c0 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.h
+++ b/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
index 28b7d926c9..7b7e229919 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.h b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.h
index fc6dda7e62..2c261b1b2c 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.h
+++ b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp
index 2c86cc5bde..5cffc2e501 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.h b/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.h
index 2d19611a9d..b8126239ec 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.h
+++ b/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h b/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h
+++ b/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.cpp
index 7ebda773e8..deb95c4251 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.h b/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.h
index a166e7d862..a7f481b94a 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.h
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
index e601a28122..4453358ba8 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.h b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.h
index 8760b850c4..d22b9d1367 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.h
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
index 5a7825c39d..6462b65c6f 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.h b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.h
index ec361a0776..a8b053bd2a 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.h
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
index 7e148df2c1..af3b125bb1 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.h b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.h
index cdbddd41fd..0508cbae3a 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.h
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
index fc43d0fdf5..6ddaac84ac 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.h b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.h
index a757d7b993..a2b26afe7e 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.h
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
index cf5720f2cf..20ce2ff09f 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.h b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.h
index a6352204cf..aeda0e8ac8 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.h
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/DebugDraw/Code/debugdraw_editor_files.cmake b/Gems/DebugDraw/Code/debugdraw_editor_files.cmake
index c171c1f2f9..b1e8cc372d 100644
--- a/Gems/DebugDraw/Code/debugdraw_editor_files.cmake
+++ b/Gems/DebugDraw/Code/debugdraw_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/DebugDraw/Code/debugdraw_files.cmake b/Gems/DebugDraw/Code/debugdraw_files.cmake
index 2064b6e396..d45871ed3f 100644
--- a/Gems/DebugDraw/Code/debugdraw_files.cmake
+++ b/Gems/DebugDraw/Code/debugdraw_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/DebugDraw/Code/debugdraw_shared_files.cmake b/Gems/DebugDraw/Code/debugdraw_shared_files.cmake
index 3fda7e9225..71f31c13ef 100644
--- a/Gems/DebugDraw/Code/debugdraw_shared_files.cmake
+++ b/Gems/DebugDraw/Code/debugdraw_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/DevTextures/CMakeLists.txt b/Gems/DevTextures/CMakeLists.txt
index 55d5bd6aa4..36fa5f970e 100644
--- a/Gems/DevTextures/CMakeLists.txt
+++ b/Gems/DevTextures/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/CMakeLists.txt b/Gems/EMotionFX/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/EMotionFX/CMakeLists.txt
+++ b/Gems/EMotionFX/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/CMakeLists.txt b/Gems/EMotionFX/Code/CMakeLists.txt
index 88312e17fd..f1c676ef17 100644
--- a/Gems/EMotionFX/Code/CMakeLists.txt
+++ b/Gems/EMotionFX/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.cpp
index 77e2909cd5..13ae46113d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.h
index ccfeeb4d41..fc95691dd1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.cpp
index fa9682cea8..9ee04dbe38 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.h
index baeed5ee3c..d0b5829c5c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp
index 7cfc20a64b..f55625c4cc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.h
index cf41be4952..ffb10f1228 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConditionCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConditionCommands.cpp
index 7be13237d0..93fb39c443 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConditionCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConditionCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConditionCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConditionCommands.h
index c45aa2c9c3..da22ab20fe 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConditionCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConditionCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConnectionCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConnectionCommands.cpp
index 16448cc3a3..acac4db827 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConnectionCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConnectionCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConnectionCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConnectionCommands.h
index 0109f198cf..724a7fffdc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConnectionCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphConnectionCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCopyPasteData.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCopyPasteData.cpp
index 215854c37b..b4a2d82184 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCopyPasteData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCopyPasteData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCopyPasteData.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCopyPasteData.h
index 35171c33f7..f87a220d70 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCopyPasteData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCopyPasteData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphGroupParameterCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphGroupParameterCommands.cpp
index c7e2fef34e..216be3f583 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphGroupParameterCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphGroupParameterCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphGroupParameterCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphGroupParameterCommands.h
index 0365e05f9c..fcbb512eb1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphGroupParameterCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphGroupParameterCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeCommands.cpp
index 4e458ef02b..0302d97fd4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeCommands.h
index 18b13d58fd..bb0de06f39 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeGroupCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeGroupCommands.cpp
index e26a7f06f6..b64c22fd36 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeGroupCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeGroupCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeGroupCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeGroupCommands.h
index 044dcc51b3..7924dcac62 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeGroupCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphNodeGroupCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphParameterCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphParameterCommands.cpp
index 62b083d7e6..2d136c66b1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphParameterCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphParameterCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphParameterCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphParameterCommands.h
index 98157f6a99..3041760b25 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphParameterCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphParameterCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphTriggerActionCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphTriggerActionCommands.cpp
index 4aa475b127..5ab2e3d6ab 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphTriggerActionCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphTriggerActionCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphTriggerActionCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphTriggerActionCommands.h
index 71e86ee4ba..3d66b660a7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphTriggerActionCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphTriggerActionCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.cpp
index 65fce45e06..dfa2e7ba8a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.h
index 6a1de35af9..c92ebc0348 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ColliderCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ColliderCommands.cpp
index ad48d8d254..cde492797c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ColliderCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ColliderCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ColliderCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ColliderCommands.h
index ad40f9af80..a71ec7a09e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ColliderCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ColliderCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandManager.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandManager.cpp
index 44b4c69520..6456045081 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandManager.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandManager.h
index 25c56adbd4..2730eac01b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandSystemConfig.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandSystemConfig.h
index ffe8b6b7c3..e8cb37dfbc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandSystemConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandSystemConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.cpp
index f9d3bd3300..d63a8e305b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.h
index 1c1473d480..dc6021cccd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MetaData.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MetaData.cpp
index 0cc96d8a2e..b7c9b61687 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MetaData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MetaData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MetaData.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MetaData.h
index 7fba241110..d15a8d436c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MetaData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MetaData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MiscCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MiscCommands.cpp
index 1538a6257b..0d871145a1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MiscCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MiscCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MiscCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MiscCommands.h
index 0745ea759e..bd852783ed 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MiscCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MiscCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.cpp
index bdc306b56e..547c768edd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.h
index 2cc9d7c155..338d03696a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.cpp
index baf6890728..0a7f77216f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.h
index 9830b2da88..9207651695 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionEventCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionEventCommands.cpp
index 85b910d3ea..86a0149c51 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionEventCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionEventCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionEventCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionEventCommands.h
index ab9d4452a1..1c7a80ae95 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionEventCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionEventCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.cpp
index 958e689a44..1088acda4c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.h
index d18861400c..8b9dc0f716 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/NodeGroupCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/NodeGroupCommands.cpp
index 7f712596f8..becb2c9cd3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/NodeGroupCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/NodeGroupCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/NodeGroupCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/NodeGroupCommands.h
index 4aa8b580c3..a721978a05 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/NodeGroupCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/NodeGroupCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ParameterMixins.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ParameterMixins.cpp
index 6faebe2450..19416df0b1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ParameterMixins.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ParameterMixins.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ParameterMixins.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ParameterMixins.h
index 7a1b13fdc7..ddd38a3513 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ParameterMixins.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ParameterMixins.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.cpp
index 3dcdd87fe7..f5dacdbdf4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.h
index 11bd327606..37480378a3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.cpp
index a45dcb2302..77ddd8e747 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.h
index cd699cd2c1..64cb7e0b13 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionList.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionList.cpp
index 6df8bb484e..2f1d349a78 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionList.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionList.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionList.h
index 3ea836e785..481b8f6e9b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionList.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SimulatedObjectCommands.cpp b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SimulatedObjectCommands.cpp
index 05f9448a27..6a2d5d7db7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SimulatedObjectCommands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SimulatedObjectCommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SimulatedObjectCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SimulatedObjectCommands.h
index b1596c3931..9cc365b587 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SimulatedObjectCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SimulatedObjectCommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/CommandSystem/commandsystem_files.cmake b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/commandsystem_files.cmake
index 97ba7315f3..61ffd43e78 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/commandsystem_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/commandsystem_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/EndianConversion.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/EndianConversion.cpp
index 8d2bd16f7f..802bfd99f3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/EndianConversion.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/EndianConversion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/Exporter.h b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/Exporter.h
index a4cdbaaf4d..0f88fc575e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/Exporter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/Exporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterActor.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterActor.cpp
index f50c4f20fe..642412ff65 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterActor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterActor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterFileProcessor.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterFileProcessor.cpp
index 96e451c4d7..4be9c78c8a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterFileProcessor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterFileProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterFileProcessor.h b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterFileProcessor.h
index cb348a82d7..035de4e705 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterFileProcessor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/ExporterFileProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/FileHeaderExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/FileHeaderExport.cpp
index 6b230d8ed1..e422547354 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/FileHeaderExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/FileHeaderExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MaterialExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MaterialExport.cpp
index be477945ae..95bba9d321 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MaterialExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MaterialExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MeshExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MeshExport.cpp
index 775493b7aa..8af466c430 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MeshExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MeshExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MorphTargetExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MorphTargetExport.cpp
index b56d8da647..1c0bfdbd03 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MorphTargetExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MorphTargetExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MotionEventExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MotionEventExport.cpp
index 78daf024f5..168cc5d0bf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MotionEventExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/MotionEventExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/NodeExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/NodeExport.cpp
index 0a71605b5b..7c16aa81f2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/NodeExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/NodeExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/SkeletalMotionExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/SkeletalMotionExport.cpp
index 033dfea66f..c55e91c3de 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/SkeletalMotionExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/SkeletalMotionExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/SkinExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/SkinExport.cpp
index e7ec35fd71..aad841d64b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/SkinExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/SkinExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/StringExport.cpp b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/StringExport.cpp
index 6e8c5754f8..b57de0c818 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/StringExport.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/Exporter/StringExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/exporterlib_files.cmake b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/exporterlib_files.cmake
index ceaca933e5..a63de02e81 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/exporterlib_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/Exporters/ExporterLib/exporterlib_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/AzSceneDef.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/AzSceneDef.h
index 7556f6310b..9696400167 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/AzSceneDef.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/AzSceneDef.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.cpp
index 0d86bc3f1f..f0ae260b4c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.h
index dec56e0b78..f949534e76 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/EMotionFXBuilderComponent.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/EMotionFXBuilderComponent.cpp
index e4b3abf21b..27fb59d602 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/EMotionFXBuilderComponent.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/EMotionFXBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/EMotionFXBuilderComponent.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/EMotionFXBuilderComponent.h
index c418f7dc87..694dbee258 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/EMotionFXBuilderComponent.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/EMotionFXBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/MotionSetBuilderWorker.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/MotionSetBuilderWorker.cpp
index b87da613ad..48286b9567 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/MotionSetBuilderWorker.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/MotionSetBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/MotionSetBuilderWorker.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/MotionSetBuilderWorker.h
index 0260ce1210..5087c5138c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/MotionSetBuilderWorker.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/MotionSetBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/emotionfxbuilder_files.cmake b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/emotionfxbuilder_files.cmake
index d9ec627d17..b6ab6cf30c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/emotionfxbuilder_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/emotionfxbuilder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.cpp
index f204c58e0f..92b85f8fa0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.h
index c7241d0f9a..54ffbed99a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorExporter.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorExporter.cpp
index 075f269751..afea82ced4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorExporter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorExporter.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorExporter.h
index 1ff77209d9..7619fd72ba 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorExporter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.cpp
index c24f887e6c..7f5558c1da 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -160,7 +160,7 @@ namespace EMotionFX
                 }
             }
 
-            // Default to the first mesh group until we get a way to choose it via the FBX settings (ATOM-13590).
+            // Default to the first mesh group until we get a way to choose it via the scene settings (ATOM-13590).
             AZStd::optional<AZ::Data::AssetId> meshAssetId = AZStd::nullopt;
             AZ_Error("EMotionFX", atomModelAssets.size() <= 1, "Ambigious mesh for actor asset. More than one mesh group found. Defaulting to the first one.");
             if (!atomModelAssets.empty())
diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.h
index 79d676fc04..652a519583 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/MorphTargetExporter.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/MorphTargetExporter.cpp
index 3ecdaf2db1..9adf4d568e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/MorphTargetExporter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/MorphTargetExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/MorphTargetExporter.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/MorphTargetExporter.h
index 7058622c09..dd8dabc843 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/MorphTargetExporter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/MorphTargetExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.cpp
index 5cb2995cc7..5c9acdc15a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.h
index 87922b49a8..15492ef025 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/ExportContexts.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.cpp
index 9568f3e143..d0963a33ee 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.h
index 16fe3bc5e2..5cf865324b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionDataBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionExporter.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionExporter.cpp
index 05fac9cda1..a4d30fac15 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionExporter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionExporter.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionExporter.h
index 98efdca00f..9115a07d7c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionExporter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionGroupExporter.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionGroupExporter.cpp
index c4ed3307ae..bb8aa07c1b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionGroupExporter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionGroupExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionGroupExporter.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionGroupExporter.h
index 379177e26d..1fc675a4c2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionGroupExporter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Motion/MotionGroupExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/rc_ext_files.cmake b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/rc_ext_files.cmake
index cf6eaed3ec..cb901d6d4b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/rc_ext_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/rc_ext_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp
index 6be086a31b..c3202398b4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -168,7 +168,7 @@ namespace EMotionFX
 
             AZ::SceneAPI::Events::ProcessingResult ActorGroupBehavior::BuildDefault(AZ::SceneAPI::Containers::Scene& scene) const
             {
-                // Skip adding the actor group if it's already exist.
+                // Skip adding the actor group if it already exists.
                 if (SceneHasActorGroup(scene))
                 {
                     return AZ::SceneAPI::Events::ProcessingResult::Ignored;
@@ -185,7 +185,7 @@ namespace EMotionFX
                 }
                 
                 const bool hasAnimationData = AZ::SceneAPI::Utilities::DoesSceneGraphContainDataLike<AZ::SceneAPI::DataTypes::IAnimationData>(scene, true);
-                // Skip adding the actor group if it's contain animation data but don't contain any skindata or blendshapedata.
+                // Skip adding the actor group if it contains animation data but doesn't contain any skin or blendshape data.
                 if (hasAnimationData && !hasSkinData && !hasBlendShapeData)
                 {
                     return AZ::SceneAPI::Events::ProcessingResult::Ignored;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.h
index 3b7cc2e51a..da1c375fdb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/LodRuleBehavior.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/LodRuleBehavior.cpp
index cc2f29d461..a946f0ceae 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/LodRuleBehavior.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/LodRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/LodRuleBehavior.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/LodRuleBehavior.h
index 3216a1cf80..461ef89444 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/LodRuleBehavior.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/LodRuleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MorphTargetRuleBehavior.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MorphTargetRuleBehavior.cpp
index ac6e001739..acd58da87e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MorphTargetRuleBehavior.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MorphTargetRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MorphTargetRuleBehavior.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MorphTargetRuleBehavior.h
index 1b42c63231..58f79d5cf6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MorphTargetRuleBehavior.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MorphTargetRuleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.cpp
index 42f369d992..60191ed309 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.h
index f648596ddc..afa023f124 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionRangeRuleBehavior.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionRangeRuleBehavior.cpp
index 65926ee3b4..083fd49d3e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionRangeRuleBehavior.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionRangeRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -96,7 +96,7 @@ namespace EMotionFX
                             const AZ::u32 frameCount = aznumeric_caster(animation->GetKeyFrameCount());
                             if (motionRangeRule->GetStartFrame() == 0 && motionRangeRule->GetEndFrame() == frameCount - 1)
                             {
-                                // if the startframe/endframe matches the fbx animation length, remove it.
+                                // if the startframe/endframe matches the scene file's animation length, remove it.
                                 rules.RemoveRule(motionRangeRule);
                                 updated = true;
                             }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionRangeRuleBehavior.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionRangeRuleBehavior.h
index 5e802c1565..7457d67a1b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionRangeRuleBehavior.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionRangeRuleBehavior.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/SkeletonOptimizationRuleBehavior.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/SkeletonOptimizationRuleBehavior.cpp
index e11a398a38..71a65d0b60 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/SkeletonOptimizationRuleBehavior.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/SkeletonOptimizationRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/SkeletonOptimizationRuleBehavior.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/SkeletonOptimizationRuleBehavior.h
index ca01d13069..55275116b3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/SkeletonOptimizationRuleBehavior.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/SkeletonOptimizationRuleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Data/LodNodeSelectionList.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Data/LodNodeSelectionList.cpp
index f1c8690fa5..69c4d0710e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Data/LodNodeSelectionList.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Data/LodNodeSelectionList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Data/LodNodeSelectionList.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Data/LodNodeSelectionList.h
index 6e6915bf95..6f4683267a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Data/LodNodeSelectionList.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Data/LodNodeSelectionList.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp
index e5d8bc65de..e4065f58e0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.h
index 07b0b51d31..fddb0d6afc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IActorGroup.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IActorGroup.h
index bb2a878e4b..398ec2c559 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IActorGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IActorGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IMotionGroup.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IMotionGroup.h
index df152c8b2a..29c561051b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IMotionGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IMotionGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -25,7 +25,7 @@ namespace EMotionFX
                 ~IMotionGroup() override = default;
 
                 // Ability to specify root bone can be useful if there are multiple skeletons 
-                // stored in an fbx file or if the user wants to override the root bone automatically
+                // stored in a scene file or if the user wants to override the root bone automatically
                 // selected by the code.
                 virtual const AZStd::string& GetSelectedRootBone() const = 0;
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.cpp
index c699e12a0c..7dfa2564c4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.h
index 40b21b3a2d..7633a66a05 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorPhysicsSetupRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorPhysicsSetupRule.cpp
index fdac74d346..c71386cc60 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorPhysicsSetupRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorPhysicsSetupRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorPhysicsSetupRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorPhysicsSetupRule.h
index 897d22cdd0..5d7df89019 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorPhysicsSetupRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorPhysicsSetupRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorScaleRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorScaleRule.cpp
index f0324c65a5..0db083af10 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorScaleRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorScaleRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorScaleRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorScaleRule.h
index e9d55276f9..a0b9a3b688 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorScaleRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ActorScaleRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ExternalToolRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ExternalToolRule.h
index 066423433f..2d2276a133 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ExternalToolRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ExternalToolRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ExternalToolRule.inl b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ExternalToolRule.inl
index da97743229..4559d89782 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ExternalToolRule.inl
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/ExternalToolRule.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IActorScaleRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IActorScaleRule.h
index d8150b7094..ed67d0520f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IActorScaleRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IActorScaleRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IMotionCompressionSettingsRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IMotionCompressionSettingsRule.h
index 416bf1b57c..7bfd3cf801 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IMotionCompressionSettingsRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IMotionCompressionSettingsRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IMotionScaleRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IMotionScaleRule.h
index 3c7a6af438..7712c848f7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IMotionScaleRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/IMotionScaleRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/LodRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/LodRule.cpp
index de9f3c5d5d..c5c2acf607 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/LodRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/LodRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/LodRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/LodRule.h
index 432316a579..76f007515e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/LodRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/LodRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.cpp
index d229b0e663..940a886d18 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.h
index 58250174da..7744459362 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.inl b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.inl
index 22ec2214ed..c0f55c08bb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.inl
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.cpp
index 35499866c0..e1ca6b9d50 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.h
index 27364e73ce..cb19e210b6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionAdditiveRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionAdditiveRule.cpp
index 5c8da60135..e1225feee2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionAdditiveRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionAdditiveRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionAdditiveRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionAdditiveRule.h
index 05820e19f6..77eacaeb6f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionAdditiveRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionAdditiveRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionCompressionSettingsRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionCompressionSettingsRule.cpp
index 61b2e9f2a5..e96fdfa79c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionCompressionSettingsRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionCompressionSettingsRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionCompressionSettingsRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionCompressionSettingsRule.h
index 6fa35e6055..76a7710234 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionCompressionSettingsRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionCompressionSettingsRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.cpp
index 40648a7f8f..ae00c7f852 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.h
index 8ede0e130f..873dccef72 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionRangeRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionRangeRule.cpp
index 506a0457ca..0840f4bf49 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionRangeRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionRangeRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionRangeRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionRangeRule.h
index a2c9daa98e..62b75c0cae 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionRangeRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionRangeRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.cpp
index 2e7ccb6829..d9f1a51ffb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -129,7 +129,7 @@ namespace EMotionFX
                     return;
                 }
 
-                serializeContext->Class<MotionSamplingRule, IRule>()->Version(3)
+                serializeContext->Class<MotionSamplingRule, IRule>()->Version(4)
                     ->Field("motionDataType", &MotionSamplingRule::m_motionDataType)
                     ->Field("sampleRateMethod", &MotionSamplingRule::m_sampleRateMethod)
                     ->Field("customSampleRate", &MotionSamplingRule::m_customSampleRate)
@@ -151,7 +151,7 @@ namespace EMotionFX
                             ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
                         ->DataElement(AZ::Edit::UIHandlers::ComboBox, &MotionSamplingRule::m_sampleRateMethod, "Sample rate", "Either use the Fbx sample rate or use a custom sample rate. The sample rate is automatically limited to the rate from Fbx.")
                             ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
-                            ->EnumAttribute(SampleRateMethod::FromFbx, "From Fbx")
+                            ->EnumAttribute(SampleRateMethod::FromSourceScene, "From Source Scene")
                             ->EnumAttribute(SampleRateMethod::Custom, "Custom sample rate")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &MotionSamplingRule::m_keepDuration, "Keep duration", "When enabled this keep the duration the same as the Fbx motion duration, even if no joints are animated. "
                             "When this option is disabled and the motion doesn't animate any joints then the resulting motion will have a duration of zero seconds.")
@@ -199,7 +199,7 @@ namespace EMotionFX
 
             AZ::Crc32 MotionSamplingRule::GetVisibilityCustomSampleRate() const
             {
-                return m_sampleRateMethod == SampleRateMethod::FromFbx ? AZ::Edit::PropertyVisibility::Hide : AZ::Edit::PropertyVisibility::Show;
+                return m_sampleRateMethod == SampleRateMethod::FromSourceScene ? AZ::Edit::PropertyVisibility::Hide : AZ::Edit::PropertyVisibility::Show;
             }
 
             AZ::Crc32 MotionSamplingRule::GetVisibilityAllowedSizePercentage() const
diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.h
index f7d3e8fb6f..95cee690d8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -30,7 +30,7 @@ namespace EMotionFX
 
                 enum class SampleRateMethod : AZ::u8
                 {
-                    FromFbx = 0,
+                    FromSourceScene = 0,
                     Custom = 1
                 };
 
@@ -71,7 +71,7 @@ namespace EMotionFX
                 AZ::Crc32 GetVisibilityAllowedSizePercentage() const;
                 
                 float m_customSampleRate = 60.0f;
-                SampleRateMethod m_sampleRateMethod = SampleRateMethod::FromFbx;
+                SampleRateMethod m_sampleRateMethod = SampleRateMethod::FromSourceScene;
                 AZ::TypeId m_motionDataType = AZ::TypeId::CreateNull();
                 bool m_keepDuration = true;
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionScaleRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionScaleRule.cpp
index e8c85ca82b..302aed8daf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionScaleRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionScaleRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionScaleRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionScaleRule.h
index 220235af45..4769df6f13 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionScaleRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionScaleRule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SimulatedObjectSetupRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SimulatedObjectSetupRule.cpp
index aa363438de..3313da8002 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SimulatedObjectSetupRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SimulatedObjectSetupRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SimulatedObjectSetupRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SimulatedObjectSetupRule.h
index 530b517325..e3c34d0e38 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SimulatedObjectSetupRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SimulatedObjectSetupRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SkeletonOptimizationRule.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SkeletonOptimizationRule.cpp
index 6bd90676f6..5628b6527d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SkeletonOptimizationRule.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SkeletonOptimizationRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SkeletonOptimizationRule.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SkeletonOptimizationRule.h
index 7d74754aa2..3e7fc87280 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SkeletonOptimizationRule.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/SkeletonOptimizationRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Utilities/LODSelector.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Utilities/LODSelector.cpp
index f65d8efa23..ce495a0983 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Utilities/LODSelector.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Utilities/LODSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Utilities/LODSelector.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Utilities/LODSelector.h
index ed6b4b1455..1707c5ac88 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Utilities/LODSelector.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Utilities/LODSelector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/sceneapi_ext_files.cmake b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/sceneapi_ext_files.cmake
index 211f85cb1c..8e4c840515 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/sceneapi_ext_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/sceneapi_ext_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.cpp
index 653416c64b..599f40b436 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.h
index 493aba7539..2512e9d7e4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.inl b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.inl
index b8a1e86a8b..67513882a4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.inl
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.cpp
index c406ad6bf7..8031cdb678 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.h
index 88592c9c3c..dc2a7bddef 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.cpp
index 2157c44880..cb8edb6e4f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.h
index 0d76ac3ca2..30981d85be 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/MCommonConfig.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/MCommonConfig.h
index 207bcebae9..a06aa56aa7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/MCommonConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/MCommonConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.cpp
index 9c865b57fd..ad4342d4c0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.h
index 5451c07437..32226707fe 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrthographicCamera.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrthographicCamera.cpp
index b4e4fd16a1..2d1f844d18 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrthographicCamera.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrthographicCamera.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrthographicCamera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrthographicCamera.h
index 1cf018a81f..f3e312f9cf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrthographicCamera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrthographicCamera.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp
index 7527317397..e9f2df7f87 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.h
index e2aed7aca8..c7dfab8d73 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RotateManipulator.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RotateManipulator.cpp
index bbd34139f4..0e61c3814d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RotateManipulator.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RotateManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RotateManipulator.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RotateManipulator.h
index 3af3519258..bb74d8d576 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RotateManipulator.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RotateManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.cpp
index 8bf9d04fe6..0e6b24b549 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.h
index cb7ebbb995..27b1139e72 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TransformationManipulator.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TransformationManipulator.h
index 7babc479a0..6f27d89f20 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TransformationManipulator.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TransformationManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.cpp
index 2a21358826..ba5ec3cf83 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.h
index 8cd8c9a517..acf4011a6b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.cpp
index 27b1c364af..7dbfc0a002 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.h
index 82821eb6cc..30f1b56e76 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLActor.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLActor.cpp
index 2de50f8ee6..7c6cd65243 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLActor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLActor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.cpp
index 15af7038da..ced0c2d54b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.h
index e8b7f847b0..8a3782b73b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLExtensions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.cpp
index ab8231eaff..b17be2b5c8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.h
index 6cec75a51b..f9d2ff00f0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.cpp
index cc2f539e65..064bc7837f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.h
index f918f8f9a8..463315263d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.cpp
index dcbffe05d3..f10cf47c82 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.h
index a326d7c43a..fdb91b5dbd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.cpp
index 56b0306617..b13caae155 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.h
index 523ba5abd7..3ae7ca238e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Light.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Light.h
index df25256e5b..aafac3130e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Light.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Light.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.cpp
index 122a3cb8a0..4017d7b1b5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.h
index badb7cf4fc..6dd3ccc53a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.cpp
index 83ff323a6c..c15aeafbca 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.h
index 8255de0462..37e97376c2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderGLConfig.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderGLConfig.h
index a6b36e9648..5db4bcc2c4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderGLConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderGLConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.cpp
index 7e61f30a76..06b6fc2e95 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.h
index 4a94a2ac83..3858d4d275 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Shader.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Shader.h
index fa84ac46a5..bcd1ffa332 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Shader.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Shader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/ShaderCache.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/ShaderCache.cpp
index 28558c052e..41223e8c78 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/ShaderCache.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/ShaderCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.cpp
index 03cd069688..79e0cfe302 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.h
index d93b53a18c..8b48b75530 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.cpp
index c3ce9edeef..575064f8db 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.h
index 908d89e9ba..cddf4da5ff 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.cpp
index e6169a80e9..b2573bb03f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.h
index feb355fc01..ee05c3e28b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/glactor.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/glactor.h
index a9f609740c..05f191a767 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/glactor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/glactor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/shadercache.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/shadercache.h
index 717a77fd3c..966b9e0e96 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/shadercache.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/shadercache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Rendering/rendering_files.cmake b/Gems/EMotionFX/Code/EMotionFX/Rendering/rendering_files.cmake
index 1eec8e84d7..a1f17cb4b3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/rendering_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/rendering_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
index b05958ad44..4f8f1bdaac 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Actor.h b/Gems/EMotionFX/Code/EMotionFX/Source/Actor.h
index 039fd2233d..6b51c0fdbd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Actor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Actor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ActorBus.h b/Gems/EMotionFX/Code/EMotionFX/Source/ActorBus.h
index 0c397758d5..dd13e97f21 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorBus.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
index 8dc3a287d6..14d8112b4a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.h b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.h
index 913178c7fa..ddcbcfacc9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstanceBus.h b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstanceBus.h
index df98e0abee..1b7c176978 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstanceBus.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstanceBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ActorManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/ActorManager.cpp
index e821dd0aa2..e93c26309b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ActorManager.h b/Gems/EMotionFX/Code/EMotionFX/Source/ActorManager.h
index 505133d187..4d7857916f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ActorUpdateScheduler.h b/Gems/EMotionFX/Code/EMotionFX/Source/ActorUpdateScheduler.h
index 350537e184..44b161a54a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorUpdateScheduler.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorUpdateScheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Algorithms.h b/Gems/EMotionFX/Code/EMotionFX/Source/Algorithms.h
index 40744eabdd..14e3178787 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Algorithms.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Algorithms.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Allocators.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Allocators.cpp
index 220df1162e..9df5002d20 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Allocators.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Allocators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Allocators.h b/Gems/EMotionFX/Code/EMotionFX/Source/Allocators.h
index 51924b8b5c..30199b9351 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Allocators.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Allocators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraph.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraph.cpp
index 3effa1cfb5..447c07ab16 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraph.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraph.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraph.h
index 77d70df19b..5c7a473cd1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraph.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.cpp
index f96a0eefbc..effb1f145b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.h
index b140e3c555..6c01a97b50 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.cpp
index d7554e192b..d2d54503fb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.h
index d6c1c636e8..e1ab3eca80 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBus.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBus.h
index 90dc4cfaee..c6b14213b2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBus.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEntryNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEntryNode.cpp
index 3b3d9edcf1..e491ee637b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEntryNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEntryNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEntryNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEntryNode.h
index 692428c785..3ad6fffc7f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEntryNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEntryNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEventBuffer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEventBuffer.cpp
index 916d01dfa6..7dc4283aa6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEventBuffer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEventBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEventBuffer.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEventBuffer.h
index 951a338378..1eda8c6b8d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEventBuffer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphEventBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphExitNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphExitNode.cpp
index baec425058..7d704e1359 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphExitNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphExitNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphExitNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphExitNode.h
index b37b93834f..0ad2d59eb5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphExitNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphExitNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphFollowerParameterAction.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphFollowerParameterAction.cpp
index 94ef9ba449..6ab9cbd5fb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphFollowerParameterAction.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphFollowerParameterAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphFollowerParameterAction.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphFollowerParameterAction.h
index db790a610b..bbc1cd913f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphFollowerParameterAction.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphFollowerParameterAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.cpp
index 7ea08a8c77..507f71c046 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.h
index 1322477fe6..a0c1868fa8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphHubNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphHubNode.cpp
index 0c41ed887b..dd51025c30 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphHubNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphHubNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphHubNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphHubNode.h
index 3b4cc65a23..4bc6b8478e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphHubNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphHubNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphInstance.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphInstance.cpp
index 90f3c08d12..bc8ce90487 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphInstance.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphInstance.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphInstance.h
index 22b901183e..4123e036db 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphInstance.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphManager.cpp
index 2bc27db3a7..c937622c9d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphManager.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphManager.h
index bc6f2b2d3e..9ac795aaea 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionCondition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionCondition.cpp
index b3b5318d79..e6991ece0c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionCondition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionCondition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionCondition.h
index 37028fa83c..81b4de75cf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionCondition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionCondition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp
index ab5df359d0..ad0f5aa141 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.h
index 00713eba0b..f6a249da98 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNetworkSerializer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNetworkSerializer.cpp
index 90e56b9bc7..0d61ef31ec 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNetworkSerializer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNetworkSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNetworkSerializer.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNetworkSerializer.h
index 5e3d948314..7dd4d97393 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNetworkSerializer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNetworkSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNode.cpp
index 3ddbf5a134..718e217029 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNode.h
index 6ff68f30fb..31b53ddd18 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeData.cpp
index 96414a551c..96a2ea053a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeData.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeData.h
index c1a4cb3735..141190a996 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeGroup.cpp
index c96b814af8..4d70518bb2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeGroup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeGroup.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeGroup.h
index 47461948df..1f0b3397da 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphNodeGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObject.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObject.cpp
index 01b7d8bc46..608552ed48 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObject.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObject.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObject.h
index d14b9a1d04..b753f44520 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObject.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectData.cpp
index 32594b7760..e625dc4e45 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectData.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectData.h
index 79d257114b..6ccc7fd08d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectFactory.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectFactory.cpp
index a6bc629db5..a391d56378 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectFactory.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectFactory.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectFactory.h
index c76acde065..e7fe36589e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectFactory.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectIds.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectIds.h
index 48d7283386..b1c001ca28 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectIds.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphObjectIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterAction.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterAction.cpp
index 4c7f2057f8..51c4e55d0e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterAction.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterAction.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterAction.h
index 18be4e854d..33d51a923d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterAction.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterCondition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterCondition.cpp
index 29ffcefb29..96781b0c32 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterCondition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterCondition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterCondition.h
index 62d02a953f..90662fde94 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterCondition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphParameterCondition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPlayTimeCondition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPlayTimeCondition.cpp
index de179be8c8..9a9098db78 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPlayTimeCondition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPlayTimeCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPlayTimeCondition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPlayTimeCondition.h
index 6c47595701..e2e0bb9451 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPlayTimeCondition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPlayTimeCondition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPose.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPose.cpp
index bb146d71fb..eb05c3221e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPose.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPose.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPose.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPose.h
index 7a9eb64f4e..7412748ab6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPose.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPose.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPosePool.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPosePool.cpp
index c0d5e25e1e..5da15149a6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPosePool.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPosePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPosePool.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPosePool.h
index 24b1db45ad..45d43cf873 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPosePool.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphPosePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedData.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedData.h
index 409118e0d7..5e0b04faee 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedDataPool.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedDataPool.cpp
index f129ecec1d..1cdd0c6467 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedDataPool.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedDataPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedDataPool.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedDataPool.h
index c2b5700ad4..fbce38505a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedDataPool.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphRefCountedDataPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.cpp
index e8e78b0376..25089af972 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.h
index 31cc2e3ddf..4859e255e4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSnapshot.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSnapshot.cpp
index 8de51d1099..f757df23fc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSnapshot.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSnapshot.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSnapshot.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSnapshot.h
index 74ea7a2867..3f6ad2a73e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSnapshot.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSnapshot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateCondition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateCondition.cpp
index 9039ef6543..6078fdde51 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateCondition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateCondition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateCondition.h
index 507d4815db..d675ec20db 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateCondition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateCondition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateMachine.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateMachine.cpp
index f3a5791369..0373a8366a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateMachine.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateMachine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateMachine.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateMachine.h
index 7bdc3c98a5..9f0970ce60 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateMachine.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateMachine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateTransition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateTransition.cpp
index b5fbef19d6..4c3570657c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateTransition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateTransition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateTransition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateTransition.h
index 658eff5c6a..38e27179ac 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateTransition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphStateTransition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSymbolicFollowerParameterAction.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSymbolicFollowerParameterAction.cpp
index 877be9154f..1b0fbe6002 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSymbolicFollowerParameterAction.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSymbolicFollowerParameterAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSymbolicFollowerParameterAction.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSymbolicFollowerParameterAction.h
index ba82d8d098..ca1e4ee204 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSymbolicFollowerParameterAction.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSymbolicFollowerParameterAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSyncTrack.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSyncTrack.cpp
index d0b91db800..67b37ef80a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSyncTrack.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSyncTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSyncTrack.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSyncTrack.h
index fcd8f96f12..f3837fadaf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSyncTrack.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphSyncTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTagCondition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTagCondition.cpp
index ec7b00ab05..726d52bf4a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTagCondition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTagCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTagCondition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTagCondition.h
index c4a5dd831f..db29766773 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTagCondition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTagCondition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTimeCondition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTimeCondition.cpp
index a4b1b8dcdd..a648373d40 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTimeCondition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTimeCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTimeCondition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTimeCondition.h
index 852a88dbb2..65b08bd62e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTimeCondition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTimeCondition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTransitionCondition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTransitionCondition.cpp
index a26430ee9f..ae28f37c43 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTransitionCondition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTransitionCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTransitionCondition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTransitionCondition.h
index 039b4e9fbc..a6ca69fc97 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTransitionCondition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTransitionCondition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTriggerAction.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTriggerAction.cpp
index 03b080249d..0264792545 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTriggerAction.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTriggerAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTriggerAction.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTriggerAction.h
index 2726cc14bf..d1cb7fc36c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTriggerAction.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphTriggerAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphVector2Condition.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphVector2Condition.cpp
index 3dd12b912d..8f764c5871 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphVector2Condition.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphVector2Condition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphVector2Condition.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphVector2Condition.h
index 8c7fec8198..d906206353 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphVector2Condition.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphVector2Condition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Attachment.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Attachment.cpp
index 1658a6b3ea..79df29f52c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Attachment.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Attachment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Attachment.h b/Gems/EMotionFX/Code/EMotionFX/Source/Attachment.h
index 1529f1efc5..8ced10a58c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Attachment.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Attachment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentNode.cpp
index a628d089ec..c6624a2fcd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentNode.h
index 3208f8c2fb..81079063a7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentSkin.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentSkin.cpp
index 6c6a7a9782..7f650d42fc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentSkin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentSkin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentSkin.h b/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentSkin.h
index 0255e22e82..b75a5702cc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentSkin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AttachmentSkin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/AutoRegisteredActor.h b/Gems/EMotionFX/Code/EMotionFX/Source/AutoRegisteredActor.h
index d885fe25e1..054678c48d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AutoRegisteredActor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AutoRegisteredActor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BaseObject.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BaseObject.cpp
index c985012886..85cf316610 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BaseObject.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BaseObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BaseObject.h b/Gems/EMotionFX/Code/EMotionFX/Source/BaseObject.h
index 61c028d393..a921445a3a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BaseObject.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BaseObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace1DNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace1DNode.cpp
index d036a0a735..5d681a380e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace1DNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace1DNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace1DNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace1DNode.h
index 3f6e129b57..a5bc71c66a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace1DNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace1DNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp
index 103ce4c8a2..e4de6f71e1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.h
index b5ccd82396..c3b1b3d784 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceManager.cpp
index 194684cce9..c8c6e43a75 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceManager.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceManager.h
index aba57f99c8..401d23f5a5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceNode.cpp
index aeed9ed02d..32b12192be 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceNode.h
index d1e7815b39..e36840cdda 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceParamEvaluator.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceParamEvaluator.cpp
index 5150aeaecf..11c4d871f2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceParamEvaluator.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceParamEvaluator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceParamEvaluator.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceParamEvaluator.h
index 037155502c..408f40f552 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceParamEvaluator.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpaceParamEvaluator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.cpp
index 1573a37d3b..5ff2c6fb3b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.h
index 4d9f1ce32c..e019d0ab27 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeAccumTransformNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeAccumTransformNode.cpp
index 3c679dd092..9bd5330e9e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeAccumTransformNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeAccumTransformNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeAccumTransformNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeAccumTransformNode.h
index 97654e8ec2..0a84446528 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeAccumTransformNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeAccumTransformNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2AdditiveNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2AdditiveNode.cpp
index 39e7d0b910..3ced42d6ca 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2AdditiveNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2AdditiveNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2AdditiveNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2AdditiveNode.h
index 8a97cbe216..841409d33e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2AdditiveNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2AdditiveNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2LegacyNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2LegacyNode.cpp
index c2c4ef79e8..37240db611 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2LegacyNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2LegacyNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2LegacyNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2LegacyNode.h
index 811a0fad77..37b5810080 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2LegacyNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2LegacyNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2Node.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2Node.cpp
index f8158cc9dd..c467e2df69 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2Node.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2Node.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2Node.h
index c71071a7b9..8c3b5d41e8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2Node.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.cpp
index 88bc0272cb..fc64b46082 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.h
index 7e55fff71a..fdaa8aa550 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.cpp
index 270c1e5f5f..155eddc08f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.h
index 0e4cd4505e..05d9201573 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBoolLogicNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBoolLogicNode.cpp
index a04b9e87a4..a41f83ae58 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBoolLogicNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBoolLogicNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBoolLogicNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBoolLogicNode.h
index 6983ac4b77..94eb2c55a8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBoolLogicNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBoolLogicNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeConnection.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeConnection.cpp
index 7a22af4b84..daf0b6aa83 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeConnection.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeConnection.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeConnection.h
index 0c8d977242..3c2b9861c0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeConnection.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeDirectionToWeightNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeDirectionToWeightNode.cpp
index cae7f9fff5..44f73267a6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeDirectionToWeightNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeDirectionToWeightNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeDirectionToWeightNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeDirectionToWeightNode.h
index 221bcb980c..effa332b4d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeDirectionToWeightNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeDirectionToWeightNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFinalNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFinalNode.cpp
index a9053942ae..e30b2a1d40 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFinalNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFinalNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFinalNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFinalNode.h
index af5bf519f0..3349e9e2d5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFinalNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFinalNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.cpp
index bb3f8f439d..14ba1cf978 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.h
index f820bfe620..18d9a30934 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConstantNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConstantNode.cpp
index 8859faa3c7..8a5a5fabc4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConstantNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConstantNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConstantNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConstantNode.h
index d3bfebe9e6..5aed0d103c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConstantNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConstantNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath1Node.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath1Node.cpp
index d1dbb21c3a..c12c946271 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath1Node.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath1Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath1Node.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath1Node.h
index 0cccddb873..a3be3d95a4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath1Node.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath1Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath2Node.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath2Node.cpp
index 4f6cbb1be9..a70b526684 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath2Node.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath2Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath2Node.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath2Node.h
index 30f916be93..7adebdd5e6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath2Node.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatMath2Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatSwitchNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatSwitchNode.cpp
index 0610a9ead3..7513b1788c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatSwitchNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatSwitchNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatSwitchNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatSwitchNode.h
index f6936aeff0..adba009f5b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatSwitchNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatSwitchNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFootIKNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFootIKNode.cpp
index e9dc44c50c..8bc6f8e9f0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFootIKNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFootIKNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFootIKNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFootIKNode.h
index e9ffc49ecf..33c3061c99 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFootIKNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFootIKNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeGetTransformNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeGetTransformNode.cpp
index 768e489abc..bffdd61fa4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeGetTransformNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeGetTransformNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeGetTransformNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeGetTransformNode.h
index 1ed57db54f..4dbdd31550 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeGetTransformNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeGetTransformNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp
index 350aab5e7a..57fa502abd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.h
index 0d0972ac9b..95e955213c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskLegacyNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskLegacyNode.cpp
index fb22ef6f59..3ec09d7254 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskLegacyNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskLegacyNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskLegacyNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskLegacyNode.h
index 5184e9efad..c3ea2c57ae 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskLegacyNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskLegacyNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskNode.cpp
index 6bb78c471e..367aa0eeb0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskNode.h
index 81d6cf195c..9d1f037f28 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMaskNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMirrorPoseNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMirrorPoseNode.cpp
index ab4b756277..f742dbf47d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMirrorPoseNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMirrorPoseNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMirrorPoseNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMirrorPoseNode.h
index e8afb88caa..edfe056d83 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMirrorPoseNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMirrorPoseNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMorphTargetNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMorphTargetNode.cpp
index 9ccfd71390..28c1347d31 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMorphTargetNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMorphTargetNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMorphTargetNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMorphTargetNode.h
index 81d30ee55a..850a980e31 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMorphTargetNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMorphTargetNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMotionFrameNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMotionFrameNode.cpp
index 0cf56705c7..a511f29c5d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMotionFrameNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMotionFrameNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMotionFrameNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMotionFrameNode.h
index 9a470943e9..ad509cce50 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMotionFrameNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeMotionFrameNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeParameterNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeParameterNode.cpp
index 57b259b465..905ef200cf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeParameterNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeParameterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeParameterNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeParameterNode.h
index 8429418995..d2444d01c2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeParameterNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeParameterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSubtractNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSubtractNode.cpp
index 6227eae85c..445b98ed4d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSubtractNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSubtractNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSubtractNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSubtractNode.h
index 42f87abdf0..069c631c88 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSubtractNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSubtractNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSwitchNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSwitchNode.cpp
index 27a908f1ea..7a554f79ff 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSwitchNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSwitchNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSwitchNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSwitchNode.h
index 013b0892a3..44d601aed4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSwitchNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreePoseSwitchNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.cpp
index 16ff2210b8..cbfd741de7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.h
index 0f95846862..df73cd23fe 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollStrengthModifierNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollStrengthModifierNode.cpp
index 60c1cb1224..ae679039f7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollStrengthModifierNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollStrengthModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollStrengthModifierNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollStrengthModifierNode.h
index 91cea6d5ef..c60e54a749 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollStrengthModifierNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollStrengthModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRangeRemapperNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRangeRemapperNode.cpp
index d5360c3df6..3efc7da2a5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRangeRemapperNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRangeRemapperNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRangeRemapperNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRangeRemapperNode.h
index 9826ec059c..fc2a1f83e6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRangeRemapperNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRangeRemapperNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRaycastNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRaycastNode.cpp
index 1dc5cea9fc..2140b4bc51 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRaycastNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRaycastNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRaycastNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRaycastNode.h
index 557d0e2397..643a1e9990 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRaycastNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRaycastNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationLimitNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationLimitNode.cpp
index 75c3378186..add46e5265 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationLimitNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationLimitNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationLimitNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationLimitNode.h
index 214746e7fb..12f7db7e16 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationLimitNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationLimitNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationMath2Node.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationMath2Node.cpp
index 47fba4f282..aae10e676a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationMath2Node.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationMath2Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationMath2Node.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationMath2Node.h
index b07e3e3ca0..ecd239d37b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationMath2Node.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRotationMath2Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSetTransformNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSetTransformNode.cpp
index 2074ee928f..02bc68d699 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSetTransformNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSetTransformNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSetTransformNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSetTransformNode.h
index a01f756f78..ab4c941a54 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSetTransformNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSetTransformNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSimulatedObjectNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSimulatedObjectNode.cpp
index 74b8720898..25f76c2d41 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSimulatedObjectNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSimulatedObjectNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSimulatedObjectNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSimulatedObjectNode.h
index 6067817fbc..05cf8188c8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSimulatedObjectNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSimulatedObjectNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSmoothingNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSmoothingNode.cpp
index 7c3d9f1f86..212862c1e3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSmoothingNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSmoothingNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSmoothingNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSmoothingNode.h
index 9ad8d741ed..969460ab2f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSmoothingNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeSmoothingNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp
index 95edc6838e..b8abf2cc90 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.h
index f046715100..038439df46 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.cpp
index e5f79c3ec0..a5fbff05c3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.h
index 445192900d..deac5ade2c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2ComposeNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2ComposeNode.cpp
index f480aed9f7..636744ba56 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2ComposeNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2ComposeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2ComposeNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2ComposeNode.h
index 9791b4cb98..c02afbf178 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2ComposeNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2ComposeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2DecomposeNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2DecomposeNode.cpp
index 35410c9e6b..c86ac36045 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2DecomposeNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2DecomposeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2DecomposeNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2DecomposeNode.h
index e89bc1e4a1..60cde5c304 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2DecomposeNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector2DecomposeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3ComposeNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3ComposeNode.cpp
index 5030c6954b..438c2a7cd0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3ComposeNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3ComposeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3ComposeNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3ComposeNode.h
index f3560eeee1..a34ab2edbc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3ComposeNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3ComposeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3DecomposeNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3DecomposeNode.cpp
index 547f3e8c6b..49700621e3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3DecomposeNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3DecomposeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3DecomposeNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3DecomposeNode.h
index 24243dc7da..09e1c691f8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3DecomposeNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3DecomposeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math1Node.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math1Node.cpp
index 641cff3cfb..0d1f82a4df 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math1Node.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math1Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math1Node.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math1Node.h
index d3a83774c6..cac4cc2d03 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math1Node.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math1Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp
index c37b73e5b9..2ee0d92dcc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.h
index 4a675509f6..63343eb00e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4ComposeNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4ComposeNode.cpp
index 29ef1d521e..07f7d64172 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4ComposeNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4ComposeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4ComposeNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4ComposeNode.h
index ea117793bd..07493ad5de 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4ComposeNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4ComposeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4DecomposeNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4DecomposeNode.cpp
index cabffe7559..c1b14af03b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4DecomposeNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4DecomposeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4DecomposeNode.h b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4DecomposeNode.h
index da24a0d31b..44655e4a46 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4DecomposeNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector4DecomposeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/CompressedKeyFrames.h b/Gems/EMotionFX/Code/EMotionFX/Source/CompressedKeyFrames.h
index dfcf250ef9..b7ab2350ac 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/CompressedKeyFrames.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/CompressedKeyFrames.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Constraint.h b/Gems/EMotionFX/Code/EMotionFX/Source/Constraint.h
index 1241ad91e0..2de89ee8b8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Constraint.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Constraint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransform.h b/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransform.h
index 3f505e9b3c..89628f8bc9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransform.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransformRotationAngles.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransformRotationAngles.cpp
index 433e5d6ffb..241d34ffe1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransformRotationAngles.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransformRotationAngles.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransformRotationAngles.h b/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransformRotationAngles.h
index 93478a2f48..16a3343278 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransformRotationAngles.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ConstraintTransformRotationAngles.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/DebugDraw.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/DebugDraw.cpp
index 370ea19f23..9649af9f6a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/DebugDraw.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/DebugDraw.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/DebugDraw.h b/Gems/EMotionFX/Code/EMotionFX/Source/DebugDraw.h
index 5746bc2ac3..ca23305d33 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/DebugDraw.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/DebugDraw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.cpp
index a1195ca87a..881d548c35 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.h b/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.h
index e7890cd7a7..630bd140fd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/DualQuatSkinDeformer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFX.h b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFX.h
index 27fa78b9f5..0d4cdfe420 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFX.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFX.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXAllocatorInitializer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXAllocatorInitializer.cpp
index 308643a86d..baa3452e7a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXAllocatorInitializer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXAllocatorInitializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXAllocatorInitializer.h b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXAllocatorInitializer.h
index cabb3c7c4b..fe2209276b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXAllocatorInitializer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXAllocatorInitializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXConfig.h b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXConfig.h
index 384bcdfd35..2559444d35 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.cpp
index 5f82e8f223..36bae5c1ec 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.h b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.h
index a66e4245dc..25bfe0d34e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Event.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Event.cpp
index e69ef9f20e..d71fad4d1e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Event.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Event.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Event.h b/Gems/EMotionFX/Code/EMotionFX/Source/Event.h
index 6665ef1ae3..aaf1514aba 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Event.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Event.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/EventData.cpp
index 74032bb100..b55ba7ef65 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventData.h b/Gems/EMotionFX/Code/EMotionFX/Source/EventData.h
index f1827eddf4..4484c30b55 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventDataFootIK.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/EventDataFootIK.cpp
index e015b56cf3..bb4ae87272 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventDataFootIK.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventDataFootIK.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventDataFootIK.h b/Gems/EMotionFX/Code/EMotionFX/Source/EventDataFootIK.h
index 4056cfcba4..57c9064ecf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventDataFootIK.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventDataFootIK.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventDataSyncable.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/EventDataSyncable.cpp
index bfd39da30f..ffb751c789 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventDataSyncable.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventDataSyncable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventDataSyncable.h b/Gems/EMotionFX/Code/EMotionFX/Source/EventDataSyncable.h
index 54f0986f61..da991c6789 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventDataSyncable.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventDataSyncable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventHandler.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/EventHandler.cpp
index 5141e0040c..74360aaaf3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventHandler.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventHandler.h b/Gems/EMotionFX/Code/EMotionFX/Source/EventHandler.h
index 4179e58fd5..f354cefd1e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventHandler.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventInfo.h b/Gems/EMotionFX/Code/EMotionFX/Source/EventInfo.h
index 55c658b2ba..db9b3ff5f2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventInfo.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/EventManager.cpp
index 281476e386..5ebdb0e63f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/EventManager.h b/Gems/EMotionFX/Code/EMotionFX/Source/EventManager.h
index cf1d751a36..676a19fb33 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/EventManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/EventManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ActorFileFormat.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ActorFileFormat.h
index 68231974c2..0ad6901bbd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ActorFileFormat.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ActorFileFormat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.cpp
index cff0731631..93743d9683 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.h
index 68970af177..c7ce48b973 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp
index ac4a44b8c0..2565d2759a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.h
index 057ebea83f..bf090c9ab1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.cpp
index 2c74c5f4e9..f4f626a402 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.h
index adc938f99f..4e5d4eb125 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.cpp
index 1230bfad07..ae8d9418dc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.h
index 76082686fb..dae571d553 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionFileFormat.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionFileFormat.h
index 601df32b3a..1582dbc745 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionFileFormat.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionFileFormat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionSetFileFormat.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionSetFileFormat.h
index 9e792dac87..02498a44d4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionSetFileFormat.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionSetFileFormat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/NodeMapFileFormat.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/NodeMapFileFormat.h
index 4a549afcf4..3a40f37146 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/NodeMapFileFormat.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/NodeMapFileFormat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Importer/SharedFileFormatStructs.h b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/SharedFileFormatStructs.h
index 52ebbf8b4b..6338b27804 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Importer/SharedFileFormatStructs.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Importer/SharedFileFormatStructs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrame.h b/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrame.h
index 8181f2444c..e749c459a9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrame.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrame.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrame.inl b/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrame.inl
index 5da8fb650c..977e4c05c3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrame.inl
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrame.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrameFinder.h b/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrameFinder.h
index b107849510..62fb6087ce 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrameFinder.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrameFinder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrameFinder.inl b/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrameFinder.inl
index 152c7a0d74..0bb54e2469 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrameFinder.inl
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/KeyFrameFinder.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/KeyTrackLinearDynamic.h b/Gems/EMotionFX/Code/EMotionFX/Source/KeyTrackLinearDynamic.h
index ffc4a98b9f..7abf725e36 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/KeyTrackLinearDynamic.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/KeyTrackLinearDynamic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/KeyTrackLinearDynamic.inl b/Gems/EMotionFX/Code/EMotionFX/Source/KeyTrackLinearDynamic.inl
index f56db4a145..0269a523a3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/KeyTrackLinearDynamic.inl
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/KeyTrackLinearDynamic.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/LayerPass.h b/Gems/EMotionFX/Code/EMotionFX/Source/LayerPass.h
index a54706cbf6..9307a6cf38 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/LayerPass.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/LayerPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Material.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Material.cpp
index a76e3759db..edaffa7ff7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Material.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Material.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Material.h b/Gems/EMotionFX/Code/EMotionFX/Source/Material.h
index e4787516d5..f804e9e9f6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Material.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Material.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MemoryCategories.h b/Gems/EMotionFX/Code/EMotionFX/Source/MemoryCategories.h
index 2dc57a9324..cbf79ab7c8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MemoryCategories.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MemoryCategories.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp
index 31570dbeb5..896ac2db42 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h
index 90c4c23290..f056a7cb2e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.inl b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.inl
index 3be4003622..dd2a9e641a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.inl
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MeshBuilderInvalidIndex.h b/Gems/EMotionFX/Code/EMotionFX/Source/MeshBuilderInvalidIndex.h
index bf3caa0bcf..ed75918a77 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MeshBuilderInvalidIndex.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MeshBuilderInvalidIndex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformer.cpp
index 19fd65f60c..f50c6328dd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformer.h b/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformer.h
index 1b22ba9479..f6ca96d32f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformerStack.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformerStack.cpp
index e2ae776fe2..473a36ea42 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformerStack.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformerStack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformerStack.h b/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformerStack.h
index 0ab75d19b2..2e85dc5bf7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformerStack.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MeshDeformerStack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphMeshDeformer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MorphMeshDeformer.cpp
index e8924c5211..f5cbd3f901 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphMeshDeformer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphMeshDeformer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphMeshDeformer.h b/Gems/EMotionFX/Code/EMotionFX/Source/MorphMeshDeformer.h
index aebcec4402..68bbacc9d3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphMeshDeformer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphMeshDeformer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetup.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetup.cpp
index a97c1e3065..0509e6509b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetup.h b/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetup.h
index 478c7abab6..e4b92b24d6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetupInstance.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetupInstance.cpp
index c66592af1a..cf0737840b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetupInstance.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetupInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetupInstance.h b/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetupInstance.h
index 15124005b5..51f32a2803 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetupInstance.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphSetupInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphTarget.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MorphTarget.cpp
index dad77c8767..30120a8562 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphTarget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphTarget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphTarget.h b/Gems/EMotionFX/Code/EMotionFX/Source/MorphTarget.h
index 8b20321961..290b25a04e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphTarget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphTarget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphTargetStandard.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MorphTargetStandard.cpp
index d9f613b31d..28d001e3d8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphTargetStandard.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphTargetStandard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MorphTargetStandard.h b/Gems/EMotionFX/Code/EMotionFX/Source/MorphTargetStandard.h
index c07b7053c0..8b16bea29f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MorphTargetStandard.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MorphTargetStandard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp
index bff1f855d6..1a7fa23336 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h
index e34e2ef7ab..d6f7724be3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.cpp
index d46fed35e4..d6494b3153 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
index b247c0536a..fbbd50be68 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -158,7 +158,7 @@ namespace EMotionFX
         virtual size_t CalcStreamSaveSizeInBytes(const SaveSettings& saveSettings) const = 0;
         virtual AZ::u32 GetStreamSaveVersion() const = 0;
         virtual bool GetSupportsOptimizeSettings() const { return true; }
-        virtual const char* GetFbxSettingsName() const = 0;
+        virtual const char* GetSceneSettingsName() const = 0;
 
         // Sampling
         virtual Transform SampleJointTransform(const SampleSettings& settings, AZ::u32 jointSkeletonIndex) const = 0;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataFactory.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataFactory.cpp
index 02e17cbdcb..1eb1fdbd60 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataFactory.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataFactory.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataFactory.h
index b9a7f3e83b..cff35947de 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataFactory.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
index e108018eca..f9e0911d51 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -35,7 +35,7 @@ namespace EMotionFX
         return aznew NonUniformMotionData();
     }
 
-    const char* NonUniformMotionData::GetFbxSettingsName() const
+    const char* NonUniformMotionData::GetSceneSettingsName() const
     {
         return "Reduced Keyframes (slower, mostly smaller)";
     }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
index ca97d1f54b..ec2ddff0ad 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -52,7 +52,7 @@ namespace EMotionFX
         bool Save(MCore::Stream* stream, const SaveSettings& saveSettings) const override;
         size_t CalcStreamSaveSizeInBytes(const SaveSettings& saveSettings) const override;
         AZ::u32 GetStreamSaveVersion() const override;
-        const char* GetFbxSettingsName() const override;
+        const char* GetSceneSettingsName() const override;
 
         Transform SampleJointTransform(const SampleSettings& settings, AZ::u32 jointSkeletonIndex) const override;
         void SamplePose(const SampleSettings& settings, Pose* outputPose) const override;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp
index f66eb53396..296f4adf62 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -36,7 +36,7 @@ namespace EMotionFX
         return aznew UniformMotionData();
     }
 
-    const char* UniformMotionData::GetFbxSettingsName() const
+    const char* UniformMotionData::GetSceneSettingsName() const
     {
         return "Evenly Spaced Keyframes (faster, mostly larger)";
     }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h
index 45edd6e947..c92ce192b2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -49,7 +49,7 @@ namespace EMotionFX
         size_t CalcStreamSaveSizeInBytes(const SaveSettings& saveSettings) const override;
         AZ::u32 GetStreamSaveVersion() const override;
         bool GetSupportsOptimizeSettings() const override { return false; }
-        const char* GetFbxSettingsName() const override;
+        const char* GetSceneSettingsName() const override;
 
         // Overloaded.
         Transform SampleJointTransform(const SampleSettings& settings, AZ::u32 jointSkeletonIndex) const override;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionEvent.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEvent.cpp
index 825926d871..602059524f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionEvent.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionEvent.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEvent.h
index 93acf514ef..5c1dfbe5d7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionEvent.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTable.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTable.cpp
index 751f7e551a..6114c0512a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTable.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTable.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTable.h
index 2101843a52..1531e721bf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTable.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTrack.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTrack.cpp
index f1ec5950fb..bb3665c4bf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTrack.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTrack.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTrack.h
index b7cfc526cc..f62143bd19 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTrack.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionEventTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionGroup.cpp
index 4ae5f29347..ee601fb624 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionGroup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstance.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstance.cpp
index 629bf18ce6..36a1a12d76 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstance.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstance.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstance.h
index 56bb831571..cfaa9faaca 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstance.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.cpp
index cecbb35b03..e514ac9c8d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.h
index 2ffd1d6373..aaf90e176b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionInstancePool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionLayerSystem.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionLayerSystem.cpp
index 4f90ea3e80..ed8ae07470 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionLayerSystem.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionLayerSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionLayerSystem.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionLayerSystem.h
index f2c00368d9..16c20dabf3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionLayerSystem.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionLayerSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionManager.cpp
index 43cc4b91ec..1d6cd70f38 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionManager.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionManager.h
index f7e5711e8b..c017855691 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionQueue.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionQueue.cpp
index 1d924b5c02..847ba0e594 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionQueue.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionQueue.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionQueue.h
index 211bffd357..09ec047f80 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionQueue.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionSet.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionSet.cpp
index 701180611e..fd2174038e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionSet.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionSet.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionSet.h
index 10a1ae78e2..8c2eb3759c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionSet.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionSystem.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionSystem.cpp
index 5624c241d8..b6f26dbdeb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionSystem.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MotionSystem.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionSystem.h
index df5c439cb2..6562b59b1b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionSystem.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MultiThreadScheduler.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MultiThreadScheduler.cpp
index a0c2992513..9dbfe02940 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MultiThreadScheduler.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MultiThreadScheduler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/MultiThreadScheduler.h b/Gems/EMotionFX/Code/EMotionFX/Source/MultiThreadScheduler.h
index c482710da4..759cfd6357 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MultiThreadScheduler.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MultiThreadScheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Node.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Node.cpp
index 0406f2bf6d..916b178c8d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Node.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Node.h b/Gems/EMotionFX/Code/EMotionFX/Source/Node.h
index 68c4eb20f9..819dfa92a8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Node.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/NodeAttribute.h b/Gems/EMotionFX/Code/EMotionFX/Source/NodeAttribute.h
index de13dc7039..5737b33a79 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/NodeAttribute.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/NodeAttribute.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/NodeGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/NodeGroup.cpp
index b10b41b734..20444c26ce 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/NodeGroup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/NodeGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/NodeGroup.h b/Gems/EMotionFX/Code/EMotionFX/Source/NodeGroup.h
index d2e907db74..0f78827ff7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/NodeGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/NodeGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/NodeMap.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/NodeMap.cpp
index da37ef29c4..ef67bfec54 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/NodeMap.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/NodeMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/NodeMap.h b/Gems/EMotionFX/Code/EMotionFX/Source/NodeMap.h
index 792d1547c3..5b15476648 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/NodeMap.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/NodeMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ObjectAffectedByParameterChanges.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/ObjectAffectedByParameterChanges.cpp
index f94a260898..a3530f9a5a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ObjectAffectedByParameterChanges.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ObjectAffectedByParameterChanges.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ObjectAffectedByParameterChanges.h b/Gems/EMotionFX/Code/EMotionFX/Source/ObjectAffectedByParameterChanges.h
index 7d4f08c52a..7c1af14f13 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ObjectAffectedByParameterChanges.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ObjectAffectedByParameterChanges.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ObjectId.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/ObjectId.cpp
index db15efa68a..90a1a7b93f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ObjectId.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ObjectId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ObjectId.h b/Gems/EMotionFX/Code/EMotionFX/Source/ObjectId.h
index 1b7459d4d2..de83fe5436 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ObjectId.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ObjectId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/BoolParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/BoolParameter.cpp
index 5afe683652..5900e2bdfa 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/BoolParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/BoolParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/BoolParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/BoolParameter.h
index 604830216e..fbdcdd9ad3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/BoolParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/BoolParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ColorParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ColorParameter.cpp
index 68dfbf35c5..e2ec8c27ac 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ColorParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ColorParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ColorParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ColorParameter.h
index 006caa6489..2947597d34 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ColorParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ColorParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/DefaultValueParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/DefaultValueParameter.h
index 070f02bb35..f0f70c01a4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/DefaultValueParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/DefaultValueParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatParameter.cpp
index 4aca16a323..2531908f12 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatParameter.h
index 46892172e0..34907fcffb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSliderParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSliderParameter.cpp
index b82098c383..296cfc4a7c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSliderParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSliderParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSliderParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSliderParameter.h
index ff206613fc..bbc51afb8a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSliderParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSliderParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSpinnerParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSpinnerParameter.cpp
index 227ee4f09c..8f659a71a1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSpinnerParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSpinnerParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSpinnerParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSpinnerParameter.h
index 2951e009c8..b37ccc833e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSpinnerParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/FloatSpinnerParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/GroupParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/GroupParameter.cpp
index d375fbdc77..275804c11d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/GroupParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/GroupParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/GroupParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/GroupParameter.h
index 24da5073a6..e7fe2390a2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/GroupParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/GroupParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntParameter.cpp
index 5db832913b..9c7192e533 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntParameter.h
index a73f760a69..df50f158ee 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSliderParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSliderParameter.cpp
index 9ac7f8b8fb..87794a8687 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSliderParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSliderParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSliderParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSliderParameter.h
index 0b0488a27c..eb6b47b3d1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSliderParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSliderParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSpinnerParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSpinnerParameter.cpp
index 3856c6737a..ab5aee9391 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSpinnerParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSpinnerParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSpinnerParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSpinnerParameter.h
index 7fda10adf5..d184255f58 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSpinnerParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/IntSpinnerParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Parameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Parameter.cpp
index d08cdbb647..2b9fe09da0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Parameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Parameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Parameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Parameter.h
index 4f73fd06a6..91a37408ae 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Parameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Parameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ParameterFactory.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ParameterFactory.cpp
index 3863e8e1ab..1ee321081e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ParameterFactory.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ParameterFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ParameterFactory.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ParameterFactory.h
index ba11b8de62..e3e770471b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ParameterFactory.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ParameterFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RangedValueParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RangedValueParameter.h
index 095f95f4f9..46e78fc76d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RangedValueParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RangedValueParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RotationParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RotationParameter.cpp
index 31452ef63f..cd9460050d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RotationParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RotationParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RotationParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RotationParameter.h
index 5eec690a5f..7d30ee351a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RotationParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/RotationParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/StringParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/StringParameter.cpp
index 1f379d36a8..a9e61a4f6c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/StringParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/StringParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/StringParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/StringParameter.h
index 7eaf692461..a04dec818c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/StringParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/StringParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/TagParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/TagParameter.cpp
index 193e55a75e..0d0c635f4a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/TagParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/TagParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/TagParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/TagParameter.h
index 29a81cb7c2..15f40ca46c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/TagParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/TagParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ValueParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ValueParameter.cpp
index 3f392f31da..dd174253b7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ValueParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ValueParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ValueParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ValueParameter.h
index b1920ed80f..ac9abe80ab 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ValueParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/ValueParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector2Parameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector2Parameter.cpp
index 23596edf25..db83b9cd03 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector2Parameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector2Parameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector2Parameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector2Parameter.h
index 1a94ad76a0..b7140ccb11 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector2Parameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector2Parameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3GizmoParameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3GizmoParameter.cpp
index dda8cd6e35..f925027ebb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3GizmoParameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3GizmoParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3GizmoParameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3GizmoParameter.h
index 689e604c1c..386aebee42 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3GizmoParameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3GizmoParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3Parameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3Parameter.cpp
index 580e4a10e3..8753b3b99b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3Parameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3Parameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3Parameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3Parameter.h
index 7b822548c8..ef7341e481 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3Parameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector3Parameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector4Parameter.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector4Parameter.cpp
index 9abd3f08e9..bc13fa2a5b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector4Parameter.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector4Parameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector4Parameter.h b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector4Parameter.h
index 05c4588a45..0908c63d58 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector4Parameter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Parameter/Vector4Parameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp
index 33e5e3dbc8..b7065e1640 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.h b/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.h
index 5cf625957f..995c8f63ff 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PlayBackInfo.h b/Gems/EMotionFX/Code/EMotionFX/Source/PlayBackInfo.h
index f1b76dbf93..92c1ae04c5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PlayBackInfo.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PlayBackInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Pose.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Pose.cpp
index 3058f3610f..1870229c1f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Pose.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Pose.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Pose.h b/Gems/EMotionFX/Code/EMotionFX/Source/Pose.h
index c98bcd0519..1d5611322e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Pose.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Pose.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PoseData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/PoseData.cpp
index 4c7d4e5416..e687353204 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PoseData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PoseData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PoseData.h b/Gems/EMotionFX/Code/EMotionFX/Source/PoseData.h
index b73b608a79..08f605a5b5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PoseData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PoseData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataFactory.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataFactory.cpp
index 9e232f11c7..bb3acdd061 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataFactory.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataFactory.h b/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataFactory.h
index 5ef92e5530..369725c4d7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataFactory.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.cpp
index 3324046880..36075ca1f4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.h b/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.h
index c8d51fb2e0..7fcf079b8a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.cpp
index 1cf1cb8a7a..0760f46f7b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.h b/Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.h
index 64e726dbd8..deefa42813 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/RagdollVelocityEvaluators.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/RagdollVelocityEvaluators.cpp
index 237d332a82..89c7809022 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/RagdollVelocityEvaluators.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/RagdollVelocityEvaluators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/RagdollVelocityEvaluators.h b/Gems/EMotionFX/Code/EMotionFX/Source/RagdollVelocityEvaluators.h
index 12669e1985..4572fba993 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/RagdollVelocityEvaluators.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/RagdollVelocityEvaluators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Recorder.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Recorder.cpp
index 1227a04690..33b2792d10 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Recorder.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Recorder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Recorder.h b/Gems/EMotionFX/Code/EMotionFX/Source/Recorder.h
index 174a1947bd..89063e0ffe 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Recorder.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Recorder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/RecorderBus.h b/Gems/EMotionFX/Code/EMotionFX/Source/RecorderBus.h
index 137a3e8c64..d9f28c5192 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/RecorderBus.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/RecorderBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/RepositioningLayerPass.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/RepositioningLayerPass.cpp
index f6c9f20043..7f3d405364 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/RepositioningLayerPass.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/RepositioningLayerPass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/RepositioningLayerPass.h b/Gems/EMotionFX/Code/EMotionFX/Source/RepositioningLayerPass.h
index 32a92396bc..fc165eff99 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/RepositioningLayerPass.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/RepositioningLayerPass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectBus.h b/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectBus.h
index 3676056cbe..0f3502f630 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectBus.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectSetup.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectSetup.cpp
index 8d3a6f584e..321f173794 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectSetup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectSetup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectSetup.h b/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectSetup.h
index 8c6d9ab3cc..0c7c58d884 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectSetup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SimulatedObjectSetup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SingleThreadScheduler.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/SingleThreadScheduler.cpp
index 7c031c4a30..14bd566bb5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SingleThreadScheduler.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SingleThreadScheduler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SingleThreadScheduler.h b/Gems/EMotionFX/Code/EMotionFX/Source/SingleThreadScheduler.h
index 450a153f3e..9c171e0f3d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SingleThreadScheduler.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SingleThreadScheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Skeleton.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Skeleton.cpp
index 4904f262f7..c8592b5b22 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Skeleton.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Skeleton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Skeleton.h b/Gems/EMotionFX/Code/EMotionFX/Source/Skeleton.h
index 8bd6ed3348..bde4e65094 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Skeleton.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Skeleton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SkinningInfoVertexAttributeLayer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/SkinningInfoVertexAttributeLayer.cpp
index 74bfdd64ba..8b0a16b542 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SkinningInfoVertexAttributeLayer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SkinningInfoVertexAttributeLayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SkinningInfoVertexAttributeLayer.h b/Gems/EMotionFX/Code/EMotionFX/Source/SkinningInfoVertexAttributeLayer.h
index 0440252f77..93d2713662 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SkinningInfoVertexAttributeLayer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SkinningInfoVertexAttributeLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinDeformer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinDeformer.cpp
index e500a776d6..ff3ade6e6a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinDeformer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinDeformer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinDeformer.h b/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinDeformer.h
index 6b7b503791..bcd62de1f9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinDeformer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinDeformer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinManager.cpp
index ec593c82d0..507135c51b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinManager.h b/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinManager.h
index 4a413d840d..2b7417e334 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SoftSkinManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SpringSolver.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/SpringSolver.cpp
index ab445b4279..a4d510698f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SpringSolver.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SpringSolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SpringSolver.h b/Gems/EMotionFX/Code/EMotionFX/Source/SpringSolver.h
index 140f36d4ff..9008f3442d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SpringSolver.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SpringSolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/StandardMaterial.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/StandardMaterial.cpp
index 4132fedda7..bc6ad999ff 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/StandardMaterial.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/StandardMaterial.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/StandardMaterial.h b/Gems/EMotionFX/Code/EMotionFX/Source/StandardMaterial.h
index 5b6b868ab4..316d503545 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/StandardMaterial.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/StandardMaterial.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SubMesh.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/SubMesh.cpp
index d52bafbf05..f0f16ea261 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SubMesh.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SubMesh.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/SubMesh.h b/Gems/EMotionFX/Code/EMotionFX/Source/SubMesh.h
index 57753a6ba8..653e247f7b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/SubMesh.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/SubMesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ThreadData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/ThreadData.cpp
index a2b95f6baf..bb8700c259 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ThreadData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ThreadData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/ThreadData.h b/Gems/EMotionFX/Code/EMotionFX/Source/ThreadData.h
index e5bca4a237..d2493b7b90 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ThreadData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ThreadData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Transform.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Transform.cpp
index e3cf237d6e..9997823ad0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Transform.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Transform.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/Transform.h b/Gems/EMotionFX/Code/EMotionFX/Source/Transform.h
index 969718cde4..a7e6f6265e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Transform.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Transform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/TransformData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/TransformData.cpp
index 4acdfeceec..ada0d7b8d5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/TransformData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/TransformData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/TransformData.h b/Gems/EMotionFX/Code/EMotionFX/Source/TransformData.h
index c6b63d5a79..5a813e6003 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/TransformData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/TransformData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/TransformSpace.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/TransformSpace.cpp
index 09b5d75b2e..398f9b1ae0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/TransformSpace.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/TransformSpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/TransformSpace.h b/Gems/EMotionFX/Code/EMotionFX/Source/TransformSpace.h
index bc8e910c5a..a226c7cc8c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/TransformSpace.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/TransformSpace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/TriggerActionSetup.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/TriggerActionSetup.cpp
index b5fdfad736..16f88f40e5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/TriggerActionSetup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/TriggerActionSetup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/TriggerActionSetup.h b/Gems/EMotionFX/Code/EMotionFX/Source/TriggerActionSetup.h
index 1b06d3bd60..a05f43a5f8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/TriggerActionSetup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/TriggerActionSetup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/TwoStringEventData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/TwoStringEventData.cpp
index a54ec76b08..530bf6c0dd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/TwoStringEventData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/TwoStringEventData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/TwoStringEventData.h b/Gems/EMotionFX/Code/EMotionFX/Source/TwoStringEventData.h
index 2574463b26..7faee2ed2c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/TwoStringEventData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/TwoStringEventData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayer.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayer.cpp
index d3833d72d8..e9de0aebd7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayer.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayer.h b/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayer.h
index 4d4290ac74..6ce6b9a7c2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayerAbstractData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayerAbstractData.cpp
index 4662086c49..0efb9b1107 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayerAbstractData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayerAbstractData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayerAbstractData.h b/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayerAbstractData.h
index 182d45c6bc..62a54e1518 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayerAbstractData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/VertexAttributeLayerAbstractData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Allocators.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Allocators.cpp
index 738436e976..6472e8cac4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Allocators.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Allocators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Allocators.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Allocators.h
index 1f0664b1a0..8c7f58c482 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Allocators.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Allocators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
index 8c22d657c3..ed0776f6f6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.h
index 18e83442dc..6d0e19952d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/DockWidgetPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/DockWidgetPlugin.cpp
index cbb6f25cb1..3979b6122f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/DockWidgetPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/DockWidgetPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/DockWidgetPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/DockWidgetPlugin.h
index 6bad749b08..68f1f2c3df 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/DockWidgetPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/DockWidgetPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioConfig.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioConfig.h
index 565e84d874..5d441dcce5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioCore.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioCore.h
index 5fccb84817..6f41c017ea 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioCore.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioCore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp
index 2fc587b1d7..a9bcfc4ee3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h
index 1b30eb96d7..7a29b2248d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.cpp
index 9e9843323d..b572cd6d0d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
index 9033fb52c9..ec2f4212e4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.cpp
index 574d3bccd8..3d8770a1d2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.h
index 5633a15805..1b80061fc5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/GUIOptions.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/GUIOptions.cpp
index 4b56ac28a2..c8ff660988 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/GUIOptions.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/GUIOptions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/GUIOptions.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/GUIOptions.h
index 62e8c685b1..907ed94064 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/GUIOptions.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/GUIOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.cpp
index 1663c94581..90e1ee8a4c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.h
index fb8ef14f79..599c9002ee 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.cpp
index af26b63640..668ddca338 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.h
index 8f8dfa0447..a42236e546 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/KeyboardShortcutsWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LayoutManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LayoutManager.cpp
index 4c75af9e35..96e075e34c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LayoutManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LayoutManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LayoutManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LayoutManager.h
index eb5179ac14..80709627ac 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LayoutManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LayoutManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LoadActorSettingsWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LoadActorSettingsWindow.cpp
index d8f9bd6cd5..572227ccb6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LoadActorSettingsWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LoadActorSettingsWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LoadActorSettingsWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LoadActorSettingsWindow.h
index cc8e6c18ca..8c5be0b480 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LoadActorSettingsWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/LoadActorSettingsWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp
index a0c6a8bcb3..8b9feb5a32 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h
index 1141f5d7a1..3919a4a397 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter.h
index 8783394fef..2460770e26 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MorphTargetSelectionWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MorphTargetSelectionWindow.cpp
index 7405b4845d..d876e4c42a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MorphTargetSelectionWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MorphTargetSelectionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MorphTargetSelectionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MorphTargetSelectionWindow.h
index a860a55354..f2ce75da67 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MorphTargetSelectionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MorphTargetSelectionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.cpp
index df416e0671..1e47f92a71 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.h
index 52994eeb52..d60b48d7a5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionEventPresetManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetHierarchyWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetHierarchyWidget.cpp
index 71626b8f6c..ebd55b4e55 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetHierarchyWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetHierarchyWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetHierarchyWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetHierarchyWidget.h
index 4b649303af..04fc9d942d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetHierarchyWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetHierarchyWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetSelectionWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetSelectionWindow.cpp
index 1c89c5a6a3..e47e04a066 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetSelectionWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetSelectionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetSelectionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetSelectionWindow.h
index ad511f43ed..84b56e63f8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetSelectionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MotionSetSelectionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.cpp
index 4afbfc95eb..509423b7b4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.h
index d79ac69586..8b8c54473c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.cpp
index 93d2ee7e32..c815b99705 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h
index 313281f9d8..89312deb05 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindow.cpp
index c2f65ed036..b3e79687a6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindow.h
index a988a80e1b..c02c88d84f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindowManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindowManager.cpp
index 179547d013..b4c6ae63af 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindowManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindowManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindowManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindowManager.h
index 70ac678c0c..5341cc72c8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindowManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NotificationWindowManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.cpp
index 9fefaa9b8e..acae90f136 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.h
index 4e1cad4cb4..746efc1452 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptions.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptions.cpp
index 37d45b1c9a..80f9371d4f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptions.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptions.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptions.h
index f6864a52fd..f053d8093a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptions.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptionsBus.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptionsBus.h
index 8bf742529c..a7db8721f6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptionsBus.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginOptionsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PreferencesWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PreferencesWindow.cpp
index e6b89bd5c3..be09f63226 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PreferencesWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PreferencesWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PreferencesWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PreferencesWindow.h
index 7d5491192b..d31bae4db0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PreferencesWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PreferencesWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RecoverFilesWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RecoverFilesWindow.cpp
index dfb75290da..8bbf075231 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RecoverFilesWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RecoverFilesWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RecoverFilesWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RecoverFilesWindow.h
index e25e2e0994..f196e1ebe0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RecoverFilesWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RecoverFilesWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RemovePluginOnCloseDockWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RemovePluginOnCloseDockWidget.cpp
index f6ca5d7409..1c73976abf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RemovePluginOnCloseDockWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RemovePluginOnCloseDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RemovePluginOnCloseDockWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RemovePluginOnCloseDockWidget.h
index ceff4dac61..224f24ebc9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RemovePluginOnCloseDockWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RemovePluginOnCloseDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/CommandCallbacks.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/CommandCallbacks.cpp
index 3a589105a6..a194b829b7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/CommandCallbacks.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/CommandCallbacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.cpp
index 3f44669f2b..4b0a7d965a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
index 4246d2d75e..dbec88a264 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderLayouts.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderLayouts.h
index 927193ae96..328706c0f1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderLayouts.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderLayouts.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp
index 3a1bfa4295..4ae50c2559 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.h
index 9343f09a33..bf7a9a8129 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp
index 2531d12853..f9851ccd2e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -313,7 +313,7 @@ namespace EMStudio
 
     void RenderPlugin::OnActorReady([[maybe_unused]] EMotionFX::Actor* actor)
     {
-        ReInit(/*resetViewCloseup=*/true);
+        m_reinitRequested = true;
     }
 
     // try to locate the helper actor for a given instance
@@ -535,6 +535,7 @@ namespace EMStudio
         }
 
         mFirstFrameAfterReInit = true;
+        m_reinitRequested = false;
 
         // zoom the camera to the available character only in case we're dealing with a single instance
         if (resetViewCloseup && numActorInstances == 1)
@@ -851,6 +852,11 @@ namespace EMStudio
             return;
         }
 
+        if (m_reinitRequested)
+        {
+            ReInit(/*resetViewCloseup=*/true);
+        }
+
         // update EMotion FX, but don't render
         UpdateActorInstances(timePassedInSeconds);
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.h
index 72cdb4c4bf..5ee1d746bf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -226,6 +226,7 @@ namespace EMStudio
         QWidget*                            mInnerWidget;
         CommandSystem::SelectionList*       mCurrentSelection;
         bool                                mFirstFrameAfterReInit;
+        bool                                m_reinitRequested = false;
 
         // command callbacks
         MCORE_DEFINECOMMANDCALLBACK(UpdateRenderActorsCallback);
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.cpp
index 46c4b8df57..3a237bdf24 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.h
index 00bfa385c9..3f8ca9aec3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewContextMenu.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewContextMenu.cpp
index c71305a434..bd161c6bb4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewContextMenu.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp
index 8139c50261..56dd03a127 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h
index 639b844bfd..ef04e7b8f3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.cpp
index 4d84325cdd..305a355da0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.h
index a4d5341c19..5bdae1be04 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ResetSettingsDialog.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ResetSettingsDialog.cpp
index 158bb2c348..aa6e761454 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ResetSettingsDialog.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ResetSettingsDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ResetSettingsDialog.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ResetSettingsDialog.h
index 3d13826e5a..3170bd844c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ResetSettingsDialog.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ResetSettingsDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.cpp
index c3a5ef422d..5fd411d2e9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.h
index 2b1c75b594..39521435aa 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/SaveChangedFilesManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.cpp
index bb0792b408..5b151c82e9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.h
index ec77df25b0..3cda511be0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/UnitScaleWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/UnitScaleWindow.cpp
index 6420660328..9c73c9113a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/UnitScaleWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/UnitScaleWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/UnitScaleWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/UnitScaleWindow.h
index 7db3b669bb..4b46a7ba51 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/UnitScaleWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/UnitScaleWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.cpp
index 5ecbd530ec..0460b10a9a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.h
index 62b787511f..3bbfa93aab 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/emstudiosdk_files.cmake b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/emstudiosdk_files.cmake
index 7fd40c2508..d6b96f75a0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/emstudiosdk_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/emstudiosdk_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.cpp
index 86cfed5919..eaff43b56c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
index 572e203d4b..908b252d37 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.cpp
index d8f28416d2..da7fd67156 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h
index 31c78e420b..def1c852aa 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -35,7 +35,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "OpenGL Render Window"; }
         uint32 GetClassID() const override                  { return static_cast<uint32>(RenderPlugin::CLASS_ID); }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RegisterPlugins.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RegisterPlugins.cpp
index 2595288e57..717067bb58 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RegisterPlugins.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RegisterPlugins.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RenderPluginsConfig.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RenderPluginsConfig.h
index ac728b2656..fcb4bb4fbf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RenderPluginsConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RenderPluginsConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/renderplugins_files.cmake b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/renderplugins_files.cmake
index ac585f89f1..68b352b361 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/renderplugins_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/renderplugins_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryCallback.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryCallback.cpp
index 469e07a638..ff60003b9e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryCallback.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryCallback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryCallback.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryCallback.h
index c199c08f28..6b369005a8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryCallback.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.cpp
index b182d4972a..c124b9ed43 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -54,7 +54,7 @@ namespace EMStudio
 
     const char* ActionHistoryPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.h
index 17d292c464..e809f19d72 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 544bccd5a8..836ed5331f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.h
index a26540d22c..18aafc358c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphEditor.cpp
index fd820d04f2..ded4bccc5c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphEditor.h
index c59414f0dc..595e615e0b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphHierarchyWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphHierarchyWidget.cpp
index e1a6214b37..67054a17e7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphHierarchyWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphHierarchyWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphHierarchyWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphHierarchyWidget.h
index c0a27f742e..51d2d37ea9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphHierarchyWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphHierarchyWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphItemDelegate.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphItemDelegate.cpp
index ddcfa2a697..2ad15788be 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphItemDelegate.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphItemDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphItemDelegate.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphItemDelegate.h
index abc6c3127c..464c2f4d5c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphItemDelegate.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphItemDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp
index ce5af87158..6829515630 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.h
index 17f0d33762..a154e20ee4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModelCallbacks.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModelCallbacks.cpp
index 5141f0bf45..3c164c7e1e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModelCallbacks.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModelCallbacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphNodeWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphNodeWidget.cpp
index 561561cf7f..ff7e195c90 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphNodeWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphNodeWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphNodeWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphNodeWidget.h
index dd27d88736..805c75e975 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphNodeWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphNodeWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphOptions.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphOptions.cpp
index 52f6b178a2..88f0af2589 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphOptions.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphOptions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphOptions.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphOptions.h
index c96c879168..4fc14cb757 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphOptions.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
index 62cf14299d..aa848b4254 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -307,7 +307,7 @@ namespace EMStudio
     // get the creator name
     const char* AnimGraphPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
index 6686090a4c..8ad9d4e7b9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPluginCallbacks.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPluginCallbacks.cpp
index 028d6b10e1..6962784851 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPluginCallbacks.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPluginCallbacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSelectionProxyModel.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSelectionProxyModel.cpp
index dbdbcdc439..20be2c2a34 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSelectionProxyModel.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSelectionProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSortFilterProxyModel.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSortFilterProxyModel.cpp
index 306b3c6533..fc78d6c47d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSortFilterProxyModel.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSortFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSortFilterProxyModel.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSortFilterProxyModel.h
index 00412ffd51..1dcc3e9770 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSortFilterProxyModel.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphSortFilterProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphVisualNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphVisualNode.cpp
index f02962b6a5..3098faf05e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphVisualNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphVisualNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphVisualNode.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphVisualNode.h
index c5a75b2b9a..074a4d28bb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphVisualNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphVisualNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AttributesWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AttributesWindow.cpp
index d29d8a4869..419ea838c2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AttributesWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AttributesWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AttributesWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AttributesWindow.h
index 3fd0eccc1d..df05a9d1b6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AttributesWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AttributesWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp
index 4ce46ce0be..f1b7616ba9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h
index 47d7daf84d..3f5537adf3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp
index 1601ca392a..a1aa99014d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h
index 2a9329e401..e2ea8bfcf0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidgetCallback.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidgetCallback.cpp
index 5c1d5a15ba..c7c98ec0bd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidgetCallback.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidgetCallback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidgetCallback.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidgetCallback.h
index af24a1deca..ab351191ec 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidgetCallback.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphWidgetCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendNodeSelectionWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendNodeSelectionWindow.cpp
index c0e7175e00..d584f608f8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendNodeSelectionWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendNodeSelectionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendNodeSelectionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendNodeSelectionWindow.h
index 14b44bca27..e3f1e5ca41 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendNodeSelectionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendNodeSelectionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.cpp
index 93d1f43571..3db2dee9f5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.h
index d749d9b1c3..7b888217e5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace2DNodeWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace2DNodeWidget.cpp
index 3e947d77a6..e9470d7291 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace2DNodeWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace2DNodeWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace2DNodeWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace2DNodeWidget.h
index a9e232ac61..c7967c8e87 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace2DNodeWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace2DNodeWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpaceNodeWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpaceNodeWidget.cpp
index 4dbe344d81..82851dcf8c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpaceNodeWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpaceNodeWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpaceNodeWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpaceNodeWidget.h
index 0021bb9f86..e2e89fa04a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpaceNodeWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpaceNodeWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendTreeVisualNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendTreeVisualNode.cpp
index 7a33ab0ec5..6f496fafbd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendTreeVisualNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendTreeVisualNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendTreeVisualNode.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendTreeVisualNode.h
index f919717cf4..c224ccb5ee 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendTreeVisualNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendTreeVisualNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ContextMenu.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ContextMenu.cpp
index ca550f86ce..606d312126 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ContextMenu.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.cpp
index a5b6eb55ae..cc55462b26 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.h
index 25ee2394bf..006dd9610a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
index a9f0af8e29..1761b732b2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.h
index 0c6f7c020c..3a51e63e0d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.cpp
index 005589c983..761500fbdb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.h
index 027724a314..47b1ce39e3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNode.cpp
index 6061178bc1..e8ec055401 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNode.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNode.h
index a44d1f737c..a4129dfdee 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNodeFactory.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNodeFactory.cpp
index 7b916878e4..d22e54bd49 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNodeFactory.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNodeFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNodeFactory.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNodeFactory.h
index 628ae2120a..db94b1a005 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNodeFactory.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphNodeFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphWidgetCallback.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphWidgetCallback.h
index d01fe0136a..9bfa56cea4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphWidgetCallback.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphWidgetCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.cpp
index 7871e9ea81..b323e4eed1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.h
index 7a4744e925..0ff7ec9379 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigateWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.cpp
index 951e3dfe2a..8ec740dff6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.h
index 908be587c5..fb040afa79 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationHistory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.cpp
index ea37c0b1ac..914cafff86 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.h
index 3c55dd8420..3fa1e6c988 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NavigationLinkWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeConnection.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeConnection.cpp
index 854a50b874..62a6a0264e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeConnection.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeConnection.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeConnection.h
index fdf950aa9b..56d22338a4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeConnection.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraph.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraph.cpp
index 353bba9550..9c928d56c5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraph.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraph.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraph.h
index 78bda45652..a7353f4241 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraph.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.cpp
index da28dc0cf7..6ce11c0329 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.h
index 970cc3167e..ce8e1e150c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGraphWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGroupWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGroupWindow.cpp
index 4d3f032f4c..1890c10e8d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGroupWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGroupWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGroupWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGroupWindow.h
index 8232912e76..71a5f2a620 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGroupWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodeGroupWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodePaletteWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodePaletteWidget.cpp
index 2e67d37cb3..2145ee6e0e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodePaletteWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodePaletteWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodePaletteWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodePaletteWidget.h
index 8776636335..3d9d9b1eaf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodePaletteWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/NodePaletteWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterCreateEditDialog.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterCreateEditDialog.cpp
index 1e13e86c93..7b6e33ffee 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterCreateEditDialog.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterCreateEditDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterCreateEditDialog.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterCreateEditDialog.h
index 5def7feb3d..ab8624af21 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterCreateEditDialog.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterCreateEditDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/BoolParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/BoolParameterEditor.cpp
index 2736b5da67..22919eb600 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/BoolParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/BoolParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/BoolParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/BoolParameterEditor.h
index 3fe0b03ec6..b37247fa34 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/BoolParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/BoolParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ColorParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ColorParameterEditor.cpp
index 3e33dac3f5..95d5a708af 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ColorParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ColorParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ColorParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ColorParameterEditor.h
index 8dffd7f438..24652c22b1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ColorParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ColorParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSliderParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSliderParameterEditor.cpp
index fab48afdc5..3df249b57e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSliderParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSliderParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSliderParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSliderParameterEditor.h
index d35ef32007..21f304bb1b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSliderParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSliderParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSpinnerParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSpinnerParameterEditor.cpp
index c49639d451..7cb128d49b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSpinnerParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSpinnerParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSpinnerParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSpinnerParameterEditor.h
index 3368f3c49a..309fc4f0b2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSpinnerParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/FloatSpinnerParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSliderParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSliderParameterEditor.cpp
index 39ad6419ab..63bb0b0fd4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSliderParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSliderParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSliderParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSliderParameterEditor.h
index a9099938f8..5ca3721549 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSliderParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSliderParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSpinnerParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSpinnerParameterEditor.cpp
index 2d5199aba9..f3cb0a395b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSpinnerParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSpinnerParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSpinnerParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSpinnerParameterEditor.h
index f171f6239e..64b0690eaf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSpinnerParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/IntSpinnerParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ParameterEditorFactory.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ParameterEditorFactory.cpp
index 93b9c97f41..779e25136d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ParameterEditorFactory.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ParameterEditorFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ParameterEditorFactory.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ParameterEditorFactory.h
index 3cfcd554d0..f308778d13 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ParameterEditorFactory.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ParameterEditorFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.cpp
index b6d9b060a4..c3d3a6a2ba 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.h
index 48305a367b..1f23e2e981 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/StringParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/StringParameterEditor.cpp
index b6af8070da..002ec3196f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/StringParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/StringParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/StringParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/StringParameterEditor.h
index d76d622f27..2d0581a0b9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/StringParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/StringParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/TagParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/TagParameterEditor.cpp
index 47de30c382..27c9b58a64 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/TagParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/TagParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/TagParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/TagParameterEditor.h
index 8db359bf2c..2924264800 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/TagParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/TagParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ValueParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ValueParameterEditor.cpp
index e497de91a9..7f7172f498 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ValueParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ValueParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ValueParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ValueParameterEditor.h
index c7b6bb092e..acbaa0bf89 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ValueParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/ValueParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector2ParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector2ParameterEditor.cpp
index ac194cc5fd..93f7cc5b43 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector2ParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector2ParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector2ParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector2ParameterEditor.h
index dc8b17bcb9..5ca8304484 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector2ParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector2ParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.cpp
index f3b268c491..9ec1ef5760 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.h
index 3c4cd24584..eff734307c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3ParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3ParameterEditor.cpp
index 19bd3292a2..3477d45caf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3ParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3ParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3ParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3ParameterEditor.h
index 1af71bf0ff..9e1dbb3615 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3ParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3ParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector4ParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector4ParameterEditor.cpp
index 182190d8e9..b2d0f18e47 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector4ParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector4ParameterEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector4ParameterEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector4ParameterEditor.h
index b3b4e39d01..591c4e4642 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector4ParameterEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector4ParameterEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterSelectionWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterSelectionWindow.cpp
index 54c29ef16d..07bda1ec24 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterSelectionWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterSelectionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterSelectionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterSelectionWindow.h
index 9d325eea95..366ef35b5f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterSelectionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterSelectionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWidget.cpp
index a5b52a9aa1..4b78170c13 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWidget.h
index 751c205f7d..b4a85d532e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.cpp
index dd0355b7fd..b2c5ea5677 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.h
index b8af21f5bf..b5ef67bed4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/RoleFilterProxyModel.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/RoleFilterProxyModel.cpp
index 53c302f65c..9698bbec0a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/RoleFilterProxyModel.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/RoleFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/RoleFilterProxyModel.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/RoleFilterProxyModel.h
index dba30234a7..3d1bf44328 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/RoleFilterProxyModel.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/RoleFilterProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/SelectionProxyModel.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/SelectionProxyModel.h
index 6052c453ba..2e47430d2e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/SelectionProxyModel.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/SelectionProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateFilterSelectionWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateFilterSelectionWindow.cpp
index 4dbe5f3198..7443235eb5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateFilterSelectionWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateFilterSelectionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateFilterSelectionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateFilterSelectionWindow.h
index cedce22fda..b5db937459 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateFilterSelectionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateFilterSelectionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateGraphNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateGraphNode.cpp
index bcd6003243..d95f639008 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateGraphNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateGraphNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateGraphNode.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateGraphNode.h
index e22c9d7114..9351bbc58c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateGraphNode.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/StateGraphNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.cpp
index a0d9a28918..b6f6687747 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.h
index df6aef58ed..ebc422b7d3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.cpp
index 932b267816..bbf8466aba 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.h
index 8307dd115e..da5aff76ba 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.cpp
index a2dfdd5e28..98b4609455 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
index df2a079930..845876f14b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -47,7 +47,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Attachments"; }
         uint32 GetClassID() const override                  { return AttachmentsPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.cpp
index 7dadfbba6c..94aac81580 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.h
index f9c10daad7..db5bc0acbf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.cpp
index 8f7badd24f..5c46434631 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -63,7 +63,7 @@ namespace EMStudio
 
     const char* CommandBarPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
     float CommandBarPlugin::GetVersion() const
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.h
index 8396edad4a..677ac77b15 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.cpp
index 06b4f75ef4..ced6aec4b5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.h
index ee29f78fc3..426ac01e8b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -36,7 +36,7 @@ class CommandBrowserPlugin : public EMStudio::DockWidgetPlugin
         const char* GetCompileDate() const      { return MCORE_DATE; }
         const char* GetName() const             { return "Command Browser"; }
         uint32 GetClassID() const               { return CommandBrowserPlugin::CLASS_ID; }
-        const char* GetCreatorName() const      { return "Amazon"; }
+        const char* GetCreatorName() const      { return "O3DE"; }
         float GetVersion() const                { return 1.0f;  }
         bool IsClosable() const                 { return true;  }
         bool IsFloatable() const                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.cpp
index b0fcd19b02..960e84e9f7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.h
index 687ca7b227..bf2cec3a44 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.cpp
index f3c24b749c..14967adcd9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -59,7 +59,7 @@ namespace EMStudio
     // get the creator name
     const char* LogWindowPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.h
index 69c820352a..7cf5746af6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.cpp
index c0c2275777..1998688ade 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.h
index 1cbd25a7c7..71689c790e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetEditWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.cpp
index 29b4a1023b..7bc4509f95 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.h
index 1f349c4e38..1ab6c5e9b6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetGroupWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.cpp
index 3d6ea78bba..a04d69cfdf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h
index 90342e2a95..1d403c003d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -40,7 +40,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Morph Targets"; }
         uint32 GetClassID() const override                  { return MorphTargetsWindowPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.cpp
index 250f9c684a..7928cbf4c3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.h
index ec84cbbd10..23a09f5c47 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/PhonemeSelectionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/EventDataEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/EventDataEditor.cpp
index ff4eaafe3e..4643619cdf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/EventDataEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/EventDataEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/EventDataEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/EventDataEditor.h
index 346c9a7c9c..3052a54402 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/EventDataEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/EventDataEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventEditor.cpp
index f0233e45a2..b6656a72af 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventEditor.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventEditor.h
index 9cdd1779ad..ec86a04e78 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventEditor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetCreateDialog.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetCreateDialog.cpp
index 1b52e500d0..6846389066 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetCreateDialog.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetCreateDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetCreateDialog.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetCreateDialog.h
index 944319245f..8ff66c98d2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetCreateDialog.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetCreateDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetsWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetsWidget.cpp
index d7335f815b..2bc1e6d9ad 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetsWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetsWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetsWidget.h
index 6e7b201b85..6c89a93faa 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetsWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventPresetsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventWidget.cpp
index 1c3a81907c..5c2bd0cbaa 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventWidget.h
index ec095a7f62..b557fb29e9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.cpp
index 68cb11a8a5..4667785530 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h
index e68d88ab32..ddb2bdc932 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -43,7 +43,7 @@ namespace EMStudio
         const char* GetCompileDate() const override     { return MCORE_DATE; }
         const char* GetName() const override            { return "Motion Events"; }
         uint32 GetClassID() const override              { return MotionEventsPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override     { return "Amazon"; }
+        const char* GetCreatorName() const override     { return "O3DE"; }
         float GetVersion() const override               { return 1.0f;  }
         bool GetIsClosable() const override             { return true;  }
         bool GetIsFloatable() const override            { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetManagementWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetManagementWindow.cpp
index 6d9f2cd877..e384558d96 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetManagementWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetManagementWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetManagementWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetManagementWindow.h
index 652b2141b9..5ce486716d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetManagementWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetManagementWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 17342c49eb..75f88d27f3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.h
index 15c8630e7e..e7e7a10d43 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp
index 8e13060f94..c4ae380e9f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
index e4044b4b5d..f78019fa9d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -53,7 +53,7 @@ namespace EMStudio
         const char* GetCompileDate() const override     { return MCORE_DATE; }
         const char* GetName() const override            { return "Motion Sets"; }
         uint32 GetClassID() const override              { return MotionSetsWindowPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override     { return "Amazon"; }
+        const char* GetCreatorName() const override     { return "O3DE"; }
         float GetVersion() const override               { return 1.0f;  }
         bool GetIsClosable() const override             { return true;  }
         bool GetIsFloatable() const override            { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.cpp
index 3c7319fdd2..8c64341507 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h
index 24b0081256..6f085b909d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionListWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionListWindow.cpp
index 131b47e68f..100e2165ec 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionListWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionListWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionListWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionListWindow.h
index 9204a6b4ce..a70f8b1d07 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionListWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionListWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.cpp
index 2394ea950d..e76ecbf57f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.h
index 0668ad0641..e783e561ef 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.cpp
index 37836be175..5695ddc1fd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h
index dbf4d0270c..bc59c4558f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.cpp
index 50a38fc0f9..4c1f43f37f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h
index aa5dcb207a..7679a39219 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -50,7 +50,7 @@ namespace EMStudio
         const char* GetCompileDate() const override     { return MCORE_DATE; }
         const char* GetName() const override            { return "Motions"; }
         uint32 GetClassID() const override              { return MotionWindowPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override     { return "Amazon"; }
+        const char* GetCreatorName() const override     { return "O3DE"; }
         float GetVersion() const override               { return 1.0f;  }
         bool GetIsClosable() const override             { return true;  }
         bool GetIsFloatable() const override            { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupManagementWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupManagementWidget.cpp
index c7eaa03dba..4ff42f1b15 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupManagementWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupManagementWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupManagementWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupManagementWidget.h
index 90162fe28b..50ac7d4bd5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupManagementWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupManagementWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.cpp
index 1e237d80c6..1c9fc191eb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.h
index f7f5869aec..69da9cdb99 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.cpp
index 3314dba580..c6ca0c03ef 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h
index 72cc5655f9..61d23902eb 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -44,7 +44,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Node Groups"; }
         uint32 GetClassID() const override                  { return NodeGroupsPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/ActorInfo.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/ActorInfo.cpp
index 402d8b7263..35dcf5ea40 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/ActorInfo.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/ActorInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/ActorInfo.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/ActorInfo.h
index e98c48a327..92940fabd5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/ActorInfo.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/ActorInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/MeshInfo.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/MeshInfo.cpp
index d23f259510..c5582e7b2a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/MeshInfo.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/MeshInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/MeshInfo.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/MeshInfo.h
index 2649d8ea2b..43afb13a75 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/MeshInfo.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/MeshInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NamedPropertyStringValue.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NamedPropertyStringValue.cpp
index 43f1dc1b1b..c02bfbfb9b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NamedPropertyStringValue.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NamedPropertyStringValue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NamedPropertyStringValue.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NamedPropertyStringValue.h
index 0242dca3fe..9677d5a2af 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NamedPropertyStringValue.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NamedPropertyStringValue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.cpp
index de7828d9ce..6fc544cb66 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.h
index b6fb75c018..90adae75a0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeInfo.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeInfo.cpp
index 070d0e9673..5766cbbd79 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeInfo.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeInfo.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeInfo.h
index 11f2f282c5..cf3f1951ff 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeInfo.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.cpp
index 1fc6e0bfe6..3f18fde9b5 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
index fa7ca5ede4..d82cfd841b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -47,7 +47,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Joint outliner"; }
         uint32 GetClassID() const override                  { return CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/SubMeshInfo.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/SubMeshInfo.cpp
index 8c45737109..638e219fc8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/SubMeshInfo.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/SubMeshInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/SubMeshInfo.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/SubMeshInfo.h
index 3cb6f89436..3b35fa4d9f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/SubMeshInfo.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/SubMeshInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorPropertiesWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorPropertiesWindow.cpp
index f2180e5d19..7f30e6cbff 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorPropertiesWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorPropertiesWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorPropertiesWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorPropertiesWindow.h
index 9b110b3cd7..da8b1ef588 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorPropertiesWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorPropertiesWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 220a9f884c..019973975e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.h
index 1cfa79a676..975c06b198 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/MirrorSetupWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/MirrorSetupWindow.cpp
index b1265ac55b..9f99df9704 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/MirrorSetupWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/MirrorSetupWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/MirrorSetupWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/MirrorSetupWindow.h
index 4a32505ba8..5d3e3f9946 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/MirrorSetupWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/MirrorSetupWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.cpp
index 2a01443c00..d3a4d67d02 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.h
index c8c1f92d1c..179c45ad1b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -75,7 +75,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Actor Manager"; }
         uint32 GetClassID() const override                  { return CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/StandardPluginsConfig.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/StandardPluginsConfig.h
index 2dd5b0ac89..6e3c9bcfd0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/StandardPluginsConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/StandardPluginsConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackControlsGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackControlsGroup.cpp
index 3c48142401..652bdabb19 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackControlsGroup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackControlsGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackControlsGroup.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackControlsGroup.h
index fd689e12c7..ed19999114 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackControlsGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackControlsGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackOptionsGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackOptionsGroup.cpp
index 6fa350bf91..f97f0e5d31 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackOptionsGroup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackOptionsGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackOptionsGroup.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackOptionsGroup.h
index ff8b0d6a66..eb6cc8426c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackOptionsGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/PlaybackOptionsGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/RecorderGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/RecorderGroup.cpp
index b7a4558262..4d2ea0d9b8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/RecorderGroup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/RecorderGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/RecorderGroup.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/RecorderGroup.h
index 12739db942..ae30c2e28e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/RecorderGroup.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/RecorderGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeInfoWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeInfoWidget.cpp
index 99e3cde601..c2690e22dd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeInfoWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeInfoWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeInfoWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeInfoWidget.h
index dd65fb67ad..f9f845ded6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeInfoWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeInfoWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrack.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrack.cpp
index b6ff7fa009..bd7b2542a4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrack.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrack.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrack.h
index f965c6e1a8..4c776a5e73 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrack.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrackElement.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrackElement.cpp
index a647619cd7..4cbfa9acb1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrackElement.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrackElement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrackElement.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrackElement.h
index abd2e58098..df4b7d3951 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrackElement.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeTrackElement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp
index 3439708a8f..b8d6e443cf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -138,7 +138,7 @@ namespace EMStudio
     // get the creator name
     const char* TimeViewPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.h
index b00ebc88bc..ed74710816 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewShared.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewShared.h
index cb4f8f9e95..2ccbfeeb78 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewShared.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewShared.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.cpp
index 23a8360d0f..a8c300a362 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.h
index b7840d3617..c299c75742 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.cpp
index 8e20b1d9e4..478aa126d3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.h
index aade5afe7d..856335189d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/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 8a2ecf39a2..a2a1f811e5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.h
index 5f97cceccc..4ca300ff69 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackHeaderWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackHeaderWidget.cpp
index 8bb6fda380..d5636e6e1d 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackHeaderWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackHeaderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackHeaderWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackHeaderWidget.h
index bdbef2df40..e4a178ac27 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackHeaderWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackHeaderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/standardplugins_files.cmake b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/standardplugins_files.cmake
index 6a66c5eef7..4ec5a171a1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/standardplugins_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/standardplugins_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake b/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake
index 29032431fe..f78bc8dbcd 100644
--- a/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Editor/Platform/Android/EMotionFX_Traits_Android.h b/Gems/EMotionFX/Code/Editor/Platform/Android/EMotionFX_Traits_Android.h
index dfc31a7ba3..681c9018ed 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Android/EMotionFX_Traits_Android.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/Android/EMotionFX_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Android/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Editor/Platform/Android/EMotionFX_Traits_Platform.h
index 8c6415e30e..64add412b1 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Android/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/Android/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Android/platform_android_files.cmake b/Gems/EMotionFX/Code/Editor/Platform/Android/platform_android_files.cmake
index a6fe6a77db..07a8ce2fc2 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Android/platform_android_files.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Editor/Platform/Common/Default/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter_Default.cpp b/Gems/EMotionFX/Code/Editor/Platform/Common/Default/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter_Default.cpp
index 09d1a18064..d26e0c9f52 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Common/Default/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter_Default.cpp
+++ b/Gems/EMotionFX/Code/Editor/Platform/Common/Default/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter_Default.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Linux/EMotionFX_Traits_Linux.h b/Gems/EMotionFX/Code/Editor/Platform/Linux/EMotionFX_Traits_Linux.h
index dfc31a7ba3..681c9018ed 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Linux/EMotionFX_Traits_Linux.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/Linux/EMotionFX_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Linux/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Editor/Platform/Linux/EMotionFX_Traits_Platform.h
index 9a0fe548d3..ce9d5b4cc3 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Linux/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/Linux/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Linux/platform_linux.cmake b/Gems/EMotionFX/Code/Editor/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Linux/platform_linux.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Editor/Platform/Linux/platform_linux_files.cmake b/Gems/EMotionFX/Code/Editor/Platform/Linux/platform_linux_files.cmake
index e2459ccc11..6ed7b68372 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Editor/Platform/Mac/EMotionFX_Traits_Mac.h b/Gems/EMotionFX/Code/Editor/Platform/Mac/EMotionFX_Traits_Mac.h
index 655ac25647..12900b60fa 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Mac/EMotionFX_Traits_Mac.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/Mac/EMotionFX_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Mac/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Editor/Platform/Mac/EMotionFX_Traits_Platform.h
index ab5b209253..b2209cdc80 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Mac/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/Mac/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac.cmake b/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac_files.cmake b/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac_files.cmake
index 3ec6f5c2b4..ca3b544268 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter_Windows.cpp b/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter_Windows.cpp
index a05345bbc7..0da6529ab3 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter_Windows.cpp
+++ b/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX_Traits_Platform.h
index 9571083712..fba200e907 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX_Traits_Windows.h b/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX_Traits_Windows.h
index 38ef21f726..bfd0ca7cd7 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX_Traits_Windows.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/Windows/EMotionFX_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/Windows/platform_windows.cmake b/Gems/EMotionFX/Code/Editor/Platform/Windows/platform_windows.cmake
index 1e6ff91a50..8044aaf717 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Windows/platform_windows.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Editor/Platform/Windows/platform_windows_files.cmake b/Gems/EMotionFX/Code/Editor/Platform/Windows/platform_windows_files.cmake
index 2916d216a5..14aafca297 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Editor/Platform/iOS/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Editor/Platform/iOS/EMotionFX_Traits_Platform.h
index 7be159dae3..0e2d3c5198 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/iOS/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/iOS/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/iOS/EMotionFX_Traits_iOS.h b/Gems/EMotionFX/Code/Editor/Platform/iOS/EMotionFX_Traits_iOS.h
index dfc31a7ba3..681c9018ed 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/iOS/EMotionFX_Traits_iOS.h
+++ b/Gems/EMotionFX/Code/Editor/Platform/iOS/EMotionFX_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Editor/Platform/iOS/platform_ios_files.cmake b/Gems/EMotionFX/Code/Editor/Platform/iOS/platform_ios_files.cmake
index ea4e92ad2a..487a3b694f 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Include/Integration/ActorComponentBus.h b/Gems/EMotionFX/Code/Include/Integration/ActorComponentBus.h
index 48537da363..c1680d5a90 100644
--- a/Gems/EMotionFX/Code/Include/Integration/ActorComponentBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/ActorComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Include/Integration/AnimAudioComponentBus.h b/Gems/EMotionFX/Code/Include/Integration/AnimAudioComponentBus.h
index cc6d6802be..30516d10cc 100644
--- a/Gems/EMotionFX/Code/Include/Integration/AnimAudioComponentBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/AnimAudioComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Include/Integration/AnimGraphComponentBus.h b/Gems/EMotionFX/Code/Include/Integration/AnimGraphComponentBus.h
index 87aae39a82..c1d35b887b 100644
--- a/Gems/EMotionFX/Code/Include/Integration/AnimGraphComponentBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/AnimGraphComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Include/Integration/AnimGraphNetworkingBus.h b/Gems/EMotionFX/Code/Include/Integration/AnimGraphNetworkingBus.h
index f3b5e010e2..860cc4fe6f 100644
--- a/Gems/EMotionFX/Code/Include/Integration/AnimGraphNetworkingBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/AnimGraphNetworkingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Include/Integration/AnimationBus.h b/Gems/EMotionFX/Code/Include/Integration/AnimationBus.h
index f00748dd80..afccb5f1cb 100644
--- a/Gems/EMotionFX/Code/Include/Integration/AnimationBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/AnimationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Include/Integration/EMotionFXBus.h b/Gems/EMotionFX/Code/Include/Integration/EMotionFXBus.h
index d4ddba2538..bb80e43fa0 100644
--- a/Gems/EMotionFX/Code/Include/Integration/EMotionFXBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/EMotionFXBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Include/Integration/EditorSimpleMotionComponentBus.h b/Gems/EMotionFX/Code/Include/Integration/EditorSimpleMotionComponentBus.h
index 98889d75b4..cb20cc0bfa 100644
--- a/Gems/EMotionFX/Code/Include/Integration/EditorSimpleMotionComponentBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/EditorSimpleMotionComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Include/Integration/MotionExtractionBus.h b/Gems/EMotionFX/Code/Include/Integration/MotionExtractionBus.h
index ef366876d5..877f8899fb 100644
--- a/Gems/EMotionFX/Code/Include/Integration/MotionExtractionBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/MotionExtractionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Include/Integration/SimpleMotionComponentBus.h b/Gems/EMotionFX/Code/Include/Integration/SimpleMotionComponentBus.h
index e8dd3d214c..fb75a165a6 100644
--- a/Gems/EMotionFX/Code/Include/Integration/SimpleMotionComponentBus.h
+++ b/Gems/EMotionFX/Code/Include/Integration/SimpleMotionComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AABB.h b/Gems/EMotionFX/Code/MCore/Source/AABB.h
index 0c40cd0aa2..8bce886df3 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AABB.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AABB.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AbstractData.h b/Gems/EMotionFX/Code/MCore/Source/AbstractData.h
index e6a580c721..0d786faeee 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AbstractData.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AbstractData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp b/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp
index 6a7ad6b470..fe4c757238 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Algorithms.h b/Gems/EMotionFX/Code/MCore/Source/Algorithms.h
index 5e7df83ae6..7883ac426a 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Algorithms.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Algorithms.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Algorithms.inl b/Gems/EMotionFX/Code/MCore/Source/Algorithms.inl
index 62540f9267..14dc47fbf2 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Algorithms.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/Algorithms.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AlignedArray.h b/Gems/EMotionFX/Code/MCore/Source/AlignedArray.h
index 921c1c3ddd..c6657edb65 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AlignedArray.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AlignedArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Array.h b/Gems/EMotionFX/Code/MCore/Source/Array.h
index f9ae7ff9b2..049e730f3e 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Array.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Array.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Array2D.h b/Gems/EMotionFX/Code/MCore/Source/Array2D.h
index 53c13b5c7e..2872e9a74b 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Array2D.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Array2D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Array2D.inl b/Gems/EMotionFX/Code/MCore/Source/Array2D.inl
index 0d814a0777..455e4aeb67 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Array2D.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/Array2D.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Attribute.cpp b/Gems/EMotionFX/Code/MCore/Source/Attribute.cpp
index 7a9f3df056..b08e5086b5 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Attribute.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Attribute.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Attribute.h b/Gems/EMotionFX/Code/MCore/Source/Attribute.h
index c520a3fd0e..6a37d6cd54 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Attribute.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Attribute.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeAllocator.cpp b/Gems/EMotionFX/Code/MCore/Source/AttributeAllocator.cpp
index a6396684e4..58e539ed02 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeAllocator.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeAllocator.h b/Gems/EMotionFX/Code/MCore/Source/AttributeAllocator.h
index 3c2708c629..3a3aac1e41 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeAllocator.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeBool.cpp b/Gems/EMotionFX/Code/MCore/Source/AttributeBool.cpp
index 32ea8e4cfe..08981b83bf 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeBool.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeBool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeBool.h b/Gems/EMotionFX/Code/MCore/Source/AttributeBool.h
index 2b23fd73df..90defccd0a 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeBool.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeBool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeColor.h b/Gems/EMotionFX/Code/MCore/Source/AttributeColor.h
index 4d3be0a650..4ed13f7cd6 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeColor.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeColor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeCreateFunctions.cpp b/Gems/EMotionFX/Code/MCore/Source/AttributeCreateFunctions.cpp
index 5de24599f9..fc56d3d3a8 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeCreateFunctions.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeCreateFunctions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeFactory.cpp b/Gems/EMotionFX/Code/MCore/Source/AttributeFactory.cpp
index d017181fc0..a3a33533dc 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeFactory.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeFactory.h b/Gems/EMotionFX/Code/MCore/Source/AttributeFactory.h
index 704fce407b..2e801edc17 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeFactory.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeFloat.cpp b/Gems/EMotionFX/Code/MCore/Source/AttributeFloat.cpp
index 879b3fdd8c..c143d5a78b 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeFloat.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeFloat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeFloat.h b/Gems/EMotionFX/Code/MCore/Source/AttributeFloat.h
index b5ab5fb5e0..cfb81bdb78 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeFloat.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeFloat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeInt32.cpp b/Gems/EMotionFX/Code/MCore/Source/AttributeInt32.cpp
index cba5f3b580..a8d5d8cf08 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeInt32.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeInt32.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeInt32.h b/Gems/EMotionFX/Code/MCore/Source/AttributeInt32.h
index 6e92462e2a..ad0f235920 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeInt32.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeInt32.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributePointer.h b/Gems/EMotionFX/Code/MCore/Source/AttributePointer.h
index 851c8cfc7c..6323cfffc5 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributePointer.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributePointer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeQuaternion.h b/Gems/EMotionFX/Code/MCore/Source/AttributeQuaternion.h
index 15564ea43e..1030189828 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeQuaternion.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeQuaternion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeString.h b/Gems/EMotionFX/Code/MCore/Source/AttributeString.h
index 0b8a31b322..2487c862c0 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeString.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeString.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeVector2.h b/Gems/EMotionFX/Code/MCore/Source/AttributeVector2.h
index e1bb761fca..475251fb01 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeVector2.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeVector2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeVector3.h b/Gems/EMotionFX/Code/MCore/Source/AttributeVector3.h
index 706acc168a..c11af6580d 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeVector3.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeVector3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AttributeVector4.h b/Gems/EMotionFX/Code/MCore/Source/AttributeVector4.h
index a115bdd158..e851ad89cc 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AttributeVector4.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AttributeVector4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/AzCoreConversions.h b/Gems/EMotionFX/Code/MCore/Source/AzCoreConversions.h
index d2cf268215..7060545640 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AzCoreConversions.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AzCoreConversions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/BoundingSphere.cpp b/Gems/EMotionFX/Code/MCore/Source/BoundingSphere.cpp
index 42c19a0711..bde3dd321d 100644
--- a/Gems/EMotionFX/Code/MCore/Source/BoundingSphere.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/BoundingSphere.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/BoundingSphere.h b/Gems/EMotionFX/Code/MCore/Source/BoundingSphere.h
index 25381ec794..d7ed80b7f0 100644
--- a/Gems/EMotionFX/Code/MCore/Source/BoundingSphere.h
+++ b/Gems/EMotionFX/Code/MCore/Source/BoundingSphere.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Color.cpp b/Gems/EMotionFX/Code/MCore/Source/Color.cpp
index 505767a638..da4a121199 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Color.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Color.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Color.h b/Gems/EMotionFX/Code/MCore/Source/Color.h
index 7d4635f08a..af5e202350 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Color.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Color.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Command.cpp b/Gems/EMotionFX/Code/MCore/Source/Command.cpp
index b4f6abf4df..f67e4e03a6 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Command.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Command.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Command.h b/Gems/EMotionFX/Code/MCore/Source/Command.h
index e0998a2396..6069771aa2 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Command.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Command.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CommandGroup.cpp b/Gems/EMotionFX/Code/MCore/Source/CommandGroup.cpp
index 7463d8f840..e16cfd0a9c 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CommandGroup.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/CommandGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CommandGroup.h b/Gems/EMotionFX/Code/MCore/Source/CommandGroup.h
index 7246f22364..27b400d199 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CommandGroup.h
+++ b/Gems/EMotionFX/Code/MCore/Source/CommandGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CommandLine.cpp b/Gems/EMotionFX/Code/MCore/Source/CommandLine.cpp
index aa61dc92b9..a018a93e75 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CommandLine.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/CommandLine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CommandLine.h b/Gems/EMotionFX/Code/MCore/Source/CommandLine.h
index 85dd47bad9..863dcb5faf 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CommandLine.h
+++ b/Gems/EMotionFX/Code/MCore/Source/CommandLine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CommandManagerCallback.h b/Gems/EMotionFX/Code/MCore/Source/CommandManagerCallback.h
index 776140df41..7602b77564 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CommandManagerCallback.h
+++ b/Gems/EMotionFX/Code/MCore/Source/CommandManagerCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CommandSyntax.cpp b/Gems/EMotionFX/Code/MCore/Source/CommandSyntax.cpp
index e9aadf3aff..db80e85a00 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CommandSyntax.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/CommandSyntax.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CommandSyntax.h b/Gems/EMotionFX/Code/MCore/Source/CommandSyntax.h
index 92ac9ec403..0655fa8d42 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CommandSyntax.h
+++ b/Gems/EMotionFX/Code/MCore/Source/CommandSyntax.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Compare.h b/Gems/EMotionFX/Code/MCore/Source/Compare.h
index cedecace91..5fe4c7d6c6 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Compare.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Compare.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Compare.inl b/Gems/EMotionFX/Code/MCore/Source/Compare.inl
index e7dd845a6c..71fdac2c8b 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Compare.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/Compare.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CompressedFloat.h b/Gems/EMotionFX/Code/MCore/Source/CompressedFloat.h
index 44fcd4cfc7..6c2425452b 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CompressedFloat.h
+++ b/Gems/EMotionFX/Code/MCore/Source/CompressedFloat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CompressedFloat.inl b/Gems/EMotionFX/Code/MCore/Source/CompressedFloat.inl
index 105e73a8a4..15e98aa561 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CompressedFloat.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/CompressedFloat.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.h b/Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.h
index 2d5652cac6..56fdd461e1 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.h
+++ b/Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.inl b/Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.inl
index e25c536d62..c2be07f54a 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CompressedVector.h b/Gems/EMotionFX/Code/MCore/Source/CompressedVector.h
index 1bcdd45b8f..082e9c4186 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CompressedVector.h
+++ b/Gems/EMotionFX/Code/MCore/Source/CompressedVector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/CompressedVector.inl b/Gems/EMotionFX/Code/MCore/Source/CompressedVector.inl
index fefa516e7a..d00de5c19b 100644
--- a/Gems/EMotionFX/Code/MCore/Source/CompressedVector.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/CompressedVector.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Config.h b/Gems/EMotionFX/Code/MCore/Source/Config.h
index a3c0aba4eb..0865bfe859 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Config.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/DelaunayTriangulator.cpp b/Gems/EMotionFX/Code/MCore/Source/DelaunayTriangulator.cpp
index 38326a91d0..1070053af6 100644
--- a/Gems/EMotionFX/Code/MCore/Source/DelaunayTriangulator.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/DelaunayTriangulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/DelaunayTriangulator.h b/Gems/EMotionFX/Code/MCore/Source/DelaunayTriangulator.h
index 2f14ef02f2..699ed8eaa1 100644
--- a/Gems/EMotionFX/Code/MCore/Source/DelaunayTriangulator.h
+++ b/Gems/EMotionFX/Code/MCore/Source/DelaunayTriangulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/DiskFile.cpp b/Gems/EMotionFX/Code/MCore/Source/DiskFile.cpp
index 19eec217db..4eca4362a8 100644
--- a/Gems/EMotionFX/Code/MCore/Source/DiskFile.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/DiskFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/DiskFile.h b/Gems/EMotionFX/Code/MCore/Source/DiskFile.h
index 2da807f088..a96a2a35c4 100644
--- a/Gems/EMotionFX/Code/MCore/Source/DiskFile.h
+++ b/Gems/EMotionFX/Code/MCore/Source/DiskFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Distance.cpp b/Gems/EMotionFX/Code/MCore/Source/Distance.cpp
index ac441428a5..8f5982f0e4 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Distance.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Distance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Distance.h b/Gems/EMotionFX/Code/MCore/Source/Distance.h
index 02ef8c00bc..60156d332b 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Distance.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Distance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.cpp b/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.cpp
index c04aececf5..b253a79c57 100644
--- a/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.h b/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.h
index 8f7470c279..3e90f60927 100644
--- a/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.h
+++ b/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.inl b/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.inl
index 6cfeee8ca1..61bfefb780 100644
--- a/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/DualQuaternion.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Endian.h b/Gems/EMotionFX/Code/MCore/Source/Endian.h
index 79d1e95c22..cf858cbff1 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Endian.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Endian.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Endian.inl b/Gems/EMotionFX/Code/MCore/Source/Endian.inl
index 47cada1f38..5a97ae4ddc 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Endian.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/Endian.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/FastMath.cpp b/Gems/EMotionFX/Code/MCore/Source/FastMath.cpp
index 6cb9c0f08e..4a0a82be10 100644
--- a/Gems/EMotionFX/Code/MCore/Source/FastMath.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/FastMath.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/FastMath.h b/Gems/EMotionFX/Code/MCore/Source/FastMath.h
index f6f137bfac..25a7c98869 100644
--- a/Gems/EMotionFX/Code/MCore/Source/FastMath.h
+++ b/Gems/EMotionFX/Code/MCore/Source/FastMath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/FastMath.inl b/Gems/EMotionFX/Code/MCore/Source/FastMath.inl
index 3841681bcd..bb969c23a1 100644
--- a/Gems/EMotionFX/Code/MCore/Source/FastMath.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/FastMath.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/File.h b/Gems/EMotionFX/Code/MCore/Source/File.h
index e8e547c7f8..ad8d89f470 100644
--- a/Gems/EMotionFX/Code/MCore/Source/File.h
+++ b/Gems/EMotionFX/Code/MCore/Source/File.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/FileSystem.cpp b/Gems/EMotionFX/Code/MCore/Source/FileSystem.cpp
index d11e467a72..27a1d8e295 100644
--- a/Gems/EMotionFX/Code/MCore/Source/FileSystem.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/FileSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/FileSystem.h b/Gems/EMotionFX/Code/MCore/Source/FileSystem.h
index adf7df91c7..39a0d4103d 100644
--- a/Gems/EMotionFX/Code/MCore/Source/FileSystem.h
+++ b/Gems/EMotionFX/Code/MCore/Source/FileSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/HashFunctions.h b/Gems/EMotionFX/Code/MCore/Source/HashFunctions.h
index 70ec15733d..311f164945 100644
--- a/Gems/EMotionFX/Code/MCore/Source/HashFunctions.h
+++ b/Gems/EMotionFX/Code/MCore/Source/HashFunctions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/HashTable.h b/Gems/EMotionFX/Code/MCore/Source/HashTable.h
index 73db3b8834..eb631cb12d 100644
--- a/Gems/EMotionFX/Code/MCore/Source/HashTable.h
+++ b/Gems/EMotionFX/Code/MCore/Source/HashTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/HashTable.inl b/Gems/EMotionFX/Code/MCore/Source/HashTable.inl
index 4f2aae6264..578911930d 100644
--- a/Gems/EMotionFX/Code/MCore/Source/HashTable.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/HashTable.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/IDGenerator.cpp b/Gems/EMotionFX/Code/MCore/Source/IDGenerator.cpp
index 08f1e91b54..8d34d9b37e 100644
--- a/Gems/EMotionFX/Code/MCore/Source/IDGenerator.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/IDGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/IDGenerator.h b/Gems/EMotionFX/Code/MCore/Source/IDGenerator.h
index bcadda4158..225313e1a3 100644
--- a/Gems/EMotionFX/Code/MCore/Source/IDGenerator.h
+++ b/Gems/EMotionFX/Code/MCore/Source/IDGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/LogManager.cpp b/Gems/EMotionFX/Code/MCore/Source/LogManager.cpp
index b198a8c1db..e7c38bb73a 100644
--- a/Gems/EMotionFX/Code/MCore/Source/LogManager.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/LogManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/LogManager.h b/Gems/EMotionFX/Code/MCore/Source/LogManager.h
index 503429d036..06b11dbf7f 100644
--- a/Gems/EMotionFX/Code/MCore/Source/LogManager.h
+++ b/Gems/EMotionFX/Code/MCore/Source/LogManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MCoreCommandManager.cpp b/Gems/EMotionFX/Code/MCore/Source/MCoreCommandManager.cpp
index 53d97b150e..1b82c48981 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MCoreCommandManager.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/MCoreCommandManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MCoreCommandManager.h b/Gems/EMotionFX/Code/MCore/Source/MCoreCommandManager.h
index 9fe2a7e5be..2b447ca4e8 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MCoreCommandManager.h
+++ b/Gems/EMotionFX/Code/MCore/Source/MCoreCommandManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MCoreSystem.cpp b/Gems/EMotionFX/Code/MCore/Source/MCoreSystem.cpp
index f4e85e6b70..2f2a3359cd 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MCoreSystem.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/MCoreSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MCoreSystem.h b/Gems/EMotionFX/Code/MCore/Source/MCoreSystem.h
index b55271960a..e8120a66a9 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MCoreSystem.h
+++ b/Gems/EMotionFX/Code/MCore/Source/MCoreSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Macros.h b/Gems/EMotionFX/Code/MCore/Source/Macros.h
index 6c9d92f8c8..a2a115eda7 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Macros.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Macros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Matrix4.cpp b/Gems/EMotionFX/Code/MCore/Source/Matrix4.cpp
index 3bc2ac7b51..0436d79dfd 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Matrix4.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Matrix4.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Matrix4.h b/Gems/EMotionFX/Code/MCore/Source/Matrix4.h
index 59cc8c4b75..0a4650c187 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Matrix4.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Matrix4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Matrix4.inl b/Gems/EMotionFX/Code/MCore/Source/Matrix4.inl
index f100c4f394..da3d1e274b 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Matrix4.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/Matrix4.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryCategoriesCore.h b/Gems/EMotionFX/Code/MCore/Source/MemoryCategoriesCore.h
index eb17de3ca1..672e3a5f4b 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryCategoriesCore.h
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryCategoriesCore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryFile.cpp b/Gems/EMotionFX/Code/MCore/Source/MemoryFile.cpp
index bc4c38221c..f7c3d9dd0f 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryFile.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryFile.h b/Gems/EMotionFX/Code/MCore/Source/MemoryFile.h
index 86db94e243..2bfab3dd65 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryFile.h
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryManager.cpp b/Gems/EMotionFX/Code/MCore/Source/MemoryManager.cpp
index 4102a6cf95..14cc1168c4 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryManager.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryManager.h b/Gems/EMotionFX/Code/MCore/Source/MemoryManager.h
index facb519587..233195f552 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryManager.h
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryObject.cpp b/Gems/EMotionFX/Code/MCore/Source/MemoryObject.cpp
index 247f488bc1..4e3130defb 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryObject.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryObject.h b/Gems/EMotionFX/Code/MCore/Source/MemoryObject.h
index 3eec186b1d..a3e77d6dd5 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryObject.h
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryTracker.cpp b/Gems/EMotionFX/Code/MCore/Source/MemoryTracker.cpp
index af2dd9a8c7..6f206229ae 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryTracker.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MemoryTracker.h b/Gems/EMotionFX/Code/MCore/Source/MemoryTracker.h
index 00386a2ff4..967cca1de9 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MemoryTracker.h
+++ b/Gems/EMotionFX/Code/MCore/Source/MemoryTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/MultiThreadManager.h b/Gems/EMotionFX/Code/MCore/Source/MultiThreadManager.h
index e84cdcfe5b..27755dddbb 100644
--- a/Gems/EMotionFX/Code/MCore/Source/MultiThreadManager.h
+++ b/Gems/EMotionFX/Code/MCore/Source/MultiThreadManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/OBB.cpp b/Gems/EMotionFX/Code/MCore/Source/OBB.cpp
index 2ae27fcb1f..8ee36f5c7f 100644
--- a/Gems/EMotionFX/Code/MCore/Source/OBB.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/OBB.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/OBB.h b/Gems/EMotionFX/Code/MCore/Source/OBB.h
index db06cf6279..a3e29ceae1 100644
--- a/Gems/EMotionFX/Code/MCore/Source/OBB.h
+++ b/Gems/EMotionFX/Code/MCore/Source/OBB.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/OBB.inl b/Gems/EMotionFX/Code/MCore/Source/OBB.inl
index 21ea02bb45..25e08f0ef3 100644
--- a/Gems/EMotionFX/Code/MCore/Source/OBB.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/OBB.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/PlaneEq.cpp b/Gems/EMotionFX/Code/MCore/Source/PlaneEq.cpp
index 3cd864fe22..e80ad51387 100644
--- a/Gems/EMotionFX/Code/MCore/Source/PlaneEq.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/PlaneEq.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/PlaneEq.h b/Gems/EMotionFX/Code/MCore/Source/PlaneEq.h
index eb68bf750a..1d788379ae 100644
--- a/Gems/EMotionFX/Code/MCore/Source/PlaneEq.h
+++ b/Gems/EMotionFX/Code/MCore/Source/PlaneEq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/PlaneEq.inl b/Gems/EMotionFX/Code/MCore/Source/PlaneEq.inl
index eb46ade7bd..daeabd76ad 100644
--- a/Gems/EMotionFX/Code/MCore/Source/PlaneEq.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/PlaneEq.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Quaternion.cpp b/Gems/EMotionFX/Code/MCore/Source/Quaternion.cpp
index c260863efd..f00ece7b12 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Quaternion.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Quaternion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Quaternion.h b/Gems/EMotionFX/Code/MCore/Source/Quaternion.h
index 7482e450ce..9fbe8ddd4a 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Quaternion.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Quaternion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Quaternion.inl b/Gems/EMotionFX/Code/MCore/Source/Quaternion.inl
index 6c7803b28c..62cafdc383 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Quaternion.inl
+++ b/Gems/EMotionFX/Code/MCore/Source/Quaternion.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Random.cpp b/Gems/EMotionFX/Code/MCore/Source/Random.cpp
index 411f319710..6a5f891152 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Random.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Random.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Random.h b/Gems/EMotionFX/Code/MCore/Source/Random.h
index a01fbbb3c0..6a51f50192 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Random.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Random.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Ray.cpp b/Gems/EMotionFX/Code/MCore/Source/Ray.cpp
index acd1385ede..1d60078a5e 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Ray.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Ray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Ray.h b/Gems/EMotionFX/Code/MCore/Source/Ray.h
index 0f9816be1e..5a90875908 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Ray.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Ray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/ReflectionSerializer.cpp b/Gems/EMotionFX/Code/MCore/Source/ReflectionSerializer.cpp
index 5e90bf0045..3a8690c4e5 100644
--- a/Gems/EMotionFX/Code/MCore/Source/ReflectionSerializer.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/ReflectionSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/ReflectionSerializer.h b/Gems/EMotionFX/Code/MCore/Source/ReflectionSerializer.h
index b15294b7c1..19ef90f8bc 100644
--- a/Gems/EMotionFX/Code/MCore/Source/ReflectionSerializer.h
+++ b/Gems/EMotionFX/Code/MCore/Source/ReflectionSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/SmallArray.h b/Gems/EMotionFX/Code/MCore/Source/SmallArray.h
index 66bd827258..28522fab09 100644
--- a/Gems/EMotionFX/Code/MCore/Source/SmallArray.h
+++ b/Gems/EMotionFX/Code/MCore/Source/SmallArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/StandardHeaders.h b/Gems/EMotionFX/Code/MCore/Source/StandardHeaders.h
index 56f85b2201..b408f3dc4e 100644
--- a/Gems/EMotionFX/Code/MCore/Source/StandardHeaders.h
+++ b/Gems/EMotionFX/Code/MCore/Source/StandardHeaders.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/StaticAllocator.cpp b/Gems/EMotionFX/Code/MCore/Source/StaticAllocator.cpp
index 204de39c0e..538337e9b7 100644
--- a/Gems/EMotionFX/Code/MCore/Source/StaticAllocator.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/StaticAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/StaticAllocator.h b/Gems/EMotionFX/Code/MCore/Source/StaticAllocator.h
index 119e52d6c9..4f4c7e6644 100644
--- a/Gems/EMotionFX/Code/MCore/Source/StaticAllocator.h
+++ b/Gems/EMotionFX/Code/MCore/Source/StaticAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/StaticString.h b/Gems/EMotionFX/Code/MCore/Source/StaticString.h
index dbb89e2a5e..2bf8725c98 100644
--- a/Gems/EMotionFX/Code/MCore/Source/StaticString.h
+++ b/Gems/EMotionFX/Code/MCore/Source/StaticString.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Stream.h b/Gems/EMotionFX/Code/MCore/Source/Stream.h
index 8b6137ec70..7b1a882fb1 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Stream.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/StringConversions.cpp b/Gems/EMotionFX/Code/MCore/Source/StringConversions.cpp
index 88180fd4a6..a95ed3dee2 100644
--- a/Gems/EMotionFX/Code/MCore/Source/StringConversions.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/StringConversions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/StringConversions.h b/Gems/EMotionFX/Code/MCore/Source/StringConversions.h
index 4e5097aa24..d33a4a945e 100644
--- a/Gems/EMotionFX/Code/MCore/Source/StringConversions.h
+++ b/Gems/EMotionFX/Code/MCore/Source/StringConversions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/StringIdPool.cpp b/Gems/EMotionFX/Code/MCore/Source/StringIdPool.cpp
index eef8f224d6..c771c631a5 100644
--- a/Gems/EMotionFX/Code/MCore/Source/StringIdPool.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/StringIdPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/StringIdPool.h b/Gems/EMotionFX/Code/MCore/Source/StringIdPool.h
index 971b6685fb..0f3f29b009 100644
--- a/Gems/EMotionFX/Code/MCore/Source/StringIdPool.h
+++ b/Gems/EMotionFX/Code/MCore/Source/StringIdPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/TriangleListOptimizer.h b/Gems/EMotionFX/Code/MCore/Source/TriangleListOptimizer.h
index 507cf74cb1..d31fe41598 100644
--- a/Gems/EMotionFX/Code/MCore/Source/TriangleListOptimizer.h
+++ b/Gems/EMotionFX/Code/MCore/Source/TriangleListOptimizer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/Source/Vector.h b/Gems/EMotionFX/Code/MCore/Source/Vector.h
index 28f4b8a8b1..fe34182791 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Vector.h
+++ b/Gems/EMotionFX/Code/MCore/Source/Vector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MCore/mcore_files.cmake b/Gems/EMotionFX/Code/MCore/mcore_files.cmake
index 0171d27175..ac588d59a6 100644
--- a/Gems/EMotionFX/Code/MCore/mcore_files.cmake
+++ b/Gems/EMotionFX/Code/MCore/mcore_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp
index d6714da05c..28b6667fcf 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp
+++ b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h
index daff33ffae..d3512c1021 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.cpp b/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.cpp
index 727372daeb..f2814a5d80 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.cpp
+++ b/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.h b/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.h
index 80ef8cc6fb..dd3e9d3e5a 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/KeyboardShortcutManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/Source/MysticQtConfig.h b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtConfig.h
index db42673ee8..65e5042549 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/MysticQtConfig.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.cpp b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.cpp
index 472fb0677e..005e1ff07b 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.cpp
+++ b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.h b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.h
index b0e08fa130..850a7db0f4 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.cpp b/Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.cpp
index d4af4aab45..0e975d026c 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.cpp
+++ b/Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.h b/Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.h
index d145089fa2..02959e82a6 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/MysticQt/mysticqt_files.cmake b/Gems/EMotionFX/Code/MysticQt/mysticqt_files.cmake
index 7fe6b8654d..eb82993ad6 100644
--- a/Gems/EMotionFX/Code/MysticQt/mysticqt_files.cmake
+++ b/Gems/EMotionFX/Code/MysticQt/mysticqt_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/Android/EMotionFX_Traits_Android.h b/Gems/EMotionFX/Code/Platform/Android/EMotionFX_Traits_Android.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/EMotionFX/Code/Platform/Android/EMotionFX_Traits_Android.h
+++ b/Gems/EMotionFX/Code/Platform/Android/EMotionFX_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Android/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Platform/Android/EMotionFX_Traits_Platform.h
index 8c6415e30e..64add412b1 100644
--- a/Gems/EMotionFX/Code/Platform/Android/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Platform/Android/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Android/platform_android.cmake b/Gems/EMotionFX/Code/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/EMotionFX/Code/Platform/Android/platform_android.cmake
+++ b/Gems/EMotionFX/Code/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/Android/platform_android_files.cmake b/Gems/EMotionFX/Code/Platform/Android/platform_android_files.cmake
index 897d1b3d6b..baeed2321f 100644
--- a/Gems/EMotionFX/Code/Platform/Android/platform_android_files.cmake
+++ b/Gems/EMotionFX/Code/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/Common/FileOffsetType/MCore/Source/DiskFile_FileOffsetType.cpp b/Gems/EMotionFX/Code/Platform/Common/FileOffsetType/MCore/Source/DiskFile_FileOffsetType.cpp
index 73eda994cb..47c57bd137 100644
--- a/Gems/EMotionFX/Code/Platform/Common/FileOffsetType/MCore/Source/DiskFile_FileOffsetType.cpp
+++ b/Gems/EMotionFX/Code/Platform/Common/FileOffsetType/MCore/Source/DiskFile_FileOffsetType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Common/WinAPI/MCore/Source/DiskFile_WinAPI.cpp b/Gems/EMotionFX/Code/Platform/Common/WinAPI/MCore/Source/DiskFile_WinAPI.cpp
index 6cb359dd8b..b784a8943b 100644
--- a/Gems/EMotionFX/Code/Platform/Common/WinAPI/MCore/Source/DiskFile_WinAPI.cpp
+++ b/Gems/EMotionFX/Code/Platform/Common/WinAPI/MCore/Source/DiskFile_WinAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Linux/EMotionFX_Traits_Linux.h b/Gems/EMotionFX/Code/Platform/Linux/EMotionFX_Traits_Linux.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/EMotionFX/Code/Platform/Linux/EMotionFX_Traits_Linux.h
+++ b/Gems/EMotionFX/Code/Platform/Linux/EMotionFX_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Linux/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Platform/Linux/EMotionFX_Traits_Platform.h
index 9a0fe548d3..ce9d5b4cc3 100644
--- a/Gems/EMotionFX/Code/Platform/Linux/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Platform/Linux/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Linux/platform_linux.cmake b/Gems/EMotionFX/Code/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/EMotionFX/Code/Platform/Linux/platform_linux.cmake
+++ b/Gems/EMotionFX/Code/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/Linux/platform_linux_files.cmake b/Gems/EMotionFX/Code/Platform/Linux/platform_linux_files.cmake
index 897d1b3d6b..baeed2321f 100644
--- a/Gems/EMotionFX/Code/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/EMotionFX/Code/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/Mac/EMotionFX_Traits_Mac.h b/Gems/EMotionFX/Code/Platform/Mac/EMotionFX_Traits_Mac.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/EMotionFX/Code/Platform/Mac/EMotionFX_Traits_Mac.h
+++ b/Gems/EMotionFX/Code/Platform/Mac/EMotionFX_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Mac/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Platform/Mac/EMotionFX_Traits_Platform.h
index ab5b209253..b2209cdc80 100644
--- a/Gems/EMotionFX/Code/Platform/Mac/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Platform/Mac/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Mac/platform_mac.cmake b/Gems/EMotionFX/Code/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/EMotionFX/Code/Platform/Mac/platform_mac.cmake
+++ b/Gems/EMotionFX/Code/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/Mac/platform_mac_files.cmake b/Gems/EMotionFX/Code/Platform/Mac/platform_mac_files.cmake
index 897d1b3d6b..baeed2321f 100644
--- a/Gems/EMotionFX/Code/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/EMotionFX/Code/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/Windows/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Platform/Windows/EMotionFX_Traits_Platform.h
index 9571083712..fba200e907 100644
--- a/Gems/EMotionFX/Code/Platform/Windows/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Platform/Windows/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Windows/EMotionFX_Traits_Windows.h b/Gems/EMotionFX/Code/Platform/Windows/EMotionFX_Traits_Windows.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/EMotionFX/Code/Platform/Windows/EMotionFX_Traits_Windows.h
+++ b/Gems/EMotionFX/Code/Platform/Windows/EMotionFX_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/Windows/platform_windows.cmake b/Gems/EMotionFX/Code/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/EMotionFX/Code/Platform/Windows/platform_windows.cmake
+++ b/Gems/EMotionFX/Code/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/Windows/platform_windows_files.cmake b/Gems/EMotionFX/Code/Platform/Windows/platform_windows_files.cmake
index cfdb7ea449..aac92b38c8 100644
--- a/Gems/EMotionFX/Code/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/EMotionFX/Code/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/iOS/EMotionFX_Traits_Platform.h b/Gems/EMotionFX/Code/Platform/iOS/EMotionFX_Traits_Platform.h
index 7be159dae3..0e2d3c5198 100644
--- a/Gems/EMotionFX/Code/Platform/iOS/EMotionFX_Traits_Platform.h
+++ b/Gems/EMotionFX/Code/Platform/iOS/EMotionFX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/iOS/EMotionFX_Traits_iOS.h b/Gems/EMotionFX/Code/Platform/iOS/EMotionFX_Traits_iOS.h
index 7f7ea5181a..8e79c044b5 100644
--- a/Gems/EMotionFX/Code/Platform/iOS/EMotionFX_Traits_iOS.h
+++ b/Gems/EMotionFX/Code/Platform/iOS/EMotionFX_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Platform/iOS/platform_ios.cmake b/Gems/EMotionFX/Code/Platform/iOS/platform_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/EMotionFX/Code/Platform/iOS/platform_ios.cmake
+++ b/Gems/EMotionFX/Code/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Platform/iOS/platform_ios_files.cmake b/Gems/EMotionFX/Code/Platform/iOS/platform_ios_files.cmake
index 897d1b3d6b..baeed2321f 100644
--- a/Gems/EMotionFX/Code/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/EMotionFX/Code/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h b/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
index b6a7fecad2..6416d94c41 100644
--- a/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
+++ b/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ActorEditorBus.h b/Gems/EMotionFX/Code/Source/Editor/ActorEditorBus.h
index 9761328ebe..c11efcf86b 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ActorEditorBus.h
+++ b/Gems/EMotionFX/Code/Source/Editor/ActorEditorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp b/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp
index be1906609f..277a0350d9 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.h b/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.h
index ed20a5acca..e9642ca36b 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.h
+++ b/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/AnimGraphEditorBus.h b/Gems/EMotionFX/Code/Source/Editor/AnimGraphEditorBus.h
index cd781e8ea5..3463c4069a 100644
--- a/Gems/EMotionFX/Code/Source/Editor/AnimGraphEditorBus.h
+++ b/Gems/EMotionFX/Code/Source/Editor/AnimGraphEditorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ColliderContainerWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/ColliderContainerWidget.cpp
index 00904da266..b751f18c62 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ColliderContainerWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/ColliderContainerWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ColliderContainerWidget.h b/Gems/EMotionFX/Code/Source/Editor/ColliderContainerWidget.h
index 8bd339a0f5..227df80a1a 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ColliderContainerWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/ColliderContainerWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ColliderHelpers.cpp b/Gems/EMotionFX/Code/Source/Editor/ColliderHelpers.cpp
index f6f94dd1d9..15b51713d0 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ColliderHelpers.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/ColliderHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ColliderHelpers.h b/Gems/EMotionFX/Code/Source/Editor/ColliderHelpers.h
index ecab2ff749..04d5749180 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ColliderHelpers.h
+++ b/Gems/EMotionFX/Code/Source/Editor/ColliderHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/InputDialogValidatable.cpp b/Gems/EMotionFX/Code/Source/Editor/InputDialogValidatable.cpp
index 494cfa6fe5..101dc1799e 100644
--- a/Gems/EMotionFX/Code/Source/Editor/InputDialogValidatable.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/InputDialogValidatable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/InputDialogValidatable.h b/Gems/EMotionFX/Code/Source/Editor/InputDialogValidatable.h
index eb325c55b6..63f50e55a2 100644
--- a/Gems/EMotionFX/Code/Source/Editor/InputDialogValidatable.h
+++ b/Gems/EMotionFX/Code/Source/Editor/InputDialogValidatable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/JointSelectionDialog.cpp b/Gems/EMotionFX/Code/Source/Editor/JointSelectionDialog.cpp
index db414a3a33..8d41260390 100644
--- a/Gems/EMotionFX/Code/Source/Editor/JointSelectionDialog.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/JointSelectionDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/JointSelectionDialog.h b/Gems/EMotionFX/Code/Source/Editor/JointSelectionDialog.h
index 975e51bdf8..f668d9aaba 100644
--- a/Gems/EMotionFX/Code/Source/Editor/JointSelectionDialog.h
+++ b/Gems/EMotionFX/Code/Source/Editor/JointSelectionDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/JointSelectionWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/JointSelectionWidget.cpp
index 9b3f11e418..c8ac20427e 100644
--- a/Gems/EMotionFX/Code/Source/Editor/JointSelectionWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/JointSelectionWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/JointSelectionWidget.h b/Gems/EMotionFX/Code/Source/Editor/JointSelectionWidget.h
index c80b4504ef..4a76016574 100644
--- a/Gems/EMotionFX/Code/Source/Editor/JointSelectionWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/JointSelectionWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/LineEditValidatable.cpp b/Gems/EMotionFX/Code/Source/Editor/LineEditValidatable.cpp
index ff3d0d5650..10b05c4efd 100644
--- a/Gems/EMotionFX/Code/Source/Editor/LineEditValidatable.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/LineEditValidatable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/LineEditValidatable.h b/Gems/EMotionFX/Code/Source/Editor/LineEditValidatable.h
index 21a8d058c7..1616d7bc2f 100644
--- a/Gems/EMotionFX/Code/Source/Editor/LineEditValidatable.h
+++ b/Gems/EMotionFX/Code/Source/Editor/LineEditValidatable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/NotificationWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/NotificationWidget.cpp
index 6b75491bdd..87e45d4cf2 100644
--- a/Gems/EMotionFX/Code/Source/Editor/NotificationWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/NotificationWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/NotificationWidget.h b/Gems/EMotionFX/Code/Source/Editor/NotificationWidget.h
index 67d92463d8..df49e074b9 100644
--- a/Gems/EMotionFX/Code/Source/Editor/NotificationWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/NotificationWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ObjectEditor.cpp b/Gems/EMotionFX/Code/Source/Editor/ObjectEditor.cpp
index b0f17076e0..848206bf44 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ObjectEditor.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/ObjectEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ObjectEditor.h b/Gems/EMotionFX/Code/Source/Editor/ObjectEditor.h
index 9ba04db7b9..5dd0263146 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ObjectEditor.h
+++ b/Gems/EMotionFX/Code/Source/Editor/ObjectEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.cpp
index 18fbb9f2d8..4e966ec1bb 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.h
index 43870eb7c8..f8dafd01d8 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointInspectorPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointWidget.cpp
index 0836b301a3..3d70c912af 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointWidget.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointWidget.h
index f994065c62..ddd75357fa 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Cloth/ClothJointWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.cpp
index e30b6542c3..9e0b3258a2 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.h
index 4433e70188..51cd828e22 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointWidget.cpp
index d1a172ebb5..af280f7010 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointWidget.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointWidget.h
index ee9c91d469..81b8dc1a0f 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/HitDetection/HitDetectionJointWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollJointLimitWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollJointLimitWidget.cpp
index cee80673d5..004dd18407 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollJointLimitWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollJointLimitWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollJointLimitWidget.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollJointLimitWidget.h
index db49e4ab23..07dd007538 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollJointLimitWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollJointLimitWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.cpp
index 4d25260af0..7254852625 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.h
index 643fdc85bd..30366d3080 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeWidget.cpp
index 85dd3870e9..5331bbc57f 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeWidget.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeWidget.h
index 91d0088ce8..2bfb606b63 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedJointWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedJointWidget.cpp
index 5bb1778e1c..8e745c2657 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedJointWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedJointWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedJointWidget.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedJointWidget.h
index 9f0d07f285..731bc98e5d 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedJointWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedJointWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectActionManager.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectActionManager.cpp
index 0de2f0c638..fade950005 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectActionManager.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectActionManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectActionManager.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectActionManager.h
index 2fa3c2af53..8251d7dc46 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectActionManager.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectActionManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectColliderWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectColliderWidget.cpp
index 07d2eb288f..ad7ed548ce 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectColliderWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectColliderWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectColliderWidget.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectColliderWidget.h
index 2bf0c4f38a..f25df30c6f 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectColliderWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectColliderWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWidget.cpp
index 492cdfef56..21ef2ec7f4 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWidget.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWidget.h
index 9f72455124..5eebdadd45 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWindow.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWindow.cpp
index b098a1c3ff..57de2344cc 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWindow.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWindow.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWindow.h
index 0a73950165..7030c8ab9a 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWindow.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectSelectionWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.cpp
index 0a32f2254a..87dc574818 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.h
index 127ff495f5..e14ee9143d 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerBus.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerBus.h
index 7f8bdb0c20..11016a8694 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerBus.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.cpp b/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.cpp
index f72af7b00b..01656b58cc 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.h b/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.h
index 184d31a248..3bfb86ab95 100644
--- a/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.h
+++ b/Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.cpp
index 8fd58a31f2..87a2c467f3 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.h
index 28bab88fe9..807c7755fa 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.cpp
index 224d76adf1..487cec5ce9 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.h
index bf1936aa03..b8341f45b7 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.cpp
index 2973eea2a1..6c6c837b33 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.h
index 6b3a6dc123..dad84741b9 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.cpp
index 80d977ab6a..59a951e081 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.h
index e3dca960c7..cb893d1d61 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.cpp
index 8a1bbf0608..87da127541 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.h
index 9d72dffbc7..871694d769 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.cpp
index c2274bb24e..aaa55f9a0f 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.h
index f610665570..844e7c6ae9 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.cpp
index ab62935239..978bf97578 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.h
index 451284b9b0..0bc77e86aa 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.cpp
index 0a3fff1fcf..f27ac9d019 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.h
index f616aa1663..6c2497c53b 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.cpp
index f869640fb7..6564dbde08 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.h
index 2c290a5b82..59d055af7d 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendNParamWeightsHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendNParamWeightsHandler.cpp
index 0c82e10284..bd36826e50 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendNParamWeightsHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendNParamWeightsHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendNParamWeightsHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendNParamWeightsHandler.h
index 89aed5baea..46c56ee604 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendNParamWeightsHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendNParamWeightsHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.cpp
index 95afe20f6f..02c4a74f2d 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.h
index f9810e2720..2c63a18e66 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp
index 52152c0fa0..71fb8b330e 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.h
index f9150bf8ff..0ba3b872f3 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.cpp
index 8f088ed155..fee29379a6 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.h
index 4c0131f531..b4d6534e58 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendTreeRotationLimitHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendTreeRotationLimitHandler.cpp
index 0041811a13..a6371a6b72 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendTreeRotationLimitHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendTreeRotationLimitHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendTreeRotationLimitHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendTreeRotationLimitHandler.h
index 6bfc23cea6..78e0cbd719 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendTreeRotationLimitHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendTreeRotationLimitHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/EventDataHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/EventDataHandler.cpp
index 55acb9e6ca..dab047aaa3 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/EventDataHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/EventDataHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/EventDataHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/EventDataHandler.h
index 17e68eab0b..25f7950578 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/EventDataHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/EventDataHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODSceneGraphWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODSceneGraphWidget.cpp
index 97e696ad99..64a3300752 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODSceneGraphWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODSceneGraphWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODSceneGraphWidget.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODSceneGraphWidget.h
index 3edbbc5787..fa8fa76ecb 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODSceneGraphWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODSceneGraphWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.cpp
index 0020c76fe2..12fd95aab8 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.h
index e20b7be3a2..fb9977dae0 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionWidget.cpp
index e7f75cba25..2333f3c18d 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionWidget.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionWidget.h
index 594a5e6bc7..32c6481f05 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.cpp
index f53567494b..94c90f4676 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -76,7 +76,7 @@ namespace EMotionFX
         const MotionDataFactory& factory = GetEMotionFX().GetMotionManager()->GetMotionDataFactory();
         for (size_t i = 0; i < factory.GetNumRegistered(); ++i)
         {
-            GUI->addItem(factory.GetRegistered(i)->GetFbxSettingsName());
+            GUI->addItem(factory.GetRegistered(i)->GetSceneSettingsName());
             m_typeIds.emplace_back(factory.GetRegistered(i)->RTTI_GetType());
         }
 
diff --git a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.h
index b1bb93e49b..d5d0bd2ff7 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.cpp
index d3d25765c2..2bddc67a1a 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.h
index ceca274854..ea821869c6 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.cpp
index 0d6a1a58b1..ee9c206cee 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.h
index e9ddc08af8..90853403ae 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp
index e52f88e718..11fd7f996e 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.h
index fb9b1c62de..7ddcaae30c 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyWidgetAllocator.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyWidgetAllocator.h
index 4cc7e00829..49bb4895ed 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyWidgetAllocator.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyWidgetAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.cpp
index d96bf24078..6b8a0a412b 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.h
index b89c8ae51e..4003bc5bf5 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.cpp
index b6d46b1c60..2c33a3a383 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.h
index 610a8430a9..daff46f720 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.cpp
index 8c3a3b1353..07cf98249e 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.h
index 2be270babe..ec516d6c49 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.cpp
index c1aced30e1..1634e2363b 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.h
index 6555d06770..6d541a852f 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.cpp
index 4c7700179a..7d3a9382cc 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.h b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.h
index d108320b78..a6421e6286 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.h
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/QtMetaTypes.h b/Gems/EMotionFX/Code/Source/Editor/QtMetaTypes.h
index 9e9a2ce13b..30f7adfdea 100644
--- a/Gems/EMotionFX/Code/Source/Editor/QtMetaTypes.h
+++ b/Gems/EMotionFX/Code/Source/Editor/QtMetaTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ReselectingTreeView.cpp b/Gems/EMotionFX/Code/Source/Editor/ReselectingTreeView.cpp
index d574b4997e..cb1f51fa35 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ReselectingTreeView.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/ReselectingTreeView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/ReselectingTreeView.h b/Gems/EMotionFX/Code/Source/Editor/ReselectingTreeView.h
index af07759166..ad6c47d0cc 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ReselectingTreeView.h
+++ b/Gems/EMotionFX/Code/Source/Editor/ReselectingTreeView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SelectionProxyModel.cpp b/Gems/EMotionFX/Code/Source/Editor/SelectionProxyModel.cpp
index faa1948f1d..e911eb6d08 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SelectionProxyModel.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/SelectionProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SelectionProxyModel.h b/Gems/EMotionFX/Code/Source/Editor/SelectionProxyModel.h
index 95a0d79fc7..3f2f25ab17 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SelectionProxyModel.h
+++ b/Gems/EMotionFX/Code/Source/Editor/SelectionProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectBus.h b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectBus.h
index 5dc2544ed2..e438608a83 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectBus.h
+++ b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.cpp b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.cpp
index e3eb0f4aee..b820c7dd29 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.h b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.h
index 1384621b98..31b4a95fea 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.h
+++ b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModel.cpp b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModel.cpp
index bb4fa21d1e..72902f7999 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModel.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModel.h b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModel.h
index d75234b662..cb95c5e776 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModel.h
+++ b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModelCallbacks.cpp b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModelCallbacks.cpp
index ff737cdb21..7a4a0f57be 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModelCallbacks.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/SimulatedObjectModelCallbacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SkeletonModel.cpp b/Gems/EMotionFX/Code/Source/Editor/SkeletonModel.cpp
index 444a1f2f6e..cd0f72d373 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SkeletonModel.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/SkeletonModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SkeletonModel.h b/Gems/EMotionFX/Code/Source/Editor/SkeletonModel.h
index 05fa9011d7..5f62d9ec91 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SkeletonModel.h
+++ b/Gems/EMotionFX/Code/Source/Editor/SkeletonModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.cpp b/Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.cpp
index f863924f25..97cdb2286e 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.h b/Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.h
index c11f982fef..ac51a5f5be 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.h
+++ b/Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.cpp b/Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.cpp
index 097015e05e..e5f8909ecd 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.h b/Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.h
index 939ac668a7..75ef1b9eb0 100644
--- a/Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.h
+++ b/Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/TagSelector.cpp b/Gems/EMotionFX/Code/Source/Editor/TagSelector.cpp
index f0f9a7da95..8b39d3c443 100644
--- a/Gems/EMotionFX/Code/Source/Editor/TagSelector.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/TagSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/TagSelector.h b/Gems/EMotionFX/Code/Source/Editor/TagSelector.h
index 20ad573274..cd324740cb 100644
--- a/Gems/EMotionFX/Code/Source/Editor/TagSelector.h
+++ b/Gems/EMotionFX/Code/Source/Editor/TagSelector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.cpp b/Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.cpp
index 6ac3bc4d20..8f3568fd93 100644
--- a/Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.h b/Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.h
index d797e46313..bd6959ad9b 100644
--- a/Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.h
+++ b/Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp b/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp
index 69cccace81..66b0ff1d82 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.h b/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.h
index 2f18a166d2..6dbc011803 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp b/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp
index 0712558542..8955d714d5 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.h b/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.h
index 49a4afc400..d023b2f222 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/AssetCommon.h b/Gems/EMotionFX/Code/Source/Integration/Assets/AssetCommon.h
index 0737862ab0..169de4c405 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/AssetCommon.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/AssetCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp
index a8b0221e6f..e4013aed7c 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.h b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.h
index 3a6170eaae..4a5232f2d7 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp
index 47003a3d9f..e988fd9b46 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.h b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.h
index c95abfe719..808ebf5fe2 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
index e08485c858..fbb8541b2b 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
index 17cf902c53..cabacb13f9 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
index 508aee6791..d9cfe881d8 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.h b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.h
index f87a1bc995..0c14a6f585 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp
index 3b04eff11f..81c445f99f 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.h b/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.h
index 9a743426be..76e4742e60 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp
index ebf125f6ce..5ea88f2c7b 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.h b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.h
index 763a0296b2..1c4597c790 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp
index 1f537b70d9..6287d2ddb8 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h
index 480c733e76..d27d0e2b46 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
index 66689885d0..3a6c1a7991 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.h b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.h
index 27cf589c29..253d57bf1d 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -163,7 +163,7 @@ namespace EMotionFX
             bool                                m_forceUpdateJointsOOV = false;
             // \todo attachmentTarget node nr
 
-            // Note: LOD work in progress. For now we use one material instead of a list of material, because we don't have the support for LOD with multiple FBXs.
+            // Note: LOD work in progress. For now we use one material instead of a list of material, because we don't have the support for LOD with multiple scene files.
             // We purposely kept a materialList in actorComponent and actorRenderNode for the flexibility in future.
             // At the moment, the materialList stores duplicates of the same material.
             AzFramework::SimpleAssetReference<LmbrCentral::MaterialAsset>   m_materialPerActor;
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp
index 04af8e8d7d..e0c79aeb77 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.h b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.h
index a2e80c5953..d6e9483bc3 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp
index 0573ac0ced..4e8f743fe9 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.h b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.h
index 622b120eea..cba01730bb 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
index 6f0280ab07..65deb8f928 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.h b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.h
index 37a13a50b9..fec8d65a3f 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
index 0ca7248f26..3398b954e4 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.h b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.h
index 5c4c01072e..6eec960968 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActor.cpp b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActor.cpp
index 1decb2d0a5..28c0663f8f 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActor.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActor.h b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActor.h
index b64f86fd0e..b661835525 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActor.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorInstance.cpp b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorInstance.cpp
index 55515d8e09..29955e7e2c 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorInstance.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorInstance.h b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorInstance.h
index fb5d88038e..78afa5a049 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorInstance.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackend.cpp b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackend.cpp
index 3891da64df..86fd87247b 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackend.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackend.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackend.h b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackend.h
index 7db219bc53..94dbdff500 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackend.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackend.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackendManager.cpp b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackendManager.cpp
index 7b545b2813..d557e5343c 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackendManager.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackendManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackendManager.h b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackendManager.h
index f63991f0ea..9325abed1c 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackendManager.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderBackendManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/System/AnimationModule.cpp b/Gems/EMotionFX/Code/Source/Integration/System/AnimationModule.cpp
index 923fe8ef00..e2f74fe0cd 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/AnimationModule.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/System/AnimationModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/System/CVars.h b/Gems/EMotionFX/Code/Source/Integration/System/CVars.h
index 406a0ba75f..a8f802b7dc 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/CVars.h
+++ b/Gems/EMotionFX/Code/Source/Integration/System/CVars.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/System/PipelineComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/System/PipelineComponent.cpp
index 12c72f28db..dbfa22f083 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/PipelineComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/System/PipelineComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/System/PipelineComponent.h b/Gems/EMotionFX/Code/Source/Integration/System/PipelineComponent.h
index d8b4ccb2fc..5f591aac8a 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/PipelineComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/System/PipelineComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/System/SystemCommon.h b/Gems/EMotionFX/Code/Source/Integration/System/SystemCommon.h
index 550c7406df..6196e67297 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/SystemCommon.h
+++ b/Gems/EMotionFX/Code/Source/Integration/System/SystemCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
index 0c227302d6..b0384c7577 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -485,7 +485,7 @@ namespace EMotionFX
 
             SetMediaRoot("@assets@");
             // \todo Right now we're pointing at the @devassets@ location (source) and working from there, because .actor and .motion (motion) aren't yet processed through
-            // the FBX pipeline. Once they are, we'll need to update various segments of the Tool to always read from the @assets@ cache, but write to the @devassets@ data/metadata.
+            // the scene pipeline. Once they are, we'll need to update various segments of the Tool to always read from the @assets@ cache, but write to the @devassets@ data/metadata.
             EMotionFX::GetEMotionFX().InitAssetFolderPaths();
 
             // Register EMotionFX event handler
diff --git a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.h b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.h
index 3cc94d1c72..7b40bd7b9c 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Source/Integration/System/emotionfx_module_files.cmake b/Gems/EMotionFX/Code/Source/Integration/System/emotionfx_module_files.cmake
index c21401a5b2..73ed142e99 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/emotionfx_module_files.cmake
+++ b/Gems/EMotionFX/Code/Source/Integration/System/emotionfx_module_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/Tests/ActorBuilderTests.cpp b/Gems/EMotionFX/Code/Tests/ActorBuilderTests.cpp
index a1340715e8..ba22cf1038 100644
--- a/Gems/EMotionFX/Code/Tests/ActorBuilderTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ActorBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ActorBusTests.cpp b/Gems/EMotionFX/Code/Tests/ActorBusTests.cpp
index 261b55f8ea..2e3bf424b9 100644
--- a/Gems/EMotionFX/Code/Tests/ActorBusTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ActorBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ActorComponentBusTests.cpp b/Gems/EMotionFX/Code/Tests/ActorComponentBusTests.cpp
index 4ccc565985..02158819df 100644
--- a/Gems/EMotionFX/Code/Tests/ActorComponentBusTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ActorComponentBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ActorFixture.cpp b/Gems/EMotionFX/Code/Tests/ActorFixture.cpp
index bcb85adcda..1c2367146c 100644
--- a/Gems/EMotionFX/Code/Tests/ActorFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/ActorFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ActorFixture.h b/Gems/EMotionFX/Code/Tests/ActorFixture.h
index 0a0d3f048f..f97b304226 100644
--- a/Gems/EMotionFX/Code/Tests/ActorFixture.h
+++ b/Gems/EMotionFX/Code/Tests/ActorFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ActorInstanceCommandTests.cpp b/Gems/EMotionFX/Code/Tests/ActorInstanceCommandTests.cpp
index 4ee960ce00..9f18e2d44d 100644
--- a/Gems/EMotionFX/Code/Tests/ActorInstanceCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ActorInstanceCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AdditiveMotionSamplingTests.cpp b/Gems/EMotionFX/Code/Tests/AdditiveMotionSamplingTests.cpp
index 57d588bbfa..298e406a66 100644
--- a/Gems/EMotionFX/Code/Tests/AdditiveMotionSamplingTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AdditiveMotionSamplingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimAudioComponentTests.cpp b/Gems/EMotionFX/Code/Tests/AnimAudioComponentTests.cpp
index d5344a0cda..3baffc40b0 100644
--- a/Gems/EMotionFX/Code/Tests/AnimAudioComponentTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimAudioComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphActionCommandTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphActionCommandTests.cpp
index 2795a3c848..eeb6b9482e 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphActionCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphActionCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphActionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphActionTests.cpp
index f1ce12458d..3d608c18cb 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphActionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphActionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphCommandTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphCommandTests.cpp
index 270cfa2a18..8d6d04148a 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphComponentBusTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphComponentBusTests.cpp
index 0b2c7be9a6..c73b2d18e9 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphComponentBusTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphComponentBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphCopyPasteTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphCopyPasteTests.cpp
index 0f7d032dc1..f39386be6d 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphCopyPasteTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphCopyPasteTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphDeferredInitTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphDeferredInitTests.cpp
index ec44b1dec9..976e908f94 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphDeferredInitTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphDeferredInitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphEventHandlerCounter.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphEventHandlerCounter.cpp
index 1a33c6614f..43060c3ab7 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphEventHandlerCounter.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphEventHandlerCounter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphEventHandlerCounter.h b/Gems/EMotionFX/Code/Tests/AnimGraphEventHandlerCounter.h
index 1cc5a2ccac..20f5ad28c1 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphEventHandlerCounter.h
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphEventHandlerCounter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphEventTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphEventTests.cpp
index bb9c5c2857..73e0aaef07 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphEventTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphEventTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphFixture.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphFixture.cpp
index fe63bbbcb1..92eace2300 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphFixture.h b/Gems/EMotionFX/Code/Tests/AnimGraphFixture.h
index 89aebab5dc..6fbdd3c084 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphFixture.h
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphFuzzTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphFuzzTests.cpp
index 1117292cf5..7b8ff12760 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphFuzzTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphFuzzTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphHubNodeTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphHubNodeTests.cpp
index cdede041a4..478ccc1941 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphHubNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphHubNodeTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphLoadingTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphLoadingTests.cpp
index 3f1d614e1f..94eea2787c 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphLoadingTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphLoadingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphMotionConditionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphMotionConditionTests.cpp
index 8b5d0fadbf..46549dd832 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphMotionConditionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphMotionConditionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp
index b4cdbe32c6..11a21c62fb 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphNetworkingBusTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphNetworkingBusTests.cpp
index bd97005061..e06795c734 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphNetworkingBusTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphNetworkingBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphNodeEventFilterTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphNodeEventFilterTests.cpp
index 75678ecab4..41cec3f515 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphNodeEventFilterTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphNodeEventFilterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphNodeGroupTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphNodeGroupTests.cpp
index 85cec73661..568f27e230 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphNodeGroupTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphNodeGroupTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphNodeProcessingTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphNodeProcessingTests.cpp
index 53d28132cf..fdeccac7f7 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphNodeProcessingTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphNodeProcessingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphParameterActionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphParameterActionTests.cpp
index cb05d9c06f..52c386c464 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphParameterActionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphParameterActionTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphParameterCommandsTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphParameterCommandsTests.cpp
index aa5729ee20..b911271608 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphParameterCommandsTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphParameterCommandsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphParameterConditionCommandTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphParameterConditionCommandTests.cpp
index 24268a01a0..f5e1401585 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphParameterConditionCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphParameterConditionCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphParameterConditionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphParameterConditionTests.cpp
index 13939ca916..83ded8195d 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphParameterConditionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphParameterConditionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphRefCountTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphRefCountTests.cpp
index 5ed901a015..9280ddc404 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphRefCountTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphRefCountTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphReferenceNodeTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphReferenceNodeTests.cpp
index 0b3088cd37..ba378515d9 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphReferenceNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphReferenceNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineInterruptionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineInterruptionTests.cpp
index 68fd6d82cc..142db99b3e 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineInterruptionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineInterruptionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineSyncTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineSyncTests.cpp
index 39705a1cec..4aa5e43cb0 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineSyncTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineSyncTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineTests.cpp
index be48367736..794b3bacda 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphStateMachineTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphSyncTrackTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphSyncTrackTests.cpp
index 6d363eacf7..0de49bff58 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphSyncTrackTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphSyncTrackTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTagConditionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphTagConditionTests.cpp
index 47a8929ad5..dcaf237f31 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTagConditionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTagConditionTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTransitionCommandTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionCommandTests.cpp
index b527ee69a5..9053aa6abc 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTransitionCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionCommandTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionCommandTests.cpp
index a3a90b4f8e..8feaa6e20b 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionFixture.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionFixture.cpp
index 904d7abadd..d16490600d 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionFixture.h b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionFixture.h
index 066a203613..899add827a 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionFixture.h
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionTests.cpp
index 75f8971586..f2b5021009 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionConditionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTransitionFixture.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionFixture.cpp
index b1febef5df..f15aaa7c83 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTransitionFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTransitionFixture.h b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionFixture.h
index af65681eb9..61e411a3d8 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTransitionFixture.h
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphTransitionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionTests.cpp
index 435910fc0d..e9f8301f7b 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphTransitionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphTransitionTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AnimGraphVector2ConditionTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphVector2ConditionTests.cpp
index 33438a1e7f..b247c28b78 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphVector2ConditionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphVector2ConditionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/AutoSkeletonLODTests.cpp b/Gems/EMotionFX/Code/Tests/AutoSkeletonLODTests.cpp
index 985884a365..b0b03fd550 100644
--- a/Gems/EMotionFX/Code/Tests/AutoSkeletonLODTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AutoSkeletonLODTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendSpaceFixture.cpp b/Gems/EMotionFX/Code/Tests/BlendSpaceFixture.cpp
index 7afa032003..431f82e3d6 100644
--- a/Gems/EMotionFX/Code/Tests/BlendSpaceFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendSpaceFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendSpaceFixture.h b/Gems/EMotionFX/Code/Tests/BlendSpaceFixture.h
index ebaaa315b8..31cc337541 100644
--- a/Gems/EMotionFX/Code/Tests/BlendSpaceFixture.h
+++ b/Gems/EMotionFX/Code/Tests/BlendSpaceFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendSpaceTests.cpp b/Gems/EMotionFX/Code/Tests/BlendSpaceTests.cpp
index 4a379eac71..4e2ac50d71 100644
--- a/Gems/EMotionFX/Code/Tests/BlendSpaceTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendSpaceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeBlendNNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeBlendNNodeTests.cpp
index 560e43c2bc..21e2789c14 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeBlendNNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeBlendNNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeFloatConditionNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeFloatConditionNodeTests.cpp
index 5de373ac06..1c2fdaabe8 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeFloatConditionNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeFloatConditionNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeFloatConstantNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeFloatConstantNodeTests.cpp
index f8bc6e87d5..a6cec624d9 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeFloatConstantNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeFloatConstantNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeFloatMath1NodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeFloatMath1NodeTests.cpp
index 8b906d8aae..46f5f0e5b5 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeFloatMath1NodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeFloatMath1NodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeFootIKNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeFootIKNodeTests.cpp
index 9bd1487e12..9d30127536 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeFootIKNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeFootIKNodeTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeMaskNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeMaskNodeTests.cpp
index 670f3a2b9a..47fc716ffc 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeMaskNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeMaskNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeMirrorPoseNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeMirrorPoseNodeTests.cpp
index 25e2b1aa1c..92509f4395 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeMirrorPoseNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeMirrorPoseNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeMotionFrameNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeMotionFrameNodeTests.cpp
index d10a8b003a..bc4b29b5b9 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeMotionFrameNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeMotionFrameNodeTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeParameterNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeParameterNodeTests.cpp
index 4247d76c8f..a2857b381c 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeParameterNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeParameterNodeTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeRagdollNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeRagdollNodeTests.cpp
index 044d1953bd..0f2ff4de09 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeRagdollNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeRagdollNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeRangeRemapperNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeRangeRemapperNodeTests.cpp
index 2877f16868..6af42096d9 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeRangeRemapperNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeRangeRemapperNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeRotationLimitNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeRotationLimitNodeTests.cpp
index 830db0bcc3..d938a12c1e 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeRotationLimitNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeRotationLimitNodeTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeRotationMath2NodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeRotationMath2NodeTests.cpp
index 17ae49b796..6147bbd826 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeRotationMath2NodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeRotationMath2NodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeSimulatedObjectNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeSimulatedObjectNodeTests.cpp
index 275d40db59..eb0f3f4f2c 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeSimulatedObjectNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeSimulatedObjectNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeTransformNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeTransformNodeTests.cpp
index 38ee8acfe1..7d137cf864 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeTransformNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeTransformNodeTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BlendTreeTwoLinkIKNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BlendTreeTwoLinkIKNodeTests.cpp
index 6553339510..7eaee62989 100644
--- a/Gems/EMotionFX/Code/Tests/BlendTreeTwoLinkIKNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BlendTreeTwoLinkIKNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/BoolLogicNodeTests.cpp b/Gems/EMotionFX/Code/Tests/BoolLogicNodeTests.cpp
index 88bf44ecf3..c1bac25564 100644
--- a/Gems/EMotionFX/Code/Tests/BoolLogicNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/BoolLogicNodeTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteExitNodeAfterItHasBeenActive.cpp b/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteExitNodeAfterItHasBeenActive.cpp
index 9ddbb86452..fd233e4d4b 100644
--- a/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteExitNodeAfterItHasBeenActive.cpp
+++ b/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteExitNodeAfterItHasBeenActive.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteMotionSetWhenSameMotionInTwoMotionSets.cpp b/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteMotionSetWhenSameMotionInTwoMotionSets.cpp
index 08ea4e6d21..a5f4450ea1 100644
--- a/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteMotionSetWhenSameMotionInTwoMotionSets.cpp
+++ b/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteMotionSetWhenSameMotionInTwoMotionSets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteMotionWhenMotionIsBeingBlended.cpp b/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteMotionWhenMotionIsBeingBlended.cpp
index 889d7821c4..3688508481 100644
--- a/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteMotionWhenMotionIsBeingBlended.cpp
+++ b/Gems/EMotionFX/Code/Tests/Bugs/CanDeleteMotionWhenMotionIsBeingBlended.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Bugs/CanUndoParameterDeletionAndRestoreBlendTreeConnections.cpp b/Gems/EMotionFX/Code/Tests/Bugs/CanUndoParameterDeletionAndRestoreBlendTreeConnections.cpp
index cc1a992f50..7f4c43c61a 100644
--- a/Gems/EMotionFX/Code/Tests/Bugs/CanUndoParameterDeletionAndRestoreBlendTreeConnections.cpp
+++ b/Gems/EMotionFX/Code/Tests/Bugs/CanUndoParameterDeletionAndRestoreBlendTreeConnections.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ColliderCommandTests.cpp b/Gems/EMotionFX/Code/Tests/ColliderCommandTests.cpp
index 9dcee6357d..50e792e2b6 100644
--- a/Gems/EMotionFX/Code/Tests/ColliderCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ColliderCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/CommandAdjustSimulatedObjectTests.cpp b/Gems/EMotionFX/Code/Tests/CommandAdjustSimulatedObjectTests.cpp
index 1c662a0363..747531e4cb 100644
--- a/Gems/EMotionFX/Code/Tests/CommandAdjustSimulatedObjectTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/CommandAdjustSimulatedObjectTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/CommandRemoveMotionTests.cpp b/Gems/EMotionFX/Code/Tests/CommandRemoveMotionTests.cpp
index fcdeff7945..a8d7f16f7e 100644
--- a/Gems/EMotionFX/Code/Tests/CommandRemoveMotionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/CommandRemoveMotionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/CoordinateSystemConverterTests.cpp b/Gems/EMotionFX/Code/Tests/CoordinateSystemConverterTests.cpp
index 867f7258e7..67fca2a9d7 100644
--- a/Gems/EMotionFX/Code/Tests/CoordinateSystemConverterTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/CoordinateSystemConverterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/D6JointLimitConfiguration.cpp b/Gems/EMotionFX/Code/Tests/D6JointLimitConfiguration.cpp
index e123dc1469..e5ac823b6a 100644
--- a/Gems/EMotionFX/Code/Tests/D6JointLimitConfiguration.cpp
+++ b/Gems/EMotionFX/Code/Tests/D6JointLimitConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/D6JointLimitConfiguration.h b/Gems/EMotionFX/Code/Tests/D6JointLimitConfiguration.h
index 3c128deb3f..23c8d37d20 100644
--- a/Gems/EMotionFX/Code/Tests/D6JointLimitConfiguration.h
+++ b/Gems/EMotionFX/Code/Tests/D6JointLimitConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.cpp b/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.cpp
index eeb0ee7a1d..b4cfa1e5f4 100644
--- a/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.h b/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.h
index 697eed3d04..279cdfa7b9 100644
--- a/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.h
+++ b/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/EMotionFXBuilderTests.cpp b/Gems/EMotionFX/Code/Tests/EMotionFXBuilderTests.cpp
index a87ccf8bba..bbefaf1c38 100644
--- a/Gems/EMotionFX/Code/Tests/EMotionFXBuilderTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/EMotionFXBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/EMotionFXTest.cpp b/Gems/EMotionFX/Code/Tests/EMotionFXTest.cpp
index 1ece327412..8c9476a406 100644
--- a/Gems/EMotionFX/Code/Tests/EMotionFXTest.cpp
+++ b/Gems/EMotionFX/Code/Tests/EMotionFXTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Editor/FileManagerTests.cpp b/Gems/EMotionFX/Code/Tests/Editor/FileManagerTests.cpp
index b725b09784..f969bcac82 100644
--- a/Gems/EMotionFX/Code/Tests/Editor/FileManagerTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/Editor/FileManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Editor/MotionSetLoadEscalation.cpp b/Gems/EMotionFX/Code/Tests/Editor/MotionSetLoadEscalation.cpp
index 607f10c761..f4687bd48c 100644
--- a/Gems/EMotionFX/Code/Tests/Editor/MotionSetLoadEscalation.cpp
+++ b/Gems/EMotionFX/Code/Tests/Editor/MotionSetLoadEscalation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Editor/ParametersGroupDefaultValues.cpp b/Gems/EMotionFX/Code/Tests/Editor/ParametersGroupDefaultValues.cpp
index 51ef3e987f..77e795c8c8 100644
--- a/Gems/EMotionFX/Code/Tests/Editor/ParametersGroupDefaultValues.cpp
+++ b/Gems/EMotionFX/Code/Tests/Editor/ParametersGroupDefaultValues.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/EmotionFXMathLibTests.cpp b/Gems/EMotionFX/Code/Tests/EmotionFXMathLibTests.cpp
index 443d5e4bdf..c0e8ae1be5 100644
--- a/Gems/EMotionFX/Code/Tests/EmotionFXMathLibTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/EmotionFXMathLibTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/EventManagerTests.cpp b/Gems/EMotionFX/Code/Tests/EventManagerTests.cpp
index c717a1b27e..3a7f83ab3b 100644
--- a/Gems/EMotionFX/Code/Tests/EventManagerTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/EventManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Game/SampleGameFixture.h b/Gems/EMotionFX/Code/Tests/Game/SampleGameFixture.h
index f65c07256d..17e0b49c7b 100644
--- a/Gems/EMotionFX/Code/Tests/Game/SampleGameFixture.h
+++ b/Gems/EMotionFX/Code/Tests/Game/SampleGameFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Game/SamplePerformanceTests.cpp b/Gems/EMotionFX/Code/Tests/Game/SamplePerformanceTests.cpp
index 4f8a726235..96e5014304 100644
--- a/Gems/EMotionFX/Code/Tests/Game/SamplePerformanceTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/Game/SamplePerformanceTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -770,13 +770,13 @@ namespace EMotionFX
 
     TEST_F(PerformanceTestFixture, DISABLED_MotionSamplingPerformanceNonUniform)
     {
-        // Make sure that the motion is set to use NonUniform sampling! Change this in the Fbx settings! Otherwise you get wrong results.
+        // Make sure that the motion is set to use NonUniform sampling! Change this in the scene settings! Otherwise you get wrong results.
         TestMotionSamplingPerformance("@assets@\\animationsamples\\advanced_rinlocomotion\\motions\\rin_idle.motion");
     }
 
     TEST_F(PerformanceTestFixture, DISABLED_MotionSamplingPerformanceUniform)
     {
-        // Make sure that the motion is set to use Uniform sampling! Change this in the Fbx settings! Otherwise you get wrong results.
+        // Make sure that the motion is set to use Uniform sampling! Change this in the scene settings! Otherwise you get wrong results.
         TestMotionSamplingPerformance("@assets@\\animationsamples\\advanced_rinlocomotion\\motions\\rin_walk_kick_01.motion");
     }
 
diff --git a/Gems/EMotionFX/Code/Tests/InitSceneAPIFixture.h b/Gems/EMotionFX/Code/Tests/InitSceneAPIFixture.h
index 113181185f..e1ae786310 100644
--- a/Gems/EMotionFX/Code/Tests/InitSceneAPIFixture.h
+++ b/Gems/EMotionFX/Code/Tests/InitSceneAPIFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/ActorComponentAttachmentTest.cpp b/Gems/EMotionFX/Code/Tests/Integration/ActorComponentAttachmentTest.cpp
index 275fc38a9a..f7f8399b65 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/ActorComponentAttachmentTest.cpp
+++ b/Gems/EMotionFX/Code/Tests/Integration/ActorComponentAttachmentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/ActorComponentRagdollTests.cpp b/Gems/EMotionFX/Code/Tests/Integration/ActorComponentRagdollTests.cpp
index 750999123a..b487a53cb9 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/ActorComponentRagdollTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/Integration/ActorComponentRagdollTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/CanAddActor.cpp b/Gems/EMotionFX/Code/Tests/Integration/CanAddActor.cpp
index dc443a3c59..0706f8bdb7 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/CanAddActor.cpp
+++ b/Gems/EMotionFX/Code/Tests/Integration/CanAddActor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/CanAddSimpleMotionComponent.cpp b/Gems/EMotionFX/Code/Tests/Integration/CanAddSimpleMotionComponent.cpp
index 14818dc01f..2f4abdaebf 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/CanAddSimpleMotionComponent.cpp
+++ b/Gems/EMotionFX/Code/Tests/Integration/CanAddSimpleMotionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/CanDeleteJackEntity.cpp b/Gems/EMotionFX/Code/Tests/Integration/CanDeleteJackEntity.cpp
index e2e5162b28..320278060c 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/CanDeleteJackEntity.cpp
+++ b/Gems/EMotionFX/Code/Tests/Integration/CanDeleteJackEntity.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/Components/AnimGraph/CanApplyDefaultParameterValues.cpp b/Gems/EMotionFX/Code/Tests/Integration/Components/AnimGraph/CanApplyDefaultParameterValues.cpp
index 2da8a331b6..1155a278dd 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/Components/AnimGraph/CanApplyDefaultParameterValues.cpp
+++ b/Gems/EMotionFX/Code/Tests/Integration/Components/AnimGraph/CanApplyDefaultParameterValues.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/EntityComponentFixture.cpp b/Gems/EMotionFX/Code/Tests/Integration/EntityComponentFixture.cpp
index d5f40bd575..3423473a19 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/EntityComponentFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/Integration/EntityComponentFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/EntityComponentFixture.h b/Gems/EMotionFX/Code/Tests/Integration/EntityComponentFixture.h
index b10b03550d..c43afbe80f 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/EntityComponentFixture.h
+++ b/Gems/EMotionFX/Code/Tests/Integration/EntityComponentFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/PoseComparisonFixture.h b/Gems/EMotionFX/Code/Tests/Integration/PoseComparisonFixture.h
index af674f21c1..c1f5e80b3e 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/PoseComparisonFixture.h
+++ b/Gems/EMotionFX/Code/Tests/Integration/PoseComparisonFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Integration/PoseComparisonTests.cpp b/Gems/EMotionFX/Code/Tests/Integration/PoseComparisonTests.cpp
index ebb32707fe..278c258852 100644
--- a/Gems/EMotionFX/Code/Tests/Integration/PoseComparisonTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/Integration/PoseComparisonTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/JackGraphFixture.cpp b/Gems/EMotionFX/Code/Tests/JackGraphFixture.cpp
index 064a464764..20c17742fb 100644
--- a/Gems/EMotionFX/Code/Tests/JackGraphFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/JackGraphFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/JackGraphFixture.h b/Gems/EMotionFX/Code/Tests/JackGraphFixture.h
index 0e317f45f0..e26c4febc3 100644
--- a/Gems/EMotionFX/Code/Tests/JackGraphFixture.h
+++ b/Gems/EMotionFX/Code/Tests/JackGraphFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/KeyTrackLinearTests.cpp b/Gems/EMotionFX/Code/Tests/KeyTrackLinearTests.cpp
index 35bdc4159d..e2481f4b19 100644
--- a/Gems/EMotionFX/Code/Tests/KeyTrackLinearTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/KeyTrackLinearTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/LeaderFollowerVersionTests.cpp b/Gems/EMotionFX/Code/Tests/LeaderFollowerVersionTests.cpp
index 4f762e2a85..5f4d2d48d1 100644
--- a/Gems/EMotionFX/Code/Tests/LeaderFollowerVersionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/LeaderFollowerVersionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MCore/Array2DTests.cpp b/Gems/EMotionFX/Code/Tests/MCore/Array2DTests.cpp
index a5e521e155..9234675146 100644
--- a/Gems/EMotionFX/Code/Tests/MCore/Array2DTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MCore/Array2DTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MCore/CommandLineTests.cpp b/Gems/EMotionFX/Code/Tests/MCore/CommandLineTests.cpp
index 9dcf7f1fbf..6eef81ad4c 100644
--- a/Gems/EMotionFX/Code/Tests/MCore/CommandLineTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MCore/CommandLineTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MCore/CommandManagerTests.cpp b/Gems/EMotionFX/Code/Tests/MCore/CommandManagerTests.cpp
index af07a5255a..2098064ee9 100644
--- a/Gems/EMotionFX/Code/Tests/MCore/CommandManagerTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MCore/CommandManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MCore/DualQuaternionTests.cpp b/Gems/EMotionFX/Code/Tests/MCore/DualQuaternionTests.cpp
index 7d5eed88fa..9adbe991cb 100644
--- a/Gems/EMotionFX/Code/Tests/MCore/DualQuaternionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MCore/DualQuaternionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MCore/OBBTests.cpp b/Gems/EMotionFX/Code/Tests/MCore/OBBTests.cpp
index f6b12acf9f..9d8e54d4f4 100644
--- a/Gems/EMotionFX/Code/Tests/MCore/OBBTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MCore/OBBTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MCoreSystemFixture.cpp b/Gems/EMotionFX/Code/Tests/MCoreSystemFixture.cpp
index 89a5e509fa..3de6f6d013 100644
--- a/Gems/EMotionFX/Code/Tests/MCoreSystemFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/MCoreSystemFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MCoreSystemFixture.h b/Gems/EMotionFX/Code/Tests/MCoreSystemFixture.h
index d5e847d05d..89942826a6 100644
--- a/Gems/EMotionFX/Code/Tests/MCoreSystemFixture.h
+++ b/Gems/EMotionFX/Code/Tests/MCoreSystemFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Matchers.h b/Gems/EMotionFX/Code/Tests/Matchers.h
index c0aa2e31d7..214431f7be 100644
--- a/Gems/EMotionFX/Code/Tests/Matchers.h
+++ b/Gems/EMotionFX/Code/Tests/Matchers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MetaDataRuleTests.cpp b/Gems/EMotionFX/Code/Tests/MetaDataRuleTests.cpp
index 6a410087b0..c4e11d3b76 100644
--- a/Gems/EMotionFX/Code/Tests/MetaDataRuleTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MetaDataRuleTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/Actor.h b/Gems/EMotionFX/Code/Tests/Mocks/Actor.h
index 4e72e6bf54..59b2b54f1f 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/Actor.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/Actor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/ActorManager.h b/Gems/EMotionFX/Code/Tests/Mocks/ActorManager.h
index da7bab2b37..5683f78465 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/ActorManager.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/ActorManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/AnimGraph.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraph.h
index be786f073f..ae60e4cc9a 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraph.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphInstance.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphInstance.h
index 9b6155fb5e..35ff2db14c 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphInstance.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphManager.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphManager.h
index 1c290f4357..ecaafd2d6b 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphManager.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphNode.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphNode.h
index bb760af9af..cae960659b 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphNode.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphObject.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphObject.h
index 418d8e2d62..bedcc7d62e 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphObject.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphObjectData.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphObjectData.h
index 4010cd0abe..a5c488e2fa 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphObjectData.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphObjectData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphStateTransition.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphStateTransition.h
index e098b2ea32..1e53cc755f 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphStateTransition.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphStateTransition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphTransitionCondition.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphTransitionCondition.h
index fcc72d9427..c33969dcce 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphTransitionCondition.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphTransitionCondition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/BlendTreeParameterNode.h b/Gems/EMotionFX/Code/Tests/Mocks/BlendTreeParameterNode.h
index ade6813b3f..6f2da3fcd4 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/BlendTreeParameterNode.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/BlendTreeParameterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/Command.h b/Gems/EMotionFX/Code/Tests/Mocks/Command.h
index e9458514d1..e6a5f4e6c7 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/Command.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/Command.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/CommandManager.h b/Gems/EMotionFX/Code/Tests/Mocks/CommandManager.h
index 1b719471fc..c527d0d264 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/CommandManager.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/CommandManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/CommandManagerCallback.h b/Gems/EMotionFX/Code/Tests/Mocks/CommandManagerCallback.h
index d9e7dda90a..2aa19de12d 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/CommandManagerCallback.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/CommandManagerCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/CommandSystemCommandManager.h b/Gems/EMotionFX/Code/Tests/Mocks/CommandSystemCommandManager.h
index 2e2cff0e56..f59efaaf77 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/CommandSystemCommandManager.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/CommandSystemCommandManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/EMotionFXManager.h b/Gems/EMotionFX/Code/Tests/Mocks/EMotionFXManager.h
index d672fc9cbd..4514d55547 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/EMotionFXManager.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/EMotionFXManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/EventHandler.h b/Gems/EMotionFX/Code/Tests/Mocks/EventHandler.h
index 07c0ff17c9..d94e6a9817 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/EventHandler.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/EventHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/GroupParameter.h b/Gems/EMotionFX/Code/Tests/Mocks/GroupParameter.h
index 8929899c8c..3dbf673c68 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/GroupParameter.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/GroupParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/Node.h b/Gems/EMotionFX/Code/Tests/Mocks/Node.h
index 25bfd601f5..2e6d727ffc 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/Node.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/ObjectAffectedByParameterChanges.h b/Gems/EMotionFX/Code/Tests/Mocks/ObjectAffectedByParameterChanges.h
index fd3a7ee002..c70e5b4b06 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/ObjectAffectedByParameterChanges.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/ObjectAffectedByParameterChanges.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/Parameter.h b/Gems/EMotionFX/Code/Tests/Mocks/Parameter.h
index 4239772a63..ff06d341da 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/Parameter.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/Parameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/ParameterFactory.h b/Gems/EMotionFX/Code/Tests/Mocks/ParameterFactory.h
index f2fabdccf3..5326fd6c7d 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/ParameterFactory.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/ParameterFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/PhysicsRagdoll.h b/Gems/EMotionFX/Code/Tests/Mocks/PhysicsRagdoll.h
index d044d9202d..7f780ff978 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/PhysicsRagdoll.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/PhysicsRagdoll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/PhysicsSystem.h b/Gems/EMotionFX/Code/Tests/Mocks/PhysicsSystem.h
index c95fbb5537..a2c6a1a8c6 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/PhysicsSystem.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/PhysicsSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/SimulatedJoint.h b/Gems/EMotionFX/Code/Tests/Mocks/SimulatedJoint.h
index 9bf162b776..ca76fd6218 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/SimulatedJoint.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/SimulatedJoint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/SimulatedObject.h b/Gems/EMotionFX/Code/Tests/Mocks/SimulatedObject.h
index 7fa90d3dec..a5b7d80325 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/SimulatedObject.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/SimulatedObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/SimulatedObjectSetup.h b/Gems/EMotionFX/Code/Tests/Mocks/SimulatedObjectSetup.h
index 95fb1a2839..969b366bb2 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/SimulatedObjectSetup.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/SimulatedObjectSetup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/Skeleton.h b/Gems/EMotionFX/Code/Tests/Mocks/Skeleton.h
index 13fc83f303..8431ad754c 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/Skeleton.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/Skeleton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Mocks/ValueParameter.h b/Gems/EMotionFX/Code/Tests/Mocks/ValueParameter.h
index 6efdff88d1..b4b6427550 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/ValueParameter.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/ValueParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MorphSkinAttachmentTests.cpp b/Gems/EMotionFX/Code/Tests/MorphSkinAttachmentTests.cpp
index a9b1e5fd8d..5ab42c2322 100644
--- a/Gems/EMotionFX/Code/Tests/MorphSkinAttachmentTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MorphSkinAttachmentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MorphTargetPipelineTests.cpp b/Gems/EMotionFX/Code/Tests/MorphTargetPipelineTests.cpp
index e20b2e16e0..caff74a431 100644
--- a/Gems/EMotionFX/Code/Tests/MorphTargetPipelineTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MorphTargetPipelineTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MorphTargetRuntimeTests.cpp b/Gems/EMotionFX/Code/Tests/MorphTargetRuntimeTests.cpp
index 5e7c7d1034..fda9ea2c04 100644
--- a/Gems/EMotionFX/Code/Tests/MorphTargetRuntimeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MorphTargetRuntimeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MotionDataTests.cpp b/Gems/EMotionFX/Code/Tests/MotionDataTests.cpp
index d7c820a086..e8c55cdeea 100644
--- a/Gems/EMotionFX/Code/Tests/MotionDataTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MotionDataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MotionEventCommandTests.cpp b/Gems/EMotionFX/Code/Tests/MotionEventCommandTests.cpp
index 497efd666e..99a8a2c2b9 100644
--- a/Gems/EMotionFX/Code/Tests/MotionEventCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MotionEventCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MotionEventTrackTests.cpp b/Gems/EMotionFX/Code/Tests/MotionEventTrackTests.cpp
index 42711e2ca7..d88845a9e9 100644
--- a/Gems/EMotionFX/Code/Tests/MotionEventTrackTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MotionEventTrackTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MotionExtractionBusTests.cpp b/Gems/EMotionFX/Code/Tests/MotionExtractionBusTests.cpp
index e9a701400f..70b73f09f1 100644
--- a/Gems/EMotionFX/Code/Tests/MotionExtractionBusTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MotionExtractionBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MotionExtractionTests.cpp b/Gems/EMotionFX/Code/Tests/MotionExtractionTests.cpp
index dd9c8ee7ba..cf03766bb7 100644
--- a/Gems/EMotionFX/Code/Tests/MotionExtractionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MotionExtractionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MotionInstanceTests.cpp b/Gems/EMotionFX/Code/Tests/MotionInstanceTests.cpp
index 6baf65966f..502f9163e3 100644
--- a/Gems/EMotionFX/Code/Tests/MotionInstanceTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MotionInstanceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MotionLayerSystemTests.cpp b/Gems/EMotionFX/Code/Tests/MotionLayerSystemTests.cpp
index ab5e575e01..97ef1527ad 100644
--- a/Gems/EMotionFX/Code/Tests/MotionLayerSystemTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MotionLayerSystemTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/MultiThreadSchedulerTests.cpp b/Gems/EMotionFX/Code/Tests/MultiThreadSchedulerTests.cpp
index d53170dc25..062be2b0e2 100644
--- a/Gems/EMotionFX/Code/Tests/MultiThreadSchedulerTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/MultiThreadSchedulerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/NonUniformMotionDataTests.cpp b/Gems/EMotionFX/Code/Tests/NonUniformMotionDataTests.cpp
index a0985f1a0e..0e54487524 100644
--- a/Gems/EMotionFX/Code/Tests/NonUniformMotionDataTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/NonUniformMotionDataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/PhysicsSetupUtils.cpp b/Gems/EMotionFX/Code/Tests/PhysicsSetupUtils.cpp
index 1b06c407dd..ff9f70d078 100644
--- a/Gems/EMotionFX/Code/Tests/PhysicsSetupUtils.cpp
+++ b/Gems/EMotionFX/Code/Tests/PhysicsSetupUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/PhysicsSetupUtils.h b/Gems/EMotionFX/Code/Tests/PhysicsSetupUtils.h
index 5b178c797b..8e3118fb93 100644
--- a/Gems/EMotionFX/Code/Tests/PhysicsSetupUtils.h
+++ b/Gems/EMotionFX/Code/Tests/PhysicsSetupUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/PoseTests.cpp b/Gems/EMotionFX/Code/Tests/PoseTests.cpp
index 965c1a1592..212bd30846 100644
--- a/Gems/EMotionFX/Code/Tests/PoseTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/PoseTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Prefabs/LeftArmSkeleton.h b/Gems/EMotionFX/Code/Tests/Prefabs/LeftArmSkeleton.h
index e7d885144d..b97322789f 100644
--- a/Gems/EMotionFX/Code/Tests/Prefabs/LeftArmSkeleton.h
+++ b/Gems/EMotionFX/Code/Tests/Prefabs/LeftArmSkeleton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Printers.cpp b/Gems/EMotionFX/Code/Tests/Printers.cpp
index 2fa8ede4a1..a68a1eb601 100644
--- a/Gems/EMotionFX/Code/Tests/Printers.cpp
+++ b/Gems/EMotionFX/Code/Tests/Printers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Printers.h b/Gems/EMotionFX/Code/Tests/Printers.h
index 00e05bb5f9..b70ec07e14 100644
--- a/Gems/EMotionFX/Code/Tests/Printers.h
+++ b/Gems/EMotionFX/Code/Tests/Printers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphActivateTests.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphActivateTests.cpp
index aef5378d10..e5c47cde17 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphActivateTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphActivateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphModelTests.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphModelTests.cpp
index eeb434cee1..b66336b121 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphModelTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphModelTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphNodeTests.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphNodeTests.cpp
index 707a1cae21..4fa022f012 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphNodeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphPreviewMotionTests.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphPreviewMotionTests.cpp
index 918ea13191..007deefc14 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphPreviewMotionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/AnimGraphPreviewMotionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanDeleteAnimGraphNode.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanDeleteAnimGraphNode.cpp
index e1eaacd16e..945d6859f6 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanDeleteAnimGraphNode.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanDeleteAnimGraphNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanEditAnimGraphNode.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanEditAnimGraphNode.cpp
index 044cc0ea0d..4053153419 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanEditAnimGraphNode.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/CanEditAnimGraphNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/ParameterWindowTests.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/ParameterWindowTests.cpp
index 7e637cc573..dacf06afd8 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/ParameterWindowTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/ParameterWindowTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/AddGroup.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/AddGroup.cpp
index 95cdadea72..f495fcd62a 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/AddGroup.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/AddGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/AddParameter.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/AddParameter.cpp
index 57d3b3eff8..0d912b236f 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/AddParameter.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/AddParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/CannotAssignGroupsParentAsChild.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/CannotAssignGroupsParentAsChild.cpp
index 4ee1d5517f..6c91ff4a60 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/CannotAssignGroupsParentAsChild.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/CannotAssignGroupsParentAsChild.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/ParameterGroupEdit.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/ParameterGroupEdit.cpp
index 2019fc650a..7b46a1fc74 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/ParameterGroupEdit.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/ParameterGroupEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/RemoveGroup.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/RemoveGroup.cpp
index 7f458b9ebb..3e273281a9 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/RemoveGroup.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/RemoveGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/RemoveParameter.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/RemoveParameter.cpp
index 7a9e28aa2b..425fa30720 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/RemoveParameter.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Parameters/RemoveParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/ParametersGroupDefaultValues.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/ParametersGroupDefaultValues.cpp
index b1466b30c7..af87d1d8c0 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/ParametersGroupDefaultValues.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/ParametersGroupDefaultValues.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/PreviewMotionFixture.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/PreviewMotionFixture.cpp
index bf2e310fdf..8403517ee4 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/PreviewMotionFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/PreviewMotionFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/PreviewMotionFixture.h b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/PreviewMotionFixture.h
index 2c5759368f..aa5d7c3e97 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/PreviewMotionFixture.h
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/PreviewMotionFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/SimpleAnimGraphUIFixture.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/SimpleAnimGraphUIFixture.cpp
index 35893cc3b4..fc29e577bf 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/SimpleAnimGraphUIFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/SimpleAnimGraphUIFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/SimpleAnimGraphUIFixture.h b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/SimpleAnimGraphUIFixture.h
index 6d6eea92ce..58003a324c 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/SimpleAnimGraphUIFixture.h
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/SimpleAnimGraphUIFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/StateMachine/EntryStateTests.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/StateMachine/EntryStateTests.cpp
index e32942c7bb..f6938d2d20 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/StateMachine/EntryStateTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/StateMachine/EntryStateTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/AddTransition.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/AddTransition.cpp
index ba618a3825..0b68c02619 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/AddTransition.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/AddTransition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/AddTransitionCondition.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/AddTransitionCondition.cpp
index b3f03c400e..1d2436909e 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/AddTransitionCondition.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/AddTransitionCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/EditTransition.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/EditTransition.cpp
index a319a7b7bb..bf590da3d4 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/EditTransition.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/EditTransition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp
index 46bcd8aecf..487290fc33 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransitionCondition.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransitionCondition.cpp
index 70c6f22863..a8465f8025 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransitionCondition.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransitionCondition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/Menus/FileMenu/CanReset.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/Menus/FileMenu/CanReset.cpp
index fec45e9f81..55e9aded3c 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/Menus/FileMenu/CanReset.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/Menus/FileMenu/CanReset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/MotionSet/CanCreateMotionSet.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/MotionSet/CanCreateMotionSet.cpp
index 2e8f1b5702..68e19f768f 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/MotionSet/CanCreateMotionSet.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/MotionSet/CanCreateMotionSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/MotionSet/CanRemoveMotionSet.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/MotionSet/CanRemoveMotionSet.cpp
index 061f6a5ac1..d47a3b2f94 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/MotionSet/CanRemoveMotionSet.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/MotionSet/CanRemoveMotionSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/CanAddMotions.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/CanAddMotions.cpp
index 14a9990b5a..7a4e5d0bcb 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/CanAddMotions.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/CanAddMotions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/CanRemoveMotions.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/CanRemoveMotions.cpp
index 5d25a6aa57..617436746d 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/CanRemoveMotions.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/CanRemoveMotions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/MotionPlaybacksTests.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/MotionPlaybacksTests.cpp
index 4d260c484c..3045b6e7f9 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/MotionPlaybacksTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/Motions/MotionPlaybacksTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/Ragdoll/CanCopyPasteColliders.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/Ragdoll/CanCopyPasteColliders.cpp
index 177ccd1e15..9ea8534f3b 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/Ragdoll/CanCopyPasteColliders.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/Ragdoll/CanCopyPasteColliders.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/ProvidesUI/Ragdoll/CanCopyPasteJointLimits.cpp b/Gems/EMotionFX/Code/Tests/ProvidesUI/Ragdoll/CanCopyPasteJointLimits.cpp
index 583d2ad4fc..29e92117eb 100644
--- a/Gems/EMotionFX/Code/Tests/ProvidesUI/Ragdoll/CanCopyPasteJointLimits.cpp
+++ b/Gems/EMotionFX/Code/Tests/ProvidesUI/Ragdoll/CanCopyPasteJointLimits.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/QuaternionParameterTests.cpp b/Gems/EMotionFX/Code/Tests/QuaternionParameterTests.cpp
index a1e5b8075f..b63f64893c 100644
--- a/Gems/EMotionFX/Code/Tests/QuaternionParameterTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/QuaternionParameterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/RagdollCommandTests.cpp b/Gems/EMotionFX/Code/Tests/RagdollCommandTests.cpp
index 5ed6dd0dbc..242444f6b1 100644
--- a/Gems/EMotionFX/Code/Tests/RagdollCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/RagdollCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/RandomMotionSelectionTests.cpp b/Gems/EMotionFX/Code/Tests/RandomMotionSelectionTests.cpp
index 3bcb995db5..7d45b31753 100644
--- a/Gems/EMotionFX/Code/Tests/RandomMotionSelectionTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/RandomMotionSelectionTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/RenderBackendManagerTests.cpp b/Gems/EMotionFX/Code/Tests/RenderBackendManagerTests.cpp
index df83c9c09c..639093d6d1 100644
--- a/Gems/EMotionFX/Code/Tests/RenderBackendManagerTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/RenderBackendManagerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SelectionListTests.cpp b/Gems/EMotionFX/Code/Tests/SelectionListTests.cpp
index ccaeda1e2b..9297ee0d9b 100644
--- a/Gems/EMotionFX/Code/Tests/SelectionListTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SelectionListTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SimpleMotionComponentBusTests.cpp b/Gems/EMotionFX/Code/Tests/SimpleMotionComponentBusTests.cpp
index b2baf3d6d4..e710381e32 100644
--- a/Gems/EMotionFX/Code/Tests/SimpleMotionComponentBusTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SimpleMotionComponentBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SimulatedObjectCommandTests.cpp b/Gems/EMotionFX/Code/Tests/SimulatedObjectCommandTests.cpp
index 75495287b0..783987cd9a 100644
--- a/Gems/EMotionFX/Code/Tests/SimulatedObjectCommandTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SimulatedObjectCommandTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SimulatedObjectModelTests.cpp b/Gems/EMotionFX/Code/Tests/SimulatedObjectModelTests.cpp
index a5cc21bece..88008106ef 100644
--- a/Gems/EMotionFX/Code/Tests/SimulatedObjectModelTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SimulatedObjectModelTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SimulatedObjectPipelineTests.cpp b/Gems/EMotionFX/Code/Tests/SimulatedObjectPipelineTests.cpp
index df4d5dcb43..d64682a128 100644
--- a/Gems/EMotionFX/Code/Tests/SimulatedObjectPipelineTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SimulatedObjectPipelineTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SimulatedObjectSerializeTests.cpp b/Gems/EMotionFX/Code/Tests/SimulatedObjectSerializeTests.cpp
index abcee94e38..036e331b4e 100644
--- a/Gems/EMotionFX/Code/Tests/SimulatedObjectSerializeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SimulatedObjectSerializeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SimulatedObjectSetupTests.cpp b/Gems/EMotionFX/Code/Tests/SimulatedObjectSetupTests.cpp
index 24a76fa925..76a46a4776 100644
--- a/Gems/EMotionFX/Code/Tests/SimulatedObjectSetupTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SimulatedObjectSetupTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SkeletalLODTests.cpp b/Gems/EMotionFX/Code/Tests/SkeletalLODTests.cpp
index 85bae2389a..2f53d4568f 100644
--- a/Gems/EMotionFX/Code/Tests/SkeletalLODTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SkeletalLODTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SkeletonNodeSearchTests.cpp b/Gems/EMotionFX/Code/Tests/SkeletonNodeSearchTests.cpp
index 9d3a77181c..650b299f65 100644
--- a/Gems/EMotionFX/Code/Tests/SkeletonNodeSearchTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SkeletonNodeSearchTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SyncingSystemTests.cpp b/Gems/EMotionFX/Code/Tests/SyncingSystemTests.cpp
index 1131305850..28f7a36738 100644
--- a/Gems/EMotionFX/Code/Tests/SyncingSystemTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SyncingSystemTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SystemComponentFixture.h b/Gems/EMotionFX/Code/Tests/SystemComponentFixture.h
index 99e894d959..f40d1a810d 100644
--- a/Gems/EMotionFX/Code/Tests/SystemComponentFixture.h
+++ b/Gems/EMotionFX/Code/Tests/SystemComponentFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/SystemComponentTests.cpp b/Gems/EMotionFX/Code/Tests/SystemComponentTests.cpp
index ed03c22453..f70ee875f3 100644
--- a/Gems/EMotionFX/Code/Tests/SystemComponentTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/SystemComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/ActorAssetFactory.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/ActorAssetFactory.h
index 4075af3073..da0450b92b 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/ActorAssetFactory.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/ActorAssetFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/ActorFactory.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/ActorFactory.h
index 3b23d319d8..e65c849576 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/ActorFactory.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/ActorFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphAssetFactory.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphAssetFactory.h
index 4913517557..b963fd8559 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphAssetFactory.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphAssetFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphFactory.cpp b/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphFactory.cpp
index 6e3108aa22..8fa56e1d47 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphFactory.cpp
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphFactory.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphFactory.h
index 9f0b36e843..8b6f88665e 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphFactory.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/AnimGraphFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/JackActor.cpp b/Gems/EMotionFX/Code/Tests/TestAssetCode/JackActor.cpp
index 7b4090905e..115647ecde 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/JackActor.cpp
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/JackActor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/JackActor.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/JackActor.h
index ddb8630b86..e48e606717 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/JackActor.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/JackActor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/MeshFactory.cpp b/Gems/EMotionFX/Code/Tests/TestAssetCode/MeshFactory.cpp
index 77bb6f79ef..89a424d2b0 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/MeshFactory.cpp
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/MeshFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/MeshFactory.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/MeshFactory.h
index 6c26a6f4f4..3a6090b082 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/MeshFactory.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/MeshFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionEvent.cpp b/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionEvent.cpp
index 03b7972d58..823fb75316 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionEvent.cpp
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionEvent.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionEvent.h
index ce67e7bda8..4be3fdb7b0 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionEvent.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionSetAssetFactory.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionSetAssetFactory.h
index cfe79f5f5e..50231d8db3 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionSetAssetFactory.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/MotionSetAssetFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/SimpleActors.cpp b/Gems/EMotionFX/Code/Tests/TestAssetCode/SimpleActors.cpp
index aa00c03d0e..6dda21cb46 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/SimpleActors.cpp
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/SimpleActors.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/SimpleActors.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/SimpleActors.h
index 01dd33dd29..4a9303f4e9 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/SimpleActors.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/SimpleActors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/TestActorAssets.cpp b/Gems/EMotionFX/Code/Tests/TestAssetCode/TestActorAssets.cpp
index 79726203a3..fb88ffb2b7 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/TestActorAssets.cpp
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/TestActorAssets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/TestActorAssets.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/TestActorAssets.h
index 178c71b23f..e0883ac03b 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/TestActorAssets.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/TestActorAssets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/TestMotionAssets.cpp b/Gems/EMotionFX/Code/Tests/TestAssetCode/TestMotionAssets.cpp
index bb918574d1..299a09f3b7 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/TestMotionAssets.cpp
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/TestMotionAssets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TestAssetCode/TestMotionAssets.h b/Gems/EMotionFX/Code/Tests/TestAssetCode/TestMotionAssets.h
index 1721616414..1fd909c21c 100644
--- a/Gems/EMotionFX/Code/Tests/TestAssetCode/TestMotionAssets.h
+++ b/Gems/EMotionFX/Code/Tests/TestAssetCode/TestMotionAssets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/TransformUnitTests.cpp b/Gems/EMotionFX/Code/Tests/TransformUnitTests.cpp
index 601dd5104b..5845677336 100644
--- a/Gems/EMotionFX/Code/Tests/TransformUnitTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/TransformUnitTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/AnimGraphUIFixture.cpp b/Gems/EMotionFX/Code/Tests/UI/AnimGraphUIFixture.cpp
index 3c2be8e901..808a3556b4 100644
--- a/Gems/EMotionFX/Code/Tests/UI/AnimGraphUIFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/AnimGraphUIFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/AnimGraphUIFixture.h b/Gems/EMotionFX/Code/Tests/UI/AnimGraphUIFixture.h
index 35affe1518..dd4a2eaeb7 100644
--- a/Gems/EMotionFX/Code/Tests/UI/AnimGraphUIFixture.h
+++ b/Gems/EMotionFX/Code/Tests/UI/AnimGraphUIFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAddAnimGraph.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAddAnimGraph.cpp
index 49b5093d7a..55b0562703 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAddAnimGraph.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAddAnimGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAddJointAndChildren.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAddJointAndChildren.cpp
index aa5cdb77c5..aff2bf956c 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAddJointAndChildren.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAddJointAndChildren.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAddMotionToAnimGraphNode.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAddMotionToAnimGraphNode.cpp
index 4736dfe0b2..93fa4e9ae5 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAddMotionToAnimGraphNode.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAddMotionToAnimGraphNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAddMotionToMotionSet.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAddMotionToMotionSet.cpp
index affbbddf7f..c12df4fe65 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAddMotionToMotionSet.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAddMotionToMotionSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAddReferenceNode.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAddReferenceNode.cpp
index f0d209ab77..84dfb755c3 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAddReferenceNode.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAddReferenceNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAddSimulatedObject.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAddSimulatedObject.cpp
index 290faecd85..07a6933450 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAddSimulatedObject.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAddSimulatedObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAddToSimulatedObject.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAddToSimulatedObject.cpp
index 6206d46433..e6809ce958 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAddToSimulatedObject.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAddToSimulatedObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAdjustGroupParameter.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAdjustGroupParameter.cpp
index f6dc5069e6..a4ba140832 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAdjustGroupParameter.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAdjustGroupParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanAutoSaveFile.cpp b/Gems/EMotionFX/Code/Tests/UI/CanAutoSaveFile.cpp
index 1ff415ebec..8783a97f34 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanAutoSaveFile.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanAutoSaveFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanChangeParametersInSimulatedObject.cpp b/Gems/EMotionFX/Code/Tests/UI/CanChangeParametersInSimulatedObject.cpp
index 9d428f4ab8..e389552174 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanChangeParametersInSimulatedObject.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanChangeParametersInSimulatedObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanDeleteAnimGraphNode_AnimGraphModelUpdates.cpp b/Gems/EMotionFX/Code/Tests/UI/CanDeleteAnimGraphNode_AnimGraphModelUpdates.cpp
index 3a693ed5c4..9ccbb99ca6 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanDeleteAnimGraphNode_AnimGraphModelUpdates.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanDeleteAnimGraphNode_AnimGraphModelUpdates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanEditParameters.cpp b/Gems/EMotionFX/Code/Tests/UI/CanEditParameters.cpp
index 20ac76cd47..f03aa79ee3 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanEditParameters.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanEditParameters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanMorphManyShapes.cpp b/Gems/EMotionFX/Code/Tests/UI/CanMorphManyShapes.cpp
index da14bc5604..f7a5c532f8 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanMorphManyShapes.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanMorphManyShapes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanOpenWorkspace.cpp b/Gems/EMotionFX/Code/Tests/UI/CanOpenWorkspace.cpp
index a11a13171c..fa3905e733 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanOpenWorkspace.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanOpenWorkspace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanRemoveMotionFromMotionSet.cpp b/Gems/EMotionFX/Code/Tests/UI/CanRemoveMotionFromMotionSet.cpp
index 0c47aea473..5a44d1e7cc 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanRemoveMotionFromMotionSet.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanRemoveMotionFromMotionSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanRenameParameter_ParameterNodeUpdates.cpp b/Gems/EMotionFX/Code/Tests/UI/CanRenameParameter_ParameterNodeUpdates.cpp
index e7e7656d64..498f096570 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanRenameParameter_ParameterNodeUpdates.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanRenameParameter_ParameterNodeUpdates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanSeeJoints.cpp b/Gems/EMotionFX/Code/Tests/UI/CanSeeJoints.cpp
index 9df26b9c27..2b5acae522 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanSeeJoints.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanSeeJoints.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanUseEditMenu.cpp b/Gems/EMotionFX/Code/Tests/UI/CanUseEditMenu.cpp
index 2f9737931f..86b2db6804 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanUseEditMenu.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanUseEditMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp b/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
index 1de5d3942e..53b9ec8aa4 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -249,7 +249,7 @@ namespace EMotionFX
             LoadActor(actorFilename.toUtf8().data(), false);
             ASSERT_EQ(EMotionFX::GetActorManager().GetNumActorInstances(), 2) << "Failed to merge Actor.";
 
-            // We can't test Save Selected Actor as we would it would involve mocking fbx scene handling.
+            // We can't test Save Selected Actor as we would it would involve mocking source scene handling.
 
             // Add the filename to the recent actorsa anyway, so we can test that functionality.
             EMStudio::GetMainWindow()->AddRecentActorFile(actorFilename);
@@ -634,7 +634,7 @@ namespace EMotionFX
             motionSet->SetFilename(motionsetFilename.toUtf8().constData());
             motionSet->SetDirtyFlag(true);
 
-            // Don't create an actor or motion as we can't save that due to fbx scene requirements.
+            // Don't create an actor or motion as we can't save that due to source scene requirements.
 
             EMStudio::Workspace* workspace = EMStudio::GetManager()->GetWorkspace();
             const QString workspaceFilename = GenerateTempWorkspaceFilename();
diff --git a/Gems/EMotionFX/Code/Tests/UI/CanUseHelpMenu.cpp b/Gems/EMotionFX/Code/Tests/UI/CanUseHelpMenu.cpp
index f72e4f79b9..3dc7f37e58 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanUseHelpMenu.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanUseHelpMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanUseLayoutMenu.cpp b/Gems/EMotionFX/Code/Tests/UI/CanUseLayoutMenu.cpp
index 1eb571967b..29f6b7e8fe 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanUseLayoutMenu.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanUseLayoutMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CanUseViewMenu.cpp b/Gems/EMotionFX/Code/Tests/UI/CanUseViewMenu.cpp
index e152b4b09f..096a3396b8 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanUseViewMenu.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanUseViewMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/ClothColliderTests.cpp b/Gems/EMotionFX/Code/Tests/UI/ClothColliderTests.cpp
index eef25d67d3..f4fd5ec8bb 100644
--- a/Gems/EMotionFX/Code/Tests/UI/ClothColliderTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/ClothColliderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CommandRunnerFixture.cpp b/Gems/EMotionFX/Code/Tests/UI/CommandRunnerFixture.cpp
index c455284df1..2949f93144 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CommandRunnerFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CommandRunnerFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/CommandRunnerFixture.h b/Gems/EMotionFX/Code/Tests/UI/CommandRunnerFixture.h
index 025bd869be..48375b478c 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CommandRunnerFixture.h
+++ b/Gems/EMotionFX/Code/Tests/UI/CommandRunnerFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/LODSkinnedMeshTests.cpp b/Gems/EMotionFX/Code/Tests/UI/LODSkinnedMeshTests.cpp
index 8c259725d0..26fb67f681 100644
--- a/Gems/EMotionFX/Code/Tests/UI/LODSkinnedMeshTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/LODSkinnedMeshTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/MenuUIFixture.cpp b/Gems/EMotionFX/Code/Tests/UI/MenuUIFixture.cpp
index 382e9fe44e..e014584355 100644
--- a/Gems/EMotionFX/Code/Tests/UI/MenuUIFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/MenuUIFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/MenuUIFixture.h b/Gems/EMotionFX/Code/Tests/UI/MenuUIFixture.h
index b06d193996..d68f550d73 100644
--- a/Gems/EMotionFX/Code/Tests/UI/MenuUIFixture.h
+++ b/Gems/EMotionFX/Code/Tests/UI/MenuUIFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/ModalPopupHandler.cpp b/Gems/EMotionFX/Code/Tests/UI/ModalPopupHandler.cpp
index 10ca7f946c..0f85648792 100644
--- a/Gems/EMotionFX/Code/Tests/UI/ModalPopupHandler.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/ModalPopupHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/ModalPopupHandler.h b/Gems/EMotionFX/Code/Tests/UI/ModalPopupHandler.h
index 02d68be5c9..b8ef7b9b91 100644
--- a/Gems/EMotionFX/Code/Tests/UI/ModalPopupHandler.h
+++ b/Gems/EMotionFX/Code/Tests/UI/ModalPopupHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/RagdollEditTests.cpp b/Gems/EMotionFX/Code/Tests/UI/RagdollEditTests.cpp
index 4ade919559..175284a0b1 100644
--- a/Gems/EMotionFX/Code/Tests/UI/RagdollEditTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/RagdollEditTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/UIFixture.cpp b/Gems/EMotionFX/Code/Tests/UI/UIFixture.cpp
index 2bef10a42b..9140b3f86d 100644
--- a/Gems/EMotionFX/Code/Tests/UI/UIFixture.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/UIFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UI/UIFixture.h b/Gems/EMotionFX/Code/Tests/UI/UIFixture.h
index 9b03081299..7475d15800 100644
--- a/Gems/EMotionFX/Code/Tests/UI/UIFixture.h
+++ b/Gems/EMotionFX/Code/Tests/UI/UIFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/UniformMotionDataTests.cpp b/Gems/EMotionFX/Code/Tests/UniformMotionDataTests.cpp
index 3dbe321ad8..01930004fc 100644
--- a/Gems/EMotionFX/Code/Tests/UniformMotionDataTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/UniformMotionDataTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Vector2ToVector3CompatibilityTests.cpp b/Gems/EMotionFX/Code/Tests/Vector2ToVector3CompatibilityTests.cpp
index 8275d84681..416f0c9110 100644
--- a/Gems/EMotionFX/Code/Tests/Vector2ToVector3CompatibilityTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/Vector2ToVector3CompatibilityTests.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/Vector3ParameterTests.cpp b/Gems/EMotionFX/Code/Tests/Vector3ParameterTests.cpp
index 7cc79d3b91..302e758752 100644
--- a/Gems/EMotionFX/Code/Tests/Vector3ParameterTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/Vector3ParameterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py b/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py
index e00ebc0f21..8e8734d2be 100755
--- a/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py
+++ b/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/EMotionFX/Code/emotionfx_editor_files.cmake b/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
index 74431809c2..112309b710 100644
--- a/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/emotionfx_editor_tests_files.cmake b/Gems/EMotionFX/Code/emotionfx_editor_tests_files.cmake
index b39b5e117c..f77701122d 100644
--- a/Gems/EMotionFX/Code/emotionfx_editor_tests_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/emotionfx_files.cmake b/Gems/EMotionFX/Code/emotionfx_files.cmake
index 83fceb06ef..6eb336b81d 100644
--- a/Gems/EMotionFX/Code/emotionfx_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/emotionfx_shared_files.cmake b/Gems/EMotionFX/Code/emotionfx_shared_files.cmake
index 73115a36cb..dceac88c4d 100644
--- a/Gems/EMotionFX/Code/emotionfx_shared_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/emotionfx_shared_tests_files.cmake b/Gems/EMotionFX/Code/emotionfx_shared_tests_files.cmake
index e0696d91e9..93b6b738a3 100644
--- a/Gems/EMotionFX/Code/emotionfx_shared_tests_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_shared_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EMotionFX/Code/emotionfx_tests_files.cmake b/Gems/EMotionFX/Code/emotionfx_tests_files.cmake
index 58d094b308..93c3fed1f5 100644
--- a/Gems/EMotionFX/Code/emotionfx_tests_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/CMakeLists.txt b/Gems/EditorPythonBindings/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/EditorPythonBindings/CMakeLists.txt
+++ b/Gems/EditorPythonBindings/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/CMakeLists.txt b/Gems/EditorPythonBindings/Code/CMakeLists.txt
index a811239661..ef26a2b033 100644
--- a/Gems/EditorPythonBindings/Code/CMakeLists.txt
+++ b/Gems/EditorPythonBindings/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/CustomTypeBindingBus.h b/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/CustomTypeBindingBus.h
index 386e9f6cf8..8299f36ab4 100644
--- a/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/CustomTypeBindingBus.h
+++ b/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/CustomTypeBindingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/EditorPythonBindingsBus.h b/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/EditorPythonBindingsBus.h
index 77a48406ae..71bc7e6a83 100644
--- a/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/EditorPythonBindingsBus.h
+++ b/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/EditorPythonBindingsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/EditorPythonBindingsSymbols.h b/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/EditorPythonBindingsSymbols.h
index 3b253f0268..6b50654a9d 100644
--- a/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/EditorPythonBindingsSymbols.h
+++ b/Gems/EditorPythonBindings/Code/Include/EditorPythonBindings/EditorPythonBindingsSymbols.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp b/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp
index c202cc03b2..a141b3caa6 100644
--- a/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/Platform/Common/Clang/editorpythonbindings_static_clang.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Common/Clang/editorpythonbindings_static_clang.cmake
index e5c49c47cd..89a2dfa866 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Common/Clang/editorpythonbindings_static_clang.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Common/Clang/editorpythonbindings_static_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Common/Clang/editorpythonbindings_tests_clang.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Common/Clang/editorpythonbindings_tests_clang.cmake
index e5c49c47cd..89a2dfa866 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Common/Clang/editorpythonbindings_tests_clang.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Common/Clang/editorpythonbindings_tests_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Common/MSVC/editorpythonbindings_static_msvc.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Common/MSVC/editorpythonbindings_static_msvc.cmake
index 002a8c63ef..e7e2742b9d 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Common/MSVC/editorpythonbindings_static_msvc.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Common/MSVC/editorpythonbindings_static_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Common/MSVC/editorpythonbindings_tests_msvc.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Common/MSVC/editorpythonbindings_tests_msvc.cmake
index 002a8c63ef..e7e2742b9d 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Common/MSVC/editorpythonbindings_tests_msvc.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Common/MSVC/editorpythonbindings_tests_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Linux/PythonSystemComponent_linux.cpp b/Gems/EditorPythonBindings/Code/Source/Platform/Linux/PythonSystemComponent_linux.cpp
index 5faf1417c2..21c369bb80 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Linux/PythonSystemComponent_linux.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Linux/PythonSystemComponent_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Linux/platform_linux.cmake
index e5c49c47cd..89a2dfa866 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Linux/platform_linux_files.cmake
index 3bdc26b1fe..2073ab359e 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Mac/PythonSystemComponent_mac.cpp b/Gems/EditorPythonBindings/Code/Source/Platform/Mac/PythonSystemComponent_mac.cpp
index a0c304b6f6..61e02727d2 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Mac/PythonSystemComponent_mac.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Mac/PythonSystemComponent_mac.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Mac/platform_mac_files.cmake
index 9187325816..5daf394a6b 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Windows/PythonSystemComponent_windows.cpp b/Gems/EditorPythonBindings/Code/Source/Platform/Windows/PythonSystemComponent_windows.cpp
index 6731f70e35..53164ea0fd 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Windows/PythonSystemComponent_windows.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Windows/PythonSystemComponent_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Windows/platform_windows.cmake
index c1d9d8b6b5..db62374d57 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/EditorPythonBindings/Code/Source/Platform/Windows/platform_windows_files.cmake
index 710bad7088..cc6175a24f 100644
--- a/Gems/EditorPythonBindings/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/EditorPythonBindings/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/Source/PythonCommon.h b/Gems/EditorPythonBindings/Code/Source/PythonCommon.h
index 4ce3330475..b9df3e3c78 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonCommon.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.cpp b/Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.cpp
index 0e7460ddc1..f80e42e925 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.h b/Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.h
index 33f6469b9e..6366b75753 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonMarshalComponent.cpp b/Gems/EditorPythonBindings/Code/Source/PythonMarshalComponent.cpp
index a761911a56..08794fc464 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonMarshalComponent.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonMarshalComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonMarshalComponent.h b/Gems/EditorPythonBindings/Code/Source/PythonMarshalComponent.h
index 81e837d42c..737272e908 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonMarshalComponent.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonMarshalComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp b/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp
index 520fc84b28..da2cbd42d2 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.h b/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.h
index c71fcec5cc..c4814fba59 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.cpp b/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.cpp
index 970b5bf2c1..745385d5e8 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.h b/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.h
index 86ec80d1ff..54890bf5fd 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonReflectionComponent.cpp b/Gems/EditorPythonBindings/Code/Source/PythonReflectionComponent.cpp
index 2a47b6a172..dcdbb93882 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonReflectionComponent.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonReflectionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonReflectionComponent.h b/Gems/EditorPythonBindings/Code/Source/PythonReflectionComponent.h
index 88b594d359..396a045615 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonReflectionComponent.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonReflectionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonSymbolsBus.h b/Gems/EditorPythonBindings/Code/Source/PythonSymbolsBus.h
index 2f993f2b43..b13cb16243 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonSymbolsBus.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonSymbolsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
index c18bfb200f..a2241b9953 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.h b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.h
index b2d0a9abc1..82f44e674d 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonTypeCasters.h b/Gems/EditorPythonBindings/Code/Source/PythonTypeCasters.h
index 4d0064a06a..c842b74c70 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonTypeCasters.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonTypeCasters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonUtility.cpp b/Gems/EditorPythonBindings/Code/Source/PythonUtility.cpp
index aeb9298352..a036c0dfa6 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonUtility.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Source/PythonUtility.h b/Gems/EditorPythonBindings/Code/Source/PythonUtility.h
index adb901eb74..c8655020d7 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonUtility.h
+++ b/Gems/EditorPythonBindings/Code/Source/PythonUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/CustomTypeBindingBusTests.cpp b/Gems/EditorPythonBindings/Code/Tests/CustomTypeBindingBusTests.cpp
index f454c71ce2..66bcb07cdb 100644
--- a/Gems/EditorPythonBindings/Code/Tests/CustomTypeBindingBusTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/CustomTypeBindingBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp
index 34ffb0414a..fa3d2374c4 100644
--- a/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.py b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.py
index aced41006b..345b1200cb 100755
--- a/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.py
+++ b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTestWithArgs.py b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTestWithArgs.py
index 1916a95c16..dd77a33f2e 100755
--- a/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTestWithArgs.py
+++ b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTestWithArgs.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/EditorPythonBindings/Code/Tests/PythonAssetTypesTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonAssetTypesTests.cpp
index 264088275a..e73ff0459f 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonAssetTypesTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonAssetTypesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonAssociativeTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonAssociativeTests.cpp
index d0d0dfdc46..a5d360dcaf 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonAssociativeTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonAssociativeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonBindingLibTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonBindingLibTests.cpp
index 7537d6fb4f..babbd819b7 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonBindingLibTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonBindingLibTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonContainerAnyTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonContainerAnyTests.cpp
index fc5f69f7a6..58fa74f2d6 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonContainerAnyTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonContainerAnyTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonDictionaryTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonDictionaryTests.cpp
index 39b80b9771..31c5f35764 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonDictionaryTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonDictionaryTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonGlobalsTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonGlobalsTests.cpp
index 49b8e3bf14..fa8b815aaf 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonGlobalsTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonGlobalsTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonLogSymbolsComponentTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonLogSymbolsComponentTests.cpp
index 348b76ab59..57581515cd 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonLogSymbolsComponentTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonLogSymbolsComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.cpp
index 291d00079a..91bc9492fa 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.h b/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.h
index d96f5d8904..a93fabaa31 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.h
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp
index ea957f86bc..aae9d9cdde 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonProxyObjectTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonProxyObjectTests.cpp
index 1ff2ae12a4..85448a9ec7 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonProxyObjectTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonProxyObjectTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonReflectionComponentTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonReflectionComponentTests.cpp
index f0818087cb..d472ee98aa 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonReflectionComponentTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonReflectionComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonTestingUtility.h b/Gems/EditorPythonBindings/Code/Tests/PythonTestingUtility.h
index b4f7e94357..8bf0f96a99 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonTestingUtility.h
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonTestingUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonThreadingTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonThreadingTests.cpp
index 6664e9e8cf..1588e4a22b 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonThreadingTests.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonThreadingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h b/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h
index e499b4a45d..903b5b3391 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/EditorPythonBindings/Code/Tests/__init__.py b/Gems/EditorPythonBindings/Code/Tests/__init__.py
index 3a3549d485..5482b53e84 100755
--- a/Gems/EditorPythonBindings/Code/Tests/__init__.py
+++ b/Gems/EditorPythonBindings/Code/Tests/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/EditorPythonBindings/Code/Tests/test_package/__init__.py b/Gems/EditorPythonBindings/Code/Tests/test_package/__init__.py
index 3a3549d485..5482b53e84 100755
--- a/Gems/EditorPythonBindings/Code/Tests/test_package/__init__.py
+++ b/Gems/EditorPythonBindings/Code/Tests/test_package/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/EditorPythonBindings/Code/Tests/test_package/do_work.py b/Gems/EditorPythonBindings/Code/Tests/test_package/do_work.py
index 72d4012f14..5a527a6b70 100755
--- a/Gems/EditorPythonBindings/Code/Tests/test_package/do_work.py
+++ b/Gems/EditorPythonBindings/Code/Tests/test_package/do_work.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/EditorPythonBindings/Code/Tests/test_package/import_many.py b/Gems/EditorPythonBindings/Code/Tests/test_package/import_many.py
index 5097a3a075..3a3f97eeaf 100755
--- a/Gems/EditorPythonBindings/Code/Tests/test_package/import_many.py
+++ b/Gems/EditorPythonBindings/Code/Tests/test_package/import_many.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/EditorPythonBindings/Code/Tests/test_package/import_test.py b/Gems/EditorPythonBindings/Code/Tests/test_package/import_test.py
index 2ec18f4b13..e0a498662f 100755
--- a/Gems/EditorPythonBindings/Code/Tests/test_package/import_test.py
+++ b/Gems/EditorPythonBindings/Code/Tests/test_package/import_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/EditorPythonBindings/Code/editorpythonbindings_common_files.cmake b/Gems/EditorPythonBindings/Code/editorpythonbindings_common_files.cmake
index 34b1c6377e..34f7727edc 100644
--- a/Gems/EditorPythonBindings/Code/editorpythonbindings_common_files.cmake
+++ b/Gems/EditorPythonBindings/Code/editorpythonbindings_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/editorpythonbindings_common_stub_files.cmake b/Gems/EditorPythonBindings/Code/editorpythonbindings_common_stub_files.cmake
index ff8860dca5..2c92e48f60 100644
--- a/Gems/EditorPythonBindings/Code/editorpythonbindings_common_stub_files.cmake
+++ b/Gems/EditorPythonBindings/Code/editorpythonbindings_common_stub_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/editorpythonbindings_editor_files.cmake b/Gems/EditorPythonBindings/Code/editorpythonbindings_editor_files.cmake
index dd815084ce..f564bbd0cc 100644
--- a/Gems/EditorPythonBindings/Code/editorpythonbindings_editor_files.cmake
+++ b/Gems/EditorPythonBindings/Code/editorpythonbindings_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/EditorPythonBindings/Code/editorpythonbindings_tests_files.cmake b/Gems/EditorPythonBindings/Code/editorpythonbindings_tests_files.cmake
index 7982b37f4d..8ca72d63fe 100644
--- a/Gems/EditorPythonBindings/Code/editorpythonbindings_tests_files.cmake
+++ b/Gems/EditorPythonBindings/Code/editorpythonbindings_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ExpressionEvaluation/CMakeLists.txt b/Gems/ExpressionEvaluation/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/ExpressionEvaluation/CMakeLists.txt
+++ b/Gems/ExpressionEvaluation/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ExpressionEvaluation/Code/CMakeLists.txt b/Gems/ExpressionEvaluation/Code/CMakeLists.txt
index 9205910dd8..19d3b325c7 100644
--- a/Gems/ExpressionEvaluation/Code/CMakeLists.txt
+++ b/Gems/ExpressionEvaluation/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine.h b/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine.h
index 19e24d1eac..6132d84083 100644
--- a/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine.h
+++ b/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine/ExpressionTree.h b/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine/ExpressionTree.h
index eb927c4697..52c5a153d0 100644
--- a/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine/ExpressionTree.h
+++ b/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine/ExpressionTree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine/ExpressionTypes.h b/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine/ExpressionTypes.h
index 43cd2f4f92..d579fc61cc 100644
--- a/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine/ExpressionTypes.h
+++ b/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEngine/ExpressionTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEvaluationBus.h b/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEvaluationBus.h
index bcdbd7af5e..579bda2553 100644
--- a/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEvaluationBus.h
+++ b/Gems/ExpressionEvaluation/Code/Include/ExpressionEvaluation/ExpressionEvaluationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionElementParser.h b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionElementParser.h
index f0d6de9f2c..2e94d1f0b1 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionElementParser.h
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionElementParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionPrimitive.cpp b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionPrimitive.cpp
index 8282ec923f..796227659c 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionPrimitive.cpp
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionPrimitive.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionPrimitive.h b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionPrimitive.h
index ee0245096f..da3dc53fb1 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionPrimitive.h
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionPrimitive.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionVariable.cpp b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionVariable.cpp
index cde8b4ee23..3ba6a099a0 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionVariable.cpp
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionVariable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionVariable.h b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionVariable.h
index f1aa47bce9..cf24f0bff0 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionVariable.h
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/ExpressionVariable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/InternalTypes.h b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/InternalTypes.h
index 04505c3ab4..5b378119ff 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/InternalTypes.h
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/InternalTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/MathOperators/MathExpressionOperators.cpp b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/MathOperators/MathExpressionOperators.cpp
index 9a6cf90062..1589a067dc 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/MathOperators/MathExpressionOperators.cpp
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/MathOperators/MathExpressionOperators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/MathOperators/MathExpressionOperators.h b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/MathOperators/MathExpressionOperators.h
index 134b6ed03c..956f40f5ad 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/MathOperators/MathExpressionOperators.h
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/MathOperators/MathExpressionOperators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/Utils.h b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/Utils.h
index d9224ab154..939401d516 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/Utils.h
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEngine/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationModule.cpp b/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationModule.cpp
index db4066cad9..a0de74e99e 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationModule.cpp
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.cpp b/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.cpp
index 142fe2385f..57aa0766e2 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.cpp
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.h b/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.h
index b50da8bfec..278e526893 100644
--- a/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.h
+++ b/Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Tests/ExpressionEngineTestFixture.h b/Gems/ExpressionEvaluation/Code/Tests/ExpressionEngineTestFixture.h
index dbca1182bf..0018c7a8a0 100644
--- a/Gems/ExpressionEvaluation/Code/Tests/ExpressionEngineTestFixture.h
+++ b/Gems/ExpressionEvaluation/Code/Tests/ExpressionEngineTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Tests/ExpressionEngineTests.cpp b/Gems/ExpressionEvaluation/Code/Tests/ExpressionEngineTests.cpp
index 5bbd3a22b1..0e95f7f554 100644
--- a/Gems/ExpressionEvaluation/Code/Tests/ExpressionEngineTests.cpp
+++ b/Gems/ExpressionEvaluation/Code/Tests/ExpressionEngineTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Tests/ExpressionEvaluationGemTest.cpp b/Gems/ExpressionEvaluation/Code/Tests/ExpressionEvaluationGemTest.cpp
index ed3869b92e..34179f53fd 100644
--- a/Gems/ExpressionEvaluation/Code/Tests/ExpressionEvaluationGemTest.cpp
+++ b/Gems/ExpressionEvaluation/Code/Tests/ExpressionEvaluationGemTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/Tests/MathExpressionTests.cpp b/Gems/ExpressionEvaluation/Code/Tests/MathExpressionTests.cpp
index f09d8f11a0..aa63f2d8ce 100644
--- a/Gems/ExpressionEvaluation/Code/Tests/MathExpressionTests.cpp
+++ b/Gems/ExpressionEvaluation/Code/Tests/MathExpressionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ExpressionEvaluation/Code/expressionevaluation_files.cmake b/Gems/ExpressionEvaluation/Code/expressionevaluation_files.cmake
index 34d5b7c853..67e7ae27eb 100644
--- a/Gems/ExpressionEvaluation/Code/expressionevaluation_files.cmake
+++ b/Gems/ExpressionEvaluation/Code/expressionevaluation_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ExpressionEvaluation/Code/expressionevaluation_shared_files.cmake b/Gems/ExpressionEvaluation/Code/expressionevaluation_shared_files.cmake
index 83f8577d18..7e99d79451 100644
--- a/Gems/ExpressionEvaluation/Code/expressionevaluation_shared_files.cmake
+++ b/Gems/ExpressionEvaluation/Code/expressionevaluation_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ExpressionEvaluation/Code/expressionevaluation_tests_files.cmake b/Gems/ExpressionEvaluation/Code/expressionevaluation_tests_files.cmake
index 0e98205428..de9d29b2c0 100644
--- a/Gems/ExpressionEvaluation/Code/expressionevaluation_tests_files.cmake
+++ b/Gems/ExpressionEvaluation/Code/expressionevaluation_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/FastNoise/CMakeLists.txt b/Gems/FastNoise/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/FastNoise/CMakeLists.txt
+++ b/Gems/FastNoise/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/FastNoise/Code/CMakeLists.txt b/Gems/FastNoise/Code/CMakeLists.txt
index 4e8c740972..a44cc73036 100644
--- a/Gems/FastNoise/Code/CMakeLists.txt
+++ b/Gems/FastNoise/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/FastNoise/Code/Include/FastNoise/Ebuses/FastNoiseBus.h b/Gems/FastNoise/Code/Include/FastNoise/Ebuses/FastNoiseBus.h
index 3cda553fb0..55c35ed7c1 100644
--- a/Gems/FastNoise/Code/Include/FastNoise/Ebuses/FastNoiseBus.h
+++ b/Gems/FastNoise/Code/Include/FastNoise/Ebuses/FastNoiseBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Include/FastNoise/Ebuses/FastNoiseGradientRequestBus.h b/Gems/FastNoise/Code/Include/FastNoise/Ebuses/FastNoiseGradientRequestBus.h
index a691ee47d3..dae99d2aa3 100644
--- a/Gems/FastNoise/Code/Include/FastNoise/Ebuses/FastNoiseGradientRequestBus.h
+++ b/Gems/FastNoise/Code/Include/FastNoise/Ebuses/FastNoiseGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.cpp b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.cpp
index 721373e0f1..881839dd52 100644
--- a/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.cpp
+++ b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h
index e101c592f6..a0484f9197 100644
--- a/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h
+++ b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp b/Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp
index aea817591f..d3d92b81bf 100644
--- a/Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp
+++ b/Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoiseEditorModule.h b/Gems/FastNoise/Code/Source/FastNoiseEditorModule.h
index 400ec0a671..75eb7f163a 100644
--- a/Gems/FastNoise/Code/Source/FastNoiseEditorModule.h
+++ b/Gems/FastNoise/Code/Source/FastNoiseEditorModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.cpp b/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.cpp
index 774661b3bc..ec6f16482d 100644
--- a/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.cpp
+++ b/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.h b/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.h
index 3ecbefe5d1..c7f5edd9ae 100644
--- a/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.h
+++ b/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoiseModule.cpp b/Gems/FastNoise/Code/Source/FastNoiseModule.cpp
index 98d183b1ad..46b3fbafd0 100644
--- a/Gems/FastNoise/Code/Source/FastNoiseModule.cpp
+++ b/Gems/FastNoise/Code/Source/FastNoiseModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoiseModule.h b/Gems/FastNoise/Code/Source/FastNoiseModule.h
index 304b13e8cb..9a42740f7f 100644
--- a/Gems/FastNoise/Code/Source/FastNoiseModule.h
+++ b/Gems/FastNoise/Code/Source/FastNoiseModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp b/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp
index e49be4c065..2973cd4ecc 100644
--- a/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp
+++ b/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.h b/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.h
index 17169da981..47f4bda07f 100644
--- a/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.h
+++ b/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Source/FastNoise_precompiled.h b/Gems/FastNoise/Code/Source/FastNoise_precompiled.h
index 4899df5161..d424689241 100644
--- a/Gems/FastNoise/Code/Source/FastNoise_precompiled.h
+++ b/Gems/FastNoise/Code/Source/FastNoise_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp b/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp
index c027bc14c5..2b39128b16 100644
--- a/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp
+++ b/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/FastNoise/Code/fastnoise_editor_files.cmake b/Gems/FastNoise/Code/fastnoise_editor_files.cmake
index 2615dfbbbe..4615139531 100644
--- a/Gems/FastNoise/Code/fastnoise_editor_files.cmake
+++ b/Gems/FastNoise/Code/fastnoise_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/FastNoise/Code/fastnoise_editor_shared_files.cmake b/Gems/FastNoise/Code/fastnoise_editor_shared_files.cmake
index 5c8090b527..40c6ee127e 100644
--- a/Gems/FastNoise/Code/fastnoise_editor_shared_files.cmake
+++ b/Gems/FastNoise/Code/fastnoise_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/FastNoise/Code/fastnoise_files.cmake b/Gems/FastNoise/Code/fastnoise_files.cmake
index 0f0cff680c..4b14feaa7b 100644
--- a/Gems/FastNoise/Code/fastnoise_files.cmake
+++ b/Gems/FastNoise/Code/fastnoise_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/FastNoise/Code/fastnoise_shared_files.cmake b/Gems/FastNoise/Code/fastnoise_shared_files.cmake
index 45d2d25b64..d959b80c17 100644
--- a/Gems/FastNoise/Code/fastnoise_shared_files.cmake
+++ b/Gems/FastNoise/Code/fastnoise_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/FastNoise/Code/fastnoise_tests_files.cmake b/Gems/FastNoise/Code/fastnoise_tests_files.cmake
index 090439c846..903b9be8b3 100644
--- a/Gems/FastNoise/Code/fastnoise_tests_files.cmake
+++ b/Gems/FastNoise/Code/fastnoise_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameState/CMakeLists.txt b/Gems/GameState/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/GameState/CMakeLists.txt
+++ b/Gems/GameState/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameState/Code/CMakeLists.txt b/Gems/GameState/Code/CMakeLists.txt
index 17cb29460b..53ab007f75 100644
--- a/Gems/GameState/Code/CMakeLists.txt
+++ b/Gems/GameState/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameState/Code/Include/GameState/GameState.h b/Gems/GameState/Code/Include/GameState/GameState.h
index fcc217f1bf..60cdb6ff07 100644
--- a/Gems/GameState/Code/Include/GameState/GameState.h
+++ b/Gems/GameState/Code/Include/GameState/GameState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameState/Code/Include/GameState/GameStateNotificationBus.h b/Gems/GameState/Code/Include/GameState/GameStateNotificationBus.h
index a2c9ed7f18..73ef56154a 100644
--- a/Gems/GameState/Code/Include/GameState/GameStateNotificationBus.h
+++ b/Gems/GameState/Code/Include/GameState/GameStateNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameState/Code/Include/GameState/GameStateRequestBus.h b/Gems/GameState/Code/Include/GameState/GameStateRequestBus.h
index 4b05a460b9..cf427771df 100644
--- a/Gems/GameState/Code/Include/GameState/GameStateRequestBus.h
+++ b/Gems/GameState/Code/Include/GameState/GameStateRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameState/Code/Source/GameStateModule.cpp b/Gems/GameState/Code/Source/GameStateModule.cpp
index cb4e1aa3a4..8936fed0d5 100644
--- a/Gems/GameState/Code/Source/GameStateModule.cpp
+++ b/Gems/GameState/Code/Source/GameStateModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameState/Code/Source/GameStateSystemComponent.cpp b/Gems/GameState/Code/Source/GameStateSystemComponent.cpp
index b7ff848edb..4984edbe80 100644
--- a/Gems/GameState/Code/Source/GameStateSystemComponent.cpp
+++ b/Gems/GameState/Code/Source/GameStateSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameState/Code/Source/GameStateSystemComponent.h b/Gems/GameState/Code/Source/GameStateSystemComponent.h
index 23d3a1585f..6ac0ab443e 100644
--- a/Gems/GameState/Code/Source/GameStateSystemComponent.h
+++ b/Gems/GameState/Code/Source/GameStateSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameState/Code/Tests/GameStateTest.cpp b/Gems/GameState/Code/Tests/GameStateTest.cpp
index d4d9a72260..7cbf8e08cb 100644
--- a/Gems/GameState/Code/Tests/GameStateTest.cpp
+++ b/Gems/GameState/Code/Tests/GameStateTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameState/Code/gamestate_files.cmake b/Gems/GameState/Code/gamestate_files.cmake
index 587ff55fe7..f591a15c3f 100644
--- a/Gems/GameState/Code/gamestate_files.cmake
+++ b/Gems/GameState/Code/gamestate_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameState/Code/gamestate_shared_files.cmake b/Gems/GameState/Code/gamestate_shared_files.cmake
index 4b4a2ebecb..bdd06407f3 100644
--- a/Gems/GameState/Code/gamestate_shared_files.cmake
+++ b/Gems/GameState/Code/gamestate_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameState/Code/gamestate_tests_files.cmake b/Gems/GameState/Code/gamestate_tests_files.cmake
index 7f955e5cf3..d83228a1a2 100644
--- a/Gems/GameState/Code/gamestate_tests_files.cmake
+++ b/Gems/GameState/Code/gamestate_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/CMakeLists.txt b/Gems/GameStateSamples/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/GameStateSamples/CMakeLists.txt
+++ b/Gems/GameStateSamples/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/Code/CMakeLists.txt b/Gems/GameStateSamples/Code/CMakeLists.txt
index f142a2afff..17af09ac90 100644
--- a/Gems/GameStateSamples/Code/CMakeLists.txt
+++ b/Gems/GameStateSamples/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameOptionRequestBus.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameOptionRequestBus.h
index 7b3dd9db8a..cf9e01c6f3 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameOptionRequestBus.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameOptionRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelLoading.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelLoading.h
index 844d7cd30c..48627fbcfd 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelLoading.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelLoading.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelLoading.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelLoading.inl
index ae23b779a3..2370fe19aa 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelLoading.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelLoading.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelPaused.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelPaused.h
index c3e8fa12fc..56f5c4aa70 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelPaused.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelPaused.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelPaused.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelPaused.inl
index 50d8309f09..7d28f6d43c 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelPaused.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelPaused.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelRunning.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelRunning.h
index 0ff9ec9bc3..ffc1140a7c 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelRunning.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelRunning.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelRunning.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelRunning.inl
index 18e8646384..37dc50c8f7 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelRunning.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLevelRunning.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLocalUserLobby.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLocalUserLobby.h
index 292789f319..f9493ad375 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLocalUserLobby.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLocalUserLobby.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLocalUserLobby.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLocalUserLobby.inl
index 5669151abc..7c59be1022 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLocalUserLobby.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateLocalUserLobby.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.h
index 5ae034c7b7..864c36ab16 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.inl
index fa9361a251..859a840fd0 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateMainMenu.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateOptionsMenu.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateOptionsMenu.h
index e1a1b55ccb..8a05647cfe 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateOptionsMenu.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateOptionsMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateOptionsMenu.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateOptionsMenu.inl
index be40bce8de..ae2d901638 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateOptionsMenu.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStateOptionsMenu.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryControllerDisconnected.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryControllerDisconnected.h
index 1120d2b75e..b044774c3b 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryControllerDisconnected.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryControllerDisconnected.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryControllerDisconnected.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryControllerDisconnected.inl
index d77ed9a9d0..452c691428 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryControllerDisconnected.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryControllerDisconnected.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserMonitor.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserMonitor.h
index feab636804..1e8bd08e03 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserMonitor.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserMonitor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserMonitor.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserMonitor.inl
index fdc6813ac0..586ec578d1 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserMonitor.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserMonitor.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSelection.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSelection.h
index 4c320ffc04..02e5cfddf7 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSelection.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSelection.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSelection.inl
index 200300a455..a863de1632 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSelection.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSelection.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSignedOut.h b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSignedOut.h
index 035ba6ec8c..0f9cea7c0c 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSignedOut.h
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSignedOut.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSignedOut.inl b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSignedOut.inl
index fbecc5b6be..996cff075f 100644
--- a/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSignedOut.inl
+++ b/Gems/GameStateSamples/Code/Include/GameStateSamples/GameStatePrimaryUserSignedOut.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Android/GameStateSamples/GameStateSamples_Traits_Android.h b/Gems/GameStateSamples/Code/Include/Platform/Android/GameStateSamples/GameStateSamples_Traits_Android.h
index 667ef359dd..55f1de5f5a 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Android/GameStateSamples/GameStateSamples_Traits_Android.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/Android/GameStateSamples/GameStateSamples_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Android/GameStateSamples/GameStateSamples_Traits_Platform.h b/Gems/GameStateSamples/Code/Include/Platform/Android/GameStateSamples/GameStateSamples_Traits_Platform.h
index d588ccafd7..c38e3f017a 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Android/GameStateSamples/GameStateSamples_Traits_Platform.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/Android/GameStateSamples/GameStateSamples_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Android/platform_android_files.cmake b/Gems/GameStateSamples/Code/Include/Platform/Android/platform_android_files.cmake
index e1979b96ea..07bf379582 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Android/platform_android_files.cmake
+++ b/Gems/GameStateSamples/Code/Include/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/Code/Include/Platform/Linux/GameStateSamples/GameStateSamples_Traits_Linux.h b/Gems/GameStateSamples/Code/Include/Platform/Linux/GameStateSamples/GameStateSamples_Traits_Linux.h
index 667ef359dd..55f1de5f5a 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Linux/GameStateSamples/GameStateSamples_Traits_Linux.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/Linux/GameStateSamples/GameStateSamples_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Linux/GameStateSamples/GameStateSamples_Traits_Platform.h b/Gems/GameStateSamples/Code/Include/Platform/Linux/GameStateSamples/GameStateSamples_Traits_Platform.h
index 24787b4459..5569aed8c9 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Linux/GameStateSamples/GameStateSamples_Traits_Platform.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/Linux/GameStateSamples/GameStateSamples_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Linux/platform_linux_files.cmake b/Gems/GameStateSamples/Code/Include/Platform/Linux/platform_linux_files.cmake
index 7b67f4157c..b4ab7d9f85 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/GameStateSamples/Code/Include/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/Code/Include/Platform/Mac/GameStateSamples/GameStateSamples_Traits_Mac.h b/Gems/GameStateSamples/Code/Include/Platform/Mac/GameStateSamples/GameStateSamples_Traits_Mac.h
index 667ef359dd..55f1de5f5a 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Mac/GameStateSamples/GameStateSamples_Traits_Mac.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/Mac/GameStateSamples/GameStateSamples_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Mac/GameStateSamples/GameStateSamples_Traits_Platform.h b/Gems/GameStateSamples/Code/Include/Platform/Mac/GameStateSamples/GameStateSamples_Traits_Platform.h
index 31b7c78c8b..9651b87b7a 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Mac/GameStateSamples/GameStateSamples_Traits_Platform.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/Mac/GameStateSamples/GameStateSamples_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Mac/platform_mac_files.cmake b/Gems/GameStateSamples/Code/Include/Platform/Mac/platform_mac_files.cmake
index 94d4c66c16..c7ba7886ce 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/GameStateSamples/Code/Include/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/Code/Include/Platform/Windows/GameStateSamples/GameStateSamples_Traits_Platform.h b/Gems/GameStateSamples/Code/Include/Platform/Windows/GameStateSamples/GameStateSamples_Traits_Platform.h
index 6a4072428a..190cc4b27a 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Windows/GameStateSamples/GameStateSamples_Traits_Platform.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/Windows/GameStateSamples/GameStateSamples_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Windows/GameStateSamples/GameStateSamples_Traits_Windows.h b/Gems/GameStateSamples/Code/Include/Platform/Windows/GameStateSamples/GameStateSamples_Traits_Windows.h
index 667ef359dd..55f1de5f5a 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Windows/GameStateSamples/GameStateSamples_Traits_Windows.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/Windows/GameStateSamples/GameStateSamples_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/Windows/platform_windows_files.cmake b/Gems/GameStateSamples/Code/Include/Platform/Windows/platform_windows_files.cmake
index 298cb0468c..007eb766f8 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/GameStateSamples/Code/Include/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/Code/Include/Platform/iOS/GameStateSamples/GameStateSamples_Traits_Platform.h b/Gems/GameStateSamples/Code/Include/Platform/iOS/GameStateSamples/GameStateSamples_Traits_Platform.h
index dbfd3b4263..db4f3407c6 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/iOS/GameStateSamples/GameStateSamples_Traits_Platform.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/iOS/GameStateSamples/GameStateSamples_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/iOS/GameStateSamples/GameStateSamples_Traits_iOS.h b/Gems/GameStateSamples/Code/Include/Platform/iOS/GameStateSamples/GameStateSamples_Traits_iOS.h
index 667ef359dd..55f1de5f5a 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/iOS/GameStateSamples/GameStateSamples_Traits_iOS.h
+++ b/Gems/GameStateSamples/Code/Include/Platform/iOS/GameStateSamples/GameStateSamples_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/Include/Platform/iOS/platform_ios_files.cmake b/Gems/GameStateSamples/Code/Include/Platform/iOS/platform_ios_files.cmake
index 47e655fb98..cb4042a0b1 100644
--- a/Gems/GameStateSamples/Code/Include/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/GameStateSamples/Code/Include/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/Code/Source/GameStateSamplesModule.cpp b/Gems/GameStateSamples/Code/Source/GameStateSamplesModule.cpp
index 8bb8e550b0..7138a14cc4 100644
--- a/Gems/GameStateSamples/Code/Source/GameStateSamplesModule.cpp
+++ b/Gems/GameStateSamples/Code/Source/GameStateSamplesModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GameStateSamples/Code/gamestatesamples_headers_files.cmake b/Gems/GameStateSamples/Code/gamestatesamples_headers_files.cmake
index 058429c007..d000d9d5ac 100644
--- a/Gems/GameStateSamples/Code/gamestatesamples_headers_files.cmake
+++ b/Gems/GameStateSamples/Code/gamestatesamples_headers_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GameStateSamples/Code/gamestatesamples_shared_files.cmake b/Gems/GameStateSamples/Code/gamestatesamples_shared_files.cmake
index 1abef40869..84fa27623e 100644
--- a/Gems/GameStateSamples/Code/gamestatesamples_shared_files.cmake
+++ b/Gems/GameStateSamples/Code/gamestatesamples_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Gestures/CMakeLists.txt b/Gems/Gestures/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Gestures/CMakeLists.txt
+++ b/Gems/Gestures/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Gestures/Code/CMakeLists.txt b/Gems/Gestures/Code/CMakeLists.txt
index 9255aa7bfd..175dbaf1ef 100644
--- a/Gems/Gestures/Code/CMakeLists.txt
+++ b/Gems/Gestures/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.h
index 9ceb0ce61e..57e974a370 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl
index 7e6971eae6..c14fd6c0f1 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.h
index 28b0fe95db..d5c2a4d349 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl
index 761d348977..f1166a4aae 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h
index 23882094a1..5e47ce945b 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl
index 8385037d32..8029ee4a87 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.h
index a619d75652..ab9b1a0a44 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl
index f2324a2d95..2eb3254988 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.h
index 4cb9eb6156..8c47ca67fa 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl
index e255f4df24..b6277a1c82 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.h
index e0b2d73a05..a2d0629a40 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl
index 5ba76c0504..8e82463ac4 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h b/Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h
index 6265d8a772..69e28df102 100644
--- a/Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h
+++ b/Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Mocks/IRecognizerMock.h b/Gems/Gestures/Code/Mocks/IRecognizerMock.h
index cd2d18b04a..80a13db362 100644
--- a/Gems/Gestures/Code/Mocks/IRecognizerMock.h
+++ b/Gems/Gestures/Code/Mocks/IRecognizerMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/GesturesModule.cpp b/Gems/Gestures/Code/Source/GesturesModule.cpp
index 31a0126896..404ed2f265 100644
--- a/Gems/Gestures/Code/Source/GesturesModule.cpp
+++ b/Gems/Gestures/Code/Source/GesturesModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/GesturesSystemComponent.cpp b/Gems/Gestures/Code/Source/GesturesSystemComponent.cpp
index 9a8c583cfd..a5cafecb68 100644
--- a/Gems/Gestures/Code/Source/GesturesSystemComponent.cpp
+++ b/Gems/Gestures/Code/Source/GesturesSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/GesturesSystemComponent.h b/Gems/Gestures/Code/Source/GesturesSystemComponent.h
index 5b7c9142d1..c760615239 100644
--- a/Gems/Gestures/Code/Source/GesturesSystemComponent.h
+++ b/Gems/Gestures/Code/Source/GesturesSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/Gestures_precompiled.h b/Gems/Gestures/Code/Source/Gestures_precompiled.h
index df0fc10464..51811e518a 100644
--- a/Gems/Gestures/Code/Source/Gestures_precompiled.h
+++ b/Gems/Gestures/Code/Source/Gestures_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGesture.cpp b/Gems/Gestures/Code/Source/InputChannelGesture.cpp
index bcde86b08f..0a0e92ef1e 100644
--- a/Gems/Gestures/Code/Source/InputChannelGesture.cpp
+++ b/Gems/Gestures/Code/Source/InputChannelGesture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGesture.h b/Gems/Gestures/Code/Source/InputChannelGesture.h
index 54f64bc946..ad22619544 100644
--- a/Gems/Gestures/Code/Source/InputChannelGesture.h
+++ b/Gems/Gestures/Code/Source/InputChannelGesture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.cpp b/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.cpp
index f6e36ea199..843ee5b529 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.cpp
+++ b/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.h b/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.h
index 21d1a03e5b..066d40e63d 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.h
+++ b/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp b/Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp
index 6f97f097d0..6f3121b12d 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp
+++ b/Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureDrag.h b/Gems/Gestures/Code/Source/InputChannelGestureDrag.h
index 42dc1ae56f..7956349ae8 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureDrag.h
+++ b/Gems/Gestures/Code/Source/InputChannelGestureDrag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureHold.cpp b/Gems/Gestures/Code/Source/InputChannelGestureHold.cpp
index 4da8b7535d..ee8c382667 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureHold.cpp
+++ b/Gems/Gestures/Code/Source/InputChannelGestureHold.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureHold.h b/Gems/Gestures/Code/Source/InputChannelGestureHold.h
index 96c81da0a1..7f4c53b4d7 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureHold.h
+++ b/Gems/Gestures/Code/Source/InputChannelGestureHold.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGesturePinch.cpp b/Gems/Gestures/Code/Source/InputChannelGesturePinch.cpp
index 20df922ee8..f8981e996f 100644
--- a/Gems/Gestures/Code/Source/InputChannelGesturePinch.cpp
+++ b/Gems/Gestures/Code/Source/InputChannelGesturePinch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGesturePinch.h b/Gems/Gestures/Code/Source/InputChannelGesturePinch.h
index 47cbcb9b50..89c18b58be 100644
--- a/Gems/Gestures/Code/Source/InputChannelGesturePinch.h
+++ b/Gems/Gestures/Code/Source/InputChannelGesturePinch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureRotate.cpp b/Gems/Gestures/Code/Source/InputChannelGestureRotate.cpp
index c31aa3ed03..baeca606fa 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureRotate.cpp
+++ b/Gems/Gestures/Code/Source/InputChannelGestureRotate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureRotate.h b/Gems/Gestures/Code/Source/InputChannelGestureRotate.h
index b0ad5c7621..33da8d62d7 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureRotate.h
+++ b/Gems/Gestures/Code/Source/InputChannelGestureRotate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureSwipe.cpp b/Gems/Gestures/Code/Source/InputChannelGestureSwipe.cpp
index 6b2d965605..360f2c071a 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureSwipe.cpp
+++ b/Gems/Gestures/Code/Source/InputChannelGestureSwipe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputChannelGestureSwipe.h b/Gems/Gestures/Code/Source/InputChannelGestureSwipe.h
index ea748b1581..ae2ae4abac 100644
--- a/Gems/Gestures/Code/Source/InputChannelGestureSwipe.h
+++ b/Gems/Gestures/Code/Source/InputChannelGestureSwipe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputDeviceGestures.cpp b/Gems/Gestures/Code/Source/InputDeviceGestures.cpp
index 17016605cc..9ecd57a7b2 100644
--- a/Gems/Gestures/Code/Source/InputDeviceGestures.cpp
+++ b/Gems/Gestures/Code/Source/InputDeviceGestures.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Source/InputDeviceGestures.h b/Gems/Gestures/Code/Source/InputDeviceGestures.h
index 4ca532941a..2afd4a4f65 100644
--- a/Gems/Gestures/Code/Source/InputDeviceGestures.h
+++ b/Gems/Gestures/Code/Source/InputDeviceGestures.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Tests/BaseGestureTest.h b/Gems/Gestures/Code/Tests/BaseGestureTest.h
index b839567c3b..6ba69ad5e4 100644
--- a/Gems/Gestures/Code/Tests/BaseGestureTest.h
+++ b/Gems/Gestures/Code/Tests/BaseGestureTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp b/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp
index b270ac6a17..58e33d4e85 100644
--- a/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp
+++ b/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp b/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp
index 5dce9001a7..7fce2db313 100644
--- a/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp
+++ b/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/Tests/GesturesTest.cpp b/Gems/Gestures/Code/Tests/GesturesTest.cpp
index d2d97956b9..e92f8c4d9c 100644
--- a/Gems/Gestures/Code/Tests/GesturesTest.cpp
+++ b/Gems/Gestures/Code/Tests/GesturesTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Gestures/Code/gestures_files.cmake b/Gems/Gestures/Code/gestures_files.cmake
index ceba5bb483..3faf88eea7 100644
--- a/Gems/Gestures/Code/gestures_files.cmake
+++ b/Gems/Gestures/Code/gestures_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Gestures/Code/gestures_shared_files.cmake b/Gems/Gestures/Code/gestures_shared_files.cmake
index 0cd32e4bc1..5bea6dacbe 100644
--- a/Gems/Gestures/Code/gestures_shared_files.cmake
+++ b/Gems/Gestures/Code/gestures_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Gestures/Code/gestures_test_files.cmake b/Gems/Gestures/Code/gestures_test_files.cmake
index b54f1e8e5f..597c341bae 100644
--- a/Gems/Gestures/Code/gestures_test_files.cmake
+++ b/Gems/Gestures/Code/gestures_test_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GradientSignal/CMakeLists.txt b/Gems/GradientSignal/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/GradientSignal/CMakeLists.txt
+++ b/Gems/GradientSignal/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GradientSignal/Code/CMakeLists.txt b/Gems/GradientSignal/Code/CMakeLists.txt
index c8c29da072..70077a06da 100644
--- a/Gems/GradientSignal/Code/CMakeLists.txt
+++ b/Gems/GradientSignal/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ConstantGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ConstantGradientRequestBus.h
index 587b058e20..5bdf3953c4 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ConstantGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ConstantGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/DitherGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/DitherGradientRequestBus.h
index 2e1bca1555..f52c873df4 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/DitherGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/DitherGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientPreviewContextRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientPreviewContextRequestBus.h
index 8661ace1b8..b97f8310b1 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientPreviewContextRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientPreviewContextRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientPreviewRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientPreviewRequestBus.h
index 24ef577d74..764acc1175 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientPreviewRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientPreviewRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientRequestBus.h
index d722780a48..affc2e8c26 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientSurfaceDataRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientSurfaceDataRequestBus.h
index 66d001181d..47a3a992eb 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientSurfaceDataRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientSurfaceDataRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientTransformModifierRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientTransformModifierRequestBus.h
index 08f5abf3f4..cde361fa1a 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientTransformModifierRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientTransformModifierRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientTransformRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientTransformRequestBus.h
index e149660991..5c102f1871 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientTransformRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/GradientTransformRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ImageGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ImageGradientRequestBus.h
index 852cb1a697..2d1f8a1eb2 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ImageGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ImageGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/InvertGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/InvertGradientRequestBus.h
index 3ad73fd3d9..e885ead0b5 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/InvertGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/InvertGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/LevelsGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/LevelsGradientRequestBus.h
index 5ff4f18b42..e423ca6368 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/LevelsGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/LevelsGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/MixedGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/MixedGradientRequestBus.h
index 6b5c393505..4349682628 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/MixedGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/MixedGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/PerlinGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/PerlinGradientRequestBus.h
index 274de2eac4..6243b4b543 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/PerlinGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/PerlinGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/PosterizeGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/PosterizeGradientRequestBus.h
index 3d18dc4a92..88f7a0d45b 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/PosterizeGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/PosterizeGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/RandomGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/RandomGradientRequestBus.h
index af7b384e9e..2aaeba629e 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/RandomGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/RandomGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ReferenceGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ReferenceGradientRequestBus.h
index f017f36926..ae483d755d 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ReferenceGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ReferenceGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SectorDataRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SectorDataRequestBus.h
index d546923af1..36622a93a6 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SectorDataRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SectorDataRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ShapeAreaFalloffGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ShapeAreaFalloffGradientRequestBus.h
index 06d2aafbf5..6522442030 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ShapeAreaFalloffGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ShapeAreaFalloffGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SmoothStepGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SmoothStepGradientRequestBus.h
index 186f434e29..1c3f51d6b8 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SmoothStepGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SmoothStepGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SmoothStepRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SmoothStepRequestBus.h
index 7c4440bb4d..7f25556896 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SmoothStepRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SmoothStepRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceAltitudeGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceAltitudeGradientRequestBus.h
index 66dbfc5458..86bfe84ce6 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceAltitudeGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceAltitudeGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceMaskGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceMaskGradientRequestBus.h
index 0609b025ff..cda9afa8a0 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceMaskGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceMaskGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceSlopeGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceSlopeGradientRequestBus.h
index 4ddccd7c10..e1dcdec8e9 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceSlopeGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/SurfaceSlopeGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ThresholdGradientRequestBus.h b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ThresholdGradientRequestBus.h
index a75fb3b48a..4c8358817a 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ThresholdGradientRequestBus.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Ebuses/ThresholdGradientRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientComponentBase.h b/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientComponentBase.h
index f56d0e0b9e..04b4320800 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientComponentBase.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientComponentBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientComponentBase.inl b/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientComponentBase.inl
index 5c5db38063..61d0dfc933 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientComponentBase.inl
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientComponentBase.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientPreviewRenderer.h b/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientPreviewRenderer.h
index b50f8ca3a4..a8e68b4a3b 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientPreviewRenderer.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientPreviewRenderer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientTypeIds.h b/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientTypeIds.h
index 06189592d1..3b152641b7 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientTypeIds.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Editor/EditorGradientTypeIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/GradientImageConversion.h b/Gems/GradientSignal/Code/Include/GradientSignal/GradientImageConversion.h
index 3958960f00..7aaaf3868b 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/GradientImageConversion.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/GradientImageConversion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/GradientSampler.h b/Gems/GradientSignal/Code/Include/GradientSignal/GradientSampler.h
index b4271bd796..735e373ec4 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/GradientSampler.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/GradientSampler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/ImageAsset.h b/Gems/GradientSignal/Code/Include/GradientSignal/ImageAsset.h
index 5ba56b2dc0..9cd1f88c95 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/ImageAsset.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/ImageAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/ImageSettings.h b/Gems/GradientSignal/Code/Include/GradientSignal/ImageSettings.h
index 70b7f6d7d5..2e05b12698 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/ImageSettings.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/ImageSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/PerlinImprovedNoise.h b/Gems/GradientSignal/Code/Include/GradientSignal/PerlinImprovedNoise.h
index a3de1a11ae..8bc7212710 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/PerlinImprovedNoise.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/PerlinImprovedNoise.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/SmoothStep.h b/Gems/GradientSignal/Code/Include/GradientSignal/SmoothStep.h
index 10374616db..382e821a59 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/SmoothStep.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/SmoothStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Include/GradientSignal/Util.h b/Gems/GradientSignal/Code/Include/GradientSignal/Util.h
index 0056ae03c7..a3fb3e9b1f 100644
--- a/Gems/GradientSignal/Code/Include/GradientSignal/Util.h
+++ b/Gems/GradientSignal/Code/Include/GradientSignal/Util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.cpp
index ee352b0414..7cb7ef928e 100644
--- a/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.h
index c61329921d..9e4bb79404 100644
--- a/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.cpp
index ec6772abd2..2730cfafba 100644
--- a/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.h
index 0222783cd2..5541391f9e 100644
--- a/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.cpp b/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.cpp
index 101c794764..c19ad7e5b0 100644
--- a/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.h b/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.h
index 85f38a14ea..d13e7cb43f 100644
--- a/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
index 668c1ba019..617bdc759f 100644
--- a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.h b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.h
index 8a27da56db..c83a7d9562 100644
--- a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
index ba75f0fc67..21378d705e 100644
--- a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.h
index fc67238292..66dd554058 100644
--- a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.cpp
index 3e72e0ce27..1d8f742a31 100644
--- a/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.h
index 0bd6305403..88868bfdb5 100644
--- a/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.cpp
index c73c7a7f6a..950cc3b4b6 100644
--- a/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.h
index ea824e88fe..1c7fa54ae4 100644
--- a/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.cpp
index ae030bb828..722ade48a0 100644
--- a/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.h
index 03643b0a94..bc28f9ce8e 100644
--- a/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.cpp
index 1f6a42df68..fed2c49590 100644
--- a/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.h
index 9e654cfe1a..c79f5a1b99 100644
--- a/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.cpp
index d94ecb8346..0346c0adf9 100644
--- a/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.h
index 3f24d57d69..0adf52340c 100644
--- a/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.cpp
index 3a189831ca..8268fd2a7b 100644
--- a/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.h
index 9eff9626b5..3e03d39789 100644
--- a/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.cpp
index deecd4de38..c3b97e41e2 100644
--- a/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.h
index e838971ffd..a5fd16ee8e 100644
--- a/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.cpp
index ba58694285..943ffca2e2 100644
--- a/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.h
index 644169096f..9eb1347a59 100644
--- a/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.cpp
index 070a5155f6..262c12fb10 100644
--- a/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.h
index f1cdbf6915..c9513ad408 100644
--- a/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.cpp
index 68a1ed00d3..23a4d122d6 100644
--- a/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.h
index 28cb71c5b8..7f6b5d285c 100644
--- a/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.cpp
index dc125e193d..0c7331a64a 100644
--- a/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.h
index a877e6399a..691730e708 100644
--- a/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.cpp
index 5a830aba59..bb7e5b3528 100644
--- a/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.h
index 4eec21b9e6..23ea1ffa1d 100644
--- a/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.cpp
index afdead0ee4..04819dd27a 100644
--- a/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.h b/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.h
index fa95e2c142..414611e2b9 100644
--- a/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.cpp
index a39662eff1..78b7fcb3b4 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h
index fd74228fa0..61e3566350 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.cpp
index 2d9da8d6e3..cd5e302cb5 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h
index 0e91fb5e40..9f17dbda5e 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorGradientComponentBase.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorGradientComponentBase.cpp
index dffce040c7..12407bdc7c 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientComponentBase.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientComponentBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.cpp
index 4bc8fb62ec..dd9079d118 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.h
index fea22d4c47..8b4363ae24 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.cpp
index d07321f260..fb8cbde476 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h
index bb932f7e74..ccea8df71e 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp
index 4b3cd96285..f2bae481f8 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.h
index 1831ea980e..5c0079458e 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.cpp
index 699a6792e4..4c7901223f 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h
index b82b77ca0f..25e589346c 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.cpp
index eb091f638a..907fc3fcb4 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.h
index bf9fd65df6..1597b593ba 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.cpp
index 709a864be5..1fdfcdfc69 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h
index 1132e9788a..80503a1685 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.cpp
index 70c1629a4a..eb3652ff08 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h
index 4c7e54540d..6b132c0dc6 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.cpp
index 2b36ca129f..e78b6f1706 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h
index ed34b105ea..7d4cfa32dd 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.cpp
index 2d76811335..58c814bfc7 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h
index c37840262a..57574efcb4 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.cpp
index 6a1ae35feb..1ab1f5e480 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h
index dc521b9073..679ca5a554 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.cpp
index 1529757e3b..310b188f43 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h
index 76c9e0bf5f..42f4860536 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.cpp
index 0039dbe4da..40b62c78e2 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h
index 38293ee5f3..31184fa9f2 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.cpp
index d39506c2b6..2d8d471d2d 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h
index 4f519dceed..2c097ee5e6 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.cpp
index 3d96986b5c..98fd56c0b1 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h
index 4b74b1878f..db9c1c7b94 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp
index 30c9407e18..290eda59c5 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h
index e5e0bd9325..e52a0d0bed 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.cpp
index 57524e5771..7d5d30c5ea 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h
index 2cf135c711..9c24ca4bc4 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.cpp
index ac551c6677..5d36d79b19 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h
index 3b620834ed..c246908f75 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.cpp
index f23e78c6e2..00bbf97a1e 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h
index 41109e82cb..4a947ea12c 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientImageConversion.cpp b/Gems/GradientSignal/Code/Source/GradientImageConversion.cpp
index 44426a25c4..fe3800feda 100644
--- a/Gems/GradientSignal/Code/Source/GradientImageConversion.cpp
+++ b/Gems/GradientSignal/Code/Source/GradientImageConversion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientSampler.cpp b/Gems/GradientSignal/Code/Source/GradientSampler.cpp
index d588d69fad..944eef2e42 100644
--- a/Gems/GradientSignal/Code/Source/GradientSampler.cpp
+++ b/Gems/GradientSignal/Code/Source/GradientSampler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp
index 068b79ae28..c4fd0983d2 100644
--- a/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp
+++ b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.h b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.h
index 43057ea13c..c25a9c7e1c 100644
--- a/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.h
+++ b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientSignalModule.cpp b/Gems/GradientSignal/Code/Source/GradientSignalModule.cpp
index 679d5384ac..b49772656f 100644
--- a/Gems/GradientSignal/Code/Source/GradientSignalModule.cpp
+++ b/Gems/GradientSignal/Code/Source/GradientSignalModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientSignalModule.h b/Gems/GradientSignal/Code/Source/GradientSignalModule.h
index 3eaddcabc2..a056a02fbd 100644
--- a/Gems/GradientSignal/Code/Source/GradientSignalModule.h
+++ b/Gems/GradientSignal/Code/Source/GradientSignalModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.cpp b/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.cpp
index 18ca123ae8..5c47944859 100644
--- a/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.h b/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.h
index 0d7bdc5ca0..a270c969b9 100644
--- a/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.h
+++ b/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h b/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
index 4899df5161..d424689241 100644
--- a/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
+++ b/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/ImageAsset.cpp b/Gems/GradientSignal/Code/Source/ImageAsset.cpp
index 3d5ff3c8ab..caf76c62af 100644
--- a/Gems/GradientSignal/Code/Source/ImageAsset.cpp
+++ b/Gems/GradientSignal/Code/Source/ImageAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/ImageSettings.cpp b/Gems/GradientSignal/Code/Source/ImageSettings.cpp
index e289663a75..8f7d28dd35 100644
--- a/Gems/GradientSignal/Code/Source/ImageSettings.cpp
+++ b/Gems/GradientSignal/Code/Source/ImageSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp b/Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp
index 430e0e1d50..fbdaa6a072 100644
--- a/Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp
+++ b/Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/SmoothStep.cpp b/Gems/GradientSignal/Code/Source/SmoothStep.cpp
index 3cf5c35b59..1ce2f07739 100644
--- a/Gems/GradientSignal/Code/Source/SmoothStep.cpp
+++ b/Gems/GradientSignal/Code/Source/SmoothStep.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.cpp b/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.cpp
index e3e0d286ce..d82638eda3 100644
--- a/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.cpp
+++ b/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.h b/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.h
index d0a71c9714..954dba9721 100644
--- a/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.h
+++ b/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.cpp b/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.cpp
index a9614bb0a2..f4039e3807 100644
--- a/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.cpp
+++ b/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.h b/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.h
index 58ab1e3314..fe9ca9f04c 100644
--- a/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.h
+++ b/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Source/Util.cpp b/Gems/GradientSignal/Code/Source/Util.cpp
index 6e352ea4fe..67ede4e4a3 100644
--- a/Gems/GradientSignal/Code/Source/Util.cpp
+++ b/Gems/GradientSignal/Code/Source/Util.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Tests/EditorGradientSignalPreviewTests.cpp b/Gems/GradientSignal/Code/Tests/EditorGradientSignalPreviewTests.cpp
index f4471a0231..c2ec4e798f 100644
--- a/Gems/GradientSignal/Code/Tests/EditorGradientSignalPreviewTests.cpp
+++ b/Gems/GradientSignal/Code/Tests/EditorGradientSignalPreviewTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp
index 417e3c08fb..8fc95f3a84 100644
--- a/Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp
+++ b/Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Tests/GradientSignalReferencesTests.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalReferencesTests.cpp
index 044944bdcb..e9a9956bac 100644
--- a/Gems/GradientSignal/Code/Tests/GradientSignalReferencesTests.cpp
+++ b/Gems/GradientSignal/Code/Tests/GradientSignalReferencesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Tests/GradientSignalServicesTests.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalServicesTests.cpp
index 5a9a9b49be..170f978f64 100644
--- a/Gems/GradientSignal/Code/Tests/GradientSignalServicesTests.cpp
+++ b/Gems/GradientSignal/Code/Tests/GradientSignalServicesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Tests/GradientSignalSurfaceTests.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalSurfaceTests.cpp
index d6778ad212..a0ec74d18b 100644
--- a/Gems/GradientSignal/Code/Tests/GradientSignalSurfaceTests.cpp
+++ b/Gems/GradientSignal/Code/Tests/GradientSignalSurfaceTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp
index ed915e5833..d6457b5bb2 100644
--- a/Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp
+++ b/Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Tests/GradientSignalTestMocks.h b/Gems/GradientSignal/Code/Tests/GradientSignalTestMocks.h
index dea3152fb0..6ce39e4047 100644
--- a/Gems/GradientSignal/Code/Tests/GradientSignalTestMocks.h
+++ b/Gems/GradientSignal/Code/Tests/GradientSignalTestMocks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp b/Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp
index 98e8a838ad..344c2f5868 100644
--- a/Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp
+++ b/Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GradientSignal/Code/gradientsignal_editor_files.cmake b/Gems/GradientSignal/Code/gradientsignal_editor_files.cmake
index 53fb841dfa..dbe7a39a21 100644
--- a/Gems/GradientSignal/Code/gradientsignal_editor_files.cmake
+++ b/Gems/GradientSignal/Code/gradientsignal_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GradientSignal/Code/gradientsignal_editor_shared_files.cmake b/Gems/GradientSignal/Code/gradientsignal_editor_shared_files.cmake
index 8e8a10aeec..2caee268b8 100644
--- a/Gems/GradientSignal/Code/gradientsignal_editor_shared_files.cmake
+++ b/Gems/GradientSignal/Code/gradientsignal_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GradientSignal/Code/gradientsignal_editor_tests_files.cmake b/Gems/GradientSignal/Code/gradientsignal_editor_tests_files.cmake
index 654da8220e..5c07d23589 100644
--- a/Gems/GradientSignal/Code/gradientsignal_editor_tests_files.cmake
+++ b/Gems/GradientSignal/Code/gradientsignal_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GradientSignal/Code/gradientsignal_files.cmake b/Gems/GradientSignal/Code/gradientsignal_files.cmake
index d61817fe99..cfd3bf60cc 100644
--- a/Gems/GradientSignal/Code/gradientsignal_files.cmake
+++ b/Gems/GradientSignal/Code/gradientsignal_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GradientSignal/Code/gradientsignal_shared_files.cmake b/Gems/GradientSignal/Code/gradientsignal_shared_files.cmake
index 4d86f7ac1c..14508ad10f 100644
--- a/Gems/GradientSignal/Code/gradientsignal_shared_files.cmake
+++ b/Gems/GradientSignal/Code/gradientsignal_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GradientSignal/Code/gradientsignal_tests_files.cmake b/Gems/GradientSignal/Code/gradientsignal_tests_files.cmake
index a8fbb313ff..8e1d31049e 100644
--- a/Gems/GradientSignal/Code/gradientsignal_tests_files.cmake
+++ b/Gems/GradientSignal/Code/gradientsignal_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphCanvas/CMakeLists.txt b/Gems/GraphCanvas/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/GraphCanvas/CMakeLists.txt
+++ b/Gems/GraphCanvas/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphCanvas/Code/CMakeLists.txt b/Gems/GraphCanvas/Code/CMakeLists.txt
index 413cb39fc0..d0daa21733 100644
--- a/Gems/GraphCanvas/Code/CMakeLists.txt
+++ b/Gems/GraphCanvas/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphCanvas/Code/GraphCanvas_game_files.cmake b/Gems/GraphCanvas/Code/GraphCanvas_game_files.cmake
index 9c01a54e67..95c49190a2 100644
--- a/Gems/GraphCanvas/Code/GraphCanvas_game_files.cmake
+++ b/Gems/GraphCanvas/Code/GraphCanvas_game_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilterBus.h b/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilterBus.h
index bafc0b35e7..35f3b97b91 100644
--- a/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilterBus.h
+++ b/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilterBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilters.h b/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilters.h
index 8385a07eac..15934e9891 100644
--- a/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilters.h
+++ b/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/DataConnectionFilters.h b/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/DataConnectionFilters.h
index c451c6bc43..2c71d10ad8 100644
--- a/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/DataConnectionFilters.h
+++ b/Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/DataConnectionFilters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Include/GraphCanvas/Widgets/RootGraphicsItem.h b/Gems/GraphCanvas/Code/Include/GraphCanvas/Widgets/RootGraphicsItem.h
index 12da5aec92..d54818f78a 100644
--- a/Gems/GraphCanvas/Code/Include/GraphCanvas/Widgets/RootGraphicsItem.h
+++ b/Gems/GraphCanvas/Code/Include/GraphCanvas/Widgets/RootGraphicsItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Include/GraphCanvas/tools.h b/Gems/GraphCanvas/Code/Include/GraphCanvas/tools.h
index 7ea0473b80..b02e845de2 100644
--- a/Gems/GraphCanvas/Code/Include/GraphCanvas/tools.h
+++ b/Gems/GraphCanvas/Code/Include/GraphCanvas/tools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.cpp
index f1ca9c0bb4..6ddb60e0c1 100644
--- a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.h b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.h
index 881e739f90..73ed07153c 100644
--- a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorLayerControllerComponent.h b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorLayerControllerComponent.h
index 4a9d3732a2..fc9cb2ee1e 100644
--- a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorLayerControllerComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorLayerControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.cpp
index fe7d86f2c6..525654423d 100644
--- a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.h b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.h
index 0b17db1f8b..e0fdfa3016 100644
--- a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.cpp
index 8d6116b58a..cfb180288d 100644
--- a/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.h b/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.h
index a3e75c7aa2..aa6270b4ec 100644
--- a/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp
index 069ff37c2c..07cb535336 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.h b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.h
index 5d6702c577..7147128d03 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp
index 2794cddf4e..a6cdae36d7 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.h b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.h
index 02a264c372..e3c0076a58 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.cpp
index 6f06a2a837..da426b294f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.h b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.h
index 33394b5ebd..053b4544be 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp
index 4981f2d652..b570137780 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.h b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.h
index 179f6a305d..fabecacde0 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.cpp
index 1f1777e919..eec2e7dbf7 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.h b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.h
index 27f9aae33f..1905a471b0 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.cpp
index 4afe592475..2a7ba62f55 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.h b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.h
index fc26a1a817..c545ec31d6 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.cpp
index 1ec5e44615..0deb608731 100644
--- a/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.h b/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.h
index 4765c4f3af..47e9fb94ab 100644
--- a/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp
index 436e319d8e..c960c43118 100644
--- a/Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/GridComponent.h b/Gems/GraphCanvas/Code/Source/Components/GridComponent.h
index 92991a4572..9a5f93a048 100644
--- a/Gems/GraphCanvas/Code/Source/Components/GridComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/GridComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.cpp
index 65acc78472..b6edd70547 100644
--- a/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.h b/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.h
index 97393f6e55..4f10634aec 100644
--- a/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.cpp
index c1811b63ca..ec4f7069ae 100644
--- a/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.h b/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.h
index f0f02bdd14..d6cdba2b7f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp
index b15115bbb1..73e44586ff 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h
index abe5776b10..1c72c64387 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.cpp
index 788d0cfa88..8839b6516b 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.h
index 2cf3fa4a03..a053b23b95 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp
index 44b7ed9e12..b1869d310f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h
index 91c68538a2..82080e2c68 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp
index 648391e41c..f835fb897f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h
index 2ac0d745f1..b2a54ecaf6 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.cpp
index 5a9265bee0..abd27849f4 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.h
index d62c28ca84..5a2765f2e9 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp
index aa3052886a..aacaea8892 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.h
index ae3581d136..c291e40938 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.cpp
index c871570553..8f14f7d72e 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.h
index b07c20898b..e2cd359775 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.cpp
index 0a3d2d15a7..e1081871f9 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.h
index fd02355edf..83beb15b14 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.cpp
index ccc496e385..9407e6b71e 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.h
index ffbb976d60..5df592e038 100644
--- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.cpp
index 72c2c66d7b..d0cc78a7fa 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.h
index 386657060a..6a2d8c1434 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.cpp
index bd195d9eb9..7a6b1799c2 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.h
index 80e667bb5f..a9baeed324 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.cpp
index 1c9af9adb8..7e0e6adbe3 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.h
index 4456244adb..d9e14e3fe3 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.cpp
index 654aed87aa..d41ca43a00 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.h
index a5c280373b..f644d0371d 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.cpp
index e4e401bca6..e1411101d5 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h
index d8afb486ea..f298220d41 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.cpp
index e78ae096b1..e291afe5e6 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h
index 40d1a94edb..b1c15457f2 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.cpp
index 3e8fb6b21d..598ceea26f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.h
index b5fbce4cbf..cb83a52b8b 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp
index f2c00f140b..4f5b2b96f7 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h
index 528a1cc9da..9426d8fe12 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp
index 186fa92e46..bb4d06bdc2 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.h
index 8295f60b57..b4e5b2b41f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp
index cde074a24f..3b29a0c525 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.h
index b6f1fb5d4e..0655188fde 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp
index b0e4e04c0b..af52fae065 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.h
index 3eac564006..70856e36f9 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayerControllerComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayerControllerComponent.h
index 9797b5707a..73c77017e2 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayerControllerComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayerControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.cpp
index fc17e5f349..1e8a130cb5 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.h
index 104574755e..33a79e2cbe 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.cpp
index 7237817a09..03af347555 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.h
index e581c0cb8d..7864e53911 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.cpp
index 3896486e11..46917e41ca 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.h
index 52338d113c..07ae7b45b1 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeLayerControllerComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeLayerControllerComponent.h
index 5e9a226d6f..fa8144bbb6 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeLayerControllerComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeLayerControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeLayoutComponent.h
index c85361fa29..124e55a452 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.cpp
index 4d404677a5..3ff15f891f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.h
index 3a347f68f9..76a7bf1e54 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.cpp
index ccf497a0d7..af8b590ef5 100644
--- a/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.h b/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.h
index 3c217b98f6..1a7fe2a358 100644
--- a/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp
index 8906443fe3..559d8a0b57 100644
--- a/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/SceneComponent.h b/Gems/GraphCanvas/Code/Source/Components/SceneComponent.h
index 5eef37118e..b04701235e 100644
--- a/Gems/GraphCanvas/Code/Source/Components/SceneComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/SceneComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.cpp
index 2fc80b9d91..76630d503b 100644
--- a/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.h b/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.h
index abc2407d27..1cf0a174c8 100644
--- a/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp
index 02975a19a1..e05ed2c033 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.h
index 17c7a1c0e1..3d3986b1ff 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.cpp
index 8c921c7abb..de7e4e7fa1 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.h
index dd6cb5dee4..b908530b28 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.cpp
index 92f7c1d37c..415f51f9d2 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.h
index 7fe743c9a0..cfa64c20d6 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.cpp
index f41fd63755..ac678b9303 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.h
index 378c589b4b..86af584bec 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.cpp
index 0014b6568d..c1785790d4 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.h
index 268f36a671..181bd7ac27 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.cpp
index 4b7592ddf8..14368662af 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.h
index 3ddde1cd31..2a32eb21f7 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.cpp
index d887d3ab79..5fd11dacf0 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.h
index 05ffa6fdfa..a4cb4b51cf 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.cpp
index e6a2027b49..6ed94c274e 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.h
index 0c849dca18..0870bb389c 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.cpp
index 001ac5aae2..374f4eb0aa 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.h
index 8cefe35041..61b399040f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.cpp
index 7ba1bdc9e6..9664583e6f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.h
index de309ee987..bd0430b1d2 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.cpp
index 559fd13892..9e6827a358 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.h
index 182266943f..b58d1e1428 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.cpp
index db241ccd4a..da08357bed 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.h
index 25af7c69b8..e44a92a8aa 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp
index a014bae585..df92ce4a0e 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.h
index 428223af5c..b378d3bc40 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.cpp
index 1ed2d23049..85a015c8a6 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.h
index c023052e69..0a601fd638 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.cpp
index 4ff2ebc595..cd903b09f1 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.h b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.h
index a4ccf3f0a5..8eda774969 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.cpp
index 712e32e871..aa19ec11e2 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.h b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.h
index a418dd8f5d..76ae56d650 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutItem.h b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutItem.h
index 7bd4006b86..577dae4c9f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutItem.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/StylingComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/StylingComponent.cpp
index 2424f6e5ec..cf5f89d4c5 100644
--- a/Gems/GraphCanvas/Code/Source/Components/StylingComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/StylingComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Components/StylingComponent.h b/Gems/GraphCanvas/Code/Source/Components/StylingComponent.h
index e69c69ac0e..295fb22dbe 100644
--- a/Gems/GraphCanvas/Code/Source/Components/StylingComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/StylingComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp
index 724308c7e7..011548ce5a 100644
--- a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp
+++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/GraphCanvas.h b/Gems/GraphCanvas/Code/Source/GraphCanvas.h
index 65cef4c1f7..ddb29b18c0 100644
--- a/Gems/GraphCanvas/Code/Source/GraphCanvas.h
+++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp
index 816d4830c2..17f61b2d7b 100644
--- a/Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp
+++ b/Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp
index e65dc310cd..5cbf440762 100644
--- a/Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp
+++ b/Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/GraphCanvasModule.h b/Gems/GraphCanvas/Code/Source/GraphCanvasModule.h
index d08a3cf6e1..a113ec4567 100644
--- a/Gems/GraphCanvas/Code/Source/GraphCanvasModule.h
+++ b/Gems/GraphCanvas/Code/Source/GraphCanvasModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp b/Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp
index ab98368049..b1d034d033 100644
--- a/Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp
+++ b/Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp
index ca07266fed..c9dae4d683 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h
index de3c8faeeb..7759dc131c 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
index c9037a8fe2..3013187f73 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.h
index 94116c26e3..db3fc951a3 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.h
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationBus.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationBus.h
index 684de84763..267ac08f90 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBus.h
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.cpp
index fc13fb425f..5296711790 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.h
index e84dcd3fe8..828e74a928 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.h
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationDatabase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
index eaa26fc10d..ffbcba828b 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h
index a6182bc0ce..cb94c0cf5d 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.cpp b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.cpp
index ed906aa4b6..524021464d 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.cpp
+++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.h b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.h
index 21b9cde44e..c6dc3ccaea 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.h
+++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.cpp b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.cpp
index ad1c4c22b6..c5752aa6b4 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.cpp
+++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h
index 6020dba0f2..07318d7535 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h
+++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp
index 4d58f7c91e..e35d4720d9 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp
+++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h
index e0bd631d10..43128601ab 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h
+++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.cpp b/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.cpp
index 6384889dd4..9281a6709d 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.cpp
+++ b/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.h b/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.h
index f898b70e0a..c9bd2ee160 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.h
+++ b/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/Source/tools.cpp b/Gems/GraphCanvas/Code/Source/tools.cpp
index 5b681479cb..ee17d6fab0 100644
--- a/Gems/GraphCanvas/Code/Source/tools.cpp
+++ b/Gems/GraphCanvas/Code/Source/tools.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Bookmarks/BookmarkBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Bookmarks/BookmarkBus.h
index 6323067b9b..5955ccf777 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Bookmarks/BookmarkBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Bookmarks/BookmarkBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ColorPaletteManager/ColorPaletteManagerComponent.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ColorPaletteManager/ColorPaletteManagerComponent.cpp
index efac598931..26a67e6b69 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ColorPaletteManager/ColorPaletteManagerComponent.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ColorPaletteManager/ColorPaletteManagerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ColorPaletteManager/ColorPaletteManagerComponent.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ColorPaletteManager/ColorPaletteManagerComponent.h
index 5621cb003f..969b3942c0 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ColorPaletteManager/ColorPaletteManagerComponent.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ColorPaletteManager/ColorPaletteManagerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Connections/ConnectionBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Connections/ConnectionBus.h
index 57d42c7b7d..3c7d339029 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Connections/ConnectionBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Connections/ConnectionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/EntitySaveDataBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/EntitySaveDataBus.h
index 2d78b62fe4..255cdcd463 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/EntitySaveDataBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/EntitySaveDataBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GeometryBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GeometryBus.h
index 663e3eb85d..bd432c3d75 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GeometryBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GeometryBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GraphCanvasPropertyBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GraphCanvasPropertyBus.h
index 1c7d690a50..6ccfe2b486 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GraphCanvasPropertyBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GraphCanvasPropertyBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GridBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GridBus.h
index 671807eadf..7402b2e9ce 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GridBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/GridBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/LayerBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/LayerBus.h
index c379b6ac14..25ea429531 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/LayerBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/LayerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/MimeDataHandlerBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/MimeDataHandlerBus.h
index 6ca25eab92..3daa3e89c4 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/MimeDataHandlerBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/MimeDataHandlerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/AssetIdDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/AssetIdDataInterface.h
index 9683652cc8..889f8056f7 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/AssetIdDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/AssetIdDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/BooleanDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/BooleanDataInterface.h
index 10d0a9451d..fb64320644 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/BooleanDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/BooleanDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/ComboBoxDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/ComboBoxDataInterface.h
index f15ca7583a..6f67cc0237 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/ComboBoxDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/ComboBoxDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/DataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/DataInterface.h
index a87ae09aa2..9a2708598e 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/DataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/DataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/DoubleDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/DoubleDataInterface.h
index d8fe95c2e2..e53904b48b 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/DoubleDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/DoubleDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/EntityIdDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/EntityIdDataInterface.h
index 99a0363ca1..47081d4f2f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/EntityIdDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/EntityIdDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.cpp
index 8101d8c072..258e4a2c5c 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.h
index fa2828f91e..c03433a72b 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NumericDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NumericDataInterface.h
index 84bf7bacf4..067b848c57 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NumericDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NumericDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/ReadOnlyDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/ReadOnlyDataInterface.h
index ab6df7f552..342cb5eb79 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/ReadOnlyDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/ReadOnlyDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/StringDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/StringDataInterface.h
index e11c76596e..d4e6ed0782 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/StringDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/StringDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/VariableDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/VariableDataInterface.h
index 90114d5fff..6609aa4d52 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/VariableDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/VariableDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/VectorDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/VectorDataInterface.h
index 52ffcc3340..092570d31d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/VectorDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/VectorDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Comment/CommentBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Comment/CommentBus.h
index 046125e6a1..6f97cde9c7 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Comment/CommentBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Comment/CommentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Group/NodeGroupBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Group/NodeGroupBus.h
index 961e5c0b9c..c2818477a2 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Group/NodeGroupBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Group/NodeGroupBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h
index 1f37c139fd..82f85ecef1 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeConfiguration.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeConfiguration.h
index 2988f893ad..e445f2d9dc 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeConfiguration.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeLayoutBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeLayoutBus.h
index 7b7bf71b5a..78273855a9 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeLayoutBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeLayoutBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h
index 399cacb7a9..7a8c79fd04 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeUIBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeUIBus.h
index 23c843c22e..ff88096909 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeUIBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeUIBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Variable/VariableNodeBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Variable/VariableNodeBus.h
index 1ea176255a..b5e36bd170 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Variable/VariableNodeBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Variable/VariableNodeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Wrapper/WrapperNodeBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Wrapper/WrapperNodeBus.h
index 45fe59592c..b9043f7d1d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Wrapper/WrapperNodeBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/Wrapper/WrapperNodeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/PersistentIdBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/PersistentIdBus.h
index 98f07fd541..e4c7364aed 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/PersistentIdBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/PersistentIdBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/SceneBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/SceneBus.h
index 037e371b8b..b0f7e7b646 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/SceneBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/SceneBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h
index 587e6e1fb1..060e3d7d3a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Extender/ExtenderSlotBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Extender/ExtenderSlotBus.h
index eba04ee78f..bc6b92bdf6 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Extender/ExtenderSlotBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Extender/ExtenderSlotBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Property/PropertySlotBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Property/PropertySlotBus.h
index 9ffb0a8bbb..989b712c04 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Property/PropertySlotBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Property/PropertySlotBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h
index ac7d8c1dbd..def5b08276 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/StyleBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/StyleBus.h
index aac0d5885e..e735c1a040 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/StyleBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/StyleBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ToastBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ToastBus.h
index 4020f1295a..593bdbab53 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ToastBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ToastBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ViewBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ViewBus.h
index f7cfa5bb38..fbf7ac5218 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ViewBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/ViewBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/VisualBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/VisualBus.h
index 7d22a8dfbc..0df78803e6 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/VisualBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/VisualBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/AssetEditorBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/AssetEditorBus.h
index 603aa2ffc6..84c8892697 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/AssetEditorBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/AssetEditorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/Automation/AutomationIds.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/Automation/AutomationIds.h
index 32dc9dcb04..efad23635e 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/Automation/AutomationIds.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/Automation/AutomationIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/Automation/AutomationUtils.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/Automation/AutomationUtils.h
index 6a1e507df4..31337e88d5 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/Automation/AutomationUtils.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/Automation/AutomationUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/EditorDockWidgetBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/EditorDockWidgetBus.h
index 6b273b4b0c..c87030b759 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/EditorDockWidgetBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/EditorDockWidgetBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/EditorTypes.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/EditorTypes.h
index 4bcae26291..6a76dd0840 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/EditorTypes.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/EditorTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphCanvasProfiler.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphCanvasProfiler.h
index 00dab6ee64..16248e1a8e 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphCanvasProfiler.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphCanvasProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h
index 0a548860d9..b59a4162d1 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphCanvasBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphCanvasBus.h
index a3fe3329cf..4bc2ab8a70 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphCanvasBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphCanvasBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/AnimatedPulse.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/AnimatedPulse.cpp
index 71fc3c59e2..f8e2989f15 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/AnimatedPulse.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/AnimatedPulse.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/AnimatedPulse.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/AnimatedPulse.h
index 00fa24edb1..632ade412f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/AnimatedPulse.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/AnimatedPulse.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.cpp
index 0f9ef09aa5..7b0b328bac 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.h
index ff53414f6d..56b6fcd7f8 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GlowOutlineGraphicsItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphCanvasSceneEventFilter.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphCanvasSceneEventFilter.h
index 96c9d8e06d..827a7b3159 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphCanvasSceneEventFilter.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphCanvasSceneEventFilter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphicsEffect.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphicsEffect.h
index 5b6b3ea7d6..e89a0cca6e 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphicsEffect.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphicsEffect.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphicsEffectBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphicsEffectBus.h
index 8865ec05de..3e39671ee7 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphicsEffectBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/GraphicsEffectBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/Occluder.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/Occluder.cpp
index 65de0dfeae..fc2c23a586 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/Occluder.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/Occluder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/Occluder.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/Occluder.h
index 2e786ce525..d0f371541d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/Occluder.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/Occluder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/ParticleGraphicsItem.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/ParticleGraphicsItem.cpp
index d651651396..2878d10f7f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/ParticleGraphicsItem.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/ParticleGraphicsItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/ParticleGraphicsItem.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/ParticleGraphicsItem.h
index 1d597a3b86..5f82f5b54a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/ParticleGraphicsItem.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/ParticleGraphicsItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/PulseBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/PulseBus.h
index 7c6e70cc72..05cfb64e80 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/PulseBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/GraphicsItems/PulseBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Parser.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Parser.cpp
index cbcb0df437..2cab8aa870 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Parser.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Parser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Parser.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Parser.h
index d0b4e82a5a..45a957d6f0 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Parser.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/PseudoElement.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/PseudoElement.cpp
index 5e7c91f636..ba0e4e45b6 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/PseudoElement.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/PseudoElement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/PseudoElement.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/PseudoElement.h
index 722d454487..e65a0c2808 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/PseudoElement.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/PseudoElement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Selector.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Selector.cpp
index ef971c1420..82b4e951fa 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Selector.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Selector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Selector.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Selector.h
index 14b719921f..43cadb1be4 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Selector.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Selector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.cpp
index 272470dc1c..c20f8e2e82 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.h
index 60867bd8a5..b100c7f453 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/SelectorImplementations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.cpp
index 467d7dddaf..bfab89f931 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.h
index 74a617726d..bfa06afed6 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/Style.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.h
index 1d825f1af6..f6a2bcc16e 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleManager.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleManager.cpp
index 6907296191..f7a6af8519 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleManager.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleManager.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleManager.h
index 83372817fe..9eff22d7fd 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleManager.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/definitions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/definitions.cpp
index b1c2271753..32accd69f5 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/definitions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/definitions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/definitions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/definitions.h
index 47931138f5..6669eb8fb0 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/definitions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/definitions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ComponentSaveDataInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ComponentSaveDataInterface.h
index 597d8d612d..98fd89f80e 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ComponentSaveDataInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ComponentSaveDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ConstructPresets.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ConstructPresets.cpp
index 0577726381..e8163d7549 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ConstructPresets.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ConstructPresets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ConstructPresets.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ConstructPresets.h
index 7088782d9a..894cdd4d03 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ConstructPresets.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/ConstructPresets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/Endpoint.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/Endpoint.h
index 303a898d0c..4ce99c60c2 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/Endpoint.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/Endpoint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/EntitySaveData.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/EntitySaveData.h
index 71ec1c8937..9d201327b3 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/EntitySaveData.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/EntitySaveData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphData.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphData.cpp
index 6ceeadaea6..bb8fc3c525 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphData.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphData.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphData.h
index dc42fc628c..d58c380c91 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphData.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.cpp
index 3985411c7f..7781de7871 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.h
index 0d6aec6e38..b2e7da2aab 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/QtMetaTypes.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/QtMetaTypes.h
index f4163fb05d..6dc241141d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/QtMetaTypes.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/QtMetaTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h
index feec86d773..9ca47f578d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h
index 1f06e3fd84..50fa7ada6c 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/Types.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/Types.h
index 73dc5262ce..ca00bec14d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/Types.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/Types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/ColorUtils.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/ColorUtils.h
index 68adff899b..4e9f50da2c 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/ColorUtils.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/ColorUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/ConversionUtils.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/ConversionUtils.h
index 0b9f301771..907ec5a482 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/ConversionUtils.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/ConversionUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp
index c51da9aa05..258992e3d0 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.h
index aaf114d52d..fa6807739f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/NodeNudgingController.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/NodeNudgingController.cpp
index dafea1ba67..6184df95aa 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/NodeNudgingController.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/NodeNudgingController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/NodeNudgingController.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/NodeNudgingController.h
index 1cac7cc563..7b726e2bca 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/NodeNudgingController.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/NodeNudgingController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtDrawingUtils.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtDrawingUtils.cpp
index 5e9de3f20f..09541bcc77 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtDrawingUtils.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtDrawingUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtDrawingUtils.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtDrawingUtils.h
index a8e7f8b7e0..758bc487cb 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtDrawingUtils.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtDrawingUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtMimeUtils.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtMimeUtils.h
index e60d124f63..8d107c1f0d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtMimeUtils.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtMimeUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtVectorMath.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtVectorMath.h
index 0b00abf853..57b83a1b13 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtVectorMath.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/QtVectorMath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/PrioritizedStateController.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/PrioritizedStateController.h
index 9f2db8ef07..786cb79500 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/PrioritizedStateController.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/PrioritizedStateController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StackStateController.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StackStateController.h
index 5db3ab8db6..0f7ce57ed4 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StackStateController.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StackStateController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StateController.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StateController.h
index 063c2a2d91..c9d2d3e993 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StateController.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/StateControllers/StateController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.cpp
index 1080d65e15..d3876d640a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.h
index c9aeef6deb..b0ece46635 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.cpp
index b18677c62c..0e63bd0be7 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.h
index a6e35c0988..a632dfce5d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.cpp
index 3f21dc1490..b0c79d482e 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.h
index 319dc840c8..a6e6db9c57 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Bookmarks/BookmarkTableModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModelInterface.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModelInterface.h
index b813e65312..00008b39ea 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModelInterface.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModelInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModels.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModels.h
index 25740153d5..ddbc5ed09b 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModels.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModels.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ConstructPresetDialog/ConstructPresetDialog.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ConstructPresetDialog/ConstructPresetDialog.cpp
index 6270a670c3..ed78b14e4f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ConstructPresetDialog/ConstructPresetDialog.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ConstructPresetDialog/ConstructPresetDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ConstructPresetDialog/ConstructPresetDialog.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ConstructPresetDialog/ConstructPresetDialog.h
index b1e703bb65..162fc190ac 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ConstructPresetDialog/ConstructPresetDialog.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ConstructPresetDialog/ConstructPresetDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.cpp
index 26e4be8c1a..8a78cf53bf 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.h
index 210452d080..faf304652d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuAction.h
index efd7cea72f..5f9b4afbcf 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuActions.cpp
index a9e57f70fc..cee4dddac0 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuActions.h
index af4413f167..b4c811b9bb 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentContextMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentActionsMenuGroup.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentActionsMenuGroup.cpp
index e7fcaa14ab..a2830af583 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentActionsMenuGroup.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentActionsMenuGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentActionsMenuGroup.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentActionsMenuGroup.h
index 30180f6d5d..e17eef2cca 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentActionsMenuGroup.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentActionsMenuGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuAction.h
index 17b1f28c9f..a2e4ca8d8a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuActions.cpp
index 96211bd4aa..ad68fe62e1 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuActions.h
index 6470c1621e..c5b68730a3 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/CommentMenuActions/CommentContextMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/BookmarkConstructMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/BookmarkConstructMenuActions.cpp
index 29b66f6908..cd3bd773ea 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/BookmarkConstructMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/BookmarkConstructMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/BookmarkConstructMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/BookmarkConstructMenuActions.h
index b5243025b8..8074084558 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/BookmarkConstructMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/BookmarkConstructMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/CommentConstructMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/CommentConstructMenuActions.cpp
index 392bc5e729..15655123ec 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/CommentConstructMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/CommentConstructMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/CommentConstructMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/CommentConstructMenuActions.h
index f65c61cced..f44f151008 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/CommentConstructMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/CommentConstructMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructContextMenuAction.h
index 966381cdf3..1c87ff0424 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructPresetMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructPresetMenuActions.cpp
index eb8fe9d93a..19011e8c34 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructPresetMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructPresetMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructPresetMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructPresetMenuActions.h
index ff5c4e10cb..d23b99fafc 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructPresetMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/ConstructPresetMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/GraphCanvasConstructActionsMenuGroup.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/GraphCanvasConstructActionsMenuGroup.cpp
index 3683225604..76de574773 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/GraphCanvasConstructActionsMenuGroup.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/GraphCanvasConstructActionsMenuGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/GraphCanvasConstructActionsMenuGroup.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/GraphCanvasConstructActionsMenuGroup.h
index 14722b8325..be3d8f3b71 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/GraphCanvasConstructActionsMenuGroup.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ConstructMenuActions/GraphCanvasConstructActionsMenuGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ContextMenuAction.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ContextMenuAction.cpp
index 62a9bc88a0..16bf434147 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ContextMenuAction.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ContextMenuAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ContextMenuAction.h
index e91dfd54ab..574f84f54a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/ContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableActionsMenuGroup.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableActionsMenuGroup.cpp
index 047f11a18c..f4bdf198c5 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableActionsMenuGroup.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableActionsMenuGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableActionsMenuGroup.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableActionsMenuGroup.h
index 125eaca0f3..6ab1238fb8 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableActionsMenuGroup.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableActionsMenuGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuAction.h
index 0b79173847..de1a45cc1f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuActions.cpp
index 715bc53f1f..9bfb34815c 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuActions.h
index 594314ecc1..2045371dfb 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/DisableMenuActions/DisableMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditActionsMenuGroup.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditActionsMenuGroup.cpp
index bfbb473579..4ea31bed3c 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditActionsMenuGroup.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditActionsMenuGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditActionsMenuGroup.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditActionsMenuGroup.h
index dbcdaacc62..6ea88bb61d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditActionsMenuGroup.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditActionsMenuGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuAction.h
index 079601d134..5f7506307b 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuActions.cpp
index 3936723eeb..f1c48a1b13 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuActions.h
index dd2f2e21d3..76d1e56ded 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/EditMenuActions/EditContextMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/GeneralMenuActions/GeneralMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/GeneralMenuActions/GeneralMenuActions.cpp
index 958adf5c71..527500a97f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/GeneralMenuActions/GeneralMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/GeneralMenuActions/GeneralMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/GeneralMenuActions/GeneralMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/GeneralMenuActions/GeneralMenuActions.h
index 6c982d7cb8..f3e58760d8 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/GeneralMenuActions/GeneralMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/GeneralMenuActions/GeneralMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupActionsMenuGroup.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupActionsMenuGroup.cpp
index ed36c8760c..f971e89975 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupActionsMenuGroup.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupActionsMenuGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupActionsMenuGroup.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupActionsMenuGroup.h
index 1b4121b581..57effc487a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupActionsMenuGroup.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupActionsMenuGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuAction.h
index 0055ceccca..f99abf230f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuActions.cpp
index 7810ef963c..e0dd4ee6fa 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuActions.h
index 3982e282b9..da743e274d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeGroupMenuActions/NodeGroupContextMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuAction.h
index d8b1a424d8..58157d8094 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuActions.cpp
index 56438dc738..a26ace6323 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuActions.h
index 8c608439c5..e464ca5333 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/NodeMenuActions/NodeContextMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneActionsMenuGroup.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneActionsMenuGroup.cpp
index e2d4d52078..74ad4bb9c8 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneActionsMenuGroup.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneActionsMenuGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneActionsMenuGroup.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneActionsMenuGroup.h
index f09d9e046a..42d8911e97 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneActionsMenuGroup.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneActionsMenuGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuAction.h
index d5b1bf35a5..1366113d99 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuActions.cpp
index c55d2eb771..66b4e085c0 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuActions.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuActions.h
index 489efe89e3..d1f1d630b9 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SceneMenuActions/SceneContextMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuAction.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuAction.h
index 79ce62cb5e..14b150c80f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuAction.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.cpp
index bb50f5b6d9..8fdd070d3b 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.h
index 9d1663389a..90c3a39ba1 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/BookmarkContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/BookmarkContextMenu.cpp
index ef7fb89ec0..8149c38a31 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/BookmarkContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/BookmarkContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/BookmarkContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/BookmarkContextMenu.h
index 89c8b5f056..724ac889b1 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/BookmarkContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/BookmarkContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CollapsedNodeGroupContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CollapsedNodeGroupContextMenu.cpp
index d00ce12a59..9ae756f8f2 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CollapsedNodeGroupContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CollapsedNodeGroupContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CollapsedNodeGroupContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CollapsedNodeGroupContextMenu.h
index 95ceef9fbc..9544bc9616 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CollapsedNodeGroupContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CollapsedNodeGroupContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CommentContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CommentContextMenu.cpp
index 35e7205226..f324d1bcf8 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CommentContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CommentContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CommentContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CommentContextMenu.h
index 38b577c680..ac6b228609 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CommentContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/CommentContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/ConnectionContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/ConnectionContextMenu.cpp
index 42311d9252..5c1107beb5 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/ConnectionContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/ConnectionContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/ConnectionContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/ConnectionContextMenu.h
index faa87802d8..78f906c5da 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/ConnectionContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/ConnectionContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeContextMenu.cpp
index f2f0bd0b47..7bde7da546 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeContextMenu.h
index b51ccd10dd..1c576b1052 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeGroupContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeGroupContextMenu.cpp
index 652e3417a1..378c496631 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeGroupContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeGroupContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeGroupContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeGroupContextMenu.h
index 132ef47102..d13f5719f0 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeGroupContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/NodeGroupContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SceneContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SceneContextMenu.cpp
index f6ca377b84..923816da6f 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SceneContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SceneContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SceneContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SceneContextMenu.h
index aa1c72e5cc..c3df1602e5 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SceneContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SceneContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SlotContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SlotContextMenu.cpp
index 1b23a35ea2..ccb6e86475 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SlotContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SlotContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SlotContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SlotContextMenu.h
index 70bc612500..053f9335cd 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SlotContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenus/SlotContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.cpp
index bc75e4c7d8..ded23f6f88 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.h
index b3d87ad110..188db03b70 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.cpp
index 21fdf3a0de..f98b42d93a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.h
index bdd2e42584..c9820a80ad 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorCentralWidget.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorCentralWidget.cpp
index e674f45e59..3282bfd331 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorCentralWidget.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorCentralWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorCentralWidget.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorCentralWidget.h
index 1d659bbb68..868e426c33 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorCentralWidget.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorCentralWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorDockWidget.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorDockWidget.cpp
index 64f25841cb..498f0dacfb 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorDockWidget.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorDockWidget.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorDockWidget.h
index 4a06bd2037..4479e7b98e 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorDockWidget.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasEditorDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.cpp
index 22094883a4..a53e42fc5a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.h
index 2cce7426e9..898a6c1286 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeContainer.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeContainer.cpp
index 89eb3da9d5..9f9f3c5df9 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeContainer.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeContainer.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeContainer.h
index 38de367bf2..2a82720550 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeContainer.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeEvent.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeEvent.cpp
index ae7130f2b9..480b8566d8 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeEvent.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeEvent.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeEvent.h
index 5fe7adffff..7353a20bb7 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeEvent.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasMimeEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeCategorizer.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeCategorizer.cpp
index b243783c52..9b90419708 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeCategorizer.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeCategorizer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeCategorizer.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeCategorizer.h
index 59534ccbaa..4eba0d772a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeCategorizer.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeCategorizer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeItem.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeItem.cpp
index 1533b36fcc..e57434d272 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeItem.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeItem.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeItem.h
index 5296e0bcf1..6251ec1ef4 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeItem.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeModel.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeModel.cpp
index 8d521dc878..0928d29661 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeModel.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeModel.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeModel.h
index 28af68d351..595b5ca422 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeModel.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasTreeModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MimeEvents/CreateSplicingNodeMimeEvent.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MimeEvents/CreateSplicingNodeMimeEvent.cpp
index b5e95f45bf..c3e422ef62 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MimeEvents/CreateSplicingNodeMimeEvent.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MimeEvents/CreateSplicingNodeMimeEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MimeEvents/CreateSplicingNodeMimeEvent.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MimeEvents/CreateSplicingNodeMimeEvent.h
index e89f595cb0..ffad96e7d7 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MimeEvents/CreateSplicingNodeMimeEvent.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MimeEvents/CreateSplicingNodeMimeEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.cpp
index 2ebabebf2c..516a64ce4d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.h
index 695b444517..7467e6714c 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/MiniMapGraphicsView/MiniMapGraphicsView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.cpp
index 72d8b1cb86..d5c06ff341 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.h
index d45122e3dc..c4e4a4d52d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteDockWidget.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteDockWidget.cpp
index 863fe14a04..8db267e0e2 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteDockWidget.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteDockWidget.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteDockWidget.h
index e54befa852..0eaf5dc2c8 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteDockWidget.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.cpp
index d215deb49b..f87e09906d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.h
index 191c03212c..666f9ea920 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteWidget.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteWidget.cpp
index 795e645678..51f22435fd 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteWidget.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteWidget.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteWidget.h
index e617fcde77..2d777c8e9d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteWidget.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/NodePaletteWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/DraggableNodePaletteTreeItem.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/DraggableNodePaletteTreeItem.cpp
index cb2af3bab8..25ac4f5c52 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/DraggableNodePaletteTreeItem.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/DraggableNodePaletteTreeItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/DraggableNodePaletteTreeItem.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/DraggableNodePaletteTreeItem.h
index ef7bb4c285..77fd597f8a 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/DraggableNodePaletteTreeItem.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/DraggableNodePaletteTreeItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.cpp
index 877a8fbd16..c542156954 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.h
index 48d81f2e01..a2154e11ae 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp
index 464e8aa9e7..383ff51122 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h
index 4af70eacdf..0b301bb80c 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePropertyBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePropertyBus.h
index f9d98b68fb..aa4d7d3a19 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePropertyBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePropertyBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Resources/Resources.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Resources/Resources.h
index 15dbc479b2..12d81b7cb1 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Resources/Resources.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/Resources/Resources.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/GenericComboBoxDelegate.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/GenericComboBoxDelegate.cpp
index 1825d8e09c..99468829a6 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/GenericComboBoxDelegate.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/GenericComboBoxDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/GenericComboBoxDelegate.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/GenericComboBoxDelegate.h
index 02dcfa3bb9..9a2bb33864 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/GenericComboBoxDelegate.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/GenericComboBoxDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/IconDecoratedNameDelegate.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/IconDecoratedNameDelegate.cpp
index 194039a5da..e37a1099ae 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/IconDecoratedNameDelegate.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/IconDecoratedNameDelegate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/IconDecoratedNameDelegate.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/IconDecoratedNameDelegate.h
index 924e0912eb..24ba737341 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/IconDecoratedNameDelegate.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/StyledItemDelegates/IconDecoratedNameDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ToastNotification/ToastNotification.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ToastNotification/ToastNotification.cpp
index 3d910dd067..044b17f19d 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ToastNotification/ToastNotification.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ToastNotification/ToastNotification.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ToastNotification/ToastNotification.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ToastNotification/ToastNotification.h
index b9c52aac5c..4cc7de1648 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ToastNotification/ToastNotification.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ToastNotification/ToastNotification.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphCanvas/Code/graphcanvas_files.cmake b/Gems/GraphCanvas/Code/graphcanvas_files.cmake
index 2a0d0b9351..73efe3eaee 100644
--- a/Gems/GraphCanvas/Code/graphcanvas_files.cmake
+++ b/Gems/GraphCanvas/Code/graphcanvas_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
index 58da6cffab..1fdadd4100 100644
--- a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
+++ b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphCanvas/Code/precompiled.h b/Gems/GraphCanvas/Code/precompiled.h
index db8cf83d4f..f1184278c9 100644
--- a/Gems/GraphCanvas/Code/precompiled.h
+++ b/Gems/GraphCanvas/Code/precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/CMakeLists.txt b/Gems/GraphModel/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/GraphModel/CMakeLists.txt
+++ b/Gems/GraphModel/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphModel/Code/CMakeLists.txt b/Gems/GraphModel/Code/CMakeLists.txt
index 211e696d8a..4d4a31d502 100644
--- a/Gems/GraphModel/Code/CMakeLists.txt
+++ b/Gems/GraphModel/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphModel/Code/Include/GraphModel/GraphModelBus.h b/Gems/GraphModel/Code/Include/GraphModel/GraphModelBus.h
index f0219b9372..636f821427 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/GraphModelBus.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/GraphModelBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/BooleanDataInterface.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/BooleanDataInterface.h
index de9749db5a..ac9c00cda8 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/BooleanDataInterface.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/BooleanDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/EditorMainWindow.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/EditorMainWindow.h
index 2824890976..e46a6e9caa 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/EditorMainWindow.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/EditorMainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/FloatDataInterface.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/FloatDataInterface.h
index e543adfba0..c640c704a8 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/FloatDataInterface.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/FloatDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphCanvasMetadata.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphCanvasMetadata.h
index 465b26bfa9..fc104db598 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphCanvasMetadata.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphCanvasMetadata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h
index 1019f06b07..84e54ea6bf 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphControllerManager.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphControllerManager.h
index 4fe435cc0a..85c0423910 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphControllerManager.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/GraphControllerManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/Helpers.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/Helpers.h
index a62249cfc8..dde6e28f26 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/Helpers.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/Helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/IntegerDataInterface.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/IntegerDataInterface.h
index da32107baa..e7b94662f1 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/IntegerDataInterface.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/IntegerDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/IntegrationBus.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/IntegrationBus.h
index 562bbd81d2..6e0d48144e 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/IntegrationBus.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/IntegrationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/GraphCanvasNodePaletteItems.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/GraphCanvasNodePaletteItems.h
index bf7d6cf76f..d91e477d07 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/GraphCanvasNodePaletteItems.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/GraphCanvasNodePaletteItems.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h
index 88605cb078..88cec25f5d 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h
index 5d8d3085a1..20d81954c6 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h
index 585c93d723..f79a35b930 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/ReadOnlyDataInterface.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/ReadOnlyDataInterface.h
index 09ff2dce74..8ae7d2428b 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/ReadOnlyDataInterface.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/ReadOnlyDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/StringDataInterface.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/StringDataInterface.h
index 8ccca856d8..99a68aefdc 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/StringDataInterface.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/StringDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/ThumbnailImageItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/ThumbnailImageItem.h
index 126a3c4029..079a9550f6 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/ThumbnailImageItem.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/ThumbnailImageItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/ThumbnailItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/ThumbnailItem.h
index 1a83236088..08d9112ca2 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/ThumbnailItem.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/ThumbnailItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Integration/VectorDataInterface.inl b/Gems/GraphModel/Code/Include/GraphModel/Integration/VectorDataInterface.inl
index 9bd0584cd0..8208d0e504 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/VectorDataInterface.inl
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/VectorDataInterface.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/Common.h b/Gems/GraphModel/Code/Include/GraphModel/Model/Common.h
index 6d2c575843..b0196d6f5e 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/Common.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/Common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/Connection.h b/Gems/GraphModel/Code/Include/GraphModel/Model/Connection.h
index 83c672e28d..e81605903d 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/Connection.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/Connection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/DataType.h b/Gems/GraphModel/Code/Include/GraphModel/Model/DataType.h
index 5fa8fcbfbb..25d0265776 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/DataType.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/DataType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/Graph.h b/Gems/GraphModel/Code/Include/GraphModel/Model/Graph.h
index bd29b7c725..b6f5868e9c 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/Graph.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/Graph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/GraphElement.h b/Gems/GraphModel/Code/Include/GraphModel/Model/GraphElement.h
index 69c9118601..acf7d130c7 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/GraphElement.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/GraphElement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/IGraphContext.h b/Gems/GraphModel/Code/Include/GraphModel/Model/IGraphContext.h
index c43eb6e486..14a8d88c04 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/IGraphContext.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/IGraphContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/Module/InputOutputNodes.h b/Gems/GraphModel/Code/Include/GraphModel/Model/Module/InputOutputNodes.h
index bd8b595af4..515b2e34aa 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/Module/InputOutputNodes.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/Module/InputOutputNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/Module/ModuleGraphManager.h b/Gems/GraphModel/Code/Include/GraphModel/Model/Module/ModuleGraphManager.h
index 549c187e4d..b407795199 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/Module/ModuleGraphManager.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/Module/ModuleGraphManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/Module/ModuleNode.h b/Gems/GraphModel/Code/Include/GraphModel/Model/Module/ModuleNode.h
index 40b8e0d662..b0dfbb71d7 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/Module/ModuleNode.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/Module/ModuleNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/Node.h b/Gems/GraphModel/Code/Include/GraphModel/Model/Node.h
index f05e8d2cd0..261ffe1c4c 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/Node.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Include/GraphModel/Model/Slot.h b/Gems/GraphModel/Code/Include/GraphModel/Model/Slot.h
index 3422c47f29..552661f445 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Model/Slot.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Model/Slot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/GraphModelModule.cpp b/Gems/GraphModel/Code/Source/GraphModelModule.cpp
index e6d1f093a0..4e456585de 100644
--- a/Gems/GraphModel/Code/Source/GraphModelModule.cpp
+++ b/Gems/GraphModel/Code/Source/GraphModelModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/GraphModelSystemComponent.cpp b/Gems/GraphModel/Code/Source/GraphModelSystemComponent.cpp
index 83c7cac8ac..bbdec4b9c5 100644
--- a/Gems/GraphModel/Code/Source/GraphModelSystemComponent.cpp
+++ b/Gems/GraphModel/Code/Source/GraphModelSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/GraphModelSystemComponent.h b/Gems/GraphModel/Code/Source/GraphModelSystemComponent.h
index 6d17bc4f20..f78690d4e4 100644
--- a/Gems/GraphModel/Code/Source/GraphModelSystemComponent.h
+++ b/Gems/GraphModel/Code/Source/GraphModelSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/BooleanDataInterface.cpp b/Gems/GraphModel/Code/Source/Integration/BooleanDataInterface.cpp
index cf7eeb66a8..5ac5914102 100644
--- a/Gems/GraphModel/Code/Source/Integration/BooleanDataInterface.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/BooleanDataInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/EditorMainWindow.cpp b/Gems/GraphModel/Code/Source/Integration/EditorMainWindow.cpp
index 30d44d745b..31ac4c329e 100644
--- a/Gems/GraphModel/Code/Source/Integration/EditorMainWindow.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/EditorMainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/FloatDataInterface.cpp b/Gems/GraphModel/Code/Source/Integration/FloatDataInterface.cpp
index 2ff9be0557..ae04c13845 100644
--- a/Gems/GraphModel/Code/Source/Integration/FloatDataInterface.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/FloatDataInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/GraphCanvasMetadata.cpp b/Gems/GraphModel/Code/Source/Integration/GraphCanvasMetadata.cpp
index 965b7df10c..6e59e9c273 100644
--- a/Gems/GraphModel/Code/Source/Integration/GraphCanvasMetadata.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/GraphCanvasMetadata.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/GraphController.cpp b/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
index b375e86b7c..dff224b03d 100644
--- a/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/GraphController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/GraphControllerManager.cpp b/Gems/GraphModel/Code/Source/Integration/GraphControllerManager.cpp
index e9c2d0b41e..68f8ede512 100644
--- a/Gems/GraphModel/Code/Source/Integration/GraphControllerManager.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/GraphControllerManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/IntegerDataInterface.cpp b/Gems/GraphModel/Code/Source/Integration/IntegerDataInterface.cpp
index a002393f99..942f8fc0ce 100644
--- a/Gems/GraphModel/Code/Source/Integration/IntegerDataInterface.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/IntegerDataInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/NodePalette/GraphCanvasNodePaletteItems.cpp b/Gems/GraphModel/Code/Source/Integration/NodePalette/GraphCanvasNodePaletteItems.cpp
index 956fd4ecf3..d865d92ef6 100644
--- a/Gems/GraphModel/Code/Source/Integration/NodePalette/GraphCanvasNodePaletteItems.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/NodePalette/GraphCanvasNodePaletteItems.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/ReadOnlyDataInterface.cpp b/Gems/GraphModel/Code/Source/Integration/ReadOnlyDataInterface.cpp
index 7aa78f0957..80793e655b 100644
--- a/Gems/GraphModel/Code/Source/Integration/ReadOnlyDataInterface.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/ReadOnlyDataInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/StringDataInterface.cpp b/Gems/GraphModel/Code/Source/Integration/StringDataInterface.cpp
index f85babb767..fb98490491 100644
--- a/Gems/GraphModel/Code/Source/Integration/StringDataInterface.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/StringDataInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/ThumbnailImageItem.cpp b/Gems/GraphModel/Code/Source/Integration/ThumbnailImageItem.cpp
index 830ed4ecba..b0d026bc23 100644
--- a/Gems/GraphModel/Code/Source/Integration/ThumbnailImageItem.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/ThumbnailImageItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Integration/ThumbnailItem.cpp b/Gems/GraphModel/Code/Source/Integration/ThumbnailItem.cpp
index 5fb63b9064..c4803924f4 100644
--- a/Gems/GraphModel/Code/Source/Integration/ThumbnailItem.cpp
+++ b/Gems/GraphModel/Code/Source/Integration/ThumbnailItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/Connection.cpp b/Gems/GraphModel/Code/Source/Model/Connection.cpp
index 87b2d81ee8..cf73427fe9 100644
--- a/Gems/GraphModel/Code/Source/Model/Connection.cpp
+++ b/Gems/GraphModel/Code/Source/Model/Connection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/DataType.cpp b/Gems/GraphModel/Code/Source/Model/DataType.cpp
index 55b26eeb9b..e88a37b62b 100644
--- a/Gems/GraphModel/Code/Source/Model/DataType.cpp
+++ b/Gems/GraphModel/Code/Source/Model/DataType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/Graph.cpp b/Gems/GraphModel/Code/Source/Model/Graph.cpp
index 097b6b30b9..f3b8537ca5 100644
--- a/Gems/GraphModel/Code/Source/Model/Graph.cpp
+++ b/Gems/GraphModel/Code/Source/Model/Graph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/GraphElement.cpp b/Gems/GraphModel/Code/Source/Model/GraphElement.cpp
index c3cc97c309..f2e62a37b0 100644
--- a/Gems/GraphModel/Code/Source/Model/GraphElement.cpp
+++ b/Gems/GraphModel/Code/Source/Model/GraphElement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/Module/InputOutputNodes.cpp b/Gems/GraphModel/Code/Source/Model/Module/InputOutputNodes.cpp
index e8aa8e5bf7..21e9385a9b 100644
--- a/Gems/GraphModel/Code/Source/Model/Module/InputOutputNodes.cpp
+++ b/Gems/GraphModel/Code/Source/Model/Module/InputOutputNodes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/Module/ModuleGraphManager.cpp b/Gems/GraphModel/Code/Source/Model/Module/ModuleGraphManager.cpp
index a1bb8ba387..0eb9a38c18 100644
--- a/Gems/GraphModel/Code/Source/Model/Module/ModuleGraphManager.cpp
+++ b/Gems/GraphModel/Code/Source/Model/Module/ModuleGraphManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/Module/ModuleNode.cpp b/Gems/GraphModel/Code/Source/Model/Module/ModuleNode.cpp
index 2adc537cf5..2df4dc926a 100644
--- a/Gems/GraphModel/Code/Source/Model/Module/ModuleNode.cpp
+++ b/Gems/GraphModel/Code/Source/Model/Module/ModuleNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/Node.cpp b/Gems/GraphModel/Code/Source/Model/Node.cpp
index aeb1756cca..86d53107ae 100644
--- a/Gems/GraphModel/Code/Source/Model/Node.cpp
+++ b/Gems/GraphModel/Code/Source/Model/Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Source/Model/Slot.cpp b/Gems/GraphModel/Code/Source/Model/Slot.cpp
index a24814c68b..07c5ec0ef4 100644
--- a/Gems/GraphModel/Code/Source/Model/Slot.cpp
+++ b/Gems/GraphModel/Code/Source/Model/Slot.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Tests/GraphModelIntegrationTest.cpp b/Gems/GraphModel/Code/Tests/GraphModelIntegrationTest.cpp
index 10f01b96b5..76925f60e8 100644
--- a/Gems/GraphModel/Code/Tests/GraphModelIntegrationTest.cpp
+++ b/Gems/GraphModel/Code/Tests/GraphModelIntegrationTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Tests/GraphModelPythonBindingsTest.cpp b/Gems/GraphModel/Code/Tests/GraphModelPythonBindingsTest.cpp
index 7f1ee8aeee..9113487660 100644
--- a/Gems/GraphModel/Code/Tests/GraphModelPythonBindingsTest.cpp
+++ b/Gems/GraphModel/Code/Tests/GraphModelPythonBindingsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Tests/MockGraphCanvas.cpp b/Gems/GraphModel/Code/Tests/MockGraphCanvas.cpp
index 097aa4f8be..b709c057e0 100644
--- a/Gems/GraphModel/Code/Tests/MockGraphCanvas.cpp
+++ b/Gems/GraphModel/Code/Tests/MockGraphCanvas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Tests/MockGraphCanvas.h b/Gems/GraphModel/Code/Tests/MockGraphCanvas.h
index 9235b52d1b..c679792902 100644
--- a/Gems/GraphModel/Code/Tests/MockGraphCanvas.h
+++ b/Gems/GraphModel/Code/Tests/MockGraphCanvas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Tests/TestEnvironment.cpp b/Gems/GraphModel/Code/Tests/TestEnvironment.cpp
index a10b053f0b..33e8e1bec9 100644
--- a/Gems/GraphModel/Code/Tests/TestEnvironment.cpp
+++ b/Gems/GraphModel/Code/Tests/TestEnvironment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/Tests/TestEnvironment.h b/Gems/GraphModel/Code/Tests/TestEnvironment.h
index 97d8437415..d68dd34bb9 100644
--- a/Gems/GraphModel/Code/Tests/TestEnvironment.h
+++ b/Gems/GraphModel/Code/Tests/TestEnvironment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/GraphModel/Code/graphmodel_editor_files.cmake b/Gems/GraphModel/Code/graphmodel_editor_files.cmake
index a73a6bd619..15b62b777d 100644
--- a/Gems/GraphModel/Code/graphmodel_editor_files.cmake
+++ b/Gems/GraphModel/Code/graphmodel_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphModel/Code/graphmodel_editor_static_files.cmake b/Gems/GraphModel/Code/graphmodel_editor_static_files.cmake
index 101bfa0900..d383b69d38 100644
--- a/Gems/GraphModel/Code/graphmodel_editor_static_files.cmake
+++ b/Gems/GraphModel/Code/graphmodel_editor_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/GraphModel/Code/graphmodel_tests_editor_files.cmake b/Gems/GraphModel/Code/graphmodel_tests_editor_files.cmake
index 9d6d8d977b..cffba07c35 100644
--- a/Gems/GraphModel/Code/graphmodel_tests_editor_files.cmake
+++ b/Gems/GraphModel/Code/graphmodel_tests_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/CMakeLists.txt b/Gems/HttpRequestor/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/HttpRequestor/CMakeLists.txt
+++ b/Gems/HttpRequestor/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/CMakeLists.txt b/Gems/HttpRequestor/Code/CMakeLists.txt
index 6f59db4fec..effe700762 100644
--- a/Gems/HttpRequestor/Code/CMakeLists.txt
+++ b/Gems/HttpRequestor/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestParameters.h b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestParameters.h
index c3a126a38b..24e9d48ec5 100644
--- a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestParameters.h
+++ b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestParameters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestorBus.h b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestorBus.h
index b2bc03a204..4c39a2c190 100644
--- a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestorBus.h
+++ b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTextRequestParameters.h b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTextRequestParameters.h
index 859a47c532..f7e06d2f5f 100644
--- a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTextRequestParameters.h
+++ b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTextRequestParameters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTypes.h b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTypes.h
index 93ba989798..cacae74aa5 100644
--- a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTypes.h
+++ b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Source/ComponentStub.cpp b/Gems/HttpRequestor/Code/Source/ComponentStub.cpp
index fe5e99258c..f9c03ac233 100644
--- a/Gems/HttpRequestor/Code/Source/ComponentStub.cpp
+++ b/Gems/HttpRequestor/Code/Source/ComponentStub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp b/Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp
index 7dfc20fb32..eed88e3dae 100644
--- a/Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp
+++ b/Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Source/HttpRequestManager.h b/Gems/HttpRequestor/Code/Source/HttpRequestManager.h
index 18175f9344..be8845d4ae 100644
--- a/Gems/HttpRequestor/Code/Source/HttpRequestManager.h
+++ b/Gems/HttpRequestor/Code/Source/HttpRequestManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp b/Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp
index f584ed2d05..c0321c6f3d 100644
--- a/Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp
+++ b/Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp b/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp
index a677d60e8d..6da1f28d9c 100644
--- a/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp
+++ b/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.h b/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.h
index a4feef4990..bf62088c14 100644
--- a/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.h
+++ b/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.h b/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.h
index ae103e5cfa..2ff5546d1b 100644
--- a/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.h
+++ b/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/Source/Platform/Android/httprequestor_android.cmake b/Gems/HttpRequestor/Code/Source/Platform/Android/httprequestor_android.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/HttpRequestor/Code/Source/Platform/Android/httprequestor_android.cmake
+++ b/Gems/HttpRequestor/Code/Source/Platform/Android/httprequestor_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/Source/Platform/Linux/httprequestor_linux.cmake b/Gems/HttpRequestor/Code/Source/Platform/Linux/httprequestor_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/HttpRequestor/Code/Source/Platform/Linux/httprequestor_linux.cmake
+++ b/Gems/HttpRequestor/Code/Source/Platform/Linux/httprequestor_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/Source/Platform/Mac/httprequestor_mac.cmake b/Gems/HttpRequestor/Code/Source/Platform/Mac/httprequestor_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/HttpRequestor/Code/Source/Platform/Mac/httprequestor_mac.cmake
+++ b/Gems/HttpRequestor/Code/Source/Platform/Mac/httprequestor_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/Source/Platform/Windows/httprequestor_windows.cmake b/Gems/HttpRequestor/Code/Source/Platform/Windows/httprequestor_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/HttpRequestor/Code/Source/Platform/Windows/httprequestor_windows.cmake
+++ b/Gems/HttpRequestor/Code/Source/Platform/Windows/httprequestor_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/Source/Platform/iOS/httprequestor_ios.cmake b/Gems/HttpRequestor/Code/Source/Platform/iOS/httprequestor_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/HttpRequestor/Code/Source/Platform/iOS/httprequestor_ios.cmake
+++ b/Gems/HttpRequestor/Code/Source/Platform/iOS/httprequestor_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp b/Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp
index 7c4f36da1f..3a4a9e7d71 100644
--- a/Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp
+++ b/Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/HttpRequestor/Code/httprequestor_files.cmake b/Gems/HttpRequestor/Code/httprequestor_files.cmake
index eb3fb93776..79bd51688d 100644
--- a/Gems/HttpRequestor/Code/httprequestor_files.cmake
+++ b/Gems/HttpRequestor/Code/httprequestor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/httprequestor_shared_files.cmake b/Gems/HttpRequestor/Code/httprequestor_shared_files.cmake
index 5b82664700..b7496460f1 100644
--- a/Gems/HttpRequestor/Code/httprequestor_shared_files.cmake
+++ b/Gems/HttpRequestor/Code/httprequestor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/httprequestor_tests_files.cmake b/Gems/HttpRequestor/Code/httprequestor_tests_files.cmake
index 8a7c8ced21..d40893bc5c 100644
--- a/Gems/HttpRequestor/Code/httprequestor_tests_files.cmake
+++ b/Gems/HttpRequestor/Code/httprequestor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake b/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake
index d3ac49e4f5..52599c307c 100644
--- a/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake
+++ b/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/CMakeLists.txt b/Gems/ImGui/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/ImGui/CMakeLists.txt
+++ b/Gems/ImGui/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/CMakeLists.txt b/Gems/ImGui/Code/CMakeLists.txt
index df7647e6bb..4b22aab902 100644
--- a/Gems/ImGui/Code/CMakeLists.txt
+++ b/Gems/ImGui/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp b/Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp
index 521058a556..d96c9b719d 100644
--- a/Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp
+++ b/Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Include/ImGuiBus.h b/Gems/ImGui/Code/Include/ImGuiBus.h
index 2185c75d1b..cee9f3882d 100644
--- a/Gems/ImGui/Code/Include/ImGuiBus.h
+++ b/Gems/ImGui/Code/Include/ImGuiBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Include/ImGuiContextScope.h b/Gems/ImGui/Code/Include/ImGuiContextScope.h
index 2588690883..478ef18d91 100644
--- a/Gems/ImGui/Code/Include/ImGuiContextScope.h
+++ b/Gems/ImGui/Code/Include/ImGuiContextScope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Include/ImGuiLYCurveEditorBus.h b/Gems/ImGui/Code/Include/ImGuiLYCurveEditorBus.h
index 1a46681518..25ee455d67 100644
--- a/Gems/ImGui/Code/Include/ImGuiLYCurveEditorBus.h
+++ b/Gems/ImGui/Code/Include/ImGuiLYCurveEditorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Include/LYImGuiUtils/HistogramContainer.h b/Gems/ImGui/Code/Include/LYImGuiUtils/HistogramContainer.h
index be2a68e7da..694cd9bbb6 100644
--- a/Gems/ImGui/Code/Include/LYImGuiUtils/HistogramContainer.h
+++ b/Gems/ImGui/Code/Include/LYImGuiUtils/HistogramContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Include/LYImGuiUtils/ImGuiDrawHelpers.h b/Gems/ImGui/Code/Include/LYImGuiUtils/ImGuiDrawHelpers.h
index 2e8a96598b..28ea884093 100644
--- a/Gems/ImGui/Code/Include/LYImGuiUtils/ImGuiDrawHelpers.h
+++ b/Gems/ImGui/Code/Include/LYImGuiUtils/ImGuiDrawHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Include/OtherActiveImGuiBus.h b/Gems/ImGui/Code/Include/OtherActiveImGuiBus.h
index a926f049a3..c972f4475d 100644
--- a/Gems/ImGui/Code/Include/OtherActiveImGuiBus.h
+++ b/Gems/ImGui/Code/Include/OtherActiveImGuiBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/ImGuiColorDefines.h b/Gems/ImGui/Code/Source/ImGuiColorDefines.h
index 27db142702..6faa5ad40d 100644
--- a/Gems/ImGui/Code/Source/ImGuiColorDefines.h
+++ b/Gems/ImGui/Code/Source/ImGuiColorDefines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/ImGuiGem.cpp b/Gems/ImGui/Code/Source/ImGuiGem.cpp
index d1ce492b85..6f0107cb1f 100644
--- a/Gems/ImGui/Code/Source/ImGuiGem.cpp
+++ b/Gems/ImGui/Code/Source/ImGuiGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/ImGuiGem.h b/Gems/ImGui/Code/Source/ImGuiGem.h
index e7ec732456..50d485c55f 100644
--- a/Gems/ImGui/Code/Source/ImGuiGem.h
+++ b/Gems/ImGui/Code/Source/ImGuiGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/ImGuiManager.cpp b/Gems/ImGui/Code/Source/ImGuiManager.cpp
index d8ff143d4d..7e936bb1f9 100644
--- a/Gems/ImGui/Code/Source/ImGuiManager.cpp
+++ b/Gems/ImGui/Code/Source/ImGuiManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/ImGuiManager.h b/Gems/ImGui/Code/Source/ImGuiManager.h
index f11bec7ec9..acd8d7cea4 100644
--- a/Gems/ImGui/Code/Source/ImGuiManager.h
+++ b/Gems/ImGui/Code/Source/ImGuiManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp b/Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp
index 7a929d78ae..43a8800c83 100644
--- a/Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp
+++ b/Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/ImGui_precompiled.h b/Gems/ImGui/Code/Source/ImGui_precompiled.h
index d08ba572f5..d47df93cfc 100644
--- a/Gems/ImGui/Code/Source/ImGui_precompiled.h
+++ b/Gems/ImGui/Code/Source/ImGui_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
index 6b2a91ae21..2f996f5768 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.h b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.h
index 2d1afa4fd8..784659b720 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.h
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp
index eea2b229fa..c83d9520a4 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.h b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.h
index 4e317bdb13..22d00704be 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.h
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
index 749bbf3af3..9994851faa 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.h b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.h
index eeaa92bf8b..ad56fb7f4f 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.h
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp
index db08b6fbcc..a9d2052f1a 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.h b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.h
index 5a954cc27d..e23dc06a87 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.h
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp
index 1aec49a01f..aca52af238 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.h b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.h
index dd12ee8271..0e7924637f 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.h
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp b/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp
index 4602a36242..9295492f50 100644
--- a/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp
+++ b/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp b/Gems/ImGui/Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp
index 07ca8056d5..3ab1de7ca7 100644
--- a/Gems/ImGui/Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp
+++ b/Gems/ImGui/Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/Code/Source/Platform/Android/imgui_android.cmake b/Gems/ImGui/Code/Source/Platform/Android/imgui_android.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/Android/imgui_android.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Android/imgui_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Android/platform_android.cmake b/Gems/ImGui/Code/Source/Platform/Android/platform_android.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/Android/platform_android.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/ImGui/Code/Source/Platform/Android/platform_android_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/ImGui/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Linux/imgui_linux.cmake b/Gems/ImGui/Code/Source/Platform/Linux/imgui_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/Linux/imgui_linux.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Linux/imgui_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/ImGui/Code/Source/Platform/Linux/platform_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/ImGui/Code/Source/Platform/Linux/platform_linux_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/ImGui/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Mac/imgui_mac.cmake b/Gems/ImGui/Code/Source/Platform/Mac/imgui_mac.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/Mac/imgui_mac.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Mac/imgui_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/ImGui/Code/Source/Platform/Mac/platform_mac.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/ImGui/Code/Source/Platform/Mac/platform_mac_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/ImGui/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Windows/imgui_windows.cmake b/Gems/ImGui/Code/Source/Platform/Windows/imgui_windows.cmake
index 1d626c343c..342b873051 100644
--- a/Gems/ImGui/Code/Source/Platform/Windows/imgui_windows.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Windows/imgui_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/ImGui/Code/Source/Platform/Windows/platform_windows.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/ImGui/Code/Source/Platform/Windows/platform_windows_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/ImGui/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/ImGui/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/iOS/imgui_ios.cmake b/Gems/ImGui/Code/Source/Platform/iOS/imgui_ios.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/iOS/imgui_ios.cmake
+++ b/Gems/ImGui/Code/Source/Platform/iOS/imgui_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/iOS/platform_ios.cmake b/Gems/ImGui/Code/Source/Platform/iOS/platform_ios.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/ImGui/Code/Source/Platform/iOS/platform_ios.cmake
+++ b/Gems/ImGui/Code/Source/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/ImGui/Code/Source/Platform/iOS/platform_ios_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/ImGui/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/ImGui/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/imgui_common_files.cmake b/Gems/ImGui/Code/imgui_common_files.cmake
index f40f4a0613..23f1374b98 100644
--- a/Gems/ImGui/Code/imgui_common_files.cmake
+++ b/Gems/ImGui/Code/imgui_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/imgui_editor_files.cmake b/Gems/ImGui/Code/imgui_editor_files.cmake
index 61ea0a288d..3f57c43325 100644
--- a/Gems/ImGui/Code/imgui_editor_files.cmake
+++ b/Gems/ImGui/Code/imgui_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/imgui_game_files.cmake b/Gems/ImGui/Code/imgui_game_files.cmake
index f77bf55568..d6deb85f7c 100644
--- a/Gems/ImGui/Code/imgui_game_files.cmake
+++ b/Gems/ImGui/Code/imgui_game_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/imgui_game_no-op_files.cmake b/Gems/ImGui/Code/imgui_game_no-op_files.cmake
index 4eab48a5af..571c0ffb0d 100644
--- a/Gems/ImGui/Code/imgui_game_no-op_files.cmake
+++ b/Gems/ImGui/Code/imgui_game_no-op_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/imgui_lib_files.cmake b/Gems/ImGui/Code/imgui_lib_files.cmake
index 8ad6b05a99..8234c9ed54 100644
--- a/Gems/ImGui/Code/imgui_lib_files.cmake
+++ b/Gems/ImGui/Code/imgui_lib_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/imgui_lyutils_static_files.cmake b/Gems/ImGui/Code/imgui_lyutils_static_files.cmake
index 2c258b7534..6915882f4c 100644
--- a/Gems/ImGui/Code/imgui_lyutils_static_files.cmake
+++ b/Gems/ImGui/Code/imgui_lyutils_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/Code/imgui_shared_files.cmake b/Gems/ImGui/Code/imgui_shared_files.cmake
index 6b04b9fa24..75a7c8dd0d 100644
--- a/Gems/ImGui/Code/imgui_shared_files.cmake
+++ b/Gems/ImGui/Code/imgui_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ImGui/External/ImGui/v1.82/imgui/imgui_user.h b/Gems/ImGui/External/ImGui/v1.82/imgui/imgui_user.h
index 2a423b9b38..4c80b26820 100644
--- a/Gems/ImGui/External/ImGui/v1.82/imgui/imgui_user.h
+++ b/Gems/ImGui/External/ImGui/v1.82/imgui/imgui_user.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ImGui/External/ImGui/v1.82/imgui/imgui_user.inl b/Gems/ImGui/External/ImGui/v1.82/imgui/imgui_user.inl
index be7dab0de6..3d849bc89c 100644
--- a/Gems/ImGui/External/ImGui/v1.82/imgui/imgui_user.inl
+++ b/Gems/ImGui/External/ImGui/v1.82/imgui/imgui_user.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/CMakeLists.txt b/Gems/InAppPurchases/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/InAppPurchases/CMakeLists.txt
+++ b/Gems/InAppPurchases/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/CMakeLists.txt b/Gems/InAppPurchases/Code/CMakeLists.txt
index 32af024ba0..7d24108328 100644
--- a/Gems/InAppPurchases/Code/CMakeLists.txt
+++ b/Gems/InAppPurchases/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesBus.h b/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesBus.h
index 01648a7acb..36fd196db7 100644
--- a/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesBus.h
+++ b/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesInterface.h b/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesInterface.h
index 7ad95ba50d..34439304e8 100644
--- a/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesInterface.h
+++ b/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesResponseBus.h b/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesResponseBus.h
index 3ad9fc1e35..e0072f94d7 100644
--- a/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesResponseBus.h
+++ b/Gems/InAppPurchases/Code/Include/InAppPurchases/InAppPurchasesResponseBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/InAppPurchasesInterface.cpp b/Gems/InAppPurchases/Code/Source/InAppPurchasesInterface.cpp
index 62848069ad..72220fc9e3 100644
--- a/Gems/InAppPurchases/Code/Source/InAppPurchasesInterface.cpp
+++ b/Gems/InAppPurchases/Code/Source/InAppPurchasesInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.cpp b/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.cpp
index f944e4dcb7..0feb9a38cf 100644
--- a/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.cpp
+++ b/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.h b/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.h
index a67f7166c5..88fed33107 100644
--- a/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.h
+++ b/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp b/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp
index 04c4da365d..e2704d7529 100644
--- a/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp
+++ b/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.h b/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.h
index bd655c857e..af3a2012c3 100644
--- a/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.h
+++ b/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h b/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
index 835c80deaa..f620f712e2 100644
--- a/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
+++ b/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Android/InAppPurchasesAndroid.cpp b/Gems/InAppPurchases/Code/Source/Platform/Android/InAppPurchasesAndroid.cpp
index b95be266a7..6b26dd7534 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Android/InAppPurchasesAndroid.cpp
+++ b/Gems/InAppPurchases/Code/Source/Platform/Android/InAppPurchasesAndroid.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Android/InAppPurchasesAndroid.h b/Gems/InAppPurchases/Code/Source/Platform/Android/InAppPurchasesAndroid.h
index 8b3f5d7451..261e796c1f 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Android/InAppPurchasesAndroid.h
+++ b/Gems/InAppPurchases/Code/Source/Platform/Android/InAppPurchasesAndroid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Android/java/com/amazon/lumberyard/iap/LumberyardInAppBilling.java b/Gems/InAppPurchases/Code/Source/Platform/Android/java/com/amazon/lumberyard/iap/LumberyardInAppBilling.java
index 54118849a8..f0678d65e9 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Android/java/com/amazon/lumberyard/iap/LumberyardInAppBilling.java
+++ b/Gems/InAppPurchases/Code/Source/Platform/Android/java/com/amazon/lumberyard/iap/LumberyardInAppBilling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Android/platform_android.cmake b/Gems/InAppPurchases/Code/Source/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Android/platform_android.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/InAppPurchases/Code/Source/Platform/Android/platform_android_files.cmake
index 6c294d13be..2113b23dbc 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesApple.h b/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesApple.h
index 7a5bfbd3d9..3bc1962915 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesApple.h
+++ b/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesApple.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesApple.mm b/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesApple.mm
index f9d5bcc441..01807c9816 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesApple.mm
+++ b/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesApple.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesDelegate.h b/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesDelegate.h
index f5d63edbd9..a8f99805e4 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesDelegate.h
+++ b/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesDelegate.mm b/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesDelegate.mm
index d276a00f10..9914f91206 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesDelegate.mm
+++ b/Gems/InAppPurchases/Code/Source/Platform/Common/Apple/InAppPurchasesDelegate.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Common/Unimplemented/InAppPurchases_Unimplemented.cpp b/Gems/InAppPurchases/Code/Source/Platform/Common/Unimplemented/InAppPurchases_Unimplemented.cpp
index 480bd05e05..b9665c08a8 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Common/Unimplemented/InAppPurchases_Unimplemented.cpp
+++ b/Gems/InAppPurchases/Code/Source/Platform/Common/Unimplemented/InAppPurchases_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/InAppPurchases/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/InAppPurchases/Code/Source/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/InAppPurchases/Code/Source/Platform/Linux/platform_linux_files.cmake
index 096ac8b862..c0011945f4 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/InAppPurchases/Code/Source/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/InAppPurchases/Code/Source/Platform/Mac/platform_mac_files.cmake
index 096ac8b862..c0011945f4 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/InAppPurchases/Code/Source/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/InAppPurchases/Code/Source/Platform/Windows/platform_windows_files.cmake
index 096ac8b862..c0011945f4 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/iOS/platform_ios.cmake b/Gems/InAppPurchases/Code/Source/Platform/iOS/platform_ios.cmake
index 5dd6b05990..c146e72a74 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/iOS/platform_ios.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/InAppPurchases/Code/Source/Platform/iOS/platform_ios_files.cmake
index aa81a4bb89..ad1e1f3670 100644
--- a/Gems/InAppPurchases/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/InAppPurchases/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/inapppurchases_files.cmake b/Gems/InAppPurchases/Code/inapppurchases_files.cmake
index 303e0be34f..4242317634 100644
--- a/Gems/InAppPurchases/Code/inapppurchases_files.cmake
+++ b/Gems/InAppPurchases/Code/inapppurchases_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/InAppPurchases/Code/inapppurchases_shared_files.cmake b/Gems/InAppPurchases/Code/inapppurchases_shared_files.cmake
index 2296878017..36f3b8ef8d 100644
--- a/Gems/InAppPurchases/Code/inapppurchases_shared_files.cmake
+++ b/Gems/InAppPurchases/Code/inapppurchases_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LandscapeCanvas/CMakeLists.txt b/Gems/LandscapeCanvas/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/LandscapeCanvas/CMakeLists.txt
+++ b/Gems/LandscapeCanvas/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LandscapeCanvas/Code/CMakeLists.txt b/Gems/LandscapeCanvas/Code/CMakeLists.txt
index 5113d9a506..f7a915c18d 100644
--- a/Gems/LandscapeCanvas/Code/CMakeLists.txt
+++ b/Gems/LandscapeCanvas/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LandscapeCanvas/Code/Include/LandscapeCanvas/LandscapeCanvasBus.h b/Gems/LandscapeCanvas/Code/Include/LandscapeCanvas/LandscapeCanvasBus.h
index e315cda8c7..dc628ae971 100644
--- a/Gems/LandscapeCanvas/Code/Include/LandscapeCanvas/LandscapeCanvasBus.h
+++ b/Gems/LandscapeCanvas/Code/Include/LandscapeCanvas/LandscapeCanvasBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Core/Core.h b/Gems/LandscapeCanvas/Code/Source/Editor/Core/Core.h
index 28c042896b..63c1ab023a 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Core/Core.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Core/Core.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Core/DataTypes.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Core/DataTypes.cpp
index 453888c151..12ac0c8b81 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Core/DataTypes.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Core/DataTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Core/DataTypes.h b/Gems/LandscapeCanvas/Code/Source/Editor/Core/DataTypes.h
index c5ba09d968..2076a8f232 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Core/DataTypes.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Core/DataTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Core/GraphContext.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Core/GraphContext.cpp
index b4a02995f8..3364313118 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Core/GraphContext.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Core/GraphContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Core/GraphContext.h b/Gems/LandscapeCanvas/Code/Source/Editor/Core/GraphContext.h
index bd1dd6a230..4be41b7a6a 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Core/GraphContext.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Core/GraphContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp
index f97d4e913e..60fe433354 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.h b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.h
index f9a745e21f..b7fd885786 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Menus/LayerExtenderContextMenu.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/LayerExtenderContextMenu.cpp
index a1369ed7a1..36cf465b2c 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Menus/LayerExtenderContextMenu.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/LayerExtenderContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Menus/LayerExtenderContextMenu.h b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/LayerExtenderContextMenu.h
index f94a4d2b3b..91154cb071 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Menus/LayerExtenderContextMenu.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/LayerExtenderContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Menus/NodeContextMenu.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/NodeContextMenu.cpp
index 4cc3c16ff7..8712138547 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Menus/NodeContextMenu.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/NodeContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Menus/NodeContextMenu.h b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/NodeContextMenu.h
index 4c583cf364..9edf5fd182 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Menus/NodeContextMenu.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/NodeContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Menus/SceneContextMenuActions.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/SceneContextMenuActions.cpp
index 5ab4b0526c..ef75c39642 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Menus/SceneContextMenuActions.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/SceneContextMenuActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Menus/SceneContextMenuActions.h b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/SceneContextMenuActions.h
index 12ce9a1e4d..96d0b1c855 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Menus/SceneContextMenuActions.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Menus/SceneContextMenuActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/AltitudeFilterNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/AltitudeFilterNode.cpp
index 0ff12b3d34..f2a9ca565f 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/AltitudeFilterNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/AltitudeFilterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/AltitudeFilterNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/AltitudeFilterNode.h
index 4697cda9ce..c9c308d4d7 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/AltitudeFilterNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/AltitudeFilterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/BaseAreaFilterNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/BaseAreaFilterNode.cpp
index 1d803b06e0..5c3818e2cf 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/BaseAreaFilterNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/BaseAreaFilterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/BaseAreaFilterNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/BaseAreaFilterNode.h
index 84f00e3441..c452a8f418 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/BaseAreaFilterNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/BaseAreaFilterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistanceBetweenFilterNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistanceBetweenFilterNode.cpp
index 309d926417..02724a985b 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistanceBetweenFilterNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistanceBetweenFilterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistanceBetweenFilterNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistanceBetweenFilterNode.h
index 9dc7ce1936..db697d5d3c 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistanceBetweenFilterNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistanceBetweenFilterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistributionFilterNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistributionFilterNode.cpp
index 3d9eb5fcd8..ad8be35c30 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistributionFilterNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistributionFilterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistributionFilterNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistributionFilterNode.h
index 64847c2bae..ce38656cae 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistributionFilterNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/DistributionFilterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/ShapeIntersectionFilterNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/ShapeIntersectionFilterNode.cpp
index 4a5db301c2..43d24acd69 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/ShapeIntersectionFilterNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/ShapeIntersectionFilterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/ShapeIntersectionFilterNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/ShapeIntersectionFilterNode.h
index a5e3607759..32355e662d 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/ShapeIntersectionFilterNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/ShapeIntersectionFilterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SlopeFilterNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SlopeFilterNode.cpp
index 8bdf93743f..129044f10e 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SlopeFilterNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SlopeFilterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SlopeFilterNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SlopeFilterNode.h
index 9a4862b030..f9bbfd7ae2 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SlopeFilterNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SlopeFilterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskDepthFilterNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskDepthFilterNode.cpp
index 432e6b35ea..218b3bdffc 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskDepthFilterNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskDepthFilterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskDepthFilterNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskDepthFilterNode.h
index 06da925bb4..f1ea42d8d7 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskDepthFilterNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskDepthFilterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskFilterNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskFilterNode.cpp
index 334f8a43be..9e65d32b22 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskFilterNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskFilterNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskFilterNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskFilterNode.h
index 96e272b1e0..62269acca3 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskFilterNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaFilters/SurfaceMaskFilterNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/BaseAreaModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/BaseAreaModifierNode.cpp
index 77cef34b64..e13da6398c 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/BaseAreaModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/BaseAreaModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/BaseAreaModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/BaseAreaModifierNode.h
index 7813e8d241..4949445fcb 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/BaseAreaModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/BaseAreaModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/PositionModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/PositionModifierNode.cpp
index 49e3e9ea5c..27586a777a 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/PositionModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/PositionModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/PositionModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/PositionModifierNode.h
index 18925ed02f..d498dba1c3 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/PositionModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/PositionModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/RotationModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/RotationModifierNode.cpp
index 6a0bc41ec3..bb7e116d40 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/RotationModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/RotationModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/RotationModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/RotationModifierNode.h
index 594e0d7190..7467d2b64e 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/RotationModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/RotationModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/ScaleModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/ScaleModifierNode.cpp
index 10b72c09c0..f770c968dd 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/ScaleModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/ScaleModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/ScaleModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/ScaleModifierNode.h
index 50e48bfa23..c7e91eae97 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/ScaleModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/ScaleModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/SlopeAlignmentModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/SlopeAlignmentModifierNode.cpp
index c163b660eb..bc43e293f5 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/SlopeAlignmentModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/SlopeAlignmentModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/SlopeAlignmentModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/SlopeAlignmentModifierNode.h
index fd9066b928..67f66ba03a 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/SlopeAlignmentModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaModifiers/SlopeAlignmentModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaSelectors/AssetWeightSelectorNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaSelectors/AssetWeightSelectorNode.cpp
index 35f9c67f9a..1ccc4f51e4 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaSelectors/AssetWeightSelectorNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaSelectors/AssetWeightSelectorNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaSelectors/AssetWeightSelectorNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaSelectors/AssetWeightSelectorNode.h
index d7eaa5d186..59f3a1d596 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaSelectors/AssetWeightSelectorNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/AreaSelectors/AssetWeightSelectorNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/AreaBlenderNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/AreaBlenderNode.cpp
index 038e076381..bb7fefde5c 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/AreaBlenderNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/AreaBlenderNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/AreaBlenderNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/AreaBlenderNode.h
index 0de70ca95f..9146d1b496 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/AreaBlenderNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/AreaBlenderNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.cpp
index f59310ce7a..370ae9e50d 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.h
index a6e58765b0..133235b207 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BlockerAreaNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BlockerAreaNode.cpp
index ae6c0acb93..deafc047f9 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BlockerAreaNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BlockerAreaNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BlockerAreaNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BlockerAreaNode.h
index 883849e3fb..d73c31019d 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BlockerAreaNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BlockerAreaNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/MeshBlockerAreaNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/MeshBlockerAreaNode.cpp
index 182a7acbc4..9774fc59e8 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/MeshBlockerAreaNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/MeshBlockerAreaNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/MeshBlockerAreaNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/MeshBlockerAreaNode.h
index 3adac7e376..60b5335621 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/MeshBlockerAreaNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/MeshBlockerAreaNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/SpawnerAreaNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/SpawnerAreaNode.cpp
index 775a0a042b..6e20ca5f2e 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/SpawnerAreaNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/SpawnerAreaNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/SpawnerAreaNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/SpawnerAreaNode.h
index c2a3f4cc62..5386cc2215 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/SpawnerAreaNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/SpawnerAreaNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/BaseNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/BaseNode.cpp
index 119b1dec2b..35f6dacb07 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/BaseNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/BaseNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/BaseNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/BaseNode.h
index 232728e492..43ea81f980 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/BaseNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/BaseNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/BaseGradientModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/BaseGradientModifierNode.cpp
index 041f56889d..bafff8aeae 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/BaseGradientModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/BaseGradientModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/BaseGradientModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/BaseGradientModifierNode.h
index c8399c1efb..0637bdeaa1 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/BaseGradientModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/BaseGradientModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/DitherGradientModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/DitherGradientModifierNode.cpp
index 5cf569294e..227bb9142c 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/DitherGradientModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/DitherGradientModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/DitherGradientModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/DitherGradientModifierNode.h
index 1870362cd0..1afc024439 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/DitherGradientModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/DitherGradientModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/GradientMixerNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/GradientMixerNode.cpp
index 09456982da..f50220eab2 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/GradientMixerNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/GradientMixerNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/GradientMixerNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/GradientMixerNode.h
index 6b4f74c376..776a6247f7 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/GradientMixerNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/GradientMixerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/InvertGradientModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/InvertGradientModifierNode.cpp
index 67e821b7ce..70e321e5a8 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/InvertGradientModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/InvertGradientModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/InvertGradientModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/InvertGradientModifierNode.h
index dd825c17eb..140b1c2a7d 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/InvertGradientModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/InvertGradientModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/LevelsGradientModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/LevelsGradientModifierNode.cpp
index 6211ca44c9..01b42007fb 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/LevelsGradientModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/LevelsGradientModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/LevelsGradientModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/LevelsGradientModifierNode.h
index 10b69946df..80b5907d3c 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/LevelsGradientModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/LevelsGradientModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/PosterizeGradientModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/PosterizeGradientModifierNode.cpp
index 53a5c4d8a3..cd2e352d94 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/PosterizeGradientModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/PosterizeGradientModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/PosterizeGradientModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/PosterizeGradientModifierNode.h
index 62ff1f91b6..9d11b4fcaf 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/PosterizeGradientModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/PosterizeGradientModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/SmoothStepGradientModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/SmoothStepGradientModifierNode.cpp
index 226244e688..0c24655bde 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/SmoothStepGradientModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/SmoothStepGradientModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/SmoothStepGradientModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/SmoothStepGradientModifierNode.h
index 65fba31fe2..ce457cfbf9 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/SmoothStepGradientModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/SmoothStepGradientModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/ThresholdGradientModifierNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/ThresholdGradientModifierNode.cpp
index 930adfe087..45332120ea 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/ThresholdGradientModifierNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/ThresholdGradientModifierNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/ThresholdGradientModifierNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/ThresholdGradientModifierNode.h
index 0a536dc27f..7e2f956d8b 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/ThresholdGradientModifierNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/GradientModifiers/ThresholdGradientModifierNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/AltitudeGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/AltitudeGradientNode.cpp
index 84186f6d52..dbfe6b7e65 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/AltitudeGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/AltitudeGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/AltitudeGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/AltitudeGradientNode.h
index 956cc71d0c..091df2675d 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/AltitudeGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/AltitudeGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/BaseGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/BaseGradientNode.cpp
index 2a2ff2ad55..f6a4518cf0 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/BaseGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/BaseGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/BaseGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/BaseGradientNode.h
index 055dcc75c5..54d72b6b2a 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/BaseGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/BaseGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ConstantGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ConstantGradientNode.cpp
index 6922b284c8..234a6a52f9 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ConstantGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ConstantGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ConstantGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ConstantGradientNode.h
index b39f5e570f..4fe0db18c6 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ConstantGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ConstantGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/FastNoiseGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/FastNoiseGradientNode.cpp
index f5761036e3..355161faa7 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/FastNoiseGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/FastNoiseGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/FastNoiseGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/FastNoiseGradientNode.h
index cb885e0dbb..ff480b0b9c 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/FastNoiseGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/FastNoiseGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ImageGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ImageGradientNode.cpp
index 172c5da7cb..5aedb634e6 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ImageGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ImageGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ImageGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ImageGradientNode.h
index 2e721a18e1..821d316a15 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ImageGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ImageGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/PerlinNoiseGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/PerlinNoiseGradientNode.cpp
index 2aa7d9f0c2..9997b65da5 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/PerlinNoiseGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/PerlinNoiseGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/PerlinNoiseGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/PerlinNoiseGradientNode.h
index 3e435f0670..ce83b6d9d3 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/PerlinNoiseGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/PerlinNoiseGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/RandomNoiseGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/RandomNoiseGradientNode.cpp
index a2ec16d379..33734763ae 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/RandomNoiseGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/RandomNoiseGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/RandomNoiseGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/RandomNoiseGradientNode.h
index e46ed545e2..3d487fb93b 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/RandomNoiseGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/RandomNoiseGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ShapeAreaFalloffGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ShapeAreaFalloffGradientNode.cpp
index 74efc55689..4a0bcab1fb 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ShapeAreaFalloffGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ShapeAreaFalloffGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ShapeAreaFalloffGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ShapeAreaFalloffGradientNode.h
index 14e7b8254d..23c427a48e 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ShapeAreaFalloffGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/ShapeAreaFalloffGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SlopeGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SlopeGradientNode.cpp
index 05e8750de1..2b0d975e82 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SlopeGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SlopeGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SlopeGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SlopeGradientNode.h
index 3d8a1fd045..56bddce2b2 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SlopeGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SlopeGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SurfaceMaskGradientNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SurfaceMaskGradientNode.cpp
index 7644e80314..997f2736b3 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SurfaceMaskGradientNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SurfaceMaskGradientNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SurfaceMaskGradientNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SurfaceMaskGradientNode.h
index c28f13ccde..49c3a9484b 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SurfaceMaskGradientNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Gradients/SurfaceMaskGradientNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BaseShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BaseShapeNode.cpp
index b112433def..c9e8917e15 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BaseShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BaseShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BaseShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BaseShapeNode.h
index 6502539461..507a6813de 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BaseShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BaseShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BoxShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BoxShapeNode.cpp
index c0ed0f8ea3..942922c825 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BoxShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BoxShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BoxShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BoxShapeNode.h
index 019e032a20..162eeb2b62 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BoxShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/BoxShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CapsuleShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CapsuleShapeNode.cpp
index 22e67c86e2..ca9aed17a4 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CapsuleShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CapsuleShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CapsuleShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CapsuleShapeNode.h
index 7de9722c26..8297fbbd25 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CapsuleShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CapsuleShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CompoundShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CompoundShapeNode.cpp
index bd9fde04aa..43be0ea753 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CompoundShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CompoundShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CompoundShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CompoundShapeNode.h
index 8b6013f259..889f70fa72 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CompoundShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CompoundShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CylinderShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CylinderShapeNode.cpp
index c78a6d3766..9062091b5e 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CylinderShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CylinderShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CylinderShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CylinderShapeNode.h
index 9155d3c9f9..692c227304 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CylinderShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/CylinderShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/DiskShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/DiskShapeNode.cpp
index c88367d9a6..7cca2f95cd 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/DiskShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/DiskShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/DiskShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/DiskShapeNode.h
index 055d135e10..c031152479 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/DiskShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/DiskShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/PolygonPrismShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/PolygonPrismShapeNode.cpp
index f14b15dcf0..92420eaed5 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/PolygonPrismShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/PolygonPrismShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/PolygonPrismShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/PolygonPrismShapeNode.h
index 59d47d6399..fda49f9b52 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/PolygonPrismShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/PolygonPrismShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/SphereShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/SphereShapeNode.cpp
index e5e7b7e49d..45eb77690b 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/SphereShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/SphereShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/SphereShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/SphereShapeNode.h
index 35b9b1ede6..73a489cac5 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/SphereShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/SphereShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/TubeShapeNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/TubeShapeNode.cpp
index 59b9914397..a4f8f9ac05 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/TubeShapeNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/TubeShapeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/TubeShapeNode.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/TubeShapeNode.h
index 7b538babb4..0c6bd8ea37 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/TubeShapeNode.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Shapes/TubeShapeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/UI/GradientPreviewThumbnailItem.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/UI/GradientPreviewThumbnailItem.cpp
index 6b9761f5c9..e6d31e2400 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/UI/GradientPreviewThumbnailItem.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/UI/GradientPreviewThumbnailItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/UI/GradientPreviewThumbnailItem.h b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/UI/GradientPreviewThumbnailItem.h
index 3d00c3cb03..f6a1bb9e61 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/UI/GradientPreviewThumbnailItem.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/UI/GradientPreviewThumbnailItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.cpp b/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.cpp
index e21bce3fe0..62b5efd929 100644
--- a/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.h b/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.h
index 0f2215e69b..117578a497 100644
--- a/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.h
+++ b/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasEditorModule.cpp b/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasEditorModule.cpp
index 592911d2f3..57857e2377 100644
--- a/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasEditorModule.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasEditorModule.h b/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasEditorModule.h
index a88fc4147e..cad686c9c7 100644
--- a/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasEditorModule.h
+++ b/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasEditorModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasSystemComponent.cpp b/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasSystemComponent.cpp
index 91e8b57e49..c04fcf3756 100644
--- a/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasSystemComponent.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasSystemComponent.h b/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasSystemComponent.h
index 9b9aea126b..42a57b9735 100644
--- a/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasSystemComponent.h
+++ b/Gems/LandscapeCanvas/Code/Source/LandscapeCanvasSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Tests/LandscapeCanvasPythonBindingsTest.cpp b/Gems/LandscapeCanvas/Code/Tests/LandscapeCanvasPythonBindingsTest.cpp
index 0a813af923..f5034a97ee 100644
--- a/Gems/LandscapeCanvas/Code/Tests/LandscapeCanvasPythonBindingsTest.cpp
+++ b/Gems/LandscapeCanvas/Code/Tests/LandscapeCanvasPythonBindingsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/Tests/LandscapeCanvasTest.cpp b/Gems/LandscapeCanvas/Code/Tests/LandscapeCanvasTest.cpp
index b8fd6b4a8f..9e5da2daa6 100644
--- a/Gems/LandscapeCanvas/Code/Tests/LandscapeCanvasTest.cpp
+++ b/Gems/LandscapeCanvas/Code/Tests/LandscapeCanvasTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LandscapeCanvas/Code/landscapecanvas_editor_files.cmake b/Gems/LandscapeCanvas/Code/landscapecanvas_editor_files.cmake
index ddfb0a29d9..7987b16b7b 100644
--- a/Gems/LandscapeCanvas/Code/landscapecanvas_editor_files.cmake
+++ b/Gems/LandscapeCanvas/Code/landscapecanvas_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LandscapeCanvas/Code/landscapecanvas_editor_static_files.cmake b/Gems/LandscapeCanvas/Code/landscapecanvas_editor_static_files.cmake
index 3e33a60c24..1f3aefb232 100644
--- a/Gems/LandscapeCanvas/Code/landscapecanvas_editor_static_files.cmake
+++ b/Gems/LandscapeCanvas/Code/landscapecanvas_editor_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LandscapeCanvas/Code/landscapecanvas_tests_editor_files.cmake b/Gems/LandscapeCanvas/Code/landscapecanvas_tests_editor_files.cmake
index 3ca328fd8f..2ac46f265f 100644
--- a/Gems/LandscapeCanvas/Code/landscapecanvas_tests_editor_files.cmake
+++ b/Gems/LandscapeCanvas/Code/landscapecanvas_tests_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/CMakeLists.txt b/Gems/LmbrCentral/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/LmbrCentral/CMakeLists.txt
+++ b/Gems/LmbrCentral/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/CMakeLists.txt b/Gems/LmbrCentral/Code/CMakeLists.txt
index 38e80fb03b..9e3e907c02 100644
--- a/Gems/LmbrCentral/Code/CMakeLists.txt
+++ b/Gems/LmbrCentral/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Platform/Android/LmbrCentral_Traits_Android.h b/Gems/LmbrCentral/Code/Platform/Android/LmbrCentral_Traits_Android.h
index 6b984a8b29..91538a6452 100644
--- a/Gems/LmbrCentral/Code/Platform/Android/LmbrCentral_Traits_Android.h
+++ b/Gems/LmbrCentral/Code/Platform/Android/LmbrCentral_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/Android/LmbrCentral_Traits_Platform.h b/Gems/LmbrCentral/Code/Platform/Android/LmbrCentral_Traits_Platform.h
index 07b62c9da1..0010c4ac50 100644
--- a/Gems/LmbrCentral/Code/Platform/Android/LmbrCentral_Traits_Platform.h
+++ b/Gems/LmbrCentral/Code/Platform/Android/LmbrCentral_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/Android/platform_android_files.cmake b/Gems/LmbrCentral/Code/Platform/Android/platform_android_files.cmake
index a68f9344ae..3f50b969f9 100644
--- a/Gems/LmbrCentral/Code/Platform/Android/platform_android_files.cmake
+++ b/Gems/LmbrCentral/Code/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Platform/Linux/LmbrCentral_Traits_Linux.h b/Gems/LmbrCentral/Code/Platform/Linux/LmbrCentral_Traits_Linux.h
index e3de13acf6..d7b2670bcf 100644
--- a/Gems/LmbrCentral/Code/Platform/Linux/LmbrCentral_Traits_Linux.h
+++ b/Gems/LmbrCentral/Code/Platform/Linux/LmbrCentral_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/Linux/LmbrCentral_Traits_Platform.h b/Gems/LmbrCentral/Code/Platform/Linux/LmbrCentral_Traits_Platform.h
index 88ae044314..56579370d8 100644
--- a/Gems/LmbrCentral/Code/Platform/Linux/LmbrCentral_Traits_Platform.h
+++ b/Gems/LmbrCentral/Code/Platform/Linux/LmbrCentral_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/Linux/lrelease_linux.cmake b/Gems/LmbrCentral/Code/Platform/Linux/lrelease_linux.cmake
index 298836114c..24b0c562a2 100644
--- a/Gems/LmbrCentral/Code/Platform/Linux/lrelease_linux.cmake
+++ b/Gems/LmbrCentral/Code/Platform/Linux/lrelease_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Platform/Linux/platform_linux_files.cmake b/Gems/LmbrCentral/Code/Platform/Linux/platform_linux_files.cmake
index 17ce19d611..15e5a21e0c 100644
--- a/Gems/LmbrCentral/Code/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/LmbrCentral/Code/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Platform/Mac/LmbrCentral_Traits_Mac.h b/Gems/LmbrCentral/Code/Platform/Mac/LmbrCentral_Traits_Mac.h
index 1d65f60b75..8186055f78 100644
--- a/Gems/LmbrCentral/Code/Platform/Mac/LmbrCentral_Traits_Mac.h
+++ b/Gems/LmbrCentral/Code/Platform/Mac/LmbrCentral_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/Mac/LmbrCentral_Traits_Platform.h b/Gems/LmbrCentral/Code/Platform/Mac/LmbrCentral_Traits_Platform.h
index 35378684d9..c4ffad7688 100644
--- a/Gems/LmbrCentral/Code/Platform/Mac/LmbrCentral_Traits_Platform.h
+++ b/Gems/LmbrCentral/Code/Platform/Mac/LmbrCentral_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/Mac/lrelease_mac.cmake b/Gems/LmbrCentral/Code/Platform/Mac/lrelease_mac.cmake
index 07205d6469..af355b0a51 100644
--- a/Gems/LmbrCentral/Code/Platform/Mac/lrelease_mac.cmake
+++ b/Gems/LmbrCentral/Code/Platform/Mac/lrelease_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Platform/Mac/platform_mac_files.cmake b/Gems/LmbrCentral/Code/Platform/Mac/platform_mac_files.cmake
index 6a0fa4181d..07e8f9cef1 100644
--- a/Gems/LmbrCentral/Code/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/LmbrCentral/Code/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Platform/Windows/LmbrCentral_Traits_Platform.h b/Gems/LmbrCentral/Code/Platform/Windows/LmbrCentral_Traits_Platform.h
index 62c659d87f..734d2a570a 100644
--- a/Gems/LmbrCentral/Code/Platform/Windows/LmbrCentral_Traits_Platform.h
+++ b/Gems/LmbrCentral/Code/Platform/Windows/LmbrCentral_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/Windows/LmbrCentral_Traits_Windows.h b/Gems/LmbrCentral/Code/Platform/Windows/LmbrCentral_Traits_Windows.h
index e1eddf2e69..e6e94d271f 100644
--- a/Gems/LmbrCentral/Code/Platform/Windows/LmbrCentral_Traits_Windows.h
+++ b/Gems/LmbrCentral/Code/Platform/Windows/LmbrCentral_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/Windows/lrelease_windows.cmake b/Gems/LmbrCentral/Code/Platform/Windows/lrelease_windows.cmake
index a8b4bc4cf5..1cd1c93e29 100644
--- a/Gems/LmbrCentral/Code/Platform/Windows/lrelease_windows.cmake
+++ b/Gems/LmbrCentral/Code/Platform/Windows/lrelease_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Platform/Windows/platform_windows_files.cmake b/Gems/LmbrCentral/Code/Platform/Windows/platform_windows_files.cmake
index 477886e0d3..a9e31a94df 100644
--- a/Gems/LmbrCentral/Code/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/LmbrCentral/Code/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Platform/iOS/LmbrCentral_Traits_Platform.h b/Gems/LmbrCentral/Code/Platform/iOS/LmbrCentral_Traits_Platform.h
index e941df25cd..afe0992bce 100644
--- a/Gems/LmbrCentral/Code/Platform/iOS/LmbrCentral_Traits_Platform.h
+++ b/Gems/LmbrCentral/Code/Platform/iOS/LmbrCentral_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/iOS/LmbrCentral_Traits_iOS.h b/Gems/LmbrCentral/Code/Platform/iOS/LmbrCentral_Traits_iOS.h
index 6b984a8b29..91538a6452 100644
--- a/Gems/LmbrCentral/Code/Platform/iOS/LmbrCentral_Traits_iOS.h
+++ b/Gems/LmbrCentral/Code/Platform/iOS/LmbrCentral_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Platform/iOS/platform_ios_files.cmake b/Gems/LmbrCentral/Code/Platform/iOS/platform_ios_files.cmake
index 9127026fd5..0d33a7a46b 100644
--- a/Gems/LmbrCentral/Code/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/LmbrCentral/Code/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
index 97a9a2f6e0..1e0d759082 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.h b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.h
index e41ada34d8..3a0c0f49e1 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
index 3d8ff9b8f1..56d1f0b622 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.h b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.h
index 427b1f9c21..f861893bf7 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.cpp
index ab68a967f6..d5c83e668b 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.h b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.h
index 4df3f5a9cd..99f78ed2fd 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.h
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
index bd66cd9e94..26ddf17879 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.h b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.h
index b3e095dacc..9285552c39 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.cpp
index d8c452078f..4491ce7498 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.h b/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.h
index bbb601a5e5..368c69ea23 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Asset/AssetSystemDebugComponent.cpp b/Gems/LmbrCentral/Code/Source/Asset/AssetSystemDebugComponent.cpp
index c19322b36f..dcbaa713e5 100644
--- a/Gems/LmbrCentral/Code/Source/Asset/AssetSystemDebugComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Asset/AssetSystemDebugComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Asset/AssetSystemDebugComponent.h b/Gems/LmbrCentral/Code/Source/Asset/AssetSystemDebugComponent.h
index 783b48b46a..5db9f1af4e 100644
--- a/Gems/LmbrCentral/Code/Source/Asset/AssetSystemDebugComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Asset/AssetSystemDebugComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.cpp
index 24de638f2e..daa76292dc 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.h
index 7520a216e0..7ceff96e89 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.cpp
index a0aa6b3cc3..3623eda163 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.h
index 919a238b2f..d174cb00cc 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
index 54baf25426..f5c7dcce62 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.h
index 4b39536afb..e1765c77f6 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.cpp
index 2ee5ae076d..1fb7276100 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.h
index 96b09d0d8e..9a1c22635b 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.cpp
index b6de8d91b2..550233799c 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.h
index fcbd2f7789..f00af25306 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
index cfcff22e07..554be27fae 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.h
index 62e307d452..fa48e064e0 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.cpp
index ece6bc0ff2..b474b9811c 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.h
index 019b519f7d..c32e70a59f 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.cpp
index ac27b09539..2ea9f31927 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.h
index e7f67fe5ca..49a736921e 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.cpp
index 95162f00f3..9765e9dd0b 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.h
index 1f22af9ea0..295c86c3f7 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioTriggerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioTriggerComponent.cpp
index 6b16db7149..0e99cab31a 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioTriggerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioTriggerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/AudioTriggerComponent.h b/Gems/LmbrCentral/Code/Source/Audio/AudioTriggerComponent.h
index e2906f50df..f76cb3c6cc 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioTriggerComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioTriggerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
index 3b8c3c9dad..3dc522e02f 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.h b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.h
index 3083c4a66d..51a1c4eaa2 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.cpp
index 18e67b449b..ecc1950c2b 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.h b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.h
index 8d6538e777..9644aa1e60 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioEnvironmentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
index d6a5493b0b..4fe3874f24 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.h b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.h
index 778dac108c..fe98c96a30 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
index 3625da1d7b..895ff11273 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.h b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.h
index 5a0dd17b48..0cecbc2242 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
index b41f6f5754..4512c3c6c2 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.h b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.h
index ae2d336d91..2cbf5e0ec6 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
index 0e8454d8a2..8aa6ba6f83 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.h b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.h
index 1c7c0be38f..c8c7c6c4f1 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
index 12d0b5c2cb..ac9baaee5b 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.h b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.h
index 213135b324..3105a90a39 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
index d8f335b439..70575e5fcd 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.h b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.h
index 9c38ffd714..a9e2925d88 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.cpp
index 78325e9525..04f41bcd31 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.h
index 7f80535f0c..678894b9cb 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.cpp
index 50b350667c..c2d952f1af 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.h
index fa95d79393..4231f99825 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.cpp
index 99addff8a7..c192f39903 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.h
index 803a6bcbb7..fb1d7a0d87 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.cpp
index bde5d8fa0d..2b4faeb63b 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.h
index 858e2dbd58..d20875b63a 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderWorker.cpp
index 7df1fea98b..f3cbd38168 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderWorker.h
index e7e63a94c1..13df6440cb 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/CopyDependencyBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/EmfxWorkspaceBuilderWorker/EmfxWorkspaceBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/EmfxWorkspaceBuilderWorker/EmfxWorkspaceBuilderWorker.cpp
index de14725733..bf8c629859 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/EmfxWorkspaceBuilderWorker/EmfxWorkspaceBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/EmfxWorkspaceBuilderWorker/EmfxWorkspaceBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/EmfxWorkspaceBuilderWorker/EmfxWorkspaceBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/EmfxWorkspaceBuilderWorker/EmfxWorkspaceBuilderWorker.h
index 08f4a7a37c..35bbfee26e 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/EmfxWorkspaceBuilderWorker/EmfxWorkspaceBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/EmfxWorkspaceBuilderWorker/EmfxWorkspaceBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp
index 05a0eac50f..9ebc1b8d5a 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.h
index 948a2855bf..48c674fa66 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.cpp
index 3ca9ed8d53..69bc411d80 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.h
index 844bc635b9..76925ecb94 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaUtils.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaUtils.cpp
index d961534b46..9e36aad257 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaUtils.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaUtils.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaUtils.h
index d2eb29b214..b441abef99 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaUtils.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlBuilderWorker/XmlBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlBuilderWorker/XmlBuilderWorker.cpp
index 55906b67f3..b070784766 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlBuilderWorker/XmlBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlBuilderWorker/XmlBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlBuilderWorker/XmlBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlBuilderWorker/XmlBuilderWorker.h
index 916686e32a..a01d73f366 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlBuilderWorker/XmlBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlBuilderWorker/XmlBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlFormattedAssetBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlFormattedAssetBuilderWorker.cpp
index 6e6a0f8389..f0e359a0a5 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlFormattedAssetBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlFormattedAssetBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlFormattedAssetBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlFormattedAssetBuilderWorker.h
index e5ecb670d2..00e3380d29 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlFormattedAssetBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/XmlFormattedAssetBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderComponent.cpp
index 881c12be87..3ab5e78ba7 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderComponent.h
index 4baf4149a9..bd6eb68413 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.cpp
index b562ff0f1d..0ec0407d88 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.h
index e6a130d7b1..5b3343d0b4 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.cpp
index 5b90c29587..9c78fc59bf 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.h
index 5615e1c020..90f3433519 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp
index aacbb09c32..02731645d7 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.h
index 51cb35d375..e6ac992c37 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp
index 84ef3a11ca..8e2b3edaa0 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -34,7 +34,7 @@ namespace LevelBuilder
 
     AZ::u64 readXmlDataLength(AZ::IO::GenericStream* stream, int& charSize)
     {
-        // This code is replicated from readStringLength method found in .\dev\Code\Sandbox\Editor\Util\EditorUtils.h file
+        // This code is replicated from readStringLength method found in .\dev\Code\Editor\Util\EditorUtils.h file
         // such that we do not have any Cry or Qt related dependencies.
         // The basic algorithm is that it reads in an 8 bit int, and if the length is less than 2^8,
         // then that's the length. Next it reads in a 16 bit int, and if the length is less than 2^16,
diff --git a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.h
index adb3b2cc8a..cea82cdfa6 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderComponent.cpp
index 17f7e8f62a..1ba0860894 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderComponent.h
index 9efaba20e9..fdfe5c5029 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderWorker.cpp
index 4745c56b01..9291742a33 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderWorker.h
index 0249d52154..0b947913c2 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaHelpers.cpp b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaHelpers.cpp
index 6d84393a26..63c7f4c14e 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaHelpers.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaHelpers.h b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaHelpers.h
index daf664bfb6..65053b2e31 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaHelpers.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/LuaBuilder/LuaHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.cpp
index 71bc3f9244..660c38f869 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.h
index c27dbf79dd..f0b356c5ee 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderComponent.cpp
index 30c61ae586..f0e270744b 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderComponent.h
index 512f8c00a9..9c0990d377 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderWorker.cpp
index 6bf3ce85a6..762352e1ca 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderWorker.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderWorker.h b/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderWorker.h
index bb56272cc3..26c533aa66 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderWorker.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/SliceBuilder/SliceBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.cpp
index 4133b533fc..35a117a207 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.h
index 050f87d980..8584d02be0 100644
--- a/Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Bundling/BundlingSystemComponent.cpp b/Gems/LmbrCentral/Code/Source/Bundling/BundlingSystemComponent.cpp
index d70babec3d..37e14a8a92 100644
--- a/Gems/LmbrCentral/Code/Source/Bundling/BundlingSystemComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Bundling/BundlingSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Bundling/BundlingSystemComponent.h b/Gems/LmbrCentral/Code/Source/Bundling/BundlingSystemComponent.h
index 52a953f31d..9905f17682 100644
--- a/Gems/LmbrCentral/Code/Source/Bundling/BundlingSystemComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Bundling/BundlingSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.cpp b/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.cpp
index 2ee4bea421..b6fb5b2b16 100644
--- a/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.h b/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.h
index e9aefa0f02..ff7b4def93 100644
--- a/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Editor/EditorCommentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Events/ReflectScriptableEvents.cpp b/Gems/LmbrCentral/Code/Source/Events/ReflectScriptableEvents.cpp
index ebc1108a69..9083a5c652 100644
--- a/Gems/LmbrCentral/Code/Source/Events/ReflectScriptableEvents.cpp
+++ b/Gems/LmbrCentral/Code/Source/Events/ReflectScriptableEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Events/ReflectScriptableEvents.h b/Gems/LmbrCentral/Code/Source/Events/ReflectScriptableEvents.h
index 3cc1e9e7d5..75c878937e 100644
--- a/Gems/LmbrCentral/Code/Source/Events/ReflectScriptableEvents.h
+++ b/Gems/LmbrCentral/Code/Source/Events/ReflectScriptableEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Geometry/GeometrySystemComponent.cpp b/Gems/LmbrCentral/Code/Source/Geometry/GeometrySystemComponent.cpp
index d952d8f317..b6b4160736 100644
--- a/Gems/LmbrCentral/Code/Source/Geometry/GeometrySystemComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Geometry/GeometrySystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Geometry/GeometrySystemComponent.h b/Gems/LmbrCentral/Code/Source/Geometry/GeometrySystemComponent.h
index a3d339ca45..c7dd1e8e5f 100644
--- a/Gems/LmbrCentral/Code/Source/Geometry/GeometrySystemComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Geometry/GeometrySystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
index db57ae360d..0b3ec13186 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/LmbrCentral.h b/Gems/LmbrCentral/Code/Source/LmbrCentral.h
index a24c74fe70..33405dd0b3 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentral.h
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentral.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
index 2745166d50..a2c96cfd11 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.h b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.h
index 37a0543359..3b827a5f0b 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.h
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h b/Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
index 1a45961dc1..60a9984367 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Rendering/EntityDebugDisplayComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EntityDebugDisplayComponent.cpp
index c2979a24d8..455799abaf 100644
--- a/Gems/LmbrCentral/Code/Source/Rendering/EntityDebugDisplayComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Rendering/EntityDebugDisplayComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Rendering/EntityDebugDisplayComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EntityDebugDisplayComponent.h
index fc02426009..cbc5c85054 100644
--- a/Gems/LmbrCentral/Code/Source/Rendering/EntityDebugDisplayComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Rendering/EntityDebugDisplayComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
index 2aa4611b03..2500a0b30f 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.h
index e178f2f8e4..de3c69b574 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
index 8a69ad4a99..73c7e1979f 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.h
index f141e3865d..6c778d8692 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
index 398cd69527..59a4aeb9e7 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.h
index 8ce3547581..3dd787ac2f 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
index da7f46f8c1..225ff9704b 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.h
index e0352271a0..b6a142118b 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/LookAtComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/LookAtComponent.cpp
index 200416f769..f87a8726aa 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/LookAtComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/LookAtComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/LookAtComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/LookAtComponent.h
index 21f89a414c..1e798dbf42 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/LookAtComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/LookAtComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.cpp
index a6f60dfdcb..d53d1e02ae 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.h
index bbc9d5f046..988934facb 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
index b914c69816..0ffcf1ac26 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.h
index 1b6b72dc55..d3c23484ec 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/SpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/SpawnerComponent.cpp
index acaf6ad2fd..a0ca3d2dde 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/SpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/SpawnerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/SpawnerComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/SpawnerComponent.h
index 8f8def490e..c8f2d77885 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/SpawnerComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/SpawnerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp
index 478ac3bdb0..f44ef2d16e 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.h b/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.h
index 20342bf969..f100926f78 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/BoxShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/BoxShape.cpp
index 168edc0b27..b41ddf9a9c 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/BoxShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/BoxShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/BoxShape.h b/Gems/LmbrCentral/Code/Source/Shape/BoxShape.h
index 0797660b8b..80fb83a5b6 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/BoxShape.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/BoxShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/BoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/BoxShapeComponent.cpp
index c8236df531..02549c126b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/BoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/BoxShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/BoxShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/BoxShapeComponent.h
index f942de2ab7..055dd5293a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/BoxShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/BoxShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.cpp
index 1ff85c9e90..175cda4c1a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.h b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.h
index 35812e2480..5ce02d118e 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp
index f3b4195a2b..6c5fa141e6 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.h
index 58443bcb89..41f5ea5a24 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.cpp
index 0ecbc33074..febb3de7d9 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h
index 6d2a1215af..a2ccb28239 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.cpp
index ad43204402..f03d2a757a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.h b/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.h
index 497a9e8caa..d981c726d9 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp
index 8f0ae1a072..18901d2998 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.h
index 2cdf004f12..f7db21d671 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/DiskShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/DiskShape.cpp
index 5774a9c7b1..d10455987b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/DiskShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/DiskShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/DiskShape.h b/Gems/LmbrCentral/Code/Source/Shape/DiskShape.h
index 7551e40266..270efa8953 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/DiskShape.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/DiskShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp
index 930996459b..20df01da86 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.h
index 99e1b2fc6e..c45c6a9e3f 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorBaseShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorBaseShapeComponent.cpp
index a8bcf6d355..0eb6c30fd5 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBaseShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBaseShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorBaseShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorBaseShapeComponent.h
index 3ed086a03d..3eb358645e 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBaseShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBaseShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
index 91baf58f02..2c0cda363a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.h
index 2f935f3e3d..3ba6a4436a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
index 4a198c4da4..823d51d576 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h
index ec0e3532dd..8d480319d4 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
index 1548392d34..31c2239296 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h
index afc2641acb..a01e1fc33b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
index 0c4a13f3b0..4fc942c27e 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h
index b527b69564..b86e662df2 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
index f94299e120..6fb1dbdd79 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h
index 01607aebbe..d8fcf42d79 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
index b56f2ba4cf..8c81d67b3d 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.h
index 932330c94b..e2903d1aa8 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp
index 6debed8407..c0fe3509bf 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.h b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.h
index b47942993a..30c79dcec6 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
index 42db1b72fc..6602cd8827 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.h
index 618ca79e43..6dfc77a802 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorShapeComponentConverters.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorShapeComponentConverters.cpp
index 00212f5053..fe333a1898 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorShapeComponentConverters.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorShapeComponentConverters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorShapeComponentConverters.h b/Gems/LmbrCentral/Code/Source/Shape/EditorShapeComponentConverters.h
index 8fe0eb6863..d5f5dedf71 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorShapeComponentConverters.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorShapeComponentConverters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
index 07a0c0179a..e2ffbee516 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h
index 9c26ebb590..e3975b4a40 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
index 50a25ea2c4..be186acd66 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.h
index a04f564467..4ec5030583 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponentMode.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponentMode.cpp
index b5c671c0a4..1096415e10 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponentMode.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponentMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponentMode.h b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponentMode.h
index 94f170eaf4..41615b286f 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponentMode.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
index cf72c21d4d..f609c77c63 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h
index 535b2e3a8b..370cd249f1 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp
index 81fa34d64f..a45967a16c 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.h b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.h
index 387573f500..4d32c72f3a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.cpp
index d5b72c3462..9941772c13 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.h b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.h
index df3a55fb4c..66b353a13d 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShapeComponent.cpp
index 334fa3939d..22b0cbfb03 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShapeComponent.h
index faeb17bcc4..91e4893c64 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/PolygonPrismShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/QuadShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/QuadShape.cpp
index 2dae9f013c..8fbf24d896 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/QuadShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/QuadShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/QuadShape.h b/Gems/LmbrCentral/Code/Source/Shape/QuadShape.h
index f55ddbc665..ce55507d56 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/QuadShape.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/QuadShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/QuadShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/QuadShapeComponent.cpp
index 5d88bfb107..91797af793 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/QuadShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/QuadShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/QuadShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/QuadShapeComponent.h
index 7110b5af88..33f4350e3c 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/QuadShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/QuadShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/ShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/ShapeComponent.cpp
index 0bad007de1..c8fd0a4a7e 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/ShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/ShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.cpp b/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.cpp
index 47f92e7d46..3ed0fa6758 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.h b/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.h
index 45649046ac..53d1c44918 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.inl b/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.inl
index d7766096c6..fa3369f93a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.inl
+++ b/Gems/LmbrCentral/Code/Source/Shape/ShapeComponentConverters.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/ShapeDisplay.h b/Gems/LmbrCentral/Code/Source/Shape/ShapeDisplay.h
index 4d7293eced..8be1464533 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/ShapeDisplay.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/ShapeDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.cpp b/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.cpp
index c823fc0ea7..9a52fa49f0 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.h b/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.h
index 5f6f2407ea..f23326b833 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/SphereShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/SphereShape.cpp
index 120a49e30c..5c5c5d6d83 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SphereShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/SphereShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/SphereShape.h b/Gems/LmbrCentral/Code/Source/Shape/SphereShape.h
index fb4f4b25a6..6e27322a8e 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SphereShape.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/SphereShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp
index 81e2a280d8..0accd40bbb 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.h
index ade70a4888..45a02fff7d 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.cpp
index 4741433b68..deeea68aeb 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h b/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h
index b61954f892..a61a99b1d3 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp
index 7061af1368..13762ad1ed 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/TubeShape.h b/Gems/LmbrCentral/Code/Source/Shape/TubeShape.h
index 98f0dd23d5..82160fd913 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/TubeShape.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/TubeShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp
index 01028c3952..0c6f31f6fe 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.h
index b5f9af8417..0fbf6729d4 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Hidden/TextureMipmapAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Hidden/TextureMipmapAssetTypeInfo.cpp
index 551beb81e1..6093cc00a2 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Hidden/TextureMipmapAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Hidden/TextureMipmapAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Hidden/TextureMipmapAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Hidden/TextureMipmapAssetTypeInfo.h
index 4ec66b503b..e3ad4bfc4a 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Hidden/TextureMipmapAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Hidden/TextureMipmapAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
index 5b66794cb7..0da2706eba 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.h
index c9ca19d5c3..eca2312a10 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/AudioAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Other/AudioAssetTypeInfo.cpp
index 1f8cf31640..6e4d15fc07 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/AudioAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/AudioAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/AudioAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Other/AudioAssetTypeInfo.h
index 994861c472..e075c1e879 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/AudioAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/AudioAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.cpp
index e6efba3fa5..4632b903b0 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.h
index 3b03abdded..30094fd0b2 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/EntityPrototypeLibraryAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Other/EntityPrototypeLibraryAssetTypeInfo.cpp
index 68a88759f0..f47264f80b 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/EntityPrototypeLibraryAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/EntityPrototypeLibraryAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/EntityPrototypeLibraryAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Other/EntityPrototypeLibraryAssetTypeInfo.h
index 3eb2b0bd56..ba656f0c37 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/EntityPrototypeLibraryAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/EntityPrototypeLibraryAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/GameTokenAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Other/GameTokenAssetTypeInfo.cpp
index 97b78c4045..5acf90a887 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/GameTokenAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/GameTokenAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/GameTokenAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Other/GameTokenAssetTypeInfo.h
index cd59ae4c78..d66ca4d69b 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/GameTokenAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/GameTokenAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/GroupAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Other/GroupAssetTypeInfo.cpp
index f5d88f3802..78e0e3a9d0 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/GroupAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/GroupAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/GroupAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Other/GroupAssetTypeInfo.h
index ccf5117dd4..0747fcbff1 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/GroupAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/GroupAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/PrefabsLibraryAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Other/PrefabsLibraryAssetTypeInfo.cpp
index 636757093a..07647ccc91 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/PrefabsLibraryAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/PrefabsLibraryAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Other/PrefabsLibraryAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Other/PrefabsLibraryAssetTypeInfo.h
index 8a37811478..fe2c8d5cfd 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Other/PrefabsLibraryAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Other/PrefabsLibraryAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Texture/SubstanceAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/SubstanceAssetTypeInfo.cpp
index 723b7a442d..e0cfb42bce 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Texture/SubstanceAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/SubstanceAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Texture/SubstanceAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/SubstanceAssetTypeInfo.h
index 6f5998b7c3..bc4792f56f 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Texture/SubstanceAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/SubstanceAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.cpp
index 0e5ead9a42..a9f173893e 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.h
index 9a5d502035..2012268fac 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/Texture/TextureAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.cpp
index 8973325a16..b919023f12 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.h
index f2f3d53800..5c5cb5ce08 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/UI/EntityIconAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/UI/FontAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/UI/FontAssetTypeInfo.cpp
index fe4ed51f08..5d94a69361 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/UI/FontAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/UI/FontAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/UI/FontAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/UI/FontAssetTypeInfo.h
index 2090a3e073..2e2906ae3f 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/UI/FontAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/UI/FontAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.cpp
index 8b523495aa..ada492544d 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.cpp
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.h
index 2a1f344bbf..15c8b045c9 100644
--- a/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.h
+++ b/Gems/LmbrCentral/Code/Source/Unhandled/UI/UICanvasAssetTypeInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/AudioComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/AudioComponentTests.cpp
index 9b305dda87..bf6f4cc8de 100644
--- a/Gems/LmbrCentral/Code/Tests/AudioComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/AudioComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/BoxShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/BoxShapeTest.cpp
index 13d7b9a4f3..dcbd3b8b83 100644
--- a/Gems/LmbrCentral/Code/Tests/BoxShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/BoxShapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp b/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp
index e78d99d38c..5dfc143e6b 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp b/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
index a87c1b8b2c..1509525f6c 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/Builders/LuaBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/LuaBuilderTests.cpp
index 3166b55693..9505233d30 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/LuaBuilderTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/LuaBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/Builders/MaterialBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/MaterialBuilderTests.cpp
index 8e3d1f018e..ba89ca8c33 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/MaterialBuilderTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/MaterialBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/Builders/SeedBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/SeedBuilderTests.cpp
index 9de8c68ce7..d3663a30c5 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/SeedBuilderTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/SeedBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
index b642851948..befdb95a44 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/BundlingSystemComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/BundlingSystemComponentTests.cpp
index e80c4683a5..fe8aa0b7bc 100644
--- a/Gems/LmbrCentral/Code/Tests/BundlingSystemComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/BundlingSystemComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/CapsuleShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/CapsuleShapeTest.cpp
index 30a20282ec..8f76cf409f 100644
--- a/Gems/LmbrCentral/Code/Tests/CapsuleShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/CapsuleShapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/CylinderShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/CylinderShapeTest.cpp
index 6b273186d4..e2643bfca1 100644
--- a/Gems/LmbrCentral/Code/Tests/CylinderShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/CylinderShapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/DiskShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/DiskShapeTest.cpp
index 1858cef9b2..ee1394540e 100644
--- a/Gems/LmbrCentral/Code/Tests/DiskShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/DiskShapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/EditorBoxShapeComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorBoxShapeComponentTests.cpp
index fa6c4e910f..086b307873 100644
--- a/Gems/LmbrCentral/Code/Tests/EditorBoxShapeComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/EditorBoxShapeComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/EditorCapsuleShapeComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorCapsuleShapeComponentTests.cpp
index 544e53e6cb..a821c18c95 100644
--- a/Gems/LmbrCentral/Code/Tests/EditorCapsuleShapeComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/EditorCapsuleShapeComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/EditorCompoundShapeComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorCompoundShapeComponentTests.cpp
index 7a3e71f3e2..3f89cc2714 100644
--- a/Gems/LmbrCentral/Code/Tests/EditorCompoundShapeComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/EditorCompoundShapeComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/EditorCylinderShapeComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorCylinderShapeComponentTests.cpp
index 1855c9baca..2750c95a6a 100644
--- a/Gems/LmbrCentral/Code/Tests/EditorCylinderShapeComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/EditorCylinderShapeComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/EditorPolygonPrismShapeComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorPolygonPrismShapeComponentTests.cpp
index f8d97a3319..9cc25deb1b 100644
--- a/Gems/LmbrCentral/Code/Tests/EditorPolygonPrismShapeComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/EditorPolygonPrismShapeComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/EditorSphereShapeComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorSphereShapeComponentTests.cpp
index 0cb6d0e800..64e688c66f 100644
--- a/Gems/LmbrCentral/Code/Tests/EditorSphereShapeComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/EditorSphereShapeComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/LmbrCentralEditorTest.cpp b/Gems/LmbrCentral/Code/Tests/LmbrCentralEditorTest.cpp
index 33527b39b1..9697ef1ee5 100644
--- a/Gems/LmbrCentral/Code/Tests/LmbrCentralEditorTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/LmbrCentralEditorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/LmbrCentralReflectionTest.cpp b/Gems/LmbrCentral/Code/Tests/LmbrCentralReflectionTest.cpp
index fdc7f23421..d157526daa 100644
--- a/Gems/LmbrCentral/Code/Tests/LmbrCentralReflectionTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/LmbrCentralReflectionTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/LmbrCentralReflectionTest.h b/Gems/LmbrCentral/Code/Tests/LmbrCentralReflectionTest.h
index 2d05f680fe..b1da246944 100644
--- a/Gems/LmbrCentral/Code/Tests/LmbrCentralReflectionTest.h
+++ b/Gems/LmbrCentral/Code/Tests/LmbrCentralReflectionTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/LmbrCentralTest.cpp b/Gems/LmbrCentral/Code/Tests/LmbrCentralTest.cpp
index 78091743cc..aa1e2fea28 100644
--- a/Gems/LmbrCentral/Code/Tests/LmbrCentralTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/LmbrCentralTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/Lua/test1.lua b/Gems/LmbrCentral/Code/Tests/Lua/test1.lua
index e65dde960d..98d20b566e 100644
--- a/Gems/LmbrCentral/Code/Tests/Lua/test1.lua
+++ b/Gems/LmbrCentral/Code/Tests/Lua/test1.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LmbrCentral/Code/Tests/Lua/test2.lua b/Gems/LmbrCentral/Code/Tests/Lua/test2.lua
index 22fb2fce45..093938f95d 100644
--- a/Gems/LmbrCentral/Code/Tests/Lua/test2.lua
+++ b/Gems/LmbrCentral/Code/Tests/Lua/test2.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LmbrCentral/Code/Tests/Lua/test3_general_dependencies.lua b/Gems/LmbrCentral/Code/Tests/Lua/test3_general_dependencies.lua
index 869532f7dd..bcac7fadaa 100644
--- a/Gems/LmbrCentral/Code/Tests/Lua/test3_general_dependencies.lua
+++ b/Gems/LmbrCentral/Code/Tests/Lua/test3_general_dependencies.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LmbrCentral/Code/Tests/Lua/test4_console_command.lua b/Gems/LmbrCentral/Code/Tests/Lua/test4_console_command.lua
index f229c5ceee..f9ca0d40ba 100644
--- a/Gems/LmbrCentral/Code/Tests/Lua/test4_console_command.lua
+++ b/Gems/LmbrCentral/Code/Tests/Lua/test4_console_command.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LmbrCentral/Code/Tests/Lua/test5_whole_line_comment.lua b/Gems/LmbrCentral/Code/Tests/Lua/test5_whole_line_comment.lua
index 413b01f387..2b4d1c0481 100644
--- a/Gems/LmbrCentral/Code/Tests/Lua/test5_whole_line_comment.lua
+++ b/Gems/LmbrCentral/Code/Tests/Lua/test5_whole_line_comment.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LmbrCentral/Code/Tests/Lua/test6_partial_line_comment.lua b/Gems/LmbrCentral/Code/Tests/Lua/test6_partial_line_comment.lua
index 6d51698f6a..c0594ba18d 100644
--- a/Gems/LmbrCentral/Code/Tests/Lua/test6_partial_line_comment.lua
+++ b/Gems/LmbrCentral/Code/Tests/Lua/test6_partial_line_comment.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LmbrCentral/Code/Tests/Lua/test7_block_comment.lua b/Gems/LmbrCentral/Code/Tests/Lua/test7_block_comment.lua
index f4035430c4..e857d7969b 100644
--- a/Gems/LmbrCentral/Code/Tests/Lua/test7_block_comment.lua
+++ b/Gems/LmbrCentral/Code/Tests/Lua/test7_block_comment.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LmbrCentral/Code/Tests/Lua/test8_negated_block_comment.lua b/Gems/LmbrCentral/Code/Tests/Lua/test8_negated_block_comment.lua
index df3402269b..e4a0cfcb34 100644
--- a/Gems/LmbrCentral/Code/Tests/Lua/test8_negated_block_comment.lua
+++ b/Gems/LmbrCentral/Code/Tests/Lua/test8_negated_block_comment.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LmbrCentral/Code/Tests/PolygonPrismShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/PolygonPrismShapeTest.cpp
index 4d44478e0f..cadecf588e 100644
--- a/Gems/LmbrCentral/Code/Tests/PolygonPrismShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/PolygonPrismShapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/QuadShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/QuadShapeTest.cpp
index b03c8e06d4..f89227ec20 100644
--- a/Gems/LmbrCentral/Code/Tests/QuadShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/QuadShapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp b/Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
index bafb1126e8..b486645694 100644
--- a/Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/SpawnerComponentTest.cpp b/Gems/LmbrCentral/Code/Tests/SpawnerComponentTest.cpp
index 071b424135..95d4d18df3 100644
--- a/Gems/LmbrCentral/Code/Tests/SpawnerComponentTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/SpawnerComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/SphereShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/SphereShapeTest.cpp
index fb885187df..2d2e62944f 100644
--- a/Gems/LmbrCentral/Code/Tests/SphereShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/SphereShapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/SplineComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/SplineComponentTests.cpp
index b20812d0b6..60e03ebadd 100644
--- a/Gems/LmbrCentral/Code/Tests/SplineComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/SplineComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/Tests/TubeShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/TubeShapeTest.cpp
index 7254477e31..c36289afd9 100644
--- a/Gems/LmbrCentral/Code/Tests/TubeShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/TubeShapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationAreaBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationAreaBus.h
index 7108b0384b..de4ded65e0 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationAreaBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationAreaBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationComponentBus.h
index 4977c5ad11..3ac73a58db 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationSeedBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationSeedBus.h
index 8d20a782f4..434416b024 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationSeedBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationSeedBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationSystemBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationSystemBus.h
index ada72e925f..2e70fb10b8 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationSystemBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Ai/NavigationSystemBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/AttachmentComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/AttachmentComponentBus.h
index b2d8fe178c..160e93e06d 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/AttachmentComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/AttachmentComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h
index 0dcc3cbbc4..f34348f68c 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h
index faa85d35a4..1eca552947 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioListenerComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioListenerComponentBus.h
index d9ba92bbad..d39dc2ede2 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioListenerComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioListenerComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h
index 8c5d060a51..750b939bb6 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioPreloadComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioPreloadComponentBus.h
index 8406fd1ee1..86844b28fa 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioPreloadComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioPreloadComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioProxyComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioProxyComponentBus.h
index 6fa214d756..c07d933d56 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioProxyComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioProxyComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioRtpcComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioRtpcComponentBus.h
index b818375bfc..9f9718d8db 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioRtpcComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioRtpcComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioSwitchComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioSwitchComponentBus.h
index 8200625d09..d03a9e0c7d 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioSwitchComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioSwitchComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioSystemComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioSystemComponentBus.h
index ae7856883f..e062c2f3e5 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioSystemComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioSystemComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioTriggerComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioTriggerComponentBus.h
index b9a0ce2493..9cccd4d147 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioTriggerComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Audio/AudioTriggerComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Bundling/BundlingSystemComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Bundling/BundlingSystemComponentBus.h
index 0ab8bdfd6a..9c3845f3f6 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Bundling/BundlingSystemComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Bundling/BundlingSystemComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Component/EditorWrappedComponentBase.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Component/EditorWrappedComponentBase.h
index 8e74c42211..a4725ba4ab 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Component/EditorWrappedComponentBase.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Component/EditorWrappedComponentBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Component/EditorWrappedComponentBase.inl b/Gems/LmbrCentral/Code/include/LmbrCentral/Component/EditorWrappedComponentBase.inl
index be6f592e8e..ab05f69fe4 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Component/EditorWrappedComponentBase.inl
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Component/EditorWrappedComponentBase.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyMonitor.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyMonitor.h
index 8f401591f7..916afb6cff 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyMonitor.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyMonitor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyMonitor.inl b/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyMonitor.inl
index d21f4a6aec..4fbba75965 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyMonitor.inl
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyMonitor.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyNotificationBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyNotificationBus.h
index b2945b578b..2ca9070825 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyNotificationBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Dependency/DependencyNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Geometry/GeometrySystemComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Geometry/GeometrySystemComponentBus.h
index ce3a2ab1e4..f3765c3eb0 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Geometry/GeometrySystemComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Geometry/GeometrySystemComponentBus.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/ForceVolumeRequestBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/ForceVolumeRequestBus.h
index d82e097f5b..5b69f8ad46 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/ForceVolumeRequestBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/ForceVolumeRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/WaterNotificationBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/WaterNotificationBus.h
index 088beb505b..df6c447a3a 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/WaterNotificationBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/WaterNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/WindVolumeRequestBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/WindVolumeRequestBus.h
index 24f38c0e4f..d9c99e9a39 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/WindVolumeRequestBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Physics/WindVolumeRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/DecalComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/DecalComponentBus.h
index a1fa70bdc8..1b10bf1e6b 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/DecalComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/DecalComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorCameraCorrectionBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorCameraCorrectionBus.h
index 11feac79e4..1f0b3b92c7 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorCameraCorrectionBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorCameraCorrectionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorLightComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorLightComponentBus.h
index e0a7cc96ea..76c530f398 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorLightComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/EditorLightComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/GiRegistrationBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/GiRegistrationBus.h
index d7da31d43a..37a87f9144 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/GiRegistrationBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/GiRegistrationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LensFlareAsset.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LensFlareAsset.h
index e543432e8a..ca1e86997a 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LensFlareAsset.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LensFlareAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LightComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LightComponentBus.h
index f8032a0c5d..f9ce5e2f39 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LightComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/LightComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialAsset.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialAsset.h
index b912c3bfa7..6ce3861233 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialAsset.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -28,8 +28,8 @@ namespace LmbrCentral
     };
 
     /*!
-    * FBX Material asset type configuration.
-    * Reflect as: AzFramework::SimpleAssetReference<FbxMaterialAsset>
+    * Source scene file Material asset type configuration.
+    * Reflect as: AzFramework::SimpleAssetReference<DccMaterialAsset>
     */
     class DccMaterialAsset
     {
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialHandle.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialHandle.h
index e2fc4778f4..03ab70077e 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialHandle.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialOwnerBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialOwnerBus.h
index fc7bbfbb5e..4d6fee10a9 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialOwnerBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MaterialOwnerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h
index fae1c8fda5..d59305b4d8 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshModificationBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshModificationBus.h
index 91f89e3ce5..143ced702c 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshModificationBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshModificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderBoundsBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderBoundsBus.h
index 5662b2cebd..b266b1e310 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderBoundsBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderBoundsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h
index 307aad60af..c8700bafe5 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/EditorTagComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/EditorTagComponentBus.h
index 272b1833cb..5d35756efb 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/EditorTagComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/EditorTagComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/GameplayNotificationBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/GameplayNotificationBus.h
index c244b1e2f7..fdaa55abc7 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/GameplayNotificationBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/GameplayNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/RandomTimedSpawnerComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/RandomTimedSpawnerComponentBus.h
index 60ef6fc2f8..c0f1bb217f 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/RandomTimedSpawnerComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/RandomTimedSpawnerComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/SimpleStateComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/SimpleStateComponentBus.h
index 2c1e174120..5992be84ac 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/SimpleStateComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/SimpleStateComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/SpawnerComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/SpawnerComponentBus.h
index 92196b5ffd..f86db75bc1 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/SpawnerComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/SpawnerComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/TagComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/TagComponentBus.h
index 5feeb2a2bf..733dafa009 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/TagComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Scripting/TagComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/BoxShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/BoxShapeComponentBus.h
index 64afba6049..f9c493b49f 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/BoxShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/BoxShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CapsuleShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CapsuleShapeComponentBus.h
index 4a3b045dd0..d9aa0acdda 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CapsuleShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CapsuleShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CompoundShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CompoundShapeComponentBus.h
index 8e082f778d..2aa127686f 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CompoundShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CompoundShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CylinderShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CylinderShapeComponentBus.h
index 76aa85cead..84dbe5b131 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CylinderShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/CylinderShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/DiskShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/DiskShapeComponentBus.h
index 3c74de6965..f4665be1bf 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/DiskShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/DiskShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorPolygonPrismShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorPolygonPrismShapeComponentBus.h
index b73f3c24e2..28a97ba213 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorPolygonPrismShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorPolygonPrismShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorShapeComponentBus.h
index f92d4e96fe..705134adfa 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorSplineComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorSplineComponentBus.h
index fc304f2cb4..8df60e2758 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorSplineComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorSplineComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorTubeShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorTubeShapeComponentBus.h
index 017a3d227e..bca2049c28 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorTubeShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/EditorTubeShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/PolygonPrismShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/PolygonPrismShapeComponentBus.h
index fcdd1d6be2..f1eb8e59b7 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/PolygonPrismShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/PolygonPrismShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/QuadShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/QuadShapeComponentBus.h
index 860c43c84c..69ed5a8e24 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/QuadShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/QuadShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/ShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/ShapeComponentBus.h
index 5f78abda5d..a6fd80712a 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/ShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/ShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SphereShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SphereShapeComponentBus.h
index 26793408ee..9092b6fcf1 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SphereShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SphereShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineAttribute.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineAttribute.h
index 55b5c330e4..f3dd828f00 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineAttribute.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineAttribute.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineAttribute.inl b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineAttribute.inl
index 4b4cf08d0e..53b893b0e3 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineAttribute.inl
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineAttribute.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineComponentBus.h
index 0ea5493e66..081077b32d 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/SplineComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/TubeShapeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/TubeShapeComponentBus.h
index 878f6fe0c3..cce34fd51c 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/TubeShapeComponentBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/TubeShapeComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/include/LmbrCentral/Terrain/TerrainSystemRequestBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Terrain/TerrainSystemRequestBus.h
index bcbde7575a..c29ffeb48d 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Terrain/TerrainSystemRequestBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Terrain/TerrainSystemRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
index 0acce0dd93..f9b3d7769b 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/lmbrcentral_editor_shared_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_editor_shared_files.cmake
index 06d5d1bcdf..d85cdf4b00 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_editor_shared_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
index f8b6429938..1490ceb1b3 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/lmbrcentral_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
index 74687b9a14..d68eacd442 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/lmbrcentral_shared_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_shared_files.cmake
index c8c4e5de75..d6603d6584 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_shared_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LmbrCentral/Code/lmbrcentral_tests_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_tests_files.cmake
index 67a1a96fde..6c66efae29 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_tests_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/CMakeLists.txt b/Gems/LocalUser/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/LocalUser/CMakeLists.txt
+++ b/Gems/LocalUser/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/CMakeLists.txt b/Gems/LocalUser/Code/CMakeLists.txt
index 14ec2b56ce..a2a94d3b60 100644
--- a/Gems/LocalUser/Code/CMakeLists.txt
+++ b/Gems/LocalUser/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/Include/LocalUser/LocalPlayerSlot.h b/Gems/LocalUser/Code/Include/LocalUser/LocalPlayerSlot.h
index e50392ec9f..88fcb40937 100644
--- a/Gems/LocalUser/Code/Include/LocalUser/LocalPlayerSlot.h
+++ b/Gems/LocalUser/Code/Include/LocalUser/LocalPlayerSlot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/Include/LocalUser/LocalUserNotificationBus.h b/Gems/LocalUser/Code/Include/LocalUser/LocalUserNotificationBus.h
index d1d7bfd460..5e9b3ce648 100644
--- a/Gems/LocalUser/Code/Include/LocalUser/LocalUserNotificationBus.h
+++ b/Gems/LocalUser/Code/Include/LocalUser/LocalUserNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/Include/LocalUser/LocalUserProfile.h b/Gems/LocalUser/Code/Include/LocalUser/LocalUserProfile.h
index 1ba644abad..e4cf51c6c2 100644
--- a/Gems/LocalUser/Code/Include/LocalUser/LocalUserProfile.h
+++ b/Gems/LocalUser/Code/Include/LocalUser/LocalUserProfile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/Include/LocalUser/LocalUserRequestBus.h b/Gems/LocalUser/Code/Include/LocalUser/LocalUserRequestBus.h
index b000467668..290d4be0b5 100644
--- a/Gems/LocalUser/Code/Include/LocalUser/LocalUserRequestBus.h
+++ b/Gems/LocalUser/Code/Include/LocalUser/LocalUserRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/Source/LocalUserModule.cpp b/Gems/LocalUser/Code/Source/LocalUserModule.cpp
index de7ae5d318..65ef81a4b9 100644
--- a/Gems/LocalUser/Code/Source/LocalUserModule.cpp
+++ b/Gems/LocalUser/Code/Source/LocalUserModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/Source/LocalUserSystemComponent.cpp b/Gems/LocalUser/Code/Source/LocalUserSystemComponent.cpp
index d83ca30458..752d09f9ec 100644
--- a/Gems/LocalUser/Code/Source/LocalUserSystemComponent.cpp
+++ b/Gems/LocalUser/Code/Source/LocalUserSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/Source/LocalUserSystemComponent.h b/Gems/LocalUser/Code/Source/LocalUserSystemComponent.h
index 0dce89d67b..db10e2ef53 100644
--- a/Gems/LocalUser/Code/Source/LocalUserSystemComponent.h
+++ b/Gems/LocalUser/Code/Source/LocalUserSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/LocalUser/Code/Source/Platform/Android/platform_android_files.cmake
index 4124971bb5..c262d992bf 100644
--- a/Gems/LocalUser/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/LocalUser/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/Source/Platform/Common/Unimplemented/LocalUser_SystemComponent_Unimplemented.cpp b/Gems/LocalUser/Code/Source/Platform/Common/Unimplemented/LocalUser_SystemComponent_Unimplemented.cpp
index c015c60132..1e2250c134 100644
--- a/Gems/LocalUser/Code/Source/Platform/Common/Unimplemented/LocalUser_SystemComponent_Unimplemented.cpp
+++ b/Gems/LocalUser/Code/Source/Platform/Common/Unimplemented/LocalUser_SystemComponent_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/LocalUser/Code/Source/Platform/Linux/platform_linux_files.cmake
index 4124971bb5..c262d992bf 100644
--- a/Gems/LocalUser/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/LocalUser/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/LocalUser/Code/Source/Platform/Mac/platform_mac_files.cmake
index 4124971bb5..c262d992bf 100644
--- a/Gems/LocalUser/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/LocalUser/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/LocalUser/Code/Source/Platform/Windows/platform_windows_files.cmake
index 4124971bb5..c262d992bf 100644
--- a/Gems/LocalUser/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/LocalUser/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/LocalUser/Code/Source/Platform/iOS/platform_ios_files.cmake
index 4124971bb5..c262d992bf 100644
--- a/Gems/LocalUser/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/LocalUser/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/Tests/LocalUserTest.cpp b/Gems/LocalUser/Code/Tests/LocalUserTest.cpp
index 9e5008de94..52ff02a31f 100644
--- a/Gems/LocalUser/Code/Tests/LocalUserTest.cpp
+++ b/Gems/LocalUser/Code/Tests/LocalUserTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LocalUser/Code/localuser_files.cmake b/Gems/LocalUser/Code/localuser_files.cmake
index 16197eaa55..00fa2ba988 100644
--- a/Gems/LocalUser/Code/localuser_files.cmake
+++ b/Gems/LocalUser/Code/localuser_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/localuser_shared_files.cmake b/Gems/LocalUser/Code/localuser_shared_files.cmake
index 9f08f40d5a..5d67d58fa3 100644
--- a/Gems/LocalUser/Code/localuser_shared_files.cmake
+++ b/Gems/LocalUser/Code/localuser_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LocalUser/Code/localuser_tests_files.cmake b/Gems/LocalUser/Code/localuser_tests_files.cmake
index 73be5a3bde..13ed9df068 100644
--- a/Gems/LocalUser/Code/localuser_tests_files.cmake
+++ b/Gems/LocalUser/Code/localuser_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/CMakeLists.txt b/Gems/LyShine/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/LyShine/CMakeLists.txt
+++ b/Gems/LyShine/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/CMakeLists.txt b/Gems/LyShine/Code/CMakeLists.txt
index f807b4e3b5..fe5e2e77df 100644
--- a/Gems/LyShine/Code/CMakeLists.txt
+++ b/Gems/LyShine/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Editor/AlignToolbarSection.cpp b/Gems/LyShine/Code/Editor/AlignToolbarSection.cpp
index 5ff386a151..e179948961 100644
--- a/Gems/LyShine/Code/Editor/AlignToolbarSection.cpp
+++ b/Gems/LyShine/Code/Editor/AlignToolbarSection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AlignToolbarSection.h b/Gems/LyShine/Code/Editor/AlignToolbarSection.h
index 2e2385569d..347693e75e 100644
--- a/Gems/LyShine/Code/Editor/AlignToolbarSection.h
+++ b/Gems/LyShine/Code/Editor/AlignToolbarSection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AnchorPresets.cpp b/Gems/LyShine/Code/Editor/AnchorPresets.cpp
index c741c34cf8..edb5de41b2 100644
--- a/Gems/LyShine/Code/Editor/AnchorPresets.cpp
+++ b/Gems/LyShine/Code/Editor/AnchorPresets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AnchorPresets.h b/Gems/LyShine/Code/Editor/AnchorPresets.h
index 957d6adeb5..14c8dd1c8d 100644
--- a/Gems/LyShine/Code/Editor/AnchorPresets.h
+++ b/Gems/LyShine/Code/Editor/AnchorPresets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
index 6288711bd2..1aa9ed7e55 100644
--- a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
+++ b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AnchorPresetsWidget.h b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.h
index 7b02b24a36..6be0af2ef8 100644
--- a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.h
+++ b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp b/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
index 7472d58f44..975b54e998 100644
--- a/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/AnimationContext.h b/Gems/LyShine/Code/Editor/Animation/AnimationContext.h
index f2b07ef1be..939627da64 100644
--- a/Gems/LyShine/Code/Editor/Animation/AnimationContext.h
+++ b/Gems/LyShine/Code/Editor/Animation/AnimationContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
index fc2579c991..6bf3b2b440 100644
--- a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.h b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.h
index 0f9b15ad7b..dfb1ea3ad7 100644
--- a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.h
+++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.cpp b/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.cpp
index 8687c62912..0e860940b9 100644
--- a/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.h b/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.h
index aa6d50dcfd..7a893e4730 100644
--- a/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.h
+++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp
index dc8f70b16c..b47e36dd5d 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.h b/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.h
index 0ebfe5bba5..50cd3ff061 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp
index 58179f79bd..3b9f2b6264 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.h b/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.h
index 3db03904d6..3cbfc330f0 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.cpp
index edb49860c9..5dd3c267a3 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.h b/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.h
index 07155ba3a1..0ffc2854e0 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.cpp
index d426006139..32ae244eda 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.h b/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.h
index d0d0da0bcb..3354937150 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.cpp
index e4f72ffc5b..46bc7155d0 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.h b/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.h
index a4b4651ef0..0fbdf12259 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.cpp
index a1b2ef4910..a51f454fd3 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.h b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.h
index 88c2724d4e..fbf058cea2 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimUndoObject.h b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoObject.h
index 36f9e9071a..8f749ea2f5 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimUndoObject.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.cpp
index e600fa05a9..65b3260784 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.h
index f822767d46..de46e42943 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.cpp
index 0892566b3c..c3acd176a0 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.h
index bcd37b780b..6e86504e74 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
index 999d1d5f77..6c6aa93055 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -1555,7 +1555,7 @@ void CUiAnimViewDialog::ReadMiscSettings()
 //////////////////////////////////////////////////////////////////////////
 void CUiAnimViewDialog::SaveLayouts()
 {
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("UiAnimView");
     QByteArray stateData = this->saveState();
     settings.setValue("layout", stateData);
@@ -1570,7 +1570,7 @@ void CUiAnimViewDialog::SaveLayouts()
 //////////////////////////////////////////////////////////////////////////
 void CUiAnimViewDialog::ReadLayouts()
 {
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("UiAnimView");
     if (settings.contains("layout"))
     {
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.h
index 4bd9983604..c3f60af285 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
index 8a1af3d98e..2dceb0416b 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.h
index dfbfe38968..1c344e0c74 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.cpp
index 1b133bb7b9..72d99bd239 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.h
index d55c4ee711..0414a7c4c4 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.cpp
index 6339494c56..2f681fa14c 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.h
index efea846adc..931e1a65d4 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.cpp
index 696de16eb0..d04f9b2be0 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.h
index da89f6c526..ecdc2f5aa6 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.cpp
index db0b4014c2..7ecce21b13 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.h
index 523f48bcc0..0881461142 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.cpp
index a76aa99064..f7146ccd2c 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.h
index 63ff4f127a..87fde85c48 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.cpp
index 0172c1ec90..fc42af9450 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.h
index ee3df1ea42..db3fcfef7e 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp
index f6fbc6724d..78ff4bee1f 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.h
index 0f7db6ba10..d7ff920841 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.cpp
index fd2d1f68a8..f6bbab8789 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.h
index 34bc9011cb..f44be9a643 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
index 489c7046ad..1cca7fed4e 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.h
index a777522482..859b774372 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.cpp
index cb4fe1223c..3f4b21a93c 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.h
index 7f8f7a139c..87ce283699 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.cpp
index 0559a2e9f0..f1f859a933 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.h
index 7b5c77813c..82bc9c821c 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.cpp
index c6c60f9746..d9375c8cae 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.h
index cb82fd5c0d..55ea71d705 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.cpp
index 385be2a5f6..4448cd9fc4 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.h
index 7e533223d3..b86dafe1ef 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/UiEditorAnimationBus.h b/Gems/LyShine/Code/Editor/Animation/UiEditorAnimationBus.h
index 8755ae839d..d45dce3c5d 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiEditorAnimationBus.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiEditorAnimationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Animation/Util/UiEditorUtils.cpp b/Gems/LyShine/Code/Editor/Animation/Util/UiEditorUtils.cpp
index 1c5c94a911..f3c3746034 100644
--- a/Gems/LyShine/Code/Editor/Animation/Util/UiEditorUtils.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/Util/UiEditorUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AssetDropHelpers.cpp b/Gems/LyShine/Code/Editor/AssetDropHelpers.cpp
index 3d92e82a99..60bc816d35 100644
--- a/Gems/LyShine/Code/Editor/AssetDropHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/AssetDropHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AssetDropHelpers.h b/Gems/LyShine/Code/Editor/AssetDropHelpers.h
index fbc5a53d1a..0b292cc3db 100644
--- a/Gems/LyShine/Code/Editor/AssetDropHelpers.h
+++ b/Gems/LyShine/Code/Editor/AssetDropHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AssetTreeEntry.cpp b/Gems/LyShine/Code/Editor/AssetTreeEntry.cpp
index ee2749abe9..63b9b81d6c 100644
--- a/Gems/LyShine/Code/Editor/AssetTreeEntry.cpp
+++ b/Gems/LyShine/Code/Editor/AssetTreeEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/AssetTreeEntry.h b/Gems/LyShine/Code/Editor/AssetTreeEntry.h
index 0fb1779a25..03e14fbba7 100644
--- a/Gems/LyShine/Code/Editor/AssetTreeEntry.h
+++ b/Gems/LyShine/Code/Editor/AssetTreeEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CanvasHelpers.cpp b/Gems/LyShine/Code/Editor/CanvasHelpers.cpp
index a656edef0c..445e587ce7 100644
--- a/Gems/LyShine/Code/Editor/CanvasHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/CanvasHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CanvasHelpers.h b/Gems/LyShine/Code/Editor/CanvasHelpers.h
index cfcf98a32b..4a345a096c 100644
--- a/Gems/LyShine/Code/Editor/CanvasHelpers.h
+++ b/Gems/LyShine/Code/Editor/CanvasHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.cpp b/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.cpp
index a83885858e..70a77f9b57 100644
--- a/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.cpp
+++ b/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.h b/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.h
index bb0fb7423b..b09366fbf6 100644
--- a/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.h
+++ b/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.cpp b/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.cpp
index c10442f5f4..9dc2b5efce 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.cpp
+++ b/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.h b/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.h
index 32689bc74f..66cda13953 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.h
+++ b/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandCanvasSize.cpp b/Gems/LyShine/Code/Editor/CommandCanvasSize.cpp
index d9766dc164..27845095ee 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasSize.cpp
+++ b/Gems/LyShine/Code/Editor/CommandCanvasSize.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandCanvasSize.h b/Gems/LyShine/Code/Editor/CommandCanvasSize.h
index 517bd6e2d7..5468dcbbe6 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasSize.h
+++ b/Gems/LyShine/Code/Editor/CommandCanvasSize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.cpp b/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.cpp
index 279a007e71..4b70f14699 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.cpp
+++ b/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.h b/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.h
index 8020b208a1..f382c51f16 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.h
+++ b/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.cpp
index 68f5011f05..56a85bc865 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.h
index c688ea1e1e..e0088356c5 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.cpp
index 9fe818d1b5..0ea9469704 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.h
index ae7e622b01..c3c904c3fb 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.cpp
index 03f42067c9..5ec18ca084 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.h
index 49660888ea..e20fb51903 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.cpp
index 2d54a3cefa..11552658b4 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.h
index 678c8ecb8b..286aefd8b8 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.cpp
index e153beb291..8c1ddb7a52 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.h
index 6a9ed9d870..3626f2716b 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.cpp
index 19e76dae41..c1efdc9c5f 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.h
index 66d2c4dff3..4a01e00f58 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.cpp
index dd5cec3a14..988b2b0ded 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.h
index 9d3a2ae4d8..360718bacf 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.cpp
index 0ac48b05ea..36c722252e 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.h
index aab530c64e..8db630541c 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.cpp
index 756e563ca5..b8f3407959 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.h b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.h
index a7138e9faf..debfbdd856 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.h
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandPropertiesChange.cpp b/Gems/LyShine/Code/Editor/CommandPropertiesChange.cpp
index d1d5b7abb7..0a0b2d105c 100644
--- a/Gems/LyShine/Code/Editor/CommandPropertiesChange.cpp
+++ b/Gems/LyShine/Code/Editor/CommandPropertiesChange.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandPropertiesChange.h b/Gems/LyShine/Code/Editor/CommandPropertiesChange.h
index 253a5937d2..b0398aa295 100644
--- a/Gems/LyShine/Code/Editor/CommandPropertiesChange.h
+++ b/Gems/LyShine/Code/Editor/CommandPropertiesChange.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.cpp b/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.cpp
index b6c5d8df68..9d351a0405 100644
--- a/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.cpp
+++ b/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.h b/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.h
index 73ca60e914..3fd318199d 100644
--- a/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.h
+++ b/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ComponentAssetHelpers.h b/Gems/LyShine/Code/Editor/ComponentAssetHelpers.h
index 992d256b0f..65b78995bc 100644
--- a/Gems/LyShine/Code/Editor/ComponentAssetHelpers.h
+++ b/Gems/LyShine/Code/Editor/ComponentAssetHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ComponentButton.cpp b/Gems/LyShine/Code/Editor/ComponentButton.cpp
index 4ab6373272..ff03200477 100644
--- a/Gems/LyShine/Code/Editor/ComponentButton.cpp
+++ b/Gems/LyShine/Code/Editor/ComponentButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ComponentButton.h b/Gems/LyShine/Code/Editor/ComponentButton.h
index e5290c6ec9..13762a5e56 100644
--- a/Gems/LyShine/Code/Editor/ComponentButton.h
+++ b/Gems/LyShine/Code/Editor/ComponentButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ComponentHelpers.cpp b/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
index 10c2009ebe..12349dc908 100644
--- a/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ComponentHelpers.h b/Gems/LyShine/Code/Editor/ComponentHelpers.h
index 9a112fd429..c5a8dc39d9 100644
--- a/Gems/LyShine/Code/Editor/ComponentHelpers.h
+++ b/Gems/LyShine/Code/Editor/ComponentHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.cpp b/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.cpp
index 63455a782f..3e3c027d02 100644
--- a/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.cpp
+++ b/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.h b/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.h
index 0a4f37a3c2..3f6732b04b 100644
--- a/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.h
+++ b/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/EditorCommon.cpp b/Gems/LyShine/Code/Editor/EditorCommon.cpp
index ad7ff31319..d1b5736f77 100644
--- a/Gems/LyShine/Code/Editor/EditorCommon.cpp
+++ b/Gems/LyShine/Code/Editor/EditorCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/EditorCommon.h b/Gems/LyShine/Code/Editor/EditorCommon.h
index c25be71964..04dc03f8a0 100644
--- a/Gems/LyShine/Code/Editor/EditorCommon.h
+++ b/Gems/LyShine/Code/Editor/EditorCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -160,7 +160,7 @@ enum class FusibleCommand
 #include "ViewportWidget.h"
 
 // IMPORTANT: This is NOT the permanent location for these values.
-#define AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME "Amazon"
+#define AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME "O3DE"
 #define AZ_QCOREAPPLICATION_SETTINGS_APPLICATION_NAME "O3DE"
 
 // See: http://en.wikipedia.org/wiki/Internet_media_type#Prefix_x
diff --git a/Gems/LyShine/Code/Editor/EditorMenu.cpp b/Gems/LyShine/Code/Editor/EditorMenu.cpp
index 0e7fe2a486..039ed7f3ca 100644
--- a/Gems/LyShine/Code/Editor/EditorMenu.cpp
+++ b/Gems/LyShine/Code/Editor/EditorMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/EditorWindow.cpp b/Gems/LyShine/Code/Editor/EditorWindow.cpp
index 374032c092..0edc1e6151 100644
--- a/Gems/LyShine/Code/Editor/EditorWindow.cpp
+++ b/Gems/LyShine/Code/Editor/EditorWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/EditorWindow.h b/Gems/LyShine/Code/Editor/EditorWindow.h
index 2025b07ec4..0f2dd39210 100644
--- a/Gems/LyShine/Code/Editor/EditorWindow.h
+++ b/Gems/LyShine/Code/Editor/EditorWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/EnterPreviewToolbar.cpp b/Gems/LyShine/Code/Editor/EnterPreviewToolbar.cpp
index cab49a64e9..90d93859bd 100644
--- a/Gems/LyShine/Code/Editor/EnterPreviewToolbar.cpp
+++ b/Gems/LyShine/Code/Editor/EnterPreviewToolbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/EnterPreviewToolbar.h b/Gems/LyShine/Code/Editor/EnterPreviewToolbar.h
index 56608f8e8f..cbf664a01a 100644
--- a/Gems/LyShine/Code/Editor/EnterPreviewToolbar.h
+++ b/Gems/LyShine/Code/Editor/EnterPreviewToolbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/EntityHelpers.cpp b/Gems/LyShine/Code/Editor/EntityHelpers.cpp
index 4ea8b934af..dc79b55213 100644
--- a/Gems/LyShine/Code/Editor/EntityHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/EntityHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/EntityHelpers.h b/Gems/LyShine/Code/Editor/EntityHelpers.h
index 595c3e8816..cc6131c994 100644
--- a/Gems/LyShine/Code/Editor/EntityHelpers.h
+++ b/Gems/LyShine/Code/Editor/EntityHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FeedbackDialog.cpp b/Gems/LyShine/Code/Editor/FeedbackDialog.cpp
index dad913c8d0..17aa437a14 100644
--- a/Gems/LyShine/Code/Editor/FeedbackDialog.cpp
+++ b/Gems/LyShine/Code/Editor/FeedbackDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FeedbackDialog.h b/Gems/LyShine/Code/Editor/FeedbackDialog.h
index 21b2150436..86d7a562b0 100644
--- a/Gems/LyShine/Code/Editor/FeedbackDialog.h
+++ b/Gems/LyShine/Code/Editor/FeedbackDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FileHelpers.cpp b/Gems/LyShine/Code/Editor/FileHelpers.cpp
index ff00d516b5..92298f1f0d 100644
--- a/Gems/LyShine/Code/Editor/FileHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/FileHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FileHelpers.h b/Gems/LyShine/Code/Editor/FileHelpers.h
index 6cf5e20da4..d5b14f4ccb 100644
--- a/Gems/LyShine/Code/Editor/FileHelpers.h
+++ b/Gems/LyShine/Code/Editor/FileHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FindEntityItemModel.cpp b/Gems/LyShine/Code/Editor/FindEntityItemModel.cpp
index a5269c11ff..3b5332a448 100644
--- a/Gems/LyShine/Code/Editor/FindEntityItemModel.cpp
+++ b/Gems/LyShine/Code/Editor/FindEntityItemModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FindEntityItemModel.h b/Gems/LyShine/Code/Editor/FindEntityItemModel.h
index c38a40b9a5..630218c2e0 100644
--- a/Gems/LyShine/Code/Editor/FindEntityItemModel.h
+++ b/Gems/LyShine/Code/Editor/FindEntityItemModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.cpp b/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.cpp
index 3cdf37fd42..c0e7ba0489 100644
--- a/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.cpp
+++ b/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.h b/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.h
index 3524c79ea1..6c2518ba4a 100644
--- a/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.h
+++ b/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FindEntityWidget.cpp b/Gems/LyShine/Code/Editor/FindEntityWidget.cpp
index cd52071793..30b9424bd8 100644
--- a/Gems/LyShine/Code/Editor/FindEntityWidget.cpp
+++ b/Gems/LyShine/Code/Editor/FindEntityWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/FindEntityWidget.h b/Gems/LyShine/Code/Editor/FindEntityWidget.h
index a96c569cea..5913d688ea 100644
--- a/Gems/LyShine/Code/Editor/FindEntityWidget.h
+++ b/Gems/LyShine/Code/Editor/FindEntityWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/GuideHelpers.cpp b/Gems/LyShine/Code/Editor/GuideHelpers.cpp
index 7638aecc37..9f24fb3c1a 100644
--- a/Gems/LyShine/Code/Editor/GuideHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/GuideHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/GuideHelpers.h b/Gems/LyShine/Code/Editor/GuideHelpers.h
index d3f02bb65a..d95c75cc14 100644
--- a/Gems/LyShine/Code/Editor/GuideHelpers.h
+++ b/Gems/LyShine/Code/Editor/GuideHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyClipboard.cpp b/Gems/LyShine/Code/Editor/HierarchyClipboard.cpp
index 7749c4c57c..6a5dece2f4 100644
--- a/Gems/LyShine/Code/Editor/HierarchyClipboard.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyClipboard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyClipboard.h b/Gems/LyShine/Code/Editor/HierarchyClipboard.h
index a599a3d1e6..8665cadef7 100644
--- a/Gems/LyShine/Code/Editor/HierarchyClipboard.h
+++ b/Gems/LyShine/Code/Editor/HierarchyClipboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyHeader.cpp b/Gems/LyShine/Code/Editor/HierarchyHeader.cpp
index 2f352c3e71..63eb04c50b 100644
--- a/Gems/LyShine/Code/Editor/HierarchyHeader.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyHeader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyHeader.h b/Gems/LyShine/Code/Editor/HierarchyHeader.h
index 6a5cbc8539..29d8692b33 100644
--- a/Gems/LyShine/Code/Editor/HierarchyHeader.h
+++ b/Gems/LyShine/Code/Editor/HierarchyHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyHelpers.cpp b/Gems/LyShine/Code/Editor/HierarchyHelpers.cpp
index c6ac931d2a..9a58a6f31b 100644
--- a/Gems/LyShine/Code/Editor/HierarchyHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyHelpers.h b/Gems/LyShine/Code/Editor/HierarchyHelpers.h
index b4299e48b2..3a1c5ef97d 100644
--- a/Gems/LyShine/Code/Editor/HierarchyHelpers.h
+++ b/Gems/LyShine/Code/Editor/HierarchyHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyItem.cpp b/Gems/LyShine/Code/Editor/HierarchyItem.cpp
index 402656636f..0a41758516 100644
--- a/Gems/LyShine/Code/Editor/HierarchyItem.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyItem.h b/Gems/LyShine/Code/Editor/HierarchyItem.h
index ea7ca0b77d..bde0263d97 100644
--- a/Gems/LyShine/Code/Editor/HierarchyItem.h
+++ b/Gems/LyShine/Code/Editor/HierarchyItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyMenu.cpp b/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
index ff176f8eff..3758041f7a 100644
--- a/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyMenu.h b/Gems/LyShine/Code/Editor/HierarchyMenu.h
index 5d5bf8e651..69432a4d24 100644
--- a/Gems/LyShine/Code/Editor/HierarchyMenu.h
+++ b/Gems/LyShine/Code/Editor/HierarchyMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyWidget.cpp b/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
index afbda03b76..9b72f2407f 100644
--- a/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/HierarchyWidget.h b/Gems/LyShine/Code/Editor/HierarchyWidget.h
index 90a2c5bf00..8e69a2196f 100644
--- a/Gems/LyShine/Code/Editor/HierarchyWidget.h
+++ b/Gems/LyShine/Code/Editor/HierarchyWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.cpp b/Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.cpp
index 82ba7aa257..939e8e3d92 100644
--- a/Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.cpp
+++ b/Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.h b/Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.h
index a708aa0919..b34cb35cd9 100644
--- a/Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.h
+++ b/Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/MainToolbar.cpp b/Gems/LyShine/Code/Editor/MainToolbar.cpp
index e8ecbec08e..dbd2c70508 100644
--- a/Gems/LyShine/Code/Editor/MainToolbar.cpp
+++ b/Gems/LyShine/Code/Editor/MainToolbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/MainToolbar.h b/Gems/LyShine/Code/Editor/MainToolbar.h
index 1c02b3be30..b90f7f0cc6 100644
--- a/Gems/LyShine/Code/Editor/MainToolbar.h
+++ b/Gems/LyShine/Code/Editor/MainToolbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ModeToolbar.cpp b/Gems/LyShine/Code/Editor/ModeToolbar.cpp
index 2615bf3fa2..751f010efc 100644
--- a/Gems/LyShine/Code/Editor/ModeToolbar.cpp
+++ b/Gems/LyShine/Code/Editor/ModeToolbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ModeToolbar.h b/Gems/LyShine/Code/Editor/ModeToolbar.h
index b53667f576..d00cd16ddb 100644
--- a/Gems/LyShine/Code/Editor/ModeToolbar.h
+++ b/Gems/LyShine/Code/Editor/ModeToolbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/NewElementToolbarSection.cpp b/Gems/LyShine/Code/Editor/NewElementToolbarSection.cpp
index f75bdd79a5..c8de5afb11 100644
--- a/Gems/LyShine/Code/Editor/NewElementToolbarSection.cpp
+++ b/Gems/LyShine/Code/Editor/NewElementToolbarSection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/NewElementToolbarSection.h b/Gems/LyShine/Code/Editor/NewElementToolbarSection.h
index 3911dd8ade..741fba3d9e 100644
--- a/Gems/LyShine/Code/Editor/NewElementToolbarSection.h
+++ b/Gems/LyShine/Code/Editor/NewElementToolbarSection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PivotPresets.cpp b/Gems/LyShine/Code/Editor/PivotPresets.cpp
index 2397a1fcf0..5fae65d058 100644
--- a/Gems/LyShine/Code/Editor/PivotPresets.cpp
+++ b/Gems/LyShine/Code/Editor/PivotPresets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PivotPresets.h b/Gems/LyShine/Code/Editor/PivotPresets.h
index 2e6a823f6e..2c036df2dd 100644
--- a/Gems/LyShine/Code/Editor/PivotPresets.h
+++ b/Gems/LyShine/Code/Editor/PivotPresets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PivotPresetsWidget.cpp b/Gems/LyShine/Code/Editor/PivotPresetsWidget.cpp
index 09aef370fc..1c17f53663 100644
--- a/Gems/LyShine/Code/Editor/PivotPresetsWidget.cpp
+++ b/Gems/LyShine/Code/Editor/PivotPresetsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PivotPresetsWidget.h b/Gems/LyShine/Code/Editor/PivotPresetsWidget.h
index a75d1f115d..9741db8645 100644
--- a/Gems/LyShine/Code/Editor/PivotPresetsWidget.h
+++ b/Gems/LyShine/Code/Editor/PivotPresetsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/Platform/Linux/PAL_linux.cmake b/Gems/LyShine/Code/Editor/Platform/Linux/PAL_linux.cmake
index 58788dda42..67bd3849b9 100644
--- a/Gems/LyShine/Code/Editor/Platform/Linux/PAL_linux.cmake
+++ b/Gems/LyShine/Code/Editor/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Editor/Platform/Mac/PAL_mac.cmake b/Gems/LyShine/Code/Editor/Platform/Mac/PAL_mac.cmake
index fb09c30ffb..ad668eb6b3 100644
--- a/Gems/LyShine/Code/Editor/Platform/Mac/PAL_mac.cmake
+++ b/Gems/LyShine/Code/Editor/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Editor/Platform/Windows/PAL_windows.cmake b/Gems/LyShine/Code/Editor/Platform/Windows/PAL_windows.cmake
index fb09c30ffb..ad668eb6b3 100644
--- a/Gems/LyShine/Code/Editor/Platform/Windows/PAL_windows.cmake
+++ b/Gems/LyShine/Code/Editor/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Editor/PrefabHelpers.cpp b/Gems/LyShine/Code/Editor/PrefabHelpers.cpp
index ee019371a3..c6f81dd56e 100644
--- a/Gems/LyShine/Code/Editor/PrefabHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/PrefabHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PrefabHelpers.h b/Gems/LyShine/Code/Editor/PrefabHelpers.h
index f200f6dd9d..5d39513715 100644
--- a/Gems/LyShine/Code/Editor/PrefabHelpers.h
+++ b/Gems/LyShine/Code/Editor/PrefabHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PresetButton.cpp b/Gems/LyShine/Code/Editor/PresetButton.cpp
index ad722a094b..360e1acc15 100644
--- a/Gems/LyShine/Code/Editor/PresetButton.cpp
+++ b/Gems/LyShine/Code/Editor/PresetButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PresetButton.h b/Gems/LyShine/Code/Editor/PresetButton.h
index ce17a9dbc3..40441009d3 100644
--- a/Gems/LyShine/Code/Editor/PresetButton.h
+++ b/Gems/LyShine/Code/Editor/PresetButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PreviewActionLog.cpp b/Gems/LyShine/Code/Editor/PreviewActionLog.cpp
index 4c9f2d3a92..afe4657dc8 100644
--- a/Gems/LyShine/Code/Editor/PreviewActionLog.cpp
+++ b/Gems/LyShine/Code/Editor/PreviewActionLog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PreviewActionLog.h b/Gems/LyShine/Code/Editor/PreviewActionLog.h
index e6cc5c72ca..789756bee5 100644
--- a/Gems/LyShine/Code/Editor/PreviewActionLog.h
+++ b/Gems/LyShine/Code/Editor/PreviewActionLog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PreviewAnimationList.cpp b/Gems/LyShine/Code/Editor/PreviewAnimationList.cpp
index db9e94c1a8..0bacf87a0d 100644
--- a/Gems/LyShine/Code/Editor/PreviewAnimationList.cpp
+++ b/Gems/LyShine/Code/Editor/PreviewAnimationList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PreviewAnimationList.h b/Gems/LyShine/Code/Editor/PreviewAnimationList.h
index 948519dd43..1e0b5d9d90 100644
--- a/Gems/LyShine/Code/Editor/PreviewAnimationList.h
+++ b/Gems/LyShine/Code/Editor/PreviewAnimationList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PreviewToolbar.cpp b/Gems/LyShine/Code/Editor/PreviewToolbar.cpp
index 028258520f..081582eda4 100644
--- a/Gems/LyShine/Code/Editor/PreviewToolbar.cpp
+++ b/Gems/LyShine/Code/Editor/PreviewToolbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PreviewToolbar.h b/Gems/LyShine/Code/Editor/PreviewToolbar.h
index 9a56f8d182..2fe9451f7e 100644
--- a/Gems/LyShine/Code/Editor/PreviewToolbar.h
+++ b/Gems/LyShine/Code/Editor/PreviewToolbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertiesContainer.cpp b/Gems/LyShine/Code/Editor/PropertiesContainer.cpp
index f80e590836..e6b9d0513a 100644
--- a/Gems/LyShine/Code/Editor/PropertiesContainer.cpp
+++ b/Gems/LyShine/Code/Editor/PropertiesContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertiesContainer.h b/Gems/LyShine/Code/Editor/PropertiesContainer.h
index 48cd2215e3..e9099ecac5 100644
--- a/Gems/LyShine/Code/Editor/PropertiesContainer.h
+++ b/Gems/LyShine/Code/Editor/PropertiesContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertiesWidget.cpp b/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
index 45c769b702..cacd1c118a 100644
--- a/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
+++ b/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertiesWidget.h b/Gems/LyShine/Code/Editor/PropertiesWidget.h
index 3b21fd485f..e2fb8e2eb2 100644
--- a/Gems/LyShine/Code/Editor/PropertiesWidget.h
+++ b/Gems/LyShine/Code/Editor/PropertiesWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertiesWrapper.cpp b/Gems/LyShine/Code/Editor/PropertiesWrapper.cpp
index 30c81f6cc9..8ddf8145f3 100644
--- a/Gems/LyShine/Code/Editor/PropertiesWrapper.cpp
+++ b/Gems/LyShine/Code/Editor/PropertiesWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertiesWrapper.h b/Gems/LyShine/Code/Editor/PropertiesWrapper.h
index 8eeab65e7d..31034ac67f 100644
--- a/Gems/LyShine/Code/Editor/PropertiesWrapper.h
+++ b/Gems/LyShine/Code/Editor/PropertiesWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.cpp
index 0b007a0e40..927b474838 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.h b/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.h
index cb9a17a4a1..58d8a8d9cb 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerChar.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerChar.cpp
index 1ebaa5785f..b016d1cebe 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerChar.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerChar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerChar.h b/Gems/LyShine/Code/Editor/PropertyHandlerChar.h
index 91d634133a..580afcdc5a 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerChar.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerChar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
index 857903c14e..34839cde5f 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.h b/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.h
index f11a6b086c..70257f88e8 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.cpp
index 8c5482c90d..d0b3e0bdc2 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.h b/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.h
index 1c784d7aa7..a2a340b439 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.cpp
index d0b1ae8aad..a068fc9e4a 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.h b/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.h
index a9f8f21be5..6da26a7405 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerOffset.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerOffset.cpp
index 9d8e1d81ec..ebb4620034 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerOffset.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerOffset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerOffset.h b/Gems/LyShine/Code/Editor/PropertyHandlerOffset.h
index 56e91e05a5..1151206271 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerOffset.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerOffset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerPivot.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerPivot.cpp
index 2dfbb66277..6be0e9ef74 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerPivot.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerPivot.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerPivot.h b/Gems/LyShine/Code/Editor/PropertyHandlerPivot.h
index 61f523a05b..e2916a1234 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerPivot.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerPivot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
index 46bd4891c5..93bede104f 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerSprite.h b/Gems/LyShine/Code/Editor/PropertyHandlerSprite.h
index 9603b23b2a..a1b2ea1f2e 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerSprite.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerSprite.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.cpp
index d0b8b61cc7..48088bca39 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h
index ca8e2aaf2b..6ab25195cb 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.cpp
index 83ea71b5cc..8b968f3087 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h
index 6a04a5dfeb..8fcada8840 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerVec.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerVec.cpp
index 48fb1dc7ee..fe2cbdf49c 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerVec.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerVec.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlerVec.h b/Gems/LyShine/Code/Editor/PropertyHandlerVec.h
index 41238b95c6..fcb3024f25 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerVec.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerVec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlers.cpp b/Gems/LyShine/Code/Editor/PropertyHandlers.cpp
index 413daf352b..8a61bf19c0 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlers.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/PropertyHandlers.h b/Gems/LyShine/Code/Editor/PropertyHandlers.h
index d489b15b2c..3d28c7962a 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlers.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/QtHelpers.cpp b/Gems/LyShine/Code/Editor/QtHelpers.cpp
index 40f34e33bc..9897012358 100644
--- a/Gems/LyShine/Code/Editor/QtHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/QtHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/QtHelpers.h b/Gems/LyShine/Code/Editor/QtHelpers.h
index e6651bfae1..99c59b8ca2 100644
--- a/Gems/LyShine/Code/Editor/QtHelpers.h
+++ b/Gems/LyShine/Code/Editor/QtHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/RecentFiles.cpp b/Gems/LyShine/Code/Editor/RecentFiles.cpp
index 503b795071..637a880bb9 100644
--- a/Gems/LyShine/Code/Editor/RecentFiles.cpp
+++ b/Gems/LyShine/Code/Editor/RecentFiles.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/RecentFiles.h b/Gems/LyShine/Code/Editor/RecentFiles.h
index abc5c423a6..2a31fd4e24 100644
--- a/Gems/LyShine/Code/Editor/RecentFiles.h
+++ b/Gems/LyShine/Code/Editor/RecentFiles.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/RulerWidget.cpp b/Gems/LyShine/Code/Editor/RulerWidget.cpp
index 455e06a57e..6baea22d3b 100644
--- a/Gems/LyShine/Code/Editor/RulerWidget.cpp
+++ b/Gems/LyShine/Code/Editor/RulerWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/RulerWidget.h b/Gems/LyShine/Code/Editor/RulerWidget.h
index 91fa532dca..7224119fa1 100644
--- a/Gems/LyShine/Code/Editor/RulerWidget.h
+++ b/Gems/LyShine/Code/Editor/RulerWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SelectionHelpers.cpp b/Gems/LyShine/Code/Editor/SelectionHelpers.cpp
index 2fd4bc7a7d..7d911dd475 100644
--- a/Gems/LyShine/Code/Editor/SelectionHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/SelectionHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SelectionHelpers.h b/Gems/LyShine/Code/Editor/SelectionHelpers.h
index 68941fb1fb..4899e7927c 100644
--- a/Gems/LyShine/Code/Editor/SelectionHelpers.h
+++ b/Gems/LyShine/Code/Editor/SelectionHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SerializeHelpers.cpp b/Gems/LyShine/Code/Editor/SerializeHelpers.cpp
index d3f7712c7f..c834929472 100644
--- a/Gems/LyShine/Code/Editor/SerializeHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/SerializeHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SerializeHelpers.h b/Gems/LyShine/Code/Editor/SerializeHelpers.h
index 746e8d95e3..a2189bcb20 100644
--- a/Gems/LyShine/Code/Editor/SerializeHelpers.h
+++ b/Gems/LyShine/Code/Editor/SerializeHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SliceMenuHelpers.cpp b/Gems/LyShine/Code/Editor/SliceMenuHelpers.cpp
index 5345a59a67..69ce21a275 100644
--- a/Gems/LyShine/Code/Editor/SliceMenuHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/SliceMenuHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SliceMenuHelpers.h b/Gems/LyShine/Code/Editor/SliceMenuHelpers.h
index de81cccbdb..bbcd498d87 100644
--- a/Gems/LyShine/Code/Editor/SliceMenuHelpers.h
+++ b/Gems/LyShine/Code/Editor/SliceMenuHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SlicerEdit.cpp b/Gems/LyShine/Code/Editor/SlicerEdit.cpp
index b09bb6700c..fc6116833c 100644
--- a/Gems/LyShine/Code/Editor/SlicerEdit.cpp
+++ b/Gems/LyShine/Code/Editor/SlicerEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SlicerEdit.h b/Gems/LyShine/Code/Editor/SlicerEdit.h
index 23947ec8ba..7e169a19c1 100644
--- a/Gems/LyShine/Code/Editor/SlicerEdit.h
+++ b/Gems/LyShine/Code/Editor/SlicerEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SlicerManipulator.cpp b/Gems/LyShine/Code/Editor/SlicerManipulator.cpp
index 6943cf224b..cddc4b1a98 100644
--- a/Gems/LyShine/Code/Editor/SlicerManipulator.cpp
+++ b/Gems/LyShine/Code/Editor/SlicerManipulator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SlicerManipulator.h b/Gems/LyShine/Code/Editor/SlicerManipulator.h
index dba9037b50..f606dd0d8e 100644
--- a/Gems/LyShine/Code/Editor/SlicerManipulator.h
+++ b/Gems/LyShine/Code/Editor/SlicerManipulator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SlicerView.cpp b/Gems/LyShine/Code/Editor/SlicerView.cpp
index 6aeac0a089..f303852874 100644
--- a/Gems/LyShine/Code/Editor/SlicerView.cpp
+++ b/Gems/LyShine/Code/Editor/SlicerView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SlicerView.h b/Gems/LyShine/Code/Editor/SlicerView.h
index 498289b369..407e4bb18e 100644
--- a/Gems/LyShine/Code/Editor/SlicerView.h
+++ b/Gems/LyShine/Code/Editor/SlicerView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp b/Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp
index a4af972e48..a37f401581 100644
--- a/Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp
+++ b/Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SpriteBorderEditor.h b/Gems/LyShine/Code/Editor/SpriteBorderEditor.h
index bad715722a..eb49abafae 100644
--- a/Gems/LyShine/Code/Editor/SpriteBorderEditor.h
+++ b/Gems/LyShine/Code/Editor/SpriteBorderEditor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.cpp b/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.cpp
index ef1a0734d9..9aaf017c9a 100644
--- a/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.cpp
+++ b/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.h b/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.h
index 0e15c7d923..84b3754aa6 100644
--- a/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.h
+++ b/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UIVectorPropertyHandlerBase.h b/Gems/LyShine/Code/Editor/UIVectorPropertyHandlerBase.h
index 406e3f2d5a..58203fc561 100644
--- a/Gems/LyShine/Code/Editor/UIVectorPropertyHandlerBase.h
+++ b/Gems/LyShine/Code/Editor/UIVectorPropertyHandlerBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h b/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
index f53511e6a8..943e825905 100644
--- a/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
+++ b/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UiEditorEntityContext.cpp b/Gems/LyShine/Code/Editor/UiEditorEntityContext.cpp
index 10f2f48250..f5715f0d87 100644
--- a/Gems/LyShine/Code/Editor/UiEditorEntityContext.cpp
+++ b/Gems/LyShine/Code/Editor/UiEditorEntityContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UiEditorEntityContext.h b/Gems/LyShine/Code/Editor/UiEditorEntityContext.h
index 0cba5bc78a..6eeb2a24e5 100644
--- a/Gems/LyShine/Code/Editor/UiEditorEntityContext.h
+++ b/Gems/LyShine/Code/Editor/UiEditorEntityContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UiEditorEntityContextBus.h b/Gems/LyShine/Code/Editor/UiEditorEntityContextBus.h
index 0ef8d12090..7755cc5c9d 100644
--- a/Gems/LyShine/Code/Editor/UiEditorEntityContextBus.h
+++ b/Gems/LyShine/Code/Editor/UiEditorEntityContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UiEditorInternalBus.h b/Gems/LyShine/Code/Editor/UiEditorInternalBus.h
index a48f3a856a..75b271cad8 100644
--- a/Gems/LyShine/Code/Editor/UiEditorInternalBus.h
+++ b/Gems/LyShine/Code/Editor/UiEditorInternalBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UiSliceManager.cpp b/Gems/LyShine/Code/Editor/UiSliceManager.cpp
index f10fc19564..baacc0b5f4 100644
--- a/Gems/LyShine/Code/Editor/UiSliceManager.cpp
+++ b/Gems/LyShine/Code/Editor/UiSliceManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UiSliceManager.h b/Gems/LyShine/Code/Editor/UiSliceManager.h
index 402f8f8e55..48a47c83ee 100644
--- a/Gems/LyShine/Code/Editor/UiSliceManager.h
+++ b/Gems/LyShine/Code/Editor/UiSliceManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UndoStack.cpp b/Gems/LyShine/Code/Editor/UndoStack.cpp
index 7ce28848f6..94279944b7 100644
--- a/Gems/LyShine/Code/Editor/UndoStack.cpp
+++ b/Gems/LyShine/Code/Editor/UndoStack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UndoStack.h b/Gems/LyShine/Code/Editor/UndoStack.h
index 7c2b19249e..c627842225 100644
--- a/Gems/LyShine/Code/Editor/UndoStack.h
+++ b/Gems/LyShine/Code/Editor/UndoStack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UndoStackExecutionScope.cpp b/Gems/LyShine/Code/Editor/UndoStackExecutionScope.cpp
index 0bc5271923..ed45890d5c 100644
--- a/Gems/LyShine/Code/Editor/UndoStackExecutionScope.cpp
+++ b/Gems/LyShine/Code/Editor/UndoStackExecutionScope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/UndoStackExecutionScope.h b/Gems/LyShine/Code/Editor/UndoStackExecutionScope.h
index 7299842d17..a255e7d7d4 100644
--- a/Gems/LyShine/Code/Editor/UndoStackExecutionScope.h
+++ b/Gems/LyShine/Code/Editor/UndoStackExecutionScope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.cpp
index 392fcf98f7..052c8b9bea 100644
--- a/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.h b/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.h
index 27b69ce5f5..5a9691e373 100644
--- a/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.h
+++ b/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportAlign.cpp b/Gems/LyShine/Code/Editor/ViewportAlign.cpp
index 530bd5211f..dc74afce86 100644
--- a/Gems/LyShine/Code/Editor/ViewportAlign.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportAlign.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportAlign.h b/Gems/LyShine/Code/Editor/ViewportAlign.h
index c603ad8fc1..d24cf673de 100644
--- a/Gems/LyShine/Code/Editor/ViewportAlign.h
+++ b/Gems/LyShine/Code/Editor/ViewportAlign.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportAnchor.cpp b/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
index 4243eafd30..ed5a584ab3 100644
--- a/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportAnchor.h b/Gems/LyShine/Code/Editor/ViewportAnchor.h
index 42892ffcd5..6a9961f984 100644
--- a/Gems/LyShine/Code/Editor/ViewportAnchor.h
+++ b/Gems/LyShine/Code/Editor/ViewportAnchor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp b/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
index c6dc0e0ed8..00d4aa38ad 100644
--- a/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportCanvasBackground.h b/Gems/LyShine/Code/Editor/ViewportCanvasBackground.h
index 20744b5427..ba5fbcd05a 100644
--- a/Gems/LyShine/Code/Editor/ViewportCanvasBackground.h
+++ b/Gems/LyShine/Code/Editor/ViewportCanvasBackground.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportDragInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportDragInteraction.cpp
index f255784973..c8c3f42f05 100644
--- a/Gems/LyShine/Code/Editor/ViewportDragInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportDragInteraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportDragInteraction.h b/Gems/LyShine/Code/Editor/ViewportDragInteraction.h
index 0fe83cb4f2..a2a5c1301a 100644
--- a/Gems/LyShine/Code/Editor/ViewportDragInteraction.h
+++ b/Gems/LyShine/Code/Editor/ViewportDragInteraction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportElement.cpp b/Gems/LyShine/Code/Editor/ViewportElement.cpp
index dad5eb4113..7eb1a54309 100644
--- a/Gems/LyShine/Code/Editor/ViewportElement.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportElement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportElement.h b/Gems/LyShine/Code/Editor/ViewportElement.h
index 5d8e48862f..656ab1a893 100644
--- a/Gems/LyShine/Code/Editor/ViewportElement.h
+++ b/Gems/LyShine/Code/Editor/ViewportElement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportHelpers.cpp b/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
index 1e8606e873..a5a470ecee 100644
--- a/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportHelpers.h b/Gems/LyShine/Code/Editor/ViewportHelpers.h
index 50ae303894..69aaf1c63b 100644
--- a/Gems/LyShine/Code/Editor/ViewportHelpers.h
+++ b/Gems/LyShine/Code/Editor/ViewportHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportHighlight.cpp b/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
index c345113cff..274105e1d7 100644
--- a/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportHighlight.h b/Gems/LyShine/Code/Editor/ViewportHighlight.h
index 2a74cae014..1b884e94b7 100644
--- a/Gems/LyShine/Code/Editor/ViewportHighlight.h
+++ b/Gems/LyShine/Code/Editor/ViewportHighlight.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportIcon.cpp b/Gems/LyShine/Code/Editor/ViewportIcon.cpp
index df524995c8..71fa8673ec 100644
--- a/Gems/LyShine/Code/Editor/ViewportIcon.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportIcon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportIcon.h b/Gems/LyShine/Code/Editor/ViewportIcon.h
index a79c9ca31d..03b3c27938 100644
--- a/Gems/LyShine/Code/Editor/ViewportIcon.h
+++ b/Gems/LyShine/Code/Editor/ViewportIcon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
index c38147ad55..58e324eef3 100644
--- a/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportInteraction.h b/Gems/LyShine/Code/Editor/ViewportInteraction.h
index e7603c7427..0971e13029 100644
--- a/Gems/LyShine/Code/Editor/ViewportInteraction.h
+++ b/Gems/LyShine/Code/Editor/ViewportInteraction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.cpp
index 4900c58572..bb99c33e8b 100644
--- a/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.h b/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.h
index 9799b169f5..9d00e31b3f 100644
--- a/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.h
+++ b/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportMoveInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportMoveInteraction.cpp
index 5637b572f0..bcfa4c9fc8 100644
--- a/Gems/LyShine/Code/Editor/ViewportMoveInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportMoveInteraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportMoveInteraction.h b/Gems/LyShine/Code/Editor/ViewportMoveInteraction.h
index f3317d8f96..d008999e91 100644
--- a/Gems/LyShine/Code/Editor/ViewportMoveInteraction.h
+++ b/Gems/LyShine/Code/Editor/ViewportMoveInteraction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportNudge.cpp b/Gems/LyShine/Code/Editor/ViewportNudge.cpp
index 487d3de00d..6ae0d9b50e 100644
--- a/Gems/LyShine/Code/Editor/ViewportNudge.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportNudge.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportNudge.h b/Gems/LyShine/Code/Editor/ViewportNudge.h
index 5a8e8c2424..cbd7b945ed 100644
--- a/Gems/LyShine/Code/Editor/ViewportNudge.h
+++ b/Gems/LyShine/Code/Editor/ViewportNudge.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportPivot.cpp b/Gems/LyShine/Code/Editor/ViewportPivot.cpp
index 2008b77536..92c22d3db4 100644
--- a/Gems/LyShine/Code/Editor/ViewportPivot.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportPivot.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportPivot.h b/Gems/LyShine/Code/Editor/ViewportPivot.h
index 4115096e9d..741ea1e96a 100644
--- a/Gems/LyShine/Code/Editor/ViewportPivot.h
+++ b/Gems/LyShine/Code/Editor/ViewportPivot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportSnap.cpp b/Gems/LyShine/Code/Editor/ViewportSnap.cpp
index 66e1d65a89..d6040cdb36 100644
--- a/Gems/LyShine/Code/Editor/ViewportSnap.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportSnap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportSnap.h b/Gems/LyShine/Code/Editor/ViewportSnap.h
index 446a9a82cd..272b991490 100644
--- a/Gems/LyShine/Code/Editor/ViewportSnap.h
+++ b/Gems/LyShine/Code/Editor/ViewportSnap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportWidget.cpp b/Gems/LyShine/Code/Editor/ViewportWidget.cpp
index ae874d14fe..fd1374f31a 100644
--- a/Gems/LyShine/Code/Editor/ViewportWidget.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Editor/ViewportWidget.h b/Gems/LyShine/Code/Editor/ViewportWidget.h
index f9ec72bafc..9c2927ad96 100644
--- a/Gems/LyShine/Code/Editor/ViewportWidget.h
+++ b/Gems/LyShine/Code/Editor/ViewportWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Include/LyShine/Draw2d.h b/Gems/LyShine/Code/Include/LyShine/Draw2d.h
index a250f1a7a2..6ec56842bd 100644
--- a/Gems/LyShine/Code/Include/LyShine/Draw2d.h
+++ b/Gems/LyShine/Code/Include/LyShine/Draw2d.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Include/LyShine/LyShineBus.h b/Gems/LyShine/Code/Include/LyShine/LyShineBus.h
index 2645bb86df..2631589968 100644
--- a/Gems/LyShine/Code/Include/LyShine/LyShineBus.h
+++ b/Gems/LyShine/Code/Include/LyShine/LyShineBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.cpp b/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.cpp
index 916a30a9df..0258f2b423 100644
--- a/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.cpp
+++ b/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.h b/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.h
index c7ee86f945..35944f5982 100644
--- a/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.h
+++ b/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.cpp b/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.cpp
index b782f1eb3d..f98ae0b489 100644
--- a/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.cpp
+++ b/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.h b/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.h
index c257be20e7..506ad3ce88 100644
--- a/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.h
+++ b/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/2DSpline.h b/Gems/LyShine/Code/Source/Animation/2DSpline.h
index 1c943aab70..b722a31886 100644
--- a/Gems/LyShine/Code/Source/Animation/2DSpline.h
+++ b/Gems/LyShine/Code/Source/Animation/2DSpline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimNode.cpp b/Gems/LyShine/Code/Source/Animation/AnimNode.cpp
index 363206c0cd..b2c1142ef7 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimNode.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AnimNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimNode.h b/Gems/LyShine/Code/Source/Animation/AnimNode.h
index d087df6b9e..75da2b21ea 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimNode.h
+++ b/Gems/LyShine/Code/Source/Animation/AnimNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimSequence.cpp b/Gems/LyShine/Code/Source/Animation/AnimSequence.cpp
index 85fe848a31..9732e1729f 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimSequence.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AnimSequence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimSequence.h b/Gems/LyShine/Code/Source/Animation/AnimSequence.h
index 465a3a9886..9ab2313944 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimSequence.h
+++ b/Gems/LyShine/Code/Source/Animation/AnimSequence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.cpp b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.cpp
index 845a8fac71..b187198022 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h
index 58fe3dab4e..1b3bcc7122 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h
+++ b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimSplineTrack_Vec2Specialization.h b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack_Vec2Specialization.h
index 328cd85b80..4e44126710 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimSplineTrack_Vec2Specialization.h
+++ b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack_Vec2Specialization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimTrack.cpp b/Gems/LyShine/Code/Source/Animation/AnimTrack.cpp
index ecf9573390..e9e2e77524 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AnimTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AnimTrack.h b/Gems/LyShine/Code/Source/Animation/AnimTrack.h
index ae761595f0..356b724102 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimTrack.h
+++ b/Gems/LyShine/Code/Source/Animation/AnimTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp b/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
index 98bb0671b9..7e544545bc 100644
--- a/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/AzEntityNode.h b/Gems/LyShine/Code/Source/Animation/AzEntityNode.h
index ac85433823..e00d757b27 100644
--- a/Gems/LyShine/Code/Source/Animation/AzEntityNode.h
+++ b/Gems/LyShine/Code/Source/Animation/AzEntityNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/BoolTrack.cpp b/Gems/LyShine/Code/Source/Animation/BoolTrack.cpp
index 8a9d17cffd..cb748c5e7e 100644
--- a/Gems/LyShine/Code/Source/Animation/BoolTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/BoolTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/BoolTrack.h b/Gems/LyShine/Code/Source/Animation/BoolTrack.h
index c27f2fd6dc..fdfc679ee0 100644
--- a/Gems/LyShine/Code/Source/Animation/BoolTrack.h
+++ b/Gems/LyShine/Code/Source/Animation/BoolTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.cpp b/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.cpp
index e7667bcfcb..1beb1170d0 100644
--- a/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.h b/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.h
index bd071ffa04..74f36addd6 100644
--- a/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.h
+++ b/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/EventNode.cpp b/Gems/LyShine/Code/Source/Animation/EventNode.cpp
index bf3ff57e96..d0e49bceea 100644
--- a/Gems/LyShine/Code/Source/Animation/EventNode.cpp
+++ b/Gems/LyShine/Code/Source/Animation/EventNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/EventNode.h b/Gems/LyShine/Code/Source/Animation/EventNode.h
index 59ef467c47..0128f078b5 100644
--- a/Gems/LyShine/Code/Source/Animation/EventNode.h
+++ b/Gems/LyShine/Code/Source/Animation/EventNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h b/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
index 440cc7b0ab..afd07aab98 100644
--- a/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
+++ b/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/TrackEventTrack.cpp b/Gems/LyShine/Code/Source/Animation/TrackEventTrack.cpp
index 94871a68a5..154532868e 100644
--- a/Gems/LyShine/Code/Source/Animation/TrackEventTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/TrackEventTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/TrackEventTrack.h b/Gems/LyShine/Code/Source/Animation/TrackEventTrack.h
index 988c413816..912344d5e0 100644
--- a/Gems/LyShine/Code/Source/Animation/TrackEventTrack.h
+++ b/Gems/LyShine/Code/Source/Animation/TrackEventTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.cpp b/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.cpp
index eef39778c0..8148ff9f3a 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.cpp
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.h b/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.h
index 71e62fde0f..eb604a441b 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.h
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
index e14cf34011..527977ea44 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.h b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.h
index 4b93715c71..acf4fd10a1 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.h
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Draw2d.cpp b/Gems/LyShine/Code/Source/Draw2d.cpp
index 646a6ec877..a836395752 100644
--- a/Gems/LyShine/Code/Source/Draw2d.cpp
+++ b/Gems/LyShine/Code/Source/Draw2d.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/EditorPropertyTypes.cpp b/Gems/LyShine/Code/Source/EditorPropertyTypes.cpp
index 31e7fe8027..967e048947 100644
--- a/Gems/LyShine/Code/Source/EditorPropertyTypes.cpp
+++ b/Gems/LyShine/Code/Source/EditorPropertyTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/EditorPropertyTypes.h b/Gems/LyShine/Code/Source/EditorPropertyTypes.h
index ca26a7fa11..c93475431d 100644
--- a/Gems/LyShine/Code/Source/EditorPropertyTypes.h
+++ b/Gems/LyShine/Code/Source/EditorPropertyTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShine.cpp b/Gems/LyShine/Code/Source/LyShine.cpp
index d5454cef01..9d22b75c86 100644
--- a/Gems/LyShine/Code/Source/LyShine.cpp
+++ b/Gems/LyShine/Code/Source/LyShine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShine.h b/Gems/LyShine/Code/Source/LyShine.h
index e74358717a..a5d1597e53 100644
--- a/Gems/LyShine/Code/Source/LyShine.h
+++ b/Gems/LyShine/Code/Source/LyShine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShineDebug.cpp b/Gems/LyShine/Code/Source/LyShineDebug.cpp
index d4b675232b..f28ea89fea 100644
--- a/Gems/LyShine/Code/Source/LyShineDebug.cpp
+++ b/Gems/LyShine/Code/Source/LyShineDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShineDebug.h b/Gems/LyShine/Code/Source/LyShineDebug.h
index b7e4eb38f3..b0ee910ae0 100644
--- a/Gems/LyShine/Code/Source/LyShineDebug.h
+++ b/Gems/LyShine/Code/Source/LyShineDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp b/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
index a2d832afa0..82002fd131 100644
--- a/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
+++ b/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShineLoadScreen.h b/Gems/LyShine/Code/Source/LyShineLoadScreen.h
index d32617e401..d9fe5a350e 100644
--- a/Gems/LyShine/Code/Source/LyShineLoadScreen.h
+++ b/Gems/LyShine/Code/Source/LyShineLoadScreen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShineModule.cpp b/Gems/LyShine/Code/Source/LyShineModule.cpp
index 3aaf3ad078..011bb9f203 100644
--- a/Gems/LyShine/Code/Source/LyShineModule.cpp
+++ b/Gems/LyShine/Code/Source/LyShineModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShineModule.h b/Gems/LyShine/Code/Source/LyShineModule.h
index 54a974afef..67c1a6f749 100644
--- a/Gems/LyShine/Code/Source/LyShineModule.h
+++ b/Gems/LyShine/Code/Source/LyShineModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp b/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp
index ff23f21945..26e2adf0b3 100644
--- a/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp
+++ b/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShineSystemComponent.h b/Gems/LyShine/Code/Source/LyShineSystemComponent.h
index 50a8ee5aba..5b455715ee 100644
--- a/Gems/LyShine/Code/Source/LyShineSystemComponent.h
+++ b/Gems/LyShine/Code/Source/LyShineSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/LyShine_precompiled.h b/Gems/LyShine/Code/Source/LyShine_precompiled.h
index ed4e75a0f9..9b46d2024b 100644
--- a/Gems/LyShine/Code/Source/LyShine_precompiled.h
+++ b/Gems/LyShine/Code/Source/LyShine_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Particle/UiParticle.cpp b/Gems/LyShine/Code/Source/Particle/UiParticle.cpp
index 18458cf1fc..ca28e60484 100644
--- a/Gems/LyShine/Code/Source/Particle/UiParticle.cpp
+++ b/Gems/LyShine/Code/Source/Particle/UiParticle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Particle/UiParticle.h b/Gems/LyShine/Code/Source/Particle/UiParticle.h
index 8c1e8cc99f..2fd189a1e7 100644
--- a/Gems/LyShine/Code/Source/Particle/UiParticle.h
+++ b/Gems/LyShine/Code/Source/Particle/UiParticle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/LyShine/Code/Source/Platform/Android/platform_android_files.cmake
index b815165c3f..35e174ed09 100644
--- a/Gems/LyShine/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/LyShine/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Source/Platform/Common/Unimplemented/UiClipboard_Unimplemented.cpp b/Gems/LyShine/Code/Source/Platform/Common/Unimplemented/UiClipboard_Unimplemented.cpp
index 2f239bf87c..1493f1c1fe 100644
--- a/Gems/LyShine/Code/Source/Platform/Common/Unimplemented/UiClipboard_Unimplemented.cpp
+++ b/Gems/LyShine/Code/Source/Platform/Common/Unimplemented/UiClipboard_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/LyShine/Code/Source/Platform/Linux/platform_linux_files.cmake
index b815165c3f..35e174ed09 100644
--- a/Gems/LyShine/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/LyShine/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/LyShine/Code/Source/Platform/Mac/platform_mac_files.cmake
index b815165c3f..35e174ed09 100644
--- a/Gems/LyShine/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/LyShine/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Source/Platform/Windows/UiClipboard_Windows.cpp b/Gems/LyShine/Code/Source/Platform/Windows/UiClipboard_Windows.cpp
index 312d69ca55..dee73abc6d 100644
--- a/Gems/LyShine/Code/Source/Platform/Windows/UiClipboard_Windows.cpp
+++ b/Gems/LyShine/Code/Source/Platform/Windows/UiClipboard_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/LyShine/Code/Source/Platform/Windows/platform_windows_files.cmake
index 25d08ace77..6119a6d7c8 100644
--- a/Gems/LyShine/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/LyShine/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/LyShine/Code/Source/Platform/iOS/platform_ios_files.cmake
index b815165c3f..35e174ed09 100644
--- a/Gems/LyShine/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/LyShine/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/Source/RenderGraph.cpp b/Gems/LyShine/Code/Source/RenderGraph.cpp
index da7392efc3..5b33e59fdf 100644
--- a/Gems/LyShine/Code/Source/RenderGraph.cpp
+++ b/Gems/LyShine/Code/Source/RenderGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/RenderGraph.h b/Gems/LyShine/Code/Source/RenderGraph.h
index 2b3243964a..d29473168e 100644
--- a/Gems/LyShine/Code/Source/RenderGraph.h
+++ b/Gems/LyShine/Code/Source/RenderGraph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.cpp b/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.cpp
index c3b10ff883..a4f6348f9e 100644
--- a/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.cpp
+++ b/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.h b/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.h
index 25344043c0..17cd201a85 100644
--- a/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.h
+++ b/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.cpp b/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.cpp
index 86d2011082..6ff67725eb 100644
--- a/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.cpp
+++ b/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.h b/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.h
index fafae5ae7e..cf38c83424 100644
--- a/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.h
+++ b/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Script/UiElementLuaBus.cpp b/Gems/LyShine/Code/Source/Script/UiElementLuaBus.cpp
index d731a6e019..ece750b5bf 100644
--- a/Gems/LyShine/Code/Source/Script/UiElementLuaBus.cpp
+++ b/Gems/LyShine/Code/Source/Script/UiElementLuaBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Script/UiElementLuaBus.h b/Gems/LyShine/Code/Source/Script/UiElementLuaBus.h
index ac646ff45f..2b3848b855 100644
--- a/Gems/LyShine/Code/Source/Script/UiElementLuaBus.h
+++ b/Gems/LyShine/Code/Source/Script/UiElementLuaBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Sprite.cpp b/Gems/LyShine/Code/Source/Sprite.cpp
index 5cb2675ae9..e2a20b00e3 100644
--- a/Gems/LyShine/Code/Source/Sprite.cpp
+++ b/Gems/LyShine/Code/Source/Sprite.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Sprite.h b/Gems/LyShine/Code/Source/Sprite.h
index f87109899b..cac7582961 100644
--- a/Gems/LyShine/Code/Source/Sprite.h
+++ b/Gems/LyShine/Code/Source/Sprite.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/StringUtfUtils.h b/Gems/LyShine/Code/Source/StringUtfUtils.h
index a4030585b5..90aff0d42b 100644
--- a/Gems/LyShine/Code/Source/StringUtfUtils.h
+++ b/Gems/LyShine/Code/Source/StringUtfUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Tests/internal/test_TextMarkup.cpp b/Gems/LyShine/Code/Source/Tests/internal/test_TextMarkup.cpp
index e195624228..c4c9b2b196 100644
--- a/Gems/LyShine/Code/Source/Tests/internal/test_TextMarkup.cpp
+++ b/Gems/LyShine/Code/Source/Tests/internal/test_TextMarkup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Tests/internal/test_UiMarkupButtonComponent.cpp b/Gems/LyShine/Code/Source/Tests/internal/test_UiMarkupButtonComponent.cpp
index c403f645fa..6a71657499 100644
--- a/Gems/LyShine/Code/Source/Tests/internal/test_UiMarkupButtonComponent.cpp
+++ b/Gems/LyShine/Code/Source/Tests/internal/test_UiMarkupButtonComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp b/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp
index bee8fb8f56..4ca68812d1 100644
--- a/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp
+++ b/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Tests/internal/test_UiTransform2dComponent.cpp b/Gems/LyShine/Code/Source/Tests/internal/test_UiTransform2dComponent.cpp
index 37e4fc4be1..6e8cb09a18 100644
--- a/Gems/LyShine/Code/Source/Tests/internal/test_UiTransform2dComponent.cpp
+++ b/Gems/LyShine/Code/Source/Tests/internal/test_UiTransform2dComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/Tests/test_Main.cpp b/Gems/LyShine/Code/Source/Tests/test_Main.cpp
index ce4394eec1..48f0065ba9 100644
--- a/Gems/LyShine/Code/Source/Tests/test_Main.cpp
+++ b/Gems/LyShine/Code/Source/Tests/test_Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/TextMarkup.cpp b/Gems/LyShine/Code/Source/TextMarkup.cpp
index d026aed8b7..d2409a5f4e 100644
--- a/Gems/LyShine/Code/Source/TextMarkup.cpp
+++ b/Gems/LyShine/Code/Source/TextMarkup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/TextMarkup.h b/Gems/LyShine/Code/Source/TextMarkup.h
index 01bf85f2d9..1119a6ba34 100644
--- a/Gems/LyShine/Code/Source/TextMarkup.h
+++ b/Gems/LyShine/Code/Source/TextMarkup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiButtonComponent.cpp b/Gems/LyShine/Code/Source/UiButtonComponent.cpp
index 3b0ea099ec..75726da57f 100644
--- a/Gems/LyShine/Code/Source/UiButtonComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiButtonComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiButtonComponent.h b/Gems/LyShine/Code/Source/UiButtonComponent.h
index dfdcce2d2e..a585cb344e 100644
--- a/Gems/LyShine/Code/Source/UiButtonComponent.h
+++ b/Gems/LyShine/Code/Source/UiButtonComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiCanvasComponent.cpp b/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
index 0b3078ae56..b678089cb4 100644
--- a/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiCanvasComponent.h b/Gems/LyShine/Code/Source/UiCanvasComponent.h
index 2c754b8dfe..df904684ec 100644
--- a/Gems/LyShine/Code/Source/UiCanvasComponent.h
+++ b/Gems/LyShine/Code/Source/UiCanvasComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp b/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
index 61dfec0cfb..993d29c1ae 100644
--- a/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiCanvasFileObject.h b/Gems/LyShine/Code/Source/UiCanvasFileObject.h
index 4403529c22..626d5029ec 100644
--- a/Gems/LyShine/Code/Source/UiCanvasFileObject.h
+++ b/Gems/LyShine/Code/Source/UiCanvasFileObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiCanvasManager.cpp b/Gems/LyShine/Code/Source/UiCanvasManager.cpp
index 9c71120178..1b5cf2ebe7 100644
--- a/Gems/LyShine/Code/Source/UiCanvasManager.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiCanvasManager.h b/Gems/LyShine/Code/Source/UiCanvasManager.h
index bf800097a2..80a715474e 100644
--- a/Gems/LyShine/Code/Source/UiCanvasManager.h
+++ b/Gems/LyShine/Code/Source/UiCanvasManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiCheckboxComponent.cpp b/Gems/LyShine/Code/Source/UiCheckboxComponent.cpp
index 4ed786f0cf..cf0ed939ed 100644
--- a/Gems/LyShine/Code/Source/UiCheckboxComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiCheckboxComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiCheckboxComponent.h b/Gems/LyShine/Code/Source/UiCheckboxComponent.h
index 39a2cfdc2a..7ba10cc2bc 100644
--- a/Gems/LyShine/Code/Source/UiCheckboxComponent.h
+++ b/Gems/LyShine/Code/Source/UiCheckboxComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiClipboard.h b/Gems/LyShine/Code/Source/UiClipboard.h
index 4d02409aef..91de4e8555 100644
--- a/Gems/LyShine/Code/Source/UiClipboard.h
+++ b/Gems/LyShine/Code/Source/UiClipboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDraggableComponent.cpp b/Gems/LyShine/Code/Source/UiDraggableComponent.cpp
index 72e058eb5d..55ddcf93e4 100644
--- a/Gems/LyShine/Code/Source/UiDraggableComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDraggableComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDraggableComponent.h b/Gems/LyShine/Code/Source/UiDraggableComponent.h
index e5ee5d3482..67995553d7 100644
--- a/Gems/LyShine/Code/Source/UiDraggableComponent.h
+++ b/Gems/LyShine/Code/Source/UiDraggableComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDropTargetComponent.cpp b/Gems/LyShine/Code/Source/UiDropTargetComponent.cpp
index 033e43c246..4110bb8aee 100644
--- a/Gems/LyShine/Code/Source/UiDropTargetComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDropTargetComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDropTargetComponent.h b/Gems/LyShine/Code/Source/UiDropTargetComponent.h
index c4c8d744c1..f8a9b51b45 100644
--- a/Gems/LyShine/Code/Source/UiDropTargetComponent.h
+++ b/Gems/LyShine/Code/Source/UiDropTargetComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDropdownComponent.cpp b/Gems/LyShine/Code/Source/UiDropdownComponent.cpp
index 767c7dbf05..fb7885fd52 100644
--- a/Gems/LyShine/Code/Source/UiDropdownComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDropdownComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDropdownComponent.h b/Gems/LyShine/Code/Source/UiDropdownComponent.h
index 28d087a11a..7b15b724b5 100644
--- a/Gems/LyShine/Code/Source/UiDropdownComponent.h
+++ b/Gems/LyShine/Code/Source/UiDropdownComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDropdownOptionComponent.cpp b/Gems/LyShine/Code/Source/UiDropdownOptionComponent.cpp
index 5be36cf5f2..76ef210b4d 100644
--- a/Gems/LyShine/Code/Source/UiDropdownOptionComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDropdownOptionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDropdownOptionComponent.h b/Gems/LyShine/Code/Source/UiDropdownOptionComponent.h
index 5633dbc0d3..27528da090 100644
--- a/Gems/LyShine/Code/Source/UiDropdownOptionComponent.h
+++ b/Gems/LyShine/Code/Source/UiDropdownOptionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.cpp b/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.cpp
index f8bec2b642..d03842f9f0 100644
--- a/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.h b/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.h
index b56a126606..0841571b88 100644
--- a/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.h
+++ b/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp b/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp
index 76301050b0..9e2f749aa2 100644
--- a/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.h b/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.h
index 3354871994..50b7f7e87f 100644
--- a/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.h
+++ b/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiElementComponent.cpp b/Gems/LyShine/Code/Source/UiElementComponent.cpp
index 9101da0198..d335da2340 100644
--- a/Gems/LyShine/Code/Source/UiElementComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiElementComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiElementComponent.h b/Gems/LyShine/Code/Source/UiElementComponent.h
index 96eb471bba..367fca7049 100644
--- a/Gems/LyShine/Code/Source/UiElementComponent.h
+++ b/Gems/LyShine/Code/Source/UiElementComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiEntityContext.cpp b/Gems/LyShine/Code/Source/UiEntityContext.cpp
index c69b3bf248..257ea21692 100644
--- a/Gems/LyShine/Code/Source/UiEntityContext.cpp
+++ b/Gems/LyShine/Code/Source/UiEntityContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiFaderComponent.cpp b/Gems/LyShine/Code/Source/UiFaderComponent.cpp
index 6fbfce9ffc..9f5ca82a9c 100644
--- a/Gems/LyShine/Code/Source/UiFaderComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiFaderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiFaderComponent.h b/Gems/LyShine/Code/Source/UiFaderComponent.h
index b248cec8a7..6b74b3ce39 100644
--- a/Gems/LyShine/Code/Source/UiFaderComponent.h
+++ b/Gems/LyShine/Code/Source/UiFaderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
index 72b4219752..0444595c90 100644
--- a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.h b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.h
index 064760f791..939d59a672 100644
--- a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.h
+++ b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiGameEntityContext.cpp b/Gems/LyShine/Code/Source/UiGameEntityContext.cpp
index f90601276a..82fcf31c4c 100644
--- a/Gems/LyShine/Code/Source/UiGameEntityContext.cpp
+++ b/Gems/LyShine/Code/Source/UiGameEntityContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiGameEntityContext.h b/Gems/LyShine/Code/Source/UiGameEntityContext.h
index d7d1f149e3..9c99516ba8 100644
--- a/Gems/LyShine/Code/Source/UiGameEntityContext.h
+++ b/Gems/LyShine/Code/Source/UiGameEntityContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiImageComponent.cpp b/Gems/LyShine/Code/Source/UiImageComponent.cpp
index 133e0d3ae0..90a57e1108 100644
--- a/Gems/LyShine/Code/Source/UiImageComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiImageComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiImageComponent.h b/Gems/LyShine/Code/Source/UiImageComponent.h
index cd547541c4..0fb371e6c2 100644
--- a/Gems/LyShine/Code/Source/UiImageComponent.h
+++ b/Gems/LyShine/Code/Source/UiImageComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiImageSequenceComponent.cpp b/Gems/LyShine/Code/Source/UiImageSequenceComponent.cpp
index 294c403167..87859ae4c9 100644
--- a/Gems/LyShine/Code/Source/UiImageSequenceComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiImageSequenceComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiImageSequenceComponent.h b/Gems/LyShine/Code/Source/UiImageSequenceComponent.h
index b32c964e7b..b7d4c16673 100644
--- a/Gems/LyShine/Code/Source/UiImageSequenceComponent.h
+++ b/Gems/LyShine/Code/Source/UiImageSequenceComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiInteractableComponent.cpp b/Gems/LyShine/Code/Source/UiInteractableComponent.cpp
index 057654e868..0be1e5966c 100644
--- a/Gems/LyShine/Code/Source/UiInteractableComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiInteractableComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiInteractableComponent.h b/Gems/LyShine/Code/Source/UiInteractableComponent.h
index e659bb431c..dfe5c2c8f2 100644
--- a/Gems/LyShine/Code/Source/UiInteractableComponent.h
+++ b/Gems/LyShine/Code/Source/UiInteractableComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiInteractableState.cpp b/Gems/LyShine/Code/Source/UiInteractableState.cpp
index 28486deb48..0d6334c108 100644
--- a/Gems/LyShine/Code/Source/UiInteractableState.cpp
+++ b/Gems/LyShine/Code/Source/UiInteractableState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiInteractableState.h b/Gems/LyShine/Code/Source/UiInteractableState.h
index ddf74f4ee1..6e39cc2ef1 100644
--- a/Gems/LyShine/Code/Source/UiInteractableState.h
+++ b/Gems/LyShine/Code/Source/UiInteractableState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutCellComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutCellComponent.cpp
index 2ffcedc321..38636abdb2 100644
--- a/Gems/LyShine/Code/Source/UiLayoutCellComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutCellComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutCellComponent.h b/Gems/LyShine/Code/Source/UiLayoutCellComponent.h
index ee64c77d87..560991035a 100644
--- a/Gems/LyShine/Code/Source/UiLayoutCellComponent.h
+++ b/Gems/LyShine/Code/Source/UiLayoutCellComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutColumnComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutColumnComponent.cpp
index 1f240410fc..b999adb3c1 100644
--- a/Gems/LyShine/Code/Source/UiLayoutColumnComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutColumnComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutColumnComponent.h b/Gems/LyShine/Code/Source/UiLayoutColumnComponent.h
index 77570b89f0..eb3a45eec1 100644
--- a/Gems/LyShine/Code/Source/UiLayoutColumnComponent.h
+++ b/Gems/LyShine/Code/Source/UiLayoutColumnComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutFitterComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutFitterComponent.cpp
index 229124dbd4..bf05d172c0 100644
--- a/Gems/LyShine/Code/Source/UiLayoutFitterComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutFitterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutFitterComponent.h b/Gems/LyShine/Code/Source/UiLayoutFitterComponent.h
index 32028467b1..767805ac6a 100644
--- a/Gems/LyShine/Code/Source/UiLayoutFitterComponent.h
+++ b/Gems/LyShine/Code/Source/UiLayoutFitterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutGridComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutGridComponent.cpp
index 5335a9d5b1..155c78b417 100644
--- a/Gems/LyShine/Code/Source/UiLayoutGridComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutGridComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutGridComponent.h b/Gems/LyShine/Code/Source/UiLayoutGridComponent.h
index 7e97ae4be2..fe8bb18ed0 100644
--- a/Gems/LyShine/Code/Source/UiLayoutGridComponent.h
+++ b/Gems/LyShine/Code/Source/UiLayoutGridComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutHelpers.cpp b/Gems/LyShine/Code/Source/UiLayoutHelpers.cpp
index e6cb0a2131..cbe94674bb 100644
--- a/Gems/LyShine/Code/Source/UiLayoutHelpers.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutHelpers.h b/Gems/LyShine/Code/Source/UiLayoutHelpers.h
index a4fb471f82..de6afab132 100644
--- a/Gems/LyShine/Code/Source/UiLayoutHelpers.h
+++ b/Gems/LyShine/Code/Source/UiLayoutHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutManager.cpp b/Gems/LyShine/Code/Source/UiLayoutManager.cpp
index 3814150743..d7f31b3b4f 100644
--- a/Gems/LyShine/Code/Source/UiLayoutManager.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutManager.h b/Gems/LyShine/Code/Source/UiLayoutManager.h
index 9a04671e9d..a72a7ea865 100644
--- a/Gems/LyShine/Code/Source/UiLayoutManager.h
+++ b/Gems/LyShine/Code/Source/UiLayoutManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutRowComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutRowComponent.cpp
index 9fde3538a9..01deeff75f 100644
--- a/Gems/LyShine/Code/Source/UiLayoutRowComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutRowComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiLayoutRowComponent.h b/Gems/LyShine/Code/Source/UiLayoutRowComponent.h
index af44f1bc17..908b6d6360 100644
--- a/Gems/LyShine/Code/Source/UiLayoutRowComponent.h
+++ b/Gems/LyShine/Code/Source/UiLayoutRowComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiMarkupButtonComponent.cpp b/Gems/LyShine/Code/Source/UiMarkupButtonComponent.cpp
index d8d6230485..2df04e2fec 100644
--- a/Gems/LyShine/Code/Source/UiMarkupButtonComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiMarkupButtonComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiMarkupButtonComponent.h b/Gems/LyShine/Code/Source/UiMarkupButtonComponent.h
index 0d4325ea86..23fc8fcc8e 100644
--- a/Gems/LyShine/Code/Source/UiMarkupButtonComponent.h
+++ b/Gems/LyShine/Code/Source/UiMarkupButtonComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiMaskComponent.cpp b/Gems/LyShine/Code/Source/UiMaskComponent.cpp
index afcfdaa695..80a8054e89 100644
--- a/Gems/LyShine/Code/Source/UiMaskComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiMaskComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiMaskComponent.h b/Gems/LyShine/Code/Source/UiMaskComponent.h
index 59402db5fe..bfa2d7b92f 100644
--- a/Gems/LyShine/Code/Source/UiMaskComponent.h
+++ b/Gems/LyShine/Code/Source/UiMaskComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiNavigationHelpers.cpp b/Gems/LyShine/Code/Source/UiNavigationHelpers.cpp
index 2c4327c354..d25b5a2fb1 100644
--- a/Gems/LyShine/Code/Source/UiNavigationHelpers.cpp
+++ b/Gems/LyShine/Code/Source/UiNavigationHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiNavigationHelpers.h b/Gems/LyShine/Code/Source/UiNavigationHelpers.h
index 991be8e601..231ead6fd1 100644
--- a/Gems/LyShine/Code/Source/UiNavigationHelpers.h
+++ b/Gems/LyShine/Code/Source/UiNavigationHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiNavigationSettings.cpp b/Gems/LyShine/Code/Source/UiNavigationSettings.cpp
index 76f8584718..ff50a70c9d 100644
--- a/Gems/LyShine/Code/Source/UiNavigationSettings.cpp
+++ b/Gems/LyShine/Code/Source/UiNavigationSettings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiNavigationSettings.h b/Gems/LyShine/Code/Source/UiNavigationSettings.h
index ecd008b7a3..a9ce84a53b 100644
--- a/Gems/LyShine/Code/Source/UiNavigationSettings.h
+++ b/Gems/LyShine/Code/Source/UiNavigationSettings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
index d8c9c81bf9..391b110314 100644
--- a/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiParticleEmitterComponent.h b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.h
index 4e07049821..a6018f7dc5 100644
--- a/Gems/LyShine/Code/Source/UiParticleEmitterComponent.h
+++ b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiRadioButtonComponent.cpp b/Gems/LyShine/Code/Source/UiRadioButtonComponent.cpp
index 0558150dc0..c0bb3557f9 100644
--- a/Gems/LyShine/Code/Source/UiRadioButtonComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiRadioButtonComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiRadioButtonComponent.h b/Gems/LyShine/Code/Source/UiRadioButtonComponent.h
index 4f2fd74ba9..e0f64b6173 100644
--- a/Gems/LyShine/Code/Source/UiRadioButtonComponent.h
+++ b/Gems/LyShine/Code/Source/UiRadioButtonComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.cpp b/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.cpp
index dc1db0b24b..e65f67eb93 100644
--- a/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.h b/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.h
index 1a3988a249..8bfe86a364 100644
--- a/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.h
+++ b/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiRenderer.cpp b/Gems/LyShine/Code/Source/UiRenderer.cpp
index dd1a95125d..a8285c1343 100644
--- a/Gems/LyShine/Code/Source/UiRenderer.cpp
+++ b/Gems/LyShine/Code/Source/UiRenderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiRenderer.h b/Gems/LyShine/Code/Source/UiRenderer.h
index 4a9af643cb..018e60350e 100644
--- a/Gems/LyShine/Code/Source/UiRenderer.h
+++ b/Gems/LyShine/Code/Source/UiRenderer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp b/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
index 8ef9258dc0..f8b73a2647 100644
--- a/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiScrollBarComponent.h b/Gems/LyShine/Code/Source/UiScrollBarComponent.h
index fb7abcb4ad..0e81fa2bfb 100644
--- a/Gems/LyShine/Code/Source/UiScrollBarComponent.h
+++ b/Gems/LyShine/Code/Source/UiScrollBarComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiScrollBoxComponent.cpp b/Gems/LyShine/Code/Source/UiScrollBoxComponent.cpp
index 57e6e213c8..1530d2f7a3 100644
--- a/Gems/LyShine/Code/Source/UiScrollBoxComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiScrollBoxComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiScrollBoxComponent.h b/Gems/LyShine/Code/Source/UiScrollBoxComponent.h
index 51b90f2888..2d0d91d384 100644
--- a/Gems/LyShine/Code/Source/UiScrollBoxComponent.h
+++ b/Gems/LyShine/Code/Source/UiScrollBoxComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiSerialize.cpp b/Gems/LyShine/Code/Source/UiSerialize.cpp
index 2a2869ff8c..80ff9113f2 100644
--- a/Gems/LyShine/Code/Source/UiSerialize.cpp
+++ b/Gems/LyShine/Code/Source/UiSerialize.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiSerialize.h b/Gems/LyShine/Code/Source/UiSerialize.h
index f32ee1549b..9bdddceba2 100644
--- a/Gems/LyShine/Code/Source/UiSerialize.h
+++ b/Gems/LyShine/Code/Source/UiSerialize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiSliderComponent.cpp b/Gems/LyShine/Code/Source/UiSliderComponent.cpp
index fb8010c15f..b20505460e 100644
--- a/Gems/LyShine/Code/Source/UiSliderComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiSliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiSliderComponent.h b/Gems/LyShine/Code/Source/UiSliderComponent.h
index 70c144e41d..d686941fb6 100644
--- a/Gems/LyShine/Code/Source/UiSliderComponent.h
+++ b/Gems/LyShine/Code/Source/UiSliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp b/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
index 522071aa84..e8387e2392 100644
--- a/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiSpawnerComponent.h b/Gems/LyShine/Code/Source/UiSpawnerComponent.h
index bd9b222f4c..e60e2b0212 100644
--- a/Gems/LyShine/Code/Source/UiSpawnerComponent.h
+++ b/Gems/LyShine/Code/Source/UiSpawnerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiStateActionManager.cpp b/Gems/LyShine/Code/Source/UiStateActionManager.cpp
index 6c82076d64..0960e92f50 100644
--- a/Gems/LyShine/Code/Source/UiStateActionManager.cpp
+++ b/Gems/LyShine/Code/Source/UiStateActionManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiStateActionManager.h b/Gems/LyShine/Code/Source/UiStateActionManager.h
index ce9a3ac34f..d2c78d1ddb 100644
--- a/Gems/LyShine/Code/Source/UiStateActionManager.h
+++ b/Gems/LyShine/Code/Source/UiStateActionManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTextComponent.cpp b/Gems/LyShine/Code/Source/UiTextComponent.cpp
index f0c753c311..b219856a8b 100644
--- a/Gems/LyShine/Code/Source/UiTextComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTextComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTextComponent.h b/Gems/LyShine/Code/Source/UiTextComponent.h
index 3b7ff19bcc..11ab288cab 100644
--- a/Gems/LyShine/Code/Source/UiTextComponent.h
+++ b/Gems/LyShine/Code/Source/UiTextComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.cpp b/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.cpp
index f15793ae53..60f9453290 100644
--- a/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.cpp
+++ b/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.h b/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.h
index c87e058665..ba3effcedd 100644
--- a/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.h
+++ b/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTextInputComponent.cpp b/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
index 7a8cc3e9c5..095fe205d2 100644
--- a/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTextInputComponent.h b/Gems/LyShine/Code/Source/UiTextInputComponent.h
index e4841cc3a7..17d2cb02cd 100644
--- a/Gems/LyShine/Code/Source/UiTextInputComponent.h
+++ b/Gems/LyShine/Code/Source/UiTextInputComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTooltipComponent.cpp b/Gems/LyShine/Code/Source/UiTooltipComponent.cpp
index db145a5836..967f26edc1 100644
--- a/Gems/LyShine/Code/Source/UiTooltipComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTooltipComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTooltipComponent.h b/Gems/LyShine/Code/Source/UiTooltipComponent.h
index 46f34e581c..77da86039f 100644
--- a/Gems/LyShine/Code/Source/UiTooltipComponent.h
+++ b/Gems/LyShine/Code/Source/UiTooltipComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp b/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
index aa5d4affba..41a6888190 100644
--- a/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.h b/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.h
index 67de3195a7..361a969c65 100644
--- a/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.h
+++ b/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTransform2dComponent.cpp b/Gems/LyShine/Code/Source/UiTransform2dComponent.cpp
index c60730344b..9912791930 100644
--- a/Gems/LyShine/Code/Source/UiTransform2dComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTransform2dComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/UiTransform2dComponent.h b/Gems/LyShine/Code/Source/UiTransform2dComponent.h
index bcfeef8dbb..1250ec64e1 100644
--- a/Gems/LyShine/Code/Source/UiTransform2dComponent.h
+++ b/Gems/LyShine/Code/Source/UiTransform2dComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
index e17a579ea5..2db56b174a 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.h b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.h
index 3f641ea588..2944eaed26 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.h
+++ b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
index fae134dafc..320fe47745 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.h b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.h
index 8377bfc5c4..b861d04784 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.h
+++ b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
index 04a526eea2..4fe2ccd42e 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.h b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.h
index 0936f59e54..c59a809304 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.h
+++ b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Source/resource.h b/Gems/LyShine/Code/Source/resource.h
index f7d2d15d34..961bff2960 100644
--- a/Gems/LyShine/Code/Source/resource.h
+++ b/Gems/LyShine/Code/Source/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/AnimationTest.cpp b/Gems/LyShine/Code/Tests/AnimationTest.cpp
index 7f4e9dc42b..dab298f112 100644
--- a/Gems/LyShine/Code/Tests/AnimationTest.cpp
+++ b/Gems/LyShine/Code/Tests/AnimationTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp b/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
index 49d095e09c..88a201231c 100644
--- a/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
+++ b/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/LyShineTest.h b/Gems/LyShine/Code/Tests/LyShineTest.h
index 3143fff487..fb4465e9d0 100644
--- a/Gems/LyShine/Code/Tests/LyShineTest.h
+++ b/Gems/LyShine/Code/Tests/LyShineTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/Mocks/UiDynamicScrollBoxDataBusHandlerMock.h b/Gems/LyShine/Code/Tests/Mocks/UiDynamicScrollBoxDataBusHandlerMock.h
index 178f64ea5c..009bb67999 100644
--- a/Gems/LyShine/Code/Tests/Mocks/UiDynamicScrollBoxDataBusHandlerMock.h
+++ b/Gems/LyShine/Code/Tests/Mocks/UiDynamicScrollBoxDataBusHandlerMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/SerializationTest.cpp b/Gems/LyShine/Code/Tests/SerializationTest.cpp
index e4f3016593..1d8b1094d2 100644
--- a/Gems/LyShine/Code/Tests/SerializationTest.cpp
+++ b/Gems/LyShine/Code/Tests/SerializationTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/SpriteTest.cpp b/Gems/LyShine/Code/Tests/SpriteTest.cpp
index 58e1c2f1d8..4a97851d21 100644
--- a/Gems/LyShine/Code/Tests/SpriteTest.cpp
+++ b/Gems/LyShine/Code/Tests/SpriteTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/TextInputComponentTest.cpp b/Gems/LyShine/Code/Tests/TextInputComponentTest.cpp
index f8914fa548..1b46576195 100644
--- a/Gems/LyShine/Code/Tests/TextInputComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/TextInputComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/UiDynamicScrollBoxComponentTest.cpp b/Gems/LyShine/Code/Tests/UiDynamicScrollBoxComponentTest.cpp
index 9bcc2b9832..c4d0177f2a 100644
--- a/Gems/LyShine/Code/Tests/UiDynamicScrollBoxComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/UiDynamicScrollBoxComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/UiScrollBarComponentTest.cpp b/Gems/LyShine/Code/Tests/UiScrollBarComponentTest.cpp
index 6b425ca5cf..601906ecdb 100644
--- a/Gems/LyShine/Code/Tests/UiScrollBarComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/UiScrollBarComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp b/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
index bc189e7221..76962fd318 100644
--- a/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShine/Code/lyshine_common_module_files.cmake b/Gems/LyShine/Code/lyshine_common_module_files.cmake
index 5b7edf44ed..e725112e53 100644
--- a/Gems/LyShine/Code/lyshine_common_module_files.cmake
+++ b/Gems/LyShine/Code/lyshine_common_module_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/lyshine_editor_builder_files.cmake b/Gems/LyShine/Code/lyshine_editor_builder_files.cmake
index 43204beaf8..29f31fbfb0 100644
--- a/Gems/LyShine/Code/lyshine_editor_builder_files.cmake
+++ b/Gems/LyShine/Code/lyshine_editor_builder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/lyshine_editor_tests_files.cmake b/Gems/LyShine/Code/lyshine_editor_tests_files.cmake
index aaf4478cdb..7d13daeff8 100644
--- a/Gems/LyShine/Code/lyshine_editor_tests_files.cmake
+++ b/Gems/LyShine/Code/lyshine_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/lyshine_static_files.cmake b/Gems/LyShine/Code/lyshine_static_files.cmake
index 54edd9dc43..8c2275ab92 100644
--- a/Gems/LyShine/Code/lyshine_static_files.cmake
+++ b/Gems/LyShine/Code/lyshine_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/lyshine_tests_files.cmake b/Gems/LyShine/Code/lyshine_tests_files.cmake
index 21c9f2e9d0..4e416934eb 100644
--- a/Gems/LyShine/Code/lyshine_tests_files.cmake
+++ b/Gems/LyShine/Code/lyshine_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake b/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
index e40e1a849e..84a5f560c7 100644
--- a/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
+++ b/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/ButtonAnimation.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/ButtonAnimation.lua
index 09faaa0910..42222d6060 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/ButtonAnimation.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/ButtonAnimation.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/MultipleSequences.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/MultipleSequences.lua
index 19e056b6cc..b92b37a4ce 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/MultipleSequences.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/MultipleSequences.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/SequenceStates.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/SequenceStates.lua
index 0b22592ad9..a1f9fb2c65 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/SequenceStates.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Animation/SequenceStates.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/CppExample/LoadCppCanvas.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/CppExample/LoadCppCanvas.lua
index a5d7adaa58..9fa428981c 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/CppExample/LoadCppCanvas.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/CppExample/LoadCppCanvas.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DisplayMouseCursor.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DisplayMouseCursor.lua
index 4fa41dd5f3..db6f980fc4 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DisplayMouseCursor.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DisplayMouseCursor.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_ChildDropTarget.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_ChildDropTarget.lua
index 0a2d392282..5610230a0d 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_ChildDropTarget.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_ChildDropTarget.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_Draggable.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_Draggable.lua
index 4e896308ac..54ac41b884 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_Draggable.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_Draggable.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_EndDropTarget.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_EndDropTarget.lua
index 9f2f67e921..ec187a5975 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_EndDropTarget.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_EndDropTarget.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_LayoutDropTarget.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_LayoutDropTarget.lua
index 74731968fc..1b91308e9a 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_LayoutDropTarget.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_LayoutDropTarget.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableCrossCanvasElement.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableCrossCanvasElement.lua
index db124afe87..27fc824d81 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableCrossCanvasElement.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableCrossCanvasElement.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableElement.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableElement.lua
index b74aabfc28..0b38088f6a 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableElement.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableElement.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableStackingElement.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableStackingElement.lua
index 3d4d5d9eae..5567d7b058 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableStackingElement.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DraggableStackingElement.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTarget.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTarget.lua
index 56d0fc84df..9eafbbd624 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTarget.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTarget.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTargetCrossCanvas.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTargetCrossCanvas.lua
index 2d3d14611a..bb5e0a9f43 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTargetCrossCanvas.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTargetCrossCanvas.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTargetStacking.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTargetStacking.lua
index 9219cb0ff9..22a770b1f6 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTargetStacking.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/DragAndDrop/DropTargetStacking.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/ColorBall.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/ColorBall.lua
index 21f82123e9..7323f2bb2c 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/ColorBall.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/ColorBall.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/CreateBall.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/CreateBall.lua
index d4f897d9cf..05f9bdf2ab 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/CreateBall.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/CreateBall.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/DestroyBall.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/DestroyBall.lua
index 4972e656fc..0d2478e613 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/DestroyBall.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/DestroyBall.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/MoveBallDown.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/MoveBallDown.lua
index a78f411032..15070a54da 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/MoveBallDown.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/MoveBallDown.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/MoveBallUp.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/MoveBallUp.lua
index dcbcbda576..ab62dce038 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/MoveBallUp.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/MoveBallUp.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/ResetBall.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/ResetBall.lua
index a20ee093b9..7d8fa8c423 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/ResetBall.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/FunctionalityDropdown/ResetBall.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/MultiSelectionDropdown.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/MultiSelectionDropdown.lua
index 8df639ac29..91309597f6 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/MultiSelectionDropdown.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/MultiSelectionDropdown.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/SelectionDropdownOption.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/SelectionDropdownOption.lua
index 9aa10c2270..0d5521f373 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/SelectionDropdownOption.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/SelectionDropdownOption.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/SelectionDropdownSelectedOption.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/SelectionDropdownSelectedOption.lua
index 6027346012..b10f3c7e98 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/SelectionDropdownSelectedOption.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dropdown/SelectionDropdownSelectedOption.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicLayoutColumn.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicLayoutColumn.lua
index 24849a226a..5e5d3dcdef 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicLayoutColumn.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicLayoutColumn.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicLayoutGrid.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicLayoutGrid.lua
index 8e14129931..a6674e6a15 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicLayoutGrid.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicLayoutGrid.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicSBVariableSize.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicSBVariableSize.lua
index 38c6e356ce..ad180c9a40 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicSBVariableSize.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicSBVariableSize.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicSBVariableSizeWithSections.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicSBVariableSizeWithSections.lua
index 096230980e..a4c46f36d0 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicSBVariableSizeWithSections.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicSBVariableSizeWithSections.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicScrollBox.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicScrollBox.lua
index 8fddaecf3b..7be5c7c5e8 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicScrollBox.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Dynamic/DynamicScrollBox.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Fader/FadeButton.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Fader/FadeButton.lua
index 9d47755182..61c95cdc1a 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Fader/FadeButton.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Fader/FadeButton.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Fader/FadeSlider.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Fader/FadeSlider.lua
index bb49c6945d..3874114eba 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Fader/FadeSlider.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Fader/FadeSlider.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Flipbook/Flipbook.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Flipbook/Flipbook.lua
index 554e031e77..e01825578a 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Flipbook/Flipbook.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Flipbook/Flipbook.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/HideThisElementButton.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/HideThisElementButton.lua
index be19f715ed..ed7a03a1a5 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/HideThisElementButton.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/HideThisElementButton.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/ImageFillTypes.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/ImageFillTypes.lua
index 949ddfe2ae..96c0aba450 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/ImageFillTypes.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/ImageFillTypes.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/ImageTypes.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/ImageTypes.lua
index ab0284cd68..5454d04f27 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/ImageTypes.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/ImageTypes.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/Spritesheet.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/Spritesheet.lua
index 3ad6109134..0ae4d5c0ce 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/Spritesheet.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Image/Spritesheet.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ResetSizes.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ResetSizes.lua
index 7e720c50e8..cbef0afb33 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ResetSizes.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ResetSizes.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ScaleToTarget.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ScaleToTarget.lua
index 9ca971f41f..8fe02a3a7a 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ScaleToTarget.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ScaleToTarget.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ToggleHorizontalFitRecursive.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ToggleHorizontalFitRecursive.lua
index 9bf59b4bde..56b5d07885 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ToggleHorizontalFitRecursive.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ToggleHorizontalFitRecursive.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ToggleVerticalFitRecursive.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ToggleVerticalFitRecursive.lua
index a469c57075..ed350e1392 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ToggleVerticalFitRecursive.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Layout/ToggleVerticalFitRecursive.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/LoadCanvasButton.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/LoadCanvasButton.lua
index 08099d4875..ced20308c1 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/LoadCanvasButton.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/LoadCanvasButton.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/LoadUnloadCanvasButton.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/LoadUnloadCanvasButton.lua
index 38bea445c3..8403d10984 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/LoadUnloadCanvasButton.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/LoadUnloadCanvasButton.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Localization/ScrollingScrollBox.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Localization/ScrollingScrollBox.lua
index 1fc9d7c754..172c70fb9f 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Localization/ScrollingScrollBox.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Localization/ScrollingScrollBox.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/ChildMaskElement.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/ChildMaskElement.lua
index b1ac8b4371..9df4e50fe1 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/ChildMaskElement.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/ChildMaskElement.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/SetElementEnabledCheckbox.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/SetElementEnabledCheckbox.lua
index 969ab4b072..294e72e779 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/SetElementEnabledCheckbox.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/SetElementEnabledCheckbox.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/SetUseAlphaGradientCheckbox.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/SetUseAlphaGradientCheckbox.lua
index 91c16d102a..d51d8f0686 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/SetUseAlphaGradientCheckbox.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Mask/SetUseAlphaGradientCheckbox.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/NextCanvasButton.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/NextCanvasButton.lua
index 63b2ad8848..09df36dcbf 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/NextCanvasButton.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/NextCanvasButton.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ParticleEmitter/ParticleTrailButton.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ParticleEmitter/ParticleTrailButton.lua
index 595fe1731f..7173aa7796 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ParticleEmitter/ParticleTrailButton.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ParticleEmitter/ParticleTrailButton.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Performance/DrawCalls.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Performance/DrawCalls.lua
index 31a76297f9..bf8092c42d 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Performance/DrawCalls.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Performance/DrawCalls.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/RadioButton/SwitchGroup.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/RadioButton/SwitchGroup.lua
index dc09873303..edfae5c9c8 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/RadioButton/SwitchGroup.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/RadioButton/SwitchGroup.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ScrollBar/ChangeValues.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ScrollBar/ChangeValues.lua
index 1859dbe145..451ebdc6e7 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ScrollBar/ChangeValues.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ScrollBar/ChangeValues.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ScrollBar/ZoomSlider.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ScrollBar/ZoomSlider.lua
index 6c41143d77..bb0a88fffb 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ScrollBar/ZoomSlider.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ScrollBar/ZoomSlider.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/SetTextFromInput.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/SetTextFromInput.lua
index 68642bc346..d238399155 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/SetTextFromInput.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/SetTextFromInput.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ShowAndInputEnableElementButton.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ShowAndInputEnableElementButton.lua
index 2abc2a808b..bfde53c831 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ShowAndInputEnableElementButton.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ShowAndInputEnableElementButton.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/SliderWithButtons.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/SliderWithButtons.lua
index b3ce831cfd..d50ede33d0 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/SliderWithButtons.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/SliderWithButtons.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/DeleteElements.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/DeleteElements.lua
index 13f5ac5a2e..9e47a0e2cc 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/DeleteElements.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/DeleteElements.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/RadioButtonSpawner.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/RadioButtonSpawner.lua
index b258c8db74..cde1211cf6 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/RadioButtonSpawner.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/RadioButtonSpawner.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/Spawn3Elements.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/Spawn3Elements.lua
index d423610855..3cfc779586 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/Spawn3Elements.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/Spawn3Elements.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/SpawnElements.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/SpawnElements.lua
index 8ff7172506..7fcd4fddfb 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/SpawnElements.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Spawner/SpawnElements.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/FontSizeSlider.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/FontSizeSlider.lua
index 3ba34c753d..98a8346f05 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/FontSizeSlider.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/FontSizeSlider.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/ImageMarkup.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/ImageMarkup.lua
index 1a976d3fd9..258af35bb6 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/ImageMarkup.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/ImageMarkup.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/MarkupCheckBox.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/MarkupCheckBox.lua
index 858e4dc6d9..5d79b007b9 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/MarkupCheckBox.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/MarkupCheckBox.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/OverflowModeDropdown.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/OverflowModeDropdown.lua
index ecacc7035e..a37fcda884 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/OverflowModeDropdown.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/OverflowModeDropdown.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/OverflowTextAnimate.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/OverflowTextAnimate.lua
index 21c8f0ff3f..e232a18d98 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/OverflowTextAnimate.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/OverflowTextAnimate.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/PlayAnimationOnStart.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/PlayAnimationOnStart.lua
index f04b105387..1258b86ea6 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/PlayAnimationOnStart.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/PlayAnimationOnStart.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/ShrinkToFitDropdown.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/ShrinkToFitDropdown.lua
index 452a5198c6..3f6b2da738 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/ShrinkToFitDropdown.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/ShrinkToFitDropdown.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/StylingMarkupLinkText.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/StylingMarkupLinkText.lua
index 27cf2b66df..23aaf5034e 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/StylingMarkupLinkText.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/StylingMarkupLinkText.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/WrapTextDropdown.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/WrapTextDropdown.lua
index b3c8db91f5..6b546942bf 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/WrapTextDropdown.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Text/WrapTextDropdown.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleInputEnabledOnElementChildren.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleInputEnabledOnElementChildren.lua
index bdcd546149..1d3259720c 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleInputEnabledOnElementChildren.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleInputEnabledOnElementChildren.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleInteractionMaskingOnElementChildren.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleInteractionMaskingOnElementChildren.lua
index 6c31740800..fbe8c301a4 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleInteractionMaskingOnElementChildren.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleInteractionMaskingOnElementChildren.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleMaskingOnElementChildren.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleMaskingOnElementChildren.lua
index 0cde084cba..310a1d5388 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleMaskingOnElementChildren.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/ToggleMaskingOnElementChildren.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Tooltips/Styles.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Tooltips/Styles.lua
index b30187ff40..a6cda10309 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Tooltips/Styles.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Tooltips/Styles.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Tooltips/TextOptions.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Tooltips/TextOptions.lua
index 447343df57..43cc804cdd 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Tooltips/TextOptions.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/Tooltips/TextOptions.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/UnloadThisCanvasButton.lua b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/UnloadThisCanvasButton.lua
index 29d6156bfb..64fcfbc5fc 100644
--- a/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/UnloadThisCanvasButton.lua
+++ b/Gems/LyShineExamples/Assets/UI/Scripts/LyShineExamples/UnloadThisCanvasButton.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/LyShineExamples/CMakeLists.txt b/Gems/LyShineExamples/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/LyShineExamples/CMakeLists.txt
+++ b/Gems/LyShineExamples/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShineExamples/Code/CMakeLists.txt b/Gems/LyShineExamples/Code/CMakeLists.txt
index 5e8c03cb42..9bd203f186 100644
--- a/Gems/LyShineExamples/Code/CMakeLists.txt
+++ b/Gems/LyShineExamples/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShineExamples/Code/Include/LyShineExamples/LyShineExamplesBus.h b/Gems/LyShineExamples/Code/Include/LyShineExamples/LyShineExamplesBus.h
index 17031878ae..9db1904d7c 100644
--- a/Gems/LyShineExamples/Code/Include/LyShineExamples/LyShineExamplesBus.h
+++ b/Gems/LyShineExamples/Code/Include/LyShineExamples/LyShineExamplesBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Include/LyShineExamples/LyShineExamplesCppExampleBus.h b/Gems/LyShineExamples/Code/Include/LyShineExamples/LyShineExamplesCppExampleBus.h
index 189603b76c..1036ca23fc 100644
--- a/Gems/LyShineExamples/Code/Include/LyShineExamples/LyShineExamplesCppExampleBus.h
+++ b/Gems/LyShineExamples/Code/Include/LyShineExamples/LyShineExamplesCppExampleBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Include/LyShineExamples/UiCustomImageBus.h b/Gems/LyShineExamples/Code/Include/LyShineExamples/UiCustomImageBus.h
index 693f586003..7a1eda3991 100644
--- a/Gems/LyShineExamples/Code/Include/LyShineExamples/UiCustomImageBus.h
+++ b/Gems/LyShineExamples/Code/Include/LyShineExamples/UiCustomImageBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Include/LyShineExamples/UiDynamicContentDatabaseBus.h b/Gems/LyShineExamples/Code/Include/LyShineExamples/UiDynamicContentDatabaseBus.h
index 53f326e76e..4c50963d91 100644
--- a/Gems/LyShineExamples/Code/Include/LyShineExamples/UiDynamicContentDatabaseBus.h
+++ b/Gems/LyShineExamples/Code/Include/LyShineExamples/UiDynamicContentDatabaseBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamplesCppExample.cpp b/Gems/LyShineExamples/Code/Source/LyShineExamplesCppExample.cpp
index 2808eb3e52..e3abc6efa6 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamplesCppExample.cpp
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamplesCppExample.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamplesCppExample.h b/Gems/LyShineExamples/Code/Source/LyShineExamplesCppExample.h
index b1aee565d4..068aa39a4c 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamplesCppExample.h
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamplesCppExample.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamplesInternalBus.h b/Gems/LyShineExamples/Code/Source/LyShineExamplesInternalBus.h
index 74cd7f0432..e2f712bee5 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamplesInternalBus.h
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamplesInternalBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamplesModule.cpp b/Gems/LyShineExamples/Code/Source/LyShineExamplesModule.cpp
index df78ce99ac..8cc9f22c96 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamplesModule.cpp
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamplesModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamplesSerialize.cpp b/Gems/LyShineExamples/Code/Source/LyShineExamplesSerialize.cpp
index 8d4e59d9d5..314b013a16 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamplesSerialize.cpp
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamplesSerialize.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamplesSerialize.h b/Gems/LyShineExamples/Code/Source/LyShineExamplesSerialize.h
index f036d0ad6e..6dd76d4b94 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamplesSerialize.h
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamplesSerialize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.cpp b/Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.cpp
index 51e4c1c759..bbcef6fb12 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.cpp
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.h b/Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.h
index b3fd4fe39d..3838a8f299 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.h
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h b/Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
index 8d99a0243c..eefa26c318 100644
--- a/Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
+++ b/Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp b/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp
index c2ea277540..40166951a3 100644
--- a/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp
+++ b/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.h b/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.h
index be8418a60c..0dd72180c2 100644
--- a/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.h
+++ b/Gems/LyShineExamples/Code/Source/UiCustomImageComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/UiDynamicContentDatabase.cpp b/Gems/LyShineExamples/Code/Source/UiDynamicContentDatabase.cpp
index 14131faf23..9eb5163945 100644
--- a/Gems/LyShineExamples/Code/Source/UiDynamicContentDatabase.cpp
+++ b/Gems/LyShineExamples/Code/Source/UiDynamicContentDatabase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/UiDynamicContentDatabase.h b/Gems/LyShineExamples/Code/Source/UiDynamicContentDatabase.h
index addc7bd7d2..9e6ece3072 100644
--- a/Gems/LyShineExamples/Code/Source/UiDynamicContentDatabase.h
+++ b/Gems/LyShineExamples/Code/Source/UiDynamicContentDatabase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.cpp b/Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.cpp
index 2410e30b16..cd370957fc 100644
--- a/Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.cpp
+++ b/Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.h b/Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.h
index c67b9dfe32..9e7333b7b0 100644
--- a/Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.h
+++ b/Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/LyShineExamples/Code/lyshineexamples_files.cmake b/Gems/LyShineExamples/Code/lyshineexamples_files.cmake
index ee71718159..39cd168256 100644
--- a/Gems/LyShineExamples/Code/lyshineexamples_files.cmake
+++ b/Gems/LyShineExamples/Code/lyshineexamples_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/LyShineExamples/Code/lyshineexamples_shared_files.cmake b/Gems/LyShineExamples/Code/lyshineexamples_shared_files.cmake
index f176d3428a..00768127ee 100644
--- a/Gems/LyShineExamples/Code/lyshineexamples_shared_files.cmake
+++ b/Gems/LyShineExamples/Code/lyshineexamples_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Maestro/CMakeLists.txt b/Gems/Maestro/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Maestro/CMakeLists.txt
+++ b/Gems/Maestro/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Maestro/Code/CMakeLists.txt b/Gems/Maestro/Code/CMakeLists.txt
index 2f5a3c079b..f9de0c6a4b 100644
--- a/Gems/Maestro/Code/CMakeLists.txt
+++ b/Gems/Maestro/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Maestro/Code/Include/Maestro/MaestroBus.h b/Gems/Maestro/Code/Include/Maestro/MaestroBus.h
index 0dc2e61e37..738cc20554 100644
--- a/Gems/Maestro/Code/Include/Maestro/MaestroBus.h
+++ b/Gems/Maestro/Code/Include/Maestro/MaestroBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/2DSpline.h b/Gems/Maestro/Code/Source/Cinematics/2DSpline.h
index eeaa65814b..7bec08dffd 100644
--- a/Gems/Maestro/Code/Source/Cinematics/2DSpline.h
+++ b/Gems/Maestro/Code/Source/Cinematics/2DSpline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.cpp
index 4aa2bf5727..e68aa05591 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.h
index 98050c7da5..e1126ab862 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp
index 7051ea8495..473c8bd1c0 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h
index a0bb75d72b..ab742025cb 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp
index 4ab0fc7eb8..a66f495d91 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimNode.h
index 90f9a0164b..4b5c465ed9 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.cpp
index 810ae3c9a7..b0a2219a23 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.h b/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.h
index 83ca8ba145..fd3838828c 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp
index 6684d1994f..bd330b7151 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.h
index 18fa159b86..6f6be5da0c 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp
index dec9a47fd8..6169f62b46 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.h
index 51e79be318..ac12a76ff9 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
index 83b6c533ba..a9bd0d2657 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h
index c6bbf592f1..234ea760a0 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.cpp
index e5ec12626e..85e21ef930 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.h b/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.h
index 93e39403a7..514c680ecc 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.cpp
index f1c11e94b9..9f0ff079a1 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h
index b60f5d0045..1d0ecd5f5d 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_FloatSpecialization.h b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_FloatSpecialization.h
index 5b929cfa70..5240094a58 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_FloatSpecialization.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_FloatSpecialization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_QuatSpecialization.h b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_QuatSpecialization.h
index 58791b38f5..8e7e9d19de 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_QuatSpecialization.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_QuatSpecialization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec2Specialization.h b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec2Specialization.h
index 99a6c7eae5..6d3b70d0ef 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec2Specialization.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec2Specialization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec3Specialization.h b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec3Specialization.h
index 2c1c850cb2..0f7d4cffe2 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec3Specialization.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec3Specialization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimTrack.cpp
index 39fcfa7db7..e476b319b6 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AnimTrack.h b/Gems/Maestro/Code/Source/Cinematics/AnimTrack.h
index 3c99099aa2..707a95ff3d 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.cpp
index 3f5fce86a9..af2fd89671 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.h b/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.h
index 57236823b2..55a446f3a8 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp
index d78ae28765..353438fd54 100644
--- a/Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/BoolTrack.h b/Gems/Maestro/Code/Source/Cinematics/BoolTrack.h
index 4fac733e3b..1dae265309 100644
--- a/Gems/Maestro/Code/Source/Cinematics/BoolTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/BoolTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CVarNode.cpp b/Gems/Maestro/Code/Source/Cinematics/CVarNode.cpp
index 800a600edc..92576b86a4 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CVarNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/CVarNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CVarNode.h b/Gems/Maestro/Code/Source/Cinematics/CVarNode.h
index d1607ac7d5..7aa9d0f1a0 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CVarNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/CVarNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.cpp
index 757b4f2e3e..d7c259edee 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.h b/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.h
index f931682be5..a6e6edc35b 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.cpp
index e1530d05f3..423d86cde6 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.h b/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.h
index 9f32b8d908..72df0f1cea 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CharacterTrackAnimator.cpp b/Gems/Maestro/Code/Source/Cinematics/CharacterTrackAnimator.cpp
index 965a46d43f..362ae57d16 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CharacterTrackAnimator.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/CharacterTrackAnimator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CharacterTrackAnimator.h b/Gems/Maestro/Code/Source/Cinematics/CharacterTrackAnimator.h
index 390ebd5d4b..05b1c358b0 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CharacterTrackAnimator.h
+++ b/Gems/Maestro/Code/Source/Cinematics/CharacterTrackAnimator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp b/Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp
index 0d12c7d75b..67a6f506e0 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CommentNode.h b/Gems/Maestro/Code/Source/Cinematics/CommentNode.h
index c401bb1cb3..0fda85ca13 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CommentNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/CommentNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CommentTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CommentTrack.cpp
index 477bbd6192..4dabf9659d 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CommentTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/CommentTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CommentTrack.h b/Gems/Maestro/Code/Source/Cinematics/CommentTrack.h
index 6c7197bf82..0a58cca9b7 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CommentTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/CommentTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp
index 863d137079..45f5b29a5c 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h
index d52c79e895..0714b9e904 100644
--- a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.cpp
index 7f78e938b5..fbcdce2a21 100644
--- a/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.h b/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.h
index 7474d7d6dc..434b9e110f 100644
--- a/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/EventNode.cpp b/Gems/Maestro/Code/Source/Cinematics/EventNode.cpp
index bad4de89a9..5545ecc2be 100644
--- a/Gems/Maestro/Code/Source/Cinematics/EventNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/EventNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/EventNode.h b/Gems/Maestro/Code/Source/Cinematics/EventNode.h
index 671df5ec68..615e16e463 100644
--- a/Gems/Maestro/Code/Source/Cinematics/EventNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/EventNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp
index 5110929a18..fa2add2b86 100644
--- a/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/EventTrack.h b/Gems/Maestro/Code/Source/Cinematics/EventTrack.h
index b4c7fa7b1c..a1e3bc7fb6 100644
--- a/Gems/Maestro/Code/Source/Cinematics/EventTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/EventTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp
index a96098bffa..eed780c6c3 100644
--- a/Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/GotoTrack.h b/Gems/Maestro/Code/Source/Cinematics/GotoTrack.h
index 6c380509df..bfdd9e9ebb 100644
--- a/Gems/Maestro/Code/Source/Cinematics/GotoTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/GotoTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp b/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp
index c326c067db..4116794752 100644
--- a/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/LayerNode.h b/Gems/Maestro/Code/Source/Cinematics/LayerNode.h
index 4cd18e068d..ec27295011 100644
--- a/Gems/Maestro/Code/Source/Cinematics/LayerNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/LayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.cpp
index db77c8ec3f..7786e70c9e 100644
--- a/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.h b/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.h
index ecca881cf6..ab393b7842 100644
--- a/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h b/Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
index 3ee47e0684..0a03bbda40 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
+++ b/Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp
index 11897c135f..fe6cfe9243 100644
--- a/Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h
index 83b0fd502c..6568e61888 100644
--- a/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/Movie.cpp b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
index d3a5fa83f5..9430e7f769 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/Movie.h b/Gems/Maestro/Code/Source/Cinematics/Movie.h
index 22da087766..c544bc3d19 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Movie.h
+++ b/Gems/Maestro/Code/Source/Cinematics/Movie.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
index 6bc5655c3a..4c615b052e 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/SceneNode.h b/Gems/Maestro/Code/Source/Cinematics/SceneNode.h
index 3e23322d7f..7a3994a9c3 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp
index 18f998c288..2da693ff56 100644
--- a/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.h b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.h
index 7f9a953375..ac2149b9c4 100644
--- a/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.cpp b/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.cpp
index 04c96d04b7..cef12ab1c8 100644
--- a/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.h b/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.h
index 51c80187bd..db454c2d27 100644
--- a/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/SelectTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/SelectTrack.cpp
index ca6f9fec84..ea42e17ac2 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SelectTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/SelectTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/SelectTrack.h b/Gems/Maestro/Code/Source/Cinematics/SelectTrack.h
index 17f542940e..b3f10d19d8 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SelectTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/SelectTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.cpp
index 33a6145953..2409426bb4 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.h b/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.h
index 9f8f31f3d3..2b1670c932 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp b/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp
index 8ac69117e2..28c6cbc083 100644
--- a/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.h b/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.h
index 201c6e59de..56af3e5e6e 100644
--- a/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/SoundTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/SoundTrack.cpp
index ea6746a987..0e8027be2b 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SoundTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/SoundTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/SoundTrack.h b/Gems/Maestro/Code/Source/Cinematics/SoundTrack.h
index ea61081112..8b062ae14b 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SoundTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/SoundTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/TCBSpline.h b/Gems/Maestro/Code/Source/Cinematics/TCBSpline.h
index 1f57ff006f..dbbc9fdc47 100644
--- a/Gems/Maestro/Code/Source/Cinematics/TCBSpline.h
+++ b/Gems/Maestro/Code/Source/Cinematics/TCBSpline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp b/Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp
index 34f22f55a6..de227a6435 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp b/Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp
index d926eacc0c..2f089a4316 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/Tests/test_Main.cpp b/Gems/Maestro/Code/Source/Cinematics/Tests/test_Main.cpp
index 291afcbdf6..de8f7a004b 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Tests/test_Main.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/Tests/test_Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp
index 6dd70bc042..9f73efb436 100644
--- a/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.h b/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.h
index 8f2bd218e7..1e3fe3340f 100644
--- a/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp
index 30517eb6fb..3cf01f9781 100644
--- a/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.h b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.h
index 2037e60912..78a68882e7 100644
--- a/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Cinematics/resource.h b/Gems/Maestro/Code/Source/Cinematics/resource.h
index 23a9212b5f..bcc8d1d6b0 100644
--- a/Gems/Maestro/Code/Source/Cinematics/resource.h
+++ b/Gems/Maestro/Code/Source/Cinematics/resource.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp b/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp
index 1e78fbc511..f80c1edb81 100644
--- a/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp
+++ b/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -21,6 +21,7 @@
 #include <Maestro/Types/AnimParamType.h>
 #include <AzToolsFramework/ToolsComponents/EditorDisabledCompositionBus.h>
 #include <AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.h>
+#include <AzToolsFramework/Undo/UndoCacheInterface.h>
 
 namespace Maestro
 {
@@ -161,9 +162,18 @@ namespace Maestro
             return;
         }
 
+        AZ::EntityId curEntityId = GetEntityId();
+
         // remove this SequenceAgent from this entity if no sequenceComponents are connected to it
         AzToolsFramework::EntityCompositionRequestBus::Broadcast(&AzToolsFramework::EntityCompositionRequests::RemoveComponents, AZ::Entity::ComponentArrayType{this});        
-        
+
+        // Let any currently-active undo operations know that this entity has changed state.
+        auto undoCacheInterface = AZ::Interface<AzToolsFramework::UndoSystem::UndoCacheInterface>::Get();
+        if (undoCacheInterface)
+        {
+            undoCacheInterface->UpdateCache(curEntityId);
+        }
+
         // CAUTION!
         // THIS CLASS INSTANCE IS NOW DEAD DUE TO DELETION BY THE ENTITY DURING RemoveComponents!
     }
diff --git a/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.h b/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.h
index 01469f929a..0e55065707 100644
--- a/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.h
+++ b/Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp b/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp
index b60391eddd..acb8b78067 100644
--- a/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp
+++ b/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -205,15 +205,31 @@ namespace Maestro
 
             if (addComponentResult.IsSuccess())
             {
-                // We need to register our Entity and Component Ids with the SequenceAgentComponent so we can communicate over EBuses with it.
-                // We can't do this registration over an EBus because we haven't registered with it yet - do it with pointers? Is this safe?
-                agentComponent = static_cast<Maestro::EditorSequenceAgentComponent*>(addComponentResult.GetValue()[entityToAnimate].m_componentsAdded[0]);
+                if (!addComponentResult.GetValue()[entityToAnimate].m_componentsAdded.empty())
+                {
+                    // We need to register our Entity and Component Ids with the SequenceAgentComponent so we can communicate over EBuses
+                    // with it. We can't do this registration over an EBus because we haven't registered with it yet - do it with pointers?
+                    // Is this safe?
+                    agentComponent = static_cast<Maestro::EditorSequenceAgentComponent*>(
+                        addComponentResult.GetValue()[entityToAnimate].m_componentsAdded[0]);
+                }
+                else
+                {
+                    AZ_Assert(
+                        !addComponentResult.GetValue()[entityToAnimate].m_componentsAdded.empty(),
+                        "Add component result was successful, but the EditorSequenceAgentComponent wasn't added.  "
+                        "This can happen if the entity id isn't found for some reason: entity id = %s",
+                        entityToAnimate.ToString().c_str());
+                }
             }
         }
 
-        AZ_Assert(agentComponent, "EditorSequenceComponent::AddEntityToAnimate unable to create or find sequenceAgentComponent.")
+        AZ_Assert(agentComponent, "EditorSequenceComponent::AddEntityToAnimate unable to create or find sequenceAgentComponent.");
         // Notify the SequenceAgentComponent that we're connected to it - after this call, all communication with the Agent is over an EBus
-        agentComponent->ConnectSequence(GetEntityId());
+        if (agentComponent)
+        {
+            agentComponent->ConnectSequence(GetEntityId());
+        }
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h b/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h
index d1613248ff..8940363076 100644
--- a/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h
+++ b/Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Components/SequenceAgent.cpp b/Gems/Maestro/Code/Source/Components/SequenceAgent.cpp
index 840cc3fb85..282b064ba1 100644
--- a/Gems/Maestro/Code/Source/Components/SequenceAgent.cpp
+++ b/Gems/Maestro/Code/Source/Components/SequenceAgent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Components/SequenceAgent.h b/Gems/Maestro/Code/Source/Components/SequenceAgent.h
index f6bdefa47a..32a3c99dd4 100644
--- a/Gems/Maestro/Code/Source/Components/SequenceAgent.h
+++ b/Gems/Maestro/Code/Source/Components/SequenceAgent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Components/SequenceAgentComponent.cpp b/Gems/Maestro/Code/Source/Components/SequenceAgentComponent.cpp
index 363d23906c..350b33e35b 100644
--- a/Gems/Maestro/Code/Source/Components/SequenceAgentComponent.cpp
+++ b/Gems/Maestro/Code/Source/Components/SequenceAgentComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Components/SequenceAgentComponent.h b/Gems/Maestro/Code/Source/Components/SequenceAgentComponent.h
index a737f04a00..b5f0e26b7b 100644
--- a/Gems/Maestro/Code/Source/Components/SequenceAgentComponent.h
+++ b/Gems/Maestro/Code/Source/Components/SequenceAgentComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp b/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp
index 79be7daea1..595eab9ede 100644
--- a/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp
+++ b/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Components/SequenceComponent.h b/Gems/Maestro/Code/Source/Components/SequenceComponent.h
index 93c539d8df..b90af71761 100644
--- a/Gems/Maestro/Code/Source/Components/SequenceComponent.h
+++ b/Gems/Maestro/Code/Source/Components/SequenceComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/MaestroModule.cpp b/Gems/Maestro/Code/Source/MaestroModule.cpp
index 224f500909..42cabf06ad 100644
--- a/Gems/Maestro/Code/Source/MaestroModule.cpp
+++ b/Gems/Maestro/Code/Source/MaestroModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/MaestroSystemComponent.cpp b/Gems/Maestro/Code/Source/MaestroSystemComponent.cpp
index 358c7d6a2c..ec74dec358 100644
--- a/Gems/Maestro/Code/Source/MaestroSystemComponent.cpp
+++ b/Gems/Maestro/Code/Source/MaestroSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/MaestroSystemComponent.h b/Gems/Maestro/Code/Source/MaestroSystemComponent.h
index 3e7ec0c294..4c09dab483 100644
--- a/Gems/Maestro/Code/Source/MaestroSystemComponent.h
+++ b/Gems/Maestro/Code/Source/MaestroSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Source/Maestro_precompiled.h b/Gems/Maestro/Code/Source/Maestro_precompiled.h
index 3e377e10c6..342c8015e9 100644
--- a/Gems/Maestro/Code/Source/Maestro_precompiled.h
+++ b/Gems/Maestro/Code/Source/Maestro_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Tests/MaestroTest.cpp b/Gems/Maestro/Code/Tests/MaestroTest.cpp
index 78291a916b..bbdb9b0d06 100644
--- a/Gems/Maestro/Code/Tests/MaestroTest.cpp
+++ b/Gems/Maestro/Code/Tests/MaestroTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Tests/Tracks/AnimTrackTest.cpp b/Gems/Maestro/Code/Tests/Tracks/AnimTrackTest.cpp
index ca44a8af81..6275eb3358 100644
--- a/Gems/Maestro/Code/Tests/Tracks/AnimTrackTest.cpp
+++ b/Gems/Maestro/Code/Tests/Tracks/AnimTrackTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/Tests/Tracks/BoolTrackTest.cpp b/Gems/Maestro/Code/Tests/Tracks/BoolTrackTest.cpp
index 6279e113ec..d44da5752b 100644
--- a/Gems/Maestro/Code/Tests/Tracks/BoolTrackTest.cpp
+++ b/Gems/Maestro/Code/Tests/Tracks/BoolTrackTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Maestro/Code/maestro_editor_files.cmake b/Gems/Maestro/Code/maestro_editor_files.cmake
index ca10122668..21e3ebe1e0 100644
--- a/Gems/Maestro/Code/maestro_editor_files.cmake
+++ b/Gems/Maestro/Code/maestro_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Maestro/Code/maestro_files.cmake b/Gems/Maestro/Code/maestro_files.cmake
index 989197f2ee..0c101a0301 100644
--- a/Gems/Maestro/Code/maestro_files.cmake
+++ b/Gems/Maestro/Code/maestro_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Maestro/Code/maestro_static_files.cmake b/Gems/Maestro/Code/maestro_static_files.cmake
index 918917364a..a83a703421 100644
--- a/Gems/Maestro/Code/maestro_static_files.cmake
+++ b/Gems/Maestro/Code/maestro_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Maestro/Code/maestro_tests_files.cmake b/Gems/Maestro/Code/maestro_tests_files.cmake
index 43b8a79b05..c73d218c8d 100644
--- a/Gems/Maestro/Code/maestro_tests_files.cmake
+++ b/Gems/Maestro/Code/maestro_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MessagePopup/CMakeLists.txt b/Gems/MessagePopup/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/MessagePopup/CMakeLists.txt
+++ b/Gems/MessagePopup/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MessagePopup/Code/CMakeLists.txt b/Gems/MessagePopup/Code/CMakeLists.txt
index cece6ef084..05314dc746 100644
--- a/Gems/MessagePopup/Code/CMakeLists.txt
+++ b/Gems/MessagePopup/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MessagePopup/Code/Include/MessagePopup/MessagePopupBus.h b/Gems/MessagePopup/Code/Include/MessagePopup/MessagePopupBus.h
index 7950dc9534..97c99849b7 100644
--- a/Gems/MessagePopup/Code/Include/MessagePopup/MessagePopupBus.h
+++ b/Gems/MessagePopup/Code/Include/MessagePopup/MessagePopupBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/Source/LyShineMessagePopup.cpp b/Gems/MessagePopup/Code/Source/LyShineMessagePopup.cpp
index cdb682d13e..1a8f570905 100644
--- a/Gems/MessagePopup/Code/Source/LyShineMessagePopup.cpp
+++ b/Gems/MessagePopup/Code/Source/LyShineMessagePopup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/Source/LyShineMessagePopup.h b/Gems/MessagePopup/Code/Source/LyShineMessagePopup.h
index ac1e63cd45..add094346d 100644
--- a/Gems/MessagePopup/Code/Source/LyShineMessagePopup.h
+++ b/Gems/MessagePopup/Code/Source/LyShineMessagePopup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/Source/MessagePopupManager.cpp b/Gems/MessagePopup/Code/Source/MessagePopupManager.cpp
index 82c7cb31f8..1144815ecc 100644
--- a/Gems/MessagePopup/Code/Source/MessagePopupManager.cpp
+++ b/Gems/MessagePopup/Code/Source/MessagePopupManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/Source/MessagePopupManager.h b/Gems/MessagePopup/Code/Source/MessagePopupManager.h
index 8a79bfedbe..8a3609be8f 100644
--- a/Gems/MessagePopup/Code/Source/MessagePopupManager.h
+++ b/Gems/MessagePopup/Code/Source/MessagePopupManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/Source/MessagePopupModule.cpp b/Gems/MessagePopup/Code/Source/MessagePopupModule.cpp
index 66073ffbae..c98e2ba7b1 100644
--- a/Gems/MessagePopup/Code/Source/MessagePopupModule.cpp
+++ b/Gems/MessagePopup/Code/Source/MessagePopupModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.cpp b/Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.cpp
index a0d7ecb187..5723db90d7 100644
--- a/Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.cpp
+++ b/Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.h b/Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.h
index b1cb38b5ae..a5411a124d 100644
--- a/Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.h
+++ b/Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h b/Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
index 8d99a0243c..eefa26c318 100644
--- a/Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
+++ b/Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MessagePopup/Code/messagepopup_files.cmake b/Gems/MessagePopup/Code/messagepopup_files.cmake
index ee5748771c..7d0bb37f7e 100644
--- a/Gems/MessagePopup/Code/messagepopup_files.cmake
+++ b/Gems/MessagePopup/Code/messagepopup_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MessagePopup/Code/messagepopup_shared_files.cmake b/Gems/MessagePopup/Code/messagepopup_shared_files.cmake
index eb06b419dd..583a5c2e51 100644
--- a/Gems/MessagePopup/Code/messagepopup_shared_files.cmake
+++ b/Gems/MessagePopup/Code/messagepopup_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/CMakeLists.txt b/Gems/Metastream/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Metastream/CMakeLists.txt
+++ b/Gems/Metastream/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/CMakeLists.txt b/Gems/Metastream/Code/CMakeLists.txt
index 78c7599871..1d97582fdf 100644
--- a/Gems/Metastream/Code/CMakeLists.txt
+++ b/Gems/Metastream/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Include/Metastream/MetastreamBus.h b/Gems/Metastream/Code/Include/Metastream/MetastreamBus.h
index ce5874bb6b..cc030738ce 100644
--- a/Gems/Metastream/Code/Include/Metastream/MetastreamBus.h
+++ b/Gems/Metastream/Code/Include/Metastream/MetastreamBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/BaseHttpServer.cpp b/Gems/Metastream/Code/Source/BaseHttpServer.cpp
index 6ed385be25..8d61da64a8 100644
--- a/Gems/Metastream/Code/Source/BaseHttpServer.cpp
+++ b/Gems/Metastream/Code/Source/BaseHttpServer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/BaseHttpServer.h b/Gems/Metastream/Code/Source/BaseHttpServer.h
index 032baff861..a92e33f63a 100644
--- a/Gems/Metastream/Code/Source/BaseHttpServer.h
+++ b/Gems/Metastream/Code/Source/BaseHttpServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/CivetHttpServer.cpp b/Gems/Metastream/Code/Source/CivetHttpServer.cpp
index ff3c8a64d7..904a0c57e7 100644
--- a/Gems/Metastream/Code/Source/CivetHttpServer.cpp
+++ b/Gems/Metastream/Code/Source/CivetHttpServer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/CivetHttpServer.h b/Gems/Metastream/Code/Source/CivetHttpServer.h
index f8b2a215d0..cba7569e7c 100644
--- a/Gems/Metastream/Code/Source/CivetHttpServer.h
+++ b/Gems/Metastream/Code/Source/CivetHttpServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/DataCache.cpp b/Gems/Metastream/Code/Source/DataCache.cpp
index d75216550c..c5c80f32bd 100644
--- a/Gems/Metastream/Code/Source/DataCache.cpp
+++ b/Gems/Metastream/Code/Source/DataCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/DataCache.h b/Gems/Metastream/Code/Source/DataCache.h
index 10feaee2e3..1c57fc66c6 100644
--- a/Gems/Metastream/Code/Source/DataCache.h
+++ b/Gems/Metastream/Code/Source/DataCache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/MetastreamGem.cpp b/Gems/Metastream/Code/Source/MetastreamGem.cpp
index d4f6c46c61..72541e508c 100644
--- a/Gems/Metastream/Code/Source/MetastreamGem.cpp
+++ b/Gems/Metastream/Code/Source/MetastreamGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/MetastreamGem.h b/Gems/Metastream/Code/Source/MetastreamGem.h
index a8729b7f56..7cd246b804 100644
--- a/Gems/Metastream/Code/Source/MetastreamGem.h
+++ b/Gems/Metastream/Code/Source/MetastreamGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Metastream_precompiled.h b/Gems/Metastream/Code/Source/Metastream_precompiled.h
index ad49d2df73..e41e011a88 100644
--- a/Gems/Metastream/Code/Source/Metastream_precompiled.h
+++ b/Gems/Metastream/Code/Source/Metastream_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Android/Metastream_Traits_Android.h b/Gems/Metastream/Code/Source/Platform/Android/Metastream_Traits_Android.h
index 3e5aeaf178..92459b6d2c 100644
--- a/Gems/Metastream/Code/Source/Platform/Android/Metastream_Traits_Android.h
+++ b/Gems/Metastream/Code/Source/Platform/Android/Metastream_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Android/Metastream_Traits_Platform.h b/Gems/Metastream/Code/Source/Platform/Android/Metastream_Traits_Platform.h
index fb8577c8c8..0b7cf564a1 100644
--- a/Gems/Metastream/Code/Source/Platform/Android/Metastream_Traits_Platform.h
+++ b/Gems/Metastream/Code/Source/Platform/Android/Metastream_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Android/metastream_android.cmake b/Gems/Metastream/Code/Source/Platform/Android/metastream_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Metastream/Code/Source/Platform/Android/metastream_android.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Android/metastream_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Metastream/Code/Source/Platform/Android/platform_android_files.cmake
index f85cb2ba1b..876dfc2de7 100644
--- a/Gems/Metastream/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Common/Clang/metastream_clang.cmake b/Gems/Metastream/Code/Source/Platform/Common/Clang/metastream_clang.cmake
index d218d0e687..389f9fcf16 100644
--- a/Gems/Metastream/Code/Source/Platform/Common/Clang/metastream_clang.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Common/Clang/metastream_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Common/MSVC/metastream_msvc.cmake b/Gems/Metastream/Code/Source/Platform/Common/MSVC/metastream_msvc.cmake
index 7140547e45..749ffb12bc 100644
--- a/Gems/Metastream/Code/Source/Platform/Common/MSVC/metastream_msvc.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Common/MSVC/metastream_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Linux/Metastream_Traits_Linux.h b/Gems/Metastream/Code/Source/Platform/Linux/Metastream_Traits_Linux.h
index 3e5aeaf178..92459b6d2c 100644
--- a/Gems/Metastream/Code/Source/Platform/Linux/Metastream_Traits_Linux.h
+++ b/Gems/Metastream/Code/Source/Platform/Linux/Metastream_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Linux/Metastream_Traits_Platform.h b/Gems/Metastream/Code/Source/Platform/Linux/Metastream_Traits_Platform.h
index d490420231..836940eda9 100644
--- a/Gems/Metastream/Code/Source/Platform/Linux/Metastream_Traits_Platform.h
+++ b/Gems/Metastream/Code/Source/Platform/Linux/Metastream_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Linux/metastream_linux.cmake b/Gems/Metastream/Code/Source/Platform/Linux/metastream_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Metastream/Code/Source/Platform/Linux/metastream_linux.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Linux/metastream_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Metastream/Code/Source/Platform/Linux/platform_linux_files.cmake
index 80cf2105d5..ae2b767dbe 100644
--- a/Gems/Metastream/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Mac/Metastream_Traits_Mac.h b/Gems/Metastream/Code/Source/Platform/Mac/Metastream_Traits_Mac.h
index 3e5aeaf178..92459b6d2c 100644
--- a/Gems/Metastream/Code/Source/Platform/Mac/Metastream_Traits_Mac.h
+++ b/Gems/Metastream/Code/Source/Platform/Mac/Metastream_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Mac/Metastream_Traits_Platform.h b/Gems/Metastream/Code/Source/Platform/Mac/Metastream_Traits_Platform.h
index 88e78869c2..caf2c397ad 100644
--- a/Gems/Metastream/Code/Source/Platform/Mac/Metastream_Traits_Platform.h
+++ b/Gems/Metastream/Code/Source/Platform/Mac/Metastream_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Mac/metastream_mac.cmake b/Gems/Metastream/Code/Source/Platform/Mac/metastream_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Metastream/Code/Source/Platform/Mac/metastream_mac.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Mac/metastream_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Metastream/Code/Source/Platform/Mac/platform_mac_files.cmake
index 10bfa7af99..75d85294e5 100644
--- a/Gems/Metastream/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Windows/Metastream_Traits_Platform.h b/Gems/Metastream/Code/Source/Platform/Windows/Metastream_Traits_Platform.h
index 76e9f8eb26..6436c38c90 100644
--- a/Gems/Metastream/Code/Source/Platform/Windows/Metastream_Traits_Platform.h
+++ b/Gems/Metastream/Code/Source/Platform/Windows/Metastream_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Windows/Metastream_Traits_Windows.h b/Gems/Metastream/Code/Source/Platform/Windows/Metastream_Traits_Windows.h
index a32aa977d1..39e1cb7a3a 100644
--- a/Gems/Metastream/Code/Source/Platform/Windows/Metastream_Traits_Windows.h
+++ b/Gems/Metastream/Code/Source/Platform/Windows/Metastream_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/Windows/metastream_windows.cmake b/Gems/Metastream/Code/Source/Platform/Windows/metastream_windows.cmake
index 521f51d687..c2cb0a1575 100644
--- a/Gems/Metastream/Code/Source/Platform/Windows/metastream_windows.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Windows/metastream_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Metastream/Code/Source/Platform/Windows/platform_windows_files.cmake
index ee8693c0b0..049f31fa71 100644
--- a/Gems/Metastream/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Metastream/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/iOS/Metastream_Traits_Platform.h b/Gems/Metastream/Code/Source/Platform/iOS/Metastream_Traits_Platform.h
index 9129d30e1f..01c09e8f3b 100644
--- a/Gems/Metastream/Code/Source/Platform/iOS/Metastream_Traits_Platform.h
+++ b/Gems/Metastream/Code/Source/Platform/iOS/Metastream_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/iOS/Metastream_Traits_iOS.h b/Gems/Metastream/Code/Source/Platform/iOS/Metastream_Traits_iOS.h
index 3e5aeaf178..92459b6d2c 100644
--- a/Gems/Metastream/Code/Source/Platform/iOS/Metastream_Traits_iOS.h
+++ b/Gems/Metastream/Code/Source/Platform/iOS/Metastream_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/Source/Platform/iOS/metastream_ios.cmake b/Gems/Metastream/Code/Source/Platform/iOS/metastream_ios.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Metastream/Code/Source/Platform/iOS/metastream_ios.cmake
+++ b/Gems/Metastream/Code/Source/Platform/iOS/metastream_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Metastream/Code/Source/Platform/iOS/platform_ios_files.cmake
index fead40f917..075069500a 100644
--- a/Gems/Metastream/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Metastream/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/Tests/MetastreamTest.cpp b/Gems/Metastream/Code/Tests/MetastreamTest.cpp
index f3ec43eeba..6df70a7faf 100644
--- a/Gems/Metastream/Code/Tests/MetastreamTest.cpp
+++ b/Gems/Metastream/Code/Tests/MetastreamTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Metastream/Code/metastream_files.cmake b/Gems/Metastream/Code/metastream_files.cmake
index 898359559e..3a0dca5c48 100644
--- a/Gems/Metastream/Code/metastream_files.cmake
+++ b/Gems/Metastream/Code/metastream_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/metastream_shared_files.cmake b/Gems/Metastream/Code/metastream_shared_files.cmake
index f68101ec1f..ae55e96766 100644
--- a/Gems/Metastream/Code/metastream_shared_files.cmake
+++ b/Gems/Metastream/Code/metastream_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Metastream/Code/metastream_tests_files.cmake b/Gems/Metastream/Code/metastream_tests_files.cmake
index 62d217f039..7d394d70d9 100644
--- a/Gems/Metastream/Code/metastream_tests_files.cmake
+++ b/Gems/Metastream/Code/metastream_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/CMakeLists.txt b/Gems/Microphone/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Microphone/CMakeLists.txt
+++ b/Gems/Microphone/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/CMakeLists.txt b/Gems/Microphone/Code/CMakeLists.txt
index 41775780e9..be71d65e33 100644
--- a/Gems/Microphone/Code/CMakeLists.txt
+++ b/Gems/Microphone/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Include/Microphone/WAVUtil.h b/Gems/Microphone/Code/Include/Microphone/WAVUtil.h
index d61dd7f1bc..bd672d187a 100644
--- a/Gems/Microphone/Code/Include/Microphone/WAVUtil.h
+++ b/Gems/Microphone/Code/Include/Microphone/WAVUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/MicrophoneModule.cpp b/Gems/Microphone/Code/Source/MicrophoneModule.cpp
index d5910b154d..6830ce7fc2 100644
--- a/Gems/Microphone/Code/Source/MicrophoneModule.cpp
+++ b/Gems/Microphone/Code/Source/MicrophoneModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/MicrophoneSystemComponent.cpp b/Gems/Microphone/Code/Source/MicrophoneSystemComponent.cpp
index 2f9ec2c785..1dee506d97 100644
--- a/Gems/Microphone/Code/Source/MicrophoneSystemComponent.cpp
+++ b/Gems/Microphone/Code/Source/MicrophoneSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/MicrophoneSystemComponent.h b/Gems/Microphone/Code/Source/MicrophoneSystemComponent.h
index e693d3089c..deb60473ab 100644
--- a/Gems/Microphone/Code/Source/MicrophoneSystemComponent.h
+++ b/Gems/Microphone/Code/Source/MicrophoneSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/Microphone_precompiled.h b/Gems/Microphone/Code/Source/Microphone_precompiled.h
index 8d99a0243c..eefa26c318 100644
--- a/Gems/Microphone/Code/Source/Microphone_precompiled.h
+++ b/Gems/Microphone/Code/Source/Microphone_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp b/Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp
index febb209a07..3bf4fb7410 100644
--- a/Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp
+++ b/Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/Platform/Android/java/com/amazon/lumberyard/Microphone/MicrophoneSystemComponent.java b/Gems/Microphone/Code/Source/Platform/Android/java/com/amazon/lumberyard/Microphone/MicrophoneSystemComponent.java
index 39565e74ce..e4e06362c3 100644
--- a/Gems/Microphone/Code/Source/Platform/Android/java/com/amazon/lumberyard/Microphone/MicrophoneSystemComponent.java
+++ b/Gems/Microphone/Code/Source/Platform/Android/java/com/amazon/lumberyard/Microphone/MicrophoneSystemComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/Platform/Android/platform_android.cmake b/Gems/Microphone/Code/Source/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Microphone/Code/Source/Platform/Android/platform_android.cmake
+++ b/Gems/Microphone/Code/Source/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Microphone/Code/Source/Platform/Android/platform_android_files.cmake
index 114519c39d..72afd1be83 100644
--- a/Gems/Microphone/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Microphone/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/Microphone/Code/Source/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Microphone/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/Microphone/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Microphone/Code/Source/Platform/Linux/platform_linux_files.cmake
index 076ef0e157..6609ad87d8 100644
--- a/Gems/Microphone/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Microphone/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/Mac/MicrophoneSystemComponent_Mac.mm b/Gems/Microphone/Code/Source/Platform/Mac/MicrophoneSystemComponent_Mac.mm
index 02b2ec5851..a853c39ec1 100644
--- a/Gems/Microphone/Code/Source/Platform/Mac/MicrophoneSystemComponent_Mac.mm
+++ b/Gems/Microphone/Code/Source/Platform/Mac/MicrophoneSystemComponent_Mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/Microphone/Code/Source/Platform/Mac/platform_mac.cmake
index 66b3ace679..390f0f54d8 100644
--- a/Gems/Microphone/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/Microphone/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Microphone/Code/Source/Platform/Mac/platform_mac_files.cmake
index d6abf44deb..f587546fd7 100644
--- a/Gems/Microphone/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Microphone/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/None/MicrophoneSystemComponent_None.cpp b/Gems/Microphone/Code/Source/Platform/None/MicrophoneSystemComponent_None.cpp
index 70a0769489..ac64680b31 100644
--- a/Gems/Microphone/Code/Source/Platform/None/MicrophoneSystemComponent_None.cpp
+++ b/Gems/Microphone/Code/Source/Platform/None/MicrophoneSystemComponent_None.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/Platform/Windows/MicrophoneSystemComponent_Windows.cpp b/Gems/Microphone/Code/Source/Platform/Windows/MicrophoneSystemComponent_Windows.cpp
index 2d5e706c39..2b72c58b76 100644
--- a/Gems/Microphone/Code/Source/Platform/Windows/MicrophoneSystemComponent_Windows.cpp
+++ b/Gems/Microphone/Code/Source/Platform/Windows/MicrophoneSystemComponent_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/Microphone/Code/Source/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Microphone/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/Microphone/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Microphone/Code/Source/Platform/Windows/platform_windows_files.cmake
index 1170cb88b4..97c4acedd1 100644
--- a/Gems/Microphone/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Microphone/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/iOS/MicrophoneSystemComponent_iOS.mm b/Gems/Microphone/Code/Source/Platform/iOS/MicrophoneSystemComponent_iOS.mm
index 965798e9c7..3601ff3c4b 100644
--- a/Gems/Microphone/Code/Source/Platform/iOS/MicrophoneSystemComponent_iOS.mm
+++ b/Gems/Microphone/Code/Source/Platform/iOS/MicrophoneSystemComponent_iOS.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/Platform/iOS/platform_ios.cmake b/Gems/Microphone/Code/Source/Platform/iOS/platform_ios.cmake
index 66b3ace679..390f0f54d8 100644
--- a/Gems/Microphone/Code/Source/Platform/iOS/platform_ios.cmake
+++ b/Gems/Microphone/Code/Source/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Microphone/Code/Source/Platform/iOS/platform_ios_files.cmake
index 294ddad84b..b0d01a7956 100644
--- a/Gems/Microphone/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Microphone/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/Source/SimpleDownsample.cpp b/Gems/Microphone/Code/Source/SimpleDownsample.cpp
index f23559b57c..854451b830 100644
--- a/Gems/Microphone/Code/Source/SimpleDownsample.cpp
+++ b/Gems/Microphone/Code/Source/SimpleDownsample.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/Source/SimpleDownsample.h b/Gems/Microphone/Code/Source/SimpleDownsample.h
index a850b7eda3..abc87f191a 100644
--- a/Gems/Microphone/Code/Source/SimpleDownsample.h
+++ b/Gems/Microphone/Code/Source/SimpleDownsample.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Microphone/Code/microphone_files.cmake b/Gems/Microphone/Code/microphone_files.cmake
index cb77197c9f..233ce8eb91 100644
--- a/Gems/Microphone/Code/microphone_files.cmake
+++ b/Gems/Microphone/Code/microphone_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Microphone/Code/microphone_shared_files.cmake b/Gems/Microphone/Code/microphone_shared_files.cmake
index 39d2ff87f8..90f5787728 100644
--- a/Gems/Microphone/Code/microphone_shared_files.cmake
+++ b/Gems/Microphone/Code/microphone_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/CMakeLists.txt b/Gems/Multiplayer/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Multiplayer/CMakeLists.txt
+++ b/Gems/Multiplayer/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt
index 42de715cd2..ab6e22225b 100644
--- a/Gems/Multiplayer/Code/CMakeLists.txt
+++ b/Gems/Multiplayer/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -107,7 +107,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
         NAME Multiplayer.Builders GEM_MODULE
         NAMESPACE Gem
-        OUTPUT_NAME Gem.Multiplayer.Builders
         FILES_CMAKE
             multiplayer_tools_files.cmake
         INCLUDE_DIRECTORIES
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/Components/LocalPredictionPlayerInputComponent.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/LocalPredictionPlayerInputComponent.h
index d3fb3aaf06..b6d2508412 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/LocalPredictionPlayerInputComponent.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/LocalPredictionPlayerInputComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerComponent.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerComponent.h
index ced46f7fed..be55ac1d16 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerComponent.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerComponentRegistry.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerComponentRegistry.h
index 30e2047164..f9abdb31fc 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerComponentRegistry.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerComponentRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerController.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerController.h
index 7a3c0a8bc7..cdd83a653b 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerController.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/MultiplayerController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetBindComponent.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetBindComponent.h
index fdf38b37d9..e3871068fc 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetBindComponent.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetBindComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkTransformComponent.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkTransformComponent.h
index 2ea174ba60..5575de9b0d 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkTransformComponent.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkTransformComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h b/Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h
index a21cbf7e1e..c43453450b 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/ConnectionData/IConnectionData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/EntityDomains/IEntityDomain.h b/Gems/Multiplayer/Code/Include/Multiplayer/EntityDomains/IEntityDomain.h
index 53d2ccea2c..30d1576515 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/EntityDomains/IEntityDomain.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/EntityDomains/IEntityDomain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h b/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
index 0a6c8da9be..8c5fe44e2b 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayerTools.h b/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayerTools.h
index ed89b22a50..6f9994806b 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayerTools.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayerTools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/INetworkSpawnableLibrary.h b/Gems/Multiplayer/Code/Include/Multiplayer/INetworkSpawnableLibrary.h
index 1de7d703f9..fc56685c80 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/INetworkSpawnableLibrary.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/INetworkSpawnableLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerConstants.h b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerConstants.h
index c93b40520e..236c0989fe 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerConstants.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerStats.h b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerStats.h
index 8b06442ec8..b31c91c6a5 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerStats.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerStats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerTypes.h b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerTypes.h
index 51fc1bf7bd..9f81ca97a9 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerTypes.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/EntityReplication/ReplicationRecord.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/EntityReplication/ReplicationRecord.h
index 83e63d4991..81cfbe43d0 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/EntityReplication/ReplicationRecord.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/EntityReplication/ReplicationRecord.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/INetworkEntityManager.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/INetworkEntityManager.h
index b231b53378..4241970369 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/INetworkEntityManager.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/INetworkEntityManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityHandle.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityHandle.h
index b4f5703d41..3f67d96ab2 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityHandle.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityHandle.inl b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityHandle.inl
index 1b6057dfda..837176fdfa 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityHandle.inl
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityHandle.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityRpcMessage.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityRpcMessage.h
index 207fb397be..7a0c1b23bf 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityRpcMessage.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityRpcMessage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityUpdateMessage.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityUpdateMessage.h
index 598e912d40..bd8ebbce3d 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityUpdateMessage.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/NetworkEntityUpdateMessage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/IMultiplayerComponentInput.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/IMultiplayerComponentInput.h
index 79386552e4..e7a07073ad 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/IMultiplayerComponentInput.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/IMultiplayerComponentInput.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/NetworkInput.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/NetworkInput.h
index df5daa585d..5d57ea6343 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/NetworkInput.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/NetworkInput.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/INetworkTime.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/INetworkTime.h
index 02a732799a..c88c971636 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/INetworkTime.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/INetworkTime.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.h
index 43dfdc319a..524c70c671 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.inl b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.inl
index 9ff89a237a..73a9d08fcd 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.inl
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.h
index 1f20a6f136..12315c2bff 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.inl b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.inl
index 12149c362a..32fd0a51fc 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.inl
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.h
index 0d94ca6180..796eec5412 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.inl b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.inl
index 5f785e60d7..dc8d98fb45 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.inl
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/Physics/PhysicsUtils.h b/Gems/Multiplayer/Code/Include/Multiplayer/Physics/PhysicsUtils.h
index 4687af1b69..7d9e858b52 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Physics/PhysicsUtils.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Physics/PhysicsUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Include/Multiplayer/ReplicationWindows/IReplicationWindow.h b/Gems/Multiplayer/Code/Include/Multiplayer/ReplicationWindows/IReplicationWindow.h
index ff030132e7..e7ceb5c827 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/ReplicationWindows/IReplicationWindow.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/ReplicationWindows/IReplicationWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp b/Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp
index cb62632668..0b4fa99111 100644
--- a/Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp
index dc8272c27e..b0132120fc 100644
--- a/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Components/MultiplayerComponentRegistry.cpp b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponentRegistry.cpp
index 73a868a7b5..eb290a8599 100644
--- a/Gems/Multiplayer/Code/Source/Components/MultiplayerComponentRegistry.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/MultiplayerComponentRegistry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Components/MultiplayerController.cpp b/Gems/Multiplayer/Code/Source/Components/MultiplayerController.cpp
index 40e4c2b7a3..bda4ba77bd 100644
--- a/Gems/Multiplayer/Code/Source/Components/MultiplayerController.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/MultiplayerController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
index 4a6455d3ac..d35c701ccb 100644
--- a/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
index e0a5c43d61..e956245724 100644
--- a/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.cpp b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.cpp
index 116f5f275f..326d36dfa7 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.cpp
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
index c9eaf788e9..cdfd7dd9eb 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
index c2c00925f6..607f1e07b8 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.cpp b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.cpp
index 18370c0f09..c0f29f4bda 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.cpp
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
index 02cea22339..f9cf0fd680 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
index d5a9ae3a88..168cc6ff51 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.cpp b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.cpp
index bff80676b2..0bcc1f29df 100644
--- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.cpp
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.h b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.h
index ab1c9317f6..2289333b30 100644
--- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.h
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp
index 18e299c83d..390a981164 100644
--- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h
index ecc04ee076..8f7f53c476 100644
--- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
index bc6dc859ef..421d9875bc 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h
index 481df11d67..321b9aee51 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorGem.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorGem.cpp
index c487d52878..6bb79b16be 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorGem.cpp
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorGem.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorGem.h
index c0c29ed36d..44f0d67355 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorGem.h
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
index a2841927d6..69121cf0ba 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -113,6 +113,12 @@ namespace Multiplayer
             {
                 console->PerformCommand("disconnect");
             }
+
+            AZ::Interface<INetworkEntityManager>::Get()->ClearAllEntities();
+
+            // Rebuild the library to clear temporary in-memory spawnable assets
+            AZ::Interface<INetworkSpawnableLibrary>::Get()->BuildSpawnablesList();
+
             break;
         }
     }
@@ -235,7 +241,5 @@ namespace Multiplayer
 
     void MultiplayerEditorSystemComponent::OnGameEntitiesReset()
     {
-        // Rebuild the library to clear temporary in-memory spawnable assets
-        AZ::Interface<INetworkSpawnableLibrary>::Get()->BuildSpawnablesList();
     }
 }
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
index f1abd216e2..7f1966df15 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/EntityDomains/FullOwnershipEntityDomain.cpp b/Gems/Multiplayer/Code/Source/EntityDomains/FullOwnershipEntityDomain.cpp
index b2bb039f58..c4e3fac886 100644
--- a/Gems/Multiplayer/Code/Source/EntityDomains/FullOwnershipEntityDomain.cpp
+++ b/Gems/Multiplayer/Code/Source/EntityDomains/FullOwnershipEntityDomain.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/EntityDomains/FullOwnershipEntityDomain.h b/Gems/Multiplayer/Code/Source/EntityDomains/FullOwnershipEntityDomain.h
index 878154ae12..e1ba723801 100644
--- a/Gems/Multiplayer/Code/Source/EntityDomains/FullOwnershipEntityDomain.h
+++ b/Gems/Multiplayer/Code/Source/EntityDomains/FullOwnershipEntityDomain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
index 7d9cd3bbb9..1aab09543f 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/MultiplayerGem.h b/Gems/Multiplayer/Code/Source/MultiplayerGem.h
index fa7d239312..d9fc9eefa4 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerGem.h
+++ b/Gems/Multiplayer/Code/Source/MultiplayerGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/MultiplayerStats.cpp b/Gems/Multiplayer/Code/Source/MultiplayerStats.cpp
index 9e3130504f..6a66065a8c 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerStats.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerStats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
index dd0135c34b..cc23a6f9b3 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
index 4ce22a214a..a2a46cfd77 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp b/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp
index eb52a63275..59cc78f697 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h b/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h
index 9223af3307..7e6ef9512f 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h
+++ b/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/MultiplayerTypes.h b/Gems/Multiplayer/Code/Source/MultiplayerTypes.h
index 25bf922e38..b65094ca98 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerTypes.h
+++ b/Gems/Multiplayer/Code/Source/MultiplayerTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h b/Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
index 7bc2a24378..e2f396d226 100644
--- a/Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
+++ b/Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
index 40cf7f0ea1..993cb23df7 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.h b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.h
index 2565b81eb4..0020b7b71a 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.cpp
index 5769c099d7..a8918a6332 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.h b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.h
index 8e6a87d369..2adb0ac99f 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.inl b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.inl
index f3997d8c6d..46fb148e8a 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.inl
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertyPublisher.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertyPublisher.cpp
index 404232cb39..2272f43a08 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertyPublisher.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertyPublisher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertyPublisher.h b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertyPublisher.h
index 3cd0e45768..db4b783a19 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertyPublisher.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertyPublisher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp
index 82f059d988..f3427afbca 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.h b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.h
index 0ccbf59a7c..ba93c68bb4 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/ReplicationRecord.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/ReplicationRecord.cpp
index 1bc970d9bf..eecd4915e7 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/ReplicationRecord.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/ReplicationRecord.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityAuthorityTracker.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityAuthorityTracker.cpp
index 09f3a31b96..5058658d42 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityAuthorityTracker.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityAuthorityTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityAuthorityTracker.h b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityAuthorityTracker.h
index 38db991d3f..c3ab82e526 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityAuthorityTracker.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityAuthorityTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityHandle.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityHandle.cpp
index 26d7556d78..489a7db16f 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityHandle.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityHandle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
index 1468e034c0..af914047af 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.h b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.h
index 325ab1a570..a5bcabc0df 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityRpcMessage.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityRpcMessage.cpp
index 5cdf5c29cf..3304f8dc16 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityRpcMessage.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityRpcMessage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.cpp
index 5462d5e420..b2ba87b06e 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.h b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.h
index 2b683eb4ac..e504d737dd 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.inl b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.inl
index 6dba57e27a..7883b11921 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.inl
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityTracker.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityUpdateMessage.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityUpdateMessage.cpp
index 307619bb94..3d9a36b624 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityUpdateMessage.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityUpdateMessage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
index 93bccd5c81..854dd835dd 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.h b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.h
index 021fa84226..c6a034b534 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInput.cpp b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInput.cpp
index 9387c9f49c..75889d9f83 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInput.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInput.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputArray.cpp b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputArray.cpp
index 1b796c2781..32786d438e 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputArray.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputArray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputArray.h b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputArray.h
index e357d7eb13..9128dac106 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputArray.h
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputChild.cpp b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputChild.cpp
index cf188595f8..e44f660cf0 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputChild.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputChild.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputChild.h b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputChild.h
index 3239262bd1..f9715f264e 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputChild.h
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputChild.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputHistory.cpp b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputHistory.cpp
index d75d2a8d09..867bae6151 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputHistory.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputHistory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputHistory.h b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputHistory.h
index b734b184f7..f8fb947be2 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputHistory.h
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputHistory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputMigrationVector.cpp b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputMigrationVector.cpp
index b271c3f46c..a4d4c6848c 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputMigrationVector.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputMigrationVector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputMigrationVector.h b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputMigrationVector.h
index 6e02b57902..4ed20d65a1 100644
--- a/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputMigrationVector.h
+++ b/Gems/Multiplayer/Code/Source/NetworkInput/NetworkInputMigrationVector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp b/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp
index 25455808af..88ffa0b5d7 100644
--- a/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.h b/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.h
index ae5cddd470..53c9540843 100644
--- a/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.h
+++ b/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Physics/PhysicsUtils.cpp b/Gems/Multiplayer/Code/Source/Physics/PhysicsUtils.cpp
index 53dc789482..d17615c098 100644
--- a/Gems/Multiplayer/Code/Source/Physics/PhysicsUtils.cpp
+++ b/Gems/Multiplayer/Code/Source/Physics/PhysicsUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Pipeline/NetBindMarkerComponent.cpp b/Gems/Multiplayer/Code/Source/Pipeline/NetBindMarkerComponent.cpp
index 78852d9bf3..9a5c356c2c 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetBindMarkerComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetBindMarkerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Pipeline/NetBindMarkerComponent.h b/Gems/Multiplayer/Code/Source/Pipeline/NetBindMarkerComponent.h
index 22d3b2cc86..99c91513f3 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetBindMarkerComponent.h
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetBindMarkerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
index 3452a79e25..0c6235eefe 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.h b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.h
index 91177d1788..f503aea640 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.h
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Pipeline/NetworkSpawnableHolderComponent.cpp b/Gems/Multiplayer/Code/Source/Pipeline/NetworkSpawnableHolderComponent.cpp
index 6fdcd7a356..48b6db189e 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetworkSpawnableHolderComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetworkSpawnableHolderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/Pipeline/NetworkSpawnableHolderComponent.h b/Gems/Multiplayer/Code/Source/Pipeline/NetworkSpawnableHolderComponent.h
index 9cf0d429cc..ffbc551562 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetworkSpawnableHolderComponent.h
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetworkSpawnableHolderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.cpp b/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.cpp
index 9a8de2a149..cc94ae3523 100644
--- a/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.cpp
+++ b/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.h b/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.h
index 90408dbd81..0871ac490e 100644
--- a/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.h
+++ b/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.cpp b/Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.cpp
index 088a36cced..7752e16fbf 100644
--- a/Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.cpp
+++ b/Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.h b/Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.h
index 31b100523a..887b915670 100644
--- a/Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.h
+++ b/Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Tests/IMultiplayerConnectionMock.h b/Gems/Multiplayer/Code/Tests/IMultiplayerConnectionMock.h
index 9507874eb8..76a752d087 100644
--- a/Gems/Multiplayer/Code/Tests/IMultiplayerConnectionMock.h
+++ b/Gems/Multiplayer/Code/Tests/IMultiplayerConnectionMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Tests/Main.cpp b/Gems/Multiplayer/Code/Tests/Main.cpp
index 35a6d84e78..141f9473b8 100644
--- a/Gems/Multiplayer/Code/Tests/Main.cpp
+++ b/Gems/Multiplayer/Code/Tests/Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Tests/MainTools.cpp b/Gems/Multiplayer/Code/Tests/MainTools.cpp
index a914955153..bd85bdbbcd 100644
--- a/Gems/Multiplayer/Code/Tests/MainTools.cpp
+++ b/Gems/Multiplayer/Code/Tests/MainTools.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp b/Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp
index 9e6db7fd88..53a5ada914 100644
--- a/Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp b/Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp
index 55bf2af20e..4ac254a23c 100644
--- a/Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/PrefabProcessingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp b/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp
index 2b765594e3..2e3a65a5e5 100644
--- a/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/Tests/RewindableObjectTests.cpp b/Gems/Multiplayer/Code/Tests/RewindableObjectTests.cpp
index 2423ae4335..472a1ce148 100644
--- a/Gems/Multiplayer/Code/Tests/RewindableObjectTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/RewindableObjectTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Multiplayer/Code/multiplayer_autogen_files.cmake b/Gems/Multiplayer/Code/multiplayer_autogen_files.cmake
index 267526234f..d18c8c7b2b 100644
--- a/Gems/Multiplayer/Code/multiplayer_autogen_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_autogen_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/Code/multiplayer_debug_files.cmake b/Gems/Multiplayer/Code/multiplayer_debug_files.cmake
index abaaa19364..d0a5a4f0b9 100644
--- a/Gems/Multiplayer/Code/multiplayer_debug_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_debug_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/Code/multiplayer_editor_shared_files.cmake b/Gems/Multiplayer/Code/multiplayer_editor_shared_files.cmake
index c0c638388a..d5720647fa 100644
--- a/Gems/Multiplayer/Code/multiplayer_editor_shared_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/Code/multiplayer_files.cmake b/Gems/Multiplayer/Code/multiplayer_files.cmake
index 8521ccbaf4..91f0a5fdc6 100644
--- a/Gems/Multiplayer/Code/multiplayer_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/Code/multiplayer_shared_files.cmake b/Gems/Multiplayer/Code/multiplayer_shared_files.cmake
index 537e7b465f..8c6bf623e5 100644
--- a/Gems/Multiplayer/Code/multiplayer_shared_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/Code/multiplayer_tests_files.cmake b/Gems/Multiplayer/Code/multiplayer_tests_files.cmake
index 909f9d2800..2b858f66ef 100644
--- a/Gems/Multiplayer/Code/multiplayer_tests_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/Code/multiplayer_tools_files.cmake b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
index 8ad7ea2b03..2567fb2e5a 100644
--- a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Multiplayer/Code/multiplayer_tools_tests_files.cmake b/Gems/Multiplayer/Code/multiplayer_tools_tests_files.cmake
index 46605a27cb..4e09dd9ad5 100644
--- a/Gems/Multiplayer/Code/multiplayer_tools_tests_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_tools_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MultiplayerCompression/CMakeLists.txt b/Gems/MultiplayerCompression/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/MultiplayerCompression/CMakeLists.txt
+++ b/Gems/MultiplayerCompression/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MultiplayerCompression/Code/CMakeLists.txt b/Gems/MultiplayerCompression/Code/CMakeLists.txt
index c9201acbb3..aaab97333e 100644
--- a/Gems/MultiplayerCompression/Code/CMakeLists.txt
+++ b/Gems/MultiplayerCompression/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.cpp b/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.cpp
index 254d7c0b6f..2cf0542bd1 100644
--- a/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.cpp
+++ b/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.h b/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.h
index f71d456e2a..c7db51c188 100644
--- a/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.h
+++ b/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionFactory.cpp b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionFactory.cpp
index 082101b2a6..d1792cff66 100644
--- a/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionFactory.cpp
+++ b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionFactory.h b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionFactory.h
index 9c68e38a15..69549d2219 100644
--- a/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionFactory.h
+++ b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionModule.cpp b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionModule.cpp
index 01aa033c51..bc4c71e17e 100644
--- a/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionModule.cpp
+++ b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.cpp b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.cpp
index 6c4b215998..6106d2a0ae 100644
--- a/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.cpp
+++ b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.h b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.h
index 6e67f5b135..34863d5bba 100644
--- a/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.h
+++ b/Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MultiplayerCompression/Code/Tests/MultiplayerCompressionTest.cpp b/Gems/MultiplayerCompression/Code/Tests/MultiplayerCompressionTest.cpp
index 6ae3d4a653..05f2649ff9 100644
--- a/Gems/MultiplayerCompression/Code/Tests/MultiplayerCompressionTest.cpp
+++ b/Gems/MultiplayerCompression/Code/Tests/MultiplayerCompressionTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/MultiplayerCompression/Code/multiplayercompression_files.cmake b/Gems/MultiplayerCompression/Code/multiplayercompression_files.cmake
index d1a8330db6..6355cec3f8 100644
--- a/Gems/MultiplayerCompression/Code/multiplayercompression_files.cmake
+++ b/Gems/MultiplayerCompression/Code/multiplayercompression_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MultiplayerCompression/Code/multiplayercompression_shared_files.cmake b/Gems/MultiplayerCompression/Code/multiplayercompression_shared_files.cmake
index a98137e599..652d3716ab 100644
--- a/Gems/MultiplayerCompression/Code/multiplayercompression_shared_files.cmake
+++ b/Gems/MultiplayerCompression/Code/multiplayercompression_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/MultiplayerCompression/Code/multiplayercompression_tests_files.cmake b/Gems/MultiplayerCompression/Code/multiplayercompression_tests_files.cmake
index cf23f7fa25..b353a5a2f5 100644
--- a/Gems/MultiplayerCompression/Code/multiplayercompression_tests_files.cmake
+++ b/Gems/MultiplayerCompression/Code/multiplayercompression_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Assets/prefabs/Cloth/Chicken_Actor.prefab b/Gems/NvCloth/Assets/prefabs/Cloth/Chicken_Actor.prefab
new file mode 100644
index 0000000000..57953f927b
--- /dev/null
+++ b/Gems/NvCloth/Assets/prefabs/Cloth/Chicken_Actor.prefab
@@ -0,0 +1,369 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "Chicken_Actor",
+        "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": "",
+                "Cached World Transform Parent": ""
+            },
+            "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_[303447173544404]": {
+            "Id": "Entity_[303447173544404]",
+            "Name": "Chicken Rigidbody",
+            "Components": {
+                "Component_[11254527722826929517]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 11254527722826929517
+                },
+                "Component_[11752612383131299817]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 11752612383131299817,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 12470135924384913029
+                        }
+                    ]
+                },
+                "Component_[12004522441155896281]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 12004522441155896281
+                },
+                "Component_[12327847693349375221]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12327847693349375221
+                },
+                "Component_[12470135924384913029]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 12470135924384913029,
+                    "Parent Entity": "ContainerEntity",
+                    "Cached World Transform Parent": "ContainerEntity"
+                },
+                "Component_[14919455666821657531]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14919455666821657531,
+                    "ChildEntityOrderEntryArray": [
+                        {
+                            "EntityId": "Entity_[303451468511700]"
+                        }
+                    ]
+                },
+                "Component_[16643225638363527013]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 16643225638363527013
+                },
+                "Component_[17083722249682325420]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 17083722249682325420
+                },
+                "Component_[4274252334406790321]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4274252334406790321
+                },
+                "Component_[786957291078135994]": {
+                    "$type": "SelectionComponent",
+                    "Id": 786957291078135994
+                }
+            },
+            "IsDependencyReady": true
+        },
+        "Entity_[303451468511700]": {
+            "Id": "Entity_[303451468511700]",
+            "Name": "Chicken_Actor",
+            "Components": {
+                "Component_[10153184769011204037]": {
+                    "$type": "SelectionComponent",
+                    "Id": 10153184769011204037
+                },
+                "Component_[12307288056972997582]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 12307288056972997582
+                },
+                "Component_[16388291370935886976]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 16388291370935886976
+                },
+                "Component_[17273633015317842366]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 17273633015317842366
+                },
+                "Component_[18385928157765337756]": {
+                    "$type": "EditorActorComponent",
+                    "Id": 18385928157765337756,
+                    "ActorAsset": {
+                        "assetId": {
+                            "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                            "subId": 166954688
+                        },
+                        "assetHint": "objects/cloth/chicken/actor/chicken.actor"
+                    },
+                    "MaterialPerLOD": [
+                        {
+                            "AssetPath": "objects/cloth/chicken/actor/chicken.mtl"
+                        }
+                    ],
+                    "MaterialPerActor": {
+                        "AssetPath": "objects/cloth/chicken/actor/chicken.mtl"
+                    },
+                    "AttachmentTarget": ""
+                },
+                "Component_[2933618168100824891]": {
+                    "$type": "EditorSimpleMotionComponent",
+                    "Id": 2933618168100824891,
+                    "Configuration": {
+                        "MotionAsset": {
+                            "assetId": {
+                                "guid": "{37045429-A151-5646-97CF-BE931A35C0FC}",
+                                "subId": 2264735902
+                            },
+                            "assetHint": "objects/cloth/chicken/motions/chickenidle.motion"
+                        },
+                        "Loop": true,
+                        "PlaySpeed": 1.2000000476837159
+                    }
+                },
+                "Component_[3482722103355682975]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 3482722103355682975
+                },
+                "Component_[4826327274018205895]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 4826327274018205895
+                },
+                "Component_[5939417605550024797]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 5939417605550024797
+                },
+                "Component_[7236637452394054627]": {
+                    "$type": "EditorClothComponent",
+                    "Id": 7236637452394054627,
+                    "Configuration": {
+                        "Mesh Node": "chicken_mohawk",
+                        "Mass": 4.0,
+                        "Remove Static Triangles": false
+                    }
+                },
+                "Component_[868427789695884987]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 868427789695884987
+                },
+                "Component_[8777596718122199558]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 8777596718122199558,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialAssetId": {
+                                            "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                            "subId": 668669130
+                                        }
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{FB34D8F7-E8CA-542D-92A3-F0E04F3A3EC3}"
+                                            },
+                                            "assetHint": "objects/cloth/chicken/actor/chicken_chicken_body_mat.azmaterial"
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialAssetId": {
+                                            "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                            "subId": 1541321207
+                                        }
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{6114C408-26EE-51DC-8733-A07800BF4991}"
+                                            },
+                                            "assetHint": "objects/cloth/chicken/actor/chicken_chicken_eye_mat.azmaterial"
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialAssetId": {
+                                            "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                            "subId": 2608524672
+                                        }
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{80F92051-203E-52CE-B4D6-E3AED21795C9}"
+                                            },
+                                            "assetHint": "objects/cloth/chicken/actor/chicken_mohawkmat.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "materialSlots": [
+                        {
+                            "id": {
+                                "materialAssetId": {
+                                    "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                    "subId": 668669130
+                                }
+                            },
+                            "materialAsset": {
+                                "assetId": {
+                                    "guid": "{FB34D8F7-E8CA-542D-92A3-F0E04F3A3EC3}"
+                                },
+                                "assetHint": "objects/cloth/chicken/actor/chicken_chicken_body_mat.azmaterial"
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialAssetId": {
+                                    "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                    "subId": 1541321207
+                                }
+                            },
+                            "materialAsset": {
+                                "assetId": {
+                                    "guid": "{6114C408-26EE-51DC-8733-A07800BF4991}"
+                                },
+                                "assetHint": "objects/cloth/chicken/actor/chicken_chicken_eye_mat.azmaterial"
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialAssetId": {
+                                    "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                    "subId": 2608524672
+                                }
+                            },
+                            "materialAsset": {
+                                "assetId": {
+                                    "guid": "{80F92051-203E-52CE-B4D6-E3AED21795C9}"
+                                },
+                                "assetHint": "objects/cloth/chicken/actor/chicken_mohawkmat.azmaterial"
+                            }
+                        }
+                    ],
+                    "materialSlotsByLod": [
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialAssetId": {
+                                        "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                        "subId": 668669130
+                                    }
+                                }
+                            },
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialAssetId": {
+                                        "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                        "subId": 1541321207
+                                    }
+                                }
+                            },
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialAssetId": {
+                                        "guid": "{3E4C6A29-92A4-523E-8739-F3E64957569E}",
+                                        "subId": 2608524672
+                                    }
+                                }
+                            }
+                        ]
+                    ]
+                },
+                "Component_[9845606399230319505]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 9845606399230319505,
+                    "Parent Entity": "Entity_[303447173544404]",
+                    "Transform Data": {
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            -0.00006830000347690657
+                        ]
+                    },
+                    "Cached World Transform Parent": ""
+                },
+                "Component_[9979479216337101498]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 9979479216337101498,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 9845606399230319505
+                        },
+                        {
+                            "ComponentId": 18385928157765337756,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 2933618168100824891,
+                            "SortIndex": 2
+                        },
+                        {
+                            "ComponentId": 8777596718122199558,
+                            "SortIndex": 3
+                        },
+                        {
+                            "ComponentId": 7236637452394054627,
+                            "SortIndex": 4
+                        }
+                    ]
+                }
+            },
+            "IsDependencyReady": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/NvCloth/Assets/prefabs/Cloth/cloth_blinds.prefab b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_blinds.prefab
new file mode 100644
index 0000000000..270f52b29b
--- /dev/null
+++ b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_blinds.prefab
@@ -0,0 +1,222 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "cloth_blinds",
+        "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": "",
+                "Cached World Transform Parent": ""
+            },
+            "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_[303275374852564]": {
+            "Id": "Entity_[303275374852564]",
+            "Name": "cloth_blinds",
+            "Components": {
+                "Component_[10147744244398276652]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 10147744244398276652
+                },
+                "Component_[11309989511197311871]": {
+                    "$type": "EditorClothComponent",
+                    "Id": 11309989511197311871,
+                    "Configuration": {
+                        "Mesh Node": "pPlane1",
+                        "Damping": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Linear Drag": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Angular Drag": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Wind Velocity": [
+                            10.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Air Drag Coefficient": 0.5,
+                        "Air Lift Coefficient": 0.5,
+                        "Update Normals of Static Particles": true
+                    }
+                },
+                "Component_[12850019035302463297]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 12850019035302463297
+                },
+                "Component_[15214644042360665965]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 15214644042360665965,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{C3078003-51DA-5D8E-B311-38C426480DD2}",
+                                    "subId": 283342727
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_blinds.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[17205613619475042888]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 17205613619475042888
+                },
+                "Component_[17262624475618211748]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 17262624475618211748
+                },
+                "Component_[3930083736215151625]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 3930083736215151625,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 4795695323030511838
+                        },
+                        {
+                            "ComponentId": 11309989511197311871,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 15214644042360665965,
+                            "SortIndex": 2
+                        },
+                        {
+                            "ComponentId": 9206497685981025331,
+                            "SortIndex": 3
+                        }
+                    ]
+                },
+                "Component_[4446664869832380031]": {
+                    "$type": "SelectionComponent",
+                    "Id": 4446664869832380031
+                },
+                "Component_[4795695323030511838]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 4795695323030511838,
+                    "Parent Entity": "ContainerEntity",
+                    "Cached World Transform Parent": "ContainerEntity"
+                },
+                "Component_[5800800590637221800]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5800800590637221800
+                },
+                "Component_[6953593560040071775]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 6953593560040071775
+                },
+                "Component_[7074022732104182988]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 7074022732104182988
+                },
+                "Component_[9206497685981025331]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 9206497685981025331,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialAssetId": {
+                                            "guid": "{C3078003-51DA-5D8E-B311-38C426480DD2}",
+                                            "subId": 902256226
+                                        }
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{6BFA7C7C-AF9F-5B12-8B30-6B6ECE9BAB9E}"
+                                            },
+                                            "assetHint": "objects/cloth/environment/cloth_blinds.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "materialSlots": [
+                        {
+                            "id": {
+                                "materialAssetId": {
+                                    "guid": "{C3078003-51DA-5D8E-B311-38C426480DD2}",
+                                    "subId": 902256226
+                                }
+                            },
+                            "materialAsset": {
+                                "assetId": {
+                                    "guid": "{6BFA7C7C-AF9F-5B12-8B30-6B6ECE9BAB9E}"
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_blinds.azmaterial"
+                            }
+                        }
+                    ],
+                    "materialSlotsByLod": [
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialAssetId": {
+                                        "guid": "{C3078003-51DA-5D8E-B311-38C426480DD2}",
+                                        "subId": 902256226
+                                    }
+                                }
+                            }
+                        ]
+                    ]
+                }
+            },
+            "IsDependencyReady": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/NvCloth/Assets/prefabs/Cloth/cloth_blinds_broken.prefab b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_blinds_broken.prefab
new file mode 100644
index 0000000000..7feb61db90
--- /dev/null
+++ b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_blinds_broken.prefab
@@ -0,0 +1,220 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "cloth_blinds_broken",
+        "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": "",
+                "Cached World Transform Parent": ""
+            },
+            "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_[303326914460116]": {
+            "Id": "Entity_[303326914460116]",
+            "Name": "cloth_blinds_broken",
+            "Components": {
+                "Component_[10786078036233199116]": {
+                    "$type": "EditorClothComponent",
+                    "Id": 10786078036233199116,
+                    "Configuration": {
+                        "Mesh Node": "pPlane1",
+                        "Damping": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Linear Drag": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Angular Drag": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Wind Velocity": [
+                            5.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Update Normals of Static Particles": true
+                    }
+                },
+                "Component_[11765361670726469628]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 11765361670726469628,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{A64AD477-5E35-5834-A9A3-580B9D708E0C}",
+                                    "subId": 270272858
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_blinds_broken.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[13771990625644339755]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 13771990625644339755
+                },
+                "Component_[14712436598236321787]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 14712436598236321787
+                },
+                "Component_[14930554686244012752]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14930554686244012752
+                },
+                "Component_[16955243819980352058]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 16955243819980352058
+                },
+                "Component_[17396749751570379839]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 17396749751570379839
+                },
+                "Component_[2237683366320350918]": {
+                    "$type": "SelectionComponent",
+                    "Id": 2237683366320350918
+                },
+                "Component_[4939437553142322315]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 4939437553142322315
+                },
+                "Component_[538074694053236341]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 538074694053236341,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialAssetId": {
+                                            "guid": "{A64AD477-5E35-5834-A9A3-580B9D708E0C}",
+                                            "subId": 902256226
+                                        }
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{EB6CB909-E4BB-54CB-8CAE-6A4B4F203B1B}"
+                                            },
+                                            "assetHint": "objects/cloth/environment/cloth_blinds_broken.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "materialSlots": [
+                        {
+                            "id": {
+                                "materialAssetId": {
+                                    "guid": "{A64AD477-5E35-5834-A9A3-580B9D708E0C}",
+                                    "subId": 902256226
+                                }
+                            },
+                            "materialAsset": {
+                                "assetId": {
+                                    "guid": "{EB6CB909-E4BB-54CB-8CAE-6A4B4F203B1B}"
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_blinds_broken.azmaterial"
+                            }
+                        }
+                    ],
+                    "materialSlotsByLod": [
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialAssetId": {
+                                        "guid": "{A64AD477-5E35-5834-A9A3-580B9D708E0C}",
+                                        "subId": 902256226
+                                    }
+                                }
+                            }
+                        ]
+                    ]
+                },
+                "Component_[5681411293917950785]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 5681411293917950785,
+                    "Parent Entity": "ContainerEntity",
+                    "Cached World Transform Parent": "ContainerEntity"
+                },
+                "Component_[7046686956433693767]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 7046686956433693767,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 5681411293917950785
+                        },
+                        {
+                            "ComponentId": 10786078036233199116,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 11765361670726469628,
+                            "SortIndex": 2
+                        },
+                        {
+                            "ComponentId": 538074694053236341,
+                            "SortIndex": 3
+                        }
+                    ]
+                },
+                "Component_[9565338131843702938]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9565338131843702938
+                }
+            },
+            "IsDependencyReady": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_corners_four.prefab b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_corners_four.prefab
new file mode 100644
index 0000000000..cdbe92dab6
--- /dev/null
+++ b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_corners_four.prefab
@@ -0,0 +1,225 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "cloth_locked_corners_four",
+        "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": "",
+                "Cached World Transform Parent": ""
+            },
+            "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_[303417108773332]": {
+            "Id": "Entity_[303417108773332]",
+            "Name": "cloth_locked_corners_four",
+            "Components": {
+                "Component_[10032168678611459233]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 10032168678611459233,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{89C91D92-7B4E-5EB5-945D-0053111859EE}",
+                                    "subId": 279249006
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_locked_corners_four.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[12766570162661899127]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 12766570162661899127,
+                    "Parent Entity": "ContainerEntity",
+                    "Cached World Transform Parent": "ContainerEntity"
+                },
+                "Component_[12950486357466178058]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12950486357466178058,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialAssetId": {
+                                            "guid": "{89C91D92-7B4E-5EB5-945D-0053111859EE}",
+                                            "subId": 902256226
+                                        }
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{838EA487-0F74-5448-AABE-947B138CD6C2}"
+                                            },
+                                            "assetHint": "objects/cloth/environment/cloth_locked_corners_four.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "materialSlots": [
+                        {
+                            "id": {
+                                "materialAssetId": {
+                                    "guid": "{89C91D92-7B4E-5EB5-945D-0053111859EE}",
+                                    "subId": 902256226
+                                }
+                            },
+                            "materialAsset": {
+                                "assetId": {
+                                    "guid": "{838EA487-0F74-5448-AABE-947B138CD6C2}"
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_locked_corners_four.azmaterial"
+                            }
+                        }
+                    ],
+                    "materialSlotsByLod": [
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialAssetId": {
+                                        "guid": "{89C91D92-7B4E-5EB5-945D-0053111859EE}",
+                                        "subId": 902256226
+                                    }
+                                }
+                            }
+                        ]
+                    ]
+                },
+                "Component_[13484816898680823471]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 13484816898680823471
+                },
+                "Component_[1382754615503170687]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 1382754615503170687,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 12766570162661899127
+                        },
+                        {
+                            "ComponentId": 15114198178471353754,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 10032168678611459233,
+                            "SortIndex": 2
+                        },
+                        {
+                            "ComponentId": 12950486357466178058,
+                            "SortIndex": 3
+                        }
+                    ]
+                },
+                "Component_[14681412843852848812]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14681412843852848812
+                },
+                "Component_[15114198178471353754]": {
+                    "$type": "EditorClothComponent",
+                    "Id": 15114198178471353754,
+                    "Configuration": {
+                        "Mesh Node": "pPlane1",
+                        "Stiffness Frequency": 1.0,
+                        "Damping": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Linear Drag": [
+                            0.10000000149011612,
+                            0.10000000149011612,
+                            0.10000000149011612
+                        ],
+                        "Angular Drag": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Wind Velocity": [
+                            30.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Air Drag Coefficient": 0.5,
+                        "Air Lift Coefficient": 0.5,
+                        "Tether Constraint Stiffness": 0.10000000149011612,
+                        "Solver Frequency": 0.10000000149011612,
+                        "Update Normals of Static Particles": true
+                    }
+                },
+                "Component_[16053566237817170938]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 16053566237817170938
+                },
+                "Component_[4429394044165993194]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 4429394044165993194
+                },
+                "Component_[5458686923744863438]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5458686923744863438
+                },
+                "Component_[7652255413353256955]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7652255413353256955
+                },
+                "Component_[8417657922837077982]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 8417657922837077982
+                },
+                "Component_[944311658362107535]": {
+                    "$type": "SelectionComponent",
+                    "Id": 944311658362107535
+                }
+            },
+            "IsDependencyReady": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_corners_two.prefab b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_corners_two.prefab
new file mode 100644
index 0000000000..068c4a6a7e
--- /dev/null
+++ b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_corners_two.prefab
@@ -0,0 +1,221 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "cloth_locked_corners_two",
+        "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": "",
+                "Cached World Transform Parent": ""
+            },
+            "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_[303387044002260]": {
+            "Id": "Entity_[303387044002260]",
+            "Name": "cloth_locked_corners_two",
+            "Components": {
+                "Component_[1001638726593827857]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 1001638726593827857
+                },
+                "Component_[10262713678088900797]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 10262713678088900797
+                },
+                "Component_[11187088727311308743]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 11187088727311308743
+                },
+                "Component_[11287804792148854494]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 11287804792148854494
+                },
+                "Component_[13071159905056054261]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 13071159905056054261
+                },
+                "Component_[14654386610096307993]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14654386610096307993
+                },
+                "Component_[16927361351552746000]": {
+                    "$type": "EditorClothComponent",
+                    "Id": 16927361351552746000,
+                    "Configuration": {
+                        "Mesh Node": "pPlane1",
+                        "Mass": 10.0,
+                        "Stiffness Frequency": 1.0,
+                        "Damping": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Linear Drag": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Angular Drag": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Air Drag Coefficient": 0.5,
+                        "Air Lift Coefficient": 0.800000011920929,
+                        "Tether Constraint Stiffness": 0.10000000149011612,
+                        "Solver Frequency": 0.5,
+                        "Update Normals of Static Particles": true
+                    }
+                },
+                "Component_[2410073307760782444]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 2410073307760782444
+                },
+                "Component_[4751432498761592063]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 4751432498761592063,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 5636741882934012477
+                        },
+                        {
+                            "ComponentId": 16927361351552746000,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 7032406204252577953,
+                            "SortIndex": 2
+                        },
+                        {
+                            "ComponentId": 9419069324766365964,
+                            "SortIndex": 3
+                        }
+                    ]
+                },
+                "Component_[5636741882934012477]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 5636741882934012477,
+                    "Parent Entity": "ContainerEntity",
+                    "Cached World Transform Parent": "ContainerEntity"
+                },
+                "Component_[691437686890444081]": {
+                    "$type": "SelectionComponent",
+                    "Id": 691437686890444081
+                },
+                "Component_[7032406204252577953]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 7032406204252577953,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{23C6817F-0B79-5CAD-B861-9E6F5E55927D}",
+                                    "subId": 280646834
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_locked_corners_two.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[9419069324766365964]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 9419069324766365964,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialAssetId": {
+                                            "guid": "{23C6817F-0B79-5CAD-B861-9E6F5E55927D}",
+                                            "subId": 902256226
+                                        }
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{A56F28DD-6082-50B6-9B44-9EF3E03E95BB}"
+                                            },
+                                            "assetHint": "objects/cloth/environment/cloth_locked_corners_two.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "materialSlots": [
+                        {
+                            "id": {
+                                "materialAssetId": {
+                                    "guid": "{23C6817F-0B79-5CAD-B861-9E6F5E55927D}",
+                                    "subId": 902256226
+                                }
+                            },
+                            "materialAsset": {
+                                "assetId": {
+                                    "guid": "{A56F28DD-6082-50B6-9B44-9EF3E03E95BB}"
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_locked_corners_two.azmaterial"
+                            }
+                        }
+                    ],
+                    "materialSlotsByLod": [
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialAssetId": {
+                                        "guid": "{23C6817F-0B79-5CAD-B861-9E6F5E55927D}",
+                                        "subId": 902256226
+                                    }
+                                }
+                            }
+                        ]
+                    ]
+                }
+            },
+            "IsDependencyReady": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_edge.prefab b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_edge.prefab
new file mode 100644
index 0000000000..7bba36adf8
--- /dev/null
+++ b/Gems/NvCloth/Assets/prefabs/Cloth/cloth_locked_edge.prefab
@@ -0,0 +1,222 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "cloth_locked_edge",
+        "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": "",
+                "Cached World Transform Parent": ""
+            },
+            "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_[303356979231188]": {
+            "Id": "Entity_[303356979231188]",
+            "Name": "cloth_locked_edge",
+            "Components": {
+                "Component_[10058909754154454376]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 10058909754154454376
+                },
+                "Component_[13619550272459633699]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 13619550272459633699,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{9DCAD62C-7A35-5D7D-8276-870D646CD5E2}",
+                                    "subId": 272561654
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_locked_edge.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[14771752773951891563]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14771752773951891563,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 4215669181198357248
+                        },
+                        {
+                            "ComponentId": 16595775512479337011,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 13619550272459633699,
+                            "SortIndex": 2
+                        },
+                        {
+                            "ComponentId": 4580390205455331350,
+                            "SortIndex": 3
+                        }
+                    ]
+                },
+                "Component_[14983280478781449966]": {
+                    "$type": "SelectionComponent",
+                    "Id": 14983280478781449966
+                },
+                "Component_[16595775512479337011]": {
+                    "$type": "EditorClothComponent",
+                    "Id": 16595775512479337011,
+                    "Configuration": {
+                        "Mesh Node": "pPlane1",
+                        "Damping": [
+                            0.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Linear Drag": [
+                            0.5,
+                            0.5,
+                            0.5
+                        ],
+                        "Angular Drag": [
+                            0.5,
+                            0.5,
+                            0.5
+                        ],
+                        "Wind Velocity": [
+                            10.0,
+                            0.0,
+                            0.0
+                        ],
+                        "Air Drag Coefficient": 0.5,
+                        "Air Lift Coefficient": 0.5,
+                        "Update Normals of Static Particles": true
+                    }
+                },
+                "Component_[16893372770952587461]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16893372770952587461
+                },
+                "Component_[4215669181198357248]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 4215669181198357248,
+                    "Parent Entity": "ContainerEntity",
+                    "Cached World Transform Parent": "ContainerEntity"
+                },
+                "Component_[4580390205455331350]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 4580390205455331350,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialAssetId": {
+                                            "guid": "{9DCAD62C-7A35-5D7D-8276-870D646CD5E2}",
+                                            "subId": 902256226
+                                        }
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{FF25E0FE-B695-5084-AE1E-65F095AA5C3F}"
+                                            },
+                                            "assetHint": "objects/cloth/environment/cloth_locked_edge.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "materialSlots": [
+                        {
+                            "id": {
+                                "materialAssetId": {
+                                    "guid": "{9DCAD62C-7A35-5D7D-8276-870D646CD5E2}",
+                                    "subId": 902256226
+                                }
+                            },
+                            "materialAsset": {
+                                "assetId": {
+                                    "guid": "{FF25E0FE-B695-5084-AE1E-65F095AA5C3F}"
+                                },
+                                "assetHint": "objects/cloth/environment/cloth_locked_edge.azmaterial"
+                            }
+                        }
+                    ],
+                    "materialSlotsByLod": [
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialAssetId": {
+                                        "guid": "{9DCAD62C-7A35-5D7D-8276-870D646CD5E2}",
+                                        "subId": 902256226
+                                    }
+                                }
+                            }
+                        ]
+                    ]
+                },
+                "Component_[5652509070289279796]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5652509070289279796
+                },
+                "Component_[5729541152832178099]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 5729541152832178099
+                },
+                "Component_[734939761857694320]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 734939761857694320
+                },
+                "Component_[9519328464240977334]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 9519328464240977334
+                },
+                "Component_[9694796263300215788]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 9694796263300215788
+                }
+            },
+            "IsDependencyReady": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/NvCloth/CMakeLists.txt b/Gems/NvCloth/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/NvCloth/CMakeLists.txt
+++ b/Gems/NvCloth/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/CMakeLists.txt b/Gems/NvCloth/Code/CMakeLists.txt
index f145fd71c0..de77453d9b 100644
--- a/Gems/NvCloth/Code/CMakeLists.txt
+++ b/Gems/NvCloth/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/Include/NvCloth/ICloth.h b/Gems/NvCloth/Code/Include/NvCloth/ICloth.h
index 5c2a972257..177b78986c 100644
--- a/Gems/NvCloth/Code/Include/NvCloth/ICloth.h
+++ b/Gems/NvCloth/Code/Include/NvCloth/ICloth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Include/NvCloth/IClothConfigurator.h b/Gems/NvCloth/Code/Include/NvCloth/IClothConfigurator.h
index b9ea8c711c..19ee76eca1 100644
--- a/Gems/NvCloth/Code/Include/NvCloth/IClothConfigurator.h
+++ b/Gems/NvCloth/Code/Include/NvCloth/IClothConfigurator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Include/NvCloth/IClothSystem.h b/Gems/NvCloth/Code/Include/NvCloth/IClothSystem.h
index cf52981dd8..07ca6b53d8 100644
--- a/Gems/NvCloth/Code/Include/NvCloth/IClothSystem.h
+++ b/Gems/NvCloth/Code/Include/NvCloth/IClothSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Include/NvCloth/IFabricCooker.h b/Gems/NvCloth/Code/Include/NvCloth/IFabricCooker.h
index 4275a53eaf..fdb3cf5142 100644
--- a/Gems/NvCloth/Code/Include/NvCloth/IFabricCooker.h
+++ b/Gems/NvCloth/Code/Include/NvCloth/IFabricCooker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Include/NvCloth/ISolver.h b/Gems/NvCloth/Code/Include/NvCloth/ISolver.h
index 81df55aee0..ce9f402598 100644
--- a/Gems/NvCloth/Code/Include/NvCloth/ISolver.h
+++ b/Gems/NvCloth/Code/Include/NvCloth/ISolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Include/NvCloth/ITangentSpaceHelper.h b/Gems/NvCloth/Code/Include/NvCloth/ITangentSpaceHelper.h
index 9ee50d4b9f..43a482a824 100644
--- a/Gems/NvCloth/Code/Include/NvCloth/ITangentSpaceHelper.h
+++ b/Gems/NvCloth/Code/Include/NvCloth/ITangentSpaceHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Include/NvCloth/Types.h b/Gems/NvCloth/Code/Include/NvCloth/Types.h
index 7fc0d5a113..46f79ac44c 100644
--- a/Gems/NvCloth/Code/Include/NvCloth/Types.h
+++ b/Gems/NvCloth/Code/Include/NvCloth/Types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake b/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
index 40b55d3251..77e8a42871 100644
--- a/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
+++ b/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/Platform/Linux/PAL_linux.cmake b/Gems/NvCloth/Code/Platform/Linux/PAL_linux.cmake
index 40b55d3251..77e8a42871 100644
--- a/Gems/NvCloth/Code/Platform/Linux/PAL_linux.cmake
+++ b/Gems/NvCloth/Code/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake b/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
index 40b55d3251..77e8a42871 100644
--- a/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
+++ b/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake b/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
index e6ba7f735f..afedeb2df8 100644
--- a/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
+++ b/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake b/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
index 40b55d3251..77e8a42871 100644
--- a/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
+++ b/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/Source/Components/ClothComponent.cpp b/Gems/NvCloth/Code/Source/Components/ClothComponent.cpp
index 9bc3535ef9..79ff06dac2 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponent.cpp
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponent.h b/Gems/NvCloth/Code/Source/Components/ClothComponent.h
index 1fc360ec9f..e58c279adf 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponent.h
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.cpp b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.cpp
index c4bc6ad43b..8b07d0ce22 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.cpp
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.h b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.h
index b3d0186be4..cb0c0ee21e 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.h
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp
index 62566d4b61..f60f5dbf27 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.h b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.h
index f533af7be4..22aa5d13ec 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.h
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.cpp b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.cpp
index 5b8576fbb3..b791e8a543 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.cpp
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.h b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.h
index 88fcb3302b..87b08e7250 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.h
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothConstraints.cpp b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothConstraints.cpp
index 89ed09c223..e4d9d897bf 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothConstraints.cpp
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothConstraints.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothConstraints.h b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothConstraints.h
index f2722339b0..de517de2fc 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothConstraints.h
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothConstraints.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothDebugDisplay.cpp b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothDebugDisplay.cpp
index 2eba9a1485..80cc8ca0d1 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothDebugDisplay.cpp
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothDebugDisplay.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothDebugDisplay.h b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothDebugDisplay.h
index 8d8b7d818d..ff6f50a201 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothDebugDisplay.h
+++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothDebugDisplay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothConfiguration.cpp b/Gems/NvCloth/Code/Source/Components/ClothConfiguration.cpp
index 93f4d79325..8950edb5e7 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothConfiguration.cpp
+++ b/Gems/NvCloth/Code/Source/Components/ClothConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/ClothConfiguration.h b/Gems/NvCloth/Code/Source/Components/ClothConfiguration.h
index f2de17f471..37cd5093e2 100644
--- a/Gems/NvCloth/Code/Source/Components/ClothConfiguration.h
+++ b/Gems/NvCloth/Code/Source/Components/ClothConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
index 11343575fe..a71866fc6f 100644
--- a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
+++ b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -68,7 +68,7 @@ namespace NvCloth
 
                     // Mesh Node
                     ->DataElement(Editor::MeshNodeSelector, &ClothConfiguration::m_meshNode, "Mesh node", 
-                        "List of mesh nodes with cloth simulation data. These are the nodes selected inside Cloth Modifiers in FBX Editor Settings.")
+                        "List of mesh nodes with cloth simulation data. These are the nodes selected inside Cloth Modifiers in Scene Settings.")
                         ->Attribute(AZ::Edit::UIHandlers::EntityId, &ClothConfiguration::GetEntityId)
                         ->Attribute(AZ::Edit::Attributes::StringList, &ClothConfiguration::PopulateMeshNodeList)
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
diff --git a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.h b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
index b04f2d0f99..b075ae9114 100644
--- a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
+++ b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Editor/ComboBoxEditButtonPair.cpp b/Gems/NvCloth/Code/Source/Editor/ComboBoxEditButtonPair.cpp
index 64348792d8..ac539a4e61 100644
--- a/Gems/NvCloth/Code/Source/Editor/ComboBoxEditButtonPair.cpp
+++ b/Gems/NvCloth/Code/Source/Editor/ComboBoxEditButtonPair.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Editor/ComboBoxEditButtonPair.h b/Gems/NvCloth/Code/Source/Editor/ComboBoxEditButtonPair.h
index b3d8648f89..0b185b1736 100644
--- a/Gems/NvCloth/Code/Source/Editor/ComboBoxEditButtonPair.h
+++ b/Gems/NvCloth/Code/Source/Editor/ComboBoxEditButtonPair.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Editor/EditorSystemComponent.cpp b/Gems/NvCloth/Code/Source/Editor/EditorSystemComponent.cpp
index 5ebd1934e3..695e543bdd 100644
--- a/Gems/NvCloth/Code/Source/Editor/EditorSystemComponent.cpp
+++ b/Gems/NvCloth/Code/Source/Editor/EditorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Editor/EditorSystemComponent.h b/Gems/NvCloth/Code/Source/Editor/EditorSystemComponent.h
index d9e687d08e..929dd368d0 100644
--- a/Gems/NvCloth/Code/Source/Editor/EditorSystemComponent.h
+++ b/Gems/NvCloth/Code/Source/Editor/EditorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Editor/MeshNodeHandler.cpp b/Gems/NvCloth/Code/Source/Editor/MeshNodeHandler.cpp
index 85b89e0bb9..20a6c91c89 100644
--- a/Gems/NvCloth/Code/Source/Editor/MeshNodeHandler.cpp
+++ b/Gems/NvCloth/Code/Source/Editor/MeshNodeHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -25,8 +25,8 @@ namespace NvCloth
         {
             widget_t* picker = new widget_t(parent);
 
-            // Set edit button appearance to go to FBX Settings dialog
-            picker->GetEditButton()->setToolTip("Open FBX Settings to setup Cloth Modifiers");
+            // Set edit button appearance to go to Scene Settings dialog
+            picker->GetEditButton()->setToolTip("Open Scene Settings to setup Cloth Modifiers");
             picker->GetEditButton()->setText("");
             picker->GetEditButton()->setEnabled(false);
 
@@ -106,7 +106,7 @@ namespace NvCloth
             AZ::Data::Asset<AZ::Data::AssetData> meshAsset = GetMeshAsset(GUI->GetEntityId());
             if (meshAsset)
             {
-                // Open the asset with the preferred asset editor, which for Mesh and Actor Assets it's FBX Settings.
+                // Open the asset with the preferred asset editor, which for Mesh and Actor Assets it's Scene Settings.
                 bool handled = false;
                 AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Broadcast(
                     &AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotifications::OpenAssetInAssociatedEditor, meshAsset.GetId(), handled);
diff --git a/Gems/NvCloth/Code/Source/Editor/MeshNodeHandler.h b/Gems/NvCloth/Code/Source/Editor/MeshNodeHandler.h
index a47758cb13..fec346f0bc 100644
--- a/Gems/NvCloth/Code/Source/Editor/MeshNodeHandler.h
+++ b/Gems/NvCloth/Code/Source/Editor/MeshNodeHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Editor/PropertyTypes.cpp b/Gems/NvCloth/Code/Source/Editor/PropertyTypes.cpp
index d54fbd8f24..d29e52af83 100644
--- a/Gems/NvCloth/Code/Source/Editor/PropertyTypes.cpp
+++ b/Gems/NvCloth/Code/Source/Editor/PropertyTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Editor/PropertyTypes.h b/Gems/NvCloth/Code/Source/Editor/PropertyTypes.h
index fa7cee032a..db74d3666f 100644
--- a/Gems/NvCloth/Code/Source/Editor/PropertyTypes.h
+++ b/Gems/NvCloth/Code/Source/Editor/PropertyTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Module.cpp b/Gems/NvCloth/Code/Source/Module.cpp
index c1da4d590b..421a437629 100644
--- a/Gems/NvCloth/Code/Source/Module.cpp
+++ b/Gems/NvCloth/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/ModuleUnsupported.cpp b/Gems/NvCloth/Code/Source/ModuleUnsupported.cpp
index e5537140e6..4d14f21f72 100644
--- a/Gems/NvCloth/Code/Source/ModuleUnsupported.cpp
+++ b/Gems/NvCloth/Code/Source/ModuleUnsupported.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRule.cpp b/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRule.cpp
index c635c5e7da..9870dd1f96 100644
--- a/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRule.cpp
+++ b/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -19,7 +19,7 @@ namespace NvCloth
     namespace Pipeline
     {
         // It's necessary for the rule to specify the system allocator, otherwise
-        // the editor crashes when deleting the cloth modifier from FBX Settings.
+        // the editor crashes when deleting the cloth modifier from Scene Settings.
         AZ_CLASS_ALLOCATOR_IMPL(ClothRule, AZ::SystemAllocator, 0)
 
         const char* const ClothRule::DefaultChooseNodeName = "Choose a node";
diff --git a/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRule.h b/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRule.h
index dc6057933c..859f976c2a 100644
--- a/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRule.h
+++ b/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRuleBehavior.cpp b/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRuleBehavior.cpp
index 00a9f84ccf..c9df74ff61 100644
--- a/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRuleBehavior.cpp
+++ b/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRuleBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -61,7 +61,7 @@ namespace NvCloth
             [[maybe_unused]] const AZ::SceneAPI::Containers::Scene& scene,
             AZ::SceneAPI::DataTypes::IManifestObject& target)
         {
-            // When a cloth rule is created in the FBX Editor Settings...
+            // When a cloth rule is created in the Scene Settings...
             if (target.RTTI_IsTypeOf(ClothRule::TYPEINFO_Uuid()))
             {
                 ClothRule* clothRule = azrtti_cast<ClothRule*>(&target);
diff --git a/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRuleBehavior.h b/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRuleBehavior.h
index 089dea9c2e..eff6e8990d 100644
--- a/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRuleBehavior.h
+++ b/Gems/NvCloth/Code/Source/Pipeline/SceneAPIExt/ClothRuleBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -39,7 +39,7 @@ namespace NvCloth
         //! It specifies the valid Scene Groups that are allowed to have
         //! cloth rules (aka cloth modifiers), these are Mesh and Actor groups.
         //! It also validates the cloth rules data for the manifest (asset containing
-        //! all the Scene information from the FBX Editor Settings).
+        //! all the Scene information from the Scene Settings).
         class ClothRuleBehavior
             : public AZ::SceneAPI::SceneCore::BehaviorComponent
             , public AZ::SceneAPI::Events::ManifestMetaInfoBus::Handler
diff --git a/Gems/NvCloth/Code/Source/System/Cloth.cpp b/Gems/NvCloth/Code/Source/System/Cloth.cpp
index e736a8996c..640a60bb31 100644
--- a/Gems/NvCloth/Code/Source/System/Cloth.cpp
+++ b/Gems/NvCloth/Code/Source/System/Cloth.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/Cloth.h b/Gems/NvCloth/Code/Source/System/Cloth.h
index c650d803bd..79af33eac5 100644
--- a/Gems/NvCloth/Code/Source/System/Cloth.h
+++ b/Gems/NvCloth/Code/Source/System/Cloth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/Fabric.h b/Gems/NvCloth/Code/Source/System/Fabric.h
index d6cead7edb..6e1f59fa77 100644
--- a/Gems/NvCloth/Code/Source/System/Fabric.h
+++ b/Gems/NvCloth/Code/Source/System/Fabric.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/FabricCooker.cpp b/Gems/NvCloth/Code/Source/System/FabricCooker.cpp
index 4961eeb5bd..cc0b88b6fe 100644
--- a/Gems/NvCloth/Code/Source/System/FabricCooker.cpp
+++ b/Gems/NvCloth/Code/Source/System/FabricCooker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/FabricCooker.h b/Gems/NvCloth/Code/Source/System/FabricCooker.h
index e11408dce3..e66e289f8a 100644
--- a/Gems/NvCloth/Code/Source/System/FabricCooker.h
+++ b/Gems/NvCloth/Code/Source/System/FabricCooker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/Factory.cpp b/Gems/NvCloth/Code/Source/System/Factory.cpp
index 9f3515453d..6ddda48ce8 100644
--- a/Gems/NvCloth/Code/Source/System/Factory.cpp
+++ b/Gems/NvCloth/Code/Source/System/Factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/Factory.h b/Gems/NvCloth/Code/Source/System/Factory.h
index 762e0b5660..262611af7c 100644
--- a/Gems/NvCloth/Code/Source/System/Factory.h
+++ b/Gems/NvCloth/Code/Source/System/Factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/NvTypes.cpp b/Gems/NvCloth/Code/Source/System/NvTypes.cpp
index ce4a3fb9fc..689c1bdbdb 100644
--- a/Gems/NvCloth/Code/Source/System/NvTypes.cpp
+++ b/Gems/NvCloth/Code/Source/System/NvTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/NvTypes.h b/Gems/NvCloth/Code/Source/System/NvTypes.h
index 4ce8c83fe9..4799843ad9 100644
--- a/Gems/NvCloth/Code/Source/System/NvTypes.h
+++ b/Gems/NvCloth/Code/Source/System/NvTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/Solver.cpp b/Gems/NvCloth/Code/Source/System/Solver.cpp
index acceceff8b..2afd5170db 100644
--- a/Gems/NvCloth/Code/Source/System/Solver.cpp
+++ b/Gems/NvCloth/Code/Source/System/Solver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/Solver.h b/Gems/NvCloth/Code/Source/System/Solver.h
index a231158b2e..a0b1dd212b 100644
--- a/Gems/NvCloth/Code/Source/System/Solver.h
+++ b/Gems/NvCloth/Code/Source/System/Solver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/SystemComponent.cpp b/Gems/NvCloth/Code/Source/System/SystemComponent.cpp
index 75c9e2b15f..6046c1aa9c 100644
--- a/Gems/NvCloth/Code/Source/System/SystemComponent.cpp
+++ b/Gems/NvCloth/Code/Source/System/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/SystemComponent.h b/Gems/NvCloth/Code/Source/System/SystemComponent.h
index 43cf4afb77..728799a54b 100644
--- a/Gems/NvCloth/Code/Source/System/SystemComponent.h
+++ b/Gems/NvCloth/Code/Source/System/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/TangentSpaceHelper.cpp b/Gems/NvCloth/Code/Source/System/TangentSpaceHelper.cpp
index a4e831bf26..b43ad1923b 100644
--- a/Gems/NvCloth/Code/Source/System/TangentSpaceHelper.cpp
+++ b/Gems/NvCloth/Code/Source/System/TangentSpaceHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/System/TangentSpaceHelper.h b/Gems/NvCloth/Code/Source/System/TangentSpaceHelper.h
index c04ea6519e..4227cca029 100644
--- a/Gems/NvCloth/Code/Source/System/TangentSpaceHelper.h
+++ b/Gems/NvCloth/Code/Source/System/TangentSpaceHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Utils/Allocators.h b/Gems/NvCloth/Code/Source/Utils/Allocators.h
index c64571b97f..1931ddeaa9 100644
--- a/Gems/NvCloth/Code/Source/Utils/Allocators.h
+++ b/Gems/NvCloth/Code/Source/Utils/Allocators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Utils/AssetHelper.cpp b/Gems/NvCloth/Code/Source/Utils/AssetHelper.cpp
index 12a9f975b4..7c11595a0d 100644
--- a/Gems/NvCloth/Code/Source/Utils/AssetHelper.cpp
+++ b/Gems/NvCloth/Code/Source/Utils/AssetHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Utils/AssetHelper.h b/Gems/NvCloth/Code/Source/Utils/AssetHelper.h
index cac10869ac..bec45fe6a1 100644
--- a/Gems/NvCloth/Code/Source/Utils/AssetHelper.h
+++ b/Gems/NvCloth/Code/Source/Utils/AssetHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Utils/MeshAssetHelper.cpp b/Gems/NvCloth/Code/Source/Utils/MeshAssetHelper.cpp
index ad12930c15..da13afc5fa 100644
--- a/Gems/NvCloth/Code/Source/Utils/MeshAssetHelper.cpp
+++ b/Gems/NvCloth/Code/Source/Utils/MeshAssetHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Source/Utils/MeshAssetHelper.h b/Gems/NvCloth/Code/Source/Utils/MeshAssetHelper.h
index 1ea020f5c2..4a3ca9bc40 100644
--- a/Gems/NvCloth/Code/Source/Utils/MeshAssetHelper.h
+++ b/Gems/NvCloth/Code/Source/Utils/MeshAssetHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/ActorHelper.cpp b/Gems/NvCloth/Code/Tests/ActorHelper.cpp
index 98cdcb45d6..4182125fbe 100644
--- a/Gems/NvCloth/Code/Tests/ActorHelper.cpp
+++ b/Gems/NvCloth/Code/Tests/ActorHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/ActorHelper.h b/Gems/NvCloth/Code/Tests/ActorHelper.h
index 5c473fc2b3..8d9f34a193 100644
--- a/Gems/NvCloth/Code/Tests/ActorHelper.h
+++ b/Gems/NvCloth/Code/Tests/ActorHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ActorClothCollidersTest.cpp b/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ActorClothCollidersTest.cpp
index 2d70353669..55159d3a5c 100644
--- a/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ActorClothCollidersTest.cpp
+++ b/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ActorClothCollidersTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ActorClothSkinningTest.cpp b/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ActorClothSkinningTest.cpp
index cc6ce9756d..b0aa538db5 100644
--- a/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ActorClothSkinningTest.cpp
+++ b/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ActorClothSkinningTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ClothComponentMeshTest.cpp b/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ClothComponentMeshTest.cpp
index f959a51f61..2a3be26fff 100644
--- a/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ClothComponentMeshTest.cpp
+++ b/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ClothComponentMeshTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ClothConstraintsTest.cpp b/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ClothConstraintsTest.cpp
index a0a09eac91..5f390ed45d 100644
--- a/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ClothConstraintsTest.cpp
+++ b/Gems/NvCloth/Code/Tests/Components/ClothComponentMesh/ClothConstraintsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/Components/ClothComponentTest.cpp b/Gems/NvCloth/Code/Tests/Components/ClothComponentTest.cpp
index 66bc0d941a..1490c9a529 100644
--- a/Gems/NvCloth/Code/Tests/Components/ClothComponentTest.cpp
+++ b/Gems/NvCloth/Code/Tests/Components/ClothComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/Components/EditorClothComponentTest.cpp b/Gems/NvCloth/Code/Tests/Components/EditorClothComponentTest.cpp
index 3faf4443a9..b7190ff53d 100644
--- a/Gems/NvCloth/Code/Tests/Components/EditorClothComponentTest.cpp
+++ b/Gems/NvCloth/Code/Tests/Components/EditorClothComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/MeshVertexColorDataStub.h b/Gems/NvCloth/Code/Tests/MeshVertexColorDataStub.h
index 330beec341..4597acc7e5 100644
--- a/Gems/NvCloth/Code/Tests/MeshVertexColorDataStub.h
+++ b/Gems/NvCloth/Code/Tests/MeshVertexColorDataStub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/NvClothEditorTestEnvironment.cpp b/Gems/NvCloth/Code/Tests/NvClothEditorTestEnvironment.cpp
index 748c079cbf..ed73ecb1c3 100644
--- a/Gems/NvCloth/Code/Tests/NvClothEditorTestEnvironment.cpp
+++ b/Gems/NvCloth/Code/Tests/NvClothEditorTestEnvironment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/NvClothTest.cpp b/Gems/NvCloth/Code/Tests/NvClothTest.cpp
index f39c7d67d0..31083edec9 100644
--- a/Gems/NvCloth/Code/Tests/NvClothTest.cpp
+++ b/Gems/NvCloth/Code/Tests/NvClothTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/NvClothTestEnvironment.cpp b/Gems/NvCloth/Code/Tests/NvClothTestEnvironment.cpp
index 194b430ca4..167b2d2533 100644
--- a/Gems/NvCloth/Code/Tests/NvClothTestEnvironment.cpp
+++ b/Gems/NvCloth/Code/Tests/NvClothTestEnvironment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/Pipeline/SceneAPIExt/ClothRuleTest.cpp b/Gems/NvCloth/Code/Tests/Pipeline/SceneAPIExt/ClothRuleTest.cpp
index 4adb13a0f0..1b70157258 100644
--- a/Gems/NvCloth/Code/Tests/Pipeline/SceneAPIExt/ClothRuleTest.cpp
+++ b/Gems/NvCloth/Code/Tests/Pipeline/SceneAPIExt/ClothRuleTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/System/ClothSystemTest.cpp b/Gems/NvCloth/Code/Tests/System/ClothSystemTest.cpp
index 698c98ba14..4bd8171aa2 100644
--- a/Gems/NvCloth/Code/Tests/System/ClothSystemTest.cpp
+++ b/Gems/NvCloth/Code/Tests/System/ClothSystemTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/System/ClothTest.cpp b/Gems/NvCloth/Code/Tests/System/ClothTest.cpp
index 8eae8e8078..44cff03308 100644
--- a/Gems/NvCloth/Code/Tests/System/ClothTest.cpp
+++ b/Gems/NvCloth/Code/Tests/System/ClothTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/System/FabricCookerTest.cpp b/Gems/NvCloth/Code/Tests/System/FabricCookerTest.cpp
index d726757a88..25e658b95a 100644
--- a/Gems/NvCloth/Code/Tests/System/FabricCookerTest.cpp
+++ b/Gems/NvCloth/Code/Tests/System/FabricCookerTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/System/FactoryTest.cpp b/Gems/NvCloth/Code/Tests/System/FactoryTest.cpp
index 38ea0928f5..c2b25cd78d 100644
--- a/Gems/NvCloth/Code/Tests/System/FactoryTest.cpp
+++ b/Gems/NvCloth/Code/Tests/System/FactoryTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/System/NvTypesTest.cpp b/Gems/NvCloth/Code/Tests/System/NvTypesTest.cpp
index 1503ef899d..5b944d0d6a 100644
--- a/Gems/NvCloth/Code/Tests/System/NvTypesTest.cpp
+++ b/Gems/NvCloth/Code/Tests/System/NvTypesTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/System/SolverTest.cpp b/Gems/NvCloth/Code/Tests/System/SolverTest.cpp
index be668a6e80..622bac123e 100644
--- a/Gems/NvCloth/Code/Tests/System/SolverTest.cpp
+++ b/Gems/NvCloth/Code/Tests/System/SolverTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/System/TangentSpaceHelperTest.cpp b/Gems/NvCloth/Code/Tests/System/TangentSpaceHelperTest.cpp
index 32c11b288e..df43a20b86 100644
--- a/Gems/NvCloth/Code/Tests/System/TangentSpaceHelperTest.cpp
+++ b/Gems/NvCloth/Code/Tests/System/TangentSpaceHelperTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/TriangleInputHelper.cpp b/Gems/NvCloth/Code/Tests/TriangleInputHelper.cpp
index 874fff2b6a..2cb2b4d735 100644
--- a/Gems/NvCloth/Code/Tests/TriangleInputHelper.cpp
+++ b/Gems/NvCloth/Code/Tests/TriangleInputHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/TriangleInputHelper.h b/Gems/NvCloth/Code/Tests/TriangleInputHelper.h
index 9122be9ceb..95ae4f0620 100644
--- a/Gems/NvCloth/Code/Tests/TriangleInputHelper.h
+++ b/Gems/NvCloth/Code/Tests/TriangleInputHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/UnitTestHelper.cpp b/Gems/NvCloth/Code/Tests/UnitTestHelper.cpp
index 3559578615..e697d91985 100644
--- a/Gems/NvCloth/Code/Tests/UnitTestHelper.cpp
+++ b/Gems/NvCloth/Code/Tests/UnitTestHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/UnitTestHelper.h b/Gems/NvCloth/Code/Tests/UnitTestHelper.h
index e20c687075..14658bb429 100644
--- a/Gems/NvCloth/Code/Tests/UnitTestHelper.h
+++ b/Gems/NvCloth/Code/Tests/UnitTestHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/Tests/Utils/ActorAssetHelperTest.cpp b/Gems/NvCloth/Code/Tests/Utils/ActorAssetHelperTest.cpp
index b1d45aac7f..a33e931443 100644
--- a/Gems/NvCloth/Code/Tests/Utils/ActorAssetHelperTest.cpp
+++ b/Gems/NvCloth/Code/Tests/Utils/ActorAssetHelperTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/NvCloth/Code/nvcloth_editor_files.cmake b/Gems/NvCloth/Code/nvcloth_editor_files.cmake
index 5ac109d53f..baa307ccc9 100644
--- a/Gems/NvCloth/Code/nvcloth_editor_files.cmake
+++ b/Gems/NvCloth/Code/nvcloth_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/nvcloth_editor_shared_files.cmake b/Gems/NvCloth/Code/nvcloth_editor_shared_files.cmake
index a93f67afd8..c686bffbe2 100644
--- a/Gems/NvCloth/Code/nvcloth_editor_shared_files.cmake
+++ b/Gems/NvCloth/Code/nvcloth_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/nvcloth_editor_tests_files.cmake b/Gems/NvCloth/Code/nvcloth_editor_tests_files.cmake
index d78b0e119d..619cdac48e 100644
--- a/Gems/NvCloth/Code/nvcloth_editor_tests_files.cmake
+++ b/Gems/NvCloth/Code/nvcloth_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/nvcloth_files.cmake b/Gems/NvCloth/Code/nvcloth_files.cmake
index 0181bbf37b..59dee0a894 100644
--- a/Gems/NvCloth/Code/nvcloth_files.cmake
+++ b/Gems/NvCloth/Code/nvcloth_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/nvcloth_shared_files.cmake b/Gems/NvCloth/Code/nvcloth_shared_files.cmake
index a93f67afd8..c686bffbe2 100644
--- a/Gems/NvCloth/Code/nvcloth_shared_files.cmake
+++ b/Gems/NvCloth/Code/nvcloth_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/nvcloth_stub.cmake b/Gems/NvCloth/Code/nvcloth_stub.cmake
index 02c45d025d..4b2488a3cb 100644
--- a/Gems/NvCloth/Code/nvcloth_stub.cmake
+++ b/Gems/NvCloth/Code/nvcloth_stub.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/nvcloth_stub_files.cmake b/Gems/NvCloth/Code/nvcloth_stub_files.cmake
index b1e8d60342..30622457d1 100644
--- a/Gems/NvCloth/Code/nvcloth_stub_files.cmake
+++ b/Gems/NvCloth/Code/nvcloth_stub_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/NvCloth/Code/nvcloth_tests_files.cmake b/Gems/NvCloth/Code/nvcloth_tests_files.cmake
index 46178e2786..e73c53194f 100644
--- a/Gems/NvCloth/Code/nvcloth_tests_files.cmake
+++ b/Gems/NvCloth/Code/nvcloth_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PBSreferenceMaterials/CMakeLists.txt b/Gems/PBSreferenceMaterials/CMakeLists.txt
index 25280cd664..cf6e4cda97 100644
--- a/Gems/PBSreferenceMaterials/CMakeLists.txt
+++ b/Gems/PBSreferenceMaterials/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/CMakeLists.txt b/Gems/PhysX/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/PhysX/CMakeLists.txt
+++ b/Gems/PhysX/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt
index 4d95c22fee..d4fce72672 100644
--- a/Gems/PhysX/Code/CMakeLists.txt
+++ b/Gems/PhysX/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
index e147e10e8d..ed3d8b793f 100644
--- a/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.h b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.h
index 6198ad3d8c..7f3bb2e110 100644
--- a/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderBoxMode.cpp b/Gems/PhysX/Code/Editor/ColliderBoxMode.cpp
index e42dfce93f..3c8cfa5ee2 100644
--- a/Gems/PhysX/Code/Editor/ColliderBoxMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderBoxMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderBoxMode.h b/Gems/PhysX/Code/Editor/ColliderBoxMode.h
index 545bc91402..37fe60a918 100644
--- a/Gems/PhysX/Code/Editor/ColliderBoxMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderBoxMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
index aa52ec4c67..d1240900b0 100644
--- a/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderCapsuleMode.h b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.h
index 513a575b39..f05d9e6e84 100644
--- a/Gems/PhysX/Code/Editor/ColliderCapsuleMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
index 4faa18f795..c084cfa6e0 100644
--- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderComponentMode.h b/Gems/PhysX/Code/Editor/ColliderComponentMode.h
index 0c25678127..c1be83e11a 100644
--- a/Gems/PhysX/Code/Editor/ColliderComponentMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h b/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h
index 1e64b8ecc0..6235c60be8 100644
--- a/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h
+++ b/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp b/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
index 217085b68e..cf194028ea 100644
--- a/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderOffsetMode.h b/Gems/PhysX/Code/Editor/ColliderOffsetMode.h
index d19f5e3f12..6b74b99ba4 100644
--- a/Gems/PhysX/Code/Editor/ColliderOffsetMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderOffsetMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp b/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
index c474625344..6d86c0ad6c 100644
--- a/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderRotationMode.h b/Gems/PhysX/Code/Editor/ColliderRotationMode.h
index ada3786487..22d870df25 100644
--- a/Gems/PhysX/Code/Editor/ColliderRotationMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderRotationMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp b/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
index d23e57ca9b..cc8427c973 100644
--- a/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderSphereMode.h b/Gems/PhysX/Code/Editor/ColliderSphereMode.h
index 317e87246b..afb397c4ad 100644
--- a/Gems/PhysX/Code/Editor/ColliderSphereMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderSphereMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ColliderSubComponentMode.h b/Gems/PhysX/Code/Editor/ColliderSubComponentMode.h
index d064e4f42b..360bf5724d 100644
--- a/Gems/PhysX/Code/Editor/ColliderSubComponentMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderSubComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionFilteringWidget.cpp b/Gems/PhysX/Code/Editor/CollisionFilteringWidget.cpp
index bb466c6b02..c449e9d903 100644
--- a/Gems/PhysX/Code/Editor/CollisionFilteringWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionFilteringWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionFilteringWidget.h b/Gems/PhysX/Code/Editor/CollisionFilteringWidget.h
index 26cf2effb8..f38a9b2f1a 100644
--- a/Gems/PhysX/Code/Editor/CollisionFilteringWidget.h
+++ b/Gems/PhysX/Code/Editor/CollisionFilteringWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp b/Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp
index 5362684b6d..9278e8ecee 100644
--- a/Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionGroupWidget.h b/Gems/PhysX/Code/Editor/CollisionGroupWidget.h
index d407507d42..76c595dd26 100644
--- a/Gems/PhysX/Code/Editor/CollisionGroupWidget.h
+++ b/Gems/PhysX/Code/Editor/CollisionGroupWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionGroupsWidget.cpp b/Gems/PhysX/Code/Editor/CollisionGroupsWidget.cpp
index 8cff25ad3b..ab5280c97a 100644
--- a/Gems/PhysX/Code/Editor/CollisionGroupsWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionGroupsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionGroupsWidget.h b/Gems/PhysX/Code/Editor/CollisionGroupsWidget.h
index 7d1b6ce694..b562a47d2b 100644
--- a/Gems/PhysX/Code/Editor/CollisionGroupsWidget.h
+++ b/Gems/PhysX/Code/Editor/CollisionGroupsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp b/Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp
index d2efd1ecb1..cb90ddcce6 100644
--- a/Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionLayerWidget.h b/Gems/PhysX/Code/Editor/CollisionLayerWidget.h
index ad2f9f7d03..f30e627f15 100644
--- a/Gems/PhysX/Code/Editor/CollisionLayerWidget.h
+++ b/Gems/PhysX/Code/Editor/CollisionLayerWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp b/Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp
index d2a8edb238..c7b6234e1f 100644
--- a/Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/CollisionLayersWidget.h b/Gems/PhysX/Code/Editor/CollisionLayersWidget.h
index 92d85acc6e..861b41e2fd 100644
--- a/Gems/PhysX/Code/Editor/CollisionLayersWidget.h
+++ b/Gems/PhysX/Code/Editor/CollisionLayersWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.cpp b/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.cpp
index 82bd40a946..278ebbf4d2 100644
--- a/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.cpp
+++ b/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.h b/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.h
index ee90adcb14..71a3b8723b 100644
--- a/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.h
+++ b/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp b/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp
index 39fff8b29b..d99089b697 100644
--- a/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp
+++ b/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.h b/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.h
index 3bf555b4f9..3de235e1b7 100644
--- a/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.h
+++ b/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ConfigurationWidget.cpp b/Gems/PhysX/Code/Editor/ConfigurationWidget.cpp
index a0f0263140..edf475020e 100644
--- a/Gems/PhysX/Code/Editor/ConfigurationWidget.cpp
+++ b/Gems/PhysX/Code/Editor/ConfigurationWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ConfigurationWidget.h b/Gems/PhysX/Code/Editor/ConfigurationWidget.h
index 57b8f0fa46..64697c6e82 100644
--- a/Gems/PhysX/Code/Editor/ConfigurationWidget.h
+++ b/Gems/PhysX/Code/Editor/ConfigurationWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/ConfigurationWindowBus.h b/Gems/PhysX/Code/Editor/ConfigurationWindowBus.h
index a0bd5a045a..39cbdf840a 100644
--- a/Gems/PhysX/Code/Editor/ConfigurationWindowBus.h
+++ b/Gems/PhysX/Code/Editor/ConfigurationWindowBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/DebugDraw.cpp b/Gems/PhysX/Code/Editor/DebugDraw.cpp
index 09b2cac5b0..8e187a0ab3 100644
--- a/Gems/PhysX/Code/Editor/DebugDraw.cpp
+++ b/Gems/PhysX/Code/Editor/DebugDraw.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/DebugDraw.h b/Gems/PhysX/Code/Editor/DebugDraw.h
index a1d460ca32..219cd2deff 100644
--- a/Gems/PhysX/Code/Editor/DebugDraw.h
+++ b/Gems/PhysX/Code/Editor/DebugDraw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/DocumentationLinkWidget.cpp b/Gems/PhysX/Code/Editor/DocumentationLinkWidget.cpp
index 71630939db..7bafb08675 100644
--- a/Gems/PhysX/Code/Editor/DocumentationLinkWidget.cpp
+++ b/Gems/PhysX/Code/Editor/DocumentationLinkWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/DocumentationLinkWidget.h b/Gems/PhysX/Code/Editor/DocumentationLinkWidget.h
index c7e663fb1c..fe0550dcc8 100644
--- a/Gems/PhysX/Code/Editor/DocumentationLinkWidget.h
+++ b/Gems/PhysX/Code/Editor/DocumentationLinkWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorClassConverters.cpp b/Gems/PhysX/Code/Editor/EditorClassConverters.cpp
index b095ff4a3e..237bf3104b 100644
--- a/Gems/PhysX/Code/Editor/EditorClassConverters.cpp
+++ b/Gems/PhysX/Code/Editor/EditorClassConverters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorClassConverters.h b/Gems/PhysX/Code/Editor/EditorClassConverters.h
index a2723cb4e0..9c02790b99 100644
--- a/Gems/PhysX/Code/Editor/EditorClassConverters.h
+++ b/Gems/PhysX/Code/Editor/EditorClassConverters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorJointComponentMode.cpp b/Gems/PhysX/Code/Editor/EditorJointComponentMode.cpp
index d285163100..4da6e8b892 100644
--- a/Gems/PhysX/Code/Editor/EditorJointComponentMode.cpp
+++ b/Gems/PhysX/Code/Editor/EditorJointComponentMode.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorJointComponentMode.h b/Gems/PhysX/Code/Editor/EditorJointComponentMode.h
index b7a33b2950..1557af9a77 100644
--- a/Gems/PhysX/Code/Editor/EditorJointComponentMode.h
+++ b/Gems/PhysX/Code/Editor/EditorJointComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp b/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
index 8a38e3a639..a5bc482c0a 100644
--- a/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
+++ b/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorJointConfiguration.h b/Gems/PhysX/Code/Editor/EditorJointConfiguration.h
index bc82070dcd..24d4b427da 100644
--- a/Gems/PhysX/Code/Editor/EditorJointConfiguration.h
+++ b/Gems/PhysX/Code/Editor/EditorJointConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.cpp b/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.cpp
index 898ba6a93f..403dc6465c 100644
--- a/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.cpp
+++ b/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.h b/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.h
index e360ca6870..885a031f1e 100644
--- a/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.h
+++ b/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorJointTypeDrawerBus.h b/Gems/PhysX/Code/Editor/EditorJointTypeDrawerBus.h
index f421c617ce..46f351ab37 100644
--- a/Gems/PhysX/Code/Editor/EditorJointTypeDrawerBus.h
+++ b/Gems/PhysX/Code/Editor/EditorJointTypeDrawerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp
index 05fc01ef1f..69c416865c 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.h
index efbe8da6cb..39e4f4f6a5 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.cpp
index 5eba37faa5..4867afde34 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.h
index 57d9e29853..47f9c95ca6 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.cpp
index 9910a4676d..f89ffccb03 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.h
index 129b782de0..3194b9fdff 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.cpp
index 281397b31f..f4e17a0a16 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.h
index a35d67b591..1e2d488bc8 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp
index 2e9a54e7d4..ee0625cf92 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.h
index b96a9ca53e..727a3a0d0a 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.cpp
index 97556c524f..6f8c136736 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.h
index e8479999ed..3948f654b7 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.cpp
index b493842212..a1791aeaf2 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.h
index 6fe33fa0cc..702a4c8071 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
index 35d687d18f..88cef90591 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.h
index 0b4fa88541..46ac3d51fa 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.cpp
index 9cd5b040bd..44e0d51aad 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.h b/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.h
index 6e038e8e84..541271b425 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.h
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp b/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp
index 41417b3e2b..85599e04e8 100644
--- a/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp
+++ b/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.h b/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.h
index de436e9fe8..81e1a2be44 100644
--- a/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.h
+++ b/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorWindow.cpp b/Gems/PhysX/Code/Editor/EditorWindow.cpp
index 0691b3c77c..8d142ca0c4 100644
--- a/Gems/PhysX/Code/Editor/EditorWindow.cpp
+++ b/Gems/PhysX/Code/Editor/EditorWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/EditorWindow.h b/Gems/PhysX/Code/Editor/EditorWindow.h
index a51714f7ea..714e1c5bdf 100644
--- a/Gems/PhysX/Code/Editor/EditorWindow.h
+++ b/Gems/PhysX/Code/Editor/EditorWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/InertiaPropertyHandler.cpp b/Gems/PhysX/Code/Editor/InertiaPropertyHandler.cpp
index 0282b4d607..d12b61ee1b 100644
--- a/Gems/PhysX/Code/Editor/InertiaPropertyHandler.cpp
+++ b/Gems/PhysX/Code/Editor/InertiaPropertyHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/InertiaPropertyHandler.h b/Gems/PhysX/Code/Editor/InertiaPropertyHandler.h
index e1f0298893..fbd5d98018 100644
--- a/Gems/PhysX/Code/Editor/InertiaPropertyHandler.h
+++ b/Gems/PhysX/Code/Editor/InertiaPropertyHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/MaterialIdWidget.cpp b/Gems/PhysX/Code/Editor/MaterialIdWidget.cpp
index 6a7a15ac7a..6e00c8d632 100644
--- a/Gems/PhysX/Code/Editor/MaterialIdWidget.cpp
+++ b/Gems/PhysX/Code/Editor/MaterialIdWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/MaterialIdWidget.h b/Gems/PhysX/Code/Editor/MaterialIdWidget.h
index 624fd86972..46f293e848 100644
--- a/Gems/PhysX/Code/Editor/MaterialIdWidget.h
+++ b/Gems/PhysX/Code/Editor/MaterialIdWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.cpp b/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.cpp
index e24785b628..fe0a0973ba 100644
--- a/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.cpp
+++ b/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.h b/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.h
index 6266ca7cda..4a1816d8e6 100644
--- a/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.h
+++ b/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/PropertyTypes.cpp b/Gems/PhysX/Code/Editor/PropertyTypes.cpp
index ea245a74a0..0a476c508c 100644
--- a/Gems/PhysX/Code/Editor/PropertyTypes.cpp
+++ b/Gems/PhysX/Code/Editor/PropertyTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/PropertyTypes.h b/Gems/PhysX/Code/Editor/PropertyTypes.h
index e2acb50500..e41d50d18b 100644
--- a/Gems/PhysX/Code/Editor/PropertyTypes.h
+++ b/Gems/PhysX/Code/Editor/PropertyTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/PvdWidget.cpp b/Gems/PhysX/Code/Editor/PvdWidget.cpp
index 6629d13c14..133dc59ce1 100644
--- a/Gems/PhysX/Code/Editor/PvdWidget.cpp
+++ b/Gems/PhysX/Code/Editor/PvdWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/PvdWidget.h b/Gems/PhysX/Code/Editor/PvdWidget.h
index 7cabf4695b..57600da685 100644
--- a/Gems/PhysX/Code/Editor/PvdWidget.h
+++ b/Gems/PhysX/Code/Editor/PvdWidget.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/SettingsWidget.cpp b/Gems/PhysX/Code/Editor/SettingsWidget.cpp
index 2a7e368896..69e380ef41 100644
--- a/Gems/PhysX/Code/Editor/SettingsWidget.cpp
+++ b/Gems/PhysX/Code/Editor/SettingsWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/SettingsWidget.h b/Gems/PhysX/Code/Editor/SettingsWidget.h
index 9102fe7809..0d8c9ef627 100644
--- a/Gems/PhysX/Code/Editor/SettingsWidget.h
+++ b/Gems/PhysX/Code/Editor/SettingsWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp b/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
index 9d90c0b7f7..9b0fed8326 100644
--- a/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
+++ b/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.h b/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.h
index e0c4e55956..b45d2f03d8 100644
--- a/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.h
+++ b/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.cpp b/Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.cpp
index 6b74151004..dbdb7947c9 100644
--- a/Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.cpp
+++ b/Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.h b/Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.h
index bf296bb92e..df68595141 100644
--- a/Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.h
+++ b/Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/UniqueStringContainer.cpp b/Gems/PhysX/Code/Editor/UniqueStringContainer.cpp
index f5e3004b89..ad8d0c79c8 100644
--- a/Gems/PhysX/Code/Editor/UniqueStringContainer.cpp
+++ b/Gems/PhysX/Code/Editor/UniqueStringContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Editor/UniqueStringContainer.h b/Gems/PhysX/Code/Editor/UniqueStringContainer.h
index cf8384b7e0..4cc1d1115e 100644
--- a/Gems/PhysX/Code/Editor/UniqueStringContainer.h
+++ b/Gems/PhysX/Code/Editor/UniqueStringContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/CharacterControllerBus.h b/Gems/PhysX/Code/Include/PhysX/CharacterControllerBus.h
index 195b2ec289..0a9bc801f8 100644
--- a/Gems/PhysX/Code/Include/PhysX/CharacterControllerBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/CharacterControllerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/CharacterGameplayBus.h b/Gems/PhysX/Code/Include/PhysX/CharacterGameplayBus.h
index f34e655c52..ec10ade9dc 100644
--- a/Gems/PhysX/Code/Include/PhysX/CharacterGameplayBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/CharacterGameplayBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/ColliderComponentBus.h b/Gems/PhysX/Code/Include/PhysX/ColliderComponentBus.h
index d2797317f6..6a08499bd0 100644
--- a/Gems/PhysX/Code/Include/PhysX/ColliderComponentBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/ColliderComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/ColliderShapeBus.h b/Gems/PhysX/Code/Include/PhysX/ColliderShapeBus.h
index 58247adadf..d344e33532 100644
--- a/Gems/PhysX/Code/Include/PhysX/ColliderShapeBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/ColliderShapeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/ComponentTypeIds.h b/Gems/PhysX/Code/Include/PhysX/ComponentTypeIds.h
index 5f943db6ce..73442a033e 100644
--- a/Gems/PhysX/Code/Include/PhysX/ComponentTypeIds.h
+++ b/Gems/PhysX/Code/Include/PhysX/ComponentTypeIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/Configuration/PhysXConfiguration.h b/Gems/PhysX/Code/Include/PhysX/Configuration/PhysXConfiguration.h
index d39752d7a4..c24fd745b1 100644
--- a/Gems/PhysX/Code/Include/PhysX/Configuration/PhysXConfiguration.h
+++ b/Gems/PhysX/Code/Include/PhysX/Configuration/PhysXConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugConfiguration.h b/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugConfiguration.h
index aded63941c..6a795783c8 100644
--- a/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugConfiguration.h
+++ b/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugInterface.h b/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugInterface.h
index f813dc5a25..376fd85c9c 100644
--- a/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugInterface.h
+++ b/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/EditorColliderComponentRequestBus.h b/Gems/PhysX/Code/Include/PhysX/EditorColliderComponentRequestBus.h
index e8e14c058a..f9d4777423 100644
--- a/Gems/PhysX/Code/Include/PhysX/EditorColliderComponentRequestBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/EditorColliderComponentRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/EditorJointBus.h b/Gems/PhysX/Code/Include/PhysX/EditorJointBus.h
index 6713b8c187..5e6450885f 100644
--- a/Gems/PhysX/Code/Include/PhysX/EditorJointBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/EditorJointBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/ForceRegionComponentBus.h b/Gems/PhysX/Code/Include/PhysX/ForceRegionComponentBus.h
index e53fa33bf3..1e067dcd2f 100644
--- a/Gems/PhysX/Code/Include/PhysX/ForceRegionComponentBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/ForceRegionComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.cpp b/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.cpp
index 0bd3d95d50..2d03007151 100644
--- a/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.cpp
+++ b/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.h b/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.h
index e4d80926d9..73a4191ccb 100644
--- a/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.h
+++ b/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/MathConversion.h b/Gems/PhysX/Code/Include/PhysX/MathConversion.h
index bec9035830..739f543e8f 100644
--- a/Gems/PhysX/Code/Include/PhysX/MathConversion.h
+++ b/Gems/PhysX/Code/Include/PhysX/MathConversion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/MeshAsset.h b/Gems/PhysX/Code/Include/PhysX/MeshAsset.h
index 696996a885..6d4c5853a5 100644
--- a/Gems/PhysX/Code/Include/PhysX/MeshAsset.h
+++ b/Gems/PhysX/Code/Include/PhysX/MeshAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/MeshColliderComponentBus.h b/Gems/PhysX/Code/Include/PhysX/MeshColliderComponentBus.h
index a2c754f432..553d5b1646 100644
--- a/Gems/PhysX/Code/Include/PhysX/MeshColliderComponentBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/MeshColliderComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/NativeTypeIdentifiers.h b/Gems/PhysX/Code/Include/PhysX/NativeTypeIdentifiers.h
index b56aea5606..5cd066a51e 100644
--- a/Gems/PhysX/Code/Include/PhysX/NativeTypeIdentifiers.h
+++ b/Gems/PhysX/Code/Include/PhysX/NativeTypeIdentifiers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/PhysXLocks.h b/Gems/PhysX/Code/Include/PhysX/PhysXLocks.h
index 08ff3a8024..ccf1f590fd 100644
--- a/Gems/PhysX/Code/Include/PhysX/PhysXLocks.h
+++ b/Gems/PhysX/Code/Include/PhysX/PhysXLocks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/SystemComponentBus.h b/Gems/PhysX/Code/Include/PhysX/SystemComponentBus.h
index afb92f153d..41a1eb4558 100644
--- a/Gems/PhysX/Code/Include/PhysX/SystemComponentBus.h
+++ b/Gems/PhysX/Code/Include/PhysX/SystemComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/UserDataTypes.h b/Gems/PhysX/Code/Include/PhysX/UserDataTypes.h
index 77c7936e4c..21c07374e7 100644
--- a/Gems/PhysX/Code/Include/PhysX/UserDataTypes.h
+++ b/Gems/PhysX/Code/Include/PhysX/UserDataTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/UserDataTypes.inl b/Gems/PhysX/Code/Include/PhysX/UserDataTypes.inl
index 2e426c4336..d6e0d2d256 100644
--- a/Gems/PhysX/Code/Include/PhysX/UserDataTypes.inl
+++ b/Gems/PhysX/Code/Include/PhysX/UserDataTypes.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/Utils.h b/Gems/PhysX/Code/Include/PhysX/Utils.h
index 28326af52a..a024920e01 100644
--- a/Gems/PhysX/Code/Include/PhysX/Utils.h
+++ b/Gems/PhysX/Code/Include/PhysX/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Include/PhysX/Utils.inl b/Gems/PhysX/Code/Include/PhysX/Utils.inl
index 468025b291..353664cb05 100644
--- a/Gems/PhysX/Code/Include/PhysX/Utils.inl
+++ b/Gems/PhysX/Code/Include/PhysX/Utils.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/CMakeLists.txt b/Gems/PhysX/Code/NumericalMethods/CMakeLists.txt
index 8826af3d96..abfbb958a6 100644
--- a/Gems/PhysX/Code/NumericalMethods/CMakeLists.txt
+++ b/Gems/PhysX/Code/NumericalMethods/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/NumericalMethods/Include/NumericalMethods/Eigenanalysis.h b/Gems/PhysX/Code/NumericalMethods/Include/NumericalMethods/Eigenanalysis.h
index 5024fcb4cd..97953f80a9 100644
--- a/Gems/PhysX/Code/NumericalMethods/Include/NumericalMethods/Eigenanalysis.h
+++ b/Gems/PhysX/Code/NumericalMethods/Include/NumericalMethods/Eigenanalysis.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Include/NumericalMethods/Optimization.h b/Gems/PhysX/Code/NumericalMethods/Include/NumericalMethods/Optimization.h
index 4f72aa877f..2ad143f5d3 100644
--- a/Gems/PhysX/Code/NumericalMethods/Include/NumericalMethods/Optimization.h
+++ b/Gems/PhysX/Code/NumericalMethods/Include/NumericalMethods/Optimization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/EigenanalysisUtilities.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/EigenanalysisUtilities.cpp
index 84a9f40e67..5460917737 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/EigenanalysisUtilities.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/EigenanalysisUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.cpp
index 731bd6ff22..e0751cb725 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.h b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.h
index 6f304517ed..a330b732ac 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.h
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Utilities.h b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Utilities.h
index 1fc27a9030..0b74b0300b 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Utilities.h
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Utilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.cpp b/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.cpp
index ca5b4ce3e6..a88f2bf324 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.h b/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.h
index f4279d529f..2a2513b21b 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.h
+++ b/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods.cpp b/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods.cpp
index 21f3c16904..8f46af84d1 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h b/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
+++ b/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Constants.h b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Constants.h
index fc406b9449..e248c8e592 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Constants.h
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.cpp
index ea54d4d19b..5d737328a7 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.h b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.h
index 42a4d9a727..baa8974912 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.h
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.cpp
index a9453a9631..c9de544801 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.h b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.h
index b0a143c7c6..9e0afb9004 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.h
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.cpp
index 1b70581c98..ad3df6e567 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.h b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.h
index 09810dc47f..fc97787080 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.h
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Tests/CommonTest.cpp b/Gems/PhysX/Code/NumericalMethods/Tests/CommonTest.cpp
index b53d174563..20db25bc0f 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/CommonTest.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/CommonTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Tests/EigenanalysisTest.cpp b/Gems/PhysX/Code/NumericalMethods/Tests/EigenanalysisTest.cpp
index 4c95c27876..00272fd78e 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/EigenanalysisTest.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/EigenanalysisTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Tests/Environment.cpp b/Gems/PhysX/Code/NumericalMethods/Tests/Environment.cpp
index 43a3c1fdec..fc286d3f1e 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/Environment.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/Environment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Tests/Environment.h b/Gems/PhysX/Code/NumericalMethods/Tests/Environment.h
index b6cabb9f0c..caad86b553 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/Environment.h
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/Environment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/Tests/OptimizationTest.cpp b/Gems/PhysX/Code/NumericalMethods/Tests/OptimizationTest.cpp
index 5c3434ab5f..b5e9278a6e 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/OptimizationTest.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/OptimizationTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake b/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
index db13937304..c0750c640b 100644
--- a/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
+++ b/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/NumericalMethods/numericalmethods_tests_files.cmake b/Gems/PhysX/Code/NumericalMethods/numericalmethods_tests_files.cmake
index f0cf97c5a1..218d56a37c 100644
--- a/Gems/PhysX/Code/NumericalMethods/numericalmethods_tests_files.cmake
+++ b/Gems/PhysX/Code/NumericalMethods/numericalmethods_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/BallJointComponent.cpp b/Gems/PhysX/Code/Source/BallJointComponent.cpp
index ef1f74b7e9..f924993b1d 100644
--- a/Gems/PhysX/Code/Source/BallJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/BallJointComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/BallJointComponent.h b/Gems/PhysX/Code/Source/BallJointComponent.h
index ab3c8afdab..d4135f5149 100644
--- a/Gems/PhysX/Code/Source/BallJointComponent.h
+++ b/Gems/PhysX/Code/Source/BallJointComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/BaseColliderComponent.cpp b/Gems/PhysX/Code/Source/BaseColliderComponent.cpp
index 84c36c2e3f..1b2e5a52db 100644
--- a/Gems/PhysX/Code/Source/BaseColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/BaseColliderComponent.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/BaseColliderComponent.h b/Gems/PhysX/Code/Source/BaseColliderComponent.h
index 5d070f1329..2ead3de2fb 100644
--- a/Gems/PhysX/Code/Source/BaseColliderComponent.h
+++ b/Gems/PhysX/Code/Source/BaseColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/BoxColliderComponent.cpp b/Gems/PhysX/Code/Source/BoxColliderComponent.cpp
index 19c78ccc5c..6c8de25e39 100644
--- a/Gems/PhysX/Code/Source/BoxColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/BoxColliderComponent.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/BoxColliderComponent.h b/Gems/PhysX/Code/Source/BoxColliderComponent.h
index 0dbdf8e3f4..3c4ed30b9a 100644
--- a/Gems/PhysX/Code/Source/BoxColliderComponent.h
+++ b/Gems/PhysX/Code/Source/BoxColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/CapsuleColliderComponent.cpp b/Gems/PhysX/Code/Source/CapsuleColliderComponent.cpp
index 6b7a0bcba8..befb6d1e96 100644
--- a/Gems/PhysX/Code/Source/CapsuleColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/CapsuleColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/CapsuleColliderComponent.h b/Gems/PhysX/Code/Source/CapsuleColliderComponent.h
index d17cc62380..685b55f86b 100644
--- a/Gems/PhysX/Code/Source/CapsuleColliderComponent.h
+++ b/Gems/PhysX/Code/Source/CapsuleColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Collision.cpp b/Gems/PhysX/Code/Source/Collision.cpp
index f0c0174d55..954445c379 100644
--- a/Gems/PhysX/Code/Source/Collision.cpp
+++ b/Gems/PhysX/Code/Source/Collision.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Collision.h b/Gems/PhysX/Code/Source/Collision.h
index 751b1c946f..12782d52ac 100644
--- a/Gems/PhysX/Code/Source/Collision.h
+++ b/Gems/PhysX/Code/Source/Collision.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Common/PhysXSceneQueryHelpers.cpp b/Gems/PhysX/Code/Source/Common/PhysXSceneQueryHelpers.cpp
index dfd65895fd..37e37d07e3 100644
--- a/Gems/PhysX/Code/Source/Common/PhysXSceneQueryHelpers.cpp
+++ b/Gems/PhysX/Code/Source/Common/PhysXSceneQueryHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Common/PhysXSceneQueryHelpers.h b/Gems/PhysX/Code/Source/Common/PhysXSceneQueryHelpers.h
index 2a7135dd52..9de24770a6 100644
--- a/Gems/PhysX/Code/Source/Common/PhysXSceneQueryHelpers.h
+++ b/Gems/PhysX/Code/Source/Common/PhysXSceneQueryHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ComponentDescriptors.cpp b/Gems/PhysX/Code/Source/ComponentDescriptors.cpp
index 0387f1050a..69ab3de985 100644
--- a/Gems/PhysX/Code/Source/ComponentDescriptors.cpp
+++ b/Gems/PhysX/Code/Source/ComponentDescriptors.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ComponentDescriptors.h b/Gems/PhysX/Code/Source/ComponentDescriptors.h
index 1380388119..ebc1112b82 100644
--- a/Gems/PhysX/Code/Source/ComponentDescriptors.h
+++ b/Gems/PhysX/Code/Source/ComponentDescriptors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp b/Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp
index 3f28da93d6..a77e38638f 100644
--- a/Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp
+++ b/Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.cpp b/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.cpp
index a9809e2290..b4ae54ad71 100644
--- a/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.cpp
+++ b/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.h b/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.h
index 8f69417ded..569b3e1ade 100644
--- a/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.h
+++ b/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Debug/Configuration/PhysXDebugConfiguration.cpp b/Gems/PhysX/Code/Source/Debug/Configuration/PhysXDebugConfiguration.cpp
index a5525e520e..33efc73037 100644
--- a/Gems/PhysX/Code/Source/Debug/Configuration/PhysXDebugConfiguration.cpp
+++ b/Gems/PhysX/Code/Source/Debug/Configuration/PhysXDebugConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp b/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
index 04470d2339..f7be2549ba 100644
--- a/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
+++ b/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Debug/PhysXDebug.h b/Gems/PhysX/Code/Source/Debug/PhysXDebug.h
index f3e58513bd..aab974cde6 100644
--- a/Gems/PhysX/Code/Source/Debug/PhysXDebug.h
+++ b/Gems/PhysX/Code/Source/Debug/PhysXDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/DefaultWorldComponent.cpp b/Gems/PhysX/Code/Source/DefaultWorldComponent.cpp
index 4406011016..6973dcca44 100644
--- a/Gems/PhysX/Code/Source/DefaultWorldComponent.cpp
+++ b/Gems/PhysX/Code/Source/DefaultWorldComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/DefaultWorldComponent.h b/Gems/PhysX/Code/Source/DefaultWorldComponent.h
index 2b4afe1662..2bab99086a 100644
--- a/Gems/PhysX/Code/Source/DefaultWorldComponent.h
+++ b/Gems/PhysX/Code/Source/DefaultWorldComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
index 5cbe2d336b..75c797c9de 100644
--- a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorBallJointComponent.h b/Gems/PhysX/Code/Source/EditorBallJointComponent.h
index 8164e9f6de..64e8029a0a 100644
--- a/Gems/PhysX/Code/Source/EditorBallJointComponent.h
+++ b/Gems/PhysX/Code/Source/EditorBallJointComponent.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
index 1c96c7f966..46598a13a4 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -56,7 +56,7 @@ namespace PhysX
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorProxyAssetShapeConfig::m_pxAsset, "PhysX Mesh", "PhysX mesh collider asset")
                         ->Attribute(AZ_CRC_CE("EditButton"), "")
-                        ->Attribute(AZ_CRC_CE("EditDescription"), "Open in FBX Settings")
+                        ->Attribute(AZ_CRC_CE("EditDescription"), "Open in Scene Settings")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorProxyAssetShapeConfig::m_configuration, "Configuration", "Configuration of asset shape")
                         ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
             }
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.h b/Gems/PhysX/Code/Source/EditorColliderComponent.h
index 99f80e68b6..5fd94f97c9 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.h
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorComponentDescriptors.cpp b/Gems/PhysX/Code/Source/EditorComponentDescriptors.cpp
index 109dbf269a..927879bc40 100644
--- a/Gems/PhysX/Code/Source/EditorComponentDescriptors.cpp
+++ b/Gems/PhysX/Code/Source/EditorComponentDescriptors.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorComponentDescriptors.h b/Gems/PhysX/Code/Source/EditorComponentDescriptors.h
index e8535e39e6..4357eb709f 100644
--- a/Gems/PhysX/Code/Source/EditorComponentDescriptors.h
+++ b/Gems/PhysX/Code/Source/EditorComponentDescriptors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp b/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
index 4b6b003e4f..8e8ec630fa 100644
--- a/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorFixedJointComponent.h b/Gems/PhysX/Code/Source/EditorFixedJointComponent.h
index c3426418aa..3abbb0c07d 100644
--- a/Gems/PhysX/Code/Source/EditorFixedJointComponent.h
+++ b/Gems/PhysX/Code/Source/EditorFixedJointComponent.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp b/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
index 3dc99a5427..9a4c8a9df1 100644
--- a/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorForceRegionComponent.h b/Gems/PhysX/Code/Source/EditorForceRegionComponent.h
index 8627d41e26..ccd19ffdc6 100644
--- a/Gems/PhysX/Code/Source/EditorForceRegionComponent.h
+++ b/Gems/PhysX/Code/Source/EditorForceRegionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
index 02929766f4..615ae0d909 100644
--- a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorHingeJointComponent.h b/Gems/PhysX/Code/Source/EditorHingeJointComponent.h
index a09aac2bbe..e3db16e94b 100644
--- a/Gems/PhysX/Code/Source/EditorHingeJointComponent.h
+++ b/Gems/PhysX/Code/Source/EditorHingeJointComponent.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorJointComponent.cpp b/Gems/PhysX/Code/Source/EditorJointComponent.cpp
index 9de3549fad..026f2252be 100644
--- a/Gems/PhysX/Code/Source/EditorJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorJointComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorJointComponent.h b/Gems/PhysX/Code/Source/EditorJointComponent.h
index 495bc6291c..9180ee358a 100644
--- a/Gems/PhysX/Code/Source/EditorJointComponent.h
+++ b/Gems/PhysX/Code/Source/EditorJointComponent.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
index 69d0b48988..303c34d66b 100644
--- a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorRigidBodyComponent.h b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.h
index 706c1918bb..101509041e 100644
--- a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.h
+++ b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
index fa0baee314..491c6f712b 100644
--- a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/EditorShapeColliderComponent.h b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.h
index 5306d0d831..49381c1dfd 100644
--- a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.h
+++ b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/FixedJointComponent.cpp b/Gems/PhysX/Code/Source/FixedJointComponent.cpp
index ce07a4511c..bab6bc1d32 100644
--- a/Gems/PhysX/Code/Source/FixedJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/FixedJointComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/FixedJointComponent.h b/Gems/PhysX/Code/Source/FixedJointComponent.h
index 5098e57838..7b98a45861 100644
--- a/Gems/PhysX/Code/Source/FixedJointComponent.h
+++ b/Gems/PhysX/Code/Source/FixedJointComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ForceRegion.cpp b/Gems/PhysX/Code/Source/ForceRegion.cpp
index 505806bba2..74bf194481 100644
--- a/Gems/PhysX/Code/Source/ForceRegion.cpp
+++ b/Gems/PhysX/Code/Source/ForceRegion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ForceRegion.h b/Gems/PhysX/Code/Source/ForceRegion.h
index 759adb4eb9..d63db80e44 100644
--- a/Gems/PhysX/Code/Source/ForceRegion.h
+++ b/Gems/PhysX/Code/Source/ForceRegion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ForceRegionComponent.cpp b/Gems/PhysX/Code/Source/ForceRegionComponent.cpp
index 50f750bdc5..7d3935b307 100644
--- a/Gems/PhysX/Code/Source/ForceRegionComponent.cpp
+++ b/Gems/PhysX/Code/Source/ForceRegionComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ForceRegionComponent.h b/Gems/PhysX/Code/Source/ForceRegionComponent.h
index 701cb349ec..27aac625c6 100644
--- a/Gems/PhysX/Code/Source/ForceRegionComponent.h
+++ b/Gems/PhysX/Code/Source/ForceRegionComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ForceRegionForces.cpp b/Gems/PhysX/Code/Source/ForceRegionForces.cpp
index d3a7d00b52..9aae06429e 100644
--- a/Gems/PhysX/Code/Source/ForceRegionForces.cpp
+++ b/Gems/PhysX/Code/Source/ForceRegionForces.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ForceRegionForces.h b/Gems/PhysX/Code/Source/ForceRegionForces.h
index 8f37814076..b1db67340a 100644
--- a/Gems/PhysX/Code/Source/ForceRegionForces.h
+++ b/Gems/PhysX/Code/Source/ForceRegionForces.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/HingeJointComponent.cpp b/Gems/PhysX/Code/Source/HingeJointComponent.cpp
index b859d09dc5..700ffc77f9 100644
--- a/Gems/PhysX/Code/Source/HingeJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/HingeJointComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/HingeJointComponent.h b/Gems/PhysX/Code/Source/HingeJointComponent.h
index 1406642591..1c596afed6 100644
--- a/Gems/PhysX/Code/Source/HingeJointComponent.h
+++ b/Gems/PhysX/Code/Source/HingeJointComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/JointComponent.cpp b/Gems/PhysX/Code/Source/JointComponent.cpp
index 892fa07edc..18809a6c4b 100644
--- a/Gems/PhysX/Code/Source/JointComponent.cpp
+++ b/Gems/PhysX/Code/Source/JointComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/JointComponent.h b/Gems/PhysX/Code/Source/JointComponent.h
index 05109f6f6b..c02a82c688 100644
--- a/Gems/PhysX/Code/Source/JointComponent.h
+++ b/Gems/PhysX/Code/Source/JointComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Material.cpp b/Gems/PhysX/Code/Source/Material.cpp
index 8074df99bf..0f55dd4e20 100644
--- a/Gems/PhysX/Code/Source/Material.cpp
+++ b/Gems/PhysX/Code/Source/Material.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Material.h b/Gems/PhysX/Code/Source/Material.h
index 823b59f564..5c1f40397b 100644
--- a/Gems/PhysX/Code/Source/Material.h
+++ b/Gems/PhysX/Code/Source/Material.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/MeshColliderComponent.cpp b/Gems/PhysX/Code/Source/MeshColliderComponent.cpp
index 32579891ac..16d051a2e5 100644
--- a/Gems/PhysX/Code/Source/MeshColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/MeshColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/MeshColliderComponent.h b/Gems/PhysX/Code/Source/MeshColliderComponent.h
index 1378bc4411..8ad1f7235a 100644
--- a/Gems/PhysX/Code/Source/MeshColliderComponent.h
+++ b/Gems/PhysX/Code/Source/MeshColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Module.cpp b/Gems/PhysX/Code/Source/Module.cpp
index ff0062b0ad..e36ce0ecd9 100644
--- a/Gems/PhysX/Code/Source/Module.cpp
+++ b/Gems/PhysX/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ModuleUnsupported.cpp b/Gems/PhysX/Code/Source/ModuleUnsupported.cpp
index 424709dcb7..434ea7a9ec 100644
--- a/Gems/PhysX/Code/Source/ModuleUnsupported.cpp
+++ b/Gems/PhysX/Code/Source/ModuleUnsupported.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/NameConstants.cpp b/Gems/PhysX/Code/Source/NameConstants.cpp
index feb10e0681..c44c5d5974 100644
--- a/Gems/PhysX/Code/Source/NameConstants.cpp
+++ b/Gems/PhysX/Code/Source/NameConstants.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/NameConstants.h b/Gems/PhysX/Code/Source/NameConstants.h
index b7b39c3db4..a1d745cffa 100644
--- a/Gems/PhysX/Code/Source/NameConstants.h
+++ b/Gems/PhysX/Code/Source/NameConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.cpp
index c43e750d65..54328dd0c2 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.h
index b3f7db20c8..f2cc08c625 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
index 0382a1d645..25acd20ad6 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
index 6f9e589c0c..4907329746 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
index 3cf5a7798c..653d97bd06 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h
index 71092a2189..512149db92 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp
index 2be9907b47..bf7b0796c3 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.h
index f945b84e7c..c67e85bd91 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
index 90f54430e4..b2b09306f1 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
index 2ec9e7c657..82e28d6a95 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
index 219b6b7940..4bc2720b07 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.h
index 385f1bd432..cf4788d1fa 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
index c7f5dc8186..94a7db5627 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h
index dddc53329f..5f603c29b6 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
index d033e8253e..154958463a 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.h
index 8c6444bfae..1515c7973e 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
index 73a1cff942..a975e984da 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
index b9d05b62a4..cb5e339171 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h b/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
+++ b/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/PhysX_precompiled.h b/Gems/PhysX/Code/Source/PhysX_precompiled.h
index 3eca2440f0..27096b4e66 100644
--- a/Gems/PhysX/Code/Source/PhysX_precompiled.h
+++ b/Gems/PhysX/Code/Source/PhysX_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp b/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
index 8d1445a00f..51cf461f26 100644
--- a/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.h b/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.h
index 8810bee83b..ef6c29d564 100644
--- a/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.h
+++ b/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
index 1357ee1419..a04b9327ac 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -165,7 +165,7 @@ namespace PhysX
                     ;
 
                 // Note: This class needs to have edit context reflection so PropertyAssetCtrl::OnEditButtonClicked
-                //       can open the asset with the preferred asset editor (FBX Settings).
+                //       can open the asset with the preferred asset editor (Scene Settings).
                 if (auto* editContext = serializeContext->GetEditContext())
                 {
                     editContext->Class<MeshAsset>("PhysX Mesh Asset", "")
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.h b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.h
index df5273090e..4415d0e5ac 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.h
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp
index f8e52f5dae..299e5cdd23 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.h b/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.h
index 1fa9c463bb..adf02cba00 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.h
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
index fe42412b9d..93fd1c6f2d 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -63,7 +63,7 @@ namespace PhysX
             }
         } pxDefaultErrorCallback;
 
-        // A struct to store the geometry data per FBX node
+        // A struct to store the geometry data per scene node
         struct NodeCollisionGeomExportData
         {
             AZStd::vector<Vec3> m_vertices;
@@ -144,10 +144,10 @@ namespace PhysX
 
         namespace Utils
         {
-            // Utility function doing look-up in fbxMaterialNames and inserting the name if it's not found
+            // Utility function doing look-up in sourceSceneMaterialNames and inserting the name if it's not found
             AZ::u16 InsertMaterialIndexByName(const AZStd::string& materialName, AssetMaterialsData& materials)
             {
-                AZStd::vector<AZStd::string>& fbxMaterialNames = materials.m_fbxMaterialNames;
+                AZStd::vector<AZStd::string>& sourceSceneMaterialNames = materials.m_sourceSceneMaterialNames;
                 AZStd::unordered_map<AZStd::string, size_t>& materialIndexByName = materials.m_materialIndexByName;
 
                 // Check if we have this material in the list
@@ -159,9 +159,9 @@ namespace PhysX
                 }
 
                 // Add it to the list otherwise
-                fbxMaterialNames.push_back(materialName);
+                sourceSceneMaterialNames.push_back(materialName);
 
-                AZ::u16 newIndex = fbxMaterialNames.size() - 1;
+                AZ::u16 newIndex = sourceSceneMaterialNames.size() - 1;
                 materialIndexByName[materialName] = newIndex;
 
                 return newIndex;
@@ -284,8 +284,8 @@ namespace PhysX
 
                     AZStd::string_view nodeName = sceneGraph.GetNodeName(nodeIndex).GetName();
 
-                    const AZStd::vector<AZStd::string> localFbxMaterialsList = GenerateLocalNodeMaterialMap(sceneGraph, nodeIndex);
-                    if (localFbxMaterialsList.empty())
+                    const AZStd::vector<AZStd::string> localSourceSceneMaterialsList = GenerateLocalNodeMaterialMap(sceneGraph, nodeIndex);
+                    if (localSourceSceneMaterialsList.empty())
                     {
                         AZ_TracePrintf(
                             AZ::SceneAPI::Utilities::WarningWindow,
@@ -304,26 +304,26 @@ namespace PhysX
                     for (AZ::u32 faceIndex = 0; faceIndex < faceCount; ++faceIndex)
                     {
                         AZStd::string materialName = DefaultMaterialName;
-                        if (!localFbxMaterialsList.empty())
+                        if (!localSourceSceneMaterialsList.empty())
                         {
                             const int materialId = nodeMesh->GetFaceMaterialId(faceIndex);
-                            if (materialId >= localFbxMaterialsList.size())
+                            if (materialId >= localSourceSceneMaterialsList.size())
                             {
                                 AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow,
-                                    "materialId %d for face %d is out of bound for localFbxMaterialsList (size %d).",
-                                    materialId, faceIndex, localFbxMaterialsList.size());
+                                    "materialId %d for face %d is out of bound for localSourceSceneMaterialsList (size %d).",
+                                    materialId, faceIndex, localSourceSceneMaterialsList.size());
 
                                 return AZStd::nullopt;
                             }
 
-                            materialName = localFbxMaterialsList[materialId];
+                            materialName = localSourceSceneMaterialsList[materialId];
 
                             // Keep using the first material when it has to be limited to one.
                             if (limitToOneMaterial &&
-                                assetMaterialData.m_fbxMaterialNames.size() == 1 &&
-                                assetMaterialData.m_fbxMaterialNames[0] != materialName)
+                                assetMaterialData.m_sourceSceneMaterialNames.size() == 1 &&
+                                assetMaterialData.m_sourceSceneMaterialNames[0] != materialName)
                             {
-                                materialName = assetMaterialData.m_fbxMaterialNames[0];
+                                materialName = assetMaterialData.m_sourceSceneMaterialNames[0];
                             }
                         }
 
@@ -500,11 +500,11 @@ namespace PhysX
             assetData.m_materialNames = meshGroup.GetMaterialSlots();
             assetData.m_physicsMaterialNames = meshGroup.GetPhysicsMaterials();
 
-            // Updating materials lists from new materials gathered from fbx 
-            // because this exporter runs when the FBX is being processed, which
+            // Updating materials lists from new materials gathered from the source scene file 
+            // because this exporter runs when the source scene is being processed, which
             // could have a different content from when the mesh group info was
-            // entered in FBX Settings Editor.
-            if (!Utils::UpdateAssetPhysicsMaterials(assetMaterialsData.m_fbxMaterialNames, assetData.m_materialNames, assetData.m_physicsMaterialNames))
+            // entered in Scene Settings Editor.
+            if (!Utils::UpdateAssetPhysicsMaterials(assetMaterialsData.m_sourceSceneMaterialNames, assetData.m_materialNames, assetData.m_physicsMaterialNames))
             {
                 return SceneEvents::ProcessingResult::Failure;
             }
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.h b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.h
index 44c651cf3d..fa12eb6f56 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.h
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -59,10 +59,10 @@ namespace PhysX
             //! A struct to store the materials of the mesh nodes selected in a mesh group.
             struct AssetMaterialsData
             {
-                //! Material names coming from FBX.
-                AZStd::vector<AZStd::string> m_fbxMaterialNames;
+                //! Material names coming from the source scene file.
+                AZStd::vector<AZStd::string> m_sourceSceneMaterialNames;
 
-                //! Look-up table for fbxMaterialNames.
+                //! Look-up table for sourceSceneMaterialNames.
                 AZStd::unordered_map<AZStd::string, size_t> m_materialIndexByName;
 
                 //! Map of mesh nodes to their list of material indices associated to each face.
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp
index d12e66d0a1..e0d9eb1e96 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -763,7 +763,7 @@ namespace PhysX
                 return;
             }
 
-            Utils::UpdateAssetPhysicsMaterials(assetMaterialData->m_fbxMaterialNames, m_materialSlots, m_physicsMaterials);
+            Utils::UpdateAssetPhysicsMaterials(assetMaterialData->m_sourceSceneMaterialNames, m_materialSlots, m_physicsMaterials);
         }
 
         AZ::SceneAPI::Containers::RuleContainer& MeshGroup::GetRuleContainer()
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.h b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.h
index 3a633ae9f4..865ca01c50 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.h
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.cpp b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.cpp
index ef35daddd4..7c667e1afa 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.h b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.h
index 495bcfa744..00ba04c9f7 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.h
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.cpp b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.cpp
index 94b4bc4fbf..baa550b06e 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.h b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.h
index febd279519..7b311f8002 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.h
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.cpp b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.cpp
index 462a6facb7..953c7e6d51 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.h b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.h
index 9520ce8690..10a48469c4 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.h
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.cpp b/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.cpp
index 805bb13ede..15d644b812 100644
--- a/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.h b/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.h
index 1ad3423882..8ce768a107 100644
--- a/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.h
+++ b/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake b/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
index e2a0620a5a..6fbfc41c3a 100644
--- a/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/Android/PhysX_Traits_Android.h b/Gems/PhysX/Code/Source/Platform/Android/PhysX_Traits_Android.h
index afd77a839b..616b1dddf9 100644
--- a/Gems/PhysX/Code/Source/Platform/Android/PhysX_Traits_Android.h
+++ b/Gems/PhysX/Code/Source/Platform/Android/PhysX_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Android/PhysX_Traits_Platform.h b/Gems/PhysX/Code/Source/Platform/Android/PhysX_Traits_Platform.h
index 629add040e..cae6448c80 100644
--- a/Gems/PhysX/Code/Source/Platform/Android/PhysX_Traits_Platform.h
+++ b/Gems/PhysX/Code/Source/Platform/Android/PhysX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/PhysX/Code/Source/Platform/Android/platform_android_files.cmake
index 21cfcb07c5..1347ff4cf9 100644
--- a/Gems/PhysX/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
index fd6a5da633..3a1f8d6ad3 100644
--- a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/Linux/PhysX_Traits_Linux.h b/Gems/PhysX/Code/Source/Platform/Linux/PhysX_Traits_Linux.h
index afd77a839b..616b1dddf9 100644
--- a/Gems/PhysX/Code/Source/Platform/Linux/PhysX_Traits_Linux.h
+++ b/Gems/PhysX/Code/Source/Platform/Linux/PhysX_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Linux/PhysX_Traits_Platform.h b/Gems/PhysX/Code/Source/Platform/Linux/PhysX_Traits_Platform.h
index 045de5c228..3037706f2d 100644
--- a/Gems/PhysX/Code/Source/Platform/Linux/PhysX_Traits_Platform.h
+++ b/Gems/PhysX/Code/Source/Platform/Linux/PhysX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/PhysX/Code/Source/Platform/Linux/platform_linux_files.cmake
index f6bbe7ce15..e4b85ba3bc 100644
--- a/Gems/PhysX/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
index 4323c14eff..e2553c1834 100644
--- a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/Mac/PhysX_Traits_Mac.h b/Gems/PhysX/Code/Source/Platform/Mac/PhysX_Traits_Mac.h
index afd77a839b..616b1dddf9 100644
--- a/Gems/PhysX/Code/Source/Platform/Mac/PhysX_Traits_Mac.h
+++ b/Gems/PhysX/Code/Source/Platform/Mac/PhysX_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Mac/PhysX_Traits_Platform.h b/Gems/PhysX/Code/Source/Platform/Mac/PhysX_Traits_Platform.h
index c6280a726b..11dc79f782 100644
--- a/Gems/PhysX/Code/Source/Platform/Mac/PhysX_Traits_Platform.h
+++ b/Gems/PhysX/Code/Source/Platform/Mac/PhysX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/PhysX/Code/Source/Platform/Mac/platform_mac_files.cmake
index f6510b730d..da09019139 100644
--- a/Gems/PhysX/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
index 42ef63f115..9ea967e73b 100644
--- a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/Windows/PhysX_Traits_Platform.h b/Gems/PhysX/Code/Source/Platform/Windows/PhysX_Traits_Platform.h
index 69475055b8..8282b1504b 100644
--- a/Gems/PhysX/Code/Source/Platform/Windows/PhysX_Traits_Platform.h
+++ b/Gems/PhysX/Code/Source/Platform/Windows/PhysX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Windows/PhysX_Traits_Windows.h b/Gems/PhysX/Code/Source/Platform/Windows/PhysX_Traits_Windows.h
index afd77a839b..616b1dddf9 100644
--- a/Gems/PhysX/Code/Source/Platform/Windows/PhysX_Traits_Windows.h
+++ b/Gems/PhysX/Code/Source/Platform/Windows/PhysX_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/PhysX/Code/Source/Platform/Windows/platform_windows_files.cmake
index 006670a575..891395010a 100644
--- a/Gems/PhysX/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
index fd6a5da633..3a1f8d6ad3 100644
--- a/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/Platform/iOS/PhysX_Traits_Platform.h b/Gems/PhysX/Code/Source/Platform/iOS/PhysX_Traits_Platform.h
index 5a55018f67..de1dcd9322 100644
--- a/Gems/PhysX/Code/Source/Platform/iOS/PhysX_Traits_Platform.h
+++ b/Gems/PhysX/Code/Source/Platform/iOS/PhysX_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/iOS/PhysX_Traits_iOS.h b/Gems/PhysX/Code/Source/Platform/iOS/PhysX_Traits_iOS.h
index afd77a839b..616b1dddf9 100644
--- a/Gems/PhysX/Code/Source/Platform/iOS/PhysX_Traits_iOS.h
+++ b/Gems/PhysX/Code/Source/Platform/iOS/PhysX_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/PhysX/Code/Source/Platform/iOS/platform_ios_files.cmake
index e7af5d41b6..4b977989d1 100644
--- a/Gems/PhysX/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/PhysX/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/Source/RigidBody.cpp b/Gems/PhysX/Code/Source/RigidBody.cpp
index b0bace4ce2..5ffcba7aa8 100644
--- a/Gems/PhysX/Code/Source/RigidBody.cpp
+++ b/Gems/PhysX/Code/Source/RigidBody.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/RigidBody.h b/Gems/PhysX/Code/Source/RigidBody.h
index 7177f07dce..825193762a 100644
--- a/Gems/PhysX/Code/Source/RigidBody.h
+++ b/Gems/PhysX/Code/Source/RigidBody.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/RigidBodyComponent.cpp b/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
index 4cd7d3b143..1ffb4b9a49 100644
--- a/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/RigidBodyComponent.h b/Gems/PhysX/Code/Source/RigidBodyComponent.h
index 3de155d334..523f4ccb14 100644
--- a/Gems/PhysX/Code/Source/RigidBodyComponent.h
+++ b/Gems/PhysX/Code/Source/RigidBodyComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/RigidBodyStatic.cpp b/Gems/PhysX/Code/Source/RigidBodyStatic.cpp
index 956c542b97..26125fd317 100644
--- a/Gems/PhysX/Code/Source/RigidBodyStatic.cpp
+++ b/Gems/PhysX/Code/Source/RigidBodyStatic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/RigidBodyStatic.h b/Gems/PhysX/Code/Source/RigidBodyStatic.h
index fc8563590b..52950a8f84 100644
--- a/Gems/PhysX/Code/Source/RigidBodyStatic.h
+++ b/Gems/PhysX/Code/Source/RigidBodyStatic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
index 127ef1349b..22df3f0758 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
+++ b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Scene/PhysXScene.h b/Gems/PhysX/Code/Source/Scene/PhysXScene.h
index 11a063ef83..9592ab1570 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXScene.h
+++ b/Gems/PhysX/Code/Source/Scene/PhysXScene.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Scene/PhysXSceneInterface.cpp b/Gems/PhysX/Code/Source/Scene/PhysXSceneInterface.cpp
index aa297b019e..4a633fec6d 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXSceneInterface.cpp
+++ b/Gems/PhysX/Code/Source/Scene/PhysXSceneInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Scene/PhysXSceneInterface.h b/Gems/PhysX/Code/Source/Scene/PhysXSceneInterface.h
index ff6843b30d..738c50ee92 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXSceneInterface.h
+++ b/Gems/PhysX/Code/Source/Scene/PhysXSceneInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.cpp b/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.cpp
index 4597ebbe97..a9b0bfb8ac 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.cpp
+++ b/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.h b/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.h
index 0c2301f97d..ff7864b0ab 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.h
+++ b/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationFilterCallback.cpp b/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationFilterCallback.cpp
index 7c5242263b..f4bedf383f 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationFilterCallback.cpp
+++ b/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationFilterCallback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationFilterCallback.h b/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationFilterCallback.h
index d96c937bf1..f8ef7a208a 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationFilterCallback.h
+++ b/Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationFilterCallback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Shape.cpp b/Gems/PhysX/Code/Source/Shape.cpp
index b29e407e0c..77d0cbc642 100644
--- a/Gems/PhysX/Code/Source/Shape.cpp
+++ b/Gems/PhysX/Code/Source/Shape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -326,6 +326,12 @@ namespace PhysX
 
     AzPhysics::SceneQueryHit Shape::RayCastInternal(const AzPhysics::RayCastRequest& worldSpaceRequest, const physx::PxTransform& pose)
     {
+        if (const bool shouldCollide = worldSpaceRequest.m_collisionGroup.GetMask() & m_collisionLayer.GetMask();
+            !shouldCollide)
+        {
+            return AzPhysics::SceneQueryHit();
+        }
+
         const physx::PxVec3 start = PxMathConvert(worldSpaceRequest.m_start);
         const physx::PxVec3 unitDir = PxMathConvert(worldSpaceRequest.m_direction);
         const physx::PxU32 maxHits = 1;
diff --git a/Gems/PhysX/Code/Source/Shape.h b/Gems/PhysX/Code/Source/Shape.h
index 9c1d235b74..ef9364ff9e 100644
--- a/Gems/PhysX/Code/Source/Shape.h
+++ b/Gems/PhysX/Code/Source/Shape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ShapeColliderComponent.cpp b/Gems/PhysX/Code/Source/ShapeColliderComponent.cpp
index 4134174d49..9491b05e49 100644
--- a/Gems/PhysX/Code/Source/ShapeColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/ShapeColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/ShapeColliderComponent.h b/Gems/PhysX/Code/Source/ShapeColliderComponent.h
index 60012768d6..ca8fe940a3 100644
--- a/Gems/PhysX/Code/Source/ShapeColliderComponent.h
+++ b/Gems/PhysX/Code/Source/ShapeColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/SphereColliderComponent.cpp b/Gems/PhysX/Code/Source/SphereColliderComponent.cpp
index 0f90bed7df..91bff6d660 100644
--- a/Gems/PhysX/Code/Source/SphereColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/SphereColliderComponent.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/SphereColliderComponent.h b/Gems/PhysX/Code/Source/SphereColliderComponent.h
index 368786764b..f783f33dc5 100644
--- a/Gems/PhysX/Code/Source/SphereColliderComponent.h
+++ b/Gems/PhysX/Code/Source/SphereColliderComponent.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp b/Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp
index f787e5ff30..5742dba87d 100644
--- a/Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/StaticRigidBodyComponent.h b/Gems/PhysX/Code/Source/StaticRigidBodyComponent.h
index ca80da1e62..9002d7525b 100644
--- a/Gems/PhysX/Code/Source/StaticRigidBodyComponent.h
+++ b/Gems/PhysX/Code/Source/StaticRigidBodyComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXAllocator.cpp b/Gems/PhysX/Code/Source/System/PhysXAllocator.cpp
index 5c0752daaa..5b05c72ae0 100644
--- a/Gems/PhysX/Code/Source/System/PhysXAllocator.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXAllocator.h b/Gems/PhysX/Code/Source/System/PhysXAllocator.h
index 3e70a55ea3..2fb3fd9e61 100644
--- a/Gems/PhysX/Code/Source/System/PhysXAllocator.h
+++ b/Gems/PhysX/Code/Source/System/PhysXAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXCookingParams.cpp b/Gems/PhysX/Code/Source/System/PhysXCookingParams.cpp
index 3a2f076d82..a3a4483604 100644
--- a/Gems/PhysX/Code/Source/System/PhysXCookingParams.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXCookingParams.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXCookingParams.h b/Gems/PhysX/Code/Source/System/PhysXCookingParams.h
index 0f0fb04884..6df8791dda 100644
--- a/Gems/PhysX/Code/Source/System/PhysXCookingParams.h
+++ b/Gems/PhysX/Code/Source/System/PhysXCookingParams.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.cpp b/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.cpp
index 5891eb5461..6e8fcdd3bd 100644
--- a/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.h b/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.h
index 2b408e86ab..bfc764f948 100644
--- a/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.h
+++ b/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXJob.cpp b/Gems/PhysX/Code/Source/System/PhysXJob.cpp
index 4d5605d1d5..d8f1a2da08 100644
--- a/Gems/PhysX/Code/Source/System/PhysXJob.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXJob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXJob.h b/Gems/PhysX/Code/Source/System/PhysXJob.h
index 6a2f88b7ff..eeb355ddc0 100644
--- a/Gems/PhysX/Code/Source/System/PhysXJob.h
+++ b/Gems/PhysX/Code/Source/System/PhysXJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXSdkCallbacks.cpp b/Gems/PhysX/Code/Source/System/PhysXSdkCallbacks.cpp
index 159e021ee7..55b53ceae8 100644
--- a/Gems/PhysX/Code/Source/System/PhysXSdkCallbacks.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXSdkCallbacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXSdkCallbacks.h b/Gems/PhysX/Code/Source/System/PhysXSdkCallbacks.h
index a588699054..622af3a5fc 100644
--- a/Gems/PhysX/Code/Source/System/PhysXSdkCallbacks.h
+++ b/Gems/PhysX/Code/Source/System/PhysXSdkCallbacks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXSystem.cpp b/Gems/PhysX/Code/Source/System/PhysXSystem.cpp
index 6f18280d6a..24f0895eb8 100644
--- a/Gems/PhysX/Code/Source/System/PhysXSystem.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/System/PhysXSystem.h b/Gems/PhysX/Code/Source/System/PhysXSystem.h
index e717dbb3ef..38b4a97beb 100644
--- a/Gems/PhysX/Code/Source/System/PhysXSystem.h
+++ b/Gems/PhysX/Code/Source/System/PhysXSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/SystemComponent.cpp b/Gems/PhysX/Code/Source/SystemComponent.cpp
index 6bebc708b7..3aa416b70b 100644
--- a/Gems/PhysX/Code/Source/SystemComponent.cpp
+++ b/Gems/PhysX/Code/Source/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/SystemComponent.h b/Gems/PhysX/Code/Source/SystemComponent.h
index 8bda1f5174..0fdf1143b1 100644
--- a/Gems/PhysX/Code/Source/SystemComponent.h
+++ b/Gems/PhysX/Code/Source/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Utils.cpp b/Gems/PhysX/Code/Source/Utils.cpp
index c110da88cb..92af5b9855 100644
--- a/Gems/PhysX/Code/Source/Utils.cpp
+++ b/Gems/PhysX/Code/Source/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/Utils.h b/Gems/PhysX/Code/Source/Utils.h
index f609737bb5..7982c6e2a8 100644
--- a/Gems/PhysX/Code/Source/Utils.h
+++ b/Gems/PhysX/Code/Source/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/WindProvider.cpp b/Gems/PhysX/Code/Source/WindProvider.cpp
index 81db391919..4187ec9d1e 100644
--- a/Gems/PhysX/Code/Source/WindProvider.cpp
+++ b/Gems/PhysX/Code/Source/WindProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Source/WindProvider.h b/Gems/PhysX/Code/Source/WindProvider.h
index 9b8ff28a49..ca8ea3e0a3 100644
--- a/Gems/PhysX/Code/Source/WindProvider.h
+++ b/Gems/PhysX/Code/Source/WindProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarkWashingMachine.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarkWashingMachine.cpp
index dbd6d2d93b..d01e570d4c 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarkWashingMachine.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarkWashingMachine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarkWashingMachine.h b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarkWashingMachine.h
index 2f00dae907..14bcbfe9b8 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarkWashingMachine.h
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarkWashingMachine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksCommon.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksCommon.cpp
index 78f5a95290..5a09202e47 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksCommon.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksCommon.h b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksCommon.h
index 4d8bfc6491..a0d520a874 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksCommon.h
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksUtilities.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksUtilities.cpp
index 74dfb973f6..b7c3106391 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksUtilities.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksUtilities.h b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksUtilities.h
index 912b2d1882..ef48ac3f50 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksUtilities.h
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXBenchmarksUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersBenchmarks.cpp
index d4fb7106a1..1e0157f079 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp
index 6421bf75d4..920de2713f 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXGenericBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXGenericBenchmarks.cpp
index 343b6d4669..6b8d965bd0 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXGenericBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXGenericBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp
index 7c6fafa7a2..b1f3625a75 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp
index 8e8eb77a7a..03c881787c 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/Benchmarks/PhysXSceneQueryBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXSceneQueryBenchmarks.cpp
index 2de7691b0a..d67708d770 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXSceneQueryBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXSceneQueryBenchmarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/CharacterControllerTests.cpp b/Gems/PhysX/Code/Tests/CharacterControllerTests.cpp
index 9f27716548..b7c1f639a3 100644
--- a/Gems/PhysX/Code/Tests/CharacterControllerTests.cpp
+++ b/Gems/PhysX/Code/Tests/CharacterControllerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/ColliderScalingTests.cpp b/Gems/PhysX/Code/Tests/ColliderScalingTests.cpp
index cb98b305b0..686dd4f92d 100644
--- a/Gems/PhysX/Code/Tests/ColliderScalingTests.cpp
+++ b/Gems/PhysX/Code/Tests/ColliderScalingTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/DebugDrawTests.cpp b/Gems/PhysX/Code/Tests/DebugDrawTests.cpp
index 7324c4b5eb..6a606ad191 100644
--- a/Gems/PhysX/Code/Tests/DebugDrawTests.cpp
+++ b/Gems/PhysX/Code/Tests/DebugDrawTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/EditorCharacterControllerTests.cpp b/Gems/PhysX/Code/Tests/EditorCharacterControllerTests.cpp
index d9ae707a5b..a9cce846d4 100644
--- a/Gems/PhysX/Code/Tests/EditorCharacterControllerTests.cpp
+++ b/Gems/PhysX/Code/Tests/EditorCharacterControllerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp b/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp
index 5494db679c..f789ae15d2 100644
--- a/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp
+++ b/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/EditorTestUtilities.h b/Gems/PhysX/Code/Tests/EditorTestUtilities.h
index 0f68b42bc3..940a191181 100644
--- a/Gems/PhysX/Code/Tests/EditorTestUtilities.h
+++ b/Gems/PhysX/Code/Tests/EditorTestUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
index fcb641a979..8564905394 100644
--- a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp b/Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp
index 6fbd73e1f6..d871770e6e 100644
--- a/Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXComponentBusTests.cpp b/Gems/PhysX/Code/Tests/PhysXComponentBusTests.cpp
index ce0706414f..0d24fc84a0 100644
--- a/Gems/PhysX/Code/Tests/PhysXComponentBusTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXComponentBusTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXEditorTest.cpp b/Gems/PhysX/Code/Tests/PhysXEditorTest.cpp
index 442f3c04f6..c798c8121e 100644
--- a/Gems/PhysX/Code/Tests/PhysXEditorTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXEditorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXForceRegionTest.cpp b/Gems/PhysX/Code/Tests/PhysXForceRegionTest.cpp
index afaea6140f..91ce359a54 100644
--- a/Gems/PhysX/Code/Tests/PhysXForceRegionTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXForceRegionTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXGenericTest.cpp b/Gems/PhysX/Code/Tests/PhysXGenericTest.cpp
index 1b18f5b6db..7f9f25c7f4 100644
--- a/Gems/PhysX/Code/Tests/PhysXGenericTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXGenericTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXGenericTestFixture.cpp b/Gems/PhysX/Code/Tests/PhysXGenericTestFixture.cpp
index cdcf4378ca..abe5d56939 100644
--- a/Gems/PhysX/Code/Tests/PhysXGenericTestFixture.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXGenericTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXGenericTestFixture.h b/Gems/PhysX/Code/Tests/PhysXGenericTestFixture.h
index 0a89dffe69..53f22e6039 100644
--- a/Gems/PhysX/Code/Tests/PhysXGenericTestFixture.h
+++ b/Gems/PhysX/Code/Tests/PhysXGenericTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
index 7bd7d14ded..6a87639585 100644
--- a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXMultithreadingTest.cpp b/Gems/PhysX/Code/Tests/PhysXMultithreadingTest.cpp
index 76906113bb..fd97bdb3ee 100644
--- a/Gems/PhysX/Code/Tests/PhysXMultithreadingTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXMultithreadingTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXSceneQueryTests.cpp b/Gems/PhysX/Code/Tests/PhysXSceneQueryTests.cpp
index 73ce151d14..1ae9d280e4 100644
--- a/Gems/PhysX/Code/Tests/PhysXSceneQueryTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXSceneQueryTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXSceneTests.cpp b/Gems/PhysX/Code/Tests/PhysXSceneTests.cpp
index 42a3181862..94c2d439c9 100644
--- a/Gems/PhysX/Code/Tests/PhysXSceneTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXSceneTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp b/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp
new file mode 100644
index 0000000000..40213dedcf
--- /dev/null
+++ b/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp
@@ -0,0 +1,156 @@
+/*
+ * 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 <PhysX_precompiled.h>
+#include "PhysXTestFixtures.h"
+#include "PhysXTestUtil.h"
+#include "PhysXTestCommon.h"
+
+#include <AzCore/Script/ScriptContext.h>
+#include <AzCore/Script/lua/lua.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/Math/MathReflection.h>
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzFramework/Physics/Utils.h>
+#include <AzCore/Math/MathReflection.h>
+#include <AzFramework/Entity/EntityContext.h>
+
+namespace PhysX
+{
+    static AZStd::map<AZStd::string, EntityPtr> s_testEntities;
+
+    AZ::EntityId GetTestEntityId(const char* name)
+    {
+        if (auto it = s_testEntities.find(name);
+            it != s_testEntities.end())
+        {
+            return it->second->GetId();
+        }
+
+        return AZ::EntityId();
+    }
+
+    // this allows EXPECT_TRUE to be exposed to the behavior context and used inside blocks of lua code which
+    // are executed in tests
+    void ExpectTrue(bool check)
+    {
+        EXPECT_TRUE(check);
+    }
+
+    class PhysXScriptTest
+        : public PhysXDefaultWorldTest
+    {
+    public:
+        AZ_TYPE_INFO(PhysXScriptTest, "{337A9DB4-ACF7-42A7-92E5-48A9FF14B49C}");
+
+        void SetUp() override
+        {
+            PhysXDefaultWorldTest::SetUp();
+
+            m_behaviorContext = AZStd::make_unique<AZ::BehaviorContext>();
+            AZ::Entity::Reflect(m_behaviorContext.get());
+            AZ::MathReflect(m_behaviorContext.get());
+            AzFramework::EntityContext::Reflect(m_behaviorContext.get());
+            Physics::ReflectionUtils::ReflectPhysicsApi(m_behaviorContext.get());
+            m_behaviorContext->Method("ExpectTrue", &ExpectTrue);
+            m_behaviorContext->Method("GetTestEntityId", &GetTestEntityId);
+            m_scriptContext = AZStd::make_unique<AZ::ScriptContext>();
+            m_scriptContext->BindTo(m_behaviorContext.get());
+        }
+
+        void TearDown() override
+        {
+            s_testEntities.clear();
+
+            m_scriptContext.reset();
+            m_behaviorContext.reset();
+
+            PhysXDefaultWorldTest::TearDown();
+        }
+
+        AZ::BehaviorContext* GetBehaviorContext()
+        {
+            return m_behaviorContext.get();
+        }
+
+        AZ::ScriptContext* GetScriptContext()
+        {
+            return m_scriptContext.get();
+        }
+
+    private:
+        AZStd::unique_ptr<AZ::BehaviorContext> m_behaviorContext;
+        AZStd::unique_ptr<AZ::ScriptContext> m_scriptContext;
+    };
+
+    TEST_F(PhysXScriptTest, ScriptedRaycast_RaycastNotIntersectingBox_ReturnsNoHits)
+    {
+        s_testEntities.insert(
+            {
+                "Box",
+                TestUtils::AddStaticUnitTestObject<BoxColliderComponent>(GetDefaultSceneHandle(), AZ::Vector3::CreateZero(), "Box")
+            });
+
+        const char luaCode[] =
+            R"(
+                boxId = GetTestEntityId("Box")
+                request = RayCastRequest()
+                request.Start = Vector3(5.0, 0.0, 5.0)
+                request.Direction = Vector3(0.0, 0.0, -1.0)
+                request.Distance = 10.0
+                hit = SimulatedBodyComponentRequestBus.Event.RayCast(boxId, request)
+                ExpectTrue(hit.EntityId == EntityId())
+            )";
+
+        EXPECT_TRUE(GetScriptContext()->Execute(luaCode));
+    }
+
+    TEST_F(PhysXScriptTest, ScriptedRaycast_RaycastIntersectingBox_ReturnsHitOnBox)
+    {
+        s_testEntities.insert(
+            {
+                "Box",
+                TestUtils::AddStaticUnitTestObject<BoxColliderComponent>(GetDefaultSceneHandle(), AZ::Vector3::CreateZero(), "Box")
+            });
+
+        const char luaCode[] =
+            R"(
+                boxId = GetTestEntityId("Box")
+                request = RayCastRequest()
+                request.Start = Vector3(0.0, 0.0, 5.0)
+                request.Direction = Vector3(0.0, 0.0, -1.0)
+                request.Distance = 10.0
+                hit = SimulatedBodyComponentRequestBus.Event.RayCast(boxId, request)
+                ExpectTrue(hit.EntityId == boxId)
+            )";
+
+        EXPECT_TRUE(GetScriptContext()->Execute(luaCode));
+    }
+
+    TEST_F(PhysXScriptTest, ScriptedRaycast_RaycastNotInteractingCollisionFilters_ReturnsNoHit)
+    {
+        s_testEntities.insert(
+            {
+                "Box",
+                TestUtils::AddStaticUnitTestObject<BoxColliderComponent>(GetDefaultSceneHandle(), AZ::Vector3::CreateZero(), "Box")
+            });
+
+        const char luaCode[] =
+            R"(
+                boxId = GetTestEntityId("Box")
+                request = RayCastRequest()
+                request.Start = Vector3(0.0, 0.0, 5.0)
+                request.Direction = Vector3(0.0, 0.0, -1.0)
+                request.Distance = 10.0
+                request.Collision = CollisionGroup("None")
+                hit = SimulatedBodyComponentRequestBus.Event.RayCast(boxId, request)
+                ExpectTrue(hit.EntityId == EntityId())
+            )";
+
+        EXPECT_TRUE(GetScriptContext()->Execute(luaCode));
+    }
+} // namespace PhysX
diff --git a/Gems/PhysX/Code/Tests/PhysXSpecificTest.cpp b/Gems/PhysX/Code/Tests/PhysXSpecificTest.cpp
index f6b75e1de0..5accc86499 100644
--- a/Gems/PhysX/Code/Tests/PhysXSpecificTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXSpecificTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp b/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp
index f3db14639e..dc5edd4a5a 100644
--- a/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestCommon.cpp b/Gems/PhysX/Code/Tests/PhysXTestCommon.cpp
index 21bc43f821..e39fd321a2 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestCommon.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXTestCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestCommon.h b/Gems/PhysX/Code/Tests/PhysXTestCommon.h
index 778ac7ce9e..7f90ddc248 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestCommon.h
+++ b/Gems/PhysX/Code/Tests/PhysXTestCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestCommon.inl b/Gems/PhysX/Code/Tests/PhysXTestCommon.inl
index 16c068ceff..7eee24d328 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestCommon.inl
+++ b/Gems/PhysX/Code/Tests/PhysXTestCommon.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestEnvironment.cpp b/Gems/PhysX/Code/Tests/PhysXTestEnvironment.cpp
index 5bdcd8b04e..35096f9b9c 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestEnvironment.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXTestEnvironment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestEnvironment.h b/Gems/PhysX/Code/Tests/PhysXTestEnvironment.h
index b1fd2ac9ec..35f3fb155e 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestEnvironment.h
+++ b/Gems/PhysX/Code/Tests/PhysXTestEnvironment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestFixtures.cpp b/Gems/PhysX/Code/Tests/PhysXTestFixtures.cpp
index 216457e44d..1949e27f1d 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestFixtures.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXTestFixtures.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestFixtures.h b/Gems/PhysX/Code/Tests/PhysXTestFixtures.h
index b842695213..dce827dcde 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestFixtures.h
+++ b/Gems/PhysX/Code/Tests/PhysXTestFixtures.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestUtil.cpp b/Gems/PhysX/Code/Tests/PhysXTestUtil.cpp
index 918b28a22a..1af923a753 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestUtil.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXTestUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXTestUtil.h b/Gems/PhysX/Code/Tests/PhysXTestUtil.h
index 0ea53d82fe..f927b5b7d7 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestUtil.h
+++ b/Gems/PhysX/Code/Tests/PhysXTestUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PhysXWindTest.cpp b/Gems/PhysX/Code/Tests/PhysXWindTest.cpp
index af1c9c55a9..47599a1129 100644
--- a/Gems/PhysX/Code/Tests/PhysXWindTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXWindTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PolygonPrismMeshUtilsTest.cpp b/Gems/PhysX/Code/Tests/PolygonPrismMeshUtilsTest.cpp
index eb3f17d3ef..a24de1d1c2 100644
--- a/Gems/PhysX/Code/Tests/PolygonPrismMeshUtilsTest.cpp
+++ b/Gems/PhysX/Code/Tests/PolygonPrismMeshUtilsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTestData.cpp b/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTestData.cpp
index a6e2612999..0bfd979a99 100644
--- a/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTestData.cpp
+++ b/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTestData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTests.cpp b/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTests.cpp
index 628d66e8af..0d0fe52c0e 100644
--- a/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTests.cpp
+++ b/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/RagdollTestData.h b/Gems/PhysX/Code/Tests/RagdollTestData.h
index 207fe6ca27..dd0e8ddf94 100644
--- a/Gems/PhysX/Code/Tests/RagdollTestData.h
+++ b/Gems/PhysX/Code/Tests/RagdollTestData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/RagdollTests.cpp b/Gems/PhysX/Code/Tests/RagdollTests.cpp
index 5ec9cce138..0aa0c85b20 100644
--- a/Gems/PhysX/Code/Tests/RagdollTests.cpp
+++ b/Gems/PhysX/Code/Tests/RagdollTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/RigidBodyComponentTests.cpp b/Gems/PhysX/Code/Tests/RigidBodyComponentTests.cpp
index 240c6cb4af..941591ea32 100644
--- a/Gems/PhysX/Code/Tests/RigidBodyComponentTests.cpp
+++ b/Gems/PhysX/Code/Tests/RigidBodyComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/ShapeColliderComponentTests.cpp b/Gems/PhysX/Code/Tests/ShapeColliderComponentTests.cpp
index dedd9293cb..2c51071fac 100644
--- a/Gems/PhysX/Code/Tests/ShapeColliderComponentTests.cpp
+++ b/Gems/PhysX/Code/Tests/ShapeColliderComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/ShapeGeometryTests.cpp b/Gems/PhysX/Code/Tests/ShapeGeometryTests.cpp
index 413a87da34..833f5425bc 100644
--- a/Gems/PhysX/Code/Tests/ShapeGeometryTests.cpp
+++ b/Gems/PhysX/Code/Tests/ShapeGeometryTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp b/Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp
index 29654edd7d..1d5e9b82d4 100644
--- a/Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp
+++ b/Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/SystemComponentTest.cpp b/Gems/PhysX/Code/Tests/SystemComponentTest.cpp
index 669b23acda..48c11eba56 100644
--- a/Gems/PhysX/Code/Tests/SystemComponentTest.cpp
+++ b/Gems/PhysX/Code/Tests/SystemComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/Tests/TestColliderComponent.h b/Gems/PhysX/Code/Tests/TestColliderComponent.h
index 00f1db5609..96c9eb31cc 100644
--- a/Gems/PhysX/Code/Tests/TestColliderComponent.h
+++ b/Gems/PhysX/Code/Tests/TestColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysX/Code/physx_editor_files.cmake b/Gems/PhysX/Code/physx_editor_files.cmake
index cc549b143a..6a5e900732 100644
--- a/Gems/PhysX/Code/physx_editor_files.cmake
+++ b/Gems/PhysX/Code/physx_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/physx_editor_shared_files.cmake b/Gems/PhysX/Code/physx_editor_shared_files.cmake
index a93f67afd8..c686bffbe2 100644
--- a/Gems/PhysX/Code/physx_editor_shared_files.cmake
+++ b/Gems/PhysX/Code/physx_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/physx_editor_tests_files.cmake b/Gems/PhysX/Code/physx_editor_tests_files.cmake
index be4a4f4626..4229ad7f49 100644
--- a/Gems/PhysX/Code/physx_editor_tests_files.cmake
+++ b/Gems/PhysX/Code/physx_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/physx_files.cmake b/Gems/PhysX/Code/physx_files.cmake
index a0311dbbe7..97d36e3a03 100644
--- a/Gems/PhysX/Code/physx_files.cmake
+++ b/Gems/PhysX/Code/physx_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/physx_shared_files.cmake b/Gems/PhysX/Code/physx_shared_files.cmake
index 7524b2529c..e5f0ae0a44 100644
--- a/Gems/PhysX/Code/physx_shared_files.cmake
+++ b/Gems/PhysX/Code/physx_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/physx_tests_files.cmake b/Gems/PhysX/Code/physx_tests_files.cmake
index 09ecf19de5..680ed2afeb 100644
--- a/Gems/PhysX/Code/physx_tests_files.cmake
+++ b/Gems/PhysX/Code/physx_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -29,6 +29,7 @@ set(FILES
     Tests/PhysXTestUtil.h
     Tests/PhysXTestUtil.cpp
     Tests/PhysXMultithreadingTest.cpp
+    Tests/PhysXScriptTest.cpp
     Tests/CharacterControllerTests.cpp
     Tests/RagdollConfiguration.xml
     Tests/RagdollTestData.h
diff --git a/Gems/PhysX/Code/physx_unsupported_files.cmake b/Gems/PhysX/Code/physx_unsupported_files.cmake
index be6086b9a5..f818bcf062 100644
--- a/Gems/PhysX/Code/physx_unsupported_files.cmake
+++ b/Gems/PhysX/Code/physx_unsupported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysX/Code/physx_unsupported_shared_files.cmake b/Gems/PhysX/Code/physx_unsupported_shared_files.cmake
index b1e8d60342..30622457d1 100644
--- a/Gems/PhysX/Code/physx_unsupported_shared_files.cmake
+++ b/Gems/PhysX/Code/physx_unsupported_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysXDebug/CMakeLists.txt b/Gems/PhysXDebug/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/PhysXDebug/CMakeLists.txt
+++ b/Gems/PhysXDebug/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysXDebug/Code/CMakeLists.txt b/Gems/PhysXDebug/Code/CMakeLists.txt
index 296e0d5e45..09bbd2e8f3 100644
--- a/Gems/PhysXDebug/Code/CMakeLists.txt
+++ b/Gems/PhysXDebug/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysXDebug/Code/Include/PhysXDebug/PhysXDebugBus.h b/Gems/PhysXDebug/Code/Include/PhysXDebug/PhysXDebugBus.h
index 9315010c16..5967ac3dcf 100644
--- a/Gems/PhysXDebug/Code/Include/PhysXDebug/PhysXDebugBus.h
+++ b/Gems/PhysXDebug/Code/Include/PhysXDebug/PhysXDebugBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/Source/EditorSystemComponent.cpp b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.cpp
index 287444a9eb..6ae0bea82d 100644
--- a/Gems/PhysXDebug/Code/Source/EditorSystemComponent.cpp
+++ b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h
index 156f8c64b9..68e25ede21 100644
--- a/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h
+++ b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/Source/Module.cpp b/Gems/PhysXDebug/Code/Source/Module.cpp
index 982cc2bdce..49877ab329 100644
--- a/Gems/PhysXDebug/Code/Source/Module.cpp
+++ b/Gems/PhysXDebug/Code/Source/Module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/Source/ModuleUnsupported.cpp b/Gems/PhysXDebug/Code/Source/ModuleUnsupported.cpp
index aea39aad2f..561d062845 100644
--- a/Gems/PhysXDebug/Code/Source/ModuleUnsupported.cpp
+++ b/Gems/PhysXDebug/Code/Source/ModuleUnsupported.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h b/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
+++ b/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h b/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
index 4395a4898f..ef72b98bc5 100644
--- a/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
+++ b/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/Source/SystemComponent.cpp b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
index ada0a1839e..1bd9394c02 100644
--- a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
+++ b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/Source/SystemComponent.h b/Gems/PhysXDebug/Code/Source/SystemComponent.h
index 076d77410f..d413fb126d 100644
--- a/Gems/PhysXDebug/Code/Source/SystemComponent.h
+++ b/Gems/PhysXDebug/Code/Source/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake b/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
index 794adf9279..b228cdc02b 100644
--- a/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysXDebug/Code/physxdebug_files.cmake b/Gems/PhysXDebug/Code/physxdebug_files.cmake
index 66ac233ca0..9d1d6a7892 100644
--- a/Gems/PhysXDebug/Code/physxdebug_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake b/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
index 87b93be7f6..f12a747f58 100644
--- a/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PhysXSamples/CMakeLists.txt b/Gems/PhysXSamples/CMakeLists.txt
index b80fd1ce34..631ca79c78 100644
--- a/Gems/PhysXSamples/CMakeLists.txt
+++ b/Gems/PhysXSamples/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Prefab/CMakeLists.txt b/Gems/Prefab/CMakeLists.txt
index 47497fe329..bdaa5e8596 100644
--- a/Gems/Prefab/CMakeLists.txt
+++ b/Gems/Prefab/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Prefab/PrefabBuilder/CMakeLists.txt b/Gems/Prefab/PrefabBuilder/CMakeLists.txt
index c7c56e92c1..1366184126 100644
--- a/Gems/Prefab/PrefabBuilder/CMakeLists.txt
+++ b/Gems/Prefab/PrefabBuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.cpp b/Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.cpp
index 2235c22eae..024e6c35d2 100644
--- a/Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.cpp
+++ b/Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.h b/Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.h
index 8c9a14e312..8eebaa235d 100644
--- a/Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.h
+++ b/Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Prefab/PrefabBuilder/PrefabBuilderModule.cpp b/Gems/Prefab/PrefabBuilder/PrefabBuilderModule.cpp
index 2c0443d847..375bafd21a 100644
--- a/Gems/Prefab/PrefabBuilder/PrefabBuilderModule.cpp
+++ b/Gems/Prefab/PrefabBuilder/PrefabBuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.cpp b/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.cpp
index 29d49a7ea0..e9fbd3e47a 100644
--- a/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.cpp
+++ b/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.h b/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.h
index 702efd0c2f..a9a6847ae4 100644
--- a/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.h
+++ b/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake b/Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
index 4c1485096e..ebf492eee7 100644
--- a/Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
+++ b/Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Prefab/PrefabBuilder/prefabbuilder_module_files.cmake b/Gems/Prefab/PrefabBuilder/prefabbuilder_module_files.cmake
index 320cd987b5..369bee5aa9 100644
--- a/Gems/Prefab/PrefabBuilder/prefabbuilder_module_files.cmake
+++ b/Gems/Prefab/PrefabBuilder/prefabbuilder_module_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake b/Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
index 70bf17e7de..8a9fba5306 100644
--- a/Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
+++ b/Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/CMakeLists.txt b/Gems/Presence/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Presence/CMakeLists.txt
+++ b/Gems/Presence/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/CMakeLists.txt b/Gems/Presence/Code/CMakeLists.txt
index bc076e177c..31de515643 100644
--- a/Gems/Presence/Code/CMakeLists.txt
+++ b/Gems/Presence/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Include/Presence/PresenceNotificationBus.h b/Gems/Presence/Code/Include/Presence/PresenceNotificationBus.h
index e3c13277ec..182873a2c8 100644
--- a/Gems/Presence/Code/Include/Presence/PresenceNotificationBus.h
+++ b/Gems/Presence/Code/Include/Presence/PresenceNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Presence/Code/Include/Presence/PresenceRequestBus.h b/Gems/Presence/Code/Include/Presence/PresenceRequestBus.h
index cc2577369d..5f481118b9 100644
--- a/Gems/Presence/Code/Include/Presence/PresenceRequestBus.h
+++ b/Gems/Presence/Code/Include/Presence/PresenceRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Presence/Code/Source/Platform/Android/platform_android.cmake b/Gems/Presence/Code/Source/Platform/Android/platform_android.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/Presence/Code/Source/Platform/Android/platform_android.cmake
+++ b/Gems/Presence/Code/Source/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Presence/Code/Source/Platform/Android/platform_android_files.cmake
index 09bae1e9e9..25c7d5301d 100644
--- a/Gems/Presence/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Presence/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/AppleTV/platform_appletv.cmake b/Gems/Presence/Code/Source/Platform/AppleTV/platform_appletv.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/Presence/Code/Source/Platform/AppleTV/platform_appletv.cmake
+++ b/Gems/Presence/Code/Source/Platform/AppleTV/platform_appletv.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/Common/Unimplemented/PresenceSystemComponent_Unimplemented.cpp b/Gems/Presence/Code/Source/Platform/Common/Unimplemented/PresenceSystemComponent_Unimplemented.cpp
index b2793f04da..568f3ef740 100644
--- a/Gems/Presence/Code/Source/Platform/Common/Unimplemented/PresenceSystemComponent_Unimplemented.cpp
+++ b/Gems/Presence/Code/Source/Platform/Common/Unimplemented/PresenceSystemComponent_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Presence/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/Presence/Code/Source/Platform/Linux/platform_linux.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/Presence/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/Presence/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Presence/Code/Source/Platform/Linux/platform_linux_files.cmake
index 09bae1e9e9..25c7d5301d 100644
--- a/Gems/Presence/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Presence/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/Presence/Code/Source/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Presence/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/Presence/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Presence/Code/Source/Platform/Mac/platform_mac_files.cmake
index 09bae1e9e9..25c7d5301d 100644
--- a/Gems/Presence/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Presence/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/Presence/Code/Source/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/Presence/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/Presence/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Presence/Code/Source/Platform/Windows/platform_windows_files.cmake
index 09bae1e9e9..25c7d5301d 100644
--- a/Gems/Presence/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Presence/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/iOS/platform_ios.cmake b/Gems/Presence/Code/Source/Platform/iOS/platform_ios.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/Presence/Code/Source/Platform/iOS/platform_ios.cmake
+++ b/Gems/Presence/Code/Source/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Presence/Code/Source/Platform/iOS/platform_ios_files.cmake
index 09bae1e9e9..25c7d5301d 100644
--- a/Gems/Presence/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Presence/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/Source/PresenceModule.cpp b/Gems/Presence/Code/Source/PresenceModule.cpp
index 26eff52b8c..0922d1bc03 100644
--- a/Gems/Presence/Code/Source/PresenceModule.cpp
+++ b/Gems/Presence/Code/Source/PresenceModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Presence/Code/Source/PresenceSystemComponent.cpp b/Gems/Presence/Code/Source/PresenceSystemComponent.cpp
index d8435ae96c..84f9dac3d6 100644
--- a/Gems/Presence/Code/Source/PresenceSystemComponent.cpp
+++ b/Gems/Presence/Code/Source/PresenceSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Presence/Code/Source/PresenceSystemComponent.h b/Gems/Presence/Code/Source/PresenceSystemComponent.h
index 6b62a24822..8e17dbb169 100644
--- a/Gems/Presence/Code/Source/PresenceSystemComponent.h
+++ b/Gems/Presence/Code/Source/PresenceSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Presence/Code/presence_files.cmake b/Gems/Presence/Code/presence_files.cmake
index 1e4e7cde64..8d655d0807 100644
--- a/Gems/Presence/Code/presence_files.cmake
+++ b/Gems/Presence/Code/presence_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Presence/Code/presence_shared_files.cmake b/Gems/Presence/Code/presence_shared_files.cmake
index 483c42328e..9b5dcd6bfc 100644
--- a/Gems/Presence/Code/presence_shared_files.cmake
+++ b/Gems/Presence/Code/presence_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PrimitiveAssets/CMakeLists.txt b/Gems/PrimitiveAssets/CMakeLists.txt
index badff9e987..5eddeff4c5 100644
--- a/Gems/PrimitiveAssets/CMakeLists.txt
+++ b/Gems/PrimitiveAssets/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/CMakeLists.txt b/Gems/PythonAssetBuilder/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/PythonAssetBuilder/CMakeLists.txt
+++ b/Gems/PythonAssetBuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/CMakeLists.txt b/Gems/PythonAssetBuilder/Code/CMakeLists.txt
index e0e90d12ec..946199e22e 100644
--- a/Gems/PythonAssetBuilder/Code/CMakeLists.txt
+++ b/Gems/PythonAssetBuilder/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonAssetBuilderBus.h b/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonAssetBuilderBus.h
index 3006f8b573..f235062f4f 100644
--- a/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonAssetBuilderBus.h
+++ b/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonAssetBuilderBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonBuilderNotificationBus.h b/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonBuilderNotificationBus.h
index b6f1d31cef..65f8d31773 100644
--- a/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonBuilderNotificationBus.h
+++ b/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonBuilderNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonBuilderRequestBus.h b/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonBuilderRequestBus.h
index d99898a268..df3b02b717 100644
--- a/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonBuilderRequestBus.h
+++ b/Gems/PythonAssetBuilder/Code/Include/PythonAssetBuilder/PythonBuilderRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/Platform/Common/Clang/pythonassetbuilder_static_clang.cmake b/Gems/PythonAssetBuilder/Code/Source/Platform/Common/Clang/pythonassetbuilder_static_clang.cmake
index e75bb7f45a..fb29e53c94 100644
--- a/Gems/PythonAssetBuilder/Code/Source/Platform/Common/Clang/pythonassetbuilder_static_clang.cmake
+++ b/Gems/PythonAssetBuilder/Code/Source/Platform/Common/Clang/pythonassetbuilder_static_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/Source/Platform/Common/Clang/pythonassetbuilder_tests_clang.cmake b/Gems/PythonAssetBuilder/Code/Source/Platform/Common/Clang/pythonassetbuilder_tests_clang.cmake
index e75bb7f45a..fb29e53c94 100644
--- a/Gems/PythonAssetBuilder/Code/Source/Platform/Common/Clang/pythonassetbuilder_tests_clang.cmake
+++ b/Gems/PythonAssetBuilder/Code/Source/Platform/Common/Clang/pythonassetbuilder_tests_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/Source/Platform/Common/MSVC/pythonassetbuilder_static_msvc.cmake b/Gems/PythonAssetBuilder/Code/Source/Platform/Common/MSVC/pythonassetbuilder_static_msvc.cmake
index 6786dfd811..e95772616a 100644
--- a/Gems/PythonAssetBuilder/Code/Source/Platform/Common/MSVC/pythonassetbuilder_static_msvc.cmake
+++ b/Gems/PythonAssetBuilder/Code/Source/Platform/Common/MSVC/pythonassetbuilder_static_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/Source/Platform/Common/MSVC/pythonassetbuilder_tests_msvc.cmake b/Gems/PythonAssetBuilder/Code/Source/Platform/Common/MSVC/pythonassetbuilder_tests_msvc.cmake
index 74e58d9d53..8020690132 100644
--- a/Gems/PythonAssetBuilder/Code/Source/Platform/Common/MSVC/pythonassetbuilder_tests_msvc.cmake
+++ b/Gems/PythonAssetBuilder/Code/Source/Platform/Common/MSVC/pythonassetbuilder_tests_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/PythonAssetBuilder/Code/Source/Platform/Linux/PAL_linux.cmake
index d4580be776..445b7b8838 100644
--- a/Gems/PythonAssetBuilder/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/PythonAssetBuilder/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/PythonAssetBuilder/Code/Source/Platform/Mac/PAL_mac.cmake
index 29e4d63214..b5664ad910 100644
--- a/Gems/PythonAssetBuilder/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/PythonAssetBuilder/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/PythonAssetBuilder/Code/Source/Platform/Windows/PAL_windows.cmake
index d4580be776..445b7b8838 100644
--- a/Gems/PythonAssetBuilder/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/PythonAssetBuilder/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp
index 325f0f3fbf..ff0325715c 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderSystemComponent.cpp b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderSystemComponent.cpp
index 9efaf6389f..8dd7d097fa 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderSystemComponent.cpp
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderSystemComponent.h b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderSystemComponent.h
index b5928a977e..13bb10cd35 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderSystemComponent.h
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.cpp b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.cpp
index e531c7aa18..0cffac5e19 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.cpp
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.h b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.h
index 406ee9c562..e287c99733 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.h
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/PythonBuilderNotificationHandler.cpp b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderNotificationHandler.cpp
index b734707fa3..f48b79109a 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonBuilderNotificationHandler.cpp
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderNotificationHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/PythonBuilderNotificationHandler.h b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderNotificationHandler.h
index 7136a2671d..8c84aa9e80 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonBuilderNotificationHandler.h
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderNotificationHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/PythonBuilderWorker.cpp b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderWorker.cpp
index 363e25ff22..07a8836cad 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonBuilderWorker.cpp
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Source/PythonBuilderWorker.h b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderWorker.h
index a5a54cbcbb..5e21351f2a 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonBuilderWorker.h
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Tests/PythonAssetBuilderTest.cpp b/Gems/PythonAssetBuilder/Code/Tests/PythonAssetBuilderTest.cpp
index d4c351e88e..8859c10820 100644
--- a/Gems/PythonAssetBuilder/Code/Tests/PythonAssetBuilderTest.cpp
+++ b/Gems/PythonAssetBuilder/Code/Tests/PythonAssetBuilderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderCreateJobsTest.cpp b/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderCreateJobsTest.cpp
index 8f8e45c01b..056412fb9a 100644
--- a/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderCreateJobsTest.cpp
+++ b/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderCreateJobsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderProcessJobTest.cpp b/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderProcessJobTest.cpp
index b176b6f762..3fd99ab30c 100644
--- a/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderProcessJobTest.cpp
+++ b/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderProcessJobTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderRegisterTest.cpp b/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderRegisterTest.cpp
index 2238ba98ce..d18d900d1c 100644
--- a/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderRegisterTest.cpp
+++ b/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderRegisterTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderTestShared.h b/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderTestShared.h
index b2c698a37d..ad4963e236 100644
--- a/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderTestShared.h
+++ b/Gems/PythonAssetBuilder/Code/Tests/PythonBuilderTestShared.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/PythonAssetBuilder/Code/Tests/asset_builder_example.py b/Gems/PythonAssetBuilder/Code/Tests/asset_builder_example.py
index 685bd8b6b0..14a95440ee 100755
--- a/Gems/PythonAssetBuilder/Code/Tests/asset_builder_example.py
+++ b/Gems/PythonAssetBuilder/Code/Tests/asset_builder_example.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/PythonAssetBuilder/Code/pythonassetbuilder_common_files.cmake b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_common_files.cmake
index fe5b5c5880..20914d6d4b 100644
--- a/Gems/PythonAssetBuilder/Code/pythonassetbuilder_common_files.cmake
+++ b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/pythonassetbuilder_editor_files.cmake b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_editor_files.cmake
index fe5b5c5880..20914d6d4b 100644
--- a/Gems/PythonAssetBuilder/Code/pythonassetbuilder_editor_files.cmake
+++ b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/pythonassetbuilder_editor_tests_files.cmake b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_editor_tests_files.cmake
index 8548f5ba4d..3688141c7a 100644
--- a/Gems/PythonAssetBuilder/Code/pythonassetbuilder_editor_tests_files.cmake
+++ b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/pythonassetbuilder_shared_files.cmake b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_shared_files.cmake
index 40269fb8c6..d87106c4c4 100644
--- a/Gems/PythonAssetBuilder/Code/pythonassetbuilder_shared_files.cmake
+++ b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Code/pythonassetbuilder_tests_files.cmake b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_tests_files.cmake
index 8548f5ba4d..3688141c7a 100644
--- a/Gems/PythonAssetBuilder/Code/pythonassetbuilder_tests_files.cmake
+++ b/Gems/PythonAssetBuilder/Code/pythonassetbuilder_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/PythonAssetBuilder/Editor/Scripts/__init__.py b/Gems/PythonAssetBuilder/Editor/Scripts/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/PythonAssetBuilder/Editor/Scripts/__init__.py
+++ b/Gems/PythonAssetBuilder/Editor/Scripts/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/PythonAssetBuilder/Editor/Scripts/bootstrap.py b/Gems/PythonAssetBuilder/Editor/Scripts/bootstrap.py
index 3a3549d485..5482b53e84 100755
--- a/Gems/PythonAssetBuilder/Editor/Scripts/bootstrap.py
+++ b/Gems/PythonAssetBuilder/Editor/Scripts/bootstrap.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/_init_.py b/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/_init_.py
index a3a4055d50..e200fa77d0 100755
--- a/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/_init_.py
+++ b/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/_init_.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py b/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py
index 486c580ec5..1b1cfe0bbd 100755
--- a/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py
+++ b/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/QtForPython/CMakeLists.txt b/Gems/QtForPython/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/QtForPython/CMakeLists.txt
+++ b/Gems/QtForPython/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/CMakeLists.txt b/Gems/QtForPython/Code/CMakeLists.txt
index 69cffb8ffa..437ff64d39 100644
--- a/Gems/QtForPython/Code/CMakeLists.txt
+++ b/Gems/QtForPython/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/Include/QtForPython/QtForPythonBus.h b/Gems/QtForPython/Code/Include/QtForPython/QtForPythonBus.h
index fffcdb87c1..0958ad848f 100644
--- a/Gems/QtForPython/Code/Include/QtForPython/QtForPythonBus.h
+++ b/Gems/QtForPython/Code/Include/QtForPython/QtForPythonBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/QtForPython/Code/Source/Platform/Common/Clang/qtforpython_clang.cmake b/Gems/QtForPython/Code/Source/Platform/Common/Clang/qtforpython_clang.cmake
index 28045e7fcc..9f9652e659 100644
--- a/Gems/QtForPython/Code/Source/Platform/Common/Clang/qtforpython_clang.cmake
+++ b/Gems/QtForPython/Code/Source/Platform/Common/Clang/qtforpython_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/Source/Platform/Common/MSVC/qtforpython_msvc.cmake b/Gems/QtForPython/Code/Source/Platform/Common/MSVC/qtforpython_msvc.cmake
index 510cd47474..f7d3a138dc 100644
--- a/Gems/QtForPython/Code/Source/Platform/Common/MSVC/qtforpython_msvc.cmake
+++ b/Gems/QtForPython/Code/Source/Platform/Common/MSVC/qtforpython_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake
index 1681a4126d..87fda81cad 100644
--- a/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/QtForPython/Code/Source/Platform/Mac/PAL_mac.cmake
index 1681a4126d..87fda81cad 100644
--- a/Gems/QtForPython/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/QtForPython/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/QtForPython/Code/Source/Platform/Windows/PAL_windows.cmake
index ac3a2f241f..a95a3d8786 100644
--- a/Gems/QtForPython/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/QtForPython/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/Source/QtForPythonModule.cpp b/Gems/QtForPython/Code/Source/QtForPythonModule.cpp
index a820ac7346..093033d003 100644
--- a/Gems/QtForPython/Code/Source/QtForPythonModule.cpp
+++ b/Gems/QtForPython/Code/Source/QtForPythonModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp b/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp
index e48af47244..63028d6c35 100644
--- a/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp
+++ b/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.h b/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.h
index e1607a4987..838ca41bba 100644
--- a/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.h
+++ b/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/QtForPython/Code/Tests/pyside_auto_menubar_test.py b/Gems/QtForPython/Code/Tests/pyside_auto_menubar_test.py
index de6cfe18cd..436946f914 100755
--- a/Gems/QtForPython/Code/Tests/pyside_auto_menubar_test.py
+++ b/Gems/QtForPython/Code/Tests/pyside_auto_menubar_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/QtForPython/Code/Tests/pyside_auto_menubar_test_case.py b/Gems/QtForPython/Code/Tests/pyside_auto_menubar_test_case.py
index 6de279a89c..aa7b367b8d 100755
--- a/Gems/QtForPython/Code/Tests/pyside_auto_menubar_test_case.py
+++ b/Gems/QtForPython/Code/Tests/pyside_auto_menubar_test_case.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/QtForPython/Code/qtforpython_editor_macos_files.cmake b/Gems/QtForPython/Code/qtforpython_editor_macos_files.cmake
index 4832c730fd..c3f55ca3b4 100644
--- a/Gems/QtForPython/Code/qtforpython_editor_macos_files.cmake
+++ b/Gems/QtForPython/Code/qtforpython_editor_macos_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/qtforpython_editor_windows_files.cmake b/Gems/QtForPython/Code/qtforpython_editor_windows_files.cmake
index 4832c730fd..c3f55ca3b4 100644
--- a/Gems/QtForPython/Code/qtforpython_editor_windows_files.cmake
+++ b/Gems/QtForPython/Code/qtforpython_editor_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Code/qtforpython_shared_files.cmake b/Gems/QtForPython/Code/qtforpython_shared_files.cmake
index 593a97207a..91cc216493 100644
--- a/Gems/QtForPython/Code/qtforpython_shared_files.cmake
+++ b/Gems/QtForPython/Code/qtforpython_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/QtForPython/Editor/Scripts/az_qt_helpers.py b/Gems/QtForPython/Editor/Scripts/az_qt_helpers.py
index 5eb20fbdac..bd2165483e 100755
--- a/Gems/QtForPython/Editor/Scripts/az_qt_helpers.py
+++ b/Gems/QtForPython/Editor/Scripts/az_qt_helpers.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/QtForPython/Editor/Scripts/bootstrap.py b/Gems/QtForPython/Editor/Scripts/bootstrap.py
index 314292b756..f5ed02788a 100755
--- a/Gems/QtForPython/Editor/Scripts/bootstrap.py
+++ b/Gems/QtForPython/Editor/Scripts/bootstrap.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/QtForPython/Editor/Scripts/show_object_tree.py b/Gems/QtForPython/Editor/Scripts/show_object_tree.py
index 5af244d546..9dbbaf0d66 100755
--- a/Gems/QtForPython/Editor/Scripts/show_object_tree.py
+++ b/Gems/QtForPython/Editor/Scripts/show_object_tree.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/QtForPython/Editor/Scripts/tests/hello_world.py b/Gems/QtForPython/Editor/Scripts/tests/hello_world.py
index b2ccf7f95d..d338d215c7 100755
--- a/Gems/QtForPython/Editor/Scripts/tests/hello_world.py
+++ b/Gems/QtForPython/Editor/Scripts/tests/hello_world.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/QtForPython/Editor/Scripts/tests/log_main_window.py b/Gems/QtForPython/Editor/Scripts/tests/log_main_window.py
index 286a7a0890..5f6b66580e 100755
--- a/Gems/QtForPython/Editor/Scripts/tests/log_main_window.py
+++ b/Gems/QtForPython/Editor/Scripts/tests/log_main_window.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/RADTelemetry/CMakeLists.txt b/Gems/RADTelemetry/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/RADTelemetry/CMakeLists.txt
+++ b/Gems/RADTelemetry/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/RADTelemetry/Code/CMakeLists.txt b/Gems/RADTelemetry/Code/CMakeLists.txt
index be72dc1e55..ac46c61da9 100644
--- a/Gems/RADTelemetry/Code/CMakeLists.txt
+++ b/Gems/RADTelemetry/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/RADTelemetry/Code/Source/Platform/Android/RADTelemetry_Traits_Platform.h b/Gems/RADTelemetry/Code/Source/Platform/Android/RADTelemetry_Traits_Platform.h
index 8cff74ace1..2e0ef9f53c 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/Android/RADTelemetry_Traits_Platform.h
+++ b/Gems/RADTelemetry/Code/Source/Platform/Android/RADTelemetry_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/RADTelemetry/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/RADTelemetry/Code/Source/Platform/Android/platform_android_files.cmake
index 55322ebac7..06d4280389 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/RADTelemetry/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/RADTelemetry/Code/Source/Platform/Linux/RADTelemetry_Traits_Platform.h b/Gems/RADTelemetry/Code/Source/Platform/Linux/RADTelemetry_Traits_Platform.h
index 8cff74ace1..2e0ef9f53c 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/Linux/RADTelemetry_Traits_Platform.h
+++ b/Gems/RADTelemetry/Code/Source/Platform/Linux/RADTelemetry_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/RADTelemetry/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/RADTelemetry/Code/Source/Platform/Linux/platform_linux_files.cmake
index 55322ebac7..06d4280389 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/RADTelemetry/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/RADTelemetry/Code/Source/Platform/Mac/RADTelemetry_Traits_Platform.h b/Gems/RADTelemetry/Code/Source/Platform/Mac/RADTelemetry_Traits_Platform.h
index 8cff74ace1..2e0ef9f53c 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/Mac/RADTelemetry_Traits_Platform.h
+++ b/Gems/RADTelemetry/Code/Source/Platform/Mac/RADTelemetry_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/RADTelemetry/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/RADTelemetry/Code/Source/Platform/Mac/platform_mac_files.cmake
index 55322ebac7..06d4280389 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/RADTelemetry/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/RADTelemetry/Code/Source/Platform/Windows/RADTelemetry_Traits_Platform.h b/Gems/RADTelemetry/Code/Source/Platform/Windows/RADTelemetry_Traits_Platform.h
index 8cff74ace1..2e0ef9f53c 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/Windows/RADTelemetry_Traits_Platform.h
+++ b/Gems/RADTelemetry/Code/Source/Platform/Windows/RADTelemetry_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/RADTelemetry/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/RADTelemetry/Code/Source/Platform/Windows/platform_windows_files.cmake
index 55322ebac7..06d4280389 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/RADTelemetry/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/RADTelemetry/Code/Source/Platform/iOS/RADTelemetry_Traits_Platform.h b/Gems/RADTelemetry/Code/Source/Platform/iOS/RADTelemetry_Traits_Platform.h
index 8cff74ace1..2e0ef9f53c 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/iOS/RADTelemetry_Traits_Platform.h
+++ b/Gems/RADTelemetry/Code/Source/Platform/iOS/RADTelemetry_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/RADTelemetry/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/RADTelemetry/Code/Source/Platform/iOS/platform_ios_files.cmake
index 55322ebac7..06d4280389 100644
--- a/Gems/RADTelemetry/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/RADTelemetry/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/RADTelemetry/Code/Source/ProfileTelemetryComponent.cpp b/Gems/RADTelemetry/Code/Source/ProfileTelemetryComponent.cpp
index 161a124bf8..637ec5353b 100644
--- a/Gems/RADTelemetry/Code/Source/ProfileTelemetryComponent.cpp
+++ b/Gems/RADTelemetry/Code/Source/ProfileTelemetryComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/RADTelemetry/Code/Source/ProfileTelemetryComponent.h b/Gems/RADTelemetry/Code/Source/ProfileTelemetryComponent.h
index ac6ecae112..79c3af9774 100644
--- a/Gems/RADTelemetry/Code/Source/ProfileTelemetryComponent.h
+++ b/Gems/RADTelemetry/Code/Source/ProfileTelemetryComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/RADTelemetry/Code/Source/RADTelemetryModule.cpp b/Gems/RADTelemetry/Code/Source/RADTelemetryModule.cpp
index 2a5b4443d2..7ef597aab6 100644
--- a/Gems/RADTelemetry/Code/Source/RADTelemetryModule.cpp
+++ b/Gems/RADTelemetry/Code/Source/RADTelemetryModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/RADTelemetry/Code/radtelemetry_files.cmake b/Gems/RADTelemetry/Code/radtelemetry_files.cmake
index 9ec882dd74..0db48c3f28 100644
--- a/Gems/RADTelemetry/Code/radtelemetry_files.cmake
+++ b/Gems/RADTelemetry/Code/radtelemetry_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/RADTelemetry/Code/radtelemetry_shared_files.cmake b/Gems/RADTelemetry/Code/radtelemetry_shared_files.cmake
index a1e0f43c93..57fc52d3dc 100644
--- a/Gems/RADTelemetry/Code/radtelemetry_shared_files.cmake
+++ b/Gems/RADTelemetry/Code/radtelemetry_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/CMakeLists.txt b/Gems/SaveData/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/SaveData/CMakeLists.txt
+++ b/Gems/SaveData/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/CMakeLists.txt b/Gems/SaveData/Code/CMakeLists.txt
index f8eb7006bb..c2d24b5d34 100644
--- a/Gems/SaveData/Code/CMakeLists.txt
+++ b/Gems/SaveData/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Include/SaveData/SaveDataNotificationBus.h b/Gems/SaveData/Code/Include/SaveData/SaveDataNotificationBus.h
index 598d33ba68..eb2674709c 100644
--- a/Gems/SaveData/Code/Include/SaveData/SaveDataNotificationBus.h
+++ b/Gems/SaveData/Code/Include/SaveData/SaveDataNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Include/SaveData/SaveDataRequestBus.h b/Gems/SaveData/Code/Include/SaveData/SaveDataRequestBus.h
index 1659ce5681..298fd4a12e 100644
--- a/Gems/SaveData/Code/Include/SaveData/SaveDataRequestBus.h
+++ b/Gems/SaveData/Code/Include/SaveData/SaveDataRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Android/SaveData_SystemComponent_Android.cpp b/Gems/SaveData/Code/Source/Platform/Android/SaveData_SystemComponent_Android.cpp
index 9dec059cf3..80c01fc927 100644
--- a/Gems/SaveData/Code/Source/Platform/Android/SaveData_SystemComponent_Android.cpp
+++ b/Gems/SaveData/Code/Source/Platform/Android/SaveData_SystemComponent_Android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Android/SaveData_Traits_Android.h b/Gems/SaveData/Code/Source/Platform/Android/SaveData_Traits_Android.h
index 49d282ce9c..66210425f7 100644
--- a/Gems/SaveData/Code/Source/Platform/Android/SaveData_Traits_Android.h
+++ b/Gems/SaveData/Code/Source/Platform/Android/SaveData_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Android/SaveData_Traits_Platform.h b/Gems/SaveData/Code/Source/Platform/Android/SaveData_Traits_Platform.h
index 76bd387157..6d181ac919 100644
--- a/Gems/SaveData/Code/Source/Platform/Android/SaveData_Traits_Platform.h
+++ b/Gems/SaveData/Code/Source/Platform/Android/SaveData_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Android/platform_android.cmake b/Gems/SaveData/Code/Source/Platform/Android/platform_android.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/SaveData/Code/Source/Platform/Android/platform_android.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Android/platform_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/SaveData/Code/Source/Platform/Android/platform_android_files.cmake
index 12d148d377..5f6c79743d 100644
--- a/Gems/SaveData/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Android/platform_test_android_files.cmake b/Gems/SaveData/Code/Source/Platform/Android/platform_test_android_files.cmake
index 6d6375b0c0..1b3b62f95b 100644
--- a/Gems/SaveData/Code/Source/Platform/Android/platform_test_android_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Android/platform_test_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/AppleTV/platform_appletv.cmake b/Gems/SaveData/Code/Source/Platform/AppleTV/platform_appletv.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/SaveData/Code/Source/Platform/AppleTV/platform_appletv.cmake
+++ b/Gems/SaveData/Code/Source/Platform/AppleTV/platform_appletv.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Common/Apple/SaveData_SystemComponent_Apple.mm b/Gems/SaveData/Code/Source/Platform/Common/Apple/SaveData_SystemComponent_Apple.mm
index e11ecdc255..15330b650f 100644
--- a/Gems/SaveData/Code/Source/Platform/Common/Apple/SaveData_SystemComponent_Apple.mm
+++ b/Gems/SaveData/Code/Source/Platform/Common/Apple/SaveData_SystemComponent_Apple.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Common/Unimplemented/SaveDataTest_Unimplemented.cpp b/Gems/SaveData/Code/Source/Platform/Common/Unimplemented/SaveDataTest_Unimplemented.cpp
index 10f26bb2b4..afce98644f 100644
--- a/Gems/SaveData/Code/Source/Platform/Common/Unimplemented/SaveDataTest_Unimplemented.cpp
+++ b/Gems/SaveData/Code/Source/Platform/Common/Unimplemented/SaveDataTest_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Common/Unimplemented/SaveData_SystemComponent_Unimplemented.cpp b/Gems/SaveData/Code/Source/Platform/Common/Unimplemented/SaveData_SystemComponent_Unimplemented.cpp
index 6e1b814c53..9b6c39eada 100644
--- a/Gems/SaveData/Code/Source/Platform/Common/Unimplemented/SaveData_SystemComponent_Unimplemented.cpp
+++ b/Gems/SaveData/Code/Source/Platform/Common/Unimplemented/SaveData_SystemComponent_Unimplemented.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Linux/SaveData_Traits_Linux.h b/Gems/SaveData/Code/Source/Platform/Linux/SaveData_Traits_Linux.h
index 49d282ce9c..66210425f7 100644
--- a/Gems/SaveData/Code/Source/Platform/Linux/SaveData_Traits_Linux.h
+++ b/Gems/SaveData/Code/Source/Platform/Linux/SaveData_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Linux/SaveData_Traits_Platform.h b/Gems/SaveData/Code/Source/Platform/Linux/SaveData_Traits_Platform.h
index b440f0ac2b..87fdd0af22 100644
--- a/Gems/SaveData/Code/Source/Platform/Linux/SaveData_Traits_Platform.h
+++ b/Gems/SaveData/Code/Source/Platform/Linux/SaveData_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/SaveData/Code/Source/Platform/Linux/platform_linux.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/SaveData/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake
index 04f149eaca..9021a7fe5d 100644
--- a/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Linux/platform_test_linux_files.cmake b/Gems/SaveData/Code/Source/Platform/Linux/platform_test_linux_files.cmake
index 6d6375b0c0..1b3b62f95b 100644
--- a/Gems/SaveData/Code/Source/Platform/Linux/platform_test_linux_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Linux/platform_test_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Mac/SaveData_Traits_Mac.h b/Gems/SaveData/Code/Source/Platform/Mac/SaveData_Traits_Mac.h
index 49d282ce9c..66210425f7 100644
--- a/Gems/SaveData/Code/Source/Platform/Mac/SaveData_Traits_Mac.h
+++ b/Gems/SaveData/Code/Source/Platform/Mac/SaveData_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Mac/SaveData_Traits_Platform.h b/Gems/SaveData/Code/Source/Platform/Mac/SaveData_Traits_Platform.h
index c54e68f48b..a55f48498d 100644
--- a/Gems/SaveData/Code/Source/Platform/Mac/SaveData_Traits_Platform.h
+++ b/Gems/SaveData/Code/Source/Platform/Mac/SaveData_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Mac/platform_mac.cmake b/Gems/SaveData/Code/Source/Platform/Mac/platform_mac.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/SaveData/Code/Source/Platform/Mac/platform_mac.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Mac/platform_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/SaveData/Code/Source/Platform/Mac/platform_mac_files.cmake
index 0329e0d413..95ff6f204c 100644
--- a/Gems/SaveData/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Mac/platform_test_mac_files.cmake b/Gems/SaveData/Code/Source/Platform/Mac/platform_test_mac_files.cmake
index 6d6375b0c0..1b3b62f95b 100644
--- a/Gems/SaveData/Code/Source/Platform/Mac/platform_test_mac_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Mac/platform_test_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Windows/PAL_traits_windows.cmake b/Gems/SaveData/Code/Source/Platform/Windows/PAL_traits_windows.cmake
index 414ff60716..1528f0e291 100644
--- a/Gems/SaveData/Code/Source/Platform/Windows/PAL_traits_windows.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Windows/PAL_traits_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Windows/SaveData_SystemComponent_Windows.cpp b/Gems/SaveData/Code/Source/Platform/Windows/SaveData_SystemComponent_Windows.cpp
index d2501f167f..e2d0d82f7d 100644
--- a/Gems/SaveData/Code/Source/Platform/Windows/SaveData_SystemComponent_Windows.cpp
+++ b/Gems/SaveData/Code/Source/Platform/Windows/SaveData_SystemComponent_Windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Windows/SaveData_Traits_Platform.h b/Gems/SaveData/Code/Source/Platform/Windows/SaveData_Traits_Platform.h
index 83f4414cf2..31d6cf3e23 100644
--- a/Gems/SaveData/Code/Source/Platform/Windows/SaveData_Traits_Platform.h
+++ b/Gems/SaveData/Code/Source/Platform/Windows/SaveData_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Windows/SaveData_Traits_Windows.h b/Gems/SaveData/Code/Source/Platform/Windows/SaveData_Traits_Windows.h
index 49d282ce9c..66210425f7 100644
--- a/Gems/SaveData/Code/Source/Platform/Windows/SaveData_Traits_Windows.h
+++ b/Gems/SaveData/Code/Source/Platform/Windows/SaveData_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/Windows/platform_test_windows_files.cmake b/Gems/SaveData/Code/Source/Platform/Windows/platform_test_windows_files.cmake
index 6d6375b0c0..1b3b62f95b 100644
--- a/Gems/SaveData/Code/Source/Platform/Windows/platform_test_windows_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Windows/platform_test_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/SaveData/Code/Source/Platform/Windows/platform_windows.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/SaveData/Code/Source/Platform/Windows/platform_windows.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Windows/platform_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/SaveData/Code/Source/Platform/Windows/platform_windows_files.cmake
index 855464b80d..419d1452a5 100644
--- a/Gems/SaveData/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/iOS/PAL_traits_ios.cmake b/Gems/SaveData/Code/Source/Platform/iOS/PAL_traits_ios.cmake
index 414ff60716..1528f0e291 100644
--- a/Gems/SaveData/Code/Source/Platform/iOS/PAL_traits_ios.cmake
+++ b/Gems/SaveData/Code/Source/Platform/iOS/PAL_traits_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/iOS/SaveData_Traits_Platform.h b/Gems/SaveData/Code/Source/Platform/iOS/SaveData_Traits_Platform.h
index 1fbe68c294..d306cb078c 100644
--- a/Gems/SaveData/Code/Source/Platform/iOS/SaveData_Traits_Platform.h
+++ b/Gems/SaveData/Code/Source/Platform/iOS/SaveData_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/iOS/SaveData_Traits_iOS.h b/Gems/SaveData/Code/Source/Platform/iOS/SaveData_Traits_iOS.h
index 49d282ce9c..66210425f7 100644
--- a/Gems/SaveData/Code/Source/Platform/iOS/SaveData_Traits_iOS.h
+++ b/Gems/SaveData/Code/Source/Platform/iOS/SaveData_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/Platform/iOS/platform_ios.cmake b/Gems/SaveData/Code/Source/Platform/iOS/platform_ios.cmake
index 11f7f0d6b9..836f1ab4aa 100644
--- a/Gems/SaveData/Code/Source/Platform/iOS/platform_ios.cmake
+++ b/Gems/SaveData/Code/Source/Platform/iOS/platform_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/SaveData/Code/Source/Platform/iOS/platform_ios_files.cmake
index 60e7da5b25..b7ea5aa321 100644
--- a/Gems/SaveData/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/Platform/iOS/platform_test_ios_files.cmake b/Gems/SaveData/Code/Source/Platform/iOS/platform_test_ios_files.cmake
index 6d6375b0c0..1b3b62f95b 100644
--- a/Gems/SaveData/Code/Source/Platform/iOS/platform_test_ios_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/iOS/platform_test_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/Source/SaveDataModule.cpp b/Gems/SaveData/Code/Source/SaveDataModule.cpp
index d2ddb5403c..a82641c2ff 100644
--- a/Gems/SaveData/Code/Source/SaveDataModule.cpp
+++ b/Gems/SaveData/Code/Source/SaveDataModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/SaveDataSystemComponent.cpp b/Gems/SaveData/Code/Source/SaveDataSystemComponent.cpp
index 32a9439344..03ec7c44ad 100644
--- a/Gems/SaveData/Code/Source/SaveDataSystemComponent.cpp
+++ b/Gems/SaveData/Code/Source/SaveDataSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Source/SaveDataSystemComponent.h b/Gems/SaveData/Code/Source/SaveDataSystemComponent.h
index ca8b46a853..5770a4f65d 100644
--- a/Gems/SaveData/Code/Source/SaveDataSystemComponent.h
+++ b/Gems/SaveData/Code/Source/SaveDataSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Tests/SaveDataTest.cpp b/Gems/SaveData/Code/Tests/SaveDataTest.cpp
index 7d561673b1..cf288b1980 100644
--- a/Gems/SaveData/Code/Tests/SaveDataTest.cpp
+++ b/Gems/SaveData/Code/Tests/SaveDataTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/Tests/SaveDataTest.h b/Gems/SaveData/Code/Tests/SaveDataTest.h
index 70b4aad9d2..081408f9e1 100644
--- a/Gems/SaveData/Code/Tests/SaveDataTest.h
+++ b/Gems/SaveData/Code/Tests/SaveDataTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SaveData/Code/savedata_files.cmake b/Gems/SaveData/Code/savedata_files.cmake
index 9f39219342..bcb1b5dcb3 100644
--- a/Gems/SaveData/Code/savedata_files.cmake
+++ b/Gems/SaveData/Code/savedata_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/savedata_shared_files.cmake b/Gems/SaveData/Code/savedata_shared_files.cmake
index f99aa2d31d..9915ed8b81 100644
--- a/Gems/SaveData/Code/savedata_shared_files.cmake
+++ b/Gems/SaveData/Code/savedata_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SaveData/Code/savedata_tests_files.cmake b/Gems/SaveData/Code/savedata_tests_files.cmake
index 12b38d7432..97a31888d1 100644
--- a/Gems/SaveData/Code/savedata_tests_files.cmake
+++ b/Gems/SaveData/Code/savedata_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneLoggingExample/CMakeLists.txt b/Gems/SceneLoggingExample/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/SceneLoggingExample/CMakeLists.txt
+++ b/Gems/SceneLoggingExample/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneLoggingExample/Code/Behaviors/LoggingGroupBehavior.cpp b/Gems/SceneLoggingExample/Code/Behaviors/LoggingGroupBehavior.cpp
index 01984b1dfc..59709a06cb 100644
--- a/Gems/SceneLoggingExample/Code/Behaviors/LoggingGroupBehavior.cpp
+++ b/Gems/SceneLoggingExample/Code/Behaviors/LoggingGroupBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/Behaviors/LoggingGroupBehavior.h b/Gems/SceneLoggingExample/Code/Behaviors/LoggingGroupBehavior.h
index dc0919ddde..dad6aeb209 100644
--- a/Gems/SceneLoggingExample/Code/Behaviors/LoggingGroupBehavior.h
+++ b/Gems/SceneLoggingExample/Code/Behaviors/LoggingGroupBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/CMakeLists.txt b/Gems/SceneLoggingExample/Code/CMakeLists.txt
index afda2cba58..111a8dbcff 100644
--- a/Gems/SceneLoggingExample/Code/CMakeLists.txt
+++ b/Gems/SceneLoggingExample/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneLoggingExample/Code/Groups/LoggingGroup.cpp b/Gems/SceneLoggingExample/Code/Groups/LoggingGroup.cpp
index 2ae8279365..bdad51286d 100644
--- a/Gems/SceneLoggingExample/Code/Groups/LoggingGroup.cpp
+++ b/Gems/SceneLoggingExample/Code/Groups/LoggingGroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/Groups/LoggingGroup.h b/Gems/SceneLoggingExample/Code/Groups/LoggingGroup.h
index 944a3e75b0..9238fe4b4d 100644
--- a/Gems/SceneLoggingExample/Code/Groups/LoggingGroup.h
+++ b/Gems/SceneLoggingExample/Code/Groups/LoggingGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/Processors/ExportTrackingProcessor.cpp b/Gems/SceneLoggingExample/Code/Processors/ExportTrackingProcessor.cpp
index 7cac196726..abf25ff58f 100644
--- a/Gems/SceneLoggingExample/Code/Processors/ExportTrackingProcessor.cpp
+++ b/Gems/SceneLoggingExample/Code/Processors/ExportTrackingProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/Processors/ExportTrackingProcessor.h b/Gems/SceneLoggingExample/Code/Processors/ExportTrackingProcessor.h
index a2b352b164..1587b06296 100644
--- a/Gems/SceneLoggingExample/Code/Processors/ExportTrackingProcessor.h
+++ b/Gems/SceneLoggingExample/Code/Processors/ExportTrackingProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/Processors/LoadingTrackingProcessor.cpp b/Gems/SceneLoggingExample/Code/Processors/LoadingTrackingProcessor.cpp
index 1480e770b7..a8c2ccc23a 100644
--- a/Gems/SceneLoggingExample/Code/Processors/LoadingTrackingProcessor.cpp
+++ b/Gems/SceneLoggingExample/Code/Processors/LoadingTrackingProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/Processors/LoadingTrackingProcessor.h b/Gems/SceneLoggingExample/Code/Processors/LoadingTrackingProcessor.h
index 4cf1ae378b..337295a5ed 100644
--- a/Gems/SceneLoggingExample/Code/Processors/LoadingTrackingProcessor.h
+++ b/Gems/SceneLoggingExample/Code/Processors/LoadingTrackingProcessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/SceneLoggingExampleModule.cpp b/Gems/SceneLoggingExample/Code/SceneLoggingExampleModule.cpp
index bf89c74191..19d6634c19 100644
--- a/Gems/SceneLoggingExample/Code/SceneLoggingExampleModule.cpp
+++ b/Gems/SceneLoggingExample/Code/SceneLoggingExampleModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/SceneLoggingExampleModule_Stub.cpp b/Gems/SceneLoggingExample/Code/SceneLoggingExampleModule_Stub.cpp
index 4a8ae3e3b9..146fc668ba 100644
--- a/Gems/SceneLoggingExample/Code/SceneLoggingExampleModule_Stub.cpp
+++ b/Gems/SceneLoggingExample/Code/SceneLoggingExampleModule_Stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneLoggingExample/Code/sceneloggingexample_files.cmake b/Gems/SceneLoggingExample/Code/sceneloggingexample_files.cmake
index 869b1e3f13..5edcde4616 100644
--- a/Gems/SceneLoggingExample/Code/sceneloggingexample_files.cmake
+++ b/Gems/SceneLoggingExample/Code/sceneloggingexample_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneLoggingExample/Code/sceneloggingexample_shared_files.cmake b/Gems/SceneLoggingExample/Code/sceneloggingexample_shared_files.cmake
index 5a94ac7dc3..99685a2f7d 100644
--- a/Gems/SceneLoggingExample/Code/sceneloggingexample_shared_files.cmake
+++ b/Gems/SceneLoggingExample/Code/sceneloggingexample_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneLoggingExample/ReadMe.txt b/Gems/SceneLoggingExample/ReadMe.txt
index f7c398c78d..62fe755ddf 100644
--- a/Gems/SceneLoggingExample/ReadMe.txt
+++ b/Gems/SceneLoggingExample/ReadMe.txt
@@ -2,7 +2,7 @@ The Scene Logging Example demonstrates how to extend the SceneAPI by adding addi
 a collection of libraries that handle loading scene files and converting content to data that the Open 3D Engine and its editor can load. 
 
 The following approach is used:
-    1. The FbxSceneBuilder and SceneData load and convert the scene file (for example, .fbx) into a graph that is stored in memory. 
+    1. The SceneBuilder and SceneData load and convert the scene file (for example, .fbx) into a graph that is stored in memory. 
     2. SceneCore and SceneData are used to create a manifest with instructions about how to export the file. 
     3. SceneData analyzes the manifest and memory graph and creates defaults.
     4. Scene Settings allows updates to the manifest through a UI.
diff --git a/Gems/SceneProcessing/CMakeLists.txt b/Gems/SceneProcessing/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/SceneProcessing/CMakeLists.txt
+++ b/Gems/SceneProcessing/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneProcessing/Code/CMakeLists.txt b/Gems/SceneProcessing/Code/CMakeLists.txt
index ed96093c28..9aa5bc6763 100644
--- a/Gems/SceneProcessing/Code/CMakeLists.txt
+++ b/Gems/SceneProcessing/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -39,7 +39,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::SceneCore
                 AZ::SceneData
                 AZ::AzFramework
-                AZ::FbxSceneBuilder
+                AZ::SceneBuilder
                 AZ::AssetBuilderSDK
     )
 
diff --git a/Gems/SceneProcessing/Code/Include/Config/SceneProcessingConfigBus.h b/Gems/SceneProcessing/Code/Include/Config/SceneProcessingConfigBus.h
index 8fd53da2ad..c6ebdd9870 100644
--- a/Gems/SceneProcessing/Code/Include/Config/SceneProcessingConfigBus.h
+++ b/Gems/SceneProcessing/Code/Include/Config/SceneProcessingConfigBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -70,7 +70,7 @@ namespace AZ
              *     AddFileSoftName("_anim", PatternMatcher::MatchApproach::PostFix, "Ignore", false,
              *                     SceneAPI::DataTypes::IAnimationData::TYPEINFO_Name())
              *     If the filename ends with "_anim" this will mark all nodes as "Ignore" unless they're derived from IAnimationData.
-             *     This will cause only animations to be exported from the .fbx file even if there's other data available.
+             *     This will cause only animations to be exported from the source scene file even if there's other data available.
              */
             virtual bool AddFileSoftName(const char* pattern, SceneAPI::SceneCore::PatternMatcher::MatchApproach approach,
                 const char* virtualType, bool inclusive, const AZStd::string& graphObjectTypeName) = 0;
diff --git a/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.cpp b/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.cpp
index b04c66ca7b..72513b509f 100644
--- a/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.cpp
+++ b/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -31,7 +31,7 @@ namespace AZ
 
             ActivateSceneModule(SceneProcessing::s_sceneCoreModule);
             ActivateSceneModule(SceneProcessing::s_sceneDataModule);
-            ActivateSceneModule(SceneProcessing::s_fbxSceneBuilderModule);
+            ActivateSceneModule(SceneProcessing::s_sceneBuilderModule);
             
             // Defaults in case there's no config setup in the Project Configurator.
             m_softNames.push_back(aznew NodeSoftNameSetting("^.*_[Ll][Oo][Dd]1(_optimized)?$", PatternMatcher::MatchApproach::Regex, "LODMesh1", true));
@@ -42,7 +42,7 @@ namespace AZ
             m_softNames.push_back(aznew NodeSoftNameSetting("^.*_[Pp][Hh][Yy][Ss](_optimized)?$", PatternMatcher::MatchApproach::Regex, "PhysicsMesh", true));
             m_softNames.push_back(aznew NodeSoftNameSetting("_ignore", PatternMatcher::MatchApproach::PostFix, "Ignore", false));
             // If the filename ends with "_anim" this will mark all nodes as "Ignore" unless they're derived from IAnimationData. This will
-            // cause only animations to be exported from the .fbx file even if there's other data available.
+            // cause only animations to be exported from the source scene file even if there's other data available.
             m_softNames.push_back(aznew FileSoftNameSetting("_anim", PatternMatcher::MatchApproach::PostFix, "Ignore", false,
                 { FileSoftNameSetting::GraphType(SceneAPI::DataTypes::IAnimationData::TYPEINFO_Name()) }));
 
@@ -65,7 +65,7 @@ namespace AZ
 
         SceneProcessingConfigSystemComponent::~SceneProcessingConfigSystemComponent()
         {
-            DeactivateSceneModule(SceneProcessing::s_fbxSceneBuilderModule);
+            DeactivateSceneModule(SceneProcessing::s_sceneBuilderModule);
             DeactivateSceneModule(SceneProcessing::s_sceneDataModule);
             DeactivateSceneModule(SceneProcessing::s_sceneCoreModule);
         }
@@ -140,7 +140,7 @@ namespace AZ
         {
             ReflectSceneModule(context, SceneProcessing::s_sceneCoreModule);
             ReflectSceneModule(context, SceneProcessing::s_sceneDataModule);
-            ReflectSceneModule(context, SceneProcessing::s_fbxSceneBuilderModule);
+            ReflectSceneModule(context, SceneProcessing::s_sceneBuilderModule);
 
             SoftNameSetting::Reflect(context);
             NodeSoftNameSetting::Reflect(context);
@@ -166,7 +166,7 @@ namespace AZ
                             "Soft naming conventions", "Update the naming conventions to suit your project.")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, false)
                         ->DataElement(AZ::Edit::UIHandlers::Default, &SceneProcessingConfigSystemComponent::m_UseCustomNormals,
-                            "Use Custom Normals", "When enabled, Open 3D Engine will use the DCC assets custom or tangent space normals. When disabled, the normals will be averaged. This setting can be overridden on individual FBX asset settings.")
+                            "Use Custom Normals", "When enabled, Open 3D Engine will use the DCC assets custom or tangent space normals. When disabled, the normals will be averaged. This setting can be overridden on an individual scene file's asset settings.")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, false);
                 }
             }
diff --git a/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.h b/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.h
index d4b7b72ac8..26543dc000 100644
--- a/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.h
+++ b/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/Components/SoftNameBehavior.cpp b/Gems/SceneProcessing/Code/Source/Config/Components/SoftNameBehavior.cpp
index 8553c57959..46c9cdd2f4 100644
--- a/Gems/SceneProcessing/Code/Source/Config/Components/SoftNameBehavior.cpp
+++ b/Gems/SceneProcessing/Code/Source/Config/Components/SoftNameBehavior.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/Components/SoftNameBehavior.h b/Gems/SceneProcessing/Code/Source/Config/Components/SoftNameBehavior.h
index ed1d6a1e0f..9d218c1b72 100644
--- a/Gems/SceneProcessing/Code/Source/Config/Components/SoftNameBehavior.h
+++ b/Gems/SceneProcessing/Code/Source/Config/Components/SoftNameBehavior.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/FileSoftNameSetting.cpp b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/FileSoftNameSetting.cpp
index bc1de30125..dcae88c827 100644
--- a/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/FileSoftNameSetting.cpp
+++ b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/FileSoftNameSetting.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/FileSoftNameSetting.h b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/FileSoftNameSetting.h
index 492d3cb3d0..a4b7ccee5c 100644
--- a/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/FileSoftNameSetting.h
+++ b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/FileSoftNameSetting.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/NodeSoftNameSetting.cpp b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/NodeSoftNameSetting.cpp
index 697684964b..8262ee5e80 100644
--- a/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/NodeSoftNameSetting.cpp
+++ b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/NodeSoftNameSetting.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/NodeSoftNameSetting.h b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/NodeSoftNameSetting.h
index 2eb985167b..4071c42a25 100644
--- a/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/NodeSoftNameSetting.h
+++ b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/NodeSoftNameSetting.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/SoftNameSetting.cpp b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/SoftNameSetting.cpp
index 32d5b12bd9..c00eeb0526 100644
--- a/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/SoftNameSetting.cpp
+++ b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/SoftNameSetting.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/SoftNameSetting.h b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/SoftNameSetting.h
index 14c1584b4f..41916fbbe3 100644
--- a/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/SoftNameSetting.h
+++ b/Gems/SceneProcessing/Code/Source/Config/SettingsObjects/SoftNameSetting.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/Widgets/GraphTypeSelector.cpp b/Gems/SceneProcessing/Code/Source/Config/Widgets/GraphTypeSelector.cpp
index b097e82319..c4be3f145f 100644
--- a/Gems/SceneProcessing/Code/Source/Config/Widgets/GraphTypeSelector.cpp
+++ b/Gems/SceneProcessing/Code/Source/Config/Widgets/GraphTypeSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Config/Widgets/GraphTypeSelector.h b/Gems/SceneProcessing/Code/Source/Config/Widgets/GraphTypeSelector.h
index 003ab14290..f734e9682f 100644
--- a/Gems/SceneProcessing/Code/Source/Config/Widgets/GraphTypeSelector.h
+++ b/Gems/SceneProcessing/Code/Source/Config/Widgets/GraphTypeSelector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/Array2D.h b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/Array2D.h
index 53c13b5c7e..2872e9a74b 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/Array2D.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/Array2D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/Array2D.inl b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/Array2D.inl
index 0d814a0777..455e4aeb67 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/Array2D.inl
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/Array2D.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilder.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilder.cpp
index 5f9f6e3737..a0fc4d38e9 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilder.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilder.h b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilder.h
index e122661e7d..3e6a7357dd 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilder.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderInvalidIndex.h b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderInvalidIndex.h
index fbb4a61da1..faadb31127 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderInvalidIndex.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderInvalidIndex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSkinningInfo.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSkinningInfo.cpp
index e230d33b56..d6c485800c 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSkinningInfo.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSkinningInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSkinningInfo.h b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSkinningInfo.h
index 3755d25572..9ff99cad33 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSkinningInfo.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSkinningInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSubMesh.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSubMesh.cpp
index aff9637e31..0c1eb380cf 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSubMesh.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSubMesh.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSubMesh.h b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSubMesh.h
index 00471f0219..d2704fe132 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSubMesh.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderSubMesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderVertexAttributeLayers.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderVertexAttributeLayers.cpp
index a19aadd626..d1c8b01ddb 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderVertexAttributeLayers.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderVertexAttributeLayers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderVertexAttributeLayers.h b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderVertexAttributeLayers.h
index 2ac629750c..71876d6781 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderVertexAttributeLayers.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshBuilderVertexAttributeLayers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.cpp
index 8ca4f7358d..e3eb617601 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.h b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.h
index 68b52dc98f..3dc4ed00d8 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/MeshOptimizer/MeshOptimizerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.cpp
index 1b8dc1e454..67a032f737 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -107,7 +107,7 @@ namespace AZ::SceneGenerationComponents
                 return AZ::SceneAPI::Events::ProcessingResult::Failure;
             }
 
-            // Now that we have the tangents and bitangents, calculate the tangent w values for the ones that we imported from Fbx, as they only have xyz.
+            // Now that we have the tangents and bitangents, calculate the tangent w values for the ones that we imported from the scene file, as they only have xyz.
             UpdateFbxTangentWValues(graph, nodeIndex, mesh);
         }
 
@@ -122,9 +122,9 @@ namespace AZ::SceneGenerationComponents
         size_t uvSetIndex = 0;
         while (uvData)
         {
-            // Get the tangents and bitangents from Fbx.
-            AZ::SceneAPI::DataTypes::IMeshVertexTangentData*    fbxTangentData   = AZ::SceneAPI::SceneData::TangentsRule::FindTangentData(graph, nodeIndex, uvSetIndex, AZ::SceneAPI::DataTypes::TangentSpace::FromFbx);
-            AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*  fbxBitangentData = AZ::SceneAPI::SceneData::TangentsRule::FindBitangentData(graph, nodeIndex, uvSetIndex, AZ::SceneAPI::DataTypes::TangentSpace::FromFbx);
+            // Get the tangents and bitangents from the source scene.
+            AZ::SceneAPI::DataTypes::IMeshVertexTangentData*    fbxTangentData   = AZ::SceneAPI::SceneData::TangentsRule::FindTangentData(graph, nodeIndex, uvSetIndex, AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
+            AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*  fbxBitangentData = AZ::SceneAPI::SceneData::TangentsRule::FindBitangentData(graph, nodeIndex, uvSetIndex, AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
 
             if (fbxTangentData && fbxBitangentData)
             {
@@ -197,9 +197,9 @@ namespace AZ::SceneGenerationComponents
             return true; // No fatal error
         }
 
-        // Check if we had tangents inside the Fbx file.
-        AZ::SceneAPI::DataTypes::IMeshVertexTangentData*    fbxTangentData   = AZ::SceneAPI::SceneData::TangentsRule::FindTangentData(graph, nodeIndex, 0, AZ::SceneAPI::DataTypes::TangentSpace::FromFbx);
-        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*  fbxBitangentData = AZ::SceneAPI::SceneData::TangentsRule::FindBitangentData(graph, nodeIndex, 0, AZ::SceneAPI::DataTypes::TangentSpace::FromFbx);
+        // Check if we had tangents inside the source scene file.
+        AZ::SceneAPI::DataTypes::IMeshVertexTangentData*    fbxTangentData   = AZ::SceneAPI::SceneData::TangentsRule::FindTangentData(graph, nodeIndex, 0, AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
+        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*  fbxBitangentData = AZ::SceneAPI::SceneData::TangentsRule::FindBitangentData(graph, nodeIndex, 0, AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
 
         // Check what tangent spaces we need.
         AZStd::vector<AZ::SceneAPI::DataTypes::TangentSpace> requiredSpaces = CollectRequiredTangentSpaces(scene);
@@ -211,8 +211,8 @@ namespace AZ::SceneGenerationComponents
             requiredSpaces.emplace_back(AZ::SceneAPI::DataTypes::TangentSpace::MikkT);
         }
 
-        // If all we need is import from FBX, and we have tangent data from Fbx already, then skip generating.
-        if ((requiredSpaces.size() == 1 && requiredSpaces[0] == AZ::SceneAPI::DataTypes::TangentSpace::FromFbx) && fbxTangentData && fbxBitangentData)
+        // If all we need is import from the source scene, and we have tangent data from the source scene already, then skip generating.
+        if ((requiredSpaces.size() == 1 && requiredSpaces[0] == AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene) && fbxTangentData && fbxBitangentData)
         {
             return true;
         }
@@ -232,7 +232,7 @@ namespace AZ::SceneGenerationComponents
                 switch (space)
                 {
                 // If we want Fbx tangents, we don't need to do anything for that.
-                case AZ::SceneAPI::DataTypes::TangentSpace::FromFbx:
+                case AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene:
                 {
                     allSuccess &= true;
                 }
diff --git a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.h b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.h
index b4a3a5d9c1..2a39e6d2f6 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/BlendShapeMikkTGenerator.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/BlendShapeMikkTGenerator.cpp
index b96249a9e6..609087c556 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/BlendShapeMikkTGenerator.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/BlendShapeMikkTGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/BlendShapeMikkTGenerator.h b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/BlendShapeMikkTGenerator.h
index cd4e897bc3..a1d137f916 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/BlendShapeMikkTGenerator.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/BlendShapeMikkTGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.cpp
index 18e777e035..03b36a6748 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.h b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.h
index 36a72151a5..e0b5ece96c 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.cpp
index 2532862d2a..7968c407b7 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.h b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.h
index 7e39a22f38..41583e611b 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentPreExportComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/Platform/Linux/platform_linux.cmake b/Gems/SceneProcessing/Code/Source/Platform/Linux/platform_linux.cmake
index bbd9353ee2..8537e6e7a5 100644
--- a/Gems/SceneProcessing/Code/Source/Platform/Linux/platform_linux.cmake
+++ b/Gems/SceneProcessing/Code/Source/Platform/Linux/platform_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp
index 1edb7a59a0..5ca2ad4b7c 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h
index eb15818c13..9c9bf57aca 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
index c25d8afc11..6f1e54aa82 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -50,7 +50,7 @@ namespace SceneBuilder
         if (m_cachedFingerprint.empty())
         {
             // put them in an ORDERED set so that changing the reflection
-            // or the gems loaded does not invalidate FBX files due to order of reflection changing.
+            // or the gems loaded does not invalidate scene files due to order of reflection changing.
             AZStd::set<AZStd::string> fragments;
 
             AZ::SerializeContext* context = nullptr;
@@ -350,7 +350,7 @@ namespace SceneBuilder
     AZ::u32 SceneBuilderWorker::BuildSubId(const AZ::SceneAPI::Events::ExportProduct& product) const
     {
         // Instead of the just the lower 16-bits, use the full 32-bits that are available. There are production examples of
-        // uber-fbx files that contain hundreds of meshes that need to be split into individual mesh objects as an example.
+        // uber-scene files that contain hundreds of meshes that need to be split into individual mesh objects as an example.
         AZ::u32 id = static_cast<AZ::u32>(product.m_id.GetHash());
 
         if (product.m_lod.has_value())
diff --git a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.h b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.h
index b7b8717e14..9c1990d2e1 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.h
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.cpp b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.cpp
index 67c68c94d1..0bd3e6ce19 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.cpp
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.h b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.h
index 209aa2ffc4..2c93f232e7 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.h
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/SceneBuilder/TraceMessageHook.cpp b/Gems/SceneProcessing/Code/Source/SceneBuilder/TraceMessageHook.cpp
index 33194f0a49..684d1a969f 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/TraceMessageHook.cpp
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/TraceMessageHook.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/SceneBuilder/TraceMessageHook.h b/Gems/SceneProcessing/Code/Source/SceneBuilder/TraceMessageHook.h
index 1416e883ec..49ce200710 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/TraceMessageHook.h
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/TraceMessageHook.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp b/Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp
index 4991afd91e..bff43b9518 100644
--- a/Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp
+++ b/Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -33,7 +33,7 @@ namespace AZ
             {
                 LoadSceneModule(s_sceneCoreModule, "SceneCore");
                 LoadSceneModule(s_sceneDataModule, "SceneData");
-                LoadSceneModule(s_fbxSceneBuilderModule, "FbxSceneBuilder");
+                LoadSceneModule(s_sceneBuilderModule, "SceneBuilder");
 
                 m_descriptors.insert(m_descriptors.end(),
                 {
@@ -59,7 +59,7 @@ namespace AZ
 
             ~SceneProcessingModule()
             {
-                UnloadModule(s_fbxSceneBuilderModule);
+                UnloadModule(s_sceneBuilderModule);
                 UnloadModule(s_sceneDataModule);
                 UnloadModule(s_sceneCoreModule);
             }
diff --git a/Gems/SceneProcessing/Code/Source/SceneProcessingModule.h b/Gems/SceneProcessing/Code/Source/SceneProcessingModule.h
index 6eb42f69b1..3491d1a702 100644
--- a/Gems/SceneProcessing/Code/Source/SceneProcessingModule.h
+++ b/Gems/SceneProcessing/Code/Source/SceneProcessingModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -12,5 +12,5 @@ namespace AZ::SceneProcessing
 {
     inline AZStd::unique_ptr<DynamicModuleHandle> s_sceneCoreModule;
     inline AZStd::unique_ptr<DynamicModuleHandle> s_sceneDataModule;
-    inline AZStd::unique_ptr<DynamicModuleHandle> s_fbxSceneBuilderModule;
+    inline AZStd::unique_ptr<DynamicModuleHandle> s_sceneBuilderModule;
 } // namespace AZ::SceneProcessing
diff --git a/Gems/SceneProcessing/Code/Source/SceneProcessingModuleStub.cpp b/Gems/SceneProcessing/Code/Source/SceneProcessingModuleStub.cpp
index e0d05bb7dc..bde2dfed7b 100644
--- a/Gems/SceneProcessing/Code/Source/SceneProcessingModuleStub.cpp
+++ b/Gems/SceneProcessing/Code/Source/SceneProcessingModuleStub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Tests/InitSceneAPIFixture.h b/Gems/SceneProcessing/Code/Tests/InitSceneAPIFixture.h
index 1b8d7778dc..c218276f14 100644
--- a/Gems/SceneProcessing/Code/Tests/InitSceneAPIFixture.h
+++ b/Gems/SceneProcessing/Code/Tests/InitSceneAPIFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Tests/MeshBuilder/MeshBuilderTests.cpp b/Gems/SceneProcessing/Code/Tests/MeshBuilder/MeshBuilderTests.cpp
index 26f6c40153..41b224906c 100644
--- a/Gems/SceneProcessing/Code/Tests/MeshBuilder/MeshBuilderTests.cpp
+++ b/Gems/SceneProcessing/Code/Tests/MeshBuilder/MeshBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Tests/MeshBuilder/MeshVerticesTests.cpp b/Gems/SceneProcessing/Code/Tests/MeshBuilder/MeshVerticesTests.cpp
index af1992c8a3..1e8aaa8d41 100644
--- a/Gems/SceneProcessing/Code/Tests/MeshBuilder/MeshVerticesTests.cpp
+++ b/Gems/SceneProcessing/Code/Tests/MeshBuilder/MeshVerticesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Tests/MeshBuilder/SkinInfluencesTests.cpp b/Gems/SceneProcessing/Code/Tests/MeshBuilder/SkinInfluencesTests.cpp
index 006a943c8e..b3489a47e5 100644
--- a/Gems/SceneProcessing/Code/Tests/MeshBuilder/SkinInfluencesTests.cpp
+++ b/Gems/SceneProcessing/Code/Tests/MeshBuilder/SkinInfluencesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Tests/MeshOptimizer/HasBlendshapes.cpp b/Gems/SceneProcessing/Code/Tests/MeshOptimizer/HasBlendshapes.cpp
index a3f5292d2e..c9bf23b73d 100644
--- a/Gems/SceneProcessing/Code/Tests/MeshOptimizer/HasBlendshapes.cpp
+++ b/Gems/SceneProcessing/Code/Tests/MeshOptimizer/HasBlendshapes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp b/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp
index 931a2500a8..e064e01cef 100644
--- a/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp
+++ b/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderTests.cpp b/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderTests.cpp
index 71c443dc32..cd7b288a56 100644
--- a/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderTests.cpp
+++ b/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/Tests/SceneProcessingConfigTest.cpp b/Gems/SceneProcessing/Code/Tests/SceneProcessingConfigTest.cpp
index 78091743cc..aa1e2fea28 100644
--- a/Gems/SceneProcessing/Code/Tests/SceneProcessingConfigTest.cpp
+++ b/Gems/SceneProcessing/Code/Tests/SceneProcessingConfigTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SceneProcessing/Code/sceneprocessing_editor_files.cmake b/Gems/SceneProcessing/Code/sceneprocessing_editor_files.cmake
index 436785ef4b..9f03e55a20 100644
--- a/Gems/SceneProcessing/Code/sceneprocessing_editor_files.cmake
+++ b/Gems/SceneProcessing/Code/sceneprocessing_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneProcessing/Code/sceneprocessing_editor_static_files.cmake b/Gems/SceneProcessing/Code/sceneprocessing_editor_static_files.cmake
index ed17b215e2..9e80083c6a 100644
--- a/Gems/SceneProcessing/Code/sceneprocessing_editor_static_files.cmake
+++ b/Gems/SceneProcessing/Code/sceneprocessing_editor_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneProcessing/Code/sceneprocessing_editor_tests_files.cmake b/Gems/SceneProcessing/Code/sceneprocessing_editor_tests_files.cmake
index 58233bd35e..9ebe2291a3 100644
--- a/Gems/SceneProcessing/Code/sceneprocessing_editor_tests_files.cmake
+++ b/Gems/SceneProcessing/Code/sceneprocessing_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneProcessing/Code/sceneprocessing_files.cmake b/Gems/SceneProcessing/Code/sceneprocessing_files.cmake
index 3cd4f263ca..93f7a1decd 100644
--- a/Gems/SceneProcessing/Code/sceneprocessing_files.cmake
+++ b/Gems/SceneProcessing/Code/sceneprocessing_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SceneProcessing/Code/sceneprocessing_tests_files.cmake b/Gems/SceneProcessing/Code/sceneprocessing_tests_files.cmake
index e6a913cf29..e66a1a7178 100644
--- a/Gems/SceneProcessing/Code/sceneprocessing_tests_files.cmake
+++ b/Gems/SceneProcessing/Code/sceneprocessing_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/CMakeLists.txt b/Gems/ScriptCanvas/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/ScriptCanvas/CMakeLists.txt
+++ b/Gems/ScriptCanvas/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/Asset/EditorAssetConversionBus.h b/Gems/ScriptCanvas/Code/Asset/EditorAssetConversionBus.h
index 7f54a281ae..8e53db20b0 100644
--- a/Gems/ScriptCanvas/Code/Asset/EditorAssetConversionBus.h
+++ b/Gems/ScriptCanvas/Code/Asset/EditorAssetConversionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
index 69c8032d1f..035fa0f855 100644
--- a/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h
index 23b781300d..0a8bf830af 100644
--- a/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h
+++ b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.cpp b/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.cpp
index e15a2ae955..9cee1fb375 100644
--- a/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.h b/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.h
index 2764621d91..404d6bbb65 100644
--- a/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.h
+++ b/Gems/ScriptCanvas/Code/Asset/RuntimeAssetSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Builder/BuilderSystemComponent.h b/Gems/ScriptCanvas/Code/Builder/BuilderSystemComponent.h
index 7bff0b2180..9ff9aa812d 100644
--- a/Gems/ScriptCanvas/Code/Builder/BuilderSystemComponent.h
+++ b/Gems/ScriptCanvas/Code/Builder/BuilderSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
index cd7540c663..cdbd9ff943 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h
index 201c9f00ee..bd6a09433a 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
index 2284ba94cf..20b927140a 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
index 4ef20f5fb1..fe07175744 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp
index 375b217780..7c63652c1a 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Builder/ScriptCanvasFunctionBuilderWorker.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasFunctionBuilderWorker.cpp
index 9f528f983f..5ff5069141 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasFunctionBuilderWorker.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasFunctionBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/CMakeLists.txt b/Gems/ScriptCanvas/Code/CMakeLists.txt
index 84aaf315f2..e7456f4403 100644
--- a/Gems/ScriptCanvas/Code/CMakeLists.txt
+++ b/Gems/ScriptCanvas/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHandler.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHandler.cpp
index 41bf85bf3e..9f50f32cf5 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.cpp
index d42b324ba1..a3559f0123 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h
index 3941f69540..1cde981e0d 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAsset.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAsset.cpp
index ff898a41fc..75bfefbd6e 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAsset.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp
index 0da8da5276..5a15fe4298 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp
index 76cfb0de8d..247a38f58a 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.h
index 1ed69b2430..d98ff25326 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp
index 0a4b2e32f1..2f0d0bfc2c 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.h
index 5b49132168..30fedb6157 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.cpp
index 3ea1fffd82..30f2ecdb64 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.h
index 87fc9d195d..5e86636d90 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.cpp
index 8280e40741..e4d620ba57 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.h
index f464fbe678..526296b1c1 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReferenceContainer.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReferenceContainer.h
index aa7dd665ce..efff707234 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReferenceContainer.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReferenceContainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
index 3088428608..4979f5e0e8 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h
index c46d1f96d8..d77b10f2c8 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h
index ccb7221831..828223ad38 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h
index 58a7d182e5..5c20d20bf0 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
index 6ffa2693fe..3304ad7987 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
index 1e67a366e3..8f44a7f4b8 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.cpp
index 8783276dc3..1d26cc2525 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.h b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.h
index 4c824ea2d0..deccaac161 100644
--- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.h
+++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasUndoHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
index b06540c1d0..f1b4af88d8 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Components/EditorGraphVariableManagerComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraphVariableManagerComponent.cpp
index 7b860542bf..95dcca4d72 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraphVariableManagerComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraphVariableManagerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
index b767a2b52e..97f5b8706f 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp
index a12c2a2ff9..42f30e0a89 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp b/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp
index 4ff0732100..fcffc49b74 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp
index a3df4244af..511b3f6658 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.h b/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.h
index a3d19ec89c..137b230ec1 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.cpp b/Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.cpp
index b87faa72e4..75a820bdba 100644
--- a/Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.h b/Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.h
index 83b03fad04..99a67f37ab 100644
--- a/Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.h
+++ b/Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.h b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.h
index fbb6829a4f..f1e3c85783 100644
--- a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.h
+++ b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
index bb40575367..ee748129e7 100644
--- a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
+++ b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasReporter.h b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasReporter.h
index 90a2c2d22b..392aff3ec8 100644
--- a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasReporter.h
+++ b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasReporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasReporter.inl b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasReporter.inl
index dfc6ec7e2b..00f54a6c50 100644
--- a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasReporter.inl
+++ b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasReporter.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h
index 886392ca7f..381e7c78ea 100644
--- a/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h
+++ b/Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/AutomationIds.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/AutomationIds.h
index 1e93788474..a77fdb98e9 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/AutomationIds.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/AutomationIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.cpp
index 07e8fc3035..c5f212abbc 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.h
index 2a71cfde02..ab27fbde82 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp
index 630a3496e9..bd845548c6 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.h
index 096a535ca0..1307852382 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.cpp
index 040442999d..fd6313f243 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.h
index d8e8df3e94..5313cf94e0 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/AzEventHandlerNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/AzEventHandlerNodeDescriptorComponent.cpp
index daccb203aa..ac32b8f6bb 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/AzEventHandlerNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/AzEventHandlerNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/AzEventHandlerNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/AzEventHandlerNodeDescriptorComponent.h
index bc1b4c30ec..b00cd0a893 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/AzEventHandlerNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/AzEventHandlerNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp
index c81c23370d..ce8c4a7386 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.h
index 20cf6a9aa5..732ab44a84 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.cpp
index d3f6634f9e..396f53309a 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.h
index 454baa0a95..bdc0f7adb7 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.cpp
index 40a36ddf69..1c94d19137 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.h
index e3a8b9335a..f7f4fde06f 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp
index 51a2466e62..03dfa6f73c 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.h
index 83c87b4a45..7c61a7569a 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.cpp
index 46e6b28fb0..d49b776963 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h
index a83e7834b7..af8b55a69d 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EntityRefNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.cpp
index 183b5b0eba..49f0a7d167 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.h
index 0e62a5b961..83806128e1 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp
index 87dad9df76..3930c91841 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h
index 395dcb3849..d121762c93 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp
index 5070b3ea79..9599475a10 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.h
index 4f0cbd4282..e0de0e8139 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.cpp
index 17856f8b2f..86e0e930ce 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h
index f0a6a5c061..26bbb55d6e 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.cpp
index 723b8c3906..d86f3991fd 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.h
index 558791728b..32e5ba054f 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.cpp
index 89818c15f4..6872bf7f55 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.h
index e09e761140..b5ff154cc0 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.cpp
index 306773fa08..4832739422 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.h
index 2bb9a09a15..bf6bb74865 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.cpp
index 4b05cc2057..1c141f4825 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.h
index fb5979f547..5769011ff0 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp
index 70eb335dcb..6b608f0113 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.h
index 8df108725b..6b32051e9a 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp
index 08b5cedf54..ddaedc9039 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.h
index 9148a0747d..8ff73da717 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.cpp
index 63a485cd54..a3db1ca2d6 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.h
index 4b411c5708..d53ceba990 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasAssetIdDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasAssetIdDataInterface.h
index 63fc66a6fb..c8ac4eb40f 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasAssetIdDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasAssetIdDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasBoolDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasBoolDataInterface.h
index f9e4c83802..e0bdf660fe 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasBoolDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasBoolDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasCRCDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasCRCDataInterface.h
index 1ff1c135b6..ef1ebd06cd 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasCRCDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasCRCDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasColorDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasColorDataInterface.h
index 248904603b..97ede5ce71 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasColorDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasColorDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasDataInterface.h
index 54ca61bd51..82eb3c8e38 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasEntityIdDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasEntityIdDataInterface.h
index aabb47e32b..514d6e2a04 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasEntityIdDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasEntityIdDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasEnumDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasEnumDataInterface.h
index bbc4db0b7a..104bb63bb6 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasEnumDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasEnumDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasNumericDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasNumericDataInterface.h
index c22f6ab51a..d82f3a7c76 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasNumericDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasNumericDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasQuaternionDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasQuaternionDataInterface.h
index 7cc8d40cdf..08376b583b 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasQuaternionDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasQuaternionDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasReadOnlyDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasReadOnlyDataInterface.h
index 629f0dc77f..aacbdb74b3 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasReadOnlyDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasReadOnlyDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasStringDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasStringDataInterface.h
index a337293186..c6e7b47f91 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasStringDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasStringDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVariableDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVariableDataInterface.h
index ee75b5258e..6b44f59985 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVariableDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVariableDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVectorDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVectorDataInterface.h
index 3b3a40cdfb..1c7bb75c67 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVectorDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVectorDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h
index 3b2a1af99e..ec8e25aa8f 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasEnumComboBoxPropertyDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasEnumComboBoxPropertyDataInterface.h
index 6b034af3a5..07ecc1a90c 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasEnumComboBoxPropertyDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasEnumComboBoxPropertyDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasPropertyDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasPropertyDataInterface.h
index 2a72d51baa..f3f1e6506c 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasPropertyDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasPropertyDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasStringPropertyDataInterface.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasStringPropertyDataInterface.h
index e30f7b306f..f645e20f42 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasStringPropertyDataInterface.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasStringPropertyDataInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertySlotIds.h b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertySlotIds.h
index e450dfa048..ac6f42c362 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertySlotIds.h
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertySlotIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h
index 5ede7bad79..f9953aba99 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/Functions/ScriptCanvasFunctionAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h
index bf8ab35470..fdf60a1eaa 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetBus.h
index 7d38fe13d5..fad2d75413 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h
index 7332603ead..591ed27bd4 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetTypes.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetTypes.h
index 0f80a130e2..8ef3fdcb4d 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h
index 8dee7a0f1d..8b6afcde64 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/DocumentContextBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/DocumentContextBus.h
index 4e668e3109..f841f05778 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/DocumentContextBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/DocumentContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorSceneVariableManagerBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorSceneVariableManagerBus.h
index 4e8f248237..76a929563b 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorSceneVariableManagerBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorSceneVariableManagerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
index 221d91265e..d9b2be8035 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/GraphBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/GraphBus.h
index 9567b8bd1f..1d7acb03a0 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/GraphBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/GraphBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/IconBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/IconBus.h
index 4ec405360f..3094a50b39 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/IconBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/IconBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/NodeIdPair.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/NodeIdPair.h
index 8785ffa715..a45043b549 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/NodeIdPair.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/NodeIdPair.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/RequestBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/RequestBus.h
index 3b823e0e2d..0209985dc4 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/RequestBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/RequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasAssetNodeBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasAssetNodeBus.h
index 40cde0a198..1366d972b9 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasAssetNodeBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasAssetNodeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasBus.h
index 3204f9cc03..ff8e9e9747 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasExecutionBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasExecutionBus.h
index a633c7ac54..5fa81a77ca 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasExecutionBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasExecutionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/UndoBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/UndoBus.h
index 1638ccdc7d..74b649b72d 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/UndoBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/UndoBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/UnitTestVerificationBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/UnitTestVerificationBus.h
index 40ba5ab1c3..5b5e9ed7d3 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/UnitTestVerificationBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/UnitTestVerificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
index 1d4e1df09f..a32333e5ce 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraphVariableManagerComponent.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraphVariableManagerComponent.h
index 549ac73766..93e9285e57 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraphVariableManagerComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraphVariableManagerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
index c3f500c3cc..0abfda43d9 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorUtils.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorUtils.h
index 97aef77bc2..33cc31d904 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorUtils.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h
index b5c6d391f3..bd35b6b044 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/DynamicSlotBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/DynamicSlotBus.h
index 9b1c988fe8..f265a40b64 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/DynamicSlotBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/DynamicSlotBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/MappingBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/MappingBus.h
index 4b4e312c5a..c9c64cb5e9 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/MappingBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/MappingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h
index cbe7c995d3..6822576482 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.cpp b/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.cpp
index 3a3e7bfe30..aafb32eb81 100644
--- a/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.h b/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.h
index e74e261790..1c0fef208f 100644
--- a/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.h
+++ b/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp b/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp
index 1ca7057279..dff8090522 100644
--- a/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.h b/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.h
index 5a7cf9cee5..3f2263cba3 100644
--- a/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.h
+++ b/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp b/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp
index 864e9f1428..318201fc87 100644
--- a/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.h b/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.h
index 920b7371df..bfd8079019 100644
--- a/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.h
+++ b/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp
index db13adb9f7..fcdc7b2780 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.h b/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.h
index b5fdbf111d..4ea81a869a 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.h
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp
index 86ec1456bd..a7282f85b0 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h
index 91bdea2749..c24b48a289 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
index 215f3c42de..ba87796161 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.h b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.h
index 1db6cf9012..2ac38d86ed 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.h
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
index 7de211c67e..a0d79f28a3 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.h b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.h
index 7470da047c..786858d822 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.h
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp
index d6a7c87966..3bc1f1b033 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.h b/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.h
index 085a9cb7fd..8d3a5bf3d8 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.h
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/QtMetaTypes.h b/Gems/ScriptCanvas/Code/Editor/QtMetaTypes.h
index 196baca86b..ceb2b612cf 100644
--- a/Gems/ScriptCanvas/Code/Editor/QtMetaTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/QtMetaTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp b/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp
index c3d4903578..a90e3a9fd5 100644
--- a/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/ReflectComponent.h b/Gems/ScriptCanvas/Code/Editor/ReflectComponent.h
index 6aaa1ddf5f..e31737eeb1 100644
--- a/Gems/ScriptCanvas/Code/Editor/ReflectComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/ReflectComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp b/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp
index 4ab7059173..7a9d917c52 100644
--- a/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Settings.cpp b/Gems/ScriptCanvas/Code/Editor/Settings.cpp
index 974c1b341c..821f0956d3 100644
--- a/Gems/ScriptCanvas/Code/Editor/Settings.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Settings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Settings.h b/Gems/ScriptCanvas/Code/Editor/Settings.h
index e5beffb2e3..2b9268dc0c 100644
--- a/Gems/ScriptCanvas/Code/Editor/Settings.h
+++ b/Gems/ScriptCanvas/Code/Editor/Settings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.h b/Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.h
index fa3d0c1882..ea8cd89d69 100644
--- a/Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.h
+++ b/Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.inl b/Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.inl
index f7e62ac4f7..b631f3cd32 100644
--- a/Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.inl
+++ b/Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Static/Source/View/EditCtrls/GenericLineEditCtrl.cpp b/Gems/ScriptCanvas/Code/Editor/Static/Source/View/EditCtrls/GenericLineEditCtrl.cpp
index 47d4406f98..b2e93edb41 100644
--- a/Gems/ScriptCanvas/Code/Editor/Static/Source/View/EditCtrls/GenericLineEditCtrl.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Static/Source/View/EditCtrls/GenericLineEditCtrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp b/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
index 9aed5f5c40..6ab9c9b640 100644
--- a/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/SystemComponent.h b/Gems/ScriptCanvas/Code/Editor/SystemComponent.h
index 00ff4a3965..48b9bd57fc 100644
--- a/Gems/ScriptCanvas/Code/Editor/SystemComponent.h
+++ b/Gems/ScriptCanvas/Code/Editor/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Tests/test_Main.cpp b/Gems/ScriptCanvas/Code/Editor/Tests/test_Main.cpp
index b68ab73b3b..d6598d3d2a 100644
--- a/Gems/ScriptCanvas/Code/Editor/Tests/test_Main.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Tests/test_Main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h
index c15d84f05b..4f83faba66 100644
--- a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h
+++ b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp
index 6ead91985f..d745014d69 100644
--- a/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.h b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.h
index a47fa1a392..88a86ffa35 100644
--- a/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.h
+++ b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.cpp b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.cpp
index 1b14cb9704..4870b8728d 100644
--- a/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.h b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.h
index 7c0a41b7f9..75ea25ef3f 100644
--- a/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.h
+++ b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp b/Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp
index 5155dad831..e55b62681d 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Utilities/Command.h b/Gems/ScriptCanvas/Code/Editor/Utilities/Command.h
index 43479023a7..1b7629ace8 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/Command.h
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/Command.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp
index 7f4971465f..f874246c93 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h
index 5cb53a8a99..3d150d7c64 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -7,7 +7,7 @@
 #pragma once
 
 // IMPORTANT: This is NOT the permanent location for these values.
-#define SCRIPTCANVASEDITOR_AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME  "Amazon"
+#define SCRIPTCANVASEDITOR_AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME  "O3DE"
 #define SCRIPTCANVASEDITOR_NAME_SHORT   "ScriptCanvasEditor"
 
 namespace ScriptCanvasEditor
diff --git a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.cpp b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.cpp
index 3668f12a97..83aeef56e2 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.h b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.h
index 9754320a75..8214da7473 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.h
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.cpp b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.cpp
index 99ae47297e..dca0fbb17b 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.h b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.h
index 8b0bae7b0d..3e01876035 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.h
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp
index a839d4aad8..7f99fd40dd 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.h b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.h
index aeaff650c5..bc65339f05 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp
index 4b79ac0b79..f1afa83338 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.h b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.h
index 23972b5b13..f9a852c02d 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp
index 82f4d0e3d3..4bdcd80fc3 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.h b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.h
index c9af0f0ae7..6235fac191 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp
index 6cfe1563c1..b5b922acff 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.h b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.h
index 74ebff3cbb..6c12f1f7af 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp
index 9a93a72d27..6e03b4d70c 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.h b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.h
index c0080d3280..ab7335fde4 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/AssetGraphSceneDataBus.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/AssetGraphSceneDataBus.h
index 0849dad746..1e1d7fb2ae 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/AssetGraphSceneDataBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/AssetGraphSceneDataBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp
index d8529bfbad..7205a7bb85 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.h
index 58477774c3..557a4013c0 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.cpp
index 33c47ddf7e..7e1e443164 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.h
index 2211611abf..dfe1d58101 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp
index 0e5a8932dd..3aa4d34293 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.h
index f5cc4f4646..ed84f40337 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp
index 77022dcb55..7e8bbec40c 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h
index 15c26e1a43..8177cb0a63 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.cpp
index 29c4343820..9e7c48f949 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.h
index 883e9fb2e1..09838aed3d 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.cpp
index 730be30261..df88efb67f 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.h
index 1afb44864b..774dce29de 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp
index 5d2d2c8f3a..a452fc3f23 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.h
index f785270c2b..b809189984 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.cpp
index feae601492..25ab3ba941 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.h
index 934c85785d..535e6cf717 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.cpp
index 3abe41ad93..26a1ab88d3 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h
index 02d9700113..3bf2718fcc 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp
index f036835618..2af6da583a 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.h
index ca2efecd50..41a47a35ea 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp
index 65b40ff169..5dc360b7e2 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.h
index 0502c8a40c..0caf3c5299 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.cpp
index b819c602f7..dc0316bd87 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.h
index f2dae43580..966c9b7352 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp
index 0c9437ab37..2e26101179 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h
index 6e050c783c..1375151731 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.cpp
index 8fcd1ea7c5..5996a33b36 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.h
index 74ddce0497..19d5a550c3 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.cpp
index 555fa6ec7c..3a6f7b3e69 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.h
index fd7856cfd2..bd0714c55f 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp
index 311877001f..d754236b8d 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.h
index aa7b28a65b..3c62fbcab3 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp
index e4ede66c24..07e9814aae 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.h
index ac28b2b04a..49214a7d9b 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp
index 91c495a585..77606488c1 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.h
index 48ec5a1f35..a044a202da 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.cpp
index ac5c940528..7b3ffdc1f1 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h
index 01c153ba17..b92ab53220 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp
index b454e775c1..4b2e9ffe7d 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.h
index 7b4d7cb4db..8359691e3d 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.cpp
index 9d51f56328..9e5c027491 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h
index 1f3220d787..26b2eb27d6 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp
index 74298b9ba8..9d49f17fa5 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h
index ed39aa69de..6f1bf97af3 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
index e1292d149b..787d881318 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
index 17e6802a65..2286e8e453 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModelBus.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModelBus.h
index 5f575df655..ab5f13143f 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModelBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModelBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.cpp
index 918ecd573d..c339f941aa 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.h
index e3ee260bb1..8fcc64004f 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp
index 5cf8686c07..f0290eef10 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h
index 73910f659d..5f623e4c56 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp
index 34dd2bb6ec..3c37de8386 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h
index becbb13679..1e09e5cf20 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.cpp
index a07c17be3c..f25f6ba2bf 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.h
index 746a75f7d9..44f4abfc34 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridBus.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridBus.h
index a2ad3439f0..749e20dc7d 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.cpp
index 4479249f8b..14aca1a0d8 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.h
index 53f154f7d3..7337b13a54 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
index fdcc60343f..cfe719114f 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h
index 9d8e66c954..d6cfc68a22 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp
index acd3f58ee1..4281e35250 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.h
index c3cd8da168..0ea65cf70c 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp
index 697fed3c0b..caa39d4ca4 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.h
index f0a13238e2..147a05bd90 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp
index 4ab5a5cb55..85c70f7864 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.h
index b14b57ccf8..33c9966daf 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp
index 183f5e67a7..b95354b7d8 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.h
index 5406db7eea..feb944357b 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp
index 43f0650930..4100103dd1 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.h
index 353eb32348..9eac04b4e4 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidgetBus.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidgetBus.h
index 7a1458d2d5..72c3f697d4 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidgetBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidgetBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
index bc01ae92d9..b6062423ee 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.h
index 840effc1c9..b20b66e819 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp
index 7834ef0898..2d23b942df 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.h
index d837dce8f2..1de1f971b8 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp
index b63cc60708..d88c16ba24 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.h
index 6dbc185c9b..d48863209a 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp
index de5257188c..6622221c68 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.h
index 97ca1f6377..a9691961f0 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Widgets/WidgetBus.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/WidgetBus.h
index 8a7c791a9a..277add739e 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/WidgetBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/WidgetBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.cpp
index 606ef20702..f5b77e4bd7 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.h
index 081a2a1b8b..cb4cd1715a 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.cpp
index d18c94173c..c64d6253c1 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.h
index 58f2d29763..530dc240ec 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
index 0572c929eb..4bcc50e5ea 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
index 84dc3cc14d..bb15cc13b3 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindowBus.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindowBus.h
index 7d2bc1946f..c3fc9255a6 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindowBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindowBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
index 72c34e1ee7..95386c7e55 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
index ce0d575923..01029e0be1 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp
index c297d9dba2..e35435f5dd 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.h
index 642494688f..c3baff3f40 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp
index e9e778a0d8..02fb5b567d 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.h
index 74f4360feb..7fe732c1cb 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
index 6359836217..9ec399f616 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h
index 148cf4f6f3..929184834a 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui b/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
index c055f9f3ca..ddb8100821 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
@@ -170,7 +170,8 @@
    <addaction name="menuEdit"/>
    <addaction name="menuView_2"/>
    <addaction name="menuTools_2"/>
-   <addaction name="menuUtilities"/>
+    <!-- Disabled until tool is stabilized <widget class="QMenu" name="menuUtilities">
+   <addaction name="menuUtilities"/> -->
    <addaction name="menuSettings_2"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
diff --git a/Gems/ScriptCanvas/Code/Editor/precompiled.h b/Gems/ScriptCanvas/Code/Editor/precompiled.h
index bd7d04f867..dafa822ce4 100644
--- a/Gems/ScriptCanvas/Code/Editor/precompiled.h
+++ b/Gems/ScriptCanvas/Code/Editor/precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetDescription.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetDescription.h
index 263c1d497b..900fa4b3c5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetDescription.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetDescription.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistry.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistry.cpp
index 1fd7bd131a..2d010b3327 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistry.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistry.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistry.h
index eadfe90f8e..a89c6ef645 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistry.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistryBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistryBus.h
index bd6f1f0865..086508ad62 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistryBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/AssetRegistryBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.cpp
index dc68817610..66e2cac5b5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.h
index f0897d2f73..f9b99f94ee 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAssetBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAssetBus.h
index 4fd53b44dc..7d208c5915 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAssetBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAssetBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
index afa0fa6ba8..2f20fbbabb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h
index 0df45186dd..d468be735d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
index d1899a97a2..58c99e719e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.cpp
index a675a62788..c8a14f9231 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
index fd746f947d..cc41d5ae5e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
index 86dd1b8b7a..f2c03fbd03 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.h
index 32a6c71b40..ffcdbb3665 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
index b1b34482b3..b5ec697911 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h
index 994ccc6406..ae36b7a43e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja
index d417d95ec5..665642bd8b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja
index f23cc8c50b..aaffe7ddef 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja
index 188c7d2214..6f08e3fdf5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
index fdf773bf2c..11d3cdcea3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja
index 5c04232873..ae25a7e363 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja
index a0c57f4d64..6cb0217a8a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja
@@ -1,5 +1,5 @@
 {#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h
index 0ac6d8d44b..52628b62ed 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/CodeGen/NodeableCodegen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Attributes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Attributes.h
index 703999e2c2..df919d3b69 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Attributes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Attributes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
index a9394a47bd..2a2c055416 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
index 5acdf64f68..1a1c47794b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ConnectionBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ConnectionBus.h
index 7009ebeac1..3045dc2fdc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ConnectionBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ConnectionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contract.cpp
index cb6a9f0826..b8ae236563 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contract.h
index e2028c4e1d..b92cc4f7d2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ContractBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ContractBus.h
index a2bfc486a0..19a442144b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ContractBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ContractBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts.h
index e5a61083cc..8e2a748f0f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.cpp
index 9513d9259f..76f0459404 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.h
index f527612bd0..f46776a3ce 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ContractRTTI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ContractRTTI.cpp
index 289326ab40..515bb004ed 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ContractRTTI.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ContractRTTI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ContractRTTI.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ContractRTTI.h
index c26887a67f..b24fb598f2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ContractRTTI.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ContractRTTI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.cpp
index 140937d04a..d4b727bb90 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.h
index 3092045187..ee8e58a354 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.cpp
index 7a28d7da20..39cfa706d9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h
index 8793a60d5c..6c076e444c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.cpp
index 9326a4d18b..3b1eae09b1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h
index 52e8ac80e2..cedaad5b6c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.cpp
index c80c7f6102..b546a4364d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h
index 941440732e..5e5865fb06 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/ExclusivePureDataContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.cpp
index 9aba05b04a..953c37d72e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h
index 5bf767aae4..5758df6a27 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MathOperatorContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MathOperatorContract.cpp
index edcc3f595f..7a7d03a564 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MathOperatorContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MathOperatorContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MathOperatorContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MathOperatorContract.h
index 6159ab971b..8401f92378 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MathOperatorContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MathOperatorContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.cpp
index 3a0376c55a..a5ad5b43f9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.h
index a681eb050d..b502765281 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.cpp
index 0b78d4746f..d8b74cbcd8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.h
index e946fa9d40..eb9b454e71 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SlotTypeContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SlotTypeContract.cpp
index c594c1b15a..ea036a8432 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SlotTypeContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SlotTypeContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SlotTypeContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SlotTypeContract.h
index ed4ede7ce1..bd4bcbda95 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SlotTypeContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SlotTypeContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.cpp
index 51aa423ad5..f0519cd7ed 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.h
index d106265dbc..2c4b0b97b6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.cpp
index fac8aadd8f..b1c0fa1858 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.h
index 5dad7d9fc6..d383835193 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/TypeContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/TypeContract.cpp
index 3b51641c7d..2ed5a48008 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/TypeContract.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/TypeContract.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/TypeContract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/TypeContract.h
index e884a217ce..85344c620c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/TypeContract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/TypeContract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
index a79c58ea32..c81b70618a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
index 78e51ddbb0..044a3d54db 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.cpp
index d51fc0038e..cd2cf7d9ea 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.h
index 0c6912afe8..c3730aed0a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/DatumBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/DatumBus.h
index 214fffd98b..b85409b052 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/DatumBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/DatumBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.cpp
index 747561cfe2..8dfed0ea66 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.h
index 7ba41dc271..93fded64c3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusNodeBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusNodeBus.h
index 8c8a5fe590..6dc3a91df6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusNodeBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusNodeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Endpoint.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Endpoint.cpp
index b9d8b81923..7c5aef1fc7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Endpoint.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Endpoint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Endpoint.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Endpoint.h
index 155b731f4b..ca20a0ace4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Endpoint.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Endpoint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ExecutionNotificationsBus.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ExecutionNotificationsBus.cpp
index 47a0540ebb..09eee9ae79 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ExecutionNotificationsBus.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ExecutionNotificationsBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ExecutionNotificationsBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ExecutionNotificationsBus.h
index 009f687e80..9e913cb38d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ExecutionNotificationsBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ExecutionNotificationsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
index abd4cf1bb7..a1791509b0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
index 76e15bfe34..e54704e95e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphBus.h
index 87fa78eb1f..c85c76e54e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.cpp
index 50b2a055a6..d59e933676 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.h
index 38c9e4cc4f..1af246d213 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphScopedTypes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphScopedTypes.h
index dda0347f2c..a3c1446b85 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphScopedTypes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphScopedTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp
index a2ad92ba22..603079fc28 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.h
index f9323d9708..3a4ff1a104 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.cpp
index 2db48ad352..57594f6f34 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.h
index f37750dede..7786a1a136 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ModifiableDatumView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NamedId.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NamedId.h
index e90196ace0..3459a985ef 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NamedId.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NamedId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NativeDatumNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NativeDatumNode.h
index a2f6c99911..70c30198d5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NativeDatumNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NativeDatumNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
index 7aaf9ea518..f0faf324c1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
index 7e18ae8283..74707916f3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeBus.h
index 6b12157d46..b55e88844c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
index c1c33b54e7..95fc23c5d5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp
index bdb8576d8f..c73b7e0b8e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.h
index 81ced122b8..5991e4e239 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp
index 7a723278d6..5ec40d8e5f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.h
index 26014d8bfc..0589aff0da 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
index 73eec2d685..c9e2e3acc6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.h
index 53f31406bc..16767c2c6f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableOut.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableOut.h
index c0f7def920..46a2f65839 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableOut.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableOut.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodelingBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodelingBus.h
index c89e9a5c97..ce9938ec03 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodelingBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodelingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.cpp
index 9f4da0ffd2..44d087e8a5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.h
index 159f475d2f..01c52d7378 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/PureData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ScriptCanvasBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ScriptCanvasBus.h
index 0d59449237..7133691078 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ScriptCanvasBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/ScriptCanvasBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SignalBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SignalBus.h
index de21f23ef7..1a39c0f4d6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SignalBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SignalBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
index 4423d0ec7e..5b117dc4a9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.h
index 4b4d09dbce..1eeddb8898 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurationDefaults.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurationDefaults.h
index 2f4090a6c0..b998f3120c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurationDefaults.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurationDefaults.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurations.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurations.cpp
index 7f27967a08..be6b4bd094 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurations.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurations.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurations.h
index f7318b1023..7d5a0ff895 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurations.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotConfigurations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotExecutionMap.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotExecutionMap.cpp
index 073faee4d6..caf87e84af 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotExecutionMap.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotExecutionMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotExecutionMap.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotExecutionMap.h
index 909503426e..1498fb332c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotExecutionMap.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotExecutionMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotMetadata.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotMetadata.cpp
index c6365bd7df..9c3a68c1c5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotMetadata.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotMetadata.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotMetadata.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotMetadata.h
index e481b7a934..57a3b081eb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotMetadata.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotMetadata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotNames.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotNames.h
index 2e5af6427c..7efdb8b890 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotNames.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SlotNames.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.cpp
index 0047455369..a6959ae209 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.h
index c82868c86e..024f3e7483 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp
index 4a687dbebc..af131a2208 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.h
index a85b0ed3a8..02c7aef947 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.cpp
index 53978776e5..64b006a39c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.h
index 3a2bb62dfb..29831e20f9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObjectPtr.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObjectPtr.cpp
index b6da229e70..12810adf8a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObjectPtr.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObjectPtr.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObjectPtr.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObjectPtr.h
index da961f6041..32334458bf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObjectPtr.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObjectPtr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.cpp
index 02896568fa..92d30f88fb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.h
index 156b184bbf..bcf2a6bafe 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataMacros.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataMacros.h
index 5906e43456..14c4cd67a0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataMacros.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataMacros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataRegistry.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataRegistry.cpp
index 91b81b3dab..ba217c9290 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataRegistry.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataRegistry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataRegistry.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataRegistry.h
index c7bb55074a..6266a596ae 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataRegistry.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.cpp
index e8039f8164..199f6fe26d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h
index 190fc1f1f4..d1df5a1cf6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/NumericData.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/NumericData.h
index 173a064975..8af1e8864e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/NumericData.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/NumericData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/PropertyTraits.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/PropertyTraits.cpp
index 7e9a2cb2a0..99a48a51b1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/PropertyTraits.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/PropertyTraits.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/PropertyTraits.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/PropertyTraits.h
index 4a321359dd..bae23d151c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/PropertyTraits.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/PropertyTraits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Traits.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Traits.h
index 9de5a185d1..a1dee0ec01 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Traits.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Traits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/API.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/API.cpp
index f12561d437..cd696d1d28 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/API.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/API.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/API.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/API.h
index d0ecdf2f46..5fdfc80ac7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/API.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/API.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/APIArguments.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/APIArguments.cpp
index 291e96e677..b2495336bb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/APIArguments.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/APIArguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/APIArguments.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/APIArguments.h
index 9c56fd1b99..03d842c7ec 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/APIArguments.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/APIArguments.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Bus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Bus.h
index d8dec0987a..e404fc62a5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Bus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Bus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.cpp
index aae10b554d..1ee13221f9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.h
index bb4abddd21..9cbb8697fb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Debugger.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Debugger.cpp
index 1e3ba13aaf..1435808490 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Debugger.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Debugger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Debugger.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Debugger.h
index 721a9c3565..6df9d8482c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Debugger.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Debugger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/LogReader.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/LogReader.cpp
index 54afe74e0e..0c8963d6b3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/LogReader.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/LogReader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/LogReader.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/LogReader.h
index caa26cbf19..88eddf0111 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/LogReader.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/LogReader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Logger.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Logger.cpp
index 7cedb49d9e..c4fffee9ba 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Logger.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Logger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Logger.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Logger.h
index 210a6429db..13c413d47b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Logger.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Logger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Notify.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Notify.cpp
index 0706b2ea2f..c4f7592adb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Notify.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Notify.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Notify.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Notify.h
index c4eaab1c9c..30b930302f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Notify.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Notify.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Request.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Request.cpp
index e61b0f6028..5e8e51be7e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Request.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Request.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Request.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Request.h
index 3e4d08392d..c454d82a7d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Request.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/Messages/Request.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/StatusBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/StatusBus.h
index 1dc1e86375..66cbe46ac6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/StatusBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/StatusBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationEvents.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationEvents.h
index a3ec8a31f6..b1bf2d96dc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationEvents.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationIds.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationIds.h
index 8547996193..9eda5e1e53 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationIds.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DynamicDataTypeEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DynamicDataTypeEvent.h
index d5fec371c6..32125a5d6d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DynamicDataTypeEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DynamicDataTypeEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidExpressionEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidExpressionEvent.h
index 979da822b7..0b1008f16b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidExpressionEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidExpressionEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidPropertyEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidPropertyEvent.h
index 21def4d2ae..49807bfff3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidPropertyEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidPropertyEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidRandomSignalEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidRandomSignalEvent.h
index 4f9979cc4c..af8864daa3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidRandomSignalEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidRandomSignalEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidVariableTypeEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidVariableTypeEvent.h
index a4738ce621..a03b541012 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidVariableTypeEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidVariableTypeEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScopedDataConnectionEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScopedDataConnectionEvent.h
index 59c3ee2b7e..e411059e3b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScopedDataConnectionEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScopedDataConnectionEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScriptEventVersionMismatch.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScriptEventVersionMismatch.h
index d270bdbd2f..91d3e40556 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScriptEventVersionMismatch.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScriptEventVersionMismatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/SlotReferenceEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/SlotReferenceEvent.h
index 773102addf..205ac6376e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/SlotReferenceEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/SlotReferenceEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/UnknownEndpointEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/UnknownEndpointEvent.h
index 2546974141..3774467f9b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/UnknownEndpointEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/UnknownEndpointEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationEvents.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationEvents.h
index dbce59ebce..a54b3dbd7d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationEvents.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationIds.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationIds.h
index 5112b0c352..4299ea43e0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationIds.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/ExecutionValidationIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/UnusedNodeEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/UnusedNodeEvent.h
index 5ffbe66c6d..c0ccbd1ced 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/UnusedNodeEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/UnusedNodeEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/GraphTranslationValidation/GraphTranslationValidationIds.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/GraphTranslationValidation/GraphTranslationValidationIds.h
index 330865bede..8b24e67dc8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/GraphTranslationValidation/GraphTranslationValidationIds.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/GraphTranslationValidation/GraphTranslationValidationIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/GraphTranslationValidation/GraphTranslationValidations.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/GraphTranslationValidation/GraphTranslationValidations.h
index b82e5fa0a0..4274af88a2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/GraphTranslationValidation/GraphTranslationValidations.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/GraphTranslationValidation/GraphTranslationValidations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidationIds.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidationIds.h
index ee298be2ef..f30cd830f6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidationIds.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidationIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidations.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidations.h
index 458ca1202f..72bfa828ba 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidations.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/FocusOnEffect.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/FocusOnEffect.h
index 6852b6efac..6e41361b8c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/FocusOnEffect.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/FocusOnEffect.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/GreyOutEffect.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/GreyOutEffect.h
index 569e64c2dd..2a7cae6bc5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/GreyOutEffect.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/GreyOutEffect.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/HighlightEffect.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/HighlightEffect.h
index 7aafbcefc9..68715a98a3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/HighlightEffect.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEffects/HighlightEffect.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEvent.h
index c28779b253..868b8bc460 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ValidationEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatum.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatum.cpp
index 76d8836296..b79dd140f8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatum.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatum.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatum.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatum.h
index 7a100a9146..6042c6e45a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatum.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatumBase.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatumBase.cpp
index e844a613a9..d3433a3085 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatumBase.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatumBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatumBase.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatumBase.h
index 09dd552444..464cd10f6e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatumBase.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableDatumBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableHelpers.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableHelpers.cpp
index 3b1e524899..0f55b86ac4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableHelpers.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableHelpers.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableHelpers.h
index 624059b24c..d814909a73 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableHelpers.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Deprecated/VariableHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ErrorBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ErrorBus.h
index 5a28cdffbd..0933bc27dd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ErrorBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ErrorBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h
index 7f54565482..a71b74494c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionContext.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionContext.cpp
index af8a2d5f15..3098f03e6a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionContext.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionContext.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionContext.h
index ed55af7286..ee3c5230c3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionContext.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionObjectCloning.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionObjectCloning.cpp
index 83898cfada..076b098226 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionObjectCloning.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionObjectCloning.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionObjectCloning.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionObjectCloning.h
index ba39d6d4ae..43eb3c7119 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionObjectCloning.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionObjectCloning.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.cpp
index 70ecbe87de..79fb898cc6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.h
index 3225261c25..27eac54326 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.cpp
index fb9ba1afb0..6579d24e21 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.h
index 0cb51b028e..feb10c56eb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionStateDeclarations.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionStateDeclarations.h
index d3ac8ff7b8..f53a8fe6cf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionStateDeclarations.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionStateDeclarations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
index 9730d52289..3d4cb9a939 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
index cf655b64e5..9c11d26afd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.cpp
index 809b3ecfe0..e3fed31528 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.h
index bd83fa5168..4458c3535d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.cpp
index 8dbec712e5..b461119851 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.h
index af48b287e0..e1899deab9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.cpp
index 2698165435..60dbd4c179 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.h
index d30984a97f..81ab1c428c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.cpp
index c400d070e2..1d223f20c0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.h
index b5e8c54235..be6b82de11 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
index 27377157be..d52807e952 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.h
index f785b8933d..7418cec430 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.cpp
index 86e2b6d7fd..7662c8dca9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.h
index 05e07db423..020b4643e4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.cpp
index 20f5a2126e..db8d729e67 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.h
index 5523bddb08..3b5d1e9d05 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.cpp
index e92aeb74fb..499bf1c305 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.h
index 558c9ad7ce..bc46550ce5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.cpp
index ea346a54fd..5c3d11154a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.h
index 323bafb2b2..a376e44d79 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp
index b604daf031..86fe65fd99 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDeclarations.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDeclarations.h
index 5624c85d59..945b6523f7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDeclarations.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDeclarations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp
index bf482eefe7..6c956bdd70 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDefinitions.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDefinitions.h
index f431dee8cc..aa15ab73be 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDefinitions.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NativeHostDefinitions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h
index badb28cd44..2d702363d3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeBus.h
index 7daae7a008..eb3956c4e5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
index 94cb258c95..7533ec3699 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.h
index 3bee2ea592..025c936d28 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
index 37a7ab898c..50abf19389 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h
index c0ef720fbe..a3ddec73bf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/DebugMap.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/DebugMap.cpp
index bbf8256675..e5496d168d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/DebugMap.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/DebugMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/DebugMap.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/DebugMap.h
index 1bfb5e0167..46870e5fc1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/DebugMap.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/DebugMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionIterator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionIterator.h
index 88929aa2e0..b1748c41f8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionIterator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionIterator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
index ca6831c09c..1ac9303082 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h
index ce3e20b1f5..3e9d4e4d14 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.cpp
index ebff7a8b86..5d16bd7f9c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.h
index 54fc1743a8..756537fcc7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/FunctionsLegacySupport.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.cpp
index 7c6131bd60..b8eb5f5ad5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.h
index 345fd1622e..7a9d2eaec9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContextBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContextBus.h
index 5b10f8f64e..1630d0b99e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContextBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Parser.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Parser.h
index 1b68e3ac33..95aa521ae4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Parser.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingMetaData.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingMetaData.cpp
index 1b3fe8db4f..27b8b23e91 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingMetaData.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingMetaData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingMetaData.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingMetaData.h
index f37e5bfe0c..3864fe15e0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingMetaData.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingMetaData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp
index 43d0823b25..9f7473551c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.h
index d264983e03..b443bc7be2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.cpp
index 82d93ac45e..c32595a900 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.h
index 4391899683..a5300d01cf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.cpp
index 9a164cd339..85bb4a0025 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h
index 95c57b3211..a9d838a4fe 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp
index cc6310cca9..0984440bf4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
index c374d2a78f..c86f445a68 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/SymbolNames.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/SymbolNames.h
index 2c9eb27ce8..d5d688f8f0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/SymbolNames.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/SymbolNames.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.cpp
index c90fec5471..0b48790ffd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.h
index 416725e3db..d48da8b7a8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodeables/BaseTimer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp
index 7312195944..598671becb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h
index d87e41934d..ca4306cb6e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp
index 899bc399bf..aef18a9255 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h
index 50713eaae3..4f8949ba4b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.cpp
index f9209bf625..ab095f4b96 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.h
index 55c618af15..396d6de074 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp
index ef9ca98a8c..328d827954 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.h
index 78ae6d5b43..85735ace6e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Comparison.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/ComparisonFunctions.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/ComparisonFunctions.h
index adf7ad4ef6..9e6f48dad6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/ComparisonFunctions.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/ComparisonFunctions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
index 39f769c7b4..8d597884ed 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
index 23cc5e8651..baa4762911 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Greater.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
index 10a410c531..e9f5c06501 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
index 9357a011ab..b16f447d92 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/Less.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
index 09d1a204c2..35364b918f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
index 51aba4da1a..c11ff1ba05 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.cpp
index e76246c04e..39faae9f0a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.h
index aae30a3612..89d164f3d2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Assign.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.cpp
index ea2c3a010e..23ee563ccb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.h
index b732ec81a9..047d1f68b1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/AzEventHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.cpp
index 3b4985aa7a..c4d3b6f302 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h
index 2eaeb09bf8..88680fd0a3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BehaviorContextObjectNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp
index fd40b09715..7b840862bd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
index 1a742793ca..92890b2842 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ContainerTypeReflection.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ContainerTypeReflection.h
index 32d601bd1a..e7ad4848ea 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ContainerTypeReflection.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ContainerTypeReflection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
index 2d70c68b36..f5a9148231 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.h
index 543ed289d9..2551dfb4b1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/CoreNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
index 060540fe76..fb43e41ad8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
index 9e7907378b..5fad1ecec2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp
index 1a59435080..1da9428e8f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.h
index 206b3cf0e9..f9c91ad85b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
index 7342ab68ed..a53eb18cbb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.h
index e2f032851a..3edd8c7d4b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ErrorHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.cpp
index 465730454b..13e8b085cd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h
index af35dd4768..bb61c0fcdb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp
index bb43578714..c97654c1d8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.h
index 582ce7c9da..eb255c8f09 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ExtractProperty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.cpp
index 313f79b242..6584f795b8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.h
index 13d335d64c..daf32d6310 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ForEach.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionBus.h
index d79f368d1c..d1bc75837d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp
index 38e83ddbfc..48958fe994 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
index 92e6863a7b..56b17095a7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.cpp
index 2f0a38574a..ffa183f540 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h
index 355eeb139b..9bc4fb3382 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.cpp
index 63f6071b98..cd242c87c5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h
index 03ea459109..28e30c7f1c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
index 23f1ba373e..c8defb77ec 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.h
index b115ed91a3..e5011de5c6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
index 37ffd8f553..b76c3ce87c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
index 54f04a0196..930b6e8539 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp
index 997bafc0f1..76c393fb9a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h
index 5de7c9c8a7..21bc99c3b5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
index 342aa9cec5..144427d74c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.h
index 53a75a0938..92248d3ac6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.cpp
index 6f38564e31..2e6da5184d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.cpp
@@ -2,7 +2,7 @@
 
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.h
index a8746bc90c..be52c8d3a2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Nodeling.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
index a4b1647fa3..b797174f59 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
index 62af4d4140..e541f428db 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.cpp
index 6c59c4aa0a..3ff8545746 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.h
index 60bf440476..3d094feb78 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Repeater.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.cpp
index f7bd0be080..9a7c2a000c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.h
index 59f2dd1e26..d3b0aeb492 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp
index 789129def6..ac946dc037 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h
index b63885468d..d2ec893b5b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
index 9173a5be18..ee1d00e646 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h
index 465e7a21d8..27cd309386 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
index cf02c3ac50..7096f5024e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.h
index fa238a4dcd..bc97fa6a08 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.cpp
index a84b00caf2..66dfe424c5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.h
index 71725c928f..bc5ca997e8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Start.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h
index 0a8efff422..712d3d808f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/String.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp
index 2cf2197af3..43d84f0e28 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
index 8677dc6b91..d2188f0b3c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
index 3a2594cf34..79a89ab1bf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.h
index 66fa9c531c..0bd54f4194 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Entity.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
index e3c1a1250b..5b60c0cea8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNodes.h
index 2401b2078d..157b01668a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityIDNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityNodes.h
index 078c822f91..927ea59f23 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h
index a031ba4ca4..720205a158 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/EntityRef.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/FindTaggedEntities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/FindTaggedEntities.cpp
index 7357c3743f..7682a412a8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/FindTaggedEntities.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/FindTaggedEntities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.cpp
index 7385ea89e2..b1df21ea52 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.h
index 8321b5305a..cf6c19c417 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/Rotate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/RotateMethod.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/RotateMethod.cpp
index a2434f86ad..1b79c5f2ac 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/RotateMethod.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/RotateMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/RotateMethod.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/RotateMethod.h
index 6ce00e7910..8fc1d910ef 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/RotateMethod.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/RotateMethod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.cpp
index cd60b7565a..4c6d401965 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.h
index 5d5fe27d44..e75191a4f6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Libraries.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
index d0aa78a4a5..fa553036f5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/And.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.cpp
index 2c8dcdd1d7..29fd8a5075 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.h
index ccbb857c48..aca5b2bb51 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Any.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h
index 25cbd60cfb..5a118d9374 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Boolean.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.cpp
index 43935785a5..fbe703ea07 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.h
index c39ff1bcaf..6d0718ff2e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Break.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.cpp
index e9fdf250bd..a5a75e259c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h
index 2d3726d4a1..c275b8031c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.cpp
index 359f529719..3a36a265c2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.h
index 07cc9352c0..0480db1f32 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Gate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.cpp
index 2cb053e6f8..85898ad042 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.h
index 307c39217c..bea41a4e14 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Indexer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.cpp
index d034833aeb..480d51643b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h
index 96357e3561..12f996003c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
index e39660ec4a..8bd587ee4b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.h
index 904f091170..a59a4e4a88 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Logic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.cpp
index a4d2e24322..c8af5ae7a4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
index 84e9799ef3..00a974ab8a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
index e3a4b81982..58e0d747c7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Not.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.cpp
index 28525ad3e5..5bdd1ea9bd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.h
index 82436172a8..e216b7e793 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Once.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
index 94b2764a10..6868dc6e6b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Or.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp
index 2907447838..c7c3834594 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
index 6811bb2e42..f973446702 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
index deecaa050a..75693f994c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.h
index 2cbccdd841..347d21baa2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp
index e1f64eeba8..ec55784a33 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
index c9a5c5143f..7f50fbeb11 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp
index 4d781bcdba..80646e66a1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
index a31569899e..f58f89690d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.cpp
index ecc20365da..25535d3102 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.h
index 5a590e54cd..68a6b9fdfc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/While.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h
index fcaf9c0e82..fb138194c5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNodes.h
index bc7bc23318..de31323328 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/AABBNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.cpp
index e0015700aa..19adcd2777 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.h
index f464c6ff4f..dc0d3fb47f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h
index 5f1273e581..b1824d0e70 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNodes.h
index f11257124d..7b9ca64496 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/CRCNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h
index 09b4ea9aa0..84b9b38b69 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNodes.h
index 81f1e76f75..a4034c1753 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/ColorNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
index d534ca66da..7320fff037 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Divide.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
index b78b767fa0..6fa228c3b9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.h
index 46c68708b1..e9b39c582f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Math.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.cpp
index 6ba2b96ab8..83cf0621fb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.h
index 0881675d16..76d952b92c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathExpression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathGenerics.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathGenerics.h
index 6329b17dd4..1cd73b770c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathGenerics.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathGenerics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp
index e7e945db06..5d652c2919 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
index 4b721c5d71..1d5c18ecdf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathRandom.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathRandom.h
index b2f05987c5..1e304dc898 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathRandom.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/MathRandom.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
index cf0c28e0a2..4417413567 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h
index 0d726e592a..76a5a8dcba 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
index 949f441f27..da7d5983f4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Node.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h
index 0dd2a68960..2f3c9cf1c6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
index 7278cb0240..c0761502c0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Multiply.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h
index 55f185a193..9639f1fce7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Number.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h
index 18df8cee77..24718c82f4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNodes.h
index ee53f5e264..7563be3cec 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/OBBNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h
index f2a98630fd..c429eb1dc3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNodes.h
index 6a88852543..3345b7ca07 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/PlaneNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.cpp
index f9d7318d2e..dba370fa7c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.h
index ed18a39644..a5cc7d1aa9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Random.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h
index 8aca1b338c..9e23a206a1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Rotation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/RotationNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/RotationNodes.h
index 7f73051f77..0f20bcf8c9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/RotationNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/RotationNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
index 522b6e8a76..ecffc724cc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Subtract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
index 33fff3d49e..ed53b66878 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Sum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h
index 742933b929..e4260966a9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Transform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/TransformNodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/TransformNodes.h
index 2167429dee..0f0fdddcac 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/TransformNodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/TransformNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h
index 691c5f0e43..af5054c45e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
index e36ac767d0..a807243f92 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
index a8e942d0e0..a74ae45e67 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
index 9262ac7949..c8ce20fe14 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
index c963dabf22..6b5b2770de 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h
index 4fb8c35e22..e20de1a02b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
index b07008eaad..99607c37f3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h
index 09202d78e5..41c4b2cbc1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp
index 3f2398fe66..36890c9720 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h
index e9ac8a7242..a0ccad1379 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp
index ab8ae5fce7..71ee545397 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h
index 6e8a14fa55..5cc26c126e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
index 355dadda43..15328b42fb 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h
index 27351b5815..dc5d8c4c0c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
index 91aa24f287..794ee8aeb0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h
index 72cb8b8033..cb41f6a479 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
index 17d02d7a43..bce98a6776 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h
index b6afd08390..970c8ab780 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
index 53c8fd6111..e449d04d34 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h
index 7323a45968..695d6a6f93 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp
index afa40ab35f..29c5e61a21 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h
index 4f9d529b5a..3199b09ebd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp
index ffaf49bae3..a82e8f9871 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.h
index d6cb9f6a6e..8c4aa684ce 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp
index 0b603ae311..7d6fb74768 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h
index 6df6c13ae1..716c9111af 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp
index c7bf14f2a7..b50d06e9e9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h
index 2d7e8b6258..61121ff85d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp
index e0776d9ce2..27a8e5f846 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h
index 88cf308c97..10df09a42e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp
index faaf5fb4c3..b52b6d8da2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h
index 3d7d4f03ad..f49c384439 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp
index 43abfcf74c..079073fa64 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h
index ee9e93fc9d..cb54f2f236 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.cpp
index 3a223592f7..c037776ac0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
index 2105c22b80..3807bff5e7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp
index 14dfd6bf7c..6082e768ef 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
index ea325d0294..27b1f85612 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
index b88a054d8b..62d10ba58d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h
index 7ef96fa6c4..e901aa519b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp
index 0b9343560d..1246feb521 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h
index 2292d4ee8d..2797a4fdea 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.cpp
index ec6e094f33..329b8d4c31 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.h
index a5a3ee3916..7401b60d21 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
index e9173cfa88..6a35c246c9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.h
index 292ed0ad85..758871e4fc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Operators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp
index 45a778c0bb..5fd2459520 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
index a7d35b1971..3a913826c2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/Spawning.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/Spawning.cpp
index 27a4a12cee..2966d7d082 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/Spawning.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/Spawning.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/Spawning.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/Spawning.h
index dd6619a426..559248a2f2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/Spawning.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/Spawning.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.cpp
index 2a36ce3aa9..b88b2edbd3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.h
index 19622e4745..e2756f6ebf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Contains.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.cpp
index ac35de60d5..1b71390e0c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.h
index b90158e48b..6e5c50d2ae 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Format.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.cpp
index 00c8d6e678..26f3716b6a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.h
index ac4a903565..0f971f99e7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Print.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.cpp
index 8ccedd51a8..56a7ae2ef8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.h
index 0849475817..6c69818ac9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Replace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.cpp
index 072f4b7685..d0368fb02b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.h
index 05d65947f2..02eb04ae08 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/String.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringGenerics.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringGenerics.h
index 46ba474ae6..e51ed9ed11 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringGenerics.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringGenerics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringMethods.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringMethods.cpp
index dd15d3289e..8fc5d10dc7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringMethods.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringMethods.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringMethods.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringMethods.h
index ac9bc39f2f..657ac6bc93 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringMethods.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/StringMethods.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.cpp
index ba5c37cebd..ad36615e26 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.h
index e9592777d4..c1dad1f0e5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/String/Utilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.cpp
index d47f20ff94..ee06418e68 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.h
index f0dd29da8e..1809bece64 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Countdown.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/CountdownNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/CountdownNodeable.cpp
index c7bcb56a12..fc13a5c259 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/CountdownNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/CountdownNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/CountdownNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/CountdownNodeable.h
index 46bd5e01b6..cdc9071705 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/CountdownNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/CountdownNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DateTime.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DateTime.cpp
index da972d2402..84f9fa7125 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DateTime.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DateTime.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DateTime.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DateTime.h
index b3bb55016d..6e024377f4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DateTime.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DateTime.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.cpp
index 8dd1f699f0..1e40a23794 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.h
index f610cf27cb..260f0dd5f0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.cpp
index dcf6d871d3..c1e47e21b9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.h
index 1ac8eb1000..dd6c7868cf 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Duration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.cpp
index f57de67939..34781bc858 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.h
index ff9e88b9ca..2915232cff 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp
index 321d0bb552..62ed77ab2f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.h
index 00acddfa23..967376e932 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.cpp
index 647c3ff5e6..c2c3c24faa 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.h
index baacc832a0..99dd174bb0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
index 3c35826a56..7a6e5bc859 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.h
index 699fc0e57f..0e79590033 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Time.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.cpp
index a5e5138863..d34c5a2283 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.h
index 141e971cd5..0345144d92 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.cpp
index 3fb894f1ab..0465c49b43 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.h
index c8e4725e24..58ba646891 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/Timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.cpp
index d459d41abb..834b8f3bdc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.h
index 358ead1d1d..2e73dc524c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp
index f61541432f..301db76008 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
index 391a777a07..1c0e5a6fd4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.cpp
index 009e54f975..ee9b8975b0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
index fb82f610e6..c6793ad432 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp
index e594826141..dff5dff30c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h
index 867811084d..94c307e07d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/AuxiliaryGenerics.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/AuxiliaryGenerics.h
index e1d7e86956..816a40c686 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/AuxiliaryGenerics.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/AuxiliaryGenerics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.cpp
index 1a9cfad77e..5b77bea492 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
index 0ede5350d6..551d250b6b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp
index 135ba9fd03..019286355b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h
index 38f3629592..bfb5b4ffb2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp
index 56e4acab4a..77bf80fd73 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h
index d1035fc026..ca18f6f2d5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp
index 92df84b387..28e2f7a8bd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h
index 52574a1d3c..d9d7f8630d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp
index eb282baf60..7b782094de 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h
index d5e0c71487..7ef46a9dc9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp
index 8b3143c7fb..327cfb49b3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h
index 512a6bea55..fb9ca5737c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp
index a80780c1a9..3649816abc 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h
index eca83fbb8a..577aa4f8ff 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp
index e2daeb9880..6b5d3fa98c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h
index 2ea70b5b89..effc011b5a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp
index c4d7884cb5..ae0ec8a168 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
index b5f2fd85b9..6d94dc7403 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.cpp
index 469dbd67f7..e7613695e8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
index 89680b661e..9f86fe5b28 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.cpp
index 81ab59d491..dfbacbf1d6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h
index 6c8b1da605..6f3e9babb8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusMacros.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusMacros.h
index db446f52a3..0de3e49a82 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusMacros.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusMacros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp
index 526e1f1caf..20eb061e1a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.h
index debd4c1310..62d48519da 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSenderMacros.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSenderMacros.h
index 2b58fbf031..d4c99edd03 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSenderMacros.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSenderMacros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.cpp
index 4f1b047a27..a754ff087c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.h
index 432295307d..921571bafa 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp
index e05def4e55..d4cc228acd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.h
index 440995b2b0..3d142fabb5 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceStatistician.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceStatistician.h
index cb3a00b3fa..d5191ee150 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceStatistician.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceStatistician.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceStatisticsBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceStatisticsBus.h
index 3482fa14c7..3f00678d04 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceStatisticsBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceStatisticsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceTracker.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceTracker.h
index 961e2d69a8..a815e62c7b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceTracker.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/PerformanceTracker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.cpp
index 94b221ea1b..32ff07d9f0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.h
index fd82357af6..dd94ef694f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp
index f24fa04194..f6812351d0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.h
index 2ad1c26dcc..26eae84481 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.cpp
index 94b221ea1b..32ff07d9f0 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.h
index 7d873954c5..b5c1e1467c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h
index 98bbfa249c..339c0fc3a1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/ScriptCanvasGem.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/ScriptCanvasGem.h
index e0ff1e0163..90213fd8d2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/ScriptCanvasGem.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/ScriptCanvasGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/SystemComponent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/SystemComponent.h
index c5719813c2..466de99d46 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/SystemComponent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/SystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/AbstractModelTranslator.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/AbstractModelTranslator.h
index 78569d9bcf..34975370a3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/AbstractModelTranslator.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/AbstractModelTranslator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Configuration.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Configuration.h
index cb1160be6a..3469fec2ed 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Configuration.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Configuration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp
index c746aae377..ea33f1639e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.h
index bc81ac604d..0515a35f47 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
index f40ced4569..772fda4f7e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
index 48fce8bdcb..ba46b21c65 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp
index 2573826b27..2b762db176 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.h
index 336ed60269..d01025cdfd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToX.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToX.cpp
index f95ed75be8..8a424a1d7b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToX.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToX.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToX.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToX.h
index 924ba9e7cc..d15d8fea9c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToX.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToX.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Translation.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Translation.cpp
index 96cf4c4ce0..e735469538 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Translation.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Translation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Translation.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Translation.h
index 4c59b46280..b25526f04a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Translation.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/Translation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.cpp
index f755aa9fb5..2ef3aa7501 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h
index 94ded03f84..ea49f90bde 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContextBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContextBus.h
index 8a86589c43..0edac2afe3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContextBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContextBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationResult.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationResult.cpp
index 2bd39ee8df..289f066ddd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationResult.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationResult.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationResult.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationResult.h
index 951518de72..e822fd244a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationResult.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationResult.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.cpp
index d2e3a8378f..0318959e0e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -169,7 +169,7 @@ namespace ScriptCanvas
         AZStd::string_view GetAmazonCopyright()
         {
             return
-                "* Copyright (c) Contributors to the Open 3D Engine Project\n"
+                "* 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.\n"
                 "*\n"
                 "* SPDX-License-Identifier: Apache-2.0 OR MIT\n"
                 "*"
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.h
index 9e2b9090dd..429cd653f1 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/BehaviorContextUtils.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/BehaviorContextUtils.cpp
index 2662dfed31..a5839c8df4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/BehaviorContextUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/BehaviorContextUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/BehaviorContextUtils.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/BehaviorContextUtils.h
index 398bccecfe..65201d7b47 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/BehaviorContextUtils.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/BehaviorContextUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/DataUtils.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/DataUtils.cpp
index dc60dea0d0..4d831df4ef 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/DataUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/DataUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/DataUtils.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/DataUtils.h
index 2d4e5ee645..f639f21694 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/DataUtils.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/DataUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.cpp
index 487cfec4a2..164255fba9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.h
index f5e951033a..fbdee32d73 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/SerializationUtils.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/SerializationUtils.h
index c4a2a8a0ea..96d662bfda 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/SerializationUtils.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/SerializationUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersionConverters.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersionConverters.cpp
index ea78e51722..b03cf54590 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersionConverters.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersionConverters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersionConverters.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersionConverters.h
index d81f2482e5..b11583cbd3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersionConverters.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersionConverters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersioningUtils.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersioningUtils.cpp
index 43a48369f8..a552b1cd03 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersioningUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersioningUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersioningUtils.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersioningUtils.h
index 5e1a6d98af..66f5a29835 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersioningUtils.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/VersioningUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp
index 43ad3c43f2..3f93153c1f 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h
index b4ec135340..b6ad7fcf30 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.cpp
index 43a771d122..28e6060d5b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.h
index 0320d9ca36..955f403733 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableBus.h
index 4ae782df56..a8dc25ca83 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableBus.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableCore.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableCore.cpp
index 33d1e55696..15188fde82 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableCore.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableCore.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableCore.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableCore.h
index 520a5deed3..63b76e0357 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableCore.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableCore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.cpp
index 8fffc98f03..68262aff0a 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.h
index dafc85cc1d..29e026d414 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Source/PerformanceStatistician.cpp b/Gems/ScriptCanvas/Code/Source/PerformanceStatistician.cpp
index 118f37e16e..0d3a4f5a21 100644
--- a/Gems/ScriptCanvas/Code/Source/PerformanceStatistician.cpp
+++ b/Gems/ScriptCanvas/Code/Source/PerformanceStatistician.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Source/PerformanceTracker.cpp b/Gems/ScriptCanvas/Code/Source/PerformanceTracker.cpp
index 5f2861d82d..4a27c940c9 100644
--- a/Gems/ScriptCanvas/Code/Source/PerformanceTracker.cpp
+++ b/Gems/ScriptCanvas/Code/Source/PerformanceTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Source/ScriptCanvasCommonGem.cpp b/Gems/ScriptCanvas/Code/Source/ScriptCanvasCommonGem.cpp
index 575af0fe18..1c614dc5bc 100644
--- a/Gems/ScriptCanvas/Code/Source/ScriptCanvasCommonGem.cpp
+++ b/Gems/ScriptCanvas/Code/Source/ScriptCanvasCommonGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Source/ScriptCanvasGem.cpp b/Gems/ScriptCanvas/Code/Source/ScriptCanvasGem.cpp
index 1c6cc9cafc..c0bf635efc 100644
--- a/Gems/ScriptCanvas/Code/Source/ScriptCanvasGem.cpp
+++ b/Gems/ScriptCanvas/Code/Source/ScriptCanvasGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp b/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp
index 2ba32fb5c9..eeb0d25289 100644
--- a/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Source/precompiled.h b/Gems/ScriptCanvas/Code/Source/precompiled.h
index 3bdeac7835..8e9334e7ef 100644
--- a/Gems/ScriptCanvas/Code/Source/precompiled.h
+++ b/Gems/ScriptCanvas/Code/Source/precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/Framework/ScriptCanvasUnitTestFixture.h b/Gems/ScriptCanvas/Code/Tests/Framework/ScriptCanvasUnitTestFixture.h
index a2ea6d8a1c..1f00788694 100644
--- a/Gems/ScriptCanvas/Code/Tests/Framework/ScriptCanvasUnitTestFixture.h
+++ b/Gems/ScriptCanvas/Code/Tests/Framework/ScriptCanvasUnitTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/Mocks/BehaviorMethodMock.h b/Gems/ScriptCanvas/Code/Tests/Mocks/BehaviorMethodMock.h
index 669009706d..a51ade534d 100644
--- a/Gems/ScriptCanvas/Code/Tests/Mocks/BehaviorMethodMock.h
+++ b/Gems/ScriptCanvas/Code/Tests/Mocks/BehaviorMethodMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/Mocks/RuntimeRequestsMock.h b/Gems/ScriptCanvas/Code/Tests/Mocks/RuntimeRequestsMock.h
index 6240cd021f..ccd5be2705 100644
--- a/Gems/ScriptCanvas/Code/Tests/Mocks/RuntimeRequestsMock.h
+++ b/Gems/ScriptCanvas/Code/Tests/Mocks/RuntimeRequestsMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
index 41fbcdeedb..0664e034e0 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasTest.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasTest.cpp
index 907ebf0e25..2bd51b1751 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasTest.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasTestApplication.h b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasTestApplication.h
index aa1bccf2c3..b312663f16 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasTestApplication.h
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasTestApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTestHook.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTestHook.cpp
index 5acbd5cb12..d0384e7f23 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTestHook.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTestHook.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_AbstractCodeModel.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_AbstractCodeModel.cpp
index 5177918433..8897218f7a 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_AbstractCodeModel.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_AbstractCodeModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp
index 7f642eac72..ae5fc8582d 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_EventHandlerTranslationUtility.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_EventHandlerTranslationUtility.cpp
index 1bae9d1a04..8d37b2889d 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_EventHandlerTranslationUtility.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_EventHandlerTranslationUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Method.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Method.cpp
index 84407fa7d9..8cfdc43003 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Method.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Method.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Node.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Node.cpp
index aa85976b83..97042a8c99 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Node.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp
index 7e926dcf9b..4fdb709e27 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
index aef1803e25..d1d7606b4f 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_debugger_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_debugger_files.cmake
index b5579a9c23..bde041be2b 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_debugger_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_debugger_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_asset_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_asset_files.cmake
index b70f08b161..0474e6b8e6 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_asset_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_asset_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_builder_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_builder_files.cmake
index a3bb843473..c8a8d43a64 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_builder_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_builder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
index ff437eec19..daa2a599ce 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake
index 3378655188..95430a69c8 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_static_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_static_files.cmake
index 049f3eb137..9072f83577 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_static_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_static_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_tests_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_tests_files.cmake
index a2a1debff4..1d04a8a876 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_tests_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake
index eb3cfceb64..299209436f 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_runtime_asset_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_runtime_asset_files.cmake
index e4e3061c13..2d19f44765 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_runtime_asset_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_runtime_asset_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake
index e997591536..7d20226e9c 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasDeveloper/CMakeLists.txt b/Gems/ScriptCanvasDeveloper/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/ScriptCanvasDeveloper/CMakeLists.txt
+++ b/Gems/ScriptCanvasDeveloper/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasDeveloper/Code/CMakeLists.txt b/Gems/ScriptCanvasDeveloper/Code/CMakeLists.txt
index d57b3f200a..917a75e58b 100644
--- a/Gems/ScriptCanvasDeveloper/Code/CMakeLists.txt
+++ b/Gems/ScriptCanvasDeveloper/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/DynamicSlotFullCreation.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/DynamicSlotFullCreation.h
index a712781c90..7a6e5686ff 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/DynamicSlotFullCreation.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/DynamicSlotFullCreation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/FullyConnectedNodePaletteCreation.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/FullyConnectedNodePaletteCreation.h
index b1f3b5d4ba..9c708b11b7 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/FullyConnectedNodePaletteCreation.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/FullyConnectedNodePaletteCreation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/NodePaletteFullCreation.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/NodePaletteFullCreation.h
index eea5f31b19..00a799aee6 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/NodePaletteFullCreation.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/NodePaletteFullCreation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/VariableListFullCreation.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/VariableListFullCreation.h
index 246cfd0f0a..aa6380f54e 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/VariableListFullCreation.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/AutomationActions/VariableListFullCreation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/Developer.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/Developer.h
index 4e82f8b44e..6cf7dcb54d 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/Developer.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/Developer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/DeveloperUtils.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/DeveloperUtils.h
index 6a80afcd38..dbd7e116bd 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/DeveloperUtils.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/DeveloperUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationAction.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationAction.h
index f966c2c4b0..4f62073df8 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationAction.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/EditorKeyActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/EditorKeyActions.h
index 1b9983c9b3..c874f1731d 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/EditorKeyActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/EditorKeyActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/EditorMouseActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/EditorMouseActions.h
index 2800f9c067..8f6ed71c7c 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/EditorMouseActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/EditorMouseActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/GenericActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/GenericActions.h
index 2856accb0f..f0145b4367 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/GenericActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/GenericActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.h
index ef69756a75..2d1e8dcb67 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.h
index 49e03c22cc..bd953be839 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.h
index db9ca4d315..4418e1d32e 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.h
index a4df309102..144eb44f53 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.h
index 2e6d77d6ac..e77c585fd2 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.h
index 68db3a8391..edb7c1bc14 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/WidgetActions.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/WidgetActions.h
index b38737b1ea..3dca3a8ab8 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/WidgetActions.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationActions/WidgetActions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationModelIds.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationModelIds.h
index cef310dd2a..760b6a7455 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationModelIds.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationModelIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/ConnectionStates.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/ConnectionStates.h
index 7c3b29829f..e3fd15f27a 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/ConnectionStates.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/ConnectionStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/CreateElementsStates.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/CreateElementsStates.h
index fb0e6857a3..6bc498dd08 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/CreateElementsStates.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/CreateElementsStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/EditorViewStates.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/EditorViewStates.h
index a228f7893e..275f3f6dbc 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/EditorViewStates.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/EditorViewStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/ElementInteractionStates.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/ElementInteractionStates.h
index 2c746b720c..6270fc2212 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/ElementInteractionStates.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/ElementInteractionStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/GraphStates.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/GraphStates.h
index 7dac81efd5..081ada80c7 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/GraphStates.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/GraphStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/UtilityStates.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/UtilityStates.h
index c4d60fdff0..9b37b668c7 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/UtilityStates.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/UtilityStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/VariableStates.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/VariableStates.h
index d3aa8e7f7e..da4f56827c 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/VariableStates.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/VariableStates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationTest.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationTest.h
index c7e1c53fed..30b13fca15 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationTest.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/Mock.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/Mock.h
index 443401e748..8e0eb963d6 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/Mock.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/Mock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/MockBus.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/MockBus.h
index 8336943b82..180323ac84 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/MockBus.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/MockBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/NodeListDumpAction.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/NodeListDumpAction.h
index 7c516a41bb..a1543d627b 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/NodeListDumpAction.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/NodeListDumpAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/ScriptCanvasDeveloperEditorComponent.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/ScriptCanvasDeveloperEditorComponent.h
index 35dd805ea5..bb3c4d6e71 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/ScriptCanvasDeveloperEditorComponent.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/ScriptCanvasDeveloperEditorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/TSGenerateAction.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/TSGenerateAction.h
index e6288609d9..e71fb7bb7e 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/TSGenerateAction.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/TSGenerateAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/WrapperMock.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/WrapperMock.h
index a5e96b1898..0ea2d75547 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/WrapperMock.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/WrapperMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp
index 6f69f976a5..ed4bd76aa9 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/FullyConnectedNodePaletteCreation.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/FullyConnectedNodePaletteCreation.cpp
index 3b2d30f8e3..3f400cfa96 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/FullyConnectedNodePaletteCreation.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/FullyConnectedNodePaletteCreation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp
index 9c9da7bd83..1dc843dcd4 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp
index bf5346480b..6f698d8af2 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp
index c639ae1989..29cef2b2c3 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/DeveloperUtils.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/DeveloperUtils.cpp
index 5cc50ada45..b3a8b08549 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/DeveloperUtils.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/DeveloperUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp
index 8037e2fc05..cb3a356008 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp
index d30a08f3fa..b5753c06c4 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/GenericActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/GenericActions.cpp
index 35d3305079..b341fe2ec4 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/GenericActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/GenericActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.cpp
index 39cf302b56..302138491e 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.cpp
index e5f526d290..01997982f8 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.cpp
index 68972365bf..ed3cf05b5d 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp
index 52894a5194..4db4d6c827 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp
index da02cc3257..f016dd0a8d 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp
index e67bfca796..451c8ada44 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp
index 140a596e13..017dc8b950 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ConnectionStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ConnectionStates.cpp
index dd22b19701..df46cf1b07 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ConnectionStates.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ConnectionStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp
index 771ed589de..16d0bc3707 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/EditorViewStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/EditorViewStates.cpp
index 28ec904e80..86afe4564e 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/EditorViewStates.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/EditorViewStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ElementInteractionStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ElementInteractionStates.cpp
index efacc8b514..d3ecfebddc 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ElementInteractionStates.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ElementInteractionStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/GraphStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/GraphStates.cpp
index 54123180cd..3e24f04a0f 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/GraphStates.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/GraphStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp
index b509aafbd3..e7b4b829d3 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/VariableStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/VariableStates.cpp
index aa833e83af..a1d3513dde 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/VariableStates.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/VariableStates.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationTest.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationTest.cpp
index c3e6320b1f..d3f7f07f3c 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationTest.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp
index edbffdfeaf..35c31f9f83 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.h
index f4c9f91eb5..157eb8d884 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/EditorAutomationTests.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/EditorAutomationTests.h
index 037069e5b3..82ec47508f 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/EditorAutomationTests.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/EditorAutomationTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp
index 2d6c5a4dab..bc372a4f50 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.h
index b05134ffe9..b5055e5069 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp
index d601c357b7..b1a41a94fc 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.h
index 04c36aeacc..2781f46990 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.cpp
index c476560a94..8e69ade668 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.h
index 5355020ba7..9132fae394 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.cpp
index ea62057c4a..a9aaaac591 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.h
index 9c74fa994a..a4cc184ae7 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp
index 787f755484..b1fa4849bf 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.h
index 9106b61486..6d486b2bd4 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Mock.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Mock.cpp
index 259621aad4..9ecbbc8995 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Mock.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Mock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/NodeListDumpAction.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/NodeListDumpAction.cpp
index d6e9890e03..5a395a8732 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/NodeListDumpAction.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/NodeListDumpAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperEditorComponent.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperEditorComponent.cpp
index ef58ca97a9..62ec2b0973 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperEditorComponent.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperEditorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperGem.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperGem.cpp
index beedbc4286..7bebe48fdf 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperGem.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp
index c40c10e6ef..483778e94a 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp
index 54e8ca1e52..cb3d5fbdd9 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.cpp
index 68fd813294..047df73df1 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.h
index 096e7d12b7..b8c2d068f5 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Game/Source/ScriptCanvasDeveloperGem.cpp b/Gems/ScriptCanvasDeveloper/Code/Game/Source/ScriptCanvasDeveloperGem.cpp
index e3a4fc0f37..2b20b7766c 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Game/Source/ScriptCanvasDeveloperGem.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Game/Source/ScriptCanvasDeveloperGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperComponent.h b/Gems/ScriptCanvasDeveloper/Code/Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperComponent.h
index c81f922d90..bb241e0144 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperComponent.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperGem.h b/Gems/ScriptCanvasDeveloper/Code/Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperGem.h
index caae07255f..1ab1bd41ed 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperGem.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Source/ScriptCanvasDeveloperComponent.cpp b/Gems/ScriptCanvasDeveloper/Code/Source/ScriptCanvasDeveloperComponent.cpp
index 28c5580657..a79521e42a 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Source/ScriptCanvasDeveloperComponent.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Source/ScriptCanvasDeveloperComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h b/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
index c4ea73dfdd..2968ab652a 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
+++ b/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/Tests/ScriptCanvasDeveloperTest.cpp b/Gems/ScriptCanvasDeveloper/Code/Tests/ScriptCanvasDeveloperTest.cpp
index 17ee03e1a6..ba7caec391 100644
--- a/Gems/ScriptCanvasDeveloper/Code/Tests/ScriptCanvasDeveloperTest.cpp
+++ b/Gems/ScriptCanvasDeveloper/Code/Tests/ScriptCanvasDeveloperTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake
index 117cab93ef..abe33739a8 100644
--- a/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake
+++ b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_editor_files.cmake b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_editor_files.cmake
index 8147d6be61..e2495cea95 100644
--- a/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_editor_files.cmake
+++ b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_game_files.cmake b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_game_files.cmake
index d684831f16..4e63b45622 100644
--- a/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_game_files.cmake
+++ b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_game_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasPhysics/CMakeLists.txt b/Gems/ScriptCanvasPhysics/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/ScriptCanvasPhysics/CMakeLists.txt
+++ b/Gems/ScriptCanvasPhysics/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt b/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
index 6d504e1944..ba2b1e9c1e 100644
--- a/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
+++ b/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.cpp b/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.cpp
index d6a1584da6..7864ad97b4 100644
--- a/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.cpp
+++ b/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.h b/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.h
index 604b4b103c..5b4f562705 100644
--- a/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.h
+++ b/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsModule.cpp b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsModule.cpp
index bcff2ba217..94a28fb3a8 100644
--- a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsModule.cpp
+++ b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.cpp b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.cpp
index b69d01f798..dd76ae0925 100644
--- a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.cpp
+++ b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.h b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.h
index 19b2a6991a..8268540959 100644
--- a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.h
+++ b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
index 8d99a0243c..eefa26c318 100644
--- a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
+++ b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasPhysics/Code/Source/WorldNodes.h b/Gems/ScriptCanvasPhysics/Code/Source/WorldNodes.h
index 780ed3f572..2f5351a1f6 100644
--- a/Gems/ScriptCanvasPhysics/Code/Source/WorldNodes.h
+++ b/Gems/ScriptCanvasPhysics/Code/Source/WorldNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp b/Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp
index 784efb374e..6bc7b5fd42 100644
--- a/Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp
+++ b/Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake
index 54b87ca1f0..04d5da2c30 100644
--- a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake
+++ b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake
index 55bb87c38a..ca64d4d804 100644
--- a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake
+++ b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_tests_files.cmake b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_tests_files.cmake
index b3ce6fa46b..c671eea404 100644
--- a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_tests_files.cmake
+++ b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/CMakeLists.txt b/Gems/ScriptCanvasTesting/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/ScriptCanvasTesting/CMakeLists.txt
+++ b/Gems/ScriptCanvasTesting/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/CMakeLists.txt b/Gems/ScriptCanvasTesting/Code/CMakeLists.txt
index 1f90636a78..83a3456a1c 100644
--- a/Gems/ScriptCanvasTesting/Code/CMakeLists.txt
+++ b/Gems/ScriptCanvasTesting/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/Platform/Common/Clang/scriptcanvastesting_editor_tests_clang.cmake b/Gems/ScriptCanvasTesting/Code/Platform/Common/Clang/scriptcanvastesting_editor_tests_clang.cmake
index 30503258bc..1fe051b062 100644
--- a/Gems/ScriptCanvasTesting/Code/Platform/Common/Clang/scriptcanvastesting_editor_tests_clang.cmake
+++ b/Gems/ScriptCanvasTesting/Code/Platform/Common/Clang/scriptcanvastesting_editor_tests_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/Platform/Common/MSVC/scriptcanvastesting_editor_tests_msvc.cmake b/Gems/ScriptCanvasTesting/Code/Platform/Common/MSVC/scriptcanvastesting_editor_tests_msvc.cmake
index ebad2b0255..95d699cd27 100644
--- a/Gems/ScriptCanvasTesting/Code/Platform/Common/MSVC/scriptcanvastesting_editor_tests_msvc.cmake
+++ b/Gems/ScriptCanvasTesting/Code/Platform/Common/MSVC/scriptcanvastesting_editor_tests_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/Source/Framework/EntityRefTests.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/EntityRefTests.h
index 7b439f59a2..88cefccca9 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/EntityRefTests.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/EntityRefTests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestApplication.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestApplication.h
index 8bd868d6f8..c1eb78805d 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestApplication.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.cpp b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.cpp
index 428ec4562e..67dadc58ba 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
index c1bc0dc4bf..0a4408b689 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
index ab3de535fb..cf866d9f83 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.h
index e7af3992fa..8963cb4708 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp
index bd06b245e1..8f769aefa4 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h
index dc7b12ba6b..e1879f6038 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestVerify.cpp b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestVerify.cpp
index a430ee1a31..159f5891d0 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestVerify.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestVerify.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestVerify.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestVerify.h
index 360eaf99e8..51c788f3cf 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestVerify.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestVerify.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.cpp b/Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.cpp
index 1cc0263685..11016117d8 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.h
index 406859178b..dc176fca5f 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Nodes/BehaviorContextObjectTestNode.h b/Gems/ScriptCanvasTesting/Code/Source/Nodes/BehaviorContextObjectTestNode.h
index a6ce693ddd..e4d35c64da 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/BehaviorContextObjectTestNode.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/BehaviorContextObjectTestNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.cpp b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.cpp
index c9a81b6ba8..3f0cbe2088 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.h b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.h
index 1d4e146954..2b4dd73d62 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/NodeableTestingLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.cpp b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.cpp
index ac102e134e..6527e3d1d5 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.h b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.h
index 6664240523..c3bc487c89 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/SharedDataSlotExample.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.cpp b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.cpp
index 3010fa6163..259e04b4e1 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.h b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.h
index 55205647a6..616cceb5d3 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
index f526530978..9e25579197 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.h b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.h
index d22bbe68e8..19f2617d52 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingEditorModule.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingEditorModule.cpp
index 4834b84d33..a2eae9bd7c 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingEditorModule.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingEditorModule.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingModule.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingModule.cpp
index 3f98e44b6a..21924896ff 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingModule.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingModule.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.cpp
index aefe672ff6..46967852de 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.h b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.h
index 9cae496b7e..61bb83607e 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvasTestingTest.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvasTestingTest.cpp
index d2d97956b9..e92f8c4d9c 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvasTestingTest.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvasTestingTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Async.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Async.cpp
index 1be7006273..e50914c0a6 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Async.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Async.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_BehaviorContext.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_BehaviorContext.cpp
index 030251079c..be0f57665a 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_BehaviorContext.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_BehaviorContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_ContainerSupport.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_ContainerSupport.cpp
index e159ebc0b1..9452ddebe2 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_ContainerSupport.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_ContainerSupport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
index d5cbf0b500..b365a939e8 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_EventHandlers.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_EventHandlers.cpp
index 4fcbfbc516..ea55e883cc 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_EventHandlers.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_EventHandlers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Math.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Math.cpp
index e1592548d2..65236a7c92 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Math.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Math.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_MethodOverload.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_MethodOverload.cpp
index 0b7a4281c4..b45a4fdc3c 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_MethodOverload.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_MethodOverload.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_NodeGenerics.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_NodeGenerics.cpp
index ec804f5afc..a1e48a4637 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_NodeGenerics.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_NodeGenerics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Regressions.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Regressions.cpp
index 00cc06cc2c..8152ed9987 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Regressions.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Regressions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
index 434c6b87b7..e7657cff65 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Slots.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Slots.cpp
index 10d266d832..84a34dcf32 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Slots.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Slots.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_StringNodes.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_StringNodes.cpp
index 4baeeb5b8c..2106268f13 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_StringNodes.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_StringNodes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_UnitTesting.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_UnitTesting.cpp
index b6daf0843b..2b4e7b8710 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_UnitTesting.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_UnitTesting.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp
index 3011247ef6..0733101743 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Variables.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Variables.cpp
index c2d8707a84..e7aaa33076 100644
--- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Variables.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Variables.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_autogen_files.cmake b/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_autogen_files.cmake
index 6abefe0129..109a528b68 100644
--- a/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_autogen_files.cmake
+++ b/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_autogen_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_files.cmake b/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_files.cmake
index fd65c21daa..fa39346147 100644
--- a/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_files.cmake
+++ b/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_shared_files.cmake b/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_shared_files.cmake
index 1431f10ade..afe9d6e5b7 100644
--- a/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_shared_files.cmake
+++ b/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_tests_files.cmake b/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_tests_files.cmake
index 768b1fa721..ea5912045e 100644
--- a/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_tests_files.cmake
+++ b/Gems/ScriptCanvasTesting/Code/scriptcanvastesting_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_files.cmake b/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_files.cmake
index 62b3b076b0..35e5b4cb4c 100644
--- a/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_files.cmake
+++ b/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_shared_files.cmake b/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_shared_files.cmake
index a4466a9d7c..856acfb801 100644
--- a/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_shared_files.cmake
+++ b/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_tests_files.cmake b/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_tests_files.cmake
index e0706a515d..681a3c0ba1 100644
--- a/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_tests_files.cmake
+++ b/Gems/ScriptCanvasTesting/Code/scriptcanvastestingeditor_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptEvents/Assets/Scripts/Example/ScriptEvents_Addressable.lua b/Gems/ScriptEvents/Assets/Scripts/Example/ScriptEvents_Addressable.lua
index ff769fdf98..89efd37320 100644
--- a/Gems/ScriptEvents/Assets/Scripts/Example/ScriptEvents_Addressable.lua
+++ b/Gems/ScriptEvents/Assets/Scripts/Example/ScriptEvents_Addressable.lua
@@ -1,6 +1,6 @@
 -- 
 -- 
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/ScriptEvents/Assets/Scripts/Example/ScriptEvents_Broadcast.lua b/Gems/ScriptEvents/Assets/Scripts/Example/ScriptEvents_Broadcast.lua
index cb8194eb10..b92ebee944 100644
--- a/Gems/ScriptEvents/Assets/Scripts/Example/ScriptEvents_Broadcast.lua
+++ b/Gems/ScriptEvents/Assets/Scripts/Example/ScriptEvents_Broadcast.lua
@@ -1,6 +1,6 @@
 -- 
 -- 
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/ScriptEvents/CMakeLists.txt b/Gems/ScriptEvents/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/ScriptEvents/CMakeLists.txt
+++ b/Gems/ScriptEvents/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptEvents/Code/Builder/BuilderSystemComponent.h b/Gems/ScriptEvents/Code/Builder/BuilderSystemComponent.h
index 38097a8ede..2308240d38 100644
--- a/Gems/ScriptEvents/Code/Builder/BuilderSystemComponent.h
+++ b/Gems/ScriptEvents/Code/Builder/BuilderSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.cpp b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.cpp
index c80c01364d..bf4e9ad3d1 100644
--- a/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.cpp
+++ b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.h b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.h
index 22b74983a4..b398229023 100644
--- a/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.h
+++ b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp
index ce4916cf3a..2357fb38a5 100644
--- a/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp
+++ b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.h b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.h
index 941c3972e5..baf1a25d9d 100644
--- a/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.h
+++ b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/CMakeLists.txt b/Gems/ScriptEvents/Code/CMakeLists.txt
index 92615ed047..a67b3bf256 100644
--- a/Gems/ScriptEvents/Code/CMakeLists.txt
+++ b/Gems/ScriptEvents/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp
index 592e047a65..79d9fdd3c5 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h
index 109556e535..1332b203dd 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/BehaviorContextFactoryMethods.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/BehaviorContextFactoryMethods.h
index d802b48cfc..bef9bb287f 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/BehaviorContextFactoryMethods.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/BehaviorContextFactoryMethods.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.cpp
index 47e8bd4f57..3896372564 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.h
index 012cd906be..88628a57b9 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp
index 2f474ccd9c..3d78a481e5 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.h
index d6f11e4693..91c55928ae 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp
index ffcb55808b..06b42f4966 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.h
index 2f565911ec..9ce2dd44ab 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp
index 9ab5e0bc6c..5caf4bbb91 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.h
index a1a69c1a94..6a553205fb 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventsBindingBus.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventsBindingBus.h
index d074611b93..4813559e98 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventsBindingBus.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventsBindingBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.cpp
index 47658fe045..aaaa500123 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.h
index 1b52be776a..2c0a174164 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.cpp
index b98e2ab7f0..c35737aaca 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.h
index 7dd416c9fd..5d0f7c2cb4 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.cpp
index 676d03cf7a..75f3056124 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.h
index ea0923bbbd..3b42eb42cc 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventFundamentalTypes.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventFundamentalTypes.h
index 598c61d09f..5964dbc45a 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventFundamentalTypes.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventFundamentalTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventMethod.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventMethod.h
index 779f361324..4700411723 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventMethod.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventMethod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventParameter.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventParameter.h
index 1ab3b3eed8..3176cd591a 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventParameter.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.cpp
index ce4512731f..13944ade9f 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.h
index 853706648b..8fda6e8e73 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.cpp
index 7cde849ba0..c88def3484 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.h
index 86a7d62a65..d67fe3f7e1 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventTypes.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventTypes.cpp
index 90fae2f7d0..df315cd82a 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventTypes.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventTypes.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventTypes.h
index b98b7fe0e2..1d5f5d774c 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventTypes.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.cpp
index d0d5082ec8..673d694f2c 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.cpp
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.h
index 80008cb736..cfa8253923 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAssetRef.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAssetRef.h
index 1eb7f45bed..bfd468e033 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAssetRef.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAssetRef.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsBus.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsBus.h
index e91241d804..987c912db6 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsBus.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsGem.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsGem.h
index ad65e5d12f..b74ab4fa2b 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsGem.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsGem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsLegacyDefinitions.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsLegacyDefinitions.h
index 4c32b2a8bb..8f02edd9ef 100644
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsLegacyDefinitions.h
+++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsLegacyDefinitions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp
index f5a4d94b2b..b9ff71caae 100644
--- a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp
+++ b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp
index d400233b1c..bc71146bfa 100644
--- a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp
+++ b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.h b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.h
index ab486cfd5c..faa4697f87 100644
--- a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.h
+++ b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp b/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp
index 2ed1017748..936867f4ff 100644
--- a/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp
+++ b/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp b/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp
index 4236ff819b..110de7e4ef 100644
--- a/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp
+++ b/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.h b/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.h
index 63c5c3ad50..0c19d9c9a3 100644
--- a/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.h
+++ b/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Source/precompiled.h b/Gems/ScriptEvents/Code/Source/precompiled.h
index 553ef40d29..3dec2dda4a 100644
--- a/Gems/ScriptEvents/Code/Source/precompiled.h
+++ b/Gems/ScriptEvents/Code/Source/precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp b/Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
index c692819633..c87383e224 100644
--- a/Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
+++ b/Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.cpp b/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.cpp
index 2401a9e341..63ce7ee2e8 100644
--- a/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.cpp
+++ b/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.h b/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.h
index 5f455105eb..82c5fbc0f0 100644
--- a/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.h
+++ b/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Tests/ScriptEventsTest.cpp b/Gems/ScriptEvents/Code/Tests/ScriptEventsTest.cpp
index ea38b5f872..cba1fd92ed 100644
--- a/Gems/ScriptEvents/Code/Tests/ScriptEventsTest.cpp
+++ b/Gems/ScriptEvents/Code/Tests/ScriptEventsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Tests/ScriptEventsTestApplication.h b/Gems/ScriptEvents/Code/Tests/ScriptEventsTestApplication.h
index 9d0346851e..b15f817716 100644
--- a/Gems/ScriptEvents/Code/Tests/ScriptEventsTestApplication.h
+++ b/Gems/ScriptEvents/Code/Tests/ScriptEventsTestApplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.cpp b/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.cpp
index 1b63d8c655..e9fce056c3 100644
--- a/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.cpp
+++ b/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.h b/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.h
index 42820ad448..e36f1a906b 100644
--- a/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.h
+++ b/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp b/Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp
index 635094991d..0e985729c3 100644
--- a/Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp
+++ b/Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptEvents/Code/scriptevents_common_files.cmake b/Gems/ScriptEvents/Code/scriptevents_common_files.cmake
index f0cdb82320..194224755b 100644
--- a/Gems/ScriptEvents/Code/scriptevents_common_files.cmake
+++ b/Gems/ScriptEvents/Code/scriptevents_common_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptEvents/Code/scriptevents_editor_builder_files.cmake b/Gems/ScriptEvents/Code/scriptevents_editor_builder_files.cmake
index a69be3dee3..203d17962d 100644
--- a/Gems/ScriptEvents/Code/scriptevents_editor_builder_files.cmake
+++ b/Gems/ScriptEvents/Code/scriptevents_editor_builder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake b/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake
index 54d8ef6254..73eab21ecb 100644
--- a/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake
+++ b/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptEvents/Code/scriptevents_files.cmake b/Gems/ScriptEvents/Code/scriptevents_files.cmake
index b2ec8f8d10..18df26eae4 100644
--- a/Gems/ScriptEvents/Code/scriptevents_files.cmake
+++ b/Gems/ScriptEvents/Code/scriptevents_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptEvents/Code/scriptevents_tests_files.cmake b/Gems/ScriptEvents/Code/scriptevents_tests_files.cmake
index 6f28cc1f53..242ffcec2e 100644
--- a/Gems/ScriptEvents/Code/scriptevents_tests_files.cmake
+++ b/Gems/ScriptEvents/Code/scriptevents_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptedEntityTweener/Assets/Scripts/ScriptedEntityTweener/ScriptedEntityTweener.lua b/Gems/ScriptedEntityTweener/Assets/Scripts/ScriptedEntityTweener/ScriptedEntityTweener.lua
index 546b7313ef..e0385520d7 100644
--- a/Gems/ScriptedEntityTweener/Assets/Scripts/ScriptedEntityTweener/ScriptedEntityTweener.lua
+++ b/Gems/ScriptedEntityTweener/Assets/Scripts/ScriptedEntityTweener/ScriptedEntityTweener.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/ScriptedEntityTweener/CMakeLists.txt b/Gems/ScriptedEntityTweener/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/ScriptedEntityTweener/CMakeLists.txt
+++ b/Gems/ScriptedEntityTweener/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptedEntityTweener/Code/CMakeLists.txt b/Gems/ScriptedEntityTweener/Code/CMakeLists.txt
index b3b46b3e16..c857a7be4f 100644
--- a/Gems/ScriptedEntityTweener/Code/CMakeLists.txt
+++ b/Gems/ScriptedEntityTweener/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptedEntityTweener/Code/Include/ScriptedEntityTweener/ScriptedEntityTweenerBus.h b/Gems/ScriptedEntityTweener/Code/Include/ScriptedEntityTweener/ScriptedEntityTweenerBus.h
index 050751f78d..a64aa2c727 100644
--- a/Gems/ScriptedEntityTweener/Code/Include/ScriptedEntityTweener/ScriptedEntityTweenerBus.h
+++ b/Gems/ScriptedEntityTweener/Code/Include/ScriptedEntityTweener/ScriptedEntityTweenerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Include/ScriptedEntityTweener/ScriptedEntityTweenerEnums.h b/Gems/ScriptedEntityTweener/Code/Include/ScriptedEntityTweener/ScriptedEntityTweenerEnums.h
index c2a5d95a6a..47783497d1 100644
--- a/Gems/ScriptedEntityTweener/Code/Include/ScriptedEntityTweener/ScriptedEntityTweenerEnums.h
+++ b/Gems/ScriptedEntityTweener/Code/Include/ScriptedEntityTweener/ScriptedEntityTweenerEnums.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerMath.h b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerMath.h
index a1f2ffe3f5..584571c176 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerMath.h
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerMath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp
index df185c28fc..d157fc2d75 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp
index ed69daa23f..490c09d495 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.h b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.h
index f02817a38f..08375bd55f 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.h
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.cpp
index 82d1155be9..9cbfe72e8f 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.cpp
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.h b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.h
index 259405cc30..9b182fb251 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.h
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.cpp
index 344cf24f7b..71048d87fa 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.cpp
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.h b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.h
index 3d28321ed8..577b6bc971 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.h
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
+++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake b/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake
index 4c65fa87c9..6926ca4a0d 100644
--- a/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake
+++ b/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_shared_files.cmake b/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_shared_files.cmake
index 956c593c44..78b8695d42 100644
--- a/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_shared_files.cmake
+++ b/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SliceFavorites/CMakeLists.txt b/Gems/SliceFavorites/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/SliceFavorites/CMakeLists.txt
+++ b/Gems/SliceFavorites/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SliceFavorites/Code/CMakeLists.txt b/Gems/SliceFavorites/Code/CMakeLists.txt
index b0ff8ec334..be8454cbc9 100644
--- a/Gems/SliceFavorites/Code/CMakeLists.txt
+++ b/Gems/SliceFavorites/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SliceFavorites/Code/Include/SliceFavorites/SliceFavoritesBus.h b/Gems/SliceFavorites/Code/Include/SliceFavorites/SliceFavoritesBus.h
index d129dc8543..f8fd96fc20 100644
--- a/Gems/SliceFavorites/Code/Include/SliceFavorites/SliceFavoritesBus.h
+++ b/Gems/SliceFavorites/Code/Include/SliceFavorites/SliceFavoritesBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.cpp b/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.cpp
index a9c34f46b5..84149dde4f 100644
--- a/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.cpp
+++ b/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.h b/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.h
index 0efd05be67..f804bd850a 100644
--- a/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.h
+++ b/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp b/Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp
index 3f99efbdf4..8d7886b45b 100644
--- a/Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp
+++ b/Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/FavoriteDataModel.h b/Gems/SliceFavorites/Code/Source/FavoriteDataModel.h
index a31b56f39f..d857d5def6 100644
--- a/Gems/SliceFavorites/Code/Source/FavoriteDataModel.h
+++ b/Gems/SliceFavorites/Code/Source/FavoriteDataModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavoritesModule.cpp b/Gems/SliceFavorites/Code/Source/SliceFavoritesModule.cpp
index 73fbdc3cd3..d56e01635a 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavoritesModule.cpp
+++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.cpp b/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.cpp
index 8032c8c733..7e624789d7 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.cpp
+++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.h b/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.h
index 528c4beb93..d38d08590b 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.h
+++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponentBus.h b/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponentBus.h
index 440e60cb21..0a2cb8cf21 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponentBus.h
+++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.cpp b/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.cpp
index ed729009b5..8319f60816 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.cpp
+++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.h b/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.h
index 826398d3a1..ec0fb82152 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.h
+++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.cpp b/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.cpp
index 5f43a864bf..17526d8e5d 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.cpp
+++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.h b/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.h
index 91d6193e1a..fb9d8d6909 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.h
+++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h b/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
index 8d99a0243c..eefa26c318 100644
--- a/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
+++ b/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SliceFavorites/Code/slicefavorites_files.cmake b/Gems/SliceFavorites/Code/slicefavorites_files.cmake
index b7fc0672e3..492050a5f4 100644
--- a/Gems/SliceFavorites/Code/slicefavorites_files.cmake
+++ b/Gems/SliceFavorites/Code/slicefavorites_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SliceFavorites/Code/slicefavorites_shared_files.cmake b/Gems/SliceFavorites/Code/slicefavorites_shared_files.cmake
index 270098c639..2f7e1a10e3 100644
--- a/Gems/SliceFavorites/Code/slicefavorites_shared_files.cmake
+++ b/Gems/SliceFavorites/Code/slicefavorites_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointCamera/CMakeLists.txt b/Gems/StartingPointCamera/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/StartingPointCamera/CMakeLists.txt
+++ b/Gems/StartingPointCamera/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointCamera/Code/CMakeLists.txt b/Gems/StartingPointCamera/Code/CMakeLists.txt
index 3bf6dbd3b5..e6764d1c2c 100644
--- a/Gems/StartingPointCamera/Code/CMakeLists.txt
+++ b/Gems/StartingPointCamera/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraConstants.h b/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraConstants.h
index e7f2060781..7b3a5ac47c 100644
--- a/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraConstants.h
+++ b/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraUtilities.h b/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraUtilities.h
index a508440f2b..c6347a60e9 100644
--- a/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraUtilities.h
+++ b/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp
index 77ed2d05bb..d89608b930 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.h b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.h
index d1085597b1..9104a4d9c5 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -27,7 +27,7 @@ namespace Camera
     public:
         ~OffsetPosition() override = default;
         AZ_RTTI(OffsetPosition, "{5B2975A6-839B-4DE0-842B-EDE78D778BC9}", ICameraLookAtBehavior);
-        AZ_CLASS_ALLOCATOR(OffsetPosition, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(OffsetPosition, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp
index 0f65f5b532..e8cf24988a 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.h b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.h
index 7bc6be4144..4094b4cc2b 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -29,7 +29,7 @@ namespace Camera
     public:
         ~RotateCameraLookAt() override = default;
         AZ_RTTI(RotateCameraLookAt, "{B72C5BE7-2DAF-412B-BBBB-F216B3DFB9A0}", ICameraLookAtBehavior);
-        AZ_CLASS_ALLOCATOR(RotateCameraLookAt, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(RotateCameraLookAt, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp
index 79dce95b10..e2e7cd0637 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
index ade6582a67..2245cf7451 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -28,7 +28,7 @@ namespace Camera
     public:
         ~SlideAlongAxisBasedOnAngle() override = default;
         AZ_RTTI(SlideAlongAxisBasedOnAngle, "{8DDA8D0B-5BC3-437E-894B-5144E6E81236}", ICameraLookAtBehavior);
-        AZ_CLASS_ALLOCATOR(SlideAlongAxisBasedOnAngle, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(SlideAlongAxisBasedOnAngle, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.cpp b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.cpp
index bd4b9b7f6b..0314d9af05 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.h b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.h
index 96bf90eaff..2c4985fb7a 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -28,7 +28,7 @@ namespace Camera
     public:
         ~AcquireByEntityId() override = default;
         AZ_RTTI(AcquireByEntityId, "{14D0D355-1F83-4F46-9DE1-D41D23BDFC3C}", ICameraTargetAcquirer)
-        AZ_CLASS_ALLOCATOR(AcquireByEntityId, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(AcquireByEntityId, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.cpp b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.cpp
index 64a1a65569..644b1accc5 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.h b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.h
index ac7d571715..e04fe0fcd2 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -29,7 +29,7 @@ namespace Camera
     public:
         ~AcquireByTag() override = default;
         AZ_RTTI(AcquireByTag, "{E76621A5-E5A8-41B0-AC1D-EC87553181F5}", ICameraTargetAcquirer)
-        AZ_CLASS_ALLOCATOR(AcquireByTag, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(AcquireByTag, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.cpp
index 3f630da0cc..bc060231b9 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.h
index 2ccd77fbe6..71e48ef08e 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -26,7 +26,7 @@ namespace Camera
     public:
         ~FaceTarget() override = default;
         AZ_RTTI(FaceTarget, "{1A2CBCD0-1841-493C-8DB7-1BCA0D293019}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(FaceTarget, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(FaceTarget, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.cpp
index 6cea9da691..d6b2c95106 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.h
index 4a52b3787d..82ff066563 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -23,7 +23,7 @@ namespace Camera
     public:
         ~FollowTargetFromAngle() override = default;
         AZ_RTTI(FollowTargetFromAngle, "{4DBE7A2C-8E93-422E-8942-9601A270D37E}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(FollowTargetFromAngle, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(FollowTargetFromAngle, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.cpp
index db2c067416..50030b3086 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.h
index d27c9cd12e..f5cd9aa352 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -30,7 +30,7 @@ namespace Camera
     public:
         ~FollowTargetFromDistance() override = default;
         AZ_RTTI(FollowTargetFromDistance, "{E6BEDB2C-6812-4369-8C0F-C1E72F380E50}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(FollowTargetFromDistance, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(FollowTargetFromDistance, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.cpp
index b157dc6b8c..6ed1bbae73 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.h
index 7d1dfb740c..ae898a4ca3 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -21,7 +21,7 @@ namespace Camera
     public:
         ~OffsetCameraPosition() override = default;
         AZ_RTTI(OffsetCameraPosition, "{DB64D5DA-84B7-45B7-B221-B5A07BDA2F69}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(OffsetCameraPosition, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(OffsetCameraPosition, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.cpp
index c9d141e8ff..fe69c1410f 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.h b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.h
index 1d75d8894c..83e2e4efc0 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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
  *
@@ -22,7 +22,7 @@ namespace Camera
     public:
         ~Rotate() override = default;
         AZ_RTTI(Rotate, "{EE06111E-75E8-47F0-B243-5A5308A5F605}", ICameraTransformBehavior)
-        AZ_CLASS_ALLOCATOR(Rotate, AZ::SystemAllocator, 0); ///< Use AZ::SystemAllocator, otherwise a CryEngine allocator will be used. This will cause the Asset Processor to crash when this object is deleted, because of the wrong uninitialisation order
+        AZ_CLASS_ALLOCATOR(Rotate, AZ::SystemAllocator, 0);
         static void Reflect(AZ::ReflectContext* reflection);
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/StartingPointCamera/Code/Source/StartingPointCamera/StartingPointCameraUtilities.cpp b/Gems/StartingPointCamera/Code/Source/StartingPointCamera/StartingPointCameraUtilities.cpp
index db92a31553..eafaf1cf9a 100644
--- a/Gems/StartingPointCamera/Code/Source/StartingPointCamera/StartingPointCameraUtilities.cpp
+++ b/Gems/StartingPointCamera/Code/Source/StartingPointCamera/StartingPointCameraUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp b/Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp
index efef7b70c8..c4bb3cad27 100644
--- a/Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp
+++ b/Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h b/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
index 70bb9284de..2609e3b701 100644
--- a/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
+++ b/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake b/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake
index 3af925ac2d..aa11d3ef54 100644
--- a/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake
+++ b/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointCamera/Code/startingpointcamera_shared_files.cmake b/Gems/StartingPointCamera/Code/startingpointcamera_shared_files.cmake
index 123b0d0b52..8b83ab1ac1 100644
--- a/Gems/StartingPointCamera/Code/startingpointcamera_shared_files.cmake
+++ b/Gems/StartingPointCamera/Code/startingpointcamera_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointInput/Assets/Scripts/Input/held.lua b/Gems/StartingPointInput/Assets/Scripts/Input/held.lua
index 923f818a93..542e6d0539 100644
--- a/Gems/StartingPointInput/Assets/Scripts/Input/held.lua
+++ b/Gems/StartingPointInput/Assets/Scripts/Input/held.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointInput/Assets/Scripts/Input/ordered_event_combination.lua b/Gems/StartingPointInput/Assets/Scripts/Input/ordered_event_combination.lua
index b55863a230..70d6d49aa2 100644
--- a/Gems/StartingPointInput/Assets/Scripts/Input/ordered_event_combination.lua
+++ b/Gems/StartingPointInput/Assets/Scripts/Input/ordered_event_combination.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointInput/Assets/Scripts/Input/pressed.lua b/Gems/StartingPointInput/Assets/Scripts/Input/pressed.lua
index ebf9d847a5..5df1768b85 100644
--- a/Gems/StartingPointInput/Assets/Scripts/Input/pressed.lua
+++ b/Gems/StartingPointInput/Assets/Scripts/Input/pressed.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointInput/Assets/Scripts/Input/released.lua b/Gems/StartingPointInput/Assets/Scripts/Input/released.lua
index ed98d1af50..4ea206193b 100644
--- a/Gems/StartingPointInput/Assets/Scripts/Input/released.lua
+++ b/Gems/StartingPointInput/Assets/Scripts/Input/released.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointInput/Assets/Scripts/Input/vectorized_combination.lua b/Gems/StartingPointInput/Assets/Scripts/Input/vectorized_combination.lua
index 1d3fe66305..3df8dd98f9 100644
--- a/Gems/StartingPointInput/Assets/Scripts/Input/vectorized_combination.lua
+++ b/Gems/StartingPointInput/Assets/Scripts/Input/vectorized_combination.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointInput/CMakeLists.txt b/Gems/StartingPointInput/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/StartingPointInput/CMakeLists.txt
+++ b/Gems/StartingPointInput/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointInput/Code/CMakeLists.txt b/Gems/StartingPointInput/Code/CMakeLists.txt
index c7932e2ebc..a5ca0ccd31 100644
--- a/Gems/StartingPointInput/Code/CMakeLists.txt
+++ b/Gems/StartingPointInput/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointInput/Code/Include/StartingPointInput/InputEventNotificationBus.h b/Gems/StartingPointInput/Code/Include/StartingPointInput/InputEventNotificationBus.h
index f9ed1c7fe2..5f5b1b518b 100644
--- a/Gems/StartingPointInput/Code/Include/StartingPointInput/InputEventNotificationBus.h
+++ b/Gems/StartingPointInput/Code/Include/StartingPointInput/InputEventNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Include/StartingPointInput/InputEventRequestBus.h b/Gems/StartingPointInput/Code/Include/StartingPointInput/InputEventRequestBus.h
index 190f077a8e..05fd68d59d 100644
--- a/Gems/StartingPointInput/Code/Include/StartingPointInput/InputEventRequestBus.h
+++ b/Gems/StartingPointInput/Code/Include/StartingPointInput/InputEventRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/Input.cpp b/Gems/StartingPointInput/Code/Source/Input.cpp
index a8498cd5ab..6ac711e88f 100644
--- a/Gems/StartingPointInput/Code/Source/Input.cpp
+++ b/Gems/StartingPointInput/Code/Source/Input.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/Input.h b/Gems/StartingPointInput/Code/Source/Input.h
index 90e7c53f0f..525e00a140 100644
--- a/Gems/StartingPointInput/Code/Source/Input.h
+++ b/Gems/StartingPointInput/Code/Source/Input.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp b/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp
index c4f415f9d6..2d78cc828c 100644
--- a/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp
+++ b/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.h b/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.h
index 40dc154a62..8822c77b6a 100644
--- a/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.h
+++ b/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputEventBindings.h b/Gems/StartingPointInput/Code/Source/InputEventBindings.h
index 21ad0f329b..18abd165e9 100644
--- a/Gems/StartingPointInput/Code/Source/InputEventBindings.h
+++ b/Gems/StartingPointInput/Code/Source/InputEventBindings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputEventGroup.h b/Gems/StartingPointInput/Code/Source/InputEventGroup.h
index 67b1baff3a..0ef9797f24 100644
--- a/Gems/StartingPointInput/Code/Source/InputEventGroup.h
+++ b/Gems/StartingPointInput/Code/Source/InputEventGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputEventMap.cpp b/Gems/StartingPointInput/Code/Source/InputEventMap.cpp
index 1fd4eb3213..aec1526250 100644
--- a/Gems/StartingPointInput/Code/Source/InputEventMap.cpp
+++ b/Gems/StartingPointInput/Code/Source/InputEventMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputEventMap.h b/Gems/StartingPointInput/Code/Source/InputEventMap.h
index 56a32e2f5a..3969640b1f 100644
--- a/Gems/StartingPointInput/Code/Source/InputEventMap.h
+++ b/Gems/StartingPointInput/Code/Source/InputEventMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.cpp b/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.cpp
index ed0dc7e0d2..d98daba121 100644
--- a/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.cpp
+++ b/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.h b/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.h
index 085e4b330c..0db7f8a358 100644
--- a/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.h
+++ b/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputLibrary.cpp b/Gems/StartingPointInput/Code/Source/InputLibrary.cpp
index 5de02b2ba5..23d09b1b30 100644
--- a/Gems/StartingPointInput/Code/Source/InputLibrary.cpp
+++ b/Gems/StartingPointInput/Code/Source/InputLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputLibrary.h b/Gems/StartingPointInput/Code/Source/InputLibrary.h
index 079a959597..6c4e313b08 100644
--- a/Gems/StartingPointInput/Code/Source/InputLibrary.h
+++ b/Gems/StartingPointInput/Code/Source/InputLibrary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputNode.cpp b/Gems/StartingPointInput/Code/Source/InputNode.cpp
index ef80371b96..e0f9de3657 100644
--- a/Gems/StartingPointInput/Code/Source/InputNode.cpp
+++ b/Gems/StartingPointInput/Code/Source/InputNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/InputNode.h b/Gems/StartingPointInput/Code/Source/InputNode.h
index e9e4222dae..d71c302f2b 100644
--- a/Gems/StartingPointInput/Code/Source/InputNode.h
+++ b/Gems/StartingPointInput/Code/Source/InputNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/LyToAzInputNameConversions.h b/Gems/StartingPointInput/Code/Source/LyToAzInputNameConversions.h
index 729fbe5ba2..a8f9c32db1 100644
--- a/Gems/StartingPointInput/Code/Source/LyToAzInputNameConversions.h
+++ b/Gems/StartingPointInput/Code/Source/LyToAzInputNameConversions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/StartingPointInputGem.cpp b/Gems/StartingPointInput/Code/Source/StartingPointInputGem.cpp
index 5438992796..6cc8eb33d7 100644
--- a/Gems/StartingPointInput/Code/Source/StartingPointInputGem.cpp
+++ b/Gems/StartingPointInput/Code/Source/StartingPointInputGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h b/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
+++ b/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/Tests/StartingPointInputTest.cpp b/Gems/StartingPointInput/Code/Tests/StartingPointInputTest.cpp
index 6fa84f86fa..a366f757e3 100644
--- a/Gems/StartingPointInput/Code/Tests/StartingPointInputTest.cpp
+++ b/Gems/StartingPointInput/Code/Tests/StartingPointInputTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointInput/Code/startingpointinput_autogen_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_autogen_files.cmake
index f8410c31fd..8cd8e30e5a 100644
--- a/Gems/StartingPointInput/Code/startingpointinput_autogen_files.cmake
+++ b/Gems/StartingPointInput/Code/startingpointinput_autogen_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake
index de8d911d8f..4a42575140 100644
--- a/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake
+++ b/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointInput/Code/startingpointinput_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_files.cmake
index a27b23c902..933f32ec66 100644
--- a/Gems/StartingPointInput/Code/startingpointinput_files.cmake
+++ b/Gems/StartingPointInput/Code/startingpointinput_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointInput/Code/startingpointinput_shared_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_shared_files.cmake
index 5f5db5d505..ee7dbefa7b 100644
--- a/Gems/StartingPointInput/Code/startingpointinput_shared_files.cmake
+++ b/Gems/StartingPointInput/Code/startingpointinput_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointInput/Code/startingpointinput_tests_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_tests_files.cmake
index 846b0efa11..ce5e67e502 100644
--- a/Gems/StartingPointInput/Code/startingpointinput_tests_files.cmake
+++ b/Gems/StartingPointInput/Code/startingpointinput_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointMovement/Assets/Scripts/Components/AddPhysicsImpulse.lua b/Gems/StartingPointMovement/Assets/Scripts/Components/AddPhysicsImpulse.lua
index 1cc7c48696..cb4b0d62ef 100644
--- a/Gems/StartingPointMovement/Assets/Scripts/Components/AddPhysicsImpulse.lua
+++ b/Gems/StartingPointMovement/Assets/Scripts/Components/AddPhysicsImpulse.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointMovement/Assets/Scripts/Components/EntityLookAt.lua b/Gems/StartingPointMovement/Assets/Scripts/Components/EntityLookAt.lua
index 28267d3580..ccd68a00fd 100644
--- a/Gems/StartingPointMovement/Assets/Scripts/Components/EntityLookAt.lua
+++ b/Gems/StartingPointMovement/Assets/Scripts/Components/EntityLookAt.lua
@@ -1,6 +1,6 @@
 -- 
 -- 
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointMovement/Assets/Scripts/Components/MoveEntity.lua b/Gems/StartingPointMovement/Assets/Scripts/Components/MoveEntity.lua
index 1a1309b7c8..86caaa999a 100644
--- a/Gems/StartingPointMovement/Assets/Scripts/Components/MoveEntity.lua
+++ b/Gems/StartingPointMovement/Assets/Scripts/Components/MoveEntity.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointMovement/Assets/Scripts/Components/RotateEntity.lua b/Gems/StartingPointMovement/Assets/Scripts/Components/RotateEntity.lua
index 06c60a0a52..518aac2c4e 100644
--- a/Gems/StartingPointMovement/Assets/Scripts/Components/RotateEntity.lua
+++ b/Gems/StartingPointMovement/Assets/Scripts/Components/RotateEntity.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 --
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/StartingPointMovement/CMakeLists.txt b/Gems/StartingPointMovement/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/StartingPointMovement/CMakeLists.txt
+++ b/Gems/StartingPointMovement/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointMovement/Code/CMakeLists.txt b/Gems/StartingPointMovement/Code/CMakeLists.txt
index 011726859c..b7412e0fef 100644
--- a/Gems/StartingPointMovement/Code/CMakeLists.txt
+++ b/Gems/StartingPointMovement/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/StartingPointMovement/Code/Include/StartingPointMovement/StartingPointMovementConstants.h b/Gems/StartingPointMovement/Code/Include/StartingPointMovement/StartingPointMovementConstants.h
index f07f05883d..07508d3d41 100644
--- a/Gems/StartingPointMovement/Code/Include/StartingPointMovement/StartingPointMovementConstants.h
+++ b/Gems/StartingPointMovement/Code/Include/StartingPointMovement/StartingPointMovementConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointMovement/Code/Include/StartingPointMovement/StartingPointMovementUtilities.h b/Gems/StartingPointMovement/Code/Include/StartingPointMovement/StartingPointMovementUtilities.h
index c3a735b5e6..bcc37eda24 100644
--- a/Gems/StartingPointMovement/Code/Include/StartingPointMovement/StartingPointMovementUtilities.h
+++ b/Gems/StartingPointMovement/Code/Include/StartingPointMovement/StartingPointMovementUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp b/Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp
index c75fbe7269..057a32c514 100644
--- a/Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp
+++ b/Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h b/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
+++ b/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake b/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake
index c2d09a8232..f2addd54fa 100644
--- a/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake
+++ b/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SurfaceData/CMakeLists.txt b/Gems/SurfaceData/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/SurfaceData/CMakeLists.txt
+++ b/Gems/SurfaceData/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SurfaceData/Code/CMakeLists.txt b/Gems/SurfaceData/Code/CMakeLists.txt
index 53bba93fa3..0cc16abf67 100644
--- a/Gems/SurfaceData/Code/CMakeLists.txt
+++ b/Gems/SurfaceData/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataConstants.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataConstants.h
index 4cf3657fc6..8557884cdb 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataConstants.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataModifierRequestBus.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataModifierRequestBus.h
index e9ef7ac11a..0f37437614 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataModifierRequestBus.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataModifierRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataProviderRequestBus.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataProviderRequestBus.h
index 3e699aaa13..dbc74def0b 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataProviderRequestBus.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataProviderRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataSystemNotificationBus.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataSystemNotificationBus.h
index b7c43a4c3a..86bd7b2dfe 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataSystemNotificationBus.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataSystemNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataSystemRequestBus.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataSystemRequestBus.h
index b2d7d02aa5..ff7859d7a4 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataSystemRequestBus.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataSystemRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTagEnumeratorRequestBus.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTagEnumeratorRequestBus.h
index 6527276c71..628c8be443 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTagEnumeratorRequestBus.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTagEnumeratorRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTagProviderRequestBus.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTagProviderRequestBus.h
index ff207c77c7..857bac3e6d 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTagProviderRequestBus.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTagProviderRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTypes.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTypes.h
index 95177dd35f..2fd644ee47 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTypes.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h
index f75698549b..19b70b32bb 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h b/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h
index 52384e9cdc..8fc22fd988 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Include/SurfaceData/Utility/SurfaceDataUtility.h b/Gems/SurfaceData/Code/Include/SurfaceData/Utility/SurfaceDataUtility.h
index 9df55803f9..55d604c75b 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/Utility/SurfaceDataUtility.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/Utility/SurfaceDataUtility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp b/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp
index 2662e3bfe1..098e71f9ac 100644
--- a/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.h b/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.h
index 2730617c44..5550f12e83 100644
--- a/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.h
+++ b/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp b/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp
index 5e42585f5c..ea33b8d1a2 100644
--- a/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.h b/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.h
index 66c766a8eb..151659a964 100644
--- a/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.h
+++ b/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp
index 4d09fd9582..45532486af 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.h b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.h
index 005a800eb6..e74451a4e9 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.h
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp
index e0aed2a8db..4422f22e62 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.h b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.h
index 43bfda1a98..591221d60b 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.h
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp
index 63ae2f09ba..ab1b0cdffe 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.h b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.h
index 5e308439eb..3a798e2314 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.h
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp
index 6f1e37c99c..bd127990d4 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.h b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.h
index f38f07da33..385db762a3 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.h
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp
index aeeec71eec..fc3b91be5a 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h
index 593b7e6d3d..4d5d1fb05f 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp
index 3f4c50e8a2..ae2b66a8f6 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceDataModule.h b/Gems/SurfaceData/Code/Source/SurfaceDataModule.h
index f6028b53cc..afd5ad1b52 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataModule.h
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp
index b2d9151e07..a3e6d65eef 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.h b/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.h
index 70208ce735..4c5ab28a29 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.h
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp
index 439bc35071..24e59bd2c2 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h b/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
index 4899df5161..d424689241 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
+++ b/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/SurfaceTag.cpp b/Gems/SurfaceData/Code/Source/SurfaceTag.cpp
index e931273cbd..692e7185bb 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceTag.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceTag.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp
index 346a20dcb2..01b9467363 100644
--- a/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.h b/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.h
index 09af4d0cbf..b0faf03b8c 100644
--- a/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.h
+++ b/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp
index d582aeb1cb..ecb3c9cfa6 100644
--- a/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp
+++ b/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
index 120d4375d0..cffdf0ea3f 100644
--- a/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
+++ b/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/SurfaceData/Code/surfacedata_editor_files.cmake b/Gems/SurfaceData/Code/surfacedata_editor_files.cmake
index 150d67d506..47d4a36fc6 100644
--- a/Gems/SurfaceData/Code/surfacedata_editor_files.cmake
+++ b/Gems/SurfaceData/Code/surfacedata_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SurfaceData/Code/surfacedata_files.cmake b/Gems/SurfaceData/Code/surfacedata_files.cmake
index 8958723155..cfeec51b41 100644
--- a/Gems/SurfaceData/Code/surfacedata_files.cmake
+++ b/Gems/SurfaceData/Code/surfacedata_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SurfaceData/Code/surfacedata_shared_files.cmake b/Gems/SurfaceData/Code/surfacedata_shared_files.cmake
index 66a3cae417..60b97ff916 100644
--- a/Gems/SurfaceData/Code/surfacedata_shared_files.cmake
+++ b/Gems/SurfaceData/Code/surfacedata_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/SurfaceData/Code/surfacedata_tests_files.cmake b/Gems/SurfaceData/Code/surfacedata_tests_files.cmake
index 8d2aa91cba..1e307caee7 100644
--- a/Gems/SurfaceData/Code/surfacedata_tests_files.cmake
+++ b/Gems/SurfaceData/Code/surfacedata_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TestAssetBuilder/CMakeLists.txt b/Gems/TestAssetBuilder/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/TestAssetBuilder/CMakeLists.txt
+++ b/Gems/TestAssetBuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TestAssetBuilder/Code/CMakeLists.txt b/Gems/TestAssetBuilder/Code/CMakeLists.txt
index dc7ff3e5c0..9b2a529821 100644
--- a/Gems/TestAssetBuilder/Code/CMakeLists.txt
+++ b/Gems/TestAssetBuilder/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TestAssetBuilder/Code/Source/Builder/TestAssetBuilderComponent.cpp b/Gems/TestAssetBuilder/Code/Source/Builder/TestAssetBuilderComponent.cpp
index 00ea5f983d..b59fe1f7ed 100644
--- a/Gems/TestAssetBuilder/Code/Source/Builder/TestAssetBuilderComponent.cpp
+++ b/Gems/TestAssetBuilder/Code/Source/Builder/TestAssetBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TestAssetBuilder/Code/Source/Builder/TestAssetBuilderComponent.h b/Gems/TestAssetBuilder/Code/Source/Builder/TestAssetBuilderComponent.h
index 409df6ff6a..208280226c 100644
--- a/Gems/TestAssetBuilder/Code/Source/Builder/TestAssetBuilderComponent.h
+++ b/Gems/TestAssetBuilder/Code/Source/Builder/TestAssetBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TestAssetBuilder/Code/Source/TestAssetBuilderModule.cpp b/Gems/TestAssetBuilder/Code/Source/TestAssetBuilderModule.cpp
index 082fb111ac..ef30dbf3ed 100644
--- a/Gems/TestAssetBuilder/Code/Source/TestAssetBuilderModule.cpp
+++ b/Gems/TestAssetBuilder/Code/Source/TestAssetBuilderModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TestAssetBuilder/Code/testassetbuilder_files.cmake b/Gems/TestAssetBuilder/Code/testassetbuilder_files.cmake
index 5145140f14..9b12ba7b3a 100644
--- a/Gems/TestAssetBuilder/Code/testassetbuilder_files.cmake
+++ b/Gems/TestAssetBuilder/Code/testassetbuilder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TestAssetBuilder/Code/testassetbuilder_shared_files.cmake b/Gems/TestAssetBuilder/Code/testassetbuilder_shared_files.cmake
index 9f6a7c2a26..ae95a3bfe3 100644
--- a/Gems/TestAssetBuilder/Code/testassetbuilder_shared_files.cmake
+++ b/Gems/TestAssetBuilder/Code/testassetbuilder_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TextureAtlas/CMakeLists.txt b/Gems/TextureAtlas/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/TextureAtlas/CMakeLists.txt
+++ b/Gems/TextureAtlas/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TextureAtlas/Code/CMakeLists.txt b/Gems/TextureAtlas/Code/CMakeLists.txt
index 30839deeb6..d146e824e7 100644
--- a/Gems/TextureAtlas/Code/CMakeLists.txt
+++ b/Gems/TextureAtlas/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlas.h b/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlas.h
index a0129cf57d..7cbe320ad5 100644
--- a/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlas.h
+++ b/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlasBus.h b/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlasBus.h
index b26f9b0545..3d4697abc3 100644
--- a/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlasBus.h
+++ b/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlasBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlasNotificationBus.h b/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlasNotificationBus.h
index 91af627b54..6a7de90b87 100644
--- a/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlasNotificationBus.h
+++ b/Gems/TextureAtlas/Code/Include/TextureAtlas/TextureAtlasNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderComponent.cpp b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderComponent.cpp
index ffd4ab8347..5023849d47 100644
--- a/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderComponent.cpp
+++ b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderComponent.h b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderComponent.h
index e13e77852c..27bbb0adf9 100644
--- a/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderComponent.h
+++ b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp
index 0970c50eb0..dfe43b4cfb 100644
--- a/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp
+++ b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h
index 243861fde6..ff490a2648 100644
--- a/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h
+++ b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp b/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp
index 2c9501d720..28210715a5 100644
--- a/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp
+++ b/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.h b/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.h
index 85ee376036..a787dd4e3c 100644
--- a/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.h
+++ b/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp b/Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp
index 8cf1197a1c..71097fdfe0 100644
--- a/Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp
+++ b/Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.cpp b/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.cpp
index a0fe16df8c..3d30370faa 100644
--- a/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.cpp
+++ b/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.h b/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.h
index c50a560a9a..a660879134 100644
--- a/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.h
+++ b/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h b/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
index 8d99a0243c..eefa26c318 100644
--- a/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
+++ b/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TextureAtlas/Code/textureatlas_builder_files.cmake b/Gems/TextureAtlas/Code/textureatlas_builder_files.cmake
index e5da2cfe3b..2594079aef 100644
--- a/Gems/TextureAtlas/Code/textureatlas_builder_files.cmake
+++ b/Gems/TextureAtlas/Code/textureatlas_builder_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TextureAtlas/Code/textureatlas_files.cmake b/Gems/TextureAtlas/Code/textureatlas_files.cmake
index 9ef7527f1a..44d2443072 100644
--- a/Gems/TextureAtlas/Code/textureatlas_files.cmake
+++ b/Gems/TextureAtlas/Code/textureatlas_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TextureAtlas/Code/textureatlas_module_files.cmake b/Gems/TextureAtlas/Code/textureatlas_module_files.cmake
index dd5a5f3bd1..c87da636a8 100644
--- a/Gems/TextureAtlas/Code/textureatlas_module_files.cmake
+++ b/Gems/TextureAtlas/Code/textureatlas_module_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TickBusOrderViewer/CMakeLists.txt b/Gems/TickBusOrderViewer/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/TickBusOrderViewer/CMakeLists.txt
+++ b/Gems/TickBusOrderViewer/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TickBusOrderViewer/Code/CMakeLists.txt b/Gems/TickBusOrderViewer/Code/CMakeLists.txt
index 14a2e95cde..eb358312bb 100644
--- a/Gems/TickBusOrderViewer/Code/CMakeLists.txt
+++ b/Gems/TickBusOrderViewer/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TickBusOrderViewer/Code/Include/TickBusOrderViewer/TickBusOrderViewerBus.h b/Gems/TickBusOrderViewer/Code/Include/TickBusOrderViewer/TickBusOrderViewerBus.h
index 52d5f502ef..880286eae8 100644
--- a/Gems/TickBusOrderViewer/Code/Include/TickBusOrderViewer/TickBusOrderViewerBus.h
+++ b/Gems/TickBusOrderViewer/Code/Include/TickBusOrderViewer/TickBusOrderViewerBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerModule.cpp b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerModule.cpp
index 26989dddfd..6d131241ea 100644
--- a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerModule.cpp
+++ b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.cpp b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.cpp
index 6660726014..80dbb2b579 100644
--- a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.cpp
+++ b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.h b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.h
index d493801932..b7227a469b 100644
--- a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.h
+++ b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
index 4899df5161..d424689241 100644
--- a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
+++ b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake b/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake
index a756c59418..682dbb506c 100644
--- a/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake
+++ b/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/TickBusOrderViewer/Code/tickbusorderviewer_shared_files.cmake b/Gems/TickBusOrderViewer/Code/tickbusorderviewer_shared_files.cmake
index 4ff1506a13..a11323a912 100644
--- a/Gems/TickBusOrderViewer/Code/tickbusorderviewer_shared_files.cmake
+++ b/Gems/TickBusOrderViewer/Code/tickbusorderviewer_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Assets/Scripts/Twitch.lua b/Gems/Twitch/Assets/Scripts/Twitch.lua
index ed86395dcb..6e6fe82c6e 100644
--- a/Gems/Twitch/Assets/Scripts/Twitch.lua
+++ b/Gems/Twitch/Assets/Scripts/Twitch.lua
@@ -1,5 +1,5 @@
 --[[
--- Copyright (c) Contributors to the Open 3D Engine Project
+-- 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/Gems/Twitch/CMakeLists.txt b/Gems/Twitch/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Twitch/CMakeLists.txt
+++ b/Gems/Twitch/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/CMakeLists.txt b/Gems/Twitch/Code/CMakeLists.txt
index 153002329e..103e81da00 100644
--- a/Gems/Twitch/Code/CMakeLists.txt
+++ b/Gems/Twitch/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/Include/Twitch/BaseTypes.h b/Gems/Twitch/Code/Include/Twitch/BaseTypes.h
index b6b0180fe2..a0d37b72cd 100644
--- a/Gems/Twitch/Code/Include/Twitch/BaseTypes.h
+++ b/Gems/Twitch/Code/Include/Twitch/BaseTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Include/Twitch/RESTTypes.h b/Gems/Twitch/Code/Include/Twitch/RESTTypes.h
index 0c5e1818e9..5bf71b9d67 100644
--- a/Gems/Twitch/Code/Include/Twitch/RESTTypes.h
+++ b/Gems/Twitch/Code/Include/Twitch/RESTTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Include/Twitch/TwitchBus.h b/Gems/Twitch/Code/Include/Twitch/TwitchBus.h
index 196ecba22f..597a6c05dc 100644
--- a/Gems/Twitch/Code/Include/Twitch/TwitchBus.h
+++ b/Gems/Twitch/Code/Include/Twitch/TwitchBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Include/Twitch/TwitchTypes.h b/Gems/Twitch/Code/Include/Twitch/TwitchTypes.h
index bca334c513..dccb0e3211 100644
--- a/Gems/Twitch/Code/Include/Twitch/TwitchTypes.h
+++ b/Gems/Twitch/Code/Include/Twitch/TwitchTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/ComponentStub.cpp b/Gems/Twitch/Code/Source/ComponentStub.cpp
index 015ba46284..f65d127212 100644
--- a/Gems/Twitch/Code/Source/ComponentStub.cpp
+++ b/Gems/Twitch/Code/Source/ComponentStub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/FuelInterface.h b/Gems/Twitch/Code/Source/FuelInterface.h
index 954a7c1651..7acea8ad47 100644
--- a/Gems/Twitch/Code/Source/FuelInterface.h
+++ b/Gems/Twitch/Code/Source/FuelInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/IFuelInterface.h b/Gems/Twitch/Code/Source/IFuelInterface.h
index 16b8f0919a..1c245359d6 100644
--- a/Gems/Twitch/Code/Source/IFuelInterface.h
+++ b/Gems/Twitch/Code/Source/IFuelInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/ITwitchREST.h b/Gems/Twitch/Code/Source/ITwitchREST.h
index 65b022eca8..ec0aa20a19 100644
--- a/Gems/Twitch/Code/Source/ITwitchREST.h
+++ b/Gems/Twitch/Code/Source/ITwitchREST.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Android/Twitch_Traits_Android.h b/Gems/Twitch/Code/Source/Platform/Android/Twitch_Traits_Android.h
index 1afeb32b8b..9360cf17fd 100644
--- a/Gems/Twitch/Code/Source/Platform/Android/Twitch_Traits_Android.h
+++ b/Gems/Twitch/Code/Source/Platform/Android/Twitch_Traits_Android.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Android/Twitch_Traits_Platform.h b/Gems/Twitch/Code/Source/Platform/Android/Twitch_Traits_Platform.h
index 1ba70da7ad..48d905635a 100644
--- a/Gems/Twitch/Code/Source/Platform/Android/Twitch_Traits_Platform.h
+++ b/Gems/Twitch/Code/Source/Platform/Android/Twitch_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Android/platform_android_files.cmake b/Gems/Twitch/Code/Source/Platform/Android/platform_android_files.cmake
index 5666f29cb4..90e21a13b6 100644
--- a/Gems/Twitch/Code/Source/Platform/Android/platform_android_files.cmake
+++ b/Gems/Twitch/Code/Source/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/Source/Platform/Linux/Twitch_Traits_Linux.h b/Gems/Twitch/Code/Source/Platform/Linux/Twitch_Traits_Linux.h
index 1afeb32b8b..9360cf17fd 100644
--- a/Gems/Twitch/Code/Source/Platform/Linux/Twitch_Traits_Linux.h
+++ b/Gems/Twitch/Code/Source/Platform/Linux/Twitch_Traits_Linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Linux/Twitch_Traits_Platform.h b/Gems/Twitch/Code/Source/Platform/Linux/Twitch_Traits_Platform.h
index 440a7f6fb4..2e9da6af10 100644
--- a/Gems/Twitch/Code/Source/Platform/Linux/Twitch_Traits_Platform.h
+++ b/Gems/Twitch/Code/Source/Platform/Linux/Twitch_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/Twitch/Code/Source/Platform/Linux/platform_linux_files.cmake
index b1b07293e6..9603c4180c 100644
--- a/Gems/Twitch/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/Twitch/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/Source/Platform/Mac/Twitch_Traits_Mac.h b/Gems/Twitch/Code/Source/Platform/Mac/Twitch_Traits_Mac.h
index 1afeb32b8b..9360cf17fd 100644
--- a/Gems/Twitch/Code/Source/Platform/Mac/Twitch_Traits_Mac.h
+++ b/Gems/Twitch/Code/Source/Platform/Mac/Twitch_Traits_Mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Mac/Twitch_Traits_Platform.h b/Gems/Twitch/Code/Source/Platform/Mac/Twitch_Traits_Platform.h
index 0806055c94..0172a0228a 100644
--- a/Gems/Twitch/Code/Source/Platform/Mac/Twitch_Traits_Platform.h
+++ b/Gems/Twitch/Code/Source/Platform/Mac/Twitch_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Mac/platform_mac_files.cmake b/Gems/Twitch/Code/Source/Platform/Mac/platform_mac_files.cmake
index d9111723c0..99a2c66507 100644
--- a/Gems/Twitch/Code/Source/Platform/Mac/platform_mac_files.cmake
+++ b/Gems/Twitch/Code/Source/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/Source/Platform/Windows/Twitch_Traits_Platform.h b/Gems/Twitch/Code/Source/Platform/Windows/Twitch_Traits_Platform.h
index c36cb4fea7..cf44b45626 100644
--- a/Gems/Twitch/Code/Source/Platform/Windows/Twitch_Traits_Platform.h
+++ b/Gems/Twitch/Code/Source/Platform/Windows/Twitch_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Windows/Twitch_Traits_Windows.h b/Gems/Twitch/Code/Source/Platform/Windows/Twitch_Traits_Windows.h
index ec28fa9379..d9bc3cafb8 100644
--- a/Gems/Twitch/Code/Source/Platform/Windows/Twitch_Traits_Windows.h
+++ b/Gems/Twitch/Code/Source/Platform/Windows/Twitch_Traits_Windows.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/Windows/platform_windows_files.cmake b/Gems/Twitch/Code/Source/Platform/Windows/platform_windows_files.cmake
index 0a9a588c75..03df7575ee 100644
--- a/Gems/Twitch/Code/Source/Platform/Windows/platform_windows_files.cmake
+++ b/Gems/Twitch/Code/Source/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/Source/Platform/iOS/Twitch_Traits_Platform.h b/Gems/Twitch/Code/Source/Platform/iOS/Twitch_Traits_Platform.h
index b1ce4f88d8..bdd3be66db 100644
--- a/Gems/Twitch/Code/Source/Platform/iOS/Twitch_Traits_Platform.h
+++ b/Gems/Twitch/Code/Source/Platform/iOS/Twitch_Traits_Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/iOS/Twitch_Traits_iOS.h b/Gems/Twitch/Code/Source/Platform/iOS/Twitch_Traits_iOS.h
index 1afeb32b8b..9360cf17fd 100644
--- a/Gems/Twitch/Code/Source/Platform/iOS/Twitch_Traits_iOS.h
+++ b/Gems/Twitch/Code/Source/Platform/iOS/Twitch_Traits_iOS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Platform/iOS/platform_ios_files.cmake b/Gems/Twitch/Code/Source/Platform/iOS/platform_ios_files.cmake
index 7f13d1ff79..35a8a8d182 100644
--- a/Gems/Twitch/Code/Source/Platform/iOS/platform_ios_files.cmake
+++ b/Gems/Twitch/Code/Source/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/Source/TwitchModule.cpp b/Gems/Twitch/Code/Source/TwitchModule.cpp
index 05367f0d41..9819c93e7c 100644
--- a/Gems/Twitch/Code/Source/TwitchModule.cpp
+++ b/Gems/Twitch/Code/Source/TwitchModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/TwitchREST.cpp b/Gems/Twitch/Code/Source/TwitchREST.cpp
index 41b96bcff3..d4d42347aa 100644
--- a/Gems/Twitch/Code/Source/TwitchREST.cpp
+++ b/Gems/Twitch/Code/Source/TwitchREST.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/TwitchREST.h b/Gems/Twitch/Code/Source/TwitchREST.h
index 85a80e071e..ad4b51d0f0 100644
--- a/Gems/Twitch/Code/Source/TwitchREST.h
+++ b/Gems/Twitch/Code/Source/TwitchREST.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/TwitchReflection.cpp b/Gems/Twitch/Code/Source/TwitchReflection.cpp
index 4b5851857f..50d4079d7a 100644
--- a/Gems/Twitch/Code/Source/TwitchReflection.cpp
+++ b/Gems/Twitch/Code/Source/TwitchReflection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/TwitchReflection.h b/Gems/Twitch/Code/Source/TwitchReflection.h
index 7a89d5c4c5..43375bb535 100644
--- a/Gems/Twitch/Code/Source/TwitchReflection.h
+++ b/Gems/Twitch/Code/Source/TwitchReflection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp b/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp
index d505d01400..c163d39370 100644
--- a/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp
+++ b/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/TwitchSystemComponent.h b/Gems/Twitch/Code/Source/TwitchSystemComponent.h
index 49e199d28c..1fc10a2321 100644
--- a/Gems/Twitch/Code/Source/TwitchSystemComponent.h
+++ b/Gems/Twitch/Code/Source/TwitchSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/Source/Twitch_precompiled.h b/Gems/Twitch/Code/Source/Twitch_precompiled.h
index ad49d2df73..e41e011a88 100644
--- a/Gems/Twitch/Code/Source/Twitch_precompiled.h
+++ b/Gems/Twitch/Code/Source/Twitch_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Twitch/Code/lmbraws_unsupported_files.cmake b/Gems/Twitch/Code/lmbraws_unsupported_files.cmake
index 962441706f..0c76fe2cd3 100644
--- a/Gems/Twitch/Code/lmbraws_unsupported_files.cmake
+++ b/Gems/Twitch/Code/lmbraws_unsupported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/twitch_files.cmake b/Gems/Twitch/Code/twitch_files.cmake
index e3d86d3de6..6ae60b7923 100644
--- a/Gems/Twitch/Code/twitch_files.cmake
+++ b/Gems/Twitch/Code/twitch_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Twitch/Code/twitch_shared_files.cmake b/Gems/Twitch/Code/twitch_shared_files.cmake
index 3feecb53bc..4dfcf821f2 100644
--- a/Gems/Twitch/Code/twitch_shared_files.cmake
+++ b/Gems/Twitch/Code/twitch_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/UiBasics/CMakeLists.txt b/Gems/UiBasics/CMakeLists.txt
index edcda6dfba..0b2cb4efff 100644
--- a/Gems/UiBasics/CMakeLists.txt
+++ b/Gems/UiBasics/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Vegetation/CMakeLists.txt b/Gems/Vegetation/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/Vegetation/CMakeLists.txt
+++ b/Gems/Vegetation/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Vegetation/Code/CMakeLists.txt b/Gems/Vegetation/Code/CMakeLists.txt
index 29ad636737..3b701a4f56 100644
--- a/Gems/Vegetation/Code/CMakeLists.txt
+++ b/Gems/Vegetation/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Vegetation/Code/Include/Vegetation/AreaComponentBase.h b/Gems/Vegetation/Code/Include/Vegetation/AreaComponentBase.h
index 81ed1dd9ca..109971702e 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/AreaComponentBase.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/AreaComponentBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Descriptor.h b/Gems/Vegetation/Code/Include/Vegetation/Descriptor.h
index abdd0c5cc6..2e54c4ef13 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Descriptor.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Descriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/DescriptorListAsset.h b/Gems/Vegetation/Code/Include/Vegetation/DescriptorListAsset.h
index ddf051a469..8ae19acabf 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/DescriptorListAsset.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/DescriptorListAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/DynamicSliceInstanceSpawner.h b/Gems/Vegetation/Code/Include/Vegetation/DynamicSliceInstanceSpawner.h
index 28cbf98301..2ef4a5ab71 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/DynamicSliceInstanceSpawner.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/DynamicSliceInstanceSpawner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaBlenderRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaBlenderRequestBus.h
index e4b0f3f776..8a30f8b971 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaBlenderRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaBlenderRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaConfigRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaConfigRequestBus.h
index 994380f334..4386172482 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaConfigRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaConfigRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaDebugBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaDebugBus.h
index e96105721a..1149560c38 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaDebugBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaDebugBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaInfoBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaInfoBus.h
index e5f4cdbfa3..0f1709d200 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaInfoBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaInfoBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaNotificationBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaNotificationBus.h
index 399b489059..9a9d4b524e 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaNotificationBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaRequestBus.h
index a16dca8e0b..f98c922abe 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaSystemRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaSystemRequestBus.h
index 0c05bb93e8..84c84dea50 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaSystemRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/AreaSystemRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/BlockerRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/BlockerRequestBus.h
index 069b9ae795..1956c8fb4a 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/BlockerRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/BlockerRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugNotificationBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugNotificationBus.h
index 40c4d37536..51aa40ddeb 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugNotificationBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugRequestsBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugRequestsBus.h
index 19ab9e03f4..568dd59763 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugRequestsBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugRequestsBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugSystemDataBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugSystemDataBus.h
index 85534c495d..713aa7bb96 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugSystemDataBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DebugSystemDataBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DependencyRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DependencyRequestBus.h
index 34eebe936a..60b2374656 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DependencyRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DependencyRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorListCombinerRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorListCombinerRequestBus.h
index 97cef4e630..d91b71a0d7 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorListCombinerRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorListCombinerRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorListRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorListRequestBus.h
index 2ac29c88ef..fac3a2cc5d 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorListRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorListRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorNotificationBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorNotificationBus.h
index 536e0b6c95..45d5f76e47 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorNotificationBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorNotificationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorProviderRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorProviderRequestBus.h
index 4a0755417b..d706143f6c 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorProviderRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorProviderRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorSelectorRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorSelectorRequestBus.h
index 93ace97cd9..d5a6d53916 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorSelectorRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorSelectorRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorWeightSelectorRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorWeightSelectorRequestBus.h
index e148079bde..240a4d2808 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorWeightSelectorRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DescriptorWeightSelectorRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DistanceBetweenFilterRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DistanceBetweenFilterRequestBus.h
index b0d6be96f7..3487a3187f 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DistanceBetweenFilterRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DistanceBetweenFilterRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DistributionFilterRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DistributionFilterRequestBus.h
index 8712e34c8e..9269ab501e 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DistributionFilterRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/DistributionFilterRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/FilterRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/FilterRequestBus.h
index d2be432926..bfa9f759eb 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/FilterRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/FilterRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/InstanceSystemRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/InstanceSystemRequestBus.h
index c3d9363444..f696b7955c 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/InstanceSystemRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/InstanceSystemRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/LevelSettingsRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/LevelSettingsRequestBus.h
index 54a90d0cca..cde5076340 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/LevelSettingsRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/LevelSettingsRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/MeshBlockerRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/MeshBlockerRequestBus.h
index a0c71c655d..4366e7b5dc 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/MeshBlockerRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/MeshBlockerRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ModifierRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ModifierRequestBus.h
index f268605c69..70ee34ddfe 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ModifierRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ModifierRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/PositionModifierRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/PositionModifierRequestBus.h
index eb515c38e2..1e8a4eb3f4 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/PositionModifierRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/PositionModifierRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ReferenceShapeRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ReferenceShapeRequestBus.h
index ba1ad043fc..26fd8e5e26 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ReferenceShapeRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ReferenceShapeRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/RotationModifierRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/RotationModifierRequestBus.h
index 09f6812a18..bc09ca77c2 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/RotationModifierRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/RotationModifierRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ScaleModifierRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ScaleModifierRequestBus.h
index b789b86c77..9a1fbcf4ab 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ScaleModifierRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ScaleModifierRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ShapeIntersectionFilterRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ShapeIntersectionFilterRequestBus.h
index 61fd9f264c..a0f2112368 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ShapeIntersectionFilterRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ShapeIntersectionFilterRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SlopeAlignmentModifierRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SlopeAlignmentModifierRequestBus.h
index 5c4dabd8f5..5f52fdf7ab 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SlopeAlignmentModifierRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SlopeAlignmentModifierRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SpawnerRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SpawnerRequestBus.h
index 0e4d888532..15b2789137 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SpawnerRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SpawnerRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceAltitudeFilterRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceAltitudeFilterRequestBus.h
index 16f2a2dd40..a6017e4826 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceAltitudeFilterRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceAltitudeFilterRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceMaskDepthFilterRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceMaskDepthFilterRequestBus.h
index b3f7c935d4..22056c3430 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceMaskDepthFilterRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceMaskDepthFilterRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceMaskFilterRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceMaskFilterRequestBus.h
index 1a07b6d0f0..26db019a56 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceMaskFilterRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceMaskFilterRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceSlopeFilterRequestBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceSlopeFilterRequestBus.h
index c0415c6c00..433051e26e 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceSlopeFilterRequestBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SurfaceSlopeFilterRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SystemConfigurationBus.h b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SystemConfigurationBus.h
index f7c2a9410d..b58f94a5b0 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SystemConfigurationBus.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Ebuses/SystemConfigurationBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorAreaComponentBase.h b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorAreaComponentBase.h
index 7c4a08b3b2..da3d45445c 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorAreaComponentBase.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorAreaComponentBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorAreaComponentBase.inl b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorAreaComponentBase.inl
index edcf80d3ee..20b9355e23 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorAreaComponentBase.inl
+++ b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorAreaComponentBase.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentBase.h b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentBase.h
index ccd283cad4..94bcc36415 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentBase.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentBase.inl b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentBase.inl
index 8b45ee35bd..f8b07d5c94 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentBase.inl
+++ b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentBase.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentTypeIds.h b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentTypeIds.h
index c061a87f1b..f26320ef87 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentTypeIds.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentTypeIds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/EmptyInstanceSpawner.h b/Gems/Vegetation/Code/Include/Vegetation/EmptyInstanceSpawner.h
index fa76b34b27..2239b9feab 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/EmptyInstanceSpawner.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/EmptyInstanceSpawner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/InstanceData.h b/Gems/Vegetation/Code/Include/Vegetation/InstanceData.h
index 10f7e34a8a..bbf6bd3391 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/InstanceData.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/InstanceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/InstanceSpawner.h b/Gems/Vegetation/Code/Include/Vegetation/InstanceSpawner.h
index d517b51b5d..4c9803085f 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/InstanceSpawner.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/InstanceSpawner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Include/Vegetation/PrefabInstanceSpawner.h b/Gems/Vegetation/Code/Include/Vegetation/PrefabInstanceSpawner.h
index b88188ceda..84ffa3f674 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/PrefabInstanceSpawner.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/PrefabInstanceSpawner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
index 0034e35854..16771f67c7 100644
--- a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/AreaSystemComponent.h b/Gems/Vegetation/Code/Source/AreaSystemComponent.h
index 51baa8086c..b8fd36ab0a 100644
--- a/Gems/Vegetation/Code/Source/AreaSystemComponent.h
+++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp b/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp
index 322e286a8b..07c4e1a19e 100644
--- a/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.h b/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.h
index 01d76ef77a..ea912d9938 100644
--- a/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp b/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp
index 1aa653a1bf..1df8e2301b 100644
--- a/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp
+++ b/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp b/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp
index d887980dcd..4cef2d7951 100644
--- a/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/BlockerComponent.h b/Gems/Vegetation/Code/Source/Components/BlockerComponent.h
index 4b11da38f7..66116227c3 100644
--- a/Gems/Vegetation/Code/Source/Components/BlockerComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/BlockerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp
index 38faa18eda..9a72017111 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.h b/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.h
index 1788e7a7c3..4b0858b7cf 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp
index 0f27ae8413..bc630d2c12 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.h b/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.h
index ecc5cee1f7..c044fe6480 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp
index 2d7e489eaa..24230597e8 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.h b/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.h
index 9a63513d21..80bfb45567 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp
index c1f5b28359..76989f2e90 100644
--- a/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.h b/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.h
index 2ee17d3805..86e552a93d 100644
--- a/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp
index a037cf7b23..af93f9409a 100644
--- a/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.h b/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.h
index 8b2da2239b..cc429e1223 100644
--- a/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp b/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp
index c8c5b8fe87..eac395b6c2 100644
--- a/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.h b/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.h
index 2af98df6a9..f2c1aac93e 100644
--- a/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp
index 097c03a4fd..c3ac0e8105 100644
--- a/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.h b/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.h
index bfafa2a321..ce677bfc65 100644
--- a/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp
index 92165341f2..d396928dac 100644
--- a/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.h b/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.h
index 43fdd7bf5f..44daf16b7b 100644
--- a/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp b/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp
index bf1776144b..042fda8d6d 100644
--- a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.h b/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.h
index 4c9fe0537d..82a8bf5eea 100644
--- a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp
index 5fbb7f8c5e..a307623f7d 100644
--- a/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.h b/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.h
index be4cb1a3ca..07c2e0351f 100644
--- a/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp
index 8f7130c651..0faab5aabe 100644
--- a/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.h b/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.h
index c44a4d79ab..a053ee974e 100644
--- a/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp
index 11a6fe1504..a3ec226c23 100644
--- a/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.h b/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.h
index e66baa483e..a10bf00d56 100644
--- a/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp
index 9a7ab34532..8bcbf0df22 100644
--- a/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.h b/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.h
index d6b8fa4523..a32593b8d2 100644
--- a/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp b/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp
index 88a04a4978..ab236f4a9b 100644
--- a/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SpawnerComponent.h b/Gems/Vegetation/Code/Source/Components/SpawnerComponent.h
index ec9619bbef..5c810fafd5 100644
--- a/Gems/Vegetation/Code/Source/Components/SpawnerComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/SpawnerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp
index 21ac9a1a8a..8dd798ee1b 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.h b/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.h
index aefc356065..fa739f6512 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp
index 0a110043a7..408f07bfef 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.h b/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.h
index 1cb4d269c5..3a59541947 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp
index 0d8a405f46..4ae60543f9 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.h b/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.h
index f6ff9a6b8d..dab3312f4e 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp
index c4c67c6c0a..5534694002 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.h b/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.h
index b2633958a0..33b7712cc9 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp b/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp
index af9055a663..cc4eca7f0e 100644
--- a/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/DebugSystemComponent.h b/Gems/Vegetation/Code/Source/DebugSystemComponent.h
index 0620e2485b..9811b98c19 100644
--- a/Gems/Vegetation/Code/Source/DebugSystemComponent.h
+++ b/Gems/Vegetation/Code/Source/DebugSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp
index 9f0d1e8c26..1585ba629e 100644
--- a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h
index fda9b17a2a..9e7fd0c1b4 100644
--- a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h
+++ b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp
index 9553d31557..c24c380d6f 100644
--- a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h
index 859d7e98a7..6362d98371 100644
--- a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h
+++ b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp
index 9e5e26894e..6a554b2e71 100644
--- a/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.h
index 9655883927..09e73f779f 100644
--- a/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.h
+++ b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp
index 0ad265333e..7f0a750c0a 100644
--- a/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.h
index 62649c134b..6d37fe79ce 100644
--- a/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.h
+++ b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Descriptor.cpp b/Gems/Vegetation/Code/Source/Descriptor.cpp
index 9cc211a168..7e2e639926 100644
--- a/Gems/Vegetation/Code/Source/Descriptor.cpp
+++ b/Gems/Vegetation/Code/Source/Descriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp b/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp
index 0a7ea19ac3..b6ff6289ec 100644
--- a/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp
+++ b/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
index 85ed247acb..8642c41102 100644
--- a/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
+++ b/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp
index f87ac02af9..7f45945d7e 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.h
index 2a78b5cda0..3bfde59124 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp
index 0589c8ac58..b9f42eba4c 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.h
index 42b209d99e..60e4f7fdcc 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp
index 726721bf9f..1ce5fddd6d 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.h
index 8eca31c892..c156abb803 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp
index 2ddc690f53..5107fc72e0 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.h
index ec57d3c147..bdb6151c9e 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp
index d935fd7a62..831952a1fa 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.h
index d8ee99500f..5a42f9821b 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp
index d000f4cf37..2e8c547c3f 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.h
index 4804b21336..110d8368ab 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp
index 867ec87574..01909e7d92 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.h
index b35d91bea8..f87b92d62e 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp
index bd103b3338..dbb94b96fe 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.h
index ab255627cf..fb8b30c737 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp
index bef220a413..8dade21d75 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.h
index e63260b4d6..eb1f105f59 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp
index f541449eed..e924bec94c 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.h
index 79667f9b4e..edb7af7d24 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp
index d7751a2189..9bbbddb691 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h
index 9c546d77ab..73ec6a0f11 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp
index 944458b91f..cc21927e8b 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.h
index 4eaa2190a0..5856bfb7da 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp
index 20b690a739..ec0347076e 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.h
index 95a3c1d00d..325e03ab2a 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp
index 5f82bbcd22..3add308d16 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.h
index 00fdfdada0..0b7e531856 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp
index d8b35c5fac..ab2d69ff3b 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.h
index 810df7d456..e1cc5396ce 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp
index 43cd4d3a1b..ffdf6bac64 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.h
index 328b34af7a..3f4fc0145d 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp
index d3027a4300..f466b2b1a5 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.h
index 1879858a36..8369250425 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp
index 66ba8bd4d8..cde8e7181a 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.h
index 209910fac2..49bd046973 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp
index 70c701c4b2..a04f86d7ae 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.h
index 5137aa471e..fc6d599bb2 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp
index 123b094efd..f0c106b278 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.h
index 66b2c2ad18..0fde49dfb5 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp
index 93845bc06e..91d24a18ff 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.h
index 7c5ed03e31..af37ea30ed 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp
index 9137de43ba..c477c939c2 100644
--- a/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp
+++ b/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/InstanceData.cpp b/Gems/Vegetation/Code/Source/InstanceData.cpp
index 998a551a9d..99a967cc8e 100644
--- a/Gems/Vegetation/Code/Source/InstanceData.cpp
+++ b/Gems/Vegetation/Code/Source/InstanceData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
index f9c1fbe735..86504c89a5 100644
--- a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/InstanceSystemComponent.h b/Gems/Vegetation/Code/Source/InstanceSystemComponent.h
index ae1a02504f..bb90d6553d 100644
--- a/Gems/Vegetation/Code/Source/InstanceSystemComponent.h
+++ b/Gems/Vegetation/Code/Source/InstanceSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp
index b1a9e3ba3a..0023da59c2 100644
--- a/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp
+++ b/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Util/ConcurrentQueue.h b/Gems/Vegetation/Code/Source/Util/ConcurrentQueue.h
index 2654c6cf0a..95d7a03397 100644
--- a/Gems/Vegetation/Code/Source/Util/ConcurrentQueue.h
+++ b/Gems/Vegetation/Code/Source/Util/ConcurrentQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/Util/ProducerConsumerQueue.h b/Gems/Vegetation/Code/Source/Util/ProducerConsumerQueue.h
index b1cca4fc88..f34a7562fd 100644
--- a/Gems/Vegetation/Code/Source/Util/ProducerConsumerQueue.h
+++ b/Gems/Vegetation/Code/Source/Util/ProducerConsumerQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp b/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
index 1a27905396..78d8176dd3 100644
--- a/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
+++ b/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/VegetationEditorModule.h b/Gems/Vegetation/Code/Source/VegetationEditorModule.h
index 8b80bc14bd..8ff79110e9 100644
--- a/Gems/Vegetation/Code/Source/VegetationEditorModule.h
+++ b/Gems/Vegetation/Code/Source/VegetationEditorModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/VegetationModule.cpp b/Gems/Vegetation/Code/Source/VegetationModule.cpp
index ce51ff7f22..0e3522124c 100644
--- a/Gems/Vegetation/Code/Source/VegetationModule.cpp
+++ b/Gems/Vegetation/Code/Source/VegetationModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/VegetationModule.h b/Gems/Vegetation/Code/Source/VegetationModule.h
index e99e9c6eb6..ec995f8a19 100644
--- a/Gems/Vegetation/Code/Source/VegetationModule.h
+++ b/Gems/Vegetation/Code/Source/VegetationModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/VegetationProfiler.h b/Gems/Vegetation/Code/Source/VegetationProfiler.h
index def73d829a..c064b75eae 100644
--- a/Gems/Vegetation/Code/Source/VegetationProfiler.h
+++ b/Gems/Vegetation/Code/Source/VegetationProfiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp b/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp
index 24e79e1461..87fc782777 100644
--- a/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Source/VegetationSystemComponent.h b/Gems/Vegetation/Code/Source/VegetationSystemComponent.h
index 143feaa00a..4009aa50ab 100644
--- a/Gems/Vegetation/Code/Source/VegetationSystemComponent.h
+++ b/Gems/Vegetation/Code/Source/VegetationSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
index 1efa3af7e5..5cb36a3665 100644
--- a/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
+++ b/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp
index 7dc3b3dee7..62b7e86416 100644
--- a/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp
+++ b/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp
index a0c3d22575..1d81e9a496 100644
--- a/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp
+++ b/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp b/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp
index 59c06951aa..7e43a47358 100644
--- a/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp
index 16be43f0cc..a7e79b6d7d 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
index 26b2ea8e1d..35a02a016f 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp
index af56217ed0..ceaefac355 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp
index 073eea6cc4..6d93abe9f8 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/VegetationMocks.h b/Gems/Vegetation/Code/Tests/VegetationMocks.h
index e2e135a3f3..ce40c363f2 100644
--- a/Gems/Vegetation/Code/Tests/VegetationMocks.h
+++ b/Gems/Vegetation/Code/Tests/VegetationMocks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/VegetationTest.cpp b/Gems/Vegetation/Code/Tests/VegetationTest.cpp
index aee4a0bc75..bffe94359f 100644
--- a/Gems/Vegetation/Code/Tests/VegetationTest.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/Tests/VegetationTest.h b/Gems/Vegetation/Code/Tests/VegetationTest.h
index 56e927529f..22db4a5b3b 100644
--- a/Gems/Vegetation/Code/Tests/VegetationTest.h
+++ b/Gems/Vegetation/Code/Tests/VegetationTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/Vegetation/Code/vegetation_editor_files.cmake b/Gems/Vegetation/Code/vegetation_editor_files.cmake
index 76cb4797a8..80068ab4cb 100644
--- a/Gems/Vegetation/Code/vegetation_editor_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_editor_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Vegetation/Code/vegetation_files.cmake b/Gems/Vegetation/Code/vegetation_files.cmake
index 173cf2748f..f64f5e6dec 100644
--- a/Gems/Vegetation/Code/vegetation_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Vegetation/Code/vegetation_shared_files.cmake b/Gems/Vegetation/Code/vegetation_shared_files.cmake
index eb2e00fa63..fd4d468957 100644
--- a/Gems/Vegetation/Code/vegetation_shared_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/Vegetation/Code/vegetation_tests_files.cmake b/Gems/Vegetation/Code/vegetation_tests_files.cmake
index d8ccc330aa..d2207b7556 100644
--- a/Gems/Vegetation/Code/vegetation_tests_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VideoPlaybackFramework/CMakeLists.txt b/Gems/VideoPlaybackFramework/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/VideoPlaybackFramework/CMakeLists.txt
+++ b/Gems/VideoPlaybackFramework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VideoPlaybackFramework/Code/CMakeLists.txt b/Gems/VideoPlaybackFramework/Code/CMakeLists.txt
index a6fdfc5e71..a4a9a74658 100644
--- a/Gems/VideoPlaybackFramework/Code/CMakeLists.txt
+++ b/Gems/VideoPlaybackFramework/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackAsset.h b/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackAsset.h
index e1adb91b13..a704dfdacf 100644
--- a/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackAsset.h
+++ b/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackBus.h b/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackBus.h
index 8bcd33912b..b6cc27cbe7 100644
--- a/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackBus.h
+++ b/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackFrameworkBus.h b/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackFrameworkBus.h
index 71a46b6686..1ab0f9115c 100644
--- a/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackFrameworkBus.h
+++ b/Gems/VideoPlaybackFramework/Code/Include/VideoPlaybackFramework/VideoPlaybackFrameworkBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkModule.cpp b/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkModule.cpp
index 26eddf7a42..b9f6ab6454 100644
--- a/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkModule.cpp
+++ b/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkModule.h b/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkModule.h
index 5b2ccbb306..5c46bcb56b 100644
--- a/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkModule.h
+++ b/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.cpp b/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.cpp
index 3f1c00f584..66c3354dfe 100644
--- a/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.cpp
+++ b/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.h b/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.h
index e5aea24da0..47c6a42d87 100644
--- a/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.h
+++ b/Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VideoPlaybackFramework/Code/Tests/VideoPlaybackFrameworkTest.cpp b/Gems/VideoPlaybackFramework/Code/Tests/VideoPlaybackFrameworkTest.cpp
index 9f24db5be3..3faa3b8ffb 100644
--- a/Gems/VideoPlaybackFramework/Code/Tests/VideoPlaybackFrameworkTest.cpp
+++ b/Gems/VideoPlaybackFramework/Code/Tests/VideoPlaybackFrameworkTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VideoPlaybackFramework/Code/videoplaybackframework_files.cmake b/Gems/VideoPlaybackFramework/Code/videoplaybackframework_files.cmake
index 39fdd21f78..660365e7d6 100644
--- a/Gems/VideoPlaybackFramework/Code/videoplaybackframework_files.cmake
+++ b/Gems/VideoPlaybackFramework/Code/videoplaybackframework_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VideoPlaybackFramework/Code/videoplaybackframework_shared_files.cmake b/Gems/VideoPlaybackFramework/Code/videoplaybackframework_shared_files.cmake
index 4e52be77ec..82c3e2eae6 100644
--- a/Gems/VideoPlaybackFramework/Code/videoplaybackframework_shared_files.cmake
+++ b/Gems/VideoPlaybackFramework/Code/videoplaybackframework_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VideoPlaybackFramework/Code/videoplaybackframework_tests_files.cmake b/Gems/VideoPlaybackFramework/Code/videoplaybackframework_tests_files.cmake
index fce54a7c63..959128559b 100644
--- a/Gems/VideoPlaybackFramework/Code/videoplaybackframework_tests_files.cmake
+++ b/Gems/VideoPlaybackFramework/Code/videoplaybackframework_tests_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VirtualGamepad/CMakeLists.txt b/Gems/VirtualGamepad/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/VirtualGamepad/CMakeLists.txt
+++ b/Gems/VirtualGamepad/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VirtualGamepad/Code/CMakeLists.txt b/Gems/VirtualGamepad/Code/CMakeLists.txt
index be10380447..e98e2cf57b 100644
--- a/Gems/VirtualGamepad/Code/CMakeLists.txt
+++ b/Gems/VirtualGamepad/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VirtualGamepad/Code/Include/VirtualGamepad/VirtualGamepadBus.h b/Gems/VirtualGamepad/Code/Include/VirtualGamepad/VirtualGamepadBus.h
index b58eab6ca9..d3f84995ed 100644
--- a/Gems/VirtualGamepad/Code/Include/VirtualGamepad/VirtualGamepadBus.h
+++ b/Gems/VirtualGamepad/Code/Include/VirtualGamepad/VirtualGamepadBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.cpp b/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.cpp
index a4d274c162..e9d71aa23e 100644
--- a/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.cpp
+++ b/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.h b/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.h
index 9feb28d388..d7509a2126 100644
--- a/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.h
+++ b/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.cpp
index 988df67797..269545e8d8 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.cpp
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.h b/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.h
index 4bb1b807a3..89a4ee1452 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.h
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonRequestBus.h b/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonRequestBus.h
index 61deef4009..68078dcb0f 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonRequestBus.h
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp
index 33963ad604..c781b102e6 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.cpp
index 37fefa3434..fd0d42ab3f 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.cpp
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.h b/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.h
index d431c94c2e..4ffb5e58a1 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.h
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.cpp
index a1ba59d89e..bc1964ff5d 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.cpp
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.h b/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.h
index 9b31428729..b1992eda3e 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.h
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickRequestBus.h b/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickRequestBus.h
index 093565de6b..f5a401bad4 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickRequestBus.h
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickRequestBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h b/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
+++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake b/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake
index 78b82c40d7..09cc357a1c 100644
--- a/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake
+++ b/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/VirtualGamepad/Code/virtualgamepad_shared_files.cmake b/Gems/VirtualGamepad/Code/virtualgamepad_shared_files.cmake
index 31937a54d3..d278b441d6 100644
--- a/Gems/VirtualGamepad/Code/virtualgamepad_shared_files.cmake
+++ b/Gems/VirtualGamepad/Code/virtualgamepad_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/CMakeLists.txt b/Gems/WhiteBox/CMakeLists.txt
index dbfe0c9c3f..34bce0825f 100644
--- a/Gems/WhiteBox/CMakeLists.txt
+++ b/Gems/WhiteBox/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/CMakeLists.txt b/Gems/WhiteBox/Code/CMakeLists.txt
index 4e47436897..24b846cb14 100644
--- a/Gems/WhiteBox/Code/CMakeLists.txt
+++ b/Gems/WhiteBox/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxBus.h b/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxBus.h
index 21f79b6a97..8060d02298 100644
--- a/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxBus.h
+++ b/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxColliderBus.h b/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxColliderBus.h
index 9da7c8dbed..59541e1dc1 100644
--- a/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxColliderBus.h
+++ b/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxColliderBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxComponentBus.h b/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxComponentBus.h
index dd309fad17..e205d2daf9 100644
--- a/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxComponentBus.h
+++ b/Gems/WhiteBox/Code/Include/WhiteBox/EditorWhiteBoxComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxBus.h b/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxBus.h
index e96d2126e8..2dc5705883 100644
--- a/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxBus.h
+++ b/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxComponentBus.h b/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxComponentBus.h
index 6721b515e3..591f2a15a1 100644
--- a/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxComponentBus.h
+++ b/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxComponentBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxToolApi.h b/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxToolApi.h
index 401ff8bb12..08bab642b5 100644
--- a/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxToolApi.h
+++ b/Gems/WhiteBox/Code/Include/WhiteBox/WhiteBoxToolApi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp b/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp
index 144954724b..8abd7d2a75 100644
--- a/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp
+++ b/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.h b/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.h
index 0f1121f80c..3a662d4ce1 100644
--- a/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.h
+++ b/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAsset.h b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAsset.h
index 0208410d40..937ec5e01e 100644
--- a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAsset.h
+++ b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAsset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetBus.h b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetBus.h
index 3b908f8a3f..9f5d5d7c3c 100644
--- a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetBus.h
+++ b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp
index 373fc2fd69..cc3c7bb682 100644
--- a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp
+++ b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.h b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.h
index 245e9d3fbf..88fbc1b329 100644
--- a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.h
+++ b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.cpp b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.cpp
index a54247776b..e6e784e01b 100644
--- a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.cpp
+++ b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.h b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.h
index 71aa743652..e0328c86ab 100644
--- a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.h
+++ b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
index 58f3b36aab..9d43c0b8fa 100644
--- a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h
index 66ed1af45f..57d6830063 100644
--- a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h
+++ b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
index aba3a9b866..e616d3567e 100644
--- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h
index 04eefb4ba8..94bd8a9328 100644
--- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h
+++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.cpp b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.cpp
index 211c1f9460..f23dea356b 100644
--- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.cpp
+++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.h b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.h
index 91e36aea2a..348feb48e7 100644
--- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.h
+++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp b/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp
index bd6a933d76..f380a54432 100644
--- a/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp
+++ b/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
index 49a1fbd820..f003b18808 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h
index 56452ca7d6..783f5c1479 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
index 512d8389ba..c228a789f8 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.h
index 4c181ee2a9..8e683583b0 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeBus.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeBus.h
index ce904c6618..a5d2315f5f 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeBus.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.cpp
index a64cc9339c..a61c18acc4 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.h
index 93af183441..7c3a030cfe 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxDefaultShapeTypes.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxDefaultShapeTypes.h
index b051b0505a..a855830a57 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxDefaultShapeTypes.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxDefaultShapeTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxEdgeModifierBus.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxEdgeModifierBus.h
index 7662b3623f..f891e33a50 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxEdgeModifierBus.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxEdgeModifierBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxPolygonModifierBus.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxPolygonModifierBus.h
index 7db7e86d2a..657d86b50b 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxPolygonModifierBus.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxPolygonModifierBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.cpp
index db20d2f268..426e311b64 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.h b/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.h
index 6ca52c5204..478becd02d 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.h
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Platform/Android/PAL_android.cmake b/Gems/WhiteBox/Code/Source/Platform/Android/PAL_android.cmake
index 484dd078cb..cd00b8a13b 100644
--- a/Gems/WhiteBox/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/WhiteBox/Code/Source/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/WhiteBox/Code/Source/Platform/Linux/PAL_linux.cmake
index 484dd078cb..cd00b8a13b 100644
--- a/Gems/WhiteBox/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/WhiteBox/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/WhiteBox/Code/Source/Platform/Mac/PAL_mac.cmake
index 484dd078cb..cd00b8a13b 100644
--- a/Gems/WhiteBox/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/WhiteBox/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/WhiteBox/Code/Source/Platform/Windows/PAL_windows.cmake
index 0af6a15063..eb0034384c 100644
--- a/Gems/WhiteBox/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/WhiteBox/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/Source/Platform/Windows/platform_windows_tools.cmake b/Gems/WhiteBox/Code/Source/Platform/Windows/platform_windows_tools.cmake
index ef1fcfe9ba..ba10fba81a 100644
--- a/Gems/WhiteBox/Code/Source/Platform/Windows/platform_windows_tools.cmake
+++ b/Gems/WhiteBox/Code/Source/Platform/Windows/platform_windows_tools.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/WhiteBox/Code/Source/Platform/iOS/PAL_ios.cmake
index 484dd078cb..cd00b8a13b 100644
--- a/Gems/WhiteBox/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/WhiteBox/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/Source/Rendering/Atom/PackedFloat2.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/PackedFloat2.h
index f48007e756..548c286929 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/PackedFloat2.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/PackedFloat2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.cpp b/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.cpp
index 28893e7ea9..5ca1b3e79f 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.cpp
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.h
index ea5dee45b0..cd5f56d615 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp
index 68dd3576c2..4c13a63308 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.h
index 6bf82cd8f0..473f946d85 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAttributeBuffer.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAttributeBuffer.h
index dcdbf7eada..6611d9d762 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAttributeBuffer.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAttributeBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h
index 0c9982c7cc..5e3b41acda 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp
index 45c789804b..11a52e145e 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.h
index 9bc20fb307..126337eeb0 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.cpp b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.cpp
index e14067cddb..6d70dee48e 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.cpp
+++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.h b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.h
index c473977292..f81e269396 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp
index def9a1e7c9..7060e983e6 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp
+++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.h b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.h
index f655aee294..6231245e05 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.cpp b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.cpp
index 2d06f3d13c..bcb1e62209 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.cpp
+++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.h b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.h
index d1b3911da3..ea114ff9f4 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.cpp b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.cpp
index 22f0af199b..088c6c4b28 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.cpp
+++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.h b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.h
index 5e063e4273..c3b860e6a4 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.cpp
index 894d51a34e..e199509ad7 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.cpp
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.h b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.h
index 7d29f67fbc..9b4b9582cd 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.h
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp
index 5ff73802f0..e9b5514006 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.h b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.h
index 933f5b912a..e8e78f2b8e 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.h
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultModeBus.h b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultModeBus.h
index fcbdbbf73a..a62cf1e55c 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultModeBus.h
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultModeBus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp
index 31dea008ef..0abc6ffa60 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.h b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.h
index 3cc8d626c7..50ef685ba7 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.h
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.cpp b/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.cpp
index c94fd743d5..9643925907 100644
--- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.cpp
+++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.h b/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.h
index a52f39830f..4cd6f25af0 100644
--- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.h
+++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp
index 52370468ee..f9014333a2 100644
--- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp
+++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.h b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.h
index 66347b8b6b..2fbda90c8e 100644
--- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.h
+++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.cpp b/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.cpp
index 8699a99b6a..8e9680e65b 100644
--- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.cpp
+++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.h b/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.h
index c0b56b16b3..d33cb230d6 100644
--- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.h
+++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp
index be3762fbc4..2ce08fc5ce 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.h
index d5380c48d7..924fe9177a 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp
index 5b176abb5e..8c7d59f3b8 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.h
index 8da485d78a..34095c04be 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.cpp
index 090b65727c..32fa42f69a 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.h
index 86c01a8efa..309f58b3c0 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.cpp
index c3e68dff87..66a2cd0ca4 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.h
index 64d52a0d3d..f717e522f3 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.cpp
index c17a4de6b4..ae34217981 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.h
index c0053e70a0..5f97519958 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.cpp
index 65946d8343..db49ae0679 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.h
index e9f964d670..200fb07273 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp
index 827d1f026f..833b887ef4 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.h
index f4a3398134..aede27fdb4 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp
index e9030f908a..07a17ac2cb 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.h
index ac077ae4f3..b9b433a9f9 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.cpp
index 28d4a98a1b..86808cecdc 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.h
index 564f36b294..7d4c76b105 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.h
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.cpp
index 1b8e23a048..86ea1a974a 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.cpp
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h b/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h
index 3f16b10661..5aad1a687e 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp
index f3385e560b..6951135895 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxComponent.h b/Gems/WhiteBox/Code/Source/WhiteBoxComponent.h
index 88264912bb..b8a55f0104 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxComponent.h
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.cpp
index d5743954d7..c3b5445ed7 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.cpp
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.h b/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.h
index 7e05c53f04..974d3f882d 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.h
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp
index 05461cbd45..e7e5bb9128 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxModule.h b/Gems/WhiteBox/Code/Source/WhiteBoxModule.h
index beead7c89d..bc0662b62a 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxModule.h
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp
index 3309c33a4d..f0796d621c 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.cpp
index 4adcddb7c8..0c364e37f0 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.h b/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.h
index 81b373c025..3a0119118f 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.h
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.cpp
index 8674c70b11..dca96186f9 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.cpp
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.h b/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.h
index 0343eec625..320792d8ff 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.h
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h b/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
index 0eb554cc0c..cc8a920d01 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
+++ b/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h b/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
index 64c410e9b1..2f7e53eb31 100644
--- a/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
+++ b/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxComponentTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxComponentTest.cpp
index 29dee72d05..dce88122c3 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxComponentTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxComponentTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp
index c073d44470..d30a7e2283 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp
index 0723832b23..513c8a90bf 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxRenderDataTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxRenderDataTest.cpp
index 63ae3de4e1..0fb49d7b0f 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxRenderDataTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxRenderDataTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxRuntimeTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxRuntimeTest.cpp
index 4e91bbf614..6aca4296e2 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxRuntimeTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxRuntimeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxSelectionTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxSelectionTest.cpp
index f58b2cca14..5f04fc50ad 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxSelectionTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxSelectionTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp
index ad915b427f..e53bf1f24f 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxTestFixtures.h b/Gems/WhiteBox/Code/Tests/WhiteBoxTestFixtures.h
index fd87b3c1de..b75bc81674 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxTestFixtures.h
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTestFixtures.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp
index c075f1cfa9..c5e892a990 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp
index 3172fe5377..80dc272dde 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.h b/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.h
index 6a023657a6..e20ef8f639 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.h
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp
index efb5b2d07f..d3be243903 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Gems/WhiteBox/Code/whitebox_editor_physics_tests_supported_files.cmake b/Gems/WhiteBox/Code/whitebox_editor_physics_tests_supported_files.cmake
index 81d5109f9f..a257139abc 100644
--- a/Gems/WhiteBox/Code/whitebox_editor_physics_tests_supported_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_editor_physics_tests_supported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/whitebox_editor_shared_files.cmake b/Gems/WhiteBox/Code/whitebox_editor_shared_files.cmake
index 50a21f55ad..299b343130 100644
--- a/Gems/WhiteBox/Code/whitebox_editor_shared_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/whitebox_editor_supported_files.cmake b/Gems/WhiteBox/Code/whitebox_editor_supported_files.cmake
index a9d0320db3..e01e8d5c78 100644
--- a/Gems/WhiteBox/Code/whitebox_editor_supported_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_editor_supported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/whitebox_editor_tests_supported_files.cmake b/Gems/WhiteBox/Code/whitebox_editor_tests_supported_files.cmake
index 4138e27de3..7a38c19040 100644
--- a/Gems/WhiteBox/Code/whitebox_editor_tests_supported_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_editor_tests_supported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/whitebox_shared_files.cmake b/Gems/WhiteBox/Code/whitebox_shared_files.cmake
index 5fecda5af9..78a04b97a4 100644
--- a/Gems/WhiteBox/Code/whitebox_shared_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_shared_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/whitebox_supported_files.cmake b/Gems/WhiteBox/Code/whitebox_supported_files.cmake
index 1e7b041b87..870885ccfd 100644
--- a/Gems/WhiteBox/Code/whitebox_supported_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_supported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/whitebox_tests_supported_files.cmake b/Gems/WhiteBox/Code/whitebox_tests_supported_files.cmake
index b20db20b81..d3180c3b76 100644
--- a/Gems/WhiteBox/Code/whitebox_tests_supported_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_tests_supported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake b/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake
index 089a07d64a..dac84c280f 100644
--- a/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake
+++ b/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Gems/WhiteBox/Editor/Scripts/Cylinder.py b/Gems/WhiteBox/Editor/Scripts/Cylinder.py
index fa83d0d61a..c5862e4a01 100755
--- a/Gems/WhiteBox/Editor/Scripts/Cylinder.py
+++ b/Gems/WhiteBox/Editor/Scripts/Cylinder.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/WhiteBox/Editor/Scripts/Icosahedron.py b/Gems/WhiteBox/Editor/Scripts/Icosahedron.py
index 8d94433bbd..04e8d56673 100755
--- a/Gems/WhiteBox/Editor/Scripts/Icosahedron.py
+++ b/Gems/WhiteBox/Editor/Scripts/Icosahedron.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/WhiteBox/Editor/Scripts/Sphere.py b/Gems/WhiteBox/Editor/Scripts/Sphere.py
index aa9b6d6d04..cfa151b916 100755
--- a/Gems/WhiteBox/Editor/Scripts/Sphere.py
+++ b/Gems/WhiteBox/Editor/Scripts/Sphere.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/WhiteBox/Editor/Scripts/Staircase.py b/Gems/WhiteBox/Editor/Scripts/Staircase.py
index 22ea8c2667..0036faadaf 100755
--- a/Gems/WhiteBox/Editor/Scripts/Staircase.py
+++ b/Gems/WhiteBox/Editor/Scripts/Staircase.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/WhiteBox/Editor/Scripts/Tetrahedron.py b/Gems/WhiteBox/Editor/Scripts/Tetrahedron.py
index 2859d707e3..dac33b5b11 100755
--- a/Gems/WhiteBox/Editor/Scripts/Tetrahedron.py
+++ b/Gems/WhiteBox/Editor/Scripts/Tetrahedron.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/WhiteBox/Editor/Scripts/WhiteBox.py b/Gems/WhiteBox/Editor/Scripts/WhiteBox.py
index a408920939..1de7f7ec73 100755
--- a/Gems/WhiteBox/Editor/Scripts/WhiteBox.py
+++ b/Gems/WhiteBox/Editor/Scripts/WhiteBox.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/WhiteBox/Editor/Scripts/WhiteBoxInit.py b/Gems/WhiteBox/Editor/Scripts/WhiteBoxInit.py
index b4ae35a7ba..bc3ab59b3d 100755
--- a/Gems/WhiteBox/Editor/Scripts/WhiteBoxInit.py
+++ b/Gems/WhiteBox/Editor/Scripts/WhiteBoxInit.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/WhiteBox/Editor/Scripts/WhiteBoxMath.py b/Gems/WhiteBox/Editor/Scripts/WhiteBoxMath.py
index b1dec3d8c4..6e29981e6f 100755
--- a/Gems/WhiteBox/Editor/Scripts/WhiteBoxMath.py
+++ b/Gems/WhiteBox/Editor/Scripts/WhiteBoxMath.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Gems/WhiteBox/Editor/Scripts/default_shapes.py b/Gems/WhiteBox/Editor/Scripts/default_shapes.py
index 2fb74a3dd5..ad8ac06c9d 100755
--- a/Gems/WhiteBox/Editor/Scripts/default_shapes.py
+++ b/Gems/WhiteBox/Editor/Scripts/default_shapes.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Registry/setregbuilder.assetprocessor.setreg b/Registry/setregbuilder.assetprocessor.setreg
index 7b1165c0f9..c04027ad72 100644
--- a/Registry/setregbuilder.assetprocessor.setreg
+++ b/Registry/setregbuilder.assetprocessor.setreg
@@ -1,5 +1,5 @@
 //
-// Copyright (c) Contributors to the Open 3D Engine Project
+// 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/SerializeContextAnalysis.bat b/SerializeContextAnalysis.bat
index 663909e1a2..078671b8b8 100644
--- a/SerializeContextAnalysis.bat
+++ b/SerializeContextAnalysis.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Templates/AssetGem/Template/CMakeLists.txt b/Templates/AssetGem/Template/CMakeLists.txt
index bd18ce90fc..3479c0b34c 100644
--- a/Templates/AssetGem/Template/CMakeLists.txt
+++ b/Templates/AssetGem/Template/CMakeLists.txt
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/CMakeLists.txt b/Templates/DefaultGem/Template/CMakeLists.txt
index 1a56806069..d00a5f0128 100644
--- a/Templates/DefaultGem/Template/CMakeLists.txt
+++ b/Templates/DefaultGem/Template/CMakeLists.txt
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/${NameLower}_editor_files.cmake b/Templates/DefaultGem/Template/Code/${NameLower}_editor_files.cmake
index 64659bd40e..a45b0cd905 100644
--- a/Templates/DefaultGem/Template/Code/${NameLower}_editor_files.cmake
+++ b/Templates/DefaultGem/Template/Code/${NameLower}_editor_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/${NameLower}_editor_shared_files.cmake b/Templates/DefaultGem/Template/Code/${NameLower}_editor_shared_files.cmake
index ecdc928144..aa40de2163 100644
--- a/Templates/DefaultGem/Template/Code/${NameLower}_editor_shared_files.cmake
+++ b/Templates/DefaultGem/Template/Code/${NameLower}_editor_shared_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/${NameLower}_editor_tests_files.cmake b/Templates/DefaultGem/Template/Code/${NameLower}_editor_tests_files.cmake
index 3d1293d059..1b5f6df9aa 100644
--- a/Templates/DefaultGem/Template/Code/${NameLower}_editor_tests_files.cmake
+++ b/Templates/DefaultGem/Template/Code/${NameLower}_editor_tests_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/${NameLower}_files.cmake b/Templates/DefaultGem/Template/Code/${NameLower}_files.cmake
index e9e5d571b0..e3c1792ae6 100644
--- a/Templates/DefaultGem/Template/Code/${NameLower}_files.cmake
+++ b/Templates/DefaultGem/Template/Code/${NameLower}_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/${NameLower}_shared_files.cmake b/Templates/DefaultGem/Template/Code/${NameLower}_shared_files.cmake
index 386f6bace1..3381f0f5e8 100644
--- a/Templates/DefaultGem/Template/Code/${NameLower}_shared_files.cmake
+++ b/Templates/DefaultGem/Template/Code/${NameLower}_shared_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/${NameLower}_tests_files.cmake b/Templates/DefaultGem/Template/Code/${NameLower}_tests_files.cmake
index c7d93fdf34..8e618957df 100644
--- a/Templates/DefaultGem/Template/Code/${NameLower}_tests_files.cmake
+++ b/Templates/DefaultGem/Template/Code/${NameLower}_tests_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/CMakeLists.txt b/Templates/DefaultGem/Template/Code/CMakeLists.txt
index 9d69aa77a4..015c2b28fb 100644
--- a/Templates/DefaultGem/Template/Code/CMakeLists.txt
+++ b/Templates/DefaultGem/Template/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Include/${Name}/${Name}Bus.h b/Templates/DefaultGem/Template/Code/Include/${Name}/${Name}Bus.h
index 92e2ea6f45..2b6b2f938d 100644
--- a/Templates/DefaultGem/Template/Code/Include/${Name}/${Name}Bus.h
+++ b/Templates/DefaultGem/Template/Code/Include/${Name}/${Name}Bus.h
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Platform/Android/${NameLower}_android_files.cmake b/Templates/DefaultGem/Template/Code/Platform/Android/${NameLower}_android_files.cmake
index 89dde8670b..bdb5876b70 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Android/${NameLower}_android_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Android/${NameLower}_android_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake b/Templates/DefaultGem/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
index 89dde8670b..bdb5876b70 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Android/PAL_android.cmake b/Templates/DefaultGem/Template/Code/Platform/Android/PAL_android.cmake
index 0a6f76f99e..4440f7083e 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Android/PAL_android.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake b/Templates/DefaultGem/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
index 866a83c820..459af43c44 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake b/Templates/DefaultGem/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
index 866a83c820..459af43c44 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Linux/PAL_linux.cmake b/Templates/DefaultGem/Template/Code/Platform/Linux/PAL_linux.cmake
index 5631708717..eb475b256e 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Linux/PAL_linux.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake b/Templates/DefaultGem/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
index e0611bef93..1dd04d1b58 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake b/Templates/DefaultGem/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
index e0611bef93..1dd04d1b58 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Mac/PAL_mac.cmake b/Templates/DefaultGem/Template/Code/Platform/Mac/PAL_mac.cmake
index 5631708717..eb475b256e 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Mac/PAL_mac.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake b/Templates/DefaultGem/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
index fc1345a894..c9c61b2b25 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake b/Templates/DefaultGem/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
index fc1345a894..c9c61b2b25 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/Windows/PAL_windows.cmake b/Templates/DefaultGem/Template/Code/Platform/Windows/PAL_windows.cmake
index 5631708717..eb475b256e 100644
--- a/Templates/DefaultGem/Template/Code/Platform/Windows/PAL_windows.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake b/Templates/DefaultGem/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
index 4d13d420ff..10dc197857 100644
--- a/Templates/DefaultGem/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake b/Templates/DefaultGem/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
index 4d13d420ff..10dc197857 100644
--- a/Templates/DefaultGem/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Platform/iOS/PAL_ios.cmake b/Templates/DefaultGem/Template/Code/Platform/iOS/PAL_ios.cmake
index 5631708717..eb475b256e 100644
--- a/Templates/DefaultGem/Template/Code/Platform/iOS/PAL_ios.cmake
+++ b/Templates/DefaultGem/Template/Code/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Code/Source/${Name}EditorModule.cpp b/Templates/DefaultGem/Template/Code/Source/${Name}EditorModule.cpp
index 88a2f804d7..bff1c61314 100644
--- a/Templates/DefaultGem/Template/Code/Source/${Name}EditorModule.cpp
+++ b/Templates/DefaultGem/Template/Code/Source/${Name}EditorModule.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.cpp b/Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.cpp
index 6265a1dc35..2c3668c69a 100644
--- a/Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.cpp
+++ b/Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.h b/Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.h
index 8111b1b636..1ea6b66276 100644
--- a/Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.h
+++ b/Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.h
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Source/${Name}Module.cpp b/Templates/DefaultGem/Template/Code/Source/${Name}Module.cpp
index 6aef3dbd31..bedbaa7305 100644
--- a/Templates/DefaultGem/Template/Code/Source/${Name}Module.cpp
+++ b/Templates/DefaultGem/Template/Code/Source/${Name}Module.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Source/${Name}ModuleInterface.h b/Templates/DefaultGem/Template/Code/Source/${Name}ModuleInterface.h
index 29e3f4c43d..ff547443ac 100644
--- a/Templates/DefaultGem/Template/Code/Source/${Name}ModuleInterface.h
+++ b/Templates/DefaultGem/Template/Code/Source/${Name}ModuleInterface.h
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.cpp b/Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.cpp
index 2138f034d9..40a60f2fb9 100644
--- a/Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.cpp
+++ b/Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.h b/Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.h
index 6f0455418f..e0d69c1a0b 100644
--- a/Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.h
+++ b/Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.h
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Tests/${Name}EditorTest.cpp b/Templates/DefaultGem/Template/Code/Tests/${Name}EditorTest.cpp
index 3aa2be49a6..a905f1814a 100644
--- a/Templates/DefaultGem/Template/Code/Tests/${Name}EditorTest.cpp
+++ b/Templates/DefaultGem/Template/Code/Tests/${Name}EditorTest.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Code/Tests/${Name}Test.cpp b/Templates/DefaultGem/Template/Code/Tests/${Name}Test.cpp
index 3aa2be49a6..a905f1814a 100644
--- a/Templates/DefaultGem/Template/Code/Tests/${Name}Test.cpp
+++ b/Templates/DefaultGem/Template/Code/Tests/${Name}Test.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultGem/Template/Platform/Android/android_gem.cmake b/Templates/DefaultGem/Template/Platform/Android/android_gem.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultGem/Template/Platform/Android/android_gem.cmake
+++ b/Templates/DefaultGem/Template/Platform/Android/android_gem.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Platform/Linux/linux_gem.cmake b/Templates/DefaultGem/Template/Platform/Linux/linux_gem.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultGem/Template/Platform/Linux/linux_gem.cmake
+++ b/Templates/DefaultGem/Template/Platform/Linux/linux_gem.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Platform/Mac/mac_gem.cmake b/Templates/DefaultGem/Template/Platform/Mac/mac_gem.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultGem/Template/Platform/Mac/mac_gem.cmake
+++ b/Templates/DefaultGem/Template/Platform/Mac/mac_gem.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Platform/Windows/windows_gem.cmake b/Templates/DefaultGem/Template/Platform/Windows/windows_gem.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultGem/Template/Platform/Windows/windows_gem.cmake
+++ b/Templates/DefaultGem/Template/Platform/Windows/windows_gem.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultGem/Template/Platform/iOS/ios_gem.cmake b/Templates/DefaultGem/Template/Platform/iOS/ios_gem.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultGem/Template/Platform/iOS/ios_gem.cmake
+++ b/Templates/DefaultGem/Template/Platform/iOS/ios_gem.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/CMakeLists.txt b/Templates/DefaultProject/Template/CMakeLists.txt
index 4f3a2cc1a3..cdd5f786a7 100644
--- a/Templates/DefaultProject/Template/CMakeLists.txt
+++ b/Templates/DefaultProject/Template/CMakeLists.txt
@@ -1,6 +1,6 @@
 # {BEGIN_LICENSE}
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/${NameLower}_files.cmake b/Templates/DefaultProject/Template/Code/${NameLower}_files.cmake
index a0906325c8..76f2b9a978 100644
--- a/Templates/DefaultProject/Template/Code/${NameLower}_files.cmake
+++ b/Templates/DefaultProject/Template/Code/${NameLower}_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/${NameLower}_shared_files.cmake b/Templates/DefaultProject/Template/Code/${NameLower}_shared_files.cmake
index 386f6bace1..3381f0f5e8 100644
--- a/Templates/DefaultProject/Template/Code/${NameLower}_shared_files.cmake
+++ b/Templates/DefaultProject/Template/Code/${NameLower}_shared_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/CMakeLists.txt b/Templates/DefaultProject/Template/Code/CMakeLists.txt
index 95d8d6dc4b..8955d289ad 100644
--- a/Templates/DefaultProject/Template/Code/CMakeLists.txt
+++ b/Templates/DefaultProject/Template/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Include/${Name}/${Name}Bus.h b/Templates/DefaultProject/Template/Code/Include/${Name}/${Name}Bus.h
index 92e2ea6f45..2b6b2f938d 100644
--- a/Templates/DefaultProject/Template/Code/Include/${Name}/${Name}Bus.h
+++ b/Templates/DefaultProject/Template/Code/Include/${Name}/${Name}Bus.h
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
index ad75435f86..7a80ce0e1b 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
index 9c13bdfa30..c39c8e4a48 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Android/PAL_android.cmake b/Templates/DefaultProject/Template/Code/Platform/Android/PAL_android.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Android/PAL_android.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
index 104264ec86..c829a7120c 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
index 9c13bdfa30..c39c8e4a48 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Linux/PAL_linux.cmake b/Templates/DefaultProject/Template/Code/Platform/Linux/PAL_linux.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Linux/PAL_linux.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
index 5e4d3d68fc..e892e058dc 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
index c794ebc3d5..fed1903c0e 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Mac/PAL_mac.cmake b/Templates/DefaultProject/Template/Code/Platform/Mac/PAL_mac.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Mac/PAL_mac.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
index 9c13bdfa30..c39c8e4a48 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
index a225176144..d577c56b1e 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/Windows/PAL_windows.cmake b/Templates/DefaultProject/Template/Code/Platform/Windows/PAL_windows.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Windows/PAL_windows.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake b/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
index 3e7d17477c..b9a8d49b48 100644
--- a/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake b/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
index 9c13bdfa30..c39c8e4a48 100644
--- a/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Platform/iOS/PAL_ios.cmake b/Templates/DefaultProject/Template/Code/Platform/iOS/PAL_ios.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/DefaultProject/Template/Code/Platform/iOS/PAL_ios.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Code/Source/${Name}Module.cpp b/Templates/DefaultProject/Template/Code/Source/${Name}Module.cpp
index 5bed0f1c30..a9527ae79d 100644
--- a/Templates/DefaultProject/Template/Code/Source/${Name}Module.cpp
+++ b/Templates/DefaultProject/Template/Code/Source/${Name}Module.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.cpp b/Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.cpp
index 627ca41431..576cd01203 100644
--- a/Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.cpp
+++ b/Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.h b/Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.h
index c492dfc4c7..b25b0106b6 100644
--- a/Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.h
+++ b/Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.h
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultProject/Template/Code/enabled_gems.cmake b/Templates/DefaultProject/Template/Code/enabled_gems.cmake
index 5cab2e09da..99c3b89895 100644
--- a/Templates/DefaultProject/Template/Code/enabled_gems.cmake
+++ b/Templates/DefaultProject/Template/Code/enabled_gems.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/EngineFinder.cmake b/Templates/DefaultProject/Template/EngineFinder.cmake
index d1c565a2e6..de109df12d 100644
--- a/Templates/DefaultProject/Template/EngineFinder.cmake
+++ b/Templates/DefaultProject/Template/EngineFinder.cmake
@@ -1,6 +1,6 @@
 # {BEGIN_LICENSE}
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Platform/Android/android_project.cmake b/Templates/DefaultProject/Template/Platform/Android/android_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultProject/Template/Platform/Android/android_project.cmake
+++ b/Templates/DefaultProject/Template/Platform/Android/android_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Platform/Linux/linux_project.cmake b/Templates/DefaultProject/Template/Platform/Linux/linux_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultProject/Template/Platform/Linux/linux_project.cmake
+++ b/Templates/DefaultProject/Template/Platform/Linux/linux_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Platform/Mac/mac_project.cmake b/Templates/DefaultProject/Template/Platform/Mac/mac_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultProject/Template/Platform/Mac/mac_project.cmake
+++ b/Templates/DefaultProject/Template/Platform/Mac/mac_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Platform/Windows/windows_project.cmake b/Templates/DefaultProject/Template/Platform/Windows/windows_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultProject/Template/Platform/Windows/windows_project.cmake
+++ b/Templates/DefaultProject/Template/Platform/Windows/windows_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Platform/iOS/ios_project.cmake b/Templates/DefaultProject/Template/Platform/iOS/ios_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/DefaultProject/Template/Platform/iOS/ios_project.cmake
+++ b/Templates/DefaultProject/Template/Platform/iOS/ios_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/DefaultProject/Template/Resources/CryEngineLogoLauncher.bmp b/Templates/DefaultProject/Template/Resources/CryEngineLogoLauncher.bmp
deleted file mode 100644
index fe0adc54a4..0000000000
--- a/Templates/DefaultProject/Template/Resources/CryEngineLogoLauncher.bmp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf6d56fe4c367d39bd78500dd34332fcad57ad41241768b52781dbdb60ddd972
-size 347568
diff --git a/Templates/DefaultProject/Template/Resources/GameSDK.ico b/Templates/DefaultProject/Template/Resources/GameSDK.ico
index cb935cd926..0be1f28b6c 100644
--- a/Templates/DefaultProject/Template/Resources/GameSDK.ico
+++ b/Templates/DefaultProject/Template/Resources/GameSDK.ico
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61efd8df621780af995fc1250918df5e00364ff00f849bef67702cd4b0a152e1
-size 65537
+oid sha256:41239f8345fa91fe546442208461ad3cd17c7a7a7047af45018b97363bfea204
+size 109783
diff --git a/Templates/DefaultProject/Template/Resources/LegacyLogoLauncher.bmp b/Templates/DefaultProject/Template/Resources/LegacyLogoLauncher.bmp
new file mode 100644
index 0000000000..7a35cddd49
--- /dev/null
+++ b/Templates/DefaultProject/Template/Resources/LegacyLogoLauncher.bmp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c8433178baebafe984ca23d9325d3c71b5a177fc3b3b869afbb01a583542fbe
+size 462842
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128 _2x.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128 _2x.png
index 5970ea34ba..d30f2d3686 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128 _2x.png	
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128 _2x.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e38257b6917cdf5d73e90e6009f10c8736d62b20c4e785085305075c7e6320e2
-size 32037
+oid sha256:094620c172320b062f9a1f8cc758ef4bbee11bc0a6049f46ad6b42f9bf613c92
+size 9679
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128.png
index 9e30e09547..5a73a4a54d 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f41a37d2347a617e93bd97adaf6d4c161c471ca3ef7e04b98c65ddda52396dc
-size 27833
+oid sha256:f3c651ca45a83d0f68bdaa466826a29b2ca6f674e225d90e68b7dbadc2ba582d
+size 6620
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16.png
index aeb29abd0a..a7ec66841f 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b07984494059bf827bc485cbea06d12e0283811face1a18799495f9ba7ae8af1
-size 20779
+oid sha256:f7d5b15add5104d91a03df7d86898f4bc415d095d11c23555b24440497371948
+size 1061
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16_2x.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16_2x.png
index 445a389d61..474378c926 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16_2x.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16_2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e645142d284de40aafb7a4a858f3df92b6a5ba9b03fa5f1a2d3cb25211597926
-size 21857
+oid sha256:148fdae6493d7b7e1bb6cc6aae1861e0469838f54dcb3c15cc157a548c707fec
+size 1910
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256 _2x.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256 _2x.png
index 0904cf7ce8..f9ff1c15e3 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256 _2x.png	
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256 _2x.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07631f41b8dea80713d2463f81a713a9a93798975b6fb50afbeeb13d26c57fa2
-size 48899
+oid sha256:934502e242ff7a2e34e21eed1424b5e0953e701761d158520b3297944132328e
+size 18716
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256.png
index 5970ea34ba..d30f2d3686 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e38257b6917cdf5d73e90e6009f10c8736d62b20c4e785085305075c7e6320e2
-size 32037
+oid sha256:094620c172320b062f9a1f8cc758ef4bbee11bc0a6049f46ad6b42f9bf613c92
+size 9679
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32.png
index 445a389d61..474378c926 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e645142d284de40aafb7a4a858f3df92b6a5ba9b03fa5f1a2d3cb25211597926
-size 21857
+oid sha256:148fdae6493d7b7e1bb6cc6aae1861e0469838f54dcb3c15cc157a548c707fec
+size 1910
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32_2x.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32_2x.png
index 1fad9bda96..3359e99cd4 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32_2x.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32_2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad83faf98b49f4e37112baedeae726f4f8d71bcdd1961d9cdad31f043f8ca666
-size 24003
+oid sha256:749bcd29d73e5ef2d1ef8b2d878626d0bca09c6b0d5f1c9dc6cefe7b9082c8cc
+size 3758
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512.png
index e1517dddb6..f9ff1c15e3 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68529a6c11d5ffa7ecd9d5bbb11ceea28e6852bd45946b525af09602c9a1e1bf
-size 48899
+oid sha256:934502e242ff7a2e34e21eed1424b5e0953e701761d158520b3297944132328e
+size 18716
diff --git a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512_2x.png b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512_2x.png
index b425cb685f..a736c7f6b8 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512_2x.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512_2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a70003840b418848b2ce6c18ed7cbbfcd6fcf76598a6601dca8b98d9b6c1a2f
-size 114706
+oid sha256:5719043940db268dccd2e20bd9d6aa13131890d43edf002a173714ae33890422
+size 29510
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1024x768.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1024x768.png
index 1249ef3703..9f586d6af3 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1024x768.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1024x768.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31afa7ed44c5d9844c8d6ce08beccac482c3f43590869a3d190d06e2df377ccc
-size 137472
+oid sha256:a4018d9df45b4a04d4cf24a40fe01aa7e30e44a9fdd8ad9a41b0d87791786c12
+size 30442
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1536x2048.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1536x2048.png
index cdb6d5a82a..c978631c22 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1536x2048.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1536x2048.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0aac8ef9899442820bec0df8bf6434a46cc787d57c5d6d38a04727b8dc310048
-size 338281
+oid sha256:2eea06cb8ad05acefe9664551af5645d52d9763b82473b1fd4a2b2b6f62e96d3
+size 53550
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage2048x1536.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage2048x1536.png
index 954d3084c8..a52e832a42 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage2048x1536.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage2048x1536.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c07495891f15b138ba09f142777b0f43217bf8be05cbb74ba938319f3425980c
-size 321125
+oid sha256:90991aca91ab7222fdb85c03947cff38f549a6492551e7447e0c8f55022aae48
+size 52467
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage768x1024.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage768x1024.png
index 021319fbc3..3e441fab3b 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage768x1024.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage768x1024.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6bf6acb92421a453a36fc143ab6cefda14d631ea5e6dbf95c6e252a445fcbac
-size 144797
+oid sha256:6c8439a64d18dbff17dd67f6405bf49f99695e9b22fc2cc541dc72c6e3167307
+size 30564
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x1136.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x1136.png
index a15fd777fa..e662e9675c 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x1136.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x1136.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9ad650fda925b1c076a67d1ef70315fe4f14db888c9fd36ee4eba1d18c1e7d1
-size 166749
+oid sha256:f752615184160d7a78f28d9eef354c86e544f11eb1dde9f651d7acd315b3f2e6
+size 35934
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x960.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x960.png
index 2855f4069d..2753529fc2 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x960.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x960.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16f6e9d7bd15fc528d934c252213de8792812e708b1810191c5f1767f7165852
-size 142331
+oid sha256:1a43f1d893e85aa99d335a657ec0f6c13a741db976c033451ab9a2328b8a5970
+size 35559
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon152x152.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon152x152.png
index b0dd493c11..ad18894411 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon152x152.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon152x152.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4901093fa6190bf37291b0fb6de23fba1be8ebbd742775a8565a4106722fbb6
-size 31942
+oid sha256:ebfc95bd4c0cbcc53d0ef9d314d26e09a347a22dabbf210597f405d9ed8646bf
+size 7729
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon76x76.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon76x76.png
index 21aa62e96b..888d8cf785 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon76x76.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon76x76.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4ae97c4f44910121a61686862c8342ce598db4cdf9d46b29e96d3cb9e43bd06
-size 22158
+oid sha256:99cb7da9282cfcfa64598455827f27ca6791d45ca0d2c3c2dc090d82468dac03
+size 4447
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadProAppIcon167x167.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadProAppIcon167x167.png
index 6b696a84b2..86aa72016a 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadProAppIcon167x167.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadProAppIcon167x167.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:061e2d0ce8dc852dd298c80f2aed5fee8ea4b87511c00662aa2d00922c0ba3c2
-size 30162
+oid sha256:101568e946f1d4cea86d666187bbf71116bbf62e6eaf6d80bc3c5e2e184bdb15
+size 7938
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon29x29.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon29x29.png
index f3dfa05839..79331c29b1 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon29x29.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon29x29.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fb4b4b77620d99dae7473b7bd8affe14630419835bd5719167ed200e657fa4f
-size 17504
+oid sha256:cf930ffd4efb0b7b627e05aac6e0f56252ea206623e8b5d097d803aa315cdfb8
+size 1812
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon58x58.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon58x58.png
index 5325b805fd..27c4aaef2e 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon58x58.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon58x58.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8aa9b1194f3244025578225a6a87cbc2dd12c70955ff615c8af640ea7f1334f1
-size 19619
+oid sha256:ba5fea53b349e254b4625035a308d5731cb06f6d0adc278874d14db2627962cb
+size 3424
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon40x40.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon40x40.png
index 98d8455838..df1630a95a 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon40x40.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon40x40.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c25ffb1af8160b3202977de8c32aaa235e22c643ffd8004e4546c96868ef3b9
-size 18317
+oid sha256:cf087f357cd439d14651073ac079542c60f0648a30dced2a8d19912124b3f8b6
+size 2310
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon80x80.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon80x80.png
index 7482f6c892..4b7f5d6318 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon80x80.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon80x80.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2db961b8f922a552d8ad374fdb56029efd4049a6cde10399b3d961242c82ce53
-size 22571
+oid sha256:421ad4db14c28ed18666158f9ec30747c5b8c757405c1efb32442978911b0c06
+size 4437
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon120x120.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon120x120.png
index da987b86f9..674c6da124 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon120x120.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon120x120.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f39d897a57d4da0a70ede7c91339660b28e9d8c57b3e7d749807b13baa4b85f3
-size 28559
+oid sha256:0d0044ebf7e0a5dd23ed64a1289c705d8f6c3c41a62d65e5a1371058855b8cec
+size 6546
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon180x180.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon180x180.png
index 205e025c36..c0c10c2390 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon180x180.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon180x180.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:263b75d58328499eef1f8fa2e64c30706f546badcc0c4464a043b231da93cd0d
-size 34969
+oid sha256:3b8717c5f2109dfce1bf7b017278059d4915b524a6eb7e83cfb1926e54ed6869
+size 7383
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon58x58.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon58x58.png
index 0deb4f4f35..27c4aaef2e 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon58x58.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon58x58.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33522ad8a8e826b22dd9ad214f56e63e24bf55c00bd8c845925d848b855dfb48
-size 19619
+oid sha256:ba5fea53b349e254b4625035a308d5731cb06f6d0adc278874d14db2627962cb
+size 3424
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon87x87.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon87x87.png
index 78591751d7..9093e13867 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon87x87.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon87x87.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f405c9f3d908d038aea26049e533b0d10955adfac370c7b3b80209997ea706d0
-size 24407
+oid sha256:a32908a839a6cb0ca2a76d6aa60376ba8a14b4428f06c13149ec277514eb5676
+size 4533
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon120x120.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon120x120.png
index 034dcb9fed..674c6da124 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon120x120.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon120x120.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d110f6e151799a2327bcdf5ef94d6fc82b114783a8cc973a8915896679ba4a80
-size 28559
+oid sha256:0d0044ebf7e0a5dd23ed64a1289c705d8f6c3c41a62d65e5a1371058855b8cec
+size 6546
diff --git a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon80x80.png b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon80x80.png
index f0fa89149c..4b7f5d6318 100644
--- a/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon80x80.png
+++ b/Templates/DefaultProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon80x80.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db8f00568fad4e49b05249aaa7a48c9fbf85c8b7a78489c83dc9b8161778bcef
-size 22571
+oid sha256:421ad4db14c28ed18666158f9ec30747c5b8c757405c1efb32442978911b0c06
+size 4437
diff --git a/Templates/DefaultProject/Template/ShaderLib/scenesrg.srgi b/Templates/DefaultProject/Template/ShaderLib/scenesrg.srgi
index ce5025b704..f02c84d04c 100644
--- a/Templates/DefaultProject/Template/ShaderLib/scenesrg.srgi
+++ b/Templates/DefaultProject/Template/ShaderLib/scenesrg.srgi
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultProject/Template/ShaderLib/viewsrg.srgi b/Templates/DefaultProject/Template/ShaderLib/viewsrg.srgi
index 529f257f9b..dcaed96cab 100644
--- a/Templates/DefaultProject/Template/ShaderLib/viewsrg.srgi
+++ b/Templates/DefaultProject/Template/ShaderLib/viewsrg.srgi
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultProject/Template/Shaders/CommonVS.azsli b/Templates/DefaultProject/Template/Shaders/CommonVS.azsli
index bff8c61f03..3ff6751c5e 100644
--- a/Templates/DefaultProject/Template/Shaders/CommonVS.azsli
+++ b/Templates/DefaultProject/Template/Shaders/CommonVS.azsli
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultProject/Template/Shaders/ShaderResourceGroups/SceneSrg.azsli b/Templates/DefaultProject/Template/Shaders/ShaderResourceGroups/SceneSrg.azsli
index d317ab7339..f2c1224387 100644
--- a/Templates/DefaultProject/Template/Shaders/ShaderResourceGroups/SceneSrg.azsli
+++ b/Templates/DefaultProject/Template/Shaders/ShaderResourceGroups/SceneSrg.azsli
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/DefaultProject/Template/preview.png b/Templates/DefaultProject/Template/preview.png
index 0f393ac886..82234dbf6b 100644
--- a/Templates/DefaultProject/Template/preview.png
+++ b/Templates/DefaultProject/Template/preview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ac9dd09bde78f389e3725ac49d61eff109857e004840bc0bc3881739df9618d
-size 2217
+oid sha256:1cf8339fb51f82a68d2ab475c0476960e75a79d96d239c5b7cd272fbe4990ffe
+size 2770
diff --git a/Templates/DefaultProject/template.json b/Templates/DefaultProject/template.json
index 67df3cccf7..fabfb0cf18 100644
--- a/Templates/DefaultProject/template.json
+++ b/Templates/DefaultProject/template.json
@@ -4,8 +4,8 @@
     "restricted_platform_relative_path": "Templates",
     "origin": "The primary repo for DefaultProject goes here: i.e. http://www.mydomain.com",
     "license": "What license DefaultProject uses goes here: i.e. https://opensource.org/licenses/MIT",
-    "display_name": "Default",
-    "summary": "A short description of DefaultProject.",
+    "display_name": "Standard",
+    "summary": "This template has everything you need to build a full online 3D game or application.",
     "included_gems": ["Atom","Camera","EMotionFX","UI","Maestro","Input","ImGui"],
     "canonical_tags": [],
     "user_tags": [
@@ -248,8 +248,8 @@
             "isOptional": false
         },
         {
-            "file": "Resources/CryEngineLogoLauncher.bmp",
-            "origin": "Resources/CryEngineLogoLauncher.bmp",
+            "file": "Resources/LegacyLogoLauncher.bmp",
+            "origin": "Resources/LegacyLogoLauncher.bmp",
             "isTemplated": false,
             "isOptional": false
         },
diff --git a/Templates/MinimalProject/Template/CMakeLists.txt b/Templates/MinimalProject/Template/CMakeLists.txt
index 4f3a2cc1a3..cdd5f786a7 100644
--- a/Templates/MinimalProject/Template/CMakeLists.txt
+++ b/Templates/MinimalProject/Template/CMakeLists.txt
@@ -1,6 +1,6 @@
 # {BEGIN_LICENSE}
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/${NameLower}_files.cmake b/Templates/MinimalProject/Template/Code/${NameLower}_files.cmake
index a0906325c8..76f2b9a978 100644
--- a/Templates/MinimalProject/Template/Code/${NameLower}_files.cmake
+++ b/Templates/MinimalProject/Template/Code/${NameLower}_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/${NameLower}_shared_files.cmake b/Templates/MinimalProject/Template/Code/${NameLower}_shared_files.cmake
index 386f6bace1..3381f0f5e8 100644
--- a/Templates/MinimalProject/Template/Code/${NameLower}_shared_files.cmake
+++ b/Templates/MinimalProject/Template/Code/${NameLower}_shared_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/CMakeLists.txt b/Templates/MinimalProject/Template/Code/CMakeLists.txt
index 95d8d6dc4b..8955d289ad 100644
--- a/Templates/MinimalProject/Template/Code/CMakeLists.txt
+++ b/Templates/MinimalProject/Template/Code/CMakeLists.txt
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Include/${Name}/${Name}Bus.h b/Templates/MinimalProject/Template/Code/Include/${Name}/${Name}Bus.h
index 1e8318d17d..26a00b995a 100644
--- a/Templates/MinimalProject/Template/Code/Include/${Name}/${Name}Bus.h
+++ b/Templates/MinimalProject/Template/Code/Include/${Name}/${Name}Bus.h
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/MinimalProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake b/Templates/MinimalProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
index ad75435f86..7a80ce0e1b 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake b/Templates/MinimalProject/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
index 9c13bdfa30..c39c8e4a48 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Android/${NameLower}_shared_android_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Android/PAL_android.cmake b/Templates/MinimalProject/Template/Code/Platform/Android/PAL_android.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Android/PAL_android.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake b/Templates/MinimalProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
index 104264ec86..c829a7120c 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake b/Templates/MinimalProject/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
index 9c13bdfa30..c39c8e4a48 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Linux/${NameLower}_shared_linux_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Linux/PAL_linux.cmake b/Templates/MinimalProject/Template/Code/Platform/Linux/PAL_linux.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Linux/PAL_linux.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake b/Templates/MinimalProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
index 5e4d3d68fc..e892e058dc 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake b/Templates/MinimalProject/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
index c794ebc3d5..fed1903c0e 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Mac/${NameLower}_shared_mac_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Mac/PAL_mac.cmake b/Templates/MinimalProject/Template/Code/Platform/Mac/PAL_mac.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Mac/PAL_mac.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake b/Templates/MinimalProject/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
index 9c13bdfa30..c39c8e4a48 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Windows/${NameLower}_shared_windows_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake b/Templates/MinimalProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
index a225176144..d577c56b1e 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/Windows/PAL_windows.cmake b/Templates/MinimalProject/Template/Code/Platform/Windows/PAL_windows.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/MinimalProject/Template/Code/Platform/Windows/PAL_windows.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake b/Templates/MinimalProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
index 3e7d17477c..b9a8d49b48 100644
--- a/Templates/MinimalProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake b/Templates/MinimalProject/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
index 9c13bdfa30..c39c8e4a48 100644
--- a/Templates/MinimalProject/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/iOS/${NameLower}_shared_ios_files.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Platform/iOS/PAL_ios.cmake b/Templates/MinimalProject/Template/Code/Platform/iOS/PAL_ios.cmake
index c6850c7c38..c0888aaced 100644
--- a/Templates/MinimalProject/Template/Code/Platform/iOS/PAL_ios.cmake
+++ b/Templates/MinimalProject/Template/Code/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Code/Source/${Name}Module.cpp b/Templates/MinimalProject/Template/Code/Source/${Name}Module.cpp
index 5bed0f1c30..a9527ae79d 100644
--- a/Templates/MinimalProject/Template/Code/Source/${Name}Module.cpp
+++ b/Templates/MinimalProject/Template/Code/Source/${Name}Module.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/MinimalProject/Template/Code/Source/${Name}SystemComponent.cpp b/Templates/MinimalProject/Template/Code/Source/${Name}SystemComponent.cpp
index 6ba14c6ef4..6b804591cb 100644
--- a/Templates/MinimalProject/Template/Code/Source/${Name}SystemComponent.cpp
+++ b/Templates/MinimalProject/Template/Code/Source/${Name}SystemComponent.cpp
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/MinimalProject/Template/Code/Source/${Name}SystemComponent.h b/Templates/MinimalProject/Template/Code/Source/${Name}SystemComponent.h
index c492dfc4c7..b25b0106b6 100644
--- a/Templates/MinimalProject/Template/Code/Source/${Name}SystemComponent.h
+++ b/Templates/MinimalProject/Template/Code/Source/${Name}SystemComponent.h
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/MinimalProject/Template/Code/enabled_gems.cmake b/Templates/MinimalProject/Template/Code/enabled_gems.cmake
index aea155a78e..13774c2831 100644
--- a/Templates/MinimalProject/Template/Code/enabled_gems.cmake
+++ b/Templates/MinimalProject/Template/Code/enabled_gems.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/EngineFinder.cmake b/Templates/MinimalProject/Template/EngineFinder.cmake
index d1c565a2e6..de109df12d 100644
--- a/Templates/MinimalProject/Template/EngineFinder.cmake
+++ b/Templates/MinimalProject/Template/EngineFinder.cmake
@@ -1,6 +1,6 @@
 # {BEGIN_LICENSE}
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Platform/Android/android_project.cmake b/Templates/MinimalProject/Template/Platform/Android/android_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/MinimalProject/Template/Platform/Android/android_project.cmake
+++ b/Templates/MinimalProject/Template/Platform/Android/android_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Platform/Linux/linux_project.cmake b/Templates/MinimalProject/Template/Platform/Linux/linux_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/MinimalProject/Template/Platform/Linux/linux_project.cmake
+++ b/Templates/MinimalProject/Template/Platform/Linux/linux_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Platform/Mac/mac_project.cmake b/Templates/MinimalProject/Template/Platform/Mac/mac_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/MinimalProject/Template/Platform/Mac/mac_project.cmake
+++ b/Templates/MinimalProject/Template/Platform/Mac/mac_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Platform/Windows/windows_project.cmake b/Templates/MinimalProject/Template/Platform/Windows/windows_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/MinimalProject/Template/Platform/Windows/windows_project.cmake
+++ b/Templates/MinimalProject/Template/Platform/Windows/windows_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Platform/iOS/ios_project.cmake b/Templates/MinimalProject/Template/Platform/iOS/ios_project.cmake
index d52d53f6dc..13f237b63c 100644
--- a/Templates/MinimalProject/Template/Platform/iOS/ios_project.cmake
+++ b/Templates/MinimalProject/Template/Platform/iOS/ios_project.cmake
@@ -1,5 +1,5 @@
 # {BEGIN_LICENSE}
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Templates/MinimalProject/Template/Resources/CryEngineLogoLauncher.bmp b/Templates/MinimalProject/Template/Resources/CryEngineLogoLauncher.bmp
deleted file mode 100644
index fe0adc54a4..0000000000
--- a/Templates/MinimalProject/Template/Resources/CryEngineLogoLauncher.bmp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf6d56fe4c367d39bd78500dd34332fcad57ad41241768b52781dbdb60ddd972
-size 347568
diff --git a/Templates/MinimalProject/Template/Resources/GameSDK.ico b/Templates/MinimalProject/Template/Resources/GameSDK.ico
index cb935cd926..0be1f28b6c 100644
--- a/Templates/MinimalProject/Template/Resources/GameSDK.ico
+++ b/Templates/MinimalProject/Template/Resources/GameSDK.ico
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61efd8df621780af995fc1250918df5e00364ff00f849bef67702cd4b0a152e1
-size 65537
+oid sha256:41239f8345fa91fe546442208461ad3cd17c7a7a7047af45018b97363bfea204
+size 109783
diff --git a/Templates/MinimalProject/Template/Resources/LegacyLogoLauncher.bmp b/Templates/MinimalProject/Template/Resources/LegacyLogoLauncher.bmp
new file mode 100644
index 0000000000..7a35cddd49
--- /dev/null
+++ b/Templates/MinimalProject/Template/Resources/LegacyLogoLauncher.bmp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c8433178baebafe984ca23d9325d3c71b5a177fc3b3b869afbb01a583542fbe
+size 462842
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128 _2x.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128 _2x.png
index 5970ea34ba..d30f2d3686 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128 _2x.png	
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128 _2x.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e38257b6917cdf5d73e90e6009f10c8736d62b20c4e785085305075c7e6320e2
-size 32037
+oid sha256:094620c172320b062f9a1f8cc758ef4bbee11bc0a6049f46ad6b42f9bf613c92
+size 9679
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128.png
index 9e30e09547..5a73a4a54d 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_128.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f41a37d2347a617e93bd97adaf6d4c161c471ca3ef7e04b98c65ddda52396dc
-size 27833
+oid sha256:f3c651ca45a83d0f68bdaa466826a29b2ca6f674e225d90e68b7dbadc2ba582d
+size 6620
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16.png
index aeb29abd0a..a7ec66841f 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b07984494059bf827bc485cbea06d12e0283811face1a18799495f9ba7ae8af1
-size 20779
+oid sha256:f7d5b15add5104d91a03df7d86898f4bc415d095d11c23555b24440497371948
+size 1061
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16_2x.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16_2x.png
index 445a389d61..474378c926 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16_2x.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_16_2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e645142d284de40aafb7a4a858f3df92b6a5ba9b03fa5f1a2d3cb25211597926
-size 21857
+oid sha256:148fdae6493d7b7e1bb6cc6aae1861e0469838f54dcb3c15cc157a548c707fec
+size 1910
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256 _2x.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256 _2x.png
index 0904cf7ce8..f9ff1c15e3 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256 _2x.png	
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256 _2x.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07631f41b8dea80713d2463f81a713a9a93798975b6fb50afbeeb13d26c57fa2
-size 48899
+oid sha256:934502e242ff7a2e34e21eed1424b5e0953e701761d158520b3297944132328e
+size 18716
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256.png
index 5970ea34ba..d30f2d3686 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_256.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e38257b6917cdf5d73e90e6009f10c8736d62b20c4e785085305075c7e6320e2
-size 32037
+oid sha256:094620c172320b062f9a1f8cc758ef4bbee11bc0a6049f46ad6b42f9bf613c92
+size 9679
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32.png
index 445a389d61..474378c926 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e645142d284de40aafb7a4a858f3df92b6a5ba9b03fa5f1a2d3cb25211597926
-size 21857
+oid sha256:148fdae6493d7b7e1bb6cc6aae1861e0469838f54dcb3c15cc157a548c707fec
+size 1910
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32_2x.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32_2x.png
index 1fad9bda96..3359e99cd4 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32_2x.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_32_2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad83faf98b49f4e37112baedeae726f4f8d71bcdd1961d9cdad31f043f8ca666
-size 24003
+oid sha256:749bcd29d73e5ef2d1ef8b2d878626d0bca09c6b0d5f1c9dc6cefe7b9082c8cc
+size 3758
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512.png
index e1517dddb6..f9ff1c15e3 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68529a6c11d5ffa7ecd9d5bbb11ceea28e6852bd45946b525af09602c9a1e1bf
-size 48899
+oid sha256:934502e242ff7a2e34e21eed1424b5e0953e701761d158520b3297944132328e
+size 18716
diff --git a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512_2x.png b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512_2x.png
index b425cb685f..a736c7f6b8 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512_2x.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/Mac/Images.xcassets/TestDPAppIcon.appiconset/icon_512_2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a70003840b418848b2ce6c18ed7cbbfcd6fcf76598a6601dca8b98d9b6c1a2f
-size 114706
+oid sha256:5719043940db268dccd2e20bd9d6aa13131890d43edf002a173714ae33890422
+size 29510
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1024x768.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1024x768.png
index 1249ef3703..9f586d6af3 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1024x768.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1024x768.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31afa7ed44c5d9844c8d6ce08beccac482c3f43590869a3d190d06e2df377ccc
-size 137472
+oid sha256:a4018d9df45b4a04d4cf24a40fe01aa7e30e44a9fdd8ad9a41b0d87791786c12
+size 30442
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1536x2048.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1536x2048.png
index cdb6d5a82a..c978631c22 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1536x2048.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage1536x2048.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0aac8ef9899442820bec0df8bf6434a46cc787d57c5d6d38a04727b8dc310048
-size 338281
+oid sha256:2eea06cb8ad05acefe9664551af5645d52d9763b82473b1fd4a2b2b6f62e96d3
+size 53550
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage2048x1536.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage2048x1536.png
index 954d3084c8..a52e832a42 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage2048x1536.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage2048x1536.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c07495891f15b138ba09f142777b0f43217bf8be05cbb74ba938319f3425980c
-size 321125
+oid sha256:90991aca91ab7222fdb85c03947cff38f549a6492551e7447e0c8f55022aae48
+size 52467
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage768x1024.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage768x1024.png
index 021319fbc3..3e441fab3b 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage768x1024.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPadLaunchImage768x1024.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6bf6acb92421a453a36fc143ab6cefda14d631ea5e6dbf95c6e252a445fcbac
-size 144797
+oid sha256:6c8439a64d18dbff17dd67f6405bf49f99695e9b22fc2cc541dc72c6e3167307
+size 30564
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x1136.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x1136.png
index a15fd777fa..e662e9675c 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x1136.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x1136.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9ad650fda925b1c076a67d1ef70315fe4f14db888c9fd36ee4eba1d18c1e7d1
-size 166749
+oid sha256:f752615184160d7a78f28d9eef354c86e544f11eb1dde9f651d7acd315b3f2e6
+size 35934
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x960.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x960.png
index 2855f4069d..2753529fc2 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x960.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/LaunchImage.launchimage/iPhoneLaunchImage640x960.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16f6e9d7bd15fc528d934c252213de8792812e708b1810191c5f1767f7165852
-size 142331
+oid sha256:1a43f1d893e85aa99d335a657ec0f6c13a741db976c033451ab9a2328b8a5970
+size 35559
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon152x152.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon152x152.png
index b0dd493c11..ad18894411 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon152x152.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon152x152.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4901093fa6190bf37291b0fb6de23fba1be8ebbd742775a8565a4106722fbb6
-size 31942
+oid sha256:ebfc95bd4c0cbcc53d0ef9d314d26e09a347a22dabbf210597f405d9ed8646bf
+size 7729
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon76x76.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon76x76.png
index 21aa62e96b..888d8cf785 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon76x76.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadAppIcon76x76.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4ae97c4f44910121a61686862c8342ce598db4cdf9d46b29e96d3cb9e43bd06
-size 22158
+oid sha256:99cb7da9282cfcfa64598455827f27ca6791d45ca0d2c3c2dc090d82468dac03
+size 4447
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadProAppIcon167x167.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadProAppIcon167x167.png
index 6b696a84b2..86aa72016a 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadProAppIcon167x167.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadProAppIcon167x167.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:061e2d0ce8dc852dd298c80f2aed5fee8ea4b87511c00662aa2d00922c0ba3c2
-size 30162
+oid sha256:101568e946f1d4cea86d666187bbf71116bbf62e6eaf6d80bc3c5e2e184bdb15
+size 7938
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon29x29.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon29x29.png
index f3dfa05839..79331c29b1 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon29x29.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon29x29.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fb4b4b77620d99dae7473b7bd8affe14630419835bd5719167ed200e657fa4f
-size 17504
+oid sha256:cf930ffd4efb0b7b627e05aac6e0f56252ea206623e8b5d097d803aa315cdfb8
+size 1812
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon58x58.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon58x58.png
index 5325b805fd..27c4aaef2e 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon58x58.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSettingsIcon58x58.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8aa9b1194f3244025578225a6a87cbc2dd12c70955ff615c8af640ea7f1334f1
-size 19619
+oid sha256:ba5fea53b349e254b4625035a308d5731cb06f6d0adc278874d14db2627962cb
+size 3424
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon40x40.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon40x40.png
index 98d8455838..df1630a95a 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon40x40.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon40x40.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c25ffb1af8160b3202977de8c32aaa235e22c643ffd8004e4546c96868ef3b9
-size 18317
+oid sha256:cf087f357cd439d14651073ac079542c60f0648a30dced2a8d19912124b3f8b6
+size 2310
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon80x80.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon80x80.png
index 7482f6c892..4b7f5d6318 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon80x80.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPadSpotlightIcon80x80.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2db961b8f922a552d8ad374fdb56029efd4049a6cde10399b3d961242c82ce53
-size 22571
+oid sha256:421ad4db14c28ed18666158f9ec30747c5b8c757405c1efb32442978911b0c06
+size 4437
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon120x120.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon120x120.png
index da987b86f9..674c6da124 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon120x120.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon120x120.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f39d897a57d4da0a70ede7c91339660b28e9d8c57b3e7d749807b13baa4b85f3
-size 28559
+oid sha256:0d0044ebf7e0a5dd23ed64a1289c705d8f6c3c41a62d65e5a1371058855b8cec
+size 6546
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon180x180.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon180x180.png
index 205e025c36..c0c10c2390 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon180x180.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneAppIcon180x180.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:263b75d58328499eef1f8fa2e64c30706f546badcc0c4464a043b231da93cd0d
-size 34969
+oid sha256:3b8717c5f2109dfce1bf7b017278059d4915b524a6eb7e83cfb1926e54ed6869
+size 7383
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon58x58.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon58x58.png
index 0deb4f4f35..27c4aaef2e 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon58x58.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon58x58.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33522ad8a8e826b22dd9ad214f56e63e24bf55c00bd8c845925d848b855dfb48
-size 19619
+oid sha256:ba5fea53b349e254b4625035a308d5731cb06f6d0adc278874d14db2627962cb
+size 3424
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon87x87.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon87x87.png
index 78591751d7..9093e13867 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon87x87.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSettingsIcon87x87.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f405c9f3d908d038aea26049e533b0d10955adfac370c7b3b80209997ea706d0
-size 24407
+oid sha256:a32908a839a6cb0ca2a76d6aa60376ba8a14b4428f06c13149ec277514eb5676
+size 4533
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon120x120.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon120x120.png
index 034dcb9fed..674c6da124 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon120x120.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon120x120.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d110f6e151799a2327bcdf5ef94d6fc82b114783a8cc973a8915896679ba4a80
-size 28559
+oid sha256:0d0044ebf7e0a5dd23ed64a1289c705d8f6c3c41a62d65e5a1371058855b8cec
+size 6546
diff --git a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon80x80.png b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon80x80.png
index f0fa89149c..4b7f5d6318 100644
--- a/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon80x80.png
+++ b/Templates/MinimalProject/Template/Resources/Platform/iOS/Images.xcassets/TestDPAppIcon.appiconset/iPhoneSpotlightIcon80x80.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db8f00568fad4e49b05249aaa7a48c9fbf85c8b7a78489c83dc9b8161778bcef
-size 22571
+oid sha256:421ad4db14c28ed18666158f9ec30747c5b8c757405c1efb32442978911b0c06
+size 4437
diff --git a/Templates/MinimalProject/Template/ShaderLib/scenesrg.srgi b/Templates/MinimalProject/Template/ShaderLib/scenesrg.srgi
index ce5025b704..f02c84d04c 100644
--- a/Templates/MinimalProject/Template/ShaderLib/scenesrg.srgi
+++ b/Templates/MinimalProject/Template/ShaderLib/scenesrg.srgi
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/MinimalProject/Template/ShaderLib/viewsrg.srgi b/Templates/MinimalProject/Template/ShaderLib/viewsrg.srgi
index 529f257f9b..dcaed96cab 100644
--- a/Templates/MinimalProject/Template/ShaderLib/viewsrg.srgi
+++ b/Templates/MinimalProject/Template/ShaderLib/viewsrg.srgi
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/MinimalProject/Template/Shaders/CommonVS.azsli b/Templates/MinimalProject/Template/Shaders/CommonVS.azsli
index bff8c61f03..3ff6751c5e 100644
--- a/Templates/MinimalProject/Template/Shaders/CommonVS.azsli
+++ b/Templates/MinimalProject/Template/Shaders/CommonVS.azsli
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/MinimalProject/Template/Shaders/ShaderResourceGroups/SceneSrg.azsli b/Templates/MinimalProject/Template/Shaders/ShaderResourceGroups/SceneSrg.azsli
index d317ab7339..f2c1224387 100644
--- a/Templates/MinimalProject/Template/Shaders/ShaderResourceGroups/SceneSrg.azsli
+++ b/Templates/MinimalProject/Template/Shaders/ShaderResourceGroups/SceneSrg.azsli
@@ -1,6 +1,6 @@
 // {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/Templates/MinimalProject/Template/preview.png b/Templates/MinimalProject/Template/preview.png
index 0f393ac886..82234dbf6b 100644
--- a/Templates/MinimalProject/Template/preview.png
+++ b/Templates/MinimalProject/Template/preview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ac9dd09bde78f389e3725ac49d61eff109857e004840bc0bc3881739df9618d
-size 2217
+oid sha256:1cf8339fb51f82a68d2ab475c0476960e75a79d96d239c5b7cd272fbe4990ffe
+size 2770
diff --git a/Templates/MinimalProject/template.json b/Templates/MinimalProject/template.json
index 88214b26fa..a244904578 100644
--- a/Templates/MinimalProject/template.json
+++ b/Templates/MinimalProject/template.json
@@ -2,8 +2,8 @@
     "template_name": "MinimalProject",
     "origin": "The primary repo for MinimalProject goes here: i.e. http://www.mydomain.com",
     "license": "What license MinimalProject uses goes here: i.e. https://opensource.org/licenses/MIT",
-    "display_name": "MinimalProject",
-    "summary": "A short description of MinimalProject.",
+    "display_name": "Minimal",
+    "summary": "This will be a good starting point for developers who are looking for building the game with the bare minimum of gems in O3DE, and adding more when needed. ",
     "canonical_tags": [],
     "user_tags": [
         "MinimalProject"
@@ -245,8 +245,8 @@
             "isOptional": false
         },
         {
-            "file": "Resources/CryEngineLogoLauncher.bmp",
-            "origin": "Resources/CryEngineLogoLauncher.bmp",
+            "file": "Resources/LegacyLogoLauncher.bmp",
+            "origin": "Resources/LegacyLogoLauncher.bmp",
             "isTemplated": false,
             "isOptional": false
         },
diff --git a/Tools/EventLogTools/EventLogger/Reader.py b/Tools/EventLogTools/EventLogger/Reader.py
index e2f5f3ae59..b89db1c603 100755
--- a/Tools/EventLogTools/EventLogger/Reader.py
+++ b/Tools/EventLogTools/EventLogger/Reader.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/EventLogTools/EventLogger/Utils.py b/Tools/EventLogTools/EventLogger/Utils.py
index 06f253eca9..dd214e33d6 100755
--- a/Tools/EventLogTools/EventLogger/Utils.py
+++ b/Tools/EventLogTools/EventLogger/Utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/EventLogTools/EventLogger/__init__.py b/Tools/EventLogTools/EventLogger/__init__.py
index ce5d67d66d..e1b5394b94 100755
--- a/Tools/EventLogTools/EventLogger/__init__.py
+++ b/Tools/EventLogTools/EventLogger/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/EventLogTools/MessagePrinter.py b/Tools/EventLogTools/MessagePrinter.py
index 43b1e90bc0..a450f7ebd8 100755
--- a/Tools/EventLogTools/MessagePrinter.py
+++ b/Tools/EventLogTools/MessagePrinter.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/EventLogTools/TraceViewer.py b/Tools/EventLogTools/TraceViewer.py
index ffb296fda0..8f46653083 100755
--- a/Tools/EventLogTools/TraceViewer.py
+++ b/Tools/EventLogTools/TraceViewer.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/LauncherTestTools/__init__.py b/Tools/LauncherTestTools/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/Tools/LauncherTestTools/__init__.py
+++ b/Tools/LauncherTestTools/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/Tools/LauncherTestTools/device_farm_create_bundle.py b/Tools/LauncherTestTools/device_farm_create_bundle.py
index 027f3a63eb..793bc109af 100755
--- a/Tools/LauncherTestTools/device_farm_create_bundle.py
+++ b/Tools/LauncherTestTools/device_farm_create_bundle.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LauncherTestTools/device_farm_create_bundle_startergame.bat b/Tools/LauncherTestTools/device_farm_create_bundle_startergame.bat
index ec6434cc86..aca4458ac5 100644
--- a/Tools/LauncherTestTools/device_farm_create_bundle_startergame.bat
+++ b/Tools/LauncherTestTools/device_farm_create_bundle_startergame.bat
@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Tools/LauncherTestTools/device_farm_schedule_run.py b/Tools/LauncherTestTools/device_farm_schedule_run.py
index 355cec2158..50928cd196 100755
--- a/Tools/LauncherTestTools/device_farm_schedule_run.py
+++ b/Tools/LauncherTestTools/device_farm_schedule_run.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LauncherTestTools/device_farm_schedule_run_android_startergame.bat b/Tools/LauncherTestTools/device_farm_schedule_run_android_startergame.bat
index 7bedce20b2..83bbaed213 100644
--- a/Tools/LauncherTestTools/device_farm_schedule_run_android_startergame.bat
+++ b/Tools/LauncherTestTools/device_farm_schedule_run_android_startergame.bat
@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Tools/LauncherTestTools/device_farm_schedule_run_ios_startergame.sh b/Tools/LauncherTestTools/device_farm_schedule_run_ios_startergame.sh
index 1e79a75e03..1010c8638e 100755
--- a/Tools/LauncherTestTools/device_farm_schedule_run_ios_startergame.sh
+++ b/Tools/LauncherTestTools/device_farm_schedule_run_ios_startergame.sh
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/LauncherTestTools/run_launcher_tests.py b/Tools/LauncherTestTools/run_launcher_tests.py
index d54de2368b..8dbc91ff66 100755
--- a/Tools/LauncherTestTools/run_launcher_tests.py
+++ b/Tools/LauncherTestTools/run_launcher_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LauncherTestTools/run_launcher_tests_android.py b/Tools/LauncherTestTools/run_launcher_tests_android.py
index 3d1226e7d8..bf1311924e 100755
--- a/Tools/LauncherTestTools/run_launcher_tests_android.py
+++ b/Tools/LauncherTestTools/run_launcher_tests_android.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LauncherTestTools/run_launcher_tests_ios.py b/Tools/LauncherTestTools/run_launcher_tests_ios.py
index 79911362d4..844c7ea9b7 100755
--- a/Tools/LauncherTestTools/run_launcher_tests_ios.py
+++ b/Tools/LauncherTestTools/run_launcher_tests_ios.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LauncherTestTools/run_launcher_tests_local_validation.py b/Tools/LauncherTestTools/run_launcher_tests_local_validation.py
index 26ed6afea5..175e809ce2 100755
--- a/Tools/LauncherTestTools/run_launcher_tests_local_validation.py
+++ b/Tools/LauncherTestTools/run_launcher_tests_local_validation.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LauncherTestTools/run_launcher_tests_win.py b/Tools/LauncherTestTools/run_launcher_tests_win.py
index df00658838..ba6e42b8e4 100755
--- a/Tools/LauncherTestTools/run_launcher_tests_win.py
+++ b/Tools/LauncherTestTools/run_launcher_tests_win.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LauncherTestTools/run_local_launcher_test_win_automatedtesting.bat b/Tools/LauncherTestTools/run_local_launcher_test_win_automatedtesting.bat
index 1f02f1e35b..0fc8ada332 100644
--- a/Tools/LauncherTestTools/run_local_launcher_test_win_automatedtesting.bat
+++ b/Tools/LauncherTestTools/run_local_launcher_test_win_automatedtesting.bat
@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Tools/LyTestTools/README.txt b/Tools/LyTestTools/README.txt
index 76bf7697db..cec1698c57 100644
--- a/Tools/LyTestTools/README.txt
+++ b/Tools/LyTestTools/README.txt
@@ -1,4 +1,4 @@
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/__init__.py b/Tools/LyTestTools/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/__init__.py
+++ b/Tools/LyTestTools/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/__init__.py b/Tools/LyTestTools/ly_test_tools/__init__.py
index 3dc1a8241b..aa4d2e157a 100755
--- a/Tools/LyTestTools/ly_test_tools/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/__init__.py b/Tools/LyTestTools/ly_test_tools/_internal/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/log/__init__.py b/Tools/LyTestTools/ly_test_tools/_internal/log/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/log/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/log/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/log/py_logging_util.py b/Tools/LyTestTools/ly_test_tools/_internal/log/py_logging_util.py
index f9fcb27f80..fe76d8c363 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/log/py_logging_util.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/log/py_logging_util.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/managers/__init__.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py
index ec6feee80d..3417311ef8 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
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/managers/artifact_manager.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/artifact_manager.py
index 3fcefd2e83..1f42af37a1 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/artifact_manager.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/artifact_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/managers/ly_process_killer.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/ly_process_killer.py
index 7e42ce276a..4e33157061 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/ly_process_killer.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/ly_process_killer.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/__init__.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py
index 54d16c8e62..663fd585b5 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
index 45737edef0..4b9bfb2594 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 
@@ -98,4 +98,4 @@ class WindowsWorkspaceManager(AbstractWorkspaceManager):
     def clear_settings(self):
         logger.debug("Build::setup_clear_registry")
         if sys.platform == "win32":
-            ly_test_tools.environment.reg_cleaner.clean_ly_keys(exception_list=r"SOFTWARE\Amazon\Lumberyard\Identity")
+            ly_test_tools.environment.reg_cleaner.clean_ly_keys(exception_list=r"SOFTWARE\O3DE\O3DE\Identity")
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py
index 73a3d68850..b6af18a148 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/__init__.py b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/__init__.py
index b339ff96c7..5c88cc8ce8 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/case_id.py b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/case_id.py
index 6c9f3ee21d..adf647a519 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/case_id.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/case_id.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/failed_test_rerun_command.py b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/failed_test_rerun_command.py
index 62370378ee..31ad28c5b6 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/failed_test_rerun_command.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/failed_test_rerun_command.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/terminal_report.py b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/terminal_report.py
index 33e13d5177..551d9d411a 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/terminal_report.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/terminal_report.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/test_tools_fixtures.py b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/test_tools_fixtures.py
index 4459f423d2..0446a5143f 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/test_tools_fixtures.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/pytest_plugin/test_tools_fixtures.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/builtin/__init__.py b/Tools/LyTestTools/ly_test_tools/builtin/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/builtin/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/builtin/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/builtin/helpers.py b/Tools/LyTestTools/ly_test_tools/builtin/helpers.py
index 3c71bb6f8b..4343d65101 100755
--- a/Tools/LyTestTools/ly_test_tools/builtin/helpers.py
+++ b/Tools/LyTestTools/ly_test_tools/builtin/helpers.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/environment/__init__.py b/Tools/LyTestTools/ly_test_tools/environment/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/environment/file_system.py b/Tools/LyTestTools/ly_test_tools/environment/file_system.py
index a27cebc349..41b5104cb5 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/file_system.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/file_system.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/environment/process_utils.py b/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
index 97558cdac6..63e9dc874c 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py b/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py
index 1b05eaa130..8f8a7e02fb 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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,7 +11,7 @@ import winreg
 
 import ly_test_tools.environment.process_utils as process_utils
 
-CONST_LY_REG = r'SOFTWARE\Amazon\Lumberyard'
+CONST_LY_REG = r'SOFTWARE\O3DE\O3DE'
 AUTOMATION_EXCEPTION_LIST = [
     os.path.join(CONST_LY_REG, r"Identity"),
     os.path.join(CONST_LY_REG, r"Settings\DXInstalled"),
@@ -117,6 +117,6 @@ def create_ly_keys():
     process_utils.check_call(
         ["reg", "add", target_key, "/v", "RC_EnableSourceControl", "/t", "REG_DWORD", "/d", "0", "/f"])
     # The editor will ignore settings unless EditorSettingsVersion is what it expects
-    # The value it expects is in Code\Sandbox\Editor\Settings.cpp
+    # The value it expects is in Code\Editor\Settings.cpp
     process_utils.check_call(
         ["reg", "add", target_key, "/v", "EditorSettingsVersion", "/t", "REG_DWORD", "/d", "2", "/f"])
diff --git a/Tools/LyTestTools/ly_test_tools/environment/waiter.py b/Tools/LyTestTools/ly_test_tools/environment/waiter.py
index 8bdffaf51a..4c37fda433 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/waiter.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/waiter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/environment/watchdog.py b/Tools/LyTestTools/ly_test_tools/environment/watchdog.py
index e2ec29b30e..1091ee201d 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/watchdog.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/watchdog.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/image/__init__.py b/Tools/LyTestTools/ly_test_tools/image/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/image/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/image/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/image/image_capture.py b/Tools/LyTestTools/ly_test_tools/image/image_capture.py
index c781b5c02c..687931b65d 100755
--- a/Tools/LyTestTools/ly_test_tools/image/image_capture.py
+++ b/Tools/LyTestTools/ly_test_tools/image/image_capture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/image/screenshot_compare_qssim.py b/Tools/LyTestTools/ly_test_tools/image/screenshot_compare_qssim.py
index f1d299c02e..854ab74cfb 100755
--- a/Tools/LyTestTools/ly_test_tools/image/screenshot_compare_qssim.py
+++ b/Tools/LyTestTools/ly_test_tools/image/screenshot_compare_qssim.py
@@ -1,5 +1,5 @@
 """ 
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/__init__.py b/Tools/LyTestTools/ly_test_tools/launchers/__init__.py
index efa4a83d6f..07ebf663fb 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/exceptions.py b/Tools/LyTestTools/ly_test_tools/launchers/exceptions.py
index 62f1562dd6..89dcafc286 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/exceptions.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/exceptions.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/launcher_helper.py b/Tools/LyTestTools/ly_test_tools/launchers/launcher_helper.py
index 404c3b1a1a..0db87d731c 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/launcher_helper.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/launcher_helper.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/platforms/__init__.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/__init__.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
index c5134d707a..b6ec30db88 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
index 9100762561..8c44a02061 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/platforms/mac/__init__.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/mac/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/mac/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/mac/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/platforms/mac/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/mac/launcher.py
index 96111d2fc7..69da1379b5 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/mac/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/mac/launcher.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/__init__.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
index f50b47f661..86e37f96bb 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 
@@ -209,6 +209,8 @@ class WinEditor(WinLauncher):
     def __init__(self, build, args):
         super(WinEditor, self).__init__(build, args)
         self.args.append('--regset="/Amazon/Settings/EnableSourceControl=false"')
+        self.args.append('--regset="/Amazon/AWS/Preferences/AWSAttributionConsentShown=true"')
+        self.args.append('--regset="/Amazon/AWS/Preferences/AWSAttributionEnabled=false"')
 
     def binary_path(self):
         """
diff --git a/Tools/LyTestTools/ly_test_tools/log/__init__.py b/Tools/LyTestTools/ly_test_tools/log/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/log/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/log/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/log/log_monitor.py b/Tools/LyTestTools/ly_test_tools/log/log_monitor.py
index ceb624da52..a2556fa41d 100755
--- a/Tools/LyTestTools/ly_test_tools/log/log_monitor.py
+++ b/Tools/LyTestTools/ly_test_tools/log/log_monitor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/mobile/__init__.py b/Tools/LyTestTools/ly_test_tools/mobile/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/mobile/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/mobile/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/mobile/android.py b/Tools/LyTestTools/ly_test_tools/mobile/android.py
index b74743c989..bbc1e39f3f 100755
--- a/Tools/LyTestTools/ly_test_tools/mobile/android.py
+++ b/Tools/LyTestTools/ly_test_tools/mobile/android.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/o3de/__init__.py b/Tools/LyTestTools/ly_test_tools/o3de/__init__.py
index a3a4055d50..e200fa77d0 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/o3de/ap_log_parser.py b/Tools/LyTestTools/ly_test_tools/o3de/ap_log_parser.py
index 11059b313c..41c8dd772c 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/ap_log_parser.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/ap_log_parser.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
index 937d404af5..bc64d98b01 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_config_util.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_config_util.py
index 874650e267..dfeaaa61dd 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_config_util.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_config_util.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
index 46bc4612bb..2b6ff8292e 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/o3de/ini_configuration_util.py b/Tools/LyTestTools/ly_test_tools/o3de/ini_configuration_util.py
index f1999d52c2..e64df93431 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/ini_configuration_util.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/ini_configuration_util.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
index 068aa3dbbd..39371f35dc 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 
@@ -29,7 +29,7 @@ from ly_test_tools.o3de.ap_log_parser import APLogParser
 logger = logging.getLogger(__name__)
 
 # Asset Processor fast scan system setting key/subkey
-AP_FASTSCAN_KEY = r"Software\Amazon\O3DE Asset Processor\Options"
+AP_FASTSCAN_KEY = r"Software\O3DE\O3DE Asset Processor\Options"
 AP_FASTSCAN_SUBKEY = r"EnableZeroAnalysis"
 
 
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/settings.py b/Tools/LyTestTools/ly_test_tools/o3de/settings.py
index 82625727d0..e8e1a66300 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/settings.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/settings.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/o3de/shader_compiler.py b/Tools/LyTestTools/ly_test_tools/o3de/shader_compiler.py
index aadf031cc0..d7f8a4ca1d 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/shader_compiler.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/shader_compiler.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/report/__init__.py b/Tools/LyTestTools/ly_test_tools/report/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/ly_test_tools/report/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/report/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/ly_test_tools/report/rad_telemetry.py b/Tools/LyTestTools/ly_test_tools/report/rad_telemetry.py
index df916dde86..61d84e2fac 100755
--- a/Tools/LyTestTools/ly_test_tools/report/rad_telemetry.py
+++ b/Tools/LyTestTools/ly_test_tools/report/rad_telemetry.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/setup.py b/Tools/LyTestTools/setup.py
index f754cf2999..4260974f68 100755
--- a/Tools/LyTestTools/setup.py
+++ b/Tools/LyTestTools/setup.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/CMakeLists.txt b/Tools/LyTestTools/tests/CMakeLists.txt
index 4396ec1a13..e5f270197c 100644
--- a/Tools/LyTestTools/tests/CMakeLists.txt
+++ b/Tools/LyTestTools/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/LyTestTools/tests/example/__init__.py b/Tools/LyTestTools/tests/example/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/tests/example/__init__.py
+++ b/Tools/LyTestTools/tests/example/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/example/test_system_example.py b/Tools/LyTestTools/tests/example/test_system_example.py
index 7d15a32291..3cb6128802 100755
--- a/Tools/LyTestTools/tests/example/test_system_example.py
+++ b/Tools/LyTestTools/tests/example/test_system_example.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/integ/__init__.py b/Tools/LyTestTools/tests/integ/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/tests/integ/__init__.py
+++ b/Tools/LyTestTools/tests/integ/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/integ/sanity_tests.py b/Tools/LyTestTools/tests/integ/sanity_tests.py
index 9518bd58e9..c6c5ce0c31 100755
--- a/Tools/LyTestTools/tests/integ/sanity_tests.py
+++ b/Tools/LyTestTools/tests/integ/sanity_tests.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/integ/test_process_utils.py b/Tools/LyTestTools/tests/integ/test_process_utils.py
index 166bf5b14a..023b91a2d8 100755
--- a/Tools/LyTestTools/tests/integ/test_process_utils.py
+++ b/Tools/LyTestTools/tests/integ/test_process_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/integ/test_regression.py b/Tools/LyTestTools/tests/integ/test_regression.py
index 780a4d7f2f..2c797362ec 100755
--- a/Tools/LyTestTools/tests/integ/test_regression.py
+++ b/Tools/LyTestTools/tests/integ/test_regression.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/__init__.py b/Tools/LyTestTools/tests/unit/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/LyTestTools/tests/unit/__init__.py
+++ b/Tools/LyTestTools/tests/unit/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py b/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
index f40f9782f5..ed7382d36e 100755
--- a/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
+++ b/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_artifact_manager.py b/Tools/LyTestTools/tests/unit/test_artifact_manager.py
index d0f2213426..fba9029148 100755
--- a/Tools/LyTestTools/tests/unit/test_artifact_manager.py
+++ b/Tools/LyTestTools/tests/unit/test_artifact_manager.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_asset_processor.py b/Tools/LyTestTools/tests/unit/test_asset_processor.py
index acf37364da..ed7768a3c1 100755
--- a/Tools/LyTestTools/tests/unit/test_asset_processor.py
+++ b/Tools/LyTestTools/tests/unit/test_asset_processor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_builtin_helpers.py b/Tools/LyTestTools/tests/unit/test_builtin_helpers.py
index ab4e78f5a2..57f8af8cfc 100755
--- a/Tools/LyTestTools/tests/unit/test_builtin_helpers.py
+++ b/Tools/LyTestTools/tests/unit/test_builtin_helpers.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_case_id.py b/Tools/LyTestTools/tests/unit/test_case_id.py
index 4dc6295bf6..20b3a0a408 100755
--- a/Tools/LyTestTools/tests/unit/test_case_id.py
+++ b/Tools/LyTestTools/tests/unit/test_case_id.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_failed_rerun_command.py b/Tools/LyTestTools/tests/unit/test_failed_rerun_command.py
index 80acf96198..d29a0e5ec7 100755
--- a/Tools/LyTestTools/tests/unit/test_failed_rerun_command.py
+++ b/Tools/LyTestTools/tests/unit/test_failed_rerun_command.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_file_system.py b/Tools/LyTestTools/tests/unit/test_file_system.py
index f6582d0a9b..7ae0fa35e5 100755
--- a/Tools/LyTestTools/tests/unit/test_file_system.py
+++ b/Tools/LyTestTools/tests/unit/test_file_system.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_fixtures.py b/Tools/LyTestTools/tests/unit/test_fixtures.py
index 19d934587d..64e5a0b420 100755
--- a/Tools/LyTestTools/tests/unit/test_fixtures.py
+++ b/Tools/LyTestTools/tests/unit/test_fixtures.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_image_capture.py b/Tools/LyTestTools/tests/unit/test_image_capture.py
index a32049dbc1..19422523b4 100755
--- a/Tools/LyTestTools/tests/unit/test_image_capture.py
+++ b/Tools/LyTestTools/tests/unit/test_image_capture.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_launcher_android.py b/Tools/LyTestTools/tests/unit/test_launcher_android.py
index 3d4025c1ee..bbd0667b5c 100755
--- a/Tools/LyTestTools/tests/unit/test_launcher_android.py
+++ b/Tools/LyTestTools/tests/unit/test_launcher_android.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_launcher_base.py b/Tools/LyTestTools/tests/unit/test_launcher_base.py
index b6ea036382..8a2be5260c 100755
--- a/Tools/LyTestTools/tests/unit/test_launcher_base.py
+++ b/Tools/LyTestTools/tests/unit/test_launcher_base.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_launcher_mac.py b/Tools/LyTestTools/tests/unit/test_launcher_mac.py
index 77faf9064f..61426fb106 100755
--- a/Tools/LyTestTools/tests/unit/test_launcher_mac.py
+++ b/Tools/LyTestTools/tests/unit/test_launcher_mac.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_launcher_win.py b/Tools/LyTestTools/tests/unit/test_launcher_win.py
index 572de787af..f438df65f3 100755
--- a/Tools/LyTestTools/tests/unit/test_launcher_win.py
+++ b/Tools/LyTestTools/tests/unit/test_launcher_win.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_log_monitor.py b/Tools/LyTestTools/tests/unit/test_log_monitor.py
index 6d29d675f4..230dd84896 100755
--- a/Tools/LyTestTools/tests/unit/test_log_monitor.py
+++ b/Tools/LyTestTools/tests/unit/test_log_monitor.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_ly_process_killer.py b/Tools/LyTestTools/tests/unit/test_ly_process_killer.py
index f1daac2a6f..6a4d9a3e77 100755
--- a/Tools/LyTestTools/tests/unit/test_ly_process_killer.py
+++ b/Tools/LyTestTools/tests/unit/test_ly_process_killer.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_manager_platforms_mac.py b/Tools/LyTestTools/tests/unit/test_manager_platforms_mac.py
index a52ea2322b..0211785dc4 100755
--- a/Tools/LyTestTools/tests/unit/test_manager_platforms_mac.py
+++ b/Tools/LyTestTools/tests/unit/test_manager_platforms_mac.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py b/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
index 207a04c322..59f5cf1dac 100755
--- a/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
+++ b/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 
@@ -102,4 +102,4 @@ class TestWindowsWorkspaceManager(object):
         windows_workspace_manager = ly_test_tools._internal.managers.platforms.windows.WindowsWorkspaceManager()
         windows_workspace_manager.clear_settings()
 
-        mock_clear_keys.assert_called_with(exception_list=r"SOFTWARE\Amazon\Lumberyard\Identity")
+        mock_clear_keys.assert_called_with(exception_list=r"SOFTWARE\O3DE\O3DE\Identity")
diff --git a/Tools/LyTestTools/tests/unit/test_process_utils.py b/Tools/LyTestTools/tests/unit/test_process_utils.py
index 2e8424b1f6..855f5d09a1 100755
--- a/Tools/LyTestTools/tests/unit/test_process_utils.py
+++ b/Tools/LyTestTools/tests/unit/test_process_utils.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_py_logging_util.py b/Tools/LyTestTools/tests/unit/test_py_logging_util.py
index 9ab1984bce..d68df46e6d 100755
--- a/Tools/LyTestTools/tests/unit/test_py_logging_util.py
+++ b/Tools/LyTestTools/tests/unit/test_py_logging_util.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_rad_telemetry.py b/Tools/LyTestTools/tests/unit/test_rad_telemetry.py
index f26d6a99ca..9260cc0fbd 100755
--- a/Tools/LyTestTools/tests/unit/test_rad_telemetry.py
+++ b/Tools/LyTestTools/tests/unit/test_rad_telemetry.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_reg_cleaner.py b/Tools/LyTestTools/tests/unit/test_reg_cleaner.py
index cca45cbf1f..99a3e7000f 100755
--- a/Tools/LyTestTools/tests/unit/test_reg_cleaner.py
+++ b/Tools/LyTestTools/tests/unit/test_reg_cleaner.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_screenshot_compare_qssim.py b/Tools/LyTestTools/tests/unit/test_screenshot_compare_qssim.py
index 200ba0ed46..df09296517 100755
--- a/Tools/LyTestTools/tests/unit/test_screenshot_compare_qssim.py
+++ b/Tools/LyTestTools/tests/unit/test_screenshot_compare_qssim.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_settings.py b/Tools/LyTestTools/tests/unit/test_settings.py
index 2d7586602f..d165d7d748 100755
--- a/Tools/LyTestTools/tests/unit/test_settings.py
+++ b/Tools/LyTestTools/tests/unit/test_settings.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_shader_compiler.py b/Tools/LyTestTools/tests/unit/test_shader_compiler.py
index fe724ffee5..1bbe9f11c4 100755
--- a/Tools/LyTestTools/tests/unit/test_shader_compiler.py
+++ b/Tools/LyTestTools/tests/unit/test_shader_compiler.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_terminal_report.py b/Tools/LyTestTools/tests/unit/test_terminal_report.py
index 56a5c5c1c8..eab85a090e 100755
--- a/Tools/LyTestTools/tests/unit/test_terminal_report.py
+++ b/Tools/LyTestTools/tests/unit/test_terminal_report.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_waiter.py b/Tools/LyTestTools/tests/unit/test_waiter.py
index 6ac1c8dc56..c7859ed2b0 100755
--- a/Tools/LyTestTools/tests/unit/test_waiter.py
+++ b/Tools/LyTestTools/tests/unit/test_waiter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_watchdog.py b/Tools/LyTestTools/tests/unit/test_watchdog.py
index 42a5f2aa6c..621b54d7c0 100755
--- a/Tools/LyTestTools/tests/unit/test_watchdog.py
+++ b/Tools/LyTestTools/tests/unit/test_watchdog.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/LyTestTools/tests/unit/test_workspace.py b/Tools/LyTestTools/tests/unit/test_workspace.py
index 689e1eabd8..ec600ce519 100755
--- a/Tools/LyTestTools/tests/unit/test_workspace.py
+++ b/Tools/LyTestTools/tests/unit/test_workspace.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/RemoteConsole/ly_remote_console/README.txt b/Tools/RemoteConsole/ly_remote_console/README.txt
index 5071eff640..8b05b6ea06 100644
--- a/Tools/RemoteConsole/ly_remote_console/README.txt
+++ b/Tools/RemoteConsole/ly_remote_console/README.txt
@@ -1,4 +1,4 @@
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/RemoteConsole/ly_remote_console/ly_remote_console/__init__.py b/Tools/RemoteConsole/ly_remote_console/ly_remote_console/__init__.py
index d503a03f1e..35b04cb776 100755
--- a/Tools/RemoteConsole/ly_remote_console/ly_remote_console/__init__.py
+++ b/Tools/RemoteConsole/ly_remote_console/ly_remote_console/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/RemoteConsole/ly_remote_console/ly_remote_console/remote_console_commands.py b/Tools/RemoteConsole/ly_remote_console/ly_remote_console/remote_console_commands.py
index bad0cbf9d4..30a8c36f08 100755
--- a/Tools/RemoteConsole/ly_remote_console/ly_remote_console/remote_console_commands.py
+++ b/Tools/RemoteConsole/ly_remote_console/ly_remote_console/remote_console_commands.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/RemoteConsole/ly_remote_console/setup.py b/Tools/RemoteConsole/ly_remote_console/setup.py
index e02baa1f62..8225789b7e 100755
--- a/Tools/RemoteConsole/ly_remote_console/setup.py
+++ b/Tools/RemoteConsole/ly_remote_console/setup.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/RemoteConsole/ly_remote_console/tests/CMakeLists.txt b/Tools/RemoteConsole/ly_remote_console/tests/CMakeLists.txt
index 4fc35ea570..8484dd5d34 100644
--- a/Tools/RemoteConsole/ly_remote_console/tests/CMakeLists.txt
+++ b/Tools/RemoteConsole/ly_remote_console/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/RemoteConsole/ly_remote_console/tests/integ/test_remote_console.py b/Tools/RemoteConsole/ly_remote_console/tests/integ/test_remote_console.py
index 799cf94f39..611bfbd67e 100755
--- a/Tools/RemoteConsole/ly_remote_console/tests/integ/test_remote_console.py
+++ b/Tools/RemoteConsole/ly_remote_console/tests/integ/test_remote_console.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/RemoteConsole/ly_remote_console/tests/unit/test_remote_console_commands.py b/Tools/RemoteConsole/ly_remote_console/tests/unit/test_remote_console_commands.py
index 08305e9cce..a0d49a503a 100755
--- a/Tools/RemoteConsole/ly_remote_console/tests/unit/test_remote_console_commands.py
+++ b/Tools/RemoteConsole/ly_remote_console/tests/unit/test_remote_console_commands.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/SerializeContextAnalyzer/ConfluenceWiki_SerializeContext.jinja b/Tools/SerializeContextAnalyzer/ConfluenceWiki_SerializeContext.jinja
index d12ec11344..0635132b55 100644
--- a/Tools/SerializeContextAnalyzer/ConfluenceWiki_SerializeContext.jinja
+++ b/Tools/SerializeContextAnalyzer/ConfluenceWiki_SerializeContext.jinja
@@ -1,5 +1,5 @@
 {####
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/SerializeContextAnalyzer/ConfluenceWiki_SystemComponents.jinja b/Tools/SerializeContextAnalyzer/ConfluenceWiki_SystemComponents.jinja
index 62de4a7256..f95ab158f4 100644
--- a/Tools/SerializeContextAnalyzer/ConfluenceWiki_SystemComponents.jinja
+++ b/Tools/SerializeContextAnalyzer/ConfluenceWiki_SystemComponents.jinja
@@ -1,5 +1,5 @@
 {####
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/SerializeContextAnalyzer/ConfluenceWiki_Utilities.jinja b/Tools/SerializeContextAnalyzer/ConfluenceWiki_Utilities.jinja
index 47febb05d6..3a2b0242a1 100644
--- a/Tools/SerializeContextAnalyzer/ConfluenceWiki_Utilities.jinja
+++ b/Tools/SerializeContextAnalyzer/ConfluenceWiki_Utilities.jinja
@@ -1,5 +1,5 @@
 {####
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/SerializeContextAnalyzer/SerializeContextAnalyzer.py b/Tools/SerializeContextAnalyzer/SerializeContextAnalyzer.py
index c49a12778e..a2b4cf84f0 100755
--- a/Tools/SerializeContextAnalyzer/SerializeContextAnalyzer.py
+++ b/Tools/SerializeContextAnalyzer/SerializeContextAnalyzer.py
@@ -1,5 +1,5 @@
 ########################################################################################
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/SerializeContextAnalyzer/Text_EntityComponents.jinja b/Tools/SerializeContextAnalyzer/Text_EntityComponents.jinja
index 99bfe41b75..ed68a6c8b5 100644
--- a/Tools/SerializeContextAnalyzer/Text_EntityComponents.jinja
+++ b/Tools/SerializeContextAnalyzer/Text_EntityComponents.jinja
@@ -1,5 +1,5 @@
 {####
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/SerializeContextAnalyzer/Text_SerializeContext.jinja b/Tools/SerializeContextAnalyzer/Text_SerializeContext.jinja
index 09b614eca3..b6fab6ca54 100644
--- a/Tools/SerializeContextAnalyzer/Text_SerializeContext.jinja
+++ b/Tools/SerializeContextAnalyzer/Text_SerializeContext.jinja
@@ -1,5 +1,5 @@
 {####
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/SerializeContextAnalyzer/Text_SystemComponents.jinja b/Tools/SerializeContextAnalyzer/Text_SystemComponents.jinja
index 36b959cdad..9b49170c9b 100644
--- a/Tools/SerializeContextAnalyzer/Text_SystemComponents.jinja
+++ b/Tools/SerializeContextAnalyzer/Text_SystemComponents.jinja
@@ -1,5 +1,5 @@
 {####
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/SerializeContextAnalyzer/Text_Types.jinja b/Tools/SerializeContextAnalyzer/Text_Types.jinja
index e9d7b8a04e..3fcc369df7 100644
--- a/Tools/SerializeContextAnalyzer/Text_Types.jinja
+++ b/Tools/SerializeContextAnalyzer/Text_Types.jinja
@@ -1,5 +1,5 @@
 {####
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/SerializeContextAnalyzer/Text_Utilities.jinja b/Tools/SerializeContextAnalyzer/Text_Utilities.jinja
index 5371680ba7..03ec39ea56 100644
--- a/Tools/SerializeContextAnalyzer/Text_Utilities.jinja
+++ b/Tools/SerializeContextAnalyzer/Text_Utilities.jinja
@@ -1,5 +1,5 @@
 {####
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/Tools/TestRailImporter/lib/__init__.py b/Tools/TestRailImporter/lib/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/Tools/TestRailImporter/lib/__init__.py
+++ b/Tools/TestRailImporter/lib/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/Tools/TestRailImporter/lib/testrail_importer/__init__.py b/Tools/TestRailImporter/lib/testrail_importer/__init__.py
index ce5bb8503d..99aac69543 100755
--- a/Tools/TestRailImporter/lib/testrail_importer/__init__.py
+++ b/Tools/TestRailImporter/lib/testrail_importer/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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
 """
\ No newline at end of file
diff --git a/Tools/TestRailImporter/lib/testrail_importer/testrail_importer.py b/Tools/TestRailImporter/lib/testrail_importer/testrail_importer.py
index 7be90a1628..96bfe9bf2f 100755
--- a/Tools/TestRailImporter/lib/testrail_importer/testrail_importer.py
+++ b/Tools/TestRailImporter/lib/testrail_importer/testrail_importer.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/__init__.py b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/__init__.py
+++ b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_api_connector.py b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_api_connector.py
index 2feeefec94..97db1318dd 100755
--- a/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_api_connector.py
+++ b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_api_connector.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_connection.py b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_connection.py
index 376d1c40d9..05f78aa9f8 100755
--- a/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_connection.py
+++ b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_connection.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_report_converter.py b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_report_converter.py
index 42262daf2a..898a4f303d 100755
--- a/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_report_converter.py
+++ b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_report_converter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_settings.py b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_settings.py
index b8dc405079..e4d0a6d562 100755
--- a/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_settings.py
+++ b/Tools/TestRailImporter/lib/testrail_importer/testrail_tools/testrail_settings.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/testrail_importer.cmd b/Tools/TestRailImporter/testrail_importer.cmd
index c61e511777..40840917c8 100644
--- a/Tools/TestRailImporter/testrail_importer.cmd
+++ b/Tools/TestRailImporter/testrail_importer.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Tools/TestRailImporter/tests/__init__.py b/Tools/TestRailImporter/tests/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/TestRailImporter/tests/__init__.py
+++ b/Tools/TestRailImporter/tests/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/tests/unit/__init__.py b/Tools/TestRailImporter/tests/unit/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/Tools/TestRailImporter/tests/unit/__init__.py
+++ b/Tools/TestRailImporter/tests/unit/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/tests/unit/test_testrail_api_connector.py b/Tools/TestRailImporter/tests/unit/test_testrail_api_connector.py
index 9414f04f08..d146bd0502 100755
--- a/Tools/TestRailImporter/tests/unit/test_testrail_api_connector.py
+++ b/Tools/TestRailImporter/tests/unit/test_testrail_api_connector.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/tests/unit/test_testrail_connection.py b/Tools/TestRailImporter/tests/unit/test_testrail_connection.py
index e73bab6e8e..3b5dd35f2d 100755
--- a/Tools/TestRailImporter/tests/unit/test_testrail_connection.py
+++ b/Tools/TestRailImporter/tests/unit/test_testrail_connection.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/tests/unit/test_testrail_importer.py b/Tools/TestRailImporter/tests/unit/test_testrail_importer.py
index 852731f730..7f265bbbc9 100755
--- a/Tools/TestRailImporter/tests/unit/test_testrail_importer.py
+++ b/Tools/TestRailImporter/tests/unit/test_testrail_importer.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/TestRailImporter/tests/unit/test_testrail_report_converter.py b/Tools/TestRailImporter/tests/unit/test_testrail_report_converter.py
index f5a65707af..3a637f6ec7 100755
--- a/Tools/TestRailImporter/tests/unit/test_testrail_report_converter.py
+++ b/Tools/TestRailImporter/tests/unit/test_testrail_report_converter.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/Tools/styleui/styleui.cmd b/Tools/styleui/styleui.cmd
index 65393d8edb..cfd7f2832b 100644
--- a/Tools/styleui/styleui.cmd
+++ b/Tools/styleui/styleui.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/Tools/styleui/styleui.py b/Tools/styleui/styleui.py
index b9be4d4865..4f5f94342f 100755
--- a/Tools/styleui/styleui.py
+++ b/Tools/styleui/styleui.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/cmake/3rdParty.cmake b/cmake/3rdParty.cmake
index 665fa92537..15dde3c3f8 100644
--- a/cmake/3rdParty.cmake
+++ b/cmake/3rdParty.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -8,7 +8,24 @@
 # Do not overcomplicate searching for the 3rdParty path, if it is not easy to find,
 # the user should define it.
 
-set(LY_3RDPARTY_PATH "" CACHE PATH "Path to the 3rdParty folder")
+#! get_default_third_party_folder: Stores the default 3rdParty directory into the supplied output variable
+#
+# \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)
+    cmake_path(SET home_directory "$ENV{USERPROFILE}") # Windows
+    if(NOT EXISTS ${home_directory})
+        cmake_path(SET home_directory "$ENV{HOME}") # Unix
+        if (NOT EXISTS ${home_directory})
+            return()
+        endif()
+    endif()
+
+    set(${output_third_party_path} ${home_directory}/.o3de/3rdParty PARENT_SCOPE)
+endfunction()
+
+get_default_third_party_folder(o3de_default_third_party_path)
+set(LY_3RDPARTY_PATH "${o3de_default_third_party_path}" CACHE PATH "Path to the 3rdParty folder")
 
 if(LY_3RDPARTY_PATH)
     file(TO_CMAKE_PATH ${LY_3RDPARTY_PATH} LY_3RDPARTY_PATH)
diff --git a/cmake/3rdParty/BuiltInPackages.cmake b/cmake/3rdParty/BuiltInPackages.cmake
index 7f1ce8bf98..28f66dda0c 100644
--- a/cmake/3rdParty/BuiltInPackages.cmake
+++ b/cmake/3rdParty/BuiltInPackages.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/FindOpenGLInterface.cmake b/cmake/3rdParty/FindOpenGLInterface.cmake
index f3822c5bac..c6e14ec67e 100644
--- a/cmake/3rdParty/FindOpenGLInterface.cmake
+++ b/cmake/3rdParty/FindOpenGLInterface.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/FindRadTelemetry.cmake b/cmake/3rdParty/FindRadTelemetry.cmake
index a97cd56f6f..1bbead4cbf 100644
--- a/cmake/3rdParty/FindRadTelemetry.cmake
+++ b/cmake/3rdParty/FindRadTelemetry.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/FindVkValidation.cmake b/cmake/3rdParty/FindVkValidation.cmake
index 163abf66d2..d3dfa1e795 100644
--- a/cmake/3rdParty/FindVkValidation.cmake
+++ b/cmake/3rdParty/FindVkValidation.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/FindWwise.cmake b/cmake/3rdParty/FindWwise.cmake
index c53426fcc8..132b3032d7 100644
--- a/cmake/3rdParty/FindWwise.cmake
+++ b/cmake/3rdParty/FindWwise.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake
index 5846463c7f..1f3d67a034 100644
--- a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake
+++ b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Android/RadTelemetry_android.cmake b/cmake/3rdParty/Platform/Android/RadTelemetry_android.cmake
index dd6fa06731..7bc1ad7ca6 100644
--- a/cmake/3rdParty/Platform/Android/RadTelemetry_android.cmake
+++ b/cmake/3rdParty/Platform/Android/RadTelemetry_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Android/VkValidation_android.cmake b/cmake/3rdParty/Platform/Android/VkValidation_android.cmake
index 03b754e145..608eed70bd 100644
--- a/cmake/3rdParty/Platform/Android/VkValidation_android.cmake
+++ b/cmake/3rdParty/Platform/Android/VkValidation_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Android/Wwise_android.cmake b/cmake/3rdParty/Platform/Android/Wwise_android.cmake
index e63a1d25f8..659db96843 100644
--- a/cmake/3rdParty/Platform/Android/Wwise_android.cmake
+++ b/cmake/3rdParty/Platform/Android/Wwise_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Android/cmake_android_files.cmake b/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
index a5f666c884..7389b33d4d 100644
--- a/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
+++ b/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
index a45a5bf3cc..b0cfb52fb2 100644
--- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
+++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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,7 +10,7 @@ ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform
 ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform                  TARGETS ilmbase                     PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
 ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform                    TARGETS hdf5                        PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
 ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform                 TARGETS alembic                     PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
-ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev9-multiplatform                   TARGETS assimplib                   PACKAGE_HASH 448530277b51b145ca43b96becd0266e29ae210fc9e2b45f5afe85f301a040e7)
+ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev11-multiplatform                  TARGETS assimplib                   PACKAGE_HASH 1a9113788b893ef4a2ee63ac01eb71b981a92894a5a51175703fa225f5804dec)
 ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform            TARGETS squish-ccr                  PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
 ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform         TARGETS ASTCEncoder                 PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
 ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                             TARGETS md5                         PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
@@ -31,7 +31,7 @@ ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform
 ly_associate_package(PACKAGE_NAME AWSGameLiftServerSDK-3.4.1-rev1-linux             TARGETS AWSGameLiftServerSDK        PACKAGE_HASH a8149a95bd100384af6ade97e2b21a56173740d921e6c3da8188cd51554d39af)
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-linux                          TARGETS freetype                    PACKAGE_HASH 9ad246873067717962c6b780d28a5ce3cef3321b73c9aea746a039c798f52e93)
 ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-linux                               TARGETS tiff                        PACKAGE_HASH ae92b4d3b189c42ef644abc5cac865d1fb2eb7cb5622ec17e35642b00d1a0a76)
-ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-linux                   TARGETS AWSNativeSDK                PACKAGE_HASH b4db38de49d35a5f7500aed7f4aee5ec511dd3b584ee06fe9097885690191a5d)
+ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev5-linux                   TARGETS AWSNativeSDK                PACKAGE_HASH 0101a4052d9fce83a6f5515e00f366e97b308ecb8261ad23a6e4eb4365212ab6)
 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 etc2comp-9cd0f9cae0-rev1-linux                    TARGETS etc2comp                    PACKAGE_HASH 9283aa5db5bb7fb90a0ddb7a9f3895317c8ebe8044943124bbb3673a41407430)
diff --git a/cmake/3rdParty/Platform/Linux/Wwise_linux.cmake b/cmake/3rdParty/Platform/Linux/Wwise_linux.cmake
index b3c085d933..93b65afe52 100644
--- a/cmake/3rdParty/Platform/Linux/Wwise_linux.cmake
+++ b/cmake/3rdParty/Platform/Linux/Wwise_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake b/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
index 1ba16db296..217903633f 100644
--- a/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
+++ b/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Linux/squish-ccr_linux.cmake b/cmake/3rdParty/Platform/Linux/squish-ccr_linux.cmake
index 7cf2303508..02680ce2f3 100644
--- a/cmake/3rdParty/Platform/Linux/squish-ccr_linux.cmake
+++ b/cmake/3rdParty/Platform/Linux/squish-ccr_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
index be25da47f2..a7a5c99adf 100644
--- a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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,7 +10,7 @@ ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform
 ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform                  TARGETS ilmbase                     PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
 ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform                    TARGETS hdf5                        PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
 ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform                 TARGETS alembic                     PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
-ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev9-multiplatform                   TARGETS assimplib                   PACKAGE_HASH 448530277b51b145ca43b96becd0266e29ae210fc9e2b45f5afe85f301a040e7)
+ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev11-multiplatform                  TARGETS assimplib                   PACKAGE_HASH 1a9113788b893ef4a2ee63ac01eb71b981a92894a5a51175703fa225f5804dec)
 ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform            TARGETS squish-ccr                  PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
 ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform         TARGETS ASTCEncoder                 PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
 ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                             TARGETS md5                         PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
diff --git a/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake b/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
index cf06e7520c..6d3a1d5129 100644
--- a/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Mac/RadTelemetry_mac.cmake b/cmake/3rdParty/Platform/Mac/RadTelemetry_mac.cmake
index a6fb41f077..1edf30bd8c 100644
--- a/cmake/3rdParty/Platform/Mac/RadTelemetry_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/RadTelemetry_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Mac/Wwise_mac.cmake b/cmake/3rdParty/Platform/Mac/Wwise_mac.cmake
index b5c2c121eb..0edfd791ce 100644
--- a/cmake/3rdParty/Platform/Mac/Wwise_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/Wwise_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake b/cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
index 4334035a1a..c2ab76d23d 100644
--- a/cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
+++ b/cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Mac/squish-ccr_mac.cmake b/cmake/3rdParty/Platform/Mac/squish-ccr_mac.cmake
index ebf72aa160..bef495af48 100644
--- a/cmake/3rdParty/Platform/Mac/squish-ccr_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/squish-ccr_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
index 153e690148..e9eaa431ac 100644
--- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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,7 +10,7 @@ ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform
 ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform                      TARGETS ilmbase                     PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
 ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform                        TARGETS hdf5                        PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
 ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform                     TARGETS alembic                     PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
-ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev10-multiplatform                      TARGETS assimplib                   PACKAGE_HASH d0fb822a6a359f1bebbb720a8502a289540af08baa887c8bc978f0fbbee07385)
+ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev11-multiplatform                      TARGETS assimplib                   PACKAGE_HASH 1a9113788b893ef4a2ee63ac01eb71b981a92894a5a51175703fa225f5804dec)
 ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform                TARGETS squish-ccr                  PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
 ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform             TARGETS ASTCEncoder                 PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
 ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                                 TARGETS md5                         PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
diff --git a/cmake/3rdParty/Platform/Windows/RadTelemetry_windows.cmake b/cmake/3rdParty/Platform/Windows/RadTelemetry_windows.cmake
index 3a6ff60cbf..d44080d968 100644
--- a/cmake/3rdParty/Platform/Windows/RadTelemetry_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/RadTelemetry_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Windows/Wwise_windows.cmake b/cmake/3rdParty/Platform/Windows/Wwise_windows.cmake
index fd72985a82..e5d2c06651 100644
--- a/cmake/3rdParty/Platform/Windows/Wwise_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/Wwise_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
index d5a3ec31b5..75f2e61889 100644
--- a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
+++ b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/Windows/squish-ccr_windows.cmake b/cmake/3rdParty/Platform/Windows/squish-ccr_windows.cmake
index dffc02bd5a..a44681aea8 100644
--- a/cmake/3rdParty/Platform/Windows/squish-ccr_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/squish-ccr_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
index 43fd1568a3..573dece628 100644
--- a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
+++ b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/iOS/RadTelemetry_ios.cmake b/cmake/3rdParty/Platform/iOS/RadTelemetry_ios.cmake
index bed461c357..3ff213b4e5 100644
--- a/cmake/3rdParty/Platform/iOS/RadTelemetry_ios.cmake
+++ b/cmake/3rdParty/Platform/iOS/RadTelemetry_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/iOS/Wwise_ios.cmake b/cmake/3rdParty/Platform/iOS/Wwise_ios.cmake
index 874273a5a4..e81d25b53a 100644
--- a/cmake/3rdParty/Platform/iOS/Wwise_ios.cmake
+++ b/cmake/3rdParty/Platform/iOS/Wwise_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake b/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
index 6e1ac8cfad..81aa33a1b0 100644
--- a/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
+++ b/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdParty/cmake_files.cmake b/cmake/3rdParty/cmake_files.cmake
index 77640fe4aa..d5ce8045c4 100644
--- a/cmake/3rdParty/cmake_files.cmake
+++ b/cmake/3rdParty/cmake_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/3rdPartyPackages.cmake b/cmake/3rdPartyPackages.cmake
index fa6349a303..c13eecbee4 100644
--- a/cmake/3rdPartyPackages.cmake
+++ b/cmake/3rdPartyPackages.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -28,8 +28,7 @@ include(cmake/LySet.cmake)
 # also allowed:
 # "s3://bucketname" (it will use LYPackage_S3Downloader.cmake to download it from a s3 bucket)
 
-# https://d2c171ws20a1rv.cloudfront.net will be the current "production" CDN until formally moved to the public O3DE repo
-set(LY_PACKAGE_SERVER_URLS "https://d2c171ws20a1rv.cloudfront.net" CACHE STRING "Server URLS to fetch packages from")
+set(LY_PACKAGE_SERVER_URLS "http://d3t6xeg4fgfoum.cloudfront.net" CACHE STRING "Server URLS to fetch packages from")
 # Note: if you define the "LY_PACKAGE_SERVER_URLS" environment variable
 # it will be added to this value in the front, so that users can set
 # an env var and use that as an "additional" set of servers beyond the default set.
diff --git a/cmake/CMakeFiles.cmake b/cmake/CMakeFiles.cmake
index 5b3e858694..2c28d61d73 100644
--- a/cmake/CMakeFiles.cmake
+++ b/cmake/CMakeFiles.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/CommandExecution.cmake b/cmake/CommandExecution.cmake
index c450d9b405..370a074a11 100644
--- a/cmake/CommandExecution.cmake
+++ b/cmake/CommandExecution.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Configurations.cmake b/cmake/Configurations.cmake
index 721c383a68..82dd94e17d 100644
--- a/cmake/Configurations.cmake
+++ b/cmake/Configurations.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 71ff0673d7..6d018e5a31 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Deployment.cmake b/cmake/Deployment.cmake
index 2202a58cdb..ed11848f28 100644
--- a/cmake/Deployment.cmake
+++ b/cmake/Deployment.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/EngineJson.cmake b/cmake/EngineJson.cmake
index a88008d9a0..fa469758d6 100644
--- a/cmake/EngineJson.cmake
+++ b/cmake/EngineJson.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/FileUtil.cmake b/cmake/FileUtil.cmake
index 86fa5532fa..77291d8dbb 100644
--- a/cmake/FileUtil.cmake
+++ b/cmake/FileUtil.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Findo3de.cmake b/cmake/Findo3de.cmake
index 1af52490df..4593d85460 100644
--- a/cmake/Findo3de.cmake
+++ b/cmake/Findo3de.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Gems.cmake b/cmake/Gems.cmake
index 94928fdd40..634e09f596 100644
--- a/cmake/Gems.cmake
+++ b/cmake/Gems.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/GeneralSettings.cmake b/cmake/GeneralSettings.cmake
index da8cdcd71e..93f12020b7 100644
--- a/cmake/GeneralSettings.cmake
+++ b/cmake/GeneralSettings.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Install.cmake b/cmake/Install.cmake
index a6d5ffe5f7..d2131c4a50 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/LYPackage_S3Downloader.cmake b/cmake/LYPackage_S3Downloader.cmake
index e5398a754f..ec33d3f4c2 100644
--- a/cmake/LYPackage_S3Downloader.cmake
+++ b/cmake/LYPackage_S3Downloader.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/LYPython.cmake b/cmake/LYPython.cmake
index b5c7c44905..d7d3f3251e 100644
--- a/cmake/LYPython.cmake
+++ b/cmake/LYPython.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/LYTestWrappers.cmake b/cmake/LYTestWrappers.cmake
index 23bc47030d..d932aa343b 100644
--- a/cmake/LYTestWrappers.cmake
+++ b/cmake/LYTestWrappers.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/LYWrappers.cmake b/cmake/LYWrappers.cmake
index c559adaf83..b6daf8b6d7 100644
--- a/cmake/LYWrappers.cmake
+++ b/cmake/LYWrappers.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -257,14 +257,7 @@ function(ly_add_target)
     # IDE organization
     ly_source_groups_from_folders("${ALLFILES}")
     source_group("Generated Files" REGULAR_EXPRESSION "(${CMAKE_BINARY_DIR})") # Any file coming from the output folder
-    file(RELATIVE_PATH project_path ${LY_ROOT_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR})
-    # Visual Studio cannot load a project with a FOLDER that starts with a "../" relative path
-    # Strip away any leading ../ and then add a prefix of ExternalTargets/ as that in this scenario
-    # A relative directory with ../ would be outside of the Lumberyard Engine Root therefore it is external
-    set(ide_path ${project_path})
-    if (${project_path} MATCHES [[^(\.\./)+(.*)]])
-        set(ide_path "${CMAKE_MATCH_2}")
-    endif()
+    ly_get_vs_folder_directory(${CMAKE_CURRENT_SOURCE_DIR} ide_path)
     set_property(TARGET ${project_NAME} PROPERTY FOLDER ${ide_path})
 
 
@@ -639,3 +632,33 @@ function(ly_de_alias_target target_name output_variable_name)
     endif()
     set(${output_variable_name} ${de_aliased_target_name} PARENT_SCOPE)
 endfunction()
+
+#! ly_get_vs_folder_directory: Sets the Visual Studio folder name used for organizing vcxproj
+#  in the IDE
+#
+# Visual Studio cannot load projects that with a ".." relative path or contain a colon ":" as part of its FOLDER
+# Therefore if the .vcxproj is absolute, the drive letter must be removed from the folder name
+#
+# What this method does is first check if the target being added to the Visual Studio solution is within
+# the LY_ROOT_FOLDER(i.e is the LY_ROOT_FOLDER a prefix of the target source directory)
+# If it is a relative path to the target is used as the folder name
+# Otherwise the target directory would either 
+# 1. Be a path outside of the LY_ROOT_FOLDER on the same drive.
+#    In that case forming a relative path would cause it to start with ".." which will not work
+# 2. Be an path outside of the LY_ROOT_FOLDER on a different drive
+#    Here a relative path cannot be formed and therefore the path would start with "<drive>:/Path/To/Project"
+#    Which shows up as unloaded due to containing a colon
+# In this scenario the relative part of the path from the drive letter is used as the FOLDER name
+# to make sure the projects show up in the loaded .sln
+function(ly_get_vs_folder_directory absolute_target_source_dir output_source_dir)
+    # Get a relative directory to the LY_ROOT_FOLDER if possible for the Visual Studio solution hierarchy
+    # If a relative path cannot be formed, then retrieve a path with the drive letter stripped from it
+    cmake_path(IS_PREFIX LY_ROOT_FOLDER ${absolute_target_source_dir} is_target_prefix_of_engine_root)
+    if(is_target_prefix_of_engine_root)
+        cmake_path(RELATIVE_PATH absolute_target_source_dir BASE_DIRECTORY ${LY_ROOT_FOLDER} OUTPUT_VARIABLE relative_target_source_dir)
+    else()
+        cmake_path(GET absolute_target_source_dir RELATIVE_PART relative_target_source_dir)
+    endif()
+
+    set(${output_source_dir} ${relative_target_source_dir} PARENT_SCOPE)
+endfunction()
diff --git a/cmake/LyAutoGen.cmake b/cmake/LyAutoGen.cmake
index 841bca7fa7..201db8566b 100644
--- a/cmake/LyAutoGen.cmake
+++ b/cmake/LyAutoGen.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/LySet.cmake b/cmake/LySet.cmake
index 0968dd9ad6..0ce4e17081 100644
--- a/cmake/LySet.cmake
+++ b/cmake/LySet.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Monolithic.cmake b/cmake/Monolithic.cmake
index 90c0569a13..3b75f45b5c 100644
--- a/cmake/Monolithic.cmake
+++ b/cmake/Monolithic.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/O3DEJson.cmake b/cmake/O3DEJson.cmake
index a95c2c4663..0c0a5efcfe 100644
--- a/cmake/O3DEJson.cmake
+++ b/cmake/O3DEJson.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/OutputDirectory.cmake b/cmake/OutputDirectory.cmake
index c1979045f1..146315177a 100644
--- a/cmake/OutputDirectory.cmake
+++ b/cmake/OutputDirectory.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/PAL.cmake b/cmake/PAL.cmake
index a87143c0d4..11541d395a 100644
--- a/cmake/PAL.cmake
+++ b/cmake/PAL.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/PALTools.cmake b/cmake/PALTools.cmake
index c8be3f2cb0..09af3c8d16 100644
--- a/cmake/PALTools.cmake
+++ b/cmake/PALTools.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Packaging.cmake b/cmake/Packaging.cmake
index 83e91d73ee..d77b5a30f8 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/PackagingConfig.cmake b/cmake/PackagingConfig.cmake
index 26275aff36..e54164d641 100644
--- a/cmake/PackagingConfig.cmake
+++ b/cmake/PackagingConfig.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/Configurations_android.cmake b/cmake/Platform/Android/Configurations_android.cmake
index 2b05fbc4fc..7e91ea3838 100644
--- a/cmake/Platform/Android/Configurations_android.cmake
+++ b/cmake/Platform/Android/Configurations_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/Install_android.cmake b/cmake/Platform/Android/Install_android.cmake
index b95561046e..6d3bb4c1d9 100644
--- a/cmake/Platform/Android/Install_android.cmake
+++ b/cmake/Platform/Android/Install_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/LYTestWrappers_android.cmake b/cmake/Platform/Android/LYTestWrappers_android.cmake
index ce5d67d66d..e1b5394b94 100644
--- a/cmake/Platform/Android/LYTestWrappers_android.cmake
+++ b/cmake/Platform/Android/LYTestWrappers_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/LYWrappers_android.cmake b/cmake/Platform/Android/LYWrappers_android.cmake
index 33ed162cf4..193e0622fa 100644
--- a/cmake/Platform/Android/LYWrappers_android.cmake
+++ b/cmake/Platform/Android/LYWrappers_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/PALDetection_android.cmake b/cmake/Platform/Android/PALDetection_android.cmake
index 2d10e1b275..bfa8530ff0 100644
--- a/cmake/Platform/Android/PALDetection_android.cmake
+++ b/cmake/Platform/Android/PALDetection_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/PAL_android.cmake b/cmake/Platform/Android/PAL_android.cmake
index c0d7e4d757..ea19081a8f 100644
--- a/cmake/Platform/Android/PAL_android.cmake
+++ b/cmake/Platform/Android/PAL_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/RuntimeDependencies_android.cmake b/cmake/Platform/Android/RuntimeDependencies_android.cmake
index d57c916270..45fdaec202 100644
--- a/cmake/Platform/Android/RuntimeDependencies_android.cmake
+++ b/cmake/Platform/Android/RuntimeDependencies_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/Toolchain_android.cmake b/cmake/Platform/Android/Toolchain_android.cmake
index 91febd474e..e63c30af90 100644
--- a/cmake/Platform/Android/Toolchain_android.cmake
+++ b/cmake/Platform/Android/Toolchain_android.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Android/platform_android_files.cmake b/cmake/Platform/Android/platform_android_files.cmake
index 6dd2748ab7..285c1c0995 100644
--- a/cmake/Platform/Android/platform_android_files.cmake
+++ b/cmake/Platform/Android/platform_android_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/Clang/Configurations_clang.cmake b/cmake/Platform/Common/Clang/Configurations_clang.cmake
index 439a21e5be..3d9348e984 100644
--- a/cmake/Platform/Common/Clang/Configurations_clang.cmake
+++ b/cmake/Platform/Common/Clang/Configurations_clang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/Configurations_common.cmake b/cmake/Platform/Common/Configurations_common.cmake
index da8bf683d4..6abac53778 100644
--- a/cmake/Platform/Common/Configurations_common.cmake
+++ b/cmake/Platform/Common/Configurations_common.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/Directory.Build.props b/cmake/Platform/Common/Directory.Build.props
index c511787fbe..29dbcd8584 100644
--- a/cmake/Platform/Common/Directory.Build.props
+++ b/cmake/Platform/Common/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) Contributors to the Open 3D Engine Project
+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/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake
index 307f5c3ef8..7ab6006220 100644
--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -163,6 +163,7 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar
         unset(RUNTIME_DEPENDENCIES_PLACEHOLDER)
     endif()
 
+
     get_target_property(inteface_build_dependencies_props ${TARGET_NAME} INTERFACE_LINK_LIBRARIES)
     unset(INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER)
     if(inteface_build_dependencies_props)
@@ -522,47 +523,75 @@ function(ly_setup_others)
         DESTINATION .
     )
 
-    # Gem Source Assets and Registry
+    # Gem Source Assets and configuration files
     # Find all gem directories relative to the CMake Source Dir
-    file(GLOB_RECURSE
-        gems_assets_path
-        LIST_DIRECTORIES TRUE
-        RELATIVE "${LY_ROOT_FOLDER}/"
-        "Gems/*"
-    )
-    list(FILTER gems_assets_path INCLUDE REGEX "/(Assets|Registry)$")
 
-    foreach (gem_assets_path ${gems_assets_path})
-        set(gem_abs_assets_path ${LY_ROOT_FOLDER}/${gem_assets_path}/)
-        if (EXISTS ${gem_abs_assets_path})
+    # This first loop is to filter out transient and .gitignore'd folders that should be added to
+    # the install layout from the root directory. Such as <external-subdirectory-root>/Cache.
+    # This is also done to avoid globbing thousands of files in subdirectories that shouldn't
+    # be processed.
+    foreach(gem_candidate_dir IN LISTS LY_EXTERNAL_SUBDIRS LY_PROJECTS)
+        file(REAL_PATH ${gem_candidate_dir} gem_candidate_dir BASE_DIRECTORY ${LY_ROOT_FOLDER})
+        # Don't recurse immediately in order to exclude transient source artifacts
+        file(GLOB
+            external_subdir_files
+            LIST_DIRECTORIES TRUE
+            "${gem_candidate_dir}/*"
+        )
+        # Exclude transient artifacts that shouldn't be copied to the install layout
+        list(FILTER external_subdir_files EXCLUDE REGEX "/([Bb]uild|[Cc]ache|[Uu]ser)$")
+        list(APPEND filtered_asset_paths ${external_subdir_files})
+    endforeach()
+
+    # At this point the filtered_assets_paths contains the list of all directories and files
+    # that are non-excluded candidates that can be scanned for target directories and files
+    # to copy over to the install layout
+    foreach(filtered_asset_path IN LISTS filtered_asset_paths)
+        if(IS_DIRECTORY ${filtered_asset_path})
+            file(GLOB_RECURSE
+                recurse_assets_paths
+                LIST_DIRECTORIES TRUE
+                "${filtered_asset_path}/*"
+            )
+            set(gem_file_paths ${recurse_assets_paths})
+            # Make sure to prepend the current path iteration to the gem_dirs_path to filter
+            set(gem_dir_paths ${filtered_asset_path} ${recurse_assets_paths})
+
+            # Gather directories to copy over
+            # Currently only the Assets, Registry and Config directories are copied over
+            list(FILTER gem_dir_paths INCLUDE REGEX "/(Assets|Registry|Config)$")
+            list(APPEND gems_assets_dir_path ${gem_dir_paths})
+        else()
+            set(gem_file_paths ${filtered_asset_path})
+        endif()
+
+        # Gather files to copy over
+        # Currently only the gem.json file is copied over
+        list(FILTER gem_file_paths INCLUDE REGEX "/(gem.json)$")
+        list(APPEND gems_assets_file_path "${gem_file_paths}")
+    endforeach()
+
+    # gem directories to install
+    foreach(gem_absolute_dir_path ${gems_assets_dir_path})
+        cmake_path(RELATIVE_PATH gem_absolute_dir_path BASE_DIRECTORY ${LY_ROOT_FOLDER} OUTPUT_VARIABLE gem_relative_dir_path)
+        if (EXISTS ${gem_absolute_dir_path})
             # The trailing slash is IMPORTANT here as that is needed to prevent
             # the "Assets" folder from being copied underneath the <gem-root>/Assets folder
-            install(DIRECTORY ${gem_abs_assets_path}
-                DESTINATION ${gem_assets_path}
+            install(DIRECTORY "${gem_absolute_dir_path}/"
+                DESTINATION ${gem_relative_dir_path}
             )
         endif()
     endforeach()
 
-    # gem.json files
-    file(GLOB_RECURSE
-        gems_json_path
-        LIST_DIRECTORIES FALSE
-        RELATIVE "${LY_ROOT_FOLDER}"
-        "Gems/*/gem.json"
-    )
-    foreach(gem_json_path ${gems_json_path})
-        get_filename_component(gem_relative_path ${gem_json_path} DIRECTORY)
-        install(FILES ${gem_json_path}
-            DESTINATION ${gem_relative_path}
+    # gem files to install
+    foreach(gem_absolute_file_path ${gems_assets_file_path})
+        cmake_path(RELATIVE_PATH gem_absolute_file_path BASE_DIRECTORY ${LY_ROOT_FOLDER} OUTPUT_VARIABLE gem_relative_file_path)
+        cmake_path(GET gem_relative_file_path PARENT_PATH gem_relative_parent_dir)
+        install(FILES ${gem_absolute_file_path}
+            DESTINATION ${gem_relative_parent_dir}
         )
     endforeach()
 
-    # Additional files needed by gems
-    install(DIRECTORY
-        ${LY_ROOT_FOLDER}/Gems/Atom/Asset/ImageProcessingAtom/Config
-        DESTINATION Gems/Atom/Asset/ImageProcessingAtom
-    )
-
     # Templates
     install(DIRECTORY
         ${LY_ROOT_FOLDER}/Templates
diff --git a/cmake/Platform/Common/LYWrappers_default.cmake b/cmake/Platform/Common/LYWrappers_default.cmake
index 65cfa33c0e..4f74d577e1 100644
--- a/cmake/Platform/Common/LYWrappers_default.cmake
+++ b/cmake/Platform/Common/LYWrappers_default.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/MSVC/Configurations_msvc.cmake b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake
index 022a3b9e33..cad0e818cb 100644
--- a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake
+++ b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/RuntimeDependencies_common.cmake b/cmake/Platform/Common/RuntimeDependencies_common.cmake
index 97f573981a..734dd94203 100644
--- a/cmake/Platform/Common/RuntimeDependencies_common.cmake
+++ b/cmake/Platform/Common/RuntimeDependencies_common.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/TargetIncludeSystemDirectories_supported.cmake b/cmake/Platform/Common/TargetIncludeSystemDirectories_supported.cmake
index d270aadb17..7412d9b9ac 100644
--- a/cmake/Platform/Common/TargetIncludeSystemDirectories_supported.cmake
+++ b/cmake/Platform/Common/TargetIncludeSystemDirectories_supported.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/TargetIncludeSystemDirectories_unsupported.cmake b/cmake/Platform/Common/TargetIncludeSystemDirectories_unsupported.cmake
index 9cc035ab01..1999195b23 100644
--- a/cmake/Platform/Common/TargetIncludeSystemDirectories_unsupported.cmake
+++ b/cmake/Platform/Common/TargetIncludeSystemDirectories_unsupported.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/VisualStudio_common.cmake b/cmake/Platform/Common/VisualStudio_common.cmake
index 8ee5da0b79..345214274b 100644
--- a/cmake/Platform/Common/VisualStudio_common.cmake
+++ b/cmake/Platform/Common/VisualStudio_common.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Common/runtime_dependencies_common.cmake.in b/cmake/Platform/Common/runtime_dependencies_common.cmake.in
index fcf8d75291..e2a85374b8 100644
--- a/cmake/Platform/Common/runtime_dependencies_common.cmake.in
+++ b/cmake/Platform/Common/runtime_dependencies_common.cmake.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/Configurations_linux.cmake b/cmake/Platform/Linux/Configurations_linux.cmake
index de2e3968d2..b963266beb 100644
--- a/cmake/Platform/Linux/Configurations_linux.cmake
+++ b/cmake/Platform/Linux/Configurations_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/Install_linux.cmake b/cmake/Platform/Linux/Install_linux.cmake
index b95561046e..6d3bb4c1d9 100644
--- a/cmake/Platform/Linux/Install_linux.cmake
+++ b/cmake/Platform/Linux/Install_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/LYTestWrappers_linux.cmake b/cmake/Platform/Linux/LYTestWrappers_linux.cmake
index b401f52e8c..72573a437f 100644
--- a/cmake/Platform/Linux/LYTestWrappers_linux.cmake
+++ b/cmake/Platform/Linux/LYTestWrappers_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/LYWrappers_linux.cmake b/cmake/Platform/Linux/LYWrappers_linux.cmake
index 63d8d4928c..fcb45851f4 100644
--- a/cmake/Platform/Linux/LYWrappers_linux.cmake
+++ b/cmake/Platform/Linux/LYWrappers_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/PALDetection_linux.cmake b/cmake/Platform/Linux/PALDetection_linux.cmake
index d8bbc5b646..5cc8ad2ea3 100644
--- a/cmake/Platform/Linux/PALDetection_linux.cmake
+++ b/cmake/Platform/Linux/PALDetection_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/PAL_linux.cmake b/cmake/Platform/Linux/PAL_linux.cmake
index 41e48b9709..d8f16d0706 100644
--- a/cmake/Platform/Linux/PAL_linux.cmake
+++ b/cmake/Platform/Linux/PAL_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/RPathChange.cmake b/cmake/Platform/Linux/RPathChange.cmake
index 9b8ea1aab1..ea7df87053 100644
--- a/cmake/Platform/Linux/RPathChange.cmake
+++ b/cmake/Platform/Linux/RPathChange.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/RuntimeDependencies_linux.cmake b/cmake/Platform/Linux/RuntimeDependencies_linux.cmake
index d57c916270..45fdaec202 100644
--- a/cmake/Platform/Linux/RuntimeDependencies_linux.cmake
+++ b/cmake/Platform/Linux/RuntimeDependencies_linux.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Linux/platform_linux_files.cmake b/cmake/Platform/Linux/platform_linux_files.cmake
index 53ec15b44f..73f5ba3cb6 100644
--- a/cmake/Platform/Linux/platform_linux_files.cmake
+++ b/cmake/Platform/Linux/platform_linux_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/Configurations_mac.cmake b/cmake/Platform/Mac/Configurations_mac.cmake
index 02dcc5af5b..a3551be3b9 100644
--- a/cmake/Platform/Mac/Configurations_mac.cmake
+++ b/cmake/Platform/Mac/Configurations_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/Install_mac.cmake b/cmake/Platform/Mac/Install_mac.cmake
index d9c54ad555..74ebd293ae 100644
--- a/cmake/Platform/Mac/Install_mac.cmake
+++ b/cmake/Platform/Mac/Install_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/LYTestWrappers_mac.cmake b/cmake/Platform/Mac/LYTestWrappers_mac.cmake
index ce5d67d66d..e1b5394b94 100644
--- a/cmake/Platform/Mac/LYTestWrappers_mac.cmake
+++ b/cmake/Platform/Mac/LYTestWrappers_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/LYWrappers_mac.cmake b/cmake/Platform/Mac/LYWrappers_mac.cmake
index 19f1abb08d..242ed30f74 100644
--- a/cmake/Platform/Mac/LYWrappers_mac.cmake
+++ b/cmake/Platform/Mac/LYWrappers_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/PALDetection_mac.cmake b/cmake/Platform/Mac/PALDetection_mac.cmake
index f17d5f03dc..b3c16e86e9 100644
--- a/cmake/Platform/Mac/PALDetection_mac.cmake
+++ b/cmake/Platform/Mac/PALDetection_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/PAL_mac.cmake b/cmake/Platform/Mac/PAL_mac.cmake
index fd45dfa3f9..5a47c91c8a 100644
--- a/cmake/Platform/Mac/PAL_mac.cmake
+++ b/cmake/Platform/Mac/PAL_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/RPathChange.cmake b/cmake/Platform/Mac/RPathChange.cmake
index ed624fc77a..e35c88456d 100644
--- a/cmake/Platform/Mac/RPathChange.cmake
+++ b/cmake/Platform/Mac/RPathChange.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/RuntimeDependencies_mac.cmake b/cmake/Platform/Mac/RuntimeDependencies_mac.cmake
index 59c481864d..cce87c0ded 100644
--- a/cmake/Platform/Mac/RuntimeDependencies_mac.cmake
+++ b/cmake/Platform/Mac/RuntimeDependencies_mac.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/platform_mac_files.cmake b/cmake/Platform/Mac/platform_mac_files.cmake
index 48c6f7b4ea..efee5d265e 100644
--- a/cmake/Platform/Mac/platform_mac_files.cmake
+++ b/cmake/Platform/Mac/platform_mac_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
index 795ba60e44..92ad3514d4 100644
--- a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
+++ b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/Configurations_windows.cmake b/cmake/Platform/Windows/Configurations_windows.cmake
index a821082eab..1f7776f219 100644
--- a/cmake/Platform/Windows/Configurations_windows.cmake
+++ b/cmake/Platform/Windows/Configurations_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/Install_windows.cmake b/cmake/Platform/Windows/Install_windows.cmake
index b95561046e..6d3bb4c1d9 100644
--- a/cmake/Platform/Windows/Install_windows.cmake
+++ b/cmake/Platform/Windows/Install_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/LYTestWrappers_windows.cmake b/cmake/Platform/Windows/LYTestWrappers_windows.cmake
index ce5d67d66d..e1b5394b94 100644
--- a/cmake/Platform/Windows/LYTestWrappers_windows.cmake
+++ b/cmake/Platform/Windows/LYTestWrappers_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/LYWrappers_windows.cmake b/cmake/Platform/Windows/LYWrappers_windows.cmake
index 33ed162cf4..193e0622fa 100644
--- a/cmake/Platform/Windows/LYWrappers_windows.cmake
+++ b/cmake/Platform/Windows/LYWrappers_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/PALDetection_windows.cmake b/cmake/Platform/Windows/PALDetection_windows.cmake
index 55e212dbe1..7e3a4fb295 100644
--- a/cmake/Platform/Windows/PALDetection_windows.cmake
+++ b/cmake/Platform/Windows/PALDetection_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/PAL_windows.cmake b/cmake/Platform/Windows/PAL_windows.cmake
index a815668858..639c0bd8e5 100644
--- a/cmake/Platform/Windows/PAL_windows.cmake
+++ b/cmake/Platform/Windows/PAL_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
index cb9d86ede8..6971e32ca2 100644
--- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
@@ -14,9 +14,14 @@
 
         <Variable Name="InstallFolder"
             Type="string"
-            Value="[ProgramFiles64Folder]$(var.CPACK_PACKAGE_INSTALL_DIRECTORY)"
+            Value="[WindowsVolume]$(var.CPACK_PACKAGE_INSTALL_DIRECTORY)"
             bal:Overridable="yes"/>
 
+        <!-- special variable name that auto maps to a WixStandardBootstrapperApplication attribute of the same name -->
+        <Variable Name="LaunchTarget"
+            Type="string"
+            Value="[InstallFolder]\bin\Windows\profile\o3de.exe"/>
+
         <PayloadGroup Id="Images">
             <Payload Id="warning.png" SourceFile="$(var.CPACK_RESOURCE_PATH)/warning.png" Compressed="yes"/>
         </PayloadGroup>
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
index 7da81d0397..6c5d16fd49 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
@@ -22,6 +22,8 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
     <String Id="OptionsHeader">Setup Options</String>
     <String Id="OptionsLocationLabel">Install location:</String>
     <String Id="OptionsBrowseButton">&amp;Browse</String>
+    <String Id="OptionsWarningTitle">WARNING:</String>
+    <String Id="OptionsWarning">Installing to "Program Files" will require [WixBundleName] and its tools to be run with elevated privileges</String>
     <String Id="OptionsOkButton">&amp;OK</String>
     <String Id="OptionsCancelButton">&amp;Cancel</String>
 
@@ -32,9 +34,9 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
     <String Id="ModifyCloseButton">&amp;Close</String>
 
     <!-- action progress page -->
-    <String Id="ProgressHeader">Installing @CPACK_PACKAGE_FULL_NAME@...</String>
-    <String Id="ProgressLabel">Processing:</String>
-    <String Id="OverallProgressPackageText">Initializing...</String>
+    <String Id="ProgressHeader">Processing @CPACK_PACKAGE_FULL_NAME@...</String>
+    <String Id="CacheProgressLabel">Caching Progress</String>
+    <String Id="ExecuteProgressLabel">Execution Progress</String>
     <String Id="ProgressCancelButton">&amp;Cancel</String>
 
     <!-- final page (success state) -->
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 93984d06b8..8d8416539e 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -11,6 +11,8 @@
     <Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Open Sans</Font>
     <!-- throwaway font for button bar -->
     <Font Id="3" Height="-12" Weight="500" Foreground="EEEEEE" Background="EEEEEE">Open Sans</Font>
+    <!-- special font for install warning title -->
+    <Font Id="4" Height="-14" Weight="500" Foreground="000000">Open Sans</Font>
 
     <!-- top banner -->
     <Image X="28" Y="24" Width="168" Height="64" ImageFile="logo.png" Visible="yes"/>
@@ -34,6 +36,8 @@
         <Text X="42" Y="202" Width="-42" Height="18" FontId="1" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
         <Editbox Name="FolderEditbox" X="42" Y="231" Width="354" Height="21" TabStop="yes" FontId="1" FileSystemAutoComplete="yes" />
         <Button Name="BrowseButton" X="406" Y="230" Width="80" Height="23" TabStop="yes" FontId="1">#(loc.OptionsBrowseButton)</Button>
+        <Text X="42" Y="262" Width="-42" Height="20" FontId="4" DisablePrefix="yes">#(loc.OptionsWarningTitle)</Text>
+        <Text X="42" Y="282" Width="-42" Height="54" FontId="1" DisablePrefix="yes">#(loc.OptionsWarning)</Text>
 
         <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
         <Button Name="OptionsOkButton" X="-106" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.OptionsOkButton)</Button>
@@ -54,9 +58,13 @@
     <Page Name="Progress">
         <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
 
-        <Text X="42" Y="202" Width="70" Height="18" FontId="1" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-        <Text Name="OverallProgressPackageText" X="116" Y="202" Width="-42" Height="18" FontId="2" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
-        <Progressbar Name="OverallCalculatedProgressbar" X="42" Y="230" Width="-90" Height="20" />
+        <Text X="42" Y="202" Width="-45" Height="18" FontId="1" DisablePrefix="yes">#(loc.CacheProgressLabel)</Text>
+        <Progressbar Name="CacheProgressbar" X="42" Y="230" Width="-90" Height="20" />
+        <Text Name="CacheProgressText" X="-45" Y="232" Width="32" Height="18" FontId="2" DisablePrefix="yes"/>
+
+        <Text X="42" Y="262" Width="-45" Height="18" FontId="1" DisablePrefix="yes">#(loc.ExecuteProgressLabel)</Text>
+        <Progressbar Name="ExecuteProgressbar" X="42" Y="290" Width="-90" Height="20" />
+        <Text Name="ExecuteProgressText" X="-45" Y="292" Width="32" Height="18" FontId="2" DisablePrefix="yes"/>
 
         <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
         <Button Name="ProgressCancelButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.ProgressCancelButton)</Button>
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
index 07326972c6..2d003d6062 100644
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ b/cmake/Platform/Windows/PackagingPostBuild.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 895886942b..b35733a1ea 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/RuntimeDependencies_windows.cmake b/cmake/Platform/Windows/RuntimeDependencies_windows.cmake
index d57c916270..45fdaec202 100644
--- a/cmake/Platform/Windows/RuntimeDependencies_windows.cmake
+++ b/cmake/Platform/Windows/RuntimeDependencies_windows.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/Windows/platform_windows_files.cmake b/cmake/Platform/Windows/platform_windows_files.cmake
index de87ab3dc9..c3906099b1 100644
--- a/cmake/Platform/Windows/platform_windows_files.cmake
+++ b/cmake/Platform/Windows/platform_windows_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/Configurations_ios.cmake b/cmake/Platform/iOS/Configurations_ios.cmake
index 94fcb984e3..618cbb1d1f 100644
--- a/cmake/Platform/iOS/Configurations_ios.cmake
+++ b/cmake/Platform/iOS/Configurations_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/Install_ios.cmake b/cmake/Platform/iOS/Install_ios.cmake
index d9c54ad555..74ebd293ae 100644
--- a/cmake/Platform/iOS/Install_ios.cmake
+++ b/cmake/Platform/iOS/Install_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/LYTestWrappers_ios.cmake b/cmake/Platform/iOS/LYTestWrappers_ios.cmake
index ce5d67d66d..e1b5394b94 100644
--- a/cmake/Platform/iOS/LYTestWrappers_ios.cmake
+++ b/cmake/Platform/iOS/LYTestWrappers_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/LYWrappers_ios.cmake b/cmake/Platform/iOS/LYWrappers_ios.cmake
index 0fa085d21f..353bbc4899 100644
--- a/cmake/Platform/iOS/LYWrappers_ios.cmake
+++ b/cmake/Platform/iOS/LYWrappers_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/PALDetection_ios.cmake b/cmake/Platform/iOS/PALDetection_ios.cmake
index 5c32dca082..bd0f04aa3f 100644
--- a/cmake/Platform/iOS/PALDetection_ios.cmake
+++ b/cmake/Platform/iOS/PALDetection_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/PAL_ios.cmake b/cmake/Platform/iOS/PAL_ios.cmake
index 387779eef2..870da34a58 100644
--- a/cmake/Platform/iOS/PAL_ios.cmake
+++ b/cmake/Platform/iOS/PAL_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/RuntimeDependencies_ios.cmake b/cmake/Platform/iOS/RuntimeDependencies_ios.cmake
index 8b167bd609..15ef35e777 100644
--- a/cmake/Platform/iOS/RuntimeDependencies_ios.cmake
+++ b/cmake/Platform/iOS/RuntimeDependencies_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/SDK_ios.cmake b/cmake/Platform/iOS/SDK_ios.cmake
index 347d312a4f..8db9d51dd9 100644
--- a/cmake/Platform/iOS/SDK_ios.cmake
+++ b/cmake/Platform/iOS/SDK_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/Toolchain_ios.cmake b/cmake/Platform/iOS/Toolchain_ios.cmake
index 86c56d95b1..a01fb76b56 100644
--- a/cmake/Platform/iOS/Toolchain_ios.cmake
+++ b/cmake/Platform/iOS/Toolchain_ios.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Platform/iOS/platform_ios_files.cmake b/cmake/Platform/iOS/platform_ios_files.cmake
index 91f67742ed..703fc3338c 100644
--- a/cmake/Platform/iOS/platform_ios_files.cmake
+++ b/cmake/Platform/iOS/platform_ios_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Projects.cmake b/cmake/Projects.cmake
index d9843f634f..a8515eeee9 100644
--- a/cmake/Projects.cmake
+++ b/cmake/Projects.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/RuntimeDependencies.cmake b/cmake/RuntimeDependencies.cmake
index 2cb52cf733..66cd1f9c8a 100644
--- a/cmake/RuntimeDependencies.cmake
+++ b/cmake/RuntimeDependencies.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/SettingsRegistry.cmake b/cmake/SettingsRegistry.cmake
index 3aff1bdc5c..0eae244c4f 100644
--- a/cmake/SettingsRegistry.cmake
+++ b/cmake/SettingsRegistry.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/TestImpactFramework/CMakeGraphVizOptions.cmake b/cmake/TestImpactFramework/CMakeGraphVizOptions.cmake
index 3540bffce2..4a0be0ef5b 100644
--- a/cmake/TestImpactFramework/CMakeGraphVizOptions.cmake
+++ b/cmake/TestImpactFramework/CMakeGraphVizOptions.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/TestImpactFramework/LYTestImpactFramework.cmake b/cmake/TestImpactFramework/LYTestImpactFramework.cmake
index c5f5eb7353..a35bcc02f6 100644
--- a/cmake/TestImpactFramework/LYTestImpactFramework.cmake
+++ b/cmake/TestImpactFramework/LYTestImpactFramework.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/Android/__init__.py b/cmake/Tools/Platform/Android/__init__.py
index 30503258bc..1fe051b062 100755
--- a/cmake/Tools/Platform/Android/__init__.py
+++ b/cmake/Tools/Platform/Android/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/Android/android_deployment.py b/cmake/Tools/Platform/Android/android_deployment.py
index dc0d56692b..889c3d7bc2 100755
--- a/cmake/Tools/Platform/Android/android_deployment.py
+++ b/cmake/Tools/Platform/Android/android_deployment.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/Android/android_support.py b/cmake/Tools/Platform/Android/android_support.py
index 2afd2b97ab..c0ac26c277 100755
--- a/cmake/Tools/Platform/Android/android_support.py
+++ b/cmake/Tools/Platform/Android/android_support.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/Android/deploy_android.py b/cmake/Tools/Platform/Android/deploy_android.py
index 8123c57136..2314b45efc 100755
--- a/cmake/Tools/Platform/Android/deploy_android.py
+++ b/cmake/Tools/Platform/Android/deploy_android.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/Android/generate_android_project.py b/cmake/Tools/Platform/Android/generate_android_project.py
index 14c732da6c..01b92e4ab9 100755
--- a/cmake/Tools/Platform/Android/generate_android_project.py
+++ b/cmake/Tools/Platform/Android/generate_android_project.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/Android/launch_android_test.py b/cmake/Tools/Platform/Android/launch_android_test.py
index 87f62b7d06..3021fa6626 100755
--- a/cmake/Tools/Platform/Android/launch_android_test.py
+++ b/cmake/Tools/Platform/Android/launch_android_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/Android/unit_test_android_deployment.py b/cmake/Tools/Platform/Android/unit_test_android_deployment.py
index 82d03e6caf..44d1bfac15 100755
--- a/cmake/Tools/Platform/Android/unit_test_android_deployment.py
+++ b/cmake/Tools/Platform/Android/unit_test_android_deployment.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/Android/unit_test_generate_android_project.py b/cmake/Tools/Platform/Android/unit_test_generate_android_project.py
index 97ff1736b8..fc16fdd4df 100755
--- a/cmake/Tools/Platform/Android/unit_test_generate_android_project.py
+++ b/cmake/Tools/Platform/Android/unit_test_generate_android_project.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/__init__.py b/cmake/Tools/Platform/__init__.py
index 30503258bc..1fe051b062 100755
--- a/cmake/Tools/Platform/__init__.py
+++ b/cmake/Tools/Platform/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/iOS/build_ios_test.py b/cmake/Tools/Platform/iOS/build_ios_test.py
index 3ac6b02c59..4107c44a21 100755
--- a/cmake/Tools/Platform/iOS/build_ios_test.py
+++ b/cmake/Tools/Platform/iOS/build_ios_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/Platform/iOS/launch_ios_test.py b/cmake/Tools/Platform/iOS/launch_ios_test.py
index 3c289c4691..943e986781 100755
--- a/cmake/Tools/Platform/iOS/launch_ios_test.py
+++ b/cmake/Tools/Platform/iOS/launch_ios_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/__init__.py b/cmake/Tools/__init__.py
index 30503258bc..1fe051b062 100755
--- a/cmake/Tools/__init__.py
+++ b/cmake/Tools/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/common.py b/cmake/Tools/common.py
index 9de9ea3286..6d82af789b 100755
--- a/cmake/Tools/common.py
+++ b/cmake/Tools/common.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/layout_tool.py b/cmake/Tools/layout_tool.py
index 97826beb8c..c95a85d0c6 100755
--- a/cmake/Tools/layout_tool.py
+++ b/cmake/Tools/layout_tool.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/unit_test_common.py b/cmake/Tools/unit_test_common.py
index 637d96e51f..287a78b4f6 100755
--- a/cmake/Tools/unit_test_common.py
+++ b/cmake/Tools/unit_test_common.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Tools/unit_test_layout_tool.py b/cmake/Tools/unit_test_layout_tool.py
index abc0f32323..642c1081bb 100755
--- a/cmake/Tools/unit_test_layout_tool.py
+++ b/cmake/Tools/unit_test_layout_tool.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/UnitTest.cmake b/cmake/UnitTest.cmake
index 55612ce2d5..3ac9b92346 100644
--- a/cmake/UnitTest.cmake
+++ b/cmake/UnitTest.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/Version.cmake b/cmake/Version.cmake
index c18f7b45a0..28f759eb6b 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/__init__.py b/cmake/__init__.py
index 30503258bc..1fe051b062 100755
--- a/cmake/__init__.py
+++ b/cmake/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/cmake_files.cmake b/cmake/cmake_files.cmake
index 619c7044be..5b1ff58948 100644
--- a/cmake/cmake_files.cmake
+++ b/cmake/cmake_files.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/createplatformfiles.py b/cmake/createplatformfiles.py
index 440183a016..590bdddc47 100755
--- a/cmake/createplatformfiles.py
+++ b/cmake/createplatformfiles.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -19,7 +19,7 @@ fileContents = ""
 
 def getCopyright():
     return """#
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/gemcmake.py b/cmake/gemcmake.py
index 1917333e6b..7215111ed8 100755
--- a/cmake/gemcmake.py
+++ b/cmake/gemcmake.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -20,7 +20,7 @@ fileContents = ""
 
 def getCopyright():
     return """#
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/install/Copyright.in b/cmake/install/Copyright.in
index 30503258bc..1fe051b062 100644
--- a/cmake/install/Copyright.in
+++ b/cmake/install/Copyright.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/install/Findo3de.cmake.in b/cmake/install/Findo3de.cmake.in
index e059f8506b..5859f949f3 100644
--- a/cmake/install/Findo3de.cmake.in
+++ b/cmake/install/Findo3de.cmake.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/mocfix.py b/cmake/mocfix.py
index c08e70e587..73649faf4b 100755
--- a/cmake/mocfix.py
+++ b/cmake/mocfix.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/projectcmake.py b/cmake/projectcmake.py
index 5d39945ee4..10850ece3f 100755
--- a/cmake/projectcmake.py
+++ b/cmake/projectcmake.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/reroot.py b/cmake/reroot.py
index 0d46d2a5cc..4dbbb24f30 100755
--- a/cmake/reroot.py
+++ b/cmake/reroot.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/waffiles2cmake.py b/cmake/waffiles2cmake.py
index cdb2f7b0cd..22c0f47428 100755
--- a/cmake/waffiles2cmake.py
+++ b/cmake/waffiles2cmake.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -17,7 +17,7 @@ import argparse
 
 def get_banner():
     return """#
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/cmake/warn_fix.py b/cmake/warn_fix.py
index 4647854dee..42a0c88935 100755
--- a/cmake/warn_fix.py
+++ b/cmake/warn_fix.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/ctest_pytest.ini b/ctest_pytest.ini
index 6d5a35e96d..61d0630279 100644
--- a/ctest_pytest.ini
+++ b/ctest_pytest.ini
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/editor.cfg b/editor.cfg
index f2d75a3da2..843a52824d 100644
--- a/editor.cfg
+++ b/editor.cfg
@@ -1,4 +1,4 @@
--- Settings stored here are only used in the Sandbox Editor
+-- Settings stored here are only used in the Editor
 
 -- Disable the Missing Asset Resolver by default
 ed_MissingAssetResolver = 0
diff --git a/python/get_python.bat b/python/get_python.bat
index 348db7d112..61dbeee6ff 100644
--- a/python/get_python.bat
+++ b/python/get_python.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/python/get_python.cmake b/python/get_python.cmake
index d5a4f745c7..0e1fbfaee6 100644
--- a/python/get_python.cmake
+++ b/python/get_python.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/python/get_python.sh b/python/get_python.sh
index 1b28706ca6..9214c45edf 100755
--- a/python/get_python.sh
+++ b/python/get_python.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/python/pip.cmd b/python/pip.cmd
index 33e403d474..07bcd26ef8 100644
--- a/python/pip.cmd
+++ b/python/pip.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/python/pip.sh b/python/pip.sh
index 0a9eec20d5..75436e391b 100755
--- a/python/pip.sh
+++ b/python/pip.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/python/python.cmd b/python/python.cmd
index 74e09deb73..270835acef 100644
--- a/python/python.cmd
+++ b/python/python.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM 
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/python/python.sh b/python/python.sh
index 2407e20ae5..6d53c2ee07 100755
--- a/python/python.sh
+++ b/python/python.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 2a21b166c1..0375587e1b 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index e74cd39c9a..8ac9353aea 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/scripts/build/Jenkins/tools/jenkins_pipeline_metrics.py b/scripts/build/Jenkins/tools/jenkins_pipeline_metrics.py
index 6f69f66944..5702d2de9b 100644
--- a/scripts/build/Jenkins/tools/jenkins_pipeline_metrics.py
+++ b/scripts/build/Jenkins/tools/jenkins_pipeline_metrics.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Android/build_and_run_unit_tests.cmd b/scripts/build/Platform/Android/build_and_run_unit_tests.cmd
index 6575873dce..2287f38070 100644
--- a/scripts/build/Platform/Android/build_and_run_unit_tests.cmd
+++ b/scripts/build/Platform/Android/build_and_run_unit_tests.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Android/gradle_windows.cmd b/scripts/build/Platform/Android/gradle_windows.cmd
index a869021b15..4ac5a3ca69 100644
--- a/scripts/build/Platform/Android/gradle_windows.cmd
+++ b/scripts/build/Platform/Android/gradle_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Android/run_test_on_android_simulator.py b/scripts/build/Platform/Android/run_test_on_android_simulator.py
index e3c4436493..031c52bf7c 100644
--- a/scripts/build/Platform/Android/run_test_on_android_simulator.py
+++ b/scripts/build/Platform/Android/run_test_on_android_simulator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Linux/asset_linux.sh b/scripts/build/Platform/Linux/asset_linux.sh
index fe2ec3d582..bf27802b6a 100755
--- a/scripts/build/Platform/Linux/asset_linux.sh
+++ b/scripts/build/Platform/Linux/asset_linux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Linux/build_asset_linux.sh b/scripts/build/Platform/Linux/build_asset_linux.sh
index d9be128e16..3f564d2ac1 100755
--- a/scripts/build/Platform/Linux/build_asset_linux.sh
+++ b/scripts/build/Platform/Linux/build_asset_linux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Linux/build_linux.sh b/scripts/build/Platform/Linux/build_linux.sh
index aeb46020c7..3d12db22e3 100755
--- a/scripts/build/Platform/Linux/build_linux.sh
+++ b/scripts/build/Platform/Linux/build_linux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Linux/build_test_linux.sh b/scripts/build/Platform/Linux/build_test_linux.sh
index b7abe72b93..3299ef9085 100755
--- a/scripts/build/Platform/Linux/build_test_linux.sh
+++ b/scripts/build/Platform/Linux/build_test_linux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Linux/clean_linux.sh b/scripts/build/Platform/Linux/clean_linux.sh
index 24e0f97afc..af56d9558c 100755
--- a/scripts/build/Platform/Linux/clean_linux.sh
+++ b/scripts/build/Platform/Linux/clean_linux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Linux/env_linux.sh b/scripts/build/Platform/Linux/env_linux.sh
index 62de307e9d..49424758ef 100755
--- a/scripts/build/Platform/Linux/env_linux.sh
+++ b/scripts/build/Platform/Linux/env_linux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Linux/python_linux.sh b/scripts/build/Platform/Linux/python_linux.sh
index 2cbddf6efb..c9c9eec918 100755
--- a/scripts/build/Platform/Linux/python_linux.sh
+++ b/scripts/build/Platform/Linux/python_linux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Linux/test_linux.sh b/scripts/build/Platform/Linux/test_linux.sh
index fcca37222e..3e03dca253 100755
--- a/scripts/build/Platform/Linux/test_linux.sh
+++ b/scripts/build/Platform/Linux/test_linux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Mac/asset_mac.sh b/scripts/build/Platform/Mac/asset_mac.sh
index 25a002e801..012416d21c 100755
--- a/scripts/build/Platform/Mac/asset_mac.sh
+++ b/scripts/build/Platform/Mac/asset_mac.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Mac/build_asset_mac.sh b/scripts/build/Platform/Mac/build_asset_mac.sh
index e5a50fa900..f0ac90ab07 100755
--- a/scripts/build/Platform/Mac/build_asset_mac.sh
+++ b/scripts/build/Platform/Mac/build_asset_mac.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Mac/build_mac.sh b/scripts/build/Platform/Mac/build_mac.sh
index 00254a2974..00fe684767 100755
--- a/scripts/build/Platform/Mac/build_mac.sh
+++ b/scripts/build/Platform/Mac/build_mac.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Mac/build_test_mac.sh b/scripts/build/Platform/Mac/build_test_mac.sh
index 569b05d03e..d4560577a1 100755
--- a/scripts/build/Platform/Mac/build_test_mac.sh
+++ b/scripts/build/Platform/Mac/build_test_mac.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Mac/clean_mac.sh b/scripts/build/Platform/Mac/clean_mac.sh
index 24e0f97afc..af56d9558c 100755
--- a/scripts/build/Platform/Mac/clean_mac.sh
+++ b/scripts/build/Platform/Mac/clean_mac.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Mac/env_mac.sh b/scripts/build/Platform/Mac/env_mac.sh
index afef865593..0a938f0ec5 100755
--- a/scripts/build/Platform/Mac/env_mac.sh
+++ b/scripts/build/Platform/Mac/env_mac.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Mac/python_mac.sh b/scripts/build/Platform/Mac/python_mac.sh
index 2cbddf6efb..c9c9eec918 100755
--- a/scripts/build/Platform/Mac/python_mac.sh
+++ b/scripts/build/Platform/Mac/python_mac.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Mac/test_mac.sh b/scripts/build/Platform/Mac/test_mac.sh
index a04f2f7279..ee9a2f9df8 100755
--- a/scripts/build/Platform/Mac/test_mac.sh
+++ b/scripts/build/Platform/Mac/test_mac.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/Platform/Windows/asset_windows.cmd b/scripts/build/Platform/Windows/asset_windows.cmd
index 1881fcacaa..97af2bbfca 100644
--- a/scripts/build/Platform/Windows/asset_windows.cmd
+++ b/scripts/build/Platform/Windows/asset_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/build_asset_windows.cmd b/scripts/build/Platform/Windows/build_asset_windows.cmd
index 22e28ece2d..2b480990a3 100644
--- a/scripts/build/Platform/Windows/build_asset_windows.cmd
+++ b/scripts/build/Platform/Windows/build_asset_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index ca7ae2b69d..07e0e54bf5 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -329,7 +329,7 @@
     "PARAMETERS": {
         "CONFIGURATION": "profile",
         "OUTPUT_DIRECTORY": "build\\windows_vs2019",
-        "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DCPACK_WIX_ROOT=\"!WIX! \"",
+        "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DCPACK_WIX_ROOT=\"!WIX! \"",
         "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=ON -DLY_INSTALLER_DOWNLOAD_URL=https://dkb1uj4hs9ikv.cloudfront.net -DLY_INSTALLER_LICENSE_URL=https://www.o3debinaries.org/license -DLY_INSTALLER_3RD_PARTY_LICENSE_URL=https://dkb1uj4hs9ikv.cloudfront.net/SPDX-Licenses.txt",
         "CPACK_BUCKET": "spectra-prism-staging-us-west-2",
         "CMAKE_LY_PROJECTS": "",
diff --git a/scripts/build/Platform/Windows/build_installer_windows.cmd b/scripts/build/Platform/Windows/build_installer_windows.cmd
index 4207c00634..8ad19f7c14 100644
--- a/scripts/build/Platform/Windows/build_installer_windows.cmd
+++ b/scripts/build/Platform/Windows/build_installer_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/build_ninja_windows.cmd b/scripts/build/Platform/Windows/build_ninja_windows.cmd
index ce9c04ddcc..9d34a44636 100644
--- a/scripts/build/Platform/Windows/build_ninja_windows.cmd
+++ b/scripts/build/Platform/Windows/build_ninja_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/build_test_windows.cmd b/scripts/build/Platform/Windows/build_test_windows.cmd
index bbc279ba88..316ee0ad3d 100644
--- a/scripts/build/Platform/Windows/build_test_windows.cmd
+++ b/scripts/build/Platform/Windows/build_test_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd
index 8e6227ed8a..d4e54967b6 100644
--- a/scripts/build/Platform/Windows/build_windows.cmd
+++ b/scripts/build/Platform/Windows/build_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/clean_windows.cmd b/scripts/build/Platform/Windows/clean_windows.cmd
index 0dbc570db0..ee4039748a 100644
--- a/scripts/build/Platform/Windows/clean_windows.cmd
+++ b/scripts/build/Platform/Windows/clean_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/env_windows.cmd b/scripts/build/Platform/Windows/env_windows.cmd
index 115cca62bf..81304546ee 100644
--- a/scripts/build/Platform/Windows/env_windows.cmd
+++ b/scripts/build/Platform/Windows/env_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index e7449eda0a..a8f0198299 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/python_windows.cmd b/scripts/build/Platform/Windows/python_windows.cmd
index ba459e7f96..4f5d029544 100644
--- a/scripts/build/Platform/Windows/python_windows.cmd
+++ b/scripts/build/Platform/Windows/python_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/Platform/Windows/test_windows.cmd b/scripts/build/Platform/Windows/test_windows.cmd
index 7c74a48355..d6c795aaa2 100644
--- a/scripts/build/Platform/Windows/test_windows.cmd
+++ b/scripts/build/Platform/Windows/test_windows.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/build/bootstrap/incremental_build_util.py b/scripts/build/bootstrap/incremental_build_util.py
index df36757222..c414818d70 100755
--- a/scripts/build/bootstrap/incremental_build_util.py
+++ b/scripts/build/bootstrap/incremental_build_util.py
@@ -1,4 +1,4 @@
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh
index 34986be047..3bcf80fd0c 100755
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh
index a04feccb0f..41dbe6202d 100755
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh
index 2ba27214d1..d863c0644e 100755
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Linux/install-ubuntu-python3.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-python3.sh
index 7deeb3071d..df67986c3c 100755
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu-python3.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-python3.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
      
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Linux/install-ubuntu.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu.sh
index 932020d1d3..877c6d355d 100755
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Mac/init-setup.sh b/scripts/build/build_node/Platform/Mac/init-setup.sh
index 5dd2247fd3..e7b8d0c24a 100755
--- a/scripts/build/build_node/Platform/Mac/init-setup.sh
+++ b/scripts/build/build_node/Platform/Mac/init-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 set -euo pipefail
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Mac/install-jdk.sh b/scripts/build/build_node/Platform/Mac/install-jdk.sh
index 7695e56f92..a4d3878c79 100755
--- a/scripts/build/build_node/Platform/Mac/install-jdk.sh
+++ b/scripts/build/build_node/Platform/Mac/install-jdk.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 set -euo pipefail
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Mac/install-python.sh b/scripts/build/build_node/Platform/Mac/install-python.sh
index 9b2d8ea194..c1eee8cc7f 100755
--- a/scripts/build/build_node/Platform/Mac/install-python.sh
+++ b/scripts/build/build_node/Platform/Mac/install-python.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 set -euo pipefail
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Mac/install-xcode.sh b/scripts/build/build_node/Platform/Mac/install-xcode.sh
index 41a77e6954..c805400777 100755
--- a/scripts/build/build_node/Platform/Mac/install-xcode.sh
+++ b/scripts/build/build_node/Platform/Mac/install-xcode.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 set -euo pipefail
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Mac/jenkins-self-register-mac.sh b/scripts/build/build_node/Platform/Mac/jenkins-self-register-mac.sh
index 428caf7d83..95cb361642 100755
--- a/scripts/build/build_node/Platform/Mac/jenkins-self-register-mac.sh
+++ b/scripts/build/build_node/Platform/Mac/jenkins-self-register-mac.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 set -euo pipefail
 
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/build_node/Platform/Windows/init_setup.ps1 b/scripts/build/build_node/Platform/Windows/init_setup.ps1
index 9e27261791..e6ca968d80 100644
--- a/scripts/build/build_node/Platform/Windows/init_setup.ps1
+++ b/scripts/build/build_node/Platform/Windows/init_setup.ps1
@@ -1,5 +1,5 @@
 <#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/build/build_node/Platform/Windows/install_android.ps1 b/scripts/build/build_node/Platform/Windows/install_android.ps1
index 368eb866a8..32a21596e1 100644
--- a/scripts/build/build_node/Platform/Windows/install_android.ps1
+++ b/scripts/build/build_node/Platform/Windows/install_android.ps1
@@ -1,5 +1,5 @@
 <#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/build/build_node/Platform/Windows/install_cygwin.ps1 b/scripts/build/build_node/Platform/Windows/install_cygwin.ps1
index ad793c6ec6..972498fab3 100644
--- a/scripts/build/build_node/Platform/Windows/install_cygwin.ps1
+++ b/scripts/build/build_node/Platform/Windows/install_cygwin.ps1
@@ -1,5 +1,5 @@
 <#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/build/build_node/Platform/Windows/install_python.ps1 b/scripts/build/build_node/Platform/Windows/install_python.ps1
index 178d90a426..a75ce2783b 100644
--- a/scripts/build/build_node/Platform/Windows/install_python.ps1
+++ b/scripts/build/build_node/Platform/Windows/install_python.ps1
@@ -1,5 +1,5 @@
 <#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/build/build_node/Platform/Windows/install_utiltools.ps1 b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
index 9b1f9ec0a7..32db09614b 100644
--- a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
+++ b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
@@ -1,5 +1,5 @@
 <#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/build/build_node/Platform/Windows/install_vsbuildtools.ps1 b/scripts/build/build_node/Platform/Windows/install_vsbuildtools.ps1
index 5419653a59..2bb095c1d4 100644
--- a/scripts/build/build_node/Platform/Windows/install_vsbuildtools.ps1
+++ b/scripts/build/build_node/Platform/Windows/install_vsbuildtools.ps1
@@ -1,5 +1,5 @@
 <#
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/build/build_node/Platform/Windows/setup.sh b/scripts/build/build_node/Platform/Windows/setup.sh
index fe3b2109ae..bbcc10c68b 100755
--- a/scripts/build/build_node/Platform/Windows/setup.sh
+++ b/scripts/build/build_node/Platform/Windows/setup.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/ci_build.py b/scripts/build/ci_build.py
index 72558028b4..28318d54e2 100755
--- a/scripts/build/ci_build.py
+++ b/scripts/build/ci_build.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/ci_build_metrics.py b/scripts/build/ci_build_metrics.py
index e72c6554f6..a383fe7eb2 100755
--- a/scripts/build/ci_build_metrics.py
+++ b/scripts/build/ci_build_metrics.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/lambda/delete_branch_ebs.py b/scripts/build/lambda/delete_branch_ebs.py
index 3e3ed00e22..d5186b564e 100644
--- a/scripts/build/lambda/delete_branch_ebs.py
+++ b/scripts/build/lambda/delete_branch_ebs.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/lambda/delete_github_branch_ebs.py b/scripts/build/lambda/delete_github_branch_ebs.py
index 2165b7b57b..59ea525ffd 100644
--- a/scripts/build/lambda/delete_github_branch_ebs.py
+++ b/scripts/build/lambda/delete_github_branch_ebs.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/lambda/trigger_first_build.py b/scripts/build/lambda/trigger_first_build.py
index 44e065b6e3..d019dcc18f 100755
--- a/scripts/build/lambda/trigger_first_build.py
+++ b/scripts/build/lambda/trigger_first_build.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/package/PackageEnv.py b/scripts/build/package/PackageEnv.py
index 0231f13997..7713dfd671 100755
--- a/scripts/build/package/PackageEnv.py
+++ b/scripts/build/package/PackageEnv.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/package/Params.py b/scripts/build/package/Params.py
index d7a35511c4..69e1d84c9e 100755
--- a/scripts/build/package/Params.py
+++ b/scripts/build/package/Params.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/package/Platform/Windows/package_env.json b/scripts/build/package/Platform/Windows/package_env.json
index 371bee18f6..970361bacc 100644
--- a/scripts/build/package/Platform/Windows/package_env.json
+++ b/scripts/build/package/Platform/Windows/package_env.json
@@ -30,29 +30,6 @@
                     "TYPE": "profile_vs2019"
                 }
             ]
-        },
-        "atom":{
-            "PACKAGE_TARGETS":[
-                {
-                    "FILE_LIST": "atom.json",
-                    "FILE_LIST_TYPE": "Windows",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-windows-atom-${BUILD_NUMBER}.zip"
-                },
-                {
-                    "FILE_LIST": "symbols.json",
-                    "FILE_LIST_TYPE": "All",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-windows-atom-symbols-${BUILD_NUMBER}.zip"
-                }
-            ],
-            "BOOTSTRAP_CFG_GAME_FOLDER":"AtomSampleViewer;AtomTest",
-            "SKIP_BUILD": 1,
-            "BUILD_TARGETS":[
-                {
-                    "BUILD_CONFIG_FILENAME": "build_config.json",
-                    "PLATFORM": "Windows",
-                    "TYPE": "profile_vs2019_atom"
-                }
-            ]
         }
     }
 }
diff --git a/scripts/build/package/Platform/Windows/package_filelists/atom.json b/scripts/build/package/Platform/Windows/package_filelists/atom.json
deleted file mode 100644
index e18e191882..0000000000
--- a/scripts/build/package/Platform/Windows/package_filelists/atom.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-    "@lyengine": {
-        "**/*.pyc": "#exclude",
-        "*": "#include",
-        ".gitattributes": "#exclude",
-        ".gitignore": "#exclude",
-        ".gitmodules": "#exclude",
-        ".lfsconfig": "#exclude",
-        ".p4ignore": "#exclude",
-        ".submodules": "#exclude",
-        "AtomTest":
-        {
-            "**":"#include",
-            "**/*.ma":"#exclude",
-            "**/*.max":"#exclude",
-            "**/*.mb":"#exclude",
-            "**/*.psd":"#exclude"
-        },
-        "AtomSampleViewer":
-        {
-            "**":"#include",
-            "**/*.ma":"#exclude",
-            "**/*.max":"#exclude",
-            "**/*.mb":"#exclude",
-            "**/*.psd":"#exclude"
-        },
-        "cmake/**": "#include",
-        "Code": {
-            "CryEngine/**": "#include",
-            "Framework/**": "#include",
-            "LauncherUnified/**": "#include",
-            "Sandbox/**": "#include",
-            "Tools": {
-                "Android/**": "#include",
-                "AWSNativeSDKInit/**": "#include",
-                "AssetProcessor*/**": "#include",
-                "AssetBundler/**": "#include",
-                "AzTestRunner/**": "#include",
-                "CrashHandler/**": "#include",
-                "DeltaCataloger/**": "#include",
-                "GridHub/**": "#include",
-                "News/**": "#include",
-                "PythonBindingsExample/**": "#include",
-                "RemoteConsole/**": "#include",
-                "SceneAPI/**": "#include",
-                "SerializeContextTools/**": "#include",
-                "CMakeLists.txt": "#include"
-            },
-            "CMakeLists.txt": "#include"
-        },
-        "ctest_scripts/**": "#include",
-        "Editor/**": "#include",
-        "Engine/**": "#include",
-        "Gems": {
-            "Achievements": "#include",
-            "AssetMemoryAnalyzer": "#include",
-            "AssetValidation": "#include",
-            "Atom": "#include",
-            "AtomLyIntegration": "#include",
-            "AudioEngineWwise": "#include",
-            "AudioSystem": "#include",
-            "AutomatedLauncherTesting": "#include",
-            "Blast": "#include",
-            "Camera": "#include",
-            "CameraFramework": "#include",
-            "CertificateManager": "#include",
-            "ChatPlay": "#include",
-            "Clouds": "#include",
-            "CrashReporting": "#include",
-            "CustomAssetExample": "#include",
-            "DebugDraw": "#include",
-            "EditorPythonBindings": "#include",
-            "EMotionFX": "#include",
-            "ExpressionEvaluation": "#include",
-            "FastNoise": "#include",
-            "GameEffectSystem": "#include",
-            "GameState": "#include",
-            "GameStateSamples": "#include",
-            "Gestures": "#include",
-            "GradientSignal": "#include",
-            "GraphCanvas": "#include",
-            "GraphModel": "#include",
-            "HttpRequestor": "#include",
-            "ImGui": "#include",
-            "InAppPurchases": "#include",
-            "LandscapeCanvas": "#include",
-            "LegacyTerrain": "#include",
-            "LmbrCentral": "#include",
-            "LocalUser": "#include",
-            "LyShine": "#include",
-            "LyShineExamples": "#include",
-            "Maestro": "#include",
-            "MessagePopup": "#include",
-            "Metastream": "#include",
-            "Microphone": "#include",
-            "Multiplayer": "#include",
-            "MultiplayerImGui": "#include",
-            "NvCloth": "#include",
-            "PhysX": "#include",
-            "PhysXDebug": "#include",
-            "Presence": "#include",
-            "QtForPython": "#include",
-            "RADTelemetry": "#include",
-            "RenderToTexture": "#include",
-            "SaveData": "#include",
-            "SceneLoggingExample": "#include",
-            "SceneProcessing": "#include",
-            "ScriptCanvas": "#include",
-            "ScriptCanvasDeveloper": "#include",
-            "ScriptCanvasDiagnosticLibrary": "#include",
-            "ScriptCanvasPhysics": "#include",
-            "ScriptCanvasTesting": "#include",
-            "ScriptedEntityTweener": "#include",
-            "ScriptEvents": "#include",
-            "SliceFavorites": "#include",
-            "StartingPointCamera": "#include",
-            "StartingPointInput": "#include",
-            "StartingPointMovement": "#include",
-            "Substance": "#include",
-            "SurfaceData": "#include",
-            "SVOGI": "#include",
-            "TestAssetBuilder": "#include",
-            "TextureAtlas": "#include",
-            "TickBusOrderViewer": "#include",
-            "TouchBending": "#include",
-            "Twitch": "#include",
-            "Vegetation": "#include",
-            "VideoPlayback": "#include",
-            "VideoPlaybackBink": "#include",
-            "VideoPlaybackFramework": "#include",
-            "VirtualGamepad": "#include",
-            "Visibility": "#include",
-            "Water": "#include",
-            "WhiteBox": "#include",
-            "CMakeLists.txt": "#include"
-        },
-        "Tools": {
-            "3dsmax/**": "#include",
-            "7za.exe": "#include",
-            "7za_legal_notice.txt": "#include",
-            "PakShaders/**": "#include",
-            "Python/**": "#include",
-            "Redistributables": {
-                "**": "#include",
-                "ANGLE/**": "#exclude",
-                "D3DCompiler/**": "#exclude",
-                "DbgHelp/**": "#exclude",
-                "FFMpeg/**": "#exclude",
-                "LuaCompiler/**": "#exclude",
-                "MSVC90/**": "#exclude",
-                "OpenGL32/**": "#exclude",
-                "SSLEAY/**": "#exclude"
-            },
-            "RemoteConsole/**": "#include",
-            "__init__.py": "#include",
-            "lmbr_aws/**": "#include",
-            "maxscript/**": "#include",
-            "maya/**": "#include",
-            "photoshop/**": "#include"
-        }
-    }
-}
\ No newline at end of file
diff --git a/scripts/build/package/glob3.py b/scripts/build/package/glob3.py
index af3e67fb1c..ab480952c5 100755
--- a/scripts/build/package/glob3.py
+++ b/scripts/build/package/glob3.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/package/glob_to_regex.py b/scripts/build/package/glob_to_regex.py
index e4fa49be4d..9a3a2f2113 100755
--- a/scripts/build/package/glob_to_regex.py
+++ b/scripts/build/package/glob_to_regex.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/package/package.py b/scripts/build/package/package.py
index 031cd5c072..98b94a4b4b 100755
--- a/scripts/build/package/package.py
+++ b/scripts/build/package/package.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/package/util.py b/scripts/build/package/util.py
index 28ca03679e..c596af8a11 100755
--- a/scripts/build/package/util.py
+++ b/scripts/build/package/util.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/submit_metrics.py b/scripts/build/submit_metrics.py
index 3a54cc2c8f..85a1819c83 100755
--- a/scripts/build/submit_metrics.py
+++ b/scripts/build/submit_metrics.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/tools/delete_inactive_ebs.py b/scripts/build/tools/delete_inactive_ebs.py
index aadf4f6111..5bdc1c1200 100644
--- a/scripts/build/tools/delete_inactive_ebs.py
+++ b/scripts/build/tools/delete_inactive_ebs.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/tools/delete_stale_ebs.py b/scripts/build/tools/delete_stale_ebs.py
index 58e4ab0b26..a46e5f96eb 100644
--- a/scripts/build/tools/delete_stale_ebs.py
+++ b/scripts/build/tools/delete_stale_ebs.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/tools/download_from_s3.py b/scripts/build/tools/download_from_s3.py
index b76cad1bd5..f4a7b5836c 100755
--- a/scripts/build/tools/download_from_s3.py
+++ b/scripts/build/tools/download_from_s3.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/tools/generate_build_tag.py b/scripts/build/tools/generate_build_tag.py
index 1a0e21d363..e64c898ded 100644
--- a/scripts/build/tools/generate_build_tag.py
+++ b/scripts/build/tools/generate_build_tag.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/tools/sync_repo.py b/scripts/build/tools/sync_repo.py
index 9b0b1a4144..c50011ebaf 100644
--- a/scripts/build/tools/sync_repo.py
+++ b/scripts/build/tools/sync_repo.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/build/tools/upload_to_s3.py b/scripts/build/tools/upload_to_s3.py
index dfc19d5779..6dc235d3d2 100755
--- a/scripts/build/tools/upload_to_s3.py
+++ b/scripts/build/tools/upload_to_s3.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/bundler/BuildReleaseAuxiliaryContent.py b/scripts/bundler/BuildReleaseAuxiliaryContent.py
index 76c5a40276..99da2d564a 100644
--- a/scripts/bundler/BuildReleaseAuxiliaryContent.py
+++ b/scripts/bundler/BuildReleaseAuxiliaryContent.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/bundler/gen_shaders.py b/scripts/bundler/gen_shaders.py
index 70f293edd9..2bd129b1ff 100644
--- a/scripts/bundler/gen_shaders.py
+++ b/scripts/bundler/gen_shaders.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/bundler/get_shader_list.py b/scripts/bundler/get_shader_list.py
index 266af5ab7b..b5bb81731f 100644
--- a/scripts/bundler/get_shader_list.py
+++ b/scripts/bundler/get_shader_list.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/bundler/pak_shaders.py b/scripts/bundler/pak_shaders.py
index 5fdd764633..c90be5ab3c 100644
--- a/scripts/bundler/pak_shaders.py
+++ b/scripts/bundler/pak_shaders.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/CMakeLists.txt b/scripts/commit_validation/CMakeLists.txt
index 19584036a7..a8d623bdc6 100644
--- a/scripts/commit_validation/CMakeLists.txt
+++ b/scripts/commit_validation/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/__init__.py b/scripts/commit_validation/commit_validation/__init__.py
index 30503258bc..1fe051b062 100755
--- a/scripts/commit_validation/commit_validation/__init__.py
+++ b/scripts/commit_validation/commit_validation/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/commit_validation.py b/scripts/commit_validation/commit_validation/commit_validation.py
index 0fe99e834b..ba69bbcb73 100755
--- a/scripts/commit_validation/commit_validation/commit_validation.py
+++ b/scripts/commit_validation/commit_validation/commit_validation.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/pal_allowedlist.py b/scripts/commit_validation/commit_validation/pal_allowedlist.py
index 9ee4fae63f..c29fea1cae 100755
--- a/scripts/commit_validation/commit_validation/pal_allowedlist.py
+++ b/scripts/commit_validation/commit_validation/pal_allowedlist.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/pal_allowedlist.txt b/scripts/commit_validation/commit_validation/pal_allowedlist.txt
index e3bf4be52e..5ea71e0363 100644
--- a/scripts/commit_validation/commit_validation/pal_allowedlist.txt
+++ b/scripts/commit_validation/commit_validation/pal_allowedlist.txt
@@ -1,5 +1,4 @@
-*/Code/CryEngine/*
-*/Code/Deprecated/Sandbox/*
+*/Code/Legacy/*
 */Code/Framework/AzCore/AzCore/Math/Aabb.h
 */Code/Framework/AzCore/AzCore/Math/Color.h
 */Code/Framework/AzCore/AzCore/Math/Crc.h
@@ -47,7 +46,7 @@
 */Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h
 */Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp
 */Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
-*/Code/Sandbox/*
+*/Code/Editor/*
 */Code/Tools/*
 */Gems/*/3rdParty/*
 */Gems/*/External/*
diff --git a/scripts/commit_validation/commit_validation/tests/__init__.py b/scripts/commit_validation/commit_validation/tests/__init__.py
index 30503258bc..1fe051b062 100755
--- a/scripts/commit_validation/commit_validation/tests/__init__.py
+++ b/scripts/commit_validation/commit_validation/tests/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/mocks/__init__.py b/scripts/commit_validation/commit_validation/tests/mocks/__init__.py
index 30503258bc..1fe051b062 100755
--- a/scripts/commit_validation/commit_validation/tests/mocks/__init__.py
+++ b/scripts/commit_validation/commit_validation/tests/mocks/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/mocks/mock_commit.py b/scripts/commit_validation/commit_validation/tests/mocks/mock_commit.py
index 185757e206..6a229f9c9f 100755
--- a/scripts/commit_validation/commit_validation/tests/mocks/mock_commit.py
+++ b/scripts/commit_validation/commit_validation/tests/mocks/mock_commit.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/test_pal_allowedlist.py b/scripts/commit_validation/commit_validation/tests/test_pal_allowedlist.py
index 68f3e7d255..ac5bdb9143 100755
--- a/scripts/commit_validation/commit_validation/tests/test_pal_allowedlist.py
+++ b/scripts/commit_validation/commit_validation/tests/test_pal_allowedlist.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/__init__.py b/scripts/commit_validation/commit_validation/tests/validators/__init__.py
index 3a3549d485..5482b53e84 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/__init__.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/commit_validation/commit_validation/tests/validators/test_az_platform_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_az_platform_validator.py
index 920bc2c1f1..3b06923780 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_az_platform_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_az_platform_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_az_trait_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_az_trait_validator.py
index 52067f2aae..4d0d5adafa 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_az_trait_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_az_trait_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_copyright_header_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_copyright_header_validator.py
index 88a30b09f8..ed61af285c 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_copyright_header_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_copyright_header_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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,19 +13,19 @@ from commit_validation.validators.copyright_header_validator import CopyrightHea
 
 class CopyrightHeaderValidatorTests(unittest.TestCase):
     @patch('builtins.open', mock_open(read_data='This file does contain\n'
-                                                'Copyright (c) Contributors to the Open 3D Engine Project, so it should pass\n'))
+                                                '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., so it should pass\n'))
     def test_fileWithCopyrightHeader_passes(self):
         commit = MockCommit(files=['/someCppFile.cpp'])
         files = [
             'This file does contain\n'
-            'Copyright (c) Contributors to the Open 3D Engine Project, so it should pass\n',
+            '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., so it should pass\n',
 
             'This file does contain\n'
-            'Copyright(c) Contributors to the Open 3D Engine Project, so it should pass\n'
+            '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., so it should pass\n'
             'and there\'s no space between "Copyright" and "(c)"',
 
             'This file has a upper-case C between the parenthesis\n'
-            '// Copyright (C) Contributors to the Open 3D Engine Project.',
+            '// 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.',
         ]
         for file in files:
             with patch('builtins.open', mock_open(read_data=file)):
@@ -63,6 +63,14 @@ class CopyrightHeaderValidatorTests(unittest.TestCase):
         self.assertFalse(CopyrightHeaderValidator().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='Copyright (c) Contributors to the Open 3D Engine Project.\n'
+                                                '******************\n'.format(' ')))
+    def test_fileWithStaleO3DECopyrightHeader_fails(self):
+        commit = MockCommit(files=['/someCppFile.cpp'])
+        error_list = []
+        self.assertFalse(CopyrightHeaderValidator().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 does contains legacy header\n'
                                                 'Copyright{0}Crytek\n'.format(' ')))
     def test_fileWithCrytekCopyrightHeader_fails(self):
diff --git a/scripts/commit_validation/commit_validation/tests/validators/test_diff_whitespace_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_diff_whitespace_validator.py
index ced3cc5c78..7fd8236eda 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_diff_whitespace_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_diff_whitespace_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_generated_files_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_generated_files_validator.py
index 8a08e11e22..856d97806a 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_generated_files_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_generated_files_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_git_conflict_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_git_conflict_validator.py
index 90b4d6209a..05c9d463ec 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_git_conflict_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_git_conflict_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_newline_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_newline_validator.py
index cd970d5b96..a8a124ec20 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_newline_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_newline_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_platform_macro_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_platform_macro_validator.py
index 1760233e27..1df2e0ac69 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_platform_macro_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_platform_macro_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_pragma_optimize_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_pragma_optimize_validator.py
index c9d478d4e4..f6f05f27c2 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_pragma_optimize_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_pragma_optimize_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_tabs_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_tabs_validator.py
index 68932e633d..c1c618a9c2 100755
--- a/scripts/commit_validation/commit_validation/tests/validators/test_tabs_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_tabs_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/tests/validators/test_unicode_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_unicode_validator.py
index 448518a2b3..24a031b3ab 100644
--- a/scripts/commit_validation/commit_validation/tests/validators/test_unicode_validator.py
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_unicode_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/__init__.py b/scripts/commit_validation/commit_validation/validators/__init__.py
index 30503258bc..1fe051b062 100755
--- a/scripts/commit_validation/commit_validation/validators/__init__.py
+++ b/scripts/commit_validation/commit_validation/validators/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/az_platform_validator.py b/scripts/commit_validation/commit_validation/validators/az_platform_validator.py
index dd3562863b..340cacb712 100755
--- a/scripts/commit_validation/commit_validation/validators/az_platform_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/az_platform_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/az_trait_validator.py b/scripts/commit_validation/commit_validation/validators/az_trait_validator.py
index 94ccca5624..14d1f00ff2 100755
--- a/scripts/commit_validation/commit_validation/validators/az_trait_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/az_trait_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/copyright_header_validator.py b/scripts/commit_validation/commit_validation/validators/copyright_header_validator.py
index fc700fa9b9..d7206f909b 100755
--- a/scripts/commit_validation/commit_validation/validators/copyright_header_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/copyright_header_validator.py
@@ -11,7 +11,8 @@ from typing import Type, List
 
 from commit_validation.commit_validation import Commit, CommitValidator, IsFileSkipped, SOURCE_AND_SCRIPT_FILE_EXTENSIONS, EXCLUDED_VALIDATION_PATTERNS, VERBOSE
 
-OPEN_3D_ENGINE_PATTERN = re.compile(r'copyright[\s]*(?:\(c\))?[\s]*.*?Contributors\sto\sthe\sOpen\s3D\sEngine\sProject', re.IGNORECASE | re.DOTALL)
+OPEN_3D_ENGINE_PATTERN_STALE = re.compile(r'copyright[\s]*(?:\(c\))?[\s]*.*?Contributors\sto\sthe\sOpen\s3D\sEngine\sProject\s*$', re.IGNORECASE | re.DOTALL)
+OPEN_3D_ENGINE_PATTERN = re.compile(r'copyright[\s]*(?:\(c\))?[\s]*.*?Contributors\sto\sthe\sOpen\s3D\sEngine\sProject\.\sFor\scomplete\scopyright\sand\slicense\sterms\splease\ssee\sthe\sLICENSE\sat\sthe\sroot\sof\sthis\sdistribution\.', re.IGNORECASE | re.DOTALL)
 AMAZON_ORIGINAL_COPYRIGHT_PATTERN = re.compile(r'.*?this\sfile\sCopyright\s*\(c\)\s*Amazon\.com.*?', re.IGNORECASE | re.DOTALL)
 AMAZON_MODIFICATION_COPYRIGHT_PATTERN = re.compile(r'.*?Modifications\scopyright\sAmazon\.com', re.IGNORECASE | re.DOTALL)
 CRYTEK_COPYRIGHT_PATTERN = re.compile(r'Copyright Crytek', re.MULTILINE)
@@ -21,8 +22,8 @@ EXCLUDED_COPYRIGHT_VALIDATION_PATTERNS = [
     '*/Code/Framework/AzCore/AzCore/std/string/utf8/core.h',                            # Copyright 2006 Nemanja Trifunovic
     '*/Code/Framework/AzCore/AzCore/std/string/utf8/unchecked.h',                       # Copyright 2006 Nemanja Trifunovic
     '*/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ltc.azsli',   # Copyright (c) 2017, Eric Heitz, Jonathan Dupuy, Stephen Hill and David Neubelt.
-    '*/Code/CryEngine/CryCommon/MTPseudoRandom.h',                                      # Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
-    '*/Code/CryEngine/CryCommon/PNoise3.h',                                             # Copyright(c) Ken Perlin
+    '*/Code/Legacy/CryCommon/MTPseudoRandom.h',                                         # Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
+    '*/Code/Legacy/CryCommon/PNoise3.h',                                                # Copyright(c) Ken Perlin
     '*/Code/Framework/AzQtComponents/AzQtComponents/Components/FlowLayout.*'            # Copyright (C) 2015 The Qt Company Ltd.
 ] + EXCLUDED_VALIDATION_PATTERNS
 
@@ -49,10 +50,12 @@ class CopyrightHeaderValidator(CommitValidator):
                 has_amazon_mod_pattern = False
                 has_crytek_pattern = False
                 has_original_amazon_copyright_pattern = False
+                has_stale_o3de_pattern = False
 
                 with open(file_name, 'rt', encoding='utf8', errors='replace') as fh:
                     for line in fh:
-
+                        if OPEN_3D_ENGINE_PATTERN_STALE.search(line):
+                            has_stale_o3de_pattern = True
                         if OPEN_3D_ENGINE_PATTERN.search(line):
                             has_o3de_pattern = True
                         elif AMAZON_ORIGINAL_COPYRIGHT_PATTERN.search(line):
@@ -74,6 +77,12 @@ class CopyrightHeaderValidator(CommitValidator):
                     if VERBOSE: print(error_message)
                     errors.append(error_message)
 
+                if has_stale_o3de_pattern:
+                    # Has the stale the O3DE copyright (without the 'For complete copyright...')
+                    error_message = str(f"{file_name}::{self.__class__.__name__} FAILED - Source file O3DE copyright header missing 'For complete copyright...'")
+                    if VERBOSE: print(error_message)
+                    errors.append(error_message)
+
                 if not has_o3de_pattern:
                     # Missing the O3DE copyright AND does not have the Amazon Modifications copyright, assuming that this file is missing valid copyrights in general
                     error_message = str(f'{file_name}::{self.__class__.__name__} FAILED - Source file missing O3DE copyright header.')
diff --git a/scripts/commit_validation/commit_validation/validators/diff_whitespace_validator.py b/scripts/commit_validation/commit_validation/validators/diff_whitespace_validator.py
index f91103cce3..4ffd9ed823 100755
--- a/scripts/commit_validation/commit_validation/validators/diff_whitespace_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/diff_whitespace_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/generated_files_validator.py b/scripts/commit_validation/commit_validation/validators/generated_files_validator.py
index 00339945f2..3d27003628 100755
--- a/scripts/commit_validation/commit_validation/validators/generated_files_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/generated_files_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/git_conflict_validator.py b/scripts/commit_validation/commit_validation/validators/git_conflict_validator.py
index e3c9999df7..bbfe90a03d 100755
--- a/scripts/commit_validation/commit_validation/validators/git_conflict_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/git_conflict_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/newline_validator.py b/scripts/commit_validation/commit_validation/validators/newline_validator.py
index 7a4083d44e..88f641b3b8 100755
--- a/scripts/commit_validation/commit_validation/validators/newline_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/newline_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/platform_macro_validator.py b/scripts/commit_validation/commit_validation/validators/platform_macro_validator.py
index f1a862d61a..143d1dd1b2 100755
--- a/scripts/commit_validation/commit_validation/validators/platform_macro_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/platform_macro_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/pragma_optimize_validator.py b/scripts/commit_validation/commit_validation/validators/pragma_optimize_validator.py
index 79414a524f..601dce8e0d 100755
--- a/scripts/commit_validation/commit_validation/validators/pragma_optimize_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/pragma_optimize_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/tabs_validator.py b/scripts/commit_validation/commit_validation/validators/tabs_validator.py
index bf43f91d32..049090c0ad 100755
--- a/scripts/commit_validation/commit_validation/validators/tabs_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/tabs_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/commit_validation/validators/unicode_validator.py b/scripts/commit_validation/commit_validation/validators/unicode_validator.py
index ebd8282dcc..4c40b3a73f 100644
--- a/scripts/commit_validation/commit_validation/validators/unicode_validator.py
+++ b/scripts/commit_validation/commit_validation/validators/unicode_validator.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/fix_copyright_headers.py b/scripts/commit_validation/fix_copyright_headers.py
index 6239ae8d27..fc8fae6bed 100755
--- a/scripts/commit_validation/fix_copyright_headers.py
+++ b/scripts/commit_validation/fix_copyright_headers.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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,7 +11,7 @@ import re
 
 copyrightre = re.compile(r'All or portions of this file Copyright \(c\) Amazon\.com')
 copyright_text = """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/commit_validation/fix_tabs.py b/scripts/commit_validation/fix_tabs.py
index 56de5837e2..b2a9e5145f 100755
--- a/scripts/commit_validation/fix_tabs.py
+++ b/scripts/commit_validation/fix_tabs.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/fix_unicode.py b/scripts/commit_validation/fix_unicode.py
index 39abbe055a..8c06fcd58f 100644
--- a/scripts/commit_validation/fix_unicode.py
+++ b/scripts/commit_validation/fix_unicode.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/git_validate_branch.py b/scripts/commit_validation/git_validate_branch.py
index 9ce52abaa2..1678cc22e2 100755
--- a/scripts/commit_validation/git_validate_branch.py
+++ b/scripts/commit_validation/git_validate_branch.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/p4.py b/scripts/commit_validation/p4.py
index a1ab547880..b3ecfdc6d6 100755
--- a/scripts/commit_validation/p4.py
+++ b/scripts/commit_validation/p4.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/p4_validate_changelist.py b/scripts/commit_validation/p4_validate_changelist.py
index 887df87fd5..f349168dbe 100755
--- a/scripts/commit_validation/p4_validate_changelist.py
+++ b/scripts/commit_validation/p4_validate_changelist.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/p4_validate_submitted_changelists.py b/scripts/commit_validation/p4_validate_submitted_changelists.py
index dc47d02cab..5c5a574f29 100755
--- a/scripts/commit_validation/p4_validate_submitted_changelists.py
+++ b/scripts/commit_validation/p4_validate_submitted_changelists.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/commit_validation/validate_file_or_folder.py b/scripts/commit_validation/validate_file_or_folder.py
index 670e420221..16c8e2c6c9 100755
--- a/scripts/commit_validation/validate_file_or_folder.py
+++ b/scripts/commit_validation/validate_file_or_folder.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/ctest/CMakeLists.txt b/scripts/ctest/CMakeLists.txt
index 83c34632c6..8c38cf1310 100644
--- a/scripts/ctest/CMakeLists.txt
+++ b/scripts/ctest/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/ctest/ctest_driver.py b/scripts/ctest/ctest_driver.py
index 01ad045cb3..4dcbfe06d4 100755
--- a/scripts/ctest/ctest_driver.py
+++ b/scripts/ctest/ctest_driver.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/ctest/ctest_driver_test.py b/scripts/ctest/ctest_driver_test.py
index 1a095c50ac..9dd94cfc6a 100755
--- a/scripts/ctest/ctest_driver_test.py
+++ b/scripts/ctest/ctest_driver_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/ctest/ctest_entrypoint.cmd b/scripts/ctest/ctest_entrypoint.cmd
index fe531369b4..3f931ab808 100644
--- a/scripts/ctest/ctest_entrypoint.cmd
+++ b/scripts/ctest/ctest_entrypoint.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
diff --git a/scripts/ctest/ctest_entrypoint.sh b/scripts/ctest/ctest_entrypoint.sh
index d7d3f89b7a..993c464bde 100755
--- a/scripts/ctest/ctest_entrypoint.sh
+++ b/scripts/ctest/ctest_entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/ctest/result_processing/__init__.py b/scripts/ctest/result_processing/__init__.py
index a3a4055d50..e200fa77d0 100755
--- a/scripts/ctest/result_processing/__init__.py
+++ b/scripts/ctest/result_processing/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/ctest/result_processing/result_processing.py b/scripts/ctest/result_processing/result_processing.py
index e47786baa1..f4ebc485cc 100755
--- a/scripts/ctest/result_processing/result_processing.py
+++ b/scripts/ctest/result_processing/result_processing.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/ctest/sanity_test.py b/scripts/ctest/sanity_test.py
index aae449fd04..303fe1e559 100755
--- a/scripts/ctest/sanity_test.py
+++ b/scripts/ctest/sanity_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/detect_file_changes/CMakeLists.txt b/scripts/detect_file_changes/CMakeLists.txt
index 6131fdd50d..d4e2eae3ec 100644
--- a/scripts/detect_file_changes/CMakeLists.txt
+++ b/scripts/detect_file_changes/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/detect_file_changes/compare_snapshots.py b/scripts/detect_file_changes/compare_snapshots.py
index 0164da6806..cba6eb49c6 100755
--- a/scripts/detect_file_changes/compare_snapshots.py
+++ b/scripts/detect_file_changes/compare_snapshots.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/detect_file_changes/make_snapshot.py b/scripts/detect_file_changes/make_snapshot.py
index 165ec4df61..6b9051edb0 100755
--- a/scripts/detect_file_changes/make_snapshot.py
+++ b/scripts/detect_file_changes/make_snapshot.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/detect_file_changes/snapshot_folder/__init__.py b/scripts/detect_file_changes/snapshot_folder/__init__.py
index 30503258bc..1fe051b062 100755
--- a/scripts/detect_file_changes/snapshot_folder/__init__.py
+++ b/scripts/detect_file_changes/snapshot_folder/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/detect_file_changes/snapshot_folder/snapshot_folder.py b/scripts/detect_file_changes/snapshot_folder/snapshot_folder.py
index ca269e203f..442d1f8844 100755
--- a/scripts/detect_file_changes/snapshot_folder/snapshot_folder.py
+++ b/scripts/detect_file_changes/snapshot_folder/snapshot_folder.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/detect_file_changes/snapshot_folder/tests/__init__.py b/scripts/detect_file_changes/snapshot_folder/tests/__init__.py
index 30503258bc..1fe051b062 100755
--- a/scripts/detect_file_changes/snapshot_folder/tests/__init__.py
+++ b/scripts/detect_file_changes/snapshot_folder/tests/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/detect_file_changes/snapshot_folder/tests/test_snapshots.py b/scripts/detect_file_changes/snapshot_folder/tests/test_snapshots.py
index 7b38545ded..e94da1986e 100755
--- a/scripts/detect_file_changes/snapshot_folder/tests/test_snapshots.py
+++ b/scripts/detect_file_changes/snapshot_folder/tests/test_snapshots.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/migration/non_uniform_scale.py b/scripts/migration/non_uniform_scale.py
index dddfe65d01..4f7f205aa0 100644
--- a/scripts/migration/non_uniform_scale.py
+++ b/scripts/migration/non_uniform_scale.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de.bat b/scripts/o3de.bat
index cddca71120..b7e3a67261 100644
--- a/scripts/o3de.bat
+++ b/scripts/o3de.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 REM
-REM Copyright (c) Contributors to the Open 3D Engine Project
+REM 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.
 REM 
 REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
@@ -9,7 +9,7 @@ REM
 pushd %~dp0%
 CD %~dp0..
 SET "BASE_PATH=%CD%"
-CD %~dp0
+popd
 SET "PYTHON_DIRECTORY=%BASE_PATH%\python"
 IF EXIST "%PYTHON_DIRECTORY%" GOTO pythonPathAvailable
 GOTO pythonDirNotFound
@@ -25,10 +25,8 @@ GOTO fail
 ECHO Python executable not found: %PYTHON_EXECUTABLE%
 GOTO fail
 :fail
-popd
 EXIT /b 1
 :end
-popd
 EXIT /b %ERRORLEVEL%
 
 
diff --git a/scripts/o3de.py b/scripts/o3de.py
index 0405288c5f..72a241b387 100755
--- a/scripts/o3de.py
+++ b/scripts/o3de.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de.sh b/scripts/o3de.sh
index f8b18446de..63469823e4 100755
--- a/scripts/o3de.sh
+++ b/scripts/o3de.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/CMakeLists.txt b/scripts/o3de/CMakeLists.txt
index e8c8de36c3..3cce6b1b93 100644
--- a/scripts/o3de/CMakeLists.txt
+++ b/scripts/o3de/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/README.txt b/scripts/o3de/README.txt
index 37778f01db..84e7bbaaa1 100644
--- a/scripts/o3de/README.txt
+++ b/scripts/o3de/README.txt
@@ -1,4 +1,4 @@
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/o3de/o3de/__init__.py b/scripts/o3de/o3de/__init__.py
index 30503258bc..1fe051b062 100644
--- a/scripts/o3de/o3de/__init__.py
+++ b/scripts/o3de/o3de/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/cmake.py b/scripts/o3de/o3de/cmake.py
index 8ba2d3fad7..99d2f67b98 100644
--- a/scripts/o3de/o3de/cmake.py
+++ b/scripts/o3de/o3de/cmake.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/disable_gem.py b/scripts/o3de/o3de/disable_gem.py
index ff4edc19dd..1d3d16d3aa 100644
--- a/scripts/o3de/o3de/disable_gem.py
+++ b/scripts/o3de/o3de/disable_gem.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/download.py b/scripts/o3de/o3de/download.py
index 14fa4dd2a4..db453ae23c 100644
--- a/scripts/o3de/o3de/download.py
+++ b/scripts/o3de/o3de/download.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/enable_gem.py b/scripts/o3de/o3de/enable_gem.py
index 9f5cc282bf..0bafcda480 100644
--- a/scripts/o3de/o3de/enable_gem.py
+++ b/scripts/o3de/o3de/enable_gem.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/engine_template.py b/scripts/o3de/o3de/engine_template.py
index 54ec8aced4..1bc2cfc9fc 100755
--- a/scripts/o3de/o3de/engine_template.py
+++ b/scripts/o3de/o3de/engine_template.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -17,7 +17,7 @@ import uuid
 import re
 
 
-from o3de import manifest, validation, utils
+from o3de import manifest, register, validation, utils
 
 logger = logging.getLogger()
 logging.basicConfig()
@@ -388,10 +388,11 @@ def create_template(source_path: pathlib.Path,
     if not source_path:
         logger.error('Src path cannot be empty.')
         return 1
-    if not os.path.isdir(source_path):
+    if not source_path.is_dir():
         logger.error(f'Src path {source_path} is not a folder.')
         return 1
 
+    source_path = source_path.resolve()
     # source_name is now the last component of the source_path
     if not source_name:
         source_name = os.path.basename(source_path)
@@ -401,11 +402,11 @@ def create_template(source_path: pathlib.Path,
     if not template_path:
         logger.info(f'Template path empty. Using source name {source_name}')
         template_path = source_name
-    if not os.path.isabs(template_path):
+    if not template_path.is_absolute():
         default_templates_folder = manifest.get_registered(default_folder='templates')
-        template_path = default_templates_folder/ template_path
+        template_path = default_templates_folder / template_path
         logger.info(f'Template path not a full path. Using default templates folder {template_path}')
-    if not force and os.path.isdir(template_path):
+    if not force and template_path.is_dir():
         logger.error(f'Template path {template_path} already exists.')
         return 1
 
@@ -415,8 +416,7 @@ def create_template(source_path: pathlib.Path,
     except ValueError:
         pass
     else:
-        logger.error(f'Template output path {template_path} cannot be a subdirectory of the source_path {source_path}:\n'
-                     f'{err}')
+        logger.error(f'Template output path {template_path} cannot be a subdirectory of the source_path {source_path}\n')
         return 1
 
     # template name is now the last component of the template_path
@@ -1200,7 +1200,7 @@ def create_from_template(destination_path: pathlib.Path,
 
     if not destination_name:
         # destination name is now the last component of the destination_path
-        destination_name = os.path.basename(destination_path)
+        destination_name = destination_path.name
 
     # destination name cannot be the same as a restricted platform name
     if destination_name in restricted_platforms:
@@ -1649,33 +1649,15 @@ def create_project(project_path: pathlib.Path,
                     with open(cmakelists_file_name, 'w') as d:
                         if keep_license_text:
                             d.write('# {BEGIN_LICENSE}\n')
-                            d.write('# Copyright (c) Contributors to the Open 3D Engine Project\n')
+                            d.write('# 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.\n')
                             d.write('#\n')
                             d.write('# SPDX-License-Identifier: Apache-2.0 OR MIT\n')
                             d.write('# {END_LICENSE}\n')
 
-    # set the "engine" element of the project.json
-    engine_json_data = manifest.get_engine_json_data(engine_path=manifest.get_this_engine_path())
-    try:
-        engine_name = engine_json_data['engine_name']
-    except KeyError as e:
-        logger.error(f"engine_name for this engine not found in engine.json.")
-        return 1
-
-    project_json_data = manifest.get_project_json_data(project_path=project_path)
-    if not project_json_data:
-        # get_project_json_data already logs an error if the project.json is mising
-        return 1
-
-    project_json_data.update({"engine": engine_name})
-    with open(project_json, 'w') as s:
-        try:
-            s.write(json.dumps(project_json_data, indent=4) + '\n')
-        except OSError as e:
-            logger.error(f'Failed to write project json at {project_path}.')
-            return 1
 
-    return 0
+    # Register the project with the global o3de_manifest.json and set the project.json "engine" field to match the
+    # engine.json "engine_name" field
+    return register.register(project_path=project_path)
 
 
 def create_gem(gem_path: pathlib.Path,
@@ -1745,6 +1727,11 @@ def create_gem(gem_path: pathlib.Path,
     if template_name and not template_path:
         template_path = manifest.get_registered(template_name=template_name)
 
+    if not template_path:
+        logger.error(f'Could not find the template path using name {template_name}.\n'
+                     'Has the template been registered yet? It can be registered via the '
+                     '"o3de.py register --tp <template-path>" command')
+        return 1
     if not os.path.isdir(template_path):
         logger.error(f'Could not find the template {template_name}=>{template_path}')
         return 1
@@ -2041,7 +2028,7 @@ def create_gem(gem_path: pathlib.Path,
                         with open(cmakelists_file_name, 'w') as d:
                             if keep_license_text:
                                 d.write('# {BEGIN_LICENSE}\n')
-                                d.write('# Copyright (c) Contributors to the Open 3D Engine Project\n')
+                                d.write('# 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.\n')
                                 d.write('#\n')
                                 d.write('# SPDX-License-Identifier: Apache-2.0 OR MIT\n')
                                 d.write('# {END_LICENSE}\n')
@@ -2068,7 +2055,7 @@ def _run_create_from_template(args: argparse) -> int:
     return create_from_template(args.destination_path,
                                 args.template_path,
                                 args.template_name,
-                                args.destination_path,
+                                args.destination_name,
                                 args.destination_restricted_path,
                                 args.destination_restricted_name,
                                 args.template_restricted_path,
diff --git a/scripts/o3de/o3de/get_registration.py b/scripts/o3de/o3de/get_registration.py
index 584aaa93f6..145f3da044 100644
--- a/scripts/o3de/o3de/get_registration.py
+++ b/scripts/o3de/o3de/get_registration.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/global_project.py b/scripts/o3de/o3de/global_project.py
index fde76b8230..2c56e991a7 100644
--- a/scripts/o3de/o3de/global_project.py
+++ b/scripts/o3de/o3de/global_project.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/manifest.py b/scripts/o3de/o3de/manifest.py
index c93536c484..c4a7cf8f36 100644
--- a/scripts/o3de/o3de/manifest.py
+++ b/scripts/o3de/o3de/manifest.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -194,9 +194,9 @@ def load_o3de_manifest(manifest_path: pathlib.Path = None) -> dict:
             return json_data
 
 
-def save_o3de_manifest(json_data: dict, manifest_path: pathlib.Path = None) -> None:
+def save_o3de_manifest(json_data: dict, manifest_path: pathlib.Path = None) -> bool:
     """
-        Save the json dictionary to the supplied manifest file or ~/.o3de/o3de_manifest.json if None
+        Save the json dictionary to the supplied manifest file or ~/.o3de/o3de_manifest.json if manifest_path is None
 
         :param json_data: dictionary to save in json format at the file path
         :param manifest_path: optional path to manifest file to save
@@ -206,8 +206,10 @@ def save_o3de_manifest(json_data: dict, manifest_path: pathlib.Path = None) -> N
     with manifest_path.open('w') as s:
         try:
             s.write(json.dumps(json_data, indent=4) + '\n')
+            return True
         except OSError as e:
             logger.error(f'Manifest json failed to save: {str(e)}')
+            return False
 
 
 # Data query methods
diff --git a/scripts/o3de/o3de/print_registration.py b/scripts/o3de/o3de/print_registration.py
index 52cb2379c7..cd0d65fd56 100644
--- a/scripts/o3de/o3de/print_registration.py
+++ b/scripts/o3de/o3de/print_registration.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/project_properties.py b/scripts/o3de/o3de/project_properties.py
index 2e67693bbd..36e2c9166c 100644
--- a/scripts/o3de/o3de/project_properties.py
+++ b/scripts/o3de/o3de/project_properties.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/register.py b/scripts/o3de/o3de/register.py
index 16c539c358..40556205de 100644
--- a/scripts/o3de/o3de/register.py
+++ b/scripts/o3de/o3de/register.py
@@ -1,6 +1,6 @@
 
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -341,7 +341,7 @@ def register_o3de_object_path(json_data: dict,
         try:
             paths_to_remove.append(o3de_object_path.relative_to(save_path.parent))
         except ValueError:
-            pass # It is OK  relative path cannot be formed
+            pass # It is OK relative path cannot be formed
     manifest_data[o3de_object_key] = list(filter(lambda p: pathlib.Path(p) not in paths_to_remove,
                                                            manifest_data.setdefault(o3de_object_key, [])))
 
@@ -425,7 +425,6 @@ def register_project_path(json_data: dict,
         if not manifest.save_o3de_manifest(project_json_data, project_json_path):
             return 1
 
-
     return 0
 
 
@@ -754,9 +753,6 @@ def _run_register(args: argparse) -> int:
         return repo.refresh_repos()
     elif args.this_engine:
         ret_val = register(engine_path=manifest.get_this_engine_path(), force=args.force)
-        error_code = register_shipped_engine_o3de_objects(force=args.force)
-        if error_code:
-            ret_val = error_code
         return ret_val
     elif args.all_engines_path:
         return register_all_engines_in_folder(args.all_engines_path, args.remove, args.force)
diff --git a/scripts/o3de/o3de/repo.py b/scripts/o3de/o3de/repo.py
index 3851987449..fc124a85f6 100644
--- a/scripts/o3de/o3de/repo.py
+++ b/scripts/o3de/o3de/repo.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/sha256.py b/scripts/o3de/o3de/sha256.py
index cf61478b72..2f8fef29af 100644
--- a/scripts/o3de/o3de/sha256.py
+++ b/scripts/o3de/o3de/sha256.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/utils.py b/scripts/o3de/o3de/utils.py
index 29035ee43f..5702ed7d00 100755
--- a/scripts/o3de/o3de/utils.py
+++ b/scripts/o3de/o3de/utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/o3de/validation.py b/scripts/o3de/o3de/validation.py
index 50c8000c9c..7b7e202055 100644
--- a/scripts/o3de/o3de/validation.py
+++ b/scripts/o3de/o3de/validation.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/setup.py b/scripts/o3de/setup.py
index 5d0a56fb1f..afcc8306e7 100644
--- a/scripts/o3de/setup.py
+++ b/scripts/o3de/setup.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) Contributors to the Open 3D Engine Project
+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/scripts/o3de/tests/CMakeLists.txt b/scripts/o3de/tests/CMakeLists.txt
index 378412dba2..9f55400df6 100644
--- a/scripts/o3de/tests/CMakeLists.txt
+++ b/scripts/o3de/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/tests/__init__.py b/scripts/o3de/tests/__init__.py
index 30503258bc..1fe051b062 100644
--- a/scripts/o3de/tests/__init__.py
+++ b/scripts/o3de/tests/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/tests/unit_test_cmake.py b/scripts/o3de/tests/unit_test_cmake.py
index ea68a0923a..4aecd16f21 100644
--- a/scripts/o3de/tests/unit_test_cmake.py
+++ b/scripts/o3de/tests/unit_test_cmake.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/tests/unit_test_engine_template.py b/scripts/o3de/tests/unit_test_engine_template.py
index d8b1a73267..27311dba64 100755
--- a/scripts/o3de/tests/unit_test_engine_template.py
+++ b/scripts/o3de/tests/unit_test_engine_template.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #
@@ -15,7 +15,7 @@ from unittest.mock import patch
 
 CPP_LICENSE_TEXT = """// {BEGIN_LICENSE}
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * 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/scripts/o3de/tests/unit_test_global_project.py b/scripts/o3de/tests/unit_test_global_project.py
index ec8ad3f1f1..1d1a89a600 100644
--- a/scripts/o3de/tests/unit_test_global_project.py
+++ b/scripts/o3de/tests/unit_test_global_project.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/tests/unit_test_manifest.py b/scripts/o3de/tests/unit_test_manifest.py
index f851fae8e3..267d0d67da 100644
--- a/scripts/o3de/tests/unit_test_manifest.py
+++ b/scripts/o3de/tests/unit_test_manifest.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/tests/unit_test_register.py b/scripts/o3de/tests/unit_test_register.py
index c5f2246e70..fa60f0a782 100644
--- a/scripts/o3de/tests/unit_test_register.py
+++ b/scripts/o3de/tests/unit_test_register.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/o3de/tests/unit_test_utils.py b/scripts/o3de/tests/unit_test_utils.py
index 2e4b91469c..c6b27a596a 100755
--- a/scripts/o3de/tests/unit_test_utils.py
+++ b/scripts/o3de/tests/unit_test_utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/scrubbing/scrubbing_job.py b/scripts/scrubbing/scrubbing_job.py
index e0910f3e92..191bfec0d8 100755
--- a/scripts/scrubbing/scrubbing_job.py
+++ b/scripts/scrubbing/scrubbing_job.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/scrubbing/validator.py b/scripts/scrubbing/validator.py
index 188d5a3a11..21295bfff9 100755
--- a/scripts/scrubbing/validator.py
+++ b/scripts/scrubbing/validator.py
@@ -3,7 +3,7 @@
 references or code that should not be published. Can be used to scan any directory."""
 
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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/scripts/scrubbing/validator_data_LEGAL_REVIEW_REQUIRED.py b/scripts/scrubbing/validator_data_LEGAL_REVIEW_REQUIRED.py
index 9fd1205684..cf28e43032 100755
--- a/scripts/scrubbing/validator_data_LEGAL_REVIEW_REQUIRED.py
+++ b/scripts/scrubbing/validator_data_LEGAL_REVIEW_REQUIRED.py
@@ -1,7 +1,7 @@
 # This python file contains the data used to drive the validator.
 """Data for Validator tool"""
 #
-# Copyright (c) Contributors to the Open 3D Engine Project
+# 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
 #